From emaldonado at fedoraproject.org  Tue Sep  1 00:11:25 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  1 Sep 2009 00:11:25 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.108,1.109
Message-ID: <20090901001125.468EF11C0099@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17123

Modified Files:
	nss.spec 
Log Message:
Fix FORTIFY_SOURCE buffer overflows in test suite on ppc and ppc64 - bug 519766


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- nss.spec	31 Aug 2009 03:21:20 -0000	1.108
+++ nss.spec	1 Sep 2009 00:11:24 -0000	1.109
@@ -6,19 +6,15 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          29%{?dist}
+Release:          30%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn >= %{nss_softokn_version}
-Requires:         nss-softokn-freebl%{_isa} >= %{nss_softokn_version}
-Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn >= %{nss_softokn_version}                                                  
-BuildRequires:    nss-util >= %{nss_util_version}
 BuildRequires:    nss-softokn-devel >= %{version}                                                  
 BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
@@ -216,8 +212,7 @@ rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
 
-#HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
-# Temporarily disabling all tests until we investigate a fix for Bug 519766
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
 
 cd ../../../../
 
@@ -444,6 +439,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Aug 31 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-30
+- Fix FORTIFY_SOURCE buffer overflows in test suite on ppc and ppc64 - bug 519766
+- Fixed requires and buildrequires as per recommendations in spec file review
+
 * Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-29
 - Restoring patches 2 and 7 as we still compile all sources
 - Applying the nss-nolocalsql.patch solves nss-tools sqlite dependency problems



From rmccabe at fedoraproject.org  Tue Sep  1 00:21:56 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Tue,  1 Sep 2009 00:21:56 +0000 (UTC)
Subject: rpms/clustermon/devel .cvsignore, 1.4, 1.5 clustermon.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090901002156.CFF9511C0099@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22393

Modified Files:
	.cvsignore clustermon.spec sources 
Log Message:
Forward port 0.16.1 from F11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Mar 2009 19:54:26 -0000	1.4
+++ .cvsignore	1 Sep 2009 00:21:56 -0000	1.5
@@ -1 +1 @@
-clustermon-0.16.0.tar.gz
+clustermon-0.16.1.tar.gz


Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- clustermon.spec	21 Aug 2009 12:48:14 -0000	1.13
+++ clustermon.spec	1 Sep 2009 00:21:56 -0000	1.14
@@ -16,15 +16,15 @@
 
 
 Name: clustermon
-Version: 0.16.0
-Release: 3%{?dist}
+Version: 0.16.1
+Release: 2%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
 Group: System Environment/Base
 Summary: Monitoring and management of Red Hat Cluster Suite
 
-Source0: http://people.redhat.com/rmccabe/conga/fedora/src/clustermon-0.16.0.tar.gz
+Source0: http://people.redhat.com/rmccabe/conga/fedora/src/clustermon-0.16.1.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clusterlib-devel
@@ -171,8 +171,8 @@ exit 0
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.0-3
-- rebuilt with new openssl
+* Mon Aug 31 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-2
+- Forward port from F11.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Mar 2009 19:54:26 -0000	1.6
+++ sources	1 Sep 2009 00:21:56 -0000	1.7
@@ -1 +1 @@
-0af7b793cc7f741d5db3505207ab4abb  clustermon-0.16.0.tar.gz
+36e79b44b0e1235d694a838a5e3e9750  clustermon-0.16.1.tar.gz



From cchance at fedoraproject.org  Tue Sep  1 00:47:53 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  1 Sep 2009 00:47:53 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel .cvsignore, 1.5, 1.6 ibus-table-erbi.spec,
	1.14, 1.15 sources, 1.5, 1.6
Message-ID: <20090901004753.2A42F11C0099@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv953

Modified Files:
	.cvsignore ibus-table-erbi.spec sources 
Log Message:
updated source w/ fix on format of erbi standard table.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Aug 2009 04:31:54 -0000	1.5
+++ .cvsignore	1 Sep 2009 00:47:52 -0000	1.6
@@ -1 +1 @@
-ibus-table-erbi-1.2.0.20090831.tar.gz
+ibus-table-erbi-1.2.0.20090901.tar.gz


Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ibus-table-erbi.spec	31 Aug 2009 04:31:54 -0000	1.14
+++ ibus-table-erbi.spec	1 Sep 2009 00:47:52 -0000	1.15
@@ -1,5 +1,5 @@
 Name:       ibus-table-erbi
-Version:    1.2.0.20090831
+Version:    1.2.0.20090901
 Release:    1%{?dist}
 Summary:    Erbi input method tables for IBus-Table
 License:    GPLv2+
@@ -47,6 +47,9 @@ pwd
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Tue Sep 01 2009 Caius 'kaio' Chance <k at kaio.me> - 1.1.0.20090901-1.fc12
+- Updated source with fixes on format of erbi standard table.
+
 * Mon Aug 31 2009 Caius 'kaio' Chance <k at kaio.me> - 1.1.0.20090831-1.fc12
 - Updated source.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Aug 2009 04:31:54 -0000	1.5
+++ sources	1 Sep 2009 00:47:52 -0000	1.6
@@ -1 +1 @@
-826f58ecaf2c7feb05ed596e65ebe133  ibus-table-erbi-1.2.0.20090831.tar.gz
+ab7cc78e731396b6a3667f0d4886e7e7  ibus-table-erbi-1.2.0.20090901.tar.gz



From tmoertel at fedoraproject.org  Tue Sep  1 00:52:58 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Tue,  1 Sep 2009 00:52:58 +0000 (UTC)
Subject: rpms/emacs-magit/devel .cvsignore, 1.2, 1.3 emacs-magit.spec, 1.4, 
	1.5 sources, 1.2, 1.3 emacs-magit-include-fdl.patch, 1.1, NONE
Message-ID: <20090901005258.D8E4511C0099@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/extras/rpms/emacs-magit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1999

Modified Files:
	.cvsignore emacs-magit.spec sources 
Removed Files:
	emacs-magit-include-fdl.patch 
Log Message:
Updated to upstream 0.7 release of Magit



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jan 2009 03:42:39 -0000	1.2
+++ .cvsignore	1 Sep 2009 00:52:58 -0000	1.3
@@ -1 +1 @@
-magit-0.7.20090122.tar.gz
+magit-0.7.tar.gz


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/devel/emacs-magit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- emacs-magit.spec	24 Jul 2009 22:04:54 -0000	1.4
+++ emacs-magit.spec	1 Sep 2009 00:52:58 -0000	1.5
@@ -14,21 +14,14 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        5.%{git_pull_date}git%{?dist}
+Release:        6
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
 License:        GPLv3+ and GFDL+
 URL:            http://zagadka.vm.bytemark.co.uk/magit/magit.html
 
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  git clone git://gitorious.org/magit/mainline.git magit-0.7.20090122
-#  tar zcf magit-0.7.20090122.tar.gz magit-0.7.20090122
-Source0:        magit-%{version}.%{git_pull_date}.tar.gz
-
-# Include FDL into the Texinfo docs (patch submitted upstream)
-Patch0:         emacs-magit-include-fdl.patch
+Source0:        http://zagadka.vm.bytemark.co.uk/magit/magit-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,11 +45,9 @@ do not need to install this package to r
 package to use %{pkgname} with GNU Emacs.
 
 %prep
-%setup -q -n magit-%{version}.%{git_pull_date}
-%patch0 -p1
+%setup -q -n magit-%{version}
 
 %build
-./autogen.sh
 %configure
 make
 
@@ -97,6 +88,9 @@ fi
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Aug 26 2009 Tom Moertel <tom at moertel.com> - 0.7-6
+- Updated for Magit 0.7 final release (note: upstream removed FDL from tarball)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-5.20090122git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jan 2009 03:42:39 -0000	1.2
+++ sources	1 Sep 2009 00:52:58 -0000	1.3
@@ -1 +1 @@
-30b886dd1f999b64959b40e61b494700  magit-0.7.20090122.tar.gz
+1ea442bd6f83f7ac82967059754c8c87  magit-0.7.tar.gz


--- emacs-magit-include-fdl.patch DELETED ---



From hno at fedoraproject.org  Tue Sep  1 01:19:24 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue,  1 Sep 2009 01:19:24 +0000 (UTC)
Subject: rpms/squid/devel squid.spec-3.1,1.4,1.5
Message-ID: <20090901011924.A991711C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8707

Modified Files:
	squid.spec-3.1 
Log Message:
More Squid-3.1 packaging preparations, now compiles but exposes some upstream packaging issues i rpath & symbolic links


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- squid.spec-3.1	31 Aug 2009 23:57:30 -0000	1.4
+++ squid.spec-3.1	1 Sep 2009 01:19:23 -0000	1.5
@@ -91,19 +91,19 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --enable-auth="basic,digest,ntlm,negotiate" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
    --enable-negotiate-auth-helpers="squid_kerb_auth" \
+   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
+   --enable-digest-auth-helpers="password,ldap,eDirectory" \
+   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
-   --enable-digest-auth-helpers="password,ldap,eDirectory" \
    --enable-epoll \
-   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-icap-client \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
@@ -118,21 +118,12 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-openssl=/usr/kerberos \
    --with-pthreads
 
-# following options are no longer supported
-#   --with-winbind-auth-challenge \
-#   --enable-follow-x-forwarded-for \
-#   --enable-fd-config \
-#   --with-maxfd=16384 \
-#   --enable-underscores \
+# following options are no longer supported but may be supported in future
+#   --enable-follow-x-forwarded-for
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
 
-mkdir faq
-cp %{SOURCE1} faq
-cd faq
-sgml2html FAQ.sgml
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall  \
@@ -156,9 +147,6 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi 
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
-ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
-
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
@@ -177,6 +165,9 @@ chmod 644 contrib/url-normalizer.pl cont
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
+# squid.conf.documented is documentation. We ship that in doc/
+rm -f $RPM_BUILD_ROOT%{sysconfdir}/squid/squid.conf.documented
+
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
 rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
@@ -186,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc faq/*\.html README ChangeLog QUICKSTART
+%doc README ChangeLog QUICKSTART src/squid.conf.documented
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
 %attr(755,root,root) %dir /etc/squid
@@ -202,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/squid/mime.conf
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
-%config(noreplace) /etc/squid/mib.txt
 # These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
@@ -211,10 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
 
-%config(noreplace) /etc/squid/errors
 %dir %{_datadir}/squid
 %attr(-,root,root) %{_datadir}/squid/errors
-%attr(-,root,root) /etc/squid/icons
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons



From tmoertel at fedoraproject.org  Tue Sep  1 01:24:35 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Tue,  1 Sep 2009 01:24:35 +0000 (UTC)
Subject: rpms/emacs-magit/F-11 .cvsignore, 1.2, 1.3 emacs-magit.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090901012435.68A3811C0099@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/extras/rpms/emacs-magit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9722

Modified Files:
	.cvsignore emacs-magit.spec sources 
Log Message:
Updated to upstream Magit 0.7 release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jan 2009 03:42:39 -0000	1.2
+++ .cvsignore	1 Sep 2009 01:24:35 -0000	1.3
@@ -1 +1 @@
-magit-0.7.20090122.tar.gz
+magit-0.7.tar.gz


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-11/emacs-magit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- emacs-magit.spec	24 Feb 2009 14:44:51 -0000	1.3
+++ emacs-magit.spec	1 Sep 2009 01:24:35 -0000	1.4
@@ -14,21 +14,14 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        4.%{git_pull_date}git%{?dist}
+Release:        6
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
 License:        GPLv3+ and GFDL+
 URL:            http://zagadka.vm.bytemark.co.uk/magit/magit.html
 
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  git clone git://gitorious.org/magit/mainline.git magit-0.7.20090122
-#  tar zcf magit-0.7.20090122.tar.gz magit-0.7.20090122
-Source0:        magit-%{version}.%{git_pull_date}.tar.gz
-
-# Include FDL into the Texinfo docs (patch submitted upstream)
-Patch0:         emacs-magit-include-fdl.patch
+Source0:        http://zagadka.vm.bytemark.co.uk/magit/magit-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,11 +45,9 @@ do not need to install this package to r
 package to use %{pkgname} with GNU Emacs.
 
 %prep
-%setup -q -n magit-%{version}.%{git_pull_date}
-%patch0 -p1
+%setup -q -n magit-%{version}
 
 %build
-./autogen.sh
 %configure
 make
 
@@ -97,6 +88,9 @@ fi
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Aug 26 2009 Tom Moertel <tom at moertel.com> - 0.7-6
+- Updated for Magit 0.7 final release (note: upstream removed FDL from tarball)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-4.20090122git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jan 2009 03:42:39 -0000	1.2
+++ sources	1 Sep 2009 01:24:35 -0000	1.3
@@ -1 +1 @@
-30b886dd1f999b64959b40e61b494700  magit-0.7.20090122.tar.gz
+1ea442bd6f83f7ac82967059754c8c87  magit-0.7.tar.gz



From tmoertel at fedoraproject.org  Tue Sep  1 01:39:44 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Tue,  1 Sep 2009 01:39:44 +0000 (UTC)
Subject: rpms/emacs-magit/F-11 emacs-magit.spec,1.4,1.5
Message-ID: <20090901013944.5A85B11C0099@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/extras/rpms/emacs-magit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12897

Modified Files:
	emacs-magit.spec 
Log Message:
Fixed missing dist var in release


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-11/emacs-magit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- emacs-magit.spec	1 Sep 2009 01:24:35 -0000	1.4
+++ emacs-magit.spec	1 Sep 2009 01:39:44 -0000	1.5
@@ -14,7 +14,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        6
+Release:        6%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors



From tmoertel at fedoraproject.org  Tue Sep  1 01:40:23 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Tue,  1 Sep 2009 01:40:23 +0000 (UTC)
Subject: rpms/emacs-magit/devel emacs-magit.spec,1.5,1.6
Message-ID: <20090901014023.852F211C0498@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/extras/rpms/emacs-magit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13156

Modified Files:
	emacs-magit.spec 
Log Message:
Fixed missing dist var in release


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/devel/emacs-magit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- emacs-magit.spec	1 Sep 2009 00:52:58 -0000	1.5
+++ emacs-magit.spec	1 Sep 2009 01:40:23 -0000	1.6
@@ -14,7 +14,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        6
+Release:        6%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors



From tmoertel at fedoraproject.org  Tue Sep  1 01:42:31 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Tue,  1 Sep 2009 01:42:31 +0000 (UTC)
Subject: rpms/emacs-magit/F-10 .cvsignore, 1.2, 1.3 emacs-magit.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090901014231.6D1E311C0099@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/extras/rpms/emacs-magit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13707

Modified Files:
	.cvsignore emacs-magit.spec sources 
Log Message:
Update to upstread Magit 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jan 2009 03:48:54 -0000	1.2
+++ .cvsignore	1 Sep 2009 01:42:31 -0000	1.3
@@ -1 +1 @@
-magit-0.7.20090122.tar.gz
+magit-0.7.tar.gz


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-10/emacs-magit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- emacs-magit.spec	29 Jan 2009 14:52:13 -0000	1.2
+++ emacs-magit.spec	1 Sep 2009 01:42:31 -0000	1.3
@@ -14,21 +14,14 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        3.%{git_pull_date}git%{?dist}
+Release:        6%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
 License:        GPLv3+ and GFDL+
 URL:            http://zagadka.vm.bytemark.co.uk/magit/magit.html
 
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  git clone git://gitorious.org/magit/mainline.git magit-0.7.20090122
-#  tar zcf magit-0.7.20090122.tar.gz magit-0.7.20090122
-Source0:        magit-%{version}.%{git_pull_date}.tar.gz
-
-# Include FDL into the Texinfo docs (patch submitted upstream)
-Patch0:         emacs-magit-include-fdl.patch
+Source0:        http://zagadka.vm.bytemark.co.uk/magit/magit-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,11 +45,9 @@ do not need to install this package to r
 package to use %{pkgname} with GNU Emacs.
 
 %prep
-%setup -q -n magit-%{version}.%{git_pull_date}
-%patch0 -p1
+%setup -q -n magit-%{version}
 
 %build
-./autogen.sh
 %configure
 make
 
@@ -97,6 +88,9 @@ fi
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Aug 26 2009 Tom Moertel <tom at moertel.com> - 0.7-6
+- Updated for Magit 0.7 final release (note: upstream removed FDL from tarball)
+
 * Thu Jan 29 2009  <tom at moertel.com> - 0.7-3.20090122git
 - Added missing build dependency: texinfo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-magit/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jan 2009 03:48:55 -0000	1.2
+++ sources	1 Sep 2009 01:42:31 -0000	1.3
@@ -1 +1 @@
-30b886dd1f999b64959b40e61b494700  magit-0.7.20090122.tar.gz
+1ea442bd6f83f7ac82967059754c8c87  magit-0.7.tar.gz



From tgl at fedoraproject.org  Tue Sep  1 03:35:25 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue,  1 Sep 2009 03:35:25 +0000 (UTC)
Subject: rpms/mysql/devel mysql-strmov.patch, NONE,
	1.1 mysql-plugin-bug.patch, 1.10, 1.11 mysql.spec, 1.127, 1.128
Message-ID: <20090901033525.6622A11C0099@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26606

Modified Files:
	mysql-plugin-bug.patch mysql.spec 
Added Files:
	mysql-strmov.patch 
Log Message:
Work around unportable assumptions about stpcpy()

mysql-strmov.patch:
 m_string.h |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE mysql-strmov.patch ---
Remove overly optimistic definition of strmov() as stpcpy().

mysql uses this macro with overlapping source and destination strings,
which is verboten per spec, and fails on some Red Hat platforms.
Deleting the definition is sufficient to make it fall back to a
byte-at-a-time copy loop, which should consistently give the
expected behavior.


diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h
--- mysql-5.1.37.orig/include/m_string.h	2009-07-13 19:08:50.000000000 -0400
+++ mysql-5.1.37/include/m_string.h	2009-08-31 21:49:49.000000000 -0400
@@ -81,13 +81,6 @@
 extern void *(*my_str_malloc)(size_t);
 extern void (*my_str_free)(void *);
 
-#if defined(HAVE_STPCPY)
-#define strmov(A,B) stpcpy((A),(B))
-#ifndef stpcpy
-extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
-#endif
-#endif
-
 /* Declared in int2str() */
 extern char NEAR _dig_vec_upper[];
 extern char NEAR _dig_vec_lower[];

mysql-plugin-bug.patch:
 disabled.def |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mysql-plugin-bug.patch	29 Aug 2009 06:33:02 -0000	1.10
+++ mysql-plugin-bug.patch	1 Sep 2009 03:35:23 -0000	1.11
@@ -6,18 +6,14 @@ http://bugs.mysql.com/bug.php?id=42144
 
 For the moment, just disable this test.
 
-Also, temporarily disable the "mysql" test --- there's something pretty
-broken there, but I haven't figured out what yet ...
-
 
 diff -Naur mysql-5.1.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
 --- mysql-5.1.37.orig/mysql-test/t/disabled.def	2009-07-13 19:43:47.000000000 -0400
 +++ mysql-5.1.37/mysql-test/t/disabled.def	2009-08-02 20:43:36.000000000 -0400
-@@ -13,4 +13,6 @@
+@@ -13,4 +13,5 @@
  innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
  init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
 -
 +#
 +plugin_load     : gives wrong answer on PPC64
-+mysql           : fails for unclear reasons


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- mysql.spec	29 Aug 2009 06:33:02 -0000	1.127
+++ mysql.spec	1 Sep 2009 03:35:23 -0000	1.128
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.37
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -32,6 +32,7 @@ Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
+Patch10: mysql-strmov.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -174,6 +175,7 @@ the MySQL sources.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 libtoolize --force
 aclocal
@@ -205,13 +207,13 @@ export CFLAGS CXXFLAGS
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
 	--with-big-tables \
-	--with-innodb \
-	--with-ndbcluster \
+	--with-pic \
+	--with-plugin-innobase \
+	--with-plugin-ndbcluster \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
-	--disable-dependency-tracking \
-	--with-named-thread-libs="-lpthread"
+	--disable-dependency-tracking
 
 gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
 
@@ -640,6 +642,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Aug 31 2009 Tom Lane <tgl at redhat.com> 5.1.37-5
+- Work around unportable assumptions about stpcpy(); re-enable main.mysql test
+- Clean up some obsolete parameters to the configure script
+
 * Sat Aug 29 2009 Tom Lane <tgl at redhat.com> 5.1.37-4
 - Remove one misguided patch; turns out I was chasing a glibc bug
 - Temporarily disable "main.mysql" test; there's something broken there too,



From shakthimaan at fedoraproject.org  Tue Sep  1 03:41:31 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue,  1 Sep 2009 03:41:31 +0000 (UTC)
Subject: rpms/eqntott/F-10 eqntott.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901034131.B056C11C0099@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/eqntott/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30796/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	eqntott.spec import.log 
Log Message:
First package.



--- NEW FILE eqntott.spec ---
Name:           eqntott
Version:        9.0
Release:        2%{?dist}
Summary:        Generates truth tables from Boolean equations

Group:          Applications/Engineering
License:        BSD
URL:            http://code.google.com/p/eqntott
Source0:        http://eqntott.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Converts Boolean logic expressions into a truth table that is useful for 
preparing input to espresso package for logic minimization, converting logic
expressions into simpler forms, and for creating truth tables.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/eqntott
%{_mandir}/man1/eqntott.1.gz

%changelog
* Mon Aug 17 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-2
- Keeping only Changelog and README in the doc section

* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-1
- First .spec release for eqntott


--- NEW FILE import.log ---
eqntott-9_0-2_fc11:F-10:eqntott-9.0-2.fc11.src.rpm:1251776860


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 20:21:37 -0000	1.1
+++ .cvsignore	1 Sep 2009 03:41:31 -0000	1.2
@@ -0,0 +1 @@
+eqntott-9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:21:37 -0000	1.1
+++ sources	1 Sep 2009 03:41:31 -0000	1.2
@@ -0,0 +1 @@
+a029f83d885d2ed3af0c569a8f0bab12  eqntott-9.0.tar.gz



From shakthimaan at fedoraproject.org  Tue Sep  1 03:43:23 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue,  1 Sep 2009 03:43:23 +0000 (UTC)
Subject: rpms/eqntott/F-11 eqntott.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901034323.6120111C0099@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/eqntott/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32244/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	eqntott.spec import.log 
Log Message:
First package.



--- NEW FILE eqntott.spec ---
Name:           eqntott
Version:        9.0
Release:        2%{?dist}
Summary:        Generates truth tables from Boolean equations

Group:          Applications/Engineering
License:        BSD
URL:            http://code.google.com/p/eqntott
Source0:        http://eqntott.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Converts Boolean logic expressions into a truth table that is useful for 
preparing input to espresso package for logic minimization, converting logic
expressions into simpler forms, and for creating truth tables.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/eqntott
%{_mandir}/man1/eqntott.1.gz

%changelog
* Mon Aug 17 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-2
- Keeping only Changelog and README in the doc section

* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-1
- First .spec release for eqntott


--- NEW FILE import.log ---
eqntott-9_0-2_fc11:F-11:eqntott-9.0-2.fc11.src.rpm:1251776970


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 20:21:37 -0000	1.1
+++ .cvsignore	1 Sep 2009 03:43:23 -0000	1.2
@@ -0,0 +1 @@
+eqntott-9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:21:37 -0000	1.1
+++ sources	1 Sep 2009 03:43:23 -0000	1.2
@@ -0,0 +1 @@
+a029f83d885d2ed3af0c569a8f0bab12  eqntott-9.0.tar.gz



From petersen at fedoraproject.org  Tue Sep  1 03:46:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  1 Sep 2009 03:46:08 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel ghc-GLUT.spec,1.2,1.3
Message-ID: <20090901034608.8453011C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv939

Modified Files:
	ghc-GLUT.spec 
Log Message:
add haskell-platform annotation comment


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-GLUT.spec	31 Aug 2009 10:21:44 -0000	1.2
+++ ghc-GLUT.spec	1 Sep 2009 03:46:08 -0000	1.3
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform
 Version:        2.1.1.2
 Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Tue Sep  1 03:46:55 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  1 Sep 2009 03:46:55 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel ghc-OpenGL.spec,1.2,1.3
Message-ID: <20090901034655.8EC2811C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1108

Modified Files:
	ghc-OpenGL.spec 
Log Message:
add haskell-platform annotation comment


Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-OpenGL/devel/ghc-OpenGL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-OpenGL.spec	31 Aug 2009 09:34:47 -0000	1.2
+++ ghc-OpenGL.spec	1 Sep 2009 03:46:55 -0000	1.3
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform
 Version:        2.2.1.1
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Tue Sep  1 03:59:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  1 Sep 2009 03:59:25 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel ghc-GLUT.spec,1.3,1.4
Message-ID: <20090901035925.6B0A311C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4303

Modified Files:
	ghc-GLUT.spec 
Log Message:
just list deps on separate lines to keep the spec file closer to template


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-GLUT.spec	1 Sep 2009 03:46:08 -0000	1.3
+++ ghc-GLUT.spec	1 Sep 2009 03:59:25 -0000	1.4
@@ -39,9 +39,10 @@ This is a set of bindings to the C %{pkg
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}, ghc-OpenGL-devel, freeglut-devel
+Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-OpenGL-devel
 Requires:       freeglut-devel
 
 %description devel
@@ -53,9 +54,10 @@ built for ghc-%{ghc_version}.
 %package doc
 Summary:        Documentation for %{name}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}, ghc-OpenGL-doc
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
+Requires:       ghc-OpenGL-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -67,7 +69,8 @@ This package contains development docume
 Summary:        Profiling libraries for %{name}
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}, ghc-OpenGL-prof
+Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-OpenGL-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -142,7 +145,6 @@ fi
 
 %changelog
 * Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
-- devel package requires freeglut-devel
 - move BRs to source (base) package
 
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.1.1.2-1



From petersen at fedoraproject.org  Tue Sep  1 04:01:51 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  1 Sep 2009 04:01:51 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel ghc-OpenGL.spec,1.3,1.4
Message-ID: <20090901040151.8121C11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4941

Modified Files:
	ghc-OpenGL.spec 
Log Message:
list C deps on a separate line to keep the spec file closer to template


Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-OpenGL/devel/ghc-OpenGL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-OpenGL.spec	1 Sep 2009 03:46:55 -0000	1.3
+++ ghc-OpenGL.spec	1 Sep 2009 04:01:51 -0000	1.4
@@ -37,9 +37,10 @@ These provide bindings to the OpenGL gra
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel
+Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       mesa-libGL-devel, mesa-libGLU-devel
 
 %description devel
 This package contains the development files for %{name}



From shakthimaan at fedoraproject.org  Tue Sep  1 04:02:30 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue,  1 Sep 2009 04:02:30 +0000 (UTC)
Subject: rpms/eqntott/EL-5 eqntott.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901040230.843EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/eqntott/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5672/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	eqntott.spec import.log 
Log Message:
First package.



--- NEW FILE eqntott.spec ---
Name:           eqntott
Version:        9.0
Release:        2%{?dist}
Summary:        Generates truth tables from Boolean equations

Group:          Applications/Engineering
License:        BSD
URL:            http://code.google.com/p/eqntott
Source0:        http://eqntott.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Converts Boolean logic expressions into a truth table that is useful for 
preparing input to espresso package for logic minimization, converting logic
expressions into simpler forms, and for creating truth tables.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/eqntott
%{_mandir}/man1/eqntott.1.gz

%changelog
* Mon Aug 17 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-2
- Keeping only Changelog and README in the doc section

* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-1
- First .spec release for eqntott


--- NEW FILE import.log ---
eqntott-9_0-2_fc11:EL-5:eqntott-9.0-2.fc11.src.rpm:1251778119


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 20:21:37 -0000	1.1
+++ .cvsignore	1 Sep 2009 04:02:30 -0000	1.2
@@ -0,0 +1 @@
+eqntott-9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:21:37 -0000	1.1
+++ sources	1 Sep 2009 04:02:30 -0000	1.2
@@ -0,0 +1 @@
+a029f83d885d2ed3af0c569a8f0bab12  eqntott-9.0.tar.gz



From cweyl at fedoraproject.org  Tue Sep  1 04:06:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 04:06:28 +0000 (UTC)
Subject: rpms/perl-JSON/devel perl-JSON.spec,1.15,1.16
Message-ID: <20090901040628.1900711C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24663

Modified Files:
	perl-JSON.spec 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
- update filtering 



Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/perl-JSON.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-JSON.spec	26 Jul 2009 08:49:59 -0000	1.15
+++ perl-JSON.spec	1 Sep 2009 04:06:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -27,29 +27,28 @@ Requires:       perl(Scalar::Util)
 Requires:       perl(LWP::UserAgent)
 Requires:       perl(HTTP::Daemon)
 
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
+%{?filter_setup: %{expand: 
+%filter_from_provides /perl(JSON::PP)/d
+%filter_provides_in %{perl_vendorarch}/.*\\.so$ 
+%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ 
+%filter_provides_in %{_docdir} 
+%filter_requires_in %{_docdir} 
+%filter_setup 
+}}
+
 %description
 This module converts between JSON (JavaScript Object Notation) and Perl
-data structure into each other. For JSON, See to
-http://www.crockford.com/JSON/.
+data structure into each other. For JSON, see http://www.crockford.com/JSON/.
 
 %prep
 %setup -q -n JSON-%{version}
 
 # make rpmlint happy...
 find .  -type f -exec chmod -c -x {} +
-find t/ -type f -exec perl -pi -e 's|^#! perl|#!/usr/bin/perl|' {} +
+find t/ -type f -exec perl -pi -e 's|^#! perl|#!%{__perl}|' {} +
 sed -i 's/\r//' README t/*
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(My.*)/d; /perl(_unicode_handling)/d'
-EOF
-
-%define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -77,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
+- update filtering 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Sep  1 04:10:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 04:10:51 +0000 (UTC)
Subject: rpms/perl-JSON/F-11 perl-JSON.spec,1.14,1.15
Message-ID: <20090901041051.AE2FB11C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27457

Modified Files:
	perl-JSON.spec 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
- update filtering 



Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/F-11/perl-JSON.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-JSON.spec	23 Jun 2009 05:24:32 -0000	1.14
+++ perl-JSON.spec	1 Sep 2009 04:10:51 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -27,29 +27,28 @@ Requires:       perl(Scalar::Util)
 Requires:       perl(LWP::UserAgent)
 Requires:       perl(HTTP::Daemon)
 
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
+%{?filter_setup: %{expand: 
+%filter_from_provides /perl(JSON::PP)/d
+%filter_provides_in %{perl_vendorarch}/.*\\.so$ 
+%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ 
+%filter_provides_in %{_docdir} 
+%filter_requires_in %{_docdir} 
+%filter_setup 
+}}
+
 %description
 This module converts between JSON (JavaScript Object Notation) and Perl
-data structure into each other. For JSON, See to
-http://www.crockford.com/JSON/.
+data structure into each other. For JSON, see http://www.crockford.com/JSON/.
 
 %prep
 %setup -q -n JSON-%{version}
 
 # make rpmlint happy...
 find .  -type f -exec chmod -c -x {} +
-find t/ -type f -exec perl -pi -e 's|^#! perl|#!/usr/bin/perl|' {} +
+find t/ -type f -exec perl -pi -e 's|^#! perl|#!%{__perl}|' {} +
 sed -i 's/\r//' README t/*
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(My.*)/d; /perl(_unicode_handling)/d'
-EOF
-
-%define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -77,6 +76,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
+- update filtering 
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-1
 - auto-update to 2.15 (by cpan-spec-update 0.01)
 



From devrim at fedoraproject.org  Tue Sep  1 04:14:17 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Sep 2009 04:14:17 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.6,1.7
Message-ID: <20090901041417.BBF6611C00EF@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29761

Modified Files:
	mapserver.spec 
Log Message:
One more try to fix builds.



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mapserver.spec	30 Aug 2009 21:44:52 -0000	1.6
+++ mapserver.spec	1 Sep 2009 04:14:17 -0000	1.7
@@ -16,7 +16,8 @@ BuildRequires:  php-devel freetype-devel
 BuildRequires:  python-devel curl-devel zlib-devel libxml2-devel
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  java-gcj-compat-devel swig > 1.3.24
+#BuildRequires:  java-gcj-compat-devel swig > 1.3.24
+BuildRequires:  swig > 1.3.24
 BuildRequires:	byacc, flex
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")



From jwilson at fedoraproject.org  Tue Sep  1 04:18:46 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue,  1 Sep 2009 04:18:46 +0000 (UTC)
Subject: rpms/kernel/F-11 lirc-2.6.31.patch, NONE,
	1.1 lirc-revert-2.6.31-i2c-changes.patch, NONE,
	1.1 v4l-dvb-fix-cx25840-firmware-load.patch, 1.1,
	1.2 config-generic, 1.290, 1.291 hdpvr-ir-enable.patch, 1.3,
	1.4 kernel.spec, 1.1723, 1.1724 linux-2.6.29-lirc.patch, 1.13, NONE
Message-ID: <20090901041846.1048511C00EF@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv429

Modified Files:
	config-generic hdpvr-ir-enable.patch kernel.spec 
Added Files:
	lirc-2.6.31.patch lirc-revert-2.6.31-i2c-changes.patch 
	v4l-dvb-fix-cx25840-firmware-load.patch 
Removed Files:
	linux-2.6.29-lirc.patch 
Log Message:
* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com> 2.5.30.5-45
- Refresh lirc patches, add new lirc_ene0100 driver
- Fix up hdpvr driver for use with modular i2c so that
  lirc_zilog can actually bind to it
- Make lirc_zilog IR transmit and receive work on the hdpvr
- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)


lirc-2.6.31.patch:
 Kconfig                 |    2 
 Makefile                |    2 
 lirc/Kconfig            |  119 ++
 lirc/Makefile           |   21 
 lirc/lirc.h             |  100 ++
 lirc/lirc_bt829.c       |  383 +++++++
 lirc/lirc_dev.c         |  839 +++++++++++++++++
 lirc/lirc_dev.h         |  184 +++
 lirc/lirc_ene0100.c     |  644 +++++++++++++
 lirc/lirc_ene0100.h     |  169 +++
 lirc/lirc_i2c.c         |  537 +++++++++++
 lirc/lirc_igorplugusb.c |  556 +++++++++++
 lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++++++++++++++++
 lirc/lirc_it87.c        |  986 ++++++++++++++++++++
 lirc/lirc_it87.h        |  116 ++
 lirc/lirc_ite8709.c     |  539 +++++++++++
 lirc/lirc_mceusb.c      | 1225 +++++++++++++++++++++++++
 lirc/lirc_parallel.c    |  709 ++++++++++++++
 lirc/lirc_parallel.h    |   26 
 lirc/lirc_sasem.c       |  931 +++++++++++++++++++
 lirc/lirc_serial.c      | 1316 +++++++++++++++++++++++++++
 lirc/lirc_sir.c         | 1283 ++++++++++++++++++++++++++
 lirc/lirc_streamzap.c   |  794 ++++++++++++++++
 lirc/lirc_ttusbir.c     |  397 ++++++++
 lirc/lirc_zilog.c       | 1395 +++++++++++++++++++++++++++++
 25 files changed, 15574 insertions(+)

--- NEW FILE lirc-2.6.31.patch ---
Linux Infrared Remote Control drivers -- http://www.lirc.org

>From http://git.wilsonet.com/linux-2.6-lirc.git/

Refreshed 20090901

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 drivers/input/Kconfig                 |    2 +
 drivers/input/Makefile                |    2 +
 drivers/input/lirc/Kconfig            |  119 ++
 drivers/input/lirc/Makefile           |   21 +
 drivers/input/lirc/lirc.h             |  100 ++
 drivers/input/lirc/lirc_bt829.c       |  383 ++++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 +++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 +++
 drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 +++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 ++
 drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
 drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 +
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 25 files changed, 15574 insertions(+), 0 deletions(-)

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index cd50c00..442f94f 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/lirc/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 4c9c745..99e2b5e 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
 
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC)       += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..ab13cfe
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,119 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+	bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+	help
+	  Say Y here, and all supported Linux Infrared Remote Control IR and
+	  RF receiver and transmitter drivers will be displayed. When paired
+	  with a remote control and the lirc daemon, the receiver drivers
+	  allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_DEV
+	tristate "LIRC device loadable module support"
+	help
+	  LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+	depends on LIRC_DEV
+	help
+	  Driver for the IR interface on BT829-based hardware
+
+config LIRC_ENE0100
+	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
+	depends on LIRC_DEV
+	help
+	  This is a driver for CIR port handled by ENE KB3924 embedded
+	  controller found on some notebooks.
+	  It appears on PNP list as ENE0100.
+
+config LIRC_I2C
+	tristate "I2C Based IR Receivers"
+	depends on LIRC_DEV
+	help
+	  Driver for I2C-based IR receivers, such as those commonly
+	  found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+	tristate "Igor Cesko's USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+	tristate "Soundgraph IMON Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+	tristate "ITE IT87XX CIR Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+	tristate "ITE8709 CIR Port Receiver"
+	depends on LIRC_DEV && PNP
+	help
+	  Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+	tristate "Windows Media Center Ed. USB IR Transceiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Windows Media Center Ed. USB IR Transceivers
+
+config LIRC_PARALLEL
+	tristate "Homebrew Parallel Port Receiver"
+	depends on LIRC_DEV && !SMP
+	help
+	  Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+	tristate "Sasem USB IR Remote"
+	depends on LIRC_DEV
+	help
+	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+	tristate "Homebrew Serial Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+	bool "Serial Port Transmitter"
+	default y
+	depends on LIRC_SERIAL
+	help
+	  Serial Port Transmitter support
+
+config LIRC_SIR
+	tristate "Built-in SIR IrDA port"
+	depends on LIRC_DEV
+	help
+	  Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+	tristate "Streamzap PC Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+	tristate "Technotrend USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
+	tristate "Zilog/Hauppauge IR Transmitter"
+	depends on LIRC_DEV
+	help
+	  Driver for the Zilog/Hauppauge IR Transmitter, found on
+	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
+endif
diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
new file mode 100644
index 0000000..8da7aa9
--- /dev/null
+++ b/drivers/input/lirc/Makefile
@@ -0,0 +1,21 @@
+# Makefile for the lirc drivers.
+#
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
+obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
+obj-$(CONFIG_LIRC_ENE0100)	+= lirc_ene0100.o
+obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
[...15368 lines suppressed...]
+		ir->task = kthread_run(lirc_thread, ir, "lirc_zilog");
+		if (IS_ERR(ir->task)) {
+			ret = PTR_ERR(ir->task);
+			zilog_error("lirc_register_driver: cannot run "
+				    "poll thread %d\n", ret);
+			goto err;
+		}
+		wait_for_completion(&tn);
+		ir->t_notify = NULL;
+	}
+
+	/* initialise TX device */
+	memcpy(&ir->c_tx, &client_template, sizeof(struct i2c_client));
+	if (have_tx) {
+		/* I2C attach to device */
+		ir->c_tx.addr = 0x70;
+		strncpy(ir->c_tx.name, "Zilog/Hauppauge TX", I2C_NAME_SIZE);
+		ret = i2c_attach(&ir->c_tx, ir);
+		if (ret != 0)
+			goto err;
+	}
+
+	/* set lirc_dev stuff */
+	ir->l.code_length = 13;
+	ir->l.rbuf	  = &ir->buf;
+	ir->l.fops	= &lirc_fops;
+	ir->l.data	= ir;
+	ir->l.minor       = minor;
+	ir->l.sample_rate = 0;
+
+	/* register with lirc */
+	ir->l.minor = lirc_register_driver(&ir->l);
+	if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {
+		zilog_error("ir_attach: \"minor\" must be between 0 and %d "
+			    "(%d)!\n", MAX_IRCTL_DEVICES-1, ir->l.minor);
+		ret = -EBADRQC;
+		goto err;
+	}
+
+	/* store this for getting back in open() later on */
+	ir_devices[ir->l.minor] = ir;
+
+	/*
+	 * if we have the tx device, load the 'firmware'.  We do this
+	 * after registering with lirc as otherwise hotplug seems to take
+	 * 10s to create the lirc device.
+	 */
+	if (have_tx) {
+		/* Special TX init */
+		ret = tx_init(ir);
+		if (ret != 0)
+			goto err;
+	}
+	return 0;
+
+err:
+	/* undo everything, hopefully... */
+	if (ir->c_rx.addr)
+		ir_remove(&ir->c_rx);
+	if (ir->c_tx.addr)
+		ir_remove(&ir->c_tx);
+	return ret;
+}
+
+static int ir_remove(struct i2c_client *client)
+{
+	struct IR *ir = i2c_get_clientdata(client);
+	mutex_lock(&ir->lock);
+
+	if (client == &ir->c_rx) {
+		DECLARE_COMPLETION(tn);
+		DECLARE_COMPLETION(tn2);
+
+		/* end up polling thread */
+		if (ir->task && !IS_ERR(ir->task)) {
+			ir->t_notify = &tn;
+			ir->t_notify2 = &tn2;
+			ir->shutdown = 1;
+			wake_up_process(ir->task);
+			complete(&tn2);
+			wait_for_completion(&tn);
+			ir->t_notify = NULL;
+			ir->t_notify2 = NULL;
+		}
+
+	} else {
+		mutex_unlock(&ir->lock);
+		zilog_error("%s: detached from something we didn't "
+			    "attach to\n", __func__);
+		return -ENODEV;
+	}
+
+	--ir->devs;
+	if (ir->devs < 0) {
+		mutex_unlock(&ir->lock);
+		zilog_error("%s: invalid device count\n", __func__);
+		return -ENODEV;
+	} else if (ir->devs == 0) {
+		/* unregister lirc driver */
+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
+			lirc_unregister_driver(ir->l.minor);
+			ir_devices[ir->l.minor] = NULL;
+		}
+
+		/* free memory */
+		lirc_buffer_free(&ir->buf);
+		mutex_unlock(&ir->lock);
+		kfree(ir);
+		return 0;
+	}
+	mutex_unlock(&ir->lock);
+	return 0;
+}
+
+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+	struct i2c_adapter *adap = client->adapter;
+	char buf;
+
+	if (adap->id == I2C_HW_B_BT848 ||
+#ifdef I2C_HW_B_HDPVR
+	    adap->id == I2C_HW_B_HDPVR ||
+#endif
+	    adap->id == I2C_HW_B_CX2341X) {
+		int have_rx = 0, have_tx = 0;
+
+		/*
+		 * The external IR receiver is at i2c address 0x71.
+		 * The IR transmitter is at 0x70.
+		 */
+		client->addr = 0x70;
+
+		if (!disable_rx) {
+			if (i2c_master_recv(client, &buf, 1) == 1)
+				have_rx = 1;
+			dprintk("probe 0x70 @ %s: %s\n",
+				adap->name,
+				have_rx ? "yes" : "no");
+		}
+
+		if (!disable_tx) {
+			client->addr = 0x71;
+			if (i2c_master_recv(client, &buf, 1) == 1)
+				have_tx = 1;
+			dprintk("probe 0x71 @ %s: %s\n",
+				adap->name,
+				have_tx ? "yes" : "no");
+		}
+
+		if (have_rx || have_tx)
+			return ir_attach(adap, have_rx, have_tx);
+		else
+			zilog_error("%s: no devices found\n", adap->name);
+	}
+
+	return 0;
+}
+
+static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
+{
+	/* nothing */
+	return 0;
+}
+
+static int __init zilog_init(void)
+{
+	mutex_init(&tx_data_lock);
+	request_module("firmware_class");
+	i2c_add_driver(&driver);
+	return 0;
+}
+
+static void __exit zilog_exit(void)
+{
+	i2c_del_driver(&driver);
+	/* if loaded */
+	fw_unload();
+}
+
+module_init(zilog_init);
+module_exit(zilog_exit);
+
+MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
+MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
+	      "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
+MODULE_LICENSE("GPL");
+/* for compat with old name, which isn't all that accurate anymore */
+MODULE_ALIAS("lirc_pvr150");
+
+module_param(minor, int, 0444);
+MODULE_PARM_DESC(minor, "Preferred minor device number");
+
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+module_param(disable_rx, bool, 0644);
+MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
+
+module_param(disable_tx, bool, 0644);
+MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");

lirc-revert-2.6.31-i2c-changes.patch:
 a/drivers/input/lirc/lirc_zilog.c |   58 +++++-----
 b/drivers/input/lirc/lirc_i2c.c   |  216 ++++++++++++++++++++++++++++----------
 2 files changed, 198 insertions(+), 76 deletions(-)

--- NEW FILE lirc-revert-2.6.31-i2c-changes.patch ---
 drivers/input/lirc/lirc_i2c.c   |  216 ++++++++++++++++++++++++++++++---------
 drivers/input/lirc/lirc_zilog.c |   58 +++++----
 2 files changed, 198 insertions(+), 76 deletions(-)

diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
index e27d937..dedf415 100644
--- a/drivers/input/lirc/lirc_i2c.c
+++ b/drivers/input/lirc/lirc_i2c.c
@@ -168,18 +168,15 @@ static int add_to_buf_haup_common(void *data, struct lirc_buffer *buf,
 	struct IR *ir = data;
 	__u16 code;
 	unsigned char codes[2];
-	int ret;
 
 	/* poll IR chip */
-	ret = i2c_master_recv(&ir->c, keybuf, size);
-	if (ret == size) {
+	if (size == i2c_master_recv(&ir->c, keybuf, size)) {
 		ir->b[0] = keybuf[offset];
 		ir->b[1] = keybuf[offset+1];
 		ir->b[2] = keybuf[offset+2];
-		if (ir->b[0] != 0x00 && ir->b[1] != 0x00)
-			dprintk("key (0x%02x/0x%02x)\n", ir->b[0], ir->b[1]);
+		dprintk("key (0x%02x/0x%02x)\n", ir->b[0], ir->b[1]);
 	} else {
-		dprintk("read error (ret=%d)\n", ret);
+		dprintk("read error\n");
 		/* keep last successful read buffer */
 	}
 
@@ -194,7 +191,6 @@ static int add_to_buf_haup_common(void *data, struct lirc_buffer *buf,
 	codes[1] = code & 0xff;
 
 	/* return it */
-	dprintk("sending code 0x%02x%02x to lirc\n", codes[0], codes[1]);
 	lirc_buffer_write(buf, codes);
 	return 0;
 }
@@ -327,8 +323,6 @@ static int set_use_inc(void *data)
 {
 	struct IR *ir = data;
 
-	dprintk("%s called\n", __func__);
-
 	/* lock bttv in memory while /dev/lirc is in use  */
 	i2c_use_client(&ir->c);
 
@@ -339,8 +333,6 @@ static void set_use_dec(void *data)
 {
 	struct IR *ir = data;
 
-	dprintk("%s called\n", __func__);
-
 	i2c_release_client(&ir->c);
 }
 
@@ -352,64 +344,45 @@ static struct lirc_driver lirc_template = {
 	.owner		= THIS_MODULE,
 };
 
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
-static int ir_remove(struct i2c_client *client);
+static int ir_attach(struct i2c_adapter *adap, int addr,
+		      unsigned short flags, int kind);
+static int ir_detach(struct i2c_client *client);
+static int ir_probe(struct i2c_adapter *adap);
 static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-static const struct i2c_device_id ir_receiver_id[] = {
-	/* Generic entry for any IR receiver */
-	{ "ir_video", 0 },
-	/* IR device specific entries could be added here */
-	{ }
-};
-
 static struct i2c_driver driver = {
 	.driver = {
 		.owner	= THIS_MODULE,
 		.name	= "i2c ir driver",
 	},
-	.probe		= ir_probe,
-	.remove		= ir_remove,
-	.id_table	= ir_receiver_id,
+	.attach_adapter	= ir_probe,
+	.detach_client	= ir_detach,
 	.command	= ir_command,
 };
 
-static void pcf_probe(struct i2c_client *client, struct IR *ir)
-{
-	int ret1, ret2, ret3, ret4;
-
-	ret1 = i2c_smbus_write_byte(client, 0xff);
-	ret2 = i2c_smbus_read_byte(client);
-	ret3 = i2c_smbus_write_byte(client, 0x00);
-	ret4 = i2c_smbus_read_byte(client);
-
-	/* in the Asus TV-Box: bit 1-0 */
-	if (((ret2 & 0x03) == 0x03) && ((ret4 & 0x03) == 0x00)) {
-		ir->bits = (unsigned char) ~0x07;
-		ir->flag = 0x04;
-	/* in the Creative/VisionTek BreakOut-Box: bit 7-6 */
-	} else if (((ret2 & 0xc0) == 0xc0) && ((ret4 & 0xc0) == 0x00)) {
-		ir->bits = (unsigned char) ~0xe0;
-		ir->flag = 0x20;
-	}
-
-	return;
-}
+static struct i2c_client client_template = {
+	.name		= "unset",
+	.driver		= &driver
+};
 
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int ir_attach(struct i2c_adapter *adap, int addr,
+		     unsigned short flags, int kind)
 {
 	struct IR *ir;
-	struct i2c_adapter *adap = client->adapter;
-	unsigned short addr = client->addr;
-	int retval;
+	int err, retval;
+
+	client_template.adapter = adap;
+	client_template.addr = addr;
 
 	ir = kzalloc(sizeof(struct IR), GFP_KERNEL);
 	if (!ir)
 		return -ENOMEM;
 	memcpy(&ir->l, &lirc_template, sizeof(struct lirc_driver));
-	memcpy(&ir->c, client, sizeof(struct i2c_client));
+	memcpy(&ir->c, &client_template, sizeof(struct i2c_client));
 
-	i2c_set_clientdata(client, ir);
+	ir->c.adapter = adap;
+	ir->c.addr    = addr;
+	i2c_set_clientdata(&ir->c, ir);
 	ir->l.data    = ir;
 	ir->l.minor   = minor;
 	ir->l.sample_rate = 10;
@@ -465,10 +438,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		break;
 	case 0x21:
 	case 0x23:
-		pcf_probe(client, ir);
 		strlcpy(ir->c.name, "TV-Box IR", I2C_NAME_SIZE);
 		ir->l.code_length = 8;
 		ir->l.add_to_buf = add_to_buf_pcf8574;
+		ir->bits = flags & 0xff;
+		ir->flag = (flags >> 8) & 0xff;
 		break;
 	default:
 		/* shouldn't happen */
@@ -479,6 +453,13 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
 	       adap->id, addr, ir->c.name);
 
+	/* register device */
+	err = i2c_attach_client(&ir->c);
+	if (err) {
+		kfree(ir);
+		return err;
+	}
+
 	retval = lirc_register_driver(&ir->l);
 
 	if (retval < 0) {
@@ -492,18 +473,149 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	return 0;
 }
 
-static int ir_remove(struct i2c_client *client)
+static int ir_detach(struct i2c_client *client)
 {
 	struct IR *ir = i2c_get_clientdata(client);
 
 	/* unregister device */
 	lirc_unregister_driver(ir->l.minor);
+	i2c_detach_client(&ir->c);
 
 	/* free memory */
 	kfree(ir);
 	return 0;
 }
 
+static int ir_probe(struct i2c_adapter *adap)
+{
+	/*
+	 * The external IR receiver is at i2c address 0x34 (0x35 for
+	 * reads).  Future Hauppauge cards will have an internal
+	 * receiver at 0x30 (0x31 for reads).  In theory, both can be
+	 * fitted, and Hauppauge suggest an external overrides an
+	 * internal.
+	 *
+	 * That's why we probe 0x1a (~0x34) first. CB
+	 *
+	 * The i2c address for the Hauppauge PVR-150 card is 0xe2,
+	 * so we need to probe 0x71 as well.
+	 */
+
+	static const int probe[] = {
+		0x1a, /* Hauppauge IR external */
+		0x18, /* Hauppauge IR internal */
+		0x71, /* Hauppauge IR (PVR150) */
+		0x4b, /* PV951 IR */
+		0x64, /* Pixelview IR */
+		0x30, /* KNC ONE IR */
+		0x6b, /* Adaptec IR */
+		-1};
+
+	static const int probe_cx88[] = {
+		0x18, /* Leadtek Winfast PVR2000 */
+		0x71, /* Hauppauge HVR-IR */
+		-1};
+
+	struct i2c_client c;
+	char buf;
+	int i, rc;
+	memset(&c, 0, sizeof(c));
+
+	if (adap->id == I2C_HW_B_BT848 ||
+	    adap->id == I2C_HW_B_CX2341X) {
+		c.adapter = adap;
+		for (i = 0; -1 != probe[i]; i++) {
+			c.addr = probe[i];
+			rc = i2c_master_recv(&c, &buf, 1);
+			dprintk("probe 0x%02x @ %s: %s\n",
+				probe[i], adap->name,
+				(1 == rc) ? "yes" : "no");
+			if (1 == rc) {
+				rc = ir_attach(adap, probe[i], 0, 0);
+				if (rc < 0)
+					goto attach_fail;
+			}
+		}
+	}
+
+	/* Leadtek Winfast PVR2000 or Hauppauge HVR-1300 */
+	else if (adap->id == I2C_HW_B_CX2388x) {
+		c.adapter = adap;
+		for (i = 0; -1 != probe_cx88[i]; i++) {
+			c.addr = probe_cx88[i];
+			rc = i2c_master_recv(&c, &buf, 1);
+			dprintk("probe 0x%02x @ %s: %s\n",
+				c.addr, adap->name,
+				(1 == rc) ? "yes" : "no");
+			if (1 == rc) {
+				rc = ir_attach(adap, c.addr, 0, 0);
+				if (rc < 0)
+					goto attach_fail;
+			}
+		}
+	}
+
+	/* Asus TV-Box and Creative/VisionTek BreakOut-Box (PCF8574) */
+	else if (adap->id == I2C_HW_B_RIVA) {
+		/*
+		 * addresses to probe;
+		 * leave 0x24 and 0x25 because SAA7113H possibly uses it
+		 * 0x21 and 0x22 possibly used by SAA7108E
+		 * Asus:      0x21 is a correct address (channel 1 of PCF8574)
+		 * Creative:  0x23 is a correct address (channel 3 of PCF8574)
+		 * VisionTek: 0x23 is a correct address (channel 3 of PCF8574)
+		 */
+		static const int pcf_probe[] = { 0x20, 0x21, 0x22, 0x23,
+						 0x24, 0x25, 0x26, 0x27, -1 };
+		int ret1, ret2, ret3, ret4;
+		unsigned char bits = 0, flag = 0;
+
+		c.adapter = adap;
+		for (i = 0; -1 != pcf_probe[i]; i++) {
+			c.addr = pcf_probe[i];
+			ret1 = i2c_smbus_write_byte(&c, 0xff);
+			ret2 = i2c_smbus_read_byte(&c);
+			ret3 = i2c_smbus_write_byte(&c, 0x00);
+			ret4 = i2c_smbus_read_byte(&c);
+
+			/* ensure that the writable bitmask works correctly */
+			rc = 0;
+			if (ret1 != -1 && ret2 != -1 &&
+			    ret3 != -1 && ret4 != -1) {
+				/* in the Asus TV-Box: bit 1-0 */
+				if (((ret2 & 0x03) == 0x03) &&
+				    ((ret4 & 0x03) == 0x00)) {
+					bits = (unsigned char) ~0x07;
+					flag = 0x04;
+					rc = 1;
+				}
+			/* in the Creative/VisionTek BreakOut-Box: bit 7-6 */
+				if (((ret2 & 0xc0) == 0xc0) &&
+				    ((ret4 & 0xc0) == 0x00)) {
+					bits = (unsigned char) ~0xe0;
+					flag = 0x20;
+					rc = 1;
+				}
+			}
+			dprintk("probe 0x%02x @ %s: %s\n",
+				c.addr, adap->name, rc ? "yes" : "no");
+			if (rc) {
+				rc = ir_attach(adap, pcf_probe[i],
+					       bits | (flag << 8), 0);
+				if (rc < 0)
+					goto attach_fail;
+			}
+		}
+	}
+
+	return 0;
+
+attach_fail:
+	printk(KERN_ERR "lirc_i2c: %s: ir_attach failed!\n", __func__);
+	return rc;
+
+}
+
 static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
 	/* nothing */

diff --git b/drivers/input/lirc/lirc_zilog.c a/drivers/input/lirc/lirc_zilog.c
index c532399..049c3da 100644
--- b/drivers/input/lirc/lirc_zilog.c
+++ a/drivers/input/lirc/lirc_zilog.c
@@ -1088,26 +1088,18 @@ static struct lirc_driver lirc_template = {
 };
 
 static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
-static int ir_remove(struct i2c_client *client);
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
+static int ir_detach(struct i2c_client *client);
+static int ir_probe(struct i2c_adapter *adap);
 static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-static const struct i2c_device_id ir_transceiver_id[] = {
-	/* Generic entry for any IR transceiver */
-	{ "ir_video", 0 },
-	/* IR device specific entries could be added here */
-	{ }
-};
-
 static struct i2c_driver driver = {
 	.driver = {
 		.owner	= THIS_MODULE,
 		.name	= "i2c ir driver",
 	},
-	.probe		= ir_probe,
-	.remove		= ir_remove,
+	.attach_adapter	= ir_probe,
+	.detach_client	= ir_detach,
 	.command	= ir_command,
-	.id_table	= ir_transceiver_id,
 };
 
 static struct i2c_client client_template = {
@@ -1128,8 +1120,20 @@ static struct file_operations lirc_fops = {
 
 static int i2c_attach(struct i2c_client *client, struct IR *ir)
 {
+	int ret;
+
 	i2c_set_clientdata(client, ir);
 
+	ret = i2c_attach_client(client);
+	if (ret != 0) {
+		client->addr = 0;
+		return ret;
+	}
+	if (!i2c_use_client(client)) {
+		i2c_detach_client(client);
+		client->addr = 0;
+		return -EFAULT;
+	}
 	++ir->devs;
 	return 0;
 }
@@ -1230,13 +1234,13 @@ static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx)
 err:
 	/* undo everything, hopefully... */
 	if (ir->c_rx.addr)
-		ir_remove(&ir->c_rx);
+		ir_detach(&ir->c_rx);
 	if (ir->c_tx.addr)
-		ir_remove(&ir->c_tx);
+		ir_detach(&ir->c_tx);
 	return ret;
 }
 
-static int ir_remove(struct i2c_client *client)
+static int ir_detach(struct i2c_client *client)
 {
 	struct IR *ir = i2c_get_clientdata(client);
 	mutex_lock(&ir->lock);
@@ -1257,17 +1261,21 @@ static int ir_remove(struct i2c_client *client)
 			ir->t_notify2 = NULL;
 		}
 
+		/* unregister device */
+		i2c_detach_client(&ir->c_rx);
+	} else if (client == &ir->c_tx) {
+		i2c_detach_client(&ir->c_tx);
 	} else {
 		mutex_unlock(&ir->lock);
-		zilog_error("%s: detached from something we didn't "
-			    "attach to\n", __func__);
+		zilog_error("ir_detach: detached from something we didn't "
+			    "attach to\n");
 		return -ENODEV;
 	}
 
 	--ir->devs;
 	if (ir->devs < 0) {
 		mutex_unlock(&ir->lock);
-		zilog_error("%s: invalid device count\n", __func__);
+		zilog_error("ir_detach: invalid device count\n");
 		return -ENODEV;
 	} else if (ir->devs == 0) {
 		/* unregister lirc driver */
@@ -1286,10 +1294,11 @@ static int ir_remove(struct i2c_client *client)
 	return 0;
 }
 
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int ir_probe(struct i2c_adapter *adap)
 {
-	struct i2c_adapter *adap = client->adapter;
+	struct i2c_client c;
 	char buf;
+	memset(&c, 0, sizeof(c));
 
 	if (adap->id == I2C_HW_B_BT848 ||
 #ifdef I2C_HW_B_HDPVR
@@ -1302,10 +1311,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		 * The external IR receiver is at i2c address 0x71.
 		 * The IR transmitter is at 0x70.
 		 */
-		client->addr = 0x70;
+		c.adapter = adap;
+		c.addr = 0x70;
 
 		if (!disable_rx) {
-			if (i2c_master_recv(client, &buf, 1) == 1)
+			if (i2c_master_recv(&c, &buf, 1) == 1)
 				have_rx = 1;
 			dprintk("probe 0x70 @ %s: %s\n",
 				adap->name,
@@ -1313,8 +1323,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		}
 
 		if (!disable_tx) {
-			client->addr = 0x71;
-			if (i2c_master_recv(client, &buf, 1) == 1)
+			c.addr = 0x71;
+			if (i2c_master_recv(&c, &buf, 1) == 1)
 				have_tx = 1;
 			dprintk("probe 0x71 @ %s: %s\n",
 				adap->name,

v4l-dvb-fix-cx25840-firmware-load.patch:
 cx25840-firmware.c |    2 ++
 1 file changed, 2 insertions(+)

Index: v4l-dvb-fix-cx25840-firmware-load.patch
===================================================================
RCS file: v4l-dvb-fix-cx25840-firmware-load.patch
diff -N v4l-dvb-fix-cx25840-firmware-load.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ v4l-dvb-fix-cx25840-firmware-load.patch	1 Sep 2009 04:18:45 -0000	1.2
@@ -0,0 +1,29 @@
+
+# HG changeset patch
+# User Steven Toth <stoth at kernellabs.com>
+# Date 1251746101 14400
+# Node ID 38c5fb14c770c256d1a497ff6da3e33849f6b8cf
+# Parent 7c23abfe445f8b57d57db98a97a0786ab801d63e
+CX25840: Bugfix CX23885 and CX241xx caused ivtv regression.
+
+From: Steven Toth <stoth at kernellabs.com>
+
+If we override a global we need to ensure the else case resets it correctly,
+or we end up loading an incorrect firmware.
+
+Priority: normal
+
+Signed-off-by: Steven Toth <stoth at kernellabs.com>
+
+--- a/drivers/media/video/cx25840/cx25840-firmware.c	Mon Aug 31 02:03:28 2009 -0300
++++ b/drivers/media/video/cx25840/cx25840-firmware.c	Mon Aug 31 15:15:01 2009 -0400
+@@ -109,6 +109,8 @@
+ 	}
+ 	else if (state->is_cx231xx)
+ 		firmware = FWFILE_CX231XX;
++	else
++		firmware = FWFILE;
+ 
+ 	if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
+ 		v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
+


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- config-generic	28 Aug 2009 16:47:11 -0000	1.290
+++ config-generic	1 Sep 2009 04:18:44 -0000	1.291
@@ -3744,6 +3744,7 @@ CONFIG_DEFAULT_RELATIME=y
 CONFIG_INPUT_LIRC=y
 CONFIG_LIRC_DEV=m
 CONFIG_LIRC_BT829=m
+CONFIG_LIRC_ENE0100=m
 CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m

hdpvr-ir-enable.patch:
 Makefile     |    4 +---
 hdpvr-core.c |    7 +++----
 hdpvr-i2c.c  |   40 +++++++++++++++++++++++++++++++++-------
 3 files changed, 37 insertions(+), 14 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/hdpvr-ir-enable.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hdpvr-ir-enable.patch	31 Aug 2009 14:28:07 -0000	1.3
+++ hdpvr-ir-enable.patch	1 Sep 2009 04:18:44 -0000	1.4
@@ -3,8 +3,8 @@ From http://hg.jannau.net/hdpvr/, pendin
 ---
  drivers/media/video/hdpvr/Makefile     |    4 +--
  drivers/media/video/hdpvr/hdpvr-core.c |    7 ++---
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   38 ++++++++++++++++++++++++++-----
- 3 files changed, 36 insertions(+), 13 deletions(-)
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   40 ++++++++++++++++++++++++++-----
+ 3 files changed, 37 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
 index e0230fc..79ad2e1 100644
@@ -19,7 +19,7 @@ index e0230fc..79ad2e1 100644
  obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
  
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..9fa3d8d 100644
+index 188bd5a..779f907 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
 @@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
@@ -44,7 +44,7 @@ index 188bd5a..9fa3d8d 100644
  	if (dev->i2c_adapter)
  		i2c_del_adapter(dev->i2c_adapter);
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..994305c 100644
+index c4b5d15..e0ae619 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
 @@ -10,6 +10,8 @@
@@ -92,6 +92,15 @@ index c4b5d15..994305c 100644
  
  	if (ret < 0)
  		goto error;
+@@ -67,7 +69,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+ 			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
+ 			      0, 0, buf, 2, 1000);
+ 
+-	if (ret == 2)
++	if ((ret == 2) && (buf[1] == (len - 1)))
+ 		ret = 0;
+ 	else if (ret >= 0)
+ 		ret = -EIO;
 @@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1723
retrieving revision 1.1724
diff -u -p -r1.1723 -r1.1724
--- kernel.spec	28 Aug 2009 16:47:11 -0000	1.1723
+++ kernel.spec	1 Sep 2009 04:18:44 -0000	1.1724
@@ -655,9 +655,10 @@ Patch1000: linux-2.6-neigh_-fix-state-tr
 Patch1200: linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
 Patch1201: linux-2.6-xen-clean-up-warnings.patch
 
-Patch1515: linux-2.6.29-lirc.patch
+Patch1515: lirc-2.6.31.patch
 Patch1517: hid-ignore-all-recent-imon-devices.patch
 Patch1518: hdpvr-ir-enable.patch
+Patch1519: lirc-revert-2.6.31-i2c-changes.patch
 
 Patch1700: agp-set_memory_ucwb.patch
 # nouveau + drm fixes
@@ -693,6 +694,7 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
+Patch2904: v4l-dvb-fix-cx25840-firmware-load.patch
 
 # fs fixes
 Patch3000: linux-2.6-fs-cifs-fix-port-numbers.patch
@@ -1312,7 +1314,10 @@ ApplyPatch linux-2.6-zd1211rw_-adding-08
 ApplyPatch linux-2.6-crash-driver.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.29-lirc.patch
+ApplyPatch lirc-2.6.31.patch
+ApplyPatch hid-ignore-all-recent-imon-devices.patch
+ApplyPatch hdpvr-ir-enable.patch
+ApplyPatch lirc-revert-2.6.31-i2c-changes.patch
 
 # DRM patches
 ApplyPatch agp-set_memory_ucwb.patch
@@ -1344,6 +1349,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-update.patch
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-load.patch
 
 # kvm
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
@@ -1965,6 +1971,13 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com> 2.5.30.5-45
+- Refresh lirc patches, add new lirc_ene0100 driver
+- Fix up hdpvr driver for use with modular i2c so that
+  lirc_zilog can actually bind to it
+- Make lirc_zilog IR transmit and receive work on the hdpvr
+- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
+
 * Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Enable Solos DSL driver
 


--- linux-2.6.29-lirc.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  1 04:20:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 04:20:08 +0000
Subject: [pkgdb] ibus-anthy ownership updated
Message-ID: <20090901042008.C2E6C10F87A@bastion2.fedora.phx.redhat.com>

Package ibus-anthy in Fedora devel is now owned by phuang

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Sep  1 04:20:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 04:20:32 +0000
Subject: [pkgdb] ibus-anthy ownership updated
Message-ID: <20090901042032.8468910F87A@bastion2.fedora.phx.redhat.com>

Package ibus-anthy in Fedora devel is now owned by phuang

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From devrim at fedoraproject.org  Tue Sep  1 04:22:22 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Sep 2009 04:22:22 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.7,1.8
Message-ID: <20090901042222.6F24D11C00EF@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3536

Modified Files:
	mapserver.spec 
Log Message:
One more attempt to fix spec



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mapserver.spec	1 Sep 2009 04:14:17 -0000	1.7
+++ mapserver.spec	1 Sep 2009 04:22:22 -0000	1.8
@@ -8,16 +8,15 @@ URL:            http://mapserver.gis.umn
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd 
-BuildRequires:  libXpm-devel
+#BuildRequires:  libXpm-devel
 BuildRequires:  httpd-devel php-devel
 BuildRequires:  postgresql-devel mysql-devel
-BuildRequires:  geos-devel proj-devel gdal-devel
+BuildRequires:  geos-devel proj-devel 
 BuildRequires:  php-devel freetype-devel gd-devel >= 2.0.16
 BuildRequires:  python-devel curl-devel zlib-devel libxml2-devel
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 #BuildRequires:  java-gcj-compat-devel swig > 1.3.24
-BuildRequires:  swig > 1.3.24
 BuildRequires:	byacc, flex
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")



From pkgdb at fedoraproject.org  Tue Sep  1 04:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 04:24:12 +0000
Subject: [pkgdb] ibus-anthy (Fedora, 11) updated by petersen
Message-ID: <20090901042412.BE8EF10F87A@bastion2.fedora.phx.redhat.com>

petersen changed owner of ibus-anthy in Fedora 11 to fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Sep  1 04:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 04:24:12 +0000
Subject: [pkgdb] ibus-anthy (Fedora, 11) updated by petersen
Message-ID: <20090901042412.DAECB10F888@bastion2.fedora.phx.redhat.com>

petersen changed owner of ibus-anthy in Fedora devel to fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Sep  1 04:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 04:25:09 +0000
Subject: [pkgdb] ibus-anthy ownership updated
Message-ID: <20090901042509.8724510F87A@bastion2.fedora.phx.redhat.com>

Package ibus-anthy in Fedora 10 is now owned by phuang

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From awjb at fedoraproject.org  Tue Sep  1 04:27:39 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  1 Sep 2009 04:27:39 +0000 (UTC)
Subject: rpms/libopensync-plugin-synce/F-10 libopensync-plugin-synce.spec,
	1.8, 1.9
Message-ID: <20090901042739.8A31911C00EF@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libopensync-plugin-synce/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7319/F-10

Modified Files:
	libopensync-plugin-synce.spec 
Log Message:
- version upgrade



Index: libopensync-plugin-synce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-synce/F-10/libopensync-plugin-synce.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libopensync-plugin-synce.spec	25 Jul 2009 06:21:01 -0000	1.8
+++ libopensync-plugin-synce.spec	1 Sep 2009 04:27:39 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           libopensync-plugin-synce
 Epoch:          1
 Version:        0.22.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Synce plugin for libopensync to sync WM2003 devices
 
 Group:          System Environment/Libraries
@@ -47,9 +47,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/synce-plugin
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1:0.22.1-1
 - version upgrade



From davej at fedoraproject.org  Tue Sep  1 04:29:55 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  1 Sep 2009 04:29:55 +0000 (UTC)
Subject: rpms/kernel/devel/scripts rebase.sh,1.26,1.27
Message-ID: <20090901042955.3D2E511C00EF@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9117/scripts

Modified Files:
	rebase.sh 
Log Message:
finger banner changed output. this should fix it.



Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- rebase.sh	23 Feb 2009 08:12:20 -0000	1.26
+++ rebase.sh	1 Sep 2009 04:29:54 -0000	1.27
@@ -29,12 +29,12 @@ else
 fi
 
 # Is there a new snapshot or prepatch ?
-NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "snapshot for the stable"`
+NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "latest snapshot 2.6 version"`
 if [ -z "$NEW" ] ; then
-  NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"`
+  NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "latest mainline 2.6 version"`
   if [ -z "$NEW" ] ; then
     if [ "$OLDRC" -ne 0 ] ; then
-      NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"`
+      NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "latest stable 2.6." | head -n1`
     else
       echo "No new rc or git snapshot of stable branch".
       exit 0



From ausil at fedoraproject.org  Tue Sep  1 04:33:34 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 04:33:34 +0000 (UTC)
Subject: rpms/mysql-gui-tools/devel
	mysql-gui-tools-5.0r14-common-cleanup.patch, NONE,
	1.1 mysql-gui-tools-5.0r14-common.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 gtk_deprecated_typedefs.patch, 1.1,
	1.2 mysql-gui-tools-5.0_p12-gcc-4.3.patch, 1.1,
	1.2 mysql-gui-tools-5.0_p12-libsigc++-2.2.patch, 1.1,
	1.2 mysql-gui-tools-5.0r12-DEBUG.patch, 1.1,
	1.2 mysql-gui-tools-gtksourceview-cflags.patch, 1.1,
	1.2 mysql-gui-tools.spec, 1.14,
	1.15 mysql-query-browser-default_schema_infinite_loop.patch, 1.1,
	1.2 sources, 1.3, 1.4
Message-ID: <20090901043334.B093E11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-gui-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11607

Modified Files:
	.cvsignore gtk_deprecated_typedefs.patch 
	mysql-gui-tools-5.0_p12-gcc-4.3.patch 
	mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 
	mysql-gui-tools-5.0r12-DEBUG.patch 
	mysql-gui-tools-gtksourceview-cflags.patch 
	mysql-gui-tools.spec 
	mysql-query-browser-default_schema_infinite_loop.patch sources 
Added Files:
	mysql-gui-tools-5.0r14-common-cleanup.patch 
	mysql-gui-tools-5.0r14-common.patch 
Log Message:
update to mysql-gui-tools 5.0r14


mysql-gui-tools-5.0r14-common-cleanup.patch:
 administrator/source/mac/MySQL Administrator.xcodeproj/kojima.pbxuser                                   |   44 
 administrator/source/mac/MySQL Administrator.xcodeproj/project.pbxproj                                  |    6 
 mysql-gui-tools-5.0r14/administrator/README.MacOSX                                                      |    6 
 mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesCommercial.cmd                                  |    2 
 mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesDebug.cmd                                       |    4 
 mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesRelease.cmd                                     |    4 
 mysql-gui-tools-5.0r14/administrator/configure.in                                                       |    6 
 mysql-gui-tools-5.0r14/administrator/extract_pot.sh                                                     |    2 
 mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.sln                              |    4 
 mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.vcproj                           |   16 
 mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibraryTests.sln                         |    2 
 mysql-gui-tools-5.0r14/administrator/library/libmysqladmin.bdsproj                                      |   10 
 mysql-gui-tools-5.0r14/administrator/library/libmysqladmin_static.bdsproj                               |   10 
 mysql-gui-tools-5.0r14/administrator/library/source/Makefile.am                                         |    8 
 mysql-gui-tools-5.0r14/administrator/mysql-administrator.spec.in                                        |    6 
 mysql-gui-tools-5.0r14/administrator/po/Makefile.in.in                                                  |    4 
 mysql-gui-tools-5.0r14/administrator/po/update.sh                                                       |    2 
 mysql-gui-tools-5.0r14/administrator/res/FAQ                                                            |    2 
 mysql-gui-tools-5.0r14/administrator/setup/windows/Makefile.mak                                         |    2 
 mysql-gui-tools-5.0r14/administrator/setup/windows/source/mysql_administrator.xml                       |   36 
 mysql-gui-tools-5.0r14/administrator/source/linux/Makefile.am                                           |   16 
 mysql-gui-tools-5.0r14/administrator/source/util/Makefile.am                                            |   12 
 mysql-gui-tools-5.0r14/administrator/testing/test-application/Makefile                                  |    2 
 mysql-gui-tools-5.0r14/common/README.translating                                                        |    6 
 mysql-gui-tools-5.0r14/common/build/MakePoConcat.cmd                                                    |    2 
 mysql-gui-tools-5.0r14/common/build/MakePoLinux.cmd                                                     |    2 
 mysql-gui-tools-5.0r14/common/build/UpdateTranslations.cmd                                              |    2 
 mysql-gui-tools-5.0r14/common/confdefs.h                                                                |    2 
 mysql-gui-tools-5.0r14/common/configure.in                                                              |    2 
 mysql-gui-tools-5.0r14/common/extract_pot.sh                                                            |    6 
 mysql-gui-tools-5.0r14/common/library/base-library/libmysqlx_static.bdsproj                             |   10 
 mysql-gui-tools-5.0r14/common/library/generic-canvas/ftgl/ftgl_static_lib.bdsproj                       |    8 
 mysql-gui-tools-5.0r14/common/library/generic-canvas/ftgl/mac/FTGL.xcodeproj/kojima.perspective         |    2 
 mysql-gui-tools-5.0r14/common/library/generic-canvas/ftgl/win32_vcpp/ftgl.suo                           |binary
 mysql-gui-tools-5.0r14/common/library/generic-canvas/libmysqlgc.bdsproj                                 |    4 
 mysql-gui-tools-5.0r14/common/library/grt-modules/MySQLGrtBuiltinModuleLibrary.vcproj                   |    2 
 mysql-gui-tools-5.0r14/common/library/grt-wb-controller/MySQLGrtWorkbenchLibrary.vcproj                 |    8 
 mysql-gui-tools-5.0r14/common/library/mysql-resultset/MySQLSqlResultset.vcproj                          |    6 
 mysql-gui-tools-5.0r14/common/library/mysql-resultset/libmysqlgc.bdsproj                                |    4 
 mysql-gui-tools-5.0r14/common/library/sql-parser/bison.bat                                              |    2 
 mysql-gui-tools-5.0r14/common/library/sql-parser/source/myx_sql_parser.tab.cc                           | 3260 +++++-----
 mysql-gui-tools-5.0r14/common/library/sql-parser/test/test.vcproj                                       |    2 
 mysql-gui-tools-5.0r14/common/library/utilities/libmysqlutil_static.bdsproj                             |   10 
 mysql-gui-tools-5.0r14/common/po/de.po                                                                  |    2 
 mysql-gui-tools-5.0r14/common/po/ja.po                                                                  |    2 
 mysql-gui-tools-5.0r14/common/po/pt_BR.po                                                               |    2 
 mysql-gui-tools-5.0r14/common/res/grt/php.ini                                                           |    2 
 mysql-gui-tools-5.0r14/common/res/how_to_translate.txt                                                  |    2 
 mysql-gui-tools-5.0r14/common/source/linux/MGConnectDialog.cc                                           |    2 
 mysql-gui-tools-5.0r14/common/source/linux/MGConnectDialog.cc.sigc++                                    |    2 
 mysql-gui-tools-5.0r14/common/source/mac/GenericCanvas/GenericCanvas.xcodeproj/kojima.perspective       |    2 
 mysql-gui-tools-5.0r14/common/source/mac/MySQLGRT/MySQLGRT.xcodeproj/kojima.perspective                 |    2 
 mysql-gui-tools-5.0r14/common/source/mac/MySQLGUICommon.xcodeproj/kojima.mode1                          |    2 
 mysql-gui-tools-5.0r14/common/source/mac/MySQLGUICommon.xcodeproj/kojima.pbxuser                        |   12 
 mysql-gui-tools-5.0r14/common/source/mac/MySQLGUICommon.xcodeproj/kojima.perspective                    |    2 
 mysql-gui-tools-5.0r14/common/source/mac/WBCanvas/WBCanvas.xcodeproj/kojima.pbxuser                     |    4 
 mysql-gui-tools-5.0r14/common/source/mac/WBCanvas/WBCanvas.xcodeproj/kojima.perspective                 |    2 
 mysql-gui-tools-5.0r14/common/source/windows/GenericCanvasTestframe/CanvasTest.bdsproj                  |    4 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.bdsproj                                      |    2 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.cfg                                          |    8 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.dof                                          |   16 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.dpr                                          |    6 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShDebug.cfg                                     |    8 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShDebug.dof                                     |   16 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShRelease.cfg                                   |    8 
 mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShRelease.dof                                   |   16 
 mysql-gui-tools-5.0r14/common/tools/grtsh/grtsh.bdsproj                                                 |   10 
 mysql-gui-tools-5.0r14/migration-tool/build/MakeGrtShellDebug.bat                                       |    4 
 mysql-gui-tools-5.0r14/migration-tool/build/MakeGrtShellRelease.bat                                     |    4 
 mysql-gui-tools-5.0r14/migration-tool/build/MakeLua.bat                                                 |    2 
 mysql-gui-tools-5.0r14/migration-tool/build/MakePhp.bat                                                 |    4 
 mysql-gui-tools-5.0r14/migration-tool/build/MakeResources.bat                                           |    2 
 mysql-gui-tools-5.0r14/migration-tool/build/MakeXGrtShellRelease.bat                                    |    4 
 mysql-gui-tools-5.0r14/migration-tool/build/PreparePhpCode.bat                                          |    4 
 mysql-gui-tools-5.0r14/migration-tool/build_mt_script.sh                                                |   16 
 mysql-gui-tools-5.0r14/migration-tool/make_grtjar.sh                                                    |    2 
 mysql-gui-tools-5.0r14/migration-tool/setup/windows/Makefile.mak                                        |    2 
 mysql-gui-tools-5.0r14/migration-tool/setup/windows/source/mysql_migration_toolkit.xml                  |   36 
 mysql-gui-tools-5.0r14/migration-tool/source/agent/Makefile                                             |    6 
 mysql-gui-tools-5.0r14/migration-tool/source/linux/Makefile                                             |   14 
 mysql-gui-tools-5.0r14/query-browser/build/CopyLibrariesCommercial.bat                                  |    2 
 mysql-gui-tools-5.0r14/query-browser/build/CopyLibrariesDebug.bat                                       |    4 
 mysql-gui-tools-5.0r14/query-browser/build/CopyLibrariesRelease.bat                                     |    4 
 mysql-gui-tools-5.0r14/query-browser/configure.in                                                       |    6 
 mysql-gui-tools-5.0r14/query-browser/library/MySQLQueryBrowserLibrary.sln                               |    4 
 mysql-gui-tools-5.0r14/query-browser/library/MySQLQueryBrowserLibrary.vcproj                            |   32 
 mysql-gui-tools-5.0r14/query-browser/library/MySQLQueryBrowserLibraryTests.sln                          |    2 
 mysql-gui-tools-5.0r14/query-browser/library/libmysqlqb.bdsproj                                         |   10 
 mysql-gui-tools-5.0r14/query-browser/library/source/Makefile.am                                         |    8 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/Makefile.am                       |    8 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test.bat                          |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test.sh                           |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test_query_analyze.vcproj         |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/Makefile.am                   |    8 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test.bat                      |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test.sh                       |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test_query_composition.vcproj |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/Makefile.am                           |    8 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test.bat                              |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test.sh                               |    2 
 mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test_strip_sql.vcproj                 |    2 
 mysql-gui-tools-5.0r14/query-browser/mysql-query-browser.spec.in                                        |    6 
 mysql-gui-tools-5.0r14/query-browser/po/update.sh                                                       |    2 
 mysql-gui-tools-5.0r14/query-browser/setup/windows/Makefile.mak                                         |    2 
 mysql-gui-tools-5.0r14/query-browser/setup/windows/source/mysql_query_browser.xml                       |   36 
 mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am                                           |   16 
 query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser                                    |   26 
 query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj                                   |   16 
 108 files changed, 1999 insertions(+), 1999 deletions(-)

--- NEW FILE mysql-gui-tools-5.0r14-common-cleanup.patch ---
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesCommercial.cmd mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesCommercial.cmd
--- mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesCommercial.cmd	2008-09-12 09:55:30.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesCommercial.cmd	2009-08-31 22:54:59.000000000 -0500
@@ -2,7 +2,7 @@
 @echo off
 
 echo Building commercial libraries...
-copy ..\..\mysql-gui-common\library\Lib_Commercial\libmysqlx.dll ..\bin\windows\libmysqlx.dll
+copy ..\..\common\library\Lib_Commercial\libmysqlx.dll ..\bin\windows\libmysqlx.dll
 copy ..\library\Lib_Commercial\libmysqladmin.dll ..\bin\windows\libmysqladmin.dll
 
 if exist ..\bin\windows\msvcr71d.dll del ..\bin\windows\msvcr71d.dll
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesDebug.cmd mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesDebug.cmd
--- mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesDebug.cmd	2008-09-12 09:55:30.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesDebug.cmd	2009-08-31 22:54:59.000000000 -0500
@@ -1,8 +1,8 @@
 REM CommandInterpreter: $(COMSPEC)
 @echo off
 
-copy ..\..\mysql-gui-common\library\Lib_Debug\libmysqlx.dll ..\bin\windows\libmysqlx.dll
-copy ..\..\mysql-gui-common\library_util\Lib_Debug\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
+copy ..\..\common\library\Lib_Debug\libmysqlx.dll ..\bin\windows\libmysqlx.dll
+copy ..\..\common\library_util\Lib_Debug\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
 copy ..\library\Lib_Debug\libmysqladmin.dll ..\bin\windows\libmysqladmin.dll
 
 if exist ..\bin\windows\msvcr71.dll del ..\bin\windows\msvcr71.dll
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesRelease.cmd mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesRelease.cmd
--- mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesRelease.cmd	2008-09-12 09:55:30.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesRelease.cmd	2009-08-31 22:54:59.000000000 -0500
@@ -2,8 +2,8 @@
 @echo off
 
 echo Building release libraries...
-copy ..\..\mysql-gui-common\library\Lib_Release\libmysqlx.dll ..\bin\windows\libmysqlx.dll
-copy ..\..\mysql-gui-common\library_util\Lib_Release\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
+copy ..\..\common\library\Lib_Release\libmysqlx.dll ..\bin\windows\libmysqlx.dll
+copy ..\..\common\library_util\Lib_Release\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
 copy ..\library\Lib_Release\libmysqladmin.dll ..\bin\windows\libmysqladmin.dll
 
 if exist ..\bin\windows\msvcr71d.dll del ..\bin\windows\msvcr71d.dll
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/configure.in mysql-gui-tools-5.0r14/administrator/configure.in
--- mysql-gui-tools-5.0r14-orig/administrator/configure.in	2009-08-31 22:33:39.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/configure.in	2009-08-31 22:54:59.000000000 -0500
@@ -20,10 +20,10 @@
 # internal libraries
 #
 AC_CHECK_FILE(../common/library/base-library, [],
-	        AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program]))
+	        AC_MSG_ERROR([common source tree must be present in the same directory as this program]))
 
-#AC_CHECK_FILE(../mysql-gui-common/source/linux/libmacommongui.a, [],
-#	AC_MSG_ERROR([mysql-gui-common source tree must be compiled and present in the same directory as this program]))
+#AC_CHECK_FILE(../common/source/linux/libmacommongui.a, [],
+#	AC_MSG_ERROR([common source tree must be compiled and present in the same directory as this program]))
 
 
 #
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/extract_pot.sh mysql-gui-tools-5.0r14/administrator/extract_pot.sh
--- mysql-gui-tools-5.0r14-orig/administrator/extract_pot.sh	2008-09-12 09:57:41.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/extract_pot.sh	2009-08-31 22:55:02.000000000 -0500
@@ -2,7 +2,7 @@
 
 FILES="glade_files.c source/linux/*c library/source/*c"
 
-python ../mysql-gui-common/tools/po_glade.py res/linux/*.glade > glade_files.c
+python ../common/tools/po_glade.py res/linux/*.glade > glade_files.c
 
 xgettext --default-domain=mysql-administrator\
 	--add-comments --keyword=_ --keyword=N_ $FILES \
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin.bdsproj mysql-gui-tools-5.0r14/administrator/library/libmysqladmin.bdsproj
--- mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin.bdsproj	2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/libmysqladmin.bdsproj	2009-08-31 22:55:02.000000000 -0500
@@ -214,7 +214,7 @@
           <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\..\administrator-1.1\library\source"/>
           <property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="source"/>
           <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
-          <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.J.enabled" value="0"/>
@@ -232,13 +232,13 @@
           <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\..\administrator-1.1\library\source"/>
           <property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="source"/>
           <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
-          <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\..\administrator-1.1\library\source"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="source"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
-          <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\..\administrator-1.1\library\source"/>
@@ -252,7 +252,7 @@
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\..\administrator-1.1\library\source"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="source"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
-          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
           <property category="win32.*.win32b.ilink32" name="container.SelectedWarnings.containerenabled" value="1"/>
@@ -291,7 +291,7 @@
           <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\..\administrator-1.1\library\source"/>
           <property category="win32.*.win32b.ilink32" name="option.j.arg.2" value="source"/>
           <property category="win32.*.win32b.ilink32" name="option.j.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
-          <property category="win32.*.win32b.ilink32" name="option.j.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.ilink32" name="option.j.arg.4" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
           <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
           <property category="win32.*.win32b.ilink32" name="option.l.arg.1" value="intermediate"/>
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin_static.bdsproj mysql-gui-tools-5.0r14/administrator/library/libmysqladmin_static.bdsproj
--- mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin_static.bdsproj	2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/libmysqladmin_static.bdsproj	2009-08-31 22:55:02.000000000 -0500
@@ -175,7 +175,7 @@
           <property category="win32.*.win32b.dcc32" name="option.GS.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="source"/>
           <property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="D:\Work\MySQL\administrator\library"/>
-          <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.J.enabled" value="0"/>
@@ -192,12 +192,12 @@
           <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="source"/>
           <property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="D:\Work\MySQL\administrator\library"/>
-          <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="source"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="D:\Work\MySQL\administrator\library"/>
-          <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
           <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
           <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="source"/>
@@ -209,7 +209,7 @@
           <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="source"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="D:\Work\MySQL\administrator\library"/>
-          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
           <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
           <property category="win32.*.win32b.ilink32" name="container.SelectedWarnings.containerenabled" value="1"/>
@@ -231,7 +231,7 @@
           <property category="win32.*.win32b.ilink32" name="option.aa.enabled" value="0"/>
           <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="0"/>
           <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
-          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="V:\MySQL\common\source\grtsh"/>
           <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
           <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
           <property category="win32.*.win32b.ilink32" name="option.m.enabled" value="0"/>
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.sln mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.sln
--- mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.sln	2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.sln	2009-08-31 22:55:02.000000000 -0500
@@ -4,12 +4,12 @@
 		{6FBC86A7-892F-47C5-B62E-7304AB98DA29} = {6FBC86A7-892F-47C5-B62E-7304AB98DA29}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\mysql-gui-common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
 	ProjectSection(ProjectDependencies) = postProject
 		{142530C4-B184-4833-9A1A-F268B6E336A7} = {142530C4-B184-4833-9A1A-F268B6E336A7}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLUtilLibrary", "..\..\mysql-gui-common\library_util\MySQLUtilLibrary.vcproj", "{142530C4-B184-4833-9A1A-F268B6E336A7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLUtilLibrary", "..\..\common\library_util\MySQLUtilLibrary.vcproj", "{142530C4-B184-4833-9A1A-F268B6E336A7}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibraryTests.sln mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibraryTests.sln
--- mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibraryTests.sln	2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibraryTests.sln	2009-08-31 22:55:02.000000000 -0500
@@ -3,7 +3,7 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\mysql-gui-common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.vcproj mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.vcproj
--- mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.vcproj	2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.vcproj	2009-08-31 22:55:02.000000000 -0500
@@ -122,7 +122,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="include;&quot;..\..\mysql-gui-common\library\include&quot;;&quot;..\..\mysql-gui-common\library_util\include&quot;;&quot;..\..\mysql-gui-common\library_util\shared_include&quot;;&quot;..\..\mysql-gui-win-res\include&quot;;&quot;..\..\mysql-gui-win-res\include\mysql&quot;;&quot;..\..\mysql-gui-win-res\include\windows&quot;;&quot;..\..\mysql-gui-win-res\include\libxml&quot;;&quot;..\..\mysql-gui-win-res\include\glib-2.0&quot;;&quot;..\..\mysql-gui-win-res\include\pcre&quot;"
+				AdditionalIncludeDirectories="include;&quot;..\..\common\library\include&quot;;&quot;..\..\common\library_util\include&quot;;&quot;..\..\common\library_util\shared_include&quot;;&quot;..\..\mysql-gui-win-res\include&quot;;&quot;..\..\mysql-gui-win-res\include\mysql&quot;;&quot;..\..\mysql-gui-win-res\include\windows&quot;;&quot;..\..\mysql-gui-win-res\include\libxml&quot;;&quot;..\..\mysql-gui-win-res\include\glib-2.0&quot;;&quot;..\..\mysql-gui-win-res\include\pcre&quot;"
[...15286 lines suppressed...]
+    <Binary Id="NewBinary13" src="../../../common/setup/windows/resources/binary/binary13" />
+    <Binary Id="NewBinary14" src="../../../common/setup/windows/resources/binary/binary14" />
+    <Binary Id="NewBinary15" src="../../../common/setup/windows/resources/binary/binary15" />    
+    <Binary Id="NewBinary16" src="../../../common/setup/windows/resources/binary/binary16" />
+    <Binary Id="NewBinary17" src="../../../common/setup/windows/resources/binary/binary17" />
+    <Binary Id="NewBinary18" src="../../../common/setup/windows/resources/binary/binary18" />
   </Product>
 </Wix>
diff -uNr mysql-gui-tools-5.0r14-orig/query-browser/source/linux/Makefile.am mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am
--- mysql-gui-tools-5.0r14-orig/query-browser/source/linux/Makefile.am	2009-08-31 22:33:39.000000000 -0500
+++ mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am	2009-08-31 22:54:30.000000000 -0500
@@ -35,10 +35,10 @@
 
 
 INCLUDES=@GNOME_CFLAGS@ @MYSQL_CFLAGS@ @PCRE_CFLAGS@\
-        -I$(top_srcdir)/../mysql-gui-common/source/linux\
-        -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\
-        -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\
-        -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\
+        -I$(top_srcdir)/../common/source/linux\
+        -I$(top_srcdir)/../common/library/base-library/include\
+        -I$(top_srcdir)/../common/library/utilities/shared_include\
+        -I$(top_srcdir)/../common/library/utilities/include\
         -I$(top_srcdir)/library/include\
 	-I$(top_srcdir)/source/linux/gtksourceview\
 	-DPREFIX=\""$(PREFIX)"\"\
@@ -48,10 +48,10 @@
 
 
 mysql_query_browser_bin_LDADD=$(top_builddir)/library/source/libqb.a\
-	$(top_builddir)/../mysql-gui-common/source/linux/libqbcommongui.a\
-	$(top_builddir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\
-	$(top_builddir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\
-	$(top_builddir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\
+	$(top_builddir)/../common/source/linux/libqbcommongui.a\
+	$(top_builddir)/../common/library/base-library/source/.libs/libmysqlx.a\
+	$(top_builddir)/../common/library/utilities/source/.libs/libguiutil.a\
+	$(top_builddir)/../common/library/sql-parser/source/.libs/libsqlparser.a\
 	$(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a\
         @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@ 
 
diff -uNr mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser
--- mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser	2006-09-11 09:07:23.000000000 -0500
+++ mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser	2009-08-31 22:54:32.000000000 -0500
@@ -564,7 +564,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.cpp.objcpp;
 		name = MQResultSetView.mm;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/ResultSet/MQResultSetView.mm";
+		path = "/Users/kojima/Development/common/source/mac/ResultSet/MQResultSetView.mm";
 		sourceTree = "<absolute>";
 	};
 	2B1F35D908848FB700455FC3 /* PBXTextBookmark */ = {
@@ -1065,7 +1065,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MTableEditor.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTableEditor.m";
+		path = "/Users/kojima/Development/common/source/mac/MTableEditor.m";
 		sourceTree = "<absolute>";
 	};
 	2B682F030AB5A41400389BA0 /* PBXTextBookmark */ = {
@@ -1229,7 +1229,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MSourceLayoutManager.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/SourceEditor/MSourceLayoutManager.m";
+		path = "/Users/kojima/Development/common/source/mac/SourceEditor/MSourceLayoutManager.m";
 		sourceTree = "<absolute>";
 	};
 	2B8328AF085FE4CE00D8BEB0 /* PBXTextBookmark */ = {
@@ -1246,7 +1246,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MSourceLayoutManager.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/SourceEditor/MSourceLayoutManager.m";
+		path = "/Users/kojima/Development/common/source/mac/SourceEditor/MSourceLayoutManager.m";
 		sourceTree = "<absolute>";
 	};
 	2B8328BD085FE50000D8BEB0 /* PBXTextBookmark */ = {
@@ -1290,14 +1290,14 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.c;
 		name = myx_library.c;
-		path = "/Users/kojima/Development/mysql-gui-common/library/source/myx_library.c";
+		path = "/Users/kojima/Development/common/library/source/myx_library.c";
 		sourceTree = "<absolute>";
 	};
 	2B8C4B2A083C158500A72366 /* MTableEditor.m */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MTableEditor.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTableEditor.m";
+		path = "/Users/kojima/Development/common/source/mac/MTableEditor.m";
 		sourceTree = "<absolute>";
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1140, 23988}}";
@@ -1319,7 +1319,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MSchemaDataSource.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MSchemaDataSource.m";
+		path = "/Users/kojima/Development/common/source/mac/MSchemaDataSource.m";
 		sourceTree = "<absolute>";
 	};
 	2B8C4C34083C36C100A72366 /* PBXTextBookmark */ = {
@@ -1346,7 +1346,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MSchemaDataSource.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MSchemaDataSource.m";
+		path = "/Users/kojima/Development/common/source/mac/MSchemaDataSource.m";
 		sourceTree = "<absolute>";
 	};
 	2B8C4CB1083C47EA00A72366 /* PBXTextBookmark */ = {
@@ -1435,7 +1435,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MTextImageCell.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTextImageCell.m";
+		path = "/Users/kojima/Development/common/source/mac/MTextImageCell.m";
 		sourceTree = "<absolute>";
 	};
 	2B8FAC6B082B8CA600D63986 /* PBXTextBookmark */ = {
@@ -1452,7 +1452,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MTextImageCell.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTextImageCell.m";
+		path = "/Users/kojima/Development/common/source/mac/MTextImageCell.m";
 		sourceTree = "<absolute>";
 	};
 	2B8FB08E082D704100D63986 /* MQRSSearchPanel.h */ = {
@@ -1810,7 +1810,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MMenuButton.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/MMenuButton.m";
+		path = "/Users/kojima/Development/common/source/mac/MMenuButton.m";
 		sourceTree = "<absolute>";
 	};
 	2BB542490858A8D8007DA3B2 /* PBXTextBookmark */ = {
@@ -2620,7 +2620,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.objc;
 		name = MSyntaxColoring.m;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/SourceEditor/MSyntaxColoring.m";
+		path = "/Users/kojima/Development/common/source/mac/SourceEditor/MSyntaxColoring.m";
 		sourceTree = "<absolute>";
 	};
 	2BDF71BF08E0A43900088236 /* PBXTextBookmark */ = {
@@ -2637,7 +2637,7 @@
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.cpp.objcpp;
 		name = MQResultSetView.mm;
-		path = "/Users/kojima/Development/mysql-gui-common/source/mac/ResultSet/MQResultSetView.mm";
+		path = "/Users/kojima/Development/common/source/mac/ResultSet/MQResultSetView.mm";
 		sourceTree = "<absolute>";
 	};
 	2BE8B26C0815F81C00E73770 /* MQHistory.h */ = {
diff -uNr mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj
--- mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj	2006-12-13 08:11:59.000000000 -0600
+++ mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj	2009-08-31 22:54:32.000000000 -0500
@@ -331,7 +331,7 @@
 		2B8FA936082A73F900D63986 /* sbar_unsplitv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sbar_unsplitv.png; path = ../../images/png/sbar_unsplitv.png; sourceTree = SOURCE_ROOT; };
 		2B8FB08E082D704100D63986 /* MQRSSearchPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MQRSSearchPanel.h; sourceTree = "<group>"; };
 		2B8FB08F082D704100D63986 /* MQRSSearchPanel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MQRSSearchPanel.m; sourceTree = "<group>"; };
-		2B8FB093082D706400D63986 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "../../../mysql-gui-common/res/mac/English.lproj/RSSearchPanel.nib"; sourceTree = SOURCE_ROOT; };
+		2B8FB093082D706400D63986 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "../../../common/res/mac/English.lproj/RSSearchPanel.nib"; sourceTree = SOURCE_ROOT; };
 		2B8FB4EB0830EEDE00D63986 /* tabsheet_icon_inlinehelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_inlinehelp.png; path = ../../images/png/tabsheet_icon_inlinehelp.png; sourceTree = SOURCE_ROOT; };
 		2B8FB4EC0830EEDE00D63986 /* tabsheet_icon_resultset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_resultset.png; path = ../../images/png/tabsheet_icon_resultset.png; sourceTree = SOURCE_ROOT; };
 		2B8FB4ED0830EEDE00D63986 /* tabsheet_icon_script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_script.png; path = ../../images/png/tabsheet_icon_script.png; sourceTree = SOURCE_ROOT; };
@@ -353,8 +353,8 @@
 		2B8FB83708342EB000D63986 /* rs_search_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_search_disabled.png; path = ../../images/png/rs_search_disabled.png; sourceTree = SOURCE_ROOT; };
 		2B8FB83808342EB000D63986 /* rs_search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_search.png; path = ../../images/png/rs_search.png; sourceTree = SOURCE_ROOT; };
 		2B8FB83908342EB000D63986 /* rs_warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_warning.png; path = ../../images/png/rs_warning.png; sourceTree = SOURCE_ROOT; };
-		2B8FB8670834308A00D63986 /* 16x16_Catalog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Catalog.png; path = "../../../mysql-gui-common/images/png/16x16_Catalog.png"; sourceTree = SOURCE_ROOT; };
-		2B8FB875083430D100D63986 /* 16x16_Field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Field.png; path = "../../../mysql-gui-common/images/png/16x16_Field.png"; sourceTree = SOURCE_ROOT; };
+		2B8FB8670834308A00D63986 /* 16x16_Catalog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Catalog.png; path = "../../../common/images/png/16x16_Catalog.png"; sourceTree = SOURCE_ROOT; };
+		2B8FB875083430D100D63986 /* 16x16_Field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Field.png; path = "../../../common/images/png/16x16_Field.png"; sourceTree = SOURCE_ROOT; };
 		2B9973360A64A03E00649D58 /* libintl.3.4.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.3.4.3.dylib; path = /Users/vlad/sw/lib/libintl.3.4.3.dylib; sourceTree = "<absolute>"; };
 		2B9973BC0A64AF0200649D58 /* libglib-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libglib-2.0.0.dylib"; path = "/uni/lib/libglib-2.0.0.dylib"; sourceTree = "<absolute>"; };
 		2B9C8E710853B05900C16483 /* MQHelpTab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQHelpTab.h; sourceTree = "<group>"; };
@@ -402,11 +402,11 @@
 		2BC7D7E807F47A7100CB83E9 /* MQBookmark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQBookmark.m; sourceTree = "<group>"; };
 		2BC9F969085F7A6F00949574 /* MQPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQPreferences.h; sourceTree = "<group>"; };
 		2BC9F96A085F7A6F00949574 /* MQPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQPreferences.m; sourceTree = "<group>"; };
-		2BCEDE3807DBFC9400F9482E /* 16x16_KeyColumn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_KeyColumn.png; path = "../../../mysql-gui-common/images/png/16x16_KeyColumn.png"; sourceTree = SOURCE_ROOT; };
-		2BCEDE4507DBFCBF00F9482E /* myx_schema_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_16x16.png"; sourceTree = SOURCE_ROOT; };
-		2BCEDE4607DBFCBF00F9482E /* myx_schema_sp_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_sp_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_sp_16x16.png"; sourceTree = SOURCE_ROOT; };
-		2BCEDE4707DBFCBF00F9482E /* myx_schema_table_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_table_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_table_16x16.png"; sourceTree = SOURCE_ROOT; };
-		2BCEDE4807DBFCBF00F9482E /* myx_schema_view_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_view_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_view_16x16.png"; sourceTree = SOURCE_ROOT; };
+		2BCEDE3807DBFC9400F9482E /* 16x16_KeyColumn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_KeyColumn.png; path = "../../../common/images/png/16x16_KeyColumn.png"; sourceTree = SOURCE_ROOT; };
+		2BCEDE4507DBFCBF00F9482E /* myx_schema_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_16x16.png; path = "../../../common/images/icons/png/myx_schema_16x16.png"; sourceTree = SOURCE_ROOT; };
+		2BCEDE4607DBFCBF00F9482E /* myx_schema_sp_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_sp_16x16.png; path = "../../../common/images/icons/png/myx_schema_sp_16x16.png"; sourceTree = SOURCE_ROOT; };
+		2BCEDE4707DBFCBF00F9482E /* myx_schema_table_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_table_16x16.png; path = "../../../common/images/icons/png/myx_schema_table_16x16.png"; sourceTree = SOURCE_ROOT; };
+		2BCEDE4807DBFCBF00F9482E /* myx_schema_view_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_view_16x16.png; path = "../../../common/images/icons/png/myx_schema_view_16x16.png"; sourceTree = SOURCE_ROOT; };
 		2BD9ABF4085E417E00DF65E9 /* mysqlqb_functions.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = mysqlqb_functions.xml; path = ../../res/mysqlqb_functions.xml; sourceTree = SOURCE_ROOT; };
 		2BD9ABF5085E417E00DF65E9 /* mysqlqb_statements.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = mysqlqb_statements.xml; path = ../../res/mysqlqb_statements.xml; sourceTree = SOURCE_ROOT; };
 		2BD9AD7C085E701400DF65E9 /* mysqlqb_functions.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; name = mysqlqb_functions.html; path = ../../res/doc/mysqlqb_functions.html; sourceTree = SOURCE_ROOT; };

mysql-gui-tools-5.0r14-common.patch:
 administrator/configure.in |    2 +-
 query-browser/configure.in |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE mysql-gui-tools-5.0r14-common.patch ---
--- mysql-gui-tools-5.0r14/administrator/configure.in.BAD	2009-08-31 11:55:53.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/configure.in	2009-08-31 11:56:57.000000000 -0500
@@ -19,7 +19,7 @@
 #
 # internal libraries
 #
-AC_CHECK_FILE(../mysql-gui-common/library/base-library, [],
+AC_CHECK_FILE(../common/library/base-library, [],
 	        AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program]))
 
 #AC_CHECK_FILE(../mysql-gui-common/source/linux/libmacommongui.a, [],
--- mysql-gui-tools-5.0r14/query-browser/configure.in.BAD	2009-08-31 11:57:25.000000000 -0500
+++ mysql-gui-tools-5.0r14/query-browser/configure.in	2009-08-31 16:11:28.000000000 -0500
@@ -17,8 +17,8 @@
 #
 # internal libraries
 #
-AC_CHECK_FILE(../mysql-gui-common/library/base-library/include, 
-        [MYSQLA_INCLUDE='-I$(top_srcdir)/../mysql-gui-common/library/base-library/include -I$(top_srcdir)/../mysql-gui-common/source/linux'],
+AC_CHECK_FILE(../common/library/base-library/include, 
+        [MYSQLA_INCLUDE='-I$(top_srcdir)/../common/library/base-library/include -I$(top_srcdir)/../common/source/linux'],
 	        AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program]))
 
 #AC_CHECK_FILE(../mysql-gui-common/source/linux/libqbcommongui.a, [],
@@ -73,6 +73,7 @@
 PKG_CHECK_MODULES(GNOME, [libglade-2.0
 			gthread-2.0
 			libxml-2.0 >= 2.6.2
+                        libgnome-2.0
                         $gtkhtml
                         gtkmm-2.4])
 AC_SUBST(GNOME_CFLAGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jun 2007 18:42:28 -0000	1.3
+++ .cvsignore	1 Sep 2009 04:33:33 -0000	1.4
@@ -1 +1 @@
-mysql-gui-tools-5.0r12.tar.gz
+mysql-gui-tools-5.0r14.tar.gz

gtk_deprecated_typedefs.patch:
 Makefile.in |    2 --
 1 file changed, 2 deletions(-)

Index: gtk_deprecated_typedefs.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/gtk_deprecated_typedefs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk_deprecated_typedefs.patch	15 Sep 2008 17:55:15 -0000	1.1
+++ gtk_deprecated_typedefs.patch	1 Sep 2009 04:33:33 -0000	1.2
@@ -1,6 +1,6 @@
-diff -NaurEbBH mysql-gui-tools-5.0r12.ORIG/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
---- mysql-gui-tools-5.0r12.ORIG/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in	2008-09-15 03:03:13.000000000 +0400
-+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in	2008-09-15 12:28:00.000000000 +0400
+diff -NaurEbBH mysql-gui-tools-5.0r14.ORIG/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in mysql-gui-tools-5.0r14/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
+--- mysql-gui-tools-5.0r14.ORIG/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in	2008-09-15 03:03:13.000000000 +0400
++++ mysql-gui-tools-5.0r14/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in	2008-09-15 12:28:00.000000000 +0400
 @@ -202,8 +202,6 @@
  INCLUDES = \
  	-DDATADIR=\""$(datadir)"\" 	\

mysql-gui-tools-5.0_p12-gcc-4.3.patch:
 common/source/linux/MGFileBrowserList.cc    |    1 +
 common/source/linux/MGHMeterGraphPlotter.cc |    1 +
 query-browser/source/linux/MGCodeEditor.cc  |    1 +
 3 files changed, 3 insertions(+)

Index: mysql-gui-tools-5.0_p12-gcc-4.3.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-5.0_p12-gcc-4.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-5.0_p12-gcc-4.3.patch	8 Jul 2008 19:46:55 -0000	1.1
+++ mysql-gui-tools-5.0_p12-gcc-4.3.patch	1 Sep 2009 04:33:33 -0000	1.2
@@ -1,7 +1,7 @@
-Index: mysql-gui-common/source/linux/MGFileBrowserList.cc
+Index: common/source/linux/MGFileBrowserList.cc
 ===================================================================
---- mysql-gui-common/source/linux/MGFileBrowserList.cc	(revision 2059)
-+++ mysql-gui-common/source/linux/MGFileBrowserList.cc	(working copy)
+--- common/source/linux/MGFileBrowserList.cc	(revision 2059)
++++ common/source/linux/MGFileBrowserList.cc	(working copy)
 @@ -20,6 +20,7 @@
  #include <unistd.h>
  #include <sys/stat.h>
@@ -10,10 +10,10 @@ Index: mysql-gui-common/source/linux/MGF
  #include <stdio.h> /* rename() in FreeBSD */
  
  
-Index: mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc
+Index: common/source/linux/MGHMeterGraphPlotter.cc
 ===================================================================
---- mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc	(revision 2059)
-+++ mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc	(working copy)
+--- common/source/linux/MGHMeterGraphPlotter.cc	(revision 2059)
++++ common/source/linux/MGHMeterGraphPlotter.cc	(working copy)
 @@ -16,6 +16,7 @@
  
  
@@ -22,10 +22,10 @@ Index: mysql-gui-common/source/linux/MGH
  
  
  
-Index: mysql-query-browser/source/linux/MGCodeEditor.cc
+Index: query-browser/source/linux/MGCodeEditor.cc
 ===================================================================
---- mysql-query-browser/source/linux/MGCodeEditor.cc	(revision 476)
-+++ mysql-query-browser/source/linux/MGCodeEditor.cc	(working copy)
+--- query-browser/source/linux/MGCodeEditor.cc	(revision 476)
++++ query-browser/source/linux/MGCodeEditor.cc	(working copy)
 @@ -16,6 +16,7 @@
  
  #include "MGCodeEditor.h"

mysql-gui-tools-5.0_p12-libsigc++-2.2.patch:
 administrator/source/linux/MABackupPanel.cc              |    2 +-
 administrator/source/linux/MACatalogsPanel.cc            |    6 +++---
 administrator/source/linux/MARestorePanel.cc             |    4 ++--
 administrator/source/linux/MAServerConnectionsPanel.h    |    2 +-
 administrator/source/linux/MAdministrator.h              |    2 +-
 common/source/linux/MGConnectDialog.cc                   |    6 +++---
 common/source/linux/MGTreeTooltip.h                      |    2 +-
 migration-tool/source/linux/GRTEnvironment.cc            |    2 +-
 migration-tool/source/linux/GRTEnvironment.h             |    4 ++--
 migration-tool/source/linux/ObjectShell.cc               |    6 +++---
 new/mysql-gui-common/library/sql-parser/source/sed885efK |only
 query-browser/source/linux/MQResultTab.h                 |    4 ++--
 12 files changed, 20 insertions(+), 20 deletions(-)

Index: mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-5.0_p12-libsigc++-2.2.patch	8 Jul 2008 19:46:55 -0000	1.1
+++ mysql-gui-tools-5.0_p12-libsigc++-2.2.patch	1 Sep 2009 04:33:33 -0000	1.2
@@ -1,5 +1,5 @@
---- old/mysql-administrator/source/linux/MABackupPanel.cc
-+++ new/mysql-administrator/source/linux/MABackupPanel.cc
+--- old/administrator/source/linux/MABackupPanel.cc
++++ new/administrator/source/linux/MABackupPanel.cc
 @@ -1282,7 +1282,7 @@
  
    if (_inst->check_connection())
@@ -9,8 +9,8 @@
                                                           (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
                                                           50);
      dlg->show();
---- old/mysql-administrator/source/linux/MACatalogsPanel.cc
-+++ new/mysql-administrator/source/linux/MACatalogsPanel.cc
+--- old/administrator/source/linux/MACatalogsPanel.cc
++++ new/administrator/source/linux/MACatalogsPanel.cc
 @@ -1488,7 +1488,7 @@
  
        _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
@@ -38,8 +38,8 @@
  
        status= (MYX_TABLE_COMMAND_STATUSES*)
          _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,
---- old/mysql-administrator/source/linux/MAdministrator.h
-+++ new/mysql-administrator/source/linux/MAdministrator.h
+--- old/administrator/source/linux/MAdministrator.h
++++ new/administrator/source/linux/MAdministrator.h
 @@ -66,7 +66,7 @@
  
      sigc::signal0<void> _signal_prefs_changed;
@@ -49,8 +49,8 @@
      bool pulse_progress();
      
      void setup_sidebar();
---- old/mysql-administrator/source/linux/MARestorePanel.cc
-+++ new/mysql-administrator/source/linux/MARestorePanel.cc
+--- old/administrator/source/linux/MARestorePanel.cc
++++ new/administrator/source/linux/MARestorePanel.cc
 @@ -728,7 +728,7 @@
    op_aborted= false;
  
@@ -69,8 +69,8 @@
                                                           (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
                                                           50);
  
---- old/mysql-administrator/source/linux/MAServerConnectionsPanel.h
-+++ new/mysql-administrator/source/linux/MAServerConnectionsPanel.h
+--- old/administrator/source/linux/MAServerConnectionsPanel.h
++++ new/administrator/source/linux/MAServerConnectionsPanel.h
 @@ -87,7 +87,7 @@
  
      Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
@@ -81,8 +81,8 @@
      int _current_page;
  
 Only in new/mysql-gui-common/library/sql-parser/source: sed885efK
---- old/mysql-gui-common/source/linux/MGConnectDialog.cc
-+++ new/mysql-gui-common/source/linux/MGConnectDialog.cc
+--- old/common/source/linux/MGConnectDialog.cc
++++ new/common/source/linux/MGConnectDialog.cc
 @@ -659,9 +659,9 @@
    // select back the original item
    ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
@@ -104,8 +104,8 @@ Only in new/mysql-gui-common/library/sql
    int rc;
    bool pinging= false;
    int myerror= 0;
---- old/mysql-gui-common/source/linux/MGTreeTooltip.h
-+++ new/mysql-gui-common/source/linux/MGTreeTooltip.h
+--- old/common/source/linux/MGTreeTooltip.h
++++ new/common/source/linux/MGTreeTooltip.h
 @@ -39,7 +39,7 @@
      
      WillShowSignal _show_signal;
@@ -115,8 +115,8 @@ Only in new/mysql-gui-common/library/sql
  
      void expose_event(GdkEventExpose *event);
      void leave_event(GdkEventCrossing *event);
---- old/mysql-migration-tool/source/linux/GRTEnvironment.cc
-+++ new/mysql-migration-tool/source/linux/GRTEnvironment.cc
+--- old/migration-tool/source/linux/GRTEnvironment.cc
++++ new/migration-tool/source/linux/GRTEnvironment.cc
 @@ -76,7 +76,7 @@
  }
  
@@ -126,8 +126,8 @@ Only in new/mysql-gui-common/library/sql
  {
    _shellOutputHandler= slot;
  
---- old/mysql-migration-tool/source/linux/GRTEnvironment.h
-+++ new/mysql-migration-tool/source/linux/GRTEnvironment.h
+--- old/migration-tool/source/linux/GRTEnvironment.h
++++ new/migration-tool/source/linux/GRTEnvironment.h
 @@ -28,7 +28,7 @@
      int _msgOffset;
      std::vector<Glib::ustring> _sourceObjectNames;
@@ -146,8 +146,8 @@ Only in new/mysql-gui-common/library/sql
  
      MYX_GRT_OBJ *get_object(const Glib::ustring &name);
      bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);
---- old/mysql-migration-tool/source/linux/ObjectShell.cc
-+++ new/mysql-migration-tool/source/linux/ObjectShell.cc
+--- old/migration-tool/source/linux/ObjectShell.cc
++++ new/migration-tool/source/linux/ObjectShell.cc
 @@ -45,7 +45,7 @@
  
    tree->set_model(_otree);
@@ -169,8 +169,8 @@ Only in new/mysql-gui-common/library/sql
    
    put_prompt();
  }
---- old/mysql-query-browser/source/linux/MQResultTab.h
-+++ new/mysql-query-browser/source/linux/MQResultTab.h
+--- old/query-browser/source/linux/MQResultTab.h
++++ new/query-browser/source/linux/MQResultTab.h
 @@ -45,7 +45,7 @@
  
        Gtk::Paned *paned;

mysql-gui-tools-5.0r12-DEBUG.patch:
 mysql-administrator |    1 +
 1 file changed, 1 insertion(+)

Index: mysql-gui-tools-5.0r12-DEBUG.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-5.0r12-DEBUG.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-5.0r12-DEBUG.patch	15 Sep 2008 18:06:24 -0000	1.1
+++ mysql-gui-tools-5.0r12-DEBUG.patch	1 Sep 2009 04:33:33 -0000	1.2
@@ -1,5 +1,5 @@
---- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/mysql-administrator.BAD	2008-09-08 08:32:19.000000000 -0500
-+++ mysql-gui-tools-5.0r12/mysql-administrator/source/linux/mysql-administrator	2008-09-08 08:32:36.000000000 -0500
+--- mysql-gui-tools-5.0r14/administrator/source/linux/mysql-administrator.BAD	2008-09-08 08:32:19.000000000 -0500
++++ mysql-gui-tools-5.0r14/administrator/source/linux/mysql-administrator	2008-09-08 08:32:36.000000000 -0500
 @@ -1,6 +1,7 @@
  #!/bin/sh
  

mysql-gui-tools-gtksourceview-cflags.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mysql-gui-tools-gtksourceview-cflags.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-gtksourceview-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-gtksourceview-cflags.patch	8 Jul 2008 19:46:55 -0000	1.1
+++ mysql-gui-tools-gtksourceview-cflags.patch	1 Sep 2009 04:33:34 -0000	1.2
@@ -1,14 +1,11 @@
---- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/Makefile.in.BAD	2008-07-08 11:20:21.000000000 -0500
-+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/Makefile.in	2008-07-08 13:25:34.000000000 -0500
-@@ -102,9 +102,9 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -D_GNU_SOURCE
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -D_GNU_SOURCE
- CXX = @CXX@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
+--- mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am.BAD	2009-08-31 11:23:41.000000000 -0500
++++ mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am	2009-08-31 11:24:01.000000000 -0500
+@@ -61,7 +61,7 @@
+ # If a solution is found, this could be removed.
+ #
+ $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a:
+-	(cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing")
++	(cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -D_GNU_SOURCE -fno-strict-aliasing")
+ 
+ clean-generic:
+ 	-make -C gtksourceview distclean


Index: mysql-gui-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mysql-gui-tools.spec	21 Aug 2009 14:35:30 -0000	1.14
+++ mysql-gui-tools.spec	1 Sep 2009 04:33:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mysql-gui-tools
-Version:        5.0r12
-Release:        13%{?dist}
+Version:        5.0r14
+Release:        1%{?dist}
 Summary:        GUI tools to manage mysql Databases
 
 Group:          Applications/Databases
@@ -9,18 +9,21 @@ URL:            http://www.mysql.com/pro
 Source0:        http://dev.mysql.com/get/Downloads/MySQLAdministrationSuite/mysql-gui-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         mysql-gui-tools-5.0r12-DEBUG.patch
-Patch1:		mysql-query-browser-default_schema_infinite_loop.patch
-Patch2:		mysql-gui-tools-5.0_p12-gcc-4.3.patch
+Patch1:         mysql-query-browser-default_schema_infinite_loop.patch
+Patch2:         mysql-gui-tools-5.0_p12-gcc-4.3.patch
 Patch3:         mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
 Patch4:         mysql-gui-tools-gtksourceview-cflags.patch
-Patch5:         gtk_deprecated_typedefs.patch
+Patch5:         mysql-gui-tools-5.0r14-common.patch
+Patch6:         gtk_deprecated_typedefs.patch
+Patch7:         mysql-gui-tools-5.0r14-common-cleanup.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils, gettext
 BuildRequires:  mesa-libGLU-devel, python-devel, autoconf, automake
-BuildRequires:  libtool, expat-devel, readline-devel
-BuildRequires:  libgnomeprint22-devel
+BuildRequires:  libtool, expat-devel, readline-devel, perl-devel
+BuildRequires:  libgnomeprint22-devel, libgnome-devel
 BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires:  automake autoconf perl(XML::Parser)
 
 Requires:       mysql-administrator, mysql-query-browser
 
@@ -74,13 +77,31 @@ at runtime
 %patch3 -p1 -b .sigc++
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+#ln -s administrator mysql-administrator
+#ln -s common mysql-gui-common
+#ln -s migration-tool mysql-migration-tool
+#ln -s query-browser mysql-query-browser
+
+# rpmlint complains that the debuginfo packages have a bunch of files with wrong eol
+# and executeable perms lets use a hammer and fix it
+find . -name "*.h" -exec chmod 644 {} \;
+find . -name "*.h" -exec sed -i 's/\r//' {} \;
+find . -name "*.cc" -exec chmod 644 {} \;
+find . -name "*.cc" -exec sed -i 's/\r//' {} \;
+find . -name "*.c" -exec chmod 644 {} \;
+find . -name "*.c" -exec sed -i 's/\r//' {} \;
+find . -name "*.cpp" -exec chmod 644 {} \;
+find . -name "*.cpp" -exec sed -i 's/\r//' {} \;
 
 %build
-pushd  mysql-gui-common
+pushd  common
+sh autogen.sh
 %configure --enable-php-modules \
         --enable-python-modules \
         --enable-readline \
-        --with-bonobo \
 %ifarch x86_64 ppc64 sparc64
         --with-java-includes=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.%{_arch}/include
 %else
@@ -89,40 +110,41 @@ pushd  mysql-gui-common
 make %{?_smp_mflags}
 popd
 
-pushd mysql-administrator
-%configure --with-bonobo
+pushd administrator
+sh autogen.sh
+%configure
 make %{?_smp_mflags}
 popd
 
-pushd mysql-query-browser
-%configure --with-gtkhtml=libgtkhtml-3.14 \
-         --with-bonobo
+pushd query-browser
+sh autogen.sh --with-gtkhtml=libgtkhtml-3.14
+%configure --with-gtkhtml=libgtkhtml-3.14
 make %{?_smp_mflags}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd mysql-gui-common
+pushd common
 chmod 644 COPYING README
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-pushd mysql-administrator
+pushd administrator
 chmod 644 COPYING
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-pushd mysql-query-browser
+pushd query-browser
 chmod 644 COPYING
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-# MySQL  use dos new line characters  that desktop file install doesnt like
-# MySQL  also use dos new line endings in there documantation files rpmlint didint like them
+# MySQL  use dos new line characters  that desktop-file-install doesn't like
+# MySQL  also use dos new line endings in there documantation files rpmlint didn't like them
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLQueryBrowser.desktop
-sed -i 's/\r//' mysql-administrator/COPYING mysql-gui-common/COPYING mysql-gui-common/README 
-sed -i 's/\r//' mysql-query-browser/COPYING 
+sed -i 's/\r//' administrator/COPYING common/COPYING common/README 
+sed -i 's/\r//' query-browser/COPYING 
 
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -150,11 +172,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc mysql-administrator/COPYING
+%doc administrator/COPYING
 
 %files -n mysql-administrator -f mysql-administrator.lang
 %defattr(-,root,root,-)
-%doc mysql-administrator/COPYING 
+%doc administrator/COPYING 
 %{_bindir}/mabackup
 %{_bindir}/mysql-administrator
 %{_bindir}/mysql-administrator-bin
@@ -164,13 +186,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mysql-gui-common
 %defattr(-,root,root,-)
-%doc mysql-gui-common/COPYING mysql-gui-common/README
+%doc gui-common/COPYING common/README
 %dir %{_datadir}/mysql-gui
 %{_datadir}/mysql-gui/common
 
 %files -n mysql-query-browser -f mysql-query-browser.lang
 %defattr(-,root,root,-)
-%doc mysql-query-browser/COPYING 
+%doc query-browser/COPYING 
 %{_bindir}/mysql-query-browser*
 %{_datadir}/applications/fedora-MySQLQueryBrowser.desktop
 %{_datadir}/mysql-gui/query-browser
@@ -178,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Dennis Gilmore <dennis at ausil.us> - 5.0r14-1
+- update to 5.0r14
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0r12-13
 - rebuilt with new openssl
 

mysql-query-browser-default_schema_infinite_loop.patch:
 MQQueryDispatcher.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: mysql-query-browser-default_schema_infinite_loop.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-query-browser-default_schema_infinite_loop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-query-browser-default_schema_infinite_loop.patch	27 Nov 2007 22:33:46 -0000	1.1
+++ mysql-query-browser-default_schema_infinite_loop.patch	1 Sep 2009 04:33:34 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr mysql-gui-tools-5.0r12_orig/mysql-query-browser/source/linux/MQQueryDispatcher.cc mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/MQQueryDispatcher.cc
---- mysql-gui-tools-5.0r12_orig/mysql-query-browser/source/linux/MQQueryDispatcher.cc	2007-04-27 09:11:32.000000000 -0400
-+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/MQQueryDispatcher.cc	2007-10-06 10:40:45.000000000 -0400
+diff -uNr mysql-gui-tools-5.0r14_orig/query-browser/source/linux/MQQueryDispatcher.cc mysql-gui-tools-5.0r14/query-browser/source/linux/MQQueryDispatcher.cc
+--- mysql-gui-tools-5.0r14_orig/query-browser/source/linux/MQQueryDispatcher.cc	2007-04-27 09:11:32.000000000 -0400
++++ mysql-gui-tools-5.0r14/query-browser/source/linux/MQQueryDispatcher.cc	2007-10-06 10:40:45.000000000 -0400
 @@ -558,8 +558,8 @@
  
    Gtk::Main::instance()->run();


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jun 2007 18:42:28 -0000	1.3
+++ sources	1 Sep 2009 04:33:34 -0000	1.4
@@ -1 +1 @@
-755a62e8cd0ea0e138be6eedc430d7a9  mysql-gui-tools-5.0r12.tar.gz
+b8efefbf20b7264c8f3afd34424467d7  mysql-gui-tools-5.0r14.tar.gz



From devrim at fedoraproject.org  Tue Sep  1 04:35:28 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Sep 2009 04:35:28 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.8,1.9
Message-ID: <20090901043528.23EF711C00EF@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13101

Modified Files:
	mapserver.spec 
Log Message:
Remove gdal support from RHEL4 package.



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mapserver.spec	1 Sep 2009 04:22:22 -0000	1.8
+++ mapserver.spec	1 Sep 2009 04:35:27 -0000	1.9
@@ -80,16 +80,11 @@ chmod -x mapscript/php3/README
 
 %build
 
-# fix gdal lookup
-%{__sed} -i.libs -e 's|`\$GDAL_CONFIG --dep-libs`||' configure
-
 %configure \
    --with-gd \
    --with-zlib \
    --with-tiff \
    --with-freetype=%{_bindir}/freetype-config \
-   --with-gdal=%{_bindir}/gdal-config \
-   --with-ogr=%{_bindir}/gdal-config \
    --with-geos=%{_bindir}/geos-config \
    --with-proj \
    --with-sos \



From devrim at fedoraproject.org  Tue Sep  1 04:40:53 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Sep 2009 04:40:53 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.9,1.10
Message-ID: <20090901044053.EFA2211C00EF@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14326

Modified Files:
	mapserver.spec 
Log Message:
Fix: "configure: error: OGC WFS Server support cannot be enabled: missing OGR which is required)."



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mapserver.spec	1 Sep 2009 04:35:27 -0000	1.9
+++ mapserver.spec	1 Sep 2009 04:40:53 -0000	1.10
@@ -88,7 +88,6 @@ chmod -x mapscript/php3/README
    --with-geos=%{_bindir}/geos-config \
    --with-proj \
    --with-sos \
-   --with-wfs \
    --with-wcs \
    --with-wmsclient \
    --with-wfsclient \



From jwilson at fedoraproject.org  Tue Sep  1 04:44:15 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue,  1 Sep 2009 04:44:15 +0000 (UTC)
Subject: rpms/kernel/devel v4l-dvb-fix-cx25840-firmware-loading.patch, NONE, 
	1.1 kernel.spec, 1.1755, 1.1756 lirc-2.6.31.patch, 1.1, 1.2
Message-ID: <20090901044415.D9E8011C00EF@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15182

Modified Files:
	kernel.spec lirc-2.6.31.patch 
Added Files:
	v4l-dvb-fix-cx25840-firmware-loading.patch 
Log Message:
* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com>
- Fix up lirc_zilog to enable functional IR transmit and receive
  on the Hauppauge HD PVR
- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)


v4l-dvb-fix-cx25840-firmware-loading.patch:
 cx25840-firmware.c |   37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

--- NEW FILE v4l-dvb-fix-cx25840-firmware-loading.patch ---
# HG changeset patch
# User Hans Verkuil <hverkuil at xs4all.nl>
# Date 1251752272 -7200
# Node ID 36a81289010d614758a64bd757ee37c8c154ad4b
# Parent  f69cb015dc77f8893f5018afff1e60f5b4ea50af
cx25840: fix determining the firmware name

From: Hans Verkuil <hverkuil at xs4all.nl>

Depending on the model there are three different firmwares to choose from.
Unfortunately if a cx23885 is loaded first, then the global firmware name
is overwritten with that firmware and if ivtv is loaded next, then it
tries to load the wrong firmware. In addition, the original approach would
also overwrite any firmware that the user specified explicitly.

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
CC: Jarod Wilson <jarod at wilsonet.com>

Trivial backport from v4l-dvb hg tip to 2.6.31

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---

 drivers/media/video/cx25840/cx25840-firmware.c |   37 ++++++++++++++---------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 0df53b0..006ce16 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -23,10 +23,6 @@
 
 #include "cx25840-core.h"
 
-#define FWFILE "v4l-cx25840.fw"
-#define FWFILE_CX23885 "v4l-cx23885-avcore-01.fw"
-#define FWFILE_CX231XX "v4l-cx231xx-avcore-01.fw"
-
 /*
  * Mike Isely <isely at pobox.com> - The FWSEND parameter controls the
  * size of the firmware chunks sent down the I2C bus to the chip.
@@ -40,11 +36,11 @@
 
 #define FWDEV(x) &((x)->dev)
 
-static char *firmware = FWFILE;
+static char *firmware = "";
 
 module_param(firmware, charp, 0444);
 
-MODULE_PARM_DESC(firmware, "Firmware image [default: " FWFILE "]");
+MODULE_PARM_DESC(firmware, "Firmware image to load");
 
 static void start_fw_load(struct i2c_client *client)
 {
@@ -65,6 +61,19 @@ static void end_fw_load(struct i2c_client *client)
 	cx25840_write(client, 0x803, 0x03);
 }
 
+static const char *get_fw_name(struct i2c_client *client)
+{
+	struct cx25840_state *state = to_state(i2c_get_clientdata(client));
+
+	if (firmware[0])
+		return firmware;
+	if (state->is_cx23885)
+		return "v4l-cx23885-avcore-01.fw";
+	if (state->is_cx231xx)
+		return "v4l-cx231xx-avcore-01.fw";
+	return "v4l-cx25840.fw";
+}
+
 static int check_fw_load(struct i2c_client *client, int size)
 {
 	/* DL_ADDR_HB DL_ADDR_LB */
@@ -72,11 +81,13 @@ static int check_fw_load(struct i2c_client *client, int size)
 	s |= cx25840_read(client, 0x800);
 
 	if (size != s) {
-		v4l_err(client, "firmware %s load failed\n", firmware);
+		v4l_err(client, "firmware %s load failed\n",
+			get_fw_name(client));
 		return -EINVAL;
 	}
 
-	v4l_info(client, "loaded %s firmware (%d bytes)\n", firmware, size);
+	v4l_info(client, "loaded %s firmware (%d bytes)\n",
+		 get_fw_name(client), size);
 	return 0;
 }
 
@@ -96,21 +107,17 @@ int cx25840_loadfw(struct i2c_client *client)
 	const struct firmware *fw = NULL;
 	u8 buffer[FWSEND];
 	const u8 *ptr;
+	const char *fwname = get_fw_name(client);
 	int size, retval;
 	int MAX_BUF_SIZE = FWSEND;
 
-	if (state->is_cx23885)
-		firmware = FWFILE_CX23885;
-	else if (state->is_cx231xx)
-		firmware = FWFILE_CX231XX;
-
 	if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
 		v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
 		MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */
 	}
 
-	if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
-		v4l_err(client, "unable to open firmware %s\n", firmware);
+	if (request_firmware(&fw, fwname, FWDEV(client)) != 0) {
+		v4l_err(client, "unable to open firmware %s\n", fwname);
 		return -EINVAL;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1755
retrieving revision 1.1756
diff -u -p -r1.1755 -r1.1756
--- kernel.spec	30 Aug 2009 15:23:09 -0000	1.1755
+++ kernel.spec	1 Sep 2009 04:44:15 -0000	1.1756
@@ -711,6 +711,7 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
+Patch2904: v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # fs fixes
 
@@ -1333,6 +1334,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-update.patch
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # Patches headed upstream
 
@@ -2002,6 +2004,11 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com>
+- Fix up lirc_zilog to enable functional IR transmit and receive
+  on the Hauppauge HD PVR
+- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
+
 * Sun Aug 30 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc8-git1
 - Drop linux-2.6-inotify-accounting.patch, merged upstream.

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1244 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15602 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.31.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lirc-2.6.31.patch	30 Aug 2009 05:25:47 -0000	1.1
+++ lirc-2.6.31.patch	1 Sep 2009 04:44:15 -0000	1.2
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Sunday, August 30, 2009
+Last updated: Tuesday, September 01, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -24,7 +24,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
- drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1244 ++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
  drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
@@ -32,14 +32,14 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
  drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
- drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
- 26 files changed, 15562 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
+ 26 files changed, 15602 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 60299a9..59e34c4 100644
+index 8dca9d8..f25dc26 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3130,6 +3130,15 @@ W:	http://www.pasemi.com/
+@@ -3129,6 +3129,15 @@ W:	http://www.pasemi.com/
  L:	linuxppc-dev at ozlabs.org
  S:	Supported
  
@@ -727,7 +727,7 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..a23bfea
+index 0000000..48ab5af
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,839 @@
@@ -1153,7 +1153,7 @@ index 0000000..a23bfea
 +int lirc_dev_fop_open(struct inode *inode, struct file *file)
 +{
 +	struct irctl *ir;
-+	int retval;
++	int retval = 0;
 +
 +	if (iminor(inode) >= MAX_IRCTL_DEVICES) {
 +		dprintk("lirc_dev [%d]: open result = -ENODEV\n",
@@ -7658,10 +7658,10 @@ index 0000000..3d53181
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..58dfdd5
+index 0000000..3dd4cfb
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1225 @@
+@@ -0,0 +1,1244 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -7677,9 +7677,12 @@ index 0000000..58dfdd5
 + * supports the 1st-gen device now too. Transmitting on the 1st-gen device
 + * is as yet untested, but receiving definitely works.
 + *
-+ * Support for 1st-gen mceusb device added in June of 2009,
++ * Support for 1st-gen device added June 2009,
 + * by Jarod Wilson <jarod at wilsonet.com>
 + *
++ * Transmission support for 1st-gen device added August 2009,
++ * by Patrick Calhoun <phineas at ou.edu>
++ *
 + * Derived from ATI USB driver by Paul Miller and the original
 + * MCE USB driver by Dan Conti (and now including chunks of the latter
 + * relevant to the 1st-gen device initialization)
@@ -7845,6 +7848,8 @@ index 0000000..58dfdd5
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
 +	/* Formosa Industrial Computing / Beanbag Emulation Device */
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
++	/* Formosa21 / eHome Infrared Receiver */
++	{ USB_DEVICE(VENDOR_FORMOSA, 0xe03a) },
 +	/* Formosa Industrial Computing AIM IR605/A */
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe03c) },
 +	/* Fintek eHome Infrared Transceiver */
@@ -8519,7 +8524,7 @@ index 0000000..58dfdd5
 +	memset(data, 0, 8);
 +
 +	ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
-+			      5, USB_TYPE_VENDOR, 0, 0,
++			      USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
 +			      data, 2, HZ * 3);
 +	dprintk("%s - ret = %d, devnum = %d\n",
 +		__func__, ret, ir->usbdev->devnum);
@@ -8533,6 +8538,18 @@ index 0000000..58dfdd5
 +
 +	dprintk("%s - ret = %d\n", __func__, ret);
 +
++	/* strange: bRequest == 4 */
++	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
++			      4, USB_TYPE_VENDOR,
++			      0x0808, 0x0000, NULL, 0, HZ * 3);
++	dprintk("%s - retB = %d\n", __func__, ret);
++
++	/* strange: bRequest == 2 */
++	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
++			      2, USB_TYPE_VENDOR,
++			      0x0000, 0x0100, NULL, 0, HZ * 3);
++	dprintk("%s - retC = %d\n", __func__, ret);
++
 +	return ret;
 +
 +};
@@ -8793,8 +8810,10 @@ index 0000000..58dfdd5
 +		request_packet_async(ir, ep_out, init1,
 +				     sizeof(init1), MCEUSB_OUTBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
-+		request_packet_async(ir, ep_out, init2,
-+				     sizeof(init2), MCEUSB_OUTBOUND);
++		/* This breaks transmit on orig ms mce device */
++		if (!ir->flags.microsoft_gen1)
++			request_packet_async(ir, ep_out, init2,
++					     sizeof(init2), MCEUSB_OUTBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, 0);
 +	}
 +
@@ -14387,10 +14406,10 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..c532399
+index 0000000..f86db02
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1374 @@
+@@ -0,0 +1,1395 @@
 +/*
 + * i2c IR lirc driver for devices with zilog IR processors
 + *
@@ -14560,7 +14579,7 @@ index 0000000..c532399
 +
 +		/*
 +		 * Send random "poll command" (?)  Windows driver does this
-+		 * and it  is a good point to detect chip failure.
++		 * and it is a good point to detect chip failure.
 +		 */
 +		ret = i2c_master_send(&ir->c_rx, sendbuf, 1);
 +		if (ret != 1) {
@@ -14598,11 +14617,20 @@ index 0000000..c532399
 +		}
 +
 +		/* key pressed ? */
++#ifdef I2C_HW_B_HDPVR
++		if (ir->c_rx.adapter->id == I2C_HW_B_HDPVR) {
++			if (got_data && (keybuf[0] == 0x80))
++				return 0;
++			else if (got_data && (keybuf[0] == 0x00))
++				return -ENODATA;
++		} else if ((ir->b[0] & 0x80) == 0)
++#else
 +		if ((ir->b[0] & 0x80) == 0)
++#endif
 +			return got_data ? 0 : -ENODATA;
 +
 +		/* look what we have */
-+		code = (((__u16)ir->b[0]&0x7f)<<6) | (ir->b[1]>>2);
++		code = (((__u16)ir->b[0] & 0x7f) << 6) | (ir->b[1] >> 2);
 +
 +		codes[0] = (code >> 8) & 0xff;
 +		codes[1] = code & 0xff;
@@ -14611,6 +14639,7 @@ index 0000000..c532399
 +		lirc_buffer_write(&ir->buf, codes);
 +		++got_data;
 +	} while (!lirc_buffer_full(&ir->buf));
++
 +	return 0;
 +}
 +
@@ -15223,6 +15252,16 @@ index 0000000..c532399
 +		return ret < 0 ? ret : -EFAULT;
 +	}
 +
++#ifdef I2C_HW_B_HDPVR
++	/*
++	 * The sleep bits aren't necessary on the HD PVR, and in fact, the
++	 * last i2c_master_recv always fails with a -5, so for now, we're
++	 * going to skip this whole mess and say we're done on the HD PVR
++	 */
++	if (ir->c_rx.adapter->id == I2C_HW_B_HDPVR)
++		goto done;
++#endif
++
 +	/*
 +	 * This bit NAKs until the device is ready, so we retry it
 +	 * sleeping a bit each time.  This seems to be what the windows
@@ -15255,6 +15294,7 @@ index 0000000..c532399
 +		return -EFAULT;
 +	}
 +
++done:
 +	/* Oh good, it worked */
 +	dprintk("sent code %u, key %u\n", code, key);
 +	return 0;



From ausil at fedoraproject.org  Tue Sep  1 04:44:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 04:44:31 +0000 (UTC)
Subject: rpms/mysql-gui-tools/devel mysql-gui-tools.spec,1.15,1.16
Message-ID: <20090901044431.4D0B211C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-gui-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15240

Modified Files:
	mysql-gui-tools.spec 
Log Message:
remove erronous -gui



Index: mysql-gui-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mysql-gui-tools.spec	1 Sep 2009 04:33:34 -0000	1.15
+++ mysql-gui-tools.spec	1 Sep 2009 04:44:31 -0000	1.16
@@ -186,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mysql-gui-common
 %defattr(-,root,root,-)
-%doc gui-common/COPYING common/README
+%doc common/COPYING common/README
 %dir %{_datadir}/mysql-gui
 %{_datadir}/mysql-gui/common
 



From pkgdb at fedoraproject.org  Tue Sep  1 04:52:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 04:52:41 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090901045241.1621E10F882@bastion2.fedora.phx.redhat.com>

petersen has set the approveacls acl on ibus-anthy (Fedora devel) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From transif at fedoraproject.org  Tue Sep  1 05:17:51 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 05:17:51 +0000 (UTC)
Subject: comps/po ko.po,1.25,1.26
Message-ID: <20090901051751.0CC8811C00EF@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26892/po

Modified Files:
	ko.po 
Log Message:
Sending translation for Korean


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.25 -r 1.26 ko.poIndex: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ko.po	19 Aug 2009 06:45:22 -0000	1.25
+++ ko.po	1 Sep 2009 05:17:50 -0000	1.26
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-08-19 16:43+1000\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-01 15:16+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,280 +28,302 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "? ?? ?????? ? ???? ??? ???? ?????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?? ??"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "????? ?? ????? ??"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????? ?? "
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?? ????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "??? ??? ???? ?? ?? ????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??? ??"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????? ?? "
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??? ??"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "??? ??"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?? ???"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ????? ??? ?? ?? ??."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "???? ??"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "????? ?? "
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??? ??"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "??? ?? "
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????? ?? "
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??? ????? ??"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "????? ??"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "?? ??? ?? ?? "
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????? ??"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "?????? ??"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "??? ??"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
[...1840 lines suppressed...]
 msgstr "?????? ??  "
 
-#: ../comps-f11.xml.in.h:165
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "?????? ??  "
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ???? ?? "
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1386,7 +1496,8 @@ msgstr ""
 "Fedora ?? 32 ?? ??? ??, ??? ? ?? ???? ???? ??? ??"
 "? ????? ?? ??  "
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1394,37 +1505,96 @@ msgstr ""
 "Objective CAML ????? ?? ? ?????? ???? ????? ?? ?"
 "?   "
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "????? ??  "
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "??? ??  "
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "? ??? ?? ???, ??, ?? ? ???? ???? ?? ?????.  "
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "????? ??  "
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "????? (??) ?? "
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "GNOME ????? Critical Path ??? ???? ??? ?????. "
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "?? Fedora ???? Critical Path ??? ?? ?? ???? ???? ??? ?????. "
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?? ?? ? ??? "
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ??? ? ???? ?? ?? ?? ? ???  "
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (??) "
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "???? ?? "
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE? ?? ? ??? ??? ?? ???? ?? ?? ??? ????? ?? ???? ?? ??? ?? X11 ???? ?????. "
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "??? ? ??? ID ?? "
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ???? ?? "
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin? NetBook/NetTop/MID ??? ?? ???? ?????.  "
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??? ??? ?? ?? ????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "???? ???? ??"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1432,7 +1602,7 @@ msgstr ""
 "GNOME? ??? ??? ??? ??????? ??, ????, ??? ???? "
 "??? ?? ??? ??? ??? ????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1440,7 +1610,7 @@ msgstr ""
 "KDE? ??? ??? ??? ??????? ??, ????, ??? ???? ?"
 "?? ?? ??? ??? ??? ????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1448,11 +1618,11 @@ msgstr ""
 "??? ??? ?????? ???? ? ????? ??? ???? ????? "
 "?????. ??? ?????? Emacs? Vi? ?????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ??? ???."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1460,27 +1630,27 @@ msgstr ""
 "? ??? ???? DocBook ??? ??? ??? ? ??? ??? ??? "
 "HTML, PDF, Postscript? ??? ???? ??? ? ????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "? ??? ?? ??? ?? ???? ?? ?????.  "
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "? ??? ??? ??? ?? ?? ? ?? ?????. "
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "? ??? ??? ??? ?? ?? ? ?? ?????. "
 



From transif at fedoraproject.org  Tue Sep  1 05:41:46 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 05:41:46 +0000 (UTC)
Subject: comps/po gu.po,1.23,1.24
Message-ID: <20090901054146.9EC3111C00EF@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2063/po

Modified Files:
	gu.po 
Log Message:
Sending translation for Gujarati


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.23 -r 1.24 gu.poIndex: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gu.po	13 May 2009 10:30:59 -0000	1.23
+++ gu.po	1 Sep 2009 05:41:46 -0000	1.24
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.gu.po to Gujarati
+# translation of comps.po to Gujarati
 # Gujarati translations for PACKAGE package.
 # Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -9,10 +9,10 @@
 # Sweta Kothari <swkothar at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.gu\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-13 08:12+0000\n"
-"PO-Revision-Date: 2009-05-13 16:00+0530\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-01 11:10+0530\n"
 "Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
 "Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
@@ -33,279 +33,300 @@ msgstr ""
 "\n"
 "\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "????? ???????? ???????? ?? ?? ???? ????? ???? ????? ???? ??? ???."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?????? ?????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "????????? ????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ???????? ??????? ???? ?????? ??????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????? ????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????? ????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???? ??? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???? ??????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ???????????? ???? ?????? ??????? ????."
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????? ????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "??????????? ????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ????????? ????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????????? ???????? ???"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "?????????? ????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "????????? ????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
[...1839 lines suppressed...]
 msgstr "??????? ????"
 
-#: ../comps-f11.xml.in.h:165
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "???????? ????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "???? ???????? ????????"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1382,43 +1491,105 @@ msgstr ""
 "32 ??? ???????? ?????????? ?????-?????????? ?????????? ???? ????, ????? ?????? ??? ????? "
 "??, ??? ????????? ????? ??? ????? ??, Fedora ????? ???."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "Objective CAML ???????????? ???? ??? ???????????? ????? ???????? ???????? ?????? ????."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "????, ????????, ?????????, ??? ????????? ???????? ??? ? ??? ? ??????? ??????? ?????? ??."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??? ???????? ????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "???????? ???? ?? ?? GNOME ???????? ???? ???? ??? ??????????? ???? ???? ??"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "???????? ???? ?? ?? ??? Fedora ?????? ?? ???? ??? ??????????? ???? ????????? ?????????? ???? ???? ??"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????? ??? ?????????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ??????????? ??? ??????????? ???? ?????? ??? ?????????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "???? ??? (????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "???? ??? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????????? ?????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ? ???? ???????? ?????????? ???? ?? ???????, ?????? ?????? ???? ???? ?????????? ???? "
+"?????????? ???? ??? ?????? X11 ???????? ???????? ???? ???? ??."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "???? ??? ?????????? ??? ??????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ???????? ????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ? NetBook/NetTop/MID ?????? ???? ???????? ???????? ??."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ???????? ??????? ?????? ??????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "?????? ????????? ????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1426,7 +1597,7 @@ msgstr ""
 "????? ? ?????????, ???????????? ?????????? ???????? ?? ?? ?? ????, ????????, ?????? ?????? "
 "??? ??????????? ???? ?????????? ????? ??."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1434,7 +1605,7 @@ msgstr ""
 "KDE ? ?????????, ???????????? ?????????? ???????? ?? ?? ?? ????, ????????, ?????? ??????, "
 "??? ???????????? ???? ?????????? ????? ??."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1442,11 +1613,11 @@ msgstr ""
 "???? ???? ???? ??????? ????? ????? ??, ? ?????????? ???? ????? ???????? ??? ?????? "
 "?????? ??????? ??? ??. ? Emacs ??? Vi ????????? ?? ????? ??."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ???? ??????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1454,27 +1625,27 @@ msgstr ""
 "? ????? ???? ?????? ????????? ???????????? ???????? ??? ????? HTML, PDF, ?????????????? "
 "??? ??????? ???????? ??????? ??? ??."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?????? ????? ???? ? ??? ? ??????? ???????? ???? ??"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ????????? ???? ? ??? ? ????? ??? ???????? ???? ??."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ????????? ???? ? ??? ? ????? ??? ???????? ???? ??."
 



From jnovy at fedoraproject.org  Tue Sep  1 05:59:46 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue,  1 Sep 2009 05:59:46 +0000 (UTC)
Subject: rpms/mc/devel .cvsignore, 1.39, 1.40 mc-extensions.patch, 1.15,
	1.16 mc.spec, 1.147, 1.148 sources, 1.47, 1.48 mc-ipv6.patch,
	1.4, NONE mc-prompt.patch, 1.3, NONE mc-shell-patterns.patch,
	1.1, NONE
Message-ID: <20090901055946.5975F11C00EF@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9005

Modified Files:
	.cvsignore mc-extensions.patch mc.spec sources 
Removed Files:
	mc-ipv6.patch mc-prompt.patch mc-shell-patterns.patch 
Log Message:
* Tue Sep  1 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.4.pre2
- update to 4.7.0-pre2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	3 Aug 2009 10:38:04 -0000	1.39
+++ .cvsignore	1 Sep 2009 05:59:44 -0000	1.40
@@ -1 +1 @@
-mc-4.7.0-pre1.tar.bz2
+mc-4.7.0-pre2.tar.bz2

mc-extensions.patch:
 configure.ac   |    2 +-
 misc/mc.ext.in |   39 ++++++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 12 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc-extensions.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mc-extensions.patch	5 Aug 2009 12:26:01 -0000	1.15
+++ mc-extensions.patch	1 Sep 2009 05:59:44 -0000	1.16
@@ -10,18 +10,6 @@ diff -up mc-4.7.0-pre1/configure.ac.exte
  
  dnl
  dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
-diff -up mc-4.7.0-pre1/configure.extensions mc-4.7.0-pre1/configure
---- mc-4.7.0-pre1/configure.extensions	2009-07-31 20:49:03.000000000 +0200
-+++ mc-4.7.0-pre1/configure	2009-08-05 12:51:08.000000000 +0200
-@@ -15250,7 +15250,7 @@ else
- fi
- 
- 
--for ac_prog in gnome-moz-remote mozilla konqueror opera netscape
-+for ac_prog in firefox gnome-moz-remote mozilla konqueror opera netscape
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
 diff -up mc-4.7.0-pre1/misc/mc.ext.in.extensions mc-4.7.0-pre1/misc/mc.ext.in
 --- mc-4.7.0-pre1/misc/mc.ext.in.extensions	2009-06-23 20:55:11.000000000 +0200
 +++ mc-4.7.0-pre1/misc/mc.ext.in	2009-08-05 13:01:48.000000000 +0200


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- mc.spec	7 Aug 2009 10:53:58 -0000	1.147
+++ mc.spec	1 Sep 2009 05:59:44 -0000	1.148
@@ -1,22 +1,19 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.3.pre1%{?dist}
+Release:	0.4.pre2%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre1.tar.bz2
+Source0:	mc-%{version}-pre2.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel
 Requires:	dev >= 3.3-3
 
-Patch1:		mc-ipv6.patch
-Patch2:		mc-prompt.patch
-Patch3:		mc-exit.patch
-Patch4:		mc-extensions.patch
-Patch5:		mc-shell-patterns.patch
+Patch1:		mc-exit.patch
+Patch2:		mc-extensions.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -26,12 +23,9 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q -n mc-%{version}-pre1
-%patch1 -p1 -b .ipv6
-%patch2 -p1 -b .prompt
-%patch3 -p1 -b .exit
-%patch4 -p1 -b .extensions
-%patch5 -p1 -b .shell-patterns
+%setup -q -n mc-%{version}-pre2
+%patch1 -p1 -b .exit
+%patch2 -p1 -b .extensions
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Sep  1 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.4.pre2
+- update to 4.7.0-pre2
+
 * Fri Aug  7 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.3.pre1
 - support shell patterns in copy dialog (#516180)
   (http://www.midnight-commander.org/ticket/414)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	3 Aug 2009 10:38:05 -0000	1.47
+++ sources	1 Sep 2009 05:59:45 -0000	1.48
@@ -1 +1 @@
-c69a27dd79e96317be9410137b2fc9d6  mc-4.7.0-pre1.tar.bz2
+347d0144709ed342302787e314146eef  mc-4.7.0-pre2.tar.bz2


--- mc-ipv6.patch DELETED ---


--- mc-prompt.patch DELETED ---


--- mc-shell-patterns.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  1 06:01:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:01:06 +0000
Subject: [pkgdb] maven-doxia: akurtakov has requested watchbugzilla
Message-ID: <20090901060106.D12B810F921@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven-doxia (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 06:01:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:01:09 +0000
Subject: [pkgdb] maven-doxia: akurtakov has requested commit
Message-ID: <20090901060110.066FE10F927@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven-doxia (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 06:01:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:01:10 +0000
Subject: [pkgdb] maven-doxia: akurtakov has requested watchcommits
Message-ID: <20090901060110.968CF10FAFC@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven-doxia (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 06:01:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:01:14 +0000
Subject: [pkgdb] maven-doxia: akurtakov has requested approveacls
Message-ID: <20090901060114.A6A4D10FAFF@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on maven-doxia (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From cweyl at fedoraproject.org  Tue Sep  1 06:03:04 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 06:03:04 +0000 (UTC)
Subject: rpms/perl-Sys-SigAction/F-11 perl-Sys-SigAction.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090901060304.15A9211C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sys-SigAction/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9779

Modified Files:
	perl-Sys-SigAction.spec sources 
Log Message:
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



Index: perl-Sys-SigAction.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sys-SigAction/F-11/perl-Sys-SigAction.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Sys-SigAction.spec	27 Feb 2009 01:53:03 -0000	1.5
+++ perl-Sys-SigAction.spec	1 Sep 2009 06:03:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Sys-SigAction
-Version:        0.10
-Release:        4%{?dist}
+Version:        0.11
+Release:        2%{?dist}
 Summary:        Perl extension for Consistent Signal Handling
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,11 +49,17 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 23 2009 Andreas Thienemann <andreas at bawue.net> - 0.11-1
+- Update to 0.11
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-3
-Rebuild for new perl
+- Rebuild for new perl
 
 * Sun Jan 27 2008 Andreas Thienemann <andreas at bawue.net> 0.10-2
 - Added Test::More to the BuildReqs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sys-SigAction/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Mar 2007 14:13:38 -0000	1.2
+++ sources	1 Sep 2009 06:03:03 -0000	1.3
@@ -1 +1 @@
-ba520c175ea5c41950f53e60801da476  Sys-SigAction-0.10.tar.gz
+e37f1e69d6ac6ea4a9ffd7f845753e79  Sys-SigAction-0.11.tar.gz



From akurtakov at fedoraproject.org  Tue Sep  1 06:09:02 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 06:09:02 +0000 (UTC)
Subject: rpms/maven2-plugin-shade/devel maven2-plugin-shade-depmap.xml, NONE,
	1.1 maven2-plugin-shade.spec, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090901060902.9677511C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2-plugin-shade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11364/devel

Modified Files:
	sources .cvsignore 
Added Files:
	maven2-plugin-shade-depmap.xml maven2-plugin-shade.spec 
Log Message:
Initial import.


--- NEW FILE maven2-plugin-shade-depmap.xml ---
<dependencies>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm</artifactId>
            <version>3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm</artifactId>
            <version>3.1</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-util</artifactId>
            <version>3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm-util</artifactId>
            <version>3.1</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-commons</artifactId>
            <version>3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm-commons</artifactId>
            <version>3.1</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-tree</artifactId>
            <version>3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>asm-tree</artifactId>
            <version>3.1</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>asm</groupId>
            <artifactId>asm-parent</artifactId>
            <version>3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/objectweb-asm</groupId>
            <artifactId>parent</artifactId>
            <version>3.1</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>com.thoughtworks.qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </jpp>
    </dependency>    
</dependencies>


--- NEW FILE maven2-plugin-shade.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:           maven2-plugin-shade
Version:        1.0
Release:        7%{?dist}
Epoch:          0
Summary:        Maven Shade Plugin
License:        ASL 2.0
Group:          Development/Tools
URL:            http://maven.apache.org/

# svn export https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.0 maven2-plugin-shade
# tar czf maven2-shade-plugin-1.0-src.tar.gz maven2-plugin-shade

Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-depmap.xml

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  plexus-archiver >= 1.0-0.1.a7
BuildRequires:  plexus-maven-plugin >= 1.3.5
BuildRequires:  plexus-cdc
BuildRequires:  qdox >= 1.5
BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api
BuildRequires:  avalon-logkit
BuildRequires:  avalon-framework

Requires:       maven2 >= 0:2.0.8
Requires:       plexus-archiver >= 1.0-0.1.a7
Requires:       jpackage-utils >= 0:1.7.2

Requires(post):   jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2

BuildArch:      noarch

%description
This plugin provides the capability to package the artifact in an
uber-jar, including its dependencies and to shade - i.e. rename - the
packages of some of the dependencies.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -n %{name}

%build

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
    -e \
    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
    -Dmaven2.jpp.depmap.file=%{SOURCE1} \
    -Dmaven.test.skip=true \
    install javadoc:javadoc


%install
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

# Copy file and create unversioned symlink
install -pm 644 target/maven-shade-plugin-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Copy pom
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}.pom
%add_to_maven_depmap org.apache.maven.plugins maven-shade-plugin %{version} JPP %{name}

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-7
- Bump Requires on maven to be 2.0.8

* Mon Aug 24 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-6
- Add maven %post scriplets
- Add R: jpackage-utils
- Fix description for javadoc sub-package

* Mon Aug 24 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-5
- Make some lines <= 80 characters
- Remove < on plexus-cdc BR as it won't work
- Remove "excalibur-" prefix on two BRs

* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> - 1.0-4
- Fix license
- Fix comment for source creation

* Mon Apr 20 2009 Yong Yang <yyang at redhat.com> - 1.0-3
- Rebuild with plexus-cdc alpha 10

* Fri Apr 17 2009 Yong Yang <yyang at redhat.com> - 1.0-2
- Add qdox and other BRs
- Add qdox jpp-depmap
- rebuild with maven2-2.0.8 built in non-bootstrap mode

* Thu Mar 05 2009 Yong Yang <yyang at redhat.com> - 1.0-1
- Imported from dbhole's maven2 2.0.8 packages

* Tue Mar 11 2008 Deepak Bhole <dbhole at redhat.com> - 1.0-0jpp.1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-plugin-shade/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:15:04 -0000	1.1
+++ sources	1 Sep 2009 06:09:02 -0000	1.2
@@ -0,0 +1 @@
+b71c6c9d186a618c391fcd7745519ddc  maven2-plugin-shade-1.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-plugin-shade/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:15:03 -0000	1.1
+++ .cvsignore	1 Sep 2009 06:09:02 -0000	1.2
@@ -0,0 +1 @@
+maven2-plugin-shade-1.0.tar.gz



From denis at fedoraproject.org  Tue Sep  1 06:11:13 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue,  1 Sep 2009 06:11:13 +0000 (UTC)
Subject: rpms/libgnomedbmm/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE libgnomedbmm.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <20090901061113.A1B5C11C00EF@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomedbmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12149

Added Files:
	dead.package 
Removed Files:
	Makefile libgnomedbmm.spec sources 
Log Message:
Retiring libgnomedbmm


--- NEW FILE dead.package ---
libgnomedbmm was retired by upstream. See

http://mail.gnome.org/archives/gtkmm-list/2009-August/msg00129.html


--- Makefile DELETED ---


--- libgnomedbmm.spec DELETED ---


--- sources DELETED ---



From whot at fedoraproject.org  Tue Sep  1 06:22:49 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  1 Sep 2009 06:22:49 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.71, 1.72 commitid, 1.34,
	1.35 dri2-page-flip.patch, 1.2, 1.3 sources, 1.66,
	1.67 xorg-x11-server.spec, 1.480,
	1.481 xserver-1.6.99-vga-arb.patch, 1.7, NONE
Message-ID: <20090901062249.29CBD11C00EF@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14577

Modified Files:
	.cvsignore commitid dri2-page-flip.patch sources 
	xorg-x11-server.spec 
Removed Files:
	xserver-1.6.99-vga-arb.patch 
Log Message:
* Tue Sep 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-44.20090901
- Today's git snapshot (incl. vga-arbitration).
- dri2-page-flip.patch: rebase.
- xserver-1.6.99-vga-arb.patch: Drop.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	28 Aug 2009 03:03:41 -0000	1.71
+++ .cvsignore	1 Sep 2009 06:22:47 -0000	1.72
@@ -1 +1 @@
-xorg-server-20090828.tar.xz
+xorg-server-20090901.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- commitid	28 Aug 2009 03:03:41 -0000	1.34
+++ commitid	1 Sep 2009 06:22:47 -0000	1.35
@@ -1 +1 @@
-6fffcd5825454a7fe58ffbcfb219f007cf38e731
+a8e634b86d47353ef354717904fa66ebe35e1303

dri2-page-flip.patch:
 glx/glxcontext.h          |    4 +
 glx/glxdri2.c             |   47 ++++++++++++++----
 glx/glxext.c              |    3 +
 glx/glxserver.h           |   18 +++----
 hw/xfree86/dri2/dri2.c    |  118 ++++++++++++++++++++++++++++++++++++++++++++--
 hw/xfree86/dri2/dri2.h    |   12 +++-
 hw/xfree86/dri2/dri2ext.c |   27 +++++++++-
 7 files changed, 201 insertions(+), 28 deletions(-)

Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/dri2-page-flip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dri2-page-flip.patch	4 Aug 2009 06:10:29 -0000	1.2
+++ dri2-page-flip.patch	1 Sep 2009 06:22:47 -0000	1.3
@@ -1,4 +1,4 @@
-From 20edb1d61db80f5fedb4d3eea60c67d438502238 Mon Sep 17 00:00:00 2001
+From f66b2a8321af2e7779b18e1bcf5f60752b9e3705 Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
 Date: Wed, 29 Jul 2009 08:26:14 -0400
 Subject: [PATCH] DRI2 Page Flipping
@@ -10,8 +10,8 @@ Subject: [PATCH] DRI2 Page Flipping
  glx/glxserver.h           |   18 +++----
  hw/xfree86/dri2/dri2.c    |  118 +++++++++++++++++++++++++++++++++++++++++++-
  hw/xfree86/dri2/dri2.h    |   12 ++++-
- hw/xfree86/dri2/dri2ext.c |   25 +++++++++-
- 7 files changed, 200 insertions(+), 27 deletions(-)
+ hw/xfree86/dri2/dri2ext.c |   26 ++++++++++-
+ 7 files changed, 201 insertions(+), 27 deletions(-)
 
 diff --git a/glx/glxcontext.h b/glx/glxcontext.h
 index 70a1411..79bc083 100644
@@ -392,7 +392,7 @@ index 175471a..42bdb09 100644
 +
  #endif
 diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
-index 029dce8..9f5f389 100644
+index 72f9a44..c859e6e 100644
 --- a/hw/xfree86/dri2/dri2ext.c
 +++ b/hw/xfree86/dri2/dri2ext.c
 @@ -80,7 +80,7 @@ ProcDRI2QueryVersion(ClientPtr client)
@@ -404,8 +404,8 @@ index 029dce8..9f5f389 100644
  
      if (client->swapped) {
      	swaps(&rep.sequenceNumber, n);
-@@ -253,6 +253,9 @@ ProcDRI2GetBuffers(ClientPtr client)
-     if (!validDrawable(client, stuff->drawable, &pDrawable, &status))
+@@ -258,6 +258,9 @@ ProcDRI2GetBuffers(ClientPtr client)
+ 		       &pDrawable, &status))
  	return status;
  
 +    if (DRI2WaitSwap(client, pDrawable))
@@ -414,8 +414,8 @@ index 029dce8..9f5f389 100644
      attachments = (unsigned int *) &stuff[1];
      buffers = DRI2GetBuffers(pDrawable, &width, &height,
  			     attachments, stuff->count, &count);
-@@ -276,6 +279,9 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client)
-     if (!validDrawable(client, stuff->drawable, &pDrawable, &status))
+@@ -282,6 +285,9 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client)
+ 		       &pDrawable, &status))
  	return status;
  
 +    if (DRI2WaitSwap(client, pDrawable))
@@ -424,7 +424,7 @@ index 029dce8..9f5f389 100644
      attachments = (unsigned int *) &stuff[1];
      buffers = DRI2GetBuffersWithFormat(pDrawable, &width, &height,
  				       attachments, stuff->count, &count);
-@@ -322,6 +328,21 @@ ProcDRI2CopyRegion(ClientPtr client)
+@@ -329,6 +335,22 @@ ProcDRI2CopyRegion(ClientPtr client)
  }
  
  static int
@@ -436,7 +436,8 @@ index 029dce8..9f5f389 100644
 +
 +    REQUEST_SIZE_MATCH(xDRI2SwapBuffersReq);
 +
-+    if (!validDrawable(client, stuff->drawable, &pDrawable, &status))
++    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
++			&pDrawable, &status))
 +	return status;
 +
 +    return DRI2SwapBuffers(pDrawable);
@@ -446,7 +447,7 @@ index 029dce8..9f5f389 100644
  ProcDRI2Dispatch (ClientPtr client)
  {
      REQUEST(xReq);
-@@ -349,6 +370,8 @@ ProcDRI2Dispatch (ClientPtr client)
+@@ -356,6 +378,8 @@ ProcDRI2Dispatch (ClientPtr client)
  	return ProcDRI2CopyRegion(client);
      case X_DRI2GetBuffersWithFormat:
  	return ProcDRI2GetBuffersWithFormat(client);
@@ -456,5 +457,5 @@ index 029dce8..9f5f389 100644
  	return BadRequest;
      }
 -- 
-1.6.0.6
+1.6.3.rc1.2.g0164.dirty
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	28 Aug 2009 03:03:41 -0000	1.66
+++ sources	1 Sep 2009 06:22:47 -0000	1.67
@@ -1 +1 @@
-4817f1285140b16ef99c735afc72be0d  xorg-server-20090828.tar.xz
+941c731970321668b88a8af0805fccfb  xorg-server-20090901.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- xorg-x11-server.spec	28 Aug 2009 03:03:41 -0000	1.480
+++ xorg-x11-server.spec	1 Sep 2009 06:22:47 -0000	1.481
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090828
+%define gitdate 20090901
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   43.%{gitdate}%{?dist}
+Release:   44.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -48,9 +48,6 @@ Source30: find-provides
 
 Patch5: xserver-1.4.99-pic-libxf86config.patch
 
-# airlied to upstream for 1.7
-Patch100: xserver-1.6.99-vga-arb.patch
-
 # OpenGL compositing manager feature/optimization patches.
 Patch103:  xserver-1.5.0-bg-none-root.patch
 Patch104:  dri2-page-flip.patch
@@ -507,6 +504,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Sep 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-44.20090901
+- Today's git snapshot (incl. vga-arbitration).
+- dri2-page-flip.patch: rebase.
+- xserver-1.6.99-vga-arb.patch: Drop.
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-43.20090828
 - Today's git snapshot.
 


--- xserver-1.6.99-vga-arb.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  1 06:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:32:47 +0000
Subject: [pkgdb] maven-shared: akurtakov has requested approveacls
Message-ID: <20090901063247.F205810F9A9@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on maven-shared (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 06:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:32:49 +0000
Subject: [pkgdb] maven-shared: akurtakov has requested commit
Message-ID: <20090901063250.0018810F9AC@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven-shared (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 06:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:32:52 +0000
Subject: [pkgdb] maven-shared: akurtakov has requested watchcommits
Message-ID: <20090901063252.0DF3610F9B1@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven-shared (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 06:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:32:55 +0000
Subject: [pkgdb] maven-shared: akurtakov has requested watchbugzilla
Message-ID: <20090901063255.0CB4D10F9B2@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven-shared (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 06:34:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:34:57 +0000
Subject: [pkgdb] maven-scm: akurtakov has requested approveacls
Message-ID: <20090901063457.CC60010F922@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on maven-scm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From pkgdb at fedoraproject.org  Tue Sep  1 06:34:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:34:59 +0000
Subject: [pkgdb] maven-scm: akurtakov has requested commit
Message-ID: <20090901063459.7972310F925@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven-scm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From pkgdb at fedoraproject.org  Tue Sep  1 06:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:35:01 +0000
Subject: [pkgdb] maven-scm: akurtakov has requested watchcommits
Message-ID: <20090901063501.41B1410F928@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven-scm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From pkgdb at fedoraproject.org  Tue Sep  1 06:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 06:35:03 +0000
Subject: [pkgdb] maven-scm: akurtakov has requested watchbugzilla
Message-ID: <20090901063503.8DF6C10F92B@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven-scm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From transif at fedoraproject.org  Tue Sep  1 06:46:58 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 06:46:58 +0000 (UTC)
Subject: comps/po hi.po,1.21,1.22
Message-ID: <20090901064658.8221D11C00EF@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27812/po

Modified Files:
	hi.po 
Log Message:
Sending translation for Hindi


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 hi.poIndex: hi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hi.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- hi.po	27 May 2009 06:43:58 -0000	1.21
+++ hi.po	1 Sep 2009 06:46:55 -0000	1.22
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.po to Hindi
+# translation of hi.po to Hindi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -7,10 +7,10 @@
 # Rajesh Ranjan <rajesh672 at gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD\n"
+"Project-Id-Version: hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-27 02:27+0000\n"
-"PO-Revision-Date: 2009-05-27 12:13+0530\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-01 12:17+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672 at gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -32,280 +32,302 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "????? ???????? ??????? ?? ?? ???????? ???? ?? ??? ??? ???? ??."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "??????? ?????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ??????? ?????? ???? ?? ???? ?????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???? ?? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "??? ?????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ???????????? ???? ?? ??? ??????? ??????"
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "?????????? ???????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "?????????? ???????? ????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
[...1834 lines suppressed...]
 msgstr "??????? ??????"
 
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f11.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "???? ???????? ???????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1375,21 +1486,25 @@ msgstr ""
 "32 ??? ?????? ?????? ??? ????? ????????? ????????? ?? ??? ??????, ?????? ??????, ?? ???????? "
 "?? ???????, ??? ??? ?????? ?? ????."
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?????????? CAML ???????????? ???? ? ????????? ?? ?????? ?? ?????????? ????? ?? ??? ??????."
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "???? ??????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1397,23 +1512,79 @@ msgstr ""
 "?? ???? ??????? ?? ?????? ?? ?? ?? ?????? ?? ???????, ????????, ????-???? ?? ?????? ??? ???????? "
 "???? ??."
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??? ??????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "??????? ?? ?? ??? ?? ???? ???????? ?? ??? ????? ?? ?????????? ???? ??"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "??????? ?? ?? ??? ????? ?? ??????????????? ??? ?????? ????? ?? ??? ???? ?????????? ?? ???? ??"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????? ?? ????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "?????? ???????? ?? ?????????? ?? ??? ?????? ?? ????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????? ?? (Base)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "????? ?? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????????? ?????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "???????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?? ????? X11 ???????? ??????? ?? ?? ?? ???? ?????????? ?? ??? ?????? ???? ??? ?? ?? ??????, ?????? ????????? ?? ?????? ???????? ???."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "???? ?? ???????? ????? ?????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "??????? ???????? ???????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "??????? ??? ???????? ??????? ?? NetBook/NetTop/MID ?????? ?? ???."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ??????? ?? ???? ?????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????? ?????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1421,7 +1592,7 @@ msgstr ""
 "GNOME ?? ?????????, ?????? ???????? ??????? ?? ?????? ????, ????????, ????? ??????, ?? "
 "?????? ????? ??????? ??."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1429,7 +1600,7 @@ msgstr ""
 "KDE ?? ?????????, ?????? ???????? ??????? ?? ?????? ????, ????????, ????? ??????, ?? "
 "?????? ????? ??????? ??."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1437,11 +1608,11 @@ msgstr ""
 "??? ???????? ?????? ?? ??? ?? ???? ???? ???? ?? ????????? ???? ????? ????? ?? ??????? ???? "
 "?? ?????? ???? ???. ????? ?????? ?? ???? ??."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "X?????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1449,27 +1620,27 @@ msgstr ""
 "?? ??????? ?? DocBook ??????? ??? ????????????? ???? ?? ?????? HTML, PDF, ??????????????, ?? "
 "???????? ??? ??? ???? ???."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?? ???? ??????? ???????? ?? ???? ????? ????? ?? ???? ??."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ??????? ?? ???? ?? ???? ??????? ? ???????? ?? ???? ??."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ??????? ?? ???? ?? ???? ??????? ? ???????? ?? ???? ??."
 



From akurtakov at fedoraproject.org  Tue Sep  1 06:54:20 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 06:54:20 +0000 (UTC)
Subject: rpms/maven-plugin-tools/devel maven-plugin-tools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901065420.0F42A11C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31652/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maven-plugin-tools.spec 
Log Message:
Initial import.


--- NEW FILE maven-plugin-tools.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:           maven-plugin-tools
Version:        2.1
Release:        5%{?dist}
Epoch:          0
Summary:        Maven Plugin Tools
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://maven.apache.org/plugin-tools/
Source0:        %{name}-%{version}-src.tar.gz
# svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-plugin-tools-2.1
# tar czf maven-plugin-tools-2.1-src.tar.gz maven-plugin-tools-2.1

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:    jpackage-utils >= 0:1.7.2
BuildRequires:    maven2 >= 2.0.4-9
BuildRequires:    maven2-plugin-compiler
BuildRequires:    maven2-plugin-install
BuildRequires:    maven2-plugin-jar
BuildRequires:    maven2-plugin-javadoc
BuildRequires:    maven2-plugin-resources
BuildRequires:    maven2-plugin-surefire = 2.3
BuildRequires:    maven-surefire-provider-junit = 2.3
BuildRequires:    maven2-common-poms >= 1.0-2
BuildRequires:    maven-doxia
BuildRequires:    classworlds
BuildRequires:    plexus-container-default
BuildRequires:    plexus-utils >= 1.4.5
BuildRequires:    java-devel

BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api

Requires(post):    jpackage-utils >= 0:1.7.2
Requires(postun):  jpackage-utils >= 0:1.7.2

%description
The Maven Plugin Tools contains the necessary tools to play with Maven Plugins.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
Java API documentation for %{name}.

%prep
%setup -q -n %{name}-%{version}

%build

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
    -e \
    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
    install

# Manual iteration should not be needed, but there is a bug in the javadoc
# plugin which makes this necessary. See:
# http://jira.codehaus.org/browse/MJAVADOC-157
for dir in %{name}-*; do
    pushd $dir >& /dev/null
        mvn-jpp \
            -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
            javadoc:javadoc
    popd >& /dev/null
done

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}

install -pm 644 maven-plugin-tools-ant/target/maven-plugin-tools-ant-%{version}.jar \
                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/ant-%{version}.jar
install -pm 644 maven-plugin-tools-api/target/maven-plugin-tools-api-%{version}.jar \
                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/api-%{version}.jar
install -pm 644 maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-%{version}.jar \
                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/beanshell-%{version}.jar
install -pm 644 maven-plugin-tools-java/target/maven-plugin-tools-java-%{version}.jar \
                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/java-%{version}.jar
install -pm 644 maven-plugin-tools-model/target/maven-plugin-tools-model-%{version}.jar \
                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/model-%{version}.jar

(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -pm 644 pom.xml \
                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
%add_to_maven_depmap org.apache.maven %{name} %{version} JPP/%{name} %{name}

install -pm 644 maven-plugin-tools-ant/pom.xml \
                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ant.pom
%add_to_maven_depmap org.apache.maven %{name}-ant %{version} JPP/%{name} ant

install -pm 644 maven-plugin-tools-api/pom.xml \
                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-api.pom
%add_to_maven_depmap org.apache.maven %{name}-api %{version} JPP/%{name} api

install -pm 644 maven-plugin-tools-beanshell/pom.xml \
                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-beanshell.pom
%add_to_maven_depmap org.apache.maven %{name}-beanshell %{version} JPP/%{name} beanshell

install -pm 644 maven-plugin-tools-java/pom.xml \
                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-java.pom
%add_to_maven_depmap org.apache.maven %{name}-java %{version} JPP/%{name} java

install -pm 644 maven-plugin-tools-model/pom.xml \
                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-model.pom
%add_to_maven_depmap org.apache.maven %{name}-model %{version} JPP/%{name} model

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

for dir in %{name}-*; do
    install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$dir
    cp -pr $dir/target/site/apidocs/* \
        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$dir/
done

ln -s %{name}-%{version} \
     $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-5
- Set minimum version for plexus-utils BR.
- BR java-devel.
- Fix javadoc subpackage description.

* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-4
- Adapt for Fedora.

* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> - 0:2.1-3
- Fix license
- Fix URL

* Mon Apr 27 2009 Yong Yang <yyang at redhat.com> - 0:2.1-2
- Add BRs for maven-doxia*
- Rebuild with maven2-2.0.8 built in non-bootstrap mode

* Mon Mar 09 2009 Yong Yang <yyang at redhat.com> - 0:2.1-1
- Import from dbhole's maven2 2.0.8 packages

* Mon Apr 07 2008 Deepak Bhole <dbhole at redhat.com> - 0:2.1-0jpp.1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:14:42 -0000	1.1
+++ .cvsignore	1 Sep 2009 06:54:19 -0000	1.2
@@ -0,0 +1 @@
+maven-plugin-tools-2.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:14:43 -0000	1.1
+++ sources	1 Sep 2009 06:54:19 -0000	1.2
@@ -0,0 +1 @@
+b1059d97450f5f0cd0ff78d84f8da3f6  maven-plugin-tools-2.1-src.tar.gz



From petersen at fedoraproject.org  Tue Sep  1 07:38:52 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  1 Sep 2009 07:38:52 +0000 (UTC)
Subject: rpms/gettext/devel gettext.spec,1.99,1.100
Message-ID: <20090901073852.EE83311C00EF@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986

Modified Files:
	gettext.spec 
Log Message:
- bring back autopoint requires cvs (#517361)
- require info rather than /sbin/install-info
- drop install_info and remove_install_info macros




Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gettext.spec	24 Jul 2009 23:54:47 -0000	1.99
+++ gettext.spec	1 Sep 2009 07:38:51 -0000	1.100
@@ -5,14 +5,12 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 BuildRequires: autoconf >= 2.5
 BuildRequires: automake
 BuildRequires: libtool, bison, gcc-c++
@@ -30,6 +28,10 @@ BuildRequires: zip, unzip
 # need expat for xgettext on glade
 Buildrequires: expat-devel
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# for autopoint:
+Requires: cvs
+Requires(post): info
+Requires(preun): info
 Patch5: gettext-0.17-open-args.patch
 Patch6: gettext-0.17-autopoint-CVS-441481.patch
 Patch7: gettext-0.17-rpathFix.patch
@@ -54,8 +56,8 @@ Group: Development/Tools
 License: LGPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post): info
+Requires(preun): info
 
 
 %description devel
@@ -178,20 +180,15 @@ make check
 %endif
 
 
-%define install_info /sbin/install-info
-%define remove_install_info /sbin/install-info --delete
-
-
 %post
 /sbin/ldconfig
-%{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir || :
 
 
 %preun
 if [ "$1" = 0 ]; then
-    %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || :
+  /sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir || :
 fi
-exit 0
 
 
 %postun -p /sbin/ldconfig
@@ -199,12 +196,12 @@ exit 0
 
 %post devel
 /sbin/ldconfig
-%{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/autosprintf.info %{_infodir}/dir || :
 
 
 %preun devel
 if [ "$1" = 0 ]; then
-    %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir || :
+  /sbin/install-info --delete %{_infodir}/autosprintf.info %{_infodir}/dir || :
 fi
 
 
@@ -271,6 +268,11 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Jens Petersen <petersen at redhat.com> - 0.17-15
+- bring back autopoint requires cvs (#517361)
+- requires info rather than /sbin/install-info
+- drop install_info and remove_install_info macros
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Sep  1 07:38:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 07:38:56 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-Plugin-Session.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090901073856.8913311C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16158

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
- switch to new filtering system (perl_default_filter)
- auto-update to 0.25 (by cpan-spec-update 0.01)
- added a new req on perl(Catalyst::Runtime) (version 5.71001)
- added a new req on perl(Digest) (version 0)
- added a new req on perl(File::Spec) (version 0)
- added a new req on perl(File::Temp) (version 0)
- added a new req on perl(MRO::Compat) (version 0)
- added a new req on perl(Moose) (version 0.76)
- altered req on perl(MooseX::Emulate::Class::Accessor::Fast) (0 => 0.00801)
- added a new req on perl(Object::Signature) (version 0)
- added a new req on perl(Tie::RefHash) (version 1.34)
- added a new req on perl(namespace::clean) (version 0.10)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Feb 2009 07:13:51 -0000	1.3
+++ .cvsignore	1 Sep 2009 07:38:56 -0000	1.4
@@ -1,7 +1 @@
-Catalyst-Plugin-Session-0.20.tar.gz
-Catalyst-Plugin-Session-*
-*.rpm
-*.gz
-*.tar
-.build*
-clog
+Catalyst-Plugin-Session-0.25.tar.gz


Index: perl-Catalyst-Plugin-Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel/perl-Catalyst-Plugin-Session.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Plugin-Session.spec	26 Jul 2009 04:14:32 -0000	1.7
+++ perl-Catalyst-Plugin-Session.spec	1 Sep 2009 07:38:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.25
+Release:        1%{?dist}
 Summary:        Catalyst generic session plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,7 +8,7 @@ URL:            http://search.cpan.org/d
 Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       perl(MooseX::Emulate::Class::Accessor::Fast)
+Requires:       perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(Catalyst) >= 5.7010
@@ -17,6 +17,12 @@ BuildRequires:  perl(Digest)
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Object::Signature)
 BuildRequires:  perl(Tie::RefHash) >= 1.34
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(namespace::clean) >= 0.10
+BuildRequires:  perl(Moose) >= 0.76
+BuildRequires:  perl(Catalyst::Runtime) >= 5.71001
+BuildRequires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
 # test
 BuildRequires:  perl(Test::Deep)
 BuildRequires:  perl(Test::Exception)
@@ -32,13 +38,18 @@ BuildRequires:  perl(Test::Pod::Coverage
 # C::P::S::State::Cookie.  We must not BR C::P::S::State::Cookie to avoid
 # circular build deps.
 
-### auto-added brs!
-BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(File::Spec)
-BuildRequires:  perl(namespace::clean) >= 0.10
-BuildRequires:  perl(Moose) >= 0.76
-BuildRequires:  perl(Catalyst::Runtime) >= 5.71001
-BuildRequires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
+### auto-added reqs!
+Requires:  perl(Catalyst::Runtime) >= 5.71001
+Requires:  perl(Digest)
+Requires:  perl(File::Spec)
+Requires:  perl(File::Temp)
+Requires:  perl(MRO::Compat)
+Requires:  perl(Moose) >= 0.76
+Requires:  perl(Object::Signature)
+Requires:  perl(Tie::RefHash) >= 1.34
+Requires:  perl(namespace::clean) >= 0.10
+
+%{?perl_default_filter}
 
 %description
 This plugin is the base of two related parts of functionality
@@ -57,17 +68,6 @@ This plugin links the two pieces togethe
 %prep
 %setup -q -n Catalyst-Plugin-Session-%{version}
 
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'`
-%{__perl_provides} $FOO | sed -e '/perl([St].*)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Catalyst-Plugin-Session-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -95,6 +95,20 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
+- switch to new filtering system (perl_default_filter)
+- auto-update to 0.25 (by cpan-spec-update 0.01)
+- added a new req on perl(Catalyst::Runtime) (version 5.71001)
+- added a new req on perl(Digest) (version 0)
+- added a new req on perl(File::Spec) (version 0)
+- added a new req on perl(File::Temp) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+- added a new req on perl(Moose) (version 0.76)
+- altered req on perl(MooseX::Emulate::Class::Accessor::Fast) (0 => 0.00801)
+- added a new req on perl(Object::Signature) (version 0)
+- added a new req on perl(Tie::RefHash) (version 1.34)
+- added a new req on perl(namespace::clean) (version 0.10)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 May 2009 07:27:41 -0000	1.4
+++ sources	1 Sep 2009 07:38:56 -0000	1.5
@@ -1 +1 @@
-67488c4084f95254bbc84d8ecad0a984  Catalyst-Plugin-Session-0.22.tar.gz
+97c261322b3de46174a38d7a513022d0  Catalyst-Plugin-Session-0.25.tar.gz



From akurtakov at fedoraproject.org  Tue Sep  1 07:40:19 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 07:40:19 +0000 (UTC)
Subject: rpms/maven-enforcer-rule-api/devel
	maven-enforcer-rule-api-jpp-depmap.xml, NONE,
	1.1 maven-enforcer-rule-api.spec, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090901074019.DD9C711C0498@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-enforcer-rule-api/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16841/devel

Modified Files:
	sources .cvsignore 
Added Files:
	maven-enforcer-rule-api-jpp-depmap.xml 
	maven-enforcer-rule-api.spec 
Log Message:
Initial import.


--- NEW FILE maven-enforcer-rule-api-jpp-depmap.xml ---
<dependencies>
  <dependency>
    <maven>
      <groupId>com.thoughtworks.qdox</groupId>
      <artifactId>qdox</artifactId>
      <version>1.6.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>qdox</artifactId>
      <version>1.6.1</version>
    </jpp>
  </dependency>
</dependencies>



--- NEW FILE maven-enforcer-rule-api.spec ---
%define namedversion 1.0-alpha-2

Name:       maven-enforcer-rule-api
Version:    1.0
Release:    0.1.a2.1.5%{?dist}
Summary:    Generic interfaces needed by maven-enforcer-plugin

Group:      Development/Libraries
License:    ASL 2.0
URL:        http://svn.apache.org/repos/asf/maven/shared/tags/maven-enforcer-rule-api-1.0-alpha-2

# svn export \
#http://svn.apache.org/repos/asf/maven/shared/tags/maven-enforcer-rule-api-1.0-alpha-2
# tar czf maven-enforcer-rule-api-1.0-alpha-2-src.tar.gz \
# maven-enforcer-rule-api-1.0-alpha-2
Source0:    maven-enforcer-rule-api-%{namedversion}-src.tar.gz
Source1:    %{name}-jpp-depmap.xml

BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-checkstyle
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-pmd
BuildRequires:  maven2-plugin-project-info-reports
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  maven-doxia
BuildRequires:  checkstyle
BuildRequires:  plexus-maven-plugin >= 0:1.3.5
BuildRequires:  qdox
BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api

Requires:       maven2
Requires(post):   jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2


%description
This component provides the generic interfaces needed to implement custom
rules for the maven-enforcer-plugin.

%package javadoc
Summary:    Javadoc for maven-enforcer-rule-api
Group:      Documentation

%description javadoc
Java API documentation for enforcer-rule-api.

%prep
%setup -q -n %{name}-%{namedversion}

%build

export MAVEN_REPO_LOCAL=`pwd`/.m2
mkdir $MAVEN_REPO_LOCAL

mvn-jpp \
    -Dmaven.test.failure.ignore=true \
    -Dmaven2.jpp.depmap.file=%{SOURCE1} \
    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
    install javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT

# install jar
install -dm 755 $RPM_BUILD_ROOT/%{_javadir}
cp -p target/%{name}-%{namedversion}.jar \
      $RPM_BUILD_ROOT/%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar

#install pom
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
cp -p pom.xml \
  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-enforcer-rule-api.pom

#depmap entry
%add_to_maven_depmap org.apache.maven.shared maven-enforcer-rule-api %{namedversion} JPP maven-enforcer-rule-api

# install javadoc
install -dm 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
cp -a target/site/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/maven2/poms/JPP-maven-enforcer-rule-api.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}

%changelog
* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.1.a2.1.5
- Fix line lenght.
- Remove with/without maven.

* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 1.0-0.1.a2.1.4
- Fix license

* Mon Apr 27 2009 Yong Yang <yyang at redhat.com> 1.0-0.1.a2.1.3
- Add missing BRs maven-doxia*, checkstyle, plexus-maven-plugin, qdox
- Add jpp-depmap
- Rebuild with maven2-2.0.8 built in non-bootstrap mode

* Mon Mar 09 2009 Yong Yang <yyang at redhat.com> 1.0-0.1.a2.1.2
- Import from dbhole's maven2 2.0.8 packages, Initial build on JPP6

* Wed Dec 03 2008 Deepak Bhole <dbhole at redhat.com> 1.0-1.1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-enforcer-rule-api/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:17:21 -0000	1.1
+++ sources	1 Sep 2009 07:40:19 -0000	1.2
@@ -0,0 +1 @@
+4fe6dd9de1ddb6b9a6142dff18a957c8  maven-enforcer-rule-api-1.0-alpha-2-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-enforcer-rule-api/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:17:21 -0000	1.1
+++ .cvsignore	1 Sep 2009 07:40:19 -0000	1.2
@@ -0,0 +1 @@
+maven-enforcer-rule-api-1.0-alpha-2-src.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  1 07:41:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 07:41:18 +0000
Subject: [pkgdb] ganymed-ssh2: akurtakov has requested watchcommits
Message-ID: <20090901074118.78BEC10F888@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on ganymed-ssh2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 07:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 07:41:17 +0000
Subject: [pkgdb] ganymed-ssh2: akurtakov has requested watchbugzilla
Message-ID: <20090901074117.B4F5810F87F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on ganymed-ssh2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 07:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 07:41:20 +0000
Subject: [pkgdb] ganymed-ssh2: akurtakov has requested commit
Message-ID: <20090901074120.E6D4B10F894@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on ganymed-ssh2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 07:41:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 07:41:22 +0000
Subject: [pkgdb] ganymed-ssh2: akurtakov has requested approveacls
Message-ID: <20090901074122.D170C10F897@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on ganymed-ssh2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From akurtakov at fedoraproject.org  Tue Sep  1 07:47:01 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 07:47:01 +0000 (UTC)
Subject: rpms/maven-archiver/devel maven-archiver.spec, NONE, 1.1 sources,
	1.1, 1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090901074701.3B57D11C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18411/devel

Modified Files:
	sources .cvsignore 
Added Files:
	maven-archiver.spec 
Log Message:
Initial import.


--- NEW FILE maven-archiver.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define namedversion 1.0-alpha-7

Name:           maven-archiver
Version:        2.2
Release:        2%{?dist}
Epoch:          0
Summary:        Maven Archiver
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://maven.apache.org/

# svn export \
# https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.2 \
# maven-archiver
# Note: Exported revision 776866.
# tar czf maven-archiver-2.2-src.tgz maven-archiver/
Source0:        %{name}-%{version}-src.tgz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-surefire
BuildRequires:  plexus-archiver >= 1.0-0.1.a7

Requires:       maven2 >= 0:2.0.4-9
Requires:       plexus-archiver >= 1.0-0.1.a7

Requires(post):   jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2

%description
The Maven Archiver is used by other Maven plugins
to handle packaging

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}

%build

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
    -e \
    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
    install javadoc:javadoc


%install
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

# Copy file and create unversioned symlink
install -pm 644 target/%{name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Copy pom
install -pm 644 pom.xml \
  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
%add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}
%{_datadir}/maven2/poms/JPP-maven-archiver.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-2
- Fix line length.
- Own only specific fragment and pom.

* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0:2.2-1
- Fix license
- Update instructions to obtain sources
- Refresh source tar ball

* Thu Jul 26 2007 Deepak Bhole <dbhole at redhat.com> 0:2.2-0jpp.1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:18:33 -0000	1.1
+++ sources	1 Sep 2009 07:47:00 -0000	1.2
@@ -0,0 +1 @@
+f8677c83f40badb5b81e1ae5c6fe4d69  maven-archiver-2.2-src.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:18:33 -0000	1.1
+++ .cvsignore	1 Sep 2009 07:47:01 -0000	1.2
@@ -0,0 +1 @@
+maven-archiver-2.2-src.tgz



From cweyl at fedoraproject.org  Tue Sep  1 07:47:21 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 07:47:21 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Static-Simple/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-Plugin-Static-Simple.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20090901074721.735CE11C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18526

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Static-Simple.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
- switch to new filtering system
- auto-update to 0.22 (by cpan-spec-update 0.01)
- altered br on perl(Catalyst::Runtime) (5.30 => 5.80008)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new br on CPAN (inc::Module::Install::AutoInstall found)
- added a new req on perl(Catalyst::Runtime) (version 5.80008)
- added a new req on perl(MIME::Types) (version 1.25)
- added a new req on perl(MRO::Compat) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Mar 2008 18:56:52 -0000	1.5
+++ .cvsignore	1 Sep 2009 07:47:21 -0000	1.6
@@ -1 +1 @@
-Catalyst-Plugin-Static-Simple-0.20.tar.gz
+Catalyst-Plugin-Static-Simple-0.22.tar.gz


Index: perl-Catalyst-Plugin-Static-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel/perl-Catalyst-Plugin-Static-Simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Catalyst-Plugin-Static-Simple.spec	26 Jul 2009 04:16:48 -0000	1.9
+++ perl-Catalyst-Plugin-Static-Simple.spec	1 Sep 2009 07:47:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Static-Simple
-Version:        0.21
-Release:        2%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Make serving static pages painless
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,24 +10,31 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# core
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Test::More)
-# cpan
 BuildRequires:  perl(Catalyst) >= 5.30
 BuildRequires:  perl(HTTP::Request::AsCGI)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(MIME::Types) >= 1.25
-# test
 BuildRequires:  perl(Catalyst::Plugin::SubRequest)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(CPAN)
+BuildRequires:  perl(MRO::Compat)
+BuildRequires:  perl(Catalyst::Runtime) >= 5.80008
 
 Requires:       perl(Catalyst) >= 5.30
-
-### auto-added brs!
-BuildRequires:  perl(MRO::Compat)
-BuildRequires:  perl(Catalyst::Runtime) >= 5.30
+Requires:       perl(Catalyst::Runtime) >= 5.80008
+Requires:       perl(MIME::Types) >= 1.25
+Requires:       perl(MRO::Compat)
+
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11 (yet)
+%{?filter_setup: %{expand:
+%filter_provides_in %{perl_vendorarch}/.*\\.so$
+%filter_provides_in %{_docdir}
+%filter_requires_in %{_docdir}
+%filter_setup
+}}
 
 %description
 The Static::Simple plugin is designed to make serving static content in
@@ -37,29 +44,9 @@ single line of code from you.
 %prep
 %setup -q -n Catalyst-Plugin-Static-Simple-%{version}
 
-find t/*.t -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +
+find t/*.t -type f -exec perl -pi -e 's|^#!perl|#!%{__perl}|' {} +
 find .     -type f -exec perl -pi -e 's/\r//' {} +
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(TestApp)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Catalyst-Plugin-Static-Simple-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(Catalyst)$/d; /perl(File::Spec::Functions)/d; /perl(FindBin)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Catalyst-Plugin-Static-Simple-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -87,6 +74,16 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
+- switch to new filtering system
+- auto-update to 0.22 (by cpan-spec-update 0.01)
+- altered br on perl(Catalyst::Runtime) (5.30 => 5.80008)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new br on CPAN (inc::Module::Install::AutoInstall found)
+- added a new req on perl(Catalyst::Runtime) (version 5.80008)
+- added a new req on perl(MIME::Types) (version 1.25)
+- added a new req on perl(MRO::Compat) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 May 2009 07:34:48 -0000	1.6
+++ sources	1 Sep 2009 07:47:21 -0000	1.7
@@ -1 +1 @@
-6ea51e9557e73ea839485d781589930c  Catalyst-Plugin-Static-Simple-0.21.tar.gz
+77f29fdfddb71c718bd755c744adb3e2  Catalyst-Plugin-Static-Simple-0.22.tar.gz



From cweyl at fedoraproject.org  Tue Sep  1 07:50:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 07:50:51 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-Plugin-Session-State-Cookie.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090901075051.BB2EE11C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19706

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-Cookie.spec 
	sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- switch req/prov filtering systems...
- auto-update to 0.14 (by cpan-spec-update 0.01)
- added a new br on perl(Moose) (version 0)
- added a new br on perl(namespace::autoclean) (version 0)
- added a new req on perl(Moose) (version 0)
- added a new req on perl(namespace::autoclean) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Aug 2009 06:36:57 -0000	1.5
+++ .cvsignore	1 Sep 2009 07:50:51 -0000	1.6
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-Cookie-0.12.tar.gz
+Catalyst-Plugin-Session-State-Cookie-0.14.tar.gz


Index: perl-Catalyst-Plugin-Session-State-Cookie.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/perl-Catalyst-Plugin-Session-State-Cookie.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Plugin-Session-State-Cookie.spec	8 Aug 2009 06:36:58 -0000	1.8
+++ perl-Catalyst-Plugin-Session-State-Cookie.spec	1 Sep 2009 07:50:51 -0000	1.9
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Plugin-Session-State-Cookie
-Version:        0.12
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Maintain session IDs using cookies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-State-Cookie/
-Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -13,23 +13,31 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Catalyst) >= 5.80005
 BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.19
+BuildRequires:  perl(Moose)
 BuildRequires:  perl(MRO::Compat)
+BuildRequires:  perl(namespace::autoclean)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::MockObject) >= 1.01
 # optional tests
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
-
-# not automatically picked up
-Requires:       perl(Catalyst::Plugin::Session) >= 0.19
-
 # until M::I is brought up...
 BuildRequires:  perl(CPAN)
 
-### auto-added reqs!
-Requires:  perl(Catalyst) >= 5.80005
-Requires:  perl(MRO::Compat)
+Requires:       perl(Catalyst::Plugin::Session) >= 0.19
+Requires:       perl(Moose)
+Requires:       perl(namespace::autoclean)
+Requires:       perl(Catalyst) >= 5.80005
+Requires:       perl(MRO::Compat)
+
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11 (yet)
+%{?filter_setup: %{expand:
+%filter_provides_in %{perl_vendorarch}/.*\\.so$
+%filter_provides_in %{_docdir}
+%filter_requires_in %{_docdir}
+%filter_setup
+}}
 
 %description
 In order for Catalyst::Plugin::Session to work the session ID needs to
@@ -40,18 +48,6 @@ client, through a cookie.
 %prep
 %setup -q -n Catalyst-Plugin-Session-State-Cookie-%{version}
 
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'`
-%{__perl_provides} $FOO
-EOF
-
-%define __perl_provides %{_builddir}/Catalyst-Plugin-Session-State-Cookie-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -79,6 +75,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- switch req/prov filtering systems...
+- auto-update to 0.14 (by cpan-spec-update 0.01)
+- added a new br on perl(Moose) (version 0)
+- added a new br on perl(namespace::autoclean) (version 0)
+- added a new req on perl(Moose) (version 0)
+- added a new req on perl(namespace::autoclean) (version 0)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - auto-update to 0.12 (by cpan-spec-update 0.01)
 - altered br on perl(Catalyst) (5.7010 => 5.80005)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Aug 2009 06:36:58 -0000	1.5
+++ sources	1 Sep 2009 07:50:51 -0000	1.6
@@ -1 +1 @@
-f5dc01dab3b2b5de8ee45257f2dfe37a  Catalyst-Plugin-Session-State-Cookie-0.12.tar.gz
+d6d98d026613ccf54c55bb1dba7aa7a1  Catalyst-Plugin-Session-State-Cookie-0.14.tar.gz



From cweyl at fedoraproject.org  Tue Sep  1 07:55:12 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  1 Sep 2009 07:55:12 +0000 (UTC)
Subject: rpms/perl-Event/devel .cvsignore, 1.6, 1.7 perl-Event.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090901075512.401EB11C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21419

Modified Files:
	.cvsignore perl-Event.spec sources 
Log Message:
* Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.12-1
- add perl_default_filter
- auto-update to 1.12 (by cpan-spec-update 0.01)
- added a new req on perl(Test) (version 1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 May 2008 06:31:56 -0000	1.6
+++ .cvsignore	1 Sep 2009 07:55:11 -0000	1.7
@@ -1 +1 @@
-Event-1.11.tar.gz
+Event-1.12.tar.gz


Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/perl-Event.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Event.spec	26 Jul 2009 05:52:06 -0000	1.13
+++ perl-Event.spec	1 Sep 2009 07:55:11 -0000	1.14
@@ -1,23 +1,25 @@
 Name:           perl-Event
-Version:        1.11
-Release:        3%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Event loop processing
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
-URL:            http://search.cpan.org/dist/Event/ 
+URL:            http://search.cpan.org/dist/Event/
 Source0:        http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/Event-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# non-perl
 BuildRequires:  /usr/bin/iconv
-# core
+
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Time::HiRes)
+BuildRequires:  perl(Test) >= 1
 
 Requires:       perl(Time::HiRes)
 
+%{?perl_default_filter}
+
 %description
 The Event module provide a central facility to watch for various types of
 events and invoke a callback when these events occur. The idea is to delay the
@@ -26,20 +28,20 @@ safe for callbacks to execute.
 
 
 %prep
-%setup -q -n Event-%{version} 
+%setup -q -n Event-%{version}
 
 # generate our two licenses...
 perldoc perlgpl      > LICENSE.GPL
 perldoc perlartistic > LICENSE.Artistic
 
-# appease rpmlint :) 
+# appease rpmlint :)
 find . -type f -exec chmod -c -x {} +
 %{_fixperms} demo util
-find t/ -type f -exec perl -pi -e 's|^#!\./perl|#!/usr/bin/perl|' {} +
+find t/ -type f -exec perl -pi -e 's|^#!\./perl|#!%{__perl}|' {} +
 
 # fix some other interperter issues..
 cd demo
-perl -pi -e 's|#!./perl|#!/usr/bin/perl|' *.t ../util/bench.pl
+perl -pi -e 's|#!./perl|#!%{__perl}|' *.t ../util/bench.pl
 
 
 %build
@@ -53,7 +55,7 @@ for i in *.pm ; do
 done
 
 # make sure the man page is UTF-8...
-cd ../blib/man3 
+cd ../blib/man3
 iconv --from=ISO-8859-1 --to=UTF-8 Event.3pm > Event.3pm.new
 mv Event.3pm.new Event.3pm
 
@@ -86,6 +88,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.12-1
+- add perl_default_filter
+- auto-update to 1.12 (by cpan-spec-update 0.01)
+- added a new req on perl(Test) (version 1)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 May 2008 06:31:56 -0000	1.6
+++ sources	1 Sep 2009 07:55:12 -0000	1.7
@@ -1 +1 @@
-73fe100c2a40ac027fb5d992bbf74eaa  Event-1.11.tar.gz
+f09285ef0388be739fbb83bc3a221977  Event-1.12.tar.gz



From jwrdegoede at fedoraproject.org  Tue Sep  1 08:07:14 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Sep 2009 08:07:14 +0000 (UTC)
Subject: rpms/libv4l/devel .cvsignore, 1.19, 1.20 libv4l.spec, 1.20,
	1.21 sources, 1.19, 1.20
Message-ID: <20090901080714.618A111C00EF@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24786

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
- New upstream release 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Jul 2009 12:20:44 -0000	1.19
+++ .cvsignore	1 Sep 2009 08:07:13 -0000	1.20
@@ -1 +1 @@
-libv4l-0.6.0.tar.gz
+libv4l-0.6.1.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/libv4l.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libv4l.spec	25 Jul 2009 08:51:05 -0000	1.20
+++ libv4l.spec	1 Sep 2009 08:07:13 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libv4l
-Version:        0.6.0
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
+- New upstream release 0.6.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Jul 2009 12:20:45 -0000	1.19
+++ sources	1 Sep 2009 08:07:14 -0000	1.20
@@ -1 +1 @@
-db389fdf02cabd57f289f0faa37f4060  libv4l-0.6.0.tar.gz
+0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz



From jwrdegoede at fedoraproject.org  Tue Sep  1 08:07:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Sep 2009 08:07:23 +0000 (UTC)
Subject: rpms/libv4l/F-11 .cvsignore, 1.19, 1.20 libv4l.spec, 1.19,
	1.20 sources, 1.19, 1.20
Message-ID: <20090901080723.8B53911C00EF@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24847

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
- New upstream release 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Jul 2009 12:31:09 -0000	1.19
+++ .cvsignore	1 Sep 2009 08:07:23 -0000	1.20
@@ -1 +1 @@
-libv4l-0.6.0.tar.gz
+libv4l-0.6.1.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/libv4l.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libv4l.spec	9 Jul 2009 12:31:09 -0000	1.19
+++ libv4l.spec	1 Sep 2009 08:07:23 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
+- New upstream release 0.6.1
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.0-1
 - New upstream release 0.6.0
 - This fixes a divide by 0 crash in the whitebalancing code (#507748)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Jul 2009 12:31:09 -0000	1.19
+++ sources	1 Sep 2009 08:07:23 -0000	1.20
@@ -1 +1 @@
-db389fdf02cabd57f289f0faa37f4060  libv4l-0.6.0.tar.gz
+0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz



From jwrdegoede at fedoraproject.org  Tue Sep  1 08:08:09 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Sep 2009 08:08:09 +0000 (UTC)
Subject: rpms/libv4l/F-10 .cvsignore, 1.17, 1.18 libv4l.spec, 1.16,
	1.17 sources, 1.17, 1.18
Message-ID: <20090901080809.3290711C00EF@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25133

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
- New upstream release 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	9 Jul 2009 12:31:18 -0000	1.17
+++ .cvsignore	1 Sep 2009 08:08:08 -0000	1.18
@@ -1 +1 @@
-libv4l-0.6.0.tar.gz
+libv4l-0.6.1.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/libv4l.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libv4l.spec	9 Jul 2009 12:31:19 -0000	1.16
+++ libv4l.spec	1 Sep 2009 08:08:08 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
+- New upstream release 0.6.1
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.0-1
 - New upstream release 0.6.0
 - This fixes a divide by 0 crash in the whitebalancing code (#507748)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	9 Jul 2009 12:31:19 -0000	1.17
+++ sources	1 Sep 2009 08:08:09 -0000	1.18
@@ -1 +1 @@
-db389fdf02cabd57f289f0faa37f4060  libv4l-0.6.0.tar.gz
+0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz



From kwizart at fedoraproject.org  Tue Sep  1 08:09:25 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  1 Sep 2009 08:09:25 +0000 (UTC)
Subject: rpms/directfb/F-11 DirectFB-1.2.9-revert.patch, NONE,
	1.1 directfb.spec, 1.31, 1.32
Message-ID: <20090901080925.4FA6D11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25434

Modified Files:
	directfb.spec 
Added Files:
	DirectFB-1.2.9-revert.patch 
Log Message:
Revert wrong SOVERSION Change


DirectFB-1.2.9-revert.patch:
 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE DirectFB-1.2.9-revert.patch ---
diff -up DirectFB-1.2.9/configure.in.revert DirectFB-1.2.9/configure.in
--- DirectFB-1.2.9/configure.in.revert	2009-09-01 09:51:46.029744708 +0200
+++ DirectFB-1.2.9/configure.in	2009-09-01 10:00:14.011744423 +0200
@@ -32,10 +32,10 @@ AC_DEFINE_UNQUOTED(DIRECTFB_VERSION,"$DI
 
 # libtool versioning
 LT_RELEASE=$DIRECTFB_MAJOR_VERSION.$DIRECTFB_MINOR_VERSION
-LT_CURRENT=`expr $DIRECTFB_MICRO_VERSION - $DIRECTFB_INTERFACE_AGE`
-LT_BINARY=`expr $DIRECTFB_MICRO_VERSION - $DIRECTFB_BINARY_AGE`
+LT_CURRENT=$DIRECTFB_INTERFACE_AGE
+LT_BINARY=$DIRECTFB_BINARY_AGE
 LT_REVISION=$DIRECTFB_INTERFACE_AGE
-LT_AGE=`expr $DIRECTFB_BINARY_AGE - $DIRECTFB_INTERFACE_AGE`
+LT_AGE=$DIRECTFB_INTERFACE_AGE
 
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/directfb.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- directfb.spec	31 Aug 2009 12:53:40 -0000	1.31
+++ directfb.spec	1 Sep 2009 08:09:25 -0000	1.32
@@ -1,13 +1,14 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: 1.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
 Source0: http://www.directfb.org/downloads/Core/DirectFB-%{version}.tar.gz
 Patch0: DirectFB-1.2.7-libv4l2.patch
 Patch1: DirectFB-1.2.8-tweak.patch
+Patch2: DirectFB-1.2.9-revert.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
@@ -58,6 +59,7 @@ Development files for DirectFB.
 %setup -q -n DirectFB-%{version}
 %patch0 -p1 -b .libv4l2
 %patch1 -p1 -b .tweak
+%patch2 -p1 -b .revert
 
 #Disable ppc asm since compilation fails (and it seems better to use glibc)
 sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure
@@ -142,7 +144,7 @@ make check
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
 %{_libdir}/libuniquewm*.so.*
-%{_libdir}/directfb-1.2-9/
+%{_libdir}/directfb-1.2-0/
 %{_datadir}/directfb-%{version}/
 %{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/directfbrc.5*
@@ -166,6 +168,9 @@ make check
 
 
 %changelog
+* Tue Sep  1 2009 kwizart < kwizart at gmail.com > - 1.2.9-2
+- Revert soversion bump without an ABI break.
+
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.2.9-1
 - Update to 1.2.9
 



From kwizart at fedoraproject.org  Tue Sep  1 08:12:27 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  1 Sep 2009 08:12:27 +0000 (UTC)
Subject: rpms/directfb/F-10 DirectFB-1.2.9-revert.patch, NONE,
	1.1 directfb.spec, 1.24, 1.25
Message-ID: <20090901081227.8C55411C00EF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26247

Modified Files:
	directfb.spec 
Added Files:
	DirectFB-1.2.9-revert.patch 
Log Message:
Revert wrong ABI bump


DirectFB-1.2.9-revert.patch:
 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE DirectFB-1.2.9-revert.patch ---
diff -up DirectFB-1.2.9/configure.in.revert DirectFB-1.2.9/configure.in
--- DirectFB-1.2.9/configure.in.revert	2009-09-01 09:51:46.029744708 +0200
+++ DirectFB-1.2.9/configure.in	2009-09-01 10:00:14.011744423 +0200
@@ -32,10 +32,10 @@ AC_DEFINE_UNQUOTED(DIRECTFB_VERSION,"$DI
 
 # libtool versioning
 LT_RELEASE=$DIRECTFB_MAJOR_VERSION.$DIRECTFB_MINOR_VERSION
-LT_CURRENT=`expr $DIRECTFB_MICRO_VERSION - $DIRECTFB_INTERFACE_AGE`
-LT_BINARY=`expr $DIRECTFB_MICRO_VERSION - $DIRECTFB_BINARY_AGE`
+LT_CURRENT=$DIRECTFB_INTERFACE_AGE
+LT_BINARY=$DIRECTFB_BINARY_AGE
 LT_REVISION=$DIRECTFB_INTERFACE_AGE
-LT_AGE=`expr $DIRECTFB_BINARY_AGE - $DIRECTFB_INTERFACE_AGE`
+LT_AGE=$DIRECTFB_INTERFACE_AGE
 
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-10/directfb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- directfb.spec	31 Aug 2009 13:03:51 -0000	1.24
+++ directfb.spec	1 Sep 2009 08:12:27 -0000	1.25
@@ -1,13 +1,14 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: 1.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
 Source0: http://www.directfb.org/downloads/Core/DirectFB-%{version}.tar.gz
 Patch0: DirectFB-1.2.7-libv4l2.patch
 Patch1: DirectFB-1.2.8-tweak.patch
+Patch2: DirectFB-1.2.9-revert.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
@@ -58,6 +59,7 @@ Development files for DirectFB.
 %setup -q -n DirectFB-%{version}
 %patch0 -p1 -b .libv4l2
 %patch1 -p1 -b .tweak
+%patch2 -p1 -b .revert
 
 #Disable ppc asm since compilation fails (and it seems better to use glibc)
 sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure
@@ -142,7 +144,7 @@ make check
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
 %{_libdir}/libuniquewm*.so.*
-%{_libdir}/directfb-1.2-9/
+%{_libdir}/directfb-1.2-0/
 %{_datadir}/directfb-%{version}/
 %{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/directfbrc.5*
@@ -166,6 +168,9 @@ make check
 
 
 %changelog
+* Tue Sep  1 2009 kwizart < kwizart at gmail.com > - 1.2.9-2
+- Revert soversion bump without an ABI break.
+
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.2.9-1
 - Update to 1.2.9
 



From pkgdb at fedoraproject.org  Tue Sep  1 08:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:15:53 +0000
Subject: [pkgdb] abrt: npajkovs has requested watchbugzilla
Message-ID: <20090901081553.8FDD710F886@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:15:55 +0000
Subject: [pkgdb] abrt: npajkovs has requested watchcommits
Message-ID: <20090901081555.A540E10F893@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:01 +0000
Subject: [pkgdb] abrt: npajkovs has requested approveacls
Message-ID: <20090901081602.4337710F89B@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:15:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:15:58 +0000
Subject: [pkgdb] abrt: npajkovs has requested commit
Message-ID: <20090901081558.E150510F897@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:06 +0000
Subject: [pkgdb] abrt: npajkovs has requested watchbugzilla
Message-ID: <20090901081606.7876D10F87A@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on abrt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:08 +0000
Subject: [pkgdb] abrt: npajkovs has requested watchcommits
Message-ID: <20090901081608.9104C10F8A2@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on abrt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:10 +0000
Subject: [pkgdb] abrt: npajkovs has requested commit
Message-ID: <20090901081610.7C01210F8A8@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on abrt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:12 +0000
Subject: [pkgdb] abrt: npajkovs has requested approveacls
Message-ID: <20090901081612.A30F410F8AD@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on abrt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:18 +0000
Subject: [pkgdb] abrt: npajkovs has requested watchbugzilla
Message-ID: <20090901081618.58C8D10F890@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:20 +0000
Subject: [pkgdb] abrt: npajkovs has requested watchcommits
Message-ID: <20090901081620.C36DE10F8B1@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:22 +0000
Subject: [pkgdb] abrt: npajkovs has requested commit
Message-ID: <20090901081622.4550210F8B5@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:16:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:16:24 +0000
Subject: [pkgdb] abrt: npajkovs has requested approveacls
Message-ID: <20090901081624.33B3C10F8BA@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:27 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081827.591C610F893@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora devel) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:27 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081827.DC4CD10F898@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora devel) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:29 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081829.371FE10F8A3@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora devel) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:31 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081831.861D210F8A6@bastion2.fedora.phx.redhat.com>

jmoskovc has set the approveacls acl on abrt (Fedora devel) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:33 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081833.1F4AD10F8AA@bastion2.fedora.phx.redhat.com>

jmoskovc has set the approveacls acl on abrt (Fedora 10) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:36 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081836.8BD8910F8B3@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 10) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:35 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081835.0E3DE10F8AF@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora 10) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:39 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081839.AC81410F8B7@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 10) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:41 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081842.0479110F896@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 11) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:43 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081843.F001710F8BA@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 11) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:46 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081846.34C3B10F8BF@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora 11) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:46 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081846.EE74410F8C3@bastion2.fedora.phx.redhat.com>

jmoskovc has set the approveacls acl on abrt (Fedora 11) to Approved for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:53 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081853.4504A10F888@bastion2.fedora.phx.redhat.com>

jmoskovc has set the approveacls acl on abrt (Fedora 11) to Denied for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:56 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081856.3E30A10F8C6@bastion2.fedora.phx.redhat.com>

jmoskovc has set the approveacls acl on abrt (Fedora 10) to Denied for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Sep  1 08:18:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:18:58 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090901081858.97DE110F8CA@bastion2.fedora.phx.redhat.com>

jmoskovc has set the approveacls acl on abrt (Fedora devel) to Denied for npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From mnowak at fedoraproject.org  Tue Sep  1 08:23:20 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue,  1 Sep 2009 08:23:20 +0000 (UTC)
Subject: rpms/libxdg-basedir/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libxdg-basedir.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090901082320.8733711C00EF@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libxdg-basedir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29002/devel

Modified Files:
	.cvsignore import.log libxdg-basedir.spec sources 
Log Message:
1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxdg-basedir/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jun 2009 01:04:13 -0000	1.2
+++ .cvsignore	1 Sep 2009 08:23:20 -0000	1.3
@@ -1 +1 @@
-libxdg-basedir-1.0.1.tar.gz
+libxdg-basedir-1.0.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libxdg-basedir/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Jun 2009 01:04:13 -0000	1.1
+++ import.log	1 Sep 2009 08:23:20 -0000	1.2
@@ -1 +1,2 @@
 libxdg-basedir-1_0_1-2_fc11:HEAD:libxdg-basedir-1.0.1-2.fc11.src.rpm:1244855010
+libxdg-basedir-1_0_2-1_fc11:HEAD:libxdg-basedir-1.0.2-1.fc11.src.rpm:1251793343


Index: libxdg-basedir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxdg-basedir/devel/libxdg-basedir.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libxdg-basedir.spec	25 Jul 2009 08:57:00 -0000	1.2
+++ libxdg-basedir.spec	1 Sep 2009 08:23:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libxdg-basedir
-Version:        1.0.1
-Release:        3%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Implementation of the XDG Base Directory Specifications
 
 Group:          System Environment/Libraries
@@ -85,6 +85,9 @@ make check
 %doc doc/html/
 
 %changelog
+* Tue Sep  1 2009 Michal Nowak <mnowak at redhat.com> - 1.0.2-1
+- 1.0.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxdg-basedir/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jun 2009 01:04:13 -0000	1.2
+++ sources	1 Sep 2009 08:23:20 -0000	1.3
@@ -1 +1 @@
-941dacde04db15164c9aca5a1d856665  libxdg-basedir-1.0.1.tar.gz
+944202425e5359666f268d18671303d4  libxdg-basedir-1.0.2.tar.gz



From kwizart at fedoraproject.org  Tue Sep  1 08:30:03 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  1 Sep 2009 08:30:03 +0000 (UTC)
Subject: rpms/mingw32-cppunit/devel import.log, NONE,
	1.1 mingw32-cppunit.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901083003.2E10211C0498@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/mingw32-cppunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31533/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-cppunit.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
mingw32-cppunit-1_12_1-2_fc11:HEAD:mingw32-cppunit-1.12.1-2.fc11.src.rpm:1251793725


--- NEW FILE mingw32-cppunit.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-cppunit
Version:        1.12.1
Release:        2%{?dist}
Summary:        MinGW Windows C++ unit testing framework

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://cppunit.sourceforge.net/
Source0:        http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
Requires: pkgconfig

%description
CppUnit is the C++ port of the famous JUnit framework for unit testing.
Test output is in XML for automatic testing and GUI based for supervised 
tests.

MinGW Windows C++ unit testing framework.


%prep
%setup -q -n cppunit-%{version}
for file in THANKS ChangeLog NEWS; do
   iconv -f latin1 -t utf8 < $file > ${file}.utf8
   touch -c -r $file ${file}.utf8
   mv ${file}.utf8 $file
done


%build
%_mingw32_configure --disable-static --disable-doxygen

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
%{_mingw32_bindir}/cppunit-config
%{_mingw32_bindir}/DllPlugInTester.exe
%{_mingw32_includedir}/cppunit/
%{_mingw32_bindir}/libcppunit-*.dll
%{_mingw32_libdir}/pkgconfig/cppunit.pc
%{_mingw32_libdir}/libcppunit.dll.a
%{_mingw32_libdir}/libcppunit.la
%{_mingw32_datadir}/aclocal/cppunit.m4
%exclude %{_mingw32_mandir}/man1/cppunit-config.1


%changelog
* Mon Aug 17 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-2
- Fix BR mingw32-gcc-c++
- Update description
- Disable duplicated docs with native package.

* Mon Jan  5 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-1
- Initial package based on original cppunit.spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:15:49 -0000	1.1
+++ .cvsignore	1 Sep 2009 08:30:02 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:15:49 -0000	1.1
+++ sources	1 Sep 2009 08:30:02 -0000	1.2
@@ -0,0 +1 @@
+bd30e9cf5523cdfc019b94f5e1d7fd19  cppunit-1.12.1.tar.gz



From kwizart at fedoraproject.org  Tue Sep  1 08:31:38 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  1 Sep 2009 08:31:38 +0000 (UTC)
Subject: rpms/mingw32-cppunit/F-11 import.log, NONE, 1.1 mingw32-cppunit.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901083138.ABC6A11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/mingw32-cppunit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32014/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-cppunit.spec 
Log Message:
Initial import for F-11



--- NEW FILE import.log ---
mingw32-cppunit-1_12_1-2_fc11:F-11:mingw32-cppunit-1.12.1-2.fc11.src.rpm:1251793800


--- NEW FILE mingw32-cppunit.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-cppunit
Version:        1.12.1
Release:        2%{?dist}
Summary:        MinGW Windows C++ unit testing framework

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://cppunit.sourceforge.net/
Source0:        http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
Requires: pkgconfig

%description
CppUnit is the C++ port of the famous JUnit framework for unit testing.
Test output is in XML for automatic testing and GUI based for supervised 
tests.

MinGW Windows C++ unit testing framework.


%prep
%setup -q -n cppunit-%{version}
for file in THANKS ChangeLog NEWS; do
   iconv -f latin1 -t utf8 < $file > ${file}.utf8
   touch -c -r $file ${file}.utf8
   mv ${file}.utf8 $file
done


%build
%_mingw32_configure --disable-static --disable-doxygen

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
%{_mingw32_bindir}/cppunit-config
%{_mingw32_bindir}/DllPlugInTester.exe
%{_mingw32_includedir}/cppunit/
%{_mingw32_bindir}/libcppunit-*.dll
%{_mingw32_libdir}/pkgconfig/cppunit.pc
%{_mingw32_libdir}/libcppunit.dll.a
%{_mingw32_libdir}/libcppunit.la
%{_mingw32_datadir}/aclocal/cppunit.m4
%exclude %{_mingw32_mandir}/man1/cppunit-config.1


%changelog
* Mon Aug 17 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-2
- Fix BR mingw32-gcc-c++
- Update description
- Disable duplicated docs with native package.

* Mon Jan  5 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-1
- Initial package based on original cppunit.spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:15:49 -0000	1.1
+++ .cvsignore	1 Sep 2009 08:31:38 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:15:49 -0000	1.1
+++ sources	1 Sep 2009 08:31:38 -0000	1.2
@@ -0,0 +1 @@
+bd30e9cf5523cdfc019b94f5e1d7fd19  cppunit-1.12.1.tar.gz



From atkac at fedoraproject.org  Tue Sep  1 08:32:32 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  1 Sep 2009 08:32:32 +0000 (UTC)
Subject: rpms/mtools/devel .cvsignore, 1.13, 1.14 mtools.spec, 1.47,
	1.48 sources, 1.13, 1.14
Message-ID: <20090901083232.2555611C00EF@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32448

Modified Files:
	.cvsignore mtools.spec sources 
Log Message:
- update to 4.0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	7 Apr 2009 10:51:19 -0000	1.13
+++ .cvsignore	1 Sep 2009 08:32:31 -0000	1.14
@@ -1 +1 @@
-mtools-4.0.10.tar.bz2
+mtools-4.0.11.tar.bz2


Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- mtools.spec	11 Aug 2009 14:11:12 -0000	1.47
+++ mtools.spec	1 Sep 2009 08:32:31 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
-Version: 4.0.10
-Release: 4%{?dist}
+Version: 4.0.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.bz2
@@ -71,6 +71,9 @@ fi
 %{_infodir}/mtools.info*
 
 %changelog
+* Tue Sep 01 2009 Adam Tkac <atkac redhat com> 4.0.11-1
+- update to 4.0.11
+
 * Tue Aug 11 2009 Adam Tkac <atkac redhat com> 4.0.10-4
 - fix installation with --excludedocs (#515932)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Apr 2009 10:51:19 -0000	1.13
+++ sources	1 Sep 2009 08:32:31 -0000	1.14
@@ -1 +1 @@
-750c2beba968a5d46dbaae24551a82b9  mtools-4.0.10.tar.bz2
+94a4dc40ebd8353628dd9d023727b7f5  mtools-4.0.11.tar.bz2



From kwizart at fedoraproject.org  Tue Sep  1 08:32:50 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  1 Sep 2009 08:32:50 +0000 (UTC)
Subject: rpms/mingw32-cppunit/EL-5 import.log, NONE, 1.1 mingw32-cppunit.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901083250.7A85911C00EF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/mingw32-cppunit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32505/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-cppunit.spec 
Log Message:
Initial import for EL-5



--- NEW FILE import.log ---
mingw32-cppunit-1_12_1-2_fc11:EL-5:mingw32-cppunit-1.12.1-2.fc11.src.rpm:1251793883


--- NEW FILE mingw32-cppunit.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-cppunit
Version:        1.12.1
Release:        2%{?dist}
Summary:        MinGW Windows C++ unit testing framework

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://cppunit.sourceforge.net/
Source0:        http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
Requires: pkgconfig

%description
CppUnit is the C++ port of the famous JUnit framework for unit testing.
Test output is in XML for automatic testing and GUI based for supervised 
tests.

MinGW Windows C++ unit testing framework.


%prep
%setup -q -n cppunit-%{version}
for file in THANKS ChangeLog NEWS; do
   iconv -f latin1 -t utf8 < $file > ${file}.utf8
   touch -c -r $file ${file}.utf8
   mv ${file}.utf8 $file
done


%build
%_mingw32_configure --disable-static --disable-doxygen

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
%{_mingw32_bindir}/cppunit-config
%{_mingw32_bindir}/DllPlugInTester.exe
%{_mingw32_includedir}/cppunit/
%{_mingw32_bindir}/libcppunit-*.dll
%{_mingw32_libdir}/pkgconfig/cppunit.pc
%{_mingw32_libdir}/libcppunit.dll.a
%{_mingw32_libdir}/libcppunit.la
%{_mingw32_datadir}/aclocal/cppunit.m4
%exclude %{_mingw32_mandir}/man1/cppunit-config.1


%changelog
* Mon Aug 17 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-2
- Fix BR mingw32-gcc-c++
- Update description
- Disable duplicated docs with native package.

* Mon Jan  5 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-1
- Initial package based on original cppunit.spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:15:49 -0000	1.1
+++ .cvsignore	1 Sep 2009 08:32:50 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:15:49 -0000	1.1
+++ sources	1 Sep 2009 08:32:50 -0000	1.2
@@ -0,0 +1 @@
+bd30e9cf5523cdfc019b94f5e1d7fd19  cppunit-1.12.1.tar.gz



From jwrdegoede at fedoraproject.org  Tue Sep  1 08:35:43 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Sep 2009 08:35:43 +0000 (UTC)
Subject: rpms/hedgewars/devel hedgewars.spec,1.22,1.23
Message-ID: <20090901083543.9373F11C00EF@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1324

Modified Files:
	hedgewars.spec 
Log Message:
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.11-3
- rebuilt with new openssl



Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- hedgewars.spec	21 Aug 2009 13:49:30 -0000	1.22
+++ hedgewars.spec	1 Sep 2009 08:35:43 -0000	1.23
@@ -13,6 +13,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel openssl-devel cmake desktop-file-utils
 Requires:       dejavu-sans-fonts hicolor-icon-theme
+# https://bugzilla.redhat.com/show_bug.cgi?id=520400
+ExcludeArch: ppc64
 
 %description
 Hedgewars is a turn based strategy game but the real buzz is from watching the



From pkgdb at fedoraproject.org  Tue Sep  1 08:42:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:42:52 +0000
Subject: [pkgdb] scim-tomoe (un)retirement
Message-ID: <20090901084252.E41A510F886@bastion2.fedora.phx.redhat.com>

Package scim-tomoe in Fedora devel has been unretired by petersen and is now orphan.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From pkgdb at fedoraproject.org  Tue Sep  1 08:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:44:54 +0000
Subject: [pkgdb] scim-tomoe ownership updated
Message-ID: <20090901084454.ABEC010F897@bastion2.fedora.phx.redhat.com>

Package scim-tomoe in Fedora devel is now owned by petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From pkgdb at fedoraproject.org  Tue Sep  1 08:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:44:59 +0000
Subject: [pkgdb] scim-tomoe ownership updated
Message-ID: <20090901084459.2EAE610F89B@bastion2.fedora.phx.redhat.com>

Package scim-tomoe in Fedora devel is now owned by petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From pkgdb at fedoraproject.org  Tue Sep  1 08:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:45:07 +0000
Subject: [pkgdb] scim-tomoe ownership updated
Message-ID: <20090901084507.52AC710F89D@bastion2.fedora.phx.redhat.com>

Package scim-tomoe in Fedora devel is now owned by petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From pkgdb at fedoraproject.org  Tue Sep  1 08:45:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 08:45:54 +0000
Subject: [pkgdb] scim-tomoe (Fedora, devel) updated by petersen
Message-ID: <20090901084554.CE4F510F895@bastion2.fedora.phx.redhat.com>

petersen changed owner of scim-tomoe in Fedora devel to dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From wolfy at fedoraproject.org  Tue Sep  1 08:52:15 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Tue,  1 Sep 2009 08:52:15 +0000 (UTC)
Subject: rpms/dateshift/devel dateshift.spec,1.3,1.4
Message-ID: <20090901085215.85D4611C00EF@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/dateshift/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4897

Modified Files:
	dateshift.spec 
Log Message:
Modify URL/Source0 to correspond to the new address of the site of the project



Index: dateshift.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dateshift/devel/dateshift.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dateshift.spec	24 Jul 2009 19:58:53 -0000	1.3
+++ dateshift.spec	1 Sep 2009 08:52:15 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           dateshift
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A date/time test tool
 
 Group:          Applications/System
 License:        GPLv2+
-URL:            http://www.hornby.dsl.pipex.com/dateshift/
-Source0:        http://www.hornby.dsl.pipex.com/%{name}/%{name}-%{version}.tar.gz
+URL:            http://hornby.byethost5.com/dateshift/
+Source0:        http://hornby.byethost5.com/dateshift/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sept 1 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 1.1-5
+- Fix URL/Source0 -- the address of the project has changed. No other modifications
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -71,7 +74,7 @@ rm -rf %{buildroot}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Fabian Affolter <fabian at bernewireless.net> - 1.1-2
-- Changed license t GPLv2+
+- Changed license to GPLv2+
 
 * Fri Jan 02 2009 Fabian Affolter <fabian at bernewireless.net> - 1.1-1
 - Initial spec for Fedora



From twaugh at fedoraproject.org  Tue Sep  1 09:09:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  1 Sep 2009 09:09:43 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint-deviceid.patch, NONE,
	1.1 gutenprint.spec, 1.54, 1.55
Message-ID: <20090901090943.88C1211C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9353

Modified Files:
	gutenprint.spec 
Added Files:
	gutenprint-deviceid.patch 
Log Message:
* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-5
- Provide IEEE 1284 Device IDs in CUPS model list.


gutenprint-deviceid.patch:
 include/gutenprint/printers.h |   15 
 src/cups/genppd.c             |   16 
 src/main/print-escp2.c        |    2 
 src/main/printers.c           |   34 +
 src/xml/printers.xml          |  774 +++++++++++++++++++++---------------------
 5 files changed, 449 insertions(+), 392 deletions(-)

--- NEW FILE gutenprint-deviceid.patch ---
diff -up gutenprint-5.2.4/include/gutenprint/printers.h.deviceid gutenprint-5.2.4/include/gutenprint/printers.h
--- gutenprint-5.2.4/include/gutenprint/printers.h.deviceid	2008-06-03 12:40:39.000000000 +0100
+++ gutenprint-5.2.4/include/gutenprint/printers.h	2009-09-01 09:11:54.774964164 +0100
@@ -83,6 +83,14 @@ extern const stp_printer_t *stp_get_prin
 extern const stp_printer_t *stp_get_printer_by_driver(const char *driver);
 
 /**
+ * Get a printer model by its IEEE 1284 device ID.
+ * @param device_id the printer model's device ID.
+ * @returns a pointer to the printer model, or NULL on failure.  The
+ * pointer should not be freed.
+ */
+extern const stp_printer_t *stp_get_printer_by_device_id(const char *device_id);
+
+/**
  * Get the printer model from a vars object.
  * @param v the vars to use.
  * @returns a pointer to the printer model, or NULL on failure.  The
@@ -113,6 +121,13 @@ extern const char *stp_printer_get_long_
 extern const char *stp_printer_get_driver(const stp_printer_t *p);
 
 /**
+ * Get a printer model's IEEE 1284 device ID, if known.
+ * @param p the printer model to use.
+ * @returns the IEEE 1284 device ID, or NULL if not known.
+ */
+extern const char *stp_printer_get_device_id(const stp_printer_t *p);
+
+/**
  * Get a printer model's family name.
  * The family name is the name of the modular "family" driver this
  * model uses.
diff -up gutenprint-5.2.4/src/cups/genppd.c.deviceid gutenprint-5.2.4/src/cups/genppd.c
--- gutenprint-5.2.4/src/cups/genppd.c.deviceid	2009-07-18 01:55:45.000000000 +0100
+++ gutenprint-5.2.4/src/cups/genppd.c	2009-09-01 09:11:54.778963376 +0100
@@ -358,30 +358,34 @@ list_ppds(const char *argv0)		/* I - Nam
   for (i = 0; i < stp_printer_model_count(); i++)
     if ((printer = stp_get_printer_by_index(i)) != NULL)
     {
+      const char *device_id;
       if (!strcmp(stp_printer_get_family(printer), "ps") ||
 	  !strcmp(stp_printer_get_family(printer), "raw"))
         continue;
 
+      device_id = stp_printer_get_device_id(printer);
       printf("\"%s://%s/expert\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
-	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
+	     "\"%s\"\n",
              scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
-	     stp_printer_get_long_name(printer));
+	     stp_printer_get_long_name(printer),
+	     device_id ? device_id : "");
 
 #ifdef GENERATE_SIMPLIFIED_PPDS
       printf("\"%s://%s/simple\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
-	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
+	     "\"%s\"\n",
              scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
-	     stp_printer_get_long_name(printer));
+	     stp_printer_get_long_name(printer),
+	     device_id ? device_id : "");
 #endif
     }
 
@@ -925,6 +929,7 @@ write_ppd(
   int		model;			/* Internal model ID */
   const char	*long_name;		/* Driver long name */
   const char	*manufacturer;		/* Manufacturer of printer */
+  const char	*device_id;		/* IEEE1284 device ID */
   const stp_vars_t *printvars;		/* Printer option names */
   paper_t	*the_papers;		/* Media sizes */
   int		cur_opt;		/* Current option */
@@ -957,6 +962,7 @@ write_ppd(
   model      = stp_printer_get_model(p);
   long_name  = stp_printer_get_long_name(p);
   manufacturer = stp_printer_get_manufacturer(p);
+  device_id  = stp_printer_get_device_id(p);
   printvars  = stp_printer_get_defaults(p);
   the_papers = NULL;
   cur_opt    = 0;
@@ -1079,6 +1085,8 @@ write_ppd(
   gzprintf(fp, "*cupsFilter:	\"application/vnd.cups-raster 100 rastertogutenprint.%s\"\n", GUTENPRINT_RELEASE_VERSION);
   if (strcasecmp(manufacturer, "EPSON") == 0)
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
+  if (device_id)
+    gzprintf(fp, "*1284DeviceID: \"%s\"\n", device_id);
   if (!language)
   {
    /*
diff -up gutenprint-5.2.4/src/main/printers.c.deviceid gutenprint-5.2.4/src/main/printers.c
--- gutenprint-5.2.4/src/main/printers.c.deviceid	2009-06-08 02:27:38.000000000 +0100
+++ gutenprint-5.2.4/src/main/printers.c	2009-09-01 09:11:54.790088434 +0100
@@ -65,6 +65,7 @@ struct stp_printer
   char       *long_name;        /* Long name for UI */
   char       *family;           /* Printer family */
   char	     *manufacturer;	/* Printer manufacturer */
+  char	     *device_id; /* IEEE 1284 device ID */
   int        model;             /* Model number */
   int	     vars_initialized;
   const stp_printfuncs_t *printfuncs;
@@ -187,6 +188,12 @@ stpi_printer_long_namefunc(const void *i
 }
 
 const char *
+stp_printer_get_device_id(const stp_printer_t *printer)
+{
+  return printer->device_id;
+}
+
+const char *
 stp_printer_get_family(const stp_printer_t *printer)
 {
   return printer->family;
@@ -243,6 +250,30 @@ stp_get_printer_by_driver(const char *dr
   return (const stp_printer_t *) stp_list_item_get_data(printer_item);
 }
 
+const stp_printer_t *
+stp_get_printer_by_device_id(const char *device_id)
+{
+  stp_list_item_t *printer_item;
+  if (printer_list == NULL)
+    {
+      stp_erprintf("No printer drivers found: "
+		   "are STP_DATA_PATH and STP_MODULE_PATH correct?\n");
+      stpi_init_printer_list();
+    }
+  if (! device_id || strcmp(device_id, "") == 0)
+    return NULL;
+
+  printer_item = stp_list_get_start(printer_list);
+  while (printer_item)
+    {
+      if (strcmp(((const stp_printer_t *) stp_list_item_get_data(printer_item)),
+		 device_id) == 0)
+	return ((const stp_printer_t *) stp_list_item_get_data(printer_item));
+      printer_item = stp_list_item_next(printer_item);
+    }
+  return NULL;
+}
+
 int
 stp_get_printer_index_by_driver(const char *driver)
 {
@@ -1054,6 +1085,9 @@ stp_printer_create_from_xmltree(stp_mxml
   outprinter->manufacturer = stp_strdup(stp_mxmlElementGetAttr(printer, "manufacturer"));
   outprinter->model = stp_xmlstrtol(stp_mxmlElementGetAttr(printer, "model"));
   outprinter->family = stp_strdup((const char *) family);
+  stmp = stp_mxmlElementGetAttr(printer, "deviceid");
+  if (stmp)
+    outprinter->device_id = stp_strdup(stmp);
 
   if (stp_get_driver(outprinter->printvars))
     driver = 1;
diff -up gutenprint-5.2.4/src/main/print-escp2.c.deviceid gutenprint-5.2.4/src/main/print-escp2.c
--- gutenprint-5.2.4/src/main/print-escp2.c.deviceid	2009-07-21 12:07:06.000000000 +0100
+++ gutenprint-5.2.4/src/main/print-escp2.c	2009-09-01 09:11:54.786088370 +0100
@@ -922,7 +922,7 @@ static const int_param_t int_parameters[
 {
   {
     {
-      "QualityEnhancement", N_("Quality Enhancement"), N_("Advanced Printer Functionality"),
+      "BandEnhancement", N_("Quality Enhancement"), N_("Advanced Printer Functionality"),
       N_("Enhance print quality by additional passes"),
       STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, STP_CHANNEL_NONE, 1, 0
diff -up gutenprint-5.2.4/src/xml/printers.xml.deviceid gutenprint-5.2.4/src/xml/printers.xml
--- gutenprint-5.2.4/src/xml/printers.xml.deviceid	2009-06-24 02:19:54.000000000 +0100
+++ gutenprint-5.2.4/src/xml/printers.xml	2009-09-01 09:11:39.044962200 +0100
@@ -90,39 +90,39 @@
         <parameter type="float" name="CyanGamma">1.3</parameter> 
       </parameters>
       <printer translate="name" name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
-      <printer translate="name" name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-50" deviceid="MFG:Canon;MDL:BJC-50;" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-55" deviceid="MFG:Canon;MDL:BJC-55;" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-80" deviceid="MFG:Canon;MDL:BJC-80;" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-85" deviceid="MFG:Canon;MDL:BJC-85;" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-210" deviceid="MFG:Canon;MDL:BJC-210;DES:Canon BJC-210;CMD:BJ,LQ,BJL,BJRaster;" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-250" deviceid="MFG:Canon;MDL:BJC-250;DES:Canon BJC-250;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-1000" deviceid="MFG:Canon;MDL:BJC-1000;DES:Canon BJC-1000;CMD:BJL,BJRaster,BSCC,TXT01;" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-2100" deviceid="MFG:Canon;MDL:BJC-2100;DES:Canon BJC-2100;" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-3000" deviceid="MFG:Canon;MDL:BJC-3000;DES:Canon BJC-3000;CMD:BJL,BJRaster3,BSCC,TXT01,BJScan2;" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer translate="name" name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer translate="name" name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-4300" deviceid="MFG:Canon;MDL:BJC-4300;DES:Canon BJC-4300;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-4400" deviceid="MFG:Canon;MDL:BJC-4400;DES:Canon BJC-4400;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6000" deviceid="MFG:Canon;MDL:BJC-6000;DES:Canon BJC-6000;CMD:BJL,BJRaster3,BSCC,TXT;" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6200" deviceid="MFG:Canon;MDL:BJC-6200;DES:Canon BJC-6200;CMD:BJL,BJRaster3,BSCC,TXT01,BJScan2;" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
       <printer translate="name" name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-8200" deviceid="MFG:Canon;MDL:BJC-8200;DES:Canon;CMD:BJL,BJRaster3,BSCC,TXT01;" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" parameters="density_800_params" />
-      <printer translate="name" name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon S100" deviceid="MFG:Canon;MDL:S100SP;DES:Canon S100SP;CMD:BJL,BJRaster,BSCC,TXT01;" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer translate="name" name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
       <printer translate="name" name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" />
       <printer translate="name" name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
       <printer translate="name" name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
       <printer translate="name" name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
-      <printer translate="name" name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S600" deviceid="MFG:Canon;MDL:S600;DES:Canon S600;CMD:BJL,BJRaster3,BSCC,TXT01;" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
@@ -199,46 +199,46 @@
       <printer translate="name" name="Epson B-308" driver="escp2-b308" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-500DN" driver="escp2-b500dn" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-508DN" driver="escp2-b508dn" manufacturer="Epson" model="87" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20" deviceid="MFG:EPSON;MDL:Stylus C20;DES:EPSON Stylus C20;CMD:ESCPL2,BDC,D4;" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20UX" deviceid="MFG:EPSON;MDL:Stylus C20;DES:EPSON Stylus C20;CMD:ESCPL2,BDC,D4;" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40" deviceid="MFG:EPSON;MDL:Stylus C40;DES:None;" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42" deviceid="MFG:EPSON;MDL:Stylus C42;DES:EPSON Stylus C42;CMD:ESCPL2,BDC,D4;" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42UX" deviceid="MFG:EPSON;MDL:Stylus C42;DES:EPSON Stylus C42;CMD:ESCPL2,BDC,D4;" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43" deviceid="MFG:EPSON;MDL:Stylus C43;DES:EPSON Stylus C43;CMD:ESCPL2,BDC,D4;" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43SX" deviceid="MFG:EPSON;MDL:Stylus C43;DES:EPSON Stylus C43;CMD:ESCPL2,BDC,D4;" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43UX" deviceid="MFG:EPSON;MDL:Stylus C43;DES:EPSON Stylus C43;CMD:ESCPL2,BDC,D4;" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44" deviceid="MFG:EPSON;MDL:Stylus C44;DES:EPSON Stylus C44;CMD:ESCPL2,BDC,D4;" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44SX" deviceid="MFG:EPSON;MDL:Stylus C44;DES:EPSON Stylus C44;CMD:ESCPL2,BDC,D4;" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44UX" deviceid="MFG:EPSON;MDL:Stylus C44;DES:EPSON Stylus C44;CMD:ESCPL2,BDC,D4;" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C45" deviceid="MFG:EPSON;MDL:Stylus C45;DES:EPSON Stylus C45;CMD:ESCPL2,BDC,D4;" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C46" deviceid="MFG:EPSON;MDL:Stylus C46;DES:EPSON Stylus C46;CMD:ESCPL2,BDC,D4;" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C48" deviceid="MFG:EPSON;MDL:Stylus C48;DES:EPSON Stylus C48;CMD:ESCPL2,BDC,D4;" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C60" deviceid="MFG:EPSON;MDL:Stylus C60;DES:EPSON Stylus C60;CMD:ESCPL2,BDC,D4;" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C62" deviceid="MFG:EPSON;MDL:Stylus C62;DES:EPSON Stylus C62;CMD:ESCPL2,BDC,D4;" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C65" deviceid="MFG:EPSON;MDL:Stylus C65;DES:EPSON Stylus C65;CMD:ESCPL2,BDC,D4;" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C66" deviceid="MFG:EPSON;MDL:Stylus C66;DES:EPSON Stylus C66;CMD:ESCPL2,BDC,D4;" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C68" deviceid="MFG:EPSON;MDL:Stylus C68;DES:EPSON Stylus C68;CMD:ESCPL2,BDC,D4;" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C80" deviceid="MFG:EPSON;MDL:Stylus C80;DES:EPSON Stylus C80;CMD:ESCPL2,BDC,D4;" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C82" deviceid="MFG:EPSON;MDL:Stylus C82;DES:EPSON Stylus C82;CMD:ESCPL2,BDC,D4;" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C84" deviceid="MFG:EPSON;MDL:Stylus C84;DES:EPSON Stylus C84;CMD:ESCPL2,BDC,D4;" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C85" deviceid="MFG:EPSON;MDL:Stylus C85;DES:EPSON Stylus C85;CMD:ESCPL2,BDC,D4;" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C86" deviceid="MFG:EPSON;MDL:Stylus C86;DES:EPSON Stylus C86;CMD:ESCPL2,BDC,D4;" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C88" deviceid="MFG:EPSON;MDL:Stylus C88;DES:EPSON Stylus C88;CMD:ESCPL2,BDC,D4;" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
@@ -248,29 +248,29 @@
       <printer translate="name" name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus Color 440" deviceid="MFG:EPSON;MDL:Stylus COLOR 440;DES:EPSON Stylus COLOR 440;CMD:ESCPL2,BDC;" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 460" deviceid="MFG:EPSON;MDL:Stylus COLOR 460;DES:EPSON Stylus COLOR 460;CMD:ESCPL2,BDC;" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 480" deviceid="MFG:EPSON;MDL:Stylus COLOR 480;DES:EPSON Stylus COLOR 480;CMD:ESCPL2,BDC,D4;" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
       <printer translate="name" name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 600" deviceid="MFG:EPSON;MDL:Stylus COLOR 600;CMD:ESCPL2,BDC;" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 670" deviceid="MFG:EPSON;MDL:Stylus COLOR 670;DES:EPSON Stylus COLOR 670;CMD:ESCPL2,BDC,D4;" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 740" deviceid="MFG:EPSON;MDL:Stylus COLOR 740;DES:EPSON Stylus COLOR 740;CMD:ESCPL2,BDC,D4;" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 760" deviceid="MFG:EPSON;MDL:Stylus COLOR 760;DES:EPSON Stylus COLOR 760;CMD:ESCPL2,BDC,D4;" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 777" deviceid="MFG:EPSON;MDL:Stylus COLOR 777;DES:EPSON Stylus COLOR 777;CMD:ESCPL2,BDC,D4;" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 800" deviceid="MFG:EPSON;MDL:Stylus COLOR 800;CMD:ESCPL2,PRPXL24,BDC;" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 880" deviceid="MFG:EPSON;MDL:Stylus COLOR 880;DES:EPSON Stylus COLOR 880;CMD:ESCPL2,BDC,D4;" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 900" deviceid="MFG:EPSON;MDL:Stylus COLOR 900;DES:EPSON Stylus COLOR 900;CMD:ESCPL2,PRPXL24,BDC,D4;" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 980" deviceid="MFG:Epson;MDL:Stylus Color 980;CMD:ESC/P2;" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1520" deviceid="MFG:EPSON;MDL:Stylus COLOR 1520;CMD:ESCP2E,PRPXL;" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" />
@@ -284,31 +284,31 @@
       <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 700" deviceid="MFG:EPSON;MDL:Stylus Photo 700;DES:EPSON Stylus Photo 700;CMD:ESCPL2,BDC;" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo EX" deviceid="MFG:EPSON;MDL:Stylus Photo EX;CMD:ESCPL2,BDC;" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 750" deviceid="MFG:EPSON;MDL:Stylus Photo 750;DES:EPSON Stylus Photo 750;CMD:ESCPL2,BDC,D4;" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
     <!--
          Note that the 785EPX has a roll feed holder.  It's more like the 890
          than the 780, despite the name.
     -->
-      <printer translate="name" name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 785" deviceid="MFG:EPSON;MDL:Stylus Photo 785EPX;DES:EPSON Stylus Photo 785EPX;CMD:ESCPL2,BDC,D4;" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 790" deviceid="MFG:EPSON;MDL:Stylus Photo 790;DES:EPSON Stylus Photo 790;CMD:ESCPL2,BDC,D4;" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 820" deviceid="MFG:EPSON;MDL:Stylus Photo 820;DES:EPSON Stylus Photo 820;CMD:ESCPL2,BDC,D4;" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 825" deviceid="MFG:EPSON;MDL:Stylus Photo 825;DES:EPSON Stylus Photo 825;CMD:ESCPL2,BDC,D4;" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 830" deviceid="MFG:EPSON;MDL:Stylus Photo 830U;DES:EPSON Stylus Photo 830U;CMD:ESCPL2,BDC,D4;" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 870" deviceid="MFG:EPSON;MDL:Stylus Photo 870;DES:EPSON Stylus Photo 870;CMD:ESCPL2,BDC,D4;" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 890" deviceid="MFG:EPSON;MDL:Stylus Photo 890;DES:EPSON Stylus Photo 890;CMD:ESCPL2,BDC,D4;" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 895" deviceid="MFG:EPSON;MDL:Stylus Photo 895;DES:EPSON Stylus Photo 895;CMD:ESCPL2,BDC,D4;" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 900" deviceid="MFG:EPSON;MDL:Stylus Photo 900;DES:EPSON Stylus Photo 900;CMD:ESCPL2,BDC,D4;" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 915" deviceid="MFG:EPSON;MDL:Stylus Photo 915;DES:EPSON Stylus Photo 915;CMD:ESCPL2,BDC,D4;" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 935" deviceid="MFG:EPSON;MDL:Stylus Photo 935;DES:EPSON Stylus Photo 935;CMD:ESCPL2,BDC,D4;" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
@@ -320,9 +320,9 @@
       <printer translate="name" name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R200" deviceid="MFG:EPSON;MDL:Stylus Photo R200;DES:EPSON Stylus Photo R200;CMD:ESCPL2,BDC,D4;" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R210" deviceid="MFG:EPSON;MDL:Stylus Photo R210;DES:EPSON Stylus Photo R210;CMD:ESCPL2,BDC,D4;" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R220" deviceid="MFG:EPSON;MDL:Stylus Photo R220;DES:EPSON Stylus Photo R220;CMD:ESCPL2,BDC,D4;" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
@@ -332,10 +332,10 @@
       <printer translate="name" name="Epson Stylus Photo R280" driver="escp2-r280" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo R285" driver="escp2-r285" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo R290" driver="escp2-r290" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R300" deviceid="MFG:EPSON;MDL:Stylus Photo R300;DES:EPSON Stylus Photo R300;" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R310" deviceid="MFG:EPSON;MDL:Stylus Photo R310;DES:EPSON Stylus Photo R310;" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R320" deviceid="MFG:EPSON;MDL:Stylus Photo R320;DES:EPSON Stylus Photo R320;" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R340" deviceid="MFG:EPSON;MDL:Stylus Photo R340;DES:EPSON Stylus Photo R340;" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
@@ -345,12 +345,12 @@
       <printer translate="name" name="Epson Stylus Photo R1900" driver="escp2-r1900" manufacturer="Epson" model="91" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R2880" driver="escp2-r2880" manufacturer="Epson" model="98" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX400" deviceid="MFG:EPSON;MDL:Stylus Photo RX400;DES:EPSON Stylus Photo RX400;CMD:ESCPL2,BDC,D4;" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX420" deviceid="MFG:EPSON;MDL:Stylus Photo RX420;DES:EPSON Stylus Photo RX420;CMD:ESCPL2,BDC,D4;" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX425" deviceid="MFG:EPSON;MDL:Stylus Photo RX425;DES:EPSON Stylus Photo RX425;CMD:ESCPL2,BDC,D4;" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX430" deviceid="MFG:EPSON;MDL:Stylus Photo RX430;DES:EPSON Stylus Photo RX430;CMD:ESCPL2,BDC,D4;" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX500" deviceid="MFG:EPSON;MDL:Stylus Photo RX500;DES:EPSON Stylus Photo RX500;CMD:ESCPL2,BDC,D4;" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX510" deviceid="MFG:EPSON;MDL:Stylus Photo RX510;DES:EPSON Stylus Photo RX510;CMD:ESCPL2,BDC,D4;" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX585" driver="escp2-rx585" manufacturer="Epson" model="81" parameters="claria_params" />
@@ -358,13 +358,13 @@
       <printer translate="name" name="Epson Stylus Photo RX595" driver="escp2-rx595" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX610" driver="escp2-rx610" manufacturer="Epson" model="81" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX620" deviceid="MFG:EPSON;MDL:Stylus Photo RX620;DES:EPSON Stylus Photo RX620;CMD:ESCPL2,BDC,D4;" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX630" deviceid="MFG:EPSON;MDL:Stylus Photo RX630;DES:EPSON Stylus Photo RX630;CMD:ESCPL2,BDC,D4;" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="97" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="97" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="97" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX700" deviceid="MFG:EPSON;MDL:Stylus Photo RX700;DES:EPSON Stylus Photo RX700;CMD:ESCPL2,BDC,D4;" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo TX800FW" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
@@ -383,62 +383,62 @@
       <printer translate="name" name="Epson Stylus Pro 11880" driver="escp2-11880" manufacturer="Epson" model="88" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX1500" deviceid="MFG:EPSON;MDL:Stylus CX1500;DES:EPSON Stylus CX1500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus CX3100" deviceid="MFG:EPSON;MDL:Stylus CX3100;DES:EPSON Stylus CX3100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3200" deviceid="MFG:EPSON;MDL:Stylus CX3200;DES:EPSON Stylus CX3200;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3500" deviceid="MFG:EPSON;MDL:Stylus CX3500;DES:EPSON Stylus CX3500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3600" deviceid="MFG:EPSON;MDL:Stylus CX3600;DES:EPSON Stylus CX3600;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3650" deviceid="MFG:EPSON;MDL:Stylus CX3650;DES:EPSON Stylus CX3650;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3700" deviceid="MFG:EPSON;MDL:Stylus CX3700;DES:EPSON Stylus CX3700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3800" deviceid="MFG:EPSON;MDL:Stylus CX3800;DES:EPSON Stylus CX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3805" deviceid="MFG:EPSON;MDL:Stylus CX3805;DES:EPSON Stylus CX3805;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3810" deviceid="MFG:EPSON;MDL:Stylus CX3810;DES:EPSON Stylus CX3810;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX4100" deviceid="MFG:EPSON;MDL:Stylus CX4100;DES:EPSON Stylus CX4100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4100" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4200" deviceid="MFG:EPSON;MDL:Stylus CX4200;DES:EPSON Stylus CX4200;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4500" deviceid="MFG:EPSON;MDL:Stylus CX4500;DES:EPSON Stylus CX4500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4600" deviceid="MFG:EPSON;MDL:Stylus CX4600;DES:EPSON Stylus CX4600;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4700" deviceid="MFG:EPSON;MDL:Stylus CX4700;DES:EPSON Stylus CX4700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4800" deviceid="MFG:EPSON;MDL:Stylus CX4800;DES:EPSON Stylus CX4800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5100" deviceid="MFG:EPSON;MDL:Stylus CX5100;DES:EPSON Stylus CX5100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5300" deviceid="MFG:EPSON;MDL:Stylus CX5300;DES:EPSON Stylus CX5300;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5400" deviceid="MFG:EPSON;MDL:Stylus CX5400;DES:EPSON Stylus CX5400;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5500" driver="escp2-cx5500" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5700" deviceid="MFG:EPSON;MDL:Stylus CX5700;DES:EPSON Stylus CX5700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5800" deviceid="MFG:EPSON;MDL:Stylus CX5800;DES:EPSON Stylus CX5800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6300" deviceid="MFG:EPSON;MDL:Stylus CX6300;DES:EPSON Stylus CX6300;CMD:ESCPL2,BDC,D4;" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6500" deviceid="MFG:EPSON;MDL:Stylus CX6500;DES:EPSON Stylus CX6500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6600" deviceid="MFG:EPSON;MDL:Stylus CX6600;DES:EPSON Stylus CX6600;CMD:ESCPL2,BDC,D4;" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7700" deviceid="MFG:EPSON;MDL:Stylus CX7700;DES:EPSON Stylus CX7700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx7700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7800" deviceid="MFG:EPSON;MDL:Stylus CX7800;DES:EPSON Stylus CX7800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx7800" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8300" deviceid="MFG:EPSON;MDL:Stylus CX8300;DES:EPSON Stylus CX8300;CMD:ESCPL2,BDC,D4;" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8400" deviceid="MFG:EPSON;MDL:Stylus CX8400;DES:EPSON Stylus CX8400;CMD:ESCPL2,BDC,D4;" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9300F" driver="escp2-cx9300f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9400F" driver="escp2-cx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D68" deviceid="MFG:EPSON;MDL:Stylus D68;DES:EPSON Stylus D68;CMD:ESCPL2,BDC,D4;" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D88" deviceid="MFG:EPSON;MDL:Stylus D88;DES:EPSON Stylus D88;CMD:ESCPL2,BDC,D4;" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX3800" deviceid="MFG:EPSON;MDL:Stylus DX3800;DES:EPSON Stylus DX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX3850" deviceid="MFG:EPSON;MDL:Stylus DX3850;DES:EPSON Stylus DX3850;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4000" driver="escp2-dx4000" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4200" deviceid="MFG:EPSON;MDL:Stylus DX4200;DES:EPSON Stylus DX4200;CMD:ESCPL2,BDC,D4;" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4250" deviceid="MFG:EPSON;MDL:Stylus DX4250;DES:EPSON Stylus DX4250;CMD:ESCPL2,BDC,D4;" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="95" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4800" deviceid="MFG:EPSON;MDL:Stylus DX4800;DES:EPSON Stylus DX4800;CMD:ESCPL2,BDC,D4;" driver="escp2-dx4800" manufacturer="Epson" model="95" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4850" driver="escp2-dx4850" manufacturer="Epson" model="95" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
@@ -604,7 +604,7 @@
       </parameters>
       <printer translate="name" name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2200" deviceid="MFG:EPSON;MDL:Stylus DX4800;DES:EPSON Stylus DX4800;CMD:ESCPL2,BDC,D4;" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
@@ -617,38 +617,38 @@
       <printer translate="name" name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother DCP-8045D" driver="brother-dcp-8045d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1050" deviceid="MFG:Brother;MDL:HL-1050 series;CMD:PCL5,PJL,PCLXL;" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1070" deviceid="MFG:Brother;MDL:HL-1070 series;CMD:PCL5,POSTSCRIPT2,PJL,PCLXL;" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1240" deviceid="MFG:Brother;MDL:HL-1240 series;CMD:PCL4,PJL;" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1250" deviceid="MFG:Brother;MDL:HL-1250 series;CMD:PCL5,PJL,PCLXL;" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1260" deviceid="MFG:Brother;MDL:HL-1250 series;CMD:PCL5,PJL,PCLXL;" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1430" driver="brother-hl-1430" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1450" driver="brother-hl-1450" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1470N" driver="brother-hl-1470n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1430" deviceid="MFG:Brother;MDL:HL-1430 series;CMD:PJL;" driver="brother-hl-1430" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1440" deviceid="MFG:Brother;MDL:HL-1440 series;CMD:PCL4,PJL;" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1450" deviceid="MFG:Brother;MDL:Brother HL-1450 series;" driver="brother-hl-1450" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1470N" deviceid="MFG:Brother;MDL:Brother HL-1470N series;" driver="brother-hl-1470n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1650" driver="brother-hl-1650" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-2460" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2060" deviceid="MFG:Brother;MDL:HL-2040 series;DES:None;CMD:PJL,HBP;" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2460" deviceid="MFG:Brother;MDL:Brother HL-2460 series;" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-5030" driver="brother-hl-5030" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5040" driver="brother-hl-5040" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5050" driver="brother-hl-5050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5070N" driver="brother-hl-5070n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5140" driver="brother-hl-5140" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5150D" driver="brother-hl-5150d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5170DN" driver="brother-hl-5170dn" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5040" deviceid="MFG:Brother;MDL:HL-5040 series;CMD:PJL,PCL,PCLXL;" driver="brother-hl-5040" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5050" deviceid="MFG:Brother;MDL:Brother HL-5050 series;" driver="brother-hl-5050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5070N" deviceid="MFG:Brother;MDL:Brother HL-5070N series;" driver="brother-hl-5070n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5140" deviceid="MFG:Brother;MDL:HL-5140 series;CMD:PJL,PCL,PCLXL;" driver="brother-hl-5140" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5150D" deviceid="MFG:Brother;MDL:Brother HL-5150D series;CMD:PJL,PCL,PCLXL,POSTSCRIPT;" driver="brother-hl-5150d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5170DN" deviceid="MFG:Brother;MDL:Brother HL-5170DN series;CMD:PJL,PCL,PCLXL,POSTSCRIPT;" driver="brother-hl-5170dn" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-7050" driver="brother-hl-7050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-7050" deviceid="MFG:Brother;MDL:Brother HL-7050 series;" driver="brother-hl-7050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-7050N" driver="brother-hl-7050n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
@@ -659,7 +659,7 @@
       <printer translate="name" name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
-      <printer translate="name" name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1000" deviceid="MFG:Canon;MDL:LBP-1000;DES:LBP-1000;CMD:PCL-XL;" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
@@ -669,21 +669,21 @@
       <printer translate="name" name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C2000PS" deviceid="MFG:Epson;MDL:AL-C2000 PS3;" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8600PS" deviceid="MFG:Epson;MDL:AL-C8600 PS3;" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5700" deviceid="MFG:EPSON;MDL:EPL-5700;DES:EPSON EPL-5700;CMD:PJL,EJL,ESCPL2-00,ESCP9-84,PRPXL24-01,HP ENHANCED PCL5,HPGL2-01,;" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5900PS" deviceid="MFG:Epson;MDL:EPL-5900 PS3;" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-6100PS" deviceid="MFG:Epson;MDL:EPL-6100 PS3;" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-N2050" driver="epson-epl-n2050" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-N2050+" driver="epson-epl-n2050plus" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
@@ -759,17 +759,17 @@
       <printer translate="name" name="Gestetner MP 4000B" driver="gestetner-mp_4000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 5000" driver="gestetner-mp_5000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 5000B" driver="gestetner-mp_5000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2200" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;CMD:MLC,PML,PJL;" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2230" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;CMD:MLC,PML,PJL;" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250TN" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2280" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color Inkjet Printer CP1700" deviceid="MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4500" deviceid="MFG:Hewlett-Packard;MDL:LaserJet Color 4500;" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4550" deviceid="MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550;DES:Hewlett-Packard Color LaserJet 4550;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL;" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4600" deviceid="MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
@@ -786,9 +786,9 @@
       <printer translate="name" name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 400" deviceid="MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;CMD:PCL,C32;" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 450" deviceid="MFG:hp;MDL:dj450;DES:hp dj450;CMD:MLC,PCL,PML,DESKJET,DW-PCL,DYN;" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
@@ -796,84 +796,84 @@
       <printer translate="name" name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 5550" deviceid="MFG:hp;MDL:deskjet 5550;DES:hp deskjet 5550;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 600" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;CMD:MLC,PCL,PML;" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;CMD:MLC,PCL,PML;" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610CL" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;CMD:MLC,PCL,PML;" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 6122" deviceid="MFG:hp;MDL:deskjet 6122;DES:hp deskjet 6122;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 612C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;CMD:MLC,PCL,PML;" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 640C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;CMD:MLC,PCL,PML;" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 660C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 660C;DES:Hewlett-Packard DeskJet 660C;CMD:MLC,PCL,PML;" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 670C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;CMD:MLC,PCL,PML;" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 690C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;CMD:MLC,PCL,PML;" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 694C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;CMD:MLC,PCL,PML;" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 697C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;CMD:MLC,PCL,PML;" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 812C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;CMD:MLC,PCL,PML;" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 815C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;CMD:MLC,PCL,PML;" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 816C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;CMD:MLC,PCL,PML;" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 825C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;CMD:MLC,PCL,PML;" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 840C" deviceid="MFG:Hewlett-Packard;MDL:DeskJet 840C;" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 841C" deviceid="MFG:Hewlett-Packard;MDL:DeskJet 841C;" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 842C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 840C;DES:Hewlett-Packard DeskJet 840C;CMD:MLC,PCL,PML;" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 843C" deviceid="MFG:Hewlett-Packard;MDL:DeskJet 843C;" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 845C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;CMD:MLC,PCL,PML;" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 850C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;CMD:PCL,MLC,PML;" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 855C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;CMD:PCL,MLC,PML;" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 870C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;CMD:PCL,MLC,PML;" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 880C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;CMD:MLC,PCL,PML;" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 890C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;CMD:PCL,MLC,PML;" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 895C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;CMD:MLC,PCL,PML;" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
       <printer translate="name" name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 920C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;CMD:MLC,PCL,PML;" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 930C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;CMD:MLC,PCL,PML;" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 940C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;CMD:MLC,PCL,PML;" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 950C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;CMD:MLC,PCL,PML;" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 960C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;CMD:MLC,PCL,PML;" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 970C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;CMD:MLC,PCL,PML;" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 980C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;CMD:MLC,PCL,PML;" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 990C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;CMD:MLC,PCL,PML;" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1120C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 1120C;DES:Hewlett-Packard Deskjet 1120C;CMD:PCL,MLC,PML;" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
+      <printer translate="name" name="HP DeskJet 1220C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;CMD:MLC,PCL,PML;" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
       <printer translate="name" name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 340C" deviceid="MFG:Hewlett-Packard;MDL:HP DeskJet 340;DES:HP;CMD:PCL,C32;" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3820" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;CMD:MLC,PCL,PML;" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
@@ -883,173 +883,173 @@
       <printer translate="name" name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4 Plus" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;CMD:PJL,PCL,POSTSCRIPT;" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4L" deviceid="MFG:Hewlett-Packard;MDL:LaserJet 4L;CMD:HP ENHANCED PCL5,PJL;" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5L" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;CMD:HP ENHANCED PCL5,PJL;" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5MP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;CMD:HP ENHANCED PCL5,PJL,POSTSCRIPT;" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5P" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;CMD:HP ENHANCED PCL5,PJL;" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5Si" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:None;CMD:PJL,MLC,PCL,POSTSCRIPT;" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6L" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:Hewlett-Packard LaserJet 6L Printer;" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6MP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;CMD:PJL,MLC,PCLXL,PCL,POSTSCRIPT;" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6P" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;CMD:HP ENHANCED PCL5,PJL;" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1010" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1010;CMD:FastRaster;" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1012" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1012;CMD:FastRaster;" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1015" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1015;CMD:FastRaster;" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1160" driver="hp-lj_1160" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1320" driver="hp-lj_1320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;CMD:MLC,PCL,PJL;" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100A" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100A Printer-Copier-Scanner;CMD:MLC,MFPDTF1,PCL,PJL;" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1150" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;CMD:PJL,MLC,BIDI-ECP,PCL,DW-PCL;" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1160" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;CMD:PJL,MLC,BIDI-ECP,PCL,DW-PCL;" driver="hp-lj_1160" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1200" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1220" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1300" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1320" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_1320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100M" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2200" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2300" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PJL,POSTSCRIPT;" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 2410" driver="hp-lj_2410" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2420" driver="hp-lj_2420" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2430" driver="hp-lj_2430" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3015" driver="hp-lj_3015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3020" driver="hp-lj_3020" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3030" driver="hp-lj_3030" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3050" driver="hp-lj_3050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3052" driver="hp-lj_3052" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3055" driver="hp-lj_3055" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2420" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;CMD:PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT;" driver="hp-lj_2420" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2430" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;CMD:PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT,PDF;" driver="hp-lj_2430" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3015" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3020" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3020" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3030" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3030" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3050" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3052" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3052" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3055" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3055" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;CMD:PJL,MLC,PCL,PCLXL;" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200m" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3380" driver="hp-lj_3380" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3390" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3392" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3300 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3310 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320N MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3330 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3380" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3380" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3390" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3392" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4000" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4050" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series;DES:Hewlett-Packard LaserJet 4050 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4100" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series;DES:Hewlett-Packard LaserJet 4100 Series;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL;" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4200" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;CMD:PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL;" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4240" driver="hp-lj_4240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4250" driver="hp-lj_4250" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4250" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;CMD:PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT;" driver="hp-lj_4250" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4300" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 4300;CMD:PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL;" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4345 mfp" driver="hp-lj_4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4350" driver="hp-lj_4350" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4350" deviceid="MFG:HP;MDL:hp LaserJet 4350L;" driver="hp-lj_4350" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5000" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5200" driver="hp-lj_5200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5200L" driver="hp-lj_5200l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8150" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9040" driver="hp-lj_9040" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9040 MFP" driver="hp-lj_9040_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9050" driver="hp-lj_9050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9050 MFP" driver="hp-lj_9050_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M3027 MFP" driver="hp-lj_m3027_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M3035 MFP" driver="hp-lj_m3035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M4345 MFP" driver="hp-lj_m4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M5025 MFP" driver="hp-lj_m5025_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M5035 MFP" driver="hp-lj_m5035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P2010" driver="hp-lj_p2010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P2015" driver="hp-lj_p2015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P3004" driver="hp-lj_p3004" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P3005" driver="hp-lj_p3005" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3027 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m3027_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3035 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m3035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M4345 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5025 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m5025_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5035 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m5035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2010" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P2010 series;DES:Hewlett-Packard LaserJet P2010 series;CMD:PJL,MLC,BIDI-ECP,PCL,DW-PCL;" driver="hp-lj_p2010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2015" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_p2015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3004" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P3004 Series;DES:Hewlett-Packard LaserJet P3004 Series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_p3004" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3005" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P3005 Series;DES:Hewlett-Packard LaserJet P3005 Series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_p3005" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 300" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 330" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 350" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 500" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 520" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 570" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 580" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 590" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 600" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 610" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 625" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 630" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 635" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 700" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 710" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 720" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 725" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5105" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;CMD:MLC,PCL,PML;" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5110" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;CMD:MLC,PCL,PML;" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6105" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6110" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7110" deviceid="MFG:Hewlett-Packard;MDL:officejet 7100 series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7130" deviceid="MFG:Hewlett-Packard;MDL:officejet 7100 series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7140" deviceid="MFG:Hewlett-Packard;MDL:officejet 7100 series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D125" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D135" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D145" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D155" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G55" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G85" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G95" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K60;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60xi" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K60xi;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K80;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80xi" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K80xi;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet LX" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet;CMD:MLC,PCL,PML;" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1150C" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;CMD:PCL,MLC,PML,PJL;" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1170C" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;CMD:PCL,MLC,PML,PJL;" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1175C" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;CMD:PCL,MLC,PML,PJL;" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R40" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R45" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R60" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R65" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R80" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T45" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;CMD:MLC,PCL,PML;" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T65" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;CMD:MLC,PCL,PML;" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;CMD:MLC,PCL,PML;" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40xi" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;CMD:MLC,PCL,PML;" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 370" deviceid="MFG:Hewlett-Packard;MDL:Printer/Scanner/Copier 300;CMD:MLC,PCL,PML;" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 380" deviceid="MFG:Hewlett-Packard;MDL:Printer/Scanner/Copier 300;CMD:MLC,PCL,PML;" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 500" deviceid="MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;CMD:MLC,PCL,PML,SCL;" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 750" deviceid="MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;CMD:MLC,PCL,PML;" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950" deviceid="MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;CMD:MLC,PCL,PML;" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950xi" deviceid="MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;CMD:MLC,PCL,PML;" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2110" deviceid="MFG:Hewlett-Packard;MDL:PSC 2100 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2150" deviceid="MFG:Hewlett-Packard;MDL:PSC 2150 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2210" deviceid="MFG:Hewlett-Packard;MDL:PSC 2200 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7150" deviceid="MFG:hp;MDL:photosmart 7150;DES:hp photosmart 7150;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7350" deviceid="MFG:hp;MDL:photosmart 7350;DES:hp photosmart 7350;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7550" deviceid="MFG:hp;MDL:photosmart 7550;DES:hp photosmart 7550;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P100" deviceid="MFG:HP;MDL:PHOTOSMART 100;DES:hp photosmart 100;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer translate="name" name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer translate="name" name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1000" deviceid="MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;CMD:MLC,PCL,PML;" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1100" deviceid="MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;CMD:MLC,PCL,PML;" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1115" deviceid="MFG:HP;MDL:PHOTOSMART 1115;DES:hp photosmart 1115;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1218" deviceid="MFG:HP;MDL:PHOTOSMART 1218;DES:hp photosmart 1218;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1315" deviceid="MFG:HP;MDL:PHOTOSMART 1315;DES:hp photosmart 1315;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Infoprint 12" deviceid="MFG:IBM;MDL:Infoprint;CMD:PCL5E,PCL6;" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Page Printer 3112" deviceid="MFG:Lexmark International;MDL:IBM 3112 Page Printer;DES:IBM 3112 Page Printer;CMD:PCL 5 Emulation, PostScript Level 2 Emulation, NPAP, PJL;" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec 4353 MF" driver="infotec-4353_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec 4452 MF" driver="infotec-4452_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4651 MF" deviceid="MFG:Lexmark International;MDL:IBM 3112 Page Printer;DES:IBM 3112 Page Printer;CMD:PCL 5 Emulation, PostScript Level 2 Emulation, NPAP, PJL;" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS2022" driver="infotec-is2022" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS2027" driver="infotec-is2027" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS2032" driver="infotec-is2032" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
@@ -1100,52 +1100,52 @@
       <printer translate="name" name="Infotec MP 4000B" driver="infotec-mp_4000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec MP 5000" driver="infotec-mp_5000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec MP 5000B" driver="infotec-mp_5000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera F-1010" deviceid="MFG:Kyocera;MDL:F-1010;DES:Kyocera F-1010;" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-600" deviceid="MFG:Kyocera;MDL:Kyocera FS-600;DES:Kyocera FS-600;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-680" deviceid="MFG:Kyocera;MDL:Kyocera FS-680;DES:Kyocera FS-680;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-800" deviceid="MFG:Kyocera;MDL:Kyocera FS-800;DES:Kyocera FS-800;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1000" deviceid="MFG:Kyocera;MDL:Kyocera FS-1000;DES:Kyocera FS-1000;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1010" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1010;DES:Kyocera FS-1010;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1050" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1050;DES:Kyocera FS-1050;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1200" deviceid="MFG:Kyocera;MDL:Kyocera FS-1200;DES:Kyocera FS-1200;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1600" deviceid="MFG:Kyocera;MDL:FS-1600;DES:Kyocera FS-1600;" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1700" deviceid="MFG:Kyocera;MDL:Kyocera FS-1700;DES:Kyocera FS-1700;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1750" deviceid="MFG:Kyocera;MDL:Kyocera FS-1750;DES:Kyocera FS-1750;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1800" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1800;DES:Kyocera FS-1800;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1900" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1900;DES:Kyocera FS-1900;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3500" deviceid="MFG:Kyocera;MDL:FS-3500;DES:Kyocera FS-3500;" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3600" deviceid="MFG:Kyocera;MDL:FS-3600;DES:Kyocera FS-3600;" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3700" deviceid="MFG:Kyocera;MDL:Kyocera FS-3700;DES:Kyocera FS-3700;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3750" deviceid="MFG:Kyocera;MDL:Kyocera FS-3750;DES:Kyocera FS-3750;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3800" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-3800;DES:Kyocera FS-3800;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5800C" deviceid="MFG:Kyocera;MDL:Kyocera FS-5800C;DES:Kyocera FS-5800C;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5900C" deviceid="MFG:Kyocera;MDL:Kyocera FS-5900C;DES:Kyocera FS-5900C;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6500" deviceid="MFG:Kyocera;MDL:FS-6500;DES:Kyocera FS-6500;" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6700" deviceid="MFG:Kyocera;MDL:Kyocera FS-6700;DES:Kyocera FS-6700;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-7000" deviceid="MFG:Kyocera;MDL:Kyocera FS-7000;DES:Kyocera FS-7000;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-8000C" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-8000C;DES:Kyocera FS-8000C;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9000" deviceid="MFG:Kyocera;MDL:Kyocera FS-9000;DES:Kyocera FS-9000;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9100DN" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-9100DN;DES:Kyocera FS-9100DN;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9500DN" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-9500DN;DES:Kyocera FS-9500DN;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1530" deviceid="MFG:Kyocera Mita;MDL:KM-1530;DES:Kyocera Mita KM-1530;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1810" deviceid="MFG:Kyocera Mita;MDL:KM-1810;DES:Kyocera Mita KM-1810;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2030" deviceid="MFG:Kyocera Mita;MDL:KM-2030;DES:Kyocera Mita KM-2030;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2530" deviceid="MFG:Kyocera Mita;MDL:KM-2530;DES:Kyocera Mita KM-2530;" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-3530" deviceid="MFG:Kyocera Mita;MDL:KM-3530;DES:Kyocera Mita KM-3530;" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4230" deviceid="MFG:Kyocera Mita;MDL:KM-4230;DES:Kyocera Mita KM-4230;" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4530" deviceid="MFG:Kyocera Mita;MDL:KM-4530;DES:Kyocera Mita KM-4530;" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5230" deviceid="MFG:Kyocera Mita;MDL:KM-5230;DES:Kyocera Mita KM-5230;" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5530" deviceid="MFG:Kyocera Mita;MDL:KM-5530;DES:Kyocera Mita KM-5530;" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-6230" deviceid="MFG:Kyocera Mita;MDL:KM-6230;DES:Kyocera Mita KM-6230;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier 5622" driver="lanier-5622" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier 5627" driver="lanier-5627" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier 5632" driver="lanier-5632" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
@@ -1202,21 +1202,21 @@
       <printer translate="name" name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lexmark Optra E321" driver="lexmark-optra_e321" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E321" deviceid="MFG:Lexmark International;MDL:Lexmark E321;DES:Lexmark E321;CMD:PCL 5 Emulation, PostScript Level 3 For Mac Emulation, NPAP, PJL;" driver="lexmark-optra_e321" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E323" driver="lexmark-optra_e323" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6" deviceid="MFG:MINOLTA;MDL:PagePro 6;CMD:HP ENHANCED PCL5;" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6ex" deviceid="MFG:Minolta;MDL:PagePro   6e;CMD:HP ENHANCED PCL5e,PJL,WinStyler;" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8" deviceid="MFG:MINOLTA;MDL:PagePro 8;CMD:HP ENHANCED PCL6,PJL;" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8L" deviceid="MFG:Minolta;MDL:PagePro 8L;CMD:PrintGear;PCL;PLJ;" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 1100" deviceid="MFG:MINOLTA;MDL:PagePro 1100;CMD:HP ENHANCED PCL6,PJL;" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 870" deviceid="MFG:NEC;MDL:SuperScript 870;DES:SuperScript 870;CMD:PrintGear,PCL,PJL;" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 1800" deviceid="MFG:NEC;MDL:SuperScript 1800;CMD:PCL6,PCL5E;" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG 10515/10518/10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG 2205/2238/2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG 2705/2738/2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
@@ -1277,20 +1277,20 @@
       <printer translate="name" name="Oki OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6e" deviceid="MFG:OKI DATA CORP;MDL:OKIDATA OKIPAGE 6e;DES:OKIDATA OKIPAGE 6e (HP4P);CMD:ENHANCED PCL5,PJL,EPSONFX,IBMPPR,HIPERWINDOWS;" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6ex" deviceid="MFG:OKI DATA CORP;MDL:OKIDATA OKIPAGE 6ex;DES:OKIDATA OKIPAGE 6ex (HP4P);CMD:ENHANCED PCL5,PJL,EPSONFX,IBMPR,HIPERWINDOWS;" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 8p" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 8p;DES:OKIPAGE 8p;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10e" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 10e;DES:OKIPAGE 10e;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10ex" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 10ex;DES:OKIPAGE 10ex;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 14ex" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 14ex;DES:OKIPAGE 14ex;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Super 6e" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 14ex;DES:OKIPAGE 14ex;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
       <printer translate="name" name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P6500" deviceid="MFG:Panasonic;MDL:KX-P6500;DES:(no such line for this device);CMD:GDI;" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio 1022" driver="ricoh-afc_1022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio 1027" driver="ricoh-afc_1027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
@@ -1351,7 +1351,7 @@
       <printer translate="name" name="Samsung ML-1250" driver="samsung-ml-1250" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1450" driver="samsung-ml-1450" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1450PS" driver="samsung-ml-1450ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Samsung ML-1650" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1650" deviceid="MFG:Samsung;MDL:ML-1650;CMD:PCL5E,PCL6;" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1651N" driver="samsung-ml-1651n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1750" driver="samsung-ml-1750" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-2150" driver="samsung-ml-2150" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
@@ -1375,7 +1375,7 @@
       <printer translate="name" name="Samsung ML-7300" driver="samsung-ml-7300" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-7300N" driver="samsung-ml-7300n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung QL-6050" deviceid="MFG:Samsung;MDL:6050;CMD:PCL6;" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2522" driver="savin-2522" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2527" driver="savin-2527" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2532" driver="savin-2532" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
@@ -1428,9 +1428,9 @@
       <printer translate="name" name="Savin 9050" driver="savin-9050" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 9050b" driver="savin-9050b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sharp AR-161" deviceid="MFG:SHARP;MDL:AR-160/200 series;DES:None;CMD:PCL;" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Sony IJP-V100" deviceid="MFG:Sony;MDL:All-in-One IJP-V100;CMD:MLC,PCL,PML;" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
@@ -1439,11 +1439,11 @@
       <printer translate="name" name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P12" deviceid="MFG:XEROX;MDL:DocuPrint P12;DES:Xerox DocuPrint P12;CMD:PrintGear,PCL,PJL;" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P1202" deviceid="MFG:Xerox;MDL:DocuPrint;CMD:PCL5E;" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P8e" deviceid="MFG:Xerox;MDL:DocuPrint P8e;CMD:PCL5E2;" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox WorkCentre M118" deviceid="MFG:XEROX;MDL:WorkCentre M118;DES:XEROX WorkCentre M118;" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
     </family>
     <family name="lexmark">
       <parameters name="standard_params">
@@ -1452,10 +1452,10 @@
         <parameter type="float" name="Density">2.0</parameter>
       </parameters>
       <printer translate="name" name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
-      <printer translate="name" name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer translate="name" name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark X73" deviceid="MFG:Lexmark;MDL:Lexmark X73;DES:Lexmark X73;CMD:LNPAP;" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z42" deviceid="MFG:Lexmark;MDL:Lexmark Z42;DES:Lexmark Z42;CMD:LNPAP;" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
       <printer translate="name" name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer translate="name" name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z52" deviceid="MFG:Lexmark;MDL:Lexmark Z52;DES:Lexmark Z52;" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
       <printer translate="name" name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
     </family>
     <family name="dyesub">


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- gutenprint.spec	18 Aug 2009 14:51:58 -0000	1.54
+++ gutenprint.spec	1 Sep 2009 09:09:43 -0000	1.55
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -12,6 +12,7 @@ Source1:        gutenprint-foomaticppdup
 Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
 Patch2:         gutenprint-selinux.patch
+Patch3:         gutenprint-deviceid.patch
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
@@ -136,6 +137,7 @@ Epson, HP and compatible printers..
 %patch0 -p1 -b .menu
 %patch1 -p1 -b .O6
 %patch2 -p1 -b .selinux
+%patch3 -p1 -b .deviceid
 
 %build
 %configure --disable-static --disable-dependency-tracking  \
@@ -262,6 +264,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-5
+- Provide IEEE 1284 Device IDs in CUPS model list.
+
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
 - Enabled simplified CUPS drivers (bug #518030).
 



From than at fedoraproject.org  Tue Sep  1 09:11:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 09:11:04 +0000 (UTC)
Subject: rpms/ctags/devel ctags-5.7-segment-fault.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 ctags.spec, 1.26, 1.27 sources, 1.11, 1.12
Message-ID: <20090901091104.751B711C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/ctags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10032

Modified Files:
	.cvsignore ctags.spec sources 
Added Files:
	ctags-5.7-segment-fault.patch 
Log Message:
- 5.8
- apply patch to fix segment fault, thanks to Masatake YAMATO



ctags-5.7-segment-fault.patch:
 vim.c |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE ctags-5.7-segment-fault.patch ---
diff -ruN -x '*~' ctags-5.7/vim.c ctags-5.7/vim.c
--- ctags-5.7/vim.c	2006-10-26 12:06:21.000000000 +0900
+++ ctags-5.7/vim.c	2009-08-28 22:21:31.000000000 +0900
@@ -328,7 +328,7 @@
 	 */
 	const unsigned char *cp = line;
 
-	if ( (int) *cp == '\\' ) 
+	if ( cp && ( (int) *cp == '\\' ) ) 
 	{
 		/*
 		 * We are recursively calling this function is the command
@@ -350,9 +350,10 @@
 		while (*cp && isspace ((int) *cp))
 			++cp; 
 	}
-	else if ( (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
-		     (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
-				(strncmp ((const char*) line, "com", (size_t) 3) == 0) )
+	else if ( line && 
+                     (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
+		                (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
+				          (strncmp ((const char*) line, "com", (size_t) 3) == 0) )
 	{
 		cp += 2;
 		if ((int) *++cp == 'm' && (int) *++cp == 'a' &&
@@ -394,6 +395,14 @@
 			while (*cp && !isspace ((int) *cp))
 				++cp; 
 		}
+		else if (!isalnum ((int) *cp))
+		{
+			/*
+			 * Broken syntax: throw away this line
+			 */
+			cmdProcessed = TRUE;
+			goto cleanUp;
+		}
 	} while ( *cp &&  !isalnum ((int) *cp) );
 
 	if ( ! *cp )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctags/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 Feb 2008 16:25:16 -0000	1.11
+++ .cvsignore	1 Sep 2009 09:11:04 -0000	1.12
@@ -1,3 +1,4 @@
 ctags-5.5.4.tar.gz
 ctags-5.6.tar.gz
 ctags-5.7.tar.gz
+ctags-5.8.tar.gz


Index: ctags.spec
===================================================================
RCS file: /cvs/extras/rpms/ctags/devel/ctags.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ctags.spec	24 Jul 2009 19:45:20 -0000	1.26
+++ ctags.spec	1 Sep 2009 09:11:04 -0000	1.27
@@ -1,11 +1,12 @@
 Summary: A C programming language indexing and/or cross-reference tool
 Name: ctags
-Version: 5.7
-Release: 5%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: ctags-5.7-destdir.patch
+Patch1: ctags-5.7-segment-fault.patch
 URL: http://ctags.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@ Note: some command line options is not c
 %prep
 %setup -q
 %patch0 -p1 -b .destdir
+%patch1 -p1 -b .crash
 
 %build
 %configure
@@ -83,6 +85,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/etags.%{name}.1*
 
 %changelog
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 5.8-1
+- 5.8
+- apply patch to fix segment fault, thanks to Masatake YAMATO
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctags/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Feb 2008 16:25:16 -0000	1.11
+++ sources	1 Sep 2009 09:11:04 -0000	1.12
@@ -1 +1 @@
-643cab63b39c8a24377dc4c781547d40  ctags-5.7.tar.gz
+c00f82ecdcc357434731913e5b48630d  ctags-5.8.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  1 09:11:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:11:51 +0000
Subject: [pkgdb] disktype: kwizart has requested watchbugzilla
Message-ID: <20090901091151.E421C10F886@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchbugzilla acl on disktype (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Tue Sep  1 09:11:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:11:53 +0000
Subject: [pkgdb] disktype: kwizart has requested watchcommits
Message-ID: <20090901091153.8A41B10F890@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchcommits acl on disktype (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Tue Sep  1 09:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:11:54 +0000
Subject: [pkgdb] disktype: kwizart has requested commit
Message-ID: <20090901091154.8D2F910F895@bastion2.fedora.phx.redhat.com>

kwizart has requested the commit acl on disktype (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Tue Sep  1 09:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:12:10 +0000
Subject: [pkgdb] disktype: kwizart has requested watchbugzilla
Message-ID: <20090901091210.2E1DE10F888@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchbugzilla acl on disktype (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From mycae at fedoraproject.org  Tue Sep  1 09:12:26 2009
From: mycae at fedoraproject.org (mycae)
Date: Tue,  1 Sep 2009 09:12:26 +0000 (UTC)
Subject: rpms/cpptasks/EL-5 cpptasks.spec,1.1,1.2
Message-ID: <20090901091226.F223911C00EF@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10362

Modified Files:
	cpptasks.spec 
Log Message:
* Remove maven2 BuildRequires 



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/EL-5/cpptasks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpptasks.spec	29 Aug 2009 03:51:51 -0000	1.1
+++ cpptasks.spec	1 Sep 2009 09:12:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -15,7 +15,6 @@ BuildRequires:	ant 
 BuildRequires:	ant-junit 
 BuildRequires:	jpackage-utils 
 BuildRequires:	junit
-BuildRequires:	maven2
 
 Requires:	ant 
 Requires:	java
@@ -129,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Sep 01 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
+- Remove unneeded maven2 BuildRequire
+
 * Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
 - Fix doc installation 
 - Move to _javadir/ant/ rather than _javadir/



From pkgdb at fedoraproject.org  Tue Sep  1 09:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:12:10 +0000
Subject: [pkgdb] disktype: kwizart has requested watchcommits
Message-ID: <20090901091210.C566310F89C@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchcommits acl on disktype (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Tue Sep  1 09:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:12:12 +0000
Subject: [pkgdb] disktype: kwizart has requested commit
Message-ID: <20090901091212.51FDF10F8A0@bastion2.fedora.phx.redhat.com>

kwizart has requested the commit acl on disktype (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From than at fedoraproject.org  Tue Sep  1 09:24:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 09:24:28 +0000 (UTC)
Subject: rpms/ctags/F-11 ctags-5.7-segment-fault.patch, NONE, 1.1 ctags.spec,
	1.25, 1.26 sources, 1.11, 1.12
Message-ID: <20090901092428.E905311C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/ctags/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13596

Modified Files:
	ctags.spec sources 
Added Files:
	ctags-5.7-segment-fault.patch 
Log Message:
- 5.8
- apply patch to fix segment fault, thanks to Masatake YAMATO



ctags-5.7-segment-fault.patch:
 vim.c |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE ctags-5.7-segment-fault.patch ---
diff -ruN -x '*~' ctags-5.7/vim.c ctags-5.7/vim.c
--- ctags-5.7/vim.c	2006-10-26 12:06:21.000000000 +0900
+++ ctags-5.7/vim.c	2009-08-28 22:21:31.000000000 +0900
@@ -328,7 +328,7 @@
 	 */
 	const unsigned char *cp = line;
 
-	if ( (int) *cp == '\\' ) 
+	if ( cp && ( (int) *cp == '\\' ) ) 
 	{
 		/*
 		 * We are recursively calling this function is the command
@@ -350,9 +350,10 @@
 		while (*cp && isspace ((int) *cp))
 			++cp; 
 	}
-	else if ( (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
-		     (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
-				(strncmp ((const char*) line, "com", (size_t) 3) == 0) )
+	else if ( line && 
+                     (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
+		                (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
+				          (strncmp ((const char*) line, "com", (size_t) 3) == 0) )
 	{
 		cp += 2;
 		if ((int) *++cp == 'm' && (int) *++cp == 'a' &&
@@ -394,6 +395,14 @@
 			while (*cp && !isspace ((int) *cp))
 				++cp; 
 		}
+		else if (!isalnum ((int) *cp))
+		{
+			/*
+			 * Broken syntax: throw away this line
+			 */
+			cmdProcessed = TRUE;
+			goto cleanUp;
+		}
 	} while ( *cp &&  !isalnum ((int) *cp) );
 
 	if ( ! *cp )


Index: ctags.spec
===================================================================
RCS file: /cvs/extras/rpms/ctags/F-11/ctags.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ctags.spec	24 Feb 2009 10:05:02 -0000	1.25
+++ ctags.spec	1 Sep 2009 09:24:28 -0000	1.26
@@ -1,11 +1,12 @@
 Summary: A C programming language indexing and/or cross-reference tool
 Name: ctags
-Version: 5.7
-Release: 4%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: ctags-5.7-destdir.patch
+Patch1: ctags-5.7-segment-fault.patch
 URL: http://ctags.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@ Note: some command line options is not c
 %prep
 %setup -q
 %patch0 -p1 -b .destdir
+%patch1 -p1 -b .crash
 
 %build
 %configure
@@ -83,6 +85,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/etags.%{name}.1*
 
 %changelog
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 5.8-1
+- 5.8
+- apply patch to fix segment fault, thanks to Masatake YAMATO
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctags/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Feb 2008 16:25:16 -0000	1.11
+++ sources	1 Sep 2009 09:24:28 -0000	1.12
@@ -1 +1 @@
-643cab63b39c8a24377dc4c781547d40  ctags-5.7.tar.gz
+c00f82ecdcc357434731913e5b48630d  ctags-5.8.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  1 09:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:25:40 +0000
Subject: [pkgdb] etherape: bibu has requested watchcommits
Message-ID: <20090901092540.D77F610F87F@bastion2.fedora.phx.redhat.com>

bibu has requested the watchcommits acl on etherape (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/etherape



From pkgdb at fedoraproject.org  Tue Sep  1 09:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 09:25:54 +0000
Subject: [pkgdb] etherape: bibu has given up watchcommits
Message-ID: <20090901092554.E6AB410F890@bastion2.fedora.phx.redhat.com>

bibu has given up the watchcommits acl on etherape (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/etherape



From than at fedoraproject.org  Tue Sep  1 09:56:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 09:56:42 +0000 (UTC)
Subject: rpms/ctags/F-10 ctags-5.7-segment-fault.patch, NONE, 1.1 ctags.spec,
	1.24, 1.25 sources, 1.11, 1.12
Message-ID: <20090901095642.B62B411C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/ctags/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24031

Modified Files:
	ctags.spec sources 
Added Files:
	ctags-5.7-segment-fault.patch 
Log Message:
- 5.8
- apply patch to fix segment fault, thanks to Masatake YAMATO


ctags-5.7-segment-fault.patch:
 vim.c |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE ctags-5.7-segment-fault.patch ---
diff -ruN -x '*~' ctags-5.7/vim.c ctags-5.7/vim.c
--- ctags-5.7/vim.c	2006-10-26 12:06:21.000000000 +0900
+++ ctags-5.7/vim.c	2009-08-28 22:21:31.000000000 +0900
@@ -328,7 +328,7 @@
 	 */
 	const unsigned char *cp = line;
 
-	if ( (int) *cp == '\\' ) 
+	if ( cp && ( (int) *cp == '\\' ) ) 
 	{
 		/*
 		 * We are recursively calling this function is the command
@@ -350,9 +350,10 @@
 		while (*cp && isspace ((int) *cp))
 			++cp; 
 	}
-	else if ( (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
-		     (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
-				(strncmp ((const char*) line, "com", (size_t) 3) == 0) )
+	else if ( line && 
+                     (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
+		                (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
+				          (strncmp ((const char*) line, "com", (size_t) 3) == 0) )
 	{
 		cp += 2;
 		if ((int) *++cp == 'm' && (int) *++cp == 'a' &&
@@ -394,6 +395,14 @@
 			while (*cp && !isspace ((int) *cp))
 				++cp; 
 		}
+		else if (!isalnum ((int) *cp))
+		{
+			/*
+			 * Broken syntax: throw away this line
+			 */
+			cmdProcessed = TRUE;
+			goto cleanUp;
+		}
 	} while ( *cp &&  !isalnum ((int) *cp) );
 
 	if ( ! *cp )


Index: ctags.spec
===================================================================
RCS file: /cvs/extras/rpms/ctags/F-10/ctags.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ctags.spec	29 Jul 2008 15:40:31 -0000	1.24
+++ ctags.spec	1 Sep 2009 09:56:42 -0000	1.25
@@ -1,11 +1,12 @@
 Summary: A C programming language indexing and/or cross-reference tool
 Name: ctags
-Version: 5.7
-Release: 3%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: ctags-5.7-destdir.patch
+Patch1: ctags-5.7-segment-fault.patch
 URL: http://ctags.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@ Note: some command line options is not c
 %prep
 %setup -q
 %patch0 -p1 -b .destdir
+%patch1 -p1 -b .crash
 
 %build
 %configure
@@ -83,6 +85,16 @@ rm -rf %{buildroot}
 %{_mandir}/man1/etags.%{name}.1*
 
 %changelog
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 5.8-1
+- 5.8
+- apply patch to fix segment fault, thanks to Masatake YAMATO
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 29 2008 Than Ngo <than at redhat.com>  5.7-3
 - add subpackage ctags-etags
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctags/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Feb 2008 16:25:16 -0000	1.11
+++ sources	1 Sep 2009 09:56:42 -0000	1.12
@@ -1 +1 @@
-643cab63b39c8a24377dc4c781547d40  ctags-5.7.tar.gz
+c00f82ecdcc357434731913e5b48630d  ctags-5.8.tar.gz



From ovasik at fedoraproject.org  Tue Sep  1 10:05:36 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  1 Sep 2009 10:05:36 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-ls-inode.patch, NONE,
	1.1 coreutils.spec, 1.269, 1.270
Message-ID: <20090901100536.4604E11C00EF@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26535

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-7.5-ls-inode.patch 
Log Message:
ls -i: print consistent inode numbers also for mount points (#453709)

coreutils-7.5-ls-inode.patch:
 NEWS                              |    5 ++
 src/ls.c                          |   23 +++++++++++-
 tests/Makefile.am                 |    1 
 tests/ls/readdir-mountpoint-inode |   72 ++++++++++++++++++++++++++++++++++++++
 tests/ls/stat-vs-dirent           |    8 ----
 5 files changed, 101 insertions(+), 8 deletions(-)

--- NEW FILE coreutils-7.5-ls-inode.patch ---
>From 3af748aa25193e8a5a8fe520cd967cfbc4d71cb8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 2 Jul 2008 18:01:43 +0200
Subject: [PATCH] ls -i: print consistent inode numbers also for mount points

On most unix- and linux-based kernels, ls -i DIR_CONTAINING_MOUNT_POINT
would print the wrong inode number for any entry that is a mount point.
It would do that by relying on readdir's dirent.d_ino values, while
most readdir implementations return the inode number of the underlying,
inaccessible directory.  Thus, it is not consistent with what you'd
get when applying stat to the same entry.  This bug led to surprising
results like "ls -i" and "ls -i --color" printing different numbers (ls
must usually "stat" a file to colorize its name).  This change makes it
so that on offending systems, ls must stat non-command-line-arguments
for which otherwise it would be able to use "for free" dirent.d_ino
values.  Regardless of this change, ls is already required to stat every
command-line argument.  Note: versions of GNU ls prior to coreutils-6.0
did not perform the invalid optimization, and hence always printed
correct inode numbers.  Thus, for the sake of correctness, ls -i is
forgoing the readdir optimization, for any kernel (including linux!)
with POSIX-nonconforming readdir.  Note that currently, only Cygwin has
been agile enough to conform.

* src/ls.c (RELIABLE_D_INO): Define.
(print_dir): Use it.
For plenty of discussion, see this long thread:
http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/14020
This bug was introduced by the 2006-02-26 commit, 33eb3efe:
"In ls, avoid calling stat for --inode (-i), when possible."
* tests/ls/readdir-mountpoint-inode: New test.
* tests/Makefile.am (TESTS): Add it.
* tests/ls/stat-vs-dirent: Don't suppress failure of this test,
now that ls -i is fixed.  Though note that it doesn't test well,
since it compares only the always-stat'd command-line arguments.
* NEWS (Bug fixes): Mention it.
---
 NEWS                              |    5 +++
 src/ls.c                          |   23 +++++++++++-
 tests/Makefile.am                 |    1 +
 tests/ls/readdir-mountpoint-inode |   72 +++++++++++++++++++++++++++++++++++++
 tests/ls/stat-vs-dirent           |    7 +---
 5 files changed, 101 insertions(+), 7 deletions(-)
 create mode 100755 tests/ls/readdir-mountpoint-inode

diff --git a/NEWS b/NEWS
index 39666fa..50c40be 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,11 @@ GNU coreutils NEWS                                    -*- outline -*-
   printing a summary to stderr.
   [bug introduced in coreutils-6.11]

+  ls -i now prints consistent inode numbers also for mount points.
+  This makes ls -i DIR less efficient on systems with dysfunctional readdir,
+  because ls must stat every file in order to obtain a guaranteed-valid
+  inode number.  [bug introduced in coreutils-6.0]
+
 ** New features

   cp --reflink accepts a new "auto" parameter which falls back to
diff --git a/src/ls.c b/src/ls.c
index 6316dfa..553090d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -126,6 +126,26 @@
    Subtracting doesn't always work, due to overflow.  */
 #define longdiff(a, b) ((a) < (b) ? -1 : (a) > (b))

+/* Unix-based readdir implementations have historically returned a dirent.d_ino
+   value that is sometimes not equal to the stat-obtained st_ino value for
+   that same entry.  This error occurs for a readdir entry that refers
+   to a mount point.  readdir's error is to return the inode number of
+   the underlying directory -- one that typically cannot be stat'ed, as
+   long as a file system is mounted on that directory.  RELIABLE_D_INO
+   encapsulates whether we can use the more efficient approach of relying
+   on readdir-supplied d_ino values, or whether we must incur the cost of
+   calling stat or lstat to obtain each guaranteed-valid inode number.  */
+
+#ifndef READDIR_LIES_ABOUT_MOUNTPOINT_D_INO
+# define READDIR_LIES_ABOUT_MOUNTPOINT_D_INO 1
+#endif
+
+#if READDIR_LIES_ABOUT_MOUNTPOINT_D_INO
+# define RELIABLE_D_INO(dp) NOT_AN_INODE_NUMBER
+#else
+# define RELIABLE_D_INO(dp) D_INO (dp)
+#endif
+
 #if ! HAVE_STRUCT_STAT_ST_AUTHOR
 # define st_author st_uid
 #endif
@@ -2501,7 +2521,8 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
 # endif
 		}
 #endif
-	      total_blocks += gobble_file (next->d_name, type, D_INO (next),
+              total_blocks += gobble_file (next->d_name, type,
+                                           RELIABLE_D_INO (next),
					   false, name);

	      /* In this narrow case, print out each name right away, so
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3177056..0151cb0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -358,6 +358,7 @@ TESTS =                                             \
   ls/no-arg					\
   ls/no-cap					\
   ls/proc-selinux-segfault			\
+  ls/readdir-mountpoint-inode                  \
   ls/recursive					\
   ls/rt-1					\
   ls/stat-dtype					\
diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode
new file mode 100755
index 0000000..763cab1
--- /dev/null
+++ b/tests/ls/readdir-mountpoint-inode
@@ -0,0 +1,72 @@
+#!/bin/sh
+# ensure that ls -i works also for mount points
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  ls --version
+fi
+
+. $srcdir/test-lib.sh
+
+fail=0
+
+mount_points=$(df --local -P 2>&1 | sed -n 's,.*[0-9]% \(/.\),\1,p')
+test -z "$mount_points" && skip_test_ "this test requires a non-root mount point"
+
+# Given e.g., /dev/shm, produce the list of GNU ls options that
+# let us list just that entry using readdir data from its parent:
+# ls -i -I '[^s]*' -I 's[^h]*' -I 'sh[^m]*' -I 'shm?*' -I '.?*' \
+# -I '?' -I '??' /dev
+
+ls_ignore_options()
+{
+  name=$1
+  opts="-I '.?*' -I '$name?*'"
+  while :; do
+    glob=$(echo "$name"|sed 's/\(.*\)\(.\)$/\1[^\2]*/')
+    opts="$opts -I '$glob'"
+    name=$(echo "$name"|sed 's/.$//')
+    test -z "$name" && break
+    glob=$(echo "$name"|sed 's/./?/g')
+    opts="$opts -I '$glob'"
+  done
+  echo "$opts"
+}
+
+inode_via_readdir()
+{
+  mount_point=$1
+  base=$(basename $mount_point)
+  case $base in
+    .*) skip_test_ 'mount point component starts with "."' ;;
+    *[*?]*) skip_test_ 'mount point component contains "?" or "*"' ;;
+  esac
+  opts=$(ls_ignore_options "$base")
+  parent_dir=$(dirname $mount_point)
+  eval "ls -i $opts $parent_dir" | sed 's/ .*//'
+}
+
+# FIXME: use a timeout, in case stat'ing mount points takes too long.
+
+for dir in $mount_points; do
+  readdir_inode=$(inode_via_readdir $dir)
+  stat_inode=$(env stat --format=%i $dir)
+  test "$readdir_inode" = "$stat_inode" || fail=1
+done
+
+Exit $fail
diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent
index c1d7ff5..064ec12 100755
--- a/tests/ls/stat-vs-dirent
+++ b/tests/ls/stat-vs-dirent
@@ -49,12 +49,7 @@ while :; do
         The flaw isn't serious for coreutils, but it might break other tools,
         so you should report it to your operating system vendor." 1>&2

-      # This test fails too often, and we don't want to be distracted
-      # with reports, since the code that could be affected by the losing
-      # behavior (pwd and getcwd) works around any mismatch.
-      # So do continue to issue the warning, but don't count it as a
-      # real failure.
-      # fail=1
+      fail=1
       break
     fi
   fi
--
1.6.4.2.363.g2d6e


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- coreutils.spec	24 Aug 2009 08:38:17 -0000	1.269
+++ coreutils.spec	1 Sep 2009 10:05:36 -0000	1.270
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -19,6 +19,7 @@ Source203:  coreutils-runuser-l.pamd
 
 # From upstream
 Patch1: coreutils-7.5-kojiutimensatskip.patch
+Patch2: coreutils-7.5-ls-inode.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -109,6 +110,7 @@ Libraries for coreutils package.
 
 # From upstream
 %patch1 -p1 -b .kojiutimensat
+%patch2 -p1 -b .inode
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -137,6 +139,7 @@ Libraries for coreutils package.
 %patch951 -p1 -b .selinuxman
 
 chmod a+x tests/misc/sort-mb-tests
+chmod a+x tests/ls/readdir-mountpoint-inode
 
 #fix typos/mistakes in localized documentation(#439410, #440056)
 find ./po/ -name "*.p*" | xargs \
@@ -328,6 +331,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-3
+- ls -i: print consistent inode numbers also for mount points
+  (#453709)
+
 * Mon Aug 24 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-2
 - Better fix than workaround the koji insufficient utimensat
   support issue to prevent failures in other packages



From pghmcfc at fedoraproject.org  Tue Sep  1 10:13:34 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue,  1 Sep 2009 10:13:34 +0000 (UTC)
Subject: rpms/perl-Sysadm-Install/devel .cvsignore, 1.5,
	1.6 perl-Sysadm-Install.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090901101334.AD98D11C00EF@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Sysadm-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28089

Modified Files:
	.cvsignore perl-Sysadm-Install.spec sources 
Log Message:
Update to 0.32 (make UTF-8 handling configurable, not automatic)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Aug 2009 08:21:01 -0000	1.5
+++ .cvsignore	1 Sep 2009 10:13:34 -0000	1.6
@@ -1 +1 @@
-Sysadm-Install-0.31.tar.gz
+Sysadm-Install-0.32.tar.gz


Index: perl-Sysadm-Install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/perl-Sysadm-Install.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Sysadm-Install.spec	28 Aug 2009 08:21:01 -0000	1.6
+++ perl-Sysadm-Install.spec	1 Sep 2009 10:13:34 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:	Typical installation tasks for system administrators
 Name:		perl-Sysadm-Install
-Version:	0.31
+Version:	0.32
 Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -72,6 +72,9 @@ everything, but suppresses any write act
 %{_mandir}/man3/Sysadm::Install.3pm*
 
 %changelog
+* Tue Sep  1 2009 Paul Howarth <paul at city-fan.org> 0.32-1
+- Update to 0.32 (make UTF-8 handling configurable, not automatic)
+
 * Fri Aug 28 2009 Paul Howarth <paul at city-fan.org> 0.31-1
 - Update to 0.31 (improved UTF-8 support)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2009 08:21:02 -0000	1.5
+++ sources	1 Sep 2009 10:13:34 -0000	1.6
@@ -1 +1 @@
-e17a6cb9b9c509250774c6fb7c50f627  Sysadm-Install-0.31.tar.gz
+665bdb7e37c74ee32b0aa4d0e782fe17  Sysadm-Install-0.32.tar.gz



From ovasik at fedoraproject.org  Tue Sep  1 10:19:01 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  1 Sep 2009 10:19:01 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-ls-inode.patch,1.1,1.2
Message-ID: <20090901101901.AB01811C00EF@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29505

Modified Files:
	coreutils-7.5-ls-inode.patch 
Log Message:
fix the fuzz

coreutils-7.5-ls-inode.patch:
 NEWS                              |    5 ++
 src/ls.c                          |   23 +++++++++++-
 tests/Makefile.am                 |    1 
 tests/ls/readdir-mountpoint-inode |   72 ++++++++++++++++++++++++++++++++++++++
 tests/ls/stat-vs-dirent           |    8 ----
 5 files changed, 101 insertions(+), 8 deletions(-)

Index: coreutils-7.5-ls-inode.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.5-ls-inode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-7.5-ls-inode.patch	1 Sep 2009 10:05:35 -0000	1.1
+++ coreutils-7.5-ls-inode.patch	1 Sep 2009 10:19:01 -0000	1.2
@@ -32,14 +32,12 @@ This bug was introduced by the 2006-02-2
 * tests/ls/stat-vs-dirent: Don't suppress failure of this test,
 now that ls -i is fixed.  Though note that it doesn't test well,
 since it compares only the always-stat'd command-line arguments.
-* NEWS (Bug fixes): Mention it.
 ---
- NEWS                              |    5 +++
  src/ls.c                          |   23 +++++++++++-
  tests/Makefile.am                 |    1 +
  tests/ls/readdir-mountpoint-inode |   72 +++++++++++++++++++++++++++++++++++++
  tests/ls/stat-vs-dirent           |    7 +---
- 5 files changed, 101 insertions(+), 7 deletions(-)
+ 4 files changed, 96 insertions(+), 7 deletions(-)
  create mode 100755 tests/ls/readdir-mountpoint-inode
 
 diff --git a/NEWS b/NEWS
@@ -194,8 +192,8 @@ index c1d7ff5..064ec12 100755
 --- a/tests/ls/stat-vs-dirent
 +++ b/tests/ls/stat-vs-dirent
 @@ -49,12 +49,7 @@ while :; do
-         The flaw isn't serious for coreutils, but it might break other tools,
-         so you should report it to your operating system vendor." 1>&2
+ 	The flaw isn't serious for coreutils, but it might break other tools,
+ 	so you should report it to your operating system vendor." 1>&2
 
 -      # This test fails too often, and we don't want to be distracted
 -      # with reports, since the code that could be affected by the losing



From atkac at fedoraproject.org  Tue Sep  1 10:22:40 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  1 Sep 2009 10:22:40 +0000 (UTC)
Subject: rpms/bind/devel bind.spec, 1.323,
	1.324 bind-9.3.1rc1-fix_libbind_includedir.patch, 1.1, NONE
Message-ID: <20090901102240.2299511C00EF@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30368

Modified Files:
	bind.spec 
Removed Files:
	bind-9.3.1rc1-fix_libbind_includedir.patch 
Log Message:
- next attempt to fix the postun trigger (#520385)
- remove obsolete bind-9.3.1rc1-fix_libbind_includedir.patch



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- bind.spec	21 Aug 2009 12:37:36 -0000	1.323
+++ bind.spec	1 Sep 2009 10:22:39 -0000	1.324
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  8.%{PATCHVER}%{?dist}
+Release:  9.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +42,6 @@ Source30: ldap2zone.c
 # Common patches
 Patch5:  bind-nonexec.patch
 Patch10: bind-9.5-PIE.patch
-Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch16: bind-9.3.2-redhat_doc.patch
 Patch71: bind-9.5-overflow.patch
 Patch72: bind-9.5-dlz-64bit.patch
@@ -422,11 +421,13 @@ fi
 
 %post libs -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 # bind-libs between 32:9.6.1-0.1.b1 and 32:9.6.1-0.4.rc1 have bigger SOnames
 # than current bind - https://bugzilla.redhat.com/show_bug.cgi?id=509635.
-# Remove this trigger when SOnames get bigger.
+# Remove this trigger when SOnames get bigger and also correct the %%postun
+# section above (use %%postun libs -p /sbin/ldconfig)
 %triggerpostun -n bind-libs -p /bin/bash -- bind-libs > 32:9.6.1-0.1.b1
 /sbin/ldconfig
 
@@ -581,6 +582,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Sep 01 2009 Adam Tkac <atkac redhat com> 32:9.6.1-9.P1
+- next attempt to fix the postun trigger (#520385)
+- remove obsolete bind-9.3.1rc1-fix_libbind_includedir.patch
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 32:9.6.1-8.P1
 - rebuilt with new openssl
 


--- bind-9.3.1rc1-fix_libbind_includedir.patch DELETED ---



From ovasik at fedoraproject.org  Tue Sep  1 10:30:03 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  1 Sep 2009 10:30:03 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-ls-inode.patch,1.2,1.3
Message-ID: <20090901103003.DA0E411C0498@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32212

Modified Files:
	coreutils-7.5-ls-inode.patch 
Log Message:
Need coffee ...

coreutils-7.5-ls-inode.patch:
 src/ls.c                          |   23 +++++++++++-
 tests/Makefile.am                 |    1 
 tests/ls/readdir-mountpoint-inode |   72 ++++++++++++++++++++++++++++++++++++++
 tests/ls/stat-vs-dirent           |    8 ----
 4 files changed, 96 insertions(+), 8 deletions(-)

Index: coreutils-7.5-ls-inode.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.5-ls-inode.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- coreutils-7.5-ls-inode.patch	1 Sep 2009 10:19:01 -0000	1.2
+++ coreutils-7.5-ls-inode.patch	1 Sep 2009 10:30:03 -0000	1.3
@@ -40,22 +40,6 @@ since it compares only the always-stat'd
  4 files changed, 96 insertions(+), 7 deletions(-)
  create mode 100755 tests/ls/readdir-mountpoint-inode
 
-diff --git a/NEWS b/NEWS
-index 39666fa..50c40be 100644
---- a/NEWS
-+++ b/NEWS
-@@ -16,6 +16,11 @@ GNU coreutils NEWS                                    -*- outline -*-
-   printing a summary to stderr.
-   [bug introduced in coreutils-6.11]
-
-+  ls -i now prints consistent inode numbers also for mount points.
-+  This makes ls -i DIR less efficient on systems with dysfunctional readdir,
-+  because ls must stat every file in order to obtain a guaranteed-valid
-+  inode number.  [bug introduced in coreutils-6.0]
-+
- ** New features
-
-   cp --reflink accepts a new "auto" parameter which falls back to
 diff --git a/src/ls.c b/src/ls.c
 index 6316dfa..553090d 100644
 --- a/src/ls.c



From caolanm at fedoraproject.org  Tue Sep  1 10:31:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Sep 2009 10:31:46 +0000 (UTC)
Subject: rpms/icu/devel icu.6969.pkgdata.patch, NONE,
	1.1 icu.7119.s390x.patch, 
	NONE, 1.1 icu.XXXX.install.patch, NONE, 1.1 icu.spec, 1.100, 1.101
Message-ID: <20090901103146.3660C11C00EF@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv930

Modified Files:
	icu.spec 
Added Files:
	icu.6969.pkgdata.patch icu.7119.s390x.patch 
	icu.XXXX.install.patch 
Log Message:
Resolves: rhbz#520468 fix s390x and other secondary archs

icu.6969.pkgdata.patch:
 pkgdata.cpp |   66 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 15 deletions(-)

--- NEW FILE icu.6969.pkgdata.patch ---
Index: source/tools/pkgdata/pkgdata.cpp
===================================================================
--- source.orig/tools/pkgdata/pkgdata.cpp	2009-06-26 14:57:38.000000000 -0400
+++ source/tools/pkgdata/pkgdata.cpp	2009-06-27 10:12:08.437285758 -0400
@@ -118,6 +118,7 @@
 static void createFileNames(const char *version_major, const char *version, const char *libName, const UBool reverseExt);
 
 static int32_t pkg_getOptionsFromICUConfig(UOption *option);
+static int runCommand(const char* command);
 
 enum {
     NAME,
@@ -461,6 +462,17 @@
     return result;
 }
 
+static int runCommand(const char* command)
+{
+    printf("pkgdata: %s\n", command);
+    int result = system(command);
+    if (result != 0)
+    {
+	printf("-- return status = %d\n", result);
+    }
+    return result;
+}
+
 #define LN_CMD "ln -s"
 #define RM_CMD "rm -f"
 
@@ -724,7 +736,7 @@
             LN_CMD,
             libFileNames[LIB_FILE_VERSION],
             libFileNames[LIB_FILE_VERSION_MAJOR]);
-    result = system(cmd);
+    result = runCommand(cmd);
     if (result != 0) {
         return result;
     }
@@ -737,7 +749,7 @@
             libFileNames[LIB_FILE_VERSION],
             libFileNames[LIB_FILE], pkgDataFlags[SO_EXT]);
 
-     result = system(cmd);
+     result = runCommand(cmd);
 
     return result;
 }
@@ -753,7 +765,7 @@
             installDir, PKGDATA_FILE_SEP_STRING, libFileNames[LIB_FILE_VERSION]
             );
 
-    result = system(cmd);
+    result = runCommand(cmd);
 
     if (result != 0) {
         return result;
@@ -795,7 +807,7 @@
                         srcDir, PKGDATA_FILE_SEP_STRING, buffer,
                         installDir, PKGDATA_FILE_SEP_STRING, buffer);
 
-                result = system(cmd);
+                result = runCommand(cmd);
                 if (result != 0) {
                     fprintf(stderr, "Failed to install data file with command: %s\n", cmd);
                     break;
@@ -815,7 +827,7 @@
     }
 #else
     sprintf(cmd, "%s %s %s %s", WIN_INSTALL_CMD, srcDir, installDir, WIN_INSTALL_CMD_FLAGS);
-    result = system(cmd);
+    result = runCommand(cmd);
     if (result != 0) {
         fprintf(stderr, "Failed to install data file with command: %s\n", cmd);
     }
@@ -849,7 +861,17 @@
                 targetDir,
                 libFileNames[LIB_FILE_VERSION_TMP]);
 
-        result = system(cmd);
+        result = runCommand(cmd);
+        if (result != 0) {
+            return result;
+        }
+
+        sprintf(cmd, "%s %s%s",
+                pkgDataFlags[RANLIB],
+                targetDir,
+                libFileNames[LIB_FILE_VERSION]);
+
+        result = runCommand(cmd);
         if (result != 0) {
             return result;
         }
@@ -860,7 +882,7 @@
                 targetDir,
                 libFileNames[LIB_FILE_VERSION_TMP]);
 
-        result = system(cmd);
+        result = runCommand(cmd);
         if (result != 0) {
             return result;
         }
@@ -908,7 +930,21 @@
                 pkgDataFlags[A_EXT],
                 objectFile);
 
-        result = system(cmd);
+        result = runCommand(cmd);
+        if (result == 0)
+        {
+#ifdef OS400
+            sprintf(cmd, "QSH CMD('%s %s%s.%s')",
+#else
+            sprintf(cmd, "%s %s%s.%s",
+#endif
+                pkgDataFlags[RANLIB],
+                targetDir,
+                libFileNames[LIB_FILE],
+                pkgDataFlags[A_EXT]);
+
+            result = runCommand(cmd);
+        }
     } else /* if (mode == MODE_DLL) */ {
 #ifdef U_CYGWIN
         sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s",
@@ -935,7 +971,7 @@
                 pkgDataFlags[BIR_FLAGS]);
 
         /* Generate the library file. */
-        result = system(cmd);
+        result = runCommand(cmd);
     }
 
     if (freeCmd) {
@@ -961,7 +997,7 @@
             tempObjectFile,
             gencFilePath);
 
-    result = system(cmd);
+    result = runCommand(cmd);
     if (result != 0) {
         return result;
     }
@@ -1043,7 +1079,7 @@
                         tempObjectFile,
                         gencmnFile);
             
-            result = system(cmd);
+            result = runCommand(cmd);
             if (result != 0) {
                 break;
             }
@@ -1094,7 +1130,7 @@
             sprintf(cmd, "cat %s >> %s", gencmnFile, icudtAll);
 #endif
             
-            result = system(cmd);
+            result = runCommand(cmd);
             if (result != 0) {
                 break;
             }
@@ -1110,7 +1146,7 @@
                     pkgDataFlags[LIBFLAGS],
                     tempObjectFile,
                     gencmnFile);
-        result = system(cmd);
+        result = runCommand(cmd);
         if (result != 0) {
             break;
         }
@@ -1139,7 +1175,7 @@
         tempObjectFile,
         icudtAll);
     
-    result = system(cmd);
+    result = runCommand(cmd);
     if (result == 0) {
         sprintf(buffer, "%s %s",
             buffer,
@@ -1222,7 +1258,7 @@
                 );
     }
 
-    return system(cmd);
+    return runCommand(cmd);
 }
 #endif
 

icu.7119.s390x.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE icu.7119.s390x.patch ---
diff -ru icu.orig/source/configure.in icu/source/configure.in
--- icu.orig/source/configure.in	2009-09-01 08:56:46.000000000 +0100
+++ icu/source/configure.in	2009-09-01 10:38:25.000000000 +0100
@@ -462,7 +462,7 @@
 # Check to see if genccode can generate simple assembly.
 GENCCODE_ASSEMBLY=
 case "${host}" in
-i*86-*-linux*|x86_64-*-linux*|powerpc*-*-linux*|i*86-*-*bsd*|i*86-pc-gnu)
+*-linux*|i*86-*-*bsd*|i*86-pc-gnu)
     if test "$GCC" = yes; then
         # We're using gcc, and the simple -a gcc command line works for genccode
         GENCCODE_ASSEMBLY="-a gcc"

icu.XXXX.install.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE icu.XXXX.install.patch ---
--- icu/source/Makefile.in.orig	2009-08-31 21:15:03.000000000 +0100
+++ icu/source/Makefile.in	2009-08-31 21:19:23.000000000 +0100
@@ -146,7 +146,7 @@
 install-doc: doc
 	$(RM) -r $(DESTDIR)$(docdir)/$(docsubdir)
 	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(docsubdir)
-	$(INSTALL_DATA) doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
+	cp -r doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
 endif
 
 $(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/../data/%


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- icu.spec	28 Jul 2009 15:58:09 -0000	1.100
+++ icu.spec	1 Sep 2009 10:31:45 -0000	1.101
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -15,6 +15,9 @@ Patch1:  icu-3.4-multiarchdevel.patch
 Patch2:  icu.icu6284.strictalias.patch
 Patch3:  icu.6995.kannada.patch
 Patch4:  icu.icu7039.badextract.patch
+Patch5:  icu.6969.pkgdata.patch
+Patch6:  icu.XXXX.install.patch
+Patch7:  icu.7119.s390x.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -58,6 +61,9 @@ BuildArch: noarch
 %patch2 -p1 -b .icu6284.strictalias.patch
 %patch3 -p1 -b .icu6995.kannada.patch
 %patch4 -p1 -b .icu7039.badextract.patch
+%patch5 -p0 -b .icu.6969.pkgdata.patch
+%patch6 -p1 -b .icu.XXXX.install.patch
+%patch7 -p1 -b .icu.7119.s390x.patch
 
 %build
 cd source
@@ -136,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Sep 01 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-6
+- Resolves: rhbz#520468 fix s390x and other secondary archs
+
 * Tue Jul 28 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-5
 - icu#7039 fix broken use of extract to get tests working
 



From devrim at fedoraproject.org  Tue Sep  1 10:54:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Sep 2009 10:54:55 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.10,1.11 sources,1.3,1.4
Message-ID: <20090901105455.1F34211C00EF@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5764

Modified Files:
	mapserver.spec sources 
Log Message:
Latest fix (for configure part)



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mapserver.spec	1 Sep 2009 04:40:53 -0000	1.10
+++ mapserver.spec	1 Sep 2009 10:54:54 -0000	1.11
@@ -88,7 +88,6 @@ chmod -x mapscript/php3/README
    --with-geos=%{_bindir}/geos-config \
    --with-proj \
    --with-sos \
-   --with-wcs \
    --with-wmsclient \
    --with-wfsclient \
    --with-xpm \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Aug 2009 21:17:48 -0000	1.3
+++ sources	1 Sep 2009 10:54:54 -0000	1.4
@@ -1,3 +1 @@
-5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
-bde51fbe3f2218f965ee512ecba675e3  mapserver-4.10.4.tar.gz
 4c7e84b69ca57ed755cf268e79b99dce  mapserver-4.10.5.tar.gz



From schwab at fedoraproject.org  Tue Sep  1 11:03:11 2009
From: schwab at fedoraproject.org (schwab)
Date: Tue,  1 Sep 2009 11:03:11 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.284, 1.285 glibc-fedora.patch, 1.318,
	1.319 glibc.spec, 1.411, 1.412 import.log, 1.27, 1.28 sources,
	1.309, 1.310
Message-ID: <20090901110311.DC57D11C00EF@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8089/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- .cvsignore	27 Aug 2009 21:02:57 -0000	1.284
+++ .cvsignore	1 Sep 2009 11:03:10 -0000	1.285
@@ -1,2 +1,2 @@
-glibc-2.10-312-g2df4be8.tar.bz2
-glibc-2.10-312-g2df4be8-fedora.tar.bz2
+glibc-2.10-318-gc2735e9-fedora.tar.bz2
+glibc-2.10-318-gc2735e9.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   28 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- glibc-fedora.patch	27 Aug 2009 21:02:57 -0000	1.318
+++ glibc-fedora.patch	1 Sep 2009 11:03:11 -0000	1.319
@@ -1,6 +1,6 @@
---- glibc-2.10-312-g2df4be8/ChangeLog
-+++ glibc-2.10.90-17/ChangeLog
-@@ -497,6 +497,11 @@
+--- glibc-2.10-318-gc2735e9/ChangeLog
++++ glibc-2.10.90-18/ChangeLog
+@@ -519,6 +519,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -762,6 +767,11 @@
+@@ -784,6 +789,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9160,6 +9170,13 @@
+@@ -9182,6 +9192,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9455,6 +9472,10 @@
+@@ -9477,6 +9494,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10712,6 +10733,15 @@
+@@ -10734,6 +10755,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,8 +65,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-312-g2df4be8/ChangeLog.15
-+++ glibc-2.10.90-17/ChangeLog.15
+--- glibc-2.10-318-gc2735e9/ChangeLog.15
++++ glibc-2.10.90-18/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -132,8 +132,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-312-g2df4be8/ChangeLog.16
-+++ glibc-2.10.90-17/ChangeLog.16
+--- glibc-2.10-318-gc2735e9/ChangeLog.16
++++ glibc-2.10.90-18/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -305,8 +305,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-312-g2df4be8/Makeconfig
-+++ glibc-2.10.90-17/Makeconfig
+--- glibc-2.10-318-gc2735e9/Makeconfig
++++ glibc-2.10.90-18/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -323,8 +323,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-312-g2df4be8/csu/Makefile
-+++ glibc-2.10.90-17/csu/Makefile
+--- glibc-2.10-318-gc2735e9/csu/Makefile
++++ glibc-2.10.90-18/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -335,9 +335,9 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-312-g2df4be8/csu/elf-init.c
-+++ glibc-2.10.90-17/csu/elf-init.c
-@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int,
+--- glibc-2.10-318-gc2735e9/csu/elf-init.c
++++ glibc-2.10.90-18/csu/elf-init.c
+@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
  
@@ -361,8 +361,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-312-g2df4be8/debug/tst-chk1.c
-+++ glibc-2.10.90-17/debug/tst-chk1.c
+--- glibc-2.10-318-gc2735e9/debug/tst-chk1.c
++++ glibc-2.10.90-18/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -391,8 +391,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-312-g2df4be8/elf/ldconfig.c
-+++ glibc-2.10.90-17/elf/ldconfig.c
+--- glibc-2.10-318-gc2735e9/elf/ldconfig.c
++++ glibc-2.10.90-18/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -415,7 +415,7 @@
  
    if (do_chroot && opt_chroot)
      {
-@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool d
+@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool do_chroot)
  	  cp += 8;
  	  while ((dir = strsep (&cp, " \t")) != NULL)
  	    if (dir[0] != '\0')
@@ -431,7 +431,7 @@
  	}
        else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))
  	{
-@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool d
+@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool do_chroot)
     config files to read.  */
  static void
  parse_conf_include (const char *config_file, unsigned int lineno,
@@ -440,7 +440,7 @@
  {
    if (opt_chroot && pattern[0] != '/')
      error (EXIT_FAILURE, 0,
-@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_f
+@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_file, unsigned int lineno,
      {
      case 0:
        for (size_t i = 0; i < gl.gl_pathc; ++i)
@@ -474,8 +474,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-312-g2df4be8/elf/tst-stackguard1.c
-+++ glibc-2.10.90-17/elf/tst-stackguard1.c
+--- glibc-2.10-318-gc2735e9/elf/tst-stackguard1.c
++++ glibc-2.10.90-18/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -500,16 +500,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-312-g2df4be8/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-17/include/bits/stdlib-ldbl.h
+--- glibc-2.10-318-gc2735e9/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-18/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-312-g2df4be8/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-17/include/bits/wchar-ldbl.h
+--- glibc-2.10-318-gc2735e9/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-18/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-312-g2df4be8/include/features.h
-+++ glibc-2.10.90-17/include/features.h
+--- glibc-2.10-318-gc2735e9/include/features.h
++++ glibc-2.10.90-18/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -526,8 +526,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-312-g2df4be8/intl/locale.alias
-+++ glibc-2.10.90-17/intl/locale.alias
+--- glibc-2.10-318-gc2735e9/intl/locale.alias
++++ glibc-2.10.90-18/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -537,8 +537,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-312-g2df4be8/libio/stdio.h
-+++ glibc-2.10.90-17/libio/stdio.h
+--- glibc-2.10-318-gc2735e9/libio/stdio.h
++++ glibc-2.10.90-18/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -552,8 +552,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-312-g2df4be8/locale/iso-4217.def
-+++ glibc-2.10.90-17/locale/iso-4217.def
+--- glibc-2.10-318-gc2735e9/locale/iso-4217.def
++++ glibc-2.10.90-18/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -562,7 +562,7 @@
  DEFINE_INT_CURR("AED")		/* United Arab Emirates Dirham  */
  DEFINE_INT_CURR("AFN")		/* Afghanistan Afgani  */
  DEFINE_INT_CURR("ALL")		/* Albanian Lek  */
-@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram 
+@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram  */
  DEFINE_INT_CURR("ANG")		/* Netherlands Antilles  */
  DEFINE_INT_CURR("AOA")		/* Angolan Kwanza  */
  DEFINE_INT_CURR("ARS")		/* Argentine Peso  */
@@ -577,7 +577,7 @@
  DEFINE_INT_CURR("BGN")		/* Bulgarian Lev  */
  DEFINE_INT_CURR("BHD")		/* Bahraini Dinar  */
  DEFINE_INT_CURR("BIF")		/* Burundi Franc  */
-@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  *
+@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  */
  DEFINE_INT_CURR("CVE")		/* Cape Verde Escudo  */
  DEFINE_INT_CURR("CYP")		/* Cypriot Pound  */
  DEFINE_INT_CURR("CZK")		/* Czech Koruna  */
@@ -585,7 +585,7 @@
  DEFINE_INT_CURR("DJF")		/* Djibouti Franc  */
  DEFINE_INT_CURR("DKK")		/* Danish Krone (Faroe Islands, Greenland)  */
  DEFINE_INT_CURR("DOP")		/* Dominican Republic  */
-@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD")		/* Algerian Dina
+@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD")		/* Algerian Dinar  */
  DEFINE_INT_CURR("EEK")		/* Estonian Kroon  */
  DEFINE_INT_CURR("EGP")		/* Egyptian Pound  */
  DEFINE_INT_CURR("ERN")		/* Eritrean Nakfa  */
@@ -606,7 +606,7 @@
  DEFINE_INT_CURR("GTQ")		/* Guatemala Quetzal  */
  DEFINE_INT_CURR("GYD")		/* Guyana Dollar  */
  DEFINE_INT_CURR("HKD")		/* Hong Kong Dollar  */
-@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK")		/* Croatia Kuna 
+@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK")		/* Croatia Kuna  */
  DEFINE_INT_CURR("HTG")		/* Haiti Gourde  */
  DEFINE_INT_CURR("HUF")		/* Hungarian Forint  */
  DEFINE_INT_CURR("IDR")		/* Indonesia Rupiah  */
@@ -621,7 +621,7 @@
  DEFINE_INT_CURR("JEP")		/* Jersey Pound  */
  DEFINE_INT_CURR("JMD")		/* Jamaican Dollar  */
  DEFINE_INT_CURR("JOD")		/* Jordanian Dinar  */
-@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Ru
+@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Rupee  */
  DEFINE_INT_CURR("LRD")		/* Liberian Dollar  */
  DEFINE_INT_CURR("LSL")		/* Lesotho Maloti  */
  DEFINE_INT_CURR("LTL")		/* Lithuanian Litas  */
@@ -629,7 +629,7 @@
  DEFINE_INT_CURR("LVL")		/* Latvia Lat  */
  DEFINE_INT_CURR("LYD")		/* Libyan Arab Jamahiriya Dinar  */
  DEFINE_INT_CURR("MAD")		/* Moroccan Dirham  */
-@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Me
+@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Metical  */
  DEFINE_INT_CURR("NAD")		/* Namibia Dollar  */
  DEFINE_INT_CURR("NGN")		/* Nigeria Naira  */
  DEFINE_INT_CURR("NIO")		/* Nicaragua Cordoba Oro  */
@@ -637,7 +637,7 @@
  DEFINE_INT_CURR("NOK")		/* Norwegian Krone  */
  DEFINE_INT_CURR("NPR")		/* Nepalese Rupee  */
  DEFINE_INT_CURR("NZD")		/* New Zealand Dollar  */
-@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Gui
+@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Guinea Kina  */
  DEFINE_INT_CURR("PHP")		/* Philippines Peso  */
  DEFINE_INT_CURR("PKR")		/* Pakistan Rupee  */
  DEFINE_INT_CURR("PLN")		/* Polish Zloty  */
@@ -645,9 +645,9 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-312-g2df4be8/locale/programs/locarchive.c
-+++ glibc-2.10.90-17/locale/programs/locarchive.c
-@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo
+--- glibc-2.10-318-gc2735e9/locale/programs/locarchive.c
++++ glibc-2.10.90-18/locale/programs/locarchive.c
+@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
  			    locale_data_t data, bool replace);
@@ -678,9 +678,9 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-312-g2df4be8/localedata/Makefile
-+++ glibc-2.10.90-17/localedata/Makefile
-@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
+--- glibc-2.10-318-gc2735e9/localedata/Makefile
++++ glibc-2.10.90-18/localedata/Makefile
+@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
  	$(LOCALEDEF) --alias-file=../intl/locale.alias \
@@ -688,8 +688,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-312-g2df4be8/localedata/SUPPORTED
-+++ glibc-2.10.90-17/localedata/SUPPORTED
+--- glibc-2.10-318-gc2735e9/localedata/SUPPORTED
++++ glibc-2.10.90-18/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -731,9 +731,9 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-312-g2df4be8/localedata/locales/cy_GB
-+++ glibc-2.10.90-17/localedata/locales/cy_GB
-@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
+--- glibc-2.10-318-gc2735e9/localedata/locales/cy_GB
++++ glibc-2.10.90-18/localedata/locales/cy_GB
+@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
  t_fmt       "<U0025><U0054>"
@@ -747,9 +747,9 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-312-g2df4be8/localedata/locales/en_GB
-+++ glibc-2.10.90-17/localedata/locales/en_GB
-@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
+--- glibc-2.10-318-gc2735e9/localedata/locales/en_GB
++++ glibc-2.10.90-18/localedata/locales/en_GB
+@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
  t_fmt       "<U0025><U0054>"
@@ -760,8 +760,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-312-g2df4be8/localedata/locales/no_NO
-+++ glibc-2.10.90-17/localedata/locales/no_NO
+--- glibc-2.10-318-gc2735e9/localedata/locales/no_NO
++++ glibc-2.10.90-18/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -832,8 +832,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-312-g2df4be8/localedata/locales/zh_TW
-+++ glibc-2.10.90-17/localedata/locales/zh_TW
+--- glibc-2.10-318-gc2735e9/localedata/locales/zh_TW
++++ glibc-2.10.90-18/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -861,8 +861,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-312-g2df4be8/malloc/mcheck.c
-+++ glibc-2.10.90-17/malloc/mcheck.c
+--- glibc-2.10-318-gc2735e9/malloc/mcheck.c
++++ glibc-2.10.90-18/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -889,7 +889,7 @@
  /* Old hook values.  */
  static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
  static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
-@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t cal
+@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
    if (old_free_hook != NULL)
      (*old_free_hook) (ptr, caller);
    else
@@ -898,7 +898,7 @@
    __free_hook = freehook;
  }
  
-@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const 
+@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
      hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
  					     caller);
    else
@@ -907,7 +907,7 @@
    __malloc_hook = mallochook;
    if (hdr == NULL)
      return NULL;
-@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment,
+@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
    if (old_memalign_hook != NULL)
      block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
    else
@@ -916,7 +916,7 @@
    __memalign_hook = memalignhook;
    if (block == NULL)
      return NULL;
-@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_
+@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
  					      sizeof (struct hdr) + size + 1,
  					      caller);
    else
@@ -938,8 +938,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-312-g2df4be8/manual/libc.texinfo
-+++ glibc-2.10.90-17/manual/libc.texinfo
+--- glibc-2.10-318-gc2735e9/manual/libc.texinfo
++++ glibc-2.10.90-18/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -949,8 +949,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-312-g2df4be8/misc/sys/cdefs.h
-+++ glibc-2.10.90-17/misc/sys/cdefs.h
+--- glibc-2.10-318-gc2735e9/misc/sys/cdefs.h
++++ glibc-2.10.90-18/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -994,17 +994,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-312-g2df4be8/nis/nss
-+++ glibc-2.10.90-17/nis/nss
+--- glibc-2.10-318-gc2735e9/nis/nss
++++ glibc-2.10.90-18/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-312-g2df4be8/nptl/ChangeLog
-+++ glibc-2.10.90-17/nptl/ChangeLog
-@@ -3700,6 +3700,15 @@
+--- glibc-2.10-318-gc2735e9/nptl/ChangeLog
++++ glibc-2.10.90-18/nptl/ChangeLog
+@@ -3705,6 +3705,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1020,7 +1020,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4436,6 +4445,11 @@
+@@ -4441,6 +4450,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1032,7 +1032,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6510,6 +6524,11 @@
+@@ -6515,6 +6529,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1044,8 +1044,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-312-g2df4be8/nptl/Makefile
-+++ glibc-2.10.90-17/nptl/Makefile
+--- glibc-2.10-318-gc2735e9/nptl/Makefile
++++ glibc-2.10.90-18/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1078,8 +1078,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-17/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-318-gc2735e9/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1088,8 +1088,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-17/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-318-gc2735e9/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1097,8 +1097,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-312-g2df4be8/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-17/nptl/tst-stackguard1.c
+--- glibc-2.10-318-gc2735e9/nptl/tst-stackguard1.c
++++ glibc-2.10.90-18/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1123,8 +1123,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-312-g2df4be8/nscd/nscd.conf
-+++ glibc-2.10.90-17/nscd/nscd.conf
+--- glibc-2.10-318-gc2735e9/nscd/nscd.conf
++++ glibc-2.10.90-18/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1134,8 +1134,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-312-g2df4be8/nscd/nscd.init
-+++ glibc-2.10.90-17/nscd/nscd.init
+--- glibc-2.10-318-gc2735e9/nscd/nscd.init
++++ glibc-2.10.90-18/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1192,9 +1192,9 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-312-g2df4be8/posix/Makefile
-+++ glibc-2.10.90-17/posix/Makefile
-@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
+--- glibc-2.10-318-gc2735e9/posix/Makefile
++++ glibc-2.10.90-18/posix/Makefile
+@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
  
@@ -1214,8 +1214,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-312-g2df4be8/posix/getconf.speclist.h
-+++ glibc-2.10.90-17/posix/getconf.speclist.h
+--- glibc-2.10-318-gc2735e9/posix/getconf.speclist.h
++++ glibc-2.10.90-18/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1256,8 +1256,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-312-g2df4be8/streams/Makefile
-+++ glibc-2.10.90-17/streams/Makefile
+--- glibc-2.10-318-gc2735e9/streams/Makefile
++++ glibc-2.10.90-18/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1267,8 +1267,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-312-g2df4be8/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-17/sysdeps/generic/dl-cache.h
+--- glibc-2.10-318-gc2735e9/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-18/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1284,8 +1284,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-312-g2df4be8/sysdeps/i386/Makefile
-+++ glibc-2.10.90-17/sysdeps/i386/Makefile
+--- glibc-2.10-318-gc2735e9/sysdeps/i386/Makefile
++++ glibc-2.10.90-18/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1310,8 +1310,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-312-g2df4be8/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-17/sysdeps/ia64/Makefile
+--- glibc-2.10-318-gc2735e9/sysdeps/ia64/Makefile
++++ glibc-2.10.90-18/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1323,8 +1323,8 @@
  endif
  endif
  
---- glibc-2.10-312-g2df4be8/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-17/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-318-gc2735e9/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-18/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1676,8 +1676,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-312-g2df4be8/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-17/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-318-gc2735e9/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-18/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1763,8 +1763,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-312-g2df4be8/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-17/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-318-gc2735e9/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-18/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1773,8 +1773,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-312-g2df4be8/sysdeps/unix/nice.c
-+++ glibc-2.10.90-17/sysdeps/unix/nice.c
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/nice.c
++++ glibc-2.10.90-18/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1789,8 +1789,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1806,8 +1806,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1822,7 +1822,7 @@
  
  #ifndef MIN
  # define MIN(a,b) (((a)<(b))?(a):(b))
-@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_rand
+@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_random)
        unsigned char *p = (unsigned char *) &ret;
        p[sizeof (ret) - 1] = 255;
        p[sizeof (ret) - 2] = '\n';
@@ -1855,8 +1855,8 @@
      }
    else
  #endif
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1899,8 +1899,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1919,8 +1919,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1981,8 +1981,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2015,29 +2015,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2063,8 +2063,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2074,9 +2074,9 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/tcsetattr.c
-@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/tcsetattr.c
+@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
    unsigned long int cmd;
@@ -2084,7 +2084,7 @@
  
    switch (optional_actions)
      {
-@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
+@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p)
    memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
  	  __KERNEL_NCCS * sizeof (cc_t));
  
@@ -2121,8 +2121,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2141,8 +2141,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-312-g2df4be8/timezone/zic.c
-+++ glibc-2.10.90-17/timezone/zic.c
+--- glibc-2.10-318-gc2735e9/timezone/zic.c
++++ glibc-2.10.90-18/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- glibc.spec	27 Aug 2009 21:02:57 -0000	1.411
+++ glibc.spec	1 Sep 2009 11:03:11 -0000	1.412
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-312-g2df4be8
+%define glibcsrcdir glibc-2.10-318-gc2735e9
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 17
+Release: 18
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -351,6 +351,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
 	--enable-multi-arch \
 %endif
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt
+
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1028,10 +1029,15 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Sep  1 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-18
+- Update from master.
+  - fix parse error in <bits/mathinline.h> (#520209).
+
 * Thu Aug 27 2009 Roland McGrath <roland at redhat.com> - 2.10.90-17
 - Update from master.
 
 * Wed Aug 26 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-16
+- Update from master.
   - handle AVX saving on x86-64 in interrupted symbol lookups (#519081).
 
 * Mon Aug 24 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-15


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- import.log	27 Aug 2009 21:02:58 -0000	1.27
+++ import.log	1 Sep 2009 11:03:11 -0000	1.28
@@ -25,3 +25,4 @@ glibc-2_10_90-14:HEAD:glibc-2.10.90-14.s
 glibc-2_10_90-15:HEAD:glibc-2.10.90-15.src.rpm:1251105646
 glibc-2_10_90-16:HEAD:glibc-2.10.90-16.src.rpm:1251288654
 glibc-2_10_90-17:HEAD:glibc-2.10.90-17.src.rpm:1251406917
+glibc-2_10_90-18:HEAD:glibc-2.10.90-18.src.rpm:1251802906


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- sources	27 Aug 2009 21:02:58 -0000	1.309
+++ sources	1 Sep 2009 11:03:11 -0000	1.310
@@ -1,2 +1,2 @@
-e9d285d54d60e73798293d32abdabcf7  glibc-2.10-312-g2df4be8.tar.bz2
-8dd0742bf8c3a90a22197c3e054c3271  glibc-2.10-312-g2df4be8-fedora.tar.bz2
+65209cf11136a0670e363757daaf02bb  glibc-2.10-318-gc2735e9-fedora.tar.bz2
+c48e6a1a15bd51200059e92847ce8c60  glibc-2.10-318-gc2735e9.tar.bz2



From kvolny at fedoraproject.org  Tue Sep  1 11:23:31 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Tue,  1 Sep 2009 11:23:31 +0000 (UTC)
Subject: rpms/libbs2b/F-12 import.log, NONE, 1.1 libbs2b.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901112331.9DDD211C00EF@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/libbs2b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12014/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libbs2b.spec 
Log Message:
* Mon Aug 31 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-2
- specfile cleanup as per review (bug #519138 comment #1)

* Tue Aug 25 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-1
- initial Fedora package version




--- NEW FILE import.log ---
libbs2b-3_1_0-2_fc11:F-12:libbs2b-3.1.0-2.fc11.src.rpm:1251803975


--- NEW FILE libbs2b.spec ---
Name:		libbs2b
Version:	3.1.0
Release:	2%{?dist}
Summary:	Bauer stereophonic-to-binaural DSP library

Group:		Applications/Multimedia
License:	Copyright only
URL:		http://bs2b.sourceforge.net/
Source0:	http://downloads.sourceforge.net/project/bs2b/bs2b/%{version}/%{name}-%{version}.tar.lzma
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	libsndfile-devel
# the dependency (required for bs2bconvert) gets added automatically
#Requires:	libsndfile


%package devel
Summary:	Development files for libbs2b
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description
The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is designed
to improve headphone listening of stereo audio records. Recommended for
headphone prolonged listening to disable superstereo fatigue without essential
distortions.


%description devel
This package contains the development files for the Bauer
stereophonic-to-binaural (bs2b) DSP effect library.


%prep
%setup -q


%build
%configure --disable-static
# disable rpath as suggested in
# https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_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
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm %{buildroot}/%{_libdir}/%{name}.la


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/*
%{_libdir}/%{name}.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%changelog
* Mon Aug 31 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-2
- specfile cleanup as per review (bug #519138 comment #1)

* Tue Aug 25 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-1
- initial Fedora package version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbs2b/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:49:49 -0000	1.1
+++ .cvsignore	1 Sep 2009 11:23:31 -0000	1.2
@@ -0,0 +1 @@
+libbs2b-3.1.0.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbs2b/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:49:49 -0000	1.1
+++ sources	1 Sep 2009 11:23:31 -0000	1.2
@@ -0,0 +1 @@
+00d32ffa6461dde6a632c846da3e0a13  libbs2b-3.1.0.tar.lzma



From kvolny at fedoraproject.org  Tue Sep  1 11:24:42 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Tue,  1 Sep 2009 11:24:42 +0000 (UTC)
Subject: rpms/libbs2b/devel import.log, NONE, 1.1 libbs2b.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901112442.C321A11C00EF@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/libbs2b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12572/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libbs2b.spec 
Log Message:
* Mon Aug 31 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-2
- specfile cleanup as per review (bug #519138 comment #1)

* Tue Aug 25 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-1
- initial Fedora package version




--- NEW FILE import.log ---
libbs2b-3_1_0-2_fc11:HEAD:libbs2b-3.1.0-2.fc11.src.rpm:1251804101


--- NEW FILE libbs2b.spec ---
Name:		libbs2b
Version:	3.1.0
Release:	2%{?dist}
Summary:	Bauer stereophonic-to-binaural DSP library

Group:		Applications/Multimedia
License:	Copyright only
URL:		http://bs2b.sourceforge.net/
Source0:	http://downloads.sourceforge.net/project/bs2b/bs2b/%{version}/%{name}-%{version}.tar.lzma
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	libsndfile-devel
# the dependency (required for bs2bconvert) gets added automatically
#Requires:	libsndfile


%package devel
Summary:	Development files for libbs2b
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description
The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is designed
to improve headphone listening of stereo audio records. Recommended for
headphone prolonged listening to disable superstereo fatigue without essential
distortions.


%description devel
This package contains the development files for the Bauer
stereophonic-to-binaural (bs2b) DSP effect library.


%prep
%setup -q


%build
%configure --disable-static
# disable rpath as suggested in
# https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_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
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm %{buildroot}/%{_libdir}/%{name}.la


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/*
%{_libdir}/%{name}.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%changelog
* Mon Aug 31 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-2
- specfile cleanup as per review (bug #519138 comment #1)

* Tue Aug 25 2009 Karel Voln? <kvolny at redhat.com> 3.1.0-1
- initial Fedora package version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbs2b/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:49:49 -0000	1.1
+++ .cvsignore	1 Sep 2009 11:24:42 -0000	1.2
@@ -0,0 +1 @@
+libbs2b-3.1.0.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbs2b/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:49:49 -0000	1.1
+++ sources	1 Sep 2009 11:24:42 -0000	1.2
@@ -0,0 +1 @@
+00d32ffa6461dde6a632c846da3e0a13  libbs2b-3.1.0.tar.lzma



From caolanm at fedoraproject.org  Tue Sep  1 11:24:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Sep 2009 11:24:53 +0000 (UTC)
Subject: rpms/389-ds-base/devel 389-ds-base.spec,1.6,1.7
Message-ID: <20090901112453.53AA711C00EF@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12693

Modified Files:
	389-ds-base.spec 
Log Message:
rebuild with new openssl to fix dependencies


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 389-ds-base.spec	25 Aug 2009 20:00:52 -0000	1.6
+++ 389-ds-base.spec	1 Sep 2009 11:24:53 -0000	1.7
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -173,6 +173,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1.2.2-2
+- rebuild with new openssl to fix dependencies
+
 * Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.2-1
 - backed out - added template-initconfig to %files - this change is for the next major release
 - bump version to 1.2.2



From overholt at fedoraproject.org  Tue Sep  1 11:25:13 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 11:25:13 +0000 (UTC)
Subject: rpms/maven-shared/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090901112513.ABDBD11C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12887

Modified Files:
	.cvsignore sources 
Log Message:
Upload missing source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2007 03:54:13 -0000	1.2
+++ .cvsignore	1 Sep 2009 11:25:13 -0000	1.3
@@ -1,2 +1 @@
-maven-plugin-testing-harness-1.0-beta-1.tar.gz
-maven-shared-file-management-1.0.tar.gz
+maven-shared-components-8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2007 03:54:13 -0000	1.2
+++ sources	1 Sep 2009 11:25:13 -0000	1.3
@@ -1,2 +1 @@
-aec914cb2efb6fe296cef1b902b2e663  maven-plugin-testing-harness-1.0-beta-1.tar.gz
-aacddc6818a5fa633aafb0e9ca05a8bb  maven-shared-file-management-1.0.tar.gz
+f56bd9b4d221409e5e82af77c4ea1049  maven-shared-components-8.tar.gz



From overholt at fedoraproject.org  Tue Sep  1 11:29:27 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 11:29:27 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.17,1.18
Message-ID: <20090901112927.5FB4011C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14003

Modified Files:
	maven-doxia.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.7.a10
- Fix plexus-cli BR version


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- maven-doxia.spec	31 Aug 2009 22:54:43 -0000	1.17
+++ maven-doxia.spec	1 Sep 2009 11:29:27 -0000	1.18
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.6.a10%{?dist}
+Release:        0.7.a10%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -67,7 +67,7 @@ BuildRequires:  java >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant, ant-nodeps
 BuildRequires:  itext >= 2.1.7-4
-BuildRequires:  plexus-cli >= 2.1.7-4
+BuildRequires:  plexus-cli >= 1.2-8
 %if %{with_maven}
 BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
@@ -245,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.7.a10
+- Fix plexus-cli BR version
+
 * Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.6.a10
 - Add itext and plexus-cli BRs
 



From transif at fedoraproject.org  Tue Sep  1 11:31:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 11:31:04 +0000 (UTC)
Subject: comps/po pa.po,1.19,1.20
Message-ID: <20090901113104.87A0511C00EF@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14675/po

Modified Files:
	pa.po 
Log Message:
Sending translation for Punjabi


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.19 -r 1.20 pa.poIndex: pa.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pa.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- pa.po	10 May 2009 01:52:39 -0000	1.19
+++ pa.po	1 Sep 2009 11:31:04 -0000	1.20
@@ -1,4 +1,4 @@
-# translation of pa.po to Punjabi
+# translation of comps.HEAD.pa.po to Punjabi
 # Punjabi translations for pa package.
 # Copyright (C) 2004 THE pa'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the pa package.
@@ -10,295 +10,316 @@
 # Amanpreet Singh Alam <aalam at redhat.com>, 2004.
 # Amanpreet Singh Alam[???] <amanpreetalam at yahoo.com>, 2005.
 # A S Alam <aalam at users.sf.net>, 2007, 2009.
-# Jaswinder Singh <jsingh at redhat.com>, 2008.
+# Jaswinder Singh <jsingh at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: pa\n"
+"Project-Id-Version: comps.HEAD.pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-09 19:09+0000\n"
-"PO-Revision-Date: 2009-05-10 07:13+0000\n"
-"Last-Translator: A S Alam <aalam at users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjab-l10n at list.sf.net>\n"
+"POT-Creation-Date: 2009-09-01 08:21+0000\n"
+"PO-Revision-Date: 2009-09-01 17:00+0530\n"
+"Last-Translator: Jaswinder Singh <jsingh at redhat.com>\n"
+"Language-Team: Punjabi <Punjabi-users at lists.sourceforge.net>\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"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "??? ???? ??????? ???????????, ?? ?? ??? ?????? ?????? ??????? ???? ??? ???? ???"
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????? ???"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "?? ?????? ?? ??? ??? ?? ???????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????????? ??? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????? ?????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ??????????? ???? ?? ?????? ??????"
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????? ???????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "????-????? ????? ??? ???? ??"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
[...1916 lines suppressed...]
 msgstr "???? ??????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "??????? ?? ???? ?? ???? ??????? ?? ????? ???? ?????????? ????? ??"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "??????? ?? ???? ?? ?? ?????? ??????? ???? ????? ???? ?????????? ?? ?????? ???????? ????? ??"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "??????? ??? ??????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "?????? ???????? ??? ??????????? ?? ??????? ??? ??????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????? ???? (????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "????? ???? (????)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????????? ????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "?????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ??? ??????? X11 ??????? ?????????? ?? ?? ??? ???? ?? ???????? ???? ????????? ?? ????? ?? ????? ????????, ?????? ???? ??? ?????? ????????"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "???? ??? ?????? ???? ?????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "?????? ??????? ???????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "?????? NetBook/NetTop/MID ?????? ?? ??? ??????? ???????????? ???"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?? ????? ?? ???????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????? ??????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1423,7 +1590,7 @@ msgstr ""
 "???? ??? ????????, ??????? ???? ??????? ??, ??? ???? ??? ????, ???????, ????? ????? ??? "
 "??????? ???? ?????? ????? ???"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1431,7 +1598,7 @@ msgstr ""
 "????? ??? ????????, ??????? ???? ??????? ??, ??? ???? ??? ????, ?????, ????? ????? ??? "
 "??????? ???? ?????? ????? ???"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1439,101 +1606,39 @@ msgstr ""
 "??? ??? ??? ?????? ?? ?????? ??, ?? ??????? ?????? ????? ??? ???? ?? ??? ???? ??? ?? ???? "
 "????? ?? ????(Vi) ????? ???"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "X-Emacs ??? ?????? ???"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
-"?? ??? ??????? DocBook ?????? ???? ???????? ????? ???? ??? ????? ??? HTML, PDF, "
-"Postscript, ??? ??? ???? ????? ??? ???? ????? ???"
+"?? ??? ??????? DocBook ?????? ???? ???????? ????? ???? ??? ????? ??? HTML, PDF, Postscript, "
+"??? ??? ???? ????? ??? ???? ????? ???"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?? ????? ???? ??? ???? ?? ??????? ?????? ?? ????? ???"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?? ????? '? ?????? ??????????? ?? ??? ??? ???? ???"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "X?????"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?? ????? '? ???? ??????????? ?? ??? ??? ???? ???"
 
-#~ msgid "British Support"
-#~ msgstr "??????? ??????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "?????? ??????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????? ?????? ???"
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "?????? ?? ?????????? ?????? ??????? ?????? ????? ???"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????? ???? ???? ?????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "????? ?? ?????? ?????? ?? ??????? ???"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "????? ?? ?????-??? GFS ?? ??????? ???"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "?????-??? GFS ??????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "????? ??????? ??? ?????? ???? ????? ?? ???????? ?????? ?? ?????? ?????? ??? ???"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "???? ??????? ??????? ??? ????????? ????"
-
-#~ msgid "Misc"
-#~ msgstr "????"
-
-#~ msgid "Misc packages"
-#~ msgstr "???? ?????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????? ????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "????? ?? ?? Red Hat Enterprise Linux ?? ???? ????? ????? ??"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux ??????????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "????? ?? ????? ?????????? ?????????? ??? ?????????, ????? Infiniband ??? RDMA ?? ???? "
-#~ "????? ??|"
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics ????????? ???????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "????????????? ???????"



From kraxel at fedoraproject.org  Tue Sep  1 11:35:37 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue,  1 Sep 2009 11:35:37 +0000 (UTC)
Subject: rpms/xen/devel xen-bzip2-xz-1.patch, NONE, 1.1 xen-bzip2-xz-2.patch,
	NONE, 1.1 xen-bzip2-xz-3.patch, NONE,
	1.1 xen-pygrub-fix-timeout-0.patch, NONE,
	1.1 xen-qemu-dm-fix-block-memory-leak.patch, NONE,
	1.1 xen-stubdomain-bridging.patch, NONE, 1.1 xen.spec, 1.244, 1.245
Message-ID: <20090901113537.81CCA11C00EF@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16175

Modified Files:
	xen.spec 
Added Files:
	xen-bzip2-xz-1.patch xen-bzip2-xz-2.patch xen-bzip2-xz-3.patch 
	xen-pygrub-fix-timeout-0.patch 
	xen-qemu-dm-fix-block-memory-leak.patch 
	xen-stubdomain-bridging.patch 
Log Message:
backport patches

xen-bzip2-xz-1.patch:
 Makefile               |   22 ++
 xc_dom_bzimageloader.c |  392 +++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 353 insertions(+), 61 deletions(-)

--- NEW FILE xen-bzip2-xz-1.patch ---

# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1250802745 -3600
# Node ID a687c4d35fdd00c89c097d691c3039e07f737a1d
# Parent 29fe6ba28490124ffbfc1252b6fa7a9d7e20803e
domain builder: Implement bzip2 and LZMA loaders

Recent upstream kernels can be compressed using either gzip,
bzip2, or LZMA.  However, the PV kernel loader in Xen currently only
understands gzip, and will fail on the other two types.  The attached
patch implements kernel decompression for gzip, bzip2, and LZMA so
that kernels compressed with any of these methods can be launched.

Signed-off-by: Chris Lalancette <clalance at redhat.com>
Signed-off-by: Keir Fraser <keir.fraser at citrix.com>

--- a/tools/libxc/Makefile	Thu Aug 20 21:15:24 2009 +0100
+++ b/tools/libxc/Makefile	Thu Aug 20 22:12:25 2009 +0100
@@ -114,7 +114,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-	rm -rf *.rpm $(LIB) *~ $(DEPS) \
+	rm -rf *.rpm $(LIB) *~ $(DEPS) .*.deps \
             $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \
             $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS)
 
@@ -151,6 +151,26 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
+.zlib.deps:
+	@(set -e;					\
+          . ../check/funcs.sh;				\
+	  rm -f $@.new;					\
+	  if has_header bzlib.h; then			\
+            echo "-DHAVE_BZLIB" >>$@.new;		\
+	    echo "-lbz2" >>$@.new;			\
+	    echo " - BZIP2 decompression supported";	\
+	  fi;						\
+	  if has_header lzma.h; then			\
+	    echo "-DHAVE_LZMA" >>$@.new;		\
+	    echo "-llzma" >>$@.new;			\
+	    echo " - LZMA decompression supported";	\
+	  fi;						\
+	  mv $@.new $@)
+
+xc_dom_bzimageloader.o: .zlib.deps
+xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)
+
+libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(shell grep l .zlib.deps)
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
 	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
 
--- a/tools/libxc/xc_dom_bzimageloader.c	Thu Aug 20 21:15:24 2009 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c	Thu Aug 20 22:12:25 2009 +0100
@@ -11,6 +11,7 @@
  * written 2006 by Gerd Hoffmann <kraxel at suse.de>.
  * written 2007 by Jeremy Fitzhardinge <jeremy at xensource.com>
  * written 2008 by Ian Campbell <ijc at hellion.org.uk>
+ * written 2009 by Chris Lalancette <clalance at redhat.com>
  *
  */
 #include <stdio.h>
@@ -20,43 +21,289 @@
 #include "xg_private.h"
 #include "xc_dom.h"
 
+#if defined(HAVE_BZLIB)
+
+#include <bzlib.h>
+
+static int xc_try_bzip2_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    bz_stream stream;
+    int ret;
+    char *out_buf;
+    int retval = -1;
+    int outsize;
+    uint64_t total;
+
+    stream.bzalloc = NULL;
+    stream.bzfree = NULL;
+    stream.opaque = NULL;
+
+    ret = BZ2_bzDecompressInit(&stream, 0, 0);
+    if ( ret != BZ_OK )
+    {
+        xc_dom_printf("Error initting bz2 stream\n");
+        return -1;
+    }
+
+    /* sigh.  We don't know up-front how much memory we are going to need
+     * for the output buffer.  Allocate the output buffer to be equal
+     * the input buffer to start, and we'll realloc as needed.
+     */
+    outsize = dom->kernel_size;
+    out_buf = malloc(outsize);
+    if ( out_buf == NULL )
+    {
+        xc_dom_printf("Failed to alloc memory\n");
+        goto bzip2_cleanup;
+    }
+
+    stream.next_in = dom->kernel_blob;
+    stream.avail_in = dom->kernel_size;
+
+    stream.next_out = out_buf;
+    stream.avail_out = dom->kernel_size;
+
+    for ( ; ; )
+    {
+        ret = BZ2_bzDecompress(&stream);
+        if ( (stream.avail_out == 0) || (ret != BZ_OK) )
+        {
+            out_buf = realloc(out_buf, outsize * 2);
+            if ( out_buf == NULL )
+            {
+                xc_dom_printf("Failed to realloc memory\n");
+                break;
+            }
+
+            stream.next_out = out_buf + outsize;
+            stream.avail_out = (outsize * 2) - outsize;
+            outsize *= 2;
+        }
+
+        if ( ret != BZ_OK )
+        {
+            if ( ret == BZ_STREAM_END )
+            {
+                xc_dom_printf("Saw data stream end\n");
+                retval = 0;
+                break;
+            }
+            xc_dom_printf("BZIP error\n");
+        }
+    }
+
+    total = (stream.total_out_hi32 << 31) | stream.total_out_lo32;
+
+    xc_dom_printf("%s: BZIP2 decompress OK, 0x%zx -> 0x%lx\n",
+                  __FUNCTION__, *size, (long unsigned int) total);
+
+    *blob = out_buf;
+    *size = total;
+
+ bzip2_cleanup:
+    BZ2_bzDecompressEnd(&stream);
+
+    return retval;
+}
+
+#else /* !defined(HAVE_BZLIB) */
+
+static int xc_try_bzip2_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    xc_dom_printf("%s: LZMA decompress support unavailable\n",
+                  __FUNCTION__);
+    return -1;
+}
+
+#endif
+
+#if defined(HAVE_LZMA)
+
+#include <lzma.h>
+
+static uint64_t physmem(void)
+{
+    uint64_t ret = 0;
+    const long pagesize = sysconf(_SC_PAGESIZE);
+    const long pages = sysconf(_SC_PHYS_PAGES);
+
+    if ( (pagesize != -1) || (pages != -1) )
+    {
+        /*
+         * According to docs, pagesize * pages can overflow.
+         * Simple case is 32-bit box with 4 GiB or more RAM,
+         * which may report exactly 4 GiB of RAM, and "long"
+         * being 32-bit will overflow. Casting to uint64_t
+         * hopefully avoids overflows in the near future.
+         */
+        ret = (uint64_t)(pagesize) * (uint64_t)(pages);
+    }
+
+    return ret;
+}
+
+static int xc_try_lzma_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    lzma_stream stream = LZMA_STREAM_INIT;
+    lzma_ret ret;
+    lzma_action action = LZMA_RUN;
+    unsigned char *out_buf;
+    int retval = -1;
+    int outsize;
+    const char *msg;
+
+    ret = lzma_alone_decoder(&stream, physmem() / 3);
+    if ( ret != LZMA_OK )
+    {
+        xc_dom_printf("Failed to init lzma stream decoder\n");
+        return -1;
+    }
+
+    /* sigh.  We don't know up-front how much memory we are going to need
+     * for the output buffer.  Allocate the output buffer to be equal
+     * the input buffer to start, and we'll realloc as needed.
+     */
+    outsize = dom->kernel_size;
+    out_buf = malloc(outsize);
+    if ( out_buf == NULL )
+    {
+        xc_dom_printf("Failed to alloc memory\n");
+        goto lzma_cleanup;
+    }
+
+    stream.next_in = dom->kernel_blob;
+    stream.avail_in = dom->kernel_size;
+
+    stream.next_out = out_buf;
+    stream.avail_out = dom->kernel_size;
+
+    for ( ; ; )
+    {
+        ret = lzma_code(&stream, action);
+        if ( (stream.avail_out == 0) || (ret != LZMA_OK) )
+        {
+            out_buf = realloc(out_buf, outsize * 2);
+            if ( out_buf == NULL )
+            {
+                xc_dom_printf("Failed to realloc memory\n");
+                break;
+            }
+
+            stream.next_out = out_buf + outsize;
+            stream.avail_out = (outsize * 2) - outsize;
+            outsize *= 2;
+        }
+
+        if ( ret != LZMA_OK )
+        {
+            if ( ret == LZMA_STREAM_END )
+            {
+                xc_dom_printf("Saw data stream end\n");
+                retval = 0;
+                break;
+            }
+
+            switch ( ret )
+            {
+            case LZMA_MEM_ERROR:
+                msg = strerror(ENOMEM);
+                break;
+
+            case LZMA_MEMLIMIT_ERROR:
+                msg = "Memory usage limit reached";
+                break;
+
+            case LZMA_FORMAT_ERROR:
+                msg = "File format not recognized";
+                break;
+
+            case LZMA_OPTIONS_ERROR:
+                // FIXME: Better message?
+                msg = "Unsupported compression options";
+                break;
+
+            case LZMA_DATA_ERROR:
+                msg = "File is corrupt";
+                break;
+
+            case LZMA_BUF_ERROR:
+                msg = "Unexpected end of input";
+                break;
+
+            default:
+                msg = "Internal program error (bug)";
+                break;
+            }
+            xc_dom_printf("%s: LZMA decompression error %s\n",
+                          __FUNCTION__, msg);
+            break;
+        }
+    }
+
+    xc_dom_printf("%s: LZMA decompress OK, 0x%zx -> 0x%zx\n",
+                  __FUNCTION__, *size, (size_t)stream.total_out);
+
+    *blob = out_buf;
+    *size = stream.total_out;
+
+ lzma_cleanup:
+    lzma_end(&stream);
+
+    return retval;
+}
+
+#else /* !defined(HAVE_LZMA) */
+
+static int xc_try_lzma_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    xc_dom_printf("%s: LZMA decompress support unavailable\n",
+                  __FUNCTION__);
+    return -1;
+}
+
+#endif
+
 struct setup_header {
-	uint8_t		_pad0[0x1f1];		/* skip uninteresting stuff */
-	uint8_t		setup_sects;
-	uint16_t	root_flags;
-	uint32_t	syssize;
-	uint16_t	ram_size;
-	uint16_t	vid_mode;
-	uint16_t	root_dev;
-	uint16_t	boot_flag;
-	uint16_t	jump;
-	uint32_t	header;
-#define HDR_MAGIC		"HdrS"
-#define HDR_MAGIC_SZ	4
-	uint16_t	version;
-#define VERSION(h,l)	(((h)<<8) | (l))
-	uint32_t	realmode_swtch;
-	uint16_t	start_sys;
-	uint16_t	kernel_version;
-	uint8_t		type_of_loader;
-	uint8_t		loadflags;
-	uint16_t	setup_move_size;
-	uint32_t	code32_start;
-	uint32_t	ramdisk_image;
-	uint32_t	ramdisk_size;
-	uint32_t	bootsect_kludge;
-	uint16_t	heap_end_ptr;
-	uint16_t	_pad1;
-	uint32_t	cmd_line_ptr;
-	uint32_t	initrd_addr_max;
-	uint32_t	kernel_alignment;
-	uint8_t		relocatable_kernel;
-	uint8_t		_pad2[3];
-	uint32_t	cmdline_size;
-	uint32_t	hardware_subarch;
-	uint64_t	hardware_subarch_data;
-	uint32_t	payload_offset;
-	uint32_t	payload_length;
+    uint8_t  _pad0[0x1f1];  /* skip uninteresting stuff */
+    uint8_t  setup_sects;
+    uint16_t root_flags;
+    uint32_t syssize;
+    uint16_t ram_size;
+    uint16_t vid_mode;
+    uint16_t root_dev;
+    uint16_t boot_flag;
+    uint16_t jump;
+    uint32_t header;
+#define HDR_MAGIC  "HdrS"
+#define HDR_MAGIC_SZ 4
+    uint16_t version;
+#define VERSION(h,l) (((h)<<8) | (l))
+    uint32_t realmode_swtch;
+    uint16_t start_sys;
+    uint16_t kernel_version;
+    uint8_t  type_of_loader;
+    uint8_t  loadflags;
+    uint16_t setup_move_size;
+    uint32_t code32_start;
+    uint32_t ramdisk_image;
+    uint32_t ramdisk_size;
+    uint32_t bootsect_kludge;
+    uint16_t heap_end_ptr;
+    uint16_t _pad1;
+    uint32_t cmd_line_ptr;
+    uint32_t initrd_addr_max;
+    uint32_t kernel_alignment;
+    uint8_t  relocatable_kernel;
+    uint8_t  _pad2[3];
+    uint32_t cmdline_size;
+    uint32_t hardware_subarch;
+    uint64_t hardware_subarch_data;
+    uint32_t payload_offset;
+    uint32_t payload_length;
 } __attribute__((packed));
 
 extern struct xc_dom_loader elf_loader;
@@ -70,22 +317,22 @@ static unsigned int payload_offset(struc
     return off;
 }
 
-static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
+static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
 {
     struct setup_header *hdr;
+    int ret;
 
     if ( dom->kernel_blob == NULL )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
-                         __FUNCTION__);
-        return -EINVAL;
-    }
+        xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
+                     __FUNCTION__);
+        return -EINVAL;
+    }
+
     if ( dom->kernel_size < sizeof(struct setup_header) )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
-                         __FUNCTION__);
+        xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
 
@@ -93,37 +340,62 @@ static int check_bzimage_kernel(struct x
 
     if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n",
-                         __FUNCTION__);
+        xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
 
     if ( hdr->version < VERSION(2,8) )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n",
-                         __FUNCTION__, hdr->version);
+        xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n",
+                     __FUNCTION__, hdr->version);
         return -EINVAL;
     }
 
     dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
     dom->kernel_size = hdr->payload_length;
 
-    if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
-    {
-        if ( verbose )
-            xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n",
+    if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
+    {
+        ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
+        if ( ret == -1 )
+        {
+            xc_dom_panic(XC_INVALID_KERNEL,
+                         "%s: unable to gzip decompress kernel\n",
                          __FUNCTION__);
+            return -EINVAL;
+        }
+    }
+    else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 )
+    {
+        ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+        if ( ret < 0 )
+        {
+            xc_dom_panic(XC_INVALID_KERNEL,
+                         "%s unable to BZIP2 decompress kernel",
+                         __FUNCTION__);
+            return -EINVAL;
+        }
+    }
+    else if ( memcmp(dom->kernel_blob, "\135\000", 2) == 0 )
+    {
+        ret = xc_try_lzma_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+        if ( ret < 0 )
+        {
+            xc_dom_panic(XC_INVALID_KERNEL,
+                         "%s unable to LZMA decompress kernel\n",
+                         __FUNCTION__);
+            return -EINVAL;
+        }
+    }
+    else
+    {
+        xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
 
     return elf_loader.probe(dom);
-}
-
-static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
-{
-    return check_bzimage_kernel(dom, 0);
 }
 
 static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom)


xen-bzip2-xz-2.patch:
 Makefile |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE xen-bzip2-xz-2.patch ---

# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1250803576 -3600
# Node ID 7dad2e23bf892a6be9244265e028a9899503e664
# Parent a687c4d35fdd00c89c097d691c3039e07f737a1d
libxenguest: Fix libbz2/liblzma dependency computation.

 1. Create an empty dep file if neither lib is installed
 2. Forcibly disable support for libs if building minios

Signed-off-by: Keir Fraser <keir.fraser at citrix.com>

--- a/tools/libxc/Makefile	Thu Aug 20 22:12:25 2009 +0100
+++ b/tools/libxc/Makefile	Thu Aug 20 22:26:16 2009 +0100
@@ -151,10 +151,14 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
+ifeq ($(CONFIG_MiniOS),y)
+.zlib.deps:
+	echo >$@
+else
 .zlib.deps:
 	@(set -e;					\
           . ../check/funcs.sh;				\
-	  rm -f $@.new;					\
+	  echo >$@.new;					\
 	  if has_header bzlib.h; then			\
             echo "-DHAVE_BZLIB" >>$@.new;		\
 	    echo "-lbz2" >>$@.new;			\
@@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 	    echo " - LZMA decompression supported";	\
 	  fi;						\
 	  mv $@.new $@)
+endif
 
 xc_dom_bzimageloader.o: .zlib.deps
 xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)


xen-bzip2-xz-3.patch:
 .hgignore                          |    2 +-
 tools/libxc/Makefile               |   36 +++++++++++++++---------------------
 tools/libxc/xc_dom_bzimageloader.c |    2 +-
 3 files changed, 17 insertions(+), 23 deletions(-)

--- NEW FILE xen-bzip2-xz-3.patch ---

# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1251098850 -3600
# Node ID c5125c0ea051be8babe0533c94a5635eaa760272
# Parent 4e67ba3c321affda3f90734ba62ce04b23fce66c
libxc: More LZMA/BZIP fixes.

 - Fix an error message in xc_try_bzip2_decode()
 - Check library installation on demand using a Makefile function,
   rather than generating a dependency file. Cleaner and avoids a race
   on generating the dep file.

Signed-off-by: Keir Fraser <keir.fraser at citrix.com>

--- a/.hgignore	Mon Aug 24 08:08:52 2009 +0100
+++ b/.hgignore	Mon Aug 24 08:27:30 2009 +0100
@@ -102,6 +102,7 @@
 ^stubdom/ocaml-.*$
 ^stubdom/lwip/
 ^stubdom/ioemu/
+^stubdom/stubdompath\.sh$
 ^tools/.*/build/lib.*/.*\.py$
 ^tools/blktap2/daemon/blktapctrl$
 ^tools/blktap2/drivers/img2qcow$
@@ -170,7 +171,6 @@
 ^tools/ioemu/qemu\.1$
 ^tools/ioemu/qemu\.pod$
 ^tools/ioemu/tapdisk-ioemu$
-^tools/libxc/\.zlib\.deps$
 ^tools/libxc/ia64/asm/.*\.h$
 ^tools/libxc/ia64/acpi/.*\.h$
 ^tools/libxc/ia64/acpi/platform/.*\.h$
--- a/tools/libxc/Makefile	Mon Aug 24 08:08:52 2009 +0100
+++ b/tools/libxc/Makefile	Mon Aug 24 08:27:30 2009 +0100
@@ -114,7 +114,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-	rm -rf *.rpm $(LIB) *~ $(DEPS) .*.deps \
+	rm -rf *.rpm $(LIB) *~ $(DEPS) \
             $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \
             $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS)
 
@@ -152,30 +152,24 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 	ln -sf $< $@
 
 ifeq ($(CONFIG_MiniOS),y)
-.zlib.deps:
-	echo >$@
+zlib-options =
 else
-.zlib.deps:
-	@(set -e;					\
-          . ../check/funcs.sh;				\
-	  echo >$@.new;					\
-	  if has_header bzlib.h; then			\
-            echo "-DHAVE_BZLIB" >>$@.new;		\
-	    echo "-lbz2" >>$@.new;			\
-	    echo " - BZIP2 decompression supported";	\
-	  fi;						\
-	  if has_header lzma.h; then			\
-	    echo "-DHAVE_LZMA" >>$@.new;		\
-	    echo "-llzma" >>$@.new;			\
-	    echo " - LZMA decompression supported";	\
-	  fi;						\
-	  mv $@.new $@)
+zlib-options = $(shell					\
+	(. ../check/funcs.sh;				\
+	 if has_header bzlib.h; then			\
+           echo "-DHAVE_BZLIB";				\
+	   echo "-lbz2";				\
+	 fi;						\
+	 if has_header lzma.h; then			\
+	   echo "-DHAVE_LZMA";				\
+	   echo "-llzma";				\
+	 fi) | grep $(1))
 endif
 
-xc_dom_bzimageloader.o: .zlib.deps
-xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)
+xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
+xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
 
-libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(shell grep l .zlib.deps)
+libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
 	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
 
--- a/tools/libxc/xc_dom_bzimageloader.c	Mon Aug 24 08:08:52 2009 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c	Mon Aug 24 08:27:30 2009 +0100
@@ -112,7 +112,7 @@ static int xc_try_bzip2_decode(
 static int xc_try_bzip2_decode(
     struct xc_dom_image *dom, void **blob, size_t *size)
 {
-    xc_dom_printf("%s: LZMA decompress support unavailable\n",
+    xc_dom_printf("%s: BZIP2 decompress support unavailable\n",
                   __FUNCTION__);
     return -1;
 }


xen-pygrub-fix-timeout-0.patch:
 pygrub |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE xen-pygrub-fix-timeout-0.patch ---

# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1250753424 -3600
# Node ID 7a57911ff09efb2b2e5fe7811e0495adc5884a29
# Parent 3fc731e42b63f14ef0be1a972113dd19834f0d99
pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour

Signed-off-by: Keir Fraser <keir.fraser at citrix.com>
xen-unstable changeset:   20090:3509276d8ad6
xen-unstable date:        Thu Aug 20 08:23:33 2009 +0100

--- a/tools/pygrub/src/pygrub	Thu Aug 20 08:29:54 2009 +0100
+++ b/tools/pygrub/src/pygrub	Thu Aug 20 08:30:24 2009 +0100
@@ -443,11 +443,7 @@ class Grub:
                 # Timed out waiting for a keypress
                 if mytime != -1:
                     mytime += 1
-                    # curses.timeout() does not work properly on Solaris
-                    # So we may come here even after a key has been pressed.
-                    # Check both timeout and mytime to avoid exiting
-                    # when we shouldn't.
-                    if timeout != -1 and mytime >= int(timeout):
+                    if mytime >= int(timeout):
                         self.isdone = True
                         break
             else:


xen-qemu-dm-fix-block-memory-leak.patch:
 block.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xen-qemu-dm-fix-block-memory-leak.patch ---
Date: Wed, 12 Aug 2009 17:09:15 +0100
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
To: xen-devel at lists.xensource.com
Message-ID: <alpine.DEB.2.00.0908121705330.10516 at kaball-desktop>
Subject: [Xen-devel] [PATCH] fix qemu memory leak

Hi all,
the qemu block interface leaks memory every time a read or write request
is issued, this patch fixes it.
This is also the bug that is causing stubdomains to crash under high
disk IO.

Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

---

diff --git a/block.c b/block.c
index 36f5eb9..6ce453c 100644
--- a/tools/ioemu-qemu-xen/block.c
+++ b/tools/ioemu-qemu-xen/block.c
@@ -1378,6 +1378,7 @@ static void bdrv_aio_rw_vector_cb(void *opaque, int ret)
     qemu_vfree(s->bounce);
     s->this_aiocb->cb(s->this_aiocb->opaque, ret);
     qemu_aio_release(s->this_aiocb);
+    qemu_free(s);
 }
 
 static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,

_______________________________________________
Xen-devel mailing list
Xen-devel at lists.xensource.com
http://lists.xensource.com/xen-devel


xen-stubdomain-bridging.patch:
 stubdom-dm |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE xen-stubdomain-bridging.patch ---
Date: Fri, 14 Aug 2009 17:47:42 +0100
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
To: xen-devel at lists.xensource.com
Message-ID: <alpine.DEB.2.00.0908141739580.4422 at kaball-desktop>
Subject: [Xen-devel] [PATCH] stubdoms: parse bridge informations

Hi all,
currently the stubdom-dm script doesn't read the bridge of a vif
on xenstore, therefore all the vifs assigned to the stubdom always
belong to default bridge.
This patch changes the behavior reading the bridge from xenstore and
adding the bridge to the stubdom config file.

It would be nice to have this patch in the 3.4 tree as well.

Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>

---

diff -r 68e8b8379244 stubdom/stubdom-dm
--- a/stubdom/stubdom-dm	Sun Aug 02 13:43:15 2009 +0100
+++ b/stubdom/stubdom-dm	Fri Aug 14 17:39:53 2009 +0100
@@ -143,11 +143,18 @@
     i=${i%\"}
     i=${i#\"}
     vif_mac=`xenstore-read $i/mac`
+    vif_bridge=`xenstore-read $i/bridge`
     if [ $j -ne 0 ]
     then
         echo -n "," >> ${stubdom_configdir}/$domname-dm
     fi
-    echo -n "'mac=$vif_mac'" >> ${stubdom_configdir}/$domname-dm
+    echo -n "'mac=$vif_mac" >> ${stubdom_configdir}/$domname-dm
+    if [ "$vif_bridge" ]
+    then
+        echo -n ",bridge=$vif_bridge'" >> ${stubdom_configdir}/$domname-dm
+    else
+        echo -n "'" >> ${stubdom_configdir}/$domname-dm
+    fi
     j=$(( $j + 1 ))
 done
 echo " ] " >> ${stubdom_configdir}/$domname-dm

_______________________________________________
Xen-devel mailing list
Xen-devel at lists.xensource.com
http://lists.xensource.com/xen-devel



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- xen.spec	7 Aug 2009 15:27:58 -0000	1.244
+++ xen.spec	1 Sep 2009 11:35:37 -0000	1.245
@@ -37,6 +37,15 @@ Patch5: xen-net-disable-iptables-on-brid
 
 Patch10: xen-no-werror.patch
 
+# backports
+Patch20: xen-pygrub-fix-timeout-0.patch
+Patch21: xen-qemu-dm-fix-block-memory-leak.patch
+Patch22: xen-stubdomain-bridging.patch
+
+Patch30: xen-bzip2-xz-1.patch
+Patch31: xen-bzip2-xz-2.patch
+Patch32: xen-bzip2-xz-3.patch
+
 Patch100: xen-configure-xend.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -58,6 +67,8 @@ BuildRequires: gnutls-devel
 BuildRequires: openssl-devel
 # For ioemu PCI passthrough
 BuildRequires: pciutils-devel
+# modern compressed kernels
+BuildRequires: bzip2-devel xz-devel
 Requires: bridge-utils
 Requires: udev >= 059
 Requires: xen-runtime = %{version}-%{release}
@@ -136,6 +147,14 @@ which manage Xen virtual machines.
 
 %patch10 -p1
 
+%patch20 -p1
+%patch21 -p1
+#%patch22 -p1
+
+%patch30 -p1
+%patch31 -p1
+#%patch32 -p1
+
 %patch100 -p1
 
 # stubdom sources
@@ -449,6 +468,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 1 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-2
+- backport bzip2+xz linux kernel compression support.
+- backport a few bugfixes.
+
 * Fri Aug 7 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-1
 - update to 3.4.1 release.
 



From nphilipp at fedoraproject.org  Tue Sep  1 11:38:51 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 11:38:51 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.16, 1.17 python-slip.spec, 1.19,
	1.20 sources, 1.18, 1.19
Message-ID: <20090901113851.D027A11C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18647

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 Aug 2009 10:22:26 -0000	1.16
+++ .cvsignore	1 Sep 2009 11:38:51 -0000	1.17
@@ -1 +1 @@
-python-slip-0.2.1.tar.bz2
+python-slip-0.2.2.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- python-slip.spec	25 Aug 2009 10:22:26 -0000	1.19
+++ python-slip.spec	1 Sep 2009 11:38:51 -0000	1.20
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.1
+Version:    0.2.2
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -17,11 +17,13 @@ BuildArch:  noarch
 BuildRequires:  python
 BuildRequires:  python-devel
 
+Requires: libselinux-python
+
 %description
 The Simple Library for Python packages contain miscellaneous code for
 convenience, extension and workaround purposes.
 
-This package provides the "slip" base module.
+This package provides the "slip" and the "slip.util" modules.
 
 %package dbus
 Summary:    Convenience functions for dbus services
@@ -90,6 +92,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> - 0.2.2-1
+- add slip.util.files
+
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.2.1-1
 - ship slip.gtk.tools
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	25 Aug 2009 10:22:26 -0000	1.18
+++ sources	1 Sep 2009 11:38:51 -0000	1.19
@@ -1 +1 @@
-1d453a89eb6da5193f66d5f61edf9ab7  python-slip-0.2.1.tar.bz2
+142be05f5cf38d6e2d09c31806763319  python-slip-0.2.2.tar.bz2



From mhlavink at fedoraproject.org  Tue Sep  1 11:46:11 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Sep 2009 11:46:11 +0000 (UTC)
Subject: rpms/pciutils/devel .cvsignore, 1.23, 1.24 pciutils.spec, 1.74,
	1.75 sources, 1.23, 1.24
Message-ID: <20090901114611.658DF11C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22513

Modified Files:
	.cvsignore pciutils.spec sources 
Log Message:
updated to 3.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	29 Jul 2009 12:25:49 -0000	1.23
+++ .cvsignore	1 Sep 2009 11:46:11 -0000	1.24
@@ -1 +1 @@
-pciutils-3.1.3.tar.gz
+pciutils-3.1.4.tar.gz


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- pciutils.spec	29 Jul 2009 12:25:49 -0000	1.74
+++ pciutils.spec	1 Sep 2009 11:46:11 -0000	1.75
@@ -1,5 +1,5 @@
 Name:		pciutils
-Version:	3.1.3
+Version:	3.1.4
 Release: 	1%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -114,6 +114,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
+- updated to 3.1.4
+
 * Wed Jul 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.3-1
 - updated to 3.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Jul 2009 12:25:49 -0000	1.23
+++ sources	1 Sep 2009 11:46:11 -0000	1.24
@@ -1 +1 @@
-965908d8d67222a9e1db24778c61bdf1  pciutils-3.1.3.tar.gz
+63567627e6a73b6c8c29d08d3f5e640c  pciutils-3.1.4.tar.gz



From kraxel at fedoraproject.org  Tue Sep  1 11:46:49 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue,  1 Sep 2009 11:46:49 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.245,1.246
Message-ID: <20090901114649.4C1CF11C00EF@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717

Modified Files:
	xen.spec 
Log Message:
up release


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- xen.spec	1 Sep 2009 11:35:37 -0000	1.245
+++ xen.spec	1 Sep 2009 11:46:49 -0000	1.246
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/



From nphilipp at fedoraproject.org  Tue Sep  1 11:52:53 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 11:52:53 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.103, 1.104 sources,
	1.113, 1.114 system-config-date.spec, 1.121, 1.122
Message-ID: <20090901115253.BECFB11C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.45


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	28 Aug 2009 14:18:37 -0000	1.103
+++ .cvsignore	1 Sep 2009 11:52:53 -0000	1.104
@@ -1 +1 @@
-system-config-date-1.9.44.tar.bz2
+system-config-date-1.9.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources	28 Aug 2009 14:18:37 -0000	1.113
+++ sources	1 Sep 2009 11:52:53 -0000	1.114
@@ -1 +1 @@
-5dc90b8ad41fc2b8b5184d4ad4425ba9  system-config-date-1.9.44.tar.bz2
+39c4892be0d82e62d512cff1582dc7ab  system-config-date-1.9.45.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- system-config-date.spec	28 Aug 2009 14:25:18 -0000	1.121
+++ system-config-date.spec	1 Sep 2009 11:52:53 -0000	1.122
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.44
+Version: 1.9.45
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -123,6 +123,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.45-1
+- initialize gettext correctly
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.44-1
 - don't unnecessarily initialize gettext
 



From mhlavink at fedoraproject.org  Tue Sep  1 11:53:46 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Sep 2009 11:53:46 +0000 (UTC)
Subject: rpms/pciutils/F-11 .cvsignore, 1.23, 1.24 pciutils.spec, 1.73,
	1.74 sources, 1.23, 1.24
Message-ID: <20090901115346.5BF1311C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24381

Modified Files:
	.cvsignore pciutils.spec sources 
Log Message:
updated to 3.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	29 Jul 2009 12:23:23 -0000	1.23
+++ .cvsignore	1 Sep 2009 11:53:46 -0000	1.24
@@ -1 +1 @@
-pciutils-3.1.3.tar.gz
+pciutils-3.1.4.tar.gz


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- pciutils.spec	29 Jul 2009 12:23:24 -0000	1.73
+++ pciutils.spec	1 Sep 2009 11:53:46 -0000	1.74
@@ -1,5 +1,5 @@
 Name:		pciutils
-Version:	3.1.3
+Version:	3.1.4
 Release: 	1%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -114,6 +114,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
+- updated to 3.1.4
+
 * Wed Jul 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.3-1
 - updated to 3.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Jul 2009 12:23:24 -0000	1.23
+++ sources	1 Sep 2009 11:53:46 -0000	1.24
@@ -1 +1 @@
-965908d8d67222a9e1db24778c61bdf1  pciutils-3.1.3.tar.gz
+63567627e6a73b6c8c29d08d3f5e640c  pciutils-3.1.4.tar.gz



From nphilipp at fedoraproject.org  Tue Sep  1 11:58:16 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 11:58:16 +0000 (UTC)
Subject: rpms/python-slip/devel sources,1.19,1.20
Message-ID: <20090901115816.4683A11C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25429

Modified Files:
	sources 
Log Message:
fix typo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Sep 2009 11:38:51 -0000	1.19
+++ sources	1 Sep 2009 11:58:16 -0000	1.20
@@ -1 +1 @@
-142be05f5cf38d6e2d09c31806763319  python-slip-0.2.2.tar.bz2
+de63375ab20409a798ef2287df59ef0f  python-slip-0.2.2.tar.bz2



From mhlavink at fedoraproject.org  Tue Sep  1 12:03:50 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Sep 2009 12:03:50 +0000 (UTC)
Subject: rpms/pciutils/F-11 pciutils.spec,1.74,1.75
Message-ID: <20090901120350.5B4C211C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28124

Modified Files:
	pciutils.spec 
Log Message:
add COPYING to docs



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- pciutils.spec	1 Sep 2009 11:53:46 -0000	1.74
+++ pciutils.spec	1 Sep 2009 12:03:50 -0000	1.75
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -98,7 +98,7 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 %defattr(0644, root, root, 0755)
 %{_mandir}/man8/*
 %attr(0755, root, root) /sbin/*
-%doc README ChangeLog pciutils.lsm
+%doc README ChangeLog pciutils.lsm COPYING
 
 %files libs
 %{_libdir}/libpci.so.*
@@ -114,6 +114,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-2
+- add COPYING to docs
+
 * Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
 - updated to 3.1.4
 



From mlichvar at fedoraproject.org  Tue Sep  1 12:05:19 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  1 Sep 2009 12:05:19 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.35, 1.36 sources, 1.35,
	1.36 xterm.spec, 1.76, 1.77
Message-ID: <20090901120519.10EC211C00EF@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28773

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 247



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	18 Aug 2009 11:35:58 -0000	1.35
+++ .cvsignore	1 Sep 2009 12:05:18 -0000	1.36
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-246.tgz
+xterm-247.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	18 Aug 2009 11:35:58 -0000	1.35
+++ sources	1 Sep 2009 12:05:18 -0000	1.36
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-b0c3aa021031742d6f5009833fc4d800  xterm-246.tgz
+ef73f7f1eb8c863c51f2bfac1f55efd1  xterm-247.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- xterm.spec	18 Aug 2009 11:35:58 -0000	1.76
+++ xterm.spec	1 Sep 2009 12:05:18 -0000	1.77
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 246
+Version: 247
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Sep 01 2009 Miroslav Lichvar <mlichvar at redhat.com> 247-1
+- update to 247
+
 * Tue Aug 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 246-1
 - update to 246
 



From twaugh at fedoraproject.org  Tue Sep  1 12:05:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  1 Sep 2009 12:05:56 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.72, 1.73 foomatic.spec, 1.223,
	1.224 sources, 1.74, 1.75
Message-ID: <20090901120556.E97FD11C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29133

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-1
- 4.0.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	2 Jul 2009 15:55:48 -0000	1.72
+++ .cvsignore	1 Sep 2009 12:05:56 -0000	1.73
@@ -77,3 +77,4 @@ foomatic-filters-4.0.2.tar.gz
 foomatic-db-engine-4.0.2.tar.gz
 foomatic-db-hpijs-20090701.tar.gz
 foomatic-db-4.0-20090702.tar.gz
+foomatic-db-engine-4.0.3.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- foomatic.spec	18 Aug 2009 08:49:24 -0000	1.223
+++ foomatic.spec	1 Sep 2009 12:05:56 -0000	1.224
@@ -1,11 +1,11 @@
-%define enginever 4.0.2
+%define enginever 4.0.3
 %define filtersver 4.0.2
 %define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    6%{?dist}
+Release:    1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -149,6 +149,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-1
+- 4.0.3.
+
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
 - Split out foomatic-db into separate source package (bug #461234).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	2 Jul 2009 15:55:48 -0000	1.74
+++ sources	1 Sep 2009 12:05:56 -0000	1.75
@@ -1,4 +1,4 @@
 9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
-8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
 2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
 df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
+fdb02175cc857f63bb06b25ac3b1658b  foomatic-db-engine-4.0.3.tar.gz



From than at fedoraproject.org  Tue Sep  1 12:06:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 12:06:42 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.320,1.321
Message-ID: <20090901120642.01E7B11C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29583

Modified Files:
	qt.spec 
Log Message:
- drop fedora < 9 support
- only apply ossl patch for fedora > 11




Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- qt.spec	31 Aug 2009 17:07:19 -0000	1.320
+++ qt.spec	1 Sep 2009 12:06:41 -0000	1.321
@@ -7,14 +7,10 @@
 %define _default_patch_fuzz 2
 
 Summary: Qt toolkit
-%if 0%{?fedora} > 8
 Name:    qt
 Epoch:   1
-%else
-Name:    qt4
-%endif
 Version: 4.5.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -22,12 +18,9 @@ Group: System Environment/Libraries
 Url: http://www.qtsoftware.com/
 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
 %{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
-%endif
 
 Source4: Trolltech.conf
 
@@ -107,15 +100,8 @@ Source31: hi48-app-qt4-logo.png
 %define phonon_release 100
 %define webkit -webkit
 %define gtkstyle -gtkstyle
-
 %define nas -no-nas-sound
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-# link dbus
 %define dbus -dbus-linked
-# dlopen dbus
-#define dbus -dbus
-BuildRequires: dbus-devel >= 0.62
-%endif
 
 # See http://bugzilla.redhat.com/196901
 %define _qt4 %{name}
@@ -133,10 +119,9 @@ BuildRequires: dbus-devel >= 0.62
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
-%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
-%endif
 
+BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: findutils
@@ -156,9 +141,7 @@ BuildRequires: pkgconfig
 #define x_deps libGL-devel libGLU-devel
 ## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
 %define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
-%endif
 BuildRequires: %{x_deps}
 
 %if "%{?nas}" != "-no-nas-sound"
@@ -199,10 +182,8 @@ Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
 Obsoletes: qt4-sqlite < 4.5.0 
 Provides: qt4-sqlite = %{version}-%{release}
-%if "%{name}" == "qt"
 Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
 Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -234,15 +215,10 @@ Summary: API documentation for %{name}
 Group: Documentation
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-assistant
-%if "%{name}" != "qt4"
 Obsoletes: qt4-doc < %{version}-%{release}
 Provides:  qt4-doc = %{version}-%{release}
-%endif
-%if 0%{?fedora} > 9
-# help workaround yum bug http://bugzilla.redhat.com/502401
 Obsoletes: qt-doc < 1:4.5.1-4
 BuildArch: noarch
-%endif
 %description doc
 %{summary}.  Includes:
 Qt Assistant
@@ -267,14 +243,11 @@ Provides:  WebKit-qt-devel = 1.0.0-1
 %endif
 Obsoletes: qt4-designer < %{version}-%{release}
 Provides:  qt4-designer = %{version}-%{release}
-# as long as libQtUiTools.a is included
 Provides:  %{name}-static = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
 %{?_isa:Provides: qt4-devel%{?_isa} = %{version}-%{release}}
 Provides:  qt4-static = %{version}-%{release}
-%endif
 
 %description devel
 This package contains the files necessary to develop
@@ -298,10 +271,8 @@ Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-MySQL < %{version}-%{release}
 Provides:  qt4-MySQL = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-mysql < %{version}-%{release}
 Provides:  qt4-mysql = %{version}-%{release}
-%endif
 
 %description mysql 
 %{summary}.
@@ -313,10 +284,8 @@ Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-ODBC < %{version}-%{release}
 Provides:  qt4-ODBC = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-odbc < %{version}-%{release}
 Provides:  qt4-odbc = %{version}-%{release}
-%endif
 
 %description odbc 
 %{summary}.
@@ -328,10 +297,8 @@ Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-PostgreSQL < %{version}-%{release}
 Provides:  qt4-PostgreSQL = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-postgresql < %{version}-%{release}
 Provides:  qt4-postgresql = %{version}-%{release}
-%endif
 
 %description postgresql 
 %{summary}.
@@ -352,14 +319,10 @@ Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
 Provides: qt4-assistant = %{version}-%{release}
-%if "%{name}" != "qt4"
 Provides: %{name}-assistant = %{version}-%{release}
-%endif
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-x11 < %{version}-%{release}
 Provides:  qt4-x11 = %{version}-%{release}
-%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -388,7 +351,9 @@ Qt libraries used for drawing widgets an
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
+%if 0%{?fedora} > 11
 %patch56 -p1 -b .ossl10
+%endif
 
 # security fixes
 %patch100 -p1 -b .CVE-2009-1725
@@ -920,6 +885,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 4.5.2-14
+- drop fedora < 9 support
+- only apply ossl patch for fedora > 11
+
 * Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-13
 - fix for CVE-2009-2700
 



From twaugh at fedoraproject.org  Tue Sep  1 12:06:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  1 Sep 2009 12:06:44 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.224,1.225 sources,1.75,1.76
Message-ID: <20090901120644.7D8F911C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29515

Modified Files:
	foomatic.spec sources 
Log Message:
No longer use foomatic-db-hpijs.


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- foomatic.spec	1 Sep 2009 12:05:56 -0000	1.224
+++ foomatic.spec	1 Sep 2009 12:06:44 -0000	1.225
@@ -1,6 +1,5 @@
 %define enginever 4.0.3
 %define filtersver 4.0.2
-%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	1 Sep 2009 12:05:56 -0000	1.75
+++ sources	1 Sep 2009 12:06:44 -0000	1.76
@@ -1,4 +1,3 @@
 9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
-2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
 df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
 fdb02175cc857f63bb06b25ac3b1658b  foomatic-db-engine-4.0.3.tar.gz



From akurtakov at fedoraproject.org  Tue Sep  1 12:09:05 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 12:09:05 +0000 (UTC)
Subject: rpms/eclipse-rpm-editor/devel fetch-specfile-editor.sh, 1.3,
	1.4 eclipse-rpm-editor.spec, 1.28, 1.29 .cvsignore, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <20090901120905.CFA6511C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30418/devel

Modified Files:
	fetch-specfile-editor.sh eclipse-rpm-editor.spec .cvsignore 
	sources 
Log Message:
Update to Linux Tools 0.3 release.


Index: fetch-specfile-editor.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/fetch-specfile-editor.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fetch-specfile-editor.sh	14 May 2009 11:33:18 -0000	1.3
+++ fetch-specfile-editor.sh	1 Sep 2009 12:09:05 -0000	1.4
@@ -18,17 +18,7 @@ fi
 # cleanup dir
 rm -fr $tar_name
 # prepare archive
-mkdir $tar_name
-pushd $tar_name &> /dev/null
-for bundle in \
-"org.eclipse.linuxtools.rpm.ui.editor" \
-"org.eclipse.linuxtools.rpm.rpmlint" \
-"org.eclipse.linuxtools.rpm.ui.editor.doc" \
-"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
-do 
-svn export $svn_repo/$tag/$bundle 
-done
-popd &> /dev/null
+svn export $svn_repo/$tag $tar_name
 # create archive
 tar -cjf $tar_name.tar.bz2 $tar_name
 


Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- eclipse-rpm-editor.spec	24 Jul 2009 20:57:11 -0000	1.28
+++ eclipse-rpm-editor.spec	1 Sep 2009 12:09:05 -0000	1.29
@@ -1,9 +1,10 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
+%define qualifier           200908180856
 
 Name:           eclipse-rpm-editor
-Version:        0.4.2
-Release:        4%{?dist}
+Version:        0.4.3
+Release:        1%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -17,12 +18,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: java-devel >= 1.5.0
 BuildRequires: eclipse-pde >= 1:3.3.0
 BuildRequires: eclipse-changelog >= 2.5.1
-Requires: eclipse-platform >= 3.3.1 
+Requires: eclipse-platform >= 3.3.1
 Requires: eclipse-changelog >= 2.5.1
 Requires: rpmlint >= 0.81
-Requires: rpmdevtools 
+Requires: rpmdevtools
 
-# These plugins are really noarch but the changelog plugin need cdt which 
+# These plugins are really noarch but the changelog plugin need cdt which
 # we only build on these architectures.
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %define debug_package %{nil}
@@ -35,8 +36,10 @@ useful for maintenance of RPM specfiles 
 %setup -q -n specfile-editor-fetched-src-%{version}
 
 %build
-%{eclipse_base}/buildscripts/pdebuild -f  org.eclipse.linuxtools.rpm.ui.editor \
- -d changelog ;
+%{eclipse_base}/buildscripts/pdebuild -a "-DforceContextQualifier=%{qualifier} -DjavacSource=1.5 -DjavacTarget=1.5" \
+ -f  org.eclipse.linuxtools.rpm.ui.editor -d changelog ;
+%{eclipse_base}/buildscripts/pdebuild -a "-DforceContextQualifier=%{qualifier} -DjavacSource=1.5 -DjavacTarget=1.5" \
+ -f  org.eclipse.linuxtools.rpm
 
 %install
 rm -rf %{buildroot}
@@ -44,6 +47,8 @@ installDir=%{buildroot}%{install_loc}/rp
 install -d -m 755 $installDir
 unzip -q -d $installDir \
  build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip
+unzip -q -d $installDir \
+ build/rpmBuild/org.eclipse.linuxtools.rpm.zip
 
 %clean
 rm -rf %{buildroot}
@@ -54,6 +59,9 @@ rm -rf %{buildroot}
 %{install_loc}/rpm-editor
 
 %changelog
+* Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.3-1
+- Update to Linux Tools 0.3 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -107,15 +115,15 @@ rm -rf %{buildroot}
 - Add Sources completion (Contributed by Alexander Kurtakov)
 
 * Sat Dec 15 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.2.1-1
-- RFE eclipse spec editor should allow users to configure the 
+- RFE eclipse spec editor should allow users to configure the
   format of the changelog entry (#421881)
 
 * Wed Nov 28 2007 fons <fons at xp2000.leafamily.org> 0.2.0-2
-- Add support for URPM tool and cancel support to RpmPackageBuildProposalsJob. 
+- Add support for URPM tool and cancel support to RpmPackageBuildProposalsJob.
 - Fix Bug #207207
-	
+
 * Sun Oct 14 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-10
-- Just tag the sources correctly. 
+- Just tag the sources correctly.
 
 * Sun Oct 14 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-9
 - Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=206160
@@ -137,7 +145,7 @@ rm -rf %{buildroot}
   of dependencies on the cdt plugin.
 
 * Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
-- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 
+- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported.
 
 * Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
 - Fix the description tag (see comment 9 of #253434for more details).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	14 May 2009 11:33:19 -0000	1.15
+++ .cvsignore	1 Sep 2009 12:09:05 -0000	1.16
@@ -2,3 +2,4 @@ specfile-editor-fetched-src-18653.tar.bz
 specfile-editor-fetched-src-0.4.1.tar.bz2
 specfile-editor-fetched-src-0.4.2.tar.bz2
 eclipse-rpm-editor-0.4.2-3.fc12.src.rpm
+specfile-editor-fetched-src-0.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	14 May 2009 11:33:19 -0000	1.15
+++ sources	1 Sep 2009 12:09:05 -0000	1.16
@@ -1 +1 @@
-4962d03414aa48f2b494ed12b7a26032  specfile-editor-fetched-src-0.4.2.tar.bz2
+161b0d30f217b54d8dc737862ff7477b  specfile-editor-fetched-src-0.4.3.tar.bz2



From mhlavink at fedoraproject.org  Tue Sep  1 12:09:49 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Sep 2009 12:09:49 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils.spec,1.75,1.76
Message-ID: <20090901120949.3FB3011C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30779

Modified Files:
	pciutils.spec 
Log Message:
add COPYING to docs



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pciutils.spec	1 Sep 2009 11:46:11 -0000	1.75
+++ pciutils.spec	1 Sep 2009 12:09:49 -0000	1.76
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -98,7 +98,7 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 %defattr(0644, root, root, 0755)
 %{_mandir}/man8/*
 %attr(0755, root, root) /sbin/*
-%doc README ChangeLog pciutils.lsm
+%doc README ChangeLog pciutils.lsm COPYING
 
 %files libs
 %{_libdir}/libpci.so.*
@@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
+- add COPYING to docs
+
+* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
 - updated to 3.1.4
 
 * Wed Jul 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.3-1



From rdieter at fedoraproject.org  Tue Sep  1 12:11:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 01 Sep 2009 07:11:05 -0500
Subject: rpms/qt/devel qt.spec,1.320,1.321
In-Reply-To: <20090901120642.01E7B11C00EF@cvs1.fedora.phx.redhat.com>
References: <20090901120642.01E7B11C00EF@cvs1.fedora.phx.redhat.com>
Message-ID: <4A9D0F59.4080708@fedoraproject.org>

On 09/01/2009 07:06 AM, Than Ngo wrote:
> Author: than
>
> Update of /cvs/extras/rpms/qt/devel
> In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29583
>
> Modified Files:
> 	qt.spec
> Log Message:
> - drop fedora<  9 support

I'd much prefer to keep this buildable on rhel5 (if you don't mind).

-- Rex



From twaugh at fedoraproject.org  Tue Sep  1 12:14:37 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  1 Sep 2009 12:14:37 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.73, 1.74 foomatic.spec, 1.225,
	1.226 sources, 1.76, 1.77
Message-ID: <20090901121437.2E80C11C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32590

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
Don't forget foomatic-filters.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	1 Sep 2009 12:05:56 -0000	1.73
+++ .cvsignore	1 Sep 2009 12:14:36 -0000	1.74
@@ -78,3 +78,4 @@ foomatic-db-engine-4.0.2.tar.gz
 foomatic-db-hpijs-20090701.tar.gz
 foomatic-db-4.0-20090702.tar.gz
 foomatic-db-engine-4.0.3.tar.gz
+foomatic-filters-4.0.3.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- foomatic.spec	1 Sep 2009 12:06:44 -0000	1.225
+++ foomatic.spec	1 Sep 2009 12:14:36 -0000	1.226
@@ -1,5 +1,5 @@
 %define enginever 4.0.3
-%define filtersver 4.0.2
+%define filtersver 4.0.3
 
 Summary: Database of printers and printer drivers
 Name:		foomatic


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	1 Sep 2009 12:06:44 -0000	1.76
+++ sources	1 Sep 2009 12:14:36 -0000	1.77
@@ -1,3 +1,3 @@
-9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
 df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
 fdb02175cc857f63bb06b25ac3b1658b  foomatic-db-engine-4.0.3.tar.gz
+f2fb7c48cc6b1af6f76dd0529d6dbd98  foomatic-filters-4.0.3.tar.gz



From kkofler at fedoraproject.org  Tue Sep  1 12:15:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  1 Sep 2009 12:15:15 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.321,1.322
Message-ID: <20090901121515.2441611C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv467/devel

Modified Files:
	qt.spec 
Log Message:
Restore comments. (They still apply.)


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- qt.spec	1 Sep 2009 12:06:41 -0000	1.321
+++ qt.spec	1 Sep 2009 12:15:14 -0000	1.322
@@ -217,6 +217,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 Requires: %{name}-assistant
 Obsoletes: qt4-doc < %{version}-%{release}
 Provides:  qt4-doc = %{version}-%{release}
+# help workaround yum bug http://bugzilla.redhat.com/502401
 Obsoletes: qt-doc < 1:4.5.1-4
 BuildArch: noarch
 %description doc
@@ -243,6 +244,7 @@ Provides:  WebKit-qt-devel = 1.0.0-1
 %endif
 Obsoletes: qt4-designer < %{version}-%{release}
 Provides:  qt4-designer = %{version}-%{release}
+# as long as libQtUiTools.a is included
 Provides:  %{name}-static = %{version}-%{release}
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}



From akurtakov at fedoraproject.org  Tue Sep  1 12:15:46 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 12:15:46 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby/devel eclipse-rpmstubby.spec, 1.5,
	1.6 eclipse-rpmstubby-fetch-src.sh, 1.3, 1.4 .cvsignore, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090901121546.DBE5911C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpmstubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv675/devel

Modified Files:
	eclipse-rpmstubby.spec eclipse-rpmstubby-fetch-src.sh 
	.cvsignore sources 
Log Message:
Update to Linux Tools 0.3 release.


Index: eclipse-rpmstubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/eclipse-rpmstubby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-rpmstubby.spec	24 Jul 2009 20:57:32 -0000	1.5
+++ eclipse-rpmstubby.spec	1 Sep 2009 12:15:46 -0000	1.6
@@ -1,9 +1,10 @@
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_datadir}/eclipse/dropins/rpmstubby
+%define qualifier      200908180856
 
 Name:           eclipse-rpmstubby
-Version:        0.1.1
-Release:        4%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Rpm specfile generator for Eclipse features
 
 Group:          Development/Tools
@@ -28,14 +29,15 @@ feature.xml.
 cp org.eclipse.linuxtools.rpmstubby-feature/ChangeLog org.eclipse.linuxtools.rpmstubby-feature/ChangeLog.feature
 
 %build
-%{eclipse_base}/buildscripts/pdebuild 
+%{eclipse_base}/buildscripts/pdebuild \
+ -a "-DforceContextQualifier=%{qualifier} -DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 %{__rm} -rf %{buildroot}
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
-     build/rpmBuild/org.eclipse.linuxtools.rpmstubby.zip 
+     build/rpmBuild/org.eclipse.linuxtools.rpmstubby.zip
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -49,6 +51,9 @@ install -d -m 755 %{buildroot}%{install_
 %doc org.eclipse.linuxtools.rpmstubby/ChangeLog
 
 %changelog
+* Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 0.3.0-1
+- Update to Linux Tools 0.3 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: eclipse-rpmstubby-fetch-src.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/eclipse-rpmstubby-fetch-src.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-rpmstubby-fetch-src.sh	14 May 2009 10:56:28 -0000	1.3
+++ eclipse-rpmstubby-fetch-src.sh	1 Sep 2009 12:15:46 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/sh
 usage='usage: $0 <tag>'
 name=eclipse-rpmstubby
-tag=LinuxTools_0_2_0
-tar_name=$name-fetched-src-0.1.1
+tag=LinuxTools_0_3_0
+tar_name=$name-fetched-src-0.3.0
 
 # example of fetch command:
 # fetch_cmd=cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/dsdp \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Feb 2009 12:48:48 -0000	1.3
+++ .cvsignore	1 Sep 2009 12:15:46 -0000	1.4
@@ -1,2 +1,3 @@
 eclipse-rpmstubby-fetched-src-0.1.0.tar.bz2
 eclipse-rpmstubby-fetched-src-0.1.1.tar.bz2
+eclipse-rpmstubby-fetched-src-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 May 2009 10:56:28 -0000	1.4
+++ sources	1 Sep 2009 12:15:46 -0000	1.5
@@ -1 +1 @@
-56bc9a2fd878abcc42f09608632317f5  eclipse-rpmstubby-fetched-src-0.1.1.tar.bz2
+84d2553064e552084a4965240dfa7254  eclipse-rpmstubby-fetched-src-0.3.0.tar.bz2



From twaugh at fedoraproject.org  Tue Sep  1 12:17:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  1 Sep 2009 12:17:05 +0000 (UTC)
Subject: rpms/foomatic/F-11 .cvsignore, 1.73, 1.74 foomatic.spec, 1.223,
	1.224 sources, 1.76, 1.77
Message-ID: <20090901121705.D4A7B11C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1099

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-1
- 4.0.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	21 Aug 2009 10:15:18 -0000	1.73
+++ .cvsignore	1 Sep 2009 12:17:05 -0000	1.74
@@ -78,3 +78,5 @@ foomatic-db-engine-4.0.2.tar.gz
 foomatic-db-hpijs-20090701.tar.gz
 foomatic-db-4.0-20090702.tar.gz
 foomatic-db-4.0-20090819.tar.gz
+foomatic-db-engine-4.0.3.tar.gz
+foomatic-filters-4.0.3.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- foomatic.spec	24 Aug 2009 14:09:57 -0000	1.223
+++ foomatic.spec	1 Sep 2009 12:17:05 -0000	1.224
@@ -1,13 +1,13 @@
 %define dbver_rel 4.0
 %define dbver_snap 20090819
-%define enginever 4.0.2
-%define filtersver 4.0.2
+%define enginever 4.0.3
+%define filtersver 4.0.3
 %define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    7%{?dist}
+Release:    1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -245,6 +245,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-1
+- 4.0.3.
+
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-7
 - Restored db-hpijs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	24 Aug 2009 14:09:57 -0000	1.76
+++ sources	1 Sep 2009 12:17:05 -0000	1.77
@@ -1,4 +1,4 @@
-9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
-8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
 2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
 b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz
+fdb02175cc857f63bb06b25ac3b1658b  foomatic-db-engine-4.0.3.tar.gz
+f2fb7c48cc6b1af6f76dd0529d6dbd98  foomatic-filters-4.0.3.tar.gz



From ltinkl at fedoraproject.org  Tue Sep  1 12:20:21 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:20:21 +0000 (UTC)
Subject: rpms/akonadi/devel .cvsignore, 1.14, 1.15 akonadi.spec, 1.46,
	1.47 sources, 1.15, 1.16
Message-ID: <20090901122021.983BB11C0495@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2026

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
Akonadi 1.2.1 (for KDE 4.3.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Jul 2009 17:46:54 -0000	1.14
+++ .cvsignore	1 Sep 2009 12:20:21 -0000	1.15
@@ -1 +1 @@
-akonadi-1.2.0.tar.bz2
+akonadi-1.2.1.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/extras/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- akonadi.spec	29 Aug 2009 11:31:10 -0000	1.46
+++ akonadi.spec	1 Sep 2009 12:20:21 -0000	1.47
@@ -1,8 +1,8 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.2.0
-Release: 2%{?dist}.2
+Version: 1.2.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -119,6 +119,9 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.1-1
+- Akonadi 1.2.1
+
 * Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.2
 - temporarily drop mysql-related bits, to workaround broken rawhide deps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akonadi/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	30 Jul 2009 17:46:54 -0000	1.15
+++ sources	1 Sep 2009 12:20:21 -0000	1.16
@@ -1 +1 @@
-4b04ab0b4670e1133307f7b82af46ce1  akonadi-1.2.0.tar.bz2
+f9c1d000844f31c67360078ddf60bec2  akonadi-1.2.1.tar.bz2



From uwog at fedoraproject.org  Tue Sep  1 12:21:10 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Tue,  1 Sep 2009 12:21:10 +0000 (UTC)
Subject: rpms/abiword/devel abiword.spec,1.95,1.96
Message-ID: <20090901122110.045FF11C00EF@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2238

Modified Files:
	abiword.spec 
Log Message:
Make sure the Sugar AbiCollab backend is compiled in




Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- abiword.spec	29 Aug 2009 10:27:35 -0000	1.95
+++ abiword.spec	1 Sep 2009 12:21:09 -0000	1.96
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -43,9 +43,8 @@ BuildRequires: fribidi-devel, enchant-de
 BuildRequires: zlib-devel, popt-devel, libpng-devel
 BuildRequires: gtk2-devel, libgsf-devel
 BuildRequires: boost-devel, t1lib-devel
-%if %{olpc_build}
 BuildRequires: dbus-glib-devel >= 0.70
-%else
+%if !%{olpc_build}
 Requires: link-grammar >= 4.2.2
 BuildRequires: readline-devel
 BuildRequires: bzip2-devel
@@ -179,6 +178,11 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Tue Sep 01 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.10-2
+- Unconditionally add the dbus-glib-devel BR since the AbiCollab
+  Sugar backend is now always compiled in, even on non-OLPC
+  platforms.
+
 * Sat Aug 29 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.10-1
 - New upstream release
 



From than at fedoraproject.org  Tue Sep  1 12:21:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 12:21:49 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.509,1.510
Message-ID: <20090901122149.A7D1911C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2270

Modified Files:
	kdelibs.spec 
Log Message:
- workaround for glibc on x86_64 (rawhide), it causes build failure,
  will be removed when it's fixed in glibc




Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- kdelibs.spec	28 Aug 2009 20:59:30 -0000	1.509
+++ kdelibs.spec	1 Sep 2009 12:21:49 -0000	1.510
@@ -201,15 +201,9 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
-%else
-# shouldn't be needed f9+, we'll see -- Rex
-%patch6 -p1 -b .openssl
-%endif
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -222,6 +216,14 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 %build
 
+# add release version
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+
+# workaround for glibc on x86_64 (rawhide)
+%ifarch x86_64
+sed -i -e "s|-std=iso9899:1990||" cmake/modules/FindKDE4Internal.cmake
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..



From kkofler at fedoraproject.org  Tue Sep  1 12:21:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  1 Sep 2009 12:21:55 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.322,1.323
Message-ID: <20090901122155.078F711C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2561/devel

Modified Files:
	qt.spec 
Log Message:
rm redundant %define.


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- qt.spec	1 Sep 2009 12:15:14 -0000	1.322
+++ qt.spec	1 Sep 2009 12:21:54 -0000	1.323
@@ -140,7 +140,6 @@ BuildRequires: pkgconfig
 ## In theory, should be as simple as:
 #define x_deps libGL-devel libGLU-devel
 ## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
-%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 BuildRequires: %{x_deps}
 



From ltinkl at fedoraproject.org  Tue Sep  1 12:32:33 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:32:33 +0000 (UTC)
Subject: rpms/akonadi/F-10 .cvsignore, 1.8, 1.9 akonadi.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <20090901123233.9CD5D11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/akonadi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4756/F-10

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
Akonadi 1.2.1 (plus the MySQL bits)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 Jul 2009 17:46:54 -0000	1.8
+++ .cvsignore	1 Sep 2009 12:32:33 -0000	1.9
@@ -1 +1 @@
-akonadi-1.2.0.tar.bz2
+akonadi-1.2.1.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-10/akonadi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- akonadi.spec	30 Jul 2009 17:46:54 -0000	1.21
+++ akonadi.spec	1 Sep 2009 12:32:33 -0000	1.22
@@ -1,7 +1,7 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -119,6 +119,15 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.1-1
+- Akonadi 1.2.1
+
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.2
+- temporarily drop mysql-related bits, to workaround broken rawhide deps
+
+* Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 1.2.0-2
+- bump and rebuild, as s390x picked up an old boost library
+
 * Thu Jul 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.0-1
 - Akonadi 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 Jul 2009 17:46:54 -0000	1.8
+++ sources	1 Sep 2009 12:32:33 -0000	1.9
@@ -1 +1 @@
-4b04ab0b4670e1133307f7b82af46ce1  akonadi-1.2.0.tar.bz2
+f9c1d000844f31c67360078ddf60bec2  akonadi-1.2.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:32:33 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:32:33 +0000 (UTC)
Subject: rpms/akonadi/F-11 .cvsignore, 1.11, 1.12 akonadi.spec, 1.33,
	1.34 sources, 1.11, 1.12
Message-ID: <20090901123233.D1C9E11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/akonadi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4756/F-11

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
Akonadi 1.2.1 (plus the MySQL bits)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	30 Jul 2009 17:46:54 -0000	1.11
+++ .cvsignore	1 Sep 2009 12:32:33 -0000	1.12
@@ -1 +1 @@
-akonadi-1.2.0.tar.bz2
+akonadi-1.2.1.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-11/akonadi.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- akonadi.spec	30 Jul 2009 17:46:54 -0000	1.33
+++ akonadi.spec	1 Sep 2009 12:32:33 -0000	1.34
@@ -1,7 +1,7 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -119,6 +119,15 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.1-1
+- Akonadi 1.2.1
+
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.2
+- temporarily drop mysql-related bits, to workaround broken rawhide deps
+
+* Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 1.2.0-2
+- bump and rebuild, as s390x picked up an old boost library
+
 * Thu Jul 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.0-1
 - Akonadi 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Jul 2009 17:46:54 -0000	1.11
+++ sources	1 Sep 2009 12:32:33 -0000	1.12
@@ -1 +1 @@
-4b04ab0b4670e1133307f7b82af46ce1  akonadi-1.2.0.tar.bz2
+f9c1d000844f31c67360078ddf60bec2  akonadi-1.2.1.tar.bz2



From akurtakov at fedoraproject.org  Tue Sep  1 12:32:48 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  1 Sep 2009 12:32:48 +0000 (UTC)
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec, 1.77,
	1.78 sources, 1.31, 1.32 .cvsignore, 1.21,
	1.22 fetch-changelog.sh, 1.4, 1.5
Message-ID: <20090901123248.3413311C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-changelog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4948/devel

Modified Files:
	eclipse-changelog.spec sources .cvsignore fetch-changelog.sh 
Log Message:
Update to Linux Tools 0.3 release.


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- eclipse-changelog.spec	24 Jul 2009 20:51:40 -0000	1.77
+++ eclipse-changelog.spec	1 Sep 2009 12:32:47 -0000	1.78
@@ -1,13 +1,14 @@
-Epoch: 1
-
+%define qualifier      200908180856
 %define eclipse_base    %{_libdir}/eclipse
 
+Epoch: 1
+
 Name:           eclipse-changelog
 Version:        2.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
-Group:          Development/Tools 
+Group:          Development/Tools
 License:        EPL
 URL:            http://sources.redhat.com/eclipse
 
@@ -18,7 +19,7 @@ Provides:       eclipse-changelog-cdt = 
 Provides:       eclipse-changelog-jdt = %{epoch}:%{version}-%{release}
 
 ## sh fetch-mylyn.sh
-Source0:        http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
+Source0:        %{name}-src-%{version}.tar.bz2
 Source1:		fetch-changelog.sh
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +28,7 @@ BuildRequires:          eclipse-pde >= 1
 BuildRequires:          eclipse-cdt >= 1:4.0.0
 BuildRequires:          java-devel >= 1.4.2
 
-# These plugins are really noarch but they need cdt which 
+# These plugins are really noarch but they need cdt which
 # we only build on these architectures.
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %define debug_package %{nil}
@@ -47,7 +48,7 @@ popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -d cdt \
--a "-DjavacSource=1.5 -DjavacTarget=1.5" \
+-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
  -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
 
 
@@ -67,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{eclipse_base}/dropins/changelog
 
 %changelog
+* Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 1:2.6.7-3
+- Update to Linux Tools 0.3 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -155,11 +159,11 @@ rm -rf $RPM_BUILD_ROOT
 - Use copy-platform in %%{_libdir}.
 
 * Fri Oct 13 2006 Kyu Lee <klee at redhat.com> 2.3.3-1
-- Imported new version 2.3.3 with enhanced prepare 
+- Imported new version 2.3.3 with enhanced prepare
 changelog feature and bug fixes.
 
 * Fri Sep 29 2006 Kyu Lee <klee at redhat.com> 2.3.2-1
-- Imported fix for prepare changelog feature that did 
+- Imported fix for prepare changelog feature that did
   not work with Eclipse 3.2.1.
 - Also removed un-needed remove-pydev patch.
 
@@ -168,7 +172,7 @@ changelog feature and bug fixes.
 
 * Mon Sep 18 2006 Kyu Lee <klee at redhat.com> 2.3.1-1
 - Move from releng style build to 'package build' builds.
-- Import 2.3.1 - has improved error handling. 
+- Import 2.3.1 - has improved error handling.
 
 * Thu Sep 14 2006 Kyu Lee <klee at redhat.com> 2.3.0-1
 - Import version 2.3.0 that fixes keybinding issue and version
@@ -194,7 +198,7 @@ changelog feature and bug fixes.
 * Tue Aug 01 2006 Kyu Lee <klee at redhat.com> 2.2.2-1
 - Import version 2.2.2 that fixed the bug which was causing prepare-changelog
   menu button to not appear on 3.2.
- 
+
 * Tue Jul 25 2006 Kyu Lee <klee at redhat.com> 2.2.1-1
 - Import version 2.2.1 that has prepare-changelog functionality for 3.2.
 
@@ -278,7 +282,7 @@ changelog feature and bug fixes.
 
 * Wed Mar 2 2005 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-9..10
 - Added overholt at redhat.com patch to make 64 bit lib safe
-- Changed license to EPL 
+- Changed license to EPL
 - Fixed GCC4 -> GCC
 
 * Tue Mar 1 2005 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-8
@@ -295,7 +299,7 @@ changelog feature and bug fixes.
 - Touch pde.build.script to point to correct place
 
 * Mon Feb 21 2005 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-4
-- Rewrite SPEC for native build. First attempt 
+- Rewrite SPEC for native build. First attempt
 
 * Wed Nov 10 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-3
 - Bugzilla 138545 and 138543


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	15 Apr 2009 23:03:38 -0000	1.31
+++ sources	1 Sep 2009 12:32:48 -0000	1.32
@@ -1 +1 @@
-bb217bc0ac7eb6e3114b2c9228d95c7c  eclipse-changelog-src-2.6.7.zip
+06c4f7b95a12b5e9f927fba838a46df7  eclipse-changelog-src-2.6.7.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	15 Apr 2009 23:03:37 -0000	1.21
+++ .cvsignore	1 Sep 2009 12:32:48 -0000	1.22
@@ -7,3 +7,4 @@ eclipse-changelog-src-2.6.4.zip
 eclipse-changelog-src-2.6.5.zip
 eclipse-changelog-src-2.6.6.zip
 eclipse-changelog-src-2.6.7.zip
+eclipse-changelog-src-2.6.7.tar.bz2


Index: fetch-changelog.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/fetch-changelog.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fetch-changelog.sh	15 Apr 2009 23:03:38 -0000	1.4
+++ fetch-changelog.sh	1 Sep 2009 12:32:48 -0000	1.5
@@ -9,7 +9,7 @@ for f in \
  org.eclipse.linuxtools.changelog.javaparser \
  org.eclipse.linuxtools.changelog-feature \
  ;
- do 
-  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_7/$f
+ do
+  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/B0_3_0/$f
  done
-zip -r eclipse-changelog-src-2.6.7.zip *
+tar -cjf eclipse-changelog-src-2.6.7.tar.bz2 *



From mdomsch at fedoraproject.org  Tue Sep  1 12:38:29 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 12:38:29 +0000 (UTC)
Subject: rpms/python-GeoIP/devel python-GeoIP-1.2.4-ipv6.patch, NONE,
	1.1 python-GeoIP.spec, 1.15, 1.16
Message-ID: <20090901123829.4492A11C00EF@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7030

Modified Files:
	python-GeoIP.spec 
Added Files:
	python-GeoIP-1.2.4-ipv6.patch 
Log Message:
add IPv6 functions from CVS HEAD, do prerelease

python-GeoIP-1.2.4-ipv6.patch:
 ChangeLog  |    7 ++++++-
 py_GeoIP.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 test.py    |    2 +-
 test_v6.py |   13 +++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)

--- NEW FILE python-GeoIP-1.2.4-ipv6.patch ---
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/ChangeLog python/ChangeLog
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/ChangeLog	2008-12-16 07:22:45.000000000 -0600
+++ python/ChangeLog	2009-08-30 21:21:59.000000000 -0500
@@ -1,5 +1,10 @@
+	* Add IPv6 glue *** needs libGeoIP 1.4.7 ***
+		country_code_by_name_v6	
+		country_name_by_name_v6
+		country_code_by_addr_v6
+		country_name_by_addr_v6 ( Boris Zentner )
 1.2.4	2008-12-16
-	* Add charset and set_charset methods , as well as 
+	* Add charset and set_charset methods, as well as 
 		the new attributes GeoIP.GEOIP_CHARSET_ISO_8859_1 and
 		GeoIP.GEOIP_CHARSET_UTF8 ( Boris Zentner )
 	* Add test_city_charset.py script showing howto use
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/py_GeoIP.c python/py_GeoIP.c
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/py_GeoIP.c	2009-08-30 14:05:06.000000000 -0500
+++ python/py_GeoIP.c	2009-08-30 21:21:59.000000000 -0500
@@ -83,6 +83,50 @@ GeoIP_GeoIP_dealloc(PyObject* self)
   PyObject_Del(self);
 }
 
+static PyObject * GeoIP_country_code_by_name_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_code_by_name_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
+static PyObject * GeoIP_country_name_by_name_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_name_by_name_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
+static PyObject * GeoIP_country_code_by_addr_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_code_by_addr_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
+static PyObject * GeoIP_country_name_by_addr_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_name_by_addr_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
 static PyObject * GeoIP_country_code_by_name_Py(PyObject *self, PyObject *args) {
   char * name;
   const char * retval;
@@ -343,6 +387,10 @@ static PyMethodDef GeoIP_Object_methods[
   {"charset", GeoIP_charset_Py, 1, "Return the current charset ( either GEOIP_CHARSET_ISO_8859_1 or GEOIP_CHARSET_UTF8 )"},
   {"set_charset", GeoIP_set_charset_Py, 1, "Set the charset for city records"},
   {"last_netmask", GeoIP_last_netmask_Py, 1, "return the netmask depth of the last lookup"},
+  {"country_code_by_name_v6", GeoIP_country_code_by_name_v6_Py, 1, "Lookup IPv6 Country Code By Name"},
+  {"country_name_by_name_v6", GeoIP_country_name_by_name_v6_Py, 1, "Lookup IPv6 Country Name By Name"},
+  {"country_code_by_addr_v6", GeoIP_country_code_by_addr_v6_Py, 1, "Lookup IPv6 Country Code By IP Address"},
+  {"country_name_by_addr_v6", GeoIP_country_name_by_addr_v6_Py, 1, "Lookup IPv6 Country Name By IP Address"},
   {NULL, NULL, 0, NULL}
 };
 
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test.py python/test.py
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test.py	2008-12-16 07:22:45.000000000 -0600
+++ python/test.py	2009-08-30 21:21:59.000000000 -0500
@@ -4,7 +4,7 @@ import GeoIP
 
 #gi = GeoIP.new(GeoIP.GEOIP_STANDARD)
 gi = GeoIP.new(GeoIP.GEOIP_MEMORY_CACHE)
-#gi = GeoIP.open("/usr/local/share/GeoIP/GeoIP.data",GeoIP.GEOIP_STANDARD)
+#gi = GeoIP.open("/usr/local/share/GeoIP/GeoIP.dat",GeoIP.GEOIP_STANDARD)
 
 print gi.country_code_by_name("yahoo.com")
 print gi.last_netmask()
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test_v6.py python/test_v6.py
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test_v6.py	1969-12-31 18:00:00.000000000 -0600
+++ python/test_v6.py	2009-08-30 21:21:59.000000000 -0500
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
+import GeoIP
+
+#gi = GeoIP.new(GeoIP.GEOIP_STANDARD)
+#gi = GeoIP.new(GeoIP.GEOIP_MEMORY_CACHE)
+gi = GeoIP.open("/usr/local/share/GeoIP/GeoIPv6.dat",GeoIP.GEOIP_STANDARD)
+
+print gi.country_code_by_name_v6("ipv6.google.com")
+print gi.country_name_by_name_v6("ipv6.google.com")
+print gi.country_code_by_addr_v6("2001:4860:0:1001::68")
+print gi.country_name_by_addr_v6("2001:4860:0:1001::68")
+


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-GeoIP.spec	26 Jul 2009 20:03:20 -0000	1.15
+++ python-GeoIP.spec	1 Sep 2009 12:38:29 -0000	1.16
@@ -1,17 +1,19 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-GeoIP
-Version:        1.2.4
-Release:        3%{?dist}
+Version:        1.2.5
+Release:        0.1.20090931cvs%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:         python-GeoIP-1.2.4-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel GeoIP-devel
+# GeoIP 1.4.7 needed for IPv6 lookup functions
+BuildRequires:  python-devel, GeoIP-devel >= 1.4.7
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -19,6 +21,7 @@ location lookups to country, city and or
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -42,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 31 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.1.20090931cvs
+- add IPv6 functions from CVS HEAD
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Tue Sep  1 12:40:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:40:50 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 .cvsignore, 1.38,
	1.39 kdeaccessibility.spec, 1.68, 1.69 sources, 1.41, 1.42
Message-ID: <20090901124050.34C1111C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7495/F-10

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	5 Aug 2009 17:45:04 -0000	1.38
+++ .cvsignore	1 Sep 2009 12:40:49 -0000	1.39
@@ -1 +1 @@
-kdeaccessibility-4.3.0.tar.bz2
+kdeaccessibility-4.3.1.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- kdeaccessibility.spec	5 Aug 2009 02:49:19 -0000	1.68
+++ kdeaccessibility.spec	1 Sep 2009 12:40:49 -0000	1.69
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.0
-Release:        3%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
 - include epoch's in -libs-related Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	5 Aug 2009 17:45:04 -0000	1.41
+++ sources	1 Sep 2009 12:40:49 -0000	1.42
@@ -1 +1 @@
-76435ce1bf787713effe079a3664d3cd  kdeaccessibility-4.3.0.tar.bz2
+82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:40:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:40:50 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-11 .cvsignore, 1.42,
	1.43 kdeaccessibility.spec, 1.81, 1.82 sources, 1.43, 1.44
Message-ID: <20090901124050.55F3B11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeaccessibility/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7495/F-11

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	5 Aug 2009 17:45:04 -0000	1.42
+++ .cvsignore	1 Sep 2009 12:40:50 -0000	1.43
@@ -1 +1 @@
-kdeaccessibility-4.3.0.tar.bz2
+kdeaccessibility-4.3.1.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/kdeaccessibility.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- kdeaccessibility.spec	5 Aug 2009 02:49:19 -0000	1.81
+++ kdeaccessibility.spec	1 Sep 2009 12:40:50 -0000	1.82
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.0
-Release:        3%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
 - include epoch's in -libs-related Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	5 Aug 2009 17:45:04 -0000	1.43
+++ sources	1 Sep 2009 12:40:50 -0000	1.44
@@ -1 +1 @@
-76435ce1bf787713effe079a3664d3cd  kdeaccessibility-4.3.0.tar.bz2
+82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:40:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:40:50 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore,1.46,1.47
Message-ID: <20090901124050.778DF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7495/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	28 Aug 2009 12:32:22 -0000	1.46
+++ .cvsignore	1 Sep 2009 12:40:50 -0000	1.47
@@ -1,2 +1 @@
-kdeaccessibility-4.3.0.tar.bz2
 kdeaccessibility-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:42:03 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:42:03 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 .cvsignore, 1.59, 1.60 kdeadmin.spec, 1.122,
	1.123 sources, 1.63, 1.64
Message-ID: <20090901124203.7496A11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7779/F-10

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	5 Aug 2009 02:55:24 -0000	1.59
+++ .cvsignore	1 Sep 2009 12:42:03 -0000	1.60
@@ -1,5 +1 @@
-kdeadmin-4.2.90.tar.bz2
-kdeadmin-4.2.95.tar.bz2
-kdeadmin-4.2.96.tar.bz2
-kdeadmin-4.2.98.tar.bz2
-kdeadmin-4.3.0.tar.bz2
+kdeadmin-4.3.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- kdeadmin.spec	5 Aug 2009 02:55:25 -0000	1.122
+++ kdeadmin.spec	1 Sep 2009 12:42:03 -0000	1.123
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	5 Aug 2009 02:55:25 -0000	1.63
+++ sources	1 Sep 2009 12:42:03 -0000	1.64
@@ -1 +1 @@
-4712ade616d3c3a987281d24326ee9af  kdeadmin-4.3.0.tar.bz2
+e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:42:03 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:42:03 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 .cvsignore, 1.63, 1.64 kdeadmin.spec, 1.135,
	1.136 sources, 1.64, 1.65
Message-ID: <20090901124203.BFF2B11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7779/F-11

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	5 Aug 2009 02:55:25 -0000	1.63
+++ .cvsignore	1 Sep 2009 12:42:03 -0000	1.64
@@ -1,5 +1 @@
-kdeadmin-4.2.90.tar.bz2
-kdeadmin-4.2.95.tar.bz2
-kdeadmin-4.2.96.tar.bz2
-kdeadmin-4.2.98.tar.bz2
-kdeadmin-4.3.0.tar.bz2
+kdeadmin-4.3.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- kdeadmin.spec	5 Aug 2009 02:55:25 -0000	1.135
+++ kdeadmin.spec	1 Sep 2009 12:42:03 -0000	1.136
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	5 Aug 2009 02:55:25 -0000	1.64
+++ sources	1 Sep 2009 12:42:03 -0000	1.65
@@ -1 +1 @@
-4712ade616d3c3a987281d24326ee9af  kdeadmin-4.3.0.tar.bz2
+e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:42:03 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:42:03 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore,1.66,1.67
Message-ID: <20090901124203.F19BC11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7779/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	28 Aug 2009 12:34:20 -0000	1.66
+++ .cvsignore	1 Sep 2009 12:42:03 -0000	1.67
@@ -1,6 +1 @@
-kdeadmin-4.2.90.tar.bz2
-kdeadmin-4.2.95.tar.bz2
-kdeadmin-4.2.96.tar.bz2
-kdeadmin-4.2.98.tar.bz2
-kdeadmin-4.3.0.tar.bz2
 kdeadmin-4.3.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:25 +0000
Subject: [pkgdb] ganymed-ssh2 had acl change status
Message-ID: <20090901124425.CF91F10F87F@bastion2.fedora.phx.redhat.com>

robmv has set the watchbugzilla acl on ganymed-ssh2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:28 +0000
Subject: [pkgdb] ganymed-ssh2 had acl change status
Message-ID: <20090901124428.9D7D110F888@bastion2.fedora.phx.redhat.com>

robmv has set the watchcommits acl on ganymed-ssh2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:30 +0000
Subject: [pkgdb] ganymed-ssh2 had acl change status
Message-ID: <20090901124430.E2EBD10F894@bastion2.fedora.phx.redhat.com>

robmv has set the commit acl on ganymed-ssh2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:34 +0000
Subject: [pkgdb] ganymed-ssh2 had acl change status
Message-ID: <20090901124434.1DE0610F899@bastion2.fedora.phx.redhat.com>

robmv has set the approveacls acl on ganymed-ssh2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:54 +0000
Subject: [pkgdb] maven-doxia had acl change status
Message-ID: <20090901124454.3F51510F87F@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven-doxia (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:54 +0000
Subject: [pkgdb] maven-doxia had acl change status
Message-ID: <20090901124455.1810510F888@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven-doxia (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:56 +0000
Subject: [pkgdb] maven-doxia had acl change status
Message-ID: <20090901124456.9011510F8A0@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on maven-doxia (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 12:44:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:44:55 +0000
Subject: [pkgdb] maven-doxia had acl change status
Message-ID: <20090901124455.8598210F89C@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven-doxia (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:18 +0000
Subject: [pkgdb] maven-shared had acl change status
Message-ID: <20090901124518.7C9AC10F899@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven-shared (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:18 +0000
Subject: [pkgdb] maven-shared had acl change status
Message-ID: <20090901124518.84E2810F8A3@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven-shared (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:20 +0000
Subject: [pkgdb] maven-shared had acl change status
Message-ID: <20090901124520.02FD210F8A8@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven-shared (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:21 +0000
Subject: [pkgdb] maven-shared had acl change status
Message-ID: <20090901124521.36A9910F8AB@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on maven-shared (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-shared



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:38 +0000
Subject: [pkgdb] maven-scm had acl change status
Message-ID: <20090901124538.D9F4F10F89A@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven-scm (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:39 +0000
Subject: [pkgdb] maven-scm had acl change status
Message-ID: <20090901124539.90A3710F8AD@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven-scm (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:38 +0000
Subject: [pkgdb] maven-scm had acl change status
Message-ID: <20090901124538.E287F10F89D@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven-scm (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From pkgdb at fedoraproject.org  Tue Sep  1 12:45:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:45:40 +0000
Subject: [pkgdb] maven-scm had acl change status
Message-ID: <20090901124540.9858210F8B1@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on maven-scm (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-scm



From ltinkl at fedoraproject.org  Tue Sep  1 12:47:21 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:47:21 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 .cvsignore, 1.55, 1.56 kdeartwork.spec, 1.101, 
	1.102 sources, 1.60, 1.61
Message-ID: <20090901124721.82AEE11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8994/F-10

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	5 Aug 2009 02:57:17 -0000	1.55
+++ .cvsignore	1 Sep 2009 12:47:21 -0000	1.56
@@ -1,5 +1 @@
-kdeartwork-4.2.90.tar.bz2
-kdeartwork-4.2.95.tar.bz2
-kdeartwork-4.2.96.tar.bz2
-kdeartwork-4.2.98.tar.bz2
-kdeartwork-4.3.0.tar.bz2
+kdeartwork-4.3.1.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- kdeartwork.spec	20 Aug 2009 14:12:52 -0000	1.101
+++ kdeartwork.spec	1 Sep 2009 12:47:21 -0000	1.102
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.3.0
-Release:        2%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -206,6 +206,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - kde-style-phase subpkg (multilib'd)
 - %%files: cleanup some dir ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	5 Aug 2009 02:57:17 -0000	1.60
+++ sources	1 Sep 2009 12:47:21 -0000	1.61
@@ -1 +1 @@
-3e7872e841e87f716872086571028a37  kdeartwork-4.3.0.tar.bz2
+9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:47:21 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:47:21 +0000 (UTC)
Subject: rpms/kdeartwork/F-11 .cvsignore, 1.61, 1.62 kdeartwork.spec, 1.109, 
	1.110 sources, 1.62, 1.63
Message-ID: <20090901124721.C120111C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeartwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8994/F-11

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	5 Aug 2009 02:57:17 -0000	1.61
+++ .cvsignore	1 Sep 2009 12:47:21 -0000	1.62
@@ -1,5 +1 @@
-kdeartwork-4.2.90.tar.bz2
-kdeartwork-4.2.95.tar.bz2
-kdeartwork-4.2.96.tar.bz2
-kdeartwork-4.2.98.tar.bz2
-kdeartwork-4.3.0.tar.bz2
+kdeartwork-4.3.1.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/kdeartwork.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- kdeartwork.spec	20 Aug 2009 14:13:23 -0000	1.109
+++ kdeartwork.spec	1 Sep 2009 12:47:21 -0000	1.110
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.3.0
-Release:        2%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -206,6 +206,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - kde-style-phase subpkg (multilib'd)
 - %%files: cleanup some dir ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	5 Aug 2009 02:57:17 -0000	1.62
+++ sources	1 Sep 2009 12:47:21 -0000	1.63
@@ -1 +1 @@
-3e7872e841e87f716872086571028a37  kdeartwork-4.3.0.tar.bz2
+9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:47:21 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:47:21 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore,1.64,1.65
Message-ID: <20090901124721.E2B1111C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8994/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	28 Aug 2009 12:39:03 -0000	1.64
+++ .cvsignore	1 Sep 2009 12:47:21 -0000	1.65
@@ -1,6 +1 @@
-kdeartwork-4.2.90.tar.bz2
-kdeartwork-4.2.95.tar.bz2
-kdeartwork-4.2.96.tar.bz2
-kdeartwork-4.2.98.tar.bz2
-kdeartwork-4.3.0.tar.bz2
 kdeartwork-4.3.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  1 12:50:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:50:17 +0000
Subject: [pkgdb] ganymed-ssh2 had acl change status
Message-ID: <20090901125017.39FB510F882@bastion2.fedora.phx.redhat.com>

robmv has set the approveacls acl on ganymed-ssh2 (Fedora devel) to Obsolete for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From pkgdb at fedoraproject.org  Tue Sep  1 12:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 12:50:20 +0000
Subject: [pkgdb] ganymed-ssh2 had acl change status
Message-ID: <20090901125020.6080710F890@bastion2.fedora.phx.redhat.com>

robmv has set the approveacls acl on ganymed-ssh2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ganymed-ssh2



From ltinkl at fedoraproject.org  Tue Sep  1 12:55:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:55:12 +0000 (UTC)
Subject: rpms/kdebase/F-10 .cvsignore, 1.83, 1.84 kdebase.spec, 1.368,
	1.369 sources, 1.111, 1.112
Message-ID: <20090901125512.19CD511C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10746/F-10

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	5 Aug 2009 02:51:47 -0000	1.83
+++ .cvsignore	1 Sep 2009 12:55:11 -0000	1.84
@@ -1,5 +1 @@
-kdebase-4.2.90.tar.bz2
-kdebase-4.2.95.tar.bz2
-kdebase-4.2.96.tar.bz2
-kdebase-4.2.98.tar.bz2
-kdebase-4.3.0.tar.bz2
+kdebase-4.3.1.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- kdebase.spec	5 Aug 2009 02:51:48 -0000	1.368
+++ kdebase.spec	1 Sep 2009 12:55:11 -0000	1.369
@@ -1,6 +1,7 @@
+
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Epoch: 6
 
@@ -24,9 +25,11 @@ Provides:  kdebase4 = %{version}-%{relea
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 6:4.0.0 
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kde-plasma-folderview < 6:4.3.1-1
+Provides:  kde-plasma-folderview = %{?epoch:%{epoch}:}%{version}-%{release} 
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -72,23 +75,27 @@ Requires: kdebase-runtime
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
 
-
+%package -n kde-plasma-folderview
+Summary: FolderView plasma applet
+Group:   System Environment/Desktop
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n kde-plasma-folderview
+%{summary}.
 
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
-
-
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Provides:  kdebase4-devel = %{version}-%{release}
 Obsoletes: kdebase4-devel < %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 %{summary}.
@@ -146,7 +153,6 @@ rm -rf %{buildroot}
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -156,41 +162,51 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    update-desktop-database -q &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
 fi
 
 %post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/
+%{_kde4_datadir}/kde4/services/kded/*.desktop
+%{_kde4_datadir}/kde4/services/useragentstrings/
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_configdir}/*
 %{_kde4_datadir}/templates/*
 %{_kde4_datadir}/templates/.source/*
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/libkonsoleprivate.so
 
+#exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+#exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+#files -n kde-plasma-folderview
+#defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
@@ -202,6 +218,14 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+- drop/revert kde-plasma-folderview subpkg
+
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- kde-plasma-folderview subpkg
+- %%?_isa'ify -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	5 Aug 2009 02:51:48 -0000	1.111
+++ sources	1 Sep 2009 12:55:11 -0000	1.112
@@ -1 +1 @@
-6de0b96b78504d8f5fcdee819d080fb1  kdebase-4.3.0.tar.bz2
+10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:55:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:55:12 +0000 (UTC)
Subject: rpms/kdebase/F-11 .cvsignore, 1.88, 1.89 kdebase.spec, 1.378,
	1.379 sources, 1.111, 1.112
Message-ID: <20090901125512.4604011C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10746/F-11

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore	5 Aug 2009 02:51:02 -0000	1.88
+++ .cvsignore	1 Sep 2009 12:55:12 -0000	1.89
@@ -1,5 +1 @@
-kdebase-4.2.90.tar.bz2
-kdebase-4.2.95.tar.bz2
-kdebase-4.2.96.tar.bz2
-kdebase-4.2.98.tar.bz2
-kdebase-4.3.0.tar.bz2
+kdebase-4.3.1.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- kdebase.spec	5 Aug 2009 02:51:02 -0000	1.378
+++ kdebase.spec	1 Sep 2009 12:55:12 -0000	1.379
@@ -1,6 +1,7 @@
+
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Epoch: 6
 
@@ -24,9 +25,11 @@ Provides:  kdebase4 = %{version}-%{relea
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 6:4.0.0 
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kde-plasma-folderview < 6:4.3.1-1
+Provides:  kde-plasma-folderview = %{?epoch:%{epoch}:}%{version}-%{release} 
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -72,23 +75,27 @@ Requires: kdebase-runtime
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
 
-
+%package -n kde-plasma-folderview
+Summary: FolderView plasma applet
+Group:   System Environment/Desktop
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n kde-plasma-folderview
+%{summary}.
 
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
-
-
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Provides:  kdebase4-devel = %{version}-%{release}
 Obsoletes: kdebase4-devel < %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 %{summary}.
@@ -146,7 +153,6 @@ rm -rf %{buildroot}
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -156,41 +162,51 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    update-desktop-database -q &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
 fi
 
 %post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/
+%{_kde4_datadir}/kde4/services/kded/*.desktop
+%{_kde4_datadir}/kde4/services/useragentstrings/
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_configdir}/*
 %{_kde4_datadir}/templates/*
 %{_kde4_datadir}/templates/.source/*
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/libkonsoleprivate.so
 
+#exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+#exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+#files -n kde-plasma-folderview
+#defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
@@ -202,6 +218,14 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+- drop/revert kde-plasma-folderview subpkg
+
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- kde-plasma-folderview subpkg
+- %%?_isa'ify -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	5 Aug 2009 02:51:02 -0000	1.111
+++ sources	1 Sep 2009 12:55:12 -0000	1.112
@@ -1 +1 @@
-6de0b96b78504d8f5fcdee819d080fb1  kdebase-4.3.0.tar.bz2
+10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 12:55:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 12:55:12 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore,1.92,1.93
Message-ID: <20090901125512.76BB711C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10746/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- .cvsignore	28 Aug 2009 12:45:27 -0000	1.92
+++ .cvsignore	1 Sep 2009 12:55:12 -0000	1.93
@@ -1,6 +1 @@
-kdebase-4.2.90.tar.bz2
-kdebase-4.2.95.tar.bz2
-kdebase-4.2.96.tar.bz2
-kdebase-4.2.98.tar.bz2
-kdebase-4.3.0.tar.bz2
 kdebase-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 13:01:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 13:01:55 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore,1.37,1.38
Message-ID: <20090901130155.3DFBF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11901/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	28 Aug 2009 12:53:43 -0000	1.37
+++ .cvsignore	1 Sep 2009 13:01:55 -0000	1.38
@@ -1,6 +1 @@
-kdebase-runtime-4.2.90.tar.bz2
-kdebase-runtime-4.2.95.tar.bz2
-kdebase-runtime-4.2.96.tar.bz2
-kdebase-runtime-4.2.98.tar.bz2
-kdebase-runtime-4.3.0.tar.bz2
 kdebase-runtime-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 13:01:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 13:01:54 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 .cvsignore, 1.29,
	1.30 kdebase-runtime.spec, 1.94, 1.95 sources, 1.32, 1.33
Message-ID: <20090901130154.D7C5911C00EF@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-serv11901/F-10

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	5 Aug 2009 00:18:16 -0000	1.29
+++ .cvsignore	1 Sep 2009 13:01:54 -0000	1.30
@@ -1,5 +1 @@
-kdebase-runtime-4.2.90.tar.bz2
-kdebase-runtime-4.2.95.tar.bz2
-kdebase-runtime-4.2.96.tar.bz2
-kdebase-runtime-4.2.98.tar.bz2
-kdebase-runtime-4.3.0.tar.bz2
+kdebase-runtime-4.3.1.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.94
+++ kdebase-runtime.spec	1 Sep 2009 13:01:54 -0000	1.95
@@ -1,11 +1,11 @@
-%if 0%{?rhel} == 0
+%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.0
-Release:       4%{?dist}
+Version:       4.3.1
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,12 +23,6 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
-# http://websvn.kde.org/?view=rev&revision=1008050
-Patch5:        kdebase-runtime-4.3.1-comborender.patch
-#?http://websvn.kde.org/?view=rev&revision=1008861
-Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
-#?https://bugzilla.redhat.com/show_bug.cgi?id=516416
-Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -63,7 +57,7 @@ BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.3.0
-%if 0%{?rhel} == 0
+%if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
 %endif
 BuildRequires: xorg-x11-font-utils
@@ -102,9 +96,6 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
-%patch5 -p0 -b .comborender
-%patch6 -p0 -b .kcmlocalecrash
-%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}
@@ -224,6 +215,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.1
+
 * Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
 - unbreak fish kioslave protocol (#516416)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	5 Aug 2009 00:18:17 -0000	1.32
+++ sources	1 Sep 2009 13:01:54 -0000	1.33
@@ -1 +1 @@
-e4ea5d567187f4ac952c67326c5afd94  kdebase-runtime-4.3.0.tar.bz2
+e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 13:01:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 13:01:55 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 .cvsignore, 1.34,
	1.35 kdebase-runtime.spec, 1.117, 1.118 sources, 1.34, 1.35
Message-ID: <20090901130155.0DC3811C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11901/F-11

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	5 Aug 2009 00:17:29 -0000	1.34
+++ .cvsignore	1 Sep 2009 13:01:54 -0000	1.35
@@ -1,5 +1 @@
-kdebase-runtime-4.2.90.tar.bz2
-kdebase-runtime-4.2.95.tar.bz2
-kdebase-runtime-4.2.96.tar.bz2
-kdebase-runtime-4.2.98.tar.bz2
-kdebase-runtime-4.3.0.tar.bz2
+kdebase-runtime-4.3.1.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.117
+++ kdebase-runtime.spec	1 Sep 2009 13:01:54 -0000	1.118
@@ -1,11 +1,11 @@
-%if 0%{?rhel} == 0
+%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.0
-Release:       4%{?dist}
+Version:       4.3.1
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,12 +23,6 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
-# http://websvn.kde.org/?view=rev&revision=1008050
-Patch5:        kdebase-runtime-4.3.1-comborender.patch
-#?http://websvn.kde.org/?view=rev&revision=1008861
-Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
-#?https://bugzilla.redhat.com/show_bug.cgi?id=516416
-Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -63,7 +57,7 @@ BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.3.0
-%if 0%{?rhel} == 0
+%if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
 %endif
 BuildRequires: xorg-x11-font-utils
@@ -102,9 +96,6 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
-%patch5 -p0 -b .comborender
-%patch6 -p0 -b .kcmlocalecrash
-%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}
@@ -224,6 +215,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.1
+
 * Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
 - unbreak fish kioslave protocol (#516416)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	5 Aug 2009 00:17:29 -0000	1.34
+++ sources	1 Sep 2009 13:01:54 -0000	1.35
@@ -1 +1 @@
-e4ea5d567187f4ac952c67326c5afd94  kdebase-runtime-4.3.0.tar.bz2
+e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2



From mdomsch at fedoraproject.org  Tue Sep  1 13:04:09 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 13:04:09 +0000 (UTC)
Subject: rpms/GeoIP/devel geoip-1.4.6-ipv6.patch, NONE, 1.1 GeoIP.spec, 1.19,
	1.20
Message-ID: <20090901130409.99B8211C00EF@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/GeoIP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12803

Modified Files:
	GeoIP.spec 
Added Files:
	geoip-1.4.6-ipv6.patch 
Log Message:
add IPv6 functions from CVS HEAD, do prerelease

geoip-1.4.6-ipv6.patch:
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//GeoIP.spec              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//LICENSE.txt             |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//Makefile.in             |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//README.fedora           |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//aclocal.m4              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//config.guess            |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//config.sub              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//configure               |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//fetch-geoipdata-city.pl |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//fetch-geoipdata.pl      |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//install-sh              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//missing                 |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/Makefile.in         |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/conf/Makefile.in         |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data/GeoIP.dat           |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data/Makefile.in         |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/Makefile.in     |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/man/Makefile.in          |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/test/Makefile.in         |only
 c//CVS                                                                           |only
 c//LICENSE                                                                       |only
 c//regioncode                                                                    |only
 c//timezone                                                                      |only
 c/ChangeLog                                                                      |   17 +
 c/README                                                                         |   23 +
 c/apps/CVS                                                                       |only
 c/apps/geoiplookup.c                                                             |  120 +++++++++-
 c/apps/geoipupdate-pureperl.pl                                                   |    4 
 c/apps/geoipupdate.c                                                             |    3 
 c/conf/CVS                                                                       |only
 c/configure.in                                                                   |    2 
 c/data/CVS                                                                       |only
 c/libGeoIP/CVS                                                                   |only
 c/libGeoIP/GeoIP.c                                                               |   70 ++++-
 c/libGeoIP/GeoIP.h                                                               |    7 
 c/libGeoIP/regionName.c                                                          |  113 +++++++--
 c/man/CVS                                                                        |only
 c/man/geoiplookup.1                                                              |only
 c/man/geoiplookup6.1                                                             |only
 c/man/geoipupdate.1                                                              |only
 c/test/CVS                                                                       |only
 c/test/fail_test.txt                                                             |only
 c/test/proxy_test.txt                                                            |only
 43 files changed, 312 insertions(+), 47 deletions(-)

--- NEW FILE geoip-1.4.6-ipv6.patch ---
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: aclocal.m4
Only in c/apps: CVS
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoiplookup.c c/apps/geoiplookup.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoiplookup.c	2009-02-24 10:03:23.000000000 -0600
+++ c/apps/geoiplookup.c	2009-05-08 12:01:21.000000000 -0500
@@ -31,9 +31,12 @@ typedef unsigned int uint32_t; 
 void geoiplookup(GeoIP* gi,char *hostname,int i);
 
 void usage() {
-	fprintf(stderr,"Usage: geoiplookup [-d custom_dir] [-f custom_file] [-v] <ipaddress|hostname>\n");
+	fprintf(stderr,"Usage: geoiplookup [-d custom_dir] [-f custom_file] [-v] [-i] <ipaddress|hostname>\n");
 }
 
+/* extra info used in _say_range_ip */
+int info_flag = 0;
+
 int main (int argc, char *argv[]) {
 	char * hostname = NULL;
 	char * db_info;
@@ -51,7 +54,9 @@ int main (int argc, char *argv[]) {
 	while (i < argc) {
 		if (strcmp(argv[i],"-v") == 0) {
 			version_flag = 1;
-		} else if (strcmp(argv[i],"-f") == 0) {
+		} else if (strcmp(argv[i],"-i") == 0) {
+			info_flag = 1;
+                } else if (strcmp(argv[i],"-f") == 0) {
 			if ((i+1) < argc){
 				i++;
 				custom_file = argv[i];
@@ -119,12 +124,106 @@ static const char * _mk_NA( const char *
  return p ? p : "N/A";
 }
 
+static unsigned long
+__addr_to_num(const char *addr)
+{
+	unsigned int    c, octet, t;
+	unsigned long   ipnum;
+	int             i = 3;
+
+	octet = ipnum = 0;
+	while ((c = *addr++)) {
+		if (c == '.') {
+			if (octet > 255)
+				return 0;
+			ipnum <<= 8;
+			ipnum += octet;
+			i--;
+			octet = 0;
+		} else {
+			t = octet;
+			octet <<= 3;
+			octet += t;
+			octet += t;
+			c -= '0';
+			if (c > 9)
+				return 0;
+			octet += c;
+		}
+	}
+	if ((octet > 255) || (i != 0))
+		return 0;
+	ipnum <<= 8;
+	return ipnum + octet;
+}
+
+
+
+/* ptr must be a memory area with at least 16 bytes */
+static char *__num_to_addr_r (unsigned long ipnum, char * ptr) {
+	char *cur_str;
+	int octet[4];
+	int num_chars_written, i;
+
+	cur_str = ptr;
+
+	for (i = 0; i<4; i++) {
+		octet[3 - i] = ipnum % 256;
+		ipnum >>= 8;
+	}
+
+	for (i = 0; i<4; i++) {
+		num_chars_written = sprintf(cur_str, "%d", octet[i]);
+		cur_str += num_chars_written;
+
+		if (i < 3) {
+			cur_str[0] = '.';
+			cur_str++;
+		}
+	}
+
+	return ptr;
+}
+
+void _say_range_by_ip(GeoIP * gi, uint32_t ipnum ) {
+  unsigned long last_nm, mask, low, hi;
+  char ipaddr[16];
+  char tmp[16];
+  char ** range;
+
+  if ( info_flag == 0 )
+    return; /* noop unless extra information is requested */
+
+  range = GeoIP_range_by_ip( gi, __num_to_addr_r( ipnum, ipaddr ) );
+  if ( range == NULL )
+    return;
+
+  printf ( "  ipaddr: %s\n", ipaddr );
+
+  printf( "  range_by_ip:  %s - %s\n", range[0], range[1] );
+  last_nm = GeoIP_last_netmask(gi);
+  mask    = 0xffffffff << ( 32 - last_nm );
+  low     = ipnum & mask;
+  hi      = low + ( 0xffffffff & ~mask );
+  printf( "  network:      %s - %s ::%ld\n",
+    __num_to_addr_r( low, ipaddr ),
+    __num_to_addr_r( hi,  tmp ),
+    last_nm
+  );
+  printf( "  ipnum: %u\n", ipnum );
+  printf( "  range_by_num: %lu - %lu\n", __addr_to_num(range[0]), __addr_to_num(range[1]) );
+  printf( "  network num:  %lu - %lu ::%lu\n", low, hi, last_nm );
+
+  GeoIP_range_by_ip_delete(range);
+}
+
 void
 geoiplookup(GeoIP * gi, char *hostname, int i)
 {
 	const char     *country_code;
 	const char     *country_name;
 	const char     *domain_name;
+        const char     *asnum_name;
 	int             netspeed;
 	int             country_id;
 	GeoIPRegion    *region;
@@ -146,6 +245,17 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s\n", GeoIPDBDescription[i], domain_name);
+                                _say_range_by_ip(gi, ipnum);
+			}
+		}
+		else if (GEOIP_ASNUM_EDITION == i) {
+			asnum_name = GeoIP_name_by_ipnum(gi, ipnum);
+			if (asnum_name == NULL) {
+				printf("%s: IP Address not found\n", GeoIPDBDescription[i]);
+			}
+			else {
+				printf("%s: %s\n", GeoIPDBDescription[i], asnum_name);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_COUNTRY_EDITION == i) {
@@ -157,6 +267,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s, %s\n", GeoIPDBDescription[i], country_code, country_name);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_REGION_EDITION_REV0 == i || GEOIP_REGION_EDITION_REV1 == i) {
@@ -166,6 +277,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s, %s\n", GeoIPDBDescription[i], region->country_code, region->region);
+                                _say_range_by_ip(gi, ipnum);
 				GeoIPRegion_delete(region);
 			}
 		}
@@ -177,6 +289,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			else {
 				printf("%s: %s, %s, %s, %s, %f, %f\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region),
 				       _mk_NA(gir->city), _mk_NA(gir->postal_code), gir->latitude, gir->longitude);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_CITY_EDITION_REV1 == i) {
@@ -187,6 +300,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			else {
 				printf("%s: %s, %s, %s, %s, %f, %f, %d, %d\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code),
 				       gir->latitude, gir->longitude, gir->metro_code, gir->area_code);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_ORG_EDITION == i || GEOIP_ISP_EDITION == i) {
@@ -196,6 +310,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s\n", GeoIPDBDescription[i], org);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_NETSPEED_EDITION == i) {
@@ -212,6 +327,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			else if (netspeed == GEOIP_CORPORATE_SPEED) {
 				printf("%s: Corporate\n", GeoIPDBDescription[i]);
 			}
+                        _say_range_by_ip(gi, ipnum);
 		}
 		else {
 
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate.c c/apps/geoipupdate.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate.c	2009-02-24 14:01:41.000000000 -0600
+++ c/apps/geoipupdate.c	2009-05-29 03:55:00.000000000 -0500
@@ -97,6 +97,7 @@ int main (int argc, char *argv[]) {
 			exit(0);
 		case 'v':
 			verbose = 1;
+                        break;
 		case 'f':
 			license_file = optarg;
 			break;
@@ -279,5 +280,5 @@ int main (int argc, char *argv[]) {
 	if (client_ipaddr) {
 		free(client_ipaddr);
 	}
-	exit(0);
+	exit(err);
 }
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate-pureperl.pl c/apps/geoipupdate-pureperl.pl
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate-pureperl.pl	2009-02-24 10:04:39.000000000 -0600
+++ c/apps/geoipupdate-pureperl.pl	2009-03-22 09:40:33.000000000 -0500
@@ -40,7 +40,7 @@ https
 use strict;
 use warnings;
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 use 5.008;
 use Data::Dumper;
@@ -220,7 +220,7 @@ sub _gunzip_and_replace {
   {
     local $_;
     open my $gin, '<:gzip', \$content or die $!;
-    open my $gout, '>', $geoip_filename . '.test' or die $!;
+    open my $gout, '>:raw', $geoip_filename . '.test' or die $!;
     print {$gout} $_ while (<$gin>);
   }
 
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps: Makefile.in
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/ChangeLog c/ChangeLog
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/ChangeLog	2009-02-24 19:44:38.000000000 -0600
+++ c/ChangeLog	2009-08-30 21:15:04.000000000 -0500
@@ -1,3 +1,20 @@
+	* Add more IPv6 functions ( Boris Zentner )
+	    const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr);
+	    const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *host);
+	    const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr);
+	    const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *host);
+	    const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr);
+	    const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *host);
+	* Make sure that GeoIP_*_v6 functions refuse GEOIP_PROXY_EDITION and
+	    GEOIP_NETSPEED_EDITION databases ( Boris Zentner ) 
+	* Update libGeoIP/regionName.c with FIPS codes from 20090723 ( Boris Zentner )
+	* Fix geoipupdate's -v option to not change the license filename ( Thom May )
+	* Fix geoipupdate's exit code ( Thom May )
+	* Add support for ASNUM_EDITION ( Boris Zentner )
+	* Fix -i output for larger values, sign issue ( Boris Zentner )
+	* Add -i flag for more information on netmask, range_by_ip and the current network range ( Boris Zentner )
+	* Add support for DOMAIN_EDITION database type ( Boris Zentner )
+	* Fix apps/geoipupdate-pureperl.pl output layer on W32 ( Boris Zentner )
 1.4.6	2009-02-25
 	* Fix geoipupdate's my_printf function ( Boris Zentner )
 	* Fix typo in apps/geoipupdate-pureperl.pl replace PerlIO::Gzip with PerlIO::gzip ( Boris Zentner ) 
Only in c/conf: CVS
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/conf: Makefile.in
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: config.guess
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: config.sub
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: configure
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/configure.in c/configure.in
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/configure.in	2009-02-24 10:03:23.000000000 -0600
+++ c/configure.in	2009-08-30 21:15:04.000000000 -0500
@@ -1,6 +1,6 @@
 dnl AM_CONFIG_HEADER(config.h)
 
-AC_INIT([GeoIP], [1.4.6],[support at maxmind.com],[GeoIP])
+AC_INIT([GeoIP], [1.4.7],[support at maxmind.com],[GeoIP])
 AC_GNU_SOURCE
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([libGeoIP/GeoIP.c])
Only in c/: CVS
Only in c/data: CVS
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data: GeoIP.dat
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data: Makefile.in
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: fetch-geoipdata-city.pl
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: fetch-geoipdata.pl
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: GeoIP.spec
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: install-sh
Only in c/libGeoIP: CVS
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.c c/libGeoIP/GeoIP.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.c	2009-02-24 10:03:23.000000000 -0600
+++ c/libGeoIP/GeoIP.c	2009-08-30 21:15:04.000000000 -0500
@@ -366,10 +366,11 @@ void _setup_segments(GeoIP * gi) {
 				gi->databaseSegments = malloc(sizeof(int));
 				gi->databaseSegments[0] = STATE_BEGIN_REV1;
 			} else if (gi->databaseType == GEOIP_CITY_EDITION_REV0 ||
-								 gi->databaseType == GEOIP_CITY_EDITION_REV1 ||
-								 gi->databaseType == GEOIP_ORG_EDITION ||
-								 gi->databaseType == GEOIP_ISP_EDITION ||
-								 gi->databaseType == GEOIP_ASNUM_EDITION) {
+				   gi->databaseType == GEOIP_CITY_EDITION_REV1 ||
+		                   gi->databaseType == GEOIP_ORG_EDITION ||
+		                   gi->databaseType == GEOIP_DOMAIN_EDITION ||
+		 		   gi->databaseType == GEOIP_ISP_EDITION ||
+			  	   gi->databaseType == GEOIP_ASNUM_EDITION) {
 				/* City/Org Editions have two segments, read offset of second segment */
 				gi->databaseSegments = malloc(sizeof(int));
 				gi->databaseSegments[0] = 0;
@@ -377,8 +378,9 @@ void _setup_segments(GeoIP * gi) {
 				for (j = 0; j < SEGMENT_RECORD_LENGTH; j++) {
 					gi->databaseSegments[0] += (buf[j] << (j * 8));
 				}
-				if (gi->databaseType == GEOIP_ORG_EDITION ||
-						gi->databaseType == GEOIP_ISP_EDITION)
+				if (gi->databaseType == GEOIP_ORG_EDITION    ||
+		                    gi->databaseType == GEOIP_DOMAIN_EDITION ||                                  
+			 	    gi->databaseType == GEOIP_ISP_EDITION)
 					gi->record_length = ORG_RECORD_LENGTH;
 			}
 			break;
@@ -831,18 +833,36 @@ void GeoIP_delete (GeoIP *gi) {
 	free(gi);
 }
 
+const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *name) {
+	int country_id;
+	country_id = GeoIP_id_by_name_v6(gi, name);
+	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
+}
+
 const char *GeoIP_country_code_by_name (GeoIP* gi, const char *name) {
 	int country_id;
 	country_id = GeoIP_id_by_name(gi, name);
 	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
 }
 
+const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *name) {
+	int country_id;
+	country_id = GeoIP_id_by_name_v6(gi, name);
+	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
+}
+
 const char *GeoIP_country_code3_by_name (GeoIP* gi, const char *name) {
 	int country_id;
 	country_id = GeoIP_id_by_name(gi, name);
 	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
+const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *name) {
+	int country_id;
+	country_id = GeoIP_id_by_name_v6(gi, name);
+	return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
+}
+
 const char *GeoIP_country_name_by_name (GeoIP* gi, const char *name) {
 	int country_id;
 	country_id = GeoIP_id_by_name(gi, name);
@@ -945,7 +965,7 @@ int GeoIP_id_by_name_v6 (GeoIP* gi, cons
        if (name == NULL) {
                return 0;
        }
-       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 && gi->databaseType != GEOIP_PROXY_EDITION && gi->databaseType != GEOIP_NETSPEED_EDITION) {
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6) {
                printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
                return 0;
        }
@@ -956,18 +976,36 @@ int GeoIP_id_by_name_v6 (GeoIP* gi, cons
        return ret;
 }
 
+const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr) {
+	int country_id;
+	country_id = GeoIP_id_by_addr_v6(gi, addr);
+	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
+}
+
 const char *GeoIP_country_code_by_addr (GeoIP* gi, const char *addr) {
 	int country_id;
 	country_id = GeoIP_id_by_addr(gi, addr);
 	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
 }
 
+const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr) {
+	int country_id;
+	country_id = GeoIP_id_by_addr_v6(gi, addr);
+	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
+}
+
 const char *GeoIP_country_code3_by_addr (GeoIP* gi, const char *addr) {
 	int country_id;
 	country_id = GeoIP_id_by_addr(gi, addr);
 	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
+const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr) {
+	int country_id;
+	country_id = GeoIP_id_by_addr_v6(gi, addr);
+	return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
+}
+
 const char *GeoIP_country_name_by_addr (GeoIP* gi, const char *addr) {
 	int country_id;
 	country_id = GeoIP_id_by_addr(gi, addr);
@@ -1010,10 +1048,18 @@ const char *GeoIP_country_code3_by_ipnum
        return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
+int GeoIP_country_id_by_addr_v6 (GeoIP* gi, const char *addr) {
+	return GeoIP_id_by_addr_v6(gi, addr);
+}
+
 int GeoIP_country_id_by_addr (GeoIP* gi, const char *addr) {
 	return GeoIP_id_by_addr(gi, addr);
 }
 
+int GeoIP_country_id_by_name_v6 (GeoIP* gi, const char *host) {
+	return GeoIP_id_by_name_v6(gi, host);
+}
+
 int GeoIP_country_id_by_name (GeoIP* gi, const char *host) {
 	return GeoIP_id_by_name(gi, host);
 }
@@ -1024,9 +1070,7 @@ int GeoIP_id_by_addr_v6 (GeoIP* gi, cons
        if (addr == NULL) {
                return 0;
        }
-       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 &&
-                       gi->databaseType != GEOIP_PROXY_EDITION &&
-                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6) {
                printf("Invalid database type %s, expected %s\n",
                                         GeoIPDBDescription[(int)gi->databaseType],
                                         GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
@@ -1062,9 +1106,7 @@ int GeoIP_id_by_ipnum_v6 (GeoIP* gi, geo
                return 0;
        }
 */     
-       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 && 
-                       gi->databaseType != GEOIP_PROXY_EDITION &&
-                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6) {
                printf("Invalid database type %s, expected %s\n",
                                         GeoIPDBDescription[(int)gi->databaseType],
                                         GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
@@ -1346,6 +1388,7 @@ char *_get_name (GeoIP* gi, unsigned lon
 
 	if (gi->databaseType != GEOIP_ORG_EDITION &&
 			gi->databaseType != GEOIP_ISP_EDITION &&
+			gi->databaseType != GEOIP_DOMAIN_EDITION &&
 			gi->databaseType != GEOIP_ASNUM_EDITION) {
 		printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
 		return NULL;
@@ -1382,6 +1425,7 @@ char *_get_name_v6 (GeoIP* gi, geoipv6_t
 
   if (gi->databaseType != GEOIP_ORG_EDITION &&
       gi->databaseType != GEOIP_ISP_EDITION &&
+      gi->databaseType != GEOIP_DOMAIN_EDITION &&
       gi->databaseType != GEOIP_ASNUM_EDITION) {
     printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
     return NULL;
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.h c/libGeoIP/GeoIP.h
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.h	2009-02-24 10:03:23.000000000 -0600
+++ c/libGeoIP/GeoIP.h	2009-08-30 21:15:04.000000000 -0500
@@ -162,6 +162,13 @@ GEOIP_API const char *GeoIP_country_name
 GEOIP_API const char *GeoIP_country_code_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum);
 GEOIP_API const char *GeoIP_country_code3_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum);
 
+GEOIP_API const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr);
+GEOIP_API const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *host);
+GEOIP_API const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr);
+GEOIP_API const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *host);
+GEOIP_API const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr);
+GEOIP_API const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *host);
+
 /* Deprecated - for backwards compatibility only */
 GEOIP_API int GeoIP_country_id_by_addr (GeoIP* gi, const char *addr);
 GEOIP_API int GeoIP_country_id_by_name (GeoIP* gi, const char *host);
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP: Makefile.in
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/regionName.c c/libGeoIP/regionName.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/regionName.c	2009-02-24 10:03:23.000000000 -0600
+++ c/libGeoIP/regionName.c	2009-07-23 15:48:20.000000000 -0500
@@ -2249,6 +2249,12 @@ const char * GeoIP_region_name_by_code(c
   }
   if (strcmp(country_code,"CI") == 0) {
     switch (region_code2) {
+      case 5:
+      name = "Atacama";
+      break;
+      case 6:
+      name = "Biobio";
+      break;
       case 51:
       name = "Sassandra";
       break;
@@ -6102,6 +6108,9 @@ const char * GeoIP_region_name_by_code(c
       case 29:
       name = "Snafellsnes- og Hnappadalssysla";
       break;
+      case 30:
+      name = "Strandasysla";
+      break;
       case 31:
       name = "Sudur-Mulasysla";
       break;
@@ -6875,6 +6884,9 @@ const char * GeoIP_region_name_by_code(c
       case 1:
       name = "Beqaa";
       break;
+      case 2:
+      name = "Al Janub";
+      break;
       case 3:
       name = "Liban-Nord";
       break;
@@ -7092,6 +7104,9 @@ const char * GeoIP_region_name_by_code(c
       case 4:
       name = "Grand Cape Mount";
       break;
+      case 5:
+      name = "Lofa";
+      break;
       case 6:
       name = "Maryland";
       break;
@@ -7107,15 +7122,33 @@ const char * GeoIP_region_name_by_code(c
       case 11:
       name = "Grand Bassa";
       break;
+      case 12:
+      name = "Grand Cape Mount";
+      break;
+      case 13:
+      name = "Maryland";
+      break;
       case 14:
       name = "Montserrado";
       break;
+      case 17:
+      name = "Margibi";
+      break;
+      case 18:
+      name = "River Cess";
+      break;
       case 19:
       name = "Grand Gedeh";
       break;
       case 20:
       name = "Lofa";
       break;
+      case 21:
+      name = "Gbarpolu";
+      break;
+      case 22:
+      name = "River Gee";
+      break;
     }
   }
   if (strcmp(country_code,"LS") == 0) {
@@ -8848,12 +8881,18 @@ const char * GeoIP_region_name_by_code(c
       case 11:
       name = "Federal Capital Territory";
       break;
+      case 12:
+      name = "Gongola";
+      break;
       case 16:
       name = "Ogun";
       break;
       case 17:
       name = "Ondo";
       break;
+      case 18:
+      name = "Oyo";
+      break;
       case 21:
       name = "Akwa Ibom";
       break;
@@ -9271,6 +9310,9 @@ const char * GeoIP_region_name_by_code(c
       case 1092:
       name = "West Coast";
       break;
+      case 85:
+      name = "Waikato";
+      break;
     }
   }
   if (strcmp(country_code,"OM") == 0) {
@@ -9612,6 +9654,9 @@ const char * GeoIP_region_name_by_code(c
       case 44:
       name = "Mountain";
       break;
+      case 45:
+      name = "Negros Occidental";
+      break;
       case 46:
       name = "Negros Oriental";
       break;
@@ -10711,6 +10756,9 @@ const char * GeoIP_region_name_by_code(c
       case 6:
       name = "Gitarama";
       break;
+      case 7:
+      name = "Kibungo";
+      break;
       case 9:
       name = "Kigali";
       break;
@@ -11532,6 +11580,9 @@ const char * GeoIP_region_name_by_code(c
       case 7:
       name = "Thies";
       break;
+      case 8:
+      name = "Louga";
+      break;
       case 9:
       name = "Fatick";
       break;
@@ -12075,6 +12126,12 @@ const char * GeoIP_region_name_by_code(c
       case 78:
       name = "Mukdahan";
       break;
+      case 79:
+      name = "Nong Bua Lamphu";
+      break;
+      case 80:
+      name = "Sa Kaeo";
+      break;
     }
   }
   if (strcmp(country_code,"TJ") == 0) {
@@ -12112,22 +12169,19 @@ const char * GeoIP_region_name_by_code(c
   if (strcmp(country_code,"TN") == 0) {
     switch (region_code2) {
       case 2:
-      name = "Al Qasrayn";
+      name = "Kasserine";
       break;
       case 3:
-      name = "Al Qayrawan";
+      name = "Kairouan";
       break;
       case 6:
-      name = "Jundubah";
-      break;
-      case 10:
-      name = "Qafsah";
+      name = "Jendouba";
       break;
       case 14:
-      name = "Kef";
+      name = "El Kef";
       break;
       case 15:
-      name = "Al Mahdiyah";
+      name = "Al Mahdia";
       break;
       case 16:
       name = "Al Munastir";
@@ -12136,58 +12190,52 @@ const char * GeoIP_region_name_by_code(c
       name = "Bajah";
       break;
       case 18:
-      name = "Banzart";
+      name = "Bizerte";
       break;
       case 19:
-      name = "Nabul";
+      name = "Nabeul";
       break;
       case 22:
-      name = "Silyanah";
+      name = "Siliana";
       break;
       case 23:
-      name = "Susah";
+      name = "Sousse";
       break;
       case 26:
-      name = "Chaiyaphum Province";
+      name = "Ariana";
       break;
       case 27:
-      name = "Bin";
+      name = "Ben Arous";
       break;
       case 28:
       name = "Madanin";
       break;
       case 29:
-      name = "Qabis";
+      name = "Gabes";
       break;
       case 30:
-      name = "Qafsah";
+      name = "Gafsa";
       break;
       case 31:
-      name = "Qibili";
+      name = "Kebili";
       break;
       case 32:
-      name = "Safaqis";
+      name = "Sfax";
       break;
       case 33:
-      name = "Sidi Bu Zayd";
+      name = "Sidi Bou Zid";
       break;
       case 34:
-      name = "Tatawin";
+      name = "Tataouine";
       break;
       case 35:
-      name = "Tawzar";
+      name = "Tozeur";
       break;
       case 36:
       name = "Tunis";
       break;
       case 37:
-      name = "Zaghwan";
-      break;
-      case 38:
-      name = "Ariana";
-      break;
-      case 39:
-      name = "Manouba";
+      name = "Zaghouan";
       break;
     }
   }
@@ -13035,6 +13083,9 @@ const char * GeoIP_region_name_by_code(c
       case 5:
       name = "Cao Bang";
       break;
+      case 6:
+      name = "Cuu Long";
+      break;
       case 7:
       name = "Dac Lac";
       break;
@@ -13053,6 +13104,9 @@ const char * GeoIP_region_name_by_code(c
       case 14:
       name = "Ha Nam Ninh";
       break;
+      case 15:
+      name = "Ha Noi";
+      break;
       case 16:
       name = "Ha Son Binh";
       break;
@@ -13377,6 +13431,9 @@ const char * GeoIP_region_name_by_code(c
       case 5:
       name = "Shabwah";
       break;
+      case 6:
+      name = "Al Ghaydah";
+      break;
       case 8:
       name = "Al Hudaydah";
       break;
Only in c/: LICENSE
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: LICENSE.txt
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: Makefile.in
Only in c/man: CVS
Only in c/man: geoiplookup.1
Only in c/man: geoiplookup6.1
Only in c/man: geoipupdate.1
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/man: Makefile.in
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: missing
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/README c/README
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/README	2009-02-24 10:03:24.000000000 -0600
+++ c/README	2009-06-10 07:35:19.000000000 -0500
@@ -182,4 +182,27 @@ from XORG X-Server). It happens at least
 If GEOIP_MMAP_CACHE doesn't work on a 64bit machine, try adding
 the flag "MAP_32BIT" to the mmap call.
 
+If you get a "passing argument 3 of 'gethostbyname_r' from incompatible pointer type"
+error on AIX, download and/or untar a fresh copy of GeoIP.  ( To avoid cached
+results from a previous ./configure run )
+
+cd ./GeoIP-1.4.6
+then edit the file ./configure
+
+and delete these two lines:
+
+#define HAVE_GETHOSTBYNAME_R 1
+
+#define GETHOSTBYNAME_R_RETURNS_INT 1
+
+then save the configure script
+
+and build it as usual
+
+./configure
+make
+sudo make install
+
+
+
 To submit a patch, please contact support at maxmind.com 
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: README.fedora
Only in c/: regioncode
Only in c/test: CVS
Only in c/test: fail_test.txt
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/test: Makefile.in
Only in c/test: proxy_test.txt
Only in c/: timezone


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- GeoIP.spec	24 Jul 2009 15:30:21 -0000	1.19
+++ GeoIP.spec	1 Sep 2009 13:04:09 -0000	1.20
@@ -1,15 +1,17 @@
+%define tarballversion 1.4.6
 Name: GeoIP           
-Version: 1.4.6
-Release: 2%{?dist}
+Version: 1.4.7
+Release: 0.1.20090931cvs%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
-Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
+Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{tarballversion}.tar.gz 
 Source1: LICENSE.txt
 Source2: fetch-geoipdata-city.pl
 Source3: fetch-geoipdata.pl
 Source4: README.Fedora
+Patch0: geoip-1.4.6-ipv6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: geoip < %{version}-%{release}
 Provides: geoip = %{version}-%{release}
@@ -33,7 +35,8 @@ Obsoletes: geoip-devel < %{version}-%{re
 Development headers and static libraries for building GeoIP-based applications
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{tarballversion}
+%patch0 -p1
 install -D -m644 %{SOURCE1} LICENSE.txt
 install -D -m644 %{SOURCE2} fetch-geoipdata-city.pl
 install -D -m644 %{SOURCE3} fetch-geoipdata.pl
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Mon Aug 31 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.4.7.0.1.20090931
+- apply CVS HEAD 20090931 which includes IPv6 functions
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Tue Sep  1 13:05:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 13:05:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 .cvsignore, 1.27,
	1.28 kdebase-workspace.spec, 1.190, 1.191 sources, 1.32, 1.33
Message-ID: <20090901130519.0C7D011C00EF@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-serv13751/F-10

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	19 Aug 2009 16:11:49 -0000	1.27
+++ .cvsignore	1 Sep 2009 13:05:18 -0000	1.28
@@ -1 +1 @@
-kdebase-workspace-4.3.0.tar.bz2
+kdebase-workspace-4.3.1.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- kdebase-workspace.spec	24 Aug 2009 00:34:41 -0000	1.190
+++ kdebase-workspace.spec	1 Sep 2009 13:05:18 -0000	1.191
@@ -1,10 +1,11 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.0
+Version: 4.3.1
 
-Release: 9%{?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
@@ -36,11 +37,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < 4.3.0-100
-Provides:  PolicyKit-kde = %{version}-100
-# This can be used by apps which want to use the PolicyKit
-# frontend implementation of the desktop they are running under
-Provides: PolicyKit-authentication-agent
+Requires: PolicyKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -118,6 +115,10 @@ Requires: leonidas-kde-theme
 %endif
 %endif
 
+%if 0%{?fedora} > 11
+Requires: system-backgrounds-kde
+%endif
+
 Requires: kio_sysinfo
 
 %description
@@ -139,8 +140,7 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Obsoletes: PolicyKit-kde-devel < 4.2.85
-Provides:  PolicyKit-kde-devel = %{version}-%{release}
+Obsoletes: PolicyKit-kde-devel < 4.3.0
 Provides: solid-bluetooth-devel = 4.3-0.1
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -192,6 +192,15 @@ BuildArch: noarch
 %description -n oxygen-cursor-themes
 %{summary}.
 
+%package -n PolicyKit-kde
+Summary: PolicyKit integration for the KDE desktop
+Group: System Environment/Libraries
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
+%description -n PolicyKit-kde
+This package provides a PolicyKit Authentication Frontend for KDE
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -273,6 +282,9 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/f
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
+## unpackaged files
+rm -fv %{buildroot}%{_kde4_libdir}/libpolkitkdeprivate*.so
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -306,6 +318,10 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+%post -n PolicyKit-kde -p /sbin/ldconfig
+
+%postun -n PolicyKit-kde -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -334,7 +350,6 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/polkit-kde-authorization
 %{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
@@ -385,6 +400,7 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -394,6 +410,8 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -401,7 +419,6 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
-%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -412,6 +429,7 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -436,7 +454,6 @@ fi
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
-%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
@@ -461,6 +478,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -496,7 +514,6 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
-
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -523,6 +540,20 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%files -n PolicyKit-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%{_kde4_libexecdir}/polkit-kde-manager
+%{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
+#files -n PolicyKit-kde-libs
+#defattr(-,root,root,-)
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+
 %files python-applet
 %defattr(-,root,root,-)
 %{python_sitearch}/PyKDE4/plasmascript.py*
@@ -538,6 +569,26 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+- drop Requires: kde-plasma-folderview, rely on comps instead
+
+* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.3.0-102
+- Fix typo
+
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-101
+- inflate Release tag, avoiding possible upgrade/obsoletes pain 
+- -devel: drop Provides: PolicyKit-kde-devel, bump Obsoletes
+
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
+- PolicyKit-kde subpkg (#519172, #519654)
+
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-11
+- Requires: system-backgrounds-kde (f12+)
+
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-10
+- Requires: kde-plasma-folderview
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
 - -akonadi: move plasma_engine_calendar here
 - drop Requires: kdm (F-12+)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	5 Aug 2009 00:22:23 -0000	1.32
+++ sources	1 Sep 2009 13:05:18 -0000	1.33
@@ -1 +1 @@
-e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2
+cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 13:05:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 13:05:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore,1.37,1.38
Message-ID: <20090901130519.81D2211C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13751/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	28 Aug 2009 13:03:22 -0000	1.37
+++ .cvsignore	1 Sep 2009 13:05:19 -0000	1.38
@@ -1,2 +1 @@
-kdebase-workspace-4.3.0.tar.bz2
 kdebase-workspace-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 13:05:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 13:05:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 .cvsignore, 1.33,
	1.34 kdebase-workspace.spec, 1.240, 1.241 sources, 1.38, 1.39
Message-ID: <20090901130519.5BA7811C00EF@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13751/F-11

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	19 Aug 2009 16:08:56 -0000	1.33
+++ .cvsignore	1 Sep 2009 13:05:19 -0000	1.34
@@ -1 +1 @@
-kdebase-workspace-4.3.0.tar.bz2
+kdebase-workspace-4.3.1.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- kdebase-workspace.spec	24 Aug 2009 00:35:12 -0000	1.240
+++ kdebase-workspace.spec	1 Sep 2009 13:05:19 -0000	1.241
@@ -1,10 +1,11 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.0
+Version: 4.3.1
 
-Release: 9%{?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
@@ -36,11 +37,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < 4.3.0-100
-Provides:  PolicyKit-kde = %{version}-100
-# This can be used by apps which want to use the PolicyKit
-# frontend implementation of the desktop they are running under
-Provides: PolicyKit-authentication-agent
+Requires: PolicyKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -118,6 +115,10 @@ Requires: leonidas-kde-theme
 %endif
 %endif
 
+%if 0%{?fedora} > 11
+Requires: system-backgrounds-kde
+%endif
+
 Requires: kio_sysinfo
 
 %description
@@ -139,8 +140,7 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Obsoletes: PolicyKit-kde-devel < 4.2.85
-Provides:  PolicyKit-kde-devel = %{version}-%{release}
+Obsoletes: PolicyKit-kde-devel < 4.3.0
 Provides: solid-bluetooth-devel = 4.3-0.1
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -192,6 +192,15 @@ BuildArch: noarch
 %description -n oxygen-cursor-themes
 %{summary}.
 
+%package -n PolicyKit-kde
+Summary: PolicyKit integration for the KDE desktop
+Group: System Environment/Libraries
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
+%description -n PolicyKit-kde
+This package provides a PolicyKit Authentication Frontend for KDE
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -273,6 +282,9 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/f
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
+## unpackaged files
+rm -fv %{buildroot}%{_kde4_libdir}/libpolkitkdeprivate*.so
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -306,6 +318,10 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+%post -n PolicyKit-kde -p /sbin/ldconfig
+
+%postun -n PolicyKit-kde -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -334,7 +350,6 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/polkit-kde-authorization
 %{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
@@ -385,6 +400,7 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -394,6 +410,8 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -401,7 +419,6 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
-%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -412,6 +429,7 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -436,7 +454,6 @@ fi
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
-%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
@@ -461,6 +478,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -496,7 +514,6 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
-
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -523,6 +540,20 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%files -n PolicyKit-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%{_kde4_libexecdir}/polkit-kde-manager
+%{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
+#files -n PolicyKit-kde-libs
+#defattr(-,root,root,-)
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+
 %files python-applet
 %defattr(-,root,root,-)
 %{python_sitearch}/PyKDE4/plasmascript.py*
@@ -538,6 +569,26 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+- drop Requires: kde-plasma-folderview, rely on comps instead
+
+* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.3.0-102
+- Fix typo
+
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-101
+- inflate Release tag, avoiding possible upgrade/obsoletes pain 
+- -devel: drop Provides: PolicyKit-kde-devel, bump Obsoletes
+
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
+- PolicyKit-kde subpkg (#519172, #519654)
+
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-11
+- Requires: system-backgrounds-kde (f12+)
+
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-10
+- Requires: kde-plasma-folderview
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
 - -akonadi: move plasma_engine_calendar here
 - drop Requires: kdm (F-12+)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	5 Aug 2009 00:22:25 -0000	1.38
+++ sources	1 Sep 2009 13:05:19 -0000	1.39
@@ -1 +1 @@
-e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2
+cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2



From mlichvar at fedoraproject.org  Tue Sep  1 13:17:39 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  1 Sep 2009 13:17:39 +0000 (UTC)
Subject: rpms/postfix/devel .cvsignore, 1.33, 1.34 postfix.spec, 1.76,
	1.77 sources, 1.33, 1.34
Message-ID: <20090901131739.3B94411C00EF@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16272

Modified Files:
	.cvsignore postfix.spec sources 
Log Message:
- update to 2.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	18 Jun 2009 15:39:37 -0000	1.33
+++ .cvsignore	1 Sep 2009 13:17:38 -0000	1.34
@@ -1,2 +1,2 @@
 pflogsumm-1.1.1.tar.gz
-postfix-2.6.2.tar.gz
+postfix-2.6.5.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- postfix.spec	21 Aug 2009 15:28:20 -0000	1.76
+++ postfix.spec	1 Sep 2009 13:17:38 -0000	1.77
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.6.2
-Release: 3%{?dist}
+Version: 2.6.5
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -495,6 +495,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.6.5-1
+- update to 2.6.5
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.6.2-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	18 Jun 2009 15:39:37 -0000	1.33
+++ sources	1 Sep 2009 13:17:38 -0000	1.34
@@ -1,2 +1,2 @@
 2f570477b2e205f9dfc1df13f00b5c0d  pflogsumm-1.1.1.tar.gz
-1f0edbd521d2b0473626f4d61e8bb4eb  postfix-2.6.2.tar.gz
+6b954cfb3eb6141dac1e773281211717  postfix-2.6.5.tar.gz



From jpopelka at fedoraproject.org  Tue Sep  1 13:18:22 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue,  1 Sep 2009 13:18:22 +0000 (UTC)
Subject: rpms/net-tools/devel net-tools-1.60-avoid-name-resolution.patch,
	NONE, 1.1 net-tools-1.60-continous-flush-stdout.patch, NONE,
	1.1 net-tools-1.60-debug-fix.patch, NONE,
	1.1 net-tools-1.60-ib-warning.patch, NONE,
	1.1 net-tools-1.60-man-obsolete.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 net-tools.spec, 1.100, 1.101 sources, 1.11, 1.12
Message-ID: <20090901131822.EA44311C00EF@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16544

Modified Files:
	.cvsignore net-tools.spec sources 
Added Files:
	net-tools-1.60-avoid-name-resolution.patch 
	net-tools-1.60-continous-flush-stdout.patch 
	net-tools-1.60-debug-fix.patch net-tools-1.60-ib-warning.patch 
	net-tools-1.60-man-obsolete.patch 
Log Message:
netstat fixes + notes in man pages about obsolete commands + infiniband hw address warning

net-tools-1.60-avoid-name-resolution.patch:
 netstat.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE net-tools-1.60-avoid-name-resolution.patch ---
diff -up net-tools-1.60/netstat.c.avoid-name-resolution net-tools-1.60/netstat.c
--- net-tools-1.60/netstat.c.avoid-name-resolution	2009-08-28 10:48:40.000000000 +0200
+++ net-tools-1.60/netstat.c	2009-08-14 12:36:56.000000000 +0200
@@ -961,6 +961,10 @@ static void tcp_do_one(int lnr, const ch
 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
+    if (!flag_all && 
+         ((flag_lst && rem_port) || (!flag_lst && !rem_port)))
+       return;
+
     if (strlen(local_addr) > 8) {
 #if HAVE_AFINET6
 	/* Demangle what the kernel gives us */
@@ -1014,7 +1018,7 @@ static void tcp_do_one(int lnr, const ch
 					flag_not & FLAG_NUM_HOST), sizeof(local_addr));
     safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag_not & FLAG_NUM_HOST),
 		 sizeof(rem_addr));
-    if (flag_all || (flag_lst && !rem_port) || (!flag_lst && rem_port)) {
+
 	snprintf(buffer, sizeof(buffer), "%s",
 		 get_sname(htons(local_port), "tcp",
 			   flag_not & FLAG_NUM_PORT));
@@ -1075,7 +1079,6 @@ static void tcp_do_one(int lnr, const ch
 	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
 
 	finish_this_one(uid,inode,timers);
-    }
 }
 
 static int tcp_info(void)

net-tools-1.60-continous-flush-stdout.patch:
 netstat.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE net-tools-1.60-continous-flush-stdout.patch ---
diff -up net-tools-1.60/netstat.c.continous-flush-stdout net-tools-1.60/netstat.c
--- net-tools-1.60/netstat.c.continous-flush-stdout	2009-08-28 10:57:12.000000000 +0200
+++ net-tools-1.60/netstat.c	2009-08-28 10:58:48.000000000 +0200
@@ -357,6 +357,12 @@ static void prg_cache_clear(void)
     prg_cache_loaded=0;
 }
 
+static void wait_continous(const int reptimer)
+{
+    fflush(stdout);
+    sleep(reptimer);
+}
+
 static void extract_type_1_socket_inode(const char lname[], unsigned long * inode_p, int * status) {
 
     /* If lname is of the form "socket:[12345]", extract the "12345"
@@ -2289,7 +2295,7 @@ int main
 			     flag_not & FLAG_NUM_PORT, flag_exp);
 	    if (i || !flag_cnt)
 		break;
-	    sleep(reptimer);
+	    wait_continous(reptimer);
 	}
 #else
 	ENOSUPP("netstat.c", "FW_MASQUERADE");
@@ -2305,7 +2311,7 @@ int main
 	
 	if(i || !flag_cnt)
 	  break;
-	sleep(reptimer);
+	wait_continous(reptimer);
       }
       return(i);
     }
@@ -2329,7 +2335,7 @@ int main
 	    i = route_info(afname, options);
 	    if (i || !flag_cnt)
 		break;
-	    sleep(reptimer);
+	    wait_continous(reptimer);
 	}
 	return (i);
     }
@@ -2338,7 +2344,7 @@ int main
 	    i = iface_info();
 	    if (!flag_cnt || i)
 		break;
-	    sleep(reptimer);
+	    wait_continous(reptimer);
 	}
 	return (i);
     }
@@ -2470,7 +2476,7 @@ int main
 	}
 	if (!flag_cnt || i)
 	    break;
-	sleep(reptimer);
+	wait_continous(reptimer);
 	prg_cache_clear();
 	tcp_node_hash_clear();
     }

net-tools-1.60-debug-fix.patch:
 rose.c |    4 ++--
 x25.c  |    9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE net-tools-1.60-debug-fix.patch ---
diff -up net-tools-1.60/lib/rose.c.debug-fix net-tools-1.60/lib/rose.c
--- net-tools-1.60/lib/rose.c.debug-fix	2000-03-05 12:26:03.000000000 +0100
+++ net-tools-1.60/lib/rose.c	2009-09-01 13:02:20.000000000 +0200
@@ -86,7 +86,7 @@ static int ROSE_input(int type, char *bu
     if (strlen(bufp) != 10) {
 	strcpy(ROSE_errmsg, _("Node address must be ten digits"));
 #ifdef DEBUG
-	fprintf(stderr, "rose_input(%s): %s !\n", ROSE_errmsg, orig);
+	fprintf(stderr, "rose_input(%s): %s !\n", bufp, ROSE_errmsg);
 #endif
 	errno = EINVAL;
 	return (-1);
@@ -99,7 +99,7 @@ static int ROSE_input(int type, char *bu
 
     /* All done. */
 #ifdef DEBUG
-    fprintf(stderr, "rose_input(%s): ", orig);
+    fprintf(stderr, "rose_input(%s): ", bufp);
     for (i = 0; i < sizeof(rose_address); i++)
 	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
     fprintf(stderr, "\n");
diff -up net-tools-1.60/lib/x25.c.debug-fix net-tools-1.60/lib/x25.c
--- net-tools-1.60/lib/x25.c.debug-fix	2000-05-20 20:53:25.000000000 +0200
+++ net-tools-1.60/lib/x25.c	2009-09-01 13:06:05.000000000 +0200
@@ -81,6 +81,7 @@ X25_input(int type, char *bufp, struct s
   unsigned char *ptr;
   char *p;
   unsigned int sigdigits;
+  int i;
 
   sap->sa_family = x25_aftype.af;
   ptr = ((struct sockaddr_x25 *)sap)->sx25_addr.x25_addr;
@@ -90,7 +91,7 @@ X25_input(int type, char *bufp, struct s
   if (strlen(bufp)>18) {
         strcpy(X25_errmsg, _("Address can't exceed eighteen digits with sigdigits"));
 #ifdef DEBUG
-        fprintf(stderr, "x25_input(%s): %s !\n", X25_errmsg, orig);
+        fprintf(stderr, "x25_input(%s): %s !\n", bufp, X25_errmsg);
 #endif
         errno = EINVAL;
         return(-1);
@@ -108,7 +109,7 @@ X25_input(int type, char *bufp, struct s
 	*p = '/';
         strcpy(X25_errmsg, _("Invalid address"));
 #ifdef DEBUG
-        fprintf(stderr, "x25_input(%s): %s !\n", X25_errmsg, orig);
+        fprintf(stderr, "x25_input(%s): %s !\n", bufp, X25_errmsg);
 #endif
         errno = EINVAL;
         return(-1);
@@ -118,8 +119,8 @@ X25_input(int type, char *bufp, struct s
 
   /* All done. */
 #ifdef DEBUG
-  fprintf(stderr, "x25_input(%s): ", orig);
-  for (i = 0; i < sizeof(x25_address); i++)
+  fprintf(stderr, "x25_input(%s): ", bufp);
+  for (i = 0; i < sizeof(sap->sa_data); i++)
 	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
   fprintf(stderr, "\n");
 #endif

net-tools-1.60-ib-warning.patch:
 ib.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE net-tools-1.60-ib-warning.patch ---
diff -up net-tools-1.60/lib/ib.c.ib-warning net-tools-1.60/lib/ib.c
--- net-tools-1.60/lib/ib.c.ib-warning	2009-09-01 13:45:55.000000000 +0200
+++ net-tools-1.60/lib/ib.c	2009-09-01 13:47:43.000000000 +0200
@@ -48,7 +48,10 @@ static char *pr_ib(unsigned char *ptr)
 	pos += sprintf(pos, "%02X:", (*ptr++ & 0377));
     }
     buff[strlen(buff) - 1] = '\0';
-
+    char *ib_warning = "Ifconfig uses the ioctl access method to get the full address information, which limits hardware addresses to 8 bytes.\n"
+                       "Because Infiniband address has 20 bytes, only the first 8 bytes are displayed correctly.\n"
+                       "Ifconfig is obsolete! For replacement check ip.\n";
+    fprintf(stderr, _(ib_warning));
     /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)

net-tools-1.60-man-obsolete.patch:
 arp.8      |   13 ++++++++++++-
 ethers.5   |    7 ++++---
 ifconfig.8 |   23 ++++++++++++++++++++++-
 nameif.8   |   12 ++++++++++++
 netstat.8  |   16 +++++++++++-----
 route.8    |   12 +++++++++++-
 6 files changed, 72 insertions(+), 11 deletions(-)

--- NEW FILE net-tools-1.60-man-obsolete.patch ---
diff -up net-tools-1.60/man/en_US/arp.8.man-obsolete net-tools-1.60/man/en_US/arp.8
--- net-tools-1.60/man/en_US/arp.8.man-obsolete	2009-09-01 11:28:22.000000000 +0200
+++ net-tools-1.60/man/en_US/arp.8	2009-09-01 11:28:22.000000000 +0200
@@ -1,6 +1,8 @@
 .TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
+
 .SH NAME
 arp \- manipulate the system ARP cache
+
 .SH SYNOPSIS
 .B arp 
 .RB [ \-evn ] 
@@ -44,6 +46,10 @@ arp \- manipulate the system ARP cache
 .RB [ "-i if" ]
 .B -f [filename]
 
+.SH NOTE
+.P 
+This program is obsolete. For replacement check \fBip neighbor\fR.
+
 .SH DESCRIPTION
 .B Arp
 manipulates the kernel's ARP cache in various ways.  The primary options
@@ -51,6 +57,7 @@ are clearing an address mapping entry an
 debugging purposes, the
 .B arp
 program also allows a complete dump of the ARP cache.
+
 .SH OPTIONS
 .TP
 .B "\-v, \-\-verbose"
@@ -107,6 +114,7 @@ table. For
 entries the specified interface is the interface on which ARP requests will
 be answered. 
 .br
+
 .B NOTE:
 This has to be different from the interface to which the IP
 datagrams will be routed.
@@ -171,6 +179,7 @@ flag. Permanent entries are marked with
 and published entries have the
 .B P
 flag.
+
 .SH FILES
 .I /proc/net/arp,
 .br
@@ -179,8 +188,10 @@ flag.
 .I /etc/hosts
 .br
 .I /etc/ethers
+
 .SH SEE ALSO
-rarp(8), route(8), ifconfig(8), netstat(8)
+ip(8)
+
 .SH AUTHORS
 Fred N. van Kempen, <waltje at uwalt.nl.mugnet.org> with a lot of improvements
 from net-tools Maintainer Bernd Eckenfels <net-tools at lina.inka.de>.
diff -up net-tools-1.60/man/en_US/ethers.5.man-obsolete net-tools-1.60/man/en_US/ethers.5
--- net-tools-1.60/man/en_US/ethers.5.man-obsolete	1999-01-09 16:55:31.000000000 +0100
+++ net-tools-1.60/man/en_US/ethers.5	2009-09-01 11:28:22.000000000 +0200
@@ -1,7 +1,9 @@
 .TH ETHERS 5 "April 26th, 1996" "" "File formats"
+
 .SH NAME \"{{{roff}}}\"{{{
 ethers \- Ethernet address to IP number database
 .\"}}}
+
 .SH DESCRIPTION \"{{{
 \fB/etc/ethers\fP contains 48 bit Ethernet addresses and their corresponding
 IP numbers, one line for each IP number:
@@ -20,12 +22,11 @@ which represents one byte of the address
 order (big-endian).  The \fIIP-number\fP may be a hostname which
 can be resolved by DNS or a dot separated number.
 .\"}}}
+
 .SH EXAMPLES \"{{{
 08:00:20:00:61:CA  pal
 .\"}}}
+
 .SH FILES \"{{{
 /etc/ethers
 .\"}}}
-.SH "SEE ALSO" \"{{{
-rarp(8)
-.\"}}}
diff -up net-tools-1.60/man/en_US/ifconfig.8.man-obsolete net-tools-1.60/man/en_US/ifconfig.8
--- net-tools-1.60/man/en_US/ifconfig.8.man-obsolete	2009-09-01 11:28:22.000000000 +0200
+++ net-tools-1.60/man/en_US/ifconfig.8	2009-09-01 11:28:22.000000000 +0200
@@ -1,10 +1,19 @@
 .TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
+
 .SH NAME
 ifconfig \- configure a network interface
+
 .SH SYNOPSIS
 .B "ifconfig [interface]"
 .br
 .B "ifconfig interface [aftype] options | address ..."
+
+.SH NOTE
+.P 
+This program is obsolete!
+For replacement check \fBip addr\fR and \fBip link\fR.
+For statistics use \fBip -s link\fR.
+
 .SH DESCRIPTION
 .B Ifconfig
 is used to configure the kernel-resident network interfaces.  It is
@@ -44,6 +53,7 @@ octal, or hexadecimal, as specified in t
 or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise,
 the number is interpreted as decimal). Use of hexamedial and octal numbers
 is not RFC-compliant and therefore its use is discouraged and may go away.
+
 .SH OPTIONS
 .TP
 .B interface
@@ -172,6 +182,7 @@ Set the length of the transmit queue of 
 to small values for slower devices with a high latency (modem links, ISDN)
 to prevent fast bulk transfers from disturbing interactive traffic like
 telnet too much. 
+
 .SH NOTES
 Since kernel release 2.2 there are no explicit interface statistics for
 alias interfaces anymore. The statistics printed for the original address
@@ -184,17 +195,27 @@ command.
 Interrupt problems with Ethernet device drivers fail with EAGAIN. See
 .I http://www.scyld.com/expert/irq-conflict.html
 for more information.
+
 .SH FILES
 .I /proc/net/socket 
 .br
 .I /proc/net/dev
 .br
 .I /proc/net/if_inet6
+
 .SH BUGS
+Ifconfig uses obsolete kernel interface.
+It uses the ioctl access method to get the full address information,
+which limits hardware addresses to 8 bytes.
+Since an Infiniband address is 20 bytes,
+only the first 8 bytes of Infiniband address are displayed.
+.LP
 While appletalk DDP and IPX addresses will be displayed they cannot be
 altered by this command.
+
 .SH SEE ALSO
-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+ip(8)
+
 .SH AUTHORS
 Fred N. van Kempen, <waltje at uwalt.nl.mugnet.org>
 .br
diff -up net-tools-1.60/man/en_US/nameif.8.man-obsolete net-tools-1.60/man/en_US/nameif.8
--- net-tools-1.60/man/en_US/nameif.8.man-obsolete	2000-10-18 19:26:29.000000000 +0200
+++ net-tools-1.60/man/en_US/nameif.8	2009-09-01 12:15:24.000000000 +0200
@@ -1,10 +1,18 @@
 .TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual"
+
 .SH NAME
 nameif \- name network interfaces based on MAC addresses
+
 .SH SYNOPSIS
 .B "nameif [-c configfile] [-s]"
 .br
 .B "nameif [-c configfile] [-s] {interface macaddress}"
+
+.SH NOTE
+.P 
+This program is obsolete. For replacement check \fBip link\fR.
+This functionality is also much better provided by udev methods.
+
 .SH DESCRIPTION
 .B nameif 
 renames network interfaces based on mac addresses. When no arguments are
@@ -31,5 +39,9 @@ should be run before the interface is up
 
 .SH FILES
 /etc/mactab
+
+.SH SEE ALSO
+ip(8), udev(7)
+
 .SH BUGS
 Only works for Ethernet currently.
diff -up net-tools-1.60/man/en_US/netstat.8.man-obsolete net-tools-1.60/man/en_US/netstat.8
--- net-tools-1.60/man/en_US/netstat.8.man-obsolete	2009-09-01 11:28:22.000000000 +0200
+++ net-tools-1.60/man/en_US/netstat.8	2009-09-01 11:28:22.000000000 +0200
@@ -92,6 +92,14 @@ netstat \- Print network connections, ro
 .RB [ \-\-netrom ]
 .RB [ \-\-ddp ]
 
+.SH NOTE
+.P 
+This program is obsolete.
+Replacement for \fBnetstat\fR is \fBss\fR.
+Replacement for \fBnetstat -r\fR is \fBip route\fR.
+Replacement for \fBnetstat -i\fR is \fBip -s link\fR.
+Replacement for \fBnetstat -g\fR is \fBip maddr\fR.
+
 .SH DESCRIPTION
 .B Netstat
 prints information about the Linux networking subsystem.  The type of
@@ -438,13 +446,11 @@ status information via the following fil
 -- statistics
 .fi
 .P
+
 .SH SEE ALSO
-.BR route (8), 
-.BR ifconfig (8), 
-.BR ipchains (8),
-.BR iptables (8),
-.BR proc (5)
+.BR ss (8), ip(8)
 .P
+
 .SH BUGS
 Occasionally strange information may appear if a socket changes
 as it is viewed. This is unlikely to occur.
diff -up net-tools-1.60/man/en_US/route.8.man-obsolete net-tools-1.60/man/en_US/route.8
--- net-tools-1.60/man/en_US/route.8.man-obsolete	2000-05-21 20:59:03.000000000 +0200
+++ net-tools-1.60/man/en_US/route.8	2009-09-01 11:28:22.000000000 +0200
@@ -1,6 +1,8 @@
 .TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
+
 .SH NAME
 route \- show / manipulate the IP routing table
+
 .SH SYNOPSIS
 .B route
 .RB [ \-CFvnee ]
@@ -52,6 +54,11 @@ If]
 .RB [ \-\-version ]
 .RB [ \-h ]
 .RB [ \--help ]
+
+.SH NOTE
+.P 
+This program is obsolete. For replacement check \fBip route\fR.
+
 .SH DESCRIPTION
 .B Route
 manipulates the kernel's IP routing tables.  Its primary use is to set
@@ -306,6 +313,7 @@ address is not needed for the interface 
 .B Arp (cached only)
 Whether or not the hardware address for the cached route is up to date.
 .LP
+
 .SH FILES
 .I /proc/net/ipv6_route
 .br
@@ -313,9 +321,11 @@ Whether or not the hardware address for 
 .br
 .I /proc/net/rt_cache
 .LP
+
 .SH SEE ALSO
-.I ifconfig(8), netstat(8), arp(8), rarp(8)
+.I ip(8)
 .LP
+
 .SH HISTORY
 .B Route
 for Linux was originally written by Fred N.  van Kempen,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Jun 2005 08:44:46 -0000	1.11
+++ .cvsignore	1 Sep 2009 13:18:22 -0000	1.12
@@ -1 +1,3 @@
 ether-wake.8
+ipmaddr.8
+iptunnel.8


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- net-tools.spec	25 Jul 2009 17:59:56 -0000	1.100
+++ net-tools.spec	1 Sep 2009 13:18:22 -0000	1.101
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 94%{?dist}
+Release: 95%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -15,6 +15,8 @@ Source4: ether-wake.c
 Source5: ether-wake.8
 Source6: mii-diag.c
 Source7: mii-diag.8
+Source8: iptunnel.8
+Source9: ipmaddr.8
 Patch1: net-tools-1.57-bug22040.patch
 Patch2: net-tools-1.60-miiioctl.patch
 Patch3: net-tools-1.60-manydevs.patch
@@ -82,9 +84,25 @@ Patch68: net-tools-1.60-a-option.patch
 Patch69: net-tools-1.60-clear-flag.patch
 Patch70: net-tools-1.60-metric-tunnel-man.patch
 Patch71: net-tools-1.60-netstat-probe.patch
+
+# scanf format length fix (non-exploitable)
 Patch72: net-tools-1.60-scanf-format.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# netstat - avoid name resolution for listening or established sockets (-l) by return fast
+Patch73: net-tools-1.60-avoid-name-resolution.patch
+
+# netstat - --continuous should flush stdout
+Patch74: net-tools-1.60-continous-flush-stdout.patch
+
+# fix some errors so net-tools can be build with DEBUG defined
+Patch75: net-tools-1.60-debug-fix.patch
+
+# let the user know that ifconfig can correctly show only first 8 bytes of Infiniband hw address
+Patch76: net-tools-1.60-ib-warning.patch
+
+# notes in man pages, saying that these tools are obsolete
+Patch77: net-tools-1.60-man-obsolete.patch
+
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -93,8 +111,9 @@ BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
 
 %description
-The net-tools package contains basic networking tools, including
-ifconfig, netstat, route, and others.
+The net-tools package contains basic networking tools,
+including ifconfig, netstat, route, and others.
+Most of them are obsolete. For replacement check iproute package.
 
 %prep
 %setup -q -a 1
@@ -166,6 +185,11 @@ ifconfig, netstat, route, and others.
 %patch70 -p1 -b .metric-tunnel-man
 %patch71 -p1 -b .probe
 %patch72 -p1 -b .scanf-format
+%patch73 -p1 -b .avoid-name-resolution
+%patch74 -p1 -b .continous-flush-stdout
+%patch75 -p1 -b .debug-fix
+%patch76 -p1 -b .ib-warning
+%patch77 -p1 -b .man-obsolete
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -173,6 +197,8 @@ cp %SOURCE4 .
 cp %SOURCE5 ./man/en_US
 cp %SOURCE6 .
 cp %SOURCE7 ./man/en_US
+cp %SOURCE8 ./man/en_US
+cp %SOURCE9 ./man/en_US
 
 %ifarch alpha
 perl -pi -e "s|-O2||" Makefile
@@ -218,24 +244,28 @@ make
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 mv man/de_DE man/de
 mv man/fr_FR man/fr
 mv man/pt_BR man/pt
 
-make BASEDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
+make BASEDIR=%{buildroot} mandir=%{_mandir} install
 
 install -m 755 ether-wake %{buildroot}/sbin
 install -m 755 mii-diag %{buildroot}/sbin
 
 pushd netplug-%{npversion}
-make install prefix=$RPM_BUILD_ROOT \
-	initdir=$RPM_BUILD_ROOT/%{_initrddir} \
-	mandir=$RPM_BUILD_ROOT/%{_mandir}
+make install prefix=%{buildroot} \
+	initdir=%{buildroot}/%{_initrddir} \
+	mandir=%{buildroot}/%{_mandir}
 mv README README.netplugd
 mv TODO TODO.netplugd
 popd
 
+ln -s %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplug.5.gz
+ln -s %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplug.d.5.gz
+ln -s %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplugd.conf.5.gz
+
 rm %{buildroot}/sbin/rarp
 rm %{buildroot}%{_mandir}/man8/rarp.8*
 rm %{buildroot}%{_mandir}/de/man8/rarp.8*
@@ -248,7 +278,7 @@ echo "# see man ethers for syntax" > %{b
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
   /sbin/chkconfig --add netplugd
@@ -281,6 +311,13 @@ exit 0
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Tue Sep 1 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-95
+- netstat - avoid name resolution for listening or established sockets (-l) by return fast. 
+- netstat - --continuous should flush stdout
+- added missing man pages (iptunnel, ipmaddr, netplug, netplug.d, netplugd.conf)
+- added note about obsolete commands to existing man pages 
+- let the user know that ifconfig can correctly show only first 8 bytes of Infiniband hw address
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-94
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Jun 2005 08:44:46 -0000	1.11
+++ sources	1 Sep 2009 13:18:22 -0000	1.12
@@ -4,4 +4,5 @@
 8c6ac053fcab98a3fce2181e7da878ea  mii-diag.8
 15fe21b9cac19a79649c41fa7919e888  ether-wake.c
 d765b596b9e930bf22c226b99080b420  ether-wake.8
-
+32b749f457e19c5aea3a80ee8ee7f892  ipmaddr.8
+2ab05121ef65bed64dc323a59c6f9e6f  iptunnel.8



From jkratoch at fedoraproject.org  Tue Sep  1 13:19:03 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue,  1 Sep 2009 13:19:03 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch, 1.26,
	1.27 gdb-bz515434-qsort_cmp.patch, 1.2, 1.3 gdb.spec, 1.380, 1.381
Message-ID: <20090901131903.E897C11C00EF@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16655

Modified Files:
	gdb-archer.patch gdb-bz515434-qsort_cmp.patch gdb.spec 
Log Message:
* Tue Sep  1 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-7
- archer-jankratochvil-fedora12 commit: d25596676e8811b03f8c9aba6bbd04ebaa9ff5db
  - [call-frame-cfa] Fix parsing CFA-relative frames (BZ 516627, Tom Tromey).
  - [vla] variable length Fortran strings for -O -g code (part of BZ 508406, me).
  - [python] varobj + general fixes (Tom Tromey).


gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  137 -
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 +-
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  245 +
 cp-support.c                                             |   88 
 cp-support.h                                             |   49 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 +++-
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   30 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  368 ++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1863 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |   19 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 ++++
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infrun.c                                                 |    8 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  170 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 +++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 ++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 ++
 python/python-symtab.c                                   |  322 ++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |   67 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   42 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/solib-overlap-lib.c                   |   27 
 testsuite/gdb.base/solib-overlap-main.c                  |   25 
 testsuite/gdb.base/solib-overlap.exp                     |  139 +
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   30 
 testsuite/gdb.cp/namespace-recursive.exp                 |   66 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/callframecfa.S                      |  309 ++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-break.exp                            |    2 
 testsuite/gdb.mi/mi-var-block.exp                        |    2 
 testsuite/gdb.mi/mi-var-child.exp                        |   30 
 testsuite/gdb.mi/mi-var-cmd.exp                          |   38 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-block.exp                       |    2 
 testsuite/gdb.mi/mi2-var-child.exp                       |   30 
 testsuite/gdb.mi/mi2-var-cmd.exp                         |   28 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |  116 
 testsuite/gdb.python/python-prettyprint.c                |   16 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 ++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |  100 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  254 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |  735 ++++-
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 255 files changed, 18838 insertions(+), 2756 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.26 -r 1.27 gdb-archer.patchIndex: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gdb-archer.patch	19 Aug 2009 16:19:15 -0000	1.26
+++ gdb-archer.patch	1 Sep 2009 13:19:03 -0000	1.27
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 2ba2bc451eb832182ef84c3934115de7a329da7c
+commit d25596676e8811b03f8c9aba6bbd04ebaa9ff5db
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -3458,7 +3458,7 @@ index 4984f31..fcf1b5d 100644
  This observer is used for internal testing.  Do not use.  
  See testsuite/gdb.gdb/observer.exp.
 diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
-index 427f58f..fc70309 100644
+index 427f58f..392a1b4 100644
 --- a/gdb/dwarf2-frame.c
 +++ b/gdb/dwarf2-frame.c
 @@ -38,6 +38,7 @@
@@ -3501,7 +3501,7 @@ index 427f58f..fc70309 100644
  
    do_cleanups (old_chain);
  
-@@ -1250,6 +1260,14 @@ dwarf2_frame_base_sniffer (struct frame_info *this_frame)
+@@ -1250,6 +1260,16 @@ dwarf2_frame_base_sniffer (struct frame_info *this_frame)
  
    return NULL;
  }
@@ -3509,6 +3509,8 @@ index 427f58f..fc70309 100644
 +CORE_ADDR
 +dwarf2_frame_cfa (struct frame_info *this_frame)
 +{
++  while (get_frame_type (this_frame) == INLINE_FRAME)
++    this_frame = get_prev_frame (this_frame);
 +  if (! frame_unwinder_is (this_frame, &dwarf2_frame_unwind))
 +    error (_("can't compute CFA for this frame"));
 +  return get_frame_base (this_frame);
@@ -3516,7 +3518,7 @@ index 427f58f..fc70309 100644
  

  const struct objfile_data *dwarf2_frame_objfile_data;
  
-@@ -1539,6 +1557,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
+@@ -1539,6 +1559,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
        CORE_ADDR offset;
        CORE_ADDR seek_pc;
  
@@ -3834,7 +3836,7 @@ index 2306e49..597c2de 100644
    /* The length of the piece, in bytes.  */
    ULONGEST size;
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 1df6a9f..c101371 100644
+index 1df6a9f..939f7a2 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
 @@ -36,6 +36,7 @@
@@ -3875,7 +3877,7 @@ index 1df6a9f..c101371 100644
 +      gdb_assert (symbaton != NULL);
 +      *start = symbaton->data;
 +      *length = symbaton->size;
-+    }
+     }
 +  else if (SYMBOL_COMPUTED_OPS (framefunc) == &dwarf2_missing_funcs)
 +    {
 +      struct dwarf2_locexpr_baton *symbaton;
@@ -3884,7 +3886,7 @@ index 1df6a9f..c101371 100644
 +      gdb_assert (symbaton == NULL);
 +      *start = NULL;
 +      *length = 0;	/* unused */
-     }
++    }
 +  else
 +    internal_error (__FILE__, __LINE__,
 +		    _("Unsupported SYMBOL_COMPUTED_OPS %p for \"%s\""),
@@ -3905,7 +3907,7 @@ index 1df6a9f..c101371 100644
  }
  
  /* Using the objfile specified in BATON, find the address for the
-@@ -204,6 +226,118 @@ dwarf_expr_tls_address (void *baton, CORE_ADDR offset)
+@@ -204,6 +226,129 @@ dwarf_expr_tls_address (void *baton, CORE_ADDR offset)
    return target_translate_tls_address (debaton->objfile, offset);
  }
  
@@ -4016,6 +4018,17 @@ index 1df6a9f..c101371 100644
 +
 +  retval = dwarf_expr_fetch (ctx, 0);
 +
++  if (ctx->location == DWARF_VALUE_REGISTER)
++    {
++      /* Inlined dwarf_expr_read_reg as we no longer have the baton. */
++
++      int gdb_regnum = gdbarch_dwarf2_reg_to_regnum (ctx->gdbarch, retval);
++      struct type *type = builtin_type (ctx->gdbarch)->builtin_data_ptr;
++      struct frame_info *frame = get_selected_frame (NULL);
++
++      retval = address_from_register (type, gdb_regnum, frame);
++    }
++
 +  do_cleanups (back_to);
 +
 +  return retval;
@@ -4024,7 +4037,7 @@ index 1df6a9f..c101371 100644
  /* Evaluate a location description, starting at DATA and with length
     SIZE, to find the current location of variable VAR in the context
     of FRAME.  */
-@@ -213,9 +347,8 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
+@@ -213,9 +358,8 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
  			  struct dwarf2_per_cu_data *per_cu)
  {
    struct value *retval;
@@ -4035,7 +4048,7 @@ index 1df6a9f..c101371 100644
  
    if (size == 0)
      {
-@@ -225,21 +358,8 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
+@@ -225,21 +369,8 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
        return retval;
      }
  
@@ -4044,7 +4057,8 @@ index 1df6a9f..c101371 100644
 -
 -  ctx = new_dwarf_expr_context ();
 -  old_chain = make_cleanup_free_dwarf_expr_context (ctx);
--
++  ctx = dwarf_expr_prep_ctx (frame, data, size, per_cu);
+ 
 -  ctx->gdbarch = get_objfile_arch (baton.objfile);
 -  ctx->addr_size = dwarf2_per_cu_addr_size (per_cu);
 -  ctx->baton = &baton;
@@ -4052,13 +4066,12 @@ index 1df6a9f..c101371 100644
 -  ctx->read_mem = dwarf_expr_read_mem;
 -  ctx->get_frame_base = dwarf_expr_frame_base;
 -  ctx->get_tls_address = dwarf_expr_tls_address;
-+  ctx = dwarf_expr_prep_ctx (frame, data, size, per_cu);
- 
+-
 -  dwarf_expr_eval (ctx, data, size);
    if (ctx->num_pieces > 0)
      {
        int i;
-@@ -251,36 +371,115 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
+@@ -251,36 +382,115 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
        for (i = 0; i < ctx->num_pieces; i++)
  	{
  	  struct dwarf_expr_piece *p = &ctx->pieces[i];
@@ -4197,7 +4210,7 @@ index 1df6a9f..c101371 100644
      }
  
    set_value_initialized (retval, ctx->initialized);
-@@ -330,6 +529,15 @@ needs_frame_frame_base (void *baton, gdb_byte **start, size_t * length)
+@@ -330,6 +540,15 @@ needs_frame_frame_base (void *baton, gdb_byte **start, size_t * length)
    nf_baton->needs_frame = 1;
  }
  
@@ -4213,7 +4226,7 @@ index 1df6a9f..c101371 100644
  /* Thread-local accesses do require a frame.  */
  static CORE_ADDR
  needs_frame_tls_address (void *baton, CORE_ADDR offset)
-@@ -362,11 +570,12 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
+@@ -362,11 +581,12 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
    ctx->read_reg = needs_frame_read_reg;
    ctx->read_mem = needs_frame_read_mem;
    ctx->get_frame_base = needs_frame_frame_base;
@@ -4227,7 +4240,7 @@ index 1df6a9f..c101371 100644
  
    if (ctx->num_pieces > 0)
      {
-@@ -375,7 +584,7 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
+@@ -375,7 +595,7 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
        /* If the location has several pieces, and any of them are in
           registers, then we will need a frame to fetch them from.  */
        for (i = 0; i < ctx->num_pieces; i++)
@@ -4236,7 +4249,7 @@ index 1df6a9f..c101371 100644
            in_reg = 1;
      }
  
-@@ -607,7 +816,7 @@ static int
+@@ -607,7 +827,7 @@ static int
  loclist_describe_location (struct symbol *symbol, struct ui_file *stream)
  {
    /* FIXME: Could print the entire list of locations.  */
@@ -4245,7 +4258,7 @@ index 1df6a9f..c101371 100644
    return 1;
  }
  
-@@ -623,16 +832,56 @@ loclist_tracepoint_var_ref (struct symbol *symbol, struct gdbarch *gdbarch,
+@@ -623,16 +843,56 @@ loclist_tracepoint_var_ref (struct symbol *symbol, struct gdbarch *gdbarch,
  
    data = find_location_expression (dlbaton, &size, ax->scope);
    if (data == NULL)
@@ -4322,7 +4335,7 @@ index 0bfcfca..01018d6 100644
  
  #endif /* dwarf2loc.h */
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
[...2061 lines suppressed...]
- 	 UI, so we need not bother getting it.  */
+@@ -1530,44 +1738,60 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+ 
+       /* We probably should not get children of a varobj that has a
+ 	 pretty-printer, but for which -var-list-children was never
+-	 invoked.  Presumably, such varobj is not yet expanded in the
+-	 UI, so we need not bother getting it.  */
++	 invoked.    */
        if (v->pretty_printer)
  	{
 -	  VEC (varobj_p) *changed = 0, *new_and_unchanged = 0;
@@ -28807,8 +29902,32 @@ index fbe8ff8..1bfc5e4 100644
  	  int i, children_changed;
  	  varobj_p tmp;
  
-@@ -1546,28 +1729,28 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+-	  if (!v->children_requested)
+-	    continue;
+-
+ 	  if (v->frozen)
+ 	    continue;
  
++	  if (!v->children_requested)
++	    {
++	      int dummy;
++
++	      /* If we initially did not have potential children, but
++		 now we do, consider the varobj as changed.
++		 Otherwise, if children were never requested, consider
++		 it as unchanged -- presumably, such varobj is not yet
++		 expanded in the UI, so we need not bother getting
++		 it.  */
++	      if (varobj_has_more (v, 0))
++		continue;
++
++	      update_dynamic_varobj_children (v, NULL, NULL, &dummy, 0, 0);
++	      if (varobj_has_more (v, 0))
++		VEC_safe_push (varobj_update_result, result, &r);
++
++	      continue;
++	    }
++
  	  /* If update_dynamic_varobj_children returns 0, then we have
  	     a non-conforming pretty-printer, so we skip it.  */
 -	  if (update_dynamic_varobj_children (v, &changed, &new_and_unchanged,
@@ -28848,7 +29967,7 @@ index fbe8ff8..1bfc5e4 100644
  	      continue;
  	    }
  	}
-@@ -1855,7 +2038,12 @@ new_variable (void)
+@@ -1855,7 +2079,12 @@ new_variable (void)
    var->frozen = 0;
    var->not_fetched = 0;
    var->children_requested = 0;
@@ -28861,7 +29980,7 @@ index fbe8ff8..1bfc5e4 100644
  
    return var;
  }
-@@ -1885,7 +2073,10 @@ free_variable (struct varobj *var)
+@@ -1885,7 +2114,10 @@ free_variable (struct varobj *var)
    if (var->pretty_printer)
      {
        struct cleanup *cleanup = varobj_ensure_python_env (var);
@@ -28873,7 +29992,7 @@ index fbe8ff8..1bfc5e4 100644
        do_cleanups (cleanup);
      }
  #endif
-@@ -1918,6 +2109,18 @@ make_cleanup_free_variable (struct varobj *var)
+@@ -1918,6 +2150,18 @@ make_cleanup_free_variable (struct varobj *var)
    return make_cleanup (do_free_variable_cleanup, var);
  }
  
@@ -28892,7 +30011,7 @@ index fbe8ff8..1bfc5e4 100644
  /* This returns the type of the variable. It also skips past typedefs
     to return the real type of the variable.
  
-@@ -2132,6 +2335,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
+@@ -2132,6 +2376,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
        else
  	{
  	  tmp_var->obj_name = xstrdup (var->obj_name);
@@ -28901,7 +30020,7 @@ index fbe8ff8..1bfc5e4 100644
  	  varobj_delete (var, NULL, 0);
  
  	  install_variable (tmp_var);
-@@ -2166,7 +2371,11 @@ static char *
+@@ -2166,7 +2412,11 @@ static char *
  my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
  {
    if (var->root->is_valid)
@@ -28914,7 +30033,90 @@ index fbe8ff8..1bfc5e4 100644
    else
      return NULL;
  }
-@@ -2954,10 +3163,7 @@ cplus_describe_child (struct varobj *parent, int index,
+@@ -2189,43 +2439,51 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
+     struct cleanup *back_to = varobj_ensure_python_env (var);
+     PyObject *value_formatter = var->pretty_printer;
+ 
+-    if (value_formatter && PyObject_HasAttr (value_formatter,
+-					     gdbpy_to_string_cst))
++    if (value_formatter)
+       {
+-	char *hint;
+-	struct value *replacement;
+-	int string_print = 0;
+-	PyObject *output = NULL;
++	/* First check to see if we have any children at all.  If so,
++	   we simply return {...}.  */
++	if (dynamic_varobj_has_child_method (var))
++	  return xstrdup ("{...}");
+ 
+-	hint = gdbpy_get_display_hint (value_formatter);
+-	if (hint)
++	if (PyObject_HasAttr (value_formatter, gdbpy_to_string_cst))
+ 	  {
+-	    if (!strcmp (hint, "string"))
+-	      string_print = 1;
+-	    xfree (hint);
+-	  }
++	    char *hint;
++	    struct value *replacement;
++	    int string_print = 0;
++	    PyObject *output = NULL;
++
++	    hint = gdbpy_get_display_hint (value_formatter);
++	    if (hint)
++	      {
++		if (!strcmp (hint, "string"))
++		  string_print = 1;
++		xfree (hint);
++	      }
+ 
+-	output = apply_varobj_pretty_printer (value_formatter,
+-					      &replacement);
+- 	if (output)
+-  	  {
+- 	    PyObject *py_str = python_string_to_target_python_string (output);
+- 	    if (py_str)
+- 	      {
+- 		char *s = PyString_AsString (py_str);
+- 		len = PyString_Size (py_str);
+-		thevalue = xmemdup (s, len + 1, len + 1);
+- 		Py_DECREF (py_str);
++	    output = apply_varobj_pretty_printer (value_formatter,
++						  &replacement);
++	    if (output)
++	      {
++		PyObject *py_str
++		  = python_string_to_target_python_string (output);
++		if (py_str)
++		  {
++		    char *s = PyString_AsString (py_str);
++		    len = PyString_Size (py_str);
++		    thevalue = xmemdup (s, len + 1, len + 1);
++		    Py_DECREF (py_str);
++		  }
++		Py_DECREF (output);
+ 	      }
+- 	    Py_DECREF (output);
+-	  }
+-	if (thevalue && !string_print)
+-	  {
+-	    do_cleanups (back_to);
+-	    return thevalue;
++	    if (thevalue && !string_print)
++	      {
++		do_cleanups (back_to);
++		return thevalue;
++	      }
++	    if (replacement)
++	      value = replacement;
+ 	  }
+-	if (replacement)
+-	  value = replacement;
+       }
+     do_cleanups (back_to);
+   }
+@@ -2954,10 +3212,7 @@ cplus_describe_child (struct varobj *parent, int index,
  	    *cname = xstrdup (TYPE_FIELD_NAME (type, index));
  
  	  if (cvalue && value)
@@ -28926,7 +30128,7 @@ index fbe8ff8..1bfc5e4 100644
  
  	  if (ctype)
  	    {
-@@ -3163,6 +3369,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+@@ -3163,6 +3418,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -28946,7 +30148,7 @@ index fbe8ff8..1bfc5e4 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3180,6 +3399,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3180,6 +3448,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }

gdb-bz515434-qsort_cmp.patch:
 objfiles.c |  187 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 137 insertions(+), 50 deletions(-)

Index: gdb-bz515434-qsort_cmp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-bz515434-qsort_cmp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-bz515434-qsort_cmp.patch	28 Aug 2009 18:24:06 -0000	1.2
+++ gdb-bz515434-qsort_cmp.patch	1 Sep 2009 13:19:03 -0000	1.3
@@ -227,205 +227,3 @@ diff -p -u -r1.93 objfiles.c
  
    *pmap = map;
    *pmap_size = map_size;
-
-2009-08-25  Jan Kratochvil  <jan.kratochvil at redhat.com>
-
-	* gdb.base/solib-overlap.exp, gdb.base/solib-overlap-lib.c,
-	gdb.base/solib-overlap-main.c: New.
-
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/solib-overlap-lib.c
-@@ -0,0 +1,27 @@
-+/* Copyright 2009 Free Software Foundation, Inc.
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+   Contributed by Jan Kratochvil <jan.kratochvil at redhat.com>.  */
-+
-+void
-+libsym (void)
-+{
-+}
-+
-+#ifdef SYMB
-+void
-+libsymb (void)
-+{
-+}
-+#endif
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/solib-overlap-main.c
-@@ -0,0 +1,25 @@
-+/* Copyright 2009 Free Software Foundation, Inc.
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+   Contributed by Jan Kratochvil <jan.kratochvil at redhat.com>.  */
-+
-+#include <unistd.h>
-+
-+int
-+main (void)
-+{
-+  sleep (60);
-+
-+  return 1;
-+}
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
-@@ -0,0 +1,135 @@
-+# Copyright 2009 Free Software Foundation, Inc.
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+# Contributed by Jan Kratochvil <jan.kratochvil at redhat.com>.
-+
-+# Test GDB can cope with two libraries loaded with overlapping VMA ranges.
-+# Prelink libraries first so they can be loaded and their native address.
-+# In such case `struct linkmap'.l_addr will be zero.  Provide different
-+# unprelinked library files on the disk which have zero-based VMAs.  These
-+# different files should have their .dynamic section at a different offset in
-+# page size so that we get for
-+#   warning: .dynamic section for "..." is not at the expected address
-+# the reason
-+#   (wrong library or version mismatch?)
-+# and not:
-+#   difference appears to be caused by prelink, adjusting expectations
-+# In such case both disk libraries will be loaded at VMAs starting at zero.
-+
-+if [skip_shlib_tests] {
-+    return 0
-+}
-+
-+# Are we on a target board?  It is required for attaching to a process.
-+if [is_remote target] {
-+    return 0
-+}
-+
-+# Library file.
-+set libname "solib-overlap-lib"
-+set srcfile_lib ${srcdir}/${subdir}/${libname}.c
-+# Binary file.
-+set testfile "solib-overlap-main"
-+set srcfile ${srcdir}/${subdir}/${testfile}.c
-+
-+# Base addresses for `prelink -r' which should be compatible with both -m32 and
-+# -m64 targets.  If it clashes with system prelinked libraries it would give
-+# false PASS.
-+# Prelink first lib1 at 0x40000000 and lib2 at 0x41000000.
-+# During second pass try lib1 at 0x50000000 and lib2 at 0x51000000.
-+foreach prelink_lib1 {0x40000000 0x50000000} {
-+    set prelink_lib2 [format "0x%x" [expr $prelink_lib1 + 0x01000000]]
-+
-+    set old_prefix $pf_prefix
-+    lappend pf_prefix "$prelink_lib1:"
-+
-+    # Library file.
-+    set binfile_lib1 ${objdir}/${subdir}/${libname}1-${prelink_lib1}.so
-+    set binfile_lib2 ${objdir}/${subdir}/${libname}2-${prelink_lib1}.so
-+    set lib_flags {debug}
-+    # Binary file.
-+    set binfile_base ${testfile}-${prelink_lib1}
-+    set binfile ${objdir}/${subdir}/${binfile_base}
-+    set bin_flags [list debug shlib=${binfile_lib1} shlib=${binfile_lib2}]
-+    set escapedbinfile  [string_to_regexp ${binfile}]
-+
-+    if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
-+	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""
-+	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-+	untested "Could not compile ${binfile_lib1}, ${binfile_lib2} or ${binfile}."
-+	return -1
-+    }
-+
-+    if {[catch "system \"prelink -N -r ${prelink_lib1} ${binfile_lib1}\""] != 0
-+	|| [catch "system \"prelink -N -r ${prelink_lib2} ${binfile_lib2}\""] != 0} {
-+	# Maybe we don't have prelink.
-+	untested "Could not prelink ${binfile_lib1} or ${binfile_lib2}."
-+	return -1
-+    }
-+
-+    # Start the program running and then wait for a bit, to be sure
-+    # that it can be attached to.
-+
-+    set testpid [eval exec $binfile &]
-+    sleep 2
-+    if { [istarget "*-*-cygwin*"] } {
-+	# testpid is the Cygwin PID, GDB uses the Windows PID, which might be
-+	# different due to the way fork/exec works.
-+	set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
-+    }
-+
-+    remote_exec build "mv -f ${binfile_lib1} ${binfile_lib1}-running"
-+    remote_exec build "mv -f ${binfile_lib2} ${binfile_lib2}-running"
-+
-+    # Provide another exported function name to cause different sizes of sections.
-+    lappend lib_flags additional_flags=-DSYMB
-+
-+    if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
-+	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""} {
-+	untested "Could not recompile ${binfile_lib1} or ${binfile_lib2}."
-+	remote_exec build "kill -9 ${testpid}"
-+	return -1
-+    }
-+
-+    clean_restart ${binfile_base}
-+    # This testcase currently does not support remote targets.
-+    # gdb_load_shlibs ${binfile_lib1} ${binfile_lib2}
-+
-+    # Here we should get:
-+    # warning: .dynamic section for ".../solib-overlap-lib1.so" is not at the expected address (wrong library or version mismatch?)
-+    # warning: .dynamic section for ".../solib-overlap-lib2.so" is not at the expected address (wrong library or version mismatch?)
-+
-+    set test attach
-+    gdb_test_multiple "attach $testpid" $test {
-+	-re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*$gdb_prompt $" {
-+	    pass $test
-+	}
-+	-re "Attaching to program.*`?$escapedbinfile\.exe'?, process $testpid.*\[Switching to thread $testpid\..*\].*$gdb_prompt $" {
-+	    # Response expected on Cygwin
-+	    pass $test
-+	}
-+    }
-+
-+    # Detach the process.
-+
-+    gdb_test "detach" "Detaching from program: .*$escapedbinfile, process $testpid"
-+
-+    # Wait a bit for gdb to finish detaching
-+
-+    sleep 5
-+
-+    remote_exec build "kill -9 ${testpid}"
-+
-+    set pf_prefix $old_prefix
-+}


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -p -r1.380 -r1.381
--- gdb.spec	28 Aug 2009 18:24:06 -0000	1.380
+++ gdb.spec	1 Sep 2009 13:19:03 -0000	1.381
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 6%{?_with_upstream:.upstream}%{?dist}
+Release: 7%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -829,6 +829,12 @@ fi
 %endif
 
 %changelog
+* Tue Sep  1 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-7
+- archer-jankratochvil-fedora12 commit: d25596676e8811b03f8c9aba6bbd04ebaa9ff5db
+  - [call-frame-cfa] Fix parsing CFA-relative frames (BZ 516627, Tom Tromey).
+  - [vla] variable length Fortran strings for -O -g code (part of BZ 508406, me).
+  - [python] varobj + general fixes (Tom Tromey).
+
 * Fri Aug 28 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-6
 - Real upstream fixup of qsort_cmp (BZ 515434).
 - Revert bitfields regression (BZ 520129).



From satyak at fedoraproject.org  Tue Sep  1 13:24:43 2009
From: satyak at fedoraproject.org (satyak)
Date: Tue,  1 Sep 2009 13:24:43 +0000 (UTC)
Subject: rpms/beacon/devel beacon.spec, NONE, 1.1 httpd-beacon.conf, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901132443.CAC7011C00EF@cvs1.fedora.phx.redhat.com>

Author: satyak

Update of /cvs/pkgs/rpms/beacon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17864/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beacon.spec httpd-beacon.conf import.log 
Log Message:



--- NEW FILE beacon.spec ---
Name:			beacon
Version:		0.5
Release:		3%{?dist}
Summary:		WYSIWYG editor for docbook xml

Group:			Applications/Editors
License:		GPLv3+
URL:			http://fedoraproject.org/wiki/DocBook_Editor
Source0:		http://rakesh.fedorapeople.org/misc/%{name}-%{version}.tar.gz
Source1:		httpd-beacon.conf
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch
Requires:		php, httpd, php-xml, mysql-server, mysql, python-fedora

%description
Beacon is an XSLT based plug-able WYSIWYG editor for DocBook xml. It 
is intended to serve as an easy to use tool which will attract new 
contributors who would otherwise be discouraged by the steep learning
curve involved with DocBook and will also provide a convenient
alternative to those who are old-timers. More information is available
at https://fedoraproject.org/wiki/DocBook_Editor_Documentation and
https://fedoraproject.org/wiki/DocBook_Editor_Feature.
 
%prep
%setup -q


%build
# Empty build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/beacon
cp -rp beacon php $RPM_BUILD_ROOT/%{_datadir}/beacon/
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
cp -p  %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* LICENSE README TODO README_DATABASE README.fedora
%{_datadir}/beacon/*
%attr(0700,apache,apache)

%config(noreplace) %{_sysconfdir}/httpd/conf.d/httpd-beacon.conf
%config(noreplace) %{_datadir}/beacon/php/settings.php


%changelog
* Wed Aug 24 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-3
- Improved description.
- Reverted back to requiring httpd.

* Wed Aug 24 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-2
- Changed requires to webserver from httpd
- Added beacon/php/settings.php to the config section.
- Removed /var/tmp as we are using mysql now.
- Added more documentation and moved README.fedora inside the tarball.

* Wed Aug 12 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-1
- Initial version




--- NEW FILE httpd-beacon.conf ---
# Beacon specific httpd conf file
#PHPIniDir "/etc/beacon/php-beacon.ini"
Alias /beacon /usr/share/beacon
<Directory /usr/share/beacon>
Order allow,deny
Allow from all
</Directory>



--- NEW FILE import.log ---
beacon-0_5-3_fc11:HEAD:beacon-0.5-3.fc11.src.rpm:1251725004


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beacon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:33:42 -0000	1.1
+++ .cvsignore	1 Sep 2009 13:24:43 -0000	1.2
@@ -0,0 +1 @@
+beacon-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beacon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:33:42 -0000	1.1
+++ sources	1 Sep 2009 13:24:43 -0000	1.2
@@ -0,0 +1 @@
+1288e8d6dd41b4a95dbfcfc66bd485a4  beacon-0.5.tar.gz



From nphilipp at fedoraproject.org  Tue Sep  1 13:25:48 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 13:25:48 +0000 (UTC)
Subject: rpms/rss-glx/devel rss-glx.spec,1.35,1.36
Message-ID: <20090901132548.8218911C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210

Modified Files:
	rss-glx.spec 
Log Message:
don't ship prefixed rss-glx-rss-glx_install.pl



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- rss-glx.spec	18 Aug 2009 15:51:25 -0000	1.35
+++ rss-glx.spec	1 Sep 2009 13:25:48 -0000	1.36
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -238,7 +238,8 @@ EOF
 rm -rf %buildroot
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
-rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl
+rm -f %{buildroot}%{_libdir}/lib*.{,l}a
+rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl
 %if %{with gss}
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
@@ -318,6 +319,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-3
+- don't ship prefixed rss-glx-rss-glx_install.pl
+
 * Tue Aug 18 2009 Nils Philippsen <nils at redhat.com>
 - explain autofoo patch
 



From nphilipp at fedoraproject.org  Tue Sep  1 13:27:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 13:27:28 +0000 (UTC)
Subject: rpms/rss-glx/F-11 rss-glx.spec,1.32,1.33
Message-ID: <20090901132728.AE16811C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18649

Modified Files:
	rss-glx.spec 
Log Message:
don't ship prefixed rss-glx-rss-glx_install.pl


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/rss-glx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- rss-glx.spec	17 Aug 2009 15:48:04 -0000	1.32
+++ rss-glx.spec	1 Sep 2009 13:27:28 -0000	1.33
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+# don't run autoreconf when building
 Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
@@ -237,7 +238,8 @@ EOF
 rm -rf %buildroot
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
-rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl
+rm -f %{buildroot}%{_libdir}/lib*.{,l}a
+rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl
 %if %{with gss}
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
@@ -317,6 +319,12 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-3
+- don't ship prefixed rss-glx-rss-glx_install.pl
+
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com>
+- explain autofoo patch
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-2
 - don't rebuild autofoo files
 



From nphilipp at fedoraproject.org  Tue Sep  1 13:27:34 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 13:27:34 +0000 (UTC)
Subject: rpms/rss-glx/F-10 rss-glx.spec,1.30,1.31
Message-ID: <20090901132734.D53E911C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18696

Modified Files:
	rss-glx.spec 
Log Message:
don't ship prefixed rss-glx-rss-glx_install.pl


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/rss-glx.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- rss-glx.spec	17 Aug 2009 15:48:08 -0000	1.30
+++ rss-glx.spec	1 Sep 2009 13:27:34 -0000	1.31
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+# don't run autoreconf when building
 Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
@@ -237,7 +238,8 @@ EOF
 rm -rf %buildroot
 install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
-rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl
+rm -f %{buildroot}%{_libdir}/lib*.{,l}a
+rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl
 %if %{with gss}
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
@@ -317,6 +319,12 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-3
+- don't ship prefixed rss-glx-rss-glx_install.pl
+
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com>
+- explain autofoo patch
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-2
 - don't rebuild autofoo files
 



From satyak at fedoraproject.org  Tue Sep  1 13:34:15 2009
From: satyak at fedoraproject.org (satyak)
Date: Tue,  1 Sep 2009 13:34:15 +0000 (UTC)
Subject: rpms/beacon/F-11 beacon.spec, NONE, 1.1 httpd-beacon.conf, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901133415.6DB9A11C00EF@cvs1.fedora.phx.redhat.com>

Author: satyak

Update of /cvs/pkgs/rpms/beacon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20112/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	beacon.spec httpd-beacon.conf import.log 
Log Message:



--- NEW FILE beacon.spec ---
Name:			beacon
Version:		0.5
Release:		3%{?dist}
Summary:		WYSIWYG editor for docbook xml

Group:			Applications/Editors
License:		GPLv3+
URL:			http://fedoraproject.org/wiki/DocBook_Editor
Source0:		http://rakesh.fedorapeople.org/misc/%{name}-%{version}.tar.gz
Source1:		httpd-beacon.conf
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch
Requires:		php, httpd, php-xml, mysql-server, mysql, python-fedora

%description
Beacon is an XSLT based plug-able WYSIWYG editor for DocBook xml. It 
is intended to serve as an easy to use tool which will attract new 
contributors who would otherwise be discouraged by the steep learning
curve involved with DocBook and will also provide a convenient
alternative to those who are old-timers. More information is available
at https://fedoraproject.org/wiki/DocBook_Editor_Documentation and
https://fedoraproject.org/wiki/DocBook_Editor_Feature.
 
%prep
%setup -q


%build
# Empty build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/beacon
cp -rp beacon php $RPM_BUILD_ROOT/%{_datadir}/beacon/
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
cp -p  %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* LICENSE README TODO README_DATABASE README.fedora
%{_datadir}/beacon/*
%attr(0700,apache,apache)

%config(noreplace) %{_sysconfdir}/httpd/conf.d/httpd-beacon.conf
%config(noreplace) %{_datadir}/beacon/php/settings.php


%changelog
* Wed Aug 24 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-3
- Improved description.
- Reverted back to requiring httpd.

* Wed Aug 24 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-2
- Changed requires to webserver from httpd
- Added beacon/php/settings.php to the config section.
- Removed /var/tmp as we are using mysql now.
- Added more documentation and moved README.fedora inside the tarball.

* Wed Aug 12 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-1
- Initial version




--- NEW FILE httpd-beacon.conf ---
# Beacon specific httpd conf file
#PHPIniDir "/etc/beacon/php-beacon.ini"
Alias /beacon /usr/share/beacon
<Directory /usr/share/beacon>
Order allow,deny
Allow from all
</Directory>



--- NEW FILE import.log ---
beacon-0_5-3_fc11:F-11:beacon-0.5-3.fc11.src.rpm:1251725593


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beacon/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:33:42 -0000	1.1
+++ .cvsignore	1 Sep 2009 13:34:14 -0000	1.2
@@ -0,0 +1 @@
+beacon-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beacon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:33:42 -0000	1.1
+++ sources	1 Sep 2009 13:34:14 -0000	1.2
@@ -0,0 +1 @@
+1288e8d6dd41b4a95dbfcfc66bd485a4  beacon-0.5.tar.gz



From tagoh at fedoraproject.org  Tue Sep  1 13:39:11 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  1 Sep 2009 13:39:11 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.17, 1.18 imsettings.spec, 1.36, 
	1.37 sources, 1.16, 1.17
Message-ID: <20090901133911.287F611C00EF@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22646

Modified Files:
	.cvsignore imsettings.spec sources 
Log Message:
* Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
- New upstream release.
  - Fix taking CPU load after switching IM.
  - Fix getting stuck after starting some IM.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	27 Aug 2009 08:08:11 -0000	1.17
+++ .cvsignore	1 Sep 2009 13:39:10 -0000	1.18
@@ -16,3 +16,4 @@ imsettings-0.106.2.tar.bz2
 imsettings-0.107.0.tar.bz2
 imsettings-0.107.1.tar.bz2
 imsettings-0.107.2.tar.bz2
+imsettings-0.107.3.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- imsettings.spec	31 Aug 2009 03:07:12 -0000	1.36
+++ imsettings.spec	1 Sep 2009 13:39:10 -0000	1.37
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	0.107.2
+Version:	0.107.3
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -211,6 +211,11 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
+- New upstream release.
+  - Fix taking CPU load after switching IM.
+  - Fix getting stuck after starting some IM.
+
 * Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
 - Add a conditional build to disable xfce module for RHEL.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	27 Aug 2009 08:08:11 -0000	1.16
+++ sources	1 Sep 2009 13:39:10 -0000	1.17
@@ -1 +1 @@
-3451c2bc4f82e63afb7c827e4a2f8dbf  imsettings-0.107.2.tar.bz2
+c6201e25cbd670d0784bd998e80b5684  imsettings-0.107.3.tar.bz2



From tagoh at fedoraproject.org  Tue Sep  1 13:41:48 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  1 Sep 2009 13:41:48 +0000 (UTC)
Subject: rpms/imsettings/F-11 .cvsignore, 1.15, 1.16 imsettings.spec, 1.30, 
	1.31 sources, 1.14, 1.15
Message-ID: <20090901134148.887DC11C00EF@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23377

Modified Files:
	.cvsignore imsettings.spec sources 
Log Message:
* Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
- New upstream release.
  - Fix taking CPU load after switching IM.
  - Fix getting stuck after starting some IM.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Aug 2009 08:20:43 -0000	1.15
+++ .cvsignore	1 Sep 2009 13:41:48 -0000	1.16
@@ -14,3 +14,4 @@ imsettings-0.106.0.tar.bz2
 imsettings-0.106.1.tar.bz2
 imsettings-0.106.2.tar.bz2
 imsettings-0.107.2.tar.bz2
+imsettings-0.107.3.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/imsettings.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- imsettings.spec	27 Aug 2009 08:20:43 -0000	1.30
+++ imsettings.spec	1 Sep 2009 13:41:48 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	0.107.2
+Version:	0.107.3
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -8,7 +8,9 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	intltool gettext
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
 BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
+%if !0%{?rhel}
 BuildRequires:	xfconf-devel
+%endif
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -63,6 +65,7 @@ or the desktop.
 This package contains the development files to make any
 applications with imsettings.
 
+%if !0%{?rhel}
 %package	xfce
 Summary:	Xfce support on imsettings
 Group:		Applications/System
@@ -77,6 +80,7 @@ immediately without any need to restart 
 or the desktop.
 
 This package contains a plugin to get this working on Xfce.  
+%endif
 
 %prep
 %setup -q
@@ -103,6 +107,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}
 # clean up the unnecessary files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
+%if 0%{?rhel}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-xfce-helper
+%endif
 
 # still not stable
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
@@ -193,14 +201,24 @@ fi
 %{_libdir}/libimsettings-xim.so
 %{_libdir}/pkgconfig/imsettings.pc
 
+%if !0%{?rhel}
 %files	xfce
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/imsettings-xfce-helper
 %{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+%endif
 
 
 %changelog
+* Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
+- New upstream release.
+  - Fix taking CPU load after switching IM.
+  - Fix getting stuck after starting some IM.
+
+* Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
+- Add a conditional build to disable xfce module for RHEL.
+
 * Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
 - New upstream release.
   - Stop IM process properly with the DBus disconnect signal. (#518970)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Aug 2009 08:20:43 -0000	1.14
+++ sources	1 Sep 2009 13:41:48 -0000	1.15
@@ -1,2 +1 @@
-d7f713a1b0d621aae7f5cc4b72f08c6e  imsettings-0.106.2.tar.bz2
-3451c2bc4f82e63afb7c827e4a2f8dbf  imsettings-0.107.2.tar.bz2
+c6201e25cbd670d0784bd998e80b5684  imsettings-0.107.3.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  1 13:44:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Sep 2009 13:44:36 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.114, 1.115 gtk2.spec, 1.398,
	1.399 sources, 1.123, 1.124
Message-ID: <20090901134437.03DDC11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24095

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.17.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- .cvsignore	25 Aug 2009 00:17:55 -0000	1.114
+++ .cvsignore	1 Sep 2009 13:44:36 -0000	1.115
@@ -1 +1 @@
-gtk+-2.17.9.tar.bz2
+gtk+-2.17.10.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- gtk2.spec	25 Aug 2009 00:17:55 -0000	1.398
+++ gtk2.spec	1 Sep 2009 13:44:36 -0000	1.399
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.9
+%define base_version 2.17.10
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -382,6 +382,9 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.10-1
+- Update to 2.17.10
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.9-1
 - Update to 2.17.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- sources	25 Aug 2009 00:17:55 -0000	1.123
+++ sources	1 Sep 2009 13:44:36 -0000	1.124
@@ -1 +1 @@
-44323cc81628be422c59059086e33353  gtk+-2.17.9.tar.bz2
+9fe31cc177993fdec187e6f44fc3b60b  gtk+-2.17.10.tar.bz2



From caolanm at fedoraproject.org  Tue Sep  1 13:45:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Sep 2009 13:45:50 +0000 (UTC)
Subject: rpms/compat-erlang/devel otp-includes.patch, NONE,
	1.1 compat-erlang.spec, 1.15, 1.16
Message-ID: <20090901134550.6126211C00EF@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/compat-erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24438

Modified Files:
	compat-erlang.spec 
Added Files:
	otp-includes.patch 
Log Message:
Resolves: rhbz#511447 FTBFS

otp-includes.patch:
 lib/hipe/regalloc/Makefile                       |    1 -
 otp_src_R10B-10/lib/orber/c_src/setsockaddr_in.c |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE otp-includes.patch ---
diff -ru otp_src_R10B-10.orig/lib/orber/c_src/setsockaddr_in.c otp_src_R10B-10/lib/orber/c_src/setsockaddr_in.c
--- otp_src_R10B-10.orig/lib/orber/c_src/setsockaddr_in.c	2009-09-01 13:11:58.000000000 +0100
+++ otp_src_R10B-10/lib/orber/c_src/setsockaddr_in.c	2009-09-01 13:15:10.000000000 +0100
@@ -17,6 +17,8 @@
  *     $Id$
  *
  */
+#include <stddef.h>
+#include <strings.h>
 #include "inet.h"
 
 #ifdef HAVE_CONFIG_H
--- otp_src_R10B-10.orig/lib/hipe/regalloc/Makefile	2009-09-01 13:57:44.000000000 +0100
+++ otp_src_R10B-10/lib/hipe/regalloc/Makefile	2009-09-01 13:57:56.000000000 +0100
@@ -41,7 +41,6 @@
 	  hipe_node_sets hipe_spillcost hipe_reg_worklists \
 	  hipe_adj_list hipe_vectors_wrapper \
 	  hipe_temp_map \
-	  hipe_optimistic_regalloc \
 	  hipe_coalescing_regalloc \
 	  hipe_optimistic_regalloc \
 	  hipe_graph_coloring_regalloc \


Index: compat-erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-erlang/devel/compat-erlang.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- compat-erlang.spec	21 Aug 2009 12:49:33 -0000	1.15
+++ compat-erlang.spec	1 Sep 2009 13:45:50 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           compat-erlang
 Version:        R10B
-Release:        15.11%{?dist}
+Release:        15.12%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
 Patch3:         otp-sslrpath.patch
 Patch4:		otp-glibc24.patch
+Patch5:		otp-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -39,6 +40,7 @@ systems from Ericsson.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 sed -i -e 's|@libdir@/erlang|@libdir@/erlang-R10B|' Makefile.in
 sed -i -e 's|LD.*=.*@DED_LD at .*|LD=gcc|' \
     lib/asn1/c_src/Makefile.in \
@@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 01 2009 Caol?n McNamara <caolanm at redhat.com> - R10B-15.12
+- Resolves: rhbz#511447 FTBFS
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - R10B-15.11
 - rebuilt with new openssl
 



From satyak at fedoraproject.org  Tue Sep  1 13:46:49 2009
From: satyak at fedoraproject.org (satyak)
Date: Tue,  1 Sep 2009 13:46:49 +0000 (UTC)
Subject: rpms/beacon/F-10 beacon.spec, NONE, 1.1 httpd-beacon.conf, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901134649.DDE1911C00EF@cvs1.fedora.phx.redhat.com>

Author: satyak

Update of /cvs/pkgs/rpms/beacon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24690/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	beacon.spec httpd-beacon.conf import.log 
Log Message:



--- NEW FILE beacon.spec ---
Name:			beacon
Version:		0.5
Release:		3%{?dist}
Summary:		WYSIWYG editor for docbook xml

Group:			Applications/Editors
License:		GPLv3+
URL:			http://fedoraproject.org/wiki/DocBook_Editor
Source0:		http://rakesh.fedorapeople.org/misc/%{name}-%{version}.tar.gz
Source1:		httpd-beacon.conf
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch
Requires:		php, httpd, php-xml, mysql-server, mysql, python-fedora

%description
Beacon is an XSLT based plug-able WYSIWYG editor for DocBook xml. It 
is intended to serve as an easy to use tool which will attract new 
contributors who would otherwise be discouraged by the steep learning
curve involved with DocBook and will also provide a convenient
alternative to those who are old-timers. More information is available
at https://fedoraproject.org/wiki/DocBook_Editor_Documentation and
https://fedoraproject.org/wiki/DocBook_Editor_Feature.
 
%prep
%setup -q


%build
# Empty build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/beacon
cp -rp beacon php $RPM_BUILD_ROOT/%{_datadir}/beacon/
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
cp -p  %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* LICENSE README TODO README_DATABASE README.fedora
%{_datadir}/beacon/*
%attr(0700,apache,apache)

%config(noreplace) %{_sysconfdir}/httpd/conf.d/httpd-beacon.conf
%config(noreplace) %{_datadir}/beacon/php/settings.php


%changelog
* Wed Aug 24 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-3
- Improved description.
- Reverted back to requiring httpd.

* Wed Aug 24 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-2
- Changed requires to webserver from httpd
- Added beacon/php/settings.php to the config section.
- Removed /var/tmp as we are using mysql now.
- Added more documentation and moved README.fedora inside the tarball.

* Wed Aug 12 2009 Satya Komaragiri <satyak at fedoraproject.org> 0.5-1
- Initial version




--- NEW FILE httpd-beacon.conf ---
# Beacon specific httpd conf file
#PHPIniDir "/etc/beacon/php-beacon.ini"
Alias /beacon /usr/share/beacon
<Directory /usr/share/beacon>
Order allow,deny
Allow from all
</Directory>



--- NEW FILE import.log ---
beacon-0_5-3_fc11:F-10:beacon-0.5-3.fc11.src.rpm:1251726236


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beacon/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:33:42 -0000	1.1
+++ .cvsignore	1 Sep 2009 13:46:49 -0000	1.2
@@ -0,0 +1 @@
+beacon-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beacon/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:33:42 -0000	1.1
+++ sources	1 Sep 2009 13:46:49 -0000	1.2
@@ -0,0 +1 @@
+1288e8d6dd41b4a95dbfcfc66bd485a4  beacon-0.5.tar.gz



From overholt at fedoraproject.org  Tue Sep  1 13:51:31 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 13:51:31 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.18,1.19
Message-ID: <20090901135131.A607811C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25737

Modified Files:
	maven-doxia.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.8.a10
- Add tomcat5-servlet-2.4-api BR


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- maven-doxia.spec	1 Sep 2009 11:29:27 -0000	1.18
+++ maven-doxia.spec	1 Sep 2009 13:51:31 -0000	1.19
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.7.a10%{?dist}
+Release:        0.8.a10%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -80,6 +80,7 @@ BuildRequires:  maven2-plugin-surefire
 BuildRequires:  plexus-maven-plugin >= 0:1.2-2
 BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
 BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
+BuildRequires:  tomcat5-servlet-2.4-api
 %endif
 BuildRequires:  classworlds
 BuildRequires:  jakarta-commons-collections
@@ -245,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.8.a10
+- Add tomcat5-servlet-2.4-api BR
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.7.a10
 - Fix plexus-cli BR version
 



From overholt at fedoraproject.org  Tue Sep  1 13:52:29 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 13:52:29 +0000 (UTC)
Subject: rpms/maven-shared/devel maven-shared.spec,1.11,1.12
Message-ID: <20090901135229.A529A11C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26038

Modified Files:
	maven-shared.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-2
- Add tomcat5-servlet-2.4-api BR


Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- maven-shared.spec	31 Aug 2009 15:26:59 -0000	1.11
+++ maven-shared.spec	1 Sep 2009 13:52:29 -0000	1.12
@@ -65,7 +65,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        8
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -97,6 +97,7 @@ BuildRequires:  saxon-scripts
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-registry
 BuildRequires:  modello-maven-plugin
+BuildRequires:  tomcat5-servlet-2.4-api
 
 Requires:       maven2 >= 0:2.0.4
 Requires:       plexus-utils
@@ -1098,6 +1099,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-2
+- Add tomcat5-servlet-2.4-api BR
+
 * Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 8-1
 - Update to version 8 (courtesy Deepak Bhole)
 



From overholt at fedoraproject.org  Tue Sep  1 13:55:09 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 13:55:09 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.11,1.12
Message-ID: <20090901135509.BCFE011C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26685

Modified Files:
	maven-scm.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.1
- Add tomcat5-jsp-2.0-api BR


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- maven-scm.spec	31 Aug 2009 19:03:52 -0000	1.11
+++ maven-scm.spec	1 Sep 2009 13:55:09 -0000	1.12
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.0
-Release:        0.5.rc1%{?dist}
+Release:        0.5.rc1.1%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -70,6 +70,7 @@ BuildRequires:  modello-maven-plugin >= 
 BuildRequires:  netbeans-ide11 >= 6.7.1
 BuildRequires:  plexus-utils >= 1.2
 BuildRequires:  saxon-scripts
+BuildRequires:  tomcat5-jsp-2.0-api
 
 Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
@@ -226,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.1
+- Add tomcat5-jsp-2.0-api BR
+
 * Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1
 - 1.0 RC1 (courtesy Deepak Bhole)
 - Remove gcj support



From jfch2222 at fedoraproject.org  Tue Sep  1 14:02:15 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Tue,  1 Sep 2009 14:02:15 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.161,1.162
Message-ID: <20090901140215.BAF3011C00EF@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28204

Modified Files:
	openssh.spec 
Log Message:
replace ip-opts patch by an upstream candidate version



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- openssh.spec	31 Aug 2009 12:40:05 -0000	1.161
+++ openssh.spec	1 Sep 2009 14:02:15 -0000	1.162
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 21%{?dist}%{?rescue_rel}
+Release: 22%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -90,7 +90,7 @@ Patch30: openssh-4.0p1-exit-deadlock.pat
 Patch35: openssh-5.1p1-askpass-progress.patch
 Patch38: openssh-4.3p2-askpass-grab-info.patch
 Patch39: openssh-4.3p2-no-v6only.patch
-Patch44: openssh-4.3p2-allow-ip-opts.patch
+Patch44: openssh-5.2p1-allow-ip-opts.patch
 Patch49: openssh-4.3p2-gssapi-canohost.patch
 Patch51: openssh-5.2p1-nss-keys.patch
 Patch55: openssh-5.1p1-cloexec.patch
@@ -468,6 +468,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep  1 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-22
+- replace ip-opts patch by an upstream candidate version
+
 * Mon Aug 31 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-21
 - rearange selinux patch to be acceptable for upstream
 - replace seftp patch by an upstream version



From hadess at fedoraproject.org  Tue Sep  1 14:06:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 14:06:18 +0000 (UTC)
Subject: rpms/python-gdata/devel .cvsignore, 1.12, 1.13 python-gdata.spec,
	1.21, 1.22 sources, 1.12, 1.13
Message-ID: <20090901140618.14C9711C00EF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30060

Modified Files:
	.cvsignore python-gdata.spec sources 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 2.0.2-1
- Update to 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 Jul 2009 07:18:24 -0000	1.12
+++ .cvsignore	1 Sep 2009 14:06:17 -0000	1.13
@@ -1 +1 @@
-gdata-2.0.1.tar.gz
+gdata-2.0.2.tar.gz


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/python-gdata.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- python-gdata.spec	26 Jul 2009 20:25:08 -0000	1.21
+++ python-gdata.spec	1 Sep 2009 14:06:17 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-gdata
-Version:        2.0.1
-Release:        2%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        A Python module for accessing online Google services
 
 Group:          Development/Languages
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Jul 2009 07:18:25 -0000	1.12
+++ sources	1 Sep 2009 14:06:17 -0000	1.13
@@ -1 +1 @@
-d646b8f6e32911df61ea0e7379b4bc35  gdata-2.0.1.tar.gz
+8e886c7925d34ae0f9a5b9a094e790c5  gdata-2.0.2.tar.gz



From lmacken at fedoraproject.org  Tue Sep  1 14:07:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Sep 2009 14:07:53 +0000 (UTC)
Subject: rpms/nethack/devel nethack.spec,1.28,1.29
Message-ID: <20090901140753.E2C7211C00EF@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/nethack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30963

Modified Files:
	nethack.spec 
Log Message:
Fix the categories for the nethack desktop entry (#485362)


Index: nethack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nethack.spec	25 Jul 2009 18:05:28 -0000	1.28
+++ nethack.spec	1 Sep 2009 14:07:53 -0000	1.29
@@ -5,7 +5,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -112,9 +112,8 @@ install -D -p -m 0644 win/X11/nh_icon.xp
 desktop-file-install \
         --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        --add-category Application \
         --add-category Game \
+        --add-category RolePlaying \
         %{SOURCE1}
 
 # Install the fonts for the X11 interface
@@ -169,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 3.4.3-23
+- Fix the categories for the nethack desktop entry (#485362)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.3-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Tue Sep  1 14:15:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  1 Sep 2009 14:15:46 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.514,1.515
Message-ID: <20090901141546.B695B11C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1672

Modified Files:
	cups.spec 
Log Message:
* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
- Fix locale code for Norwegian (bug #520379).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -p -r1.514 -r1.515
--- cups.spec	28 Aug 2009 21:20:52 -0000	1.514
+++ cups.spec	1 Sep 2009 14:15:46 -0000	1.515
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -236,6 +236,9 @@ perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" 
 # Let's look at the compilation command lines.
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
+# Fix locale code for Norwegian (bug #520379).
+mv locale/cups_no.po locale/cups_nb.po
+
 # Rebuild configure script for --enable-avahi.
 aclocal -I config-scripts
 autoconf -I config-scripts
@@ -520,6 +523,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
+- Fix locale code for Norwegian (bug #520379).
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
 - 1.4.0.
 



From mdomsch at fedoraproject.org  Tue Sep  1 14:16:24 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 14:16:24 +0000 (UTC)
Subject: rpms/GeoIP/EL-5 geoip-1.4.6-ipv6.patch, NONE, 1.1 GeoIP.spec, 1.12,
	1.13
Message-ID: <20090901141624.2643811C00EF@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/GeoIP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2311

Modified Files:
	GeoIP.spec 
Added Files:
	geoip-1.4.6-ipv6.patch 
Log Message:
add IPv6 enablement patches, make prerelease

geoip-1.4.6-ipv6.patch:
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//GeoIP.spec              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//LICENSE.txt             |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//Makefile.in             |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//README.fedora           |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//aclocal.m4              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//config.guess            |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//config.sub              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//configure               |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//fetch-geoipdata-city.pl |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//fetch-geoipdata.pl      |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//install-sh              |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6//missing                 |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/Makefile.in         |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/conf/Makefile.in         |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data/GeoIP.dat           |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data/Makefile.in         |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/Makefile.in     |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/man/Makefile.in          |only
 /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/test/Makefile.in         |only
 c//CVS                                                                           |only
 c//LICENSE                                                                       |only
 c//regioncode                                                                    |only
 c//timezone                                                                      |only
 c/ChangeLog                                                                      |   17 +
 c/README                                                                         |   23 +
 c/apps/CVS                                                                       |only
 c/apps/geoiplookup.c                                                             |  120 +++++++++-
 c/apps/geoipupdate-pureperl.pl                                                   |    4 
 c/apps/geoipupdate.c                                                             |    3 
 c/conf/CVS                                                                       |only
 c/configure.in                                                                   |    2 
 c/data/CVS                                                                       |only
 c/libGeoIP/CVS                                                                   |only
 c/libGeoIP/GeoIP.c                                                               |   70 ++++-
 c/libGeoIP/GeoIP.h                                                               |    7 
 c/libGeoIP/regionName.c                                                          |  113 +++++++--
 c/man/CVS                                                                        |only
 c/man/geoiplookup.1                                                              |only
 c/man/geoiplookup6.1                                                             |only
 c/man/geoipupdate.1                                                              |only
 c/test/CVS                                                                       |only
 c/test/fail_test.txt                                                             |only
 c/test/proxy_test.txt                                                            |only
 43 files changed, 312 insertions(+), 47 deletions(-)

--- NEW FILE geoip-1.4.6-ipv6.patch ---
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: aclocal.m4
Only in c/apps: CVS
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoiplookup.c c/apps/geoiplookup.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoiplookup.c	2009-02-24 10:03:23.000000000 -0600
+++ c/apps/geoiplookup.c	2009-05-08 12:01:21.000000000 -0500
@@ -31,9 +31,12 @@ typedef unsigned int uint32_t; 
 void geoiplookup(GeoIP* gi,char *hostname,int i);
 
 void usage() {
-	fprintf(stderr,"Usage: geoiplookup [-d custom_dir] [-f custom_file] [-v] <ipaddress|hostname>\n");
+	fprintf(stderr,"Usage: geoiplookup [-d custom_dir] [-f custom_file] [-v] [-i] <ipaddress|hostname>\n");
 }
 
+/* extra info used in _say_range_ip */
+int info_flag = 0;
+
 int main (int argc, char *argv[]) {
 	char * hostname = NULL;
 	char * db_info;
@@ -51,7 +54,9 @@ int main (int argc, char *argv[]) {
 	while (i < argc) {
 		if (strcmp(argv[i],"-v") == 0) {
 			version_flag = 1;
-		} else if (strcmp(argv[i],"-f") == 0) {
+		} else if (strcmp(argv[i],"-i") == 0) {
+			info_flag = 1;
+                } else if (strcmp(argv[i],"-f") == 0) {
 			if ((i+1) < argc){
 				i++;
 				custom_file = argv[i];
@@ -119,12 +124,106 @@ static const char * _mk_NA( const char *
  return p ? p : "N/A";
 }
 
+static unsigned long
+__addr_to_num(const char *addr)
+{
+	unsigned int    c, octet, t;
+	unsigned long   ipnum;
+	int             i = 3;
+
+	octet = ipnum = 0;
+	while ((c = *addr++)) {
+		if (c == '.') {
+			if (octet > 255)
+				return 0;
+			ipnum <<= 8;
+			ipnum += octet;
+			i--;
+			octet = 0;
+		} else {
+			t = octet;
+			octet <<= 3;
+			octet += t;
+			octet += t;
+			c -= '0';
+			if (c > 9)
+				return 0;
+			octet += c;
+		}
+	}
+	if ((octet > 255) || (i != 0))
+		return 0;
+	ipnum <<= 8;
+	return ipnum + octet;
+}
+
+
+
+/* ptr must be a memory area with at least 16 bytes */
+static char *__num_to_addr_r (unsigned long ipnum, char * ptr) {
+	char *cur_str;
+	int octet[4];
+	int num_chars_written, i;
+
+	cur_str = ptr;
+
+	for (i = 0; i<4; i++) {
+		octet[3 - i] = ipnum % 256;
+		ipnum >>= 8;
+	}
+
+	for (i = 0; i<4; i++) {
+		num_chars_written = sprintf(cur_str, "%d", octet[i]);
+		cur_str += num_chars_written;
+
+		if (i < 3) {
+			cur_str[0] = '.';
+			cur_str++;
+		}
+	}
+
+	return ptr;
+}
+
+void _say_range_by_ip(GeoIP * gi, uint32_t ipnum ) {
+  unsigned long last_nm, mask, low, hi;
+  char ipaddr[16];
+  char tmp[16];
+  char ** range;
+
+  if ( info_flag == 0 )
+    return; /* noop unless extra information is requested */
+
+  range = GeoIP_range_by_ip( gi, __num_to_addr_r( ipnum, ipaddr ) );
+  if ( range == NULL )
+    return;
+
+  printf ( "  ipaddr: %s\n", ipaddr );
+
+  printf( "  range_by_ip:  %s - %s\n", range[0], range[1] );
+  last_nm = GeoIP_last_netmask(gi);
+  mask    = 0xffffffff << ( 32 - last_nm );
+  low     = ipnum & mask;
+  hi      = low + ( 0xffffffff & ~mask );
+  printf( "  network:      %s - %s ::%ld\n",
+    __num_to_addr_r( low, ipaddr ),
+    __num_to_addr_r( hi,  tmp ),
+    last_nm
+  );
+  printf( "  ipnum: %u\n", ipnum );
+  printf( "  range_by_num: %lu - %lu\n", __addr_to_num(range[0]), __addr_to_num(range[1]) );
+  printf( "  network num:  %lu - %lu ::%lu\n", low, hi, last_nm );
+
+  GeoIP_range_by_ip_delete(range);
+}
+
 void
 geoiplookup(GeoIP * gi, char *hostname, int i)
 {
 	const char     *country_code;
 	const char     *country_name;
 	const char     *domain_name;
+        const char     *asnum_name;
 	int             netspeed;
 	int             country_id;
 	GeoIPRegion    *region;
@@ -146,6 +245,17 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s\n", GeoIPDBDescription[i], domain_name);
+                                _say_range_by_ip(gi, ipnum);
+			}
+		}
+		else if (GEOIP_ASNUM_EDITION == i) {
+			asnum_name = GeoIP_name_by_ipnum(gi, ipnum);
+			if (asnum_name == NULL) {
+				printf("%s: IP Address not found\n", GeoIPDBDescription[i]);
+			}
+			else {
+				printf("%s: %s\n", GeoIPDBDescription[i], asnum_name);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_COUNTRY_EDITION == i) {
@@ -157,6 +267,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s, %s\n", GeoIPDBDescription[i], country_code, country_name);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_REGION_EDITION_REV0 == i || GEOIP_REGION_EDITION_REV1 == i) {
@@ -166,6 +277,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s, %s\n", GeoIPDBDescription[i], region->country_code, region->region);
+                                _say_range_by_ip(gi, ipnum);
 				GeoIPRegion_delete(region);
 			}
 		}
@@ -177,6 +289,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			else {
 				printf("%s: %s, %s, %s, %s, %f, %f\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region),
 				       _mk_NA(gir->city), _mk_NA(gir->postal_code), gir->latitude, gir->longitude);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_CITY_EDITION_REV1 == i) {
@@ -187,6 +300,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			else {
 				printf("%s: %s, %s, %s, %s, %f, %f, %d, %d\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code),
 				       gir->latitude, gir->longitude, gir->metro_code, gir->area_code);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_ORG_EDITION == i || GEOIP_ISP_EDITION == i) {
@@ -196,6 +310,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			}
 			else {
 				printf("%s: %s\n", GeoIPDBDescription[i], org);
+                                _say_range_by_ip(gi, ipnum);
 			}
 		}
 		else if (GEOIP_NETSPEED_EDITION == i) {
@@ -212,6 +327,7 @@ geoiplookup(GeoIP * gi, char *hostname, 
 			else if (netspeed == GEOIP_CORPORATE_SPEED) {
 				printf("%s: Corporate\n", GeoIPDBDescription[i]);
 			}
+                        _say_range_by_ip(gi, ipnum);
 		}
 		else {
 
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate.c c/apps/geoipupdate.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate.c	2009-02-24 14:01:41.000000000 -0600
+++ c/apps/geoipupdate.c	2009-05-29 03:55:00.000000000 -0500
@@ -97,6 +97,7 @@ int main (int argc, char *argv[]) {
 			exit(0);
 		case 'v':
 			verbose = 1;
+                        break;
 		case 'f':
 			license_file = optarg;
 			break;
@@ -279,5 +280,5 @@ int main (int argc, char *argv[]) {
 	if (client_ipaddr) {
 		free(client_ipaddr);
 	}
-	exit(0);
+	exit(err);
 }
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate-pureperl.pl c/apps/geoipupdate-pureperl.pl
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps/geoipupdate-pureperl.pl	2009-02-24 10:04:39.000000000 -0600
+++ c/apps/geoipupdate-pureperl.pl	2009-03-22 09:40:33.000000000 -0500
@@ -40,7 +40,7 @@ https
 use strict;
 use warnings;
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 use 5.008;
 use Data::Dumper;
@@ -220,7 +220,7 @@ sub _gunzip_and_replace {
   {
     local $_;
     open my $gin, '<:gzip', \$content or die $!;
-    open my $gout, '>', $geoip_filename . '.test' or die $!;
+    open my $gout, '>:raw', $geoip_filename . '.test' or die $!;
     print {$gout} $_ while (<$gin>);
   }
 
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/apps: Makefile.in
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/ChangeLog c/ChangeLog
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/ChangeLog	2009-02-24 19:44:38.000000000 -0600
+++ c/ChangeLog	2009-08-30 21:15:04.000000000 -0500
@@ -1,3 +1,20 @@
+	* Add more IPv6 functions ( Boris Zentner )
+	    const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr);
+	    const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *host);
+	    const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr);
+	    const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *host);
+	    const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr);
+	    const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *host);
+	* Make sure that GeoIP_*_v6 functions refuse GEOIP_PROXY_EDITION and
+	    GEOIP_NETSPEED_EDITION databases ( Boris Zentner ) 
+	* Update libGeoIP/regionName.c with FIPS codes from 20090723 ( Boris Zentner )
+	* Fix geoipupdate's -v option to not change the license filename ( Thom May )
+	* Fix geoipupdate's exit code ( Thom May )
+	* Add support for ASNUM_EDITION ( Boris Zentner )
+	* Fix -i output for larger values, sign issue ( Boris Zentner )
+	* Add -i flag for more information on netmask, range_by_ip and the current network range ( Boris Zentner )
+	* Add support for DOMAIN_EDITION database type ( Boris Zentner )
+	* Fix apps/geoipupdate-pureperl.pl output layer on W32 ( Boris Zentner )
 1.4.6	2009-02-25
 	* Fix geoipupdate's my_printf function ( Boris Zentner )
 	* Fix typo in apps/geoipupdate-pureperl.pl replace PerlIO::Gzip with PerlIO::gzip ( Boris Zentner ) 
Only in c/conf: CVS
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/conf: Makefile.in
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: config.guess
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: config.sub
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: configure
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/configure.in c/configure.in
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/configure.in	2009-02-24 10:03:23.000000000 -0600
+++ c/configure.in	2009-08-30 21:15:04.000000000 -0500
@@ -1,6 +1,6 @@
 dnl AM_CONFIG_HEADER(config.h)
 
-AC_INIT([GeoIP], [1.4.6],[support at maxmind.com],[GeoIP])
+AC_INIT([GeoIP], [1.4.7],[support at maxmind.com],[GeoIP])
 AC_GNU_SOURCE
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([libGeoIP/GeoIP.c])
Only in c/: CVS
Only in c/data: CVS
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data: GeoIP.dat
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/data: Makefile.in
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: fetch-geoipdata-city.pl
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: fetch-geoipdata.pl
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: GeoIP.spec
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: install-sh
Only in c/libGeoIP: CVS
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.c c/libGeoIP/GeoIP.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.c	2009-02-24 10:03:23.000000000 -0600
+++ c/libGeoIP/GeoIP.c	2009-08-30 21:15:04.000000000 -0500
@@ -366,10 +366,11 @@ void _setup_segments(GeoIP * gi) {
 				gi->databaseSegments = malloc(sizeof(int));
 				gi->databaseSegments[0] = STATE_BEGIN_REV1;
 			} else if (gi->databaseType == GEOIP_CITY_EDITION_REV0 ||
-								 gi->databaseType == GEOIP_CITY_EDITION_REV1 ||
-								 gi->databaseType == GEOIP_ORG_EDITION ||
-								 gi->databaseType == GEOIP_ISP_EDITION ||
-								 gi->databaseType == GEOIP_ASNUM_EDITION) {
+				   gi->databaseType == GEOIP_CITY_EDITION_REV1 ||
+		                   gi->databaseType == GEOIP_ORG_EDITION ||
+		                   gi->databaseType == GEOIP_DOMAIN_EDITION ||
+		 		   gi->databaseType == GEOIP_ISP_EDITION ||
+			  	   gi->databaseType == GEOIP_ASNUM_EDITION) {
 				/* City/Org Editions have two segments, read offset of second segment */
 				gi->databaseSegments = malloc(sizeof(int));
 				gi->databaseSegments[0] = 0;
@@ -377,8 +378,9 @@ void _setup_segments(GeoIP * gi) {
 				for (j = 0; j < SEGMENT_RECORD_LENGTH; j++) {
 					gi->databaseSegments[0] += (buf[j] << (j * 8));
 				}
-				if (gi->databaseType == GEOIP_ORG_EDITION ||
-						gi->databaseType == GEOIP_ISP_EDITION)
+				if (gi->databaseType == GEOIP_ORG_EDITION    ||
+		                    gi->databaseType == GEOIP_DOMAIN_EDITION ||                                  
+			 	    gi->databaseType == GEOIP_ISP_EDITION)
 					gi->record_length = ORG_RECORD_LENGTH;
 			}
 			break;
@@ -831,18 +833,36 @@ void GeoIP_delete (GeoIP *gi) {
 	free(gi);
 }
 
+const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *name) {
+	int country_id;
+	country_id = GeoIP_id_by_name_v6(gi, name);
+	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
+}
+
 const char *GeoIP_country_code_by_name (GeoIP* gi, const char *name) {
 	int country_id;
 	country_id = GeoIP_id_by_name(gi, name);
 	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
 }
 
+const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *name) {
+	int country_id;
+	country_id = GeoIP_id_by_name_v6(gi, name);
+	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
+}
+
 const char *GeoIP_country_code3_by_name (GeoIP* gi, const char *name) {
 	int country_id;
 	country_id = GeoIP_id_by_name(gi, name);
 	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
+const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *name) {
+	int country_id;
+	country_id = GeoIP_id_by_name_v6(gi, name);
+	return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
+}
+
 const char *GeoIP_country_name_by_name (GeoIP* gi, const char *name) {
 	int country_id;
 	country_id = GeoIP_id_by_name(gi, name);
@@ -945,7 +965,7 @@ int GeoIP_id_by_name_v6 (GeoIP* gi, cons
        if (name == NULL) {
                return 0;
        }
-       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 && gi->databaseType != GEOIP_PROXY_EDITION && gi->databaseType != GEOIP_NETSPEED_EDITION) {
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6) {
                printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
                return 0;
        }
@@ -956,18 +976,36 @@ int GeoIP_id_by_name_v6 (GeoIP* gi, cons
        return ret;
 }
 
+const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr) {
+	int country_id;
+	country_id = GeoIP_id_by_addr_v6(gi, addr);
+	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
+}
+
 const char *GeoIP_country_code_by_addr (GeoIP* gi, const char *addr) {
 	int country_id;
 	country_id = GeoIP_id_by_addr(gi, addr);
 	return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
 }
 
+const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr) {
+	int country_id;
+	country_id = GeoIP_id_by_addr_v6(gi, addr);
+	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
+}
+
 const char *GeoIP_country_code3_by_addr (GeoIP* gi, const char *addr) {
 	int country_id;
 	country_id = GeoIP_id_by_addr(gi, addr);
 	return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
+const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr) {
+	int country_id;
+	country_id = GeoIP_id_by_addr_v6(gi, addr);
+	return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
+}
+
 const char *GeoIP_country_name_by_addr (GeoIP* gi, const char *addr) {
 	int country_id;
 	country_id = GeoIP_id_by_addr(gi, addr);
@@ -1010,10 +1048,18 @@ const char *GeoIP_country_code3_by_ipnum
        return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
+int GeoIP_country_id_by_addr_v6 (GeoIP* gi, const char *addr) {
+	return GeoIP_id_by_addr_v6(gi, addr);
+}
+
 int GeoIP_country_id_by_addr (GeoIP* gi, const char *addr) {
 	return GeoIP_id_by_addr(gi, addr);
 }
 
+int GeoIP_country_id_by_name_v6 (GeoIP* gi, const char *host) {
+	return GeoIP_id_by_name_v6(gi, host);
+}
+
 int GeoIP_country_id_by_name (GeoIP* gi, const char *host) {
 	return GeoIP_id_by_name(gi, host);
 }
@@ -1024,9 +1070,7 @@ int GeoIP_id_by_addr_v6 (GeoIP* gi, cons
        if (addr == NULL) {
                return 0;
        }
-       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 &&
-                       gi->databaseType != GEOIP_PROXY_EDITION &&
-                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6) {
                printf("Invalid database type %s, expected %s\n",
                                         GeoIPDBDescription[(int)gi->databaseType],
                                         GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
@@ -1062,9 +1106,7 @@ int GeoIP_id_by_ipnum_v6 (GeoIP* gi, geo
                return 0;
        }
 */     
-       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 && 
-                       gi->databaseType != GEOIP_PROXY_EDITION &&
-                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6) {
                printf("Invalid database type %s, expected %s\n",
                                         GeoIPDBDescription[(int)gi->databaseType],
                                         GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
@@ -1346,6 +1388,7 @@ char *_get_name (GeoIP* gi, unsigned lon
 
 	if (gi->databaseType != GEOIP_ORG_EDITION &&
 			gi->databaseType != GEOIP_ISP_EDITION &&
+			gi->databaseType != GEOIP_DOMAIN_EDITION &&
 			gi->databaseType != GEOIP_ASNUM_EDITION) {
 		printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
 		return NULL;
@@ -1382,6 +1425,7 @@ char *_get_name_v6 (GeoIP* gi, geoipv6_t
 
   if (gi->databaseType != GEOIP_ORG_EDITION &&
       gi->databaseType != GEOIP_ISP_EDITION &&
+      gi->databaseType != GEOIP_DOMAIN_EDITION &&
       gi->databaseType != GEOIP_ASNUM_EDITION) {
     printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
     return NULL;
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.h c/libGeoIP/GeoIP.h
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/GeoIP.h	2009-02-24 10:03:23.000000000 -0600
+++ c/libGeoIP/GeoIP.h	2009-08-30 21:15:04.000000000 -0500
@@ -162,6 +162,13 @@ GEOIP_API const char *GeoIP_country_name
 GEOIP_API const char *GeoIP_country_code_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum);
 GEOIP_API const char *GeoIP_country_code3_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum);
 
+GEOIP_API const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr);
+GEOIP_API const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *host);
+GEOIP_API const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr);
+GEOIP_API const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *host);
+GEOIP_API const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr);
+GEOIP_API const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *host);
+
 /* Deprecated - for backwards compatibility only */
 GEOIP_API int GeoIP_country_id_by_addr (GeoIP* gi, const char *addr);
 GEOIP_API int GeoIP_country_id_by_name (GeoIP* gi, const char *host);
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP: Makefile.in
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/regionName.c c/libGeoIP/regionName.c
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/libGeoIP/regionName.c	2009-02-24 10:03:23.000000000 -0600
+++ c/libGeoIP/regionName.c	2009-07-23 15:48:20.000000000 -0500
@@ -2249,6 +2249,12 @@ const char * GeoIP_region_name_by_code(c
   }
   if (strcmp(country_code,"CI") == 0) {
     switch (region_code2) {
+      case 5:
+      name = "Atacama";
+      break;
+      case 6:
+      name = "Biobio";
+      break;
       case 51:
       name = "Sassandra";
       break;
@@ -6102,6 +6108,9 @@ const char * GeoIP_region_name_by_code(c
       case 29:
       name = "Snafellsnes- og Hnappadalssysla";
       break;
+      case 30:
+      name = "Strandasysla";
+      break;
       case 31:
       name = "Sudur-Mulasysla";
       break;
@@ -6875,6 +6884,9 @@ const char * GeoIP_region_name_by_code(c
       case 1:
       name = "Beqaa";
       break;
+      case 2:
+      name = "Al Janub";
+      break;
       case 3:
       name = "Liban-Nord";
       break;
@@ -7092,6 +7104,9 @@ const char * GeoIP_region_name_by_code(c
       case 4:
       name = "Grand Cape Mount";
       break;
+      case 5:
+      name = "Lofa";
+      break;
       case 6:
       name = "Maryland";
       break;
@@ -7107,15 +7122,33 @@ const char * GeoIP_region_name_by_code(c
       case 11:
       name = "Grand Bassa";
       break;
+      case 12:
+      name = "Grand Cape Mount";
+      break;
+      case 13:
+      name = "Maryland";
+      break;
       case 14:
       name = "Montserrado";
       break;
+      case 17:
+      name = "Margibi";
+      break;
+      case 18:
+      name = "River Cess";
+      break;
       case 19:
       name = "Grand Gedeh";
       break;
       case 20:
       name = "Lofa";
       break;
+      case 21:
+      name = "Gbarpolu";
+      break;
+      case 22:
+      name = "River Gee";
+      break;
     }
   }
   if (strcmp(country_code,"LS") == 0) {
@@ -8848,12 +8881,18 @@ const char * GeoIP_region_name_by_code(c
       case 11:
       name = "Federal Capital Territory";
       break;
+      case 12:
+      name = "Gongola";
+      break;
       case 16:
       name = "Ogun";
       break;
       case 17:
       name = "Ondo";
       break;
+      case 18:
+      name = "Oyo";
+      break;
       case 21:
       name = "Akwa Ibom";
       break;
@@ -9271,6 +9310,9 @@ const char * GeoIP_region_name_by_code(c
       case 1092:
       name = "West Coast";
       break;
+      case 85:
+      name = "Waikato";
+      break;
     }
   }
   if (strcmp(country_code,"OM") == 0) {
@@ -9612,6 +9654,9 @@ const char * GeoIP_region_name_by_code(c
       case 44:
       name = "Mountain";
       break;
+      case 45:
+      name = "Negros Occidental";
+      break;
       case 46:
       name = "Negros Oriental";
       break;
@@ -10711,6 +10756,9 @@ const char * GeoIP_region_name_by_code(c
       case 6:
       name = "Gitarama";
       break;
+      case 7:
+      name = "Kibungo";
+      break;
       case 9:
       name = "Kigali";
       break;
@@ -11532,6 +11580,9 @@ const char * GeoIP_region_name_by_code(c
       case 7:
       name = "Thies";
       break;
+      case 8:
+      name = "Louga";
+      break;
       case 9:
       name = "Fatick";
       break;
@@ -12075,6 +12126,12 @@ const char * GeoIP_region_name_by_code(c
       case 78:
       name = "Mukdahan";
       break;
+      case 79:
+      name = "Nong Bua Lamphu";
+      break;
+      case 80:
+      name = "Sa Kaeo";
+      break;
     }
   }
   if (strcmp(country_code,"TJ") == 0) {
@@ -12112,22 +12169,19 @@ const char * GeoIP_region_name_by_code(c
   if (strcmp(country_code,"TN") == 0) {
     switch (region_code2) {
       case 2:
-      name = "Al Qasrayn";
+      name = "Kasserine";
       break;
       case 3:
-      name = "Al Qayrawan";
+      name = "Kairouan";
       break;
       case 6:
-      name = "Jundubah";
-      break;
-      case 10:
-      name = "Qafsah";
+      name = "Jendouba";
       break;
       case 14:
-      name = "Kef";
+      name = "El Kef";
       break;
       case 15:
-      name = "Al Mahdiyah";
+      name = "Al Mahdia";
       break;
       case 16:
       name = "Al Munastir";
@@ -12136,58 +12190,52 @@ const char * GeoIP_region_name_by_code(c
       name = "Bajah";
       break;
       case 18:
-      name = "Banzart";
+      name = "Bizerte";
       break;
       case 19:
-      name = "Nabul";
+      name = "Nabeul";
       break;
       case 22:
-      name = "Silyanah";
+      name = "Siliana";
       break;
       case 23:
-      name = "Susah";
+      name = "Sousse";
       break;
       case 26:
-      name = "Chaiyaphum Province";
+      name = "Ariana";
       break;
       case 27:
-      name = "Bin";
+      name = "Ben Arous";
       break;
       case 28:
       name = "Madanin";
       break;
       case 29:
-      name = "Qabis";
+      name = "Gabes";
       break;
       case 30:
-      name = "Qafsah";
+      name = "Gafsa";
       break;
       case 31:
-      name = "Qibili";
+      name = "Kebili";
       break;
       case 32:
-      name = "Safaqis";
+      name = "Sfax";
       break;
       case 33:
-      name = "Sidi Bu Zayd";
+      name = "Sidi Bou Zid";
       break;
       case 34:
-      name = "Tatawin";
+      name = "Tataouine";
       break;
       case 35:
-      name = "Tawzar";
+      name = "Tozeur";
       break;
       case 36:
       name = "Tunis";
       break;
       case 37:
-      name = "Zaghwan";
-      break;
-      case 38:
-      name = "Ariana";
-      break;
-      case 39:
-      name = "Manouba";
+      name = "Zaghouan";
       break;
     }
   }
@@ -13035,6 +13083,9 @@ const char * GeoIP_region_name_by_code(c
       case 5:
       name = "Cao Bang";
       break;
+      case 6:
+      name = "Cuu Long";
+      break;
       case 7:
       name = "Dac Lac";
       break;
@@ -13053,6 +13104,9 @@ const char * GeoIP_region_name_by_code(c
       case 14:
       name = "Ha Nam Ninh";
       break;
+      case 15:
+      name = "Ha Noi";
+      break;
       case 16:
       name = "Ha Son Binh";
       break;
@@ -13377,6 +13431,9 @@ const char * GeoIP_region_name_by_code(c
       case 5:
       name = "Shabwah";
       break;
+      case 6:
+      name = "Al Ghaydah";
+      break;
       case 8:
       name = "Al Hudaydah";
       break;
Only in c/: LICENSE
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: LICENSE.txt
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: Makefile.in
Only in c/man: CVS
Only in c/man: geoiplookup.1
Only in c/man: geoiplookup6.1
Only in c/man: geoipupdate.1
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/man: Makefile.in
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: missing
diff -urp --exclude=from=/home/mdomsch/excludes --minimal /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/README c/README
--- /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/README	2009-02-24 10:03:24.000000000 -0600
+++ c/README	2009-06-10 07:35:19.000000000 -0500
@@ -182,4 +182,27 @@ from XORG X-Server). It happens at least
 If GEOIP_MMAP_CACHE doesn't work on a 64bit machine, try adding
 the flag "MAP_32BIT" to the mmap call.
 
+If you get a "passing argument 3 of 'gethostbyname_r' from incompatible pointer type"
+error on AIX, download and/or untar a fresh copy of GeoIP.  ( To avoid cached
+results from a previous ./configure run )
+
+cd ./GeoIP-1.4.6
+then edit the file ./configure
+
+and delete these two lines:
+
+#define HAVE_GETHOSTBYNAME_R 1
+
+#define GETHOSTBYNAME_R_RETURNS_INT 1
+
+then save the configure script
+
+and build it as usual
+
+./configure
+make
+sudo make install
+
+
+
 To submit a patch, please contact support at maxmind.com 
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/: README.fedora
Only in c/: regioncode
Only in c/test: CVS
Only in c/test: fail_test.txt
Only in /home/mdomsch/cvs/fedora-extras/GeoIP/devel/GeoIP-1.4.6/test: Makefile.in
Only in c/test: proxy_test.txt
Only in c/: timezone


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/GeoIP.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- GeoIP.spec	8 Mar 2009 11:47:50 -0000	1.12
+++ GeoIP.spec	1 Sep 2009 14:16:23 -0000	1.13
@@ -1,15 +1,17 @@
+%define tarballversion 1.4.6
 Name: GeoIP           
-Version: 1.4.6
-Release: 1%{?dist}
+Version: 1.4.7
+Release: 0.1.20090931cvs%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
-Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
+Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{tarballversion}.tar.gz 
 Source1: LICENSE.txt
 Source2: fetch-geoipdata-city.pl
 Source3: fetch-geoipdata.pl
 Source4: README.Fedora
+Patch0: geoip-1.4.6-ipv6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: geoip < %{version}-%{release}
 Provides: geoip = %{version}-%{release}
@@ -33,7 +35,8 @@ Obsoletes: geoip-devel < %{version}-%{re
 Development headers and static libraries for building GeoIP-based applications
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{tarballversion}
+%patch0 -p1
 install -D -m644 %{SOURCE1} LICENSE.txt
 install -D -m644 %{SOURCE2} fetch-geoipdata-city.pl
 install -D -m644 %{SOURCE3} fetch-geoipdata.pl
@@ -81,14 +84,29 @@ rm -rf %{buildroot}
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Mon Aug 31 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.4.7.0.1.20090931
+- apply CVS HEAD 20090931 which includes IPv6 functions
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 08 2009 Michael Fleming <mfleming+rpm at enlartenment.com> - 1.4.6-1
 - Add geoiplookup6 man page
 - Update to 1.4.6
 
-* Sat Nov 29 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.5-1
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.5-2
 - Update to 1.4.5
 - Fix database URL locations in Perl helper scripts
 
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.4-2
+- Autorebuild for GCC 4.3
+
+* Mon Jan 28 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.4-1
+- New upstream release.
+
 * Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
 - New upstream release.
 - Fix GeoIPCity fetcher script



From jakub at fedoraproject.org  Tue Sep  1 14:23:12 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue,  1 Sep 2009 14:23:12 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.284, 1.285 gcc.spec, 1.62, 1.63 sources,
	1.288, 1.289 gcc44-power7-2.patch, 1.3,
	NONE gcc44-power7-3.patch, 1.2, NONE gcc44-power7.patch, 1.6, NONE
Message-ID: <20090901142312.3B71A11C00EF@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6305

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-power7-2.patch gcc44-power7-3.patch gcc44-power7.patch 
Log Message:
4.4.1-7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- .cvsignore	18 Aug 2009 13:48:09 -0000	1.284
+++ .cvsignore	1 Sep 2009 14:23:10 -0000	1.285
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090818.tar.bz2
+gcc-4.4.1-20090901.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gcc.spec	18 Aug 2009 13:48:09 -0000	1.62
+++ gcc.spec	1 Sep 2009 14:23:11 -0000	1.63
@@ -1,9 +1,9 @@
-%global DATE 20090818
-%global SVNREV 150873
+%global DATE 20090901
+%global SVNREV 151272
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 6
+%global gcc_release 7
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -43,7 +43,7 @@ Version: %{gcc_version}
 Release: %{gcc_release}
 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
-License: GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
+License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group: Development/Languages
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -155,9 +155,6 @@ Patch20: gcc44-libtool-no-rpath.patch
 Patch21: gcc44-cloog-dl.patch
 Patch22: gcc44-raw-string.patch
 Patch24: gcc44-unwind-debug-hook.patch
-Patch25: gcc44-power7.patch
-Patch26: gcc44-power7-2.patch
-Patch27: gcc44-power7-3.patch
 Patch28: gcc44-pr38757.patch
 Patch29: gcc44-libstdc++-docs.patch
 Patch30: gcc44-rh503816-1.patch
@@ -464,9 +461,6 @@ which are required to compile with the G
 %endif
 %patch22 -p0 -b .raw-string~
 %patch24 -p0 -b .unwind-debug-hook~
-%patch25 -p0 -b .power7~
-%patch26 -p0 -b .power7-2~
-%patch27 -p0 -b .power7-3~
 %patch28 -p0 -b .pr38757~
 %if %{build_libstdcxx_docs}
 %patch29 -p0 -b .libstdc++-docs~
@@ -1812,6 +1806,18 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Sep  1 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-7
+- update from gcc-4_4-branch
+  - PRs c++/41120, c++/41127, c++/41131, fortran/41062, fortran/41102,
+	fortran/41121, fortran/41126, fortran/41139, fortran/41157,
+	fortran/41162, libfortran/40962, libstdc++/41005, middle-end/41094,
+	middle-end/41123, middle-end/41163, target/34412, target/40718
+- fix pr22033.C on ppc*/ia64/sparc*
+- emit namespace DIE even if it contains just some used type (PR debug/41170)
+- fix dynamic_cast (#519517)
+- backport power7 changes from the trunk, instead of using the old incomplete
+  backport from ibm/power7-meissner
+
 * Tue Aug 18 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-6
 - update from gcc-4_4-branch
   - PRs bootstrap/41018, c/41046, debug/37801, debug/40990, fortran/40847,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- sources	18 Aug 2009 13:48:10 -0000	1.288
+++ sources	1 Sep 2009 14:23:12 -0000	1.289
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-a280c87e7d0a44a99a6bc84bbe3eb86d  gcc-4.4.1-20090818.tar.bz2
+e68c85e9137a39272468f86268d87251  gcc-4.4.1-20090901.tar.bz2


--- gcc44-power7-2.patch DELETED ---


--- gcc44-power7-3.patch DELETED ---


--- gcc44-power7.patch DELETED ---



From overholt at fedoraproject.org  Tue Sep  1 14:25:06 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 14:25:06 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.19,1.20
Message-ID: <20090901142506.5DA8A11C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7668

Modified Files:
	maven-doxia.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.8.a10.1
- Add tomcat5 BR


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- maven-doxia.spec	1 Sep 2009 13:51:31 -0000	1.19
+++ maven-doxia.spec	1 Sep 2009 14:25:05 -0000	1.20
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.8.a10%{?dist}
+Release:        0.8.a10.1%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -81,6 +81,7 @@ BuildRequires:  plexus-maven-plugin >= 0
 BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
 BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
 BuildRequires:  tomcat5-servlet-2.4-api
+BuildRequires:  tomcat5
 %endif
 BuildRequires:  classworlds
 BuildRequires:  jakarta-commons-collections
@@ -246,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.8.a10.1
+- Add tomcat5 BR
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.8.a10
 - Add tomcat5-servlet-2.4-api BR
 



From than at fedoraproject.org  Tue Sep  1 14:34:18 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 14:34:18 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.510,1.511
Message-ID: <20090901143418.8CB9411C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10021

Modified Files:
	kdelibs.spec 
Log Message:
drop the workarounnd, it's now fixed in lastest glibc



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- kdelibs.spec	1 Sep 2009 12:21:49 -0000	1.510
+++ kdelibs.spec	1 Sep 2009 14:34:16 -0000	1.511
@@ -219,11 +219,6 @@ format for easy browsing.
 # add release version
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 
-# workaround for glibc on x86_64 (rawhide)
-%ifarch x86_64
-sed -i -e "s|-std=iso9899:1990||" cmake/modules/FindKDE4Internal.cmake
-%endif
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..



From hadess at fedoraproject.org  Tue Sep  1 14:40:38 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 14:40:38 +0000 (UTC)
Subject: rpms/rhythmbox/devel .cvsignore, 1.57, 1.58 rhythmbox.spec, 1.258, 
	1.259 sources, 1.59, 1.60
Message-ID: <20090901144038.1723911C0498@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12073

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-1
- Update to 0.12.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	10 Jul 2009 13:46:18 -0000	1.57
+++ .cvsignore	1 Sep 2009 14:40:37 -0000	1.58
@@ -1 +1 @@
-rhythmbox-0.12.3.tar.bz2
+rhythmbox-0.12.4.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- rhythmbox.spec	23 Aug 2009 00:45:38 -0000	1.258
+++ rhythmbox.spec	1 Sep 2009 14:40:37 -0000	1.259
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application
-Version: 0.12.3
-Release: 5%{?dist}
+Version: 0.12.4
+Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -224,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-1
+- Update to 0.12.4
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-5
 - Respect the button-images setting better
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	10 Jul 2009 13:46:18 -0000	1.59
+++ sources	1 Sep 2009 14:40:37 -0000	1.60
@@ -1 +1 @@
-4a28e79184f1a9737ac2e719a1478105  rhythmbox-0.12.3.tar.bz2
+38116cbe4d86ec2a3c54f32e5c2dc7e7  rhythmbox-0.12.4.tar.bz2



From overholt at fedoraproject.org  Tue Sep  1 14:52:06 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 14:52:06 +0000 (UTC)
Subject: rpms/maven-shared/devel maven-shared.spec,1.12,1.13
Message-ID: <20090901145206.E70BA11C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15487

Modified Files:
	maven-shared.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-3
- Add tomcat5, easymock, and maven2-plugin-source BRs


Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- maven-shared.spec	1 Sep 2009 13:52:29 -0000	1.12
+++ maven-shared.spec	1 Sep 2009 14:52:05 -0000	1.13
@@ -65,7 +65,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        8
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -90,6 +90,7 @@ BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 #BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-source
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  junit
 BuildRequires:  saxon
@@ -98,6 +99,8 @@ BuildRequires:  plexus-utils
 BuildRequires:  plexus-registry
 BuildRequires:  modello-maven-plugin
 BuildRequires:  tomcat5-servlet-2.4-api
+BuildRequires:  tomcat5
+BuildRequires:  easymock
 
 Requires:       maven2 >= 0:2.0.4
 Requires:       plexus-utils
@@ -1099,6 +1102,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-3
+- Add tomcat5, easymock, and maven2-plugin-source BRs
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-2
 - Add tomcat5-servlet-2.4-api BR
 



From hadess at fedoraproject.org  Tue Sep  1 14:56:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 14:56:53 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec, 1.259,
	1.260 0001-Fix-audio-CD-activation.patch, 1.1, NONE
Message-ID: <20090901145653.65AE511C00EF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19384

Modified Files:
	rhythmbox.spec 
Removed Files:
	0001-Fix-audio-CD-activation.patch 
Log Message:
Remove obsolete patch


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- rhythmbox.spec	1 Sep 2009 14:40:37 -0000	1.259
+++ rhythmbox.spec	1 Sep 2009 14:56:53 -0000	1.260
@@ -47,7 +47,6 @@ BuildRequires: perl(XML::Parser) intltoo
 
 ExcludeArch:    s390 s390x
 
-Patch0: 0001-Fix-audio-CD-activation.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592404
 Patch1: spinner.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592763
@@ -84,7 +83,6 @@ from, and sending media to UPnP/DLNA net
 
 %prep
 %setup -q
-%patch0 -p1 -b .audiocd
 %patch1 -p1 -b .spinner
 %patch2 -p1 -b .button-images
 


--- 0001-Fix-audio-CD-activation.patch DELETED ---



From hadess at fedoraproject.org  Tue Sep  1 14:58:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 14:58:18 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.43, 1.44 bluez.spec, 1.90,
	1.91 sources, 1.43, 1.44
Message-ID: <20090901145818.2FCA111C00EF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21416

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 4.50-1
- Update to 4.50



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	10 Aug 2009 13:14:06 -0000	1.43
+++ .cvsignore	1 Sep 2009 14:58:17 -0000	1.44
@@ -1 +1 @@
-bluez-4.47.tar.bz2
+bluez-4.50.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- bluez.spec	25 Aug 2009 15:22:45 -0000	1.90
+++ bluez.spec	1 Sep 2009 14:58:17 -0000	1.91
@@ -1,10 +1,10 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.47
-Release: 6%{?dist}
+Version: 4.50
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
-Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
+Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source3: dund.init
 Source4: dund.conf
@@ -281,6 +281,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 4.50-1
+- Update to 4.50
+
 * Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 4.47-6
 - don't buildrequire libusb1 on s390*
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	10 Aug 2009 13:14:06 -0000	1.43
+++ sources	1 Sep 2009 14:58:17 -0000	1.44
@@ -1 +1 @@
-528b6abe52ff5301290c066baaed1097  bluez-4.47.tar.bz2
+e80152c946493e1bb66eca718e8b7ee0  bluez-4.50.tar.gz



From hadess at fedoraproject.org  Tue Sep  1 14:59:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 14:59:24 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.15, 1.16 obexd.spec, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <20090901145924.95F3111C00EF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23016

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.17-1
- Update to 0.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	17 Aug 2009 13:37:18 -0000	1.15
+++ .cvsignore	1 Sep 2009 14:59:24 -0000	1.16
@@ -1 +1 @@
-obexd-0.16.tar.bz2
+obexd-0.17.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- obexd.spec	17 Aug 2009 13:33:46 -0000	1.15
+++ obexd.spec	1 Sep 2009 14:59:24 -0000	1.16
@@ -1,11 +1,11 @@
 Name:		obexd
-Version:	0.16
+Version:	0.17
 Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
 License:	GPLv2+
-Source0:	http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.bz2
+Source0:	http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.gz
 Url:		http://www.bluez.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.17-1
+- Update to 0.17
+
 * Mon Aug 17 2009 Bastien Nocera <bnocera at redhat.com> 0.16-1
 - Update to 0.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	17 Aug 2009 13:37:18 -0000	1.15
+++ sources	1 Sep 2009 14:59:24 -0000	1.16
@@ -1 +1 @@
-389de26da04cfabce7a011d582d1800f  obexd-0.16.tar.bz2
+e4abc602c9ba34a862d97951acab8ae7  obexd-0.17.tar.gz



From caolanm at fedoraproject.org  Tue Sep  1 15:01:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Sep 2009 15:01:52 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, 1.2,
	1.3 openoffice.org.spec, 1.1738, 1.1739 workspace.os131.patch,
	1.1, 1.2 workspace.pdfextfix02.patch, 1.2, 1.3
Message-ID: <20090901150152.3A4CC11C00EF@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-serv24985

Modified Files:
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 
	openoffice.org.spec workspace.os131.patch 
	workspace.pdfextfix02.patch 
Log Message:
Resolves: CVE-2009-0200/CVE-2009-0201

openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
 dbaccess/source/ui/misc/WCopyTable.cxx              |    2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx     |    2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx  |    2 +-
 wizards/com/sun/star/wizards/db/DBMetaData.java     |    4 ++--
 wizards/com/sun/star/wizards/table/TableWizard.java |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

Index: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch	21 Aug 2009 05:08:22 -0000	1.2
+++ openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch	1 Sep 2009 15:01:50 -0000	1.3
@@ -58,15 +58,15 @@ diff -ru dbaccess.orig/source/ui/misc/WC
 diff -ru dbaccess.orig/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableController.cxx
 --- dbaccess.orig/source/ui/tabledesign/TableController.cxx	2009-07-30 12:58:31.000000000 +0100
 +++ dbaccess/source/ui/tabledesign/TableController.cxx	2009-07-30 14:18:18.000000000 +0100
-@@ -1119,7 +1119,7 @@
+@@ -1100,7 +1100,7 @@
  	}
  	if(!bFoundPKey)
  	{
 -		if(_bNew && xMetaData.is() && xMetaData->supportsCoreSQLGrammar())
-+		if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
++                if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
  		{
-             String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
- 		    String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
+ 			String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
+ 			String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
 diff -ru dbaccess.orig/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.cxx
 --- dbaccess.orig/source/ui/tabledesign/TEditControl.cxx	2009-07-30 12:58:31.000000000 +0100
 +++ dbaccess/source/ui/tabledesign/TEditControl.cxx	2009-07-30 14:18:18.000000000 +0100


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1738
retrieving revision 1.1739
diff -u -p -r1.1738 -r1.1739
--- openoffice.org.spec	21 Aug 2009 05:12:22 -0000	1.1738
+++ openoffice.org.spec	1 Sep 2009 15:01:51 -0000	1.1739
@@ -153,6 +153,7 @@ Patch79: openoffice.org-3.1.0.ooo102566.
 Patch80: workspace.pdfextfix02.patch
 Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 Patch82: workspace.os131.patch
+Patch83: workspace.hb311fixes01.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1429,6 +1430,7 @@ tar xzf %{PATCH21}
 %patch80 -p0 -b .workspace.pdfextfix02.patch
 %patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 %patch82 -p0 -b .workspace.os131.patch
+%patch83 -p0 -b .workspace.hb311fixes01.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3804,7 +3806,8 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5.UNRELEASED
+* Mon Aug 31 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
+- Resolves: CVE-2009-0200/CVE-2009-0201
 - Resolves: rhbz#499474 soffice and .recently-used.xbel
 - Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    2 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  385 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |   53 ++---
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 532 insertions(+), 109 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.os131.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.os131.patch	21 Aug 2009 05:10:23 -0000	1.1
+++ workspace.os131.patch	1 Sep 2009 15:01:51 -0000	1.2
@@ -195,8 +195,8 @@ Index: sw/source/core/doc/docnew.cxx
 +    {
 +        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
 +        {
-+            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
-+            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
++            const SfxPoolItem& rSourceAttr = aAttrPool.GetDefaultItem( nWhich );
++            if( rSourceAttr != pRet->aAttrPool.GetDefaultItem( nWhich ) )
 +                aNewDefaults.Put( rSourceAttr );
 +        }
 +        nRange += 2;
@@ -976,7 +976,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <mmconfigitem.hxx>
  #include <sfx2/request.hxx>
  #include <hintids.hxx>
-@@ -3182,7 +3164,10 @@
+@@ -3176,7 +3158,10 @@
  
      SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
      BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
@@ -987,7 +987,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
      //save the settings of the first
      rSourceShell.SttEndDoc(TRUE);
      USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3192,6 +3177,8 @@
+@@ -3186,6 +3171,8 @@
  
      try
      {
@@ -996,7 +996,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
          // save the working document into a temporary location
          sSourceDocURL = URIHelper::SmartRel2Abs(
              INetURLObject(), utl::TempFile::CreateTempName(),
-@@ -3207,7 +3194,7 @@
+@@ -3201,7 +3188,7 @@
          pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
          uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
          xStore->storeToURL( sSourceDocURL, aValues );
@@ -1005,7 +1005,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
          // create a target docshell to put the merged document into
          SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
          xTargetDocShell->DoInitNew( 0 );
-@@ -3256,6 +3243,15 @@
+@@ -3250,6 +3237,15 @@
                      Application::Reschedule();
              }
  
@@ -1021,7 +1021,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
              // create a new docshell from the temporary document
              SfxBoolItem aHidden( SID_HIDDEN, TRUE );
              SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
-@@ -3265,9 +3261,13 @@
+@@ -3259,9 +3255,13 @@
                              rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
                                      &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
              if(pReturnValue)
@@ -1035,14 +1035,16 @@ Index: sw/source/ui/dbui/dbmgr.cxx
                  SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
                  pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
  
-@@ -3387,8 +3387,11 @@
+@@ -3381,8 +3381,11 @@
      {
-         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
+         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments")
      }
+-    if(sSourceDocURL.Len())
+-        File::remove( sSourceDocURL );
 +#ifdef SW_COPY_DOC_IN_MEMORY
 +#else
-     if(sSourceDocURL.Len())
-         File::remove( sSourceDocURL );
++     if(sSourceDocURL.Len())
++         File::remove( sSourceDocURL );
 +#endif
      DELETEZ(pImpl->pMergeData);
      bInMerge = FALSE;

workspace.pdfextfix02.patch:
 config/description.xml         |    2 
 inc/wrapper.hxx                |    8 
 pdfiadaptor.cxx                |   19 +
 pdfiadaptor.hxx                |    2 
 test/tests.cxx                 |    8 
 tree/drawtreevisiting.cxx      |   14 +
 tree/genericelements.hxx       |    3 
 tree/pdfiprocessor.cxx         |   78 ++++++-
 wrapper/wrapper.cxx            |  160 ++++++++++++---
 xpdfwrapper/makefile.mk        |    3 
 xpdfwrapper/pdfioutdev_gpl.cxx |  246 +++++++++++++++++-------
 xpdfwrapper/pdfioutdev_gpl.hxx |    6 
 xpdfwrapper/pnghelper.cxx      |  411 +++++++++++++++++++++++++++++++++++++++++
 xpdfwrapper/pnghelper.hxx      |   92 +++++++++
 xpdfwrapper/wrapper_gpl.cxx    |   50 +++-
 15 files changed, 956 insertions(+), 146 deletions(-)

Index: workspace.pdfextfix02.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.pdfextfix02.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.pdfextfix02.patch	21 Aug 2009 05:08:22 -0000	1.2
+++ workspace.pdfextfix02.patch	1 Sep 2009 15:01:51 -0000	1.3
@@ -357,7 +357,7 @@ Index: sdext/source/pdfimport/tree/pdfip
 ===================================================================
 --- sdext/source/pdfimport/tree/pdfiprocessor.cxx	(.../tags/OOO310_m11)	(revision 272982)
 +++ sdext/source/pdfimport/tree/pdfiprocessor.cxx	(.../cws/pdfextfix02)	(revision 272982)
-@@ -374,9 +374,10 @@
+@@ -362,9 +362,10 @@
           else
           {
              if (
@@ -371,87 +371,19 @@ Index: sdext/source/pdfimport/tree/pdfip
                  ( m_GlyphsList[i].getPrevGlypthsSpace() == 0.0 )
              ) 
              {
-@@ -451,45 +452,45 @@
-                                    const geometry::Matrix2D&        rFontMatrix )
- {
-     double isFirstLine= fYPrevTextPosition+ fXPrevTextPosition+ fPrevTextHeight+ fPrevTextWidth ;
--  
-+    
-     if(
--        (  ( ( fYPrevTextPosition!= rRect.Y1 ) ) ||
--           ( ( fXPrevTextPosition > rRect.X2 ) ) ||
--           ( ( fXPrevTextPosition+fPrevTextWidth*1.3)<rRect.X1 ) 
-+       (  ( ( fYPrevTextPosition!= rRect.Y1 ) ) ||
-+        ( ( fXPrevTextPosition > rRect.X2 ) ) ||
-+        ( ( fXPrevTextPosition+fPrevTextWidth*1.3)<rRect.X1 ) 
-         )  && ( isFirstLine> 0.0 ) 
--    )  
-+        )  
-     {
-         processGlyphLine();
--     
-+        
-     }
--       
--       CharGlyph aGlyph;
--
--       aGlyph.setGlyph ( rGlyphs );
--       aGlyph.setRect  ( rRect );
--       aGlyph.setFontMatrix ( rFontMatrix );
--       aGlyph.setGraphicsContext ( getCurrentContext() );
--       getGCId(getCurrentContext());
--       aGlyph.setCurElement( m_pCurElement );
--        
--       aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
--       aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
--       aGlyph.setPrevGlyphHeight  ( fPrevTextHeight );
--       aGlyph.setPrevGlyphWidth   ( fPrevTextWidth );
--
--       m_GlyphsList.push_back( aGlyph );
--
--       fYPrevTextPosition  = rRect.Y1;
--       fXPrevTextPosition  = rRect.X2;
--       fPrevTextHeight     = rRect.Y2-rRect.Y1;
--       fPrevTextWidth      = rRect.X2-rRect.X1;
--
--       if( !m_bIsWhiteSpaceInLine )
--       {
+@@ -474,8 +475,9 @@
+ 
+        if( !m_bIsWhiteSpaceInLine )
+        {
 -         rtl::OUString tempWhiteSpaceStr( 32 );
 -         m_bIsWhiteSpaceInLine=rGlyphs.equals( tempWhiteSpaceStr );
--       }
-- 
-+    
-+    CharGlyph aGlyph;
-+    
-+    aGlyph.setGlyph ( rGlyphs );
-+    aGlyph.setRect  ( rRect );
-+    aGlyph.setFontMatrix ( rFontMatrix );
-+    aGlyph.setGraphicsContext ( getCurrentContext() );
-+    getGCId(getCurrentContext());
-+    aGlyph.setCurElement( m_pCurElement );
-+    
-+    aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
-+    aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
-+    aGlyph.setPrevGlyphHeight  ( fPrevTextHeight );
-+    aGlyph.setPrevGlyphWidth   ( fPrevTextWidth );
-+    
-+    m_GlyphsList.push_back( aGlyph );
-+    
-+    fYPrevTextPosition  = rRect.Y1;
-+    fXPrevTextPosition  = rRect.X2;
-+    fPrevTextHeight     = rRect.Y2-rRect.Y1;
-+    fPrevTextWidth      = rRect.X2-rRect.X1;
-+    
-+    if( !m_bIsWhiteSpaceInLine )
-+    {
-+        static rtl::OUString tempWhiteSpaceStr( 0x20 );
-+        static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); 
-+        m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
-+    }
- }
++         static rtl::OUString tempWhiteSpaceStr( 0x20 );
++         static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); 
++         m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
+        }
   
- GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph )
-@@ -576,22 +577,70 @@
+ }
+@@ -564,22 +566,70 @@
  {
      const GraphicsContext& rGC( getCurrentContext() );
  
@@ -474,7 +406,7 @@ Index: sdext/source/pdfimport/tree/pdfip
 +        aTrans.identity();
 +        aTrans.scale( aScale.getX(), aScale.getY() );
 +        aTrans.rotate( -fRotate );
- 
++
 +        basegfx::B2DRange aRect( 0, 0, 1, 1 );
 +        aRect.transform( aTrans );
 +        
@@ -505,7 +437,7 @@ Index: sdext/source/pdfimport/tree/pdfip
 +    // transform unit rect to determine view box
 +    basegfx::B2DRange aRect( 0, 0, 1, 1 );
 +    aRect.transform( aTrans );
-+
+ 
      // TODO(F3): Handle clip
      const sal_Int32 nGCId = getGCId(rGC);
      FrameElement* pFrame = m_pElFactory->createFrameElement( m_pCurElement, nGCId );    



From caolanm at fedoraproject.org  Tue Sep  1 15:08:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Sep 2009 15:08:50 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 workspace.hb311fixes01.patch,NONE,1.1
Message-ID: <20090901150851.224CC11C00EF@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-serv30927

Added Files:
	workspace.hb311fixes01.patch 
Log Message:
Resolves: CVE-2009-0200/CVE-2009-0201

workspace.hb311fixes01.patch:
 ww8par2.cxx |   61 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 12 deletions(-)

--- NEW FILE workspace.hb311fixes01.patch ---
Index: sw/source/filter/ww8/ww8par2.cxx
===================================================================
--- sw/source/filter/ww8/ww8par2.cxx	(.../tags/OOO310_m14)	(revision 275245)
+++ sw/source/filter/ww8/ww8par2.cxx	(.../cws/hb311fixes01)	(revision 275245)
@@ -1399,14 +1401,34 @@
     if( nWwCols && pParamsTInsert )        // set one or more cell length(s)
     {
         BYTE nitcInsert = pParamsTInsert[0]; // position at which to insert
+        if (nitcInsert >= MAX_COL)  // cannot insert into cell outside max possible index
+            return;
         BYTE nctc  = pParamsTInsert[1];      // number of cells
         USHORT ndxaCol = SVBT16ToShort( pParamsTInsert+2 );
 
         short nNewWwCols;
         if (nitcInsert > nWwCols)
+        {
             nNewWwCols = nitcInsert+nctc;
+            //if new count would be outside max possible count, clip it, and calc a new replacement
+            //legal nctc
+            if (nNewWwCols > MAX_COL)
+            {
+                nNewWwCols = MAX_COL;
+                nctc = ::sal::static_int_cast<BYTE>(nNewWwCols-nitcInsert);
+            }
+        }
         else
+        {
             nNewWwCols = nWwCols+nctc;
+            //if new count would be outside max possible count, clip it, and calc a new replacement
+            //legal nctc
+            if (nNewWwCols > MAX_COL)
+            {
+                nNewWwCols = MAX_COL;
+                nctc = ::sal::static_int_cast<BYTE>(nNewWwCols-nWwCols);
+            }
+        }
 
         WW8_TCell *pTC2s = new WW8_TCell[nNewWwCols];
         setcelldefaults(pTC2s, nNewWwCols);
@@ -1542,25 +1564,42 @@
     if( nWwCols && pParamsTDelete )        // set one or more cell length(s)
     {
         BYTE nitcFirst= pParamsTDelete[0]; // first col to be deleted
+        if (nitcFirst >= nWwCols) // first index to delete from doesn't exist
+            return;
         BYTE nitcLim  = pParamsTDelete[1]; // (last col to be deleted)+1
+        if (nitcLim <= nitcFirst) // second index to delete to is not greater than first index
+            return;
 
-        BYTE nShlCnt  = static_cast< BYTE >(nWwCols - nitcLim); // count of cells to be shifted
+        /*
+         * sprmTDelete causes any rgdxaCenter and rgtc entries whose index is
+         * greater than or equal to itcLim to be moved
+         */
+        int nShlCnt  = nWwCols - nitcLim; // count of cells to be shifted
 
+        if (nShlCnt >= 0) //There exist entries whose index is greater than or equal to itcLim
+        {
+            WW8_TCell* pAktTC  = pTCs + nitcFirst;
+            int i = 0;
+            while( i < nShlCnt )
+            {
+                // adjust the left x-position
+                nCenter[nitcFirst + i] = nCenter[nitcLim + i];
 
-        WW8_TCell* pAktTC  = pTCs + nitcFirst;
-        int i = 0;
-        for( ; i < nShlCnt; i++, ++pAktTC )
-        {
-            // adjust the left x-position
+                // adjust the cell's borders
+                *pAktTC = pTCs[ nitcLim + i];
+
+                ++i;
+                ++pAktTC;
+            }
+            // adjust the left x-position of the dummy at the very end
             nCenter[nitcFirst + i] = nCenter[nitcLim + i];
-
-            // adjust the cell's borders
-            *pAktTC = pTCs[ nitcLim + i];
         }
-        // adjust the left x-position of the dummy at the very end
-        nCenter[nitcFirst + i] = nCenter[nitcLim + i];
 
-        nWwCols -= (nitcLim - nitcFirst);
+        short nCellsDeleted = nitcLim - nitcFirst;
+        //clip delete request to available number of cells
+        if (nCellsDeleted > nWwCols)
+            nCellsDeleted = nWwCols;
+        nWwCols -= nCellsDeleted;
     }
 }
 



From pghmcfc at fedoraproject.org  Tue Sep  1 15:14:58 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue,  1 Sep 2009 15:14:58 +0000 (UTC)
Subject: rpms/perl-FileHandle-Unget/devel .cvsignore, 1.3,
	1.4 perl-FileHandle-Unget.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <20090901151458.F0BE511C00EF@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-FileHandle-Unget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3520

Modified Files:
	.cvsignore perl-FileHandle-Unget.spec sources 
Log Message:
- Update to 0.1623
  - fix uninitialized value warning and incorrect behaviour (CPAN RT#48528)
  - remove reference to obsolete ExtUtils::MakeMaker::bytes (CPAN RT#48984)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jul 2008 09:25:38 -0000	1.3
+++ .cvsignore	1 Sep 2009 15:14:58 -0000	1.4
@@ -1 +1 @@
-FileHandle-Unget-0.1622.tar.gz
+FileHandle-Unget-0.1623.tar.gz


Index: perl-FileHandle-Unget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/perl-FileHandle-Unget.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-FileHandle-Unget.spec	26 Jul 2009 06:06:36 -0000	1.10
+++ perl-FileHandle-Unget.spec	1 Sep 2009 15:14:58 -0000	1.11
@@ -6,8 +6,8 @@
 
 Summary:	A FileHandle that supports ungetting of multiple bytes
 Name:		perl-FileHandle-Unget
-Version:	0.1622
-Release:	3%{?dist}
+Version:	0.1623
+Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/FileHandle-Unget/
@@ -35,7 +35,7 @@ string of bytes back on the input.
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec %{__rmdir} {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %check
@@ -51,6 +51,11 @@ string of bytes back on the input.
 %{_mandir}/man3/FileHandle::Unget.3pm*
 
 %changelog
+* Tue Sep  1 2009 Paul Howarth <paul at city-fan.org> 0.1623-1
+- Update to 0.1623
+  - fix uninitialized value warning and incorrect behaviour (CPAN RT#48528)
+  - remove reference to obsolete ExtUtils::MakeMaker::bytes (CPAN RT#48984)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1622-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jul 2008 09:25:38 -0000	1.3
+++ sources	1 Sep 2009 15:14:58 -0000	1.4
@@ -1 +1 @@
-14c708f99adc22256a7b2566bf5c649f  FileHandle-Unget-0.1622.tar.gz
+27df2a78e60e30b1950bbf41740eae13  FileHandle-Unget-0.1623.tar.gz



From transif at fedoraproject.org  Tue Sep  1 15:28:29 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 15:28:29 +0000 (UTC)
Subject: comps/po bn_IN.po,1.21,1.22
Message-ID: <20090901152829.4384E11C00EF@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12674/po

Modified Files:
	bn_IN.po 
Log Message:
Sending translation for Bengali (India)


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 bn_IN.poIndex: bn_IN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bn_IN.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- bn_IN.po	26 May 2009 06:20:48 -0000	1.21
+++ bn_IN.po	1 Sep 2009 15:28:27 -0000	1.22
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 02:27+0000\n"
-"PO-Revision-Date: 2009-05-26 11:32+0530\n"
-"Last-Translator: Runa Bhattacharjee <runab at fedoraproject.org>\n"
-"Language-Team: Bengali INDIA <fedora-trans-bn_in at redhat.com>\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-01 11:34+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
+"Language-Team: Bengali INDIA <anubad at lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,301 +28,322 @@ msgstr ""
 "\n"
 "\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "????? ????????????? ?????? ???? ???????????? ??????????? ??????? ???????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????? ???????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "???????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????? ???? ????????? ??????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ????? ??????? ????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ???? ????????? ??????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "?????? ????? ????????? ??????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???? ? ????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????? ???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ??????????? ???? ????????? ???????? ???????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "??????????? ???? ????????? ??????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "????? ???? ????????? ??????"
 
 # modified for RHEL
-#: ../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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "??????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "???????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ???????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Buildsystem ????????? ?????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "?????????? ???? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "????????? ???? ????????? ??????"
 
 # modified for RHEL
[...1920 lines suppressed...]
 msgstr "Sugar ??????? ??????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1449,7 +1560,8 @@ msgstr ""
 "Fedora ?????? ??-??? Windows ????????? ????? ????????? ????-??????? ???, ??????? "
 "??????? ? ???????? ??????? ????????? ???????"
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1458,16 +1570,19 @@ msgstr ""
 "???????"
 
 # modified for RHEL
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ???? ????????? ??????"
 
 # modified for RHEL
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ???? ????????? ??????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1475,24 +1590,80 @@ msgstr ""
 "???? ???????, ????????, ???????? ? ??????? ???? ???????????? ???? ????????? ???? "
 "??????"
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "?????????? ???? ????????? ??????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "???? ????????? ???? ????????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "GNOME ????????? ???????? Critical Path-? ????????? ?????????? ????????? ??????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "Fedora-? ??? ??????? ???????? Critical Path-? ????????? ?????????? ????????? ??????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?? ? ???????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ??????????? ? ?????????? ???? ??????? ?? ? ???????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (Base)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????????? ???????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ????, ????? ????????????? ?????? ???? ??????, ?????? ?????? ???? ?????? ?????????? ???? ???????????? ??????????? X11 ??????? ???????"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "????? ? ?????????????? ?????????? ????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ??????? ??????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "NetBook/NetTop/MID ???????? ???? ???????????? ??????? ?????? Moblin?"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ????? ??????? ????????????"
 
 # modified for RHEL
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "?????-?? ??????????? ????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1500,7 +1671,7 @@ msgstr ""
 "GNOME ???? ?????? ????????? ????????? ??? ????? ??????????? ????? ???? ???????, "
 "???????, ??????? ??????? ???? ??? ???? ????????? ???? ??????? ?????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1508,7 +1679,7 @@ msgstr ""
 "KDE ???? ?????? ????????? ????????? ??? ????? ??????????? ????? ???? ???????, ???????, "
 "??????? ??????? ???? ??? ???? ????????? ???? ??????? ?????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1516,11 +1687,11 @@ msgstr ""
 "?? ?????????????? ???????? ???? ?????? ???? ???? ??? ???????? ???? ??????? "
 "??????? ????? ?????? ????? ???? ???????  ?? ????? ????? Emacs ??? Vi?"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ?????? ??????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1528,35 +1699,35 @@ msgstr ""
 "?? ?????????????? ???????? ???? DocBook ???????? ??????? ??????? ??? ?? HTML, PDF, "
 "Postscript ??? ?????? ???? ???????? ???? ???????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
 "??????????? ????? ???? ???????????? ??????? ????????? ????????? ?? ??????? ????? "
 "??????? ?????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "?????? ????? ??????? ???????????? ??????? ? ??????? ??????? ?? ??????? ????? "
 "??????? ??????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "??? ????? ??????? ???????????? ??????? ? ??????? ??????? ?? ??????? ????? ??????? "



From mdomsch at fedoraproject.org  Tue Sep  1 15:36:55 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 15:36:55 +0000 (UTC)
Subject: rpms/python-GeoIP/EL-5 python-GeoIP-1.2.4-ipv6.patch, NONE,
	1.1 python-GeoIP.spec, 1.4, 1.5
Message-ID: <20090901153655.DA64D11C00EF@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-GeoIP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14495

Modified Files:
	python-GeoIP.spec 
Added Files:
	python-GeoIP-1.2.4-ipv6.patch 
Log Message:
add IPv6 functions from CVS HEAD; require newer GeoIP libraries

python-GeoIP-1.2.4-ipv6.patch:
 ChangeLog  |    7 ++++++-
 py_GeoIP.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 test.py    |    2 +-
 test_v6.py |   13 +++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)

--- NEW FILE python-GeoIP-1.2.4-ipv6.patch ---
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/ChangeLog python/ChangeLog
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/ChangeLog	2008-12-16 07:22:45.000000000 -0600
+++ python/ChangeLog	2009-08-30 21:21:59.000000000 -0500
@@ -1,5 +1,10 @@
+	* Add IPv6 glue *** needs libGeoIP 1.4.7 ***
+		country_code_by_name_v6	
+		country_name_by_name_v6
+		country_code_by_addr_v6
+		country_name_by_addr_v6 ( Boris Zentner )
 1.2.4	2008-12-16
-	* Add charset and set_charset methods , as well as 
+	* Add charset and set_charset methods, as well as 
 		the new attributes GeoIP.GEOIP_CHARSET_ISO_8859_1 and
 		GeoIP.GEOIP_CHARSET_UTF8 ( Boris Zentner )
 	* Add test_city_charset.py script showing howto use
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/py_GeoIP.c python/py_GeoIP.c
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/py_GeoIP.c	2009-08-30 14:05:06.000000000 -0500
+++ python/py_GeoIP.c	2009-08-30 21:21:59.000000000 -0500
@@ -83,6 +83,50 @@ GeoIP_GeoIP_dealloc(PyObject* self)
   PyObject_Del(self);
 }
 
+static PyObject * GeoIP_country_code_by_name_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_code_by_name_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
+static PyObject * GeoIP_country_name_by_name_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_name_by_name_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
+static PyObject * GeoIP_country_code_by_addr_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_code_by_addr_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
+static PyObject * GeoIP_country_name_by_addr_v6_Py(PyObject *self, PyObject *args) {
+  char * name;
+  const char * retval;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &name)) {
+    return NULL;
+  }
+  retval = GeoIP_country_name_by_addr_v6(GeoIP->gi, name);
+  return Py_BuildValue("s", retval);
+}
+
 static PyObject * GeoIP_country_code_by_name_Py(PyObject *self, PyObject *args) {
   char * name;
   const char * retval;
@@ -343,6 +387,10 @@ static PyMethodDef GeoIP_Object_methods[
   {"charset", GeoIP_charset_Py, 1, "Return the current charset ( either GEOIP_CHARSET_ISO_8859_1 or GEOIP_CHARSET_UTF8 )"},
   {"set_charset", GeoIP_set_charset_Py, 1, "Set the charset for city records"},
   {"last_netmask", GeoIP_last_netmask_Py, 1, "return the netmask depth of the last lookup"},
+  {"country_code_by_name_v6", GeoIP_country_code_by_name_v6_Py, 1, "Lookup IPv6 Country Code By Name"},
+  {"country_name_by_name_v6", GeoIP_country_name_by_name_v6_Py, 1, "Lookup IPv6 Country Name By Name"},
+  {"country_code_by_addr_v6", GeoIP_country_code_by_addr_v6_Py, 1, "Lookup IPv6 Country Code By IP Address"},
+  {"country_name_by_addr_v6", GeoIP_country_name_by_addr_v6_Py, 1, "Lookup IPv6 Country Name By IP Address"},
   {NULL, NULL, 0, NULL}
 };
 
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test.py python/test.py
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test.py	2008-12-16 07:22:45.000000000 -0600
+++ python/test.py	2009-08-30 21:21:59.000000000 -0500
@@ -4,7 +4,7 @@ import GeoIP
 
 #gi = GeoIP.new(GeoIP.GEOIP_STANDARD)
 gi = GeoIP.new(GeoIP.GEOIP_MEMORY_CACHE)
-#gi = GeoIP.open("/usr/local/share/GeoIP/GeoIP.data",GeoIP.GEOIP_STANDARD)
+#gi = GeoIP.open("/usr/local/share/GeoIP/GeoIP.dat",GeoIP.GEOIP_STANDARD)
 
 print gi.country_code_by_name("yahoo.com")
 print gi.last_netmask()
diff -urNp --minimal --exclude-from=/home/mdomsch/excludes /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test_v6.py python/test_v6.py
--- /home/mdomsch/cvs/fedora-extras/python-GeoIP/devel/GeoIP-Python-1.2.4/test_v6.py	1969-12-31 18:00:00.000000000 -0600
+++ python/test_v6.py	2009-08-30 21:21:59.000000000 -0500
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
+import GeoIP
+
+#gi = GeoIP.new(GeoIP.GEOIP_STANDARD)
+#gi = GeoIP.new(GeoIP.GEOIP_MEMORY_CACHE)
+gi = GeoIP.open("/usr/local/share/GeoIP/GeoIPv6.dat",GeoIP.GEOIP_STANDARD)
+
+print gi.country_code_by_name_v6("ipv6.google.com")
+print gi.country_name_by_name_v6("ipv6.google.com")
+print gi.country_code_by_addr_v6("2001:4860:0:1001::68")
+print gi.country_name_by_addr_v6("2001:4860:0:1001::68")
+


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-GeoIP.spec	13 Sep 2007 12:29:08 -0000	1.4
+++ python-GeoIP.spec	1 Sep 2009 15:36:55 -0000	1.5
@@ -1,18 +1,19 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-GeoIP
-Version:        1.2.1
-Release:        6%{?dist}
+Version:        1.2.5
+Release:        0.1.20090931cvs%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        LGPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
-Patch0:		GeoIP-Python-1.2.1-ccodes.patch
+Patch0:         python-GeoIP-1.2.4-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel GeoIP-devel
+# GeoIP 1.4.7 needed for IPv6 lookup functions
+BuildRequires:  python-devel, GeoIP-devel >= 1.4.7
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -20,7 +21,7 @@ location lookups to country, city and or
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-%patch0 -p1 -b .ccodes
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,10 +44,40 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+* Mon Aug 31 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.1.20090931cvs
+- add IPv6 functions from CVS HEAD
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 29 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.4-1
+- Update to 1.2.4
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2.2-2
+- Rebuild for Python 2.6
+
+* Sun Aug 31 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.2-1
+- Update to 1.2.2
+- Drop ccodes patch as it's been accepted upstream
+- Change of license to LGPL
+
+* Sat Feb 23 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-12
+- Include egg-info files (as generated by Python 2.5)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.1-10
+- Autorebuild for GCC 4.3
+
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-9
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
-- Update License tag per guidelines.
+- Update License tag per new guidelines
+- Fix requires per python packaging guidelines.
+
+* Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Rebuild for python 2.5
 
 * Mon Sep 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-5
 - Rebuild



From overholt at fedoraproject.org  Tue Sep  1 15:42:24 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 15:42:24 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.12,1.13
Message-ID: <20090901154224.B4DDE11C0077@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16331

Modified Files:
	maven-scm.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.1
- Add tomcat5, tomcat5-servlet-2.4-api,
  maven-shared-plugin-testing-harness, and tomcat5-jsp-2.0-api BRs


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- maven-scm.spec	1 Sep 2009 13:55:09 -0000	1.12
+++ maven-scm.spec	1 Sep 2009 15:42:23 -0000	1.13
@@ -71,6 +71,9 @@ BuildRequires:  netbeans-ide11 >= 6.7.1
 BuildRequires:  plexus-utils >= 1.2
 BuildRequires:  saxon-scripts
 BuildRequires:  tomcat5-jsp-2.0-api
+BuildRequires:  tomcat5-servlet-2.4-api
+BuildRequires:  tomcat5
+BuildRequires:  maven-shared-plugin-testing-harness
 
 Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
@@ -228,7 +231,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.1
-- Add tomcat5-jsp-2.0-api BR
+- Add tomcat5, tomcat5-servlet-2.4-api,
+  maven-shared-plugin-testing-harness, and tomcat5-jsp-2.0-api BRs
 
 * Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1
 - 1.0 RC1 (courtesy Deepak Bhole)



From overholt at fedoraproject.org  Tue Sep  1 15:43:26 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 15:43:26 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.13,1.14
Message-ID: <20090901154326.BC84A11C0077@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16664

Modified Files:
	maven-scm.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.2
- Bump release


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- maven-scm.spec	1 Sep 2009 15:42:23 -0000	1.13
+++ maven-scm.spec	1 Sep 2009 15:43:26 -0000	1.14
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.0
-Release:        0.5.rc1.1%{?dist}
+Release:        0.5.rc1.2%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -230,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.2
+- Bump release
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.1
 - Add tomcat5, tomcat5-servlet-2.4-api,
   maven-shared-plugin-testing-harness, and tomcat5-jsp-2.0-api BRs



From mdomsch at fedoraproject.org  Tue Sep  1 15:45:02 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 15:45:02 +0000 (UTC)
Subject: rpms/python-GeoIP/devel python-GeoIP.spec,1.16,1.17
Message-ID: <20090901154502.6356C11C0077@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17101

Modified Files:
	python-GeoIP.spec 
Log Message:
fix prerelease versioning


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-GeoIP.spec	1 Sep 2009 12:38:29 -0000	1.16
+++ python-GeoIP.spec	1 Sep 2009 15:45:02 -0000	1.17
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
+%define tarballversion 1.2.4
 Name:           python-GeoIP
 Version:        1.2.5
-Release:        0.1.20090931cvs%{?dist}
+Release:        0.2.20090931cvs%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
-Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{tarballversion}.tar.gz
 Patch0:         python-GeoIP-1.2.4-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +20,7 @@ This package contains the Python binding
 location lookups to country, city and organization level within Python code.
 
 %prep
-%setup -q -n GeoIP-Python-%{version}
+%setup -q -n GeoIP-Python-%{tarballversion}
 %patch0 -p1
 
 %build
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.2.20090931cvs
+- fix prerelease versioning
+
 * Mon Aug 31 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.1.20090931cvs
 - add IPv6 functions from CVS HEAD
 



From mdomsch at fedoraproject.org  Tue Sep  1 15:45:52 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 15:45:52 +0000 (UTC)
Subject: rpms/python-GeoIP/EL-5 python-GeoIP.spec,1.5,1.6
Message-ID: <20090901154552.F22F411C0077@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-GeoIP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17375

Modified Files:
	python-GeoIP.spec 
Log Message:
fix prerelease versioning


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/python-GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-GeoIP.spec	1 Sep 2009 15:36:55 -0000	1.5
+++ python-GeoIP.spec	1 Sep 2009 15:45:52 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
+%define tarballversion 1.2.4
 Name:           python-GeoIP
 Version:        1.2.5
-Release:        0.1.20090931cvs%{?dist}
+Release:        0.2.20090931cvs%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
-Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{tarballversion}.tar.gz
 Patch0:         python-GeoIP-1.2.4-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +20,7 @@ This package contains the Python binding
 location lookups to country, city and organization level within Python code.
 
 %prep
-%setup -q -n GeoIP-Python-%{version}
+%setup -q -n GeoIP-Python-%{tarballversion}
 %patch0 -p1
 
 %build
@@ -44,6 +44,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.2.20090931cvs
+- fix prerelease versioning
+
 * Mon Aug 31 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.1.20090931cvs
 - add IPv6 functions from CVS HEAD
 



From pkgdb at fedoraproject.org  Tue Sep  1 16:02:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 16:02:48 +0000
Subject: [pkgdb] maven-doxia-sitetools was added for overholt
Message-ID: <20090901160248.A65A610F882@bastion2.fedora.phx.redhat.com>

ausil has added Package maven-doxia-sitetools with summary Doxia content generation framework
ausil has approved Package maven-doxia-sitetools
ausil has added a Fedora devel branch for maven-doxia-sitetools with an owner of overholt
ausil has approved maven-doxia-sitetools in Fedora devel
ausil has approved Package maven-doxia-sitetools
ausil has set commit to Approved for 107427 on maven-doxia-sitetools (Fedora devel)
ausil has set checkout to Approved for 107427 on maven-doxia-sitetools (Fedora devel)
ausil has set build to Approved for 107427 on maven-doxia-sitetools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia-sitetools



From pkgdb at fedoraproject.org  Tue Sep  1 16:02:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 16:02:50 +0000
Subject: [pkgdb] maven-doxia-sitetools summary updated by ausil
Message-ID: <20090901160250.3E3E210F893@bastion2.fedora.phx.redhat.com>

ausil set package maven-doxia-sitetools summary to Doxia content generation framework

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia-sitetools



From pkgdb at fedoraproject.org  Tue Sep  1 16:02:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 16:02:50 +0000
Subject: [pkgdb] maven-doxia-sitetools (Fedora, devel) updated by ausil
Message-ID: <20090901160250.4AA4510F897@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on maven-doxia-sitetools (Fedora devel) for akurtakov
ausil approved watchcommits on maven-doxia-sitetools (Fedora devel) for akurtakov
ausil approved commit on maven-doxia-sitetools (Fedora devel) for akurtakov
ausil approved build on maven-doxia-sitetools (Fedora devel) for akurtakov
ausil approved approveacls on maven-doxia-sitetools (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-doxia-sitetools



From ausil at fedoraproject.org  Tue Sep  1 16:02:57 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:02:57 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools/devel - New directory
Message-ID: <20090901160257.6A3B211C0345@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-doxia-sitetools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ20585/rpms/maven-doxia-sitetools/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-doxia-sitetools/devel added to the repository




From ausil at fedoraproject.org  Tue Sep  1 16:02:57 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:02:57 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools - New directory
Message-ID: <20090901160257.51AFC11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-doxia-sitetools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ20585/rpms/maven-doxia-sitetools

Log Message:
Directory /cvs/pkgs/rpms/maven-doxia-sitetools added to the repository




From ausil at fedoraproject.org  Tue Sep  1 16:03:03 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:03:03 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools Makefile,NONE,1.1
Message-ID: <20090901160303.B92F111C0077@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-doxia-sitetools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ20585/rpms/maven-doxia-sitetools

Added Files:
	Makefile 
Log Message:
Setup of module maven-doxia-sitetools


--- NEW FILE Makefile ---
# Top level Makefile for module maven-doxia-sitetools
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  Tue Sep  1 16:03:04 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:03:04 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090901160304.1A45411C0077@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-doxia-sitetools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ20585/rpms/maven-doxia-sitetools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-doxia-sitetools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-doxia-sitetools
# $Id: Makefile,v 1.1 2009/09/01 16:03:03 ausil Exp $
NAME := maven-doxia-sitetools
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 tmraz at fedoraproject.org  Tue Sep  1 16:03:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue,  1 Sep 2009 16:03:13 +0000 (UTC)
Subject: rpms/pam/devel pam-1.1.0-console-nochmod.patch, NONE,
	1.1 pam-1.1.0-notally.patch, NONE, 1.1 pam.spec, 1.203, 1.204
Message-ID: <20090901160313.5457111C0077@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20683

Modified Files:
	pam.spec 
Added Files:
	pam-1.1.0-console-nochmod.patch pam-1.1.0-notally.patch 
Log Message:
* Tue Sep  1 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-5
- do not change permissions with pam_console_apply
- drop obsolete pam_tally module and the faillog file (#461258)


pam-1.1.0-console-nochmod.patch:
 Makefile.am      |    2 +-
 console.handlers |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE pam-1.1.0-console-nochmod.patch ---
diff -up Linux-PAM-1.1.0/modules/pam_console/console.handlers.nochmod Linux-PAM-1.1.0/modules/pam_console/console.handlers
--- Linux-PAM-1.1.0/modules/pam_console/console.handlers.nochmod	2008-12-16 13:37:52.000000000 +0100
+++ Linux-PAM-1.1.0/modules/pam_console/console.handlers	2009-09-01 17:20:08.000000000 +0200
@@ -15,5 +15,3 @@
 # touch unlock wait /var/run/console-unlocked
 
 console consoledevs tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]+\.[0-9]+ :[0-9]+
-/sbin/pam_console_apply lock logfail wait -t tty -s
-/sbin/pam_console_apply unlock logfail wait -r -t tty -s
diff -up Linux-PAM-1.1.0/modules/pam_console/Makefile.am.nochmod Linux-PAM-1.1.0/modules/pam_console/Makefile.am
--- Linux-PAM-1.1.0/modules/pam_console/Makefile.am.nochmod	2008-12-16 13:37:52.000000000 +0100
+++ Linux-PAM-1.1.0/modules/pam_console/Makefile.am	2009-09-01 17:42:47.000000000 +0200
@@ -38,7 +38,6 @@ sbin_PROGRAMS = pam_console_apply
 
 
 secureconf_DATA = console.perms console.handlers
-permsd_DATA = 50-default.perms
 
 FLEX_OPTS = -Cr
 BISON_OPTS = -d
@@ -62,4 +61,5 @@ configfile.c: configfile.tab.c configfil
 
 install-data-local:
 	mkdir -p $(DESTDIR)$(secureconfdir)/console.apps
+	mkdir -p $(DESTDIR)$(permsddir)
 	mkdir -m $(LOCKMODE) -p -p $(DESTDIR)$(LOCKDIR)

pam-1.1.0-notally.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam-1.1.0-notally.patch ---
diff -up Linux-PAM-1.1.0/modules/Makefile.am.notally Linux-PAM-1.1.0/modules/Makefile.am
--- Linux-PAM-1.1.0/modules/Makefile.am.notally	2009-07-27 17:39:25.000000000 +0200
+++ Linux-PAM-1.1.0/modules/Makefile.am	2009-09-01 17:40:16.000000000 +0200
@@ -10,7 +10,7 @@ SUBDIRS = pam_access pam_cracklib pam_de
 	pam_mkhomedir pam_motd pam_namespace pam_nologin \
 	pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \
 	pam_selinux pam_sepermit pam_shells pam_stress \
-	pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \
+	pam_succeed_if pam_tally2 pam_time pam_timestamp \
 	pam_tty_audit pam_umask \
 	pam_unix pam_userdb pam_warn pam_wheel pam_xauth
 


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- pam.spec	26 Aug 2009 18:43:27 -0000	1.203
+++ pam.spec	1 Sep 2009 16:03:13 -0000	1.204
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 License: BSD and GPLv2+
@@ -24,6 +24,8 @@ Source14: 90-nproc.conf
 Patch1:  pam-1.0.90-redhat-modules.patch
 Patch2:  pam-1.0.91-std-noclose.patch
 Patch3:  pam-1.1.0-cracklib-authtok.patch
+Patch4:  pam-1.1.0-console-nochmod.patch
+Patch5:  pam-1.1.0-notally.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -87,6 +89,8 @@ mv pam-redhat-%{pam_redhat_version}/* mo
 %patch1 -p1 -b .redhat-modules
 %patch2 -p1 -b .std-noclose
 %patch3 -p1 -b .authtok
+%patch4 -p1 -b .nochmod
+%patch5 -p1 -b .notally
 
 libtoolize -f
 autoreconf
@@ -138,7 +142,6 @@ install -m 644 %{SOURCE10} $RPM_BUILD_RO
 install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/90-nproc.conf
 install -m 600 /dev/null $RPM_BUILD_ROOT%{_secconfdir}/opasswd
 install -d -m 755 $RPM_BUILD_ROOT/var/log
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/faillog
 install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/tallylog
 
 # Install man pages.
@@ -174,7 +177,8 @@ for dir in modules/pam_* ; do
 if [ -d ${dir} ] ; then
 %if ! %{WITH_SELINUX}
         [ ${dir} = "modules/pam_selinux" ] && continue
-%endif	
+%endif
+	[ ${dir} = "modules/pam_tally" ] && continue
 	if ! ls -1 $RPM_BUILD_ROOT%{_moduledir}/`basename ${dir}`*.so ; then
 		echo ERROR `basename ${dir}` did not build a module.
 		exit 1
@@ -198,9 +202,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-if [ ! -a /var/log/faillog ] ; then
-	install -m 600 /dev/null /var/log/faillog
-fi
 if [ ! -a /var/log/tallylog ] ; then
 	install -m 600 /dev/null /var/log/tallylog
 fi
@@ -224,7 +225,6 @@ fi
 /%{_lib}/libpamc.so.*
 /%{_lib}/libpam_misc.so.*
 %{_sbindir}/pam_console_apply
-%{_sbindir}/pam_tally
 %{_sbindir}/pam_tally2
 %attr(4755,root,root) %{_sbindir}/pam_timestamp_check
 %attr(4755,root,root) %{_sbindir}/unix_chkpwd
@@ -273,7 +273,6 @@ fi
 %{_moduledir}/pam_shells.so
 %{_moduledir}/pam_stress.so
 %{_moduledir}/pam_succeed_if.so
-%{_moduledir}/pam_tally.so
 %{_moduledir}/pam_tally2.so
 %{_moduledir}/pam_time.so
 %{_moduledir}/pam_timestamp.so
@@ -307,10 +306,8 @@ fi
 %config(noreplace) %{_secconfdir}/opasswd
 %dir %{_secconfdir}/console.apps
 %dir %{_secconfdir}/console.perms.d
-%config %{_secconfdir}/console.perms.d/50-default.perms
 %dir /var/run/console
 %dir /var/run/sepermit
-%ghost %verify(not md5 size mtime) /var/log/faillog
 %ghost %verify(not md5 size mtime) /var/log/tallylog
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -326,6 +323,10 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Tue Sep  1 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-5
+- do not change permissions with pam_console_apply
+- drop obsolete pam_tally module and the faillog file (#461258)
+
 * Wed Aug 19 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-4
 - rebuild with new libaudit
 



From pkgdb at fedoraproject.org  Tue Sep  1 16:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 16:04:02 +0000
Subject: [pkgdb] maven-embedder was added for overholt
Message-ID: <20090901160402.2969510F87F@bastion2.fedora.phx.redhat.com>

ausil has added Package maven-embedder with summary The Maven Embedder is used by the Maven CLI, by IDE integration and others.
ausil has approved Package maven-embedder
ausil has added a Fedora devel branch for maven-embedder with an owner of overholt
ausil has approved maven-embedder in Fedora devel
ausil has approved Package maven-embedder
ausil has set commit to Approved for 107427 on maven-embedder (Fedora devel)
ausil has set checkout to Approved for 107427 on maven-embedder (Fedora devel)
ausil has set build to Approved for 107427 on maven-embedder (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-embedder



From pkgdb at fedoraproject.org  Tue Sep  1 16:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 16:04:03 +0000
Subject: [pkgdb] maven-embedder summary updated by ausil
Message-ID: <20090901160403.8C08010F896@bastion2.fedora.phx.redhat.com>

ausil set package maven-embedder summary to The Maven Embedder is used by the Maven CLI, by IDE integration and others.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-embedder



From ausil at fedoraproject.org  Tue Sep  1 16:04:10 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:04:10 +0000 (UTC)
Subject: rpms/maven-embedder - New directory
Message-ID: <20090901160410.1DA2E11C0077@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-embedder
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE20965/rpms/maven-embedder

Log Message:
Directory /cvs/pkgs/rpms/maven-embedder added to the repository




From pkgdb at fedoraproject.org  Tue Sep  1 16:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 16:04:03 +0000
Subject: [pkgdb] maven-embedder (Fedora, devel) updated by ausil
Message-ID: <20090901160403.98B6D10F89A@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on maven-embedder (Fedora devel) for akurtakov
ausil approved watchcommits on maven-embedder (Fedora devel) for akurtakov
ausil approved commit on maven-embedder (Fedora devel) for akurtakov
ausil approved build on maven-embedder (Fedora devel) for akurtakov
ausil approved approveacls on maven-embedder (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-embedder



From ausil at fedoraproject.org  Tue Sep  1 16:04:10 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:04:10 +0000 (UTC)
Subject: rpms/maven-embedder/devel - New directory
Message-ID: <20090901160410.43F8F11C0349@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-embedder/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE20965/rpms/maven-embedder/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-embedder/devel added to the repository




From ausil at fedoraproject.org  Tue Sep  1 16:04:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:04:16 +0000 (UTC)
Subject: rpms/maven-embedder Makefile,NONE,1.1
Message-ID: <20090901160416.D330F11C0077@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-embedder
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE20965/rpms/maven-embedder

Added Files:
	Makefile 
Log Message:
Setup of module maven-embedder


--- NEW FILE Makefile ---
# Top level Makefile for module maven-embedder
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  Tue Sep  1 16:04:17 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 16:04:17 +0000 (UTC)
Subject: rpms/maven-embedder/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090901160417.49ABC11C0077@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-embedder/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE20965/rpms/maven-embedder/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-embedder


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-embedder
# $Id: Makefile,v 1.1 2009/09/01 16:04:17 ausil Exp $
NAME := maven-embedder
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 mdomsch at fedoraproject.org  Tue Sep  1 16:06:56 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  1 Sep 2009 16:06:56 +0000 (UTC)
Subject: rpms/python-GeoIP/EL-5 .cvsignore, 1.2, 1.3 python-GeoIP.spec, 1.6, 
	1.7 sources, 1.2, 1.3 GeoIP-Python-1.2.1-ccodes.patch, 1.1, NONE
Message-ID: <20090901160656.B9CBE11C0077@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-GeoIP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21614

Modified Files:
	.cvsignore python-GeoIP.spec sources 
Removed Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
build fix


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Feb 2006 22:33:22 -0000	1.2
+++ .cvsignore	1 Sep 2009 16:06:56 -0000	1.3
@@ -1 +1 @@
-GeoIP-Python-1.2.1.tar.gz
+GeoIP-Python-1.2.4.tar.gz


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/python-GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-GeoIP.spec	1 Sep 2009 15:45:52 -0000	1.6
+++ python-GeoIP.spec	1 Sep 2009 16:06:56 -0000	1.7
@@ -2,7 +2,7 @@
 %define tarballversion 1.2.4
 Name:           python-GeoIP
 Version:        1.2.5
-Release:        0.2.20090931cvs%{?dist}
+Release:        0.3.20090931cvs%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
@@ -44,6 +44,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.3.20090931cvs
+- build fix
+
 * Tue Sep  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.5-0.2.20090931cvs
 - fix prerelease versioning
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Feb 2006 22:33:22 -0000	1.2
+++ sources	1 Sep 2009 16:06:56 -0000	1.3
@@ -1 +1 @@
-5683420ea34490029ee0285ff048fda0  GeoIP-Python-1.2.1.tar.gz
+50f820d854476efaf3b7af733ffe4236  GeoIP-Python-1.2.4.tar.gz


--- GeoIP-Python-1.2.1-ccodes.patch DELETED ---



From hadess at fedoraproject.org  Tue Sep  1 16:11:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 16:11:59 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.260,1.261
Message-ID: <20090901161159.7590811C0077@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24155

Modified Files:
	rhythmbox.spec 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-2
- Remove obsolete configure flags
- Add libgudev BR
- Add media-player-info requires (note, not built yet)



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- rhythmbox.spec	1 Sep 2009 14:56:53 -0000	1.260
+++ rhythmbox.spec	1 Sep 2009 16:11:59 -0000	1.261
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -14,6 +14,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 Requires: gtk2 >= 2.4.0
 Requires: gnome-python2 gnome-python2-gconf gnome-python2-gnomevfs
 Requires: gnome-themes
+Requires: media-player-info
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2
@@ -43,6 +44,7 @@ BuildRequires: hal-devel
 BuildRequires: lirc-devel
 BuildRequires: libmtp-devel
 BuildRequires: gstreamer-python-devel
+BuildRequires: libgudev-devel
 BuildRequires: perl(XML::Parser) intltool
 
 ExcludeArch:    s390 s390x
@@ -96,12 +98,9 @@ find plugins/coherence/upnp_coherence/ -
 
 %configure \
       --with-ipod \
-      --with-dbus \
       --with-mdns=avahi \
       --disable-scrollkeeper \
-      --enable-tag-writing \
-      --with-gnome-keyring \
-      --with-metadata-helper
+      --with-gnome-keyring
 
 make %{?_smp_mflags}
 
@@ -222,6 +221,11 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-2
+- Remove obsolete configure flags
+- Add libgudev BR
+- Add media-player-info requires (note, not built yet)
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-1
 - Update to 0.12.4
 



From davej at fedoraproject.org  Tue Sep  1 16:12:53 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  1 Sep 2009 16:12:53 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1756,1.1757
Message-ID: <20090901161253.3C74311C0077@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24905

Modified Files:
	kernel.spec 
Log Message:
Make firmware buildarch noarch. (Suggested by drago01 on irc)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1756
retrieving revision 1.1757
diff -u -p -r1.1756 -r1.1757
--- kernel.spec	1 Sep 2009 04:44:15 -0000	1.1756
+++ kernel.spec	1 Sep 2009 16:12:52 -0000	1.1757
@@ -763,6 +763,7 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
+Buildarch: noarch
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -2004,6 +2005,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Dave Jones <davej at redhat.com>
+- Make firmware buildarch noarch. (Suggested by drago01 on irc)
+
 * Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com>
 - Fix up lirc_zilog to enable functional IR transmit and receive
   on the Hauppauge HD PVR



From nphilipp at fedoraproject.org  Tue Sep  1 16:26:33 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  1 Sep 2009 16:26:33 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.17, 1.18 python-slip.spec, 1.20,
	1.21 sources, 1.20, 1.21
Message-ID: <20090901162633.82A2D11C0077@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28428

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	1 Sep 2009 11:38:51 -0000	1.17
+++ .cvsignore	1 Sep 2009 16:26:33 -0000	1.18
@@ -1 +1 @@
-python-slip-0.2.2.tar.bz2
+python-slip-0.2.3.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-slip.spec	1 Sep 2009 11:38:51 -0000	1.20
+++ python-slip.spec	1 Sep 2009 16:26:33 -0000	1.21
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.2
+Version:    0.2.3
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -92,6 +92,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> - 0.2.3-1
+- add issamefile(), linkfile(), linkorcopyfile() to slip.util.files
+
 * Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> - 0.2.2-1
 - add slip.util.files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	1 Sep 2009 11:58:16 -0000	1.20
+++ sources	1 Sep 2009 16:26:33 -0000	1.21
@@ -1 +1 @@
-de63375ab20409a798ef2287df59ef0f  python-slip-0.2.2.tar.bz2
+85224f6a6e6ef47b18b6abc227b61e13  python-slip-0.2.3.tar.bz2



From sandeen at fedoraproject.org  Tue Sep  1 16:26:35 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  1 Sep 2009 16:26:35 +0000 (UTC)
Subject: rpms/xfsprogs/devel .cvsignore, 1.20, 1.21 sources, 1.21,
	1.22 xfsprogs.spec, 1.65, 1.66 xfsprogs-3.0.1-fallocate.patch,
	1.2, NONE xfsprogs-3.0.1-overflows.patch, 1.1,
	NONE xfsprogs-3.0.1-readline.patch, 1.1, NONE
Message-ID: <20090901162635.75D8511C0077@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28446

Modified Files:
	.cvsignore sources xfsprogs.spec 
Removed Files:
	xfsprogs-3.0.1-fallocate.patch xfsprogs-3.0.1-overflows.patch 
	xfsprogs-3.0.1-readline.patch 
Log Message:
* Tue Sep 01 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	5 May 2009 18:24:26 -0000	1.20
+++ .cvsignore	1 Sep 2009 16:26:35 -0000	1.21
@@ -1 +1 @@
-xfsprogs-3.0.1.tar.gz
+xfsprogs-3.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	5 May 2009 18:24:26 -0000	1.21
+++ sources	1 Sep 2009 16:26:35 -0000	1.22
@@ -1 +1 @@
-d7f879a21692d4f7abc16a20479b0829  xfsprogs-3.0.1.tar.gz
+41bac47fb49a98857f346bbc1c164872  xfsprogs-3.0.3.tar.gz


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xfsprogs.spec	27 Jul 2009 08:01:28 -0000	1.65
+++ xfsprogs.spec	1 Sep 2009 16:26:35 -0000	1.66
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	3.0.1
-Release:	10%{?dist}
+Version:	3.0.3
+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
@@ -17,12 +17,10 @@ Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
 Conflicts:	xfsdump < 3.0.1
 
-# These are upstream
-Patch0:		xfsprogs-3.0.1-readline.patch
-Patch1:		xfsprogs-3.0.1-fallocate.patch
-Patch2:		xfsprogs-3.0.1-overflows.patch
-# This one, not yet
-Patch3:		xfsprogs-3.0.1-mkfs-lazy-count-default.patch
+# Upstream patches:
+
+# Not-yet-upstream patches:
+Patch1:		xfsprogs-3.0.1-mkfs-lazy-count-default.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -67,10 +65,7 @@ in building or running the xfstests QA s
 %prep
 %setup -q
 
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 export tagname=CC DEBUG=-DNDEBUG
@@ -197,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
+* Tue Sep 01 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-1
+- New upstream release
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xfsprogs-3.0.1-fallocate.patch DELETED ---


--- xfsprogs-3.0.1-overflows.patch DELETED ---


--- xfsprogs-3.0.1-readline.patch DELETED ---



From hadess at fedoraproject.org  Tue Sep  1 16:42:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 16:42:33 +0000 (UTC)
Subject: rpms/bluez/devel
	0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch,
	NONE, 1.1 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.3,
	1.4 bluez.spec, 1.91,
	1.92 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch, 1.1,
	NONE 0001-Don-t-abort-cups-backend-on-property-change.patch, 1.1,
	NONE 0002-Actually-read-the-CreateDevice-reply.patch, 1.1,
	NONE 0002-Mark-Bluetooth-printers-as-being-local.patch, 1.1, NONE
Message-ID: <20090901164233.3475A11C0077@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2132

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch bluez.spec 
Added Files:
	0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch 
Removed Files:
	0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch 
	0001-Don-t-abort-cups-backend-on-property-change.patch 
	0002-Actually-read-the-CreateDevice-reply.patch 
	0002-Mark-Bluetooth-printers-as-being-local.patch 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 4.50-2
- Remove obsoleted patches
- Add another CUPS backend patch
- Update cable pairing patch for new build system


0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch:
 ChangeLog   |    2 +
 cups/main.c |   64 +++++++++++++++++++++++-------------------------------------
 2 files changed, 27 insertions(+), 39 deletions(-)

--- NEW FILE 0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch ---
>From fdf7b75f5fc8a9726db6756bcddff6aa74b42ba0 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter at gmail.com>
Date: Thu, 27 Aug 2009 09:07:49 +0200
Subject: [PATCH] Make discovery mode of bluetooth CUPS backend work with CUPS 1.4.0

The new CUPS 1.4.x does device discovery only for a given time frame
requested by the client (printer setup tool, "lpinfo" command). CUPS's
default for CUPS-1.3.x-ish requests without timeout specification
seems to be 10 seconds. CUPS starts all backends at once in the
beginning (in parallel) and kills every backend which remains running
at the end of the timeout. It accepts output from the backends
whenever it occurs not only when the backend finishes, so a backend
can search for printers infinitely long if it outputs every found
device immediately. Then all printers found during CUPS' timeout are
taken into account.

The bluetooth backend of 4.48 asks the Bluetooth daemon for printers
and collects results for 10 seconds and after that it outputs
them. This takes a total of 10.5 sec and so CUPS kills the backend
right before it answers (at least with the 10-second default timeout),
resulting in Bluetooth printers never being discovered by CUPS.

This change fixes it by making each new printer added to the list
being output immediately. Note that the list structure cannot be
removed from cups/main.c as otherwise we would get duplicate
listings. Also important is the addition of unbuffered output on
stdout.
---
 ChangeLog   |    2 +
 cups/main.c |   63 +++++++++++++++++++++++-----------------------------------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d06f494..6c170f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+ver 4.51:
+	Make discovery mode of bluetooth CUPS backend work with CUPS 1.4.0.
 ver 4.50:
 	Fix issue with missing manual pages in distribution.
 	Fix issue with the configuration and state directories.
diff --git a/cups/main.c b/cups/main.c
index da757b0..1bbc78c 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -185,6 +185,27 @@ static char *device_get_ieee1284_id(const char *adapter, const char *device)
 	return id;
 }
 
+static void print_printer_details(const char *name, const char *bdaddr, const char *id)
+{
+	char *uri, *escaped;
+
+	escaped = g_strdelimit(g_strdup(name), "\"", '\'');
+	uri = g_strdup_printf("bluetooth://%c%c%c%c%c%c%c%c%c%c%c%c",
+		 bdaddr[0], bdaddr[1],
+		 bdaddr[3], bdaddr[4],
+		 bdaddr[6], bdaddr[7],
+		 bdaddr[9], bdaddr[10],
+		 bdaddr[12], bdaddr[13],
+		 bdaddr[15], bdaddr[16]);
+	printf("direct %s \"%s\" \"%s (Bluetooth)\"", uri, escaped, escaped);
+	if (id != NULL)
+		printf(" \"%s\"\n", id);
+	else
+		printf("\n");
+	g_free(escaped);
+	g_free(uri);
+}
+
 static void add_device_to_list(const char *name, const char *bdaddr, const char *id)
 {
 	struct cups_device *device;
@@ -212,27 +233,7 @@ static void add_device_to_list(const char *name, const char *bdaddr, const char
 	device->id = g_strdup(id);
 
 	device_list = g_slist_prepend(device_list, device);
-}
-
-static void print_printer_details(const char *name, const char *bdaddr, const char *id)
-{
-	char *uri, *escaped;
-
-	escaped = g_strdelimit(g_strdup(name), "\"", '\'');
-	uri = g_strdup_printf("bluetooth://%c%c%c%c%c%c%c%c%c%c%c%c",
-		 bdaddr[0], bdaddr[1],
-		 bdaddr[3], bdaddr[4],
-		 bdaddr[6], bdaddr[7],
-		 bdaddr[9], bdaddr[10],
-		 bdaddr[12], bdaddr[13],
-		 bdaddr[15], bdaddr[16]);
-	printf("direct %s \"%s\" \"%s (Bluetooth)\"", uri, escaped, escaped);
-	if (id != NULL)
-		printf(" \"%s\"\n", id);
-	else
-		printf("\n");
-	g_free(escaped);
-	g_free(uri);
+	print_printer_details(device->name, device->bdaddr, device->id);
 }
 
 static gboolean parse_device_properties(DBusMessageIter *reply_iter, char **name, char **bdaddr)
@@ -384,23 +385,6 @@ static void remote_device_found(const char *adapter, const char *bdaddr, const c
 
 static void discovery_completed(void)
 {
-	GSList *l;
-
-	for (l = device_list; l != NULL; l = l->next) {
-		struct cups_device *device = (struct cups_device *) l->data;
-
-		if (device->name == NULL)
-			device->name = g_strdelimit(g_strdup(device->bdaddr), ":", '-');
-		/* Give another try to getting an ID for the device */
-		if (device->id == NULL)
-			remote_device_found(NULL, device->bdaddr, device->name);
-		print_printer_details(device->name, device->bdaddr, device->id);
-		g_free(device->name);
-		g_free(device->bdaddr);
-		g_free(device->id);
-		g_free(device);
-	}
-
 	g_slist_free(device_list);
 	device_list = NULL;
 
@@ -638,6 +622,9 @@ int main(int argc, char *argv[])
 	/* Make sure status messages are not buffered */
 	setbuf(stderr, NULL);
 
+	/* Make sure output is not buffered */
+	setbuf(stdout, NULL);
+
 	/* Ignore SIGPIPE signals */
 #ifdef HAVE_SIGSET
 	sigset(SIGPIPE, SIG_IGN);
-- 
1.6.3.3


0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 387 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	3 Jul 2009 11:24:10 -0000	1.3
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	1 Sep 2009 16:42:32 -0000	1.4
@@ -1,6 +1,6 @@
-From f23a9556acf6308e217b11e0a882e89d799f2517 Mon Sep 17 00:00:00 2001
+From 0f3b73be98d0f933970b87eda3fc6128de3788ab Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
-Date: Thu, 4 Jun 2009 10:23:58 +0100
+Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
 
 Implement the old "sixpair" using gudev (a GObject layer on top
@@ -10,18 +10,91 @@ When a Sixaxis device is plugged in, eve
 the device is selected, poked around to set the default Bluetooth
 address, and added to the database of the current default adapter.
 ---
- acinclude.m4        |   16 +++
- configure.ac        |    1 +
- plugins/Makefile.am |   11 ++-
- plugins/cable.c     |  361 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ Makefile.am     |   11 ++-
+ acinclude.m4    |   16 +++
+ configure.ac    |    1 +
+ plugins/cable.c |  361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 388 insertions(+), 1 deletions(-)
  create mode 100644 plugins/cable.c
 
+diff --git a/Makefile.am b/Makefile.am
+index 09eb7ec..cc8381e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -162,6 +162,15 @@ builtin_modules += service
+ builtin_sources += plugins/service.c
+ endif
+ 
++if CABLE
++plugin_LTLIBRARIES += plugins/cable.la
++
++plugins_cable_la_LIBADD = @CABLE_LIBS@
++plugins_cable_la_LDFLAGS = -module -avoid-version -no-undefined
++plugins_cable_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
++					@GLIB_CFLAGS@ @CABLE_CFLAGS@
++endif
++
+ builtin_modules += hciops
+ builtin_sources += plugins/hciops.c
+ 
+diff --git a/acinclude.m4 b/acinclude.m4
+index 44f7c72..465fb67 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
+ 			[Define to 1 if you need the usb_interrupt_read() function.]))
+ ])
+ 
++AC_DEFUN([AC_PATH_CABLE], [
++	PKG_CHECK_MODULES(CABLE, gudev-1.0 libusb-1.0, cable_found=yes, cable_found=no)
++	AC_SUBST(CABLE_CFLAGS)
++	AC_SUBST(CABLE_LIBS)
++])
++
+ AC_DEFUN([AC_PATH_NETLINK], [
+ 	PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
+ 	AC_SUBST(NETLINK_CFLAGS)
+@@ -163,6 +169,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	netlink_enable=no
+ 	hal_enable=${hal_found}
+ 	usb_enable=${usb_found}
++	cable_enable=${cable_found}
+ 	alsa_enable=${alsa_found}
+ 	gstreamer_enable=${gstreamer_found}
+ 	audio_enable=yes
+@@ -228,6 +235,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 		usb_enable=${enableval}
+ 	])
+ 
++	AC_ARG_ENABLE(cable, AC_HELP_STRING([--enable-cable], [enable DeviceKit support]), [
++		cable_enable=${enableval}
++	])
++
+ 	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
+ 		netlink_enable=${enableval}
+ 	])
+@@ -311,6 +322,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
+ 	fi
+ 
++	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
++		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
++	fi
++
+ 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
+ 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
+ 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
+@@ -335,4 +350,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
+ 	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
+ 	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
++	AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
+ ])
 diff --git a/configure.ac b/configure.ac
-index 1686d18..339d45c 100644
+index 9e5279d..8b17659 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -36,6 +36,7 @@ AC_PATH_GLIB
+@@ -40,6 +40,7 @@ AC_PATH_GLIB
  AC_PATH_ALSA
  AC_PATH_GSTREAMER
  AC_PATH_USB
@@ -29,59 +102,9 @@ index 1686d18..339d45c 100644
  AC_PATH_NETLINK
  AC_PATH_SNDFILE
  
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 9d9f970..e43584a 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -26,10 +26,16 @@ builtin_sources += hal.c
- builtin_modules += storage
- builtin_sources += storage.c
- 
-+if CABLE
-+plugin_LTLIBRARIES += cable.la
-+cable_la_LIBADD = @CABLE_CFLAGS@
-+endif
-+
- noinst_LTLIBRARIES = libbuiltin.la echo.la
- 
- libbuiltin_la_SOURCES = $(builtin_sources)
- libbuiltin_la_LDFLAGS =
-+libbuiltin_la_LIBADD = @CABLE_LIBS@
- libbuiltin_la_CFLAGS = $(AM_CFLAGS) \
- 			$(builtin_cflags) -DBLUETOOTH_PLUGIN_BUILTIN
- 
-@@ -40,7 +46,7 @@ nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
- AM_LDFLAGS = -module -avoid-version -no-undefined
- 
- AM_CFLAGS = -fvisibility=hidden @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ \
--			@GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@
-+			@GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@ @CABLE_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
- 
-@@ -49,6 +55,7 @@ CLEANFILES = $(BUILT_SOURCES)
- MAINTAINERCLEANFILES = Makefile.in
- 
- builtin.h:
-+	echo $(builtin_modules)
- 	echo "" > $@
- 	list='$(builtin_modules)'; for i in $$list; \
- 	  do echo "extern struct bluetooth_plugin_desc __bluetooth_builtin_$$i;" >> $@; done
-@@ -63,9 +70,11 @@ all-local:
- 	@$(LN_S) -f $(top_srcdir)/audio/.libs/audio.so
- 	@$(LN_S) -f $(top_srcdir)/serial/.libs/serial.so
- 	@$(LN_S) -f $(top_srcdir)/network/.libs/network.so
-+	@$(LN_S) -f $(top_srcdir)/plugins/.libs/cable.so
- 
- clean-local:
- 	@rm -f network.so
- 	@rm -f serial.so
- 	@rm -f audio.so
- 	@rm -f input.so
-+	@rm -f cable.so
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
-index 0000000..9f24b55
+index 0000000..9179c62
 --- /dev/null
 +++ b/plugins/cable.c
 @@ -0,0 +1,361 @@
@@ -447,56 +470,5 @@ index 0000000..9f24b55
 +BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
 +			BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
 -- 
-1.6.0.6
+1.6.2.5
 
---- bluez-4.43.old/acinclude.m4	2009-07-02 23:43:14.000000000 +0100
-+++ bluez-4.43/acinclude.m4	2009-07-03 12:18:46.000000000 +0100
-@@ -162,6 +162,12 @@ AC_DEFUN([AC_PATH_USB], [
- 			[Define to 1 if you need the usb_interrupt_read() function.]))
- ])
- 
-+AC_DEFUN([AC_PATH_CABLE], [
-+	PKG_CHECK_MODULES(CABLE, gudev-1.0 libusb-1.0, cable_found=yes, cable_found=no)
-+	AC_SUBST(CABLE_CFLAGS)
-+	AC_SUBST(CABLE_LIBS)
-+])
-+
- AC_DEFUN([AC_PATH_NETLINK], [
- 	PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
- 	AC_SUBST(NETLINK_CFLAGS)
-@@ -182,6 +188,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 	netlink_enable=no
- 	hal_enable=${hal_found}
- 	usb_enable=${usb_found}
-+	cable_enable=${cable_found}
- 	alsa_enable=${alsa_found}
- 	gstreamer_enable=${gstreamer_found}
- 	audio_enable=yes
-@@ -244,6 +251,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 		usb_enable=${enableval}
- 	])
- 
-+	AC_ARG_ENABLE(cable, AC_HELP_STRING([--enable-cable], [enable DeviceKit support]), [
-+		cable_enable=${enableval}
-+	])
-+
- 	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
- 		netlink_enable=${enableval}
- 	])
-@@ -327,6 +338,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
- 	fi
- 
-+	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
-+		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
-+	fi
-+
- 	AC_SUBST([BLUEZ_CFLAGS], ['-I$(top_builddir)/include'])
- 	AC_SUBST([BLUEZ_LIBS], ['$(top_builddir)/lib/libbluetooth.la'])
- 
-@@ -360,4 +375,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 	AM_CONDITIONAL(MANPAGES, test "${manpages_enable}" = "yes")
- 	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
- 	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
-+	AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
- ])


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- bluez.spec	1 Sep 2009 14:58:17 -0000	1.91
+++ bluez.spec	1 Sep 2009 16:42:32 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.50
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -23,12 +23,8 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
-# http://thread.gmane.org/gmane.linux.bluez.kernel/3108
-Patch6: 0001-Don-t-abort-cups-backend-on-property-change.patch
-Patch7: 0002-Actually-read-the-CreateDevice-reply.patch
-# http://thread.gmane.org/gmane.linux.bluez.kernel/3106/focus=3114
-Patch8: 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch
-Patch9: 0002-Mark-Bluetooth-printers-as-being-local.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3264/focus=3286
+Patch6: 0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -138,10 +134,7 @@ This includes hidd, dund and pand.
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cable-pairing
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch6 -p1 -b .newer-cups
 
 %build
 libtoolize -f -c
@@ -281,6 +274,11 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 4.50-2
+- Remove obsoleted patches
+- Add another CUPS backend patch
+- Update cable pairing patch for new build system
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 4.50-1
 - Update to 4.50
 


--- 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch DELETED ---


--- 0001-Don-t-abort-cups-backend-on-property-change.patch DELETED ---


--- 0002-Actually-read-the-CreateDevice-reply.patch DELETED ---


--- 0002-Mark-Bluetooth-printers-as-being-local.patch DELETED ---



From jkeating at fedoraproject.org  Tue Sep  1 16:44:55 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue,  1 Sep 2009 16:44:55 +0000 (UTC)
Subject: rpms/httrack/devel httrack.spec,1.13,1.14
Message-ID: <20090901164455.79CCF11C0077@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/httrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3700

Modified Files:
	httrack.spec 
Log Message:
* Tue Sep 01 2009 Jesse Keating <jkeating at redhat.com> - 3.43.2-5
- Rebuild for openssl



Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- httrack.spec	25 Jul 2009 02:18:18 -0000	1.13
+++ httrack.spec	1 Sep 2009 16:44:55 -0000	1.14
@@ -1,7 +1,7 @@
 %if 0%{?fc9}%{?fc10}
   %define _openssl_version 0.9.8g
 %else
-  %define _openssl_version 0.9.8k
+  %define _openssl_version 1.0.0
 %endif
 
 %if 0%{?fc7}
@@ -12,7 +12,7 @@
 Summary:	Website copier and offline browser
 Name:		httrack
 Version:	3.43.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
@@ -164,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Sep 01 2009 Jesse Keating <jkeating at redhat.com> - 3.43.2-5
+- Rebuild for openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.43.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Tue Sep  1 16:45:22 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 16:45:22 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools/devel import.log, NONE,
	1.1 maven-doxia-sitetools-disablehtmlunit.patch, NONE,
	1.1 maven-doxia-sitetools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090901164522.E936111C0077@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia-sitetools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3906/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log maven-doxia-sitetools-disablehtmlunit.patch 
	maven-doxia-sitetools.spec 
Log Message:
Initial import (review bug #520202)



--- NEW FILE import.log ---
maven-doxia-sitetools-1_0-0_2_a10_fc11:HEAD:maven-doxia-sitetools-1.0-0.2.a10.fc11.src.rpm:1251823422

maven-doxia-sitetools-disablehtmlunit.patch:
 pom.xml |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE maven-doxia-sitetools-disablehtmlunit.patch ---
diff -up ./doxia-site-renderer/pom.xml.sav ./doxia-site-renderer/pom.xml
--- ./doxia-site-renderer/pom.xml.sav	2008-06-20 17:27:41.000000000 -0400
+++ ./doxia-site-renderer/pom.xml	2008-06-20 17:27:53.000000000 -0400
@@ -86,12 +86,6 @@ under the License.
       <artifactId>doxia-decoration-model</artifactId>
     </dependency>
     <dependency>
-      <groupId>htmlunit</groupId>
-      <artifactId>htmlunit</artifactId>
-      <version>1.9</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
       <version>3.2</version>


--- NEW FILE maven-doxia-sitetools.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define parent maven-doxia
%define subproj sitetools
%define namedversion 1.0-alpha-10

Name:           %{parent}-%{subproj}
Version:        1.0
Release:        0.2.a10%{?dist}
Summary:        Doxia content generation framework
License:        ASL 2.0
Group:          Development/Tools
URL:            http://maven.apache.org/doxia/

# svn export \
#  http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-10/ \
#  maven-doxia-sitetools
# tar czf maven-doxia-sitetools-1.0-alpha10-src.tar.gz maven-doxia-sitetools/
Source0:        %{name}-1.0-alpha10-src.tar.gz

Patch0:         %{name}-disablehtmlunit.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  maven2 >= 0:2.0.4-9
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-surefire
BuildRequires:  maven-doxia >= 1.0-0.3.a10 
BuildRequires:  plexus-maven-plugin >= 0:1.2-2
BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
BuildRequires:  classworlds
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-validator
BuildRequires:  junit
BuildRequires:  oro
BuildRequires:  plexus-container-default
BuildRequires:  plexus-i18n
BuildRequires:  plexus-utils
BuildRequires:  plexus-velocity
BuildRequires:  velocity

Requires:       classworlds
Requires:       jakarta-commons-collections
Requires:       jakarta-commons-logging
Requires:       jakarta-commons-validator
Requires:       junit
Requires:       maven-doxia
Requires:       oro
Requires:       plexus-container-default
Requires:       plexus-i18n
Requires:       plexus-utils
Requires:       plexus-velocity
Requires:       velocity

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils >= 0:1.7.2
Requires(post):   jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2

BuildArch:      noarch

%description
Doxia is a content generation framework which aims to provide its
users with powerful techniques for generating static and dynamic
content. Doxia can be used to generate static sites in addition to
being incorporated into dynamic content generation systems like blogs,
wikis and content management systems.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{name}

%patch0

# Disable test that needs htmlunit, until we get it in Fedora
rm -f doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java

%build

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
      -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
      -Dmaven.test.failure.ignore=true \
      install

for dir in doxia*; do
    pushd $dir
        mvn-jpp \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        javadoc:javadoc
    popd
done

%post
%update_maven_depmap

%postun
%update_maven_depmap

%install
rm -rf $RPM_BUILD_ROOT

# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -m 644 -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-sitetools.pom
install -m 644 -p doxia-decoration-model/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-decoration-model.pom
install -m 644 -p doxia-site-renderer/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-site-renderer.pom
install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-doc-renderer.pom

%add_to_maven_depmap org.apache.maven.doxia doxia-sitetools %{namedversion} JPP/%{parent} sitetools
%add_to_maven_depmap org.apache.maven.doxia doxia-decoration-model %{namedversion} JPP/%{parent} decoration-model
%add_to_maven_depmap org.apache.maven.doxia doxia-site-renderer %{namedversion} JPP/%{parent} site-renderer
%add_to_maven_depmap org.apache.maven.doxia doxia-doc-renderer %{namedversion} JPP/%{parent} doc-renderer

install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}

install -m 644 -p doxia-decoration-model/target/doxia-decoration-model-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model-%{namedversion}.jar
install -m 644 -p doxia-site-renderer/target/doxia-site-renderer-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer-%{namedversion}.jar
install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer-%{namedversion}.jar

(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{namedversion}*; \
  do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)

# javadoc (all javadocs are contained in the main module docs dir used below)
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer

cp -pr doxia-decoration-model/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model/
cp -pr doxia-site-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer/
cp -pr doxia-doc-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/%{parent}
%{_datadir}/maven2/poms/JPP.%{parent}-sitetools.pom
%{_datadir}/maven2/poms/JPP.%{parent}-decoration-model.pom
%{_datadir}/maven2/poms/JPP.%{parent}-site-renderer.pom
%{_datadir}/maven2/poms/JPP.%{parent}-doc-renderer.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Fri Aug 28 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a10
- First Fedora build

* Fri Jun 20 2000 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a10.0jpp.1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia-sitetools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Sep 2009 16:03:03 -0000	1.1
+++ .cvsignore	1 Sep 2009 16:45:22 -0000	1.2
@@ -0,0 +1 @@
+maven-doxia-sitetools-1.0-alpha10-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia-sitetools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Sep 2009 16:03:03 -0000	1.1
+++ sources	1 Sep 2009 16:45:22 -0000	1.2
@@ -0,0 +1 @@
+e92a63df39ab4e700a26cb267f4c0c0e  maven-doxia-sitetools-1.0-alpha10-src.tar.gz



From overholt at fedoraproject.org  Tue Sep  1 16:50:25 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 16:50:25 +0000 (UTC)
Subject: rpms/maven-embedder/devel import.log, NONE,
	1.1 maven-embedder-build.xml, NONE,
	1.1 maven-embedder-jpp-depmap.xml, NONE, 1.1 maven-embedder.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090901165025.9B26811C0495@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-embedder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5053/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log maven-embedder-build.xml 
	maven-embedder-jpp-depmap.xml maven-embedder.spec 
Log Message:
Initial import (review bug #520491)



--- NEW FILE import.log ---
maven-embedder-2_0_4-6_fc11:HEAD:maven-embedder-2.0.4-6.fc11.src.rpm:1251823723


--- NEW FILE maven-embedder-build.xml ---
<project name="maven-embedder" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="maven-embedder-2.0.4"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar"/>
      <include name="org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar"/>
      <include name="org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar"/>
      <include name="org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar"/>
      <include name="classworlds/classworlds/1.1/classworlds-1.1.jar"/>
      <include name="org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar"/>
      <include name="jdom/jdom/1.0/jdom-1.0.jar"/>
      <include name="org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar"/>
      <include name="org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar"/>
      <include name="org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar"/>
      <include name="org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar"/>
      <include name="commons-cli/commons-cli/1.0/commons-cli-1.0.jar"/>
      <include name="com/jcraft/jsch/0.1.24/jsch-0.1.24.jar"/>
      <include name="org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar"/>
      <include name="org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar"/>
      <include name="org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar"/>
      <include name="org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar"/>
      <include name="org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar"/>
      <include name="org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar"/>
      <include name="org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar"/>
      <include name="org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar"/>
      <include name="org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar"/>
      <include name="org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar"/>
      <include name="jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar"/>
      <include name="org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar"/>
      <include name="org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar"/>
      <include name="org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar"/>
      <include name="xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
      <include name="org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar"/>
      <include name="org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar"/>
      <include name="org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
    <copy todir="${maven.build.output}">
      <fileset dir="src/main/resources"/>
    </copy>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="false" haltonfailure="false" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-plugin-descriptor/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-descriptor/2.0.4/maven-plugin-descriptor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-ssh-common/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/codehaus/plexus/plexus-interactivity-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0/plexus-interactivity-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-error-diagnostics/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/classworlds/classworlds/1.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-ssh/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/jdom/jdom/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/jdom/jdom/1.0/jdom-1.0.jar" dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/jdom/jdom/1.0/jdom-1.0.jar" dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/jdom/jdom/1.0/jdom-1.0.jar" dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/jdom/jdom/1.0/jdom-1.0.jar" dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/jdom/jdom/1.0/jdom-1.0.jar" dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/jdom/jdom/1.0/jdom-1.0.jar" dest="${maven.repo.local}/jdom/jdom/1.0/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-monitor/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-monitor/2.0.4/maven-monitor-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-http-shared/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0/wagon-http-shared-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-repository-metadata/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-plugin-parameter-documenter/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-parameter-documenter/2.0.4/maven-plugin-parameter-documenter-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/commons-cli/commons-cli/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/com/jcraft/jsch/0.1.24"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-model/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-artifact/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-settings/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-provider-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-file/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0/wagon-file-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-artifact-manager/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/codehaus/plexus/plexus-utils/1.4.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.8/plexus-utils-1.4.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-plugin-api/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-plugin-registry/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-plugin-registry/2.0.4/maven-plugin-registry-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-profile/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/jtidy/jtidy/4aug2000r7-dev"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-core/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/reporting/maven-reporting-api/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/maven-project/2.0.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" dest="${maven.repo.local}/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/xml-apis/xml-apis/2.0.2"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-ssh-external/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0/wagon-ssh-external-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/org/apache/maven/wagon/wagon-http-lightweight/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/external_repo/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/maven-embedder-2.0.4/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://cvs.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0/wagon-http-lightweight-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Maven Embedder 2.0.4 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.embedder.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>

</project>


--- NEW FILE maven-embedder-jpp-depmap.xml ---
<dependencies>
  <dependency>
	<maven>
	  <groupId>org.apache.maven</groupId>
	  <artifactId>maven-archiver</artifactId>
	  <version>2.0.1</version>
	</maven>
	<jpp>
	  <groupId>JPP/maven-shared</groupId>
	  <artifactId>archiver</artifactId>
	  <version>2.3</version>
	</jpp>
  </dependency>
  <dependency>
	<maven>
	  <groupId>junit</groupId>
	  <artifactId>junit</artifactId>
	  <version>3.8.1</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>junit</artifactId>
	  <version>3.8.2</version>
	</jpp>
  </dependency>
  <dependency>
	<maven>
	  <groupId>javax.servlet</groupId>
	  <artifactId>servlet-api</artifactId>
	  <version>2.3</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>servletapi4</artifactId>
	  <version>2.3</version>
	</jpp>
  </dependency>

</dependencies>


--- NEW FILE maven-embedder.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

%define bname embedder

%define maven_settings_file %{_builddir}/%{name}/settings.xml

Name:           maven-embedder
Version:        2.0.4
Release:        6%{?dist}
Summary:        Maven Embedder
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://maven.apache.org/
# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-embedder-2.0.4/
# Note: Exported revision 776856.
# tar czf maven-embedder-2.0.4-src.tgz maven-embedder-2.0.4
Source0:        %{name}-%{version}-src.tgz

Source1:        %{name}-build.xml
Source2:        %{name}-jpp-depmap.xml

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
%if %{with_maven}
BuildRequires:  maven2 >= 0:2.0.4
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-checkstyle
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-pmd
BuildRequires:  maven2-plugin-project-info-reports
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven-surefire-maven-plugin = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  maven-doxia
BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api
BuildRequires:  checkstyle
%endif

Requires:       maven2
Requires(post):   jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
Conflicts:      maven2 < 0:2.0.6

%description
The Maven Embedder is used by the Maven CLI, by IDE integration projects like
Mevenide and potentially any tool that needs to embed Maven's capabilities.
You could embed Maven in a Continuous Integration application to run Maven
build, an application lifecycle management (ALF) tool, or Ant tasks that
utilize Maven's functionality.
These are just a few examples of what the Maven Embedder can be used for.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
%{summary}.

%prep
%setup -q
cp %{SOURCE1} build.xml

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

%if %{with_maven}

# disable tests because they download stuff from the net

    mvn-jpp \
        -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.skip=true \
        install javadoc:javadoc

# ignoring failures only needed for mock environments
%else
export CLASSPATH=$(build-classpath \
commons-codec \
commons-httpclient \
jdom \
maven2/artifact \
maven2/artifact-manager \
maven2/core \
maven2/model \
maven2/monitor \
maven2/plugin-api \
maven2/plugin-descriptor \
maven2/plugin-registry \
maven2/profile \
maven2/project \
maven2/repository-metadata \
maven2/settings \
maven-wagon/provider-api \
maven-wagon/file \
maven-wagon/http \
plexus/classworlds \
plexus/container-default \
plexus/interactivity-api \
plexus/utils \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven2
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -m 644 target/%{name}-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/maven-embedder-%{version}.jar
%add_to_maven_depmap org.apache.maven %{name} %{version} JPP embedder
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-embedder.pom

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# create a compatibility link
ln -s ../maven-embedder-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/maven2/embedder.jar

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}

cp -pr target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/maven2/embedder*.jar
%{_javadir}/%{name}*jar
%{_datadir}/maven2
%{_mavendepmapfragdir}

%if %{with_maven}
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%endif

%changelog
* Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.4-6
- Remove Epoch:0.
- Require maven-surefire-maven-plugin instead of maven2-plugin-surefire.

* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.4-5
- Adapt for Fedora.

* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 2.0.4-4
- Fix license
- Fix instructions to generate source tar ball
- Refresh source tar ball
- Better description

* Mon Apr 27 2009 Yong Yang <yyang at redhat.com> 2.0.4-3
- Add BRs for maven-doxia*, checkstyle
- Rebuild with maven2-2.0.8 built in non-bootstrap mode

* Mon Mar 09 2009 Yong Yang <yyang at redhat.com> 2.0.4-2
- Import from dbhole's maven2 2.0.8 packages

* Thu Apr 03 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-1jpp.1
- Import from JPackage

* Tue Feb 05 2008 Ralph Apel <r.apel at r-apel.de> 0:2.0.4-1jpp
- First release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-embedder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Sep 2009 16:04:16 -0000	1.1
+++ .cvsignore	1 Sep 2009 16:50:25 -0000	1.2
@@ -0,0 +1 @@
+maven-embedder-2.0.4-src.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-embedder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Sep 2009 16:04:17 -0000	1.1
+++ sources	1 Sep 2009 16:50:25 -0000	1.2
@@ -0,0 +1 @@
+ac6be3c4c490a9476510d2191eafe910  maven-embedder-2.0.4-src.tgz



From mtasaka at fedoraproject.org  Tue Sep  1 16:57:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  1 Sep 2009 16:57:10 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.389, 1.390 jd.spec, 1.452, 1.453 sources,
	1.390, 1.391
Message-ID: <20090901165710.5EC4411C0077@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6482

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3055



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- .cvsignore	30 Aug 2009 04:53:55 -0000	1.389
+++ .cvsignore	1 Sep 2009 16:57:10 -0000	1.390
@@ -1 +1 @@
-jd-2.4.2-svn3054_trunk.tgz
+jd-2.4.2-svn3055_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -p -r1.452 -r1.453
--- jd.spec	30 Aug 2009 04:53:55 -0000	1.452
+++ jd.spec	1 Sep 2009 16:57:10 -0000	1.453
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3054_trunk
+%define         strtag        svn3055_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3054
+* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3055
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- sources	30 Aug 2009 04:53:55 -0000	1.390
+++ sources	1 Sep 2009 16:57:10 -0000	1.391
@@ -1 +1 @@
-26b788eb750ba90ecb8ef1ded3909b7e  jd-2.4.2-svn3054_trunk.tgz
+1ee4aa47b29ee812bfc712c2ea890bb6  jd-2.4.2-svn3055_trunk.tgz



From hadess at fedoraproject.org  Tue Sep  1 17:00:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Sep 2009 17:00:43 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel .cvsignore, 1.21,
	1.22 gstreamer-plugins-good.spec, 1.102, 1.103 sources, 1.21, 1.22
Message-ID: <20090901170043.2735C11C0345@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7317

Modified Files:
	.cvsignore gstreamer-plugins-good.spec sources 
Log Message:
* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
- Update to 0.10.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	14 Aug 2009 19:36:27 -0000	1.21
+++ .cvsignore	1 Sep 2009 17:00:42 -0000	1.22
@@ -1 +1 @@
-gst-plugins-good-0.10.15.3.tar.bz2
+gst-plugins-good-0.10.16.tar.bz2


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gstreamer-plugins-good.spec	16 Aug 2009 19:27:02 -0000	1.102
+++ gstreamer-plugins-good.spec	1 Sep 2009 17:00:42 -0000	1.103
@@ -5,7 +5,7 @@
 %define         _gstpb          0.10.17
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.15.3
+Version: 	0.10.16
 Release:  	1%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
@@ -271,6 +271,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
+- Update to 0.10.16
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15.3-1
 - Update to 0.10.15.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	14 Aug 2009 19:36:27 -0000	1.21
+++ sources	1 Sep 2009 17:00:42 -0000	1.22
@@ -1 +1 @@
-916a8a2f30891246f6c8ad7f6a94e42f  gst-plugins-good-0.10.15.3.tar.bz2
+f0af97464bb6e060a99df39bb21b7a42  gst-plugins-good-0.10.16.tar.bz2



From cebbert at fedoraproject.org  Tue Sep  1 17:08:26 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  1 Sep 2009 17:08:26 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc8-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1121, 1.1122 config-generic, 1.322, 1.323 drm-intel-next.patch,
	1.10, 1.11 kernel.spec, 1.1757, 1.1758 sources, 1.1079,
	1.1080 upstream, 1.993, 1.994 patch-2.6.31-rc8-git1.bz2.sign,
	1.1, NONE
Message-ID: <20090901170826.D41F511C0077@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8822

Modified Files:
	.cvsignore config-generic drm-intel-next.patch kernel.spec 
	sources upstream 
Added Files:
	patch-2.6.31-rc8-git2.bz2.sign 
Removed Files:
	patch-2.6.31-rc8-git1.bz2.sign 
Log Message:
2.6.31-rc8-git2
Blank out drm-intel-next: entire contents are now upstream.


--- NEW FILE patch-2.6.31-rc8-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKnRA2yGugalF9Dw4RAloiAJ9bTv62NKVqJomI1RZifqbpGJ+FYgCfQVBT
on7r6znNdTxyK09vneVQsdI=
=rRWa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1121
retrieving revision 1.1122
diff -u -p -r1.1121 -r1.1122
--- .cvsignore	30 Aug 2009 15:23:08 -0000	1.1121
+++ .cvsignore	1 Sep 2009 17:08:26 -0000	1.1122
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git1.bz2
+patch-2.6.31-rc8-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- config-generic	28 Aug 2009 16:43:03 -0000	1.322
+++ config-generic	1 Sep 2009 17:08:26 -0000	1.323
@@ -2362,8 +2362,9 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_SIANO_SMS1XXX=m
-CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m

drm-intel-next.patch:
 0 files changed

Index: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- drm-intel-next.patch	26 Aug 2009 13:58:24 -0000	1.10
+++ drm-intel-next.patch	1 Sep 2009 17:08:26 -0000	1.11
@@ -1,362 +1 @@
-diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index 4cf8e2e..d129497 100644
---- a/drivers/gpu/drm/i915/intel_crt.c
-+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -537,6 +537,10 @@ void intel_crt_init(struct drm_device *dev)
- 	}
- 
- 	intel_output->type = INTEL_OUTPUT_ANALOG;
-+	intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+				   (1 << INTEL_ANALOG_CLONE_BIT) |
-+				   (1 << INTEL_SDVO_LVDS_CLONE_BIT);
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
- 
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index d6fce21..3fadb53 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -666,7 +666,7 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
- 	intel_clock_t clock;
- 	int err = target;
- 
--	if (IS_I9XX(dev) && intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-+	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
- 	    (I915_READ(LVDS)) != 0) {
- 		/*
- 		 * For LVDS, if the panel is on, just rely on its current
-@@ -2396,7 +2396,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- 		if (is_sdvo) {
- 			dpll |= DPLL_DVO_HIGH_SPEED;
- 			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
--			if (IS_I945G(dev) || IS_I945GM(dev))
-+			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
- 				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
- 			else if (IS_IGDNG(dev))
- 				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
-@@ -3170,7 +3170,7 @@ static int intel_connector_clones(struct drm_device *dev, int type_mask)
- 
-         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- 		struct intel_output *intel_output = to_intel_output(connector);
--		if (type_mask & (1 << intel_output->type))
-+		if (type_mask & intel_output->clone_mask)
- 			index_mask |= (1 << entry);
- 		entry++;
- 	}
-@@ -3218,30 +3218,30 @@ static void intel_setup_outputs(struct drm_device *dev)
- 			intel_dp_init(dev, PCH_DP_D);
- 
- 	} else if (IS_I9XX(dev)) {
--		int found;
--		u32 reg;
-+		bool found = false;
- 
- 		if (I915_READ(SDVOB) & SDVO_DETECTED) {
- 			found = intel_sdvo_init(dev, SDVOB);
- 			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- 				intel_hdmi_init(dev, SDVOB);
-+
- 			if (!found && SUPPORTS_INTEGRATED_DP(dev))
- 				intel_dp_init(dev, DP_B);
- 		}
- 
- 		/* 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) {
-+		if (I915_READ(SDVOB) & SDVO_DETECTED)
- 			found = intel_sdvo_init(dev, SDVOC);
--			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
-+
-+		if (!found && (I915_READ(SDVOC) & SDVO_DETECTED)) {
-+
-+			if (SUPPORTS_INTEGRATED_HDMI(dev))
- 				intel_hdmi_init(dev, SDVOC);
--			if (!found && SUPPORTS_INTEGRATED_DP(dev))
-+			if (SUPPORTS_INTEGRATED_DP(dev))
- 				intel_dp_init(dev, DP_C);
- 		}
-+
- 		if (SUPPORTS_INTEGRATED_DP(dev) && (I915_READ(DP_D) & DP_DETECTED))
- 			intel_dp_init(dev, DP_D);
- 	} else
-@@ -3253,51 +3253,10 @@ static void intel_setup_outputs(struct drm_device *dev)
- 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- 		struct intel_output *intel_output = to_intel_output(connector);
- 		struct drm_encoder *encoder = &intel_output->enc;
--		int crtc_mask = 0, clone_mask = 0;
- 
--		/* valid crtcs */
--		switch(intel_output->type) {
--		case INTEL_OUTPUT_HDMI:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_HDMI));
--			break;
--		case INTEL_OUTPUT_DVO:
--		case INTEL_OUTPUT_SDVO:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_ANALOG) |
--				      (1 << INTEL_OUTPUT_DVO) |
--				      (1 << INTEL_OUTPUT_SDVO));
--			break;
--		case INTEL_OUTPUT_ANALOG:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_ANALOG) |
--				      (1 << INTEL_OUTPUT_DVO) |
--				      (1 << INTEL_OUTPUT_SDVO));
--			break;
--		case INTEL_OUTPUT_LVDS:
--			crtc_mask = (1 << 1);
--			clone_mask = (1 << INTEL_OUTPUT_LVDS);
--			break;
--		case INTEL_OUTPUT_TVOUT:
--			crtc_mask = ((1 << 0) |
--				     (1 << 1));
--			clone_mask = (1 << INTEL_OUTPUT_TVOUT);
--			break;
--		case INTEL_OUTPUT_DISPLAYPORT:
--			crtc_mask = ((1 << 0) |
--				     (1 << 1));
--			clone_mask = (1 << INTEL_OUTPUT_DISPLAYPORT);
--			break;
--		case INTEL_OUTPUT_EDP:
--			crtc_mask = (1 << 1);
--			clone_mask = (1 << INTEL_OUTPUT_EDP);
--			break;
--		}
--		encoder->possible_crtcs = crtc_mask;
--		encoder->possible_clones = intel_connector_clones(dev, clone_mask);
-+		encoder->possible_crtcs = intel_output->crtc_mask;
-+		encoder->possible_clones = intel_connector_clones(dev,
-+						intel_output->clone_mask);
- 	}
- }
- 
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index a6ff15a..f2afc4a 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1254,6 +1254,18 @@ intel_dp_init(struct drm_device *dev, int output_reg)
- 	else
- 		intel_output->type = INTEL_OUTPUT_DISPLAYPORT;
- 
-+	if (output_reg == DP_B)
-+		intel_output->clone_mask = (1 << INTEL_DP_B_CLONE_BIT);
-+	else if (output_reg == DP_C)
-+		intel_output->clone_mask = (1 << INTEL_DP_C_CLONE_BIT);
-+	else if (output_reg == DP_D)
-+		intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT);
-+
-+	if (IS_eDP(intel_output)) {
-+		intel_output->crtc_mask = (1 << 1);
-+		intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP);
-+	} else
-+		intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 	connector->interlace_allowed = true;
- 	connector->doublescan_allowed = 0;
- 
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index d6f92ea..25aa6fa 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -57,6 +57,24 @@
- #define INTEL_OUTPUT_DISPLAYPORT 7
- #define INTEL_OUTPUT_EDP 8
- 
-+/* Intel Pipe Clone Bit */
-+#define INTEL_HDMIB_CLONE_BIT 1
-+#define INTEL_HDMIC_CLONE_BIT 2
-+#define INTEL_HDMID_CLONE_BIT 3
-+#define INTEL_HDMIE_CLONE_BIT 4
-+#define INTEL_HDMIF_CLONE_BIT 5
-+#define INTEL_SDVO_NON_TV_CLONE_BIT 6
-+#define INTEL_SDVO_TV_CLONE_BIT 7
-+#define INTEL_SDVO_LVDS_CLONE_BIT 8
-+#define INTEL_ANALOG_CLONE_BIT 9
-+#define INTEL_TV_CLONE_BIT 10
-+#define INTEL_DP_B_CLONE_BIT 11
-+#define INTEL_DP_C_CLONE_BIT 12
-+#define INTEL_DP_D_CLONE_BIT 13
-+#define INTEL_LVDS_CLONE_BIT 14
-+#define INTEL_DVO_TMDS_CLONE_BIT 15
-+#define INTEL_DVO_LVDS_CLONE_BIT 16
-+
- #define INTEL_DVO_CHIP_NONE 0
- #define INTEL_DVO_CHIP_LVDS 1
- #define INTEL_DVO_CHIP_TMDS 2
-@@ -86,6 +104,8 @@ struct intel_output {
- 	bool needs_tv_clock;
- 	void *dev_priv;
- 	void (*hot_plug)(struct intel_output *);
-+	int crtc_mask;
-+	int clone_mask;
- };
- 
- struct intel_crtc {
-diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
-index 13bff20..a4d2606 100644
---- a/drivers/gpu/drm/i915/intel_dvo.c
-+++ b/drivers/gpu/drm/i915/intel_dvo.c
-@@ -435,14 +435,20 @@ void intel_dvo_init(struct drm_device *dev)
- 			continue;
- 
- 		intel_output->type = INTEL_OUTPUT_DVO;
-+		intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 		switch (dvo->type) {
- 		case INTEL_DVO_CHIP_TMDS:
-+			intel_output->clone_mask =
-+				(1 << INTEL_DVO_TMDS_CLONE_BIT) |
-+				(1 << INTEL_ANALOG_CLONE_BIT);
- 			drm_connector_init(dev, connector,
- 					   &intel_dvo_connector_funcs,
- 					   DRM_MODE_CONNECTOR_DVII);
- 			encoder_type = DRM_MODE_ENCODER_TMDS;
- 			break;
- 		case INTEL_DVO_CHIP_LVDS:
-+			intel_output->clone_mask =
-+				(1 << INTEL_DVO_LVDS_CLONE_BIT);
- 			drm_connector_init(dev, connector,
- 					   &intel_dvo_connector_funcs,
- 					   DRM_MODE_CONNECTOR_LVDS);
-diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
-index 1842290..fa304e1 100644
---- a/drivers/gpu/drm/i915/intel_hdmi.c
-+++ b/drivers/gpu/drm/i915/intel_hdmi.c
-@@ -230,22 +230,28 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
- 
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 
- 	/* Set up the DDC bus. */
--	if (sdvox_reg == SDVOB)
-+	if (sdvox_reg == SDVOB) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIB_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "HDMIB");
--	else if (sdvox_reg == SDVOC)
-+	} else if (sdvox_reg == SDVOC) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIC_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOD, "HDMIC");
--	else if (sdvox_reg == HDMIB)
-+	} else if (sdvox_reg == HDMIB) {
-+		intel_output->clone_mask = (1 << INTEL_HDMID_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOE,
- 								"HDMIB");
--	else if (sdvox_reg == HDMIC)
-+	} else if (sdvox_reg == HDMIC) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIE_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOD,
- 								"HDMIC");
--	else if (sdvox_reg == HDMID)
-+	} else if (sdvox_reg == HDMID) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIF_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOF,
- 								"HDMID");
--
-+	}
- 	if (!intel_output->ddc_bus)
- 		goto err_connector;
- 
-diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 3f445a8..8df02ef 100644
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -916,6 +916,8 @@ void intel_lvds_init(struct drm_device *dev)
- 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
- 	intel_output->type = INTEL_OUTPUT_LVDS;
- 
-+	intel_output->clone_mask = (1 << INTEL_LVDS_CLONE_BIT);
-+	intel_output->crtc_mask = (1 << 1);
- 	drm_encoder_helper_add(encoder, &intel_lvds_helper_funcs);
- 	drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs);
- 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index 5371d93..d3b74ba 100644
---- a/drivers/gpu/drm/i915/intel_sdvo.c
-+++ b/drivers/gpu/drm/i915/intel_sdvo.c
-@@ -1458,7 +1458,7 @@ intel_sdvo_multifunc_encoder(struct intel_output *intel_output)
- 		(SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1))
- 		caps++;
- 	if (sdvo_priv->caps.output_flags &
--		(SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID0))
-+		(SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID1))
- 		caps++;
- 	if (sdvo_priv->caps.output_flags &
- 		(SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_CVBS1))
-@@ -1967,6 +1967,9 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 			intel_sdvo_set_colorimetry(intel_output,
- 						   SDVO_COLORIMETRY_RGB256);
- 			connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
-+			intel_output->clone_mask =
-+					(1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+					(1 << INTEL_ANALOG_CLONE_BIT);
- 		}
- 	} else if (flags & SDVO_OUTPUT_SVID0) {
- 
-@@ -1975,11 +1978,14 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 		connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
- 		sdvo_priv->is_tv = true;
- 		intel_output->needs_tv_clock = true;
-+		intel_output->clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
- 	} else if (flags & SDVO_OUTPUT_RGB0) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
- 		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
- 		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
-+		intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+					(1 << INTEL_ANALOG_CLONE_BIT);
- 	} else if (flags & SDVO_OUTPUT_RGB1) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
-@@ -1991,12 +1997,16 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
- 		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- 		sdvo_priv->is_lvds = true;
-+		intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT) |
-+					(1 << INTEL_SDVO_LVDS_CLONE_BIT);
- 	} else if (flags & SDVO_OUTPUT_LVDS1) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
- 		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
- 		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- 		sdvo_priv->is_lvds = true;
-+		intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT) |
-+					(1 << INTEL_SDVO_LVDS_CLONE_BIT);
- 	} else {
- 
- 		unsigned char bytes[2];
-@@ -2009,6 +2019,7 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 				  bytes[0], bytes[1]);
- 		ret = false;
- 	}
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 
- 	if (ret && registered)
- 		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index da4ab4d..2fbe13a 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1718,6 +1718,7 @@ intel_tv_init(struct drm_device *dev)
- 	if (!intel_output) {
- 		return;
- 	}
-+
- 	connector = &intel_output->base;
- 
- 	drm_connector_init(dev, connector, &intel_tv_connector_funcs,
-@@ -1729,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
- 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
- 	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
- 	intel_output->type = INTEL_OUTPUT_TVOUT;
-+	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
- 	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
- 	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
- 	intel_output->dev_priv = tv_priv;
+empty


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -p -r1.1757 -r1.1758
--- kernel.spec	1 Sep 2009 16:12:52 -0000	1.1757
+++ kernel.spec	1 Sep 2009 17:08:26 -0000	1.1758
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -686,7 +686,7 @@ Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-26
+# intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
@@ -1316,7 +1316,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-ApplyPatch drm-intel-next.patch
+ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -2005,6 +2005,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8-git2
+- Blank out drm-intel-next: entire contents are now upstream.
+
 * Tue Sep 01 2009 Dave Jones <davej at redhat.com>
 - Make firmware buildarch noarch. (Suggested by drago01 on irc)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -p -r1.1079 -r1.1080
--- sources	30 Aug 2009 15:23:09 -0000	1.1079
+++ sources	1 Sep 2009 17:08:26 -0000	1.1080
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2
-7b4745c59d0ba65bef1d360229e02d50  patch-2.6.31-rc8-git1.bz2
+81cac9f7aa9cfa526ce4cfedb4e0f739  patch-2.6.31-rc8-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -p -r1.993 -r1.994
--- upstream	30 Aug 2009 15:23:09 -0000	1.993
+++ upstream	1 Sep 2009 17:08:26 -0000	1.994
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git1.bz2
+patch-2.6.31-rc8-git2.bz2


--- patch-2.6.31-rc8-git1.bz2.sign DELETED ---



From clumens at fedoraproject.org  Tue Sep  1 17:13:39 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue,  1 Sep 2009 17:13:39 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.661, 1.662 anaconda.spec, 1.811, 
	1.812 sources, 1.795, 1.796
Message-ID: <20090901171339.B650C11C0077@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10499

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -p -r1.661 -r1.662
--- .cvsignore	28 Aug 2009 22:52:02 -0000	1.661
+++ .cvsignore	1 Sep 2009 17:13:39 -0000	1.662
@@ -1 +1,2 @@
 anaconda-12.18.tar.bz2
+anaconda-12.19.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -p -r1.811 -r1.812
--- anaconda.spec	28 Aug 2009 22:52:02 -0000	1.811
+++ anaconda.spec	1 Sep 2009 17:13:39 -0000	1.812
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.18
+Version: 12.19
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -210,6 +210,13 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Sep 01 2009 Chris Lumens <clumens at redhat.com> - 12.19-1
+- NetworkManager changed *again*, use libnm-glib.pc now. (dcantrell)
+- Save duplicates from /etc/fstab and don't traceback (#517498). (clumens)
+- Update fstab header to reference blkid instead of vol_id. (dlehman)
+- Sort fstab entries by mountpoint. (#498354) (dlehman)
+- Don't hardcode path to tune2fs. (dlehman)
+
 * Fri Aug 28 2009 David Cantrell <dcantrell at redhat.com> - 12.18-1
 - Append s390x packages to PACKAGES list, exclude /sbin/qetharp-2.4
   (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -p -r1.795 -r1.796
--- sources	28 Aug 2009 22:52:02 -0000	1.795
+++ sources	1 Sep 2009 17:13:39 -0000	1.796
@@ -1 +1 @@
-5ddfff960c4c935436d3f319d6a6c85b  anaconda-12.18.tar.bz2
+c5596213b8fe5f0d29784450b029e97a  anaconda-12.19.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:16:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:16:57 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore,1.62,1.63
Message-ID: <20090901171657.6976011C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	28 Aug 2009 13:10:04 -0000	1.62
+++ .cvsignore	1 Sep 2009 17:16:57 -0000	1.63
@@ -1,6 +1 @@
-kdebindings-4.2.90.tar.bz2
-kdebindings-4.2.95.tar.bz2
-kdebindings-4.2.96.tar.bz2
-kdebindings-4.2.98.tar.bz2
-kdebindings-4.3.0.tar.bz2
 kdebindings-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:16:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:16:57 +0000 (UTC)
Subject: rpms/kdebindings/F-10 .cvsignore, 1.57, 1.58 kdebindings.spec, 1.164,
	1.165 sources, 1.65, 1.66
Message-ID: <20090901171657.18DB711C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166/F-10

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	5 Aug 2009 02:46:55 -0000	1.57
+++ .cvsignore	1 Sep 2009 17:16:56 -0000	1.58
@@ -1,5 +1 @@
-kdebindings-4.2.90.tar.bz2
-kdebindings-4.2.95.tar.bz2
-kdebindings-4.2.96.tar.bz2
-kdebindings-4.2.98.tar.bz2
-kdebindings-4.3.0.tar.bz2
+kdebindings-4.3.1.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- kdebindings.spec	11 Aug 2009 15:09:14 -0000	1.164
+++ kdebindings.spec	1 Sep 2009 17:16:56 -0000	1.165
@@ -9,10 +9,7 @@
 %endif
 %endif
 %define falcon 1
-# FIXME: temporarily disable on rawhide, until build failures fixed
-%if 0%{?fedora} < 12
 %define php 1
-%endif
 %define ruby 1
 %define smoke 1
 %define java 0
@@ -31,8 +28,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.0
-Release: 4%{?dist}.1
+Version: 4.3.1
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -510,6 +507,12 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
+- re-enable php bindings (rawhide)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
 - BR: qscintilla-devel >= 2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	5 Aug 2009 02:46:55 -0000	1.65
+++ sources	1 Sep 2009 17:16:56 -0000	1.66
@@ -1 +1 @@
-6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2
+6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:16:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:16:57 +0000 (UTC)
Subject: rpms/kdebindings/F-11 .cvsignore, 1.61, 1.62 kdebindings.spec, 1.204,
	1.205 sources, 1.66, 1.67
Message-ID: <20090901171657.4058611C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166/F-11

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	5 Aug 2009 02:45:53 -0000	1.61
+++ .cvsignore	1 Sep 2009 17:16:57 -0000	1.62
@@ -1,5 +1 @@
-kdebindings-4.2.90.tar.bz2
-kdebindings-4.2.95.tar.bz2
-kdebindings-4.2.96.tar.bz2
-kdebindings-4.2.98.tar.bz2
-kdebindings-4.3.0.tar.bz2
+kdebindings-4.3.1.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- kdebindings.spec	11 Aug 2009 15:09:14 -0000	1.204
+++ kdebindings.spec	1 Sep 2009 17:16:57 -0000	1.205
@@ -9,10 +9,7 @@
 %endif
 %endif
 %define falcon 1
-# FIXME: temporarily disable on rawhide, until build failures fixed
-%if 0%{?fedora} < 12
 %define php 1
-%endif
 %define ruby 1
 %define smoke 1
 %define java 0
@@ -31,8 +28,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.0
-Release: 4%{?dist}.1
+Version: 4.3.1
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -510,6 +507,12 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
+- re-enable php bindings (rawhide)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
 - BR: qscintilla-devel >= 2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	5 Aug 2009 02:45:54 -0000	1.66
+++ sources	1 Sep 2009 17:16:57 -0000	1.67
@@ -1 +1 @@
-6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2
+6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2



From transif at fedoraproject.org  Tue Sep  1 17:18:49 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 17:18:49 +0000 (UTC)
Subject: comps/po is.po,1.19,1.20
Message-ID: <20090901171849.92FFF11C0077@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11672/po

Modified Files:
	is.po 
Log Message:
Sending translation for Icelandic


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.19 -r 1.20 is.poIndex: is.po
===================================================================
RCS file: /cvs/pkgs/comps/po/is.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- is.po	25 Aug 2009 08:10:32 -0000	1.19
+++ is.po	1 Sep 2009 17:18:49 -0000	1.20
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.po to icelandic
+# translation of comps.HEAD.po to
 # ?slensk ???ing comps.HEAD.po
 # Copyright (C) 2009 Free Software Foundation
 # This file is distributed under the same license as the PACKAGE package.
@@ -9,288 +9,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-06-10 12:30+0000\n"
-"Last-Translator: Sveinn ? Felli <sveinki at nett.is>\n"
-"Language-Team: icelandic <kde-isl at molar.is>\n"
+"POT-Creation-Date: 2009-09-01 14:26+0000\n"
+"PO-Revision-Date: 2009-09-01 17:17+0000\n"
+"Last-Translator: \n"
+"Language-Team:  <is at li.org>\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"
 
-#: ../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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "L?tt skj?bor?sumhverfi sem virkar vel ? aflminni v?lum."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Kerfisstj?rnunart?l"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Afr?kanska"
 
-#: ../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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Alb?nska"
 
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Forrit"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "?mis forrit sem leysa m?rg verkefni af hendi"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arab?ska"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Armenska"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Assam?ska"
 
-#: ../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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Umbrot og ritstj?rn"
 
-#: ../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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Grunnur"
 
-#: ../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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Grunnkerfi?"
 
-#: ../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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Grunnstu?ningur vi? forritunarm?li? 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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Baskneska"
 
-#: ../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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Hv?t-r?ssneska"
 
-#: ../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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Bengalska"
 
-#: ../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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Bh?tanska"
 
-#: ../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-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Bosn?ska"
 
-#: ../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-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Bras?l?sk port?galska"
 
-#: ../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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Bret?nska"
 
-#: ../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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Buildsystem building group"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "B?lgarska"
 
-#: ../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-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Katal?nska"
 
-#: ../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-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
[...1879 lines suppressed...]
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "SUGAR skj?bor?sumhverfi"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1385,21 +1479,25 @@ msgstr ""
 "Windows umhverfi?, pr?fanir ?eirra og ger? uppsetningarpakka, allt gert ? "
 "Fedora."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?r?unart?l fyrir Objective CAML forritunarm?li? og tengd a?ger?as?fn."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1407,23 +1505,79 @@ msgstr ""
 "?essi pakkah?pur inniheldur ?mis t?l fyrir h?nnun, breytingar, me?h?ndlun og "
 "p?kkun ? letri."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "T?rkmen?ska"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Efri Sorbian"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "B?kur og lei?arv?sar"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "M?ppumi?lari"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin skj?bor?sumhverfi"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr ""
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?mis forrit til ?missa verka"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Upphringinetsstu?ningur"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1431,7 +1585,7 @@ msgstr ""
 "GNOME er ?flugt myndr?nt vinnuumhverfi sem inniheldur spjald, skj?bor?, "
 "kerfissm?myndir og myndr?nann skr?arstj?ra."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1439,7 +1593,7 @@ msgstr ""
 "KDE er ?flugt myndr?nt vinnuumhverfi sem inniheldur spjald, skj?bor?, "
 "kerfissm?myndir og myndr?nann skr?arstj?ra."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1447,11 +1601,11 @@ msgstr ""
 "Forrit sem kallast ritlar. ?etta eru t?lin sem gera ??r kleyft a? b?a til og "
 "breyta skr?m. ?etta inniheldur me?al annars Emacs og Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ritillinn."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1459,30 +1613,27 @@ msgstr ""
 "?essi t?l gera ??r kleyft a? b?a til skj?l ? DocBook sni?i og breyta ?eim ? "
 "HTML, PDF, Postscript og texta."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?essi pakkah?pur inniheldur ?msa s?rh?f?a net?j?na."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? arab?sku."
 
-#: ../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."
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? hebresku."
 
-#: ../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."
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? jap?nsku."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? t?kknesku."
+



From epienbro at fedoraproject.org  Tue Sep  1 17:23:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  1 Sep 2009 17:23:47 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.8, 1.9 mingw32-gtk2.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20090901172347.94F6811C0077@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12623

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.17.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	27 Aug 2009 21:01:31 -0000	1.8
+++ .cvsignore	1 Sep 2009 17:23:47 -0000	1.9
@@ -1 +1 @@
-gtk+-2.17.9.tar.bz2
+gtk+-2.17.10.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mingw32-gtk2.spec	27 Aug 2009 21:01:31 -0000	1.12
+++ mingw32-gtk2.spec	1 Sep 2009 17:23:47 -0000	1.13
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.17.9
+Version:        2.17.10
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -332,6 +332,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.10-1
+- Update to 2.17.10
+
 * Tue Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.9-1
 - Update to 2.17.9
 - Rebuild against mingw32-libjpeg 7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	27 Aug 2009 21:01:32 -0000	1.8
+++ sources	1 Sep 2009 17:23:47 -0000	1.9
@@ -1 +1 @@
-44323cc81628be422c59059086e33353  gtk+-2.17.9.tar.bz2
+9fe31cc177993fdec187e6f44fc3b60b  gtk+-2.17.10.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:24:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:24:25 +0000 (UTC)
Subject: rpms/kdeedu/F-10 .cvsignore, 1.63, 1.64 kdeedu.spec, 1.155,
	1.156 sources, 1.65, 1.66
Message-ID: <20090901172425.1FD4011C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12825/F-10

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	5 Aug 2009 02:53:20 -0000	1.63
+++ .cvsignore	1 Sep 2009 17:24:24 -0000	1.64
@@ -1,5 +1 @@
-kdeedu-4.2.90.tar.bz2
-kdeedu-4.2.95.tar.bz2
-kdeedu-4.2.96.tar.bz2
-kdeedu-4.2.98.tar.bz2
-kdeedu-4.3.0.tar.bz2
+kdeedu-4.3.1.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdeedu.spec	23 Aug 2009 23:13:22 -0000	1.155
+++ kdeedu.spec	1 Sep 2009 17:24:24 -0000	1.156
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.0
-Release: 6%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -480,6 +480,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
 - -kstars-libs subpkg, make -kstars not multilib'd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	5 Aug 2009 02:53:20 -0000	1.65
+++ sources	1 Sep 2009 17:24:25 -0000	1.66
@@ -1 +1 @@
-4c309bcdc47274cea6f61206a42ef638  kdeedu-4.3.0.tar.bz2
+f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:24:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:24:25 +0000 (UTC)
Subject: rpms/kdeedu/F-11 .cvsignore, 1.66, 1.67 kdeedu.spec, 1.183,
	1.184 sources, 1.67, 1.68
Message-ID: <20090901172425.5D1CD11C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12825/F-11

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	5 Aug 2009 02:53:20 -0000	1.66
+++ .cvsignore	1 Sep 2009 17:24:25 -0000	1.67
@@ -1,5 +1 @@
-kdeedu-4.2.90.tar.bz2
-kdeedu-4.2.95.tar.bz2
-kdeedu-4.2.96.tar.bz2
-kdeedu-4.2.98.tar.bz2
-kdeedu-4.3.0.tar.bz2
+kdeedu-4.3.1.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- kdeedu.spec	23 Aug 2009 23:12:42 -0000	1.183
+++ kdeedu.spec	1 Sep 2009 17:24:25 -0000	1.184
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.0
-Release: 6%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -480,6 +480,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
 - -kstars-libs subpkg, make -kstars not multilib'd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	5 Aug 2009 02:53:21 -0000	1.67
+++ sources	1 Sep 2009 17:24:25 -0000	1.68
@@ -1 +1 @@
-4c309bcdc47274cea6f61206a42ef638  kdeedu-4.3.0.tar.bz2
+f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:24:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:24:25 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore,1.69,1.70
Message-ID: <20090901172425.7E7CC11C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12825/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	28 Aug 2009 13:18:32 -0000	1.69
+++ .cvsignore	1 Sep 2009 17:24:25 -0000	1.70
@@ -1,6 +1 @@
-kdeedu-4.2.90.tar.bz2
-kdeedu-4.2.95.tar.bz2
-kdeedu-4.2.96.tar.bz2
-kdeedu-4.2.98.tar.bz2
-kdeedu-4.3.0.tar.bz2
 kdeedu-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:29:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:29:52 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore,1.71,1.72
Message-ID: <20090901172952.EC1E711C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13950/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	28 Aug 2009 13:29:02 -0000	1.71
+++ .cvsignore	1 Sep 2009 17:29:52 -0000	1.72
@@ -1,6 +1 @@
-kdegames-4.2.90.tar.bz2
-kdegames-4.2.95.tar.bz2
-kdegames-4.2.96.tar.bz2
-kdegames-4.2.98.tar.bz2
-kdegames-4.3.0.tar.bz2
 kdegames-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:29:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:29:52 +0000 (UTC)
Subject: rpms/kdegames/F-10 .cvsignore, 1.65, 1.66 kdegames.spec, 1.118,
	1.119 sources, 1.70, 1.71
Message-ID: <20090901172952.9F18611C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13950/F-10

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	5 Aug 2009 12:52:00 -0000	1.65
+++ .cvsignore	1 Sep 2009 17:29:52 -0000	1.66
@@ -1,5 +1 @@
-kdegames-4.2.90.tar.bz2
-kdegames-4.2.95.tar.bz2
-kdegames-4.2.96.tar.bz2
-kdegames-4.2.98.tar.bz2
-kdegames-4.3.0.tar.bz2
+kdegames-4.3.1.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- kdegames.spec	5 Aug 2009 15:57:03 -0000	1.118
+++ kdegames.spec	1 Sep 2009 17:29:52 -0000	1.119
@@ -1,8 +1,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -207,6 +207,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - Conflicts: kdegames3 < 3.5.10-6
 - %%check: desktop-file-validate


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	5 Aug 2009 12:52:01 -0000	1.70
+++ sources	1 Sep 2009 17:29:52 -0000	1.71
@@ -1 +1 @@
-9997c1fab82519ebc59e661c4324fa0a  kdegames-4.3.0.tar.bz2
+dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:29:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:29:52 +0000 (UTC)
Subject: rpms/kdegames/F-11 .cvsignore, 1.68, 1.69 kdegames.spec, 1.130,
	1.131 sources, 1.71, 1.72
Message-ID: <20090901172952.C68D511C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13950/F-11

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	5 Aug 2009 12:52:01 -0000	1.68
+++ .cvsignore	1 Sep 2009 17:29:52 -0000	1.69
@@ -1,5 +1 @@
-kdegames-4.2.90.tar.bz2
-kdegames-4.2.95.tar.bz2
-kdegames-4.2.96.tar.bz2
-kdegames-4.2.98.tar.bz2
-kdegames-4.3.0.tar.bz2
+kdegames-4.3.1.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- kdegames.spec	5 Aug 2009 15:57:03 -0000	1.130
+++ kdegames.spec	1 Sep 2009 17:29:52 -0000	1.131
@@ -1,8 +1,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -207,6 +207,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - Conflicts: kdegames3 < 3.5.10-6
 - %%check: desktop-file-validate


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	5 Aug 2009 12:52:01 -0000	1.71
+++ sources	1 Sep 2009 17:29:52 -0000	1.72
@@ -1 +1 @@
-9997c1fab82519ebc59e661c4324fa0a  kdegames-4.3.0.tar.bz2
+dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2



From jkeating at fedoraproject.org  Tue Sep  1 17:30:57 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue,  1 Sep 2009 17:30:57 +0000 (UTC)
Subject: rpms/serpentine/devel dead.package,NONE,1.1
Message-ID: <20090901173057.5967411C0077@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/serpentine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14476

Added Files:
	dead.package 
Log Message:
Retired


--- NEW FILE dead.package ---
Dead upstream



From pkgdb at fedoraproject.org  Tue Sep  1 17:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:31:44 +0000
Subject: [pkgdb] supybot-meetbot: e32e7ad0 has requested watchbugzilla
Message-ID: <20090901173144.E7E4510F87A@bastion2.fedora.phx.redhat.com>

e32e7ad0 has requested the watchbugzilla acl on supybot-meetbot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:31:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:31:48 +0000
Subject: [pkgdb] supybot-meetbot: e32e7ad0 has requested watchcommits
Message-ID: <20090901173148.7928A10F886@bastion2.fedora.phx.redhat.com>

e32e7ad0 has requested the watchcommits acl on supybot-meetbot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:31:53 +0000
Subject: [pkgdb] supybot-meetbot: e32e7ad0 has requested watchbugzilla
Message-ID: <20090901173153.8BB1510F896@bastion2.fedora.phx.redhat.com>

e32e7ad0 has requested the watchbugzilla acl on supybot-meetbot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:31:51 +0000
Subject: [pkgdb] supybot-meetbot: e32e7ad0 has requested watchbugzilla
Message-ID: <20090901173151.6B51010F893@bastion2.fedora.phx.redhat.com>

e32e7ad0 has requested the watchbugzilla acl on supybot-meetbot (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:31:55 +0000
Subject: [pkgdb] supybot-meetbot: e32e7ad0 has requested watchcommits
Message-ID: <20090901173155.B022410F899@bastion2.fedora.phx.redhat.com>

e32e7ad0 has requested the watchcommits acl on supybot-meetbot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:31:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:31:56 +0000
Subject: [pkgdb] supybot-meetbot: e32e7ad0 has requested watchcommits
Message-ID: <20090901173156.2446E10F89C@bastion2.fedora.phx.redhat.com>

e32e7ad0 has requested the watchcommits acl on supybot-meetbot (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From karsten at fedoraproject.org  Tue Sep  1 17:31:59 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  1 Sep 2009 17:31:59 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.115,1.116
Message-ID: <20090901173159.B9F2E11C0077@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15070

Modified Files:
	postgresql.spec 
Log Message:
- disable dtrace on s390x as a workaround until #520469 has been fixed


Index: postgresql.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- postgresql.spec	21 Aug 2009 15:29:10 -0000	1.115
+++ postgresql.spec	1 Sep 2009 17:31:59 -0000	1.116
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.0
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -90,6 +90,10 @@ BuildRequires: perl(ExtUtils::Embed), pe
 # for /sbin/ldconfig
 Prereq: glibc initscripts
 
+%ifarch s390 s390x
+%define sdt 0
+%endif
+
 %if %python || %plpython
 BuildRequires: python-devel
 %endif
@@ -365,8 +369,8 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; expo
 
 # Strip out -ffast-math from CFLAGS....
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# use -O1 on sparc64 and alpha
-%ifarch sparc64 alpha
+# use -O1 on sparc64, s390x  and alpha
+%ifarch sparc64 alpha s390x s390
 CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
 %endif
 
@@ -852,6 +856,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 8.4.0-3.1
+- disable dtrace on s390x as a workaround until #520469 has been fixed
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.0-3
 - rebuilt with new openssl
 



From ltinkl at fedoraproject.org  Tue Sep  1 17:32:37 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:32:37 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 .cvsignore, 1.58, 1.59 kdegraphics.spec, 1.195,
	1.196 sources, 1.67, 1.68
Message-ID: <20090901173237.C380D11C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15286/F-10

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	5 Aug 2009 00:24:32 -0000	1.58
+++ .cvsignore	1 Sep 2009 17:32:37 -0000	1.59
@@ -1,5 +1 @@
-kdegraphics-4.2.90.tar.bz2
-kdegraphics-4.2.95.tar.bz2
-kdegraphics-4.2.96.tar.bz2
-kdegraphics-4.2.98.tar.bz2
-kdegraphics-4.3.0.tar.bz2
+kdegraphics-4.3.1.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdegraphics.spec	5 Aug 2009 00:24:32 -0000	1.195
+++ kdegraphics.spec	1 Sep 2009 17:32:37 -0000	1.196
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	5 Aug 2009 00:24:32 -0000	1.67
+++ sources	1 Sep 2009 17:32:37 -0000	1.68
@@ -1 +1 @@
-5d3838a2575a82777f00ced90332c41a  kdegraphics-4.3.0.tar.bz2
+1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:32:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:32:38 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore,1.66,1.67
Message-ID: <20090901173238.1566211C02CA@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15286/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	28 Aug 2009 13:41:16 -0000	1.66
+++ .cvsignore	1 Sep 2009 17:32:37 -0000	1.67
@@ -1,6 +1 @@
-kdegraphics-4.2.90.tar.bz2
-kdegraphics-4.2.95.tar.bz2
-kdegraphics-4.2.96.tar.bz2
-kdegraphics-4.2.98.tar.bz2
-kdegraphics-4.3.0.tar.bz2
 kdegraphics-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:32:37 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:32:37 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 .cvsignore, 1.63, 1.64 kdegraphics.spec, 1.205,
	1.206 sources, 1.68, 1.69
Message-ID: <20090901173237.E897811C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15286/F-11

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	5 Aug 2009 00:25:01 -0000	1.63
+++ .cvsignore	1 Sep 2009 17:32:37 -0000	1.64
@@ -1,5 +1 @@
-kdegraphics-4.2.90.tar.bz2
-kdegraphics-4.2.95.tar.bz2
-kdegraphics-4.2.96.tar.bz2
-kdegraphics-4.2.98.tar.bz2
-kdegraphics-4.3.0.tar.bz2
+kdegraphics-4.3.1.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- kdegraphics.spec	5 Aug 2009 00:25:01 -0000	1.205
+++ kdegraphics.spec	1 Sep 2009 17:32:37 -0000	1.206
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	5 Aug 2009 00:25:01 -0000	1.68
+++ sources	1 Sep 2009 17:32:37 -0000	1.69
@@ -1 +1 @@
-5d3838a2575a82777f00ced90332c41a  kdegraphics-4.3.0.tar.bz2
+1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  1 17:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:32:55 +0000
Subject: [pkgdb] supybot-meetbot had acl change status
Message-ID: <20090901173255.4D82410F886@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on supybot-meetbot (Fedora devel) to Approved for e32e7ad0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:32:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:32:56 +0000
Subject: [pkgdb] supybot-meetbot had acl change status
Message-ID: <20090901173256.E9ACD10F894@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on supybot-meetbot (Fedora devel) to Approved for e32e7ad0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:33:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:33:00 +0000
Subject: [pkgdb] supybot-meetbot had acl change status
Message-ID: <20090901173300.7C30510F8A0@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on supybot-meetbot (Fedora 11) to Approved for e32e7ad0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:33:01 +0000
Subject: [pkgdb] supybot-meetbot had acl change status
Message-ID: <20090901173301.8E52A10F8A3@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on supybot-meetbot (Fedora 11) to Approved for e32e7ad0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:33:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:33:06 +0000
Subject: [pkgdb] supybot-meetbot had acl change status
Message-ID: <20090901173306.2465310F8A9@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on supybot-meetbot (Fedora EPEL 5) to Approved for e32e7ad0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From pkgdb at fedoraproject.org  Tue Sep  1 17:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:33:05 +0000
Subject: [pkgdb] supybot-meetbot had acl change status
Message-ID: <20090901173305.E363710F8A5@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on supybot-meetbot (Fedora EPEL 5) to Approved for e32e7ad0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/supybot-meetbot



From ltinkl at fedoraproject.org  Tue Sep  1 17:41:48 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:41:48 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore,1.78,1.79
Message-ID: <20090901174148.98F1511C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17696/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	28 Aug 2009 14:14:08 -0000	1.78
+++ .cvsignore	1 Sep 2009 17:41:48 -0000	1.79
@@ -1,3 +1 @@
-kdelibs-4.2.98.tar.bz2
-kdelibs-4.3.0.tar.bz2
 kdelibs-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:41:47 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:41:47 +0000 (UTC)
Subject: rpms/kdelibs/F-10 .cvsignore, 1.67, 1.68 kdelibs.spec, 1.438,
	1.439 sources, 1.82, 1.83 kdelibs-4.3.1-copyrename.patch, 1.1,
	NONE kdelibs-4.3.1-copyurls.patch, 1.1,
	NONE kdelibs-4.3.1-kdebug#199557.patch, 1.1,
	NONE kdelibs-4.3.1-kdebug#202550.patch, 1.1,
	NONE kdelibs-4.3.1-toolbarEditCrash.patch, 1.1,
	NONE kdelibs-4.3.1-unmountfix.patch, 1.1, NONE
Message-ID: <20090901174147.EC0BC11C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17696/F-10

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.1-copyrename.patch kdelibs-4.3.1-copyurls.patch 
	kdelibs-4.3.1-kdebug#199557.patch 
	kdelibs-4.3.1-kdebug#202550.patch 
	kdelibs-4.3.1-toolbarEditCrash.patch 
	kdelibs-4.3.1-unmountfix.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	4 Aug 2009 19:32:57 -0000	1.67
+++ .cvsignore	1 Sep 2009 17:41:47 -0000	1.68
@@ -1,2 +1 @@
-kdelibs-4.2.98.tar.bz2
-kdelibs-4.3.0.tar.bz2
+kdelibs-4.3.1.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -p -r1.438 -r1.439
--- kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.438
+++ kdelibs.spec	1 Sep 2009 17:41:47 -0000	1.439
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.0
-Release: 6%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,17 +83,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
-# http://bugs.kde.org/202550
-Patch100: kdelibs-4.3.1-kdebug#202550.patch
-# http://bugs.kde.org/199557
-Patch101: kdelibs-4.3.1-kdebug#199557.patch
-Patch102: kdelibs-4.3.1-unmountfix.patch
-# http://bugs.kde.org/170608
-Patch103: kdelibs-4.3.1-copyurls.patch
-#?http://bugs.kde.org/195385
-Patch104: kdelibs-4.3.1-copyrename.patch
-#?http://bugs.kde.org/200815
-Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -126,6 +115,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
@@ -133,8 +123,8 @@ BuildRequires: phonon-devel >= %{phonon_
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
 BuildRequires: strigi-devel >= %{strigi_ver} 
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
-BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
 %define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
@@ -211,15 +201,9 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
-%else
-# shouldn't be needed f9+, we'll see -- Rex
-%patch6 -p1 -b .openssl
-%endif
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -228,15 +212,13 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
-%patch100 -p4 -b .kdebug#202550
-%patch101 -p4 -b .kdebug#199557
-%patch102 -p0 -b .unmountfix
-%patch103 -p0 -b .copyurls
-%patch104 -p0 -b .copyrename
-%patch105 -p0 -b .toolbarEditCrash
+
 
 %build
 
+# add release version
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
@@ -415,6 +397,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- BR: xz-devel
+
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
+- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
+
 * Wed Aug 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
 - fix crash when editting toolbars (kdebug:200815)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	4 Aug 2009 19:32:57 -0000	1.82
+++ sources	1 Sep 2009 17:41:47 -0000	1.83
@@ -1 +1 @@
-ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2
+df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2


--- kdelibs-4.3.1-copyrename.patch DELETED ---


--- kdelibs-4.3.1-copyurls.patch DELETED ---


--- kdelibs-4.3.1-kdebug#199557.patch DELETED ---


--- kdelibs-4.3.1-kdebug#202550.patch DELETED ---


--- kdelibs-4.3.1-toolbarEditCrash.patch DELETED ---


--- kdelibs-4.3.1-unmountfix.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Sep  1 17:41:48 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:41:48 +0000 (UTC)
Subject: rpms/kdelibs/F-11 .cvsignore, 1.74, 1.75 kdelibs.spec, 1.492,
	1.493 sources, 1.91, 1.92 kdelibs-4.3.1-copyrename.patch, 1.1,
	NONE kdelibs-4.3.1-copyurls.patch, 1.1,
	NONE kdelibs-4.3.1-kdebug#199557.patch, 1.1,
	NONE kdelibs-4.3.1-kdebug#202550.patch, 1.1,
	NONE kdelibs-4.3.1-toolbarEditCrash.patch, 1.1,
	NONE kdelibs-4.3.1-unmountfix.patch, 1.1, NONE
Message-ID: <20090901174148.768C911C0077@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17696/F-11

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.1-copyrename.patch kdelibs-4.3.1-copyurls.patch 
	kdelibs-4.3.1-kdebug#199557.patch 
	kdelibs-4.3.1-kdebug#202550.patch 
	kdelibs-4.3.1-toolbarEditCrash.patch 
	kdelibs-4.3.1-unmountfix.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	4 Aug 2009 20:03:07 -0000	1.74
+++ .cvsignore	1 Sep 2009 17:41:47 -0000	1.75
@@ -1,2 +1 @@
-kdelibs-4.2.98.tar.bz2
-kdelibs-4.3.0.tar.bz2
+kdelibs-4.3.1.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.492
+++ kdelibs.spec	1 Sep 2009 17:41:48 -0000	1.493
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.0
-Release: 6%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,17 +83,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
-# http://bugs.kde.org/202550
-Patch100: kdelibs-4.3.1-kdebug#202550.patch
-# http://bugs.kde.org/199557
-Patch101: kdelibs-4.3.1-kdebug#199557.patch
-Patch102: kdelibs-4.3.1-unmountfix.patch
-# http://bugs.kde.org/170608
-Patch103: kdelibs-4.3.1-copyurls.patch
-#?http://bugs.kde.org/195385
-Patch104: kdelibs-4.3.1-copyrename.patch
-#?http://bugs.kde.org/200815
-Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -126,6 +115,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
@@ -133,8 +123,8 @@ BuildRequires: phonon-devel >= %{phonon_
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
 BuildRequires: strigi-devel >= %{strigi_ver} 
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
-BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
 %define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
@@ -211,15 +201,9 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
-%else
-# shouldn't be needed f9+, we'll see -- Rex
-%patch6 -p1 -b .openssl
-%endif
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -228,15 +212,13 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
-%patch100 -p4 -b .kdebug#202550
-%patch101 -p4 -b .kdebug#199557
-%patch102 -p0 -b .unmountfix
-%patch103 -p0 -b .copyurls
-%patch104 -p0 -b .copyrename
-%patch105 -p0 -b .toolbarEditCrash
+
 
 %build
 
+# add release version
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
@@ -415,6 +397,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- BR: xz-devel
+
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
+- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
+
 * Wed Aug 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
 - fix crash when editting toolbars (kdebug:200815)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	4 Aug 2009 20:03:08 -0000	1.91
+++ sources	1 Sep 2009 17:41:48 -0000	1.92
@@ -1 +1 @@
-ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2
+df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2


--- kdelibs-4.3.1-copyrename.patch DELETED ---


--- kdelibs-4.3.1-copyurls.patch DELETED ---


--- kdelibs-4.3.1-kdebug#199557.patch DELETED ---


--- kdelibs-4.3.1-kdebug#202550.patch DELETED ---


--- kdelibs-4.3.1-toolbarEditCrash.patch DELETED ---


--- kdelibs-4.3.1-unmountfix.patch DELETED ---



From overholt at fedoraproject.org  Tue Sep  1 17:42:35 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 17:42:35 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools/devel maven-doxia-sitetools.spec, 1.1,
	1.2
Message-ID: <20090901174235.D1EB511C0077@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia-sitetools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17961

Modified Files:
	maven-doxia-sitetools.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a10.1
- Add itext, tomcat5, and tomcat5-servlet-2.4-api BRs


Index: maven-doxia-sitetools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia-sitetools/devel/maven-doxia-sitetools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-doxia-sitetools.spec	1 Sep 2009 16:45:22 -0000	1.1
+++ maven-doxia-sitetools.spec	1 Sep 2009 17:42:35 -0000	1.2
@@ -34,7 +34,7 @@
 
 Name:           %{parent}-%{subproj}
 Version:        1.0
-Release:        0.2.a10%{?dist}
+Release:        0.2.a10.1%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
@@ -50,6 +50,7 @@ Patch0:         %{name}-disablehtmlunit.
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  itext >= 2.1.7
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
@@ -73,6 +74,8 @@ BuildRequires:  plexus-container-default
 BuildRequires:  plexus-i18n
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
+BuildRequires:  tomcat5
+BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  velocity
 
 Requires:       classworlds
@@ -192,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a10.1
+- Add itext, tomcat5, and tomcat5-servlet-2.4-api BRs
+
 * Fri Aug 28 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a10
 - First Fedora build
 



From pkgdb at fedoraproject.org  Tue Sep  1 17:45:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:45:53 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested watchbugzilla
Message-ID: <20090901174553.3169F10F886@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdelibs-experimental (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:45:55 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested watchcommits
Message-ID: <20090901174555.8A03810F897@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdelibs-experimental (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:45:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:45:58 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested commit
Message-ID: <20090901174558.034FA10F89D@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdelibs-experimental (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:46:04 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested watchbugzilla
Message-ID: <20090901174606.6100A10F87A@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdelibs-experimental (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:46:06 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested watchcommits
Message-ID: <20090901174606.B67C210F8A9@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdelibs-experimental (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:46:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:46:09 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested commit
Message-ID: <20090901174609.A5EBD10F8B0@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdelibs-experimental (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:46:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:46:16 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested watchbugzilla
Message-ID: <20090901174616.E319710F8B7@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdelibs-experimental (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:46:19 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested watchcommits
Message-ID: <20090901174619.80A4810F8B9@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdelibs-experimental (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:46:21 +0000
Subject: [pkgdb] kdelibs-experimental: ltinkl has requested commit
Message-ID: <20090901174621.EE1A910F8C1@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdelibs-experimental (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From ltinkl at fedoraproject.org  Tue Sep  1 17:48:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:48:25 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 .cvsignore, 1.62, 1.63 kdemultimedia.spec, 
	1.133, 1.134 sources, 1.65, 1.66
Message-ID: <20090901174825.E4B0111C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19861/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	5 Aug 2009 12:57:43 -0000	1.62
+++ .cvsignore	1 Sep 2009 17:48:25 -0000	1.63
@@ -1,5 +1 @@
-kdemultimedia-4.2.90.tar.bz2
-kdemultimedia-4.2.95.tar.bz2
-kdemultimedia-4.2.96.tar.bz2
-kdemultimedia-4.2.98.tar.bz2
-kdemultimedia-4.3.0.tar.bz2
+kdemultimedia-4.3.1.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kdemultimedia.spec	5 Aug 2009 12:57:43 -0000	1.133
+++ kdemultimedia.spec	1 Sep 2009 17:48:25 -0000	1.134
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	5 Aug 2009 12:57:43 -0000	1.65
+++ sources	1 Sep 2009 17:48:25 -0000	1.66
@@ -1 +1 @@
-75c0c42f22f5ffc98262441751ccb247  kdemultimedia-4.3.0.tar.bz2
+e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:48:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:48:26 +0000 (UTC)
Subject: rpms/kdemultimedia/F-11 .cvsignore, 1.65, 1.66 kdemultimedia.spec, 
	1.144, 1.145 sources, 1.66, 1.67
Message-ID: <20090901174826.0A7CF11C0349@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19861/F-11

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	5 Aug 2009 12:57:44 -0000	1.65
+++ .cvsignore	1 Sep 2009 17:48:25 -0000	1.66
@@ -1,5 +1 @@
-kdemultimedia-4.2.90.tar.bz2
-kdemultimedia-4.2.95.tar.bz2
-kdemultimedia-4.2.96.tar.bz2
-kdemultimedia-4.2.98.tar.bz2
-kdemultimedia-4.3.0.tar.bz2
+kdemultimedia-4.3.1.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/kdemultimedia.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- kdemultimedia.spec	5 Aug 2009 12:57:44 -0000	1.144
+++ kdemultimedia.spec	1 Sep 2009 17:48:25 -0000	1.145
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	5 Aug 2009 12:57:44 -0000	1.66
+++ sources	1 Sep 2009 17:48:25 -0000	1.67
@@ -1 +1 @@
-75c0c42f22f5ffc98262441751ccb247  kdemultimedia-4.3.0.tar.bz2
+e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:48:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:48:26 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore,1.68,1.69
Message-ID: <20090901174826.3500C11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19861/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	28 Aug 2009 14:38:53 -0000	1.68
+++ .cvsignore	1 Sep 2009 17:48:26 -0000	1.69
@@ -1,6 +1 @@
-kdemultimedia-4.2.90.tar.bz2
-kdemultimedia-4.2.95.tar.bz2
-kdemultimedia-4.2.96.tar.bz2
-kdemultimedia-4.2.98.tar.bz2
-kdemultimedia-4.3.0.tar.bz2
 kdemultimedia-4.3.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:14 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175114.EC26910F886@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs-experimental (Fedora devel) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:16 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175116.0D42710F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs-experimental (Fedora devel) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:17 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175117.0F85D10F899@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs-experimental (Fedora devel) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:21 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175121.B186810F89F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs-experimental (Fedora 11) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:22 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175122.4809710F8A5@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs-experimental (Fedora 11) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:24 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175124.8A64310F8AA@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs-experimental (Fedora 11) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:28 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175128.9B45810F886@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs-experimental (Fedora 10) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:30 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175130.5122210F8B2@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs-experimental (Fedora 10) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Tue Sep  1 17:51:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Sep 2009 17:51:31 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090901175131.54EF310F8B7@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs-experimental (Fedora 10) to Approved for ltinkl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From ltinkl at fedoraproject.org  Tue Sep  1 17:52:31 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:52:31 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 .cvsignore, 1.64, 1.65 kdenetwork.spec, 1.174, 
	1.175 sources, 1.74, 1.75
Message-ID: <20090901175231.13AED11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20619/F-10

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	5 Aug 2009 13:01:16 -0000	1.64
+++ .cvsignore	1 Sep 2009 17:52:30 -0000	1.65
@@ -1,6 +1,2 @@
-kdenetwork-4.2.90.tar.bz2
-kdenetwork-4.2.95.tar.bz2
-kdenetwork-4.2.96.tar.bz2
-kdenetwork-4.2.98.tar.bz2
 krdc-icons.tar.bz2
-kdenetwork-4.3.0.tar.bz2
+kdenetwork-4.3.1.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- kdenetwork.spec	25 Aug 2009 09:16:18 -0000	1.174
+++ kdenetwork.spec	1 Sep 2009 17:52:30 -0000	1.175
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -186,6 +186,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - fix bz#515586, backport patch to fix this issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	5 Aug 2009 13:01:17 -0000	1.74
+++ sources	1 Sep 2009 17:52:30 -0000	1.75
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-f9695ff06d0d67a78a71fb9b3ddbd4f3  kdenetwork-4.3.0.tar.bz2
+496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:52:31 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:52:31 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 .cvsignore, 1.68, 1.69 kdenetwork.spec, 1.192, 
	1.193 sources, 1.75, 1.76
Message-ID: <20090901175231.4802911C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20619/F-11

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	5 Aug 2009 13:01:17 -0000	1.68
+++ .cvsignore	1 Sep 2009 17:52:31 -0000	1.69
@@ -1,6 +1,2 @@
-kdenetwork-4.2.90.tar.bz2
-kdenetwork-4.2.95.tar.bz2
-kdenetwork-4.2.96.tar.bz2
-kdenetwork-4.2.98.tar.bz2
 krdc-icons.tar.bz2
-kdenetwork-4.3.0.tar.bz2
+kdenetwork-4.3.1.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- kdenetwork.spec	25 Aug 2009 09:14:58 -0000	1.192
+++ kdenetwork.spec	1 Sep 2009 17:52:31 -0000	1.193
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -186,6 +186,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - fix bz#515586, backport patch to fix this issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	5 Aug 2009 13:01:17 -0000	1.75
+++ sources	1 Sep 2009 17:52:31 -0000	1.76
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-f9695ff06d0d67a78a71fb9b3ddbd4f3  kdenetwork-4.3.0.tar.bz2
+496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 17:52:31 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 17:52:31 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore,1.72,1.73
Message-ID: <20090901175231.695C811C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20619/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	28 Aug 2009 14:49:50 -0000	1.72
+++ .cvsignore	1 Sep 2009 17:52:31 -0000	1.73
@@ -1,7 +1,2 @@
-kdenetwork-4.2.90.tar.bz2
-kdenetwork-4.2.95.tar.bz2
-kdenetwork-4.2.96.tar.bz2
-kdenetwork-4.2.98.tar.bz2
 krdc-icons.tar.bz2
-kdenetwork-4.3.0.tar.bz2
 kdenetwork-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:10:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:10:08 +0000 (UTC)
Subject: rpms/kdepim/F-10 .cvsignore, 1.64, 1.65 kdepim.spec, 1.216,
	1.217 sources, 1.73, 1.74 kmail-fonts-4.3.patch, 1.1, NONE
Message-ID: <20090901181008.1209611C0498@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25531/F-10

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kmail-fonts-4.3.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	5 Aug 2009 13:06:17 -0000	1.64
+++ .cvsignore	1 Sep 2009 18:10:07 -0000	1.65
@@ -1,5 +1 @@
-kdepim-4.2.90.tar.bz2
-kdepim-4.2.95.tar.bz2
-kdepim-4.2.96.tar.bz2
-kdepim-4.2.98.tar.bz2
-kdepim-4.3.0.tar.bz2
+kdepim-4.3.1.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- kdepim.spec	20 Aug 2009 14:33:25 -0000	1.216
+++ kdepim.spec	1 Sep 2009 18:10:07 -0000	1.217
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.0
-Release: 4%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,9 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-## upstream 
-# https://bugs.kde.org/show_bug.cgi?id=178402
-Patch100: kmail-fonts-4.3.patch
+# 4.3.1 upstream 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -97,7 +95,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p0 -b .kmail-fonts
 
 
 %build
@@ -216,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - kmail: upstream fix for custom font settings (#kdebug#178402)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	5 Aug 2009 13:06:17 -0000	1.73
+++ sources	1 Sep 2009 18:10:07 -0000	1.74
@@ -1 +1 @@
-ddc887f19ef9cd454f4f3226c955aaaf  kdepim-4.3.0.tar.bz2
+1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2


--- kmail-fonts-4.3.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Sep  1 18:10:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:10:08 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore,1.68,1.69
Message-ID: <20090901181008.7034D11C0498@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25531/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	28 Aug 2009 15:11:21 -0000	1.68
+++ .cvsignore	1 Sep 2009 18:10:08 -0000	1.69
@@ -1,6 +1 @@
-kdepim-4.2.90.tar.bz2
-kdepim-4.2.95.tar.bz2
-kdepim-4.2.96.tar.bz2
-kdepim-4.2.98.tar.bz2
-kdepim-4.3.0.tar.bz2
 kdepim-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:10:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:10:08 +0000 (UTC)
Subject: rpms/kdepim/F-11 .cvsignore, 1.64, 1.65 kdepim.spec, 1.222,
	1.223 sources, 1.72, 1.73 kmail-fonts-4.3.patch, 1.1, NONE
Message-ID: <20090901181008.440D811C0498@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25531/F-11

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kmail-fonts-4.3.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	5 Aug 2009 13:06:17 -0000	1.64
+++ .cvsignore	1 Sep 2009 18:10:07 -0000	1.65
@@ -1,5 +1 @@
-kdepim-4.2.90.tar.bz2
-kdepim-4.2.95.tar.bz2
-kdepim-4.2.96.tar.bz2
-kdepim-4.2.98.tar.bz2
-kdepim-4.3.0.tar.bz2
+kdepim-4.3.1.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- kdepim.spec	20 Aug 2009 14:33:50 -0000	1.222
+++ kdepim.spec	1 Sep 2009 18:10:08 -0000	1.223
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.0
-Release: 4%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,9 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-## upstream 
-# https://bugs.kde.org/show_bug.cgi?id=178402
-Patch100: kmail-fonts-4.3.patch
+# 4.3.1 upstream 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -97,7 +95,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p0 -b .kmail-fonts
 
 
 %build
@@ -216,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - kmail: upstream fix for custom font settings (#kdebug#178402)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	5 Aug 2009 13:06:18 -0000	1.72
+++ sources	1 Sep 2009 18:10:08 -0000	1.73
@@ -1 +1 @@
-ddc887f19ef9cd454f4f3226c955aaaf  kdepim-4.3.0.tar.bz2
+1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2


--- kmail-fonts-4.3.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Sep  1 18:11:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:11:12 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-10 .cvsignore, 1.2,
	1.3 kdelibs-experimental.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090901181112.2B88611C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs-experimental/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25895/F-10

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Aug 2009 23:12:54 -0000	1.2
+++ .cvsignore	1 Sep 2009 18:11:11 -0000	1.3
@@ -1,5 +1 @@
-kdelibs-experimental-4.2.90.tar.bz2
-kdelibs-experimental-4.2.95.tar.bz2
-kdelibs-experimental-4.2.96.tar.bz2
-kdelibs-experimental-4.2.98.tar.bz2
-kdelibs-experimental-4.3.0.tar.bz2
+kdelibs-experimental-4.3.1.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-10/kdelibs-experimental.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-experimental.spec	4 Aug 2009 23:12:54 -0000	1.1
+++ kdelibs-experimental.spec	1 Sep 2009 18:11:12 -0000	1.2
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Aug 2009 23:12:54 -0000	1.2
+++ sources	1 Sep 2009 18:11:12 -0000	1.3
@@ -1 +1 @@
-9b3ed689f4f357d4fc059cf9dd41e035  kdelibs-experimental-4.3.0.tar.bz2
+2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:11:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:11:12 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-11 .cvsignore, 1.2,
	1.3 kdelibs-experimental.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090901181112.5FE8911C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs-experimental/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25895/F-11

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Aug 2009 23:11:27 -0000	1.2
+++ .cvsignore	1 Sep 2009 18:11:12 -0000	1.3
@@ -1,5 +1 @@
-kdelibs-experimental-4.2.90.tar.bz2
-kdelibs-experimental-4.2.95.tar.bz2
-kdelibs-experimental-4.2.96.tar.bz2
-kdelibs-experimental-4.2.98.tar.bz2
-kdelibs-experimental-4.3.0.tar.bz2
+kdelibs-experimental-4.3.1.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/kdelibs-experimental.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-experimental.spec	4 Aug 2009 23:12:10 -0000	1.1
+++ kdelibs-experimental.spec	1 Sep 2009 18:11:12 -0000	1.2
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Aug 2009 23:11:27 -0000	1.2
+++ sources	1 Sep 2009 18:11:12 -0000	1.3
@@ -1 +1 @@
-9b3ed689f4f357d4fc059cf9dd41e035  kdelibs-experimental-4.3.0.tar.bz2
+2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:11:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:11:12 +0000 (UTC)
Subject: rpms/kdelibs-experimental/devel .cvsignore,1.8,1.9
Message-ID: <20090901181112.9CA8711C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs-experimental/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25895/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Aug 2009 14:24:07 -0000	1.8
+++ .cvsignore	1 Sep 2009 18:11:12 -0000	1.9
@@ -1,6 +1 @@
-kdelibs-experimental-4.2.90.tar.bz2
-kdelibs-experimental-4.2.95.tar.bz2
-kdelibs-experimental-4.2.96.tar.bz2
-kdelibs-experimental-4.2.98.tar.bz2
-kdelibs-experimental-4.3.0.tar.bz2
 kdelibs-experimental-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:11:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:11:59 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 .cvsignore, 1.33, 1.34 kdepimlibs.spec, 1.70, 
	1.71 sources, 1.35, 1.36
Message-ID: <20090901181159.64F0C11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26063/F-10

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	4 Aug 2009 23:04:43 -0000	1.33
+++ .cvsignore	1 Sep 2009 18:11:59 -0000	1.34
@@ -1,5 +1 @@
-kdepimlibs-4.2.90.tar.bz2
-kdepimlibs-4.2.95.tar.bz2
-kdepimlibs-4.2.96.tar.bz2
-kdepimlibs-4.2.98.tar.bz2
-kdepimlibs-4.3.0.tar.bz2
+kdepimlibs-4.3.1.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- kdepimlibs.spec	4 Aug 2009 23:04:45 -0000	1.70
+++ kdepimlibs.spec	1 Sep 2009 18:11:59 -0000	1.71
@@ -11,8 +11,8 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -213,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - akonadi_version 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	4 Aug 2009 23:04:45 -0000	1.35
+++ sources	1 Sep 2009 18:11:59 -0000	1.36
@@ -1 +1 @@
-313f1a9d353f82c2ffee517115404dd5  kdepimlibs-4.3.0.tar.bz2
+8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:11:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:11:59 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore,1.42,1.43
Message-ID: <20090901181159.C2F4411C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26063/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	28 Aug 2009 15:15:14 -0000	1.42
+++ .cvsignore	1 Sep 2009 18:11:59 -0000	1.43
@@ -1,6 +1 @@
-kdepimlibs-4.2.90.tar.bz2
-kdepimlibs-4.2.95.tar.bz2
-kdepimlibs-4.2.96.tar.bz2
-kdepimlibs-4.2.98.tar.bz2
-kdepimlibs-4.3.0.tar.bz2
 kdepimlibs-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:11:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:11:59 +0000 (UTC)
Subject: rpms/kdepimlibs/F-11 .cvsignore, 1.38, 1.39 kdepimlibs.spec, 1.90, 
	1.91 sources, 1.38, 1.39
Message-ID: <20090901181159.A281911C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26063/F-11

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	4 Aug 2009 23:04:46 -0000	1.38
+++ .cvsignore	1 Sep 2009 18:11:59 -0000	1.39
@@ -1,5 +1 @@
-kdepimlibs-4.2.90.tar.bz2
-kdepimlibs-4.2.95.tar.bz2
-kdepimlibs-4.2.96.tar.bz2
-kdepimlibs-4.2.98.tar.bz2
-kdepimlibs-4.3.0.tar.bz2
+kdepimlibs-4.3.1.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/kdepimlibs.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kdepimlibs.spec	4 Aug 2009 23:04:46 -0000	1.90
+++ kdepimlibs.spec	1 Sep 2009 18:11:59 -0000	1.91
@@ -11,8 +11,8 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -213,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - akonadi_version 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	4 Aug 2009 23:04:47 -0000	1.38
+++ sources	1 Sep 2009 18:11:59 -0000	1.39
@@ -1 +1 @@
-313f1a9d353f82c2ffee517115404dd5  kdepimlibs-4.3.0.tar.bz2
+8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:15:00 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:15:00 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 .cvsignore, 1.13,
	1.14 kdeplasma-addons.spec, 1.19, 1.20 sources, 1.14,
	1.15 kdeplasma-addons-4.3.0-lancelot-kde#196809.patch, 1.1, NONE
Message-ID: <20090901181500.7C54C11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27411/F-10

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	5 Aug 2009 13:04:05 -0000	1.13
+++ .cvsignore	1 Sep 2009 18:15:00 -0000	1.14
@@ -1,5 +1 @@
-kdeplasma-addons-4.2.90.tar.bz2
-kdeplasma-addons-4.2.95.tar.bz2
-kdeplasma-addons-4.2.96.tar.bz2
-kdeplasma-addons-4.2.98.tar.bz2
-kdeplasma-addons-4.3.0.tar.bz2
+kdeplasma-addons-4.3.1.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kdeplasma-addons.spec	8 Aug 2009 02:36:08 -0000	1.19
+++ kdeplasma-addons.spec	1 Sep 2009 18:15:00 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.0
-Release:        8%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,8 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # Backported from 4.3 branch
-# Commit 1008267
-Patch101: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -25,14 +23,14 @@ BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
 # for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
+%if 0%{?fedora}
+BuildRequires:  eigen2-devel
 # RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
 BuildRequires:  kdeedu-devel >= %{version}
-%if 0%{?fedora} > 9
-# Optional (but recommended), enables automatic rotation for frame applet
+%endif
 BuildRequires:  libkexiv2-devel >= 0.4.0
 # lancelot eye-candy
 BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
-%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 
@@ -74,7 +72,6 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch101 -p0
 
 
 %build
@@ -96,9 +93,11 @@ make install/fast DESTDIR=%{buildroot} -
 # omit shlib symlinks 
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
 rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
+
 # lancelot-devel
 rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
 rm -rf %{buildroot}%{_kde4_includedir}/lancelot
+
 # conversion-devel 
 rm -rf %{buildroot}%{_kde4_includedir}/conversion/
 rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
@@ -160,6 +159,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
+- omit BR on kdevel-devel/eigen2-devel for rhel
+
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
 - Waited for newRepo task
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	5 Aug 2009 13:04:05 -0000	1.14
+++ sources	1 Sep 2009 18:15:00 -0000	1.15
@@ -1 +1 @@
-74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2
+282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2


--- kdeplasma-addons-4.3.0-lancelot-kde#196809.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Sep  1 18:15:00 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:15:00 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11 .cvsignore, 1.16,
	1.17 kdeplasma-addons.spec, 1.37, 1.38 sources, 1.15,
	1.16 kdeplasma-addons-4.3.0-lancelot-kde#196809.patch, 1.1, NONE
Message-ID: <20090901181500.A4CCD11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27411/F-11

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	5 Aug 2009 13:04:05 -0000	1.16
+++ .cvsignore	1 Sep 2009 18:15:00 -0000	1.17
@@ -1,5 +1 @@
-kdeplasma-addons-4.2.90.tar.bz2
-kdeplasma-addons-4.2.95.tar.bz2
-kdeplasma-addons-4.2.96.tar.bz2
-kdeplasma-addons-4.2.98.tar.bz2
-kdeplasma-addons-4.3.0.tar.bz2
+kdeplasma-addons-4.3.1.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- kdeplasma-addons.spec	8 Aug 2009 02:32:46 -0000	1.37
+++ kdeplasma-addons.spec	1 Sep 2009 18:15:00 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.0
-Release:        8%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,8 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # Backported from 4.3 branch
-# Commit 1008267
-Patch101: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -25,14 +23,14 @@ BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
 # for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
+%if 0%{?fedora}
+BuildRequires:  eigen2-devel
 # RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
 BuildRequires:  kdeedu-devel >= %{version}
-%if 0%{?fedora} > 9
-# Optional (but recommended), enables automatic rotation for frame applet
+%endif
 BuildRequires:  libkexiv2-devel >= 0.4.0
 # lancelot eye-candy
 BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
-%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 
@@ -74,7 +72,6 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch101 -p0
 
 
 %build
@@ -96,9 +93,11 @@ make install/fast DESTDIR=%{buildroot} -
 # omit shlib symlinks 
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
 rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
+
 # lancelot-devel
 rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
 rm -rf %{buildroot}%{_kde4_includedir}/lancelot
+
 # conversion-devel 
 rm -rf %{buildroot}%{_kde4_includedir}/conversion/
 rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
@@ -160,6 +159,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
+- omit BR on kdevel-devel/eigen2-devel for rhel
+
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
 - Waited for newRepo task
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 Aug 2009 13:04:06 -0000	1.15
+++ sources	1 Sep 2009 18:15:00 -0000	1.16
@@ -1 +1 @@
-74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2
+282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2


--- kdeplasma-addons-4.3.0-lancelot-kde#196809.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Sep  1 18:15:00 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:15:00 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore,1.19,1.20
Message-ID: <20090901181500.C2EF311C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27411/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	28 Aug 2009 16:15:15 -0000	1.19
+++ .cvsignore	1 Sep 2009 18:15:00 -0000	1.20
@@ -1,6 +1 @@
-kdeplasma-addons-4.2.90.tar.bz2
-kdeplasma-addons-4.2.95.tar.bz2
-kdeplasma-addons-4.2.96.tar.bz2
-kdeplasma-addons-4.2.98.tar.bz2
-kdeplasma-addons-4.3.0.tar.bz2
 kdeplasma-addons-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:25:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:25:55 +0000 (UTC)
Subject: rpms/kdesdk/F-10 .cvsignore, 1.57, 1.58 kdesdk.spec, 1.133,
	1.134 sources, 1.60, 1.61
Message-ID: <20090901182555.6210911C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29373/F-10

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	5 Aug 2009 13:07:45 -0000	1.57
+++ .cvsignore	1 Sep 2009 18:25:55 -0000	1.58
@@ -1,5 +1 @@
-kdesdk-4.2.90.tar.bz2
-kdesdk-4.2.95.tar.bz2
-kdesdk-4.2.96.tar.bz2
-kdesdk-4.2.98.tar.bz2
-kdesdk-4.3.0.tar.bz2
+kdesdk-4.3.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kdesdk.spec	5 Aug 2009 13:07:45 -0000	1.133
+++ kdesdk.spec	1 Sep 2009 18:25:55 -0000	1.134
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	5 Aug 2009 13:07:45 -0000	1.60
+++ sources	1 Sep 2009 18:25:55 -0000	1.61
@@ -1 +1 @@
-eda2376a54d66899bf7beb60cc0843b1  kdesdk-4.3.0.tar.bz2
+e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:25:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:25:55 +0000 (UTC)
Subject: rpms/kdesdk/F-11 .cvsignore, 1.60, 1.61 kdesdk.spec, 1.148,
	1.149 sources, 1.61, 1.62
Message-ID: <20090901182555.8994411C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29373/F-11

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	5 Aug 2009 13:07:46 -0000	1.60
+++ .cvsignore	1 Sep 2009 18:25:55 -0000	1.61
@@ -1,5 +1 @@
-kdesdk-4.2.90.tar.bz2
-kdesdk-4.2.95.tar.bz2
-kdesdk-4.2.96.tar.bz2
-kdesdk-4.2.98.tar.bz2
-kdesdk-4.3.0.tar.bz2
+kdesdk-4.3.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/kdesdk.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kdesdk.spec	5 Aug 2009 13:07:46 -0000	1.148
+++ kdesdk.spec	1 Sep 2009 18:25:55 -0000	1.149
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	5 Aug 2009 13:07:46 -0000	1.61
+++ sources	1 Sep 2009 18:25:55 -0000	1.62
@@ -1 +1 @@
-eda2376a54d66899bf7beb60cc0843b1  kdesdk-4.3.0.tar.bz2
+e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:25:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:25:55 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore,1.63,1.64
Message-ID: <20090901182555.B157811C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29373/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	28 Aug 2009 16:17:34 -0000	1.63
+++ .cvsignore	1 Sep 2009 18:25:55 -0000	1.64
@@ -1,6 +1 @@
-kdesdk-4.2.90.tar.bz2
-kdesdk-4.2.95.tar.bz2
-kdesdk-4.2.96.tar.bz2
-kdesdk-4.2.98.tar.bz2
-kdesdk-4.3.0.tar.bz2
 kdesdk-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:29:48 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:29:48 +0000 (UTC)
Subject: rpms/kdetoys/F-10 .cvsignore, 1.33, 1.34 kdetoys.spec, 1.43,
	1.44 sources, 1.33, 1.34
Message-ID: <20090901182948.1AA4911C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30060/F-10

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	5 Aug 2009 13:09:13 -0000	1.33
+++ .cvsignore	1 Sep 2009 18:29:47 -0000	1.34
@@ -1,5 +1 @@
-kdetoys-4.2.90.tar.bz2
-kdetoys-4.2.95.tar.bz2
-kdetoys-4.2.96.tar.bz2
-kdetoys-4.2.98.tar.bz2
-kdetoys-4.3.0.tar.bz2
+kdetoys-4.3.1.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- kdetoys.spec	5 Aug 2009 13:09:13 -0000	1.43
+++ kdetoys.spec	1 Sep 2009 18:29:47 -0000	1.44
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	5 Aug 2009 13:09:13 -0000	1.33
+++ sources	1 Sep 2009 18:29:47 -0000	1.34
@@ -1 +1 @@
-6975e332bdd1cdf60b8509c544cedb06  kdetoys-4.3.0.tar.bz2
+0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:29:48 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:29:48 +0000 (UTC)
Subject: rpms/kdetoys/F-11 .cvsignore, 1.37, 1.38 kdetoys.spec, 1.53,
	1.54 sources, 1.34, 1.35
Message-ID: <20090901182948.3C2DE11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30060/F-11

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	5 Aug 2009 13:09:13 -0000	1.37
+++ .cvsignore	1 Sep 2009 18:29:48 -0000	1.38
@@ -1,5 +1 @@
-kdetoys-4.2.90.tar.bz2
-kdetoys-4.2.95.tar.bz2
-kdetoys-4.2.96.tar.bz2
-kdetoys-4.2.98.tar.bz2
-kdetoys-4.3.0.tar.bz2
+kdetoys-4.3.1.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/kdetoys.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- kdetoys.spec	5 Aug 2009 13:09:13 -0000	1.53
+++ kdetoys.spec	1 Sep 2009 18:29:48 -0000	1.54
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	5 Aug 2009 13:09:13 -0000	1.34
+++ sources	1 Sep 2009 18:29:48 -0000	1.35
@@ -1 +1 @@
-6975e332bdd1cdf60b8509c544cedb06  kdetoys-4.3.0.tar.bz2
+0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:29:48 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:29:48 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore,1.40,1.41
Message-ID: <20090901182948.601FA11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30060/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	28 Aug 2009 16:19:32 -0000	1.40
+++ .cvsignore	1 Sep 2009 18:29:48 -0000	1.41
@@ -1,6 +1 @@
-kdetoys-4.2.90.tar.bz2
-kdetoys-4.2.95.tar.bz2
-kdetoys-4.2.96.tar.bz2
-kdetoys-4.2.98.tar.bz2
-kdetoys-4.3.0.tar.bz2
 kdetoys-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:31:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:31:59 +0000 (UTC)
Subject: rpms/kdeutils/F-10 .cvsignore, 1.60, 1.61 kdeutils.spec, 1.159,
	1.160 sources, 1.64, 1.65
Message-ID: <20090901183159.78BAF11C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30762/F-10

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	5 Aug 2009 13:12:35 -0000	1.60
+++ .cvsignore	1 Sep 2009 18:31:59 -0000	1.61
@@ -1,5 +1 @@
-kdeutils-4.2.90.tar.bz2
-kdeutils-4.2.95.tar.bz2
-kdeutils-4.2.96.tar.bz2
-kdeutils-4.2.98.tar.bz2
-kdeutils-4.3.0.tar.bz2
+kdeutils-4.3.1.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- kdeutils.spec	5 Aug 2009 13:12:35 -0000	1.159
+++ kdeutils.spec	1 Sep 2009 18:31:59 -0000	1.160
@@ -1,10 +1,11 @@
-# define to include applet
+%if 0%{?fedora}
 %define printer_applet 1
+%endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.0
-Release:        3%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -15,6 +16,7 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
+Patch2:         kdeutils-4.3.1-kscd-lirc.patch
 
 ## upstreamed patches
 
@@ -91,7 +93,7 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-
+%patch2 -p1 -b .kscd-lirc
 
 %build
 
@@ -215,6 +217,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
 - include epoch's in -libs-related Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	5 Aug 2009 13:12:35 -0000	1.64
+++ sources	1 Sep 2009 18:31:59 -0000	1.65
@@ -1 +1 @@
-9d17d3d7bf25be5af1cbd4abf04e4c99  kdeutils-4.3.0.tar.bz2
+69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:31:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:31:59 +0000 (UTC)
Subject: rpms/kdeutils/F-11 .cvsignore, 1.65, 1.66 kdeutils.spec, 1.179,
	1.180 sources, 1.66, 1.67
Message-ID: <20090901183159.B182711C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30762/F-11

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	5 Aug 2009 13:12:35 -0000	1.65
+++ .cvsignore	1 Sep 2009 18:31:59 -0000	1.66
@@ -1,5 +1 @@
-kdeutils-4.2.90.tar.bz2
-kdeutils-4.2.95.tar.bz2
-kdeutils-4.2.96.tar.bz2
-kdeutils-4.2.98.tar.bz2
-kdeutils-4.3.0.tar.bz2
+kdeutils-4.3.1.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- kdeutils.spec	5 Aug 2009 13:12:36 -0000	1.179
+++ kdeutils.spec	1 Sep 2009 18:31:59 -0000	1.180
@@ -1,10 +1,11 @@
-# define to include applet
+%if 0%{?fedora}
 %define printer_applet 1
+%endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.0
-Release:        3%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -15,6 +16,7 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
+Patch2:         kdeutils-4.3.1-kscd-lirc.patch
 
 ## upstreamed patches
 
@@ -91,7 +93,7 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-
+%patch2 -p1 -b .kscd-lirc
 
 %build
 
@@ -215,6 +217,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
 - include epoch's in -libs-related Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	5 Aug 2009 13:12:36 -0000	1.66
+++ sources	1 Sep 2009 18:31:59 -0000	1.67
@@ -1 +1 @@
-9d17d3d7bf25be5af1cbd4abf04e4c99  kdeutils-4.3.0.tar.bz2
+69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep  1 18:31:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Sep 2009 18:31:59 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore,1.68,1.69
Message-ID: <20090901183159.DB46011C0345@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30762/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	28 Aug 2009 16:22:39 -0000	1.68
+++ .cvsignore	1 Sep 2009 18:31:59 -0000	1.69
@@ -1,6 +1 @@
-kdeutils-4.2.90.tar.bz2
-kdeutils-4.2.95.tar.bz2
-kdeutils-4.2.96.tar.bz2
-kdeutils-4.2.98.tar.bz2
-kdeutils-4.3.0.tar.bz2
 kdeutils-4.3.1.tar.bz2



From hno at fedoraproject.org  Tue Sep  1 18:32:21 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue,  1 Sep 2009 18:32:21 +0000 (UTC)
Subject: rpms/squid/F-11 squid.logrotate,1.2,1.3 squid.spec,1.125,1.126
Message-ID: <20090901183221.83ACC11C0345@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039

Modified Files:
	squid.logrotate squid.spec 
Log Message:
Bug #520445 silence logrotate when Squid is not running


Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.logrotate	9 Oct 2008 11:47:06 -0000	1.2
+++ squid.logrotate	1 Sep 2009 18:32:21 -0000	1.3
@@ -7,7 +7,8 @@
     sharedscripts
     postrotate
       # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
-      /usr/sbin/squid -k rotate
+      # errors redirected to make it silent if squid is not running
+      /usr/sbin/squid -k rotate 2>/dev/null
       # Wait a little to allow Squid to catch up before the logs is compressed
       sleep 1
     endscript


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- squid.spec	4 Aug 2009 19:58:16 -0000	1.125
+++ squid.spec	1 Sep 2009 18:32:21 -0000	1.126
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE18
-Release:  1%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -341,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep  1 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-3
+- Bug #520445 silence logrotate when Squid is not running
+
 * Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
 - Update to 3.0.STABLE18
 



From djuran at fedoraproject.org  Tue Sep  1 18:38:26 2009
From: djuran at fedoraproject.org (David Juran)
Date: Tue,  1 Sep 2009 18:38:26 +0000 (UTC)
Subject: rpms/azureus/F-11 azureus.script,1.22,1.23 azureus.spec,1.75,1.76
Message-ID: <20090901183826.BE81411C0345@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1259

Modified Files:
	azureus.script azureus.spec 
Log Message:
- fix start-script to work when  /usr/share/azureus/plugins/ is empty



Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus.script,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- azureus.script	19 Mar 2009 03:11:48 -0000	1.22
+++ azureus.script	1 Sep 2009 18:38:26 -0000	1.23
@@ -12,9 +12,13 @@ SCRIPT_VERSION=2
 rm -rf $APPDIR/plugins
 mkdir -p $APPDIR/plugins
 pushd $APPDIR/plugins > /dev/null 2>&1
-for pdir in /usr/share/azureus/plugins/*; do
-  ln -s $pdir .;
-done;
+
+if ls /usr/share/azureus/plugins/* > /dev/null 2>&1;then
+    for pdir in /usr/share/azureus/plugins/*; do
+	ln -s $pdir .;
+    done;
+fi
+
 popd > /dev/null 2>&1
 
 case $(uname -i) in


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- azureus.spec	19 Mar 2009 03:11:49 -0000	1.75
+++ azureus.spec	1 Sep 2009 18:38:26 -0000	1.76
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	4.0.0.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -212,6 +212,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Tue Sep  1 2009 David Juran <david at juran.se> - 4.0.0.4-4
+- fix start-script to work when  /usr/share/azureus/plugins/ is empty
+
 * Wed Mar 18 2009 Conrad Meyer <konrad at tylerc.org> - 4.0.0.4-3
 - Apply Bart Vanbrabant's patch to azureus.script to start
   correctly on 64-bit (rhbz#490774).



From thm at fedoraproject.org  Tue Sep  1 18:46:58 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue,  1 Sep 2009 18:46:58 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.26, 1.27 ikiwiki.spec, 1.29,
	1.30 import.log, 1.26, 1.27 sources, 1.26, 1.27
Message-ID: <20090901184658.A35B211C00EF@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5878/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	12 Aug 2009 16:29:32 -0000	1.26
+++ .cvsignore	1 Sep 2009 18:46:58 -0000	1.27
@@ -1 +1 @@
-ikiwiki_3.141592.tar.gz
+ikiwiki_3.1415926.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ikiwiki.spec	12 Aug 2009 16:29:32 -0000	1.29
+++ ikiwiki.spec	1 Sep 2009 18:46:58 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.141592
+Version:        3.1415926
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Tue Sep  1 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.1415926-1
+- Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
+
 * Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.141592-1
 - Update to 3.141592.
 - po4a is needed now.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- import.log	12 Aug 2009 16:29:32 -0000	1.26
+++ import.log	1 Sep 2009 18:46:58 -0000	1.27
@@ -24,3 +24,4 @@ ikiwiki-3_12-1_fc11:HEAD:ikiwiki-3.12-1.
 ikiwiki-3_14-1_fc11:HEAD:ikiwiki-3.14-1.fc11.src.rpm:1244756213
 ikiwiki-3_1415-1_fc11:HEAD:ikiwiki-3.1415-1.fc11.src.rpm:1247863227
 ikiwiki-3_141592-1_fc11:HEAD:ikiwiki-3.141592-1.fc11.src.rpm:1250094529
+ikiwiki-3_1415926-1_fc11:HEAD:ikiwiki-3.1415926-1.fc11.src.rpm:1251830777


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	12 Aug 2009 16:29:32 -0000	1.26
+++ sources	1 Sep 2009 18:46:58 -0000	1.27
@@ -1 +1 @@
-de1daa180835615da9ac494837a51d9d  ikiwiki_3.141592.tar.gz
+b5f28d88ebc358347a14ad88cbac22e9  ikiwiki_3.1415926.tar.gz



From jfch2222 at fedoraproject.org  Tue Sep  1 18:51:41 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Tue,  1 Sep 2009 18:51:41 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-allow-ip-opts.patch, NONE,
	1.1 openssh.spec, 1.162, 1.163 openssh-4.3p2-allow-ip-opts.patch,
	1.1, NONE
Message-ID: <20090901185141.C261C11C00EF@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8156

Modified Files:
	openssh.spec 
Added Files:
	openssh-5.2p1-allow-ip-opts.patch 
Removed Files:
	openssh-4.3p2-allow-ip-opts.patch 
Log Message:
add correct patch for ip-opts


openssh-5.2p1-allow-ip-opts.patch:
 canohost.c |   27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

--- NEW FILE openssh-5.2p1-allow-ip-opts.patch ---
diff -up openssh-5.2p1/canohost.c.ip-opts openssh-5.2p1/canohost.c
--- openssh-5.2p1/canohost.c.ip-opts	2009-02-14 06:28:21.000000000 +0100
+++ openssh-5.2p1/canohost.c	2009-09-01 15:31:29.000000000 +0200
@@ -169,12 +169,27 @@ check_ip_options(int sock, char *ipaddr)
 	option_size = sizeof(options);
 	if (getsockopt(sock, ipproto, IP_OPTIONS, options,
 	    &option_size) >= 0 && option_size != 0) {
-		text[0] = '\0';
-		for (i = 0; i < option_size; i++)
-			snprintf(text + i*3, sizeof(text) - i*3,
-			    " %2.2x", options[i]);
-		fatal("Connection from %.100s with IP options:%.800s",
-		    ipaddr, text);
+		i = 0;
+		do {
+			switch (options[i]) {
+				case 0:
+				case 1:
+					++i;
+					break;
+				case 131:
+				case 137:
+				/* Fail, fatally, if we detect either loose or strict
+			 	 * source routing options. */
+					text[0] = '\0';
+					for (i = 0; i < option_size; i++)
+						snprintf(text + i*3, sizeof(text) - i*3,
+							" %2.2x", options[i]);
+					fatal("Connection from %.100s with IP options:%.800s",
+						ipaddr, text);
+				default:
+					i += options[i + 1];
+			}
+		} while (i < option_size);
 	}
 #endif /* IP_OPTIONS */
 }


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- openssh.spec	1 Sep 2009 14:02:15 -0000	1.162
+++ openssh.spec	1 Sep 2009 18:51:41 -0000	1.163
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 22%{?dist}%{?rescue_rel}
+Release: 23%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -468,6 +468,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep  1 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-23
+- add correct patch for ip-opts
+
 * Tue Sep  1 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-22
 - replace ip-opts patch by an upstream candidate version
 


--- openssh-4.3p2-allow-ip-opts.patch DELETED ---



From thm at fedoraproject.org  Tue Sep  1 19:02:25 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue,  1 Sep 2009 19:02:25 +0000 (UTC)
Subject: rpms/ikiwiki/F-11 .cvsignore, 1.25, 1.26 ikiwiki.spec, 1.27,
	1.28 import.log, 1.25, 1.26 sources, 1.25, 1.26
Message-ID: <20090901190225.9DB8911C00EF@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13072/F-11

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	12 Aug 2009 16:37:42 -0000	1.25
+++ .cvsignore	1 Sep 2009 19:02:25 -0000	1.26
@@ -1 +1 @@
-ikiwiki_3.141592.tar.gz
+ikiwiki_3.1415926.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/ikiwiki.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ikiwiki.spec	12 Aug 2009 16:37:42 -0000	1.27
+++ ikiwiki.spec	1 Sep 2009 19:02:25 -0000	1.28
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.141592
+Version:        3.1415926
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Tue Sep  1 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.1415926-1
+- Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
+
 * Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.141592-1
 - Update to 3.141592.
 - po4a is needed now.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- import.log	12 Aug 2009 16:37:42 -0000	1.25
+++ import.log	1 Sep 2009 19:02:25 -0000	1.26
@@ -23,3 +23,4 @@ ikiwiki-3_11-1_fc11:F-11:ikiwiki-3.11-1.
 ikiwiki-3_12-1_fc11:F-11:ikiwiki-3.12-1.fc11.src.rpm:1242422225
 ikiwiki-3_1415-1_fc12:F-11:ikiwiki-3.1415-1.fc12.src.rpm:1247863732
 ikiwiki-3_141592-1_fc11:F-11:ikiwiki-3.141592-1.fc11.src.rpm:1250094991
+ikiwiki-3_1415926-1_fc11:F-11:ikiwiki-3.1415926-1.fc11.src.rpm:1251831564


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	12 Aug 2009 16:37:42 -0000	1.25
+++ sources	1 Sep 2009 19:02:25 -0000	1.26
@@ -1 +1 @@
-de1daa180835615da9ac494837a51d9d  ikiwiki_3.141592.tar.gz
+b5f28d88ebc358347a14ad88cbac22e9  ikiwiki_3.1415926.tar.gz



From mbarnes at fedoraproject.org  Tue Sep  1 19:06:40 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  1 Sep 2009 19:06:40 +0000 (UTC)
Subject: rpms/evolution/devel evolution-kb-override-version.patch, NONE,
	1.1.2.1 .cvsignore, 1.116.2.17, 1.116.2.18 evolution.spec,
	1.394.2.34, 1.394.2.35 sources, 1.116.2.21,
	1.116.2.22 evolution-override-eds-version.patch, 1.1.2.1, NONE
Message-ID: <20090901190640.D961111C00EF@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13917

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Added Files:
      Tag: private-mbarnes-kb
	evolution-kb-override-version.patch 
Removed Files:
      Tag: private-mbarnes-kb
	evolution-override-eds-version.patch 
Log Message:

* Mon Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit f945e64.
- Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
  compatibility with Fedora 12.


evolution-kb-override-version.patch:
 configure.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE evolution-kb-override-version.patch ---
diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac
--- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version	2009-09-01 15:02:53.028656991 -0400
+++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac	2009-09-01 15:03:19.843363079 -0400
@@ -1,7 +1,7 @@
 dnl Evolution Versions
 m4_define([evo_major_version], [2])
-m4_define([evo_minor_version], [29])
-m4_define([evo_micro_version], [1])
+m4_define([evo_minor_version], [27])
+m4_define([evo_micro_version], [99])
 m4_define([evo_version],
 	[evo_major_version.evo_minor_version.evo_micro_version])
 m4_define([evo_stable_version],
@@ -13,8 +13,8 @@ dnl Base Version: This is for API/versio
 dnl Bonobo server files.  This should always be the major/minor of
 dnl the stable version or stable version to be.  Note, this is set
 dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly.
-BASE_VERSION=2.30
-m4_define([base_version], [2.30])
+BASE_VERSION=2.28
+m4_define([base_version], [2.28])
 
 dnl Upgrade Revision: This is for triggering migration calls between
 dnl varying versions. Reset to 0 whenever BASE_VERSION changes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.17
retrieving revision 1.116.2.18
diff -u -p -r1.116.2.17 -r1.116.2.18
--- .cvsignore	31 Aug 2009 23:11:01 -0000	1.116.2.17
+++ .cvsignore	1 Sep 2009 19:06:40 -0000	1.116.2.18
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2
+evolution-2.29.1-kill-bonobo-f945e64.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.34
retrieving revision 1.394.2.35
diff -u -p -r1.394.2.34 -r1.394.2.35
--- evolution.spec	31 Aug 2009 23:48:21 -0000	1.394.2.34
+++ evolution.spec	1 Sep 2009 19:06:40 -0000	1.394.2.35
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash e7a7e7d
+%define hash f945e64
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,14 +45,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.29.1
+Version: 2.27.99
 Release: 1.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: %{name}-%{version}-kill-bonobo-%{hash}.tar.bz2
+Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -69,9 +69,8 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# Override the evolution-data-server version requirement,
-# since e-d-s version 2.29 will never exist in Fedora 12.
-Patch13: evolution-override-eds-version.patch
+# Override the version to 2.27.99 (and API_VERSION to 2.28).
+Patch13: evolution-kb-override-version.patch
 
 ## Dependencies ###
 
@@ -229,11 +228,11 @@ Requires: %{name} = %{version}-%{release
 This package contains supplemental utilities for %{name} that require Perl.
 
 %prep
-%setup -q -n evolution-%{version}-kill-bonobo-%{hash}
+%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .override-eds-version
+%patch13 -p1 -b .override-version
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -680,10 +679,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
-* Mon Aug 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.kb.1.fc12
-- Snapshot of "kill-bonobo" branch at commit e7a7e7d.
-- Relax the evolution-data-server version requirement.
-- Bump evo_major to 2.30.
+* Mon Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
+- Snapshot of "kill-bonobo" branch at commit f945e64.
+- Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
+  compatibility with Fedora 12.
 
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
 - Snapshot of "kill-bonobo" branch at commit 787ce81.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.21
retrieving revision 1.116.2.22
diff -u -p -r1.116.2.21 -r1.116.2.22
--- sources	31 Aug 2009 23:11:01 -0000	1.116.2.21
+++ sources	1 Sep 2009 19:06:40 -0000	1.116.2.22
@@ -1 +1 @@
-e838844dc46e59e95c37719fd95bbdb2  evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2
+658fce6142a8c152cde3054c1086a849  evolution-2.29.1-kill-bonobo-f945e64.tar.bz2


--- evolution-override-eds-version.patch DELETED ---



From ajax at fedoraproject.org  Tue Sep  1 19:14:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  1 Sep 2009 19:14:30 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel redhat-rpm-config.spec,1.72,1.73
Message-ID: <20090901191430.DC8FB11C00EF@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15409

Modified Files:
	redhat-rpm-config.spec 
Log Message:
fix changelog


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- redhat-rpm-config.spec	19 Aug 2009 06:08:05 -0000	1.72
+++ redhat-rpm-config.spec	1 Sep 2009 19:14:30 -0000	1.73
@@ -65,7 +65,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - use XZ payload compression for binary packages
 
 * Tue Jul 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-10
-- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
+- always delete %%buildroot as first step of %%install (as long as %%buildroot is not /)
 
 * Fri Jul 17 2009 Bill Nottingham <notting at redhat.com> 9.0.3-10
 - apply fedora 12 default buildflags



From karsten at fedoraproject.org  Tue Sep  1 19:17:33 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  1 Sep 2009 19:17:33 +0000 (UTC)
Subject: rpms/wireless-tools/devel wireless-tools.spec,1.44,1.45
Message-ID: <20090901191733.2251211C00EF@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/wireless-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16722

Modified Files:
	wireless-tools.spec 
Log Message:
- drop excludearch s390x as at least the headers are required to build p.e. NetworkManager


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- wireless-tools.spec	27 Jul 2009 07:18:18 -0000	1.44
+++ wireless-tools.spec	1 Sep 2009 19:17:32 -0000	1.45
@@ -8,13 +8,12 @@ Group: System Environment/Base
 License: GPL+
 Name: wireless-tools
 Version: 29
-Release: 5%{?pre_version}%{?dist}
+Release: 5.1%{?pre_version}%{?dist}
 Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}%{?pre_version}.tar.gz
 Patch1: wireless-tools-29-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-ExcludeArch: s390 s390x
 
 # This is artificial, for packaging purposes.  The presumption is that
 # wireless users will install this package, so they will want crda too.
@@ -85,6 +84,9 @@ ln -sf ../../%{_lib}/libiw.so.%{version}
 
 
 %changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 29-5.1
+- drop excludearch s390x as at least the headers are required to build p.e. NetworkManager
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:29-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjames at fedoraproject.org  Tue Sep  1 19:23:36 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Sep 2009 19:23:36 +0000 (UTC)
Subject: rpms/xemacs-packages-base/F-11
	xemacs-packages-base-20090901-mule-480845.patch, NONE,
	1.1 xemacs-packages-base.spec, 1.7, 1.8
Message-ID: <20090901192336.C9C1711C00EF@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18225/F-11

Modified Files:
	xemacs-packages-base.spec 
Added Files:
	xemacs-packages-base-20090901-mule-480845.patch 
Log Message:
* Tue Sep  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
- Add mule-base patch to fix bz 480845 and hopefully bz 520248.


xemacs-packages-base-20090901-mule-480845.patch:
 ChangeLog    |    7 +++++
 mule-util.el |   69 -----------------------------------------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)

--- NEW FILE xemacs-packages-base-20090901-mule-480845.patch ---
Index: mule-packages/mule-base/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/ChangeLog,v
retrieving revision 1.66
diff -d -u -r1.66 ChangeLog
--- mule-packages/mule-base/ChangeLog	9 Aug 2008 12:41:17 -0000	1.66
+++ mule-packages/mule-base/ChangeLog	1 Sep 2009 18:56:15 -0000
@@ -1,3 +1,10 @@
+2009-09-01  Jerry James  <james at xemacs.org>
+
+	* mule-util.el (store-substring): Remove older version of a
+	function that is now defined in subr.el.
+	(truncate-string-to-width): Ditto.
+	(truncate-string): Ditto.
+
 2008-08-09  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.53 released.
Index: mule-packages/mule-base/mule-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/mule-util.el,v
retrieving revision 1.3
diff -d -u -r1.3 mule-util.el
--- mule-packages/mule-base/mule-util.el	20 May 2007 19:32:53 -0000	1.3
+++ mule-packages/mule-base/mule-util.el	1 Sep 2009 18:56:15 -0000
@@ -68,75 +68,6 @@
 ;;   "Return a vector of characters in STRING."
 ;;   (string-to-sequence string 'vector))
 
-;;;###autoload
-(defun store-substring (string idx obj)
-  "Embed OBJ (string or character) at index IDX of STRING."
-  (if (characterp obj)
-      (aset string idx obj)
-    (let ((len1 (length obj))
-	  (len2 (length string))
-	  (i 0))
-      (while (< i len1)
-	(aset string (+ idx i) (aref obj i))
-	(setq i (1+ i)))))
-  string)
-
-;;;###autoload
-(defun truncate-string-to-width (str end-column &optional start-column padding)
-  "Truncate string STR to end at column END-COLUMN.
-The optional 2nd arg START-COLUMN, if non-nil, specifies
-the starting column; that means to return the characters occupying
-columns START-COLUMN ... END-COLUMN of STR.
-
-The optional 3rd arg PADDING, if non-nil, specifies a padding character
-to add at the end of the result if STR doesn't reach column END-COLUMN,
-or if END-COLUMN comes in the middle of a character in STR.
-PADDING is also added at the beginning of the result
-if column START-COLUMN appears in the middle of a character in STR.
-
-If PADDING is nil, no padding is added in these cases, so
-the resulting string may be narrower than END-COLUMN."
-  (or start-column
-      (setq start-column 0))
-  (let ((len (length str))
-	(idx 0)
-	(column 0)
-	(head-padding "") (tail-padding "")
-	ch last-column last-idx from-idx)
-    (condition-case nil
-	(while (< column start-column)
-	  (setq ch (aref str idx)
-		column (+ column (char-width ch))
-		idx (1+ idx)))
-      (args-out-of-range (setq idx len)))
-    (if (< column start-column)
-	(if padding (make-string end-column padding) "")
-      (if (and padding (> column start-column))
-	  (setq head-padding (make-string (- column start-column) padding)))
-      (setq from-idx idx)
-      (if (< end-column column)
-	  (setq idx from-idx)
-	(condition-case nil
-	    (while (< column end-column)
-	      (setq last-column column
-		    last-idx idx
-		    ch (aref str idx)
-		    column (+ column (char-width ch))
-		    idx (1+ idx)))
-	  (args-out-of-range (setq idx len)))
-	(if (> column end-column)
-	    (setq column last-column idx last-idx))
-	(if (and padding (< column end-column))
-	    (setq tail-padding (make-string (- end-column column) padding))))
-      (setq str (substring str from-idx idx))
-      (if padding
-	  (concat head-padding str tail-padding)
-	str))))
-
-;;; For backward compatibility ...
-;;;###autoload
-(defalias 'truncate-string 'truncate-string-to-width)
-(make-obsolete 'truncate-string 'truncate-string-to-width)
 

 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.


Index: xemacs-packages-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/F-11/xemacs-packages-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xemacs-packages-base.spec	24 Aug 2009 22:30:41 -0000	1.7
+++ xemacs-packages-base.spec	1 Sep 2009 19:23:36 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-base
 Version:        20090217
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -19,6 +19,9 @@ Patch0:         xemacs-packages-base-200
 Patch1:         xemacs-packages-base-20090624-dired-504422.patch
 # This patch has been committed upstream.  Fix a timer bug.
 Patch2:         xemacs-packages-base-20090824-timer.patch
+# This patch has been committed upstream.  Remove obsolete definitions that
+# lead to a crash in the menubar code.
+Patch3:         xemacs-packages-base-20090901-mule-480845.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -54,6 +57,7 @@ developing or debugging the packages.
 %patch0
 %patch1
 %patch2
+%patch3
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
@@ -116,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
+- Add mule-base patch to fix bz 480845 and hopefully bz 520248.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
 - Add APEL patch to fix bz 503185 for XEmacs.
 - Add dired patch to fix bz 504422.



From jjames at fedoraproject.org  Tue Sep  1 19:23:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Sep 2009 19:23:37 +0000 (UTC)
Subject: rpms/xemacs-packages-base/devel
	xemacs-packages-base-20090901-mule-480845.patch, NONE,
	1.1 xemacs-packages-base.spec, 1.8, 1.9
Message-ID: <20090901192337.3208B11C00EF@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18225/devel

Modified Files:
	xemacs-packages-base.spec 
Added Files:
	xemacs-packages-base-20090901-mule-480845.patch 
Log Message:
* Tue Sep  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
- Add mule-base patch to fix bz 480845 and hopefully bz 520248.


xemacs-packages-base-20090901-mule-480845.patch:
 ChangeLog    |    7 +++++
 mule-util.el |   69 -----------------------------------------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)

--- NEW FILE xemacs-packages-base-20090901-mule-480845.patch ---
Index: mule-packages/mule-base/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/ChangeLog,v
retrieving revision 1.66
diff -d -u -r1.66 ChangeLog
--- mule-packages/mule-base/ChangeLog	9 Aug 2008 12:41:17 -0000	1.66
+++ mule-packages/mule-base/ChangeLog	1 Sep 2009 18:56:15 -0000
@@ -1,3 +1,10 @@
+2009-09-01  Jerry James  <james at xemacs.org>
+
+	* mule-util.el (store-substring): Remove older version of a
+	function that is now defined in subr.el.
+	(truncate-string-to-width): Ditto.
+	(truncate-string): Ditto.
+
 2008-08-09  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.53 released.
Index: mule-packages/mule-base/mule-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/mule-util.el,v
retrieving revision 1.3
diff -d -u -r1.3 mule-util.el
--- mule-packages/mule-base/mule-util.el	20 May 2007 19:32:53 -0000	1.3
+++ mule-packages/mule-base/mule-util.el	1 Sep 2009 18:56:15 -0000
@@ -68,75 +68,6 @@
 ;;   "Return a vector of characters in STRING."
 ;;   (string-to-sequence string 'vector))
 
-;;;###autoload
-(defun store-substring (string idx obj)
-  "Embed OBJ (string or character) at index IDX of STRING."
-  (if (characterp obj)
-      (aset string idx obj)
-    (let ((len1 (length obj))
-	  (len2 (length string))
-	  (i 0))
-      (while (< i len1)
-	(aset string (+ idx i) (aref obj i))
-	(setq i (1+ i)))))
-  string)
-
-;;;###autoload
-(defun truncate-string-to-width (str end-column &optional start-column padding)
-  "Truncate string STR to end at column END-COLUMN.
-The optional 2nd arg START-COLUMN, if non-nil, specifies
-the starting column; that means to return the characters occupying
-columns START-COLUMN ... END-COLUMN of STR.
-
-The optional 3rd arg PADDING, if non-nil, specifies a padding character
-to add at the end of the result if STR doesn't reach column END-COLUMN,
-or if END-COLUMN comes in the middle of a character in STR.
-PADDING is also added at the beginning of the result
-if column START-COLUMN appears in the middle of a character in STR.
-
-If PADDING is nil, no padding is added in these cases, so
-the resulting string may be narrower than END-COLUMN."
-  (or start-column
-      (setq start-column 0))
-  (let ((len (length str))
-	(idx 0)
-	(column 0)
-	(head-padding "") (tail-padding "")
-	ch last-column last-idx from-idx)
-    (condition-case nil
-	(while (< column start-column)
-	  (setq ch (aref str idx)
-		column (+ column (char-width ch))
-		idx (1+ idx)))
-      (args-out-of-range (setq idx len)))
-    (if (< column start-column)
-	(if padding (make-string end-column padding) "")
-      (if (and padding (> column start-column))
-	  (setq head-padding (make-string (- column start-column) padding)))
-      (setq from-idx idx)
-      (if (< end-column column)
-	  (setq idx from-idx)
-	(condition-case nil
-	    (while (< column end-column)
-	      (setq last-column column
-		    last-idx idx
-		    ch (aref str idx)
-		    column (+ column (char-width ch))
-		    idx (1+ idx)))
-	  (args-out-of-range (setq idx len)))
-	(if (> column end-column)
-	    (setq column last-column idx last-idx))
-	(if (and padding (< column end-column))
-	    (setq tail-padding (make-string (- end-column column) padding))))
-      (setq str (substring str from-idx idx))
-      (if padding
-	  (concat head-padding str tail-padding)
-	str))))
-
-;;; For backward compatibility ...
-;;;###autoload
-(defalias 'truncate-string 'truncate-string-to-width)
-(make-obsolete 'truncate-string 'truncate-string-to-width)
 

 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.


Index: xemacs-packages-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/devel/xemacs-packages-base.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xemacs-packages-base.spec	24 Aug 2009 22:30:42 -0000	1.8
+++ xemacs-packages-base.spec	1 Sep 2009 19:23:36 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-base
 Version:        20090217
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -19,6 +19,9 @@ Patch0:         xemacs-packages-base-200
 Patch1:         xemacs-packages-base-20090624-dired-504422.patch
 # This patch has been committed upstream.  Fix a timer bug.
 Patch2:         xemacs-packages-base-20090824-timer.patch
+# This patch has been committed upstream.  Remove obsolete definitions that
+# lead to a crash in the menubar code.
+Patch3:         xemacs-packages-base-20090901-mule-480845.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -54,6 +57,7 @@ developing or debugging the packages.
 %patch0
 %patch1
 %patch2
+%patch3
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
@@ -116,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
+- Add mule-base patch to fix bz 480845 and hopefully bz 520248.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
 - Add APEL patch to fix bz 503185 for XEmacs.
 - Add dired patch to fix bz 504422.



From overholt at fedoraproject.org  Tue Sep  1 19:30:12 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue,  1 Sep 2009 19:30:12 +0000 (UTC)
Subject: rpms/maven2/devel maven2.spec,1.25,1.26
Message-ID: <20090901193012.086DB11C0498@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22431

Modified Files:
	maven2.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-2
- Build in non-bootstrap mode
- Change jmock R to easymock for plugin-assembly


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- maven2.spec	31 Aug 2009 14:51:15 -0000	1.25
+++ maven2.spec	1 Sep 2009 19:30:11 -0000	1.26
@@ -32,8 +32,8 @@
 
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 
-%define with_bootstrap 1
-%define without_bootstrap 0
+%define with_bootstrap 0
+%define without_bootstrap 1
 
 %define maven_version   2.0.8
 %define NONFREE 0
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.4%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -172,7 +172,6 @@ BuildRequires:    plexus-container-defau
 BuildRequires:    plexus-i18n >= 1.0
 BuildRequires:    plexus-interactivity >= 1.0
 BuildRequires:    plexus-utils >= 1.2
-BuildRequires:    plexus-velocity >= 1.1.2
 BuildRequires:    pmd >= 3.6
 BuildRequires:    qdox >= 1.5
 BuildRequires:    rhino >= 1.5
@@ -208,6 +207,8 @@ BuildRequires:    maven2-plugin-resource
 BuildRequires:    maven2-plugin-shade
 BuildRequires:    maven2-plugin-site
 BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-archiver >= 2.2
+BuildRequires:    maven-plugin-tools >= 2.1
 BuildRequires:    maven-shared-archiver
 BuildRequires:    maven-doxia-sitetools
 BuildRequires:    maven-embedder
@@ -236,10 +237,14 @@ BuildRequires:    maven-surefire-provide
 BuildRequires:    maven-surefire-booter >= 2.0
 BuildRequires:    modello >= 1.0-0.a8.3
 BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires:    plexus-cdc >= 1.0-0.5.a10
 BuildRequires:    plexus-digest
 BuildRequires:    plexus-maven-plugin >= 1.3.5
 BuildRequires:    plexus-mail-sender
 BuildRequires:    plexus-resources
+BuildRequires:    plexus-velocity >= 1.1.7
+%else
+BuildRequires:    plexus-velocity >= 1.1.2
 %endif
 
 Requires:        ant >= 1.6.5
@@ -438,7 +443,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 %if %{without_bootstrap}
 Requires:       modello >= 1.0-0.a8.3
 Requires:    	maven-shared-archiver
-Requires:       jmock >= 1.0.1
 Requires:	maven-shared-test-tools
 Requires:    	maven-shared-repository-builder
 Requires:    	maven-shared-common-artifact-filters
@@ -450,6 +454,7 @@ Requires:    	maven-shared-file-manageme
 Requires:	plexus-container-default
 Requires:       jdom >= 1.0
 Requires:       jaxen >= 1.1
+Requires:       easymock
 Requires:    	saxpath
 Requires:       junit >= 3.8.2
 
@@ -493,12 +498,14 @@ Requires:       maven-doxia
 Requires:       maven-doxia-sitetools >= 1.0
 Requires:    	maven-shared-reporting-impl
 Requires:       glassfish-javamail
+Requires:       plexus-velocity >= 1.1.7
+%else
+Requires:       plexus-velocity >= 1.1.2
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       velocity
 Requires:       commons-httpclient
-Requires:       plexus-velocity >= 1.1.2
 Requires:       plexus-mail-sender
 Requires:       jakarta-commons-lang
 Requires:       velocity
@@ -691,6 +698,7 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 %if %{without_bootstrap}
+Requires:       maven-archiver >= 2.2
 Requires:       maven-shared-verifier
 %endif
 Requires:       xmlunit
@@ -2898,6 +2906,10 @@ fi
 %endif
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-2
+- Build in non-bootstrap mode
+- Change jmock R to easymock for plugin-assembly
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-1.4
 - Move missing dependencies to without_bootstrap blocks.
 



From karsten at fedoraproject.org  Tue Sep  1 19:31:48 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  1 Sep 2009 19:31:48 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.408,1.408.2.1
Message-ID: <20090901193148.81C0B11C00EF@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22929

Modified Files:
      Tag: evolution-2_27_5-3_fc12_rhel6_rebuild
	evolution.spec 
Log Message:
 - fix build requirements for f12 rebuild on s390x, add libeconduit.so.* to
   main package (s390x only)




Index: evolution.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.408
retrieving revision 1.408.2.1
diff -u -p -r1.408 -r1.408.2.1
--- evolution.spec	28 Jul 2009 17:15:44 -0000	1.408
+++ evolution.spec	1 Sep 2009 19:31:48 -0000	1.408.2.1
@@ -25,11 +25,7 @@
 %define libpst_support 1
 %define krb5_support 1
 %define nntp_support 1
-%ifnarch s390 s390x
 %define nm_support 1
-%else
-%define nm_support 0
-%endif
 %ifarch s390 s390x
 %define build_conduits 0
 %else
@@ -43,7 +39,7 @@
 
 Name: evolution
 Version: 2.27.5
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -619,6 +615,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %{evo_plugin_dir}/org-gnome-evolution-webdav.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-webdav.so
+# 
+# we don't have a conduits subpackage on s390*, but libeconduit.so* exists
+%if ! %{build_conduits}
+%{_libdir}/evolution/%{evo_major}/libeconduit.so*
+%endif
 
 %files devel
 %defattr(-, root, root)
@@ -693,6 +694,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 2.27.5-3.1
+- fix build requirements for f12 rebuild on s390x, add libeconduit.so.* to
+  main package (s390x only)
+
 * Tue Jul 28 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-3.fc12
 - Enable pst-import plugin (RH bug #493049)
 



From mbarnes at fedoraproject.org  Tue Sep  1 19:38:02 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  1 Sep 2009 19:38:02 +0000 (UTC)
Subject: rpms/evolution/devel evolution-kb-override-version.patch, 1.1.2.1, 
	1.1.2.2 evolution.spec, 1.394.2.35, 1.394.2.36
Message-ID: <20090901193802.1AB4211C00EF@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24455

Modified Files:
      Tag: private-mbarnes-kb
	evolution-kb-override-version.patch evolution.spec 
Log Message:

* Mon Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit f945e64.
- Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
  compatibility with Fedora 12.
- Relax evolution-data-server requirement.


evolution-kb-override-version.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: evolution-kb-override-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/Attic/evolution-kb-override-version.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- evolution-kb-override-version.patch	1 Sep 2009 19:06:40 -0000	1.1.2.1
+++ evolution-kb-override-version.patch	1 Sep 2009 19:38:01 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac
 --- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version	2009-09-01 15:02:53.028656991 -0400
-+++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac	2009-09-01 15:03:19.843363079 -0400
++++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac	2009-09-01 15:36:41.818612634 -0400
 @@ -1,7 +1,7 @@
  dnl Evolution Versions
  m4_define([evo_major_version], [2])
@@ -22,3 +22,12 @@ diff -up evolution-2.29.1-kill-bonobo-f9
  
  dnl Upgrade Revision: This is for triggering migration calls between
  dnl varying versions. Reset to 0 whenever BASE_VERSION changes.
+@@ -49,7 +49,7 @@ GTKHTML_PACKAGE=3.14
+ dnl Required Packages
+ m4_define([glib_minimum_version], [2.20.0])
+ m4_define([gtk_minimum_version], [2.16.0])
+-m4_define([eds_minimum_version], [evo_version])
++m4_define([eds_minimum_version], [2.27.91])
+ m4_define([gnome_icon_theme_minimum_version], [2.19.91])
+ m4_define([gnome_desktop_minimum_version], [2.26.0])
+ m4_define([libbonobo_minimum_version], [2.20.3])


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.35
retrieving revision 1.394.2.36
diff -u -p -r1.394.2.35 -r1.394.2.36
--- evolution.spec	1 Sep 2009 19:06:40 -0000	1.394.2.35
+++ evolution.spec	1 Sep 2009 19:38:01 -0000	1.394.2.36
@@ -3,6 +3,7 @@
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
+%define eds_version 2.27.91
 %define glib2_version 2.16.0
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
@@ -98,7 +99,7 @@ BuildRequires: byacc
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel
+BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -683,6 +684,7 @@ rm -rf $RPM_BUILD_ROOT
 - Snapshot of "kill-bonobo" branch at commit f945e64.
 - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
   compatibility with Fedora 12.
+- Relax evolution-data-server requirement.
 
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
 - Snapshot of "kill-bonobo" branch at commit 787ce81.



From epienbro at fedoraproject.org  Tue Sep  1 19:43:01 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  1 Sep 2009 19:43:01 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel .cvsignore, 1.4, 1.5 mingw32-libsoup.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090901194302.02C5411C00EF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26588

Modified Files:
	.cvsignore mingw32-libsoup.spec sources 
Log Message:
Update to 2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Aug 2009 09:05:53 -0000	1.4
+++ .cvsignore	1 Sep 2009 19:43:01 -0000	1.5
@@ -1 +1 @@
-libsoup-2.27.90.tar.bz2
+libsoup-2.27.91.tar.bz2


Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libsoup.spec	13 Aug 2009 09:17:48 -0000	1.5
+++ mingw32-libsoup.spec	1 Sep 2009 19:43:01 -0000	1.6
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:		mingw32-libsoup
-Version:	2.27.90
+Version:	2.27.91
 Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.91-1
+- Update to 2.27.91
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.90-1
 - Update to 2.27.90
 - Automatically generate debuginfo subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Aug 2009 09:05:54 -0000	1.4
+++ sources	1 Sep 2009 19:43:01 -0000	1.5
@@ -1 +1 @@
-5bad95448a9ea59ca590567c41854fbb  libsoup-2.27.90.tar.bz2
+58e5518a483fbef0b72f142e63f43e9f  libsoup-2.27.91.tar.bz2



From nhorman at fedoraproject.org  Tue Sep  1 20:11:07 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Sep 2009 20:11:07 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance-0.55-config-capng.patch, NONE,
	1.1 irqbalance.spec, 1.58, 1.59
Message-ID: <20090901201107.2042D11C00EF@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1741

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-0.55-config-capng.patch 
Log Message:
Resolves: bz 520699

irqbalance-0.55-config-capng.patch:
 COPYING          |  340 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am      |   39 ++++++
 activate.c       |    1 
 autogen.sh       |    4 
 bitmap.c         |    2 
 classify.c       |    1 
 configure.ac     |   74 +++++++++++
 cputree.c        |    3 
 irqbalance.c     |   12 +
 irqlist.c        |    2 
 m4/cap-ng.m4     |   40 ++++++
 network.c        |    2 
 numa.c           |    2 
 placement.c      |    1 
 powermode.c      |    2 
 procinterrupts.c |    2 
 16 files changed, 518 insertions(+), 9 deletions(-)

--- NEW FILE irqbalance-0.55-config-capng.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/activate.c.orig irqbalance-0.55/irqbalance-0.55/activate.c
--- irqbalance-0.55/irqbalance-0.55/activate.c.orig	2006-11-22 04:23:41.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/activate.c	2009-09-01 16:03:26.000000000 -0400
@@ -23,6 +23,7 @@
  * This file contains the code to communicate a selected distribution / mapping
  * of interrupts to the kernel.
  */
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/AUTHORS
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/autogen.sh
--- /dev/null	2009-08-23 21:38:48.579244073 -0400
+++ irqbalance-0.55/irqbalance-0.55/autogen.sh	2009-09-01 16:03:26.000000000 -0400
@@ -0,0 +1,4 @@
+#! /bin/sh
+set -x -e
+# --no-recursive is available only in recent autoconf versions
+autoreconf -fv --install
diff -up irqbalance-0.55/irqbalance-0.55/bitmap.c.orig irqbalance-0.55/irqbalance-0.55/bitmap.c
--- irqbalance-0.55/irqbalance-0.55/bitmap.c.orig	2006-11-22 08:43:17.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/bitmap.c	2009-09-01 16:03:26.000000000 -0400
@@ -11,7 +11,7 @@ This file is taken from the Linux kernel
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
-
+#include "config.h"
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/Changelog
diff -up irqbalance-0.55/irqbalance-0.55/classify.c.orig irqbalance-0.55/irqbalance-0.55/classify.c
--- irqbalance-0.55/irqbalance-0.55/classify.c.orig	2006-11-24 11:11:22.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/classify.c	2009-09-01 16:03:26.000000000 -0400
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/configure.ac
--- /dev/null	2009-08-23 21:38:48.579244073 -0400
+++ irqbalance-0.55/irqbalance-0.55/configure.ac	2009-09-01 16:03:26.000000000 -0400
@@ -0,0 +1,74 @@
+dnl
+define([AC_INIT_NOTICE],
+[### Generated automatically using autoconf version] AC_ACVERSION [
+### Copyright 2009 Steve Grubb <sgrubb at redhat.com>
+###
+### Permission is hereby granted, free of charge, to any person obtaining a
+### copy of this software and associated documentation files (the "Software"),
+### to deal in the Software without restriction, including without limitation
+### the rights to use, copy, modify, merge, publish, distribute, sublicense,
+### and/or sell copies of the Software, and to permit persons to whom the
+### Software is furnished to do so, subject to the following conditions:
+###
+### The above copyright notice and this permission notice shall be included
+### in all copies or substantial portions of the Software.
+###
+### THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+### IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+### FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+### THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+### OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+### ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+### OTHER DEALINGS IN THE SOFTWARE.
+###
+### For usage, run `./configure --help'
+### For more detailed information on installation, read the file `INSTALL'.
+###
+### If configuration succeeds, status is in the file `config.status'.
+### A log of configuration tests is in `config.log'.
+])
+
+AC_REVISION($Revision: 1.3 $)dnl
+AC_INIT(irqbalance,0.56)
+AC_PREREQ(2.12)dnl
+AM_CONFIG_HEADER(config.h)
+
+echo Configuring irqbalance $VERSION
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
+AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+
+echo .
+echo Checking for programs
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_AWK
+
+echo .
+echo Checking for header files
+AC_HEADER_STDC
+AC_CHECK_HEADERS(linux/ethtool.h linux/sockios.h, [], [])
+
+AC_C_CONST
+AC_C_INLINE
+AM_PROG_CC_C_O
+
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+LIBCAP_NG_PATH
+
+AC_OUTPUT(Makefile)
+
+echo .
+echo "
+
+  irqbalance Version:     $VERSION
+  Target:                 $target
+  Installation prefix:    $prefix
+  Compiler:               $CC
+  Compiler flags:
+`echo $CFLAGS | fmt -w 50 | sed 's,^,                          ,'`
+"
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/COPYING
--- /dev/null	2009-08-23 21:38:48.579244073 -0400
+++ irqbalance-0.55/irqbalance-0.55/COPYING	2009-09-01 16:03:26.000000000 -0400
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+

+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+

+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+

+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+

+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -up irqbalance-0.55/irqbalance-0.55/cputree.c.orig irqbalance-0.55/irqbalance-0.55/cputree.c
--- irqbalance-0.55/irqbalance-0.55/cputree.c.orig	2009-09-01 16:02:59.000000000 -0400
+++ irqbalance-0.55/irqbalance-0.55/cputree.c	2009-09-01 16:03:26.000000000 -0400
@@ -24,8 +24,7 @@
  * cache domains and processor cores.
  */
 
-#define _GNU_SOURCE
-
+#include "config.h"
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
diff -up irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig irqbalance-0.55/irqbalance-0.55/irqbalance.c
--- irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig	2009-09-01 16:02:59.000000000 -0400
+++ irqbalance-0.55/irqbalance-0.55/irqbalance.c	2009-09-01 16:03:26.000000000 -0400
@@ -18,6 +18,7 @@
  * 51 Franklin Street, Fifth Floor, 
  * Boston, MA 02110-1301 USA
  */
+#include "config.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,7 +28,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
+#ifdef HAVE_LIBCAP_NG
+#include <cap-ng.h>
+#endif
 #include "irqbalance.h"
 
 int one_shot_mode;
@@ -102,6 +105,13 @@ int main(int argc, char** argv)
 
 	close(pidf);	
 
+#ifdef HAVE_LIBCAP_NG
+	// Drop capabilities
+	capng_clear(CAPNG_SELECT_BOTH);
+	capng_lock();
+	capng_apply(CAPNG_SELECT_BOTH);
+#endif
+
 	parse_proc_interrupts();
 	sleep(SLEEP_INTERVAL/4);
 	reset_counts();
diff -up irqbalance-0.55/irqbalance-0.55/irqlist.c.orig irqbalance-0.55/irqbalance-0.55/irqlist.c
--- irqbalance-0.55/irqbalance-0.55/irqlist.c.orig	2006-12-10 15:16:44.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/irqlist.c	2009-09-01 16:03:26.000000000 -0400
@@ -22,7 +22,7 @@
 /*
  * This file has the basic functions to manipulate interrupt metadata
  */
-#define _GNU_SOURCE
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/m4/cap-ng.m4
--- /dev/null	2009-08-23 21:38:48.579244073 -0400
+++ irqbalance-0.55/irqbalance-0.55/m4/cap-ng.m4	2009-09-01 16:03:26.000000000 -0400
@@ -0,0 +1,40 @@
+# libcap-ng.m4 - Checks for the libcap-ng support
+# 	Copyright (c) 2009 Steve Grubb sgrubb at redhat.com
+#
+AC_DEFUN([LIBCAP_NG_PATH],
+[
+  AC_ARG_WITH(libcap-ng,
+    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
+    with_libcap_ng=auto)
+
+  # Check for Libcap-ng API
+  #
+  # libcap-ng detection
+
+  if test x$with_libcap_ng = xno ; then
+      have_libcap_ng=no;
+  else
+      # Start by checking for header file
+      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
+
+      # See if we have libcap-ng library
+      AC_CHECK_LIB(cap-ng, capng_clear,
+	         CAPNG_LDADD=-lcap-ng,)
+
+      # Check results are usable
+      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
+      fi
+      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
+      fi
+  fi
+  AC_SUBST(CAPNG_LDADD)
+  AC_MSG_CHECKING(whether to use libcap-ng)
+  if test x$CAPNG_LDADD != x ; then
+      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
+      AC_MSG_RESULT(yes)
+  else
+      AC_MSG_RESULT(no)
+  fi
+])
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/Makefile.am
--- /dev/null	2009-08-23 21:38:48.579244073 -0400
+++ irqbalance-0.55/irqbalance-0.55/Makefile.am	2009-09-01 16:03:26.000000000 -0400
@@ -0,0 +1,39 @@
+# Makefile.am --
+# Copyright 2009 Red Hat Inc., Durham, North Carolina.
+# All Rights Reserved.
+#
+# This 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.
+#
+# This 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 this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Authors:
+#   Steve Grubb <sgrubb at redhat.com>
+# 
+
+AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4
+ 
+INCLUDES = -I${top_srcdir} 
+LIBS = $(CAPNG_LDADD) $(GLIB_LIBS)
+AM_CFLAGS = -g -Os -W -Wall -Wshadow -Wformat -Wundef $(GLIB_CFLAGS) -D_GNU_SOURCE
+noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \
+	types.h
+sbin_PROGRAMS = irqbalance
+irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
+	irqlist.c network.c numa.c placement.c powermode.c procinterrupts.c
+
+CONFIG_CLEAN_FILES = debug*.list config/*
+clean-generic:
+	rm -rf autom4te*.cache 
+	rm -f *.rej *.orig *~
+
diff -up irqbalance-0.55/irqbalance-0.55/network.c.orig irqbalance-0.55/irqbalance-0.55/network.c
--- irqbalance-0.55/irqbalance-0.55/network.c.orig	2006-12-11 03:36:17.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/network.c	2009-09-01 16:03:26.000000000 -0400
@@ -24,7 +24,7 @@
  * even though the amount of work is high; this file is there to compensate for this
  * by adding actual package counts to the calculated amount of work of interrupts
  */
-#define _GNU_SOURCE
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/NEWS
diff -up irqbalance-0.55/irqbalance-0.55/numa.c.orig irqbalance-0.55/irqbalance-0.55/numa.c
--- irqbalance-0.55/irqbalance-0.55/numa.c.orig	2006-12-10 15:03:11.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/numa.c	2009-09-01 16:03:26.000000000 -0400
@@ -24,7 +24,7 @@
  * In addition the PCI class information is used to refine the classification
  * of interrupt sources 
  */
-#define _GNU_SOURCE
+#include "config.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
diff -up irqbalance-0.55/irqbalance-0.55/placement.c.orig irqbalance-0.55/irqbalance-0.55/placement.c
--- irqbalance-0.55/irqbalance-0.55/placement.c.orig	2006-11-23 05:55:26.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/placement.c	2009-09-01 16:03:26.000000000 -0400
@@ -18,6 +18,7 @@
  * 51 Franklin Street, Fifth Floor, 
  * Boston, MA 02110-1301 USA
  */
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -up irqbalance-0.55/irqbalance-0.55/powermode.c.orig irqbalance-0.55/irqbalance-0.55/powermode.c
--- irqbalance-0.55/irqbalance-0.55/powermode.c.orig	2006-12-11 03:16:50.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/powermode.c	2009-09-01 16:03:26.000000000 -0400
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, 
  * Boston, MA 02110-1301 USA
  */
-#define _GNU_SOURCE
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -up irqbalance-0.55/irqbalance-0.55/procinterrupts.c.orig irqbalance-0.55/irqbalance-0.55/procinterrupts.c
--- irqbalance-0.55/irqbalance-0.55/procinterrupts.c.orig	2006-12-10 15:11:45.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/procinterrupts.c	2009-09-01 16:03:26.000000000 -0400
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, 
  * Boston, MA 02110-1301 USA
  */
-#define _GNU_SOURCE
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -up /dev/null irqbalance-0.55/irqbalance-0.55/README


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- irqbalance.spec	31 Jul 2009 18:12:39 -0000	1.58
+++ irqbalance.spec	1 Sep 2009 20:11:06 -0000	1.59
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	18%{?dist}
+Release:	19%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -22,6 +22,7 @@ BuildRequires:	glib2-devel pkgconfig ima
 Patch0: irqbalance-pie.patch
 Patch1: irqbalance-0.55-cputree-parse.patch
 Patch2: irqbalance-0.55-pid-file.patch
+Patch3: irqbalance-0.55-config-capng.patch
 
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
@@ -33,10 +34,17 @@ multiple CPUs for enhanced performance.
 #%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+touch %{name}-%{version}/NEWS
+touch %{name}-%{version}/AUTHORS
+touch %{name}-%{version}/README
+touch %{name}-%{version}/ChangeLog
 sed -i s/-Os//g %{name}-%{version}/Makefile
 
 %build
 cd %{name}-%{version}
+sh ./autogen.sh
+%{configure}
 CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 %install
@@ -73,6 +81,9 @@ exit 0
 
 
 %changelog
+* Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-19
+- Incorporate capng (bz 520699)
+
 * Fri Jul 31 2009 Peter Lemenkov <lemenkov at gmail.com> - 2:0.55-18
 - Added back accidentaly forgotten imake
 



From transif at fedoraproject.org  Tue Sep  1 20:13:02 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  1 Sep 2009 20:13:02 +0000 (UTC)
Subject: comps/po nl.po,1.29,1.30
Message-ID: <20090901201302.BDC3211C00EF@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2202/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.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nl.po	31 Aug 2009 12:02:59 -0000	1.29
+++ nl.po	1 Sep 2009 20:13:02 -0000	1.30
@@ -7,15 +7,14 @@
 # R.E. van der Luit <nippur at fedoraproject.org>, 2009.
 # Geert Warrink <geert.warrink at onsnet.nu>, 2009.
 #
-# Geert Warrink <geert.warrink at onsnet.nu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 08:24+0000\n"
-"PO-Revision-Date: 2009-08-31 14:00+0200\n"
-"Last-Translator: Geert Warrink <geert.warrink at onsnet.nu>\n"
-"Language-Team: nl <nl at li.org>\n"
+"POT-Creation-Date: 2009-09-01 14:26+0000\n"
+"PO-Revision-Date: 2009-09-01 20:34+0200\n"
+"Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
+"Language-Team: Dutch <fedora-trans-list at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding:  \n"
@@ -1588,7 +1587,7 @@ msgid ""
 "functionality on all Fedora spins"
 msgstr ""
 "Een aantal pakketten die het gedeelde platform voor Kritieke Pad "
-"functionalteit aanbieden voor alle Fedora spins"
+"functionaliteit aanbieden voor alle Fedora spins"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1608,7 +1607,7 @@ msgstr "Kritieke Pad (GNOME)"
 
 #: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
 msgid "Directory Server"
-msgstr "Netwerkserver"
+msgstr "Directory server"
 
 #: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
 msgid "Haskell"
@@ -1619,21 +1618,21 @@ msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
 msgstr ""
-"LXDE is een lichtgewicht X11 bureaublad omgeving ontworpen voor computers "
-"met minder krachtige hardware zoals netbooks, draagbare apparaten en oudere "
+"LXDE is een lichtgewicht X11 werkomgeving ontworpen voor computers met "
+"minder krachtige hardware zoals netbooks, mobiele apparaten of oudere "
 "computers."
 
 #: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
 msgid "Machine and user identity servers."
-msgstr "Machine en gebruiker identiteit servers"
+msgstr "Machine en gebruiker identiteit servers."
 
 #: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
 msgid "Moblin Desktop Environment"
-msgstr "Moblin bureaublad omgeving"
+msgstr "Moblin werkomgeving"
 
 #: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
-msgstr "Moblin is een bureaublad omgeving voor netbook/nettop/MID apparaten."
+msgstr "Moblin is een werkomgeving voor netbook/nettop/MID apparaten."
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From scop at fedoraproject.org  Tue Sep  1 20:23:42 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  1 Sep 2009 20:23:42 +0000 (UTC)
Subject: rpms/vdr-text2skin/devel vdr-text2skin-1.3-skindir.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vdr-text2skin.spec,
	1.9, 1.10 vdr-text2skin-1.2-skindir.patch, 1.1, NONE
Message-ID: <20090901202342.27CEB11C00EF@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4997

Modified Files:
	.cvsignore sources vdr-text2skin.spec 
Added Files:
	vdr-text2skin-1.3-skindir.patch 
Removed Files:
	vdr-text2skin-1.2-skindir.patch 
Log Message:
* Tue Sep  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-3.git97c95bc
- Update to git revision 97c95bc for several bugfixes and better fonts handling.
- Build with GraphicsMagick instead of imlib2 by default.
- Make vdr(abi) dependency ISA qualified.
- Install translations.
- Use %global instead of %define.


vdr-text2skin-1.3-skindir.patch:
 README    |    3 +++
 README.de |    3 +++
 common.c  |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE vdr-text2skin-1.3-skindir.patch ---
diff -up vdr-plugin-text2skin/common.c.orig vdr-plugin-text2skin/common.c
--- vdr-plugin-text2skin/common.c.orig	2009-08-22 01:11:50.000000000 +0300
+++ vdr-plugin-text2skin/common.c	2009-09-01 22:31:23.000000000 +0300
@@ -14,7 +14,7 @@
 const std::string &SkinPath(void) 
 {
 	// should never change
-	static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
+	static std::string path = "/usr/share/vdr/text2skin";
 	return path;
 }
 
diff -up vdr-plugin-text2skin/README.de.orig vdr-plugin-text2skin/README.de
--- vdr-plugin-text2skin/README.de.orig	2009-08-22 01:11:50.000000000 +0300
+++ vdr-plugin-text2skin/README.de	2009-09-01 22:31:23.000000000 +0300
@@ -70,6 +70,9 @@ root at linux # ./vdr -P text2skin
 Wo die Skins hingeh?ren:
 ------------------------
 
+*** rpm package note: this text2skin package has been patched to load skins
+*** from /usr/share/vdr/text2skin instead of the path documented below.
+
 Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
 Konfigurationsordners, in dem alle Dateien, die zu Plugins geh?ren, enthalten
 sein sollten. Wenn Sie nicht wissen, wo das sein k?nnte, schauen Sie in dem
diff -up vdr-plugin-text2skin/README.orig vdr-plugin-text2skin/README
--- vdr-plugin-text2skin/README.orig	2009-08-22 01:11:50.000000000 +0300
+++ vdr-plugin-text2skin/README	2009-09-01 22:31:23.000000000 +0300
@@ -68,6 +68,9 @@ root at linux # ./vdr -P text2skin
 Where to put the skins:
 -----------------------
 
+*** rpm package note: this text2skin package has been patched to load skins
+*** from /usr/share/vdr/text2skin instead of the path documented below.
+
 As you might know, VDR has a subfolder "plugins" inside it's configuration 
 folder, where all plugin-related files should reside. If you don't know, where
 this could be, look into the folder you gave to VDR with the -v parameter 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Jul 2009 21:42:56 -0000	1.4
+++ .cvsignore	1 Sep 2009 20:23:41 -0000	1.5
@@ -1 +1 @@
-vdr-text2skin-1.2.tgz
+vdr-plugin-text2skin-97c95bc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Jul 2009 21:42:56 -0000	1.4
+++ sources	1 Sep 2009 20:23:41 -0000	1.5
@@ -1 +1 @@
-bc24ba8fad94ac435081144b067676db  vdr-text2skin-1.2.tgz
+4f2c86e5a12283ef7bb159ae29794d61  vdr-plugin-text2skin-97c95bc.tar.gz


Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- vdr-text2skin.spec	27 Jul 2009 06:47:45 -0000	1.9
+++ vdr-text2skin.spec	1 Sep 2009 20:23:41 -0000	1.10
@@ -1,33 +1,40 @@
-%define pname     text2skin
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     text2skin
+%global gitrev    97c95bc
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+# imagelib: imagemagick, graphicsmagick, imlib2 or %{nil}
+%{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
 Version:        1.2
-Release:        2%{?dist}
+Release:        3.git%{gitrev}%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-Source0:        http://projects.vdr-developer.org/attachments/download/112/%{name}-%{version}.tgz
+# wget --content-disposition "http://projects.vdr-developer.org/git/?p=vdr-plugin-text2skin.git;a=snapshot;h=%{gitrev};sf=tgz"
+Source0:        vdr-plugin-%{pname}-%{gitrev}.tar.gz
 Source1:        %{name}.conf
-Patch0:         %{name}-1.2-skindir.patch
+Patch0:         %{name}-1.3-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?_with_imagemagick:1}
+%if "%{imagelib}" == "imagemagick"
 BuildRequires:  ImageMagick-c++-devel
-%else
-BuildRequires:  imlib2-devel
 %endif
+%if "%{imagelib}" == "graphicsmagick"
+BuildRequires:  GraphicsMagick-c++-devel
+# Dependency missing in GraphicsMagick-devel <= 1.1.14-4.fc11
 BuildRequires:  freetype-devel
-BuildRequires:  vdr-devel >= 1.3.47
-BuildRequires:  sed >= 3.95
-BuildRequires:  which
+%endif
+%if "%{imagelib}" == "imlib2"
+BuildRequires:  imlib2-devel
+%endif
+BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gawk
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 This plugin is designed to load and interpret a set of files
@@ -40,15 +47,14 @@ of the skin wishes.
 
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n vdr-plugin-%{pname}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
 chmod -x contrib/*.pl
-sed -i -e /strip/d -e /O2/d Makefile
 
 
 %build
-opts="%{!?_with_imagemagick:HAVE_IMLIB2=1 HAVE_IMAGEMAGICK=}"
-make %{?_smp_mflags} $opts LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
+make %{?_smp_mflags} STRIP=: IMAGELIB=%{?imagelib} LIBDIR=. LOCALEDIR=./locale \
+    VDRDIR=%{_libdir}/vdr all
 
 
 %install
@@ -60,14 +66,18 @@ install -pm 755 libvdr-%{pname}.so.%{api
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin/fonts
+install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
 %lang(de) %doc README.de
@@ -77,6 +87,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-3.git97c95bc
+- Update to git revision 97c95bc for several bugfixes and better fonts handling.
+- Build with GraphicsMagick instead of imlib2 by default.
+- Make vdr(abi) dependency ISA qualified.
+- Install translations.
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- vdr-text2skin-1.2-skindir.patch DELETED ---



From karsten at fedoraproject.org  Tue Sep  1 20:39:52 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  1 Sep 2009 20:39:52 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.116,1.117
Message-ID: <20090901203952.BE18911C00EF@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10594

Modified Files:
	postgresql.spec 
Log Message:
- bump release and build again with the correct libssl




Index: postgresql.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- postgresql.spec	1 Sep 2009 17:31:59 -0000	1.116
+++ postgresql.spec	1 Sep 2009 20:39:52 -0000	1.117
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.0
-Release: 3.1%{?dist}
+Release: 3.2%{?dist}
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -856,6 +856,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 8.4.0-3.2
+- bump release and build again with the correct libssl
+
 * Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 8.4.0-3.1
 - disable dtrace on s390x as a workaround until #520469 has been fixed
 



From kalev at fedoraproject.org  Tue Sep  1 20:42:13 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue,  1 Sep 2009 20:42:13 +0000 (UTC)
Subject: rpms/powwow/devel .cvsignore, 1.3, 1.4 powwow.spec, 1.5, 1.6 sources,
	1.3, 1.4 import.log, 1.1, NONE powwow-long-prompt.patch, 1.2, NONE
Message-ID: <20090901204213.F0C4C11C00EF@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11078

Modified Files:
	.cvsignore powwow.spec sources 
Removed Files:
	import.log powwow-long-prompt.patch 
Log Message:
1.2.16-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 May 2009 22:34:32 -0000	1.3
+++ .cvsignore	1 Sep 2009 20:42:13 -0000	1.4
@@ -1 +1 @@
-powwow-1.2.15.tar.gz
+powwow-1.2.16.tar.gz


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/powwow.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- powwow.spec	7 Aug 2009 10:03:13 -0000	1.5
+++ powwow.spec	1 Sep 2009 20:42:13 -0000	1.6
@@ -1,15 +1,12 @@
 Name:           powwow
-Version:        1.2.15
-Release:        4%{?dist}
+Version:        1.2.16
+Release:        1%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
-# Match prompts longer than terminal width
-# https://bugzilla.redhat.com/show_bug.cgi?id=509288
-Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -34,8 +31,6 @@ for developing applications which use po
 %prep
 %setup -q
 
-%patch0 -p1 -b .long-prompt
-
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,11 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc Hacking README.modules TODO
+%doc Hacking plugtest.c README.modules TODO
 %{_includedir}/powwow/
 
 
 %changelog
+* Tue Sep 01 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.16-1
+- Update to powwow 1.2.16.
+- Dropped upstreamed powwow-long-prompt.patch.
+- Added a plugin example to -devel docs.
+
 * Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-4
 - Update powwow-long-prompt.patch to the version sent upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 May 2009 22:34:32 -0000	1.3
+++ sources	1 Sep 2009 20:42:13 -0000	1.4
@@ -1 +1 @@
-1eaaf6d601fb1e1b9ce4f4e69f31872b  powwow-1.2.15.tar.gz
+f1cbcccd4a4a166c164495ffc1e23bc8  powwow-1.2.16.tar.gz


--- import.log DELETED ---


--- powwow-long-prompt.patch DELETED ---



From kalev at fedoraproject.org  Tue Sep  1 20:49:18 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue,  1 Sep 2009 20:49:18 +0000 (UTC)
Subject: rpms/powwow/F-11 .cvsignore, 1.3, 1.4 powwow.spec, 1.4, 1.5 sources,
	1.3, 1.4 import.log, 1.1, NONE powwow-long-prompt.patch, 1.2, NONE
Message-ID: <20090901204918.A789B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13256

Modified Files:
	.cvsignore powwow.spec sources 
Removed Files:
	import.log powwow-long-prompt.patch 
Log Message:
1.2.16-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 May 2009 22:48:35 -0000	1.3
+++ .cvsignore	1 Sep 2009 20:49:18 -0000	1.4
@@ -1 +1 @@
-powwow-1.2.15.tar.gz
+powwow-1.2.16.tar.gz


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/powwow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- powwow.spec	7 Aug 2009 10:03:12 -0000	1.4
+++ powwow.spec	1 Sep 2009 20:49:18 -0000	1.5
@@ -1,15 +1,12 @@
 Name:           powwow
-Version:        1.2.15
-Release:        3%{?dist}
+Version:        1.2.16
+Release:        1%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
-# Match prompts longer than terminal width
-# https://bugzilla.redhat.com/show_bug.cgi?id=509288
-Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -34,8 +31,6 @@ for developing applications which use po
 %prep
 %setup -q
 
-%patch0 -p1 -b .long-prompt
-
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,11 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc Hacking README.modules TODO
+%doc Hacking plugtest.c README.modules TODO
 %{_includedir}/powwow/
 
 
 %changelog
+* Tue Sep 01 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.16-1
+- Update to powwow 1.2.16.
+- Dropped upstreamed powwow-long-prompt.patch.
+- Added a plugin example to -devel docs.
+
 * Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-3
 - Update powwow-long-prompt.patch to the version sent upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 May 2009 22:48:35 -0000	1.3
+++ sources	1 Sep 2009 20:49:18 -0000	1.4
@@ -1 +1 @@
-1eaaf6d601fb1e1b9ce4f4e69f31872b  powwow-1.2.15.tar.gz
+f1cbcccd4a4a166c164495ffc1e23bc8  powwow-1.2.16.tar.gz


--- import.log DELETED ---


--- powwow-long-prompt.patch DELETED ---



From ausil at fedoraproject.org  Tue Sep  1 20:51:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Sep 2009 20:51:30 +0000 (UTC)
Subject: rpms/ctemplate/devel ctemplate.spec,1.8,1.9
Message-ID: <20090901205130.3CFB311C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13741

Modified Files:
	ctemplate.spec 
Log Message:
make sure the namespace is ctemplate not google
clean up spec



Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ctemplate.spec	5 Aug 2009 18:53:50 -0000	1.8
+++ ctemplate.spec	1 Sep 2009 20:51:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           ctemplate
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -8,7 +8,6 @@ License:        BSD
 URL:            http://code.google.com/p/google-ctemplate/
 Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         ctemplate-0.93.consts.patch
-#Patch1:         ctemplate-0.93.bswap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  chrpath, python
 
@@ -31,7 +30,6 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .const
 chmod 644 src/template_string.cc
-#%patch1 -p1 -b .bswap
 
 %build
 %configure --disable-static
@@ -54,8 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
-#mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/
-sed -i -e 's|^#include <google|#include <ctemplate|g' $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h
+sed -i -e 's|google|ctemplate|g' $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -93,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Tue Sep 01 2009 Dennis Gilmore <dennis at ausil.us> - 0.95-2
+- make sure that the namespace is ctemplate not google
+
 * Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.95-1
 - Updated to ctemplate
 



From kalev at fedoraproject.org  Tue Sep  1 20:51:33 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue,  1 Sep 2009 20:51:33 +0000 (UTC)
Subject: rpms/powwow/F-10 .cvsignore, 1.3, 1.4 powwow.spec, 1.4, 1.5 sources,
	1.3, 1.4 import.log, 1.1, NONE powwow-long-prompt.patch, 1.2, NONE
Message-ID: <20090901205133.CE33011C00EF@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13835

Modified Files:
	.cvsignore powwow.spec sources 
Removed Files:
	import.log powwow-long-prompt.patch 
Log Message:
1.2.16-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 May 2009 22:52:08 -0000	1.3
+++ .cvsignore	1 Sep 2009 20:51:33 -0000	1.4
@@ -1 +1 @@
-powwow-1.2.15.tar.gz
+powwow-1.2.16.tar.gz


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/powwow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- powwow.spec	7 Aug 2009 10:03:12 -0000	1.4
+++ powwow.spec	1 Sep 2009 20:51:33 -0000	1.5
@@ -1,15 +1,12 @@
 Name:           powwow
-Version:        1.2.15
-Release:        3%{?dist}
+Version:        1.2.16
+Release:        1%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
-# Match prompts longer than terminal width
-# https://bugzilla.redhat.com/show_bug.cgi?id=509288
-Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -34,8 +31,6 @@ for developing applications which use po
 %prep
 %setup -q
 
-%patch0 -p1 -b .long-prompt
-
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,11 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc Hacking README.modules TODO
+%doc Hacking plugtest.c README.modules TODO
 %{_includedir}/powwow/
 
 
 %changelog
+* Tue Sep 01 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.16-1
+- Update to powwow 1.2.16.
+- Dropped upstreamed powwow-long-prompt.patch.
+- Added a plugin example to -devel docs.
+
 * Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-3
 - Update powwow-long-prompt.patch to the version sent upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 May 2009 22:52:08 -0000	1.3
+++ sources	1 Sep 2009 20:51:33 -0000	1.4
@@ -1 +1 @@
-1eaaf6d601fb1e1b9ce4f4e69f31872b  powwow-1.2.15.tar.gz
+f1cbcccd4a4a166c164495ffc1e23bc8  powwow-1.2.16.tar.gz


--- import.log DELETED ---


--- powwow-long-prompt.patch DELETED ---



From sandeen at fedoraproject.org  Tue Sep  1 20:56:52 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  1 Sep 2009 20:56:52 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-xfs-radix-tree-fix.patch, NONE,
	1.1.2.1 kernel.spec, 1.1679.2.20, 1.1679.2.21
Message-ID: <20090901205652.D862C11C00EF@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15154

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-xfs-radix-tree-fix.patch 
Log Message:
* Tue Sep 01 2009 Eric Sandeen <sandeen at redhat.com>
- Fix NFS vs. XFS oops (#502236)


linux-2.6-xfs-radix-tree-fix.patch:
 fs/inode.c         |   38 ++++++++------
 fs/xfs/xfs_iget.c  |  140 +++++++++++++++++++++++++++--------------------------
 fs/xfs/xfs_inode.h |   17 ------
 fs/xfs/xfs_log.c   |    2 
 include/linux/fs.h |    3 -
 5 files changed, 99 insertions(+), 101 deletions(-)

--- NEW FILE linux-2.6-xfs-radix-tree-fix.patch ---
commit 54e346215e4fe2ca8c94c54e546cc61902060510
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri Aug 7 14:38:25 2009 -0300

    vfs: fix inode_init_always calling convention

    Currently inode_init_always calls into ->destroy_inode if the additional
    initialization fails.  That's not only counter-intuitive because
    inode_init_always did not allocate the inode structure, but in case of
    XFS it's actively harmful as ->destroy_inode might delete the inode from
    a radix-tree that has never been added.  This in turn might end up
    deleting the inode for the same inum that has been instanciated by
    another process and cause lots of cause subtile problems.

    Also in the case of re-initializing a reclaimable inode in XFS it would
    free an inode we still want to keep alive.

    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net>

commit 2e00c97e2c1d2ffc9e26252ca26b237678b0b772
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri Aug 7 14:38:29 2009 -0300

    vfs: add __destroy_inode

    When we want to tear down an inode that lost the add to the cache race
    in XFS we must not call into ->destroy_inode because that would delete
    the inode that won the race from the inode cache radix tree.
    
    This patch provides the __destroy_inode helper needed to fix this,
    the actual fix will be in th next patch.  As XFS was the only reason
    destroy_inode was exported we shift the export to the new __destroy_inode.

    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net>

commit b36ec0428a06fcbdb67d61e9e664154e5dd9a8c7
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri Aug 7 14:38:34 2009 -0300

    xfs: fix freeing of inodes not yet added to the inode cache

    When freeing an inode that lost race getting added to the inode cache we
    must not call into ->destroy_inode, because that would delete the inode
    that won the race from the inode cache radix tree.
    
    This patch uses splits a new xfs_inode_free helper out of xfs_ireclaim
    and uses that plus __destroy_inode to make sure we really only free
    the memory allocted for the inode that lost the race, and not mess with
    the inode cache state.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net>
    Reported-by: Alex Samad <alex at samad.com.au>
    Reported-by: Andrew Randrianasulu <randrik at mail.ru>
    Reported-by: Stephane <sharnois at max-t.com>
    Reported-by: Tommy <tommy at news-service.com>
    Reported-by: Miah Gregory <mace at darksilence.net>
    Reported-by: Gabriel Barazer <gabriel at oxeva.fr>
    Reported-by: Leandro Lucarella <llucax at gmail.com>
    Reported-by: Daniel Burr <dburr at fami.com.au>
    Reported-by: Nickolay <newmail at spaces.ru>
    Reported-by: Michael Guntsche <mike at it-loops.com>
    Reported-by: Dan Carley <dan.carley+linuxkern-bugs at gmail.com>
    Reported-by: Michael Ole Olsen <gnu at gmx.net>
    Reported-by: Michael Weissenbacher <mw at dermichi.com>
    Reported-by: Martin Spott <Martin.Spott at mgras.net>
    Reported-by: Christian Kujau <lists at nerdbynature.de>
    Tested-by: Michael Guntsche <mike at it-loops.com>
    Tested-by: Dan Carley <dan.carley+linuxkern-bugs at gmail.com>
    Tested-by: Christian Kujau <lists at nerdbynature.de>

commit a8914f3a6d72c97328597a556a99daaf5cc288ae
Author: Christoph Hellwig <hch at lst.de>
Date:   Mon Aug 10 11:32:44 2009 -0300

    xfs: fix spin_is_locked assert on uni-processor builds

    Without SMP or preemption spin_is_locked always returns false,
    so we can't do an assert with it.  Instead use assert_spin_locked,
    which does the right thing on all builds.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net> 
    Reported-by: Johannes Engel <jcnengel at googlemail.com> 
    Tested-by: Johannes Engel <jcnengel at googlemail.com>
    Signed-off-by: Felix Blyakher <felixb at sgi.com>

Index: linux-2.6.29.noarch/fs/inode.c
===================================================================
--- linux-2.6.29.noarch.orig/fs/inode.c
+++ linux-2.6.29.noarch/fs/inode.c
@@ -117,7 +117,7 @@ static void wake_up_inode(struct inode *
  * These are initializations that need to be done on every inode
  * allocation as the fields are not initialised by slab allocation.
  */
-struct inode *inode_init_always(struct super_block *sb, struct inode *inode)
+int inode_init_always(struct super_block *sb, struct inode *inode)
 {
 	static const struct address_space_operations empty_aops;
 	static struct inode_operations empty_iops;
@@ -147,13 +147,8 @@ struct inode *inode_init_always(struct s
 	inode->i_cdev = NULL;
 	inode->i_rdev = 0;
 	inode->dirtied_when = 0;
-	if (security_inode_alloc(inode)) {
-		if (inode->i_sb->s_op->destroy_inode)
-			inode->i_sb->s_op->destroy_inode(inode);
-		else
-			kmem_cache_free(inode_cachep, (inode));
-		return NULL;
-	}
+	if (security_inode_alloc(inode))
+		return -ENOMEM;
 
 	spin_lock_init(&inode->i_lock);
 	lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
@@ -188,7 +183,7 @@ struct inode *inode_init_always(struct s
 	inode->i_private = NULL;
 	inode->i_mapping = mapping;
 
-	return inode;
+	return 0;
 }
 EXPORT_SYMBOL(inode_init_always);
 
@@ -201,22 +196,35 @@ static struct inode *alloc_inode(struct 
 	else
 		inode = kmem_cache_alloc(inode_cachep, GFP_KERNEL);
 
-	if (inode)
-		return inode_init_always(sb, inode);
-	return NULL;
+	if (!inode)
+		return NULL;
+
+	if (unlikely(inode_init_always(sb, inode))) {
+		if (inode->i_sb->s_op->destroy_inode)
+			inode->i_sb->s_op->destroy_inode(inode);
+		else
+			kmem_cache_free(inode_cachep, inode);
+		return NULL;
+	}
+
+	return inode;
 }
 
-void destroy_inode(struct inode *inode) 
+void __destroy_inode(struct inode *inode)
 {
 	BUG_ON(inode_has_buffers(inode));
 	security_inode_free(inode);
+}
+EXPORT_SYMBOL(__destroy_inode);
+
+void destroy_inode(struct inode *inode)
+{
+	__destroy_inode(inode);
 	if (inode->i_sb->s_op->destroy_inode)
 		inode->i_sb->s_op->destroy_inode(inode);
 	else
 		kmem_cache_free(inode_cachep, (inode));
 }
-EXPORT_SYMBOL(destroy_inode);
-
 
 /*
  * These are initializations that only need to be done
Index: linux-2.6.29.noarch/fs/xfs/xfs_iget.c
===================================================================
--- linux-2.6.29.noarch.orig/fs/xfs/xfs_iget.c
+++ linux-2.6.29.noarch/fs/xfs/xfs_iget.c
@@ -63,21 +63,16 @@ xfs_inode_alloc(
 	ip = kmem_zone_alloc(xfs_inode_zone, KM_SLEEP);
 	if (!ip)
 		return NULL;
+	if (inode_init_always(mp->m_super, VFS_I(ip))) {
+		kmem_zone_free(xfs_inode_zone, ip);
+		return NULL;
+	}
 
 	ASSERT(atomic_read(&ip->i_iocount) == 0);
 	ASSERT(atomic_read(&ip->i_pincount) == 0);
 	ASSERT(!spin_is_locked(&ip->i_flags_lock));
 	ASSERT(completion_done(&ip->i_flush));
 
-	/*
-	 * initialise the VFS inode here to get failures
-	 * out of the way early.
-	 */
-	if (!inode_init_always(mp->m_super, VFS_I(ip))) {
-		kmem_zone_free(xfs_inode_zone, ip);
-		return NULL;
-	}
-
 	/* initialise the xfs inode */
 	ip->i_ino = ino;
 	ip->i_mount = mp;
@@ -117,6 +112,71 @@ xfs_inode_alloc(
 	return ip;
 }
 
+STATIC void
+xfs_inode_free(
+	struct xfs_inode	*ip)
+{
+	switch (ip->i_d.di_mode & S_IFMT) {
+	case S_IFREG:
+	case S_IFDIR:
+	case S_IFLNK:
+		xfs_idestroy_fork(ip, XFS_DATA_FORK);
+		break;
+	}
+
+	if (ip->i_afp)
+		xfs_idestroy_fork(ip, XFS_ATTR_FORK);
+
+#ifdef XFS_INODE_TRACE
+	ktrace_free(ip->i_trace);
+#endif
+#ifdef XFS_BMAP_TRACE
+	ktrace_free(ip->i_xtrace);
+#endif
+#ifdef XFS_BTREE_TRACE
+	ktrace_free(ip->i_btrace);
+#endif
+#ifdef XFS_RW_TRACE
+	ktrace_free(ip->i_rwtrace);
+#endif
+#ifdef XFS_ILOCK_TRACE
+	ktrace_free(ip->i_lock_trace);
+#endif
+#ifdef XFS_DIR2_TRACE
+	ktrace_free(ip->i_dir_trace);
+#endif
+
+	if (ip->i_itemp) {
+		/*
+		 * Only if we are shutting down the fs will we see an
+		 * inode still in the AIL. If it is there, we should remove
+		 * it to prevent a use-after-free from occurring.
+		 */
+		xfs_log_item_t	*lip = &ip->i_itemp->ili_item;
+		struct xfs_ail	*ailp = lip->li_ailp;
+
+		ASSERT(((lip->li_flags & XFS_LI_IN_AIL) == 0) ||
+				       XFS_FORCED_SHUTDOWN(ip->i_mount));
+		if (lip->li_flags & XFS_LI_IN_AIL) {
+			spin_lock(&ailp->xa_lock);
+			if (lip->li_flags & XFS_LI_IN_AIL)
+				xfs_trans_ail_delete(ailp, lip);
+			else
+				spin_unlock(&ailp->xa_lock);
+		}
+		xfs_inode_item_destroy(ip);
+		ip->i_itemp = NULL;
+	}
+
+	/* asserts to verify all state is correct here */
+	ASSERT(atomic_read(&ip->i_iocount) == 0);
+	ASSERT(atomic_read(&ip->i_pincount) == 0);
+	ASSERT(!spin_is_locked(&ip->i_flags_lock));
+	ASSERT(completion_done(&ip->i_flush));
+
+	kmem_zone_free(xfs_inode_zone, ip);
+}
+
 /*
  * Check the validity of the inode we just found it the cache
  */
@@ -161,7 +221,7 @@ xfs_iget_cache_hit(
 		 * errors cleanly, then tag it so it can be set up correctly
 		 * later.
 		 */
-		if (!inode_init_always(mp->m_super, VFS_I(ip))) {
+		if (inode_init_always(mp->m_super, VFS_I(ip))) {
 			error = ENOMEM;
 			goto out_error;
 		}
@@ -293,7 +353,8 @@ out_preload_end:
 	if (lock_flags)
 		xfs_iunlock(ip, lock_flags);
 out_destroy:
-	xfs_destroy_inode(ip);
+	__destroy_inode(VFS_I(ip));
+	xfs_inode_free(ip);
 	return error;
 }
 
@@ -501,62 +562,7 @@ xfs_ireclaim(
 	XFS_QM_DQDETACH(ip->i_mount, ip);
 	xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
 
-	switch (ip->i_d.di_mode & S_IFMT) {
-	case S_IFREG:
-	case S_IFDIR:
-	case S_IFLNK:
-		xfs_idestroy_fork(ip, XFS_DATA_FORK);
-		break;
-	}
-
-	if (ip->i_afp)
-		xfs_idestroy_fork(ip, XFS_ATTR_FORK);
-
-#ifdef XFS_INODE_TRACE
-	ktrace_free(ip->i_trace);
-#endif
-#ifdef XFS_BMAP_TRACE
-	ktrace_free(ip->i_xtrace);
-#endif
-#ifdef XFS_BTREE_TRACE
-	ktrace_free(ip->i_btrace);
-#endif
-#ifdef XFS_RW_TRACE
-	ktrace_free(ip->i_rwtrace);
-#endif
-#ifdef XFS_ILOCK_TRACE
-	ktrace_free(ip->i_lock_trace);
-#endif
-#ifdef XFS_DIR2_TRACE
-	ktrace_free(ip->i_dir_trace);
-#endif
-	if (ip->i_itemp) {
-		/*
-		 * Only if we are shutting down the fs will we see an
-		 * inode still in the AIL. If it is there, we should remove
-		 * it to prevent a use-after-free from occurring.
-		 */
-		xfs_log_item_t	*lip = &ip->i_itemp->ili_item;
-		struct xfs_ail	*ailp = lip->li_ailp;
-
-		ASSERT(((lip->li_flags & XFS_LI_IN_AIL) == 0) ||
-				       XFS_FORCED_SHUTDOWN(ip->i_mount));
-		if (lip->li_flags & XFS_LI_IN_AIL) {
-			spin_lock(&ailp->xa_lock);
-			if (lip->li_flags & XFS_LI_IN_AIL)
-				xfs_trans_ail_delete(ailp, lip);
-			else
-				spin_unlock(&ailp->xa_lock);
-		}
-		xfs_inode_item_destroy(ip);
-		ip->i_itemp = NULL;
-	}
-	/* asserts to verify all state is correct here */
-	ASSERT(atomic_read(&ip->i_iocount) == 0);
-	ASSERT(atomic_read(&ip->i_pincount) == 0);
-	ASSERT(!spin_is_locked(&ip->i_flags_lock));
-	ASSERT(completion_done(&ip->i_flush));
-	kmem_zone_free(xfs_inode_zone, ip);
+	xfs_inode_free(ip);
 }
 
 /*
Index: linux-2.6.29.noarch/include/linux/fs.h
===================================================================
--- linux-2.6.29.noarch.orig/include/linux/fs.h
+++ linux-2.6.29.noarch/include/linux/fs.h
@@ -1906,7 +1906,7 @@ extern loff_t default_llseek(struct file
 
 extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin);
 
-extern struct inode * inode_init_always(struct super_block *, struct inode *);
+extern int inode_init_always(struct super_block *, struct inode *);
 extern void inode_init_once(struct inode *);
 extern void inode_add_to_lists(struct super_block *, struct inode *);
 extern void iput(struct inode *);
@@ -1933,6 +1933,7 @@ extern void __iget(struct inode * inode)
 extern void iget_failed(struct inode *);
 extern void clear_inode(struct inode *);
 extern void destroy_inode(struct inode *);
+extern void __destroy_inode(struct inode *);
 extern struct inode *new_inode(struct super_block *);
 extern int should_remove_suid(struct dentry *);
 extern int file_remove_suid(struct file *);
Index: linux-2.6.29.noarch/fs/xfs/xfs_inode.h
===================================================================
--- linux-2.6.29.noarch.orig/fs/xfs/xfs_inode.h
+++ linux-2.6.29.noarch/fs/xfs/xfs_inode.h
@@ -309,23 +309,6 @@ static inline struct inode *VFS_I(struct
 }
 
 /*
- * Get rid of a partially initialized inode.
- *
- * We have to go through destroy_inode to make sure allocations
- * from init_inode_always like the security data are undone.
- *
- * We mark the inode bad so that it takes the short cut in
- * the reclaim path instead of going through the flush path
- * which doesn't make sense for an inode that has never seen the
- * light of day.
- */
-static inline void xfs_destroy_inode(struct xfs_inode *ip)
-{
-	make_bad_inode(VFS_I(ip));
-	return destroy_inode(VFS_I(ip));
-}
-
-/*
  * i_flags helper functions
  */
 static inline void
Index: linux-2.6.29.noarch/fs/xfs/xfs_log.c
===================================================================
--- linux-2.6.29.noarch.orig/fs/xfs/xfs_log.c
+++ linux-2.6.29.noarch/fs/xfs/xfs_log.c
@@ -3195,7 +3195,7 @@ try_again:
 STATIC void
 xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog)
 {
-	ASSERT(spin_is_locked(&log->l_icloglock));
+	assert_spin_locked(&log->l_icloglock);
 
 	if (iclog->ic_state == XLOG_STATE_ACTIVE) {
 		xlog_state_switch_iclogs(log, iclog, 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.20
retrieving revision 1.1679.2.21
diff -u -p -r1.1679.2.20 -r1.1679.2.21
--- kernel.spec	31 Aug 2009 19:31:16 -0000	1.1679.2.20
+++ kernel.spec	1 Sep 2009 20:56:52 -0000	1.1679.2.21
@@ -775,6 +775,7 @@ Patch3000: linux-2.6-btrfs-unstable-upda
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 Patch3030: linux-2.6-ecryptfs-overflow-fixes.patch
+Patch3031: linux-2.6-xfs-radix-tree-fix.patch
 
 Patch5000: linux-2.6-add-qcserial.patch
 
@@ -1296,6 +1297,7 @@ ApplyPatch linux-2.6-execshield.patch
 # ext4
 
 # xfs
+ApplyPatch linux-2.6-xfs-radix-tree-fix.patch
 
 # btrfs
 ApplyPatch linux-2.6-btrfs-unstable-update.patch
@@ -2186,6 +2188,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Eric Sandeen <sandeen at redhat.com>
+- Fix NFS vs. XFS oops (#502236)
+
 * Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
 - Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
 



From ajax at fedoraproject.org  Tue Sep  1 21:14:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  1 Sep 2009 21:14:08 +0000 (UTC)
Subject: rpms/kernel/devel drm-god-shut-up-about-edid-already.patch, NONE,
	1.1 kernel.spec, 1.1758, 1.1759
Message-ID: <20090901211408.EA81911C00EF@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18942

Modified Files:
	kernel.spec 
Added Files:
	drm-god-shut-up-about-edid-already.patch 
Log Message:
* Tue Sep 01 2009 Adam Jackson <ajax at redhat.com>
- Make DRM less chatty about EDID failures.  No one cares.


drm-god-shut-up-about-edid-already.patch:
 drm_edid.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE drm-god-shut-up-about-edid-already.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c.jx	2009-09-01 17:06:43.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c	2009-09-01 17:10:28.000000000 -0400
@@ -630,7 +630,6 @@ int drm_do_probe_ddc_edid(struct i2c_ada
 	if (i2c_transfer(adapter, msgs, 2) == 2)
 		return 0;
 
-	dev_info(&adapter->dev, "unable to read EDID block.\n");
 	return -1;
 }
 EXPORT_SYMBOL(drm_do_probe_ddc_edid);
@@ -643,8 +642,6 @@ static int drm_ddc_read_edid(struct drm_
 
 	ret = drm_do_probe_ddc_edid(adapter, buf, len);
 	if (ret != 0) {
-		dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
-			 drm_get_connector_name(connector));
 		goto end;
 	}
 	if (!edid_is_valid((struct edid *)buf)) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -p -r1.1758 -r1.1759
--- kernel.spec	1 Sep 2009 17:08:26 -0000	1.1758
+++ kernel.spec	1 Sep 2009 21:14:08 -0000	1.1759
@@ -691,6 +691,7 @@ Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
 Patch1827: drm-rv710-ucode-fix.patch
+Patch1828: drm-god-shut-up-about-edid-already.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1309,6 +1310,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
 ApplyPatch drm-rv710-ucode-fix.patch
+ApplyPatch drm-god-shut-up-about-edid-already.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2005,6 +2007,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Adam Jackson <ajax at redhat.com>
+- Make DRM less chatty about EDID failures.  No one cares.
+
 * Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc8-git2
 - Blank out drm-intel-next: entire contents are now upstream.



From scop at fedoraproject.org  Tue Sep  1 21:14:25 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  1 Sep 2009 21:14:25 +0000 (UTC)
Subject: rpms/vdr-skins/devel Aluminium-1.0-demo-fonts.patch, NONE,
	1.1 enigma-0.3a-fonts.patch, NONE,
	1.1 izegrey16-1.0-20050304-fonts.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 vdr-skins-prepare-tarballs.sh, 1.2,
	1.3 vdr-skins.spec, 1.13, 1.14
Message-ID: <20090901211425.B296711C00EF@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19085

Modified Files:
	.cvsignore sources vdr-skins-prepare-tarballs.sh 
	vdr-skins.spec 
Added Files:
	Aluminium-1.0-demo-fonts.patch enigma-0.3a-fonts.patch 
	izegrey16-1.0-20050304-fonts.patch 
Log Message:
* Tue Sep  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090901-1
- Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey
  font handling (no longer filename based font paths, phew).
- Add EgalsTry 1.1.0.
- Apply Thomas G?nther's locale patches for DeepBlue, enElchi, and Enigma.
- Drop unused SilverGreen themes, install default properly.
- Recompress cleaned up tarballs with xz.
- Hardlink identical files.


Aluminium-1.0-demo-fonts.patch:
 Aluminium.skin |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Aluminium-1.0-demo-fonts.patch ---
diff -up Aluminium/Aluminium.skin~ Aluminium/Aluminium.skin
--- Aluminium/Aluminium.skin~	2004-12-08 20:45:13.000000000 +0200
+++ Aluminium/Aluminium.skin	2009-07-13 00:04:06.000000000 +0300
@@ -155,7 +155,7 @@
 			<text x1="24" x2="593" y1="102" y2="129" color="#AF80ff00">{PresentTitle}</text>
 			<text x1="24" x2="419" y1="62" y2="91" color="#AFFFFF00" font="Osd">{PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}</text>
 			<text x1="420" x2="539" y1="62" y2="91" color="#AFFFFF00" font="Osd" condition="{PresentVPSDateTime}">VPS: {PresentVPSDateTime:%H\:%M}</text>
-			<scrolltext x1="24" y1="138" y2="-72" x2="583" font="helmetr.ttf:20" color="#AFFFFF00">
+			<scrolltext x1="24" y1="138" y2="-72" x2="583" font="Sans Serif at 20" color="#AFFFFF00">
 {PresentShortText}
 {PresentDescription}
       </scrolltext> <!-- Notice how whitespace is handled: The newline between the two tokens is recognized 
@@ -171,7 +171,7 @@
 		</block>
 		
 		<block condition="{MenuText}">
-			<scrolltext x1="24" y1="62" y2="-72" x2="583" font="helmetr.ttf:20" color="#AFFFFF00">{MenuText}</scrolltext>
+			<scrolltext x1="24" y1="62" y2="-72" x2="583" font="Sans Serif at 20" color="#AFFFFF00">{MenuText}</scrolltext>
 			<image x="585" y="138" condition="{CanScrollUp}" path="symbols/arrowup.xpm" color="#AFFFFF00" bgColor="#8F2B1B9E"/>
 			<image x="585" y="-96" condition="{CanScrollDown}" path="symbols/arrowdown.xpm" color="#AFFFFF00" bgColor="#8F2B1B9E"/>
 			<scrollbar x1="585" x2="608" y1="162" y2="-110" color="#AFFFFF00" bgColor="#8F2B1B9E"/>

enigma-0.3a-fonts.patch:
 Enigma.skin |  262 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 131 insertions(+), 131 deletions(-)

--- NEW FILE enigma-0.3a-fonts.patch ---
diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin
--- Enigma/Enigma.skin~	2009-07-13 00:07:10.000000000 +0300
+++ Enigma/Enigma.skin	2009-07-13 00:08:26.000000000 +0300
@@ -55,16 +55,16 @@
 			<rectangle x1="107" x2="-1" y1="-128" y2="-125" color="TopBG"/>
 			
 			<!-- channel-info -->
-			<text x1="110" x2="182" y1="-159" y2="-124" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
-			<text x1="107" x2="179" y1="-160" y2="-125" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
-			<text x1="186" x2="-5" y1="-159" y2="-124" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
-			<text x1="183" x2="-8" y1="-160" y2="-125" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
+			<text x1="110" x2="182" y1="-159" y2="-124" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+			<text x1="107" x2="179" y1="-160" y2="-125" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+			<text x1="186" x2="-5" y1="-159" y2="-124" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+			<text x1="183" x2="-8" y1="-160" y2="-125" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
 			
 			<!-- EPG-date "now" -->
 			<rectangle x1="107" x2="-1" y1="-120" y2="-78" color="ChEpgNowBG"/>
 
 			<block condition="or({PresentHasTimer},{PresentHasVPS})">
-				<text x1="107" x2="182" y1="-122" y2="-78" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{PresentStartDateTime:%H\:%M}</text>
+				<text x1="107" x2="182" y1="-122" y2="-78" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%H\:%M}</text>
 				
 				<image condition="and({PresentHasTimer},{PresentHasVPS})" x="115" y="-98" color="SymRecActive" bgColor="ChEpgNowBG" path="symbols/recording.xpm"/>
 				<image condition="and({PresentHasTimer},{PresentHasVPS})" x="144" y="-98" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
@@ -72,25 +72,25 @@
 				<image condition="and(not({PresentHasTimer}),{PresentHasVPS})" x="129" y="-98" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
 			</block>
 			<block condition="not(or({PresentHasTimer},{PresentHasVPS}))">
-				<text x1="107" x2="182" y1="-112" y2="-78" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{PresentStartDateTime:%H\:%M}</text>
+				<text x1="107" x2="182" y1="-112" y2="-78" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%H\:%M}</text>
 			</block>
 			
 			<block condition="not({PresentShortText})">
-				<text x1="183" x2="-65" y1="-112" y2="-78" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{PresentTitle}</text>
+				<text x1="183" x2="-65" y1="-112" y2="-78" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{PresentTitle}</text>
 			</block>
 			<block condition="{PresentShortText}">
-				<text x1="183" x2="-65" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{PresentTitle}</text>
-				<text x1="183" x2="-65" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="left" font="Font.ttf:20,85">{PresentShortText}</text>
+				<text x1="183" x2="-65" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{PresentTitle}</text>
+				<text x1="183" x2="-65" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="left" font="Sans Serif at 20,85">{PresentShortText}</text>
 			</block>
 			
-			<text x1="-60" x2="-5" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="right" font="Font.ttf:20,85">{PresentDuration:%m}'</text>
-			<text x1="-60" x2="-5" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="right" font="Font.ttf:20,85">+{PresentRemaining:%m}'</text>
+			<text x1="-60" x2="-5" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="right" font="Sans Serif at 20,85">{PresentDuration:%m}'</text>
+			<text x1="-60" x2="-5" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="right" font="Sans Serif at 20,85">+{PresentRemaining:%m}'</text>
 			
 			<!-- EPG-date "next" -->
 			<rectangle x1="107" x2="-1" y1="-73" y2="-31" color="ChEpgNxtBG"/>
 
 			<block condition="or({FollowingHasTimer},{FollowingHasVPS})">
-				<text x1="107" x2="182" y1="-75" y2="-31" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{FollowingStartDateTime:%H\:%M}</text>
+				<text x1="107" x2="182" y1="-75" y2="-31" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{FollowingStartDateTime:%H\:%M}</text>
 				
 				<image condition="and({FollowingHasTimer},{FollowingHasVPS})" x="115" y="-51" color="SymTimActive" bgColor="ChEpgNxtBG" path="symbols/timer.xpm"/>
 				<image condition="and({FollowingHasTimer},{FollowingHasVPS})" x="144" y="-51" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
@@ -98,18 +98,18 @@
 				<image condition="and(not({FollowingHasTimer}),{FollowingHasVPS})" x="129" y="-51" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>			
 			</block>
 			<block condition="not(or({FollowingHasTimer},{FollowingHasVPS}))">
-				<text x1="107" x2="182" y1="-65" y2="-31" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{FollowingStartDateTime:%H\:%M}</text>
+				<text x1="107" x2="182" y1="-65" y2="-31" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{FollowingStartDateTime:%H\:%M}</text>
 			</block>
 			
 			<block condition="not({FollowingShortText})">
-				<text x1="183" x2="-65" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{FollowingTitle}</text>
+				<text x1="183" x2="-65" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{FollowingTitle}</text>
 			</block>
 			<block condition="{FollowingShortText}">
-				<text x1="183" x2="-65" y1="-75" y2="-55" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{FollowingTitle}</text>
-				<text x1="183" x2="-65" y1="-54" y2="-31" color="ChEpgTxtShortInfoFG" align="left" font="Font.ttf:20,85">{FollowingShortText}</text>
+				<text x1="183" x2="-65" y1="-75" y2="-55" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{FollowingTitle}</text>
+				<text x1="183" x2="-65" y1="-54" y2="-31" color="ChEpgTxtShortInfoFG" align="left" font="Sans Serif at 20,85">{FollowingShortText}</text>
 			</block>
 			
-			<text x1="-60" x2="-5" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="right" font="Font.ttf:20,85">{FollowingDuration:%m}'</text>
+			<text x1="-60" x2="-5" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="right" font="Sans Serif at 20,85">{FollowingDuration:%m}'</text>
 			
 			<!-- bottom info-line -->
 			<ellipse x1="107" x2="116" y1="-10" y2="-1" arc="3" color="BotBG"/>
@@ -117,8 +117,8 @@
 			<rectangle x1="107" x2="-1" y1="-26" y2="-11" color="BotBG"/>		<rectangle x1="117" x2="-11" y1="-10" y2="-1" color="BotBG"/>
 			
 			<!-- date / time -->
-			<text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-			<text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+			<text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+			<text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 
 			<!-- progress-bar (if there are further audio-infos) -->
 			<block condition="and({PresentProgress},or(ne({AudioTrack},''),equal({AudioChannel},'left'),equal({AudioChannel},'right')))">
@@ -156,9 +156,9 @@
 			<image condition="not({ChannelHasMultilang})" x="-177" y="-22" color="BotBG" bgColor="SymInactive" path="symbols/multilingual.xpm"/>
 			
 			<!-- selected Language -->
-			<marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
-			<marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack}</marquee>
-			<marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioChannel} channel</marquee>
+			<marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
+			<marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack}</marquee>
+			<marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioChannel} channel</marquee>
 		</block>
 	
 		
@@ -179,16 +179,16 @@
 			<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/>		<rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
 			
 			<!-- date / time -->
-			<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-			<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+			<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+			<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 
 			<!-- no EPG-data-view -->
 			<block condition="{ChannelNumber}">
 				<!-- channel-info -->
-				<text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
-				<text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
-				<text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
-				<text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
+				<text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+				<text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+				<text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+				<text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
 				
 				<!-- icons -->
 				<image condition="{IsRecording}" x="-32" y="-52" color="SymRecActive" bgColor="BotTxtFG" path="symbols/recording.xpm"/>
@@ -210,15 +210,15 @@
 				<image condition="not({ChannelHasMultilang})" x="-177" y="-52" color="BotBG" bgColor="SymInactive" path="symbols/multilingual.xpm"/>
 				
 				<!-- selected Language -->
-				<marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
-				<marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack}</marquee>
-				<marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioChannel} channel</marquee>
+				<marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
+				<marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack}</marquee>
+				<marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioChannel} channel</marquee>
 			</block>
 
 			<!-- bouquets-view -->
 			<block condition="not({ChannelNumber})">			
-				<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
-				<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
+				<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+				<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
 			</block>
 		</block>
 		
@@ -232,8 +232,8 @@
 			<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
 			<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
 			
-			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		</block>
 	</display>
 
@@ -269,10 +269,10 @@
 		<!-- no EPG-data-view -->
 		<block condition="{ChannelNumber}">
 			<!-- channel-info -->
-			<text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
-			<text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
-			<text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
-			<text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
+			<text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+			<text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+			<text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+			<text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
 			
 			<!-- icons -->
 			<image condition="{IsRecording}" x="-32" y="-52" color="SymRecActive" bgColor="BotTxtFG" path="symbols/recording.xpm"/>
@@ -294,15 +294,15 @@
 			<image condition="not({ChannelHasMultilang})" x="-177" y="-52" color="BotBG" bgColor="SymInactive" path="symbols/multilingual.xpm"/>
 			
 			<!-- selected Language -->
-			<marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
-			<marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack}</marquee>
-			<marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioChannel} channel</marquee>
+			<marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
+			<marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack}</marquee>
+			<marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioChannel} channel</marquee>
 		</block>
 
 		<!-- bouquets-view -->
 		<block condition="not({ChannelNumber})">			
-			<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
-			<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
+			<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+			<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
 		</block>
 		
 		<!-- dummy-area -->
@@ -313,8 +313,8 @@
 		<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/>		<rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
 		
 		<!-- date / time -->
-		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 		
 		<!-- overlay messages -->
 		<block condition="{Message}">
@@ -326,8 +326,8 @@
 			<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
 			<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
 			
-			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		</block>
 	</display>
 
@@ -385,8 +385,8 @@
 		<rectangle x1="0" x2="-1" y1="-140" y2="-133" color="TopBG"/>
 		<rectangle x1="0" x2="-1" y1="-128" y2="-125" color="TopBG"/>		
 		
-		<text x1="8" x2="-1" y1="-159" y2="-124" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ReplayTitle}</text>
-		<text x1="5" x2="-4" y1="-160" y2="-125" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ReplayTitle}</text>
+		<text x1="8" x2="-1" y1="-159" y2="-124" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ReplayTitle}</text>
+		<text x1="5" x2="-4" y1="-160" y2="-125" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ReplayTitle}</text>
 		
 		<!-- flicker-protection -->
 		<rectangle x1="107" x2="107" y1="-107" y2="-107" color="RepBarMark"/>
@@ -409,9 +409,9 @@
 		
 		<!-- replay-position and replay-prompt -->
 		<rectangle x1="94" x2="-1" y1="-64" y2="-31" color="ChEpgNxtBG"/>
-		<text x1="98" x2="228" y1="-61" y2="-31" color="RepTxtFG" align="left" font="FontBold.ttf:20,85">{ReplayPosition}</text>
-		<text x1="-135" x2="-5" y1="-61" y2="-31" color="RepTxtFG" align="right" font="FontBold.ttf:20,85">{ReplayDuration}</text>
-		<text x1="229" x2="-136" y1="-61" y2="-31" color="RepTxtFG" align="center" font="Font.ttf:20,85">{ReplayPrompt}</text>
+		<text x1="98" x2="228" y1="-61" y2="-31" color="RepTxtFG" align="left" font="Sans Serif:Bold at 20,85">{ReplayPosition}</text>
+		<text x1="-135" x2="-5" y1="-61" y2="-31" color="RepTxtFG" align="right" font="Sans Serif:Bold at 20,85">{ReplayDuration}</text>
+		<text x1="229" x2="-136" y1="-61" y2="-31" color="RepTxtFG" align="center" font="Sans Serif at 20,85">{ReplayPrompt}</text>
 
 		<!-- bottom info-line -->
 		<ellipse x1="0" x2="9" y1="-10" y2="-1" arc="3" color="BotBG"/>
@@ -419,8 +419,8 @@
 		<rectangle x1="0" x2="-1" y1="-26" y2="-11" color="BotBG"/>		<rectangle x1="10" x2="-11" y1="-10" y2="-1" color="BotBG"/>
 		
 		<!-- date / time -->
-		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 			
 		<!-- overlay messages -->
 		<block condition="{Message}">
@@ -432,8 +432,8 @@
 			<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
 			<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
 			
-			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		</block>
 	</display>
 	
@@ -490,8 +490,8 @@
 			<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
 			<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
 			
-			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		</block>
 	</display>
 
@@ -518,12 +518,12 @@
 			
 			<!-- blink if there is less than 5h recording-time left and we are in the 'Main-Menu' -->
 			<block condition="or(gt({FreeDiskSpace},7725),{PresentTitle},{MenuText})">
-				<text x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</text>
-				<text x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</text>
+				<text x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</text>
+				<text x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</text>
 			</block>
 			<block condition="not(or(gt({FreeDiskSpace},7725),{PresentTitle},{MenuText}))">
-				<blink x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" delay="500" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</blink>
-				<blink x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" delay="500" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</blink>
+				<blink x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" delay="500" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</blink>
+				<blink x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" delay="500" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</blink>
 			</block>
 			
 			<!-- menu-area -->
@@ -620,11 +620,11 @@
 			
 			<!-- icons -->
 			<rectangle x1="-90" x2="-1" y1="0" y2="25" color="LogoBG"/>
-			<text x1="-87" x2="-1" y1="1" y2="31" color="TopTxtShad" align="center" font="FontBold.ttf:20,150">VDR</text>
-			<text x1="-90" x2="-4" y1="0" y2="30" color="TopTxtFG" align="center" font="FontBold.ttf:20,150">VDR</text>			
+			<text x1="-87" x2="-1" y1="1" y2="31" color="TopTxtShad" align="center" font="Sans Serif:Bold at 20,150">VDR</text>
+			<text x1="-90" x2="-4" y1="0" y2="30" color="TopTxtFG" align="center" font="Sans Serif:Bold at 20,150">VDR</text>			
 			
-			<text x1="8" x2="-100" y1="1" y2="31" color="TopTxtShad" align="left" font="FontBold.ttf:24,85">{MenuTitle}</text>
-			<text x1="5" x2="-103" y1="0" y2="30" color="TopTxtFG" align="left" font="FontBold.ttf:24,85">{MenuTitle}</text>
+			<text x1="8" x2="-100" y1="1" y2="31" color="TopTxtShad" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle}</text>
+			<text x1="5" x2="-103" y1="0" y2="30" color="TopTxtFG" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle}</text>
 		
 			<!-- menu-area -->
 			<rectangle x1="0" x2="-1" y1="30" y2="-31" color="MenuBG"/>
@@ -640,10 +640,10 @@
 				<!-- menu -->
 				<rectangle condition="{IsMenuCurrent}" x1="5" x2="-100" y1="2" y2="25" color="MenuHighlight"/>
 				<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
-				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
-				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
-				<marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
-				<marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+				<marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+				<marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
 			</list>		
 			
 			<!-- spared info-line -->
@@ -655,10 +655,10 @@
 				<!-- menu -->
 				<rectangle condition="{IsMenuCurrent}" x1="5" x2="-100" y1="2" y2="25" color="MenuHighlight"/>
 				<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
-				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
-				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
-				<marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
-				<marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+				<text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+				<marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+				<marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
 			</list>
 			
 		<!-- other menus -->
@@ -673,10 +673,10 @@
 				<!-- menu -->
 				<rectangle condition="{IsMenuCurrent}" x1="5" x2="-6" y1="2" y2="25" color="MenuHighlight"/>
 				<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
-				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
-				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
-				<marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
-				<marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+				<marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+				<marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
 			</list>
 			
 			<!-- spared info-line -->
@@ -690,10 +690,10 @@
 				<!-- menu -->
 				<rectangle condition="{IsMenuCurrent}" x1="5" x2="-6" y1="2" y2="25" color="MenuHighlight"/>
 				<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
-				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
-				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
-				<marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
-				<marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+				<text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+				<marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+				<marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
 			</list>
 
 		<!-- menu-area for extended EPG-info -->
@@ -703,11 +703,11 @@
 			
 			<!-- Title -->
 			<block condition="{PresentShortText}">
-				<marquee x1="10" x2="-98" y1="33" y2="63" font="FontBold.ttf:24,85" color="MenuTxtFG">{PresentTitle}</marquee>
-				<marquee x1="10" x2="-98" y1="63" y2="93" font="FontBold.ttf:22,85" color="MenuTxtFG">{PresentShortText}</marquee>
+				<marquee x1="10" x2="-98" y1="33" y2="63" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{PresentTitle}</marquee>
+				<marquee x1="10" x2="-98" y1="63" y2="93" font="Sans Serif:Bold at 22,85" color="MenuTxtFG">{PresentShortText}</marquee>
 			</block>
 			<block condition="not({PresentShortText})">
-				<marquee x1="10" x2="-98" y1="48" y2="78" font="FontBold.ttf:24,85" color="MenuTxtFG">{PresentTitle}</marquee>
+				<marquee x1="10" x2="-98" y1="48" y2="78" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{PresentTitle}</marquee>
 			</block>
 			
 			<!-- icon -->
@@ -718,13 +718,13 @@
 			<image condition="not({PresentIsRunning})" x="-33" y="100" color="MenuInfFG" bgColor="SymInactive" path="symbols/run.xpm"/>
 
 			<block condition="{PresentIsRunning}">			
-				<text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="FontBold.ttf:20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}')</text>
+				<text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}')</text>
 
 				<image condition="{PresentHasTimer}" x="-64" y="100" color="SymRecActive" bgColor="MenuBG" path="symbols/recording.xpm"/>
 				<image condition="not({PresentHasTimer})" x="-64" y="100" color="MenuInfFG" bgColor="SymInactive" path="symbols/recording.xpm"/>
 			</block>
 			<block condition="not({PresentIsRunning})">	
-				<text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="FontBold.ttf:20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}')</text>
+				<text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}')</text>
 			
 				<image condition="{PresentHasTimer}" x="-64" y="100" color="SymTimActive" bgColor="MenuBG" path="symbols/timer.xpm"/>
 				<image condition="not({PresentHasTimer})" x="-64" y="100" color="MenuInfFG" bgColor="SymInactive" path="symbols/timer.xpm"/>
@@ -734,10 +734,10 @@
 			<image condition="not({PresentHasVPS})" x="-93" y="100"
 			color="MenuInfFG" bgColor="SymInactive" path="symbols/vps.xpm"/>
 			
-			<text condition="{PresentHasVPS}" x1="-160" x2="-98" y1="94" y2="123" color="SymActive" align="right" font="FontBold.ttf:20,85">{PresentVPSDateTime:%H\:%M}</text>
+			<text condition="{PresentHasVPS}" x1="-160" x2="-98" y1="94" y2="123" color="SymActive" align="right" font="Sans Serif:Bold at 20,85">{PresentVPSDateTime:%H\:%M}</text>
 			
 			<!-- Description -->
-			<scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Font.ttf:22,85" color="MenuTxtFG">{PresentDescription}</scrolltext>
+			<scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Sans Serif at 22,85" color="MenuTxtFG">{PresentDescription}</scrolltext>
 		</block>
 
 		<!-- menu-area for Recording-info -->
@@ -747,25 +747,25 @@
 			
 			<!-- Title -->
 			<block condition="{RecordingShortText}">
-				<marquee x1="10" x2="-98" y1="33" y2="63" font="FontBold.ttf:24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
-				<marquee x1="10" x2="-98" y1="63" y2="93" font="FontBold.ttf:22,85" color="MenuTxtFG">{RecordingShortText}</marquee>
+				<marquee x1="10" x2="-98" y1="33" y2="63" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
+				<marquee x1="10" x2="-98" y1="63" y2="93" font="Sans Serif:Bold at 22,85" color="MenuTxtFG">{RecordingShortText}</marquee>
 			</block>
 			<block condition="not({RecordingShortText})">
-				<marquee x1="10" x2="-98" y1="48" y2="78" font="FontBold.ttf:24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
+				<marquee x1="10" x2="-98" y1="48" y2="78" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
 			</block>
 			
 			<!-- icon -->
 			<image x="-85" y="5" bgColor="LogoBG" path="icons/Summary.png"/>
 			
 			<!-- Timing-info -->
-			<text x1="10" x2="150" y1="95" y2="123" color="MenuInfFG" align="left" font="FontBold.ttf:20,85">{RecordingDateTime:%d.%m. %H\:%M}</text>
+			<text x1="10" x2="150" y1="95" y2="123" color="MenuInfFG" align="left" font="Sans Serif:Bold at 20,85">{RecordingDateTime:%d.%m. %H\:%M}</text>
 			
 			<!--
-			<text condition="and({RecordingLanguageCode:0},not({RecordingLanguageCode:1}),not({RecordingLanguageCode:2}))" x1="151" x2="-98" y1="95" y2="123" color="MenuInfFG" align="right" font="FontBold.ttf:20,85">{RecordingLanguageCode:0} ({RecordingLanguageDescription:0})</text>			
+			<text condition="and({RecordingLanguageCode:0},not({RecordingLanguageCode:1}),not({RecordingLanguageCode:2}))" x1="151" x2="-98" y1="95" y2="123" color="MenuInfFG" align="right" font="Sans Serif:Bold at 20,85">{RecordingLanguageCode:0} ({RecordingLanguageDescription:0})</text>			
 			-->
 			
 			<!-- Description -->
-			<scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Font.ttf:22,85" color="MenuTxtFG">{RecordingDescription}</scrolltext>
+			<scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Sans Serif at 22,85" color="MenuTxtFG">{RecordingDescription}</scrolltext>
 		</block>
 		
 		<!-- Menu-text -->
@@ -774,17 +774,17 @@
 			<rectangle x1="0" x2="-95" y1="30" y2="93" color="MenuAltBG"/>
 			<rectangle x1="0" x2="-1" y1="94" y2="-31" color="MenuAltBG"/>
 			
-			<scrolltext condition="or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info')))" x1="10" x2="-106" y1="35" y2="-36" font="Font.ttf:22,85" color="MenuTxtFG">{MenuText}</scrolltext>
-			<scrolltext condition="not(or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info'))))" x1="10" x2="-106" y1="35" y2="-36" font="FontMonoSpaced.ttf:22,85" color="MenuTxtFG">{MenuText}</scrolltext>
+			<scrolltext condition="or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info')))" x1="10" x2="-106" y1="35" y2="-36" font="Sans Serif at 22,85" color="MenuTxtFG">{MenuText}</scrolltext>
+			<scrolltext condition="not(or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info'))))" x1="10" x2="-106" y1="35" y2="-36" font="Monospaced at 22,85" color="MenuTxtFG">{MenuText}</scrolltext>
 		</block>
 		
 		<!-- Show recordings (in all menus except 'Extended EPG-info' and 'MenuText') -->
 		<block condition="and(not({PresentTitle}),not({MenuText}),{CurrentRecording})">
 			<rectangle x1="0" x2="-1" y1="-60" y2="-27" color="Transparent"/>
 			<rectangle x1="0" x2="-1" y1="-56" y2="-31" color="MenuHighlight"/>
-			<text condition="not({CurrentRecording:1})" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Font.ttf:20,85">RECORDING: {CurrentRecording}</text>
+			<text condition="not({CurrentRecording:1})" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Sans Serif at 20,85">RECORDING: {CurrentRecording}</text>
 			<!-- trans('RECORDING: {CurrentRecording}') -->
-			<text condition="{CurrentRecording:1}" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Font.ttf:20,85">RECORDINGS: {CurrentRecording}</text>
+			<text condition="{CurrentRecording:1}" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Sans Serif at 20,85">RECORDINGS: {CurrentRecording}</text>
 			<!-- trans('RECORDINGS: {CurrentRecording}') -->
 		</block>
 		
@@ -798,8 +798,8 @@
 			<rectangle condition="{MessageWarning}" x1="4" x2="-5" y1="-56" y2="-35" color="MsgWarningBG"/>
 			<rectangle condition="{MessageError}" x1="4" x2="-5" y1="-56" y2="-35" color="MsgErrorBG"/>
 			
-			<text x1="8" x2="-10" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-			<text x1="9" x2="-9" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+			<text x1="8" x2="-10" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+			<text x1="9" x2="-9" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		</block>
 
 		<!-- bottom info-line -->
@@ -809,33 +809,33 @@
 		<rectangle x1="10" x2="-11" y1="-10" y2="-1" color="BotBG"/>
 		
 		<!-- date / time -->
-		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 		
 		<!-- Buttons -->
 		<block condition="{ButtonRed}">
 			<rectangle x1="-460" x2="-342" y1="-26" y2="-1" color="Transparent"/>
 			<rectangle x1="-456" x2="-346" y1="-26" y2="-1" color="MenuRed"/>
-			<marquee x1="-456" x2="-347" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonRed}</marquee>
-			<marquee x1="-455" x2="-346" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonRed}</marquee>
+			<marquee x1="-456" x2="-347" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonRed}</marquee>
+			<marquee x1="-455" x2="-346" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonRed}</marquee>
 		</block>
 		<block condition="{ButtonGreen}">
 			<rectangle x1="-345" x2="-227" y1="-26" y2="-1" color="Transparent"/>
 			<rectangle x1="-341" x2="-231" y1="-26" y2="-1" color="MenuGreen"/>
-			<marquee x1="-341" x2="-232" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonGreen}</marquee>
-			<marquee x1="-340" x2="-231" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonGreen}</marquee>
+			<marquee x1="-341" x2="-232" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonGreen}</marquee>
+			<marquee x1="-340" x2="-231" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonGreen}</marquee>
 		</block>
 		<block condition="{ButtonYellow}">
 			<rectangle x1="-230" x2="-112" y1="-26" y2="-1" color="Transparent"/>
 			<rectangle x1="-226" x2="-116" y1="-26" y2="-1" color="MenuYellow"/>
-			<marquee x1="-226" x2="-117" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonYellow}</marquee>
-			<marquee x1="-225" x2="-116" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonYellow}</marquee>
+			<marquee x1="-226" x2="-117" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonYellow}</marquee>
+			<marquee x1="-225" x2="-116" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonYellow}</marquee>
 		</block>
 		<block condition="{ButtonBlue}">
 			<rectangle x1="-115" x2="-1" y1="-26" y2="-1" color="Transparent"/>
 			<rectangle x1="-111" x2="-1" y1="-26" y2="-1" color="MenuBlue"/>
-			<marquee x1="-111" x2="-2" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonBlue}</marquee>
-			<marquee x1="-110" x2="-1" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonBlue}</marquee>
+			<marquee x1="-111" x2="-2" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonBlue}</marquee>
+			<marquee x1="-110" x2="-1" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonBlue}</marquee>
 		</block>
 		
 		<!-- Scroll-bar -->
@@ -868,8 +868,8 @@
 		<rectangle x1="107" x2="-1" y1="-110" y2="-103" color="TopBG"/>
 		<rectangle x1="107" x2="-1" y1="-98" y2="-95" color="TopBG"/>
 		
-		<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">Volume</text>
-		<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">Volume</text>
+		<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">Volume</text>
+		<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">Volume</text>
 		<!-- trans('Volume') -->
 			
 		<!-- Volume-bar -->
@@ -882,8 +882,8 @@
 		<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/>		<rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
 		
 		<!-- date / time -->
-		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 		
 		<!-- overlay messages -->
 		<block condition="{Message}">
@@ -895,8 +895,8 @@
 			<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
 			<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
 			
-			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+			<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+			<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		</block>
 	</display>
   
@@ -918,8 +918,8 @@
 		<rectangle x1="107" x2="-1" y1="-110" y2="-103" color="TopBG"/>
 		<rectangle x1="107" x2="-1" y1="-98" y2="-95" color="TopBG"/>
 		
-		<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">Message</text>
-		<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">Message</text>
+		<text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">Message</text>
+		<text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">Message</text>
 		<!-- trans('Message') -->
 		<rectangle x1="107" x2="-1" y1="-90" y2="-61" color="MsgInfoBG"/>
 		
@@ -932,16 +932,16 @@
 		<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
 		<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
 		
-		<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
-		<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+		<text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+		<text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
 		
 		<!-- bottom info-line -->
 		<ellipse x1="-10" x2="-1" y1="-40" y2="-31" arc="4" color="BotBG"/>
 		<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/>		<rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
 		
 		<!-- date / time -->
-		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+		<text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 	</display>
 	
 	
@@ -969,18 +969,18 @@
 		<rectangle x1="0" x2="339" y1="-140" y2="-133" color="TopBG"/>
 		<rectangle x1="0" x2="339" y1="-128" y2="-125" color="TopBG"/>
 
-		<text x1="3" x2="339" y1="-159" y2="-124" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">Audio</text>
-		<text x1="0" x2="336" y1="-160" y2="-125" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">Audio</text>
+		<text x1="3" x2="339" y1="-159" y2="-124" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">Audio</text>
+		<text x1="0" x2="336" y1="-160" y2="-125" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">Audio</text>
 		<!-- trans('Audio') -->
 			
 		<!-- audio-area -->
 		<rectangle x1="94" x2="339" y1="-120" y2="-31" color="AudioBG"/>
 		<list x1="94" x2="339" y1="-114" y2="-31">
 			<item height="26"/>
-			<text x1="10" x2="235" y1="0" y2="26" color="AudioTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
+			<text x1="10" x2="235" y1="0" y2="26" color="AudioTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
 			<rectangle condition="{MenuCurrent}" x1="5" x2="240" y1="1" y2="26" color="AudioHighlight"/>
-			<marquee x1="10" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
-			<marquee x1="11" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+			<marquee x1="10" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+			<marquee x1="11" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
 		</list>
 		
 		<!-- bottom info-line -->
@@ -990,7 +990,7 @@
 		<rectangle x1="10" x2="329" y1="-10" y2="-1" color="BotBG"/>
 		
 		<!-- date / time -->
-		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
-		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+		<text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
 	</display>
 </skin>

izegrey16-1.0-20050304-fonts.patch:
 izegrey16.skin |   76 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

--- NEW FILE izegrey16-1.0-20050304-fonts.patch ---
Index: izegrey16.skin
===================================================================
RCS file: /var/cvsroot/skins/izegrey16/izegrey16.skin,v
retrieving revision 1.1
diff -u -r1.1 izegrey16.skin
--- izegrey16.skin	4 Mar 2005 18:41:46 -0000	1.1
+++ izegrey16.skin	12 Jul 2009 20:11:18 -0000
@@ -7,7 +7,7 @@
     <ellipse   x1="0"   x2="11"  y1="423" y2="450" color="darkgrey" arc="7"/>
     <rectangle x1="12"  x2="599" y1="423" y2="450" color="darkgrey"/>
     <ellipse   x1="600" x2="611" y1="423" y2="450" color="darkgrey" arc="5"/>
-    <text      x1="15"  x2="105" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="left">Volume</text>
+    <text      x1="15"  x2="105" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="left">Volume</text>
     <progress  x1="110"  x2="597" y1="427" y2="446" color="green" current="{VolumeCurrent}" total="{VolumeTotal}"/>
     </block>
   </display>
@@ -16,10 +16,10 @@
     <ellipse   x1="0"   x2="11"  y1="423" y2="450" color="darkgrey" arc="7"/>
     <rectangle x1="12" x2="599" y1="423" y2="450" color="darkgrey"/>
     <ellipse   x1="600" x2="611" y1="423" y2="450" color="darkgrey" arc="5"/>
-    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageInfo}   </text>
-    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageStatus} </text>
-    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageWarning}</text>
-    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageError}  </text>
+    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageInfo}   </text>
+    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageStatus} </text>
+    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageWarning}</text>
+    <text      x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageError}  </text>
   </display>
 
   <display id="replayInfo">
@@ -30,8 +30,8 @@
     <!-- time bar -->
     <progress  x1="4"  x2="500" y1="433" y2="452" color="green" bgColor="lightgrey" current="{ReplayPositionIndex}" total="{ReplayDurationIndex}" mark="darkgrey" active="red" keep="darkgrey"/>
     <!-- replay title -->
-    <text x1="4"   x2="354" y1="405" y2="429" color="darkwhite" font="Vera.ttf:22">{ReplayTitle}</text>
-    <text x1="410" x2="600" y1="405" y2="429" color="darkwhite" align="right" font="Vera.ttf:22">{ReplayPosition} / {ReplayDuration}</text>
+    <text x1="4"   x2="354" y1="405" y2="429" color="darkwhite" font="Sans Serif at 22">{ReplayTitle}</text>
+    <text x1="410" x2="600" y1="405" y2="429" color="darkwhite" align="right" font="Sans Serif at 22">{ReplayPosition} / {ReplayDuration}</text>
     <!-- symbols -->
     <image x="550" y="435" alpha="200" condition="{ReplayIsPlaying}" color="green"  bgColor="darkgrey" path="symbols/play.xpm"/>
     <image x="550" y="435" alpha="200" condition="{ReplayIsPausing}" color="red"  bgColor="darkgrey" path="symbols/pause.xpm"/>
@@ -85,21 +85,21 @@
     <rectangle x1="10" x2="-1" y1="306" y2="367" color="darkgrey"/>
     <rectangle x1="10" x2="95" y1="306" y2="360" color="grey"/>
     <ellipse   x1="10" x2="25" y1="306" y2="321" color="00000000" arc="-2"/>
-    <text      x1="10" x2="95" y1="306" y2="360" color="lightgrey" font="Vera.ttf:40" align="center" >{ChannelNumber}</text>
+    <text      x1="10" x2="95" y1="306" y2="360" color="lightgrey" font="Sans Serif at 40" align="center" >{ChannelNumber}</text>
     <rectangle x1="95"  x2="318" y1="306" y2="333" color="darkgrey"/>
     <ellipse   x1="319" x2="332" y1="306" y2="333" color="darkgrey" arc="5"/>
-    <text      x1="97" x2="248" y1="306" y2="333" color="lightgrey" font="Vera.ttf:22" align="left">{DateTime:%a %d.%m.}</text>
-    <text      x1="350" x2="510" y1="306" y2="360" color="lightgrey" font="Vera.ttf:40" align="right">{DateTime:%H\:%M} </text>
+    <text      x1="97" x2="248" y1="306" y2="333" color="lightgrey" font="Sans Serif at 22" align="left">{DateTime:%a %d.%m.}</text>
+    <text      x1="350" x2="510" y1="306" y2="360" color="lightgrey" font="Sans Serif at 40" align="right">{DateTime:%H\:%M} </text>
     <!-- channel name -->
     <rectangle x1="95"  x2="349" y1="333" y2="360" color="grey"/>
     <ellipse   x1="350" x2="363" y1="333" y2="360" color="grey" arc="5"/>
-    <text      x1="97"  x2="361" y1="333" y2="360" color="lightgrey" font="Vera.ttf:22">{ChannelName}</text>
+    <text      x1="97"  x2="361" y1="333" y2="360" color="lightgrey" font="Sans Serif at 22">{ChannelName}</text>
     <!-- program start times -->
     <rectangle x1="10" x2="77" y1="367" y2="454" color="darkgrey"/>
     <ellipse   x1="10" x2="25" y1="455" y2="470" color="darkgrey" arc="3"/>
     <rectangle x1="26" x2="77" y1="455" y2="470" color="darkgrey"/>
-    <text      x1="10" x2="74" y1="367" y2="394" color="lightgrey" font="Vera.ttf:20" align="right">{PresentStartDateTime:%H\:%M}</text>
-    <text      x1="10" x2="74" y1="421" y2="448" color="lightgrey" font="Vera.ttf:20" align="right">{FollowingStartDateTime:%H\:%M}</text>
+    <text      x1="10" x2="74" y1="367" y2="394" color="lightgrey" font="Sans Serif at 20" align="right">{PresentStartDateTime:%H\:%M}</text>
+    <text      x1="10" x2="74" y1="421" y2="448" color="lightgrey" font="Sans Serif at 20" align="right">{FollowingStartDateTime:%H\:%M}</text>
     <!-- time bar -->
     <rectangle x1="78" x2="89" y1="367" y2="470" color="grey"/>
     <progress  x1="80" x2="87" y1="367" y2="470" color="yellow" current="{PresentProgress}" total="{PresentDuration}"/>
@@ -107,10 +107,10 @@
     <rectangle x1="90"  x2="591" y1="367" y2="470" color="darkgrey"/>
     <rectangle x1="592" x2="607" y1="367" y2="454" color="darkgrey"/>
     <ellipse   x1="592" x2="607" y1="455" y2="470" color="darkgrey" arc="4"/>
-    <text      x1="98"  x2="565" y1="367" y2="394" color="lightgrey" font="Vera.ttf:22">{PresentTitle}</text>
-    <text      x1="98"  x2="565" y1="395" y2="418" color="grey" font="Vera.ttf:18">{PresentShortText}</text>
-    <text      x1="98"  x2="565" y1="421" y2="448" color="lightgrey" font="Vera.ttf:22">{FollowingTitle}</text>
-    <text      x1="98"  x2="565" y1="449" y2="472" color="grey" font="Vera.ttf:18">{FollowingShortText}</text>
+    <text      x1="98"  x2="565" y1="367" y2="394" color="lightgrey" font="Sans Serif at 22">{PresentTitle}</text>
+    <text      x1="98"  x2="565" y1="395" y2="418" color="grey" font="Sans Serif at 18">{PresentShortText}</text>
+    <text      x1="98"  x2="565" y1="421" y2="448" color="lightgrey" font="Sans Serif at 22">{FollowingTitle}</text>
+    <text      x1="98"  x2="565" y1="449" y2="472" color="grey" font="Sans Serif at 18">{FollowingShortText}</text>
     <!-- symbols -->
     <image x="568" y="365" alpha="200" condition="{IsRecording}"       color="lightgrey" bgColor="darkgrey" path="symbols/recording.xpm"/>
     <image x="568" y="385" alpha="200" condition="{IsEncrypted}"       color="lightgrey"  bgColor="darkgrey" path="symbols/encrypted.xpm"/>
@@ -132,8 +132,8 @@
     <rectangle x1="0"   x2="607" y1="16" y2="27" color="darkgrey"/>
     <ellipse   x1="0"   x2="15"  y1="0"  y2="15" color="darkgrey" arc="2"/>
     <ellipse   x1="592" x2="607" y1="0"  y2="15" color="darkgrey" arc="1"/>
-    <text      x1="361" x2="592" y1="1"  y2="31" color="lightgrey" align="right" font="Vera.ttf:22">{DateTime:%a %d.%m.  %H\:%M}</text>
-    <text      x1="15"  x2="360" y1="1"  y2="31" color="lightgrey" font="Vera.ttf:22">{MenuTitle}</text>
+    <text      x1="361" x2="592" y1="1"  y2="31" color="lightgrey" align="right" font="Sans Serif at 22">{DateTime:%a %d.%m.  %H\:%M}</text>
+    <text      x1="15"  x2="360" y1="1"  y2="31" color="lightgrey" font="Sans Serif at 22">{MenuTitle}</text>
     <!-- menu list -->
     <rectangle   x1="0"   x2="607" y1="28" y2="455" color="grey"/>
     <list        x1="0"   x2="607" y1="32" y2="455">
@@ -141,41 +141,41 @@
       <ellipse   x1="0"   x2="11"  y1="0"  y2="27" color="lightgrey" condition="{IsMenuCurrent}" arc="7"/>
       <rectangle x1="12"  x2="595" y1="0"  y2="27" color="lightgrey" condition="{IsMenuCurrent}"/>
       <ellipse   x1="596" x2="607" y1="0"  y2="27" color="lightgrey" condition="{IsMenuCurrent}" arc="5"/>
-      <text      x1="12"  x2="595" y1="0"  y2="27" color="lightgrey" font="Vera.ttf:22">{MenuGroup}</text>
-      <text      x1="12"  x2="595" y1="0"  y2="27" color="grey" font="Vera.ttf:20">{MenuCurrent}</text>
-      <text      x1="12"  x2="595" y1="0"  y2="27" color="darkwhite" font="Vera.ttf:20">{MenuItem}</text>
+      <text      x1="12"  x2="595" y1="0"  y2="27" color="lightgrey" font="Sans Serif at 22">{MenuGroup}</text>
+      <text      x1="12"  x2="595" y1="0"  y2="27" color="grey" font="Sans Serif at 20">{MenuCurrent}</text>
+      <text      x1="12"  x2="595" y1="0"  y2="27" color="darkwhite" font="Sans Serif at 20">{MenuItem}</text>
     </list>
     <!-- red button -->
     <block>
         <ellipse   x1="0"  x2="15"  y1="468" y2="483" color="red" arc="3"/>
         <rectangle x1="0"  x2="15"  y1="456" y2="467" color="red"/>
         <rectangle x1="16" x2="151" y1="456" y2="483" color="red"/>
-        <text      x1="0"  x2="155" y1="456" y2="483" color="darkwhite" font="VeraBd.ttf:22" align="center">{ButtonRed}</text>
+        <text      x1="0"  x2="155" y1="456" y2="483" color="darkwhite" font="Sans Serif:Bold at 22" align="center">{ButtonRed}</text>
     </block>
     <!-- green button -->
     <block>
         <rectangle x1="152" x2="303" y1="456" y2="483" color="green"/>
-        <text      x1="156" x2="305" y1="456" y2="483" color="darkgrey" font="VeraBd.ttf:22" align="center">{ButtonGreen}</text>
+        <text      x1="156" x2="305" y1="456" y2="483" color="darkgrey" font="Sans Serif:Bold at 22" align="center">{ButtonGreen}</text>
     </block>
     <!-- yellow button -->
 
     <block>
         <rectangle x1="304" x2="455" y1="456" y2="483" color="yellow"/>
-        <text      x1="306" x2="455" y1="456" y2="483" color="darkgrey" font="VeraBd.ttf:22" align="center">{ButtonYellow}</text>
+        <text      x1="306" x2="455" y1="456" y2="483" color="darkgrey" font="Sans Serif:Bold at 22" align="center">{ButtonYellow}</text>
     </block>
     <!-- blue button -->
     <block>
         <rectangle x1="456" x2="591" y1="456" y2="483" color="blue"/>
         <rectangle x1="592" x2="607" y1="456" y2="467" color="blue"/>
         <ellipse   x1="592" x2="607" y1="468" y2="483" color="blue" arc="4"/>
-        <text      x1="456" x2="607" y1="456" y2="483" color="darkwhite" font="VeraBd.ttf:22" align="center">{ButtonBlue}</text>
+        <text      x1="456" x2="607" y1="456" y2="483" color="darkwhite" font="Sans Serif:Bold at 22" align="center">{ButtonBlue}</text>
     </block>
     <!-- detailed epg info -->
     <block condition="{PresentTitle}">
-        <text       x1="24"  x2="419" y1="62"  y2="91"  color="darkgrey" font="Vera.ttf:22">{PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}</text>
-        <text       x1="420" x2="539" y1="62"  y2="91"  color="darkgrey" font="Vera.ttf:22" condition="{PresentVPSDateTime}">VPS: {PresentVPSDateTime:%H\:%M}</text>
-        <text       x1="24"  x2="593" y1="102" y2="129" color="darkwhite" font="Vera.ttf:22">{PresentTitle}</text>
-        <scrolltext x1="24"  x2="583" y1="138" y2="450" color="lightgrey" font="Vera.ttf:22">{PresentShortText}{PresentDescription}</scrolltext>
+        <text       x1="24"  x2="419" y1="62"  y2="91"  color="darkgrey" font="Sans Serif at 22">{PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}</text>
+        <text       x1="420" x2="539" y1="62"  y2="91"  color="darkgrey" font="Sans Serif at 22" condition="{PresentVPSDateTime}">VPS: {PresentVPSDateTime:%H\:%M}</text>
+        <text       x1="24"  x2="593" y1="102" y2="129" color="darkwhite" font="Sans Serif at 22">{PresentTitle}</text>
+        <scrolltext x1="24"  x2="583" y1="138" y2="450" color="lightgrey" font="Sans Serif at 22">{PresentShortText}{PresentDescription}</scrolltext>
         <scrollbar  x1="585" x2="597" y1="138" y2="450" condition="or({CanScrollUp},{CanScrollDown})" color="darkgrey" bgColor="grey"/>
         <image      x="72"   y="35"   path="symbols/vps.xpm"       condition="{HasVPS}"/>
         <image      x="48"   y="35"   path="symbols/timer.xpm"     condition="{HasTimer}"/>
@@ -183,7 +183,7 @@
     </block>
     <!-- menu text -->
     <block condition="{MenuText}">
-        <scrolltext x1="24"  x2="583" y1="62" y2="426" font="Vera.ttf:22"  color="lightgrey">{MenuText}</scrolltext>
+        <scrolltext x1="24"  x2="583" y1="62" y2="426" font="Sans Serif at 22"  color="lightgrey">{MenuText}</scrolltext>
         <scrollbar  x1="585" x2="597" y1="62" y2="426" condition="or({CanScrollUp},{CanScrollDown})" color="lightgrey" bgColor="darkgrey"/>
     </block>
     <!-- message -->
@@ -192,28 +192,28 @@
     <rectangle x1="0"  x2="607"  y1="456" y2="468" color="lightgrey"/>
     <rectangle x1="15"  x2="592"  y1="468" y2="483" color="lightgrey"/>
     <ellipse   x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
-    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageInfo}</text>
+    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageInfo}</text>
     </block>
     <block condition="{MessageStatus}">
     <ellipse   x1="0"  x2="15"  y1="468" y2="483" color="lightgrey" arc="3"/>
     <rectangle x1="0"  x2="607"  y1="456" y2="468" color="lightgrey"/>
     <rectangle x1="15"  x2="592"  y1="468" y2="483" color="lightgrey"/>
     <ellipse   x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
-    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageStatus}</text>
+    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageStatus}</text>
     </block>
     <block condition="{MessageWarning}">
     <ellipse   x1="0"  x2="15"  y1="468" y2="483" color="lightgrey" arc="3"/>
     <rectangle x1="0"  x2="607"  y1="456" y2="468" color="lightgrey"/>
     <rectangle x1="15"  x2="592"  y1="468" y2="483" color="lightgrey"/>
     <ellipse   x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
-    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageWarning}</text>
+    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageWarning}</text>
     </block>
     <block condition="{MessageError}">
     <ellipse   x1="0"  x2="15"  y1="468" y2="483" color="lightgrey" arc="3"/>
     <rectangle x1="0"  x2="607"  y1="456" y2="468" color="lightgrey"/>
     <rectangle x1="15"  x2="592"  y1="468" y2="483" color="lightgrey"/>
     <ellipse   x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
-    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageError}</text>
+    <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageError}</text>
     </block>
   </display>
   
@@ -225,7 +225,7 @@
     <rectangle x1="0"   x2="15"  y1="325" y2="339" color="darkgrey"/>
     <rectangle x1="233" x2="249" y1="325" y2="339" color="darkgrey"/>
     <rectangle x1="16"  x2="232" y1="310" y2="339" color="darkgrey"/>
-    <text      x1="16"  x2="232" y1="314" y2="337" color="lightgrey" font="Vera.ttf:22">{MenuTitle}</text>
+    <text      x1="16"  x2="232" y1="314" y2="337" color="lightgrey" font="Sans Serif at 22">{MenuTitle}</text>
     <!-- background -->
     <rectangle x1="0"   x2="249" y1="340" y2="463" color="grey"/>
     <rectangle x1="16"  x2="232" y1="464" y2="479" color="grey"/>
@@ -234,11 +234,11 @@
     <!-- audio list -->    
     <list        x1="0"   x2="249" y1="342" y2="479">
       <item      height="27"/>
-      <text      x1="12"  x2="238" y1="0"   y2="27" color="darkwhite" font="Vera.ttf:22" >{MenuItem}</text>
+      <text      x1="12"  x2="238" y1="0"   y2="27" color="darkwhite" font="Sans Serif at 22" >{MenuItem}</text>
       <ellipse   x1="0"   x2="11"  y1="0"   y2="27" color="darkgrey" arc="7" condition="{IsMenuCurrent}"/>
       <rectangle x1="12"  x2="238" y1="0"   y2="27" color="darkgrey" condition="{IsMenuCurrent}"/>
       <ellipse   x1="238" x2="249" y1="0"   y2="27" color="darkgrey" arc="5" condition="{IsMenuCurrent}"/>
-      <text      x1="12"  x2="249" y1="0"   y2="27" color="yellow" font="Vera.ttf:22" >{MenuCurrent}</text>
+      <text      x1="12"  x2="249" y1="0"   y2="27" color="yellow" font="Sans Serif at 22" >{MenuCurrent}</text>
     </list>
   </display>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 19:11:51 -0000	1.3
+++ .cvsignore	1 Sep 2009 21:14:25 -0000	1.4
@@ -1,7 +1,11 @@
-Aluminium-1.0-demo-nologos.tar.bz2
-DeepBlue-0.1.4-nologos.tar.bz2
+Aluminium-1.0-demo-nologos.tar.xz
+deepblue-0.1.4-locale.diff
+DeepBlue-0.1.4-nologos.tar.xz
 EgalSimple-1.0-demo.tar.bz2
+enelchi-0.7.2-locale.diff
+enigma-0.3a-locale.diff
+izegrey16-1.0-20050304-nologos.tar.xz
 SilverGreen-0.1.7.tar.bz2
-izegrey16-1.0-20050304-nologos.tar.bz2
-vdrskin-enigma-0.3a-nologos.tar.bz2
+Skin-EgalsTry-1.1.0-nologos.tar.xz
 vdrskin-enElchi-0.7.2.tgz
+vdrskin-enigma-0.3a-nologos.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 19:11:51 -0000	1.3
+++ sources	1 Sep 2009 21:14:25 -0000	1.4
@@ -1,7 +1,11 @@
-f7aca33ccc3f17f257a6919d1f2d5bc0  Aluminium-1.0-demo-nologos.tar.bz2
-8527b1fc6f7a5bacd622ee828de3f203  DeepBlue-0.1.4-nologos.tar.bz2
+00a37ab75fcadeb46385d585938bfe56  Aluminium-1.0-demo-nologos.tar.xz
+b4982b8a9900897f215eadab0acef6db  deepblue-0.1.4-locale.diff
+46bf3259b319df37a0d532020a9d9f74  DeepBlue-0.1.4-nologos.tar.xz
 8676ae6f7596d7c09fbdec7468709bbc  EgalSimple-1.0-demo.tar.bz2
+6d25e2376a348596ffc4c35ad4480606  enelchi-0.7.2-locale.diff
+9a305465f90e9ce1e52b4238df8489b0  enigma-0.3a-locale.diff
+edd0fc660e55168a14223b3150e10f1f  izegrey16-1.0-20050304-nologos.tar.xz
 89dd82fa698d139a15c4d24601188a0c  SilverGreen-0.1.7.tar.bz2
-8a238e3d1a3f2d62a37415e912e780e4  izegrey16-1.0-20050304-nologos.tar.bz2
-acdb6c15e86aee821401cc2697a4e225  vdrskin-enigma-0.3a-nologos.tar.bz2
+9ded71faf87400a031a18b8315909cb4  Skin-EgalsTry-1.1.0-nologos.tar.xz
 f1913e012a68f8ca7a1feb3da82b8709  vdrskin-enElchi-0.7.2.tgz
+c4a4a3078cffa557639130af829aeb55  vdrskin-enigma-0.3a-nologos.tar.xz


Index: vdr-skins-prepare-tarballs.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins-prepare-tarballs.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vdr-skins-prepare-tarballs.sh	24 Nov 2008 19:11:51 -0000	1.2
+++ vdr-skins-prepare-tarballs.sh	1 Sep 2009 21:14:25 -0000	1.3
@@ -7,7 +7,7 @@ curl -O http://skins.vdr-developer.org/t
 rm -rf izegrey16
 tar zxf izegrey16-1.0-20050304.tar.gz
 rm -f izegrey16/{*.tar,*.ttf,logos/{*.mng,*.png,*.xpm}}
-tar jcf izegrey16-1.0-20050304-nologos.tar.bz2 izegrey16
+tar c izegrey16 | xz --best > izegrey16-1.0-20050304-nologos.tar.xz
 rm -rf izegrey16
 
 [ ! -e vdrskin-enigma-0.3a.tar.bz2 ] && \
@@ -20,7 +20,7 @@ find Enigma -type d -exec chmod +x {} ';
 mv Enigma/icons Enigma/icons-normal
 tar zx -C Enigma -f $PWD/icons-low-low-col.tar.gz
 rm -rf Enigma/{hqlogos/*,fonts/ttf-bitstream-vera*,patches}
-tar jcf vdrskin-enigma-0.3a-nologos.tar.bz2 Enigma
+tar c Enigma | xz --best > vdrskin-enigma-0.3a-nologos.tar.xz
 rm -rf Enigma
 
 [ ! -e DeepBlue-0.1.4.tar.gz ] && \
@@ -34,7 +34,7 @@ find DeepBlueDXR3 -type d -exec chmod +x
 rm -rf DeepBlue/logos/*
 mv DeepBlueDXR3/HISTORY DeepBlue
 mv DeepBlueDXR3/images DeepBlue/images-dxr3
-tar jcf DeepBlue-0.1.4-nologos.tar.bz2 DeepBlue
+tar c DeepBlue | xz --best > DeepBlue-0.1.4-nologos.tar.xz
 rm -rf DeepBlue DeepBlueDXR3
 
 [ ! -e Aluminium-1.0-demo.tar.bz2 ] && \
@@ -42,5 +42,13 @@ curl -O http://linux.kompiliert.net/cont
 rm -rf Aluminium
 tar jxf Aluminium-1.0-demo.tar.bz2
 rm -f Aluminium/logos/*
-tar jcf Aluminium-1.0-demo-nologos.tar.bz2 Aluminium
+tar c Aluminium | xz --best > Aluminium-1.0-demo-nologos.tar.xz
 rm -rf Aluminium
+
+[ ! -e Skin-EgalsTry-1.1.0.tgz ] && \
+curl -O http://www.egal-vdr.de/skins/Skin-EgalsTry-1.1.0.tgz
+rm -rf EgalsTry
+tar zxf Skin-EgalsTry-1.1.0.tgz
+rm -r EgalsTry/logos/*
+tar c EgalsTry | xz --best > Skin-EgalsTry-1.1.0-nologos.tar.xz
+rm -rf EgalsTry


Index: vdr-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vdr-skins.spec	27 Jul 2009 06:46:41 -0000	1.13
+++ vdr-skins.spec	1 Sep 2009 21:14:25 -0000	1.14
@@ -8,13 +8,9 @@
 %global vdr_group %(vdr-config --group     2>/dev/null || echo ERROR)
 %global vdr_user  %(vdr-config --user      2>/dev/null || echo ERROR)
 
-%global sansfont  %{_datadir}/fonts/dejavu/DejaVuSans.ttf
-%global boldfont  %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
-%global monofont  %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf
-
 Name:           vdr-skins
-Version:        20081124
-Release:        6%{?dist}
+Version:        20090901
+Release:        1%{?dist}
 Summary:        Collection of OSD skins for VDR
 
 Group:          Applications/Multimedia
@@ -25,20 +21,22 @@ License:        GPL+
 # http://home.arcor.de/bjoern.sturzrehm/vdr/
 Source0:        http://home.arcor.de/bjoern.sturzrehm/vdr/SilverGreen-0.1.7.tar.bz2
 # http://skins.vdr-developer.org/
-Source1:        izegrey16-1.0-20050304-nologos.tar.bz2
+Source1:        izegrey16-1.0-20050304-nologos.tar.xz
 # http://home.pages.at/brougs78/
 # http://ventoso.org/luca/vdr/
-Source2:        vdrskin-enigma-0.3a-nologos.tar.bz2
+Source2:        vdrskin-enigma-0.3a-nologos.tar.xz
 # http://vdr.pfroen.de/
 # http://www.netholic.com/viewtopic.php?t=1464
-Source3:        DeepBlue-0.1.4-nologos.tar.bz2
+Source3:        DeepBlue-0.1.4-nologos.tar.xz
 # http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/
 Source4:        http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdrskin-enElchi-0.7.2.tgz
 # http://www.fdm-ware.de/vdrskin/
 # http://linux.kompiliert.net/contrib/
-Source5:        Aluminium-1.0-demo-nologos.tar.bz2
+Source5:        Aluminium-1.0-demo-nologos.tar.xz
 # http://linux.kompiliert.net/contrib/
 Source6:        http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2
+# http://www.egal-vdr.de/skins/
+Source7:        Skin-EgalsTry-1.1.0-nologos.tar.xz
 # http://www.vdrskins.org/vdrskins/thumbnails.php?album=58
 Source8:        http://web.archive.org/web/20060322201106/http://www.magoa.net/sttng-blue.theme
 Source99:       %{name}-prepare-tarballs.sh
@@ -46,15 +44,21 @@ Source99:       %{name}-prepare-tarballs
 Patch0:         %{name}-aluminium-i18n.patch
 Patch1:         %{name}-egalsimple-i18n.patch
 Patch2:         %{name}-izegrey16-i18n.patch
+Patch3:         http://toms-cafe.de/vdr/download/deepblue-0.1.4-locale.diff
+Patch4:         http://toms-cafe.de/vdr/download/enigma-0.3a-locale.diff
+Patch5:         http://toms-cafe.de/vdr/download/enelchi-0.7.2-locale.diff
+Patch6:         izegrey16-1.0-20050304-fonts.patch
+Patch7:         enigma-0.3a-fonts.patch
+Patch8:         Aluminium-1.0-demo-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  vdr-devel
-# Font build deps for checking filenames during build
-BuildRequires:  dejavu-sans-fonts
-BuildRequires:  dejavu-sans-mono-fonts
-Requires:       vdr-text2skin >= 1.1
-Requires:       vdr >= 1.4.6-2
+BuildRequires:  gettext
+BuildRequires:  hardlink
+Requires:       vdr-text2skin >= 1.2-3
+Requires:       vdr >= 1.6.0
+# Actually any sans+monospace set would do
 Requires:       dejavu-sans-fonts
 Requires:       dejavu-sans-mono-fonts
 
@@ -63,7 +67,7 @@ This package contains a collection of sk
 
 
 %prep
-%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6
+%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7
 find . -type d -exec chmod 755 {} ';'
 find . -type f -exec chmod 644 {} ';'
 find . -type d -name CVS* | xargs rm -r
@@ -75,6 +79,20 @@ done
 %patch0
 %patch1
 %patch2
+cd DeepBlue
+%patch3 -p2
+cd ..
+cd Enigma
+%patch4 -p2
+%patch7 -p1
+cd ..
+cd enElchi
+%patch5 -p2
+cd ..
+cd izegrey16
+%patch6 -p0
+cd ..
+%patch8 -p0
 
 SKINS=$(find * -maxdepth 0 -type d)
 
@@ -86,12 +104,13 @@ for s in $SKINS ; do
 done
 
 find . -type f -name "*.theme" -exec mv {} . ';'
+mv SilverGreen-Default.theme SilverGreen-default.theme
+rm SilverGreen-ThemeName.theme
 for s in $SKINS ; do
     [ -f $s-default.theme ] || touch $s-default.theme
 done
 
 ln -sf mp3.png Aluminium/replay/mp3oss.png
-sed -i -e 's|\bhelmetr\.ttf\b|%{sansfont}|g' Aluminium/Aluminium.skin
 rm -r Aluminium/{Aluminium.skin.*,MERKEN,fonts}
 
 cd DeepBlue
@@ -103,11 +122,9 @@ cd ..
 
 rm -r EgalSimple/{EgalSimple.skin.*,themes}
 
+rm -r EgalsTry/{theme,tools}
+
 cd Enigma
-sed -i -e 's|\bFont\.ttf\b|%{sansfont}|g' \
-    -e 's|\bFontBold\.ttf\b|%{boldfont}|g' \
-    -e 's|\bFontMonoSpaced\.ttf\b|%{monofont}|g' \
-    Enigma.skin
 rm -r fonts themes *.ttf
 find . -type f -iname thumbs.db | xargs rm
 mv icons icons-dxr3
@@ -116,16 +133,14 @@ cd ..
 
 rm -rf enElchi/themes
 
-sed -i -e 's|Vera\.ttf|%{sansfont}|g' -e 's|VeraBd\.ttf|%{boldfont}|g' \
-    izegrey16/izegrey16.skin
-
-# Remove translations if built for VDR 1.6.x for now, text2skin crash issues.
-if pkg-config --atleast-version 1.6.0 vdr ; then
-    find . -name "*.trans" -delete
-fi
+# *.trans not needed with text2skin >= 1.2 and vdr >= 1.6.0
+find . -name "*.trans" -delete
 
 
 %build
+for skin in DeepBlue enElchi Enigma ; do
+    make -C $skin %{?_smp_mflags}
+done
 
 
 %install
@@ -142,15 +157,17 @@ find $RPM_BUILD_ROOT%{vardir}/themes -na
 
 install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin
 cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{datadir}/text2skin/
+rm -r $RPM_BUILD_ROOT%{datadir}/text2skin/*/{Makefile,locale,po}
 
-
-%check
-for font in %{sansfont} %{boldfont} %{monofont} ; do
-    if [ ! -r "$font" ] ; then
-        "Font file $font does not exist, specfile probably needs updating"
-        exit 1
-    fi
+for skin in DeepBlue enElchi Enigma ; do
+    make -C $skin install-i18n DESTDIR=$RPM_BUILD_ROOT LOCDIR=%{_datadir}/locale
 done
+%find_lang %{name} --all-name
+# Note: .lang before .themes due to defattr in .themes
+cat %{name}.lang %{name}.themes > %{name}.files
+
+# Save a bit of space
+%{_sbindir}/hardlink -cv $RPM_BUILD_ROOT%{_datadir}
 
 
 %clean
@@ -180,7 +197,7 @@ if [ $2 -eq 0 ] ; then
 fi
 
 
-%files -f %{name}.themes
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc COPYING* HISTORY.* README.*
 
@@ -195,6 +212,8 @@ fi
 
 %{datadir}/text2skin/EgalSimple/
 
+%{datadir}/text2skin/EgalsTry/
+
 %{datadir}/text2skin/enElchi/
 
 %dir %{datadir}/text2skin/Enigma/
@@ -211,51 +230,60 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090901-1
+- Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey
+  font handling (no longer filename based font paths, phew).
+- Add EgalsTry 1.1.0.
+- Apply Thomas G?nther's locale patches for DeepBlue, enElchi, and Enigma.
+- Drop unused SilverGreen themes, install default properly.
+- Recompress cleaned up tarballs with xz.
+- Hardlink identical files.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081124-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Fri Feb 27 2009 Ville Skytt? <ville.skytta at iki.fi> - 20081124-5
+* Fri Feb 27 2009 Ville Skytt? <ville.skytta at iki.fi> - 20081124-5
 - More deja vu with dejavu-fonts changes (#480477).
 - Use %%global instead of %%define.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081124-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 20081124-3
+* Sat Jan 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 20081124-3
 - Use full DejaVu fonts instead of LGC (#477478).
 
-* Thu Dec 25 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081124-2
+* Thu Dec 25 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081124-2
 - Use DejaVu fonts for Aluminium and Enigma (#477478).
 
-* Mon Nov 24 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081124-1
+* Mon Nov 24 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081124-1
 - Update enElchi to 0.7.2.
 - Catch up again with latest dejavu-fonts changes.
 
-* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 20061119-6
+* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 20061119-6
 - Don't install translations if built for VDR 1.6.0 due to text2skin issues.
 - Re-add disttag.
 
-* Mon Dec 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-5
+* Mon Dec 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-5
 - Adjust font paths for dejavu-lgc-fonts 2.22+ (#388891).  Deja vu, indeed.
 
-* Sun Nov 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-4
+* Sun Nov 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-4
 - Adjust font paths for dejavu-lgc-fonts 2.21+ (#388891).
 
-* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-3
+* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-3
 - Use DejaVu LGC fonts instead of Bitstream Vera.
 - License: GPL+
 
-* Mon Apr 23 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-2
+* Mon Apr 23 2007 Ville Skytt? <ville.skytta at iki.fi> - 20061119-2
 - Relocate themes to /var/lib/vdr/themes, drop disttag (#216355).
 - Drop file based dependency on /usr/share/vdr/text2skin.
 - Fix sttng-blue source URL.
 
-* Sun Nov 19 2006 Ville Skytt? <ville.skytta at iki.fi> - 20061119-1
+* Sun Nov 19 2006 Ville Skytt? <ville.skytta at iki.fi> - 20061119-1
 - Install skins to /usr/share/vdr/text2skin.
 - Don't ship channel logos.
 
-* Sun Sep 24 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060924-1
+* Sun Sep 24 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060924-1
 - Add DXR3 compatible image set for DeepBlue from cccache.
 
-* Sun May 21 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060311-2
+* Sun May 21 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060311-2
 - Fix some enElchi logos.



From rvinyard at fedoraproject.org  Tue Sep  1 21:18:57 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  1 Sep 2009 21:18:57 +0000 (UTC)
Subject: rpms/papyrus/devel .cvsignore, 1.19, 1.20 papyrus.spec, 1.28,
	1.29 sources, 1.19, 1.20
Message-ID: <20090901211857.146E111C00EF@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20782

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Aug 2009 22:21:06 -0000	1.19
+++ .cvsignore	1 Sep 2009 21:18:56 -0000	1.20
@@ -1,2 +1,2 @@
-papyrus-0.12.0.tar.bz2
-papyrus-0.12.0-doc.tar.bz2
+papyrus-0.12.1.tar.bz2
+papyrus-0.12.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- papyrus.spec	5 Aug 2009 22:21:06 -0000	1.28
+++ papyrus.spec	1 Sep 2009 21:18:56 -0000	1.29
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.12.0
+Version:          0.12.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.12/papyrus/
 %dir %{_includedir}/papyrus-0.12/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.12.0/
+%{_datadir}/papyrus-0.12.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.12/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.12/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.12.0/
+%{_datadir}/papyrus-gtkmm-0.12.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Tue Sep  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.1-1
+- New release
+
 * Wed Aug  5 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.0-1
 - New release
 - Made doc subpackage noarch conditional


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Aug 2009 22:21:07 -0000	1.19
+++ sources	1 Sep 2009 21:18:56 -0000	1.20
@@ -1,2 +1,2 @@
-3d222606d9831f36e690b8d2f68c1478  papyrus-0.12.0.tar.bz2
-fae4586278eb7434dc82f09ccab1d753  papyrus-0.12.0-doc.tar.bz2
+e21696bde63a9cd8c6e662397d9937f0  papyrus-0.12.1.tar.bz2
+64c3fe69502228133115968ca7e4bf20  papyrus-0.12.1-doc.tar.bz2



From rvinyard at fedoraproject.org  Tue Sep  1 21:19:05 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  1 Sep 2009 21:19:05 +0000 (UTC)
Subject: rpms/papyrus/F-11 .cvsignore, 1.19, 1.20 papyrus.spec, 1.27,
	1.28 sources, 1.19, 1.20
Message-ID: <20090901211905.7EAB411C00EF@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20835

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Aug 2009 22:21:13 -0000	1.19
+++ .cvsignore	1 Sep 2009 21:19:05 -0000	1.20
@@ -1,2 +1,2 @@
-papyrus-0.12.0.tar.bz2
-papyrus-0.12.0-doc.tar.bz2
+papyrus-0.12.1.tar.bz2
+papyrus-0.12.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/papyrus.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- papyrus.spec	5 Aug 2009 22:21:13 -0000	1.27
+++ papyrus.spec	1 Sep 2009 21:19:05 -0000	1.28
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.12.0
+Version:          0.12.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.12/papyrus/
 %dir %{_includedir}/papyrus-0.12/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.12.0/
+%{_datadir}/papyrus-0.12.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.12/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.12/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.12.0/
+%{_datadir}/papyrus-gtkmm-0.12.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Tue Sep  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.1-1
+- New release
+
 * Wed Aug  5 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.0-1
 - New release
 - Made doc subpackage noarch conditional


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Aug 2009 22:21:13 -0000	1.19
+++ sources	1 Sep 2009 21:19:05 -0000	1.20
@@ -1,2 +1,2 @@
-3d222606d9831f36e690b8d2f68c1478  papyrus-0.12.0.tar.bz2
-fae4586278eb7434dc82f09ccab1d753  papyrus-0.12.0-doc.tar.bz2
+e21696bde63a9cd8c6e662397d9937f0  papyrus-0.12.1.tar.bz2
+64c3fe69502228133115968ca7e4bf20  papyrus-0.12.1-doc.tar.bz2



From rvinyard at fedoraproject.org  Tue Sep  1 21:19:12 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  1 Sep 2009 21:19:12 +0000 (UTC)
Subject: rpms/papyrus/F-10 .cvsignore, 1.19, 1.20 papyrus.spec, 1.30,
	1.31 sources, 1.19, 1.20
Message-ID: <20090901211912.34B4811C00EF@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20892

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Aug 2009 22:21:20 -0000	1.19
+++ .cvsignore	1 Sep 2009 21:19:12 -0000	1.20
@@ -1,2 +1,2 @@
-papyrus-0.12.0.tar.bz2
-papyrus-0.12.0-doc.tar.bz2
+papyrus-0.12.1.tar.bz2
+papyrus-0.12.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- papyrus.spec	5 Aug 2009 22:21:20 -0000	1.30
+++ papyrus.spec	1 Sep 2009 21:19:12 -0000	1.31
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.12.0
+Version:          0.12.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.12/papyrus/
 %dir %{_includedir}/papyrus-0.12/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.12.0/
+%{_datadir}/papyrus-0.12.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.12/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.12/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.12.0/
+%{_datadir}/papyrus-gtkmm-0.12.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Tue Sep  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.1-1
+- New release
+
 * Wed Aug  5 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.0-1
 - New release
 - Made doc subpackage noarch conditional


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Aug 2009 22:21:20 -0000	1.19
+++ sources	1 Sep 2009 21:19:12 -0000	1.20
@@ -1,2 +1,2 @@
-3d222606d9831f36e690b8d2f68c1478  papyrus-0.12.0.tar.bz2
-fae4586278eb7434dc82f09ccab1d753  papyrus-0.12.0-doc.tar.bz2
+e21696bde63a9cd8c6e662397d9937f0  papyrus-0.12.1.tar.bz2
+64c3fe69502228133115968ca7e4bf20  papyrus-0.12.1-doc.tar.bz2



From than at fedoraproject.org  Tue Sep  1 21:31:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 21:31:35 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-ossl-1.x.patch, NONE,
	1.1 kdelibs.spec, 1.511, 1.512
Message-ID: <20090901213135.DF3D211C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23410

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-ossl-1.x.patch 
Log Message:
- openssl-1.0 build fixes


kdelibs-4.3.1-ossl-1.x.patch:
 kopenssl.cpp |    2 +-
 kopenssl.h   |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-ossl-1.x.patch ---
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig kdelibs-4.3.1/kio/kssl/kopenssl.cpp
--- kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig	2009-09-01 21:58:06.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-01 22:08:16.000000000 +0200
@@ -622,7 +622,7 @@ KOpenSSLProxy::KOpenSSLProxy()
       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
 #endif
 
 
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.h.orig kdelibs-4.3.1/kio/kssl/kopenssl.h
--- kdelibs-4.3.1/kio/kssl/kopenssl.h.orig	2009-09-01 21:58:31.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-01 22:48:44.000000000 +0200
@@ -44,6 +44,14 @@ class KOpenSSLProxyPrivate;
 #include <openssl/stack.h>
 #include <openssl/bn.h>
 #undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define OSSL_SKVALUE_RTYPE void
+#define OSSL_MORECONST const
+#else
+#define OSSL_SKVALUE_RTYPE char
+#define OSSL_MORECONST
+#endif
 #endif
 
 /**
@@ -505,6 +513,9 @@ public:
     */
    void sk_free(STACK *s);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
 
    /*
     *  Number of elements in the stack
@@ -517,6 +528,9 @@ public:
     */
    char *sk_value(STACK *s, int n);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
 
    /*
     *  Create a new stack
@@ -529,6 +543,10 @@ public:
     */
    int sk_push(STACK *s, char *d);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
+
 
    /*
     *  Duplicate the stack


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- kdelibs.spec	1 Sep 2009 14:34:16 -0000	1.511
+++ kdelibs.spec	1 Sep 2009 21:31:35 -0000	1.512
@@ -80,6 +80,7 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
+Patch21: kdelibs-4.3.1-ossl-1.x.patch
 
 # upstream
 # 4.3 branch
@@ -209,6 +210,7 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
+%patch21 -p1 -b .ossl-1.x
 
 # upstream patches
 # 4.3
@@ -399,6 +401,7 @@ rm -rf %{buildroot}
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- openssl-1.0 build fixes
 
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - BR: xz-devel



From epienbro at fedoraproject.org  Tue Sep  1 21:39:21 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  1 Sep 2009 21:39:21 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel libsoup-disable-get-testcase.patch, NONE,
	1.1 mingw32-libsoup.spec, 1.6, 1.7
Message-ID: <20090901213921.B492411C00EF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25008

Modified Files:
	mingw32-libsoup.spec 
Added Files:
	libsoup-disable-get-testcase.patch 
Log Message:
Added a patch to workaround http://bugzilla.gnome.org/show_bug.cgi?id=593845


libsoup-disable-get-testcase.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libsoup-disable-get-testcase.patch ---
--- tests/Makefile.in.orig	2009-09-01 22:33:48.162419037 +0200
+++ tests/Makefile.in	2009-09-01 22:34:35.803667769 +0200
@@ -36,7 +36,7 @@
 host_triplet = @host@
 noinst_PROGRAMS = chunk-test$(EXEEXT) context-test$(EXEEXT) \
 	continue-test$(EXEEXT) date$(EXEEXT) dns$(EXEEXT) \
-	forms-test$(EXEEXT) get$(EXEEXT) getbug$(EXEEXT) \
+	forms-test$(EXEEXT) getbug$(EXEEXT) \
 	header-parsing$(EXEEXT) misc-test$(EXEEXT) ntlm-test$(EXEEXT) \
 	redirect-test$(EXEEXT) simple-httpd$(EXEEXT) \
 	simple-proxy$(EXEEXT) sniffing-test$(EXEEXT) \


Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-libsoup.spec	1 Sep 2009 19:43:01 -0000	1.6
+++ mingw32-libsoup.spec	1 Sep 2009 21:39:21 -0000	1.7
@@ -18,6 +18,9 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildArch:	noarch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=593845
+Patch0:         libsoup-disable-get-testcase.patch
+
 BuildRequires:	mingw32-filesystem
 BuildRequires:	mingw32-gcc
 BuildRequires:	mingw32-binutils
@@ -55,7 +58,7 @@ Static version of the MinGW Windows Libs
 
 %prep
 %setup -q -n libsoup-%{version}
-
+%patch0 -p0
 
 %build
 # Libsoup can't build static and shared libraries in one go, so we build the package twice here



From kkofler at fedoraproject.org  Tue Sep  1 21:41:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  1 Sep 2009 21:41:10 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 kdeplasma-addons.spec,1.20,1.21
Message-ID: <20090901214110.28CDD11C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25459/F-10

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Fix changelog typo.


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kdeplasma-addons.spec	1 Sep 2009 18:15:00 -0000	1.20
+++ kdeplasma-addons.spec	1 Sep 2009 21:41:09 -0000	1.21
@@ -163,7 +163,7 @@ rm -rf %{buildroot}
 - 4.3.1
 
 * Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
-- omit BR on kdevel-devel/eigen2-devel for rhel
+- omit BR on kdeedu-devel/eigen2-devel for rhel
 
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
 - Waited for newRepo task



From kkofler at fedoraproject.org  Tue Sep  1 21:41:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  1 Sep 2009 21:41:10 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11 kdeplasma-addons.spec,1.38,1.39
Message-ID: <20090901214110.444E111C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25459/F-11

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Fix changelog typo.


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kdeplasma-addons.spec	1 Sep 2009 18:15:00 -0000	1.38
+++ kdeplasma-addons.spec	1 Sep 2009 21:41:10 -0000	1.39
@@ -163,7 +163,7 @@ rm -rf %{buildroot}
 - 4.3.1
 
 * Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
-- omit BR on kdevel-devel/eigen2-devel for rhel
+- omit BR on kdeedu-devel/eigen2-devel for rhel
 
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
 - Waited for newRepo task



From kkofler at fedoraproject.org  Tue Sep  1 21:41:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  1 Sep 2009 21:41:10 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.58,1.59
Message-ID: <20090901214110.6AC5911C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25459/devel

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Fix changelog typo.


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- kdeplasma-addons.spec	28 Aug 2009 16:15:15 -0000	1.58
+++ kdeplasma-addons.spec	1 Sep 2009 21:41:10 -0000	1.59
@@ -163,7 +163,7 @@ rm -rf %{buildroot}
 - 4.3.1
 
 * Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
-- omit BR on kdevel-devel/eigen2-devel for rhel
+- omit BR on kdeedu-devel/eigen2-devel for rhel
 
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
 - Waited for newRepo task



From epienbro at fedoraproject.org  Tue Sep  1 21:42:50 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  1 Sep 2009 21:42:50 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.28,
	1.29 mingw32-scripts.sh, 1.3, 1.4
Message-ID: <20090901214250.648CE11C00EF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25784

Modified Files:
	mingw32-filesystem.spec mingw32-scripts.sh 
Log Message:
* Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 55-1
- The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config,
  mingw32-configure, mingw32-make and mingw32-cmake had a bug where
  quoted arguments could get interpreted incorrect.
  Thanks to Michael Ploujnikov for helping out with this issue



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mingw32-filesystem.spec	29 Aug 2009 14:35:44 -0000	1.28
+++ mingw32-filesystem.spec	1 Sep 2009 21:42:50 -0000	1.29
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        54
+Version:        55
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -166,6 +166,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 55-1
+- The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config,
+  mingw32-configure, mingw32-make and mingw32-cmake had a bug where
+  quoted arguments could get interpreted incorrect.
+  Thanks to Michael Ploujnikov for helping out with this issue
+
 * Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 54-1
 - Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script
   which calls pkg-config with the right environment variables set (BZ #513825)


Index: mingw32-scripts.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-scripts.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-scripts.sh	29 Aug 2009 14:40:08 -0000	1.3
+++ mingw32-scripts.sh	1 Sep 2009 21:42:50 -0000	1.4
@@ -26,4 +26,8 @@ if [ "`basename $0`" = "i686-pc-mingw32-
 else
     NAME="_`basename $0|tr -- - _`"
 fi
-eval "`rpm --eval "%{$NAME}"`" "$@"
+
+# NOTE: The use of 'eval' in combination with '$@' is a potential security risk
+#       We should find a more safe replacement for this command
+#       Suggestions are welcome at the Fedora MinGW mailing list
+eval "`rpm --eval "%{$NAME}"`" '"$@"'



From than at fedoraproject.org  Tue Sep  1 22:03:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Sep 2009 22:03:59 +0000 (UTC)
Subject: rpms/arts/devel arts.spec,1.95,1.96
Message-ID: <20090901220359.A4F3811C00EF@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3702

Modified Files:
	arts.spec 
Log Message:
- drop support fedora < 10




Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/devel/arts.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- arts.spec	24 Jul 2009 17:09:01 -0000	1.95
+++ arts.spec	1 Sep 2009 22:03:59 -0000	1.96
@@ -6,20 +6,7 @@
 %define final 1 
 %define make_cvs 1
 
-%if 0%{?fedora} < 10
-%define _with_esd --with-esd
-%define _with_nas --with-nas
-%if 0%{?rhel} == 0
-%define _with_jack --with-jack
-%endif
-%endif
-
-%if 0%{?fedora} > 8
 %define qt3 qt3
-%else
-%define qt3 qt
-%define qt3_epoch 1:
-%endif
 %define qt3_ev %{?qt3_epoch}3.3.8
 
 Name:    arts
@@ -27,7 +14,7 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -51,20 +38,14 @@ Patch51: kde-3.5-libtool-shlibext.patch
 Requires: which
 
 BuildRequires: %{qt3}-devel >= %{qt3_ev}
-## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them.  (-;
-#global qt3_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt3_ev})
-#Requires: %{qt3} >= %{qt3_ver}
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
-%{?_with_esd:BuildRequires: esound-devel}
 BuildRequires: findutils sed
 BuildRequires: glib2-devel
-%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
 BuildRequires: libvorbis-devel
-%{?_with_nas:BuildRequires: nas-devel}
 BuildRequires: pkgconfig
 
 
@@ -121,9 +102,6 @@ unset QTDIR && . /etc/profile.d/qt.sh
   --enable-new-ldflags \
   --disable-libmad \
   --with-alsa \
-  %{?_with_esd} %{!?_with_esd:--without-esd} \
-  %{?_with_jack} %{!?_with_jack:--without-jack}\
-  %{?_with_nas} %{!?_with_nas:--without-nas} \
 %if 0%{?final}
   --enable-final
 %endif
@@ -210,6 +188,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 Than Ngo <than at redhat.com> - 1.5.10-8
+- drop support fedora < 10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8:1.5.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Tue Sep  1 22:08:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  1 Sep 2009 22:08:03 +0000 (UTC)
Subject: rpms/arts/devel arts.spec,1.96,1.97
Message-ID: <20090901220803.1C1DD11C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6129/devel

Modified Files:
	arts.spec 
Log Message:
Remove/substitute macros turned redundant by removing the conditionals.


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- arts.spec	1 Sep 2009 22:03:59 -0000	1.96
+++ arts.spec	1 Sep 2009 22:08:02 -0000	1.97
@@ -6,9 +6,6 @@
 %define final 1 
 %define make_cvs 1
 
-%define qt3 qt3
-%define qt3_ev %{?qt3_epoch}3.3.8
-
 Name:    arts
 Summary: aRts (analog realtime synthesizer) - the KDE sound system 
 Group:   System Environment/Daemons
@@ -37,7 +34,7 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # used in artsdsp
 Requires: which
 
-BuildRequires: %{qt3}-devel >= %{qt3_ev}
+BuildRequires: qt3-devel >= 3.3.8
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
 %if %{make_cvs}
@@ -65,7 +62,7 @@ playing a wave file with some effects.
 Group: Development/Libraries
 Summary: Development files for the aRts sound server
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: %{qt3}-devel
+Requires: qt3-devel
 Requires: pkgconfig
 Requires: glib2-devel
 %description devel



From pghmcfc at fedoraproject.org  Tue Sep  1 22:12:14 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue,  1 Sep 2009 22:12:14 +0000 (UTC)
Subject: rpms/redhat-rpm-config/F-10 redhat-rpm-config.spec,1.59,1.60
Message-ID: <20090901221214.E081611C0349@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/redhat-rpm-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9200/F-10

Modified Files:
	redhat-rpm-config.spec 
Log Message:
Fix unescaped %buildroot macro in changelog


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/redhat-rpm-config.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- redhat-rpm-config.spec	21 Aug 2009 20:54:07 -0000	1.59
+++ redhat-rpm-config.spec	1 Sep 2009 22:12:14 -0000	1.60
@@ -38,7 +38,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - add filtering system macros, w/o backporting other updates (#516240)
 
 * Tue Jul 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-5
-- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
+- always delete %%buildroot as first step of %%install (as long as %%buildroot is not /)
 
 * Mon Feb 16 2009 Dennis Gilmore <dennis at ausil.us> - 9.0.3-4
 - limit _smp_flags to -j16



From pghmcfc at fedoraproject.org  Tue Sep  1 22:12:15 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue,  1 Sep 2009 22:12:15 +0000 (UTC)
Subject: rpms/redhat-rpm-config/F-11 redhat-rpm-config.spec,1.65,1.66
Message-ID: <20090901221215.2354911C0349@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/redhat-rpm-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9200/F-11

Modified Files:
	redhat-rpm-config.spec 
Log Message:
Fix unescaped %buildroot macro in changelog


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-11/redhat-rpm-config.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- redhat-rpm-config.spec	21 Aug 2009 20:48:08 -0000	1.65
+++ redhat-rpm-config.spec	1 Sep 2009 22:12:14 -0000	1.66
@@ -44,7 +44,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - add filtering system macros, w/o backporting other updates (#516240)
 
 * Tue Jul 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-10
-- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
+- always delete %%buildroot as first step of %%install (as long as %%buildroot is not /)
 
 * Wed Jun 03 2009 Adam Jackson <ajax at redhat.com> 9.0.3-9
 - limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)



From thm at fedoraproject.org  Tue Sep  1 22:55:18 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue,  1 Sep 2009 22:55:18 +0000 (UTC)
Subject: rpms/ikiwiki/F-10 ikiwiki-2.72-teximg.patch, NONE, 1.1 ikiwiki.spec,
	1.12, 1.13
Message-ID: <20090901225518.C3D6A11C00EF@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21192

Modified Files:
	ikiwiki.spec 
Added Files:
	ikiwiki-2.72-teximg.patch 
Log Message:
* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-2
- Add patch for teximg plugin: Make TeX handle preventing unsafe
  things; remove insufficient blacklist (fixes CVE-2009-2944, see
  bz 520543).


ikiwiki-2.72-teximg.patch:
 teximg.pm |   41 ++---------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

--- NEW FILE ikiwiki-2.72-teximg.patch ---
>From f41d51c825450c5f423b35d887e99820369402f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey at gnu.kitenet.net>
Date: Tue, 1 Sep 2009 15:31:21 -0400
Subject: [PATCH] teximg: Make TeX handle preventing unsafe things; remove insufficient blacklist

TeX has configuration options that prevent unsafe things like shell
escapes and insecure file reads/writes.  Turn all of them on.

teximg's regex-based blacklist does not suffice.  For instance:

[[!teximg code="""
\catcode`\%=0
%input{/etc/passwd}
"""]]

Remove the blacklist, since the TeX configuration options seal off the
underlying mechanisms more safely, and the blacklist blocks other TeX
commands that can prove useful.

Conflicts:

	debian/changelog
---
 IkiWiki/Plugin/teximg.pm |   40 ++--------------------------------------
 1 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 57b2314..099ec63 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -69,13 +69,7 @@ sub preprocess (@) {
 	if (! defined $code && ! length $code) {
 		error gettext("missing tex code");
 	}
-
-	if (check($code)) {
-		return create($code, check_height($height), \%params);
-	}
-	else {
-		error gettext("code includes disallowed latex commands")
-	}
+	return create($code, check_height($height), \%params);
 }
 
 sub check_height ($) {
@@ -155,7 +149,7 @@ sub gen_image ($$$$) {
 	my $tmp = eval { create_tmp_dir($digest) };
 	if (! $@ &&
 	    writefile("$digest.tex", $tmp, $tex) &&
-	    system("cd $tmp; latex --interaction=nonstopmode $tmp/$digest.tex > /dev/null") == 0 &&
+	    system("cd $tmp; shell_escape=f openout_any=p openin_any=p latex --interaction=nonstopmode $digest.tex < /dev/null > /dev/null") == 0 &&
 	    # ensure destination directory exists
 	    writefile("$imagedir/$digest.png", $config{destdir}, "") &&
 	    (($config{teximg_dvipng} &&
@@ -191,34 +185,4 @@ sub create_tmp_dir ($) {
 	return $tmpdir;
 }
 
-sub check ($) {
-	# Check if the code is ok
-	my $code = shift;
-
-	my @badthings = (
-		qr/\$\$/,
-		qr/\\include/,
-		qr/\\includegraphic/,
-		qr/\\usepackage/,
-		qr/\\newcommand/, 
-		qr/\\renewcommand/,
-		qr/\\def/,
-		qr/\\input/,
-		qr/\\open/,
-		qr/\\loop/,
-		qr/\\errorstopmode/,
-		qr/\\scrollmode/,
-		qr/\\batchmode/,
-		qr/\\read/,
-		qr/\\write/,
-	);
-	
-	foreach my $thing (@badthings) {
-		if ($code =~ m/$thing/ ) {
-			return 0;
-		}
-	}
-	return 1;
-}
-
 1
-- 
1.6.3.3



Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/ikiwiki.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ikiwiki.spec	2 Jan 2009 11:32:27 -0000	1.12
+++ ikiwiki.spec	1 Sep 2009 22:55:17 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ikiwiki
 Version:        2.72
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
 Patch0:         ikiwiki-2.72-libexecdir.patch
+Patch1:         ikiwiki-2.72-teximg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -49,6 +50,7 @@ array of plugins.
 %prep
 %setup0 -q -n %{name}
 %patch0 -p1 -b .libexecdir
+%patch1 -p1
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -143,6 +145,11 @@ meta-wrapper in this package.
 
 
 %changelog
+* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-2
+- Add patch for teximg plugin: Make TeX handle preventing unsafe
+  things; remove insufficient blacklist (fixes CVE-2009-2944, see
+  bz 520543).
+
 * Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-1
 - Update to 2.72.
 - Patch for mtn plugin has been applied upstream.



From nhorman at fedoraproject.org  Tue Sep  1 23:07:08 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Sep 2009 23:07:08 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance.spec,1.59,1.60
Message-ID: <20090901230708.CF8F811C00EF@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27087

Modified Files:
	irqbalance.spec 
Log Message:
Fixing BuildRequires


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- irqbalance.spec	1 Sep 2009 20:11:06 -0000	1.59
+++ irqbalance.spec	1 Sep 2009 23:07:07 -0000	1.60
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	19%{?dist}
+Release:	20%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -11,6 +11,7 @@ Source1:	irqbalance.init
 Source2:	irqbalance.sysconfig
 Source3:	irqbalance.1
 Buildroot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:	autoreconf
 Requires(post):	chkconfig
 Requires(postun):chkconfig
 Requires(preun):chkconfig
@@ -81,6 +82,9 @@ exit 0
 
 
 %changelog
+* Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-20
+- Fixing BuildRequires for new config script
+
 * Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-19
 - Incorporate capng (bz 520699)
 



From nhorman at fedoraproject.org  Tue Sep  1 23:30:55 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Sep 2009 23:30:55 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance.spec,1.60,1.61
Message-ID: <20090901233055.95B7111C0345@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7143

Modified Files:
	irqbalance.spec 
Log Message:
Fixing spec file


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- irqbalance.spec	1 Sep 2009 23:07:07 -0000	1.60
+++ irqbalance.spec	1 Sep 2009 23:30:53 -0000	1.61
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	20%{?dist}
+Release:	21%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -11,7 +11,7 @@ Source1:	irqbalance.init
 Source2:	irqbalance.sysconfig
 Source3:	irqbalance.1
 Buildroot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	autoreconf
+BuildRequires:	autoconf
 Requires(post):	chkconfig
 Requires(postun):chkconfig
 Requires(preun):chkconfig
@@ -82,6 +82,9 @@ exit 0
 
 
 %changelog
+* Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-21
+- Fixing BuildRequires for new config script
+
 * Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-20
 - Fixing BuildRequires for new config script
 



From mjakubicek at fedoraproject.org  Tue Sep  1 23:33:07 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue,  1 Sep 2009 23:33:07 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel .cvsignore, 1.2,
	1.3 maven2-common-poms-jpp-depmap.xml, 1.4,
	1.5 maven2-common-poms.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090901233307.899DF11C00EF@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7849

Modified Files:
	.cvsignore maven2-common-poms-jpp-depmap.xml 
	maven2-common-poms.spec sources 
Log Message:
- Added JPP.codehaus-mojo-parent.pom
- Fix cobertura's jar name in the depmap, should be maven2-plugin-cobertura




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Mar 2007 15:25:51 -0000	1.2
+++ .cvsignore	1 Sep 2009 23:33:07 -0000	1.3
@@ -1,2 +1 @@
-maven2-common-poms-docs.tar.gz
 maven2-common-poms-src.tar.gz


Index: maven2-common-poms-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- maven2-common-poms-jpp-depmap.xml	18 Aug 2009 19:54:22 -0000	1.4
+++ maven2-common-poms-jpp-depmap.xml	1 Sep 2009 23:33:07 -0000	1.5
@@ -1292,6 +1292,18 @@
 	</dependency>
 	<dependency>
 		<maven>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>mojo-parent</artifactId>
+			<version>21</version>
+		</maven>
+		<jpp>
+			<groupId>JPP/codehaus</groupId>
+			<artifactId>mojo-parent</artifactId>
+			<version>21</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-components</artifactId>
 			<version>1.1.4</version>
@@ -3125,7 +3137,7 @@
         </maven>
         <jpp>
             <groupId>JPP</groupId>
-            <artifactId>maven-cobertura-plugin</artifactId>
+            <artifactId>maven2-plugin-cobertura</artifactId>
             <version>2.0</version>
         </jpp>
     </dependency>


Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- maven2-common-poms.spec	19 Aug 2009 13:07:41 -0000	1.8
+++ maven2-common-poms.spec	1 Sep 2009 23:33:07 -0000	1.9
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           8%{?dist}
+Release:           9%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -91,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2
 
 %changelog
+* Tue Sep  1 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.0-9
+- Added JPP.codehaus-mojo-parent.pom
+- Fix cobertura's jar name in the depmap, should be maven2-plugin-cobertura
+
 * Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.0-8
 - From Yong Yang:
 - Fix JPP.excalibur-logkit.pom's version by sed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Aug 2009 19:53:55 -0000	1.3
+++ sources	1 Sep 2009 23:33:07 -0000	1.4
@@ -1,2 +1 @@
-e1a697356772cf0dc7badade59aa922b  maven2-common-poms-docs.tar.gz
-1c5984e16007290912b8eaaeaaf27c14  maven2-common-poms-src.tar.gz
+7868675a900fce52e93f3f3ddf78030e  maven2-common-poms-src.tar.gz



From mjakubicek at fedoraproject.org  Tue Sep  1 23:36:15 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue,  1 Sep 2009 23:36:15 +0000 (UTC)
Subject: rpms/protobuf/devel protobuf.spec,1.6,1.7
Message-ID: <20090901233615.BBA1111C00EF@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/protobuf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8754

Modified Files:
	protobuf.spec 
Log Message:
- Fix FTBFS (BZ#511491): fix autotools to find gtest-config




Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/protobuf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- protobuf.spec	26 Jul 2009 19:29:54 -0000	1.6
+++ protobuf.spec	1 Sep 2009 23:36:15 -0000	1.7
@@ -13,7 +13,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        2.0.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -148,7 +148,14 @@ rm -rf java/src/test
 
 %build
 ./autogen.sh
+%if !%{without_gtest}
+export GTEST_CONFIG=`which gtest-config`
+sed -i -e 's|AS_IF(\[test "x$HAVE_GTEST" = "xyes"\],||' -e 's|\[m4_ifval(\[$2\], \[$2\])\],||' -e 's|\[m4_ifval(\[$3\], \[$3\])\])||' aclocal.m4
+autoconf
+%configure --enable-gtest
+%else
 %configure
+%endif
 
 make %{?_smp_mflags}
 
@@ -268,6 +275,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep  2 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.0.2-10
+- Fix FTBFS (BZ#511491): fix autotools to find gtest-config
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Tue Sep  1 23:39:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue,  1 Sep 2009 23:39:27 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <20090901233927.2057411C00EF@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9599

Modified Files:
	.cvsignore sources 
Log Message:
- Fix sources upload of docs from previous commit




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Sep 2009 23:33:07 -0000	1.3
+++ .cvsignore	1 Sep 2009 23:39:26 -0000	1.4
@@ -1 +1,2 @@
+maven2-common-poms-docs.tar.gz
 maven2-common-poms-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Sep 2009 23:33:07 -0000	1.4
+++ sources	1 Sep 2009 23:39:26 -0000	1.5
@@ -1 +1,2 @@
+e1a697356772cf0dc7badade59aa922b  maven2-common-poms-docs.tar.gz
 7868675a900fce52e93f3f3ddf78030e  maven2-common-poms-src.tar.gz



From mbarnes at fedoraproject.org  Tue Sep  1 23:56:59 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  1 Sep 2009 23:56:59 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.36,1.394.2.37
Message-ID: <20090901235659.90D3411C00EF@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14337

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix evo_major.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.36
retrieving revision 1.394.2.37
diff -u -p -r1.394.2.36 -r1.394.2.37
--- evolution.spec	1 Sep 2009 19:38:01 -0000	1.394.2.36
+++ evolution.spec	1 Sep 2009 23:56:59 -0000	1.394.2.37
@@ -21,7 +21,7 @@
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
 
-%define evo_major 2.30
+%define evo_major 2.28
 
 %define exchange_support 1
 %define inline_audio_support 1



From nhorman at fedoraproject.org  Tue Sep  1 23:59:01 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Sep 2009 23:59:01 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance.spec,1.61,1.62
Message-ID: <20090901235901.8803711C00EF@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14893

Modified Files:
	irqbalance.spec 
Log Message:
Fixing spec file


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- irqbalance.spec	1 Sep 2009 23:30:53 -0000	1.61
+++ irqbalance.spec	1 Sep 2009 23:59:01 -0000	1.62
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	21%{?dist}
+Release:	22%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -11,7 +11,7 @@ Source1:	irqbalance.init
 Source2:	irqbalance.sysconfig
 Source3:	irqbalance.1
 Buildroot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	autoconf
+BuildRequires:	autoconf automake
 Requires(post):	chkconfig
 Requires(postun):chkconfig
 Requires(preun):chkconfig
@@ -82,6 +82,9 @@ exit 0
 
 
 %changelog
+* Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-22
+- Fixing BuildRequires for new config script
+
 * Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-21
 - Fixing BuildRequires for new config script
 



From notting at fedoraproject.org  Wed Sep  2 00:01:31 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  2 Sep 2009 00:01:31 +0000 (UTC)
Subject: comps/po comps.pot,1.19,NONE
Message-ID: <20090902000131.0D6B811C00EF@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15568

Removed Files:
	comps.pot 
Log Message:
Remove comps.pot per request (#520264)



--- comps.pot DELETED ---



From wakko666 at fedoraproject.org  Wed Sep  2 00:32:34 2009
From: wakko666 at fedoraproject.org (Brett Lentz)
Date: Wed,  2 Sep 2009 00:32:34 +0000 (UTC)
Subject: rpms/rubygem-facade/devel import.log, NONE, 1.1 rubygem-facade.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902003234.253DA11C00EF@cvs1.fedora.phx.redhat.com>

Author: wakko666

Update of /cvs/pkgs/rpms/rubygem-facade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26940/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-facade.spec 
Log Message:
Import rubygem-facade



--- NEW FILE import.log ---
rubygem-facade-1_0_4-4_fc11:HEAD:rubygem-facade-1.0.4-4.fc11.src.rpm:1251851503


--- NEW FILE rubygem-facade.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname    facade
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Version:        1.0.4
Release:        4%{?dist}
Summary:        A module that helps implement the facade pattern

Group:          Development/Languages
License:        Artistic 2.0
URL:            http://raa.ruby-lang.org/project/facade
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: rubygem(rake)
BuildRequires: rubygems
BuildRequires: ruby(abi) = 1.8

Requires:      rubygems
Requires:      ruby(abi) = 1.8

Provides:      rubygem(%{gemname}) = %{version}

%description
A simple way to implement the facade pattern in Ruby.

%prep

%build

%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{gemdir}
gem install --local --install-dir=%{buildroot}%{gemdir} \
   --force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}/test
rake test

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %{geminstdir}
%dir %{geminstdir}/lib
%dir %{geminstdir}/test
%doc %{geminstdir}/CHANGES
%doc %{geminstdir}/MANIFEST
%doc %{geminstdir}/README
%doc %{gemdir}/doc/%{gemname}-%{version}
%{geminstdir}/%{gemname}.gemspec
%{geminstdir}/Rakefile
%{geminstdir}/lib/%{gemname}.rb
%{geminstdir}/test/test_facade.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-4
- Simplify a few things in the files section. 

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-3
- Fix a few more spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518082

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-2
- Fix a few spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518082

* Tue Aug 18 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-1
- First packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facade/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:51:39 -0000	1.1
+++ .cvsignore	2 Sep 2009 00:32:33 -0000	1.2
@@ -0,0 +1 @@
+facade-1.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facade/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:51:39 -0000	1.1
+++ sources	2 Sep 2009 00:32:33 -0000	1.2
@@ -0,0 +1 @@
+331a5d86167e076fc46863e24f6fd536  facade-1.0.4.gem



From wakko666 at fedoraproject.org  Wed Sep  2 00:35:45 2009
From: wakko666 at fedoraproject.org (Brett Lentz)
Date: Wed,  2 Sep 2009 00:35:45 +0000 (UTC)
Subject: rpms/rubygem-facade/F-12 import.log, NONE, 1.1 rubygem-facade.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902003545.B478211C00EF@cvs1.fedora.phx.redhat.com>

Author: wakko666

Update of /cvs/pkgs/rpms/rubygem-facade/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30587/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-facade.spec 
Log Message:
Import rubygem-facade into branch F-12



--- NEW FILE import.log ---
rubygem-facade-1_0_4-4_fc11:F-12:rubygem-facade-1.0.4-4.fc11.src.rpm:1251851722


--- NEW FILE rubygem-facade.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname    facade
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Version:        1.0.4
Release:        4%{?dist}
Summary:        A module that helps implement the facade pattern

Group:          Development/Languages
License:        Artistic 2.0
URL:            http://raa.ruby-lang.org/project/facade
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: rubygem(rake)
BuildRequires: rubygems
BuildRequires: ruby(abi) = 1.8

Requires:      rubygems
Requires:      ruby(abi) = 1.8

Provides:      rubygem(%{gemname}) = %{version}

%description
A simple way to implement the facade pattern in Ruby.

%prep

%build

%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{gemdir}
gem install --local --install-dir=%{buildroot}%{gemdir} \
   --force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}/test
rake test

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %{geminstdir}
%dir %{geminstdir}/lib
%dir %{geminstdir}/test
%doc %{geminstdir}/CHANGES
%doc %{geminstdir}/MANIFEST
%doc %{geminstdir}/README
%doc %{gemdir}/doc/%{gemname}-%{version}
%{geminstdir}/%{gemname}.gemspec
%{geminstdir}/Rakefile
%{geminstdir}/lib/%{gemname}.rb
%{geminstdir}/test/test_facade.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-4
- Simplify a few things in the files section. 

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-3
- Fix a few more spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518082

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-2
- Fix a few spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518082

* Tue Aug 18 2009 Brett Lentz <wakko666 at gmail.com> - 1.0.4-1
- First packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facade/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:51:39 -0000	1.1
+++ .cvsignore	2 Sep 2009 00:35:45 -0000	1.2
@@ -0,0 +1 @@
+facade-1.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facade/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:51:39 -0000	1.1
+++ sources	2 Sep 2009 00:35:45 -0000	1.2
@@ -0,0 +1 @@
+331a5d86167e076fc46863e24f6fd536  facade-1.0.4.gem



From bpepple at fedoraproject.org  Wed Sep  2 00:56:04 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed,  2 Sep 2009 00:56:04 +0000 (UTC)
Subject: rpms/empathy/devel empathy-broken-nm.patch, NONE, 1.1 empathy.spec, 
	1.74, 1.75
Message-ID: <20090902005604.3DC0011C00EF@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6496

Modified Files:
	empathy.spec 
Added Files:
	empathy-broken-nm.patch 
Log Message:
* Tue Sep  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-6
- Add patch to workaround NetworkManager pc file name change.


empathy-broken-nm.patch:
 configure    |   16 ++++++++--------
 configure.ac |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE empathy-broken-nm.patch ---
diff -urp empathy-2.27.91.1.OLD/configure empathy-2.27.91.1/configure
--- empathy-2.27.91.1.OLD/configure	2009-08-25 11:58:07.000000000 -0400
+++ empathy-2.27.91.1/configure	2009-09-01 20:19:21.000104092 -0400
@@ -18227,16 +18227,16 @@ if test -n "$PKG_CONFIG"; then
     else
         if test -n "$PKG_CONFIG" && \
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-      libnm_glib >= \$NETWORK_MANAGER_REQUIRED
+      libnm-glib >= \$NETWORK_MANAGER_REQUIRED
    \"") >&5
   ($PKG_CONFIG --exists --print-errors "
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    " 2>/dev/null`
 else
   pkg_failed=yes
@@ -18251,16 +18251,16 @@ if test -n "$PKG_CONFIG"; then
     else
         if test -n "$PKG_CONFIG" && \
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-      libnm_glib >= \$NETWORK_MANAGER_REQUIRED
+      libnm-glib >= \$NETWORK_MANAGER_REQUIRED
    \"") >&5
   ($PKG_CONFIG --exists --print-errors "
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    " 2>/dev/null`
 else
   pkg_failed=yes
@@ -18281,11 +18281,11 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    "`
         else
 	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    "`
         fi
 	# Put the nasty error message in config.log where it belongs
diff -urp empathy-2.27.91.1.OLD/configure.ac empathy-2.27.91.1/configure.ac
--- empathy-2.27.91.1.OLD/configure.ac	2009-08-25 11:46:02.000000000 -0400
+++ empathy-2.27.91.1/configure.ac	2009-09-01 20:18:24.951104847 -0400
@@ -183,7 +183,7 @@ else
 
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    ], have_nm="yes", have_nm="no")
 
    if test "x$have_nm" = "xyes"; then


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- empathy.spec	29 Aug 2009 20:54:04 -0000	1.74
+++ empathy.spec	2 Sep 2009 00:56:03 -0000	1.75
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.91.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -36,6 +36,7 @@ Patch2:		%{name}-desktop-category.patch
 Patch3:		presence-icons.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=593318
 Patch4:		%{name}-fix-nav-handling.patch
+Patch5:		%{name}-broken-nm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -140,6 +141,7 @@ bindings to the libempathy and libempath
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .presence-icons
 %patch4 -p1 -b .fix-nav-handling
+%patch5 -p1 -b .nm
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -248,6 +250,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Sep  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-6
+- Add patch to workaround NetworkManager pc file name change.
+
 * Sat Aug 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-5
 - Backport patch to fix incorrect assumption about navigation-request. (#519849)
 



From cweyl at fedoraproject.org  Wed Sep  2 02:03:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  2 Sep 2009 02:03:50 +0000 (UTC)
Subject: rpms/perl-JSON/devel perl-JSON.spec,1.16,1.17
Message-ID: <20090902020350.F15C211C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21131

Modified Files:
	perl-JSON.spec 
Log Message:
release bump


Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/perl-JSON.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-JSON.spec	1 Sep 2009 04:06:27 -0000	1.16
+++ perl-JSON.spec	2 Sep 2009 02:03:50 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-4
+- bump
+
 * Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
 - update filtering 
 



From cweyl at fedoraproject.org  Wed Sep  2 02:05:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  2 Sep 2009 02:05:34 +0000 (UTC)
Subject: rpms/perl-JSON/F-11 perl-JSON.spec,1.15,1.16
Message-ID: <20090902020534.9EC7411C00EF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21570

Modified Files:
	perl-JSON.spec 
Log Message:
* Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-4
- bump



Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/F-11/perl-JSON.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-JSON.spec	1 Sep 2009 04:10:51 -0000	1.15
+++ perl-JSON.spec	2 Sep 2009 02:05:34 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-4
+- bump
+
 * Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
 - update filtering 
 



From pkgdb at fedoraproject.org  Wed Sep  2 02:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 02:46:21 +0000
Subject: [pkgdb] media-player-info was added for mclasen
Message-ID: <20090902024622.07DAB10F882@bastion2.fedora.phx.redhat.com>

wtogami has added Package media-player-info with summary Data files describing media player capabilities
wtogami has approved Package media-player-info
wtogami has added a Fedora devel branch for media-player-info with an owner of mclasen
wtogami has approved media-player-info in Fedora devel
wtogami has approved Package media-player-info
wtogami has set commit to Approved for 107427 on media-player-info (Fedora devel)
wtogami has set checkout to Approved for 107427 on media-player-info (Fedora devel)
wtogami has set build to Approved for 107427 on media-player-info (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/media-player-info



From pkgdb at fedoraproject.org  Wed Sep  2 02:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 02:46:22 +0000
Subject: [pkgdb] media-player-info summary updated by wtogami
Message-ID: <20090902024622.E4FAB10F890@bastion2.fedora.phx.redhat.com>

wtogami set package media-player-info summary to Data files describing media player capabilities

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/media-player-info



From wtogami at fedoraproject.org  Wed Sep  2 02:48:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 02:48:00 +0000 (UTC)
Subject: rpms/media-player-info/devel - New directory
Message-ID: <20090902024800.3ABA811C02BB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/media-player-info/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsq32293/rpms/media-player-info/devel

Log Message:
Directory /cvs/pkgs/rpms/media-player-info/devel added to the repository




From wtogami at fedoraproject.org  Wed Sep  2 02:48:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 02:48:00 +0000 (UTC)
Subject: rpms/media-player-info - New directory
Message-ID: <20090902024800.1E02411C00EF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/media-player-info
In directory cvs1.fedora.phx.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsq32293/rpms/media-player-info

Log Message:
Directory /cvs/pkgs/rpms/media-player-info added to the repository




From wtogami at fedoraproject.org  Wed Sep  2 02:48:06 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 02:48:06 +0000 (UTC)
Subject: rpms/media-player-info Makefile,NONE,1.1
Message-ID: <20090902024806.A937911C00EF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/media-player-info
In directory cvs1.fedora.phx.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsq32293/rpms/media-player-info

Added Files:
	Makefile 
Log Message:
Setup of module media-player-info


--- NEW FILE Makefile ---
# Top level Makefile for module media-player-info
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 wtogami at fedoraproject.org  Wed Sep  2 02:48:06 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 02:48:06 +0000 (UTC)
Subject: rpms/media-player-info/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090902024806.DD72411C00EF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/media-player-info/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsq32293/rpms/media-player-info/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module media-player-info


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: media-player-info
# $Id: Makefile,v 1.1 2009/09/02 02:48:06 wtogami Exp $
NAME := media-player-info
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 jcollie at fedoraproject.org  Wed Sep  2 02:53:50 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  2 Sep 2009 02:53:50 +0000 (UTC)
Subject: rpms/asterisk/devel 0016-pagecount.patch, NONE, 1.1 asterisk.spec, 
	1.53, 1.54
Message-ID: <20090902025350.2A6BA11C00EF@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1400

Modified Files:
	asterisk.spec 
Added Files:
	0016-pagecount.patch 
Log Message:
* Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
- Add a patch from Quentin Armitage and rebuld.


0016-pagecount.patch:
 app_fax.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE 0016-pagecount.patch ---
--- a/apps/app_fax.c	2008-12-15 15:50:12.000000000 +0000
+++ b/apps/app_fax.c	2009-09-02 00:05:15.000000000 +0100
@@ -161,6 +161,7 @@
 	char buf[20];
 	fax_session *s = (fax_session *) user_data;
 	t30_stats_t stat;
+	int pages_transferred;
 
 	ast_debug(1, "Fax phase E handler. result=%d\n", result);
 
@@ -186,7 +187,12 @@
 	pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); 
 	pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); 
 	pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident);
-	snprintf(buf, sizeof(buf), "%d", stat.pages_transferred);
+#if SPANDSP_RELEASE_DATE >= 20090220
+	pages_transferred = (s->direction) ? stat.pages_tx : stat.pages_rx;
+#else
+	pages_transferred = stat.pages_transferred;
+#endif
+	snprintf(buf, sizeof(buf), "%d", pages_transferred);
 	pbx_builtin_setvar_helper(s->chan, "FAXPAGES", buf);
 	snprintf(buf, sizeof(buf), "%d", stat.y_resolution);
 	pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", buf);
@@ -195,7 +201,7 @@
 	
 	ast_debug(1, "Fax transmitted successfully.\n");
 	ast_debug(1, "  Remote station ID: %s\n", far_ident);
-	ast_debug(1, "  Pages transferred: %d\n", stat.pages_transferred);
+	ast_debug(1, "  Pages transferred: %d\n", pages_transferred);
 	ast_debug(1, "  Image resolution:  %d x %d\n", stat.x_resolution, stat.y_resolution);
 	ast_debug(1, "  Transfer Rate:     %d\n", stat.bit_rate);
 	
@@ -215,7 +221,7 @@
 		      S_OR(s->chan->cid.cid_num, ""),
 		      far_ident,
 		      local_ident,
-		      stat.pages_transferred,
+		      pages_transferred,
 		      stat.y_resolution,
 		      stat.bit_rate,
 		      s->file_name);


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- asterisk.spec	21 Aug 2009 12:31:44 -0000	1.53
+++ asterisk.spec	2 Sep 2009 02:53:49 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.25.%{?_rc:rc%{_rc}}%{?dist}
+Release: 0.26.%{?_rc:rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -55,6 +55,7 @@ Patch12: 0012-Add-LDAP-schema-that-is-co
 Patch13: 0013-Bridging-work-as-of-svn-rev-174216.patch
 Patch14: 0014-Adding-in-CLI-apps.patch
 Patch15: 0015-Update-autoconf.patch
+Patch16: 0016-pagecount.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -456,6 +457,7 @@ local filesystem.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1099,6 +1101,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
+- Add a patch from Quentin Armitage and rebuld.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.25.rc1
 - rebuilt with new openssl
 



From mclasen at fedoraproject.org  Wed Sep  2 02:54:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Sep 2009 02:54:58 +0000 (UTC)
Subject: rpms/media-player-info/devel import.log, NONE,
	1.1 media-player-info.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090902025458.AA90B11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/media-player-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1067/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log media-player-info.spec 
Log Message:
initial import



--- NEW FILE import.log ---
media-player-info-3-1_fc12:HEAD:media-player-info-3-1.fc12.src.rpm:1251859808


--- NEW FILE media-player-info.spec ---
Name:           media-player-info
Version:        3
Release:        1%{?dist}
Summary:        Data files describing media player capabilities

Group:          System Environment/Base
License:        BSD
URL:            http://cgit.freedesktop.org/~teuf/media-player-id/
Source0:        http://people.freedesktop.org/~teuf/media-player-id/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  libudev-devel
Requires:       udev

%description
media-player-info is a repository of data files describing media player
(mostly USB Mass Storage ones) capabilities. These files contain information
about the directory layout to use to add music to these devices, about the
supported file formats, etc.

The package also installs a udev rule to identify media player devices.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README NEWS AUTHORS
%{_datadir}/media-player-info
/lib/udev/rules.d/*


%changelog
* Tue Sep  1 2009 Matthias Clasen <mclasen at redhat.com> - 3-1
- New upstream tarball with fixed Copyright headers

* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 2-1
- Rename to media-player-info

* Thu Aug 27 2009 Matthias Clasen <mclasen at redhat.com> - 1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/media-player-info/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	2 Sep 2009 02:48:06 -0000	1.1
+++ .cvsignore	2 Sep 2009 02:54:58 -0000	1.2
@@ -0,0 +1 @@
+media-player-info-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/media-player-info/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Sep 2009 02:48:06 -0000	1.1
+++ sources	2 Sep 2009 02:54:58 -0000	1.2
@@ -0,0 +1 @@
+bbcb961786c28df78e354feb856f68be  media-player-info-3.tar.gz



From wtogami at fedoraproject.org  Wed Sep  2 03:32:18 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 03:32:18 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.25, 1.26 ltsp.spec, 1.34, 1.35 sources,
	1.29, 1.30
Message-ID: <20090902033218.D21F411C00EF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10287

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- minimal effort to make it install and boot F-12
- fix pulsesaudio launching in F-12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	3 Aug 2009 21:24:10 -0000	1.25
+++ .cvsignore	2 Sep 2009 03:32:17 -0000	1.26
@@ -1 +1 @@
-ltsp-5.1.80.tar.bz2
+ltsp-5.1.84.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ltsp.spec	3 Aug 2009 21:24:10 -0000	1.34
+++ ltsp.spec	2 Sep 2009 03:32:17 -0000	1.35
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.80
+Version:        5.1.84
 %define _datestamp .20090422.23
-#Release:        1%{_datestamp}%{?dist}
+#Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -412,6 +412,10 @@ fi
 %endif
 
 %changelog
+* Tue Sep 01 2009 Warren Togami <wtogami at redhat.com> - 5.1.84-1
+- minimal effort to make it install and boot F-12
+- fix pulsesaudio launching in F-12
+
 * Mon Aug 03 2009 Warren Togami <wtogami at redhat.com> - 5.1.80-1
 - 5.1.80
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	3 Aug 2009 21:24:10 -0000	1.29
+++ sources	2 Sep 2009 03:32:17 -0000	1.30
@@ -1 +1 @@
-b9fd7f5d293561fde3932d0ca503fd7d  ltsp-5.1.80.tar.bz2
+0c91d280068b832933561b40ad55553e  ltsp-5.1.84.tar.bz2



From cebbert at fedoraproject.org  Wed Sep  2 03:52:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  2 Sep 2009 03:52:53 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch, NONE,
	1.1 kernel.spec, 1.1724, 1.1725
Message-ID: <20090902035253.0DEE211C00EF@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14229

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch 
Log Message:
Fix yet another Xen boot crash (#520517)

linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch:
 amd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch ---
From: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed, 22 Jul 2009 16:59:35 +0000 (-0700)
Subject: x86, amd: Don't probe for extended APIC ID if APICs are disabled
X-Git-Tag: v2.6.31-rc5~87^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2cb078603abb612e3bcd428fb8122c3d39e08832

x86, amd: Don't probe for extended APIC ID if APICs are disabled

If we've logically disabled apics, don't probe the PCI space for the
AMD extended APIC ID.

[ Impact: prevent boot crash under Xen. ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Reported-by: Bastian Blank <bastian at waldi.eu.org>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 28e5f59..e2485b0 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -356,7 +356,7 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
 #endif
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI)
 	/* check CPU config space for extended APIC ID */
-	if (c->x86 >= 0xf) {
+	if (cpu_has_apic && c->x86 >= 0xf) {
 		unsigned int val;
 		val = read_pci_config(0, 24, 0, 0x68);
 		if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18)))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -p -r1.1724 -r1.1725
--- kernel.spec	1 Sep 2009 04:18:44 -0000	1.1724
+++ kernel.spec	2 Sep 2009 03:52:52 -0000	1.1725
@@ -746,6 +746,9 @@ Patch14070: linux-2.6-kthreads-fix-kthre
 Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
+# fix amd crash in xen caused by -stable patch
+Patch14100: linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1386,6 +1389,9 @@ ApplyPatch linux-2.6-kthreads-fix-kthrea
 ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
+# another fun xen bug (#520517)
+ApplyPatch linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1971,6 +1977,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-46
+- Fix yet another Xen boot crash (#520517)
+
 * Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com> 2.5.30.5-45
 - Refresh lirc patches, add new lirc_ene0100 driver
 - Fix up hdpvr driver for use with modular i2c so that



From iarnell at fedoraproject.org  Wed Sep  2 03:58:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  2 Sep 2009 03:58:46 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-EncodedColumn/devel .cvsignore, 1.2,
	1.3 perl-DBIx-Class-EncodedColumn.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090902035846.79B7F11C00EF@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17667

Modified Files:
	.cvsignore perl-DBIx-Class-EncodedColumn.spec sources 
Log Message:
* Wed Sep 02 2009 Iain Arnell <iarnell at gmail.com> 0.00003-1
- update to latest upstream (copyright notice added)
- remove temporary BRs due to BZ #499768



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 May 2009 06:54:10 -0000	1.2
+++ .cvsignore	2 Sep 2009 03:58:46 -0000	1.3
@@ -1 +1 @@
-DBIx-Class-EncodedColumn-0.00002.tar.gz
+DBIx-Class-EncodedColumn-0.00003.tar.gz


Index: perl-DBIx-Class-EncodedColumn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/perl-DBIx-Class-EncodedColumn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DBIx-Class-EncodedColumn.spec	26 Jul 2009 05:23:48 -0000	1.3
+++ perl-DBIx-Class-EncodedColumn.spec	2 Sep 2009 03:58:46 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           perl-DBIx-Class-EncodedColumn
-Version:        0.00002
-Release:        3%{?dist}
+Version:        0.00003
+Release:        1%{?dist}
 Summary:        Automatically encode columns
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DBIx-Class-EncodedColumn/
-Source0:        http://www.cpan.org/authors/id/G/GR/GRODITI/DBIx-Class-EncodedColumn-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/DBIx-Class-EncodedColumn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(DBD::SQLite)
@@ -15,9 +15,6 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(SQL::Translator) >= 0.08000
 BuildRequires:  perl(Sub::Name) >= 0.04
 BuildRequires:  perl(Test::More)
-# Missing BRs in perl-SQL-Translator (BZ #499768)
-BuildRequires:  perl(Class::Accessor::Fast)
-BuildRequires:  perl(Class::Data::Inheritable)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # undetected
 Requires:       perl(DBIx::Class)
@@ -59,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 02 2009 Iain Arnell <iarnell at gmail.com> 0.00003-1
+- update to latest upstream (copyright notice added)
+- remove temporary BRs due to BZ #499768
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.00002-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 May 2009 06:54:10 -0000	1.2
+++ sources	2 Sep 2009 03:58:46 -0000	1.3
@@ -1 +1 @@
-959a622303580654f5fff1ef8399438e  DBIx-Class-EncodedColumn-0.00002.tar.gz
+3a2613af1c10219654150b59f076a620  DBIx-Class-EncodedColumn-0.00003.tar.gz



From iarnell at fedoraproject.org  Wed Sep  2 03:59:08 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  2 Sep 2009 03:59:08 +0000 (UTC)
Subject: rpms/perl-B-Utils/devel .cvsignore, 1.2, 1.3 perl-B-Utils.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090902035908.68B1811C00EF@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-B-Utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18475

Modified Files:
	.cvsignore perl-B-Utils.spec sources 
Log Message:
* Wed Sep 02 2009 Iain Arnell <iarnell at gmail.com> 0.08-1
- update to latest upstream
- use perl_default_filter 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Dec 2008 04:56:02 -0000	1.2
+++ .cvsignore	2 Sep 2009 03:59:08 -0000	1.3
@@ -1 +1 @@
-B-Utils-0.07.tar.gz
+B-Utils-0.08.tar.gz


Index: perl-B-Utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Utils/devel/perl-B-Utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-B-Utils.spec	26 Jul 2009 01:48:21 -0000	1.4
+++ perl-B-Utils.spec	2 Sep 2009 03:59:08 -0000	1.5
@@ -1,18 +1,24 @@
 Name:           perl-B-Utils
-Version:        0.07
-Release:        4%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Helper functions for op tree manipulation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/B-Utils/
 Source0:        http://www.cpan.org/authors/id/J/JJ/JJORE/B-Utils-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(ExtUtils::Depends) >= 0.302
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::Signature)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
+#BuildRequires:  perl(Test::Pod)
+#BuildRequires:  perl(Test::Signature)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 Helper functions for op tree manipulation.
 
@@ -48,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 02 2009 Iain Arnell <iarnell at gmail.com> 0.08-1
+- update to latest upstream
+- use perl_default_filter 
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Dec 2008 04:56:02 -0000	1.2
+++ sources	2 Sep 2009 03:59:08 -0000	1.3
@@ -1 +1 @@
-d69e7d81a24093a41e90e19f8bdb54e3  B-Utils-0.07.tar.gz
+081c80bbee7c0b3313cf2656f58b953d  B-Utils-0.08.tar.gz



From mbarnes at fedoraproject.org  Wed Sep  2 04:16:30 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Sep 2009 04:16:30 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.30,
	1.31 gnome-python2-desktop.spec, 1.67, 1.68 sources, 1.30, 1.31
Message-ID: <20090902041630.AB78311C00E6@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-serv14028

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Wed Sep 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.3-1.fc12
- Update to 2.27.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	15 Jul 2009 02:04:12 -0000	1.30
+++ .cvsignore	2 Sep 2009 04:16:29 -0000	1.31
@@ -1 +1 @@
-gnome-python-desktop-2.27.2.tar.bz2
+gnome-python-desktop-2.27.3.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gnome-python2-desktop.spec	2 Aug 2009 12:30:47 -0000	1.67
+++ gnome-python2-desktop.spec	2 Sep 2009 04:16:29 -0000	1.68
@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.27.2
-Release: 3%{?dist}
+Version: 2.27.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -323,6 +323,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Wed Sep 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.3-1.fc12
+- Update to 2.27.3
+
 * Sun Aug 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.2-3.fc12
 - Disable nautilus-cd-burner bindings.  Package is dead.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	15 Jul 2009 02:04:12 -0000	1.30
+++ sources	2 Sep 2009 04:16:29 -0000	1.31
@@ -1 +1 @@
-3e1da41c3223687e812c0b1bd1f0ed55  gnome-python-desktop-2.27.2.tar.bz2
+8f727b090818327f92fe7b50704339c0  gnome-python-desktop-2.27.3.tar.bz2



From jwilson at fedoraproject.org  Wed Sep  2 04:21:37 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed,  2 Sep 2009 04:21:37 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1725, 1.1726 lirc-2.6.31.patch, 1.1,
	1.2 lirc-revert-2.6.31-i2c-changes.patch, 1.1, 1.2
Message-ID: <20090902042137.A678911C00E6@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17298

Modified Files:
	kernel.spec lirc-2.6.31.patch 
	lirc-revert-2.6.31-i2c-changes.patch 
Log Message:
* Wed Sep 02 2009 Jarod Wilson <jarod at redhat.com>
- Make it possible to rmmod lirc_zilog w/o it hanging indefinitely
- Add transmit support (via port 2 only) on 1st-gen mceusb transceiver



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -p -r1.1725 -r1.1726
--- kernel.spec	2 Sep 2009 03:52:52 -0000	1.1725
+++ kernel.spec	2 Sep 2009 04:21:36 -0000	1.1726
@@ -1977,10 +1977,14 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 02 2009 Jarod Wilson <jarod at redhat.com>
+- Make it possible to rmmod lirc_zilog w/o it hanging indefinitely
+- Add transmit support (via port 2 only) on 1st-gen mceusb transceiver
+
 * Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-46
 - Fix yet another Xen boot crash (#520517)
 
-* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com> 2.5.30.5-45
+* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com> 2.6.30.5-45
 - Refresh lirc patches, add new lirc_ene0100 driver
 - Fix up hdpvr driver for use with modular i2c so that
   lirc_zilog can actually bind to it

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1243 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15601 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/lirc-2.6.31.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lirc-2.6.31.patch	1 Sep 2009 04:18:45 -0000	1.1
+++ lirc-2.6.31.patch	2 Sep 2009 04:21:37 -0000	1.2
@@ -2,11 +2,12 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
-Refreshed 20090901
+Refreshed 20090902
 
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
+ MAINTAINERS                           |    9 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  119 ++
@@ -23,7 +24,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
- drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1243 ++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
  drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
@@ -32,8 +33,28 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
- 25 files changed, 15574 insertions(+), 0 deletions(-)
+ 26 files changed, 15601 insertions(+), 0 deletions(-)
 
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 8dca9d8..f25dc26 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3129,6 +3129,15 @@ W:	http://www.pasemi.com/
+ L:	linuxppc-dev at ozlabs.org
+ S:	Supported
+ 
++LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
++P:	Jarod Wilson
++M:	jarod at redhat.com
++P:	Christoph Bartelmus
++M:	lirc at bartelmus.de
++W:	http://www.lirc.org/
++L:	lirc-list at lists.sourceforge.net
++S:	Maintained
++
+ LINUX SECURITY MODULE (LSM) FRAMEWORK
+ M:	Chris Wright <chrisw at sous-sol.org>
+ L:	linux-security-module at vger.kernel.org
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index cd50c00..442f94f 100644
 --- a/drivers/input/Kconfig
@@ -706,7 +727,7 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..a23bfea
+index 0000000..48ab5af
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,839 @@
@@ -1132,7 +1153,7 @@ index 0000000..a23bfea
 +int lirc_dev_fop_open(struct inode *inode, struct file *file)
 +{
 +	struct irctl *ir;
-+	int retval;
++	int retval = 0;
 +
 +	if (iminor(inode) >= MAX_IRCTL_DEVICES) {
 +		dprintk("lirc_dev [%d]: open result = -ENODEV\n",
@@ -7637,10 +7658,10 @@ index 0000000..3d53181
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..58dfdd5
+index 0000000..8011a14
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1225 @@
+@@ -0,0 +1,1243 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -7656,9 +7677,12 @@ index 0000000..58dfdd5
 + * supports the 1st-gen device now too. Transmitting on the 1st-gen device
 + * is as yet untested, but receiving definitely works.
 + *
-+ * Support for 1st-gen mceusb device added in June of 2009,
++ * Support for 1st-gen device added June 2009,
 + * by Jarod Wilson <jarod at wilsonet.com>
 + *
++ * Initial transmission support for 1st-gen device added August 2009,
++ * by Patrick Calhoun <phineas at ou.edu>
++ *
 + * Derived from ATI USB driver by Paul Miller and the original
 + * MCE USB driver by Dan Conti (and now including chunks of the latter
 + * relevant to the 1st-gen device initialization)
@@ -7824,6 +7848,8 @@ index 0000000..58dfdd5
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
 +	/* Formosa Industrial Computing / Beanbag Emulation Device */
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
++	/* Formosa21 / eHome Infrared Receiver */
++	{ USB_DEVICE(VENDOR_FORMOSA, 0xe03a) },
 +	/* Formosa Industrial Computing AIM IR605/A */
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe03c) },
 +	/* Fintek eHome Infrared Transceiver */
@@ -8498,7 +8524,7 @@ index 0000000..58dfdd5
 +	memset(data, 0, 8);
 +
 +	ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
-+			      5, USB_TYPE_VENDOR, 0, 0,
++			      USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
 +			      data, 2, HZ * 3);
 +	dprintk("%s - ret = %d, devnum = %d\n",
 +		__func__, ret, ir->usbdev->devnum);
@@ -8512,6 +8538,18 @@ index 0000000..58dfdd5
 +
 +	dprintk("%s - ret = %d\n", __func__, ret);
 +
++	/* strange: bRequest == 4 */
++	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
++			      4, USB_TYPE_VENDOR,
++			      0x0808, 0x0000, NULL, 0, HZ * 3);
++	dprintk("%s - retB = %d\n", __func__, ret);
++
++	/* strange: bRequest == 2 */
++	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
++			      2, USB_TYPE_VENDOR,
++			      0x0000, 0x0100, NULL, 0, HZ * 3);
++	dprintk("%s - retC = %d\n", __func__, ret);
++
 +	return ret;
 +
 +};
@@ -8753,19 +8791,10 @@ index 0000000..58dfdd5
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_out, pin_init3, sizeof(pin_init3),
 +				     MCEUSB_OUTBOUND);
-+		/* if we don't issue the correct number of receives
-+		 * (MCEUSB_INBOUND) for each outbound, then the first few ir
-+		 * pulses will be interpreted by the usb_async_callback routine
-+		 * - we should ensure we have the right amount OR less - as the
-+		 * mceusb_dev_recv routine will handle the control packets OK -
-+		 * they start with 0x9f - but the async callback doesn't handle
-+		 * ir pulse packets
-+		 */
-+		request_packet_async(ir, ep_in, NULL, maxp, 0);
-+	} else {
++	} else if (ir->flags.microsoft_gen1) {
 +		/* original ms mce device requires some additional setup */
-+		if (ir->flags.microsoft_gen1)
-+			mceusb_gen1_init(ir);
++		mceusb_gen1_init(ir);
++	} else {
 +
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
@@ -8774,9 +8803,19 @@ index 0000000..58dfdd5
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_out, init2,
 +				     sizeof(init2), MCEUSB_OUTBOUND);
-+		request_packet_async(ir, ep_in, NULL, maxp, 0);
 +	}
 +
++	/*
++	 * if we don't issue the correct number of receives
++	 * (MCEUSB_INBOUND) for each outbound, then the first few ir
++	 * pulses will be interpreted by the usb_async_callback routine
++	 * - we should ensure we have the right amount OR less - as the
++	 * mceusb_dev_recv routine will handle the control packets OK -
++	 * they start with 0x9f - but the async callback doesn't handle
++	 * ir pulse packets
++	 */
++	request_packet_async(ir, ep_in, NULL, maxp, 0);
++
 +	usb_set_intfdata(intf, ir);
 +
 +	return 0;

lirc-revert-2.6.31-i2c-changes.patch:
 lirc_i2c.c   |  216 ++++++++++++++++++++++++++++++++++++++++++++---------------
 lirc_zilog.c |   60 +++++++++-------
 2 files changed, 200 insertions(+), 76 deletions(-)

Index: lirc-revert-2.6.31-i2c-changes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/lirc-revert-2.6.31-i2c-changes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lirc-revert-2.6.31-i2c-changes.patch	1 Sep 2009 04:18:45 -0000	1.1
+++ lirc-revert-2.6.31-i2c-changes.patch	2 Sep 2009 04:21:37 -0000	1.2
@@ -1,6 +1,6 @@
- drivers/input/lirc/lirc_i2c.c   |  216 ++++++++++++++++++++++++++++++---------
- drivers/input/lirc/lirc_zilog.c |   58 +++++----
- 2 files changed, 198 insertions(+), 76 deletions(-)
+ drivers/input/lirc/lirc_i2c.c   |  216 +++++++++++++++++++++++++++++----------
+ drivers/input/lirc/lirc_zilog.c |   60 +++++++-----
+ 2 files changed, 200 insertions(+), 76 deletions(-)
 
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 index e27d937..dedf415 100644
@@ -317,12 +317,11 @@ index e27d937..dedf415 100644
  static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
  {
  	/* nothing */
-
-diff --git b/drivers/input/lirc/lirc_zilog.c a/drivers/input/lirc/lirc_zilog.c
-index c532399..049c3da 100644
---- b/drivers/input/lirc/lirc_zilog.c
-+++ a/drivers/input/lirc/lirc_zilog.c
-@@ -1088,26 +1088,18 @@ static struct lirc_driver lirc_template = {
+diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
+index f86db02..26bdb18 100644
+--- a/drivers/input/lirc/lirc_zilog.c
++++ b/drivers/input/lirc/lirc_zilog.c
+@@ -1109,26 +1109,18 @@ static struct lirc_driver lirc_template = {
  };
  
  static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
@@ -353,7 +352,7 @@ index c532399..049c3da 100644
  };
  
  static struct i2c_client client_template = {
-@@ -1128,8 +1120,20 @@ static struct file_operations lirc_fops = {
+@@ -1149,8 +1141,20 @@ static struct file_operations lirc_fops = {
  
  static int i2c_attach(struct i2c_client *client, struct IR *ir)
  {
@@ -374,7 +373,7 @@ index c532399..049c3da 100644
  	++ir->devs;
  	return 0;
  }
-@@ -1230,13 +1234,13 @@ static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx)
+@@ -1251,13 +1255,13 @@ static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx)
  err:
  	/* undo everything, hopefully... */
  	if (ir->c_rx.addr)
@@ -391,13 +390,15 @@ index c532399..049c3da 100644
  {
  	struct IR *ir = i2c_get_clientdata(client);
  	mutex_lock(&ir->lock);
-@@ -1257,17 +1261,21 @@ static int ir_remove(struct i2c_client *client)
+@@ -1278,17 +1282,23 @@ static int ir_remove(struct i2c_client *client)
  			ir->t_notify2 = NULL;
  		}
  
 +		/* unregister device */
++		i2c_release_client(&ir->c_rx);
 +		i2c_detach_client(&ir->c_rx);
 +	} else if (client == &ir->c_tx) {
++		i2c_release_client(&ir->c_tx);
 +		i2c_detach_client(&ir->c_tx);
  	} else {
  		mutex_unlock(&ir->lock);
@@ -416,7 +417,7 @@ index c532399..049c3da 100644
  		return -ENODEV;
  	} else if (ir->devs == 0) {
  		/* unregister lirc driver */
-@@ -1286,10 +1294,11 @@ static int ir_remove(struct i2c_client *client)
+@@ -1307,10 +1317,11 @@ static int ir_remove(struct i2c_client *client)
  	return 0;
  }
  
@@ -430,7 +431,7 @@ index c532399..049c3da 100644
  
  	if (adap->id == I2C_HW_B_BT848 ||
  #ifdef I2C_HW_B_HDPVR
-@@ -1302,10 +1311,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+@@ -1323,10 +1334,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
  		 * The external IR receiver is at i2c address 0x71.
  		 * The IR transmitter is at 0x70.
  		 */
@@ -444,7 +445,7 @@ index c532399..049c3da 100644
  				have_rx = 1;
  			dprintk("probe 0x70 @ %s: %s\n",
  				adap->name,
-@@ -1313,8 +1323,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+@@ -1334,8 +1346,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
  		}
  
  		if (!disable_tx) {



From mtasaka at fedoraproject.org  Wed Sep  2 04:59:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 04:59:43 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria-0.6.5-WorldCat-results.patch, NONE,
	1.1 alexandria-0.6.5-crash-in-turkish.patch, 1.1,
	1.2 alexandria.spec, 1.41, 1.42
Message-ID: <20090902045943.5476411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28218

Modified Files:
	alexandria-0.6.5-crash-in-turkish.patch alexandria.spec 
Added Files:
	alexandria-0.6.5-WorldCat-results.patch 
Log Message:
* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
- Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)


alexandria-0.6.5-WorldCat-results.patch:
 worldcat.rb |   35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

--- NEW FILE alexandria-0.6.5-WorldCat-results.patch ---
Index: lib/alexandria/book_providers/worldcat.rb
===================================================================
--- lib/alexandria/book_providers/worldcat.rb	(revision 1088)
+++ lib/alexandria/book_providers/worldcat.rb	(revision 1089)
@@ -23,7 +23,11 @@
 # New WorldCat provider, taken from the Palatina MetaDataSource and
 # modified to fit the structure of Alexandria book providers.
 # (25 Feb 2009)
+#
+# Updated from Palatina, to reflect changes in the worldcat website.
+# (1 Sep 2009)
 
+
 require 'cgi'
 require 'alexandria/net'
 
@@ -136,7 +140,17 @@
           raise NoResultsError
         end
 
-        title_header = doc%'h1.item-title'
+
+        if doc % 'table.table-results'
+          log.info { "Found multiple results for lookup: fetching first result only" }
+          search_results = parse_search_result_data(html)
+          first = search_results.first
+          rslt2 = transport.get_response(URI.parse(first[:url]))
+          html2 = rslt2.body
+          doc = Hpricot(html2)
+        end
+
+        title_header = doc%'h1.title'
         title = title_header.inner_text if title_header
         unless title
           log.warn { "Unexpected lack of title from WorldCat lookup" }
@@ -145,18 +159,25 @@
         log.info { "Found book #{title} at WorldCat" }
 
         authors = []
-        authors_div = doc%'div.item-author'
-        if authors_div
-          (authors_div/:a).each do |a|
+        authors_tr = doc%'tr#details-allauthors'
+        if authors_tr
+          (authors_tr/:a).each do |a|
             authors << a.inner_text
           end
         end
 
         # can we do better? get the City name?? or multiple publishers?
-        publisher_row = doc%'td.label[text()*=Publisher]/..'
+        bibdata = doc % 'div#bibdata'
+        bibdata_table = bibdata % :table
+        publisher_row = bibdata_table % 'th[text()*=Publisher]/..'
+
         if publisher_row
           publication_info = (publisher_row/'td').last.inner_text
-          publication_info =~ /:*([^;,]+)/
+          if publication_info.index(':')
+            publication_info =~ /:[\s]*([^;,]+)/
+          else
+            publication_info =~ /([^;,]+)/
+          end
           publisher = $1
           publication_info =~ /([12][0-9]{3})/
           year = $1.to_i if $1
@@ -167,7 +188,7 @@
 
         isbn = search_isbn
         unless isbn
-          isbn_row = doc%'td.label[text()*=ISBN]/..'
+          isbn_row = doc % 'tr#details-standardno' ##bibdata_table % 'th[text()*=ISBN]/..'
           if isbn_row
             isbns = (isbn_row/'td').last.inner_text.split
             isbn = Library.canonicalise_isbn(isbns.first)

alexandria-0.6.5-crash-in-turkish.patch:
 icons.rb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: alexandria-0.6.5-crash-in-turkish.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria-0.6.5-crash-in-turkish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-crash-in-turkish.patch	28 Aug 2009 19:57:58 -0000	1.1
+++ alexandria-0.6.5-crash-in-turkish.patch	2 Sep 2009 04:59:43 -0000	1.2
@@ -1,7 +1,7 @@
 Index: lib/alexandria/ui/icons.rb
 ===================================================================
 --- lib/alexandria/ui/icons.rb	(revision 1087)
-+++ lib/alexandria/ui/icons.rb	(working copy)
++++ lib/alexandria/ui/icons.rb	(revision 1088)
 @@ -63,7 +63,9 @@
        def self.load_icon_images
          Dir.entries(ICONS_DIR).each do |file|


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- alexandria.spec	29 Aug 2009 12:52:22 -0000	1.41
+++ alexandria.spec	2 Sep 2009 04:59:43 -0000	1.42
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	6.1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -33,9 +33,11 @@ Patch4:		alexandria-0.6.5-search-result-
 # ref: alexandria-Bugs-27000
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 # Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170
-# alexandria-Bugs-27015, applied in rev 1088
+# RH bug 520170, alexandria-Bugs-27015
 Patch6:		alexandria-0.6.5-crash-in-turkish.patch
+# Fix for parsing WorldCat search result
+# ref: alexandria-Bugs-27028
+Patch7:		alexandria-0.6.5-WorldCat-results.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -90,6 +92,7 @@ Alexandria is a GNOME application to hel
 %patch4 -p0 -b .sanity
 %patch5 -p0 -b .deastore
 %patch6 -p0 -b .tr_TR
+%patch7 -p0 -b .worldcat
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -216,16 +219,20 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
+- Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
+
 * Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
-- Fix crash on startup in tr_TR.UTF-8 (bug 520170)
+- Fix crash on startup in tr_TR.UTF-8 (bug 520170, alexandria-Bugs-27015)
 
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
 - Add sanity check for invalid search result, now using upstream patch
 - Fix DeaStore provider where search result contains no Author
+  (alexandria-Bugs-27000)
 
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 
-  functionality of alexandria)
+  functionality of alexandria, alexandria-Bugs-26968)
 
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
 - Kill the previous 2 patches (for now)



From mtasaka at fedoraproject.org  Wed Sep  2 05:01:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 05:01:53 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria.spec,1.42,1.43
Message-ID: <20090902050153.4BFA811C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29474

Modified Files:
	alexandria.spec 
Log Message:
fix release number


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- alexandria.spec	2 Sep 2009 04:59:43 -0000	1.42
+++ alexandria.spec	2 Sep 2009 05:01:53 -0000	1.43
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6.1
+%define		fedorarel	7
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 



From cchance at fedoraproject.org  Wed Sep  2 05:12:05 2009
From: cchance at fedoraproject.org (cchance)
Date: Wed,  2 Sep 2009 05:12:05 +0000 (UTC)
Subject: rpms/ibus-table-quick/devel .cvsignore, 1.2, 1.3 Makefile, 1.1,
	1.2 ibus-table-quick.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090902051206.00AA411C00E6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-quick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2288

Modified Files:
	.cvsignore Makefile ibus-table-quick.spec sources 
Log Message:
Updated source with intro of Quick Classic table.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 04:58:24 -0000	1.2
+++ .cvsignore	2 Sep 2009 05:12:05 -0000	1.3
@@ -1 +1 @@
-ibus-table-quick-1.2.0.20090720.tar.gz
+ibus-table-quick-1.2.0.20090902.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	24 Jul 2009 19:17:23 -0000	1.1
+++ Makefile	2 Sep 2009 05:12:05 -0000	1.2
@@ -1,7 +1,7 @@
 # Makefile for source rpm: ibus-table-quick
 # $Id$
 NAME := ibus-table-quick
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = ibus-table-quick.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


Index: ibus-table-quick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/ibus-table-quick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-table-quick.spec	7 Aug 2009 04:58:24 -0000	1.1
+++ ibus-table-quick.spec	2 Sep 2009 05:12:05 -0000	1.2
@@ -1,7 +1,13 @@
-Name:       ibus-table-quick
-Version:    1.2.0.20090720
-Release:    2%{?dist}
-Summary:    Quick input methods for ibus-table
+%define  fwname   ibus
+%define  engname  table
+%define  tabname  quick
+%define  appname  %{fwname}-%{engname}
+%define  appdir   %{_datadir}/%{appname}
+
+Name:       %{appname}-%{tabname}
+Version:    1.2.0.20090902
+Release:    1%{?dist}
+Summary:    %{tabname} table for %{appname}
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -11,12 +17,12 @@ Source1:    COPYING.tables
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-Requires:         ibus >= 1.2, ibus-table >= 1.2
-Requires(post):   ibus >= 1.2, ibus-table >= 1.2
-BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
+Requires:         %{appname} >= 1.2, %{appname} >= 1.2
+Requires(post):   %{appname} >= 1.2, %{appname} >= 1.2
+BuildRequires:    %{appname} >= 1.2, %{appname} >= 1.2
 
 %description
-The package contains Quick input methods for Table engine of IBus platform. 
+The package contains %{tabname} table for %{appname}.
 
 %prep
 %setup -q
@@ -27,8 +33,9 @@ The package contains Quick input methods
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
 %configure \
     --prefix=%{_prefix} \
+    --enable-quick3 \
     --enable-quick5 \
-    --enable-quick3
+    --enable-quickclassic
 %__make %{?_smp_mflags}
 
 %install
@@ -39,23 +46,30 @@ make DESTDIR=%{buildroot} NO_INDEX=true 
 %__rm -rf %{buildroot}
 
 %post
-cd %{_datadir}/ibus-table/tables/
+cd %{_datadir}/%{appname}/tables/
 %{_bindir}/ibus-table-createdb -i -n quick3.db
 %{_bindir}/ibus-table-createdb -i -n quick5.db
+%{_bindir}/ibus-table-createdb -i -n quick-classic.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
-%{_datadir}/ibus-table/icons/quick5.png
-%{_datadir}/ibus-table/icons/quick3.png
+%{appdir}/tables/quick3.db
+%{appdir}/tables/quick5.db
+%{appdir}/tables/quick-classic.db
+%{appdir}/icons/quick3.png
+%{appdir}/icons/quick5.png
+%{appdir}/icons/quick-classic.png
 
 %changelog
-* Wed Jul 22 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090720-2.fc12
+* Wed Sep 02 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090902-1.fc12
+- Updated source w/ intro of Quick Classic table.
+- Macro'ed .spec file.
+
+* Wed Jul 22 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090720-2.fc12
 - Removed unneccessary BuildRequires.
 - Removed unneccessary owned directories.
 - Changed autogen.sh to configure.
 
-* Mon Jul 20 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090720-1.fc12
+* Mon Jul 20 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090720-1.fc12
 - Separated from ibus-table-cangjie to ibus-table-quick.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 04:58:24 -0000	1.2
+++ sources	2 Sep 2009 05:12:05 -0000	1.3
@@ -1 +1 @@
-12a8505b00bb976b914d7e9191049243  ibus-table-quick-1.2.0.20090720.tar.gz
+488c33d4ae2b35aa82764cb746fe4cb4  ibus-table-quick-1.2.0.20090902.tar.gz



From pkgdb at fedoraproject.org  Wed Sep  2 05:53:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 05:53:23 +0000
Subject: [pkgdb] maven2-common-poms: akurtakov has requested watchcommits
Message-ID: <20090902055323.2A2E910F883@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven2-common-poms (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 05:53:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 05:53:23 +0000
Subject: [pkgdb] maven2-common-poms: akurtakov has requested commit
Message-ID: <20090902055323.C287E10F893@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven2-common-poms (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 05:53:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 05:53:23 +0000
Subject: [pkgdb] maven2-common-poms: akurtakov has requested watchbugzilla
Message-ID: <20090902055323.D63B210F896@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven2-common-poms (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 05:53:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 05:53:27 +0000
Subject: [pkgdb] maven2-common-poms: akurtakov has requested approveacls
Message-ID: <20090902055327.7DEC110F899@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on maven2-common-poms (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 06:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 06:04:52 +0000
Subject: [pkgdb] maven-jxr: akurtakov has requested watchbugzilla
Message-ID: <20090902060452.26B0810F899@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven-jxr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From pkgdb at fedoraproject.org  Wed Sep  2 06:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 06:04:52 +0000
Subject: [pkgdb] maven-jxr: akurtakov has requested watchcommits
Message-ID: <20090902060453.0158610F89C@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven-jxr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From pkgdb at fedoraproject.org  Wed Sep  2 06:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 06:04:55 +0000
Subject: [pkgdb] maven-jxr: akurtakov has requested commit
Message-ID: <20090902060455.3F21210F89F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven-jxr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From pkgdb at fedoraproject.org  Wed Sep  2 06:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 06:04:57 +0000
Subject: [pkgdb] maven-jxr: akurtakov has requested approveacls
Message-ID: <20090902060457.CB41D10F8A1@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on maven-jxr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From than at fedoraproject.org  Wed Sep  2 06:19:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 06:19:59 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.98,1.99
Message-ID: <20090902061959.40A5211C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23800

Modified Files:
	kdepimlibs.spec 
Log Message:
drop support fedora < 10



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kdepimlibs.spec	28 Aug 2009 15:15:14 -0000	1.98
+++ kdepimlibs.spec	2 Sep 2009 06:19:57 -0000	1.99
@@ -1,12 +1,4 @@
-%if 0%{?fedora} > 8
-# set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
-%else
-# don't build apidocs on Fedora < 9 for now, because we don't have the required
-# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
-%define apidocs 0
-%endif
-
 %define akonadi_subpkg 1
 %define akonadi_version 1.2.0
 
@@ -62,7 +54,6 @@ Obsoletes: kdepimlibs4-devel < %{version
 Provides:  kdepimlibs4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: boost-devel
-# FIXME/HACK, bogus dep -- Rex
 Requires: libical-devel
 
 %description devel
@@ -82,9 +73,7 @@ Requires: akonadi%{?_isa} >= %{akonadi_v
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML



From jskala at fedoraproject.org  Wed Sep  2 06:24:37 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Wed,  2 Sep 2009 06:24:37 +0000 (UTC)
Subject: rpms/lftp/devel .cvsignore, 1.40, 1.41 lftp.spec, 1.83, 1.84 sources,
	1.40, 1.41 lftp-3.7.14-decode.patch, 1.1, NONE
Message-ID: <20090902062437.1B18A11C00E6@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25472

Modified Files:
	.cvsignore lftp.spec sources 
Removed Files:
	lftp-3.7.14-decode.patch 
Log Message:
* Wed Sep 02 2009 Jiri Skala <jskala at redhat.com> - 3.7.15-1
- updated to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	12 Aug 2009 17:16:44 -0000	1.40
+++ .cvsignore	2 Sep 2009 06:24:36 -0000	1.41
@@ -1 +1 @@
-lftp-3.7.14.tar.lzma
+lftp-3.7.15.tar.lzma


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- lftp.spec	12 Aug 2009 17:16:44 -0000	1.83
+++ lftp.spec	2 Sep 2009 06:24:36 -0000	1.84
@@ -1,7 +1,7 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	3.7.14
-Release:	6%{?dist}
+Version:	3.7.15
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma
@@ -9,8 +9,6 @@ URL:		http://lftp.yar.ru/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext
 
-Patch1:  lftp-3.7.14-decode.patch
-
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
 control and uses the readline library for input. It has bookmarks, built-in
@@ -29,8 +27,6 @@ Utility scripts for use with lftp.
 %prep
 %setup -q
 
-%patch1 -p1 -b .decode
-
 #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
 sed -i.norpath -e \
 	'/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib64 |' \
@@ -91,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 02 2009 Jiri Skala <jskala at redhat.com> - 3.7.15-1
+- updated to latest upstream release
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.7.14-6
 - Use lzma compressed upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	12 Aug 2009 17:16:44 -0000	1.40
+++ sources	2 Sep 2009 06:24:36 -0000	1.41
@@ -1 +1 @@
-102f675cdc937dd1c4c7a919cf908678  lftp-3.7.14.tar.lzma
+7407a8eadacae90c9c6caf542c3f46d2  lftp-3.7.15.tar.lzma


--- lftp-3.7.14-decode.patch DELETED ---



From kkofler at fedoraproject.org  Wed Sep  2 06:34:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  2 Sep 2009 06:34:45 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.99,1.100
Message-ID: <20090902063445.87CC311C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29394/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
Restore comment, add one more.

I think that Requires can be dropped now, does anybody want to check?


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- kdepimlibs.spec	2 Sep 2009 06:19:57 -0000	1.99
+++ kdepimlibs.spec	2 Sep 2009 06:34:44 -0000	1.100
@@ -54,6 +54,9 @@ Obsoletes: kdepimlibs4-devel < %{version
 Provides:  kdepimlibs4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: boost-devel
+# FIXME/HACK, bogus dep -- Rex
+# Is this still needed now that we have "reduced link interfaces"? I think
+# users of libkcal no longer try to link in libical.so now. -- Kevin
 Requires: libical-devel
 
 %description devel



From cweyl at fedoraproject.org  Wed Sep  2 07:05:29 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  2 Sep 2009 07:05:29 +0000 (UTC)
Subject: rpms/perl-JSON/devel perl-JSON.spec,1.17,1.18
Message-ID: <20090902070529.E120D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11125

Modified Files:
	perl-JSON.spec 
Log Message:
* Wed Sep 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-5
- adjust filtering so we don't drop the versioned perl(JSON:PP) prov



Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/perl-JSON.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-JSON.spec	2 Sep 2009 02:03:50 -0000	1.17
+++ perl-JSON.spec	2 Sep 2009 07:05:27 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -29,7 +29,7 @@ Requires:       perl(HTTP::Daemon)
 
 # use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
 %{?filter_setup: %{expand: 
-%filter_from_provides /perl(JSON::PP)/d
+%filter_from_provides /^perl(JSON::PP)$/d
 %filter_provides_in %{perl_vendorarch}/.*\\.so$ 
 %filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ 
 %filter_provides_in %{_docdir} 
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-5
+- adjust filtering so we don't drop the versioned perl(JSON:PP) prov
+
 * Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-4
 - bump
 



From cweyl at fedoraproject.org  Wed Sep  2 07:11:20 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  2 Sep 2009 07:11:20 +0000 (UTC)
Subject: rpms/perl-JSON/F-11 perl-JSON.spec,1.16,1.17
Message-ID: <20090902071121.6FC6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13716

Modified Files:
	perl-JSON.spec 
Log Message:
* Wed Sep 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-5
- adjust filtering so we don't drop the versioned perl(JSON:PP) prov



Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/F-11/perl-JSON.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-JSON.spec	2 Sep 2009 02:05:34 -0000	1.16
+++ perl-JSON.spec	2 Sep 2009 07:11:15 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -29,7 +29,7 @@ Requires:       perl(HTTP::Daemon)
 
 # use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
 %{?filter_setup: %{expand: 
-%filter_from_provides /perl(JSON::PP)/d
+%filter_from_provides /^perl(JSON::PP)$/d
 %filter_provides_in %{perl_vendorarch}/.*\\.so$ 
 %filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ 
 %filter_provides_in %{_docdir} 
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-5
+- adjust filtering so we don't drop the versioned perl(JSON:PP) prov
+
 * Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-4
 - bump
 



From cchance at fedoraproject.org  Wed Sep  2 07:29:22 2009
From: cchance at fedoraproject.org (cchance)
Date: Wed,  2 Sep 2009 07:29:22 +0000 (UTC)
Subject: rpms/ibus-table/devel ibus-table.spec,1.23,1.24
Message-ID: <20090902072922.6973A11C00E6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20710

Modified Files:
	ibus-table.spec 
Log Message:
Updated source.


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ibus-table.spec	4 Aug 2009 04:34:29 -0000	1.23
+++ ibus-table.spec	2 Sep 2009 07:29:20 -0000	1.24
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    1.2.0.20090804
+Version:    1.2.0.20090902
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
@@ -75,15 +75,21 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/tc-mode.svg
 %{_datadir}/%{name}/icons/tcb-mode.svg
 %{_datadir}/%{name}/data/pinyin_table.txt.bz2
+%{_datadir}/%{name}/engine/KeyEvent.py
+%{_datadir}/%{name}/engine/KeyEvent.pyc
+%{_datadir}/%{name}/engine/KeyEvent.pyo
+%{_datadir}/%{name}/engine/config.py
+%{_datadir}/%{name}/engine/config.pyc
+%{_datadir}/%{name}/engine/config.pyo
+%{_datadir}/%{name}/engine/editor.py
+%{_datadir}/%{name}/engine/editor.pyc
+%{_datadir}/%{name}/engine/editor.pyo
 %{_datadir}/%{name}/engine/factory.py
 %{_datadir}/%{name}/engine/factory.pyc
 %{_datadir}/%{name}/engine/factory.pyo
 %{_datadir}/%{name}/engine/main.py
 %{_datadir}/%{name}/engine/main.pyc
 %{_datadir}/%{name}/engine/main.pyo
-%{_datadir}/%{name}/engine/speedmeter.py
-%{_datadir}/%{name}/engine/speedmeter.pyc
-%{_datadir}/%{name}/engine/speedmeter.pyo
 %{_datadir}/%{name}/engine/tabcreatedb.py
 %{_datadir}/%{name}/engine/tabcreatedb.pyc
 %{_datadir}/%{name}/engine/tabcreatedb.pyo
@@ -96,6 +102,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/engine/tabsqlitedb.py
 %{_datadir}/%{name}/engine/tabsqlitedb.pyc
 %{_datadir}/%{name}/engine/tabsqlitedb.pyo
+%{_datadir}/%{name}/meter/speedmeter.py
+%{_datadir}/%{name}/meter/speedmeter.pyc
+%{_datadir}/%{name}/meter/speedmeter.pyo
 %{_datadir}/%{name}/setup/main.py
 %{_datadir}/%{name}/setup/main.pyc
 %{_datadir}/%{name}/setup/main.pyo
@@ -103,6 +112,7 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_bindir}/%{name}-createdb
 %{_libexecdir}/ibus-engine-table
 %{_libexecdir}/ibus-setup-table
+%{_libexecdir}/ibus-table-meter
 
 %files additional
 %defattr(-,root,root,-)
@@ -112,6 +122,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Wed Sep 02 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090902-1.fc12
+- Updated source.
+
 * Tue Aug 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090804-1.fc12
 - Cleaned up unused dcommit contents.
 



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:43 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested watchcommits
Message-ID: <20090902073343.9C42410F87A@bastion2.fedora.phx.redhat.com>

atkac has requested the watchcommits acl on bind-dyndb-ldap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:47 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested watchbugzilla
Message-ID: <20090902073347.8954F10F883@bastion2.fedora.phx.redhat.com>

atkac has requested the watchbugzilla acl on bind-dyndb-ldap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:49 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested commit
Message-ID: <20090902073349.5A19910F894@bastion2.fedora.phx.redhat.com>

atkac has requested the commit acl on bind-dyndb-ldap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:51 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested approveacls
Message-ID: <20090902073351.32EA810F897@bastion2.fedora.phx.redhat.com>

atkac has requested the approveacls acl on bind-dyndb-ldap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:55 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested watchbugzilla
Message-ID: <20090902073355.1ECD910F89A@bastion2.fedora.phx.redhat.com>

atkac has requested the watchbugzilla acl on bind-dyndb-ldap (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:57 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested watchcommits
Message-ID: <20090902073357.6375C10F87A@bastion2.fedora.phx.redhat.com>

atkac has requested the watchcommits acl on bind-dyndb-ldap (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:33:58 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested commit
Message-ID: <20090902073358.E14B810F89F@bastion2.fedora.phx.redhat.com>

atkac has requested the commit acl on bind-dyndb-ldap (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 07:34:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 07:34:00 +0000
Subject: [pkgdb] bind-dyndb-ldap: atkac has requested approveacls
Message-ID: <20090902073400.F003C10F8A3@bastion2.fedora.phx.redhat.com>

atkac has requested the approveacls acl on bind-dyndb-ldap (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From than at fedoraproject.org  Wed Sep  2 07:57:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 07:57:33 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.278,1.279
Message-ID: <20090902075733.AC26F11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28332

Modified Files:
	kdebase-workspace.spec 
Log Message:
drop support fedora < 9 



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- kdebase-workspace.spec	30 Aug 2009 20:25:41 -0000	1.278
+++ kdebase-workspace.spec	2 Sep 2009 07:57:31 -0000	1.279
@@ -39,23 +39,12 @@ Obsoletes: kdebase-workspace < 4.3.0-2
 
 Requires: PolicyKit-authentication-agent
 
-# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
-%if 0%{?fedora} == 9
-# upgrade path: kdebase(3) -> kdebase-workspace
-Obsoletes: kdebase < 6:4
-# so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
-Requires: kdebase4
-%endif
-
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
-
-%if 0%{?fedora} > 10
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
 # -> powerdevel upgrade path
 Obsoletes: guidance-power-manager < 4.3
-%endif
 
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
@@ -160,9 +149,7 @@ Requires: %{name} = %{version}-%{release
 Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%if 0%{?fedora} > 9 
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -186,9 +173,7 @@ Group:   System Environment/Daemons
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n oxygen-cursor-themes
 %{summary}.
 
@@ -550,8 +535,6 @@ fi
 %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_docdir}/HTML/en/PolicyKit-kde/
-#files -n PolicyKit-kde-libs
-#defattr(-,root,root,-)
 %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 
 %files python-applet



From kkofler at fedoraproject.org  Wed Sep  2 08:00:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  2 Sep 2009 08:00:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.279,1.280
Message-ID: <20090902080041.930FB11C0345@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30721/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
Restore a conditional for F10 vs. F11+ which got accidentally dropped.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- kdebase-workspace.spec	2 Sep 2009 07:57:31 -0000	1.279
+++ kdebase-workspace.spec	2 Sep 2009 08:00:40 -0000	1.280
@@ -41,10 +41,12 @@ Requires: PolicyKit-authentication-agent
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
+%if 0%{?fedora} > 10
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
 # -> powerdevel upgrade path
 Obsoletes: guidance-power-manager < 4.3
+%endif
 
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel



From than at fedoraproject.org  Wed Sep  2 08:04:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 08:04:43 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.138,1.139
Message-ID: <20090902080443.E47A611C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31990

Modified Files:
	kdebase-runtime.spec 
Log Message:
drop support fedora < 10



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- kdebase-runtime.spec	30 Aug 2009 07:09:00 -0000	1.138
+++ kdebase-runtime.spec	2 Sep 2009 08:04:43 -0000	1.139
@@ -81,9 +81,7 @@ Requires: %{name} = %{version}-%{release
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description flags
 %{summary}.
 



From perex at fedoraproject.org  Wed Sep  2 08:11:20 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  2 Sep 2009 08:11:20 +0000 (UTC)
Subject: rpms/alsa-lib/devel .cvsignore, 1.37, 1.38 alsa-lib.spec, 1.84,
	1.85 sources, 1.41, 1.42
Message-ID: <20090902081120.6856411C00E6@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4232

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
alsa-lib: updated to 1.0.21 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	6 May 2009 09:11:46 -0000	1.37
+++ .cvsignore	2 Sep 2009 08:11:19 -0000	1.38
@@ -24,3 +24,4 @@ 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
+alsa-lib-1.0.21.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- alsa-lib.spec	24 Jul 2009 16:47:20 -0000	1.84
+++ alsa-lib.spec	2 Sep 2009 08:11:20 -0000	1.85
@@ -4,8 +4,8 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.20
-Release: 2%{?prever_dot}%{?dist}
+Version: 1.0.21
+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 Sep  2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
+* Updated to 1.0.21 final
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	6 May 2009 09:11:46 -0000	1.41
+++ sources	2 Sep 2009 08:11:20 -0000	1.42
@@ -1 +1 @@
-6e9080ba1faa5d3739d14dd76c62d8dc  alsa-lib-1.0.20.tar.bz2
+d8a556041a4cbeeae0c32eadeffb3c74  alsa-lib-1.0.21.tar.bz2



From perex at fedoraproject.org  Wed Sep  2 08:14:23 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  2 Sep 2009 08:14:23 +0000 (UTC)
Subject: rpms/alsa-lib/F-11 .cvsignore, 1.37, 1.38 alsa-lib.spec, 1.83,
	1.84 sources, 1.41, 1.42
Message-ID: <20090902081423.714DA11C00E6@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-serv4915

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
alsa-lib: updated to 1.0.21 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	6 May 2009 08:35:52 -0000	1.37
+++ .cvsignore	2 Sep 2009 08:14:23 -0000	1.38
@@ -24,3 +24,4 @@ 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
+alsa-lib-1.0.21.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- alsa-lib.spec	6 May 2009 08:35:52 -0000	1.83
+++ alsa-lib.spec	2 Sep 2009 08:14:23 -0000	1.84
@@ -4,7 +4,7 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.20
+Version: 1.0.21
 Release: 1%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep  2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
+- Updated to 1.0.21 final
+
 * Wed May  6 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.20-1
 - Updated to 1.0.20 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	6 May 2009 08:35:52 -0000	1.41
+++ sources	2 Sep 2009 08:14:23 -0000	1.42
@@ -1 +1 @@
-6e9080ba1faa5d3739d14dd76c62d8dc  alsa-lib-1.0.20.tar.bz2
+d8a556041a4cbeeae0c32eadeffb3c74  alsa-lib-1.0.21.tar.bz2



From kwizart at fedoraproject.org  Wed Sep  2 08:34:40 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed,  2 Sep 2009 08:34:40 +0000 (UTC)
Subject: rpms/afflib/devel sources, 1.13, 1.14 .cvsignore, 1.13,
	1.14 afflib.spec, 1.30, 1.31
Message-ID: <20090902083441.17D7211C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13475

Modified Files:
	sources .cvsignore afflib.spec 
Log Message:
Update to 3.3.7



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	20 May 2009 23:44:06 -0000	1.13
+++ sources	2 Sep 2009 08:34:39 -0000	1.14
@@ -1 +1 @@
-546cb2f0c6bde7868b3ad77bd56791d7  afflib-3.3.6.tar.gz
+198433e717073d69976ee0b3b9399ab4  afflib-3.3.7.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	20 May 2009 23:44:06 -0000	1.13
+++ .cvsignore	2 Sep 2009 08:34:39 -0000	1.14
@@ -1 +1 @@
-afflib-3.3.6.tar.gz
+afflib-3.3.7.tar.gz


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- afflib.spec	21 Aug 2009 12:19:34 -0000	1.30
+++ afflib.spec	2 Sep 2009 08:34:39 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           afflib
-Version:        3.3.6
-Release:        4%{?dist}
+Version:        3.3.7
+Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -18,7 +18,7 @@ BuildRequires:  expat-devel
 ##BuildRequires:  fuse-devel
 BuildRequires:  libewf-devel >= 20080305
 # Afflib uses lzma-SDK 443
-#BuildRequires:  lzma-devel
+BuildRequires:  lzma-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  libtermcap-devel
 BuildRequires:  openssl-devel
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 3.3.7-1
+- Update to 3.3.7
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-4
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:06 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083606.6635C10F87A@bastion2.fedora.phx.redhat.com>

mnagy has set the watchcommits acl on bind-dyndb-ldap (Fedora devel) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:07 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083607.3026410F88C@bastion2.fedora.phx.redhat.com>

mnagy has set the watchbugzilla acl on bind-dyndb-ldap (Fedora devel) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:08 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083609.10E3E10F894@bastion2.fedora.phx.redhat.com>

mnagy has set the approveacls acl on bind-dyndb-ldap (Fedora devel) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:09 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083609.B381810F899@bastion2.fedora.phx.redhat.com>

mnagy has set the commit acl on bind-dyndb-ldap (Fedora devel) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:12 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083612.43FB210F89B@bastion2.fedora.phx.redhat.com>

mnagy has set the watchbugzilla acl on bind-dyndb-ldap (Fedora 11) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:12 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083612.4463910F89C@bastion2.fedora.phx.redhat.com>

mnagy has set the watchcommits acl on bind-dyndb-ldap (Fedora 11) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:15 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083615.4E38110F8A1@bastion2.fedora.phx.redhat.com>

mnagy has set the commit acl on bind-dyndb-ldap (Fedora 11) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From pkgdb at fedoraproject.org  Wed Sep  2 08:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 08:36:16 +0000
Subject: [pkgdb] bind-dyndb-ldap had acl change status
Message-ID: <20090902083616.9732B10F8A9@bastion2.fedora.phx.redhat.com>

mnagy has set the approveacls acl on bind-dyndb-ldap (Fedora 11) to Approved for atkac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind-dyndb-ldap



From perex at fedoraproject.org  Wed Sep  2 08:40:53 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  2 Sep 2009 08:40:53 +0000 (UTC)
Subject: rpms/alsa-lib/F-10 .cvsignore, 1.37, 1.38 alsa-lib.spec, 1.82,
	1.83 sources, 1.41, 1.42
Message-ID: <20090902084053.ABBD511C04D6@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-serv17781

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
alsa-lib: updated to 1.0.21 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	6 May 2009 08:27:43 -0000	1.37
+++ .cvsignore	2 Sep 2009 08:40:52 -0000	1.38
@@ -24,3 +24,4 @@ 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
+alsa-lib-1.0.21.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/alsa-lib.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- alsa-lib.spec	6 May 2009 08:27:43 -0000	1.82
+++ alsa-lib.spec	2 Sep 2009 08:40:53 -0000	1.83
@@ -4,7 +4,7 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.20
+Version: 1.0.21
 Release: 1%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep  2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
+- Updated to 1.0.21 final
+
 * Wed May  6 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.20-1
 - Updated to 1.0.20 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	6 May 2009 08:27:43 -0000	1.41
+++ sources	2 Sep 2009 08:40:53 -0000	1.42
@@ -1 +1 @@
-6e9080ba1faa5d3739d14dd76c62d8dc  alsa-lib-1.0.20.tar.bz2
+d8a556041a4cbeeae0c32eadeffb3c74  alsa-lib-1.0.21.tar.bz2



From jwrdegoede at fedoraproject.org  Wed Sep  2 08:46:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  2 Sep 2009 08:46:23 +0000 (UTC)
Subject: rpms/mkinitrd/devel .cvsignore, 1.230, 1.231 mkinitrd.spec, 1.330, 
	1.331 sources, 1.272, 1.273
Message-ID: <20090902084623.9344111C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21156

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Wed Sep  2 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.93-1
- Move hotplug run to before gpu driver probing (airlied, #520730)
- Fix (non-fatal) syntax error (katzj, #513414)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- .cvsignore	21 Jul 2009 02:26:56 -0000	1.230
+++ .cvsignore	2 Sep 2009 08:46:23 -0000	1.231
@@ -1 +1 @@
-mkinitrd-6.0.92.tar.bz2
+mkinitrd-6.0.93.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- mkinitrd.spec	10 Aug 2009 09:21:30 -0000	1.330
+++ mkinitrd.spec	2 Sep 2009 08:46:23 -0000	1.331
@@ -2,8 +2,8 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.92
-Release: 3%{?dist}
+Version: 6.0.93
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -119,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Wed Sep  2 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.93-1
+- Move hotplug run to before gpu driver probing (airlied, #520730)
+- Fix (non-fatal) syntax error (katzj, #513414)
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 6.0.92-3
 - Convert specfile to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- sources	21 Jul 2009 02:26:56 -0000	1.272
+++ sources	2 Sep 2009 08:46:23 -0000	1.273
@@ -1 +1 @@
-86685bbba9a17368b658eb65dd60bdd2  mkinitrd-6.0.92.tar.bz2
+3f23ffc5bb86c9c29a8ae71da2245393  mkinitrd-6.0.93.tar.bz2



From jwrdegoede at fedoraproject.org  Wed Sep  2 08:54:11 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  2 Sep 2009 08:54:11 +0000 (UTC)
Subject: rpms/mkinitrd/F-11
	0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch,
	NONE, 1.1 mkinitrd.spec, 1.325, 1.326
Message-ID: <20090902085411.A4E0511C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mkinitrd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25322

Modified Files:
	mkinitrd.spec 
Added Files:
	0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch 
Log Message:
* Wed Sep  2 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.87-4
- move hotplug run to before gpu driver probing (#520730)


0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch:
 mkinitrd |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch ---
>From 93f6828f8ef4710f1253ab246f31498c8876317d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Wed, 2 Sep 2009 12:06:25 +1000
Subject: [PATCH] mkinitrd: move hotplug run to before gpu driver probing.

---
 mkinitrd |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mkinitrd b/mkinitrd
index 457231f..9676f0a 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -1509,6 +1509,9 @@ for i in 0 1 2 3 ; do
 done
 emit "daemonize --ignore-missing /bin/plymouthd"
 
+emit "echo Setting up hotplug."
+emit "hotplug"
+
 # If we have drm loaded, include modesetting drivers
 if [ "x$PROBE" == "xyes" -a -d /sys/class/drm ]; then
     handlegraphics
@@ -1535,9 +1538,6 @@ if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
     /usr/libexec/plymouth/plymouth-populate-initrd $(get_verbose) -t "$MNTIMAGE"
 fi
 
-emit "echo Setting up hotplug."
-emit "hotplug"
-
 emit "echo Creating block device nodes."
 emit "mkblkdevs"
 emit "echo Creating character device nodes."
-- 
1.6.4



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-11/mkinitrd.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- mkinitrd.spec	27 Jul 2009 14:49:38 -0000	1.325
+++ mkinitrd.spec	2 Sep 2009 08:54:11 -0000	1.326
@@ -3,11 +3,12 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.87
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 Patch0: mkinitrd-rh506189.patch
+Patch1: 0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch
 ExclusiveOs: Linux
 URL: git://git.fedoraproject.org/git/hosted/mkinitrd
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -81,6 +82,7 @@ information about the current boot envir
 %prep
 %setup -q -n mkinitrd-%{version}
 %patch0 -p1
+%patch1 -p1
 find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 
 %build
@@ -139,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Wed Sep  2 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.87-4
+- move hotplug run to before gpu driver probing (#520730)
+
 * Mon Jul 27 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.87-3
 - process all PVs in required VG (#506189)
 



From tomeu at fedoraproject.org  Wed Sep  2 08:55:21 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed,  2 Sep 2009 08:55:21 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 sugar-base.spec, 1.20, 1.21
Message-ID: <20090902085521.C60A711C00E6@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	26 Aug 2009 09:14:13 -0000	1.14
+++ .cvsignore	2 Sep 2009 08:55:21 -0000	1.15
@@ -1 +1 @@
-sugar-base-0.85.3.tar.bz2
+sugar-base-0.85.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	26 Aug 2009 09:14:13 -0000	1.14
+++ sources	2 Sep 2009 08:55:21 -0000	1.15
@@ -1 +1 @@
-c2067ccf42fb978772be84894d7300af  sugar-base-0.85.3.tar.bz2
+6ed1e197b923daf776886d80c286cb96  sugar-base-0.85.4.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sugar-base.spec	26 Aug 2009 09:14:13 -0000	1.20
+++ sugar-base.spec	2 Sep 2009 08:55:21 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.85.3
+Version: 0.85.4
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -18,6 +18,8 @@ BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool
 
+Requires: python-decorator
+
 %description
 
 The base libary for Sugar, the user interface of the One Laptop Per
@@ -45,6 +47,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
+- New upstream release
+
 * Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
 - New upstream release
 



From nphilipp at fedoraproject.org  Wed Sep  2 08:56:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 08:56:28 +0000 (UTC)
Subject: rpms/system-config-nfs/devel .cvsignore, 1.53, 1.54 sources, 1.61, 
	1.62 system-config-nfs.spec, 1.68, 1.69
Message-ID: <20090902085628.C597311C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27357

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
version 1.3.48


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	28 Aug 2009 14:29:01 -0000	1.53
+++ .cvsignore	2 Sep 2009 08:56:28 -0000	1.54
@@ -1 +1 @@
-system-config-nfs-1.3.47.tar.bz2
+system-config-nfs-1.3.48.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	28 Aug 2009 14:29:01 -0000	1.61
+++ sources	2 Sep 2009 08:56:28 -0000	1.62
@@ -1 +1 @@
-55be4f7f07f35eb09f13790b55964ce6  system-config-nfs-1.3.47.tar.bz2
+5bc0cb00b01d4b0c4a099fa37e8080fa  system-config-nfs-1.3.48.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- system-config-nfs.spec	28 Aug 2009 14:29:01 -0000	1.68
+++ system-config-nfs.spec	2 Sep 2009 08:56:28 -0000	1.69
@@ -8,7 +8,7 @@
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.47
+Version: 1.3.48
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -85,6 +85,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.3.48-1
+- initialize gettext correctly
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.3.47-1
 - don't unnecessarily initialize gettext
 



From nphilipp at fedoraproject.org  Wed Sep  2 08:59:16 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 08:59:16 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.73, 1.74 sources, 1.78,
	1.79 system-config-samba.spec, 1.82, 1.83
Message-ID: <20090902085916.7419711C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29648

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.81


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	28 Aug 2009 14:59:09 -0000	1.73
+++ .cvsignore	2 Sep 2009 08:59:15 -0000	1.74
@@ -1 +1 @@
-system-config-samba-1.2.80.tar.bz2
+system-config-samba-1.2.81.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	28 Aug 2009 15:15:16 -0000	1.78
+++ sources	2 Sep 2009 08:59:16 -0000	1.79
@@ -1 +1 @@
-dedc46cc37247b1993b4eb99ab9f4d51  system-config-samba-1.2.80.tar.bz2
+b852bd0866a75eb1e1c1ebfaa96587eb  system-config-samba-1.2.81.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- system-config-samba.spec	28 Aug 2009 14:59:10 -0000	1.82
+++ system-config-samba.spec	2 Sep 2009 08:59:16 -0000	1.83
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.80
+Version: 1.2.81
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -112,6 +112,9 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.2.81-1
+- initialize gettext correctly
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.80-1
 - initialize gettext at the right place
 



From tomeu at fedoraproject.org  Wed Sep  2 08:59:27 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed,  2 Sep 2009 08:59:27 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.36, 1.37 sources, 1.40,
	1.41 sugar-toolkit.spec, 1.51, 1.52
Message-ID: <20090902085927.E4F1F11C00E6@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29799

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.6-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	26 Aug 2009 09:17:28 -0000	1.36
+++ .cvsignore	2 Sep 2009 08:59:27 -0000	1.37
@@ -1 +1 @@
-sugar-toolkit-0.85.5.tar.bz2
+sugar-toolkit-0.85.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	26 Aug 2009 09:17:28 -0000	1.40
+++ sources	2 Sep 2009 08:59:27 -0000	1.41
@@ -1 +1 @@
-2ba59ac81f2b4313dd10c7fc7733cc4d  sugar-toolkit-0.85.5.tar.bz2
+e1024fa58092a7848fe9f7f668a904e3  sugar-toolkit-0.85.6.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sugar-toolkit.spec	26 Aug 2009 09:17:28 -0000	1.51
+++ sugar-toolkit.spec	2 Sep 2009 08:59:27 -0000	1.52
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.85.5
+Version: 0.85.6
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.6-1
+- New upstream release
+
 * Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
 - New upstream release
 



From nphilipp at fedoraproject.org  Wed Sep  2 09:03:42 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 09:03:42 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.83, 1.84 sources,
	1.96, 1.97 system-config-services.spec, 1.98, 1.99
Message-ID: <20090902090342.38B0711C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv784

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.39


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	25 Aug 2009 15:03:03 -0000	1.83
+++ .cvsignore	2 Sep 2009 09:03:41 -0000	1.84
@@ -1 +1 @@
-system-config-services-0.99.38.tar.bz2
+system-config-services-0.99.39.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	25 Aug 2009 15:03:03 -0000	1.96
+++ sources	2 Sep 2009 09:03:41 -0000	1.97
@@ -1 +1 @@
-cb362b25657611310b8fe042ae970b1d  system-config-services-0.99.38.tar.bz2
+40dec5f16dda6da1eb1778811341aec0  system-config-services-0.99.39.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- system-config-services.spec	25 Aug 2009 15:03:04 -0000	1.98
+++ system-config-services.spec	2 Sep 2009 09:03:41 -0000	1.99
@@ -11,7 +11,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.38
+Version: 0.99.39
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -47,8 +47,11 @@ Requires: PolicyKit-gnome
 %endif
 Obsoletes: serviceconf <= 0.8.1
 Obsoletes: redhat-config-services <= 0.8.5
+# Until version 0.99.28, system-config-services contained online documentation.
+# From version 0.99.29 on, online documentation is split off into its own
+# package system-config-services-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-services < 0.99.29
-Conflicts: system-config-services < 0.99.29
 
 %description
 system-config-services is a utility which allows you to configure which services
@@ -115,6 +118,12 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 0.99.39-1
+- initialize gettext correctly
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions (#519300)
+
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.38-1
 - always allow access if properly authorized
 



From akurtakov at fedoraproject.org  Wed Sep  2 09:04:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  2 Sep 2009 09:04:08 +0000 (UTC)
Subject: rpms/maven2/devel maven2-bash-completion, NONE, 1.1 maven2.spec,
	1.26, 1.27
Message-ID: <20090902090408.DC02F11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1242/devel

Modified Files:
	maven2.spec 
Added Files:
	maven2-bash-completion 
Log Message:
- Add bash-completion.
- Drop gcj-support. Drops 1170 lines.
- Fix dependencies for the following plugins: changes, eclipse, idea.


--- NEW FILE maven2-bash-completion ---
_m2_make_goals()
{
  plugin=$1
  mojos=$2
  for mojo in $mojos
  do
    export goals="$goals $plugin:$mojo"
  done
}

_m2_complete()
{
  local cur goals

  COMPREPLY=()
  cur=${COMP_WORDS[COMP_CWORD]}
  goals='clean compile test install package deploy site'
  goals=$goals _m2_make_goals "eclipse" "eclipse"
  goals=$goals _m2_make_goals "idea" "idea"
  goals=$goals _m2_make_goals "assembly" "assembly"
  goals=$goals _m2_make_goals "plexus" "app bundle-application bundle-runtime descriptor runtime service"
  cur=`echo $cur | sed 's/\\\\//g'`
  COMPREPLY=($(compgen -W "${goals}" ${cur} | sed 's/\\\\//g') )
}

complete -F _m2_complete -o filenames mvn
complete -F _m2_complete -o filenames mvn-jpp


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- maven2.spec	1 Sep 2009 19:30:11 -0000	1.26
+++ maven2.spec	2 Sep 2009 09:04:08 -0000	1.27
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support 0
-
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 
 %define with_bootstrap 0
@@ -46,7 +44,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -102,6 +100,7 @@ Source14:       %{name}-empty-dep.jar
 Source15:       %{name}-jpp-script
 Source16:       %{name}-jpp-readme.html
 Source17:       %{name}-versionless-depmap.xml
+Source18:       %{name}-bash-completion
 
 Patch0:         maven2-addjdomtobootstrappath.patch
 Patch1:         %{name}-jpprepolayout.patch
@@ -121,7 +120,7 @@ Patch15:        %{name}-plugins-javadoc-
 # This plugin can't cope with a JAR without a JDK version on it
 Patch16:        %{name}-plugins-project-info-reports-jdkversion.patch
 Patch17:        %{name}-MNG-3139.patch
-Patch18:	%{name}-plugins-jpprepolayout.patch
+Patch18:        %{name}-plugins-jpprepolayout.patch
 
 BuildRequires:    java-1.6.0-openjdk-devel
 BuildRequires:    jpackage-utils >= 0:1.7.2
@@ -338,15 +337,7 @@ Requires(postun):  jpackage-utils >= 0:1
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
-
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
 
 %description
 Maven is a software project management and comprehension tool. Based on the
@@ -382,12 +373,6 @@ Requires:	plexus-container-default
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-ant
 Generates an Ant build file for the project.
 
@@ -405,12 +390,6 @@ Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-antlr
 Generates sources from an Antlr grammar.
 
@@ -425,12 +404,6 @@ Requires:    	maven-shared-reporting-imp
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-antrun
 Runs a set of ant tasks from a phase of the build.
 
@@ -458,12 +431,6 @@ Requires:       easymock
 Requires:    	saxpath
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-assembly
 Builds an assembly (distribution) of sources and/or binaries.
 
@@ -480,12 +447,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       maven-doxia >= 1.0-0.a9
 Requires:       maven-scm >= 0:1.0-0.b3.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-changelog
 The Maven Changelog Plugin generates reports regarding the recent changes in
 your Software Configuration Management or SCM.
@@ -497,7 +458,6 @@ Group:          Development/Build Tools
 Requires:       maven-doxia
 Requires:       maven-doxia-sitetools >= 1.0
 Requires:    	maven-shared-reporting-impl
-Requires:       glassfish-javamail
 Requires:       plexus-velocity >= 1.1.7
 %else
 Requires:       plexus-velocity >= 1.1.2
@@ -510,12 +470,6 @@ Requires:       plexus-mail-sender
 Requires:       jakarta-commons-lang
 Requires:       velocity
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-changes
 The Maven Changes Plugin is used to inform users of the changes that have
 occured between different releases of your project.
@@ -534,12 +488,6 @@ Requires:       plexus-resources
 Requires:    	maven-shared-reporting-impl
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-checkstyle
 Generates a checkstyle report.
 
@@ -552,12 +500,6 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-clean
 Cleans up files generated during build.
 
@@ -575,12 +517,6 @@ Requires:       plexus-resources
 Requires:       clover
 Requires:    	maven-shared-reporting-impl
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-clover
 Generates a Clover report.
 %endif
@@ -594,12 +530,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       plexus-compiler >= 1.5.1
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-compiler
 Compiles Java sources.
 
@@ -619,13 +549,6 @@ Requires:       maven-shared-dependency-
 Requires:       maven-shared-dependency-tree
 %endif
 
-
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-dependency
 The dependency plugin provides the capability to manipulate artifacts. It can
 copy and/or unpack artifacts from local or remote repositories to a specified
@@ -637,12 +560,6 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-deploy
 Deploys the built artifacts to a remote repository.
 
@@ -653,17 +570,10 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-doap
 The Maven DOAP Plugin generates a Description of a Project (DOAP) file from
 a POM.
 
-
 %package        plugin-docck
 Summary:        DOCCK plugin for maven
 Group:          Development/Build Tools
@@ -680,12 +590,6 @@ Requires:       commons-httpclient
 Requires:       jakarta-commons-logging >= 1.0.4
 Requires:       maven-shared-file-management >= 1.0-4
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-docck
 The Maven DOCCK Plugin checks that a project complies with the
 Plugin Documentation Standard.
@@ -703,12 +607,6 @@ Requires:       maven-shared-verifier
 %endif
 Requires:       xmlunit
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-ear
 Generates an EAR from the current project.
 
@@ -725,18 +623,11 @@ Requires:       jaxen >= 1.1
 Requires:    	saxpath
 Requires:       plexus-interactivity >= 1.0
 %if %{without_bootstrap}
-Requires:       jmock >= 1.0.1
 Requires:	maven-shared-plugin-testing-tools
 Requires:	maven-shared-test-tools
 %endif
 Requires:       aqute-bndlib
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-eclipse
 Generates an Eclipse project file for the current project.
 
@@ -747,12 +638,6 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-ejb
 Builds an EJB (and optional client) from the current project.
 
@@ -769,12 +654,6 @@ Requires:       maven-enforcer-rule-api
 Requires:       plexus-utils
 Requires:       bsh
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-enforcer
 The Maven Enforcer Plugin provides goals to control certain environmental
 constraints such as Maven Version, JDK version, and OS family.
@@ -790,12 +669,6 @@ Requires:       plexus-utils
 Requires:       jakarta-commons-lang
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-gpg
 The Maven GPG Plugin signs all of the project's attached artifacts with GnuPG.
 
@@ -809,12 +682,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       maven-shared-plugin-tools-api
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-help
 Gets information about the working environment for the project.
 
@@ -827,15 +694,6 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon >= 1.0-0.1.b2
 Requires:       plexus-utils >= 1.2
-%if %{without_bootstrap}
-Requires:       jmock >= 1.0.1
-%endif
-
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
 
 %description    plugin-idea
 Creates/updates an IDEA workspace for the current project
@@ -849,12 +707,6 @@ Requires:       plexus-digest >= 1.0
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-install
 Installs the built artifact into the local repository.
 
@@ -871,12 +723,6 @@ Requires:	maven-shared-io
 %endif
 Requires:       bsh
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-invoker
 The Maven Invoker Plugin is used to run a set of Maven projects and makes
 sure that each project execution is successful, and optionally verifies
@@ -893,12 +739,6 @@ Requires:       maven-shared-archiver >=
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-jar
 Builds a JAR from the current project.
 
@@ -918,12 +758,6 @@ Requires:       plexus-utils >= 1.2
 Requires:    	maven-shared-reporting-impl
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-javadoc
 Generates Javadoc for the project.
 
@@ -940,12 +774,6 @@ Requires:       junit >= 3.8.2
 Requires:       maven-shared-model-converter
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-one
 A plugin for interacting with legacy Maven 1.x repositories and builds.
 
@@ -964,12 +792,6 @@ Requires:       maven-doxia >= 1.0-0.a9
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-plugin
 Creates a Maven plugin descriptor for any Mojo's found in the source tree,
 to include in the JAR.
@@ -989,12 +811,6 @@ Requires:       xom
 Requires:    	maven-shared-reporting-impl
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-pmd
 Generates a PMD report.
 
@@ -1017,12 +833,6 @@ Requires:       maven-wagon
 Requires:       maven-scm >= 0:1.0-0.b3.2
 Requires:       maven-doxia >= 1.0-0.a9
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-project-info-reports
 Generates standard project reports.
 
@@ -1032,12 +842,6 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-rar
 Builds a RAR from the current project.
 
@@ -1057,12 +861,6 @@ Requires:       maven-shared-downloader
 Requires:       plexus-resources
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-remote-resources
 The Maven Remote Resources Plugin is used to retrieve JARs of resources
 from remote repositories, processes those resources, and incorporate them
@@ -1076,12 +874,6 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-repository
 Plugin to help with repository-based tasks.
 
@@ -1093,12 +885,6 @@ Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-resources
 Copies the resources to the output directory for including in the JAR.
 
@@ -1113,12 +899,6 @@ Requires:       maven-doxia-sitetools >=
 %endif
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-site
 Generates a site for the current project.
 
@@ -1132,12 +912,6 @@ Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default >= 1.0
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-source
 Builds a JAR of sources for use in IDEs and distribution to the repository.
 
@@ -1150,16 +924,9 @@ Requires:       maven-wagon
 Requires:       plexus-utils
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-stage
 Maven Stage Plugin copies artifacts from one repository to another.
 
-
 %package        plugin-verifier
 Summary:        Verifier plugin for maven
 Group:          Development/Build Tools
@@ -1171,12 +938,6 @@ Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-verifier
 Useful for integration tests - verifies the existence of certain conditions.
 
@@ -1188,12 +949,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       plexus-utils >= 1.2
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-war
 Builds a WAR from the current project.
 
@@ -1693,9 +1448,10 @@ mv m2_repo/repository/JPP $RPM_BUILD_ROO
 rmdir -p m2_repo/repository
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+# Install bash-completion support
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/bash_completion.d
+%{__cp} -a %{SOURCE18} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1733,13 +1489,6 @@ build-jar-repository -s -p %{_datadir}/%
 
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 # We create links in %post in the dir's below. rm -rf them.
 %preun -n %{name}
 [ $1 = 0 ] || exit 0
@@ -1753,607 +1502,6 @@ rm -rf %{_datadir}/%{name}/core/*
 if [ -d %{_javadir}/%{name} ] ; then rmdir --ignore-fail-on-non-empty %{_javadir}/%{name} >& /dev/null; fi
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-source
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-source
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{NONFREE}
-%if %{gcj_support}
-%post plugin-clover
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-clover
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-%endif
-
-%if %{gcj_support}
-%post plugin-ejb
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-ejb
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-repository
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-repository
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-pmd
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-pmd
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-idea
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-idea
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-site
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-site
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-plugin
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-plugin
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-one
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-one
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-eclipse
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-eclipse
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-ear
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-ear
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-project-info-reports
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-project-info-reports
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-antlr
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-antlr
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-clean
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-clean
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-rar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-rar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-jar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-jar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-checkstyle
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-checkstyle
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-ant
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-ant
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-antrun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-antrun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-help
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-help
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-verifier
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-verifier
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-compiler
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-compiler
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-install
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-install
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-javadoc
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-javadoc
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-assembly
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-assembly
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-deploy
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-deploy
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-dependency
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-dependency
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-changelog
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-changelog
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-changes
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-changes
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-doap
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-doap
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-docck
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-docck
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-enforcer
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-enforcer
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-gpg
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-gpg
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-invoker
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-invoker
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-remote-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-remote-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-stage
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-stage
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files -n %{name}
 %defattr(-,root,root,-)
 %doc %{name}/maven-core/*.txt
@@ -2375,122 +1523,11 @@ fi
 %{_datadir}/%{name}/repository
 %{_mavendepmapfragdir}
 %{_javadir}/%{name}
+%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
 
 %if %{with_bootstrap}
 %{_datadir}/%{name}/bootstrap_repo
 %endif
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/artifact-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/artifact-manager-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/artifact-test-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/core-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/error-diagnostics-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-%{version}-uber.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/model-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/model-v3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/monitor-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-api-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-descriptor-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-parameter-documenter-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-registry-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/profile-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/project-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/reporting-api-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-metadata-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/script-ant-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/script-beanshell-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/settings-%{version}.jar.*
-
-%if %{with_bootstrap}
-%attr(-,root,root) %{_libdir}/gcj/maven2/asm3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/backport-util-concurrent.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/beanshell.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/bndlib.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/book.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/booter.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/cdc.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/classworlds.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/common-artifact-filters.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/decoration-model.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/digest.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/doc-renderer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/file-management.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/geronimo-j2ee-1.4-apis.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/geronimo-javamail-1.3.1-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/impl.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/io.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/jar.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/java.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/junit.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/mail-sender-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/mail-sender-javamail.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/mail-sender-simple.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/manager-plexus.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-archiver.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-dependency-analyzer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-dependency-tree.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-downloader.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-doxia_core.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-doxia_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-embedder.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-enforcer-rule-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-invoker.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-model-converter.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-plugin-testing-harness.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-plugin-testing-tools.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-plugin-tools_api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-scm_api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-surefire_api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-surefire_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-test-tools.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-verifier.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven2-plugin-shade.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/modello_core.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/modello_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-apt.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-confluence.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-docbook-simple.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-fml.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-itext.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-latex.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-rtf.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-twiki.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-xdoc.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-xhtml.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plexus_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-jdom.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-jpox.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-prevayler.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-store.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xdoc.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xml.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xpp3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xsd.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/pmd.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-bazaar.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-clearcase.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-cvs-commons.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-cvsexe.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-cvsjava.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-hg.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-local.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-perforce.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-starteam.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-svn-commons.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-svnexe.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-synergy.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-vss.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/repository-builder.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/resources.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/saxpath.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/sink-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/site-renderer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/utils.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/velocity.jar.*
-%endif
-
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -2505,94 +1542,46 @@ fi
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/ant-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-plugin*.jar.*
-%endif
-
 %files plugin-antlr
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/antlr-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/antlr-plugin*.jar.*
-%endif
-
 %files plugin-antrun
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/antrun-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/antrun-plugin*.jar.*
-%endif
-
 %files plugin-assembly
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/assembly-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/assembly-plugin*.jar.*
-%endif
-
 %files plugin-changelog
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/changelog-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/changelog-plugin*.jar.*
-%endif
-
 %files plugin-changes
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/changes-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/changes-plugin*.jar.*
-%endif
-
 %files plugin-checkstyle
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/checkstyle-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/checkstyle-plugin*.jar.*
-%endif
-
 %files plugin-clean
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/clean-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/clean-plugin*.jar.*
-%endif
-
 %if %{NONFREE}
 %files plugin-clover
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/clover-plugin*.jar
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/clover-plugin*.jar.*
-%endif
 %endif
 
 %files plugin-compiler
@@ -2600,312 +1589,153 @@ fi
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/compiler-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/compiler-plugin*.jar.*
-%endif
-
 %files plugin-dependency
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/dependency-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/dependency-plugin*.jar.*
-%endif
-
 %files plugin-deploy
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/deploy-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/deploy-plugin*.jar.*
-%endif
-
 %files plugin-doap
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/doap-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/doap-plugin*.jar.*
-%endif
-
-
 %files plugin-docck
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/docck-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/docck-plugin*.jar.*
-%endif
-
 %files plugin-ear
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/ear-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ear-plugin*.jar.*
-%endif
-
 %files plugin-eclipse
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/eclipse-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/eclipse-plugin*.jar.*
-%endif
-
-
 %files plugin-ejb
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/ejb-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ejb-plugin*.jar.*
-%endif
-
 %files plugin-enforcer
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/enforcer-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/enforcer-plugin*.jar.*
-%endif
-
 %files plugin-gpg
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/gpg-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/gpg-plugin*.jar.*
-%endif
-
-
 %files plugin-help
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/help-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/help-plugin*.jar.*
-%endif
-
-
 %files plugin-idea
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/idea-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/idea-plugin*.jar.*
-%endif
-
-
 %files plugin-install
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/install-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/install-plugin*.jar.*
-%endif
-
 %files plugin-invoker
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/invoker-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/invoker-plugin*.jar.*
-%endif
-
-
 %files plugin-jar
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/jar-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jar-plugin*.jar.*
-%endif
-
-
 %files plugin-javadoc
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/javadoc-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/javadoc-plugin*.jar.*
-%endif
-
-
 %files plugin-one
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/one-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/one-plugin*.jar.*
-%endif
-
-
 %files plugin-plugin
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/plugin-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin*.jar.*
-%endif
-
-
 %files plugin-pmd
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/pmd-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/pmd-plugin*.jar.*
-%endif
-
-
 %files plugin-project-info-reports
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/project-info-reports-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/project-info-reports-plugin*.jar.*
-%endif
-
-
 %files plugin-rar
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/rar-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/rar-plugin*.jar.*
-%endif
-
-
 %files plugin-remote-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/remote-resources-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin*.jar.*
-%endif
-
-
 %files plugin-repository
 %defattr(-,root,root,-)
 %doc maven2-plugins/maven-repository-plugin/LICENSE.txt
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/repository-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-plugin*.jar.*
-%endif
-
 %files plugin-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/resources-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/resources-plugin*.jar.*
-%endif
-
-
 %files plugin-site
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/site-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/site-plugin*.jar.*
-%endif
-
-
 %files plugin-source
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/source-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/source-plugin*.jar.*
-%endif
-
-
 %files plugin-stage
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/stage-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/stage-plugin*.jar.*
-%endif
-
 %files plugin-verifier
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/verifier-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/verifier-plugin*.jar.*
-%endif
-
-
 %files plugin-war
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/war-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/war-plugin*.jar.*
-%endif
-
 %changelog
+* Wed Sep 2 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-3
+- Add bash-completion.
+- Drop gcj-support. Drops 1170 lines.
+- Fix dependencies for the following plugins: changes, eclipse, idea.
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-2
 - Build in non-bootstrap mode
 - Change jmock R to easymock for plugin-assembly



From tomeu at fedoraproject.org  Wed Sep  2 09:05:31 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed,  2 Sep 2009 09:05:31 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.42, 1.43 sources, 1.44,
	1.45 sugar.spec, 1.67, 1.68
Message-ID: <20090902090531.91BD311C00E6@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2546

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	26 Aug 2009 09:26:02 -0000	1.42
+++ .cvsignore	2 Sep 2009 09:05:31 -0000	1.43
@@ -1 +1 @@
-sugar-0.85.4.tar.bz2
+sugar-0.85.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	26 Aug 2009 09:26:02 -0000	1.44
+++ sources	2 Sep 2009 09:05:31 -0000	1.45
@@ -1 +1 @@
-a72e795662e04140e8b852ecab549f85  sugar-0.85.4.tar.bz2
+fd3e1dff6f4f9b903846aab2446ec843  sugar-0.85.5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sugar.spec	26 Aug 2009 09:26:02 -0000	1.67
+++ sugar.spec	2 Sep 2009 09:05:31 -0000	1.68
@@ -42,6 +42,7 @@ Requires: dbus-x11
 Requires: openssh
 
 Obsoletes: sugar-journal <= 99
+Obsoletes: sugar-update-control <= 99
 
 %description
 
@@ -140,6 +141,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
+- New upstream release
+
 * Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
 - New upstream release
 



From nphilipp at fedoraproject.org  Wed Sep  2 09:06:32 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 09:06:32 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.75, 1.76 sources, 1.84,
	1.85 system-config-users.spec, 1.92, 1.93
Message-ID: <20090902090632.AA58D11C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3489

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.89


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	28 Aug 2009 15:54:20 -0000	1.75
+++ .cvsignore	2 Sep 2009 09:06:32 -0000	1.76
@@ -1 +1 @@
-system-config-users-1.2.88.tar.bz2
+system-config-users-1.2.89.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	28 Aug 2009 15:54:21 -0000	1.84
+++ sources	2 Sep 2009 09:06:32 -0000	1.85
@@ -1 +1 @@
-c5763c77916fa97d89deb604a85b97a6  system-config-users-1.2.88.tar.bz2
+246c9a2aa7ec7ff51431b117f5d70f6d  system-config-users-1.2.89.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- system-config-users.spec	28 Aug 2009 15:54:21 -0000	1.92
+++ system-config-users.spec	2 Sep 2009 09:06:32 -0000	1.93
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.88
+Version: 1.2.89
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -127,6 +127,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.2.89-1
+- initialize gettext correctly
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.88-1
 - initialize gettext at the right place
 - get rid of rhpl.iconv, rhpl.executil



From tomeu at fedoraproject.org  Wed Sep  2 09:07:39 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed,  2 Sep 2009 09:07:39 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.68,1.69
Message-ID: <20090902090739.2519411C00E6@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4338

Modified Files:
	sugar.spec 
Log Message:
Bump version number


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sugar.spec	2 Sep 2009 09:05:31 -0000	1.68
+++ sugar.spec	2 Sep 2009 09:07:39 -0000	1.69
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.85.4
+Version: 0.85.5
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/



From than at fedoraproject.org  Wed Sep  2 09:22:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 09:22:37 +0000 (UTC)
Subject: rpms/kde-l10n/devel sources,1.31,1.32
Message-ID: <20090902092237.19B7D11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9804

Modified Files:
	sources 
Log Message:
respin kde-l10n-pl



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	28 Aug 2009 20:46:32 -0000	1.31
+++ sources	2 Sep 2009 09:22:36 -0000	1.32
@@ -38,7 +38,6 @@ c6ad03ce2427d9729ff4cd64c6451ade  kde-l1
 0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
 20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
 b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
-3b1444fb608909940f6010e076e718c9  kde-l10n-pl-4.3.1.tar.bz2
 695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
 57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
 3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
@@ -54,3 +53,4 @@ f705391dccc8557e0d9b874c0c2d3597  kde-l1
 8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
 44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
 2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
+7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2



From pghmcfc at fedoraproject.org  Wed Sep  2 09:44:31 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 09:44:31 +0000 (UTC)
Subject: rpms/proftpd/devel .cvsignore, 1.15, 1.16 proftpd.conf, 1.11,
	1.12 proftpd.spec, 1.53, 1.54 sources, 1.15, 1.16
Message-ID: <20090902094431.B6E3211C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13959

Modified Files:
	.cvsignore proftpd.conf proftpd.spec sources 
Log Message:
New DSO module: mod_exec (#520214)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Aug 2009 15:41:06 -0000	1.15
+++ .cvsignore	2 Sep 2009 09:44:31 -0000	1.16
@@ -1,2 +1,3 @@
 proftpd-1.3.2a.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
+proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- proftpd.conf	19 Aug 2009 15:41:06 -0000	1.11
+++ proftpd.conf	2 Sep 2009 09:44:31 -0000	1.12
@@ -91,6 +91,11 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 # (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
 #   LoadModule mod_ctrls_admin.c
 #
+# Execute external programs or scripts at various points in the process
+# of handling FTP commands
+# (http://www.castaglia.org/proftpd/modules/mod_exec.html)
+#   LoadModule mod_exec.c
+#
 # Support for POSIX ACLs
 # (http://www.proftpd.org/docs/modules/mod_facl.html)
 #   LoadModule mod_facl.c
@@ -138,7 +143,6 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 
 # TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
 <IfDefine TLS>
-  LoadModule			mod_tls.c
   TLSEngine			on
   TLSRequired			on
   TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- proftpd.spec	21 Aug 2009 15:29:55 -0000	1.53
+++ proftpd.spec	2 Sep 2009 09:44:31 -0000	1.54
@@ -7,12 +7,12 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 4
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
 Version:		1.3.2a
-Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}.1
+Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
 URL:			http://www.proftpd.org/
@@ -27,6 +27,7 @@ Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
+Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -78,10 +79,15 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever} -a 10
+%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11
 
-# Copy mod_vroot source into place
+# Copy mod_vroot source and documentation into place
 %{__cp} -p mod_vroot/mod_vroot.c contrib/
+%{__cp} -p mod_vroot/mod_vroot.html doc/contrib/
+
+# Copy mod_exec source and documentation into place
+%{__cp} -p mod_exec/mod_exec.c contrib/
+%{__cp} -p mod_exec/mod_exec.html doc/contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -132,7 +138,7 @@ done
 SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
 SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
 SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
-SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec
 SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
@@ -241,6 +247,7 @@ fi
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_exec.so
 %{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_load.so
@@ -278,8 +285,11 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
+- New DSO module: mod_exec (#520214)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
-- rebuilt with new openssl
+- Rebuilt with new openssl
 
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
 - Use mod_vroot to work around PAM/chroot issues (#477120, #506735)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Aug 2009 15:41:07 -0000	1.15
+++ sources	2 Sep 2009 09:44:31 -0000	1.16
@@ -1,2 +1,3 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
+dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz



From pghmcfc at fedoraproject.org  Wed Sep  2 09:56:33 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 09:56:33 +0000 (UTC)
Subject: rpms/proftpd/EL-4 .cvsignore, 1.10, 1.11 proftpd.conf, 1.10,
	1.11 proftpd.spec, 1.14, 1.15 sources, 1.10, 1.11
Message-ID: <20090902095633.1A8CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16551/EL-4

Modified Files:
	.cvsignore proftpd.conf proftpd.spec sources 
Log Message:
New DSO module: mod_exec (#520214)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Aug 2009 15:41:05 -0000	1.10
+++ .cvsignore	2 Sep 2009 09:56:32 -0000	1.11
@@ -1,2 +1,3 @@
 proftpd-1.3.2a.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
+proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- proftpd.conf	19 Aug 2009 15:41:05 -0000	1.10
+++ proftpd.conf	2 Sep 2009 09:56:32 -0000	1.11
@@ -91,6 +91,11 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 # (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
 #   LoadModule mod_ctrls_admin.c
 #
+# Execute external programs or scripts at various points in the process
+# of handling FTP commands
+# (http://www.castaglia.org/proftpd/modules/mod_exec.html)
+#   LoadModule mod_exec.c
+#
 # Support for POSIX ACLs
 # (http://www.proftpd.org/docs/modules/mod_facl.html)
 #   LoadModule mod_facl.c
@@ -138,7 +143,6 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 
 # TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
 <IfDefine TLS>
-  LoadModule			mod_tls.c
   TLSEngine			on
   TLSRequired			on
   TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- proftpd.spec	19 Aug 2009 15:41:05 -0000	1.14
+++ proftpd.spec	2 Sep 2009 09:56:32 -0000	1.15
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 4
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -27,6 +27,7 @@ Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
+Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -78,10 +79,15 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever} -a 10
+%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11
 
-# Copy mod_vroot source into place
+# Copy mod_vroot source and documentation into place
 %{__cp} -p mod_vroot/mod_vroot.c contrib/
+%{__cp} -p mod_vroot/mod_vroot.html doc/contrib/
+
+# Copy mod_exec source and documentation into place
+%{__cp} -p mod_exec/mod_exec.c contrib/
+%{__cp} -p mod_exec/mod_exec.html doc/contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -132,7 +138,7 @@ done
 SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
 SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
 SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
-SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec
 SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
@@ -241,6 +247,7 @@ fi
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_exec.so
 %{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_load.so
@@ -278,6 +285,12 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
+- New DSO module: mod_exec (#520214)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
+- Rebuilt with new openssl
+
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
 - Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Aug 2009 15:41:05 -0000	1.10
+++ sources	2 Sep 2009 09:56:32 -0000	1.11
@@ -1,2 +1,3 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
+dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz



From pghmcfc at fedoraproject.org  Wed Sep  2 09:56:33 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 09:56:33 +0000 (UTC)
Subject: rpms/proftpd/EL-5 .cvsignore, 1.13, 1.14 proftpd.conf, 1.11,
	1.12 proftpd.spec, 1.34, 1.35 sources, 1.13, 1.14
Message-ID: <20090902095633.4A89D11C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16551/EL-5

Modified Files:
	.cvsignore proftpd.conf proftpd.spec sources 
Log Message:
New DSO module: mod_exec (#520214)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	19 Aug 2009 15:41:05 -0000	1.13
+++ .cvsignore	2 Sep 2009 09:56:32 -0000	1.14
@@ -1,2 +1,3 @@
 proftpd-1.3.2a.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
+proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- proftpd.conf	19 Aug 2009 15:41:05 -0000	1.11
+++ proftpd.conf	2 Sep 2009 09:56:33 -0000	1.12
@@ -91,6 +91,11 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 # (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
 #   LoadModule mod_ctrls_admin.c
 #
+# Execute external programs or scripts at various points in the process
+# of handling FTP commands
+# (http://www.castaglia.org/proftpd/modules/mod_exec.html)
+#   LoadModule mod_exec.c
+#
 # Support for POSIX ACLs
 # (http://www.proftpd.org/docs/modules/mod_facl.html)
 #   LoadModule mod_facl.c
@@ -138,7 +143,6 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 
 # TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
 <IfDefine TLS>
-  LoadModule			mod_tls.c
   TLSEngine			on
   TLSRequired			on
   TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- proftpd.spec	19 Aug 2009 15:41:05 -0000	1.34
+++ proftpd.spec	2 Sep 2009 09:56:33 -0000	1.35
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 4
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -27,6 +27,7 @@ Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
+Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -78,10 +79,15 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever} -a 10
+%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11
 
-# Copy mod_vroot source into place
+# Copy mod_vroot source and documentation into place
 %{__cp} -p mod_vroot/mod_vroot.c contrib/
+%{__cp} -p mod_vroot/mod_vroot.html doc/contrib/
+
+# Copy mod_exec source and documentation into place
+%{__cp} -p mod_exec/mod_exec.c contrib/
+%{__cp} -p mod_exec/mod_exec.html doc/contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -132,7 +138,7 @@ done
 SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
 SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
 SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
-SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec
 SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
@@ -241,6 +247,7 @@ fi
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_exec.so
 %{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_load.so
@@ -278,6 +285,12 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
+- New DSO module: mod_exec (#520214)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
+- Rebuilt with new openssl
+
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
 - Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	19 Aug 2009 15:41:05 -0000	1.13
+++ sources	2 Sep 2009 09:56:33 -0000	1.14
@@ -1,2 +1,3 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
+dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz



From pghmcfc at fedoraproject.org  Wed Sep  2 09:56:33 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 09:56:33 +0000 (UTC)
Subject: rpms/proftpd/F-11 .cvsignore, 1.15, 1.16 proftpd.conf, 1.11,
	1.12 proftpd.spec, 1.49, 1.50 sources, 1.15, 1.16
Message-ID: <20090902095633.D2F2211C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16551/F-11

Modified Files:
	.cvsignore proftpd.conf proftpd.spec sources 
Log Message:
New DSO module: mod_exec (#520214)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Aug 2009 15:41:06 -0000	1.15
+++ .cvsignore	2 Sep 2009 09:56:33 -0000	1.16
@@ -1,2 +1,3 @@
 proftpd-1.3.2a.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
+proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- proftpd.conf	19 Aug 2009 15:41:06 -0000	1.11
+++ proftpd.conf	2 Sep 2009 09:56:33 -0000	1.12
@@ -91,6 +91,11 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 # (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
 #   LoadModule mod_ctrls_admin.c
 #
+# Execute external programs or scripts at various points in the process
+# of handling FTP commands
+# (http://www.castaglia.org/proftpd/modules/mod_exec.html)
+#   LoadModule mod_exec.c
+#
 # Support for POSIX ACLs
 # (http://www.proftpd.org/docs/modules/mod_facl.html)
 #   LoadModule mod_facl.c
@@ -138,7 +143,6 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 
 # TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
 <IfDefine TLS>
-  LoadModule			mod_tls.c
   TLSEngine			on
   TLSRequired			on
   TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- proftpd.spec	19 Aug 2009 15:41:06 -0000	1.49
+++ proftpd.spec	2 Sep 2009 09:56:33 -0000	1.50
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 4
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -27,6 +27,7 @@ Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
+Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -78,10 +79,15 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever} -a 10
+%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11
 
-# Copy mod_vroot source into place
+# Copy mod_vroot source and documentation into place
 %{__cp} -p mod_vroot/mod_vroot.c contrib/
+%{__cp} -p mod_vroot/mod_vroot.html doc/contrib/
+
+# Copy mod_exec source and documentation into place
+%{__cp} -p mod_exec/mod_exec.c contrib/
+%{__cp} -p mod_exec/mod_exec.html doc/contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -132,7 +138,7 @@ done
 SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
 SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
 SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
-SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec
 SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
@@ -241,6 +247,7 @@ fi
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_exec.so
 %{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_load.so
@@ -278,6 +285,12 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
+- New DSO module: mod_exec (#520214)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
+- Rebuilt with new openssl
+
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
 - Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Aug 2009 15:41:06 -0000	1.15
+++ sources	2 Sep 2009 09:56:33 -0000	1.16
@@ -1,2 +1,3 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
+dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz



From pghmcfc at fedoraproject.org  Wed Sep  2 09:56:33 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 09:56:33 +0000 (UTC)
Subject: rpms/proftpd/F-10 .cvsignore, 1.14, 1.15 proftpd.conf, 1.11,
	1.12 proftpd.spec, 1.46, 1.47 sources, 1.14, 1.15
Message-ID: <20090902095633.94B7711C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16551/F-10

Modified Files:
	.cvsignore proftpd.conf proftpd.spec sources 
Log Message:
New DSO module: mod_exec (#520214)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Aug 2009 15:41:05 -0000	1.14
+++ .cvsignore	2 Sep 2009 09:56:33 -0000	1.15
@@ -1,2 +1,3 @@
 proftpd-1.3.2a.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
+proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- proftpd.conf	19 Aug 2009 15:41:06 -0000	1.11
+++ proftpd.conf	2 Sep 2009 09:56:33 -0000	1.12
@@ -91,6 +91,11 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 # (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
 #   LoadModule mod_ctrls_admin.c
 #
+# Execute external programs or scripts at various points in the process
+# of handling FTP commands
+# (http://www.castaglia.org/proftpd/modules/mod_exec.html)
+#   LoadModule mod_exec.c
+#
 # Support for POSIX ACLs
 # (http://www.proftpd.org/docs/modules/mod_facl.html)
 #   LoadModule mod_facl.c
@@ -138,7 +143,6 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %
 
 # TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
 <IfDefine TLS>
-  LoadModule			mod_tls.c
   TLSEngine			on
   TLSRequired			on
   TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- proftpd.spec	19 Aug 2009 15:41:06 -0000	1.46
+++ proftpd.spec	2 Sep 2009 09:56:33 -0000	1.47
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 4
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -27,6 +27,7 @@ Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
+Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -78,10 +79,15 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever} -a 10
+%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11
 
-# Copy mod_vroot source into place
+# Copy mod_vroot source and documentation into place
 %{__cp} -p mod_vroot/mod_vroot.c contrib/
+%{__cp} -p mod_vroot/mod_vroot.html doc/contrib/
+
+# Copy mod_exec source and documentation into place
+%{__cp} -p mod_exec/mod_exec.c contrib/
+%{__cp} -p mod_exec/mod_exec.html doc/contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -132,7 +138,7 @@ done
 SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
 SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
 SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
-SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec
 SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
@@ -241,6 +247,7 @@ fi
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_exec.so
 %{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_load.so
@@ -278,6 +285,12 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
+- New DSO module: mod_exec (#520214)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
+- Rebuilt with new openssl
+
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
 - Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Aug 2009 15:41:06 -0000	1.14
+++ sources	2 Sep 2009 09:56:33 -0000	1.15
@@ -1,2 +1,3 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
+dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz



From denis at fedoraproject.org  Wed Sep  2 10:03:38 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed,  2 Sep 2009 10:03:38 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.39, 1.40 glibmm.spec, 1.57,
	1.58 sources, 1.40, 1.41
Message-ID: <20090902100338.7CA0F11C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18068

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.21.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	30 Aug 2009 08:26:58 -0000	1.39
+++ .cvsignore	2 Sep 2009 10:03:38 -0000	1.40
@@ -1 +1 @@
-glibmm-2.21.4.tar.bz2
+glibmm-2.21.4.2.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- glibmm.spec	30 Aug 2009 08:26:58 -0000	1.57
+++ glibmm.spec	2 Sep 2009 10:03:38 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.21.4
+Version:        2.21.4.2
 Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  2 2009 Denis Leroy <denis at poolshark.org> - 2.21.4.2-1
+- Update to upstream 2.21.4.2
+
 * Sun Aug 30 2009 Denis Leroy <denis at poolshark.org> - 2.21.4-1
 - Update to upstream 2.21.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	30 Aug 2009 08:26:58 -0000	1.40
+++ sources	2 Sep 2009 10:03:38 -0000	1.41
@@ -1 +1 @@
-08be0712e2992a395ac9405376dbc392  glibmm-2.21.4.tar.bz2
+1f14c41e08b3663a2929370834e7834e  glibmm-2.21.4.2.tar.bz2



From kwizart at fedoraproject.org  Wed Sep  2 10:11:25 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed,  2 Sep 2009 10:11:25 +0000 (UTC)
Subject: rpms/aimage/devel aimage-3.2.1.gcc44.patch, NONE, 1.1 aimage.spec,
	1.8, 1.9 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 aimage-3.2.0-gcc44.patch, 1.1, NONE
Message-ID: <20090902101125.1555811C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20643

Modified Files:
	aimage.spec .cvsignore sources 
Added Files:
	aimage-3.2.1.gcc44.patch 
Removed Files:
	aimage-3.2.0-gcc44.patch 
Log Message:
Update to 3.2.1


aimage-3.2.1.gcc44.patch:
 ident.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE aimage-3.2.1.gcc44.patch ---
diff -up aimage-3.2.1/src/ident.cpp.gcc44 aimage-3.2.1/src/ident.cpp
--- aimage-3.2.1/src/ident.cpp.gcc44	2009-09-02 11:54:51.199071082 +0200
+++ aimage-3.2.1/src/ident.cpp	2009-09-02 11:56:43.164073238 +0200
@@ -126,7 +126,7 @@ char *getfileline(const char *dirname,co
  */
 void getresult(const char *buf,const char *str,char **res)
 {
-    char *pos = strstr(buf,str);
+    const char *pos = strstr(buf,str);
     if(!pos) return;
     pos += strlen(str);
     *res = strdup(pos);


Index: aimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- aimage.spec	21 Aug 2009 12:20:09 -0000	1.8
+++ aimage.spec	2 Sep 2009 10:11:24 -0000	1.9
@@ -1,16 +1,16 @@
 Name:           aimage
-Version:        3.2.0
-Release:        6%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        Advanced Disk Imager
 
 Group:          Applications/System
 License:        BSD with advertising
 URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/aimage-%{version}.tar.gz
-Patch0:         aimage-3.2.0-gcc44.patch
+Patch0:         aimage-3.2.1.gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  afflib-devel
+BuildRequires:  afflib-devel >= 3.3.7
 BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
 
@@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 3.2.1-1
+- Update to 3.2.1
+- Update gcc44 patch
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-6
 - rebuilt with new openssl
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Sep 2008 14:40:21 -0000	1.4
+++ .cvsignore	2 Sep 2009 10:11:24 -0000	1.5
@@ -1 +1 @@
-aimage-3.2.0.tar.gz
+aimage-3.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Sep 2008 14:40:21 -0000	1.4
+++ sources	2 Sep 2009 10:11:24 -0000	1.5
@@ -1 +1 @@
-58218cfc5cfcfdbabb216f1f8c0f9c39  aimage-3.2.0.tar.gz
+0afd3376fe2c8dd8e43571282505a9fb  aimage-3.2.1.tar.gz


--- aimage-3.2.0-gcc44.patch DELETED ---



From than at fedoraproject.org  Wed Sep  2 10:18:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 10:18:06 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.390,1.391
Message-ID: <20090902101806.B795411C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21846

Modified Files:
	kdebase.spec 
Log Message:
drop support fedora < 10



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- kdebase.spec	31 Aug 2009 13:31:09 -0000	1.390
+++ kdebase.spec	2 Sep 2009 10:18:06 -0000	1.391
@@ -1,4 +1,3 @@
-
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
@@ -57,11 +56,7 @@ BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba
-%endif
 BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: strigi-devel >= 0.5.7
 # needed?



From pkgdb at fedoraproject.org  Wed Sep  2 10:18:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 10:18:48 +0000
Subject: [pkgdb] findutils ownership updated
Message-ID: <20090902101848.6D5BC10F882@bastion2.fedora.phx.redhat.com>

Package findutils in Fedora devel was orphaned by vcrhonek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/findutils



From pkgdb at fedoraproject.org  Wed Sep  2 10:18:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 10:18:56 +0000
Subject: [pkgdb] findutils ownership updated
Message-ID: <20090902101856.A840D10F883@bastion2.fedora.phx.redhat.com>

Package findutils in Fedora 11 was orphaned by vcrhonek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/findutils



From pkgdb at fedoraproject.org  Wed Sep  2 10:18:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 10:18:58 +0000
Subject: [pkgdb] findutils ownership updated
Message-ID: <20090902101859.0E17710F893@bastion2.fedora.phx.redhat.com>

Package findutils in Fedora 10 was orphaned by vcrhonek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/findutils



From pkgdb at fedoraproject.org  Wed Sep  2 10:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 10:21:01 +0000
Subject: [pkgdb] findutils ownership updated
Message-ID: <20090902102101.694BF10F890@bastion2.fedora.phx.redhat.com>

Package findutils in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/findutils



From pkgdb at fedoraproject.org  Wed Sep  2 10:20:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 10:20:54 +0000
Subject: [pkgdb] findutils ownership updated
Message-ID: <20090902102054.C2B7610F883@bastion2.fedora.phx.redhat.com>

Package findutils in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/findutils



From pkgdb at fedoraproject.org  Wed Sep  2 10:21:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 10:21:03 +0000
Subject: [pkgdb] findutils ownership updated
Message-ID: <20090902102103.D2AD410F893@bastion2.fedora.phx.redhat.com>

Package findutils in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/findutils



From denis at fedoraproject.org  Wed Sep  2 10:43:15 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed,  2 Sep 2009 10:43:15 +0000 (UTC)
Subject: rpms/gstreamermm/devel gstreamermm-0.10.4-docs.patch, NONE,
	1.1 gstreamermm.spec, 1.13, 1.14
Message-ID: <20090902104315.C95CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31651

Modified Files:
	gstreamermm.spec 
Added Files:
	gstreamermm-0.10.4-docs.patch 
Log Message:
Rebuild for new glibmm24. Added patch to remove beautify_docs

gstreamermm-0.10.4-docs.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gstreamermm-0.10.4-docs.patch ---
--- gstreamermm-0.10.4/docs/reference/Makefile.in~	2009-08-19 23:02:24.000000000 +0200
+++ gstreamermm-0.10.4/docs/reference/Makefile.in	2009-09-02 12:16:40.000000000 +0200
@@ -392,11 +392,11 @@
 	uninstall uninstall-am uninstall-local
 
 
-$(HTML_INDEX): $(doxygen_configfile_source) $(beautify_docs) \
+$(HTML_INDEX): $(doxygen_configfile_source) \
 	$(top_srcdir)/gstreamer/gstreamermm/*.h
 	-rm -rf html
 	$(doxygenprog) $(doxygen_configfile)
-	$(PERL_PATH) $(beautify_docs) html && touch $@
+	touch $@
 
 gstreamermm-reference-html.tar.gz: $(HTML_INDEX)
 	tar cf - html | gzip -c --best >$@


Index: gstreamermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/gstreamermm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gstreamermm.spec	20 Aug 2009 08:52:31 -0000	1.13
+++ gstreamermm.spec	2 Sep 2009 10:43:15 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gstreamermm
 Version:        0.10.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        C++ wrapper for GStreamer library
 
@@ -8,6 +8,7 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.9/%{name}-%{version}.tar.bz2
+Patch0:         gstreamermm-0.10.4-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibmm24-devel >= 2.21.1
@@ -40,6 +41,7 @@ developing gstreamermm applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .docs
 
 
 %build
@@ -85,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  2 2009 Denis Leroy <denis at poolshark.org> - 0.10.4-2
+- Rebuild for new glibmm24
+- Added patch to remove beautify_docs
+
 * Thu Aug 20 2009 Denis Leroy <denis at poolshark.org> - 0.10.4-1
 - Update to upstream 0.10.4
 



From fabbione at fedoraproject.org  Wed Sep  2 11:13:55 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  2 Sep 2009 11:13:55 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel minor_build_fixes.diff, NONE, 1.1 .cvsignore,
	1.2, 1.3 ocfs2-tools.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20090902111355.CACA011C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10139

Modified Files:
	.cvsignore ocfs2-tools.spec sources 
Added Files:
	minor_build_fixes.diff 
Log Message:
New upstream release and start to integrate with cman and pacemaker


minor_build_fixes.diff:
 Makefile    |    2 +-
 pacemaker.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE minor_build_fixes.diff ---
diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.2/ocfs2_controld/Makefile
--- ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile	2009-04-14 00:10:40.000000000 +0200
+++ ocfs2-tools-1.4.2/ocfs2_controld/Makefile	2009-08-31 16:15:04.000000000 +0200
@@ -17,7 +17,7 @@
 PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS)
 endif
 
-INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
+INCLUDES = -I/usr/include/libxml2 -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c
--- ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c	2009-05-06 03:36:57.000000000 +0200
+++ ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c	2009-08-31 16:18:15.000000000 +0200
@@ -22,6 +22,7 @@
 
 #include <bzlib.h>
 
+#include <corosync/corodefs.h>
 #include <pacemaker/crm_config.h>
 /* heartbeat support is irrelevant here */
 #undef SUPPORT_HEARTBEAT


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Apr 2008 18:52:22 -0000	1.2
+++ .cvsignore	2 Sep 2009 11:13:54 -0000	1.3
@@ -1 +1 @@
-ocfs2-tools-1.3.9.tar.gz
+ocfs2-tools-1.4.2.tar.gz


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocfs2-tools.spec	25 Jul 2009 20:07:13 -0000	1.7
+++ ocfs2-tools.spec	2 Sep 2009 11:13:54 -0000	1.8
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define with_console %{?_without_console: 0} %{?!_without_console: 1}
-%define alphatag 20080221git
+## define alphatag 20080221git
 
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
-Version: 1.3.9
-Release: 11%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.4.2
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -18,16 +18,22 @@ Group: System Environment/Base
 #   ./autogen.sh
 #   cd ..
 #   tar -czvf ocfs2-tools-1.3.9.tar.gz ocfs2-tools-1.3.9
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+Patch0: minor_build_fixes.diff
 URL: http://oss.oracle.com/projects/ocfs2-tools/
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires: bash, coreutils, net-tools, modutils
 Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3
+Requires: redhat-lsb
 BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
+BuildRequires: libblkid-devel, bzip2-devel
 BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
-BuildRequires: ncurses-devel, readline-devel, desktop-file-utils
+BuildRequires: ncurses-devel, readline-devel
+BuildRequires: openaislib-devel, clusterlib-devel
+BuildRequires: cluster-glue-libs-devel, pacemaker-libs-devel
+BuildRequires: libxml2-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -49,7 +55,6 @@ Group: System Environment/Kernel
 Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, pygtk2 >= 1.99.16
 Requires: python >= 2.5, %{name} = %{version}-%{release}
 
-
 %description -n ocfs2console
 Ocfs2console can make it easier to manage an Ocfs2 cluster by
 providing a gui front-end to common tasks, including initial cluster
@@ -68,14 +73,30 @@ Provides: %{name}-static = %{version}-%{
 ocfs2-tools-devel contains the libraries and header files needed to
 develop Ocfs2 filesystem-specific programs.
 
+%package cman
+Summary: Tools for managing the Ocfs2 cluster file system (cman component)
+Group: System Environment/Base
+Requires: cman >= 3.0.0-1
+
+%description cman
+ocfs2-tools-cman contains the daemon required to use Ocfs2 with
+cman cluster manager
 
+%package pcmk
+Summary: Tools for managing the Ocfs2 cluster file system (pacemaker component)
+Group: System Environment/Base
+Requires: pacemaker >= 1.0.5-1
+
+%description pcmk
+ocfs2-tools-pcmk contains the daemon required to use Ocfs2 with
+pacemaker cluster manager
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
-%configure \
+%{configure} \
 %if ! %{with_console}
     --enable-ocfs2console=no \
 %endif
@@ -84,7 +105,6 @@ develop Ocfs2 filesystem-specific progra
 # parallel build currently fails, so no %{_smp_mflags}
 CFLAGS="$(echo '%{optflags}')" make
 
-
 %install
 rm -rf "$RPM_BUILD_ROOT"
 
@@ -93,6 +113,9 @@ cp -f vendor/common/o2cb.init $RPM_BUILD
 cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/%{_initrddir}/ocfs2
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp -f vendor/common/o2cb.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/o2cb
+mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
+cp -f vendor/common/51-ocfs2.rules \
+	$RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
@@ -102,19 +125,11 @@ chmod 644 $RPM_BUILD_ROOT/%{_libdir}/*.a
 %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')"
 # rpm autostripper needs to see these as executable
 chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface/*.so
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ocfs2console/
-cp -f vendor/common/ocfs2console.png $RPM_BUILD_ROOT%{_datadir}/ocfs2console/
-desktop-file-install --vendor="fedora"                    \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/    \
-  vendor/common/ocfs2console.desktop
 %endif
 
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-
 %post
 /sbin/chkconfig --add o2cb
 /sbin/chkconfig --add ocfs2
@@ -138,11 +153,12 @@ fi
 /sbin/debugfs.ocfs2
 /sbin/o2cb_ctl
 /sbin/mount.ocfs2
-/sbin/ocfs2cdsl
 /sbin/ocfs2_hb_ctl
+/sbin/o2image
 %{_initrddir}/o2cb
 %{_initrddir}/ocfs2
 %config(noreplace) /etc/sysconfig/o2cb
+%{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/debugfs.ocfs2.8.gz
 %{_mandir}/man8/fsck.ocfs2.8.gz
 %{_mandir}/man8/fsck.ocfs2.checks.8.gz
@@ -152,8 +168,7 @@ fi
 %{_mandir}/man8/mounted.ocfs2.8.gz
 %{_mandir}/man8/o2cb_ctl.8.gz
 %{_mandir}/man8/ocfs2_hb_ctl.8.gz
-%{_mandir}/man8/ocfs2cdsl.8.gz
-
+%{_mandir}/man8/o2image.8.gz
 
 %if %{with_console}
 %files -n ocfs2console
@@ -162,9 +177,6 @@ fi
 %{python_sitearch}/ocfs2interface/*
 %{_sbindir}/ocfs2console
 %{_mandir}/man8/ocfs2console.8.gz
-%{_datadir}/applications/fedora-ocfs2console.desktop
-%dir %{_datadir}/ocfs2console/
-%{_datadir}/ocfs2console/*
 %endif
 
 %files devel
@@ -180,9 +192,25 @@ fi
 %{_includedir}/o2dlm/*
 %{_includedir}/ocfs2/*
 
+%files cman
+%defattr(-,root,root,-)
+/sbin/ocfs2_controld.cman
 
+%files pcmk
+%defattr(-,root,root,-)
+/sbin/ocfs2_controld.pcmk
 
 %changelog
+* Mon Aug 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-1
+- New upstream release
+- Undefine alpha tag
+- Add patch to fix 2 minor build glitches
+- Add Requires: redhat-lsb for init scripts
+- Update BuildRequires to enable all features
+- Add ocfs2-tools-{cman,pcmk} packages with respective control daemons
+- Install udev rule
+- Update file lists
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-11.20080221git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2008 18:52:22 -0000	1.2
+++ sources	2 Sep 2009 11:13:54 -0000	1.3
@@ -1 +1 @@
-150346c30891caa4273849f23fdc1a08  ocfs2-tools-1.3.9.tar.gz
+1dfc4a4ba72ba96250b508c8e27af981  ocfs2-tools-1.4.2.tar.gz



From than at fedoraproject.org  Wed Sep  2 11:21:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 11:21:33 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.235,1.236
Message-ID: <20090902112133.70B9811C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12233

Modified Files:
	kdebindings.spec 
Log Message:
drop support fedora < 10



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- kdebindings.spec	28 Aug 2009 13:10:04 -0000	1.235
+++ kdebindings.spec	2 Sep 2009 11:21:33 -0000	1.236
@@ -59,9 +59,7 @@ BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
-%if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.4
-%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}



From mlichvar at fedoraproject.org  Wed Sep  2 11:24:39 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  2 Sep 2009 11:24:39 +0000 (UTC)
Subject: rpms/arpwatch/devel .cvsignore, 1.5, 1.6 arpwatch.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090902112439.5FB6511C00E6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/arpwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13205

Modified Files:
	.cvsignore arpwatch.spec sources 
Log Message:
- update ethercodes.dat



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Sep 2008 15:56:32 -0000	1.5
+++ .cvsignore	2 Sep 2009 11:24:39 -0000	1.6
@@ -1,2 +1,2 @@
 arpwatch-2.1a15.tar.gz
-ethercodes-20080916.dat.bz2
+ethercodes-20090902.dat.bz2


Index: arpwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/arpwatch.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- arpwatch.spec	24 Jul 2009 17:08:22 -0000	1.10
+++ arpwatch.spec	2 Sep 2009 11:24:39 -0000	1.11
@@ -3,7 +3,7 @@
 Name: arpwatch
 Epoch: 14
 Version: 2.1a15
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Network monitoring tools for tracking IP addresses on a network
 Group: Applications/System
 License: BSD with advertising
@@ -19,7 +19,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.ee.lbl.gov/arpwatch-%{version}.tar.gz
 Source1: arpwatch.init
 Source2: arpwatch.sysconfig
-Source3: ethercodes-20080916.dat.bz2
+# created by:
+# wget -O- http://standards.ieee.org/regauth/oui/oui.txt | \
+# iconv -f iso8859-1 -t utf8 | massagevendor | bzip2
+Source3: ethercodes-20090902.dat.bz2
 Patch1: arpwatch-2.1a4-fhs.patch
 Patch2: arpwatch-2.1a10-man.patch
 Patch3: arpwatch-drop.patch
@@ -142,6 +145,9 @@ fi
 %verify(not md5 size mtime) %config %{_vararpwatch}/ethercodes.dat
 
 %changelog
+* Wed Sep 02 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:2.1a15-12
+- update ethercodes.dat
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14:2.1a15-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Sep 2008 15:56:32 -0000	1.5
+++ sources	2 Sep 2009 11:24:39 -0000	1.6
@@ -1,2 +1,2 @@
 cebfeb99c4a7c2a6cee2564770415fe7  arpwatch-2.1a15.tar.gz
-7eb6579856d3b6aa998248766ee13eaf  ethercodes-20080916.dat.bz2
+481167b23dd046952d8d4d3845da6b91  ethercodes-20090902.dat.bz2



From schwab at fedoraproject.org  Wed Sep  2 11:28:29 2009
From: schwab at fedoraproject.org (schwab)
Date: Wed,  2 Sep 2009 11:28:29 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.285, 1.286 glibc-fedora.patch, 1.319,
	1.320 glibc.spec, 1.412, 1.413 import.log, 1.28, 1.29 sources,
	1.310, 1.311
Message-ID: <20090902112829.8758211C00E6@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14251/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-19



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- .cvsignore	1 Sep 2009 11:03:10 -0000	1.285
+++ .cvsignore	2 Sep 2009 11:28:28 -0000	1.286
@@ -1,2 +1,2 @@
-glibc-2.10-318-gc2735e9-fedora.tar.bz2
-glibc-2.10-318-gc2735e9.tar.bz2
+glibc-2.10-322-gd840539-fedora.tar.bz2
+glibc-2.10-322-gd840539.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   28 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- glibc-fedora.patch	1 Sep 2009 11:03:11 -0000	1.319
+++ glibc-fedora.patch	2 Sep 2009 11:28:28 -0000	1.320
@@ -1,6 +1,6 @@
---- glibc-2.10-318-gc2735e9/ChangeLog
+--- glibc-2.10-322-gd840539/ChangeLog
 +++ glibc-2.10.90-18/ChangeLog
-@@ -519,6 +519,11 @@
+@@ -540,6 +540,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -784,6 +789,11 @@
+@@ -805,6 +810,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9182,6 +9192,13 @@
+@@ -9203,6 +9213,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9477,6 +9494,10 @@
+@@ -9498,6 +9515,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10734,6 +10755,15 @@
+@@ -10755,6 +10776,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,7 +65,7 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-318-gc2735e9/ChangeLog.15
+--- glibc-2.10-322-gd840539/ChangeLog.15
 +++ glibc-2.10.90-18/ChangeLog.15
 @@ -477,6 +477,14 @@
  
@@ -132,7 +132,7 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-318-gc2735e9/ChangeLog.16
+--- glibc-2.10-322-gd840539/ChangeLog.16
 +++ glibc-2.10.90-18/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
@@ -305,7 +305,7 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-318-gc2735e9/Makeconfig
+--- glibc-2.10-322-gd840539/Makeconfig
 +++ glibc-2.10.90-18/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
@@ -323,7 +323,7 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-318-gc2735e9/csu/Makefile
+--- glibc-2.10-322-gd840539/csu/Makefile
 +++ glibc-2.10.90-18/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
@@ -335,7 +335,7 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-318-gc2735e9/csu/elf-init.c
+--- glibc-2.10-322-gd840539/csu/elf-init.c
 +++ glibc-2.10.90-18/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -361,7 +361,7 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-318-gc2735e9/debug/tst-chk1.c
+--- glibc-2.10-322-gd840539/debug/tst-chk1.c
 +++ glibc-2.10.90-18/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -391,7 +391,7 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-318-gc2735e9/elf/ldconfig.c
+--- glibc-2.10-322-gd840539/elf/ldconfig.c
 +++ glibc-2.10.90-18/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
@@ -474,7 +474,7 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-318-gc2735e9/elf/tst-stackguard1.c
+--- glibc-2.10-322-gd840539/elf/tst-stackguard1.c
 +++ glibc-2.10.90-18/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -500,15 +500,15 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-318-gc2735e9/include/bits/stdlib-ldbl.h
+--- glibc-2.10-322-gd840539/include/bits/stdlib-ldbl.h
 +++ glibc-2.10.90-18/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-318-gc2735e9/include/bits/wchar-ldbl.h
+--- glibc-2.10-322-gd840539/include/bits/wchar-ldbl.h
 +++ glibc-2.10.90-18/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-318-gc2735e9/include/features.h
+--- glibc-2.10-322-gd840539/include/features.h
 +++ glibc-2.10.90-18/include/features.h
 @@ -299,8 +299,13 @@
  #endif
@@ -526,7 +526,7 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-318-gc2735e9/intl/locale.alias
+--- glibc-2.10-322-gd840539/intl/locale.alias
 +++ glibc-2.10.90-18/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
@@ -537,7 +537,7 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-318-gc2735e9/libio/stdio.h
+--- glibc-2.10-322-gd840539/libio/stdio.h
 +++ glibc-2.10.90-18/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
@@ -552,7 +552,7 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-318-gc2735e9/locale/iso-4217.def
+--- glibc-2.10-322-gd840539/locale/iso-4217.def
 +++ glibc-2.10.90-18/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
@@ -645,7 +645,7 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-318-gc2735e9/locale/programs/locarchive.c
+--- glibc-2.10-322-gd840539/locale/programs/locarchive.c
 +++ glibc-2.10.90-18/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
@@ -678,7 +678,7 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-318-gc2735e9/localedata/Makefile
+--- glibc-2.10-322-gd840539/localedata/Makefile
 +++ glibc-2.10.90-18/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
@@ -688,7 +688,7 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-318-gc2735e9/localedata/SUPPORTED
+--- glibc-2.10-322-gd840539/localedata/SUPPORTED
 +++ glibc-2.10.90-18/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
@@ -731,7 +731,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-318-gc2735e9/localedata/locales/cy_GB
+--- glibc-2.10-322-gd840539/localedata/locales/cy_GB
 +++ glibc-2.10.90-18/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -747,7 +747,7 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-318-gc2735e9/localedata/locales/en_GB
+--- glibc-2.10-322-gd840539/localedata/locales/en_GB
 +++ glibc-2.10.90-18/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -760,7 +760,7 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-318-gc2735e9/localedata/locales/no_NO
+--- glibc-2.10-322-gd840539/localedata/locales/no_NO
 +++ glibc-2.10.90-18/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
@@ -832,7 +832,7 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-318-gc2735e9/localedata/locales/zh_TW
+--- glibc-2.10-322-gd840539/localedata/locales/zh_TW
 +++ glibc-2.10.90-18/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
@@ -861,7 +861,7 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-318-gc2735e9/malloc/mcheck.c
+--- glibc-2.10-322-gd840539/malloc/mcheck.c
 +++ glibc-2.10.90-18/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
@@ -938,7 +938,7 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-318-gc2735e9/manual/libc.texinfo
+--- glibc-2.10-322-gd840539/manual/libc.texinfo
 +++ glibc-2.10.90-18/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
@@ -949,7 +949,7 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-318-gc2735e9/misc/sys/cdefs.h
+--- glibc-2.10-322-gd840539/misc/sys/cdefs.h
 +++ glibc-2.10.90-18/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
@@ -994,7 +994,7 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-318-gc2735e9/nis/nss
+--- glibc-2.10-322-gd840539/nis/nss
 +++ glibc-2.10.90-18/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
@@ -1002,7 +1002,7 @@
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-318-gc2735e9/nptl/ChangeLog
+--- glibc-2.10-322-gd840539/nptl/ChangeLog
 +++ glibc-2.10.90-18/nptl/ChangeLog
 @@ -3705,6 +3705,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
@@ -1044,7 +1044,7 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-318-gc2735e9/nptl/Makefile
+--- glibc-2.10-322-gd840539/nptl/Makefile
 +++ glibc-2.10.90-18/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
@@ -1078,7 +1078,7 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-318-gc2735e9/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-322-gd840539/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 +++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
@@ -1088,7 +1088,7 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-318-gc2735e9/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-322-gd840539/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 +++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
@@ -1097,7 +1097,7 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-318-gc2735e9/nptl/tst-stackguard1.c
+--- glibc-2.10-322-gd840539/nptl/tst-stackguard1.c
 +++ glibc-2.10.90-18/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -1123,7 +1123,7 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-318-gc2735e9/nscd/nscd.conf
+--- glibc-2.10-322-gd840539/nscd/nscd.conf
 +++ glibc-2.10.90-18/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
@@ -1134,7 +1134,7 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-318-gc2735e9/nscd/nscd.init
+--- glibc-2.10-322-gd840539/nscd/nscd.init
 +++ glibc-2.10.90-18/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
@@ -1192,7 +1192,7 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-318-gc2735e9/posix/Makefile
+--- glibc-2.10-322-gd840539/posix/Makefile
 +++ glibc-2.10.90-18/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
@@ -1214,7 +1214,7 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-318-gc2735e9/posix/getconf.speclist.h
+--- glibc-2.10-322-gd840539/posix/getconf.speclist.h
 +++ glibc-2.10.90-18/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
@@ -1256,7 +1256,7 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-318-gc2735e9/streams/Makefile
+--- glibc-2.10-322-gd840539/streams/Makefile
 +++ glibc-2.10.90-18/streams/Makefile
 @@ -21,7 +21,7 @@
  #
@@ -1267,7 +1267,7 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-318-gc2735e9/sysdeps/generic/dl-cache.h
+--- glibc-2.10-322-gd840539/sysdeps/generic/dl-cache.h
 +++ glibc-2.10.90-18/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
@@ -1284,7 +1284,7 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-318-gc2735e9/sysdeps/i386/Makefile
+--- glibc-2.10-322-gd840539/sysdeps/i386/Makefile
 +++ glibc-2.10.90-18/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
@@ -1310,7 +1310,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-318-gc2735e9/sysdeps/ia64/Makefile
+--- glibc-2.10-322-gd840539/sysdeps/ia64/Makefile
 +++ glibc-2.10.90-18/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
@@ -1323,7 +1323,7 @@
  endif
  endif
  
---- glibc-2.10-318-gc2735e9/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-322-gd840539/sysdeps/ia64/ia64libgcc.S
 +++ glibc-2.10.90-18/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -1676,7 +1676,7 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-318-gc2735e9/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-322-gd840539/sysdeps/ia64/libgcc-compat.c
 +++ glibc-2.10.90-18/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
@@ -1763,7 +1763,7 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-318-gc2735e9/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-322-gd840539/sysdeps/powerpc/powerpc64/Makefile
 +++ glibc-2.10.90-18/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
@@ -1773,7 +1773,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-318-gc2735e9/sysdeps/unix/nice.c
+--- glibc-2.10-322-gd840539/sysdeps/unix/nice.c
 +++ glibc-2.10.90-18/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
@@ -1789,7 +1789,7 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/check_pf.c
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
@@ -1806,7 +1806,7 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/dl-osinfo.h
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -1855,7 +1855,7 @@
      }
    else
  #endif
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/futimesat.c
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
@@ -1899,7 +1899,7 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/i386/clone.S
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
@@ -1919,7 +1919,7 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/i386/dl-cache.h
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
@@ -1981,7 +1981,7 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
@@ -2015,7 +2015,7 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2023,7 +2023,7 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2031,12 +2031,12 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/netlinkaccess.h
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
@@ -2063,7 +2063,7 @@
  
  struct netlink_res
  {
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/paths.h
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
@@ -2074,7 +2074,7 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/tcsetattr.c
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
@@ -2121,7 +2121,7 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/x86_64/clone.S
 +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
@@ -2141,7 +2141,7 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-318-gc2735e9/timezone/zic.c
+--- glibc-2.10-322-gd840539/timezone/zic.c
 +++ glibc-2.10.90-18/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- glibc.spec	1 Sep 2009 11:03:11 -0000	1.412
+++ glibc.spec	2 Sep 2009 11:28:29 -0000	1.413
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-318-gc2735e9
+%define glibcsrcdir glibc-2.10-322-gd840539
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 18
+Release: 19
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1029,6 +1029,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Sep  2 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-19
+- Update from master.
+  - Fix x86_64 bits/mathinline.h for -m32 compilation.
+
 * Tue Sep  1 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-18
 - Update from master.
   - fix parse error in <bits/mathinline.h> (#520209).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- import.log	1 Sep 2009 11:03:11 -0000	1.28
+++ import.log	2 Sep 2009 11:28:29 -0000	1.29
@@ -26,3 +26,4 @@ glibc-2_10_90-15:HEAD:glibc-2.10.90-15.s
 glibc-2_10_90-16:HEAD:glibc-2.10.90-16.src.rpm:1251288654
 glibc-2_10_90-17:HEAD:glibc-2.10.90-17.src.rpm:1251406917
 glibc-2_10_90-18:HEAD:glibc-2.10.90-18.src.rpm:1251802906
+glibc-2_10_90-19:HEAD:glibc-2.10.90-19.src.rpm:1251889856


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- sources	1 Sep 2009 11:03:11 -0000	1.310
+++ sources	2 Sep 2009 11:28:29 -0000	1.311
@@ -1,2 +1,2 @@
-65209cf11136a0670e363757daaf02bb  glibc-2.10-318-gc2735e9-fedora.tar.bz2
-c48e6a1a15bd51200059e92847ce8c60  glibc-2.10-318-gc2735e9.tar.bz2
+76cd8fe4fc85a7bb8cbcc26e7ee1b596  glibc-2.10-322-gd840539-fedora.tar.bz2
+a62cbf8a80e00e4bca0b78f17b9f50a3  glibc-2.10-322-gd840539.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep  2 11:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 11:29:03 +0000
Subject: [pkgdb] uClibc had acl change status
Message-ID: <20090902112904.14C8410F883@bastion2.fedora.phx.redhat.com>

vda has set the commit acl on uClibc (Fedora 11) to Approved for varekova

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uClibc



From pkgdb at fedoraproject.org  Wed Sep  2 11:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 11:29:06 +0000
Subject: [pkgdb] uClibc had acl change status
Message-ID: <20090902112906.5FEEB10F894@bastion2.fedora.phx.redhat.com>

vda has set the approveacls acl on uClibc (Fedora 11) to Approved for varekova

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uClibc



From kraxel at fedoraproject.org  Wed Sep  2 11:36:00 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Wed,  2 Sep 2009 11:36:00 +0000 (UTC)
Subject: rpms/xen/devel
	xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch, 
	NONE, 1.1 xen-fix-videoram-option.patch, NONE, 1.1 xen.spec,
	1.246, 1.247 xen-bzip2-xz-1.patch, 1.1,
	NONE xen-bzip2-xz-2.patch, 1.1, NONE xen-bzip2-xz-3.patch, 1.1,
	NONE xen-stubdomain-bridging.patch, 1.1, NONE
Message-ID: <20090902113600.AF97011C00E6@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16108

Modified Files:
	xen.spec 
Added Files:
	xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch 
	xen-fix-videoram-option.patch 
Removed Files:
	xen-bzip2-xz-1.patch xen-bzip2-xz-2.patch xen-bzip2-xz-3.patch 
	xen-stubdomain-bridging.patch 
Log Message:
more backports

xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch:
 Makefile               |   19 ++
 xc_dom_bzimageloader.c |  386 +++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 348 insertions(+), 57 deletions(-)

--- NEW FILE xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch ---
--- xen-3.4-testing.hg/tools/libxc/Makefile	2009-09-01 17:19:44.000000000 +0300
+++ xen-unstable.hg/tools/libxc/Makefile	2009-09-01 17:12:45.000000000 +0300
@@ -149,6 +151,25 @@
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
+ifeq ($(CONFIG_MiniOS),y)
+zlib-options =
+else
+zlib-options = $(shell					\
+	(. ../check/funcs.sh;				\
+	 if has_header bzlib.h; then			\
+           echo "-DHAVE_BZLIB";				\
+	   echo "-lbz2";				\
+	 fi;						\
+	 if has_header lzma.h; then			\
+	   echo "-DHAVE_LZMA";				\
+	   echo "-llzma";				\
+	 fi) | grep $(1))
+endif
+
+xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
+xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
+
+libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
 	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
 
--- xen-3.4-testing.hg/tools/libxc/xc_dom_bzimageloader.c	2009-09-01 17:19:44.000000000 +0300
+++ xen-unstable.hg/tools/libxc/xc_dom_bzimageloader.c	2009-09-01 17:12:45.000000000 +0300
@@ -11,6 +11,7 @@
  * written 2006 by Gerd Hoffmann <kraxel at suse.de>.
  * written 2007 by Jeremy Fitzhardinge <jeremy at xensource.com>
  * written 2008 by Ian Campbell <ijc at hellion.org.uk>
+ * written 2009 by Chris Lalancette <clalance at redhat.com>
  *
  */
 #include <stdio.h>
@@ -20,43 +21,289 @@
 #include "xg_private.h"
 #include "xc_dom.h"
 
+#if defined(HAVE_BZLIB)
+
+#include <bzlib.h>
+
+static int xc_try_bzip2_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    bz_stream stream;
+    int ret;
+    char *out_buf;
+    int retval = -1;
+    int outsize;
+    uint64_t total;
+
+    stream.bzalloc = NULL;
+    stream.bzfree = NULL;
+    stream.opaque = NULL;
+
+    ret = BZ2_bzDecompressInit(&stream, 0, 0);
+    if ( ret != BZ_OK )
+    {
+        xc_dom_printf("Error initting bz2 stream\n");
+        return -1;
+    }
+
+    /* sigh.  We don't know up-front how much memory we are going to need
+     * for the output buffer.  Allocate the output buffer to be equal
+     * the input buffer to start, and we'll realloc as needed.
+     */
+    outsize = dom->kernel_size;
+    out_buf = malloc(outsize);
+    if ( out_buf == NULL )
+    {
+        xc_dom_printf("Failed to alloc memory\n");
+        goto bzip2_cleanup;
+    }
+
+    stream.next_in = dom->kernel_blob;
+    stream.avail_in = dom->kernel_size;
+
+    stream.next_out = out_buf;
+    stream.avail_out = dom->kernel_size;
+
+    for ( ; ; )
+    {
+        ret = BZ2_bzDecompress(&stream);
+        if ( (stream.avail_out == 0) || (ret != BZ_OK) )
+        {
+            out_buf = realloc(out_buf, outsize * 2);
+            if ( out_buf == NULL )
+            {
+                xc_dom_printf("Failed to realloc memory\n");
+                break;
+            }
+
+            stream.next_out = out_buf + outsize;
+            stream.avail_out = (outsize * 2) - outsize;
+            outsize *= 2;
+        }
+
+        if ( ret != BZ_OK )
+        {
+            if ( ret == BZ_STREAM_END )
+            {
+                xc_dom_printf("Saw data stream end\n");
+                retval = 0;
+                break;
+            }
+            xc_dom_printf("BZIP error\n");
+        }
+    }
+
+    total = (stream.total_out_hi32 << 31) | stream.total_out_lo32;
+
+    xc_dom_printf("%s: BZIP2 decompress OK, 0x%zx -> 0x%lx\n",
+                  __FUNCTION__, *size, (long unsigned int) total);
+
+    *blob = out_buf;
+    *size = total;
+
+ bzip2_cleanup:
+    BZ2_bzDecompressEnd(&stream);
+
+    return retval;
+}
+
+#else /* !defined(HAVE_BZLIB) */
+
+static int xc_try_bzip2_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    xc_dom_printf("%s: BZIP2 decompress support unavailable\n",
+                  __FUNCTION__);
+    return -1;
+}
+
+#endif
+
+#if defined(HAVE_LZMA)
+
+#include <lzma.h>
+
+static uint64_t physmem(void)
+{
+    uint64_t ret = 0;
+    const long pagesize = sysconf(_SC_PAGESIZE);
+    const long pages = sysconf(_SC_PHYS_PAGES);
+
+    if ( (pagesize != -1) || (pages != -1) )
+    {
+        /*
+         * According to docs, pagesize * pages can overflow.
+         * Simple case is 32-bit box with 4 GiB or more RAM,
+         * which may report exactly 4 GiB of RAM, and "long"
+         * being 32-bit will overflow. Casting to uint64_t
+         * hopefully avoids overflows in the near future.
+         */
+        ret = (uint64_t)(pagesize) * (uint64_t)(pages);
+    }
+
+    return ret;
+}
+
+static int xc_try_lzma_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    lzma_stream stream = LZMA_STREAM_INIT;
+    lzma_ret ret;
+    lzma_action action = LZMA_RUN;
+    unsigned char *out_buf;
+    int retval = -1;
+    int outsize;
+    const char *msg;
+
+    ret = lzma_alone_decoder(&stream, physmem() / 3);
+    if ( ret != LZMA_OK )
+    {
+        xc_dom_printf("Failed to init lzma stream decoder\n");
+        return -1;
+    }
+
+    /* sigh.  We don't know up-front how much memory we are going to need
+     * for the output buffer.  Allocate the output buffer to be equal
+     * the input buffer to start, and we'll realloc as needed.
+     */
+    outsize = dom->kernel_size;
+    out_buf = malloc(outsize);
+    if ( out_buf == NULL )
+    {
+        xc_dom_printf("Failed to alloc memory\n");
+        goto lzma_cleanup;
+    }
+
+    stream.next_in = dom->kernel_blob;
+    stream.avail_in = dom->kernel_size;
+
+    stream.next_out = out_buf;
+    stream.avail_out = dom->kernel_size;
+
+    for ( ; ; )
+    {
+        ret = lzma_code(&stream, action);
+        if ( (stream.avail_out == 0) || (ret != LZMA_OK) )
+        {
+            out_buf = realloc(out_buf, outsize * 2);
+            if ( out_buf == NULL )
+            {
+                xc_dom_printf("Failed to realloc memory\n");
+                break;
+            }
+
+            stream.next_out = out_buf + outsize;
+            stream.avail_out = (outsize * 2) - outsize;
+            outsize *= 2;
+        }
+
+        if ( ret != LZMA_OK )
+        {
+            if ( ret == LZMA_STREAM_END )
+            {
+                xc_dom_printf("Saw data stream end\n");
+                retval = 0;
+                break;
+            }
+
+            switch ( ret )
+            {
+            case LZMA_MEM_ERROR:
+                msg = strerror(ENOMEM);
+                break;
+
+            case LZMA_MEMLIMIT_ERROR:
+                msg = "Memory usage limit reached";
+                break;
+
+            case LZMA_FORMAT_ERROR:
+                msg = "File format not recognized";
+                break;
+
+            case LZMA_OPTIONS_ERROR:
+                // FIXME: Better message?
+                msg = "Unsupported compression options";
+                break;
+
+            case LZMA_DATA_ERROR:
+                msg = "File is corrupt";
+                break;
+
+            case LZMA_BUF_ERROR:
+                msg = "Unexpected end of input";
+                break;
+
+            default:
+                msg = "Internal program error (bug)";
+                break;
+            }
+            xc_dom_printf("%s: LZMA decompression error %s\n",
+                          __FUNCTION__, msg);
+            break;
+        }
+    }
+
+    xc_dom_printf("%s: LZMA decompress OK, 0x%zx -> 0x%zx\n",
+                  __FUNCTION__, *size, (size_t)stream.total_out);
+
+    *blob = out_buf;
+    *size = stream.total_out;
+
+ lzma_cleanup:
+    lzma_end(&stream);
+
+    return retval;
+}
+
+#else /* !defined(HAVE_LZMA) */
+
+static int xc_try_lzma_decode(
+    struct xc_dom_image *dom, void **blob, size_t *size)
+{
+    xc_dom_printf("%s: LZMA decompress support unavailable\n",
+                  __FUNCTION__);
+    return -1;
+}
+
+#endif
+
 struct setup_header {
-	uint8_t		_pad0[0x1f1];		/* skip uninteresting stuff */
-	uint8_t		setup_sects;
-	uint16_t	root_flags;
-	uint32_t	syssize;
-	uint16_t	ram_size;
-	uint16_t	vid_mode;
-	uint16_t	root_dev;
-	uint16_t	boot_flag;
-	uint16_t	jump;
-	uint32_t	header;
-#define HDR_MAGIC		"HdrS"
-#define HDR_MAGIC_SZ	4
-	uint16_t	version;
-#define VERSION(h,l)	(((h)<<8) | (l))
-	uint32_t	realmode_swtch;
-	uint16_t	start_sys;
-	uint16_t	kernel_version;
-	uint8_t		type_of_loader;
-	uint8_t		loadflags;
-	uint16_t	setup_move_size;
-	uint32_t	code32_start;
-	uint32_t	ramdisk_image;
-	uint32_t	ramdisk_size;
-	uint32_t	bootsect_kludge;
-	uint16_t	heap_end_ptr;
-	uint16_t	_pad1;
-	uint32_t	cmd_line_ptr;
-	uint32_t	initrd_addr_max;
-	uint32_t	kernel_alignment;
-	uint8_t		relocatable_kernel;
-	uint8_t		_pad2[3];
-	uint32_t	cmdline_size;
-	uint32_t	hardware_subarch;
-	uint64_t	hardware_subarch_data;
-	uint32_t	payload_offset;
-	uint32_t	payload_length;
+    uint8_t  _pad0[0x1f1];  /* skip uninteresting stuff */
+    uint8_t  setup_sects;
+    uint16_t root_flags;
+    uint32_t syssize;
+    uint16_t ram_size;
+    uint16_t vid_mode;
+    uint16_t root_dev;
+    uint16_t boot_flag;
+    uint16_t jump;
+    uint32_t header;
+#define HDR_MAGIC  "HdrS"
+#define HDR_MAGIC_SZ 4
+    uint16_t version;
+#define VERSION(h,l) (((h)<<8) | (l))
+    uint32_t realmode_swtch;
+    uint16_t start_sys;
+    uint16_t kernel_version;
+    uint8_t  type_of_loader;
+    uint8_t  loadflags;
+    uint16_t setup_move_size;
+    uint32_t code32_start;
+    uint32_t ramdisk_image;
+    uint32_t ramdisk_size;
+    uint32_t bootsect_kludge;
+    uint16_t heap_end_ptr;
+    uint16_t _pad1;
+    uint32_t cmd_line_ptr;
+    uint32_t initrd_addr_max;
+    uint32_t kernel_alignment;
+    uint8_t  relocatable_kernel;
+    uint8_t  _pad2[3];
+    uint32_t cmdline_size;
+    uint32_t hardware_subarch;
+    uint64_t hardware_subarch_data;
+    uint32_t payload_offset;
+    uint32_t payload_length;
 } __attribute__((packed));
 
 extern struct xc_dom_loader elf_loader;
@@ -70,22 +317,22 @@
     return off;
 }
 
-static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
+static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
 {
     struct setup_header *hdr;
+    int ret;
 
     if ( dom->kernel_blob == NULL )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
-                         __FUNCTION__);
+        xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
+
     if ( dom->kernel_size < sizeof(struct setup_header) )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
-                         __FUNCTION__);
+        xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
 
@@ -93,39 +340,64 @@
 
     if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n",
-                         __FUNCTION__);
+        xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
 
     if ( hdr->version < VERSION(2,8) )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n",
-                         __FUNCTION__, hdr->version);
+        xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n",
+                     __FUNCTION__, hdr->version);
         return -EINVAL;
     }
 
     dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
     dom->kernel_size = hdr->payload_length;
 
-    if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
+    if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
+    {
+        ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
+        if ( ret == -1 )
+        {
+            xc_dom_panic(XC_INVALID_KERNEL,
+                         "%s: unable to gzip decompress kernel\n",
+                         __FUNCTION__);
+            return -EINVAL;
+        }
+    }
+    else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 )
     {
-        if ( verbose )
-            xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n",
+        ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+        if ( ret < 0 )
+        {
+            xc_dom_panic(XC_INVALID_KERNEL,
+                         "%s unable to BZIP2 decompress kernel",
                          __FUNCTION__);
+            return -EINVAL;
+        }
+    }
+    else if ( memcmp(dom->kernel_blob, "\135\000", 2) == 0 )
+    {
+        ret = xc_try_lzma_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+        if ( ret < 0 )
+        {
+            xc_dom_panic(XC_INVALID_KERNEL,
+                         "%s unable to LZMA decompress kernel\n",
+                         __FUNCTION__);
+            return -EINVAL;
+        }
+    }
+    else
+    {
+        xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\n",
+                     __FUNCTION__);
         return -EINVAL;
     }
 
     return elf_loader.probe(dom);
 }
 
-static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
-{
-    return check_bzimage_kernel(dom, 0);
-}
-
 static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom)
 {
     return elf_loader.parser(dom);

xen-fix-videoram-option.patch:
 vl.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE xen-fix-videoram-option.patch ---
Date: Mon, 10 Aug 2009 13:46:30 +0100
Message-ID: <f4527be0908100546s4e616654iabc67080961e7fa1 at mail.gmail.com>
Subject: Re: [Xen-devel] [ANNOUNCE] Xen 3.3.2 and 3.4.1 released
From: Andrew Lyon <andrew.lyon at gmail.com>

>
> If that's not what you meant, what did you mean ? :-)
>
> Ian.
>

Yes that is the correct pair of patches, I have tested on x86_64 and I
am able to create hvm with increased video ram, I do not see much
value in applying a patch which does not work and then fixing it if
both are not currently in 3.4 so here is a single patch instead,
perhaps KUWAMURA Shin'ya can add a signed-off-by to this too.

Signed-off-by: Andrew Lyon <andrew.lyon at gmail.com>


---

diff --git tools/ioemu-qemu-xen/vl.c tools/ioemu-qemu-xen/vl.c
index b5bb5cb..3506977 100644
--- a/tools/ioemu-qemu-xen/vl.c
+++ b/tools/ioemu-qemu-xen/vl.c
@@ -4801,7 +4801,6 @@ int main(int argc, char **argv, char **envp)
     machine = first_machine;
     cpu_model = NULL;
     initrd_filename = NULL;
-    ram_size = VGA_RAM_SIZE;
 #ifdef CONFIG_GDBSTUB
     use_gdbstub = 0;
     gdbstub_port = DEFAULT_GDBSTUB_PORT;
@@ -5654,13 +5653,6 @@ int main(int argc, char **argv, char **envp)
     }
 #endif

-#if defined (__ia64__)
-    if (ram_size > VGA_IO_START)
-        ram_size += VGA_IO_SIZE; /* skip VGA I/O hole */
-    if (ram_size > MMIO_START)
-        ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
-#endif
-
     /* init the bluetooth world */
     for (i = 0; i < nb_bt_opts; i++)
         if (bt_parse(bt_opts[i]))
@@ -5677,6 +5669,13 @@ int main(int argc, char **argv, char **envp)

     phys_ram_size = (machine->ram_require + vga_ram_size) & ~RAMSIZE_FIXED;

+#if defined (__ia64__)
+    if (ram_size > VGA_IO_START)
+        ram_size += VGA_IO_SIZE; /* skip VGA I/O hole */
+    if (ram_size > MMIO_START)
+        ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
+#endif
+
     if (machine->ram_require & RAMSIZE_FIXED) {
         if (ram_size > 0) {
             if (ram_size < phys_ram_size) {


Andy

_______________________________________________
Xen-devel mailing list
Xen-devel at lists.xensource.com
http://lists.xensource.com/xen-devel



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- xen.spec	1 Sep 2009 11:46:49 -0000	1.246
+++ xen.spec	2 Sep 2009 11:36:00 -0000	1.247
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -40,11 +40,8 @@ Patch10: xen-no-werror.patch
 # backports
 Patch20: xen-pygrub-fix-timeout-0.patch
 Patch21: xen-qemu-dm-fix-block-memory-leak.patch
-Patch22: xen-stubdomain-bridging.patch
-
-Patch30: xen-bzip2-xz-1.patch
-Patch31: xen-bzip2-xz-2.patch
-Patch32: xen-bzip2-xz-3.patch
+Patch22: xen-fix-videoram-option.patch
+Patch23: xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch
 
 Patch100: xen-configure-xend.patch
 
@@ -149,11 +146,8 @@ which manage Xen virtual machines.
 
 %patch20 -p1
 %patch21 -p1
-#%patch22 -p1
-
-%patch30 -p1
-%patch31 -p1
-#%patch32 -p1
+%patch22 -p1
+%patch23 -p1
 
 %patch100 -p1
 
@@ -468,6 +462,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 2 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-3
+- swap bzip2+xz linux kernel compression support patches.
+- backport one more bugfix (videoram option).
+
 * Tue Sep 1 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-2
 - backport bzip2+xz linux kernel compression support.
 - backport a few bugfixes.


--- xen-bzip2-xz-1.patch DELETED ---


--- xen-bzip2-xz-2.patch DELETED ---


--- xen-bzip2-xz-3.patch DELETED ---


--- xen-stubdomain-bridging.patch DELETED ---



From mgrepl at fedoraproject.org  Wed Sep  2 11:37:34 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed,  2 Sep 2009 11:37:34 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.49,1.50
Message-ID: <20090902113734.4377A11C00E6@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16450

Modified Files:
	policy-20090521.patch 
Log Message:
- Allow gssd to send signals to users
- Allow fsdaemon_t setpcap capability



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 policy/modules/admin/prelink.te           |    9 
 policy/modules/admin/readahead.te         |    2 
 policy/modules/admin/rpm.fc               |    1 
 policy/modules/admin/rpm.if               |   46 +++++
 policy/modules/admin/rpm.te               |    4 
 policy/modules/admin/shorewall.fc         |   12 +
 policy/modules/admin/shorewall.if         |  166 ++++++++++++++++++
 policy/modules/admin/shorewall.te         |  103 +++++++++++
 policy/modules/admin/sudo.if              |    4 
 policy/modules/admin/usermanage.if        |    3 
 policy/modules/admin/usermanage.te        |    3 
 policy/modules/apps/awstats.te            |    2 
 policy/modules/apps/calamaris.te          |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++++++++++
 policy/modules/apps/gitosis.te            |   43 ++++
 policy/modules/apps/gnome.te              |   15 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 policy/modules/apps/mozilla.if            |   16 +
 policy/modules/apps/mozilla.te            |   14 -
 policy/modules/apps/nsplugin.if           |    2 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 ++
 policy/modules/apps/ptchown.te            |   40 ++++
 policy/modules/apps/qemu.fc               |    1 
 policy/modules/apps/qemu.te               |    5 
 policy/modules/apps/sandbox.if            |  134 +++++++++++---
 policy/modules/apps/sandbox.te            |  274 +++++++++++++++++++++++++++---
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    6 
 policy/modules/kernel/corecommands.fc     |   10 -
 policy/modules/kernel/corenetwork.te.in   |    5 
 policy/modules/kernel/devices.fc          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   31 +++
 policy/modules/kernel/files.if            |    3 
 policy/modules/kernel/kernel.if           |    2 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/roles/staff.te             |   12 +
 policy/modules/roles/sysadm.if            |   35 +++
 policy/modules/roles/sysadm.te            |    4 
 policy/modules/roles/unconfineduser.te    |   10 -
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/apache.fc         |    4 
 policy/modules/services/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 policy/modules/services/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    6 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |   15 +
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   19 +-
 policy/modules/services/hal.te            |   15 +
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 ++++
 policy/modules/services/hddtemp.te        |   40 ++++
 policy/modules/services/kerberos.if       |    2 
 policy/modules/services/kerberos.te       |   12 +
 policy/modules/services/lircd.te          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 policy/modules/services/nslcd.te          |   50 +++++
 policy/modules/services/nx.fc             |    3 
 policy/modules/services/nx.if             |   19 ++
 policy/modules/services/openvpn.te        |   14 +
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/polkit.fc         |    2 
 policy/modules/services/polkit.if         |    2 
 policy/modules/services/polkit.te         |    3 
 policy/modules/services/postfix.if        |   26 ++
 policy/modules/services/postfix.te        |   26 --
 policy/modules/services/postgresql.te     |    2 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |    2 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/rpc.te            |   14 +
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/samba.te          |    2 
 policy/modules/services/sasl.te           |    2 
 policy/modules/services/sendmail.if       |   39 ++++
 policy/modules/services/sendmail.te       |    7 
 policy/modules/services/setroubleshoot.te |    5 
 policy/modules/services/shorewall.fc      |   12 -
 policy/modules/services/shorewall.if      |  166 ------------------
 policy/modules/services/shorewall.te      |  102 -----------
 policy/modules/services/smartmon.te       |    4 
 policy/modules/services/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |    8 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 policy/modules/system/authlogin.fc        |    3 
 policy/modules/system/authlogin.if        |  270 ++++++++++++++++++-----------
 policy/modules/system/authlogin.te        |   27 +-
 policy/modules/system/init.fc             |    2 
 policy/modules/system/init.te             |    2 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/mount.te            |    1 
 policy/modules/system/sysnetwork.if       |    1 
 policy/modules/system/sysnetwork.te       |   17 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |   10 +
 policy/modules/system/userdomain.if       |   33 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 151 files changed, 2407 insertions(+), 650 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- policy-20090521.patch	24 Aug 2009 14:48:05 -0000	1.49
+++ policy-20090521.patch	2 Sep 2009 11:37:33 -0000	1.50
@@ -208,9 +208,19 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(readahead_t)
  fs_search_auto_mountpoints(readahead_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.12/policy/modules/admin/rpm.fc
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-09-02 13:11:37.000000000 +0200
+@@ -1,5 +1,6 @@
+ 
+ /bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/rpm                    --      gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/bin/smart 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ 
+ /usr/bin/yum 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.12/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-06-25 10:19:43.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-09-02 11:03:37.000000000 +0200
 @@ -470,6 +470,24 @@
  
  ########################################
@@ -236,6 +246,38 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to read, 
  ##	write RPM tmp files
  ## </summary>
+@@ -569,3 +587,31 @@
+ 	allow $1 rpm_t:process signull;
+ ')
+ 
++########################################
++## <summary>
++##	dontaudit read and write an leaked file descriptors
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_dontaudit_leaks',`
++	gen_require(`
++		type rpm_t;
++		type rpm_script_t;
++		type rpm_var_run_t;
++		type rpm_tmp_t;
++		type rpm_tmpfs_t;
++	')
++
++	dontaudit $1 rpm_t:fifo_file rw_fifo_file_perms;
++	dontaudit $1 rpm_script_t:fd use;
++	dontaudit $1 rpm_script_t:fifo_file rw_fifo_file_perms;
++	dontaudit $1 rpm_var_run_t:file write_file_perms;
++	dontaudit $1 rpm_tmp_t:file rw_file_perms;
++	dontaudit $1 rpm_t:shm rw_shm_perms;
++ 	dontaudit $1 rpm_tmpfs_t:dir rw_dir_perms;
++ 	dontaudit $1 rpm_tmpfs_t:file write_file_perms;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.12/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-07-28 14:08:18.000000000 +0200
@@ -557,9 +599,22 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.6.12/policy/modules/admin/usermanage.if
+--- nsaserefpolicy/policy/modules/admin/usermanage.if	2009-04-07 21:54:49.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/usermanage.if	2009-09-02 09:29:39.000000000 +0200
+@@ -274,6 +274,9 @@
+ 	usermanage_domtrans_useradd($1)
+ 	role $2 types useradd_t;
+ 
++	# Add/remove user home directories
++	userdom_manage_home_role($2, useradd_t)
++
+ 	optional_policy(`
+ 		nscd_run(useradd_t, $2)
+ 	')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.12/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-06-25 10:19:43.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/admin/usermanage.te	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/usermanage.te	2009-09-02 09:28:02.000000000 +0200
 @@ -209,6 +209,7 @@
  files_manage_etc_files(groupadd_t)
  files_relabel_etc_files(groupadd_t)
@@ -568,6 +623,15 @@ diff -b -B --ignore-all-space --exclude-
  
  # Execute /usr/bin/{passwd,chfn,chsh} and /usr/sbin/{useradd,vipw}.
  corecmd_exec_bin(groupadd_t)
+@@ -489,6 +490,8 @@
+ 
+ userdom_use_unpriv_users_fds(useradd_t)
+ # Add/remove user home directories
++userdom_manage_home_role(system_r, useradd_t)
++
+ userdom_manage_user_home_content_dirs(useradd_t)
+ userdom_manage_user_home_content_files(useradd_t)
+ userdom_home_filetrans_user_home_dir(useradd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/awstats.te serefpolicy-3.6.12/policy/modules/apps/awstats.te
 --- nsaserefpolicy/policy/modules/apps/awstats.te	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/awstats.te	2009-08-19 18:08:12.000000000 +0200
@@ -1867,7 +1931,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-07-24 15:45:03.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-09-02 11:03:42.000000000 +0200
 @@ -91,6 +91,9 @@
  kernel_read_proc_symlinks(domain)
  kernel_read_crypto_sysctls(domain)
@@ -1907,7 +1971,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	afs_rw_cache(domain)
  ')
-@@ -125,6 +143,12 @@
+@@ -125,6 +143,13 @@
  	libs_use_shared_libs(domain)
  ')
  
@@ -1915,12 +1979,13 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	rpm_use_fds(domain)
 +	rpm_read_pipes(domain)
++	rpm_dontaudit_leaks(domain)
 +')
 +
  optional_policy(`
  	setrans_translate_context(domain)
  ')
-@@ -152,8 +176,7 @@
+@@ -152,8 +177,7 @@
  allow unconfined_domain_type domain:fd use;
  allow unconfined_domain_type domain:fifo_file rw_file_perms;
  
@@ -1930,7 +1995,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Act upon any other process.
  allow unconfined_domain_type domain:process ~{ transition dyntransition execmem execstack execheap };
-@@ -185,7 +208,10 @@
+@@ -185,7 +209,10 @@
  
  ifdef(`hide_broken_symptoms',`
  	fs_list_inotifyfs(domain)
@@ -2129,7 +2194,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-07-20 14:33:12.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-09-02 10:35:47.000000000 +0200
 @@ -52,6 +52,8 @@
  init_system_domain(unconfined_execmem_t, execmem_exec_t)
  role unconfined_r types unconfined_execmem_t;
@@ -2147,17 +2212,17 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_user_home_dir_filetrans_user_home_content(unconfined_t, { dir file lnk_file fifo_file sock_file })
  
-@@ -253,6 +254,10 @@
+@@ -252,6 +253,10 @@
+ 	portmap_run_helper(unconfined_t, unconfined_r)
  ')
  
- optional_policy(`
-+	ppp_run(unconfined_t, unconfined_r)
-+')
++#optional_policy(`
++#	ppp_run(unconfined_t, unconfined_r)
++#')
 +
-+optional_policy(`
+ optional_policy(`
  	qemu_role_notrans(unconfined_r, unconfined_t)
  	qemu_unconfined_role(unconfined_r)
- 
 @@ -277,7 +282,7 @@
  ')
  
@@ -2167,6 +2232,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
+@@ -323,6 +328,7 @@
+ allow unconfined_execmem_t self:process { execstack execmem };
+ unconfined_domain_noaudit(unconfined_execmem_t)
+ allow unconfined_execmem_t unconfined_t:process transition;
++rpm_transition_script(unconfined_execmem_t)
+ 
+ optional_policy(`
+ 	init_dbus_chat_script(unconfined_execmem_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.12/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/roles/unprivuser.te	2009-06-25 10:21:01.000000000 +0200
@@ -2948,7 +3021,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-08-04 12:43:13.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-09-02 10:30:14.000000000 +0200
 @@ -103,6 +103,7 @@
  kernel_rw_irq_sysctls(hald_t)
  kernel_rw_vm_sysctls(hald_t)
@@ -2965,7 +3038,15 @@ diff -b -B --ignore-all-space --exclude-
  
  files_getattr_all_mountpoints(hald_t)
  
-@@ -297,6 +299,7 @@
+@@ -211,6 +213,7 @@
+ 
+ sysnet_read_config(hald_t)
+ sysnet_domtrans_dhcpc(hald_t)
++sysnet_domtrans_ifconfig(hald_t)  
+ 
+ userdom_dontaudit_use_unpriv_user_fds(hald_t)
+ userdom_dontaudit_search_user_home_dirs(hald_t)
+@@ -297,6 +300,7 @@
  ')
  
  optional_policy(`
@@ -2973,7 +3054,7 @@ diff -b -B --ignore-all-space --exclude-
  	polkit_domtrans_auth(hald_t)
  	polkit_domtrans_resolve(hald_t)
  	polkit_read_lib(hald_t)
-@@ -369,6 +372,8 @@
+@@ -369,6 +373,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -2982,7 +3063,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -381,6 +386,7 @@
+@@ -381,6 +387,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -2990,7 +3071,7 @@ diff -b -B --ignore-all-space --exclude-
  	polkit_domtrans_auth(hald_acl_t)
  	polkit_read_lib(hald_acl_t)
  	polkit_read_reload(hald_acl_t)
-@@ -470,6 +476,8 @@
+@@ -470,6 +477,8 @@
  #
  # Local hald dccm policy
  #
@@ -2999,7 +3080,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:capability { net_bind_service };
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
-@@ -480,6 +488,8 @@
+@@ -480,6 +489,8 @@
  allow hald_t hald_dccm_t:process signal;
  allow hald_dccm_t hald_t:unix_stream_socket connectto;
  
@@ -3008,7 +3089,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -508,4 +518,8 @@
+@@ -508,4 +519,8 @@
  
  miscfiles_read_localization(hald_dccm_t)
  
@@ -3811,7 +3892,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-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-07-07 08:35:34.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-09-02 10:55:40.000000000 +0200
 @@ -95,6 +95,10 @@
  userdom_signal_unpriv_users(rpcd_t)
  
@@ -3834,7 +3915,16 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # NFSD local policy
-@@ -214,6 +222,10 @@
+@@ -207,6 +215,8 @@
+ 
+ mount_signal(gssd_t)
+ 
++userdom_signal_all_users(gssd_t)
++
+ tunable_policy(`allow_gssd_read_tmp',`
+ 	userdom_list_user_tmp(gssd_t) 
+ 	userdom_read_user_tmp_files(gssd_t) 
+@@ -214,6 +224,10 @@
  ')
  
  optional_policy(`
@@ -3857,6 +3947,18 @@ diff -b -B --ignore-all-space --exclude-
  	auth_read_all_dirs_except_shadow(rsync_t)
  	auth_read_all_files_except_shadow(rsync_t)
  	auth_read_all_symlinks_except_shadow(rsync_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.12/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-09-02 09:14:35.000000000 +0200
+@@ -342,6 +342,8 @@
+ miscfiles_read_localization(smbd_t)
+ miscfiles_read_public_files(smbd_t)
+ 
++userdom_signal_all_users(smbd_t)
++
+ userdom_use_unpriv_users_fds(smbd_t)
+ userdom_dontaudit_search_user_home_dirs(smbd_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.6.12/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/sasl.te	2009-08-18 14:47:01.000000000 +0200
@@ -4266,6 +4368,21 @@ diff -b -B --ignore-all-space --exclude-
 -
 -permissive shorewall_t;
 -
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.12/policy/modules/services/smartmon.te
+--- nsaserefpolicy/policy/modules/services/smartmon.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/smartmon.te	2009-09-02 10:27:17.000000000 +0200
+@@ -28,9 +28,9 @@
+ # Local policy
+ #
+ 
+-allow fsdaemon_t self:capability { setgid sys_rawio sys_admin };
++allow fsdaemon_t self:capability { setgid setpcap sys_rawio sys_admin };
+ dontaudit fsdaemon_t self:capability sys_tty_config;
+-allow fsdaemon_t self:process { signal_perms setfscreate };
++allow fsdaemon_t self:process { getcap setcap signal_perms setfscreate };
+ allow fsdaemon_t self:fifo_file rw_fifo_file_perms;
+ allow fsdaemon_t self:unix_dgram_socket create_socket_perms;
+ allow fsdaemon_t self:unix_stream_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.12/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/spamassassin.fc	2009-08-19 17:48:56.000000000 +0200



From vda at fedoraproject.org  Wed Sep  2 11:39:53 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Wed,  2 Sep 2009 11:39:53 +0000 (UTC)
Subject: rpms/uClibc/F-11 uClibc-0.9.30.1-getline.patch, NONE,
	1.1 uClibc.config, NONE, 1.1 uClibc.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090902113953.92CCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: vda

Update of /cvs/extras/rpms/uClibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16983

Modified Files:
	sources 
Added Files:
	uClibc-0.9.30.1-getline.patch uClibc.config uClibc.spec 
Log Message:
initial build



uClibc-0.9.30.1-getline.patch:
 unifdef.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE uClibc-0.9.30.1-getline.patch ---
diff -up uClibc-0.9.30.1/extra/scripts/unifdef.c.pom uClibc-0.9.30.1/extra/scripts/unifdef.c
--- uClibc-0.9.30.1/extra/scripts/unifdef.c.pom	2008-04-28 01:10:00.000000000 +0200
+++ uClibc-0.9.30.1/extra/scripts/unifdef.c	2009-06-09 11:15:09.000000000 +0200
@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         getline_uClibc(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void)
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = getline_uClibc();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+getline_uClibc(void)
 {
 	const char *cp;
 	int cursym;


--- NEW FILE uClibc.config ---
#
# Target Architecture Features and Options
#
FORCE_OPTIONS_FOR_ARCH=y
TARGET_SUBARCH=""

#
# Using ELF file format
#
ARCH_LITTLE_ENDIAN=y

#
# Using Little Endian
#
ARCH_HAS_MMU=y
ARCH_USE_MMU=y
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=n
UCLIBC_HAS_FENV=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS="./kernel-include"
HAVE_DOT_CONFIG=y

#
# General Library Settings
#
# HAVE_NO_PIC is not set
# DOPIC is not set
# ARCH_HAS_NO_SHARED is not set
# ARCH_HAS_NO_LDSO is not set
# HAVE_SHARED is not set
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
# UCLIBC_HAS_THREADS is not set
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
MALLOC_STANDARD=y
# MALLOC_GLIBC_COMPAT is not set
UCLIBC_DYNAMIC_ATEXIT=y
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
UNIX98PTY_ONLY=y
UCLIBC_HAS_GETPT=y
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
UCLIBC_HAS_TZ_FILE_READ_MANY=y
UCLIBC_TZ_FILE_PATH="/etc/TZ"

#
# Advanced Library Settings
#
UCLIBC_PWD_BUFFER_SIZE=256
UCLIBC_GRP_BUFFER_SIZE=256

#
# Support various families of functions
#
UCLIBC_LINUX_MODULE_24=y
UCLIBC_LINUX_SPECIFIC=y
UCLIBC_HAS_GNU_ERROR=y
UCLIBC_BSD_SPECIFIC=y
UCLIBC_HAS_BSD_ERR=y
UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
UCLIBC_NTP_LEGACY=y
UCLIBC_SV4_DEPRECATED=y
UCLIBC_HAS_REALTIME=y
UCLIBC_HAS_ADVANCED_REALTIME=y
UCLIBC_HAS_EPOLL=y
UCLIBC_HAS_XATTR=y
UCLIBC_HAS_PROFILING=y
UCLIBC_HAS_CRYPT_IMPL=y
UCLIBC_HAS_CRYPT=y
UCLIBC_HAS_NETWORK_SUPPORT=y
UCLIBC_HAS_SOCKET=y
UCLIBC_HAS_IPV4=y
UCLIBC_HAS_IPV6=y
UCLIBC_HAS_RPC=y
UCLIBC_HAS_FULL_RPC=y
UCLIBC_HAS_REENTRANT_RPC=y
# UCLIBC_USE_NETLINK is not set
# UCLIBC_HAS_BSD_RES_CLOSE is not set

#
# String and Stdio Support
#
UCLIBC_HAS_STRING_GENERIC_OPT=y
UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
UCLIBC_HAS_CTYPE_UNSAFE=y
# UCLIBC_HAS_CTYPE_CHECKED is not set
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
# USE_OLD_VFPRINTF is not set
UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
UCLIBC_HAS_STDIO_BUFSIZ_1024=y
# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
UCLIBC_HAS_STDIO_GETC_MACRO=y
UCLIBC_HAS_STDIO_PUTC_MACRO=y
UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
UCLIBC_HAS_PRINTF_M_SPEC=y
UCLIBC_HAS_ERRNO_MESSAGES=y
# UCLIBC_HAS_SYS_ERRLIST is not set
UCLIBC_HAS_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set
UCLIBC_HAS_GNU_GETOPT=y
UCLIBC_HAS_GNU_GETSUBOPT=y

#
# Big and Tall
#
UCLIBC_HAS_REGEX=y
# UCLIBC_HAS_REGEX_OLD is not set
UCLIBC_HAS_FNMATCH=y
UCLIBC_HAS_FNMATCH_OLD=y
UCLIBC_HAS_WORDEXP=y
UCLIBC_HAS_FTW=y
UCLIBC_HAS_GLOB=y
# UCLIBC_HAS_GNU_GLOB is not set

#
# Library Installation Options
#
RUNTIME_PREFIX="/lib_uc"
DEVEL_PREFIX="./installeddd"

#
# Security options
#
# UCLIBC_HAS_ARC4RANDOM is not set
# HAVE_NO_SSP is not set
# UCLIBC_HAS_SSP is not set
UCLIBC_BUILD_NOEXECSTACK=y

#
# uClibc development/debugging options
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
DODEBUG=y
DOSTRIP=y
# DOASSERTS is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
# EXTRA_WARNINGS is not set
# DOMULTI is not set
# UCLIBC_MJN3_ONLY is not set


--- NEW FILE uClibc.spec ---
Name: uClibc
Version: 0.9.30.1
Release: 1%{?dist}
Summary: C library for embedded Linux

Group: Development/Libraries
License: LGPLv2
URL: http://www.uclibc.org/
Source0: http://www.uclibc.org/downloads/%{name}-%{version}.tar.bz2
Source1: uClibc.config
# fix conflicting types for getline
Patch0: uClibc-0.9.30.1-getline.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%global debug_package %{nil}
# This package only contains a static library

ExcludeArch: ppc64
# uclibc 0.9.30 does not support ppc64

%description
uClibc is a C library for developing embedded Linux systems.
It is much smaller than the GNU C Library, but nearly all applications
supported by glibc also work perfectly with uClibc.

%package devel
Summary: Header files and libraries for uClibc library
Group: Development/Libraries
Provides: uClibc-static = %{version}-%{release}

%description devel
uClibc is a C library for developing embedded Linux systems.
It is much smaller than the GNU C Library, but nearly all applications
supported by glibc also work perfectly with uClibc.
This package contains the header files and libraries
needed for uClibc package.

%prep
%setup -q
%patch0 -p1 -b .getline

cat %{SOURCE1} >.config1
iconv -f windows-1252 -t utf-8 README >README.pom
mv README.pom README

%build
mkdir kernel-include
cp -a /usr/include/asm kernel-include
cp -a /usr/include/asm-generic kernel-include
cp -a /usr/include/linux kernel-include

arch=`uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/'`
echo "TARGET_$arch=y" >.config
echo "TARGET_ARCH=\"$arch\"" >>.config
cat .config1 >>.config

yes "" | make oldconfig %{?_smp_mflags}
make V=1 %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DEVEL_PREFIX="$RPM_BUILD_ROOT/"
make install_kernel_headers DEVEL_PREFIX="$RPM_BUILD_ROOT/"

# move libraries to proper subdirectory
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/uClibc
mv  $RPM_BUILD_ROOT/lib/*  $RPM_BUILD_ROOT/%{_libdir}/uClibc/
rm -rf  $RPM_BUILD_ROOT/lib/

# move the header files to /usr subdirectory
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/uClibc
mv  $RPM_BUILD_ROOT/include/*  $RPM_BUILD_ROOT/%{_includedir}/uClibc
rm -rf  $RPM_BUILD_ROOT/include/

%clean
rm -rf $RPM_BUILD_ROOT

%files devel
%defattr(-,root,root,-)
%doc README docs/Glibc_vs_uClibc_Differences.txt docs/threads.txt docs/uClibc_vs_SuSv3.txt
%doc TODO DEDICATION.mjn3 MAINTAINERS
%doc docs/PORTING COPYING.LIB
%{_includedir}/uClibc
%{_libdir}/uClibc

%changelog
* Wed Sep  2 2009 Denys Vlasenko <dvlasenk at redhat.com> - 0.9.30.1-1
- initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uClibc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Jul 2009 15:17:50 -0000	1.1
+++ sources	2 Sep 2009 11:39:53 -0000	1.2
@@ -0,0 +1 @@
+1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2



From fabbione at fedoraproject.org  Wed Sep  2 11:40:20 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  2 Sep 2009 11:40:20 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel ocfs2-tools.spec,1.8,1.9
Message-ID: <20090902114020.F354911C0498@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17171

Modified Files:
	ocfs2-tools.spec 
Log Message:
Add missing file entry



Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocfs2-tools.spec	2 Sep 2009 11:13:54 -0000	1.8
+++ ocfs2-tools.spec	2 Sep 2009 11:40:20 -0000	1.9
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.2
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -115,7 +115,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp -f vendor/common/o2cb.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/o2cb
 mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
 cp -f vendor/common/51-ocfs2.rules \
-	$RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
+ $RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
@@ -157,6 +157,7 @@ fi
 /sbin/o2image
 %{_initrddir}/o2cb
 %{_initrddir}/ocfs2
+%config(noreplace) /etc/udev/rules.d/51-ocfs2.rules
 %config(noreplace) /etc/sysconfig/o2cb
 %{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/debugfs.ocfs2.8.gz
@@ -201,6 +202,9 @@ fi
 /sbin/ocfs2_controld.pcmk
 
 %changelog
+* Wed Sep  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-2
+- Fix udev rule packaging
+
 * Mon Aug 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-1
 - New upstream release
 - Undefine alpha tag



From transif at fedoraproject.org  Wed Sep  2 11:41:49 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  2 Sep 2009 11:41:49 +0000 (UTC)
Subject: comps/po mr.po,1.20,1.21
Message-ID: <20090902114149.EF02C11C00E6@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17682/po

Modified Files:
	mr.po 
Log Message:
Sending translation for Marathi


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 mr.poIndex: mr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mr.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mr.po	26 May 2009 08:35:35 -0000	1.20
+++ mr.po	2 Sep 2009 11:41:49 -0000	1.21
@@ -1,297 +1,319 @@
-# translation of comps.HEAD.mr.po to marathi
+# translation of comps.HEAD.po to Marathi
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Rahul Bhalerao <rbhalera at redhat.com>, 2006.
 # Rahul Bhalerao <b.rahul.pm at gmail.com>, 2006.
 # Sandeep Shedmake <sandeep.shedmake at gmail.com>, 2008, 2009.
+# Sandeep Shedmake <sshedmak at redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.mr\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 02:27+0000\n"
-"PO-Revision-Date: 2009-05-26 14:00+0530\n"
-"Last-Translator: Sandeep Shedmake <sandeep.shedmake at gmail.com>\n"
-"Language-Team: marathi\n"
+"POT-Creation-Date: 2009-09-02 08:22+0000\n"
+"PO-Revision-Date: 2009-09-02 17:09+0530\n"
+"Last-Translator: Sandeep Shedmake <sshedmak at redhat.com>\n"
+"Language-Team: Marathi <fedora-trans-mr at redhat.com>\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
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "?? ???? ???????? ??????? ?? ??? ???????? ?????????? ???????? ??????? ??? ????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ???? ??? ??????????? ?????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???? ??? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???? ???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ???????????? ???????? ?????? ??????."
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "?????????? ????????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "????? ??????? ?????? ????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
[...1845 lines suppressed...]
 msgstr "??????? ??????"
 
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f11.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ???????? ???????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1369,7 +1480,8 @@ msgstr ""
 "32 ??? Windows ?????? ???? ?????-?????????, ?????, ? ????????????? ??????, ???? ???? "
 "Fedora ??????? ????????? ????? ??????."
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1377,37 +1489,96 @@ msgstr ""
 "Objective CAML ???????????? ???? ? ?????????? ???? ???? ????????? ?????? ??????? "
 "??????."
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ??????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "?? ?? ????, ??????, ???? ??????? ? ????? ?????? ??????? ???????????? ???????? ???? ???."
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "????? ??????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "GNOME ???????? ????? ???????? ??? ??????????????? ??????? ?????????? ???????? ??????? ???"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "???? Fedora ???????? ????? ???????? ??? ??????????????? ??????? ?????????? ???????? ??????? ???"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????? ? ???????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ????????? ? ???????? ????? ?????? ? ???????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "???????? ??? (???)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "???????? ??? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????????? ???????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?? ??? ????????? ??????? ?????? ????? ??? ?? ?????????, ?????? ???? ????? ???? ????? ????? ???? X11 ???????? ??????? ???."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "???? ? ????????? ??? ????????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ???????? ???????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ?? NetBook/NetTop/MID ???? ????? ???????? ??????? ??? ???."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ????????? ?????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "?????? ?????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1415,7 +1586,7 @@ msgstr ""
 "GNOME ?? ?????????, ?????? ???????? ??????? ??? ????????? ?????, ???????????? , ??????? "
 "??????? ??? ?????? ???? ?????????? ????? ?????? ???."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1423,7 +1594,7 @@ msgstr ""
 "KDE ?? ?????????, ?????? ???????? ??????? ??? ????????? ?????, ???????????? , ??????? ??????? "
 "??? ?????? ???? ?????????? ????? ?????? ???."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1431,11 +1602,11 @@ msgstr ""
 "?????? ??? ?????? ??????? ??????, ?? ????????? ????? ?? ??????? ?????? ??????? ??? ?????? "
 "??? ?????. ???????? Emacs ??? Vi ????? ?????? ???."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ??? ??????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1443,27 +1614,27 @@ msgstr ""
 "?? ?????? ??????? DocBook ???????? ???????? ????? ??? ??????? HTML, PDF, ??????????????, "
 "??? ??? ???????? ????????? ??????? ??? ?????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?? ???? ??????? ????????? ????? ??????? ?? ???"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?? ???? ?????? ????????????? ???? ? ??????????? ?? ???."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?? ???? ??? ????????????? ???? ? ??????????? ?? ???."
 



From ltinkl at fedoraproject.org  Wed Sep  2 11:46:18 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Sep 2009 11:46:18 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase-4.3.2-konsolemenus.patch, NONE,
	1.1 kdebase.spec, 1.369, 1.370
Message-ID: <20090902114618.B151611C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447/F-10

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
Correct KPart issue where the wrong context menu was used and invalid menus
were created.


kdebase-4.3.2-konsolemenus.patch:
 SessionController.cpp |   19 +++++++++++++------
 SessionController.h   |    3 +++
 2 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE kdebase-4.3.2-konsolemenus.patch ---
Index: apps/konsole/src/SessionController.cpp
===================================================================
--- apps/konsole/src/SessionController.cpp	(revision 1017602)
+++ apps/konsole/src/SessionController.cpp	(revision 1017603)
@@ -95,13 +95,11 @@
     Q_ASSERT( view );
 
     // handle user interface related to session (menus etc.)
+    if (isKonsolePart())
+        setXMLFile("konsole/partui.rc");
+    else
+        setXMLFile("konsole/sessionui.rc");
 
-#ifdef KONSOLE_PART
-    setXMLFile("konsole/partui.rc");
-#else
-    setXMLFile("konsole/sessionui.rc");
-#endif
-
     setupActions();
     actionCollection()->addAssociatedWidget(view);
     foreach (QAction* action, actionCollection()->actions())
@@ -1041,6 +1039,15 @@
     }
 }
 
+bool SessionController::isKonsolePart() const
+{
+    // Check to see if we are being called from Konsole or a KPart
+    if (QString(kapp->metaObject()->className()) == "Konsole::Application")
+        return false;
+    else
+        return true;
+}
+
 SessionTask::SessionTask(QObject* parent)
     :  QObject(parent)
     ,  _autoDelete(false)
Index: apps/konsole/src/SessionController.h
===================================================================
--- apps/konsole/src/SessionController.h	(revision 1017602)
+++ apps/konsole/src/SessionController.h	(revision 1017603)
@@ -209,6 +209,9 @@
 
     void updateSearchFilter();
 
+    /* Returns true if called within a KPart; false if called within Konsole. */
+    bool isKonsolePart() const;
+
 private:
     // begins the search
     // text - pattern to search for


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- kdebase.spec	1 Sep 2009 12:55:11 -0000	1.369
+++ kdebase.spec	2 Sep 2009 11:46:18 -0000	1.370
@@ -1,8 +1,7 @@
-
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -15,6 +14,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
+Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -57,11 +57,7 @@ BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba
-%endif
 BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: strigi-devel >= 0.5.7
 # needed?
@@ -107,6 +103,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch3 -p0 -b .konsolemenus
 
 # 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
@@ -218,6 +215,9 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
+- fix context menus in Konsole (kdebug:186745)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - drop/revert kde-plasma-folderview subpkg



From ltinkl at fedoraproject.org  Wed Sep  2 11:46:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Sep 2009 11:46:19 +0000 (UTC)
Subject: rpms/kdebase/F-11 kdebase-4.3.2-konsolemenus.patch, NONE,
	1.1 kdebase.spec, 1.379, 1.380
Message-ID: <20090902114619.0460611C00EC@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447/F-11

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
Correct KPart issue where the wrong context menu was used and invalid menus
were created.


kdebase-4.3.2-konsolemenus.patch:
 SessionController.cpp |   19 +++++++++++++------
 SessionController.h   |    3 +++
 2 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE kdebase-4.3.2-konsolemenus.patch ---
Index: apps/konsole/src/SessionController.cpp
===================================================================
--- apps/konsole/src/SessionController.cpp	(revision 1017602)
+++ apps/konsole/src/SessionController.cpp	(revision 1017603)
@@ -95,13 +95,11 @@
     Q_ASSERT( view );
 
     // handle user interface related to session (menus etc.)
+    if (isKonsolePart())
+        setXMLFile("konsole/partui.rc");
+    else
+        setXMLFile("konsole/sessionui.rc");
 
-#ifdef KONSOLE_PART
-    setXMLFile("konsole/partui.rc");
-#else
-    setXMLFile("konsole/sessionui.rc");
-#endif
-
     setupActions();
     actionCollection()->addAssociatedWidget(view);
     foreach (QAction* action, actionCollection()->actions())
@@ -1041,6 +1039,15 @@
     }
 }
 
+bool SessionController::isKonsolePart() const
+{
+    // Check to see if we are being called from Konsole or a KPart
+    if (QString(kapp->metaObject()->className()) == "Konsole::Application")
+        return false;
+    else
+        return true;
+}
+
 SessionTask::SessionTask(QObject* parent)
     :  QObject(parent)
     ,  _autoDelete(false)
Index: apps/konsole/src/SessionController.h
===================================================================
--- apps/konsole/src/SessionController.h	(revision 1017602)
+++ apps/konsole/src/SessionController.h	(revision 1017603)
@@ -209,6 +209,9 @@
 
     void updateSearchFilter();
 
+    /* Returns true if called within a KPart; false if called within Konsole. */
+    bool isKonsolePart() const;
+
 private:
     // begins the search
     // text - pattern to search for


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- kdebase.spec	1 Sep 2009 12:55:12 -0000	1.379
+++ kdebase.spec	2 Sep 2009 11:46:18 -0000	1.380
@@ -1,8 +1,7 @@
-
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -15,6 +14,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
+Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -57,11 +57,7 @@ BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba
-%endif
 BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: strigi-devel >= 0.5.7
 # needed?
@@ -107,6 +103,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch3 -p0 -b .konsolemenus
 
 # 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
@@ -218,6 +215,9 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
+- fix context menus in Konsole (kdebug:186745)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - drop/revert kde-plasma-folderview subpkg



From ltinkl at fedoraproject.org  Wed Sep  2 11:46:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Sep 2009 11:46:19 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase-4.3.2-konsolemenus.patch, NONE,
	1.1 kdebase.spec, 1.391, 1.392
Message-ID: <20090902114619.65AD011C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447/devel

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
Correct KPart issue where the wrong context menu was used and invalid menus
were created.


kdebase-4.3.2-konsolemenus.patch:
 SessionController.cpp |   19 +++++++++++++------
 SessionController.h   |    3 +++
 2 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE kdebase-4.3.2-konsolemenus.patch ---
Index: apps/konsole/src/SessionController.cpp
===================================================================
--- apps/konsole/src/SessionController.cpp	(revision 1017602)
+++ apps/konsole/src/SessionController.cpp	(revision 1017603)
@@ -95,13 +95,11 @@
     Q_ASSERT( view );
 
     // handle user interface related to session (menus etc.)
+    if (isKonsolePart())
+        setXMLFile("konsole/partui.rc");
+    else
+        setXMLFile("konsole/sessionui.rc");
 
-#ifdef KONSOLE_PART
-    setXMLFile("konsole/partui.rc");
-#else
-    setXMLFile("konsole/sessionui.rc");
-#endif
-
     setupActions();
     actionCollection()->addAssociatedWidget(view);
     foreach (QAction* action, actionCollection()->actions())
@@ -1041,6 +1039,15 @@
     }
 }
 
+bool SessionController::isKonsolePart() const
+{
+    // Check to see if we are being called from Konsole or a KPart
+    if (QString(kapp->metaObject()->className()) == "Konsole::Application")
+        return false;
+    else
+        return true;
+}
+
 SessionTask::SessionTask(QObject* parent)
     :  QObject(parent)
     ,  _autoDelete(false)
Index: apps/konsole/src/SessionController.h
===================================================================
--- apps/konsole/src/SessionController.h	(revision 1017602)
+++ apps/konsole/src/SessionController.h	(revision 1017603)
@@ -209,6 +209,9 @@
 
     void updateSearchFilter();
 
+    /* Returns true if called within a KPart; false if called within Konsole. */
+    bool isKonsolePart() const;
+
 private:
     // begins the search
     // text - pattern to search for


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- kdebase.spec	2 Sep 2009 10:18:06 -0000	1.391
+++ kdebase.spec	2 Sep 2009 11:46:19 -0000	1.392
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -14,6 +14,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
+Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -102,6 +103,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch3 -p0 -b .konsolemenus
 
 # 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
@@ -213,6 +215,9 @@ fi
 
 
 %changelog
+* Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
+- fix context menus in Konsole (kdebug:186745)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - drop/revert kde-plasma-folderview subpkg



From ltinkl at fedoraproject.org  Wed Sep  2 11:48:02 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Sep 2009 11:48:02 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-10 .cvsignore, 1.3,
	1.4 oxygen-icon-theme.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090902114802.A3BBD11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19840/F-10

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 12:58:11 -0000	1.3
+++ .cvsignore	2 Sep 2009 11:48:02 -0000	1.4
@@ -1 +1 @@
-oxygen-icons-4.3.0.tar.bz2
+oxygen-icons-4.3.1.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-10/oxygen-icon-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- oxygen-icon-theme.spec	7 Aug 2009 12:58:11 -0000	1.2
+++ oxygen-icon-theme.spec	2 Sep 2009 11:48:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.0
+Version:       4.3.1
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 12:58:11 -0000	1.3
+++ sources	2 Sep 2009 11:48:02 -0000	1.4
@@ -1 +1 @@
-26b63e75f9f198f91a022e5f198119bb  oxygen-icons-4.3.0.tar.bz2
+bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Wed Sep  2 11:48:02 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Sep 2009 11:48:02 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-11 .cvsignore, 1.3,
	1.4 oxygen-icon-theme.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090902114802.D6EAB11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19840/F-11

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 12:58:11 -0000	1.3
+++ .cvsignore	2 Sep 2009 11:48:02 -0000	1.4
@@ -1 +1 @@
-oxygen-icons-4.3.0.tar.bz2
+oxygen-icons-4.3.1.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/oxygen-icon-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- oxygen-icon-theme.spec	7 Aug 2009 12:58:11 -0000	1.2
+++ oxygen-icon-theme.spec	2 Sep 2009 11:48:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.0
+Version:       4.3.1
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 12:58:11 -0000	1.3
+++ sources	2 Sep 2009 11:48:02 -0000	1.4
@@ -1 +1 @@
-26b63e75f9f198f91a022e5f198119bb  oxygen-icons-4.3.0.tar.bz2
+bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2



From ltinkl at fedoraproject.org  Wed Sep  2 11:48:03 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Sep 2009 11:48:03 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore,1.9,1.10
Message-ID: <20090902114803.4EAAB11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19840/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Aug 2009 20:06:53 -0000	1.9
+++ .cvsignore	2 Sep 2009 11:48:02 -0000	1.10
@@ -1,6 +1 @@
-oxygen-icons-4.2.90.tar.bz2
-oxygen-icons-4.2.95.tar.bz2
-oxygen-icons-4.2.96.tar.bz2
-oxygen-icons-4.2.98.tar.bz2
-oxygen-icons-4.3.0.tar.bz2
 oxygen-icons-4.3.1.tar.bz2



From than at fedoraproject.org  Wed Sep  2 11:52:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 11:52:49 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.91,1.92
Message-ID: <20090902115249.DFA2111C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21585

Modified Files:
	kde-l10n.spec 
Log Message:
fix file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kde-l10n.spec	28 Aug 2009 20:46:32 -0000	1.91
+++ kde-l10n.spec	2 Sep 2009 11:52:49 -0000	1.92
@@ -1394,7 +1394,6 @@ rm -rf %{buildroot}
 %lang(sr) %{_kde4_docdir}/HTML/sr at latin
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/*
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr at latin/*
-%lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/*
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt



From timlau at fedoraproject.org  Wed Sep  2 12:00:57 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  2 Sep 2009 12:00:57 +0000 (UTC)
Subject: rpms/yum-utils/devel .cvsignore, 1.29, 1.30 sources, 1.31,
	1.32 yum-utils.spec, 1.65, 1.66
Message-ID: <20090902120057.0EAA011C00E6@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24419

Modified Files:
	.cvsignore sources yum-utils.spec 
Log Message:
Release 1.1.23


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	19 May 2009 06:50:12 -0000	1.29
+++ .cvsignore	2 Sep 2009 12:00:56 -0000	1.30
@@ -1 +1 @@
-yum-utils-1.1.22.tar.gz
+yum-utils-1.1.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	19 May 2009 06:50:12 -0000	1.31
+++ sources	2 Sep 2009 12:00:56 -0000	1.32
@@ -1 +1 @@
-91373d40b9703f04d12eb289932077a1  yum-utils-1.1.22.tar.gz
+6e5c0e3143b098912728d00a5934db76  yum-utils-1.1.23.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- yum-utils.spec	27 Jul 2009 08:58:04 -0000	1.65
+++ yum-utils.spec	2 Sep 2009 12:00:56 -0000	1.66
@@ -1,15 +1,14 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.22
-Release: 3%{?dist}
+Version: 1.1.23
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
-Patch0: repoclosure-arch-fix.patch
 URL: http://yum.baseurl.org/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: python >= 2.4 , yum >= 3.2.22
+Requires: python >= 2.4 , yum >= 3.2.23
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -38,7 +37,7 @@ Provides: yum-changelog = %{version}-%{r
 Obsoletes: yum-changelog < 1.1.20-0
 Conflicts: yum-changelog < 1.1.20-0
 # changelog requires new update_md.UpdateMetadata() API in 3.2.23
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 Requires: python-dateutil
 
 %description -n yum-plugin-changelog
@@ -76,7 +75,7 @@ Group: System Environment/Base
 Provides: yum-versionlock = %{version}-%{release}
 Obsoletes: yum-versionlock < 1.1.20-0
 Conflicts: yum-versionlock < 1.1.20-0
-Requires: yum >= 3.0
+Requires: yum >= 3.2.24
 
 %description -n yum-plugin-versionlock
 This plugin takes a set of name/versions for packages and excludes all other
@@ -210,7 +209,7 @@ Provides: yum-aliases = %{version}-%{rel
 Obsoletes: yum-aliases < 1.1.20-0
 Conflicts: yum-aliases < 1.1.20-0
 # Requires args_hook
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-aliases
 This plugin adds the command alias, and parses the aliases config. file to
@@ -348,7 +347,7 @@ repositories.
 %package -n yum-plugin-show-leaves
 Summary: Yum plugin which shows newly installed leaf packages
 Group: System Environment/Base
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-show-leaves
 Yum plugin which shows newly installed leaf packages
@@ -356,7 +355,6 @@ and packages that became leaves after a 
 
 %prep
 %setup -q
-%patch0 -p0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -598,14 +596,8 @@ fi
 
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.22-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jul  7 2009 Seth Vidal <skvidal at fedoraproject.org>
-- patch to repoclosure so spam-o-matic works again in rawhide
-
-* Tue May 19 2009 Tim Lauridsen <timlau at fedoraproject.org>
-- decrease yum require to 3.2.22, because 3.2.22 in fedora is also 3.2.23
+* Wed Sep 2 2009 Tim Lauridsen <timlau at fedoraproject.org>
+- mark as 1.1.23
 
 * Tue May 19 2009 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.22 



From timlau at fedoraproject.org  Wed Sep  2 12:02:41 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  2 Sep 2009 12:02:41 +0000 (UTC)
Subject: rpms/yum-utils/devel repoclosure-arch-fix.patch,1.1,NONE
Message-ID: <20090902120241.9A68911C00E6@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25577

Removed Files:
	repoclosure-arch-fix.patch 
Log Message:
remove unused patch


--- repoclosure-arch-fix.patch DELETED ---



From timlau at fedoraproject.org  Wed Sep  2 12:12:45 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  2 Sep 2009 12:12:45 +0000 (UTC)
Subject: rpms/yum-utils/F-11 sources,1.31,1.32 yum-utils.spec,1.62,1.63
Message-ID: <20090902121245.BE3C011C00E6@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29160

Modified Files:
	sources yum-utils.spec 
Log Message:
Release 1.1.23


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	19 May 2009 07:06:56 -0000	1.31
+++ sources	2 Sep 2009 12:12:44 -0000	1.32
@@ -1 +1 @@
-91373d40b9703f04d12eb289932077a1  yum-utils-1.1.22.tar.gz
+6e5c0e3143b098912728d00a5934db76  yum-utils-1.1.23.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-11/yum-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- yum-utils.spec	19 May 2009 07:06:56 -0000	1.62
+++ yum-utils.spec	2 Sep 2009 12:12:44 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.22
+Version: 1.1.23
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -8,7 +8,7 @@ Source: http://yum.baseurl.org/download/
 URL: http://yum.baseurl.org/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: python >= 2.4 , yum >= 3.2.22
+Requires: python >= 2.4 , yum >= 3.2.23
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -37,7 +37,7 @@ Provides: yum-changelog = %{version}-%{r
 Obsoletes: yum-changelog < 1.1.20-0
 Conflicts: yum-changelog < 1.1.20-0
 # changelog requires new update_md.UpdateMetadata() API in 3.2.23
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 Requires: python-dateutil
 
 %description -n yum-plugin-changelog
@@ -75,7 +75,7 @@ Group: System Environment/Base
 Provides: yum-versionlock = %{version}-%{release}
 Obsoletes: yum-versionlock < 1.1.20-0
 Conflicts: yum-versionlock < 1.1.20-0
-Requires: yum >= 3.0
+Requires: yum >= 3.2.24
 
 %description -n yum-plugin-versionlock
 This plugin takes a set of name/versions for packages and excludes all other
@@ -209,7 +209,7 @@ Provides: yum-aliases = %{version}-%{rel
 Obsoletes: yum-aliases < 1.1.20-0
 Conflicts: yum-aliases < 1.1.20-0
 # Requires args_hook
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-aliases
 This plugin adds the command alias, and parses the aliases config. file to
@@ -347,7 +347,7 @@ repositories.
 %package -n yum-plugin-show-leaves
 Summary: Yum plugin which shows newly installed leaf packages
 Group: System Environment/Base
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-show-leaves
 Yum plugin which shows newly installed leaf packages
@@ -596,8 +596,8 @@ fi
 
 
 %changelog
-* Tue May 19 2009 Tim Lauridsen <timlau at fedoraproject.org>
-- decrease yum require to 3.2.22, because 3.2.22 in fedora is also 3.2.23
+* Wed Sep 2 2009 Tim Lauridsen <timlau at fedoraproject.org>
+- mark as 1.1.23
 
 * Tue May 19 2009 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.22 



From transif at fedoraproject.org  Wed Sep  2 12:14:39 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  2 Sep 2009 12:14:39 +0000 (UTC)
Subject: comps/po or.po,1.20,1.21
Message-ID: <20090902121439.F32C111C00E6@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29777/po

Modified Files:
	or.po 
Log Message:
Sending translation for Oriya


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 or.poIndex: or.po
===================================================================
RCS file: /cvs/pkgs/comps/po/or.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- or.po	26 May 2009 07:46:24 -0000	1.20
+++ or.po	2 Sep 2009 12:14:39 -0000	1.21
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 02:27+0000\n"
-"PO-Revision-Date: 2009-05-26 13:16+0530\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-01 14:56+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
 "Language-Team: Oriya <oriya-it at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -29,280 +29,305 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
+"\n"
+"\n"
+"\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "????? ?????? ??????? ?????? ?????? ????? ??? ????? ???????? ????? ???? ??????? ???????"
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????? ?????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "??????? ??????? ????? ???? ?????? ???"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????? ??? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ?????????? ????????? ???? ????? ?????"
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "??????????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "????????? ???????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????? ?????? ??????? ????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "?????? ??????"
 
[...1854 lines suppressed...]
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "??????? ??????"
 
-#: ../comps-f11.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "????? ??????? ??????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1396,21 +1510,25 @@ msgstr ""
 "32 ??? Windows ???????? ??????????-????? ???????? ???? ??????, ????????? ??????? ???, ??? "
 "?????? ??????? ???, ????? Fedora ???????"
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "CAML ???????????? ???? ??? ????????? ??????? ??? ??????? ????? ???? ???????"
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "??????? ??????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ??????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1418,23 +1536,83 @@ msgstr ""
 "???????? ??????, ??????????, ??????, ??? ??????????? ???? ??????? ???????????? ????? ?????? "
 "????"
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??? ???????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "?????????????? ????? ??? ?????? GNOME ??????? ???? ???? ?? ??????????? ?????? ??????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"?????????????? ????? ??? ?????? ????? Fedora ????????????? ???? ?? ??????????? ???? "
+"?????? ????????? ?????? ??????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "??? ??? ??????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ???? ??? ??????????????? ???? ??? ??? ??????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "???? ?? (????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "???? ?? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????????? ?????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "??????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ?? ??????, ?????? ????? ???? ?????? ????????????? ??? ?????? ???????? ???????????? "
+"????? ???? ??????? ???? ????? ?????? X11 ??????? ???????"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "?????? ??? ???? ????? ????????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ??????? ??????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "NetBook/NetTop/MID ????? ???? Moblin ????? ??????? ???????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????? ??????? ???? ??????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "????-?? ???????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1442,7 +1620,7 @@ msgstr ""
 "??? ????? ?????????, ?????? ???? ??????????? ??? ?????? ????? ???????, ????????, ?????? "
 "???????????,??? ????? ?????? ???? ??????? ???? ???????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1450,7 +1628,7 @@ msgstr ""
 "??.??.?. ????? ?????????, ?????? ???? ??????????? ??? ?????? ????? ???????, ????????, "
 "?????? ? ???????????,??? ????? ?????? ???? ??????? ???? ??????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1458,11 +1636,11 @@ msgstr ""
 "???????? ???????? ????? ??????? ???? ??????, ?????? ????? ????? ????????? ?????? ??????? "
 "???? ?????? ????? ???? ?????? ?????? ?????? | ??????  ?-????? ??? ??.??. ?? ???????? ????????"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "????-?-????? ????? ???????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1471,27 +1649,27 @@ msgstr ""
 "????????? ??.??.??.??.,??.??.??., ??????????????, ??? ????? ???? ?? ???????? ????? ???? ?????? "
 "?????? ??? ???????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??? ?????? ??????? ???????? ??????????? ???????? ?????? ???? ????? ??????? ????? ?????? ????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ???? ??????? ??????? ????? ??? ????? ??????? ????? ?????? ????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "????-?-?????"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ???? ??? ??????? ????? ??? ????? ??????? ????? ?????? ????"
 



From timlau at fedoraproject.org  Wed Sep  2 12:19:41 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  2 Sep 2009 12:19:41 +0000 (UTC)
Subject: rpms/yum-utils/F-10 sources,1.30,1.31 yum-utils.spec,1.53,1.54
Message-ID: <20090902121941.6C3FE11C00E6@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31905

Modified Files:
	sources yum-utils.spec 
Log Message:
Release 1.1.23


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	19 May 2009 07:13:46 -0000	1.30
+++ sources	2 Sep 2009 12:19:41 -0000	1.31
@@ -1 +1 @@
-91373d40b9703f04d12eb289932077a1  yum-utils-1.1.22.tar.gz
+6e5c0e3143b098912728d00a5934db76  yum-utils-1.1.23.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-10/yum-utils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- yum-utils.spec	19 May 2009 07:13:46 -0000	1.53
+++ yum-utils.spec	2 Sep 2009 12:19:41 -0000	1.54
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.22
+Version: 1.1.23
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -8,7 +8,7 @@ Source: http://yum.baseurl.org/download/
 URL: http://yum.baseurl.org/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: python >= 2.4 , yum >= 3.2.22
+Requires: python >= 2.4 , yum >= 3.2.23
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -37,7 +37,7 @@ Provides: yum-changelog = %{version}-%{r
 Obsoletes: yum-changelog < 1.1.20-0
 Conflicts: yum-changelog < 1.1.20-0
 # changelog requires new update_md.UpdateMetadata() API in 3.2.23
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 Requires: python-dateutil
 
 %description -n yum-plugin-changelog
@@ -75,7 +75,7 @@ Group: System Environment/Base
 Provides: yum-versionlock = %{version}-%{release}
 Obsoletes: yum-versionlock < 1.1.20-0
 Conflicts: yum-versionlock < 1.1.20-0
-Requires: yum >= 3.0
+Requires: yum >= 3.2.24
 
 %description -n yum-plugin-versionlock
 This plugin takes a set of name/versions for packages and excludes all other
@@ -209,7 +209,7 @@ Provides: yum-aliases = %{version}-%{rel
 Obsoletes: yum-aliases < 1.1.20-0
 Conflicts: yum-aliases < 1.1.20-0
 # Requires args_hook
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-aliases
 This plugin adds the command alias, and parses the aliases config. file to
@@ -347,7 +347,7 @@ repositories.
 %package -n yum-plugin-show-leaves
 Summary: Yum plugin which shows newly installed leaf packages
 Group: System Environment/Base
-Requires: yum >= 3.2.22
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-show-leaves
 Yum plugin which shows newly installed leaf packages
@@ -596,8 +596,8 @@ fi
 
 
 %changelog
-* Tue May 19 2009 Tim Lauridsen <timlau at fedoraproject.org>
-- decrease yum require to 3.2.22, because 3.2.22 in fedora is also 3.2.23
+* Wed Sep 2 2009 Tim Lauridsen <timlau at fedoraproject.org>
+- mark as 1.1.23
 
 * Tue May 19 2009 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.22 



From pkgdb at fedoraproject.org  Wed Sep  2 12:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:34:54 +0000
Subject: [pkgdb] maven2-common-poms had acl change status
Message-ID: <20090902123454.5AAE510F890@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven2-common-poms (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 12:34:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:34:55 +0000
Subject: [pkgdb] maven2-common-poms had acl change status
Message-ID: <20090902123455.92A8310F894@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven2-common-poms (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 12:34:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:34:56 +0000
Subject: [pkgdb] maven2-common-poms had acl change status
Message-ID: <20090902123456.9075210F896@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven2-common-poms (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 12:34:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:34:57 +0000
Subject: [pkgdb] maven2-common-poms had acl change status
Message-ID: <20090902123457.7EA5A10F898@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on maven2-common-poms (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 12:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:35:05 +0000
Subject: [pkgdb] maven2-common-poms had acl change status
Message-ID: <20090902123505.35A5210F89B@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on maven2-common-poms (Fedora devel) to Obsolete for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-common-poms



From pkgdb at fedoraproject.org  Wed Sep  2 12:35:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:35:47 +0000
Subject: [pkgdb] maven-jxr had acl change status
Message-ID: <20090902123547.D96A210F882@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven-jxr (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From pkgdb at fedoraproject.org  Wed Sep  2 12:35:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:35:48 +0000
Subject: [pkgdb] maven-jxr had acl change status
Message-ID: <20090902123548.11C5110F896@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven-jxr (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From pkgdb at fedoraproject.org  Wed Sep  2 12:35:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:35:49 +0000
Subject: [pkgdb] maven-jxr had acl change status
Message-ID: <20090902123549.419E510F89B@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven-jxr (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From pkgdb at fedoraproject.org  Wed Sep  2 12:35:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 12:35:50 +0000
Subject: [pkgdb] maven-jxr had acl change status
Message-ID: <20090902123550.7D9BC10F89F@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on maven-jxr (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-jxr



From nphilipp at fedoraproject.org  Wed Sep  2 12:36:42 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 12:36:42 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.104, 1.105 sources,
	1.114, 1.115 system-config-date.spec, 1.122, 1.123
Message-ID: <20090902123642.245EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4413

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.2.46


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	1 Sep 2009 11:52:53 -0000	1.104
+++ .cvsignore	2 Sep 2009 12:36:41 -0000	1.105
@@ -1 +1 @@
-system-config-date-1.9.45.tar.bz2
+system-config-date-1.9.46.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	1 Sep 2009 11:52:53 -0000	1.114
+++ sources	2 Sep 2009 12:36:41 -0000	1.115
@@ -1 +1 @@
-39c4892be0d82e62d512cff1582dc7ab  system-config-date-1.9.45.tar.bz2
+774e286ff8503c4711da117ffac9ab93  system-config-date-1.9.46.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- system-config-date.spec	1 Sep 2009 11:52:53 -0000	1.122
+++ system-config-date.spec	2 Sep 2009 12:36:41 -0000	1.123
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.45
+Version: 1.9.46
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -39,6 +39,8 @@ BuildRequires: python
 Requires: libselinux-python
 Requires: ntp
 Requires: python >= 2.0
+Requires: python-slip >= 0.2.3
+Requires: pygtk2 >= 2.12.0
 Requires: pygtk2-libglade
 Requires: gnome-python2-canvas
 %if 0%{?with_console_util:1}
@@ -123,6 +125,13 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.46-1
+- use new gtk toolkit API
+
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com>
+- use slip.util.files.linkorcopyfile() (#512046)
+- initialize gettext correctly in all places
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.45-1
 - initialize gettext correctly
 



From hadess at fedoraproject.org  Wed Sep  2 12:38:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Sep 2009 12:38:09 +0000 (UTC)
Subject: rpms/gnome-user-share/devel .cvsignore, 1.19,
	1.20 gnome-user-share.spec, 1.57, 1.58 sources, 1.19,
	1.20 do-not-localize-realms.patch, 1.1, NONE
Message-ID: <20090902123809.9CDE911C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4966

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Removed Files:
	do-not-localize-realms.patch 
Log Message:
* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-1
- Update to 2.27.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Mar 2009 10:31:04 -0000	1.19
+++ .cvsignore	2 Sep 2009 12:38:09 -0000	1.20
@@ -1 +1 @@
-gnome-user-share-2.26.0.tar.bz2
+gnome-user-share-2.27.0.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gnome-user-share.spec	20 Aug 2009 12:00:00 -0000	1.57
+++ gnome-user-share.spec	2 Sep 2009 12:38:09 -0000	1.58
@@ -1,16 +1,13 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.26.0
-Release: 6%{?dist}
+Version: 2.27.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/2.26/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-user-share/2.27/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
-# Localized realm in the passwd file doesn't work
-# http://bugzilla.gnome.org/show_bug.cgi?id=586755
-Patch1: do-not-localize-realms.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -19,6 +16,7 @@ Requires: mod_dnssd
 BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6
+BuildRequires: gnome-bluetooth-libs-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
@@ -49,7 +47,6 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
-%patch1 -p1 -b .realm-localization
 
 %build
 %configure
@@ -127,6 +124,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-1
+- Update to 2.27.0
+
 * Thu Aug 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-6
 - Do not localize realm in passwd files (#500123)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Mar 2009 10:31:04 -0000	1.19
+++ sources	2 Sep 2009 12:38:09 -0000	1.20
@@ -1 +1 @@
-c99133b74a81a78ac0e4e10ef73fada7  gnome-user-share-2.26.0.tar.bz2
+6900aa1c9b2fcfbc6d89762063c37efa  gnome-user-share-2.27.0.tar.bz2


--- do-not-localize-realms.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep  2 12:42:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Sep 2009 12:42:14 +0000 (UTC)
Subject: rpms/xforms/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xforms.spec,
	1.29, 1.30
Message-ID: <20090902124214.1FBC811C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6194

Modified Files:
	.cvsignore sources xforms.spec 
Log Message:
* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.2.pre8
- xforms-1.0.92pre8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Aug 2009 15:39:45 -0000	1.5
+++ .cvsignore	2 Sep 2009 12:42:13 -0000	1.6
@@ -1,2 +1,2 @@
-xforms-1.0.92pre7.tar.gz
-xforms-1.0.92pre7.tar.gz.sig
+xforms-1.0.92pre8.tar.gz
+xforms-1.0.92pre8.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Aug 2009 15:39:45 -0000	1.5
+++ sources	2 Sep 2009 12:42:13 -0000	1.6
@@ -1,2 +1,2 @@
-fe7c0ecc94685e9eb6ebfffaaa1d6e01  xforms-1.0.92pre7.tar.gz
-101b7103709fc2964474c48af2367da4  xforms-1.0.92pre7.tar.gz.sig
+6f5092966b20f63acdc5c7e6c13436f3  xforms-1.0.92pre8.tar.gz
+3dc664cc57369f018af53079f49da016  xforms-1.0.92pre8.tar.gz.sig


Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xforms.spec	31 Aug 2009 19:47:16 -0000	1.29
+++ xforms.spec	2 Sep 2009 12:42:13 -0000	1.30
@@ -1,10 +1,10 @@
 
-%define pre pre7
+%define pre pre8
 
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.92
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.2.pre8
+- xforms-1.0.92pre8
+
 * Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.1.pre7
 - xforms-1.0.92pre7
 



From atkac at fedoraproject.org  Wed Sep  2 12:53:13 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed,  2 Sep 2009 12:53:13 +0000 (UTC)
Subject: rpms/swig/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 swig.spec,
	1.50, 1.51
Message-ID: <20090902125313.0734811C00E6@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/swig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9908

Modified Files:
	.cvsignore sources swig.spec 
Log Message:
- update to 1.3.40



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	30 Mar 2009 13:53:10 -0000	1.13
+++ .cvsignore	2 Sep 2009 12:53:12 -0000	1.14
@@ -1 +1 @@
-swig-1.3.39.tar.gz
+swig-1.3.40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Mar 2009 13:53:10 -0000	1.13
+++ sources	2 Sep 2009 12:53:12 -0000	1.14
@@ -1 +1 @@
-ac201d1b87f8659584534f9540d7ad24  swig-1.3.39.tar.gz
+2df766c9e03e02811b1ab4bba1c7b9cc  swig-1.3.40.tar.gz


Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- swig.spec	11 Aug 2009 12:22:49 -0000	1.50
+++ swig.spec	2 Sep 2009 12:53:12 -0000	1.51
@@ -3,8 +3,8 @@
 
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
-Version: 1.3.39
-Release: 4%{?dist}
+Version: 1.3.40
+Release: 1%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Doc Examples
 
 %changelog
+* Wed Sep 02 2009 Adam Tkac <atkac redhat com> 1.3.40-1
+- update to 1.3.40
+
 * Tue Aug 11 2009 Adam Tkac <atkac redhat com> 1.3.39-4
 - correct source URL
 



From nhorman at fedoraproject.org  Wed Sep  2 12:57:56 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Wed,  2 Sep 2009 12:57:56 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance.spec,1.62,1.63
Message-ID: <20090902125756.ABE5811C00E6@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11405

Modified Files:
	irqbalance.spec 
Log Message:
Updating buildrequires some more


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- irqbalance.spec	1 Sep 2009 23:59:01 -0000	1.62
+++ irqbalance.spec	2 Sep 2009 12:57:56 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	22%{?dist}
+Release:	23%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -11,7 +11,7 @@ Source1:	irqbalance.init
 Source2:	irqbalance.sysconfig
 Source3:	irqbalance.1
 Buildroot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	autoconf automake
+BuildRequires:	autoconf automake libtool
 Requires(post):	chkconfig
 Requires(postun):chkconfig
 Requires(preun):chkconfig
@@ -82,6 +82,9 @@ exit 0
 
 
 %changelog
+* Wed Sep 02 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-23
+- Fixing BuildRequires for new config script
+
 * Tue Sep 01 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-22
 - Fixing BuildRequires for new config script
 



From transif at fedoraproject.org  Wed Sep  2 13:18:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  2 Sep 2009 13:18:04 +0000 (UTC)
Subject: comps/po ml.po,1.20,1.21
Message-ID: <20090902131804.E116C11C00E6@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17537/po

Modified Files:
	ml.po 
Log Message:
Sending translation for Malayalam


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 ml.poIndex: ml.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ml.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ml.po	5 May 2009 10:44:37 -0000	1.20
+++ ml.po	2 Sep 2009 13:18:04 -0000	1.21
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 08:08+0000\n"
-"PO-Revision-Date: 2009-05-05 16:14+0530\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-02 11:49+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,279 +24,300 @@ msgstr ""
 "\n"
 "\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "?? ?????? ??????????? ??????? ?????????????????? ?????? ???????? ??????????? ???????????????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????????? ???????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "????????????? ???????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "???????????? ???????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ????????????????????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????? ???????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????????? ???????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????????? ???????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "????????? ???????????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????? ????????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ????????????? ?????????? ???????? ?????????? ???????."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "?????? ???????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????????? ???????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ???????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ???????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????????? ???????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ????????????? ???????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "??????????? ???????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????? ???????? ???????????? ??????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "???????????? ???????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "????????? ???????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "?????? ???????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1845 lines suppressed...]
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "?????? ??????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1381,7 +1490,8 @@ msgstr ""
 "32 ?????? ????????? ??????????????????? ???????? ???????? ??????????????, ?? ????????????, ????????????????? "
 "?????????? ??????????????? ???????. ?????? ?????????? ?????."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1389,15 +1499,18 @@ msgstr ""
 "?????????? CAML ????????????? ????????? ??????????? ????????????? ???????????????? "
 "??????????????????? ???????."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ???????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "?????? ???????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1405,23 +1518,84 @@ msgstr ""
 "???????????????? ???????????, ??????????? ???????, ???????? ???????????????? ???????????? ??? "
 "????????? ? ??????."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "????????????? ???????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??????? ??????????? ???????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "????? ?????????????? ?????????????? ???? ???????? ????????????? ????????????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"????? ?????? ???????????? ?????????????? ???? ???????????????? ???????? ??????????? "
+"????????????? ????????????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "???????????? ????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "?????? ??????????????????? ?????????????????? ???????????? ????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "?????????????? ???? (??????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "?????????????? ???? (?????)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "???????? ????????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "?????????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"??? ???????????????? ???????????? ????????????, ??????? ?????????? ??????????????? "
+"?? ?????????????? ????????????? ????????????????????????? ??? ??????????????? X11 ??????????? "
+"????????????????????? LXDE."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "?????? ?????? ?????????? ???????????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "????????? ??????????? ???????????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "NetBook/NetTop/MID ????????????????? ??????????? ?????????????????? Moblin."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ??????????????????????? ????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????? ????????????????? ???????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1429,7 +1603,7 @@ msgstr ""
 "??????, ?????????????, ???????? ??????????, ???????????? ???????? ????????????? ??????????? ??? ??????? "
 "???????????? ?????? ?????????????? ??? GNOME. "
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1437,7 +1611,7 @@ msgstr ""
 "??????, ?????????????, ???????? ??????????, ???????????? ???????? ????????????? ??????????? ??? ??????? "
 "???????????? ?????? ?????????????? ??? KDE. "
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1445,11 +1619,11 @@ msgstr ""
 "???????? ????????????????? ??????? ?????????????? ?????????????????? ????????????? ? ??????????????, "
 "?????????? ???????????? ?????? ?????????????????. Emacs??  Vi??? ??????? ??????????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ?????????? ?????????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1457,27 +1631,27 @@ msgstr ""
 "DocBook format??? ????????????????? ??????????????, ???? HTML, PDF, Postscript, text "
 "?????????????? ????????????? ??????????????? ? ??????????? ??????????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "???????? ???????????????????????? ??????????????? ???????????? ??? ???????? ? ??????."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "????????? ???????????????????? ???????????? ??????????? ???? ??? ???????? ? ??????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???????????????????? ???????????? ??????????? ???? ??? ???????? ? ??????."
 



From yaneti at fedoraproject.org  Wed Sep  2 13:24:49 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Wed,  2 Sep 2009 13:24:49 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-SMTP/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Client-SMTP.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090902132449.E88EC11C00E6@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/perl-POE-Component-Client-SMTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19769

Modified Files:
	.cvsignore perl-POE-Component-Client-SMTP.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-SMTP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Jun 2009 16:33:27 -0000	1.2
+++ .cvsignore	2 Sep 2009 13:24:49 -0000	1.3
@@ -1 +1,2 @@
 POE-Component-Client-SMTP-0.21.tar.gz
+POE-Component-Client-SMTP-0.22.tar.gz


Index: perl-POE-Component-Client-SMTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-SMTP/devel/perl-POE-Component-Client-SMTP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-POE-Component-Client-SMTP.spec	26 Jul 2009 13:57:19 -0000	1.3
+++ perl-POE-Component-Client-SMTP.spec	2 Sep 2009 13:24:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-SMTP
-Version:        0.21
-Release:        6%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Asynchronous mail sending with POE
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  2 2009 Yanko Kaneti <yaneti at declera.com> - 0.22-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-SMTP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jun 2009 16:33:27 -0000	1.2
+++ sources	2 Sep 2009 13:24:49 -0000	1.3
@@ -1 +1 @@
-442d3be44eb6c4417759eb419b003a73  POE-Component-Client-SMTP-0.21.tar.gz
+238b9f20a917fa27d65e1e5fb713cea6  POE-Component-Client-SMTP-0.22.tar.gz



From vcrhonek at fedoraproject.org  Wed Sep  2 13:31:02 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  2 Sep 2009 13:31:02 +0000 (UTC)
Subject: rpms/texinfo/devel texinfo.spec,1.63,1.64
Message-ID: <20090902133102.44D6B11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22509

Modified Files:
	texinfo.spec 
Log Message:
Fix errors installing texinfo/info with --excludedocs


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- texinfo.spec	12 Aug 2009 15:53:25 -0000	1.63
+++ texinfo.spec	2 Sep 2009 13:31:02 -0000	1.64
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -84,23 +84,31 @@ mv ChangeLog_utf8 ChangeLog
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/texinfo %{_infodir}/dir || :
+if [ -f %{_infodir}/texinfo ]; then # --excludedocs?
+    /sbin/install-info %{_infodir}/texinfo %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/texinfo %{_infodir}/dir || :
+    if [ -f %{_infodir}/texinfo ]; then # --excludedocs?
+        /sbin/install-info --delete %{_infodir}/texinfo %{_infodir}/dir || :
+    fi
 fi
 
 %post -n info
-/sbin/install-info %{_infodir}/info-stnd.info %{_infodir}/dir
+if [ -f %{_infodir}/info-stnd.info ]; then # --excludedocs?
+    /sbin/install-info %{_infodir}/info-stnd.info %{_infodir}/dir
+fi
 if [ -x /bin/sed ]; then
     /bin/sed -i '/^This is.*produced by makeinfo.*from/d' %{_infodir}/dir || :
 fi
 
 %preun -n info
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/info-stnd.info %{_infodir}/dir \
-    || :
+    if [ -f %{_infodir}/info-stnd.info ]; then # --excludedocs?
+        /sbin/install-info --delete %{_infodir}/info-stnd.info %{_infodir}/dir \
+        || :
+    fi
 fi
 
 %post tex
@@ -146,6 +154,11 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Sep  2 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-7
+- Fix errors installing texinfo/info with --excludedocs
+  Resolves: #515909
+  Resolves: #515938
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.13a-6
 - Use lzma compressed upstream tarball.
 



From kasal at fedoraproject.org  Wed Sep  2 13:32:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  2 Sep 2009 13:32:40 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-SMTP/devel .cvsignore,1.3,1.4
Message-ID: <20090902133240.405E611C008C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-SMTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22944

Modified Files:
	.cvsignore 
Log Message:
remove old tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-SMTP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Sep 2009 13:24:49 -0000	1.3
+++ .cvsignore	2 Sep 2009 13:32:40 -0000	1.4
@@ -1,2 +1 @@
-POE-Component-Client-SMTP-0.21.tar.gz
 POE-Component-Client-SMTP-0.22.tar.gz



From dwalsh at fedoraproject.org  Wed Sep  2 13:33:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  2 Sep 2009 13:33:15 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.70,
	1.71 selinux-policy.spec, 1.910, 1.911
Message-ID: <20090902133315.5BE0D11C008C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-2
- Dontaudit setroubleshootfix looking at /root directory


policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  289 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  302 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   23 
 policy/modules/kernel/corecommands.fc     |   24 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  124 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   60 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   12 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   76 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  307 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  157 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1396 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 312 files changed, 14610 insertions(+), 2938 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- policy-F12.patch	31 Aug 2009 21:27:50 -0000	1.70
+++ policy-F12.patch	2 Sep 2009 13:33:14 -0000	1.71
@@ -2717,8 +2717,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.30/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/apps/nsplugin.te	2009-08-31 13:40:47.000000000 -0400
-@@ -0,0 +1,288 @@
++++ serefpolicy-3.6.30/policy/modules/apps/nsplugin.te	2009-09-01 08:48:07.000000000 -0400
+@@ -0,0 +1,289 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -2828,6 +2828,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_write_video_dev(nsplugin_t)
 +dev_getattr_dri_dev(nsplugin_t)
 +dev_rwx_zero(nsplugin_t)
++dev_search_sysfs(nsplugin_t)
 +
 +kernel_read_kernel_sysctls(nsplugin_t)
 +kernel_read_system_state(nsplugin_t)
@@ -3489,7 +3490,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.te serefpolicy-3.6.30/policy/modules/apps/sambagui.te
 --- nsaserefpolicy/policy/modules/apps/sambagui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/apps/sambagui.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/apps/sambagui.te	2009-08-31 17:31:25.000000000 -0400
 @@ -0,0 +1,56 @@
 +policy_module(sambagui,1.0.0)
 +
@@ -16519,7 +16520,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te	2009-08-31 15:21:51.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te	2009-08-31 17:31:34.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -16581,7 +16582,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,68 @@
+@@ -94,23 +113,70 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -16643,6 +16644,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(setroubleshoot_fixit_t)
 +
++userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
++
 +optional_policy(`
 +	rpm_read_db(setroubleshoot_fixit_t)
 +')
@@ -22489,7 +22492,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.30/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/libraries.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/libraries.fc	2009-09-01 08:55:51.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -22679,7 +22682,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +296,91 @@
+@@ -307,10 +296,94 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -22732,6 +22735,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/lib(64)?/midori/.*\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
++/usr/lib(64)?/libav.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
 +ifdef(`fixed',`
 +/usr/lib(64)?/libavfilter\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libavdevice\.so.*	 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22766,7 +22773,6 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/httpd/modules/libphp5\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -25944,7 +25950,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.30/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/userdomain.if	2009-08-31 15:27:09.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/userdomain.if	2009-09-01 07:40:59.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -26839,7 +26845,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +939,78 @@
+@@ -865,51 +939,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26871,6 +26877,9 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_read_rand($1_usertype)
  
 -	logging_send_syslog_msg($1_t)
++	dev_read_video_dev($1_usertype)
++	dev_write_video_dev($1_usertype)
++
 +	logging_send_syslog_msg($1_usertype)
  	logging_dontaudit_send_audit_msgs($1_t)
  
@@ -26931,7 +26940,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1044,8 @@
+@@ -943,8 +1047,8 @@
  	# Declarations
  	#
  
@@ -26941,7 +26950,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1054,12 @@
+@@ -953,11 +1057,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26956,7 +26965,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1077,53 @@
+@@ -975,36 +1080,53 @@
  		')
  	')
  
@@ -27024,7 +27033,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1159,7 @@
+@@ -1040,7 +1162,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -27033,7 +27042,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1168,7 @@
+@@ -1049,8 +1171,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -27043,7 +27052,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1193,9 @@
+@@ -1075,6 +1196,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -27053,7 +27062,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1210,7 @@
+@@ -1089,6 +1213,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -27061,7 +27070,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1218,6 @@
+@@ -1096,8 +1221,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27070,7 +27079,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1244,7 @@
+@@ -1124,6 +1247,7 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -27078,7 +27087,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1273,6 @@
+@@ -1152,20 +1276,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27099,7 +27108,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1318,7 @@
+@@ -1211,6 +1321,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27107,7 +27116,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1384,15 @@
+@@ -1276,11 +1387,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27123,7 +27132,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1503,13 @@
+@@ -1391,12 +1506,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -27138,7 +27147,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1542,14 @@
+@@ -1429,6 +1545,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27153,7 +27162,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1565,11 @@
+@@ -1444,9 +1568,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27165,7 +27174,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1626,25 @@
+@@ -1503,6 +1629,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27191,7 +27200,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1719,8 @@
+@@ -1577,6 +1722,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27200,7 +27209,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1814,7 @@
+@@ -1670,6 +1817,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27208,7 +27217,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1942,32 @@
+@@ -1797,19 +1945,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -27248,7 +27257,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2002,7 @@
+@@ -1844,6 +2005,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -27256,7 +27265,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2550,7 @@
+@@ -2391,27 +2553,7 @@
  
  ########################################
  ## <summary>
@@ -27285,7 +27294,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2904,32 @@
+@@ -2765,11 +2907,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27320,7 +27329,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3057,25 @@
+@@ -2897,7 +3060,25 @@
  		type user_tmp_t;
  	')
  
@@ -27347,7 +27356,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3112,7 @@
+@@ -2934,6 +3115,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27355,7 +27364,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3243,559 @@
+@@ -3064,3 +3246,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -p -r1.910 -r1.911
--- selinux-policy.spec	31 Aug 2009 21:27:50 -0000	1.910
+++ selinux-policy.spec	2 Sep 2009 13:33:15 -0000	1.911
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-2
+- Dontaudit setroubleshootfix looking at /root directory
+
 * Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-1
 - Update to upsteam
 



From rdieter at fedoraproject.org  Wed Sep  2 13:39:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Sep 2009 13:39:44 +0000 (UTC)
Subject: rpms/digikam/devel .cvsignore, 1.35, 1.36 digikam.spec, 1.95,
	1.96 sources, 1.35, 1.36
Message-ID: <20090902133944.A94C111C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25996

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
- digikam-1.0.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	24 Jul 2009 12:08:54 -0000	1.35
+++ .cvsignore	2 Sep 2009 13:39:44 -0000	1.36
@@ -1 +1 @@
-digikam-1.0.0-beta3.tar.bz2
+digikam-1.0.0-beta4.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- digikam.spec	5 Aug 2009 17:27:58 -0000	1.95
+++ digikam.spec	2 Sep 2009 13:39:44 -0000	1.96
@@ -1,9 +1,9 @@
 
-%define pre beta3
+%define pre beta4
 
 Name:	 digikam
 Version: 1.0.0
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -154,6 +154,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
+- digikam-1.0.0-beta4
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.4.beta3
 - drop xdg-utils references 
 - tighten -libs related deps via %%{?_isa}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	24 Jul 2009 12:08:54 -0000	1.35
+++ sources	2 Sep 2009 13:39:44 -0000	1.36
@@ -1 +1 @@
-937f6f1f109e8137dad8f1b59f009891  digikam-1.0.0-beta3.tar.bz2
+c25f02080f5524570768e567daed91c8  digikam-1.0.0-beta4.tar.bz2



From davej at fedoraproject.org  Wed Sep  2 13:40:44 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  2 Sep 2009 13:40:44 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1759,1.1760
Message-ID: <20090902134044.5150611C008C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26456

Modified Files:
	kernel.spec 
Log Message:
Add missing scriptlet dependancy. (#520788)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1759
retrieving revision 1.1760
diff -u -p -r1.1759 -r1.1760
--- kernel.spec	1 Sep 2009 21:14:08 -0000	1.1759
+++ kernel.spec	2 Sep 2009 13:40:43 -0000	1.1760
@@ -430,7 +430,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, grubby >= 7.0.2-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.2-1
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -446,6 +446,8 @@ Provides: kernel-drm-nouveau = 15\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
+Requires(post): /sbin/new-kernel-pkg\
+Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
 Conflicts: %{package_conflicts}\
 %{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\
@@ -2007,6 +2009,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 02 2009 Dave Jones <davej at redhat.com>
+- Add missing scriptlet dependancy. (#520788)
+
 * Tue Sep 01 2009 Adam Jackson <ajax at redhat.com>
 - Make DRM less chatty about EDID failures.  No one cares.
 



From pfj at fedoraproject.org  Wed Sep  2 13:42:46 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed,  2 Sep 2009 13:42:46 +0000 (UTC)
Subject: rpms/xmms/devel xmms-play.patch, NONE, 1.1 import.log, 1.3,
	1.4 xmms.spec, 1.41, 1.42
Message-ID: <20090902134246.04D7711C008C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26942/devel

Modified Files:
	import.log xmms.spec 
Added Files:
	xmms-play.patch 
Log Message:

Fixes play on double click bug (BZ 434692) 


xmms-play.patch:
 xmms.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xmms-play.patch ---
--- xmms-1.2.11-20071117cvs/xmms/xmms.desktop	2002-02-11 23:15:56.000000000 +0000
+++ xmms-1.2.11-20071117cvs/xmms/xmms.desktop-new	2009-09-02 14:19:57.000000000 +0100
@@ -14,7 +14,7 @@
 comment[tr]=X Multimedya Sistem
 comment[zh_TW]=X ?h?C???t??
 Encoding=Legacy-Mixed
-Exec=xmms
+Exec=xmms -e -p %F
 Icon=xmms_mini.xpm
 MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
 Terminal=0


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Nov 2008 15:03:56 -0000	1.3
+++ import.log	2 Sep 2009 13:42:45 -0000	1.4
@@ -1,3 +1,4 @@
 xmms-1_2_11-1_20071117cvs_fc10:HEAD:xmms-1.2.11-1.20071117cvs.fc10.src.rpm:1220391799
 xmms-1_2_11-1_20071117cvs_1_fc10:HEAD:xmms-1.2.11-1.20071117cvs.1.fc10.src.rpm:1221173377
 xmms-1_2_11-3_20071117cvs_fc11:HEAD:xmms-1.2.11-3.20071117cvs.fc11.src.rpm:1227970982
+xmms-1_2_11-7_20071117cvs_fc12:HEAD:xmms-1.2.11-7.20071117cvs.fc12.src.rpm:1251898922


Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- xmms.spec	27 Jul 2009 08:14:03 -0000	1.41
+++ xmms.spec	2 Sep 2009 13:42:45 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        6.20071117cvs%{?dist}
+Release:        7.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -25,6 +25,7 @@ Patch6:         %{name}-1.2.11-alsalib.p
 Patch7:         %{name}-cd-mountpoint.patch
 # Patch8 on top of patch4
 Patch8:         %{name}-1.2.11-multilib.patch
+Patch9:		%{name}-play.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
 Patch14:	%{name}-1.2.10-configfile-safe-write.patch
@@ -107,6 +108,7 @@ Files needed for building plug-ins for t
 # Randomize playlists better
 %patch14 -p1
 %patch15 -p1
+%patch9 -p1 -b .playonclick
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -218,6 +220,9 @@ update-desktop-database -q || :
 
 
 %changelog
+* Wed Sep 02 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1:1.2.11-7.20071117cvs
+- Fix play on click bug (BZ434692)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.11-6.20071117cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pfj at fedoraproject.org  Wed Sep  2 13:44:10 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed,  2 Sep 2009 13:44:10 +0000 (UTC)
Subject: rpms/xmms/F-11 xmms-play.patch, NONE, 1.1 import.log, 1.3,
	1.4 xmms.spec, 1.40, 1.41
Message-ID: <20090902134410.AB3ED11C008C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xmms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27466/F-11

Modified Files:
	import.log xmms.spec 
Added Files:
	xmms-play.patch 
Log Message:

Fixes play on double click bug (BZ 434692) 


xmms-play.patch:
 xmms.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xmms-play.patch ---
--- xmms-1.2.11-20071117cvs/xmms/xmms.desktop	2002-02-11 23:15:56.000000000 +0000
+++ xmms-1.2.11-20071117cvs/xmms/xmms.desktop-new	2009-09-02 14:19:57.000000000 +0100
@@ -14,7 +14,7 @@
 comment[tr]=X Multimedya Sistem
 comment[zh_TW]=X ?h?C???t??
 Encoding=Legacy-Mixed
-Exec=xmms
+Exec=xmms -e -p %F
 Icon=xmms_mini.xpm
 MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
 Terminal=0


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Nov 2008 15:03:56 -0000	1.3
+++ import.log	2 Sep 2009 13:44:10 -0000	1.4
@@ -1,3 +1,4 @@
 xmms-1_2_11-1_20071117cvs_fc10:HEAD:xmms-1.2.11-1.20071117cvs.fc10.src.rpm:1220391799
 xmms-1_2_11-1_20071117cvs_1_fc10:HEAD:xmms-1.2.11-1.20071117cvs.1.fc10.src.rpm:1221173377
 xmms-1_2_11-3_20071117cvs_fc11:HEAD:xmms-1.2.11-3.20071117cvs.fc11.src.rpm:1227970982
+xmms-1_2_11-7_20071117cvs_fc12:F-11:xmms-1.2.11-7.20071117cvs.fc12.src.rpm:1251899008


Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-11/xmms.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xmms.spec	12 Apr 2009 15:58:08 -0000	1.40
+++ xmms.spec	2 Sep 2009 13:44:10 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        5.20071117cvs%{?dist}
+Release:        7.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -25,6 +25,7 @@ Patch6:         %{name}-1.2.11-alsalib.p
 Patch7:         %{name}-cd-mountpoint.patch
 # Patch8 on top of patch4
 Patch8:         %{name}-1.2.11-multilib.patch
+Patch9:		%{name}-play.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
 Patch14:	%{name}-1.2.10-configfile-safe-write.patch
@@ -107,6 +108,7 @@ Files needed for building plug-ins for t
 # Randomize playlists better
 %patch14 -p1
 %patch15 -p1
+%patch9 -p1 -b .playonclick
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -218,6 +220,12 @@ update-desktop-database -q || :
 
 
 %changelog
+* Wed Sep 02 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1:1.2.11-7.20071117cvs
+- Fix play on click bug (BZ434692)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.11-6.20071117cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-5.20071117cvs
 - Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
 



From mgrepl at fedoraproject.org  Wed Sep  2 13:44:38 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed,  2 Sep 2009 13:44:38 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.903,1.904
Message-ID: <20090902134438.E8EE211C008C@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27675

Modified Files:
	selinux-policy.spec 
Log Message:
- Allow gssd to send signals to users
- Allow fsdaemon_t setpcap capability




Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -p -r1.903 -r1.904
--- selinux-policy.spec	27 Aug 2009 13:41:22 -0000	1.903
+++ selinux-policy.spec	2 Sep 2009 13:44:38 -0000	1.904
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 81%{?dist}
+Release: 82%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,6 +442,10 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 2 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-82
+- Allow gssd to send signals to users
+- Allow fsdaemon_t setpcap capability
+
 * Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-81
 - Turn back on unconfineduser and unconfined domains
 



From apevec at fedoraproject.org  Wed Sep  2 13:45:01 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed,  2 Sep 2009 13:45:01 +0000 (UTC)
Subject: rpms/collectd/devel .cvsignore, 1.8, 1.9 collectd.spec, 1.23,
	1.24 sources, 1.8, 1.9
Message-ID: <20090902134501.3BF5911C008C@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27780

Modified Files:
	.cvsignore collectd.spec sources 
Log Message:
* Wed Sep 02 2009 Alan Pevec <apevec at redhat.com> 4.6.4-1
- fix condrestart: on upgrade collectd is not restarted, bz# 516273
- collectd does not re-connect to libvirtd, bz# 480997
- fix unpackaged files https://bugzilla.redhat.com/show_bug.cgi?id=516276#c4
- New upstream version 4.6.4
  http://collectd.org/news.shtml#news69




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 May 2009 10:40:50 -0000	1.8
+++ .cvsignore	2 Sep 2009 13:45:01 -0000	1.9
@@ -1,2 +1 @@
-collectd-4.5.3.tar.bz2
-collectd-4.6.2.tar.bz2
+collectd-4.6.4.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- collectd.spec	21 Aug 2009 12:48:55 -0000	1.23
+++ collectd.spec	2 Sep 2009 13:45:01 -0000	1.24
@@ -1,15 +1,19 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.6.2
-Release: 5%{?dist}
+Version: 4.6.4
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
 
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
-Patch0: %{name}-%{version}-include-collectd.d.patch
+Patch0: %{name}-4.6.2-include-collectd.d.patch
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
-Patch1: %{name}-%{version}-configure-OpenIPMI.patch
+Patch1: %{name}-4.6.2-configure-OpenIPMI.patch
+# bug 516273 on upgrade collectd is not restarted
+Patch2: %{name}-4.5.4-fix-condrestart.patch
+# bug 480997 collectd does not re-connect to libvirtd
+Patch3: %{name}-4.5.4-libvirt-reconnect.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -151,6 +155,8 @@ This plugin collects information from vi
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
+%patch3 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -221,7 +227,7 @@ done
 
 
 # *.la files shouldn't be distributed.
-rm -f %{buildroot}/%{_libdir}/collectd/*.la
+rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
 
 
 %post
@@ -310,6 +316,24 @@ fi
 %{_libdir}/collectd/wireless.so
 %{_datadir}/collectd/types.db
 
+%{_libdir}/collectd/bind.so
+%{_libdir}/collectd/curl.so
+%{_libdir}/collectd/match_regex.so
+%{_libdir}/collectd/match_timediff.so
+%{_libdir}/collectd/match_value.so
+%{_libdir}/collectd/openvpn.so
+%{_libdir}/collectd/target_notification.so
+%{_libdir}/collectd/target_replace.so
+%{_libdir}/collectd/target_set.so
+
+# collectdclient - TBD reintroduce -devel subpackage?
+%{_libdir}/libcollectdclient.so
+%{_libdir}/libcollectdclient.so.0
+%{_libdir}/libcollectdclient.so.0.0.0
+%{_libdir}/pkgconfig/libcollectdclient.pc
+%{_includedir}/collectd/client.h
+%{_includedir}/collectd/lcc_features.h
+
 %doc AUTHORS ChangeLog COPYING INSTALL README
 %doc %{_mandir}/man1/collectd.1*
 %doc %{_mandir}/man1/collectd-nagios.1*
@@ -407,6 +431,13 @@ fi
 
 
 %changelog
+* Wed Sep 02 2009 Alan Pevec <apevec at redhat.com> 4.6.4-1
+- fix condrestart: on upgrade collectd is not restarted, bz# 516273
+- collectd does not re-connect to libvirtd, bz# 480997
+- fix unpackaged files https://bugzilla.redhat.com/show_bug.cgi?id=516276#c4
+- New upstream version 4.6.4
+  http://collectd.org/news.shtml#news69
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.6.2-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 May 2009 10:40:50 -0000	1.8
+++ sources	2 Sep 2009 13:45:01 -0000	1.9
@@ -1,2 +1 @@
-f368200c4bedd64baba46094906e81ee  collectd-4.5.3.tar.bz2
-ca1282372f15882ce07fdff6c61340d5  collectd-4.6.2.tar.bz2
+f4a1b16c57ba946d24c0db910febb950  collectd-4.6.4.tar.bz2



From caolanm at fedoraproject.org  Wed Sep  2 13:45:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Sep 2009 13:45:41 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 workspace.os131.patch,1.2,1.3
Message-ID: <20090902134541.B1B6511C008C@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-serv28045/F-10

Modified Files:
	workspace.os131.patch 
Log Message:
Resolves: rhbz#520772 copy/paste cockup

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  384 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/swserv.cxx         |    7 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/acorrect.cxx      |    2 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |  239 +++++++++--------------
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 27 files changed, 612 insertions(+), 225 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.os131.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.os131.patch	1 Sep 2009 15:01:51 -0000	1.2
+++ workspace.os131.patch	2 Sep 2009 13:45:41 -0000	1.3
@@ -1,8 +1,8 @@
 Index: sw/source/filter/xml/xmltbli.cxx
 ===================================================================
---- sw/source/filter/xml/xmltbli.cxx	(revision 272643)
-+++ sw/source/filter/xml/xmltbli.cxx	(revision 272644)
-@@ -662,7 +662,7 @@
+--- sw/source/filter/xml/xmltbli.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/filter/xml/xmltbli.cxx	(.../cws/os131)	(revision 275705)
+@@ -667,7 +667,7 @@
  					SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
  								   *pSrcPaM->GetMark() );
  					SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
@@ -13,8 +13,8 @@ Index: sw/source/filter/xml/xmltbli.cxx
  				}
 Index: sw/source/filter/ww8/ww8glsy.cxx
 ===================================================================
---- sw/source/filter/ww8/ww8glsy.cxx	(revision 272643)
-+++ sw/source/filter/ww8/ww8glsy.cxx	(revision 272644)
+--- sw/source/filter/ww8/ww8glsy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/filter/ww8/ww8glsy.cxx	(.../cws/os131)	(revision 275705)
 @@ -187,7 +187,7 @@
                          -1 );
                      pCNd = aIdx.GetNode().GetCntntNode();
@@ -26,8 +26,8 @@ Index: sw/source/filter/ww8/ww8glsy.cxx
              }
 Index: sw/source/core/frmedt/fecopy.cxx
 ===================================================================
---- sw/source/core/frmedt/fecopy.cxx	(revision 272643)
-+++ sw/source/core/frmedt/fecopy.cxx	(revision 272644)
+--- sw/source/core/frmedt/fecopy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/frmedt/fecopy.cxx	(.../cws/os131)	(revision 275705)
 @@ -840,7 +840,7 @@
              {
                  SwNodeIndex aIndexBefore(rInsPos.nNode);
@@ -48,8 +48,8 @@ Index: sw/source/core/frmedt/fecopy.cxx
                      aIndexBefore++;
 Index: sw/source/core/txtnode/atrftn.cxx
 ===================================================================
---- sw/source/core/txtnode/atrftn.cxx	(revision 272643)
-+++ sw/source/core/txtnode/atrftn.cxx	(revision 272644)
+--- sw/source/core/txtnode/atrftn.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/txtnode/atrftn.cxx	(.../cws/os131)	(revision 275705)
 @@ -303,7 +303,7 @@
  		SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
  		ULONG  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
@@ -61,8 +61,8 @@ Index: sw/source/core/txtnode/atrftn.cxx
  		// Nodes geloescht werden:
 Index: sw/source/core/edit/edglss.cxx
 ===================================================================
---- sw/source/core/edit/edglss.cxx	(revision 272643)
-+++ sw/source/core/edit/edglss.cxx	(revision 272644)
+--- sw/source/core/edit/edglss.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/edglss.cxx	(.../cws/os131)	(revision 275705)
 @@ -168,7 +168,7 @@
  			aStt = pGDoc->GetNodes().GetEndOfExtras();
  			pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
@@ -84,14 +84,27 @@ Index: sw/source/core/edit/edglss.cxx
  			}
  			else
 -				bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
-+                bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
++                bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
  
  		FOREACHPAM_END()
          }
+Index: sw/source/core/edit/acorrect.cxx
+===================================================================
+--- sw/source/core/edit/acorrect.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/acorrect.cxx	(.../cws/os131)	(revision 275705)
+@@ -374,7 +374,7 @@
+ 				SwDontExpandItem aExpItem;
+ 				aExpItem.SaveDontExpandItems( *aPam.GetPoint() );
+ 
+-				pAutoDoc->Copy( aCpyPam, *aPam.GetPoint() );
++                pAutoDoc->Copy( aCpyPam, *aPam.GetPoint(), false );
+ 
+ 				aExpItem.RestoreDontExpandItems( *aPam.GetPoint() );
+ 
 Index: sw/source/core/edit/eddel.cxx
 ===================================================================
---- sw/source/core/edit/eddel.cxx	(revision 272643)
-+++ sw/source/core/edit/eddel.cxx	(revision 272644)
+--- sw/source/core/edit/eddel.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/eddel.cxx	(.../cws/os131)	(revision 275705)
 @@ -253,7 +253,7 @@
  			bFirstMove = FALSE;
  		}
@@ -103,8 +116,8 @@ Index: sw/source/core/edit/eddel.cxx
          SwPaM aInsertPaM(*pPos, aSttNdIdx);
 Index: sw/source/core/doc/docnew.cxx
 ===================================================================
---- sw/source/core/doc/docnew.cxx	(revision 272643)
-+++ sw/source/core/doc/docnew.cxx	(revision 272644)
+--- sw/source/core/doc/docnew.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docnew.cxx	(.../cws/os131)	(revision 275705)
 @@ -32,6 +32,7 @@
  #include "precompiled_sw.hxx"
  #define ROLBCK_HISTORY_ONLY 	// Der Kampf gegen die CLOOK's
@@ -147,12 +160,13 @@ Index: sw/source/core/doc/docnew.cxx
  #include <drawdoc.hxx>
  #include <linkenum.hxx>
  #include <fldupde.hxx>
-@@ -105,12 +97,10 @@
+@@ -105,13 +97,11 @@
  #include <istyleaccess.hxx>
  #include <swstylemanager.hxx>
  #include <IGrammarContact.hxx>
--
 +#include <tblsel.hxx>
+ #include <MarkManager.hxx>
+-
  #include <unochart.hxx>
  
 -#ifndef _CMDID_H
@@ -161,7 +175,7 @@ Index: sw/source/core/doc/docnew.cxx
  
  
  // --> OD 2006-04-19 #b6375613#
-@@ -1056,3 +1046,370 @@
+@@ -1049,3 +1039,369 @@
      }
  }
  // <--
@@ -195,8 +209,8 @@ Index: sw/source/core/doc/docnew.cxx
 +    {
 +        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
 +        {
-+            const SfxPoolItem& rSourceAttr = aAttrPool.GetDefaultItem( nWhich );
-+            if( rSourceAttr != pRet->aAttrPool.GetDefaultItem( nWhich ) )
++            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
++            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
 +                aNewDefaults.Put( rSourceAttr );
 +        }
 +        nRange += 2;
@@ -472,7 +486,6 @@ Index: sw/source/core/doc/docnew.cxx
 +    aCpyPam.SetMark();
 +    aCpyPam.Move( fnMoveForward, fnGoDoc );
 +
-+    BOOL bRet = TRUE, bDelTbl = TRUE;
 +    this->StartUndo( UNDO_INSGLOSSARY, NULL );
 +    this->LockExpFlds();
 +
@@ -534,8 +547,8 @@ Index: sw/source/core/doc/docnew.cxx
 +}
 Index: sw/source/core/doc/doccomp.cxx
 ===================================================================
---- sw/source/core/doc/doccomp.cxx	(revision 272643)
-+++ sw/source/core/doc/doccomp.cxx	(revision 272644)
+--- sw/source/core/doc/doccomp.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/doccomp.cxx	(.../cws/os131)	(revision 275705)
 @@ -1196,7 +1196,7 @@
  					SwPaM aCpyPam( rSrcNd, nStt );
  					aCpyPam.SetMark();
@@ -565,8 +578,8 @@ Index: sw/source/core/doc/doccomp.cxx
  		pDoc->DoUndo( bUndo );
 Index: sw/source/core/doc/docnum.cxx
 ===================================================================
---- sw/source/core/doc/docnum.cxx	(revision 272643)
-+++ sw/source/core/doc/docnum.cxx	(revision 272644)
+--- sw/source/core/doc/docnum.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docnum.cxx	(.../cws/os131)	(revision 275705)
 @@ -2273,7 +2273,7 @@
                  }
              }
@@ -578,8 +591,8 @@ Index: sw/source/core/doc/docnum.cxx
  				// dann muss der letzte leere Node wieder entfernt werden
 Index: sw/source/core/doc/docredln.cxx
 ===================================================================
---- sw/source/core/doc/docredln.cxx	(revision 272643)
-+++ sw/source/core/doc/docredln.cxx	(revision 272644)
+--- sw/source/core/doc/docredln.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docredln.cxx	(.../cws/os131)	(revision 275705)
 @@ -3418,7 +3418,7 @@
  			SwNodeIndex aNdIdx( *pSttNd, 1 );
  			SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
@@ -607,8 +620,8 @@ Index: sw/source/core/doc/docredln.cxx
  		pCntntSect = new SwNodeIndex( *pSttNd );
 Index: sw/source/core/doc/docglos.cxx
 ===================================================================
---- sw/source/core/doc/docglos.cxx	(revision 272643)
-+++ sw/source/core/doc/docglos.cxx	(revision 272644)
+--- sw/source/core/doc/docglos.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docglos.cxx	(.../cws/os131)	(revision 275705)
 @@ -183,7 +183,7 @@
                  SwDontExpandItem aACD;
  				aACD.SaveDontExpandItems( rInsPos );
@@ -620,8 +633,8 @@ Index: sw/source/core/doc/docglos.cxx
  				if( pShell )
 Index: sw/source/core/doc/tblcpy.cxx
 ===================================================================
---- sw/source/core/doc/tblcpy.cxx	(revision 272643)
-+++ sw/source/core/doc/tblcpy.cxx	(revision 272644)
+--- sw/source/core/doc/tblcpy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/tblcpy.cxx	(.../cws/os131)	(revision 275705)
 @@ -567,7 +567,7 @@
  
  	SwNodeIndex aSavePos( aInsIdx, -1 );
@@ -633,8 +646,8 @@ Index: sw/source/core/doc/tblcpy.cxx
  	aSavePos++;
 Index: sw/source/core/doc/docglbl.cxx
 ===================================================================
---- sw/source/core/doc/docglbl.cxx	(revision 272643)
-+++ sw/source/core/doc/docglbl.cxx	(revision 272644)
+--- sw/source/core/doc/docglbl.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docglbl.cxx	(.../cws/os131)	(revision 275705)
 @@ -307,7 +307,7 @@
  						pDoc->GetNodes().Delete( aIdx, 1 );
  
@@ -644,10 +657,19 @@ Index: sw/source/core/doc/docglbl.cxx
  
  
  					// und noch alle Bookmarks
+@@ -653,7 +653,7 @@
+ 						pDoc->GetNodes().Delete( aIdx, 1 );
+ 
+ 					// alle Flys in dem Bereich
+-					_CopyFlyInFly( aRg, aIdx );
++                    _CopyFlyInFly( aRg, 0, aIdx );
+ 
+ 
+ 					// und noch alle Bookmarks
 Index: sw/source/core/doc/tblrwcl.cxx
 ===================================================================
---- sw/source/core/doc/tblrwcl.cxx	(revision 272643)
-+++ sw/source/core/doc/tblrwcl.cxx	(revision 272644)
+--- sw/source/core/doc/tblrwcl.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/tblrwcl.cxx	(.../cws/os131)	(revision 275705)
 @@ -2103,7 +2103,7 @@
                              *rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
                  SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
@@ -657,10 +679,29 @@ Index: sw/source/core/doc/tblrwcl.cxx
                  // den initialen TextNode loeschen
                  pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
              }
+Index: sw/source/core/doc/swserv.cxx
+===================================================================
+--- sw/source/core/doc/swserv.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/swserv.cxx	(.../cws/os131)	(revision 275705)
+@@ -299,9 +299,12 @@
+     if(eType == BOOKMARK_SERVER && CNTNT_TYPE.pBkmk)
+     {
+         ::sw::mark::DdeBookmark* const pDdeBookmark = dynamic_cast< ::sw::mark::DdeBookmark* >(CNTNT_TYPE.pBkmk);
+-        if(pDdeBookmark) pDdeBookmark->SetRefObject(NULL);
++        if(pDdeBookmark) 
++		{
++            CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
++			pDdeBookmark->SetRefObject(NULL);
++		}
+     }
+-    CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
+ }
+ 
+ void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark)
 Index: sw/source/core/doc/doclay.cxx
 ===================================================================
---- sw/source/core/doc/doclay.cxx	(revision 272643)
-+++ sw/source/core/doc/doclay.cxx	(revision 272644)
+--- sw/source/core/doc/doclay.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/doclay.cxx	(.../cws/os131)	(revision 275705)
 @@ -507,7 +507,7 @@
  
  		// sorge dafuer das auch Fly's in Fly's kopiert werden
@@ -681,9 +722,9 @@ Index: sw/source/core/doc/doclay.cxx
  				mbUndo = bOldUndo;
 Index: sw/source/core/doc/docfmt.cxx
 ===================================================================
---- sw/source/core/doc/docfmt.cxx	(revision 272643)
-+++ sw/source/core/doc/docfmt.cxx	(revision 272644)
-@@ -2126,7 +2126,7 @@
+--- sw/source/core/doc/docfmt.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docfmt.cxx	(.../cws/os131)	(revision 275705)
+@@ -2136,7 +2136,7 @@
  				aTmpIdx = *pSttNd->EndOfSectionNode();
  				rSrcNds._Copy( aRg, aTmpIdx );
  				aTmpIdx = *pSttNd;
@@ -694,8 +735,8 @@ Index: sw/source/core/doc/docfmt.cxx
  			else
 Index: sw/source/core/undo/untblk.cxx
 ===================================================================
---- sw/source/core/undo/untblk.cxx	(revision 272643)
-+++ sw/source/core/undo/untblk.cxx	(revision 272644)
+--- sw/source/core/undo/untblk.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/undo/untblk.cxx	(.../cws/os131)	(revision 275705)
 @@ -346,7 +346,7 @@
  
  	SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
@@ -707,9 +748,9 @@ Index: sw/source/core/undo/untblk.cxx
  }
 Index: sw/source/core/docnode/ndcopy.cxx
 ===================================================================
---- sw/source/core/docnode/ndcopy.cxx	(revision 272643)
-+++ sw/source/core/docnode/ndcopy.cxx	(revision 272644)
-@@ -659,7 +659,7 @@
+--- sw/source/core/docnode/ndcopy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/docnode/ndcopy.cxx	(.../cws/os131)	(revision 275705)
+@@ -670,7 +670,7 @@
  
  // Kopieren eines Bereiches im oder in ein anderes Dokument !
  
@@ -718,7 +759,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  {
  	const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
  
-@@ -698,13 +698,13 @@
+@@ -709,13 +709,13 @@
  	BOOL bRet = FALSE;
  
  	if( pDoc != this )
@@ -734,7 +775,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  	else
  	{
-@@ -728,7 +728,7 @@
+@@ -739,7 +739,7 @@
  		SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
  								SwNodeIndex( GetNodes().GetEndOfAutotext() ));
  		aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
@@ -743,7 +784,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  		aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
  		aPam.SetMark();
-@@ -803,7 +803,7 @@
+@@ -814,7 +814,7 @@
  }
  
  BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
@@ -752,7 +793,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  {
  	SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
      bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
-@@ -1087,7 +1087,7 @@
+@@ -1098,7 +1098,7 @@
  			}
  		}
  
@@ -761,7 +802,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  		{
  			SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
              if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
-@@ -1102,13 +1102,13 @@
+@@ -1113,13 +1113,13 @@
  			if( aInsPos == pEnd->nNode )
  			{
  				SwNodeIndex aSaveIdx( aInsPos, -1 );
@@ -777,7 +818,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  			bCopyBookmarks = FALSE;
  
-@@ -1167,7 +1167,7 @@
+@@ -1178,7 +1178,7 @@
  
  //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
  
@@ -786,7 +827,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  							const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
  							BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
  {
-@@ -1206,7 +1206,7 @@
+@@ -1217,7 +1217,7 @@
  	// Undo abschalten
  	BOOL bUndo = pDest->DoesUndo();
  	pDest->DoUndo( FALSE );
@@ -795,7 +836,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  	pDest->DoUndo( bUndo );
  
  	SwNodeRange aCpyRange( aSavePos, rInsPos );
-@@ -1242,7 +1242,7 @@
+@@ -1253,7 +1253,7 @@
  	}
  }
  
@@ -804,7 +845,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  							BOOL bCopyFlyAtFly ) const
  {
  	// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
-@@ -1259,7 +1259,8 @@
+@@ -1270,7 +1270,8 @@
  		const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
  		const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
  		const SwPosition* pAPos;
@@ -814,7 +855,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  			   pAnchor->GetAnchorId() == FLY_AT_FLY ||
  			   pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
  			 0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
-@@ -1268,9 +1269,53 @@
+@@ -1279,9 +1280,53 @@
  					: ( IsRedlineMove()
  							? rRg.aStart < pAPos->nNode
  							: rRg.aStart <= pAPos->nNode )) &&
@@ -872,9 +913,9 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
 Index: sw/source/core/docnode/section.cxx
 ===================================================================
---- sw/source/core/docnode/section.cxx	(revision 272643)
-+++ sw/source/core/docnode/section.cxx	(revision 272644)
-@@ -1415,7 +1415,7 @@
+--- sw/source/core/docnode/section.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/docnode/section.cxx	(.../cws/os131)	(revision 275705)
+@@ -1414,7 +1414,7 @@
  						if( pSrcDoc != pDoc ||
  							pCpyPam->Start()->nNode > rInsPos ||
  							rInsPos >= pCpyPam->End()->nNode )
@@ -883,7 +924,7 @@ Index: sw/source/core/docnode/section.cx
  						delete pCpyPam;
  					}
  					if( pCpyRg && pSrcDoc == pDoc &&
-@@ -1444,7 +1444,7 @@
+@@ -1443,7 +1443,7 @@
  
  					SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
  
@@ -894,20 +935,18 @@ Index: sw/source/core/docnode/section.cx
  					if( !bCreateFrm )
 Index: sw/source/ui/dbui/dbmgr.cxx
 ===================================================================
---- sw/source/ui/dbui/dbmgr.cxx	(revision 272643)
-+++ sw/source/ui/dbui/dbmgr.cxx	(revision 272644)
-@@ -35,7 +35,9 @@
+--- sw/source/ui/dbui/dbmgr.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/dbui/dbmgr.cxx	(.../cws/os131)	(revision 275705)
+@@ -35,7 +35,7 @@
  #endif
  
  #include <stdio.h>
 -
-+#ifdef SW_COPY_DOC_IN_MEMORY
 +#include <unotxdoc.hxx>
-+#endif
  #include <com/sun/star/text/NotePrintMode.hpp>
  #include <sfx2/app.hxx>
  #include <com/sun/star/sdb/CommandType.hpp>
-@@ -43,17 +45,13 @@
+@@ -43,17 +43,13 @@
  #include <com/sun/star/frame/XComponentLoader.hpp>
  #include <com/sun/star/lang/DisposedException.hpp>
  #include <com/sun/star/lang/XEventListener.hpp>
@@ -926,7 +965,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
  #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
  #include <com/sun/star/uno/XNamingService.hpp>
-@@ -65,9 +63,7 @@
+@@ -65,9 +61,7 @@
  #include <dbconfig.hxx>
  #include <swdbtoolsclient.hxx>
  #include <pagedesc.hxx>
@@ -936,7 +975,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <unotools/tempfile.hxx>
  #include <svtools/pathoptions.hxx>
  #include <svtools/urihelper.hxx>
-@@ -86,39 +82,25 @@
+@@ -86,39 +80,25 @@
  #include <goodies/mailenum.hxx>
  #include <cmdid.h>
  #include <swmodule.hxx>
@@ -976,84 +1015,268 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <mmconfigitem.hxx>
  #include <sfx2/request.hxx>
  #include <hintids.hxx>
-@@ -3176,7 +3158,10 @@
+@@ -3185,7 +3165,6 @@
  
      SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
      BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-     String sSourceDocURL;
-+#endif
+-    String sSourceDocURL;
      //save the settings of the first
      rSourceShell.SttEndDoc(TRUE);
      USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3186,6 +3171,8 @@
+@@ -3195,22 +3174,6 @@
  
      try
      {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-         // save the working document into a temporary location
-         sSourceDocURL = URIHelper::SmartRel2Abs(
-             INetURLObject(), utl::TempFile::CreateTempName(),
-@@ -3201,7 +3188,7 @@
-         pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
-         uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-         xStore->storeToURL( sSourceDocURL, aValues );
+-        // save the working document into a temporary location
+-        sSourceDocURL = URIHelper::SmartRel2Abs(
+-            INetURLObject(), utl::TempFile::CreateTempName(),
+-            URIHelper::GetMaybeFileHdl());
+-        const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
+-                String::CreateFromAscii( FILTER_XML ),
+-                SwDocShell::Factory().GetFilterContainer() );
+-
+-        SfxStringItem aFilterName( SID_FILTER_NAME, pSfxFlt->GetFilterName());
+-        uno::Sequence< beans::PropertyValue > aValues(1);
+-        beans::PropertyValue* pValues = aValues.getArray();
+-        pValues[0].Name = C2U("FilterName");
+-        pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+-        uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+-        xStore->storeToURL( sSourceDocURL, aValues );
 -
-+#endif
          // create a target docshell to put the merged document into
          SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
          xTargetDocShell->DoInitNew( 0 );
-@@ -3250,6 +3237,15 @@
+@@ -3259,116 +3222,120 @@
                      Application::Reschedule();
              }
  
-+#ifdef SW_COPY_DOC_IN_MEMORY
+-            // create a new docshell from the temporary document
+-            SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+-            SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
+-            SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+-            SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL );
+-            const SfxPoolItem* pReturnValue =
+-                            rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
+-                                    &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
+-            if(pReturnValue)
 +            // copy the source document
-+            uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-+            uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
-+            SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++            SfxObjectShellRef xWorkDocSh;
++            if(nDocNo == 1 )
+             {
+-                SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
+-                SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+-                SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
+-                pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++                uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
++                uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
++                SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++                xWorkDocSh = pWorkModel->GetDocShell();
++            }
++            else
++            {
++                SwDoc* pNewDoc = rSourceView.GetDocShell()->GetDoc()->CreateCopy();
++                xWorkDocSh = new SwDocShell( pNewDoc, SFX_CREATE_MODE_STANDARD );
++                xWorkDocSh->DoInitNew();
++            }    
 +            //create a ViewFrame
-+            SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
 +            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
-+#else
-             // create a new docshell from the temporary document
-             SfxBoolItem aHidden( SID_HIDDEN, TRUE );
-             SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
-@@ -3259,9 +3255,13 @@
-                             rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
-                                     &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
-             if(pReturnValue)
-+#endif
-             {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else                
-                 SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
-                 SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
-+#endif
-                 SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
-                 pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++            SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
++            pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
+ 
+-                // merge the data
+-                SwDoc* pWorkDoc = rWorkShell.GetDoc();
+-                SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+-                pWorkDoc->SetNewDBMgr( this );
+-                pWorkDoc->EmbedAllLinks();
+-                if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
+-                    rWorkShell.Undo();
+-                // create a layout
+-                rWorkShell.CalcLayout();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+-                rWorkShell.ViewShell::UpdateFlds();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++            // merge the data
++            SwDoc* pWorkDoc = rWorkShell.GetDoc();
++            SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
++            pWorkDoc->SetNewDBMgr( this );
++            pWorkDoc->EmbedAllLinks();
++            if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
++                rWorkShell.Undo();
++            // create a layout
++            rWorkShell.CalcLayout();
++            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++            rWorkShell.ViewShell::UpdateFlds();
++            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+ 
+-                // strip invisible content and convert fields to text
+-                rWorkShell.RemoveInvisibleContent();
+-                rWorkShell.ConvertFieldsToText();
+-                rWorkShell.SetNumberingRestart();
++            // strip invisible content and convert fields to text
++            rWorkShell.RemoveInvisibleContent();
++            rWorkShell.ConvertFieldsToText();
++            rWorkShell.SetNumberingRestart();
+ 
+ 
+-                // insert the document into the target document
+-                rWorkShell.SttEndDoc(FALSE);
+-                rWorkShell.SttEndDoc(TRUE);
+-                rWorkShell.SelAll();
+-                pTargetShell->SttEndDoc(FALSE);
++            // insert the document into the target document
++            rWorkShell.SttEndDoc(FALSE);
++            rWorkShell.SttEndDoc(TRUE);
++            rWorkShell.SelAll();
++            pTargetShell->SttEndDoc(FALSE);
+ 
+-                //#i63806# put the styles to the target document
+-                //if the source uses headers or footers each new copy need to copy a new page styles
+-                if(bPageStylesWithHeaderFooter)
+-                {
+-                    //create a new pagestyle
+-                    //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
++            //#i63806# put the styles to the target document
++            //if the source uses headers or footers each new copy need to copy a new page styles
++            if(bPageStylesWithHeaderFooter)
++            {
++                //create a new pagestyle
++                //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
  
-@@ -3381,8 +3381,11 @@
+-                    SwDoc* pTargetDoc = pTargetShell->GetDoc();
+-                    String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
+-                    pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
+-                    SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+-                    if(pSourcePageDesc && pTargetPageDesc)
+-                    {
+-                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+-                        sModifiedStartingPageDesc = sNewPageDescName;
+-                        lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+-                    }
+-                }
+-                if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++                SwDoc* pTargetDoc = pTargetShell->GetDoc();
++                String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
++                pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
++                SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
++                if(pSourcePageDesc && pTargetPageDesc)
+                 {
+-                    pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++                    pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
++                    sModifiedStartingPageDesc = sNewPageDescName;
++                    lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+                 }
+-                if(nDocNo > 1)
++            }
++            if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++            {
++                pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++            }
++            if(nDocNo > 1)
++            {
++                pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++            }
++            else
++            {
++                pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
++            }
++            USHORT nPageCountBefore = pTargetShell->GetPageCnt();
++            DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
++            //#i51359# add a second paragraph in case there's only one
++            {
++                SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
++              SwPosition aTestPos( aIdx );
++              SwCursor aTestCrsr(aTestPos,0,false);
++                if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+                 {
+-                    pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++                    //append a paragraph
++                    pWorkDoc->AppendTxtNode( aTestPos );
+                 }
+-                else
+-                {
+-                    pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
+-                }
+-                USHORT nPageCountBefore = pTargetShell->GetPageCnt();
+-                DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
+-                //#i51359# add a second paragraph in case there's only one
+-                {
+-                    SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
+-                  SwPosition aTestPos( aIdx );
+-                  SwCursor aTestCrsr(aTestPos,0,false);
+-                    if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+-                    {
+-                        //append a paragraph
+-                        pWorkDoc->AppendTxtNode( aTestPos );
+-                    }
+-                }
+-                pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+-                //convert fields in page styles (header/footer - has to be done after the first document has been pasted
+-                if(1 == nDocNo)
+-                {
+-                    pTargetShell->CalcLayout();
+-                    pTargetShell->ConvertFieldsToText();
+-                }
+-                //add the document info to the config item
+-                SwDocMergeInfo aMergeInfo;
+-                aMergeInfo.nStartPageInTarget = nPageCountBefore;
+-                //#i72820# calculate layout to be able to find the correct page index
++            }
++            pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
++            //convert fields in page styles (header/footer - has to be done after the first document has been pasted
++            if(1 == nDocNo)
++            {
+                 pTargetShell->CalcLayout();
+-                aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
+-                aMergeInfo.nDBRow = nStartRow;
+-                rMMConfig.AddMergedDocument( aMergeInfo );
+-                ++nRet;
++                pTargetShell->ConvertFieldsToText();
++            }
++            //add the document info to the config item
++            SwDocMergeInfo aMergeInfo;
++            aMergeInfo.nStartPageInTarget = nPageCountBefore;
++            //#i72820# calculate layout to be able to find the correct page index
++            pTargetShell->CalcLayout();
++            aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
++            aMergeInfo.nDBRow = nStartRow;
++            rMMConfig.AddMergedDocument( aMergeInfo );
++            ++nRet;
+ 
+-                // the print monitor needs some time to act
+-                for( USHORT i = 0; i < 25; i++)
+-                    Application::Reschedule();
++            // the print monitor needs some time to act
++            for( USHORT i = 0; i < 25; i++)
++                Application::Reschedule();
+ 
+-                //restore the ole DBMgr
+-                pWorkDoc->SetNewDBMgr( pWorkDBMgr );
+-                //now the temporary document should be closed
+-                SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
+-                xDocSh->DoClose();
+-            }
++            //restore the ole DBMgr
++            pWorkDoc->SetNewDBMgr( pWorkDBMgr );
++            //now the temporary document should be closed
++            SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
++            xDocSh->DoClose();
+             nEndRow = pImpl->pMergeData->xResultSet->getRow();
+             ++nDocNo;
+         } while( !bCancel &&
+@@ -3390,8 +3357,6 @@
      {
-         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments")
+         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
      }
 -    if(sSourceDocURL.Len())
 -        File::remove( sSourceDocURL );
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-+     if(sSourceDocURL.Len())
-+         File::remove( sSourceDocURL );
-+#endif
      DELETEZ(pImpl->pMergeData);
      bInMerge = FALSE;
      return nRet;
 Index: sw/source/ui/uno/unoatxt.cxx
 ===================================================================
---- sw/source/ui/uno/unoatxt.cxx	(revision 272643)
-+++ sw/source/ui/uno/unoatxt.cxx	(revision 272644)
-@@ -417,7 +417,7 @@
+--- sw/source/ui/uno/unoatxt.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/uno/unoatxt.cxx	(.../cws/os131)	(revision 275705)
+@@ -416,7 +416,7 @@
  		if(pxCursor)
  		{
  			SwPaM* pUnoCrsr = pxCursor->GetPaM();
@@ -1062,10 +1285,10 @@ Index: sw/source/ui/uno/unoatxt.cxx
  		}
  		else
  		{
-@@ -425,7 +425,7 @@
-             if(pBkm && pBkm->GetOtherBookmarkPos())
+@@ -424,7 +424,7 @@
+             if(pBkmk && pBkmk->IsExpanded())
  			{
-                 SwPaM aTmp(*pBkm->GetOtherBookmarkPos(), pBkm->GetBookmarkPos());
+                 SwPaM aTmp(pBkmk->GetOtherMarkPos(), pBkmk->GetMarkPos());
 -                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos));
 +                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos, false));
  			}
@@ -1073,8 +1296,8 @@ Index: sw/source/ui/uno/unoatxt.cxx
  	}
 Index: sw/source/ui/uno/unotxdoc.cxx
 ===================================================================
---- sw/source/ui/uno/unotxdoc.cxx	(revision 272643)
-+++ sw/source/ui/uno/unotxdoc.cxx	(revision 272644)
+--- sw/source/ui/uno/unotxdoc.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/uno/unotxdoc.cxx	(.../cws/os131)	(revision 275705)
 @@ -37,16 +37,12 @@
  #include <vcl/virdev.hxx>
  #include <vcl/svapp.hxx>
@@ -1116,7 +1339,7 @@ Index: sw/source/ui/uno/unotxdoc.cxx
  #include <swcont.hxx>
  #include <unodefaults.hxx>
  #include <SwXDocumentSettings.hxx>
-@@ -2856,7 +2846,27 @@
+@@ -2851,7 +2841,27 @@
  {
      return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
  }
@@ -1146,9 +1369,9 @@ Index: sw/source/ui/uno/unotxdoc.cxx
   ---------------------------------------------------------------------------*/
 Index: sw/inc/doc.hxx
 ===================================================================
---- sw/inc/doc.hxx	(revision 272643)
-+++ sw/inc/doc.hxx	(revision 272644)
-@@ -636,7 +636,7 @@
+--- sw/inc/doc.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/doc.hxx	(.../cws/os131)	(revision 275705)
+@@ -638,7 +638,7 @@
  		// Kopieren eines Bereiches im oder in ein anderes Dokument !
  		// Die Position darf nicht im Bereich liegen !!
  	sal_Bool _Copy( SwPaM&, SwPosition&,
@@ -1157,7 +1380,7 @@ Index: sw/inc/doc.hxx
  
  	SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
  								const SwCntntNode& rNode, RndStdIds eRequestId,
-@@ -648,7 +648,8 @@
+@@ -650,7 +650,8 @@
  								const SfxItemSet* pGrfAttrSet,
  								SwFrmFmt* = 0 );
  
@@ -1167,7 +1390,7 @@ Index: sw/inc/doc.hxx
  						sal_Bool bCopyFlyAtFly = sal_False ) const;	// steht im ndcopy.cxx
      sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
  
-@@ -720,6 +721,7 @@
+@@ -722,6 +723,7 @@
       SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
       SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
  
@@ -1175,7 +1398,7 @@ Index: sw/inc/doc.hxx
  public:
  
      /** Life cycle
-@@ -915,7 +917,7 @@
+@@ -898,7 +900,7 @@
  
      /** IDocumentContentOperations
      */
@@ -1184,7 +1407,7 @@ Index: sw/inc/doc.hxx
  	virtual void DeleteSection(SwNode* pNode);
  	virtual bool Delete(SwPaM&);
  	virtual bool DelFullPara(SwPaM&);
-@@ -1118,6 +1120,7 @@
+@@ -1101,6 +1103,7 @@
  								SwFrmFmt *pParent = 0 );
  
  	void CopyWithFlyInFly( const SwNodeRange& rRg,
@@ -1192,7 +1415,7 @@ Index: sw/inc/doc.hxx
  							const SwNodeIndex& rInsPos,
  							sal_Bool bMakeNewFrms = sal_True,
  							sal_Bool bDelRedlines = sal_True,
-@@ -2117,6 +2120,7 @@
+@@ -2100,6 +2103,7 @@
  	{
  		return n32DummyCompatabilityOptions2;
  	}
@@ -1202,8 +1425,8 @@ Index: sw/inc/doc.hxx
  
 Index: sw/inc/unotxdoc.hxx
 ===================================================================
---- sw/inc/unotxdoc.hxx	(revision 272643)
-+++ sw/inc/unotxdoc.hxx	(revision 272644)
+--- sw/inc/unotxdoc.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/unotxdoc.hxx	(.../cws/os131)	(revision 275705)
 @@ -68,9 +68,8 @@
  #include <com/sun/star/xforms/XFormsSupplier.hpp>
  #include <com/sun/star/container/XNameContainer.hpp>
@@ -1292,8 +1515,8 @@ Index: sw/inc/unotxdoc.hxx
  	SwXDocumentPropertyHelper * GetPropertyHelper ();
 Index: sw/inc/IDocumentContentOperations.hxx
 ===================================================================
---- sw/inc/IDocumentContentOperations.hxx	(revision 272643)
-+++ sw/inc/IDocumentContentOperations.hxx	(revision 272644)
+--- sw/inc/IDocumentContentOperations.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/IDocumentContentOperations.hxx	(.../cws/os131)	(revision 275705)
 @@ -71,7 +71,7 @@
      /** Kopieren eines Bereiches im oder in ein anderes Dokument !
  	    Die Position kann auch im Bereich liegen !!
@@ -1303,3 +1526,10 @@ Index: sw/inc/IDocumentContentOperations
  
  	/** Loesche die Section, in der der Node steht.
      */
+
+Property changes on: .
+___________________________________________________________________
+Added: svn:mergeinfo
+   Merged /tags/DEV300_m50:r272825-272842
+   Merged /trunk:r270724-272824
+



From caolanm at fedoraproject.org  Wed Sep  2 13:45:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Sep 2009 13:45:42 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1932,
	1.1933 workspace.os131.patch, 1.1, 1.2
Message-ID: <20090902134542.DCD7911C008C@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-serv28045/F-11

Modified Files:
	openoffice.org.spec workspace.os131.patch 
Log Message:
Resolves: rhbz#520772 copy/paste cockup


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1932
retrieving revision 1.1933
diff -u -p -r1.1932 -r1.1933
--- openoffice.org.spec	28 Aug 2009 13:40:20 -0000	1.1932
+++ openoffice.org.spec	2 Sep 2009 13:45:41 -0000	1.1933
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4173,6 +4173,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
+- Resolves: rhbz#520772 copy/paste cockup
+
 * Fri Aug 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
 - update to 3.1.1
 - Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  384 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |  239 +++++++++--------------
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 606 insertions(+), 222 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.os131.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.os131.patch	21 Aug 2009 05:13:40 -0000	1.1
+++ workspace.os131.patch	2 Sep 2009 13:45:42 -0000	1.2
@@ -1,8 +1,8 @@
 Index: sw/source/filter/xml/xmltbli.cxx
 ===================================================================
---- sw/source/filter/xml/xmltbli.cxx	(revision 272643)
-+++ sw/source/filter/xml/xmltbli.cxx	(revision 272644)
-@@ -662,7 +662,7 @@
+--- sw/source/filter/xml/xmltbli.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/filter/xml/xmltbli.cxx	(.../cws/os131)	(revision 275705)
+@@ -667,7 +667,7 @@
  					SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
  								   *pSrcPaM->GetMark() );
  					SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
@@ -13,8 +13,8 @@ Index: sw/source/filter/xml/xmltbli.cxx
  				}
 Index: sw/source/filter/ww8/ww8glsy.cxx
 ===================================================================
---- sw/source/filter/ww8/ww8glsy.cxx	(revision 272643)
-+++ sw/source/filter/ww8/ww8glsy.cxx	(revision 272644)
+--- sw/source/filter/ww8/ww8glsy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/filter/ww8/ww8glsy.cxx	(.../cws/os131)	(revision 275705)
 @@ -187,7 +187,7 @@
                          -1 );
                      pCNd = aIdx.GetNode().GetCntntNode();
@@ -26,8 +26,8 @@ Index: sw/source/filter/ww8/ww8glsy.cxx
              }
 Index: sw/source/core/frmedt/fecopy.cxx
 ===================================================================
---- sw/source/core/frmedt/fecopy.cxx	(revision 272643)
-+++ sw/source/core/frmedt/fecopy.cxx	(revision 272644)
+--- sw/source/core/frmedt/fecopy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/frmedt/fecopy.cxx	(.../cws/os131)	(revision 275705)
 @@ -840,7 +840,7 @@
              {
                  SwNodeIndex aIndexBefore(rInsPos.nNode);
@@ -48,8 +48,8 @@ Index: sw/source/core/frmedt/fecopy.cxx
                      aIndexBefore++;
 Index: sw/source/core/txtnode/atrftn.cxx
 ===================================================================
---- sw/source/core/txtnode/atrftn.cxx	(revision 272643)
-+++ sw/source/core/txtnode/atrftn.cxx	(revision 272644)
+--- sw/source/core/txtnode/atrftn.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/txtnode/atrftn.cxx	(.../cws/os131)	(revision 275705)
 @@ -303,7 +303,7 @@
  		SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
  		ULONG  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
@@ -61,8 +61,8 @@ Index: sw/source/core/txtnode/atrftn.cxx
  		// Nodes geloescht werden:
 Index: sw/source/core/edit/edglss.cxx
 ===================================================================
---- sw/source/core/edit/edglss.cxx	(revision 272643)
-+++ sw/source/core/edit/edglss.cxx	(revision 272644)
+--- sw/source/core/edit/edglss.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/edglss.cxx	(.../cws/os131)	(revision 275705)
 @@ -168,7 +168,7 @@
  			aStt = pGDoc->GetNodes().GetEndOfExtras();
  			pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
@@ -84,14 +84,14 @@ Index: sw/source/core/edit/edglss.cxx
  			}
  			else
 -				bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
-+                bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
++                bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
  
  		FOREACHPAM_END()
          }
 Index: sw/source/core/edit/eddel.cxx
 ===================================================================
---- sw/source/core/edit/eddel.cxx	(revision 272643)
-+++ sw/source/core/edit/eddel.cxx	(revision 272644)
+--- sw/source/core/edit/eddel.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/eddel.cxx	(.../cws/os131)	(revision 275705)
 @@ -253,7 +253,7 @@
  			bFirstMove = FALSE;
  		}
@@ -103,8 +103,8 @@ Index: sw/source/core/edit/eddel.cxx
          SwPaM aInsertPaM(*pPos, aSttNdIdx);
 Index: sw/source/core/doc/docnew.cxx
 ===================================================================
---- sw/source/core/doc/docnew.cxx	(revision 272643)
-+++ sw/source/core/doc/docnew.cxx	(revision 272644)
+--- sw/source/core/doc/docnew.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docnew.cxx	(.../cws/os131)	(revision 275705)
 @@ -32,6 +32,7 @@
  #include "precompiled_sw.hxx"
  #define ROLBCK_HISTORY_ONLY 	// Der Kampf gegen die CLOOK's
@@ -161,7 +161,7 @@ Index: sw/source/core/doc/docnew.cxx
  
  
  // --> OD 2006-04-19 #b6375613#
-@@ -1056,3 +1046,370 @@
+@@ -1057,3 +1047,369 @@
      }
  }
  // <--
@@ -472,7 +472,6 @@ Index: sw/source/core/doc/docnew.cxx
 +    aCpyPam.SetMark();
 +    aCpyPam.Move( fnMoveForward, fnGoDoc );
 +
-+    BOOL bRet = TRUE, bDelTbl = TRUE;
 +    this->StartUndo( UNDO_INSGLOSSARY, NULL );
 +    this->LockExpFlds();
 +
@@ -534,8 +533,8 @@ Index: sw/source/core/doc/docnew.cxx
 +}
 Index: sw/source/core/doc/doccomp.cxx
 ===================================================================
---- sw/source/core/doc/doccomp.cxx	(revision 272643)
-+++ sw/source/core/doc/doccomp.cxx	(revision 272644)
+--- sw/source/core/doc/doccomp.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/doccomp.cxx	(.../cws/os131)	(revision 275705)
 @@ -1196,7 +1196,7 @@
  					SwPaM aCpyPam( rSrcNd, nStt );
  					aCpyPam.SetMark();
@@ -565,8 +564,8 @@ Index: sw/source/core/doc/doccomp.cxx
  		pDoc->DoUndo( bUndo );
 Index: sw/source/core/doc/docnum.cxx
 ===================================================================
---- sw/source/core/doc/docnum.cxx	(revision 272643)
-+++ sw/source/core/doc/docnum.cxx	(revision 272644)
+--- sw/source/core/doc/docnum.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docnum.cxx	(.../cws/os131)	(revision 275705)
 @@ -2273,7 +2273,7 @@
                  }
              }
@@ -578,8 +577,8 @@ Index: sw/source/core/doc/docnum.cxx
  				// dann muss der letzte leere Node wieder entfernt werden
 Index: sw/source/core/doc/docredln.cxx
 ===================================================================
---- sw/source/core/doc/docredln.cxx	(revision 272643)
-+++ sw/source/core/doc/docredln.cxx	(revision 272644)
+--- sw/source/core/doc/docredln.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docredln.cxx	(.../cws/os131)	(revision 275705)
 @@ -3418,7 +3418,7 @@
  			SwNodeIndex aNdIdx( *pSttNd, 1 );
  			SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
@@ -607,8 +606,8 @@ Index: sw/source/core/doc/docredln.cxx
  		pCntntSect = new SwNodeIndex( *pSttNd );
 Index: sw/source/core/doc/docglos.cxx
 ===================================================================
---- sw/source/core/doc/docglos.cxx	(revision 272643)
-+++ sw/source/core/doc/docglos.cxx	(revision 272644)
+--- sw/source/core/doc/docglos.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docglos.cxx	(.../cws/os131)	(revision 275705)
 @@ -183,7 +183,7 @@
                  SwDontExpandItem aACD;
  				aACD.SaveDontExpandItems( rInsPos );
@@ -620,8 +619,8 @@ Index: sw/source/core/doc/docglos.cxx
  				if( pShell )
 Index: sw/source/core/doc/tblcpy.cxx
 ===================================================================
---- sw/source/core/doc/tblcpy.cxx	(revision 272643)
-+++ sw/source/core/doc/tblcpy.cxx	(revision 272644)
+--- sw/source/core/doc/tblcpy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/tblcpy.cxx	(.../cws/os131)	(revision 275705)
 @@ -567,7 +567,7 @@
  
  	SwNodeIndex aSavePos( aInsIdx, -1 );
@@ -633,8 +632,8 @@ Index: sw/source/core/doc/tblcpy.cxx
  	aSavePos++;
 Index: sw/source/core/doc/docglbl.cxx
 ===================================================================
---- sw/source/core/doc/docglbl.cxx	(revision 272643)
-+++ sw/source/core/doc/docglbl.cxx	(revision 272644)
+--- sw/source/core/doc/docglbl.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docglbl.cxx	(.../cws/os131)	(revision 275705)
 @@ -307,7 +307,7 @@
  						pDoc->GetNodes().Delete( aIdx, 1 );
  
@@ -655,8 +654,8 @@ Index: sw/source/core/doc/docglbl.cxx
  					// und noch alle Bookmarks
 Index: sw/source/core/doc/tblrwcl.cxx
 ===================================================================
---- sw/source/core/doc/tblrwcl.cxx	(revision 272643)
-+++ sw/source/core/doc/tblrwcl.cxx	(revision 272644)
+--- sw/source/core/doc/tblrwcl.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/tblrwcl.cxx	(.../cws/os131)	(revision 275705)
 @@ -2103,7 +2103,7 @@
                              *rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
                  SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
@@ -668,8 +667,8 @@ Index: sw/source/core/doc/tblrwcl.cxx
              }
 Index: sw/source/core/doc/doclay.cxx
 ===================================================================
---- sw/source/core/doc/doclay.cxx	(revision 272643)
-+++ sw/source/core/doc/doclay.cxx	(revision 272644)
+--- sw/source/core/doc/doclay.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/doclay.cxx	(.../cws/os131)	(revision 275705)
 @@ -507,7 +507,7 @@
  
  		// sorge dafuer das auch Fly's in Fly's kopiert werden
@@ -690,9 +689,9 @@ Index: sw/source/core/doc/doclay.cxx
  				mbUndo = bOldUndo;
 Index: sw/source/core/doc/docfmt.cxx
 ===================================================================
---- sw/source/core/doc/docfmt.cxx	(revision 272643)
-+++ sw/source/core/doc/docfmt.cxx	(revision 272644)
-@@ -2126,7 +2126,7 @@
+--- sw/source/core/doc/docfmt.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docfmt.cxx	(.../cws/os131)	(revision 275705)
+@@ -2136,7 +2136,7 @@
  				aTmpIdx = *pSttNd->EndOfSectionNode();
  				rSrcNds._Copy( aRg, aTmpIdx );
  				aTmpIdx = *pSttNd;
@@ -703,8 +702,8 @@ Index: sw/source/core/doc/docfmt.cxx
  			else
 Index: sw/source/core/undo/untblk.cxx
 ===================================================================
---- sw/source/core/undo/untblk.cxx	(revision 272643)
-+++ sw/source/core/undo/untblk.cxx	(revision 272644)
+--- sw/source/core/undo/untblk.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/undo/untblk.cxx	(.../cws/os131)	(revision 275705)
 @@ -346,7 +346,7 @@
  
  	SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
@@ -716,9 +715,9 @@ Index: sw/source/core/undo/untblk.cxx
  }
 Index: sw/source/core/docnode/ndcopy.cxx
 ===================================================================
---- sw/source/core/docnode/ndcopy.cxx	(revision 272643)
-+++ sw/source/core/docnode/ndcopy.cxx	(revision 272644)
-@@ -659,7 +659,7 @@
+--- sw/source/core/docnode/ndcopy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/docnode/ndcopy.cxx	(.../cws/os131)	(revision 275705)
+@@ -670,7 +670,7 @@
  
  // Kopieren eines Bereiches im oder in ein anderes Dokument !
  
@@ -727,7 +726,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  {
  	const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
  
-@@ -698,13 +698,13 @@
+@@ -709,13 +709,13 @@
  	BOOL bRet = FALSE;
  
  	if( pDoc != this )
@@ -743,7 +742,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  	else
  	{
-@@ -728,7 +728,7 @@
+@@ -739,7 +739,7 @@
  		SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
  								SwNodeIndex( GetNodes().GetEndOfAutotext() ));
  		aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
@@ -752,7 +751,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  		aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
  		aPam.SetMark();
-@@ -803,7 +803,7 @@
+@@ -814,7 +814,7 @@
  }
  
  BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
@@ -761,7 +760,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  {
  	SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
      bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
-@@ -1087,7 +1087,7 @@
+@@ -1098,7 +1098,7 @@
  			}
  		}
  
@@ -770,7 +769,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  		{
  			SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
              if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
-@@ -1102,13 +1102,13 @@
+@@ -1113,13 +1113,13 @@
  			if( aInsPos == pEnd->nNode )
  			{
  				SwNodeIndex aSaveIdx( aInsPos, -1 );
@@ -786,7 +785,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  			bCopyBookmarks = FALSE;
  
-@@ -1167,7 +1167,7 @@
+@@ -1178,7 +1178,7 @@
  
  //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
  
@@ -795,7 +794,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  							const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
  							BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
  {
-@@ -1206,7 +1206,7 @@
+@@ -1217,7 +1217,7 @@
  	// Undo abschalten
  	BOOL bUndo = pDest->DoesUndo();
  	pDest->DoUndo( FALSE );
@@ -804,7 +803,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  	pDest->DoUndo( bUndo );
  
  	SwNodeRange aCpyRange( aSavePos, rInsPos );
-@@ -1242,7 +1242,7 @@
+@@ -1253,7 +1253,7 @@
  	}
  }
  
@@ -813,7 +812,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  							BOOL bCopyFlyAtFly ) const
  {
  	// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
-@@ -1259,7 +1259,8 @@
+@@ -1270,7 +1270,8 @@
  		const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
  		const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
  		const SwPosition* pAPos;
@@ -823,7 +822,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  			   pAnchor->GetAnchorId() == FLY_AT_FLY ||
  			   pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
  			 0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
-@@ -1268,9 +1269,53 @@
+@@ -1279,9 +1280,53 @@
  					: ( IsRedlineMove()
  							? rRg.aStart < pAPos->nNode
  							: rRg.aStart <= pAPos->nNode )) &&
@@ -881,9 +880,9 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
 Index: sw/source/core/docnode/section.cxx
 ===================================================================
---- sw/source/core/docnode/section.cxx	(revision 272643)
-+++ sw/source/core/docnode/section.cxx	(revision 272644)
-@@ -1415,7 +1415,7 @@
+--- sw/source/core/docnode/section.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/docnode/section.cxx	(.../cws/os131)	(revision 275705)
+@@ -1414,7 +1414,7 @@
  						if( pSrcDoc != pDoc ||
  							pCpyPam->Start()->nNode > rInsPos ||
  							rInsPos >= pCpyPam->End()->nNode )
@@ -892,7 +891,7 @@ Index: sw/source/core/docnode/section.cx
  						delete pCpyPam;
  					}
  					if( pCpyRg && pSrcDoc == pDoc &&
-@@ -1444,7 +1444,7 @@
+@@ -1443,7 +1443,7 @@
  
  					SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
  
@@ -903,20 +902,18 @@ Index: sw/source/core/docnode/section.cx
  					if( !bCreateFrm )
 Index: sw/source/ui/dbui/dbmgr.cxx
 ===================================================================
---- sw/source/ui/dbui/dbmgr.cxx	(revision 272643)
-+++ sw/source/ui/dbui/dbmgr.cxx	(revision 272644)
-@@ -35,7 +35,9 @@
+--- sw/source/ui/dbui/dbmgr.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/dbui/dbmgr.cxx	(.../cws/os131)	(revision 275705)
+@@ -35,7 +35,7 @@
  #endif
  
  #include <stdio.h>
 -
-+#ifdef SW_COPY_DOC_IN_MEMORY
 +#include <unotxdoc.hxx>
-+#endif
  #include <com/sun/star/text/NotePrintMode.hpp>
  #include <sfx2/app.hxx>
  #include <com/sun/star/sdb/CommandType.hpp>
-@@ -43,17 +45,13 @@
+@@ -43,17 +43,13 @@
  #include <com/sun/star/frame/XComponentLoader.hpp>
  #include <com/sun/star/lang/DisposedException.hpp>
  #include <com/sun/star/lang/XEventListener.hpp>
@@ -935,7 +932,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
  #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
  #include <com/sun/star/uno/XNamingService.hpp>
-@@ -65,9 +63,7 @@
+@@ -65,9 +61,7 @@
  #include <dbconfig.hxx>
  #include <swdbtoolsclient.hxx>
  #include <pagedesc.hxx>
@@ -945,7 +942,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <unotools/tempfile.hxx>
  #include <svtools/pathoptions.hxx>
  #include <svtools/urihelper.hxx>
-@@ -86,39 +82,25 @@
+@@ -86,39 +80,25 @@
  #include <goodies/mailenum.hxx>
  #include <cmdid.h>
  #include <swmodule.hxx>
@@ -985,81 +982,267 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <mmconfigitem.hxx>
  #include <sfx2/request.hxx>
  #include <hintids.hxx>
-@@ -3182,7 +3164,10 @@
+@@ -3185,7 +3165,6 @@
  
      SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
      BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-     String sSourceDocURL;
-+#endif
+-    String sSourceDocURL;
      //save the settings of the first
      rSourceShell.SttEndDoc(TRUE);
      USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3192,6 +3177,8 @@
+@@ -3195,22 +3174,6 @@
  
      try
      {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-         // save the working document into a temporary location
-         sSourceDocURL = URIHelper::SmartRel2Abs(
-             INetURLObject(), utl::TempFile::CreateTempName(),
-@@ -3207,7 +3194,7 @@
-         pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
-         uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-         xStore->storeToURL( sSourceDocURL, aValues );
+-        // save the working document into a temporary location
+-        sSourceDocURL = URIHelper::SmartRel2Abs(
+-            INetURLObject(), utl::TempFile::CreateTempName(),
+-            URIHelper::GetMaybeFileHdl());
+-        const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
+-                String::CreateFromAscii( FILTER_XML ),
+-                SwDocShell::Factory().GetFilterContainer() );
+-
+-        SfxStringItem aFilterName( SID_FILTER_NAME, pSfxFlt->GetFilterName());
+-        uno::Sequence< beans::PropertyValue > aValues(1);
+-        beans::PropertyValue* pValues = aValues.getArray();
+-        pValues[0].Name = C2U("FilterName");
+-        pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+-        uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+-        xStore->storeToURL( sSourceDocURL, aValues );
 -
-+#endif
          // create a target docshell to put the merged document into
          SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
          xTargetDocShell->DoInitNew( 0 );
-@@ -3256,6 +3243,15 @@
+@@ -3259,116 +3222,120 @@
                      Application::Reschedule();
              }
  
-+#ifdef SW_COPY_DOC_IN_MEMORY
+-            // create a new docshell from the temporary document
+-            SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+-            SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
+-            SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+-            SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL );
+-            const SfxPoolItem* pReturnValue =
+-                            rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
+-                                    &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
+-            if(pReturnValue)
 +            // copy the source document
-+            uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-+            uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
-+            SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++            SfxObjectShellRef xWorkDocSh;
++            if(nDocNo == 1 )
+             {
+-                SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
+-                SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+-                SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
+-                pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++                uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
++                uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
++                SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++                xWorkDocSh = pWorkModel->GetDocShell();
++            }
++            else
++            {
++                SwDoc* pNewDoc = rSourceView.GetDocShell()->GetDoc()->CreateCopy();
++                xWorkDocSh = new SwDocShell( pNewDoc, SFX_CREATE_MODE_STANDARD );
++                xWorkDocSh->DoInitNew();
++            }    
 +            //create a ViewFrame
-+            SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
 +            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
-+#else
-             // create a new docshell from the temporary document
-             SfxBoolItem aHidden( SID_HIDDEN, TRUE );
-             SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
-@@ -3265,9 +3261,13 @@
-                             rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
-                                     &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
-             if(pReturnValue)
-+#endif
-             {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else                
-                 SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
-                 SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
-+#endif
-                 SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
-                 pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++            SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
++            pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
  
-@@ -3387,8 +3387,11 @@
+-                // merge the data
+-                SwDoc* pWorkDoc = rWorkShell.GetDoc();
+-                SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+-                pWorkDoc->SetNewDBMgr( this );
+-                pWorkDoc->EmbedAllLinks();
+-                if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
+-                    rWorkShell.Undo();
+-                // create a layout
+-                rWorkShell.CalcLayout();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+-                rWorkShell.ViewShell::UpdateFlds();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++            // merge the data
++            SwDoc* pWorkDoc = rWorkShell.GetDoc();
++            SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
++            pWorkDoc->SetNewDBMgr( this );
++            pWorkDoc->EmbedAllLinks();
++            if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
++                rWorkShell.Undo();
++            // create a layout
++            rWorkShell.CalcLayout();
++            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++            rWorkShell.ViewShell::UpdateFlds();
++            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+ 
+-                // strip invisible content and convert fields to text
+-                rWorkShell.RemoveInvisibleContent();
+-                rWorkShell.ConvertFieldsToText();
+-                rWorkShell.SetNumberingRestart();
++            // strip invisible content and convert fields to text
++            rWorkShell.RemoveInvisibleContent();
++            rWorkShell.ConvertFieldsToText();
++            rWorkShell.SetNumberingRestart();
+ 
+ 
+-                // insert the document into the target document
+-                rWorkShell.SttEndDoc(FALSE);
+-                rWorkShell.SttEndDoc(TRUE);
+-                rWorkShell.SelAll();
+-                pTargetShell->SttEndDoc(FALSE);
++            // insert the document into the target document
++            rWorkShell.SttEndDoc(FALSE);
++            rWorkShell.SttEndDoc(TRUE);
++            rWorkShell.SelAll();
++            pTargetShell->SttEndDoc(FALSE);
+ 
+-                //#i63806# put the styles to the target document
+-                //if the source uses headers or footers each new copy need to copy a new page styles
+-                if(bPageStylesWithHeaderFooter)
+-                {
+-                    //create a new pagestyle
+-                    //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
++            //#i63806# put the styles to the target document
++            //if the source uses headers or footers each new copy need to copy a new page styles
++            if(bPageStylesWithHeaderFooter)
++            {
++                //create a new pagestyle
++                //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
+ 
+-                    SwDoc* pTargetDoc = pTargetShell->GetDoc();
+-                    String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
+-                    pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
+-                    SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+-                    if(pSourcePageDesc && pTargetPageDesc)
+-                    {
+-                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+-                        sModifiedStartingPageDesc = sNewPageDescName;
+-                        lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+-                    }
+-                }
+-                if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++                SwDoc* pTargetDoc = pTargetShell->GetDoc();
++                String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
++                pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
++                SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
++                if(pSourcePageDesc && pTargetPageDesc)
+                 {
+-                    pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++                    pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
++                    sModifiedStartingPageDesc = sNewPageDescName;
++                    lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+                 }
+-                if(nDocNo > 1)
++            }
++            if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++            {
++                pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++            }
++            if(nDocNo > 1)
++            {
++                pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++            }
++            else
++            {
++                pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
++            }
++            USHORT nPageCountBefore = pTargetShell->GetPageCnt();
++            DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
++            //#i51359# add a second paragraph in case there's only one
++            {
++                SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
++              SwPosition aTestPos( aIdx );
++              SwCursor aTestCrsr(aTestPos,0,false);
++                if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+                 {
+-                    pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++                    //append a paragraph
++                    pWorkDoc->AppendTxtNode( aTestPos );
+                 }
+-                else
+-                {
+-                    pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
+-                }
+-                USHORT nPageCountBefore = pTargetShell->GetPageCnt();
+-                DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
+-                //#i51359# add a second paragraph in case there's only one
+-                {
+-                    SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
+-                  SwPosition aTestPos( aIdx );
+-                  SwCursor aTestCrsr(aTestPos,0,false);
+-                    if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+-                    {
+-                        //append a paragraph
+-                        pWorkDoc->AppendTxtNode( aTestPos );
+-                    }
+-                }
+-                pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+-                //convert fields in page styles (header/footer - has to be done after the first document has been pasted
+-                if(1 == nDocNo)
+-                {
+-                    pTargetShell->CalcLayout();
+-                    pTargetShell->ConvertFieldsToText();
+-                }
+-                //add the document info to the config item
+-                SwDocMergeInfo aMergeInfo;
+-                aMergeInfo.nStartPageInTarget = nPageCountBefore;
+-                //#i72820# calculate layout to be able to find the correct page index
++            }
++            pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
++            //convert fields in page styles (header/footer - has to be done after the first document has been pasted
++            if(1 == nDocNo)
++            {
+                 pTargetShell->CalcLayout();
+-                aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
+-                aMergeInfo.nDBRow = nStartRow;
+-                rMMConfig.AddMergedDocument( aMergeInfo );
+-                ++nRet;
++                pTargetShell->ConvertFieldsToText();
++            }
++            //add the document info to the config item
++            SwDocMergeInfo aMergeInfo;
++            aMergeInfo.nStartPageInTarget = nPageCountBefore;
++            //#i72820# calculate layout to be able to find the correct page index
++            pTargetShell->CalcLayout();
++            aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
++            aMergeInfo.nDBRow = nStartRow;
++            rMMConfig.AddMergedDocument( aMergeInfo );
++            ++nRet;
+ 
+-                // the print monitor needs some time to act
+-                for( USHORT i = 0; i < 25; i++)
+-                    Application::Reschedule();
++            // the print monitor needs some time to act
++            for( USHORT i = 0; i < 25; i++)
++                Application::Reschedule();
+ 
+-                //restore the ole DBMgr
+-                pWorkDoc->SetNewDBMgr( pWorkDBMgr );
+-                //now the temporary document should be closed
+-                SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
+-                xDocSh->DoClose();
+-            }
++            //restore the ole DBMgr
++            pWorkDoc->SetNewDBMgr( pWorkDBMgr );
++            //now the temporary document should be closed
++            SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
++            xDocSh->DoClose();
+             nEndRow = pImpl->pMergeData->xResultSet->getRow();
+             ++nDocNo;
+         } while( !bCancel &&
+@@ -3390,8 +3357,6 @@
      {
          DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
      }
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-     if(sSourceDocURL.Len())
-         File::remove( sSourceDocURL );
-+#endif
+-    if(sSourceDocURL.Len())
+-        File::remove( sSourceDocURL );
      DELETEZ(pImpl->pMergeData);
      bInMerge = FALSE;
      return nRet;
 Index: sw/source/ui/uno/unoatxt.cxx
 ===================================================================
---- sw/source/ui/uno/unoatxt.cxx	(revision 272643)
-+++ sw/source/ui/uno/unoatxt.cxx	(revision 272644)
+--- sw/source/ui/uno/unoatxt.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/uno/unoatxt.cxx	(.../cws/os131)	(revision 275705)
 @@ -417,7 +417,7 @@
  		if(pxCursor)
  		{
@@ -1080,8 +1263,8 @@ Index: sw/source/ui/uno/unoatxt.cxx
  	}
 Index: sw/source/ui/uno/unotxdoc.cxx
 ===================================================================
---- sw/source/ui/uno/unotxdoc.cxx	(revision 272643)
-+++ sw/source/ui/uno/unotxdoc.cxx	(revision 272644)
+--- sw/source/ui/uno/unotxdoc.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/uno/unotxdoc.cxx	(.../cws/os131)	(revision 275705)
 @@ -37,16 +37,12 @@
  #include <vcl/virdev.hxx>
  #include <vcl/svapp.hxx>
@@ -1123,7 +1306,7 @@ Index: sw/source/ui/uno/unotxdoc.cxx
  #include <swcont.hxx>
  #include <unodefaults.hxx>
  #include <SwXDocumentSettings.hxx>
-@@ -2856,7 +2846,27 @@
+@@ -2851,7 +2841,27 @@
  {
      return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
  }
@@ -1153,9 +1336,9 @@ Index: sw/source/ui/uno/unotxdoc.cxx
   ---------------------------------------------------------------------------*/
 Index: sw/inc/doc.hxx
 ===================================================================
---- sw/inc/doc.hxx	(revision 272643)
-+++ sw/inc/doc.hxx	(revision 272644)
-@@ -636,7 +636,7 @@
+--- sw/inc/doc.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/doc.hxx	(.../cws/os131)	(revision 275705)
+@@ -638,7 +638,7 @@
  		// Kopieren eines Bereiches im oder in ein anderes Dokument !
  		// Die Position darf nicht im Bereich liegen !!
  	sal_Bool _Copy( SwPaM&, SwPosition&,
@@ -1164,7 +1347,7 @@ Index: sw/inc/doc.hxx
  
  	SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
  								const SwCntntNode& rNode, RndStdIds eRequestId,
-@@ -648,7 +648,8 @@
+@@ -650,7 +650,8 @@
  								const SfxItemSet* pGrfAttrSet,
  								SwFrmFmt* = 0 );
  
@@ -1174,7 +1357,7 @@ Index: sw/inc/doc.hxx
  						sal_Bool bCopyFlyAtFly = sal_False ) const;	// steht im ndcopy.cxx
      sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
  
-@@ -720,6 +721,7 @@
+@@ -722,6 +723,7 @@
       SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
       SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
  
@@ -1182,7 +1365,7 @@ Index: sw/inc/doc.hxx
  public:
  
      /** Life cycle
-@@ -915,7 +917,7 @@
+@@ -898,7 +900,7 @@
  
      /** IDocumentContentOperations
      */
@@ -1191,7 +1374,7 @@ Index: sw/inc/doc.hxx
  	virtual void DeleteSection(SwNode* pNode);
  	virtual bool Delete(SwPaM&);
  	virtual bool DelFullPara(SwPaM&);
-@@ -1118,6 +1120,7 @@
+@@ -1101,6 +1103,7 @@
  								SwFrmFmt *pParent = 0 );
  
  	void CopyWithFlyInFly( const SwNodeRange& rRg,
@@ -1199,7 +1382,7 @@ Index: sw/inc/doc.hxx
  							const SwNodeIndex& rInsPos,
  							sal_Bool bMakeNewFrms = sal_True,
  							sal_Bool bDelRedlines = sal_True,
-@@ -2117,6 +2120,7 @@
+@@ -2100,6 +2103,7 @@
  	{
  		return n32DummyCompatabilityOptions2;
  	}
@@ -1209,8 +1392,8 @@ Index: sw/inc/doc.hxx
  
 Index: sw/inc/unotxdoc.hxx
 ===================================================================
---- sw/inc/unotxdoc.hxx	(revision 272643)
-+++ sw/inc/unotxdoc.hxx	(revision 272644)
+--- sw/inc/unotxdoc.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/unotxdoc.hxx	(.../cws/os131)	(revision 275705)
 @@ -68,9 +68,8 @@
  #include <com/sun/star/xforms/XFormsSupplier.hpp>
  #include <com/sun/star/container/XNameContainer.hpp>
@@ -1299,8 +1482,8 @@ Index: sw/inc/unotxdoc.hxx
  	SwXDocumentPropertyHelper * GetPropertyHelper ();
 Index: sw/inc/IDocumentContentOperations.hxx
 ===================================================================
---- sw/inc/IDocumentContentOperations.hxx	(revision 272643)
-+++ sw/inc/IDocumentContentOperations.hxx	(revision 272644)
+--- sw/inc/IDocumentContentOperations.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/IDocumentContentOperations.hxx	(.../cws/os131)	(revision 275705)
 @@ -71,7 +71,7 @@
      /** Kopieren eines Bereiches im oder in ein anderes Dokument !
  	    Die Position kann auch im Bereich liegen !!
@@ -1310,3 +1493,10 @@ Index: sw/inc/IDocumentContentOperations
  
  	/** Loesche die Section, in der der Node steht.
      */
+
+Property changes on: .
+___________________________________________________________________
+Added: svn:mergeinfo
+   Merged /tags/DEV300_m50:r272825-272842
+   Merged /trunk:r270724-272824
+



From caolanm at fedoraproject.org  Wed Sep  2 13:45:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Sep 2009 13:45:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1997,
	1.1998 workspace.os131.patch, 1.1,
	1.2 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch, 1.1, NONE
Message-ID: <20090902134543.B1EBC11C008C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28045/devel

Modified Files:
	openoffice.org.spec workspace.os131.patch 
Removed Files:
	openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch 
Log Message:
Resolves: rhbz#520772 copy/paste cockup


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -p -r1.1997 -r1.1998
--- openoffice.org.spec	27 Aug 2009 16:17:21 -0000	1.1997
+++ openoffice.org.spec	2 Sep 2009 13:45:43 -0000	1.1998
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4210,6 +4210,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
+- Resolves: rhbz#520772 copy/paste cockup
+
 * Thu Aug 27 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
 - rebuilt with new openssl
 - add openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  384 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |  239 +++++++++--------------
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 606 insertions(+), 222 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.os131.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.os131.patch	21 Aug 2009 05:18:30 -0000	1.1
+++ workspace.os131.patch	2 Sep 2009 13:45:43 -0000	1.2
@@ -1,8 +1,8 @@
 Index: sw/source/filter/xml/xmltbli.cxx
 ===================================================================
---- sw/source/filter/xml/xmltbli.cxx	(revision 272643)
-+++ sw/source/filter/xml/xmltbli.cxx	(revision 272644)
-@@ -662,7 +662,7 @@
+--- sw/source/filter/xml/xmltbli.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/filter/xml/xmltbli.cxx	(.../cws/os131)	(revision 275705)
+@@ -667,7 +667,7 @@
  					SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
  								   *pSrcPaM->GetMark() );
  					SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
@@ -13,8 +13,8 @@ Index: sw/source/filter/xml/xmltbli.cxx
  				}
 Index: sw/source/filter/ww8/ww8glsy.cxx
 ===================================================================
---- sw/source/filter/ww8/ww8glsy.cxx	(revision 272643)
-+++ sw/source/filter/ww8/ww8glsy.cxx	(revision 272644)
+--- sw/source/filter/ww8/ww8glsy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/filter/ww8/ww8glsy.cxx	(.../cws/os131)	(revision 275705)
 @@ -187,7 +187,7 @@
                          -1 );
                      pCNd = aIdx.GetNode().GetCntntNode();
@@ -26,8 +26,8 @@ Index: sw/source/filter/ww8/ww8glsy.cxx
              }
 Index: sw/source/core/frmedt/fecopy.cxx
 ===================================================================
---- sw/source/core/frmedt/fecopy.cxx	(revision 272643)
-+++ sw/source/core/frmedt/fecopy.cxx	(revision 272644)
+--- sw/source/core/frmedt/fecopy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/frmedt/fecopy.cxx	(.../cws/os131)	(revision 275705)
 @@ -840,7 +840,7 @@
              {
                  SwNodeIndex aIndexBefore(rInsPos.nNode);
@@ -48,8 +48,8 @@ Index: sw/source/core/frmedt/fecopy.cxx
                      aIndexBefore++;
 Index: sw/source/core/txtnode/atrftn.cxx
 ===================================================================
---- sw/source/core/txtnode/atrftn.cxx	(revision 272643)
-+++ sw/source/core/txtnode/atrftn.cxx	(revision 272644)
+--- sw/source/core/txtnode/atrftn.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/txtnode/atrftn.cxx	(.../cws/os131)	(revision 275705)
 @@ -303,7 +303,7 @@
  		SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
  		ULONG  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
@@ -61,8 +61,8 @@ Index: sw/source/core/txtnode/atrftn.cxx
  		// Nodes geloescht werden:
 Index: sw/source/core/edit/edglss.cxx
 ===================================================================
---- sw/source/core/edit/edglss.cxx	(revision 272643)
-+++ sw/source/core/edit/edglss.cxx	(revision 272644)
+--- sw/source/core/edit/edglss.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/edglss.cxx	(.../cws/os131)	(revision 275705)
 @@ -168,7 +168,7 @@
  			aStt = pGDoc->GetNodes().GetEndOfExtras();
  			pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
@@ -84,14 +84,14 @@ Index: sw/source/core/edit/edglss.cxx
  			}
  			else
 -				bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
-+                bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
++                bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
  
  		FOREACHPAM_END()
          }
 Index: sw/source/core/edit/eddel.cxx
 ===================================================================
---- sw/source/core/edit/eddel.cxx	(revision 272643)
-+++ sw/source/core/edit/eddel.cxx	(revision 272644)
+--- sw/source/core/edit/eddel.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/edit/eddel.cxx	(.../cws/os131)	(revision 275705)
 @@ -253,7 +253,7 @@
  			bFirstMove = FALSE;
  		}
@@ -103,8 +103,8 @@ Index: sw/source/core/edit/eddel.cxx
          SwPaM aInsertPaM(*pPos, aSttNdIdx);
 Index: sw/source/core/doc/docnew.cxx
 ===================================================================
---- sw/source/core/doc/docnew.cxx	(revision 272643)
-+++ sw/source/core/doc/docnew.cxx	(revision 272644)
+--- sw/source/core/doc/docnew.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docnew.cxx	(.../cws/os131)	(revision 275705)
 @@ -32,6 +32,7 @@
  #include "precompiled_sw.hxx"
  #define ROLBCK_HISTORY_ONLY 	// Der Kampf gegen die CLOOK's
@@ -161,7 +161,7 @@ Index: sw/source/core/doc/docnew.cxx
  
  
  // --> OD 2006-04-19 #b6375613#
-@@ -1056,3 +1046,370 @@
+@@ -1057,3 +1047,369 @@
      }
  }
  // <--
@@ -472,7 +472,6 @@ Index: sw/source/core/doc/docnew.cxx
 +    aCpyPam.SetMark();
 +    aCpyPam.Move( fnMoveForward, fnGoDoc );
 +
-+    BOOL bRet = TRUE, bDelTbl = TRUE;
 +    this->StartUndo( UNDO_INSGLOSSARY, NULL );
 +    this->LockExpFlds();
 +
@@ -534,8 +533,8 @@ Index: sw/source/core/doc/docnew.cxx
 +}
 Index: sw/source/core/doc/doccomp.cxx
 ===================================================================
---- sw/source/core/doc/doccomp.cxx	(revision 272643)
-+++ sw/source/core/doc/doccomp.cxx	(revision 272644)
+--- sw/source/core/doc/doccomp.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/doccomp.cxx	(.../cws/os131)	(revision 275705)
 @@ -1196,7 +1196,7 @@
  					SwPaM aCpyPam( rSrcNd, nStt );
  					aCpyPam.SetMark();
@@ -565,8 +564,8 @@ Index: sw/source/core/doc/doccomp.cxx
  		pDoc->DoUndo( bUndo );
 Index: sw/source/core/doc/docnum.cxx
 ===================================================================
---- sw/source/core/doc/docnum.cxx	(revision 272643)
-+++ sw/source/core/doc/docnum.cxx	(revision 272644)
+--- sw/source/core/doc/docnum.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docnum.cxx	(.../cws/os131)	(revision 275705)
 @@ -2273,7 +2273,7 @@
                  }
              }
@@ -578,8 +577,8 @@ Index: sw/source/core/doc/docnum.cxx
  				// dann muss der letzte leere Node wieder entfernt werden
 Index: sw/source/core/doc/docredln.cxx
 ===================================================================
---- sw/source/core/doc/docredln.cxx	(revision 272643)
-+++ sw/source/core/doc/docredln.cxx	(revision 272644)
+--- sw/source/core/doc/docredln.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docredln.cxx	(.../cws/os131)	(revision 275705)
 @@ -3418,7 +3418,7 @@
  			SwNodeIndex aNdIdx( *pSttNd, 1 );
  			SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
@@ -607,8 +606,8 @@ Index: sw/source/core/doc/docredln.cxx
  		pCntntSect = new SwNodeIndex( *pSttNd );
 Index: sw/source/core/doc/docglos.cxx
 ===================================================================
---- sw/source/core/doc/docglos.cxx	(revision 272643)
-+++ sw/source/core/doc/docglos.cxx	(revision 272644)
+--- sw/source/core/doc/docglos.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docglos.cxx	(.../cws/os131)	(revision 275705)
 @@ -183,7 +183,7 @@
                  SwDontExpandItem aACD;
  				aACD.SaveDontExpandItems( rInsPos );
@@ -620,8 +619,8 @@ Index: sw/source/core/doc/docglos.cxx
  				if( pShell )
 Index: sw/source/core/doc/tblcpy.cxx
 ===================================================================
---- sw/source/core/doc/tblcpy.cxx	(revision 272643)
-+++ sw/source/core/doc/tblcpy.cxx	(revision 272644)
+--- sw/source/core/doc/tblcpy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/tblcpy.cxx	(.../cws/os131)	(revision 275705)
 @@ -567,7 +567,7 @@
  
  	SwNodeIndex aSavePos( aInsIdx, -1 );
@@ -633,8 +632,8 @@ Index: sw/source/core/doc/tblcpy.cxx
  	aSavePos++;
 Index: sw/source/core/doc/docglbl.cxx
 ===================================================================
---- sw/source/core/doc/docglbl.cxx	(revision 272643)
-+++ sw/source/core/doc/docglbl.cxx	(revision 272644)
+--- sw/source/core/doc/docglbl.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docglbl.cxx	(.../cws/os131)	(revision 275705)
 @@ -307,7 +307,7 @@
  						pDoc->GetNodes().Delete( aIdx, 1 );
  
@@ -655,8 +654,8 @@ Index: sw/source/core/doc/docglbl.cxx
  					// und noch alle Bookmarks
 Index: sw/source/core/doc/tblrwcl.cxx
 ===================================================================
---- sw/source/core/doc/tblrwcl.cxx	(revision 272643)
-+++ sw/source/core/doc/tblrwcl.cxx	(revision 272644)
+--- sw/source/core/doc/tblrwcl.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/tblrwcl.cxx	(.../cws/os131)	(revision 275705)
 @@ -2103,7 +2103,7 @@
                              *rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
                  SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
@@ -668,8 +667,8 @@ Index: sw/source/core/doc/tblrwcl.cxx
              }
 Index: sw/source/core/doc/doclay.cxx
 ===================================================================
---- sw/source/core/doc/doclay.cxx	(revision 272643)
-+++ sw/source/core/doc/doclay.cxx	(revision 272644)
+--- sw/source/core/doc/doclay.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/doclay.cxx	(.../cws/os131)	(revision 275705)
 @@ -507,7 +507,7 @@
  
  		// sorge dafuer das auch Fly's in Fly's kopiert werden
@@ -690,9 +689,9 @@ Index: sw/source/core/doc/doclay.cxx
  				mbUndo = bOldUndo;
 Index: sw/source/core/doc/docfmt.cxx
 ===================================================================
---- sw/source/core/doc/docfmt.cxx	(revision 272643)
-+++ sw/source/core/doc/docfmt.cxx	(revision 272644)
-@@ -2126,7 +2126,7 @@
+--- sw/source/core/doc/docfmt.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/doc/docfmt.cxx	(.../cws/os131)	(revision 275705)
+@@ -2136,7 +2136,7 @@
  				aTmpIdx = *pSttNd->EndOfSectionNode();
  				rSrcNds._Copy( aRg, aTmpIdx );
  				aTmpIdx = *pSttNd;
@@ -703,8 +702,8 @@ Index: sw/source/core/doc/docfmt.cxx
  			else
 Index: sw/source/core/undo/untblk.cxx
 ===================================================================
---- sw/source/core/undo/untblk.cxx	(revision 272643)
-+++ sw/source/core/undo/untblk.cxx	(revision 272644)
+--- sw/source/core/undo/untblk.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/undo/untblk.cxx	(.../cws/os131)	(revision 275705)
 @@ -346,7 +346,7 @@
  
  	SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
@@ -716,9 +715,9 @@ Index: sw/source/core/undo/untblk.cxx
  }
 Index: sw/source/core/docnode/ndcopy.cxx
 ===================================================================
---- sw/source/core/docnode/ndcopy.cxx	(revision 272643)
-+++ sw/source/core/docnode/ndcopy.cxx	(revision 272644)
-@@ -659,7 +659,7 @@
+--- sw/source/core/docnode/ndcopy.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/docnode/ndcopy.cxx	(.../cws/os131)	(revision 275705)
+@@ -670,7 +670,7 @@
  
  // Kopieren eines Bereiches im oder in ein anderes Dokument !
  
@@ -727,7 +726,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  {
  	const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
  
-@@ -698,13 +698,13 @@
+@@ -709,13 +709,13 @@
  	BOOL bRet = FALSE;
  
  	if( pDoc != this )
@@ -743,7 +742,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  	else
  	{
-@@ -728,7 +728,7 @@
+@@ -739,7 +739,7 @@
  		SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
  								SwNodeIndex( GetNodes().GetEndOfAutotext() ));
  		aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
@@ -752,7 +751,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  		aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
  		aPam.SetMark();
-@@ -803,7 +803,7 @@
+@@ -814,7 +814,7 @@
  }
  
  BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
@@ -761,7 +760,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  {
  	SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
      bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
-@@ -1087,7 +1087,7 @@
+@@ -1098,7 +1098,7 @@
  			}
  		}
  
@@ -770,7 +769,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  		{
  			SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
              if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
-@@ -1102,13 +1102,13 @@
+@@ -1113,13 +1113,13 @@
  			if( aInsPos == pEnd->nNode )
  			{
  				SwNodeIndex aSaveIdx( aInsPos, -1 );
@@ -786,7 +785,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
  			bCopyBookmarks = FALSE;
  
-@@ -1167,7 +1167,7 @@
+@@ -1178,7 +1178,7 @@
  
  //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
  
@@ -795,7 +794,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  							const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
  							BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
  {
-@@ -1206,7 +1206,7 @@
+@@ -1217,7 +1217,7 @@
  	// Undo abschalten
  	BOOL bUndo = pDest->DoesUndo();
  	pDest->DoUndo( FALSE );
@@ -804,7 +803,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  	pDest->DoUndo( bUndo );
  
  	SwNodeRange aCpyRange( aSavePos, rInsPos );
-@@ -1242,7 +1242,7 @@
+@@ -1253,7 +1253,7 @@
  	}
  }
  
@@ -813,7 +812,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  							BOOL bCopyFlyAtFly ) const
  {
  	// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
-@@ -1259,7 +1259,8 @@
+@@ -1270,7 +1270,8 @@
  		const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
  		const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
  		const SwPosition* pAPos;
@@ -823,7 +822,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
  			   pAnchor->GetAnchorId() == FLY_AT_FLY ||
  			   pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
  			 0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
-@@ -1268,9 +1269,53 @@
+@@ -1279,9 +1280,53 @@
  					: ( IsRedlineMove()
  							? rRg.aStart < pAPos->nNode
  							: rRg.aStart <= pAPos->nNode )) &&
@@ -881,9 +880,9 @@ Index: sw/source/core/docnode/ndcopy.cxx
  
 Index: sw/source/core/docnode/section.cxx
 ===================================================================
---- sw/source/core/docnode/section.cxx	(revision 272643)
-+++ sw/source/core/docnode/section.cxx	(revision 272644)
-@@ -1415,7 +1415,7 @@
+--- sw/source/core/docnode/section.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/core/docnode/section.cxx	(.../cws/os131)	(revision 275705)
+@@ -1414,7 +1414,7 @@
  						if( pSrcDoc != pDoc ||
  							pCpyPam->Start()->nNode > rInsPos ||
  							rInsPos >= pCpyPam->End()->nNode )
@@ -892,7 +891,7 @@ Index: sw/source/core/docnode/section.cx
  						delete pCpyPam;
  					}
  					if( pCpyRg && pSrcDoc == pDoc &&
-@@ -1444,7 +1444,7 @@
+@@ -1443,7 +1443,7 @@
  
  					SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
  
@@ -903,20 +902,18 @@ Index: sw/source/core/docnode/section.cx
  					if( !bCreateFrm )
 Index: sw/source/ui/dbui/dbmgr.cxx
 ===================================================================
---- sw/source/ui/dbui/dbmgr.cxx	(revision 272643)
-+++ sw/source/ui/dbui/dbmgr.cxx	(revision 272644)
-@@ -35,7 +35,9 @@
+--- sw/source/ui/dbui/dbmgr.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/dbui/dbmgr.cxx	(.../cws/os131)	(revision 275705)
+@@ -35,7 +35,7 @@
  #endif
  
  #include <stdio.h>
 -
-+#ifdef SW_COPY_DOC_IN_MEMORY
 +#include <unotxdoc.hxx>
-+#endif
  #include <com/sun/star/text/NotePrintMode.hpp>
  #include <sfx2/app.hxx>
  #include <com/sun/star/sdb/CommandType.hpp>
-@@ -43,17 +45,13 @@
+@@ -43,17 +43,13 @@
  #include <com/sun/star/frame/XComponentLoader.hpp>
  #include <com/sun/star/lang/DisposedException.hpp>
  #include <com/sun/star/lang/XEventListener.hpp>
@@ -935,7 +932,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
  #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
  #include <com/sun/star/uno/XNamingService.hpp>
-@@ -65,9 +63,7 @@
+@@ -65,9 +61,7 @@
  #include <dbconfig.hxx>
  #include <swdbtoolsclient.hxx>
  #include <pagedesc.hxx>
@@ -945,7 +942,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <unotools/tempfile.hxx>
  #include <svtools/pathoptions.hxx>
  #include <svtools/urihelper.hxx>
-@@ -86,39 +82,25 @@
+@@ -86,39 +80,25 @@
  #include <goodies/mailenum.hxx>
  #include <cmdid.h>
  #include <swmodule.hxx>
@@ -985,81 +982,267 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <mmconfigitem.hxx>
  #include <sfx2/request.hxx>
  #include <hintids.hxx>
-@@ -3182,7 +3164,10 @@
+@@ -3185,7 +3165,6 @@
  
      SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
      BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-     String sSourceDocURL;
-+#endif
+-    String sSourceDocURL;
      //save the settings of the first
      rSourceShell.SttEndDoc(TRUE);
      USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3192,6 +3177,8 @@
+@@ -3195,22 +3174,6 @@
  
      try
      {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-         // save the working document into a temporary location
-         sSourceDocURL = URIHelper::SmartRel2Abs(
-             INetURLObject(), utl::TempFile::CreateTempName(),
-@@ -3207,7 +3194,7 @@
-         pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
-         uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-         xStore->storeToURL( sSourceDocURL, aValues );
+-        // save the working document into a temporary location
+-        sSourceDocURL = URIHelper::SmartRel2Abs(
+-            INetURLObject(), utl::TempFile::CreateTempName(),
+-            URIHelper::GetMaybeFileHdl());
+-        const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
+-                String::CreateFromAscii( FILTER_XML ),
+-                SwDocShell::Factory().GetFilterContainer() );
+-
+-        SfxStringItem aFilterName( SID_FILTER_NAME, pSfxFlt->GetFilterName());
+-        uno::Sequence< beans::PropertyValue > aValues(1);
+-        beans::PropertyValue* pValues = aValues.getArray();
+-        pValues[0].Name = C2U("FilterName");
+-        pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+-        uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+-        xStore->storeToURL( sSourceDocURL, aValues );
 -
-+#endif
          // create a target docshell to put the merged document into
          SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
          xTargetDocShell->DoInitNew( 0 );
-@@ -3256,6 +3243,15 @@
+@@ -3259,116 +3222,120 @@
                      Application::Reschedule();
              }
  
-+#ifdef SW_COPY_DOC_IN_MEMORY
+-            // create a new docshell from the temporary document
+-            SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+-            SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
+-            SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+-            SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL );
+-            const SfxPoolItem* pReturnValue =
+-                            rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
+-                                    &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
+-            if(pReturnValue)
 +            // copy the source document
-+            uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-+            uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
-+            SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++            SfxObjectShellRef xWorkDocSh;
++            if(nDocNo == 1 )
+             {
+-                SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
+-                SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+-                SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
+-                pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++                uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
++                uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
++                SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++                xWorkDocSh = pWorkModel->GetDocShell();
++            }
++            else
++            {
++                SwDoc* pNewDoc = rSourceView.GetDocShell()->GetDoc()->CreateCopy();
++                xWorkDocSh = new SwDocShell( pNewDoc, SFX_CREATE_MODE_STANDARD );
++                xWorkDocSh->DoInitNew();
++            }    
 +            //create a ViewFrame
-+            SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
 +            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
-+#else
-             // create a new docshell from the temporary document
-             SfxBoolItem aHidden( SID_HIDDEN, TRUE );
-             SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
-@@ -3265,9 +3261,13 @@
-                             rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
-                                     &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
-             if(pReturnValue)
-+#endif
-             {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else                
-                 SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
-                 SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
-+#endif
-                 SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
-                 pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++            SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
++            pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
  
-@@ -3387,8 +3387,11 @@
+-                // merge the data
+-                SwDoc* pWorkDoc = rWorkShell.GetDoc();
+-                SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+-                pWorkDoc->SetNewDBMgr( this );
+-                pWorkDoc->EmbedAllLinks();
+-                if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
+-                    rWorkShell.Undo();
+-                // create a layout
+-                rWorkShell.CalcLayout();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+-                rWorkShell.ViewShell::UpdateFlds();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++            // merge the data
++            SwDoc* pWorkDoc = rWorkShell.GetDoc();
++            SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
++            pWorkDoc->SetNewDBMgr( this );
++            pWorkDoc->EmbedAllLinks();
++            if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
++                rWorkShell.Undo();
++            // create a layout
++            rWorkShell.CalcLayout();
++            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++            rWorkShell.ViewShell::UpdateFlds();
++            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+ 
+-                // strip invisible content and convert fields to text
+-                rWorkShell.RemoveInvisibleContent();
+-                rWorkShell.ConvertFieldsToText();
+-                rWorkShell.SetNumberingRestart();
++            // strip invisible content and convert fields to text
++            rWorkShell.RemoveInvisibleContent();
++            rWorkShell.ConvertFieldsToText();
++            rWorkShell.SetNumberingRestart();
+ 
+ 
+-                // insert the document into the target document
+-                rWorkShell.SttEndDoc(FALSE);
+-                rWorkShell.SttEndDoc(TRUE);
+-                rWorkShell.SelAll();
+-                pTargetShell->SttEndDoc(FALSE);
++            // insert the document into the target document
++            rWorkShell.SttEndDoc(FALSE);
++            rWorkShell.SttEndDoc(TRUE);
++            rWorkShell.SelAll();
++            pTargetShell->SttEndDoc(FALSE);
+ 
+-                //#i63806# put the styles to the target document
+-                //if the source uses headers or footers each new copy need to copy a new page styles
+-                if(bPageStylesWithHeaderFooter)
+-                {
+-                    //create a new pagestyle
+-                    //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
++            //#i63806# put the styles to the target document
++            //if the source uses headers or footers each new copy need to copy a new page styles
++            if(bPageStylesWithHeaderFooter)
++            {
++                //create a new pagestyle
++                //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
+ 
+-                    SwDoc* pTargetDoc = pTargetShell->GetDoc();
+-                    String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
+-                    pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
+-                    SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+-                    if(pSourcePageDesc && pTargetPageDesc)
+-                    {
+-                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+-                        sModifiedStartingPageDesc = sNewPageDescName;
+-                        lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+-                    }
+-                }
+-                if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++                SwDoc* pTargetDoc = pTargetShell->GetDoc();
++                String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
++                pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
++                SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
++                if(pSourcePageDesc && pTargetPageDesc)
+                 {
+-                    pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++                    pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
++                    sModifiedStartingPageDesc = sNewPageDescName;
++                    lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+                 }
+-                if(nDocNo > 1)
++            }
++            if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++            {
++                pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++            }
++            if(nDocNo > 1)
++            {
++                pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++            }
++            else
++            {
++                pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
++            }
++            USHORT nPageCountBefore = pTargetShell->GetPageCnt();
++            DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
++            //#i51359# add a second paragraph in case there's only one
++            {
++                SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
++              SwPosition aTestPos( aIdx );
++              SwCursor aTestCrsr(aTestPos,0,false);
++                if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+                 {
+-                    pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++                    //append a paragraph
++                    pWorkDoc->AppendTxtNode( aTestPos );
+                 }
+-                else
+-                {
+-                    pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
+-                }
+-                USHORT nPageCountBefore = pTargetShell->GetPageCnt();
+-                DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
+-                //#i51359# add a second paragraph in case there's only one
+-                {
+-                    SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
+-                  SwPosition aTestPos( aIdx );
+-                  SwCursor aTestCrsr(aTestPos,0,false);
+-                    if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+-                    {
+-                        //append a paragraph
+-                        pWorkDoc->AppendTxtNode( aTestPos );
+-                    }
+-                }
+-                pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+-                //convert fields in page styles (header/footer - has to be done after the first document has been pasted
+-                if(1 == nDocNo)
+-                {
+-                    pTargetShell->CalcLayout();
+-                    pTargetShell->ConvertFieldsToText();
+-                }
+-                //add the document info to the config item
+-                SwDocMergeInfo aMergeInfo;
+-                aMergeInfo.nStartPageInTarget = nPageCountBefore;
+-                //#i72820# calculate layout to be able to find the correct page index
++            }
++            pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
++            //convert fields in page styles (header/footer - has to be done after the first document has been pasted
++            if(1 == nDocNo)
++            {
+                 pTargetShell->CalcLayout();
+-                aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
+-                aMergeInfo.nDBRow = nStartRow;
+-                rMMConfig.AddMergedDocument( aMergeInfo );
+-                ++nRet;
++                pTargetShell->ConvertFieldsToText();
++            }
++            //add the document info to the config item
++            SwDocMergeInfo aMergeInfo;
++            aMergeInfo.nStartPageInTarget = nPageCountBefore;
++            //#i72820# calculate layout to be able to find the correct page index
++            pTargetShell->CalcLayout();
++            aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
++            aMergeInfo.nDBRow = nStartRow;
++            rMMConfig.AddMergedDocument( aMergeInfo );
++            ++nRet;
+ 
+-                // the print monitor needs some time to act
+-                for( USHORT i = 0; i < 25; i++)
+-                    Application::Reschedule();
++            // the print monitor needs some time to act
++            for( USHORT i = 0; i < 25; i++)
++                Application::Reschedule();
+ 
+-                //restore the ole DBMgr
+-                pWorkDoc->SetNewDBMgr( pWorkDBMgr );
+-                //now the temporary document should be closed
+-                SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
+-                xDocSh->DoClose();
+-            }
++            //restore the ole DBMgr
++            pWorkDoc->SetNewDBMgr( pWorkDBMgr );
++            //now the temporary document should be closed
++            SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
++            xDocSh->DoClose();
+             nEndRow = pImpl->pMergeData->xResultSet->getRow();
+             ++nDocNo;
+         } while( !bCancel &&
+@@ -3390,8 +3357,6 @@
      {
          DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
      }
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
-     if(sSourceDocURL.Len())
-         File::remove( sSourceDocURL );
-+#endif
+-    if(sSourceDocURL.Len())
+-        File::remove( sSourceDocURL );
      DELETEZ(pImpl->pMergeData);
      bInMerge = FALSE;
      return nRet;
 Index: sw/source/ui/uno/unoatxt.cxx
 ===================================================================
---- sw/source/ui/uno/unoatxt.cxx	(revision 272643)
-+++ sw/source/ui/uno/unoatxt.cxx	(revision 272644)
+--- sw/source/ui/uno/unoatxt.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/uno/unoatxt.cxx	(.../cws/os131)	(revision 275705)
 @@ -417,7 +417,7 @@
  		if(pxCursor)
  		{
@@ -1080,8 +1263,8 @@ Index: sw/source/ui/uno/unoatxt.cxx
  	}
 Index: sw/source/ui/uno/unotxdoc.cxx
 ===================================================================
---- sw/source/ui/uno/unotxdoc.cxx	(revision 272643)
-+++ sw/source/ui/uno/unotxdoc.cxx	(revision 272644)
+--- sw/source/ui/uno/unotxdoc.cxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/source/ui/uno/unotxdoc.cxx	(.../cws/os131)	(revision 275705)
 @@ -37,16 +37,12 @@
  #include <vcl/virdev.hxx>
  #include <vcl/svapp.hxx>
@@ -1123,7 +1306,7 @@ Index: sw/source/ui/uno/unotxdoc.cxx
  #include <swcont.hxx>
  #include <unodefaults.hxx>
  #include <SwXDocumentSettings.hxx>
-@@ -2856,7 +2846,27 @@
+@@ -2851,7 +2841,27 @@
  {
      return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
  }
@@ -1153,9 +1336,9 @@ Index: sw/source/ui/uno/unotxdoc.cxx
   ---------------------------------------------------------------------------*/
 Index: sw/inc/doc.hxx
 ===================================================================
---- sw/inc/doc.hxx	(revision 272643)
-+++ sw/inc/doc.hxx	(revision 272644)
-@@ -636,7 +636,7 @@
+--- sw/inc/doc.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/doc.hxx	(.../cws/os131)	(revision 275705)
+@@ -638,7 +638,7 @@
  		// Kopieren eines Bereiches im oder in ein anderes Dokument !
  		// Die Position darf nicht im Bereich liegen !!
  	sal_Bool _Copy( SwPaM&, SwPosition&,
@@ -1164,7 +1347,7 @@ Index: sw/inc/doc.hxx
  
  	SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
  								const SwCntntNode& rNode, RndStdIds eRequestId,
-@@ -648,7 +648,8 @@
+@@ -650,7 +650,8 @@
  								const SfxItemSet* pGrfAttrSet,
  								SwFrmFmt* = 0 );
  
@@ -1174,7 +1357,7 @@ Index: sw/inc/doc.hxx
  						sal_Bool bCopyFlyAtFly = sal_False ) const;	// steht im ndcopy.cxx
      sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
  
-@@ -720,6 +721,7 @@
+@@ -722,6 +723,7 @@
       SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
       SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
  
@@ -1182,7 +1365,7 @@ Index: sw/inc/doc.hxx
  public:
  
      /** Life cycle
-@@ -915,7 +917,7 @@
+@@ -898,7 +900,7 @@
  
      /** IDocumentContentOperations
      */
@@ -1191,7 +1374,7 @@ Index: sw/inc/doc.hxx
  	virtual void DeleteSection(SwNode* pNode);
  	virtual bool Delete(SwPaM&);
  	virtual bool DelFullPara(SwPaM&);
-@@ -1118,6 +1120,7 @@
+@@ -1101,6 +1103,7 @@
  								SwFrmFmt *pParent = 0 );
  
  	void CopyWithFlyInFly( const SwNodeRange& rRg,
@@ -1199,7 +1382,7 @@ Index: sw/inc/doc.hxx
  							const SwNodeIndex& rInsPos,
  							sal_Bool bMakeNewFrms = sal_True,
  							sal_Bool bDelRedlines = sal_True,
-@@ -2117,6 +2120,7 @@
+@@ -2100,6 +2103,7 @@
  	{
  		return n32DummyCompatabilityOptions2;
  	}
@@ -1209,8 +1392,8 @@ Index: sw/inc/doc.hxx
  
 Index: sw/inc/unotxdoc.hxx
 ===================================================================
---- sw/inc/unotxdoc.hxx	(revision 272643)
-+++ sw/inc/unotxdoc.hxx	(revision 272644)
+--- sw/inc/unotxdoc.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/unotxdoc.hxx	(.../cws/os131)	(revision 275705)
 @@ -68,9 +68,8 @@
  #include <com/sun/star/xforms/XFormsSupplier.hpp>
  #include <com/sun/star/container/XNameContainer.hpp>
@@ -1299,8 +1482,8 @@ Index: sw/inc/unotxdoc.hxx
  	SwXDocumentPropertyHelper * GetPropertyHelper ();
 Index: sw/inc/IDocumentContentOperations.hxx
 ===================================================================
---- sw/inc/IDocumentContentOperations.hxx	(revision 272643)
-+++ sw/inc/IDocumentContentOperations.hxx	(revision 272644)
+--- sw/inc/IDocumentContentOperations.hxx	(.../tags/DEV300_m50)	(revision 275705)
++++ sw/inc/IDocumentContentOperations.hxx	(.../cws/os131)	(revision 275705)
 @@ -71,7 +71,7 @@
      /** Kopieren eines Bereiches im oder in ein anderes Dokument !
  	    Die Position kann auch im Bereich liegen !!
@@ -1310,3 +1493,10 @@ Index: sw/inc/IDocumentContentOperations
  
  	/** Loesche die Section, in der der Node steht.
      */
+
+Property changes on: .
+___________________________________________________________________
+Added: svn:mergeinfo
+   Merged /tags/DEV300_m50:r272825-272842
+   Merged /trunk:r270724-272824
+


--- openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch DELETED ---



From pfj at fedoraproject.org  Wed Sep  2 13:46:06 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed,  2 Sep 2009 13:46:06 +0000 (UTC)
Subject: rpms/xmms/F-10 xmms-play.patch, NONE, 1.1 import.log, 1.3,
	1.4 xmms.spec, 1.38, 1.39
Message-ID: <20090902134606.1A4A911C008C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xmms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28135/F-10

Modified Files:
	import.log xmms.spec 
Added Files:
	xmms-play.patch 
Log Message:

Fixes play on double click bug (BZ 434692)
Adds xmms-skins sub-package 


xmms-play.patch:
 xmms.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xmms-play.patch ---
--- xmms-1.2.11-20071117cvs/xmms/xmms.desktop	2002-02-11 23:15:56.000000000 +0000
+++ xmms-1.2.11-20071117cvs/xmms/xmms.desktop-new	2009-09-02 14:19:57.000000000 +0100
@@ -14,7 +14,7 @@
 comment[tr]=X Multimedya Sistem
 comment[zh_TW]=X ?h?C???t??
 Encoding=Legacy-Mixed
-Exec=xmms
+Exec=xmms -e -p %F
 Icon=xmms_mini.xpm
 MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
 Terminal=0


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Nov 2008 15:01:47 -0000	1.3
+++ import.log	2 Sep 2009 13:46:05 -0000	1.4
@@ -1,3 +1,4 @@
 xmms-1_2_11-1_20071117cvs_fc10:HEAD:xmms-1.2.11-1.20071117cvs.fc10.src.rpm:1220391799
 xmms-1_2_11-1_20071117cvs_1_fc10:HEAD:xmms-1.2.11-1.20071117cvs.1.fc10.src.rpm:1221173377
 xmms-1_2_11-3_20071117cvs_fc11:F-10:xmms-1.2.11-3.20071117cvs.fc11.src.rpm:1227970783
+xmms-1_2_11-7_20071117cvs_fc12:F-10:xmms-1.2.11-7.20071117cvs.fc12.src.rpm:1251899096


Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-10/xmms.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xmms.spec	29 Nov 2008 15:01:47 -0000	1.38
+++ xmms.spec	2 Sep 2009 13:46:05 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        3.20071117cvs%{?dist}
+Release:        7.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -25,6 +25,7 @@ Patch6:         %{name}-1.2.11-alsalib.p
 Patch7:         %{name}-cd-mountpoint.patch
 # Patch8 on top of patch4
 Patch8:         %{name}-1.2.11-multilib.patch
+Patch9:		%{name}-play.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
 Patch14:	%{name}-1.2.10-configfile-safe-write.patch
@@ -50,6 +51,9 @@ Requires:       %{_datadir}/desktop-menu
 Requires(post): desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
 
+# Skin packages can require this from xmms and all GUI compatible players
+Provides:       xmms-gui
+
 %description
 XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
 with an interface similar to Winamp's.  XMMS supports playlists and
@@ -104,6 +108,7 @@ Files needed for building plug-ins for t
 # Randomize playlists better
 %patch14 -p1
 %patch15 -p1
+%patch9 -p1 -b .playonclick
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -215,6 +220,18 @@ update-desktop-database -q || :
 
 
 %changelog
+* Wed Sep 02 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1:1.2.11-7.20071117cvs
+- Fix play on click bug (BZ434692)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.11-6.20071117cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-5.20071117cvs
+- Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.11-4.20071117cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-3
 - Fix multilib patch
 



From pghmcfc at fedoraproject.org  Wed Sep  2 13:46:36 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 13:46:36 +0000 (UTC)
Subject: rpms/grepmail/devel grepmail-5.3034-empty-file-not-error.patch, NONE,
	1.1 grepmail-5.3034-revert-recursive-test-change.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 grepmail.spec, 1.11, 1.12 sources, 1.3, 1.4
Message-ID: <20090902134636.3CA6811C008C@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/grepmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28503

Modified Files:
	.cvsignore grepmail.spec sources 
Added Files:
	grepmail-5.3034-empty-file-not-error.patch 
	grepmail-5.3034-revert-recursive-test-change.patch 
Log Message:
* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 5.3034-1
- Update to 5.3034
  - fix man page year typo (Debian bug #428973)
  - updated to the latest version of Module::Install
  - added TODO to the distribution
  - fix a bug where grepmail could abort with -L
  - fix a bug in the -R test that could cause a false test failure
  - fix uninitialized variable warnings for emails missing certain headers
- URLs moved back to search.cpan.org
- Buildreq perl(Test::More)
- Buildreq perl(Module::AutoInstall), should have been bundled
- Revert change to t/recursive.t from 5.3033 that causes test failure
- Patch t/nonexistent_mailbox.t to support changed behaviour of
  Mail::Mbox::MessageParser >= 1.5002


grepmail-5.3034-empty-file-not-error.patch:
 nonexistent_mailbox.t |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE grepmail-5.3034-empty-file-not-error.patch ---
--- grepmail-5.3034/t/nonexistent_mailbox.t	2009-09-02 11:51:28.000000000 +0100
+++ grepmail-5.3034/t/nonexistent_mailbox.t	2009-09-02 13:37:09.000000000 +0100
@@ -149,6 +149,15 @@
 
   my %skip;
 
+  $skip{"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+        " | grepmail pattern"} = 'inappropriate for Mail::Mbox::MessageParser >= 1.5002'
+        if $Mail::Mbox::MessageParser::VERSION >= 1.5002;
+
+  $skip{"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+        " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"} =
+        'inappropriate for Mail::Mbox::MessageParser >= 1.5002'
+        if $Mail::Mbox::MessageParser::VERSION >= 1.5002;
+
   return %skip;
 }
 

grepmail-5.3034-revert-recursive-test-change.patch:
 recursive.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE grepmail-5.3034-revert-recursive-test-change.patch ---
--- grepmail-5.3034/t/recursive.t	2009-08-16 21:25:17.000000000 +0100
+++ grepmail-5.3034/t/recursive.t	2009-09-02 11:24:03.000000000 +0100
@@ -17,7 +17,7 @@
 'grepmail -Lq Handy t/temp/directory_with_links'
   => ['recursive2','none'],
 'grepmail -Rq Handy t/temp/directory_with_links'
-  => ['recursive2','none'],
+  => ['recursive','none'],
 );
 
 my %expected_errors = (


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 14:01:37 -0000	1.3
+++ .cvsignore	2 Sep 2009 13:46:35 -0000	1.4
@@ -1 +1 @@
-grepmail-5.3033.tar.gz
+grepmail-5.3034.tar.gz


Index: grepmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/grepmail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- grepmail.spec	25 Jul 2009 01:25:55 -0000	1.11
+++ grepmail.spec	2 Sep 2009 13:46:36 -0000	1.12
@@ -1,17 +1,22 @@
 Summary:	Search mailboxes for a particular email
 Name:		grepmail
-Version:	5.3033
-Release:	6%{?dist}
+Version:	5.3034
+Release:	1%{?dist}
 License:	GPL+
 Group:		Applications/Text
-Url:		http://grepmail.sourceforge.net/
-Source0:	http://downloads.sf.net/grepmail/grepmail-%{version}.tar.gz
+Url:		http://search.cpan.org/dist/grepmail/
+Source0:	http://search.cpan.org/CPAN/authors/id/D/DC/DCOPPIT/grepmail-%{version}.tar.gz
+Patch0:		grepmail-5.3034-revert-recursive-test-change.patch
+Patch1:		grepmail-5.3034-empty-file-not-error.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(Mail::Mbox::MessageParser) >= 1.4001
 BuildRequires:	perl(Mail::Mbox::MessageParser) >= 1.4001, perl(Date::Parse), perl(Date::Manip)
-BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::More)
+# AutoInstall.pm should have been bundled but wasn't
+# http://code.google.com/p/grepmail/issues/detail?id=1
+BuildRequires:	perl(Module::AutoInstall)
 # The following module requirements are optional and hence not picked up by RPM automatically.
 # Adding manual deps for them improves grepmail's functionality.
 Requires:	perl(Date::Parse), perl(Date::Manip)
@@ -26,6 +31,14 @@ operators.
 %prep
 %setup -q -n %{name}-%{version}
 
+# Revert recursive test change in 5.3034 that breaks test suite
+# http://code.google.com/p/grepmail/issues/detail?id=2
+%patch0 -p1
+
+# Empty files are not treated as errors by Mail::Mbox::MessageParser >= 1.5002
+# http://code.google.com/p/grepmail/issues/detail?id=2
+%patch1 -p1
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor --default
 %{__make} %{?_smp_mflags}
@@ -34,7 +47,7 @@ operators.
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %check
@@ -47,19 +60,34 @@ export TZ=GMT0
 
 %files
 %defattr(-,root,root,-)
-%doc README* CHANGES LICENSE
+%doc README* CHANGES LICENSE TODO
 %{_bindir}/grepmail
 %{_mandir}/man1/grepmail.1*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3033-6
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 5.3034-1
+- Update to 5.3034
+  - fix man page year typo (Debian bug #428973)
+  - updated to the latest version of Module::Install
+  - added TODO to the distribution
+  - fix a bug where grepmail could abort with -L
+  - fix a bug in the -R test that could cause a false test failure
+  - fix uninitialized variable warnings for emails missing certain headers
+- URLs moved back to search.cpan.org
+- Buildreq perl(Test::More)
+- Buildreq perl(Module::AutoInstall), should have been bundled
+- Revert change to t/recursive.t from 5.3033 that causes test failure
+- Patch t/nonexistent_mailbox.t to support changed behaviour of
+  Mail::Mbox::MessageParser >= 1.5002
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 5.3033-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3033-5
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 5.3033-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Feb  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 5.3033-4
-- rebuild for new perl
+- Rebuild for new perl
 
 * Wed Apr 18 2007 Paul Howarth <paul at city-fan.org> 5.3033-3
 - Buildrequire perl(ExtUtils::MakeMaker) instead of perl-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Mar 2007 14:01:37 -0000	1.3
+++ sources	2 Sep 2009 13:46:36 -0000	1.4
@@ -1 +1 @@
-83f94e253ccb02fde9a207d7f23c9cd2  grepmail-5.3033.tar.gz
+1785cc317fab38bc8386b44c543ae6d1  grepmail-5.3034.tar.gz



From till at fedoraproject.org  Wed Sep  2 13:50:54 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed,  2 Sep 2009 13:50:54 +0000 (UTC)
Subject: rpms/dzen2/F-11 dzen2-0.8.5-check_environment.patch, NONE,
	1.1 dzen2-0.8.5-verbose.patch, NONE, 1.1 dzen2-dbar.1, NONE,
	1.1 dzen2-gcpubar.1, NONE, 1.1 dzen2-gdbar.1, NONE,
	1.1 dzen2-textwidth.1, NONE, 1.1 dzen2.1, NONE, 1.1 dzen2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902135054.798E311C008C@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/dzen2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31214

Modified Files:
	.cvsignore sources 
Added Files:
	dzen2-0.8.5-check_environment.patch dzen2-0.8.5-verbose.patch 
	dzen2-dbar.1 dzen2-gcpubar.1 dzen2-gdbar.1 dzen2-textwidth.1 
	dzen2.1 dzen2.spec 
Log Message:
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %build


dzen2-0.8.5-check_environment.patch:
 config.mk         |   45 +++++++++++++++++++++++----------------------
 gadgets/config.mk |    9 +++++----
 2 files changed, 28 insertions(+), 26 deletions(-)

--- NEW FILE dzen2-0.8.5-check_environment.patch ---
diff -up dzen2-0.8.5/config.mk.check_environment dzen2-0.8.5/config.mk
--- dzen2-0.8.5/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/config.mk	2007-12-26 13:40:06.000000000 +0100
@@ -4,40 +4,41 @@ VERSION = 0.8.5
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 INCS = -I. -I/usr/include -I${X11INC}
 
 # Configure the features you want to be supported
-# Only one of the following options has to be uncommented, 
-# all others must be commented!
-#
-# Uncomment: Remove # from the beginning of respective lines
-# Comment  : Add # to the beginning of the respective lines
 
-# Option 1: No Xinerama no XPM
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+# Remove the # from the next line to enable Xinerama support
+#DZEN_XINERAMA=1
+
+# Remove the # from the next line to enable Xpm support
+#DZEN_XPM=1
 
-# Option 2: No Xinerama with XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
-
-# Option 3: With Xinerama no XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
-
-# Option 4: With Xinerama and XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+# Uncomment: Remove # from the beginning of respective lines
+# Comment  : Add # to the beginning of the respective lines
 
 # END of feature configuration
 
+CFLAGS ?= -Os
+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+
+ifeq ($(DZEN_XINERAMA),1)
+LIBS += -lXinerama
+CFLAGS += -DDZEN_XINERAMA
+endif
+
+ifeq ($(DZEN_XPM), 1)
+LIBS += -lXpm
+CFLAGS += -DDZEN_XPM
+endif
 
-LDFLAGS = ${LIBS}
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # Solaris, uncomment for Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff -up dzen2-0.8.5/gadgets/config.mk.check_environment dzen2-0.8.5/gadgets/config.mk
--- dzen2-0.8.5/gadgets/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/config.mk	2007-12-26 13:39:04.000000000 +0100
@@ -1,8 +1,8 @@
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 INCS = -I. -I/usr/include -I${X11INC}
@@ -10,8 +10,9 @@ INCS = -I. -I/usr/include -I${X11INC}
 X11LIB = /usr/X11R6/lib
 LIBS = -L/usr/lib 
 
-CFLAGS = -Os ${INCS} 
-LDFLAGS = ${LIBS}
+CFLAGS ?= -Os 
+CFLAGS += ${INCS} 
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # compiler and linker
 CC = gcc

dzen2-0.8.5-verbose.patch:
 Makefile         |    5 ++---
 gadgets/Makefile |   14 +++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE dzen2-0.8.5-verbose.patch ---
diff -up dzen2-0.8.5/Makefile.verbose dzen2-0.8.5/Makefile
--- dzen2-0.8.5/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/Makefile	2008-11-01 11:25:01.000000000 +0100
@@ -17,14 +17,13 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: dzen.h action.h config.mk
 
 dzen2: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ ${OBJ} ${LDFLAGS}
 	@echo "Run ./help for documentation"
 
 clean:
diff -up dzen2-0.8.5/gadgets/Makefile.verbose dzen2-0.8.5/gadgets/Makefile
--- dzen2-0.8.5/gadgets/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/Makefile	2008-11-01 11:26:30.000000000 +0100
@@ -17,29 +17,25 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.mk
 
 dbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ dbar.o ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ dbar.o ${LDFLAGS}
 
 gdbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
 
 gcpubar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
-	@strip $@
+	${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
 
 textwidth: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
 
 clean:
 	@echo cleaning


--- NEW FILE dzen2-dbar.1 ---
.TH "DBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-dbar \- simple gadget that you can use in combination with dzen to display a progressbar.
.SH SYNOPSIS
.HP 7
\fBdzen2-dbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl]
.SH DESCRIPTION
.B dbar
is an application that generates semi graphical progress meters, from some values you supply to it.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-w
Number of charcaters to be considered 100% in the bar  (default: 25 )
.TP
.B \-s
Symbol represeting the percentage value in the bar (default: =  )
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar    (default: do print '\n')
.SH USAGE EXAMPLES
.TP
.B Static 0% and 100% mark or single value input:
.ip
Command: echo 25 | dbar -m 100 -l Sometext
.br
Output: Sometext  25% [======                   ]
.TP
.B If your 100% mark changes dynamically or 2-values input:
.ip
Command: echo "50 150" | dbar
.br
Output: 33% [========                 ]
.TP
.B If your value range is not between [0, maxval] or 3-values input:
.ip
Command: echo "50 -25 150" | dbar
.br
Output: 43% [===========              ]
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gcpubar.1 ---
.TH "GCPUBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gcpubar \- graphical CPU usage meter
.SH SYNOPSIS
.HP 7
\fBdzen2-gcpubar\fR [\-i \fIinterval\fR] [\-c \fIcount\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-w \fIpixel\fR] [\-h\ \fIpixel\fR] [\-nonl]
.SH DESCRIPTION
.B gcpubar
is a CPU utilization meter for Linux. It relies on the existence of the /proc/stat file and generates fully graphical meters viewable with dzen.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-i
Update interval in seconds (default 1). You can use positive values less than 1 for intervals shorter than 1 second.
.TP
.B \-c
Terminate after displaying argument to this option (default infinite).
.TP
.B \-fg
Foreground color
.TP
.B \-bg
Background color
.TP
.B \-w
Width in piwels
.TP
.B \-h
Height in pixels
.TP
.B \-nonl
No new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
gcpubar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gdbar.1 ---
.TH "GDBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gdbar \- generates fully graphical progress meters
.SH SYNOPSIS
.HP 7
\fBdzen2-gdbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl] [\-o]
.SH DESCRIPTION
.B gdbar
application that generates fully graphical progress meters, from some values you supply to it.
.PP
It has the same input semantics as dbar (see 
.B dbar (1)
\). In contrast to dbar, gdbar draws fully graphical meters which are only useful in combination with dzen.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-fg
Foreground color. (default white)
.TP
.B \-bg
Bacground color (default darkgrey)
.TP
.B \-w
Size in pixels to be considered 100% in the bar  (default: 80 )
.TP
.B \-h
Bar height.
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-o
Draw conky style meters.
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-textwidth.1 ---
.TH "TEXTWIDTH" 1 "Jan 01 2008"
.SH NAME
dzen2-textwidth \- calculate the width in pixels of text for a given font.
.SH SYNOPSIS
.HP 7
\fBdzen2-textwidth\fR  \fIfontname\fR \fIstring\fR
.SH DESCRIPTION
.B textwidth
is a simple utility to calculate the width in pixels of text with a given font.
.PP
This tool is provided as part of the
.B dzen2 (1)
package.
.SH OPTIONS
A summary of options is included below.
.TP
.B fontname
Set the font.
.TP
.B string
Set the string. 
.PP
textwidth was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2.1 ---
.T utf8
.TH DZEN 1
.SH NAME
dzen2 \- general-purpose messaging and notification for X11
.SH SYNOPSIS
.B dzen2
[\-v] [\-p [seconds]] [\-m [v|h]] [\-ta <l|c|r>] [\-sa <l|c|r>]
      [\-x <pixel>] [\-y <pixel>] [\-w <pixel>] [\-tw <pixel>] [\-u] 
      [\-e <string>] [\-l <lines>]  [\-fn <font>] [\-bg <color>]
      [\-fg <color>] [\-xs <screen>]
.SH DESCRIPTION
.B Dzen
is a general\-purpose messaging and notification program for X11,
desigend to be scriptable in any language and integrate well with
window managers like dwm, wmii and xmonad though it will work with any
windowmanger.
.PP
.B Dzen
expects the status message on its standard input, and uses a custom
formatting language for colors and several other features (like bar
meters and such). See README for detailed usage and scripting
instructions.
.SH OPTIONS
.TP
.B \-fg <color>
Set foreground color. The <color> can be specified either as symbolic
name (e.g. red, darkgreen, etc.) or as #rrggbb hex\-value
(e.g. #ffffaa).
.TP
.B \-bg <color>
Set background color (same format as \-fg).
.TP
.B \-fn <font>
Set font (using the format of xlsfonts and xfontsel).
.TP
.B \-ta <l|c|r>
Set alignement of title window content: l(eft), c(center) or r(ight).
.TP
.B \-tw <pixels>
Set title window width.
.TP
.B \-sa <l|c|r>
Set alignment of slave window (see
.B \-ta
).
.TP
.B \-l <lines>
Number of lines to display in slave window (see (1) in README).
.TP
.B \-e <event1=action1:option1:...,action2;event2=...>
Set up events and actions, eg. responses to mouse clicks (see (2) in README).
.TP
.B \-m
Start up in menu mode (see (3) in README).
.TP
.B \-u
Update contents of title and slave window simultaneously, see (see (4) in README).
.TP
.B \-p [<timeout>]
Persist EOF (optional timeout in seconds).
.TP
.B \-x <pixels>
Set x position on the screen.
.TP
.B \-y <pixels>
Set y position on the screen.
.TP
.B \-h <pixels>
Set line height (defaults to fontheight + 2 pixels).
.TP
.B \-w <pixels>
width
.TP
.B \-xs <n>
Set the Xinerama screen number where dzen should appear.
.TP
.B \-v
Display version information.

.SH SEE ALSO
More detailed documentation (especially on the formatting language of
dzen2) is available in /usr/share/doc/dzen2/README.gz.

.SH AUTHOR
.B Dzen2
has been written by
.B Robert Manea.
This manpage has been written, based on dzen documentation, by Petr
Ro?kai, for Debian GNU/Linux, but may be used by others. This manpage
falls under the same licence as Dzen2 itself, see 
/usr/share/doc/dzen2/copyright.


--- NEW FILE dzen2.spec ---
Name:           dzen2
Version:        0.8.5
Release:        5%{?dist}
Summary:        A general purpose messaging and notification program

Group:          User Interface/X
License:        MIT
URL:            http://gotmor.googlepages.com/dzen
Source0:        http://gotmor.googlepages.com/%{name}-latest.tar.gz
Source1:        dzen2.1
Source2:        dzen2-dbar.1
Source3:        dzen2-gcpubar.1
Source4:        dzen2-gdbar.1
Source5:        dzen2-textwidth.1

# 2007-12-26: sent to upstream via private e-mail, inclusion depends on usability
# for *BSD and Solaris
Patch0:         dzen2-0.8.5-check_environment.patch
# Not sent to upstream: removes strip and shows cc invocations, which seems not to
#                       be wanted by upstream
Patch1:         dzen2-0.8.5-verbose.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libXpm-devel libXinerama-devel

%description
Dzen is a general purpose messaging, notification and menuing program for X11.
It was desigend to be scriptable in any language and integrate well with window
managers like dwm, wmii and xmonad though it will work with any windowmanger.


%prep
%setup -q
%patch0 -p1 -b .check_environment
%patch1 -p1 -b .verbose


%build
export CFLAGS="${RPM_OPT_FLAGS}"
export LDFLAGS="${RPM_OPT_FLAGS}"
make %{?_smp_mflags} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
export CFLAGS="${RPM_OPT_FLAGS}"
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
for gadget in dbar gcpubar gdbar textwidth
do
mv $RPM_BUILD_ROOT%{_bindir}/{,dzen2-}"${gadget}"
done

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
do
install -m 0644 "${manpage}" $RPM_BUILD_ROOT%{_mandir}/man1/"${manpage##*/}"
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# There is no .desktop file, because the applications displays data received
# via stdin, e.g. from xmonad, a window manager
# This cannot be done using a .desktop file
%doc LICENSE CREDITS README README.dzen
%doc gadgets/README.*
%{_bindir}/dzen2
%{_bindir}/dzen2-dbar
%{_bindir}/dzen2-gcpubar
%{_bindir}/dzen2-gdbar
%{_bindir}/dzen2-textwidth
%{_mandir}/man1/dzen2.1*
%{_mandir}/man1/dzen2-dbar.1*
%{_mandir}/man1/dzen2-gcpubar.1*
%{_mandir}/man1/dzen2-gdbar.1*
%{_mandir}/man1/dzen2-textwidth.1*


%changelog
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %%build

* Wed Aug 26 2009 Till Maas <opensource at till.name> - 0.8.5-4
- export LDFLAGS
- explain missing .desktop file

* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.8.5-3
- use make -C instead of pushd/popd
- add manpages from debian
- prefix gadgets with dzen2 like debian does it

* Tue Mar 31 2009 Till Maas <opensource at till.name> - 0.8.5-2
- Add description

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 0.8.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:32:25 -0000	1.1
+++ .cvsignore	2 Sep 2009 13:50:54 -0000	1.2
@@ -0,0 +1 @@
+dzen2-latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:32:25 -0000	1.1
+++ sources	2 Sep 2009 13:50:54 -0000	1.2
@@ -0,0 +1 @@
+5978620c2124c8a8ad52d7f17ce94fd7  dzen2-latest.tar.gz



From apevec at fedoraproject.org  Wed Sep  2 13:52:55 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed,  2 Sep 2009 13:52:55 +0000 (UTC)
Subject: rpms/collectd/devel collectd-4.5.4-fix-condrestart.patch, NONE,
	1.1 collectd-4.5.4-libvirt-reconnect.patch, NONE, 1.1
Message-ID: <20090902135255.5AD7811C008C@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31642

Added Files:
	collectd-4.5.4-fix-condrestart.patch 
	collectd-4.5.4-libvirt-reconnect.patch 
Log Message:
* Wed Sep 02 2009 Alan Pevec <apevec at redhat.com> 4.6.4-1
- fix condrestart: on upgrade collectd is not restarted, bz# 516273
- collectd does not re-connect to libvirtd, bz# 480997
- fix unpackaged files https://bugzilla.redhat.com/show_bug.cgi?id=516276#c4
- New upstream version 4.6.4
  http://collectd.org/news.shtml#news69


collectd-4.5.4-fix-condrestart.patch:
 init.d-collectd |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE collectd-4.5.4-fix-condrestart.patch ---
--- contrib/fedora/init.d-collectd.orig	2009-08-11 01:50:15.000000000 +0200
+++ contrib/fedora/init.d-collectd	2009-08-11 01:51:10.000000000 +0200
@@ -54,7 +54,7 @@
 	start
 	;;
   condrestart)
-	[ -f /var/lock/subsys/$prog ] && restart || :
+	[ -f /var/lock/subsys/$prog ] && stop && start || :
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"

collectd-4.5.4-libvirt-reconnect.patch:
 libvirt.c |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

--- NEW FILE collectd-4.5.4-libvirt-reconnect.patch ---
--- a/src/libvirt.c	2009-08-11 23:27:35.000000000 +0200
+++ b/src/libvirt.c	2009-08-12 00:14:58.000000000 +0200
@@ -49,6 +49,8 @@
 
 /* Connection. */
 static virConnectPtr conn = 0;
+static char *conn_string = NULL;
+static int conn_count = 0;
 
 /* Seconds between list refreshes, 0 disables completely. */
 static int interval = 60;
@@ -153,14 +155,14 @@
         il_interface_devices = ignorelist_create (1);
 
     if (strcasecmp (key, "Connection") == 0) {
-        if (conn != 0) {
+        if (conn_count++ != 0) {
             ERROR ("Connection may only be given once in config file");
             return 1;
         }
-        conn = virConnectOpenReadOnly (value);
-        if (!conn) {
-            VIRT_ERROR (NULL, "connection failed");
-            return 1;
+        conn_string = strdup(value);
+        if (conn_string == NULL) {
+            ERROR ("libvirt plugin: Connection strdup failed.");
+            return -1;
         }
         return 0;
     }
@@ -253,10 +255,11 @@
     int i;
 
     if (conn == NULL) {
-        ERROR ("libvirt plugin: Not connected. Use Connection in "
-                "config file to supply connection URI.  For more information "
-                "see <http://libvirt.org/uri.html>");
-        return -1;
+        conn = virConnectOpenReadOnly (conn_string);
+	if (conn == NULL) {
+	    ERROR ("libvirt plugin: Not connected.");
+	    return -1;
+	}
     }
 
     time (&t);
@@ -264,8 +267,12 @@
     /* Need to refresh domain or device lists? */
     if ((last_refresh == (time_t) 0) ||
             ((interval > 0) && ((last_refresh + interval) <= t))) {
-        if (refresh_lists () != 0)
+        if (refresh_lists () != 0) {
+            if (conn != NULL)
+                virConnectClose (conn);
+            conn = NULL;
             return -1;
+        }
         last_refresh = t;
     }
 



From rdieter at fedoraproject.org  Wed Sep  2 13:56:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Sep 2009 13:56:07 +0000 (UTC)
Subject: rpms/digikam/devel sources,1.36,1.37
Message-ID: <20090902135607.C0E1C11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32389

Modified Files:
	sources 
Log Message:
tarball respin



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	2 Sep 2009 13:39:44 -0000	1.36
+++ sources	2 Sep 2009 13:56:07 -0000	1.37
@@ -1 +1 @@
-c25f02080f5524570768e567daed91c8  digikam-1.0.0-beta4.tar.bz2
+fd43f7aab22fc093904525ba59497e3c  digikam-1.0.0-beta4.tar.bz2



From harald at fedoraproject.org  Wed Sep  2 13:58:34 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  2 Sep 2009 13:58:34 +0000 (UTC)
Subject: rpms/dracut/F-11 .cvsignore, 1.8, 1.9 dracut.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20090902135834.0D44411C008C@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv765

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
- version 001
- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Aug 2009 16:04:25 -0000	1.8
+++ .cvsignore	2 Sep 2009 13:58:33 -0000	1.9
@@ -1 +1 @@
-dracut-0.9.tar.bz2
+dracut-001.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dracut.spec	27 Aug 2009 12:45:34 -0000	1.8
+++ dracut.spec	2 Sep 2009 13:58:33 -0000	1.9
@@ -5,15 +5,15 @@
 %endif
 
 %if %{defined gittag}
-%define rdist 1.git%{gittag}%{?dist}
+%define rdist .git%{gittag}%{?dist}
 %define dashgittag -%{gittag}
 %else
 %define rdist %{?dist}
 %endif
 
 Name: dracut
-Version: 0.9
-Release: 2%{?rdist}
+Version: 001
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -40,38 +40,43 @@ Requires: filesystem >= 2.1.0, cpio, dev
 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
 Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
 Requires: cryptsetup-luks
-Requires: bridge-utils
 Requires: file
 Requires: bzip2
-%ifnarch s390 s390x
+Requires: policycoreutils
 Requires: dmraid
 Requires: kbd
-%endif
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
 BuildArch: noarch
 %endif
 
-Patch1: dracut-0.9-vol_id.patch
-
 %description
 dracut is a new, event-driven initramfs infrastructure based around udev.
 
-%package generic
-Summary: Metapackage to build a generic initramfs with dracut
+%package network
+Summary: dracut modules to build a dracut initramfs with network support
 Requires: %{name} = %{version}-%{release}
 Requires: rpcbind nfs-utils 
 Requires: iscsi-initiator-utils
 Requires: nbd
 Requires: net-tools iproute
-Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar
-Requires: plymouth-theme-fade-in plymouth-theme-spinfinity
+Requires: bridge-utils
+
+%description network
+This package requires everything which is needed to build a generic
+all purpose initramfs with network support with dracut.
+
+%package generic
+Summary: Metapackage to build a generic initramfs with dracut
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-network = %{version}-%{release}
 
 %description generic
 This package requires everything which is needed to build a generic
 all purpose initramfs with dracut.
 
+
 %package kernel
 Summary: Metapackage to build generic initramfs with dracut with only kernel modules
 Requires: %{name} = %{version}-%{release}
@@ -97,7 +102,6 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1 
 
 %build
 make
@@ -105,7 +109,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
+     sysconfdir=/etc mandir=%{_mandir}
 
 %if ! 0%{?with_switch_root}
 rm -f $RPM_BUILD_ROOT/sbin/switch_root
@@ -119,28 +124,54 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
-%doc README HACKING TODO COPYING AUTHORS
+%doc README HACKING TODO COPYING AUTHORS NEWS
 /sbin/dracut
 %if 0%{?with_switch_root}
 /sbin/switch_root
 %endif
 %dir %{_datadir}/dracut
 %{_datadir}/dracut/dracut-functions
-%{_datadir}/dracut/modules.d
 %config(noreplace) /etc/dracut.conf
 %{_mandir}/man8/dracut.8*
+%{_datadir}/dracut/modules.d/00dash
+%{_datadir}/dracut/modules.d/10redhat-i18n
+%{_datadir}/dracut/modules.d/10rpmversion
+%{_datadir}/dracut/modules.d/50plymouth
+%{_datadir}/dracut/modules.d/90crypt
+%{_datadir}/dracut/modules.d/90dmraid
+%{_datadir}/dracut/modules.d/90dmsquash-live
+%{_datadir}/dracut/modules.d/90kernel-modules
+%{_datadir}/dracut/modules.d/90lvm
+%{_datadir}/dracut/modules.d/90mdraid
+%{_datadir}/dracut/modules.d/95debug
+%{_datadir}/dracut/modules.d/95resume
+%{_datadir}/dracut/modules.d/95rootfs-block
+%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95terminfo
+%{_datadir}/dracut/modules.d/95udev-rules
+%{_datadir}/dracut/modules.d/95udev-rules.ub810
+%{_datadir}/dracut/modules.d/98syslog
+%{_datadir}/dracut/modules.d/99base
 
-%files generic
+%files network
 %defattr(-,root,root,0755)
-%doc README.generic
+%{_datadir}/dracut/modules.d/40network
+%{_datadir}/dracut/modules.d/95fcoe
+%{_datadir}/dracut/modules.d/95iscsi
+%{_datadir}/dracut/modules.d/95nbd
+%{_datadir}/dracut/modules.d/95nfs
 
 %files kernel 
 %defattr(-,root,root,0755)
 %doc README.kernel
 
+%files generic
+%defattr(-,root,root,0755)
+%doc README.generic
+
 %files tools 
 %defattr(-,root,root,0755)
-%doc COPYING
+%doc COPYING NEWS
 /sbin/dracut-gencmdline
 /sbin/dracut-catimages
 %dir /boot/dracut
@@ -148,36 +179,36 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
-* Thu Aug 27 2009 Harald Hoyer <harald at redhat.com> 0.9-2
-- patch dracut to install vol_id
+* Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
+- version 001
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
 - version 0.9
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
 - version 0.8 
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 24 2009 Harald Hoyer <harald at redhat.com> 0.7-1
 - version 0.7
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 22 2009 Harald Hoyer <harald at redhat.com> 0.6-1
 - version 0.6
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 17 2009 Harald Hoyer <harald at redhat.com> 0.5-1
 - version 0.5
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Sat Jul 04 2009 Harald Hoyer <harald at redhat.com> 0.4-1
 - version 0.4
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Thu Jul 02 2009 Harald Hoyer <harald at redhat.com> 0.3-1
 - version 0.3
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 01 2009 Harald Hoyer <harald at redhat.com> 0.2-1
 - version 0.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Aug 2009 16:04:25 -0000	1.8
+++ sources	2 Sep 2009 13:58:33 -0000	1.9
@@ -1 +1 @@
-e672a50435520c078e4b064f789850ce  dracut-0.9.tar.bz2
+12d60478b28876747bee3d7c8c04be95  dracut-001.tar.bz2



From harald at fedoraproject.org  Wed Sep  2 13:58:47 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  2 Sep 2009 13:58:47 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.7, 1.8 dracut.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20090902135847.E968711C008C@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv918

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
- version 001
- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	14 Aug 2009 16:02:06 -0000	1.7
+++ .cvsignore	2 Sep 2009 13:58:47 -0000	1.8
@@ -1 +1 @@
-dracut-0.9.tar.bz2
+dracut-001.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- dracut.spec	27 Aug 2009 01:35:36 -0000	1.17
+++ dracut.spec	2 Sep 2009 13:58:47 -0000	1.18
@@ -5,15 +5,15 @@
 %endif
 
 %if %{defined gittag}
-%define rdist 1.git%{gittag}%{?dist}
+%define rdist .git%{gittag}%{?dist}
 %define dashgittag -%{gittag}
 %else
 %define rdist %{?dist}
 %endif
 
 Name: dracut
-Version: 0.9
-Release: 6%{?rdist}
+Version: 001
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -40,9 +40,9 @@ Requires: filesystem >= 2.1.0, cpio, dev
 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
 Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
 Requires: cryptsetup-luks
-Requires: bridge-utils
 Requires: file
 Requires: bzip2
+Requires: policycoreutils
 Requires: dmraid
 Requires: kbd
 
@@ -54,20 +54,29 @@ BuildArch: noarch
 %description
 dracut is a new, event-driven initramfs infrastructure based around udev.
 
-%package generic
-Summary: Metapackage to build a generic initramfs with dracut
+%package network
+Summary: dracut modules to build a dracut initramfs with network support
 Requires: %{name} = %{version}-%{release}
 Requires: rpcbind nfs-utils 
 Requires: iscsi-initiator-utils
 Requires: nbd
 Requires: net-tools iproute
-Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar
-Requires: plymouth-theme-fade-in plymouth-theme-spinfinity
+Requires: bridge-utils
+
+%description network
+This package requires everything which is needed to build a generic
+all purpose initramfs with network support with dracut.
+
+%package generic
+Summary: Metapackage to build a generic initramfs with dracut
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-network = %{version}-%{release}
 
 %description generic
 This package requires everything which is needed to build a generic
 all purpose initramfs with dracut.
 
+
 %package kernel
 Summary: Metapackage to build generic initramfs with dracut with only kernel modules
 Requires: %{name} = %{version}-%{release}
@@ -100,7 +109,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
+     sysconfdir=/etc mandir=%{_mandir}
 
 %if ! 0%{?with_switch_root}
 rm -f $RPM_BUILD_ROOT/sbin/switch_root
@@ -114,28 +124,54 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
-%doc README HACKING TODO COPYING AUTHORS
+%doc README HACKING TODO COPYING AUTHORS NEWS
 /sbin/dracut
 %if 0%{?with_switch_root}
 /sbin/switch_root
 %endif
 %dir %{_datadir}/dracut
 %{_datadir}/dracut/dracut-functions
-%{_datadir}/dracut/modules.d
 %config(noreplace) /etc/dracut.conf
 %{_mandir}/man8/dracut.8*
+%{_datadir}/dracut/modules.d/00dash
+%{_datadir}/dracut/modules.d/10redhat-i18n
+%{_datadir}/dracut/modules.d/10rpmversion
+%{_datadir}/dracut/modules.d/50plymouth
+%{_datadir}/dracut/modules.d/90crypt
+%{_datadir}/dracut/modules.d/90dmraid
+%{_datadir}/dracut/modules.d/90dmsquash-live
+%{_datadir}/dracut/modules.d/90kernel-modules
+%{_datadir}/dracut/modules.d/90lvm
+%{_datadir}/dracut/modules.d/90mdraid
+%{_datadir}/dracut/modules.d/95debug
+%{_datadir}/dracut/modules.d/95resume
+%{_datadir}/dracut/modules.d/95rootfs-block
+%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95terminfo
+%{_datadir}/dracut/modules.d/95udev-rules
+%{_datadir}/dracut/modules.d/95udev-rules.ub810
+%{_datadir}/dracut/modules.d/98syslog
+%{_datadir}/dracut/modules.d/99base
 
-%files generic
+%files network
 %defattr(-,root,root,0755)
-%doc README.generic
+%{_datadir}/dracut/modules.d/40network
+%{_datadir}/dracut/modules.d/95fcoe
+%{_datadir}/dracut/modules.d/95iscsi
+%{_datadir}/dracut/modules.d/95nbd
+%{_datadir}/dracut/modules.d/95nfs
 
 %files kernel 
 %defattr(-,root,root,0755)
 %doc README.kernel
 
+%files generic
+%defattr(-,root,root,0755)
+%doc README.generic
+
 %files tools 
 %defattr(-,root,root,0755)
-%doc COPYING
+%doc COPYING NEWS
 /sbin/dracut-gencmdline
 /sbin/dracut-catimages
 %dir /boot/dracut
@@ -143,50 +179,36 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
-* Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-6
-- add BuildArch: noarch to actually make dracut noarch again
-
-* Wed Aug 26 2009 Karsten Hopp <karsten at redhat.com> 0.9-5
-- make it noarch again, just excluding kbd on s390x doesn't
-  work as code needs to be changed as well.
-
-* Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-4
-- its kbd not kdb
-
-* Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-3
-- make arch specific. There are arch specific dependancies.
-- add back kdb requirement on arches where its used.
-
-* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 0.9-2
-- removed kdb requirement (because s390x does not have it)
+* Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
+- version 001
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
 - version 0.9
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
 - version 0.8 
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 24 2009 Harald Hoyer <harald at redhat.com> 0.7-1
 - version 0.7
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 22 2009 Harald Hoyer <harald at redhat.com> 0.6-1
 - version 0.6
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 17 2009 Harald Hoyer <harald at redhat.com> 0.5-1
 - version 0.5
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Sat Jul 04 2009 Harald Hoyer <harald at redhat.com> 0.4-1
 - version 0.4
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Thu Jul 02 2009 Harald Hoyer <harald at redhat.com> 0.3-1
 - version 0.3
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 01 2009 Harald Hoyer <harald at redhat.com> 0.2-1
 - version 0.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Aug 2009 16:02:07 -0000	1.8
+++ sources	2 Sep 2009 13:58:47 -0000	1.9
@@ -1 +1 @@
-e672a50435520c078e4b064f789850ce  dracut-0.9.tar.bz2
+12d60478b28876747bee3d7c8c04be95  dracut-001.tar.bz2



From pghmcfc at fedoraproject.org  Wed Sep  2 13:58:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  2 Sep 2009 13:58:55 +0000 (UTC)
Subject: rpms/perl-Mail-Mbox-MessageParser/devel .cvsignore, 1.7,
	1.8 perl-Mail-Mbox-MessageParser.spec, 1.15, 1.16 sources, 1.7,
	1.8 Mail-Mbox-MessageParser-1.5000-ANDK-01.patch, 1.1, NONE
Message-ID: <20090902135855.C6C8611C008C@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Mail-Mbox-MessageParser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv863

Modified Files:
	.cvsignore perl-Mail-Mbox-MessageParser.spec sources 
Removed Files:
	Mail-Mbox-MessageParser-1.5000-ANDK-01.patch 
Log Message:
* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.5002-1 
- Update to 1.5002 
  - perl 5.10 patch upstreamed 
  - disable the grep interface, known to be buggy 
  - fix infinite loop in emails of less than 200 characters (CPAN RT#33493) 
  - update Makefile.PL for versions of Module::Install > 0.88 
  - instead of returning an error for an empty mailbox, a valid mailbox is 
    returned that immediately fails the end_of_mailbox check (CPAN RT#43665) 
  - fix missing "m" modifier issue exposed by Perl 5.10 (CPAN RT#33004) 
  - added some debugging information for the "cache data not validated" error 
  - fix an off-by-one error that could cause warnings about undefined values 
- BuildRequire perl(Test::More) and perl(Text::Diff)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Mbox-MessageParser/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Feb 2007 17:20:30 -0000	1.7
+++ .cvsignore	2 Sep 2009 13:58:55 -0000	1.8
@@ -1 +1 @@
-Mail-Mbox-MessageParser-1.5000.tar.gz
+Mail-Mbox-MessageParser-1.5002.tar.gz


Index: perl-Mail-Mbox-MessageParser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Mbox-MessageParser/devel/perl-Mail-Mbox-MessageParser.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Mail-Mbox-MessageParser.spec	26 Jul 2009 09:07:56 -0000	1.15
+++ perl-Mail-Mbox-MessageParser.spec	2 Sep 2009 13:58:55 -0000	1.16
@@ -1,19 +1,18 @@
 Summary:	A fast and simple mbox folder reader
 Name:		perl-Mail-Mbox-MessageParser
-Version:	1.5000
-Release:	8%{?dist}
+Version:	1.5002
+Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Mail-Mbox-MessageParser/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-%{version}.tar.gz
-# http://cpan.llarian.net/authors/id/A/AN/ANDK/patches/Mail-Mbox-MessageParser-1.5000-ANDK-01.patch.gz
-Patch0:		Mail-Mbox-MessageParser-1.5000-ANDK-01.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	grep, gzip, bzip2, /usr/bin/diff
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	grep, gzip, bzip2, /usr/bin/diff
 BuildRequires:	perl(ExtUtils::MakeMaker), perl(FileHandle::Unget)
+BuildRequires:	perl(Test::More), perl(Text::Diff)
 
 %description
 Mail::Mbox::MessageParser is a feature-poor but very fast mbox parser. It uses
@@ -22,7 +21,6 @@ information, GNU grep, or highly optimiz
 
 %prep
 %setup -q -n Mail-Mbox-MessageParser-%{version}
-%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor \
@@ -41,7 +39,7 @@ information, GNU grep, or highly optimiz
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -51,9 +49,26 @@ information, GNU grep, or highly optimiz
 %defattr(-,root,root,-)
 %doc README CHANGES anonymize_mailbox LICENSE
 %{perl_vendorlib}/Mail/
-%{_mandir}/man3/Mail::Mbox::MessageParser*
+%{_mandir}/man3/Mail::Mbox::MessageParser.3pm*
+%{_mandir}/man3/Mail::Mbox::MessageParser::Cache.3pm*
+%{_mandir}/man3/Mail::Mbox::MessageParser::Grep.3pm*
+%{_mandir}/man3/Mail::Mbox::MessageParser::MetaInfo.3pm*
+%{_mandir}/man3/Mail::Mbox::MessageParser::Perl.3pm*
 
 %changelog
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.5002-1 
+- Update to 1.5002 
+  - perl 5.10 patch upstreamed 
+  - disable the grep interface, known to be buggy 
+  - fix infinite loop in emails of less than 200 characters (CPAN RT#33493) 
+  - update Makefile.PL for versions of Module::Install > 0.88 
+  - instead of returning an error for an empty mailbox, a valid mailbox is 
+    returned that immediately fails the end_of_mailbox check (CPAN RT#43665) 
+  - fix missing "m" modifier issue exposed by Perl 5.10 (CPAN RT#33004) 
+  - added some debugging information for the "cache data not validated" error 
+  - fix an off-by-one error that could cause warnings about undefined values 
+- BuildRequire perl(Test::More) and perl(Text::Diff) 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5000-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Mbox-MessageParser/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Feb 2007 17:20:30 -0000	1.7
+++ sources	2 Sep 2009 13:58:55 -0000	1.8
@@ -1 +1 @@
-8489694f8cdb77bf8f31f6582735b2f9  Mail-Mbox-MessageParser-1.5000.tar.gz
+0df054faf3a43a537636ea7ca997694c  Mail-Mbox-MessageParser-1.5002.tar.gz


--- Mail-Mbox-MessageParser-1.5000-ANDK-01.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep  2 13:59:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Sep 2009 13:59:06 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.96,1.97
Message-ID: <20090902135906.1E6CF11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1091

Modified Files:
	digikam.spec 
Log Message:
BR: liblqr-1-devel



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- digikam.spec	2 Sep 2009 13:39:44 -0000	1.96
+++ digikam.spec	2 Sep 2009 13:59:06 -0000	1.97
@@ -20,6 +20,7 @@ BuildRequires: gphoto2-devel
 BuildRequires: libkdcraw-devel >= 0.4.0-2
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
+BuildRequires: liblqr-1-devel
 BuildRequires: jasper-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
@@ -156,6 +157,7 @@ rm -rf %{buildroot}
 %changelog
 * Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
 - digikam-1.0.0-beta4
+- BR: liblqr-1-devel
 
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.4.beta3
 - drop xdg-utils references 



From kdudka at fedoraproject.org  Wed Sep  2 14:19:19 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  2 Sep 2009 14:19:19 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.6-autoconf.patch, NONE,
	1.1 curl-7.19.6-nss-cn.patch, NONE, 1.1 curl-7.19.6-poll.patch,
	NONE, 1.1 curl.spec, 1.111, 1.112 curl-7.19.6-sftp-poll.patch,
	1.1, NONE
Message-ID: <20090902141919.785D811C008C@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9133

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.6-autoconf.patch curl-7.19.6-nss-cn.patch 
	curl-7.19.6-poll.patch 
Removed Files:
	curl-7.19.6-sftp-poll.patch 
Log Message:
- use pkg-config to find nss and libssh2 if possible
+- better patch (not only) for SCP/SFTP polling
+- improve error message for not matching common name (#516056)


curl-7.19.6-autoconf.patch:
 curl-7.19.6.orig/configure.ac.orig |only
 curl-7.19.6/configure.ac           |   58 +++++++++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 15 deletions(-)

--- NEW FILE curl-7.19.6-autoconf.patch ---
diff -rup curl-7.19.6.orig/configure.ac curl-7.19.6/configure.ac
--- curl-7.19.6.orig/configure.ac	2009-09-02 15:46:09.396519773 +0200
+++ curl-7.19.6/configure.ac	2009-09-02 15:56:18.750831674 +0200
@@ -1455,22 +1455,37 @@ if test X"$OPT_LIBSSH2" != Xno; then
   case "$OPT_LIBSSH2" in
   yes)
     dnl --with-libssh2 (without path) used
-    PREFIX_LIBSSH2=/usr/local/lib
-    LIB_LIBSSH2="$PREFIX_LIBSSH2$libsuff"
+    CURL_CHECK_PKGCONFIG(libssh2)
+
+    if test "$PKGCONFIG" != "no" ; then
+      LIB_SSH2=`$PKGCONFIG --libs-only-l libssh2`
+      LD_SSH2=`$PKGCONFIG --libs-only-L libssh2`
+      CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2`
+      version=`$PKGCONFIG --modversion libssh2`
+      DIR_SSH2=`echo $LD_SSH2 | $SED -e 's/-L//'`
+    fi
+    
     ;;
   off)
     dnl no --with-libssh2 option given, just check default places
-    PREFIX_LIBSSH2=
     ;;
   *)
     dnl use the given --with-libssh2 spot
-    PREFIX_LIBSSH2=$OPT_LIBSSH2
-    LIB_LIBSSH2="$PREFIX_LIBSSH2/lib$libsuff"
-    LDFLAGS="$LDFLAGS -L$LIB_LIBSSH2"
-    CPPFLAGS="$CPPFLAGS -I$PREFIX_LIBSSH2/include"
+    PREFIX_SSH2=$OPT_LIBSSH2
     ;;
   esac
 
+  dnl if given with a prefix, we set -L and -I based on that
+  if test -n "$PREFIX_SSH2"; then
+    LD_SSH2=-L${PREFIX_SSH2}/lib
+    CPP_SSH2=-I${PREFIX_SSH2}/include
+    DIR_SSH2=${PREFIX_SSH2}/lib
+  fi
+
+  LDFLAGS="$LDFLAGS $LD_SSH2"
+  CPPFLAGS="$CPPFLAGS $CPP_SSH2"
+  LIBS="$LIBS $LIB_SSH2"
+
   AC_CHECK_LIB(ssh2, libssh2_channel_open_ex)
 
   AC_CHECK_HEADERS(libssh2.h,
@@ -1494,10 +1509,15 @@ if test X"$OPT_LIBSSH2" != Xno; then
        dnl libssh2_version is a post 1.0 addition
        AC_CHECK_FUNCS( libssh2_version )
 
-       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_LIBSSH2"
+       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
        export LD_LIBRARY_PATH
-       AC_MSG_NOTICE([Added $LIB_LIBSSH2 to LD_LIBRARY_PATH])
+       AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
     fi
+  else
+    dnl no libssh2, revert back to clean variables
+    LDFLAGS=$CLEANLDFLAGS
+    CPPFLAGS=$CLEANCPPFLAGS
+    LIBS=$CLEANLIBS
   fi
 fi
 
@@ -1665,13 +1685,21 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G
         addcflags=`$PKGCONFIG --cflags nss`
         version=`$PKGCONFIG --modversion nss`
         nssprefix=`$PKGCONFIG --variable=prefix nss`
+      else
+        dnl Without pkg-config, we check for nss-config
+
+        check=`nss-config --version 2>/dev/null`
+        if test -n "$check"; then
+          addlib=`nss-config --libs`
+          addcflags=`nss-config --cflags`
+          version=`nss-config --version`
+          nssprefix=`nss-config --prefix`
+        else
+          addlib="-lnss3"
+          addcflags=""
+          version="unknown"
+        fi
       fi
-    else
-      # Without pkg-config, we'll kludge in some defaults
-      addlib="-L$OPT_NSS/lib -lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
-      addcflags="-I$OPT_NSS/include"
-      version="unknown"
-      nssprefix=$OPT_NSS
     fi
 
     dnl Check for functionPK11_CreateGenericObject
Only in curl-7.19.6.orig: configure.ac.orig

curl-7.19.6-nss-cn.patch:
 nss.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE curl-7.19.6-nss-cn.patch ---
diff -rup curl-7.19.6.orig/lib/nss.c curl-7.19.6/lib/nss.c
--- curl-7.19.6.orig/lib/nss.c	2009-08-25 12:27:08.664828503 +0200
+++ curl-7.19.6/lib/nss.c	2009-08-28 11:51:37.764523702 +0200
@@ -591,7 +591,7 @@ static SECStatus BadCertHandler(void *ar
   struct connectdata *conn = (struct connectdata *)arg;
   PRErrorCode err = PR_GetError();
   CERTCertificate *cert = NULL;
-  char *subject, *issuer;
+  char *subject, *subject_cn, *issuer;
 
   if(conn->data->set.ssl.certverifyresult!=0)
     return success;
@@ -599,6 +599,7 @@ static SECStatus BadCertHandler(void *ar
   conn->data->set.ssl.certverifyresult=err;
   cert = SSL_PeerCertificate(sock);
   subject = CERT_NameToAscii(&cert->subject);
+  subject_cn = CERT_GetCommonName(&cert->subject);
   issuer = CERT_NameToAscii(&cert->issuer);
   CERT_DestroyCertificate(cert);
 
@@ -616,12 +617,12 @@ static SECStatus BadCertHandler(void *ar
     break;
   case SSL_ERROR_BAD_CERT_DOMAIN:
     if(conn->data->set.ssl.verifyhost) {
-      failf(conn->data, "common name '%s' does not match '%s'",
-            subject, conn->host.dispname);
+      failf(conn->data, "SSL: certificate subject name '%s' does not match "
+            "target host name '%s'", subject_cn, conn->host.dispname);
       success = SECFailure;
     } else {
-      infof(conn->data, "warning: common name '%s' does not match '%s'\n",
-            subject, conn->host.dispname);
+      infof(conn->data, "warning: SSL: certificate subject name '%s' does not "
+            "match target host name '%s'\n", subject_cn, conn->host.dispname);
     }
     break;
   case SEC_ERROR_EXPIRED_CERTIFICATE:
@@ -645,6 +646,7 @@ static SECStatus BadCertHandler(void *ar
   if(success == SECSuccess)
     infof(conn->data, "SSL certificate verify ok.\n");
   PR_Free(subject);
+  PR_Free(subject_cn);
   PR_Free(issuer);
 
   return success;

curl-7.19.6-poll.patch:
 ssh.c      |   12 +++++++-----
 transfer.c |   29 +++++++++++++++++++++--------
 urldata.h  |    3 ++-
 3 files changed, 30 insertions(+), 14 deletions(-)

--- NEW FILE curl-7.19.6-poll.patch ---
diff -rup curl-7.19.6.orig/lib/ssh.c curl-7.19.6/lib/ssh.c
--- curl-7.19.6.orig/lib/ssh.c	2009-07-25 00:21:50.000000000 +0200
+++ curl-7.19.6/lib/ssh.c	2009-09-02 15:43:13.337644271 +0200
@@ -2235,10 +2235,10 @@ static int ssh_perform_getsock(const str
 
   sock[0] = conn->sock[FIRSTSOCKET];
 
-  if(conn->proto.sshc.waitfor & KEEP_RECV)
+  if(conn->waitfor & KEEP_RECV)
     bitmap |= GETSOCK_READSOCK(FIRSTSOCKET);
 
-  if(conn->proto.sshc.waitfor & KEEP_SEND)
+  if(conn->waitfor & KEEP_SEND)
     bitmap |= GETSOCK_WRITESOCK(FIRSTSOCKET);
 
   return bitmap;
@@ -2282,15 +2282,17 @@ static void ssh_block2waitfor(struct con
 {
   struct ssh_conn *sshc = &conn->proto.sshc;
   int dir;
-  if(block && (dir = libssh2_session_block_directions(sshc->ssh_session))) {
+  if(!block)
+    conn->waitfor = 0;
+  else if((dir = libssh2_session_block_directions(sshc->ssh_session))) {
     /* translate the libssh2 define bits into our own bit defines */
-    sshc->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) |
+    conn->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) |
       ((dir&LIBSSH2_SESSION_BLOCK_OUTBOUND)?KEEP_SEND:0);
   }
   else
     /* It didn't block or libssh2 didn't reveal in which direction, put back
        the original set */
-    sshc->waitfor = sshc->orig_waitfor;
+    conn->waitfor = sshc->orig_waitfor;
 }
 #else
   /* no libssh2 directional support so we simply don't know */
diff -rup curl-7.19.6.orig/lib/transfer.c curl-7.19.6/lib/transfer.c
--- curl-7.19.6.orig/lib/transfer.c	2009-07-22 22:09:53.000000000 +0200
+++ curl-7.19.6/lib/transfer.c	2009-09-02 15:43:13.338644150 +0200
@@ -1884,33 +1884,46 @@ Transfer(struct connectdata *conn)
     return CURLE_OK;
 
   while(!done) {
-    curl_socket_t fd_read;
-    curl_socket_t fd_write;
+    curl_socket_t fd_read = conn->sockfd;
+    curl_socket_t fd_write = conn->writesockfd;
+    int keepon = k->keepon;
+
+#if defined(USE_LIBSSH2)
+    if(conn->protocol & (PROT_SCP|PROT_SFTP)) {
+      fd_read = conn->sock[FIRSTSOCKET];
+      fd_write = conn->sock[FIRSTSOCKET];
+    }
+#endif /* USE_LIBSSH2 */
+
+    if(conn->waitfor) {
+      /* if waitfor is set, get the RECV and SEND bits from that but keep the
+         other bits */
+      keepon &= ~ (KEEP_RECV|KEEP_SEND);
+      keepon |= conn->waitfor & (KEEP_RECV|KEEP_SEND);
+    }
 
     /* limit-rate logic: if speed exceeds threshold, then do not include fd in
        select set. The current speed is recalculated in each Curl_readwrite()
        call */
-    if((k->keepon & KEEP_SEND) &&
+    if((keepon & KEEP_SEND) &&
         (!data->set.max_send_speed ||
          (data->progress.ulspeed < data->set.max_send_speed) )) {
-      fd_write = conn->writesockfd;
       k->keepon &= ~KEEP_SEND_HOLD;
     }
     else {
       fd_write = CURL_SOCKET_BAD;
-      if(k->keepon & KEEP_SEND)
+      if(keepon & KEEP_SEND)
         k->keepon |= KEEP_SEND_HOLD; /* hold it */
     }
 
-    if((k->keepon & KEEP_RECV) &&
+    if((keepon & KEEP_RECV) &&
         (!data->set.max_recv_speed ||
          (data->progress.dlspeed < data->set.max_recv_speed)) ) {
-      fd_read = conn->sockfd;
       k->keepon &= ~KEEP_RECV_HOLD;
     }
     else {
       fd_read = CURL_SOCKET_BAD;
-      if(k->keepon & KEEP_RECV)
+      if(keepon & KEEP_RECV)
         k->keepon |= KEEP_RECV_HOLD; /* hold it */
     }
 
diff -rup curl-7.19.6.orig/lib/urldata.h curl-7.19.6/lib/urldata.h
--- curl-7.19.6.orig/lib/urldata.h	2009-07-23 00:49:56.000000000 +0200
+++ curl-7.19.6/lib/urldata.h	2009-09-02 15:43:13.339644227 +0200
@@ -565,7 +565,6 @@ struct ssh_conn {
   LIBSSH2_CHANNEL *ssh_channel; /* Secure Shell channel handle */
   LIBSSH2_SFTP *sftp_session;   /* SFTP handle */
   LIBSSH2_SFTP_HANDLE *sftp_handle;
-  int waitfor;                  /* current READ/WRITE bits to wait for */
   int orig_waitfor;             /* default READ/WRITE bits wait for */
 
   /* note that HAVE_LIBSSH2_KNOWNHOST_API is a define set in the libssh2.h
@@ -1070,6 +1069,8 @@ struct connectdata {
   } proto;
 
   int cselect_bits; /* bitmask of socket events */
+  int waitfor;      /* current READ/WRITE bits to wait for */
+
 #if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
   int socks5_gssapi_enctype;
 #endif


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- curl.spec	21 Aug 2009 09:26:47 -0000	1.111
+++ curl.spec	2 Sep 2009 14:19:19 -0000	1.112
@@ -1,16 +1,18 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
 Patch1: curl-7.19.6-verifyhost.patch
+Patch2: curl-7.19.6-nss-cn.patch
+Patch3: curl-7.19.6-poll.patch
+Patch4: curl-7.19.6-autoconf.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
-Patch201: curl-7.19.6-sftp-poll.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,17 +55,19 @@ use cURL's capabilities internally.
 %prep
 %setup -q
 
-# upstream patches
+# upstream patches (already applied)
 %patch1 -p1
+%patch2 -p1
+
+# upstream patches (not yet applied)
+%patch3 -p1
+%patch4 -p1
 
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
 
-# workarounds (not intended to be applied upstream)
-%patch201 -p1
-
 # Convert docs to UTF-8
 for f in CHANGES README; do
 	iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -72,8 +76,7 @@ done
 
 %build
 autoconf
-export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
-%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
+%configure --without-ssl --with-nss --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--enable-ldaps --disable-static --with-libssh2 --enable-manual
@@ -145,6 +148,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Sep 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-4
+- use pkg-config to find nss and libssh2 if possible
+- better patch (not only) for SCP/SFTP polling
+- improve error message for not matching common name (#516056)
+
 * Fri Aug 21 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-3
 - avoid tight loop during a sftp upload
 - http://permalink.gmane.org/gmane.comp.web.curl.library/24744


--- curl-7.19.6-sftp-poll.patch DELETED ---



From caolanm at fedoraproject.org  Wed Sep  2 14:22:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Sep 2009 14:22:38 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 openoffice.org.spec, 1.1739,
	1.1740 workspace.os131.patch, 1.3, 1.4
Message-ID: <20090902142238.170E011C008C@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-serv10169

Modified Files:
	openoffice.org.spec workspace.os131.patch 
Log Message:
Resolves: rhbz#520772 and fix this for proposed F-10 as well


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -p -r1.1739 -r1.1740
--- openoffice.org.spec	1 Sep 2009 15:01:51 -0000	1.1739
+++ openoffice.org.spec	2 Sep 2009 14:22:37 -0000	1.1740
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3806,6 +3806,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.6
+- Resolves: rhbz#520772 copy/paste cockup
+
 * Mon Aug 31 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
 - Resolves: CVE-2009-0200/CVE-2009-0201
 - Resolves: rhbz#499474 soffice and .recently-used.xbel

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  384 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |  239 +++++++++--------------
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 606 insertions(+), 222 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.os131.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.os131.patch	2 Sep 2009 13:45:41 -0000	1.3
+++ workspace.os131.patch	2 Sep 2009 14:22:37 -0000	1.4
@@ -88,19 +88,6 @@ Index: sw/source/core/edit/edglss.cxx
  
  		FOREACHPAM_END()
          }
-Index: sw/source/core/edit/acorrect.cxx
-===================================================================
---- sw/source/core/edit/acorrect.cxx	(.../tags/DEV300_m50)	(revision 275705)
-+++ sw/source/core/edit/acorrect.cxx	(.../cws/os131)	(revision 275705)
-@@ -374,7 +374,7 @@
- 				SwDontExpandItem aExpItem;
- 				aExpItem.SaveDontExpandItems( *aPam.GetPoint() );
- 
--				pAutoDoc->Copy( aCpyPam, *aPam.GetPoint() );
-+                pAutoDoc->Copy( aCpyPam, *aPam.GetPoint(), false );
- 
- 				aExpItem.RestoreDontExpandItems( *aPam.GetPoint() );
- 
 Index: sw/source/core/edit/eddel.cxx
 ===================================================================
 --- sw/source/core/edit/eddel.cxx	(.../tags/DEV300_m50)	(revision 275705)
@@ -160,13 +147,12 @@ Index: sw/source/core/doc/docnew.cxx
  #include <drawdoc.hxx>
  #include <linkenum.hxx>
  #include <fldupde.hxx>
-@@ -105,13 +97,11 @@
+@@ -105,12 +97,10 @@
  #include <istyleaccess.hxx>
  #include <swstylemanager.hxx>
  #include <IGrammarContact.hxx>
-+#include <tblsel.hxx>
- #include <MarkManager.hxx>
 -
++#include <tblsel.hxx>
  #include <unochart.hxx>
  
 -#ifndef _CMDID_H
@@ -175,7 +161,7 @@ Index: sw/source/core/doc/docnew.cxx
  
  
  // --> OD 2006-04-19 #b6375613#
-@@ -1049,3 +1039,369 @@
+@@ -1057,3 +1047,369 @@
      }
  }
  // <--
@@ -209,8 +195,8 @@ Index: sw/source/core/doc/docnew.cxx
 +    {
 +        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
 +        {
-+            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
-+            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
++            const SfxPoolItem& rSourceAttr = aAttrPool.GetDefaultItem( nWhich );
++            if( rSourceAttr != pRet->aAttrPool.GetDefaultItem( nWhich ) )
 +                aNewDefaults.Put( rSourceAttr );
 +        }
 +        nRange += 2;
@@ -679,25 +665,6 @@ Index: sw/source/core/doc/tblrwcl.cxx
                  // den initialen TextNode loeschen
                  pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
              }
-Index: sw/source/core/doc/swserv.cxx
-===================================================================
---- sw/source/core/doc/swserv.cxx	(.../tags/DEV300_m50)	(revision 275705)
-+++ sw/source/core/doc/swserv.cxx	(.../cws/os131)	(revision 275705)
-@@ -299,9 +299,12 @@
-     if(eType == BOOKMARK_SERVER && CNTNT_TYPE.pBkmk)
-     {
-         ::sw::mark::DdeBookmark* const pDdeBookmark = dynamic_cast< ::sw::mark::DdeBookmark* >(CNTNT_TYPE.pBkmk);
--        if(pDdeBookmark) pDdeBookmark->SetRefObject(NULL);
-+        if(pDdeBookmark) 
-+		{
-+            CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
-+			pDdeBookmark->SetRefObject(NULL);
-+		}
-     }
--    CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
- }
- 
- void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark)
 Index: sw/source/core/doc/doclay.cxx
 ===================================================================
 --- sw/source/core/doc/doclay.cxx	(.../tags/DEV300_m50)	(revision 275705)
@@ -1276,7 +1243,7 @@ Index: sw/source/ui/uno/unoatxt.cxx
 ===================================================================
 --- sw/source/ui/uno/unoatxt.cxx	(.../tags/DEV300_m50)	(revision 275705)
 +++ sw/source/ui/uno/unoatxt.cxx	(.../cws/os131)	(revision 275705)
-@@ -416,7 +416,7 @@
+@@ -417,7 +417,7 @@
  		if(pxCursor)
  		{
  			SwPaM* pUnoCrsr = pxCursor->GetPaM();
@@ -1285,10 +1252,10 @@ Index: sw/source/ui/uno/unoatxt.cxx
  		}
  		else
  		{
-@@ -424,7 +424,7 @@
-             if(pBkmk && pBkmk->IsExpanded())
+@@ -425,7 +425,7 @@
+             if(pBkm && pBkm->GetOtherBookmarkPos())
  			{
-                 SwPaM aTmp(pBkmk->GetOtherMarkPos(), pBkmk->GetMarkPos());
+                 SwPaM aTmp(*pBkm->GetOtherBookmarkPos(), pBkm->GetBookmarkPos());
 -                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos));
 +                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos, false));
  			}



From hadess at fedoraproject.org  Wed Sep  2 14:34:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Sep 2009 14:34:36 +0000 (UTC)
Subject: rpms/rhythmbox/devel path-to-mpi-files.patch, NONE,
	1.1 rhythmbox.spec, 1.261, 1.262
Message-ID: <20090902143436.EA95511C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14879

Modified Files:
	rhythmbox.spec 
Added Files:
	path-to-mpi-files.patch 
Log Message:
* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-3
- Add upstream patch to use the correct path for mpi files


path-to-mpi-files.patch:
 mpid-files.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE path-to-mpi-files.patch ---
>From 2dd7e3e1526a23e81bdc31cccb0b4758fb0da767 Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan at d14n.org>
Date: Sun, 30 Aug 2009 12:00:37 +0000
Subject: mpid: update path to .mpi files, fix a bit of a leak

---
diff --git a/lib/libmediaplayerid/mpid-files.c b/lib/libmediaplayerid/mpid-files.c
index 5b56ed9..a5452c1 100644
--- a/lib/libmediaplayerid/mpid-files.c
+++ b/lib/libmediaplayerid/mpid-files.c
@@ -80,7 +80,7 @@ mpid_find_and_read_device_file (MPIDDevice *device, const char *device_file)
 		char *path;
 
 		filename = g_strdup_printf ("%s.mpi", device_file);
-		path = g_build_filename (data_dirs[i], "media-player-id", filename, NULL);
+		path = g_build_filename (data_dirs[i], "media-player-info", filename, NULL);
 		g_free (filename);
 		if (g_file_test (path, G_FILE_TEST_EXISTS)) {
 			device->source = MPID_SOURCE_SYSTEM;
@@ -88,6 +88,7 @@ mpid_find_and_read_device_file (MPIDDevice *device, const char *device_file)
 			g_free (path);
 			return;
 		}
+		g_free (path);
 	}
 
 	/* device info file is missing */
--
cgit v0.8.2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- rhythmbox.spec	1 Sep 2009 16:11:59 -0000	1.261
+++ rhythmbox.spec	2 Sep 2009 14:34:36 -0000	1.262
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -53,6 +53,8 @@ ExcludeArch:    s390 s390x
 Patch1: spinner.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592763
 Patch2: button-images.patch
+# http://git.gnome.org/cgit/rhythmbox/patch/?id=2dd7e3e1526a23e81bdc31cccb0b4758fb0da767
+Patch3: path-to-mpi-files.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -87,6 +89,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 %patch1 -p1 -b .spinner
 %patch2 -p1 -b .button-images
+%patch3 -p1 -b .mpi
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -221,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-3
+- Add upstream patch to use the correct path for mpi files
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-2
 - Remove obsolete configure flags
 - Add libgudev BR



From than at fedoraproject.org  Wed Sep  2 14:35:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 14:35:04 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork-4.3.0-template.patch, NONE,
	1.1 kdeartwork.spec, 1.115, 1.116
Message-ID: <20090902143504.A48F111C008C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15263

Modified Files:
	kdeartwork.spec 
Added Files:
	kdeartwork-4.3.0-template.patch 
Log Message:
- add missing screensavers bz#472886



kdeartwork-4.3.0-template.patch:
 ScreenSavers/xscreensaver |  175 +++++++++++++++++++++++++++++++++++++++++++++-
 screensaver.sh            |   24 ++++++
 2 files changed, 196 insertions(+), 3 deletions(-)

--- NEW FILE kdeartwork-4.3.0-template.patch ---
diff -up /dev/null kdeartwork-4.3.1/kscreensaver/kxsconfig/screensaver.sh
--- /dev/null	2009-09-02 11:52:25.267161014 +0200
+++ kdeartwork-4.3.1/kscreensaver/kxsconfig/screensaver.sh	2009-09-02 16:31:17.000000000 +0200
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+[ -n "$XSCREENSAVER_CONFIG_DIR" ] || XSCREENSAVER_CONFIG_DIR=/usr/share/xscreensaver/config/
+[ -n "$XSCREENSAVER_DIR" ] || XSCREENSAVER_DIR=/usr/libexec/xscreensaver/
+
+d1="${XSCREENSAVER_CONFIG_DIR}"
+d2="${XSCREENSAVER_DIR}"
+d3="kscreensaver/kxsconfig/ScreenSavers/"
+
+hacks=`cd $d1 && ls -1 | grep -v config`
+for name in $hacks; do
+  fa=${name/.xml}
+  echo check screeensaver $name
+  if test -f $d2/$fa && test -f $d1/$name && test ! -f $d3/$fa.desktop; then
+      label=`grep '<screensaver.*_label' $d1/$name  | sed -e 's#^.*_label=\"\(.*\)\".*$#\1#'`
+      f=$d3/$fa.desktop
+      sed -e "s#@NAME@#$fa#; s#@LABEL@#$label#" $d3/xscreensaver.template > $f
+      if ldd $d2/$fa 2>&1 | grep libGL; then
+         sed -e "s, at GL1@,X-KDE-Type=OpenGL,; s, at GL2@,X-KDE-Category=OpenGL Screen Savers," $f > $f.new && mv $f.new $f
+      else
+         grep -v @GL $f > $f.new && mv $f.new $f
+      fi
+  fi
+done
diff -up kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver
diff -up kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template.template kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template
--- kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template.template	2008-01-05 01:00:45.000000000 +0100
+++ kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template	2009-09-02 16:16:29.000000000 +0200
@@ -1,25 +1,194 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=@NAME@
 Icon=kscreensaver
-Type=Application
+Type=Service
+X-KDE-ServiceTypes=ScreenSaver
+TryExec=xscreensaver
 Actions=InWindow;Root;Setup;
 Name=@LABEL@
-TryExec=xscreensaver
 @GL1@
 @GL2@
 
 [Desktop Action Setup]
 Exec=kxsconfig @NAME@
 Name=Setup...
+Name[af]=Opstelling...
+Name[bg]=?????????...
+Name[br]=Kefluniadur?...
+Name[ca]=Arranjament...
+Name[cs]=Nastaven?...
+Name[cy]=Gosod ...
+Name[da]=Ops?tning...
+Name[de]=Einrichtung ...
+Name[el]=???????...
+Name[eo]=Agordo...
+Name[es]=Configuraci?n...
+Name[et]=Seadistamine...
+Name[eu]=Konfiguratu...
+Name[fa]=??????...
+Name[fi]=Asetukset...
+Name[fr]=Configuration...
+Name[fy]=Opset...
+Name[ga]=Socr?...
+Name[gl]=Configuraci?n...
+Name[he]=??????...
+Name[hne]=?????...
+Name[hu]=Be?ll?t?s...
+Name[is]=Stillingar...
+Name[it]=Impostazioni...
+Name[ja]=??...
+Name[lt]=S?ranka ...
+Name[lv]=Iestat?jumi...
+Name[mai]=?????...
+Name[mk]=???????????...
+Name[ml]=???????...
+Name[ms]=Setkan...
+Name[nb]=Innstillinger??
+Name[nds]=Instellen...
+Name[ne]=?????...
+Name[nl]=Instellingen...
+Name[nn]=Oppsett??
+Name[pa]=??????...
+Name[pl]=Ustawienia...
+Name[pt]=Configurar...
+Name[pt_BR]=Configurar...
+Name[ro]=Configurare...
+Name[ru]=?????????...
+Name[sk]=Nastavenie...
+Name[sl]=Nastavi ...
+Name[sr]=??????...
+Name[sr at latin]=Podesi...
+Name[sv]=Inst?llningar...
+Name[ta]=???????...
+Name[tg]=?????????...
+Name[th]=???????...
+Name[tr]=Kurulum...
+Name[uk]=??????????...
+Name[uz]=O?rnatish
+Name[uz at cyrillic]=???????
+Name[vi]=Thi?t l?p...
+Name[xh]=Iyacwangciswa...
+Name[x-test]=xxSetup...xx
+Name[zh_CN]=??...
+Name[zh_TW]=??...
 
 [Desktop Action InWindow]
 Exec=kxsrun @NAME@ -- -window-id %w
 Name=Display in Specified Window
+Name[bg]=????????? ? ?????? ????????
+Name[br]=Diskwel er prenestr spisaet
+Name[ca]=Mostra a la finestra especificada
+Name[cs]=Zobrazit v ur?en?m okn?
+Name[cy]=Dangos mewn Ffenestr Benodol
+Name[da]=Visning i angivet vindue
+Name[de]=In bestimmten Fenster anzeigen
+Name[el]=??????? ??? ??????????? ????????
+Name[eo]=Montri en indikita fenestro
+Name[es]=Mostrar en la ventana especificada
+Name[et]=M??ratud aknas n?itamine
+Name[eu]=Bistaratu zehaztutako lehioan
+Name[fa]=????? ?? ????? ????????
+Name[fi]=N?yt? m??r?tyss? ikkunassa
+Name[fr]=Affichage dans la fen?tre sp?cifi?e
+Name[fy]=Werjefte yn in definiearre finster
+Name[ga]=Taispe?in san Fhuinneog Sonraithe
+Name[gl]=Mostrar na fiestra indicada
+Name[he]=??? ????? ??????
+Name[hne]=???????? ????? ?? ?????
+Name[hu]=Megjelen?t?s a megadott ablakban
+Name[is]=Birta ? v?ldum glugga
+Name[it]=Mostra nella finestra specificata
+Name[ja]=????????????
+Name[lt]=Rodyti nurodytame lange
+Name[lv]=R?d?t nor?d?taj? log?
+Name[mai]=????????? ????? ?? ????????? ???
+Name[mk]=??????? ?? ?????????? ????????
+Name[ml]=????????? ??????????????? ??????????? ??????????????????
+Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
+Name[nb]=Vis i angitt vindu
+Name[nds]=In uts?cht Finster wiesen
+Name[ne]=????????? ?????????? ????????
+Name[nl]=Weergeven In een opgegeven venster
+Name[nn]=Vis i oppgjeve vindauge
+Name[pa]=???? ????? ???? ?????
+Name[pl]=Wy?wietl w zadanym oknie
+Name[pt]=Mostrar na Janela Indicada
+Name[pt_BR]=Exibir na janela especificada
+Name[ro]=Afi?eaz? ?n fereastra specificat?
+Name[ru]=?????????? ? ????????? ????
+Name[sk]=Zobrazi? v zadanom okne
+Name[sl]=Prikaz v dolo?enemu oknu
+Name[sr]=??????? ? ????????? ???????
+Name[sr at latin]=Prika?i u navedenom prozoru
+Name[sv]=Visa i angivet f?nster
+Name[ta]=??????? ?????????? ??????
+Name[tg]=??? ??????? ????????? ?????? ??????
+Name[th]=??????????????????????
+Name[tr]=Belirtilen Pencerede G?ster
+Name[uk]=??????????? ? ????????? ?????
+Name[vi]=Hi?n th? trong C?a s? ?? ??nh
+Name[x-test]=xxDisplay in Specified Windowxx
+Name[zh_CN]=?????????
+Name[zh_TW]=?????????
 NoDisplay=true
 
 [Desktop Action Root]
 Exec=kxsrun @NAME@ -- -root
 Name=Display in Root Window
+Name[bg]=????????? ? ??????? ????????
+Name[br]=Diskwel er prenestr gwrizienn
+Name[ca]=Mostra a la finestra arrel
+Name[cs]=Zobrazit na pozad? plochy
+Name[cy]=Dangos mewn Ffenestr Wraidd
+Name[da]=Visning i root-vindue
+Name[de]=In Hintergrundfenster anzeigen
+Name[el]=??????? ??? ?????? ????????
+Name[eo]=Montri en radika fenestro
+Name[es]=Mostrar en la ventana ra?z
+Name[et]=Juuraknas n?itamine
+Name[eu]=Bistaratu erro lehioan
+Name[fa]=????? ?? ????? ????
+Name[fi]=N?yt? juuri-ikkunassa
+Name[fr]=Affichage dans la fen?tre racine
+Name[fy]=Werjefte yn haadfinster
+Name[ga]=Taispe?in sa Phr?omhfhuinneog
+Name[gl]=Mostrar na fiestra ra?z
+Name[he]=??? ????? ?????
+Name[hne]=??? ????? ?? ?????
+Name[hu]=Megjelen?t?s a gy?k?rablakban
+Name[is]=Birta ? r?targlugganum
+Name[it]=Mostra sullo sfondo
+Name[ja]=???????????
+Name[lt]=Rodyti root lange
+Name[lv]=R?d?t saknes log?
+Name[mai]=??? ????? ?? ????????? ???
+Name[mk]=??????? ?? ?????????? ????????
+Name[ml]=??? ??????????? ??????????????????
+Name[ms]=Papar dalam Tetingkap Root
+Name[nb]=Vis i root-vindu
+Name[nds]=In H??ftfinster wiesen
+Name[ne]=??? ?????????? ????????
+Name[nl]=Weergeven in hoofdvenster
+Name[nn]=Vis i rotvindauget
+Name[pa]=Root ????? ???? ?????
+Name[pl]=Wy?wietl w oknie g??wnym
+Name[pt]=Mostrar na Janela de Fundo
+Name[pt_BR]=Exibir na janela raiz
+Name[ro]=Afi?eaz? ?n fereastra r?d?cin?
+Name[ru]=?????????? ? ???????? ????
+Name[sk]=Zobrazi? v kore?ovom okne
+Name[sl]=Prikaz v korenskem oknu
+Name[sr]=??????? ? ??????? ???????
+Name[sr at latin]=Prika?i u korenom prozoru
+Name[sv]=Visa i rotf?nstret
+Name[ta]=????? ?????????? ??????
+Name[tg]=??? ??????? ?????? ?????? ??????
+Name[th]=?????????????????
+Name[tr]=K?k Pencerede G?ster
+Name[uk]=??????????? ? ?????????? ?????
+Name[vi]=Hi?n th? trong C?a s? G?c
+Name[x-test]=xxDisplay in Root Windowxx
+Name[zh_CN]=???????
+Name[zh_TW]=???????
 NoDisplay=true
 


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- kdeartwork.spec	28 Aug 2009 12:39:03 -0000	1.115
+++ kdeartwork.spec	2 Sep 2009 14:35:04 -0000	1.116
@@ -7,6 +7,8 @@ License:        GPLv2
 Group:          User Interface/Desktops
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeartwork-4.3.0-template.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  eigen2-devel
@@ -38,9 +40,7 @@ Obsoletes: kdeartwork < 4.3.0-2
 %package -n nuvola-icon-theme
 Summary: Nuvola icon theme
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n nuvola-icon-theme
 %{summary}.
 
@@ -49,9 +49,7 @@ Summary: KDE classic icon theme
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons < 4.2.2-3
 Provides:  kdeartwork-icons = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n kdeclassic-icon-theme
 %{summary}.
 
@@ -84,9 +82,7 @@ Requires: xscreensaver-base
 Summary: Additional wallpapers
 Group: Amusements/Graphics
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -94,18 +90,22 @@ BuildArch: noarch
 Summary: Additional sounds
 Group: Amusements/Graphics
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description sounds
 %{summary}.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .template
 
 %build
+
+# create missing xscreensavers desktop files
+if [ -f kscreensaver/kxsconfig/screensaver.sh ] ; then
+ sh kscreensaver/kxsconfig/screensaver.sh
+fi
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -208,6 +208,7 @@ fi
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- add missing screensavers bz#472886
 
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - kde-style-phase subpkg (multilib'd)



From than at fedoraproject.org  Wed Sep  2 14:36:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 14:36:37 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.92,1.93
Message-ID: <20090902143637.9555F11C008C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16504

Modified Files:
	kde-l10n.spec 
Log Message:
fix file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kde-l10n.spec	2 Sep 2009 11:52:49 -0000	1.92
+++ kde-l10n.spec	2 Sep 2009 14:36:36 -0000	1.93
@@ -941,6 +941,7 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
 %lang(ca) %{_datadir}/locale/ca/entry.desktop
 %lang(ca) %{_kde4_appsdir}/khangman/ca.txt
+%lang(ca) %{_kde4_appsdir}/ktuberling/sounds/ca*
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
 %lang(ca) %{_kde4_docdir}/HTML/ca



From jakub at fedoraproject.org  Wed Sep  2 14:40:51 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Sep 2009 14:40:51 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.285, 1.286 gcc.spec, 1.63, 1.64 sources,
	1.289, 1.290 gcc44-unique-object.patch, 1.1, NONE
Message-ID: <20090902144051.8C06411C02C8@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19803

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-unique-object.patch 
Log Message:
4.4.1-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- .cvsignore	1 Sep 2009 14:23:10 -0000	1.285
+++ .cvsignore	2 Sep 2009 14:40:50 -0000	1.286
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090901.tar.bz2
+gcc-4.4.1-20090902.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gcc.spec	1 Sep 2009 14:23:11 -0000	1.63
+++ gcc.spec	2 Sep 2009 14:40:51 -0000	1.64
@@ -1,9 +1,9 @@
-%global DATE 20090901
-%global SVNREV 151272
+%global DATE 20090902
+%global SVNREV 151328
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 7
+%global gcc_release 8
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -144,22 +144,21 @@ Patch2: gcc44-c++-builtin-redecl.patch
 Patch3: gcc44-ia64-libunwind.patch
 Patch4: gcc44-java-nomulti.patch
 Patch5: gcc44-ppc32-retaddr.patch
-Patch9: gcc44-pr33763.patch
-Patch10: gcc44-rh330771.patch
-Patch11: gcc44-rh341221.patch
-Patch12: gcc44-java-debug-iface-type.patch
-Patch13: gcc44-i386-libgomp.patch
-Patch15: gcc44-sparc-config-detection.patch
-Patch16: gcc44-libgomp-omp_h-multilib.patch
-Patch20: gcc44-libtool-no-rpath.patch
-Patch21: gcc44-cloog-dl.patch
-Patch22: gcc44-raw-string.patch
-Patch24: gcc44-unwind-debug-hook.patch
-Patch28: gcc44-pr38757.patch
-Patch29: gcc44-libstdc++-docs.patch
-Patch30: gcc44-rh503816-1.patch
-Patch31: gcc44-rh503816-2.patch
-Patch32: gcc44-unique-object.patch
+Patch6: gcc44-pr33763.patch
+Patch7: gcc44-rh330771.patch
+Patch8: gcc44-rh341221.patch
+Patch9: gcc44-java-debug-iface-type.patch
+Patch10: gcc44-i386-libgomp.patch
+Patch11: gcc44-sparc-config-detection.patch
+Patch12: gcc44-libgomp-omp_h-multilib.patch
+Patch13: gcc44-libtool-no-rpath.patch
+Patch14: gcc44-cloog-dl.patch
+Patch15: gcc44-raw-string.patch
+Patch16: gcc44-unwind-debug-hook.patch
+Patch17: gcc44-pr38757.patch
+Patch18: gcc44-libstdc++-docs.patch
+Patch19: gcc44-rh503816-1.patch
+Patch20: gcc44-rh503816-2.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -448,26 +447,25 @@ which are required to compile with the G
 %patch3 -p0 -b .ia64-libunwind~
 %patch4 -p0 -b .java-nomulti~
 %patch5 -p0 -b .ppc32-retaddr~
-%patch9 -p0 -b .pr33763~
-%patch10 -p0 -b .rh330771~
-%patch11 -p0 -b .rh341221~
-%patch12 -p0 -b .java-debug-iface-type~
-%patch13 -p0 -b .i386-libgomp~
-%patch15 -p0 -b .sparc-config-detection~
-%patch16 -p0 -b .libgomp-omp_h-multilib~
-%patch20 -p0 -b .libtool-no-rpath~
+%patch6 -p0 -b .pr33763~
+%patch7 -p0 -b .rh330771~
+%patch8 -p0 -b .rh341221~
+%patch9 -p0 -b .java-debug-iface-type~
+%patch10 -p0 -b .i386-libgomp~
+%patch11 -p0 -b .sparc-config-detection~
+%patch12 -p0 -b .libgomp-omp_h-multilib~
+%patch13 -p0 -b .libtool-no-rpath~
 %if %{build_cloog}
-%patch21 -p0 -b .cloog-dl~
+%patch14 -p0 -b .cloog-dl~
 %endif
-%patch22 -p0 -b .raw-string~
-%patch24 -p0 -b .unwind-debug-hook~
-%patch28 -p0 -b .pr38757~
+%patch15 -p0 -b .raw-string~
+%patch16 -p0 -b .unwind-debug-hook~
+%patch17 -p0 -b .pr38757~
 %if %{build_libstdcxx_docs}
-%patch29 -p0 -b .libstdc++-docs~
+%patch18 -p0 -b .libstdc++-docs~
 %endif
-%patch30 -p0 -b .rh503816-1~
-%patch31 -p0 -b .rh503816-2~
-%patch32 -p0 -b .unique-object~
+%patch19 -p0 -b .rh503816-1~
+%patch20 -p0 -b .rh503816-2~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -604,6 +602,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`
 	--with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap \
 	--enable-shared --enable-threads=posix --enable-checking=release \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
+	--enable-gnu-unique-object \
 %if !%{build_ada}
 	--enable-languages=c,c++,objc,obj-c++,java,fortran \
 %else
@@ -1806,6 +1805,10 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Sep  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-8
+- fix up __builtin_object_size (#505862)
+- fix Fortran GOTO warning (PR fortran/38507)
+
 * Tue Sep  1 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-7
 - update from gcc-4_4-branch
   - PRs c++/41120, c++/41127, c++/41131, fortran/41062, fortran/41102,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- sources	1 Sep 2009 14:23:12 -0000	1.289
+++ sources	2 Sep 2009 14:40:51 -0000	1.290
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-e68c85e9137a39272468f86268d87251  gcc-4.4.1-20090901.tar.bz2
+eb2fb0d2c073de0b4edf78dab958aca4  gcc-4.4.1-20090902.tar.bz2


--- gcc44-unique-object.patch DELETED ---



From hadess at fedoraproject.org  Wed Sep  2 14:41:08 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Sep 2009 14:41:08 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.19,
	1.20 gnome-bluetooth.spec, 1.88, 1.89 sources, 1.20,
	1.21 0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch, 1.1, 
	NONE 0001-Fix-keyboard-not-working-in-the-properties-window.patch,
	1.1, NONE
Message-ID: <20090902144108.5A7F711C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20039

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Removed Files:
	0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch 
	0001-Fix-keyboard-not-working-in-the-properties-window.patch 
Log Message:
* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-1
- Update to 2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	4 Aug 2009 18:37:16 -0000	1.19
+++ .cvsignore	2 Sep 2009 14:41:07 -0000	1.20
@@ -1 +1 @@
-gnome-bluetooth-2.27.9.tar.bz2
+gnome-bluetooth-2.27.90.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- gnome-bluetooth.spec	11 Aug 2009 15:10:06 -0000	1.88
+++ gnome-bluetooth.spec	2 Sep 2009 14:41:08 -0000	1.89
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.27.9
-Release:	5%{?dist}
+Version:	2.27.90
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -10,10 +10,6 @@ Source0:	http://download.gnome.org/sourc
 Source1:	61-gnome-bluetooth-rfkill.rules
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Patch0:		0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=516801
-Patch1:		0001-Fix-keyboard-not-working-in-the-properties-window.patch
-
 BuildRequires:	gtk2-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	dbus-glib-devel
@@ -66,8 +62,6 @@ for writing applications that require a 
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
-%patch0 -p1 -b .nm-crasher
-%patch1 -p1 -b .kbd
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -200,6 +194,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-5
 - Fix the friendly name not being editable (#516801)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 18:37:16 -0000	1.20
+++ sources	2 Sep 2009 14:41:08 -0000	1.21
@@ -1 +1 @@
-a4111b2578346b951d5c3fb2457c0f18  gnome-bluetooth-2.27.9.tar.bz2
+c58e676d6e95384ba27bde814a5a84bb  gnome-bluetooth-2.27.90.tar.bz2


--- 0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch DELETED ---


--- 0001-Fix-keyboard-not-working-in-the-properties-window.patch DELETED ---



From than at fedoraproject.org  Wed Sep  2 14:42:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 14:42:21 +0000 (UTC)
Subject: rpms/kdeartwork/F-11 kdeartwork-4.3.0-template.patch, NONE,
	1.1 kdeartwork.spec, 1.110, 1.111
Message-ID: <20090902144221.EE8E611C008C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20862

Modified Files:
	kdeartwork.spec 
Added Files:
	kdeartwork-4.3.0-template.patch 
Log Message:
add missing screensavers bz#472886


kdeartwork-4.3.0-template.patch:
 ScreenSavers/xscreensaver |  175 +++++++++++++++++++++++++++++++++++++++++++++-
 screensaver.sh            |   24 ++++++
 2 files changed, 196 insertions(+), 3 deletions(-)

--- NEW FILE kdeartwork-4.3.0-template.patch ---
diff -up /dev/null kdeartwork-4.3.1/kscreensaver/kxsconfig/screensaver.sh
--- /dev/null	2009-09-02 11:52:25.267161014 +0200
+++ kdeartwork-4.3.1/kscreensaver/kxsconfig/screensaver.sh	2009-09-02 16:31:17.000000000 +0200
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+[ -n "$XSCREENSAVER_CONFIG_DIR" ] || XSCREENSAVER_CONFIG_DIR=/usr/share/xscreensaver/config/
+[ -n "$XSCREENSAVER_DIR" ] || XSCREENSAVER_DIR=/usr/libexec/xscreensaver/
+
+d1="${XSCREENSAVER_CONFIG_DIR}"
+d2="${XSCREENSAVER_DIR}"
+d3="kscreensaver/kxsconfig/ScreenSavers/"
+
+hacks=`cd $d1 && ls -1 | grep -v config`
+for name in $hacks; do
+  fa=${name/.xml}
+  echo check screeensaver $name
+  if test -f $d2/$fa && test -f $d1/$name && test ! -f $d3/$fa.desktop; then
+      label=`grep '<screensaver.*_label' $d1/$name  | sed -e 's#^.*_label=\"\(.*\)\".*$#\1#'`
+      f=$d3/$fa.desktop
+      sed -e "s#@NAME@#$fa#; s#@LABEL@#$label#" $d3/xscreensaver.template > $f
+      if ldd $d2/$fa 2>&1 | grep libGL; then
+         sed -e "s, at GL1@,X-KDE-Type=OpenGL,; s, at GL2@,X-KDE-Category=OpenGL Screen Savers," $f > $f.new && mv $f.new $f
+      else
+         grep -v @GL $f > $f.new && mv $f.new $f
+      fi
+  fi
+done
diff -up kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver
diff -up kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template.template kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template
--- kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template.template	2008-01-05 01:00:45.000000000 +0100
+++ kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template	2009-09-02 16:16:29.000000000 +0200
@@ -1,25 +1,194 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=@NAME@
 Icon=kscreensaver
-Type=Application
+Type=Service
+X-KDE-ServiceTypes=ScreenSaver
+TryExec=xscreensaver
 Actions=InWindow;Root;Setup;
 Name=@LABEL@
-TryExec=xscreensaver
 @GL1@
 @GL2@
 
 [Desktop Action Setup]
 Exec=kxsconfig @NAME@
 Name=Setup...
+Name[af]=Opstelling...
+Name[bg]=?????????...
+Name[br]=Kefluniadur?...
+Name[ca]=Arranjament...
+Name[cs]=Nastaven?...
+Name[cy]=Gosod ...
+Name[da]=Ops?tning...
+Name[de]=Einrichtung ...
+Name[el]=???????...
+Name[eo]=Agordo...
+Name[es]=Configuraci?n...
+Name[et]=Seadistamine...
+Name[eu]=Konfiguratu...
+Name[fa]=??????...
+Name[fi]=Asetukset...
+Name[fr]=Configuration...
+Name[fy]=Opset...
+Name[ga]=Socr?...
+Name[gl]=Configuraci?n...
+Name[he]=??????...
+Name[hne]=?????...
+Name[hu]=Be?ll?t?s...
+Name[is]=Stillingar...
+Name[it]=Impostazioni...
+Name[ja]=??...
+Name[lt]=S?ranka ...
+Name[lv]=Iestat?jumi...
+Name[mai]=?????...
+Name[mk]=???????????...
+Name[ml]=???????...
+Name[ms]=Setkan...
+Name[nb]=Innstillinger??
+Name[nds]=Instellen...
+Name[ne]=?????...
+Name[nl]=Instellingen...
+Name[nn]=Oppsett??
+Name[pa]=??????...
+Name[pl]=Ustawienia...
+Name[pt]=Configurar...
+Name[pt_BR]=Configurar...
+Name[ro]=Configurare...
+Name[ru]=?????????...
+Name[sk]=Nastavenie...
+Name[sl]=Nastavi ...
+Name[sr]=??????...
+Name[sr at latin]=Podesi...
+Name[sv]=Inst?llningar...
+Name[ta]=???????...
+Name[tg]=?????????...
+Name[th]=???????...
+Name[tr]=Kurulum...
+Name[uk]=??????????...
+Name[uz]=O?rnatish
+Name[uz at cyrillic]=???????
+Name[vi]=Thi?t l?p...
+Name[xh]=Iyacwangciswa...
+Name[x-test]=xxSetup...xx
+Name[zh_CN]=??...
+Name[zh_TW]=??...
 
 [Desktop Action InWindow]
 Exec=kxsrun @NAME@ -- -window-id %w
 Name=Display in Specified Window
+Name[bg]=????????? ? ?????? ????????
+Name[br]=Diskwel er prenestr spisaet
+Name[ca]=Mostra a la finestra especificada
+Name[cs]=Zobrazit v ur?en?m okn?
+Name[cy]=Dangos mewn Ffenestr Benodol
+Name[da]=Visning i angivet vindue
+Name[de]=In bestimmten Fenster anzeigen
+Name[el]=??????? ??? ??????????? ????????
+Name[eo]=Montri en indikita fenestro
+Name[es]=Mostrar en la ventana especificada
+Name[et]=M??ratud aknas n?itamine
+Name[eu]=Bistaratu zehaztutako lehioan
+Name[fa]=????? ?? ????? ????????
+Name[fi]=N?yt? m??r?tyss? ikkunassa
+Name[fr]=Affichage dans la fen?tre sp?cifi?e
+Name[fy]=Werjefte yn in definiearre finster
+Name[ga]=Taispe?in san Fhuinneog Sonraithe
+Name[gl]=Mostrar na fiestra indicada
+Name[he]=??? ????? ??????
+Name[hne]=???????? ????? ?? ?????
+Name[hu]=Megjelen?t?s a megadott ablakban
+Name[is]=Birta ? v?ldum glugga
+Name[it]=Mostra nella finestra specificata
+Name[ja]=????????????
+Name[lt]=Rodyti nurodytame lange
+Name[lv]=R?d?t nor?d?taj? log?
+Name[mai]=????????? ????? ?? ????????? ???
+Name[mk]=??????? ?? ?????????? ????????
+Name[ml]=????????? ??????????????? ??????????? ??????????????????
+Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
+Name[nb]=Vis i angitt vindu
+Name[nds]=In uts?cht Finster wiesen
+Name[ne]=????????? ?????????? ????????
+Name[nl]=Weergeven In een opgegeven venster
+Name[nn]=Vis i oppgjeve vindauge
+Name[pa]=???? ????? ???? ?????
+Name[pl]=Wy?wietl w zadanym oknie
+Name[pt]=Mostrar na Janela Indicada
+Name[pt_BR]=Exibir na janela especificada
+Name[ro]=Afi?eaz? ?n fereastra specificat?
+Name[ru]=?????????? ? ????????? ????
+Name[sk]=Zobrazi? v zadanom okne
+Name[sl]=Prikaz v dolo?enemu oknu
+Name[sr]=??????? ? ????????? ???????
+Name[sr at latin]=Prika?i u navedenom prozoru
+Name[sv]=Visa i angivet f?nster
+Name[ta]=??????? ?????????? ??????
+Name[tg]=??? ??????? ????????? ?????? ??????
+Name[th]=??????????????????????
+Name[tr]=Belirtilen Pencerede G?ster
+Name[uk]=??????????? ? ????????? ?????
+Name[vi]=Hi?n th? trong C?a s? ?? ??nh
+Name[x-test]=xxDisplay in Specified Windowxx
+Name[zh_CN]=?????????
+Name[zh_TW]=?????????
 NoDisplay=true
 
 [Desktop Action Root]
 Exec=kxsrun @NAME@ -- -root
 Name=Display in Root Window
+Name[bg]=????????? ? ??????? ????????
+Name[br]=Diskwel er prenestr gwrizienn
+Name[ca]=Mostra a la finestra arrel
+Name[cs]=Zobrazit na pozad? plochy
+Name[cy]=Dangos mewn Ffenestr Wraidd
+Name[da]=Visning i root-vindue
+Name[de]=In Hintergrundfenster anzeigen
+Name[el]=??????? ??? ?????? ????????
+Name[eo]=Montri en radika fenestro
+Name[es]=Mostrar en la ventana ra?z
+Name[et]=Juuraknas n?itamine
+Name[eu]=Bistaratu erro lehioan
+Name[fa]=????? ?? ????? ????
+Name[fi]=N?yt? juuri-ikkunassa
+Name[fr]=Affichage dans la fen?tre racine
+Name[fy]=Werjefte yn haadfinster
+Name[ga]=Taispe?in sa Phr?omhfhuinneog
+Name[gl]=Mostrar na fiestra ra?z
+Name[he]=??? ????? ?????
+Name[hne]=??? ????? ?? ?????
+Name[hu]=Megjelen?t?s a gy?k?rablakban
+Name[is]=Birta ? r?targlugganum
+Name[it]=Mostra sullo sfondo
+Name[ja]=???????????
+Name[lt]=Rodyti root lange
+Name[lv]=R?d?t saknes log?
+Name[mai]=??? ????? ?? ????????? ???
+Name[mk]=??????? ?? ?????????? ????????
+Name[ml]=??? ??????????? ??????????????????
+Name[ms]=Papar dalam Tetingkap Root
+Name[nb]=Vis i root-vindu
+Name[nds]=In H??ftfinster wiesen
+Name[ne]=??? ?????????? ????????
+Name[nl]=Weergeven in hoofdvenster
+Name[nn]=Vis i rotvindauget
+Name[pa]=Root ????? ???? ?????
+Name[pl]=Wy?wietl w oknie g??wnym
+Name[pt]=Mostrar na Janela de Fundo
+Name[pt_BR]=Exibir na janela raiz
+Name[ro]=Afi?eaz? ?n fereastra r?d?cin?
+Name[ru]=?????????? ? ???????? ????
+Name[sk]=Zobrazi? v kore?ovom okne
+Name[sl]=Prikaz v korenskem oknu
+Name[sr]=??????? ? ??????? ???????
+Name[sr at latin]=Prika?i u korenom prozoru
+Name[sv]=Visa i rotf?nstret
+Name[ta]=????? ?????????? ??????
+Name[tg]=??? ??????? ?????? ?????? ??????
+Name[th]=?????????????????
+Name[tr]=K?k Pencerede G?ster
+Name[uk]=??????????? ? ?????????? ?????
+Name[vi]=Hi?n th? trong C?a s? G?c
+Name[x-test]=xxDisplay in Root Windowxx
+Name[zh_CN]=???????
+Name[zh_TW]=???????
 NoDisplay=true
 


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/kdeartwork.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- kdeartwork.spec	1 Sep 2009 12:47:21 -0000	1.110
+++ kdeartwork.spec	2 Sep 2009 14:42:21 -0000	1.111
@@ -7,6 +7,8 @@ License:        GPLv2
 Group:          User Interface/Desktops
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeartwork-4.3.0-template.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  eigen2-devel
@@ -38,9 +40,7 @@ Obsoletes: kdeartwork < 4.3.0-2
 %package -n nuvola-icon-theme
 Summary: Nuvola icon theme
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n nuvola-icon-theme
 %{summary}.
 
@@ -49,9 +49,7 @@ Summary: KDE classic icon theme
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons < 4.2.2-3
 Provides:  kdeartwork-icons = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n kdeclassic-icon-theme
 %{summary}.
 
@@ -84,9 +82,7 @@ Requires: xscreensaver-base
 Summary: Additional wallpapers
 Group: Amusements/Graphics
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -94,18 +90,22 @@ BuildArch: noarch
 Summary: Additional sounds
 Group: Amusements/Graphics
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description sounds
 %{summary}.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .template
 
 %build
+
+# create missing xscreensavers desktop files
+if [ -f kscreensaver/kxsconfig/screensaver.sh ] ; then
+ sh kscreensaver/kxsconfig/screensaver.sh
+fi
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -208,6 +208,7 @@ fi
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- add missing screensavers bz#472886
 
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - kde-style-phase subpkg (multilib'd)



From than at fedoraproject.org  Wed Sep  2 14:43:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 14:43:32 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 kdeartwork-4.3.0-template.patch, NONE,
	1.1 kdeartwork.spec, 1.102, 1.103
Message-ID: <20090902144332.0982611C008C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22013

Modified Files:
	kdeartwork.spec 
Added Files:
	kdeartwork-4.3.0-template.patch 
Log Message:
add missing screensavers bz#472886


kdeartwork-4.3.0-template.patch:
 ScreenSavers/xscreensaver |  175 +++++++++++++++++++++++++++++++++++++++++++++-
 screensaver.sh            |   24 ++++++
 2 files changed, 196 insertions(+), 3 deletions(-)

--- NEW FILE kdeartwork-4.3.0-template.patch ---
diff -up /dev/null kdeartwork-4.3.1/kscreensaver/kxsconfig/screensaver.sh
--- /dev/null	2009-09-02 11:52:25.267161014 +0200
+++ kdeartwork-4.3.1/kscreensaver/kxsconfig/screensaver.sh	2009-09-02 16:31:17.000000000 +0200
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+[ -n "$XSCREENSAVER_CONFIG_DIR" ] || XSCREENSAVER_CONFIG_DIR=/usr/share/xscreensaver/config/
+[ -n "$XSCREENSAVER_DIR" ] || XSCREENSAVER_DIR=/usr/libexec/xscreensaver/
+
+d1="${XSCREENSAVER_CONFIG_DIR}"
+d2="${XSCREENSAVER_DIR}"
+d3="kscreensaver/kxsconfig/ScreenSavers/"
+
+hacks=`cd $d1 && ls -1 | grep -v config`
+for name in $hacks; do
+  fa=${name/.xml}
+  echo check screeensaver $name
+  if test -f $d2/$fa && test -f $d1/$name && test ! -f $d3/$fa.desktop; then
+      label=`grep '<screensaver.*_label' $d1/$name  | sed -e 's#^.*_label=\"\(.*\)\".*$#\1#'`
+      f=$d3/$fa.desktop
+      sed -e "s#@NAME@#$fa#; s#@LABEL@#$label#" $d3/xscreensaver.template > $f
+      if ldd $d2/$fa 2>&1 | grep libGL; then
+         sed -e "s, at GL1@,X-KDE-Type=OpenGL,; s, at GL2@,X-KDE-Category=OpenGL Screen Savers," $f > $f.new && mv $f.new $f
+      else
+         grep -v @GL $f > $f.new && mv $f.new $f
+      fi
+  fi
+done
diff -up kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver
diff -up kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template.template kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template
--- kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template.template	2008-01-05 01:00:45.000000000 +0100
+++ kdeartwork-4.3.1/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template	2009-09-02 16:16:29.000000000 +0200
@@ -1,25 +1,194 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=@NAME@
 Icon=kscreensaver
-Type=Application
+Type=Service
+X-KDE-ServiceTypes=ScreenSaver
+TryExec=xscreensaver
 Actions=InWindow;Root;Setup;
 Name=@LABEL@
-TryExec=xscreensaver
 @GL1@
 @GL2@
 
 [Desktop Action Setup]
 Exec=kxsconfig @NAME@
 Name=Setup...
+Name[af]=Opstelling...
+Name[bg]=?????????...
+Name[br]=Kefluniadur?...
+Name[ca]=Arranjament...
+Name[cs]=Nastaven?...
+Name[cy]=Gosod ...
+Name[da]=Ops?tning...
+Name[de]=Einrichtung ...
+Name[el]=???????...
+Name[eo]=Agordo...
+Name[es]=Configuraci?n...
+Name[et]=Seadistamine...
+Name[eu]=Konfiguratu...
+Name[fa]=??????...
+Name[fi]=Asetukset...
+Name[fr]=Configuration...
+Name[fy]=Opset...
+Name[ga]=Socr?...
+Name[gl]=Configuraci?n...
+Name[he]=??????...
+Name[hne]=?????...
+Name[hu]=Be?ll?t?s...
+Name[is]=Stillingar...
+Name[it]=Impostazioni...
+Name[ja]=??...
+Name[lt]=S?ranka ...
+Name[lv]=Iestat?jumi...
+Name[mai]=?????...
+Name[mk]=???????????...
+Name[ml]=???????...
+Name[ms]=Setkan...
+Name[nb]=Innstillinger??
+Name[nds]=Instellen...
+Name[ne]=?????...
+Name[nl]=Instellingen...
+Name[nn]=Oppsett??
+Name[pa]=??????...
+Name[pl]=Ustawienia...
+Name[pt]=Configurar...
+Name[pt_BR]=Configurar...
+Name[ro]=Configurare...
+Name[ru]=?????????...
+Name[sk]=Nastavenie...
+Name[sl]=Nastavi ...
+Name[sr]=??????...
+Name[sr at latin]=Podesi...
+Name[sv]=Inst?llningar...
+Name[ta]=???????...
+Name[tg]=?????????...
+Name[th]=???????...
+Name[tr]=Kurulum...
+Name[uk]=??????????...
+Name[uz]=O?rnatish
+Name[uz at cyrillic]=???????
+Name[vi]=Thi?t l?p...
+Name[xh]=Iyacwangciswa...
+Name[x-test]=xxSetup...xx
+Name[zh_CN]=??...
+Name[zh_TW]=??...
 
 [Desktop Action InWindow]
 Exec=kxsrun @NAME@ -- -window-id %w
 Name=Display in Specified Window
+Name[bg]=????????? ? ?????? ????????
+Name[br]=Diskwel er prenestr spisaet
+Name[ca]=Mostra a la finestra especificada
+Name[cs]=Zobrazit v ur?en?m okn?
+Name[cy]=Dangos mewn Ffenestr Benodol
+Name[da]=Visning i angivet vindue
+Name[de]=In bestimmten Fenster anzeigen
+Name[el]=??????? ??? ??????????? ????????
+Name[eo]=Montri en indikita fenestro
+Name[es]=Mostrar en la ventana especificada
+Name[et]=M??ratud aknas n?itamine
+Name[eu]=Bistaratu zehaztutako lehioan
+Name[fa]=????? ?? ????? ????????
+Name[fi]=N?yt? m??r?tyss? ikkunassa
+Name[fr]=Affichage dans la fen?tre sp?cifi?e
+Name[fy]=Werjefte yn in definiearre finster
+Name[ga]=Taispe?in san Fhuinneog Sonraithe
+Name[gl]=Mostrar na fiestra indicada
+Name[he]=??? ????? ??????
+Name[hne]=???????? ????? ?? ?????
+Name[hu]=Megjelen?t?s a megadott ablakban
+Name[is]=Birta ? v?ldum glugga
+Name[it]=Mostra nella finestra specificata
+Name[ja]=????????????
+Name[lt]=Rodyti nurodytame lange
+Name[lv]=R?d?t nor?d?taj? log?
+Name[mai]=????????? ????? ?? ????????? ???
+Name[mk]=??????? ?? ?????????? ????????
+Name[ml]=????????? ??????????????? ??????????? ??????????????????
+Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
+Name[nb]=Vis i angitt vindu
+Name[nds]=In uts?cht Finster wiesen
+Name[ne]=????????? ?????????? ????????
+Name[nl]=Weergeven In een opgegeven venster
+Name[nn]=Vis i oppgjeve vindauge
+Name[pa]=???? ????? ???? ?????
+Name[pl]=Wy?wietl w zadanym oknie
+Name[pt]=Mostrar na Janela Indicada
+Name[pt_BR]=Exibir na janela especificada
+Name[ro]=Afi?eaz? ?n fereastra specificat?
+Name[ru]=?????????? ? ????????? ????
+Name[sk]=Zobrazi? v zadanom okne
+Name[sl]=Prikaz v dolo?enemu oknu
+Name[sr]=??????? ? ????????? ???????
+Name[sr at latin]=Prika?i u navedenom prozoru
+Name[sv]=Visa i angivet f?nster
+Name[ta]=??????? ?????????? ??????
+Name[tg]=??? ??????? ????????? ?????? ??????
+Name[th]=??????????????????????
+Name[tr]=Belirtilen Pencerede G?ster
+Name[uk]=??????????? ? ????????? ?????
+Name[vi]=Hi?n th? trong C?a s? ?? ??nh
+Name[x-test]=xxDisplay in Specified Windowxx
+Name[zh_CN]=?????????
+Name[zh_TW]=?????????
 NoDisplay=true
 
 [Desktop Action Root]
 Exec=kxsrun @NAME@ -- -root
 Name=Display in Root Window
+Name[bg]=????????? ? ??????? ????????
+Name[br]=Diskwel er prenestr gwrizienn
+Name[ca]=Mostra a la finestra arrel
+Name[cs]=Zobrazit na pozad? plochy
+Name[cy]=Dangos mewn Ffenestr Wraidd
+Name[da]=Visning i root-vindue
+Name[de]=In Hintergrundfenster anzeigen
+Name[el]=??????? ??? ?????? ????????
+Name[eo]=Montri en radika fenestro
+Name[es]=Mostrar en la ventana ra?z
+Name[et]=Juuraknas n?itamine
+Name[eu]=Bistaratu erro lehioan
+Name[fa]=????? ?? ????? ????
+Name[fi]=N?yt? juuri-ikkunassa
+Name[fr]=Affichage dans la fen?tre racine
+Name[fy]=Werjefte yn haadfinster
+Name[ga]=Taispe?in sa Phr?omhfhuinneog
+Name[gl]=Mostrar na fiestra ra?z
+Name[he]=??? ????? ?????
+Name[hne]=??? ????? ?? ?????
+Name[hu]=Megjelen?t?s a gy?k?rablakban
+Name[is]=Birta ? r?targlugganum
+Name[it]=Mostra sullo sfondo
+Name[ja]=???????????
+Name[lt]=Rodyti root lange
+Name[lv]=R?d?t saknes log?
+Name[mai]=??? ????? ?? ????????? ???
+Name[mk]=??????? ?? ?????????? ????????
+Name[ml]=??? ??????????? ??????????????????
+Name[ms]=Papar dalam Tetingkap Root
+Name[nb]=Vis i root-vindu
+Name[nds]=In H??ftfinster wiesen
+Name[ne]=??? ?????????? ????????
+Name[nl]=Weergeven in hoofdvenster
+Name[nn]=Vis i rotvindauget
+Name[pa]=Root ????? ???? ?????
+Name[pl]=Wy?wietl w oknie g??wnym
+Name[pt]=Mostrar na Janela de Fundo
+Name[pt_BR]=Exibir na janela raiz
+Name[ro]=Afi?eaz? ?n fereastra r?d?cin?
+Name[ru]=?????????? ? ???????? ????
+Name[sk]=Zobrazi? v kore?ovom okne
+Name[sl]=Prikaz v korenskem oknu
+Name[sr]=??????? ? ??????? ???????
+Name[sr at latin]=Prika?i u korenom prozoru
+Name[sv]=Visa i rotf?nstret
+Name[ta]=????? ?????????? ??????
+Name[tg]=??? ??????? ?????? ?????? ??????
+Name[th]=?????????????????
+Name[tr]=K?k Pencerede G?ster
+Name[uk]=??????????? ? ?????????? ?????
+Name[vi]=Hi?n th? trong C?a s? G?c
+Name[x-test]=xxDisplay in Root Windowxx
+Name[zh_CN]=???????
+Name[zh_TW]=???????
 NoDisplay=true
 


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- kdeartwork.spec	1 Sep 2009 12:47:21 -0000	1.102
+++ kdeartwork.spec	2 Sep 2009 14:43:31 -0000	1.103
@@ -7,6 +7,8 @@ License:        GPLv2
 Group:          User Interface/Desktops
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeartwork-4.3.0-template.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  eigen2-devel
@@ -38,9 +40,7 @@ Obsoletes: kdeartwork < 4.3.0-2
 %package -n nuvola-icon-theme
 Summary: Nuvola icon theme
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n nuvola-icon-theme
 %{summary}.
 
@@ -49,9 +49,7 @@ Summary: KDE classic icon theme
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons < 4.2.2-3
 Provides:  kdeartwork-icons = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n kdeclassic-icon-theme
 %{summary}.
 
@@ -84,9 +82,7 @@ Requires: xscreensaver-base
 Summary: Additional wallpapers
 Group: Amusements/Graphics
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -94,18 +90,22 @@ BuildArch: noarch
 Summary: Additional sounds
 Group: Amusements/Graphics
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description sounds
 %{summary}.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .template
 
 %build
+
+# create missing xscreensavers desktop files
+if [ -f kscreensaver/kxsconfig/screensaver.sh ] ; then
+ sh kscreensaver/kxsconfig/screensaver.sh
+fi
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -208,6 +208,7 @@ fi
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- add missing screensavers bz#472886
 
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - kde-style-phase subpkg (multilib'd)



From transif at fedoraproject.org  Wed Sep  2 14:48:19 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  2 Sep 2009 14:48:19 +0000 (UTC)
Subject: comps/po ca.po,1.21,1.22
Message-ID: <20090902144819.69B7011C008C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25199/po

Modified Files:
	ca.po 
Log Message:
Sending translation for Catalan


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 ca.poIndex: ca.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ca.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ca.po	5 Aug 2009 20:13:56 -0000	1.21
+++ ca.po	2 Sep 2009 14:48:19 -0000	1.22
@@ -17,293 +17,313 @@
 #   http://www.softcatala.org/projectes/fedora/
 #   i contacteu l'anterior traductor/a.
 #
-
 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-08-05 23:25+0100\n"
+"POT-Creation-Date: 2009-09-02 08:22+0000\n"
+"PO-Revision-Date: 2009-09-02 23:25+0100\n"
 "Last-Translator: Oscar Osta Pueyo <oostap at gmail.com>\n"
 "Language-Team: Catalan <fedora at softcatala.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Un entorn d'escriptori lleuger que funciona en ordinadors senzills."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Eines d'administraci?"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Suport per a l'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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Suport per a l'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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplicacions per a realitzar diverses tasques"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suport per a l'?rab"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suport per a l'armeni"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Suport per a l'assam?s"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Creaci? i publicaci?"
 
-#: ../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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "B?sic"
 
-#: ../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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema b?sic"
 
-#: ../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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Suport b?sic per al llenguatge de programaci? 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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Suport per al basc"
 
-#: ../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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Suport per al bielor?s"
 
-#: ../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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Suport per al bengal?"
 
 # TODO
-#: ../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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr ""
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Suport per al bosni"
 
-#: ../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-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Suport per al portugu?s de Brasil"
 
-#: ../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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Suport per al bret?"
 
-#: ../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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Grup de muntatge del sistema de muntatge"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Suport per al b?lgar"
 
-#: ../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-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Suport per al catal?"
 
-#: ../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-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "Suport per al xin?s"
 
[...1916 lines suppressed...]
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Suport per al swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr ""
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1448,23 +1561,85 @@ msgstr ""
 "Aquest grup ?s una col?lecci? d'eines usades en el disseny, modificaci?, "
 "manipulaci? i empaquetat de tipus de lletra."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Suport per al turcman"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Suport per a l'alt s?rab"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+"Un conjunt de paquets que proporcionen la funcionalitat del cam? cr?tic per "
+"a l'escriptori GNOME"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"Un conjunt de paquets que proporcionen la plataforma compartida per a la "
+"funcionalitat del cam? cr?tic per a totes les variants de Fedora"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Llibres i guies"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Llibres i guies per als usuaris i desenvolupadors de Fedora"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Cam? cr?tic (b?sic)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Cam? cr?tic (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Servidor de directori"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ?s un escriptori lleuger per a X11 dissenyat per a ordinadors amb "
+"pocs recursos, com ara miniport?tils, dispositius m?bils o ordinadors vells."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Servidors d'identitat de m?quina i usuaris."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Entorn d'escriptori Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ?s un entorn d'escriptori per a dispositius NetBook/NetTop/MID."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplicacions per a diverses tasques"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Suport per a la connexi? a la xarxa"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1472,7 +1647,7 @@ msgstr ""
 "El GNOME ?s una interf?cie gr?fica avan?ada que inclou un quadre, un "
 "escriptori, icones de sistema i un gestor de fitxers gr?fic."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1480,7 +1655,7 @@ msgstr ""
 "El KDE ?s una interf?cie gr?fica avan?ada que inclou un quadre, un "
 "escriptori, icones de sistema i un gestor de fitxers gr?fic."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1488,11 +1663,11 @@ msgstr ""
 "Els editors de text us permeten crear i editar fitxers. S'inclouen l'Emacs i "
 "el Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "L'editor de text XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1500,39 +1675,45 @@ msgstr ""
 "Aquestes eines us permeten crear documentaci? en format DocBook i convertir-"
 "les en format HTML, PDF, Postscript i text."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
 "Aquest grup ?s una col?lecci? de servidors de xarxa per a diferents tipus de "
 "maquinari."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Aquest grup ?s una col?lecci? d'eines i recursos per a entorns ar?bics."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Aquest grup ?s una col?lecci? d'eines i recursos per a entorns hebreus."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Aquest grup ?s una col?lecci? d'eines i recursos per a entorns japonesos."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr "Aquest grup ?s una col?lecci? d'eines i recursos per a entorns txecs."
 
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "L'entorn de desenvolupament integrat Eclipse."
+
 #~ msgid "British Support"
 #~ msgstr "Suport per al brit?nic"
 
@@ -1630,9 +1811,6 @@ msgstr "Aquest grup ?s una col?lecci?
 #~ msgid "KDE Desktop Environment"
 #~ msgstr "Entorn d'escriptori KDE"
 
-#~ msgid "Kernel Development"
-#~ msgstr "Desenvolupament del nucli"
-
 #~ msgid "Mozilla packages for the x86 platform"
 #~ msgstr "Paquets Mozilla per a la plataforma x86"
 



From atkac at fedoraproject.org  Wed Sep  2 14:51:12 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed,  2 Sep 2009 14:51:12 +0000 (UTC)
Subject: rpms/telnet/devel netkit-telnet-0.17-reallynodns.patch, NONE,
	1.1 telnet.spec, 1.35, 1.36
Message-ID: <20090902145112.B5E2811C008C@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/telnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26849

Modified Files:
	telnet.spec 
Added Files:
	netkit-telnet-0.17-reallynodns.patch 
Log Message:
- add new option -N to disable DNS lookups (#490242)


netkit-telnet-0.17-reallynodns.patch:
 telnetd.8 |    6 +++++-
 telnetd.c |   27 +++++++++++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

--- NEW FILE netkit-telnet-0.17-reallynodns.patch ---
--- netkit-telnet-0.17.orig/telnetd/telnetd.c.reallynodns	2009-03-12 14:32:29.000000000 -0700
+++ netkit-telnet-0.17.orig/telnetd/telnetd.c	2009-03-12 14:51:59.000000000 -0700
@@ -85,6 +85,7 @@
 int keepalive = 1;
 char *loginprg = _PATH_LOGIN;
 char *progname;
+int lookupself = 1;
 
 extern void usage(void);
 
@@ -111,7 +112,7 @@
 
 	progname = *argv;
 
-	while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
+	while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:N")) != EOF) {
 		switch(ch) {
 
 #ifdef	AUTHENTICATE
@@ -210,6 +211,10 @@
 			keepalive = 0;
 			break;
 
+                case 'N':
+                        lookupself = 0;
+                        break;
+
 #ifdef	SecurID
 		case 's':
 			/* SecurID required */
@@ -393,6 +398,7 @@
 #endif
 	fprintf(stderr, " [-L login_program]");
 	fprintf(stderr, " [-n]");
+	fprintf(stderr, " [-N]");
 #ifdef	SecurID
 	fprintf(stderr, " [-s]");
 #endif
@@ -691,15 +697,20 @@
 
 		memset(&hints, '\0', sizeof(hints));
 		hints.ai_socktype = SOCK_STREAM;
-		hints.ai_flags = AI_ADDRCONFIG;
+		hints.ai_flags = AI_CANONNAME;
 
 		gethostname(host_name, sizeof(host_name));
-		if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
-			if(e != EAI_AGAIN) {
-				fprintf(stderr, "getaddrinfo: localhost %s\n", 
-				        gai_strerror(e));
-				exit(1);
-			}
+                /*
+                 * Optionally canonicalize the local host name, in case
+                 * gethostname() returns foo, we want foo.example.com
+                 */
+		if (lookupself &&
+                    (e = getaddrinfo(host_name, NULL, &hints, &res)) == 0) {
+                        if (res->ai_canonname) {
+                                strncpy(host_name, res->ai_canonname,
+                                                        sizeof(host_name)-1);
+                                host_name[sizeof(host_name)-1] = 0;
+                        }
 		}
 		if(res)
 			freeaddrinfo(res);
--- netkit-telnet-0.17.orig/telnetd/telnetd.8.reallynodns	2009-03-12 14:54:54.000000000 -0700
+++ netkit-telnet-0.17.orig/telnetd/telnetd.8	2009-03-12 14:56:58.000000000 -0700
@@ -42,7 +42,7 @@
 protocol server
 .Sh SYNOPSIS
 .Nm /usr/sbin/in.telnetd
-.Op Fl hns
+.Op Fl hnNs
 .Op Fl a Ar authmode
 .Op Fl D Ar debugmode
 .Op Fl L Ar loginprg
@@ -175,6 +175,10 @@
 if the client is still there, so that idle connections
 from machines that have crashed or can no longer
 be reached may be cleaned up.
+.It Fl N
+Do not use DNS to canonicalize the local hostname;
+.Fn gethostname 2
+returns a fully qualified name.
 .It Fl s
 This option is only enabled if
 .Nm telnetd


Index: telnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- telnet.spec	27 Jul 2009 05:46:04 -0000	1.35
+++ telnet.spec	2 Sep 2009 14:51:12 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 44%{?dist}
+Release: 45%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -27,6 +27,7 @@ Patch18: telnet-gethostbyname.patch
 Patch19: netkit-telnet-0.17-ipv6.diff
 Patch20: netkit-telnet-0.17-nodns.patch
 Patch21: telnet-0.17-errno_test_sys_bsd.patch
+Patch22: netkit-telnet-0.17-reallynodns.patch
 
 BuildPreReq: ncurses-devel
 Buildroot: %{_tmppath}/%{name}-root
@@ -70,6 +71,7 @@ mv telnet telnet-NETKIT
 %patch19 -p1 -b .gethost2
 %patch20 -p1 -b .nodns
 %patch21 -p1 -b .errnosysbsd
+%patch22 -p1 -b .reallynodns
 
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS -g"
@@ -135,6 +137,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Wed Sep 02 2009 Adam Tkac <atkac redhat com> 1:0.17-45
+- add new option -N to disable DNS lookups (#490242)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17-44
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Wed Sep  2 14:58:34 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Sep 2009 14:58:34 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 workspace.os131.patch,1.4,1.5
Message-ID: <20090902145834.9BF4011C008C@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-serv29268

Modified Files:
	workspace.os131.patch 
Log Message:
grr

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    2 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  384 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |  258 ++++++++++--------------
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 615 insertions(+), 230 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.os131.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- workspace.os131.patch	2 Sep 2009 14:22:37 -0000	1.4
+++ workspace.os131.patch	2 Sep 2009 14:58:33 -0000	1.5
@@ -643,15 +643,6 @@ Index: sw/source/core/doc/docglbl.cxx
  
  
  					// und noch alle Bookmarks
-@@ -653,7 +653,7 @@
- 						pDoc->GetNodes().Delete( aIdx, 1 );
- 
- 					// alle Flys in dem Bereich
--					_CopyFlyInFly( aRg, aIdx );
-+                    _CopyFlyInFly( aRg, 0, aIdx );
- 
- 
- 					// und noch alle Bookmarks
 Index: sw/source/core/doc/tblrwcl.cxx
 ===================================================================
 --- sw/source/core/doc/tblrwcl.cxx	(.../tags/DEV300_m50)	(revision 275705)
@@ -982,7 +973,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
  #include <mmconfigitem.hxx>
  #include <sfx2/request.hxx>
  #include <hintids.hxx>
-@@ -3185,7 +3165,6 @@
+@@ -3176,7 +3156,6 @@
  
      SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
      BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
@@ -990,7 +981,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
      //save the settings of the first
      rSourceShell.SttEndDoc(TRUE);
      USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3195,22 +3174,6 @@
+@@ -3186,22 +3165,6 @@
  
      try
      {
@@ -1013,7 +1004,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
          // create a target docshell to put the merged document into
          SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
          xTargetDocShell->DoInitNew( 0 );
-@@ -3259,116 +3222,120 @@
+@@ -3250,116 +3213,121 @@
                      Application::Reschedule();
              }
  
@@ -1026,14 +1017,83 @@ Index: sw/source/ui/dbui/dbmgr.cxx
 -                            rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
 -                                    &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
 -            if(pReturnValue)
-+            // copy the source document
-+            SfxObjectShellRef xWorkDocSh;
-+            if(nDocNo == 1 )
-             {
+-            {
 -                SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
 -                SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
 -                SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
 -                pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
+-
+-                // merge the data
+-                SwDoc* pWorkDoc = rWorkShell.GetDoc();
+-                SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+-                pWorkDoc->SetNewDBMgr( this );
+-                pWorkDoc->EmbedAllLinks();
+-                if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
+-                    rWorkShell.Undo();
+-                // create a layout
+-                rWorkShell.CalcLayout();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+-                rWorkShell.ViewShell::UpdateFlds();
+-                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+-
+-                // strip invisible content and convert fields to text
+-                rWorkShell.RemoveInvisibleContent();
+-                rWorkShell.ConvertFieldsToText();
+-                rWorkShell.SetNumberingRestart();
+-
+-
+-                // insert the document into the target document
+-                rWorkShell.SttEndDoc(FALSE);
+-                rWorkShell.SttEndDoc(TRUE);
+-                rWorkShell.SelAll();
+-                pTargetShell->SttEndDoc(FALSE);
+-
+-                //#i63806# put the styles to the target document
+-                //if the source uses headers or footers each new copy need to copy a new page styles
+-                if(bPageStylesWithHeaderFooter)
+-                {
+-                    //create a new pagestyle
+-                    //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
+-
+-                    SwDoc* pTargetDoc = pTargetShell->GetDoc();
+-                    String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
+-                    pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
+-                    SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+-                    if(pSourcePageDesc && pTargetPageDesc)
+-                    {
+-                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+-                        sModifiedStartingPageDesc = sNewPageDescName;
+-                        lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+-                    }
+-                }
+-                if(nDocNo == 1 || bPageStylesWithHeaderFooter)
+-                {
+-                    pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
+-                }
+-                if(nDocNo > 1)
+-                {
+-                    pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
+-                }
+-                else
+-                {
+-                    pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
+-                }
+-                USHORT nPageCountBefore = pTargetShell->GetPageCnt();
+-                DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended")
+-                //#i51359# add a second paragraph in case there's only one
+-                {
+-                    SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
+-                  SwPosition aTestPos( aIdx );
+-                  SwCursor aTestCrsr(aTestPos,0,false);
+-                    if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+-                    {
+-                        //append a paragraph
+-                        pWorkDoc->AppendTxtNode( aTestPos );
+-                    }
++            // copy the source document
++            SfxObjectShellRef xWorkDocSh;
++            if(nDocNo == 1 )
++            {
 +                uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
 +                uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
 +                SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
@@ -1049,19 +1109,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
 +            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
 +            SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
 +            pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
- 
--                // merge the data
--                SwDoc* pWorkDoc = rWorkShell.GetDoc();
--                SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
--                pWorkDoc->SetNewDBMgr( this );
--                pWorkDoc->EmbedAllLinks();
--                if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
--                    rWorkShell.Undo();
--                // create a layout
--                rWorkShell.CalcLayout();
--                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
--                rWorkShell.ViewShell::UpdateFlds();
--                SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++
 +            // merge the data
 +            SwDoc* pWorkDoc = rWorkShell.GetDoc();
 +            SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
@@ -1074,65 +1122,39 @@ Index: sw/source/ui/dbui/dbmgr.cxx
 +            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
 +            rWorkShell.ViewShell::UpdateFlds();
 +            SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
- 
--                // strip invisible content and convert fields to text
--                rWorkShell.RemoveInvisibleContent();
--                rWorkShell.ConvertFieldsToText();
--                rWorkShell.SetNumberingRestart();
++
 +            // strip invisible content and convert fields to text
 +            rWorkShell.RemoveInvisibleContent();
 +            rWorkShell.ConvertFieldsToText();
 +            rWorkShell.SetNumberingRestart();
- 
- 
--                // insert the document into the target document
--                rWorkShell.SttEndDoc(FALSE);
--                rWorkShell.SttEndDoc(TRUE);
--                rWorkShell.SelAll();
--                pTargetShell->SttEndDoc(FALSE);
++
++
 +            // insert the document into the target document
 +            rWorkShell.SttEndDoc(FALSE);
 +            rWorkShell.SttEndDoc(TRUE);
 +            rWorkShell.SelAll();
 +            pTargetShell->SttEndDoc(FALSE);
- 
--                //#i63806# put the styles to the target document
--                //if the source uses headers or footers each new copy need to copy a new page styles
--                if(bPageStylesWithHeaderFooter)
--                {
--                    //create a new pagestyle
--                    //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
++
 +            //#i63806# put the styles to the target document
 +            //if the source uses headers or footers each new copy need to copy a new page styles
 +            if(bPageStylesWithHeaderFooter)
 +            {
 +                //create a new pagestyle
 +                //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
- 
--                    SwDoc* pTargetDoc = pTargetShell->GetDoc();
--                    String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
--                    pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
--                    SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
--                    if(pSourcePageDesc && pTargetPageDesc)
--                    {
--                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
--                        sModifiedStartingPageDesc = sNewPageDescName;
--                        lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
--                    }
--                }
--                if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++
 +                SwDoc* pTargetDoc = pTargetShell->GetDoc();
 +                String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
 +                pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
 +                SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
 +                if(pSourcePageDesc && pTargetPageDesc)
-                 {
--                    pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++                {
 +                    pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
 +                    sModifiedStartingPageDesc = sNewPageDescName;
 +                    lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
                  }
--                if(nDocNo > 1)
+-                pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+-                //convert fields in page styles (header/footer - has to be done after the first document has been pasted
+-                if(1 == nDocNo)
 +            }
 +            if(nDocNo == 1 || bPageStylesWithHeaderFooter)
 +            {
@@ -1155,34 +1177,11 @@ Index: sw/source/ui/dbui/dbmgr.cxx
 +              SwCursor aTestCrsr(aTestPos,0,false);
 +                if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
                  {
--                    pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
+-                    pTargetShell->CalcLayout();
+-                    pTargetShell->ConvertFieldsToText();
 +                    //append a paragraph
 +                    pWorkDoc->AppendTxtNode( aTestPos );
                  }
--                else
--                {
--                    pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
--                }
--                USHORT nPageCountBefore = pTargetShell->GetPageCnt();
--                DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
--                //#i51359# add a second paragraph in case there's only one
--                {
--                    SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
--                  SwPosition aTestPos( aIdx );
--                  SwCursor aTestCrsr(aTestPos,0,false);
--                    if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
--                    {
--                        //append a paragraph
--                        pWorkDoc->AppendTxtNode( aTestPos );
--                    }
--                }
--                pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
--                //convert fields in page styles (header/footer - has to be done after the first document has been pasted
--                if(1 == nDocNo)
--                {
--                    pTargetShell->CalcLayout();
--                    pTargetShell->ConvertFieldsToText();
--                }
 -                //add the document info to the config item
 -                SwDocMergeInfo aMergeInfo;
 -                aMergeInfo.nStartPageInTarget = nPageCountBefore;
@@ -1197,8 +1196,18 @@ Index: sw/source/ui/dbui/dbmgr.cxx
 -                aMergeInfo.nDBRow = nStartRow;
 -                rMMConfig.AddMergedDocument( aMergeInfo );
 -                ++nRet;
+-
+-                // the print monitor needs some time to act
+-                for( USHORT i = 0; i < 25; i++)
+-                    Application::Reschedule();
+-
+-                //restore the ole DBMgr
+-                pWorkDoc->SetNewDBMgr( pWorkDBMgr );
+-                //now the temporary document should be closed
+-                SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
+-                xDocSh->DoClose();
 +                pTargetShell->ConvertFieldsToText();
-+            }
+             }
 +            //add the document info to the config item
 +            SwDocMergeInfo aMergeInfo;
 +            aMergeInfo.nStartPageInTarget = nPageCountBefore;
@@ -1208,31 +1217,23 @@ Index: sw/source/ui/dbui/dbmgr.cxx
 +            aMergeInfo.nDBRow = nStartRow;
 +            rMMConfig.AddMergedDocument( aMergeInfo );
 +            ++nRet;
- 
--                // the print monitor needs some time to act
--                for( USHORT i = 0; i < 25; i++)
--                    Application::Reschedule();
++
 +            // the print monitor needs some time to act
 +            for( USHORT i = 0; i < 25; i++)
 +                Application::Reschedule();
- 
--                //restore the ole DBMgr
--                pWorkDoc->SetNewDBMgr( pWorkDBMgr );
--                //now the temporary document should be closed
--                SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
--                xDocSh->DoClose();
--            }
++
 +            //restore the ole DBMgr
 +            pWorkDoc->SetNewDBMgr( pWorkDBMgr );
 +            //now the temporary document should be closed
 +            SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
 +            xDocSh->DoClose();
++
              nEndRow = pImpl->pMergeData->xResultSet->getRow();
              ++nDocNo;
          } while( !bCancel &&
-@@ -3390,8 +3357,6 @@
+@@ -3381,8 +3349,6 @@
      {
-         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
+         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments")
      }
 -    if(sSourceDocURL.Len())
 -        File::remove( sSourceDocURL );



From nphilipp at fedoraproject.org  Wed Sep  2 15:01:09 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 15:01:09 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.105, 1.106 sources,
	1.115, 1.116 system-config-date.spec, 1.123, 1.124
Message-ID: <20090902150109.C1A0211C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30214

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.47


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	2 Sep 2009 12:36:41 -0000	1.105
+++ .cvsignore	2 Sep 2009 15:01:09 -0000	1.106
@@ -1 +1 @@
-system-config-date-1.9.46.tar.bz2
+system-config-date-1.9.47.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	2 Sep 2009 12:36:41 -0000	1.115
+++ sources	2 Sep 2009 15:01:09 -0000	1.116
@@ -1 +1 @@
-774e286ff8503c4711da117ffac9ab93  system-config-date-1.9.46.tar.bz2
+ba1bf7d85a8ac821015e9d7bc4269581  system-config-date-1.9.47.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- system-config-date.spec	2 Sep 2009 12:36:41 -0000	1.123
+++ system-config-date.spec	2 Sep 2009 15:01:09 -0000	1.124
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.46
+Version: 1.9.47
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.47-1
+- appease anaconda (#520799)
+
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.46-1
 - use new gtk toolkit API
 



From than at fedoraproject.org  Wed Sep  2 15:02:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 15:02:40 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.204,1.205
Message-ID: <20090902150240.6AE2011C008C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30641

Modified Files:
	kdeedu.spec 
Log Message:
cleanup



Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- kdeedu.spec	28 Aug 2009 13:18:32 -0000	1.204
+++ kdeedu.spec	2 Sep 2009 15:02:39 -0000	1.205
@@ -25,16 +25,20 @@ Provides:  kdeedu4 = %{version}-%{releas
 # Kig can optionally use Boost.Python for Python scripting
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
+%if 0%{?fedora}
 BuildRequires: cfitsio-devel
+BuildRequires: xplanet
+BuildRequires: libindi-devel
+BuildRequires: libnova-devel
+BuildRequires: libqalculate-devel
+BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
-BuildRequires: libindi-devel
-BuildRequires: libnova-devel
-BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
@@ -42,10 +46,8 @@ BuildRequires: libxslt-devel
 BuildRequires: ocaml(compiler)
 BuildRequires: ocaml-facile-devel
 %endif
-BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-BuildRequires: xplanet
 
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.



From kvolny at fedoraproject.org  Wed Sep  2 15:05:35 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Wed,  2 Sep 2009 15:05:35 +0000 (UTC)
Subject: rpms/qmmp/devel qmmp.spec,1.15,1.16
Message-ID: <20090902150535.B184011C008C@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/qmmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32759

Modified Files:
	qmmp.spec 
Log Message:
* Wed Sep 02 2009 Karel Voln? <kvolny at redhat.com> 0.3.0-3
- add libbs2b support, as it got added to Fedora (see bug #519138)



Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qmmp.spec	27 Aug 2009 08:03:34 -0000	1.15
+++ qmmp.spec	2 Sep 2009 15:05:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		qmmp
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Qt-based multimedia player
 
 Group:		Applications/Multimedia
@@ -15,8 +15,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	cmake flac-devel >= 1.1.3
 BuildRequires:	jack-audio-connection-kit-devel >= 0.102.5
-# libbs2b is not available yet, submitted for review (bug #519138)
-#BuildRequires:	libbs2b-devel
+BuildRequires:	libbs2b-devel
 BuildRequires:	libcdio-devel
 BuildRequires:	libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel
 BuildRequires:	libprojectM-devel
@@ -124,6 +123,9 @@ fi
 
 
 %changelog
+* Wed Sep 02 2009 Karel Voln? <kvolny at redhat.com> 0.3.0-3
+- add libbs2b support, as it got added to Fedora (see bug #519138)
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0-2
 - rebuilt with new openssl
 



From mtasaka at fedoraproject.org  Wed Sep  2 15:05:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 15:05:56 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria-0.6.5-WorldCat-results.patch, NONE, 
	1.1 alexandria-0.6.5-crash-in-turkish.patch, 1.1,
	1.2 alexandria.spec, 1.31, 1.32
Message-ID: <20090902150556.4B8B811C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv504/F-10

Modified Files:
	alexandria-0.6.5-crash-in-turkish.patch alexandria.spec 
Added Files:
	alexandria-0.6.5-WorldCat-results.patch 
Log Message:
Sync with devel

alexandria-0.6.5-WorldCat-results.patch:
 worldcat.rb |   35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

--- NEW FILE alexandria-0.6.5-WorldCat-results.patch ---
Index: lib/alexandria/book_providers/worldcat.rb
===================================================================
--- lib/alexandria/book_providers/worldcat.rb	(revision 1088)
+++ lib/alexandria/book_providers/worldcat.rb	(revision 1089)
@@ -23,7 +23,11 @@
 # New WorldCat provider, taken from the Palatina MetaDataSource and
 # modified to fit the structure of Alexandria book providers.
 # (25 Feb 2009)
+#
+# Updated from Palatina, to reflect changes in the worldcat website.
+# (1 Sep 2009)
 
+
 require 'cgi'
 require 'alexandria/net'
 
@@ -136,7 +140,17 @@
           raise NoResultsError
         end
 
-        title_header = doc%'h1.item-title'
+
+        if doc % 'table.table-results'
+          log.info { "Found multiple results for lookup: fetching first result only" }
+          search_results = parse_search_result_data(html)
+          first = search_results.first
+          rslt2 = transport.get_response(URI.parse(first[:url]))
+          html2 = rslt2.body
+          doc = Hpricot(html2)
+        end
+
+        title_header = doc%'h1.title'
         title = title_header.inner_text if title_header
         unless title
           log.warn { "Unexpected lack of title from WorldCat lookup" }
@@ -145,18 +159,25 @@
         log.info { "Found book #{title} at WorldCat" }
 
         authors = []
-        authors_div = doc%'div.item-author'
-        if authors_div
-          (authors_div/:a).each do |a|
+        authors_tr = doc%'tr#details-allauthors'
+        if authors_tr
+          (authors_tr/:a).each do |a|
             authors << a.inner_text
           end
         end
 
         # can we do better? get the City name?? or multiple publishers?
-        publisher_row = doc%'td.label[text()*=Publisher]/..'
+        bibdata = doc % 'div#bibdata'
+        bibdata_table = bibdata % :table
+        publisher_row = bibdata_table % 'th[text()*=Publisher]/..'
+
         if publisher_row
           publication_info = (publisher_row/'td').last.inner_text
-          publication_info =~ /:*([^;,]+)/
+          if publication_info.index(':')
+            publication_info =~ /:[\s]*([^;,]+)/
+          else
+            publication_info =~ /([^;,]+)/
+          end
           publisher = $1
           publication_info =~ /([12][0-9]{3})/
           year = $1.to_i if $1
@@ -167,7 +188,7 @@
 
         isbn = search_isbn
         unless isbn
-          isbn_row = doc%'td.label[text()*=ISBN]/..'
+          isbn_row = doc % 'tr#details-standardno' ##bibdata_table % 'th[text()*=ISBN]/..'
           if isbn_row
             isbns = (isbn_row/'td').last.inner_text.split
             isbn = Library.canonicalise_isbn(isbns.first)

alexandria-0.6.5-crash-in-turkish.patch:
 icons.rb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: alexandria-0.6.5-crash-in-turkish.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria-0.6.5-crash-in-turkish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-crash-in-turkish.patch	28 Aug 2009 19:57:58 -0000	1.1
+++ alexandria-0.6.5-crash-in-turkish.patch	2 Sep 2009 15:05:56 -0000	1.2
@@ -1,7 +1,7 @@
 Index: lib/alexandria/ui/icons.rb
 ===================================================================
 --- lib/alexandria/ui/icons.rb	(revision 1087)
-+++ lib/alexandria/ui/icons.rb	(working copy)
++++ lib/alexandria/ui/icons.rb	(revision 1088)
 @@ -63,7 +63,9 @@
        def self.load_icon_images
          Dir.entries(ICONS_DIR).each do |file|


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- alexandria.spec	28 Aug 2009 19:57:58 -0000	1.31
+++ alexandria.spec	2 Sep 2009 15:05:56 -0000	1.32
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	7
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -33,9 +33,11 @@ Patch4:		alexandria-0.6.5-search-result-
 # ref: alexandria-Bugs-27000
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 # Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170
-# Must report upstream
+# RH bug 520170, alexandria-Bugs-27015
 Patch6:		alexandria-0.6.5-crash-in-turkish.patch
+# Fix for parsing WorldCat search result
+# ref: alexandria-Bugs-27028
+Patch7:		alexandria-0.6.5-WorldCat-results.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -90,6 +92,7 @@ Alexandria is a GNOME application to hel
 %patch4 -p0 -b .sanity
 %patch5 -p0 -b .deastore
 %patch6 -p0 -b .tr_TR
+%patch7 -p0 -b .worldcat
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -216,16 +219,20 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
+- Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
+
 * Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
-- Fix crash on startup in tr_TR.UTF-8 (bug 520170)
+- Fix crash on startup in tr_TR.UTF-8 (bug 520170, alexandria-Bugs-27015)
 
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
 - Add sanity check for invalid search result, now using upstream patch
 - Fix DeaStore provider where search result contains no Author
+  (alexandria-Bugs-27000)
 
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 
-  functionality of alexandria)
+  functionality of alexandria, alexandria-Bugs-26968)
 
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
 - Kill the previous 2 patches (for now)



From mtasaka at fedoraproject.org  Wed Sep  2 15:05:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 15:05:56 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria-0.6.5-WorldCat-results.patch, NONE, 
	1.1 alexandria-0.6.5-crash-in-turkish.patch, 1.1,
	1.2 alexandria.spec, 1.38, 1.39
Message-ID: <20090902150556.8FBC211C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv504/F-11

Modified Files:
	alexandria-0.6.5-crash-in-turkish.patch alexandria.spec 
Added Files:
	alexandria-0.6.5-WorldCat-results.patch 
Log Message:
Sync with devel

alexandria-0.6.5-WorldCat-results.patch:
 worldcat.rb |   35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

--- NEW FILE alexandria-0.6.5-WorldCat-results.patch ---
Index: lib/alexandria/book_providers/worldcat.rb
===================================================================
--- lib/alexandria/book_providers/worldcat.rb	(revision 1088)
+++ lib/alexandria/book_providers/worldcat.rb	(revision 1089)
@@ -23,7 +23,11 @@
 # New WorldCat provider, taken from the Palatina MetaDataSource and
 # modified to fit the structure of Alexandria book providers.
 # (25 Feb 2009)
+#
+# Updated from Palatina, to reflect changes in the worldcat website.
+# (1 Sep 2009)
 
+
 require 'cgi'
 require 'alexandria/net'
 
@@ -136,7 +140,17 @@
           raise NoResultsError
         end
 
-        title_header = doc%'h1.item-title'
+
+        if doc % 'table.table-results'
+          log.info { "Found multiple results for lookup: fetching first result only" }
+          search_results = parse_search_result_data(html)
+          first = search_results.first
+          rslt2 = transport.get_response(URI.parse(first[:url]))
+          html2 = rslt2.body
+          doc = Hpricot(html2)
+        end
+
+        title_header = doc%'h1.title'
         title = title_header.inner_text if title_header
         unless title
           log.warn { "Unexpected lack of title from WorldCat lookup" }
@@ -145,18 +159,25 @@
         log.info { "Found book #{title} at WorldCat" }
 
         authors = []
-        authors_div = doc%'div.item-author'
-        if authors_div
-          (authors_div/:a).each do |a|
+        authors_tr = doc%'tr#details-allauthors'
+        if authors_tr
+          (authors_tr/:a).each do |a|
             authors << a.inner_text
           end
         end
 
         # can we do better? get the City name?? or multiple publishers?
-        publisher_row = doc%'td.label[text()*=Publisher]/..'
+        bibdata = doc % 'div#bibdata'
+        bibdata_table = bibdata % :table
+        publisher_row = bibdata_table % 'th[text()*=Publisher]/..'
+
         if publisher_row
           publication_info = (publisher_row/'td').last.inner_text
-          publication_info =~ /:*([^;,]+)/
+          if publication_info.index(':')
+            publication_info =~ /:[\s]*([^;,]+)/
+          else
+            publication_info =~ /([^;,]+)/
+          end
           publisher = $1
           publication_info =~ /([12][0-9]{3})/
           year = $1.to_i if $1
@@ -167,7 +188,7 @@
 
         isbn = search_isbn
         unless isbn
-          isbn_row = doc%'td.label[text()*=ISBN]/..'
+          isbn_row = doc % 'tr#details-standardno' ##bibdata_table % 'th[text()*=ISBN]/..'
           if isbn_row
             isbns = (isbn_row/'td').last.inner_text.split
             isbn = Library.canonicalise_isbn(isbns.first)

alexandria-0.6.5-crash-in-turkish.patch:
 icons.rb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: alexandria-0.6.5-crash-in-turkish.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria-0.6.5-crash-in-turkish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-crash-in-turkish.patch	28 Aug 2009 19:32:15 -0000	1.1
+++ alexandria-0.6.5-crash-in-turkish.patch	2 Sep 2009 15:05:56 -0000	1.2
@@ -1,7 +1,7 @@
 Index: lib/alexandria/ui/icons.rb
 ===================================================================
 --- lib/alexandria/ui/icons.rb	(revision 1087)
-+++ lib/alexandria/ui/icons.rb	(working copy)
++++ lib/alexandria/ui/icons.rb	(revision 1088)
 @@ -63,7 +63,9 @@
        def self.load_icon_images
          Dir.entries(ICONS_DIR).each do |file|


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- alexandria.spec	28 Aug 2009 19:32:15 -0000	1.38
+++ alexandria.spec	2 Sep 2009 15:05:56 -0000	1.39
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	7
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -33,9 +33,11 @@ Patch4:		alexandria-0.6.5-search-result-
 # ref: alexandria-Bugs-27000
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 # Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170
-# Must report upstream
+# RH bug 520170, alexandria-Bugs-27015
 Patch6:		alexandria-0.6.5-crash-in-turkish.patch
+# Fix for parsing WorldCat search result
+# ref: alexandria-Bugs-27028
+Patch7:		alexandria-0.6.5-WorldCat-results.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -90,6 +92,7 @@ Alexandria is a GNOME application to hel
 %patch4 -p0 -b .sanity
 %patch5 -p0 -b .deastore
 %patch6 -p0 -b .tr_TR
+%patch7 -p0 -b .worldcat
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -216,16 +219,20 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
+- Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
+
 * Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
-- Fix crash on startup in tr_TR.UTF-8 (bug 520170)
+- Fix crash on startup in tr_TR.UTF-8 (bug 520170, alexandria-Bugs-27015)
 
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
 - Add sanity check for invalid search result, now using upstream patch
 - Fix DeaStore provider where search result contains no Author
+  (alexandria-Bugs-27000)
 
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 
-  functionality of alexandria)
+  functionality of alexandria, alexandria-Bugs-26968)
 
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
 - Kill the previous 2 patches (for now)



From till at fedoraproject.org  Wed Sep  2 15:06:32 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed,  2 Sep 2009 15:06:32 +0000 (UTC)
Subject: rpms/dzen2/F-10 dzen2-0.8.5-check_environment.patch, NONE,
	1.1 dzen2-0.8.5-verbose.patch, NONE, 1.1 dzen2-dbar.1, NONE,
	1.1 dzen2-gcpubar.1, NONE, 1.1 dzen2-gdbar.1, NONE,
	1.1 dzen2-textwidth.1, NONE, 1.1 dzen2.1, NONE, 1.1 dzen2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902150632.6172511C008C@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/dzen2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv854

Modified Files:
	.cvsignore sources 
Added Files:
	dzen2-0.8.5-check_environment.patch dzen2-0.8.5-verbose.patch 
	dzen2-dbar.1 dzen2-gcpubar.1 dzen2-gdbar.1 dzen2-textwidth.1 
	dzen2.1 dzen2.spec 
Log Message:
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %build


dzen2-0.8.5-check_environment.patch:
 config.mk         |   45 +++++++++++++++++++++++----------------------
 gadgets/config.mk |    9 +++++----
 2 files changed, 28 insertions(+), 26 deletions(-)

--- NEW FILE dzen2-0.8.5-check_environment.patch ---
diff -up dzen2-0.8.5/config.mk.check_environment dzen2-0.8.5/config.mk
--- dzen2-0.8.5/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/config.mk	2007-12-26 13:40:06.000000000 +0100
@@ -4,40 +4,41 @@ VERSION = 0.8.5
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 INCS = -I. -I/usr/include -I${X11INC}
 
 # Configure the features you want to be supported
-# Only one of the following options has to be uncommented, 
-# all others must be commented!
-#
-# Uncomment: Remove # from the beginning of respective lines
-# Comment  : Add # to the beginning of the respective lines
 
-# Option 1: No Xinerama no XPM
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+# Remove the # from the next line to enable Xinerama support
+#DZEN_XINERAMA=1
+
+# Remove the # from the next line to enable Xpm support
+#DZEN_XPM=1
 
-# Option 2: No Xinerama with XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
-
-# Option 3: With Xinerama no XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
-
-# Option 4: With Xinerama and XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+# Uncomment: Remove # from the beginning of respective lines
+# Comment  : Add # to the beginning of the respective lines
 
 # END of feature configuration
 
+CFLAGS ?= -Os
+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+
+ifeq ($(DZEN_XINERAMA),1)
+LIBS += -lXinerama
+CFLAGS += -DDZEN_XINERAMA
+endif
+
+ifeq ($(DZEN_XPM), 1)
+LIBS += -lXpm
+CFLAGS += -DDZEN_XPM
+endif
 
-LDFLAGS = ${LIBS}
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # Solaris, uncomment for Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff -up dzen2-0.8.5/gadgets/config.mk.check_environment dzen2-0.8.5/gadgets/config.mk
--- dzen2-0.8.5/gadgets/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/config.mk	2007-12-26 13:39:04.000000000 +0100
@@ -1,8 +1,8 @@
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 INCS = -I. -I/usr/include -I${X11INC}
@@ -10,8 +10,9 @@ INCS = -I. -I/usr/include -I${X11INC}
 X11LIB = /usr/X11R6/lib
 LIBS = -L/usr/lib 
 
-CFLAGS = -Os ${INCS} 
-LDFLAGS = ${LIBS}
+CFLAGS ?= -Os 
+CFLAGS += ${INCS} 
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # compiler and linker
 CC = gcc

dzen2-0.8.5-verbose.patch:
 Makefile         |    5 ++---
 gadgets/Makefile |   14 +++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE dzen2-0.8.5-verbose.patch ---
diff -up dzen2-0.8.5/Makefile.verbose dzen2-0.8.5/Makefile
--- dzen2-0.8.5/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/Makefile	2008-11-01 11:25:01.000000000 +0100
@@ -17,14 +17,13 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: dzen.h action.h config.mk
 
 dzen2: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ ${OBJ} ${LDFLAGS}
 	@echo "Run ./help for documentation"
 
 clean:
diff -up dzen2-0.8.5/gadgets/Makefile.verbose dzen2-0.8.5/gadgets/Makefile
--- dzen2-0.8.5/gadgets/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/Makefile	2008-11-01 11:26:30.000000000 +0100
@@ -17,29 +17,25 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.mk
 
 dbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ dbar.o ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ dbar.o ${LDFLAGS}
 
 gdbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
 
 gcpubar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
-	@strip $@
+	${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
 
 textwidth: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
 
 clean:
 	@echo cleaning


--- NEW FILE dzen2-dbar.1 ---
.TH "DBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-dbar \- simple gadget that you can use in combination with dzen to display a progressbar.
.SH SYNOPSIS
.HP 7
\fBdzen2-dbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl]
.SH DESCRIPTION
.B dbar
is an application that generates semi graphical progress meters, from some values you supply to it.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-w
Number of charcaters to be considered 100% in the bar  (default: 25 )
.TP
.B \-s
Symbol represeting the percentage value in the bar (default: =  )
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar    (default: do print '\n')
.SH USAGE EXAMPLES
.TP
.B Static 0% and 100% mark or single value input:
.ip
Command: echo 25 | dbar -m 100 -l Sometext
.br
Output: Sometext  25% [======                   ]
.TP
.B If your 100% mark changes dynamically or 2-values input:
.ip
Command: echo "50 150" | dbar
.br
Output: 33% [========                 ]
.TP
.B If your value range is not between [0, maxval] or 3-values input:
.ip
Command: echo "50 -25 150" | dbar
.br
Output: 43% [===========              ]
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gcpubar.1 ---
.TH "GCPUBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gcpubar \- graphical CPU usage meter
.SH SYNOPSIS
.HP 7
\fBdzen2-gcpubar\fR [\-i \fIinterval\fR] [\-c \fIcount\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-w \fIpixel\fR] [\-h\ \fIpixel\fR] [\-nonl]
.SH DESCRIPTION
.B gcpubar
is a CPU utilization meter for Linux. It relies on the existence of the /proc/stat file and generates fully graphical meters viewable with dzen.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-i
Update interval in seconds (default 1). You can use positive values less than 1 for intervals shorter than 1 second.
.TP
.B \-c
Terminate after displaying argument to this option (default infinite).
.TP
.B \-fg
Foreground color
.TP
.B \-bg
Background color
.TP
.B \-w
Width in piwels
.TP
.B \-h
Height in pixels
.TP
.B \-nonl
No new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
gcpubar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gdbar.1 ---
.TH "GDBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gdbar \- generates fully graphical progress meters
.SH SYNOPSIS
.HP 7
\fBdzen2-gdbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl] [\-o]
.SH DESCRIPTION
.B gdbar
application that generates fully graphical progress meters, from some values you supply to it.
.PP
It has the same input semantics as dbar (see 
.B dbar (1)
\). In contrast to dbar, gdbar draws fully graphical meters which are only useful in combination with dzen.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-fg
Foreground color. (default white)
.TP
.B \-bg
Bacground color (default darkgrey)
.TP
.B \-w
Size in pixels to be considered 100% in the bar  (default: 80 )
.TP
.B \-h
Bar height.
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-o
Draw conky style meters.
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-textwidth.1 ---
.TH "TEXTWIDTH" 1 "Jan 01 2008"
.SH NAME
dzen2-textwidth \- calculate the width in pixels of text for a given font.
.SH SYNOPSIS
.HP 7
\fBdzen2-textwidth\fR  \fIfontname\fR \fIstring\fR
.SH DESCRIPTION
.B textwidth
is a simple utility to calculate the width in pixels of text with a given font.
.PP
This tool is provided as part of the
.B dzen2 (1)
package.
.SH OPTIONS
A summary of options is included below.
.TP
.B fontname
Set the font.
.TP
.B string
Set the string. 
.PP
textwidth was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2.1 ---
.T utf8
.TH DZEN 1
.SH NAME
dzen2 \- general-purpose messaging and notification for X11
.SH SYNOPSIS
.B dzen2
[\-v] [\-p [seconds]] [\-m [v|h]] [\-ta <l|c|r>] [\-sa <l|c|r>]
      [\-x <pixel>] [\-y <pixel>] [\-w <pixel>] [\-tw <pixel>] [\-u] 
      [\-e <string>] [\-l <lines>]  [\-fn <font>] [\-bg <color>]
      [\-fg <color>] [\-xs <screen>]
.SH DESCRIPTION
.B Dzen
is a general\-purpose messaging and notification program for X11,
desigend to be scriptable in any language and integrate well with
window managers like dwm, wmii and xmonad though it will work with any
windowmanger.
.PP
.B Dzen
expects the status message on its standard input, and uses a custom
formatting language for colors and several other features (like bar
meters and such). See README for detailed usage and scripting
instructions.
.SH OPTIONS
.TP
.B \-fg <color>
Set foreground color. The <color> can be specified either as symbolic
name (e.g. red, darkgreen, etc.) or as #rrggbb hex\-value
(e.g. #ffffaa).
.TP
.B \-bg <color>
Set background color (same format as \-fg).
.TP
.B \-fn <font>
Set font (using the format of xlsfonts and xfontsel).
.TP
.B \-ta <l|c|r>
Set alignement of title window content: l(eft), c(center) or r(ight).
.TP
.B \-tw <pixels>
Set title window width.
.TP
.B \-sa <l|c|r>
Set alignment of slave window (see
.B \-ta
).
.TP
.B \-l <lines>
Number of lines to display in slave window (see (1) in README).
.TP
.B \-e <event1=action1:option1:...,action2;event2=...>
Set up events and actions, eg. responses to mouse clicks (see (2) in README).
.TP
.B \-m
Start up in menu mode (see (3) in README).
.TP
.B \-u
Update contents of title and slave window simultaneously, see (see (4) in README).
.TP
.B \-p [<timeout>]
Persist EOF (optional timeout in seconds).
.TP
.B \-x <pixels>
Set x position on the screen.
.TP
.B \-y <pixels>
Set y position on the screen.
.TP
.B \-h <pixels>
Set line height (defaults to fontheight + 2 pixels).
.TP
.B \-w <pixels>
width
.TP
.B \-xs <n>
Set the Xinerama screen number where dzen should appear.
.TP
.B \-v
Display version information.

.SH SEE ALSO
More detailed documentation (especially on the formatting language of
dzen2) is available in /usr/share/doc/dzen2/README.gz.

.SH AUTHOR
.B Dzen2
has been written by
.B Robert Manea.
This manpage has been written, based on dzen documentation, by Petr
Ro?kai, for Debian GNU/Linux, but may be used by others. This manpage
falls under the same licence as Dzen2 itself, see 
/usr/share/doc/dzen2/copyright.


--- NEW FILE dzen2.spec ---
Name:           dzen2
Version:        0.8.5
Release:        5%{?dist}
Summary:        A general purpose messaging and notification program

Group:          User Interface/X
License:        MIT
URL:            http://gotmor.googlepages.com/dzen
Source0:        http://gotmor.googlepages.com/%{name}-latest.tar.gz
Source1:        dzen2.1
Source2:        dzen2-dbar.1
Source3:        dzen2-gcpubar.1
Source4:        dzen2-gdbar.1
Source5:        dzen2-textwidth.1

# 2007-12-26: sent to upstream via private e-mail, inclusion depends on usability
# for *BSD and Solaris
Patch0:         dzen2-0.8.5-check_environment.patch
# Not sent to upstream: removes strip and shows cc invocations, which seems not to
#                       be wanted by upstream
Patch1:         dzen2-0.8.5-verbose.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libXpm-devel libXinerama-devel

%description
Dzen is a general purpose messaging, notification and menuing program for X11.
It was desigend to be scriptable in any language and integrate well with window
managers like dwm, wmii and xmonad though it will work with any windowmanger.


%prep
%setup -q
%patch0 -p1 -b .check_environment
%patch1 -p1 -b .verbose


%build
export CFLAGS="${RPM_OPT_FLAGS}"
export LDFLAGS="${RPM_OPT_FLAGS}"
make %{?_smp_mflags} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
export CFLAGS="${RPM_OPT_FLAGS}"
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
for gadget in dbar gcpubar gdbar textwidth
do
mv $RPM_BUILD_ROOT%{_bindir}/{,dzen2-}"${gadget}"
done

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
do
install -m 0644 "${manpage}" $RPM_BUILD_ROOT%{_mandir}/man1/"${manpage##*/}"
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# There is no .desktop file, because the applications displays data received
# via stdin, e.g. from xmonad, a window manager
# This cannot be done using a .desktop file
%doc LICENSE CREDITS README README.dzen
%doc gadgets/README.*
%{_bindir}/dzen2
%{_bindir}/dzen2-dbar
%{_bindir}/dzen2-gcpubar
%{_bindir}/dzen2-gdbar
%{_bindir}/dzen2-textwidth
%{_mandir}/man1/dzen2.1*
%{_mandir}/man1/dzen2-dbar.1*
%{_mandir}/man1/dzen2-gcpubar.1*
%{_mandir}/man1/dzen2-gdbar.1*
%{_mandir}/man1/dzen2-textwidth.1*


%changelog
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %%build

* Wed Aug 26 2009 Till Maas <opensource at till.name> - 0.8.5-4
- export LDFLAGS
- explain missing .desktop file

* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.8.5-3
- use make -C instead of pushd/popd
- add manpages from debian
- prefix gadgets with dzen2 like debian does it

* Tue Mar 31 2009 Till Maas <opensource at till.name> - 0.8.5-2
- Add description

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 0.8.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:32:25 -0000	1.1
+++ .cvsignore	2 Sep 2009 15:06:31 -0000	1.2
@@ -0,0 +1 @@
+dzen2-latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:32:25 -0000	1.1
+++ sources	2 Sep 2009 15:06:32 -0000	1.2
@@ -0,0 +1 @@
+5978620c2124c8a8ad52d7f17ce94fd7  dzen2-latest.tar.gz



From till at fedoraproject.org  Wed Sep  2 15:08:34 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed,  2 Sep 2009 15:08:34 +0000 (UTC)
Subject: rpms/dzen2/EL-5 dzen2-0.8.5-check_environment.patch, NONE,
	1.1 dzen2-0.8.5-verbose.patch, NONE, 1.1 dzen2-dbar.1, NONE,
	1.1 dzen2-gcpubar.1, NONE, 1.1 dzen2-gdbar.1, NONE,
	1.1 dzen2-textwidth.1, NONE, 1.1 dzen2.1, NONE, 1.1 dzen2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902150834.B9F4E11C008C@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/dzen2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1803

Modified Files:
	.cvsignore sources 
Added Files:
	dzen2-0.8.5-check_environment.patch dzen2-0.8.5-verbose.patch 
	dzen2-dbar.1 dzen2-gcpubar.1 dzen2-gdbar.1 dzen2-textwidth.1 
	dzen2.1 dzen2.spec 
Log Message:
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %build


dzen2-0.8.5-check_environment.patch:
 config.mk         |   45 +++++++++++++++++++++++----------------------
 gadgets/config.mk |    9 +++++----
 2 files changed, 28 insertions(+), 26 deletions(-)

--- NEW FILE dzen2-0.8.5-check_environment.patch ---
diff -up dzen2-0.8.5/config.mk.check_environment dzen2-0.8.5/config.mk
--- dzen2-0.8.5/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/config.mk	2007-12-26 13:40:06.000000000 +0100
@@ -4,40 +4,41 @@ VERSION = 0.8.5
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 INCS = -I. -I/usr/include -I${X11INC}
 
 # Configure the features you want to be supported
-# Only one of the following options has to be uncommented, 
-# all others must be commented!
-#
-# Uncomment: Remove # from the beginning of respective lines
-# Comment  : Add # to the beginning of the respective lines
 
-# Option 1: No Xinerama no XPM
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+# Remove the # from the next line to enable Xinerama support
+#DZEN_XINERAMA=1
+
+# Remove the # from the next line to enable Xpm support
+#DZEN_XPM=1
 
-# Option 2: No Xinerama with XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
-
-# Option 3: With Xinerama no XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
-
-# Option 4: With Xinerama and XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+# Uncomment: Remove # from the beginning of respective lines
+# Comment  : Add # to the beginning of the respective lines
 
 # END of feature configuration
 
+CFLAGS ?= -Os
+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+
+ifeq ($(DZEN_XINERAMA),1)
+LIBS += -lXinerama
+CFLAGS += -DDZEN_XINERAMA
+endif
+
+ifeq ($(DZEN_XPM), 1)
+LIBS += -lXpm
+CFLAGS += -DDZEN_XPM
+endif
 
-LDFLAGS = ${LIBS}
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # Solaris, uncomment for Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff -up dzen2-0.8.5/gadgets/config.mk.check_environment dzen2-0.8.5/gadgets/config.mk
--- dzen2-0.8.5/gadgets/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/config.mk	2007-12-26 13:39:04.000000000 +0100
@@ -1,8 +1,8 @@
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 INCS = -I. -I/usr/include -I${X11INC}
@@ -10,8 +10,9 @@ INCS = -I. -I/usr/include -I${X11INC}
 X11LIB = /usr/X11R6/lib
 LIBS = -L/usr/lib 
 
-CFLAGS = -Os ${INCS} 
-LDFLAGS = ${LIBS}
+CFLAGS ?= -Os 
+CFLAGS += ${INCS} 
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # compiler and linker
 CC = gcc

dzen2-0.8.5-verbose.patch:
 Makefile         |    5 ++---
 gadgets/Makefile |   14 +++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE dzen2-0.8.5-verbose.patch ---
diff -up dzen2-0.8.5/Makefile.verbose dzen2-0.8.5/Makefile
--- dzen2-0.8.5/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/Makefile	2008-11-01 11:25:01.000000000 +0100
@@ -17,14 +17,13 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: dzen.h action.h config.mk
 
 dzen2: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ ${OBJ} ${LDFLAGS}
 	@echo "Run ./help for documentation"
 
 clean:
diff -up dzen2-0.8.5/gadgets/Makefile.verbose dzen2-0.8.5/gadgets/Makefile
--- dzen2-0.8.5/gadgets/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/Makefile	2008-11-01 11:26:30.000000000 +0100
@@ -17,29 +17,25 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.mk
 
 dbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ dbar.o ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ dbar.o ${LDFLAGS}
 
 gdbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
 
 gcpubar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
-	@strip $@
+	${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
 
 textwidth: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
 
 clean:
 	@echo cleaning


--- NEW FILE dzen2-dbar.1 ---
.TH "DBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-dbar \- simple gadget that you can use in combination with dzen to display a progressbar.
.SH SYNOPSIS
.HP 7
\fBdzen2-dbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl]
.SH DESCRIPTION
.B dbar
is an application that generates semi graphical progress meters, from some values you supply to it.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-w
Number of charcaters to be considered 100% in the bar  (default: 25 )
.TP
.B \-s
Symbol represeting the percentage value in the bar (default: =  )
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar    (default: do print '\n')
.SH USAGE EXAMPLES
.TP
.B Static 0% and 100% mark or single value input:
.ip
Command: echo 25 | dbar -m 100 -l Sometext
.br
Output: Sometext  25% [======                   ]
.TP
.B If your 100% mark changes dynamically or 2-values input:
.ip
Command: echo "50 150" | dbar
.br
Output: 33% [========                 ]
.TP
.B If your value range is not between [0, maxval] or 3-values input:
.ip
Command: echo "50 -25 150" | dbar
.br
Output: 43% [===========              ]
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gcpubar.1 ---
.TH "GCPUBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gcpubar \- graphical CPU usage meter
.SH SYNOPSIS
.HP 7
\fBdzen2-gcpubar\fR [\-i \fIinterval\fR] [\-c \fIcount\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-w \fIpixel\fR] [\-h\ \fIpixel\fR] [\-nonl]
.SH DESCRIPTION
.B gcpubar
is a CPU utilization meter for Linux. It relies on the existence of the /proc/stat file and generates fully graphical meters viewable with dzen.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-i
Update interval in seconds (default 1). You can use positive values less than 1 for intervals shorter than 1 second.
.TP
.B \-c
Terminate after displaying argument to this option (default infinite).
.TP
.B \-fg
Foreground color
.TP
.B \-bg
Background color
.TP
.B \-w
Width in piwels
.TP
.B \-h
Height in pixels
.TP
.B \-nonl
No new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
gcpubar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gdbar.1 ---
.TH "GDBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gdbar \- generates fully graphical progress meters
.SH SYNOPSIS
.HP 7
\fBdzen2-gdbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl] [\-o]
.SH DESCRIPTION
.B gdbar
application that generates fully graphical progress meters, from some values you supply to it.
.PP
It has the same input semantics as dbar (see 
.B dbar (1)
\). In contrast to dbar, gdbar draws fully graphical meters which are only useful in combination with dzen.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-fg
Foreground color. (default white)
.TP
.B \-bg
Bacground color (default darkgrey)
.TP
.B \-w
Size in pixels to be considered 100% in the bar  (default: 80 )
.TP
.B \-h
Bar height.
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-o
Draw conky style meters.
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-textwidth.1 ---
.TH "TEXTWIDTH" 1 "Jan 01 2008"
.SH NAME
dzen2-textwidth \- calculate the width in pixels of text for a given font.
.SH SYNOPSIS
.HP 7
\fBdzen2-textwidth\fR  \fIfontname\fR \fIstring\fR
.SH DESCRIPTION
.B textwidth
is a simple utility to calculate the width in pixels of text with a given font.
.PP
This tool is provided as part of the
.B dzen2 (1)
package.
.SH OPTIONS
A summary of options is included below.
.TP
.B fontname
Set the font.
.TP
.B string
Set the string. 
.PP
textwidth was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2.1 ---
.T utf8
.TH DZEN 1
.SH NAME
dzen2 \- general-purpose messaging and notification for X11
.SH SYNOPSIS
.B dzen2
[\-v] [\-p [seconds]] [\-m [v|h]] [\-ta <l|c|r>] [\-sa <l|c|r>]
      [\-x <pixel>] [\-y <pixel>] [\-w <pixel>] [\-tw <pixel>] [\-u] 
      [\-e <string>] [\-l <lines>]  [\-fn <font>] [\-bg <color>]
      [\-fg <color>] [\-xs <screen>]
.SH DESCRIPTION
.B Dzen
is a general\-purpose messaging and notification program for X11,
desigend to be scriptable in any language and integrate well with
window managers like dwm, wmii and xmonad though it will work with any
windowmanger.
.PP
.B Dzen
expects the status message on its standard input, and uses a custom
formatting language for colors and several other features (like bar
meters and such). See README for detailed usage and scripting
instructions.
.SH OPTIONS
.TP
.B \-fg <color>
Set foreground color. The <color> can be specified either as symbolic
name (e.g. red, darkgreen, etc.) or as #rrggbb hex\-value
(e.g. #ffffaa).
.TP
.B \-bg <color>
Set background color (same format as \-fg).
.TP
.B \-fn <font>
Set font (using the format of xlsfonts and xfontsel).
.TP
.B \-ta <l|c|r>
Set alignement of title window content: l(eft), c(center) or r(ight).
.TP
.B \-tw <pixels>
Set title window width.
.TP
.B \-sa <l|c|r>
Set alignment of slave window (see
.B \-ta
).
.TP
.B \-l <lines>
Number of lines to display in slave window (see (1) in README).
.TP
.B \-e <event1=action1:option1:...,action2;event2=...>
Set up events and actions, eg. responses to mouse clicks (see (2) in README).
.TP
.B \-m
Start up in menu mode (see (3) in README).
.TP
.B \-u
Update contents of title and slave window simultaneously, see (see (4) in README).
.TP
.B \-p [<timeout>]
Persist EOF (optional timeout in seconds).
.TP
.B \-x <pixels>
Set x position on the screen.
.TP
.B \-y <pixels>
Set y position on the screen.
.TP
.B \-h <pixels>
Set line height (defaults to fontheight + 2 pixels).
.TP
.B \-w <pixels>
width
.TP
.B \-xs <n>
Set the Xinerama screen number where dzen should appear.
.TP
.B \-v
Display version information.

.SH SEE ALSO
More detailed documentation (especially on the formatting language of
dzen2) is available in /usr/share/doc/dzen2/README.gz.

.SH AUTHOR
.B Dzen2
has been written by
.B Robert Manea.
This manpage has been written, based on dzen documentation, by Petr
Ro?kai, for Debian GNU/Linux, but may be used by others. This manpage
falls under the same licence as Dzen2 itself, see 
/usr/share/doc/dzen2/copyright.


--- NEW FILE dzen2.spec ---
Name:           dzen2
Version:        0.8.5
Release:        5%{?dist}
Summary:        A general purpose messaging and notification program

Group:          User Interface/X
License:        MIT
URL:            http://gotmor.googlepages.com/dzen
Source0:        http://gotmor.googlepages.com/%{name}-latest.tar.gz
Source1:        dzen2.1
Source2:        dzen2-dbar.1
Source3:        dzen2-gcpubar.1
Source4:        dzen2-gdbar.1
Source5:        dzen2-textwidth.1

# 2007-12-26: sent to upstream via private e-mail, inclusion depends on usability
# for *BSD and Solaris
Patch0:         dzen2-0.8.5-check_environment.patch
# Not sent to upstream: removes strip and shows cc invocations, which seems not to
#                       be wanted by upstream
Patch1:         dzen2-0.8.5-verbose.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libXpm-devel libXinerama-devel

%description
Dzen is a general purpose messaging, notification and menuing program for X11.
It was desigend to be scriptable in any language and integrate well with window
managers like dwm, wmii and xmonad though it will work with any windowmanger.


%prep
%setup -q
%patch0 -p1 -b .check_environment
%patch1 -p1 -b .verbose


%build
export CFLAGS="${RPM_OPT_FLAGS}"
export LDFLAGS="${RPM_OPT_FLAGS}"
make %{?_smp_mflags} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
export CFLAGS="${RPM_OPT_FLAGS}"
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
for gadget in dbar gcpubar gdbar textwidth
do
mv $RPM_BUILD_ROOT%{_bindir}/{,dzen2-}"${gadget}"
done

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
do
install -m 0644 "${manpage}" $RPM_BUILD_ROOT%{_mandir}/man1/"${manpage##*/}"
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# There is no .desktop file, because the applications displays data received
# via stdin, e.g. from xmonad, a window manager
# This cannot be done using a .desktop file
%doc LICENSE CREDITS README README.dzen
%doc gadgets/README.*
%{_bindir}/dzen2
%{_bindir}/dzen2-dbar
%{_bindir}/dzen2-gcpubar
%{_bindir}/dzen2-gdbar
%{_bindir}/dzen2-textwidth
%{_mandir}/man1/dzen2.1*
%{_mandir}/man1/dzen2-dbar.1*
%{_mandir}/man1/dzen2-gcpubar.1*
%{_mandir}/man1/dzen2-gdbar.1*
%{_mandir}/man1/dzen2-textwidth.1*


%changelog
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %%build

* Wed Aug 26 2009 Till Maas <opensource at till.name> - 0.8.5-4
- export LDFLAGS
- explain missing .desktop file

* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.8.5-3
- use make -C instead of pushd/popd
- add manpages from debian
- prefix gadgets with dzen2 like debian does it

* Tue Mar 31 2009 Till Maas <opensource at till.name> - 0.8.5-2
- Add description

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 0.8.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:32:25 -0000	1.1
+++ .cvsignore	2 Sep 2009 15:08:33 -0000	1.2
@@ -0,0 +1 @@
+dzen2-latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:32:25 -0000	1.1
+++ sources	2 Sep 2009 15:08:34 -0000	1.2
@@ -0,0 +1 @@
+5978620c2124c8a8ad52d7f17ce94fd7  dzen2-latest.tar.gz



From notting at fedoraproject.org  Wed Sep  2 15:09:25 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  2 Sep 2009 15:09:25 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.636,1.637
Message-ID: <20090902150925.D55DC11C008C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2376

Modified Files:
	policycoreutils.spec 
Log Message:
Fix typo


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -p -r1.636 -r1.637
--- policycoreutils.spec	28 Aug 2009 18:18:47 -0000	1.636
+++ policycoreutils.spec	2 Sep 2009 15:09:25 -0000	1.637
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -164,11 +164,11 @@ exit 0
 
 %post sandbox
 if [ $1 -eq 1 ]; then
-   /sbin/chkconfig sanbox --add
+   /sbin/chkconfig sandbox --add
 fi
 %preun sandbox
 if [ $1 -eq 0 ]; then
-   /sbin/chkconfig sanbox --del
+   /sbin/chkconfig sandbox --del
 fi
 
 %package newrole
@@ -295,6 +295,9 @@ fi
 exit 0
 
 %changelog
+* Wed Sep  2 2009 Bill Nottingham <notting at redhat.com> 2.0.71-15
+- Fix typo
+
 * Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-14
 - Add enable/disable patch
 



From hadess at fedoraproject.org  Wed Sep  2 15:09:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Sep 2009 15:09:41 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.23,
	1.24 nautilus-sendto.spec, 1.81, 1.82 sources, 1.23, 1.24
Message-ID: <20090902150941.200DC11C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2530

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 1.1.7-1
- Update to 1.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	29 Jul 2009 16:48:45 -0000	1.23
+++ .cvsignore	2 Sep 2009 15:09:40 -0000	1.24
@@ -1 +1 @@
-nautilus-sendto-1.1.6.tar.bz2
+nautilus-sendto-1.1.7.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- nautilus-sendto.spec	26 Aug 2009 23:12:12 -0000	1.81
+++ nautilus-sendto.spec	2 Sep 2009 15:09:40 -0000	1.82
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
-Version:        1.1.6
-Release:        3%{?dist}
+Version:        1.1.7
+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
+* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 1.1.7-1
+- Update to 1.1.7
+
 * Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.1.6-3
 - Rebuild for new Empathy.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Jul 2009 16:48:45 -0000	1.23
+++ sources	2 Sep 2009 15:09:40 -0000	1.24
@@ -1 +1 @@
-aab4afd686f0a701c0b439f262d1410d  nautilus-sendto-1.1.6.tar.bz2
+620949efa09416a970479b572130753a  nautilus-sendto-1.1.7.tar.bz2



From nalin at fedoraproject.org  Wed Sep  2 15:26:59 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed,  2 Sep 2009 15:26:59 +0000 (UTC)
Subject: rpms/nss-ldapd/devel .cvsignore, 1.2, 1.3 nss-ldapd.spec, 1.2,
	1.3 sources, 1.2, 1.3 nss-ldapd-0.6.10.tar.gz.sig, 1.1, NONE
Message-ID: <20090902152659.D2B7E11C008C@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss-ldapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8418

Modified Files:
	.cvsignore nss-ldapd.spec sources 
Removed Files:
	nss-ldapd-0.6.10.tar.gz.sig 
Log Message:
update to 0.6.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2009 18:17:30 -0000	1.2
+++ .cvsignore	2 Sep 2009 15:26:58 -0000	1.3
@@ -1 +1,3 @@
 nss-ldapd-0.6.10.tar.gz
+nss-ldapd-0.6.11.tar.gz
+nss-ldapd-0.6.11.tar.gz.sig


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/devel/nss-ldapd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-ldapd.spec	25 Jul 2009 19:34:53 -0000	1.2
+++ nss-ldapd.spec	2 Sep 2009 15:26:58 -0000	1.3
@@ -4,8 +4,8 @@
 %define		provide_so_link 0
 
 Name:		nss-ldapd
-Version:	0.6.10
-Release:	4%{?dist}
+Version:	0.6.11
+Release:	1%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -147,6 +147,9 @@ fi
 exit 0
 
 %changelog
+* Wed Sep  2 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-1
+- update to 0.6.11
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jun 2009 18:17:31 -0000	1.2
+++ sources	2 Sep 2009 15:26:58 -0000	1.3
@@ -1 +1,2 @@
-4b351954d94aceadb74ce589640fc93b  nss-ldapd-0.6.10.tar.gz
+8e5087f74a128f2c12f974c176803747  nss-ldapd-0.6.11.tar.gz
+30a2abf95d3342f58a07d2ce39f647ed  nss-ldapd-0.6.11.tar.gz.sig


--- nss-ldapd-0.6.10.tar.gz.sig DELETED ---



From nalin at fedoraproject.org  Wed Sep  2 15:33:29 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed,  2 Sep 2009 15:33:29 +0000 (UTC)
Subject: rpms/nss-ldapd/F-11 nss-ldapd.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090902153329.380F311C008C@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss-ldapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10552

Modified Files:
	nss-ldapd.spec sources 
Log Message:
update to 0.6.11 by rebasing to devel


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/F-11/nss-ldapd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-ldapd.spec	25 Jul 2009 19:34:53 -0000	1.2
+++ nss-ldapd.spec	2 Sep 2009 15:33:28 -0000	1.3
@@ -4,8 +4,8 @@
 %define		provide_so_link 0
 
 Name:		nss-ldapd
-Version:	0.6.10
-Release:	4%{?dist}
+Version:	0.6.11
+Release:	1%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -147,6 +147,9 @@ fi
 exit 0
 
 %changelog
+* Wed Sep  2 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-1
+- update to 0.6.11
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jun 2009 18:17:31 -0000	1.2
+++ sources	2 Sep 2009 15:33:28 -0000	1.3
@@ -1 +1,2 @@
-4b351954d94aceadb74ce589640fc93b  nss-ldapd-0.6.10.tar.gz
+8e5087f74a128f2c12f974c176803747  nss-ldapd-0.6.11.tar.gz
+30a2abf95d3342f58a07d2ce39f647ed  nss-ldapd-0.6.11.tar.gz.sig



From ajax at fedoraproject.org  Wed Sep  2 15:46:21 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Sep 2009 15:46:21 +0000 (UTC)
Subject: rpms/kernel/devel drm-intel-pm.patch, 1.4, 1.5 kernel.spec, 1.1760, 
	1.1761
Message-ID: <20090902154621.A1B4F11C008C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15319

Modified Files:
	drm-intel-pm.patch kernel.spec 
Log Message:
* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com>
- drm-intel-pm.patch: Disable by default, too flickery on too many machines.
  Enable with i915.powersave=1.


drm-intel-pm.patch:
 i915_drv.c      |   15 +
 i915_drv.h      |   14 +
 i915_gem.c      |    8 
 i915_reg.h      |   22 ++
 intel_display.c |  484 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 intel_drv.h     |    4 
 6 files changed, 512 insertions(+), 35 deletions(-)

Index: drm-intel-pm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-pm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drm-intel-pm.patch	3 Aug 2009 18:24:04 -0000	1.4
+++ drm-intel-pm.patch	2 Sep 2009 15:46:20 -0000	1.5
@@ -5,7 +5,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  unsigned int i915_fbpercrtc = 0;
  module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
  
-+unsigned int i915_powersave = 1;
++unsigned int i915_powersave = 0;
 +module_param_named(powersave, i915_powersave, int, 0400);
 +
 +unsigned int i915_lvdsclock = 1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -p -r1.1760 -r1.1761
--- kernel.spec	2 Sep 2009 13:40:43 -0000	1.1760
+++ kernel.spec	2 Sep 2009 15:46:20 -0000	1.1761
@@ -2009,6 +2009,10 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com>
+- drm-intel-pm.patch: Disable by default, too flickery on too many machines.
+  Enable with i915.powersave=1.
+
 * Wed Sep 02 2009 Dave Jones <davej at redhat.com>
 - Add missing scriptlet dependancy. (#520788)
 



From mtasaka at fedoraproject.org  Wed Sep  2 15:53:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 15:53:59 +0000 (UTC)
Subject: rpms/uget/F-10 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 uget.spec,
	1.11, 1.12
Message-ID: <20090902155359.B1CE811C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19198/F-10

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
- 1.4.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 15:38:12 -0000	1.10
+++ .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
@@ -1 +1 @@
-uget-1.4.9.2.tar.gz
+uget-1.4.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Aug 2009 15:38:12 -0000	1.10
+++ sources	2 Sep 2009 15:53:59 -0000	1.11
@@ -1 +1 @@
-f2dbc5a9abb1b8253c92221013a33455  uget-1.4.9.2.tar.gz
+7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/uget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- uget.spec	4 Aug 2009 15:38:12 -0000	1.11
+++ uget.spec	2 Sep 2009 15:53:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.2
+Version:	1.4.9.3
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -75,9 +75,13 @@ exit 0
 
 %{_datadir}/applications/%{name}-gtk.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
+%{_datadir}/pixmaps/%{name}/
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
+- 1.4.9.3
+
 * Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
 - 1.4.9.2
 



From mtasaka at fedoraproject.org  Wed Sep  2 15:54:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 15:54:00 +0000 (UTC)
Subject: rpms/uget/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 uget.spec,
	1.13, 1.14
Message-ID: <20090902155400.213CB11C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19198/devel

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
- 1.4.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 15:38:12 -0000	1.10
+++ .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
@@ -1 +1 @@
-uget-1.4.9.2.tar.gz
+uget-1.4.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Aug 2009 15:38:12 -0000	1.10
+++ sources	2 Sep 2009 15:53:59 -0000	1.11
@@ -1 +1 @@
-f2dbc5a9abb1b8253c92221013a33455  uget-1.4.9.2.tar.gz
+7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/uget.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- uget.spec	4 Aug 2009 15:38:12 -0000	1.13
+++ uget.spec	2 Sep 2009 15:53:59 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.2
+Version:	1.4.9.3
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -75,9 +75,13 @@ exit 0
 
 %{_datadir}/applications/%{name}-gtk.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
+%{_datadir}/pixmaps/%{name}/
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
+- 1.4.9.3
+
 * Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
 - 1.4.9.2
 



From mtasaka at fedoraproject.org  Wed Sep  2 15:53:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  2 Sep 2009 15:53:59 +0000 (UTC)
Subject: rpms/uget/F-11 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 uget.spec,
	1.11, 1.12
Message-ID: <20090902155359.DD6D511C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19198/F-11

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
- 1.4.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 15:38:12 -0000	1.10
+++ .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
@@ -1 +1 @@
-uget-1.4.9.2.tar.gz
+uget-1.4.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Aug 2009 15:38:12 -0000	1.10
+++ sources	2 Sep 2009 15:53:59 -0000	1.11
@@ -1 +1 @@
-f2dbc5a9abb1b8253c92221013a33455  uget-1.4.9.2.tar.gz
+7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/uget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- uget.spec	4 Aug 2009 15:38:12 -0000	1.11
+++ uget.spec	2 Sep 2009 15:53:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.2
+Version:	1.4.9.3
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -75,9 +75,13 @@ exit 0
 
 %{_datadir}/applications/%{name}-gtk.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
+%{_datadir}/pixmaps/%{name}/
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
+- 1.4.9.3
+
 * Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
 - 1.4.9.2
 



From nphilipp at fedoraproject.org  Wed Sep  2 15:55:24 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  2 Sep 2009 15:55:24 +0000 (UTC)
Subject: rpms/system-config-date/devel sources, 1.116,
	1.117 system-config-date.spec, 1.124, 1.125
Message-ID: <20090902155524.32A9F11C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19568

Modified Files:
	sources system-config-date.spec 
Log Message:
fixed version 1.9.47


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	2 Sep 2009 15:01:09 -0000	1.116
+++ sources	2 Sep 2009 15:55:23 -0000	1.117
@@ -1 +1 @@
-ba1bf7d85a8ac821015e9d7bc4269581  system-config-date-1.9.47.tar.bz2
+60511fece116d7621dcb56f99f2d5a61  system-config-date-1.9.47.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- system-config-date.spec	2 Sep 2009 15:01:09 -0000	1.124
+++ system-config-date.spec	2 Sep 2009 15:55:24 -0000	1.125
@@ -126,7 +126,7 @@ fi
 
 %changelog
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.47-1
-- appease anaconda (#520799)
+- import gettext from each module again (#520799)
 
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.46-1
 - use new gtk toolkit API



From than at fedoraproject.org  Wed Sep  2 16:01:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 16:01:01 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.143,1.144
Message-ID: <20090902160101.2161711C008C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21229

Modified Files:
	kdegames.spec 
Log Message:
add _default_patch_fuzz 2



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- kdegames.spec	28 Aug 2009 13:29:02 -0000	1.143
+++ kdegames.spec	2 Sep 2009 16:01:00 -0000	1.144
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6



From pkgdb at fedoraproject.org  Wed Sep  2 16:07:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 16:07:50 +0000
Subject: [pkgdb] libtnc was added for spot
Message-ID: <20090902160750.C627210F87A@bastion2.fedora.phx.redhat.com>

spot has added Package libtnc with summary Library implementation of the Trusted Network Connect (TNC) specification
spot has approved Package libtnc
spot has added a Fedora devel branch for libtnc with an owner of spot
spot has approved libtnc in Fedora devel
spot has approved Package libtnc
spot has set commit to Approved for 107427 on libtnc (Fedora devel)
spot has set checkout to Approved for 107427 on libtnc (Fedora devel)
spot has set build to Approved for 107427 on libtnc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtnc



From pkgdb at fedoraproject.org  Wed Sep  2 16:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 16:07:52 +0000
Subject: [pkgdb] libtnc summary updated by spot
Message-ID: <20090902160752.2DCE710F882@bastion2.fedora.phx.redhat.com>

spot set package libtnc summary to Library implementation of the Trusted Network Connect (TNC) specification

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtnc



From pkgdb at fedoraproject.org  Wed Sep  2 16:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 16:07:52 +0000
Subject: [pkgdb] libtnc (Fedora, 11) updated by spot
Message-ID: <20090902160752.3397F10F890@bastion2.fedora.phx.redhat.com>

spot added a Fedora 11 branch for libtnc
spot has set commit to Approved for 107427 on libtnc (Fedora 11)
spot has set checkout to Approved for 107427 on libtnc (Fedora 11)
spot has set build to Approved for 107427 on libtnc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtnc



From spot at fedoraproject.org  Wed Sep  2 16:07:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:07:58 +0000 (UTC)
Subject: rpms/libtnc/devel - New directory
Message-ID: <20090902160758.41F5D11C0094@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsX22919/rpms/libtnc/devel

Log Message:
Directory /cvs/pkgs/rpms/libtnc/devel added to the repository




From spot at fedoraproject.org  Wed Sep  2 16:07:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:07:58 +0000 (UTC)
Subject: rpms/libtnc - New directory
Message-ID: <20090902160758.1E39411C008C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsX22919/rpms/libtnc

Log Message:
Directory /cvs/pkgs/rpms/libtnc added to the repository




From spot at fedoraproject.org  Wed Sep  2 16:08:04 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:08:04 +0000 (UTC)
Subject: rpms/libtnc Makefile,NONE,1.1
Message-ID: <20090902160804.A5B5A11C008C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsX22919/rpms/libtnc

Added Files:
	Makefile 
Log Message:
Setup of module libtnc


--- NEW FILE Makefile ---
# Top level Makefile for module libtnc
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 Sep  2 16:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Sep 2009 16:07:52 +0000
Subject: [pkgdb] libtnc (Fedora, 11) updated by spot
Message-ID: <20090902160752.3A44110F894@bastion2.fedora.phx.redhat.com>

spot added a Fedora 10 branch for libtnc
spot has set commit to Approved for 107427 on libtnc (Fedora 10)
spot has set checkout to Approved for 107427 on libtnc (Fedora 10)
spot has set build to Approved for 107427 on libtnc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtnc



From spot at fedoraproject.org  Wed Sep  2 16:08:04 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:08:04 +0000 (UTC)
Subject: rpms/libtnc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090902160804.ED32911C008C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsX22919/rpms/libtnc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtnc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libtnc
# $Id: Makefile,v 1.1 2009/09/02 16:08:04 spot Exp $
NAME := libtnc
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 spot at fedoraproject.org  Wed Sep  2 16:13:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:13:17 +0000 (UTC)
Subject: rpms/libtnc/devel import.log, NONE, 1.1 libtnc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902161317.A5EC311C008C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24288/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libtnc.spec 
Log Message:

initial commit



--- NEW FILE import.log ---
libtnc-1_22-1_fc12:HEAD:libtnc-1.22-1.fc12.src.rpm:1251907803


--- NEW FILE libtnc.spec ---
Name:		libtnc
Version:	1.22
Release:	1%{?dist}
Summary:	Library implementation of the Trusted Network Connect (TNC) specification
License:	GPLv2
Group:		System Environment/Libraries
Source0:	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
URL:		http://libtnc.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libxml2-devel, zlib-devel

%description
This library provides functions for loading and interfacing with loadable IMC
Integrity Measurement Collector (IMC) and Integrity Measurement Verifier (IMV)
modules as required by the Trusted Network Computing (TNC) IF-IMC and IF-IMV 
interfaces as described in: https://www.trustedcomputinggroup.org/specs/TNC

%package devel
Summary:	Development headers and libraries for libtnc
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Header and library files used for developing with (or linking to) libtnc.

%prep
%setup -q

%build
CFLAGS="%{optflags} -fPIC -DPIC"
%configure --with-pic
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 DESTDIR=%{buildroot} install
rm -rf %{buildroot}/%{_libdir}/*.la
# It is easier to delete the static libs here than to disable them in configure
# Autoconf makes my brain bleed.
rm -rf %{buildroot}/%{_libdir}/*.a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libosc_im*.so.*
%{_libdir}/libsample_im*.so.*
%{_libdir}/libtnc.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/libtnc.pdf
%{_includedir}/libtnc*.h
%{_includedir}/tnc*.h
%{_libdir}/libosc_im*.so
%{_libdir}/libsample_im*.so
%{_libdir}/libtnc.so

%changelog
* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.22-1
- update to 1.22

* Tue May 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-1
- initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtnc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	2 Sep 2009 16:08:04 -0000	1.1
+++ .cvsignore	2 Sep 2009 16:13:17 -0000	1.2
@@ -0,0 +1 @@
+libtnc-1.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtnc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Sep 2009 16:08:04 -0000	1.1
+++ sources	2 Sep 2009 16:13:17 -0000	1.2
@@ -0,0 +1 @@
+abcb3793d3487f32926e3ef7ce495c14  libtnc-1.22.tar.gz



From spot at fedoraproject.org  Wed Sep  2 16:18:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:18:58 +0000 (UTC)
Subject: rpms/libtnc/F-11 libtnc.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090902161858.AC8A811C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26934/F-11

Modified Files:
	sources 
Added Files:
	libtnc.spec 
Log Message:
branching


--- NEW FILE libtnc.spec ---
Name:		libtnc
Version:	1.22
Release:	1%{?dist}
Summary:	Library implementation of the Trusted Network Connect (TNC) specification
License:	GPLv2
Group:		System Environment/Libraries
Source0:	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
URL:		http://libtnc.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libxml2-devel, zlib-devel

%description
This library provides functions for loading and interfacing with loadable IMC
Integrity Measurement Collector (IMC) and Integrity Measurement Verifier (IMV)
modules as required by the Trusted Network Computing (TNC) IF-IMC and IF-IMV 
interfaces as described in: https://www.trustedcomputinggroup.org/specs/TNC

%package devel
Summary:	Development headers and libraries for libtnc
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Header and library files used for developing with (or linking to) libtnc.

%prep
%setup -q

%build
CFLAGS="%{optflags} -fPIC -DPIC"
%configure --with-pic
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 DESTDIR=%{buildroot} install
rm -rf %{buildroot}/%{_libdir}/*.la
# It is easier to delete the static libs here than to disable them in configure
# Autoconf makes my brain bleed.
rm -rf %{buildroot}/%{_libdir}/*.a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libosc_im*.so.*
%{_libdir}/libsample_im*.so.*
%{_libdir}/libtnc.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/libtnc.pdf
%{_includedir}/libtnc*.h
%{_includedir}/tnc*.h
%{_libdir}/libosc_im*.so
%{_libdir}/libsample_im*.so
%{_libdir}/libtnc.so

%changelog
* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.22-1
- update to 1.22

* Tue May 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-1
- initial Fedora package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtnc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Sep 2009 16:08:04 -0000	1.1
+++ sources	2 Sep 2009 16:18:58 -0000	1.2
@@ -0,0 +1 @@
+abcb3793d3487f32926e3ef7ce495c14  libtnc-1.22.tar.gz



From spot at fedoraproject.org  Wed Sep  2 16:18:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:18:58 +0000 (UTC)
Subject: rpms/libtnc/F-10 libtnc.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090902161858.848BD11C008C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libtnc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26934/F-10

Modified Files:
	sources 
Added Files:
	libtnc.spec 
Log Message:
branching


--- NEW FILE libtnc.spec ---
Name:		libtnc
Version:	1.22
Release:	1%{?dist}
Summary:	Library implementation of the Trusted Network Connect (TNC) specification
License:	GPLv2
Group:		System Environment/Libraries
Source0:	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
URL:		http://libtnc.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libxml2-devel, zlib-devel

%description
This library provides functions for loading and interfacing with loadable IMC
Integrity Measurement Collector (IMC) and Integrity Measurement Verifier (IMV)
modules as required by the Trusted Network Computing (TNC) IF-IMC and IF-IMV 
interfaces as described in: https://www.trustedcomputinggroup.org/specs/TNC

%package devel
Summary:	Development headers and libraries for libtnc
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Header and library files used for developing with (or linking to) libtnc.

%prep
%setup -q

%build
CFLAGS="%{optflags} -fPIC -DPIC"
%configure --with-pic
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 DESTDIR=%{buildroot} install
rm -rf %{buildroot}/%{_libdir}/*.la
# It is easier to delete the static libs here than to disable them in configure
# Autoconf makes my brain bleed.
rm -rf %{buildroot}/%{_libdir}/*.a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libosc_im*.so.*
%{_libdir}/libsample_im*.so.*
%{_libdir}/libtnc.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/libtnc.pdf
%{_includedir}/libtnc*.h
%{_includedir}/tnc*.h
%{_libdir}/libosc_im*.so
%{_libdir}/libsample_im*.so
%{_libdir}/libtnc.so

%changelog
* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.22-1
- update to 1.22

* Tue May 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-1
- initial Fedora package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtnc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Sep 2009 16:08:04 -0000	1.1
+++ sources	2 Sep 2009 16:18:58 -0000	1.2
@@ -0,0 +1 @@
+abcb3793d3487f32926e3ef7ce495c14  libtnc-1.22.tar.gz



From hadess at fedoraproject.org  Wed Sep  2 16:25:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Sep 2009 16:25:10 +0000 (UTC)
Subject: rpms/totem/F-11
	0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch, 1.1,
	1.2 totem.spec, 1.243, 1.244
Message-ID: <20090902162510.A517511C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29187

Modified Files:
	0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch 
	totem.spec 
Log Message:
* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-4
- Really fix #514914 (crash when a drive has an emblemed icon)


0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch:
 totem-menu.c |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Index: 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch	31 Jul 2009 18:08:13 -0000	1.1
+++ 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch	2 Sep 2009 16:25:10 -0000	1.2
@@ -26,7 +26,7 @@ index 28b8b73..ec59fea 100644
 +			GIcon *new_icon;
 +			new_icon = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
 +			g_object_unref (icon);
-+			icon = new_icon;
++			icon = g_object_ref (new_icon);
 +		}
 +
 +		if (G_IS_THEMED_ICON (icon)) {


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- totem.spec	19 Aug 2009 11:00:59 -0000	1.243
+++ totem.spec	2 Sep 2009 16:25:10 -0000	1.244
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -485,6 +485,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-4
+- Really fix #514914 (crash when a drive has an emblemed icon)
+
 * Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-3
 - Update PA volume patch, don't restore the volume when
   using Pulseaudio (#512090)



From jcollie at fedoraproject.org  Wed Sep  2 16:45:25 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  2 Sep 2009 16:45:25 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore, 1.17, 1.18 gnonlin.spec, 1.29,
	1.30 sources, 1.17, 1.18
Message-ID: <20090902164525.2C1C711C00CE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3031

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.1
- Update to latest prelrelease



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Aug 2009 14:19:27 -0000	1.17
+++ .cvsignore	2 Sep 2009 16:45:24 -0000	1.18
@@ -1 +1 @@
-gnonlin-0.10.12.2.tar.bz2
+gnonlin.spec


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gnonlin.spec	29 Aug 2009 14:19:27 -0000	1.29
+++ gnonlin.spec	2 Sep 2009 16:45:24 -0000	1.30
@@ -2,7 +2,7 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.12.2
+Version:        0.10.12.3
 Release:        0.1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.1
+- Update to latest prelrelease
+
 * Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.2-0.1
 - Update to prerelease for 0.10.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	29 Aug 2009 14:19:27 -0000	1.17
+++ sources	2 Sep 2009 16:45:24 -0000	1.18
@@ -1 +1 @@
-ac2fc4be5cc1bfdd303ea1400301df86  gnonlin-0.10.12.2.tar.bz2
+bc67c35c111579744ee4465b3d8e8e50  gnonlin.spec



From spot at fedoraproject.org  Wed Sep  2 16:55:48 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  2 Sep 2009 16:55:48 +0000 (UTC)
Subject: rpms/xsupplicant/devel xsupplicant-2.1.8-ui-Fedora.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 sources, 1.11, 1.12 xsupplicant.spec,
	1.43, 1.44 xsupplicant-2.1.7-fix-configure.patch, 1.1,
	NONE xsupplicant-2.1.7-sim-fixes.patch, 1.1,
	NONE xsupplicant-2.1.7-tnc.patch, 1.1,
	NONE xsupplicant-2.1.7-ui-Fedora.patch, 1.1,
	NONE xsupplicant-2.1.7-ui-fixes.patch, 1.1, NONE
Message-ID: <20090902165548.7EBCD11C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xsupplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6623

Modified Files:
	.cvsignore sources xsupplicant.spec 
Added Files:
	xsupplicant-2.1.8-ui-Fedora.patch 
Removed Files:
	xsupplicant-2.1.7-fix-configure.patch 
	xsupplicant-2.1.7-sim-fixes.patch xsupplicant-2.1.7-tnc.patch 
	xsupplicant-2.1.7-ui-Fedora.patch 
	xsupplicant-2.1.7-ui-fixes.patch 
Log Message:
update to 2.1.8

xsupplicant-2.1.8-ui-Fedora.patch:
 FormLoader.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xsupplicant-2.1.8-ui-Fedora.patch ---
diff -up XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp.Fedora XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp
--- XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp.Fedora	2009-04-22 01:13:04.000000000 -0400
+++ XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp	2009-09-02 12:40:38.329916230 -0400
@@ -82,7 +82,7 @@ QString FormLoader::skinpath()
 #ifdef __APPLE__
         return QString("/Library/Application Support/XSupplicant") + QString("/Skins/Default/");
 #else
-	return QApplication::applicationDirPath() + QString("/Skins/Default/");
+	return QString("/usr/share/xsupplicant/Skins/Default/");
 #endif // __APPLE__
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 May 2009 21:06:34 -0000	1.8
+++ .cvsignore	2 Sep 2009 16:55:48 -0000	1.9
@@ -1 +1 @@
-xsupplicant-2.1.7.zip
+XSupplicant-2.1.8-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 May 2009 21:06:34 -0000	1.11
+++ sources	2 Sep 2009 16:55:48 -0000	1.12
@@ -1 +1 @@
-d92d4ed7f2f6f3e91e7b29553daa4b5a  xsupplicant-2.1.7.zip
+390e45630f06ac0efa88049fa8c5f16f  XSupplicant-2.1.8-src.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xsupplicant.spec	21 Aug 2009 16:37:15 -0000	1.43
+++ xsupplicant.spec	2 Sep 2009 16:55:48 -0000	1.44
@@ -1,17 +1,13 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	2.1.7
-Release:	3%{?dist}
+Version:	2.1.8
+Release:	1%{?dist}
 License:	GPLv2+ or BSD with advertising
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
-Source0:	http://download.sourceforge.net/open1x/xsupplicant-%{version}.zip
+Source0:	http://download.sourceforge.net/open1x/XSupplicant-%{version}-src.tar.gz
 Source1:	XSupplicantUI.desktop
-Patch0:		xsupplicant-2.1.7-tnc.patch
-Patch1:		xsupplicant-2.1.7-ui-fixes.patch
-Patch2:		xsupplicant-2.1.7-ui-Fedora.patch
-Patch3:		xsupplicant-2.1.7-fix-configure.patch
-Patch4:		xsupplicant-2.1.7-sim-fixes.patch
+Patch2:		xsupplicant-2.1.8-ui-Fedora.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel
 BuildRequires:	openssl-devel, wireless-tools-devel
@@ -42,17 +38,10 @@ Requires:	%{name} = %{version}-%{release
 QT User Interface for XSupplicant.
 
 %prep
-%setup -q
-%patch0 -p1 -b .tnc
-%patch1 -p1 -b .ui
+%setup -q -n XSupplicant-%{version}-src
 # Find UI files in a sane system location
 %patch2 -p1 -b .Fedora
-# Fix configure
-%patch3 -p1 -b .fix-configure
-# Fix sim
-%patch4 -p1 -b .fix-sim
 cd xsupplicant
-dos2unix configure.ac Makefile.am
 autoreconf -vfis
 
 %build
@@ -61,7 +50,7 @@ pushd xsupplicant
 make %{?_smp_mflags}
 popd
 pushd xsupplicant-ui/xsupptray
-qmake-qt4
+qmake-qt4 XSupplicantUI-unix.pro
 make %{?_smp_mflags}
 popd
 
@@ -133,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-1
+- update to 2.1.8
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-3
 - rebuilt with new openssl
 


--- xsupplicant-2.1.7-fix-configure.patch DELETED ---


--- xsupplicant-2.1.7-sim-fixes.patch DELETED ---


--- xsupplicant-2.1.7-tnc.patch DELETED ---


--- xsupplicant-2.1.7-ui-Fedora.patch DELETED ---


--- xsupplicant-2.1.7-ui-fixes.patch DELETED ---



From walters at fedoraproject.org  Wed Sep  2 17:15:55 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed,  2 Sep 2009 17:15:55 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.102,1.103
Message-ID: <20090902171556.0AE3011C00CE@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13730

Modified Files:
	comps-f12.xml.in 
Log Message:
ABRT: Swap kerneloops for abrt-desktop, and remove bug-buddy


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- comps-f12.xml.in	31 Aug 2009 18:59:30 -0000	1.102
+++ comps-f12.xml.in	2 Sep 2009 17:15:54 -0000	1.103
@@ -360,7 +360,7 @@
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">kerneloops</packagereq>
+      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
@@ -2462,7 +2462,6 @@
       <packagereq type="conditional" requires="scim">scim-bridge-gtk</packagereq>
       <packagereq type="default">at-spi</packagereq>
       <packagereq type="default">brasero-nautilus</packagereq>
-      <packagereq type="default">bug-buddy</packagereq>
       <packagereq type="default">cheese</packagereq>
       <packagereq type="default">compiz-gnome</packagereq>
       <packagereq type="default">dasher</packagereq>



From scop at fedoraproject.org  Wed Sep  2 17:17:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed,  2 Sep 2009 17:17:04 +0000 (UTC)
Subject: rpms/cd-discid/devel .cvsignore, 1.3, 1.4 cd-discid.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <20090902171704.CAB2C11C00CE@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cd-discid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389

Modified Files:
	.cvsignore cd-discid.spec sources 
Log Message:
* Wed Sep  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1-1
- Update to 1.1 (#520781).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Aug 2009 16:14:57 -0000	1.3
+++ .cvsignore	2 Sep 2009 17:17:04 -0000	1.4
@@ -1 +1 @@
-cd-discid-1.0.tar.gz
+cd-discid-1.1.tar.gz


Index: cd-discid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/devel/cd-discid.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cd-discid.spec	26 Aug 2009 16:14:57 -0000	1.12
+++ cd-discid.spec	2 Sep 2009 17:17:04 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cd-discid
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Utility to get CDDB discid information
 
@@ -26,8 +26,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 cd-discid $RPM_BUILD_ROOT%{_bindir}/cd-discid
-install -Dpm 644 cd-discid.1 $RPM_BUILD_ROOT%{_mandir}/man1/cd-discid.1
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -42,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1-1
+- Update to 1.1 (#520781).
+
 * Wed Aug 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
 - Update to 1.0 (#519289).
 - Update URLs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2009 16:14:57 -0000	1.3
+++ sources	2 Sep 2009 17:17:04 -0000	1.4
@@ -1 +1 @@
-ccca88ffec8d8497714e9a1203c81c5a  cd-discid-1.0.tar.gz
+04cb368e3f1ce17e656ac6691ca0b687  cd-discid-1.1.tar.gz



From rdieter at fedoraproject.org  Wed Sep  2 17:19:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Sep 2009 17:19:09 +0000 (UTC)
Subject: rpms/amarok/F-11 amarok-2.1.1-lyricwiki.patch, NONE, 1.1 amarok.spec,
	1.150, 1.151 amarok-parse-lyricwiki-website.patch, 1.1, NONE
Message-ID: <20090902171909.669AB11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15497

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.1.1-lyricwiki.patch 
Removed Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-5
- lyricwiki patch respin (kdebug#202366)


amarok-2.1.1-lyricwiki.patch:
 main.js |   36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

--- NEW FILE amarok-2.1.1-lyricwiki.patch ---
diff -up amarok-2.1.1/src/scripts/lyrics_lyricwiki/main.js.lyricwiki amarok-2.1.1/src/scripts/lyrics_lyricwiki/main.js
--- amarok-2.1.1/src/scripts/lyrics_lyricwiki/main.js.lyricwiki	2009-06-12 10:26:54.000000000 -0500
+++ amarok-2.1.1/src/scripts/lyrics_lyricwiki/main.js	2009-09-02 12:17:40.783849630 -0500
@@ -27,6 +27,31 @@ Importer.loadQtBinding( "qt.core" );
 Importer.loadQtBinding( "qt.xml" );
 
 xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><lyric artist=\"{artist}\" title=\"{title}\">{lyrics}</lyric>";
+newxml = "";
+
+function onFinished2( response )
+{
+    try
+    {
+        if( response.length == 0 )
+            Amarok.Lyrics.showLyricsError( "Unable to contact server - no website returned" ); // TODO: this should be i18n able
+        else
+        {
+            doc2 = new QDomDocument();
+            doc2.setContent( response );
+            textboxtext = doc2.elementsByTagName( "textarea" ).at( 0 ).toElement().text();
+            lyr = /<lyrics>(.*)<\/lyrics>/.exec(textboxtext)[1];
+            //Amarok.debug( "matched: " + lyr );
+            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( lyr ) );
+            Amarok.Lyrics.showLyrics( newxml );
+        }
+    }
+    catch( err )
+    {
+        Amarok.Lyrics.showLyricsError( "Could not retrieve lyrics: " + err );
+        Amarok.debug( "error: " + err );
+    }
+}
 
 function onFinished( dat )
 {
@@ -38,13 +63,14 @@ function onFinished( dat )
         {
             doc = new QDomDocument();
             doc.setContent( dat );
-            parsedContent = doc.elementsByTagName( "lyrics" ).at( 0 ).toElement().text();
-            parsedContent = parsedContent.replace( "<lyrics>", "" ).replace( "</lyrics>", "" ); // some lyrics have 2 lyrics in them...wtf?
             newxml = xml.replace( "{artist}", Amarok.Lyrics.escape( doc.elementsByTagName( "artist" ).at( 0 ).toElement().text() ) );
             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
-            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( parsedContent ) );
-            //Amarok.debug( "showing lyrics:" + newxml );
-            Amarok.Lyrics.showLyrics( newxml );
+            Amarok.debug( "returned URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            var url = decodeURI(doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            url = url.replace( /lyricwiki\.org\//, "lyrics.wikia.com/index.php?action=edit&title=" );
+            var url2 = new QUrl(url);
+            Amarok.debug( "request-2 URL: " + url2.toString() );
+            new Downloader( url2, onFinished2 );
         }
     }
     catch( err )


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- amarok.spec	9 Aug 2009 00:16:03 -0000	1.150
+++ amarok.spec	2 Sep 2009 17:19:09 -0000	1.151
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -14,7 +14,7 @@ Patch50: amarok-2.0.90-qtscript_not_requ
 
 ## upstream patches
 # https://bugs.kde.org/show_bug.cgi?id=202366
-Patch100: amarok-parse-lyricwiki-website.patch
+Patch100: amarok-2.1.1-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -149,6 +149,9 @@ fi
 
 
 %changelog
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-5
+- lyricwiki patch respin (kdebug#202366)
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
 - lyricwiki patch (kdebug#202366)
 


--- amarok-parse-lyricwiki-website.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep  2 17:21:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Sep 2009 17:21:05 +0000 (UTC)
Subject: rpms/amarok/devel amarok-2.1.80-lyricwiki.patch, NONE,
	1.1 .cvsignore, 1.48, 1.49 amarok.spec, 1.160, 1.161 sources, 1.49,
	1.50 amarok-parse-lyricwiki-website.patch, 1.1, NONE
Message-ID: <20090902172105.DE24711C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16455

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.1.80-lyricwiki.patch 
Removed Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
- another lyricwiki fix

* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
- amarok-2.1.80 (2.2beta1)
- -libs subpkg


amarok-2.1.80-lyricwiki.patch:
 main.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amarok-2.1.80-lyricwiki.patch ---
diff -up amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js.lyricwiki amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js
--- amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js.lyricwiki	2009-09-01 12:19:32.000000000 -0500
+++ amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js	2009-09-02 12:13:15.658840532 -0500
@@ -68,7 +68,7 @@ function onFinished( dat )
             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
             Amarok.debug( "returned real lyricwiki URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
             var url = doc.elementsByTagName( "url" ).at( 0 ).toElement().text();
-            url = url.replace( /lyricwiki\.org\//, "lyricwiki.org/index.php?action=edit&title=" );
+            url = url.replace( /lyricwiki\.org\//, "lyrics.wikia.com/index.php?action=edit&title=" );
             var url2 = QUrl.fromEncoded( new QByteArray( url ), 1 );
             Amarok.debug( "request-2 URL: " + url2.toString() );
             new Downloader( url2, onFinished2 );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	13 Jun 2009 18:43:25 -0000	1.48
+++ .cvsignore	2 Sep 2009 17:21:05 -0000	1.49
@@ -1 +1 @@
-amarok-2.1.1.tar.bz2
+amarok-2.1.80.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- amarok.spec	21 Aug 2009 12:23:00 -0000	1.160
+++ amarok.spec	2 Sep 2009 17:21:05 -0000	1.161
@@ -1,26 +1,26 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.1
-Release: 5%{?dist}
+Version: 2.1.80
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=202366
-Patch100: amarok-parse-lyricwiki-website.patch
+Patch100: amarok-2.1.80-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
+BuildRequires: liblastfm-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
@@ -36,12 +36,15 @@ BuildRequires: taglib-devel
 BuildRequires: taglib-extras-devel
 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
-%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# when we grew a -libs subpkg, multilib love
+Obsoletes: amarok < 2.1.80
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -54,6 +57,14 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%description libs
+%{summary}.
+
 %package utils
 Summary: Amarok standalone utilities
 Group: Applications/Multimedia
@@ -67,6 +78,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q
 
 %patch50 -p1 -b .qtscript_not_required
+
 %patch100 -p1 -b .lyricwiki
 
 
@@ -86,10 +98,13 @@ make install DESTDIR=%{buildroot} -C %{_
 
 %find_lang amarok
 %find_lang amarokcollectionscanner_qt
+%find_lang amarokpkg
+%find_lang amarok_scriptengine_qscript
+cat amarokpkg.lang >> amarok.lang
+cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
-rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
+rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud,ocsclient}.so
 
 
 %check
@@ -101,7 +116,6 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %posttrans
@@ -109,26 +123,32 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f amarok.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_kde4_bindir}/amarok
+%{_kde4_bindir}/amarokpkg
 %{_kde4_bindir}/amarok_afttagger
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
 %{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
+%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
 %{_kde4_configdir}/amarok_homerc
+%{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -137,18 +157,28 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/libamarok*.so.*
-%{_kde4_libdir}/libmediadevicelib.so.*
-%{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libamaroklib.so.1*
+%{_kde4_libdir}/libamarokocsclient.so.4*
+%{_kde4_libdir}/libamarokpud.so.1*
+
 %files utils -f amarokcollectionscanner_qt.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/amarokcollectionscanner
 
 
 %changelog
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
+- another lyricwiki fix
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
+- amarok-2.1.80 (2.2beta1)
+- -libs subpkg
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	13 Jun 2009 18:43:25 -0000	1.49
+++ sources	2 Sep 2009 17:21:05 -0000	1.50
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2


--- amarok-parse-lyricwiki-website.patch DELETED ---



From wtogami at fedoraproject.org  Wed Sep  2 17:26:13 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 17:26:13 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/devel .cvsignore, 1.3, 1.4 perl-Mail-DKIM.spec, 
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090902172613.E0DC511C0094@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20016

Modified Files:
	.cvsignore perl-Mail-DKIM.spec sources 
Log Message:
0.36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jun 2009 19:36:29 -0000	1.3
+++ .cvsignore	2 Sep 2009 17:26:13 -0000	1.4
@@ -1 +1 @@
-Mail-DKIM-0.33.tar.gz
+Mail-DKIM-0.36.tar.gz


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/perl-Mail-DKIM.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Mail-DKIM.spec	26 Jul 2009 09:07:06 -0000	1.6
+++ perl-Mail-DKIM.spec	2 Sep 2009 17:26:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Mail-DKIM
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.36
+Release:        1%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-1
+- 0.36
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jun 2009 19:36:29 -0000	1.3
+++ sources	2 Sep 2009 17:26:13 -0000	1.4
@@ -1 +1 @@
-09216a6544439c212efdd70e4bd106ca  Mail-DKIM-0.33.tar.gz
+b6681a7b3cc21c0976205d4ad616455d  Mail-DKIM-0.36.tar.gz



From wtogami at fedoraproject.org  Wed Sep  2 17:44:45 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 17:44:45 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/devel .cvsignore, 1.4, 1.5 perl-Mail-DKIM.spec, 
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090902174445.B31EB11C0094@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28708

Modified Files:
	.cvsignore perl-Mail-DKIM.spec sources 
Log Message:
0.36_5 ... why does upstream use strange version numbers?



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Sep 2009 17:26:13 -0000	1.4
+++ .cvsignore	2 Sep 2009 17:44:45 -0000	1.5
@@ -1 +1 @@
-Mail-DKIM-0.36.tar.gz
+Mail-DKIM-0.36_5.tar.gz


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/perl-Mail-DKIM.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Mail-DKIM.spec	2 Sep 2009 17:26:13 -0000	1.7
+++ perl-Mail-DKIM.spec	2 Sep 2009 17:44:45 -0000	1.8
@@ -1,12 +1,14 @@
 Name:           perl-Mail-DKIM
 Version:        0.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://dkimproxy.sourceforge.net/
-Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
+# FIXME: Undo this when upstream returns to normal version numbers
+#Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}_5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -59,8 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-1
-- 0.36
+* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-2
+- 0.36_5 ... why does upstream use strange version numbers?
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Sep 2009 17:26:13 -0000	1.4
+++ sources	2 Sep 2009 17:44:45 -0000	1.5
@@ -1 +1 @@
-b6681a7b3cc21c0976205d4ad616455d  Mail-DKIM-0.36.tar.gz
+48fb65c9cf3b681bbc94ba9efcb1c6f2  Mail-DKIM-0.36_5.tar.gz



From ausil at fedoraproject.org  Wed Sep  2 17:49:13 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 17:49:13 +0000 (UTC)
Subject: rpms/mock/EL-5 mock-epel-config.patch,NONE,1.1 mock.spec,1.37,1.38
Message-ID: <20090902174913.705EA11C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30130

Modified Files:
	mock.spec 
Added Files:
	mock-epel-config.patch 
Log Message:
update epel configs


mock-epel-config.patch:
 epel-4-i386.cfg   |    8 ++++++--
 epel-4-ppc.cfg    |    5 ++++-
 epel-4-x86_64.cfg |    6 ++++--
 epel-5-i386.cfg   |    5 ++++-
 epel-5-ppc.cfg    |    5 ++++-
 epel-5-x86_64.cfg |    6 ++++--
 6 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE mock-epel-config.patch ---
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-i386.cfg mock-0.9.14/etc/mock/epel-4-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-i386.cfg	2009-09-02 12:43:53.000000000 -0500
@@ -31,16 +31,20 @@
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/
 
-[extras]
+[stable]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/i386/
+cost=2000
+enabled=0
+
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg mock-0.9.14/etc/mock/epel-4-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-ppc.cfg	2009-09-02 12:44:01.000000000 -0500
@@ -38,9 +38,12 @@
 [testing]
 name=epel-testing
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=ppc
+enabled=0
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg mock-0.9.14/etc/mock/epel-4-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-x86_64.cfg	2009-09-02 12:44:47.000000000 -0500
@@ -41,11 +41,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-i386.cfg mock-0.9.14/etc/mock/epel-5-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-i386.cfg	2009-09-02 12:45:21.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/i386/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg mock-0.9.14/etc/mock/epel-5-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-ppc.cfg	2009-09-02 12:45:41.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=ppc
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg mock-0.9.14/etc/mock/epel-5-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-x86_64.cfg	2009-09-02 12:46:11.000000000 -0500
@@ -37,11 +37,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- mock.spec	3 Feb 2009 23:34:55 -0000	1.37
+++ mock.spec	2 Sep 2009 17:49:13 -0000	1.38
@@ -21,12 +21,14 @@ BuildArch: noarch
 Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
 Requires(pre): shadow-utils
 BuildRequires: python-devel
+Patch0: mock-epel-config.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
+%patch0 -p1
 %if "%{?dist}" == ".fc8"
 pushd etc/mock
 sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,6 +99,9 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2
+- apply patch to clean up mock configs. plague is no more
+
 * Mon Feb 02 2009 Clark Williams <williams at redhat.com> - 0.9.14-1
 - logging cleanup (mikem)
 - add new exception for resultdir not available (mebrown)



From ausil at fedoraproject.org  Wed Sep  2 17:51:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 17:51:06 +0000 (UTC)
Subject: rpms/mock/EL-5 mock.spec,1.38,1.39
Message-ID: <20090902175106.C09E011C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30937

Modified Files:
	mock.spec 
Log Message:
whee helps when you actually bump



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- mock.spec	2 Sep 2009 17:49:13 -0000	1.38
+++ mock.spec	2 Sep 2009 17:51:06 -0000	1.39
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz



From wtogami at fedoraproject.org  Wed Sep  2 17:53:57 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Sep 2009 17:53:57 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/devel perl-Mail-DKIM.spec,1.8,1.9
Message-ID: <20090902175357.3750F11C0094@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32443

Modified Files:
	perl-Mail-DKIM.spec 
Log Message:
make it build



Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/perl-Mail-DKIM.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Mail-DKIM.spec	2 Sep 2009 17:44:45 -0000	1.8
+++ perl-Mail-DKIM.spec	2 Sep 2009 17:53:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Mail-DKIM
 Version:        0.36
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
@@ -26,7 +26,8 @@ It is required if you wish to enable DKI
 Mail::SpamAssassin::Plugin::DKIM plugin.
 
 %prep
-%setup -q -n Mail-DKIM-%{version}
+# FIXME: Here too
+%setup -q -n Mail-DKIM-%{version}_5
 # Make the example scripts non-executable
 %{__chmod} -x scripts/*.pl
 
@@ -61,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-2
+* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-3
 - 0.36_5 ... why does upstream use strange version numbers?
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-3



From ausil at fedoraproject.org  Wed Sep  2 17:55:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 17:55:39 +0000 (UTC)
Subject: rpms/mock/F-10 mock-epel-config.patch,NONE,1.1 mock.spec,1.71,1.72
Message-ID: <20090902175539.D8CE511C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv517

Modified Files:
	mock.spec 
Added Files:
	mock-epel-config.patch 
Log Message:
update epel configs


mock-epel-config.patch:
 epel-4-i386.cfg   |    8 ++++++--
 epel-4-ppc.cfg    |    5 ++++-
 epel-4-x86_64.cfg |    6 ++++--
 epel-5-i386.cfg   |    5 ++++-
 epel-5-ppc.cfg    |    5 ++++-
 epel-5-x86_64.cfg |    6 ++++--
 6 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE mock-epel-config.patch ---
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-i386.cfg mock-0.9.14/etc/mock/epel-4-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-i386.cfg	2009-09-02 12:43:53.000000000 -0500
@@ -31,16 +31,20 @@
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/
 
-[extras]
+[stable]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/i386/
+cost=2000
+enabled=0
+
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg mock-0.9.14/etc/mock/epel-4-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-ppc.cfg	2009-09-02 12:44:01.000000000 -0500
@@ -38,9 +38,12 @@
 [testing]
 name=epel-testing
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=ppc
+enabled=0
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg mock-0.9.14/etc/mock/epel-4-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-x86_64.cfg	2009-09-02 12:44:47.000000000 -0500
@@ -41,11 +41,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-i386.cfg mock-0.9.14/etc/mock/epel-5-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-i386.cfg	2009-09-02 12:45:21.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/i386/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg mock-0.9.14/etc/mock/epel-5-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-ppc.cfg	2009-09-02 12:45:41.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=ppc
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg mock-0.9.14/etc/mock/epel-5-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-x86_64.cfg	2009-09-02 12:46:11.000000000 -0500
@@ -37,11 +37,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/F-10/mock.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- mock.spec	8 Jul 2009 23:09:47 -0000	1.71
+++ mock.spec	2 Sep 2009 17:55:39 -0000	1.72
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 17
+%define sub 14
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -21,12 +21,14 @@ BuildArch: noarch
 Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
 Requires(pre): shadow-utils
 BuildRequires: python-devel
+Patch0: mock-epel-config.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
+%patch0 -p1
 %if "%{?dist}" == ".fc8"
 pushd etc/mock
 sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,21 +99,8 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
-* Wed Jul  8 2009 Clark Williams <williams at redhat.com>- 0.9.17-1
-- Patch from Jakub Jelinek <jakub at redhat.com> for mounting
-  /dev/pts correctly in the chroot (BZ# 510183)
-- raise exception when --shell specified for uninitialized chroot
-  (BZ# 506288)
-- add directory and infrastructure to allow dbus to run inside
-  chroot (BZ# 460574)
-- patch from Levente Farkas <lfarkas at lfarkas.org> to fix exclude
-  in EPEL 5 x86_64 config
-
-* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.16-1
-- Make F11 and rawhide build i586 on i386 targets.
-
-* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.15-1
-- Add configs for F11 (jkeating)
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2
+- apply patch to clean up mock configs. plague is no more
 
 * Mon Feb 02 2009 Clark Williams <williams at redhat.com> - 0.9.14-1
 - logging cleanup (mikem)



From ausil at fedoraproject.org  Wed Sep  2 17:57:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 17:57:30 +0000 (UTC)
Subject: rpms/mock/F-11 mock-epel-config.patch,NONE,1.1 mock.spec,1.75,1.76
Message-ID: <20090902175730.4435911C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2348

Modified Files:
	mock.spec 
Added Files:
	mock-epel-config.patch 
Log Message:
fix up the epel configs


mock-epel-config.patch:
 epel-4-i386.cfg   |    8 ++++++--
 epel-4-ppc.cfg    |    5 ++++-
 epel-4-x86_64.cfg |    6 ++++--
 epel-5-i386.cfg   |    5 ++++-
 epel-5-ppc.cfg    |    5 ++++-
 epel-5-x86_64.cfg |    6 ++++--
 6 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE mock-epel-config.patch ---
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-i386.cfg mock-0.9.14/etc/mock/epel-4-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-i386.cfg	2009-09-02 12:43:53.000000000 -0500
@@ -31,16 +31,20 @@
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/
 
-[extras]
+[stable]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/i386/
+cost=2000
+enabled=0
+
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg mock-0.9.14/etc/mock/epel-4-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-ppc.cfg	2009-09-02 12:44:01.000000000 -0500
@@ -38,9 +38,12 @@
 [testing]
 name=epel-testing
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=ppc
+enabled=0
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg mock-0.9.14/etc/mock/epel-4-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-x86_64.cfg	2009-09-02 12:44:47.000000000 -0500
@@ -41,11 +41,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-i386.cfg mock-0.9.14/etc/mock/epel-5-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-i386.cfg	2009-09-02 12:45:21.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/i386/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg mock-0.9.14/etc/mock/epel-5-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-ppc.cfg	2009-09-02 12:45:41.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=ppc
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg mock-0.9.14/etc/mock/epel-5-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-x86_64.cfg	2009-09-02 12:46:11.000000000 -0500
@@ -37,11 +37,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/F-11/mock.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- mock.spec	8 Jul 2009 23:08:17 -0000	1.75
+++ mock.spec	2 Sep 2009 17:57:30 -0000	1.76
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 17
+%define sub 14
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -21,12 +21,14 @@ BuildArch: noarch
 Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
 Requires(pre): shadow-utils
 BuildRequires: python-devel
+Patch0: mock-epel-config.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
+%patch0 -p1
 %if "%{?dist}" == ".fc8"
 pushd etc/mock
 sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,21 +99,8 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
-* Wed Jul  8 2009 Clark Williams <williams at redhat.com>- 0.9.17-1
-- Patch from Jakub Jelinek <jakub at redhat.com> for mounting
-  /dev/pts correctly in the chroot (BZ# 510183)
-- raise exception when --shell specified for uninitialized chroot
-  (BZ# 506288)
-- add directory and infrastructure to allow dbus to run inside
-  chroot (BZ# 460574)
-- patch from Levente Farkas <lfarkas at lfarkas.org> to fix exclude
-  in EPEL 5 x86_64 config
-
-* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.16-1
-- Make F11 and rawhide build i586 on i386 targets.
-
-* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.15-1
-- Add configs for F11 (jkeating)
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2
+- apply patch to clean up mock configs. plague is no more
 
 * Mon Feb 02 2009 Clark Williams <williams at redhat.com> - 0.9.14-1
 - logging cleanup (mikem)



From mathstuf at fedoraproject.org  Wed Sep  2 17:57:44 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed,  2 Sep 2009 17:57:44 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.0-bookmarks.patch, NONE,
	1.1 kdelibs.spec, 1.512, 1.513
Message-ID: <20090902175744.8855011C0094@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2534

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.0-bookmarks.patch 
Log Message:
Add patch for kde#160679

kdelibs-4.3.0-bookmarks.patch:
 kbookmark.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.0-bookmarks.patch ---
diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc	2008-07-08 05:54:18.000000000 -0400
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc	2009-08-28 15:09:07.000000000 -0400
@@ -681,11 +681,11 @@
         doc.setContent( payload );
         QDomElement elem = doc.documentElement();
         QDomNodeList children = elem.childNodes();
         for ( int childno = 0; childno < children.count(); childno++)
         {
-            bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
+            bookmarks.append( KBookmark( children.item(childno).toElement() ));
         }
         return bookmarks;
     }
     const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
     if ( !urls.isEmpty() )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- kdelibs.spec	1 Sep 2009 21:31:35 -0000	1.512
+++ kdelibs.spec	2 Sep 2009 17:57:44 -0000	1.513
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -81,6 +81,8 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
 Patch21: kdelibs-4.3.1-ossl-1.x.patch
+# patch to fix keditbookmarks crash (kde#160679)
+Patch22: kdelibs-4.3.0-bookmarks.patch
 
 # upstream
 # 4.3 branch
@@ -211,6 +213,7 @@ format for easy browsing.
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .ossl-1.x
+%patch22 -p1 -b .bookmarks
 
 # upstream patches
 # 4.3
@@ -399,6 +402,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
+- Patch for kde#160679
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - openssl-1.0 build fixes



From sharkcz at fedoraproject.org  Wed Sep  2 17:59:17 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  2 Sep 2009 17:59:17 +0000 (UTC)
Subject: rpms/httping/devel httping.spec,1.4,1.5
Message-ID: <20090902175917.3350C11C0094@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/httping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3181

Modified Files:
	httping.spec 
Log Message:
* Wed Sep  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.1-2
- Fix -debuginfo (let rpmbuild strip the binary) - #520852



Index: httping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/httping.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- httping.spec	31 Aug 2009 09:35:39 -0000	1.4
+++ httping.spec	2 Sep 2009 17:59:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           httping
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ping alike tool for http requests
 
 Group:          Applications/Internet
@@ -31,7 +31,7 @@ make %{?_smp_mflags} DEBUG="" OFLAGS="%{
 
 %install
 rm -rf %{buildroot}
-make install INSTALL="install -Dp" DESTDIR=%{buildroot}
+make install INSTALL="install -Dp" STRIP=/bin/true DESTDIR=%{buildroot}
 
 rm -rf %{buildroot}%{_prefix}/doc
 
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.1-2
+- Fix -debuginfo (let rpmbuild strip the binary) - #520852
+
 * Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.3.1-1
 - Updated to new upstream version 1.3.1
 - Updated the strndup patch



From ausil at fedoraproject.org  Wed Sep  2 17:59:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 17:59:32 +0000 (UTC)
Subject: rpms/mock/F-11 mock.spec,1.76,1.77
Message-ID: <20090902175932.6EED811C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3008

Modified Files:
	mock.spec 
Log Message:
.2 was tagged on teh devel branch with the fc11 disttag



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/F-11/mock.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mock.spec	2 Sep 2009 17:57:30 -0000	1.76
+++ mock.spec	2 Sep 2009 17:59:32 -0000	1.77
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -99,7 +99,7 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
-* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2.1
 - apply patch to clean up mock configs. plague is no more
 
 * Mon Feb 02 2009 Clark Williams <williams at redhat.com> - 0.9.14-1



From mathstuf at fedoraproject.org  Wed Sep  2 18:01:36 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed,  2 Sep 2009 18:01:36 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.0-bookmarks.patch, NONE,
	1.1 kdelibs.spec, 1.493, 1.494
Message-ID: <20090902180136.1916B11C0094@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.0-bookmarks.patch 
Log Message:
Add patch for kde#160679

kdelibs-4.3.0-bookmarks.patch:
 kbookmark.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.0-bookmarks.patch ---
diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc	2008-07-08 05:54:18.000000000 -0400
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc	2009-08-28 15:09:07.000000000 -0400
@@ -681,11 +681,11 @@
         doc.setContent( payload );
         QDomElement elem = doc.documentElement();
         QDomNodeList children = elem.childNodes();
         for ( int childno = 0; childno < children.count(); childno++)
         {
-            bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
+            bookmarks.append( KBookmark( children.item(childno).toElement() ));
         }
         return bookmarks;
     }
     const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
     if ( !urls.isEmpty() )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- kdelibs.spec	1 Sep 2009 17:41:48 -0000	1.493
+++ kdelibs.spec	2 Sep 2009 18:01:35 -0000	1.494
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,6 +80,8 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
+# patch to fix keditbookmarks crash (kde#160679)
+Patch22: kdelibs-4.3.0-bookmarks.patch
 
 # upstream
 # 4.3 branch
@@ -209,6 +211,7 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
+%patch22 -p1 -b .bookmarks
 
 # upstream patches
 # 4.3
@@ -397,6 +400,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
+- Patch for kde#160679
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From ausil at fedoraproject.org  Wed Sep  2 18:03:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 18:03:11 +0000 (UTC)
Subject: rpms/mock/devel mock-epel-config.patch, NONE, 1.1 mock.spec, 1.76,
	1.77
Message-ID: <20090902180311.A587611C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4736

Modified Files:
	mock.spec 
Added Files:
	mock-epel-config.patch 
Log Message:
fix epel configs


mock-epel-config.patch:
 epel-4-i386.cfg   |    8 ++++++--
 epel-4-ppc.cfg    |    5 ++++-
 epel-4-x86_64.cfg |    6 ++++--
 epel-5-i386.cfg   |    5 ++++-
 epel-5-ppc.cfg    |    5 ++++-
 epel-5-x86_64.cfg |    6 ++++--
 6 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE mock-epel-config.patch ---
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-i386.cfg mock-0.9.14/etc/mock/epel-4-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-i386.cfg	2009-09-02 12:43:53.000000000 -0500
@@ -31,16 +31,20 @@
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/
 
-[extras]
+[stable]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/i386/
+cost=2000
+enabled=0
+
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg mock-0.9.14/etc/mock/epel-4-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-ppc.cfg	2009-09-02 12:44:01.000000000 -0500
@@ -38,9 +38,12 @@
 [testing]
 name=epel-testing
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=ppc
+enabled=0
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg mock-0.9.14/etc/mock/epel-4-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-x86_64.cfg	2009-09-02 12:44:47.000000000 -0500
@@ -41,11 +41,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-i386.cfg mock-0.9.14/etc/mock/epel-5-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-i386.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-i386.cfg	2009-09-02 12:45:21.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=i386
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/i386/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg mock-0.9.14/etc/mock/epel-5-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-ppc.cfg	2009-09-02 12:45:41.000000000 -0500
@@ -34,10 +34,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=ppc
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/ppc/
+cost=2000
+enabled=0
 
 """
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg mock-0.9.14/etc/mock/epel-5-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg	2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-x86_64.cfg	2009-09-02 12:46:11.000000000 -0500
@@ -37,11 +37,13 @@
 
 [testing]
 name=epel-testing
+enabled=0
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=x86_64
 
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/x86_64/
+cost=2000
+enabled=0
 
 """


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mock.spec	25 Jul 2009 14:41:16 -0000	1.76
+++ mock.spec	2 Sep 2009 18:03:11 -0000	1.77
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -21,12 +21,14 @@ BuildArch: noarch
 Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
 Requires(pre): shadow-utils
 BuildRequires: python-devel
+Patch0: mock-epel-config.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
+%patch0 -p1
 %if "%{?dist}" == ".fc8"
 pushd etc/mock
 sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,6 +99,9 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.17-3
+Add patch cleaning up mock configs for epel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Wed Sep  2 18:05:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 18:05:05 +0000 (UTC)
Subject: rpms/mock/F-11 mock.spec,1.77,1.78
Message-ID: <20090902180505.9059611C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5807

Modified Files:
	mock.spec 
Log Message:
do it with the right spec



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/F-11/mock.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- mock.spec	2 Sep 2009 17:59:32 -0000	1.77
+++ mock.spec	2 Sep 2009 18:05:05 -0000	1.78
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 14
+%define sub 17
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -99,8 +99,27 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
-* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2.1
-- apply patch to clean up mock configs. plague is no more
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.17-3
+Add patch cleaning up mock configs for epel
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Clark Williams <williams at redhat.com>- 0.9.17-1
+- Patch from Jakub Jelinek <jakub at redhat.com> for mounting
+  /dev/pts correctly in the chroot (BZ# 510183)
+- raise exception when --shell specified for uninitialized chroot
+  (BZ# 506288)
+- add directory and infrastructure to allow dbus to run inside
+  chroot (BZ# 460574)
+- patch from Levente Farkas <lfarkas at lfarkas.org> to fix exclude
+  in EPEL 5 x86_64 config
+
+* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.16-1
+- Make F11 and rawhide build i586 on i386 targets.
+
+* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.15-1
+- Add configs for F11 (jkeating)
 
 * Mon Feb 02 2009 Clark Williams <williams at redhat.com> - 0.9.14-1
 - logging cleanup (mikem)



From rhughes at fedoraproject.org  Wed Sep  2 18:10:31 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed,  2 Sep 2009 18:10:31 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.53, 1.54 PackageKit.spec, 1.113,
	1.114 sources, 1.54, 1.55 PackageKit-0.5.2-pkaction.patch, 1.1, NONE
Message-ID: <20090902181031.A1F5D11C0349@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8931

Modified Files:
	.cvsignore PackageKit.spec sources 
Removed Files:
	PackageKit-0.5.2-pkaction.patch 
Log Message:
* Wed Sep 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090902git
- Update to a newer git snapshot from the 0.5.x series.
- Should fix some issues with KPackageKit.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	24 Aug 2009 13:49:27 -0000	1.53
+++ .cvsignore	2 Sep 2009 18:10:31 -0000	1.54
@@ -1 +1 @@
-PackageKit-0.5.2-20090824.tar.gz
+PackageKit-0.5.2-20090902.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- PackageKit.spec	29 Aug 2009 23:24:29 -0000	1.113
+++ PackageKit.spec	2 Sep 2009 18:10:31 -0000	1.114
@@ -3,14 +3,14 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090824
+%define alphatag			20090902
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.2
-Release:   0.2.%{?alphatag}git%{?dist}
+Release:   0.1.%{?alphatag}git%{?dist}
 #Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -25,10 +25,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
 
-# http://bugs.freedesktop.org/show_bug.cgi?id=23592
-Patch2:    PackageKit-0.5.2-pkaction.patch
-BuildRequires: autoconf
-
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -244,10 +240,6 @@ user to restart the computer or remove a
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 
-# http://bugs.freedesktop.org/show_bug.cgi?id=23592
-%patch2 -p1 -b .pkaction
-autoreconf
-
 %build
 %configure --disable-static --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
 
@@ -444,6 +436,10 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed Sep 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090902git
+- Update to a newer git snapshot from the 0.5.x series.
+- Should fix some issues with KPackageKit.
+
 * Sat Aug 29 2009 Christopher Aillon <caillon at redhat.com> - 0.5.2-0.2.20090824git
 - Fix build against polkit, rebuild against newer libnm_glib
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	24 Aug 2009 13:49:27 -0000	1.54
+++ sources	2 Sep 2009 18:10:31 -0000	1.55
@@ -1 +1 @@
-65d1187374f4fbf9022c5caa4ad53aa7  PackageKit-0.5.2-20090824.tar.gz
+a867faa27eb766138038fbecb61edc0f  PackageKit-0.5.2-20090902.tar.gz


--- PackageKit-0.5.2-pkaction.patch DELETED ---



From ausil at fedoraproject.org  Wed Sep  2 18:11:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  2 Sep 2009 18:11:22 +0000 (UTC)
Subject: rpms/mock/F-10 mock.spec,1.72,1.73
Message-ID: <20090902181122.5D31811C0094@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9367

Modified Files:
	mock.spec 
Log Message:
use the right spec



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/F-10/mock.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- mock.spec	2 Sep 2009 17:55:39 -0000	1.72
+++ mock.spec	2 Sep 2009 18:11:22 -0000	1.73
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 14
+%define sub 17
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -99,8 +99,27 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
-* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.14-2
-- apply patch to clean up mock configs. plague is no more
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.17-3
+Add patch cleaning up mock configs for epel
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Clark Williams <williams at redhat.com>- 0.9.17-1
+- Patch from Jakub Jelinek <jakub at redhat.com> for mounting
+  /dev/pts correctly in the chroot (BZ# 510183)
+- raise exception when --shell specified for uninitialized chroot
+  (BZ# 506288)
+- add directory and infrastructure to allow dbus to run inside
+  chroot (BZ# 460574)
+- patch from Levente Farkas <lfarkas at lfarkas.org> to fix exclude
+  in EPEL 5 x86_64 config
+
+* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.16-1
+- Make F11 and rawhide build i586 on i386 targets.
+
+* Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.9.15-1
+- Add configs for F11 (jkeating)
 
 * Mon Feb 02 2009 Clark Williams <williams at redhat.com> - 0.9.14-1
 - logging cleanup (mikem)



From jcollie at fedoraproject.org  Wed Sep  2 18:21:43 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  2 Sep 2009 18:21:43 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore, 1.18, 1.19 gnonlin.spec, 1.30,
	1.31 sources, 1.18, 1.19
Message-ID: <20090902182143.75B0911C0094@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13453

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.2
- Doh!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	2 Sep 2009 16:45:24 -0000	1.18
+++ .cvsignore	2 Sep 2009 18:21:43 -0000	1.19
@@ -1 +1 @@
-gnonlin.spec
+gnonlin-0.10.12.3.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gnonlin.spec	2 Sep 2009 16:45:24 -0000	1.30
+++ gnonlin.spec	2 Sep 2009 18:21:43 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           gnonlin
 Version:        0.10.12.3
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.2
+- Doh!
+
 * Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.1
 - Update to latest prelrelease
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	2 Sep 2009 16:45:24 -0000	1.18
+++ sources	2 Sep 2009 18:21:43 -0000	1.19
@@ -1 +1 @@
-bc67c35c111579744ee4465b3d8e8e50  gnonlin.spec
+16bc0ef8f1e497c3cbd4d0ea6a11cbef  gnonlin-0.10.12.3.tar.bz2



From steve at fedoraproject.org  Wed Sep  2 18:30:44 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Wed,  2 Sep 2009 18:30:44 +0000 (UTC)
Subject: rpms/perl-BerkeleyDB/devel .cvsignore, 1.12,
	1.13 perl-BerkeleyDB.spec, 1.24, 1.25 sources, 1.12, 1.13
Message-ID: <20090902183044.941B111C00E6@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-BerkeleyDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16442

Modified Files:
	.cvsignore perl-BerkeleyDB.spec sources 
Log Message:
Update to 0.39.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Jun 2009 16:32:54 -0000	1.12
+++ .cvsignore	2 Sep 2009 18:30:44 -0000	1.13
@@ -1 +1 @@
-BerkeleyDB-0.38.tar.gz
+BerkeleyDB-0.39.tar.gz


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-BerkeleyDB.spec	26 Jul 2009 03:50:37 -0000	1.24
+++ perl-BerkeleyDB.spec	2 Sep 2009 18:30:44 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-BerkeleyDB
-Version:        0.38
-Release:        2%{?dist}
+Version:        0.39
+Release:        1%{?dist}
 Summary:        Perl extension for Berkeley DB version 2, 3 or 4
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Sat Aug 29 2009 Steven Pritchard <steve at kspei.com> 0.39-1
+- Update to 0.39.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.38-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Jun 2009 16:32:54 -0000	1.12
+++ sources	2 Sep 2009 18:30:44 -0000	1.13
@@ -1 +1 @@
-33a0c1a9d566a3f5fc71601a165d8335  BerkeleyDB-0.38.tar.gz
+da4cff937216a147162a6df76cae8096  BerkeleyDB-0.39.tar.gz



From svahl at fedoraproject.org  Wed Sep  2 18:49:20 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed,  2 Sep 2009 18:49:20 +0000 (UTC)
Subject: rpms/konq-plugins/devel .cvsignore, 1.11, 1.12 konq-plugins.spec,
	1.29, 1.30 sources, 1.12, 1.13
Message-ID: <20090902184920.DB4B111C0094@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25820

Modified Files:
	.cvsignore konq-plugins.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1
- use scriplet for HTML docdirs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Aug 2009 16:12:05 -0000	1.11
+++ .cvsignore	2 Sep 2009 18:49:20 -0000	1.12
@@ -1 +1 @@
-konq-plugins-4.3.0.tar.bz2
+konq-plugins-4.3.1.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- konq-plugins.spec	11 Aug 2009 16:12:05 -0000	1.29
+++ konq-plugins.spec	2 Sep 2009 18:49:20 -0000	1.30
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
@@ -73,6 +73,16 @@ do
   cat $locale.lang >> %{name}.lang
 done
 
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
+  fi
+done
+fi
+
 
 %clean
 rm -rf %{buildroot}
@@ -107,26 +117,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
+%{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_docdir}/HTML/en/konq-plugins/
-%lang(ca) %{_kde4_docdir}/HTML/ca/konq-plugins/
-%lang(de) %{_kde4_docdir}/HTML/de/konq-plugins/
-%lang(et) %{_kde4_docdir}/HTML/et/konq-plugins/
-%lang(fr) %{_kde4_docdir}/HTML/fr/konq-plugins/
-%lang(it) %{_kde4_docdir}/HTML/it/konq-plugins/
-%lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins/
-%lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins/
-%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/konq-plugins/
-%lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins/
-%lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins/
-
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+- use scriplet for HTML docdirs
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
 * KDE 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 16:12:05 -0000	1.12
+++ sources	2 Sep 2009 18:49:20 -0000	1.13
@@ -1 +1 @@
-527d61a6774aee7c053c48b5842db4fb  konq-plugins-4.3.0.tar.bz2
+57ba2ab5e7c6bdad8d6ac7644b151b32  konq-plugins-4.3.1.tar.bz2



From svahl at fedoraproject.org  Wed Sep  2 18:53:22 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed,  2 Sep 2009 18:53:22 +0000 (UTC)
Subject: rpms/kcoloredit/devel .cvsignore, 1.12, 1.13 kcoloredit.spec, 1.19, 
	1.20 sources, 1.13, 1.14
Message-ID: <20090902185322.245F311C0094@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kcoloredit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26962

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Aug 2009 15:09:00 -0000	1.12
+++ .cvsignore	2 Sep 2009 18:53:21 -0000	1.13
@@ -1,2 +1 @@
-kcoloredit-2.0.0-kde4.2.4.tar.bz2
-kcoloredit-2.0.0-kde4.3.0.tar.bz2
+kcoloredit-2.0.0-kde4.3.1.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/kcoloredit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kcoloredit.spec	11 Aug 2009 16:48:27 -0000	1.19
+++ kcoloredit.spec	2 Sep 2009 18:53:21 -0000	1.20
@@ -4,7 +4,7 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        A color palette Editor
 
@@ -83,6 +83,9 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Aug 2009 15:09:00 -0000	1.13
+++ sources	2 Sep 2009 18:53:21 -0000	1.14
@@ -1 +1 @@
-4d4c7809dd3275299ff31cdfb784ddab  kcoloredit-2.0.0-kde4.3.0.tar.bz2
+8307023ee8759c250962e034bf563b1a  kcoloredit-2.0.0-kde4.3.1.tar.bz2



From ajax at fedoraproject.org  Wed Sep  2 18:55:09 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Sep 2009 18:55:09 +0000 (UTC)
Subject: rpms/busybox/devel busybox.spec, 1.98,
	1.99 busybox-1.12.1-anaconda.patch, 1.2, NONE
Message-ID: <20090902185509.5D89611C0094@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27592

Modified Files:
	busybox.spec 
Removed Files:
	busybox-1.12.1-anaconda.patch 
Log Message:
* Wed Sep 02 2009 Chris Lumens <clumens at redhat.com> 1.14.1-4
- Remove busybox-anaconda (#514319).



Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- busybox.spec	24 Jul 2009 18:30:02 -0000	1.98
+++ busybox.spec	2 Sep 2009 18:55:09 -0000	1.99
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.14.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -10,7 +10,6 @@ Source1: busybox-petitboot.config
 Source2: http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2
 Source3: uClibc.config
 Patch0: busybox-1.12.1-static.patch
-Patch1: busybox-1.12.1-anaconda.patch
 Patch12: busybox-1.2.2-ls.patch
 Patch14: busybox-1.9.0-msh.patch
 Patch16: busybox-1.10.1-hwclock.patch
@@ -18,6 +17,7 @@ Patch20: busybox-1.12.1-selinux.patch
 # patch to avoid conflicts with getline() from stdio.h, already present in upstream VCS
 Patch22: uClibc-0.9.30.1-getline.patch
 Patch23: busybox-1.14.1-readlink.patch
+Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -28,10 +28,6 @@ BuildRequires: glibc-static
 
 %define debug_package %{nil}
 
-%package anaconda
-Group: System Environment/Shells
-Summary: Version of busybox configured for use with anaconda
-
 %package petitboot
 Group: System Environment/Shells
 Summary: Version of busybox configured for use with petitboot
@@ -42,13 +38,6 @@ of system commands, including a shell.  
 useful for recovering from certain types of system failures,
 particularly those involving broken shared libraries.
 
-%description anaconda
-Busybox is a single binary which includes versions of a large number
-of system commands, including a shell.  The version contained in this
-package is designed for use with the Red Hat installation program,
-anaconda. The busybox package provides a binary better suited to
-normal use.
-
 %description petitboot
 Busybox is a single binary which includes versions of a large number
 of system commands, including a shell.  The version contained in this
@@ -106,17 +95,6 @@ else \
     make V=1 CC="gcc $RPM_OPT_FLAGS"; \
 fi
 cp busybox busybox-static
-# create busybox optimized for anaconda 
-make clean
-#revert selinux patch
-patch -R -p1 <%{PATCH20}
-# revert the static patches
-patch -R -p1 <%{PATCH0}
-# applied anaconda patch
-patch -b --suffix .anaconda -p1 < %{PATCH1}
-make defconfig
-make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
-cp busybox busybox.anaconda
 
 # create busybox optimized for petitboot
 make clean
@@ -131,7 +109,6 @@ cp busybox busybox.petitboot
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 install -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox
-install -m 755 busybox.anaconda $RPM_BUILD_ROOT/sbin/busybox.anaconda
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
 
 %clean
@@ -142,17 +119,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE docs/busybox.net/*.html docs/busybox.net/images/*
 /sbin/busybox
 
-%files anaconda
-%defattr(-,root,root,-)
-%doc LICENSE docs/busybox.net/*.html docs/busybox.net/images/*
-/sbin/busybox.anaconda
-
 %files petitboot
 %defattr(-,root,root,-)
 %doc LICENSE
 /sbin/busybox.petitboot
 
 %changelog
+* Wed Sep 02 2009 Chris Lumens <clumens at redhat.com> 1.14.1-4
+- Remove busybox-anaconda (#514319).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.14.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- busybox-1.12.1-anaconda.patch DELETED ---



From svahl at fedoraproject.org  Wed Sep  2 18:55:32 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed,  2 Sep 2009 18:55:32 +0000 (UTC)
Subject: rpms/kiconedit/devel .cvsignore, 1.12, 1.13 kiconedit.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <20090902185532.218D511C0094@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kiconedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27822

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Aug 2009 15:23:05 -0000	1.12
+++ .cvsignore	2 Sep 2009 18:55:31 -0000	1.13
@@ -1,2 +1 @@
-kiconedit-4.2.4.tar.bz2
-kiconedit-4.3.0.tar.bz2
+kiconedit-4.3.1.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/kiconedit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- kiconedit.spec	11 Aug 2009 16:58:52 -0000	1.22
+++ kiconedit.spec	2 Sep 2009 18:55:31 -0000	1.23
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        An icon editor
 
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Aug 2009 15:23:05 -0000	1.13
+++ sources	2 Sep 2009 18:55:31 -0000	1.14
@@ -1 +1 @@
-b01877aa6da21b50f0550c43c6b86cfe  kiconedit-4.3.0.tar.bz2
+211d2de7aae9b2eb5594550b40ebe70b  kiconedit-4.3.1.tar.bz2



From svahl at fedoraproject.org  Wed Sep  2 18:57:48 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed,  2 Sep 2009 18:57:48 +0000 (UTC)
Subject: rpms/kgrab/devel .cvsignore, 1.10, 1.11 kgrab.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <20090902185748.7679711C0094@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29362

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.1.1-19
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 15:37:03 -0000	1.10
+++ .cvsignore	2 Sep 2009 18:57:48 -0000	1.11
@@ -1,2 +1 @@
-kgrab-0.1.1-kde4.2.4.tar.bz2
-kgrab-0.1.1-kde4.3.0.tar.bz2
+kgrab-0.1.1-kde4.3.1.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/kgrab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kgrab.spec	4 Aug 2009 15:37:03 -0000	1.20
+++ kgrab.spec	2 Sep 2009 18:57:48 -0000	1.21
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.3.0
+%define kdeversion 4.3.1
 
 Name:           kgrab
 Version:        0.1.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.1.1-19
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 0.1.1-18
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Aug 2009 15:37:03 -0000	1.10
+++ sources	2 Sep 2009 18:57:48 -0000	1.11
@@ -1 +1 @@
-199d59f03900236c0dbc771d617b49f6  kgrab-0.1.1-kde4.3.0.tar.bz2
+73e7a23426f1a448957a0192f88831e0  kgrab-0.1.1-kde4.3.1.tar.bz2



From kkofler at fedoraproject.org  Wed Sep  2 18:57:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  2 Sep 2009 18:57:49 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.0-bookmarks.patch, NONE,
	1.1 kdelibs.spec, 1.439, 1.440
Message-ID: <20090902185749.788BC11C0094@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29386/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.0-bookmarks.patch 
Log Message:
Sync from F-11:

* Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
- Patch for kde#160679

kdelibs-4.3.0-bookmarks.patch:
 kbookmark.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.0-bookmarks.patch ---
diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc	2008-07-08 05:54:18.000000000 -0400
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc	2009-08-28 15:09:07.000000000 -0400
@@ -681,11 +681,11 @@
         doc.setContent( payload );
         QDomElement elem = doc.documentElement();
         QDomNodeList children = elem.childNodes();
         for ( int childno = 0; childno < children.count(); childno++)
         {
-            bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
+            bookmarks.append( KBookmark( children.item(childno).toElement() ));
         }
         return bookmarks;
     }
     const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
     if ( !urls.isEmpty() )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -p -r1.439 -r1.440
--- kdelibs.spec	1 Sep 2009 17:41:47 -0000	1.439
+++ kdelibs.spec	2 Sep 2009 18:57:49 -0000	1.440
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,6 +80,8 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
+# patch to fix keditbookmarks crash (kde#160679)
+Patch22: kdelibs-4.3.0-bookmarks.patch
 
 # upstream
 # 4.3 branch
@@ -209,6 +211,7 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
+%patch22 -p1 -b .bookmarks
 
 # upstream patches
 # 4.3
@@ -397,6 +400,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
+- Patch for kde#160679
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From athimm at fedoraproject.org  Wed Sep  2 19:00:43 2009
From: athimm at fedoraproject.org (athimm)
Date: Wed,  2 Sep 2009 19:00:43 +0000 (UTC)
Subject: rpms/fail2ban/F-11 .cvsignore, 1.7, 1.8 fail2ban.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20090902190043.9998A11C00E6@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30107/F-11

Modified Files:
	.cvsignore fail2ban.spec sources 
Log Message:
Fix python 2.6 issue.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Aug 2008 09:20:30 -0000	1.7
+++ .cvsignore	2 Sep 2009 19:00:43 -0000	1.8
@@ -1 +1 @@
-fail2ban-0.8.3.tar.bz2
+fail2ban-FAIL2BAN-0_8.tar.bz2


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/fail2ban.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fail2ban.spec	27 Aug 2009 20:01:14 -0000	1.18
+++ fail2ban.spec	2 Sep 2009 19:00:43 -0000	1.19
@@ -4,18 +4,16 @@
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.8.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+#Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://www.fail2ban.org/nightly/fail2ban-FAIL2BAN-0_8.tar.bz2
 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
-Patch5: fail2ban-0.8.3-inodecheck.patch
 Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
@@ -31,13 +29,10 @@ Fail2ban scans log files like /var/log/p
 failures. It updates firewall rules to reject the IP address.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-SVN
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
-#patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
-%patch4 -p1 -b .CVE-2009-0362
-%patch5 -p1 -b .inodecheck
 %patch6 -p1 -b .log2syslog
 
 %build
@@ -88,6 +83,9 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
+- Update to a newer svn snapshot to fix python 2.6 issue.
+
 * Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
 - Log to syslog (RH bug #491983). Also deals with RH bug #515116.
 - Check inodes of log files (RH bug #503852).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Aug 2009 20:01:14 -0000	1.10
+++ sources	2 Sep 2009 19:00:43 -0000	1.11
@@ -1 +1 @@
-b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2
+76b4d0e69ad808950b8353c6fcf93615  fail2ban-FAIL2BAN-0_8.tar.bz2



From athimm at fedoraproject.org  Wed Sep  2 19:00:43 2009
From: athimm at fedoraproject.org (athimm)
Date: Wed,  2 Sep 2009 19:00:43 +0000 (UTC)
Subject: rpms/fail2ban/devel .cvsignore, 1.7, 1.8 fail2ban.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20090902190043.F28C411C00E6@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30107/devel

Modified Files:
	.cvsignore fail2ban.spec sources 
Log Message:
Fix python 2.6 issue.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Aug 2008 09:20:30 -0000	1.7
+++ .cvsignore	2 Sep 2009 19:00:43 -0000	1.8
@@ -1 +1 @@
-fail2ban-0.8.3.tar.bz2
+fail2ban-FAIL2BAN-0_8.tar.bz2


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/fail2ban.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fail2ban.spec	27 Aug 2009 20:01:14 -0000	1.19
+++ fail2ban.spec	2 Sep 2009 19:00:43 -0000	1.20
@@ -4,18 +4,16 @@
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.8.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+#Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://www.fail2ban.org/nightly/fail2ban-FAIL2BAN-0_8.tar.bz2
 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
-Patch5: fail2ban-0.8.3-inodecheck.patch
 Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
@@ -31,13 +29,10 @@ Fail2ban scans log files like /var/log/p
 failures. It updates firewall rules to reject the IP address.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-SVN
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
-#patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
-%patch4 -p1 -b .CVE-2009-0362
-%patch5 -p1 -b .inodecheck
 %patch6 -p1 -b .log2syslog
 
 %build
@@ -88,6 +83,9 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
+- Update to a newer svn snapshot to fix python 2.6 issue.
+
 * Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
 - Log to syslog (RH bug #491983). Also deals with RH bug #515116.
 - Check inodes of log files (RH bug #503852).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Aug 2009 20:01:14 -0000	1.10
+++ sources	2 Sep 2009 19:00:43 -0000	1.11
@@ -1 +1 @@
-b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2
+76b4d0e69ad808950b8353c6fcf93615  fail2ban-FAIL2BAN-0_8.tar.bz2



From svahl at fedoraproject.org  Wed Sep  2 19:01:00 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed,  2 Sep 2009 19:01:00 +0000 (UTC)
Subject: rpms/kopete-cryptography/devel .cvsignore, 1.6,
	1.7 kopete-cryptography.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20090902190100.5A15611C00E6@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kopete-cryptography/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30261

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.3.0-13
- 1.3.0-kde4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Aug 2009 19:31:33 -0000	1.6
+++ .cvsignore	2 Sep 2009 19:01:00 -0000	1.7
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.3.0.tar.bz2
+kopete-cryptography-1.3.0-kde4.3.1.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/kopete-cryptography.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kopete-cryptography.spec	11 Aug 2009 19:31:33 -0000	1.11
+++ kopete-cryptography.spec	2 Sep 2009 19:01:00 -0000	1.12
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion 4.3.0
+%define kdeversion 4.3.1
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.3.0-13
+- 1.3.0-kde4.3.1
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.3.0-12
 - 1.3.0-kde4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Aug 2009 19:31:33 -0000	1.6
+++ sources	2 Sep 2009 19:01:00 -0000	1.7
@@ -1 +1 @@
-ea214f8749208130bde77a18814106bc  kopete-cryptography-1.3.0-kde4.3.0.tar.bz2
+609f72a0884941bbefcd331de7c9f939  kopete-cryptography-1.3.0-kde4.3.1.tar.bz2



From thoger at fedoraproject.org  Wed Sep  2 19:10:44 2009
From: thoger at fedoraproject.org (thoger)
Date: Wed,  2 Sep 2009 19:10:44 +0000 (UTC)
Subject: rpms/macchanger/devel macchanger-1.5.0-OUI-list-update.diff, NONE, 
	1.1 macchanger-1.5.0-dynamic-lists.diff, NONE,
	1.1 macchanger-1.5.0-man-update.diff, NONE,
	1.1 macchanger-1.5.0-random-seed.diff, NONE, 1.1 macchanger.spec,
	1.5, 1.6
Message-ID: <20090902191044.7D45911C0349@cvs1.fedora.phx.redhat.com>

Author: thoger

Update of /cvs/pkgs/rpms/macchanger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv551

Modified Files:
	macchanger.spec 
Added Files:
	macchanger-1.5.0-OUI-list-update.diff 
	macchanger-1.5.0-dynamic-lists.diff 
	macchanger-1.5.0-man-update.diff 
	macchanger-1.5.0-random-seed.diff 
Log Message:
1.5.0-8

- Fix pseudo random number generator seeding (RHBZ#520268)
- Update OUI list from IEEE, now more than 12000 items listed
- Update man page to list -s / --show
- Fix handling of internal mac lists where static array was still assumed,
  while dynamically allocated array was used


macchanger-1.5.0-OUI-list-update.diff:
 OUI.list | 6315 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 5873 insertions(+), 442 deletions(-)

--- NEW FILE macchanger-1.5.0-OUI-list-update.diff ---
Update OUI list from IEEE list:
  http://standards.ieee.org/regauth/oui/

Date: 2009-09-02

--- macchanger-1.5.0/data/OUI.list	2004-05-10 10:45:15.000000000 +0200
+++ macchanger-1.5.0/data/OUI.list.20090902	2009-09-02 17:57:00.000000000 +0200
@@ -97,9 +97,9 @@
 00 00 60 Kontron Elektronik Gmbh
 00 00 61 Gateway Communications
 00 00 62 Bull Hn Information Systems
-00 00 63 Dr.ing.seufert Gmbh
+00 00 63 Barco Control Rooms Gmbh
 00 00 64 Yokogawa Digital Computer Corp
-00 00 65 Network Associates, Inc.
+00 00 65 Network General Corporation
 00 00 66 Talaris Systems, Inc.
 00 00 67 Soft * Rite, Inc.
 00 00 68 Rosemount Controls
@@ -134,14 +134,14 @@
 00 00 85 Canon Inc.
 00 00 86 Megahertz Corporation
 00 00 87 Hitachi, Ltd.
-00 00 88 Computer Network Tech. Corp.
+00 00 88 Brocade Communications Systems, Inc.
 00 00 89 Cayman Systems Inc.
 00 00 8A Datahouse Information Systems
 00 00 8B Infotron
 00 00 8C Alloy Computer Products (australia) Pty Ltd
-00 00 8D Verdix Corporation
+00 00 8D Cryptek Inc.
 00 00 8E Solbourne Computer, Inc.
-00 00 8F Raytheon Company
+00 00 8F Raytheon
 00 00 90 Microcom
 00 00 91 Anritsu Corporation
 00 00 92 Cogent Data Technologies
@@ -149,7 +149,7 @@
 00 00 94 Asante Technologies
 00 00 95 Sony Tektronix Corp.
 00 00 96 Marconi Electronics Ltd.
-00 00 97 Epoch Systems
+00 00 97 Emc Corporation
 00 00 98 Crosscomm Corporation
 00 00 99 Mtx, Inc.
 00 00 9A Rc Computer A/s
@@ -158,7 +158,7 @@
 00 00 9D Locus Computing Corporation
 00 00 9E Marli S.a.
 00 00 9F Ameristar Technologies Inc.
-00 00 A0 Tokyo Sanyo Electric Co. Ltd.
+00 00 A0 Sanyo Electric Co., Ltd.
 00 00 A1 Marquette Electric Co.
 00 00 A2 Bay Networks
 00 00 A3 Network Application Technology
@@ -186,7 +186,7 @@
 00 00 B9 Mcdonnell Douglas Computer Sys
 00 00 BA Siig, Inc.
 00 00 BB Tri-data
-00 00 BC Allen-bradley Co. Inc.
+00 00 BC Rockwell Automation
 00 00 BD Mitsubishi Cable Company
 00 00 BE The Nti Group
 00 00 BF Symmetric Computer Systems
@@ -200,10 +200,10 @@
 00 00 C7 Arix Corporation
 00 00 C8 Altos Computer Systems
 00 00 C9 Emulex Corporation
-00 00 CA Applitek
+00 00 CA Arris International
 00 00 CB Compu-shack Electronic Gmbh
 00 00 CC Densan Co., Ltd.
-00 00 CD Allied Telesyn Research Ltd.
+00 00 CD Allied Telesis Labs Ltd
 00 00 CE Megadata Corp.
 00 00 CF Hayes Microcomputer Products
 00 00 D0 Develcon Electronics Ltd.
@@ -259,7 +259,7 @@
 00 01 02 3com Corporation
 00 01 03 3com Corporation
 00 01 04 Dvico Co., Ltd.
-00 01 05 Beckhoff Gmbh
+00 01 05 Beckhoff Automation Gmbh
 00 01 06 Tews Datentechnik Gmbh
 00 01 07 Leiser Gmbh
 00 01 08 Avlab Technology, Inc.
@@ -269,7 +269,7 @@
 00 01 0C System Talks Inc.
 00 01 0D Coreco, Inc.
 00 01 0E Bri-link Technologies Co., Ltd
-00 01 0F Nishan Systems, Inc.
+00 01 0F Brocade Communications Systems, Inc.
 00 01 10 Gotham Networks
 00 01 11 Idigm Inc.
 00 01 12 Shark Multimedia Inc.
@@ -279,7 +279,7 @@
 00 01 16 Netspect Technologies, Inc.
 00 01 17 Canal +
 00 01 18 Ez Digital Co., Ltd.
-00 01 19 Action Controls Pty. Ltd.
+00 01 19 Rtunet (australia)
 00 01 1A Eeh Datalink Gmbh
 00 01 1B Unizone Technologies, Inc.
 00 01 1C Universal Talkware Corporation
@@ -293,7 +293,7 @@
 00 01 24 Acer Incorporated
 00 01 25 Yaesu Musen Co., Ltd.
 00 01 26 Pac Labs
-00 01 27 The Open Group Limited
+00 01 27 Open Networks Pty Ltd
 00 01 28 Enjoyweb, Inc.
 00 01 29 Dfi Inc.
 00 01 2A Telematica Sistems Inteligente
@@ -306,7 +306,7 @@
 00 01 31 Detection Systems, Inc.
 00 01 32 Dranetz - Bmi
 00 01 33 Kyowa Electronic Instruments C
-00 01 34 Sig Positec Systems Ag
+00 01 34 Selectron Systems Ag
 00 01 35 Kdc Corp.
 00 01 36 Cybertan Technology, Inc.
 00 01 37 It Farm Corporation
@@ -322,7 +322,7 @@
 00 01 41 Cable Print
 00 01 42 Cisco Systems, Inc.
 00 01 43 Cisco Systems, Inc.
-00 01 44 Cereva Networks, Inc.
+00 01 44 Emc Corporation
 00 01 45 Winsystems, Inc.
 00 01 46 Tesco Controls, Inc.
 00 01 47 Zhone Technologies
@@ -333,7 +333,7 @@
 00 01 4C Berkeley Process Control
 00 01 4D Shin Kin Enterprises Co., Ltd
 00 01 4E Win Enterprises, Inc.
-00 01 4F Luminous Networks, Inc.
+00 01 4F Adtran Inc
 00 01 50 Gilat Communications, Ltd.
 00 01 51 Ensemble Communications
 00 01 52 Chromatek Inc.
@@ -365,11 +365,11 @@
 00 01 6C Foxconn
 00 01 6D Carriercomm Inc.
 00 01 6E Conklin Corporation
-00 01 6F Haitai Electronics Co., Ltd.
+00 01 6F Inkel Corp.
 00 01 70 Ese Embedded System Engineer'g
 00 01 71 Allied Data Technologies
 00 01 72 Technoland Co., Ltd.
-00 01 73 Jni Corporation
+00 01 73 Amcc
 00 01 74 Cyberoptics Corporation
 00 01 75 Radiant Communications Corp.
 00 01 76 Orient Silver Enterprises
@@ -388,7 +388,7 @@
 00 01 83 Anite Telecoms
 00 01 84 Sieb & Meyer Ag
 00 01 85 Aloka Co., Ltd.
-00 01 86 Disch Gmbh
+00 01 86 Uwe Disch
 00 01 87 I2se Gmbh
 00 01 88 Lxco Technologies Ag
 00 01 89 Refraction Technology, Inc.
@@ -429,7 +429,7 @@
 00 01 AC Sitara Networks, Inc.
 00 01 AD Coach Master International  D.b.a. Cmi Worldwide, Inc.
 00 01 AE Trex Enterprises
-00 01 AF Motorola Computer Group
+00 01 AF Emerson Network Power
 00 01 B0 Fulltek Technology Co., Ltd.
 00 01 B1 General Bandwidth
 00 01 B2 Digital Processing Systems, Inc.
@@ -458,7 +458,7 @@
 00 01 C8 Conrad Corp.
 00 01 C9 Cisco Systems, Inc.
 00 01 CA Geocast Network Systems, Inc.
-00 01 CB Netgame, Ltd.
+00 01 CB Evr
 00 01 CC Japan Total Design Communication Co., Ltd.
 00 01 CD Artem
 00 01 CE Custom Micro Products, Ltd.
@@ -469,7 +469,7 @@
 00 01 D3 Paxcomm, Inc.
 00 01 D4 Leisure Time, Inc.
 00 01 D5 Haedong Info & Comm Co., Ltd
-00 01 D6 Man Roland Druckmaschinen Ag
+00 01 D6 Manroland Ag
 00 01 D7 F5 Networks, Inc.
 00 01 D8 Teltronics, Inc.
 00 01 D9 Sigma, Inc.
@@ -525,7 +525,7 @@
 00 02 0B Native Networks, Inc.
 00 02 0C Metro-optix
 00 02 0D Micronpc.com
-00 02 0E Laurel Networks, Inc.
+00 02 0E Eci Telecom, Ltd., Nsd-us
 00 02 0F Aatr
 00 02 10 Fenecom
 00 02 11 Nature Worldwide Technology Corp.
[...8367 lines suppressed...]
 00 E0 4A Enhanced Messaging Systems, Inc
@@ -7112,7 +12442,7 @@
 00 E0 6C Aep Systems International Ltd
 00 E0 6D Compuware Corporation
 00 E0 6E Far Systems S.p.a.
-00 E0 6F Terayon Communications Systems
+00 E0 6F Motorola, Inc.
 00 E0 70 Dh Technology
 00 E0 71 Epis Microcomputer
 00 E0 72 Lynk
@@ -7155,7 +12485,7 @@
 00 E0 97 Carrier Access Corporation
 00 E0 98 Abocom Systems, Inc.
 00 E0 99 Samson Ag
-00 E0 9A Positron Industries, Inc.
+00 E0 9A Positron Inc.
 00 E0 9B Engage Networks, Inc.
 00 E0 9C Mii
 00 E0 9D Sarnoff Corporation
@@ -7178,7 +12508,7 @@
 00 E0 AE Xaqti Corporation
 00 E0 AF General Dynamics Information Systems
 00 E0 B0 Cisco Systems, Inc.
-00 E0 B1 Packet Engines, Inc.
+00 E0 B1 Alcatel-lucent, Enterprise Business Group
 00 E0 B2 Telmax Communications Corp.
 00 E0 B3 Etherwan Systems, Inc.
 00 E0 B4 Techno Scope Co., Ltd.
@@ -7214,17 +12544,17 @@
 00 E0 D2 Versanet Communications, Inc.
 00 E0 D3 Datentechnik Gmbh
 00 E0 D4 Excellent Computer
-00 E0 D5 Arcxel Technologies, Inc.
+00 E0 D5 Emulex Corporation
 00 E0 D6 Computer & Communication Research Lab.
 00 E0 D7 Sunshine Electronics, Inc.
 00 E0 D8 Lanbit Computer, Inc.
 00 E0 D9 Tazmo Co., Ltd.
-00 E0 DA Assured Access Technology, Inc.
+00 E0 DA Alcatel North America Esd
 00 E0 DB Viavideo Communications, Inc.
 00 E0 DC Nexware Corp.
 00 E0 DD Zenith Electronics Corporation
 00 E0 DE Datax Nv
-00 E0 DF Ke Kommunikations-electronik
+00 E0 DF Keymile Gmbh
 00 E0 E0 Si Electronics, Ltd.
 00 E0 E1 G2 Networks, Inc.
 00 E0 E2 Innova Corp.
@@ -7272,6 +12602,10 @@
 02 CF 1C Communication Machinery Corp.
 02 E6 D3 Nixdorf Computer Corporation
 04 0A E0 Xmit Ag Computer Networks
+04 1E 64 Apple, Inc
+04 4F AA Ruckus Wireless
+04 B3 B6 Seamap (uk) Ltd
+04 B4 66 Bsp Co., Ltd.
 04 E0 C4 Triumph-adler Ag
 08 00 01 Computervision Corporation
 08 00 02 Bridge Communications Inc.
@@ -7298,7 +12632,7 @@
 08 00 18 Pirelli Focom Networks
 08 00 19 General Electric Corporation
 08 00 1A Tiara/ 10net
-08 00 1B Data General
+08 00 1B Emc Corporation
 08 00 1C Kdd-kokusai Debnsin Denwa Co.
 08 00 1D Able Communications Inc.
 08 00 1E Apollo Computer Inc.
@@ -7343,7 +12677,7 @@
 08 00 43 Pixel Computer Inc.
 08 00 44 David Systems Inc.
 08 00 45 Concurrent Computer Corp.
-08 00 46 Sony Corporation Ltd.
+08 00 46 Sony Corporation
 08 00 47 Sequent Computer Systems Inc.
 08 00 48 Eurotherm Gauging Systems
 08 00 49 Univation
@@ -7407,7 +12741,7 @@
 08 00 85 Elxsi
 08 00 86 Konica Minolta Holdings, Inc.
 08 00 87 Xyplex
-08 00 88 Mcdata Corporation
+08 00 88 Brocade Communications Systems, Inc.
 08 00 89 Kinetics
 08 00 8A Performance Technology
 08 00 8B Pyramid Technology Corp.
@@ -7418,15 +12752,112 @@
 08 00 90 Sonoma Systems
 08 14 43 Unibrain S.a.
 08 BB CC Ak-nord Edv Vertriebsges. Mbh
+0C 60 76 Hon Hai Precision Ind. Co.,ltd.
+0C D7 C2 Axium Technologies, Inc.
+0C E7 09 Fox Crypto B.v.
+0C E9 36 Elimos Srl
+0C EE E6 Hon Hai Precision Ind. Co.,ltd.
 10 00 00 Private
 10 00 5A Ibm Corporation
 10 00 E8 National Semiconductor
+10 BA A5 Gana I&c Co., Ltd
 11 00 AA Private
+14 6E 0A Private
+18 01 E3 Elektrobit Wireless Communications Ltd
+18 86 AC Nokia Danmark A/s
+18 A9 05 Hewlett Packard
+1C 4B D6 Azurewave
+20 2C B7 Kong Yue Electronics & Information Industry (xinhui) Ltd.
+24 82 8A Prowave Technologies Ltd.
+24 CF 21 Shenzhen State Micro Technology Co., Ltd
+28 FB D3 Shanghai Ragentek Communication Technology Co.,ltd.
+30 32 D4 Hanilstm Co., Ltd.
+3C 2D B7 Texas Instruments
+40 15 97 Protect America, Inc.
+40 61 86 Micro-star Int'l Co.,ltd
+40 97 D1 Bk Electronics Cc
+40 EF 4C Fihonest Communication Co.,ltd
+40 F5 2E Leica Microsystems (schweiz) Ag
+44 56 8D Pnc Technologies  Co., Ltd.
+44 56 B7 Spawn Labs, Inc
+44 C9 A2 Greenwald Industries
+48 34 3D Iep Gmbh
+58 4C EE Digital One Technologies, Limited
+58 6E D6 Private
+58 F6 7B Xia Men Unioncore Technology Ltd.
+60 38 0E Alps Electric Co.,
+60 39 1F Abb Ltd
+60 9F 9D Cloudswitch
+60 D0 A9 Samsung Electronics Co.,ltd
+60 D3 0A Quatius Limited
+60 FB 42 Apple, Inc
+64 16 F0 Shehzhen Huawei Communication Technologies Co., Ltd.
+64 4B C3 Shanghai Woasis Telecommunications Ltd., Co.
+64 65 C0 Nuvon, Inc
+64 68 0C Comtrend
+64 7D 81 Yokota Industrial Co,.ltd
+64 A8 37 Juni Korea Co., Ltd
+64 BC 11 Combiq Ab
+64 C6 AF Axerra Networks Ltd
+64 ED 57 Motorola Mdb/broadband
+68 85 40 Igi Mobile, Inc.
+68 AA D2 Datecs Ltd.,
+68 CC 9C Mine Site Technologies
+6C 0E 0D Sony Ericsson Mobile Communications Ab
+6C 0F 6A Jdc Tech Co., Ltd.
+6C 8C DB Otus Technologies Ltd
+6C F0 49 Giga-byte Technology Co.,ltd.
+70 1A 04 Liteon Tech Corp.
+70 1A ED Advas Co., Ltd.
+74 E5 37 Radspin
+7C 1E B3 2n Telekomunikace A.s.
+7C 7B E4 Z&#39;sedai Kenkyusho Corporation
+7C CF CF Shanghai Seari Intelligent System Co., Ltd
 80 00 10 Att Bell Laboratories
+88 91 DD Racktivity
+90 6D C8 Dlg Automa??o Industrial Ltda
+90 E6 BA Asustek Computer Inc.
+94 2E 63 Fins?cur
+94 44 52 Belkin International, Inc.
+9C 18 74 Nokia Danmark A/s
+A0 07 98 Samsung Electronics
+A0 2E F3 United Integrated Services Co., Led.
 A0 6A 00 Verilink Corporation
+A0 73 32 Cashmaster International Limited
+A0 98 05 Openvox Communication Co Ltd
+A0 9A 5A Time Domain
+A4 DE 50 Total Walther Gmbh
+A4 E7 E4 Connex Gmbh
+A8 CE 90 Cvc
 AA 00 00 Digital Equipment Corporation
 AA 00 01 Digital Equipment Corporation
 AA 00 02 Digital Equipment Corporation
 AA 00 03 Digital Equipment Corporation
 AA 00 04 Digital Equipment Corporation
+AC 83 17 Shenzhen Furtunetel Communication Co., Ltd
+AC D1 80 Crexendo Business Solutions, Inc.
 AC DE 48 Private
+B0 C6 9A Juniper Networks
+B4 41 7A Shenzhen Gongjin Electronics Co.,ltd
+B4 B5 AF Minsung Electronics
+BC 9D A5 Dascom Europe Gmbh
+C0 22 50 Private
+C4 19 8B Dominion Voting Systems Corporation
+C8 3A 35 Tenda Technology Co., Ltd.
+C8 C1 3C Ruggedtek Hangzhou Co., Ltd
+C8 D2 C1 Jetlun (shenzhen) Corporation
+CC 00 80 Trust System Co.,
+CC CC 4E Sun Fountainhead Usa. Corp 
+D4 C7 66 Acentic Gmbh
+D8 D6 7E Gsk Cnc Equipment Co.,ltd
+DC 33 50 Techsat Gmbh
+E0 64 BB Digiview S.r.l.
+E0 91 53 Xavi Technologies Corp.
+E4 1F 13 Ibm
+E8 0B 13 Akib Systems Taiwan, Inc
+E8 A4 C1 Deep Sea Electronics Plc
+EC 30 91 Cisco Systems
+EC 6C 9F Chengdu Volans Technology Co.,ltd
+F0 BC C8 Maxid (pty) Ltd
+F0 DE 71 Shanghai Edo Technologies Co.,ltd.
+F4 AC C1 Cisco Systems

macchanger-1.5.0-dynamic-lists.diff:
 maclist.c |   35 +++++++++++++++++------------------
 maclist.h |    1 -
 2 files changed, 17 insertions(+), 19 deletions(-)

--- NEW FILE macchanger-1.5.0-dynamic-lists.diff ---
Fix computation of mac list lengths - in some places, code assumed static list
(computing length as sizeof(list)/sizeof(item)), while dynamic memory
allocation is used now.

diff -pruN macchanger-1.5.0.orig/src/maclist.c macchanger-1.5.0/src/maclist.c
--- macchanger-1.5.0.orig/src/maclist.c	2002-12-03 18:52:48.000000000 +0100
+++ macchanger-1.5.0/src/maclist.c	2009-09-02 20:20:10.000000000 +0200
@@ -32,6 +32,9 @@
 card_mac_list_item_t *list_others   = NULL; /* IEEE OUI */
 card_mac_list_item_t *list_wireless = NULL; /* Wireless cards */
 
+int list_others_len   = 0;
+int list_wireless_len = 0;
+
 
 static char *
 mc_maclist_get_cardname_from_list (const mac_t *mac, card_mac_list_item_t *list)
@@ -76,12 +79,9 @@ mc_maclist_get_cardname_with_default (co
 }
 
 static void
-mc_maclist_set_random_vendor_from_list (mac_t *mac, card_mac_list_item_t *list)
+mc_maclist_set_random_vendor_from_list (mac_t *mac, card_mac_list_item_t *list, int list_len)
 {
-	   int i, num = 0;
-
-	   /* Count */
-	   while (list[++num].name);
+	   int i, num = list_len;
 
 	   /* Choose one randomly */
 	   num = random()%num;
@@ -96,25 +96,23 @@ mc_maclist_set_random_vendor_from_list (
 void
 mc_maclist_set_random_vendor (mac_t *mac, mac_type_t type)
 {
-	   int total, num;
-	   total = LIST_LENGHT (list_others) +
-		   LIST_LENGHT (list_wireless);
+	   int num;
 
-	   num = random() % total;
+	   num = random() % ( list_others_len + list_wireless_len );
 	   
 	   switch (type) {
 	   case mac_is_anykind:
-			 if (num < LIST_LENGHT(list_others)) {
-				    mc_maclist_set_random_vendor_from_list (mac, list_others);
+			 if (num < list_others_len) {
+				    mc_maclist_set_random_vendor_from_list (mac, list_others, list_others_len);
 			 } else {
-				    mc_maclist_set_random_vendor_from_list (mac, list_wireless);
+				    mc_maclist_set_random_vendor_from_list (mac, list_wireless, list_wireless_len);
 			 }
 			 break;
 	   case mac_is_wireless:
-			 mc_maclist_set_random_vendor_from_list (mac, list_wireless);
+			 mc_maclist_set_random_vendor_from_list (mac, list_wireless, list_wireless_len);
 			 break;
 	   case mac_is_others:
-			 mc_maclist_set_random_vendor_from_list (mac, list_others);
+			 mc_maclist_set_random_vendor_from_list (mac, list_others, list_others_len);
 			 break;
 	   }
 }
@@ -160,12 +158,12 @@ mc_maclist_print (const char *keyword)
 
 
 static card_mac_list_item_t *
-mc_maclist_read_from_file (const char *fullpath)
+mc_maclist_read_from_file (const char *fullpath, int *list_len)
 {
 	FILE *f;
 	char *line;
 	char  tmp[512];
-	int   num =0;
+	int   num = 0;
 	card_mac_list_item_t *list;
 
 	if ((f = fopen(fullpath, "r")) == NULL) {
@@ -199,6 +197,7 @@ mc_maclist_read_from_file (const char *f
 
 	fclose (f);
 
+	*list_len = num;
 	return list;
 }
 
@@ -206,8 +205,8 @@ mc_maclist_read_from_file (const char *f
 int
 mc_maclist_init (void)
 {
-	list_others = mc_maclist_read_from_file(LISTDIR "/OUI.list");
-	list_wireless = mc_maclist_read_from_file(LISTDIR "/wireless.list");
+	list_others = mc_maclist_read_from_file(LISTDIR "/OUI.list", &list_others_len);
+	list_wireless = mc_maclist_read_from_file(LISTDIR "/wireless.list", &list_wireless_len);
 
 	return (list_others && list_wireless)? 0 : -1;
 }
diff -pruN macchanger-1.5.0.orig/src/maclist.h macchanger-1.5.0/src/maclist.h
--- macchanger-1.5.0.orig/src/maclist.h	2002-12-03 18:52:57.000000000 +0100
+++ macchanger-1.5.0/src/maclist.h	2009-09-02 20:20:42.000000000 +0200
@@ -33,7 +33,6 @@ typedef struct {
 	unsigned char byte[3];
 } card_mac_list_item_t;
 
-#define LIST_LENGHT(l)   ((sizeof(l) / sizeof(card_mac_list_item_t))-1)
 #define CARD_NAME(x)     mc_maclist_get_cardname_with_default(x, "unknown")
 
 int    mc_maclist_init  (void);

macchanger-1.5.0-man-update.diff:
 macchanger.1 |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE macchanger-1.5.0-man-update.diff ---
Make sure -s / --show is documented in man page.

Loosely based on Debian's 01-fix_manpage.patch .

diff -pruN macchanger-1.5.0.orig/macchanger.1 macchanger-1.5.0/macchanger.1
--- macchanger-1.5.0.orig/macchanger.1	2002-12-03 18:34:31.000000000 +0100
+++ macchanger-1.5.0/macchanger.1	2009-09-02 19:15:34.000000000 +0200
@@ -45,6 +45,9 @@ Show summary of options.
 .B \-V, \-\-version
 Show version of program.
 .TP
+.B \-s, \-\-show
+Prints the current MAC
+.TP
 .B \-e, \-\-endding
 Don't change the vendor bytes.
 .TP
@@ -60,7 +63,7 @@ Set fully random MAC.
 .B \-l, \-\-list[=keyword]
 Print known vendors (with keyword in the vendor's description string)
 .TP
-.B \-m, \-\-mac XX:XX:XX:XX:XX:XX
+.B \-m, \-\-mac=XX:XX:XX:XX:XX:XX
 Set the MAC XX:XX:XX:XX:XX:XX
 .SH EXAMPLE
 macchanger -A eth1

macchanger-1.5.0-random-seed.diff:
 main.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE macchanger-1.5.0-random-seed.diff ---
Use more than current time when seeding pseudo random number generator.

https://bugzilla.redhat.com/show_bug.cgi?id=520268

diff -pruN macchanger-1.5.0.orig/src/main.c macchanger-1.5.0/src/main.c
--- macchanger-1.5.0.orig/src/main.c	2004-02-04 14:38:11.000000000 +0100
+++ macchanger-1.5.0/src/main.c	2009-09-02 19:35:56.000000000 +0200
@@ -32,6 +32,9 @@
 #include <getopt.h>
 #include <stdlib.h>
 
+#include <unistd.h>
+#include <sys/types.h>
+
 #include "mac.h"
 #include "maclist.h"
 #include "netinfo.h"
@@ -174,7 +177,7 @@ main (int argc, char *argv[])
 	device_name = argv[optind];
 	
 	
-	srandom(time(NULL));
+	srandom(getpid() * time(NULL));
 
         /* Read the MAC */
 	if ((net = mc_net_info_new(device_name)) == NULL) exit(1);


Index: macchanger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/macchanger/devel/macchanger.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- macchanger.spec	25 Jul 2009 11:37:26 -0000	1.5
+++ macchanger.spec	2 Sep 2009 19:10:44 -0000	1.6
@@ -1,12 +1,16 @@
 Name:           macchanger
 Version:        1.5.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An utility for viewing/manipulating the MAC address of network interfaces
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.alobbs.com/macchanger
 Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Patch0:         macchanger-1.5.0-OUI-list-update.diff
+Patch1:         macchanger-1.5.0-man-update.diff
+Patch2:         macchanger-1.5.0-random-seed.diff
+Patch3:         macchanger-1.5.0-dynamic-lists.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info    
@@ -19,11 +23,15 @@ Features:
   * set a MAC of another vendor
   * set another MAC of the same vendor
   * set a MAC of the same kind (eg: wireless card)
-  * display a vendor MAC list (today, 6200 items) to choose from
+  * display a vendor MAC list (more than 12000 items) to choose from
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .OUI-list
+%patch1 -p1 -b .man
+%patch2 -p1 -b .srandom
+%patch3 -p1 -b .dynlists
 
 
 %build
@@ -57,6 +65,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep  2 2009 Tomas Hoger <thoger at fedoraproject.org> - 1.5.0-8
+- Fix pseudo random number generator seeding (RHBZ#520268)
+- Update OUI list from IEEE, now more than 12000 items listed
+- Update man page to list -s / --show
+- Fix handling of internal mac lists where static array was still assumed,
+  while dynamically allocated array was used
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rcritten at fedoraproject.org  Wed Sep  2 19:13:45 2009
From: rcritten at fedoraproject.org (rcritten)
Date: Wed,  2 Sep 2009 19:13:45 +0000 (UTC)
Subject: rpms/python-pyasn1/devel python-pyasn1.spec,1.5,1.6
Message-ID: <20090902191345.F18DB11C0094@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/python-pyasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2099

Modified Files:
	python-pyasn1.spec 
Log Message:
Include doc/notes.html in the package



Index: python-pyasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/devel/python-pyasn1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-pyasn1.spec	26 Jul 2009 20:55:08 -0000	1.5
+++ python-pyasn1.spec	2 Sep 2009 19:13:45 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-pyasn1
 Version:        0.0.8a
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        ASN.1 tools for Python
 License:        BSD
 Group:          System Environment/Libraries
@@ -39,11 +39,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE examples/*
+%doc README LICENSE doc/notes.html examples/*
 %{python_sitelib}/*
 
 
 %changelog
+* Wed Sep  2 2009 Rob Crittenden <rcritten at redhat.com> - 0.0.8a-5
+- Include doc/notes.html in the package
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8a-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From athimm at fedoraproject.org  Wed Sep  2 19:41:55 2009
From: athimm at fedoraproject.org (athimm)
Date: Wed,  2 Sep 2009 19:41:55 +0000 (UTC)
Subject: rpms/nx/F-10 .cvsignore, 1.17, 1.18 nx.spec, 1.28, 1.29 sources,
	1.18, 1.19
Message-ID: <20090902194155.DD90611C0094@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/nx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14040/F-10

Modified Files:
	.cvsignore nx.spec sources 
Log Message:
Third maintenance release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	7 Jun 2009 08:02:08 -0000	1.17
+++ .cvsignore	2 Sep 2009 19:41:55 -0000	1.18
@@ -5,7 +5,7 @@ nxcompshad-3.3.0-3.tar.gz
 nxproxy-3.3.0-2.tar.gz
 nxscripts-3.3.0-1.tar.gz
 nxssh-3.3.0-1.tar.gz
-nx-X11-3.3.0-6.tar.gz
 nxcompext-3.3.0-4.tar.gz
 nxcomp-3.3.0-4.tar.gz
-nxagent-3.3.0-13.tar.gz
+nxagent-3.3.0-18.tar.gz
+nx-X11-3.3.0-7.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/F-10/nx.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nx.spec	7 Jun 2009 08:02:08 -0000	1.28
+++ nx.spec	2 Sep 2009 19:41:55 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.3.0
-Release: 35%{?dist}
+Release: 38%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 Group: Applications/Internet
@@ -21,10 +21,10 @@ Source3: http://64.34.161.181/download/%
 # Shadowing Libraries
 Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-3.tar.gz
 # X11 Support Programs and Libraries
-Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-6.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-7.tar.gz
 Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
 # X11 Agent Sources
-Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-13.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-18.tar.gz
 # NX Example Scripts
 Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
 
@@ -171,6 +171,9 @@ rm -rf %{buildroot}
 %{_pkglibexecdir}
 
 %changelog
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-38
+- Update to latest (third) maintenance release.
+
 * Sat Jun  6 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-35
 - Update to latest maintenance sources.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	7 Jun 2009 08:02:08 -0000	1.18
+++ sources	2 Sep 2009 19:41:55 -0000	1.19
@@ -5,7 +5,7 @@
 047206e5a811b915aac4ae09bddef207  nxproxy-3.3.0-2.tar.gz
 4a36b323efbb731f8672758438a8a5c6  nxscripts-3.3.0-1.tar.gz
 e9bb4c1cd61c42db9626894845fcf3f7  nxssh-3.3.0-1.tar.gz
-954de7b8a3d1e6cd24bdc96db2857f1b  nx-X11-3.3.0-6.tar.gz
 421398e9f8878a9956aebbf9452ec40a  nxcompext-3.3.0-4.tar.gz
 0eb3866f1173767f185a1d62dd51dba0  nxcomp-3.3.0-4.tar.gz
-052091391a7340007db764025f36750a  nxagent-3.3.0-13.tar.gz
+87e574795ecf2a6d6fa7a28bb205dc8d  nxagent-3.3.0-18.tar.gz
+db73e168cace71d24a053de51de4e2b1  nx-X11-3.3.0-7.tar.gz



From athimm at fedoraproject.org  Wed Sep  2 19:41:56 2009
From: athimm at fedoraproject.org (athimm)
Date: Wed,  2 Sep 2009 19:41:56 +0000 (UTC)
Subject: rpms/nx/F-11 .cvsignore, 1.17, 1.18 nx.spec, 1.31, 1.32 sources,
	1.18, 1.19
Message-ID: <20090902194156.5C71D11C0094@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/nx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14040/F-11

Modified Files:
	.cvsignore nx.spec sources 
Log Message:
Third maintenance release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	7 Jun 2009 08:02:09 -0000	1.17
+++ .cvsignore	2 Sep 2009 19:41:55 -0000	1.18
@@ -5,7 +5,7 @@ nxcompshad-3.3.0-3.tar.gz
 nxproxy-3.3.0-2.tar.gz
 nxscripts-3.3.0-1.tar.gz
 nxssh-3.3.0-1.tar.gz
-nx-X11-3.3.0-6.tar.gz
 nxcompext-3.3.0-4.tar.gz
 nxcomp-3.3.0-4.tar.gz
-nxagent-3.3.0-13.tar.gz
+nxagent-3.3.0-18.tar.gz
+nx-X11-3.3.0-7.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/F-11/nx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nx.spec	7 Jun 2009 08:02:09 -0000	1.31
+++ nx.spec	2 Sep 2009 19:41:56 -0000	1.32
@@ -8,7 +8,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.3.0
-Release: 35%{?dist}
+Release: 38%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 Group: Applications/Internet
@@ -21,10 +21,10 @@ Source3: http://64.34.161.181/download/%
 # Shadowing Libraries
 Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-3.tar.gz
 # X11 Support Programs and Libraries
-Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-6.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-7.tar.gz
 Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
 # X11 Agent Sources
-Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-13.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-18.tar.gz
 # NX Example Scripts
 Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
 
@@ -171,6 +171,9 @@ rm -rf %{buildroot}
 %{_pkglibexecdir}
 
 %changelog
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-38
+- Update to latest (third) maintenance release.
+
 * Sat Jun  6 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-35
 - Update to latest maintenance sources.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	7 Jun 2009 08:02:09 -0000	1.18
+++ sources	2 Sep 2009 19:41:56 -0000	1.19
@@ -5,7 +5,7 @@
 047206e5a811b915aac4ae09bddef207  nxproxy-3.3.0-2.tar.gz
 4a36b323efbb731f8672758438a8a5c6  nxscripts-3.3.0-1.tar.gz
 e9bb4c1cd61c42db9626894845fcf3f7  nxssh-3.3.0-1.tar.gz
-954de7b8a3d1e6cd24bdc96db2857f1b  nx-X11-3.3.0-6.tar.gz
 421398e9f8878a9956aebbf9452ec40a  nxcompext-3.3.0-4.tar.gz
 0eb3866f1173767f185a1d62dd51dba0  nxcomp-3.3.0-4.tar.gz
-052091391a7340007db764025f36750a  nxagent-3.3.0-13.tar.gz
+87e574795ecf2a6d6fa7a28bb205dc8d  nxagent-3.3.0-18.tar.gz
+db73e168cace71d24a053de51de4e2b1  nx-X11-3.3.0-7.tar.gz



From athimm at fedoraproject.org  Wed Sep  2 19:41:56 2009
From: athimm at fedoraproject.org (athimm)
Date: Wed,  2 Sep 2009 19:41:56 +0000 (UTC)
Subject: rpms/nx/devel .cvsignore, 1.17, 1.18 nx.spec, 1.33, 1.34 sources,
	1.18, 1.19
Message-ID: <20090902194156.C0CF111C0094@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/nx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14040/devel

Modified Files:
	.cvsignore nx.spec sources 
Log Message:
Third maintenance release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	7 Jun 2009 08:02:10 -0000	1.17
+++ .cvsignore	2 Sep 2009 19:41:56 -0000	1.18
@@ -5,7 +5,7 @@ nxcompshad-3.3.0-3.tar.gz
 nxproxy-3.3.0-2.tar.gz
 nxscripts-3.3.0-1.tar.gz
 nxssh-3.3.0-1.tar.gz
-nx-X11-3.3.0-6.tar.gz
 nxcompext-3.3.0-4.tar.gz
 nxcomp-3.3.0-4.tar.gz
-nxagent-3.3.0-13.tar.gz
+nxagent-3.3.0-18.tar.gz
+nx-X11-3.3.0-7.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/nx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- nx.spec	21 Aug 2009 14:47:40 -0000	1.33
+++ nx.spec	2 Sep 2009 19:41:56 -0000	1.34
@@ -8,7 +8,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.3.0
-Release: 37%{?dist}
+Release: 38%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 Group: Applications/Internet
@@ -21,10 +21,10 @@ Source3: http://64.34.161.181/download/%
 # Shadowing Libraries
 Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-3.tar.gz
 # X11 Support Programs and Libraries
-Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-6.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-7.tar.gz
 Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
 # X11 Agent Sources
-Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-13.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-18.tar.gz
 # NX Example Scripts
 Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
 
@@ -171,11 +171,8 @@ rm -rf %{buildroot}
 %{_pkglibexecdir}
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-37
-- rebuilt with new openssl
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-36
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-38
+- Update to latest (third) maintenance release.
 
 * Sat Jun  6 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-35
 - Update to latest maintenance sources.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	7 Jun 2009 08:02:10 -0000	1.18
+++ sources	2 Sep 2009 19:41:56 -0000	1.19
@@ -5,7 +5,7 @@
 047206e5a811b915aac4ae09bddef207  nxproxy-3.3.0-2.tar.gz
 4a36b323efbb731f8672758438a8a5c6  nxscripts-3.3.0-1.tar.gz
 e9bb4c1cd61c42db9626894845fcf3f7  nxssh-3.3.0-1.tar.gz
-954de7b8a3d1e6cd24bdc96db2857f1b  nx-X11-3.3.0-6.tar.gz
 421398e9f8878a9956aebbf9452ec40a  nxcompext-3.3.0-4.tar.gz
 0eb3866f1173767f185a1d62dd51dba0  nxcomp-3.3.0-4.tar.gz
-052091391a7340007db764025f36750a  nxagent-3.3.0-13.tar.gz
+87e574795ecf2a6d6fa7a28bb205dc8d  nxagent-3.3.0-18.tar.gz
+db73e168cace71d24a053de51de4e2b1  nx-X11-3.3.0-7.tar.gz



From nalin at fedoraproject.org  Wed Sep  2 19:43:37 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed,  2 Sep 2009 19:43:37 +0000 (UTC)
Subject: rpms/gnupg/devel .cvsignore, 1.23, 1.24 gnupg.spec, 1.82,
	1.83 sources, 1.27, 1.28 gnupg-1.4.2-curl.patch, 1.2,
	NONE gnupg-1.4.9-gcc43.patch, 1.1, NONE
Message-ID: <20090902194337.7EB0F11C0094@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/gnupg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15388

Modified Files:
	.cvsignore gnupg.spec sources 
Removed Files:
	gnupg-1.4.2-curl.patch gnupg-1.4.9-gcc43.patch 
Log Message:
update to 1.4.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	26 Mar 2008 20:56:11 -0000	1.23
+++ .cvsignore	2 Sep 2009 19:43:37 -0000	1.24
@@ -19,3 +19,5 @@ gnupg-1.4.8.tar.bz2
 gnupg-1.4.8.tar.bz2.sig
 gnupg-1.4.9.tar.bz2
 gnupg-1.4.9.tar.bz2.sig
+gnupg-1.4.10.tar.bz2
+gnupg-1.4.10.tar.bz2.sig


Index: gnupg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- gnupg.spec	25 Jul 2009 00:58:20 -0000	1.82
+++ gnupg.spec	2 Sep 2009 19:43:37 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage
 Name: gnupg
-Version: 1.4.9
-Release: 6%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 License: GPLv3+ with exceptions
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -9,9 +9,6 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gnup
 Source2: gnupg-shm-coprocessing.expect
 Patch0: gnupg-1.4.1-gcc.patch
 Patch3: gnupg-1.4.6-dir.patch
-# Fix build failure with curl-7.18.1+ and gcc 4.3+
-# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
-Patch4: gnupg-1.4.9-gcc43.patch
 URL: http://www.gnupg.org/
 # Requires autoconf >= 2.60 because earlier autoconf didn't define $localedir.
 BuildRequires: autoconf >= 2.60
@@ -38,7 +35,6 @@ only IDEA for symmetric-key encryption, 
 %setup -q
 %patch0 -p1 -b .gcc
 %patch3 -p1 -b .dir
-%patch4 -p1 -b .gcc43
 
 # Convert these files to UTF-8, per rpmlint.
 iconv -f koi8-ru -t utf-8 doc/gpg.ru.1 > doc/gpg.ru.utf8.1
@@ -113,6 +109,9 @@ exit 0
 %{_mandir}/man7/*
 
 %changelog
+* Wed Sep  2 2009 Nalin Dahyabhai <nalin at redhat.com> 1.4.10-1
+- update to 1.4.10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	26 Mar 2008 20:56:11 -0000	1.27
+++ sources	2 Sep 2009 19:43:37 -0000	1.28
@@ -1,2 +1,2 @@
-cc52393087480ac8d245625004a6a30c  gnupg-1.4.9.tar.bz2
-c1dbb1e28502593635bf0349b74ca33a  gnupg-1.4.9.tar.bz2.sig
+dcf7ed712997888d616e029637bfc303  gnupg-1.4.10.tar.bz2
+4f602a424cc1b6cadfd83487c6723403  gnupg-1.4.10.tar.bz2.sig


--- gnupg-1.4.2-curl.patch DELETED ---


--- gnupg-1.4.9-gcc43.patch DELETED ---



From svahl at fedoraproject.org  Wed Sep  2 19:46:29 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed,  2 Sep 2009 19:46:29 +0000 (UTC)
Subject: rpms/skanlite/devel .cvsignore, 1.3, 1.4 skanlite.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090902194629.131B111C0094@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/skanlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16715

Modified Files:
	.cvsignore skanlite.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.3-5
- KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skanlite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 19:54:41 -0000	1.3
+++ .cvsignore	2 Sep 2009 19:46:28 -0000	1.4
@@ -1 +1 @@
-skanlite-0.3-kde4.3.0.tar.bz2
+skanlite-0.3-kde4.3.1.tar.bz2


Index: skanlite.spec
===================================================================
RCS file: /cvs/extras/rpms/skanlite/devel/skanlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skanlite.spec	11 Aug 2009 19:54:41 -0000	1.3
+++ skanlite.spec	2 Sep 2009 19:46:28 -0000	1.4
@@ -1,8 +1,8 @@
-%global kdeversion 4.3.0
+%global kdeversion 4.3.1
 
 Name:           skanlite
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.3-5
+- KDE 4.3.1
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.3-4
 - KDE 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skanlite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 19:54:41 -0000	1.3
+++ sources	2 Sep 2009 19:46:28 -0000	1.4
@@ -1 +1 @@
-cf72ef82553627e21406084a12e9b5eb  skanlite-0.3-kde4.3.0.tar.bz2
+ffe6c35bb6dc9096380c940ac2bc3e6e  skanlite-0.3-kde4.3.1.tar.bz2



From pingou at fedoraproject.org  Wed Sep  2 20:14:59 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:14:59 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/F-11 sources,1.1,1.2
Message-ID: <20090902201459.EDC8511C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29951/F-11

Modified Files:
	sources 
Log Message:
Update to the lastest version + add of the dist tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Jan 2008 18:22:42 -0000	1.1
+++ sources	2 Sep 2009 20:14:59 -0000	1.2
@@ -0,0 +1 @@
+ed104a2f25f002cf6f6e2b918767a8c2  BSgenome.Celegans.UCSC.ce2_1.3.13.tar.gz



From pingou at fedoraproject.org  Wed Sep  2 20:15:00 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:15:00 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/devel sources,1.1,1.2
Message-ID: <20090902201500.28D0D11C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29951/devel

Modified Files:
	sources 
Log Message:
Update to the lastest version + add of the dist tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Jan 2008 18:22:42 -0000	1.1
+++ sources	2 Sep 2009 20:15:00 -0000	1.2
@@ -0,0 +1 @@
+ed104a2f25f002cf6f6e2b918767a8c2  BSgenome.Celegans.UCSC.ce2_1.3.13.tar.gz



From pingou at fedoraproject.org  Wed Sep  2 20:14:59 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:14:59 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/F-10
	R-BSgenome.Celegans.UCSC.ce2.spec, 1.2, 1.3
Message-ID: <20090902201459.D4A9A11C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29951/F-10

Modified Files:
	R-BSgenome.Celegans.UCSC.ce2.spec 
Log Message:
Update to the lastest version + add of the dist tag


Index: R-BSgenome.Celegans.UCSC.ce2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-10/R-BSgenome.Celegans.UCSC.ce2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-BSgenome.Celegans.UCSC.ce2.spec	31 Jul 2009 19:22:16 -0000	1.2
+++ R-BSgenome.Celegans.UCSC.ce2.spec	2 Sep 2009 20:14:59 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:             R-%{packname}
 Version:          1.3.13 
-Release:          2
+Release:          3%{?dist}
 Summary:          Caenorhabditis elegans genome (UCSC Release ce2)
 Summary(fr):      Genome de Caenorhabditis elegans (UCSC Release ce2)
 
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-2
+- Re-add the dist tag cf https://fedorahosted.org/rel-eng/ticket/2152
+
 * Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-2
 - Increase release tag
 



From pbrobinson at fedoraproject.org  Wed Sep  2 20:20:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Sep 2009 20:20:52 +0000 (UTC)
Subject: rpms/metacity/devel metacity-option-to-force-fullscreen.patch, NONE,
	1.1 metacity.spec, 1.200, 1.201
Message-ID: <20090902202052.2798511C0094@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31433

Modified Files:
	metacity.spec 
Added Files:
	metacity-option-to-force-fullscreen.patch 
Log Message:
- Add upstreamed patch for option to force fullscreen for sugar - RHBZ 516225

metacity-option-to-force-fullscreen.patch:
 core/constraints.c |    4 +++-
 core/main.c        |   10 ++++++++++
 core/prefs.c       |   17 +++++++++++++++++
 include/prefs.h    |    7 +++++--
 4 files changed, 35 insertions(+), 3 deletions(-)

--- NEW FILE metacity-option-to-force-fullscreen.patch ---
>From b625ec30d99b2dcf86d8fa78b09f6d04dce3a6e0 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu at sugarlabs.org>
Date: Fri, 19 Jun 2009 15:30:37 +0000
Subject: Add a switch to disable autofullscreen'ing maximized windows without decorations

---
diff --git a/src/core/constraints.c b/src/core/constraints.c
index 800b293..a060d20 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -27,6 +27,7 @@
 #include "constraints.h"
 #include "workspace.h"
 #include "place.h"
+#include "prefs.h"
 
 #include <stdlib.h>
 #include <math.h>
@@ -424,7 +425,8 @@ setup_constraint_info (ConstraintInfo      *info,
   /* Workaround braindead legacy apps that don't know how to
    * fullscreen themselves properly.
    */
-  if (meta_rectangle_equal (new, &xinerama_info->rect) &&
+  if (meta_prefs_get_force_fullscreen() &&
+      meta_rectangle_equal (new, &xinerama_info->rect) &&
       window->has_fullscreen_func &&
       !window->fullscreen)
     {
diff --git a/src/core/main.c b/src/core/main.c
index 6c36f10..a36a396 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -233,6 +233,7 @@ typedef struct
   gboolean sync;
   gboolean composite;
   gboolean no_composite;
+  gboolean no_force_fullscreen;
 } MetaArguments;
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
@@ -314,6 +315,12 @@ meta_parse_options (int *argc, char ***argv,
       N_("Turn compositing off"),
       NULL
     },
+    {
+      "no-force-fullscreen", 0, COMPOSITE_OPTS_FLAGS, G_OPTION_ARG_NONE,
+      &my_args.no_force_fullscreen,
+      N_("Don't make fullscreen windows that are maximized and have no decorations"),
+      NULL
+    },
     {NULL}
   };
   GOptionContext *ctx;
@@ -584,6 +591,9 @@ main (int argc, char **argv)
   if (meta_args.composite || meta_args.no_composite)
     meta_prefs_set_compositing_manager (meta_args.composite);
 
+  if (meta_args.no_force_fullscreen)
+    meta_prefs_set_force_fullscreen (FALSE);
+
   if (!meta_display_open ())
     meta_exit (META_EXIT_ERROR);
   
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 1f4fe41..6e41b3c 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -95,6 +95,7 @@ static char *cursor_theme = NULL;
 static int   cursor_size = 24;
 static gboolean compositing_manager = FALSE;
 static gboolean resize_with_right_button = FALSE;
+static gboolean force_fullscreen = TRUE;
 
 static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
 static MetaButtonLayout button_layout;
@@ -1751,6 +1752,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_RESIZE_WITH_RIGHT_BUTTON:
       return "RESIZE_WITH_RIGHT_BUTTON";
+
+    case META_PREF_FORCE_FULLSCREEN:
+      return "FORCE_FULLSCREEN";
     }
 
   return "(unknown)";
@@ -2737,6 +2741,12 @@ meta_prefs_get_mouse_button_menu (void)
   return resize_with_right_button ? 2: 3;
 }
 
+gboolean
+meta_prefs_get_force_fullscreen (void)
+{
+  return force_fullscreen;
+}
+
 void
 meta_prefs_set_compositing_manager (gboolean whether)
 {
@@ -2797,3 +2807,10 @@ init_button_layout(void)
 };
 
 #endif
+
+void
+meta_prefs_set_force_fullscreen (gboolean whether)
+{
+  force_fullscreen = whether;
+}
+
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 2f1ce8e..a4193ff 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -59,7 +59,8 @@ typedef enum
   META_PREF_CURSOR_THEME,
   META_PREF_CURSOR_SIZE,
   META_PREF_COMPOSITING_MANAGER,
-  META_PREF_RESIZE_WITH_RIGHT_BUTTON
+  META_PREF_RESIZE_WITH_RIGHT_BUTTON,
+  META_PREF_FORCE_FULLSCREEN
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -114,6 +115,7 @@ void        meta_prefs_change_workspace_name (int         i,
 const char* meta_prefs_get_cursor_theme      (void);
 int         meta_prefs_get_cursor_size       (void);
 gboolean    meta_prefs_get_compositing_manager (void);
+gboolean    meta_prefs_get_force_fullscreen  (void);
 
 /**
  * Sets whether the compositor is turned on.
@@ -122,6 +124,8 @@ gboolean    meta_prefs_get_compositing_manager (void);
  */
 void meta_prefs_set_compositing_manager (gboolean whether);
 
+void meta_prefs_set_force_fullscreen (gboolean whether);
+
 /* XXX FIXME This should be x-macroed, but isn't yet because it would be
  * difficult (or perhaps impossible) to add the suffixes using the current
  * system.  It needs some more thought, perhaps after the current system
--
cgit v0.8.2


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- metacity.spec	28 Aug 2009 15:24:52 -0000	1.200
+++ metacity.spec	2 Sep 2009 20:20:52 -0000	1.201
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -16,6 +16,8 @@ Patch7: 0001-bell-increase-bell-rate-lim
 Patch8: 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=593358
 Patch9: 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=516225
+Patch10: metacity-option-to-force-fullscreen.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -81,6 +83,7 @@ API. This package exists purely for tech
 %patch7 -p1 -b .bell
 %patch8 -p1 -b .sound-cache
 %patch9 -p1 -b .tooltip
+%patch10 -p1 -b .force-fullscreen
 
 # force regeneration
 rm src/metacity.schemas
@@ -188,6 +191,10 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Sep  2 2009 Peter Robinson <pbrobinson at gmail.com> - 2.27.0-9
+- Add upstreamed patch for option to force fullscreen for sugar
+- https://bugzilla.redhat.com/show_bug.cgi?id=516225
+
 * Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> - 2.27.0-8
 - Actually apply the patch from -7
 



From than at fedoraproject.org  Wed Sep  2 20:21:23 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 20:21:23 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.155,1.156
Message-ID: <20090902202123.754ED11C0094@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31546

Modified Files:
	kdemultimedia.spec 
Log Message:
fix source



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdemultimedia.spec	28 Aug 2009 14:38:53 -0000	1.155
+++ kdemultimedia.spec	2 Sep 2009 20:21:23 -0000	1.156
@@ -8,7 +8,7 @@ Group:   Applications/Multimedia
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
 License: GPLv2+
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch



From pingou at fedoraproject.org  Wed Sep  2 20:35:05 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:35:05 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/devel
	R-BSgenome.Celegans.UCSC.ce2.spec, NONE, 1.1
Message-ID: <20090902203505.32A8811C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4482

Added Files:
	R-BSgenome.Celegans.UCSC.ce2.spec 
Log Message:
Add spec


--- NEW FILE R-BSgenome.Celegans.UCSC.ce2.spec ---
%global packname  BSgenome.Celegans.UCSC.ce2 
%global bioc      2.4

Name:             R-%{packname}
Version:          1.3.13 
Release:          3%{?dist}
Summary:          Caenorhabditis elegans genome (UCSC Release ce2)
Summary(fr):      Genome de Caenorhabditis elegans (UCSC Release ce2)

Group:            Applications/Engineering 
License:          Artistic 2.0
URL:              http://www.bioconductor.org/packages/%{bioc}/data/annotation/html/%{packname}.html
Source0:          http://www.bioconductor.org/packages/%{bioc}/data/annotation/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

Requires:         R R-BSgenome
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R-BSgenome

%description
Caenorhabditis elegans genome grabbed from UCSC (ce2, Mar. 2004)
and stored in Biostrings objects

%description -l fr
Genome de Caenorhabditis elegans extrait par UCSC (ce2, Mar. 2004)
et stock? dans un objet Biostrings
%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_datadir}/R/library/R.css

%check
#this section refered to Biostrings which refer to this package
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%{_datadir}/R/library/%{packname}/CONTENTS
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/extdata
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/R-ex

#noarch
%dir %{_datadir}/R/library/%{packname}
%doc %{_datadir}/R/library/%{packname}/latex
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/man


%changelog
* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-2
- Re-add the dist tag cf https://fedorahosted.org/rel-eng/ticket/2152

* Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-2
- Increase release tag

* Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-1
- Update license tag
- Use global instead of define
- Update the R and BR (add R-BSgenome)
- Finally update the package

* Sat Jan 05 2008 Pingou <pingoufc4 at yahoo.fr> 1.2.0-5
- Remove the distro specific build of this package

* Fri Nov 23 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-4
- Correction on the dependancies

* Thu Sep 20 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-3
- Changes in the requires

* Wed Aug 29 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-2
-Change the license tag

* Mon Jul 16 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-1
- initial package for Fedora



From awjb at fedoraproject.org  Wed Sep  2 20:36:03 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Wed,  2 Sep 2009 20:36:03 +0000 (UTC)
Subject: rpms/wine/F-10 .cvsignore, 1.77, 1.78 sources, 1.78, 1.79 wine.spec,
	1.106, 1.107
Message-ID: <20090902203603.63B5B11C0094@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4713/F-10

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade
- disable f10 x86_64 build (gcc is to old)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	31 Aug 2009 15:46:23 -0000	1.77
+++ .cvsignore	2 Sep 2009 20:36:03 -0000	1.78
@@ -1 +1 @@
-wine-1.1.28-fe.tar.bz2
+wine-1.1.29-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	31 Aug 2009 15:46:23 -0000	1.78
+++ sources	2 Sep 2009 20:36:03 -0000	1.79
@@ -1 +1 @@
-6342c41f46d0571efae685c17aa5550f  wine-1.1.28-fe.tar.bz2
+3782b65da7db94460b93961356715403  wine-1.1.29-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/wine.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- wine.spec	31 Aug 2009 15:46:23 -0000	1.106
+++ wine.spec	2 Sep 2009 20:36:03 -0000	1.107
@@ -1,6 +1,6 @@
-%define no64bit 0
+%define no64bit 1
 Name:		wine
-Version:	1.1.28
+Version:	1.1.29
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -523,6 +523,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winver.exe.so
 %{_libdir}/wine/wordpad.exe.so
 %{_libdir}/wine/write.exe.so
+%{_libdir}/wine/dxdiag.exe.so
 
 %ifarch %{ix86}
 %{_bindir}/wine-preloader
@@ -727,6 +728,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
 %{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledb32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr32.dll.so
@@ -1023,6 +1025,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Wed Sep 02 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-1
+- version upgrade
+
 * Mon Aug 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.28-1
 - version upgrade



From awjb at fedoraproject.org  Wed Sep  2 20:36:03 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Wed,  2 Sep 2009 20:36:03 +0000 (UTC)
Subject: rpms/wine/F-11 .cvsignore, 1.78, 1.79 sources, 1.79, 1.80 wine.spec,
	1.110, 1.111
Message-ID: <20090902203603.9F66B11C0094@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4713/F-11

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade
- disable f10 x86_64 build (gcc is to old)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	31 Aug 2009 15:37:06 -0000	1.78
+++ .cvsignore	2 Sep 2009 20:36:03 -0000	1.79
@@ -1 +1 @@
-wine-1.1.28-fe.tar.bz2
+wine-1.1.29-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	31 Aug 2009 15:37:06 -0000	1.79
+++ sources	2 Sep 2009 20:36:03 -0000	1.80
@@ -1 +1 @@
-6342c41f46d0571efae685c17aa5550f  wine-1.1.28-fe.tar.bz2
+3782b65da7db94460b93961356715403  wine-1.1.29-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- wine.spec	31 Aug 2009 15:37:06 -0000	1.110
+++ wine.spec	2 Sep 2009 20:36:03 -0000	1.111
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.28
+Version:	1.1.29
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -523,6 +523,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winver.exe.so
 %{_libdir}/wine/wordpad.exe.so
 %{_libdir}/wine/write.exe.so
+%{_libdir}/wine/dxdiag.exe.so
 
 %ifarch %{ix86}
 %{_bindir}/wine-preloader
@@ -727,6 +728,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
 %{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledb32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr32.dll.so
@@ -1023,6 +1025,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Wed Sep 02 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-1
+- version upgrade
+
 * Mon Aug 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.28-1
 - version upgrade



From awjb at fedoraproject.org  Wed Sep  2 20:36:04 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Wed,  2 Sep 2009 20:36:04 +0000 (UTC)
Subject: rpms/wine/devel .cvsignore, 1.78, 1.79 sources, 1.79, 1.80 wine.spec,
	1.111, 1.112
Message-ID: <20090902203604.1625B11C0094@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4713/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade
- disable f10 x86_64 build (gcc is to old)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	30 Aug 2009 21:27:13 -0000	1.78
+++ .cvsignore	2 Sep 2009 20:36:03 -0000	1.79
@@ -1 +1 @@
-wine-1.1.28-fe.tar.bz2
+wine-1.1.29-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	30 Aug 2009 21:27:13 -0000	1.79
+++ sources	2 Sep 2009 20:36:03 -0000	1.80
@@ -1 +1 @@
-6342c41f46d0571efae685c17aa5550f  wine-1.1.28-fe.tar.bz2
+3782b65da7db94460b93961356715403  wine-1.1.29-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- wine.spec	30 Aug 2009 21:27:13 -0000	1.111
+++ wine.spec	2 Sep 2009 20:36:03 -0000	1.112
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.28
+Version:	1.1.29
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -523,6 +523,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winver.exe.so
 %{_libdir}/wine/wordpad.exe.so
 %{_libdir}/wine/write.exe.so
+%{_libdir}/wine/dxdiag.exe.so
 
 %ifarch %{ix86}
 %{_bindir}/wine-preloader
@@ -727,6 +728,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
 %{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledb32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr32.dll.so
@@ -1023,6 +1025,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Wed Sep 02 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-1
+- version upgrade
+
 * Mon Aug 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.28-1
 - version upgrade



From pingou at fedoraproject.org  Wed Sep  2 20:36:15 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:36:15 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/devel
	R-BSgenome.Celegans.UCSC.ce2.spec, 1.1, 1.2
Message-ID: <20090902203615.B2BE311C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5292

Modified Files:
	R-BSgenome.Celegans.UCSC.ce2.spec 
Log Message:
Increase release


Index: R-BSgenome.Celegans.UCSC.ce2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/devel/R-BSgenome.Celegans.UCSC.ce2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- R-BSgenome.Celegans.UCSC.ce2.spec	2 Sep 2009 20:35:05 -0000	1.1
+++ R-BSgenome.Celegans.UCSC.ce2.spec	2 Sep 2009 20:36:15 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:             R-%{packname}
 Version:          1.3.13 
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Caenorhabditis elegans genome (UCSC Release ce2)
 Summary(fr):      Genome de Caenorhabditis elegans (UCSC Release ce2)
 
@@ -74,7 +74,10 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-2
+* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-4
+- Increase release tag
+
+* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-3
 - Re-add the dist tag cf https://fedorahosted.org/rel-eng/ticket/2152
 
 * Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-2



From pingou at fedoraproject.org  Wed Sep  2 20:37:02 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:37:02 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/F-11
	R-BSgenome.Celegans.UCSC.ce2.spec, NONE, 1.1
Message-ID: <20090902203702.B623311C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5928

Added Files:
	R-BSgenome.Celegans.UCSC.ce2.spec 
Log Message:
Add file + Increase release


--- NEW FILE R-BSgenome.Celegans.UCSC.ce2.spec ---
%global packname  BSgenome.Celegans.UCSC.ce2 
%global bioc      2.4

Name:             R-%{packname}
Version:          1.3.13 
Release:          4%{?dist}
Summary:          Caenorhabditis elegans genome (UCSC Release ce2)
Summary(fr):      Genome de Caenorhabditis elegans (UCSC Release ce2)

Group:            Applications/Engineering 
License:          Artistic 2.0
URL:              http://www.bioconductor.org/packages/%{bioc}/data/annotation/html/%{packname}.html
Source0:          http://www.bioconductor.org/packages/%{bioc}/data/annotation/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

Requires:         R R-BSgenome
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R-BSgenome

%description
Caenorhabditis elegans genome grabbed from UCSC (ce2, Mar. 2004)
and stored in Biostrings objects

%description -l fr
Genome de Caenorhabditis elegans extrait par UCSC (ce2, Mar. 2004)
et stock? dans un objet Biostrings
%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_datadir}/R/library/R.css

%check
#this section refered to Biostrings which refer to this package
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%{_datadir}/R/library/%{packname}/CONTENTS
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/extdata
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/R-ex

#noarch
%dir %{_datadir}/R/library/%{packname}
%doc %{_datadir}/R/library/%{packname}/latex
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/man


%changelog
* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-4
- Increase release tag

* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-3
- Re-add the dist tag cf https://fedorahosted.org/rel-eng/ticket/2152

* Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-2
- Increase release tag

* Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-1
- Update license tag
- Use global instead of define
- Update the R and BR (add R-BSgenome)
- Finally update the package

* Sat Jan 05 2008 Pingou <pingoufc4 at yahoo.fr> 1.2.0-5
- Remove the distro specific build of this package

* Fri Nov 23 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-4
- Correction on the dependancies

* Thu Sep 20 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-3
- Changes in the requires

* Wed Aug 29 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-2
-Change the license tag

* Mon Jul 16 2007 Pingou <pingoufc4 at yahoo.fr> 1.2.0-1
- initial package for Fedora



From pingou at fedoraproject.org  Wed Sep  2 20:39:06 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  2 Sep 2009 20:39:06 +0000 (UTC)
Subject: rpms/R-BSgenome.Celegans.UCSC.ce2/F-10
	R-BSgenome.Celegans.UCSC.ce2.spec, 1.3, 1.4
Message-ID: <20090902203906.A1DF411C0094@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7612

Modified Files:
	R-BSgenome.Celegans.UCSC.ce2.spec 
Log Message:
Increase release


Index: R-BSgenome.Celegans.UCSC.ce2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BSgenome.Celegans.UCSC.ce2/F-10/R-BSgenome.Celegans.UCSC.ce2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-BSgenome.Celegans.UCSC.ce2.spec	2 Sep 2009 20:14:59 -0000	1.3
+++ R-BSgenome.Celegans.UCSC.ce2.spec	2 Sep 2009 20:39:06 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:             R-%{packname}
 Version:          1.3.13 
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Caenorhabditis elegans genome (UCSC Release ce2)
 Summary(fr):      Genome de Caenorhabditis elegans (UCSC Release ce2)
 
@@ -74,7 +74,10 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-2
+* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-4
+- Increase release tag
+
+* Wed Sep 02 2009 pingou <pingou at pingoured.fr> 1.3.13-3
 - Re-add the dist tag cf https://fedorahosted.org/rel-eng/ticket/2152
 
 * Fri Jul 31 2009 pingou <pingou at pingoured.fr> 1.3.13-2



From scop at fedoraproject.org  Wed Sep  2 20:43:28 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed,  2 Sep 2009 20:43:28 +0000 (UTC)
Subject: rpms/gkrellm-volume/devel gkrellm-volume.spec,1.15,1.16
Message-ID: <20090902204328.5150511C0094@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-volume/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9421

Modified Files:
	gkrellm-volume.spec 
Log Message:
* Wed Sep  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-11
- Filter out autoprovided volume.so (if %filter_setup is available).



Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-volume/devel/gkrellm-volume.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gkrellm-volume.spec	25 Jul 2009 19:40:06 -0000	1.15
+++ gkrellm-volume.spec	2 Sep 2009 20:43:28 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
@@ -19,6 +19,10 @@ BuildRequires:  gettext
 BuildRequires:  alsa-lib-devel
 Requires:       gkrellm%{?_isa} >= 2.0
 
+%{?filter_setup:
+%filter_provides_in %{plugdir}
+%filter_setup}
+
 %description
 GKrellM plugin for controlling mixer devices.
 
@@ -56,7 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jul 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-10
+* Wed Sep  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-11
+- Filter out autoprovided volume.so (if %%filter_setup is available).
+
+* Sat Jul 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-10
 - Make dependency on gkrellm ISA qualified.
 - Use %%global instead of %%define.
 
@@ -66,37 +73,37 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.13-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-7
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-7
 - Fix URL.
 
-* Tue Sep  4 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-6
+* Tue Sep  4 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-6
 - Convert docs to UTF-8.
 
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-5
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-5
 - License: GPLv2+
 
-* Wed Aug 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-4
+* Wed Aug 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-4
 - Rebuild.
 
-* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-3
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1.13-3
 - Rebuild, cosmetics.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.13-2
 - rebuilt
 
-* Sat Sep 11 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.13-0.fdr.1
+* Sat Sep 11 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.13-0.fdr.1
 - Update to 2.1.13.
 - Patch to show correct version and honor $RPM_OPT_FLAGS.
 
-* Mon Jun  7 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.11-0.fdr.1
+* Mon Jun  7 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.11-0.fdr.1
 - Update to 2.1.11.
 - Enable ALSA support.
 
-* Sun Sep  7 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1
+* Sun Sep  7 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1
 - Update to 2.1.9.
 
-* Fri Jun 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.8-0.fdr.1
+* Fri Jun 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.8-0.fdr.1
 - Update to 2.1.8.
 
-* Sat Apr 12 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.7-0.fdr.1
+* Sat Apr 12 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.7-0.fdr.1
 - First release.



From notting at fedoraproject.org  Wed Sep  2 21:38:28 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  2 Sep 2009 21:38:28 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.167, 1.168 initscripts.spec,
	1.197, 1.198 sources, 1.186, 1.187
Message-ID: <20090902213828.2919A11C0094@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22922

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.98-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- .cvsignore	10 Aug 2009 21:13:34 -0000	1.167
+++ .cvsignore	2 Sep 2009 21:38:27 -0000	1.168
@@ -1 +1 @@
-initscripts-8.97.tar.bz2
+initscripts-8.98.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- initscripts.spec	10 Aug 2009 21:13:34 -0000	1.197
+++ initscripts.spec	2 Sep 2009 21:38:27 -0000	1.198
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.97
+Version: 8.98
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -15,7 +15,7 @@ Requires: /sbin/sysctl, syslog
 Requires: /sbin/fuser, /bin/grep
 Requires: /sbin/pidof, /sbin/blkid
 Requires: module-init-tools
-Requires: util-linux >= 2.10s-11, mount >= 2.11l
+Requires: util-linux-ng >= 2.16, mount >= 2.11l
 Requires: bash >= 3.0
 %if with_upstart
 Requires: upstart
@@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuse
 Requires: udev >= 125-1
 Requires: popt >= 1.12-2
 Requires: cpio
-Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3
+Conflicts: mkinitrd < 4.0, kernel < 2.6.31, mdadm < 2.6.4-3
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
@@ -251,6 +251,18 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Wed Sep  2 2009 Bill Nottingham <notting at redhat.com> - 8.98-1
+- sysconfig.txt: doucment DHCP_HOSTNAME (#498052)
+- 88-clock.rules: Use --systz instead of --hctosys. (#517886, #489494)
+- Support rwtab and state passed from dracut initrd (#515771, <wtogami at redhat.com>)
+- restore context of *tmp files (#519748)
+- halt: don't try and save mixer settings if it's not writable. (#515771)
+- rwtab: add /var/spool, /var/lib/dbus, others (#494973, #515771)
+- sysconfig.txt: clarify docs (#518614)
+- rc.sysinit: don't pretend /selinux is configurable (#518164)
+- assorted ipv6 redundant code deletion
+- translation updates: bn, ca, d, es, fi, fr, gu, hi, it, ja, ko, ml, nb, nl, pl, pt, pt_BR, ru, sr, ta, zh_CN, zh_TW
+
 * Mon Aug 10 2009 Bill Nottingham <notting at redhat.com> - 8.97-1
 - ipcalc: fix IPv6 address checking (#516319)
 - ifup-aliases: fix syntax error from earlier cleanups. (#515612, <jik at kamens.brookline.ma.us>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- sources	10 Aug 2009 21:13:34 -0000	1.186
+++ sources	2 Sep 2009 21:38:27 -0000	1.187
@@ -1 +1 @@
-24b32543443055f6e1374496bfda5187  initscripts-8.97.tar.bz2
+bc4ed1f39917bab795140bfaeccae18c  initscripts-8.98.tar.bz2



From than at fedoraproject.org  Wed Sep  2 21:45:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Sep 2009 21:45:39 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.236,1.237
Message-ID: <20090902214540.152BE11C0094@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24155

Modified Files:
	kdebindings.spec 
Log Message:
disable falcon temporary, there's api change in Falcon-9.0.x that causes the build failture
i will fix it later



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- kdebindings.spec	2 Sep 2009 11:21:33 -0000	1.236
+++ kdebindings.spec	2 Sep 2009 21:45:39 -0000	1.237
@@ -8,11 +8,13 @@
 %define csharp 1
 %endif
 %endif
-%define falcon 1
+%if 0%{?fedora}
+%define falcon 0
 %define php 1
 %define ruby 1
 %define smoke 1
 %define java 0
+%endif
 
 %define pykde4_akonadi 1
 %define pyqt4_version 4.5.2



From ajax at fedoraproject.org  Wed Sep  2 21:54:31 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Sep 2009 21:54:31 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel uevent.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.24, 1.25
Message-ID: <20090902215431.CE34711C0094@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27047

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	uevent.patch 
Log Message:
* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com> 2.8.0-9
- uevent.patch: Catch uevents for output hotplug, rescan when they happen,
  and send RANDR events for any changes.


uevent.patch:
 Makefile.am   |    2 -
 i830.h        |    5 +++
 i830_driver.c |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 1 deletion(-)

--- NEW FILE uevent.patch ---
diff -up xf86-video-intel-20090812/src/i830_driver.c.uevent xf86-video-intel-20090812/src/i830_driver.c
--- xf86-video-intel-20090812/src/i830_driver.c.uevent	2009-09-01 15:41:32.803946753 -0400
+++ xf86-video-intel-20090812/src/i830_driver.c	2009-09-01 15:41:32.836946701 -0400
@@ -84,6 +84,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "i915_drm.h"
 #include <xf86drmMode.h>
 
+#include "libudev.h"
+
 #define BIT(x) (1 << (x))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define NB_OF(x) (sizeof (x) / sizeof (*x))
@@ -2526,6 +2528,80 @@ i830_disable_render_standby(ScrnInfoPtr 
    }
 }
 
+static void
+I830HandleUEvents(int fd, void *closure)
+{
+    ScrnInfoPtr pScrn = closure;
+    I830Ptr pI830 = I830PTR(pScrn);
+    struct udev_device *dev;
+
+    dev = udev_monitor_receive_device(pI830->uevent_monitor);
+    if (!dev)
+	return;
+
+    /*
+     * technically we should inspect the event to see that it's a hotplug.
+     * but we know it's a hotplug, we don't get events for anything else.
+     * XXX but we should definitely trim by drm node
+     */
+
+    RRGetInfo(screenInfo.screens[pScrn->scrnIndex], TRUE);
+
+    udev_device_unref(dev);
+}
+
+static void
+I830UeventInit(ScrnInfoPtr pScrn)
+{
+    I830Ptr pI830 = I830PTR(pScrn);
+    struct udev *u;
+    struct udev_monitor *mon;
+
+    u = udev_new();
+    if (!u)
+	return;
+
+    mon = udev_monitor_new_from_netlink(u, "udev");
+
+    if (!mon) {
+	udev_unref(u);
+	return;
+    }
+
+    if (udev_monitor_filter_add_match_subsystem_devtype(mon,
+							"drm",
+							"drm_minor") < 0 ||
+	udev_monitor_enable_receiving(mon) < 0)
+    {
+	udev_monitor_unref(mon);
+	udev_unref(u);
+	return;
+    }
+
+    pI830->uevent_handler =
+	xf86AddGeneralHandler(udev_monitor_get_fd(mon),
+			      I830HandleUEvents,
+			      pScrn);
+
+    pI830->uevent_monitor = mon;
+}
+
+static void
+I830UeventFini(ScrnInfoPtr pScrn)
+{
+    I830Ptr pI830 = I830PTR(pScrn);
+
+    if (pI830->uevent_handler)
+    {
+	struct udev *u = udev_monitor_get_udev(pI830->uevent_monitor);
+
+	xf86RemoveGeneralHandler(pI830->uevent_handler);
+
+	udev_monitor_unref(pI830->uevent_monitor);
+	udev_unref(u);
+    }
+}
+
 static Bool
 I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 {
@@ -2834,6 +2910,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
    pI830->closing = FALSE;
    pI830->suspended = FALSE;
 
+   I830UeventInit(pScrn);
+
    return TRUE;
 }
 
@@ -3093,6 +3171,8 @@ I830CloseScreen(int scrnIndex, ScreenPtr
 
    pI830->closing = TRUE;
 
+   I830UeventFini(pScrn);
+
    if (pScrn->vtSema == TRUE) {
       I830LeaveVT(scrnIndex, 0);
    }
--- xf86-video-intel-20090812/src/i830.h.uevent	2009-09-01 15:41:32.825975679 -0400
+++ xf86-video-intel-20090812/src/i830.h	2009-09-01 15:41:32.838947026 -0400
@@ -47,6 +47,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #ifndef _I830_H_
 #define _I830_H_
 
+#include "libudev.h"
+
 #include "xf86_OSproc.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
@@ -618,6 +620,9 @@ typedef struct _I830Rec {
     /** User option to print acceleration fallback info to the server log. */
    Bool fallback_debug;
    struct sdvo_device_mapping sdvo_mappings[2];
+
+   struct udev_monitor *uevent_monitor;
+   InputHandlerProc uevent_handler;
 } I830Rec;
 
 #define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
--- xf86-video-intel-20090812/src/Makefile.am.uevent	2009-08-11 14:50:03.000000000 -0400
+++ xf86-video-intel-20090812/src/Makefile.am	2009-09-01 15:44:06.552076300 -0400
@@ -32,7 +32,7 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
+intel_drv_la_LIBADD = -ludev -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
 intel_drv_la_LIBADD += @PCIACCESS_LIBS@
 
 INTEL_DRI_SRCS = \


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-intel.spec	20 Aug 2009 21:23:04 -0000	1.24
+++ xorg-x11-drv-intel.spec	2 Sep 2009 21:54:31 -0000	1.25
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,6 +31,7 @@ Patch21: intel-2.8.0-lvds-first.patch
 Patch40: dri2-page-flip.patch
 
 Patch50: intel-2.8.0-shadow-no-offset.patch
+Patch60: uevent.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -83,6 +84,7 @@ Debugging tools for Intel graphics chips
 %patch21 -p1 -b .lvds-first
 %patch40 -p1 -b .flip
 %patch50 -p1 -b .shadow-no-offset
+%patch60 -p1 -b .uevent
 
 %build
  
@@ -138,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com> 2.8.0-9
+- uevent.patch: Catch uevents for output hotplug, rescan when they happen,
+  and send RANDR events for any changes.
+
 * Thu Aug 20 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-8
 - Don't use fb offset when using shadow fbs.
 



From dwheeler at fedoraproject.org  Wed Sep  2 21:54:27 2009
From: dwheeler at fedoraproject.org (David A. Wheeler)
Date: Wed,  2 Sep 2009 21:54:27 +0000 (UTC)
Subject: rpms/auto-destdir/devel auto-destdir.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902215427.CFD4D11C0094@cvs1.fedora.phx.redhat.com>

Author: dwheeler

Update of /cvs/pkgs/rpms/auto-destdir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26725/devel

Modified Files:
	.cvsignore sources 
Added Files:
	auto-destdir.spec import.log 
Log Message:

* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
- Test suite improvements: More tests, runs on Cygwin.
- Simplified .spec file.



--- NEW FILE auto-destdir.spec ---
Name:		auto-destdir
Version:	1.10
Release:	1%{?dist}
Summary:	Automate DESTDIR support for "make install"

Group:		Development/Tools
License:	MIT
URL:		http://www.dwheeler.com/auto-destdir
Source0:	http://www.dwheeler.com/auto-destdir/auto-destdir-%{version}.tgz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch

%description
Auto-DESTDIR is a set of programs for POSIX/Unix/Linux systems that helps
automate program installation from source code.  It can be useful for
creating native packages (e.g., RPM or deb), or for installing programs
from source code to be managed by tools like GNU stow.

The Auto-DESTDIR tools (run-redir and make-redir) redirect file installations
so that the installed files are placed inside the the $DESTDIR directory,
even if the provided makefile doesn't support the DESTDIR convention.

%prep
%setup -q


%build
%configure --scriptdir="%{_libexecdir}/%{name}"
make


%install
rm -rf "%{buildroot}"
make DESTDIR="%{buildroot}" install
chmod a-x %{buildroot}/%{_mandir}/man1/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libexecdir}/%{name}/
%doc %{_mandir}/man1/*
%doc README COPYING

%changelog
* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
- Test suite improvements: More tests, runs on Cygwin.
- Simplified .spec file.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.7-1
- Shortened description
- Moved scripts to libexecdir.
- Fixed missing '$' in run-redir
- See https://bugzilla.redhat.com/show_bug.cgi?id=518766 for more info.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.6-1
- New version 1.6.
- Significantly improved test suite, with a few found and fixed bugs
- Refactored code

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.5-1
- New version 1.5.
- Fix ./configure so error messages report the problem
  correctly and handle empty values correctly.
- Remove debug-disabler in RPM .spec file.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.4-2
- Switch from ./configure to %%configure

* Sat Aug 22 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.4-1
- Change so run-redir isn't modified in place. Simplifies Debian packaging.

* Fri Aug 21 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.3-1
- Added wrapper for "mv"

* Mon Aug 12 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.1-1
- Modified to better comply with GNU coding standards

* Mon Feb 16 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.0-1
- Initial version. Wraps install, mkdir, cp, ln.



--- NEW FILE import.log ---
auto-destdir-1_10-1_fc11:HEAD:auto-destdir-1.10-1.fc11.src.rpm:1251928469


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 15:52:27 -0000	1.1
+++ .cvsignore	2 Sep 2009 21:54:27 -0000	1.2
@@ -0,0 +1 @@
+auto-destdir-1.10.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 15:52:27 -0000	1.1
+++ sources	2 Sep 2009 21:54:27 -0000	1.2
@@ -0,0 +1 @@
+e78d909dd0dcc5a594726f5efd3dee7e  auto-destdir-1.10.tgz



From deji at fedoraproject.org  Wed Sep  2 21:55:14 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  2 Sep 2009 21:55:14 +0000 (UTC)
Subject: rpms/mpich2/EL-5 .cvsignore, 1.4, 1.5 mpich2.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090902215514.B8F1F11C0094@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27311

Modified Files:
	.cvsignore mpich2.spec sources 
Log Message:
* Wed Sep 02 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
- Update to 1.1.1p1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jul 2009 13:36:42 -0000	1.4
+++ .cvsignore	2 Sep 2009 21:55:14 -0000	1.5
@@ -1 +1 @@
-mpich2-1.1.1.tar.gz
+mpich2-1.1.1p1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/mpich2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mpich2.spec	23 Jul 2009 14:08:41 -0000	1.7
+++ mpich2.spec	2 Sep 2009 21:55:14 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1.1
+Version:	1.1.1p1
 Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
@@ -292,6 +292,9 @@ fi
 %{_mandir}/man4/*.gz
 
 %changelog
+* Wed Sep 02 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
+- Update to 1.1.1p1
+
 * Wed Jul 22 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1-1
 - Update to 1.1.1
 - Remove (and obsolete) the -libs subpackage, it is not necessary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jul 2009 13:36:42 -0000	1.4
+++ sources	2 Sep 2009 21:55:14 -0000	1.5
@@ -1 +1 @@
-01bffc9233411495c973d52c8ee15bf9  mpich2-1.1.1.tar.gz
+cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz



From dwheeler at fedoraproject.org  Wed Sep  2 21:56:18 2009
From: dwheeler at fedoraproject.org (David A. Wheeler)
Date: Wed,  2 Sep 2009 21:56:18 +0000 (UTC)
Subject: rpms/auto-destdir/F-11 auto-destdir.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902215618.5F90811C0094@cvs1.fedora.phx.redhat.com>

Author: dwheeler

Update of /cvs/pkgs/rpms/auto-destdir/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27935/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	auto-destdir.spec import.log 
Log Message:

* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
- Test suite improvements: More tests, runs on Cygwin.
- Simplified .spec file.



--- NEW FILE auto-destdir.spec ---
Name:		auto-destdir
Version:	1.10
Release:	1%{?dist}
Summary:	Automate DESTDIR support for "make install"

Group:		Development/Tools
License:	MIT
URL:		http://www.dwheeler.com/auto-destdir
Source0:	http://www.dwheeler.com/auto-destdir/auto-destdir-%{version}.tgz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch

%description
Auto-DESTDIR is a set of programs for POSIX/Unix/Linux systems that helps
automate program installation from source code.  It can be useful for
creating native packages (e.g., RPM or deb), or for installing programs
from source code to be managed by tools like GNU stow.

The Auto-DESTDIR tools (run-redir and make-redir) redirect file installations
so that the installed files are placed inside the the $DESTDIR directory,
even if the provided makefile doesn't support the DESTDIR convention.

%prep
%setup -q


%build
%configure --scriptdir="%{_libexecdir}/%{name}"
make


%install
rm -rf "%{buildroot}"
make DESTDIR="%{buildroot}" install
chmod a-x %{buildroot}/%{_mandir}/man1/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libexecdir}/%{name}/
%doc %{_mandir}/man1/*
%doc README COPYING

%changelog
* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
- Test suite improvements: More tests, runs on Cygwin.
- Simplified .spec file.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.7-1
- Shortened description
- Moved scripts to libexecdir.
- Fixed missing '$' in run-redir
- See https://bugzilla.redhat.com/show_bug.cgi?id=518766 for more info.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.6-1
- New version 1.6.
- Significantly improved test suite, with a few found and fixed bugs
- Refactored code

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.5-1
- New version 1.5.
- Fix ./configure so error messages report the problem
  correctly and handle empty values correctly.
- Remove debug-disabler in RPM .spec file.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.4-2
- Switch from ./configure to %%configure

* Sat Aug 22 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.4-1
- Change so run-redir isn't modified in place. Simplifies Debian packaging.

* Fri Aug 21 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.3-1
- Added wrapper for "mv"

* Mon Aug 12 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.1-1
- Modified to better comply with GNU coding standards

* Mon Feb 16 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.0-1
- Initial version. Wraps install, mkdir, cp, ln.



--- NEW FILE import.log ---
auto-destdir-1_10-1_fc11:F-11:auto-destdir-1.10-1.fc11.src.rpm:1251928629


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 15:52:27 -0000	1.1
+++ .cvsignore	2 Sep 2009 21:56:18 -0000	1.2
@@ -0,0 +1 @@
+auto-destdir-1.10.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 15:52:27 -0000	1.1
+++ sources	2 Sep 2009 21:56:18 -0000	1.2
@@ -0,0 +1 @@
+e78d909dd0dcc5a594726f5efd3dee7e  auto-destdir-1.10.tgz



From dwheeler at fedoraproject.org  Wed Sep  2 21:57:14 2009
From: dwheeler at fedoraproject.org (David A. Wheeler)
Date: Wed,  2 Sep 2009 21:57:14 +0000 (UTC)
Subject: rpms/auto-destdir/F-10 auto-destdir.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090902215714.8FE6311C0094@cvs1.fedora.phx.redhat.com>

Author: dwheeler

Update of /cvs/pkgs/rpms/auto-destdir/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28892/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	auto-destdir.spec import.log 
Log Message:

* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
- Test suite improvements: More tests, runs on Cygwin.
- Simplified .spec file.



--- NEW FILE auto-destdir.spec ---
Name:		auto-destdir
Version:	1.10
Release:	1%{?dist}
Summary:	Automate DESTDIR support for "make install"

Group:		Development/Tools
License:	MIT
URL:		http://www.dwheeler.com/auto-destdir
Source0:	http://www.dwheeler.com/auto-destdir/auto-destdir-%{version}.tgz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch

%description
Auto-DESTDIR is a set of programs for POSIX/Unix/Linux systems that helps
automate program installation from source code.  It can be useful for
creating native packages (e.g., RPM or deb), or for installing programs
from source code to be managed by tools like GNU stow.

The Auto-DESTDIR tools (run-redir and make-redir) redirect file installations
so that the installed files are placed inside the the $DESTDIR directory,
even if the provided makefile doesn't support the DESTDIR convention.

%prep
%setup -q


%build
%configure --scriptdir="%{_libexecdir}/%{name}"
make


%install
rm -rf "%{buildroot}"
make DESTDIR="%{buildroot}" install
chmod a-x %{buildroot}/%{_mandir}/man1/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libexecdir}/%{name}/
%doc %{_mandir}/man1/*
%doc README COPYING

%changelog
* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
- Test suite improvements: More tests, runs on Cygwin.
- Simplified .spec file.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.7-1
- Shortened description
- Moved scripts to libexecdir.
- Fixed missing '$' in run-redir
- See https://bugzilla.redhat.com/show_bug.cgi?id=518766 for more info.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.6-1
- New version 1.6.
- Significantly improved test suite, with a few found and fixed bugs
- Refactored code

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.5-1
- New version 1.5.
- Fix ./configure so error messages report the problem
  correctly and handle empty values correctly.
- Remove debug-disabler in RPM .spec file.

* Sun Aug 23 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.4-2
- Switch from ./configure to %%configure

* Sat Aug 22 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.4-1
- Change so run-redir isn't modified in place. Simplifies Debian packaging.

* Fri Aug 21 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.3-1
- Added wrapper for "mv"

* Mon Aug 12 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.1-1
- Modified to better comply with GNU coding standards

* Mon Feb 16 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.0-1
- Initial version. Wraps install, mkdir, cp, ln.



--- NEW FILE import.log ---
auto-destdir-1_10-1_fc11:F-10:auto-destdir-1.10-1.fc11.src.rpm:1251928694


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 15:52:27 -0000	1.1
+++ .cvsignore	2 Sep 2009 21:57:14 -0000	1.2
@@ -0,0 +1 @@
+auto-destdir-1.10.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 15:52:27 -0000	1.1
+++ sources	2 Sep 2009 21:57:14 -0000	1.2
@@ -0,0 +1 @@
+e78d909dd0dcc5a594726f5efd3dee7e  auto-destdir-1.10.tgz



From ajax at fedoraproject.org  Wed Sep  2 22:01:02 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Sep 2009 22:01:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec,1.25,1.26
Message-ID: <20090902220102.2FBCF11C0094@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31612

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
uh, i can buildreq, i promise


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-intel.spec	2 Sep 2009 21:54:31 -0000	1.25
+++ xorg-x11-drv-intel.spec	2 Sep 2009 22:01:01 -0000	1.26
@@ -41,6 +41,7 @@ BuildRequires: libXvMC-devel
 BuildRequires: mesa-libGL-devel >= 6.5-9
 BuildRequires: libdrm-devel >= 2.4.6
 BuildRequires: kernel-headers
+BuildRequires: libudev-devel
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1



From rvinyard at fedoraproject.org  Wed Sep  2 22:08:08 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  2 Sep 2009 22:08:08 +0000 (UTC)
Subject: rpms/clipsmm/F-11 clipsmm.spec,1.6,1.7
Message-ID: <20090902220808.58B6611C0094@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/clipsmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1129

Modified Files:
	clipsmm.spec 
Log Message:



Index: clipsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-11/clipsmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- clipsmm.spec	4 Aug 2009 19:32:18 -0000	1.6
+++ clipsmm.spec	2 Sep 2009 22:08:08 -0000	1.7
@@ -2,7 +2,7 @@
 Summary:          C++ interface to the CLIPS expert system C library
 Name:             clipsmm
 Version:          0.1.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3
 URL:              http://clipsmm.sourceforge.net
 Group:            System Environment/Libraries
@@ -114,6 +114,9 @@ find %{buildroot} -type f -name "*.la" -
 
 
 %changelog
+* Wed Sep  2 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-2
+- Bump release to rebuild against newer clips
+
 * Mon Jul 27 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-1
 - New release
 



From rvinyard at fedoraproject.org  Wed Sep  2 22:08:20 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  2 Sep 2009 22:08:20 +0000 (UTC)
Subject: rpms/clipsmm/devel clipsmm.spec,1.7,1.8
Message-ID: <20090902220820.0B3D211C0094@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/clipsmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1205

Modified Files:
	clipsmm.spec 
Log Message:



Index: clipsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/devel/clipsmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- clipsmm.spec	4 Aug 2009 19:32:09 -0000	1.7
+++ clipsmm.spec	2 Sep 2009 22:08:19 -0000	1.8
@@ -2,7 +2,7 @@
 Summary:          C++ interface to the CLIPS expert system C library
 Name:             clipsmm
 Version:          0.1.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3
 URL:              http://clipsmm.sourceforge.net
 Group:            System Environment/Libraries
@@ -114,6 +114,9 @@ find %{buildroot} -type f -name "*.la" -
 
 
 %changelog
+* Wed Sep  2 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-2
+- Bump release to rebuild against newer clips
+
 * Mon Jul 27 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-1
 - New release
 



From lennart at fedoraproject.org  Wed Sep  2 23:24:21 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  2 Sep 2009 23:24:21 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.40, 1.41 pulseaudio.spec, 1.96, 
	1.97 sources, 1.43, 1.44
Message-ID: <20090902232421.36D7011C0094@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20130

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
New test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	24 Aug 2009 02:13:02 -0000	1.40
+++ .cvsignore	2 Sep 2009 23:24:18 -0000	1.41
@@ -1 +1 @@
-pulseaudio-0.9.16-test6.tar.gz
+pulseaudio-0.9.16-test7.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- pulseaudio.spec	27 Aug 2009 07:53:59 -0000	1.96
+++ pulseaudio.spec	2 Sep 2009 23:24:19 -0000	1.97
@@ -1,10 +1,10 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        11.test6%{?dist}
+Release:        12.test7%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
-Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz
 Source1:        default.pa-for-gdm
 URL:            http://pulseaudio.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -198,7 +198,7 @@ Requires(pre):  gdm
 This package contains GDM integration hooks for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.16-test6
+%setup -q -T -b0 -n pulseaudio-0.9.16-test7
 
 %build
 %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access --disable-hal
@@ -281,6 +281,7 @@ exit 0
 %{_libdir}/pulse-%{version}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{version}/modules/module-cli.so
 %{_libdir}/pulse-%{version}/modules/module-combine.so
+%{_libdir}/pulse-%{version}/modules/module-loopback.so
 %{_libdir}/pulse-%{version}/modules/module-esound-compat-spawnfd.so
 %{_libdir}/pulse-%{version}/modules/module-esound-compat-spawnpid.so
 %{_libdir}/pulse-%{version}/modules/module-esound-protocol-tcp.so
@@ -433,7 +434,10 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
-* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-11.test5
+* Thu Sep 3 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-12.test7
+- New test release
+
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-11.test6
 - rebuilt with new openssl
 
 * Mon Aug 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-10.test6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	24 Aug 2009 15:17:55 -0000	1.43
+++ sources	2 Sep 2009 23:24:19 -0000	1.44
@@ -1 +1 @@
-a2f5c6c43e67ee77acb8d46bbf4838f2  pulseaudio-0.9.16-test6.tar.gz
+c9347d3b84eebcd02658020dfe4c28e4  pulseaudio-0.9.16-test7.tar.gz



From transif at fedoraproject.org  Wed Sep  2 23:48:33 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  2 Sep 2009 23:48:33 +0000 (UTC)
Subject: comps/po zh_CN.po,1.25,1.26
Message-ID: <20090902234833.DA20911C0094@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30327/po

Modified Files:
	zh_CN.po 
Log Message:
Sending translation for Chinese (Simplified)


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.25 -r 1.26 zh_CN.poIndex: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- zh_CN.po	17 Aug 2009 06:01:44 -0000	1.25
+++ zh_CN.po	2 Sep 2009 23:48:33 -0000	1.26
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-08-17 16:01+1000\n"
+"POT-Creation-Date: 2009-09-02 02:23+0000\n"
+"PO-Revision-Date: 2009-09-03 09:47+1000\n"
 "Last-Translator: Leah Liu <lliu at redhat.com>\n"
 "Language-Team: Simplified Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,279 +24,300 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "??????????????????????"
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "? Ruby ??????????"
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "????????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1812 lines suppressed...]
 msgstr "???????"
 
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
+#: ../comps-f13.xml.in.h:175
 msgid "Sanskrit Support"
 msgstr "????"
 
-#: ../comps-f11.xml.in.h:165
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "??????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ????"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
 msgstr "??? Fedora ?? 32 ????????????????????????"
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?????? CAML ?????????????"
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "?????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "????????,??,???????????."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "??????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "? GNOME ????????????????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "??? Fedora spin ????????????????????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "? Fedora ??????????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????????"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "?????GNOME?"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?????? S11 ????????????????????????????????????"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "??????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ??????/???/?????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1403,7 +1572,7 @@ msgstr ""
 "GNOME ???????????????????????????????????"
 "????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1411,17 +1580,17 @@ msgstr ""
 "KDE ????????????????????????????????????"
 "????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr "????????????????????????????? Emacs ? Vi?"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ?????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1429,27 +1598,27 @@ msgstr ""
 "?????????? DocBook ????????????? HTML? PDF?"
 "Postscript ??????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????"
 



From lennart at fedoraproject.org  Wed Sep  2 23:53:01 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  2 Sep 2009 23:53:01 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.97,1.98 sources,1.44,1.45
Message-ID: <20090902235301.64EBA11C0094@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1777

Modified Files:
	pulseaudio.spec sources 
Log Message:
Fix build for ppc


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- pulseaudio.spec	2 Sep 2009 23:24:19 -0000	1.97
+++ pulseaudio.spec	2 Sep 2009 23:53:01 -0000	1.98
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        12.test7%{?dist}
+Release:        13.test7%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz
@@ -434,6 +434,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Thu Sep 3 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-13.test7
+- Fix build for ppc
+
 * Thu Sep 3 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-12.test7
 - New test release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	2 Sep 2009 23:24:19 -0000	1.44
+++ sources	2 Sep 2009 23:53:01 -0000	1.45
@@ -1 +1 @@
-c9347d3b84eebcd02658020dfe4c28e4  pulseaudio-0.9.16-test7.tar.gz
+56080993180c89d7f2e3c3358cc09b90  pulseaudio-0.9.16-test7.tar.gz



From mycae at fedoraproject.org  Wed Sep  2 23:53:30 2009
From: mycae at fedoraproject.org (mycae)
Date: Wed,  2 Sep 2009 23:53:30 +0000 (UTC)
Subject: rpms/cpptasks/F-10 cpptasks.spec,1.1,1.2
Message-ID: <20090902235330.B5C6811C0094@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2091

Modified Files:
	cpptasks.spec 
Log Message:
*fix BR and dep



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/cpptasks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpptasks.spec	29 Aug 2009 03:48:13 -0000	1.1
+++ cpptasks.spec	2 Sep 2009 23:53:30 -0000	1.2
@@ -15,7 +15,7 @@ BuildRequires:	ant 
 BuildRequires:	ant-junit 
 BuildRequires:	jpackage-utils 
 BuildRequires:	junit
-BuildRequires:	maven2
+#BuildRequires:	mave
 
 Requires:	ant 
 Requires:	java
@@ -34,7 +34,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}-%{version}-%{release}
+Requires:	%{name}>=%{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -128,7 +128,12 @@ rm -rf $RPM_BUILD_ROOT
 
 # -----------------------------------------------------------------------------
 
+- Fix doc installation 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
+- Remove excess BR
+- Fix subpackage dep
+
 * Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
 - Fix doc installation 
 - Move to _javadir/ant/ rather than _javadir/



From mycae at fedoraproject.org  Wed Sep  2 23:54:12 2009
From: mycae at fedoraproject.org (mycae)
Date: Wed,  2 Sep 2009 23:54:12 +0000 (UTC)
Subject: rpms/cpptasks/F-10 cpptasks.spec,1.2,1.3
Message-ID: <20090902235412.ED7EE11C0094@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2449

Modified Files:
	cpptasks.spec 
Log Message:
Bump revision number



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/cpptasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cpptasks.spec	2 Sep 2009 23:53:30 -0000	1.2
+++ cpptasks.spec	2 Sep 2009 23:54:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries



From spot at fedoraproject.org  Thu Sep  3 00:23:23 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 00:23:23 +0000 (UTC)
Subject: rpms/xsupplicant/devel XSupplicant-2.1.8-ppc-fix.patch, NONE,
	1.1 xsupplicant.spec, 1.44, 1.45
Message-ID: <20090903002323.7820911C0094@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xsupplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13112

Modified Files:
	xsupplicant.spec 
Added Files:
	XSupplicant-2.1.8-ppc-fix.patch 
Log Message:
fix ppc, not run tested

XSupplicant-2.1.8-ppc-fix.patch:
 sigsegv.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE XSupplicant-2.1.8-ppc-fix.patch ---
diff -up XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c.ppc XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c
--- XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c.ppc	2009-05-26 19:16:26.000000000 -0400
+++ XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c	2009-09-02 17:57:26.857041963 -0400
@@ -81,7 +81,21 @@ static void signal_segv(int signum, sigi
     // NGREG not defined on Mac OS X...
 #ifndef __APPLE__
     for(i = 0; i < NGREG; i++)
+#if defined(__linux__)
+        #if defined(__powerpc__)
+        #if defined(__powerpc64__)
+        fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.gp_regs[i]);
+        #else
+        fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.uc_regs->gregs[i]);
+        #endif
+        #else
+        /* This is a bit of a lie, ia64 is also special, but I don't care. */
         fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.gregs[i]);
+        #endif
+#else
+	/* This is probably not right for any OS besides Solaris x86. */
+	fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.gregs[i]);
+#endif
 #else
     fprintf(fh, "NGREG Not available on Mac OS X.\n");
 #endif


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xsupplicant.spec	2 Sep 2009 16:55:48 -0000	1.44
+++ xsupplicant.spec	3 Sep 2009 00:23:23 -0000	1.45
@@ -1,13 +1,14 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	2.1.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+ or BSD with advertising
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
 Source0:	http://download.sourceforge.net/open1x/XSupplicant-%{version}-src.tar.gz
 Source1:	XSupplicantUI.desktop
 Patch2:		xsupplicant-2.1.8-ui-Fedora.patch
+Patch3:		XSupplicant-2.1.8-ppc-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel
 BuildRequires:	openssl-devel, wireless-tools-devel
@@ -41,6 +42,8 @@ QT User Interface for XSupplicant.
 %setup -q -n XSupplicant-%{version}-src
 # Find UI files in a sane system location
 %patch2 -p1 -b .Fedora
+# Fix PPC (enough to get it building, not run-tested)
+%patch3 -p1 -b .ppc
 cd xsupplicant
 autoreconf -vfis
 
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-2
+- duct tape fix for ppc/ppc64, not run-tested
+
 * Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-1
 - update to 2.1.8
 



From cebbert at fedoraproject.org  Thu Sep  3 00:44:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  3 Sep 2009 00:44:23 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1761,1.1762
Message-ID: <20090903004423.E2EC111C0094@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17636

Modified Files:
	kernel.spec 
Log Message:
add version to changelog


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1761
retrieving revision 1.1762
diff -u -p -r1.1761 -r1.1762
--- kernel.spec	2 Sep 2009 15:46:20 -0000	1.1761
+++ kernel.spec	3 Sep 2009 00:44:23 -0000	1.1762
@@ -2009,7 +2009,7 @@ fi
 # and build.
 
 %changelog
-* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com>
+* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com> 2.6.31-0.199.rc8.git2
 - drm-intel-pm.patch: Disable by default, too flickery on too many machines.
   Enable with i915.powersave=1.
 



From cchance at fedoraproject.org  Thu Sep  3 01:38:53 2009
From: cchance at fedoraproject.org (cchance)
Date: Thu,  3 Sep 2009 01:38:53 +0000 (UTC)
Subject: rpms/ibus-table/devel .cvsignore, 1.11, 1.12 ibus-table.spec, 1.24, 
	1.25 sources, 1.12, 1.13
Message-ID: <20090903013853.F2B7A11C0094@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5095

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Aug 2009 01:35:52 -0000	1.11
+++ .cvsignore	3 Sep 2009 01:38:53 -0000	1.12
@@ -1 +1,2 @@
 ibus-table-1.2.0.20090804.tar.gz
+ibus-table-1.2.0.20090902.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ibus-table.spec	2 Sep 2009 07:29:20 -0000	1.24
+++ ibus-table.spec	3 Sep 2009 01:38:53 -0000	1.25
@@ -1,6 +1,6 @@
 Name:       ibus-table
 Version:    1.2.0.20090902
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -122,6 +122,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Thu Sep 03 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090902-2.fc12
+- Rebuilt.
+
 * Wed Sep 02 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090902-1.fc12
 - Updated source.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Aug 2009 01:35:52 -0000	1.12
+++ sources	3 Sep 2009 01:38:53 -0000	1.13
@@ -1 +1,2 @@
 86efc5aa421eeffe26b4dd5718387738  ibus-table-1.2.0.20090804.tar.gz
+a87a42535c63fe89dc25c47cea658290  ibus-table-1.2.0.20090902.tar.gz



From mbarnes at fedoraproject.org  Thu Sep  3 02:31:29 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  3 Sep 2009 02:31:29 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.18,
	1.116.2.19 evolution.spec, 
	1.394.2.37, 1.394.2.38 sources, 1.116.2.22, 1.116.2.23
Message-ID: <20090903023129.91E9011C0094@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20601

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Wed Sep 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.2.fc12
- Snapshot of "kill-bonobo" branch at commit 74457fd.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.18
retrieving revision 1.116.2.19
diff -u -p -r1.116.2.18 -r1.116.2.19
--- .cvsignore	1 Sep 2009 19:06:40 -0000	1.116.2.18
+++ .cvsignore	3 Sep 2009 02:31:29 -0000	1.116.2.19
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-f945e64.tar.bz2
+evolution-2.29.1-kill-bonobo-74457fd.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.37
retrieving revision 1.394.2.38
diff -u -p -r1.394.2.37 -r1.394.2.38
--- evolution.spec	1 Sep 2009 23:56:59 -0000	1.394.2.37
+++ evolution.spec	3 Sep 2009 02:31:29 -0000	1.394.2.38
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash f945e64
+%define hash 74457fd
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.1%{?dist}
+Release: 1.kb.2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -680,7 +680,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
-* Mon Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
+* Wed Sep 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.2.fc12
+- Snapshot of "kill-bonobo" branch at commit 74457fd.
+
+* Tue Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
 - Snapshot of "kill-bonobo" branch at commit f945e64.
 - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
   compatibility with Fedora 12.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.22
retrieving revision 1.116.2.23
diff -u -p -r1.116.2.22 -r1.116.2.23
--- sources	1 Sep 2009 19:06:40 -0000	1.116.2.22
+++ sources	3 Sep 2009 02:31:29 -0000	1.116.2.23
@@ -1 +1 @@
-658fce6142a8c152cde3054c1086a849  evolution-2.29.1-kill-bonobo-f945e64.tar.bz2
+430d4e5ead977fa1e270a106a70caaf2  evolution-2.29.1-kill-bonobo-74457fd.tar.bz2



From dcantrel at fedoraproject.org  Thu Sep  3 02:33:31 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  3 Sep 2009 02:33:31 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.662, 1.663 anaconda.spec, 1.812, 
	1.813 sources, 1.796, 1.797
Message-ID: <20090903023331.282D111C0094@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21242

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep 02 2009 David Cantrell <dcantrell at redhat.com> - 12.20-1
- Rename mostlyclean-glade to mostlyclean-liveinst. (dcantrell)
- Handle rootPath referencing a chroot value or actual path (#519665)
  (dcantrell)
- We convert cmdline args to longs in several places, so reduce to a
  function. (clumens)
- Support rootpath overrides in fsset.rootDevice (#519665) (dcantrell)
- Pass anaconda.rootPath to FSSet() (dcantrell)
- Include ui, liveinst, and lang-table strings in po updates (#515411)
  (dcantrell)
- Add some silent make support for sed, mkctype, and other commands.
  (dcantrell)
- Recheck if a partition should be ignored after getting its disk (#518971)
  (hdegoede)
- Fix traceback when editing a pre-existing logical volume (hdegoede)
- Do not traceback on an usb cardreader with no card present (hdegoede)
- Don't identify multi lun usb card readers as multipath (#517603) (hdegoede)
- Device class does not have a format member (hdegoede)
- Device class does not have a path member (hdegoede)
- Simplify language.py to two basic settings, and a lot of support
  (#517569). (clumens)
- clobber is a method of PartedDevice not PartedDisk (hdegoede)
- Remove unused fsFromConfig method (hdegoede)
- allocatePartitions: PartitionCount is a member of PartedDisk not
  DiskDevice (hdegoede)
- New version. (clumens)
- Fix storage/__init__.py:1857: non-keyword arg after keyword arg (hdegoede)
- Remove a bunch of unnecessary semicolons (hdegoede)
- pylint does not like )
- Fix 55:udev_resolve_devspec: Using possibly undefined loop variable 'dev'
  (hdegoede)
- MDRaidArrayDevice.totalDevices is a read only property so don't write it
  (hdegoede)
- storage/__init__.py:471:Storage.exceptionDisks: Undefined variable 'udev'
  (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -p -r1.662 -r1.663
--- .cvsignore	1 Sep 2009 17:13:39 -0000	1.662
+++ .cvsignore	3 Sep 2009 02:33:30 -0000	1.663
@@ -1,2 +1 @@
-anaconda-12.18.tar.bz2
-anaconda-12.19.tar.bz2
+anaconda-12.20.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -p -r1.812 -r1.813
--- anaconda.spec	1 Sep 2009 17:13:39 -0000	1.812
+++ anaconda.spec	3 Sep 2009 02:33:30 -0000	1.813
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.19
+Version: 12.20
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -210,6 +210,42 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Sep 02 2009 David Cantrell <dcantrell at redhat.com> - 12.20-1
+- Rename mostlyclean-glade to mostlyclean-liveinst. (dcantrell)
+- Handle rootPath referencing a chroot value or actual path (#519665)
+  (dcantrell)
+- We convert cmdline args to longs in several places, so reduce to a
+  function. (clumens)
+- Support rootpath overrides in fsset.rootDevice (#519665) (dcantrell)
+- Pass anaconda.rootPath to FSSet() (dcantrell)
+- Include ui, liveinst, and lang-table strings in po updates (#515411)
+  (dcantrell)
+- Add some silent make support for sed, mkctype, and other commands.
+  (dcantrell)
+- Recheck if a partition should be ignored after getting its disk (#518971)
+  (hdegoede)
+- Fix traceback when editing a pre-existing logical volume (hdegoede)
+- Do not traceback on an usb cardreader with no card present (hdegoede)
+- Don't identify multi lun usb card readers as multipath (#517603) (hdegoede)
+- Device class does not have a format member (hdegoede)
+- Device class does not have a path member (hdegoede)
+- Simplify language.py to two basic settings, and a lot of support
+  (#517569). (clumens)
+- clobber is a method of PartedDevice not PartedDisk (hdegoede)
+- Remove unused fsFromConfig method (hdegoede)
+- allocatePartitions: PartitionCount is a member of PartedDisk not
+  DiskDevice (hdegoede)
+- New version. (clumens)
+- Fix storage/__init__.py:1857: non-keyword arg after keyword arg (hdegoede)
+- Remove a bunch of unnecessary semicolons (hdegoede)
+- pylint does not like )
+- Fix 55:udev_resolve_devspec: Using possibly undefined loop variable 'dev'
+  (hdegoede)
+- MDRaidArrayDevice.totalDevices is a read only property so don't write it
+  (hdegoede)
+- storage/__init__.py:471:Storage.exceptionDisks: Undefined variable 'udev'
+  (hdegoede)
+
 * Tue Sep 01 2009 Chris Lumens <clumens at redhat.com> - 12.19-1
 - NetworkManager changed *again*, use libnm-glib.pc now. (dcantrell)
 - Save duplicates from /etc/fstab and don't traceback (#517498). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -p -r1.796 -r1.797
--- sources	1 Sep 2009 17:13:39 -0000	1.796
+++ sources	3 Sep 2009 02:33:30 -0000	1.797
@@ -1 +1 @@
-c5596213b8fe5f0d29784450b029e97a  anaconda-12.19.tar.bz2
+f117ebba1cc50fe6b3ccc1f37c619e27  anaconda-12.20.tar.bz2



From mbarnes at fedoraproject.org  Thu Sep  3 03:08:22 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  3 Sep 2009 03:08:22 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.38,1.394.2.39
Message-ID: <20090903030822.87AD211C0094@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30765

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix file list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.38
retrieving revision 1.394.2.39
diff -u -p -r1.394.2.38 -r1.394.2.39
--- evolution.spec	3 Sep 2009 02:31:29 -0000	1.394.2.38
+++ evolution.spec	3 Sep 2009 03:08:20 -0000	1.394.2.39
@@ -592,9 +592,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-prefer-plain.eplug
 %{evo_plugin_dir}/liborg-gnome-prefer-plain.so
 
-#%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
-#%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
-#%{evo_plugin_dir}/org-gnome-publish-calendar.xml
+%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 
 #%{evo_plugin_dir}/org-gnome-save-calendar.eplug
 #%{evo_plugin_dir}/liborg-gnome-save-calendar.so



From whot at fedoraproject.org  Thu Sep  3 03:11:21 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  3 Sep 2009 03:11:21 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.72, 1.73 commitid, 1.35,
	1.36 sources, 1.67, 1.68 xorg-x11-server.spec, 1.481, 1.482
Message-ID: <20090903031121.9244F11C0094@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv708

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Log Message:
* Thu Sep 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-45.20090903
- Today's git snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	1 Sep 2009 06:22:47 -0000	1.72
+++ .cvsignore	3 Sep 2009 03:11:21 -0000	1.73
@@ -1 +1 @@
-xorg-server-20090901.tar.xz
+xorg-server-20090903.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- commitid	1 Sep 2009 06:22:47 -0000	1.35
+++ commitid	3 Sep 2009 03:11:21 -0000	1.36
@@ -1 +1 @@
-a8e634b86d47353ef354717904fa66ebe35e1303
+84eb4c66a4a09c360cef260fb2f35dfb6d8a93c6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	1 Sep 2009 06:22:47 -0000	1.67
+++ sources	3 Sep 2009 03:11:21 -0000	1.68
@@ -1 +1 @@
-941c731970321668b88a8af0805fccfb  xorg-server-20090901.tar.xz
+d1e78cc3b2455b9d307bf52c10db2e0d  xorg-server-20090903.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -p -r1.481 -r1.482
--- xorg-x11-server.spec	1 Sep 2009 06:22:47 -0000	1.481
+++ xorg-x11-server.spec	3 Sep 2009 03:11:21 -0000	1.482
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090901
+%define gitdate 20090903
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   44.%{gitdate}%{?dist}
+Release:   45.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -504,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Sep 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-45.20090903
+- Today's git snapshot.
+
 * Tue Sep 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-44.20090901
 - Today's git snapshot (incl. vga-arbitration).
 - dri2-page-flip.patch: rebase.



From mclasen at fedoraproject.org  Thu Sep  3 03:13:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Sep 2009 03:13:45 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.9,1.10
Message-ID: <20090903031345.EC1CE11C0094@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29743

Modified Files:
	polkit-gnome.spec 
Log Message:
remove onlyshowin



Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- polkit-gnome.spec	29 Aug 2009 17:43:38 -0000	1.9
+++ polkit-gnome.spec	3 Sep 2009 03:13:45 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.94
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -53,7 +53,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 desktop-file-install --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                      \
-  --add-only-show-in KDE \
+  --remove-only-show-in GNOME \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 
 %find_lang polkit-gnome-1
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.94-4
+- Just remove the OnlyShowIn, it turns out everybody wants this
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.94-3
 - Require a new enough polkit (#517479)
 



From chitlesh at fedoraproject.org  Thu Sep  3 05:12:50 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 05:12:50 +0000 (UTC)
Subject: rpms/alliance/F-10 .cvsignore, 1.4, 1.5 alliance.spec, 1.21,
	1.22 import.log, 1.3, 1.4 sources, 1.4, 1.5 alliance-env.patch,
	1.6, NONE alliance-examples-adm2901.patch, 1.1,
	NONE alliance-examples-mipsR3000.patch, 1.1,
	NONE alliance-examples.patch, 1.1, NONE alliance-perms.patch,
	1.1, NONE alliance-run.patch, 1.1,
	NONE alliance-tutorials-amd2901.patch, 1.1,
	NONE alliance-tutorials-place_n_route.patch, 1.1,
	NONE alliance-tutorials-simulation.patch, 1.1,
	NONE alliance-tutorials-start.patch, 1.1,
	NONE alliance-tutorials-synthesis.patch, 1.1,
	NONE alliance-xgra-xgrerror-ld.patch, 1.1,
	NONE alliance-xgra.patch, 1.1, NONE dreal.desktop, 1.4,
	NONE dreal.png, 1.1, NONE graal.desktop, 1.4, NONE graal.png,
	1.1, NONE xfsm.desktop, 1.4, NONE xfsm.png, 1.1,
	NONE xgra.desktop, 1.1, NONE xgra.png, 1.1, NONE xpat.desktop,
	1.4, NONE xpat.png, 1.1, NONE xsch.desktop, 1.4, NONE xsch.png,
	1.1, NONE xvpn.desktop, 1.4, NONE xvpn.png, 1.1, NONE
Message-ID: <20090903051250.EC9E711C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2699/F-10

Modified Files:
	.cvsignore alliance.spec import.log sources 
Removed Files:
	alliance-env.patch alliance-examples-adm2901.patch 
	alliance-examples-mipsR3000.patch alliance-examples.patch 
	alliance-perms.patch alliance-run.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	dreal.desktop dreal.png graal.desktop graal.png xfsm.desktop 
	xfsm.png xgra.desktop xgra.png xpat.desktop xpat.png 
	xsch.desktop xsch.png xvpn.desktop xvpn.png 
Log Message:
20090901snap: upstream merged most of our patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 10:26:09 -0000	1.4
+++ .cvsignore	3 Sep 2009 05:12:47 -0000	1.5
@@ -1 +1 @@
-alliance-5.0-20090827.tar.gz
+alliance-5.0-20090901.tar.gz


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/alliance.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- alliance.spec	28 Aug 2009 14:51:18 -0000	1.21
+++ alliance.spec	3 Sep 2009 05:12:48 -0000	1.22
@@ -1,10 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20090827
+%define        snapshot  20090901
 %define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       30.%{snapshot}snap%{?dist}
+Release:       31.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -13,51 +13,16 @@ Group:         Applications/Engineering
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
-Patch0:        alliance-env.patch
-Patch1:        alliance-run.patch
-Patch2:        alliance-perms.patch
-
-# Improving autogeneration of documentation
-Patch3:        alliance-tutorials-place_n_route.patch
-Patch4:        alliance-tutorials-simulation.patch
-Patch5:        alliance-tutorials-start.patch
-Patch6:        alliance-tutorials-synthesis.patch
-Patch7:        alliance-tutorials-amd2901.patch
-
-# Improving examples
-Patch8:        alliance-examples.patch
-Patch9:        alliance-examples-adm2901.patch
-Patch10:       alliance-examples-mipsR3000.patch
-
-# upstream enhancements
-Patch11:       alliance-xgra.patch
-
-# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
-Patch12:       alliance-xgra-xgrerror-ld.patch
-
-Source1:       xsch.desktop
-Source2:       dreal.desktop
-Source3:       xpat.desktop
-Source4:       xfsm.desktop
-Source5:       xvpn.desktop
-Source6:       graal.desktop
-Source7:       xgra.desktop
 
-Source8:       alliance.fedora
+Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source9:       graal.png
-Source10:      dreal.png
-Source11:      xvpn.png
-Source12:      xfsm.png
-Source13:      xpat.png
-Source14:      xsch.png
-Source15:      xgra.png
-
-Source16:      alliance-tutorials-go-all.sh
-Source17:      alliance-tutorials-go-all-clean.sh
-Source18:      alliance-examples-go-all.sh
-Source19:      alliance-examples-go-all-clean.sh
+# included asfrom snapshot 20090901
+
+Source2:       alliance-tutorials-go-all.sh
+Source3:       alliance-tutorials-go-all-clean.sh
+Source4:       alliance-examples-go-all.sh
+Source5:       alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
@@ -72,7 +37,7 @@ BuildRequires: lesstif-devel
 %endif
 
 Requires:      xorg-x11-fonts-misc
-# 442379
+# RHBZ 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
@@ -137,31 +102,17 @@ Documentation and tutorials for the Alli
 %setup -q
 %{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
-sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%{__cp} -p %{SOURCE1} .
+sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop
 
 # removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
 
-%patch11 -p1 -b .xgra-makefile.am
-%patch12 -p0 -b .xgra-long
-
-
-%patch0 -p0 -b .env
-%patch1 -p0 -b .run
-%patch2 -p0 -b .perms
-
-
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
 sed -i "s|documentation/tutorials/Makefile||" configure*
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .doc
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .doc
-%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -175,8 +126,8 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE16} go-all.sh
-    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    %{__install} -pm 755 %{SOURCE2} go-all.sh
+    %{__install} -pm 755 %{SOURCE3} go-all-clean.sh
     # Fedora Electronic Lab self test for alliance
     #./go-all.sh 2>&1 | tee self-test-tutorials.log
     # clean temporary files
@@ -184,10 +135,6 @@ pushd documentation/tutorials
 popd
 # ------------------------------------------------------------------------------
 
-%patch8  -p0 -b .examples
-%patch9  -p1 -b .examples
-%patch10 -p1 -b .examples
-
 # fixing flex and bison update on rawhide
 sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
 sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
@@ -211,10 +158,14 @@ done
 sed -i 's/\r//' mipsR3000/asm/*
 popd
 
-# Fix xgra build 
-sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
-sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
-
+find documentation/tutorials/ \
+    -name *.vbe  -o \
+    -name *.pat  -o \
+    -name *.vhdl -o \
+    -name *.vst  -o \
+    -name *.c \
+    -exec chmod 0644 {} ';'
+    
 %build
 
 export ALLIANCE_TOP=%{prefix}
@@ -225,7 +176,7 @@ export ALLIANCE_TOP=%{prefix}
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
            --bindir=%{prefix}/bin         \
-           --mandir=%{_datadir}/%{name}/man         #252941
+           --mandir=%{_datadir}/%{name}/man         # RHBZ 252941
 
 # disabling rpath
 sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -244,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 pushd %{buildroot}%{_sysconfdir}/profile.d
   chmod 0644 alc_env.*
@@ -262,8 +212,8 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
 
 pushd alliance-examples/
     # FEL self test for alliance
@@ -277,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
+%{__cp} -p distrib/*.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
-for desktopfile in *.desktop; do
+for desktopfile in distrib/*.desktop; do
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -327,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/allianc
 %{_fixperms} %{buildroot}/*
 
 
+
 %post
 /sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
@@ -349,8 +300,8 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files
-%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %defattr(-,root,root,-)
+%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -381,6 +332,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Sep 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-31.20090901snap
+- updated to upstream's 20090901 snapshot
+- Removed all patches which are accepted by upstream
+
 * Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
 - updated to upstream's 20090828 snapshot
 - merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Aug 2009 10:26:09 -0000	1.3
+++ import.log	3 Sep 2009 05:12:48 -0000	1.4
@@ -1,3 +1,4 @@
 alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180
 alliance-5_0-24_20070718snap_fc10:F-10:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515871
 alliance-5_0-30_20090827snap_fc11:F-10:alliance-5.0-30.20090827snap.fc11.src.rpm:1251454888
+alliance-5_0-31_20090901snap_fc11:F-10:alliance-5.0-31.20090901snap.fc11.src.rpm:1251954526


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 10:26:09 -0000	1.4
+++ sources	3 Sep 2009 05:12:48 -0000	1.5
@@ -1 +1 @@
-8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz
+f3b692c4ea9e54c040280f660b3cf170  alliance-5.0-20090901.tar.gz


--- alliance-env.patch DELETED ---


--- alliance-examples-adm2901.patch DELETED ---


--- alliance-examples-mipsR3000.patch DELETED ---


--- alliance-examples.patch DELETED ---


--- alliance-perms.patch DELETED ---


--- alliance-run.patch DELETED ---


--- alliance-tutorials-amd2901.patch DELETED ---


--- alliance-tutorials-place_n_route.patch DELETED ---


--- alliance-tutorials-simulation.patch DELETED ---


--- alliance-tutorials-start.patch DELETED ---


--- alliance-tutorials-synthesis.patch DELETED ---


--- alliance-xgra-xgrerror-ld.patch DELETED ---


--- alliance-xgra.patch DELETED ---


--- dreal.desktop DELETED ---


--- graal.desktop DELETED ---


--- xfsm.desktop DELETED ---


--- xgra.desktop DELETED ---


--- xpat.desktop DELETED ---


--- xsch.desktop DELETED ---


--- xvpn.desktop DELETED ---



From chitlesh at fedoraproject.org  Thu Sep  3 05:18:38 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 05:18:38 +0000 (UTC)
Subject: rpms/alliance/F-11 .cvsignore, 1.4, 1.5 alliance.spec, 1.23,
	1.24 import.log, 1.4, 1.5 sources, 1.4, 1.5 alliance-env.patch,
	1.6, NONE alliance-examples-adm2901.patch, 1.1,
	NONE alliance-examples-mipsR3000.patch, 1.1,
	NONE alliance-examples.patch, 1.1, NONE alliance-perms.patch,
	1.1, NONE alliance-run.patch, 1.1,
	NONE alliance-tutorials-amd2901.patch, 1.1,
	NONE alliance-tutorials-place_n_route.patch, 1.1,
	NONE alliance-tutorials-simulation.patch, 1.1,
	NONE alliance-tutorials-start.patch, 1.1,
	NONE alliance-tutorials-synthesis.patch, 1.1,
	NONE alliance-xgra-xgrerror-ld.patch, 1.1,
	NONE alliance-xgra.patch, 1.1, NONE dreal.desktop, 1.4,
	NONE dreal.png, 1.1, NONE graal.desktop, 1.4, NONE graal.png,
	1.1, NONE xfsm.desktop, 1.4, NONE xfsm.png, 1.1,
	NONE xgra.desktop, 1.1, NONE xgra.png, 1.1, NONE xpat.desktop,
	1.4, NONE xpat.png, 1.1, NONE xsch.desktop, 1.4, NONE xsch.png,
	1.1, NONE xvpn.desktop, 1.4, NONE xvpn.png, 1.1, NONE
Message-ID: <20090903051838.B472311C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5769/F-11

Modified Files:
	.cvsignore alliance.spec import.log sources 
Removed Files:
	alliance-env.patch alliance-examples-adm2901.patch 
	alliance-examples-mipsR3000.patch alliance-examples.patch 
	alliance-perms.patch alliance-run.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	dreal.desktop dreal.png graal.desktop graal.png xfsm.desktop 
	xfsm.png xgra.desktop xgra.png xpat.desktop xpat.png 
	xsch.desktop xsch.png xvpn.desktop xvpn.png 
Log Message:
20090901snap: upstream merged most of our patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 10:31:48 -0000	1.4
+++ .cvsignore	3 Sep 2009 05:18:34 -0000	1.5
@@ -1 +1 @@
-alliance-5.0-20090827.tar.gz
+alliance-5.0-20090901.tar.gz


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/alliance.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- alliance.spec	28 Aug 2009 14:51:37 -0000	1.23
+++ alliance.spec	3 Sep 2009 05:18:35 -0000	1.24
@@ -1,10 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20090827
+%define        snapshot  20090901
 %define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       30.%{snapshot}snap%{?dist}
+Release:       31.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -13,51 +13,16 @@ Group:         Applications/Engineering
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
-Patch0:        alliance-env.patch
-Patch1:        alliance-run.patch
-Patch2:        alliance-perms.patch
-
-# Improving autogeneration of documentation
-Patch3:        alliance-tutorials-place_n_route.patch
-Patch4:        alliance-tutorials-simulation.patch
-Patch5:        alliance-tutorials-start.patch
-Patch6:        alliance-tutorials-synthesis.patch
-Patch7:        alliance-tutorials-amd2901.patch
-
-# Improving examples
-Patch8:        alliance-examples.patch
-Patch9:        alliance-examples-adm2901.patch
-Patch10:       alliance-examples-mipsR3000.patch
-
-# upstream enhancements
-Patch11:       alliance-xgra.patch
-
-# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
-Patch12:       alliance-xgra-xgrerror-ld.patch
-
-Source1:       xsch.desktop
-Source2:       dreal.desktop
-Source3:       xpat.desktop
-Source4:       xfsm.desktop
-Source5:       xvpn.desktop
-Source6:       graal.desktop
-Source7:       xgra.desktop
 
-Source8:       alliance.fedora
+Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source9:       graal.png
-Source10:      dreal.png
-Source11:      xvpn.png
-Source12:      xfsm.png
-Source13:      xpat.png
-Source14:      xsch.png
-Source15:      xgra.png
-
-Source16:      alliance-tutorials-go-all.sh
-Source17:      alliance-tutorials-go-all-clean.sh
-Source18:      alliance-examples-go-all.sh
-Source19:      alliance-examples-go-all-clean.sh
+# included asfrom snapshot 20090901
+
+Source2:       alliance-tutorials-go-all.sh
+Source3:       alliance-tutorials-go-all-clean.sh
+Source4:       alliance-examples-go-all.sh
+Source5:       alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
@@ -72,7 +37,7 @@ BuildRequires: lesstif-devel
 %endif
 
 Requires:      xorg-x11-fonts-misc
-# 442379
+# RHBZ 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
@@ -137,31 +102,17 @@ Documentation and tutorials for the Alli
 %setup -q
 %{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
-sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%{__cp} -p %{SOURCE1} .
+sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop
 
 # removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
 
-%patch11 -p1 -b .xgra-makefile.am
-%patch12 -p0 -b .xgra-long
-
-
-%patch0 -p0 -b .env
-%patch1 -p0 -b .run
-%patch2 -p0 -b .perms
-
-
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
 sed -i "s|documentation/tutorials/Makefile||" configure*
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .doc
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .doc
-%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -175,8 +126,8 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE16} go-all.sh
-    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    %{__install} -pm 755 %{SOURCE2} go-all.sh
+    %{__install} -pm 755 %{SOURCE3} go-all-clean.sh
     # Fedora Electronic Lab self test for alliance
     #./go-all.sh 2>&1 | tee self-test-tutorials.log
     # clean temporary files
@@ -184,10 +135,6 @@ pushd documentation/tutorials
 popd
 # ------------------------------------------------------------------------------
 
-%patch8  -p0 -b .examples
-%patch9  -p1 -b .examples
-%patch10 -p1 -b .examples
-
 # fixing flex and bison update on rawhide
 sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
 sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
@@ -211,10 +158,14 @@ done
 sed -i 's/\r//' mipsR3000/asm/*
 popd
 
-# Fix xgra build 
-sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
-sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
-
+find documentation/tutorials/ \
+    -name *.vbe  -o \
+    -name *.pat  -o \
+    -name *.vhdl -o \
+    -name *.vst  -o \
+    -name *.c \
+    -exec chmod 0644 {} ';'
+    
 %build
 
 export ALLIANCE_TOP=%{prefix}
@@ -225,7 +176,7 @@ export ALLIANCE_TOP=%{prefix}
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
            --bindir=%{prefix}/bin         \
-           --mandir=%{_datadir}/%{name}/man         #252941
+           --mandir=%{_datadir}/%{name}/man         # RHBZ 252941
 
 # disabling rpath
 sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -244,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 pushd %{buildroot}%{_sysconfdir}/profile.d
   chmod 0644 alc_env.*
@@ -262,8 +212,8 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
 
 pushd alliance-examples/
     # FEL self test for alliance
@@ -277,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
+%{__cp} -p distrib/*.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
-for desktopfile in *.desktop; do
+for desktopfile in distrib/*.desktop; do
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -327,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/allianc
 %{_fixperms} %{buildroot}/*
 
 
+
 %post
 /sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
@@ -349,8 +300,8 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files
-%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %defattr(-,root,root,-)
+%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -381,6 +332,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Sep 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-31.20090901snap
+- updated to upstream's 20090901 snapshot
+- Removed all patches which are accepted by upstream
+
 * Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
 - updated to upstream's 20090828 snapshot
 - merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	28 Aug 2009 10:31:49 -0000	1.4
+++ import.log	3 Sep 2009 05:18:36 -0000	1.5
@@ -2,3 +2,4 @@ alliance-5_0-21_20070718snap_fc9:HEAD:al
 alliance-5_0-24_20070718snap_fc10:HEAD:alliance-5.0-24.20070718snap.fc10.src.rpm:1233516213
 alliance-5_0-26_20070718snap_fc10:HEAD:alliance-5.0-26.20070718snap.fc10.src.rpm:1235508896
 alliance-5_0-30_20090827snap_fc11:F-11:alliance-5.0-30.20090827snap.fc11.src.rpm:1251455305
+alliance-5_0-31_20090901snap_fc11:F-11:alliance-5.0-31.20090901snap.fc11.src.rpm:1251954952


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 10:31:49 -0000	1.4
+++ sources	3 Sep 2009 05:18:36 -0000	1.5
@@ -1 +1 @@
-8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz
+f3b692c4ea9e54c040280f660b3cf170  alliance-5.0-20090901.tar.gz


--- alliance-env.patch DELETED ---


--- alliance-examples-adm2901.patch DELETED ---


--- alliance-examples-mipsR3000.patch DELETED ---


--- alliance-examples.patch DELETED ---


--- alliance-perms.patch DELETED ---


--- alliance-run.patch DELETED ---


--- alliance-tutorials-amd2901.patch DELETED ---


--- alliance-tutorials-place_n_route.patch DELETED ---


--- alliance-tutorials-simulation.patch DELETED ---


--- alliance-tutorials-start.patch DELETED ---


--- alliance-tutorials-synthesis.patch DELETED ---


--- alliance-xgra-xgrerror-ld.patch DELETED ---


--- alliance-xgra.patch DELETED ---


--- dreal.desktop DELETED ---


--- graal.desktop DELETED ---


--- xfsm.desktop DELETED ---


--- xgra.desktop DELETED ---


--- xpat.desktop DELETED ---


--- xsch.desktop DELETED ---


--- xvpn.desktop DELETED ---



From chitlesh at fedoraproject.org  Thu Sep  3 05:29:01 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 05:29:01 +0000 (UTC)
Subject: rpms/alliance/devel .cvsignore, 1.5, 1.6 alliance.spec, 1.26,
	1.27 import.log, 1.6, 1.7 sources, 1.5, 1.6 alliance-env.patch,
	1.6, NONE alliance-examples-adm2901.patch, 1.1,
	NONE alliance-examples-mipsR3000.patch, 1.1,
	NONE alliance-examples.patch, 1.1, NONE alliance-perms.patch,
	1.1, NONE alliance-run.patch, 1.1,
	NONE alliance-tutorials-amd2901.patch, 1.1,
	NONE alliance-tutorials-place_n_route.patch, 1.2,
	NONE alliance-tutorials-simulation.patch, 1.2,
	NONE alliance-tutorials-start.patch, 1.2,
	NONE alliance-tutorials-synthesis.patch, 1.2,
	NONE alliance-xgra-xgrerror-ld.patch, 1.1,
	NONE alliance-xgra.patch, 1.2, NONE dreal.desktop, 1.4,
	NONE dreal.png, 1.1, NONE graal.desktop, 1.4, NONE graal.png,
	1.1, NONE xfsm.desktop, 1.4, NONE xfsm.png, 1.1,
	NONE xgra.desktop, 1.1, NONE xgra.png, 1.1, NONE xpat.desktop,
	1.4, NONE xpat.png, 1.1, NONE xsch.desktop, 1.4, NONE xsch.png,
	1.1, NONE xvpn.desktop, 1.4, NONE xvpn.png, 1.1, NONE
Message-ID: <20090903052901.B595D11C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9053/devel

Modified Files:
	.cvsignore alliance.spec import.log sources 
Removed Files:
	alliance-env.patch alliance-examples-adm2901.patch 
	alliance-examples-mipsR3000.patch alliance-examples.patch 
	alliance-perms.patch alliance-run.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	dreal.desktop dreal.png graal.desktop graal.png xfsm.desktop 
	xfsm.png xgra.desktop xgra.png xpat.desktop xpat.png 
	xsch.desktop xsch.png xvpn.desktop xvpn.png 
Log Message:
20090901snap: upstream merged most of our patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Aug 2009 10:44:02 -0000	1.5
+++ .cvsignore	3 Sep 2009 05:29:00 -0000	1.6
@@ -1 +1 @@
-alliance-5.0-20090827.tar.gz
+alliance-5.0-20090901.tar.gz


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- alliance.spec	28 Aug 2009 14:32:35 -0000	1.26
+++ alliance.spec	3 Sep 2009 05:29:01 -0000	1.27
@@ -1,10 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20090827
+%define        snapshot  20090901
 %define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       30.%{snapshot}snap%{?dist}
+Release:       31.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -13,51 +13,16 @@ Group:         Applications/Engineering
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
-Patch0:        alliance-env.patch
-Patch1:        alliance-run.patch
-Patch2:        alliance-perms.patch
-
-# Improving autogeneration of documentation
-Patch3:        alliance-tutorials-place_n_route.patch
-Patch4:        alliance-tutorials-simulation.patch
-Patch5:        alliance-tutorials-start.patch
-Patch6:        alliance-tutorials-synthesis.patch
-Patch7:        alliance-tutorials-amd2901.patch
-
-# Improving examples
-Patch8:        alliance-examples.patch
-Patch9:        alliance-examples-adm2901.patch
-Patch10:       alliance-examples-mipsR3000.patch
-
-# upstream enhancements
-Patch11:       alliance-xgra.patch
-
-# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
-Patch12:       alliance-xgra-xgrerror-ld.patch
-
-Source1:       xsch.desktop
-Source2:       dreal.desktop
-Source3:       xpat.desktop
-Source4:       xfsm.desktop
-Source5:       xvpn.desktop
-Source6:       graal.desktop
-Source7:       xgra.desktop
 
-Source8:       alliance.fedora
+Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source9:       graal.png
-Source10:      dreal.png
-Source11:      xvpn.png
-Source12:      xfsm.png
-Source13:      xpat.png
-Source14:      xsch.png
-Source15:      xgra.png
-
-Source16:      alliance-tutorials-go-all.sh
-Source17:      alliance-tutorials-go-all-clean.sh
-Source18:      alliance-examples-go-all.sh
-Source19:      alliance-examples-go-all-clean.sh
+# included asfrom snapshot 20090901
+
+Source2:       alliance-tutorials-go-all.sh
+Source3:       alliance-tutorials-go-all-clean.sh
+Source4:       alliance-examples-go-all.sh
+Source5:       alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
@@ -72,7 +37,7 @@ BuildRequires: lesstif-devel
 %endif
 
 Requires:      xorg-x11-fonts-misc
-# 442379
+# RHBZ 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
@@ -137,31 +102,17 @@ Documentation and tutorials for the Alli
 %setup -q
 %{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
-sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%{__cp} -p %{SOURCE1} .
+sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop
 
 # removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
 
-%patch11 -p1 -b .xgra-makefile.am
-%patch12 -p0 -b .xgra-long
-
-
-%patch0 -p0 -b .env
-%patch1 -p0 -b .run
-%patch2 -p0 -b .perms
-
-
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
 sed -i "s|documentation/tutorials/Makefile||" configure*
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .doc
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .doc
-%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -175,8 +126,8 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE16} go-all.sh
-    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    %{__install} -pm 755 %{SOURCE2} go-all.sh
+    %{__install} -pm 755 %{SOURCE3} go-all-clean.sh
     # Fedora Electronic Lab self test for alliance
     #./go-all.sh 2>&1 | tee self-test-tutorials.log
     # clean temporary files
@@ -184,10 +135,6 @@ pushd documentation/tutorials
 popd
 # ------------------------------------------------------------------------------
 
-%patch8  -p0 -b .examples
-%patch9  -p1 -b .examples
-%patch10 -p1 -b .examples
-
 # fixing flex and bison update on rawhide
 sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
 sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
@@ -211,10 +158,14 @@ done
 sed -i 's/\r//' mipsR3000/asm/*
 popd
 
-# Fix xgra build 
-sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
-sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
-
+find documentation/tutorials/ \
+    -name *.vbe  -o \
+    -name *.pat  -o \
+    -name *.vhdl -o \
+    -name *.vst  -o \
+    -name *.c \
+    -exec chmod 0644 {} ';'
+    
 %build
 
 export ALLIANCE_TOP=%{prefix}
@@ -225,7 +176,7 @@ export ALLIANCE_TOP=%{prefix}
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
            --bindir=%{prefix}/bin         \
-           --mandir=%{_datadir}/%{name}/man         #252941
+           --mandir=%{_datadir}/%{name}/man         # RHBZ 252941
 
 # disabling rpath
 sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -244,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 pushd %{buildroot}%{_sysconfdir}/profile.d
   chmod 0644 alc_env.*
@@ -262,8 +212,8 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
 
 pushd alliance-examples/
     # FEL self test for alliance
@@ -277,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
+%{__cp} -p distrib/*.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
-for desktopfile in *.desktop; do
+for desktopfile in distrib/*.desktop; do
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -327,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/allianc
 %{_fixperms} %{buildroot}/*
 
 
+
 %post
 /sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
@@ -349,8 +300,8 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files
-%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %defattr(-,root,root,-)
+%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -381,6 +332,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Sep 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-31.20090901snap
+- updated to upstream's 20090901 snapshot
+- Removed all patches which are accepted by upstream
+
 * Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
 - updated to upstream's 20090828 snapshot
 - merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	28 Aug 2009 10:44:15 -0000	1.6
+++ import.log	3 Sep 2009 05:29:01 -0000	1.7
@@ -4,3 +4,4 @@ alliance-5_0-26_20070718snap_fc10:HEAD:a
 alliance-5_0-27_20070718snap_fc11:HEAD:alliance-5.0-27.20070718snap.fc11.src.rpm:1246707806
 alliance-5_0-28_20070718snap_fc11:HEAD:alliance-5.0-28.20070718snap.fc11.src.rpm:1247151445
 alliance-5_0-30_20090827snap_fc11:HEAD:alliance-5.0-30.20090827snap.fc11.src.rpm:1251456077
+alliance-5_0-31_20090901snap_fc11:HEAD:alliance-5.0-31.20090901snap.fc11.src.rpm:1251955356


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2009 10:44:16 -0000	1.5
+++ sources	3 Sep 2009 05:29:01 -0000	1.6
@@ -1 +1 @@
-8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz
+f3b692c4ea9e54c040280f660b3cf170  alliance-5.0-20090901.tar.gz


--- alliance-env.patch DELETED ---


--- alliance-examples-adm2901.patch DELETED ---


--- alliance-examples-mipsR3000.patch DELETED ---


--- alliance-examples.patch DELETED ---


--- alliance-perms.patch DELETED ---


--- alliance-run.patch DELETED ---


--- alliance-tutorials-amd2901.patch DELETED ---


--- alliance-tutorials-place_n_route.patch DELETED ---


--- alliance-tutorials-simulation.patch DELETED ---


--- alliance-tutorials-start.patch DELETED ---


--- alliance-tutorials-synthesis.patch DELETED ---


--- alliance-xgra-xgrerror-ld.patch DELETED ---


--- alliance-xgra.patch DELETED ---


--- dreal.desktop DELETED ---


--- graal.desktop DELETED ---


--- xfsm.desktop DELETED ---


--- xgra.desktop DELETED ---


--- xpat.desktop DELETED ---


--- xsch.desktop DELETED ---


--- xvpn.desktop DELETED ---



From chitlesh at fedoraproject.org  Thu Sep  3 05:36:56 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 05:36:56 +0000 (UTC)
Subject: rpms/alliance/EL-5 .cvsignore, 1.4, 1.5 alliance.spec, 1.5,
	1.6 import.log, 1.2, 1.3 sources, 1.4, 1.5 alliance-env.patch,
	1.3, NONE alliance-examples-adm2901.patch, 1.1,
	NONE alliance-examples-mipsR3000.patch, 1.1,
	NONE alliance-examples.patch, 1.1, NONE alliance-perms.patch,
	1.1, NONE alliance-run.patch, 1.1,
	NONE alliance-tutorials-amd2901.patch, 1.1,
	NONE alliance-tutorials-place_n_route.patch, 1.1,
	NONE alliance-tutorials-simulation.patch, 1.1,
	NONE alliance-tutorials-start.patch, 1.1,
	NONE alliance-tutorials-synthesis.patch, 1.1,
	NONE alliance-xgra-xgrerror-ld.patch, 1.1,
	NONE alliance-xgra.patch, 1.1, NONE dreal.desktop, 1.4,
	NONE dreal.png, 1.1, NONE graal.desktop, 1.4, NONE graal.png,
	1.1, NONE xfsm.desktop, 1.4, NONE xfsm.png, 1.1,
	NONE xgra.desktop, 1.1, NONE xgra.png, 1.1, NONE xpat.desktop,
	1.4, NONE xpat.png, 1.1, NONE xsch.desktop, 1.4, NONE xsch.png,
	1.1, NONE xvpn.desktop, 1.4, NONE xvpn.png, 1.1, NONE
Message-ID: <20090903053656.7A0E111C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11664/EL-5

Modified Files:
	.cvsignore alliance.spec import.log sources 
Removed Files:
	alliance-env.patch alliance-examples-adm2901.patch 
	alliance-examples-mipsR3000.patch alliance-examples.patch 
	alliance-perms.patch alliance-run.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	dreal.desktop dreal.png graal.desktop graal.png xfsm.desktop 
	xfsm.png xgra.desktop xgra.png xpat.desktop xpat.png 
	xsch.desktop xsch.png xvpn.desktop xvpn.png 
Log Message:
20090901snap: upstream merged most of our patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 10:47:49 -0000	1.4
+++ .cvsignore	3 Sep 2009 05:36:55 -0000	1.5
@@ -1 +1 @@
-alliance-5.0-20090827.tar.gz
+alliance-5.0-20090901.tar.gz


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/alliance.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- alliance.spec	28 Aug 2009 10:47:50 -0000	1.5
+++ alliance.spec	3 Sep 2009 05:36:55 -0000	1.6
@@ -1,9 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20090827
+%define        snapshot  20090901
+%define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       30.%{snapshot}snap%{?dist}
+Release:       31.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -12,51 +13,16 @@ Group:         Applications/Engineering
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
-Patch0:        alliance-env.patch
-Patch1:        alliance-run.patch
-Patch2:        alliance-perms.patch
-
-# Improving autogeneration of documentation
-Patch3:        alliance-tutorials-place_n_route.patch
-Patch4:        alliance-tutorials-simulation.patch
-Patch5:        alliance-tutorials-start.patch
-Patch6:        alliance-tutorials-synthesis.patch
-Patch7:        alliance-tutorials-amd2901.patch
-
-# Improving examples
-Patch8:        alliance-examples.patch
-Patch9:        alliance-examples-adm2901.patch
-Patch10:       alliance-examples-mipsR3000.patch
-
-# upstream enhancements
-Patch11:       alliance-xgra.patch
-
-# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
-Patch12:       alliance-xgra-xgrerror-ld.patch
-
-Source1:       xsch.desktop
-Source2:       dreal.desktop
-Source3:       xpat.desktop
-Source4:       xfsm.desktop
-Source5:       xvpn.desktop
-Source6:       graal.desktop
-Source7:       xgra.desktop
 
-Source8:       alliance.fedora
+Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source9:       graal.png
-Source10:      dreal.png
-Source11:      xvpn.png
-Source12:      xfsm.png
-Source13:      xpat.png
-Source14:      xsch.png
-Source15:      xgra.png
-
-Source16:      alliance-tutorials-go-all.sh
-Source17:      alliance-tutorials-go-all-clean.sh
-Source18:      alliance-examples-go-all.sh
-Source19:      alliance-examples-go-all-clean.sh
+# included asfrom snapshot 20090901
+
+Source2:       alliance-tutorials-go-all.sh
+Source3:       alliance-tutorials-go-all-clean.sh
+Source4:       alliance-examples-go-all.sh
+Source5:       alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
@@ -71,7 +37,7 @@ BuildRequires: lesstif-devel
 %endif
 
 Requires:      xorg-x11-fonts-misc
-# 442379
+# RHBZ 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
@@ -136,31 +102,17 @@ Documentation and tutorials for the Alli
 %setup -q
 %{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
-sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%{__cp} -p %{SOURCE1} .
+sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop
 
 # removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
 
-%patch11 -p1 -b .xgra-makefile.am
-%patch12 -p0 -b .xgra-long
-
-
-%patch0 -p0 -b .env
-%patch1 -p0 -b .run
-%patch2 -p0 -b .perms
-
-
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
 sed -i "s|documentation/tutorials/Makefile||" configure*
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .doc
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .doc
-%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -174,8 +126,8 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE16} go-all.sh
-    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    %{__install} -pm 755 %{SOURCE2} go-all.sh
+    %{__install} -pm 755 %{SOURCE3} go-all-clean.sh
     # Fedora Electronic Lab self test for alliance
     #./go-all.sh 2>&1 | tee self-test-tutorials.log
     # clean temporary files
@@ -183,10 +135,6 @@ pushd documentation/tutorials
 popd
 # ------------------------------------------------------------------------------
 
-%patch8  -p0 -b .examples
-%patch9  -p1 -b .examples
-%patch10 -p1 -b .examples
-
 # fixing flex and bison update on rawhide
 sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
 sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
@@ -210,10 +158,14 @@ done
 sed -i 's/\r//' mipsR3000/asm/*
 popd
 
-# Fix xgra build 
-sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
-sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
-
+find documentation/tutorials/ \
+    -name *.vbe  -o \
+    -name *.pat  -o \
+    -name *.vhdl -o \
+    -name *.vst  -o \
+    -name *.c \
+    -exec chmod 0644 {} ';'
+    
 %build
 
 export ALLIANCE_TOP=%{prefix}
@@ -224,7 +176,7 @@ export ALLIANCE_TOP=%{prefix}
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
            --bindir=%{prefix}/bin         \
-           --mandir=%{_datadir}/%{name}/man         #252941
+           --mandir=%{_datadir}/%{name}/man         # RHBZ 252941
 
 # disabling rpath
 sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -243,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 pushd %{buildroot}%{_sysconfdir}/profile.d
   chmod 0644 alc_env.*
@@ -261,8 +212,8 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
 
 pushd alliance-examples/
     # FEL self test for alliance
@@ -276,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
+%{__cp} -p distrib/*.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
-for desktopfile in *.desktop; do
+for desktopfile in distrib/*.desktop; do
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -326,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/allianc
 %{_fixperms} %{buildroot}/*
 
 
+
 %post
 /sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
@@ -348,8 +300,8 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files
-%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %defattr(-,root,root,-)
+%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -380,6 +332,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Sep 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-31.20090901snap
+- updated to upstream's 20090901 snapshot
+- Removed all patches which are accepted by upstream
+
 * Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
 - updated to upstream's 20090828 snapshot
 - merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	28 Aug 2009 10:47:50 -0000	1.2
+++ import.log	3 Sep 2009 05:36:55 -0000	1.3
@@ -1,2 +1,3 @@
 alliance-5_0-23_20070718snap_fc10:EL-5:alliance-5.0-23.20070718snap.fc10.src.rpm:1226340022
 alliance-5_0-30_20090827snap_fc11:EL-5:alliance-5.0-30.20090827snap.fc11.src.rpm:1251456319
+alliance-5_0-31_20090901snap_fc11:EL-5:alliance-5.0-31.20090901snap.fc11.src.rpm:1251956039


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 10:47:50 -0000	1.4
+++ sources	3 Sep 2009 05:36:55 -0000	1.5
@@ -1 +1 @@
-8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz
+f3b692c4ea9e54c040280f660b3cf170  alliance-5.0-20090901.tar.gz


--- alliance-env.patch DELETED ---


--- alliance-examples-adm2901.patch DELETED ---


--- alliance-examples-mipsR3000.patch DELETED ---


--- alliance-examples.patch DELETED ---


--- alliance-perms.patch DELETED ---


--- alliance-run.patch DELETED ---


--- alliance-tutorials-amd2901.patch DELETED ---


--- alliance-tutorials-place_n_route.patch DELETED ---


--- alliance-tutorials-simulation.patch DELETED ---


--- alliance-tutorials-start.patch DELETED ---


--- alliance-tutorials-synthesis.patch DELETED ---


--- alliance-xgra-xgrerror-ld.patch DELETED ---


--- alliance-xgra.patch DELETED ---


--- dreal.desktop DELETED ---


--- graal.desktop DELETED ---


--- xfsm.desktop DELETED ---


--- xgra.desktop DELETED ---


--- xpat.desktop DELETED ---


--- xsch.desktop DELETED ---


--- xvpn.desktop DELETED ---



From abompard at fedoraproject.org  Thu Sep  3 06:11:19 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Thu,  3 Sep 2009 06:11:19 +0000 (UTC)
Subject: rpms/spring/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 spring.spec,
	1.7, 1.8
Message-ID: <20090903061119.6739C11C02C6@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21552/devel

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
- New release: 0.80.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Aug 2009 11:35:22 -0000	1.5
+++ .cvsignore	3 Sep 2009 06:11:18 -0000	1.6
@@ -1 +1 @@
-spring_0.80.2_src.tar.lzma
+spring_0.80.4_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 11:35:23 -0000	1.5
+++ sources	3 Sep 2009 06:11:18 -0000	1.6
@@ -1 +1 @@
-d01e9f54e32fb61a4fee7d655e7f87f4  spring_0.80.2_src.tar.lzma
+b0119298031fd1aa4aca77086a438d00  spring_0.80.4_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- spring.spec	23 Aug 2009 11:35:23 -0000	1.7
+++ spring.spec	3 Sep 2009 06:11:18 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.2
+Version:        0.80.4
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
+- New release: 0.80.4
+
 * Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
 - New release: 0.80.2
 



From abompard at fedoraproject.org  Thu Sep  3 06:11:19 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Thu,  3 Sep 2009 06:11:19 +0000 (UTC)
Subject: rpms/spring/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 spring.spec,
	1.5, 1.6
Message-ID: <20090903061119.6448711C00EF@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21552/F-11

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
- New release: 0.80.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 11:35:22 -0000	1.4
+++ .cvsignore	3 Sep 2009 06:11:18 -0000	1.5
@@ -1 +1 @@
-spring_0.80.2_src.tar.lzma
+spring_0.80.4_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 11:35:22 -0000	1.4
+++ sources	3 Sep 2009 06:11:18 -0000	1.5
@@ -1 +1 @@
-d01e9f54e32fb61a4fee7d655e7f87f4  spring_0.80.2_src.tar.lzma
+b0119298031fd1aa4aca77086a438d00  spring_0.80.4_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- spring.spec	23 Aug 2009 11:35:22 -0000	1.5
+++ spring.spec	3 Sep 2009 06:11:18 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.2
+Version:        0.80.4
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
+- New release: 0.80.4
+
 * Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
 - New release: 0.80.2
 



From abompard at fedoraproject.org  Thu Sep  3 06:11:19 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Thu,  3 Sep 2009 06:11:19 +0000 (UTC)
Subject: rpms/spring/F-10 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 spring.spec,
	1.4, 1.5
Message-ID: <20090903061119.6442811C0099@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21552/F-10

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
- New release: 0.80.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 11:35:21 -0000	1.4
+++ .cvsignore	3 Sep 2009 06:11:17 -0000	1.5
@@ -1 +1 @@
-spring_0.80.2_src.tar.lzma
+spring_0.80.4_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 11:35:22 -0000	1.4
+++ sources	3 Sep 2009 06:11:17 -0000	1.5
@@ -1 +1 @@
-d01e9f54e32fb61a4fee7d655e7f87f4  spring_0.80.2_src.tar.lzma
+b0119298031fd1aa4aca77086a438d00  spring_0.80.4_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/spring.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- spring.spec	23 Aug 2009 11:35:22 -0000	1.4
+++ spring.spec	3 Sep 2009 06:11:17 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.2
+Version:        0.80.4
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
+- New release: 0.80.4
+
 * Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
 - New release: 0.80.2
 



From sharkcz at fedoraproject.org  Thu Sep  3 06:19:54 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  3 Sep 2009 06:19:54 +0000 (UTC)
Subject: rpms/pywebdav/devel pywebdav.spec,1.5,1.6
Message-ID: <20090903061954.EDF4C11C0099@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24812

Modified Files:
	pywebdav.spec 
Log Message:
* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
- drop dependency on PyXML (#520984)



Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/devel/pywebdav.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pywebdav.spec	26 Aug 2009 08:07:20 -0000	1.5
+++ pywebdav.spec	3 Sep 2009 06:19:54 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           pywebdav
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        WebDAV library
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
-Requires:       PyXML
+
 
 %description
 WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
+- drop dependency on PyXML (#520984)
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
 - update to 0.9.3
 



From cweyl at fedoraproject.org  Thu Sep  3 06:20:47 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  3 Sep 2009 06:20:47 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/devel .cvsignore, 1.9,
	1.10 perl-Catalyst-Plugin-Authentication.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090903062047.D647C11C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25180

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Thu Sep 03 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10015-1
- switch filtering systems...
- auto-update to 0.10015 (by cpan-spec-update 0.01)
- added a new br on perl(Class::MOP) (version 0)
- added a new br on perl(Moose) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Aug 2009 06:39:52 -0000	1.9
+++ .cvsignore	3 Sep 2009 06:20:47 -0000	1.10
@@ -1 +1 @@
-Catalyst-Plugin-Authentication-0.10013.tar.gz
+Catalyst-Plugin-Authentication-0.10015.tar.gz


Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Catalyst-Plugin-Authentication.spec	8 Aug 2009 18:34:13 -0000	1.12
+++ perl-Catalyst-Plugin-Authentication.spec	3 Sep 2009 06:20:47 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10013
-Release:        2%{?dist}
+Version:        0.10015
+Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
+%{?filter_setup: %{expand:
+%filter_provides_in %{perl_vendorarch}/.*\\.so$
+%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$
+%filter_provides_in %{_docdir}
+%filter_requires_in %{_docdir}
+%filter_setup
+}}
+
 BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.10
 BuildRequires:  perl(Catalyst::Runtime)
 BuildRequires:  perl(Class::Inspector)
@@ -20,6 +29,9 @@ BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::MockObject)
+BuildRequires:  perl(Class::MOP)
+BuildRequires:  perl(Moose)
+BuildRequires:  perl(CPAN)
 # optional tests
 BuildRequires:  perl(Catalyst::Plugin::Session::State::Cookie)
 BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
@@ -29,15 +41,6 @@ Requires:       perl(Catalyst::Runtime)
 Requires:       perl(Class::Inspector)
 Requires:       perl(MRO::Compat)
 
-# don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%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}"
-
-### auto-added brs!
-BuildRequires:  perl(CPAN)
-
 %description
 The authentication plugin provides generic user support for Catalyst apps.
 It is the basis for both authentication (checking the user is who they
@@ -76,6 +79,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 03 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10015-1
+- switch filtering systems...
+- auto-update to 0.10015 (by cpan-spec-update 0.01)
+- added a new br on perl(Class::MOP) (version 0)
+- added a new br on perl(Moose) (version 0)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10013-2
 - auto-update to 0.10013 (by cpan-spec-update 0.01)
 - added a new br on CPAN (inc::Module::AutoInstall found)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Aug 2009 06:39:52 -0000	1.9
+++ sources	3 Sep 2009 06:20:47 -0000	1.10
@@ -1 +1 @@
-78d7f5793dcf965f8008789be91a0407  Catalyst-Plugin-Authentication-0.10013.tar.gz
+45bb28864a3282e6a9c32d0f7c5ea72a  Catalyst-Plugin-Authentication-0.10015.tar.gz



From sharkcz at fedoraproject.org  Thu Sep  3 06:21:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  3 Sep 2009 06:21:06 +0000 (UTC)
Subject: rpms/pywebdav/F-11 pywebdav.spec,1.4,1.5
Message-ID: <20090903062106.A3EC311C0099@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25338

Modified Files:
	pywebdav.spec 
Log Message:
* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
- drop dependency on PyXML (#520984)



Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-11/pywebdav.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pywebdav.spec	26 Aug 2009 08:18:57 -0000	1.4
+++ pywebdav.spec	3 Sep 2009 06:21:06 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           pywebdav
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        WebDAV library
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
-Requires:       PyXML
+
 
 %description
 WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
+- drop dependency on PyXML (#520984)
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
 - update to 0.9.3
 



From sharkcz at fedoraproject.org  Thu Sep  3 06:22:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  3 Sep 2009 06:22:06 +0000 (UTC)
Subject: rpms/pywebdav/F-10 pywebdav.spec,1.3,1.4
Message-ID: <20090903062206.3D11711C0099@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25654

Modified Files:
	pywebdav.spec 
Log Message:
* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
- drop dependency on PyXML (#520984)



Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-10/pywebdav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pywebdav.spec	26 Aug 2009 08:20:03 -0000	1.3
+++ pywebdav.spec	3 Sep 2009 06:22:05 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           pywebdav
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        WebDAV library
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
-Requires:       PyXML
+
 
 %description
 WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
+- drop dependency on PyXML (#520984)
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
 - update to 0.9.3
 



From sharkcz at fedoraproject.org  Thu Sep  3 06:22:55 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  3 Sep 2009 06:22:55 +0000 (UTC)
Subject: rpms/pywebdav/EL-5 pywebdav.spec,1.3,1.4
Message-ID: <20090903062255.843A011C0099@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25915

Modified Files:
	pywebdav.spec 
Log Message:
* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
- drop dependency on PyXML (#520984)



Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/pywebdav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pywebdav.spec	26 Aug 2009 08:51:23 -0000	1.3
+++ pywebdav.spec	3 Sep 2009 06:22:54 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           pywebdav
 Version:        0.9.3
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        WebDAV library
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
-Requires:       PyXML
+
 
 %description
 WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-2
+- drop dependency on PyXML (#520984)
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1.1
 - fix build on EL-5, lower the required setuptools version
 



From chitlesh at fedoraproject.org  Thu Sep  3 06:39:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 06:39:42 +0000 (UTC)
Subject: rpms/gspiceui/F-11 gspiceui-xpm.patch, NONE, 1.1 gspiceui.desktop,
	1.1, 1.2 gspiceui.spec, 1.3, 1.4 import.log, 1.1, 1.2
Message-ID: <20090903063943.1FB9311C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32490/F-11

Modified Files:
	gspiceui.desktop gspiceui.spec import.log 
Added Files:
	gspiceui-xpm.patch 
Log Message:
built on wxGTK2.8

gspiceui-xpm.patch:
 file-close.xpm     |    2 +-
 file-import.xpm    |    2 +-
 file-open.xpm      |    2 +-
 file-reload.xpm    |    2 +-
 file-save.xpm      |    2 +-
 file-saveas.xpm    |    2 +-
 gspiceui-32x32.xpm |    2 +-
 gspiceui-48x48.xpm |    2 +-
 help.xpm           |    2 +-
 html-back.xpm      |    2 +-
 html-close.xpm     |    2 +-
 sim-create.xpm     |    2 +-
 sim-edit.xpm       |    2 +-
 sim-plot.xpm       |    2 +-
 sim-run.xpm        |    2 +-
 sim-stop.xpm       |    2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE gspiceui-xpm.patch ---
diff -Naur gspiceui-v0.9.65/src/icons/file-close.xpm gspiceui-v0.9.65_mod/src/icons/file-close.xpm
--- gspiceui-v0.9.65/src/icons/file-close.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-close.xpm	2009-09-03 07:48:44.621541915 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_close_xpm[] = {
+static const char * file_close_xpm[] = {
 "22 22 78 1",
 " 	c None",
 ".	c #464646",
diff -Naur gspiceui-v0.9.65/src/icons/file-import.xpm gspiceui-v0.9.65_mod/src/icons/file-import.xpm
--- gspiceui-v0.9.65/src/icons/file-import.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-import.xpm	2009-09-03 07:48:48.935542898 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_import_xpm[] = {
+static const char * file_import_xpm[] = {
 "24 24 221 2",
 "  	c None",
 ". 	c #000000",
diff -Naur gspiceui-v0.9.65/src/icons/file-open.xpm gspiceui-v0.9.65_mod/src/icons/file-open.xpm
--- gspiceui-v0.9.65/src/icons/file-open.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-open.xpm	2009-09-03 07:48:53.678542646 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_open_xpm[] = {
+static const char * file_open_xpm[] = {
 "24 24 205 2",
 "  	c None",
 ". 	c #000000",
diff -Naur gspiceui-v0.9.65/src/icons/file-reload.xpm gspiceui-v0.9.65_mod/src/icons/file-reload.xpm
--- gspiceui-v0.9.65/src/icons/file-reload.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-reload.xpm	2009-09-03 07:48:57.449542899 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_reload_xpm[] = {
+static const char * file_reload_xpm[] = {
 "22 22 47 1",
 " 	c None",
 ".	c #346C30",
diff -Naur gspiceui-v0.9.65/src/icons/file-saveas.xpm gspiceui-v0.9.65_mod/src/icons/file-saveas.xpm
--- gspiceui-v0.9.65/src/icons/file-saveas.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-saveas.xpm	2009-09-03 07:49:01.095541779 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_saveas_xpm[] = {
+static const char * file_saveas_xpm[] = {
 "22 22 139 2",
 "  	c None",
 ". 	c #FDD7A6",
diff -Naur gspiceui-v0.9.65/src/icons/file-save.xpm gspiceui-v0.9.65_mod/src/icons/file-save.xpm
--- gspiceui-v0.9.65/src/icons/file-save.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-save.xpm	2009-09-03 07:49:04.513541785 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * filesave_xpm[] = {
+static const char * filesave_xpm[] = {
 "22 22 118 2",
 "  	c None",
 ". 	c #6B6B6B",
diff -Naur gspiceui-v0.9.65/src/icons/gspiceui-32x32.xpm gspiceui-v0.9.65_mod/src/icons/gspiceui-32x32.xpm
--- gspiceui-v0.9.65/src/icons/gspiceui-32x32.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/gspiceui-32x32.xpm	2009-09-03 07:48:19.260543296 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char *gspiceui_xpm[]={
+static const char *gspiceui_xpm[]={
 "32 32 6 1",
 "b c #000000",
 "e c #0000ff",
diff -Naur gspiceui-v0.9.65/src/icons/gspiceui-48x48.xpm gspiceui-v0.9.65_mod/src/icons/gspiceui-48x48.xpm
--- gspiceui-v0.9.65/src/icons/gspiceui-48x48.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/gspiceui-48x48.xpm	2009-09-03 07:49:13.279541320 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char *gspiceui[]={
+static const char *gspiceui[]={
 "48 48 7 1",
 "d c #0058c0",
 "a c #303030",
diff -Naur gspiceui-v0.9.65/src/icons/help.xpm gspiceui-v0.9.65_mod/src/icons/help.xpm
--- gspiceui-v0.9.65/src/icons/help.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/help.xpm	2009-09-03 07:49:08.588542920 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * help_xpm[] = {
+static const char * help_xpm[] = {
 "32 32 8 1",
 " 	c None",
 ".	c #800080",
diff -Naur gspiceui-v0.9.65/src/icons/html-back.xpm gspiceui-v0.9.65_mod/src/icons/html-back.xpm
--- gspiceui-v0.9.65/src/icons/html-back.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/html-back.xpm	2009-09-03 07:46:14.408542719 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * html_back_xpm[] = {
+static const char * html_back_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "18 17 3 1",
 "  c black",
diff -Naur gspiceui-v0.9.65/src/icons/html-close.xpm gspiceui-v0.9.65_mod/src/icons/html-close.xpm
--- gspiceui-v0.9.65/src/icons/html-close.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/html-close.xpm	2009-09-03 07:46:45.017542729 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * html_close_xpm[] = {
+static const char * html_close_xpm[] = {
 "22 22 78 1",
 " 	c None",
 ".	c #464646",
diff -Naur gspiceui-v0.9.65/src/icons/sim-create.xpm gspiceui-v0.9.65_mod/src/icons/sim-create.xpm
--- gspiceui-v0.9.65/src/icons/sim-create.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-create.xpm	2009-09-03 07:49:18.082539173 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_create_xpm[] = {
+static const char * sim_create_xpm[] = {
 "22 22 232 2",
 "  	c None",
 ". 	c #8F7F6E",
diff -Naur gspiceui-v0.9.65/src/icons/sim-edit.xpm gspiceui-v0.9.65_mod/src/icons/sim-edit.xpm
--- gspiceui-v0.9.65/src/icons/sim-edit.xpm	2008-02-18 23:52:47.000000000 +0100
+++ gspiceui-v0.9.65_mod/src/icons/sim-edit.xpm	2009-09-03 07:49:22.045542990 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_edit_xpm[] = {
+static const char * sim_edit_xpm[] = {
 "24 24 5 1",
 " 	c None",
 ".	c #00008B8B0000",
diff -Naur gspiceui-v0.9.65/src/icons/sim-plot.xpm gspiceui-v0.9.65_mod/src/icons/sim-plot.xpm
--- gspiceui-v0.9.65/src/icons/sim-plot.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-plot.xpm	2009-09-03 07:49:27.417541616 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_plot_xpm[] = {
+static const char * sim_plot_xpm[] = {
 "22 22 79 1",
 " 	c None",
 ".	c #000000",
diff -Naur gspiceui-v0.9.65/src/icons/sim-run.xpm gspiceui-v0.9.65_mod/src/icons/sim-run.xpm
--- gspiceui-v0.9.65/src/icons/sim-run.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-run.xpm	2009-09-03 07:49:31.265541272 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_run_xpm[] = {
+static const char * sim_run_xpm[] = {
 "22 22 204 2",
 "  	c None",
 ". 	c #0C0C0A",
diff -Naur gspiceui-v0.9.65/src/icons/sim-stop.xpm gspiceui-v0.9.65_mod/src/icons/sim-stop.xpm
--- gspiceui-v0.9.65/src/icons/sim-stop.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-stop.xpm	2009-09-03 07:49:35.523541385 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_stop_xpm[] = {
+static const char * sim_stop_xpm[] = {
 "24 24 70 1",
 " 	c None",
 ".	c #630000",


Index: gspiceui.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/gspiceui.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gspiceui.desktop	28 Jul 2008 07:41:35 -0000	1.1
+++ gspiceui.desktop	3 Sep 2009 06:39:41 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=GspiceUI
-Comment=Spice Electronic circuit similators UI
+Name=Spice Simulation Frontend
+Comment=Simulates spice netlists and gEDA schematics
 Exec=gspiceui
 Icon=gspiceui
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Education;Science;Engineering;
+Categories=Electronics;Engineering;


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/gspiceui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gspiceui.spec	25 Feb 2009 01:25:11 -0000	1.3
+++ gspiceui.spec	3 Sep 2009 06:39:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		gspiceui
 Version:	0.9.65 
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A GUI to freely available Spice Electronic circuit similators
 
 Group:		Applications/System 
@@ -8,9 +8,10 @@ License:	GPLv2+
 URL:		http://sourceforge.net/projects/gspiceui
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
 Source1:	%{name}.desktop
+Patch0:     gspiceui-xpm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	compat-wxGTK26-devel, desktop-file-utils  
+BuildRequires:	wxGTK-devel, desktop-file-utils  
 Requires:	ngspice, geda-gnetlist, geda-gschem 
 Requires:	gwave, electronics-menu
 
@@ -28,13 +29,21 @@ gSchem is used as the schematic generati
 %prep
 %setup -q -n %{name}-v%{version}
 
+%patch0 -p1 -b .xpm
+
 sed -i 's|/usr/local|/usr|g' html/Makefile
 sed -i 's|cp|install -pm 644|g' Makefile html/Makefile
 sed -i 's|cp |install -m 755 |g' src/Makefile
-sed -i 's|wx-config|wx-2.6-config|' src/Makefile
+
+#wrong-file-end-of-line-encoding
+sed -i 's/\r//' lib/*/*.mod
+
+#spurious-executable-perm
+chmod 0644 lib/*/*.mod
+
 
 %build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6
+make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,13 +69,13 @@ install -pm 0644 src/icons/%{name}-32x32
 install -pm 0644 src/icons/%{name}-48x48.xpm \
 	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
-desktop-file-install 	--vendor "Fedora"				\
+desktop-file-install 	--vendor ""				\
 			--mode 0644					\
-			--remove-category="Science;Education"		\
-			--add-category Electronics			\
 			--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 			%{SOURCE1}
 
+find %{buildroot} -name Makefile -exec rm -f {} ';'
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +94,7 @@ touch --no-create %{_datadir}/icons/hico
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog TODO
+%doc sch/ lib/
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/??x??/apps/*.xpm
@@ -94,6 +104,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-5
+- Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
+- Added documentations: schematics and spice models
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Jul 2008 07:41:35 -0000	1.1
+++ import.log	3 Sep 2009 06:39:41 -0000	1.2
@@ -1 +1,2 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
+gspiceui-0_9_65-5_fc11:F-11:gspiceui-0.9.65-5.fc11.src.rpm:1251959808



From jskala at fedoraproject.org  Thu Sep  3 06:39:57 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu,  3 Sep 2009 06:39:57 +0000 (UTC)
Subject: rpms/bltk/devel bltk-1.0.9-opt_office.patch, 1.2,
	1.3 bltk-1.0.9-opt_reader.patch, 1.2, 1.3 bltk.spec, 1.6, 1.7
Message-ID: <20090903063957.CEEF611C0099@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/bltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32612

Modified Files:
	bltk-1.0.9-opt_office.patch bltk-1.0.9-opt_reader.patch 
	bltk.spec 
Log Message:
* Thu Sep 03 2009 Jiri Skala <jskala at redhat.com> 1.0.9-6
- fixed misspelled bash variable with stop file


bltk-1.0.9-opt_office.patch:
 tools/bltk/bltk_wl_common.sh        |   24 +++++++++++--
 wl_office/bltk_wl_office.sh         |   64 ++++++++++++++++++++++++++++--------
 wl_office/bltk_wl_office_run_app.sh |    4 +-
 3 files changed, 74 insertions(+), 18 deletions(-)

Index: bltk-1.0.9-opt_office.patch
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk-1.0.9-opt_office.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bltk-1.0.9-opt_office.patch	31 Jul 2009 08:43:58 -0000	1.2
+++ bltk-1.0.9-opt_office.patch	3 Sep 2009 06:39:57 -0000	1.3
@@ -97,7 +97,7 @@
  		CMD="$BLTK_WL_BIN/$XSE_PROG $BLTK_WL_OFFICE_SCEN"
  #####		\time -p $CMD >./XSE.times 2>&1
  		$CMD
-+		if [ -f $BLTK_STOP_FILE ]
++		if [ -f $BLTK_STOP_FNAME ]
 +		then
 +			ps -eopid,cmd | grep $WL_OFFICE_WORKING_DIR | sed 's/^ *//' | sed 's/ .*$//' | xargs kill -s SIGKILL
 +			exit 0

bltk-1.0.9-opt_reader.patch:
 bltk_wl_reader.sh    |   57 ++++++++++++++++++++++++++++++++++-----------------
 bltk_wl_reader_xse.c |    2 -
 2 files changed, 39 insertions(+), 20 deletions(-)

Index: bltk-1.0.9-opt_reader.patch
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk-1.0.9-opt_reader.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bltk-1.0.9-opt_reader.patch	31 Jul 2009 08:43:58 -0000	1.2
+++ bltk-1.0.9-opt_reader.patch	3 Sep 2009 06:39:57 -0000	1.3
@@ -91,7 +91,7 @@
  
  	CMD="$BLTK_WL_BIN/$XSE_PROG"
  	$CMD
-+	if [ -f $BLTK_STOP_FILE ]
++	if [ -f $BLTK_STOP_FNAME ]
 +	then
 +		ps -eopid,cmd | grep $BLTK_READER_PROG | sed 's/^ *//' | sed 's/ .*$//' | xargs kill -s SIGKILL
 +		exit 0


Index: bltk.spec
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bltk.spec	31 Jul 2009 08:43:58 -0000	1.6
+++ bltk.spec	3 Sep 2009 06:39:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		bltk
 Version:	1.0.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	The BLTK measures notebook battery life under any workload
 
 Group:		Applications/System
@@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/wl_reader/war_and_peace.html
 
 %changelog
+* Thu Sep 03 2009 Jiri Skala <jskala at redhat.com> 1.0.9-6
+- fixed misspelled bash variable with stop file
+
 * Fri Jul 31 2009 Jiri Skala <jskala at redhat.com> 1.0.9-5
 - bltk.conf can be located in ~/.bltk
 



From chitlesh at fedoraproject.org  Thu Sep  3 06:40:37 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 06:40:37 +0000 (UTC)
Subject: rpms/gspiceui/devel gspiceui-xpm.patch, NONE, 1.1 gspiceui.desktop, 
	1.1, 1.2 gspiceui.spec, 1.4, 1.5 import.log, 1.1, 1.2
Message-ID: <20090903064037.8EFDD11C0380@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv403/devel

Modified Files:
	gspiceui.desktop gspiceui.spec import.log 
Added Files:
	gspiceui-xpm.patch 
Log Message:
built on wxGTK2.8

gspiceui-xpm.patch:
 file-close.xpm     |    2 +-
 file-import.xpm    |    2 +-
 file-open.xpm      |    2 +-
 file-reload.xpm    |    2 +-
 file-save.xpm      |    2 +-
 file-saveas.xpm    |    2 +-
 gspiceui-32x32.xpm |    2 +-
 gspiceui-48x48.xpm |    2 +-
 help.xpm           |    2 +-
 html-back.xpm      |    2 +-
 html-close.xpm     |    2 +-
 sim-create.xpm     |    2 +-
 sim-edit.xpm       |    2 +-
 sim-plot.xpm       |    2 +-
 sim-run.xpm        |    2 +-
 sim-stop.xpm       |    2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE gspiceui-xpm.patch ---
diff -Naur gspiceui-v0.9.65/src/icons/file-close.xpm gspiceui-v0.9.65_mod/src/icons/file-close.xpm
--- gspiceui-v0.9.65/src/icons/file-close.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-close.xpm	2009-09-03 07:48:44.621541915 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_close_xpm[] = {
+static const char * file_close_xpm[] = {
 "22 22 78 1",
 " 	c None",
 ".	c #464646",
diff -Naur gspiceui-v0.9.65/src/icons/file-import.xpm gspiceui-v0.9.65_mod/src/icons/file-import.xpm
--- gspiceui-v0.9.65/src/icons/file-import.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-import.xpm	2009-09-03 07:48:48.935542898 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_import_xpm[] = {
+static const char * file_import_xpm[] = {
 "24 24 221 2",
 "  	c None",
 ". 	c #000000",
diff -Naur gspiceui-v0.9.65/src/icons/file-open.xpm gspiceui-v0.9.65_mod/src/icons/file-open.xpm
--- gspiceui-v0.9.65/src/icons/file-open.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-open.xpm	2009-09-03 07:48:53.678542646 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_open_xpm[] = {
+static const char * file_open_xpm[] = {
 "24 24 205 2",
 "  	c None",
 ". 	c #000000",
diff -Naur gspiceui-v0.9.65/src/icons/file-reload.xpm gspiceui-v0.9.65_mod/src/icons/file-reload.xpm
--- gspiceui-v0.9.65/src/icons/file-reload.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-reload.xpm	2009-09-03 07:48:57.449542899 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_reload_xpm[] = {
+static const char * file_reload_xpm[] = {
 "22 22 47 1",
 " 	c None",
 ".	c #346C30",
diff -Naur gspiceui-v0.9.65/src/icons/file-saveas.xpm gspiceui-v0.9.65_mod/src/icons/file-saveas.xpm
--- gspiceui-v0.9.65/src/icons/file-saveas.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-saveas.xpm	2009-09-03 07:49:01.095541779 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * file_saveas_xpm[] = {
+static const char * file_saveas_xpm[] = {
 "22 22 139 2",
 "  	c None",
 ". 	c #FDD7A6",
diff -Naur gspiceui-v0.9.65/src/icons/file-save.xpm gspiceui-v0.9.65_mod/src/icons/file-save.xpm
--- gspiceui-v0.9.65/src/icons/file-save.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/file-save.xpm	2009-09-03 07:49:04.513541785 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * filesave_xpm[] = {
+static const char * filesave_xpm[] = {
 "22 22 118 2",
 "  	c None",
 ". 	c #6B6B6B",
diff -Naur gspiceui-v0.9.65/src/icons/gspiceui-32x32.xpm gspiceui-v0.9.65_mod/src/icons/gspiceui-32x32.xpm
--- gspiceui-v0.9.65/src/icons/gspiceui-32x32.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/gspiceui-32x32.xpm	2009-09-03 07:48:19.260543296 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char *gspiceui_xpm[]={
+static const char *gspiceui_xpm[]={
 "32 32 6 1",
 "b c #000000",
 "e c #0000ff",
diff -Naur gspiceui-v0.9.65/src/icons/gspiceui-48x48.xpm gspiceui-v0.9.65_mod/src/icons/gspiceui-48x48.xpm
--- gspiceui-v0.9.65/src/icons/gspiceui-48x48.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/gspiceui-48x48.xpm	2009-09-03 07:49:13.279541320 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char *gspiceui[]={
+static const char *gspiceui[]={
 "48 48 7 1",
 "d c #0058c0",
 "a c #303030",
diff -Naur gspiceui-v0.9.65/src/icons/help.xpm gspiceui-v0.9.65_mod/src/icons/help.xpm
--- gspiceui-v0.9.65/src/icons/help.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/help.xpm	2009-09-03 07:49:08.588542920 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * help_xpm[] = {
+static const char * help_xpm[] = {
 "32 32 8 1",
 " 	c None",
 ".	c #800080",
diff -Naur gspiceui-v0.9.65/src/icons/html-back.xpm gspiceui-v0.9.65_mod/src/icons/html-back.xpm
--- gspiceui-v0.9.65/src/icons/html-back.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/html-back.xpm	2009-09-03 07:46:14.408542719 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * html_back_xpm[] = {
+static const char * html_back_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "18 17 3 1",
 "  c black",
diff -Naur gspiceui-v0.9.65/src/icons/html-close.xpm gspiceui-v0.9.65_mod/src/icons/html-close.xpm
--- gspiceui-v0.9.65/src/icons/html-close.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/html-close.xpm	2009-09-03 07:46:45.017542729 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * html_close_xpm[] = {
+static const char * html_close_xpm[] = {
 "22 22 78 1",
 " 	c None",
 ".	c #464646",
diff -Naur gspiceui-v0.9.65/src/icons/sim-create.xpm gspiceui-v0.9.65_mod/src/icons/sim-create.xpm
--- gspiceui-v0.9.65/src/icons/sim-create.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-create.xpm	2009-09-03 07:49:18.082539173 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_create_xpm[] = {
+static const char * sim_create_xpm[] = {
 "22 22 232 2",
 "  	c None",
 ". 	c #8F7F6E",
diff -Naur gspiceui-v0.9.65/src/icons/sim-edit.xpm gspiceui-v0.9.65_mod/src/icons/sim-edit.xpm
--- gspiceui-v0.9.65/src/icons/sim-edit.xpm	2008-02-18 23:52:47.000000000 +0100
+++ gspiceui-v0.9.65_mod/src/icons/sim-edit.xpm	2009-09-03 07:49:22.045542990 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_edit_xpm[] = {
+static const char * sim_edit_xpm[] = {
 "24 24 5 1",
 " 	c None",
 ".	c #00008B8B0000",
diff -Naur gspiceui-v0.9.65/src/icons/sim-plot.xpm gspiceui-v0.9.65_mod/src/icons/sim-plot.xpm
--- gspiceui-v0.9.65/src/icons/sim-plot.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-plot.xpm	2009-09-03 07:49:27.417541616 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_plot_xpm[] = {
+static const char * sim_plot_xpm[] = {
 "22 22 79 1",
 " 	c None",
 ".	c #000000",
diff -Naur gspiceui-v0.9.65/src/icons/sim-run.xpm gspiceui-v0.9.65_mod/src/icons/sim-run.xpm
--- gspiceui-v0.9.65/src/icons/sim-run.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-run.xpm	2009-09-03 07:49:31.265541272 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_run_xpm[] = {
+static const char * sim_run_xpm[] = {
 "22 22 204 2",
 "  	c None",
 ". 	c #0C0C0A",
diff -Naur gspiceui-v0.9.65/src/icons/sim-stop.xpm gspiceui-v0.9.65_mod/src/icons/sim-stop.xpm
--- gspiceui-v0.9.65/src/icons/sim-stop.xpm	2007-09-10 01:37:26.000000000 +0200
+++ gspiceui-v0.9.65_mod/src/icons/sim-stop.xpm	2009-09-03 07:49:35.523541385 +0200
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sim_stop_xpm[] = {
+static const char * sim_stop_xpm[] = {
 "24 24 70 1",
 " 	c None",
 ".	c #630000",


Index: gspiceui.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/gspiceui.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gspiceui.desktop	28 Jul 2008 07:41:35 -0000	1.1
+++ gspiceui.desktop	3 Sep 2009 06:40:37 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=GspiceUI
-Comment=Spice Electronic circuit similators UI
+Name=Spice Simulation Frontend
+Comment=Simulates spice netlists and gEDA schematics
 Exec=gspiceui
 Icon=gspiceui
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Education;Science;Engineering;
+Categories=Electronics;Engineering;


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/gspiceui.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gspiceui.spec	25 Jul 2009 01:34:12 -0000	1.4
+++ gspiceui.spec	3 Sep 2009 06:40:37 -0000	1.5
@@ -8,9 +8,10 @@ License:	GPLv2+
 URL:		http://sourceforge.net/projects/gspiceui
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
 Source1:	%{name}.desktop
+Patch0:     gspiceui-xpm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	compat-wxGTK26-devel, desktop-file-utils  
+BuildRequires:	wxGTK-devel, desktop-file-utils  
 Requires:	ngspice, geda-gnetlist, geda-gschem 
 Requires:	gwave, electronics-menu
 
@@ -28,13 +29,21 @@ gSchem is used as the schematic generati
 %prep
 %setup -q -n %{name}-v%{version}
 
+%patch0 -p1 -b .xpm
+
 sed -i 's|/usr/local|/usr|g' html/Makefile
 sed -i 's|cp|install -pm 644|g' Makefile html/Makefile
 sed -i 's|cp |install -m 755 |g' src/Makefile
-sed -i 's|wx-config|wx-2.6-config|' src/Makefile
+
+#wrong-file-end-of-line-encoding
+sed -i 's/\r//' lib/*/*.mod
+
+#spurious-executable-perm
+chmod 0644 lib/*/*.mod
+
 
 %build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6
+make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,13 +69,13 @@ install -pm 0644 src/icons/%{name}-32x32
 install -pm 0644 src/icons/%{name}-48x48.xpm \
 	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
-desktop-file-install 	--vendor "Fedora"				\
+desktop-file-install 	--vendor ""				\
 			--mode 0644					\
-			--remove-category="Science;Education"		\
-			--add-category Electronics			\
 			--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 			%{SOURCE1}
 
+find %{buildroot} -name Makefile -exec rm -f {} ';'
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +94,7 @@ touch --no-create %{_datadir}/icons/hico
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog TODO
+%doc sch/ lib/
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/??x??/apps/*.xpm
@@ -94,8 +104,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-5
+- Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
+- Added documentations: schematics and spice models
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Jul 2008 07:41:35 -0000	1.1
+++ import.log	3 Sep 2009 06:40:37 -0000	1.2
@@ -1 +1,2 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
+gspiceui-0_9_65-5_fc11:HEAD:gspiceui-0.9.65-5.fc11.src.rpm:1251959887



From chitlesh at fedoraproject.org  Thu Sep  3 06:42:58 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  3 Sep 2009 06:42:58 +0000 (UTC)
Subject: rpms/gspiceui/devel gspiceui.spec,1.5,1.6 import.log,1.2,1.3
Message-ID: <20090903064259.005BF11C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv981/devel

Modified Files:
	gspiceui.spec import.log 
Log Message:
built on wxGTK2.8


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/gspiceui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gspiceui.spec	3 Sep 2009 06:40:37 -0000	1.5
+++ gspiceui.spec	3 Sep 2009 06:42:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gspiceui
 Version:	0.9.65 
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A GUI to freely available Spice Electronic circuit similators
 
 Group:		Applications/System 
@@ -104,10 +104,13 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
-* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-5
+* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-6
 - Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
 - Added documentations: schematics and spice models
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Sep 2009 06:40:37 -0000	1.2
+++ import.log	3 Sep 2009 06:42:58 -0000	1.3
@@ -1,2 +1,3 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
 gspiceui-0_9_65-5_fc11:HEAD:gspiceui-0.9.65-5.fc11.src.rpm:1251959887
+gspiceui-0_9_65-6_fc11:HEAD:gspiceui-0.9.65-6.fc11.src.rpm:1251960020



From iankent at fedoraproject.org  Thu Sep  3 08:17:09 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu,  3 Sep 2009 08:17:09 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.4-fix-direct-map-cache-locking.patch, 
	NONE, 1.1
	autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch,
	NONE, 1.1 autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch,
	NONE, 1.1 autofs.spec, 1.286, 1.287
Message-ID: <20090903081709.B213C11C0099@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3051

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-direct-map-cache-locking.patch 
	autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch 
	autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch 
Log Message:
* Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-39
- fix libxml2 non-thread-safe calls.
- fix direct map cache locking.
- fix patch "dont umount existing direct mount on reread" deadlock.


autofs-5.0.4-fix-direct-map-cache-locking.patch:
 CHANGELOG       |    1 +
 daemon/direct.c |    6 ++++++
 2 files changed, 7 insertions(+)

--- NEW FILE autofs-5.0.4-fix-direct-map-cache-locking.patch ---
autofs-5.0.4 - fix direct map cache locking

From: Ian Kent <raven at themaw.net>

Some time during the recent round of updates some locking of the
null map and the direct map entry caches was removed. This patch
adds it back again.
---

 CHANGELOG       |    1 +
 daemon/direct.c |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index af7792d..82ebc83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -60,6 +60,7 @@
 - don't block signals we expect to dump core.
 - fix pthread push order in expire_proc_direct().
 - fix libxml2 non-thread-safe calls.
+- fix direct map cache locking.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/direct.c b/daemon/direct.c
index 0f33d03..0c78627 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -470,6 +470,8 @@ int mount_autofs_direct(struct autofs_point *ap)
 	pthread_cleanup_push(master_source_lock_cleanup, ap->entry);
 	master_source_readlock(ap->entry);
 	nc = ap->entry->master->nc;
+	cache_readlock(nc);
+	pthread_cleanup_push(cache_lock_cleanup, nc);
 	map = ap->entry->maps;
 	while (map) {
 		/*
@@ -482,6 +484,8 @@ int mount_autofs_direct(struct autofs_point *ap)
 		}
 
 		mc = map->mc;
+		cache_readlock(mc);
+		pthread_cleanup_push(cache_lock_cleanup, mc);
 		me = cache_enumerate(mc, NULL);
 		while (me) {
 			ne = cache_lookup_distinct(nc, me->key);
@@ -509,10 +513,12 @@ int mount_autofs_direct(struct autofs_point *ap)
 
 			me = cache_enumerate(mc, me);
 		}
+		pthread_cleanup_pop(1);
 		map = map->next;
 	}
 	pthread_cleanup_pop(1);
 	pthread_cleanup_pop(1);
+	pthread_cleanup_pop(1);
 
 	return 0;
 }

autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch:
 CHANGELOG      |    1 +
 daemon/state.c |   10 ++++++++++
 2 files changed, 11 insertions(+)

--- NEW FILE autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch ---
autofs-5.0.4 - fix dont umount existing direct mount on reread

From: Ian Kent <raven at themaw.net>

A recent problem where we incorrectly umounted direct mounts on map
re-read, when the map name in the master map has changed, checks for
the stale entry in an old map source and updates the new entry from
information in the the stale entry. But this check can also match
an entry that has been removed from a direct map whose name hasn't
changed which leads to a deadlock when we try and take the cache
write lock on the (alleged) stale cache to update the new entry.
This is because, in this case, the cache we want to lock is in
fact the one we are reading and we already hold a read lock on it.
---

 CHANGELOG      |    1 +
 daemon/state.c |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 82ebc83..929a21f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@
 - fix pthread push order in expire_proc_direct().
 - fix libxml2 non-thread-safe calls.
 - fix direct map cache locking.
+- fix dont umount existing direct mount on reread.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/state.c b/daemon/state.c
index 84ccba3..71af46a 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -389,6 +389,16 @@ static void do_readmap_mount(struct autofs_point *ap, struct mnt_list *mnts,
 		 * an empty cache awaiting a map re-load.
 		 */
 		valid = lookup_source_valid_mapent(ap, me->key, LKP_DISTINCT);
+		if (valid && valid->mc == me->mc) {
+			/*
+			 * We've found a map entry that has been removed from
+			 * the current cache so there is no need to update it.
+			 * The stale entry will be dealt with when we prune the
+			 * cache later.
+			 */
+			cache_unlock(valid->mc);
+			valid = NULL;
+		}
 		if (valid) {
 			struct mapent_cache *vmc = valid->mc;
 			cache_unlock(vmc);

autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch:
 CHANGELOG             |    1 +
 daemon/Makefile       |    7 +++++++
 daemon/automount.c    |    7 ++++++-
 modules/lookup_ldap.c |    2 --
 4 files changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch ---
autofs-5.0.4 - fix libxml2 non-thread-safe calls

From: Ian Kent <raven at themaw.net>

The libxml2 call xmlCleanupParser() is definitely not thread safe.
This patch moves it and the xmlInitParser() call to the location
of the code to workaround the libxml2 incorrect TSD handling so
they are called only at start and at exit.
---

 CHANGELOG             |    1 +
 daemon/Makefile       |    7 +++++++
 daemon/automount.c    |    7 ++++++-
 modules/lookup_ldap.c |    2 --
 4 files changed, 14 insertions(+), 3 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 4491449..af7792d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -59,6 +59,7 @@
 - fix an RPC fd leak.
 - don't block signals we expect to dump core.
 - fix pthread push order in expire_proc_direct().
+- fix libxml2 non-thread-safe calls.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/Makefile b/daemon/Makefile
index 9c2d858..371ec72 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -22,6 +22,13 @@ CFLAGS += -DVERSION_STRING=\"$(version)\"
 LDFLAGS += -rdynamic
 LIBS = -ldl
 
+ifeq ($(LDAP), 1)
+  ifeq ($(SASL), 1)
+    CFLAGS += $(XML_FLAGS)
+    LIBS += $(XML_LIBS)
+  endif
+endif
+
 all: automount
 
 automount: $(OBJS) $(AUTOFS_LIB)
diff --git a/daemon/automount.c b/daemon/automount.c
index 6759883..979ecd6 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -40,6 +40,7 @@
 #include "automount.h"
 #ifdef LIBXML2_WORKAROUND
 #include <dlfcn.h>
+#include <libxml/parser.h>
 #endif
 
 const char *program;		/* Initialized with argv[0] */
@@ -2113,6 +2114,8 @@ int main(int argc, char *argv[])
 	void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW);
 	if (!dh_xml2)
 		dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW);
+	if (dh_xml2)
+		xmlInitParser();
 #endif
 #ifdef TIRPC_WORKAROUND
 	void *dh_tirpc = dlopen("libitirpc.so", RTLD_NOW);
@@ -2156,8 +2159,10 @@ int main(int argc, char *argv[])
 		dlclose(dh_tirpc);
 #endif
 #ifdef LIBXML2_WORKAROUND
-	if (dh_xml2)
+	if (dh_xml2) {
+		xmlCleanupParser();
 		dlclose(dh_xml2);
+	}
 #endif
 	close_ioctl_ctl();
 
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 8f352d6..2ecf5fe 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -897,7 +897,6 @@ int parse_ldap_config(unsigned logopt, struct lookup_context *ctxt)
 		return -1;
 	}
 
-	xmlInitParser();
 	doc = xmlParseFile(auth_conf);
 	if (!doc) {
 		error(logopt, MODPREFIX
@@ -1069,7 +1068,6 @@ int parse_ldap_config(unsigned logopt, struct lookup_context *ctxt)
 
 out:
 	xmlFreeDoc(doc);
-	xmlCleanupParser();
 
 	if (fallback)
 		return 0;


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- autofs.spec	30 Jul 2009 20:54:00 -0000	1.286
+++ autofs.spec	3 Sep 2009 08:17:07 -0000	1.287
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 37
+Release: 39
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -72,6 +72,9 @@ Patch59: autofs-5.0.4-fix-map-type-info-
 Patch60: autofs-5.0.4-fix-rpc-fd-leak.patch
 Patch61: autofs-5.0.4-allow-automount-daemon-to-dump-core.patch
 Patch62: autofs-5.0.4-fix-pthread-push-order-in-expire_proc_direct.patch
+Patch63: autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch
+Patch64: autofs-5.0.4-fix-direct-map-cache-locking.patch
+Patch65: autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.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
@@ -175,6 +178,9 @@ echo %{version}-%{release} > .version
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -227,6 +233,11 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-39
+- fix libxml2 non-thread-safe calls.
+- fix direct map cache locking.
+- fix patch "dont umount existing direct mount on reread" deadlock.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.0.4-37
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From iankent at fedoraproject.org  Thu Sep  3 08:32:47 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu,  3 Sep 2009 08:32:47 +0000 (UTC)
Subject: rpms/autofs/F-11 autofs-5.0.4-fix-direct-map-cache-locking.patch,
	NONE, 1.1
	autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch,
	NONE, 1.1 autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch,
	NONE, 1.1 autofs.spec, 1.287, 1.288
Message-ID: <20090903083247.335D811C0099@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8364

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-direct-map-cache-locking.patch 
	autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch 
	autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch 
Log Message:
* Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-38
- fix libxml2 non-thread-safe calls.
- fix direct map cache locking.
- fix patch "dont umount existing direct mount on reread" deadlock.


autofs-5.0.4-fix-direct-map-cache-locking.patch:
 CHANGELOG       |    1 +
 daemon/direct.c |    6 ++++++
 2 files changed, 7 insertions(+)

--- NEW FILE autofs-5.0.4-fix-direct-map-cache-locking.patch ---
autofs-5.0.4 - fix direct map cache locking

From: Ian Kent <raven at themaw.net>

Some time during the recent round of updates some locking of the
null map and the direct map entry caches was removed. This patch
adds it back again.
---

 CHANGELOG       |    1 +
 daemon/direct.c |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index af7792d..82ebc83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -60,6 +60,7 @@
 - don't block signals we expect to dump core.
 - fix pthread push order in expire_proc_direct().
 - fix libxml2 non-thread-safe calls.
+- fix direct map cache locking.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/direct.c b/daemon/direct.c
index 0f33d03..0c78627 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -470,6 +470,8 @@ int mount_autofs_direct(struct autofs_point *ap)
 	pthread_cleanup_push(master_source_lock_cleanup, ap->entry);
 	master_source_readlock(ap->entry);
 	nc = ap->entry->master->nc;
+	cache_readlock(nc);
+	pthread_cleanup_push(cache_lock_cleanup, nc);
 	map = ap->entry->maps;
 	while (map) {
 		/*
@@ -482,6 +484,8 @@ int mount_autofs_direct(struct autofs_point *ap)
 		}
 
 		mc = map->mc;
+		cache_readlock(mc);
+		pthread_cleanup_push(cache_lock_cleanup, mc);
 		me = cache_enumerate(mc, NULL);
 		while (me) {
 			ne = cache_lookup_distinct(nc, me->key);
@@ -509,10 +513,12 @@ int mount_autofs_direct(struct autofs_point *ap)
 
 			me = cache_enumerate(mc, me);
 		}
+		pthread_cleanup_pop(1);
 		map = map->next;
 	}
 	pthread_cleanup_pop(1);
 	pthread_cleanup_pop(1);
+	pthread_cleanup_pop(1);
 
 	return 0;
 }

autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch:
 CHANGELOG      |    1 +
 daemon/state.c |   10 ++++++++++
 2 files changed, 11 insertions(+)

--- NEW FILE autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch ---
autofs-5.0.4 - fix dont umount existing direct mount on reread

From: Ian Kent <raven at themaw.net>

A recent problem where we incorrectly umounted direct mounts on map
re-read, when the map name in the master map has changed, checks for
the stale entry in an old map source and updates the new entry from
information in the the stale entry. But this check can also match
an entry that has been removed from a direct map whose name hasn't
changed which leads to a deadlock when we try and take the cache
write lock on the (alleged) stale cache to update the new entry.
This is because, in this case, the cache we want to lock is in
fact the one we are reading and we already hold a read lock on it.
---

 CHANGELOG      |    1 +
 daemon/state.c |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 82ebc83..929a21f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@
 - fix pthread push order in expire_proc_direct().
 - fix libxml2 non-thread-safe calls.
 - fix direct map cache locking.
+- fix dont umount existing direct mount on reread.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/state.c b/daemon/state.c
index 84ccba3..71af46a 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -389,6 +389,16 @@ static void do_readmap_mount(struct autofs_point *ap, struct mnt_list *mnts,
 		 * an empty cache awaiting a map re-load.
 		 */
 		valid = lookup_source_valid_mapent(ap, me->key, LKP_DISTINCT);
+		if (valid && valid->mc == me->mc) {
+			/*
+			 * We've found a map entry that has been removed from
+			 * the current cache so there is no need to update it.
+			 * The stale entry will be dealt with when we prune the
+			 * cache later.
+			 */
+			cache_unlock(valid->mc);
+			valid = NULL;
+		}
 		if (valid) {
 			struct mapent_cache *vmc = valid->mc;
 			cache_unlock(vmc);

autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch:
 CHANGELOG             |    1 +
 daemon/Makefile       |    7 +++++++
 daemon/automount.c    |    7 ++++++-
 modules/lookup_ldap.c |    2 --
 4 files changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch ---
autofs-5.0.4 - fix libxml2 non-thread-safe calls

From: Ian Kent <raven at themaw.net>

The libxml2 call xmlCleanupParser() is definitely not thread safe.
This patch moves it and the xmlInitParser() call to the location
of the code to workaround the libxml2 incorrect TSD handling so
they are called only at start and at exit.
---

 CHANGELOG             |    1 +
 daemon/Makefile       |    7 +++++++
 daemon/automount.c    |    7 ++++++-
 modules/lookup_ldap.c |    2 --
 4 files changed, 14 insertions(+), 3 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 4491449..af7792d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -59,6 +59,7 @@
 - fix an RPC fd leak.
 - don't block signals we expect to dump core.
 - fix pthread push order in expire_proc_direct().
+- fix libxml2 non-thread-safe calls.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/Makefile b/daemon/Makefile
index 9c2d858..371ec72 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -22,6 +22,13 @@ CFLAGS += -DVERSION_STRING=\"$(version)\"
 LDFLAGS += -rdynamic
 LIBS = -ldl
 
+ifeq ($(LDAP), 1)
+  ifeq ($(SASL), 1)
+    CFLAGS += $(XML_FLAGS)
+    LIBS += $(XML_LIBS)
+  endif
+endif
+
 all: automount
 
 automount: $(OBJS) $(AUTOFS_LIB)
diff --git a/daemon/automount.c b/daemon/automount.c
index 6759883..979ecd6 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -40,6 +40,7 @@
 #include "automount.h"
 #ifdef LIBXML2_WORKAROUND
 #include <dlfcn.h>
+#include <libxml/parser.h>
 #endif
 
 const char *program;		/* Initialized with argv[0] */
@@ -2113,6 +2114,8 @@ int main(int argc, char *argv[])
 	void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW);
 	if (!dh_xml2)
 		dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW);
+	if (dh_xml2)
+		xmlInitParser();
 #endif
 #ifdef TIRPC_WORKAROUND
 	void *dh_tirpc = dlopen("libitirpc.so", RTLD_NOW);
@@ -2156,8 +2159,10 @@ int main(int argc, char *argv[])
 		dlclose(dh_tirpc);
 #endif
 #ifdef LIBXML2_WORKAROUND
-	if (dh_xml2)
+	if (dh_xml2) {
+		xmlCleanupParser();
 		dlclose(dh_xml2);
+	}
 #endif
 	close_ioctl_ctl();
 
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 8f352d6..2ecf5fe 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -897,7 +897,6 @@ int parse_ldap_config(unsigned logopt, struct lookup_context *ctxt)
 		return -1;
 	}
 
-	xmlInitParser();
 	doc = xmlParseFile(auth_conf);
 	if (!doc) {
 		error(logopt, MODPREFIX
@@ -1069,7 +1068,6 @@ int parse_ldap_config(unsigned logopt, struct lookup_context *ctxt)
 
 out:
 	xmlFreeDoc(doc);
-	xmlCleanupParser();
 
 	if (fallback)
 		return 0;


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- autofs.spec	17 Jul 2009 01:49:31 -0000	1.287
+++ autofs.spec	3 Sep 2009 08:32:46 -0000	1.288
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 36
+Release: 38
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -72,6 +72,9 @@ Patch59: autofs-5.0.4-fix-map-type-info-
 Patch60: autofs-5.0.4-fix-rpc-fd-leak.patch
 Patch61: autofs-5.0.4-allow-automount-daemon-to-dump-core.patch
 Patch62: autofs-5.0.4-fix-pthread-push-order-in-expire_proc_direct.patch
+Patch63: autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch
+Patch64: autofs-5.0.4-fix-direct-map-cache-locking.patch
+Patch65: autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.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
@@ -175,6 +178,9 @@ echo %{version}-%{release} > .version
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -227,6 +233,11 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-38
+- fix libxml2 non-thread-safe calls.
+- fix direct map cache locking.
+- fix patch "dont umount existing direct mount on reread" deadlock.
+
 * Fri Jul 17 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-36
 - fix typo in patch to allow dumping core.
 



From pghmcfc at fedoraproject.org  Thu Sep  3 08:57:22 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  3 Sep 2009 08:57:22 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel
	redhat-rpm-config-9.0.3-filtering-macros.patch, 1.1,
	1.2 redhat-rpm-config.spec, 1.73, 1.74
Message-ID: <20090903085722.7920E11C0099@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19416

Modified Files:
	redhat-rpm-config-9.0.3-filtering-macros.patch 
	redhat-rpm-config.spec 
Log Message:
* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-17
- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
- add (empty) %build section
- fix unescaped macros in changelog


redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Index: redhat-rpm-config-9.0.3-filtering-macros.patch
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config-9.0.3-filtering-macros.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- redhat-rpm-config-9.0.3-filtering-macros.patch	19 Aug 2009 06:08:05 -0000	1.1
+++ redhat-rpm-config-9.0.3-filtering-macros.patch	3 Sep 2009 08:57:20 -0000	1.2
@@ -1,6 +1,6 @@
 --- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
 +++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
-@@ -224,3 +224,37 @@
+@@ -243,3 +243,37 @@ kernel_module_package_release	1
  	fi \
  	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
  )}


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- redhat-rpm-config.spec	1 Sep 2009 19:14:30 -0000	1.73
+++ redhat-rpm-config.spec	3 Sep 2009 08:57:20 -0000	1.74
@@ -1,7 +1,7 @@
-Summary: Red Hat specific rpm configuration files.
+Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -36,6 +36,8 @@ Red Hat specific rpm configuration files
 %patch8 -p1
 %patch9 -p1
 
+%build
+
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
 
@@ -47,6 +49,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-17
+- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
+- add (empty) %%build section
+- fix unescaped macros in changelog
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-16
 - add the filtering framework approved by the FPC/FESCo. (#516240)
 
@@ -156,7 +163,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Added patch for find-requires. Waiting on write access to public CVS.
 
 * Tue Sep 12 2006 Deepak Bhole <dbhole at redhat.com> 8.0.45-6
-- Fix brp-java-repack-jars to work with builddirs that aren't %name-%version
+- Fix brp-java-repack-jars to work with builddirs that aren't %%name-%%version
 
 * Mon Sep 11 2006 Fernando Nasser <fnasser at redhat.com> - 8.0.45-5
 - Fix order of tokens in find command (thanks mikeb at redhat.com)
@@ -300,7 +307,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Remove tracking dependency
 
 * Wed Oct 16 2002 Phil Knirsch <pknirsch at redhat.com> 8.0.3-2
-- Added fix for outdated config.[sub|guess] files in %configure section
+- Added fix for outdated config.[sub|guess] files in %%configure section
 
 * Wed Oct 16 2002 Elliot Lee <sopwith at redhat.com> 8.0.3-1
 - New release that blows up on unpackaged files and missing doc files.
@@ -309,7 +316,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - don't redefine everything in macros, just what we need to
 
 * Mon Sep 16 2002 Alexander Larsson <alexl at redhat.com> 8.0.1
-- Add debug package support to %__spec_install_post
+- Add debug package support to %%__spec_install_post
 
 * Tue Sep  3 2002 Bill Nottingham <notting at redhat.com> 8.0-1
 - bump version



From bojan at fedoraproject.org  Thu Sep  3 09:00:13 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  3 Sep 2009 09:00:13 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.31,1.32
Message-ID: <20090903090013.3622211C0381@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20144

Modified Files:
	subversion-api-docs.spec 
Log Message:
Fix search.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- subversion-api-docs.spec	29 Aug 2009 09:32:45 -0000	1.31
+++ subversion-api-docs.spec	3 Sep 2009 09:00:12 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
 Version:        1.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -35,10 +35,10 @@ doxygen -
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs/search
 install -m 644 docs/svn.tag $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
-rm -rf docs/html/search
-install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
+install -m 644 docs/html/search/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs/search
+install -m 644 `find docs/html -type f -maxdepth 1` $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 
 %clean
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Thu Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-3
+- fix search
+
 * Sat Aug 29 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-2
 - attempt to fix docs install
 



From mhlavink at fedoraproject.org  Thu Sep  3 09:04:56 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu,  3 Sep 2009 09:04:56 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartmontools-5.38-lowcap.patch, NONE,
	1.1 smartmontools.spec, 1.54, 1.55
Message-ID: <20090903090456.EC10711C0099@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21287

Modified Files:
	smartmontools.spec 
Added Files:
	smartmontools-5.38-lowcap.patch 
Log Message:
drop all unnecessary capabilities (#517728)


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.cpp   |   12 ++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

--- NEW FILE smartmontools-5.38-lowcap.patch ---
diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
--- smartmontools-5.38/configure.in.lowcap	2009-08-26 17:40:36.942297517 +0200
+++ smartmontools-5.38/configure.in	2009-08-26 17:40:36.951298527 +0200
@@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
 	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
 fi
 
+  AC_ARG_WITH(libcap-ng,
+    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
+    with_libcap_ng=auto)
+
+# Check for Libcap-ng API
+#
+# libcap-ng detection
+
+if test x$with_libcap_ng = xno ; then
+    have_libcap_ng=no;
+else
+    # Start by checking for header file
+    AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
+
+    # See if we have libcap-ng library
+    AC_CHECK_LIB(cap-ng, capng_clear, CAPNG_LDADD=-lcap-ng,)
+
+    # Check results are usable
+    if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+       AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
+    fi
+    if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+       AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
+    fi
+fi
+AC_SUBST(CAPNG_LDADD)
+AC_MSG_CHECKING(whether to use libcap-ng)
+if test x$CAPNG_LDADD != x ; then
+    AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
+    AC_MSG_RESULT(yes)
+else
+    AC_MSG_RESULT(no)
+fi
+
 if test "$prefix" = "NONE"; then
     dnl no prefix and no mandir, so use ${prefix}/share/man as default
     if test "$mandir" = '${prefix}/man'; then
diff -up smartmontools-5.38/Makefile.am.lowcap smartmontools-5.38/Makefile.am
--- smartmontools-5.38/Makefile.am.lowcap	2007-04-01 18:49:44.000000000 +0200
+++ smartmontools-5.38/Makefile.am	2009-08-26 17:40:36.951298527 +0200
@@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                   utility.cpp     \
                   utility.h
 
-smartd_LDADD = @os_deps@ @os_libs@
+smartd_LDADD = @os_deps@ @os_libs@ @CAPNG_LDADD@
 smartd_DEPENDENCIES = @os_deps@
 
 EXTRA_smartd_SOURCES = os_darwin.cpp    \
diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
--- smartmontools-5.38/smartd.cpp.lowcap	2009-08-26 17:40:36.937297475 +0200
+++ smartmontools-5.38/smartd.cpp	2009-08-26 17:57:48.558423011 +0200
@@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
 #include <io.h> // setmode()
 #endif // __CYGWIN__
 
+#ifdef HAVE_LIBCAP_NG
+#include <cap-ng.h>
+#endif //LIBCAP_NG
+
 // locally included files
 #include "int64.h"
 #include "atacmds.h"
@@ -4408,6 +4412,14 @@ static int smartd_main(int argc, char **
   
   // don't exit on bad checksums
   con->checksumfail=0;
+
+#ifdef HAVE_LIBCAP_NG
+  // Drop capabilities
+  capng_clear(CAPNG_SELECT_BOTH);
+  capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
+               CAP_SYS_ADMIN, CAP_SYS_RAWIO, -1);
+  capng_apply(CAPNG_SELECT_BOTH);
+#endif
   
   // the main loop of the code
   while (1){


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- smartmontools.spec	11 Jun 2009 08:43:32 -0000	1.54
+++ smartmontools.spec	3 Sep 2009 09:04:56 -0000	1.55
@@ -1,21 +1,22 @@
-Summary:	Tools for monitoring SMART capable hard disks
-Name:		smartmontools
-Version:	5.38
-Release: 	12%{?dist}
-Epoch:		1
-Group:		System Environment/Base
-License:	GPLv2+
-URL:		http://smartmontools.sourceforge.net/
-Source0:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	smartd.initd
-Source2:	smartmontools.sysconf
-Patch1:		smartmontools-5.38-cloexec.patch
-Patch2:     smartmontools-5.37-addrinfo.patch
-Patch3:     smartmontools-5.38-perc.patch
-Patch4:     smartmontools-5.38-selinux.patch
-Patch5:     smartmontools-5.38-defaultconf.patch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires:	fileutils mailx chkconfig initscripts
+Name: smartmontools
+Version: 5.38
+Release: 13%{?dist}
+Epoch: 1
+Summary:       Tools for monitoring SMART capable hard disks
+Group:         System Environment/Base
+License:       GPLv2+
+URL:           http://smartmontools.sourceforge.net/
+Source0:       http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:       smartd.initd
+Source2:       smartmontools.sysconf
+Patch1:        smartmontools-5.38-cloexec.patch
+Patch2:        smartmontools-5.37-addrinfo.patch
+Patch3:        smartmontools-5.38-perc.patch
+Patch4:        smartmontools-5.38-selinux.patch
+Patch5:        smartmontools-5.38-defaultconf.patch
+Patch6:        smartmontools-5.38-lowcap.patch
+BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires:      fileutils mailx chkconfig initscripts
 BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext
 BuildRequires: libselinux-devel automake
 
@@ -34,6 +35,7 @@ failure.
 %patch3 -p1 -b .perc
 %patch4 -p1 -b .selinux
 %patch5 -p1 -b .defaultconf
+%patch6 -p1 -b .lowcap
 
 %build
 ./autogen.sh
@@ -76,6 +78,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Wed Aug 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-13
+- drop all unnecessary capabilities (#517728)
+
 * Thu Jun 11 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-12
 - add automake to buildrequires
 



From bojan at fedoraproject.org  Thu Sep  3 09:05:12 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  3 Sep 2009 09:05:12 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-11 subversion-api-docs.spec,1.27,1.28
Message-ID: <20090903090512.3C42111C0099@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21389

Modified Files:
	subversion-api-docs.spec 
Log Message:
Add search.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-11/subversion-api-docs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- subversion-api-docs.spec	11 Aug 2009 03:46:47 -0000	1.27
+++ subversion-api-docs.spec	3 Sep 2009 09:05:11 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
 Version:        1.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -35,9 +35,10 @@ doxygen -
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs/search
 install -m 644 docs/svn.tag $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
-install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
+install -m 644 docs/html/search/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs/search
+install -m 644 `find docs/html -type f -maxdepth 1` $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 
 %clean
@@ -51,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-2
+- add search
+
 * Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-1
 - bump up to 1.6.4
 



From bojan at fedoraproject.org  Thu Sep  3 09:06:19 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  3 Sep 2009 09:06:19 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-10 subversion-api-docs.spec,1.21,1.22
Message-ID: <20090903090619.0E17E11C0099@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21718

Modified Files:
	subversion-api-docs.spec 
Log Message:
Add search.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-10/subversion-api-docs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- subversion-api-docs.spec	11 Aug 2009 03:53:07 -0000	1.21
+++ subversion-api-docs.spec	3 Sep 2009 09:06:18 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
 Version:        1.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -35,9 +35,10 @@ doxygen -
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs/search
 install -m 644 docs/svn.tag $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
-install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
+install -m 644 docs/html/search/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs/search
+install -m 644 `find docs/html -type f -maxdepth 1` $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 
 %clean
@@ -51,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-2
+- add search
+
 * Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-1
 - bump up to 1.6.4
 



From vcrhonek at fedoraproject.org  Thu Sep  3 09:11:16 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu,  3 Sep 2009 09:11:16 +0000 (UTC)
Subject: rpms/jwhois/devel jwhois.spec,1.52,1.53
Message-ID: <20090903091116.7DE2311C0099@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22927

Modified Files:
	jwhois.spec 
Log Message:
Fix errors installing jwhois with --excludedocs


Index: jwhois.spec
===================================================================
RCS file: /cvs/extras/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- jwhois.spec	16 Aug 2009 17:28:02 -0000	1.52
+++ jwhois.spec	3 Sep 2009 09:11:16 -0000	1.53
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 4.0
-Release: 17%{?dist}
+Release: 18%{?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
@@ -66,17 +66,25 @@ echo .so man1/jwhois.1 > $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/jwhois.conf
 
 %post
-/sbin/install-info %{_infodir}/jwhois.info %{_infodir}/dir || :
+if [ -f %{_infodir}/jwhois.info ]; then # --excludedocs?
+    /sbin/install-info %{_infodir}/jwhois.info %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/jwhois.info %{_infodir}/dir || :
+    if [ -f %{_infodir}/jwhois.info ]; then # --excludedocs?
+        /sbin/install-info --delete %{_infodir}/jwhois.info %{_infodir}/dir || :
+    fi
 fi
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep  3 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-18
+- Fix errors installing jwhois with --excludedocs
+  Resolves: #515940
+
 * Sun Aug 16 2009 Robert Scheck <robert at fedoraproject.org> - 4.0-17
 - Update jwhois.conf for .edu.ar, .bs, .by, .dk, .name, .ng, .ps,
   .sg, .sl, .sv, .co.zw domains and handles from .name and .aero



From mhlavink at fedoraproject.org  Thu Sep  3 09:11:34 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu,  3 Sep 2009 09:11:34 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartmontools.spec,1.55,1.56
Message-ID: <20090903091134.CAF5111C0099@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22897

Modified Files:
	smartmontools.spec 
Log Message:
update also build process and buildrequires



Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- smartmontools.spec	3 Sep 2009 09:04:56 -0000	1.55
+++ smartmontools.spec	3 Sep 2009 09:11:34 -0000	1.56
@@ -18,7 +18,7 @@ Patch6:        smartmontools-5.38-lowcap
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:      fileutils mailx chkconfig initscripts
 BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext
-BuildRequires: libselinux-devel automake
+BuildRequires: libselinux-devel libcap-ng-devel
 
 %description
 The smartmontools package contains two utility programs (smartctl
@@ -38,8 +38,9 @@ failure.
 %patch6 -p1 -b .lowcap
 
 %build
-./autogen.sh
-%configure --with-selinux
+ln -s CHANGELOG ChangeLog
+autoreconf -i
+%configure --with-selinux --with-libcap-ng=yes
 %ifarch sparc64
 make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %else



From bojan at fedoraproject.org  Thu Sep  3 09:13:29 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  3 Sep 2009 09:13:29 +0000 (UTC)
Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.16,1.17
Message-ID: <20090903091329.207C211C0099@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23538

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.8.
Add search.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- apr-api-docs.spec	28 Jul 2009 02:58:25 -0000	1.16
+++ apr-api-docs.spec	3 Sep 2009 09:13:28 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           apr-api-docs
-Version:        1.3.7
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
@@ -42,9 +42,10 @@ sed -i -e 's,^\[<a class="el" href="grou
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs/search
 install -m 644 docs/apr.tag $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
-install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
+install -m 644 docs/html/search/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs/search
+install -m 644 `find docs/html -type f -maxdepth 1` $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 
@@ -59,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-1
+- Bump up to 1.3.8
+- Add search
+
 * Tue Jul 28 2009 Bojan Smojver <bojan at rexursive.com> 1.3.7-1
 - Bump up to 1.3.7
 



From schwab at fedoraproject.org  Thu Sep  3 09:16:25 2009
From: schwab at fedoraproject.org (schwab)
Date: Thu,  3 Sep 2009 09:16:25 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.286, 1.287 glibc-fedora.patch, 1.320,
	1.321 glibc.spec, 1.413, 1.414 import.log, 1.29, 1.30 sources,
	1.311, 1.312
Message-ID: <20090903091626.0091511C0099@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24290/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- .cvsignore	2 Sep 2009 11:28:28 -0000	1.286
+++ .cvsignore	3 Sep 2009 09:16:24 -0000	1.287
@@ -1,2 +1,2 @@
-glibc-2.10-322-gd840539-fedora.tar.bz2
-glibc-2.10-322-gd840539.tar.bz2
+glibc-2.10-327-g01034d7-fedora.tar.bz2
+glibc-2.10-327-g01034d7.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   28 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- glibc-fedora.patch	2 Sep 2009 11:28:28 -0000	1.320
+++ glibc-fedora.patch	3 Sep 2009 09:16:25 -0000	1.321
@@ -1,6 +1,6 @@
---- glibc-2.10-322-gd840539/ChangeLog
-+++ glibc-2.10.90-18/ChangeLog
-@@ -540,6 +540,11 @@
+--- glibc-2.10-327-g01034d7/ChangeLog
++++ glibc-2.10.90-19/ChangeLog
+@@ -563,6 +563,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -805,6 +810,11 @@
+@@ -828,6 +833,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9203,6 +9213,13 @@
+@@ -9226,6 +9236,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9498,6 +9515,10 @@
+@@ -9521,6 +9538,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10755,6 +10776,15 @@
+@@ -10778,6 +10799,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,8 +65,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-322-gd840539/ChangeLog.15
-+++ glibc-2.10.90-18/ChangeLog.15
+--- glibc-2.10-327-g01034d7/ChangeLog.15
++++ glibc-2.10.90-19/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -132,8 +132,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-322-gd840539/ChangeLog.16
-+++ glibc-2.10.90-18/ChangeLog.16
+--- glibc-2.10-327-g01034d7/ChangeLog.16
++++ glibc-2.10.90-19/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -305,8 +305,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-322-gd840539/Makeconfig
-+++ glibc-2.10.90-18/Makeconfig
+--- glibc-2.10-327-g01034d7/Makeconfig
++++ glibc-2.10.90-19/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -323,8 +323,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-322-gd840539/csu/Makefile
-+++ glibc-2.10.90-18/csu/Makefile
+--- glibc-2.10-327-g01034d7/csu/Makefile
++++ glibc-2.10.90-19/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -335,8 +335,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-322-gd840539/csu/elf-init.c
-+++ glibc-2.10.90-18/csu/elf-init.c
+--- glibc-2.10-327-g01034d7/csu/elf-init.c
++++ glibc-2.10.90-19/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -361,8 +361,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-322-gd840539/debug/tst-chk1.c
-+++ glibc-2.10.90-18/debug/tst-chk1.c
+--- glibc-2.10-327-g01034d7/debug/tst-chk1.c
++++ glibc-2.10.90-19/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -391,8 +391,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-322-gd840539/elf/ldconfig.c
-+++ glibc-2.10.90-18/elf/ldconfig.c
+--- glibc-2.10-327-g01034d7/elf/ldconfig.c
++++ glibc-2.10.90-19/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -474,8 +474,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-322-gd840539/elf/tst-stackguard1.c
-+++ glibc-2.10.90-18/elf/tst-stackguard1.c
+--- glibc-2.10-327-g01034d7/elf/tst-stackguard1.c
++++ glibc-2.10.90-19/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -500,16 +500,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-322-gd840539/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-18/include/bits/stdlib-ldbl.h
+--- glibc-2.10-327-g01034d7/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-19/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-322-gd840539/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-18/include/bits/wchar-ldbl.h
+--- glibc-2.10-327-g01034d7/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-19/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-322-gd840539/include/features.h
-+++ glibc-2.10.90-18/include/features.h
+--- glibc-2.10-327-g01034d7/include/features.h
++++ glibc-2.10.90-19/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -526,8 +526,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-322-gd840539/intl/locale.alias
-+++ glibc-2.10.90-18/intl/locale.alias
+--- glibc-2.10-327-g01034d7/intl/locale.alias
++++ glibc-2.10.90-19/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -537,8 +537,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-322-gd840539/libio/stdio.h
-+++ glibc-2.10.90-18/libio/stdio.h
+--- glibc-2.10-327-g01034d7/libio/stdio.h
++++ glibc-2.10.90-19/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -552,8 +552,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-322-gd840539/locale/iso-4217.def
-+++ glibc-2.10.90-18/locale/iso-4217.def
+--- glibc-2.10-327-g01034d7/locale/iso-4217.def
++++ glibc-2.10.90-19/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -645,8 +645,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-322-gd840539/locale/programs/locarchive.c
-+++ glibc-2.10.90-18/locale/programs/locarchive.c
+--- glibc-2.10-327-g01034d7/locale/programs/locarchive.c
++++ glibc-2.10.90-19/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -678,8 +678,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-322-gd840539/localedata/Makefile
-+++ glibc-2.10.90-18/localedata/Makefile
+--- glibc-2.10-327-g01034d7/localedata/Makefile
++++ glibc-2.10.90-19/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -688,8 +688,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-322-gd840539/localedata/SUPPORTED
-+++ glibc-2.10.90-18/localedata/SUPPORTED
+--- glibc-2.10-327-g01034d7/localedata/SUPPORTED
++++ glibc-2.10.90-19/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -731,8 +731,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-322-gd840539/localedata/locales/cy_GB
-+++ glibc-2.10.90-18/localedata/locales/cy_GB
+--- glibc-2.10-327-g01034d7/localedata/locales/cy_GB
++++ glibc-2.10.90-19/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -747,8 +747,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-322-gd840539/localedata/locales/en_GB
-+++ glibc-2.10.90-18/localedata/locales/en_GB
+--- glibc-2.10-327-g01034d7/localedata/locales/en_GB
++++ glibc-2.10.90-19/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -760,8 +760,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-322-gd840539/localedata/locales/no_NO
-+++ glibc-2.10.90-18/localedata/locales/no_NO
+--- glibc-2.10-327-g01034d7/localedata/locales/no_NO
++++ glibc-2.10.90-19/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -832,8 +832,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-322-gd840539/localedata/locales/zh_TW
-+++ glibc-2.10.90-18/localedata/locales/zh_TW
+--- glibc-2.10-327-g01034d7/localedata/locales/zh_TW
++++ glibc-2.10.90-19/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -861,8 +861,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-322-gd840539/malloc/mcheck.c
-+++ glibc-2.10.90-18/malloc/mcheck.c
+--- glibc-2.10-327-g01034d7/malloc/mcheck.c
++++ glibc-2.10.90-19/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -938,8 +938,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-322-gd840539/manual/libc.texinfo
-+++ glibc-2.10.90-18/manual/libc.texinfo
+--- glibc-2.10-327-g01034d7/manual/libc.texinfo
++++ glibc-2.10.90-19/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -949,8 +949,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-322-gd840539/misc/sys/cdefs.h
-+++ glibc-2.10.90-18/misc/sys/cdefs.h
+--- glibc-2.10-327-g01034d7/misc/sys/cdefs.h
++++ glibc-2.10.90-19/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -994,17 +994,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-322-gd840539/nis/nss
-+++ glibc-2.10.90-18/nis/nss
+--- glibc-2.10-327-g01034d7/nis/nss
++++ glibc-2.10.90-19/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-322-gd840539/nptl/ChangeLog
-+++ glibc-2.10.90-18/nptl/ChangeLog
-@@ -3705,6 +3705,15 @@
+--- glibc-2.10-327-g01034d7/nptl/ChangeLog
++++ glibc-2.10.90-19/nptl/ChangeLog
+@@ -3713,6 +3713,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1020,7 +1020,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4441,6 +4450,11 @@
+@@ -4449,6 +4458,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1032,7 +1032,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6515,6 +6529,11 @@
+@@ -6523,6 +6537,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1044,8 +1044,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-322-gd840539/nptl/Makefile
-+++ glibc-2.10.90-18/nptl/Makefile
+--- glibc-2.10-327-g01034d7/nptl/Makefile
++++ glibc-2.10.90-19/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1078,8 +1078,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-322-gd840539/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-327-g01034d7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-19/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1088,8 +1088,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-322-gd840539/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-327-g01034d7/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-19/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1097,8 +1097,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-322-gd840539/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-18/nptl/tst-stackguard1.c
+--- glibc-2.10-327-g01034d7/nptl/tst-stackguard1.c
++++ glibc-2.10.90-19/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1123,8 +1123,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-322-gd840539/nscd/nscd.conf
-+++ glibc-2.10.90-18/nscd/nscd.conf
+--- glibc-2.10-327-g01034d7/nscd/nscd.conf
++++ glibc-2.10.90-19/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1134,8 +1134,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-322-gd840539/nscd/nscd.init
-+++ glibc-2.10.90-18/nscd/nscd.init
+--- glibc-2.10-327-g01034d7/nscd/nscd.init
++++ glibc-2.10.90-19/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1192,8 +1192,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-322-gd840539/posix/Makefile
-+++ glibc-2.10.90-18/posix/Makefile
+--- glibc-2.10-327-g01034d7/posix/Makefile
++++ glibc-2.10.90-19/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1214,8 +1214,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-322-gd840539/posix/getconf.speclist.h
-+++ glibc-2.10.90-18/posix/getconf.speclist.h
+--- glibc-2.10-327-g01034d7/posix/getconf.speclist.h
++++ glibc-2.10.90-19/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1256,8 +1256,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-322-gd840539/streams/Makefile
-+++ glibc-2.10.90-18/streams/Makefile
+--- glibc-2.10-327-g01034d7/streams/Makefile
++++ glibc-2.10.90-19/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1267,8 +1267,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-322-gd840539/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-18/sysdeps/generic/dl-cache.h
+--- glibc-2.10-327-g01034d7/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-19/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1284,8 +1284,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-322-gd840539/sysdeps/i386/Makefile
-+++ glibc-2.10.90-18/sysdeps/i386/Makefile
+--- glibc-2.10-327-g01034d7/sysdeps/i386/Makefile
++++ glibc-2.10.90-19/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1310,8 +1310,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-322-gd840539/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-18/sysdeps/ia64/Makefile
+--- glibc-2.10-327-g01034d7/sysdeps/ia64/Makefile
++++ glibc-2.10.90-19/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1323,8 +1323,8 @@
  endif
  endif
  
---- glibc-2.10-322-gd840539/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-18/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-327-g01034d7/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-19/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1676,8 +1676,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-322-gd840539/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-18/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-327-g01034d7/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-19/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1763,8 +1763,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-322-gd840539/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-18/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-327-g01034d7/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-19/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1773,8 +1773,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-322-gd840539/sysdeps/unix/nice.c
-+++ glibc-2.10.90-18/sysdeps/unix/nice.c
+--- glibc-2.10-327-g01034d7/sysdeps/unix/nice.c
++++ glibc-2.10.90-19/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1789,8 +1789,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1806,8 +1806,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1855,8 +1855,8 @@
      }
    else
  #endif
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1899,8 +1899,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1919,8 +1919,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1981,8 +1981,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2015,29 +2015,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2063,8 +2063,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2074,8 +2074,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2121,8 +2121,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-322-gd840539/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2141,8 +2141,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-322-gd840539/timezone/zic.c
-+++ glibc-2.10.90-18/timezone/zic.c
+--- glibc-2.10-327-g01034d7/timezone/zic.c
++++ glibc-2.10.90-19/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- glibc.spec	2 Sep 2009 11:28:29 -0000	1.413
+++ glibc.spec	3 Sep 2009 09:16:25 -0000	1.414
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-322-gd840539
+%define glibcsrcdir glibc-2.10-327-g01034d7
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 19
+Release: 20
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1029,6 +1029,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Sep  3 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-20
+- Update from master.
+  - Fix strstr/strcasestr/fma/fmaf on x86_64 (#519226).
+  - Fix lookup of group names in hesiod initgroups (#520472).
+
 * Wed Sep  2 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-19
 - Update from master.
   - Fix x86_64 bits/mathinline.h for -m32 compilation.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- import.log	2 Sep 2009 11:28:29 -0000	1.29
+++ import.log	3 Sep 2009 09:16:25 -0000	1.30
@@ -27,3 +27,4 @@ glibc-2_10_90-16:HEAD:glibc-2.10.90-16.s
 glibc-2_10_90-17:HEAD:glibc-2.10.90-17.src.rpm:1251406917
 glibc-2_10_90-18:HEAD:glibc-2.10.90-18.src.rpm:1251802906
 glibc-2_10_90-19:HEAD:glibc-2.10.90-19.src.rpm:1251889856
+glibc-2_10_90-20:HEAD:glibc-2.10.90-20.src.rpm:1251969190


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- sources	2 Sep 2009 11:28:29 -0000	1.311
+++ sources	3 Sep 2009 09:16:25 -0000	1.312
@@ -1,2 +1,2 @@
-76cd8fe4fc85a7bb8cbcc26e7ee1b596  glibc-2.10-322-gd840539-fedora.tar.bz2
-a62cbf8a80e00e4bca0b78f17b9f50a3  glibc-2.10-322-gd840539.tar.bz2
+f09abd16c8c4af2b8b121d1fc0c3bcf8  glibc-2.10-327-g01034d7-fedora.tar.bz2
+6ca9cac4ff45488909e548278d888620  glibc-2.10-327-g01034d7.tar.bz2



From bojan at fedoraproject.org  Thu Sep  3 09:17:43 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  3 Sep 2009 09:17:43 +0000 (UTC)
Subject: rpms/apr-api-docs/F-11 apr-api-docs.spec,1.13,1.14
Message-ID: <20090903091743.2370B11C0099@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24735

Modified Files:
	apr-api-docs.spec 
Log Message:
Add search.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/F-11/apr-api-docs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- apr-api-docs.spec	10 Aug 2009 07:13:59 -0000	1.13
+++ apr-api-docs.spec	3 Sep 2009 09:17:42 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -42,9 +42,10 @@ sed -i -e 's,^\[<a class="el" href="grou
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs/search
 install -m 644 docs/apr.tag $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
-install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
+install -m 644 docs/html/search/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs/search
+install -m 644 `find docs/html -type f -maxdepth 1` $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 
@@ -59,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-2
+- Add search
+
 * Mon Aug 10 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-1
 - Bump up to 1.3.8
 



From bojan at fedoraproject.org  Thu Sep  3 09:18:21 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  3 Sep 2009 09:18:21 +0000 (UTC)
Subject: rpms/apr-api-docs/F-10 apr-api-docs.spec,1.12,1.13
Message-ID: <20090903091821.9491911C0099@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24975

Modified Files:
	apr-api-docs.spec 
Log Message:
Add search.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/F-10/apr-api-docs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- apr-api-docs.spec	10 Aug 2009 07:20:16 -0000	1.12
+++ apr-api-docs.spec	3 Sep 2009 09:18:21 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -42,9 +42,10 @@ sed -i -e 's,^\[<a class="el" href="grou
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs/search
 install -m 644 docs/apr.tag $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
-install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
+install -m 644 docs/html/search/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs/search
+install -m 644 `find docs/html -type f -maxdepth 1` $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs
 
@@ -59,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-2
+- Add search
+
 * Mon Aug 10 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-1
 - Bump up to 1.3.8
 



From pghmcfc at fedoraproject.org  Thu Sep  3 09:25:58 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  3 Sep 2009 09:25:58 +0000 (UTC)
Subject: rpms/redhat-rpm-config/F-11
	redhat-rpm-config-9.0.3-filtering-macros.patch, 1.1,
	1.2 redhat-rpm-config.spec, 1.66, 1.67
Message-ID: <20090903092558.91D4D11C0099@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/redhat-rpm-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27106

Modified Files:
	redhat-rpm-config-9.0.3-filtering-macros.patch 
	redhat-rpm-config.spec 
Log Message:
* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-12
- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
- add (empty) %build section
- fix unescaped macros in changelog


redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Index: redhat-rpm-config-9.0.3-filtering-macros.patch
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-11/redhat-rpm-config-9.0.3-filtering-macros.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- redhat-rpm-config-9.0.3-filtering-macros.patch	21 Aug 2009 20:48:08 -0000	1.1
+++ redhat-rpm-config-9.0.3-filtering-macros.patch	3 Sep 2009 09:25:57 -0000	1.2
@@ -1,6 +1,6 @@
 --- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
 +++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
-@@ -224,3 +224,37 @@
+@@ -240,3 +240,37 @@ kernel_module_package_release	1
  	fi \
  	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
  )}


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-11/redhat-rpm-config.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- redhat-rpm-config.spec	1 Sep 2009 22:12:14 -0000	1.66
+++ redhat-rpm-config.spec	3 Sep 2009 09:25:57 -0000	1.67
@@ -1,7 +1,7 @@
-Summary: Red Hat specific rpm configuration files.
+Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -29,6 +29,8 @@ Red Hat specific rpm configuration files
 %patch4 -p1
 %patch5 -p1
 
+%build
+
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
 
@@ -40,6 +42,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-12
+- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
+- add (empty) %%build section
+- fix unescaped macros in changelog
+
 * Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-11
 - add filtering system macros, w/o backporting other updates (#516240)
 
@@ -132,7 +139,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Added patch for find-requires. Waiting on write access to public CVS.
 
 * Tue Sep 12 2006 Deepak Bhole <dbhole at redhat.com> 8.0.45-6
-- Fix brp-java-repack-jars to work with builddirs that aren't %name-%version
+- Fix brp-java-repack-jars to work with builddirs that aren't %%name-%%version
 
 * Mon Sep 11 2006 Fernando Nasser <fnasser at redhat.com> - 8.0.45-5
 - Fix order of tokens in find command (thanks mikeb at redhat.com)
@@ -276,7 +283,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Remove tracking dependency
 
 * Wed Oct 16 2002 Phil Knirsch <pknirsch at redhat.com> 8.0.3-2
-- Added fix for outdated config.[sub|guess] files in %configure section
+- Added fix for outdated config.[sub|guess] files in %%configure section
 
 * Wed Oct 16 2002 Elliot Lee <sopwith at redhat.com> 8.0.3-1
 - New release that blows up on unpackaged files and missing doc files.
@@ -285,7 +292,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - don't redefine everything in macros, just what we need to
 
 * Mon Sep 16 2002 Alexander Larsson <alexl at redhat.com> 8.0.1
-- Add debug package support to %__spec_install_post
+- Add debug package support to %%__spec_install_post
 
 * Tue Sep  3 2002 Bill Nottingham <notting at redhat.com> 8.0-1
 - bump version



From hadess at fedoraproject.org  Thu Sep  3 09:36:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  3 Sep 2009 09:36:57 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.44, 1.45 bluez.spec, 1.92,
	1.93 sources, 1.44, 1.45
Message-ID: <20090903093657.2D9DB11C0099@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29244

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Thu Sep 03 2009 Bastien Nocera <bnocera at redhat.com> 4.51-1
- Update to 4.51



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	1 Sep 2009 14:58:17 -0000	1.44
+++ .cvsignore	3 Sep 2009 09:36:56 -0000	1.45
@@ -1 +1 @@
-bluez-4.50.tar.gz
+bluez-4.51.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- bluez.spec	1 Sep 2009 16:42:32 -0000	1.92
+++ bluez.spec	3 Sep 2009 09:36:56 -0000	1.93
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.50
-Release: 2%{?dist}
+Version: 4.51
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -274,6 +274,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Thu Sep 03 2009 Bastien Nocera <bnocera at redhat.com> 4.51-1
+- Update to 4.51
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 4.50-2
 - Remove obsoleted patches
 - Add another CUPS backend patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	1 Sep 2009 14:58:17 -0000	1.44
+++ sources	3 Sep 2009 09:36:56 -0000	1.45
@@ -1 +1 @@
-e80152c946493e1bb66eca718e8b7ee0  bluez-4.50.tar.gz
+9693387139bc0c68657fbfe8ceb2fd8d  bluez-4.51.tar.gz



From mschwendt at fedoraproject.org  Thu Sep  3 09:40:21 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  3 Sep 2009 09:40:21 +0000 (UTC)
Subject: rpms/audacity/devel README,1.26,1.27
Message-ID: <20090903094021.1C8F011C0381@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29992

Modified Files:
	README 
Log Message:
noticed the 1.3.9-beta tarball announcement


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/README,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- README	2 Feb 2009 18:41:25 -0000	1.26
+++ README	3 Sep 2009 09:40:20 -0000	1.27
@@ -1,3 +1,7 @@
+$ md5sum audacity-minsrc-1.3.9.tar.bz2 
+0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2
+
+-----
 Audacity 1.3.7-beta release : audacity-minsrc-1.3.7.tar.bz2
 
 | Requested 'vamp-hostsdk >= 2.0' but version of vamp-hostsdk is 1.1.0



From pghmcfc at fedoraproject.org  Thu Sep  3 09:47:07 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  3 Sep 2009 09:47:07 +0000 (UTC)
Subject: rpms/redhat-rpm-config/F-10 limit-smp-16-threads.patch, 1.1,
	1.2 redhat-rpm-config-9.0.3-filtering-macros.patch, 1.1,
	1.2 redhat-rpm-config.spec, 1.60, 1.61
Message-ID: <20090903094707.448B411C0099@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/redhat-rpm-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31142

Modified Files:
	limit-smp-16-threads.patch 
	redhat-rpm-config-9.0.3-filtering-macros.patch 
	redhat-rpm-config.spec 
Log Message:
* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-7
- limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)
- actually apply the filtering macros patch
- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
- add (empty) %build section
- fix unescaped macros in changelog


limit-smp-16-threads.patch:
 macros |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: limit-smp-16-threads.patch
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/limit-smp-16-threads.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- limit-smp-16-threads.patch	16 Feb 2009 17:02:51 -0000	1.1
+++ limit-smp-16-threads.patch	3 Sep 2009 09:47:06 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur redhat-rpm-config-9.0.2-orig/macros redhat-rpm-config-9.0.2/macros
---- redhat-rpm-config-9.0.2-orig/macros	2008-04-03 02:14:54.000000000 -0500
-+++ redhat-rpm-config-9.0.2/macros	2008-05-20 13:33:15.000000000 -0500
-@@ -68,7 +68,8 @@
+diff -up redhat-rpm-config-9.0.3/macros.orig redhat-rpm-config-9.0.3/macros
+--- redhat-rpm-config-9.0.3/macros.orig	2008-05-06 19:08:20.000000000 -0400
++++ redhat-rpm-config-9.0.3/macros	2009-06-03 15:00:28.000000000 -0400
+@@ -67,7 +67,8 @@
  
  %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
  	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\

redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Index: redhat-rpm-config-9.0.3-filtering-macros.patch
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/redhat-rpm-config-9.0.3-filtering-macros.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- redhat-rpm-config-9.0.3-filtering-macros.patch	21 Aug 2009 20:54:07 -0000	1.1
+++ redhat-rpm-config-9.0.3-filtering-macros.patch	3 Sep 2009 09:47:06 -0000	1.2
@@ -1,6 +1,6 @@
 --- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
 +++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
-@@ -224,3 +224,37 @@
+@@ -236,3 +236,37 @@ kernel_module_package_release	1
  	fi \
  	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
  )}


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/redhat-rpm-config.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- redhat-rpm-config.spec	1 Sep 2009 22:12:14 -0000	1.60
+++ redhat-rpm-config.spec	3 Sep 2009 09:47:06 -0000	1.61
@@ -1,7 +1,7 @@
-Summary: Red Hat specific rpm configuration files.
+Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -22,6 +22,9 @@ Red Hat specific rpm configuration files
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+%build
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -34,6 +37,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-7
+- limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)
+- actually apply the filtering macros patch
+- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
+- add (empty) %%build section
+- fix unescaped macros in changelog
+
 * Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 9.0.3-6
 - add filtering system macros, w/o backporting other updates (#516240)
 
@@ -107,7 +117,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Added patch for find-requires. Waiting on write access to public CVS.
 
 * Tue Sep 12 2006 Deepak Bhole <dbhole at redhat.com> 8.0.45-6
-- Fix brp-java-repack-jars to work with builddirs that aren't %name-%version
+- Fix brp-java-repack-jars to work with builddirs that aren't %%name-%%version
 
 * Mon Sep 11 2006 Fernando Nasser <fnasser at redhat.com> - 8.0.45-5
 - Fix order of tokens in find command (thanks mikeb at redhat.com)
@@ -251,7 +261,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Remove tracking dependency
 
 * Wed Oct 16 2002 Phil Knirsch <pknirsch at redhat.com> 8.0.3-2
-- Added fix for outdated config.[sub|guess] files in %configure section
+- Added fix for outdated config.[sub|guess] files in %%configure section
 
 * Wed Oct 16 2002 Elliot Lee <sopwith at redhat.com> 8.0.3-1
 - New release that blows up on unpackaged files and missing doc files.
@@ -260,7 +270,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - don't redefine everything in macros, just what we need to
 
 * Mon Sep 16 2002 Alexander Larsson <alexl at redhat.com> 8.0.1
-- Add debug package support to %__spec_install_post
+- Add debug package support to %%__spec_install_post
 
 * Tue Sep  3 2002 Bill Nottingham <notting at redhat.com> 8.0-1
 - bump version



From nphilipp at fedoraproject.org  Thu Sep  3 09:47:36 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  3 Sep 2009 09:47:36 +0000 (UTC)
Subject: rpms/libhugetlbfs/devel libhugetlbfs-2.6-s390x-build.patch, NONE,
	1.1 libhugetlbfs.spec, 1.30,
	1.31 remove-s390-libhugetlbfs-2.4.patch, 1.1, NONE
Message-ID: <20090903094736.D3B0D11C0099@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/libhugetlbfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31461

Modified Files:
	libhugetlbfs.spec 
Added Files:
	libhugetlbfs-2.6-s390x-build.patch 
Removed Files:
	remove-s390-libhugetlbfs-2.4.patch 
Log Message:
fix building on s390x


libhugetlbfs-2.6-s390x-build.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libhugetlbfs-2.6-s390x-build.patch ---
diff -up libhugetlbfs-2.6/Makefile.s390x-build libhugetlbfs-2.6/Makefile
--- libhugetlbfs-2.6/Makefile.s390x-build	2009-08-24 14:56:07.000000000 +0200
+++ libhugetlbfs-2.6/Makefile	2009-09-01 10:08:15.939516241 +0200
@@ -74,10 +74,12 @@ CFLAGS += -DNO_ELFLINK
 else
 ifeq ($(ARCH),s390x)
 CC64 = gcc -m64
-CC32 = gcc -m31
 TMPLIB64 = lib64
 TMPLIB32 = lib
 CFLAGS += -DNO_ELFLINK
+ifneq ($(BUILDTYPE),NATIVEONLY)
+CC32 = gcc -m31
+endif
 else
 $(error "Unrecognized architecture ($(ARCH))")
 endif


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/libhugetlbfs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libhugetlbfs.spec	31 Aug 2009 11:23:39 -0000	1.30
+++ libhugetlbfs.spec	3 Sep 2009 09:47:36 -0000	1.31
@@ -1,13 +1,13 @@
 Name: libhugetlbfs
 Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libhugetlbfs.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
-Patch0: remove-s390-libhugetlbfs-2.4.patch
+Patch0: libhugetlbfs-2.6-s390x-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -42,6 +42,7 @@ pool size control. pagesize lists page s
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .s390x-build
 
 %build
 # Parallel builds are not reliable
@@ -98,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> 2.6-2
+- fix building on s390x
+
 * Mon Aug 31 2009 Eric Munson <ebmunson at us.ibm.com> 2.6-1
 - Updating for the libhugetlbfs-2.6 release
 


--- remove-s390-libhugetlbfs-2.4.patch DELETED ---



From tuxbrewr at fedoraproject.org  Thu Sep  3 09:48:18 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Thu,  3 Sep 2009 09:48:18 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec, 1.42, 1.43 sources, 1.19,
	1.20
Message-ID: <20090903094818.9F05911C0099@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31709

Modified Files:
	kpackagekit.spec sources 
Log Message:
new git snapshot


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kpackagekit.spec	25 Aug 2009 23:06:10 -0000	1.42
+++ kpackagekit.spec	3 Sep 2009 09:48:18 -0000	1.43
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.5.0
-Release:	0.1.20090824svn%{?dist}
+Release:	0.1.20090902svn%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 02 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090902svn
+- New git snapshot
+
 * Mon Aug 24 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090824svn
 - New git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	25 Aug 2009 23:06:11 -0000	1.19
+++ sources	3 Sep 2009 09:48:18 -0000	1.20
@@ -1 +1 @@
-3b7f930e85f42c77700ec04ff08ce9cf  kpackagekit-0.5.0.tar.bz2
+763708cf93f5fe23e90860ee298b5159  kpackagekit-0.5.0.tar.bz2



From sharkcz at fedoraproject.org  Thu Sep  3 09:53:48 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  3 Sep 2009 09:53:48 +0000 (UTC)
Subject: rpms/s390utils/devel s390utils.spec,1.3,1.4
Message-ID: <20090903095348.3633C11C0099@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv344

Modified Files:
	s390utils.spec 
Log Message:
* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-3
- create devel subpackage with some useful headers
- preserving timestamps on installed files



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- s390utils.spec	26 Aug 2009 12:43:55 -0000	1.3
+++ s390utils.spec	3 Sep 2009 09:53:47 -0000	1.4
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -182,6 +182,7 @@ pushd lib-zfcp-hbaapi-%{hbaapiver}
 make EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 popd
 
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -193,10 +194,10 @@ make install \
         LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
         DISTRELEASE=%{release}
 
-%{__mkdir} -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-%{__mkdir} -p ${RPM_BUILD_ROOT}%{_initddir}
-%{__mkdir} -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
-%{__mkdir} -p ${RPM_BUILD_ROOT}/sbin
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+mkdir -p ${RPM_BUILD_ROOT}/sbin
 
 install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -205,16 +206,16 @@ install -p -m 755 %{SOURCE5} $RPM_BUILD_
 install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-zfcp.rules
 install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-dasd.rules
 
-install -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
+install -p -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -p -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
 
-install -m 644 etc/sysconfig/mon_statd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 755 etc/init.d/mon_statd ${RPM_BUILD_ROOT}%{_initddir}/mon_statd
+install -p -m 644 etc/sysconfig/mon_statd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -p -m 755 etc/init.d/mon_statd ${RPM_BUILD_ROOT}%{_initddir}/mon_statd
 
-install -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
+install -p -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -p -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
 
-install -D -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+install -Dp -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 
 # cmsfs tools must be available in /sbin
 install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/sbin
@@ -239,6 +240,10 @@ pushd lib-zfcp-hbaapi-%{hbaapiver}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/lib-zfcp-hbaapi-devel-%{hbaapiver}/latex
 popd
 
+# install usefull headers for devel subpackage
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
+install -p -m 644 include/vtoc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -744,8 +749,27 @@ This package contains the CMS file syste
 %{_mandir}/man8/cmsfslst.8*
 %{_mandir}/man8/cmsfsvol.8*
 
+#
+# *********************** devel package  ***********************
+#
+%package devel
+License:        GPLv2
+Summary:        Development files
+Group:          Development/Libraries
+
+%description devel
+User-space development files for the s390/s390x architecture.
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+
 
 %changelog
+* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-3
+- create devel subpackage with some useful headers
+- preserving timestamps on installed files
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-2
 - Fix byte check for disk encryption check in lsluns (#510032)
 - Fix cmm configuration file value initialization parser in cpuplugd (#511379)
@@ -1147,5 +1171,3 @@ This package contains the CMS file syste
 
 * Thu Aug 02 2001 Karsten Hopp <karsten at redhat.de>
 - initial build
-
-



From sharkcz at fedoraproject.org  Thu Sep  3 09:54:43 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  3 Sep 2009 09:54:43 +0000 (UTC)
Subject: rpms/s390utils/F-11 s390utils.spec,1.4,1.5
Message-ID: <20090903095443.0FF0811C0099@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv628

Modified Files:
	s390utils.spec 
Log Message:
* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-3
- create devel subpackage with some useful headers
- preserving timestamps on installed files



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- s390utils.spec	26 Aug 2009 12:41:41 -0000	1.4
+++ s390utils.spec	3 Sep 2009 09:54:42 -0000	1.5
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -182,6 +182,7 @@ pushd lib-zfcp-hbaapi-%{hbaapiver}
 make EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 popd
 
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -193,10 +194,10 @@ make install \
         LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
         DISTRELEASE=%{release}
 
-%{__mkdir} -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-%{__mkdir} -p ${RPM_BUILD_ROOT}%{_initddir}
-%{__mkdir} -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
-%{__mkdir} -p ${RPM_BUILD_ROOT}/sbin
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+mkdir -p ${RPM_BUILD_ROOT}/sbin
 
 install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -205,16 +206,16 @@ install -p -m 755 %{SOURCE5} $RPM_BUILD_
 install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-zfcp.rules
 install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-dasd.rules
 
-install -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
+install -p -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -p -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
 
-install -m 644 etc/sysconfig/mon_statd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 755 etc/init.d/mon_statd ${RPM_BUILD_ROOT}%{_initddir}/mon_statd
+install -p -m 644 etc/sysconfig/mon_statd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -p -m 755 etc/init.d/mon_statd ${RPM_BUILD_ROOT}%{_initddir}/mon_statd
 
-install -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
+install -p -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -p -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
 
-install -D -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+install -Dp -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 
 # cmsfs tools must be available in /sbin
 install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/sbin
@@ -239,6 +240,10 @@ pushd lib-zfcp-hbaapi-%{hbaapiver}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/lib-zfcp-hbaapi-devel-%{hbaapiver}/latex
 popd
 
+# install usefull headers for devel subpackage
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
+install -p -m 644 include/vtoc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -744,8 +749,27 @@ This package contains the CMS file syste
 %{_mandir}/man8/cmsfslst.8*
 %{_mandir}/man8/cmsfsvol.8*
 
+#
+# *********************** devel package  ***********************
+#
+%package devel
+License:        GPLv2
+Summary:        Development files
+Group:          Development/Libraries
+
+%description devel
+User-space development files for the s390/s390x architecture.
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+
 
 %changelog
+* Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-3
+- create devel subpackage with some useful headers
+- preserving timestamps on installed files
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-2
 - Fix byte check for disk encryption check in lsluns (#510032)
 - Fix cmm configuration file value initialization parser in cpuplugd (#511379)
@@ -1147,5 +1171,3 @@ This package contains the CMS file syste
 
 * Thu Aug 02 2001 Karsten Hopp <karsten at redhat.de>
 - initial build
-
-



From hadess at fedoraproject.org  Thu Sep  3 09:57:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  3 Sep 2009 09:57:36 +0000 (UTC)
Subject: rpms/bluez/devel bluez-utils-oui-usage.patch, 1.1, 1.2 bluez.spec, 
	1.93,
	1.94 0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch, 
	1.1, NONE
Message-ID: <20090903095736.AAAE711C0099@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1970

Modified Files:
	bluez-utils-oui-usage.patch bluez.spec 
Removed Files:
	0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch 
Log Message:
Update patches

bluez-utils-oui-usage.patch:
 oui.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Index: bluez-utils-oui-usage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez-utils-oui-usage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bluez-utils-oui-usage.patch	11 Sep 2008 02:10:24 -0000	1.1
+++ bluez-utils-oui-usage.patch	3 Sep 2009 09:57:36 -0000	1.2
@@ -1,10 +1,10 @@
-Index: common/oui.c
+Index: src/oui.c
 ===================================================================
 RCS file: /cvsroot/bluez/utils/common/oui.c,v
 retrieving revision 1.2
 diff -u -p -r1.2 oui.c
---- common/oui.c	13 Jan 2007 17:48:12 -0000	1.2
-+++ common/oui.c	25 Jan 2008 12:16:58 -0000
+--- src/oui.c	13 Jan 2007 17:48:12 -0000	1.2
++++ src/oui.c	25 Jan 2008 12:16:58 -0000
 @@ -38,7 +38,7 @@
  
  /* http://standards.ieee.org/regauth/oui/oui.txt */


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- bluez.spec	3 Sep 2009 09:36:56 -0000	1.93
+++ bluez.spec	3 Sep 2009 09:57:36 -0000	1.94
@@ -23,8 +23,6 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
-# http://thread.gmane.org/gmane.linux.bluez.kernel/3264/focus=3286
-Patch6: 0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -134,7 +132,6 @@ This includes hidd, dund and pand.
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cable-pairing
-%patch6 -p1 -b .newer-cups
 
 %build
 libtoolize -f -c


--- 0001-Make-discovery-mode-of-bluetooth-CUPS-backend-work-w.patch DELETED ---



From karsten at fedoraproject.org  Thu Sep  3 10:02:03 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Sep 2009 10:02:03 +0000 (UTC)
Subject: rpms/libx86/devel libx86.spec,1.7,1.8
Message-ID: <20090903100203.9DD1511C0099@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libx86/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2862

Modified Files:
	libx86.spec 
Log Message:
- excludearch s390, s390x where we don't have sys/io.h


Index: libx86.spec
===================================================================
RCS file: /cvs/extras/rpms/libx86/devel/libx86.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libx86.spec	4 Aug 2009 03:12:11 -0000	1.7
+++ libx86.spec	3 Sep 2009 10:02:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libx86
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library for making real-mode x86 calls
 
 Group:          System Environment/Libraries
@@ -8,9 +8,9 @@ License:        MIT
 URL:            http://www.codon.org.uk/~mjg59/libx86
 Source0:        http://www.codon.org.uk/~mjg59/libx86/downloads/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# does not build on ppc or ppc64 yet, due to the lack of port i/o redirection
-# and video routing
-ExcludeArch:    ppc ppc64
+# does not build on ppc, ppc64 and s390* yet, due to the lack of port i/o
+# redirection and video routing
+ExcludeArch:    ppc ppc64 s390 s390x
 
 Patch0: libx86-add-pkgconfig.patch
 
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/x86.pc
 
 %changelog
+* Thu Sep 03 2009 Karsten Hopp <karsten at redhat.com> 1.1-7
+- excludearch s390, s390x where we don't have sys/io.h
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.1-6
 - add pkgconfig support
 



From fabbione at fedoraproject.org  Thu Sep  3 10:17:48 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu,  3 Sep 2009 10:17:48 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel ocfs2-tools.spec,1.9,1.10
Message-ID: <20090903101749.1A87211C0099@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8380

Modified Files:
	ocfs2-tools.spec 
Log Message:
Fix pacemaker and cman Requires



Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocfs2-tools.spec	2 Sep 2009 11:40:20 -0000	1.9
+++ ocfs2-tools.spec	3 Sep 2009 10:17:47 -0000	1.10
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.2
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -77,6 +77,7 @@ develop Ocfs2 filesystem-specific progra
 Summary: Tools for managing the Ocfs2 cluster file system (cman component)
 Group: System Environment/Base
 Requires: cman >= 3.0.0-1
+Requires: %{name} = %{version}-%{release}
 
 %description cman
 ocfs2-tools-cman contains the daemon required to use Ocfs2 with
@@ -86,6 +87,7 @@ cman cluster manager
 Summary: Tools for managing the Ocfs2 cluster file system (pacemaker component)
 Group: System Environment/Base
 Requires: pacemaker >= 1.0.5-1
+Requires: %{name} = %{version}-%{release}
 
 %description pcmk
 ocfs2-tools-pcmk contains the daemon required to use Ocfs2 with
@@ -202,6 +204,9 @@ fi
 /sbin/ocfs2_controld.pcmk
 
 %changelog
+* Thu Sep  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-3
+- Fix pcmk and cman Requires.
+
 * Wed Sep  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-2
 - Fix udev rule packaging
 



From vcrhonek at fedoraproject.org  Thu Sep  3 10:26:22 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu,  3 Sep 2009 10:26:22 +0000 (UTC)
Subject: rpms/m4/devel m4.spec,1.39,1.40
Message-ID: <20090903102622.26E8011C0099@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/m4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10115

Modified Files:
	m4.spec 
Log Message:
Fix errors installing m4 with --excludedocs


Index: m4.spec
===================================================================
RCS file: /cvs/extras/rpms/m4/devel/m4.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- m4.spec	12 Aug 2009 17:35:16 -0000	1.39
+++ m4.spec	3 Sep 2009 10:26:21 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor
 Name: m4
 Version: 1.4.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
@@ -44,17 +44,25 @@ make %{?_smp_mflags} check
 %{_mandir}/man1/m4.1*
 
 %post
-/sbin/install-info %{_infodir}/m4.info %{_infodir}/dir || :
+if [ -f %{_infodir}/m4.info ]; then # --excludedocs?
+    /sbin/install-info %{_infodir}/m4.info %{_infodir}/dir || :
+fi
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/m4.info %{_infodir}/dir || :
+    if [ -f %{_infodir}/m4.info ]; then # --excludedocs?
+        /sbin/install-info --delete %{_infodir}/m4.info %{_infodir}/dir || :
+    fi
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep  3 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.13-4
+- Fix errors installing m4 with --excludedocs
+  Resolves: #516013
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.4.13-3
 - Use xz compressed upstream tarball.
 



From hubbitus at fedoraproject.org  Thu Sep  3 10:49:10 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  3 Sep 2009 10:49:10 +0000 (UTC)
Subject: rpms/vanessa_adt/devel import.log, NONE, 1.1 vanessa_adt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090903104911.0531A11C0099@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_adt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17999/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_adt.spec 
Log Message:
Initial import vanessa_adt into Fedora


--- NEW FILE import.log ---
vanessa_adt-0_0_7-6_fc11:HEAD:vanessa_adt-0.0.7-6.fc11.src.rpm:1251974915


--- NEW FILE vanessa_adt.spec ---
Summary:		Library of Abstract Data Types 
Name:		vanessa_adt
Version:		0.0.7
Release:		6%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/%{name}/%{version}/%{name}-%{version}.tar.gz
Requires:		vanessa_logger >= 0.0.5
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool vanessa_logger-devel >= 0.0.5

%description
Library of Abstract Data Types (ADTs) that may be useful.  Includes queue,
dynamic array and key value ADT.

%package		devel
Summary:		Headers and static libraries for development
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		vanessa_logger-devel >= 0.0.5

%description devel
Headers and static libraries required to develop against vanessa_adt.

%prep
%setup -q

%build

CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/{etc,%{prefix}/{lib,bin,doc}}
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Tue Aug 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-6
- Add %%{?_smp_mflags}
- End Fedora review.

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-5
- Fedora Review started. Thanks to Andrew Colin Kissa.
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_adt/vanessa_adt-0.0.7-2.fc8.Hu.0.src.rpm
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Delete unversioned explicit provides: Provides:		%%{name}-%%{version}
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Remove *.*a files in %%install.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- In devel turn "Provides: %%{name}-devel-%%{version}" to "%%{name}-devel = %%{version}-%%{release}".
- Add --disable-static in configure options (with it .la file not produced).
- Licence changed to LGPLv2+ from just LGPL.

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.7-2
- Replace Tag Copyright by License
- Change license to it abbriviation LGPL (was GNU Lesser General Public Licence)
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	2%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>

* Sat Sep 2 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:15:36 -0000	1.1
+++ .cvsignore	3 Sep 2009 10:49:08 -0000	1.2
@@ -0,0 +1 @@
+vanessa_adt-0.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:15:36 -0000	1.1
+++ sources	3 Sep 2009 10:49:08 -0000	1.2
@@ -0,0 +1 @@
+e7952bc3ae35a0a042cfe370bc03ce88  vanessa_adt-0.0.7.tar.gz



From hubbitus at fedoraproject.org  Thu Sep  3 10:51:18 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  3 Sep 2009 10:51:18 +0000 (UTC)
Subject: rpms/vanessa_adt/F-10 import.log, NONE, 1.1 vanessa_adt.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090903105118.91D0811C0099@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_adt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18705/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_adt.spec 
Log Message:
Initial import vanessa_adt into Fedora


--- NEW FILE import.log ---
vanessa_adt-0_0_7-6_fc11:F-10:vanessa_adt-0.0.7-6.fc11.src.rpm:1251975006


--- NEW FILE vanessa_adt.spec ---
Summary:		Library of Abstract Data Types 
Name:		vanessa_adt
Version:		0.0.7
Release:		6%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/%{name}/%{version}/%{name}-%{version}.tar.gz
Requires:		vanessa_logger >= 0.0.5
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool vanessa_logger-devel >= 0.0.5

%description
Library of Abstract Data Types (ADTs) that may be useful.  Includes queue,
dynamic array and key value ADT.

%package		devel
Summary:		Headers and static libraries for development
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		vanessa_logger-devel >= 0.0.5

%description devel
Headers and static libraries required to develop against vanessa_adt.

%prep
%setup -q

%build

CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/{etc,%{prefix}/{lib,bin,doc}}
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Tue Aug 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-6
- Add %%{?_smp_mflags}
- End Fedora review.

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-5
- Fedora Review started. Thanks to Andrew Colin Kissa.
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_adt/vanessa_adt-0.0.7-2.fc8.Hu.0.src.rpm
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Delete unversioned explicit provides: Provides:		%%{name}-%%{version}
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Remove *.*a files in %%install.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- In devel turn "Provides: %%{name}-devel-%%{version}" to "%%{name}-devel = %%{version}-%%{release}".
- Add --disable-static in configure options (with it .la file not produced).
- Licence changed to LGPLv2+ from just LGPL.

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.7-2
- Replace Tag Copyright by License
- Change license to it abbriviation LGPL (was GNU Lesser General Public Licence)
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	2%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>

* Sat Sep 2 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:15:36 -0000	1.1
+++ .cvsignore	3 Sep 2009 10:51:17 -0000	1.2
@@ -0,0 +1 @@
+vanessa_adt-0.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:15:36 -0000	1.1
+++ sources	3 Sep 2009 10:51:18 -0000	1.2
@@ -0,0 +1 @@
+e7952bc3ae35a0a042cfe370bc03ce88  vanessa_adt-0.0.7.tar.gz



From hubbitus at fedoraproject.org  Thu Sep  3 10:54:50 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  3 Sep 2009 10:54:50 +0000 (UTC)
Subject: rpms/vanessa_adt/F-11 import.log, NONE, 1.1 vanessa_adt.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090903105450.6499611C0099@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_adt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19589/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_adt.spec 
Log Message:
Initial import vanessa_adt into Fedora


--- NEW FILE import.log ---
vanessa_adt-0_0_7-6_fc11:F-11:vanessa_adt-0.0.7-6.fc11.src.rpm:1251975236


--- NEW FILE vanessa_adt.spec ---
Summary:		Library of Abstract Data Types 
Name:		vanessa_adt
Version:		0.0.7
Release:		6%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/%{name}/%{version}/%{name}-%{version}.tar.gz
Requires:		vanessa_logger >= 0.0.5
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool vanessa_logger-devel >= 0.0.5

%description
Library of Abstract Data Types (ADTs) that may be useful.  Includes queue,
dynamic array and key value ADT.

%package		devel
Summary:		Headers and static libraries for development
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		vanessa_logger-devel >= 0.0.5

%description devel
Headers and static libraries required to develop against vanessa_adt.

%prep
%setup -q

%build

CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/{etc,%{prefix}/{lib,bin,doc}}
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Tue Aug 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-6
- Add %%{?_smp_mflags}
- End Fedora review.

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-5
- Fedora Review started. Thanks to Andrew Colin Kissa.
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_adt/vanessa_adt-0.0.7-2.fc8.Hu.0.src.rpm
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Delete unversioned explicit provides: Provides:		%%{name}-%%{version}
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Remove *.*a files in %%install.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- In devel turn "Provides: %%{name}-devel-%%{version}" to "%%{name}-devel = %%{version}-%%{release}".
- Add --disable-static in configure options (with it .la file not produced).
- Licence changed to LGPLv2+ from just LGPL.

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.7-2
- Replace Tag Copyright by License
- Change license to it abbriviation LGPL (was GNU Lesser General Public Licence)
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	2%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>

* Sat Sep 2 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:15:36 -0000	1.1
+++ .cvsignore	3 Sep 2009 10:54:50 -0000	1.2
@@ -0,0 +1 @@
+vanessa_adt-0.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:15:36 -0000	1.1
+++ sources	3 Sep 2009 10:54:50 -0000	1.2
@@ -0,0 +1 @@
+e7952bc3ae35a0a042cfe370bc03ce88  vanessa_adt-0.0.7.tar.gz



From perex at fedoraproject.org  Thu Sep  3 10:57:30 2009
From: perex at fedoraproject.org (perex)
Date: Thu,  3 Sep 2009 10:57:30 +0000 (UTC)
Subject: rpms/alsa-utils/devel .cvsignore, 1.28, 1.29 alsa-info.sh, 1.6,
	1.7 alsa-utils.spec, 1.86, 1.87 sources, 1.33,
	1.34 alsa-utils-1.0.19-init.patch, 1.1,
	NONE alsactl-init-fix-headphone.patch, 1.1, NONE
Message-ID: <20090903105730.D57FF11C0099@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20266

Modified Files:
	.cvsignore alsa-info.sh alsa-utils.spec sources 
Removed Files:
	alsa-utils-1.0.19-init.patch alsactl-init-fix-headphone.patch 
Log Message:
alsa-utils: updated to 1.0.21 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	6 May 2009 09:24:34 -0000	1.28
+++ .cvsignore	3 Sep 2009 10:57:30 -0000	1.29
@@ -21,3 +21,4 @@ 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
+alsa-utils-1.0.21.tar.bz2


Index: alsa-info.sh
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-info.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- alsa-info.sh	6 May 2009 09:24:34 -0000	1.6
+++ alsa-info.sh	3 Sep 2009 10:57:30 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.56
+SCRIPT_VERSION=0.4.58
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -36,15 +36,17 @@ PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0
 #Define some simple functions
 
 pbcheck(){
+	[[ $UPLOAD = "no" ]] && return
+
 	if [[ -z $PASTEBIN ]]; then
-		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
 	else
-		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
 	fi
 }
 
 update() {
-	SHFILE=`mktemp -p /tmp alsa-info.XXXXXXXXXX`
+	SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
 	wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
 	REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
 	if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
@@ -72,8 +74,7 @@ update() {
 					echo "Please re-run the script"
 					rm $SHFILE 2>/dev/null
 				else
-					mv $SHFILE /tmp/alsa-info.sh || exit 1
-					echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+					echo "ALSA-Info script has been downloaded as $SHFILE."
 					echo "Please re-run the script from new location."
 				fi
 				exit
@@ -90,8 +91,7 @@ update() {
 				echo "ALSA-Info script has been updated. Please re-run it."
 				rm $SHFILE 2>/dev/null
 			else
-				mv $SHFILE /tmp/alsa-info.sh || exit 1
-				echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+				echo "ALSA-Info script has been downloaded $SHFILE."
 				echo "Please, re-run it from new location."
 			fi
 			exit
@@ -103,8 +103,9 @@ update() {
 
 cleanup() {
 	if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then
-		rm -r "$TEMPDIR" 2>/dev/null
+		rm -rf "$TEMPDIR" 2>/dev/null
 	fi
+	test -n "$KEEP_OUTPUT" || rm -f "$NFILE"
 }
 
 
@@ -241,6 +242,26 @@ withsysfs() {
     fi
 }
 
+withdmesg() {
+	echo "!!ALSA/HDA dmesg" >> $FILE
+	echo "!!------------------" >> $FILE
+	echo "" >> $FILE
+	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+}
+
+withall() {
+	withdevices
+	withconfigs
+	withaplay
+	withamixer
+	withalsactl
+	withlsmod
+	withsysfs
+	withdmesg
+}
+
 get_alsa_library_version() {
 	ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
 
@@ -287,20 +308,29 @@ SYSFS=$(mount |grep sysfs|awk {'print $3
 #Check modprobe config files for sound related options
 SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
 
+KEEP_OUTPUT=
+NFILE=""
+
 PASTEBIN=""
 WWWSERVICE="www.alsa-project.org"
-QUESTION="yes"
+WELCOME="yes"
 PROCEED="yes"
+UPLOAD="ask"
 REPEAT=""
 while [ -z "$REPEAT" ]; do
 REPEAT="no"
 case "$1" in
 	--update|--help|--about)
-		QUESTION="no"
+		WELCOME="no"
 		PROCEED="no"
 		;;
+	--upload)
+		UPLOAD="yes"
+		WELCOME="no"
+		;;
 	--no-upload)
-		NOUPLOAD="yes"
+		UPLOAD="no"
+		WELCOME="no"
 		;;
 	--pastebin)
 		PASTEBIN="yes"
@@ -313,61 +343,50 @@ case "$1" in
 		;;
 	--stdout)
 		DIALOG=""
-		NOUPLOAD="yes"
-		QUESTION="no"
+		UPLOAD="no"
+		WELCOME="no"
 		TOSTDOUT="yes"
 		;;
 esac
 done
-		
+
 
 #Script header output.
-if [ "$QUESTION" = "yes" ]; then
-if [[ -n "$DIALOG" ]]
-then
-if [ -z "$NOUPLOAD" ]; then
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a $WWWSERVICE site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
-else
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
-fi
-DIALOG_EXIT_CODE=$?
-if [ $DIALOG_EXIT_CODE != 0 ]; then
-echo "Thank you for using the ALSA-Info Script"
-exit 0;
-fi
-else
+if [ "$WELCOME" = "yes" ]; then
+greeting_message="\
 
-echo "ALSA Information Script v $SCRIPT_VERSION"
-echo "--------------------------------"
-echo ""
-echo "This script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem."
-echo ""
-if [ -z "$NOUPLOAD" ]; then
-if [[ -n "$TPUT" ]]; then
-tput bold
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
-echo "If you do not wish for this to occur, run the script with the --no-upload argument"
-tput sgr0
+This script visits the following commands/files to collect diagnostic
+information about your ALSA installation and sound related hardware.
+
+  dmesg
+  lspci
+  lsmod
+  aplay
+  amixer
+  alsactl
+  /proc/asound/
+  /sys/class/sound/
+  ~/.asoundrc (etc.)
+
+See '$0 --help' for command line options.
+"
+if [[ -n "$DIALOG" ]]; then
+	dialog  --backtitle "$BGTITLE" \
+		--title "ALSA-Info script v $SCRIPT_VERSION" \
+		--msgbox "$greeting_message" 20 80
 else
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
-echo "If you do not wish for this to occur, run the script with the --no-upload argument"
-fi
-echo ""
-fi # NOUPLOAD
-echo -n "Do you want to run this script? [y/n] : "
-read -e CONFIRM
-if [ "$CONFIRM" != "y" ]; then
-echo ""
-echo "Thank you for using the ALSA-Info Script"
-exit 0;
-fi
-fi
-fi # question
+	echo "ALSA Information Script v $SCRIPT_VERSION"
+	echo "--------------------------------"
+	echo "$greeting_message"
+fi # dialog
+fi # WELCOME
 
 #Set the output file
-TEMPDIR=`mktemp -p /tmp -d alsa-info.XXXXXXXXXX`
+TEMPDIR=`mktemp -t -d alsa-info.XXXXXXXXXX` || exit 1
 FILE="$TEMPDIR/alsa-info.txt"
-NFILE="/tmp/alsa-info.txt"
+if [ -z "$NFILE" ]; then
+	NFILE=`mktemp -t alsa-info.txt.XXXXXXXXXX` || exit 1
+fi
 
 trap cleanup 0
 
@@ -379,9 +398,6 @@ then
 	exit 0
 fi
 
-#Create the temporary work dir.
-mkdir $TEMPDIR 2>/dev/null
-
 #Fetch the info and store in temp files/variables
 DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
 KERNEL_VERSION=`uname -r`
@@ -400,6 +416,17 @@ ESDINST=$(which esd 2>/dev/null| sed 's|
 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)
+DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+
+#Check for DMI data
+if [ -d /sys/class/dmi/id ]; then
+    # No root privileges are required when using sysfs method
+    DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
+elif [ -x $DMIDECODE ]; then
+    DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
+fi
 
 cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
 cat /proc/asound/cards >$TEMPDIR/alsacards.tmp
@@ -431,6 +458,13 @@ echo "" >> $FILE
 echo $DISTRO >> $FILE
 echo "" >> $FILE
 echo "" >> $FILE
+echo "!!DMI Information" >> $FILE
+echo "!!---------------" >> $FILE
+echo "" >> $FILE
+echo "Manufacturer:      $DMI_SYSTEM_MANUFACTURER" >> $FILE
+echo "Product Name:      $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
 echo "!!Kernel Information" >> $FILE
 echo "!!------------------" >> $FILE
 echo "" >> $FILE
@@ -527,7 +561,10 @@ echo "!!--------------------------" >> $
 echo "" >> $FILE
 for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
 echo "!!Module: $mod" >> $FILE
-for params in `ls $SYSFS/module/$mod/parameters/*`; do /bin/echo -ne "\t";/bin/echo "$params : `cat $params`"|sed 's:.*/::' >> $FILE;done
+for params in `echo $SYSFS/module/$mod/parameters/*`; do
+	echo -ne "\t";
+	echo "$params : `cat $params`" | sed 's:.*/::';
+done >> $FILE
 echo "" >> $FILE
 done
 echo "" >> $FILE
@@ -564,12 +601,7 @@ fi
 if [[ -z "$1" ]]
 then
 	update
-	withdevices
-	withconfigs
-	withaplay
-	withamixer
-	withalsactl
-	withlsmod
+	withall
 	pbcheck	
 fi
 
@@ -583,49 +615,34 @@ then
 	case "$1" in
 		--pastebin)
 		        update
-        		withdevices
-        		withconfigs
-        		withaplay
-        		withamixer
-        		withalsactl
-        		withlsmod
-			withsysfs
+			withall
         		pbcheck
 			;;
 		--update)
 			update
 			exit
 			;;
+		--upload)
+			UPLOAD="yes"
+			withall
+			;;
 		--no-upload)
-			NOUPLOAD="yes"
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			UPLOAD="no"
+			withall
+			;;
+		--output)
+			shift
+			NFILE="$1"
+			KEEP_OUTPUT="yes"
 			;;
 		--debug)
 			echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
 			KEEP_FILES="yes"
 			echo ""
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			withall
 			;;
 		--with-all)
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			withall
 			;;
 		--with-aplay)
 			withaplay
@@ -639,6 +656,9 @@ then
 		--with-devices)
 			withdevices
 			;;
+		--with-dmesg)
+			withdmesg
+			;;
 		--with-configs)
 			if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
 			then
@@ -668,13 +688,8 @@ then
 			fi
 			;;
 		--stdout)
-			NOUPLOAD="yes"
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
+			UPLOAD="no"
+			withall
 			cat $FILE
 			rm $FILE
 			;;
@@ -699,13 +714,16 @@ then
 			echo "	--with-configs (includes the output of ~/.asoundrc and"
 			echo "	    /etc/asound.conf if they exist)" 
 			echo "	--with-devices (shows the device nodes in /dev/snd/)"
+			echo "	--with-dmesg (shows the ALSA/HDA kernel messages)"
 			echo ""
+			echo "	--output FILE (specify the file to output for no-upload mode)"
 			echo "	--update (check server for script updates)"
+			echo "	--upload (upload contents to remote server)"
 			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 "	--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)"
@@ -720,32 +738,54 @@ if [ "$PROCEED" = "no" ]; then
 	exit 1
 fi
 
-if [ -n "$NOUPLOAD" ]; then
+if [ "$UPLOAD" = "ask" ]; then
+	if [[ -n "$DIALOG" ]]; then
+		dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80
+		DIALOG_EXIT_CODE=$?
+		if [ $DIALOG_EXIT_CODE != 0 ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	else
+		echo -n "Automatically upload ALSA information to $WWWSERVICE? [y/N] : "
+		read -e CONFIRM
+		if [ "$CONFIRM" != "y" ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	fi
+
+fi
+
+if [ "$UPLOAD" = "no" ]; then
 
 	if [ -z "$TOSTDOUT" ]; then
-		mv $FILE $NFILE || exit 1
+		mv -f $FILE $NFILE || exit 1
+		KEEP_OUTPUT="yes"
 	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
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE.\n Your information was NOT automatically uploaded.\n\nYour ALSA information is 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
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "\n\nYour ALSA information is in $NFILE" 10 60
 		fi
 	else
 		echo
 
 		if [[ -n $PBERROR ]]; then
-			echo "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded."
+			echo "An error occurred while contacting the $WWWSERVICE."
+			echo "Your information was NOT automatically uploaded."
 			echo ""
-			echo "Your ALSA information can be seen by looking in $NFILE"
+			echo "Your ALSA information is 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 "Your ALSA information is in $NFILE"
 				echo ""
 			fi
 		fi
@@ -753,7 +793,7 @@ if [ -n "$NOUPLOAD" ]; then
 
 	exit
 
-fi # noupload
+fi # UPLOAD
 
 #Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. 
 if
@@ -836,7 +876,8 @@ echo ""
 
 #We couldnt find a suitable wget, so tell the user to upload manually.
 else
-	mv $FILE $NFILE || exit 1
+	mv -f $FILE $NFILE || exit 1
+	KEEP_OUTPUT="yes"
 	if [[ -z $DIALOG ]]
 	then
 		if [[ -z $PASTEBIN ]]; then


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- alsa-utils.spec	24 Jul 2009 16:48:23 -0000	1.86
+++ alsa-utils.spec	3 Sep 2009 10:57:30 -0000	1.87
@@ -3,8 +3,8 @@
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.20
-Release: 4%{?prever_dot}%{?dist}
+Version: 1.0.21
+Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -13,7 +13,7 @@ Source4: alsaunmute
 Source6: alsa-info.sh
 Source10: alsa.rules
 Source11: alsactl.conf
-Patch1:  alsactl-init-fix-headphone.patch
+Patch1:  alsactl-init-fix-headphone2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -94,6 +94,10 @@ if [ -s /etc/alsa/asound.state -a ! -s /
 fi
 
 %changelog
+* Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-1
+- updated to 1.0.21 final
+- updated alsa-info.sh script to 0.4.58
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	6 May 2009 09:24:34 -0000	1.33
+++ sources	3 Sep 2009 10:57:30 -0000	1.34
@@ -1 +1 @@
-6837e673ef19da96d8bd2f9e18cd9574  alsa-utils-1.0.20.tar.bz2
+3672287c2608040d111ce45495ba7602  alsa-utils-1.0.21.tar.bz2


--- alsa-utils-1.0.19-init.patch DELETED ---


--- alsactl-init-fix-headphone.patch DELETED ---



From perex at fedoraproject.org  Thu Sep  3 11:00:50 2009
From: perex at fedoraproject.org (perex)
Date: Thu,  3 Sep 2009 11:00:50 +0000 (UTC)
Subject: rpms/alsa-utils/devel alsactl-init-fix-headphone2.patch, NONE,
	1.1 alsa-utils.spec, 1.87, 1.88
Message-ID: <20090903110050.300CA11C0099@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21635

Modified Files:
	alsa-utils.spec 
Added Files:
	alsactl-init-fix-headphone2.patch 
Log Message:
alsa-utils: updated to 1.0.21 final

alsactl-init-fix-headphone2.patch:
 default |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE alsactl-init-fix-headphone2.patch ---
>From 2cbf39749cd71a2b892b6006ae69283576176d17 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 2 Sep 2009 14:31:49 +0200
Subject: [PATCH] alsactl init: Fix typo "(" -> "{" in Headphone default rule

Reported-by: Philipp Jocham <philipp.jocham at gmx.net>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 alsactl/init/default |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/alsactl/init/default b/alsactl/init/default
index 8653ec6..f2c0539 100644
--- a/alsactl/init/default
+++ b/alsactl/init/default
@@ -49,7 +49,7 @@ CTL{reset}="mixer"
 CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end"
 # if master volume control is present, turn headphone volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone0_end"
 CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
 LABEL="headphone0_end"
 CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \
-- 
1.5.5.1



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- alsa-utils.spec	3 Sep 2009 10:57:30 -0000	1.87
+++ alsa-utils.spec	3 Sep 2009 11:00:49 -0000	1.88
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -94,6 +94,9 @@ if [ -s /etc/alsa/asound.state -a ! -s /
 fi
 
 %changelog
+* Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-2
+- added missing patch file
+
 * Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-1
 - updated to 1.0.21 final
 - updated alsa-info.sh script to 0.4.58



From harald at fedoraproject.org  Thu Sep  3 11:11:26 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  3 Sep 2009 11:11:26 +0000 (UTC)
Subject: rpms/udev-extras/devel dead.package,NONE,1.1
Message-ID: <20090903111126.2DE2E11C0099@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23516

Added Files:
	dead.package 
Log Message:
dead package


--- NEW FILE dead.package ---



From hubbitus at fedoraproject.org  Thu Sep  3 11:25:03 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  3 Sep 2009 11:25:03 +0000 (UTC)
Subject: rpms/vanessa_adt/EL-5 import.log, NONE, 1.1 vanessa_adt.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090903112503.CF20811C0099@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_adt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26847/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_adt.spec 
Log Message:
Initial import vanessa_adt into Fedora


--- NEW FILE import.log ---
vanessa_adt-0_0_7-6_fc11:EL-5:vanessa_adt-0.0.7-6.fc11.src.rpm:1251975599


--- NEW FILE vanessa_adt.spec ---
Summary:		Library of Abstract Data Types 
Name:		vanessa_adt
Version:		0.0.7
Release:		6%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/%{name}/%{version}/%{name}-%{version}.tar.gz
Requires:		vanessa_logger >= 0.0.5
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool vanessa_logger-devel >= 0.0.5

%description
Library of Abstract Data Types (ADTs) that may be useful.  Includes queue,
dynamic array and key value ADT.

%package		devel
Summary:		Headers and static libraries for development
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		vanessa_logger-devel >= 0.0.5

%description devel
Headers and static libraries required to develop against vanessa_adt.

%prep
%setup -q

%build

CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/{etc,%{prefix}/{lib,bin,doc}}
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Tue Aug 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-6
- Add %%{?_smp_mflags}
- End Fedora review.

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-5
- Fedora Review started. Thanks to Andrew Colin Kissa.
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_adt/vanessa_adt-0.0.7-2.fc8.Hu.0.src.rpm
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Delete unversioned explicit provides: Provides:		%%{name}-%%{version}
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Remove *.*a files in %%install.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- In devel turn "Provides: %%{name}-devel-%%{version}" to "%%{name}-devel = %%{version}-%%{release}".
- Add --disable-static in configure options (with it .la file not produced).
- Licence changed to LGPLv2+ from just LGPL.

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.7-2
- Replace Tag Copyright by License
- Change license to it abbriviation LGPL (was GNU Lesser General Public Licence)
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	2%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>

* Sat Sep 2 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:15:36 -0000	1.1
+++ .cvsignore	3 Sep 2009 11:25:03 -0000	1.2
@@ -0,0 +1 @@
+vanessa_adt-0.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_adt/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:15:36 -0000	1.1
+++ sources	3 Sep 2009 11:25:03 -0000	1.2
@@ -0,0 +1 @@
+e7952bc3ae35a0a042cfe370bc03ce88  vanessa_adt-0.0.7.tar.gz



From perex at fedoraproject.org  Thu Sep  3 11:26:30 2009
From: perex at fedoraproject.org (perex)
Date: Thu,  3 Sep 2009 11:26:30 +0000 (UTC)
Subject: rpms/alsa-utils/F-11 alsactl-init-fix-headphone2.patch, NONE,
	1.1 .cvsignore, 1.28, 1.29 alsa-info.sh, 1.6,
	1.7 alsa-utils.spec, 1.85, 1.86 sources, 1.33,
	1.34 alsactl-init-fix-headphone.patch, 1.1, NONE
Message-ID: <20090903112630.AD84611C0099@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27262

Modified Files:
	.cvsignore alsa-info.sh alsa-utils.spec sources 
Added Files:
	alsactl-init-fix-headphone2.patch 
Removed Files:
	alsactl-init-fix-headphone.patch 
Log Message:
alsa-utils: updated to 1.0.21 final

alsactl-init-fix-headphone2.patch:
 default |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE alsactl-init-fix-headphone2.patch ---
>From 2cbf39749cd71a2b892b6006ae69283576176d17 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 2 Sep 2009 14:31:49 +0200
Subject: [PATCH] alsactl init: Fix typo "(" -> "{" in Headphone default rule

Reported-by: Philipp Jocham <philipp.jocham at gmx.net>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 alsactl/init/default |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/alsactl/init/default b/alsactl/init/default
index 8653ec6..f2c0539 100644
--- a/alsactl/init/default
+++ b/alsactl/init/default
@@ -49,7 +49,7 @@ CTL{reset}="mixer"
 CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end"
 # if master volume control is present, turn headphone volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone0_end"
 CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
 LABEL="headphone0_end"
 CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	11 May 2009 09:56:20 -0000	1.28
+++ .cvsignore	3 Sep 2009 11:26:30 -0000	1.29
@@ -21,3 +21,4 @@ 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
+alsa-utils-1.0.21.tar.bz2


Index: alsa-info.sh
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-11/alsa-info.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- alsa-info.sh	11 May 2009 09:56:20 -0000	1.6
+++ alsa-info.sh	3 Sep 2009 11:26:30 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.56
+SCRIPT_VERSION=0.4.58
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -36,15 +36,17 @@ PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0
 #Define some simple functions
 
 pbcheck(){
+	[[ $UPLOAD = "no" ]] && return
+
 	if [[ -z $PASTEBIN ]]; then
-		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
 	else
-		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
 	fi
 }
 
 update() {
-	SHFILE=`mktemp -p /tmp alsa-info.XXXXXXXXXX`
+	SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
 	wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
 	REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
 	if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
@@ -72,8 +74,7 @@ update() {
 					echo "Please re-run the script"
 					rm $SHFILE 2>/dev/null
 				else
-					mv $SHFILE /tmp/alsa-info.sh || exit 1
-					echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+					echo "ALSA-Info script has been downloaded as $SHFILE."
 					echo "Please re-run the script from new location."
 				fi
 				exit
@@ -90,8 +91,7 @@ update() {
 				echo "ALSA-Info script has been updated. Please re-run it."
 				rm $SHFILE 2>/dev/null
 			else
-				mv $SHFILE /tmp/alsa-info.sh || exit 1
-				echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+				echo "ALSA-Info script has been downloaded $SHFILE."
 				echo "Please, re-run it from new location."
 			fi
 			exit
@@ -103,8 +103,9 @@ update() {
 
 cleanup() {
 	if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then
-		rm -r "$TEMPDIR" 2>/dev/null
+		rm -rf "$TEMPDIR" 2>/dev/null
 	fi
+	test -n "$KEEP_OUTPUT" || rm -f "$NFILE"
 }
 
 
@@ -241,6 +242,26 @@ withsysfs() {
     fi
 }
 
+withdmesg() {
+	echo "!!ALSA/HDA dmesg" >> $FILE
+	echo "!!------------------" >> $FILE
+	echo "" >> $FILE
+	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+}
+
+withall() {
+	withdevices
+	withconfigs
+	withaplay
+	withamixer
+	withalsactl
+	withlsmod
+	withsysfs
+	withdmesg
+}
+
 get_alsa_library_version() {
 	ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
 
@@ -287,20 +308,29 @@ SYSFS=$(mount |grep sysfs|awk {'print $3
 #Check modprobe config files for sound related options
 SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
 
+KEEP_OUTPUT=
+NFILE=""
+
 PASTEBIN=""
 WWWSERVICE="www.alsa-project.org"
-QUESTION="yes"
+WELCOME="yes"
 PROCEED="yes"
+UPLOAD="ask"
 REPEAT=""
 while [ -z "$REPEAT" ]; do
 REPEAT="no"
 case "$1" in
 	--update|--help|--about)
-		QUESTION="no"
+		WELCOME="no"
 		PROCEED="no"
 		;;
+	--upload)
+		UPLOAD="yes"
+		WELCOME="no"
+		;;
 	--no-upload)
-		NOUPLOAD="yes"
+		UPLOAD="no"
+		WELCOME="no"
 		;;
 	--pastebin)
 		PASTEBIN="yes"
@@ -313,61 +343,50 @@ case "$1" in
 		;;
 	--stdout)
 		DIALOG=""
-		NOUPLOAD="yes"
-		QUESTION="no"
+		UPLOAD="no"
+		WELCOME="no"
 		TOSTDOUT="yes"
 		;;
 esac
 done
-		
+
 
 #Script header output.
-if [ "$QUESTION" = "yes" ]; then
-if [[ -n "$DIALOG" ]]
-then
-if [ -z "$NOUPLOAD" ]; then
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a $WWWSERVICE site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
-else
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
-fi
-DIALOG_EXIT_CODE=$?
-if [ $DIALOG_EXIT_CODE != 0 ]; then
-echo "Thank you for using the ALSA-Info Script"
-exit 0;
-fi
-else
+if [ "$WELCOME" = "yes" ]; then
+greeting_message="\
 
-echo "ALSA Information Script v $SCRIPT_VERSION"
-echo "--------------------------------"
-echo ""
-echo "This script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem."
-echo ""
-if [ -z "$NOUPLOAD" ]; then
-if [[ -n "$TPUT" ]]; then
-tput bold
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
-echo "If you do not wish for this to occur, run the script with the --no-upload argument"
-tput sgr0
+This script visits the following commands/files to collect diagnostic
+information about your ALSA installation and sound related hardware.
+
+  dmesg
+  lspci
+  lsmod
+  aplay
+  amixer
+  alsactl
+  /proc/asound/
+  /sys/class/sound/
+  ~/.asoundrc (etc.)
+
+See '$0 --help' for command line options.
+"
+if [[ -n "$DIALOG" ]]; then
+	dialog  --backtitle "$BGTITLE" \
+		--title "ALSA-Info script v $SCRIPT_VERSION" \
+		--msgbox "$greeting_message" 20 80
 else
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
-echo "If you do not wish for this to occur, run the script with the --no-upload argument"
-fi
-echo ""
-fi # NOUPLOAD
-echo -n "Do you want to run this script? [y/n] : "
-read -e CONFIRM
-if [ "$CONFIRM" != "y" ]; then
-echo ""
-echo "Thank you for using the ALSA-Info Script"
-exit 0;
-fi
-fi
-fi # question
+	echo "ALSA Information Script v $SCRIPT_VERSION"
+	echo "--------------------------------"
+	echo "$greeting_message"
+fi # dialog
+fi # WELCOME
 
 #Set the output file
-TEMPDIR=`mktemp -p /tmp -d alsa-info.XXXXXXXXXX`
+TEMPDIR=`mktemp -t -d alsa-info.XXXXXXXXXX` || exit 1
 FILE="$TEMPDIR/alsa-info.txt"
-NFILE="/tmp/alsa-info.txt"
+if [ -z "$NFILE" ]; then
+	NFILE=`mktemp -t alsa-info.txt.XXXXXXXXXX` || exit 1
+fi
 
 trap cleanup 0
 
@@ -379,9 +398,6 @@ then
 	exit 0
 fi
 
-#Create the temporary work dir.
-mkdir $TEMPDIR 2>/dev/null
-
 #Fetch the info and store in temp files/variables
 DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
 KERNEL_VERSION=`uname -r`
@@ -400,6 +416,17 @@ ESDINST=$(which esd 2>/dev/null| sed 's|
 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)
+DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+
+#Check for DMI data
+if [ -d /sys/class/dmi/id ]; then
+    # No root privileges are required when using sysfs method
+    DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
+elif [ -x $DMIDECODE ]; then
+    DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
+fi
 
 cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
 cat /proc/asound/cards >$TEMPDIR/alsacards.tmp
@@ -431,6 +458,13 @@ echo "" >> $FILE
 echo $DISTRO >> $FILE
 echo "" >> $FILE
 echo "" >> $FILE
+echo "!!DMI Information" >> $FILE
+echo "!!---------------" >> $FILE
+echo "" >> $FILE
+echo "Manufacturer:      $DMI_SYSTEM_MANUFACTURER" >> $FILE
+echo "Product Name:      $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
 echo "!!Kernel Information" >> $FILE
 echo "!!------------------" >> $FILE
 echo "" >> $FILE
@@ -527,7 +561,10 @@ echo "!!--------------------------" >> $
 echo "" >> $FILE
 for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
 echo "!!Module: $mod" >> $FILE
-for params in `ls $SYSFS/module/$mod/parameters/*`; do /bin/echo -ne "\t";/bin/echo "$params : `cat $params`"|sed 's:.*/::' >> $FILE;done
+for params in `echo $SYSFS/module/$mod/parameters/*`; do
+	echo -ne "\t";
+	echo "$params : `cat $params`" | sed 's:.*/::';
+done >> $FILE
 echo "" >> $FILE
 done
 echo "" >> $FILE
@@ -564,12 +601,7 @@ fi
 if [[ -z "$1" ]]
 then
 	update
-	withdevices
-	withconfigs
-	withaplay
-	withamixer
-	withalsactl
-	withlsmod
+	withall
 	pbcheck	
 fi
 
@@ -583,49 +615,34 @@ then
 	case "$1" in
 		--pastebin)
 		        update
-        		withdevices
-        		withconfigs
-        		withaplay
-        		withamixer
-        		withalsactl
-        		withlsmod
-			withsysfs
+			withall
         		pbcheck
 			;;
 		--update)
 			update
 			exit
 			;;
+		--upload)
+			UPLOAD="yes"
+			withall
+			;;
 		--no-upload)
-			NOUPLOAD="yes"
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			UPLOAD="no"
+			withall
+			;;
+		--output)
+			shift
+			NFILE="$1"
+			KEEP_OUTPUT="yes"
 			;;
 		--debug)
 			echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
 			KEEP_FILES="yes"
 			echo ""
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			withall
 			;;
 		--with-all)
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			withall
 			;;
 		--with-aplay)
 			withaplay
@@ -639,6 +656,9 @@ then
 		--with-devices)
 			withdevices
 			;;
+		--with-dmesg)
+			withdmesg
+			;;
 		--with-configs)
 			if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
 			then
@@ -668,13 +688,8 @@ then
 			fi
 			;;
 		--stdout)
-			NOUPLOAD="yes"
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
+			UPLOAD="no"
+			withall
 			cat $FILE
 			rm $FILE
 			;;
@@ -699,13 +714,16 @@ then
 			echo "	--with-configs (includes the output of ~/.asoundrc and"
 			echo "	    /etc/asound.conf if they exist)" 
 			echo "	--with-devices (shows the device nodes in /dev/snd/)"
+			echo "	--with-dmesg (shows the ALSA/HDA kernel messages)"
 			echo ""
+			echo "	--output FILE (specify the file to output for no-upload mode)"
 			echo "	--update (check server for script updates)"
+			echo "	--upload (upload contents to remote server)"
 			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 "	--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)"
@@ -720,32 +738,54 @@ if [ "$PROCEED" = "no" ]; then
 	exit 1
 fi
 
-if [ -n "$NOUPLOAD" ]; then
+if [ "$UPLOAD" = "ask" ]; then
+	if [[ -n "$DIALOG" ]]; then
+		dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80
+		DIALOG_EXIT_CODE=$?
+		if [ $DIALOG_EXIT_CODE != 0 ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	else
+		echo -n "Automatically upload ALSA information to $WWWSERVICE? [y/N] : "
+		read -e CONFIRM
+		if [ "$CONFIRM" != "y" ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	fi
+
+fi
+
+if [ "$UPLOAD" = "no" ]; then
 
 	if [ -z "$TOSTDOUT" ]; then
-		mv $FILE $NFILE || exit 1
+		mv -f $FILE $NFILE || exit 1
+		KEEP_OUTPUT="yes"
 	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
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE.\n Your information was NOT automatically uploaded.\n\nYour ALSA information is 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
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "\n\nYour ALSA information is in $NFILE" 10 60
 		fi
 	else
 		echo
 
 		if [[ -n $PBERROR ]]; then
-			echo "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded."
+			echo "An error occurred while contacting the $WWWSERVICE."
+			echo "Your information was NOT automatically uploaded."
 			echo ""
-			echo "Your ALSA information can be seen by looking in $NFILE"
+			echo "Your ALSA information is 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 "Your ALSA information is in $NFILE"
 				echo ""
 			fi
 		fi
@@ -753,7 +793,7 @@ if [ -n "$NOUPLOAD" ]; then
 
 	exit
 
-fi # noupload
+fi # UPLOAD
 
 #Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. 
 if
@@ -836,7 +876,8 @@ echo ""
 
 #We couldnt find a suitable wget, so tell the user to upload manually.
 else
-	mv $FILE $NFILE || exit 1
+	mv -f $FILE $NFILE || exit 1
+	KEEP_OUTPUT="yes"
 	if [[ -z $DIALOG ]]
 	then
 		if [[ -z $PASTEBIN ]]; then


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-11/alsa-utils.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- alsa-utils.spec	15 May 2009 12:33:46 -0000	1.85
+++ alsa-utils.spec	3 Sep 2009 11:26:30 -0000	1.86
@@ -3,8 +3,8 @@
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.20
-Release: 3%{?prever_dot}%{?dist}
+Version: 1.0.21
+Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -13,7 +13,7 @@ Source4: alsaunmute
 Source6: alsa-info.sh
 Source10: alsa.rules
 Source11: alsactl.conf
-Patch1:  alsactl-init-fix-headphone.patch
+Patch1:  alsactl-init-fix-headphone2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -94,6 +94,10 @@ if [ -s /etc/alsa/asound.state -a ! -s /
 fi
 
 %changelog
+* Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-1
+- updated to 1.0.21 final
+- updated alsa-info.sh script to 0.4.58
+
 * Fri May 15 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.20-3
 - fixed Headphone Volume issue (bz#500956)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	11 May 2009 10:01:01 -0000	1.33
+++ sources	3 Sep 2009 11:26:30 -0000	1.34
@@ -1 +1 @@
-6837e673ef19da96d8bd2f9e18cd9574  alsa-utils-1.0.20.tar.bz2
+3672287c2608040d111ce45495ba7602  alsa-utils-1.0.21.tar.bz2


--- alsactl-init-fix-headphone.patch DELETED ---



From perex at fedoraproject.org  Thu Sep  3 11:45:52 2009
From: perex at fedoraproject.org (perex)
Date: Thu,  3 Sep 2009 11:45:52 +0000 (UTC)
Subject: rpms/alsa-utils/F-10 alsactl-init-fix-headphone2.patch, NONE,
	1.1 .cvsignore, 1.28, 1.29 alsa-info.sh, 1.6,
	1.7 alsa-utils.spec, 1.81, 1.82 sources, 1.32,
	1.33 alsactl-init-fix-headphone.patch, 1.1, NONE
Message-ID: <20090903114552.9AF6F11C0099@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv746

Modified Files:
	.cvsignore alsa-info.sh alsa-utils.spec sources 
Added Files:
	alsactl-init-fix-headphone2.patch 
Removed Files:
	alsactl-init-fix-headphone.patch 
Log Message:
alsa-utils: updated to 1.0.21 final

alsactl-init-fix-headphone2.patch:
 default |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE alsactl-init-fix-headphone2.patch ---
>From 2cbf39749cd71a2b892b6006ae69283576176d17 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 2 Sep 2009 14:31:49 +0200
Subject: [PATCH] alsactl init: Fix typo "(" -> "{" in Headphone default rule

Reported-by: Philipp Jocham <philipp.jocham at gmx.net>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 alsactl/init/default |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/alsactl/init/default b/alsactl/init/default
index 8653ec6..f2c0539 100644
--- a/alsactl/init/default
+++ b/alsactl/init/default
@@ -49,7 +49,7 @@ CTL{reset}="mixer"
 CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end"
 # if master volume control is present, turn headphone volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone0_end"
 CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
 LABEL="headphone0_end"
 CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	11 May 2009 09:34:21 -0000	1.28
+++ .cvsignore	3 Sep 2009 11:45:52 -0000	1.29
@@ -21,3 +21,4 @@ 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
+alsa-utils-1.0.21.tar.bz2


Index: alsa-info.sh
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/alsa-info.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- alsa-info.sh	11 May 2009 09:34:21 -0000	1.6
+++ alsa-info.sh	3 Sep 2009 11:45:52 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.56
+SCRIPT_VERSION=0.4.58
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -36,15 +36,17 @@ PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0
 #Define some simple functions
 
 pbcheck(){
+	[[ $UPLOAD = "no" ]] && return
+
 	if [[ -z $PASTEBIN ]]; then
-		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
 	else
-		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
 	fi
 }
 
 update() {
-	SHFILE=`mktemp -p /tmp alsa-info.XXXXXXXXXX`
+	SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
 	wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
 	REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
 	if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
@@ -72,8 +74,7 @@ update() {
 					echo "Please re-run the script"
 					rm $SHFILE 2>/dev/null
 				else
-					mv $SHFILE /tmp/alsa-info.sh || exit 1
-					echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+					echo "ALSA-Info script has been downloaded as $SHFILE."
 					echo "Please re-run the script from new location."
 				fi
 				exit
@@ -90,8 +91,7 @@ update() {
 				echo "ALSA-Info script has been updated. Please re-run it."
 				rm $SHFILE 2>/dev/null
 			else
-				mv $SHFILE /tmp/alsa-info.sh || exit 1
-				echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+				echo "ALSA-Info script has been downloaded $SHFILE."
 				echo "Please, re-run it from new location."
 			fi
 			exit
@@ -103,8 +103,9 @@ update() {
 
 cleanup() {
 	if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then
-		rm -r "$TEMPDIR" 2>/dev/null
+		rm -rf "$TEMPDIR" 2>/dev/null
 	fi
+	test -n "$KEEP_OUTPUT" || rm -f "$NFILE"
 }
 
 
@@ -241,6 +242,26 @@ withsysfs() {
     fi
 }
 
+withdmesg() {
+	echo "!!ALSA/HDA dmesg" >> $FILE
+	echo "!!------------------" >> $FILE
+	echo "" >> $FILE
+	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+}
+
+withall() {
+	withdevices
+	withconfigs
+	withaplay
+	withamixer
+	withalsactl
+	withlsmod
+	withsysfs
+	withdmesg
+}
+
 get_alsa_library_version() {
 	ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
 
@@ -287,20 +308,29 @@ SYSFS=$(mount |grep sysfs|awk {'print $3
 #Check modprobe config files for sound related options
 SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
 
+KEEP_OUTPUT=
+NFILE=""
+
 PASTEBIN=""
 WWWSERVICE="www.alsa-project.org"
-QUESTION="yes"
+WELCOME="yes"
 PROCEED="yes"
+UPLOAD="ask"
 REPEAT=""
 while [ -z "$REPEAT" ]; do
 REPEAT="no"
 case "$1" in
 	--update|--help|--about)
-		QUESTION="no"
+		WELCOME="no"
 		PROCEED="no"
 		;;
+	--upload)
+		UPLOAD="yes"
+		WELCOME="no"
+		;;
 	--no-upload)
-		NOUPLOAD="yes"
+		UPLOAD="no"
+		WELCOME="no"
 		;;
 	--pastebin)
 		PASTEBIN="yes"
@@ -313,61 +343,50 @@ case "$1" in
 		;;
 	--stdout)
 		DIALOG=""
-		NOUPLOAD="yes"
-		QUESTION="no"
+		UPLOAD="no"
+		WELCOME="no"
 		TOSTDOUT="yes"
 		;;
 esac
 done
-		
+
 
 #Script header output.
-if [ "$QUESTION" = "yes" ]; then
-if [[ -n "$DIALOG" ]]
-then
-if [ -z "$NOUPLOAD" ]; then
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a $WWWSERVICE site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
-else
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
-fi
-DIALOG_EXIT_CODE=$?
-if [ $DIALOG_EXIT_CODE != 0 ]; then
-echo "Thank you for using the ALSA-Info Script"
-exit 0;
-fi
-else
+if [ "$WELCOME" = "yes" ]; then
+greeting_message="\
 
-echo "ALSA Information Script v $SCRIPT_VERSION"
-echo "--------------------------------"
-echo ""
-echo "This script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem."
-echo ""
-if [ -z "$NOUPLOAD" ]; then
-if [[ -n "$TPUT" ]]; then
-tput bold
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
-echo "If you do not wish for this to occur, run the script with the --no-upload argument"
-tput sgr0
+This script visits the following commands/files to collect diagnostic
+information about your ALSA installation and sound related hardware.
+
+  dmesg
+  lspci
+  lsmod
+  aplay
+  amixer
+  alsactl
+  /proc/asound/
+  /sys/class/sound/
+  ~/.asoundrc (etc.)
+
+See '$0 --help' for command line options.
+"
+if [[ -n "$DIALOG" ]]; then
+	dialog  --backtitle "$BGTITLE" \
+		--title "ALSA-Info script v $SCRIPT_VERSION" \
+		--msgbox "$greeting_message" 20 80
 else
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
-echo "If you do not wish for this to occur, run the script with the --no-upload argument"
-fi
-echo ""
-fi # NOUPLOAD
-echo -n "Do you want to run this script? [y/n] : "
-read -e CONFIRM
-if [ "$CONFIRM" != "y" ]; then
-echo ""
-echo "Thank you for using the ALSA-Info Script"
-exit 0;
-fi
-fi
-fi # question
+	echo "ALSA Information Script v $SCRIPT_VERSION"
+	echo "--------------------------------"
+	echo "$greeting_message"
+fi # dialog
+fi # WELCOME
 
 #Set the output file
-TEMPDIR=`mktemp -p /tmp -d alsa-info.XXXXXXXXXX`
+TEMPDIR=`mktemp -t -d alsa-info.XXXXXXXXXX` || exit 1
 FILE="$TEMPDIR/alsa-info.txt"
-NFILE="/tmp/alsa-info.txt"
+if [ -z "$NFILE" ]; then
+	NFILE=`mktemp -t alsa-info.txt.XXXXXXXXXX` || exit 1
+fi
 
 trap cleanup 0
 
@@ -379,9 +398,6 @@ then
 	exit 0
 fi
 
-#Create the temporary work dir.
-mkdir $TEMPDIR 2>/dev/null
-
 #Fetch the info and store in temp files/variables
 DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
 KERNEL_VERSION=`uname -r`
@@ -400,6 +416,17 @@ ESDINST=$(which esd 2>/dev/null| sed 's|
 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)
+DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+
+#Check for DMI data
+if [ -d /sys/class/dmi/id ]; then
+    # No root privileges are required when using sysfs method
+    DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
+elif [ -x $DMIDECODE ]; then
+    DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
+fi
 
 cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
 cat /proc/asound/cards >$TEMPDIR/alsacards.tmp
@@ -431,6 +458,13 @@ echo "" >> $FILE
 echo $DISTRO >> $FILE
 echo "" >> $FILE
 echo "" >> $FILE
+echo "!!DMI Information" >> $FILE
+echo "!!---------------" >> $FILE
+echo "" >> $FILE
+echo "Manufacturer:      $DMI_SYSTEM_MANUFACTURER" >> $FILE
+echo "Product Name:      $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
 echo "!!Kernel Information" >> $FILE
 echo "!!------------------" >> $FILE
 echo "" >> $FILE
@@ -527,7 +561,10 @@ echo "!!--------------------------" >> $
 echo "" >> $FILE
 for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
 echo "!!Module: $mod" >> $FILE
-for params in `ls $SYSFS/module/$mod/parameters/*`; do /bin/echo -ne "\t";/bin/echo "$params : `cat $params`"|sed 's:.*/::' >> $FILE;done
+for params in `echo $SYSFS/module/$mod/parameters/*`; do
+	echo -ne "\t";
+	echo "$params : `cat $params`" | sed 's:.*/::';
+done >> $FILE
 echo "" >> $FILE
 done
 echo "" >> $FILE
@@ -564,12 +601,7 @@ fi
 if [[ -z "$1" ]]
 then
 	update
-	withdevices
-	withconfigs
-	withaplay
-	withamixer
-	withalsactl
-	withlsmod
+	withall
 	pbcheck	
 fi
 
@@ -583,49 +615,34 @@ then
 	case "$1" in
 		--pastebin)
 		        update
-        		withdevices
-        		withconfigs
-        		withaplay
-        		withamixer
-        		withalsactl
-        		withlsmod
-			withsysfs
+			withall
         		pbcheck
 			;;
 		--update)
 			update
 			exit
 			;;
+		--upload)
+			UPLOAD="yes"
+			withall
+			;;
 		--no-upload)
-			NOUPLOAD="yes"
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			UPLOAD="no"
+			withall
+			;;
+		--output)
+			shift
+			NFILE="$1"
+			KEEP_OUTPUT="yes"
 			;;
 		--debug)
 			echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
 			KEEP_FILES="yes"
 			echo ""
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			withall
 			;;
 		--with-all)
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsysfs
+			withall
 			;;
 		--with-aplay)
 			withaplay
@@ -639,6 +656,9 @@ then
 		--with-devices)
 			withdevices
 			;;
+		--with-dmesg)
+			withdmesg
+			;;
 		--with-configs)
 			if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
 			then
@@ -668,13 +688,8 @@ then
 			fi
 			;;
 		--stdout)
-			NOUPLOAD="yes"
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
+			UPLOAD="no"
+			withall
 			cat $FILE
 			rm $FILE
 			;;
@@ -699,13 +714,16 @@ then
 			echo "	--with-configs (includes the output of ~/.asoundrc and"
 			echo "	    /etc/asound.conf if they exist)" 
 			echo "	--with-devices (shows the device nodes in /dev/snd/)"
+			echo "	--with-dmesg (shows the ALSA/HDA kernel messages)"
 			echo ""
+			echo "	--output FILE (specify the file to output for no-upload mode)"
 			echo "	--update (check server for script updates)"
+			echo "	--upload (upload contents to remote server)"
 			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 "	--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)"
@@ -720,32 +738,54 @@ if [ "$PROCEED" = "no" ]; then
 	exit 1
 fi
 
-if [ -n "$NOUPLOAD" ]; then
+if [ "$UPLOAD" = "ask" ]; then
+	if [[ -n "$DIALOG" ]]; then
+		dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80
+		DIALOG_EXIT_CODE=$?
+		if [ $DIALOG_EXIT_CODE != 0 ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	else
+		echo -n "Automatically upload ALSA information to $WWWSERVICE? [y/N] : "
+		read -e CONFIRM
+		if [ "$CONFIRM" != "y" ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	fi
+
+fi
+
+if [ "$UPLOAD" = "no" ]; then
 
 	if [ -z "$TOSTDOUT" ]; then
-		mv $FILE $NFILE || exit 1
+		mv -f $FILE $NFILE || exit 1
+		KEEP_OUTPUT="yes"
 	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
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE.\n Your information was NOT automatically uploaded.\n\nYour ALSA information is 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
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "\n\nYour ALSA information is in $NFILE" 10 60
 		fi
 	else
 		echo
 
 		if [[ -n $PBERROR ]]; then
-			echo "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded."
+			echo "An error occurred while contacting the $WWWSERVICE."
+			echo "Your information was NOT automatically uploaded."
 			echo ""
-			echo "Your ALSA information can be seen by looking in $NFILE"
+			echo "Your ALSA information is 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 "Your ALSA information is in $NFILE"
 				echo ""
 			fi
 		fi
@@ -753,7 +793,7 @@ if [ -n "$NOUPLOAD" ]; then
 
 	exit
 
-fi # noupload
+fi # UPLOAD
 
 #Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. 
 if
@@ -836,7 +876,8 @@ echo ""
 
 #We couldnt find a suitable wget, so tell the user to upload manually.
 else
-	mv $FILE $NFILE || exit 1
+	mv -f $FILE $NFILE || exit 1
+	KEEP_OUTPUT="yes"
 	if [[ -z $DIALOG ]]
 	then
 		if [[ -z $PASTEBIN ]]; then


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/alsa-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- alsa-utils.spec	15 May 2009 12:28:27 -0000	1.81
+++ alsa-utils.spec	3 Sep 2009 11:45:52 -0000	1.82
@@ -3,8 +3,8 @@
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.20
-Release: 2%{?prever_dot}%{?dist}
+Version: 1.0.21
+Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -94,6 +94,9 @@ if [ -s /etc/alsa/asound.state -a ! -s /
 fi
 
 %changelog
+* Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-2
+- added missing patch file
+
 * Fri May 15 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.20-2
 - fixed Headphone Volume issue (bz#500956)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	11 May 2009 09:34:21 -0000	1.32
+++ sources	3 Sep 2009 11:45:52 -0000	1.33
@@ -1 +1 @@
-6837e673ef19da96d8bd2f9e18cd9574  alsa-utils-1.0.20.tar.bz2
+3672287c2608040d111ce45495ba7602  alsa-utils-1.0.21.tar.bz2


--- alsactl-init-fix-headphone.patch DELETED ---



From transif at fedoraproject.org  Thu Sep  3 11:54:42 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu,  3 Sep 2009 11:54:42 +0000 (UTC)
Subject: comps/po kn.po,1.21,1.22
Message-ID: <20090903115442.1DFC311C0099@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3157/po

Modified Files:
	kn.po 
Log Message:
Sending translation for Kannada


Index: kn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/kn.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kn.po	9 Jun 2009 06:44:33 -0000	1.21
+++ kn.po	3 Sep 2009 11:54:41 -0000	1.22
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-08 08:07+0000\n"
-"PO-Revision-Date: 2009-06-09 12:13+0530\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-03 16:46+0530\n"
 "Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
 "Language-Team: Kannada <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,282 +24,299 @@ msgstr ""
 "\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
-#: ../comps-f12.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "???????? ??????????? ???? ?????????? ???? ???? ???? ??????? ?????."
 
 #: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:3 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????? ????????"
 
 #: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ?????"
 
 #: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:7 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????"
 
 #: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ???????????  ????????? ??????? ????????"
 
 #: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:9 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:10 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ?????"
 
 #: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:12 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????? ????? ???????"
 
 #: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "???"
 
 #: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:15 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "??? ????????"
 
 #: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ????????????? ?????? ???????? ?????."
 
 #: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "?????????? ?????"
 
 #: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
-#: ../comps-f12.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
-#: ../comps-f12.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
-#: ../comps-f12.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
-#: ../comps-f12.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
-#: ../comps-f12.xml.in.h:24 ../comps-el5.xml.in.h:8
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
 msgid "Buildsystem building group"
 msgstr "????????????????????(?????????????) ????????? ????"
 
 #: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
-#: ../comps-f12.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "?????????? ?????"
 
 #: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
-#: ../comps-f12.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
-#: ../comps-f12.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "???? ?????"
 
 #: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
-#: ../comps-f12.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
 msgstr "???????????"
 
 #: ../comps-f9.xml.in.h:26 ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:30
-#: ../comps-f12.xml.in.h:30
+#: ../comps-f12.xml.in.h:34 ../comps-f13.xml.in.h:34
 msgid "Clustering Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:32
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
 msgid "Core"
 msgstr "????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:33
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
 msgid "Croatian Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:34 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "???? ?????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:35
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
 msgid "DNS Name Server"
 msgstr "DNS ??????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:36
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
 msgid "Danish Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:38 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:10
 msgid "Desktop Environments"
 msgstr "??? ????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:39 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop environments"
 msgstr "??? ????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:40 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:12
 msgid "Development"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:41
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
 msgid "Development Libraries"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:42 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:13
 msgid "Development Tools"
 msgstr "?????? ????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:43
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
 msgid "Dial-up Networking Support"
 msgstr "??????? ???? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:44
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
 msgid "Dutch Support"
 msgstr "??? ?????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:45 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:15
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:46 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:16
 msgid "Educational Software"
 msgstr "???????? ????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:47 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:17
 msgid "Educational software for learning"
 msgstr "????????? ???????? ???????? "
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:49 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:18
 msgid "Engineering and Scientific"
 msgstr "???????????? ????? ???????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:50
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
 msgid "English (UK) Support"
 msgstr "???????? (????) ?????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:51
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
 msgid "Esperanto Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:52
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
 msgid "Estonian Support"
 msgstr "?????????? ?????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:53
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
 msgid "Ethiopic Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:54 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:19
 msgid "FTP Server"
 msgstr "FTP ???????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:55
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
 msgid "Faeroese Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:56
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
 msgid "Fedora Eclipse"
 msgstr "????? ??????????"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:57 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:20
 msgid "Fedora Packager"
 msgstr "?????? ?????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:59
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
 msgid "Filipino Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:60
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
 msgid "Finnish Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:62
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
 msgid "Fonts"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:63
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????? ????????? ?????? ????? ??????????? ????????????."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:64
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
 msgid "French Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:67 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:21
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
@@ -308,17 +325,19 @@ msgstr ""
 "???????????, ? ???????? ????? ???? ??????????????? ??????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:68 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:22
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:69 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:23
 msgid "GNOME Software Development"
 msgstr "GNOME ???????? ??????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:70
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -327,158 +346,170 @@ msgstr ""
 "?????????,????? ???? ?????????? ??? ??????????????????????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:71
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
 msgid "Gaelic Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:72
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
 msgid "Galician Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:73 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
 msgid "Games and Entertainment"
 msgstr "????????? ????? ????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:74
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
 msgid "Georgian Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:75
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
 msgid "German Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:76 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:26
 msgid "Graphical Internet"
 msgstr "?????????? ????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:77 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:27
 msgid "Graphics"
 msgstr "????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:78
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
 msgid "Greek Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:79
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
 msgid "Gujarati Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:80 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:28
 msgid "Hardware Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:82 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:29
 msgid "Hebrew Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:84
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
 msgid "Hindi Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:85
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
 msgid "Hungarian Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:86
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
 msgid "Icelandic Support"
 msgstr "?????????? ?????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:87
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
 msgid "Indonesian Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:90 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:30
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ????? GNOME ?????????? ??????????? ???????? ? ??????????????? ???????????."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:91
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????? XFCE ?????????? ??????????? ??????????????? ? ??????????????? ???????????."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:92 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:31
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????? KDE ?????????? ??????????? ???????? ???????????????? ???????????."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:93
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "????? ??????? ????????? ???? ????? ???????? ?????? ????????????????? ? ??????????? "
 "???????????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:94 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "??? ?????????? ?????? ???? (X ????) ??????????? ? ???????? ????????? ???????????."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:95
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "????????? ????? ?????? ?????? ?????."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:97
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
 msgid "Inuktitut Support"
 msgstr "???????????? ?????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:98
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
 msgid "Irish Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:99
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
 msgid "Italian Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:100 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
 msgid "Japanese Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:101 ../comps-el4.xml.in.h:31
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:102 ../comps-el4.xml.in.h:32
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???? ??????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:103 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:104 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
 msgid "KDE Software Development"
 msgstr "KDE ???????? ??????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:105
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -487,130 +518,142 @@ msgstr ""
 "???????? ????????? ???? ?????????? ??? ??????????????????????."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:106
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
 msgid "Kannada Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:108
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
 msgid "Kashubian Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:110
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
 msgid "Khmer Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:113
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
 msgid "Korean Support"
 msgstr "??????? ?????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:114
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
 msgid "Kurdish Support"
 msgstr "???????? ?????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:116
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
 msgid "Languages"
 msgstr "???????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:117
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
 msgid "Lao Support"
 msgstr "???? ?????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:119
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
 msgid "Latvian Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:120
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
 msgid "Legacy Fonts"
 msgstr "????????(??????) ????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:121
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
 msgid "Legacy Network Server"
 msgstr "????? ??? ???????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
-#: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:122
+#: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
+#: ../comps-f13.xml.in.h:130
 msgid "Legacy Software Development"
 msgstr "????? (legacy) ???????? ??????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
-#: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:123
+#: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Support"
 msgstr "????? ???????? ?????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:124
+#: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
+#: ../comps-f13.xml.in.h:132
 msgid "Lithuanian Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:125
+#: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
+#: ../comps-f13.xml.in.h:133
 msgid "Low Saxon Support"
 msgstr "???? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
-#: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:127
+#: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
+#: ../comps-f13.xml.in.h:135
 msgid "Macedonian Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
-#: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:128
-#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
+#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
 msgid "Mail Server"
 msgstr "???? ???????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
-#: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:131
+#: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
+#: ../comps-f13.xml.in.h:140
 msgid "Malay Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
-#: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:132
+#: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
+#: ../comps-f13.xml.in.h:141
 msgid "Malayalam Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
-#: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:135
+#: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
+#: ../comps-f13.xml.in.h:144
 msgid "Maori Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:136
+#: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
+#: ../comps-f13.xml.in.h:145
 msgid "Marathi Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
-#: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:138
+#: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
+#: ../comps-f13.xml.in.h:149
 msgid "Mongolian Support"
 msgstr "????????? ?????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
-#: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:139
+#: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
+#: ../comps-f13.xml.in.h:150
 msgid "MySQL Database"
 msgstr "MySQL ????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
-#: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:141
+#: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
+#: ../comps-f13.xml.in.h:152
 msgid "Nepali Support"
 msgstr "?????? ?????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
-#: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:142
-#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
+#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
 msgid "Network Servers"
 msgstr "??? ??????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:143
-#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
 msgid "News Server"
 msgstr "?????? ???????"
 
@@ -619,85 +662,98 @@ msgid "Northern Sami Support"
 msgstr "????? ???? ?????"
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
-#: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:144
+#: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
+#: ../comps-f13.xml.in.h:155
 msgid "Northern Sotho Support"
 msgstr "????? ???? ?????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
-#: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:145
+#: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
+#: ../comps-f13.xml.in.h:156
 msgid "Norwegian Support"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:148
-#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
+#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
 msgid "Office/Productivity"
 msgstr "?????/?????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
-#: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:149
+#: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
+#: ../comps-f13.xml.in.h:160
 msgid "Older bitmap and vector fonts packages"
 msgstr "???? ??????????? ???? ??????????? ????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
-#: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:151
+#: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
+#: ../comps-f13.xml.in.h:162
 msgid "Oriya Support"
 msgstr "????? ?????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
-#: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:152
-#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
+#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "??????????? ???????? ???? ?????? ????? ????????? ?????????? ????????????."
 
-#: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:131
-#: ../comps-f11.xml.in.h:153 ../comps-f12.xml.in.h:153
+#: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
+#: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
+#: ../comps-f13.xml.in.h:165
 msgid "Persian Support"
 msgstr "???????? ?????"
 
-#: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:132
-#: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:154
+#: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
+#: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
+#: ../comps-f13.xml.in.h:166
 msgid "Polish Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:133
-#: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:155
+#: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
+#: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
+#: ../comps-f13.xml.in.h:167
 msgid "Portuguese Support"
 msgstr "?????????? ?????"
 
-#: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:134
-#: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:156
+#: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
+#: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
+#: ../comps-f13.xml.in.h:168
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ????????"
 
-#: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:135
-#: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:157
+#: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
+#: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
+#: ../comps-f13.xml.in.h:169
 msgid "Printing Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:136
-#: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:158
+#: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
+#: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
+#: ../comps-f13.xml.in.h:170
 msgid "Punjabi Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:137
-#: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:159
+#: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
+#: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
+#: ../comps-f13.xml.in.h:171
 msgid "Romanian Support"
 msgstr "????????? ?????"
 
-#: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:138
-#: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:160
+#: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
+#: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
+#: ../comps-f13.xml.in.h:172
 msgid "Ruby"
 msgstr "????"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:161
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
+#: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
+#: ../comps-f13.xml.in.h:173
 msgid "Russian Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:141
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ??? ?????"
 
@@ -705,66 +761,75 @@ msgstr "SUGAR ??? ?????"
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ????????? OLPC XO ???? ????????? ??????? ?????."
 
-#: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:141
-#: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:162
+#: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
+#: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
+#: ../comps-f13.xml.in.h:174
 msgid "Samoan Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:142
-#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:165
+#: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
+#: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
+#: ../comps-f13.xml.in.h:177
 msgid "Serbian Support"
 msgstr "???????? ?????"
 
-#: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:143
-#: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:166
+#: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
+#: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
+#: ../comps-f13.xml.in.h:178
 msgid "Server Configuration Tools"
 msgstr "??????? ?????? ????????"
 
-#: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:144
-#: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:167
-#: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
+#: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
+#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
 msgid "Servers"
 msgstr "??????????"
 
-#: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:145
-#: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:168
-#: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
+#: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "???? ????? ??????? ???????? ?????????? ???? ??????? ????? ??????????."
 
-#: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:147
-#: ../comps-f11.xml.in.h:170 ../comps-f12.xml.in.h:170
+#: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
+#: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
+#: ../comps-f13.xml.in.h:182
 msgid "Sinhala Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:148
-#: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:171
+#: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
+#: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
+#: ../comps-f13.xml.in.h:183
 msgid "Slovak Support"
 msgstr "???????? ?????"
 
-#: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:149
-#: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:172
+#: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
+#: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
+#: ../comps-f13.xml.in.h:184
 msgid "Slovenian Support"
 msgstr "??????????? ?????"
 
-#: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:150
-#: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:173
+#: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
+#: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
+#: ../comps-f13.xml.in.h:185
 msgid "Smallest possible installation"
 msgstr "???????????? ??????????"
 
-#: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:151
-#: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:174
-#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
+#: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
+#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
 msgid "Software used for running network servers"
 msgstr "??? ????????????? ?????????????? ????? ????????"
 
-#: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:152
-#: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:175
+#: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
+#: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
+#: ../comps-f13.xml.in.h:187
 msgid "Somali Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:153
-#: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:176
+#: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
+#: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
+#: ../comps-f13.xml.in.h:188
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -772,116 +837,129 @@ msgstr ""
 "???? ??????????? ?????????? ? ???????????? ??? ????????? ????????? ???? ?????????? "
 "??????????????????. Emacs ????? Vi ? ??????? ?????????."
 
-#: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:154
-#: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:177
-#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
+#: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
+#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
 msgid "Sound and Video"
 msgstr "????? ????? ??????"
 
-#: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:155
-#: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:178
+#: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
+#: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
+#: ../comps-f13.xml.in.h:190
 msgid "Southern Ndebele Support"
 msgstr "???? ?????? ?????"
 
-#: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:156
-#: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:179
+#: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
+#: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Sotho Support"
 msgstr "???? ???? ?????"
 
-#: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:157
-#: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:180
+#: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
+#: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
+#: ../comps-f13.xml.in.h:192
 msgid "Spanish Support"
 msgstr "?????????? ?????"
 
-#: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:159
-#: ../comps-f11.xml.in.h:184 ../comps-f12.xml.in.h:184
-#: ../comps-el4.xml.in.h:46
+#: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
+#: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
+#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???? ????????????? ????????? ??????????????? ???????? ?????."
 
-#: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:160
-#: ../comps-f11.xml.in.h:186 ../comps-f12.xml.in.h:186
-#: ../comps-el4.xml.in.h:47
+#: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
+#: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
+#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???? ????????????? ????????? ??????? ??????????????? ??????? ?????."
 
-#: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:161
-#: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:188
+#: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
+#: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
+#: ../comps-f13.xml.in.h:201
 msgid "Swati Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:162
-#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:189
+#: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
+#: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
+#: ../comps-f13.xml.in.h:202
 msgid "Swedish Support"
 msgstr "???????? ?????"
 
-#: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:163
-#: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:190
-#: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
+#: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
+#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
 msgid "System Tools"
 msgstr "???????????? ????????"
 
-#: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:164
-#: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:191
+#: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
+#: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
+#: ../comps-f13.xml.in.h:204
 msgid "Tagalog Support"
 msgstr "????????? ?????"
 
-#: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:166
-#: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:193
+#: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
+#: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
+#: ../comps-f13.xml.in.h:206
 msgid "Tamil Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:167
-#: ../comps-f11.xml.in.h:194 ../comps-f12.xml.in.h:194
+#: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
+#: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
+#: ../comps-f13.xml.in.h:207
 msgid "Telugu Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:168
-#: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:196
-#: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
+#: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
+#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
 msgid "Text-based Internet"
 msgstr "????????? ????????"
 
-#: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:169
-#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:197
+#: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
+#: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
+#: ../comps-f13.xml.in.h:210
 msgid "Thai Support"
 msgstr "???? ?????"
 
-#: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:170
-#: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:198
-#: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
+#: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "????? ????????? ????????? ????????, PDF ???????? ???? ??? ???????????????????."
 
-#: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:171
-#: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:199
+#: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
+#: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
+#: ../comps-f13.xml.in.h:212
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??????????? ???????? ???????? ???? ?????????? ? ???????? ???????????."
 
-#: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:172
-#: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:200
-#: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
+#: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "? ???????????? IMAP ???? SMTP ???? ???????????? ???????? ??????????????????."
 
-#: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:173
-#: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:201
+#: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
+#: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
+#: ../comps-f13.xml.in.h:214
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "X Window ?????????? ??????????? ???????? ? ???????????? ??????????????????."
 
-#: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:174
-#: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:202
-#: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
+#: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ??????????? ??? ??? ????????? ????????????????? ? ???????????? ???????????????."
 
-#: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:175
-#: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:203
+#: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
+#: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
+#: ../comps-f13.xml.in.h:216
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "? ???????????? DHCP, Kerberos, NIS.?????? ?????????? ???????????????????."
 
-#: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:176
-#: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:204
+#: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
+#: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
+#: ../comps-f13.xml.in.h:217
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -889,18 +967,21 @@ msgstr ""
 "? ???????????? rsh, telnet ?????? ???? ??? ??????????????? ??????? "
 "???????????????????."
 
-#: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:177
-#: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:205
+#: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
+#: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
+#: ../comps-f13.xml.in.h:218
 msgid "These packages provide a virtualization environment."
 msgstr "? ???????????? ?????????? ?????????? ?????????."
 
-#: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:178
-#: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:206
+#: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
+#: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
+#: ../comps-f13.xml.in.h:219
 msgid "These packages provide compatibility with previous releases."
 msgstr "? ???????????? ?????? ???????????? ????? ?????????? ?????????."
 
-#: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:179
-#: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:207
+#: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
+#: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
+#: ../comps-f13.xml.in.h:220
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -908,8 +989,9 @@ msgstr ""
 "? ???????????? ???????? (font) ???? ?????????????????????? (input methods) ????? "
 "???????? ????? ?????????."
 
-#: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:180
-#: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:208
+#: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
+#: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
+#: ../comps-f13.xml.in.h:221
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -917,21 +999,21 @@ msgstr ""
 "? ???????? ??????????????? DocBook ??????????? ????????, HTML, PDF, Postscript "
 "???? ???????? ??????????? ??????????????????."
 
-#: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:181
-#: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:209
-#: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
+#: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
+#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run a Web server on the system."
 msgstr "? ???????? ????? ???????? ??? ??????????????? ??????? ??????????????????."
 
-#: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:182
-#: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:210
-#: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
+#: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
+#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "? ???????? ????? ???????? FTP ??????????????? ??????? ??????????????????."
 
-#: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:183
-#: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:211
-#: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
+#: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -939,19 +1021,21 @@ msgstr ""
 "? ???????? automake, gcc, perl, python, ????????? ??????? ???????? ??????? "
 "???????????????????."
 
-#: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:184
-#: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:212
-#: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
+#: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
 msgid "This group allows you to configure the system as a news server."
 msgstr "? ???? ????? ???????? ?????? ??????????? ???????? ??????????????????."
 
-#: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:185
-#: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:213
+#: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
+#: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
+#: ../comps-f13.xml.in.h:226
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "? ???? Red Hat ? ????? ???????? ??????? ?????? ??????????? ????????????."
 
-#: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:186
-#: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:214
+#: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
+#: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
+#: ../comps-f13.xml.in.h:227
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -959,15 +1043,15 @@ msgstr ""
 "? ????, ????? ????? ???????? ????? ?????? ???????? ???????? ???????????????????????. ?."
 "??."
 
-#: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:187
-#: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:215
-#: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
+#: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
+#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "? ???? ???????? ??-????, ??? ???? ??????? ????????????????????."
 
-#: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:188
-#: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:216
-#: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
+#: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
+#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -975,17 +1059,17 @@ msgstr ""
 "? ???? ?????? ???? ????????? ??????????? ?????, ??????????????? (??????) ??????? "
 "???? ?????? ?????????????? ????????? ???????????????????????."
 
-#: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:189
-#: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:217
-#: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
+#: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 "? ???? ??????????? ?????????? ???? ?????? ????? ?????????????? "
 "???????????????????????."
 
-#: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:190
-#: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:218
-#: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
+#: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -993,9 +1077,9 @@ msgstr ""
 "? ???? X Window ????????? ?????????????? ?????????? ??-????, ???, ??????? ?????? "
 "???????????????????."
 
-#: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:191
-#: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:219
-#: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
+#: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1003,21 +1087,21 @@ msgstr ""
 "? ???? ???????? ?????? ???????, ???????????? ???????? ?????? ???? ??? ?????????? "
 "???????? ?????????? ???????? ???????????????????."
 
-#: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:192
-#: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:220
-#: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
+#: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "? ?????? ?????????? ??????? ???????? ???? ?????????? ???? ????????? ?????."
 
-#: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:193
-#: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:221
-#: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
+#: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "? ?????? ????? ???????? ??????? ???????? ???? ????????? ?????."
 
-#: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:194
-#: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:223
-#: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
+#: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -1025,15 +1109,17 @@ msgstr ""
 "? ???? SMB shares ????? ?????????? ????? ?????? ????? ???? ??? ??????????? "
 "??????????????????? ???????? ???????????????????."
 
-#: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:195
-#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:224
+#: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
+#: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
+#: ../comps-f13.xml.in.h:237
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "? ???????? ???? ????? ???????? ??????????????? (DNS name server (BIND)) ??????? "
 "????? ?????????????."
 
-#: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:196
-#: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:225
+#: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
+#: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
+#: ../comps-f13.xml.in.h:238
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1041,314 +1127,363 @@ msgstr ""
 "? ???????? ???? ??????? ???? ???????(tm) ????? ????? ????? ???????? "
 "??????????????????."
 
-#: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:197
-#: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:226
+#: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
+#: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
+#: ../comps-f13.xml.in.h:239
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "? ???????? ???? MySQL ????? ????????????? ???????????????????????."
 
-#: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:198
-#: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:227
+#: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
+#: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
+#: ../comps-f13.xml.in.h:240
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "? ???????? ???? Postgresql ????? ????????????? ???????????????????????."
 
-#: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:199
-#: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:228
+#: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
+#: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
+#: ../comps-f13.xml.in.h:241
 msgid "Tibetan Support"
 msgstr "????????? ?????"
 
-#: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:200
-#: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:229
+#: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
+#: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
+#: ../comps-f13.xml.in.h:242
 msgid "Tonga Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:201
-#: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:230
-#: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
+#: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
+#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "???? ?????? ?????????????? ??????? ????? ???? ????????????"
 
-#: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:202
-#: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:231
+#: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
+#: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
+#: ../comps-f13.xml.in.h:244
 msgid "Tsonga Support"
 msgstr "??????? ?????"
 
-#: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:203
-#: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:232
+#: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
+#: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
+#: ../comps-f13.xml.in.h:245
 msgid "Tswana Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:204
-#: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:233
+#: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
+#: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
+#: ../comps-f13.xml.in.h:246
 msgid "Turkish Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:205
-#: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:235
+#: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
+#: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
+#: ../comps-f13.xml.in.h:248
 msgid "Ukrainian Support"
 msgstr "??????????? ?????"
 
-#: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:206
-#: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:237
+#: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
+#: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
+#: ../comps-f13.xml.in.h:250
 msgid "Urdu Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:208
-#: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:239
-#: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
+#: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
+#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
 msgid "Various core pieces of the system."
 msgstr "????????? ????? ???????? ?????????."
 
-#: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:209
-#: ../comps-f11.xml.in.h:240 ../comps-f12.xml.in.h:240
-#: ../comps-el5.xml.in.h:73
+#: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
+#: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
+#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
 msgid "Various ways to relax and spend your free time."
 msgstr "????????? ?????? ???? ????? ??????? ????????? ?????? ?????? ????????."
 
-#: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:210
-#: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:241
+#: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
+#: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
+#: ../comps-f13.xml.in.h:254
 msgid "Venda Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:211
-#: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:242
+#: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
+#: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
+#: ../comps-f13.xml.in.h:255
 msgid "Vietnamese Support"
 msgstr "??????????? ?????"
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:212
-#: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:243
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
+#: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
+#: ../comps-f13.xml.in.h:256
 msgid "Virtualization"
 msgstr "??????????????? (Virtualization)"
 
-#: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:244
+#: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
+#: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
+#: ../comps-f13.xml.in.h:257
 msgid "Walloon Support"
 msgstr "????? ?????"
 
-#: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:214
-#: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:245
-#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
+#: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
+#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
 msgid "Web Development"
 msgstr "??? ?????????"
 
-#: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:215
-#: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:246
-#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
+#: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
+#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
 msgid "Web Server"
 msgstr "??? ???????"
 
-#: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:216
-#: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:247
+#: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
+#: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
+#: ../comps-f13.xml.in.h:260
 msgid "Welsh Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:217
-#: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:248
-#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
+#: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
 msgid "Window Managers"
 msgstr "????? ??????????"
 
-#: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:218
-#: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:249
+#: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
+#: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
+#: ../comps-f13.xml.in.h:262
 msgid "Windows File Server"
 msgstr "??????? ??? ???????"
 
-#: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:219
-#: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:250
+#: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
+#: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
+#: ../comps-f13.xml.in.h:263
 msgid "X Software Development"
 msgstr "X ???????? ??????"
 
-#: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:220
-#: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:251
-#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
+#: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
+#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
 msgid "X Window System"
 msgstr "X Window ????????"
 
-#: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:221
-#: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:252
+#: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
+#: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
+#: ../comps-f13.xml.in.h:265
 msgid "XFCE"
 msgstr "XFCE"
 
-#: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:222
-#: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:253
+#: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
+#: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
+#: ../comps-f13.xml.in.h:266
 msgid "XFCE Software Development"
 msgstr "XFCE ???????? ?????????"
 
-#: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:223
-#: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:254
+#: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
+#: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
+#: ../comps-f13.xml.in.h:267
 msgid "Xhosa Support"
 msgstr "?????? ?????"
 
-#: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:224
-#: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:255
+#: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
+#: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
+#: ../comps-f13.xml.in.h:268
 msgid "Zulu Support"
 msgstr "???? ?????"
 
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-f12.xml.in.h:2
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-f12.xml.in.h:4
+#: ../comps-f13.xml.in.h:4
 msgid "A software playground for learning about learning."
 msgstr "??????? ????? ?????? ???????? ???? ???????? ??? ?????."
 
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:81 ../comps-f12.xml.in.h:81
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:81
 msgid "Haskell Development"
 msgstr "?????????? ?????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:88
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
+#: ../comps-f13.xml.in.h:95
 msgid "Input Methods"
 msgstr "???? ???????"
 
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:89
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
+#: ../comps-f13.xml.in.h:96
 msgid "Input method packages for the input of international text."
 msgstr "???????????? ????????? ???????? ???????? ???? ?????? ???????????."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:107
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
 msgid "Kashmiri Support"
 msgstr "???????? ?????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:112
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
 msgid "Konkani Support"
 msgstr "?????? ?????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:115
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:129
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
 msgid "Maithili Support"
 msgstr "?????? ?????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:140
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
 msgid "Myanmar (Burmese) Support"
 msgstr "???????? (???????) ?????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:169
-#: ../comps-f12.xml.in.h:169
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+msgid "Perl Development"
+msgstr "Perl ??????"
+
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
 msgid "Sindhi Support"
 msgstr "????? ?????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:183
-#: ../comps-f12.xml.in.h:183
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "?????????? ?????????????? ????????? ??????????????? ???????? ?????."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:192
-#: ../comps-f12.xml.in.h:192
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+msgid "Support for developing programs in the Perl programming language."
+msgstr "Perl ?????????????? ????????? ??????????????? ???????? ?????."
+
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
 msgid "Tajik Support"
 msgstr "?????? ?????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:238
-#: ../comps-f12.xml.in.h:238
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
 msgid "Uzbek Support"
 msgstr "??????? ?????"
 
-#: ../comps-f11.xml.in.h:6 ../comps-f12.xml.in.h:6
+#: ../comps-f11.xml.in.h:6 ../comps-f12.xml.in.h:8 ../comps-f13.xml.in.h:8
 msgid "Amazigh Support"
 msgstr "??????? ?????"
 
-#: ../comps-f11.xml.in.h:13 ../comps-f12.xml.in.h:13
+#: ../comps-f11.xml.in.h:13 ../comps-f12.xml.in.h:15 ../comps-f13.xml.in.h:15
 msgid "Azerbaijani Support"
 msgstr "?????????? ?????"
 
-#: ../comps-f11.xml.in.h:27 ../comps-f12.xml.in.h:27
+#: ../comps-f11.xml.in.h:27 ../comps-f12.xml.in.h:31 ../comps-f13.xml.in.h:31
 msgid "Chichewa Support"
 msgstr "?????? ?????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:31
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
 msgid "Coptic Support"
 msgstr "???????? ?????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:37
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "???????? ????????????????? ??????? ???? ????????? ????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:48
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
 msgid "Electronic Lab"
 msgstr "??????????? ?????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:58
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
 msgid "Fijian Support"
 msgstr "??????? ?????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:61
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
 msgid "Font design and packaging"
 msgstr "????????? ??????? ???? ???????? ????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:65
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
 msgid "Frisian Support"
 msgstr "?????????? ?????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:66
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
 msgid "Friulian Support"
 msgstr "???????????  ?????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:83
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
 msgid "Hiligaynon Support"
 msgstr "???????????? ?????"
 
-#: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:96
+#: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
+#: ../comps-f13.xml.in.h:103
 msgid "Interlingua Support"
 msgstr "???????????? ?????"
 
-#: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:109
+#: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
+#: ../comps-f13.xml.in.h:116
 msgid "Kazakh Support"
 msgstr "???? ?????"
 
-#: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:111
+#: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
+#: ../comps-f13.xml.in.h:118
 msgid "Kinyarwanda Support"
 msgstr "???????????? ?????"
 
-#: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:118
+#: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
+#: ../comps-f13.xml.in.h:126
 msgid "Latin Support"
 msgstr "?????? ?????"
 
-#: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:126
+#: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
+#: ../comps-f13.xml.in.h:134
 msgid "Luxembourgish Support"
 msgstr "???????????? ?????"
 
-#: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:130
+#: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
+#: ../comps-f13.xml.in.h:139
 msgid "Malagasy Support"
 msgstr "?????? ?????"
 
-#: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:133
+#: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
+#: ../comps-f13.xml.in.h:142
 msgid "Maltese Support"
 msgstr "???????? ?????"
 
-#: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:134
+#: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
+#: ../comps-f13.xml.in.h:143
 msgid "Manx Support"
 msgstr "?????????? ?????"
 
-#: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:137
+#: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
+#: ../comps-f13.xml.in.h:146
 msgid "MinGW cross-compiler"
 msgstr "MinGW ??????-???????"
 
-#: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:146
+#: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
+#: ../comps-f13.xml.in.h:157
 msgid "OCaml"
 msgstr "OCaml"
 
-#: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:147
+#: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
+#: ../comps-f13.xml.in.h:158
 msgid "Occitan Support"
 msgstr "????????? ?????"
 
-#: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:150
+#: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
+#: ../comps-f13.xml.in.h:161
 msgid "Online Help and Documentation"
 msgstr "????????? ????? ???? ????????????"
 
-#: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:163
+#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
+#: ../comps-f13.xml.in.h:175
 msgid "Sanskrit Support"
 msgstr "??????? ?????"
 
-#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:164
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "?????????? ?????"
 
-#: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "????? ??? ????????"
 
-#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1356,7 +1491,8 @@ msgstr ""
 "32 ??????? ???????????? ??????-????????? ??????????????? ?????, ????? ?????? ?????? "
 "?????? ????????? ??????? ?????, ???? ??????????????? ????????? ????????????."
 
-#: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1364,15 +1500,18 @@ msgstr ""
 "??????????? CAML ????????????? ????????? ???? ????????????? ????????? ????????????? "
 "???????? ?????."
 
-#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "??????? ?????"
 
-#: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ?????"
 
-#: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1380,14 +1519,70 @@ msgstr ""
 "? ??????? ?????? ??????????? ?????, ?????????????, ???????????????? ????????????? "
 "???? ?????????????? ????????? ????? ????????????."
 
-#: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ?????"
 
-#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "?????? ???????? ?????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "GNOME ????????? ????????? ???? ?????????? ??????? ???????????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "????? ?????? ?????????????? ????????? ???? ??????????? ?????? ???????????????? ??????? ???????????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "????????? ???? ?????????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "????? ????????????? ???? ???????????????? ????????? ???? ?????????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????????? ???? (????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "????????? ???? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????????? ???????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "??????????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?? ???? ???????? X11 ??????? ?????????????, ?????????????, ?????? ??????? ???? ???? ???????? ????? ???????? ????????????? ???????? ???????? ?????????? ????????? ??????????????."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "??? ???? ???????????? ????????? ??????????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "???????? ??? ?????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "???????? ????????? NetBook/NetTop/MID ???????????? ??????? ?????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ?????????? ????????"



From perex at fedoraproject.org  Thu Sep  3 12:04:47 2009
From: perex at fedoraproject.org (perex)
Date: Thu,  3 Sep 2009 12:04:47 +0000 (UTC)
Subject: rpms/alsa-utils/F-10 alsa-utils.spec,1.82,1.83
Message-ID: <20090903120447.40DDF11C0099@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6244

Modified Files:
	alsa-utils.spec 
Log Message:
alsa-utils: updated to 1.0.21 final


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/alsa-utils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- alsa-utils.spec	3 Sep 2009 11:45:52 -0000	1.82
+++ alsa-utils.spec	3 Sep 2009 12:04:47 -0000	1.83
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -13,7 +13,7 @@ Source4: alsaunmute
 Source6: alsa-info.sh
 Source10: alsa.rules
 Source11: alsactl.conf
-Patch1:	 alsactl-init-fix-headphone.patch
+Patch1:	 alsactl-init-fix-headphone2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -95,6 +95,13 @@ fi
 
 %changelog
 * Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-2
+- fixed patch name
+
+* Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-1
+- updated to 1.0.21 final
+- updated alsa-info.sh script to 0.4.58
+
+* Thu Sep  3 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.21-2
 - added missing patch file
 
 * Fri May 15 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.20-2



From theinric at fedoraproject.org  Thu Sep  3 12:23:12 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Thu,  3 Sep 2009 12:23:12 +0000 (UTC)
Subject: rpms/rsyslog/devel .cvsignore, 1.32, 1.33 rsyslog.spec, 1.62,
	1.63 sources, 1.34, 1.35
Message-ID: <20090903122312.8FCCF11C0099@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13787

Modified Files:
	.cvsignore rsyslog.spec sources 
Log Message:
upgrade to new upstream stable version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	14 Jul 2009 13:52:38 -0000	1.32
+++ .cvsignore	3 Sep 2009 12:23:12 -0000	1.33
@@ -1 +1 @@
-rsyslog-4.2.0.tar.gz
+rsyslog-4.4.1.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- rsyslog.spec	21 Aug 2009 15:43:49 -0000	1.62
+++ rsyslog.spec	3 Sep 2009 12:23:12 -0000	1.63
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 4.2.0
-Release: 3%{?dist}
+Version: 4.4.1
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -92,6 +92,7 @@ IETF standard protocol.
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
 %configure	--sbindir=%{sbindir} \
 		--disable-static \
+		--disable-testbench \
 		--enable-mysql \
 		--enable-pgsql \
 		--enable-gssapi-krb5 \
@@ -159,6 +160,7 @@ fi	
 %{_libdir}/rsyslog/lmtcpsrv.so
 %{_libdir}/rsyslog/lmnetstrms.so
 %{_libdir}/rsyslog/lmnsd_ptcp.so
+%{_libdir}/rsyslog/lmstrmsrv.so
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
@@ -192,6 +194,9 @@ fi	
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Thu Sep 03 2009 Tomas Heinrich <theinric at redhat.com> 4.4.1-1
+- upgrade to new upstream stable version
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.2.0-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	14 Jul 2009 13:52:38 -0000	1.34
+++ sources	3 Sep 2009 12:23:12 -0000	1.35
@@ -1 +1 @@
-c66650e961f23253fc926da5d35bd71f  rsyslog-4.2.0.tar.gz
+2f298222850a098834bbf8c651a9963c  rsyslog-4.4.1.tar.gz



From timlau at fedoraproject.org  Thu Sep  3 12:35:24 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu,  3 Sep 2009 12:35:24 +0000 (UTC)
Subject: rpms/yum-utils/devel yum-utils.spec,1.66,1.67
Message-ID: <20090903123524.9344C11C0099@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20841

Modified Files:
	yum-utils.spec 
Log Message:
Changed Requires: yum >= 3.2.24 to yum >= 3.2.23 for versionlock plugin
because yum in rawhide contains patches against yum-3_2_X HEAD
And 3.2.24 is not released yet :(



Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- yum-utils.spec	2 Sep 2009 12:00:56 -0000	1.66
+++ yum-utils.spec	3 Sep 2009 12:35:24 -0000	1.67
@@ -75,7 +75,7 @@ Group: System Environment/Base
 Provides: yum-versionlock = %{version}-%{release}
 Obsoletes: yum-versionlock < 1.1.20-0
 Conflicts: yum-versionlock < 1.1.20-0
-Requires: yum >= 3.2.24
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-versionlock
 This plugin takes a set of name/versions for packages and excludes all other
@@ -596,6 +596,10 @@ fi
 
 
 %changelog
+* Wed Sep 3 2009 Tim Lauridsen <timlau at fedoraproject.org>
+- changed Requires: yum >= 3.2.24 to yum >= 3.2.23 for versionlock plugin
+- because yum in rawhide contains patches against yum-3_2_X HEAD.
+
 * Wed Sep 2 2009 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.23
 



From timlau at fedoraproject.org  Thu Sep  3 12:35:58 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu,  3 Sep 2009 12:35:58 +0000 (UTC)
Subject: rpms/yum-utils/devel yum-utils.spec,1.67,1.68
Message-ID: <20090903123558.C05B311C0099@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22107

Modified Files:
	yum-utils.spec 
Log Message:
bumped release


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- yum-utils.spec	3 Sep 2009 12:35:24 -0000	1.67
+++ yum-utils.spec	3 Sep 2009 12:35:58 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz



From mclasen at fedoraproject.org  Thu Sep  3 12:44:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Sep 2009 12:44:21 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.114,1.115
Message-ID: <20090903124421.9FFBF11C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28571

Modified Files:
	PackageKit.spec 
Log Message:
Rename debuginfo-install to debug-install



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- PackageKit.spec	2 Sep 2009 18:10:31 -0000	1.114
+++ PackageKit.spec	3 Sep 2009 12:44:21 -0000	1.115
@@ -10,7 +10,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.2
-Release:   0.1.%{?alphatag}git%{?dist}
+Release:   0.2.%{?alphatag}git%{?dist}
 #Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -25,6 +25,8 @@ 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
 
+Patch2: plugin-ui.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -141,12 +143,13 @@ Requires: %{name} = %{version}-%{release
 %description cron
 Crontab and utilities for running PackageKit as a cron job.
 
-%package debuginfo-install
+%package debug-install
 Summary: Facility to install debugging packages using PackageKit
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
+Obsoletes: PackageKit-debuginfo-install <= 0.5.2-0.1.20090902git.fc12
 
-%description debuginfo-install
+%description debug-install
 Provides facility to install debugging packages using PackageKit.
 
 %package glib-devel
@@ -239,9 +242,10 @@ user to restart the computer or remove a
 #%setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
+%patch2 -p1 -b .plugin-ui
 
 %build
-%configure --disable-static --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
+%configure --disable-static --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck --disable-strict
 
 make %{?_smp_mflags}
 
@@ -374,7 +378,7 @@ update-mime-database %{_datadir}/mime &>
 %config %{_sysconfdir}/cron.daily/packagekit-background.cron
 %config(noreplace) %{_sysconfdir}/sysconfig/packagekit-background
 
-%files debuginfo-install
+%files debug-install
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %{_bindir}/pk-debuginfo-install
@@ -436,6 +440,9 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.2-0.2.20090902git
+- Rename -debuginfo-install to debug-install (#520965)
+
 * Wed Sep 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090902git
 - Update to a newer git snapshot from the 0.5.x series.
 - Should fix some issues with KPackageKit.



From rdieter at fedoraproject.org  Thu Sep  3 12:44:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Sep 2009 12:44:07 +0000 (UTC)
Subject: rpms/kdelibs3/devel kde.csh, 1.2, 1.3 kde.sh, 1.3, 1.4 kdelibs3.spec,
	1.66, 1.67
Message-ID: <20090903124407.D808811C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28756

Modified Files:
	kde.csh kde.sh kdelibs3.spec 
Log Message:
* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-14
- kde.(sh|csh): drop KDE_IS_PRELINKED (workaround bug #515539)



Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde.csh	1 Dec 2007 19:11:02 -0000	1.2
+++ kde.csh	3 Sep 2009 12:44:07 -0000	1.3
@@ -5,13 +5,10 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ##  When/if using prelinking, avoids (some) use of kdeinit
-if ( -f /etc/sysconfig/prelink ) then
-   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-   if ( "$PRELINKING" == "yes" )  then
-     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-   endif
-endif
-
-## if not using IPv6, speeds DNS operations
-# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 
+#if ( -f /etc/sysconfig/prelink ) then
+#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+#   if ( "$PRELINKING" == "yes" )  then
+#     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+#   endif
+#endif
 


Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde.sh	10 Jan 2009 17:28:52 -0000	1.3
+++ kde.sh	3 Sep 2009 12:44:07 -0000	1.4
@@ -5,7 +5,7 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -z "$KDE_IS_PRELINKED" ] ; then
-  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
-  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-fi
+#if [ -z "$KDE_IS_PRELINKED" ] ; then
+#  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+#  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+#fi


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- kdelibs3.spec	26 Jul 2009 05:40:32 -0000	1.66
+++ kdelibs3.spec	3 Sep 2009 12:44:07 -0000	1.67
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -640,6 +640,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-14
+- kde.(sh|csh): drop KDE_IS_PRELINKED (workaround bug #515539)
+
 * Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13
 - fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references



From pbrobinson at fedoraproject.org  Thu Sep  3 13:00:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 13:00:20 +0000 (UTC)
Subject: rpms/anjal/devel import.log,1.1,NONE
Message-ID: <20090903130020.F274611C02C6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2185

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From nphilipp at fedoraproject.org  Thu Sep  3 13:03:13 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  3 Sep 2009 13:03:13 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.76, 1.77 sources, 1.85,
	1.86 system-config-users.spec, 1.93, 1.94
Message-ID: <20090903130313.720DA11C0099@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3411

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.90


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	2 Sep 2009 09:06:32 -0000	1.76
+++ .cvsignore	3 Sep 2009 13:03:12 -0000	1.77
@@ -1 +1 @@
-system-config-users-1.2.89.tar.bz2
+system-config-users-1.2.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	2 Sep 2009 09:06:32 -0000	1.85
+++ sources	3 Sep 2009 13:03:13 -0000	1.86
@@ -1 +1 @@
-246c9a2aa7ec7ff51431b117f5d70f6d  system-config-users-1.2.89.tar.bz2
+9a901c52d40ac62c5cfffec89e854b7e  system-config-users-1.2.90.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- system-config-users.spec	2 Sep 2009 09:06:32 -0000	1.93
+++ system-config-users.spec	3 Sep 2009 13:03:13 -0000	1.94
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.89
+Version: 1.2.90
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -127,6 +127,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> - 1.2.90-1
+- import gettext from each module again
+- use gtk.ComboBoxEntry instead of gtk.Combo
+
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.2.89-1
 - initialize gettext correctly
 



From mnagy at fedoraproject.org  Thu Sep  3 13:03:21 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Thu,  3 Sep 2009 13:03:21 +0000 (UTC)
Subject: rpms/bind/F-11 bind-96-dyndb.patch,1.7,1.8 bind.spec,1.319,1.320
Message-ID: <20090903130321.897AE11C0099@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3472

Modified Files:
	bind-96-dyndb.patch bind.spec 
Log Message:
* Thu Sep 03 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-4.P1.1
- update the patch for dynamic loading of database backends


bind-96-dyndb.patch:
 b/lib/dns/dynamic_db.c             |  364 +++++++++++++++++++++++++++++++++++++
 b/lib/dns/include/dns/dynamic_db.h |   50 +++++
 bin/named/main.c                   |    3 
 bin/named/server.c                 |  102 ++++++++++
 lib/dns/Makefile.in                |   10 -
 lib/dns/include/dns/Makefile.in    |    2 
 lib/dns/include/dns/log.h          |    1 
 lib/dns/include/dns/types.h        |    1 
 lib/dns/log.c                      |    1 
 lib/isccfg/namedconf.c             |   36 +++
 10 files changed, 567 insertions(+), 3 deletions(-)

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind-96-dyndb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bind-96-dyndb.patch	28 Apr 2009 17:18:06 -0000	1.7
+++ bind-96-dyndb.patch	3 Sep 2009 13:03:21 -0000	1.8
@@ -8,15 +8,15 @@
  #include <dns/name.h>
  #include <dns/result.h>
  #include <dns/view.h>
-@@ -778,6 +779,8 @@ cleanup(void) {
- 	dlz_drivers_clear();
- #endif
+@@ -760,6 +761,8 @@ setup(void) {
  
+ static void
+ cleanup(void) {
 +	dns_dynamic_db_cleanup(ISC_TRUE);
 +
- 	dns_name_destroy();
+ 	destroy_managers();
  
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+ 	ns_server_destroy(&ns_g_server);
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
 @@ -57,6 +57,7 @@


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- bind.spec	29 Jul 2009 13:18:28 -0000	1.319
+++ bind.spec	3 Sep 2009 13:03:21 -0000	1.320
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  4.%{PATCHVER}%{?dist}
+Release:  4.%{PATCHVER}%{?dist}.1
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -583,6 +583,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Sep 03 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-4.P1.1
+- update the patch for dynamic loading of database backends
+
 * Wed Jul 29 2009 Adam Tkac <atkac redhat com> 32:9.6.1-4.P1
 - 9.6.1-P1 release (CVE-2009-0696)
 - fix postun trigger (#513016, hopefully)



From caolanm at fedoraproject.org  Thu Sep  3 13:04:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Sep 2009 13:04:04 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch, NONE,
	1.1 openoffice.org.spec, 1.1998, 1.1999
Message-ID: <20090903130404.563B311C0099@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch 
Log Message:
Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch

openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch:
 chart2uno.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch ---
Index: source/ui/unoobj/chart2uno.cxx
===================================================================
--- sc.orig/source/ui/unoobj/chart2uno.cxx	(revision 275719)
+++ sc/source/ui/unoobj/chart2uno.cxx	(working copy)
@@ -500,6 +500,10 @@
         ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr);
         SCCOLROW n1 = aData.Ref1.nCol;
         SCCOLROW n2 = aData.Ref2.nCol;
+        if (n1 > SCCOL_MAX)
+            n1 = SCCOL_MAX;
+        if (n2 > SCCOL_MAX)
+            n2 = SCCOL_MAX;
         SCCOLROW nTmp = n2 - n1 + 1;
         if (n1 < mnStartCol)
             mnStartCol = static_cast<SCCOL>(n1);
@@ -510,14 +514,18 @@
 
         n1 = aData.Ref1.nRow;
         n2 = aData.Ref2.nRow;
+        if (n1 > SCROW_MAX)
+            n1 = SCROW_MAX;
+        if (n2 > SCROW_MAX)
+            n2 = SCROW_MAX;
         nTmp = n2 - n1 + 1;
 
         if (n1 < mnStartRow)
-            mnStartRow = static_cast<SCCOL>(n1);
+            mnStartRow = static_cast<SCROW>(n1);
         if (n2 > nEndRow)
-            nEndRow = static_cast<SCCOL>(n2);
+            nEndRow = static_cast<SCROW>(n2);
         if (nTmp > nMaxRows)
-            nMaxRows = static_cast<SCCOL>(nTmp);
+            nMaxRows = static_cast<SCROW>(nTmp);
     }
 
     // total column size ?


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -p -r1.1998 -r1.1999
--- openoffice.org.spec	2 Sep 2009 13:45:43 -0000	1.1998
+++ openoffice.org.spec	3 Sep 2009 13:04:03 -0000	1.1999
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -158,6 +158,7 @@ Patch80: openoffice.org-3.1.1.ooo104329.
 Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
+Patch84: openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1701,6 +1702,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch81 -p0 -b .workspace.os131.patch
 %patch82 -p0 -b .workspace.vcl102.patch
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
+%patch84 -p0 -b .ooo104484.sc.wrong.cast.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4210,6 +4212,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
+- Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
+
 * Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
 - Resolves: rhbz#520772 copy/paste cockup
 



From pbrobinson at fedoraproject.org  Thu Sep  3 13:12:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 13:12:17 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.5,1.6
Message-ID: <20090903131217.5384D11C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5457

Modified Files:
	bisho.spec 
Log Message:
- Update gconf scriptlets for schema file name change


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bisho.spec	31 Aug 2009 16:39:00 -0000	1.5
+++ bisho.spec	3 Sep 2009 13:12:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -60,20 +60,20 @@ rm -rf %{buildroot}
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-%{_sysconfdir}/gconf/schemas/[NAME] .schemas >/dev/null || :
+%{_sysconfdir}/gconf/schemas/bisho.schemas >/dev/null || :
 fi
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+%{_sysconfdir}/gconf/schemas/bisho.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+%{_sysconfdir}/gconf/schemas/bisho.schemas > /dev/null || :
 fi
 
 %postun
@@ -94,6 +94,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-4
+- Update gconf scriptlets for schema file name change
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-3
 - Add upstream patch for gconf schema name
 



From pkgdb at fedoraproject.org  Thu Sep  3 13:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 13:20:21 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090903132021.63E7610F865@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora devel is now owned by zoeloelip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Thu Sep  3 13:20:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 13:20:28 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090903132028.369D210F882@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora EPEL 5 is now owned by zoeloelip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Thu Sep  3 13:20:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 13:20:33 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090903132033.9756410F88C@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 10 is now owned by zoeloelip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Thu Sep  3 13:20:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 13:20:36 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090903132036.26F9C10F886@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 11 is now owned by zoeloelip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From timlau at fedoraproject.org  Thu Sep  3 13:22:35 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu,  3 Sep 2009 13:22:35 +0000 (UTC)
Subject: rpms/yum-utils/devel yum-utils.spec,1.68,1.69
Message-ID: <20090903132235.2E59B11C0099@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7912

Modified Files:
	yum-utils.spec 
Log Message:
bumped release and addded require to yum-3.2.23-15 for versionlock plugin and repoquery


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- yum-utils.spec	3 Sep 2009 12:35:58 -0000	1.68
+++ yum-utils.spec	3 Sep 2009 13:22:34 -0000	1.69
@@ -1,14 +1,14 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.23
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
 URL: http://yum.baseurl.org/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: python >= 2.4 , yum >= 3.2.23
+Requires: python >= 2.4 , yum >= 3.2.23-15
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -75,7 +75,7 @@ Group: System Environment/Base
 Provides: yum-versionlock = %{version}-%{release}
 Obsoletes: yum-versionlock < 1.1.20-0
 Conflicts: yum-versionlock < 1.1.20-0
-Requires: yum >= 3.2.23
+Requires: yum >= 3.2.23-15
 
 %description -n yum-plugin-versionlock
 This plugin takes a set of name/versions for packages and excludes all other
@@ -350,7 +350,7 @@ Group: System Environment/Base
 Requires: yum >= 3.2.23
 
 %description -n yum-plugin-show-leaves
-Yum plugin which shows newly installed leaf packages
+Yum plugin which shows newly installed leaf packages3.2.23-15
 and packages that became leaves after a transaction
 
 %prep
@@ -597,7 +597,7 @@ fi
 
 %changelog
 * Wed Sep 3 2009 Tim Lauridsen <timlau at fedoraproject.org>
-- changed Requires: yum >= 3.2.24 to yum >= 3.2.23 for versionlock plugin
+- changed Requires: yum >= 3.2.23 to yum >= 3.2.23-15 for versionlock plugin and repoquery
 - because yum in rawhide contains patches against yum-3_2_X HEAD.
 
 * Wed Sep 2 2009 Tim Lauridsen <timlau at fedoraproject.org>



From mycae at fedoraproject.org  Thu Sep  3 13:30:28 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu,  3 Sep 2009 13:30:28 +0000 (UTC)
Subject: rpms/cpptasks/EL-5 cpptasks.spec,1.2,1.3
Message-ID: <20090903133028.8872811C02C6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10004

Modified Files:
	cpptasks.spec 
Log Message:
- Fix Subpackage dep



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/EL-5/cpptasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cpptasks.spec	1 Sep 2009 09:12:26 -0000	1.2
+++ cpptasks.spec	3 Sep 2009 13:30:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -33,7 +33,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}-%{version}-%{release}
+Requires:	%{name}>=%{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -128,6 +128,11 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
+- Remove excess BR
+- Fix subpackage dep
+- Fix doc installation 
+
 * Mon Sep 01 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove unneeded maven2 BuildRequire
 



From mycae at fedoraproject.org  Thu Sep  3 13:32:38 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu,  3 Sep 2009 13:32:38 +0000 (UTC)
Subject: rpms/cpptasks/F-10 cpptasks.spec,1.3,1.4
Message-ID: <20090903133238.E22BA11C0099@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11278

Modified Files:
	cpptasks.spec 
Log Message:
- Move change line



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/cpptasks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpptasks.spec	2 Sep 2009 23:54:12 -0000	1.3
+++ cpptasks.spec	3 Sep 2009 13:32:38 -0000	1.4
@@ -128,11 +128,11 @@ rm -rf $RPM_BUILD_ROOT
 
 # -----------------------------------------------------------------------------
 
-- Fix doc installation 
 %changelog
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove excess BR
 - Fix subpackage dep
+- Fix doc installation 
 
 * Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
 - Fix doc installation 



From mycae at fedoraproject.org  Thu Sep  3 13:33:00 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu,  3 Sep 2009 13:33:00 +0000 (UTC)
Subject: rpms/cpptasks/F-11 cpptasks.spec,1.1,1.2
Message-ID: <20090903133300.4242D11C0099@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12272

Modified Files:
	cpptasks.spec 
Log Message:
Fix supackage dep



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-11/cpptasks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpptasks.spec	29 Aug 2009 03:49:37 -0000	1.1
+++ cpptasks.spec	3 Sep 2009 13:33:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -15,7 +15,7 @@ BuildRequires:	ant 
 BuildRequires:	ant-junit 
 BuildRequires:	jpackage-utils 
 BuildRequires:	junit
-BuildRequires:	maven2
+#BuildRequires:	mave
 
 Requires:	ant 
 Requires:	java
@@ -34,7 +34,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}-%{version}-%{release}
+Requires:	%{name}>=%{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -129,6 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
+- Remove excess BR
+- Fix subpackage dep
+- Fix doc installation 
+
 * Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
 - Fix doc installation 
 - Move to _javadir/ant/ rather than _javadir/



From timlau at fedoraproject.org  Thu Sep  3 13:36:29 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu,  3 Sep 2009 13:36:29 +0000 (UTC)
Subject: rpms/yum-utils/devel yum-utils.spec,1.69,1.70
Message-ID: <20090903133629.7A02311C0099@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14042

Modified Files:
	yum-utils.spec 
Log Message:
remove cut & paste error


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- yum-utils.spec	3 Sep 2009 13:22:34 -0000	1.69
+++ yum-utils.spec	3 Sep 2009 13:36:29 -0000	1.70
@@ -350,7 +350,7 @@ Group: System Environment/Base
 Requires: yum >= 3.2.23
 
 %description -n yum-plugin-show-leaves
-Yum plugin which shows newly installed leaf packages3.2.23-15
+Yum plugin which shows newly installed leaf packages
 and packages that became leaves after a transaction
 
 %prep



From mycae at fedoraproject.org  Thu Sep  3 13:40:25 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu,  3 Sep 2009 13:40:25 +0000 (UTC)
Subject: rpms/cpptasks/F-10 cpptasks.spec,1.4,1.5
Message-ID: <20090903134025.A912511C0381@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14895

Modified Files:
	cpptasks.spec 
Log Message:
Tag bump



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/cpptasks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cpptasks.spec	3 Sep 2009 13:32:38 -0000	1.4
+++ cpptasks.spec	3 Sep 2009 13:40:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
+- tag bump
+
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove excess BR
 - Fix subpackage dep



From ajax at fedoraproject.org  Thu Sep  3 13:44:23 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  3 Sep 2009 13:44:23 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel redhat-rpm-config.spec,1.74,1.75
Message-ID: <20090903134423.22B1311C0099@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15831

Modified Files:
	redhat-rpm-config.spec 
Log Message:
* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
- Delete *.orig in %install



Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- redhat-rpm-config.spec	3 Sep 2009 08:57:20 -0000	1.74
+++ redhat-rpm-config.spec	3 Sep 2009 13:44:22 -0000	1.75
@@ -40,6 +40,7 @@ Red Hat specific rpm configuration files
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
+find ${RPM_BUILD_ROOT} -name \*.orig -delete
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -49,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
+- Delete *.orig in %%install
+
 * Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-17
 - redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
 - add (empty) %%build section



From mycae at fedoraproject.org  Thu Sep  3 13:46:25 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu,  3 Sep 2009 13:46:25 +0000 (UTC)
Subject: rpms/cpptasks/devel cpptasks.spec,1.1,1.2
Message-ID: <20090903134625.2935611C0099@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16471

Modified Files:
	cpptasks.spec 
Log Message:
- Fix dep for subpackage & rm uneeded maven2 dep



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/devel/cpptasks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpptasks.spec	29 Aug 2009 03:44:23 -0000	1.1
+++ cpptasks.spec	3 Sep 2009 13:46:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -15,7 +15,7 @@ BuildRequires:	ant 
 BuildRequires:	ant-junit 
 BuildRequires:	jpackage-utils 
 BuildRequires:	junit
-BuildRequires:	maven2
+#BuildRequires:	mave
 
 Requires:	ant 
 Requires:	java
@@ -34,7 +34,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}-%{version}-%{release}
+Requires:	%{name}>=%{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -129,6 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
+- Remove excess BR
+- Fix subpackage dep
+- Fix doc installation 
+
 * Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
 - Fix doc installation 
 - Move to _javadir/ant/ rather than _javadir/



From zoeloelip at fedoraproject.org  Thu Sep  3 13:51:43 2009
From: zoeloelip at fedoraproject.org (Bart Vanbrabant)
Date: Thu,  3 Sep 2009 13:51:43 +0000 (UTC)
Subject: rpms/avrdude/F-11 .cvsignore, 1.3, 1.4 avrdude.spec, 1.8,
	1.9 sources, 1.3, 1.4 avrdude-5.5.usbtiny.64bit.patch, 1.1, NONE
Message-ID: <20090903135143.567AC11C0099@cvs1.fedora.phx.redhat.com>

Author: zoeloelip

Update of /cvs/pkgs/rpms/avrdude/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16853

Modified Files:
	.cvsignore avrdude.spec sources 
Removed Files:
	avrdude-5.5.usbtiny.64bit.patch 
Log Message:
* Thu Sep 3 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 5.8-1
- New upstream version: See the NEWS file for more information
- Removed patch: changes are included in upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avrdude/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Dec 2007 23:08:28 -0000	1.3
+++ .cvsignore	3 Sep 2009 13:51:42 -0000	1.4
@@ -1 +1 @@
-avrdude-5.5.tar.gz
+avrdude-5.8.tar.gz


Index: avrdude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avrdude/F-11/avrdude.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- avrdude.spec	24 Feb 2009 03:44:16 -0000	1.8
+++ avrdude.spec	3 Sep 2009 13:51:43 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           avrdude
-Version:        5.5
-Release:        4%{?dist}
+Version:        5.8
+Release:        1%{?dist}
 Summary:        Software for programming Atmel AVR Microcontroller
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/avrdude
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0: 	avrdude-5.5.usbtiny.64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -33,7 +32,6 @@ particular chip.
 
 %prep
 %setup -q
-%patch0 -p1
 chmod -x safemode.c doc/TODO
 sed -i 's|/usr/local/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
 sed -i 's|/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
@@ -81,6 +79,10 @@ fi
 
 
 %changelog
+* Thu Sep 3 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 5.8-1
+- New upstream version: See the NEWS file for more information
+- Removed patch: changes are included in upstream version
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avrdude/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Dec 2007 23:08:28 -0000	1.3
+++ sources	3 Sep 2009 13:51:43 -0000	1.4
@@ -1 +1 @@
-60180d3f5f467987bfd7bc4505796fae  avrdude-5.5.tar.gz
+d459dcf47fa7fc2a29a70d68ebff4886  avrdude-5.8.tar.gz


--- avrdude-5.5.usbtiny.64bit.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Sep  3 13:55:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 13:55:25 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.3, 1.4 anjal.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <20090903135525.99BD611C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22379

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- New git snapshot, temporarily disable anerley


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 13:50:10 -0000	1.3
+++ .cvsignore	3 Sep 2009 13:55:25 -0000	1.4
@@ -1 +1 @@
-anjal-0.1.0-20090821.tar.bz2
+anjal-0.1.0-20090903.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- anjal.spec	21 Aug 2009 15:20:32 -0000	1.4
+++ anjal.spec	3 Sep 2009 13:55:25 -0000	1.5
@@ -2,14 +2,14 @@
 # git clone git://git.gnome.org/anjal
 # git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090821
-%define git_version 5ac8bfe
+%define gitdate 20090903
+%define git_version 62734e6
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.7.%{snapshot}%{?dist}
+Release:        0.8.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -18,7 +18,7 @@ URL:            http://live.gnome.org/An
 Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: anerley-devel
+#BuildRequires: anerley-devel
 BuildRequires: clutter-devel
 BuildRequires: clutter-gtk-devel
 BuildRequires: evolution-devel
@@ -51,13 +51,14 @@ all the mail backends including POP3, IM
 NOCONFIGURE=yes ./autogen.sh
 
 %build
-%configure --with-mozilla=no --with-anerley --disable-schemas
+# configure --with-mozilla=no --with-anerley
+%configure --with-mozilla=no --without-anerley
 make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
@@ -67,19 +68,19 @@ desktop-file-validate %{buildroot}%{_dat
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-%{_sysconfdir}/gconf/schemas/[NAME] .schemas >/dev/null || :
+%{_sysconfdir}/gconf/schemas/anjal.schemas >/dev/null || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+%{_sysconfdir}/gconf/schemas/anjal.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+%{_sysconfdir}/gconf/schemas/anjal.schemas > /dev/null || :
 fi
 
 %clean
@@ -94,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/anjal.desktop
 
 %changelog
+* Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.8
+- New git snapshot, temporarily disable anerley
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.7
 - Add gconf schema and associated spec scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 13:50:10 -0000	1.3
+++ sources	3 Sep 2009 13:55:25 -0000	1.4
@@ -1 +1 @@
-446a41434e2f6a794b9915cd1058c454  anjal-0.1.0-20090821.tar.bz2
+6416630251d0604b50a964f98d10d15f  anjal-0.1.0-20090903.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  3 14:00:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Sep 2009 14:00:15 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.237,
	1.238 kdebindings-4.2.4-fix-kpythonpluginfactory.patch, 1.1, NONE
Message-ID: <20090903140015.22CDC11C0381@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23679/devel

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.2.4-fix-kpythonpluginfactory.patch 
Log Message:
* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
- only (temporarily) disable Falcon on F12+
- drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
- remove unused (commented out) patch

* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
- 4.3.1
- temporarily disable Falcon bindings (build fails with Falcon 0.9.x)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- kdebindings.spec	2 Sep 2009 21:45:39 -0000	1.237
+++ kdebindings.spec	3 Sep 2009 14:00:14 -0000	1.238
@@ -9,7 +9,10 @@
 %endif
 %endif
 %if 0%{?fedora}
-%define falcon 0
+%if 0%{?fedora} < 12
+# FIXME: The Falcon bindings don't work in Rawhide (Falcon 0.9.x).
+%define falcon 1
+%endif
 %define php 1
 %define ruby 1
 %define smoke 1
@@ -31,7 +34,7 @@
 
 Name: kdebindings
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -45,8 +48,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdebindings-qyoto-examples.patch
 # workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
 Patch1:  kdebindings-4.2.85-old-PyQt4.patch
-# make the Python plugin factory work without python-devel
-Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
 
 ## upstream patches
 
@@ -57,7 +58,9 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+%if 0%{?fedora} < 12
 BuildRequires:  polkit-qt-devel
+%endif
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
@@ -250,9 +253,6 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-## Manually speciify PYTHON_LIBRARIES below in lieu of
-## a better, working, upstreamable patch
-#patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
 
@@ -507,8 +507,14 @@ fi
 
 
 %changelog
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
+- only (temporarily) disable Falcon on F12+
+- drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
+- remove unused (commented out) patch
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- temporarily disable Falcon bindings (build fails with Falcon 0.9.x)
 
 * Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
 - re-enable php bindings (rawhide)


--- kdebindings-4.2.4-fix-kpythonpluginfactory.patch DELETED ---



From jussilehtola at fedoraproject.org  Thu Sep  3 14:07:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  3 Sep 2009 14:07:55 +0000 (UTC)
Subject: rpms/xine-ui/devel xine-ui.spec,1.8,1.9
Message-ID: <20090903140755.A479611C0099@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28058

Modified Files:
	xine-ui.spec 
Log Message:
Move xine-ui_logo.mpv to main package.


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xine-ui.spec	24 Jul 2009 22:50:18 -0000	1.8
+++ xine-ui.spec	3 Sep 2009 14:07:55 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
@@ -209,6 +209,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %dir %{_datadir}/xine/skins/
 %{_datadir}/xine/skins/xinetic/
+%{_datadir}/xine/skins/xine-ui_logo.mpv
 %{_datadir}/xine/skins/xine_splash.png
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
@@ -226,9 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %{_datadir}/xine/skins/*
 %exclude %{_datadir}/xine/skins/xinetic/
+%exclude %{_datadir}/xine/skins/xine-ui_logo.mpv
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Sep 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-16
+- Move xine-ui_logo.mpv to main package from -skins.
+
 * Sat Jul 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-15
 - Move xine_splash.png to main package from -skins.
 - Fix EPEL build.



From kkofler at fedoraproject.org  Thu Sep  3 14:08:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Sep 2009 14:08:30 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.238,1.239
Message-ID: <20090903140830.806D111C0099@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28200/devel

Modified Files:
	kdebindings.spec 
Log Message:
Revert "- only (temporarily) disable Falcon on F12+" (i.e. keep it disabled everywhere), Krossfalcon is just broken according to mathstuf (and that's the only Falcon stuff in kdebindings at the moment), and Falcon 0.9.x will probably get pushed to F10/F11 too.


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- kdebindings.spec	3 Sep 2009 14:00:14 -0000	1.238
+++ kdebindings.spec	3 Sep 2009 14:08:30 -0000	1.239
@@ -9,10 +9,10 @@
 %endif
 %endif
 %if 0%{?fedora}
-%if 0%{?fedora} < 12
-# FIXME: The Falcon bindings don't work in Rawhide (Falcon 0.9.x).
-%define falcon 1
-%endif
+# FIXME: Krossfalcon doesn't build in Rawhide (Falcon 0.9.x).
+#        It's also not working properly. And there are no Falcon bindings for
+#        the libraries anyway, just the Kross backend. -- Kevin
+#define falcon 1
 %define php 1
 %define ruby 1
 %define smoke 1
@@ -508,7 +508,6 @@ fi
 
 %changelog
 * Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
-- only (temporarily) disable Falcon on F12+
 - drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
 - remove unused (commented out) patch
 



From jussilehtola at fedoraproject.org  Thu Sep  3 14:10:12 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  3 Sep 2009 14:10:12 +0000 (UTC)
Subject: rpms/xine-ui/F-10 xine-ui.spec,1.5,1.6
Message-ID: <20090903141012.C708611C0381@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28578/F-10

Modified Files:
	xine-ui.spec 
Log Message:
Move xine-ui_logo.mpv to main package.


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/F-10/xine-ui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xine-ui.spec	24 Jul 2009 22:50:18 -0000	1.5
+++ xine-ui.spec	3 Sep 2009 14:10:12 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
@@ -209,6 +209,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %dir %{_datadir}/xine/skins/
 %{_datadir}/xine/skins/xinetic/
+%{_datadir}/xine/skins/xine-ui_logo.mpv
 %{_datadir}/xine/skins/xine_splash.png
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
@@ -226,9 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %{_datadir}/xine/skins/*
 %exclude %{_datadir}/xine/skins/xinetic/
+%exclude %{_datadir}/xine/skins/xine-ui_logo.mpv
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Sep 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-16
+- Move xine-ui_logo.mpv to main package from -skins.
+
 * Sat Jul 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-15
 - Move xine_splash.png to main package from -skins.
 - Fix EPEL build.



From jussilehtola at fedoraproject.org  Thu Sep  3 14:10:12 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  3 Sep 2009 14:10:12 +0000 (UTC)
Subject: rpms/xine-ui/EL-5 xine-ui.spec,1.6,1.7
Message-ID: <20090903141012.9C2CC11C0381@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28578/EL-5

Modified Files:
	xine-ui.spec 
Log Message:
Move xine-ui_logo.mpv to main package.


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/EL-5/xine-ui.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xine-ui.spec	24 Jul 2009 22:50:17 -0000	1.6
+++ xine-ui.spec	3 Sep 2009 14:10:12 -0000	1.7
@@ -3,7 +3,7 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
@@ -209,6 +209,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %dir %{_datadir}/xine/skins/
 %{_datadir}/xine/skins/xinetic/
+%{_datadir}/xine/skins/xine-ui_logo.mpv
 %{_datadir}/xine/skins/xine_splash.png
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
@@ -226,9 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %{_datadir}/xine/skins/*
 %exclude %{_datadir}/xine/skins/xinetic/
+%exclude %{_datadir}/xine/skins/xine-ui_logo.mpv
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Sep 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-16
+- Move xine-ui_logo.mpv to main package from -skins.
+
 * Sat Jul 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-15
 - Move xine_splash.png to main package from -skins.
 - Fix EPEL build.



From kkofler at fedoraproject.org  Thu Sep  3 14:10:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Sep 2009 14:10:28 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.239,1.240
Message-ID: <20090903141028.3E5C011C0381@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28738/devel

Modified Files:
	kdebindings.spec 
Log Message:
- only (temporarily) disable Falcon on F12+
(re-revert, sorry).

We'll keep it enabled on F10/F11 for now, we can drop it later if we can't get it to work properly.


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- kdebindings.spec	3 Sep 2009 14:08:30 -0000	1.239
+++ kdebindings.spec	3 Sep 2009 14:10:28 -0000	1.240
@@ -12,7 +12,9 @@
 # FIXME: Krossfalcon doesn't build in Rawhide (Falcon 0.9.x).
 #        It's also not working properly. And there are no Falcon bindings for
 #        the libraries anyway, just the Kross backend. -- Kevin
-#define falcon 1
+%if 0%{?fedora} < 12
+%define falcon 1
+%endif
 %define php 1
 %define ruby 1
 %define smoke 1
@@ -508,6 +510,7 @@ fi
 
 %changelog
 * Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
+- only (temporarily) disable Falcon on F12+
 - drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
 - remove unused (commented out) patch
 



From jussilehtola at fedoraproject.org  Thu Sep  3 14:10:13 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  3 Sep 2009 14:10:13 +0000 (UTC)
Subject: rpms/xine-ui/F-11 xine-ui.spec,1.5,1.6
Message-ID: <20090903141013.00DA011C0381@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28578/F-11

Modified Files:
	xine-ui.spec 
Log Message:
Move xine-ui_logo.mpv to main package.


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/F-11/xine-ui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xine-ui.spec	24 Jul 2009 22:50:18 -0000	1.5
+++ xine-ui.spec	3 Sep 2009 14:10:12 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
@@ -209,6 +209,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %dir %{_datadir}/xine/skins/
 %{_datadir}/xine/skins/xinetic/
+%{_datadir}/xine/skins/xine-ui_logo.mpv
 %{_datadir}/xine/skins/xine_splash.png
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
@@ -226,9 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %{_datadir}/xine/skins/*
 %exclude %{_datadir}/xine/skins/xinetic/
+%exclude %{_datadir}/xine/skins/xine-ui_logo.mpv
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Sep 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-16
+- Move xine-ui_logo.mpv to main package from -skins.
+
 * Sat Jul 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-15
 - Move xine_splash.png to main package from -skins.
 - Fix EPEL build.



From mtasaka at fedoraproject.org  Thu Sep  3 14:10:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Sep 2009 14:10:33 +0000 (UTC)
Subject: rpms/xscreensaver/F-10
	xscreensaver-5.09-hacks-missing-header-creation.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xscreensaver.spec,
	1.81, 1.82 xscreensaver-5.08-phosphor-segv.patch, 1.1,
	NONE xscreensaver-5.08-po-recreate.patch, 1.1,
	NONE xscreensaver-5.08-randr-ncrtc-from-gentoo.patch, 1.1, NONE
Message-ID: <20090903141033.51E7F11C0381@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28710/F-10

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.09-hacks-missing-header-creation.patch 
Removed Files:
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.patch 
	xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
- Update to 5.09
- Drop patches applied by upstream (1 patch still pending on upstream
  + 2 Fedora specific patches left)
- Add one patch to generate missing header files


xscreensaver-5.09-hacks-missing-header-creation.patch:
 Makefile.in     |    3 +++
 glx/Makefile.in |    4 ++++
 2 files changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.09-hacks-missing-header-creation.patch ---
--- xscreensaver-5.09/hacks/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/Makefile.in	2009-09-03 22:35:42.000000000 +0900
@@ -825,6 +825,9 @@
 	UTILS_SRC="$(UTILS_SRC)" \
 	$(srcdir)/m6502.sh m6502.h $(srcdir)/images/m6502/*.asm
 
+# Compiling m6502.c needs m6502.h
+m6502.o:	m6502.h
+
 m6502:		m6502.o		asm6502.o $(HACK_OBJS) $(ATV)
 	$(CC_HACK) -o $@ $@.o	asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS)
 
--- xscreensaver-5.09/hacks/glx/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/glx/Makefile.in	2009-09-03 22:43:26.000000000 +0900
@@ -670,6 +670,10 @@
 	$(srcdir)/molecules.sh molecules.h $(HACK_SRC)/images/molecules/*.pdb
 
 MOLECULE_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+
+# Compiling molecule.c needs molecules.h
+molecule.o:	molecules.h
+
 molecule:	molecule.o	$(MOLECULE_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(MOLECULE_OBJS) $(HACK_LIBS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Dec 2008 15:24:14 -0000	1.11
+++ .cvsignore	3 Sep 2009 14:10:32 -0000	1.12
@@ -1 +1 @@
-xscreensaver-5.08.tar.gz
+xscreensaver-5.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Dec 2008 15:24:14 -0000	1.11
+++ sources	3 Sep 2009 14:10:32 -0000	1.12
@@ -1 +1 @@
-79dea708c915341f205e00318a699be9  xscreensaver-5.08.tar.gz
+f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- xscreensaver.spec	27 Aug 2009 19:13:20 -0000	1.81
+++ xscreensaver.spec	3 Sep 2009 14:10:33 -0000	1.82
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.08
+%define mainversion   5.09
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    13
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -45,30 +45,15 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Reported from upstream, sent upstream
-# pot file is not regenerated correctly
-Patch50:         xscreensaver-5.08-po-recreate.patch
-# bug 481146, sent upstream
-# phosphor crashes when resizing window
-Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, sent upstream
-# ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
-# xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
-%if 0%{?fedora} >= 12
-# Fix for Xext 1.0.99.3
-# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
-Patch53:         xscreensaver-5.08-new-xextproto.patch
-# Fix warnings for breaking strict aliasing rule
-Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
-%endif
-#
-# Not sent to upstream yet, must do later
-#
-# Ubuntu bug 418419, must send to upstream later
+# Generate missing header files
+Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
+# Ubuntu bug 418419, sent upstream
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
+#
+# Not sent to upstream yet, must do later
+#
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -222,13 +207,7 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .po
-%patch51 -p1 -b .phosphor
-%patch52 -p0 -b .randr_ncrtc
-%if 0%{?fedora} >= 12
-%patch53 -p1 -b .newxextproto
-%patch54 -p1 -b .aliasing
-%endif
+%patch50 -p1 -b .missing
 %patch55 -p1 -b .small
 
 change_option(){
@@ -355,7 +334,7 @@ sed -i.delay -e 's| delay = 1| delay = 3
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -694,6 +673,12 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
+- Update to 5.09
+- Drop patches applied by upstream (1 patch still pending on upstream
+  + 2 Fedora specific patches left)
+- Add one patch to generate missing header files
+
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small
   (Ubuntu bug 418419)


--- xscreensaver-5.08-phosphor-segv.patch DELETED ---


--- xscreensaver-5.08-po-recreate.patch DELETED ---


--- xscreensaver-5.08-randr-ncrtc-from-gentoo.patch DELETED ---



From mtasaka at fedoraproject.org  Thu Sep  3 14:10:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Sep 2009 14:10:33 +0000 (UTC)
Subject: rpms/xscreensaver/F-11
	xscreensaver-5.09-hacks-missing-header-creation.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xscreensaver.spec,
	1.92, 1.93 xscreensaver-5.08-phosphor-segv.patch, 1.1,
	NONE xscreensaver-5.08-po-recreate.patch, 1.3,
	NONE xscreensaver-5.08-randr-ncrtc-from-gentoo.patch, 1.1, NONE
Message-ID: <20090903141033.C490211C0381@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28710/F-11

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.09-hacks-missing-header-creation.patch 
Removed Files:
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.patch 
	xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
- Update to 5.09
- Drop patches applied by upstream (1 patch still pending on upstream
  + 2 Fedora specific patches left)
- Add one patch to generate missing header files


xscreensaver-5.09-hacks-missing-header-creation.patch:
 Makefile.in     |    3 +++
 glx/Makefile.in |    4 ++++
 2 files changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.09-hacks-missing-header-creation.patch ---
--- xscreensaver-5.09/hacks/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/Makefile.in	2009-09-03 22:35:42.000000000 +0900
@@ -825,6 +825,9 @@
 	UTILS_SRC="$(UTILS_SRC)" \
 	$(srcdir)/m6502.sh m6502.h $(srcdir)/images/m6502/*.asm
 
+# Compiling m6502.c needs m6502.h
+m6502.o:	m6502.h
+
 m6502:		m6502.o		asm6502.o $(HACK_OBJS) $(ATV)
 	$(CC_HACK) -o $@ $@.o	asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS)
 
--- xscreensaver-5.09/hacks/glx/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/glx/Makefile.in	2009-09-03 22:43:26.000000000 +0900
@@ -670,6 +670,10 @@
 	$(srcdir)/molecules.sh molecules.h $(HACK_SRC)/images/molecules/*.pdb
 
 MOLECULE_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+
+# Compiling molecule.c needs molecules.h
+molecule.o:	molecules.h
+
 molecule:	molecule.o	$(MOLECULE_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(MOLECULE_OBJS) $(HACK_LIBS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Dec 2008 15:24:15 -0000	1.11
+++ .cvsignore	3 Sep 2009 14:10:33 -0000	1.12
@@ -1 +1 @@
-xscreensaver-5.08.tar.gz
+xscreensaver-5.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Dec 2008 15:24:15 -0000	1.11
+++ sources	3 Sep 2009 14:10:33 -0000	1.12
@@ -1 +1 @@
-79dea708c915341f205e00318a699be9  xscreensaver-5.08.tar.gz
+f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- xscreensaver.spec	27 Aug 2009 19:13:21 -0000	1.92
+++ xscreensaver.spec	3 Sep 2009 14:10:33 -0000	1.93
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.08
+%define mainversion   5.09
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    13
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -45,30 +45,15 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Reported from upstream, sent upstream
-# pot file is not regenerated correctly
-Patch50:         xscreensaver-5.08-po-recreate.patch
-# bug 481146, sent upstream
-# phosphor crashes when resizing window
-Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, sent upstream
-# ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
-# xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
-%if 0%{?fedora} >= 12
-# Fix for Xext 1.0.99.3
-# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
-Patch53:         xscreensaver-5.08-new-xextproto.patch
-# Fix warnings for breaking strict aliasing rule
-Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
-%endif
-#
-# Not sent to upstream yet, must do later
-#
-# Ubuntu bug 418419, must send to upstream later
+# Generate missing header files
+Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
+# Ubuntu bug 418419, sent upstream
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
+#
+# Not sent to upstream yet, must do later
+#
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -222,13 +207,7 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .po
-%patch51 -p1 -b .phosphor
-%patch52 -p0 -b .randr_ncrtc
-%if 0%{?fedora} >= 12
-%patch53 -p1 -b .newxextproto
-%patch54 -p1 -b .aliasing
-%endif
+%patch50 -p1 -b .missing
 %patch55 -p1 -b .small
 
 change_option(){
@@ -355,7 +334,7 @@ sed -i.delay -e 's| delay = 1| delay = 3
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -694,6 +673,12 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
+- Update to 5.09
+- Drop patches applied by upstream (1 patch still pending on upstream
+  + 2 Fedora specific patches left)
+- Add one patch to generate missing header files
+
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small
   (Ubuntu bug 418419)


--- xscreensaver-5.08-phosphor-segv.patch DELETED ---


--- xscreensaver-5.08-po-recreate.patch DELETED ---


--- xscreensaver-5.08-randr-ncrtc-from-gentoo.patch DELETED ---



From mtasaka at fedoraproject.org  Thu Sep  3 14:10:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Sep 2009 14:10:34 +0000 (UTC)
Subject: rpms/xscreensaver/devel
	xscreensaver-5.09-hacks-missing-header-creation.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xscreensaver.spec,
	1.95, 1.96 xscreensaver-5.08-gcc441-aliasing.patch, 1.1,
	NONE xscreensaver-5.08-new-xextproto.patch, 1.1,
	NONE xscreensaver-5.08-phosphor-segv.patch, 1.1,
	NONE xscreensaver-5.08-po-recreate.patch, 1.3,
	NONE xscreensaver-5.08-randr-ncrtc-from-gentoo.patch, 1.1, NONE
Message-ID: <20090903141034.62AC911C0381@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28710/devel

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.09-hacks-missing-header-creation.patch 
Removed Files:
	xscreensaver-5.08-gcc441-aliasing.patch 
	xscreensaver-5.08-new-xextproto.patch 
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.patch 
	xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
- Update to 5.09
- Drop patches applied by upstream (1 patch still pending on upstream
  + 2 Fedora specific patches left)
- Add one patch to generate missing header files


xscreensaver-5.09-hacks-missing-header-creation.patch:
 Makefile.in     |    3 +++
 glx/Makefile.in |    4 ++++
 2 files changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.09-hacks-missing-header-creation.patch ---
--- xscreensaver-5.09/hacks/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/Makefile.in	2009-09-03 22:35:42.000000000 +0900
@@ -825,6 +825,9 @@
 	UTILS_SRC="$(UTILS_SRC)" \
 	$(srcdir)/m6502.sh m6502.h $(srcdir)/images/m6502/*.asm
 
+# Compiling m6502.c needs m6502.h
+m6502.o:	m6502.h
+
 m6502:		m6502.o		asm6502.o $(HACK_OBJS) $(ATV)
 	$(CC_HACK) -o $@ $@.o	asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS)
 
--- xscreensaver-5.09/hacks/glx/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/glx/Makefile.in	2009-09-03 22:43:26.000000000 +0900
@@ -670,6 +670,10 @@
 	$(srcdir)/molecules.sh molecules.h $(HACK_SRC)/images/molecules/*.pdb
 
 MOLECULE_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+
+# Compiling molecule.c needs molecules.h
+molecule.o:	molecules.h
+
 molecule:	molecule.o	$(MOLECULE_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(MOLECULE_OBJS) $(HACK_LIBS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Dec 2008 15:24:15 -0000	1.11
+++ .cvsignore	3 Sep 2009 14:10:33 -0000	1.12
@@ -1 +1 @@
-xscreensaver-5.08.tar.gz
+xscreensaver-5.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Dec 2008 15:24:15 -0000	1.11
+++ sources	3 Sep 2009 14:10:33 -0000	1.12
@@ -1 +1 @@
-79dea708c915341f205e00318a699be9  xscreensaver-5.08.tar.gz
+f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- xscreensaver.spec	28 Aug 2009 19:36:20 -0000	1.95
+++ xscreensaver.spec	3 Sep 2009 14:10:34 -0000	1.96
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.08
+%define mainversion   5.09
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    13
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -45,29 +45,14 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Reported from upstream, sent upstream
-# pot file is not regenerated correctly
-Patch50:         xscreensaver-5.08-po-recreate.patch
-# bug 481146, sent upstream
-# phosphor crashes when resizing window
-Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, sent upstream
-# ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
-# xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
-%if 0%{?fedora} >= 12
-# Fix for Xext 1.0.99.3
-# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
-Patch53:         xscreensaver-5.08-new-xextproto.patch
-# Fix warnings for breaking strict aliasing rule
-Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
-%endif
-# Ubuntu bug 418419, must send to upstream later
+# Generate missing header files
+Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
+# Ubuntu bug 418419, sent upstream
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
-# Not sent to upstream yet, must do later
 #
+# Not sent to upstream yet, must do later
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -222,13 +207,7 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .po
-%patch51 -p1 -b .phosphor
-%patch52 -p0 -b .randr_ncrtc
-%if 0%{?fedora} >= 12
-%patch53 -p1 -b .newxextproto
-%patch54 -p1 -b .aliasing
-%endif
+%patch50 -p1 -b .missing
 %patch55 -p1 -b .small
 
 change_option(){
@@ -355,7 +334,7 @@ sed -i.delay -e 's| delay = 1| delay = 3
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -694,6 +673,12 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
+- Update to 5.09
+- Drop patches applied by upstream (1 patch still pending on upstream
+  + 2 Fedora specific patches left)
+- Add one patch to generate missing header files
+
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small
   (Ubuntu bug 418419)


--- xscreensaver-5.08-gcc441-aliasing.patch DELETED ---


--- xscreensaver-5.08-new-xextproto.patch DELETED ---


--- xscreensaver-5.08-phosphor-segv.patch DELETED ---


--- xscreensaver-5.08-po-recreate.patch DELETED ---


--- xscreensaver-5.08-randr-ncrtc-from-gentoo.patch DELETED ---



From jforbes at fedoraproject.org  Thu Sep  3 14:14:22 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Thu,  3 Sep 2009 14:14:22 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch,
	NONE, 1.1
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch,
	NONE,
	1.1 linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch, 
	NONE, 1.1 linux-2.6-xen-stack-protector-fix.patch, NONE,
	1.1 kernel.spec, 1.1762, 1.1763
Message-ID: <20090903141422.526C011C0099@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30161

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch 
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch 
	linux-2.6-xen-stack-protector-fix.patch 
Log Message:
Fix xen guest boot with stack protector and small kvm fixes

linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch:
 kvm.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch ---
Date:  Tue, 25 Aug 2009 01:13:10 -0300
From: Marcelo Tosatti <mtosatti at redhat.com>
To: Avi Kivity <avi at redhat.com>
Cc: kvm <kvm at vger.kernel.org>, Jeremy Fitzhardinge <jeremy at goop.org>
Subject: KVM pvmmu: do not batch pte updates from interrupt context


Commit b8bcfe997e4 made paravirt pte updates synchronous in interrupt
context.

Unfortunately the KVM pv mmu code caches the lazy/nonlazy mode
internally, so a pte update from interrupt context during a lazy mmu
operation can be batched while it should be performed synchronously.

https://bugzilla.redhat.com/show_bug.cgi?id=518022

Drop the internal mode variable and use paravirt_get_lazy_mode(), which
returns the correct state.

Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index c664d51..63b0ec8 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -34,7 +34,6 @@
 struct kvm_para_state {
 	u8 mmu_queue[MMU_QUEUE_SIZE];
 	int mmu_queue_len;
-	enum paravirt_lazy_mode mode;
 };
 
 static DEFINE_PER_CPU(struct kvm_para_state, para_state);
@@ -77,7 +76,7 @@ static void kvm_deferred_mmu_op(void *buffer, int len)
 {
 	struct kvm_para_state *state = kvm_para_state();
 
-	if (state->mode != PARAVIRT_LAZY_MMU) {
+	if (paravirt_get_lazy_mode() != PARAVIRT_LAZY_MMU) {
 		kvm_mmu_op(buffer, len);
 		return;
 	}
@@ -185,10 +184,7 @@ static void kvm_release_pt(unsigned long pfn)
 
 static void kvm_enter_lazy_mmu(void)
 {
-	struct kvm_para_state *state = kvm_para_state();
-
 	paravirt_enter_lazy_mmu();
-	state->mode = paravirt_get_lazy_mode();
 }
 
 static void kvm_leave_lazy_mmu(void)
@@ -197,7 +193,6 @@ static void kvm_leave_lazy_mmu(void)
 
 	mmu_queue_flush(state);
 	paravirt_leave_lazy_mmu();
-	state->mode = paravirt_get_lazy_mode();
 }
 
 static void __init paravirt_ops_setup(void)


linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch:
 include/asm/kvm_host.h |    1 +
 kvm/vmx.c              |    2 ++
 kvm/x86.c              |   14 +++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch ---
Date: Tue,  1 Sep 2009 12:03:25 +0300
From: Avi Kivity <avi at redhat.com>
To: Marcelo Tosatti <mtosatti at redhat.com>
Cc: kvm at vger.kernel.org
Subject: [PATCH] KVM: VMX: Check cpl before emulating debug register access

Debug registers may only be accessed from cpl 0.  Unfortunately, vmx will
code to emulate the instruction even though it was issued from guest
userspace, possibly leading to an unexpected trap later.

Cc: stable at kernel.org
Signed-off-by: Avi Kivity <avi at redhat.com>
---
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/vmx.c              |    2 ++
 arch/x86/kvm/x86.c              |   13 +++++++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index a3f637f..6046e6f 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -621,6 +621,7 @@ void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr);
 void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);
 void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long cr2,
 			   u32 error_code);
+bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl);
 
 int kvm_pic_set_irq(void *opaque, int irq, int level);
 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 78101dd..05cd554 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2931,6 +2931,8 @@ static int handle_dr(struct kvm_vcpu *vcpu)
 	unsigned long val;
 	int dr, reg;
 
+	if (!kvm_require_cpl(vcpu, 0))
+		return 1;
 	dr = vmcs_readl(GUEST_DR7);
 	if (dr & DR7_GD) {
 		/*
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8b3a169..891234b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -223,6 +223,19 @@ void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code)
 EXPORT_SYMBOL_GPL(kvm_queue_exception_e);
 
 /*
+ * Checks if cpl <= required_cpl; if true, return true.  Otherwise queue
+ * a #GP and return false.
+ */
+bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl)
+{
+	if (kvm_x86_ops->get_cpl(vcpu) <= required_cpl)
+		return true;
+	kvm_queue_exception_e(vcpu, GP_VECTOR, 0);
+	return false;
+}
+EXPORT_SYMBOL_GPL(kvm_require_cpl);
+
+/*
  * Load the pae pdptrs.  Return true is they are all valid.
  */
 int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3)
-- 
1.6.4.1


linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch:
 kvmclock.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch ---
Date:  Mon, 31 Aug 2009 03:04:31 -0400
From: Glauber Costa <glommer at redhat.com>
To: kvm at vger.kernel.org
Cc: linux-kernel at vger.kernel.org, avi at redhat.com
Subject: [PATCH] use __pa_symbol to calculate the address of a C symbol.

The use of __pa() to calculate the address of a C-visible symbol
is wrong, and can lead to unpredictable results. See arch/x86/include/asm/page.h
for details.

It should be replaced with __pa_symbol(), that does the correct math here,
by taking relocations into account.

Signed-off-by: Glauber Costa <glommer at redhat.com>
---
 arch/x86/kernel/kvmclock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 223af43..e5efcdc 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -50,8 +50,8 @@ static unsigned long kvm_get_wallclock(void)
 	struct timespec ts;
 	int low, high;
 
-	low = (int)__pa(&wall_clock);
-	high = ((u64)__pa(&wall_clock) >> 32);
+	low = (int)__pa_symbol(&wall_clock);
+	high = ((u64)__pa_symbol(&wall_clock) >> 32);
 	native_write_msr(MSR_KVM_WALL_CLOCK, low, high);
 
 	vcpu_time = &get_cpu_var(hv_clock);
-- 
1.6.2.2

linux-2.6-xen-stack-protector-fix.patch:
 arch/x86/mm/Makefile     |    4 +
 arch/x86/xen/Makefile    |    2 
 arch/x86/xen/enlighten.c |  133 +++++++++++++++++++++++++++++++++++++++--------
 arch/x86/xen/smp.c       |    1 
 drivers/xen/Makefile     |    3 +
 5 files changed, 123 insertions(+), 20 deletions(-)

--- NEW FILE linux-2.6-xen-stack-protector-fix.patch ---
>From 27512accbc440c1460b2df6024ed03fc40feff7d Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Thu, 27 Aug 2009 12:46:35 -0700
Subject: [PATCH] xen: make -fstack-protector work under Xen

-fstack-protector uses a special per-cpu "stack canary" value.
gcc generates special code in each function to test the canary to make
sure that the function's stack hasn't been overrun.

On x86-64, this is simply an offset of %gs, which is the usual per-cpu
base segment register, so setting it up simply requires loading %gs's
base as normal.

On i386, the stack protector segment is %gs (rather than the usual kernel
percpu %fs segment register).  This requires setting up the full kernel
GDT and then loading %gs accordingly.  (We also need to make sure %fs is
initialized on secondary cpus too.)

To keep things consistent, we do the full GDT/segment register setup on
both architectures.

Because we need to avoid -fstack-protected code before setting up the GDT
and because there's no way to disable it on a per-function basis, several
files need to have stack-protector inhibited.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index eefdeee..72bb3a2 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,6 +1,10 @@
 obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
 	    pat.o pgtable.o gup.o
 
+# Make sure __phys_addr has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_ioremap.o		:= $(nostackp)
+
 obj-$(CONFIG_SMP)		+= tlb.o
 
 obj-$(CONFIG_X86_32)		+= pgtable_32.o iomap_32.o
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 7410640..3bb4fc2 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -8,6 +8,7 @@ endif
 # Make sure early boot has no stackprotector
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_enlighten.o		:= $(nostackp)
+CFLAGS_mmu.o			:= $(nostackp)
 
 obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 			time.o xen-asm.o xen-asm_$(BITS).o \
@@ -16,3 +17,4 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
+
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index e5b903b..596a7d7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -51,6 +51,7 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/reboot.h>
+#include <asm/stackprotector.h>
 
 #include "xen-ops.h"
 #include "mmu.h"
@@ -339,18 +340,28 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
 	unsigned long frames[pages];
 	int f;
 
-	/* A GDT can be up to 64k in size, which corresponds to 8192
-	   8-byte entries, or 16 4k pages.. */
+	/* 
+	 * A GDT can be up to 64k in size, which corresponds to 8192
+	 * 8-byte entries, or 16 4k pages..
+	 */
 
 	BUG_ON(size > 65536);
 	BUG_ON(va & ~PAGE_MASK);
 
 	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
 		int level;
-		pte_t *ptep = lookup_address(va, &level);
+		pte_t *ptep;
 		unsigned long pfn, mfn;
 		void *virt;
 
+		/*
+		 * The GDT is per-cpu and is in the percpu data area.
+		 * That can be virtually mapped, so we need to do a
+		 * page-walk to get the underlying MFN for the
+		 * hypercall.  The page can also be in the kernel's
+		 * linear range, so we need to RO that mapping too.
+		 */
+		ptep = lookup_address(va, &level);
 		BUG_ON(ptep == NULL);
 
 		pfn = pte_pfn(*ptep);
@@ -367,6 +378,44 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
 		BUG();
 }
 
+/* 
+ * load_gdt for early boot, when the gdt is only mapped once
+ */
+static __init void xen_load_gdt_boot(const struct desc_ptr *dtr)
+{
+	unsigned long va = dtr->address;
+	unsigned int size = dtr->size + 1;
+	unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+	unsigned long frames[pages];
+	int f;
+
+	/* 
+	 * A GDT can be up to 64k in size, which corresponds to 8192
+	 * 8-byte entries, or 16 4k pages..
+	 */
+
+	BUG_ON(size > 65536);
+	BUG_ON(va & ~PAGE_MASK);
+
+	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
+		pte_t pte;
+		unsigned long pfn, mfn;
+
+		pfn = virt_to_pfn(va);
+		mfn = pfn_to_mfn(pfn);
+
+		pte = pfn_pte(pfn, PAGE_KERNEL_RO);
+
+		if (HYPERVISOR_update_va_mapping((unsigned long)va, pte, 0))
+			BUG();
+
+		frames[f] = mfn;
+	}
+
+	if (HYPERVISOR_set_gdt(frames, size / sizeof(struct desc_struct)))
+		BUG();
+}
+
 static void load_TLS_descriptor(struct thread_struct *t,
 				unsigned int cpu, unsigned int i)
 {
@@ -590,6 +639,29 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
 	preempt_enable();
 }
 
+/* 
+ * Version of write_gdt_entry for use at early boot-time needed to
+ * update an entry as simply as possible.
+ */
+static __init void xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,
+					    const void *desc, int type)
+{
+	switch (type) {
+	case DESC_LDT:
+	case DESC_TSS:
+		/* ignore */
+		break;
+
+	default: {
+		xmaddr_t maddr = virt_to_machine(&dt[entry]);
+
+		if (HYPERVISOR_update_descriptor(maddr.maddr, *(u64 *)desc))
+			dt[entry] = *(struct desc_struct *)desc;
+	}
+
+	}	
+}
+
 static void xen_load_sp0(struct tss_struct *tss,
 			 struct thread_struct *thread)
 {
@@ -974,6 +1046,23 @@ static const struct machine_ops __initdata xen_machine_ops = {
 	.emergency_restart = xen_emergency_restart,
 };
 
+/* 
+ * Set up the GDT and segment registers for -fstack-protector.  Until
+ * we do this, we have to be careful not to call any stack-protected
+ * function, which is most of the kernel.
+ */
+static void __init xen_setup_stackprotector(void)
+{
+	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
+	pv_cpu_ops.load_gdt = xen_load_gdt_boot;
+
+	setup_stack_canary_segment(0);
+	switch_to_new_gdt(0);
+
+	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;       
+	pv_cpu_ops.load_gdt = xen_load_gdt;
+}
+
 /* First C function to be called on Xen boot */
 asmlinkage void __init xen_start_kernel(void)
 {
@@ -992,13 +1081,28 @@ asmlinkage void __init xen_start_kernel(void)
 	pv_apic_ops = xen_apic_ops;
 	pv_mmu_ops = xen_mmu_ops;
 
-#ifdef CONFIG_X86_64
-	/*
-	 * Setup percpu state.  We only need to do this for 64-bit
-	 * because 32-bit already has %fs set properly.
+	/* 
+	 * Set up some pagetable state before starting to set any ptes.
 	 */
-	load_percpu_segment(0);
-#endif
+
+	/* Prevent unwanted bits from being set in PTEs. */
+	__supported_pte_mask &= ~_PAGE_GLOBAL;
+	if (!xen_initial_domain())
+		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
+
+	__supported_pte_mask |= _PAGE_IOMAP;
+
+	xen_setup_features();
+
+	/* Get mfn list */
+	if (!xen_feature(XENFEAT_auto_translated_physmap))
+		xen_build_dynamic_phys_to_machine();
+
+	/* 
+	 * Set up kernel GDT and segment registers, mainly so that
+	 * -fstack-protector code can be executed.
+	 */
+	xen_setup_stackprotector();
 
 	xen_init_irq_ops();
 	xen_init_cpuid_mask();
@@ -1010,8 +1114,6 @@ asmlinkage void __init xen_start_kernel(void)
 	set_xen_basic_apic_ops();
 #endif
 
-	xen_setup_features();
-
 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
@@ -1028,17 +1130,8 @@ asmlinkage void __init xen_start_kernel(void)
 
 	xen_smp_init();
 
-	/* Get mfn list */
-	if (!xen_feature(XENFEAT_auto_translated_physmap))
-		xen_build_dynamic_phys_to_machine();
-
 	pgd = (pgd_t *)xen_start_info->pt_base;
 
-	/* Prevent unwanted bits from being set in PTEs. */
-	__supported_pte_mask &= ~_PAGE_GLOBAL;
-	if (!xen_initial_domain())
-		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
-
 #ifdef CONFIG_X86_64
 	/* Work out if we support NX */
 	check_efer();
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 429834e..fe03eee 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -236,6 +236,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
 	ctxt->user_regs.ss = __KERNEL_DS;
 #ifdef CONFIG_X86_32
 	ctxt->user_regs.fs = __KERNEL_PERCPU;
+	ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
 #else
 	ctxt->gs_base_kernel = per_cpu_offset(cpu);
 #endif
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index ec2a39b..7c28434 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,6 +1,9 @@
 obj-y	+= grant-table.o features.o events.o manage.o
 obj-y	+= xenbus/
 
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_features.o			:= $(nostackp)
+
 obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
 obj-$(CONFIG_XEN_XENCOMM)	+= xencomm.o
 obj-$(CONFIG_XEN_BALLOON)	+= balloon.o


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1762
retrieving revision 1.1763
diff -u -p -r1.1762 -r1.1763
--- kernel.spec	3 Sep 2009 00:44:23 -0000	1.1762
+++ kernel.spec	3 Sep 2009 14:14:21 -0000	1.1763
@@ -676,10 +676,15 @@ Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
 
+# virt + ksm patches
 Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
+Patch1575: linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+Patch1578: linux-2.6-xen-stack-protector-fix.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next.patch
@@ -1303,6 +1308,12 @@ ApplyPatch linux-2.6-ksm-fix-munlock.pat
 # Optimize KVM for KSM support
 ApplyPatch linux-2.6-ksm-kvm.patch
 
+# Assorted Virt Fixes
+ApplyPatch linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+ApplyPatch linux-2.6-xen-stack-protector-fix.patch
+
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
@@ -2009,6 +2020,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 03 2009 Justin M.Forbes <jforbes at redhat.com>
+- Fix xen guest with stack protector. (#508120)
+- Small kvm fixes.
+
 * Wed Sep 02 2009 Adam Jackson <ajax at redhat.com> 2.6.31-0.199.rc8.git2
 - drm-intel-pm.patch: Disable by default, too flickery on too many machines.
   Enable with i915.powersave=1.



From zoeloelip at fedoraproject.org  Thu Sep  3 14:20:21 2009
From: zoeloelip at fedoraproject.org (Bart Vanbrabant)
Date: Thu,  3 Sep 2009 14:20:21 +0000 (UTC)
Subject: rpms/avrdude/devel .cvsignore, 1.3, 1.4 avrdude.spec, 1.9,
	1.10 sources, 1.3, 1.4 avrdude-5.5.usbtiny.64bit.patch, 1.1, NONE
Message-ID: <20090903142021.5353811C0375@cvs1.fedora.phx.redhat.com>

Author: zoeloelip

Update of /cvs/pkgs/rpms/avrdude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31505

Modified Files:
	.cvsignore avrdude.spec sources 
Removed Files:
	avrdude-5.5.usbtiny.64bit.patch 
Log Message:
* Thu Sep 3 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 5.8-1
- New upstream version: See the NEWS file for more information
- Removed patch: changes are included in upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avrdude/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Dec 2007 23:08:28 -0000	1.3
+++ .cvsignore	3 Sep 2009 14:20:21 -0000	1.4
@@ -1 +1 @@
-avrdude-5.5.tar.gz
+avrdude-5.8.tar.gz


Index: avrdude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avrdude/devel/avrdude.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- avrdude.spec	24 Jul 2009 17:42:58 -0000	1.9
+++ avrdude.spec	3 Sep 2009 14:20:21 -0000	1.10
@@ -1,13 +1,12 @@
 Name:           avrdude
-Version:        5.5
-Release:        5%{?dist}
+Version:        5.8
+Release:        1%{?dist}
 Summary:        Software for programming Atmel AVR Microcontroller
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/avrdude
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0: 	avrdude-5.5.usbtiny.64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -33,7 +32,6 @@ particular chip.
 
 %prep
 %setup -q
-%patch0 -p1
 chmod -x safemode.c doc/TODO
 sed -i 's|/usr/local/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
 sed -i 's|/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
@@ -81,8 +79,9 @@ fi
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Sep 3 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 5.8-1
+- New upstream version: See the NEWS file for more information
+- Removed patch: changes are included in upstream version
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avrdude/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Dec 2007 23:08:28 -0000	1.3
+++ sources	3 Sep 2009 14:20:21 -0000	1.4
@@ -1 +1 @@
-60180d3f5f467987bfd7bc4505796fae  avrdude-5.5.tar.gz
+d459dcf47fa7fc2a29a70d68ebff4886  avrdude-5.8.tar.gz


--- avrdude-5.5.usbtiny.64bit.patch DELETED ---



From mgrepl at fedoraproject.org  Thu Sep  3 14:30:23 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu,  3 Sep 2009 14:30:23 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.177,
	1.178 selinux-policy.spec, 1.805, 1.806
Message-ID: <20090903143023.4BE4A11C0381@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1605

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow postgresql to send audit messages



policy-20080710.patch:
 Makefile                                            |   26 
 Rules.modular                                       |   18 
 config/appconfig-mcs/default_contexts               |   19 
 config/appconfig-mcs/failsafe_context               |    2 
 config/appconfig-mcs/guest_u_default_contexts       |    6 
 config/appconfig-mcs/root_default_contexts          |    8 
 config/appconfig-mcs/seusers                        |    4 
 config/appconfig-mcs/staff_u_default_contexts       |    4 
 config/appconfig-mcs/unconfined_u_default_contexts  |    2 
 config/appconfig-mcs/user_u_default_contexts        |    5 
 config/appconfig-mcs/userhelper_context             |    2 
 config/appconfig-mcs/xguest_u_default_contexts      |    7 
 config/appconfig-mls/default_contexts               |   19 
 config/appconfig-mls/guest_u_default_contexts       |    4 
 config/appconfig-mls/root_default_contexts          |   12 
 config/appconfig-mls/staff_u_default_contexts       |    2 
 config/appconfig-mls/user_u_default_contexts        |    2 
 config/appconfig-mls/xguest_u_default_contexts      |    7 
 config/appconfig-standard/guest_u_default_contexts  |    4 
 config/appconfig-standard/root_default_contexts     |    6 
 config/appconfig-standard/staff_u_default_contexts  |    2 
 config/appconfig-standard/user_u_default_contexts   |    2 
 config/appconfig-standard/xguest_u_default_contexts |    5 
 man/man8/nfs_selinux.8                              |   19 
 man/man8/samba_selinux.8                            |   12 
 policy/flask/access_vectors                         |    1 
 policy/global_tunables                              |   20 
 policy/mcs                                          |    8 
 policy/mls                                          |    9 
 policy/modules/admin/alsa.te                        |    1 
 policy/modules/admin/anaconda.te                    |    1 
 policy/modules/admin/certwatch.te                   |    4 
 policy/modules/admin/consoletype.te                 |   11 
 policy/modules/admin/kismet.if                      |    1 
 policy/modules/admin/kismet.te                      |   49 
 policy/modules/admin/logrotate.te                   |   14 
 policy/modules/admin/logwatch.te                    |   11 
 policy/modules/admin/mrtg.te                        |    1 
 policy/modules/admin/netutils.te                    |   11 
 policy/modules/admin/prelink.te                     |   18 
 policy/modules/admin/rpm.fc                         |   10 
 policy/modules/admin/rpm.if                         |  290 +++
 policy/modules/admin/rpm.te                         |   40 
 policy/modules/admin/su.if                          |   69 
 policy/modules/admin/sudo.if                        |   55 
 policy/modules/admin/tmpreaper.te                   |   24 
 policy/modules/admin/usermanage.te                  |   19 
 policy/modules/admin/vbetool.if                     |   31 
 policy/modules/admin/vbetool.te                     |    9 
 policy/modules/admin/vpn.if                         |   36 
 policy/modules/apps/awstats.te                      |    6 
 policy/modules/apps/ethereal.fc                     |    2 
 policy/modules/apps/ethereal.if                     |   54 
 policy/modules/apps/ethereal.te                     |    7 
 policy/modules/apps/games.if                        |   28 
 policy/modules/apps/gitosis.fc                      |    4 
 policy/modules/apps/gitosis.if                      |   94 
 policy/modules/apps/gitosis.te                      |   43 
 policy/modules/apps/gnome.fc                        |   14 
 policy/modules/apps/gnome.if                        |  171 +
 policy/modules/apps/gnome.te                        |   31 
 policy/modules/apps/gpg.fc                          |    8 
 policy/modules/apps/gpg.if                          |  304 ---
 policy/modules/apps/gpg.te                          |  248 ++
 policy/modules/apps/java.fc                         |   17 
 policy/modules/apps/java.if                         |  188 +
 policy/modules/apps/java.te                         |   31 
 policy/modules/apps/livecd.fc                       |    2 
 policy/modules/apps/livecd.if                       |   56 
 policy/modules/apps/livecd.te                       |   26 
 policy/modules/apps/loadkeys.te                     |    5 
 policy/modules/apps/mono.if                         |  103 +
 policy/modules/apps/mono.te                         |    6 
 policy/modules/apps/mozilla.fc                      |   13 
 policy/modules/apps/mozilla.if                      |  325 +--
 policy/modules/apps/mozilla.te                      |   19 
 policy/modules/apps/mplayer.fc                      |    8 
 policy/modules/apps/mplayer.if                      |   64 
 policy/modules/apps/mplayer.te                      |    4 
 policy/modules/apps/nsplugin.fc                     |   13 
 policy/modules/apps/nsplugin.if                     |  318 +++
 policy/modules/apps/nsplugin.te                     |  290 +++
 policy/modules/apps/openoffice.fc                   |    3 
 policy/modules/apps/openoffice.if                   |  106 +
 policy/modules/apps/openoffice.te                   |   14 
 policy/modules/apps/podsleuth.fc                    |    2 
 policy/modules/apps/podsleuth.if                    |   34 
 policy/modules/apps/podsleuth.te                    |   44 
 policy/modules/apps/ptchown.fc                      |    2 
 policy/modules/apps/ptchown.if                      |   22 
 policy/modules/apps/ptchown.te                      |   39 
 policy/modules/apps/qemu.fc                         |    5 
 policy/modules/apps/qemu.if                         |  367 +++
 policy/modules/apps/qemu.te                         |  152 +
 policy/modules/apps/sambagui.fc                     |    4 
 policy/modules/apps/sambagui.if                     |    2 
 policy/modules/apps/sambagui.te                     |   62 
 policy/modules/apps/screen.fc                       |    2 
 policy/modules/apps/screen.if                       |   24 
 policy/modules/apps/screen.te                       |    4 
 policy/modules/apps/slocate.te                      |    4 
 policy/modules/apps/thunderbird.fc                  |    2 
 policy/modules/apps/thunderbird.if                  |   34 
 policy/modules/apps/thunderbird.te                  |    4 
 policy/modules/apps/tvtime.if                       |   39 
 policy/modules/apps/tvtime.te                       |    6 
 policy/modules/apps/uml.fc                          |    2 
 policy/modules/apps/vmware.fc                       |   19 
 policy/modules/apps/vmware.if                       |   14 
 policy/modules/apps/vmware.te                       |   17 
 policy/modules/apps/webalizer.te                    |    2 
 policy/modules/apps/wine.fc                         |   23 
 policy/modules/apps/wine.if                         |   50 
 policy/modules/apps/wine.te                         |    8 
 policy/modules/apps/wireshark.if                    |    2 
 policy/modules/apps/wm.fc                           |    3 
 policy/modules/apps/wm.if                           |  178 +
 policy/modules/apps/wm.te                           |   10 
 policy/modules/kernel/.filesystem.if.swp            |binary
 policy/modules/kernel/corecommands.fc               |   47 
 policy/modules/kernel/corecommands.if               |    1 
 policy/modules/kernel/corenetwork.if.in             |   46 
 policy/modules/kernel/corenetwork.te.in             |   41 
 policy/modules/kernel/devices.fc                    |   46 
 policy/modules/kernel/devices.if                    |  541 +++++
 policy/modules/kernel/devices.te                    |   45 
 policy/modules/kernel/domain.if                     |   22 
 policy/modules/kernel/domain.te                     |   53 
 policy/modules/kernel/files.fc                      |    2 
 policy/modules/kernel/files.if                      |  304 +++
 policy/modules/kernel/files.te                      |   11 
 policy/modules/kernel/filesystem.if                 |  356 +++
 policy/modules/kernel/filesystem.te                 |   18 
 policy/modules/kernel/kernel.if                     |   42 
 policy/modules/kernel/kernel.te                     |   16 
 policy/modules/kernel/selinux.if                    |   54 
 policy/modules/kernel/selinux.te                    |    6 
 policy/modules/kernel/storage.fc                    |    2 
 policy/modules/kernel/storage.if                    |    1 
 policy/modules/kernel/terminal.if                   |    6 
 policy/modules/roles/.staff.te.swp                  |binary
 policy/modules/roles/guest.fc                       |    1 
 policy/modules/roles/guest.if                       |  161 +
 policy/modules/roles/guest.te                       |   36 
 policy/modules/roles/logadm.fc                      |    1 
 policy/modules/roles/logadm.if                      |   44 
 policy/modules/roles/logadm.te                      |   20 
 policy/modules/roles/staff.te                       |   58 
 policy/modules/roles/sysadm.if                      |  114 -
 policy/modules/roles/sysadm.te                      |   14 
 policy/modules/roles/unprivuser.if                  |  605 ++++++
 policy/modules/roles/unprivuser.te                  |   15 
 policy/modules/roles/webadm.fc                      |    1 
 policy/modules/roles/webadm.if                      |   44 
 policy/modules/roles/webadm.te                      |   65 
 policy/modules/roles/xguest.fc                      |    1 
 policy/modules/roles/xguest.if                      |  161 +
 policy/modules/roles/xguest.te                      |   87 
 policy/modules/services/aide.if                     |    6 
 policy/modules/services/amavis.if                   |   20 
 policy/modules/services/amavis.te                   |    2 
 policy/modules/services/apache.fc                   |   35 
 policy/modules/services/apache.if                   |  488 +++--
 policy/modules/services/apache.te                   |  397 +++-
 policy/modules/services/apcupsd.fc                  |    2 
 policy/modules/services/arpwatch.fc                 |    1 
 policy/modules/services/arpwatch.if                 |   42 
 policy/modules/services/arpwatch.te                 |    3 
 policy/modules/services/asterisk.fc                 |    1 
 policy/modules/services/asterisk.if                 |   53 
 policy/modules/services/asterisk.te                 |    3 
 policy/modules/services/audioentropy.fc             |    2 
 policy/modules/services/audioentropy.te             |    1 
 policy/modules/services/automount.if                |   18 
 policy/modules/services/automount.te                |    6 
 policy/modules/services/avahi.fc                    |    4 
 policy/modules/services/avahi.if                    |  132 +
 policy/modules/services/avahi.te                    |   15 
 policy/modules/services/bind.fc                     |    7 
 policy/modules/services/bind.if                     |   92 
 policy/modules/services/bind.te                     |    5 
 policy/modules/services/bitlbee.te                  |    2 
 policy/modules/services/bluetooth.fc                |    5 
 policy/modules/services/bluetooth.if                |   53 
 policy/modules/services/bluetooth.te                |   22 
 policy/modules/services/certmaster.fc               |    9 
 policy/modules/services/certmaster.if               |  128 +
 policy/modules/services/certmaster.te               |   81 
 policy/modules/services/clamav.fc                   |   12 
 policy/modules/services/clamav.if                   |  105 +
 policy/modules/services/clamav.te                   |   35 
 policy/modules/services/consolekit.fc               |    3 
 policy/modules/services/consolekit.if               |   21 
 policy/modules/services/consolekit.te               |   64 
 policy/modules/services/courier.fc                  |    2 
 policy/modules/services/courier.if                  |   19 
 policy/modules/services/courier.te                  |    4 
 policy/modules/services/cron.fc                     |   10 
 policy/modules/services/cron.if                     |  250 +-
 policy/modules/services/cron.te                     |  112 -
 policy/modules/services/cups.fc                     |   32 
 policy/modules/services/cups.if                     |  106 +
 policy/modules/services/cups.te                     |  186 +
 policy/modules/services/cvs.te                      |    1 
 policy/modules/services/cyphesis.fc                 |    5 
 policy/modules/services/cyrus.te                    |    1 
 policy/modules/services/dbus.fc                     |    3 
 policy/modules/services/dbus.if                     |  235 ++
 policy/modules/services/dbus.te                     |   57 
 policy/modules/services/dcc.fc                      |    2 
 policy/modules/services/dcc.if                      |   18 
 policy/modules/services/dcc.te                      |   62 
 policy/modules/services/dhcp.fc                     |    1 
 policy/modules/services/dhcp.if                     |   60 
 policy/modules/services/dhcp.te                     |   18 
 policy/modules/services/dnsmasq.fc                  |    3 
 policy/modules/services/dnsmasq.if                  |  174 +
 policy/modules/services/dnsmasq.te                  |   22 
 policy/modules/services/dovecot.fc                  |   12 
 policy/modules/services/dovecot.if                  |   98 +
 policy/modules/services/dovecot.te                  |   98 -
 policy/modules/services/exim.if                     |   40 
 policy/modules/services/exim.te                     |  102 -
 policy/modules/services/fail2ban.fc                 |    1 
 policy/modules/services/fail2ban.if                 |   45 
 policy/modules/services/fail2ban.te                 |   10 
 policy/modules/services/fetchmail.fc                |    2 
 policy/modules/services/fetchmail.if                |   26 
 policy/modules/services/fetchmail.te                |   10 
 policy/modules/services/ftp.te                      |   53 
 policy/modules/services/gamin.fc                    |    2 
 policy/modules/services/gamin.if                    |   57 
 policy/modules/services/gamin.te                    |   39 
 policy/modules/services/gnomeclock.fc               |    3 
 policy/modules/services/gnomeclock.if               |   75 
 policy/modules/services/gnomeclock.te               |   55 
 policy/modules/services/gpsd.fc                     |    3 
 policy/modules/services/gpsd.if                     |   89 
 policy/modules/services/gpsd.te                     |   55 
 policy/modules/services/hal.fc                      |    4 
 policy/modules/services/hal.if                      |   39 
 policy/modules/services/hal.te                      |  112 +
 policy/modules/services/inetd.fc                    |    2 
 policy/modules/services/inetd.te                    |    2 
 policy/modules/services/kerberos.fc                 |    6 
 policy/modules/services/kerberos.te                 |    3 
 policy/modules/services/kerneloops.if               |   23 
 policy/modules/services/kerneloops.te               |    6 
 policy/modules/services/ktalk.te                    |    1 
 policy/modules/services/ldap.te                     |    6 
 policy/modules/services/lircd.fc                    |    9 
 policy/modules/services/lircd.if                    |  100 +
 policy/modules/services/lircd.te                    |   70 
 policy/modules/services/lpd.fc                      |    6 
 policy/modules/services/mailman.fc                  |    1 
 policy/modules/services/mailman.if                  |   28 
 policy/modules/services/mailman.te                  |   33 
 policy/modules/services/mailscanner.fc              |    2 
 policy/modules/services/mailscanner.if              |   59 
 policy/modules/services/mailscanner.te              |    5 
 policy/modules/services/milter.fc                   |   15 
 policy/modules/services/milter.if                   |  104 +
 policy/modules/services/milter.te                   |  107 +
 policy/modules/services/mta.fc                      |   10 
 policy/modules/services/mta.if                      |   70 
 policy/modules/services/mta.te                      |   76 
 policy/modules/services/munin.fc                    |    7 
 policy/modules/services/munin.if                    |   92 
 policy/modules/services/munin.te                    |   77 
 policy/modules/services/mysql.fc                    |    3 
 policy/modules/services/mysql.if                    |  128 +
 policy/modules/services/mysql.te                    |   53 
 policy/modules/services/nagios.fc                   |   11 
 policy/modules/services/nagios.if                   |   71 
 policy/modules/services/nagios.te                   |   58 
 policy/modules/services/networkmanager.fc           |   12 
 policy/modules/services/networkmanager.if           |   18 
 policy/modules/services/networkmanager.te           |  106 -
 policy/modules/services/nis.fc                      |    6 
 policy/modules/services/nis.if                      |  126 +
 policy/modules/services/nis.te                      |   27 
 policy/modules/services/nscd.fc                     |    1 
 policy/modules/services/nscd.if                     |  126 +
 policy/modules/services/nscd.te                     |   32 
 policy/modules/services/ntp.if                      |   57 
 policy/modules/services/ntp.te                      |   19 
 policy/modules/services/nx.fc                       |    4 
 policy/modules/services/oddjob.fc                   |    2 
 policy/modules/services/oddjob.if                   |   32 
 policy/modules/services/oddjob.te                   |   28 
 policy/modules/services/openvpn.fc                  |    1 
 policy/modules/services/openvpn.if                  |   36 
 policy/modules/services/openvpn.te                  |   19 
 policy/modules/services/pads.fc                     |   12 
 policy/modules/services/pads.if                     |   10 
 policy/modules/services/pads.te                     |   68 
 policy/modules/services/pcscd.fc                    |    1 
 policy/modules/services/pcscd.te                    |   12 
 policy/modules/services/pegasus.te                  |   28 
 policy/modules/services/pingd.fc                    |   11 
 policy/modules/services/pingd.if                    |   99 +
 policy/modules/services/pingd.te                    |   54 
 policy/modules/services/pki.fc                      |   46 
 policy/modules/services/pki.if                      |  643 ++++++
 policy/modules/services/pki.te                      |   91 
 policy/modules/services/polkit.fc                   |    9 
 policy/modules/services/polkit.if                   |  233 ++
 policy/modules/services/polkit.te                   |  235 ++
 policy/modules/services/portmap.te                  |    1 
 policy/modules/services/portreserve.fc              |   12 
 policy/modules/services/portreserve.if              |   70 
 policy/modules/services/portreserve.te              |   55 
 policy/modules/services/postfix.fc                  |    6 
 policy/modules/services/postfix.if                  |  136 +
 policy/modules/services/postfix.te                  |  134 +
 policy/modules/services/postgresql.fc               |    1 
 policy/modules/services/postgresql.if               |   43 
 policy/modules/services/postgresql.te               |   12 
 policy/modules/services/postgrey.fc                 |    4 
 policy/modules/services/postgrey.if                 |   67 
 policy/modules/services/postgrey.te                 |   19 
 policy/modules/services/ppp.fc                      |    6 
 policy/modules/services/ppp.if                      |   64 
 policy/modules/services/ppp.te                      |   38 
 policy/modules/services/prelude.fc                  |   14 
 policy/modules/services/prelude.if                  |   71 
 policy/modules/services/prelude.te                  |  193 ++
 policy/modules/services/privoxy.fc                  |    2 
 policy/modules/services/privoxy.if                  |   12 
 policy/modules/services/privoxy.te                  |   17 
 policy/modules/services/procmail.fc                 |    3 
 policy/modules/services/procmail.if                 |   38 
 policy/modules/services/procmail.te                 |   35 
 policy/modules/services/psad.fc                     |   17 
 policy/modules/services/psad.if                     |  304 +++
 policy/modules/services/psad.te                     |  107 +
 policy/modules/services/pyzor.fc                    |    6 
 policy/modules/services/pyzor.if                    |   61 
 policy/modules/services/pyzor.te                    |   51 
 policy/modules/services/qmail.te                    |    8 
 policy/modules/services/radius.te                   |    3 
 policy/modules/services/radvd.te                    |    2 
 policy/modules/services/razor.fc                    |    4 
 policy/modules/services/razor.if                    |   87 
 policy/modules/services/razor.te                    |   38 
 policy/modules/services/ricci.te                    |   18 
 policy/modules/services/rlogin.te                   |   16 
 policy/modules/services/roundup.fc                  |    2 
 policy/modules/services/roundup.if                  |   38 
 policy/modules/services/roundup.te                  |    3 
 policy/modules/services/rpc.fc                      |    1 
 policy/modules/services/rpc.if                      |   43 
 policy/modules/services/rpc.te                      |   33 
 policy/modules/services/rpcbind.fc                  |    2 
 policy/modules/services/rpcbind.te                  |    3 
 policy/modules/services/rshd.te                     |   17 
 policy/modules/services/rsync.fc                    |    2 
 policy/modules/services/rsync.te                    |   11 
 policy/modules/services/samba.fc                    |    8 
 policy/modules/services/samba.if                    |  387 ++++
 policy/modules/services/samba.te                    |  209 +-
 policy/modules/services/sasl.te                     |    5 
 policy/modules/services/sendmail.if                 |  103 +
 policy/modules/services/sendmail.te                 |   92 
 policy/modules/services/setroubleshoot.fc           |    2 
 policy/modules/services/setroubleshoot.if           |   48 
 policy/modules/services/setroubleshoot.te           |   31 
 policy/modules/services/smartmon.te                 |   12 
 policy/modules/services/snmp.fc                     |    6 
 policy/modules/services/snmp.if                     |   36 
 policy/modules/services/snmp.te                     |   28 
 policy/modules/services/snort.if                    |    9 
 policy/modules/services/snort.te                    |    9 
 policy/modules/services/spamassassin.fc             |   16 
 policy/modules/services/spamassassin.if             |  472 ++--
 policy/modules/services/spamassassin.te             |  219 ++
 policy/modules/services/squid.fc                    |    4 
 policy/modules/services/squid.if                    |   18 
 policy/modules/services/squid.te                    |    8 
 policy/modules/services/ssh.fc                      |    2 
 policy/modules/services/ssh.if                      |  151 +
 policy/modules/services/ssh.te                      |   43 
 policy/modules/services/stunnel.fc                  |    1 
 policy/modules/services/stunnel.te                  |    3 
 policy/modules/services/sysstat.te                  |    2 
 policy/modules/services/telnet.te                   |    4 
 policy/modules/services/tftp.te                     |    1 
 policy/modules/services/tor.te                      |    2 
 policy/modules/services/ulogd.fc                    |   10 
 policy/modules/services/ulogd.if                    |  127 +
 policy/modules/services/ulogd.te                    |   54 
 policy/modules/services/uucp.fc                     |    7 
 policy/modules/services/uucp.te                     |   14 
 policy/modules/services/virt.fc                     |    1 
 policy/modules/services/virt.if                     |   94 
 policy/modules/services/virt.te                     |   47 
 policy/modules/services/w3c.te                      |    7 
 policy/modules/services/xserver.fc                  |   40 
 policy/modules/services/xserver.if                  |  915 +++++++--
 policy/modules/services/xserver.te                  |  317 +++
 policy/modules/services/zebra.te                    |    2 
 policy/modules/services/zosremote.fc                |    2 
 policy/modules/services/zosremote.if                |   52 
 policy/modules/services/zosremote.te                |   36 
 policy/modules/system/application.te                |    6 
 policy/modules/system/authlogin.fc                  |   10 
 policy/modules/system/authlogin.if                  |  212 ++
 policy/modules/system/authlogin.te                  |   46 
 policy/modules/system/fstools.fc                    |    2 
 policy/modules/system/fstools.te                    |    9 
 policy/modules/system/hostname.te                   |    4 
 policy/modules/system/init.fc                       |    5 
 policy/modules/system/init.if                       |  129 +
 policy/modules/system/init.te                       |  114 +
 policy/modules/system/ipsec.fc                      |    3 
 policy/modules/system/ipsec.te                      |   47 
 policy/modules/system/iptables.fc                   |   16 
 policy/modules/system/iptables.te                   |   13 
 policy/modules/system/iscsi.te                      |    4 
 policy/modules/system/libraries.fc                  |   90 
 policy/modules/system/libraries.te                  |   18 
 policy/modules/system/locallogin.te                 |   26 
 policy/modules/system/logging.fc                    |   11 
 policy/modules/system/logging.if                    |   25 
 policy/modules/system/logging.te                    |   18 
 policy/modules/system/lvm.fc                        |    2 
 policy/modules/system/lvm.te                        |   66 
 policy/modules/system/miscfiles.if                  |   39 
 policy/modules/system/modutils.te                   |   40 
 policy/modules/system/mount.fc                      |    8 
 policy/modules/system/mount.if                      |   21 
 policy/modules/system/mount.te                      |   81 
 policy/modules/system/raid.te                       |    4 
 policy/modules/system/selinuxutil.fc                |   10 
 policy/modules/system/selinuxutil.if                |  373 +++
 policy/modules/system/selinuxutil.te                |  229 --
 policy/modules/system/setrans.if                    |   20 
 policy/modules/system/sysnetwork.fc                 |   15 
 policy/modules/system/sysnetwork.if                 |   82 
 policy/modules/system/sysnetwork.te                 |   72 
 policy/modules/system/udev.fc                       |    4 
 policy/modules/system/udev.if                       |   28 
 policy/modules/system/udev.te                       |   16 
 policy/modules/system/unconfined.fc                 |   34 
 policy/modules/system/unconfined.if                 |  300 +++
 policy/modules/system/unconfined.te                 |  209 +-
 policy/modules/system/userdomain.fc                 |    9 
 policy/modules/system/userdomain.if                 | 1899 ++++++++++++++------
 policy/modules/system/userdomain.te                 |   89 
 policy/modules/system/xen.fc                        |    6 
 policy/modules/system/xen.if                        |   50 
 policy/modules/system/xen.te                        |  127 +
 policy/policy_capabilities                          |    2 
 policy/support/obj_perm_sets.spt                    |   74 
 policy/users                                        |   13 
 support/Makefile.devel                              |    3 
 456 files changed, 22280 insertions(+), 3612 deletions(-)

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- policy-20080710.patch	21 Aug 2009 08:33:47 -0000	1.177
+++ policy-20080710.patch	3 Sep 2009 14:30:21 -0000	1.178
@@ -24157,7 +24157,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.5.13/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/postgresql.te	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/postgresql.te	2009-09-02 10:20:41.000000000 +0200
 @@ -32,6 +32,9 @@
  type postgresql_etc_t;
  files_config_file(postgresql_etc_t)
@@ -24193,7 +24193,15 @@ diff --exclude-from=exclude -N -u -r nsa
  corenet_tcp_bind_all_nodes(postgresql_t)
  corenet_tcp_bind_postgresql_port(postgresql_t)
  corenet_tcp_connect_auth_port(postgresql_t)
-@@ -288,7 +293,7 @@
+@@ -214,6 +219,7 @@
+ libs_use_ld_so(postgresql_t)
+ libs_use_shared_libs(postgresql_t)
+ 
++logging_send_audit_msgs(postgresql_t)
+ logging_send_syslog_msg(postgresql_t)
+ 
+ miscfiles_read_localization(postgresql_t)
+@@ -288,7 +294,7 @@
  allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select };
  
  allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute };
@@ -24202,7 +24210,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write };
  allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read };
-@@ -329,7 +334,7 @@
+@@ -329,7 +335,7 @@
  
  # unconfined domain is not allowed to invoke user defined procedure directly.
  # They have to confirm and relabel it at first.
@@ -33916,7 +33924,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow iscsid_t iscsi_tmp_t:dir manage_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.13/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/libraries.fc	2009-07-30 17:12:05.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/system/libraries.fc	2009-09-03 14:45:32.000000000 +0200
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -34026,9 +34034,10 @@ diff --exclude-from=exclude -N -u -r nsa
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/X11R6/lib/libOSMesa.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/libOSMesa\.so.*                --      gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -p -r1.805 -r1.806
--- selinux-policy.spec	21 Aug 2009 08:33:48 -0000	1.805
+++ selinux-policy.spec	3 Sep 2009 14:30:22 -0000	1.806
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 70%{?dist}
+Release: 71%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -462,6 +462,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 3 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-71
+- Allow postgresql to send audit messages
+
 * Fri Aug 21 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-70
 - Allow gpsd fsetid capability
 



From mtasaka at fedoraproject.org  Thu Sep  3 14:34:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Sep 2009 14:34:03 +0000 (UTC)
Subject: rpms/xscreensaver/devel xscreensaver-5.09-kill-c89-warning.patch,
	NONE, 1.1 xscreensaver.spec, 1.96, 1.97
Message-ID: <20090903143403.C05F711C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3209

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.09-kill-c89-warning.patch 
Log Message:
- Suppress compilation warnings with -std=c89

xscreensaver-5.09-kill-c89-warning.patch:
 juggler3d.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE xscreensaver-5.09-kill-c89-warning.patch ---
--- xscreensaver-5.09/hacks/glx/juggler3d.c.c89	2009-08-18 02:28:09.000000000 +0900
+++ xscreensaver-5.09/hacks/glx/juggler3d.c	2009-09-03 23:27:24.000000000 +0900
@@ -2318,11 +2318,12 @@
       glNormal3f (0, 0, j*1);
       glBegin (wire_p ? GL_LINES : GL_QUAD_STRIP);
       for (i = 0; i < slices + (wire_p ? 0 : 1); i++) {
+        GLfloat th, cth, sth;
         glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE,
                       (i % (slices/3) ? gcolor1 : gcolor2));
-        GLfloat th = i * width;
-        GLfloat cth = cos(th);
-        GLfloat sth = sin(th);
+        th = i * width;
+        cth = cos(th);
+        sth = sin(th);
         glVertex3f (cth * ra, sth * ra, z);
         glVertex3f (cth * rb, sth * rb, z);
         polys++;


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- xscreensaver.spec	3 Sep 2009 14:10:34 -0000	1.96
+++ xscreensaver.spec	3 Sep 2009 14:34:03 -0000	1.97
@@ -47,6 +47,8 @@ Patch1:          xscreensaver-5.00b5-san
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 # Generate missing header files
 Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
+# Kill warnings with -std=c89
+Patch51:	xscreensaver-5.09-kill-c89-warning.patch
 # Ubuntu bug 418419, sent upstream
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
@@ -208,6 +210,7 @@ This package contains some test programs
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch50 -p1 -b .missing
+%patch51 -p1 -b .c89
 %patch55 -p1 -b .small
 
 change_option(){
@@ -678,6 +681,7 @@ exit 0
 - Drop patches applied by upstream (1 patch still pending on upstream
   + 2 Fedora specific patches left)
 - Add one patch to generate missing header files
+- Suppress compilation warnings with -std=c89
 
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small



From pkgdb at fedoraproject.org  Thu Sep  3 15:09:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:09:54 +0000
Subject: [pkgdb] felix-osgi-core was added for akurtakov
Message-ID: <20090903150954.9850410F87A@bastion2.fedora.phx.redhat.com>

ausil has added Package felix-osgi-core with summary Felix OSGi R4 Core Bundle
ausil has approved Package felix-osgi-core
ausil has added a Fedora devel branch for felix-osgi-core with an owner of akurtakov
ausil has approved felix-osgi-core in Fedora devel
ausil has approved Package felix-osgi-core
ausil has set commit to Approved for 107427 on felix-osgi-core (Fedora devel)
ausil has set checkout to Approved for 107427 on felix-osgi-core (Fedora devel)
ausil has set build to Approved for 107427 on felix-osgi-core (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/felix-osgi-core



From pkgdb at fedoraproject.org  Thu Sep  3 15:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:09:55 +0000
Subject: [pkgdb] felix-osgi-core summary updated by ausil
Message-ID: <20090903150955.A8D6110F886@bastion2.fedora.phx.redhat.com>

ausil set package felix-osgi-core summary to Felix OSGi R4 Core Bundle

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/felix-osgi-core



From ausil at fedoraproject.org  Thu Sep  3 15:10:04 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:04 +0000 (UTC)
Subject: rpms/felix-osgi-core - New directory
Message-ID: <20090903151004.27B2311C0382@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-core
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH12936/rpms/felix-osgi-core

Log Message:
Directory /cvs/pkgs/rpms/felix-osgi-core added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:10:04 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:04 +0000 (UTC)
Subject: rpms/felix-osgi-core/devel - New directory
Message-ID: <20090903151004.47F0211C0417@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-core/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH12936/rpms/felix-osgi-core/devel

Log Message:
Directory /cvs/pkgs/rpms/felix-osgi-core/devel added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:10:10 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:10 +0000 (UTC)
Subject: rpms/felix-osgi-core Makefile,NONE,1.1
Message-ID: <20090903151010.9E74211C0382@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-core
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH12936/rpms/felix-osgi-core

Added Files:
	Makefile 
Log Message:
Setup of module felix-osgi-core


--- NEW FILE Makefile ---
# Top level Makefile for module felix-osgi-core
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  Thu Sep  3 15:10:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:11 +0000 (UTC)
Subject: rpms/felix-osgi-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090903151011.14B1D11C0382@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-core/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH12936/rpms/felix-osgi-core/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module felix-osgi-core


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: felix-osgi-core
# $Id: Makefile,v 1.1 2009/09/03 15:10:10 ausil Exp $
NAME := felix-osgi-core
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  Thu Sep  3 15:10:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:10:40 +0000
Subject: [pkgdb] felix-osgi-obr was added for akurtakov
Message-ID: <20090903151040.C4FF610F87A@bastion2.fedora.phx.redhat.com>

ausil has added Package felix-osgi-obr with summary Felix OSGi OBR Service API
ausil has approved Package felix-osgi-obr
ausil has added a Fedora devel branch for felix-osgi-obr with an owner of akurtakov
ausil has approved felix-osgi-obr in Fedora devel
ausil has approved Package felix-osgi-obr
ausil has set commit to Approved for 107427 on felix-osgi-obr (Fedora devel)
ausil has set checkout to Approved for 107427 on felix-osgi-obr (Fedora devel)
ausil has set build to Approved for 107427 on felix-osgi-obr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/felix-osgi-obr



From ausil at fedoraproject.org  Thu Sep  3 15:10:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:48 +0000 (UTC)
Subject: rpms/felix-osgi-obr - New directory
Message-ID: <20090903151048.1A3F111C0381@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-obr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsI13188/rpms/felix-osgi-obr

Log Message:
Directory /cvs/pkgs/rpms/felix-osgi-obr added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:10:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:48 +0000 (UTC)
Subject: rpms/felix-osgi-obr/devel - New directory
Message-ID: <20090903151048.5F41B11C04E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-obr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsI13188/rpms/felix-osgi-obr/devel

Log Message:
Directory /cvs/pkgs/rpms/felix-osgi-obr/devel added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:10:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:54 +0000 (UTC)
Subject: rpms/felix-osgi-obr Makefile,NONE,1.1
Message-ID: <20090903151054.4F58F11C0381@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-obr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsI13188/rpms/felix-osgi-obr

Added Files:
	Makefile 
Log Message:
Setup of module felix-osgi-obr


--- NEW FILE Makefile ---
# Top level Makefile for module felix-osgi-obr
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  Thu Sep  3 15:10:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:10:54 +0000 (UTC)
Subject: rpms/felix-osgi-obr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090903151054.A1CCF11C0381@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/felix-osgi-obr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsI13188/rpms/felix-osgi-obr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module felix-osgi-obr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: felix-osgi-obr
# $Id: Makefile,v 1.1 2009/09/03 15:10:54 ausil Exp $
NAME := felix-osgi-obr
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  Thu Sep  3 15:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:10:41 +0000
Subject: [pkgdb] felix-osgi-obr summary updated by ausil
Message-ID: <20090903151041.5635110F88C@bastion2.fedora.phx.redhat.com>

ausil set package felix-osgi-obr summary to Felix OSGi OBR Service API

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/felix-osgi-obr



From pkgdb at fedoraproject.org  Thu Sep  3 15:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:11:09 +0000
Subject: [pkgdb] slf4j was added for akurtakov
Message-ID: <20090903151109.67E1910F888@bastion2.fedora.phx.redhat.com>

ausil has added Package slf4j with summary Simple Logging Facade for Java
ausil has approved Package slf4j
ausil has added a Fedora devel branch for slf4j with an owner of akurtakov
ausil has approved slf4j in Fedora devel
ausil has approved Package slf4j
ausil has set commit to Approved for 107427 on slf4j (Fedora devel)
ausil has set checkout to Approved for 107427 on slf4j (Fedora devel)
ausil has set build to Approved for 107427 on slf4j (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slf4j



From pkgdb at fedoraproject.org  Thu Sep  3 15:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:11:09 +0000
Subject: [pkgdb] slf4j summary updated by ausil
Message-ID: <20090903151110.19DBE10F897@bastion2.fedora.phx.redhat.com>

ausil set package slf4j summary to Simple Logging Facade for Java

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slf4j



From ausil at fedoraproject.org  Thu Sep  3 15:11:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:16 +0000 (UTC)
Subject: rpms/slf4j - New directory
Message-ID: <20090903151116.1F6C411C0381@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/slf4j
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp13382/rpms/slf4j

Log Message:
Directory /cvs/pkgs/rpms/slf4j added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:11:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:16 +0000 (UTC)
Subject: rpms/slf4j/devel - New directory
Message-ID: <20090903151116.4E34811C04E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/slf4j/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp13382/rpms/slf4j/devel

Log Message:
Directory /cvs/pkgs/rpms/slf4j/devel added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:11:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:23 +0000 (UTC)
Subject: rpms/slf4j Makefile,NONE,1.1
Message-ID: <20090903151123.1AC4D11C0345@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/slf4j
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp13382/rpms/slf4j

Added Files:
	Makefile 
Log Message:
Setup of module slf4j


--- NEW FILE Makefile ---
# Top level Makefile for module slf4j
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  Thu Sep  3 15:11:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:23 +0000 (UTC)
Subject: rpms/slf4j/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090903151123.611A211C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/slf4j/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp13382/rpms/slf4j/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module slf4j


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: slf4j
# $Id: Makefile,v 1.1 2009/09/03 15:11:23 ausil Exp $
NAME := slf4j
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  Thu Sep  3 15:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:11:36 +0000
Subject: [pkgdb] kxml was added for akurtakov
Message-ID: <20090903151136.3FE1710F882@bastion2.fedora.phx.redhat.com>

ausil has added Package kxml with summary kXML is a small XML pull parser
ausil has approved Package kxml
ausil has added a Fedora devel branch for kxml with an owner of akurtakov
ausil has approved kxml in Fedora devel
ausil has approved Package kxml
ausil has set commit to Approved for 107427 on kxml (Fedora devel)
ausil has set checkout to Approved for 107427 on kxml (Fedora devel)
ausil has set build to Approved for 107427 on kxml (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kxml



From ausil at fedoraproject.org  Thu Sep  3 15:11:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:43 +0000 (UTC)
Subject: rpms/kxml - New directory
Message-ID: <20090903151143.1E77A11C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/kxml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw13608/rpms/kxml

Log Message:
Directory /cvs/pkgs/rpms/kxml added to the repository




From ausil at fedoraproject.org  Thu Sep  3 15:11:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:43 +0000 (UTC)
Subject: rpms/kxml/devel - New directory
Message-ID: <20090903151143.5041811C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/kxml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw13608/rpms/kxml/devel

Log Message:
Directory /cvs/pkgs/rpms/kxml/devel added to the repository




From pkgdb at fedoraproject.org  Thu Sep  3 15:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:11:36 +0000
Subject: [pkgdb] kxml summary updated by ausil
Message-ID: <20090903151137.0EB5E10F896@bastion2.fedora.phx.redhat.com>

ausil set package kxml summary to kXML is a small XML pull parser

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kxml



From ausil at fedoraproject.org  Thu Sep  3 15:11:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:49 +0000 (UTC)
Subject: rpms/kxml Makefile,NONE,1.1
Message-ID: <20090903151149.8088511C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/kxml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw13608/rpms/kxml

Added Files:
	Makefile 
Log Message:
Setup of module kxml


--- NEW FILE Makefile ---
# Top level Makefile for module kxml
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  Thu Sep  3 15:11:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  3 Sep 2009 15:11:49 +0000 (UTC)
Subject: rpms/kxml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090903151149.DC3BD11C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/kxml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw13608/rpms/kxml/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kxml


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kxml
# $Id: Makefile,v 1.1 2009/09/03 15:11:49 ausil Exp $
NAME := kxml
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 ovasik at fedoraproject.org  Thu Sep  3 15:19:58 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  3 Sep 2009 15:19:58 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-df-localdevice.patch, NONE,
	1.1 coreutils.spec, 1.270, 1.271
Message-ID: <20090903151958.E2D7411C0099@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15748

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-7.5-df-localdevice.patch 
Log Message:
fixed regression where df -l <device> as regular user cause Permission denied (#520630, introduced by fix for rhbz #497830)

coreutils-7.5-df-localdevice.patch:
 df.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE coreutils-7.5-df-localdevice.patch ---
diff -urNp coreutils-7.5-orig/src/df.c coreutils-7.5/src/df.c
--- coreutils-7.5-orig/src/df.c	2009-08-15 17:25:32.000000000 +0200
+++ coreutils-7.5/src/df.c	2009-09-03 16:37:25.000000000 +0200
@@ -995,7 +995,12 @@ main (int argc, char **argv)
       for (i = optind; i < argc; ++i)
 	{
 	  int fd = open (argv[i], O_RDONLY | O_NOCTTY);
-	  if (fd < 0 || fstat (fd, &stats[i - optind]))
+   if (0 <= fd && !fstat (fd, &stats[i - optind])
+       && !stat (argv[i], &stats[i - optind]))
+     {
+     /* open() may have failed for normal user but stat() works */
+     }
+   else
 	    {
 	      error (0, errno, "%s", quote (argv[i]));
 	      exit_status = EXIT_FAILURE;


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- coreutils.spec	1 Sep 2009 10:05:36 -0000	1.270
+++ coreutils.spec	3 Sep 2009 15:19:58 -0000	1.271
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -25,6 +25,7 @@ Patch2: coreutils-7.5-ls-inode.patch
 Patch100: coreutils-6.10-configuration.patch
 Patch101: coreutils-6.10-manpages.patch
 Patch102: coreutils-7.4-sttytcsadrain.patch
+Patch103: coreutils-7.5-df-localdevice.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -116,6 +117,7 @@ Libraries for coreutils package.
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 %patch102 -p1 -b .tcsadrain
+%patch103 -p1 -b .localdevice
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -331,6 +333,11 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Thu Sep 03 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-4
+- fixed regression where df -l <device> as regular user
+  cause "Permission denied" (#520630, introduced by fix for
+  rhbz #497830)
+
 * Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-3
 - ls -i: print consistent inode numbers also for mount points
   (#453709)



From fkooman at fedoraproject.org  Thu Sep  3 15:28:57 2009
From: fkooman at fedoraproject.org (=?utf-8?q?Fran=C3=A7ois_Kooman?=)
Date: Thu,  3 Sep 2009 15:28:57 +0000 (UTC)
Subject: rpms/proguard/devel proguard.spec,1.4,1.5
Message-ID: <20090903152857.E747F11C0099@cvs1.fedora.phx.redhat.com>

Author: fkooman

Update of /cvs/pkgs/rpms/proguard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18917

Modified Files:
	proguard.spec 
Log Message:
* Thu Sep  3 2009 Fran?ois Kooman <fkooman at tuxed.net> - 4.4-4
- create a subpackage for the GUI




Index: proguard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proguard/devel/proguard.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- proguard.spec	29 Jul 2009 10:29:30 -0000	1.4
+++ proguard.spec	3 Sep 2009 15:28:57 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           proguard
 Version:        4.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java class file shrinker, optimizer, obfuscator and preverifier
 
 Group:          Development/Tools
@@ -32,10 +32,6 @@ BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1.5
 BuildRequires:  ant
-BuildRequires:  desktop-file-utils
-# we convert the favicon.ico to png files of different sizes, so we require
-# ImageMagick
-BuildRequires:  ImageMagick
 Requires:       jpackage-utils
 Requires:       java >= 1.5
 
@@ -56,6 +52,19 @@ Requires:       %{name} = %{version}-%{r
 %description manual
 The manual for %{name}.
 
+%package gui
+Summary:        GUI for %{name}
+Group:          Development/Tools
+# we convert the favicon.ico to png files of different sizes, so we require
+# ImageMagick
+BuildRequires:  ImageMagick
+BuildRequires:  desktop-file-utils
+Requires:       jpackage-utils
+Requires:       %{name} = %{version}-%{release}
+
+%description gui
+A GUI for %{name}.
+
 %prep
 %setup -qn %{name}%{version}
 
@@ -149,10 +158,13 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}/%{name}/
-%{_bindir}/*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/*/*/apps/*
+%{_javadir}/%{name}
+%{_javadir}/%{name}/proguard.jar
+%{_javadir}/%{name}/proguard-%{version}.jar
+%{_javadir}/%{name}/retrace.jar
+%{_javadir}/%{name}/retrace-%{version}.jar
+%{_bindir}/proguard
+%{_bindir}/retrace
 
 %if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
@@ -164,7 +176,18 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root,-)
 %doc docs/*
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/proguardgui
+%{_javadir}/%{name}/proguardgui.jar
+%{_javadir}/%{name}/proguardgui-%{version}.jar
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/*/*/apps/*
+
 %changelog
+* Thu Sep  3 2009 Fran?ois Kooman <fkooman at tuxed.net> - 4.4-4
+- create a subpackage for the GUI
+
 * Wed Jul 29 2009 Fran?ois Kooman <fkooman at tuxed.net> - 4.4-3
 - put the manual in a sub package
 - fix permissions of launch scripts to 0755 instead of +x to fix rpmlint 



From cweyl at fedoraproject.org  Thu Sep  3 15:29:29 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  3 Sep 2009 15:29:29 +0000 (UTC)
Subject: rpms/perl/devel perl-update-Test-Simple.patch, 1.1, 1.2 perl.spec, 
	1.231, 1.232
Message-ID: <20090903152929.D79E111C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19479

Modified Files:
	perl-update-Test-Simple.patch perl.spec 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
- update Module-Pluggable to 3.9


perl-update-Test-Simple.patch:
 MANIFEST                                              |   25 
 lib/Test/Builder.pm                                   | 1430 +++++++++++-------
 lib/Test/Builder/Module.pm                            |   39 
 lib/Test/Builder/Tester.pm                            |  249 +--
 lib/Test/Builder/Tester/Color.pm                      |    5 
 lib/Test/More.pm                                      |  592 ++++---
 lib/Test/Simple.pm                                    |   38 
 lib/Test/Simple/Changes                               |  226 ++
 lib/Test/Simple/README                                |    7 
 lib/Test/Simple/t/BEGIN_require_ok.t                  |   27 
 lib/Test/Simple/t/BEGIN_use_ok.t                      |   26 
 lib/Test/Simple/t/More.t                              |    9 
 lib/Test/Simple/t/bad_plan.t                          |   29 
 lib/Test/Simple/t/bail_out.t                          |   16 
 lib/Test/Simple/t/c_flag.t                            |   21 
 lib/Test/Simple/t/cmp_ok.t                            |   37 
 lib/Test/Simple/t/create.t                            |   21 
 lib/Test/Simple/t/curr_test.t                         |   11 
 lib/Test/Simple/t/current_test.t                      |   11 
 lib/Test/Simple/t/current_test_without_plan.t         |   16 
 lib/Test/Simple/t/details.t                           |   13 
 lib/Test/Simple/t/diag.t                              |   67 
 lib/Test/Simple/t/died.t                              |   45 
 lib/Test/Simple/t/done_testing.t                      |   12 
 lib/Test/Simple/t/done_testing_double.t               |   46 
 lib/Test/Simple/t/done_testing_plan_mismatch.t        |   44 
 lib/Test/Simple/t/done_testing_with_no_plan.t         |   11 
 lib/Test/Simple/t/done_testing_with_number.t          |   12 
 lib/Test/Simple/t/done_testing_with_plan.t            |   11 
 lib/Test/Simple/t/dont_overwrite_die_handler.t        |   19 
 lib/Test/Simple/t/exit.t                              |  134 -
 lib/Test/Simple/t/explain.t                           |   27 
 lib/Test/Simple/t/extra.t                             |    2 
 lib/Test/Simple/t/extra_one.t                         |    2 
 lib/Test/Simple/t/fail-like.t                         |   39 
 lib/Test/Simple/t/fail-more.t                         |  458 ++++-
 lib/Test/Simple/t/fail.t                              |   62 
 lib/Test/Simple/t/fail_one.t                          |   47 
 lib/Test/Simple/t/filehandles.t                       |    9 
 lib/Test/Simple/t/fork_with_new_stdout.t              |   54 
 lib/Test/Simple/t/is_deeply_dne_bug.t                 |   11 
 lib/Test/Simple/t/is_deeply_fail.t                    |    6 
 lib/Test/Simple/t/is_deeply_with_threads.t            |   11 
 lib/Test/Simple/t/lib/Dev/Null.pm                     |    8 
 lib/Test/Simple/t/lib/Dummy.pm                        |    5 
 lib/Test/Simple/t/lib/MyOverload.pm                   |   27 
 lib/Test/Simple/t/lib/SigDie.pm                       |    8 
 lib/Test/Simple/t/maybe_regex.t                       |   24 
 lib/Test/Simple/t/missing.t                           |    8 
 lib/Test/Simple/t/new_ok.t                            |   42 
 lib/Test/Simple/t/no_plan.t                           |   23 
 lib/Test/Simple/t/no_plan_at_all.t                    |   35 
 lib/Test/Simple/t/no_tests.t                          |   44 
 lib/Test/Simple/t/note.t                              |   30 
 lib/Test/Simple/t/output.t                            |  128 -
 lib/Test/Simple/t/overload.t                          |   44 
 lib/Test/Simple/t/overload_threads.t                  |   11 
 lib/Test/Simple/t/plan_bad.t                          |    5 
 lib/Test/Simple/t/plan_is_noplan.t                    |   46 
 lib/Test/Simple/t/reset.t                             |   77 
 lib/Test/Simple/t/reset_outputs.t                     |   35 
 lib/Test/Simple/t/skip.t                              |    2 
 lib/Test/Simple/t/skipall.t                           |   41 
 lib/Test/Simple/t/tbm_doesnt_set_exported_to.t        |   24 
 lib/Test/Simple/t/thread_taint.t                      |    2 
 lib/Test/Simple/t/todo.t                              |   86 +
 lib/Test/Simple/t/try.t                               |   37 
 lib/Test/Simple/t/undef.t                             |   32 
 lib/Test/Simple/t/use_ok.t                            |   11 
 lib/Test/Simple/t/utf8.t                              |   69 
 lib/Test/Simple/t/versions.t                          |   21 
 t/lib/Test/Builder/NoOutput.pm                        |  122 +
 t/lib/Test/Simple/Catch.pm                            |    6 
 t/lib/Test/Simple/sample_tests/death.plx              |    7 
 t/lib/Test/Simple/sample_tests/death_with_handler.plx |   20 
 t/lib/Test/Simple/sample_tests/last_minute_death.plx  |    7 
 t/lib/Test/Simple/sample_tests/too_few_fail.plx       |    2 
 t/lib/TieOut.pm                                       |    8 
 78 files changed, 3459 insertions(+), 1615 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-Test-Simple.patchIndex: perl-update-Test-Simple.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl-update-Test-Simple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-Test-Simple.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-Test-Simple.patch	3 Sep 2009 15:29:29 -0000	1.2
@@ -1,116 +1,13 @@
-Test-Simple-0.86
+Update to 0.92; patch by Iain Arnell <iarnell at gmail.com> (BZ#519417)
 
-the following made the patch smaller:
-mv Test-Simple-0.86/t/{Builder,Tester,}
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-02-17 17:16:40.000000000 +0100
-@@ -2626,11 +2626,16 @@
- lib/Test/Simple/Changes		Test::Simple changes
- lib/Test/Simple.pm		Basic utility for writing tests
- lib/Test/Simple/README		Test::Simple README
-+lib/Test/Simple/TODO		Test::Simple TODO
- lib/Test/Simple/t/00test_harness_check.t	Test::Simple test
-+lib/Test/Simple/t/BEGIN_require_ok.t
-+lib/Test/Simple/t/BEGIN_use_ok.t
-+lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/More.t	Test::More test, basic stuff
- lib/Test/Simple/t/bad_plan.t	Test::Builder plan() test
- lib/Test/Simple/t/bail_out.t	Test::Builder BAIL_OUT test
- lib/Test/Simple/t/buffer.t	Test::Builder buffering test
--lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/c_flag.t
- lib/Test/Simple/t/carp.t	Test::Builder test
- lib/Test/Simple/t/circular_data.t	Test::Simple test
- lib/Test/Simple/t/cmp_ok.t	Test::More test
-@@ -2638,19 +2643,22 @@
- lib/Test/Simple/t/curr_test.t	Test::Builder->curr_test tests
- lib/Test/Simple/t/details.t	Test::Builder tests
- lib/Test/Simple/t/diag.t	Test::More diag() test
-+lib/Test/Simple/t/died.t
-+lib/Test/Simple/t/dont_overwrite_die_handler.t
- lib/Test/Simple/t/eq_set.t	Test::Simple test
- lib/Test/Simple/t/exit.t	Test::Simple test, exit codes
--lib/Test/Simple/t/extra_one.t	Test::Simple test
-+lib/Test/Simple/t/explain.t
- lib/Test/Simple/t/extra.t	Test::Simple test
-+lib/Test/Simple/t/extra_one.t	Test::Simple test
- lib/Test/Simple/t/fail-like.t	Test::More test, like() failures
- lib/Test/Simple/t/fail-more.t	Test::More test, tests failing
--lib/Test/Simple/t/fail_one.t	Test::Simple test
- lib/Test/Simple/t/fail.t	Test::Simple test, test failures
-+lib/Test/Simple/t/fail_one.t	Test::Simple test
- lib/Test/Simple/t/filehandles.t	Test::Simple test, STDOUT can be played with
- lib/Test/Simple/t/fork.t	Test::More fork tests
- lib/Test/Simple/t/harness_active.t	Test::Simple test
--lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/has_plan.t	Test::Builder->plan tests
-+lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/import.t	Test::More test, importing functions
- lib/Test/Simple/t/is_deeply_dne_bug.t	Test::More test
- lib/Test/Simple/t/is_deeply_fail.t	Test::More test, is_deeply()
-@@ -2660,27 +2668,30 @@
- lib/Test/Simple/t/lib/MyOverload.pm	Test::More test module 
- lib/Test/Simple/t/maybe_regex.t	Test::Builder->maybe_regex() tests
- lib/Test/Simple/t/missing.t	Test::Simple test, missing tests
--lib/Test/Simple/t/More.t	Test::More test, basic stuff
-+lib/Test/Simple/t/new_ok.t
- lib/Test/Simple/t/no_diag.t	Test::Simple test
- lib/Test/Simple/t/no_ending.t	Test::Builder test, no_ending()
- lib/Test/Simple/t/no_header.t	Test::Builder test, no_header()
- lib/Test/Simple/t/no_plan.t	Test::Simple test, forgot the plan
--lib/Test/Simple/TODO		Test::Simple TODO
-+lib/Test/Simple/t/no_tests.t
-+lib/Test/Simple/t/note.t
- lib/Test/Simple/t/ok_obj.t	Test::Builder object tests
- lib/Test/Simple/t/output.t	Test::Builder test, output methods
- lib/Test/Simple/t/overload.t		Test::Simple test
- lib/Test/Simple/t/overload_threads.t	Test::Simple test
-+lib/Test/Simple/t/plan.t	Test::More test, plan()
- lib/Test/Simple/t/plan_bad.t		Test::Simple test
- lib/Test/Simple/t/plan_is_noplan.t	Test::Simple test, no_plan
- lib/Test/Simple/t/plan_no_plan.t	Test::More test, plan() w/no_plan
- lib/Test/Simple/t/plan_shouldnt_import.t	Test::Simple test
- lib/Test/Simple/t/plan_skip_all.t	Test::More test, plan() w/skip_all
--lib/Test/Simple/t/plan.t	Test::More test, plan()
- lib/Test/Simple/t/require_ok.t	Test::Simple test
- lib/Test/Simple/t/reset.t	Test::Simple test
-+lib/Test/Simple/t/reset_outputs.t
- lib/Test/Simple/t/simple.t	Test::Simple test, basic stuff
--lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
- lib/Test/Simple/t/skip.t	Test::More test, SKIP tests
-+lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
-+lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
- lib/Test/Simple/t/tbt_01basic.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_02fhrestore.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_03die.t	Test::Builder::Tester test
-@@ -2688,13 +2699,14 @@
- lib/Test/Simple/t/tbt_05faildiag.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_06errormess.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_07args.t	Test::Builder::Tester test
--lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
- lib/Test/Simple/t/thread_taint.t	Test::Simple test
-+lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
- lib/Test/Simple/t/todo.t	Test::More test, TODO tests
- lib/Test/Simple/t/try.t		Test::More test
- lib/Test/Simple/t/undef.t	Test::More test, undefs don't cause warnings
--lib/Test/Simple/t/useing.t	Test::More test, compile test
- lib/Test/Simple/t/use_ok.t	Test::More test, use_ok()
-+lib/Test/Simple/t/useing.t	Test::More test, compile test
-+lib/Test/Simple/t/utf8.t
- lib/Test/t/05_about_verbose.t	See if Test works
- lib/Test/t/fail.t		See if Test works
- lib/Test/t/mix.t		See if Test works
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Module.pm perl-5.10.0/lib/Test/Builder/Module.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Module.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-02-17 17:16:40.000000000 +0100
++++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-08-26 06:14:11.000000000 +0200
 @@ -1,24 +1,24 @@
  package Test::Builder::Module;
-+# $Id$
-+
-+use strict;
  
++use strict;
++
  use Test::Builder;
  
  require Exporter;
@@ -120,7 +17,8 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
 -$VERSION = '0.72';
 -
 -use strict;
-+our $VERSION = '0.86';
++our $VERSION = '0.92';
++$VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
  
  # 5.004's Exporter doesn't have export_to_level.
  my $_export_to_level = sub {
@@ -208,14 +106,20 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  1;
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm perl-5.10.0/lib/Test/Builder/Tester/Color.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-02-17 17:16:40.000000000 +0100
-@@ -1,4 +1,5 @@
++++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,9 +1,11 @@
  package Test::Builder::Tester::Color;
-+# $Id$
  
  use strict;
++our $VERSION = "1.18";
+ 
+ require Test::Builder::Tester;
  
-@@ -25,8 +26,7 @@
++
+ =head1 NAME
+ 
+ Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
+@@ -25,8 +27,7 @@
  
  =cut
  
@@ -227,10 +131,9 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Tester.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-02-17 17:16:40.000000000 +0100
-@@ -1,8 +1,8 @@
++++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,8 +1,7 @@
  package Test::Builder::Tester;
-+# $Id$
  
  use strict;
 -use vars qw(@EXPORT $VERSION @ISA);
@@ -239,7 +142,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  
  use Test::Builder;
  use Symbol;
-@@ -56,21 +56,20 @@
+@@ -56,21 +55,20 @@
  ###
  
  use Exporter;
@@ -269,7 +172,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  }
  
  sub import {
-@@ -83,14 +82,14 @@
+@@ -83,14 +81,14 @@
      $t->plan(@plan);
  
      my @imports = ();
@@ -287,7 +190,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  }
  
  ###
-@@ -124,8 +123,7 @@
[...6118 lines suppressed...]
  my $out = tie *$out_fh, 'TieOut';
  my $err = tie *$err_fh, 'TieOut';
  
-@@ -13,6 +14,6 @@
+@@ -13,6 +15,6 @@
  $t->failure_output($err_fh);
  $t->todo_output($err_fh);
  
@@ -6035,12 +8073,8 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  1;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,16 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -4,10 +4,13 @@
  require Test::Simple::Catch;
  my($out, $err) = Test::Simple::Catch::caught();
  
@@ -6054,22 +8088,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  ok(1);
  ok(1);
 -die "Knife?";
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- use Carp;
- 
- push @INC, 't/lib';
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -0,0 +1,19 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -0,0 +1,20 @@
 +require Test::Simple;
-+# $Id$
 +
 +push @INC, 't/lib';
 +require Test::Simple::Catch;
@@ -6086,42 +8111,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
 +
 +ok(1);
 +ok(1);
++
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,3 +1,4 @@
- require Test::Builder;
-+# $Id$
- 
- exit 1;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- use lib 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,11 +1,14 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -5,7 +5,9 @@
  my($out, $err) = Test::Simple::Catch::caught();
  
  Test::Simple->import(tests => 5);
@@ -6132,86 +8128,31 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  
  ok(1);
  ok(1);
-@@ -13,4 +16,4 @@
+@@ -13,4 +15,5 @@
  ok(1);
  ok(1);
  
 -die "Almost there...";
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- # ID 20020716.013, the exit code would become 0 if the test died
-+# $Id$
- # before a plan.
- 
- require Test::Simple;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1 +1,2 @@
- require Test::Simple;
-+# $Id$
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-@@ -9,4 +10,4 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -9,4 +9,4 @@
  
  ok(0);
  ok(1);
 -ok(0);
 \ No newline at end of file
 +ok(0);
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/TieOut.pm perl-5.10.0/t/lib/TieOut.pm
 --- perl-5.10.0.orig/t/lib/TieOut.pm	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/TieOut.pm	2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,14 @@
++++ perl-5.10.0/t/lib/TieOut.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,13 +1,15 @@
  package TieOut;
-+# $Id$
  
++use strict;
++
  sub TIEHANDLE {
      my $scalar = '';
 -    bless( \$scalar, $_[0]);
@@ -6225,7 +8166,7 @@ diff -urN perl-5.10.0.orig/t/lib/TieOut.
  }
  
  sub PRINTF {
-@@ -16,7 +17,7 @@
+@@ -16,7 +18,7 @@
      $$self .= sprintf $fmt, @_;
  }
  


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- perl.spec	28 Aug 2009 05:39:58 -0000	1.231
+++ perl.spec	3 Sep 2009 15:29:29 -0000	1.232
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        81%{?dist}
+Release:        82%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -235,7 +235,7 @@ Patch113:	perl-update-Sys-Syslog.patch
 Patch114:	perl-update-Test-Harness.patch
 %define			    Test_Harness_version 3.16
 Patch115:	perl-update-Test-Simple.patch
-%define			    Test_Simple_version 0.86
+%define			    Test_Simple_version 0.92
 Patch116:	perl-update-Time-HiRes.patch
 %define			    Time_HiRes_version 1.9719
 Patch117:	perl-update-Digest-SHA.patch
@@ -250,6 +250,8 @@ Patch120:	perl-update-Compress_Raw_Zlib.
 %define			    Compress_Raw_Zlib 2.020
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
+Patch122:   perl-update-Module-Pluggable.patch
+%define             Module_Pluggable_version 3.90
 
 # Fedora uses links instead of lynx
 # patches File-Fetch and CPAN
@@ -772,7 +774,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        3.60
+Version:        %{Module_Pluggable_version} 
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Pluggable
@@ -1032,6 +1034,12 @@ upstream tarball from perl.org.
 %patch119 -p1
 %patch120 -p1
 %patch121 -p1
+%patch122 -p1
+# 0-byte files and patch don't seem to agree
+mkdir t/Module_Pluggable/lib/Zot/
+touch t/Module_Pluggable/lib/Zot/.Zork.pm
+
+
 %patch201 -p1
 
 #
@@ -1313,6 +1321,7 @@ perl -x patchlevel.h \
 	'Fedora Patch119: Update File::Spec to %{File_Spec_version}' \
 	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
 	'Fedora Patch121: Update Scalar-List-Utils to %{Scalar_List_Utils}' \
+	'Fedora Patch122: Update Module-Pluggable to %{Module_Pluggable_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
@@ -1939,6 +1948,10 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
+- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
+- update Module-Pluggable to 3.9
+
 * Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
 - fix macros.perl *sigh*
 



From cweyl at fedoraproject.org  Thu Sep  3 15:30:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  3 Sep 2009 15:30:26 +0000 (UTC)
Subject: rpms/perl/devel perl-update-Module-Pluggable.patch,NONE,1.1
Message-ID: <20090903153026.E374911C02C6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20376

Added Files:
	perl-update-Module-Pluggable.patch 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
- update Module-Pluggable to 3.9


perl-update-Module-Pluggable.patch:
 MANIFEST                                            |   11 +
 lib/Devel/InnerPackage.pm                           |    4 
 lib/Module/Pluggable.pm                             |   15 +-
 lib/Module/Pluggable/Object.pm                      |  134 +++++++++++++-------
 t/Module_Pluggable/02alsoworks.t                    |    2 
 t/Module_Pluggable/02works.t                        |    2 
 t/Module_Pluggable/03diffname.t                     |    2 
 t/Module_Pluggable/04acmedir.t                      |    2 
 t/Module_Pluggable/04acmedir_single.t               |    2 
 t/Module_Pluggable/04acmepath.t                     |    2 
 t/Module_Pluggable/04acmepath_single.t              |    2 
 t/Module_Pluggable/05postpath.t                     |    2 
 t/Module_Pluggable/06multipath.t                    |    2 
 t/Module_Pluggable/07instantiate.t                  |    4 
 t/Module_Pluggable/08nothing.t                      |    2 
 t/Module_Pluggable/09require.t                      |    2 
 t/Module_Pluggable/10innerpack.t                    |    2 
 t/Module_Pluggable/10innerpack_inner.t              |    2 
 t/Module_Pluggable/10innerpack_noinner.t            |    2 
 t/Module_Pluggable/10innerpack_onefile.t            |   27 ++++
 t/Module_Pluggable/10innerpack_override.t           |    2 
 t/Module_Pluggable/10innerpack_super.t              |   29 ++++
 t/Module_Pluggable/11usetwice.t                     |    2 
 t/Module_Pluggable/12only.t                         |    2 
 t/Module_Pluggable/12onlyarray.t                    |    2 
 t/Module_Pluggable/12onlyregex.t                    |    2 
 t/Module_Pluggable/12onlyrequire.t                  |   21 +++
 t/Module_Pluggable/13except.t                       |    2 
 t/Module_Pluggable/13exceptarray.t                  |    4 
 t/Module_Pluggable/13exceptregex.t                  |    4 
 t/Module_Pluggable/14package.t                      |    2 
 t/Module_Pluggable/15topicsafe.t                    |    2 
 t/Module_Pluggable/16different_extension.t          |    2 
 t/Module_Pluggable/17devel_inner_package.t          |    2 
 t/Module_Pluggable/18skipped_package.t              |    2 
 t/Module_Pluggable/19can_ok_clobber.t               |    2 
 t/Module_Pluggable/20dodgy_files.t                  |   16 +-
 t/Module_Pluggable/21editor_junk.t                  |   53 +++++++
 t/Module_Pluggable/lib/Acme/Foo-Bar.pm              |    6 
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm     |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~    |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm     |    9 +
 44 files changed, 344 insertions(+), 81 deletions(-)

--- NEW FILE perl-update-Module-Pluggable.patch ---
This patch is derived from the perl-5.10.1 tarball as released on the CPAN.

diff -urN perl-5.10.0.orig/lib/Devel/InnerPackage.pm perl-5.10.0/lib/Devel/InnerPackage.pm
--- perl-5.10.0.orig/lib/Devel/InnerPackage.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Devel/InnerPackage.pm	2009-08-31 19:47:24.444773931 -0700
@@ -17,7 +17,7 @@
 =head1 SYNOPSIS
 
     use Foo::Bar;
-    use Devel::innerPackage qw(list_packages);
+    use Devel::InnerPackage qw(list_packages);
 
     my @inner_packages = list_packages('Foo::Bar');
 
@@ -75,7 +75,7 @@
                     !__PACKAGE__->_loaded($pack.$cand); # or @children;
                 push @packs, @children;
             }
-            return grep {$_ !~ /::::ISA::CACHE/} @packs;
+            return grep {$_ !~ /::(::ISA::CACHE|SUPER)/} @packs;
 }
 
 ### XXX this is an inlining of the Class-Inspector->loaded()
diff -urN perl-5.10.0.orig/lib/Module/Pluggable/Object.pm perl-5.10.0/lib/Module/Pluggable/Object.pm
--- perl-5.10.0.orig/lib/Module/Pluggable/Object.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable/Object.pm	2009-08-31 19:47:24.446771196 -0700
@@ -6,10 +6,9 @@
 use File::Spec::Functions qw(splitdir catdir curdir catfile abs2rel);
 use Carp qw(croak carp);
 use Devel::InnerPackage;
-use Data::Dumper;
 use vars qw($VERSION);
 
-$VERSION = '3.6';
+$VERSION = '3.9';
 
 
 sub new {
@@ -20,6 +19,10 @@
 
 }
 
+### Eugggh, this code smells 
+### This is what happens when you keep adding patches
+### *sigh*
+
 
 sub plugins {
         my $self = shift;
@@ -30,14 +33,14 @@
         my $filename   = $self->{'filename'};
         my $pkg        = $self->{'package'};
 
+        # Get the exception params instantiated
+        $self->_setup_exceptions;
+
         # automatically turn a scalar search path or namespace into a arrayref
         for (qw(search_path search_dirs)) {
             $self->{$_} = [ $self->{$_} ] if exists $self->{$_} && !ref($self->{$_});
         }
 
-
-
-
         # default search path is '<Module>::<Name>::Plugin'
         $self->{'search_path'} = ["${pkg}::Plugin"] unless $self->{'search_path'}; 
 
@@ -46,13 +49,14 @@
 
 
         # check to see if we're running under test
-        my @SEARCHDIR = exists $INC{"blib.pm"} && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
+        my @SEARCHDIR = exists $INC{"blib.pm"} && defined $filename && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
 
         # add any search_dir params
         unshift @SEARCHDIR, @{$self->{'search_dirs'}} if defined $self->{'search_dirs'};
 
 
         my @plugins = $self->search_directories(@SEARCHDIR);
+        push(@plugins, $self->handle_innerpackages($_)) for @{$self->{'search_path'}};
 
         # push @plugins, map { print STDERR "$_\n"; $_->require } list_packages($_) for (@{$self->{'search_path'}});
         
@@ -60,43 +64,12 @@
         return () unless @plugins;
 
 
-        # exceptions
-        my %only;   
-        my %except; 
-        my $only;
-        my $except;
-
-        if (defined $self->{'only'}) {
-            if (ref($self->{'only'}) eq 'ARRAY') {
-                %only   = map { $_ => 1 } @{$self->{'only'}};
-            } elsif (ref($self->{'only'}) eq 'Regexp') {
-                $only = $self->{'only'}
-            } elsif (ref($self->{'only'}) eq '') {
-                $only{$self->{'only'}} = 1;
-            }
-        }
-        
-
-        if (defined $self->{'except'}) {
-            if (ref($self->{'except'}) eq 'ARRAY') {
-                %except   = map { $_ => 1 } @{$self->{'except'}};
-            } elsif (ref($self->{'except'}) eq 'Regexp') {
-                $except = $self->{'except'}
-            } elsif (ref($self->{'except'}) eq '') {
-                $except{$self->{'except'}} = 1;
-            }
-        }
-
 
         # remove duplicates
         # probably not necessary but hey ho
         my %plugins;
         for(@plugins) {
-            next if (keys %only   && !$only{$_}     );
-            next unless (!defined $only || m!$only! );
-
-            next if (keys %except &&  $except{$_}   );
-            next if (defined $except &&  m!$except! );
+            next unless $self->_is_legit($_);
             $plugins{$_} = 1;
         }
 
@@ -112,6 +85,58 @@
 
 }
 
+sub _setup_exceptions {
+    my $self = shift;
+
+    my %only;   
+    my %except; 
+    my $only;
+    my $except;
+
+    if (defined $self->{'only'}) {
+        if (ref($self->{'only'}) eq 'ARRAY') {
+            %only   = map { $_ => 1 } @{$self->{'only'}};
+        } elsif (ref($self->{'only'}) eq 'Regexp') {
+            $only = $self->{'only'}
+        } elsif (ref($self->{'only'}) eq '') {
+            $only{$self->{'only'}} = 1;
+        }
+    }
+        
+
+    if (defined $self->{'except'}) {
+        if (ref($self->{'except'}) eq 'ARRAY') {
+            %except   = map { $_ => 1 } @{$self->{'except'}};
+        } elsif (ref($self->{'except'}) eq 'Regexp') {
+            $except = $self->{'except'}
+        } elsif (ref($self->{'except'}) eq '') {
+            $except{$self->{'except'}} = 1;
+        }
+    }
+    $self->{_exceptions}->{only_hash}   = \%only;
+    $self->{_exceptions}->{only}        = $only;
+    $self->{_exceptions}->{except_hash} = \%except;
+    $self->{_exceptions}->{except}      = $except;
+        
+}
+
+sub _is_legit {
+    my $self   = shift;
+    my $plugin = shift;
+    my %only   = %{$self->{_exceptions}->{only_hash}||{}};
+    my %except = %{$self->{_exceptions}->{except_hash}||{}};
+    my $only   = $self->{_exceptions}->{only};
+    my $except = $self->{_exceptions}->{except};
+
+    return 0 if     (keys %only   && !$only{$plugin}     );
+    return 0 unless (!defined $only || $plugin =~ m!$only!     );
+
+    return 0 if     (keys %except &&  $except{$plugin}   );
+    return 0 if     (defined $except &&  $plugin =~ m!$except! );
+
+    return 1;
+}
+
 sub search_directories {
     my $self      = shift;
     my @SEARCHDIR = @_;
@@ -121,7 +146,6 @@
     foreach my $dir (@SEARCHDIR) {
         push @plugins, $self->search_paths($dir);
     }
-
     return @plugins;
 }
 
@@ -151,6 +175,8 @@
             # parse the file to get the name
             my ($name, $directory, $suffix) = fileparse($file, $file_regex);
 
+            next if (!$self->{include_editor_junk} && $self->_is_editor_junk($name));
+
             $directory = abs2rel($directory, $sp);
 
             # If we have a mixed-case package name, assume case has been preserved
@@ -203,17 +229,34 @@
         # now add stuff that may have been in package
         # NOTE we should probably use all the stuff we've been given already
         # but then we can't unload it :(
-        push @plugins, $self->handle_innerpackages($searchpath) unless (exists $self->{inner} && !$self->{inner});
+        push @plugins, $self->handle_innerpackages($searchpath);
     } # foreach $searchpath
 
     return @plugins;
 }
 
+sub _is_editor_junk {
+    my $self = shift;
+    my $name = shift;
+
+    # Emacs (and other Unix-y editors) leave temp files ending in a
+    # tilde as a backup.
+    return 1 if $name =~ /~$/;
+    # Emacs makes these files while a buffer is edited but not yet
+    # saved.
+    return 1 if $name =~ /^\.#/;
+    # Vim can leave these files behind if it crashes.
+    return 1 if $name =~ /\.sw[po]$/;
+
+    return 0;
+}
+
 sub handle_finding_plugin {
     my $self   = shift;
     my $plugin = shift;
 
     return unless (defined $self->{'instantiate'} || $self->{'require'}); 
+    return unless $self->_is_legit($plugin);
     $self->_require($plugin);
 }
 
@@ -245,10 +288,11 @@
 
 sub handle_innerpackages {
     my $self = shift;
+    return () if (exists $self->{inner} && !$self->{inner});
+
     my $path = shift;
     my @plugins;
 
-
     foreach my $plugin (Devel::InnerPackage::list_packages($path)) {
         my $err = $self->handle_finding_plugin($plugin);
         #next if $err;
@@ -299,6 +343,14 @@
 
 Optionally it instantiates those classes for you.
 
+This object is wrapped by C<Module::Pluggable>. If you want to do something
+odd or add non-general special features you're probably best to wrap this
+and produce your own subclass.
+
+=head1 OPTIONS
+
+See the C<Module::Pluggable> docs.
+
 =head1 AUTHOR
 
 Simon Wistow <simon at thegestalt.org>
diff -urN perl-5.10.0.orig/lib/Module/Pluggable.pm perl-5.10.0/lib/Module/Pluggable.pm
--- perl-5.10.0.orig/lib/Module/Pluggable.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable.pm	2009-08-31 19:47:24.448771465 -0700
@@ -9,7 +9,7 @@
 # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
 
 
-$VERSION = '3.6';
+$VERSION = '3.9';
 
 sub import {
     my $class        = shift;
@@ -60,8 +60,9 @@
 
 
     no strict 'refs';
-    no warnings 'redefine';
-    *{"$package\::$sub"}    = $subroutine;
+    no warnings qw(redefine prototype);
+    
+    *{"$package\::$sub"}        = $subroutine;
     *{"$package\::search_path"} = $searchsub;
     *{"$package\::only"}        = $onlysub;
     *{"$package\::except"}      = $exceptsub;
@@ -297,6 +298,14 @@
 
     file_regex => qr/\.plugin$/
 
+=head2 include_editor_junk
+
+By default C<Module::Pluggable> ignores files that look like they were
+left behind by editors. Currently this means files ending in F<~> (~),
+the extensions F<.swp> or F<.swo>, or files beginning with F<.#>.
+
+Setting C<include_editor_junk> changes C<Module::Pluggable> so it does
+not ignore any files it finds.
 
 
 =head1 METHODs
diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/MANIFEST	2009-08-31 19:47:24.452770885 -0700
@@ -3612,11 +3612,14 @@
 t/Module_Pluggable/09require.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_inner.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_noinner.t	Module::Pluggable tests
+t/Module_Pluggable/10innerpack_onefile.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_override.t	Module::Pluggable tests
+t/Module_Pluggable/10innerpack_super.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack.t	Module::Pluggable tests
 t/Module_Pluggable/11usetwice.t	Module::Pluggable tests
 t/Module_Pluggable/12onlyarray.t	Module::Pluggable tests
 t/Module_Pluggable/12onlyregex.t	Module::Pluggable tests
+t/Module_Pluggable/12onlyrequire.t	Module::Pluggable tests
 t/Module_Pluggable/12only.t	Module::Pluggable tests
 t/Module_Pluggable/13exceptarray.t	Module::Pluggable tests
 t/Module_Pluggable/13exceptregex.t	Module::Pluggable tests
@@ -3628,8 +3631,15 @@
 t/Module_Pluggable/18skipped_package.t	Module::Pluggable tests
 t/Module_Pluggable/19can_ok_clobber.t	Module::Pluggable tests
 t/Module_Pluggable/20dodgy_files.t	Module::Pluggable tests
+t/Module_Pluggable/21editor_junk.t	Module::Pluggable tests
 t/Module_Pluggable/acme/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/Acme/Foo-Bar.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Bar.plugin	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Foo.plugin	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Quux/Foo.plugin	Module::Pluggable tests
@@ -3646,6 +3656,7 @@
 t/Module_Pluggable/lib/OddTest/Plugin/-Dodgy.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/OddTest/Plugin/Foo.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/TA/C/A/I.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/Zot/.Zork.pm	Module::Pluggable tests
 t/mro/basic_01_c3.t		mro tests
 t/mro/basic_01_dfs.t		mro tests
 t/mro/basic_02_c3.t		mro tests
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t perl-5.10.0/t/Module_Pluggable/02alsoworks.t
--- perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02alsoworks.t	2009-08-31 19:47:24.454770805 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02works.t perl-5.10.0/t/Module_Pluggable/02works.t
--- perl-5.10.0.orig/t/Module_Pluggable/02works.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02works.t	2009-08-31 19:47:24.455771358 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/03diffname.t perl-5.10.0/t/Module_Pluggable/03diffname.t
--- perl-5.10.0.orig/t/Module_Pluggable/03diffname.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/03diffname.t	2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t perl-5.10.0/t/Module_Pluggable/04acmedir_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir_single.t	2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t perl-5.10.0/t/Module_Pluggable/04acmedir.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir.t	2009-08-31 19:47:24.457771627 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t perl-5.10.0/t/Module_Pluggable/04acmepath_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath_single.t	2009-08-31 19:47:24.458773508 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t perl-5.10.0/t/Module_Pluggable/04acmepath.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath.t	2009-08-31 19:47:24.459772105 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/05postpath.t perl-5.10.0/t/Module_Pluggable/05postpath.t
--- perl-5.10.0.orig/t/Module_Pluggable/05postpath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/05postpath.t	2009-08-31 19:47:24.460771332 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/06multipath.t perl-5.10.0/t/Module_Pluggable/06multipath.t
--- perl-5.10.0.orig/t/Module_Pluggable/06multipath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/06multipath.t	2009-08-31 19:47:24.461771676 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t perl-5.10.0/t/Module_Pluggable/07instantiate.t
--- perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/07instantiate.t	2009-08-31 19:47:24.462772090 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 6;
 
 my $foo;
@@ -26,7 +26,7 @@
 use File::Spec::Functions qw(catdir);
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'booga', instantiate => 'new');
 use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'wooga', instantiate => 'nosomuchmethod');
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/08nothing.t perl-5.10.0/t/Module_Pluggable/08nothing.t
--- perl-5.10.0.orig/t/Module_Pluggable/08nothing.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/08nothing.t	2009-08-31 19:47:24.463771316 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 2;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/09require.t perl-5.10.0/t/Module_Pluggable/09require.t
--- perl-5.10.0.orig/t/Module_Pluggable/09require.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/09require.t	2009-08-31 19:47:24.464771800 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 2;
 
 my $t = MyTest->new();
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t	2009-08-31 19:47:24.465771515 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t	2009-08-31 19:47:24.479772629 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t	2009-08-31 19:47:24.480772134 -0700
@@ -0,0 +1,27 @@
+#!perl -wT
+
+use strict;
+use Test::More tests => 2;
+use Data::Dumper;
+
+my $mc  = MyClass->new();
+my $mc2 = MyClass2->new();
+
+
+is_deeply([$mc->plugins],  [qw(MyClass::Plugin::MyPlugin)], "Got inner plugin");
+is_deeply([$mc2->plugins], [],                              "Didn't get plugin");
+
+package MyClass::Plugin::MyPlugin;
+sub pretty { print "I am pretty" };
+
+package MyClass;
+use Module::Pluggable inner => 1;
+
+sub new { return bless {}, $_[0] }
+
+package MyClass2;
+use Module::Pluggable search_path => "MyClass::Plugin", inner => 0;
+
+sub new { return bless {}, $_[0] }
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t perl-5.10.0/t/Module_Pluggable/10innerpack_override.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_override.t	2009-08-31 19:47:24.481771501 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t perl-5.10.0/t/Module_Pluggable/10innerpack_super.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_super.t	2009-08-31 19:47:24.482771565 -0700
@@ -0,0 +1,29 @@
+#!perl -wT
+
+use Test::More tests => 3;
+use strict;
+use_ok('Devel::InnerPackage');
+Bar->whee;
+is_deeply([Devel::InnerPackage::list_packages("Bar")],[], "Don't pick up ::SUPER pseudo stash"); 
+is_deeply([Devel::InnerPackage::list_packages("Foo")],['Foo::Bar'], "Still pick up other inner package");
+
+package Foo;
+
+sub whee {
+    1;
+}
+
+package Foo::Bar;
+
+sub whee {}
+
+package Bar;
+use base 'Foo';
+
+sub whee {
+    shift->SUPER::whee;
+    2;
+}
+
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t perl-5.10.0/t/Module_Pluggable/10innerpack.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack.t	2009-08-31 19:47:24.483771909 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 4;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t perl-5.10.0/t/Module_Pluggable/11usetwice.t
--- perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/11usetwice.t	2009-08-31 19:47:24.484771624 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t perl-5.10.0/t/Module_Pluggable/12onlyarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyarray.t	2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t perl-5.10.0/t/Module_Pluggable/12onlyregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyregex.t	2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t perl-5.10.0/t/Module_Pluggable/12onlyrequire.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyrequire.t	2009-08-31 19:47:24.505021273 -0700
@@ -0,0 +1,21 @@
+#!perl -w
+use strict;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Test::More tests => 2;
+
+my @packages = eval { Zot->_dist_types };
+is($@, '',                "No warnings");
+is(scalar(@packages), 0,  "Correctly only got 1 package");
+
+
+package Zot;
+use strict;
+use Module::Pluggable (
+        sub_name => '_dist_types',
+        search_path => __PACKAGE__,
+        only => qr/Zot::\w+$/,
+        require => 1,
+    );
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12only.t perl-5.10.0/t/Module_Pluggable/12only.t
--- perl-5.10.0.orig/t/Module_Pluggable/12only.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12only.t	2009-08-31 19:47:24.506022385 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t perl-5.10.0/t/Module_Pluggable/13exceptarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptarray.t	2009-08-31 19:47:24.507021263 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t perl-5.10.0/t/Module_Pluggable/13exceptregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptregex.t	2009-08-31 19:47:24.510021945 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13except.t perl-5.10.0/t/Module_Pluggable/13except.t
--- perl-5.10.0.orig/t/Module_Pluggable/13except.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13except.t	2009-08-31 19:47:24.511021381 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/14package.t perl-5.10.0/t/Module_Pluggable/14package.t
--- perl-5.10.0.orig/t/Module_Pluggable/14package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/14package.t	2009-08-31 19:47:24.842414378 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t perl-5.10.0/t/Module_Pluggable/15topicsafe.t
--- perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/15topicsafe.t	2009-08-31 19:47:24.842774343 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More 'no_plan';
 
 use Module::Pluggable search_path => 'Acme::MyTest';
diff -urN perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t perl-5.10.0/t/Module_Pluggable/16different_extension.t
--- perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/16different_extension.t	2009-08-31 19:47:24.843800947 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t	2009-08-31 19:47:24.843800947 -0700
@@ -3,7 +3,7 @@
 
 use Devel::InnerPackage qw(list_packages);
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 my @packages;
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t perl-5.10.0/t/Module_Pluggable/18skipped_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/18skipped_package.t	2009-08-31 19:47:24.844780129 -0700
@@ -2,7 +2,7 @@
 
 use Test::More tests => 1;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 use Devel::InnerPackage qw(list_packages);
 use No::Middle;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t
--- perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t	2009-08-31 19:47:24.844780129 -0700
@@ -3,7 +3,7 @@
 use warnings;
 use Data::Dumper;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 use Test::More tests=>5;
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t perl-5.10.0/t/Module_Pluggable/20dodgy_files.t
--- perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/20dodgy_files.t	2009-08-31 19:47:24.845769158 -0700
@@ -1,7 +1,7 @@
 #!perl -w
 
 BEGIN {
-    if ($^O eq 'VMS') {
+    if ($^O eq 'VMS' || $^O eq 'VOS') {
         print "1..0 # Skip: can't handle misspelled plugin names\n";
         exit;
     }
@@ -9,8 +9,18 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
-use Test::More tests => 5;
+use Test::More;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use File::Spec::Functions qw(catfile);
+
+
+my ($dodgy_file) = (catfile($FindBin::Bin, "lib", "OddTest", "Plugin", "-Dodgy.pm")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+        plan skip_all => "Can't handle misspelled plugin names\n";
+} else {
+        plan tests => 5;
+}
+
 
 my $foo;
 ok($foo = OddTest->new());
diff -urN perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t perl-5.10.0/t/Module_Pluggable/21editor_junk.t
--- perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/21editor_junk.t	2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,53 @@
+#!perl -w
+
+use Test::More;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Module::Pluggable::Object;
+use File::Spec::Functions qw(catfile);
+
+my ($dodgy_file) = (catfile($FindBin::Bin,"lib", "EditorJunk", "Plugin", "#Bar.pm#")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+        plan skip_all => "Can't handle plugin names with octothorpes\n";
+} else {
+        plan tests => 4;
+}
+
+
+
+my $foo;
+ok($foo = EditorJunk->new());
+
+my @plugins;
+my @expected = qw(EditorJunk::Plugin::Bar EditorJunk::Plugin::Foo);
+ok(@plugins = sort $foo->plugins);
+
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+my $mpo = Module::Pluggable::Object->new(
+    package             => 'EditorJunk',
+    filename            => __FILE__,
+    include_editor_junk => 1,
+);
+
+ at expected = ('EditorJunk::Plugin::.#Bar', 'EditorJunk::Plugin::Bar', 'EditorJunk::Plugin::Foo');
+ at plugins = sort $mpo->plugins();
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+
+package EditorJunk;
+
+use strict;
+use Module::Pluggable;
+
+
+sub new {
+    my $class = shift;
+    return bless {}, $class;
+
+}
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,6 @@
+package Acme::FooBar;
+
+our $quux = "hello";
+
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	2009-08-31 19:47:24.846769084 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	2009-08-31 19:47:24.851770803 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	2009-08-31 19:47:24.852771985 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	2009-08-31 19:47:24.853771770 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	2009-08-31 19:47:24.854771835 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Foo;
+
+
+use strict;
+
+
+1;
+
+



From harald at fedoraproject.org  Thu Sep  3 15:32:42 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  3 Sep 2009 15:32:42 +0000 (UTC)
Subject: rpms/dracut/devel 0005-mdraid-add-grep-for-convenience.patch, NONE, 
	1.1 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch, 
	NONE, 1.1 dracut.spec, 1.18, 1.19
Message-ID: <20090903153242.2660C11C0099@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23108

Modified Files:
	dracut.spec 
Added Files:
	0005-mdraid-add-grep-for-convenience.patch 
	0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch 
Log Message:
* Thu Sep 03 2009 Harald Hoyer <harald at redhat.com> 001-2
- fixed missing grep for md
- reorder cleanup


0005-mdraid-add-grep-for-convenience.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-mdraid-add-grep-for-convenience.patch ---
>From 429aa1a2c29dd42fbc91e956a8a77675773cc46d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 3 Sep 2009 17:11:03 +0200
Subject: [PATCH 5/6] mdraid: add grep for convenience

---
 modules.d/90mdraid/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 60f289a..497e5b0 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dracut_install mdadm partx
+dracut_install mdadm partx grep
 
 
 # XXX: mdmon really needs to run as non-root?
-- 
1.6.2.5


0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch:
 90crypt/install  |    2 +-
 90dmraid/install |    2 +-
 90lvm/install    |    2 +-
 90mdraid/install |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch ---
>From e4dec3d6b66ad6cc3c5b0646459c4ba2db1808b7 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 3 Sep 2009 17:11:57 +0200
Subject: [PATCH 6/6] {crypt,dmraid,lvm,mdraid}: cleanup with pre-pivot 30 and 31

---
 modules.d/90crypt/install  |    2 +-
 modules.d/90dmraid/install |    2 +-
 modules.d/90lvm/install    |    2 +-
 modules.d/90mdraid/install |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules.d/90crypt/install b/modules.d/90crypt/install
index 5108fef..b15440c 100755
--- a/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@ -4,4 +4,4 @@ inst_rules "$moddir/70-luks.rules"
 inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
 inst_hook cmdline 30 "$moddir/parse-crypt.sh"
 inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/crypt-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/crypt-cleanup.sh"
diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 704728b..b66257c 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -4,4 +4,4 @@ inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 inst_rules 64-md-raid.rules
 inst_rules "$moddir/61-dmraid-imsm.rules"
 inst_hook pre-pivot 30 "$moddir/dmraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/dmraid-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/dmraid-cleanup.sh"
diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
index eb27159..ad4d2e2 100755
--- a/modules.d/90lvm/install
+++ b/modules.d/90lvm/install
@@ -13,4 +13,4 @@ fi
 inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
 inst_hook cmdline 30 "$moddir/parse-lvm.sh"
 inst_hook pre-pivot 30 "$moddir/lvm-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/lvm-cleanup.sh"
\ No newline at end of file
+inst_hook pre-pivot 31 "$moddir/lvm-cleanup.sh"
\ No newline at end of file
diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 497e5b0..71c313b 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -34,4 +34,4 @@ fi
 inst "$moddir/mdraid_start.sh" /sbin/mdraid_start
 inst_hook pre-trigger 30 "$moddir/parse-md.sh"
 inst_hook pre-pivot 30 "$moddir/mdraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/mdraid-cleanup.sh"
\ No newline at end of file
+inst_hook pre-pivot 31 "$moddir/mdraid-cleanup.sh"
-- 
1.6.2.5



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- dracut.spec	2 Sep 2009 13:58:47 -0000	1.18
+++ dracut.spec	3 Sep 2009 15:32:41 -0000	1.19
@@ -13,12 +13,17 @@
 
 Name: dracut
 Version: 001
-Release: 1%{?rdist}
+Release: 2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
+
+Patch1: 0005-mdraid-add-grep-for-convenience.patch
+Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
+
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
@@ -102,11 +107,12 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1 
+%patch2 -p1 
 
 %build
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
@@ -179,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Sep 03 2009 Harald Hoyer <harald at redhat.com> 001-2
+- fixed missing grep for md
+- reorder cleanup
+
 * Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
 - version 001
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS



From acme at fedoraproject.org  Thu Sep  3 15:35:18 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Thu,  3 Sep 2009 15:35:18 +0000 (UTC)
Subject: rpms/tuna/F-11 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 tuna.spec, 1.1,
	1.2
Message-ID: <20090903153518.DD22D11C0099@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/tuna/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25304

Modified Files:
	.cvsignore sources tuna.spec 
Log Message:
New upstream release: 0.9.1

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:50:12 -0000	1.1
+++ .cvsignore	3 Sep 2009 15:35:18 -0000	1.2
@@ -0,0 +1 @@
+tuna-0.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2009 22:00:12 -0000	1.2
+++ sources	3 Sep 2009 15:35:18 -0000	1.3
@@ -1 +1 @@
-9ac2cb3ebe2c0098b683f3481c11f8f8  tuna-0.9.tar.bz2
+2f0fda8d3db2163283f3edda5a39ef98  tuna-0.9.1.tar.bz2


Index: tuna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-11/tuna.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tuna.spec	31 Aug 2009 21:59:23 -0000	1.1
+++ tuna.spec	3 Sep 2009 15:35:18 -0000	1.2
@@ -2,8 +2,8 @@
 %{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name: tuna
-Version: 0.9
-Release: 3%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
 License: GPLv2
 Summary: Application tuning GUI & command line utility
 Group: Applications/System
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %doc docs/oscilloscope+tuna.pdf
 
 %changelog
+* Thu Sep 03 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9.1-1
+- New upstream release
+
 * Wed Aug 26 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-3
 - Rewrite the oscilloscope package summary
 - Remove the shebang in tuna/oscilloscope.py



From acme at fedoraproject.org  Thu Sep  3 15:37:08 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Thu,  3 Sep 2009 15:37:08 +0000 (UTC)
Subject: rpms/tuna/F-12 sources,1.2,1.3 tuna.spec,1.1,1.2
Message-ID: <20090903153708.3115211C0099@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/tuna/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26676

Modified Files:
	sources tuna.spec 
Log Message:
New upstream release: 0.9.1

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2009 21:49:33 -0000	1.2
+++ sources	3 Sep 2009 15:37:07 -0000	1.3
@@ -1 +1 @@
-9ac2cb3ebe2c0098b683f3481c11f8f8  tuna-0.9.tar.bz2
+2f0fda8d3db2163283f3edda5a39ef98  tuna-0.9.1.tar.bz2


Index: tuna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-12/tuna.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tuna.spec	31 Aug 2009 21:49:33 -0000	1.1
+++ tuna.spec	3 Sep 2009 15:37:07 -0000	1.2
@@ -2,8 +2,8 @@
 %{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name: tuna
-Version: 0.9
-Release: 3%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
 License: GPLv2
 Summary: Application tuning GUI & command line utility
 Group: Applications/System
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %doc docs/oscilloscope+tuna.pdf
 
 %changelog
+* Thu Sep 03 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9.1-1
+- New upstream release
+
 * Wed Aug 26 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-3
 - Rewrite the oscilloscope package summary
 - Remove the shebang in tuna/oscilloscope.py



From crobinso at fedoraproject.org  Thu Sep  3 15:54:48 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Sep 2009 15:54:48 +0000 (UTC)
Subject: rpms/gnome-applet-vm/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE gnome-applet-vm-0.2.0-gnome-libs.patch, 1.2,
	NONE gnome-applet-vm.spec, 1.26, NONE sources, 1.10, NONE
Message-ID: <20090903155448.59EB211C0099@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/gnome-applet-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30468

Added Files:
	dead.package 
Removed Files:
	Makefile gnome-applet-vm-0.2.0-gnome-libs.patch 
	gnome-applet-vm.spec sources 
Log Message:
Mark package as dead in devel branch. Upstream is dead, virt-manager now
has similar functionality.



--- NEW FILE dead.package ---
Dead upstream, largely obsoleted by virt-manager 0.8.0.


--- Makefile DELETED ---


--- gnome-applet-vm-0.2.0-gnome-libs.patch DELETED ---


--- gnome-applet-vm.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Thu Sep  3 15:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:55:22 +0000
Subject: [pkgdb] kernel: michich has requested watchcommits
Message-ID: <20090903155522.8A4CC10F87F@bastion2.fedora.phx.redhat.com>

michich has requested the watchcommits acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From crobinso at fedoraproject.org  Thu Sep  3 15:55:27 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Sep 2009 15:55:27 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.103,1.104 comps-f13.xml.in,1.2,1.3
Message-ID: <20090903155527.5F0BD11C0099@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30726

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
gnome-applet-vm is dead, remove it from F12 + F13



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- comps-f12.xml.in	2 Sep 2009 17:15:54 -0000	1.103
+++ comps-f12.xml.in	3 Sep 2009 15:55:27 -0000	1.104
@@ -5812,7 +5812,6 @@
       <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
-      <packagereq type="optional">gnome-applet-vm</packagereq>
       <packagereq type="optional">virt-top</packagereq>
     </packagelist>
   </group>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- comps-f13.xml.in	31 Aug 2009 18:59:30 -0000	1.2
+++ comps-f13.xml.in	3 Sep 2009 15:55:27 -0000	1.3
@@ -5811,7 +5811,6 @@
       <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
-      <packagereq type="optional">gnome-applet-vm</packagereq>
       <packagereq type="optional">virt-top</packagereq>
     </packagelist>
   </group>



From pkgdb at fedoraproject.org  Thu Sep  3 15:55:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 15:55:26 +0000
Subject: [pkgdb] kernel: michich has requested commit
Message-ID: <20090903155527.38C2110F897@bastion2.fedora.phx.redhat.com>

michich has requested the commit acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From thm at fedoraproject.org  Thu Sep  3 15:57:38 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  3 Sep 2009 15:57:38 +0000 (UTC)
Subject: rpms/python-markdown2/devel markdown2-old-pygments.patch, NONE,
	1.1 import.log, 1.5, 1.6 python-markdown2.spec, 1.8, 1.9
Message-ID: <20090903155738.56FE611C0099@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31411/devel

Modified Files:
	import.log python-markdown2.spec 
Added Files:
	markdown2-old-pygments.patch 
Log Message:
Patch syntax_color test case for older pygments version on rhel.

markdown2-old-pygments.patch:
 syntax_color.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE markdown2-old-pygments.patch ---
diff -up markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig markdown2-1.0.1.13/test/tm-cases/syntax_color.html
--- markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig	2009-04-07 16:39:22.000000000 +0200
+++ markdown2-1.0.1.13/test/tm-cases/syntax_color.html	2009-09-02 22:19:38.000000000 +0200
@@ -1,6 +1,6 @@
 <p>Here is some sample code:</p>
 
-<div class="codehilite"><pre><code><span class="kn">import</span> <span class="nn">sys</span>
+<div class="codehilite"><pre><code><span class="k">import</span> <span class="nn">sys</span>
 <span class="k">def</span> <span class="nf">main</span><span class="p">(</span><span class="n">argv</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">):</span>
     <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">()</span>
     <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&#39;hi&#39;</span><span class="p">)</span>


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	11 Jul 2009 15:48:54 -0000	1.5
+++ import.log	3 Sep 2009 15:57:38 -0000	1.6
@@ -3,3 +3,4 @@ python-markdown2-1_0_1_8-1_fc9:HEAD:pyth
 python-markdown2-1_0_1_9-1_fc9:HEAD:python-markdown2-1.0.1.9-1.fc9.src.rpm:1221203243
 python-markdown2-1_0_1_11-1_fc9:HEAD:python-markdown2-1.0.1.11-1.fc9.src.rpm:1222984575
 python-markdown2-1_0_1_13-1_fc11:HEAD:python-markdown2-1.0.1.13-1.fc11.src.rpm:1247327308
+python-markdown2-1_0_1_13-3_fc11:HEAD:python-markdown2-1.0.1.13-3.fc11.src.rpm:1251993409


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/python-markdown2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-markdown2.spec	26 Jul 2009 20:38:32 -0000	1.8
+++ python-markdown2.spec	3 Sep 2009 15:57:38 -0000	1.9
@@ -4,12 +4,14 @@
 
 Name:           python-%{srcname}
 Version:        1.0.1.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/python-%{srcname}/
 Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.zip
+# needed on rhel with python-pygments 0.9
+Patch0:         markdown2-old-pygments.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -30,6 +32,9 @@ http://daringfireball.net/projects/markd
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 
 %build
@@ -63,6 +68,9 @@ cd test
 
 
 %changelog
+* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
+- Patch syntax_color test case for older pygments version on rhel.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thm at fedoraproject.org  Thu Sep  3 16:04:27 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  3 Sep 2009 16:04:27 +0000 (UTC)
Subject: rpms/python-markdown2/EL-5 markdown2-old-pygments.patch, NONE,
	1.1 import.log, 1.5, 1.6 python-markdown2.spec, 1.8, 1.9
Message-ID: <20090903160427.6581111C0099@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv634/EL-5

Modified Files:
	import.log python-markdown2.spec 
Added Files:
	markdown2-old-pygments.patch 
Log Message:
Patch syntax_color test case for older pygments version on rhel.

markdown2-old-pygments.patch:
 syntax_color.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE markdown2-old-pygments.patch ---
diff -up markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig markdown2-1.0.1.13/test/tm-cases/syntax_color.html
--- markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig	2009-04-07 16:39:22.000000000 +0200
+++ markdown2-1.0.1.13/test/tm-cases/syntax_color.html	2009-09-02 22:19:38.000000000 +0200
@@ -1,6 +1,6 @@
 <p>Here is some sample code:</p>
 
-<div class="codehilite"><pre><code><span class="kn">import</span> <span class="nn">sys</span>
+<div class="codehilite"><pre><code><span class="k">import</span> <span class="nn">sys</span>
 <span class="k">def</span> <span class="nf">main</span><span class="p">(</span><span class="n">argv</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">):</span>
     <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">()</span>
     <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&#39;hi&#39;</span><span class="p">)</span>


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	11 Jul 2009 15:48:54 -0000	1.5
+++ import.log	3 Sep 2009 16:04:27 -0000	1.6
@@ -3,3 +3,4 @@ python-markdown2-1_0_1_8-1_fc9:HEAD:pyth
 python-markdown2-1_0_1_9-1_fc9:HEAD:python-markdown2-1.0.1.9-1.fc9.src.rpm:1221203243
 python-markdown2-1_0_1_11-1_fc9:HEAD:python-markdown2-1.0.1.11-1.fc9.src.rpm:1222984575
 python-markdown2-1_0_1_13-1_fc11:HEAD:python-markdown2-1.0.1.13-1.fc11.src.rpm:1247327308
+python-markdown2-1_0_1_13-3_fc11:EL-5:python-markdown2-1.0.1.13-3.fc11.src.rpm:1251993836


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/python-markdown2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-markdown2.spec	26 Jul 2009 20:38:32 -0000	1.8
+++ python-markdown2.spec	3 Sep 2009 16:04:27 -0000	1.9
@@ -4,12 +4,14 @@
 
 Name:           python-%{srcname}
 Version:        1.0.1.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/python-%{srcname}/
 Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.zip
+# needed on rhel with python-pygments 0.9
+Patch0:         markdown2-old-pygments.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -30,6 +32,9 @@ http://daringfireball.net/projects/markd
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 
 %build
@@ -63,6 +68,9 @@ cd test
 
 
 %changelog
+* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
+- Patch syntax_color test case for older pygments version on rhel.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Thu Sep  3 16:18:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Sep 2009 16:18:28 +0000 (UTC)
Subject: rpms/perl/F-12 perl-update-Module-Pluggable.patch, NONE,
	1.1 perl-update-Test-Simple.patch, 1.1, 1.2 perl.spec, 1.231, 1.232
Message-ID: <20090903161828.3040D11C0099@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4589

Modified Files:
	perl-update-Test-Simple.patch perl.spec 
Added Files:
	perl-update-Module-Pluggable.patch 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
- update Module-Pluggable to 3.9

perl-update-Module-Pluggable.patch:
 MANIFEST                                            |   11 +
 lib/Devel/InnerPackage.pm                           |    4 
 lib/Module/Pluggable.pm                             |   15 +-
 lib/Module/Pluggable/Object.pm                      |  134 +++++++++++++-------
 t/Module_Pluggable/02alsoworks.t                    |    2 
 t/Module_Pluggable/02works.t                        |    2 
 t/Module_Pluggable/03diffname.t                     |    2 
 t/Module_Pluggable/04acmedir.t                      |    2 
 t/Module_Pluggable/04acmedir_single.t               |    2 
 t/Module_Pluggable/04acmepath.t                     |    2 
 t/Module_Pluggable/04acmepath_single.t              |    2 
 t/Module_Pluggable/05postpath.t                     |    2 
 t/Module_Pluggable/06multipath.t                    |    2 
 t/Module_Pluggable/07instantiate.t                  |    4 
 t/Module_Pluggable/08nothing.t                      |    2 
 t/Module_Pluggable/09require.t                      |    2 
 t/Module_Pluggable/10innerpack.t                    |    2 
 t/Module_Pluggable/10innerpack_inner.t              |    2 
 t/Module_Pluggable/10innerpack_noinner.t            |    2 
 t/Module_Pluggable/10innerpack_onefile.t            |   27 ++++
 t/Module_Pluggable/10innerpack_override.t           |    2 
 t/Module_Pluggable/10innerpack_super.t              |   29 ++++
 t/Module_Pluggable/11usetwice.t                     |    2 
 t/Module_Pluggable/12only.t                         |    2 
 t/Module_Pluggable/12onlyarray.t                    |    2 
 t/Module_Pluggable/12onlyregex.t                    |    2 
 t/Module_Pluggable/12onlyrequire.t                  |   21 +++
 t/Module_Pluggable/13except.t                       |    2 
 t/Module_Pluggable/13exceptarray.t                  |    4 
 t/Module_Pluggable/13exceptregex.t                  |    4 
 t/Module_Pluggable/14package.t                      |    2 
 t/Module_Pluggable/15topicsafe.t                    |    2 
 t/Module_Pluggable/16different_extension.t          |    2 
 t/Module_Pluggable/17devel_inner_package.t          |    2 
 t/Module_Pluggable/18skipped_package.t              |    2 
 t/Module_Pluggable/19can_ok_clobber.t               |    2 
 t/Module_Pluggable/20dodgy_files.t                  |   16 +-
 t/Module_Pluggable/21editor_junk.t                  |   53 +++++++
 t/Module_Pluggable/lib/Acme/Foo-Bar.pm              |    6 
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm     |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~    |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm     |    9 +
 44 files changed, 344 insertions(+), 81 deletions(-)

--- NEW FILE perl-update-Module-Pluggable.patch ---
This patch is derived from the perl-5.10.1 tarball as released on the CPAN.

diff -urN perl-5.10.0.orig/lib/Devel/InnerPackage.pm perl-5.10.0/lib/Devel/InnerPackage.pm
--- perl-5.10.0.orig/lib/Devel/InnerPackage.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Devel/InnerPackage.pm	2009-08-31 19:47:24.444773931 -0700
@@ -17,7 +17,7 @@
 =head1 SYNOPSIS
 
     use Foo::Bar;
-    use Devel::innerPackage qw(list_packages);
+    use Devel::InnerPackage qw(list_packages);
 
     my @inner_packages = list_packages('Foo::Bar');
 
@@ -75,7 +75,7 @@
                     !__PACKAGE__->_loaded($pack.$cand); # or @children;
                 push @packs, @children;
             }
-            return grep {$_ !~ /::::ISA::CACHE/} @packs;
+            return grep {$_ !~ /::(::ISA::CACHE|SUPER)/} @packs;
 }
 
 ### XXX this is an inlining of the Class-Inspector->loaded()
diff -urN perl-5.10.0.orig/lib/Module/Pluggable/Object.pm perl-5.10.0/lib/Module/Pluggable/Object.pm
--- perl-5.10.0.orig/lib/Module/Pluggable/Object.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable/Object.pm	2009-08-31 19:47:24.446771196 -0700
@@ -6,10 +6,9 @@
 use File::Spec::Functions qw(splitdir catdir curdir catfile abs2rel);
 use Carp qw(croak carp);
 use Devel::InnerPackage;
-use Data::Dumper;
 use vars qw($VERSION);
 
-$VERSION = '3.6';
+$VERSION = '3.9';
 
 
 sub new {
@@ -20,6 +19,10 @@
 
 }
 
+### Eugggh, this code smells 
+### This is what happens when you keep adding patches
+### *sigh*
+
 
 sub plugins {
         my $self = shift;
@@ -30,14 +33,14 @@
         my $filename   = $self->{'filename'};
         my $pkg        = $self->{'package'};
 
+        # Get the exception params instantiated
+        $self->_setup_exceptions;
+
         # automatically turn a scalar search path or namespace into a arrayref
         for (qw(search_path search_dirs)) {
             $self->{$_} = [ $self->{$_} ] if exists $self->{$_} && !ref($self->{$_});
         }
 
-
-
-
         # default search path is '<Module>::<Name>::Plugin'
         $self->{'search_path'} = ["${pkg}::Plugin"] unless $self->{'search_path'}; 
 
@@ -46,13 +49,14 @@
 
 
         # check to see if we're running under test
-        my @SEARCHDIR = exists $INC{"blib.pm"} && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
+        my @SEARCHDIR = exists $INC{"blib.pm"} && defined $filename && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
 
         # add any search_dir params
         unshift @SEARCHDIR, @{$self->{'search_dirs'}} if defined $self->{'search_dirs'};
 
 
         my @plugins = $self->search_directories(@SEARCHDIR);
+        push(@plugins, $self->handle_innerpackages($_)) for @{$self->{'search_path'}};
 
         # push @plugins, map { print STDERR "$_\n"; $_->require } list_packages($_) for (@{$self->{'search_path'}});
         
@@ -60,43 +64,12 @@
         return () unless @plugins;
 
 
-        # exceptions
-        my %only;   
-        my %except; 
-        my $only;
-        my $except;
-
-        if (defined $self->{'only'}) {
-            if (ref($self->{'only'}) eq 'ARRAY') {
-                %only   = map { $_ => 1 } @{$self->{'only'}};
-            } elsif (ref($self->{'only'}) eq 'Regexp') {
-                $only = $self->{'only'}
-            } elsif (ref($self->{'only'}) eq '') {
-                $only{$self->{'only'}} = 1;
-            }
-        }
-        
-
-        if (defined $self->{'except'}) {
-            if (ref($self->{'except'}) eq 'ARRAY') {
-                %except   = map { $_ => 1 } @{$self->{'except'}};
-            } elsif (ref($self->{'except'}) eq 'Regexp') {
-                $except = $self->{'except'}
-            } elsif (ref($self->{'except'}) eq '') {
-                $except{$self->{'except'}} = 1;
-            }
-        }
-
 
         # remove duplicates
         # probably not necessary but hey ho
         my %plugins;
         for(@plugins) {
-            next if (keys %only   && !$only{$_}     );
-            next unless (!defined $only || m!$only! );
-
-            next if (keys %except &&  $except{$_}   );
-            next if (defined $except &&  m!$except! );
+            next unless $self->_is_legit($_);
             $plugins{$_} = 1;
         }
 
@@ -112,6 +85,58 @@
 
 }
 
+sub _setup_exceptions {
+    my $self = shift;
+
+    my %only;   
+    my %except; 
+    my $only;
+    my $except;
+
+    if (defined $self->{'only'}) {
+        if (ref($self->{'only'}) eq 'ARRAY') {
+            %only   = map { $_ => 1 } @{$self->{'only'}};
+        } elsif (ref($self->{'only'}) eq 'Regexp') {
+            $only = $self->{'only'}
+        } elsif (ref($self->{'only'}) eq '') {
+            $only{$self->{'only'}} = 1;
+        }
+    }
+        
+
+    if (defined $self->{'except'}) {
+        if (ref($self->{'except'}) eq 'ARRAY') {
+            %except   = map { $_ => 1 } @{$self->{'except'}};
+        } elsif (ref($self->{'except'}) eq 'Regexp') {
+            $except = $self->{'except'}
+        } elsif (ref($self->{'except'}) eq '') {
+            $except{$self->{'except'}} = 1;
+        }
+    }
+    $self->{_exceptions}->{only_hash}   = \%only;
+    $self->{_exceptions}->{only}        = $only;
+    $self->{_exceptions}->{except_hash} = \%except;
+    $self->{_exceptions}->{except}      = $except;
+        
+}
+
+sub _is_legit {
+    my $self   = shift;
+    my $plugin = shift;
+    my %only   = %{$self->{_exceptions}->{only_hash}||{}};
+    my %except = %{$self->{_exceptions}->{except_hash}||{}};
+    my $only   = $self->{_exceptions}->{only};
+    my $except = $self->{_exceptions}->{except};
+
+    return 0 if     (keys %only   && !$only{$plugin}     );
+    return 0 unless (!defined $only || $plugin =~ m!$only!     );
+
+    return 0 if     (keys %except &&  $except{$plugin}   );
+    return 0 if     (defined $except &&  $plugin =~ m!$except! );
+
+    return 1;
+}
+
 sub search_directories {
     my $self      = shift;
     my @SEARCHDIR = @_;
@@ -121,7 +146,6 @@
     foreach my $dir (@SEARCHDIR) {
         push @plugins, $self->search_paths($dir);
     }
-
     return @plugins;
 }
 
@@ -151,6 +175,8 @@
             # parse the file to get the name
             my ($name, $directory, $suffix) = fileparse($file, $file_regex);
 
+            next if (!$self->{include_editor_junk} && $self->_is_editor_junk($name));
+
             $directory = abs2rel($directory, $sp);
 
             # If we have a mixed-case package name, assume case has been preserved
@@ -203,17 +229,34 @@
         # now add stuff that may have been in package
         # NOTE we should probably use all the stuff we've been given already
         # but then we can't unload it :(
-        push @plugins, $self->handle_innerpackages($searchpath) unless (exists $self->{inner} && !$self->{inner});
+        push @plugins, $self->handle_innerpackages($searchpath);
     } # foreach $searchpath
 
     return @plugins;
 }
 
+sub _is_editor_junk {
+    my $self = shift;
+    my $name = shift;
+
+    # Emacs (and other Unix-y editors) leave temp files ending in a
+    # tilde as a backup.
+    return 1 if $name =~ /~$/;
+    # Emacs makes these files while a buffer is edited but not yet
+    # saved.
+    return 1 if $name =~ /^\.#/;
+    # Vim can leave these files behind if it crashes.
+    return 1 if $name =~ /\.sw[po]$/;
+
+    return 0;
+}
+
 sub handle_finding_plugin {
     my $self   = shift;
     my $plugin = shift;
 
     return unless (defined $self->{'instantiate'} || $self->{'require'}); 
+    return unless $self->_is_legit($plugin);
     $self->_require($plugin);
 }
 
@@ -245,10 +288,11 @@
 
 sub handle_innerpackages {
     my $self = shift;
+    return () if (exists $self->{inner} && !$self->{inner});
+
     my $path = shift;
     my @plugins;
 
-
     foreach my $plugin (Devel::InnerPackage::list_packages($path)) {
         my $err = $self->handle_finding_plugin($plugin);
         #next if $err;
@@ -299,6 +343,14 @@
 
 Optionally it instantiates those classes for you.
 
+This object is wrapped by C<Module::Pluggable>. If you want to do something
+odd or add non-general special features you're probably best to wrap this
+and produce your own subclass.
+
+=head1 OPTIONS
+
+See the C<Module::Pluggable> docs.
+
 =head1 AUTHOR
 
 Simon Wistow <simon at thegestalt.org>
diff -urN perl-5.10.0.orig/lib/Module/Pluggable.pm perl-5.10.0/lib/Module/Pluggable.pm
--- perl-5.10.0.orig/lib/Module/Pluggable.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable.pm	2009-08-31 19:47:24.448771465 -0700
@@ -9,7 +9,7 @@
 # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
 
 
-$VERSION = '3.6';
+$VERSION = '3.9';
 
 sub import {
     my $class        = shift;
@@ -60,8 +60,9 @@
 
 
     no strict 'refs';
-    no warnings 'redefine';
-    *{"$package\::$sub"}    = $subroutine;
+    no warnings qw(redefine prototype);
+    
+    *{"$package\::$sub"}        = $subroutine;
     *{"$package\::search_path"} = $searchsub;
     *{"$package\::only"}        = $onlysub;
     *{"$package\::except"}      = $exceptsub;
@@ -297,6 +298,14 @@
 
     file_regex => qr/\.plugin$/
 
+=head2 include_editor_junk
+
+By default C<Module::Pluggable> ignores files that look like they were
+left behind by editors. Currently this means files ending in F<~> (~),
+the extensions F<.swp> or F<.swo>, or files beginning with F<.#>.
+
+Setting C<include_editor_junk> changes C<Module::Pluggable> so it does
+not ignore any files it finds.
 
 
 =head1 METHODs
diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/MANIFEST	2009-08-31 19:47:24.452770885 -0700
@@ -3612,11 +3612,14 @@
 t/Module_Pluggable/09require.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_inner.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_noinner.t	Module::Pluggable tests
+t/Module_Pluggable/10innerpack_onefile.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_override.t	Module::Pluggable tests
+t/Module_Pluggable/10innerpack_super.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack.t	Module::Pluggable tests
 t/Module_Pluggable/11usetwice.t	Module::Pluggable tests
 t/Module_Pluggable/12onlyarray.t	Module::Pluggable tests
 t/Module_Pluggable/12onlyregex.t	Module::Pluggable tests
+t/Module_Pluggable/12onlyrequire.t	Module::Pluggable tests
 t/Module_Pluggable/12only.t	Module::Pluggable tests
 t/Module_Pluggable/13exceptarray.t	Module::Pluggable tests
 t/Module_Pluggable/13exceptregex.t	Module::Pluggable tests
@@ -3628,8 +3631,15 @@
 t/Module_Pluggable/18skipped_package.t	Module::Pluggable tests
 t/Module_Pluggable/19can_ok_clobber.t	Module::Pluggable tests
 t/Module_Pluggable/20dodgy_files.t	Module::Pluggable tests
+t/Module_Pluggable/21editor_junk.t	Module::Pluggable tests
 t/Module_Pluggable/acme/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/Acme/Foo-Bar.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Bar.plugin	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Foo.plugin	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Quux/Foo.plugin	Module::Pluggable tests
@@ -3646,6 +3656,7 @@
 t/Module_Pluggable/lib/OddTest/Plugin/-Dodgy.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/OddTest/Plugin/Foo.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/TA/C/A/I.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/Zot/.Zork.pm	Module::Pluggable tests
 t/mro/basic_01_c3.t		mro tests
 t/mro/basic_01_dfs.t		mro tests
 t/mro/basic_02_c3.t		mro tests
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t perl-5.10.0/t/Module_Pluggable/02alsoworks.t
--- perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02alsoworks.t	2009-08-31 19:47:24.454770805 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02works.t perl-5.10.0/t/Module_Pluggable/02works.t
--- perl-5.10.0.orig/t/Module_Pluggable/02works.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02works.t	2009-08-31 19:47:24.455771358 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/03diffname.t perl-5.10.0/t/Module_Pluggable/03diffname.t
--- perl-5.10.0.orig/t/Module_Pluggable/03diffname.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/03diffname.t	2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t perl-5.10.0/t/Module_Pluggable/04acmedir_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir_single.t	2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t perl-5.10.0/t/Module_Pluggable/04acmedir.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir.t	2009-08-31 19:47:24.457771627 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t perl-5.10.0/t/Module_Pluggable/04acmepath_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath_single.t	2009-08-31 19:47:24.458773508 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t perl-5.10.0/t/Module_Pluggable/04acmepath.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath.t	2009-08-31 19:47:24.459772105 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/05postpath.t perl-5.10.0/t/Module_Pluggable/05postpath.t
--- perl-5.10.0.orig/t/Module_Pluggable/05postpath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/05postpath.t	2009-08-31 19:47:24.460771332 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/06multipath.t perl-5.10.0/t/Module_Pluggable/06multipath.t
--- perl-5.10.0.orig/t/Module_Pluggable/06multipath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/06multipath.t	2009-08-31 19:47:24.461771676 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t perl-5.10.0/t/Module_Pluggable/07instantiate.t
--- perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/07instantiate.t	2009-08-31 19:47:24.462772090 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 6;
 
 my $foo;
@@ -26,7 +26,7 @@
 use File::Spec::Functions qw(catdir);
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'booga', instantiate => 'new');
 use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'wooga', instantiate => 'nosomuchmethod');
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/08nothing.t perl-5.10.0/t/Module_Pluggable/08nothing.t
--- perl-5.10.0.orig/t/Module_Pluggable/08nothing.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/08nothing.t	2009-08-31 19:47:24.463771316 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 2;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/09require.t perl-5.10.0/t/Module_Pluggable/09require.t
--- perl-5.10.0.orig/t/Module_Pluggable/09require.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/09require.t	2009-08-31 19:47:24.464771800 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 2;
 
 my $t = MyTest->new();
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t	2009-08-31 19:47:24.465771515 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t	2009-08-31 19:47:24.479772629 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t	2009-08-31 19:47:24.480772134 -0700
@@ -0,0 +1,27 @@
+#!perl -wT
+
+use strict;
+use Test::More tests => 2;
+use Data::Dumper;
+
+my $mc  = MyClass->new();
+my $mc2 = MyClass2->new();
+
+
+is_deeply([$mc->plugins],  [qw(MyClass::Plugin::MyPlugin)], "Got inner plugin");
+is_deeply([$mc2->plugins], [],                              "Didn't get plugin");
+
+package MyClass::Plugin::MyPlugin;
+sub pretty { print "I am pretty" };
+
+package MyClass;
+use Module::Pluggable inner => 1;
+
+sub new { return bless {}, $_[0] }
+
+package MyClass2;
+use Module::Pluggable search_path => "MyClass::Plugin", inner => 0;
+
+sub new { return bless {}, $_[0] }
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t perl-5.10.0/t/Module_Pluggable/10innerpack_override.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_override.t	2009-08-31 19:47:24.481771501 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t perl-5.10.0/t/Module_Pluggable/10innerpack_super.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_super.t	2009-08-31 19:47:24.482771565 -0700
@@ -0,0 +1,29 @@
+#!perl -wT
+
+use Test::More tests => 3;
+use strict;
+use_ok('Devel::InnerPackage');
+Bar->whee;
+is_deeply([Devel::InnerPackage::list_packages("Bar")],[], "Don't pick up ::SUPER pseudo stash"); 
+is_deeply([Devel::InnerPackage::list_packages("Foo")],['Foo::Bar'], "Still pick up other inner package");
+
+package Foo;
+
+sub whee {
+    1;
+}
+
+package Foo::Bar;
+
+sub whee {}
+
+package Bar;
+use base 'Foo';
+
+sub whee {
+    shift->SUPER::whee;
+    2;
+}
+
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t perl-5.10.0/t/Module_Pluggable/10innerpack.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack.t	2009-08-31 19:47:24.483771909 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 4;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t perl-5.10.0/t/Module_Pluggable/11usetwice.t
--- perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/11usetwice.t	2009-08-31 19:47:24.484771624 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t perl-5.10.0/t/Module_Pluggable/12onlyarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyarray.t	2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t perl-5.10.0/t/Module_Pluggable/12onlyregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyregex.t	2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t perl-5.10.0/t/Module_Pluggable/12onlyrequire.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyrequire.t	2009-08-31 19:47:24.505021273 -0700
@@ -0,0 +1,21 @@
+#!perl -w
+use strict;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Test::More tests => 2;
+
+my @packages = eval { Zot->_dist_types };
+is($@, '',                "No warnings");
+is(scalar(@packages), 0,  "Correctly only got 1 package");
+
+
+package Zot;
+use strict;
+use Module::Pluggable (
+        sub_name => '_dist_types',
+        search_path => __PACKAGE__,
+        only => qr/Zot::\w+$/,
+        require => 1,
+    );
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12only.t perl-5.10.0/t/Module_Pluggable/12only.t
--- perl-5.10.0.orig/t/Module_Pluggable/12only.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12only.t	2009-08-31 19:47:24.506022385 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t perl-5.10.0/t/Module_Pluggable/13exceptarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptarray.t	2009-08-31 19:47:24.507021263 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t perl-5.10.0/t/Module_Pluggable/13exceptregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptregex.t	2009-08-31 19:47:24.510021945 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13except.t perl-5.10.0/t/Module_Pluggable/13except.t
--- perl-5.10.0.orig/t/Module_Pluggable/13except.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13except.t	2009-08-31 19:47:24.511021381 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/14package.t perl-5.10.0/t/Module_Pluggable/14package.t
--- perl-5.10.0.orig/t/Module_Pluggable/14package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/14package.t	2009-08-31 19:47:24.842414378 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t perl-5.10.0/t/Module_Pluggable/15topicsafe.t
--- perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/15topicsafe.t	2009-08-31 19:47:24.842774343 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More 'no_plan';
 
 use Module::Pluggable search_path => 'Acme::MyTest';
diff -urN perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t perl-5.10.0/t/Module_Pluggable/16different_extension.t
--- perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/16different_extension.t	2009-08-31 19:47:24.843800947 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t	2009-08-31 19:47:24.843800947 -0700
@@ -3,7 +3,7 @@
 
 use Devel::InnerPackage qw(list_packages);
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 my @packages;
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t perl-5.10.0/t/Module_Pluggable/18skipped_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/18skipped_package.t	2009-08-31 19:47:24.844780129 -0700
@@ -2,7 +2,7 @@
 
 use Test::More tests => 1;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 use Devel::InnerPackage qw(list_packages);
 use No::Middle;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t
--- perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t	2009-08-31 19:47:24.844780129 -0700
@@ -3,7 +3,7 @@
 use warnings;
 use Data::Dumper;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 use Test::More tests=>5;
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t perl-5.10.0/t/Module_Pluggable/20dodgy_files.t
--- perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/20dodgy_files.t	2009-08-31 19:47:24.845769158 -0700
@@ -1,7 +1,7 @@
 #!perl -w
 
 BEGIN {
-    if ($^O eq 'VMS') {
+    if ($^O eq 'VMS' || $^O eq 'VOS') {
         print "1..0 # Skip: can't handle misspelled plugin names\n";
         exit;
     }
@@ -9,8 +9,18 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
-use Test::More tests => 5;
+use Test::More;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use File::Spec::Functions qw(catfile);
+
+
+my ($dodgy_file) = (catfile($FindBin::Bin, "lib", "OddTest", "Plugin", "-Dodgy.pm")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+        plan skip_all => "Can't handle misspelled plugin names\n";
+} else {
+        plan tests => 5;
+}
+
 
 my $foo;
 ok($foo = OddTest->new());
diff -urN perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t perl-5.10.0/t/Module_Pluggable/21editor_junk.t
--- perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/21editor_junk.t	2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,53 @@
+#!perl -w
+
+use Test::More;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Module::Pluggable::Object;
+use File::Spec::Functions qw(catfile);
+
+my ($dodgy_file) = (catfile($FindBin::Bin,"lib", "EditorJunk", "Plugin", "#Bar.pm#")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+        plan skip_all => "Can't handle plugin names with octothorpes\n";
+} else {
+        plan tests => 4;
+}
+
+
+
+my $foo;
+ok($foo = EditorJunk->new());
+
+my @plugins;
+my @expected = qw(EditorJunk::Plugin::Bar EditorJunk::Plugin::Foo);
+ok(@plugins = sort $foo->plugins);
+
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+my $mpo = Module::Pluggable::Object->new(
+    package             => 'EditorJunk',
+    filename            => __FILE__,
+    include_editor_junk => 1,
+);
+
+ at expected = ('EditorJunk::Plugin::.#Bar', 'EditorJunk::Plugin::Bar', 'EditorJunk::Plugin::Foo');
+ at plugins = sort $mpo->plugins();
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+
+package EditorJunk;
+
+use strict;
+use Module::Pluggable;
+
+
+sub new {
+    my $class = shift;
+    return bless {}, $class;
+
+}
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,6 @@
+package Acme::FooBar;
+
+our $quux = "hello";
+
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	2009-08-31 19:47:24.846769084 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	2009-08-31 19:47:24.851770803 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	2009-08-31 19:47:24.852771985 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	2009-08-31 19:47:24.853771770 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	2009-08-31 19:47:24.854771835 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Foo;
+
+
+use strict;
+
+
+1;
+
+

perl-update-Test-Simple.patch:
 MANIFEST                                              |   25 
 lib/Test/Builder.pm                                   | 1430 +++++++++++-------
 lib/Test/Builder/Module.pm                            |   39 
 lib/Test/Builder/Tester.pm                            |  249 +--
 lib/Test/Builder/Tester/Color.pm                      |    5 
 lib/Test/More.pm                                      |  592 ++++---
 lib/Test/Simple.pm                                    |   38 
 lib/Test/Simple/Changes                               |  226 ++
 lib/Test/Simple/README                                |    7 
 lib/Test/Simple/t/BEGIN_require_ok.t                  |   27 
 lib/Test/Simple/t/BEGIN_use_ok.t                      |   26 
 lib/Test/Simple/t/More.t                              |    9 
 lib/Test/Simple/t/bad_plan.t                          |   29 
 lib/Test/Simple/t/bail_out.t                          |   16 
 lib/Test/Simple/t/c_flag.t                            |   21 
 lib/Test/Simple/t/cmp_ok.t                            |   37 
 lib/Test/Simple/t/create.t                            |   21 
 lib/Test/Simple/t/curr_test.t                         |   11 
 lib/Test/Simple/t/current_test.t                      |   11 
 lib/Test/Simple/t/current_test_without_plan.t         |   16 
 lib/Test/Simple/t/details.t                           |   13 
 lib/Test/Simple/t/diag.t                              |   67 
 lib/Test/Simple/t/died.t                              |   45 
 lib/Test/Simple/t/done_testing.t                      |   12 
 lib/Test/Simple/t/done_testing_double.t               |   46 
 lib/Test/Simple/t/done_testing_plan_mismatch.t        |   44 
 lib/Test/Simple/t/done_testing_with_no_plan.t         |   11 
 lib/Test/Simple/t/done_testing_with_number.t          |   12 
 lib/Test/Simple/t/done_testing_with_plan.t            |   11 
 lib/Test/Simple/t/dont_overwrite_die_handler.t        |   19 
 lib/Test/Simple/t/exit.t                              |  134 -
 lib/Test/Simple/t/explain.t                           |   27 
 lib/Test/Simple/t/extra.t                             |    2 
 lib/Test/Simple/t/extra_one.t                         |    2 
 lib/Test/Simple/t/fail-like.t                         |   39 
 lib/Test/Simple/t/fail-more.t                         |  458 ++++-
 lib/Test/Simple/t/fail.t                              |   62 
 lib/Test/Simple/t/fail_one.t                          |   47 
 lib/Test/Simple/t/filehandles.t                       |    9 
 lib/Test/Simple/t/fork_with_new_stdout.t              |   54 
 lib/Test/Simple/t/is_deeply_dne_bug.t                 |   11 
 lib/Test/Simple/t/is_deeply_fail.t                    |    6 
 lib/Test/Simple/t/is_deeply_with_threads.t            |   11 
 lib/Test/Simple/t/lib/Dev/Null.pm                     |    8 
 lib/Test/Simple/t/lib/Dummy.pm                        |    5 
 lib/Test/Simple/t/lib/MyOverload.pm                   |   27 
 lib/Test/Simple/t/lib/SigDie.pm                       |    8 
 lib/Test/Simple/t/maybe_regex.t                       |   24 
 lib/Test/Simple/t/missing.t                           |    8 
 lib/Test/Simple/t/new_ok.t                            |   42 
 lib/Test/Simple/t/no_plan.t                           |   23 
 lib/Test/Simple/t/no_plan_at_all.t                    |   35 
 lib/Test/Simple/t/no_tests.t                          |   44 
 lib/Test/Simple/t/note.t                              |   30 
 lib/Test/Simple/t/output.t                            |  128 -
 lib/Test/Simple/t/overload.t                          |   44 
 lib/Test/Simple/t/overload_threads.t                  |   11 
 lib/Test/Simple/t/plan_bad.t                          |    5 
 lib/Test/Simple/t/plan_is_noplan.t                    |   46 
 lib/Test/Simple/t/reset.t                             |   77 
 lib/Test/Simple/t/reset_outputs.t                     |   35 
 lib/Test/Simple/t/skip.t                              |    2 
 lib/Test/Simple/t/skipall.t                           |   41 
 lib/Test/Simple/t/tbm_doesnt_set_exported_to.t        |   24 
 lib/Test/Simple/t/thread_taint.t                      |    2 
 lib/Test/Simple/t/todo.t                              |   86 +
 lib/Test/Simple/t/try.t                               |   37 
 lib/Test/Simple/t/undef.t                             |   32 
 lib/Test/Simple/t/use_ok.t                            |   11 
 lib/Test/Simple/t/utf8.t                              |   69 
 lib/Test/Simple/t/versions.t                          |   21 
 t/lib/Test/Builder/NoOutput.pm                        |  122 +
 t/lib/Test/Simple/Catch.pm                            |    6 
 t/lib/Test/Simple/sample_tests/death.plx              |    7 
 t/lib/Test/Simple/sample_tests/death_with_handler.plx |   20 
 t/lib/Test/Simple/sample_tests/last_minute_death.plx  |    7 
 t/lib/Test/Simple/sample_tests/too_few_fail.plx       |    2 
 t/lib/TieOut.pm                                       |    8 
 78 files changed, 3459 insertions(+), 1615 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-Test-Simple.patchIndex: perl-update-Test-Simple.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/F-12/perl-update-Test-Simple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-Test-Simple.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-Test-Simple.patch	3 Sep 2009 16:18:27 -0000	1.2
@@ -1,116 +1,13 @@
-Test-Simple-0.86
+Update to 0.92; patch by Iain Arnell <iarnell at gmail.com> (BZ#519417)
 
-the following made the patch smaller:
-mv Test-Simple-0.86/t/{Builder,Tester,}
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-02-17 17:16:40.000000000 +0100
-@@ -2626,11 +2626,16 @@
- lib/Test/Simple/Changes		Test::Simple changes
- lib/Test/Simple.pm		Basic utility for writing tests
- lib/Test/Simple/README		Test::Simple README
-+lib/Test/Simple/TODO		Test::Simple TODO
- lib/Test/Simple/t/00test_harness_check.t	Test::Simple test
-+lib/Test/Simple/t/BEGIN_require_ok.t
-+lib/Test/Simple/t/BEGIN_use_ok.t
-+lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/More.t	Test::More test, basic stuff
- lib/Test/Simple/t/bad_plan.t	Test::Builder plan() test
- lib/Test/Simple/t/bail_out.t	Test::Builder BAIL_OUT test
- lib/Test/Simple/t/buffer.t	Test::Builder buffering test
--lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/c_flag.t
- lib/Test/Simple/t/carp.t	Test::Builder test
- lib/Test/Simple/t/circular_data.t	Test::Simple test
- lib/Test/Simple/t/cmp_ok.t	Test::More test
-@@ -2638,19 +2643,22 @@
- lib/Test/Simple/t/curr_test.t	Test::Builder->curr_test tests
- lib/Test/Simple/t/details.t	Test::Builder tests
- lib/Test/Simple/t/diag.t	Test::More diag() test
-+lib/Test/Simple/t/died.t
-+lib/Test/Simple/t/dont_overwrite_die_handler.t
- lib/Test/Simple/t/eq_set.t	Test::Simple test
- lib/Test/Simple/t/exit.t	Test::Simple test, exit codes
--lib/Test/Simple/t/extra_one.t	Test::Simple test
-+lib/Test/Simple/t/explain.t
- lib/Test/Simple/t/extra.t	Test::Simple test
-+lib/Test/Simple/t/extra_one.t	Test::Simple test
- lib/Test/Simple/t/fail-like.t	Test::More test, like() failures
- lib/Test/Simple/t/fail-more.t	Test::More test, tests failing
--lib/Test/Simple/t/fail_one.t	Test::Simple test
- lib/Test/Simple/t/fail.t	Test::Simple test, test failures
-+lib/Test/Simple/t/fail_one.t	Test::Simple test
- lib/Test/Simple/t/filehandles.t	Test::Simple test, STDOUT can be played with
- lib/Test/Simple/t/fork.t	Test::More fork tests
- lib/Test/Simple/t/harness_active.t	Test::Simple test
--lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/has_plan.t	Test::Builder->plan tests
-+lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/import.t	Test::More test, importing functions
- lib/Test/Simple/t/is_deeply_dne_bug.t	Test::More test
- lib/Test/Simple/t/is_deeply_fail.t	Test::More test, is_deeply()
-@@ -2660,27 +2668,30 @@
- lib/Test/Simple/t/lib/MyOverload.pm	Test::More test module 
- lib/Test/Simple/t/maybe_regex.t	Test::Builder->maybe_regex() tests
- lib/Test/Simple/t/missing.t	Test::Simple test, missing tests
--lib/Test/Simple/t/More.t	Test::More test, basic stuff
-+lib/Test/Simple/t/new_ok.t
- lib/Test/Simple/t/no_diag.t	Test::Simple test
- lib/Test/Simple/t/no_ending.t	Test::Builder test, no_ending()
- lib/Test/Simple/t/no_header.t	Test::Builder test, no_header()
- lib/Test/Simple/t/no_plan.t	Test::Simple test, forgot the plan
--lib/Test/Simple/TODO		Test::Simple TODO
-+lib/Test/Simple/t/no_tests.t
-+lib/Test/Simple/t/note.t
- lib/Test/Simple/t/ok_obj.t	Test::Builder object tests
- lib/Test/Simple/t/output.t	Test::Builder test, output methods
- lib/Test/Simple/t/overload.t		Test::Simple test
- lib/Test/Simple/t/overload_threads.t	Test::Simple test
-+lib/Test/Simple/t/plan.t	Test::More test, plan()
- lib/Test/Simple/t/plan_bad.t		Test::Simple test
- lib/Test/Simple/t/plan_is_noplan.t	Test::Simple test, no_plan
- lib/Test/Simple/t/plan_no_plan.t	Test::More test, plan() w/no_plan
- lib/Test/Simple/t/plan_shouldnt_import.t	Test::Simple test
- lib/Test/Simple/t/plan_skip_all.t	Test::More test, plan() w/skip_all
--lib/Test/Simple/t/plan.t	Test::More test, plan()
- lib/Test/Simple/t/require_ok.t	Test::Simple test
- lib/Test/Simple/t/reset.t	Test::Simple test
-+lib/Test/Simple/t/reset_outputs.t
- lib/Test/Simple/t/simple.t	Test::Simple test, basic stuff
--lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
- lib/Test/Simple/t/skip.t	Test::More test, SKIP tests
-+lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
-+lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
- lib/Test/Simple/t/tbt_01basic.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_02fhrestore.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_03die.t	Test::Builder::Tester test
-@@ -2688,13 +2699,14 @@
- lib/Test/Simple/t/tbt_05faildiag.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_06errormess.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_07args.t	Test::Builder::Tester test
--lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
- lib/Test/Simple/t/thread_taint.t	Test::Simple test
-+lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
- lib/Test/Simple/t/todo.t	Test::More test, TODO tests
- lib/Test/Simple/t/try.t		Test::More test
- lib/Test/Simple/t/undef.t	Test::More test, undefs don't cause warnings
--lib/Test/Simple/t/useing.t	Test::More test, compile test
- lib/Test/Simple/t/use_ok.t	Test::More test, use_ok()
-+lib/Test/Simple/t/useing.t	Test::More test, compile test
-+lib/Test/Simple/t/utf8.t
- lib/Test/t/05_about_verbose.t	See if Test works
- lib/Test/t/fail.t		See if Test works
- lib/Test/t/mix.t		See if Test works
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Module.pm perl-5.10.0/lib/Test/Builder/Module.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Module.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-02-17 17:16:40.000000000 +0100
++++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-08-26 06:14:11.000000000 +0200
 @@ -1,24 +1,24 @@
  package Test::Builder::Module;
-+# $Id$
-+
-+use strict;
  
++use strict;
++
  use Test::Builder;
  
  require Exporter;
@@ -120,7 +17,8 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
 -$VERSION = '0.72';
 -
 -use strict;
-+our $VERSION = '0.86';
++our $VERSION = '0.92';
++$VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
  
  # 5.004's Exporter doesn't have export_to_level.
  my $_export_to_level = sub {
@@ -208,14 +106,20 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  1;
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm perl-5.10.0/lib/Test/Builder/Tester/Color.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-02-17 17:16:40.000000000 +0100
-@@ -1,4 +1,5 @@
++++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,9 +1,11 @@
  package Test::Builder::Tester::Color;
-+# $Id$
  
  use strict;
++our $VERSION = "1.18";
+ 
+ require Test::Builder::Tester;
  
-@@ -25,8 +26,7 @@
++
+ =head1 NAME
+ 
+ Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
+@@ -25,8 +27,7 @@
  
  =cut
  
@@ -227,10 +131,9 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Tester.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-02-17 17:16:40.000000000 +0100
-@@ -1,8 +1,8 @@
++++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,8 +1,7 @@
  package Test::Builder::Tester;
-+# $Id$
  
  use strict;
 -use vars qw(@EXPORT $VERSION @ISA);
@@ -239,7 +142,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  
  use Test::Builder;
  use Symbol;
-@@ -56,21 +56,20 @@
+@@ -56,21 +55,20 @@
  ###
  
  use Exporter;
@@ -269,7 +172,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  }
  
  sub import {
-@@ -83,14 +82,14 @@
+@@ -83,14 +81,14 @@
      $t->plan(@plan);
  
      my @imports = ();
@@ -287,7 +190,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  }
  
  ###
-@@ -124,8 +123,7 @@
[...6118 lines suppressed...]
  my $out = tie *$out_fh, 'TieOut';
  my $err = tie *$err_fh, 'TieOut';
  
-@@ -13,6 +14,6 @@
+@@ -13,6 +15,6 @@
  $t->failure_output($err_fh);
  $t->todo_output($err_fh);
  
@@ -6035,12 +8073,8 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  1;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,16 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -4,10 +4,13 @@
  require Test::Simple::Catch;
  my($out, $err) = Test::Simple::Catch::caught();
  
@@ -6054,22 +8088,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  ok(1);
  ok(1);
 -die "Knife?";
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- use Carp;
- 
- push @INC, 't/lib';
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -0,0 +1,19 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -0,0 +1,20 @@
 +require Test::Simple;
-+# $Id$
 +
 +push @INC, 't/lib';
 +require Test::Simple::Catch;
@@ -6086,42 +8111,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
 +
 +ok(1);
 +ok(1);
++
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,3 +1,4 @@
- require Test::Builder;
-+# $Id$
- 
- exit 1;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- use lib 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,11 +1,14 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -5,7 +5,9 @@
  my($out, $err) = Test::Simple::Catch::caught();
  
  Test::Simple->import(tests => 5);
@@ -6132,86 +8128,31 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  
  ok(1);
  ok(1);
-@@ -13,4 +16,4 @@
+@@ -13,4 +15,5 @@
  ok(1);
  ok(1);
  
 -die "Almost there...";
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- # ID 20020716.013, the exit code would become 0 if the test died
-+# $Id$
- # before a plan.
- 
- require Test::Simple;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1 +1,2 @@
- require Test::Simple;
-+# $Id$
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-@@ -9,4 +10,4 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -9,4 +9,4 @@
  
  ok(0);
  ok(1);
 -ok(0);
 \ No newline at end of file
 +ok(0);
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/TieOut.pm perl-5.10.0/t/lib/TieOut.pm
 --- perl-5.10.0.orig/t/lib/TieOut.pm	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/TieOut.pm	2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,14 @@
++++ perl-5.10.0/t/lib/TieOut.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,13 +1,15 @@
  package TieOut;
-+# $Id$
  
++use strict;
++
  sub TIEHANDLE {
      my $scalar = '';
 -    bless( \$scalar, $_[0]);
@@ -6225,7 +8166,7 @@ diff -urN perl-5.10.0.orig/t/lib/TieOut.
  }
  
  sub PRINTF {
-@@ -16,7 +17,7 @@
+@@ -16,7 +18,7 @@
      $$self .= sprintf $fmt, @_;
  }
  


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-12/perl.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- perl.spec	28 Aug 2009 05:39:58 -0000	1.231
+++ perl.spec	3 Sep 2009 16:18:27 -0000	1.232
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        81%{?dist}
+Release:        82%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -235,7 +235,7 @@ Patch113:	perl-update-Sys-Syslog.patch
 Patch114:	perl-update-Test-Harness.patch
 %define			    Test_Harness_version 3.16
 Patch115:	perl-update-Test-Simple.patch
-%define			    Test_Simple_version 0.86
+%define			    Test_Simple_version 0.92
 Patch116:	perl-update-Time-HiRes.patch
 %define			    Time_HiRes_version 1.9719
 Patch117:	perl-update-Digest-SHA.patch
@@ -250,6 +250,8 @@ Patch120:	perl-update-Compress_Raw_Zlib.
 %define			    Compress_Raw_Zlib 2.020
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
+Patch122:   perl-update-Module-Pluggable.patch
+%define             Module_Pluggable_version 3.90
 
 # Fedora uses links instead of lynx
 # patches File-Fetch and CPAN
@@ -772,7 +774,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        3.60
+Version:        %{Module_Pluggable_version} 
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Pluggable
@@ -1032,6 +1034,12 @@ upstream tarball from perl.org.
 %patch119 -p1
 %patch120 -p1
 %patch121 -p1
+%patch122 -p1
+# 0-byte files and patch don't seem to agree
+mkdir t/Module_Pluggable/lib/Zot/
+touch t/Module_Pluggable/lib/Zot/.Zork.pm
+
+
 %patch201 -p1
 
 #
@@ -1313,6 +1321,7 @@ perl -x patchlevel.h \
 	'Fedora Patch119: Update File::Spec to %{File_Spec_version}' \
 	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
 	'Fedora Patch121: Update Scalar-List-Utils to %{Scalar_List_Utils}' \
+	'Fedora Patch122: Update Module-Pluggable to %{Module_Pluggable_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
@@ -1939,6 +1948,10 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
+- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
+- update Module-Pluggable to 3.9
+
 * Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
 - fix macros.perl *sigh*
 



From drago01 at fedoraproject.org  Thu Sep  3 16:32:56 2009
From: drago01 at fedoraproject.org (drago01)
Date: Thu,  3 Sep 2009 16:32:56 +0000 (UTC)
Subject: rpms/fsarchiver/devel .cvsignore, 1.10, 1.11 fsarchiver.spec, 1.17, 
	1.18 sources, 1.10, 1.11
Message-ID: <20090903163256.4B7EA11C0099@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8398

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.5.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Jul 2009 15:41:04 -0000	1.10
+++ .cvsignore	3 Sep 2009 16:32:55 -0000	1.11
@@ -1 +1 @@
-fsarchiver-0.5.8.tar.gz
+fsarchiver-0.5.9.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fsarchiver.spec	21 Aug 2009 13:26:00 -0000	1.17
+++ fsarchiver.spec	3 Sep 2009 16:32:56 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		fsarchiver
-Version:	0.5.8
-Release:	5%{?dist}
+Version:	0.5.9
+Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Thu Sep 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.9-1
+- Update to 0.5.9
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Jul 2009 15:41:04 -0000	1.10
+++ sources	3 Sep 2009 16:32:56 -0000	1.11
@@ -1 +1 @@
-07ee10a45bcac667d2a3f894fb2f7ab9  fsarchiver-0.5.8.tar.gz
+03af22d9dca5bec4154e1a4c1e569714  fsarchiver-0.5.9.tar.gz



From drago01 at fedoraproject.org  Thu Sep  3 16:33:04 2009
From: drago01 at fedoraproject.org (drago01)
Date: Thu,  3 Sep 2009 16:33:04 +0000 (UTC)
Subject: rpms/fsarchiver/F-10 .cvsignore, 1.9, 1.10 fsarchiver.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090903163304.4DD1E11C0099@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8478

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.5.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 Jul 2009 15:43:30 -0000	1.9
+++ .cvsignore	3 Sep 2009 16:33:04 -0000	1.10
@@ -1 +1 @@
-fsarchiver-0.5.8.tar.gz
+fsarchiver-0.5.9.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/fsarchiver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fsarchiver.spec	17 Aug 2009 16:17:55 -0000	1.10
+++ fsarchiver.spec	3 Sep 2009 16:33:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		fsarchiver
-Version:	0.5.8
-Release:	2%{?dist}
+Version:	0.5.9
+Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Thu Sep 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.9-1
+- Update to 0.5.9
+
 * Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-2
 - Enable XZ support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	12 Jul 2009 15:43:30 -0000	1.9
+++ sources	3 Sep 2009 16:33:04 -0000	1.10
@@ -1 +1 @@
-07ee10a45bcac667d2a3f894fb2f7ab9  fsarchiver-0.5.8.tar.gz
+03af22d9dca5bec4154e1a4c1e569714  fsarchiver-0.5.9.tar.gz



From drago01 at fedoraproject.org  Thu Sep  3 16:33:01 2009
From: drago01 at fedoraproject.org (drago01)
Date: Thu,  3 Sep 2009 16:33:01 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 .cvsignore, 1.10, 1.11 fsarchiver.spec, 1.14, 
	1.15 sources, 1.10, 1.11
Message-ID: <20090903163301.8BDF711C0099@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8441

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.5.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Jul 2009 15:43:24 -0000	1.10
+++ .cvsignore	3 Sep 2009 16:33:01 -0000	1.11
@@ -1 +1 @@
-fsarchiver-0.5.8.tar.gz
+fsarchiver-0.5.9.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fsarchiver.spec	17 Aug 2009 16:17:49 -0000	1.14
+++ fsarchiver.spec	3 Sep 2009 16:33:01 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		fsarchiver
-Version:	0.5.8
-Release:	2%{?dist}
+Version:	0.5.9
+Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Thu Sep 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.9-1
+- Update to 0.5.9
+
 * Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-2
 - Enable XZ support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Jul 2009 15:43:24 -0000	1.10
+++ sources	3 Sep 2009 16:33:01 -0000	1.11
@@ -1 +1 @@
-07ee10a45bcac667d2a3f894fb2f7ab9  fsarchiver-0.5.8.tar.gz
+03af22d9dca5bec4154e1a4c1e569714  fsarchiver-0.5.9.tar.gz



From cweyl at fedoraproject.org  Thu Sep  3 16:35:06 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  3 Sep 2009 16:35:06 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/devel .cvsignore, 1.12,
	1.13 perl-Catalyst-Runtime.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20090903163506.D7F4211C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9276

Modified Files:
	.cvsignore perl-Catalyst-Runtime.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80011-1
- switch filtering system
- auto-update to 5.80011 (by cpan-spec-update 0.01)
- added a new br on perl(List::MoreUtils) (version 0)
- altered br on perl(Module::Pluggable) (3.01 => 3.9)
- altered br on perl(MooseX::MethodAttributes::Inheritable) (0.12 => 0.15)
- added a new req on perl(List::MoreUtils) (version 0)
- altered req on perl(Module::Pluggable) (3.01 => 3.9)
- altered req on perl(MooseX::MethodAttributes::Inheritable) (0.12 => 0.15)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Jul 2009 05:03:33 -0000	1.12
+++ .cvsignore	3 Sep 2009 16:35:06 -0000	1.13
@@ -1 +1 @@
-Catalyst-Runtime-5.80007.tar.gz
+Catalyst-Runtime-5.80011.tar.gz


Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Catalyst-Runtime.spec	28 Jul 2009 05:03:33 -0000	1.19
+++ perl-Catalyst-Runtime.spec	3 Sep 2009 16:35:06 -0000	1.20
@@ -1,7 +1,7 @@
 Name:           perl-Catalyst-Runtime
-Version:        5.80007
+Version:        5.80011
 Release:        1%{?dist}
-Summary:        Catalyst Framework Runtime 
+Summary:        Catalyst Framework Runtime
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Runtime/
@@ -27,7 +27,7 @@ BuildRequires:  perl(HTTP::Request)
 BuildRequires:  perl(HTTP::Request::AsCGI)  >= 0.8
 BuildRequires:  perl(HTTP::Response)
 BuildRequires:  perl(LWP::UserAgent)
-BuildRequires:  perl(Module::Pluggable)     >= 3.01
+BuildRequires:  perl(Module::Pluggable)     >= 3.9
 BuildRequires:  perl(Path::Class) >= 0.09
 BuildRequires:  perl(Text::SimpleTable)     >= 0.03
 BuildRequires:  perl(Tree::Simple)          >= 1.15
@@ -44,12 +44,13 @@ BuildRequires:  perl(Sub::Exporter)
 BuildRequires:  perl(B::Hooks::EndOfScope) >= 0.08
 BuildRequires:  perl(namespace::clean)
 BuildRequires:  perl(Moose) >= 0.78
-BuildRequires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.12
+BuildRequires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.15
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Text::Balanced)
 BuildRequires:  perl(Class::C3::Adopt::NEXT) >= 0.07
 BuildRequires:  perl(Test::MockObject) >= 1.07
 BuildRequires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
+BuildRequires:  perl(List::MoreUtils)
 # test
 BuildRequires:  perl(Class::C3)
 BuildRequires:  perl(File::Copy::Recursive)
@@ -83,9 +84,9 @@ Requires:  perl(HTTP::Request::AsCGI) >=
 Requires:  perl(HTTP::Response)
 Requires:  perl(LWP::UserAgent)
 Requires:  perl(MRO::Compat)
-Requires:  perl(Module::Pluggable) >= 3.01
+Requires:  perl(Module::Pluggable) >= 3.9
 Requires:  perl(Moose) >= 0.78
-Requires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.12
+Requires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.15
 Requires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
 Requires:  perl(Path::Class) >= 0.09
 Requires:  perl(Scalar::Util)
@@ -100,12 +101,16 @@ Requires:  perl(namespace::clean)
 Requires:  perl(String::RewritePrefix) >= 0.004
 Requires:  perl(Task::Weaken)
 Requires:  perl(namespace::autoclean)
+Requires:       perl(List::MoreUtils)
 
-# neither provide nor require things we shouldn't
-%global _use_internal_dependency_generator 0
-%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}"
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
+%{?filter_setup: %{expand:
+%filter_provides_in %{perl_vendorarch}/.*\\.so$
+%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$
+%filter_provides_in %{_docdir}
+%filter_requires_in %{_docdir}
+%filter_setup
+}}
 
 %description
 This is the primary class for the Catalyst-Runtime distribution.  It provides
@@ -179,6 +184,16 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80011-1
+- switch filtering system
+- auto-update to 5.80011 (by cpan-spec-update 0.01)
+- added a new br on perl(List::MoreUtils) (version 0)
+- altered br on perl(Module::Pluggable) (3.01 => 3.9)
+- altered br on perl(MooseX::MethodAttributes::Inheritable) (0.12 => 0.15)
+- added a new req on perl(List::MoreUtils) (version 0)
+- altered req on perl(Module::Pluggable) (3.01 => 3.9)
+- altered req on perl(MooseX::MethodAttributes::Inheritable) (0.12 => 0.15)
+
 * Mon Jul 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80007-1
 - auto-update to 5.80007 (by cpan-spec-update 0.01)
 - added a new br on perl(String::RewritePrefix) (version 0.004)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Jul 2009 05:03:33 -0000	1.10
+++ sources	3 Sep 2009 16:35:06 -0000	1.11
@@ -1 +1 @@
-9ccd070be7ee18fa13345ad2135d8e89  Catalyst-Runtime-5.80007.tar.gz
+96f09897079c6a13e1c0375b3a94ad4f  Catalyst-Runtime-5.80011.tar.gz



From twaugh at fedoraproject.org  Thu Sep  3 16:37:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Sep 2009 16:37:40 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-raw-device-change.patch, NONE,
	1.1 system-config-printer.spec, 1.280, 1.281
Message-ID: <20090903163740.54E4D11C0099@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10572

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-raw-device-change.patch 
Log Message:
* Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
- Allow raw devices to be changed.


system-config-printer-raw-device-change.patch:
 system-config-printer.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-raw-device-change.patch ---
diff -up system-config-printer-1.1.12/system-config-printer.py.raw-device-change system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.raw-device-change	2009-09-03 17:30:31.792304116 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-03 17:30:33.364303189 +0100
@@ -1906,16 +1906,16 @@ class GUI(GtkGUI, monitor.Watcher):
 
     # set buttons sensitivity
     def setDataButtonState(self):
-        try: # Might not be a printer selected
+        try:
             possible = (self.ppd and
                         not bool (self.changed) and
                         self.printer.enabled and
                         not self.printer.rejecting)
 
-            for button in [self.btnPrintTestPage,
-                           self.btnChangePPD,
+            self.btnPrintTestPage.set_sensitive (possible)
+            for button in [self.btnChangePPD,
                            self.btnSelectDevice]:
-                button.set_sensitive (possible)
+                button.set_sensitive (not bool (self.changed))
 
             commands = (self.printer.type & cups.CUPS_PRINTER_COMMANDS) != 0
             self.btnSelfTest.set_sensitive (commands and possible)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- system-config-printer.spec	28 Aug 2009 15:55:41 -0000	1.280
+++ system-config-printer.spec	3 Sep 2009 16:37:39 -0000	1.281
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch2: system-config-printer-statereaso
 Patch3: system-config-printer-icon-load-traceback.patch
 Patch4: system-config-printer-proxy-auth.patch
 Patch5: system-config-printer-ppdippstr.patch
+Patch6: system-config-printer-raw-device-change.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -72,6 +73,7 @@ the configuration tool.
 %patch3 -p1 -b .icon-load-traceback
 %patch4 -p1 -b .proxy-auth
 %patch5 -p1 -b .ppdippstr
+%patch6 -p1 -b .raw-device-change
 
 %build
 %configure
@@ -173,6 +175,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
+- Allow raw devices to be changed.
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
 - Fixed PPD/IPP string translation.
 - Fixed proxy authentication.



From mmcgrath at fedoraproject.org  Thu Sep  3 16:41:00 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Thu,  3 Sep 2009 16:41:00 +0000 (UTC)
Subject: rpms/smolt/devel .cvsignore, 1.26, 1.27 smolt.spec, 1.72,
	1.73 sources, 1.27, 1.28
Message-ID: <20090903164100.B683911C0099@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13763

Modified Files:
	.cvsignore smolt.spec sources 
Log Message:
upstream released new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	7 Jul 2009 21:21:57 -0000	1.26
+++ .cvsignore	3 Sep 2009 16:41:00 -0000	1.27
@@ -1 +1 @@
-smolt-1.3.tar.gz
+smolt-1.3.2.tar.gz


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- smolt.spec	27 Jul 2009 04:30:16 -0000	1.72
+++ smolt.spec	3 Sep 2009 16:41:00 -0000	1.73
@@ -1,8 +1,8 @@
 Name: smolt
 
 Summary: Fedora hardware profiler
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -20,6 +20,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
+Requires: python-simplejson
 
 %description
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -79,7 +80,6 @@ cd ..
 %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
 %{__mkdir} -p %{buildroot}/%{_mandir}/man1/
 %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
-%{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/gate.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/os_detect.py %{buildroot}/%{_datadir}/%{name}/client/
@@ -112,13 +112,16 @@ touch %{buildroot}/%{_sysconfdir}/syscon
 %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
 
 %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/client/config.py
+
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
 ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
 ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
+
 desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+%{__rm} -f %{buildroot}/%{_datadir}/applications/smolt.desktop
 %find_lang %{name}
 
 # Cleanup from the Makefile (will be cleaned up when it is finalized)
@@ -176,8 +179,8 @@ touch --no-create %{_datadir}/icons/hico
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}/client
-%ghost %{_datadir}/%{name}/client/scan.pyc
-%ghost %{_datadir}/%{name}/client/scan.pyo
+#%ghost %{_datadir}/%{name}/client/scan.pyc
+#%ghost %{_datadir}/%{name}/client/scan.pyo
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
@@ -203,6 +206,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep 03 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-1
+- Upstream released new version
+- Changed some link and copy info
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	7 Jul 2009 21:21:57 -0000	1.27
+++ sources	3 Sep 2009 16:41:00 -0000	1.28
@@ -1 +1 @@
-72fa94c3a866583477bb1c2b587869f9  smolt-1.3.tar.gz
+1b6d9f58cf400e1115825c2039383609  smolt-1.3.2.tar.gz



From twaugh at fedoraproject.org  Thu Sep  3 16:42:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Sep 2009 16:42:32 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-raw-device-change.patch, NONE,
	1.1 system-config-printer.spec, 1.289, 1.290
Message-ID: <20090903164232.CC08911C0099@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15525

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-raw-device-change.patch 
Log Message:
* Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
- Allow raw devices to be changed.


system-config-printer-raw-device-change.patch:
 system-config-printer.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-raw-device-change.patch ---
diff -up system-config-printer-1.1.12/system-config-printer.py.raw-device-change system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.raw-device-change	2009-09-03 17:30:31.792304116 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-03 17:30:33.364303189 +0100
@@ -1906,16 +1906,16 @@ class GUI(GtkGUI, monitor.Watcher):
 
     # set buttons sensitivity
     def setDataButtonState(self):
-        try: # Might not be a printer selected
+        try:
             possible = (self.ppd and
                         not bool (self.changed) and
                         self.printer.enabled and
                         not self.printer.rejecting)
 
-            for button in [self.btnPrintTestPage,
-                           self.btnChangePPD,
+            self.btnPrintTestPage.set_sensitive (possible)
+            for button in [self.btnChangePPD,
                            self.btnSelectDevice]:
-                button.set_sensitive (possible)
+                button.set_sensitive (not bool (self.changed))
 
             commands = (self.printer.type & cups.CUPS_PRINTER_COMMANDS) != 0
             self.btnSelfTest.set_sensitive (commands and possible)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- system-config-printer.spec	28 Aug 2009 15:52:05 -0000	1.289
+++ system-config-printer.spec	3 Sep 2009 16:42:32 -0000	1.290
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch3: system-config-printer-icon-load-
 Patch4: system-config-printer-polkit-1.patch
 Patch5: system-config-printer-proxy-auth.patch
 Patch6: system-config-printer-ppdippstr.patch
+Patch7: system-config-printer-raw-device-change.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -87,6 +88,7 @@ printers.
 %patch4 -p1 -b .polkit-1
 %patch5 -p1 -b .proxy-auth
 %patch6 -p1 -b .ppdippstr
+%patch7 -p1 -b .raw-device-change
 
 %build
 aclocal
@@ -201,6 +203,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
+- Allow raw devices to be changed.
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
 - Fixed PPD/IPP string translation.
 - Fixed proxy authentication.



From twaugh at fedoraproject.org  Thu Sep  3 16:48:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Sep 2009 16:48:08 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-get-devices.patch, NONE,
	1.1 system-config-printer.spec, 1.281, 1.282
Message-ID: <20090903164809.06C9D11C0099@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18684

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-get-devices.patch 
Log Message:
* Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
- Speed improvement when fetching devices.


system-config-printer-get-devices.patch:
 cupshelpers/cupshelpers.py |    4 
 cupspk.py                  |   18 +++-
 gtkspinner.py              |    2 
 system-config-printer.py   |  196 ++++++++++++++++++++++++++++++---------------
 timedops.py                |   36 ++++++--
 5 files changed, 177 insertions(+), 79 deletions(-)

--- NEW FILE system-config-printer-get-devices.patch ---
diff -up system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices system-config-printer-1.1.12/cupshelpers/cupshelpers.py
--- system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-03 17:40:01.312306795 +0100
@@ -541,7 +541,7 @@ class Device:
         
         return result
 
-def getDevices(connection):
+def getDevices(connection, **kw):
     """
     Obtain a list of available CUPS devices.
 
@@ -550,7 +550,7 @@ def getDevices(connection):
     @returns: a list of L{Device} objects
     @raise cups.IPPError: IPP Error
     """
-    devices = connection.getDevices()
+    devices = connection.getDevices(**kw)
     for uri, data in devices.iteritems():
         device = Device(uri, **data)
         devices[uri] = device
diff -up system-config-printer-1.1.12/cupspk.py.get-devices system-config-printer-1.1.12/cupspk.py
--- system-config-printer-1.1.12/cupspk.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupspk.py	2009-09-03 17:39:54.649306311 +0100
@@ -304,12 +304,13 @@ class Connection:
     def getDevices(self, *args, **kwds):
         use_pycups = False
 
-        timeout = 0
+        limit = 0
         include_schemes = ''
         exclude_schemes = ''
+        timeout = 0
 
-        if len(args) == 3:
-            (use_pycups, timeout, include_schemes, exclude_schemes) = self._args_to_tuple([int, str, str], *args)
+        if len(args) == 4:
+            (use_pycups, limit, include_schemes, exclude_schemes, timeout) = self._args_to_tuple([int, str, str, int], *args)
         else:
             if kwds.has_key('timeout'):
                 timeout = kwds['timeout']
@@ -320,6 +321,17 @@ class Connection:
             if kwds.has_key('exclude_schemes'):
                 exclude_schemes = kwds['exclude_schemes']
 
+        # Convert from list to string
+        if len (include_schemes) > 0:
+            include_schemes = reduce (lambda x, y: x + "," + y, include_schemes)
+        else:
+            include_schemes = ""
+
+        if len (exclude_schemes) > 0:
+            exclude_schemes = reduce (lambda x, y: x + "," + y, exclude_schemes)
+        else:
+            exclude_schemes = ""
+
         pk_args = (timeout, include_schemes, exclude_schemes)
 
         result = self._call_with_pk_and_fallback(use_pycups,
diff -up system-config-printer-1.1.12/gtkspinner.py.get-devices system-config-printer-1.1.12/gtkspinner.py
--- system-config-printer-1.1.12/gtkspinner.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/gtkspinner.py	2009-09-03 17:40:15.558428680 +0100
@@ -65,7 +65,7 @@ class Spinner:
     def _next_frame (self):
         n = self._current_frame + 1
         if n >= self.n_frames:
-            n = 0
+            n = 1
 
         self._set_frame (n)
         return True
diff -up system-config-printer-1.1.12/system-config-printer.py.get-devices system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-03 17:39:28.893432444 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-03 17:42:09.536304232 +0100
@@ -3681,6 +3681,7 @@ class NewPrinterGUI(GtkGUI):
         self.ntbkNPDownloadableDriverProperties.set_show_tabs(False)
 
         self.spinner = gtkspinner.Spinner (self.imgProcessWorking)
+        self.spinner_count = 0
 
         # Set up OpenPrinting widgets.
         self.openprinting = cupshelpers.openprinting.OpenPrinting ()
@@ -3716,6 +3717,7 @@ class NewPrinterGUI(GtkGUI):
         slct.set_select_function (self.device_select_function)
         self.tvNPDevices.set_row_separator_func (self.device_row_separator_fn)
         self.tvNPDevices.connect ("row-activated", self.device_row_activated)
+        self.tvNPDevices.connect ("row-expanded", self.device_row_expanded)
 
         # Devices expander
         self.expNPDeviceURIs.connect ("notify::expanded",
@@ -3765,6 +3767,19 @@ class NewPrinterGUI(GtkGUI):
         ppd_filter.add_pattern("*")
         self.filechooserPPD.add_filter(ppd_filter)
 
+    def inc_spinner_task (self):
+        if self.spinner_count == 0:
+            self.imgProcessWorking.show ()
+            self.spinner.start ()
+
+        self.spinner_count += 1
+
+    def dec_spinner_task (self):
+        self.spinner_count -= 1
+        if self.spinner_count == 0:
+            self.imgProcessWorking.hide ()
+            self.spinner.stop ()
+
     def show_IPP_Error (self, exception, message):
         return show_IPP_Error (exception, message, parent=self.NewPrinterWindow)
 
@@ -4611,32 +4626,48 @@ class NewPrinterGUI(GtkGUI):
             self.btnNPForward.set_sensitive(
                 self.mainapp.checkNPName(new_text))
 
-    def fetchDevices(self, parent=None):
+    def fetchDevices(self, parent=None, network=False):
         debugprint ("fetchDevices")
-        self.lblWait.set_markup ('<span weight="bold" size="larger">' +
-                                 _('Searching') + '</span>\n\n' +
-                                 _('Searching for printers'))
-        if parent == None:
-            parent = self.mainapp.PrintersWindow
-        self.WaitWindow.set_transient_for (parent)
-        self.WaitWindow.show_now ()
-        self.busy (self.WaitWindow)
-        while gtk.events_pending ():
-            gtk.main_iteration ()
 
-        debugprint ("Fetching devices")
-        self.mainapp.cups._begin_operation (_("fetching device list"))
+        have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
+        if not have_polkit_1:
+            if network:
+                return {}
+
+            network = True
+
+        network_schemes = ["dnssd", "snmp"]
         try:
-            devices = cupshelpers.getDevices(self.mainapp.cups)
-        except:
-            self.mainapp.cups._end_operation ()
-            self.WaitWindow.hide ()
+            c = authconn.Connection (host=self.mainapp.connect_server,
+                                     parent=parent, lock=True)
+            debugprint ("in get_devices: connected")
+            c._begin_operation (_("fetching device list"))
+            try:
+                if network:
+                    debugprint ("Fetching network devices")
+                    ret = cupshelpers.getDevices (c,
+                                                  include_schemes=network_schemes)
+                else:
+                    debugprint ("Fetching local devices")
+                    ret = cupshelpers.getDevices (c,
+                                                  exclude_schemes=network_schemes)
+            except TypeError:
+                # include_schemes/exclude_schemes requires pycups >= 1.9.46
+                if network:
+                    ret = {}
+                else:
+                    debugprint ("Fetching all devices")
+                    debugprint ("in get_devices: getDevices")
+                    ret = cupshelpers.getDevices (c)
+        except RuntimeError:
+            raise
+        except cups.IPPError:
+            c._end_operation ()
             raise
 
-        self.mainapp.cups._end_operation ()
-        self.WaitWindow.hide ()
+        c._end_operation ()
         debugprint ("Got devices")
-        return devices
+        return ret
 
     def install_hplip_plugin(self, uri):
         """
@@ -4949,23 +4980,53 @@ class NewPrinterGUI(GtkGUI):
         return (host, uri)
 
     def fillDeviceTab(self, current_uri=None):
-        try:
-            devices = self.fetchDevices()
-        except cups.IPPError, (e, msg):
-            self.show_IPP_Error(e, msg)
-            devices = {}
-        except:
-            nonfatalException()
-            devices = {}
+        self.device_selected = -1
+        model = gtk.TreeStore (gobject.TYPE_STRING,   # device-info
+                               gobject.TYPE_PYOBJECT, # PhysicalDevice obj
+                               gobject.TYPE_BOOLEAN)  # Separator?
+        other = cupshelpers.Device('', **{'device-info' :_("Other")})
+        physother = PhysicalDevice (other)
+        self.devices = [physother]
+        model.append (None, row=[physother.get_info (), physother, False])
+        network_iter = model.append (None, row=[_("Network Printer"),
+                                                None,
+                                                False])
+        network_dict = { 'device-class': 'network',
+                         'device-info': _("Find Network Printer") }
+        network = cupshelpers.Device ('network', **network_dict)
+        find_nw_iter = model.append (network_iter,
+                                     row=[network_dict['device-info'],
+                                          PhysicalDevice (network), False])
+        model.insert_after (network_iter, find_nw_iter, row=['', None, True])
+        self.devices_find_nw_iter = find_nw_iter
+        self.devices_network_iter = network_iter
+        self.devices_network_fetched = False
+        self.tvNPDevices.set_model (model)
+        self.entNPTDevice.set_text ('')
+        self.expNPDeviceURIs.hide ()
+        self.inc_spinner_task ()
+
+        TimedOperation (self.fetchDevices,
+                        kwargs={"network": False},
+                        callback=self.got_devices,
+                        context=current_uri)
+
+    def got_devices (self, result, exception, current_uri=None):
+        self.dec_spinner_task ()
+        if exception:
+            try:
+                raise exception
+            except:
+                nonfatalException()
+            return
 
+        devices = result
         if current_uri:
             if devices.has_key (current_uri):
                 current = devices.pop(current_uri)
-                current.info += _(" (Current)")
             elif devices.has_key (current_uri.replace (":9100", "")):
                 current_uri = current_uri.replace (":9100", "")
                 current = devices.pop(current_uri)
-                current.info += _(" (Current)")
             else:
                 current = cupshelpers.Device (current_uri)
                 current.info = "Current device"
@@ -5008,7 +5069,7 @@ class NewPrinterGUI(GtkGUI):
                                                  "hal", "beh",
                                                  "scsi", "http", "delete"),
                          devices)
-        self.devices = []
+        newdevices = []
         for device in devices:
             physicaldevice = PhysicalDevice (device)
             try:
@@ -5016,43 +5077,32 @@ class NewPrinterGUI(GtkGUI):
                 self.devices[i].add_device (device)
             except ValueError:
                 self.devices.append (physicaldevice)
+                newdevices.append (physicaldevice)
 
         self.devices.sort()
-        other = cupshelpers.Device('', **{'device-info' :_("Other")})
-        self.devices.append (PhysicalDevice (other))
-        device_select_index = 0
         if current_uri:
             current_device = PhysicalDevice (current)
             try:
                 i = self.devices.index (current_device)
                 self.devices[i].add_device (current)
-                device_select_index = i
-                devs = self.devices[i].get_devices ()
+                current_device = self.devices[i]
             except ValueError:
-                self.devices.insert(0, current_device)
+                self.devices.append (current_device)
+                newdevices.append (current_device)
+        else:
+            current_device = None
 
-        model = gtk.TreeStore (gobject.TYPE_STRING,   # device-info
-                               gobject.TYPE_PYOBJECT, # PhysicalDevice obj
-                               gobject.TYPE_BOOLEAN)  # Separator?
-        network_iter = model.append (None, row=[_("Network Printer"),
-                                                None,
-                                                False])
-        network_dict = { 'device-class': 'network',
-                         'device-info': _("Find Network Printer") }
-        network = cupshelpers.Device ('network', **network_dict)
-        find_nw_iter = model.append (network_iter,
-                                     row=[network_dict['device-info'],
-                                          PhysicalDevice (network), False])
-        model.insert_after (network_iter, find_nw_iter, row=['', None, True])
-        self.devices_find_nw_iter = find_nw_iter
-        self.tvNPDevices.set_model (model)
+        model = self.tvNPDevices.get_model ()
 
-        i = 0
-        device_select_path = None
-        for device in self.devices:
+        network_iter = self.devices_network_iter
+        find_nw_iter = self.devices_find_nw_iter
+        for device in newdevices:
             devs = device.get_devices ()
             network = devs[0].device_class == 'network'
-            row=[device.get_info (), device, False]
+            info = device.get_info ()
+            if device == current_device:
+                info += _(" (Current)")
+            row=[info, device, False]
             if network:
                 if devs[0].uri != devs[0].type:
                     # An actual network printer device.  Put this at the top.
@@ -5062,24 +5112,31 @@ class NewPrinterGUI(GtkGUI):
                     # If this is the currently selected device we need
                     # to expand the "Network Printer" row so that it
                     # is visible.
-                    if device_select_index == i:
+                    if device == current_device:
                         network_path = model.get_path (network_iter)
                         self.tvNPDevices.expand_row (network_path, False)
                 else:
                     # Just a method of finding one.
                     iter = model.append (network_iter, row=row)
             else:
-                iter = model.insert_before(None, network_iter, row=row)
+                # Insert this local device in order.
+                iter = model.get_iter_first ()
+                while iter != network_iter:
+                    physdev = model.get_value (iter, 1)
+                    if physdev > device:
+                        break
+
+                    iter = model.iter_next (iter)
+
+                iter = model.insert_before (None, iter, row=row)
 
-            if device_select_index == i:
+            if device == current_device:
                 device_select_path = model.get_path (iter)
                 self.tvNPDevices.scroll_to_cell (device_select_path,
                                                  row_align=0.5)
                 column = self.tvNPDevices.get_column (0)
                 self.tvNPDevices.set_cursor (device_select_path, column)
 
-            i += 1
-
         connection_select_path = 0
         if current_uri:
             model = self.tvNPDeviceURIs.get_model ()
@@ -5093,6 +5150,9 @@ class NewPrinterGUI(GtkGUI):
 
                 iter = model.iter_next (iter)
                 i += 1
+        elif not self.device_selected:
+            column = self.tvNPDevices.get_column (0)
+            self.tvNPDevices.set_cursor ((0,), column)
 
         column = self.tvNPDeviceURIs.get_column (0)
         self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
@@ -5538,6 +5598,13 @@ class NewPrinterGUI(GtkGUI):
         else:
             view.expand_row (path, False)
 
+    def device_row_expanded (self, view, iter, path):
+        if not self.devices_network_fetched:
+            self.devices_network_fetched = True
+            self.inc_spinner_task ()
+            TimedOperation (self.fetchDevices, kwargs={'network': True},
+                            callback=self.got_devices)
+
     def device_select_function (self, path):
         """
         Allow this path to be selected as long as there
@@ -5552,6 +5619,7 @@ class NewPrinterGUI(GtkGUI):
         return False
 
     def on_tvNPDevices_cursor_changed(self, widget):
+        self.device_selected += 1
         path, column = widget.get_cursor ()
         if path == None:
             return
@@ -5855,8 +5923,7 @@ class NewPrinterGUI(GtkGUI):
         self.network_found = 0
         self.lblNetworkFindSearching.show_all ()
         finder = probe_printer.PrinterFinder ()
-        self.imgProcessWorking.show ()
-        self.spinner.start ()
+        self.inc_spinner_task ()
         finder.find (host, found_callback)
 
     def found_network_printer_callback (self, new_device):
@@ -5885,8 +5952,7 @@ class NewPrinterGUI(GtkGUI):
                 path = model.get_path (iter)
                 self.tvNPDevices.set_cursor (path)
         else:
-            self.imgProcessWorking.hide ()
-            self.spinner.stop ()
+            self.dec_spinner_task ()
             self.lblNetworkFindSearching.hide ()
             self.entNPTNetworkHostname.set_sensitive (True)
             self.btnNetworkFind.set_sensitive (True)
diff -up system-config-printer-1.1.12/timedops.py.get-devices system-config-printer-1.1.12/timedops.py
--- system-config-printer-1.1.12/timedops.py.get-devices	2009-08-25 15:01:41.000000000 +0100
+++ system-config-printer-1.1.12/timedops.py	2009-09-03 17:39:48.935433815 +0100
@@ -152,16 +152,24 @@ class OperationThread(threading.Thread):
 
 class TimedOperation(Timed):
     def __init__ (self, target, args=(), kwargs={}, parent=None,
-                  show_dialog=False):
+                  show_dialog=False, callback=None, context=None):
         self.wait_window = None
         self.parent = parent
         self.show_dialog = show_dialog
+        self.callback = callback
+        self.context = context
         self.thread = OperationThread (target=target,
                                        args=args,
                                        kwargs=kwargs)
         self.thread.start ()
 
+        if self.callback:
+            self.timeout_source = gobject.timeout_add (50, self._check_thread)
+
     def run (self):
+        if self.callback:
+            raise RuntimeError
+
         if self.show_dialog:
             wait = gtk.MessageDialog (self.parent,
                                       gtk.DIALOG_MODAL |
@@ -170,7 +178,7 @@ class TimedOperation(Timed):
                                       gtk.BUTTONS_CANCEL,
                                       _("Please wait"))
             wait.connect ("delete_event", lambda *args: False)
-            wait.connect ("response", self.wait_window_response)
+            wait.connect ("response", self._wait_window_response)
             if self.parent:
                 wait.set_transient_for (self.parent)
 
@@ -178,7 +186,7 @@ class TimedOperation(Timed):
             wait.format_secondary_text (_("Gathering information"))
             wait.show_all ()
 
-        self.timeout_source = gobject.timeout_add (50, self.check_thread)
+        self.timeout_source = gobject.timeout_add (50, self._check_thread)
         gtk.main ()
         gobject.source_remove (self.timeout_source)
         if self.show_dialog:
@@ -186,20 +194,32 @@ class TimedOperation(Timed):
 
         return self.thread.collect_result ()
 
-    def check_thread (self):
+    def _check_thread (self):
         if self.thread.isAlive ():
             # Thread still running.
             return True
 
-        # Thread has finished.  Stop the sub-loop.
-        gtk.main_quit ()
+        # Thread has finished.  Stop the sub-loop or trigger callback.
+        if self.callback:
+            if self.context != None:
+                self.callback (self.thread.result, self.thread.exception,
+                               self.context)
+            else:
+                self.callback (self.thread.result, self.thread.exception)
+        else:
+            gtk.main_quit ()
+
         return False
 
-    def wait_window_response (self, dialog, response):
+    def _wait_window_response (self, dialog, response):
         if response == gtk.RESPONSE_CANCEL:
             self.cancel ()
 
     def cancel (self):
         debugprint ("Command canceled")
-        gtk.main_quit ()
+        if self.callback:
+            self.callback = None
+        else:
+            gtk.main_quit ()
+
         return False


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- system-config-printer.spec	3 Sep 2009 16:37:39 -0000	1.281
+++ system-config-printer.spec	3 Sep 2009 16:48:08 -0000	1.282
@@ -20,6 +20,7 @@ Patch3: system-config-printer-icon-load-
 Patch4: system-config-printer-proxy-auth.patch
 Patch5: system-config-printer-ppdippstr.patch
 Patch6: system-config-printer-raw-device-change.patch
+Patch7: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -74,6 +75,7 @@ the configuration tool.
 %patch4 -p1 -b .proxy-auth
 %patch5 -p1 -b .ppdippstr
 %patch6 -p1 -b .raw-device-change
+%patch7 -p1 -b .get-devices
 
 %build
 %configure
@@ -176,6 +178,7 @@ exit 0
 
 %changelog
 * Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
+- Speed improvement when fetching devices.
 - Allow raw devices to be changed.
 
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6



From twaugh at fedoraproject.org  Thu Sep  3 16:53:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Sep 2009 16:53:27 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-get-devices.patch, NONE,
	1.1 system-config-printer.spec, 1.290, 1.291
Message-ID: <20090903165327.CC20F11C0099@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19967

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-get-devices.patch 
Log Message:
* Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
- Speed improvement when fetching devices.


system-config-printer-get-devices.patch:
 cupshelpers/cupshelpers.py |    4 
 cupspk.py                  |   18 +++
 gtkspinner.py              |    2 
 system-config-printer.py   |  211 ++++++++++++++++++++++++++++-----------------
 timedops.py                |   36 +++++--
 5 files changed, 178 insertions(+), 93 deletions(-)

--- NEW FILE system-config-printer-get-devices.patch ---
diff -up system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices system-config-printer-1.1.12/cupshelpers/cupshelpers.py
--- system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-03 17:44:32.610304039 +0100
@@ -541,7 +541,7 @@ class Device:
         
         return result
 
-def getDevices(connection):
+def getDevices(connection, **kw):
     """
     Obtain a list of available CUPS devices.
 
@@ -550,7 +550,7 @@ def getDevices(connection):
     @returns: a list of L{Device} objects
     @raise cups.IPPError: IPP Error
     """
-    devices = connection.getDevices()
+    devices = connection.getDevices(**kw)
     for uri, data in devices.iteritems():
         device = Device(uri, **data)
         devices[uri] = device
diff -up system-config-printer-1.1.12/cupspk.py.get-devices system-config-printer-1.1.12/cupspk.py
--- system-config-printer-1.1.12/cupspk.py.get-devices	2009-09-03 17:44:32.513304908 +0100
+++ system-config-printer-1.1.12/cupspk.py	2009-09-03 17:44:32.612310211 +0100
@@ -311,12 +311,13 @@ class Connection:
     def getDevices(self, *args, **kwds):
         use_pycups = False
 
-        timeout = 0
+        limit = 0
         include_schemes = ''
         exclude_schemes = ''
+        timeout = 0
 
-        if len(args) == 3:
-            (use_pycups, timeout, include_schemes, exclude_schemes) = self._args_to_tuple([int, str, str], *args)
+        if len(args) == 4:
+            (use_pycups, limit, include_schemes, exclude_schemes, timeout) = self._args_to_tuple([int, str, str, int], *args)
         else:
             if kwds.has_key('timeout'):
                 timeout = kwds['timeout']
@@ -327,6 +328,17 @@ class Connection:
             if kwds.has_key('exclude_schemes'):
                 exclude_schemes = kwds['exclude_schemes']
 
+        # Convert from list to string
+        if len (include_schemes) > 0:
+            include_schemes = reduce (lambda x, y: x + "," + y, include_schemes)
+        else:
+            include_schemes = ""
+
+        if len (exclude_schemes) > 0:
+            exclude_schemes = reduce (lambda x, y: x + "," + y, exclude_schemes)
+        else:
+            exclude_schemes = ""
+
         pk_args = (timeout, include_schemes, exclude_schemes)
 
         result = self._call_with_pk_and_fallback(use_pycups,
diff -up system-config-printer-1.1.12/gtkspinner.py.get-devices system-config-printer-1.1.12/gtkspinner.py
--- system-config-printer-1.1.12/gtkspinner.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/gtkspinner.py	2009-09-03 17:44:32.614305510 +0100
@@ -65,7 +65,7 @@ class Spinner:
     def _next_frame (self):
         n = self._current_frame + 1
         if n >= self.n_frames:
-            n = 0
+            n = 1
 
         self._set_frame (n)
         return True
diff -up system-config-printer-1.1.12/system-config-printer.py.get-devices system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-03 17:44:32.601305285 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-03 17:45:23.411307659 +0100
@@ -3681,6 +3681,7 @@ class NewPrinterGUI(GtkGUI):
         self.ntbkNPDownloadableDriverProperties.set_show_tabs(False)
 
         self.spinner = gtkspinner.Spinner (self.imgProcessWorking)
+        self.spinner_count = 0
 
         # Set up OpenPrinting widgets.
         self.openprinting = cupshelpers.openprinting.OpenPrinting ()
@@ -3716,6 +3717,7 @@ class NewPrinterGUI(GtkGUI):
         slct.set_select_function (self.device_select_function)
         self.tvNPDevices.set_row_separator_func (self.device_row_separator_fn)
         self.tvNPDevices.connect ("row-activated", self.device_row_activated)
+        self.tvNPDevices.connect ("row-expanded", self.device_row_expanded)
 
         # Devices expander
         self.expNPDeviceURIs.connect ("notify::expanded",
@@ -3765,6 +3767,19 @@ class NewPrinterGUI(GtkGUI):
         ppd_filter.add_pattern("*")
         self.filechooserPPD.add_filter(ppd_filter)
 
+    def inc_spinner_task (self):
+        if self.spinner_count == 0:
+            self.imgProcessWorking.show ()
+            self.spinner.start ()
+
+        self.spinner_count += 1
+
+    def dec_spinner_task (self):
+        self.spinner_count -= 1
+        if self.spinner_count == 0:
+            self.imgProcessWorking.hide ()
+            self.spinner.stop ()
+
     def show_IPP_Error (self, exception, message):
         return show_IPP_Error (exception, message, parent=self.NewPrinterWindow)
 
@@ -4611,45 +4626,48 @@ class NewPrinterGUI(GtkGUI):
             self.btnNPForward.set_sensitive(
                 self.mainapp.checkNPName(new_text))
 
-    def fetchDevices(self, parent=None):
+    def fetchDevices(self, parent=None, network=False):
         debugprint ("fetchDevices")
-        self.lblWait.set_markup ('<span weight="bold" size="larger">' +
-                                 _('Searching') + '</span>\n\n' +
-                                 _('Searching for printers'))
-        if parent == None:
-            parent = self.mainapp.PrintersWindow
-        self.WaitWindow.set_transient_for (parent)
-        self.WaitWindow.show_now ()
-        self.busy (self.WaitWindow)
 
-        if self.mainapp.cups._use_pk and config.WITH_POLKIT_1:
-            def get_devices():
-                c = authconn.Connection (host=self.mainapp.connect_server,
-                                         parent=parent, lock=True)
-                c._begin_operation (_("fetching device list"))
-                ret = cupshelpers.getDevices (c)
-                c._end_operation ()
-                return ret
+        have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
+        if not have_polkit_1:
+            if network:
+                return {}
 
-            op = TimedOperation (get_devices)
-            try:
-                devices = op.run ()
-            except (OperationCanceled, RuntimeError, cups.IPPError):
-                self.WaitWindow.hide ()
-                raise
-        else:
-            self.mainapp.cups._begin_operation (_("fetching device list"))
-            try:
-                devices = cupshelpers.getDevices (self.mainapp.cups)
-                self.mainapp.cups._end_operation ()
-            except cups.IPPError:
-                self.mainapp.cups._end_operation ()
-                self.WaitWindow.hide ()
-                raise
+            network = True
 
-        self.WaitWindow.hide ()
+        network_schemes = ["dnssd", "snmp"]
+        try:
+            c = authconn.Connection (host=self.mainapp.connect_server,
+                                     parent=parent, lock=True)
+            debugprint ("in get_devices: connected")
+            c._begin_operation (_("fetching device list"))
+            try:
+                if network:
+                    debugprint ("Fetching network devices")
+                    ret = cupshelpers.getDevices (c,
+                                                  include_schemes=network_schemes)
+                else:
+                    debugprint ("Fetching local devices")
+                    ret = cupshelpers.getDevices (c,
+                                                  exclude_schemes=network_schemes)
+            except TypeError:
+                # include_schemes/exclude_schemes requires pycups >= 1.9.46
+                if network:
+                    ret = {}
+                else:
+                    debugprint ("Fetching all devices")
+                    debugprint ("in get_devices: getDevices")
+                    ret = cupshelpers.getDevices (c)
+        except RuntimeError:
+            raise
+        except cups.IPPError:
+            c._end_operation ()
+            raise
+
+        c._end_operation ()
         debugprint ("Got devices")
-        return devices
+        return ret
 
     def install_hplip_plugin(self, uri):
         """
@@ -4962,23 +4980,53 @@ class NewPrinterGUI(GtkGUI):
         return (host, uri)
 
     def fillDeviceTab(self, current_uri=None):
-        try:
-            devices = self.fetchDevices()
-        except cups.IPPError, (e, msg):
-            self.show_IPP_Error(e, msg)
-            devices = {}
-        except:
-            nonfatalException()
-            devices = {}
+        self.device_selected = -1
+        model = gtk.TreeStore (gobject.TYPE_STRING,   # device-info
+                               gobject.TYPE_PYOBJECT, # PhysicalDevice obj
+                               gobject.TYPE_BOOLEAN)  # Separator?
+        other = cupshelpers.Device('', **{'device-info' :_("Other")})
+        physother = PhysicalDevice (other)
+        self.devices = [physother]
+        model.append (None, row=[physother.get_info (), physother, False])
+        network_iter = model.append (None, row=[_("Network Printer"),
+                                                None,
+                                                False])
+        network_dict = { 'device-class': 'network',
+                         'device-info': _("Find Network Printer") }
+        network = cupshelpers.Device ('network', **network_dict)
+        find_nw_iter = model.append (network_iter,
+                                     row=[network_dict['device-info'],
+                                          PhysicalDevice (network), False])
+        model.insert_after (network_iter, find_nw_iter, row=['', None, True])
+        self.devices_find_nw_iter = find_nw_iter
+        self.devices_network_iter = network_iter
+        self.devices_network_fetched = False
+        self.tvNPDevices.set_model (model)
+        self.entNPTDevice.set_text ('')
+        self.expNPDeviceURIs.hide ()
+        self.inc_spinner_task ()
+
+        TimedOperation (self.fetchDevices,
+                        kwargs={"network": False},
+                        callback=self.got_devices,
+                        context=current_uri)
+
+    def got_devices (self, result, exception, current_uri=None):
+        self.dec_spinner_task ()
+        if exception:
+            try:
+                raise exception
+            except:
+                nonfatalException()
+            return
 
+        devices = result
         if current_uri:
             if devices.has_key (current_uri):
                 current = devices.pop(current_uri)
-                current.info += _(" (Current)")
             elif devices.has_key (current_uri.replace (":9100", "")):
                 current_uri = current_uri.replace (":9100", "")
                 current = devices.pop(current_uri)
-                current.info += _(" (Current)")
             else:
                 current = cupshelpers.Device (current_uri)
                 current.info = "Current device"
@@ -5021,7 +5069,7 @@ class NewPrinterGUI(GtkGUI):
                                                  "hal", "beh",
                                                  "scsi", "http", "delete"),
                          devices)
-        self.devices = []
+        newdevices = []
         for device in devices:
             physicaldevice = PhysicalDevice (device)
             try:
@@ -5029,43 +5077,32 @@ class NewPrinterGUI(GtkGUI):
                 self.devices[i].add_device (device)
             except ValueError:
                 self.devices.append (physicaldevice)
+                newdevices.append (physicaldevice)
 
         self.devices.sort()
-        other = cupshelpers.Device('', **{'device-info' :_("Other")})
-        self.devices.append (PhysicalDevice (other))
-        device_select_index = 0
         if current_uri:
             current_device = PhysicalDevice (current)
             try:
                 i = self.devices.index (current_device)
                 self.devices[i].add_device (current)
-                device_select_index = i
-                devs = self.devices[i].get_devices ()
+                current_device = self.devices[i]
             except ValueError:
-                self.devices.insert(0, current_device)
+                self.devices.append (current_device)
+                newdevices.append (current_device)
+        else:
+            current_device = None
 
-        model = gtk.TreeStore (gobject.TYPE_STRING,   # device-info
-                               gobject.TYPE_PYOBJECT, # PhysicalDevice obj
-                               gobject.TYPE_BOOLEAN)  # Separator?
-        network_iter = model.append (None, row=[_("Network Printer"),
-                                                None,
-                                                False])
-        network_dict = { 'device-class': 'network',
-                         'device-info': _("Find Network Printer") }
-        network = cupshelpers.Device ('network', **network_dict)
-        find_nw_iter = model.append (network_iter,
-                                     row=[network_dict['device-info'],
-                                          PhysicalDevice (network), False])
-        model.insert_after (network_iter, find_nw_iter, row=['', None, True])
-        self.devices_find_nw_iter = find_nw_iter
-        self.tvNPDevices.set_model (model)
+        model = self.tvNPDevices.get_model ()
 
-        i = 0
-        device_select_path = None
-        for device in self.devices:
+        network_iter = self.devices_network_iter
+        find_nw_iter = self.devices_find_nw_iter
+        for device in newdevices:
             devs = device.get_devices ()
             network = devs[0].device_class == 'network'
-            row=[device.get_info (), device, False]
+            info = device.get_info ()
+            if device == current_device:
+                info += _(" (Current)")
+            row=[info, device, False]
             if network:
                 if devs[0].uri != devs[0].type:
                     # An actual network printer device.  Put this at the top.
@@ -5075,24 +5112,31 @@ class NewPrinterGUI(GtkGUI):
                     # If this is the currently selected device we need
                     # to expand the "Network Printer" row so that it
                     # is visible.
-                    if device_select_index == i:
+                    if device == current_device:
                         network_path = model.get_path (network_iter)
                         self.tvNPDevices.expand_row (network_path, False)
                 else:
                     # Just a method of finding one.
                     iter = model.append (network_iter, row=row)
             else:
-                iter = model.insert_before(None, network_iter, row=row)
+                # Insert this local device in order.
+                iter = model.get_iter_first ()
+                while iter != network_iter:
+                    physdev = model.get_value (iter, 1)
+                    if physdev > device:
+                        break
+
+                    iter = model.iter_next (iter)
+
+                iter = model.insert_before (None, iter, row=row)
 
-            if device_select_index == i:
+            if device == current_device:
                 device_select_path = model.get_path (iter)
                 self.tvNPDevices.scroll_to_cell (device_select_path,
                                                  row_align=0.5)
                 column = self.tvNPDevices.get_column (0)
                 self.tvNPDevices.set_cursor (device_select_path, column)
 
-            i += 1
-
         connection_select_path = 0
         if current_uri:
             model = self.tvNPDeviceURIs.get_model ()
@@ -5106,6 +5150,9 @@ class NewPrinterGUI(GtkGUI):
 
                 iter = model.iter_next (iter)
                 i += 1
+        elif not self.device_selected:
+            column = self.tvNPDevices.get_column (0)
+            self.tvNPDevices.set_cursor ((0,), column)
 
         column = self.tvNPDeviceURIs.get_column (0)
         self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
@@ -5551,6 +5598,13 @@ class NewPrinterGUI(GtkGUI):
         else:
             view.expand_row (path, False)
 
+    def device_row_expanded (self, view, iter, path):
+        if not self.devices_network_fetched:
+            self.devices_network_fetched = True
+            self.inc_spinner_task ()
+            TimedOperation (self.fetchDevices, kwargs={'network': True},
+                            callback=self.got_devices)
+
     def device_select_function (self, path):
         """
         Allow this path to be selected as long as there
@@ -5565,6 +5619,7 @@ class NewPrinterGUI(GtkGUI):
         return False
 
     def on_tvNPDevices_cursor_changed(self, widget):
+        self.device_selected += 1
         path, column = widget.get_cursor ()
         if path == None:
             return
@@ -5868,8 +5923,7 @@ class NewPrinterGUI(GtkGUI):
         self.network_found = 0
         self.lblNetworkFindSearching.show_all ()
         finder = probe_printer.PrinterFinder ()
-        self.imgProcessWorking.show ()
-        self.spinner.start ()
+        self.inc_spinner_task ()
         finder.find (host, found_callback)
 
     def found_network_printer_callback (self, new_device):
@@ -5898,8 +5952,7 @@ class NewPrinterGUI(GtkGUI):
                 path = model.get_path (iter)
                 self.tvNPDevices.set_cursor (path)
         else:
-            self.imgProcessWorking.hide ()
-            self.spinner.stop ()
+            self.dec_spinner_task ()
             self.lblNetworkFindSearching.hide ()
             self.entNPTNetworkHostname.set_sensitive (True)
             self.btnNetworkFind.set_sensitive (True)
diff -up system-config-printer-1.1.12/timedops.py.get-devices system-config-printer-1.1.12/timedops.py
--- system-config-printer-1.1.12/timedops.py.get-devices	2009-08-25 15:01:41.000000000 +0100
+++ system-config-printer-1.1.12/timedops.py	2009-09-03 17:44:32.629302805 +0100
@@ -152,16 +152,24 @@ class OperationThread(threading.Thread):
 
 class TimedOperation(Timed):
     def __init__ (self, target, args=(), kwargs={}, parent=None,
-                  show_dialog=False):
+                  show_dialog=False, callback=None, context=None):
         self.wait_window = None
         self.parent = parent
         self.show_dialog = show_dialog
+        self.callback = callback
+        self.context = context
         self.thread = OperationThread (target=target,
                                        args=args,
                                        kwargs=kwargs)
         self.thread.start ()
 
+        if self.callback:
+            self.timeout_source = gobject.timeout_add (50, self._check_thread)
+
     def run (self):
+        if self.callback:
+            raise RuntimeError
+
         if self.show_dialog:
             wait = gtk.MessageDialog (self.parent,
                                       gtk.DIALOG_MODAL |
@@ -170,7 +178,7 @@ class TimedOperation(Timed):
                                       gtk.BUTTONS_CANCEL,
                                       _("Please wait"))
             wait.connect ("delete_event", lambda *args: False)
-            wait.connect ("response", self.wait_window_response)
+            wait.connect ("response", self._wait_window_response)
             if self.parent:
                 wait.set_transient_for (self.parent)
 
@@ -178,7 +186,7 @@ class TimedOperation(Timed):
             wait.format_secondary_text (_("Gathering information"))
             wait.show_all ()
 
-        self.timeout_source = gobject.timeout_add (50, self.check_thread)
+        self.timeout_source = gobject.timeout_add (50, self._check_thread)
         gtk.main ()
         gobject.source_remove (self.timeout_source)
         if self.show_dialog:
@@ -186,20 +194,32 @@ class TimedOperation(Timed):
 
         return self.thread.collect_result ()
 
-    def check_thread (self):
+    def _check_thread (self):
         if self.thread.isAlive ():
             # Thread still running.
             return True
 
-        # Thread has finished.  Stop the sub-loop.
-        gtk.main_quit ()
+        # Thread has finished.  Stop the sub-loop or trigger callback.
+        if self.callback:
+            if self.context != None:
+                self.callback (self.thread.result, self.thread.exception,
+                               self.context)
+            else:
+                self.callback (self.thread.result, self.thread.exception)
+        else:
+            gtk.main_quit ()
+
         return False
 
-    def wait_window_response (self, dialog, response):
+    def _wait_window_response (self, dialog, response):
         if response == gtk.RESPONSE_CANCEL:
             self.cancel ()
 
     def cancel (self):
         debugprint ("Command canceled")
-        gtk.main_quit ()
+        if self.callback:
+            self.callback = None
+        else:
+            gtk.main_quit ()
+
         return False


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- system-config-printer.spec	3 Sep 2009 16:42:32 -0000	1.290
+++ system-config-printer.spec	3 Sep 2009 16:53:27 -0000	1.291
@@ -21,6 +21,7 @@ Patch4: system-config-printer-polkit-1.p
 Patch5: system-config-printer-proxy-auth.patch
 Patch6: system-config-printer-ppdippstr.patch
 Patch7: system-config-printer-raw-device-change.patch
+Patch8: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -89,6 +90,7 @@ printers.
 %patch5 -p1 -b .proxy-auth
 %patch6 -p1 -b .ppdippstr
 %patch7 -p1 -b .raw-device-change
+%patch8 -p1 -b .get-devices
 
 %build
 aclocal
@@ -204,6 +206,7 @@ exit 0
 
 %changelog
 * Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
+- Speed improvement when fetching devices.
 - Allow raw devices to be changed.
 
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6



From arbiter at fedoraproject.org  Thu Sep  3 17:04:36 2009
From: arbiter at fedoraproject.org (arbiter)
Date: Thu,  3 Sep 2009 17:04:36 +0000 (UTC)
Subject: rpms/bip/devel .cvsignore, 1.5, 1.6 bip.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20090903170436.93BE211C0099@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/bip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28016

Modified Files:
	.cvsignore bip.spec sources 
Log Message:
0.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bip/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Mar 2009 18:25:22 -0000	1.5
+++ .cvsignore	3 Sep 2009 17:04:36 -0000	1.6
@@ -1 +1 @@
-bip-0.8.0.tar.gz
+bip-0.8.2.tar.gz


Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/devel/bip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bip.spec	21 Aug 2009 12:38:18 -0000	1.10
+++ bip.spec	3 Sep 2009 17:04:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:    bip
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
 License: GPLv2+
@@ -83,6 +83,9 @@ fi
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Thu Sep 03 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.2-1
+- 0.8.2
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bip/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Mar 2009 18:25:22 -0000	1.5
+++ sources	3 Sep 2009 17:04:36 -0000	1.6
@@ -1 +1 @@
-ee036d96fec6222de5a8449e013552da  bip-0.8.0.tar.gz
+3f3a66f6179456ba7efb1970a89f46dd  bip-0.8.2.tar.gz



From kdudka at fedoraproject.org  Thu Sep  3 17:17:55 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu,  3 Sep 2009 17:17:55 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.112,1.113
Message-ID: <20090903171755.EAD2311C0099@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31998

Modified Files:
	curl.spec 
Log Message:
- cover ssh and stunnel support by the test-suite


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- curl.spec	2 Sep 2009 14:19:19 -0000	1.112
+++ curl.spec	3 Sep 2009 17:17:55 -0000	1.113
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -18,8 +18,10 @@ URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: groff
+BuildRequires: openssh-server openssh-clients
 BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
+BuildRequires: stunnel
 Requires: libcurl = %{version}-%{release}
 
 %description
@@ -148,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Sep 03 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-5
+- cover ssh and stunnel support by the test-suite
+
 * Wed Sep 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-4
 - use pkg-config to find nss and libssh2 if possible
 - better patch (not only) for SCP/SFTP polling



From steve at fedoraproject.org  Thu Sep  3 17:20:16 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Thu,  3 Sep 2009 17:20:16 +0000 (UTC)
Subject: rpms/perl-IPC-Run/devel .cvsignore, 1.5, 1.6 perl-IPC-Run.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <20090903172016.3C8B811C0375@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-IPC-Run/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32724

Modified Files:
	.cvsignore perl-IPC-Run.spec sources 
Log Message:
Update to 0.84.
Drop IPCRUNDEBUG from "make test" (bug fixed long ago).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Jan 2009 01:27:59 -0000	1.5
+++ .cvsignore	3 Sep 2009 17:20:15 -0000	1.6
@@ -1 +1 @@
-IPC-Run-0.82.tar.gz
+IPC-Run-0.84.tar.gz


Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-IPC-Run.spec	26 Jul 2009 06:43:30 -0000	1.19
+++ perl-IPC-Run.spec	3 Sep 2009 17:20:16 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Run
-Version:        0.82
-Release:        3%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Perl module for interacting with child processes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,8 +46,7 @@ rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/I
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/IPC::Run::Win32*.3*
 
 %check
-# https://rt.cpan.org/NoAuth/Bug.html?id=11129
-[ ! -d /dev/pts ] || IPCRUNDEBUG=2 make test
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 02 2009 Steven Pritchard <steve at kspei.com> 0.84-1
+- Update to 0.84.
+- Drop IPCRUNDEBUG from "make test" (bug fixed long ago).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Jan 2009 01:27:59 -0000	1.5
+++ sources	3 Sep 2009 17:20:16 -0000	1.6
@@ -1 +1 @@
-6eb9fa0058956ece7fdf25c6ec395288  IPC-Run-0.82.tar.gz
+f7c1b7584ebcde637479bf5aa321491f  IPC-Run-0.84.tar.gz



From hadess at fedoraproject.org  Thu Sep  3 17:31:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  3 Sep 2009 17:31:33 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel
	0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch,
	NONE, 1.1 gnome-bluetooth.spec, 1.89, 1.90
Message-ID: <20090903173133.56F0E11C0099@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7918

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch 
Log Message:
* Thu Sep 03 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-2
- Fix connecting to audio devices not working when disconnected
  at start


0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch:
 bluetooth-enums.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch ---
>From b4b046cd37324454c7125d345cceabb5c6f61612 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 3 Sep 2009 18:17:43 +0100
Subject: [PATCH] =?utf-8?q?Bug=C2=A0594055=20-=20applet=20fails=20to=20connect=20to=20any=20disconnected=20audio=20device?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Hunted down by Peter Hurley <phurley at charter.net>.

Description
If the remote device is disconnected when the applet starts, the applet
will be unable to initiate connection to the audio interface of the
device.

Cause
Incorrect use of g_hash_table_lookup in the device_list_nodes() function
in lib/bluetooth-client.c

Discussion
For a given device, device_list_nodes() loops through the known
detectable interfaces (those in detectable_interfaces[]) and adds
them to the returned hash table if calling the interfaces's
.GetProperties dbus method returns true.

The value of the "Connected" property is then stored as the associated
value with the interface name as the key in the hash table.

The *connectable* interface "org.bluez.Audio" is only added if at least
either of the *detectable* interfaces "org.bluez.Headset" or
"org.bluez.AudioSink" were added the the hash table in previous
iterations within device_list_nodes().

However, the test for whether those *detectable* interfaces were added
is not correct. Currently, g_hash_table_lookup() is used to determine
if the interface names are in the hash table.  g_hash_table_lookup()
will return NULL if the the key is not present in the hash table,
OTHERWISE IT RETURNS THE VALUE ASSOCIATED WITH THE KEY. If that value
is 0 (== BLUETOOTH_STATUS_DISCONNECTED), the logic mistakenly believes
that the key is not present in the hash table, and as a result, fails
to add the only connectable audio interface "org.bluez.Audio".

Recommend
Either use g_hash_table_lookup_extended() to test for key presence
or change enum BLUET00TH_STATUS_DISCONNECTED to be != 0.
---
 lib/bluetooth-enums.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-enums.h b/lib/bluetooth-enums.h
index 7563c4c..450c38c 100644
--- a/lib/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
@@ -80,7 +80,8 @@ typedef enum {
 } BluetoothColumn;
 
 typedef enum {
-	BLUETOOTH_STATUS_DISCONNECTED = 0,
+	BLUETOOTH_STATUS_INVALID = 0,
+	BLUETOOTH_STATUS_DISCONNECTED,
 	BLUETOOTH_STATUS_CONNECTED,
 	BLUETOOTH_STATUS_CONNECTING,
 	BLUETOOTH_STATUS_PLAYING
-- 
1.6.2.5



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- gnome-bluetooth.spec	2 Sep 2009 14:41:08 -0000	1.89
+++ gnome-bluetooth.spec	3 Sep 2009 17:31:32 -0000	1.90
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -34,6 +34,9 @@ Requires:	pulseaudio-module-bluetooth
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=594055
+Patch0:		0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch
+
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -63,6 +66,8 @@ for writing applications that require a 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
 
+%patch0 -p1 -b .connect
+
 %build
 %configure --disable-desktop-update --disable-icon-update
 make %{?_smp_mflags}
@@ -194,6 +199,10 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Thu Sep 03 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-2
+- Fix connecting to audio devices not working when disconnected
+  at start
+
 * Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-1
 - Update to 2.27.90
 



From orion at fedoraproject.org  Thu Sep  3 17:31:55 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  3 Sep 2009 17:31:55 +0000 (UTC)
Subject: rpms/octave/devel octave.spec,1.88,1.89
Message-ID: <20090903173155.5D9DF11C0099@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8123

Modified Files:
	octave.spec 
Log Message:
* Wed Sep 2 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.2-2
- Add make check



Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- octave.spec	31 Jul 2009 08:01:59 -0000	1.88
+++ octave.spec	3 Sep 2009 17:31:55 -0000	1.89
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        3.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -117,6 +117,9 @@ touch %{buildroot}%{_datadir}/%{name}/oc
 mkdir interpreter
 cp -a doc/interpreter/*.pdf doc/interpreter/HTML/ interpreter/
 
+%check
+make check
+
 %clean
 rm -rf %{buildroot}
 
@@ -167,6 +170,9 @@ fi
 
 
 %changelog
+* Wed Sep 2 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.2-2
+- Add make check
+
 * Fri Jul 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6:3.2.2-1
 - Update to latest upstream (3.2.2).
 



From jgu at fedoraproject.org  Thu Sep  3 17:32:03 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu,  3 Sep 2009 17:32:03 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.58, 1.59 shorewall.spec, 1.90,
	1.91 sources, 1.58, 1.59
Message-ID: <20090903173203.AA7CF11C0099@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8190

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Thu Sep  3 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.1-1
- Update to 4.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	18 Aug 2009 21:50:20 -0000	1.58
+++ .cvsignore	3 Sep 2009 17:32:03 -0000	1.59
@@ -1,4 +1,4 @@
-shorewall-4.4.0.tar.bz2
-shorewall6-4.4.0.tar.bz2
-shorewall6-lite-4.4.0.tar.bz2
-shorewall-lite-4.4.0.tar.bz2
+shorewall-4.4.1.tar.bz2
+shorewall6-4.4.1.tar.bz2
+shorewall6-lite-4.4.1.tar.bz2
+shorewall-lite-4.4.1.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- shorewall.spec	18 Aug 2009 22:03:43 -0000	1.90
+++ shorewall.spec	3 Sep 2009 17:32:03 -0000	1.91
@@ -1,7 +1,7 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-%global major_ver 4.4.0
+%global major_ver 4.4.1
 %global shorewall_ver %{major_ver}
 %global lite_ver %{major_ver}
 %global shorewall6_ver %{major_ver}
@@ -9,7 +9,7 @@
 
 Name:           shorewall
 Version:        %{shorewall_ver}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -334,6 +334,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Sep  3 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.1-1
+- Update to 4.4.1
+
 * Tue Aug 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.0-2
 - Spec file cleanups with respect to package versioning
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	18 Aug 2009 21:50:20 -0000	1.58
+++ sources	3 Sep 2009 17:32:03 -0000	1.59
@@ -1,4 +1,4 @@
-6f8bda1da529fbe8d726297de445d4a9  shorewall-4.4.0.tar.bz2
-8733153bf6012fb9ff5e981e78044ba8  shorewall6-4.4.0.tar.bz2
-e18bb2541267169ad4240effa89fb993  shorewall6-lite-4.4.0.tar.bz2
-aa9b157e27cffb950fa0c7f7dce2902a  shorewall-lite-4.4.0.tar.bz2
+18f036f73ca37fb4f8130a33b23c9543  shorewall-4.4.1.tar.bz2
+075835cd382634fa25372bcf183bcce5  shorewall6-4.4.1.tar.bz2
+ac20aa2fca3311b0b0d8c127bceb4a3f  shorewall6-lite-4.4.1.tar.bz2
+1371cf5e7bf3cd01159ad62f058d469e  shorewall-lite-4.4.1.tar.bz2



From rhughes at fedoraproject.org  Thu Sep  3 17:41:17 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu,  3 Sep 2009 17:41:17 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.54, 1.55 PackageKit.spec, 1.115,
	1.116 sources, 1.55, 1.56
Message-ID: <20090903174117.0B88E11C0099@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11600

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Thu Sep 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090903git
- Update to a newer git snapshot from the 0.5.x series.
- Fixes NetworkManager build time configure check.
- Don't backtrace if we need to do yum-complete-transaction.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	2 Sep 2009 18:10:31 -0000	1.54
+++ .cvsignore	3 Sep 2009 17:41:16 -0000	1.55
@@ -1 +1 @@
-PackageKit-0.5.2-20090902.tar.gz
+PackageKit-0.5.2-20090903.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- PackageKit.spec	3 Sep 2009 12:44:21 -0000	1.115
+++ PackageKit.spec	3 Sep 2009 17:41:16 -0000	1.116
@@ -3,7 +3,7 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090902
+%define alphatag			20090903
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -25,8 +25,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
 
-Patch2: plugin-ui.patch
-
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -35,7 +33,9 @@ Requires: PackageKit-yum-plugin = %{vers
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: comps-extras
+%if 0%{?rhel} != 0
 Requires: preupgrade
+%endif
 BuildRequires: polkit >= %{polkit_version}
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -242,7 +242,6 @@ user to restart the computer or remove a
 #%setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
-%patch2 -p1 -b .plugin-ui
 
 %build
 %configure --disable-static --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck --disable-strict
@@ -440,6 +439,11 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Sep 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090903git
+- Update to a newer git snapshot from the 0.5.x series.
+- Fixes NetworkManager build time configure check.
+- Don't backtrace if we need to do yum-complete-transaction.
+
 * Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.2-0.2.20090902git
 - Rename -debuginfo-install to debug-install (#520965)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	2 Sep 2009 18:10:31 -0000	1.55
+++ sources	3 Sep 2009 17:41:16 -0000	1.56
@@ -1 +1 @@
-a867faa27eb766138038fbecb61edc0f  PackageKit-0.5.2-20090902.tar.gz
+1971b0360127c0d1ed32af3fc197ac82  PackageKit-0.5.2-20090903.tar.gz



From salimma at fedoraproject.org  Thu Sep  3 17:43:14 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  3 Sep 2009 17:43:14 +0000 (UTC)
Subject: rpms/mono/F-11 mono-242-libgdiplusconfig.patch, NONE,
	1.1 mono-242-metadata-appconf.patch, NONE, 1.1 .cvsignore, 1.40,
	1.41 mono.spec, 1.129, 1.130 sources, 1.50, 1.51 import.log,
	1.46, NONE mono-22-libgdiwinform.patch, 1.3,
	NONE mono-24-ppc-glocks.patch, 1.1, NONE
Message-ID: <20090903174314.D238311C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/mono/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12022/F-11

Modified Files:
	.cvsignore mono.spec sources 
Added Files:
	mono-242-libgdiplusconfig.patch 
	mono-242-metadata-appconf.patch 
Removed Files:
	import.log mono-22-libgdiwinform.patch 
	mono-24-ppc-glocks.patch 
Log Message:
- Update F-11's mono to 2.4.2.3 from rawhide
- remove import.log for F-11 and devel


mono-242-libgdiplusconfig.patch:
 config-new.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mono-242-libgdiplusconfig.patch ---
--- mono-2.4.2/data/config.in	2009-06-15 22:16:29.000000000 +0100
+++ mono-2.4.2/data/config-new.in	2009-06-17 22:57:56.000000000 +0100
@@ -15,7 +15,8 @@
 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
 	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
 	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
-	<dllmap dll="libX11" target="@X11@" os="!windows" />
+	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0" os="!windows"/>
+	<dllmap dll="libX11" target="@X11@" os="!windows"/>
 	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
 	<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
 	<dllmap dll="i:kernel32.dll">

mono-242-metadata-appconf.patch:
 Makefile-new.am |    1 -
 Makefile-new.in |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE mono-242-metadata-appconf.patch ---
--- mono-2.4.2/mono/metadata/Makefile.in	2009-06-08 18:34:04.000000000 +0100
+++ mono-2.4.2/mono/metadata/Makefile-new.in	2009-06-14 14:41:11.000000000 +0100
@@ -443,7 +443,6 @@
 	object.h	\
 	exception.h	\
 	profiler.h	\
-	appdomain.h	\
 	mono-config.h	\
 	debug-helpers.h	\
 	mempool.h
--- mono-2.4.2/mono/metadata/Makefile.am	2009-06-14 16:52:07.000000000 +0100
+++ mono-2.4.2/mono/metadata/Makefile-new.am	2009-06-14 17:18:50.000000000 +0100
@@ -171,7 +171,6 @@
 	object.h	\
 	exception.h	\
 	profiler.h	\
-	appdomain.h	\
 	mono-config.h	\
 	debug-helpers.h	\
 	mempool.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	27 Feb 2009 23:10:23 -0000	1.40
+++ .cvsignore	3 Sep 2009 17:43:14 -0000	1.41
@@ -1 +1 @@
-mono-2.4.tar.bz2
+mono-2.4.2.3.tar.bz2


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-11/mono.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- mono.spec	20 Apr 2009 16:08:12 -0000	1.129
+++ mono.spec	3 Sep 2009 17:43:14 -0000	1.130
@@ -1,6 +1,8 @@
+#%define svnver 138447
+
 Name:           mono
-Version:        2.4
-Release:        19%{?dist}
+Version:        2.4.2.3
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -8,7 +10,7 @@ License:        MIT
 URL:            http://www.mono-project.com/Main_Page
 # Prereleases are available here
 # http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:        http://ftp.novell.com/pub/%{name}/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://mono.ximian.com/monobuild/snapshot/sources-trunk/%name-%version.tar.bz2
 Source1:        monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,7 +18,7 @@ BuildRequires:  bison 
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 2.4
+BuildRequires:  libgdiplus-devel >= 2.4.2
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -42,9 +44,9 @@ Patch2: mono-1.2.3-use-monodir.patch
 Patch3: mono-2.2-uselibdir.patch
 Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
-Patch6: mono-22-libgdiwinform.patch
+Patch6: mono-242-libgdiplusconfig.patch
 Patch7: mono-22-libdir.patch
-Patch8: mono-24-ppc-glocks.patch
+Patch8: mono-242-metadata-appconf.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -55,7 +57,7 @@ metadata access libraries.
 %package core
 Summary:        The Mono CIL runtime, suitable for running .NET code
 Group:          Development/Languages
-Requires:	libgdiplus
+Requires:       libgdiplus
 
 %description core
 This package contains the core of the Mono runtime including its
@@ -76,7 +78,7 @@ assembler and other various tools.
 
 %package nunit
 Summary:        NUnit Testing Framework
-License:	zlib with acknowledgement
+License:        zlib with acknowledgement
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
 Requires:       glib2-devel
@@ -139,6 +141,15 @@ This package provides a fully managed im
 System.Windows.Forms, the default graphical toolkit for .NET
 applications.
 
+%package wcf
+Summary:        Mono implementation of Windows Communication Foundation
+Group:          Development/Languages
+Requires:       mono-core = %{version}-%{release}
+
+%description wcf
+This package provides an implementation of WCF, the Windows Communication
+Foundation.
+
 %package web
 Summary:        ASP.NET, Remoting, and Web Services for Mono
 Group:          Development/Languages
@@ -152,7 +163,7 @@ development of web application, web serv
 Summary:        Development files for system.web
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
-Requires:	mono-web = %{version}-%{release} pkgconfig
+Requires:       mono-web = %{version}-%{release} pkgconfig
 
 %description web-devel
 This package provides the .pc file for mono-web
@@ -236,9 +247,9 @@ no longer maintained. MySQL AB now provi
 which is fully managed and actively maintained.
 
 %package -n monodoc
-Summary:	The mono documentation system
-Group:		Documentation
-Requires:	mono-core = %{version}-%{release}
+Summary:        The mono documentation system
+Group:          Documentation
+Requires:       mono-core = %{version}-%{release}
 
 %description -n monodoc
 monodoc is the documentation package for the mono .NET environment
@@ -253,9 +264,9 @@ Requires: mono-core = %{version}-%{relea
 Development file for monodoc
 
 %package moonlight
-Summary:	All the parts required for moonlight compilation
-Group:		Development/Libraries
-Requires:	mono-core = %{version}-%{release}
+Summary:        All the parts required for moonlight compilation
+Group:          Development/Libraries
+Requires:       mono-core = %{version}-%{release}
 
 %description moonlight
 mono-moonlight are all the parts required for moonlight compilation
@@ -281,7 +292,7 @@ mono-moonlight are all the parts require
   %{nil}
 
 %prep
-%setup -q 
+%setup -q
 
 %patch0 -p1 -b .ppc-threading
 %patch1 -p1 -b .libdir
@@ -289,8 +300,8 @@ mono-moonlight are all the parts require
 %patch3 -p1 -b .uselibdir
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
+%patch8 -p1 -b .metadata-appconf
 %patch6 -p1 -b .libgdiplus
-%patch8 -p1 -b .glocks-ppc
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
@@ -302,7 +313,7 @@ sed -i -e 's!$(prefix)/lib/!%{_libdir}/!
 autoreconf -f -i -s
 
 # Add undeclared Arg
-sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
+sed -i "61a #define ARG_MAX     _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
 rm -rf mcs/class/lib/monolite/*
@@ -370,30 +381,20 @@ install monodir %{buildroot}%{_bindir}
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
 %{_bindir}/monodir
-%{_bindir}/mono-api-*
-%mono_bin csharp
-%{_bindir}/gacutil1
-%mono_bin mod
-%mono_bin mono-cil-strip
-%{monodir}/?.0/mono-api-info*
 %{_bindir}/mono-test-install
-%{_bindir}/gacutil2
 %mono_bin certmgr
 %mono_bin chktrust
+%mono_bin csharp
 %mono_bin gacutil
+%{_bindir}/gacutil1
+%{_bindir}/gacutil2
 %mono_bin gmcs
 %mono_bin mcs
 %{_bindir}/mcs1
 %mono_bin mozroots
-%mono_bin mconfig
 %mono_bin setreg
 %mono_bin sn
-%mono_bin installvst
-%mono_bin monolinker
-%{monodir}/?.0/installutil.*
-%{monodir}/3.5/System.Web.Extensions*
 %{monodir}/2.0/System.Xml.Linq.dll
-%{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
 %{_libdir}/libmono-profiler-logging.so.*
 %{_mandir}/man1/certmgr.1.gz
@@ -404,12 +405,8 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/mozroots.1.gz
 %{_mandir}/man1/setreg.1.gz
 %{_mandir}/man1/sn.1.gz
-%{_mandir}/man1/monolinker.1.gz
-%{_mandir}/man1/resgen.1.gz
-%{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man5/mono-config.5.gz
 %{_mandir}/man1/csharp.1.gz
-%{_mandir}/man1/mono-cil-strip.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -422,31 +419,27 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll I18N.West
 %gac_dll ICSharpCode.SharpZipLib
 %{monodir}/compat-*/ICSharpCode.SharpZipLib.dll
+%{monodir}/gac/Mono.Cecil
+%{monodir}/gac/Mono.Cecil.Mdb
+%gac_dll cscompmgd
+%gac_dll CustomMarshalers
 %gac_dll Microsoft.VisualC
 %gac_dll Mono.C5
 %gac_dll Mono.Cairo
-%{monodir}/gac/Mono.Cecil
-%{monodir}/gac/Mono.Cecil.Mdb
 %gac_dll Mono.CompilerServices.SymbolWriter
+%gac_dll Mono.CSharp
+%gac_dll System.Drawing
 %gac_dll Mono.GetOptions
+%gac_dll Mono.Management
 %gac_dll Mono.Posix
 %gac_dll Mono.Security
+%gac_dll Mono.Simd
+%gac_dll OpenSystem.C
 %gac_dll System
 %gac_dll System.Configuration
-%gac_dll System.Drawing
+%gac_dll System.Core
 %gac_dll System.Security
 %gac_dll System.Xml
-%gac_dll System.Core
-%gac_dll Mono.CSharp
-%gac_dll Mono.Management
-%gac_dll Mono.Simd
-%gac_dll System.ComponentModel.DataAnnotations
-%gac_dll System.IdentityModel.Selectors
-%gac_dll System.IdentityModel
-%gac_dll System.Runtime.Serialization
-%gac_dll cscompmgd
-%gac_dll CustomMarshalers
-%gac_dll OpenSystem.C
 %{monodir}/gac/System.Xml.Linq
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
@@ -457,17 +450,17 @@ install monodir %{buildroot}%{_bindir}
 %config (noreplace) %{_sysconfdir}/mono/config
 %config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
-%config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
 %{_libdir}/mono-source-libs/
 
 %files devel
 %defattr(-,root,root,-)
+%{_bindir}/mono-api-*
+%{monodir}/?.0/mono-api-info*
 %{_bindir}/monodis
-%{_bindir}/pedump
+%{_bindir}/al1
 %mono_bin_1 al al
 %mono_bin_2 al2 al
-%{_bindir}/al1
 %mono_bin caspol
 %mono_bin cert2spc
 %mono_bin cilc
@@ -476,6 +469,8 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_1 genxs1 genxs
 %{_bindir}/genxs
 %mono_bin sgen
+%{monodir}/?.0/installutil.*
+%mono_bin installvst
 %mono_bin_1 ilasm ilasm
 %{_bindir}/ilasm1
 %mono_bin_2 ilasm2 ilasm
@@ -483,16 +478,21 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin makecert
 %mono_bin mkbundle
 %{_bindir}/mkbundle1
+%{_bindir}/mkbundle2
+%mono_bin mono-cil-strip
+%mono_bin monolinker
 %mono_bin_1 monop monop
 %{_bindir}/monop1
 %mono_bin_2 monop2 monop
 %mono_bin mono-shlib-cop
 %mono_bin mono-xmltool
+%{_bindir}/pedump
 %mono_bin permview
 %mono_bin prj2make
-%mono_bin_1 resgen resgen
 %{_bindir}/resgen1
+%mono_bin_1 resgen resgen
 %mono_bin_2 resgen2 resgen
+%{_mandir}/man1/resgen.1.gz
 %mono_bin secutil
 %mono_bin signcode
 %mono_bin xbuild
@@ -507,6 +507,8 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/macpack.1.gz
 %{_mandir}/man1/makecert.1.gz
 %{_mandir}/man1/mkbundle.1.gz
+%{_mandir}/man1/mono-cil-strip.1.gz
+%{_mandir}/man1/monolinker.1.gz
 %{_mandir}/man1/mono-shlib-cop.1.gz
 %{_mandir}/man1/mono-xmltool.1.gz
 %{_mandir}/man1/monodis.1.gz
@@ -598,40 +600,42 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_1 mono-service mono-service
 %mono_bin_2 mono-service2 mono-service
 %{monodir}/gac/mono-service
+%gac_dll System.Configuration.Install
 %gac_dll System.Management
 %gac_dll System.Messaging
 %gac_dll System.ServiceProcess
-%gac_dll System.ServiceModel
-%gac_dll System.Configuration.Install
 %gac_dll Microsoft.Vsa
 %gac_dll Mono.Messaging.RabbitMQ
 %gac_dll Mono.Messaging
 %gac_dll RabbitMQ.Client
 
-%files winforms
-%defattr(-,root,root,-)
-%gac_dll System.Windows.Forms
-%gac_dll Accessibility
-%gac_dll System.Design
-%gac_dll System.Drawing.Design
+%files wcf
+%defattr(-, root, root, -)
+%gac_dll System.IdentityModel
+%gac_dll System.IdentityModel.Selectors
+%gac_dll System.Runtime.Serialization
+%gac_dll System.ServiceModel
+%gac_dll System.ServiceModel.Web
 
 %files web
 %defattr(-,root,root,-)
 %gac_dll Mono.Http
 %gac_dll Mono.Web
-%gac_dll Mono.WebBrowser
+%gac_dll System.ComponentModel.DataAnnotations
 %gac_dll System.Runtime.Remoting
-%gac_dll System.Web
 %gac_dll System.Runtime.Serialization.Formatters.Soap
-%{monodir}/compat-2.0/System.Web.Extensions*dll
-%gac_dll System.ServiceModel.Web
+%gac_dll System.Web
 %gac_dll System.Web.Abstractions
 %gac_dll System.Web.DynamicData
+%gac_dll System.Web.Extensions
+%gac_dll System.Web.Extensions.Design
+%{monodir}/compat-2.0/System.Web.Extensions*dll
+%{monodir}/3.5/System.Web.Extensions*
+%gac_dll System.Web.Mvc
 %gac_dll System.Web.Routing
 %gac_dll System.Web.Services
-%gac_dll System.Web.Extensions.Design
-%gac_dll System.Web.Extensions
 %mono_bin disco
+%mono_bin mconfig
 %mono_bin soapsuds
 %mono_bin_1 wsdl wsdl
 %{_bindir}/wsdl1
@@ -639,6 +643,7 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_2 xsd2 xsd
 %mono_bin_1 xsd xsd
 %{_mandir}/man1/disco.1.gz
+%{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man1/soapsuds.1.gz
 %{_mandir}/man1/wsdl.1.gz
 %{_mandir}/man1/xsd.1.gz
@@ -646,6 +651,7 @@ install monodir %{buildroot}%{_bindir}
 %config (noreplace) %{_sysconfdir}/mono/2.0/Browsers/Compat.browser
 %config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/web.config
 %mono_bin httpcfg
 %{_mandir}/man1/httpcfg.1.gz
@@ -656,6 +662,16 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/system.web.extensions_1.0.pc
 %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
 
+%files winforms
+%defattr(-,root,root,-)
+%gac_dll Accessibility
+%gac_dll System.Design
+%gac_dll System.Drawing.Design
+%gac_dll System.Windows.Forms
+# Put here temporarily to break dependency issues
+# (cf. openSUSE packaging). Will be fixed post 1.2.5
+%gac_dll Mono.WebBrowser
+
 %files data
 %defattr(-,root,root,-)
 %mono_bin sqlsharp
@@ -706,6 +722,7 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/monodoc/*
 %{_libdir}/mono/monodoc/monodoc.dll
 %mono_bin mdoc
+%mono_bin mod
 %{_bindir}/mdoc-*
 %{_bindir}/mdass*
 %{_bindir}/mdval*
@@ -720,6 +737,42 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2.3-2
+- Rearrange assemblies to properly fix bz 434709:
+  * mono-core can now be installed on its own, no longer pulling in
+    monodoc, mono-extras and mono-web
+  * mono-web no longer pull in mono-extras
+
+* Wed Jul 29 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2.3.1
+- Update to 2.4.2.3
+
+* Fri Jul 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2.2-1
+- Patch for cve-2009-0217
+
+* Thu Jul 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2.1-1
+- Bump to 2.4.2.1 release
+- Add system.web.mvc
+
+* Tue Jun 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-5
+- Bump to 2.4.2 official release
+- Move mkbundle2 to devel (BZ 497187)
+
+* Mon Jun 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-4
+- Bump to 2.4.2 RC 1
+
+* Wed Jun 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-3
+- Bump to 2.4.2 preview 2
+- Fix libgdiplus winform patch
+
+* Sun Jun 14 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-2
+- Fix metadata makefile (duplicates appconf.h during make install)
+- Move System.Web to mono-core (bz 434709)
+- Move System.Configuration.Install to mono-core (bz 434709)
+
+* Tue Jun 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-1
+- Bump to 2.4.2 preview
+- remove ppc glocks patch
+
 * Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-19
 - And turn off bootstrapping and make sure it rebuilds on all platforms.
 
@@ -951,7 +1004,7 @@ install monodir %{buildroot}%{_bindir}
 * Mon Apr 07 2008 Xavier Lamien <lxtnow at gmail.com> - 1.9-4
 - Added undeclared function bug #xxxx.
 
-* Mon Mar 17 2008 Xavier Lamien	<lxtnow at gmail.com> - 1.9-3
+* Mon Mar 17 2008 Xavier Lamien <lxtnow at gmail.com> - 1.9-3
 - Added require on mono-nunit-devel
 
 * Thu Mar 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	14 Apr 2009 23:52:01 -0000	1.50
+++ sources	3 Sep 2009 17:43:14 -0000	1.51
@@ -1 +1 @@
-da2bf1c0aba2958d26c5e8a9a49fd9d1  mono-2.4.tar.bz2
+696f25afc8453cd0d1c78de6e905dcf2  mono-2.4.2.3.tar.bz2


--- import.log DELETED ---


--- mono-22-libgdiwinform.patch DELETED ---


--- mono-24-ppc-glocks.patch DELETED ---



From salimma at fedoraproject.org  Thu Sep  3 17:43:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  3 Sep 2009 17:43:15 +0000 (UTC)
Subject: rpms/mono/devel import.log,1.54,NONE
Message-ID: <20090903174315.1C2A911C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12022/devel

Removed Files:
	import.log 
Log Message:
- Update F-11's mono to 2.4.2.3 from rawhide
- remove import.log for F-11 and devel



--- import.log DELETED ---



From pkgdb at fedoraproject.org  Thu Sep  3 17:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 17:51:18 +0000
Subject: [pkgdb] mutt: deji has requested commit
Message-ID: <20090903175118.6530810F87F@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on mutt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutt



From pkgdb at fedoraproject.org  Thu Sep  3 17:51:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 17:51:36 +0000
Subject: [pkgdb] mutt: deji has requested commit
Message-ID: <20090903175136.A2A1C10F85C@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on mutt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutt



From pkgdb at fedoraproject.org  Thu Sep  3 17:51:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 17:51:43 +0000
Subject: [pkgdb] mutt: deji has requested commit
Message-ID: <20090903175143.38E9410F886@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on mutt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutt



From arbiter at fedoraproject.org  Thu Sep  3 18:26:26 2009
From: arbiter at fedoraproject.org (arbiter)
Date: Thu,  3 Sep 2009 18:26:26 +0000 (UTC)
Subject: rpms/bip/F-10 .cvsignore,1.5,1.6 bip.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20090903182626.233C111C0099@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/bip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30658/F-10

Modified Files:
	.cvsignore bip.spec sources 
Log Message:
0.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bip/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Mar 2009 18:28:08 -0000	1.5
+++ .cvsignore	3 Sep 2009 18:26:25 -0000	1.6
@@ -1 +1 @@
-bip-0.8.0.tar.gz
+bip-0.8.2.tar.gz


Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/F-10/bip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bip.spec	15 Mar 2009 18:28:08 -0000	1.7
+++ bip.spec	3 Sep 2009 18:26:25 -0000	1.8
@@ -1,5 +1,5 @@
 Name:    bip
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
@@ -83,6 +83,15 @@ fi
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Thu Sep 03 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.2-1
+- 0.8.2
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 05 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.0-1
 - 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bip/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Mar 2009 18:28:08 -0000	1.5
+++ sources	3 Sep 2009 18:26:25 -0000	1.6
@@ -1 +1 @@
-ee036d96fec6222de5a8449e013552da  bip-0.8.0.tar.gz
+3f3a66f6179456ba7efb1970a89f46dd  bip-0.8.2.tar.gz



From arbiter at fedoraproject.org  Thu Sep  3 18:26:25 2009
From: arbiter at fedoraproject.org (arbiter)
Date: Thu,  3 Sep 2009 18:26:25 +0000 (UTC)
Subject: rpms/bip/EL-5 .cvsignore,1.5,1.6 bip.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090903182625.4776711C0099@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/bip/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30658/EL-5

Modified Files:
	.cvsignore bip.spec sources 
Log Message:
0.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bip/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Mar 2009 18:28:07 -0000	1.5
+++ .cvsignore	3 Sep 2009 18:26:24 -0000	1.6
@@ -1 +1 @@
-bip-0.8.0.tar.gz
+bip-0.8.2.tar.gz


Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/EL-5/bip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bip.spec	15 Mar 2009 18:28:07 -0000	1.8
+++ bip.spec	3 Sep 2009 18:26:24 -0000	1.9
@@ -1,5 +1,5 @@
 Name:    bip
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
@@ -83,6 +83,15 @@ fi
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Thu Sep 03 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.2-1
+- 0.8.2
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 05 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.0-1
 - 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bip/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Mar 2009 18:28:07 -0000	1.5
+++ sources	3 Sep 2009 18:26:24 -0000	1.6
@@ -1 +1 @@
-ee036d96fec6222de5a8449e013552da  bip-0.8.0.tar.gz
+3f3a66f6179456ba7efb1970a89f46dd  bip-0.8.2.tar.gz



From arbiter at fedoraproject.org  Thu Sep  3 18:26:26 2009
From: arbiter at fedoraproject.org (arbiter)
Date: Thu,  3 Sep 2009 18:26:26 +0000 (UTC)
Subject: rpms/bip/F-11 .cvsignore,1.5,1.6 bip.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090903182626.E71CC11C0099@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/bip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30658/F-11

Modified Files:
	.cvsignore bip.spec sources 
Log Message:
0.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bip/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Mar 2009 18:25:22 -0000	1.5
+++ .cvsignore	3 Sep 2009 18:26:26 -0000	1.6
@@ -1 +1 @@
-bip-0.8.0.tar.gz
+bip-0.8.2.tar.gz


Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/F-11/bip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bip.spec	5 Mar 2009 11:58:16 -0000	1.8
+++ bip.spec	3 Sep 2009 18:26:26 -0000	1.9
@@ -1,5 +1,5 @@
 Name:    bip
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
@@ -83,6 +83,15 @@ fi
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Thu Sep 03 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.2-1
+- 0.8.2
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 05 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.0-1
 - 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bip/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Mar 2009 18:25:22 -0000	1.5
+++ sources	3 Sep 2009 18:26:26 -0000	1.6
@@ -1 +1 @@
-ee036d96fec6222de5a8449e013552da  bip-0.8.0.tar.gz
+3f3a66f6179456ba7efb1970a89f46dd  bip-0.8.2.tar.gz



From ajax at fedoraproject.org  Thu Sep  3 18:26:48 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  3 Sep 2009 18:26:48 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/F-11 sources, 1.15,
	1.16 xorg-x11-server-utils.spec, 1.43, 1.44
Message-ID: <20090903182648.7B54B11C0099@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30988

Modified Files:
	sources xorg-x11-server-utils.spec 
Log Message:
* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com> 7.4-7.1
- xrandr 1.3.0 (#512208)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	4 Feb 2009 21:50:49 -0000	1.15
+++ sources	3 Sep 2009 18:26:48 -0000	1.16
@@ -13,4 +13,4 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
-ea230049f757cd48fa46965c36ab552c  xrandr-1.2.99.4.tar.bz2
+616612a15711a4422e71be6acc42ca3c  xrandr-1.3.0.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-11/xorg-x11-server-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xorg-x11-server-utils.spec	26 Feb 2009 11:33:01 -0000	1.43
+++ xorg-x11-server-utils.spec	3 Sep 2009 18:26:48 -0000	1.44
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 7%{?dist}
+Release: 7.1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -18,7 +18,7 @@ Source4:  http://www.x.org/pub/individua
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
 Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
-Source8:  http://www.x.org/pub/individual/app/xrandr-1.2.99.4.tar.bz2
+Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
 Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.5.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
 Source11: http://www.x.org/pub/individual/app/xset-1.0.4.tar.bz2
@@ -201,6 +201,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com> 7.4-7.1
+- xrandr 1.3.0 (#512208)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Thu Sep  3 18:47:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Sep 2009 18:47:44 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.60, 1.61 kde-settings.spec,
	1.84, 1.85 sources, 1.62, 1.63
Message-ID: <20090903184744.6C93711C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4687

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-5
- plasma-desktop-appletsrc: wallpaper=/usr/share/wallpapers/Constantine_Mosaico/



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	18 Aug 2009 18:38:56 -0000	1.60
+++ .cvsignore	3 Sep 2009 18:47:44 -0000	1.61
@@ -1 +1 @@
-kde-settings-4.3-4.tar.bz2
+kde-settings-4.3-5.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- kde-settings.spec	26 Aug 2009 14:39:14 -0000	1.84
+++ kde-settings.spec	3 Sep 2009 18:47:44 -0000	1.85
@@ -1,11 +1,11 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 4
+%define rel 5
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}.2
+Release: %{rel}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -150,6 +150,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-5
+- plasma-desktop-appletsrc: wallpaper=/usr/share/wallpapers/Constantine_Mosaico/
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4.2
 - drop Requires: system-backgrounds-kde (move to kdebase-workspace)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	18 Aug 2009 18:38:56 -0000	1.62
+++ sources	3 Sep 2009 18:47:44 -0000	1.63
@@ -1 +1 @@
-e5d095626685f9c211ae44efc00dab66  kde-settings-4.3-4.tar.bz2
+6178c6f7980cf45849081c21f331b197  kde-settings-4.3-5.tar.bz2



From salimma at fedoraproject.org  Thu Sep  3 18:54:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  3 Sep 2009 18:54:28 +0000 (UTC)
Subject: rpms/libgdiplus/F-11 .cvsignore, 1.23, 1.24 libgdiplus.spec, 1.43, 
	1.44 sources, 1.26, 1.27
Message-ID: <20090903185428.8162911C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/libgdiplus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6169/F-11

Modified Files:
	.cvsignore libgdiplus.spec sources 
Log Message:
* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2-3
- Enable unit tests
- Corrected project and source URLs
- Remove obsolete license files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	27 Feb 2009 22:46:32 -0000	1.23
+++ .cvsignore	3 Sep 2009 18:54:28 -0000	1.24
@@ -1 +1 @@
-libgdiplus-2.4.tar.bz2
+libgdiplus-2.4.2.tar.bz2


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-11/libgdiplus.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- libgdiplus.spec	26 Mar 2009 23:09:11 -0000	1.43
+++ libgdiplus.spec	3 Sep 2009 18:54:28 -0000	1.44
@@ -1,12 +1,12 @@
 Name:           libgdiplus
-Version:        2.4
-Release:        5%{?dist}
-Summary:        libgdiplus: An Open Source implementation of the GDI+ API
+Version:        2.4.2
+Release:        3%{?dist}
+Summary:        An implementation of the GDI+ API
 
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:        %{name}-%{version}.tar.bz2
+URL:            http://mono-project.com/Libgdiplus
+Source0:        ftp://ftp.novell.com/pub/mono/sources/libgdiplus/libgdiplus-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
@@ -15,8 +15,7 @@ BuildRequires:  cairo-devel
 BuildRequires:  zlib-devel
 
 %description
-An Open Source implementation of the GDI+ API, it is part of the Mono 
-Project
+An implementation of the GDI+ API, built on top of Cairo.
 
 %package devel
 Summary: Development files for libgdiplus
@@ -24,7 +23,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
-Development files for libgdiplus
+This package contains development files for %{name}.
 
 %prep
 %setup -q
@@ -34,6 +33,10 @@ perl -pi -e "s,-Werror,,g" src/Makefile
 %configure --disable-static 
 make %{?_smp_mflags} 
 
+%check
+make check
+
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -48,7 +51,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%doc COPYING NEWS README TODO MPL-1.1.html AUTHORS
+%doc COPYING NEWS README TODO AUTHORS
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 
@@ -59,6 +62,14 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 
 %changelog
+* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2-3
+- Enable unit tests
+- Corrected project and source URLs
+- Remove obsolete license files
+
+* Tue Jun 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-1
+- bump to 2.4.2 preview
+
 * Wed Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-5
 - 2.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	27 Feb 2009 22:46:32 -0000	1.26
+++ sources	3 Sep 2009 18:54:28 -0000	1.27
@@ -1 +1 @@
-ddf40d6f21ab7e8942abd063d460e4fa  libgdiplus-2.4.tar.bz2
+703210950bce2ed0a9824f897f774925  libgdiplus-2.4.2.tar.bz2



From salimma at fedoraproject.org  Thu Sep  3 18:54:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  3 Sep 2009 18:54:28 +0000 (UTC)
Subject: rpms/libgdiplus/devel libgdiplus.spec,1.45,1.46
Message-ID: <20090903185428.A0C3311C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/libgdiplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6169/devel

Modified Files:
	libgdiplus.spec 
Log Message:
* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2-3
- Enable unit tests
- Corrected project and source URLs
- Remove obsolete license files



Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- libgdiplus.spec	25 Jul 2009 05:42:05 -0000	1.45
+++ libgdiplus.spec	3 Sep 2009 18:54:28 -0000	1.46
@@ -1,12 +1,12 @@
 Name:           libgdiplus
 Version:        2.4.2
-Release:        2%{?dist}
-Summary:        libgdiplus: An Open Source implementation of the GDI+ API
+Release:        3%{?dist}
+Summary:        An implementation of the GDI+ API
 
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:        %{name}-%{version}.tar.bz2
+URL:            http://mono-project.com/Libgdiplus
+Source0:        ftp://ftp.novell.com/pub/mono/sources/libgdiplus/libgdiplus-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
@@ -15,8 +15,7 @@ BuildRequires:  cairo-devel
 BuildRequires:  zlib-devel
 
 %description
-An Open Source implementation of the GDI+ API, it is part of the Mono 
-Project
+An implementation of the GDI+ API, built on top of Cairo.
 
 %package devel
 Summary: Development files for libgdiplus
@@ -24,7 +23,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
-Development files for libgdiplus
+This package contains development files for %{name}.
 
 %prep
 %setup -q
@@ -34,6 +33,10 @@ perl -pi -e "s,-Werror,,g" src/Makefile
 %configure --disable-static 
 make %{?_smp_mflags} 
 
+%check
+make check
+
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -48,7 +51,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%doc COPYING NEWS README TODO MPL-1.1.html AUTHORS
+%doc COPYING NEWS README TODO AUTHORS
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 
@@ -59,6 +62,11 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 
 %changelog
+* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2-3
+- Enable unit tests
+- Corrected project and source URLs
+- Remove obsolete license files
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nalin at fedoraproject.org  Thu Sep  3 18:58:46 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu,  3 Sep 2009 18:58:46 +0000 (UTC)
Subject: rpms/hmaccalc/devel .cvsignore, 1.5, 1.6 hmaccalc.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090903185846.BC91311C0099@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/hmaccalc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7241

Modified Files:
	.cvsignore hmaccalc.spec sources 
Log Message:
update to 0.9.10 to add a minimum truncation length


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hmaccalc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Jul 2009 22:11:34 -0000	1.5
+++ .cvsignore	3 Sep 2009 18:58:46 -0000	1.6
@@ -2,3 +2,4 @@ hmaccalc-0.9.6.tar.gz
 hmaccalc-0.9.7.tar.gz
 hmaccalc-0.9.8.tar.gz
 hmaccalc-0.9.9.tar.gz
+hmaccalc-0.9.10.tar.gz


Index: hmaccalc.spec
===================================================================
RCS file: /cvs/extras/rpms/hmaccalc/devel/hmaccalc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hmaccalc.spec	25 Jul 2009 02:10:28 -0000	1.5
+++ hmaccalc.spec	3 Sep 2009 18:58:46 -0000	1.6
@@ -12,8 +12,8 @@
 	%{nil}
 
 Name:		hmaccalc
-Version:	0.9.9
-Release:	2%{?dist}
+Version:	0.9.10
+Release:	1%{?dist}
 Summary:	Tools for computing and checking HMAC values for files
 
 Group:		System Environment/Base
@@ -61,6 +61,15 @@ make check
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep  3 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.10-1
+- refuse to truncate output below half the size of the hash length, or 80
+  bits, whichever is higher, in case we get used in a situation where
+  not doing so would make us vulnerable to CVE-2009-0217, in which an
+  attacker manages to convince a party doing verification to truncate
+  both the just-computed value and the value to be checked before
+  comparing them, as comparing just 1 bit would make detecting forgeries
+  close to impossible
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hmaccalc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jul 2009 22:11:34 -0000	1.5
+++ sources	3 Sep 2009 18:58:46 -0000	1.6
@@ -1 +1 @@
-889521571d77e4e7705ee2b8ed709008  hmaccalc-0.9.9.tar.gz
+7cdafa7876106e2716c2c09b58c86573  hmaccalc-0.9.10.tar.gz



From scop at fedoraproject.org  Thu Sep  3 19:13:37 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  3 Sep 2009 19:13:37 +0000 (UTC)
Subject: rpms/perl-SGML-Parser-OpenSP/devel perl-SGML-Parser-OpenSP.spec, 1.9,
	1.10
Message-ID: <20090903191337.49D8711C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15273

Modified Files:
	perl-SGML-Parser-OpenSP.spec 
Log Message:
* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.994-4
- Filter out autoprovided OpenSP.so (if %{perl_default_filter} is available).



Index: perl-SGML-Parser-OpenSP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel/perl-SGML-Parser-OpenSP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-SGML-Parser-OpenSP.spec	26 Jul 2009 16:22:38 -0000	1.9
+++ perl-SGML-Parser-OpenSP.spec	3 Sep 2009 19:13:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-SGML-Parser-OpenSP
 Version:        0.994
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to the OpenSP SGML and XML parser
 
 Group:          Development/Libraries
@@ -18,6 +18,8 @@ BuildRequires:  opensp-devel
 Requires:       perl(Class::Accessor)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 SGML::Parser::OpenSP provides a native Perl interface, written in C++
 and XS, to the OpenSP SGML and XML parser.
@@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.994-4
+- Filter out autoprovided OpenSP.so (if %%{perl_default_filter} is available).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.994-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Thu Sep  3 19:26:51 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  3 Sep 2009 19:26:51 +0000 (UTC)
Subject: rpms/javasqlite/devel javasqlite.spec,1.15,1.16
Message-ID: <20090903192651.5E9AE11C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18966

Modified Files:
	javasqlite.spec 
Log Message:
* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090430-3
- Filter out autoprovided libsqlite_jni.so (if %filter_setup is available).



Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- javasqlite.spec	25 Jul 2009 03:56:20 -0000	1.15
+++ javasqlite.spec	3 Sep 2009 19:26:51 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           javasqlite
 Version:        20090430
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -18,6 +18,10 @@ BuildRequires:  java-devel = 1.5.0
 BuildRequires:  java-javadoc
 Requires:       jre
 
+%{?filter_setup:
+%filter_provides_in %{_libdir}/%{name}/.*\.so$
+%filter_setup}
+
 %description
 javasqlite is a Java wrapper including a basic JDBC driver for the
 SQLite database engine. It is designed using JNI to interface to the
@@ -102,6 +106,9 @@ done
 
 
 %changelog
+* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090430-3
+- Filter out autoprovided libsqlite_jni.so (if %%filter_setup is available).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090430-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -111,75 +118,75 @@ done
 * Tue Apr 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090420-1
 - Update to 20090420, feature check patch applied upstream.
 
-* Mon Apr 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090409-3
+* Mon Apr 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090409-3
 - Disable extension loading due to security concerns.
 
-* Tue Apr 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090409-2
+* Tue Apr 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090409-2
 - Don't use parallel make, Java build doesn't appear parallel clean.
 
-* Sun Apr 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090409-1
+* Sun Apr 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090409-1
 - Update to 20090409, enable extension loading.
 - Patch to actually check features of system sqlite lib at build time.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Feb 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090213-1
+* Sun Feb 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090213-1
 - Update to 20090213.
 - Improve description.
 - Make -javadoc subpackage noarch when built with rpmbuild >= 4.6.0.
 
-* Wed Dec 10 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081006-4
+* Wed Dec 10 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081006-4
 - Revert previous change, arch specific links break in %%{_datadir}.
 
 * Wed Dec  3 2008 Colin Walters <walters at verbum.org> - 20081006-3
 - Add a link in /usr/share/java to correspond with other jars.
   Someday we'll have a real module system.
 
-* Sun Nov 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081006-2
+* Sun Nov 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081006-2
 - Own the /usr/lib*/javasqlite dir (#473609).
 
-* Tue Oct  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081006-1
+* Tue Oct  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 20081006-1
 - 20081006; all upstreamable patches applied upstream.
 
-* Mon Sep  1 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080420-3
+* Mon Sep  1 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080420-3
 - Include JDBC 3 (Java 1.5.x) drivers.
 - Work around build setup issues #460761 and #460783.
 
-* Sun Aug 31 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080420-2
+* Sun Aug 31 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080420-2
 - Patch to output error message if loading the lib from a specified
   SQLite.library.path fails.
 - Patch test suite to exit with non-zero status on failures.
 - Run more tests during build, but not SQLite 2.x ones.
 
-* Tue Apr 22 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080420-1
+* Tue Apr 22 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080420-1
 - 20080420; all upstreamable patches applied upstream.
 
-* Thu Apr  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080401-2
+* Thu Apr  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080401-2
 - First Fedora build.
 
-* Wed Apr  2 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080401-1
+* Wed Apr  2 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080401-1
 - Update to 20080401.
 - Patch to install *.so as an unversioned module.
 - Patch to fix parallel make (#439941, Colin Walters).
 - Build with "-source 5" instead of "-source 5.0" (#439941, Colin Walters).
 - Use %%{_jvmdir} instead of %%{_prefix}/lib/jvm.
 
-* Thu Mar 20 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080315-1
+* Thu Mar 20 2008 Ville Skytt? <ville.skytta at iki.fi> - 20080315-1
 - 20080315; classpath, lib64, and getboolean patches applied upstream.
 - Install to %%{_libdir}/%%{name} per current Fedora packaging guidelines.
 - Patch to appease recent libtool.
 - Patch to honor $RPM_OPT_FLAGS.
 
-* Sat Nov 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070915-0.2
+* Sat Nov 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070915-0.2
 - Build with -source 5.0.
 - More classpath fixes.
 
-* Tue Sep 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070915-0.1
+* Tue Sep 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070915-0.1
 - 20070915.
 - Disable parallel build, doesn't work.
 - Patch to fix build and test suite classpath.
 - Patch to add support for ResultSet.getBoolean().
 
-* Fri Sep 14 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070914-0.1
+* Fri Sep 14 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070914-0.1
 - First build.



From transif at fedoraproject.org  Thu Sep  3 19:27:47 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu,  3 Sep 2009 19:27:47 +0000 (UTC)
Subject: comps/po pt.po,1.20,1.21
Message-ID: <20090903192747.DFCD211C0099@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19220/po

Modified Files:
	pt.po 
Log Message:
Sending translation for Portuguese


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 pt.poIndex: pt.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pt.po	3 May 2009 23:39:57 -0000	1.20
+++ pt.po	3 Sep 2009 19:27:47 -0000	1.21
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-03 19:10+0000\n"
-"PO-Revision-Date: 2009-05-04 00:43+0100\n"
+"POT-Creation-Date: 2009-09-03 14:24+0000\n"
+"PO-Revision-Date: 2009-09-03 20:27+0100\n"
 "Last-Translator: Rui Gouveia <rui.gouveia at globaltek.pt>\n"
 "Language-Team: pt <fedora-trans-pt at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -50,1812 +50,1826 @@ 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-f12.xml.in.h:1
+#: ../comps-f13.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-f12.xml.in.h:5
+#: ../comps-f13.xml.in.h:5
 #: ../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-f12.xml.in.h:6
+#: ../comps-f13.xml.in.h:6
 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-f12.xml.in.h:7
+#: ../comps-f13.xml.in.h:7
 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-f12.xml.in.h:9
+#: ../comps-f13.xml.in.h:9
 #: ../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-f12.xml.in.h:10
+#: ../comps-f13.xml.in.h:10
 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-f12.xml.in.h:11
+#: ../comps-f13.xml.in.h:11
 #: ../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-f12.xml.in.h:12
+#: ../comps-f13.xml.in.h:12
 #: ../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-f12.xml.in.h:13
+#: ../comps-f13.xml.in.h:13
 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-f12.xml.in.h:14
+#: ../comps-f13.xml.in.h:14
 #: ../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-f12.xml.in.h:16
+#: ../comps-f13.xml.in.h:16
 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-f12.xml.in.h:17
+#: ../comps-f13.xml.in.h:17
 #: ../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-f12.xml.in.h:18
+#: ../comps-f13.xml.in.h:18
 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-f12.xml.in.h:19
+#: ../comps-f13.xml.in.h:19
 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-f12.xml.in.h:20
+#: ../comps-f13.xml.in.h:20
 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-f12.xml.in.h:21
+#: ../comps-f13.xml.in.h:21
 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
[...2617 lines suppressed...]
+#: ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "Suporte a Sardenho"
 
 #: ../comps-f11.xml.in.h:182
+#: ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Ambientes de Trabalho Sugar"
 
 #: ../comps-f11.xml.in.h:183
+#: ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 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
+#: ../comps-f11.xml.in.h:187
+#: ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 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
+#: ../comps-f11.xml.in.h:189
+#: ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Suporte a Swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197
+#: ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Suporte a Tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224
+#: ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 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
+#: ../comps-f11.xml.in.h:236
+#: ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Suporte a Turquemeno"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238
+#: ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Suporte a S?rbio Alto"
 
+#: ../comps-f12.xml.in.h:2
+#: ../comps-f13.xml.in.h:2
+msgid "A set of packages that provide the Critical Path functionality for the GNOME desktop"
+msgstr "Um conjunto de pacotes que disponibilizam a funcionalidade de Caminho Cr?tico para o ambiente de trabalho GNOME"
+
+#: ../comps-f12.xml.in.h:3
+#: ../comps-f13.xml.in.h:3
+msgid "A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins"
+msgstr "Um conjunto de pacotes que disponibilizam a funcionalidade de Caminho Cr?tico para plataformas partilhadas em todos os spins Fedora"
+
+#: ../comps-f12.xml.in.h:23
+#: ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Livros e Guias"
+
+#: ../comps-f12.xml.in.h:24
+#: ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Livros e Guias para utilizadores e programadores Fedora"
+
+#: ../comps-f12.xml.in.h:37
+#: ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Caminho Cr?tico (Base)"
+
+#: ../comps-f12.xml.in.h:38
+#: ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Caminho Cr?tico (GNOME)"
+
+#: ../comps-f12.xml.in.h:50
+#: ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Servidores de Direct?rios"
+
+#: ../comps-f12.xml.in.h:88
+#: ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123
+#: ../comps-f13.xml.in.h:123
+msgid "LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ? um ambiente de trabalho X11 leve desenhado para computadores com especifica??es de hardware modestas como netbooks, dispositivos m?veis e computadores mais antigos."
+
+#: ../comps-f12.xml.in.h:136
+#: ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Servidores de identifica??o de utilizadores e m?quinas."
+
+#: ../comps-f12.xml.in.h:147
+#: ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Ambiente de Trabalho Moblin"
+
+#: ../comps-f12.xml.in.h:148
+#: ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ? um ambiente de trabalho para dispositivos NetBook/NetTop/MID."
+
 #: ../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-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Suporte a Liga??es Telef?nicas"
 
 #: ../comps-el4.xml.in.h:22
-#: ../comps-el5.xml.in.h:23
+#: ../comps-el5.xml.in.h:24
 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
+#: ../comps-el5.xml.in.h:36
 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
+#: ../comps-el5.xml.in.h:45
 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-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "O editor de texto XEmacs."
 
 #: ../comps-el4.xml.in.h:54
-#: ../comps-el5.xml.in.h:52
+#: ../comps-el5.xml.in.h:53
 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-el5.xml.in.h:63
 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
+#: ../comps-el5.xml.in.h:64
 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
+#: ../comps-el5.xml.in.h:67
 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
+#: ../comps-el5.xml.in.h:68
 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-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 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 "Eclipse"
+#~ msgstr "Eclipse"
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "O Ambiente Integrado de Desenvolvimento Eclipse."
+



From bpepple at fedoraproject.org  Thu Sep  3 19:29:09 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  3 Sep 2009 19:29:09 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.52, 1.53 sources, 1.52,
	1.53 telepathy-gabble.spec, 1.64, 1.65
Message-ID: <20090903192909.5E0DC11C0099@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.2-1
- Update to 0.8.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	20 Aug 2009 20:39:49 -0000	1.52
+++ .cvsignore	3 Sep 2009 19:29:09 -0000	1.53
@@ -1 +1 @@
-telepathy-gabble-0.8.1.tar.gz
+telepathy-gabble-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	20 Aug 2009 20:39:50 -0000	1.52
+++ sources	3 Sep 2009 19:29:09 -0000	1.53
@@ -1 +1 @@
-06a50caf8e071035437ff2f246e6aca1  telepathy-gabble-0.8.1.tar.gz
+512a264e022b9786b0d8ed49e1be2ab2  telepathy-gabble-0.8.2.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- telepathy-gabble.spec	23 Aug 2009 22:07:44 -0000	1.64
+++ telepathy-gabble.spec	3 Sep 2009 19:29:09 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2.
+
 * Thu Aug 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.1-2
 - Enable libuuid support.
 



From scop at fedoraproject.org  Thu Sep  3 19:43:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  3 Sep 2009 19:43:30 +0000 (UTC)
Subject: rpms/vdr-osdteletext/devel vdr-osdteletext.spec,1.17,1.18
Message-ID: <20090903194330.EE5D011C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-osdteletext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23919

Modified Files:
	vdr-osdteletext.spec 
Log Message:
* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-4
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).



Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vdr-osdteletext.spec	10 Aug 2009 10:51:15 -0000	1.17
+++ vdr-osdteletext.spec	3 Sep 2009 19:43:30 -0000	1.18
@@ -6,7 +6,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.8.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
@@ -20,6 +20,10 @@ BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 The OSD teletext plugin displays teletext directly on VDR's on-screen
 display, with sound and video from the current channel playing in the
@@ -71,6 +75,9 @@ fi
 
 
 %changelog
+* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-4
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-3
 - Use ISA qualified dependency to vdr(abi).
 - Use %%global instead of %%define.



From jkratoch at fedoraproject.org  Thu Sep  3 19:45:39 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu,  3 Sep 2009 19:45:39 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch,1.27,1.28 gdb.spec,1.381,1.382
Message-ID: <20090903194539.5A40D11C0099@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24591

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Thu Sep  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-8
- archer-jankratochvil-fedora12 commit: a081d2f12945e9468edd5f4341d3e945bd0fefe9
  - [expr] Fix too slow lookups in large C++ programs (Sami Wagiaalla).
  - [python] Fix varobj changed values reporting (GDB PR 10584, Tom Tromey).


gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  137 -
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 +-
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  275 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 +++-
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   36 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   90 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  368 ++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1863 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |   19 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 ++++
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infrun.c                                                 |    8 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  170 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 +++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 ++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 ++
 python/python-symtab.c                                   |  322 ++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |   67 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   42 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/solib-overlap-lib.c                   |   27 
 testsuite/gdb.base/solib-overlap-main.c                  |   25 
 testsuite/gdb.base/solib-overlap.exp                     |  139 +
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   30 
 testsuite/gdb.cp/namespace-recursive.exp                 |   66 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/callframecfa.S                      |  309 ++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-break.exp                            |    2 
 testsuite/gdb.mi/mi-var-block.exp                        |    2 
 testsuite/gdb.mi/mi-var-child.exp                        |   30 
 testsuite/gdb.mi/mi-var-cmd.exp                          |   38 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi-var-invalidate.exp                   |    6 
 testsuite/gdb.mi/mi2-var-block.exp                       |    2 
 testsuite/gdb.mi/mi2-var-child.exp                       |   30 
 testsuite/gdb.mi/mi2-var-cmd.exp                         |   28 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |  127 -
 testsuite/gdb.python/python-prettyprint.c                |   19 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 ++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |  100 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  254 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |  754 ++++--
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 258 files changed, 19022 insertions(+), 2762 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gdb-archer.patch	1 Sep 2009 13:19:03 -0000	1.27
+++ gdb-archer.patch	3 Sep 2009 19:45:38 -0000	1.28
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit d25596676e8811b03f8c9aba6bbd04ebaa9ff5db
+commit a081d2f12945e9468edd5f4341d3e945bd0fefe9
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -1934,7 +1934,7 @@ index 62800b8..97d587b 100644
  			{ $$ = $1.comp;
  			  if ($2) $$ = fill_comp (DEMANGLE_COMPONENT_LOCAL_NAME, $$, $2); }
 diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
-index d2d8f2e..5805a30 100644
+index d2d8f2e..7672b2e 100644
 --- a/gdb/cp-namespace.c
 +++ b/gdb/cp-namespace.c
 @@ -36,14 +36,17 @@ static struct using_direct *cp_copy_usings (struct using_direct *using,
@@ -2081,7 +2081,7 @@ index d2d8f2e..5805a30 100644
 +  /* Search for name in namespaces imported to this and parent blocks.  */
 +  while (block != NULL)
 +    {
-+      sym = cp_lookup_symbol_imports(scope,name, block, domain,0);
++      sym = cp_lookup_symbol_imports(scope,name, block, domain,0,1);
 +
 +      if (sym)
 +        return sym;
@@ -2114,7 +2114,7 @@ index d2d8f2e..5805a30 100644
        if (sym != NULL)
  	return sym;
      }
-@@ -320,25 +377,55 @@ lookup_namespace_scope (const char *name,
+@@ -320,25 +377,81 @@ lookup_namespace_scope (const char *name,
    namespace = alloca (scope_len + 1);
    strncpy (namespace, scope, scope_len);
    namespace[scope_len] = '\0';
@@ -2152,7 +2152,29 @@ index d2d8f2e..5805a30 100644
 +}
 +
 +/* Search for NAME by applying all import statements belonging
-+   to BLOCK which are applicable in SCOPE.  */
++   to BLOCK which are applicable in SCOPE. If DECLARATION_ONLY the search
++   is restricted to using declarations.
++   Example:
++
++     namespace A{
++       int x;
++     }
++     using A::x;
++
++   If SEARCH_PARENTS the search will include imports which are applicable in
++   parents of scopes.
++   Example:
++
++     namespace A{
++       using namespace X;
++       namespace B{
++         using namespace Y;
++       }
++     }
++
++   If SCOPE is "A::B" and SEARCH_PARENTS is true the imports of namespaces X
++   and Y will be considered. If SEARCH_PARENTS is false only the import of Y
++   is considered.  */
 +
  struct symbol *
 -cp_lookup_symbol_namespace (const char *namespace,
@@ -2164,17 +2186,21 @@ index d2d8f2e..5805a30 100644
 +                            const char *name,
 +                            const struct block *block,
 +                            const domain_enum domain,
-+                            int declaration_only)
++                            int declaration_only,
++                            int search_parents)
  {
 -  const struct using_direct *current;
 -  struct symbol *sym;
 +  struct using_direct *current;
 +  struct symbol *sym = NULL;
++  int directive_match;
++  int current_line = find_pc_line (get_frame_pc (get_current_frame ()), 0).line;
  
 -  /* First, go through the using directives.  If any of them add new
 +  if(!declaration_only)
-+  /* First, try to find the symbol in the given namespace.  */
-+  sym = cp_lookup_symbol_in_namespace (scope, name, block, domain);
++    /* First, try to find the symbol in the given namespace.  */
++    sym = cp_lookup_symbol_in_namespace (scope, name, block, domain);
++
 +  if ( sym != NULL)
 +    return sym;
 +
@@ -2182,17 +2208,20 @@ index d2d8f2e..5805a30 100644
       names to the namespace we're searching in, see if we can find a
       match by applying them.  */
  
-@@ -346,39 +433,70 @@ cp_lookup_symbol_namespace (const char *namespace,
+@@ -346,39 +459,74 @@ cp_lookup_symbol_namespace (const char *namespace,
         current != NULL;
         current = current->next)
      {
 -      if (strcmp (namespace, current->import_dest) == 0)
-+      int current_line = find_pc_line (get_frame_pc (get_current_frame ()), 0).line;
 +  
 +      /* If the import destination is the current scope or one of its ancestors then
 +         it is applicable.  */
-+      if (strncmp (scope, current->import_dest,
-+          strlen(current->import_dest)) == 0 &&
++      directive_match = search_parents ?
++                        strncmp (scope, current->import_dest,
++                                 strlen(current->import_dest)) == 0 :
++                        strcmp (scope, current->import_dest) == 0;
++
++      if (directive_match &&
 +          current->line_number < current_line &&
 +          !current->searched)
  	{
@@ -2244,6 +2273,7 @@ index d2d8f2e..5805a30 100644
 +		                                name,
 +		                                block,
 +		                                domain,
++		                                0,
 +		                                0);
 +	    }
 +
@@ -2281,7 +2311,7 @@ index d2d8f2e..5805a30 100644
  }
  
  /* Look up NAME in BLOCK's static block and in global blocks.  If
-@@ -388,17 +506,15 @@ cp_lookup_symbol_namespace (const char *namespace,
+@@ -388,17 +536,15 @@ cp_lookup_symbol_namespace (const char *namespace,
  
  static struct symbol *
  lookup_symbol_file (const char *name,
@@ -2300,7 +2330,7 @@ index d2d8f2e..5805a30 100644
    if (anonymous_namespace)
      {
        /* Symbols defined in anonymous namespaces have external linkage
-@@ -408,12 +524,11 @@ lookup_symbol_file (const char *name,
+@@ -408,12 +554,11 @@ lookup_symbol_file (const char *name,
        const struct block *global_block = block_global_block (block);
        
        if (global_block != NULL)
@@ -2315,7 +2345,7 @@ index d2d8f2e..5805a30 100644
      }
  
    if (sym != NULL)
-@@ -434,6 +549,7 @@ lookup_symbol_file (const char *name,
+@@ -434,6 +579,7 @@ lookup_symbol_file (const char *name,
        sym = lookup_possible_namespace_symbol (name);
        if (sym != NULL)
  	return sym;
@@ -2323,7 +2353,7 @@ index d2d8f2e..5805a30 100644
      }
  
    return NULL;
-@@ -461,9 +577,8 @@ cp_lookup_nested_type (struct type *parent_type,
+@@ -461,9 +607,8 @@ cp_lookup_nested_type (struct type *parent_type,
  	   lookup_symbol_namespace works when looking them up.  */
  
  	const char *parent_name = TYPE_TAG_NAME (parent_type);
@@ -2334,7 +2364,7 @@ index d2d8f2e..5805a30 100644
  							 block,
  							 VAR_DOMAIN);
  	if (sym == NULL || SYMBOL_CLASS (sym) != LOC_TYPEDEF)
-@@ -709,7 +824,7 @@ check_one_possible_namespace_symbol (const char *name, int len,
+@@ -709,7 +854,7 @@ check_one_possible_namespace_symbol (const char *name, int len,
  
    memcpy (name_copy, name, len);
    name_copy[len] = '\0';
@@ -2343,7 +2373,7 @@ index d2d8f2e..5805a30 100644
  
    if (sym == NULL)
      {
-@@ -749,7 +864,7 @@ lookup_possible_namespace_symbol (const char *name)
+@@ -749,7 +894,7 @@ lookup_possible_namespace_symbol (const char *name)
        struct symbol *sym;
  
        sym = lookup_block_symbol (get_possible_namespace_block (objfile),
@@ -2474,7 +2504,7 @@ index f12d785..ca10007 100644
  _initialize_cp_support (void)
  {
 diff --git a/gdb/cp-support.h b/gdb/cp-support.h
-index b5a5c5f..022f102 100644
+index b5a5c5f..3f48f98 100644
 --- a/gdb/cp-support.h
 +++ b/gdb/cp-support.h
 @@ -38,15 +38,33 @@ struct demangle_component;
@@ -2547,7 +2577,7 @@ index b5a5c5f..022f102 100644
  					  struct using_direct *next);
  
  extern void cp_initialize_namespace (void);
-@@ -97,15 +124,19 @@ extern void cp_set_block_scope (const struct symbol *symbol,
+@@ -97,15 +124,20 @@ extern void cp_set_block_scope (const struct symbol *symbol,
  extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol);
  
  extern struct symbol *cp_lookup_symbol_nonlocal (const char *name,
@@ -2559,7 +2589,8 @@ index b5a5c5f..022f102 100644
 +                                         const char *name,
 +                                         const struct block *block,
 +                                         const domain_enum domain,
-+                                         int declaration_only);
++                                         int declaration_only,
++                                         int search_parents);
 +
  extern struct symbol *cp_lookup_symbol_namespace (const char *namespace,
 -						  const char *name,
@@ -3458,7 +3489,7 @@ index 4984f31..fcf1b5d 100644
  This observer is used for internal testing.  Do not use.  
  See testsuite/gdb.gdb/observer.exp.
 diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
-index 427f58f..392a1b4 100644
+index 427f58f..e66f007 100644
 --- a/gdb/dwarf2-frame.c
 +++ b/gdb/dwarf2-frame.c
 @@ -38,6 +38,7 @@
@@ -3483,7 +3514,7 @@ index 427f58f..392a1b4 100644
  no_get_tls_address (void *baton, CORE_ADDR offset)
  {
    internal_error (__FILE__, __LINE__,
-@@ -363,14 +371,16 @@ execute_stack_op (gdb_byte *exp, ULONGEST len, int addr_size,
+@@ -363,14 +371,22 @@ execute_stack_op (gdb_byte *exp, ULONGEST len, int addr_size,
    ctx->read_reg = read_reg;
    ctx->read_mem = read_mem;
    ctx->get_frame_base = no_get_frame_base;
@@ -3497,11 +3528,17 @@ index 427f58f..392a1b4 100644
 -  if (ctx->in_reg)
 +  if (ctx->location == DWARF_VALUE_REGISTER)
      result = read_reg (this_frame, result);
-+  /* FIXME */
++  else if (ctx->location != DWARF_VALUE_MEMORY)
++    {
++      /* This is actually invalid DWARF, but if we ever do run across
++	 it somehow, we might as well support it.  So, instead, report
++	 it as unimplemented.  */
++      error (_("Not implemented: computing unwound register using explicit value operator"));
++    }
  
    do_cleanups (old_chain);
  
-@@ -1250,6 +1260,16 @@ dwarf2_frame_base_sniffer (struct frame_info *this_frame)
+@@ -1250,6 +1266,16 @@ dwarf2_frame_base_sniffer (struct frame_info *this_frame)
  
    return NULL;
  }
@@ -3518,7 +3555,7 @@ index 427f58f..392a1b4 100644
  

  const struct objfile_data *dwarf2_frame_objfile_data;
  
-@@ -1539,6 +1559,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
+@@ -1539,6 +1565,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
        CORE_ADDR offset;
        CORE_ADDR seek_pc;
  
@@ -3547,7 +3584,7 @@ index b203661..dd03d59 100644
 +
  #endif /* dwarf2-frame.h */
 diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
-index 2721065..228eae7 100644
+index 2721065..0644b46 100644
 --- a/gdb/dwarf2expr.c
 +++ b/gdb/dwarf2expr.c
 @@ -125,8 +125,7 @@ dwarf_expr_fetch (struct dwarf_expr_context *ctx, int n)
@@ -3578,7 +3615,7 @@ index 2721065..228eae7 100644
  }
  
  /* Evaluate the expression at ADDR (LEN bytes long) using the context
-@@ -287,6 +292,21 @@ signed_address_type (struct gdbarch *gdbarch, int addr_size)
+@@ -287,6 +292,23 @@ signed_address_type (struct gdbarch *gdbarch, int addr_size)
      }
  }
  

@@ -3589,7 +3626,9 @@ index 2721065..228eae7 100644
 +static void
 +require_composition (gdb_byte *op_ptr, gdb_byte *op_end, const char *op_name)
 +{
-+  /* FIXME: DW_OP_GNU_uninit?  */
++  /* It seems like DW_OP_GNU_uninit should be handled here.  However,
++     it doesn't seem to make sense for DW_OP_*_value, and it was not
++     checked at the other place that this function is called.  */
 +  if (op_ptr != op_end && *op_ptr != DW_OP_piece && *op_ptr != DW_OP_bit_piece)
 +    error (_("DWARF-2 expression error: `%s' operations must be "
 +	     "used either alone or in conjuction with DW_OP_piece "
@@ -3600,7 +3639,7 @@ index 2721065..228eae7 100644
  /* The engine for the expression evaluator.  Using the context in CTX,
     evaluate the expression between OP_PTR and OP_END.  */
  
-@@ -295,8 +315,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -295,8 +317,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  		  gdb_byte *op_ptr, gdb_byte *op_end)
  {
    enum bfd_endian byte_order = gdbarch_byte_order (ctx->gdbarch);
@@ -3610,7 +3649,7 @@ index 2721065..228eae7 100644
    ctx->initialized = 1;  /* Default is initialized.  */
  
    if (ctx->recursion_depth > ctx->max_recursion_depth)
-@@ -436,20 +455,36 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -436,20 +457,36 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  		   "used either alone or in conjuction with DW_OP_piece."));
  
  	  result = op - DW_OP_reg0;
@@ -3635,7 +3674,7 @@ index 2721065..228eae7 100644
 +	  {
 +	    ULONGEST len;
 +	    op_ptr = read_uleb128 (op_ptr, op_end, &len);
-+	    if (op_ptr + len >= op_end)
++	    if (op_ptr + len > op_end)
 +	      error (_("DW_OP_implicit_value: too few bytes available."));
 +	    ctx->len = len;
 +	    ctx->data = op_ptr;
@@ -3653,14 +3692,17 @@ index 2721065..228eae7 100644
  	case DW_OP_breg0:
  	case DW_OP_breg1:
  	case DW_OP_breg2:
-@@ -514,11 +549,12 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -513,12 +550,15 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+                specific this_base method.  */
  	    (ctx->get_frame_base) (ctx->baton, &datastart, &datalen);
  	    dwarf_expr_eval (ctx, datastart, datalen);
++	    if (ctx->location == DWARF_VALUE_LITERAL
++		|| ctx->location == DWARF_VALUE_STACK)
++	      error (_("Not implemented: computing frame base using explicit value operator"));
  	    result = dwarf_expr_fetch (ctx, 0);
 -	    if (ctx->in_reg)
 +	    if (ctx->location == DWARF_VALUE_REGISTER)
  	      result = (ctx->read_reg) (ctx->baton, result);
-+	    /* FIXME: other DWARF_VALUE_*?? */
  	    result = result + offset;
  	    ctx->stack_len = before_stack_len;
 -	    ctx->in_reg = 0;
@@ -3668,7 +3710,7 @@ index 2721065..228eae7 100644
  	  }
  	  break;
  	case DW_OP_dup:
-@@ -716,6 +752,10 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -716,6 +756,10 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  	  }
  	  break;
  
@@ -3679,7 +3721,7 @@ index 2721065..228eae7 100644
  	case DW_OP_GNU_push_tls_address:
  	  /* Variable is at a constant offset in the thread-local
  	  storage block into the objfile for the current thread and
-@@ -754,12 +794,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -754,12 +798,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  
              /* Record the piece.  */
              op_ptr = read_uleb128 (op_ptr, op_end, &size);
@@ -3698,7 +3740,7 @@ index 2721065..228eae7 100644
            }
            goto no_push;
  
-@@ -771,6 +812,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -771,6 +816,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  	  ctx->initialized = 0;
  	  goto no_push;
  
@@ -18820,7 +18862,7 @@ index eb35369..dfd8c8c 100644
  	  {
  	    printf_filtered ("Global symbol `");
 diff --git a/gdb/symtab.c b/gdb/symtab.c
-index c88156a..9c102c0 100644
+index c88156a..75b907f 100644
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
 @@ -42,6 +42,7 @@
@@ -19128,7 +19170,7 @@ index c88156a..9c102c0 100644
 +      if (language == language_cplus )
 +        {
 +          sym = cp_lookup_symbol_imports (block_scope (block_iterator), name,
-+                                          block_iterator, domain, 1);
++                                          block_iterator, domain, 1, 1);
 +
 +          if (sym != NULL)
 +            return sym;
@@ -22507,6 +22549,129 @@ index 0000000..ebc898f
 +
 +gdb_test "print xx" "= 999"
 +
+diff --git a/gdb/testsuite/gdb.cp/namespace-stress.cc b/gdb/testsuite/gdb.cp/namespace-stress.cc
+new file mode 100644
+index 0000000..f34083e
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-stress.cc
+@@ -0,0 +1,60 @@
++
++namespace A{ int x; }
++namespace B{ int x; }
++namespace C{ int x; }
++namespace D{ int x; }
++namespace E{ int x; }
++namespace F{ int x; }
++namespace G{ int x; }
++namespace H{ int x; }
++namespace I{ int x; }
++namespace J{ int x; }
++namespace K{ int x; }
++namespace L{ int x; }
++namespace M{ int x; }
++namespace N{ int x; }
++namespace O{ int x; }
++namespace P{ int x; }
++namespace Q{ int x; }
++namespace R{ int x; }
++namespace S{ int x; }
++namespace T{ int x; }
++namespace U{ int x; }
++namespace V{ int x; }
++namespace W{ int x; }
++namespace X{ int x; }
++namespace Y{ int x; }
++namespace Z{ int x; }
++
++
++int main(){
++
++  using namespace A;
++  using namespace B;
++  using namespace C;
++  using namespace D;
++  using namespace E;
++  using namespace F;
++  using namespace G;
++  using namespace H;
++  using namespace I;
++  using namespace J;
++  using namespace K;
++  using namespace L;
++  using namespace M;
++  using namespace N;
++  using namespace O;
++  using namespace P;
++  using namespace Q;
++  using namespace R;
++  using namespace S;
++  using namespace T;
++  using namespace U;
++  using namespace V;
++  using namespace W;
++  using namespace X;
++  using namespace Y;
++  using namespace Z;
++
++  return 0;
++}
+\ No newline at end of file
+diff --git a/gdb/testsuite/gdb.cp/namespace-stress.exp b/gdb/testsuite/gdb.cp/namespace-stress.exp
+new file mode 100644
+index 0000000..1806523
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-stress.exp
+@@ -0,0 +1,50 @@
++# Copyright 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++set testfile namespace-stress
++set srcfile ${testfile}.cc
++set binfile ${objdir}/${subdir}/${testfile}
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1;
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] then {
++    perror "couldn't run to breakpoint main"
++    continue
++}
++
++############################################
++# Test that the search can fail efficiently 
++
++gdb_test "print y" "No symbol \"y\" in current context."
 diff --git a/gdb/testsuite/gdb.cp/namespace-using.cc b/gdb/testsuite/gdb.cp/namespace-using.cc
 index 4786fd5..8ff5622 100644
 --- a/gdb/testsuite/gdb.cp/namespace-using.cc
@@ -25322,6 +25487,37 @@ index 4b02e50..faa9172 100644
  	"get children of anone"
  
  
+diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+index 05d46fa..4b95674 100644
+--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
++++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+@@ -72,7 +72,7 @@ mi_runto main
+ 
+ # Check local variable is "invalid".
+ mi_gdb_test "-var-update linteger" \
+-	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"invalid\"\}\\\]" \
++	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"invalid\",has_more=\"0\"\}\\\]" \
+ 	"linteger not anymore in scope due to binary changes"
+ 
+ mi_gdb_test "-var-info-type linteger" \
+@@ -97,7 +97,7 @@ mi_delete_breakpoints
+ mi_gdb_load ${binfile2}
+ # Check local variable are "invalid"
+ mi_gdb_test "-var-update linteger" \
+-	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"invalid\"\}\\\]" \
++	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"invalid\",has_more=\"0\"\}\\\]" \
+ 	"linteger not valid anymore due to binary changes"
+ 
+ mi_gdb_test "-var-info-type linteger" \
+@@ -106,7 +106,7 @@ mi_gdb_test "-var-info-type linteger" \
+ 
+ # Check global variable are still correct.
+ mi_gdb_test "-var-update global_simple" \
+-	"\\^done,changelist=\\\[\{name=\"global_simple\",in_scope=\"invalid\"\}\\\]" \
++	"\\^done,changelist=\\\[\{name=\"global_simple\",in_scope=\"invalid\",has_more=\"0\"\}\\\]" \
+ 	"global_simple not anymore in scope due to binary changes"
+ 
+ mi_gdb_test "-var-info-type global_simple" \
 diff --git a/gdb/testsuite/gdb.mi/mi2-var-block.exp b/gdb/testsuite/gdb.mi/mi2-var-block.exp
 index 6bcfea3..9b3d08f 100644
 --- a/gdb/testsuite/gdb.mi/mi2-var-block.exp
@@ -26342,10 +26538,10 @@ index 0000000..d444554
 +gdb_test "python print t0" "\\<gdb.InferiorThread object at 0x\[\[:xdigit:\]\]+>" "verify InferiorThread object"
 +gdb_test "python print 'result =', t0.num" " = \[0-9\]+" "test Inferior.num"
 diff --git a/gdb/testsuite/gdb.python/python-mi.exp b/gdb/testsuite/gdb.python/python-mi.exp
-index 3258810..018c6a2 100644
+index 3258810..7791775 100644
 --- a/gdb/testsuite/gdb.python/python-mi.exp
 +++ b/gdb/testsuite/gdb.python/python-mi.exp
-@@ -48,23 +48,42 @@ mi_gdb_test "python execfile ('${srcdir}/${subdir}/${testfile}.py')" ""
+@@ -48,23 +48,53 @@ mi_gdb_test "python execfile ('${srcdir}/${subdir}/${testfile}.py')" ""
  mi_continue_to_line [gdb_get_line_number {MI breakpoint here} ${testfile}.c] \
    "step to breakpoint"
  
@@ -26363,6 +26559,17 @@ index 3258810..018c6a2 100644
 +
 +mi_gdb_test "-enable-pretty-printing" ""
 +
++mi_create_varobj_checked string string_1 \
++    "struct string_repr" \
++    "create string_1 varobj"
++
++mi_gdb_test "-data-evaluate-expression \"string_1 = string_2\"" ".*" \
++    "assign string_1 from string_2"
++
++mi_gdb_test "-var-update string" \
++    "\\^done,changelist=\\\[{name=\"string\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"}\\\]" \
++    "update string varobj after assignment"
++
 +mi_create_dynamic_varobj container c \
 +  "create container varobj"
  
@@ -26396,7 +26603,7 @@ index 3258810..018c6a2 100644
  
  mi_gdb_test "-var-set-visualizer container None" \
    "\\^done" \
-@@ -78,19 +97,88 @@ mi_gdb_test "-var-set-visualizer container gdb.default_visualizer" \
+@@ -78,19 +108,88 @@ mi_gdb_test "-var-set-visualizer container gdb.default_visualizer" \
    "\\^done" \
    "choose default visualizer"
  
@@ -26492,7 +26699,7 @@ index 3258810..018c6a2 100644
  mi_continue_to_line \
      [gdb_get_line_number {Another MI breakpoint} ${testfile}.c] \
 diff --git a/gdb/testsuite/gdb.python/python-prettyprint.c b/gdb/testsuite/gdb.python/python-prettyprint.c
-index 3cafc48..5fbd534 100644
+index 3cafc48..adf66b5 100644
 --- a/gdb/testsuite/gdb.python/python-prettyprint.c
 +++ b/gdb/testsuite/gdb.python/python-prettyprint.c
 @@ -15,6 +15,8 @@
@@ -26504,7 +26711,7 @@ index 3cafc48..5fbd534 100644
  struct s
  {
    int a;
-@@ -148,6 +150,11 @@ void do_nothing(void)
+@@ -148,6 +150,14 @@ void do_nothing(void)
    c = 23;			/* Another MI breakpoint */
  }
  
@@ -26513,10 +26720,13 @@ index 3cafc48..5fbd534 100644
 +  char *s;
 +};
 +
++struct string_repr string_1 = { { "one" } };
++struct string_repr string_2 = { { "two" } };
++
  int
  main ()
  {
-@@ -155,11 +162,15 @@ main ()
+@@ -155,11 +165,15 @@ main ()
    struct ss  ssa[2];
    string x = make_string ("this is x");
    zzz_type c = make_container ("container");
@@ -26532,7 +26742,7 @@ index 3cafc48..5fbd534 100644
  
    struct ns  ns;
    ns.null_str = "embedded\0null\0string";
-@@ -193,6 +204,11 @@ main ()
+@@ -193,6 +207,11 @@ main ()
    add_item (&c, 72);
  
  #ifdef MI
@@ -29116,7 +29326,7 @@ index 6f6b756..b9ca650 100644
  /* User function handler.  */
  
 diff --git a/gdb/varobj.c b/gdb/varobj.c
-index fbe8ff8..a730095 100644
+index fbe8ff8..490ca33 100644
 --- a/gdb/varobj.c
 +++ b/gdb/varobj.c
 @@ -26,9 +26,12 @@
@@ -29758,21 +29968,36 @@ index fbe8ff8..a730095 100644
  	{
  	  /* Try to compare the values.  That requires that both
  	     values are non-lazy.  */
-@@ -1310,6 +1561,8 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1310,74 +1561,53 @@ install_new_value (struct varobj *var, struct value *value, int initial)
    if (var->value != NULL && var->value != value)
      value_free (var->value);
    var->value = value;
+-  if (var->print_value)
+-    xfree (var->print_value);
+-  var->print_value = print_value;
 +  if (value != NULL)
 +    value_incref (value);
-   if (var->print_value)
-     xfree (var->print_value);
-   var->print_value = print_value;
-@@ -1319,65 +1572,32 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+   if (value && value_lazy (value) && intentionally_not_fetched)
+     var->not_fetched = 1;
+   else
      var->not_fetched = 0;
    var->updated = 0;
  
 +  install_new_value_visualizer (var);
 +
++  /* If we installed a pretty-printer, re-compare the printed version
++     to see if the variable changed.  */
++  if (var->pretty_printer)
++    {
++      xfree (print_value);
++      print_value = value_get_print_value (var->value, var->format, var);
++      if (!var->print_value || strcmp (var->print_value, print_value) != 0)
++	changed = 1;
++    }
++  if (var->print_value)
++    xfree (var->print_value);
++  var->print_value = print_value;
++
    gdb_assert (!var->value || value_type (var->value));
  
    return changed;
@@ -29850,7 +30075,7 @@ index fbe8ff8..a730095 100644
  }
  
  void 
-@@ -1395,31 +1615,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
+@@ -1395,31 +1625,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
    make_cleanup_py_decref (globals);
  
    constructor = PyRun_String (visualizer, Py_eval_input, globals, globals);
@@ -29888,7 +30113,7 @@ index fbe8ff8..a730095 100644
  
    do_cleanups (back_to);
  #else
-@@ -1530,44 +1738,60 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+@@ -1530,44 +1748,63 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
  
        /* We probably should not get children of a varobj that has a
  	 pretty-printer, but for which -var-list-children was never
@@ -29918,11 +30143,14 @@ index fbe8ff8..a730095 100644
 +		 it as unchanged -- presumably, such varobj is not yet
 +		 expanded in the UI, so we need not bother getting
 +		 it.  */
-+	      if (varobj_has_more (v, 0))
-+		continue;
++	      if (!varobj_has_more (v, 0))
++		{
++		  update_dynamic_varobj_children (v, NULL, NULL, &dummy, 0, 0);
++		  if (varobj_has_more (v, 0))
++		    r.changed = 1;
++		}
 +
-+	      update_dynamic_varobj_children (v, NULL, NULL, &dummy, 0, 0);
-+	      if (varobj_has_more (v, 0))
++	      if (r.changed)
 +		VEC_safe_push (varobj_update_result, result, &r);
 +
 +	      continue;
@@ -29967,7 +30195,7 @@ index fbe8ff8..a730095 100644
  	      continue;
  	    }
  	}
-@@ -1855,7 +2079,12 @@ new_variable (void)
+@@ -1855,7 +2092,12 @@ new_variable (void)
    var->frozen = 0;
    var->not_fetched = 0;
    var->children_requested = 0;
@@ -29980,7 +30208,7 @@ index fbe8ff8..a730095 100644
  
    return var;
  }
-@@ -1885,7 +2114,10 @@ free_variable (struct varobj *var)
+@@ -1885,7 +2127,10 @@ free_variable (struct varobj *var)
    if (var->pretty_printer)
      {
        struct cleanup *cleanup = varobj_ensure_python_env (var);
@@ -29992,7 +30220,7 @@ index fbe8ff8..a730095 100644
        do_cleanups (cleanup);
      }
  #endif
-@@ -1918,6 +2150,18 @@ make_cleanup_free_variable (struct varobj *var)
+@@ -1918,6 +2163,18 @@ make_cleanup_free_variable (struct varobj *var)
    return make_cleanup (do_free_variable_cleanup, var);
  }
  
@@ -30011,7 +30239,7 @@ index fbe8ff8..a730095 100644
  /* This returns the type of the variable. It also skips past typedefs
     to return the real type of the variable.
  
-@@ -2132,6 +2376,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
+@@ -2132,6 +2389,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
        else
  	{
  	  tmp_var->obj_name = xstrdup (var->obj_name);
@@ -30020,7 +30248,7 @@ index fbe8ff8..a730095 100644
  	  varobj_delete (var, NULL, 0);
  
  	  install_variable (tmp_var);
-@@ -2166,7 +2412,11 @@ static char *
+@@ -2166,7 +2425,11 @@ static char *
  my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
  {
    if (var->root->is_valid)
@@ -30033,7 +30261,7 @@ index fbe8ff8..a730095 100644
    else
      return NULL;
  }
-@@ -2189,43 +2439,51 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
+@@ -2189,43 +2452,51 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
      struct cleanup *back_to = varobj_ensure_python_env (var);
      PyObject *value_formatter = var->pretty_printer;
  
@@ -30116,7 +30344,7 @@ index fbe8ff8..a730095 100644
        }
      do_cleanups (back_to);
    }
-@@ -2954,10 +3212,7 @@ cplus_describe_child (struct varobj *parent, int index,
+@@ -2954,10 +3225,7 @@ cplus_describe_child (struct varobj *parent, int index,
  	    *cname = xstrdup (TYPE_FIELD_NAME (type, index));
  
  	  if (cvalue && value)
@@ -30128,7 +30356,7 @@ index fbe8ff8..a730095 100644
  
  	  if (ctype)
  	    {
-@@ -3163,6 +3418,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+@@ -3163,6 +3431,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -30148,7 +30376,7 @@ index fbe8ff8..a730095 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3180,6 +3448,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3180,6 +3461,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- gdb.spec	1 Sep 2009 13:19:03 -0000	1.381
+++ gdb.spec	3 Sep 2009 19:45:38 -0000	1.382
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 7%{?_with_upstream:.upstream}%{?dist}
+Release: 8%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -829,6 +829,11 @@ fi
 %endif
 
 %changelog
+* Thu Sep  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-8
+- archer-jankratochvil-fedora12 commit: a081d2f12945e9468edd5f4341d3e945bd0fefe9
+  - [expr] Fix too slow lookups in large C++ programs (Sami Wagiaalla).
+  - [python] Fix varobj changed values reporting (GDB PR 10584, Tom Tromey).
+
 * Tue Sep  1 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-7
 - archer-jankratochvil-fedora12 commit: d25596676e8811b03f8c9aba6bbd04ebaa9ff5db
   - [call-frame-cfa] Fix parsing CFA-relative frames (BZ 516627, Tom Tromey).



From scop at fedoraproject.org  Thu Sep  3 19:46:11 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  3 Sep 2009 19:46:11 +0000 (UTC)
Subject: rpms/vdr-remote/devel vdr-remote.spec,1.5,1.6
Message-ID: <20090903194611.ED9C411C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-remote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24897

Modified Files:
	vdr-remote.spec 
Log Message:
* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-9
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).



Index: vdr-remote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-remote/devel/vdr-remote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vdr-remote.spec	10 Aug 2009 10:48:59 -0000	1.5
+++ vdr-remote.spec	3 Sep 2009 19:46:11 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.4.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Extended remote control plugin for VDR
 
 Group:          Applications/Multimedia
@@ -25,6 +25,10 @@ BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 Requires:       udev
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 This plugin extends VDR's remote control capabilities, adding support
 for Linux input devices, keyboards (tty), TCP connections, and LIRC.
@@ -92,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-9
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-8
 - Use ISA qualified dependency to vdr(abi).
 - Use %%global instead of %%define.



From notting at fedoraproject.org  Thu Sep  3 19:46:05 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  3 Sep 2009 19:46:05 +0000 (UTC)
Subject: rpms/anthy/devel anthy.spec,1.61,1.62
Message-ID: <20090903194605.837D511C0099@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24770

Modified Files:
	anthy.spec 
Log Message:
Do not build against xemacs on RHEL (<dgregor at redhat.com>)



Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- anthy.spec	28 Aug 2009 08:22:55 -0000	1.61
+++ anthy.spec	3 Sep 2009 19:46:05 -0000	1.62
@@ -23,13 +23,15 @@
 
 Name:		anthy
 Version:	9100h
-Release:	8%{?dist}
+Release:	9%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs emacs-el
+%if 0%{?rhel} == 0
 BuildRequires:	xemacs
+%endif
 
 Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
@@ -77,6 +79,7 @@ This package contains the elisp source f
 do not need to install this package to run Anthy. Install the emacs-%{pkg}
 package to use Anthy with GNU Emacs.
 
+%if 0%{?rhel} == 0
 %package -n	xemacs-%{pkg}
 Summary:	Compiled elisp files to run Anthy under XEmacs
 Group:		System Environment/Libraries
@@ -98,6 +101,7 @@ Requires:	xemacs-%{pkg} = %{version}-%{r
 This package contains the elisp source files for Anthy under XEmacs. You do
 not need to install this package to run Anthy. Install the xemacs-%{pkg}
 package to use Anthy with XEmacs.
+%endif
 
 
 %prep
@@ -183,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{l
 %__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
 
+%if 0%{?rhel} == 0
 ## for xemacs-anthy
 %__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}
@@ -191,6 +196,7 @@ make clean
 make EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
 make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
 popd
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -225,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{emacs_lispdir}/%{pkg}/*.el
 
+%if 0%{?rhel} == 0
 %files -n xemacs-%{pkg}
 %defattr(-, root, root, -)
 %doc doc/ELISP
@@ -235,9 +242,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -n xemacs-%{pkg}-el
 %defattr(-, root, root, -)
 %{xemacs_lispdir}/%{pkg}/*.el
-
+%endif
 
 %changelog
+* Thu Sep  3 2009 Dennis Gregorovic <dgregor at redhat.com> - 9100h-9
+- Do not build against xemacs on RHEL
+
 * Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
 - Fix more typos in dictionary. (#519769)
 



From scop at fedoraproject.org  Thu Sep  3 19:50:05 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  3 Sep 2009 19:50:05 +0000 (UTC)
Subject: rpms/vdr-ttxtsubs/devel vdr-ttxtsubs.spec,1.13,1.14
Message-ID: <20090903195005.F313411C0374@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-ttxtsubs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26075

Modified Files:
	vdr-ttxtsubs.spec 
Log Message:
* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-4
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).



Index: vdr-ttxtsubs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/vdr-ttxtsubs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vdr-ttxtsubs.spec	10 Aug 2009 10:44:55 -0000	1.13
+++ vdr-ttxtsubs.spec	3 Sep 2009 19:50:05 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 Group:          Applications/Multimedia
@@ -20,6 +20,10 @@ BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 This VDR plugin implements displaying, recording and replaying
 teletext based subtitles using the on screen display.
@@ -69,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-4
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-3
 - Use ISA qualified dependency to vdr(abi).
 - Use %%global instead of %%define.
@@ -76,68 +83,68 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-1
+* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-1
 - 0.0.9.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Jan  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.8-1
+* Tue Jan  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.8-1
 - 0.0.8.
 - License: GPLv2+ (already since 0.0.6).
 
-* Fri Dec 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.7-1
+* Fri Dec 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.7-1
 - 0.0.7.
 
-* Mon Dec 15 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.6-1
+* Mon Dec 15 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.6-1
 - 0.0.6 (new community upstream), patches applied upstream.
 
-* Mon Nov 24 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-6
+* Mon Nov 24 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-6
 - Rebuild.
 
-* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-5
+* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-5
 - Rebuild for VDR 1.6.0.
 
-* Sat Feb 16 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-4
+* Sat Feb 16 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-4
 - Rebuild.
 
-* Wed Jan 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-3
+* Wed Jan 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-3
 - Update raastinrauta patch to 2008-01-22.
 
-* Mon Oct 15 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-2
+* Mon Oct 15 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-2
 - Rebuild.
 
-* Sun Sep 30 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-1
+* Sun Sep 30 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-1
 - License: GPL+
 - Raastinrauta patch re-re-re-re-re-released.
 
-* Tue Aug 28 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.10
+* Tue Aug 28 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.10
 - Raastinrauta patch re-re-re-released.
 
-* Fri Aug 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.9
+* Fri Aug 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.9
 - Raastinrauta patch re-re-released.
 
-* Thu Aug  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.8
+* Thu Aug  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.8
 - Raastinrauta patch re-released.
 
-* Wed Jul 25 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.7
+* Wed Jul 25 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.7
 - Update Rofa's patch to raastinrauta edition.
 
-* Tue Apr 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.6
+* Tue Apr 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.6
 - Update Rofa's patch to kermanekka edition, changes from 0.0.5-0.5 applied.
 
-* Mon Apr  9 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.5
+* Mon Apr  9 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.5
 - Fix plugin init/shutdown with newish VDR; avoids crashes at shutdown.
 - Clean up logging.
 
-* Sat Jan 20 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.4
+* Sat Jan 20 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.4
 - Update Rofa's patch to pippurimylly edition.
 
-* Sun Nov 12 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.3
+* Sun Nov 12 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.3
 - Move channel settings to /var/lib/vdr.
 
-* Sat Nov 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.2
+* Sat Nov 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.2
 - Own /etc/vdr/plugins/ttxtsubs.
 
-* Sat Nov 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.1
+* Sat Nov 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.0.5-0.1
 - First build.



From scop at fedoraproject.org  Thu Sep  3 19:51:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  3 Sep 2009 19:51:15 +0000 (UTC)
Subject: rpms/vdr-femon/devel vdr-femon.spec,1.22,1.23
Message-ID: <20090903195115.A83BC11C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-femon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26459

Modified Files:
	vdr-femon.spec 
Log Message:
* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-4
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).



Index: vdr-femon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/vdr-femon.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- vdr-femon.spec	10 Aug 2009 10:53:42 -0000	1.22
+++ vdr-femon.spec	3 Sep 2009 19:51:15 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.6.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DVB frontend status monitor plugin for VDR
 
 Group:          Applications/Multimedia
@@ -18,6 +18,10 @@ BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 DVB frontend status monitor is a plugin that displays some signal
 information parameters of the current tuned channel on VDR's OSD.  You
@@ -61,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-4
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-3
 - Use ISA qualified dependency to vdr(abi).
 - Use %%global instead of %%define.



From rdieter at fedoraproject.org  Thu Sep  3 19:52:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Sep 2009 19:52:34 +0000 (UTC)
Subject: rpms/kmymoney2/EL-5 kmymoney2-1.0.0-no_it_locale.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 kmymoney2.spec, 1.20, 1.21 sources,
	1.9, 1.10
Message-ID: <20090903195234.3435011C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26838

Modified Files:
	.cvsignore kmymoney2.spec sources 
Added Files:
	kmymoney2-1.0.0-no_it_locale.patch 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
- kmymoney2-1.0.0


kmymoney2-1.0.0-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.0-no_it_locale.patch ---
diff -up kmymoney2-1.0.0/po/Makefile.in.no_it kmymoney2-1.0.0/po/Makefile.in
--- kmymoney2-1.0.0/po/Makefile.in.no_it	2009-08-16 23:43:29.000000000 -0500
+++ kmymoney2-1.0.0/po/Makefile.in	2009-09-03 14:39:56.000000000 -0500
@@ -309,8 +309,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = ru.po it.po lt.po pt_BR.po da.po sk.po ca.po nl.po es_AR.po fi.po gl.po fr.po pl.po de.po en_GB.po es.po tr.po cs.po sv.po ro.po pt.po zh_CN.po
-GMOFILES = ru.gmo it.gmo lt.gmo pt_BR.gmo da.gmo sk.gmo ca.gmo nl.gmo es_AR.gmo fi.gmo gl.gmo fr.gmo pl.gmo de.gmo en_GB.gmo es.gmo tr.gmo cs.gmo sv.gmo ro.gmo pt.gmo zh_CN.gmo
+POFILES = ru.po lt.po pt_BR.po da.po sk.po ca.po nl.po es_AR.po fi.po gl.po fr.po pl.po de.po en_GB.po es.po tr.po cs.po sv.po ro.po pt.po zh_CN.po
+GMOFILES = ru.gmo lt.gmo pt_BR.gmo da.gmo sk.gmo ca.gmo nl.gmo es_AR.gmo fi.gmo gl.gmo fr.gmo pl.gmo de.gmo en_GB.gmo es.gmo tr.gmo cs.gmo sv.gmo ro.gmo pt.gmo zh_CN.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Apr 2008 20:09:49 -0000	1.10
+++ .cvsignore	3 Sep 2009 19:52:33 -0000	1.11
@@ -1 +1 @@
-kmymoney2-0.8.9.tar.bz2
+kmymoney2-1.0.0.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kmymoney2.spec	15 Apr 2008 20:09:49 -0000	1.20
+++ kmymoney2.spec	3 Sep 2009 19:52:33 -0000	1.21
@@ -1,21 +1,21 @@
 
-# FIXME/TODO: Requires aqbanking (v3?) + latest kmm_kbanking plugin.  arg. -- Rex
-#define _enable_kbanking --enable-kbanking
 %define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define ofx_deps libofx-devel opensp-devel
+%define ofx_deps libofx-devel opensp-devel libxml++-devel
 %endif
 
-%if 0%{?fedora} > 8 || 0%{?rhel} > 3
-# make -libs subpkg
-%define libs 1
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.9
+Version: 1.0.0 
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -24,29 +24,29 @@ Group:	 Applications/Productivity
 Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# RHEL5's gettext doesn't grok it.po
+Patch1: kmymoney2-1.0.0-no_it_locale.patch
+
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
-
-%{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
+# multilib upgrades, when -libs became unconditional
+Obsoletes: kmymoney2 < 0.9.3-3
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+BuildRequires: curl-devel
+BuildRequires: desktop-file-utils
+BuildRequires: html2ps
 BuildRequires: gettext
 BuildRequires: ghostscript
-%if 0%{?fedora} > 6 
-BuildRequires: kdelibs3-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: libxml2-devel
 %{?_enable_ofxbanking:BuildRequires: %{ofx_deps}}
+# FIXME/TODO: consider packaging qt-sqlite3, 
+# http://www.kde-apps.org/content/show.php?content=23011
+# so not be tempted to use the embedded copy here
+%{?_enable_sqlite3:BuildRequires:sqlite-devel}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
 
 %description
@@ -54,21 +54,19 @@ KMyMoney is striving to be a full-featur
 Windows-based finance software.  We are a full double-entry accounting
 software package, for personal or small-business use.
 
-%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
-%endif
 
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
 Obsoletes: kmymoney-devel < %{version}-%{release}
 Provides:  kmymoney-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -76,6 +74,10 @@ Requires: %{name}-libs = %{version}-%{re
 %prep
 %setup -q -n kmymoney2-%{version}
 
+%if 0%{?rhel}
+%patch1 -p1 -b .no_it_locale
+%endif
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -85,10 +87,13 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final \
-  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
+  %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
+# to help doc generation
+export LANG=en_US.UTF-8
+
 make %{?_smp_mflags}
 
 
@@ -97,6 +102,10 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+desktop-file-install \
+  --vendor="" --dir=%{buildroot}%{_datadir}/applications/kde/ \
+  %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
+
 ## File lists
 # locale's
 %find_lang %{name}
@@ -119,34 +128,45 @@ fi
 
 # Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
+rm -rf %{buildroot}%{_datadir}/icons/*/scalable
 
 
-# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %check 
+# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
 
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 %post
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
+touch --no-create %{_datadir}/icons/Tango &> /dev/null || :
+
 
 %postun
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null 
+  touch --no-create %{_datadir}/icons/locolor &> /dev/null
+  touch --no-create %{_datadir}/icons/oxygen &> /dev/null
+  touch --no-create %{_datadir}/icons/Tango &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
+
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -154,30 +174,35 @@ update-desktop-database %{_datadir}/appl
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2/
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/kmymoney2.desktop
+%{_datadir}/config.kcfg/kmymoney2.kcfg
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
+%{_datadir}/icons/Tango/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
-%if "%{?_enable_ofxbanking:1}" == "1"
+%if 0%{?_enable_ofxbanking:1}
+%{_datadir}/apps/kmm_ofximport/
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
-%if "%{?_enable_kbanking:1}" == "1"
+%if 0%{?_enable_kbanking:1}
 %{_libdir}/kde3/kmm_kbanking.*
 %{_datadir}/apps/kmm_kbanking/
 %endif
 %{_mandir}/man?/*
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
+%{_libdir}/libkmm_kdchart.so.0*
+%{_libdir}/libkmm_mymoney.so.5*
+%{_libdir}/libkmm_plugin.so.0*
+%{?_enable_sqlite3:%{_libdir}/qt-3.3/plugins/sqldrivers/*.so}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/kmymoney
+%{_libdir}/libkmm_*.so
 
 
 %clean
@@ -185,6 +210,36 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- kmymoney2-1.0.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- validate .desktop file
+- -libs unconditional
+- use %%_isa where appropriate
+- optimize scriptlets
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-1
+- kmymoney2-0.9.3
+
+* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-3
+- respun tarball 
+
+* Sun Sep 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
+- kmymoney2-0.9.2
+
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> 0.9-2
+- rebuild for new libofx ABI
+
+* Wed May 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9-1
+- kmymoney2-0.9
+
 * Wed Mar 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.9-1
 - kmymoney2-0.8.9
 - --disable-kbanking (requires aqbanking,kbanking fix/update)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Apr 2008 20:09:49 -0000	1.9
+++ sources	3 Sep 2009 19:52:33 -0000	1.10
@@ -1 +1 @@
-1f0c412f88b9344c18562fbca3c10717  kmymoney2-0.8.9.tar.bz2
+f702ea77ff5bf6aec727768da34d98ec  kmymoney2-1.0.0.tar.bz2



From myoung at fedoraproject.org  Thu Sep  3 20:02:41 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu,  3 Sep 2009 20:02:41 +0000 (UTC)
Subject: rpms/kernel/devel/scripts rebase.sh,1.24.6.1,1.24.6.2
Message-ID: <20090903200241.9EFBC11C0099@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29138/scripts

Modified Files:
      Tag: private-myoung-dom0-branch
	rebase.sh 
Log Message:
Update pvops patch to try stack protector on i686 again



Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.24.6.1
retrieving revision 1.24.6.2
diff -u -p -r1.24.6.1 -r1.24.6.2
--- rebase.sh	25 Feb 2009 21:26:03 -0000	1.24.6.1
+++ rebase.sh	3 Sep 2009 20:02:41 -0000	1.24.6.2
@@ -29,12 +29,12 @@ else
 fi
 
 # Is there a new snapshot or prepatch ?
-NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "snapshot for the stable"`
+NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "latest snapshot 2.6 version"`
 if [ -z "$NEW" ] ; then
-  NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"`
+  NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "latest mainline 2.6 version"`
   if [ -z "$NEW" ] ; then
     if [ "$OLDRC" -ne 0 ] ; then
-      NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"`
+      NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "latest stable 2.6." | head -n1`
     else
       echo "No new rc or git snapshot of stable branch".
       exit 0



From myoung at fedoraproject.org  Thu Sep  3 20:02:48 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu,  3 Sep 2009 20:02:48 +0000 (UTC)
Subject: rpms/kernel/devel drm-god-shut-up-about-edid-already.patch, NONE,
	1.1.2.2 drm-rv710-ucode-fix.patch, NONE,
	1.1.2.2 linux-2.6-ksm-fix-munlock.patch, NONE, 1.1.2.2
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch,
	NONE, 1.1.2.2
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch,
	NONE, 1.1.2.2
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch,
	NONE, 1.1.2.2 linux-2.6-xen-stack-protector-fix.patch, NONE,
	1.1.2.2 lirc-2.6.31.patch, NONE,
	1.2.2.2 patch-2.6.31-rc8-git2.bz2.sign, NONE,
	1.1.2.2 patch-2.6.31-rc8.bz2.sign, NONE,
	1.1.2.2 v4l-dvb-fix-cx25840-firmware-loading.patch, NONE,
	1.1.2.2 .cvsignore, 1.1014.2.28, 1.1014.2.29 config-generic,
	1.238.6.36, 1.238.6.37 config-x86-generic, 1.68.6.19,
	1.68.6.20 drm-intel-next.patch, 1.4.6.6,
	1.4.6.7 drm-intel-pm.patch, 1.4.2.2,
	1.4.2.3 hdpvr-ir-enable.patch, 1.2.2.2, 1.2.2.3 kernel.spec,
	1.1294.2.60, 1.1294.2.61 linux-2.6-ksm-kvm.patch, 1.2.6.2,
	1.2.6.3 linux-2.6-ksm.patch, 1.2.6.2, 1.2.6.3 sources,
	1.976.2.29, 1.976.2.30 upstream, 1.888.2.28,
	1.888.2.29 xen.pvops.patch, 1.1.2.37,
	1.1.2.38 allow-disabling-ima.diff, 1.2.2.2,
	NONE linux-2.6.31-lirc.patch, 1.2.2.5,
	NONE lirc_streamzap-buffer-rework.patch, 1.1.2.2,
	NONE patch-2.6.31-rc7-git4.bz2.sign, 1.1.4.2,
	NONE patch-2.6.31-rc7.bz2.sign, 1.1.2.2,
	NONE xen-fb-probe-fix.patch, 1.1.6.2, NONE
Message-ID: <20090903200248.D6ECD11C0099@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29138

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic config-x86-generic 
	drm-intel-next.patch drm-intel-pm.patch hdpvr-ir-enable.patch 
	kernel.spec linux-2.6-ksm-kvm.patch linux-2.6-ksm.patch 
	sources upstream xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-god-shut-up-about-edid-already.patch 
	drm-rv710-ucode-fix.patch linux-2.6-ksm-fix-munlock.patch 
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch 
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch 
	linux-2.6-xen-stack-protector-fix.patch lirc-2.6.31.patch 
	patch-2.6.31-rc8-git2.bz2.sign patch-2.6.31-rc8.bz2.sign 
	v4l-dvb-fix-cx25840-firmware-loading.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	allow-disabling-ima.diff linux-2.6.31-lirc.patch 
	lirc_streamzap-buffer-rework.patch 
	patch-2.6.31-rc7-git4.bz2.sign patch-2.6.31-rc7.bz2.sign 
	xen-fb-probe-fix.patch 
Log Message:
Update pvops patch to try stack protector on i686 again


drm-god-shut-up-about-edid-already.patch:
 drm_edid.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE drm-god-shut-up-about-edid-already.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c.jx	2009-09-01 17:06:43.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c	2009-09-01 17:10:28.000000000 -0400
@@ -630,7 +630,6 @@ int drm_do_probe_ddc_edid(struct i2c_ada
 	if (i2c_transfer(adapter, msgs, 2) == 2)
 		return 0;
 
-	dev_info(&adapter->dev, "unable to read EDID block.\n");
 	return -1;
 }
 EXPORT_SYMBOL(drm_do_probe_ddc_edid);
@@ -643,8 +642,6 @@ static int drm_ddc_read_edid(struct drm_
 
 	ret = drm_do_probe_ddc_edid(adapter, buf, len);
 	if (ret != 0) {
-		dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
-			 drm_get_connector_name(connector));
 		goto end;
 	}
 	if (!edid_is_valid((struct edid *)buf)) {

drm-rv710-ucode-fix.patch:
 rv770.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE drm-rv710-ucode-fix.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c.jx linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c.jx	2009-08-27 14:45:25.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c	2009-08-27 14:54:30.000000000 -0400
@@ -282,6 +282,7 @@ static int rv770_cp_load_microcode(struc
 		for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
 			WREG32(CP_ME_RAM_DATA, RV710_cp_microcode[i]);
 		WREG32(CP_ME_RAM_WADDR, 0);
+		break;
 	default:
 		DRM_ERROR("Unknown chipset for RV7XX microcode\n");
 		return -1;

linux-2.6-ksm-fix-munlock.patch:
 include/linux/ksm.h |   11 ++++-------
 kernel/fork.c       |    1 +
 mm/ksm.c            |    5 +----
 mm/memory.c         |    4 ++--
 mm/mmap.c           |    7 -------
 5 files changed, 8 insertions(+), 20 deletions(-)

--- NEW FILE linux-2.6-ksm-fix-munlock.patch ---
From: Andrea Arcangeli <aarcange at redhat.com>

Allowing page faults triggered by drivers tracking the mm during
exit_mmap with mm_users already zero is asking for troubles. And we
can't stop page faults from happening during exit_mmap or munlock fails
(munlock also better stop triggering page faults with mm_users zero).

ksm_exit if there are rmap_items still chained on this mm slot, will
take mmap_sem write side so preventing ksm to keep working on a mm while
exit_mmap runs. And ksm will bail out as soon as it notices that
mm_users is already zero thanks to the ksm_test_exit checks. So that
when a task is killed by OOM killer or the user, ksm will not
indefinitely prevent it to run exit_mmap and release its memory. 

Signed-off-by: Andrea Arcangeli <aarcange at redhat.com>
---

diff --git a/include/linux/ksm.h b/include/linux/ksm.h
index 2d64ff3..0e26de6 100644
--- a/include/linux/ksm.h
+++ b/include/linux/ksm.h
@@ -18,8 +18,7 @@ struct mmu_gather;
 int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
 		unsigned long end, int advice, unsigned long *vm_flags);
 int __ksm_enter(struct mm_struct *mm);
-void __ksm_exit(struct mm_struct *mm,
-		struct mmu_gather **tlbp, unsigned long end);
+void __ksm_exit(struct mm_struct *mm);
 
 static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
 {
@@ -41,11 +40,10 @@ static inline bool ksm_test_exit(struct mm_struct *mm)
 	return atomic_read(&mm->mm_users) == 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm,
-			    struct mmu_gather **tlbp, unsigned long end)
+static inline void ksm_exit(struct mm_struct *mm)
 {
 	if (test_bit(MMF_VM_MERGEABLE, &mm->flags))
-		__ksm_exit(mm, tlbp, end);
+		__ksm_exit(mm);
 }
 
 /*
@@ -86,8 +84,7 @@ static inline bool ksm_test_exit(struct mm_struct *mm)
 	return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm,
-			    struct mmu_gather **tlbp, unsigned long end)
+static inline void ksm_exit(struct mm_struct *mm)
 {
 }
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 9a16c21..6f93809 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -515,6 +515,7 @@ void mmput(struct mm_struct *mm)
 
 	if (atomic_dec_and_test(&mm->mm_users)) {
 		exit_aio(mm);
+		ksm_exit(mm);
 		exit_mmap(mm);
 		set_mm_exe_file(mm, NULL);
 		if (!list_empty(&mm->mmlist)) {
diff --git a/mm/ksm.c b/mm/ksm.c
index d03627f..329ebe9 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1428,8 +1428,7 @@ int __ksm_enter(struct mm_struct *mm)
 	return 0;
 }
 
-void __ksm_exit(struct mm_struct *mm,
-		struct mmu_gather **tlbp, unsigned long end)
+void __ksm_exit(struct mm_struct *mm)
 {
 	struct mm_slot *mm_slot;
 	int easy_to_free = 0;
@@ -1462,10 +1461,8 @@ void __ksm_exit(struct mm_struct *mm,
 		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
 		mmdrop(mm);
 	} else if (mm_slot) {
-		tlb_finish_mmu(*tlbp, 0, end);
 		down_write(&mm->mmap_sem);
 		up_write(&mm->mmap_sem);
-		*tlbp = tlb_gather_mmu(mm, 1);
 	}
 }
 
diff --git a/mm/memory.c b/mm/memory.c
index 4a2c60d..025431e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2603,7 +2603,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	entry = maybe_mkwrite(pte_mkdirty(entry), vma);
 
 	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
-	if (!pte_none(*page_table) || ksm_test_exit(mm))
+	if (!pte_none(*page_table))
 		goto release;
 
 	inc_mm_counter(mm, anon_rss);
@@ -2753,7 +2753,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * handle that later.
 	 */
 	/* Only go through if we didn't race with anybody else... */
-	if (likely(pte_same(*page_table, orig_pte) && !ksm_test_exit(mm))) {
+	if (likely(pte_same(*page_table, orig_pte))) {
 		flush_icache_page(vma, page);
 		entry = mk_pte(page, vma->vm_page_prot);
 		if (flags & FAULT_FLAG_WRITE)
diff --git a/mm/mmap.c b/mm/mmap.c
index 1b0a709..f3f2a22 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2111,13 +2111,6 @@ void exit_mmap(struct mm_struct *mm)
 	end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL);
 	vm_unacct_memory(nr_accounted);
 
-	/*
-	 * For KSM to handle OOM without deadlock when it's breaking COW in a
-	 * likely victim of the OOM killer, we must serialize with ksm_exit()
-	 * after freeing mm's pages but before freeing its page tables.
-	 */
-	ksm_exit(mm, &tlb, end);
-
 	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
 	tlb_finish_mmu(tlb, 0, end);
 

linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch:
 kvm.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch ---
Date:  Tue, 25 Aug 2009 01:13:10 -0300
From: Marcelo Tosatti <mtosatti at redhat.com>
To: Avi Kivity <avi at redhat.com>
Cc: kvm <kvm at vger.kernel.org>, Jeremy Fitzhardinge <jeremy at goop.org>
Subject: KVM pvmmu: do not batch pte updates from interrupt context


Commit b8bcfe997e4 made paravirt pte updates synchronous in interrupt
context.

Unfortunately the KVM pv mmu code caches the lazy/nonlazy mode
internally, so a pte update from interrupt context during a lazy mmu
operation can be batched while it should be performed synchronously.

https://bugzilla.redhat.com/show_bug.cgi?id=518022

Drop the internal mode variable and use paravirt_get_lazy_mode(), which
returns the correct state.

Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index c664d51..63b0ec8 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -34,7 +34,6 @@
 struct kvm_para_state {
 	u8 mmu_queue[MMU_QUEUE_SIZE];
 	int mmu_queue_len;
-	enum paravirt_lazy_mode mode;
 };
 
 static DEFINE_PER_CPU(struct kvm_para_state, para_state);
@@ -77,7 +76,7 @@ static void kvm_deferred_mmu_op(void *buffer, int len)
 {
 	struct kvm_para_state *state = kvm_para_state();
 
-	if (state->mode != PARAVIRT_LAZY_MMU) {
+	if (paravirt_get_lazy_mode() != PARAVIRT_LAZY_MMU) {
 		kvm_mmu_op(buffer, len);
 		return;
 	}
@@ -185,10 +184,7 @@ static void kvm_release_pt(unsigned long pfn)
 
 static void kvm_enter_lazy_mmu(void)
 {
-	struct kvm_para_state *state = kvm_para_state();
-
 	paravirt_enter_lazy_mmu();
-	state->mode = paravirt_get_lazy_mode();
 }
 
 static void kvm_leave_lazy_mmu(void)
@@ -197,7 +193,6 @@ static void kvm_leave_lazy_mmu(void)
 
 	mmu_queue_flush(state);
 	paravirt_leave_lazy_mmu();
-	state->mode = paravirt_get_lazy_mode();
 }
 
 static void __init paravirt_ops_setup(void)


linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch:
 include/asm/kvm_host.h |    1 +
 kvm/vmx.c              |    2 ++
 kvm/x86.c              |   14 +++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch ---
Date: Tue,  1 Sep 2009 12:03:25 +0300
From: Avi Kivity <avi at redhat.com>
To: Marcelo Tosatti <mtosatti at redhat.com>
Cc: kvm at vger.kernel.org
Subject: [PATCH] KVM: VMX: Check cpl before emulating debug register access

Debug registers may only be accessed from cpl 0.  Unfortunately, vmx will
code to emulate the instruction even though it was issued from guest
userspace, possibly leading to an unexpected trap later.

Cc: stable at kernel.org
Signed-off-by: Avi Kivity <avi at redhat.com>
---
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/vmx.c              |    2 ++
 arch/x86/kvm/x86.c              |   13 +++++++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index a3f637f..6046e6f 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -621,6 +621,7 @@ void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr);
 void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);
 void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long cr2,
 			   u32 error_code);
+bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl);
 
 int kvm_pic_set_irq(void *opaque, int irq, int level);
 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 78101dd..05cd554 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2931,6 +2931,8 @@ static int handle_dr(struct kvm_vcpu *vcpu)
 	unsigned long val;
 	int dr, reg;
 
+	if (!kvm_require_cpl(vcpu, 0))
+		return 1;
 	dr = vmcs_readl(GUEST_DR7);
 	if (dr & DR7_GD) {
 		/*
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8b3a169..891234b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -223,6 +223,19 @@ void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code)
 EXPORT_SYMBOL_GPL(kvm_queue_exception_e);
 
 /*
+ * Checks if cpl <= required_cpl; if true, return true.  Otherwise queue
+ * a #GP and return false.
+ */
+bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl)
+{
+	if (kvm_x86_ops->get_cpl(vcpu) <= required_cpl)
+		return true;
+	kvm_queue_exception_e(vcpu, GP_VECTOR, 0);
+	return false;
+}
+EXPORT_SYMBOL_GPL(kvm_require_cpl);
+
+/*
  * Load the pae pdptrs.  Return true is they are all valid.
  */
 int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3)
-- 
1.6.4.1


linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch:
 kvmclock.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch ---
Date:  Mon, 31 Aug 2009 03:04:31 -0400
From: Glauber Costa <glommer at redhat.com>
To: kvm at vger.kernel.org
Cc: linux-kernel at vger.kernel.org, avi at redhat.com
Subject: [PATCH] use __pa_symbol to calculate the address of a C symbol.

The use of __pa() to calculate the address of a C-visible symbol
is wrong, and can lead to unpredictable results. See arch/x86/include/asm/page.h
for details.

It should be replaced with __pa_symbol(), that does the correct math here,
by taking relocations into account.

Signed-off-by: Glauber Costa <glommer at redhat.com>
---
 arch/x86/kernel/kvmclock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 223af43..e5efcdc 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -50,8 +50,8 @@ static unsigned long kvm_get_wallclock(void)
 	struct timespec ts;
 	int low, high;
 
-	low = (int)__pa(&wall_clock);
-	high = ((u64)__pa(&wall_clock) >> 32);
+	low = (int)__pa_symbol(&wall_clock);
+	high = ((u64)__pa_symbol(&wall_clock) >> 32);
 	native_write_msr(MSR_KVM_WALL_CLOCK, low, high);
 
 	vcpu_time = &get_cpu_var(hv_clock);
-- 
1.6.2.2

linux-2.6-xen-stack-protector-fix.patch:
 arch/x86/mm/Makefile     |    4 +
 arch/x86/xen/Makefile    |    2 
 arch/x86/xen/enlighten.c |  133 +++++++++++++++++++++++++++++++++++++++--------
 arch/x86/xen/smp.c       |    1 
 drivers/xen/Makefile     |    3 +
 5 files changed, 123 insertions(+), 20 deletions(-)

--- NEW FILE linux-2.6-xen-stack-protector-fix.patch ---
>From 27512accbc440c1460b2df6024ed03fc40feff7d Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Thu, 27 Aug 2009 12:46:35 -0700
Subject: [PATCH] xen: make -fstack-protector work under Xen

-fstack-protector uses a special per-cpu "stack canary" value.
gcc generates special code in each function to test the canary to make
sure that the function's stack hasn't been overrun.

On x86-64, this is simply an offset of %gs, which is the usual per-cpu
base segment register, so setting it up simply requires loading %gs's
base as normal.

On i386, the stack protector segment is %gs (rather than the usual kernel
percpu %fs segment register).  This requires setting up the full kernel
GDT and then loading %gs accordingly.  (We also need to make sure %fs is
initialized on secondary cpus too.)

To keep things consistent, we do the full GDT/segment register setup on
both architectures.

Because we need to avoid -fstack-protected code before setting up the GDT
and because there's no way to disable it on a per-function basis, several
files need to have stack-protector inhibited.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index eefdeee..72bb3a2 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,6 +1,10 @@
 obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
 	    pat.o pgtable.o gup.o
 
+# Make sure __phys_addr has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_ioremap.o		:= $(nostackp)
+
 obj-$(CONFIG_SMP)		+= tlb.o
 
 obj-$(CONFIG_X86_32)		+= pgtable_32.o iomap_32.o
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 7410640..3bb4fc2 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -8,6 +8,7 @@ endif
 # Make sure early boot has no stackprotector
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_enlighten.o		:= $(nostackp)
+CFLAGS_mmu.o			:= $(nostackp)
 
 obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 			time.o xen-asm.o xen-asm_$(BITS).o \
@@ -16,3 +17,4 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
+
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index e5b903b..596a7d7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -51,6 +51,7 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/reboot.h>
+#include <asm/stackprotector.h>
 
 #include "xen-ops.h"
 #include "mmu.h"
@@ -339,18 +340,28 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
 	unsigned long frames[pages];
 	int f;
 
-	/* A GDT can be up to 64k in size, which corresponds to 8192
-	   8-byte entries, or 16 4k pages.. */
+	/* 
+	 * A GDT can be up to 64k in size, which corresponds to 8192
+	 * 8-byte entries, or 16 4k pages..
+	 */
 
 	BUG_ON(size > 65536);
 	BUG_ON(va & ~PAGE_MASK);
 
 	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
 		int level;
-		pte_t *ptep = lookup_address(va, &level);
+		pte_t *ptep;
 		unsigned long pfn, mfn;
 		void *virt;
 
+		/*
+		 * The GDT is per-cpu and is in the percpu data area.
+		 * That can be virtually mapped, so we need to do a
+		 * page-walk to get the underlying MFN for the
+		 * hypercall.  The page can also be in the kernel's
+		 * linear range, so we need to RO that mapping too.
+		 */
+		ptep = lookup_address(va, &level);
 		BUG_ON(ptep == NULL);
 
 		pfn = pte_pfn(*ptep);
@@ -367,6 +378,44 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
 		BUG();
 }
 
+/* 
+ * load_gdt for early boot, when the gdt is only mapped once
+ */
+static __init void xen_load_gdt_boot(const struct desc_ptr *dtr)
+{
+	unsigned long va = dtr->address;
+	unsigned int size = dtr->size + 1;
+	unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+	unsigned long frames[pages];
+	int f;
+
+	/* 
+	 * A GDT can be up to 64k in size, which corresponds to 8192
+	 * 8-byte entries, or 16 4k pages..
+	 */
+
+	BUG_ON(size > 65536);
+	BUG_ON(va & ~PAGE_MASK);
+
+	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
+		pte_t pte;
+		unsigned long pfn, mfn;
+
+		pfn = virt_to_pfn(va);
+		mfn = pfn_to_mfn(pfn);
+
+		pte = pfn_pte(pfn, PAGE_KERNEL_RO);
+
+		if (HYPERVISOR_update_va_mapping((unsigned long)va, pte, 0))
+			BUG();
+
+		frames[f] = mfn;
+	}
+
+	if (HYPERVISOR_set_gdt(frames, size / sizeof(struct desc_struct)))
+		BUG();
+}
+
 static void load_TLS_descriptor(struct thread_struct *t,
 				unsigned int cpu, unsigned int i)
 {
@@ -590,6 +639,29 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
 	preempt_enable();
 }
 
+/* 
+ * Version of write_gdt_entry for use at early boot-time needed to
+ * update an entry as simply as possible.
+ */
+static __init void xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,
+					    const void *desc, int type)
+{
+	switch (type) {
+	case DESC_LDT:
+	case DESC_TSS:
+		/* ignore */
+		break;
+
+	default: {
+		xmaddr_t maddr = virt_to_machine(&dt[entry]);
+
+		if (HYPERVISOR_update_descriptor(maddr.maddr, *(u64 *)desc))
+			dt[entry] = *(struct desc_struct *)desc;
+	}
+
+	}	
+}
+
 static void xen_load_sp0(struct tss_struct *tss,
 			 struct thread_struct *thread)
 {
@@ -974,6 +1046,23 @@ static const struct machine_ops __initdata xen_machine_ops = {
 	.emergency_restart = xen_emergency_restart,
 };
 
+/* 
+ * Set up the GDT and segment registers for -fstack-protector.  Until
+ * we do this, we have to be careful not to call any stack-protected
+ * function, which is most of the kernel.
+ */
+static void __init xen_setup_stackprotector(void)
+{
+	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
+	pv_cpu_ops.load_gdt = xen_load_gdt_boot;
+
+	setup_stack_canary_segment(0);
+	switch_to_new_gdt(0);
+
+	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;       
+	pv_cpu_ops.load_gdt = xen_load_gdt;
+}
+
 /* First C function to be called on Xen boot */
 asmlinkage void __init xen_start_kernel(void)
 {
@@ -992,13 +1081,28 @@ asmlinkage void __init xen_start_kernel(void)
 	pv_apic_ops = xen_apic_ops;
 	pv_mmu_ops = xen_mmu_ops;
 
-#ifdef CONFIG_X86_64
-	/*
-	 * Setup percpu state.  We only need to do this for 64-bit
-	 * because 32-bit already has %fs set properly.
+	/* 
+	 * Set up some pagetable state before starting to set any ptes.
 	 */
-	load_percpu_segment(0);
-#endif
+
+	/* Prevent unwanted bits from being set in PTEs. */
+	__supported_pte_mask &= ~_PAGE_GLOBAL;
+	if (!xen_initial_domain())
+		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
+
+	__supported_pte_mask |= _PAGE_IOMAP;
+
+	xen_setup_features();
+
+	/* Get mfn list */
+	if (!xen_feature(XENFEAT_auto_translated_physmap))
+		xen_build_dynamic_phys_to_machine();
+
+	/* 
+	 * Set up kernel GDT and segment registers, mainly so that
+	 * -fstack-protector code can be executed.
+	 */
+	xen_setup_stackprotector();
 
 	xen_init_irq_ops();
 	xen_init_cpuid_mask();
@@ -1010,8 +1114,6 @@ asmlinkage void __init xen_start_kernel(void)
 	set_xen_basic_apic_ops();
 #endif
 
-	xen_setup_features();
-
 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
@@ -1028,17 +1130,8 @@ asmlinkage void __init xen_start_kernel(void)
 
 	xen_smp_init();
 
-	/* Get mfn list */
-	if (!xen_feature(XENFEAT_auto_translated_physmap))
-		xen_build_dynamic_phys_to_machine();
-
 	pgd = (pgd_t *)xen_start_info->pt_base;
 
-	/* Prevent unwanted bits from being set in PTEs. */
-	__supported_pte_mask &= ~_PAGE_GLOBAL;
-	if (!xen_initial_domain())
-		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
-
 #ifdef CONFIG_X86_64
 	/* Work out if we support NX */
 	check_efer();
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 429834e..fe03eee 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -236,6 +236,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
 	ctxt->user_regs.ss = __KERNEL_DS;
 #ifdef CONFIG_X86_32
 	ctxt->user_regs.fs = __KERNEL_PERCPU;
+	ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
 #else
 	ctxt->gs_base_kernel = per_cpu_offset(cpu);
 #endif
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index ec2a39b..7c28434 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,6 +1,9 @@
 obj-y	+= grant-table.o features.o events.o manage.o
 obj-y	+= xenbus/
 
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_features.o			:= $(nostackp)
+
 obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
 obj-$(CONFIG_XEN_XENCOMM)	+= xencomm.o
 obj-$(CONFIG_XEN_BALLOON)	+= balloon.o

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1244 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15602 insertions(+)

--- NEW FILE lirc-2.6.31.patch ---
Linux Infrared Remote Control drivers -- http://www.lirc.org

Last updated: Tuesday, September 01, 2009

>From http://git.wilsonet.com/linux-2.6-lirc.git/

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 MAINTAINERS                           |    9 +
 drivers/input/Kconfig                 |    2 +
 drivers/input/Makefile                |    2 +
 drivers/input/lirc/Kconfig            |  119 ++
 drivers/input/lirc/Makefile           |   21 +
 drivers/input/lirc/lirc.h             |  100 ++
 drivers/input/lirc/lirc_bt829.c       |  383 ++++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 +++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 +++
 drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 +++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 ++
 drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
 drivers/input/lirc/lirc_mceusb.c      | 1244 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 +
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15602 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8dca9d8..f25dc26 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3129,6 +3129,15 @@ W:	http://www.pasemi.com/
 L:	linuxppc-dev at ozlabs.org
 S:	Supported
 
+LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
+P:	Jarod Wilson
+M:	jarod at redhat.com
+P:	Christoph Bartelmus
+M:	lirc at bartelmus.de
+W:	http://www.lirc.org/
+L:	lirc-list at lists.sourceforge.net
+S:	Maintained
+
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:	Chris Wright <chrisw at sous-sol.org>
 L:	linux-security-module at vger.kernel.org
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index cd50c00..442f94f 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/lirc/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 4c9c745..99e2b5e 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
 
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC)       += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..ab13cfe
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,119 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+	bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+	help
+	  Say Y here, and all supported Linux Infrared Remote Control IR and
+	  RF receiver and transmitter drivers will be displayed. When paired
+	  with a remote control and the lirc daemon, the receiver drivers
+	  allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_DEV
+	tristate "LIRC device loadable module support"
+	help
+	  LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+	depends on LIRC_DEV
+	help
+	  Driver for the IR interface on BT829-based hardware
+
+config LIRC_ENE0100
+	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
+	depends on LIRC_DEV
+	help
+	  This is a driver for CIR port handled by ENE KB3924 embedded
+	  controller found on some notebooks.
+	  It appears on PNP list as ENE0100.
+
+config LIRC_I2C
+	tristate "I2C Based IR Receivers"
+	depends on LIRC_DEV
+	help
+	  Driver for I2C-based IR receivers, such as those commonly
+	  found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+	tristate "Igor Cesko's USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+	tristate "Soundgraph IMON Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+	tristate "ITE IT87XX CIR Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+	tristate "ITE8709 CIR Port Receiver"
+	depends on LIRC_DEV && PNP
+	help
+	  Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+	tristate "Windows Media Center Ed. USB IR Transceiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Windows Media Center Ed. USB IR Transceivers
+
+config LIRC_PARALLEL
+	tristate "Homebrew Parallel Port Receiver"
+	depends on LIRC_DEV && !SMP
+	help
+	  Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+	tristate "Sasem USB IR Remote"
+	depends on LIRC_DEV
+	help
+	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+	tristate "Homebrew Serial Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+	bool "Serial Port Transmitter"
+	default y
+	depends on LIRC_SERIAL
+	help
+	  Serial Port Transmitter support
+
+config LIRC_SIR
+	tristate "Built-in SIR IrDA port"
+	depends on LIRC_DEV
+	help
+	  Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+	tristate "Streamzap PC Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+	tristate "Technotrend USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
[...15408 lines suppressed...]
+		ir->task = kthread_run(lirc_thread, ir, "lirc_zilog");
+		if (IS_ERR(ir->task)) {
+			ret = PTR_ERR(ir->task);
+			zilog_error("lirc_register_driver: cannot run "
+				    "poll thread %d\n", ret);
+			goto err;
+		}
+		wait_for_completion(&tn);
+		ir->t_notify = NULL;
+	}
+
+	/* initialise TX device */
+	memcpy(&ir->c_tx, &client_template, sizeof(struct i2c_client));
+	if (have_tx) {
+		/* I2C attach to device */
+		ir->c_tx.addr = 0x70;
+		strncpy(ir->c_tx.name, "Zilog/Hauppauge TX", I2C_NAME_SIZE);
+		ret = i2c_attach(&ir->c_tx, ir);
+		if (ret != 0)
+			goto err;
+	}
+
+	/* set lirc_dev stuff */
+	ir->l.code_length = 13;
+	ir->l.rbuf	  = &ir->buf;
+	ir->l.fops	= &lirc_fops;
+	ir->l.data	= ir;
+	ir->l.minor       = minor;
+	ir->l.sample_rate = 0;
+
+	/* register with lirc */
+	ir->l.minor = lirc_register_driver(&ir->l);
+	if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {
+		zilog_error("ir_attach: \"minor\" must be between 0 and %d "
+			    "(%d)!\n", MAX_IRCTL_DEVICES-1, ir->l.minor);
+		ret = -EBADRQC;
+		goto err;
+	}
+
+	/* store this for getting back in open() later on */
+	ir_devices[ir->l.minor] = ir;
+
+	/*
+	 * if we have the tx device, load the 'firmware'.  We do this
+	 * after registering with lirc as otherwise hotplug seems to take
+	 * 10s to create the lirc device.
+	 */
+	if (have_tx) {
+		/* Special TX init */
+		ret = tx_init(ir);
+		if (ret != 0)
+			goto err;
+	}
+	return 0;
+
+err:
+	/* undo everything, hopefully... */
+	if (ir->c_rx.addr)
+		ir_remove(&ir->c_rx);
+	if (ir->c_tx.addr)
+		ir_remove(&ir->c_tx);
+	return ret;
+}
+
+static int ir_remove(struct i2c_client *client)
+{
+	struct IR *ir = i2c_get_clientdata(client);
+	mutex_lock(&ir->lock);
+
+	if (client == &ir->c_rx) {
+		DECLARE_COMPLETION(tn);
+		DECLARE_COMPLETION(tn2);
+
+		/* end up polling thread */
+		if (ir->task && !IS_ERR(ir->task)) {
+			ir->t_notify = &tn;
+			ir->t_notify2 = &tn2;
+			ir->shutdown = 1;
+			wake_up_process(ir->task);
+			complete(&tn2);
+			wait_for_completion(&tn);
+			ir->t_notify = NULL;
+			ir->t_notify2 = NULL;
+		}
+
+	} else {
+		mutex_unlock(&ir->lock);
+		zilog_error("%s: detached from something we didn't "
+			    "attach to\n", __func__);
+		return -ENODEV;
+	}
+
+	--ir->devs;
+	if (ir->devs < 0) {
+		mutex_unlock(&ir->lock);
+		zilog_error("%s: invalid device count\n", __func__);
+		return -ENODEV;
+	} else if (ir->devs == 0) {
+		/* unregister lirc driver */
+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
+			lirc_unregister_driver(ir->l.minor);
+			ir_devices[ir->l.minor] = NULL;
+		}
+
+		/* free memory */
+		lirc_buffer_free(&ir->buf);
+		mutex_unlock(&ir->lock);
+		kfree(ir);
+		return 0;
+	}
+	mutex_unlock(&ir->lock);
+	return 0;
+}
+
+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+	struct i2c_adapter *adap = client->adapter;
+	char buf;
+
+	if (adap->id == I2C_HW_B_BT848 ||
+#ifdef I2C_HW_B_HDPVR
+	    adap->id == I2C_HW_B_HDPVR ||
+#endif
+	    adap->id == I2C_HW_B_CX2341X) {
+		int have_rx = 0, have_tx = 0;
+
+		/*
+		 * The external IR receiver is at i2c address 0x71.
+		 * The IR transmitter is at 0x70.
+		 */
+		client->addr = 0x70;
+
+		if (!disable_rx) {
+			if (i2c_master_recv(client, &buf, 1) == 1)
+				have_rx = 1;
+			dprintk("probe 0x70 @ %s: %s\n",
+				adap->name,
+				have_rx ? "yes" : "no");
+		}
+
+		if (!disable_tx) {
+			client->addr = 0x71;
+			if (i2c_master_recv(client, &buf, 1) == 1)
+				have_tx = 1;
+			dprintk("probe 0x71 @ %s: %s\n",
+				adap->name,
+				have_tx ? "yes" : "no");
+		}
+
+		if (have_rx || have_tx)
+			return ir_attach(adap, have_rx, have_tx);
+		else
+			zilog_error("%s: no devices found\n", adap->name);
+	}
+
+	return 0;
+}
+
+static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
+{
+	/* nothing */
+	return 0;
+}
+
+static int __init zilog_init(void)
+{
+	mutex_init(&tx_data_lock);
+	request_module("firmware_class");
+	i2c_add_driver(&driver);
+	return 0;
+}
+
+static void __exit zilog_exit(void)
+{
+	i2c_del_driver(&driver);
+	/* if loaded */
+	fw_unload();
+}
+
+module_init(zilog_init);
+module_exit(zilog_exit);
+
+MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
+MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
+	      "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
+MODULE_LICENSE("GPL");
+/* for compat with old name, which isn't all that accurate anymore */
+MODULE_ALIAS("lirc_pvr150");
+
+module_param(minor, int, 0444);
+MODULE_PARM_DESC(minor, "Preferred minor device number");
+
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+module_param(disable_rx, bool, 0644);
+MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
+
+module_param(disable_tx, bool, 0644);
+MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");


--- NEW FILE patch-2.6.31-rc8-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKnRA2yGugalF9Dw4RAloiAJ9bTv62NKVqJomI1RZifqbpGJ+FYgCfQVBT
on7r6znNdTxyK09vneVQsdI=
=rRWa
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.31-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKlzPryGugalF9Dw4RArpYAJ4u8zU9zDifKaTMyyviHw/5C1V5xgCfdcz5
91kW/e8e04xUISC11nA0zd0=
=M4EK
-----END PGP SIGNATURE-----

v4l-dvb-fix-cx25840-firmware-loading.patch:
 cx25840-firmware.c |   37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

--- NEW FILE v4l-dvb-fix-cx25840-firmware-loading.patch ---
# HG changeset patch
# User Hans Verkuil <hverkuil at xs4all.nl>
# Date 1251752272 -7200
# Node ID 36a81289010d614758a64bd757ee37c8c154ad4b
# Parent  f69cb015dc77f8893f5018afff1e60f5b4ea50af
cx25840: fix determining the firmware name

From: Hans Verkuil <hverkuil at xs4all.nl>

Depending on the model there are three different firmwares to choose from.
Unfortunately if a cx23885 is loaded first, then the global firmware name
is overwritten with that firmware and if ivtv is loaded next, then it
tries to load the wrong firmware. In addition, the original approach would
also overwrite any firmware that the user specified explicitly.

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
CC: Jarod Wilson <jarod at wilsonet.com>

Trivial backport from v4l-dvb hg tip to 2.6.31

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---

 drivers/media/video/cx25840/cx25840-firmware.c |   37 ++++++++++++++---------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 0df53b0..006ce16 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -23,10 +23,6 @@
 
 #include "cx25840-core.h"
 
-#define FWFILE "v4l-cx25840.fw"
-#define FWFILE_CX23885 "v4l-cx23885-avcore-01.fw"
-#define FWFILE_CX231XX "v4l-cx231xx-avcore-01.fw"
-
 /*
  * Mike Isely <isely at pobox.com> - The FWSEND parameter controls the
  * size of the firmware chunks sent down the I2C bus to the chip.
@@ -40,11 +36,11 @@
 
 #define FWDEV(x) &((x)->dev)
 
-static char *firmware = FWFILE;
+static char *firmware = "";
 
 module_param(firmware, charp, 0444);
 
-MODULE_PARM_DESC(firmware, "Firmware image [default: " FWFILE "]");
+MODULE_PARM_DESC(firmware, "Firmware image to load");
 
 static void start_fw_load(struct i2c_client *client)
 {
@@ -65,6 +61,19 @@ static void end_fw_load(struct i2c_client *client)
 	cx25840_write(client, 0x803, 0x03);
 }
 
+static const char *get_fw_name(struct i2c_client *client)
+{
+	struct cx25840_state *state = to_state(i2c_get_clientdata(client));
+
+	if (firmware[0])
+		return firmware;
+	if (state->is_cx23885)
+		return "v4l-cx23885-avcore-01.fw";
+	if (state->is_cx231xx)
+		return "v4l-cx231xx-avcore-01.fw";
+	return "v4l-cx25840.fw";
+}
+
 static int check_fw_load(struct i2c_client *client, int size)
 {
 	/* DL_ADDR_HB DL_ADDR_LB */
@@ -72,11 +81,13 @@ static int check_fw_load(struct i2c_client *client, int size)
 	s |= cx25840_read(client, 0x800);
 
 	if (size != s) {
-		v4l_err(client, "firmware %s load failed\n", firmware);
+		v4l_err(client, "firmware %s load failed\n",
+			get_fw_name(client));
 		return -EINVAL;
 	}
 
-	v4l_info(client, "loaded %s firmware (%d bytes)\n", firmware, size);
+	v4l_info(client, "loaded %s firmware (%d bytes)\n",
+		 get_fw_name(client), size);
 	return 0;
 }
 
@@ -96,21 +107,17 @@ int cx25840_loadfw(struct i2c_client *client)
 	const struct firmware *fw = NULL;
 	u8 buffer[FWSEND];
 	const u8 *ptr;
+	const char *fwname = get_fw_name(client);
 	int size, retval;
 	int MAX_BUF_SIZE = FWSEND;
 
-	if (state->is_cx23885)
-		firmware = FWFILE_CX23885;
-	else if (state->is_cx231xx)
-		firmware = FWFILE_CX231XX;
-
 	if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
 		v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
 		MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */
 	}
 
-	if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
-		v4l_err(client, "unable to open firmware %s\n", firmware);
+	if (request_firmware(&fw, fwname, FWDEV(client)) != 0) {
+		v4l_err(client, "unable to open firmware %s\n", fwname);
 		return -EINVAL;
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.28
retrieving revision 1.1014.2.29
diff -u -p -r1.1014.2.28 -r1.1014.2.29
--- .cvsignore	26 Aug 2009 19:58:45 -0000	1.1014.2.28
+++ .cvsignore	3 Sep 2009 20:02:36 -0000	1.1014.2.29
@@ -5,5 +5,5 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git4.bz2
+patch-2.6.31-rc8.bz2
+patch-2.6.31-rc8-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.36
retrieving revision 1.238.6.37
diff -u -p -r1.238.6.36 -r1.238.6.37
--- config-generic	26 Aug 2009 19:58:46 -0000	1.238.6.36
+++ config-generic	3 Sep 2009 20:02:36 -0000	1.238.6.37
@@ -1162,7 +1162,7 @@ CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_NICSTAR_USE_SUNI is not set
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
-# CONFIG_ATM_SOLOS is not set
+CONFIG_ATM_SOLOS=m
 
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y
@@ -2247,6 +2247,7 @@ CONFIG_DRM_VIA=m
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_NOUVEAU_KMS is not set
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
+CONFIG_DRM_I2C_CH7006=m
 
 #
 # PCMCIA character devices
@@ -2361,8 +2362,9 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_SIANO_SMS1XXX=m
-CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m
@@ -4068,4 +4070,3 @@ CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_PCI_PASSTHROUGH=y
 # CONFIG_XEN_PCI_PASSTHROUGH_DEBUG is not set
 # CONFIG_X86_DS_SELFTEST is not set
-# CONFIG_DRM_I2C_CH7006 is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.19
retrieving revision 1.68.6.20
diff -u -p -r1.68.6.19 -r1.68.6.20
--- config-x86-generic	24 Aug 2009 20:17:11 -0000	1.68.6.19
+++ config-x86-generic	3 Sep 2009 20:02:36 -0000	1.68.6.20
@@ -115,7 +115,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
 

drm-intel-next.patch:
 0 files changed

Index: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.4.6.6
retrieving revision 1.4.6.7
diff -u -p -r1.4.6.6 -r1.4.6.7
--- drm-intel-next.patch	26 Aug 2009 19:58:46 -0000	1.4.6.6
+++ drm-intel-next.patch	3 Sep 2009 20:02:36 -0000	1.4.6.7
@@ -1,362 +1 @@
-diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index 4cf8e2e..d129497 100644
---- a/drivers/gpu/drm/i915/intel_crt.c
-+++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -537,6 +537,10 @@ void intel_crt_init(struct drm_device *dev)
- 	}
- 
- 	intel_output->type = INTEL_OUTPUT_ANALOG;
-+	intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+				   (1 << INTEL_ANALOG_CLONE_BIT) |
-+				   (1 << INTEL_SDVO_LVDS_CLONE_BIT);
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
- 
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index d6fce21..3fadb53 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -666,7 +666,7 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
- 	intel_clock_t clock;
- 	int err = target;
- 
--	if (IS_I9XX(dev) && intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-+	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
- 	    (I915_READ(LVDS)) != 0) {
- 		/*
- 		 * For LVDS, if the panel is on, just rely on its current
-@@ -2396,7 +2396,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- 		if (is_sdvo) {
- 			dpll |= DPLL_DVO_HIGH_SPEED;
- 			sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
--			if (IS_I945G(dev) || IS_I945GM(dev))
-+			if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
- 				dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
- 			else if (IS_IGDNG(dev))
- 				dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
-@@ -3170,7 +3170,7 @@ static int intel_connector_clones(struct drm_device *dev, int type_mask)
- 
-         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- 		struct intel_output *intel_output = to_intel_output(connector);
--		if (type_mask & (1 << intel_output->type))
-+		if (type_mask & intel_output->clone_mask)
- 			index_mask |= (1 << entry);
- 		entry++;
- 	}
-@@ -3218,30 +3218,30 @@ static void intel_setup_outputs(struct drm_device *dev)
- 			intel_dp_init(dev, PCH_DP_D);
- 
- 	} else if (IS_I9XX(dev)) {
--		int found;
--		u32 reg;
-+		bool found = false;
- 
- 		if (I915_READ(SDVOB) & SDVO_DETECTED) {
- 			found = intel_sdvo_init(dev, SDVOB);
- 			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- 				intel_hdmi_init(dev, SDVOB);
-+
- 			if (!found && SUPPORTS_INTEGRATED_DP(dev))
- 				intel_dp_init(dev, DP_B);
- 		}
- 
- 		/* 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) {
-+		if (I915_READ(SDVOB) & SDVO_DETECTED)
- 			found = intel_sdvo_init(dev, SDVOC);
--			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
-+
-+		if (!found && (I915_READ(SDVOC) & SDVO_DETECTED)) {
-+
-+			if (SUPPORTS_INTEGRATED_HDMI(dev))
- 				intel_hdmi_init(dev, SDVOC);
--			if (!found && SUPPORTS_INTEGRATED_DP(dev))
-+			if (SUPPORTS_INTEGRATED_DP(dev))
- 				intel_dp_init(dev, DP_C);
- 		}
-+
- 		if (SUPPORTS_INTEGRATED_DP(dev) && (I915_READ(DP_D) & DP_DETECTED))
- 			intel_dp_init(dev, DP_D);
- 	} else
-@@ -3253,51 +3253,10 @@ static void intel_setup_outputs(struct drm_device *dev)
- 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- 		struct intel_output *intel_output = to_intel_output(connector);
- 		struct drm_encoder *encoder = &intel_output->enc;
--		int crtc_mask = 0, clone_mask = 0;
- 
--		/* valid crtcs */
--		switch(intel_output->type) {
--		case INTEL_OUTPUT_HDMI:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_HDMI));
--			break;
--		case INTEL_OUTPUT_DVO:
--		case INTEL_OUTPUT_SDVO:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_ANALOG) |
--				      (1 << INTEL_OUTPUT_DVO) |
--				      (1 << INTEL_OUTPUT_SDVO));
--			break;
--		case INTEL_OUTPUT_ANALOG:
--			crtc_mask = ((1 << 0)|
--				     (1 << 1));
--			clone_mask = ((1 << INTEL_OUTPUT_ANALOG) |
--				      (1 << INTEL_OUTPUT_DVO) |
--				      (1 << INTEL_OUTPUT_SDVO));
--			break;
--		case INTEL_OUTPUT_LVDS:
--			crtc_mask = (1 << 1);
--			clone_mask = (1 << INTEL_OUTPUT_LVDS);
--			break;
--		case INTEL_OUTPUT_TVOUT:
--			crtc_mask = ((1 << 0) |
--				     (1 << 1));
--			clone_mask = (1 << INTEL_OUTPUT_TVOUT);
--			break;
--		case INTEL_OUTPUT_DISPLAYPORT:
--			crtc_mask = ((1 << 0) |
--				     (1 << 1));
--			clone_mask = (1 << INTEL_OUTPUT_DISPLAYPORT);
--			break;
--		case INTEL_OUTPUT_EDP:
--			crtc_mask = (1 << 1);
--			clone_mask = (1 << INTEL_OUTPUT_EDP);
--			break;
--		}
--		encoder->possible_crtcs = crtc_mask;
--		encoder->possible_clones = intel_connector_clones(dev, clone_mask);
-+		encoder->possible_crtcs = intel_output->crtc_mask;
-+		encoder->possible_clones = intel_connector_clones(dev,
-+						intel_output->clone_mask);
- 	}
- }
- 
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index a6ff15a..f2afc4a 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1254,6 +1254,18 @@ intel_dp_init(struct drm_device *dev, int output_reg)
- 	else
- 		intel_output->type = INTEL_OUTPUT_DISPLAYPORT;
- 
-+	if (output_reg == DP_B)
-+		intel_output->clone_mask = (1 << INTEL_DP_B_CLONE_BIT);
-+	else if (output_reg == DP_C)
-+		intel_output->clone_mask = (1 << INTEL_DP_C_CLONE_BIT);
-+	else if (output_reg == DP_D)
-+		intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT);
-+
-+	if (IS_eDP(intel_output)) {
-+		intel_output->crtc_mask = (1 << 1);
-+		intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP);
-+	} else
-+		intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 	connector->interlace_allowed = true;
- 	connector->doublescan_allowed = 0;
- 
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index d6f92ea..25aa6fa 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -57,6 +57,24 @@
- #define INTEL_OUTPUT_DISPLAYPORT 7
- #define INTEL_OUTPUT_EDP 8
- 
-+/* Intel Pipe Clone Bit */
-+#define INTEL_HDMIB_CLONE_BIT 1
-+#define INTEL_HDMIC_CLONE_BIT 2
-+#define INTEL_HDMID_CLONE_BIT 3
-+#define INTEL_HDMIE_CLONE_BIT 4
-+#define INTEL_HDMIF_CLONE_BIT 5
-+#define INTEL_SDVO_NON_TV_CLONE_BIT 6
-+#define INTEL_SDVO_TV_CLONE_BIT 7
-+#define INTEL_SDVO_LVDS_CLONE_BIT 8
-+#define INTEL_ANALOG_CLONE_BIT 9
-+#define INTEL_TV_CLONE_BIT 10
-+#define INTEL_DP_B_CLONE_BIT 11
-+#define INTEL_DP_C_CLONE_BIT 12
-+#define INTEL_DP_D_CLONE_BIT 13
-+#define INTEL_LVDS_CLONE_BIT 14
-+#define INTEL_DVO_TMDS_CLONE_BIT 15
-+#define INTEL_DVO_LVDS_CLONE_BIT 16
-+
- #define INTEL_DVO_CHIP_NONE 0
- #define INTEL_DVO_CHIP_LVDS 1
- #define INTEL_DVO_CHIP_TMDS 2
-@@ -86,6 +104,8 @@ struct intel_output {
- 	bool needs_tv_clock;
- 	void *dev_priv;
- 	void (*hot_plug)(struct intel_output *);
-+	int crtc_mask;
-+	int clone_mask;
- };
- 
- struct intel_crtc {
-diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
-index 13bff20..a4d2606 100644
---- a/drivers/gpu/drm/i915/intel_dvo.c
-+++ b/drivers/gpu/drm/i915/intel_dvo.c
-@@ -435,14 +435,20 @@ void intel_dvo_init(struct drm_device *dev)
- 			continue;
- 
- 		intel_output->type = INTEL_OUTPUT_DVO;
-+		intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 		switch (dvo->type) {
- 		case INTEL_DVO_CHIP_TMDS:
-+			intel_output->clone_mask =
-+				(1 << INTEL_DVO_TMDS_CLONE_BIT) |
-+				(1 << INTEL_ANALOG_CLONE_BIT);
- 			drm_connector_init(dev, connector,
- 					   &intel_dvo_connector_funcs,
- 					   DRM_MODE_CONNECTOR_DVII);
- 			encoder_type = DRM_MODE_ENCODER_TMDS;
- 			break;
- 		case INTEL_DVO_CHIP_LVDS:
-+			intel_output->clone_mask =
-+				(1 << INTEL_DVO_LVDS_CLONE_BIT);
- 			drm_connector_init(dev, connector,
- 					   &intel_dvo_connector_funcs,
- 					   DRM_MODE_CONNECTOR_LVDS);
-diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
-index 1842290..fa304e1 100644
---- a/drivers/gpu/drm/i915/intel_hdmi.c
-+++ b/drivers/gpu/drm/i915/intel_hdmi.c
-@@ -230,22 +230,28 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
- 
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 
- 	/* Set up the DDC bus. */
--	if (sdvox_reg == SDVOB)
-+	if (sdvox_reg == SDVOB) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIB_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "HDMIB");
--	else if (sdvox_reg == SDVOC)
-+	} else if (sdvox_reg == SDVOC) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIC_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOD, "HDMIC");
--	else if (sdvox_reg == HDMIB)
-+	} else if (sdvox_reg == HDMIB) {
-+		intel_output->clone_mask = (1 << INTEL_HDMID_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOE,
- 								"HDMIB");
--	else if (sdvox_reg == HDMIC)
-+	} else if (sdvox_reg == HDMIC) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIE_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOD,
- 								"HDMIC");
--	else if (sdvox_reg == HDMID)
-+	} else if (sdvox_reg == HDMID) {
-+		intel_output->clone_mask = (1 << INTEL_HDMIF_CLONE_BIT);
- 		intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOF,
- 								"HDMID");
--
-+	}
- 	if (!intel_output->ddc_bus)
- 		goto err_connector;
- 
-diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 3f445a8..8df02ef 100644
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -916,6 +916,8 @@ void intel_lvds_init(struct drm_device *dev)
- 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
- 	intel_output->type = INTEL_OUTPUT_LVDS;
- 
-+	intel_output->clone_mask = (1 << INTEL_LVDS_CLONE_BIT);
-+	intel_output->crtc_mask = (1 << 1);
- 	drm_encoder_helper_add(encoder, &intel_lvds_helper_funcs);
- 	drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs);
- 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index 5371d93..d3b74ba 100644
---- a/drivers/gpu/drm/i915/intel_sdvo.c
-+++ b/drivers/gpu/drm/i915/intel_sdvo.c
-@@ -1458,7 +1458,7 @@ intel_sdvo_multifunc_encoder(struct intel_output *intel_output)
- 		(SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1))
- 		caps++;
- 	if (sdvo_priv->caps.output_flags &
--		(SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID0))
-+		(SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID1))
- 		caps++;
- 	if (sdvo_priv->caps.output_flags &
- 		(SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_CVBS1))
-@@ -1967,6 +1967,9 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 			intel_sdvo_set_colorimetry(intel_output,
- 						   SDVO_COLORIMETRY_RGB256);
- 			connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
-+			intel_output->clone_mask =
-+					(1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+					(1 << INTEL_ANALOG_CLONE_BIT);
- 		}
- 	} else if (flags & SDVO_OUTPUT_SVID0) {
- 
-@@ -1975,11 +1978,14 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 		connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
- 		sdvo_priv->is_tv = true;
- 		intel_output->needs_tv_clock = true;
-+		intel_output->clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
- 	} else if (flags & SDVO_OUTPUT_RGB0) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
- 		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
- 		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
-+		intel_output->clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
-+					(1 << INTEL_ANALOG_CLONE_BIT);
- 	} else if (flags & SDVO_OUTPUT_RGB1) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
-@@ -1991,12 +1997,16 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
- 		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- 		sdvo_priv->is_lvds = true;
-+		intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT) |
-+					(1 << INTEL_SDVO_LVDS_CLONE_BIT);
- 	} else if (flags & SDVO_OUTPUT_LVDS1) {
- 
- 		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
- 		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
- 		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- 		sdvo_priv->is_lvds = true;
-+		intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT) |
-+					(1 << INTEL_SDVO_LVDS_CLONE_BIT);
- 	} else {
- 
- 		unsigned char bytes[2];
-@@ -2009,6 +2019,7 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
- 				  bytes[0], bytes[1]);
- 		ret = false;
- 	}
-+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
- 
- 	if (ret && registered)
- 		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index da4ab4d..2fbe13a 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1718,6 +1718,7 @@ intel_tv_init(struct drm_device *dev)
- 	if (!intel_output) {
- 		return;
- 	}
-+
- 	connector = &intel_output->base;
- 
- 	drm_connector_init(dev, connector, &intel_tv_connector_funcs,
-@@ -1729,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
- 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
- 	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
- 	intel_output->type = INTEL_OUTPUT_TVOUT;
-+	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
- 	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
- 	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
- 	intel_output->dev_priv = tv_priv;
+empty

drm-intel-pm.patch:
 i915_drv.c      |   15 +
 i915_drv.h      |   14 +
 i915_gem.c      |    8 
 i915_reg.h      |   22 ++
 intel_display.c |  484 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 intel_drv.h     |    4 
 6 files changed, 512 insertions(+), 35 deletions(-)

Index: drm-intel-pm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-pm.patch,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -p -r1.4.2.2 -r1.4.2.3
--- drm-intel-pm.patch	5 Aug 2009 23:00:10 -0000	1.4.2.2
+++ drm-intel-pm.patch	3 Sep 2009 20:02:36 -0000	1.4.2.3
@@ -5,7 +5,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  unsigned int i915_fbpercrtc = 0;
  module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
  
-+unsigned int i915_powersave = 1;
++unsigned int i915_powersave = 0;
 +module_param_named(powersave, i915_powersave, int, 0400);
 +
 +unsigned int i915_lvdsclock = 1;

hdpvr-ir-enable.patch:
 Makefile     |    4 +---
 hdpvr-core.c |    7 +++----
 hdpvr-i2c.c  |   49 +++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 45 insertions(+), 15 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.2 -r1.2.2.3
--- hdpvr-ir-enable.patch	10 Jul 2009 19:04:29 -0000	1.2.2.2
+++ hdpvr-ir-enable.patch	3 Sep 2009 20:02:36 -0000	1.2.2.3
@@ -1,29 +1,62 @@
 From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
 
 ---
- drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
- 2 files changed, 30 insertions(+), 9 deletions(-)
+ drivers/media/video/hdpvr/Makefile     |    4 +--
+ drivers/media/video/hdpvr/hdpvr-core.c |    7 ++--
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   49 ++++++++++++++++++++++++++-----
+ 3 files changed, 45 insertions(+), 15 deletions(-)
 
+diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
+index e0230fc..79ad2e1 100644
+--- a/drivers/media/video/hdpvr/Makefile
++++ b/drivers/media/video/hdpvr/Makefile
+@@ -1,6 +1,4 @@
+-hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
+-
+-hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
++hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o
+ 
+ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..878d1e5 100644
+index 188bd5a..9fa3d8d 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
+@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
+ 		goto error;
  	}
  
- #ifdef CONFIG_I2C
+-#ifdef CONFIG_I2C
 -	/* until i2c is working properly */
 -	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 +	retval = hdpvr_register_i2c_adapter(dev);
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
+@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+ 	mutex_unlock(&dev->io_mutex);
+ 
+ 	/* deregister I2C adapter */
+-#ifdef CONFIG_I2C
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+ 	mutex_lock(&dev->i2c_mutex);
+ 	if (dev->i2c_adapter)
+ 		i2c_del_adapter(dev->i2c_adapter);
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..1c01b6c 100644
+index c4b5d15..bc33607 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -22,7 +22,7 @@
+@@ -10,6 +10,8 @@
+  *
+  */
+ 
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
++
+ #include <linux/i2c.h>
+ 
+ #include "hdpvr.h"
+@@ -22,7 +24,7 @@
  #define REQTYPE_I2C_WRITE_STATT	0xd0
  
  static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
@@ -32,7 +65,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -41,7 +74,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  }
  
  static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -50,7 +83,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -59,15 +92,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret < 0)
  		goto error;
- 
- 	ret = usb_control_msg(dev->udev,
- 			      usb_rcvctrlpipe(dev->udev, 0),
--			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-+			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
- 			      0, 0, buf, 2, 1000);
- 
- 	if (ret == 2)
-@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)
  			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -80,7 +105,7 @@ index c4b5d15..1c01b6c 100644
  	}
  
  	mutex_unlock(&dev->i2c_mutex);
-@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,15 +116,39 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
@@ -107,7 +132,11 @@ index c4b5d15..1c01b6c 100644
  int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  {
  	struct i2c_adapter *i2c_adap;
-@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
++	struct i2c_board_info info;
+ 	int retval = -ENOMEM;
++	const unsigned short addr_list[] = { 0x54, I2C_CLIENT_END };
+ 
+ 	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
  	if (i2c_adap == NULL)
  		goto error;
  
@@ -116,3 +145,24 @@ index c4b5d15..1c01b6c 100644
  	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
  		sizeof(i2c_adap->name));
  	i2c_adap->algo  = &hdpvr_algo;
+@@ -135,11 +161,18 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ 
+ 	retval = i2c_add_adapter(i2c_adap);
+ 
+-	if (!retval)
++	if (!retval) {
+ 		dev->i2c_adapter = i2c_adap;
+-	else
++		memset(&info, 0, sizeof(struct i2c_board_info));
++		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
++		i2c_new_probed_device(&dev->i2c_adapter, &info, addr_list);
++
++	} else {
+ 		kfree(i2c_adap);
++	}
+ 
+ error:
+ 	return retval;
+ }
++
++#endif /* CONFIG_I2C */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.60
retrieving revision 1.1294.2.61
diff -u -p -r1.1294.2.60 -r1.1294.2.61
--- kernel.spec	26 Aug 2009 20:16:16 -0000	1.1294.2.60
+++ kernel.spec	3 Sep 2009 20:02:36 -0000	1.1294.2.61
@@ -60,9 +60,9 @@ 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 7
+%define rcrev 8
 # The git snapshot level
-%define gitrev 4
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -433,7 +433,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -449,6 +449,8 @@ Provides: kernel-drm-nouveau = 15\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
+Requires(post): /sbin/new-kernel-pkg\
+Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
 Conflicts: %{package_conflicts}\
 %{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\
@@ -673,14 +675,19 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1515: linux-2.6.31-lirc.patch
-Patch1516: lirc_streamzap-buffer-rework.patch
+Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
 
+# virt + ksm patches
 Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
+Patch1553: linux-2.6-ksm-fix-munlock.patch
+Patch1575: linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+Patch1578: linux-2.6-xen-stack-protector-fix.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next.patch
@@ -689,10 +696,12 @@ Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-26
+# intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
+Patch1827: drm-rv710-ucode-fix.patch
+Patch1828: drm-god-shut-up-about-edid-already.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -713,6 +722,7 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
+Patch2904: v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # fs fixes
 
@@ -726,11 +736,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
-# fix xen boot
-Patch12020: xen-fb-probe-fix.patch
-
-Patch90000: allow-disabling-ima.diff
-
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
 Patch19999: xen.pvops.post.patch
@@ -772,6 +777,7 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
+Buildarch: noarch
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -1295,19 +1301,24 @@ ApplyPatch linux-2.6-crash-driver.patch
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.31-lirc.patch
-# should be a short-lived patch, hopefully fixing bz#508952 w/o breaking anything else...
-ApplyPatch lirc_streamzap-buffer-rework.patch
+ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
 # tell usbhid to ignore all imon devices (sent upstream 2009.07.31)
 ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Add kernel KSM support
-#ApplyPatch linux-2.6-ksm.patch
-#ApplyPatch linux-2.6-ksm-updates.patch
+ApplyPatch linux-2.6-ksm.patch
+ApplyPatch linux-2.6-ksm-updates.patch
+ApplyPatch linux-2.6-ksm-fix-munlock.patch
 # Optimize KVM for KSM support
-#ApplyPatch linux-2.6-ksm-kvm.patch
+ApplyPatch linux-2.6-ksm-kvm.patch
+
+# Assorted Virt Fixes
+ApplyPatch linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+#ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1317,6 +1328,8 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
+ApplyPatch drm-rv710-ucode-fix.patch
+ApplyPatch drm-god-shut-up-about-edid-already.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1324,7 +1337,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-ApplyPatch drm-intel-next.patch
+ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -1343,14 +1356,10 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-update.patch
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # Patches headed upstream
 
-# fix xen boot
-ApplyPatch xen-fb-probe-fix.patch
-
-ApplyPatch allow-disabling-ima.diff
-
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
 ApplyPatch xen.pvops.post.patch
@@ -2020,6 +2029,75 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 03 2009 Michael Young <m.a.young at durham.ac.uk>
+- Update pvops patch to try stack protector on i686 again
+
+* Thu Sep 03 2009 Justin M.Forbes <jforbes at redhat.com>
+- Fix xen guest with stack protector. (#508120)
+- Small kvm fixes.
+
+* Wed Sep 02 2009 Adam Jackson <ajax at redhat.com> 2.6.31-0.199.rc8.git2
+- drm-intel-pm.patch: Disable by default, too flickery on too many machines.
+  Enable with i915.powersave=1.
+
+* Wed Sep 02 2009 Dave Jones <davej at redhat.com>
+- Add missing scriptlet dependancy. (#520788)
+
+* Tue Sep 01 2009 Adam Jackson <ajax at redhat.com>
+- Make DRM less chatty about EDID failures.  No one cares.
+
+* Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8-git2
+- Blank out drm-intel-next: entire contents are now upstream.
+
+* Tue Sep 01 2009 Dave Jones <davej at redhat.com>
+- Make firmware buildarch noarch. (Suggested by drago01 on irc)
+
+* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com>
+- Fix up lirc_zilog to enable functional IR transmit and receive
+  on the Hauppauge HD PVR
+- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
+
+* Sun Aug 30 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8-git1
+- Drop linux-2.6-inotify-accounting.patch, merged upstream.
+
+* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com>
+- fix lirc_imon oops on older devices w/o tx ctrl ep (#520008)
+
+* Fri Aug 28 2009 Eric Paris <eparis at redhat.com> 2.6.31-0.190.rc8
+- fix inotify length accounting and send inotify events
+
+* Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Enable Solos DSL driver
+
+* Fri Aug 28 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8
+
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.185.rc7.git6
+- 2.6.31-rc7-git6
+- Drop patch merged upstream:
+  xen-fb-probe-fix.patch
+
+* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
+- drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
+  you know, success. (#519718)
+
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git5
+- Drop patch linux-2.6-ima-leak.patch, now merged upstream.
+
+* Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
+- Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)
+
+* Wed Aug 26 2009 Eric Paris <eparis at redhat.com>
+- fix iint_cache leak in IMA code
+  drop the ima=0 patch
+
+* Wed Aug 26 2009 Justin M. Forbes <jforbes at redhat.com>
+- Fix munlock with KSM (#516909)
+- Re-enable KSM
+
 * Wed Aug 26 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops again.
 

linux-2.6-ksm-kvm.patch:
 arch/x86/include/asm/kvm_host.h |    1 
 arch/x86/kvm/mmu.c              |   91 ++++++++++++++++++++++++++++++++--------
 arch/x86/kvm/paging_tmpl.h      |   15 +++++-
 virt/kvm/kvm_main.c             |   14 ++++++
 4 files changed, 101 insertions(+), 20 deletions(-)

Index: linux-2.6-ksm-kvm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ksm-kvm.patch,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -p -r1.2.6.2 -r1.2.6.3
--- linux-2.6-ksm-kvm.patch	5 Aug 2009 23:00:16 -0000	1.2.6.2
+++ linux-2.6-ksm-kvm.patch	3 Sep 2009 20:02:37 -0000	1.2.6.3
@@ -22,8 +22,8 @@ directly map pages into its shadow page 
 Signed-off-by: Izik Eidus <ieidus at redhat.com>
 Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
 ---
---- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-07-23 14:58:56.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/include/asm/kvm_host.h	2009-07-23 15:00:04.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-08-20 10:37:37.784886414 -0500
++++ linux-2.6.30.x86_64.kvm/arch/x86/include/asm/kvm_host.h	2009-08-20 10:39:33.742641558 -0500
 @@ -796,5 +796,6 @@ asmlinkage void kvm_handle_fault_on_rebo
  int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
  int kvm_age_hva(struct kvm *kvm, unsigned long hva);
@@ -31,8 +31,8 @@ Signed-off-by: Justin M. Forbes <jforbes
 +void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
  
  #endif /* _ASM_X86_KVM_HOST_H */
---- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-07-23 14:58:56.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/mmu.c	2009-07-23 15:00:04.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-08-20 10:37:37.964887039 -0500
++++ linux-2.6.30.x86_64.kvm/arch/x86/kvm/mmu.c	2009-08-20 10:41:15.231638028 -0500
 @@ -139,6 +139,8 @@ module_param(oos_shadow, bool, 0644);
  #define ACC_USER_MASK    PT_USER_MASK
  #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
@@ -54,7 +54,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  static gfn_t pse36_gfn_delta(u32 gpte)
  {
  	int shift = 32 - PT32_DIR_PSE36_SHIFT - PAGE_SHIFT;
-@@ -566,9 +573,7 @@ static void rmap_remove(struct kvm *kvm,
+@@ -573,9 +580,7 @@ static void rmap_remove(struct kvm *kvm,
  	if (*spte & shadow_accessed_mask)
  		kvm_set_pfn_accessed(pfn);
  	if (is_writeble_pte(*spte))
@@ -65,7 +65,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  	rmapp = gfn_to_rmap(kvm, sp->gfns[spte - sp->spt], is_large_pte(*spte));
  	if (!*rmapp) {
  		printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte);
-@@ -677,7 +682,8 @@ static int rmap_write_protect(struct kvm
+@@ -684,7 +689,8 @@ static int rmap_write_protect(struct kvm
  	return write_protected;
  }
  
@@ -75,7 +75,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	u64 *spte;
  	int need_tlb_flush = 0;
-@@ -692,8 +698,48 @@ static int kvm_unmap_rmapp(struct kvm *k
+@@ -699,8 +705,48 @@ static int kvm_unmap_rmapp(struct kvm *k
  	return need_tlb_flush;
  }
  
@@ -125,7 +125,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	int i;
  	int retval = 0;
-@@ -714,11 +760,13 @@ static int kvm_handle_hva(struct kvm *kv
+@@ -721,11 +767,13 @@ static int kvm_handle_hva(struct kvm *kv
  		end = start + (memslot->npages << PAGE_SHIFT);
  		if (hva >= start && hva < end) {
  			gfn_t gfn_offset = (hva - start) >> PAGE_SHIFT;
@@ -141,7 +141,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  		}
  	}
  
-@@ -727,10 +775,16 @@ static int kvm_handle_hva(struct kvm *kv
+@@ -734,10 +782,16 @@ static int kvm_handle_hva(struct kvm *kv
  
  int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
  {
@@ -160,7 +160,14 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	u64 *spte;
  	int young = 0;
-@@ -756,7 +810,7 @@ static int kvm_age_rmapp(struct kvm *kvm
+@@ -770,13 +824,13 @@ static void rmap_recycle(struct kvm_vcpu
+ 	gfn = unalias_gfn(vcpu->kvm, gfn);
+ 	rmapp = gfn_to_rmap(vcpu->kvm, gfn, lpage);
+ 
+-	kvm_unmap_rmapp(vcpu->kvm, rmapp);
++	kvm_unmap_rmapp(vcpu->kvm, rmapp, 0);
+ 	kvm_flush_remote_tlbs(vcpu->kvm);
+ }
  
  int kvm_age_hva(struct kvm *kvm, unsigned long hva)
  {
@@ -169,7 +176,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  }
  
  #ifdef MMU_DEBUG
-@@ -1665,7 +1719,7 @@ static int set_spte(struct kvm_vcpu *vcp
+@@ -1686,7 +1740,7 @@ static int set_spte(struct kvm_vcpu *vcp
  		    unsigned pte_access, int user_fault,
  		    int write_fault, int dirty, int largepage,
  		    gfn_t gfn, pfn_t pfn, bool speculative,
@@ -178,7 +185,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	u64 spte;
  	int ret = 0;
-@@ -1723,6 +1777,8 @@ static int set_spte(struct kvm_vcpu *vcp
+@@ -1744,6 +1798,8 @@ static int set_spte(struct kvm_vcpu *vcp
  				spte &= ~PT_WRITABLE_MASK;
  		}
  	}
@@ -187,7 +194,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  
  	if (pte_access & ACC_WRITE_MASK)
  		mark_page_dirty(vcpu->kvm, gfn);
-@@ -1736,7 +1792,8 @@ static void mmu_set_spte(struct kvm_vcpu
+@@ -1757,7 +1813,8 @@ static void mmu_set_spte(struct kvm_vcpu
  			 unsigned pt_access, unsigned pte_access,
  			 int user_fault, int write_fault, int dirty,
  			 int *ptwrite, int largepage, gfn_t gfn,
@@ -197,7 +204,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	int was_rmapped = 0;
  	int was_writeble = is_writeble_pte(*shadow_pte);
-@@ -1765,7 +1822,8 @@ static void mmu_set_spte(struct kvm_vcpu
+@@ -1787,7 +1844,8 @@ static void mmu_set_spte(struct kvm_vcpu
  			was_rmapped = 1;
  	}
  	if (set_spte(vcpu, shadow_pte, pte_access, user_fault, write_fault,
@@ -207,17 +214,17 @@ Signed-off-by: Justin M. Forbes <jforbes
  		if (write_fault)
  			*ptwrite = 1;
  		kvm_x86_ops->tlb_flush(vcpu);
-@@ -1782,8 +1840,7 @@ static void mmu_set_spte(struct kvm_vcpu
+@@ -1804,8 +1862,7 @@ static void mmu_set_spte(struct kvm_vcpu
  	page_header_update_slot(vcpu->kvm, shadow_pte, gfn);
  	if (!was_rmapped) {
- 		rmap_add(vcpu, shadow_pte, gfn, largepage);
+ 		rmap_count = rmap_add(vcpu, shadow_pte, gfn, largepage);
 -		if (!is_rmap_pte(*shadow_pte))
 -			kvm_release_pfn_clean(pfn);
 +		kvm_release_pfn_clean(pfn);
+ 		if (rmap_count > RMAP_RECYCLE_THRESHOLD)
+ 			rmap_recycle(vcpu, gfn, largepage);
  	} else {
- 		if (was_writeble)
- 			kvm_release_pfn_dirty(pfn);
-@@ -1813,7 +1870,7 @@ static int __direct_map(struct kvm_vcpu 
+@@ -1837,7 +1894,7 @@ static int __direct_map(struct kvm_vcpu 
  		    || (largepage && iterator.level == PT_DIRECTORY_LEVEL)) {
  			mmu_set_spte(vcpu, iterator.sptep, ACC_ALL, ACC_ALL,
  				     0, write, 1, &pt_write,
@@ -226,8 +233,8 @@ Signed-off-by: Justin M. Forbes <jforbes
  			++vcpu->stat.pf_fixed;
  			break;
  		}
---- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-07-23 14:58:56.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/paging_tmpl.h	2009-07-23 15:01:49.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-08-20 10:37:37.966889166 -0500
++++ linux-2.6.30.x86_64.kvm/arch/x86/kvm/paging_tmpl.h	2009-08-20 10:39:33.747636180 -0500
 @@ -266,9 +266,13 @@ static void FNAME(update_pte)(struct kvm
  	if (mmu_notifier_retry(vcpu, vcpu->arch.update_pte.mmu_seq))
  		return;
@@ -275,8 +282,8 @@ Signed-off-by: Justin M. Forbes <jforbes
  	}
  
  	return !nr_present;
---- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-07-23 14:58:58.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/virt/kvm/kvm_main.c	2009-07-23 15:00:04.000000000 -0500
+--- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-08-20 10:37:45.448886340 -0500
++++ linux-2.6.30.x86_64.kvm/virt/kvm/kvm_main.c	2009-08-20 10:39:33.749636212 -0500
 @@ -859,6 +859,19 @@ static void kvm_mmu_notifier_invalidate_
  
  }

linux-2.6-ksm.patch:
 b/arch/alpha/include/asm/mman.h     |    3 
 b/arch/mips/include/asm/mman.h      |    3 
 b/arch/parisc/include/asm/mman.h    |    3 
 b/arch/xtensa/include/asm/mman.h    |    3 
 b/fs/proc/page.c                    |    5 
 b/include/asm-generic/mman-common.h |    5 
 b/include/linux/ksm.h               |   50 +
 b/include/linux/mm.h                |    1 
 b/include/linux/mmu_notifier.h      |   34 
 b/include/linux/rmap.h              |    6 
 b/include/linux/sched.h             |    7 
 b/kernel/fork.c                     |    8 
 b/mm/Kconfig                        |   11 
 b/mm/Makefile                       |    1 
 b/mm/ksm.c                          |   56 +
 b/mm/madvise.c                      |   41 
 b/mm/memory.c                       |    9 
 b/mm/mmu_notifier.c                 |   22 
 b/mm/mremap.c                       |   14 
 b/mm/rmap.c                         |   23 
 include/linux/ksm.h                 |   29 
 mm/ksm.c                            | 1506 +++++++++++++++++++++++++++++++++++-
 mm/madvise.c                        |   16 
 mm/memory.c                         |    7 
 24 files changed, 1780 insertions(+), 83 deletions(-)

Index: linux-2.6-ksm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ksm.patch,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -p -r1.2.6.2 -r1.2.6.3
--- linux-2.6-ksm.patch	5 Aug 2009 23:00:16 -0000	1.2.6.2
+++ linux-2.6-ksm.patch	3 Sep 2009 20:02:37 -0000	1.2.6.3
@@ -541,14 +541,14 @@ index bd29592..ac312a4 100644
  		struct file *file;
 @@ -425,7 +429,8 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
  	atomic_set(&mm->mm_count, 1);
- 	init_rwsem(&mm->mmap_sem);
+	init_rwsem(&mm->mmap_sem);
  	INIT_LIST_HEAD(&mm->mmlist);
 -	mm->flags = (current->mm) ? current->mm->flags : default_dump_filter;
 +	mm->flags = (current->mm) ?
 +		(current->mm->flags & MMF_INIT_MASK) : default_dump_filter;
- 	mm->oom_adj = (current->mm) ? current->mm->oom_adj : 0;
  	mm->core_state = NULL;
  	mm->nr_ptes = 0;
+	set_mm_counter(mm, file_rss, 0);
 @@ -486,6 +491,7 @@ void mmput(struct mm_struct *mm)
  
  	if (atomic_dec_and_test(&mm->mm_users)) {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.29
retrieving revision 1.976.2.30
diff -u -p -r1.976.2.29 -r1.976.2.30
--- sources	26 Aug 2009 19:58:49 -0000	1.976.2.29
+++ sources	3 Sep 2009 20:02:38 -0000	1.976.2.30
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-8329c25267787e591972e477b113c08b  patch-2.6.31-rc7-git4.bz2
+d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2
+81cac9f7aa9cfa526ce4cfedb4e0f739  patch-2.6.31-rc8-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.28
retrieving revision 1.888.2.29
diff -u -p -r1.888.2.28 -r1.888.2.29
--- upstream	26 Aug 2009 19:58:49 -0000	1.888.2.28
+++ upstream	3 Sep 2009 20:02:38 -0000	1.888.2.29
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git4.bz2
+patch-2.6.31-rc8.bz2
+patch-2.6.31-rc8-git2.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   46 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    4 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  204 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |  112 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++-
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  413 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 ++++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +------
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 ++++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 138 files changed, 11555 insertions(+), 1333 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -p -r1.1.2.37 -r1.1.2.38
--- xen.pvops.patch	26 Aug 2009 19:58:49 -0000	1.1.2.37
+++ xen.pvops.patch	3 Sep 2009 20:02:38 -0000	1.1.2.38
@@ -13,6 +13,19 @@ index 13ffa5d..ae6617b 100644
  config PCI_DOMAINS
  	def_bool y
  	depends on PCI
+diff --git a/arch/x86/Makefile b/arch/x86/Makefile
+index 1b68659..5e7db44 100644
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -72,7 +72,7 @@ endif
+ 
+ ifdef CONFIG_CC_STACKPROTECTOR
+ 	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
+-        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)
++        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(biarch)),y)
+                 stackp-y := -fstack-protector
+                 stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
+                 KBUILD_CFLAGS += $(stackp-y)
 diff --git a/arch/x86/include/asm/agp.h b/arch/x86/include/asm/agp.h
 index 9825cd6..d972b14 100644
 --- a/arch/x86/include/asm/agp.h
@@ -3189,6 +3202,21 @@ index 5204332..22a5a6d 100644
  }
  EXPORT_SYMBOL_GPL(math_state_restore);
  
+diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
+index eefdeee..72bb3a2 100644
+--- a/arch/x86/mm/Makefile
++++ b/arch/x86/mm/Makefile
+@@ -1,6 +1,10 @@
+ obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
+ 	    pat.o pgtable.o gup.o
+ 
++# Make sure __phys_addr has no stackprotector
++nostackp := $(call cc-option, -fno-stack-protector)
++CFLAGS_ioremap.o		:= $(nostackp)
++
+ obj-$(CONFIG_SMP)		+= tlb.o
+ 
+ obj-$(CONFIG_X86_32)		+= pgtable_32.o iomap_32.o
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
 index 3cd7711..f16903d 100644
 --- a/arch/x86/mm/init_32.c
@@ -3568,10 +3596,18 @@ index b83e119..951c924 100644
 +       depends on XEN_DOM0 && MICROCODE
 \ No newline at end of file
 diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
-index 7410640..8c2c266 100644
+index 7410640..4a9ee23 100644
 --- a/arch/x86/xen/Makefile
 +++ b/arch/x86/xen/Makefile
-@@ -16,3 +16,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
+@@ -8,6 +8,7 @@ endif
+ # Make sure early boot has no stackprotector
+ nostackp := $(call cc-option, -fno-stack-protector)
+ CFLAGS_enlighten.o		:= $(nostackp)
++CFLAGS_mmu.o			:= $(nostackp)
+ 
+ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
+ 			time.o xen-asm.o xen-asm_$(BITS).o \
+@@ -16,3 +17,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
  obj-$(CONFIG_SMP)		+= smp.o
  obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
  obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
@@ -3579,7 +3615,6 @@ index 7410640..8c2c266 100644
 +obj-$(CONFIG_XEN_DOM0)		+= apic.o
 +obj-$(CONFIG_XEN_DOM0_PCI)	+= pci.o
 +obj-$(CONFIG_PCI_XEN)		+= pci-swiotlb.o
-\ No newline at end of file
 diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
 new file mode 100644
 index 0000000..ee0db39
@@ -3644,10 +3679,18 @@ index 0000000..ee0db39
 +#endif
 +}
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index e90540a..1edf6a8 100644
+index eb33aaa..97a2764 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -64,6 +64,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
+@@ -51,6 +51,7 @@
+ #include <asm/pgtable.h>
+ #include <asm/tlbflush.h>
+ #include <asm/reboot.h>
++#include <asm/stackprotector.h>
+ 
+ #include "xen-ops.h"
+ #include "mmu.h"
+@@ -64,6 +65,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
  enum xen_domain_type xen_domain_type = XEN_NATIVE;
  EXPORT_SYMBOL_GPL(xen_domain_type);
  
@@ -3659,7 +3702,7 @@ index e90540a..1edf6a8 100644
  struct start_info *xen_start_info;
  EXPORT_SYMBOL_GPL(xen_start_info);
  
-@@ -166,13 +171,16 @@ static void __init xen_banner(void)
+@@ -166,13 +172,16 @@ static void __init xen_banner(void)
  
  	printk(KERN_INFO "Booting paravirtualized kernel on %s\n",
  	       pv_info.name);
@@ -3678,7 +3721,7 @@ index e90540a..1edf6a8 100644
  
  static void xen_cpuid(unsigned int *ax, unsigned int *bx,
  		      unsigned int *cx, unsigned int *dx)
-@@ -184,9 +192,15 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
+@@ -184,9 +193,15 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
  	 * Mask out inconvenient features, to try and disable as many
  	 * unsupported kernel subsystems as possible.
  	 */
@@ -3695,7 +3738,7 @@ index e90540a..1edf6a8 100644
  	}
  
  	asm(XEN_EMULATE_PREFIX "cpuid"
-@@ -205,16 +219,20 @@ static __init void xen_init_cpuid_mask(void)
+@@ -205,13 +220,16 @@ static __init void xen_init_cpuid_mask(void)
  	unsigned int ax, bx, cx, dx;
  
  	cpuid_leaf1_edx_mask =
@@ -3716,11 +3759,114 @@ index e90540a..1edf6a8 100644
  			  (1 << X86_FEATURE_ACPI));  /* disable ACPI */
  
  	ax = 1;
-+	cx = 0;
- 	xen_cpuid(&ax, &bx, &cx, &dx);
+@@ -330,18 +348,28 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
+ 	unsigned long frames[pages];
+ 	int f;
+ 
+-	/* A GDT can be up to 64k in size, which corresponds to 8192
+-	   8-byte entries, or 16 4k pages.. */
++	/* 
++	 * A GDT can be up to 64k in size, which corresponds to 8192
++	 * 8-byte entries, or 16 4k pages..
++	 */
+ 
+ 	BUG_ON(size > 65536);
+ 	BUG_ON(va & ~PAGE_MASK);
+ 
+ 	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
+ 		int level;
+-		pte_t *ptep = lookup_address(va, &level);
++		pte_t *ptep;
+ 		unsigned long pfn, mfn;
+ 		void *virt;
+ 
++		/*
++		 * The GDT is per-cpu and is in the percpu data area.
++		 * That can be virtually mapped, so we need to do a
++		 * page-walk to get the underlying MFN for the
++		 * hypercall.  The page can also be in the kernel's
++		 * linear range, so we need to RO that mapping too.
++		 */
++		ptep = lookup_address(va, &level);
+ 		BUG_ON(ptep == NULL);
+ 
+ 		pfn = pte_pfn(*ptep);
+@@ -358,6 +386,44 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
+ 		BUG();
+ }
+ 
++/* 
++ * load_gdt for early boot, when the gdt is only mapped once
++ */
++static __init void xen_load_gdt_boot(const struct desc_ptr *dtr)
++{
++	unsigned long va = dtr->address;
++	unsigned int size = dtr->size + 1;
++	unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
++	unsigned long frames[pages];
++	int f;
++
++	/* 
++	 * A GDT can be up to 64k in size, which corresponds to 8192
++	 * 8-byte entries, or 16 4k pages..
++	 */
++
++	BUG_ON(size > 65536);
++	BUG_ON(va & ~PAGE_MASK);
++
++	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
++		pte_t pte;
++		unsigned long pfn, mfn;
++
++		pfn = virt_to_pfn(va);
++		mfn = pfn_to_mfn(pfn);
++
++		pte = pfn_pte(pfn, PAGE_KERNEL_RO);
++
++		if (HYPERVISOR_update_va_mapping((unsigned long)va, pte, 0))
++			BUG();
++
++		frames[f] = mfn;
++	}
++
++	if (HYPERVISOR_set_gdt(frames, size / sizeof(struct desc_struct)))
++		BUG();
++}
++
+ static void load_TLS_descriptor(struct thread_struct *t,
+ 				unsigned int cpu, unsigned int i)
+ {
+@@ -581,6 +647,29 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
+ 	preempt_enable();
+ }
  
- 	/* cpuid claims we support xsave; try enabling it to see what happens */
-@@ -597,6 +615,18 @@ static void xen_set_iopl_mask(unsigned mask)
++/* 
++ * Version of write_gdt_entry for use at early boot-time needed to
++ * update an entry as simply as possible.
++ */
++static __init void xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,
++					    const void *desc, int type)
++{
++	switch (type) {
++	case DESC_LDT:
++	case DESC_TSS:
++		/* ignore */
++		break;
++
++	default: {
++		xmaddr_t maddr = virt_to_machine(&dt[entry]);
++
++		if (HYPERVISOR_update_descriptor(maddr.maddr, *(u64 *)desc))
++			dt[entry] = *(struct desc_struct *)desc;
++	}
++
++	}	
++}
++
+ static void xen_load_sp0(struct tss_struct *tss,
+ 			 struct thread_struct *thread)
+ {
+@@ -598,6 +687,18 @@ static void xen_set_iopl_mask(unsigned mask)
  	HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl);
  }
  
@@ -3739,7 +3885,7 @@ index e90540a..1edf6a8 100644
  static void xen_io_delay(void)
  {
  }
-@@ -634,7 +664,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
+@@ -635,7 +736,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
          return 0;
  }
  
@@ -3748,7 +3894,7 @@ index e90540a..1edf6a8 100644
  {
  	apic->read = xen_apic_read;
  	apic->write = xen_apic_write;
-@@ -906,6 +936,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -907,6 +1008,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  	.load_sp0 = xen_load_sp0,
  
  	.set_iopl_mask = xen_set_iopl_mask,
@@ -3756,25 +3902,96 @@ index e90540a..1edf6a8 100644
  	.io_delay = xen_io_delay,
  
  	/* Xen takes care of %gs when switching to usermode for us */
-@@ -1000,6 +1031,8 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -965,6 +1067,23 @@ static const struct machine_ops __initdata xen_machine_ops = {
+ 	.emergency_restart = xen_emergency_restart,
+ };
+ 
++/* 
++ * Set up the GDT and segment registers for -fstack-protector.  Until
++ * we do this, we have to be careful not to call any stack-protected
++ * function, which is most of the kernel.
++ */
++static void __init xen_setup_stackprotector(void)
++{
++	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
++	pv_cpu_ops.load_gdt = xen_load_gdt_boot;
++
++	setup_stack_canary_segment(0);
++	switch_to_new_gdt(0);
++
++	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;       
++	pv_cpu_ops.load_gdt = xen_load_gdt;
++}
++
+ /* First C function to be called on Xen boot */
+ asmlinkage void __init xen_start_kernel(void)
+ {
+@@ -983,13 +1102,28 @@ asmlinkage void __init xen_start_kernel(void)
+ 	pv_apic_ops = xen_apic_ops;
+ 	pv_mmu_ops = xen_mmu_ops;
+ 
+-#ifdef CONFIG_X86_64
+-	/*
+-	 * Setup percpu state.  We only need to do this for 64-bit
+-	 * because 32-bit already has %fs set properly.
++	/* 
++	 * Set up some pagetable state before starting to set any ptes.
+ 	 */
+-	load_percpu_segment(0);
+-#endif
++
++	/* Prevent unwanted bits from being set in PTEs. */
++	__supported_pte_mask &= ~_PAGE_GLOBAL;
++	if (!xen_initial_domain())
++		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
++
++	__supported_pte_mask |= _PAGE_IOMAP;
++
++	xen_setup_features();
++
++	/* Get mfn list */
++	if (!xen_feature(XENFEAT_auto_translated_physmap))
++		xen_build_dynamic_phys_to_machine();
++
++	/* 
++	 * Set up kernel GDT and segment registers, mainly so that
++	 * -fstack-protector code can be executed.
++	 */
++	xen_setup_stackprotector();
+ 
+ 	xen_init_irq_ops();
+ 	xen_init_cpuid_mask();
+@@ -1001,7 +1135,11 @@ asmlinkage void __init xen_start_kernel(void)
  	set_xen_basic_apic_ops();
  #endif
  
++<<<<<<< HEAD:arch/x86/xen/enlighten.c
 +	xen_setup_machphys_mapping();
-+
++=======
  	xen_setup_features();
++>>>>>>> v2.6.31-rc8-git2:arch/x86/xen/enlighten.c
  
  	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
-@@ -1029,6 +1062,8 @@ asmlinkage void __init xen_start_kernel(void)
- 	if (!xen_initial_domain())
- 		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
+ 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
+@@ -1019,16 +1157,9 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	xen_smp_init();
  
+-	/* Get mfn list */
+-	if (!xen_feature(XENFEAT_auto_translated_physmap))
+-		xen_build_dynamic_phys_to_machine();
+-
+ 	pgd = (pgd_t *)xen_start_info->pt_base;
+ 
+-	/* Prevent unwanted bits from being set in PTEs. */
+-	__supported_pte_mask &= ~_PAGE_GLOBAL;
+-	if (!xen_initial_domain())
+-		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 +	__supported_pte_mask |= _PAGE_IOMAP;
-+
+ 
  #ifdef CONFIG_X86_64
  	/* Work out if we support NX */
- 	check_efer();
-@@ -1043,6 +1078,7 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1044,6 +1175,7 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_raw_console_write("mapping kernel into physical memory\n");
  	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
@@ -3782,7 +3999,7 @@ index e90540a..1edf6a8 100644
  
  	init_mm.pgd = pgd;
  
-@@ -1052,13 +1088,26 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1053,9 +1185,21 @@ asmlinkage void __init xen_start_kernel(void)
  	if (xen_feature(XENFEAT_supervisor_mode_kernel))
  		pv_info.kernel_rpl = 0;
  
@@ -3804,12 +4021,7 @@ index e90540a..1edf6a8 100644
  #ifdef CONFIG_X86_32
  	/* set up basic CPUID stuff */
  	cpu_detect(&new_cpu_data);
- 	new_cpu_data.hard_math = 1;
-+	new_cpu_data.wp_works_ok = 1;
- 	new_cpu_data.x86_capability[0] = cpuid_edx(1);
- #endif
- 
-@@ -1073,6 +1122,16 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1075,6 +1219,16 @@ asmlinkage void __init xen_start_kernel(void)
  		add_preferred_console("xenboot", 0, NULL);
  		add_preferred_console("tty", 0, NULL);
  		add_preferred_console("hvc", 0, NULL);
@@ -4696,10 +4908,18 @@ index ad0047f..2439456 100644
  	fiddle_vdso();
  }
 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index 429834e..4706af7 100644
+index 429834e..58078da 100644
 --- a/arch/x86/xen/smp.c
 +++ b/arch/x86/xen/smp.c
-@@ -297,6 +297,8 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
+@@ -236,6 +236,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+ 	ctxt->user_regs.ss = __KERNEL_DS;
+ #ifdef CONFIG_X86_32
+ 	ctxt->user_regs.fs = __KERNEL_PERCPU;
++	ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
+ #else
+ 	ctxt->gs_base_kernel = per_cpu_offset(cpu);
+ #endif
+@@ -297,6 +298,8 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
  	xen_setup_timer(cpu);
  	xen_init_lock_cpu(cpu);
  
@@ -4896,7 +5116,7 @@ index db307a3..c6d845c 100644
  		return_ACPI_STATUS(status);
  	}
 diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
-index 84e0f3c..8882c23 100644
+index 2cc4b30..98010d5 100644
 --- a/drivers/acpi/processor_core.c
 +++ b/drivers/acpi/processor_core.c
 @@ -58,6 +58,7 @@
@@ -4989,7 +5209,7 @@ index 84e0f3c..8882c23 100644
  		if ((!result) && ((pr->id >= 0) && (pr->id < nr_cpu_ids))) {
  			kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index 66393d5..da9797e 100644
+index 66393d5..25680c6 100644
 --- a/drivers/acpi/processor_idle.c
 +++ b/drivers/acpi/processor_idle.c
 @@ -58,6 +58,7 @@
@@ -5015,7 +5235,7 @@ index 66393d5..da9797e 100644
  	if (!pr->flags.power_setup_done)
  		return -ENODEV;
  
-+    if (processor_cntl_xen_pm()) {
++    if (xen_initial_domain()) {
 +		acpi_processor_get_power_info(pr);
 +		processor_cntl_xen_notify(pr,
 +			PROCESSOR_PM_CHANGE, PM_TYPE_IDLE);
@@ -5032,7 +5252,7 @@ index 66393d5..da9797e 100644
 -		acpi_processor_setup_cpuidle(pr);
 -		if (cpuidle_register_device(&pr->power.dev))
 -			return -EIO;
-+		if (processor_cntl_xen_pm())
++		if (xen_initial_domain())
 +			processor_cntl_xen_notify(pr,
 +					PROCESSOR_PM_INIT, PM_TYPE_IDLE);
 +		else {
@@ -5795,10 +6015,10 @@ index cab100a..33976f7 100644
 +	depends on XEN_DOM0 && ACPI_PROCESSOR && CPU_FREQ
 +	default y
 diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
-index ec2a39b..2a69a03 100644
+index ec2a39b..8e7ce48 100644
 --- a/drivers/xen/Makefile
 +++ b/drivers/xen/Makefile
-@@ -1,9 +1,15 @@
+@@ -1,9 +1,18 @@
 -obj-y	+= grant-table.o features.o events.o manage.o
 +obj-y	+= grant-table.o features.o events.o manage.o biomerge.o
  obj-y	+= xenbus/
@@ -5810,6 +6030,9 @@ index ec2a39b..2a69a03 100644
 -obj-$(CONFIG_XENFS)		+= xenfs/
 -obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 \ No newline at end of file
++nostackp := $(call cc-option, -fno-stack-protector)
++CFLAGS_features.o			:= $(nostackp)
++
 +obj-$(CONFIG_PCI)			+= pci.o
 +obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
 +obj-$(CONFIG_XEN_XENCOMM)		+= xencomm.o
@@ -5853,10 +6076,10 @@ index 0000000..e6d3d0e
 +}
 diff --git a/drivers/xen/acpi_processor.c b/drivers/xen/acpi_processor.c
 new file mode 100644
-index 0000000..d2b76e9
+index 0000000..6a4e8e4
 --- /dev/null
 +++ b/drivers/xen/acpi_processor.c
-@@ -0,0 +1,447 @@
+@@ -0,0 +1,451 @@
 +/*
 + *  acpi_processor.c - interface to notify Xen on acpi processor object
 + *                     info parsing
@@ -6289,10 +6512,14 @@ index 0000000..d2b76e9
 +
 +static int __init xen_acpi_processor_extcntl_init(void)
 +{
-+	unsigned int pmbits = (xen_start_info->flags & SIF_PM_MASK) >> 8;
++	unsigned int pmbits;
 +
-+	if (!pmbits)
++	/* Only xen dom0 is allowed to handle ACPI processor info */
++	if (!xen_initial_domain())
 +		return 0;
++
++	pmbits = (xen_start_info->flags & SIF_PM_MASK) >> 8;
++
 +	if (pmbits & XEN_PROCESSOR_PM_CX)
 +		xen_ops.pm_ops[PM_TYPE_IDLE] = xen_cx_notifier;
 +	if (pmbits & XEN_PROCESSOR_PM_PX)
@@ -13843,7 +14070,7 @@ index 0000000..af10804
 +	.release = xsd_release,
 +};
 diff --git a/include/acpi/processor.h b/include/acpi/processor.h
-index baf1e0a..f325963 100644
+index 740ac3a..221d30d 100644
 --- a/include/acpi/processor.h
 +++ b/include/acpi/processor.h
 @@ -295,6 +295,8 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx


--- allow-disabling-ima.diff DELETED ---


--- linux-2.6.31-lirc.patch DELETED ---


--- lirc_streamzap-buffer-rework.patch DELETED ---


--- patch-2.6.31-rc7-git4.bz2.sign DELETED ---


--- patch-2.6.31-rc7.bz2.sign DELETED ---


--- xen-fb-probe-fix.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep  3 20:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 20:16:25 +0000
Subject: [pkgdb] hornsey was added for pbrobinson
Message-ID: <20090903201625.F08A710F86F@bastion2.fedora.phx.redhat.com>

spot has added Package hornsey with summary The moblin media player
spot has approved Package hornsey
spot has added a Fedora devel branch for hornsey with an owner of pbrobinson
spot has approved hornsey in Fedora devel
spot has approved Package hornsey
spot has set commit to Approved for 107427 on hornsey (Fedora devel)
spot has set checkout to Approved for 107427 on hornsey (Fedora devel)
spot has set build to Approved for 107427 on hornsey (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hornsey



From pkgdb at fedoraproject.org  Thu Sep  3 20:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 20:16:26 +0000
Subject: [pkgdb] hornsey summary updated by spot
Message-ID: <20090903201627.052EB10F882@bastion2.fedora.phx.redhat.com>

spot set package hornsey summary to The moblin media player

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hornsey



From spot at fedoraproject.org  Thu Sep  3 20:16:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:16:33 +0000 (UTC)
Subject: rpms/hornsey - New directory
Message-ID: <20090903201633.451B011C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/hornsey
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvscWB916/rpms/hornsey

Log Message:
Directory /cvs/pkgs/rpms/hornsey added to the repository




From spot at fedoraproject.org  Thu Sep  3 20:16:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:16:33 +0000 (UTC)
Subject: rpms/hornsey/devel - New directory
Message-ID: <20090903201633.6C6A411C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/hornsey/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvscWB916/rpms/hornsey/devel

Log Message:
Directory /cvs/pkgs/rpms/hornsey/devel added to the repository




From pkgdb at fedoraproject.org  Thu Sep  3 20:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 20:16:26 +0000
Subject: [pkgdb] hornsey (Fedora, 11) updated by spot
Message-ID: <20090903201627.1DBB210F88C@bastion2.fedora.phx.redhat.com>

spot added a Fedora 11 branch for hornsey
spot has set commit to Approved for 107427 on hornsey (Fedora 11)
spot has set checkout to Approved for 107427 on hornsey (Fedora 11)
spot has set build to Approved for 107427 on hornsey (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hornsey



From spot at fedoraproject.org  Thu Sep  3 20:16:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:16:39 +0000 (UTC)
Subject: rpms/hornsey Makefile,NONE,1.1
Message-ID: <20090903201639.E39E111C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/hornsey
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvscWB916/rpms/hornsey

Added Files:
	Makefile 
Log Message:
Setup of module hornsey


--- NEW FILE Makefile ---
# Top level Makefile for module hornsey
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 spot at fedoraproject.org  Thu Sep  3 20:16:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:16:40 +0000 (UTC)
Subject: rpms/hornsey/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090903201640.25CF411C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/hornsey/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvscWB916/rpms/hornsey/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hornsey


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hornsey
# $Id: Makefile,v 1.1 2009/09/03 20:16:40 spot Exp $
NAME := hornsey
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 pbrobinson at fedoraproject.org  Thu Sep  3 20:16:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 20:16:54 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel .cvsignore, 1.2,
	1.3 moblin-panel-status.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090903201654.C9BC711C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1094

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Log Message:
- New upstream 0.0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Aug 2009 22:42:37 -0000	1.2
+++ .cvsignore	3 Sep 2009 20:16:54 -0000	1.3
@@ -1 +1 @@
-moblin-panel-status-0.0.3.tar.bz2
+moblin-panel-status-0.0.4.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-status.spec	26 Aug 2009 22:42:37 -0000	1.1
+++ moblin-panel-status.spec	3 Sep 2009 20:16:54 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           moblin-panel-status
-Version:        0.0.3
+Version:        0.0.4
 Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
@@ -54,5 +54,8 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
+- New upstream 0.0.4 release
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Aug 2009 22:42:37 -0000	1.2
+++ sources	3 Sep 2009 20:16:54 -0000	1.3
@@ -1 +1 @@
-e8cbc221fabca94ec4a20a3b1ff44c9c  moblin-panel-status-0.0.3.tar.bz2
+3f34ae5595ba0e9d9ea078a1faa85fef  moblin-panel-status-0.0.4.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep  3 20:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 20:18:25 +0000
Subject: [pkgdb] moblin-panel-media was added for pbrobinson
Message-ID: <20090903201825.465EC10F865@bastion2.fedora.phx.redhat.com>

spot has added Package moblin-panel-media with summary Moblin Panel for Media
spot has approved Package moblin-panel-media
spot has added a Fedora devel branch for moblin-panel-media with an owner of pbrobinson
spot has approved moblin-panel-media in Fedora devel
spot has approved Package moblin-panel-media
spot has set commit to Approved for 107427 on moblin-panel-media (Fedora devel)
spot has set checkout to Approved for 107427 on moblin-panel-media (Fedora devel)
spot has set build to Approved for 107427 on moblin-panel-media (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-media



From pkgdb at fedoraproject.org  Thu Sep  3 20:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 20:18:26 +0000
Subject: [pkgdb] moblin-panel-media summary updated by spot
Message-ID: <20090903201826.3B18410F882@bastion2.fedora.phx.redhat.com>

spot set package moblin-panel-media summary to Moblin Panel for Media

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-media



From spot at fedoraproject.org  Thu Sep  3 20:18:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:18:32 +0000 (UTC)
Subject: rpms/moblin-panel-media - New directory
Message-ID: <20090903201832.1501411C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/moblin-panel-media
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsTX1494/rpms/moblin-panel-media

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-media added to the repository




From pkgdb at fedoraproject.org  Thu Sep  3 20:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Sep 2009 20:18:26 +0000
Subject: [pkgdb] moblin-panel-media (Fedora, 11) updated by spot
Message-ID: <20090903201826.4B26D10F88C@bastion2.fedora.phx.redhat.com>

spot added a Fedora 11 branch for moblin-panel-media
spot has set commit to Approved for 107427 on moblin-panel-media (Fedora 11)
spot has set checkout to Approved for 107427 on moblin-panel-media (Fedora 11)
spot has set build to Approved for 107427 on moblin-panel-media (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-media



From spot at fedoraproject.org  Thu Sep  3 20:18:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:18:32 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel - New directory
Message-ID: <20090903201832.4C9CE11C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsTX1494/rpms/moblin-panel-media/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-media/devel added to the repository




From spot at fedoraproject.org  Thu Sep  3 20:18:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:18:38 +0000 (UTC)
Subject: rpms/moblin-panel-media Makefile,NONE,1.1
Message-ID: <20090903201838.C20F511C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/moblin-panel-media
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsTX1494/rpms/moblin-panel-media

Added Files:
	Makefile 
Log Message:
Setup of module moblin-panel-media


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-panel-media
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 spot at fedoraproject.org  Thu Sep  3 20:18:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Sep 2009 20:18:39 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090903201839.0354E11C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsTX1494/rpms/moblin-panel-media/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-panel-media


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-panel-media
# $Id: Makefile,v 1.1 2009/09/03 20:18:38 spot Exp $
NAME := moblin-panel-media
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 pbrobinson at fedoraproject.org  Thu Sep  3 20:21:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 20:21:18 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.8, 1.9 mojito.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20090903202118.C8B5511C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2230

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Aug 2009 16:17:54 -0000	1.8
+++ .cvsignore	3 Sep 2009 20:21:18 -0000	1.9
@@ -1 +1 @@
-mojito-0.20.tar.bz2
+mojito-0.20.1.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mojito.spec	31 Aug 2009 14:01:03 -0000	1.17
+++ mojito.spec	3 Sep 2009 20:21:18 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mojito
-Version:        0.20
-Release:        5%{?dist}
+Version:        0.20.1
+Release:        1%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.20.1-1
+- Update to 0.20.1
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-5
 - Actually commit patch for detection of new NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Aug 2009 16:17:54 -0000	1.8
+++ sources	3 Sep 2009 20:21:18 -0000	1.9
@@ -1 +1 @@
-b5d435e3e665fac50f5e78e1b56770c3  mojito-0.20.tar.bz2
+35ddb7e1f8ef396e24b9c5fef99ced5f  mojito-0.20.1.tar.bz2



From bpepple at fedoraproject.org  Thu Sep  3 20:26:32 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  3 Sep 2009 20:26:32 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.35, 1.36 sources, 1.35,
	1.36 telepathy-glib.spec, 1.44, 1.45
Message-ID: <20090903202632.53E3611C0099@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3339

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.36-1
- Update to 0.7.36.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	18 Aug 2009 22:58:35 -0000	1.35
+++ .cvsignore	3 Sep 2009 20:26:32 -0000	1.36
@@ -1 +1 @@
-telepathy-glib-0.7.35.tar.gz
+telepathy-glib-0.7.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	18 Aug 2009 22:58:35 -0000	1.35
+++ sources	3 Sep 2009 20:26:32 -0000	1.36
@@ -1 +1 @@
-651251a6707698d3c8e0a2c39880cf19  telepathy-glib-0.7.35.tar.gz
+b557e89db1be21b2a3c2935fb04e3b4e  telepathy-glib-0.7.36.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- telepathy-glib.spec	18 Aug 2009 22:58:35 -0000	1.44
+++ telepathy-glib.spec	3 Sep 2009 20:26:32 -0000	1.45
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.35
+Version:        0.7.36
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.36-1
+- Update to 0.7.36.
+
 * Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.35-1
 - Update to 0.7.35.
 



From pbrobinson at fedoraproject.org  Thu Sep  3 20:30:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 20:30:32 +0000 (UTC)
Subject: rpms/hornsey/devel hornsey-bognorregis-0.4.10.patch, NONE,
	1.1 hornsey.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090903203032.B8AFC11C02BB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hornsey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4498/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hornsey-bognorregis-0.4.10.patch hornsey.spec import.log 
Log Message:
- Initial import


hornsey-bognorregis-0.4.10.patch:
 configure.ac  |    2 +-
 src/hornsey.c |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE hornsey-bognorregis-0.4.10.patch ---
>From bf1d9ae02f562ead847ef1d74e75e4980d2e40be Mon Sep 17 00:00:00 2001
From: iain <iain at linux.intel.com>
Date: Mon, 24 Aug 2009 15:26:04 +0000
Subject: Require Bognor 0.4.10

---
diff --git a/configure.ac b/configure.ac
index d69fac8..31e6ce5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ PKG_CHECK_MODULES(DEPS, clutter-1.0 \
                         clutter-imcontext-0.1 \
                         bickley-0.4 \
                         nbtk-1.0 \
-                        bognor-regis-0.4 >= 0.4.9 \
+                        bognor-regis-0.4 >= 0.4.10 \
                         unique-1.0 >= 1.0.6 \
                         libstartup-notification-1.0 >= 0.9 \
                         libnotify \
diff --git a/src/hornsey.c b/src/hornsey.c
index 4b44681..dd99bd9 100644
--- a/src/hornsey.c
+++ b/src/hornsey.c
@@ -1191,9 +1191,7 @@ main (gint argc, gchar **argv)
   state_manager = g_object_new (HRN_TYPE_STATE_MANAGER, NULL);
   dbus_init (state_manager);
 
-  local_queue = g_object_new (BR_TYPE_QUEUE,
-                              "object_path", BR_LOCAL_QUEUE_PATH,
-                              NULL);
+  local_queue = br_queue_new_local ();
 
   nbtk_style_load_from_file (nbtk_style_get_default (),
                              PKGDATADIR "hornsey.css", NULL);
--
cgit v0.8.2


--- NEW FILE hornsey.spec ---
Name:           hornsey
Version:        0.3
Release:        2%{?dist}
Summary:        The moblin media player

Group:          Applications/Multimedia
License:        LGPLv2
URL:            http://www.moblin.org/
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
Patch0:         hornsey-bognorregis-0.4.10.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: bickley-devel
BuildRequires: bognor-regis-devel
BuildRequires: clutter-gtk-devel
BuildRequires: clutter-gst-devel
BuildRequires: clutter-imcontext-devel
BuildRequires: libnotify-devel
BuildRequires: libXtst-devel
BuildRequires: nbtk-devel
BuildRequires: startup-notification-devel
BuildRequires: unique-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
BuildRequires: gettext

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: bickley

%description
Hornsey is a Image, Audio and Video media browser and player for Moblin.

%prep
%setup -q
%patch0 -p1 -b .bognorregis-0.4.10

# Remove execute bit from the source files
chmod -x src/hrn-texture-cache.*

# Don't run configure from autogen.sh
NOCONFIGURE=yes ./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files  -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README AUTHORS
%{_bindir}/hornsey
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/64x64/apps/hornsey.png
%{_datadir}/applications/hornsey.desktop
%{_datadir}/dbus-1/services/org.moblin.Hornsey.service

%changelog
* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
- Updates from package review, add patch for bognor-regis 0.4.10

* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-1
- New upstream 0.3 release. Updates to spec

* Tue Jul 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.2-1
- Initial packaging


--- NEW FILE import.log ---
hornsey-0_3-2_fc11:HEAD:hornsey-0.3-2.fc11.src.rpm:1252009669


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Sep 2009 20:16:39 -0000	1.1
+++ .cvsignore	3 Sep 2009 20:30:32 -0000	1.2
@@ -0,0 +1 @@
+hornsey-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Sep 2009 20:16:40 -0000	1.1
+++ sources	3 Sep 2009 20:30:32 -0000	1.2
@@ -0,0 +1 @@
+1e959a8b2a70f059b502e05fe2c90687  hornsey-0.3.tar.bz2



From pbrobinson at fedoraproject.org  Thu Sep  3 20:32:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 20:32:21 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel import.log, NONE,
	1.1 moblin-panel-media-BR0410.patch, NONE,
	1.1 moblin-panel-media.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090903203221.4041E11C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5105/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-panel-media-BR0410.patch 
	moblin-panel-media.spec 
Log Message:
- Initial import



--- NEW FILE import.log ---
moblin-panel-media-0_0_1-2_fc11:HEAD:moblin-panel-media-0.0.1-2.fc11.src.rpm:1252009891

moblin-panel-media-BR0410.patch:
 ahoghill/ahoghill-grid-view.c |    4 +---
 configure.ac                  |    6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE moblin-panel-media-BR0410.patch ---
>From 59b6f40b0700765ab250459d9a2b567a7c908029 Mon Sep 17 00:00:00 2001
From: iain <iain at linux.intel.com>
Date: Mon, 24 Aug 2009 15:23:01 +0000
Subject: Require bognor 0.4.10 for the new brqueue creation function

---
diff --git a/ahoghill/ahoghill-grid-view.c b/ahoghill/ahoghill-grid-view.c
index 20d59f9..d7f815d 100644
--- a/ahoghill/ahoghill-grid-view.c
+++ b/ahoghill/ahoghill-grid-view.c
@@ -596,9 +596,7 @@ init_bognor (AhoghillGridView *grid)
 {
     AhoghillGridViewPrivate *priv = grid->priv;
 
-    priv->local_queue = g_object_new (BR_TYPE_QUEUE,
-                                      "object-path", BR_LOCAL_QUEUE_PATH,
-                                      NULL);
+    priv->local_queue = br_queue_new_local ();
 }
 
 static gboolean
diff --git a/configure.ac b/configure.ac
index a16dec3..544c17c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,17 +14,14 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
 AM_GLIB_GNU_GETTEXT
 
 AC_PROG_CC
-AC_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
-AC_ISC_POSIX
-AC_HEADER_STDC
 AM_PROG_CC_C_O
 
 CFLAGS="$CFLAGS -Wall"
 
 PKG_CHECK_MODULES(MPL, moblin-panel)
-PKG_CHECK_MODULES(AHOGHILL, nbtk-1.0 bickley-0.4 >= 0.4.2 gdk-pixbuf-2.0 bognor-regis-0.4 >= 0.4.3 gtk+-2.0)
+PKG_CHECK_MODULES(AHOGHILL, nbtk-1.0 bickley-0.4 >= 0.4.2 gdk-pixbuf-2.0 bognor-regis-0.4 >= 0.4.10 gtk+-2.0)
 
 AC_ARG_ENABLE([cache],
               [AC_HELP_STRING([--enable-cache],
--
cgit v0.8.2


--- NEW FILE moblin-panel-media.spec ---
Name:           moblin-panel-media
Version:        0.0.1
Release:        2%{?dist}
Summary:        Moblin Panel for Media

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.moblin.org
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
Patch0:         moblin-panel-media-BR0410.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: bickley-devel
BuildRequires: bognor-regis-devel
BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: dbus

%description
The Moblin mutter panel for managing and playing media.

%prep
%setup -q
%patch0 -p1 -b .BR0410

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_libexecdir}/moblin-panel-media
%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.media.service
%{_datadir}/%{name}

%changelog
* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-2
- Add patch for bognor-regis 0.4.10

* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Sep 2009 20:18:38 -0000	1.1
+++ .cvsignore	3 Sep 2009 20:32:20 -0000	1.2
@@ -0,0 +1 @@
+moblin-panel-media-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Sep 2009 20:18:38 -0000	1.1
+++ sources	3 Sep 2009 20:32:21 -0000	1.2
@@ -0,0 +1 @@
+edf0425f5c43b873d02fdfa7c77494ee  moblin-panel-media-0.0.1.tar.bz2



From pbrobinson at fedoraproject.org  Thu Sep  3 20:36:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Sep 2009 20:36:06 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.104,1.105
Message-ID: <20090903203606.3369811C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5962

Modified Files:
	comps-f12.xml.in 
Log Message:
Moblin media player


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- comps-f12.xml.in	3 Sep 2009 15:55:27 -0000	1.104
+++ comps-f12.xml.in	3 Sep 2009 20:36:05 -0000	1.105
@@ -4260,6 +4260,7 @@
       <packagereq type="mandatory">moblin-gtk-engine</packagereq>
       <packagereq type="mandatory">moblin-icon-theme</packagereq>
       <packagereq type="mandatory">moblin-panel-applications</packagereq>
+      <packagereq type="mandatory">moblin-panel-media</packagereq>
       <packagereq type="mandatory">moblin-panel-myzone</packagereq>
       <packagereq type="mandatory">moblin-panel-pasteboard</packagereq>
       <packagereq type="mandatory">moblin-panel-people</packagereq>
@@ -4269,6 +4270,7 @@
       <packagereq type="mandatory">mutter</packagereq>
       <packagereq type="mandatory">network-manager-netbook</packagereq>
       <packagereq type="default">anjal</packagereq>
+      <packagereq type="default">hornsey</packagereq>
     </packagelist>
   </group>
   <group>



From myoung at fedoraproject.org  Thu Sep  3 20:37:33 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu,  3 Sep 2009 20:37:33 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1294.2.61,
	1.1294.2.62 xen.pvops.patch, 1.1.2.38, 1.1.2.39
Message-ID: <20090903203733.D1FCA11C0099@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6152

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec xen.pvops.patch 
Log Message:
fix a mismerge



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.61
retrieving revision 1.1294.2.62
diff -u -p -r1.1294.2.61 -r1.1294.2.62
--- kernel.spec	3 Sep 2009 20:02:36 -0000	1.1294.2.61
+++ kernel.spec	3 Sep 2009 20:37:22 -0000	1.1294.2.62
@@ -2031,6 +2031,7 @@ fi
 %changelog
 * Thu Sep 03 2009 Michael Young <m.a.young at durham.ac.uk>
 - Update pvops patch to try stack protector on i686 again
+- disable linux-2.6-xen-stack-protector-fix.patch as we already have it
 
 * Thu Sep 03 2009 Justin M.Forbes <jforbes at redhat.com>
 - Fix xen guest with stack protector. (#508120)

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   46 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    4 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  202 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |  112 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++-
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  413 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 ++++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +------
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 ++++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 138 files changed, 11552 insertions(+), 1334 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -p -r1.1.2.38 -r1.1.2.39
--- xen.pvops.patch	3 Sep 2009 20:02:38 -0000	1.1.2.38
+++ xen.pvops.patch	3 Sep 2009 20:37:22 -0000	1.1.2.39
@@ -3961,15 +3961,12 @@ index eb33aaa..97a2764 100644
  
  	xen_init_irq_ops();
  	xen_init_cpuid_mask();
-@@ -1001,7 +1135,11 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1001,7 +1135,7 @@ asmlinkage void __init xen_start_kernel(void)
  	set_xen_basic_apic_ops();
  #endif
  
-+<<<<<<< HEAD:arch/x86/xen/enlighten.c
+-	xen_setup_features();
 +	xen_setup_machphys_mapping();
-+=======
- 	xen_setup_features();
-+>>>>>>> v2.6.31-rc8-git2:arch/x86/xen/enlighten.c
  
  	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
  		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;



From akurtakov at fedoraproject.org  Thu Sep  3 20:51:36 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Sep 2009 20:51:36 +0000 (UTC)
Subject: rpms/aqute-bndlib/devel aqute-service.tar.gz, NONE,
	1.1 bnd-0.0.363.pom, NONE, 1.1 sources, 1.2,
	1.3 aqute-bndlib.spec, 1.5, 1.6 .cvsignore, 1.2,
	1.3 aQute-bndlib-Filter.patch, 1.2, NONE bnd-0.0.203.pom, 1.2, NONE
Message-ID: <20090903205136.6737D11C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10299/devel

Modified Files:
	sources aqute-bndlib.spec .cvsignore 
Added Files:
	aqute-service.tar.gz bnd-0.0.363.pom 
Removed Files:
	aQute-bndlib-Filter.patch bnd-0.0.203.pom 
Log Message:
Update to 0.0.363


--- NEW FILE aqute-service.tar.gz ---
?'#?J
?
??q??b??R?#?+r?v??n??8	?8N:??G?Q'??????rC?ie,??z??]???Z?R??bv?????o???I?&??{????I?~??8j'??CX????
[?
???,?????????$?????-????? ???q!????5$g`?;????????u???1Ws??K!?_?W???d?gG}^??66W?$????M?????nV??????%?B?O?y???}?

--- NEW FILE bnd-0.0.363.pom ---
<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
  <modelVersion>4.0.0</modelVersion>
  <groupId>biz.aQute</groupId>
  <artifactId>bnd</artifactId>
  <version>0.0.363</version>
  <description>
    A utility and plugin to wrap, build, or print bundles
  </description>
  <name>aQute Bundle Tool</name>
  <url>http://www.aQute.biz/Code/Bnd</url>
  <organization>
    <name>aQute SARL</name>
    <url>http://www.aQute.biz</url>
  </organization>
  <licenses>
    <license>
    <name>All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt).</name>
    <url>http://www.opensource.org/licenses/apache2.0.php</url>
    <distribution>repo</distribution>
    </license>
  </licenses>
</project>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Aug 2009 20:00:26 -0000	1.2
+++ sources	3 Sep 2009 20:51:36 -0000	1.3
@@ -1 +1 @@
-517cc8edead3dbd520c6a8e3f82f7321  bnd-0.0.203.jar
+1d36d0271381964304c08b00b5fd1b4a  bnd-0.0.363.jar


Index: aqute-bndlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/aqute-bndlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- aqute-bndlib.spec	20 Aug 2009 14:15:49 -0000	1.5
+++ aqute-bndlib.spec	3 Sep 2009 20:51:36 -0000	1.6
@@ -29,17 +29,16 @@
 #
 
 Name:           aqute-bndlib
-Version:        0.0.203
-Release:        4.3%{?dist}
+Version:        0.0.363
+Release:        1%{?dist}
 Epoch:          0
 Summary:        BND Library
 License:        ASL 2.0
 Group:          Development/Tools
 URL:            http://www.aQute.biz/Code/Bnd
-Source0:        http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.jar
-Source1:        http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.pom
-Patch0:         aQute-bndlib-Filter.patch
-
+Source0:        http://www.aqute.biz/repo/biz/aQute/bnd/%{version}/bnd-%{version}.jar
+Source1:        http://www.aqute.biz/repo/biz/aQute/bnd/%{version}/bnd-%{version}.pom
+Source2:        aqute-service.tar.gz
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -56,16 +55,16 @@ Requires(postun):  jpackage-utils >= 0:1
 
 %description
 The bnd tool helps you create and diagnose OSGi R4 bundles.
-The key functions are: 
-- Show the manifest and JAR contents of a bundle 
-- Wrap a JAR so that it becomes a bundle 
-- Create a Bundle from a specification and a class path 
-- Verify the validity of the manifest entries 
-The tool is capable of acting as: 
-- Command line tool 
-- File format 
-- Directives 
-- Use of macros 
+The key functions are:
+- Show the manifest and JAR contents of a bundle
+- Wrap a JAR so that it becomes a bundle
+- Create a Bundle from a specification and a class path
+- Verify the validity of the manifest entries
+The tool is capable of acting as:
+- Command line tool
+- File format
+- Directives
+- Use of macros
 
 %package javadoc
 Summary:        Javadoc for %{name}
@@ -80,7 +79,11 @@ mkdir -p target/site/apidocs/
 mkdir -p target/classes/
 mkdir -p src/main/
 mv OSGI-OPT/src src/main/java
-%patch0 -b .sav0
+pushd src/main/java
+tar xfs %{SOURCE2}
+popd
+sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ComponentDef.java
+sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ServiceComponent.java
 
 %build
 export LANG=en_US.utf8
@@ -89,17 +92,31 @@ export CLASSPATH=$(build-classpath ant)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi.services_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface.databinding_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface.text_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.ide_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.commands_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.jobs_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.runtime_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.resources_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.debug.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.debug.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.text_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.console_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.editors_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.common_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.swt.*.jar)
 
-%{javac} -d target/classes $(find src/main/java -type f -name "*.java")
+%{javac} -d target/classes -target 1.5 -source 1.5 $(find src/main/java -type f -name "*.java")
 %{javadoc} -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter
 cp -p LICENSE maven-dependencies.txt plugin.xml pom.xml target/classes
 for f in $(find aQute/ -type f -not -name "*.class"); do
@@ -152,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.0.363-1
+- Update to 0.0.363.
+
 * Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:0.0.203-4.3
 - Add LICENSE
 - Clean up Group tag
@@ -182,4 +202,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jan 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:0.0.203-1jpp
 - First release
-


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Aug 2009 20:00:25 -0000	1.2
+++ .cvsignore	3 Sep 2009 20:51:36 -0000	1.3
@@ -1 +1,2 @@
 bnd-0.0.203.jar
+bnd-0.0.363.jar


--- aQute-bndlib-Filter.patch DELETED ---


--- bnd-0.0.203.pom DELETED ---



From akurtakov at fedoraproject.org  Thu Sep  3 20:59:21 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Sep 2009 20:59:21 +0000 (UTC)
Subject: rpms/felix-osgi-core/devel build.xml.tar.gz, NONE,
	1.1 felix-osgi-core.spec, NONE, 1.1 sources, 1.1, 1.2 .cvsignore,
	1.1, 1.2
Message-ID: <20090903205921.7FAF411C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/felix-osgi-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12571/devel

Modified Files:
	sources .cvsignore 
Added Files:
	build.xml.tar.gz felix-osgi-core.spec 
Log Message:
Initial import.


--- NEW FILE build.xml.tar.gz ---
?
(C[?
{??F?????|%??{???=?l?;Ii??h?XGG??????q???=~[]?m{ww??{???9{?.r??????????l?q?;?!{?2???3??|?.H??E???????0??h?uL??H?R??.??/?w?????:???>HC??J?;?4
?&~@??i????Qb??SbRva=A?$?c??=_??^eM?{@?:/cF?7A?????_??K?"?Lp$?.?y?/??s??l?5?0??(?x??%(?W$2???E~?P?L	rS??*????8>?????vkbv-1?????1??|AZ_???8?l*?? mW???R?!????
?hB,???dd??C?_Z???T+?}????/{???%>??1???vr??q?6??????:??IDN???7?XD????Az?G?@oO????=????s????????F????}??={??F???#????N??
,?&q???<??f??2????@Y??6#3?t(?????p}}]??
?0?|d_?}????6??2?'&S??
Z????F??)?N?'b%W??1{??Q?q??.0????	????)s	?2??Y?b????!g????U??4M????
???m??f?V?pKw?&?Z?@a???Z??7(?X?????9???
???Z??8M
P??G:!????%t?7?? ???????u|8:0?N?i?X????N???:zsxr~??0???????]RB????????T?
>??Cl???d4ih?t?@???p?L?F?^I???/??Jy????,?????k???r???w?!?S?>???4:HRH???k???O?m???{F0CM
P?
Xs????C?Hd,%?????k?qs$????????m??'iKt???????
???[P?
??2:q?
?TE??*??ikK????i?e?-6w?fC??*v??D?'?I:?_????????f???^-???}pvrt?~?????\K??_`n?s?????4 ?#t?ztp2??????
?q?4?r?PC?w??	??Y????V??
?????{?7T???????;?1??r??D~?qd'?y?e\??S$~??d%OE(;.?@???w?d??GB??}??Y`??`H?
????kL??????O???a?????????>??<??e???ei??L
.h??`?!???s???V???[yDU?????5[_$???
q?O???????w??#??]??/?????wYg	zje?1?I?J?:??
$?	U???}???(l??Q?k
?u ?Z)g?=??{??????Z?F!?c*q?3?~-?????
???Z?????????7??E??T??~}??[)7^?~???o???w?]d;?^???????J2?RG???V???8K1??n???aP?_?.1????\???!>(?;????[???j??}6??VyHI#??~T&?ir?S?y???????U??OU???g?KY?DR?S??nRR?qFb?C?????$
f8o?M?U,?"?Q/
?]?G"?NQLu 7.?F????<?[????M8?`+o?TKQ??????%?0?Vg????7m?6m?6m?6m?6m?6m?6m?6m??? e5?

--- NEW FILE felix-osgi-core.spec ---
%global bundle org.osgi.core

Name:           felix-osgi-core
Version:        1.2.0
Release:        2%{?dist}
Summary:        Felix OSGi R4 Core Bundle

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://felix.apache.org/site/apache-felix-osgi-core.html
Source0:        http://www.apache.org/dist/felix/org.osgi.core-%{version}-project.tar.gz
Source1:        build.xml.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ant
BuildRequires:  jpackage-utils
Requires:       java
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
BuildArch: noarch

%description
OSGi Service Platform Release 4 Core Interfaces and Classes.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{bundle}-%{version}

tar xf %{SOURCE1}

mkdir -p .m2/repository

%build
ant -Dmaven.settings.offline=true \
    -Dmaven.repo.local=.m2/repository \
    package javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/felix
install -m 644 target/%{bundle}-%{version}.jar \
        %{buildroot}%{_javadir}/felix/%{bundle}-%{version}.jar

(cd %{buildroot}%{_javadir}/felix && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP.felix-%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/felix
%{_datadir}/maven2/poms/JPP.felix-%{name}.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.2.0-2
- Fix line length.

* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.2.0-1
- Initial package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Sep 2009 15:10:10 -0000	1.1
+++ sources	3 Sep 2009 20:59:21 -0000	1.2
@@ -0,0 +1 @@
+074d678ad635cc9ffbac56e9bcde05f4  org.osgi.core-1.2.0-project.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Sep 2009 15:10:10 -0000	1.1
+++ .cvsignore	3 Sep 2009 20:59:21 -0000	1.2
@@ -0,0 +1 @@
+org.osgi.core-1.2.0-project.tar.gz



From jwilson at fedoraproject.org  Thu Sep  3 21:02:14 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu,  3 Sep 2009 21:02:14 +0000 (UTC)
Subject: rpms/kernel/devel hdpvr-ir-enable.patch, 1.3, 1.4 kernel.spec,
	1.1763, 1.1764 lirc-2.6.31.patch, 1.2, 1.3
Message-ID: <20090903210214.A4C5E11C0099@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13560

Modified Files:
	hdpvr-ir-enable.patch kernel.spec lirc-2.6.31.patch 
Log Message:
* Thu Sep 03 2009 Jarod Wilson <jarod at redhat.com>
- Update hdpvr and lirc_zilog drivers for 2.6.31 i2c


hdpvr-ir-enable.patch:
 Makefile     |    4 --
 hdpvr-core.c |   12 ++------
 hdpvr-i2c.c  |   88 +++++++++++++++++++++++++++++++++++++++++------------------
 hdpvr.h      |    2 -
 4 files changed, 68 insertions(+), 38 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hdpvr-ir-enable.patch	26 Aug 2009 21:23:36 -0000	1.3
+++ hdpvr-ir-enable.patch	3 Sep 2009 21:02:14 -0000	1.4
@@ -1,10 +1,11 @@
 From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
 
 ---
- drivers/media/video/hdpvr/Makefile     |    4 +--
- drivers/media/video/hdpvr/hdpvr-core.c |    7 ++--
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   49 ++++++++++++++++++++++++++-----
- 3 files changed, 45 insertions(+), 15 deletions(-)
+ drivers/media/video/hdpvr/Makefile     |    4 +-
+ drivers/media/video/hdpvr/hdpvr-core.c |   12 ++---
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   88 ++++++++++++++++++++++---------
+ drivers/media/video/hdpvr/hdpvr.h      |    2 +-
+ 4 files changed, 68 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
 index e0230fc..79ad2e1 100644
@@ -19,7 +20,7 @@ index e0230fc..79ad2e1 100644
  obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
  
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..9fa3d8d 100644
+index 188bd5a..d2bb4c2 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
 @@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
@@ -34,30 +35,42 @@ index 188bd5a..9fa3d8d 100644
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
-@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+@@ -414,12 +413,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
  	mutex_unlock(&dev->io_mutex);
  
  	/* deregister I2C adapter */
 -#ifdef CONFIG_I2C
 +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
  	mutex_lock(&dev->i2c_mutex);
- 	if (dev->i2c_adapter)
- 		i2c_del_adapter(dev->i2c_adapter);
+-	if (dev->i2c_adapter)
+-		i2c_del_adapter(dev->i2c_adapter);
+-	kfree(dev->i2c_adapter);
+-	dev->i2c_adapter = NULL;
++	i2c_del_adapter(&dev->i2c_adapter);
+ 	mutex_unlock(&dev->i2c_mutex);
+ #endif /* CONFIG_I2C */
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..bc33607 100644
+index c4b5d15..7cd977f 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -10,6 +10,8 @@
+@@ -10,6 +10,7 @@
   *
   */
  
 +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+
  #include <linux/i2c.h>
  
  #include "hdpvr.h"
-@@ -22,7 +24,7 @@
- #define REQTYPE_I2C_WRITE_STATT	0xd0
+@@ -19,10 +20,13 @@
+ 
+ #define REQTYPE_I2C_READ	0xb1
+ #define REQTYPE_I2C_WRITE	0xb0
+-#define REQTYPE_I2C_WRITE_STATT	0xd0
++#define REQTYPE_I2C_WRITE_STAT	0xd0
++
++#define HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR	0x70
++#define HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR	0x71
  
  static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
 -			  char *data, int len)
@@ -65,7 +78,7 @@ index c4b5d15..bc33607 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,7 +36,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -74,7 +87,7 @@ index c4b5d15..bc33607 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +50,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  }
  
  static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -83,7 +96,7 @@ index c4b5d15..bc33607 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,17 +61,17 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -92,7 +105,19 @@ index c4b5d15..bc33607 100644
  
  	if (ret < 0)
  		goto error;
-@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+ 
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_rcvctrlpipe(dev->udev, 0),
+-			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
++			      REQTYPE_I2C_WRITE_STAT, CTRL_READ_REQUEST,
+ 			      0, 0, buf, 2, 1000);
+ 
+-	if (ret == 2)
++	if ((ret == 2) && (buf[1] == (len - 1)))
+ 		ret = 0;
+ 	else if (ret >= 0)
+ 		ret = -EIO;
+@@ -93,10 +97,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)
  			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -105,10 +130,25 @@ index c4b5d15..bc33607 100644
  	}
  
  	mutex_unlock(&dev->i2c_mutex);
-@@ -114,15 +116,39 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,32 +118,64 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
++static struct i2c_adapter hdpvr_i2c_adap_template = {
++	.name		= "Hauppauge HD PVR I2C",
++	.owner		= THIS_MODULE,
++	.id		= I2C_HW_B_HDPVR,
++	.algo		= &hdpvr_algo,
++	.class		= I2C_CLASS_TV_ANALOG,
++};
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
++static struct i2c_board_info hdpvr_i2c_board_info = {
++	I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
++	I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
++};
++#endif
++
 +static int hdpvr_activate_ir(struct hdpvr_device *dev)
 +{
 +	char buffer[8];
@@ -128,41 +168,60 @@ index c4b5d15..bc33607 100644
 +	return 0;
 +}
 +
-+
  int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  {
- 	struct i2c_adapter *i2c_adap;
-+	struct i2c_board_info info;
+-	struct i2c_adapter *i2c_adap;
  	int retval = -ENOMEM;
-+	const unsigned short addr_list[] = { 0x54, I2C_CLIENT_END };
- 
- 	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
- 	if (i2c_adap == NULL)
- 		goto error;
  
+-	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
+-	if (i2c_adap == NULL)
+-		goto error;
 +	hdpvr_activate_ir(dev);
 +
- 	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
- 		sizeof(i2c_adap->name));
- 	i2c_adap->algo  = &hdpvr_algo;
-@@ -135,11 +161,18 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
++	memcpy(&dev->i2c_adapter, &hdpvr_i2c_adap_template,
++	       sizeof(struct i2c_adapter));
  
- 	retval = i2c_add_adapter(i2c_adap);
+-	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
+-		sizeof(i2c_adap->name));
+-	i2c_adap->algo  = &hdpvr_algo;
+-	i2c_adap->class = I2C_CLASS_TV_ANALOG;
+-	i2c_adap->id    = I2C_HW_B_HDPVR;
+-	i2c_adap->owner = THIS_MODULE;
+-	i2c_adap->dev.parent = &dev->udev->dev;
++	dev->i2c_adapter.dev.parent = &dev->udev->dev;
+ 
+-	i2c_set_adapdata(i2c_adap, dev);
++	i2c_set_adapdata(&dev->i2c_adapter, dev);
+ 
+-	retval = i2c_add_adapter(i2c_adap);
++	retval = i2c_add_adapter(&dev->i2c_adapter);
  
 -	if (!retval)
-+	if (!retval) {
- 		dev->i2c_adapter = i2c_adap;
+-		dev->i2c_adapter = i2c_adap;
 -	else
-+		memset(&info, 0, sizeof(struct i2c_board_info));
-+		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-+		i2c_new_probed_device(&dev->i2c_adapter, &info, addr_list);
-+
-+	} else {
- 		kfree(i2c_adap);
-+	}
+-		kfree(i2c_adap);
++	if (retval)
++		goto error;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
++	i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
++#endif
  
  error:
  	return retval;
  }
 +
 +#endif /* CONFIG_I2C */
+diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
+index 1edd875..173aefa 100644
+--- a/drivers/media/video/hdpvr/hdpvr.h
++++ b/drivers/media/video/hdpvr/hdpvr.h
+@@ -101,7 +101,7 @@ struct hdpvr_device {
+ 	struct work_struct	worker;
+ 
+ 	/* I2C adapter */
+-	struct i2c_adapter	*i2c_adapter;
++	struct i2c_adapter	i2c_adapter;
+ 	/* I2C lock */
+ 	struct mutex		i2c_mutex;
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1763
retrieving revision 1.1764
diff -u -p -r1.1763 -r1.1764
--- kernel.spec	3 Sep 2009 14:14:21 -0000	1.1763
+++ kernel.spec	3 Sep 2009 21:02:14 -0000	1.1764
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 03 2009 Jarod Wilson <jarod at redhat.com>
+- Update hdpvr and lirc_zilog drivers for 2.6.31 i2c
+
 * Thu Sep 03 2009 Justin M.Forbes <jforbes at redhat.com>
 - Fix xen guest with stack protector. (#508120)
 - Small kvm fixes.

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15600 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.31.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc-2.6.31.patch	1 Sep 2009 04:44:15 -0000	1.2
+++ lirc-2.6.31.patch	3 Sep 2009 21:02:14 -0000	1.3
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Tuesday, September 01, 2009
+Last updated: Thursday, September 03, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -24,7 +24,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
- drivers/input/lirc/lirc_mceusb.c      | 1244 ++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
  drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
@@ -33,7 +33,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
- 26 files changed, 15602 insertions(+), 0 deletions(-)
+ 26 files changed, 15600 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 8dca9d8..f25dc26 100644
@@ -7658,10 +7658,10 @@ index 0000000..3d53181
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..3dd4cfb
+index 0000000..8b48a56
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1244 @@
+@@ -0,0 +1,1242 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -7675,12 +7675,12 @@ index 0000000..3dd4cfb
 + *
 + * Original lirc_mceusb driver deprecated in favor of this driver, which
 + * supports the 1st-gen device now too. Transmitting on the 1st-gen device
-+ * is as yet untested, but receiving definitely works.
++ * only functions on port #2 at the moment.
 + *
 + * Support for 1st-gen device added June 2009,
 + * by Jarod Wilson <jarod at wilsonet.com>
 + *
-+ * Transmission support for 1st-gen device added August 2009,
++ * Initial transmission support for 1st-gen device added August 2009,
 + * by Patrick Calhoun <phineas at ou.edu>
 + *
 + * Derived from ATI USB driver by Paul Miller and the original
@@ -8791,32 +8791,30 @@ index 0000000..3dd4cfb
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_out, pin_init3, sizeof(pin_init3),
 +				     MCEUSB_OUTBOUND);
-+		/* if we don't issue the correct number of receives
-+		 * (MCEUSB_INBOUND) for each outbound, then the first few ir
-+		 * pulses will be interpreted by the usb_async_callback routine
-+		 * - we should ensure we have the right amount OR less - as the
-+		 * mceusb_dev_recv routine will handle the control packets OK -
-+		 * they start with 0x9f - but the async callback doesn't handle
-+		 * ir pulse packets
-+		 */
-+		request_packet_async(ir, ep_in, NULL, maxp, 0);
-+	} else {
++	} else if (ir->flags.microsoft_gen1) {
 +		/* original ms mce device requires some additional setup */
-+		if (ir->flags.microsoft_gen1)
-+			mceusb_gen1_init(ir);
++		mceusb_gen1_init(ir);
++	} else {
 +
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_out, init1,
 +				     sizeof(init1), MCEUSB_OUTBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
-+		/* This breaks transmit on orig ms mce device */
-+		if (!ir->flags.microsoft_gen1)
-+			request_packet_async(ir, ep_out, init2,
-+					     sizeof(init2), MCEUSB_OUTBOUND);
-+		request_packet_async(ir, ep_in, NULL, maxp, 0);
++		request_packet_async(ir, ep_out, init2,
++				     sizeof(init2), MCEUSB_OUTBOUND);
 +	}
 +
++	/*
++	 * if we don't issue the correct number of receives (MCEUSB_INBOUND)
++	 * for each outbound, then the first few ir pulses will be interpreted
++	 * by the usb_async_callback routine - we should ensure we have the
++	 * right amount OR less - as the mceusb_dev_recv routine will handle
++	 * the control packets OK - they start with 0x9f - but the async
++	 * callback doesn't handle ir pulse packets
++	 */
++	request_packet_async(ir, ep_in, NULL, maxp, 0);
++
 +	usb_set_intfdata(intf, ir);
 +
 +	return 0;
@@ -14406,7 +14404,7 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..f86db02
+index 0000000..c4080f5
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1395 @@
@@ -14476,31 +14474,30 @@ index 0000000..f86db02
 +	struct lirc_driver l;
 +
 +	/* Device info */
-+	struct mutex       lock;
-+	int		   open;
++	struct mutex lock;
++	int open;
 +
 +	/* RX device */
-+	struct i2c_client  c_rx;
++	struct i2c_client c_rx;
++	int have_rx;
 +
 +	/* RX device buffer & lock */
 +	struct lirc_buffer buf;
-+	struct mutex       buf_lock;
++	struct mutex buf_lock;
 +
 +	/* RX polling thread data */
-+	struct completion  *t_notify;
-+	struct completion  *t_notify2;
-+	int		   shutdown;
++	struct completion *t_notify;
++	struct completion *t_notify2;
++	int shutdown;
 +	struct task_struct *task;
 +
 +	/* RX read data */
-+	unsigned char      b[3];
++	unsigned char b[3];
 +
 +	/* TX device */
-+	struct i2c_client  c_tx;
-+	int		   need_boot;
-+
-+	/* # devices, for shutdown */
-+	int		   devs;
++	struct i2c_client c_tx;
++	int need_boot;
++	int have_tx;
 +};
 +
 +/* Minor -> data mapping */
@@ -14531,13 +14528,15 @@ index 0000000..f86db02
 +};
 +
 +static struct tx_data_struct *tx_data;
-+struct mutex tx_data_lock;
++static struct mutex tx_data_lock;
 +
-+#define DEVICE_NAME "lirc_zilog"
 +#define zilog_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, \
 +					## args)
 +#define zilog_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 +
++#define ZILOG_HAUPPAUGE_IR_RX_NAME "Zilog/Hauppauge IR RX"
++#define ZILOG_HAUPPAUGE_IR_TX_NAME "Zilog/Hauppauge IR TX"
++
 +/* module parameters */
 +static int debug;	/* debug output */
 +static int disable_rx;	/* disable RX device */
@@ -14547,7 +14546,7 @@ index 0000000..f86db02
 +#define dprintk(fmt, args...)						\
 +	do {								\
 +		if (debug)						\
-+			printk(KERN_DEBUG DEVICE_NAME ": " fmt,		\
++			printk(KERN_DEBUG KBUILD_MODNAME ": " fmt,	\
 +				 ## args);				\
 +	} while (0)
 +
@@ -14926,8 +14925,8 @@ index 0000000..f86db02
 +		zilog_error("unexpected IR TX response: %02x\n", buf[0]);
 +		return 0;
 +	}
-+	zilog_notify("Zilog/Hauppauge IR blaster: firmware version "
-+		     "%d.%d.%d\n", buf[1], buf[2], buf[3]);
++	zilog_notify("Zilog/Hauppauge IR blaster firmware version "
++		     "%d.%d.%d loaded\n", buf[1], buf[2], buf[3]);
 +
 +	return 0;
 +}
@@ -14962,7 +14961,7 @@ index 0000000..f86db02
 +	int ret;
 +	unsigned int i;
 +	unsigned char *data, version, num_global_fixed;
-+	const struct firmware *fw_entry = NULL;
++	const struct firmware *fw_entry;
 +
 +	/* Already loaded? */
 +	mutex_lock(&tx_data_lock);
@@ -14979,7 +14978,7 @@ index 0000000..f86db02
 +		ret = ret < 0 ? ret : -EFAULT;
 +		goto out;
 +	}
-+	zilog_notify("firmware of size %zu loaded\n", fw_entry->size);
++	dprintk("firmware of size %zu loaded\n", fw_entry->size);
 +
 +	/* Parse the file */
 +	tx_data = vmalloc(sizeof(*tx_data));
@@ -15026,7 +15025,7 @@ index 0000000..f86db02
 +			      &tx_data->num_code_sets))
 +		goto corrupt;
 +
-+	zilog_notify("%u codesets loaded\n", tx_data->num_code_sets);
++	dprintk("%u IR blaster codesets loaded\n", tx_data->num_code_sets);
 +
 +	tx_data->code_sets = vmalloc(
 +		tx_data->num_code_sets * sizeof(char *));
@@ -15520,7 +15519,6 @@ index 0000000..f86db02
 +	.owner		= THIS_MODULE
 +};
 +
-+static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
 +static int ir_remove(struct i2c_client *client);
 +static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
@@ -15528,14 +15526,16 @@ index 0000000..f86db02
 +static const struct i2c_device_id ir_transceiver_id[] = {
 +	/* Generic entry for any IR transceiver */
 +	{ "ir_video", 0 },
-+	/* IR device specific entries could be added here */
++	/* IR device specific entries should be added here */
++	{ "ir_tx_z8f0811_haup", 0 },
++	{ "ir_rx_z8f0811_haup", 0 },
 +	{ }
 +};
 +
 +static struct i2c_driver driver = {
 +	.driver = {
 +		.owner	= THIS_MODULE,
-+		.name	= "i2c ir driver",
++		.name	= "Zilog/Hauppauge i2c IR",
 +	},
 +	.probe		= ir_probe,
 +	.remove		= ir_remove,
@@ -15543,11 +15543,6 @@ index 0000000..f86db02
 +	.id_table	= ir_transceiver_id,
 +};
 +
-+static struct i2c_client client_template = {
-+	.name	= "unset",
-+	.driver	= &driver
-+};
-+
 +static struct file_operations lirc_fops = {
 +	.owner		= THIS_MODULE,
 +	.llseek		= lseek,
@@ -15559,30 +15554,107 @@ index 0000000..f86db02
 +	.release	= close
 +};
 +
-+static int i2c_attach(struct i2c_client *client, struct IR *ir)
++static int ir_remove(struct i2c_client *client)
 +{
-+	i2c_set_clientdata(client, ir);
++	struct IR *ir = i2c_get_clientdata(client);
++
++	mutex_lock(&ir->lock);
++
++	if (ir->have_rx || ir->have_tx) {
++		DECLARE_COMPLETION(tn);
++		DECLARE_COMPLETION(tn2);
++
++		/* end up polling thread */
++		if (ir->task && !IS_ERR(ir->task)) {
++			ir->t_notify = &tn;
++			ir->t_notify2 = &tn2;
++			ir->shutdown = 1;
++			wake_up_process(ir->task);
++			complete(&tn2);
++			wait_for_completion(&tn);
++			ir->t_notify = NULL;
++			ir->t_notify2 = NULL;
++		}
++
++	} else {
++		mutex_unlock(&ir->lock);
++		zilog_error("%s: detached from something we didn't "
++			    "attach to\n", __func__);
++		return -ENODEV;
++	}
++
++	/* unregister lirc driver */
++	if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
++		lirc_unregister_driver(ir->l.minor);
++		ir_devices[ir->l.minor] = NULL;
++	}
++
++	/* free memory */
++	lirc_buffer_free(&ir->buf);
++	mutex_unlock(&ir->lock);
++	kfree(ir);
 +
-+	++ir->devs;
 +	return 0;
 +}
 +
-+static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx)
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 +{
-+	struct IR *ir;
++	struct IR *ir = NULL;
++	struct i2c_adapter *adap = client->adapter;
++	char buf;
 +	int ret;
++	int have_rx = 0, have_tx = 0;
++
++	dprintk("%s: adapter id=0x%x, client addr=0x%02x\n",
++		__func__, adap->id, client->addr);
 +
-+	printk("lirc_zilog: chip found with %s\n",
++	/* if this isn't an appropriate device, bail w/-ENODEV now */
++	if (!(adap->id == I2C_HW_B_BT848 ||
++#ifdef I2C_HW_B_HDPVR
++	      adap->id == I2C_HW_B_HDPVR ||
++#endif
++	      adap->id == I2C_HW_B_CX2341X))
++		goto out_nodev;
++
++	/*
++	 * The external IR receiver is at i2c address 0x71.
++	 * The IR transmitter is at 0x70.
++	 */
++	client->addr = 0x70;
++
++	if (!disable_tx) {
++		if (i2c_master_recv(client, &buf, 1) == 1)
++			have_tx = 1;
++		dprintk("probe 0x70 @ %s: %s\n",
++			adap->name, have_tx ? "success" : "failed");
++	}
++
++	if (!disable_rx) {
++		client->addr = 0x71;
++		if (i2c_master_recv(client, &buf, 1) == 1)
++			have_rx = 1;
++		dprintk("probe 0x71 @ %s: %s\n",
++			adap->name, have_rx ? "success" : "failed");
++	}
++
++	if (!(have_rx || have_tx)) {
++		zilog_error("%s: no devices found\n", adap->name);
++		goto out_nodev;
++	}
++
++	printk(KERN_INFO "lirc_zilog: chip found with %s\n",
 +		have_rx && have_tx ? "RX and TX" :
 +			have_rx ? "RX only" : "TX only");
 +
 +	ir = kzalloc(sizeof(struct IR), GFP_KERNEL);
-+	if (ir == NULL)
-+		return -ENOMEM;
-+	if (lirc_buffer_init(&ir->buf, 2, BUFLEN/2) != 0) {
-+		kfree(ir);
-+		return -ENOMEM;
-+	}
++
++	if (!ir)
++		goto out_nomem;
++
++	ret = lirc_buffer_init(&ir->buf, 2, BUFLEN / 2);
++	if (ret)
++		goto out_nomem;
++
 +	mutex_init(&ir->lock);
 +	mutex_init(&ir->buf_lock);
 +	ir->need_boot = 1;
@@ -15590,18 +15662,17 @@ index 0000000..f86db02
 +	memcpy(&ir->l, &lirc_template, sizeof(struct lirc_driver));
 +	ir->l.minor = -1;
 +
++	/* I2C attach to device */
++	i2c_set_clientdata(client, ir);
++
 +	/* initialise RX device */
-+	client_template.adapter = adap;
-+	memcpy(&ir->c_rx, &client_template, sizeof(struct i2c_client));
 +	if (have_rx) {
 +		DECLARE_COMPLETION(tn);
++		memcpy(&ir->c_rx, client, sizeof(struct i2c_client));
 +
-+		/* I2C attach to device */
 +		ir->c_rx.addr = 0x71;
-+		strncpy(ir->c_rx.name, "Zilog/Hauppauge RX", I2C_NAME_SIZE);
-+		ret = i2c_attach(&ir->c_rx, ir);
-+		if (ret != 0)
-+			goto err;
++		strncpy(ir->c_rx.name, ZILOG_HAUPPAUGE_IR_RX_NAME,
++			I2C_NAME_SIZE);
 +
 +		/* try to fire up polling thread */
 +		ir->t_notify = &tn;
@@ -15614,24 +15685,23 @@ index 0000000..f86db02
 +		}
 +		wait_for_completion(&tn);
 +		ir->t_notify = NULL;
++		ir->have_rx = 1;
 +	}
 +
 +	/* initialise TX device */
-+	memcpy(&ir->c_tx, &client_template, sizeof(struct i2c_client));
 +	if (have_tx) {
-+		/* I2C attach to device */
++		memcpy(&ir->c_tx, client, sizeof(struct i2c_client));
 +		ir->c_tx.addr = 0x70;
-+		strncpy(ir->c_tx.name, "Zilog/Hauppauge TX", I2C_NAME_SIZE);
-+		ret = i2c_attach(&ir->c_tx, ir);
-+		if (ret != 0)
-+			goto err;
++		strncpy(ir->c_tx.name, ZILOG_HAUPPAUGE_IR_TX_NAME,
++			I2C_NAME_SIZE);
++		ir->have_tx = 1;
 +	}
 +
 +	/* set lirc_dev stuff */
 +	ir->l.code_length = 13;
 +	ir->l.rbuf	  = &ir->buf;
-+	ir->l.fops	= &lirc_fops;
-+	ir->l.data	= ir;
++	ir->l.fops	  = &lirc_fops;
++	ir->l.data	  = ir;
 +	ir->l.minor       = minor;
 +	ir->l.sample_rate = 0;
 +
@@ -15658,6 +15728,7 @@ index 0000000..f86db02
 +		if (ret != 0)
 +			goto err;
 +	}
++
 +	return 0;
 +
 +err:
@@ -15667,100 +15738,15 @@ index 0000000..f86db02
 +	if (ir->c_tx.addr)
 +		ir_remove(&ir->c_tx);
 +	return ret;
-+}
-+
-+static int ir_remove(struct i2c_client *client)
-+{
-+	struct IR *ir = i2c_get_clientdata(client);
-+	mutex_lock(&ir->lock);
-+
-+	if (client == &ir->c_rx) {
-+		DECLARE_COMPLETION(tn);
-+		DECLARE_COMPLETION(tn2);
-+
-+		/* end up polling thread */
-+		if (ir->task && !IS_ERR(ir->task)) {
-+			ir->t_notify = &tn;
-+			ir->t_notify2 = &tn2;
-+			ir->shutdown = 1;
-+			wake_up_process(ir->task);
-+			complete(&tn2);
-+			wait_for_completion(&tn);
-+			ir->t_notify = NULL;
-+			ir->t_notify2 = NULL;
-+		}
-+
-+	} else {
-+		mutex_unlock(&ir->lock);
-+		zilog_error("%s: detached from something we didn't "
-+			    "attach to\n", __func__);
-+		return -ENODEV;
-+	}
-+
-+	--ir->devs;
-+	if (ir->devs < 0) {
-+		mutex_unlock(&ir->lock);
-+		zilog_error("%s: invalid device count\n", __func__);
-+		return -ENODEV;
-+	} else if (ir->devs == 0) {
-+		/* unregister lirc driver */
-+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
-+			lirc_unregister_driver(ir->l.minor);
-+			ir_devices[ir->l.minor] = NULL;
-+		}
 +
-+		/* free memory */
-+		lirc_buffer_free(&ir->buf);
-+		mutex_unlock(&ir->lock);
-+		kfree(ir);
-+		return 0;
-+	}
-+	mutex_unlock(&ir->lock);
-+	return 0;
-+}
++out_nodev:
++	zilog_error("no device found\n");
++	return -ENODEV;
 +
-+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
-+{
-+	struct i2c_adapter *adap = client->adapter;
-+	char buf;
-+
-+	if (adap->id == I2C_HW_B_BT848 ||
-+#ifdef I2C_HW_B_HDPVR
-+	    adap->id == I2C_HW_B_HDPVR ||
-+#endif
-+	    adap->id == I2C_HW_B_CX2341X) {
-+		int have_rx = 0, have_tx = 0;
-+
-+		/*
-+		 * The external IR receiver is at i2c address 0x71.
-+		 * The IR transmitter is at 0x70.
-+		 */
-+		client->addr = 0x70;
-+
-+		if (!disable_rx) {
-+			if (i2c_master_recv(client, &buf, 1) == 1)
-+				have_rx = 1;
-+			dprintk("probe 0x70 @ %s: %s\n",
-+				adap->name,
-+				have_rx ? "yes" : "no");
-+		}
-+
-+		if (!disable_tx) {
-+			client->addr = 0x71;
-+			if (i2c_master_recv(client, &buf, 1) == 1)
-+				have_tx = 1;
-+			dprintk("probe 0x71 @ %s: %s\n",
-+				adap->name,
-+				have_tx ? "yes" : "no");
-+		}
-+
-+		if (have_rx || have_tx)
-+			return ir_attach(adap, have_rx, have_tx);
-+		else
-+			zilog_error("%s: no devices found\n", adap->name);
-+	}
-+
-+	return 0;
++out_nomem:
++	zilog_error("memory allocation failure\n");
++	kfree(ir);
++	return -ENOMEM;
 +}
 +
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
@@ -15771,10 +15757,21 @@ index 0000000..f86db02
 +
 +static int __init zilog_init(void)
 +{
++	int ret;
++
++	zilog_notify("Zilog/Hauppauge IR driver initializing\n");
++
 +	mutex_init(&tx_data_lock);
++
 +	request_module("firmware_class");
-+	i2c_add_driver(&driver);
-+	return 0;
++
++	ret = i2c_add_driver(&driver);
++	if (ret)
++		zilog_error("initialization failed\n");
++	else
++		zilog_notify("initialization complete\n");
++
++	return ret;
 +}
 +
 +static void __exit zilog_exit(void)
@@ -15782,6 +15779,7 @@ index 0000000..f86db02
 +	i2c_del_driver(&driver);
 +	/* if loaded */
 +	fw_unload();
++	zilog_notify("Zilog/Hauppauge IR driver unloaded\n");
 +}
 +
 +module_init(zilog_init);



From akurtakov at fedoraproject.org  Thu Sep  3 21:05:14 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Sep 2009 21:05:14 +0000 (UTC)
Subject: rpms/slf4j/devel slf4j-1.5.8-skip-integration-tests.patch, NONE,
	1.1 slf4j-pom_xml.patch, NONE, 1.1 slf4j-component-info.xml,
	NONE, 1.1 slf4j.spec, NONE, 1.1 slf4j-settings.xml, NONE,
	1.1 slf4j-jpp-depmap.xml, NONE, 1.1 sources, 1.1, 1.2 .cvsignore,
	1.1, 1.2
Message-ID: <20090903210514.6605C11C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/slf4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15053/devel

Modified Files:
	sources .cvsignore 
Added Files:
	slf4j-1.5.8-skip-integration-tests.patch slf4j-pom_xml.patch 
	slf4j-component-info.xml slf4j.spec slf4j-settings.xml 
	slf4j-jpp-depmap.xml 
Log Message:
Initial import.

slf4j-1.5.8-skip-integration-tests.patch:
 build.xml |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE slf4j-1.5.8-skip-integration-tests.patch ---
--- slf4j-1.5.8/integration/build.xml.orig	2009-07-29 11:46:27.000000000 +0800
+++ slf4j-1.5.8/integration/build.xml	2009-07-29 12:42:44.000000000 +0800
@@ -61,34 +61,42 @@
 	</target>
 
 	<target name="testMismatch">
+<!--
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="pathIncompatible" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMismatchTest" />
 		</junit>
+-->
 	</target>
 		
 	<target name="testPre155">
+<!--
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="path150" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" name="org.slf4j.Pre155VersionTest" />
 		</junit>
+-->
 	</target>
 
 	<target name="testMatch">
+<!--
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="pathCurrent" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionMatchTest" />
 		</junit>
+-->
 	</target>
 
 	<target name="testMultiBinding">
+<!--
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="multiBinding" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" name="org.slf4j.MultiBindingTest" />
 		</junit>
+-->
 	</target>
 </project>
\ No newline at end of file

slf4j-pom_xml.patch:
 pom.xml |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE slf4j-pom_xml.patch ---
--- pom.xml.sav	2008-07-06 13:50:34.000000000 +0200
+++ pom.xml	2008-07-06 13:51:24.000000000 +0200
@@ -98,9 +98,9 @@
 					</excludes>
 				</configuration>
 			</plugin>		
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>        
+<!--
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>        
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
@@ -111,6 +111,7 @@
           </execution>
         </executions>
       </plugin>
+-->
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -283,4 +284,4 @@
 
 	</distributionManagement>
   
-</project>
\ No newline at end of file
+</project>


--- NEW FILE slf4j-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="org/slf4j"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="slf4j-api.jar"/>


    <export>
      <include input="slf4j-api.jar"/>

    </export>
  </component>
</project>


--- NEW FILE slf4j.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:           slf4j
Version:        1.5.8
Release:        4%{?dist}
Epoch:          0
Summary:        Simple Logging Facade for Java
Group:          Development/Libraries
License:        MIT
URL:            http://www.slf4j.org/
Source0:        http://www.slf4j.org/dist/slf4j-1.5.8.tar.gz
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Source3:        slf4j-component-info.xml
Patch0:         %{name}-pom_xml.patch
Patch1:         slf4j-1.5.8-skip-integration-tests.patch
Requires(post): jpackage-utils >= 0:1.7.5
Requires(postun): jpackage-utils >= 0:1.7.5
BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit >= 0:1.6.5
BuildRequires:  javassist >= 0:3.4
BuildRequires:  junit >= 0:3.8.2
BuildRequires:  maven2 >= 2.0.7
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  maven-surefire-provider-junit
BuildRequires:  log4j
BuildRequires:  jakarta-commons-logging
Requires:       jpackage-utils
Requires:       java
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
The Simple Logging Facade for Java or (SLF4J) is intended to serve
as a simple facade for various logging APIs allowing to the end-user
to plug in the desired implementation at deployment time. SLF4J also
allows for a gradual migration path away from
Jakarta Commons Logging (JCL).

Logging API implementations can either choose to implement the
SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively,
it is possible (and rather easy) to write SLF4J adapters for the given
API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter..

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%package manual
Group:          Documentation
Summary:        Documents for %{name}

%description manual
Manual for %{name}.

%prep
%setup -q
%patch0 -p0
%patch1 -p1
find . -name "*.jar" | xargs rm
cp -p %{SOURCE1} settings.xml

sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" \
    settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" \
    settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" \
    settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" \
    settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" \
    settings.xml

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL/org.slf4j
ln -sf $(build-classpath maven2/empty-dep) \
  $MAVEN_REPO_LOCAL/org.slf4j/slf4j-api.jar
ln -sf $(build-classpath maven2/empty-dep) \
  $MAVEN_REPO_LOCAL/org.slf4j/slf4j-simple.jar
ln -sf $(build-classpath maven2/empty-dep) \
  $MAVEN_REPO_LOCAL/org.slf4j/slf4j-log4j12.jar
ln -sf $(build-classpath maven2/empty-dep) \
  $MAVEN_REPO_LOCAL/org.slf4j/slf4j-nop.jar

%{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
    %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        -Dmaven2.jpp.mode=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}

#install -m 644 jcl104-over-slf4j/target/jcl104-over-slf4j-%{version}.jar
#  $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl104-over-slf4j-%{version}.jar
ln -sf jcl-over-slf4j-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl104-over-slf4j-%{version}.jar
install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-over-slf4j-%{version}.jar
install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/jul-to-slf4j-%{version}.jar
install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j-over-slf4j-%{version}.jar
install -m 644 slf4j-api/target/%{name}-api-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/api-%{version}.jar
install -m 644 slf4j-api/target/%{name}-api-%{version}-tests.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/api-tests-%{version}.jar
install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/ext-%{version}.jar
install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-%{version}.jar
install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/jdk14-%{version}.jar
install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j12-%{version}.jar
install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/migrator-%{version}.jar
install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/nop-%{version}.jar
install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/simple-%{version}.jar

(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.slf4j jcl104-over-slf4j %{version} JPP/slf4j jcl104-over-slf4j
%add_to_maven_depmap org.slf4j jcl-over-slf4j %{version} JPP/slf4j jcl-over-slf4j
%add_to_maven_depmap org.slf4j jul-to-slf4j %{version} JPP/slf4j jul-to-slf4j
%add_to_maven_depmap org.slf4j log4j-over-slf4j %{version} JPP/slf4j log4j-over-slf4j
%add_to_maven_depmap org.slf4j %{name}-parent %{version} JPP/slf4j parent
%add_to_maven_depmap org.slf4j %{name}-api %{version} JPP/slf4j api
%add_to_maven_depmap org.slf4j %{name}-ext %{version} JPP/slf4j ext
%add_to_maven_depmap org.slf4j %{name}-jcl %{version} JPP/slf4j jcl
%add_to_maven_depmap org.slf4j %{name}-jdk14 %{version} JPP/slf4j jdk14
%add_to_maven_depmap org.slf4j %{name}-log4j12 %{version} JPP/slf4j log4j12
%add_to_maven_depmap org.slf4j %{name}-migrator %{version} JPP/slf4j migrator
%add_to_maven_depmap org.slf4j %{name}-nop %{version} JPP/slf4j nop
%add_to_maven_depmap org.slf4j %{name}-simple %{version} JPP/slf4j simple

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
install -pm 644 jcl104-over-slf4j/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jcl104-over-slf4j.pom
install -pm 644 jcl-over-slf4j/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jcl-over-slf4j.pom
install -pm 644 jul-to-slf4j/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jul-to-slf4j.pom
install -pm 644 log4j-over-slf4j/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-log4j-over-slf4j.pom
install -pm 644 slf4j-api/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-api.pom
install -pm 644 slf4j-ext/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ext.pom
install -pm 644 slf4j-jcl/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jcl.pom
install -pm 644 slf4j-jdk14/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jdk14.pom
install -pm 644 slf4j-log4j12/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-log4j12.pom
install -pm 644 slf4j-migrator/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-migrator.pom
install -pm 644 slf4j-nop/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-nop.pom
install -pm 644 slf4j-simple/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-simple.pom

# javadoc
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf target/site/api*

# manual
install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
rm -f target/site/.htaccess
cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%files manual
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/site

%changelog
* Wed Sep 2 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.8-4
- Fix other line lenghts.

* Wed Sep 2 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.8-3
- Fix permissions.
- Fixed descriptions.
- Fix file lengths.

* Wed Sep 2 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.8-2
- Adapt for Fedora.

* Wed Jul 29 2009 Yong Yang <yyang at redhat.com> 0:1.5.8-1
- 1.5.8
- Replace slf4j-1.5.6-integration-tests-current-only.patch with
  slf4j-1.5.8-skip-integration-tests.patch because of the failure of "testMatch"

* Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> 0:1.5.6-2
- Add -ext jar, depmap and pom
- Save jcl104-over-slf4j as symlink

* Tue Feb 18 2009 David Walluck <dwalluck at redhat.com> 0:1.5.6-1
- 1.5.6
- add repolib
- fix file eol
- fix Release tag

* Fri Jul 18 2008 David Walluck <dwalluck at redhat.com> 0:1.5.2-2
- use excalibur for avalon
- remove javadoc scriptlets
- GCJ fixes
- fix maven directory ownership
- fix -bc --short-circuit by moving some of %%build to %%prep

* Sun Jul 06 2008 Ralph Apel <r.apel at r-apel.de> 0:1.5.2-1.jpp5
- 1.5.2

* Mon Feb 04 2008 Ralph Apel <r.apel at r-apel.de> 0:1.4.2-2jpp
- Fix macro misprint
- Add maven2-plugin BRs

* Wed Jul 18 2007 Ralph Apel <r.apel at r-apel.de> 0:1.4.2-1jpp
- Upgrade to 1.4.2
- Build with maven2
- Add poms and depmap frags
- Add gcj_support option

* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.rc5.1jpp
- First JPackage release.


--- NEW FILE slf4j-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>


--- NEW FILE slf4j-jpp-depmap.xml ---
<dependencies>
 <dependency>
   <maven>
     <groupId>javax.jms</groupId>
     <artifactId>jms</artifactId>
     <version>1.1</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jms_1_1_api</artifactId>
     <version>1.1</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>javassist</groupId>
     <artifactId>javassist</artifactId>
     <version>3.4.GA</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>javassist</artifactId>
     <version>3.9.0</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>ant</groupId>
     <artifactId>ant-junit</artifactId>
     <version>1.6.5</version>
   </maven>
   <jpp>
     <groupId>JPP/ant</groupId>
     <artifactId>ant-junit</artifactId>
     <version>1.7.1</version>
   </jpp>
 </dependency>
</dependencies>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Sep 2009 15:11:23 -0000	1.1
+++ sources	3 Sep 2009 21:05:14 -0000	1.2
@@ -0,0 +1 @@
+a50d4b793d2e7c6c1e901f364a74a10f  slf4j-1.5.8.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Sep 2009 15:11:23 -0000	1.1
+++ .cvsignore	3 Sep 2009 21:05:14 -0000	1.2
@@ -0,0 +1 @@
+slf4j-1.5.8.tar.gz



From akurtakov at fedoraproject.org  Thu Sep  3 21:06:03 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Sep 2009 21:06:03 +0000 (UTC)
Subject: rpms/kxml/devel kxml.spec, NONE, 1.1 kxml2-2.2.2.pom, NONE,
	1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090903210603.37D9D11C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/kxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15363/devel

Modified Files:
	sources .cvsignore 
Added Files:
	kxml.spec kxml2-2.2.2.pom 
Log Message:
Initial import.


--- NEW FILE kxml.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:           kxml
Version:        2.2.2
Release:        5%{?dist}
Summary:        Small XML pull parser
License:        BSD
URL:            http://kxml.sourceforge.net/
Group:          Development/Libraries
Source0:        http://dl.sourceforge.net/sourceforge/kxml/kxml2-src-2.2.2.zip
Source1:        http://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  xpp3 >= 0:1.1.3.1
Requires:  java >= 0:1.5.0
Requires:  xpp3
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

%description
kXML is a small XML pull parser, specially designed for constrained
environments such as Applets, Personal Java or MIDP devices.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description    javadoc
API documentation for %{name}.

%prep
%setup -q -c
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
ln -sf $(build-classpath xpp3) lib/xmlpull_1_1_3_1.jar

%build
ant

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

%add_to_maven_depmap net.sf.kxml %{name}2 %{version} JPP %{name}
install -m 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}.pom

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 dist/%{name}2-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -m 644 dist/%{name}2-min-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-min-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)

# javadoc
install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr www/kxml2/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%doc license.txt
%{_javadir}/*.jar
%{_datadir}/maven2/poms/JPP.%{name}.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}-%{version}/*
%dir %{_javadocdir}/%{name}

%changelog
* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 2.2.2-5
- Fix Summary and description.
- Fix line length.
- Use pom from the URL.

* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 2.2.2-4
- Adapt for Fedora.

* Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 2.2.2-3
- Auto rebuild for JPackage 5 in mock

* Wed May 07 2008 Ralph Apel <r.apel at r-apel.de> 0:2.2.2-2jpp
- Add xpp3 (B)R

* Wed May 07 2008 Ralph Apel <r.apel at r-apel.de> 0:2.2.2-1jpp
- 2.2.2

* Thu Aug 26 2004 Fernando Nasser <fnasser at redhat.com> 0:2.1.8-4jpp
- Pro-forma rebuild with Ant 1.6.2

* Mon Jan 26 2004 David Walluck <david at anti-microsoft.org> 0:2.1.8-3jpp
- remove fractal reference

* Sun Jan 25 2004 David Walluck <david at anti-microsoft.org> 0:2.1.8-2jpp
- fix license

* Sun Jan 25 2004 David Walluck <david at anti-microsoft.org> 0:2.1.8-1jpp
- release


--- NEW FILE kxml2-2.2.2.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>net.sf.kxml</groupId>
  <artifactId>kxml2</artifactId>
  <name>kXML 2</name>
  <version>2.2.2</version>
  <description>kXML2 is a small XmlPull parser aimed at J2ME/MIDP devices, e.g. mobile phones.</description>
  <url>http://kxml.sourceforge.net/kxml2</url>

  <licenses>
     <license>
        <name>The BSD License</name>
        <url>http://www.opensource.org/licenses/bsd-license.html</url>
        <distribution>repo</distribution>
     </license>
  </licenses>

  <issueManagement>
    <url>http://sourceforge.net/tracker/?atid=109157&amp;group_id=9157&amp;func=browse</url>
  </issueManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>kXML Developer List</name>
      <archive>http://sourceforge.net/mail/?group_id=9157</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>haustein</id>
      <name>Stefan Haustein</name>
      <email>sh at kobjects.org</email>
      <organization></organization>
    </developer>
  </developers>
  <scm>
    <connection>scm:cvs:pserver:anonymous at cvs.sourceforge.net:/cvsroot/kxml:kxml2</connection>
    <url>http://cvs.sourceforge.net/viewcvs.py/kxml/kxml2/</url>
  </scm>
  <organization>
    <name>kObjects.org</name>
    <url>http://kobjects.org/</url>
  </organization>
  <build>
    <sourceDirectory>src/</sourceDirectory>
  </build>
  <dependencies>
    <dependency>
      <groupId>xmlpull</groupId>
      <artifactId>xmlpull</artifactId>
      <version>1.1.3.1</version>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://kxml.sourceforge.net//kxml2</url>
    </site>
  </distributionManagement>
</project>

Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kxml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Sep 2009 15:11:49 -0000	1.1
+++ sources	3 Sep 2009 21:06:02 -0000	1.2
@@ -0,0 +1 @@
+4b451a4ce39e20b8f885f5194aabbfbd  kxml2-src-2.2.2.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kxml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Sep 2009 15:11:49 -0000	1.1
+++ .cvsignore	3 Sep 2009 21:06:03 -0000	1.2
@@ -0,0 +1 @@
+kxml2-src-2.2.2.zip



From akurtakov at fedoraproject.org  Thu Sep  3 21:20:27 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Sep 2009 21:20:27 +0000 (UTC)
Subject: rpms/slf4j/devel slf4j.spec,1.1,1.2
Message-ID: <20090903212027.E579F11C0374@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/slf4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19081/devel

Modified Files:
	slf4j.spec 
Log Message:
Skip tests.


Index: slf4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slf4j/devel/slf4j.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- slf4j.spec	3 Sep 2009 21:05:13 -0000	1.1
+++ slf4j.spec	3 Sep 2009 21:20:27 -0000	1.2
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.5.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Simple Logging Facade for Java
 Group:          Development/Libraries
@@ -137,6 +137,7 @@ mvn-jpp \
         -Dmaven2.jpp.mode=true \
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
@@ -259,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/%{name}-%{version}/site
 
 %changelog
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.8-5
+- Skip tests.
+
 * Wed Sep 2 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.8-4
 - Fix other line lenghts.
 



From kalev at fedoraproject.org  Thu Sep  3 21:30:44 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu,  3 Sep 2009 21:30:44 +0000 (UTC)
Subject: rpms/mingw32-gcc/devel .cvsignore, 1.5, 1.6 mingw32-gcc.spec, 1.7, 
	1.8 sources, 1.5, 1.6 fastjar-0.97-segfault.patch, 1.1,
	NONE gcc44-power7-2.patch, 1.2, NONE gcc44-power7-3.patch, 1.1,
	NONE gcc44-power7.patch, 1.2, NONE gcc44-unique-object.patch,
	1.1, NONE
Message-ID: <20090903213044.77A7311C02BB@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21697

Modified Files:
	.cvsignore mingw32-gcc.spec sources 
Removed Files:
	fastjar-0.97-segfault.patch gcc44-power7-2.patch 
	gcc44-power7-3.patch gcc44-power7.patch 
	gcc44-unique-object.patch 
Log Message:
4.4.1-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 20:26:27 -0000	1.5
+++ .cvsignore	3 Sep 2009 21:30:42 -0000	1.6
@@ -1 +1 @@
-gcc-4.4.1-20090818.tar.bz2
+gcc-4.4.1-20090902.tar.bz2


Index: mingw32-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-gcc.spec	25 Aug 2009 20:26:28 -0000	1.7
+++ mingw32-gcc.spec	3 Sep 2009 21:30:43 -0000	1.8
@@ -1,14 +1,14 @@
 %global __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
-%global DATE 20090818
-%global SVNREV 150873
+%global DATE 20090902
+%global SVNREV 151328
 
 Name:           mingw32-gcc
 Version:        4.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C
 
-License:        GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
+License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 
 # We use the same source as Fedora's native gcc.
@@ -25,25 +25,21 @@ Patch2:         gcc44-c++-builtin-redecl
 Patch3:         gcc44-ia64-libunwind.patch
 Patch4:         gcc44-java-nomulti.patch
 Patch5:         gcc44-ppc32-retaddr.patch
-Patch9:         gcc44-pr33763.patch
-Patch10:        gcc44-rh330771.patch
-Patch11:        gcc44-rh341221.patch
-Patch12:        gcc44-java-debug-iface-type.patch
-Patch13:        gcc44-i386-libgomp.patch
-Patch15:        gcc44-sparc-config-detection.patch
-Patch16:        gcc44-libgomp-omp_h-multilib.patch
-Patch20:        gcc44-libtool-no-rpath.patch
-Patch21:        gcc44-cloog-dl.patch
-Patch22:        gcc44-raw-string.patch
-Patch24:        gcc44-unwind-debug-hook.patch
-Patch25:        gcc44-power7.patch
-Patch26:        gcc44-power7-2.patch
-Patch27:        gcc44-power7-3.patch
-Patch28:        gcc44-pr38757.patch
-#Patch29:        gcc44-libstdc++-docs.patch
-Patch30:        gcc44-rh503816-1.patch
-Patch31:        gcc44-rh503816-2.patch
-Patch32:        gcc44-unique-object.patch
+Patch6:         gcc44-pr33763.patch
+Patch7:         gcc44-rh330771.patch
+Patch8:         gcc44-rh341221.patch
+Patch9:         gcc44-java-debug-iface-type.patch
+Patch10:        gcc44-i386-libgomp.patch
+Patch11:        gcc44-sparc-config-detection.patch
+Patch12:        gcc44-libgomp-omp_h-multilib.patch
+Patch13:        gcc44-libtool-no-rpath.patch
+Patch14:        gcc44-cloog-dl.patch
+Patch15:        gcc44-raw-string.patch
+Patch16:        gcc44-unwind-debug-hook.patch
+Patch17:        gcc44-pr38757.patch
+Patch18:        gcc44-libstdc++-docs.patch
+Patch19:        gcc44-rh503816-1.patch
+Patch20:        gcc44-rh503816-2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -128,24 +124,21 @@ MinGW Windows cross-compiler for FORTRAN
 %patch3 -p0 -b .ia64-libunwind~
 %patch4 -p0 -b .java-nomulti~
 %patch5 -p0 -b .ppc32-retaddr~
-%patch9 -p0 -b .pr33763~
-%patch10 -p0 -b .rh330771~
-%patch11 -p0 -b .rh341221~
-%patch12 -p0 -b .java-debug-iface-type~
-%patch13 -p0 -b .i386-libgomp~
-%patch15 -p0 -b .sparc-config-detection~
-%patch16 -p0 -b .libgomp-omp_h-multilib~
-%patch20 -p0 -b .libtool-no-rpath~
-%patch21 -p0 -b .cloog-dl~
-%patch22 -p0 -b .raw-string~
-%patch24 -p0 -b .unwind-debug-hook~
-%patch25 -p0 -b .power7~
-%patch26 -p0 -b .power7-2~
-%patch27 -p0 -b .power7-3~
-%patch28 -p0 -b .pr38757~
-%patch30 -p0 -b .rh503816-1~
-%patch31 -p0 -b .rh503816-2~
-%patch32 -p0 -b .unique-object~
+%patch6 -p0 -b .pr33763~
+%patch7 -p0 -b .rh330771~
+%patch8 -p0 -b .rh341221~
+%patch9 -p0 -b .java-debug-iface-type~
+%patch10 -p0 -b .i386-libgomp~
+%patch11 -p0 -b .sparc-config-detection~
+%patch12 -p0 -b .libgomp-omp_h-multilib~
+%patch13 -p0 -b .libtool-no-rpath~
+%patch14 -p0 -b .cloog-dl~
+%patch15 -p0 -b .raw-string~
+%patch16 -p0 -b .unwind-debug-hook~
+%patch17 -p0 -b .pr38757~
+%patch18 -p0 -b .libstdc++-docs~
+%patch19 -p0 -b .rh503816-1~
+%patch20 -p0 -b .rh503816-2~
 
 sed -i -e 's/4\.4\.2/%{version}/' gcc/BASE-VER
 echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
@@ -298,6 +291,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 03 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.1-2
+- Update to gcc 4.4.1 20090902 svn 151328.
+- Patches taken from native Fedora gcc-4.4.1-8.
+- Another license update to keep it in sync with native gcc package.
+
 * Sun Aug 23 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.1-1
 - Update to gcc 4.4.1 20090818 svn 150873.
 - Patches taken from native Fedora gcc-4.4.1-6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 20:26:28 -0000	1.5
+++ sources	3 Sep 2009 21:30:43 -0000	1.6
@@ -1 +1 @@
-a280c87e7d0a44a99a6bc84bbe3eb86d  gcc-4.4.1-20090818.tar.bz2
+eb2fb0d2c073de0b4edf78dab958aca4  gcc-4.4.1-20090902.tar.bz2


--- fastjar-0.97-segfault.patch DELETED ---


--- gcc44-power7-2.patch DELETED ---


--- gcc44-power7-3.patch DELETED ---


--- gcc44-power7.patch DELETED ---


--- gcc44-unique-object.patch DELETED ---



From emaldonado at fedoraproject.org  Thu Sep  3 21:35:27 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Sep 2009 21:35:27 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.10,1.11 sources,1.2,1.3
Message-ID: <20090903213527.CAB7111C0099@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24729

Modified Files:
	nss-util.spec sources 
Log Message:
Update to 3.12.4


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nss-util.spec	28 Aug 2009 05:32:55 -0000	1.10
+++ nss-util.spec	3 Sep 2009 21:35:27 -0000	1.11
@@ -2,8 +2,8 @@
 
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
-Version:          3.12.3.99.3
-Release:          15%{?dist}
+Version:          3.12.4
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -161,7 +161,9 @@ done
 
 %files devel
 %defattr(-,root,root)
+# this is a symbolic link to the shared library in /%{_lib}
 %{_libdir}/libnssutil3.so
+# package configuration files
 %{_libdir}/pkgconfig/nss-util.pc
 %{_bindir}/nss-util-config
 
@@ -201,6 +203,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Sep 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
+- Update to 3.12.4
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-15
 - Bump the release number for a chained build of nss-util, nss-softokn and nss
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Aug 2009 23:03:21 -0000	1.2
+++ sources	3 Sep 2009 21:35:27 -0000	1.3
@@ -1 +1 @@
-405ec2373d85f45c1afd79b9005f7513  nss-util-3.12.3.99.3.tar.bz2
+f7b73ca36d53c74191f8794fa1a99d1d  nss-util-3.12.4.tar.bz2



From emaldonado at fedoraproject.org  Thu Sep  3 21:35:48 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Sep 2009 21:35:48 +0000 (UTC)
Subject: rpms/nss-util/devel .cvsignore,1.2,1.3
Message-ID: <20090903213548.8369011C0099@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023

Modified Files:
	.cvsignore 
Log Message:
Update to 3.12.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Aug 2009 23:04:00 -0000	1.2
+++ .cvsignore	3 Sep 2009 21:35:48 -0000	1.3
@@ -1 +1 @@
-nss-util-3.12.3.99.3.tar.bz2
+nss-util-3.12.4.tar.bz2



From ajax at fedoraproject.org  Thu Sep  3 21:47:33 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  3 Sep 2009 21:47:33 +0000 (UTC)
Subject: rpms/kernel/devel drm-ddc-caching-bug.patch, NONE, 1.1 kernel.spec, 
	1.1764, 1.1765
Message-ID: <20090903214733.8865711C0099@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28841

Modified Files:
	kernel.spec 
Added Files:
	drm-ddc-caching-bug.patch 
Log Message:
* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
- drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
  disconnected.


drm-ddc-caching-bug.patch:
 drm_crtc_helper.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE drm-ddc-caching-bug.patch ---
When an output was disconnected, its mode list would remain.  If you later
plugged into a sink with no EDID (projector, etc), you'd inherit the mode
list from the old sink, which is not what you want.

diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx	2009-09-03 16:56:11.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-03 16:57:24.911505245 -0400
@@ -104,8 +104,7 @@ int drm_helper_probe_single_connector_mo
 	if (connector->status == connector_status_disconnected) {
 		DRM_DEBUG_KMS("%s is disconnected\n",
 			  drm_get_connector_name(connector));
-		/* TODO set EDID to NULL */
-		return 0;
+		goto prune;
 	}
 
 	count = (*connector_funcs->get_modes)(connector);
@@ -130,7 +129,7 @@ int drm_helper_probe_single_connector_mo
 								   mode);
 	}
 
-
+prune:
 	drm_mode_prune_invalid(dev, &connector->modes, true);
 
 	if (list_empty(&connector->modes))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -p -r1.1764 -r1.1765
--- kernel.spec	3 Sep 2009 21:02:14 -0000	1.1764
+++ kernel.spec	3 Sep 2009 21:47:33 -0000	1.1765
@@ -699,6 +699,7 @@ Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
 Patch1827: drm-rv710-ucode-fix.patch
 Patch1828: drm-god-shut-up-about-edid-already.patch
+Patch1829: drm-ddc-caching-bug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1324,6 +1325,7 @@ ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
 ApplyPatch drm-rv710-ucode-fix.patch
 ApplyPatch drm-god-shut-up-about-edid-already.patch
+ApplyPatch drm-ddc-caching-bug.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2020,6 +2022,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
+- drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
+  disconnected.
+
 * Thu Sep 03 2009 Jarod Wilson <jarod at redhat.com>
 - Update hdpvr and lirc_zilog drivers for 2.6.31 i2c
 



From kkofler at fedoraproject.org  Thu Sep  3 21:53:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Sep 2009 21:53:16 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.240,1.241
Message-ID: <20090903215316.7942B11C0099@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30036/devel

Modified Files:
	kdebindings.spec 
Log Message:
* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
- also disable polkit-qt on EL6+
- also remove polkit-qt sip files and examples on F12+/EL6+


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- kdebindings.spec	3 Sep 2009 14:10:28 -0000	1.240
+++ kdebindings.spec	3 Sep 2009 21:53:16 -0000	1.241
@@ -36,7 +36,7 @@
 
 Name: kdebindings
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -60,7 +60,7 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 && 0%{?rhel} < 6
 BuildRequires:  polkit-qt-devel
 %endif
 BuildRequires:  python-devel
@@ -307,6 +307,12 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+# zap polkit-qt stuff which gets installed even without polkit-qt available
+rm -rf %{buildroot}%{_kde4_datadir}/sip/PyKDE4/polkitqt/
+rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples/polkitqtExamples/
+%endif
+
 # HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
 rm -fv %{buildroot}%{_bindir}/pykdeuic4
 mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
@@ -509,6 +515,10 @@ fi
 
 
 %changelog
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- also disable polkit-qt on EL6+
+- also remove polkit-qt sip files and examples on F12+/EL6+
+
 * Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
 - only (temporarily) disable Falcon on F12+
 - drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)



From kkofler at fedoraproject.org  Thu Sep  3 21:55:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Sep 2009 21:55:13 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.241,1.242
Message-ID: <20090903215513.CE3B011C0099@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30490/devel

Modified Files:
	kdebindings.spec 
Log Message:
Oops, don't rely on %{?rhel}. (Looking at Than's changes for RHEL, that doesn't seem to be defined in the RHEL build system for some reason.)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- kdebindings.spec	3 Sep 2009 21:53:16 -0000	1.241
+++ kdebindings.spec	3 Sep 2009 21:55:13 -0000	1.242
@@ -60,7 +60,7 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-%if 0%{?fedora} < 12 && 0%{?rhel} < 6
+%if 0%{?fedora} && 0%{?fedora} < 12
 BuildRequires:  polkit-qt-devel
 %endif
 BuildRequires:  python-devel
@@ -307,7 +307,7 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if !0%{?fedora} || 0%{?fedora} >= 12
 # zap polkit-qt stuff which gets installed even without polkit-qt available
 rm -rf %{buildroot}%{_kde4_datadir}/sip/PyKDE4/polkitqt/
 rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples/polkitqtExamples/



From than at fedoraproject.org  Thu Sep  3 21:56:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  3 Sep 2009 21:56:37 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec, 1.95,
	1.96 kdebase-runtime-4.3.1-comborender.patch, 1.1,
	NONE kdebase-runtime-4.3.1-fish.patch, 1.1,
	NONE kdebase-runtime-4.3.1-kcmlocalecrash.patch, 1.1, NONE
Message-ID: <20090903215637.7D4FF11C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30802

Modified Files:
	kdebase-runtime.spec 
Removed Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-fish.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
4.3.1



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kdebase-runtime.spec	1 Sep 2009 13:01:54 -0000	1.95
+++ kdebase-runtime.spec	3 Sep 2009 21:56:37 -0000	1.96
@@ -81,9 +81,7 @@ Requires: %{name} = %{version}-%{release
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description flags
 %{summary}.
 


--- kdebase-runtime-4.3.1-comborender.patch DELETED ---


--- kdebase-runtime-4.3.1-fish.patch DELETED ---


--- kdebase-runtime-4.3.1-kcmlocalecrash.patch DELETED ---



From than at fedoraproject.org  Thu Sep  3 21:58:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  3 Sep 2009 21:58:16 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec, 1.118,
	1.119 kdebase-runtime-4.3.1-comborender.patch, 1.1,
	NONE kdebase-runtime-4.3.1-fish.patch, 1.1,
	NONE kdebase-runtime-4.3.1-kcmlocalecrash.patch, 1.1, NONE
Message-ID: <20090903215816.BB65011C0099@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-serv31378

Modified Files:
	kdebase-runtime.spec 
Removed Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-fish.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
4.3.1



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- kdebase-runtime.spec	1 Sep 2009 13:01:54 -0000	1.118
+++ kdebase-runtime.spec	3 Sep 2009 21:58:16 -0000	1.119
@@ -81,9 +81,7 @@ Requires: %{name} = %{version}-%{release
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description flags
 %{summary}.
 


--- kdebase-runtime-4.3.1-comborender.patch DELETED ---


--- kdebase-runtime-4.3.1-fish.patch DELETED ---


--- kdebase-runtime-4.3.1-kcmlocalecrash.patch DELETED ---



From jjames at fedoraproject.org  Thu Sep  3 22:06:11 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu,  3 Sep 2009 22:06:11 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/devel
	xemacs-packages-extra-20090624-apel-503185.patch, NONE,
	1.1 xemacs-packages-extra-20090624-dired-504422.patch, NONE,
	1.1 xemacs-packages-extra-20090824-timer.patch, NONE,
	1.1 xemacs-packages-extra.spec, 1.10, 1.11
Message-ID: <20090903220611.AF73411C0099@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32612/devel

Modified Files:
	xemacs-packages-extra.spec 
Added Files:
	xemacs-packages-extra-20090624-apel-503185.patch 
	xemacs-packages-extra-20090624-dired-504422.patch 
	xemacs-packages-extra-20090824-timer.patch 
Log Message:
* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
- Update APEL to a newer version (bz 503185).
- Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).
- Fix a known timer bug.


xemacs-packages-extra-20090624-apel-503185.patch:
 ChangeLog          |    4 +
 ChangeLog.upstream |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 Makefile           |   22 +++++---
 README.en          |   11 ----
 README.ja          |   13 -----
 alist.el           |  101 ++++++++++++++++++++++++++++++++++++++++
 apel-ver.el        |    9 ++-
 atype.el           |    4 -
 broken.el          |    4 -
 calist.el          |    6 +-
 emu.el             |    4 -
 file-detect.el     |    4 -
 filename.el        |   62 +++++++++++++++----------
 install.el         |   91 ++++++++++++++++++++++++++----------
 inv-xemacs.el      |    4 -
 invisible.el       |    4 -
 mcharset.el        |    4 -
 mcs-20.el          |    4 -
 mcs-ltn1.el        |    4 -
 mcs-xmu.el         |    4 -
 mule-caesar.el     |    4 -
 path-util.el       |    4 -
 pccl-20.el         |    4 -
 pccl.el            |    4 -
 pces-20.el         |    4 -
 pces-raw.el        |    4 -
 pces-xfc.el        |    4 -
 pces-xm.el         |    4 -
 pces.el            |    4 -
 pcustom.el         |    4 -
 poe-xemacs.el      |  122 ++++++++++++++++++++++++++++++++++++++++---------
 poe.el             |   74 +++++++++++++++++++++++------
 poem-ltn1.el       |    4 -
 poem-xm.el         |   17 ++++--
 poem.el            |   14 ++++-
 product.el         |    4 -
 pym.el             |    4 -
 richtext.el        |    4 -
 static.el          |    4 -
 39 files changed, 592 insertions(+), 185 deletions(-)

--- NEW FILE xemacs-packages-extra-20090624-apel-503185.patch ---
Index: xemacs-packages/apel/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog,v
retrieving revision 1.42
diff -d -u -r1.42 ChangeLog
--- xemacs-packages/apel/ChangeLog	15 Aug 2007 07:38:42 -0000	1.42
+++ xemacs-packages/apel/ChangeLog	3 Jul 2009 22:02:50 -0000
@@ -1,3 +1,7 @@
+2009-07-01  Jerry James  <james at xemacs.org>
+
+	* *.el, README.*, ChangeLog.upstream: Sync with 10.7.
+
 2007-08-15  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.33 released.
Index: xemacs-packages/apel/ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog.upstream,v
retrieving revision 1.1
diff -d -u -r1.1 ChangeLog.upstream
--- xemacs-packages/apel/ChangeLog.upstream	6 Dec 2005 10:47:17 -0000	1.1
+++ xemacs-packages/apel/ChangeLog.upstream	3 Jul 2009 22:02:51 -0000
@@ -1,3 +1,130 @@
+2007-02-14  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL: Version 10.7 released.
+
+	* Makefile (VERSION): Update to 10.7.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL-MK (config-apel-package): Use
+	`install-get-default-package-directory'.
+
+	* install.el (install-get-default-package-directory): New
+	function.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* apel-ver.el (apel-ver): Change APEL version to 10.7.
+
+2005-05-08  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* poem-xm.el (char-valid-p): New alias.
+
+2006-12-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Avoid an error concerning
+	PACKAGEDIR with old XEmacs that doesn't use the package system.
+
+2006-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-update-package-files): Use
+	batch-update-directory-autoloads if it is available instead of
+	batch-update-directory.
+
+2006-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Check for
+	(early|late|last)-package-hierarchies and configure-package-path
+	as well as (early|late|last)-packages.
+
+2006-11-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* time-stamp.el: Remove.  Suggested by Stephen Gildea, the
+	maintainer of time-stamp.el.
+
+	* EMU-ELS (emu-modules): Exclude it.
+
+	* README.en, README.ja: Remove time-stamp.el entry.
+
+2006-04-24  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-detect-elisp-directory): Fix 2002-11-29
+	change; assume default-load-path contains nil; use regexp-quote to
+	compare directories even in Emacs.
+
+2005-12-06  Ville Skytt?  <scop at xemacs.org>
+
+	* poe.el (minor-mode-overriding-map-alist): Doc fix.
+
+	* product.el (product-version-as-string): Doc fix.
+
+2002-11-29  Ben Wing  <ben at xemacs.org>
+
+	* install.el (install-detect-elisp-directory): Fix problems
+	handling backslashes in filenames (Windows).
+
+2005-06-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* filename.el (filename-special-filter-1): New macro defined for
+	filename-special-filter to use aref instead of sref for the recent
+	Emacsen.
+	(filename-special-filter): Use it.
+
+2005-06-05  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
+
+2005-05-10  TAKAHASHI Kaoru  <kaoru at kaisei.org>
+
+	* poe.el (split-string): Import from Emacs 22. Add omit-nulls
+	argument.
+
+2005-05-03  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poem.el (characterp): Use `char-valid-p' if it exists.
+	* poem.el (char-or-char-int-p): Ditto.
+
+2005-02-23  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Attempt to load `timer-funcs'
+	before `timer'.
+
+2004-09-27  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* README.en, README.ja (CVS): Remove the description about
+	developers' pserver access.
+
+2004-02-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* calist.el (use-calist-package): Add missing arg to `format'.
+
+2004-01-26  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* Makefile: Make `elc' into the default entry.
+
+2004-01-07  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Don't use `defadvice' in order to
+	avoid a conflict with the Gnus version.
+
+2003-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Fully implement it for the recent
+	XEmacsen when the fsf-compat package is not available.
+	(run-at-time-tick-tock): Check closely whether a bug is in
+	`start-itimer'.
+
+2003-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Redefine it to make it punctual.
+
+2003-09-05  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poem-xm.el (char-length): Don't use `defun-maybe' to define it
+	since this module may be installed as the XEmacs package which
+	should be usable by all the XEmacs 21.x series.
+
+

 2003-07-05  Yuuichi Teranishi  <teranisi at gohome.org>
 
 	* APEL: Version 10.6 released.
@@ -278,7 +405,7 @@
 	(minor-mode-map-alist): Ditto.
 
 	* README.en ((d) make.bat (for MS-DOS family)): New section.
-	* README.ja ((d) make.bat $B$rMxMQ$9$k(B (MS-DOS $B7O(B OS $B$N>l9g(B)):
+	* README.ja ((d) make.bat $(B$rMxMQ$9$k(B (MS-DOS $(B7O(B OS $(B$N>l9g(B)):
 	Ditto.
 
 2000-12-22  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
@@ -3064,7 +3191,7 @@
 
 	* APEL: Version 8.4 was released.
 
-	* EMU-ELS: Don't use HIRAGANA LETTER A ($B$"(B) to detect character
+	* EMU-ELS: Don't use HIRAGANA LETTER A ($(B$"(B) to detect character
  	indexing (Emacs 20.3 or later).
 
 1998-04-20  MORIOKA Tomohiko  <morioka at jaist.ac.jp>
Index: xemacs-packages/apel/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/Makefile,v
retrieving revision 1.43
diff -d -u -r1.43 Makefile
--- xemacs-packages/apel/Makefile	15 Aug 2007 07:38:42 -0000	1.43
+++ xemacs-packages/apel/Makefile	3 Jul 2009 22:02:51 -0000
@@ -18,7 +18,7 @@
 # Boston, MA  02110-1301  USA
 
 VERSION = 1.33
-AUTHOR_VERSION = 10.6
+AUTHOR_VERSION = 10.7
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = apel
 PKG_TYPE = regular
@@ -27,22 +27,26 @@
 
 include ../../Local.rules.inc
 
-ELCS = apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
+ELCS = alist.elc apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
 	install.elc inv-xemacs.elc invisible.elc mcharset.elc \
-	mcs-20.elc mcs-ltn1.elc mule-caesar.elc path-util.elc \
-	pccl.elc poe-xemacs.elc poe.elc poem-ltn1.elc poem-xm.elc \
-	poem.elc product.elc pym.elc richtext.elc static.elc \
-	pcustom.elc pces.elc pces-raw.elc pces-20.elc pces-xfc.elc \
-	atype.elc file-detect.elc
+	mule-caesar.elc path-util.elc pccl.elc pces-20.elc pces-xfc.elc \
+	pces.elc pcustom.elc poe-xemacs.elc poe.elc poem.elc product.elc \
+	pym.elc richtext.elc static.elc
 
 ## The following files are no longer in upstream apel, but tm needs them.
 ELCS += std11.elc std11-parse.elc
 
+## The following files are considered obsolete, but bbdb-rmail needs them.
+ELCS += atype.elc file-detect.elc
+
+## The following files are only needed for non-MULE XEmacsen.
+ELCS += mcs-ltn1.elc poem-ltn1.elc
+
 EXTRA_SOURCES = README.en ChangeLog.upstream
 
 ifeq ($(BUILD_WITHOUT_MULE),)
-# ELCS += emu-x20.elc
-ELCS += mcs-xm.elc pccl-20.elc pces-xm.elc mcs-xmu.elc
+ELCS += mcs-20.elc mcs-xm.elc mcs-xmu.elc pccl-20.elc \
+	pces-raw.elc pces-xm.elc poem-xm.elc
 EXTRA_SOURCES += README.ja
 endif
 
Index: xemacs-packages/apel/README.en
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.en,v
retrieving revision 1.4
diff -d -u -r1.4 README.en
--- xemacs-packages/apel/README.en	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.en	3 Jul 2009 22:02:51 -0000
@@ -99,11 +99,6 @@
 
   tinycustom.el --- emulation module of custom.el
 
-** time-stamp.el
-
-This is a utility to maintain last change time stamps in files edited
-by Emacs.
-
 ** timezone.el
 
 This is a utility of time zone.  This is a Y2K fixed version.   This
@@ -242,7 +237,7 @@
 to really regularize eol codes to CRLF.  If you need further
 information, see the following URL (n.b. Japanese only)
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 * load-path (for Emacs or MULE)
 
@@ -493,9 +488,5 @@
 
 with your account name and your public key for ssh.  cvsroot is
 :ext:cvs at cvs.m17n.org:/cvs/root.
-
-If you cannot use ssh, please send UNIX /etc/passwd style crypted
-password.  you can commit with the cvsroot
-:pserver:<accountname>@cvs.m17n.org:/cvs/root.
 
 We hope you will join the open development.
Index: xemacs-packages/apel/README.ja
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.ja,v
retrieving revision 1.4
diff -d -u -r1.4 README.ja
--- xemacs-packages/apel/README.ja	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.ja	3 Jul 2009 22:02:51 -0000
@@ -95,10 +95,6 @@
 
   tinycustom.el --- custom.el $B$N%(%_%e%l!<%7%g%s$r9T$J$&(B
 
-** time-stamp.el
-
-Emacs $B$K$h$kJT=8$N:]!":G=*=$@5;~9o$rJ]B8$9$k$?$a$N%f!<%F%#%j%F%#!#(B
-
 ** timezone.el
 
 $B%?%$%`%>!<%s%f!<%F%#%j%F%#!#(B2000 $BG/LdBjBP1~HG!#(BEmacs 18 $B$H(B GNUS 3.14.4
@@ -229,7 +225,7 @@
 
 $B>e5-$NNc$G$O!"(Bmeadow $B$N%P%$%J%j$,(B c:\usr\Meadow\1.10\bin\meadow95.exe
 $B$K%$%s%9%H!<%k$5$l$F$$$k$3$H$rA0Ds$K$7$F$$$^$9!#$=$NA0Ds$K4p$E$-!"(BAPEL
-$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B 
+$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B
 
   c:\usr\Meadow\site-lisp
 
@@ -311,7 +307,7 @@
 $B$-$^$;$s$N$G9TKv%3!<%I$r(B CRLF $B$K=$@5$7$F$*;H$$2<$5$$!#$3$NLdBj$K$D$$$F(B
 $B>\$7$/$O!"(B
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 $B$r$4;2>H2<$5$$!#(B
 
@@ -585,10 +581,5 @@
 
 $B$K%"%+%&%s%HL>$H!"(Bssh $B$N8x3+80$rAw$C$F$/$@$5$$!#(Bssh $B7PM3$G$O!"(Bcvsroot
 $B$O(B :ext:cvs at cvs.m17n.org:/cvs/root $B$H$J$j$^$9!#(B
-
-$B$I$&$7$F$b(B ssh $B$,;H$($J$$>l9g!"(Bpserver $B7PM3$G$b3+H/$K;22C$G$-$^$9!#$3(B
-$B$N>l9g!"(BUNIX $B$N(B /etc/passwd $BMM<0$G0E9f2=$5$l$?%Q%9%o!<%I$rAw$C$F2<$5$$!#(B
-$B$3$N>l9g(B cvsroot $B$O(B :pserver:<$B%"%+%&%s%HL>(B>@cvs.m17n.org:/cvs/root $B$H(B
-$B$J$j$^$9!#(B
 
 $B3+$+$l$?3+H/$K;22C$7$F$/$@$5$k$3$H$r4|BT$7$^$9!#(B
Index: xemacs-packages/apel/alist.el
===================================================================
RCS file: xemacs-packages/apel/alist.el
diff -N xemacs-packages/apel/alist.el
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-packages/apel/alist.el	3 Jul 2009 22:02:51 -0000
@@ -0,0 +1,101 @@
+;;; alist.el --- utility functions for association list
+
+;; Copyright (C) 1993,1994,1995,1996,1998,2000 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
+;; Keywords: alist
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+;;;###autoload
+(defun put-alist (key value alist)
+  "Set cdr of an element (KEY . ...) in ALIST to VALUE and return ALIST.
+If there is no such element, create a new pair (KEY . VALUE) and
+return a new alist whose car is the new pair and cdr is ALIST."
+  (let ((elm (assoc key alist)))
+    (if elm
+	(progn
+	  (setcdr elm value)
+	  alist)
+      (cons (cons key value) alist))))
+
+;;;###autoload
+(defun del-alist (key alist)
+  "Delete an element whose car equals KEY from ALIST.
+Return the modified ALIST."
+  (let ((pair (assoc key alist)))
+    (if pair
+	(delq pair alist)
+      alist)))
+
+;;;###autoload
+(defun set-alist (symbol key value)
+  "Set cdr of an element (KEY . ...) in the alist bound to SYMBOL to VALUE."
+  (or (boundp symbol)
+      (set symbol nil))
+  (set symbol (put-alist key value (symbol-value symbol))))
+
+;;;###autoload
+(defun remove-alist (symbol key)
+  "Delete an element whose car equals KEY from the alist bound to SYMBOL."
+  (and (boundp symbol)
+       (set symbol (del-alist key (symbol-value symbol)))))
+
+;;;###autoload
+(defun modify-alist (modifier default)
+  "Store elements in the alist MODIFIER in the alist DEFAULT.
+Return the modified alist."
+  (mapcar (function
+	   (lambda (as)
+	     (setq default (put-alist (car as)(cdr as) default))))
+	  modifier)
+  default)
+
+;;;###autoload
+(defun set-modified-alist (symbol modifier)
+  "Store elements in the alist MODIFIER in an alist bound to SYMBOL.
+If SYMBOL is not bound, set it to nil at first."
+  (if (not (boundp symbol))
+      (set symbol nil))
+  (set symbol (modify-alist modifier (eval symbol))))
+
+
+;;; @ association-vector-list
+;;;
+
+;;;###autoload
+(defun vassoc (key avlist)
+  "Search AVLIST for an element whose first element equals KEY.
+AVLIST is a list of vectors.
+See also `assoc'."
+  (while (and avlist
+	      (not (equal key (aref (car avlist) 0))))
+    (setq avlist (cdr avlist)))
+  (and avlist
+       (car avlist)))
+
+
+;;; @ end
+;;;
+
+(require 'product)
+(product-provide (provide 'alist) (require 'apel-ver))
+
+;;; alist.el ends here
Index: xemacs-packages/apel/apel-ver.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/apel-ver.el,v
retrieving revision 1.2
diff -d -u -r1.2 apel-ver.el
--- xemacs-packages/apel/apel-ver.el	6 Dec 2005 10:47:17 -0000	1.2
+++ xemacs-packages/apel/apel-ver.el	3 Jul 2009 22:02:51 -0000
@@ -1,6 +1,6 @@
 ;;; apel-ver.el --- Declare APEL version.
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei at aqua.ocn.ne.jp>
 ;;	Keiichi Suzuki <keiichi at nanap.org>
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -43,7 +43,8 @@
   ;; (product-define "APEL" nil '(10 3))	; Released 30 December 2000
   ;; (product-define "APEL" nil '(10 4))	; Released 04 October 2002
   ;; (product-define "APEL" nil '(10 5))	; Released 06 June 2003
-  (product-define "APEL" nil '(10 6))		; Released 05 July 2003
+  ;; (product-define "APEL" nil '(10 6))	; Released 05 July 2003
+  (product-define "APEL" nil '(10 7))
   )
 
 (defun apel-version ()
Index: xemacs-packages/apel/atype.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/atype.el,v
retrieving revision 1.5
diff -d -u -r1.5 atype.el
--- xemacs-packages/apel/atype.el	6 Dec 2005 10:47:17 -0000	1.5
+++ xemacs-packages/apel/atype.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/broken.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/broken.el,v
retrieving revision 1.5
diff -d -u -r1.5 broken.el
--- xemacs-packages/apel/broken.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/broken.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/calist.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/calist.el,v
retrieving revision 1.3
diff -d -u -r1.3 calist.el
--- xemacs-packages/apel/calist.el	10 Jul 2000 04:41:04 -0000	1.3
+++ xemacs-packages/apel/calist.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,7 +48,7 @@
 	      (if (intern-soft (symbol-name sym)
 			       calist-field-match-method-obarray)
 		  (signal 'conflict-of-calist-symbol
-			  (list (format "Conflict of symbol %s")))
+			  (list (format "Conflict of symbol %s" sym)))
 		(if (fboundp sym)
 		    (define-calist-field-match-method
 		      sym (symbol-function sym))
Index: xemacs-packages/apel/emu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/emu.el,v
retrieving revision 1.9
diff -d -u -r1.9 emu.el
--- xemacs-packages/apel/emu.el	6 Dec 2005 10:47:18 -0000	1.9
+++ xemacs-packages/apel/emu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/file-detect.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/file-detect.el,v
retrieving revision 1.5
diff -d -u -r1.5 file-detect.el
--- xemacs-packages/apel/file-detect.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/file-detect.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/filename.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/filename.el,v
retrieving revision 1.4
diff -d -u -r1.4 filename.el
--- xemacs-packages/apel/filename.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/filename.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -34,8 +34,8 @@
   "Apply initial ARGUMENT to sequence of FUNCTIONS.
 FUNCTIONS is list of functions.
 
-(poly-funcall '(f1 f2 .. fn) arg) is as same as
-(fn .. (f2 (f1 arg)) ..).
+\(poly-funcall '(f1 f2 .. fn) arg) is as same as
+\(fn .. (f2 (f1 arg)) ..).
 
 For example, (poly-funcall '(car number-to-string) '(100)) returns
 \"100\"."
@@ -71,7 +71,7 @@
 Moreover, if you want to convert Japanese filename to roman string by kakasi,
 
 \(if \(exec-installed-p \"kakasi\"\)
-    \(setq file-name-filters
+    \(setq filename-filters
 	  \(append '\(filename-japanese-to-roman-string\) filename-filters\)\)\)")
 
 ;;; @ filters
@@ -91,26 +91,40 @@
   (let ((code (char-int character)))
     (or (< code 32)(= code 127))))
 
+(eval-when-compile
+  (defmacro filename-special-filter-1 (string)
+    (let (sref inc-i)
+      (if (or (not (fboundp 'sref))
+	      (>= emacs-major-version 21)
+	      (and (= emacs-major-version 20)
+		   (>= emacs-minor-version 3)))
+	  (setq sref 'aref
+		inc-i '(1+ i))
+	(setq sref 'aref
+	      inc-i '(+ i (char-length chr))))
+      (` (let ((len (length (, string)))
+	       (b 0)(i 0)
+	       (dest ""))
+	   (while (< i len)
+	     (let ((chr ((, sref) (, string) i))
+		   (lst filename-replacement-alist)
+		   ret)
+	       (while (and lst (not ret))
+		 (if (if (functionp (car (car lst)))
+			 (setq ret (funcall (car (car lst)) chr))
+		       (setq ret (memq chr (car (car lst)))))
+		     t			; quit this loop.
+		   (setq lst (cdr lst))))
+	       (if ret
+		   (setq dest (concat dest (substring (, string) b i)
+				      (cdr (car lst)))
+			 i (, inc-i)
+			 b i)
+		 (setq i (, inc-i)))))
+	   (concat dest (substring (, string) b)))))))
+
 (defun filename-special-filter (string)
-  (let ((len (length string))
-	(b 0)(i 0)
-	(dest ""))
-    (while (< i len)
-      (let ((chr (sref string i))
-            (lst filename-replacement-alist)
-            ret)
-        (while (and lst (not ret))
-          (if (if (functionp (car (car lst)))
-                  (setq ret (funcall (car (car lst)) chr))
-                (setq ret (memq chr (car (car lst)))))
-              t                         ; quit this loop.
-            (setq lst (cdr lst))))
-	(if ret
-	    (setq dest (concat dest (substring string b i)(cdr (car lst)))
-		  i (+ i (char-length chr))
-		  b i)
-	  (setq i (+ i (char-length chr))))))
-    (concat dest (substring string b))))
+  (filename-special-filter-1 string))
 
 (defun filename-eliminate-top-low-lines (string)
   (if (string-match "^_+" string)
Index: xemacs-packages/apel/install.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/install.el,v
retrieving revision 1.6
diff -d -u -r1.6 install.el
--- xemacs-packages/apel/install.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/install.el	3 Jul 2009 22:02:51 -0000
@@ -1,8 +1,9 @@
 ;;; install.el --- Emacs Lisp package install utility
 
-;; Copyright (C) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+;; 	Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka at jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Created: 1996/08/18
 ;; Keywords: install, byte-compile, directory detection
 
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -158,6 +159,9 @@
     ;; v18 does not have standard site directory.
     "local.lisp"))
 
+;; Avoid compile warning.
+(eval-when-compile (autoload 'replace-in-string "subr"))
+
 (defun install-detect-elisp-directory (&optional prefix elisp-prefix
 						 allow-version-specific)
   (or prefix
@@ -165,28 +169,36 @@
   (or elisp-prefix
       (setq elisp-prefix install-elisp-prefix))
   (or (catch 'tag
-	(let ((rest default-load-path)
-	      (regexp (concat "^"
-			      ;; XEmacs change: handle backslashes (Windows)
-			      (regexp-quote (replace-in-string
-					     (file-name-as-directory
-					      (expand-file-name elisp-prefix))
-					     "\\\\" "/"))
-			      ".*/"
-			      (regexp-quote
-			       (replace-in-string prefix "\\\\" "/"))
-			      "/?$")))
+	(let ((rest (delq nil (copy-sequence default-load-path)))
+	      (regexp
+	       (concat "^"
+		       (regexp-quote (if (featurep 'xemacs)
+					 ;; Handle backslashes (Windows)
+					 (replace-in-string
+					  (file-name-as-directory
+					   (expand-file-name prefix))
+					  "\\\\" "/")
+				       (file-name-as-directory
+					(expand-file-name prefix))))
+		       ".*/"
+		       (regexp-quote
+			(if (featurep 'xemacs)
+			    ;; Handle backslashes (Windows)
+			    (replace-in-string elisp-prefix "\\\\" "/")
+			  elisp-prefix))
+		       "/?$"))
+	      dir)
 	  (while rest
-	    ;; XEmacs change: handle backslashes (Windows)
-	    (if (string-match regexp
-			      (replace-in-string (car rest) "\\\\" "/"))
+	    (setq dir (if (featurep 'xemacs)
+			  ;; Handle backslashes (Windows)
+			  (replace-in-string (car rest) "\\\\" "/")
+			(car rest)))
+	    (if (string-match regexp dir)
 		(if (or allow-version-specific
 			(not (string-match (format "/%d\\.%d"
 						   emacs-major-version
 						   emacs-minor-version)
-					   ;; XEmacs change: handle backslashes
-					   (replace-in-string (car rest)
-							      "\\\\" "/"))))
+					   dir)))
 		    (throw 'tag (car rest))))
 	    (setq rest (cdr rest)))))
       (expand-file-name (concat (if (and (not (featurep 'xemacs))
@@ -215,6 +227,32 @@
 ;;; @ for XEmacs package system
 ;;;
 
+(defun install-get-default-package-directory ()
+  (let ((dirs (append
+	       (cond
+		((boundp 'early-package-hierarchies)
+		 (append (if early-package-load-path
+			     early-package-hierarchies)
+			 (if late-package-load-path
+			     late-package-hierarchies)
+			 (if last-package-load-path
+			     last-package-hierarchies)) )
+		((boundp 'early-packages)
+		 (append (if early-package-load-path
+			     early-packages)
+			 (if late-package-load-path
+			     late-packages)
+			 (if last-package-load-path
+			     last-packages)) ))
+	       (if (and (boundp 'configure-package-path)
+			(listp configure-package-path))
+		   (delete "" configure-package-path))))
+	dir)
+    (while (and (setq dir (car dirs))
+		(not (file-exists-p dir)))
+      (setq dirs (cdr dirs)))
+    dir))
+
 (defun install-update-package-files (package dir &optional just-print)
   (cond
    (just-print
@@ -233,10 +271,13 @@
     (princ (format "Wrote %s\n"
 		   (expand-file-name "custom-load.elc" dir))))
    (t
-    (setq autoload-package-name package)
-
-    (let ((command-line-args-left (list dir)))
-      (batch-update-directory))
+    (if (fboundp 'batch-update-directory-autoloads)
+	;; XEmacs 21.5.19 and newer.
+	(let ((command-line-args-left (list package dir)))
+	  (batch-update-directory-autoloads))
+      (setq autoload-package-name package)
+      (let ((command-line-args-left (list dir)))
+	(batch-update-directory)))
 
     (let ((command-line-args-left (list dir)))
       (Custom-make-dependencies))
Index: xemacs-packages/apel/inv-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/inv-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 inv-xemacs.el
--- xemacs-packages/apel/inv-xemacs.el	10 Jul 2000 04:41:04 -0000	1.2
+++ xemacs-packages/apel/inv-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/invisible.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/invisible.el,v
retrieving revision 1.2
diff -d -u -r1.2 invisible.el
--- xemacs-packages/apel/invisible.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/invisible.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcharset.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcharset.el,v
retrieving revision 1.4
diff -d -u -r1.4 mcharset.el
--- xemacs-packages/apel/mcharset.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/mcharset.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-20.el,v
retrieving revision 1.6
diff -d -u -r1.6 mcs-20.el
--- xemacs-packages/apel/mcs-20.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/mcs-20.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mcs-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-ltn1.el,v
retrieving revision 1.3
diff -d -u -r1.3 mcs-ltn1.el
--- xemacs-packages/apel/mcs-ltn1.el	6 Dec 2005 10:47:18 -0000	1.3
+++ xemacs-packages/apel/mcs-ltn1.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-xmu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-xmu.el,v
retrieving revision 1.1
diff -d -u -r1.1 mcs-xmu.el
--- xemacs-packages/apel/mcs-xmu.el	10 Jul 2000 04:41:05 -0000	1.1
+++ xemacs-packages/apel/mcs-xmu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mule-caesar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mule-caesar.el,v
retrieving revision 1.4
diff -d -u -r1.4 mule-caesar.el
--- xemacs-packages/apel/mule-caesar.el	10 Jul 2000 04:41:05 -0000	1.4
+++ xemacs-packages/apel/mule-caesar.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/path-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/path-util.el,v
retrieving revision 1.5
diff -d -u -r1.5 path-util.el
--- xemacs-packages/apel/path-util.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/path-util.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl-20.el,v
retrieving revision 1.4
diff -d -u -r1.4 pccl-20.el
--- xemacs-packages/apel/pccl-20.el	14 Aug 2007 21:23:02 -0000	1.4
+++ xemacs-packages/apel/pccl-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl.el,v
retrieving revision 1.6
diff -d -u -r1.6 pccl.el
--- xemacs-packages/apel/pccl.el	14 Aug 2007 21:23:02 -0000	1.6
+++ xemacs-packages/apel/pccl.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; ##### Much of the logic here is flawed in the context of XEmacs
 ;;; packages.  All the static-if and broken-facility stuff is evaluated at
Index: xemacs-packages/apel/pces-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-20.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-20.el
--- xemacs-packages/apel/pces-20.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pces-raw.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-raw.el,v
retrieving revision 1.3
diff -d -u -r1.3 pces-raw.el
--- xemacs-packages/apel/pces-raw.el	10 Jul 2000 04:41:05 -0000	1.3
+++ xemacs-packages/apel/pces-raw.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xfc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xfc.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xfc.el
--- xemacs-packages/apel/pces-xfc.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xfc.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xm.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xm.el
--- xemacs-packages/apel/pces-xm.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xm.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces.el
--- xemacs-packages/apel/pces.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pcustom.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pcustom.el,v
retrieving revision 1.2
diff -d -u -r1.2 pcustom.el
--- xemacs-packages/apel/pcustom.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/pcustom.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/poe-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 poe-xemacs.el
--- xemacs-packages/apel/poe-xemacs.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/poe-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -82,33 +82,113 @@
 ;;;
 
 (condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
     (require 'timer)
-  (error
+  (error nil))
+(or
+ (or (featurep 'timer-funcs) (featurep 'timer))
+ (progn
    (require 'itimer)
-   (defun-maybe run-at-time (time repeat function &rest args)
-     (start-itimer (make-temp-name "rat")
-		   `(lambda ()
-		      (,function , at args))
-		   time repeat))
+   (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+       (defun-maybe run-at-time (time repeat function &rest args)
+	 (start-itimer (make-temp-name "rat")
+		       `(lambda ()
+			  (,function , at args))
+		       time repeat))
+     (defun-maybe run-at-time (time repeat function &rest args)
+       "Function emulating the function of the same name of Emacs.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+       (apply #'start-itimer "run-at-time"
+	      function (if time (max time 1e-9) 1e-9)
+	      repeat nil t args)))
    (defalias 'cancel-timer 'delete-itimer)
    (defun with-timeout-handler (tag)
      (throw tag 'timeout))
    (defmacro-maybe with-timeout (list &rest body)
      (let ((seconds (car list))
 	   (timeout-forms (cdr list)))
-     `(let ((with-timeout-tag (cons nil nil))
-	    with-timeout-value with-timeout-timer)
-	(if (catch with-timeout-tag
-	      (progn
-		(setq with-timeout-timer
-		      (run-at-time ,seconds nil
-				   'with-timeout-handler
-				   with-timeout-tag))
-		(setq with-timeout-value (progn . ,body))
-		nil))
-	    (progn . ,timeout-forms)
-	  (cancel-timer with-timeout-timer)
-	  with-timeout-value))))))
+       `(let ((with-timeout-tag (cons nil nil))
+	      with-timeout-value with-timeout-timer)
+	  (if (catch with-timeout-tag
+		(progn
+		  (setq with-timeout-timer
+			(run-at-time ,seconds nil
+				     'with-timeout-handler
+				     with-timeout-tag))
+		  (setq with-timeout-value (progn . ,body))
+		  nil))
+	      (progn . ,timeout-forms)
+	    (cancel-timer with-timeout-timer)
+	    with-timeout-value))))))
+
+(require 'broken)
+
+(broken-facility run-at-time-tick-tock
+  "`run-at-time' is not punctual."
+  ;; Note that it doesn't support XEmacsen prior to the version 19.15
+  ;; since `start-itimer' doesn't pass arguments to a timer function.
+  (or (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+      (condition-case nil
+	  (progn
+	    (unless (or itimer-process itimer-timer)
+	      (itimer-driver-start))
+	    ;; Check whether there is a bug to which the difference of
+	    ;; the present time and the time when the itimer driver was
+	    ;; woken up is subtracted from the initial itimer value.
+	    (let* ((inhibit-quit t)
+		   (ctime (current-time))
+		   (itimer-timer-last-wakeup
+		    (prog1
+			ctime
+		      (setcar ctime (1- (car ctime)))))
+		   (itimer-list nil)
+		   (itimer (start-itimer "run-at-time" 'ignore 5)))
+	      (sleep-for 0.1) ;; Accept the timeout interrupt.
+	      (prog1
+		  (> (itimer-value itimer) 0)
+		(delete-itimer itimer))))
+	(error nil))))
+
+(when-broken run-at-time-tick-tock
+  (defalias 'run-at-time
+    (lambda (time repeat function &rest args)
+      "Function emulating the function of the same name of Emacs.
+It works correctly for TIME even if there is a bug in the XEmacs core.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+      (let ((itimers (list nil)))
+	(setcar
+	 itimers
+	 (apply #'start-itimer "fixed-run-at-time"
+		(lambda (itimers repeat function &rest args)
+		  (let ((itimer (car itimers)))
+		    (if repeat
+			(progn
+			  (set-itimer-function
+			   itimer
+			   (lambda (itimer repeat function &rest args)
+			     (set-itimer-restart itimer repeat)
+			     (set-itimer-function itimer function)
+			     (set-itimer-function-arguments itimer args)
+			     (apply function args)))
+			  (set-itimer-function-arguments
+			   itimer
+			   (append (list itimer repeat function) args)))
+		      (set-itimer-function
+		       itimer
+		       (lambda (itimer function &rest args)
+			 (delete-itimer itimer)
+			 (apply function args)))
+		      (set-itimer-function-arguments
+		       itimer
+		       (append (list itimer function) args)))))
+		1e-9 (if time (max time 1e-9) 1e-9)
+		nil t itimers repeat function args))))))
 
 
 ;;; @ to avoid bug of XEmacs 19.14
Index: xemacs-packages/apel/poe.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe.el,v
retrieving revision 1.7
diff -d -u -r1.7 poe.el
--- xemacs-packages/apel/poe.el	6 Dec 2005 10:47:18 -0000	1.7
+++ xemacs-packages/apel/poe.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -1523,20 +1523,62 @@
 			 ls (- ls 65536))))
 	    (setq time (append (list ms ls) (nth 2 time))))))))
 
-;; Emacs 20.1/XEmacs 20.3(?) and later: (split-string STRING &optional PATTERN)
-;; Here is a XEmacs version.
-(defun-maybe split-string (string &optional pattern)
-  "Return a list of substrings of STRING which are separated by PATTERN.
-If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
-  (or pattern
-      (setq pattern "[ \f\t\n\r\v]+"))
-  ;; The FSF version of this function takes care not to cons in case
-  ;; of infloop.  Maybe we should synch?
-  (let (parts (start 0))
-    (while (string-match pattern string start)
-      (setq parts (cons (substring string start (match-beginning 0)) parts)
-	    start (match-end 0)))
-    (nreverse (cons (substring string start) parts))))
+(defconst-maybe split-string-default-separators "[ \f\t\n\r\v]+"
+  "The default value of separators for `split-string'.
+
+A regexp matching strings of whitespace.  May be locale-dependent
+\(as yet unimplemented).  Should not match non-breaking spaces.
+
+Warning: binding this to a different value and using it as default is
+likely to have undesired semantics.")
+
+;; Here is a Emacs 22 version. OMIT-NULLS
+(defun-maybe split-string (string &optional separators omit-nulls)
+  "Split STRING into substrings bounded by matches for SEPARATORS.
+
+The beginning and end of STRING, and each match for SEPARATORS, are
+splitting points.  The substrings matching SEPARATORS are removed, and
+the substrings between the splitting points are collected as a list,
+which is returned.
+
+If SEPARATORS is non-nil, it should be a regular expression matching text
+which separates, but is not part of, the substrings.  If nil it defaults to
+`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
+OMIT-NULLS is forced to t.
+
+If OMIT-NULLS is t, zero-length substrings are omitted from the list \(so
+that for the default value of SEPARATORS leading and trailing whitespace
+are effectively trimmed).  If nil, all zero-length substrings are retained,
+which correctly parses CSV format, for example.
+
+Note that the effect of `(split-string STRING)' is the same as
+`(split-string STRING split-string-default-separators t)').  In the rare
+case that you wish to retain zero-length substrings when splitting on
+whitespace, use `(split-string STRING split-string-default-separators)'.
+
+Modifies the match data; use `save-match-data' if necessary."
+  (let ((keep-nulls (not (if separators omit-nulls t)))
+	(rexp (or separators split-string-default-separators))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< start (length string)))
+      (setq notfirst t)
+      (if (or keep-nulls (< start (match-beginning 0)))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (if (or keep-nulls (< start (length string)))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
 

 
 ;;; @ Window commands emulation. (lisp/window.el)
Index: xemacs-packages/apel/poem-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-ltn1.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-ltn1.el
--- xemacs-packages/apel/poem-ltn1.el	24 Mar 2002 20:52:46 -0000	1.4
+++ xemacs-packages/apel/poem-ltn1.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/poem-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-xm.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-xm.el
--- xemacs-packages/apel/poem-xm.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/poem-xm.el	3 Jul 2009 22:02:52 -0000
@@ -1,6 +1,6 @@
 ;;; poem-xm.el --- poem module for XEmacs-mule; -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2002,2003,2005 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Keywords: emulation, compatibility, Mule
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -68,9 +68,14 @@
   "Return index of character succeeding CHAR whose index is INDEX."
   `(1+ ,index))
 
-(defun-maybe char-length (char)
-  "Return indexing length of multi-byte form of CHAR."
-  1)
+(if (not (fboundp 'char-length))
+    (defalias 'char-length
+      (lambda (char)
+	"Return number of bytes a CHARACTER occupies in a string or buffer.
+It always returns 1 in XEmacs.  It is for compatibility with MULE 2.3."
+	1)))
+
+(defalias-maybe 'char-valid-p 'characterp)
 
 
 ;;; @ string
Index: xemacs-packages/apel/poem.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem.el,v
retrieving revision 1.5
diff -d -u -r1.5 poem.el
--- xemacs-packages/apel/poem.el	6 Oct 2000 08:33:45 -0000	1.5
+++ xemacs-packages/apel/poem.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -77,9 +77,15 @@
 
 (defalias-maybe 'int-char 'identity)
 
-(defalias-maybe 'characterp 'integerp)
+(defalias-maybe 'characterp
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(defalias-maybe 'char-or-char-int-p
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
 (defun-maybe char-octet (ch &optional n)
   "Return the octet numbered N (should be 0 or 1) of char CH.
Index: xemacs-packages/apel/product.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/product.el,v
retrieving revision 1.3
diff -d -u -r1.3 product.el
--- xemacs-packages/apel/product.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/product.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pym.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pym.el,v
retrieving revision 1.2
diff -d -u -r1.2 pym.el
--- xemacs-packages/apel/pym.el	6 Dec 2005 10:47:19 -0000	1.2
+++ xemacs-packages/apel/pym.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/richtext.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/richtext.el,v
retrieving revision 1.3
diff -d -u -r1.3 richtext.el
--- xemacs-packages/apel/richtext.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/richtext.el	3 Jul 2009 22:02:52 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/static.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/static.el,v
retrieving revision 1.4
diff -d -u -r1.4 static.el
--- xemacs-packages/apel/static.el	6 Dec 2005 10:47:19 -0000	1.4
+++ xemacs-packages/apel/static.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 

xemacs-packages-extra-20090624-dired-504422.patch:
 dired.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-extra-20090624-dired-504422.patch ---
Index: xemacs-packages/dired/dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired.el,v
retrieving revision 1.11
diff -d -u -r1.11 dired.el
--- xemacs-packages/dired/dired.el	13 Jan 2008 14:51:20 -0000	1.11
+++ xemacs-packages/dired/dired.el	24 Jun 2009 16:33:11 -0000
@@ -219,7 +219,7 @@
 
 ;;;###autoload
 (defcustom dired-use-ls-dired
-  (and (string-match "gnu" system-configuration)
+  (and (string-match "gnu\\|linux" system-configuration)
        ;; Only supported for XEmacs >= 21.5 and GNU Emacs >= 21.4 (I think)
        (or (and (featurep 'xemacs)
 		(fboundp 'emacs-version>=)
@@ -2849,7 +2849,7 @@
 	(if (save-excursion
 	      (goto-char bol)
 	      (re-search-forward
-	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9@]"
+	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9 at .]"
 	       bof t))
 	    (progn
 	      (setq modes-start (match-beginning 0)

xemacs-packages-extra-20090824-timer.patch:
 ChangeLog |   10 ++++++++++
 Makefile  |    2 +-
 timer.el  |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-extra-20090824-timer.patch ---
--- xemacs-packages/fsf-compat/ChangeLog	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/ChangeLog	2009-08-24 16:20:07.752947063 -0600
@@ -1,3 +1,13 @@
+2009-07-30  Norbert Koch  <viteno at xemacs.org>
+
+	* Makefile (VERSION): XEmacs package 1.18 released.
+
+2009-07-30  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* timer.el (timer-set-idle-time): Use right type of argument to
+	set-itimer-restart.  Fixes issue547.
+	Thanks to the anonymous reporter.
+
 2008-04-14  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.17 released.
--- xemacs-packages/fsf-compat/Makefile	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/Makefile	2009-08-24 16:19:49.650969431 -0600
@@ -19,7 +19,7 @@
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.17
+VERSION = 1.18
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = fsf-compat
--- xemacs-packages/fsf-compat/timer.el	2004-10-22 09:23:00.000000000 -0600
+++ xemacs-packages/fsf-compat/timer.el	2009-08-24 16:19:49.652131279 -0600
@@ -65,7 +65,7 @@
   (set-itimer-is-idle timer t)
   (set-itimer-value timer secs)
   (when repeat
-    (set-itimer-restart timer repeat))
+    (set-itimer-restart timer secs))
   timer)
 
 ;; timer-next-integral-multiple-of-time and timer-relative-time have moved


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xemacs-packages-extra.spec	27 Jul 2009 07:46:46 -0000	1.10
+++ xemacs-packages-extra.spec	3 Sep 2009 22:06:11 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -31,6 +31,12 @@ Patch4:         %{name}-20090217-auctex-
 Patch5:         %{name}-20060510-egg-wnn-host-unix-79826.patch
 Patch6:         %{name}-20090217-browsers.patch
 Patch8:         %{name}-20060510-avoid-catch-error-65346.patch
+# This patch has been applied upstream
+Patch9:         %{name}-20090624-apel-503185.patch
+# This patch has been applied upstream
+Patch10:        %{name}-20090624-dired-504422.patch
+# This patch has been applied upstream
+Patch11:        %{name}-20090824-timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -100,6 +106,12 @@ collection in GNU texinfo format
 %patch6 -p1
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch8 -p1
+# upgrade to a newer APEL (needed by some external packages)
+%patch9
+# fix "no file at point" errors in dired
+%patch10
+# fix a parameter gaffe in the timer code
+%patch11
 
 chmod -c -x \
     xemacs-packages/auctex/style/babel.el \
@@ -229,6 +241,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
+- Update APEL to a newer version (bz 503185).
+- Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).
+- Fix a known timer bug.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090217-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjames at fedoraproject.org  Thu Sep  3 22:06:11 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu,  3 Sep 2009 22:06:11 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-11
	xemacs-packages-extra-20090624-apel-503185.patch, NONE,
	1.1 xemacs-packages-extra-20090624-dired-504422.patch, NONE,
	1.1 xemacs-packages-extra-20090824-timer.patch, NONE,
	1.1 xemacs-packages-extra.spec, 1.9, 1.10
Message-ID: <20090903220611.5A4D011C0099@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32612/F-11

Modified Files:
	xemacs-packages-extra.spec 
Added Files:
	xemacs-packages-extra-20090624-apel-503185.patch 
	xemacs-packages-extra-20090624-dired-504422.patch 
	xemacs-packages-extra-20090824-timer.patch 
Log Message:
* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
- Update APEL to a newer version (bz 503185).
- Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).
- Fix a known timer bug.


xemacs-packages-extra-20090624-apel-503185.patch:
 ChangeLog          |    4 +
 ChangeLog.upstream |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 Makefile           |   22 +++++---
 README.en          |   11 ----
 README.ja          |   13 -----
 alist.el           |  101 ++++++++++++++++++++++++++++++++++++++++
 apel-ver.el        |    9 ++-
 atype.el           |    4 -
 broken.el          |    4 -
 calist.el          |    6 +-
 emu.el             |    4 -
 file-detect.el     |    4 -
 filename.el        |   62 +++++++++++++++----------
 install.el         |   91 ++++++++++++++++++++++++++----------
 inv-xemacs.el      |    4 -
 invisible.el       |    4 -
 mcharset.el        |    4 -
 mcs-20.el          |    4 -
 mcs-ltn1.el        |    4 -
 mcs-xmu.el         |    4 -
 mule-caesar.el     |    4 -
 path-util.el       |    4 -
 pccl-20.el         |    4 -
 pccl.el            |    4 -
 pces-20.el         |    4 -
 pces-raw.el        |    4 -
 pces-xfc.el        |    4 -
 pces-xm.el         |    4 -
 pces.el            |    4 -
 pcustom.el         |    4 -
 poe-xemacs.el      |  122 ++++++++++++++++++++++++++++++++++++++++---------
 poe.el             |   74 +++++++++++++++++++++++------
 poem-ltn1.el       |    4 -
 poem-xm.el         |   17 ++++--
 poem.el            |   14 ++++-
 product.el         |    4 -
 pym.el             |    4 -
 richtext.el        |    4 -
 static.el          |    4 -
 39 files changed, 592 insertions(+), 185 deletions(-)

--- NEW FILE xemacs-packages-extra-20090624-apel-503185.patch ---
Index: xemacs-packages/apel/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog,v
retrieving revision 1.42
diff -d -u -r1.42 ChangeLog
--- xemacs-packages/apel/ChangeLog	15 Aug 2007 07:38:42 -0000	1.42
+++ xemacs-packages/apel/ChangeLog	3 Jul 2009 22:02:50 -0000
@@ -1,3 +1,7 @@
+2009-07-01  Jerry James  <james at xemacs.org>
+
+	* *.el, README.*, ChangeLog.upstream: Sync with 10.7.
+
 2007-08-15  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.33 released.
Index: xemacs-packages/apel/ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog.upstream,v
retrieving revision 1.1
diff -d -u -r1.1 ChangeLog.upstream
--- xemacs-packages/apel/ChangeLog.upstream	6 Dec 2005 10:47:17 -0000	1.1
+++ xemacs-packages/apel/ChangeLog.upstream	3 Jul 2009 22:02:51 -0000
@@ -1,3 +1,130 @@
+2007-02-14  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL: Version 10.7 released.
+
+	* Makefile (VERSION): Update to 10.7.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL-MK (config-apel-package): Use
+	`install-get-default-package-directory'.
+
+	* install.el (install-get-default-package-directory): New
+	function.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* apel-ver.el (apel-ver): Change APEL version to 10.7.
+
+2005-05-08  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* poem-xm.el (char-valid-p): New alias.
+
+2006-12-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Avoid an error concerning
+	PACKAGEDIR with old XEmacs that doesn't use the package system.
+
+2006-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-update-package-files): Use
+	batch-update-directory-autoloads if it is available instead of
+	batch-update-directory.
+
+2006-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Check for
+	(early|late|last)-package-hierarchies and configure-package-path
+	as well as (early|late|last)-packages.
+
+2006-11-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* time-stamp.el: Remove.  Suggested by Stephen Gildea, the
+	maintainer of time-stamp.el.
+
+	* EMU-ELS (emu-modules): Exclude it.
+
+	* README.en, README.ja: Remove time-stamp.el entry.
+
+2006-04-24  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-detect-elisp-directory): Fix 2002-11-29
+	change; assume default-load-path contains nil; use regexp-quote to
+	compare directories even in Emacs.
+
+2005-12-06  Ville Skytt?  <scop at xemacs.org>
+
+	* poe.el (minor-mode-overriding-map-alist): Doc fix.
+
+	* product.el (product-version-as-string): Doc fix.
+
+2002-11-29  Ben Wing  <ben at xemacs.org>
+
+	* install.el (install-detect-elisp-directory): Fix problems
+	handling backslashes in filenames (Windows).
+
+2005-06-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* filename.el (filename-special-filter-1): New macro defined for
+	filename-special-filter to use aref instead of sref for the recent
+	Emacsen.
+	(filename-special-filter): Use it.
+
+2005-06-05  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
+
+2005-05-10  TAKAHASHI Kaoru  <kaoru at kaisei.org>
+
+	* poe.el (split-string): Import from Emacs 22. Add omit-nulls
+	argument.
+
+2005-05-03  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poem.el (characterp): Use `char-valid-p' if it exists.
+	* poem.el (char-or-char-int-p): Ditto.
+
+2005-02-23  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Attempt to load `timer-funcs'
+	before `timer'.
+
+2004-09-27  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* README.en, README.ja (CVS): Remove the description about
+	developers' pserver access.
+
+2004-02-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* calist.el (use-calist-package): Add missing arg to `format'.
+
+2004-01-26  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* Makefile: Make `elc' into the default entry.
+
+2004-01-07  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Don't use `defadvice' in order to
+	avoid a conflict with the Gnus version.
+
+2003-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Fully implement it for the recent
+	XEmacsen when the fsf-compat package is not available.
+	(run-at-time-tick-tock): Check closely whether a bug is in
+	`start-itimer'.
+
+2003-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Redefine it to make it punctual.
+
+2003-09-05  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poem-xm.el (char-length): Don't use `defun-maybe' to define it
+	since this module may be installed as the XEmacs package which
+	should be usable by all the XEmacs 21.x series.
+
+

 2003-07-05  Yuuichi Teranishi  <teranisi at gohome.org>
 
 	* APEL: Version 10.6 released.
@@ -278,7 +405,7 @@
 	(minor-mode-map-alist): Ditto.
 
 	* README.en ((d) make.bat (for MS-DOS family)): New section.
-	* README.ja ((d) make.bat $B$rMxMQ$9$k(B (MS-DOS $B7O(B OS $B$N>l9g(B)):
+	* README.ja ((d) make.bat $(B$rMxMQ$9$k(B (MS-DOS $(B7O(B OS $(B$N>l9g(B)):
 	Ditto.
 
 2000-12-22  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
@@ -3064,7 +3191,7 @@
 
 	* APEL: Version 8.4 was released.
 
-	* EMU-ELS: Don't use HIRAGANA LETTER A ($B$"(B) to detect character
+	* EMU-ELS: Don't use HIRAGANA LETTER A ($(B$"(B) to detect character
  	indexing (Emacs 20.3 or later).
 
 1998-04-20  MORIOKA Tomohiko  <morioka at jaist.ac.jp>
Index: xemacs-packages/apel/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/Makefile,v
retrieving revision 1.43
diff -d -u -r1.43 Makefile
--- xemacs-packages/apel/Makefile	15 Aug 2007 07:38:42 -0000	1.43
+++ xemacs-packages/apel/Makefile	3 Jul 2009 22:02:51 -0000
@@ -18,7 +18,7 @@
 # Boston, MA  02110-1301  USA
 
 VERSION = 1.33
-AUTHOR_VERSION = 10.6
+AUTHOR_VERSION = 10.7
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = apel
 PKG_TYPE = regular
@@ -27,22 +27,26 @@
 
 include ../../Local.rules.inc
 
-ELCS = apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
+ELCS = alist.elc apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
 	install.elc inv-xemacs.elc invisible.elc mcharset.elc \
-	mcs-20.elc mcs-ltn1.elc mule-caesar.elc path-util.elc \
-	pccl.elc poe-xemacs.elc poe.elc poem-ltn1.elc poem-xm.elc \
-	poem.elc product.elc pym.elc richtext.elc static.elc \
-	pcustom.elc pces.elc pces-raw.elc pces-20.elc pces-xfc.elc \
-	atype.elc file-detect.elc
+	mule-caesar.elc path-util.elc pccl.elc pces-20.elc pces-xfc.elc \
+	pces.elc pcustom.elc poe-xemacs.elc poe.elc poem.elc product.elc \
+	pym.elc richtext.elc static.elc
 
 ## The following files are no longer in upstream apel, but tm needs them.
 ELCS += std11.elc std11-parse.elc
 
+## The following files are considered obsolete, but bbdb-rmail needs them.
+ELCS += atype.elc file-detect.elc
+
+## The following files are only needed for non-MULE XEmacsen.
+ELCS += mcs-ltn1.elc poem-ltn1.elc
+
 EXTRA_SOURCES = README.en ChangeLog.upstream
 
 ifeq ($(BUILD_WITHOUT_MULE),)
-# ELCS += emu-x20.elc
-ELCS += mcs-xm.elc pccl-20.elc pces-xm.elc mcs-xmu.elc
+ELCS += mcs-20.elc mcs-xm.elc mcs-xmu.elc pccl-20.elc \
+	pces-raw.elc pces-xm.elc poem-xm.elc
 EXTRA_SOURCES += README.ja
 endif
 
Index: xemacs-packages/apel/README.en
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.en,v
retrieving revision 1.4
diff -d -u -r1.4 README.en
--- xemacs-packages/apel/README.en	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.en	3 Jul 2009 22:02:51 -0000
@@ -99,11 +99,6 @@
 
   tinycustom.el --- emulation module of custom.el
 
-** time-stamp.el
-
-This is a utility to maintain last change time stamps in files edited
-by Emacs.
-
 ** timezone.el
 
 This is a utility of time zone.  This is a Y2K fixed version.   This
@@ -242,7 +237,7 @@
 to really regularize eol codes to CRLF.  If you need further
 information, see the following URL (n.b. Japanese only)
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 * load-path (for Emacs or MULE)
 
@@ -493,9 +488,5 @@
 
 with your account name and your public key for ssh.  cvsroot is
 :ext:cvs at cvs.m17n.org:/cvs/root.
-
-If you cannot use ssh, please send UNIX /etc/passwd style crypted
-password.  you can commit with the cvsroot
-:pserver:<accountname>@cvs.m17n.org:/cvs/root.
 
 We hope you will join the open development.
Index: xemacs-packages/apel/README.ja
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.ja,v
retrieving revision 1.4
diff -d -u -r1.4 README.ja
--- xemacs-packages/apel/README.ja	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.ja	3 Jul 2009 22:02:51 -0000
@@ -95,10 +95,6 @@
 
   tinycustom.el --- custom.el $B$N%(%_%e%l!<%7%g%s$r9T$J$&(B
 
-** time-stamp.el
-
-Emacs $B$K$h$kJT=8$N:]!":G=*=$@5;~9o$rJ]B8$9$k$?$a$N%f!<%F%#%j%F%#!#(B
-
 ** timezone.el
 
 $B%?%$%`%>!<%s%f!<%F%#%j%F%#!#(B2000 $BG/LdBjBP1~HG!#(BEmacs 18 $B$H(B GNUS 3.14.4
@@ -229,7 +225,7 @@
 
 $B>e5-$NNc$G$O!"(Bmeadow $B$N%P%$%J%j$,(B c:\usr\Meadow\1.10\bin\meadow95.exe
 $B$K%$%s%9%H!<%k$5$l$F$$$k$3$H$rA0Ds$K$7$F$$$^$9!#$=$NA0Ds$K4p$E$-!"(BAPEL
-$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B 
+$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B
 
   c:\usr\Meadow\site-lisp
 
@@ -311,7 +307,7 @@
 $B$-$^$;$s$N$G9TKv%3!<%I$r(B CRLF $B$K=$@5$7$F$*;H$$2<$5$$!#$3$NLdBj$K$D$$$F(B
 $B>\$7$/$O!"(B
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 $B$r$4;2>H2<$5$$!#(B
 
@@ -585,10 +581,5 @@
 
 $B$K%"%+%&%s%HL>$H!"(Bssh $B$N8x3+80$rAw$C$F$/$@$5$$!#(Bssh $B7PM3$G$O!"(Bcvsroot
 $B$O(B :ext:cvs at cvs.m17n.org:/cvs/root $B$H$J$j$^$9!#(B
-
-$B$I$&$7$F$b(B ssh $B$,;H$($J$$>l9g!"(Bpserver $B7PM3$G$b3+H/$K;22C$G$-$^$9!#$3(B
-$B$N>l9g!"(BUNIX $B$N(B /etc/passwd $BMM<0$G0E9f2=$5$l$?%Q%9%o!<%I$rAw$C$F2<$5$$!#(B
-$B$3$N>l9g(B cvsroot $B$O(B :pserver:<$B%"%+%&%s%HL>(B>@cvs.m17n.org:/cvs/root $B$H(B
-$B$J$j$^$9!#(B
 
 $B3+$+$l$?3+H/$K;22C$7$F$/$@$5$k$3$H$r4|BT$7$^$9!#(B
Index: xemacs-packages/apel/alist.el
===================================================================
RCS file: xemacs-packages/apel/alist.el
diff -N xemacs-packages/apel/alist.el
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-packages/apel/alist.el	3 Jul 2009 22:02:51 -0000
@@ -0,0 +1,101 @@
+;;; alist.el --- utility functions for association list
+
+;; Copyright (C) 1993,1994,1995,1996,1998,2000 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
+;; Keywords: alist
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+;;;###autoload
+(defun put-alist (key value alist)
+  "Set cdr of an element (KEY . ...) in ALIST to VALUE and return ALIST.
+If there is no such element, create a new pair (KEY . VALUE) and
+return a new alist whose car is the new pair and cdr is ALIST."
+  (let ((elm (assoc key alist)))
+    (if elm
+	(progn
+	  (setcdr elm value)
+	  alist)
+      (cons (cons key value) alist))))
+
+;;;###autoload
+(defun del-alist (key alist)
+  "Delete an element whose car equals KEY from ALIST.
+Return the modified ALIST."
+  (let ((pair (assoc key alist)))
+    (if pair
+	(delq pair alist)
+      alist)))
+
+;;;###autoload
+(defun set-alist (symbol key value)
+  "Set cdr of an element (KEY . ...) in the alist bound to SYMBOL to VALUE."
+  (or (boundp symbol)
+      (set symbol nil))
+  (set symbol (put-alist key value (symbol-value symbol))))
+
+;;;###autoload
+(defun remove-alist (symbol key)
+  "Delete an element whose car equals KEY from the alist bound to SYMBOL."
+  (and (boundp symbol)
+       (set symbol (del-alist key (symbol-value symbol)))))
+
+;;;###autoload
+(defun modify-alist (modifier default)
+  "Store elements in the alist MODIFIER in the alist DEFAULT.
+Return the modified alist."
+  (mapcar (function
+	   (lambda (as)
+	     (setq default (put-alist (car as)(cdr as) default))))
+	  modifier)
+  default)
+
+;;;###autoload
+(defun set-modified-alist (symbol modifier)
+  "Store elements in the alist MODIFIER in an alist bound to SYMBOL.
+If SYMBOL is not bound, set it to nil at first."
+  (if (not (boundp symbol))
+      (set symbol nil))
+  (set symbol (modify-alist modifier (eval symbol))))
+
+
+;;; @ association-vector-list
+;;;
+
+;;;###autoload
+(defun vassoc (key avlist)
+  "Search AVLIST for an element whose first element equals KEY.
+AVLIST is a list of vectors.
+See also `assoc'."
+  (while (and avlist
+	      (not (equal key (aref (car avlist) 0))))
+    (setq avlist (cdr avlist)))
+  (and avlist
+       (car avlist)))
+
+
+;;; @ end
+;;;
+
+(require 'product)
+(product-provide (provide 'alist) (require 'apel-ver))
+
+;;; alist.el ends here
Index: xemacs-packages/apel/apel-ver.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/apel-ver.el,v
retrieving revision 1.2
diff -d -u -r1.2 apel-ver.el
--- xemacs-packages/apel/apel-ver.el	6 Dec 2005 10:47:17 -0000	1.2
+++ xemacs-packages/apel/apel-ver.el	3 Jul 2009 22:02:51 -0000
@@ -1,6 +1,6 @@
 ;;; apel-ver.el --- Declare APEL version.
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei at aqua.ocn.ne.jp>
 ;;	Keiichi Suzuki <keiichi at nanap.org>
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -43,7 +43,8 @@
   ;; (product-define "APEL" nil '(10 3))	; Released 30 December 2000
   ;; (product-define "APEL" nil '(10 4))	; Released 04 October 2002
   ;; (product-define "APEL" nil '(10 5))	; Released 06 June 2003
-  (product-define "APEL" nil '(10 6))		; Released 05 July 2003
+  ;; (product-define "APEL" nil '(10 6))	; Released 05 July 2003
+  (product-define "APEL" nil '(10 7))
   )
 
 (defun apel-version ()
Index: xemacs-packages/apel/atype.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/atype.el,v
retrieving revision 1.5
diff -d -u -r1.5 atype.el
--- xemacs-packages/apel/atype.el	6 Dec 2005 10:47:17 -0000	1.5
+++ xemacs-packages/apel/atype.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/broken.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/broken.el,v
retrieving revision 1.5
diff -d -u -r1.5 broken.el
--- xemacs-packages/apel/broken.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/broken.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/calist.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/calist.el,v
retrieving revision 1.3
diff -d -u -r1.3 calist.el
--- xemacs-packages/apel/calist.el	10 Jul 2000 04:41:04 -0000	1.3
+++ xemacs-packages/apel/calist.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,7 +48,7 @@
 	      (if (intern-soft (symbol-name sym)
 			       calist-field-match-method-obarray)
 		  (signal 'conflict-of-calist-symbol
-			  (list (format "Conflict of symbol %s")))
+			  (list (format "Conflict of symbol %s" sym)))
 		(if (fboundp sym)
 		    (define-calist-field-match-method
 		      sym (symbol-function sym))
Index: xemacs-packages/apel/emu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/emu.el,v
retrieving revision 1.9
diff -d -u -r1.9 emu.el
--- xemacs-packages/apel/emu.el	6 Dec 2005 10:47:18 -0000	1.9
+++ xemacs-packages/apel/emu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/file-detect.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/file-detect.el,v
retrieving revision 1.5
diff -d -u -r1.5 file-detect.el
--- xemacs-packages/apel/file-detect.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/file-detect.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/filename.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/filename.el,v
retrieving revision 1.4
diff -d -u -r1.4 filename.el
--- xemacs-packages/apel/filename.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/filename.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -34,8 +34,8 @@
   "Apply initial ARGUMENT to sequence of FUNCTIONS.
 FUNCTIONS is list of functions.
 
-(poly-funcall '(f1 f2 .. fn) arg) is as same as
-(fn .. (f2 (f1 arg)) ..).
+\(poly-funcall '(f1 f2 .. fn) arg) is as same as
+\(fn .. (f2 (f1 arg)) ..).
 
 For example, (poly-funcall '(car number-to-string) '(100)) returns
 \"100\"."
@@ -71,7 +71,7 @@
 Moreover, if you want to convert Japanese filename to roman string by kakasi,
 
 \(if \(exec-installed-p \"kakasi\"\)
-    \(setq file-name-filters
+    \(setq filename-filters
 	  \(append '\(filename-japanese-to-roman-string\) filename-filters\)\)\)")
 
 ;;; @ filters
@@ -91,26 +91,40 @@
   (let ((code (char-int character)))
     (or (< code 32)(= code 127))))
 
+(eval-when-compile
+  (defmacro filename-special-filter-1 (string)
+    (let (sref inc-i)
+      (if (or (not (fboundp 'sref))
+	      (>= emacs-major-version 21)
+	      (and (= emacs-major-version 20)
+		   (>= emacs-minor-version 3)))
+	  (setq sref 'aref
+		inc-i '(1+ i))
+	(setq sref 'aref
+	      inc-i '(+ i (char-length chr))))
+      (` (let ((len (length (, string)))
+	       (b 0)(i 0)
+	       (dest ""))
+	   (while (< i len)
+	     (let ((chr ((, sref) (, string) i))
+		   (lst filename-replacement-alist)
+		   ret)
+	       (while (and lst (not ret))
+		 (if (if (functionp (car (car lst)))
+			 (setq ret (funcall (car (car lst)) chr))
+		       (setq ret (memq chr (car (car lst)))))
+		     t			; quit this loop.
+		   (setq lst (cdr lst))))
+	       (if ret
+		   (setq dest (concat dest (substring (, string) b i)
+				      (cdr (car lst)))
+			 i (, inc-i)
+			 b i)
+		 (setq i (, inc-i)))))
+	   (concat dest (substring (, string) b)))))))
+
 (defun filename-special-filter (string)
-  (let ((len (length string))
-	(b 0)(i 0)
-	(dest ""))
-    (while (< i len)
-      (let ((chr (sref string i))
-            (lst filename-replacement-alist)
-            ret)
-        (while (and lst (not ret))
-          (if (if (functionp (car (car lst)))
-                  (setq ret (funcall (car (car lst)) chr))
-                (setq ret (memq chr (car (car lst)))))
-              t                         ; quit this loop.
-            (setq lst (cdr lst))))
-	(if ret
-	    (setq dest (concat dest (substring string b i)(cdr (car lst)))
-		  i (+ i (char-length chr))
-		  b i)
-	  (setq i (+ i (char-length chr))))))
-    (concat dest (substring string b))))
+  (filename-special-filter-1 string))
 
 (defun filename-eliminate-top-low-lines (string)
   (if (string-match "^_+" string)
Index: xemacs-packages/apel/install.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/install.el,v
retrieving revision 1.6
diff -d -u -r1.6 install.el
--- xemacs-packages/apel/install.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/install.el	3 Jul 2009 22:02:51 -0000
@@ -1,8 +1,9 @@
 ;;; install.el --- Emacs Lisp package install utility
 
-;; Copyright (C) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+;; 	Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka at jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Created: 1996/08/18
 ;; Keywords: install, byte-compile, directory detection
 
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -158,6 +159,9 @@
     ;; v18 does not have standard site directory.
     "local.lisp"))
 
+;; Avoid compile warning.
+(eval-when-compile (autoload 'replace-in-string "subr"))
+
 (defun install-detect-elisp-directory (&optional prefix elisp-prefix
 						 allow-version-specific)
   (or prefix
@@ -165,28 +169,36 @@
   (or elisp-prefix
       (setq elisp-prefix install-elisp-prefix))
   (or (catch 'tag
-	(let ((rest default-load-path)
-	      (regexp (concat "^"
-			      ;; XEmacs change: handle backslashes (Windows)
-			      (regexp-quote (replace-in-string
-					     (file-name-as-directory
-					      (expand-file-name elisp-prefix))
-					     "\\\\" "/"))
-			      ".*/"
-			      (regexp-quote
-			       (replace-in-string prefix "\\\\" "/"))
-			      "/?$")))
+	(let ((rest (delq nil (copy-sequence default-load-path)))
+	      (regexp
+	       (concat "^"
+		       (regexp-quote (if (featurep 'xemacs)
+					 ;; Handle backslashes (Windows)
+					 (replace-in-string
+					  (file-name-as-directory
+					   (expand-file-name prefix))
+					  "\\\\" "/")
+				       (file-name-as-directory
+					(expand-file-name prefix))))
+		       ".*/"
+		       (regexp-quote
+			(if (featurep 'xemacs)
+			    ;; Handle backslashes (Windows)
+			    (replace-in-string elisp-prefix "\\\\" "/")
+			  elisp-prefix))
+		       "/?$"))
+	      dir)
 	  (while rest
-	    ;; XEmacs change: handle backslashes (Windows)
-	    (if (string-match regexp
-			      (replace-in-string (car rest) "\\\\" "/"))
+	    (setq dir (if (featurep 'xemacs)
+			  ;; Handle backslashes (Windows)
+			  (replace-in-string (car rest) "\\\\" "/")
+			(car rest)))
+	    (if (string-match regexp dir)
 		(if (or allow-version-specific
 			(not (string-match (format "/%d\\.%d"
 						   emacs-major-version
 						   emacs-minor-version)
-					   ;; XEmacs change: handle backslashes
-					   (replace-in-string (car rest)
-							      "\\\\" "/"))))
+					   dir)))
 		    (throw 'tag (car rest))))
 	    (setq rest (cdr rest)))))
       (expand-file-name (concat (if (and (not (featurep 'xemacs))
@@ -215,6 +227,32 @@
 ;;; @ for XEmacs package system
 ;;;
 
+(defun install-get-default-package-directory ()
+  (let ((dirs (append
+	       (cond
+		((boundp 'early-package-hierarchies)
+		 (append (if early-package-load-path
+			     early-package-hierarchies)
+			 (if late-package-load-path
+			     late-package-hierarchies)
+			 (if last-package-load-path
+			     last-package-hierarchies)) )
+		((boundp 'early-packages)
+		 (append (if early-package-load-path
+			     early-packages)
+			 (if late-package-load-path
+			     late-packages)
+			 (if last-package-load-path
+			     last-packages)) ))
+	       (if (and (boundp 'configure-package-path)
+			(listp configure-package-path))
+		   (delete "" configure-package-path))))
+	dir)
+    (while (and (setq dir (car dirs))
+		(not (file-exists-p dir)))
+      (setq dirs (cdr dirs)))
+    dir))
+
 (defun install-update-package-files (package dir &optional just-print)
   (cond
    (just-print
@@ -233,10 +271,13 @@
     (princ (format "Wrote %s\n"
 		   (expand-file-name "custom-load.elc" dir))))
    (t
-    (setq autoload-package-name package)
-
-    (let ((command-line-args-left (list dir)))
-      (batch-update-directory))
+    (if (fboundp 'batch-update-directory-autoloads)
+	;; XEmacs 21.5.19 and newer.
+	(let ((command-line-args-left (list package dir)))
+	  (batch-update-directory-autoloads))
+      (setq autoload-package-name package)
+      (let ((command-line-args-left (list dir)))
+	(batch-update-directory)))
 
     (let ((command-line-args-left (list dir)))
       (Custom-make-dependencies))
Index: xemacs-packages/apel/inv-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/inv-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 inv-xemacs.el
--- xemacs-packages/apel/inv-xemacs.el	10 Jul 2000 04:41:04 -0000	1.2
+++ xemacs-packages/apel/inv-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/invisible.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/invisible.el,v
retrieving revision 1.2
diff -d -u -r1.2 invisible.el
--- xemacs-packages/apel/invisible.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/invisible.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcharset.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcharset.el,v
retrieving revision 1.4
diff -d -u -r1.4 mcharset.el
--- xemacs-packages/apel/mcharset.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/mcharset.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-20.el,v
retrieving revision 1.6
diff -d -u -r1.6 mcs-20.el
--- xemacs-packages/apel/mcs-20.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/mcs-20.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mcs-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-ltn1.el,v
retrieving revision 1.3
diff -d -u -r1.3 mcs-ltn1.el
--- xemacs-packages/apel/mcs-ltn1.el	6 Dec 2005 10:47:18 -0000	1.3
+++ xemacs-packages/apel/mcs-ltn1.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-xmu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-xmu.el,v
retrieving revision 1.1
diff -d -u -r1.1 mcs-xmu.el
--- xemacs-packages/apel/mcs-xmu.el	10 Jul 2000 04:41:05 -0000	1.1
+++ xemacs-packages/apel/mcs-xmu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mule-caesar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mule-caesar.el,v
retrieving revision 1.4
diff -d -u -r1.4 mule-caesar.el
--- xemacs-packages/apel/mule-caesar.el	10 Jul 2000 04:41:05 -0000	1.4
+++ xemacs-packages/apel/mule-caesar.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/path-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/path-util.el,v
retrieving revision 1.5
diff -d -u -r1.5 path-util.el
--- xemacs-packages/apel/path-util.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/path-util.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl-20.el,v
retrieving revision 1.4
diff -d -u -r1.4 pccl-20.el
--- xemacs-packages/apel/pccl-20.el	14 Aug 2007 21:23:02 -0000	1.4
+++ xemacs-packages/apel/pccl-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl.el,v
retrieving revision 1.6
diff -d -u -r1.6 pccl.el
--- xemacs-packages/apel/pccl.el	14 Aug 2007 21:23:02 -0000	1.6
+++ xemacs-packages/apel/pccl.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; ##### Much of the logic here is flawed in the context of XEmacs
 ;;; packages.  All the static-if and broken-facility stuff is evaluated at
Index: xemacs-packages/apel/pces-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-20.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-20.el
--- xemacs-packages/apel/pces-20.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pces-raw.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-raw.el,v
retrieving revision 1.3
diff -d -u -r1.3 pces-raw.el
--- xemacs-packages/apel/pces-raw.el	10 Jul 2000 04:41:05 -0000	1.3
+++ xemacs-packages/apel/pces-raw.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xfc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xfc.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xfc.el
--- xemacs-packages/apel/pces-xfc.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xfc.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xm.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xm.el
--- xemacs-packages/apel/pces-xm.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xm.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces.el
--- xemacs-packages/apel/pces.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pcustom.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pcustom.el,v
retrieving revision 1.2
diff -d -u -r1.2 pcustom.el
--- xemacs-packages/apel/pcustom.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/pcustom.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/poe-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 poe-xemacs.el
--- xemacs-packages/apel/poe-xemacs.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/poe-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -82,33 +82,113 @@
 ;;;
 
 (condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
     (require 'timer)
-  (error
+  (error nil))
+(or
+ (or (featurep 'timer-funcs) (featurep 'timer))
+ (progn
    (require 'itimer)
-   (defun-maybe run-at-time (time repeat function &rest args)
-     (start-itimer (make-temp-name "rat")
-		   `(lambda ()
-		      (,function , at args))
-		   time repeat))
+   (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+       (defun-maybe run-at-time (time repeat function &rest args)
+	 (start-itimer (make-temp-name "rat")
+		       `(lambda ()
+			  (,function , at args))
+		       time repeat))
+     (defun-maybe run-at-time (time repeat function &rest args)
+       "Function emulating the function of the same name of Emacs.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+       (apply #'start-itimer "run-at-time"
+	      function (if time (max time 1e-9) 1e-9)
+	      repeat nil t args)))
    (defalias 'cancel-timer 'delete-itimer)
    (defun with-timeout-handler (tag)
      (throw tag 'timeout))
    (defmacro-maybe with-timeout (list &rest body)
      (let ((seconds (car list))
 	   (timeout-forms (cdr list)))
-     `(let ((with-timeout-tag (cons nil nil))
-	    with-timeout-value with-timeout-timer)
-	(if (catch with-timeout-tag
-	      (progn
-		(setq with-timeout-timer
-		      (run-at-time ,seconds nil
-				   'with-timeout-handler
-				   with-timeout-tag))
-		(setq with-timeout-value (progn . ,body))
-		nil))
-	    (progn . ,timeout-forms)
-	  (cancel-timer with-timeout-timer)
-	  with-timeout-value))))))
+       `(let ((with-timeout-tag (cons nil nil))
+	      with-timeout-value with-timeout-timer)
+	  (if (catch with-timeout-tag
+		(progn
+		  (setq with-timeout-timer
+			(run-at-time ,seconds nil
+				     'with-timeout-handler
+				     with-timeout-tag))
+		  (setq with-timeout-value (progn . ,body))
+		  nil))
+	      (progn . ,timeout-forms)
+	    (cancel-timer with-timeout-timer)
+	    with-timeout-value))))))
+
+(require 'broken)
+
+(broken-facility run-at-time-tick-tock
+  "`run-at-time' is not punctual."
+  ;; Note that it doesn't support XEmacsen prior to the version 19.15
+  ;; since `start-itimer' doesn't pass arguments to a timer function.
+  (or (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+      (condition-case nil
+	  (progn
+	    (unless (or itimer-process itimer-timer)
+	      (itimer-driver-start))
+	    ;; Check whether there is a bug to which the difference of
+	    ;; the present time and the time when the itimer driver was
+	    ;; woken up is subtracted from the initial itimer value.
+	    (let* ((inhibit-quit t)
+		   (ctime (current-time))
+		   (itimer-timer-last-wakeup
+		    (prog1
+			ctime
+		      (setcar ctime (1- (car ctime)))))
+		   (itimer-list nil)
+		   (itimer (start-itimer "run-at-time" 'ignore 5)))
+	      (sleep-for 0.1) ;; Accept the timeout interrupt.
+	      (prog1
+		  (> (itimer-value itimer) 0)
+		(delete-itimer itimer))))
+	(error nil))))
+
+(when-broken run-at-time-tick-tock
+  (defalias 'run-at-time
+    (lambda (time repeat function &rest args)
+      "Function emulating the function of the same name of Emacs.
+It works correctly for TIME even if there is a bug in the XEmacs core.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+      (let ((itimers (list nil)))
+	(setcar
+	 itimers
+	 (apply #'start-itimer "fixed-run-at-time"
+		(lambda (itimers repeat function &rest args)
+		  (let ((itimer (car itimers)))
+		    (if repeat
+			(progn
+			  (set-itimer-function
+			   itimer
+			   (lambda (itimer repeat function &rest args)
+			     (set-itimer-restart itimer repeat)
+			     (set-itimer-function itimer function)
+			     (set-itimer-function-arguments itimer args)
+			     (apply function args)))
+			  (set-itimer-function-arguments
+			   itimer
+			   (append (list itimer repeat function) args)))
+		      (set-itimer-function
+		       itimer
+		       (lambda (itimer function &rest args)
+			 (delete-itimer itimer)
+			 (apply function args)))
+		      (set-itimer-function-arguments
+		       itimer
+		       (append (list itimer function) args)))))
+		1e-9 (if time (max time 1e-9) 1e-9)
+		nil t itimers repeat function args))))))
 
 
 ;;; @ to avoid bug of XEmacs 19.14
Index: xemacs-packages/apel/poe.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe.el,v
retrieving revision 1.7
diff -d -u -r1.7 poe.el
--- xemacs-packages/apel/poe.el	6 Dec 2005 10:47:18 -0000	1.7
+++ xemacs-packages/apel/poe.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -1523,20 +1523,62 @@
 			 ls (- ls 65536))))
 	    (setq time (append (list ms ls) (nth 2 time))))))))
 
-;; Emacs 20.1/XEmacs 20.3(?) and later: (split-string STRING &optional PATTERN)
-;; Here is a XEmacs version.
-(defun-maybe split-string (string &optional pattern)
-  "Return a list of substrings of STRING which are separated by PATTERN.
-If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
-  (or pattern
-      (setq pattern "[ \f\t\n\r\v]+"))
-  ;; The FSF version of this function takes care not to cons in case
-  ;; of infloop.  Maybe we should synch?
-  (let (parts (start 0))
-    (while (string-match pattern string start)
-      (setq parts (cons (substring string start (match-beginning 0)) parts)
-	    start (match-end 0)))
-    (nreverse (cons (substring string start) parts))))
+(defconst-maybe split-string-default-separators "[ \f\t\n\r\v]+"
+  "The default value of separators for `split-string'.
+
+A regexp matching strings of whitespace.  May be locale-dependent
+\(as yet unimplemented).  Should not match non-breaking spaces.
+
+Warning: binding this to a different value and using it as default is
+likely to have undesired semantics.")
+
+;; Here is a Emacs 22 version. OMIT-NULLS
+(defun-maybe split-string (string &optional separators omit-nulls)
+  "Split STRING into substrings bounded by matches for SEPARATORS.
+
+The beginning and end of STRING, and each match for SEPARATORS, are
+splitting points.  The substrings matching SEPARATORS are removed, and
+the substrings between the splitting points are collected as a list,
+which is returned.
+
+If SEPARATORS is non-nil, it should be a regular expression matching text
+which separates, but is not part of, the substrings.  If nil it defaults to
+`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
+OMIT-NULLS is forced to t.
+
+If OMIT-NULLS is t, zero-length substrings are omitted from the list \(so
+that for the default value of SEPARATORS leading and trailing whitespace
+are effectively trimmed).  If nil, all zero-length substrings are retained,
+which correctly parses CSV format, for example.
+
+Note that the effect of `(split-string STRING)' is the same as
+`(split-string STRING split-string-default-separators t)').  In the rare
+case that you wish to retain zero-length substrings when splitting on
+whitespace, use `(split-string STRING split-string-default-separators)'.
+
+Modifies the match data; use `save-match-data' if necessary."
+  (let ((keep-nulls (not (if separators omit-nulls t)))
+	(rexp (or separators split-string-default-separators))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< start (length string)))
+      (setq notfirst t)
+      (if (or keep-nulls (< start (match-beginning 0)))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (if (or keep-nulls (< start (length string)))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
 

 
 ;;; @ Window commands emulation. (lisp/window.el)
Index: xemacs-packages/apel/poem-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-ltn1.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-ltn1.el
--- xemacs-packages/apel/poem-ltn1.el	24 Mar 2002 20:52:46 -0000	1.4
+++ xemacs-packages/apel/poem-ltn1.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/poem-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-xm.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-xm.el
--- xemacs-packages/apel/poem-xm.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/poem-xm.el	3 Jul 2009 22:02:52 -0000
@@ -1,6 +1,6 @@
 ;;; poem-xm.el --- poem module for XEmacs-mule; -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2002,2003,2005 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Keywords: emulation, compatibility, Mule
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -68,9 +68,14 @@
   "Return index of character succeeding CHAR whose index is INDEX."
   `(1+ ,index))
 
-(defun-maybe char-length (char)
-  "Return indexing length of multi-byte form of CHAR."
-  1)
+(if (not (fboundp 'char-length))
+    (defalias 'char-length
+      (lambda (char)
+	"Return number of bytes a CHARACTER occupies in a string or buffer.
+It always returns 1 in XEmacs.  It is for compatibility with MULE 2.3."
+	1)))
+
+(defalias-maybe 'char-valid-p 'characterp)
 
 
 ;;; @ string
Index: xemacs-packages/apel/poem.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem.el,v
retrieving revision 1.5
diff -d -u -r1.5 poem.el
--- xemacs-packages/apel/poem.el	6 Oct 2000 08:33:45 -0000	1.5
+++ xemacs-packages/apel/poem.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -77,9 +77,15 @@
 
 (defalias-maybe 'int-char 'identity)
 
-(defalias-maybe 'characterp 'integerp)
+(defalias-maybe 'characterp
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(defalias-maybe 'char-or-char-int-p
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
 (defun-maybe char-octet (ch &optional n)
   "Return the octet numbered N (should be 0 or 1) of char CH.
Index: xemacs-packages/apel/product.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/product.el,v
retrieving revision 1.3
diff -d -u -r1.3 product.el
--- xemacs-packages/apel/product.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/product.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pym.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pym.el,v
retrieving revision 1.2
diff -d -u -r1.2 pym.el
--- xemacs-packages/apel/pym.el	6 Dec 2005 10:47:19 -0000	1.2
+++ xemacs-packages/apel/pym.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/richtext.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/richtext.el,v
retrieving revision 1.3
diff -d -u -r1.3 richtext.el
--- xemacs-packages/apel/richtext.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/richtext.el	3 Jul 2009 22:02:52 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/static.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/static.el,v
retrieving revision 1.4
diff -d -u -r1.4 static.el
--- xemacs-packages/apel/static.el	6 Dec 2005 10:47:19 -0000	1.4
+++ xemacs-packages/apel/static.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 

xemacs-packages-extra-20090624-dired-504422.patch:
 dired.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-extra-20090624-dired-504422.patch ---
Index: xemacs-packages/dired/dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired.el,v
retrieving revision 1.11
diff -d -u -r1.11 dired.el
--- xemacs-packages/dired/dired.el	13 Jan 2008 14:51:20 -0000	1.11
+++ xemacs-packages/dired/dired.el	24 Jun 2009 16:33:11 -0000
@@ -219,7 +219,7 @@
 
 ;;;###autoload
 (defcustom dired-use-ls-dired
-  (and (string-match "gnu" system-configuration)
+  (and (string-match "gnu\\|linux" system-configuration)
        ;; Only supported for XEmacs >= 21.5 and GNU Emacs >= 21.4 (I think)
        (or (and (featurep 'xemacs)
 		(fboundp 'emacs-version>=)
@@ -2849,7 +2849,7 @@
 	(if (save-excursion
 	      (goto-char bol)
 	      (re-search-forward
-	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9@]"
+	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9 at .]"
 	       bof t))
 	    (progn
 	      (setq modes-start (match-beginning 0)

xemacs-packages-extra-20090824-timer.patch:
 ChangeLog |   10 ++++++++++
 Makefile  |    2 +-
 timer.el  |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-extra-20090824-timer.patch ---
--- xemacs-packages/fsf-compat/ChangeLog	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/ChangeLog	2009-08-24 16:20:07.752947063 -0600
@@ -1,3 +1,13 @@
+2009-07-30  Norbert Koch  <viteno at xemacs.org>
+
+	* Makefile (VERSION): XEmacs package 1.18 released.
+
+2009-07-30  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* timer.el (timer-set-idle-time): Use right type of argument to
+	set-itimer-restart.  Fixes issue547.
+	Thanks to the anonymous reporter.
+
 2008-04-14  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.17 released.
--- xemacs-packages/fsf-compat/Makefile	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/Makefile	2009-08-24 16:19:49.650969431 -0600
@@ -19,7 +19,7 @@
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.17
+VERSION = 1.18
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = fsf-compat
--- xemacs-packages/fsf-compat/timer.el	2004-10-22 09:23:00.000000000 -0600
+++ xemacs-packages/fsf-compat/timer.el	2009-08-24 16:19:49.652131279 -0600
@@ -65,7 +65,7 @@
   (set-itimer-is-idle timer t)
   (set-itimer-value timer secs)
   (when repeat
-    (set-itimer-restart timer repeat))
+    (set-itimer-restart timer secs))
   timer)
 
 ;; timer-next-integral-multiple-of-time and timer-relative-time have moved


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xemacs-packages-extra.spec	6 Mar 2009 23:08:10 -0000	1.9
+++ xemacs-packages-extra.spec	3 Sep 2009 22:06:11 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -31,6 +31,12 @@ Patch4:         %{name}-20090217-auctex-
 Patch5:         %{name}-20060510-egg-wnn-host-unix-79826.patch
 Patch6:         %{name}-20090217-browsers.patch
 Patch8:         %{name}-20060510-avoid-catch-error-65346.patch
+# This patch has been applied upstream
+Patch9:         %{name}-20090624-apel-503185.patch
+# This patch has been applied upstream
+Patch10:        %{name}-20090624-dired-504422.patch
+# This patch has been applied upstream
+Patch11:        %{name}-20090824-timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -100,6 +106,12 @@ collection in GNU texinfo format
 %patch6 -p1
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch8 -p1
+# upgrade to a newer APEL (needed by some external packages)
+%patch9
+# fix "no file at point" errors in dired
+%patch10
+# fix a parameter gaffe in the timer code
+%patch11
 
 chmod -c -x \
     xemacs-packages/auctex/style/babel.el \
@@ -229,6 +241,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
+- Update APEL to a newer version (bz 503185).
+- Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).
+- Fix a known timer bug.
+
 * Sat Mar  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090217-1
 - Update to 2009-02-17, several patches applied/superseded upstream.
 - Apply upstream patch to fix errors and obsolete code in VC menu.



From jakub at fedoraproject.org  Thu Sep  3 22:28:37 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  3 Sep 2009 22:28:37 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.286, 1.287 gcc.spec, 1.64, 1.65 sources,
	1.290, 1.291
Message-ID: <20090903222837.5FF7A11C0099@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7743

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.1-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- .cvsignore	2 Sep 2009 14:40:50 -0000	1.286
+++ .cvsignore	3 Sep 2009 22:28:35 -0000	1.287
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090902.tar.bz2
+gcc-4.4.1-20090903.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gcc.spec	2 Sep 2009 14:40:51 -0000	1.64
+++ gcc.spec	3 Sep 2009 22:28:35 -0000	1.65
@@ -1,9 +1,9 @@
-%global DATE 20090902
-%global SVNREV 151328
+%global DATE 20090903
+%global SVNREV 151396
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 8
+%global gcc_release 9
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -1805,6 +1805,11 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Sep  3 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-9
+- update from gcc-4_4-branch
+  - fix wide char constant stringification
+- __builtin_unreachable fix
+
 * Wed Sep  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-8
 - fix up __builtin_object_size (#505862)
 - fix Fortran GOTO warning (PR fortran/38507)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- sources	2 Sep 2009 14:40:51 -0000	1.290
+++ sources	3 Sep 2009 22:28:35 -0000	1.291
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-eb2fb0d2c073de0b4edf78dab958aca4  gcc-4.4.1-20090902.tar.bz2
+67e50d0590f56a2184121e035c7907c8  gcc-4.4.1-20090903.tar.bz2



From wtogami at fedoraproject.org  Thu Sep  3 22:31:19 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Sep 2009 22:31:19 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/devel .cvsignore, 1.5, 1.6 perl-Mail-DKIM.spec, 
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090903223119.EA96611C0099@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8730

Modified Files:
	.cvsignore perl-Mail-DKIM.spec sources 
Log Message:
0.36_6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Sep 2009 17:44:45 -0000	1.5
+++ .cvsignore	3 Sep 2009 22:31:19 -0000	1.6
@@ -1 +1 @@
-Mail-DKIM-0.36_5.tar.gz
+Mail-DKIM-0.36_6.tar.gz


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/perl-Mail-DKIM.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Mail-DKIM.spec	2 Sep 2009 17:53:57 -0000	1.9
+++ perl-Mail-DKIM.spec	3 Sep 2009 22:31:19 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Mail-DKIM
 Version:        0.36
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
@@ -8,7 +8,7 @@ License:        GPL+ or Artistic
 URL:            http://dkimproxy.sourceforge.net/
 # FIXME: Undo this when upstream returns to normal version numbers
 #Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
-Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}_5.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}_6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,7 +27,7 @@ Mail::SpamAssassin::Plugin::DKIM plugin.
 
 %prep
 # FIXME: Here too
-%setup -q -n Mail-DKIM-%{version}_5
+%setup -q -n Mail-DKIM-%{version}_6
 # Make the example scripts non-executable
 %{__chmod} -x scripts/*.pl
 
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 3 2009 Warren Togami <wtogami at redhat.com> - 0.36-4
+- 0.36_6
+
 * Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-3
 - 0.36_5 ... why does upstream use strange version numbers?
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Sep 2009 17:44:45 -0000	1.5
+++ sources	3 Sep 2009 22:31:19 -0000	1.6
@@ -1 +1 @@
-48fb65c9cf3b681bbc94ba9efcb1c6f2  Mail-DKIM-0.36_5.tar.gz
+7f9b20007dbfba239e9d037506ad8622  Mail-DKIM-0.36_6.tar.gz



From jakub at fedoraproject.org  Thu Sep  3 22:50:35 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  3 Sep 2009 22:50:35 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-raw-string.patch,1.2,1.3
Message-ID: <20090903225035.A709911C0374@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12446

Modified Files:
	gcc44-raw-string.patch 
Log Message:
4.4.1-9

gcc44-raw-string.patch:
 gcc/c-common.c                            |    2 
 gcc/c-lex.c                               |   16 +-
 gcc/c-parser.c                            |    1 
 gcc/cp/parser.c                           |    6 
 gcc/testsuite/g++.dg/ext/raw-string-1.C   |   96 +++++++++++++
 gcc/testsuite/g++.dg/ext/raw-string-2.C   |  104 ++++++++++++++
 gcc/testsuite/g++.dg/ext/raw-string-3.C   |   58 ++++++++
 gcc/testsuite/g++.dg/ext/raw-string-4.C   |   28 +++
 gcc/testsuite/g++.dg/ext/raw-string-5.C   |   23 +++
 gcc/testsuite/g++.dg/ext/raw-string-6.C   |    5 
 gcc/testsuite/g++.dg/ext/raw-string-7.C   |   23 +++
 gcc/testsuite/g++.dg/ext/utf-badconcat2.C |   15 ++
 gcc/testsuite/g++.dg/ext/utf-dflt2.C      |   12 +
 gcc/testsuite/g++.dg/ext/utf8-1.C         |   45 ++++++
 gcc/testsuite/g++.dg/ext/utf8-2.C         |   21 ++
 gcc/testsuite/gcc.dg/raw-string-1.c       |  101 ++++++++++++++
 gcc/testsuite/gcc.dg/raw-string-2.c       |  109 +++++++++++++++
 gcc/testsuite/gcc.dg/raw-string-3.c       |   53 +++++++
 gcc/testsuite/gcc.dg/raw-string-4.c       |   28 +++
 gcc/testsuite/gcc.dg/raw-string-5.c       |   23 +++
 gcc/testsuite/gcc.dg/raw-string-6.c       |    5 
 gcc/testsuite/gcc.dg/raw-string-7.c       |   23 +++
 gcc/testsuite/gcc.dg/utf-badconcat2.c     |   15 ++
 gcc/testsuite/gcc.dg/utf-dflt2.c          |   12 +
 gcc/testsuite/gcc.dg/utf8-1.c             |   45 ++++++
 gcc/testsuite/gcc.dg/utf8-2.c             |   26 +++
 libcpp/charset.c                          |   52 +++++++
 libcpp/directives.c                       |    3 
 libcpp/include/cpplib.h                   |    5 
 libcpp/internal.h                         |    4 
 libcpp/lex.c                              |  214 ++++++++++++++++++++++++++++--
 libcpp/macro.c                            |    3 
 32 files changed, 1155 insertions(+), 21 deletions(-)

Index: gcc44-raw-string.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-raw-string.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcc44-raw-string.patch	4 Mar 2009 15:06:35 -0000	1.2
+++ gcc44-raw-string.patch	3 Sep 2009 22:50:33 -0000	1.3
@@ -431,7 +431,7 @@
 +++ libcpp/macro.c	2008-09-11 20:25:20.000000000 +0200
 @@ -377,7 +377,8 @@ stringify_arg (cpp_reader *pfile, macro_
        escape_it = (token->type == CPP_STRING || token->type == CPP_CHAR
- 		   || token->type == CPP_WSTRING || token->type == CPP_STRING
+ 		   || token->type == CPP_WSTRING || token->type == CPP_WCHAR
  		   || token->type == CPP_STRING32 || token->type == CPP_CHAR32
 -		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16);
 +		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16



From bpepple at fedoraproject.org  Thu Sep  3 23:01:30 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  3 Sep 2009 23:01:30 +0000 (UTC)
Subject: rpms/farsight2/devel .cvsignore, 1.9, 1.10 farsight2.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <20090903230130.E1D4A11C0099@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17435

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
* Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.15-1
- Update to 0.0.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Aug 2009 20:44:30 -0000	1.9
+++ .cvsignore	3 Sep 2009 23:01:29 -0000	1.10
@@ -1 +1 @@
-farsight2-0.0.14.tar.gz
+farsight2-0.0.15.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- farsight2.spec	6 Aug 2009 20:44:30 -0000	1.16
+++ farsight2.spec	3 Sep 2009 23:01:29 -0000	1.17
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gst_ver 0.10.22
-%define gst_plugins_base_ver 0.10.22
+%define gst_ver 0.10.23
+%define gst_plugins_base_ver 0.10.23
 %define gst_plugins_good 0.10.7
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.14
+Version:        0.0.15
 Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.15-1
+- Update to 0.0.15.
+
 * Thu Aug 06 2009 Warren Togami <wtogami at redhat.com> - 0.0.14-1
 - 0.0.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Aug 2009 20:44:31 -0000	1.9
+++ sources	3 Sep 2009 23:01:29 -0000	1.10
@@ -1 +1 @@
-fbfa45661b7949abf9bf92c2531ac392  farsight2-0.0.14.tar.gz
+563ae54fb4df477eaf11e047e1550df7  farsight2-0.0.15.tar.gz



From mclasen at fedoraproject.org  Fri Sep  4 00:08:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Sep 2009 00:08:26 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre-unique-ids.patch, NONE, 1.1 vinagre.spec,
	1.52, 1.53
Message-ID: <20090904000826.AC94E11C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5477

Modified Files:
	vinagre.spec 
Added Files:
	vinagre-unique-ids.patch 
Log Message:
Make ids unique


vinagre-unique-ids.patch:
 data/vinagre.ui                |   18 +++++++++---------
 vinagre/vinagre-bookmarks-ui.c |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE vinagre-unique-ids.patch ---
diff --git a/data/vinagre.ui b/data/vinagre.ui
index 33c99ec..93e2560 100644
--- a/data/vinagre.ui
+++ b/data/vinagre.ui
@@ -17,7 +17,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="xalign">0</property>
@@ -61,7 +61,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="host_label">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="xalign">0</property>
@@ -101,7 +101,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="protocol_label">
+              <object class="GtkLabel" id="label22">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Protocol:</property>
@@ -174,7 +174,7 @@
           <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
             <child>
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="label21">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">  </property>
@@ -540,7 +540,7 @@
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox3">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label15">
@@ -688,7 +688,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkHBox" id="hbox4">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label3">
@@ -703,7 +703,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="fullscreen_check">
+                  <object class="GtkCheckButton" id="bookmark_fullscreen_check">
                     <property name="label" translatable="yes">_Full screen</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -753,7 +753,7 @@
               <object class="GtkHBox" id="folder_box">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkLabel" id="label22">
+                  <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">    </property>
@@ -862,7 +862,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox5">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
                 <child>
diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
index 71fdbf6..441456f 100644
--- a/vinagre/vinagre-bookmarks-ui.c
+++ b/vinagre/vinagre-bookmarks-ui.c
@@ -133,7 +133,7 @@ show_dialog_conn (VinagreBookmarks      *book,
   dialog         = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog"));
   name_entry     = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry"));
   host_entry     = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry"));
-  fs_check       = GTK_WIDGET (gtk_builder_get_object (xml, "fullscreen_check"));
+  fs_check       = GTK_WIDGET (gtk_builder_get_object (xml, "bookmark_fullscreen_check"));
   folder_box     = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box"));
   plugin_box     = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_options_vbox"));
   save_button    = GTK_WIDGET (gtk_builder_get_object (xml, "save_button"));


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- vinagre.spec	25 Aug 2009 20:20:48 -0000	1.52
+++ vinagre.spec	4 Sep 2009 00:08:24 -0000	1.53
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	2.27.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -26,6 +26,8 @@ BuildRequires:  telepathy-glib-devel
 # for /usr/share/dbus-1/services
 Requires: dbus
 
+Patch0: vinagre-unique-ids.patch
+
 %description
 Vinagre is a VNC client for the GNOME desktop.
 
@@ -49,6 +51,7 @@ to vinagre.
 
 %prep
 %setup -q
+%patch -p1 -b .unique-ids
 
 %build
 %configure --enable-avahi=yes --disable-static
@@ -155,6 +158,9 @@ fi
 
 
 %changelog
+* Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-2
+- Make ids unique
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 



From mclasen at fedoraproject.org  Fri Sep  4 00:15:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Sep 2009 00:15:50 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.53,1.54
Message-ID: <20090904001550.636C211C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9580

Modified Files:
	vinagre.spec 
Log Message:
fix spec



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- vinagre.spec	4 Sep 2009 00:08:24 -0000	1.53
+++ vinagre.spec	4 Sep 2009 00:15:50 -0000	1.54
@@ -51,7 +51,7 @@ to vinagre.
 
 %prep
 %setup -q
-%patch -p1 -b .unique-ids
+%patch0 -p1 -b .unique-ids
 
 %build
 %configure --enable-avahi=yes --disable-static



From mclasen at fedoraproject.org  Fri Sep  4 00:41:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Sep 2009 00:41:30 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.105,1.106
Message-ID: <20090904004130.D63B111C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17353

Modified Files:
	comps-f12.xml.in 
Log Message:
Remove PolicyKit-gnome from the gnome group



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- comps-f12.xml.in	3 Sep 2009 20:36:05 -0000	1.105
+++ comps-f12.xml.in	4 Sep 2009 00:41:30 -0000	1.106
@@ -2456,7 +2456,6 @@
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">metacity</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
-      <packagereq type="mandatory">PolicyKit-gnome</packagereq>
       <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-gtk</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-gtk</packagereq>
@@ -2566,6 +2565,7 @@
       <packagereq type="optional">scim-gtk</packagereq>
       <packagereq type="optional">screenruler</packagereq>
       <packagereq type="optional">seahorse-plugins</packagereq>
+      <packagereq type="optional">shotwell</packagereq>
       <packagereq type="optional">stardict-dic-en</packagereq>
       <packagereq type="optional">swfdec-gnome</packagereq>
       <packagereq type="optional">tango-icon-theme</packagereq>



From bskeggs at fedoraproject.org  Fri Sep  4 00:44:52 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri,  4 Sep 2009 00:44:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.42,
	1.43 nouveau-bicubic-2x.patch, 1.9,
	1.10 nouveau-multiple-xserver.patch, 1.11,
	1.12 nouveau-transition-hack.patch, 1.12, 1.13 sources, 1.43,
	1.44 xorg-x11-drv-nouveau.spec, 1.53, 1.54
Message-ID: <20090904004452.F420811C0099@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17883

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Sep 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-7.20090904git2b5ec6a
- fix cursor being left enabled on wrong display




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	21 Aug 2009 04:17:36 -0000	1.42
+++ .cvsignore	4 Sep 2009 00:44:52 -0000	1.43
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2
+xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-bicubic-2x.patch	21 Aug 2009 04:17:36 -0000	1.9
+++ nouveau-bicubic-2x.patch	4 Sep 2009 00:44:52 -0000	1.10
@@ -1,4 +1,4 @@
-From 5d771a98dfdb77dcfff906342d1bb69c5e95ba62 Mon Sep 17 00:00:00 2001
+From 669fc0a22b4c2b6b8c9572187e151e426f039227 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 3/3] xv: only use bicubic filtering when scaling >=2x
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
  	else
  		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 -- 
-1.6.4
+1.6.4.2
 

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nouveau-multiple-xserver.patch	21 Aug 2009 04:17:36 -0000	1.11
+++ nouveau-multiple-xserver.patch	4 Sep 2009 00:44:52 -0000	1.12
@@ -1,4 +1,4 @@
-From 50340ef2c1b24e5c10245b980e77552f4baecd06 Mon Sep 17 00:00:00 2001
+From bc70e6309b35633b76c48126bb967d4d85bce4df Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -153,5 +153,5 @@ index b8de860..5838ce7 100644
  	/* We don't need to allocate cursors / lut here if we're using
  	 * kernel modesetting
 -- 
-1.6.4
+1.6.4.2
 

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nouveau-transition-hack.patch	21 Aug 2009 04:17:36 -0000	1.12
+++ nouveau-transition-hack.patch	4 Sep 2009 00:44:52 -0000	1.13
@@ -1,4 +1,4 @@
-From 01d6d416943706bf0030724cae4481a916807282 Mon Sep 17 00:00:00 2001
+From bb8bda06e19ac2181fd96a159e6e12ee4f5d108d Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
@@ -8,10 +8,10 @@ Subject: [PATCH 2/3] f12: transitions
  1 files changed, 169 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 9231d93..cdb7689 100644
+index 55381d3..266d3a6 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -183,6 +183,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -184,6 +184,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
  }
  
  static void
@@ -178,7 +178,7 @@ index 9231d93..cdb7689 100644
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -195,6 +355,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -196,6 +356,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	if (!src_id || !dst_id)
  		return;
  
@@ -193,7 +193,7 @@ index 9231d93..cdb7689 100644
  	pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
  	if (!pspix)
  		return;
-@@ -296,8 +464,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -297,8 +465,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		x = 0;
  		y = 0;
  	} else
@@ -204,5 +204,5 @@ index 9231d93..cdb7689 100644
  				drmmode_crtc->mode_crtc->buffer_id, x, y);
  	}
 -- 
-1.6.4
+1.6.4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	21 Aug 2009 04:17:36 -0000	1.43
+++ sources	4 Sep 2009 00:44:52 -0000	1.44
@@ -1 +1 @@
-22f93b760e83ecc8fc5eae19cd8a799a  xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2
+50b387dd790cf70326dc3f60fd92310e  xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xorg-x11-drv-nouveau.spec	27 Aug 2009 20:58:15 -0000	1.53
+++ xorg-x11-drv-nouveau.spec	4 Sep 2009 00:44:52 -0000	1.54
@@ -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:   6.%{snapshot}%{?dist}
+Release:   7.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Sep 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-7.20090904git2b5ec6a
+- fix cursor being left enabled on wrong display
+
 * Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 0.0.15-6.20090820git569a17a
 - nouveau-bgnr.patch: Enable seamless plymouth->gdm transition.
 



From bskeggs at fedoraproject.org  Fri Sep  4 00:48:27 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri,  4 Sep 2009 00:48:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel xorg-x11-drv-nouveau.spec, 1.54,
	1.55
Message-ID: <20090904004827.D295711C0099@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18805

Modified Files:
	xorg-x11-drv-nouveau.spec 
Log Message:
oops



Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- xorg-x11-drv-nouveau.spec	4 Sep 2009 00:44:52 -0000	1.54
+++ xorg-x11-drv-nouveau.spec	4 Sep 2009 00:48:27 -0000	1.55
@@ -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 20090820
-%define git_version 569a17a
+%define gitdate 20090904
+%define git_version 2b5ec6a
 
 %define snapshot %{gitdate}git%{git_version}
 



From mclasen at fedoraproject.org  Fri Sep  4 01:19:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Sep 2009 01:19:24 +0000 (UTC)
Subject: rpms/gtk2/F-11 im-cedilla.conf,NONE,1.1 gtk2.spec,1.382,1.383
Message-ID: <20090904011924.1867E11C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23617

Modified Files:
	gtk2.spec 
Added Files:
	im-cedilla.conf 
Log Message:
Add im-cedilla.conf to gtk2-immodules



--- NEW FILE im-cedilla.conf ---
XIM=none
XIM_PROGRAM=/bin/true
XIM_ARGS=
SHORT_DESC=im-cedilla
GTK_IM_MODULE=cedilla
QT_IM_MODULE=xim


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/gtk2.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- gtk2.spec	29 Aug 2009 14:55:35 -0000	1.382
+++ gtk2.spec	4 Sep 2009 01:19:23 -0000	1.383
@@ -17,12 +17,13 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
 Source1: update-gdk-pixbuf-loaders
 Source2: update-gtk-immodules
+Source3: im-cedilla.conf
 
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
@@ -86,6 +87,8 @@ suites.
 Summary: Input methods for GTK+
 Group: System Environment/Libraries
 Requires: gtk2 = %{version}-%{release}
+# for /etc/X11/xinit/xinput.d
+Requires: imsettings
 
 %description immodules
 The gtk2-immodules package contains standalone input methods that are shipped
@@ -249,6 +252,11 @@ esac
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
 
+
+# Input method frameworks want this
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
@@ -344,6 +352,7 @@ fi
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so
+%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
 %files immodule-xim
@@ -373,6 +382,9 @@ fi
 
 
 %changelog
+* Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.6-2
+- Add im-cedilla.conf to gtk2-immodules (#510666)
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.6-1
 - Update to 2.16.6
 



From hno at fedoraproject.org  Fri Sep  4 02:07:10 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 02:07:10 +0000 (UTC)
Subject: rpms/squid/devel squid-3.1.0.13-alias-link.patch, NONE,
	1.1 squid.spec-3.1, 1.5, 1.6
Message-ID: <20090904020710.6172D11C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31928

Modified Files:
	squid.spec-3.1 
Added Files:
	squid-3.1.0.13-alias-link.patch 
Log Message:
3.1: fix alias-link.sh DESTDIR issue

squid-3.1.0.13-alias-link.patch:
 alias-link.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squid-3.1.0.13-alias-link.patch ---
=== modified file 'errors/alias-link.sh'
--- errors/alias-link.sh	2009-07-06 03:12:39 +0000
+++ errors/alias-link.sh	2009-09-04 01:07:00 +0000
@@ -38,6 +38,6 @@
 	# Remove and replace any pre-existing content/link
 	for alia in ${aliases}; do
 		${RM} -f -r ${DIR}/${alia} || exit 1
-		${LN} -s ${DIR}/${base} ${DIR}/${alia} || exit 1
+		${LN} -s ${base} ${DIR}/${alia} || exit 1
 	done
 done



Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- squid.spec-3.1	1 Sep 2009 01:19:23 -0000	1.5
+++ squid.spec-3.1	4 Sep 2009 02:07:10 -0000	1.6
@@ -30,6 +30,8 @@ Source98: perl-requires-squid.sh
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
 Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
+# Upstream fix, but have not reached 3.1 yet
+Patch002: squid-3.1.0.13-alias-link.patch
 
 # External patches
 
@@ -68,6 +70,7 @@ lookup program (dnsserver), a program fo
 %setup -q
 
 %patch001 -p0 -b .b9694
+%patch002 -p0 -b .alias-link
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -79,7 +82,6 @@ lookup program (dnsserver), a program fo
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
 %configure \
    --exec_prefix=/usr \
-   --bindir=%{_sbindir} \
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
    --datadir=%{_datadir} \
@@ -88,9 +90,9 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
+   --enable-follow-x-forwarded-for \
    --enable-auth="basic,digest,ntlm,negotiate" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
    --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    --enable-digest-auth-helpers="password,ldap,eDirectory" \
    --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
@@ -118,8 +120,8 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-openssl=/usr/kerberos \
    --with-pthreads
 
-# following options are no longer supported but may be supported in future
-#   --enable-follow-x-forwarded-for
+# following options should be enabled but fails building
+#   --enable-negotiate-auth-helpers="squid_kerb_auth"
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
@@ -166,7 +168,7 @@ iconv -f ISO88591 -t UTF8 ChangeLog -o C
 mv -f ChangeLog.tmp ChangeLog
 
 # squid.conf.documented is documentation. We ship that in doc/
-rm -f $RPM_BUILD_ROOT%{sysconfdir}/squid/squid.conf.documented
+rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
@@ -184,19 +186,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
-%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
-%attr(4750,root,squid) %{_libdir}/squid/pam_auth
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
 %config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
 %config(noreplace) /etc/squid/mime.conf
+%config(noreplace) /etc/squid/errorpage.css
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
 # These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
 %config /etc/squid/mime.conf.default
+%config /etc/squid/errorpage.css.default
 %config /etc/squid/cachemgr.conf.default
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
@@ -206,9 +208,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons
+%{_datadir}/squid/mib.txt
 %{_sbindir}/squid
-%{_sbindir}/squidclient
+%{_bindir}/squidclient
 %{_mandir}/man8/*
+%{_mandir}/man1/*
 %{_libdir}/squid/*
 
 %pre



From pkgdb at fedoraproject.org  Fri Sep  4 02:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:07:10 +0000
Subject: [pkgdb] auto-destdir (Fedora EPEL, 4) updated by kevin
Message-ID: <20090904020710.8EC9A10F865@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for auto-destdir
kevin has set commit to Approved for 107427 on auto-destdir (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on auto-destdir (Fedora EPEL 4)
kevin has set build to Approved for 107427 on auto-destdir (Fedora EPEL 4)
kevin changed owner of auto-destdir in Fedora EPEL 4 to dwheeler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/auto-destdir



From pkgdb at fedoraproject.org  Fri Sep  4 02:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:07:10 +0000
Subject: [pkgdb] auto-destdir (Fedora EPEL, 4) updated by kevin
Message-ID: <20090904020710.A95D810F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for auto-destdir
kevin has set commit to Approved for 107427 on auto-destdir (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on auto-destdir (Fedora EPEL 5)
kevin has set build to Approved for 107427 on auto-destdir (Fedora EPEL 5)
kevin changed owner of auto-destdir in Fedora EPEL 5 to dwheeler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/auto-destdir



From hno at fedoraproject.org  Fri Sep  4 02:11:01 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 02:11:01 +0000 (UTC)
Subject: rpms/squid/devel squid.spec-3.1,1.6,1.7
Message-ID: <20090904021101.D62DC11C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32404

Modified Files:
	squid.spec-3.1 
Log Message:
3.1: Correct squidclient location


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- squid.spec-3.1	4 Sep 2009 02:07:10 -0000	1.6
+++ squid.spec-3.1	4 Sep 2009 02:11:01 -0000	1.7
@@ -131,7 +131,6 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall  \
         sysconfdir=$RPM_BUILD_ROOT/etc/squid \
         localstatedir=$RPM_BUILD_ROOT/var \
-        bindir=$RPM_BUILD_ROOT/%{_sbindir} \
         libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
 echo "
 #



From pkgdb at fedoraproject.org  Fri Sep  4 02:12:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:12:56 +0000
Subject: [pkgdb] nforenum was added for heffer
Message-ID: <20090904021256.3D32F10F865@bastion2.fedora.phx.redhat.com>

kevin has added Package nforenum with summary A format correcter and linter for the NFO language
kevin has approved Package nforenum
kevin has added a Fedora devel branch for nforenum with an owner of heffer
kevin has approved nforenum in Fedora devel
kevin has approved Package nforenum
kevin has set commit to Approved for 107427 on nforenum (Fedora devel)
kevin has set checkout to Approved for 107427 on nforenum (Fedora devel)
kevin has set build to Approved for 107427 on nforenum (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Fri Sep  4 02:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:12:57 +0000
Subject: [pkgdb] nforenum summary updated by kevin
Message-ID: <20090904021257.D6DF510F886@bastion2.fedora.phx.redhat.com>

kevin set package nforenum summary to A format correcter and linter for the NFO language

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Fri Sep  4 02:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:12:57 +0000
Subject: [pkgdb] nforenum (Fedora, 10) updated by kevin
Message-ID: <20090904021257.EB01D10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nforenum
kevin has set commit to Approved for 107427 on nforenum (Fedora 10)
kevin has set checkout to Approved for 107427 on nforenum (Fedora 10)
kevin has set build to Approved for 107427 on nforenum (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nforenum



From kevin at fedoraproject.org  Fri Sep  4 02:13:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:13:08 +0000 (UTC)
Subject: rpms/nforenum - New directory
Message-ID: <20090904021308.2013F11C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nforenum
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32665/rpms/nforenum

Log Message:
Directory /cvs/pkgs/rpms/nforenum added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:13:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:13:08 +0000 (UTC)
Subject: rpms/nforenum/devel - New directory
Message-ID: <20090904021308.34DDE11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nforenum/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32665/rpms/nforenum/devel

Log Message:
Directory /cvs/pkgs/rpms/nforenum/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:13:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:13:14 +0000 (UTC)
Subject: rpms/nforenum Makefile,NONE,1.1
Message-ID: <20090904021314.1573E11C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nforenum
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32665/rpms/nforenum

Added Files:
	Makefile 
Log Message:
Setup of module nforenum


--- NEW FILE Makefile ---
# Top level Makefile for module nforenum
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  Fri Sep  4 02:13:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:13:14 +0000 (UTC)
Subject: rpms/nforenum/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090904021314.4E2C811C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nforenum/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32665/rpms/nforenum/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nforenum


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nforenum
# $Id: Makefile,v 1.1 2009/09/04 02:13:14 kevin Exp $
NAME := nforenum
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 Sep  4 02:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:12:57 +0000
Subject: [pkgdb] nforenum (Fedora, 10) updated by kevin
Message-ID: <20090904021257.F30F410F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for nforenum
kevin has set commit to Approved for 107427 on nforenum (Fedora 11)
kevin has set checkout to Approved for 107427 on nforenum (Fedora 11)
kevin has set build to Approved for 107427 on nforenum (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Fri Sep  4 02:14:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:14:01 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-DBIC-Schema was added for
	eseyman
Message-ID: <20090904021401.EDAB710F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-CGI-Application-Plugin-DBIC-Schema with summary Easy DBIx::Class access from CGI::Application
kevin has approved Package perl-CGI-Application-Plugin-DBIC-Schema
kevin has added a Fedora devel branch for perl-CGI-Application-Plugin-DBIC-Schema with an owner of eseyman
kevin has approved perl-CGI-Application-Plugin-DBIC-Schema in Fedora devel
kevin has approved Package perl-CGI-Application-Plugin-DBIC-Schema
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora devel)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-DBIC-Schema



From pkgdb at fedoraproject.org  Fri Sep  4 02:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:14:02 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-DBIC-Schema summary updated by
	kevin
Message-ID: <20090904021403.7596510F89D@bastion2.fedora.phx.redhat.com>

kevin set package perl-CGI-Application-Plugin-DBIC-Schema summary to Easy DBIx::Class access from CGI::Application

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-DBIC-Schema



From pkgdb at fedoraproject.org  Fri Sep  4 02:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:14:02 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-DBIC-Schema (Fedora,
	10) updated by kevin
Message-ID: <20090904021403.9847810F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-CGI-Application-Plugin-DBIC-Schema
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 11)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 11)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 11) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-DBIC-Schema



From pkgdb at fedoraproject.org  Fri Sep  4 02:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:14:02 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-DBIC-Schema (Fedora,
	10) updated by kevin
Message-ID: <20090904021403.A4E5E10F865@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-CGI-Application-Plugin-DBIC-Schema
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 10)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 10)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 10) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-DBIC-Schema



From pkgdb at fedoraproject.org  Fri Sep  4 02:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:14:02 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-DBIC-Schema (Fedora,
	10) updated by kevin
Message-ID: <20090904021403.AFCA310F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-CGI-Application-Plugin-DBIC-Schema
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 12)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 12)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 12) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-DBIC-Schema (Fedora 12) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-DBIC-Schema



From kevin at fedoraproject.org  Fri Sep  4 02:14:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:14:17 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema - New directory
Message-ID: <20090904021417.1398D11C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszIu441/rpms/perl-CGI-Application-Plugin-DBIC-Schema

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:14:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:14:17 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel - New directory
Message-ID: <20090904021417.34AE111C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszIu441/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:14:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:14:23 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema Makefile,NONE,1.1
Message-ID: <20090904021423.1789711C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszIu441/rpms/perl-CGI-Application-Plugin-DBIC-Schema

Added Files:
	Makefile 
Log Message:
Setup of module perl-CGI-Application-Plugin-DBIC-Schema


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CGI-Application-Plugin-DBIC-Schema
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 Sep  4 02:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:14:03 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-DBIC-Schema (Fedora,
	10) updated by kevin
Message-ID: <20090904021403.B872510F8A8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-CGI-Application-Plugin-DBIC-Schema (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-DBIC-Schema (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-DBIC-Schema



From kevin at fedoraproject.org  Fri Sep  4 02:14:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:14:23 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090904021423.5B95711C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszIu441/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CGI-Application-Plugin-DBIC-Schema


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CGI-Application-Plugin-DBIC-Schema
# $Id: Makefile,v 1.1 2009/09/04 02:14:23 kevin Exp $
NAME := perl-CGI-Application-Plugin-DBIC-Schema
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 Sep  4 02:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:15:47 +0000
Subject: [pkgdb] trac-accountmanager-plugin was added for mathstuf
Message-ID: <20090904021547.998C210F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package trac-accountmanager-plugin with summary Trac plugin for account registration and management
kevin has approved Package trac-accountmanager-plugin
kevin has added a Fedora devel branch for trac-accountmanager-plugin with an owner of mathstuf
kevin has approved trac-accountmanager-plugin in Fedora devel
kevin has approved Package trac-accountmanager-plugin
kevin has set commit to Approved for 107427 on trac-accountmanager-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on trac-accountmanager-plugin (Fedora devel)
kevin has set build to Approved for 107427 on trac-accountmanager-plugin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-accountmanager-plugin



From pkgdb at fedoraproject.org  Fri Sep  4 02:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:15:49 +0000
Subject: [pkgdb] trac-accountmanager-plugin summary updated by kevin
Message-ID: <20090904021549.9252310F886@bastion2.fedora.phx.redhat.com>

kevin set package trac-accountmanager-plugin summary to Trac plugin for account registration and management

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-accountmanager-plugin



From pkgdb at fedoraproject.org  Fri Sep  4 02:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:15:49 +0000
Subject: [pkgdb] trac-accountmanager-plugin (Fedora, 11) updated by kevin
Message-ID: <20090904021549.9A3FF10F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on trac-accountmanager-plugin (Fedora devel) for pghmcfc
kevin approved watchcommits on trac-accountmanager-plugin (Fedora devel) for pghmcfc
kevin approved commit on trac-accountmanager-plugin (Fedora devel) for pghmcfc
kevin approved build on trac-accountmanager-plugin (Fedora devel) for pghmcfc
kevin approved approveacls on trac-accountmanager-plugin (Fedora devel) for pghmcfc

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-accountmanager-plugin



From kevin at fedoraproject.org  Fri Sep  4 02:16:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:16:01 +0000 (UTC)
Subject: rpms/trac-accountmanager-plugin - New directory
Message-ID: <20090904021601.166DE11C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-accountmanager-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsScR846/rpms/trac-accountmanager-plugin

Log Message:
Directory /cvs/pkgs/rpms/trac-accountmanager-plugin added to the repository




From pkgdb at fedoraproject.org  Fri Sep  4 02:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:15:49 +0000
Subject: [pkgdb] trac-accountmanager-plugin (Fedora, 11) updated by kevin
Message-ID: <20090904021549.A7D5F10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for trac-accountmanager-plugin
kevin has set commit to Approved for 107427 on trac-accountmanager-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on trac-accountmanager-plugin (Fedora 11)
kevin has set build to Approved for 107427 on trac-accountmanager-plugin (Fedora 11)
kevin approved watchbugzilla on trac-accountmanager-plugin (Fedora 11) for pghmcfc
kevin approved watchcommits on trac-accountmanager-plugin (Fedora 11) for pghmcfc
kevin approved commit on trac-accountmanager-plugin (Fedora 11) for pghmcfc
kevin approved build on trac-accountmanager-plugin (Fedora 11) for pghmcfc
kevin approved approveacls on trac-accountmanager-plugin (Fedora 11) for pghmcfc

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-accountmanager-plugin



From kevin at fedoraproject.org  Fri Sep  4 02:16:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:16:01 +0000 (UTC)
Subject: rpms/trac-accountmanager-plugin/devel - New directory
Message-ID: <20090904021601.3554E11C02C8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-accountmanager-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsScR846/rpms/trac-accountmanager-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/trac-accountmanager-plugin/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:16:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:16:07 +0000 (UTC)
Subject: rpms/trac-accountmanager-plugin Makefile,NONE,1.1
Message-ID: <20090904021607.23F7011C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-accountmanager-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsScR846/rpms/trac-accountmanager-plugin

Added Files:
	Makefile 
Log Message:
Setup of module trac-accountmanager-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module trac-accountmanager-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  Fri Sep  4 02:16:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:16:07 +0000 (UTC)
Subject: rpms/trac-accountmanager-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090904021607.5553111C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-accountmanager-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsScR846/rpms/trac-accountmanager-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module trac-accountmanager-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: trac-accountmanager-plugin
# $Id: Makefile,v 1.1 2009/09/04 02:16:07 kevin Exp $
NAME := trac-accountmanager-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  Fri Sep  4 02:16:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:16:55 +0000
Subject: [pkgdb] rubygem-pathname2 was added for wakko666
Message-ID: <20090904021655.285B810F883@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-pathname2 with summary An alternate implementation for the Pathname library
kevin has approved Package rubygem-pathname2
kevin has added a Fedora devel branch for rubygem-pathname2 with an owner of wakko666
kevin has approved rubygem-pathname2 in Fedora devel
kevin has approved Package rubygem-pathname2
kevin has set commit to Approved for 107427 on rubygem-pathname2 (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-pathname2 (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-pathname2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-pathname2



From pkgdb at fedoraproject.org  Fri Sep  4 02:16:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:16:56 +0000
Subject: [pkgdb] rubygem-pathname2 summary updated by kevin
Message-ID: <20090904021656.A182A10F88C@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-pathname2 summary to An alternate implementation for the Pathname library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-pathname2



From pkgdb at fedoraproject.org  Fri Sep  4 02:16:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:16:56 +0000
Subject: [pkgdb] rubygem-pathname2 (Fedora, 12) updated by kevin
Message-ID: <20090904021656.AA55810F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on rubygem-pathname2 (Fedora devel) for mtasaka
kevin approved watchcommits on rubygem-pathname2 (Fedora devel) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-pathname2



From pkgdb at fedoraproject.org  Fri Sep  4 02:16:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:16:56 +0000
Subject: [pkgdb] rubygem-pathname2 (Fedora, 12) updated by kevin
Message-ID: <20090904021656.B9D0B10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-pathname2
kevin has set commit to Approved for 107427 on rubygem-pathname2 (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-pathname2 (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-pathname2 (Fedora 12)
kevin approved watchbugzilla on rubygem-pathname2 (Fedora 12) for mtasaka
kevin approved watchcommits on rubygem-pathname2 (Fedora 12) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-pathname2



From kevin at fedoraproject.org  Fri Sep  4 02:17:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:17:06 +0000 (UTC)
Subject: rpms/rubygem-pathname2 - New directory
Message-ID: <20090904021706.1530211C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-pathname2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshx1108/rpms/rubygem-pathname2

Log Message:
Directory /cvs/pkgs/rpms/rubygem-pathname2 added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:17:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:17:06 +0000 (UTC)
Subject: rpms/rubygem-pathname2/devel - New directory
Message-ID: <20090904021706.364B911C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-pathname2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshx1108/rpms/rubygem-pathname2/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-pathname2/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:17:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:17:11 +0000 (UTC)
Subject: rpms/rubygem-pathname2 Makefile,NONE,1.1
Message-ID: <20090904021711.F1B8111C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-pathname2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshx1108/rpms/rubygem-pathname2

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-pathname2


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-pathname2
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  Fri Sep  4 02:17:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:17:12 +0000 (UTC)
Subject: rpms/rubygem-pathname2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090904021712.329A711C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-pathname2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshx1108/rpms/rubygem-pathname2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-pathname2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-pathname2
# $Id: Makefile,v 1.1 2009/09/04 02:17:12 kevin Exp $
NAME := rubygem-pathname2
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 Sep  4 02:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:17:59 +0000
Subject: [pkgdb] perl-Moose-Autobox was added for cweyl
Message-ID: <20090904021800.1B65210F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Moose-Autobox with summary Autoboxed wrappers for native Perl datatypes
kevin has approved Package perl-Moose-Autobox
kevin has added a Fedora devel branch for perl-Moose-Autobox with an owner of cweyl
kevin has approved perl-Moose-Autobox in Fedora devel
kevin has approved Package perl-Moose-Autobox
kevin has set commit to Approved for 107427 on perl-Moose-Autobox (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Moose-Autobox (Fedora devel)
kevin has set build to Approved for 107427 on perl-Moose-Autobox (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose-Autobox



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:02 +0000
Subject: [pkgdb] perl-Moose-Autobox summary updated by kevin
Message-ID: <20090904021802.29E7510F888@bastion2.fedora.phx.redhat.com>

kevin set package perl-Moose-Autobox summary to Autoboxed wrappers for native Perl datatypes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose-Autobox



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:02 +0000
Subject: [pkgdb] perl-Moose-Autobox (Fedora, 10) updated by kevin
Message-ID: <20090904021802.2E9FF10F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Moose-Autobox
kevin has set commit to Approved for 107427 on perl-Moose-Autobox (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Moose-Autobox (Fedora 10)
kevin has set build to Approved for 107427 on perl-Moose-Autobox (Fedora 10)
kevin approved watchbugzilla on perl-Moose-Autobox (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Moose-Autobox (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose-Autobox



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:02 +0000
Subject: [pkgdb] perl-Moose-Autobox (Fedora, 10) updated by kevin
Message-ID: <20090904021802.355BF10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Moose-Autobox
kevin has set commit to Approved for 107427 on perl-Moose-Autobox (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Moose-Autobox (Fedora 11)
kevin has set build to Approved for 107427 on perl-Moose-Autobox (Fedora 11)
kevin approved watchbugzilla on perl-Moose-Autobox (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Moose-Autobox (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose-Autobox



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:02 +0000
Subject: [pkgdb] perl-Moose-Autobox (Fedora, 10) updated by kevin
Message-ID: <20090904021802.3B2D110F89B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Moose-Autobox (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Moose-Autobox (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose-Autobox



From kevin at fedoraproject.org  Fri Sep  4 02:18:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:18:11 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox - New directory
Message-ID: <20090904021811.14A9811C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Moose-Autobox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTJ1368/rpms/perl-Moose-Autobox

Log Message:
Directory /cvs/pkgs/rpms/perl-Moose-Autobox added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:18:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:18:11 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox/devel - New directory
Message-ID: <20090904021811.34F7211C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Moose-Autobox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTJ1368/rpms/perl-Moose-Autobox/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Moose-Autobox/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:18:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:18:17 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox Makefile,NONE,1.1
Message-ID: <20090904021817.9244411C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Moose-Autobox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTJ1368/rpms/perl-Moose-Autobox

Added Files:
	Makefile 
Log Message:
Setup of module perl-Moose-Autobox


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Moose-Autobox
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  Fri Sep  4 02:18:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:18:17 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090904021817.C628211C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Moose-Autobox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTJ1368/rpms/perl-Moose-Autobox/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Moose-Autobox


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Moose-Autobox
# $Id: Makefile,v 1.1 2009/09/04 02:18:17 kevin Exp $
NAME := perl-Moose-Autobox
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 Sep  4 02:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:49 +0000
Subject: [pkgdb] perl-MooseX-Traits-Pluggable was added for cweyl
Message-ID: <20090904021849.3E63D10F883@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Traits-Pluggable with summary A pluggable extension to MooseX::Traits
kevin has approved Package perl-MooseX-Traits-Pluggable
kevin has added a Fedora devel branch for perl-MooseX-Traits-Pluggable with an owner of cweyl
kevin has approved perl-MooseX-Traits-Pluggable in Fedora devel
kevin has approved Package perl-MooseX-Traits-Pluggable
kevin has set commit to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora devel)
kevin has set build to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Pluggable



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:51 +0000
Subject: [pkgdb] perl-MooseX-Traits-Pluggable summary updated by kevin
Message-ID: <20090904021851.A06ED10F897@bastion2.fedora.phx.redhat.com>

kevin set package perl-MooseX-Traits-Pluggable summary to A pluggable extension to MooseX::Traits

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Pluggable



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:51 +0000
Subject: [pkgdb] perl-MooseX-Traits-Pluggable (Fedora, 10) updated by kevin
Message-ID: <20090904021851.A42D010F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Traits-Pluggable
kevin has set commit to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora 10)
kevin has set build to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Traits-Pluggable (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Traits-Pluggable (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Pluggable



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:51 +0000
Subject: [pkgdb] perl-MooseX-Traits-Pluggable (Fedora, 10) updated by kevin
Message-ID: <20090904021851.B025F10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-MooseX-Traits-Pluggable
kevin has set commit to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora 11)
kevin has set build to Approved for 107427 on perl-MooseX-Traits-Pluggable (Fedora 11)
kevin approved watchbugzilla on perl-MooseX-Traits-Pluggable (Fedora 11) for perl-sig
kevin approved watchcommits on perl-MooseX-Traits-Pluggable (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Pluggable



From pkgdb at fedoraproject.org  Fri Sep  4 02:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:18:51 +0000
Subject: [pkgdb] perl-MooseX-Traits-Pluggable (Fedora, 10) updated by kevin
Message-ID: <20090904021851.B91C410F8A3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Traits-Pluggable (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Traits-Pluggable (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Pluggable



From kevin at fedoraproject.org  Fri Sep  4 02:19:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:19:00 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable - New directory
Message-ID: <20090904021900.1423311C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfy1714/rpms/perl-MooseX-Traits-Pluggable

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:19:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:19:00 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable/devel - New directory
Message-ID: <20090904021900.338C611C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfy1714/rpms/perl-MooseX-Traits-Pluggable/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:19:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:19:06 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable Makefile,NONE,1.1
Message-ID: <20090904021906.DF1B211C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfy1714/rpms/perl-MooseX-Traits-Pluggable

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Traits-Pluggable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Traits-Pluggable
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  Fri Sep  4 02:19:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:19:07 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090904021907.1F2B611C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfy1714/rpms/perl-MooseX-Traits-Pluggable/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Traits-Pluggable


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Traits-Pluggable
# $Id: Makefile,v 1.1 2009/09/04 02:19:06 kevin Exp $
NAME := perl-MooseX-Traits-Pluggable
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 Sep  4 02:20:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:20:09 +0000
Subject: [pkgdb] perl-Nagios-Plugin (Fedora EPEL, 5) updated by kevin
Message-ID: <20090904022009.58DA910F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Nagios-Plugin
kevin has set commit to Approved for 107427 on perl-Nagios-Plugin (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-Nagios-Plugin (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-Nagios-Plugin (Fedora EPEL 5)
kevin changed owner of perl-Nagios-Plugin in Fedora EPEL 5 to ruben
kevin approved watchbugzilla on perl-Nagios-Plugin (Fedora EPEL 5) for jpo
kevin approved watchcommits on perl-Nagios-Plugin (Fedora EPEL 5) for jpo
kevin approved commit on perl-Nagios-Plugin (Fedora EPEL 5) for jpo
kevin approved build on perl-Nagios-Plugin (Fedora EPEL 5) for jpo
kevin approved approveacls on perl-Nagios-Plugin (Fedora EPEL 5) for jpo

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nagios-Plugin



From pkgdb at fedoraproject.org  Fri Sep  4 02:21:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:21:26 +0000
Subject: [pkgdb] amarok F-12 cloned from devel
Message-ID: <20090904022126.C1BC810F87F@bastion2.fedora.phx.redhat.com>

kevin cloned amarok F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From hno at fedoraproject.org  Fri Sep  4 02:22:04 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 02:22:04 +0000 (UTC)
Subject: rpms/squid/devel squid-3.1.0.13-build.patch,1.2,1.3
Message-ID: <20090904022204.5C35111C02C6@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3284

Modified Files:
	squid-3.1.0.13-build.patch 
Log Message:
One more needed pkgdatadir change found by Jiri Skala

squid-3.1.0.13-build.patch:
 errors/Makefile.am |    2 -
 errors/Makefile.in |    2 -
 icons/Makefile.am  |    2 -
 icons/Makefile.in  |    2 -
 src/Makefile.am    |   16 +++++++-----
 src/Makefile.in    |   67 +++++++++++++++++++++++++++--------------------------
 6 files changed, 48 insertions(+), 43 deletions(-)

Index: squid-3.1.0.13-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid-3.1.0.13-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid-3.1.0.13-build.patch	31 Aug 2009 23:57:30 -0000	1.2
+++ squid-3.1.0.13-build.patch	4 Sep 2009 02:22:04 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up squid-3.1.0.13/errors/Makefile.am.build squid-3.1.0.13/errors/Makefile.am
 --- squid-3.1.0.13/errors/Makefile.am.build	2009-08-04 15:32:08.000000000 +0200
-+++ squid-3.1.0.13/errors/Makefile.am	2009-09-01 01:55:37.000000000 +0200
++++ squid-3.1.0.13/errors/Makefile.am	2009-09-04 04:11:29.000000000 +0200
 @@ -3,7 +3,7 @@
  # $Id$
  #
@@ -12,7 +12,7 @@ diff -up squid-3.1.0.13/errors/Makefile.
  
 diff -up squid-3.1.0.13/errors/Makefile.in.build squid-3.1.0.13/errors/Makefile.in
 --- squid-3.1.0.13/errors/Makefile.in.build	2009-08-04 15:32:30.000000000 +0200
-+++ squid-3.1.0.13/errors/Makefile.in	2009-09-01 01:56:14.000000000 +0200
++++ squid-3.1.0.13/errors/Makefile.in	2009-09-04 04:19:05.000000000 +0200
 @@ -221,7 +221,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
@@ -24,7 +24,7 @@ diff -up squid-3.1.0.13/errors/Makefile.
  TRANSLATIONPO = `ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//`
 diff -up squid-3.1.0.13/icons/Makefile.am.build squid-3.1.0.13/icons/Makefile.am
 --- squid-3.1.0.13/icons/Makefile.am.build	2009-08-04 15:32:10.000000000 +0200
-+++ squid-3.1.0.13/icons/Makefile.am	2009-09-01 01:55:37.000000000 +0200
++++ squid-3.1.0.13/icons/Makefile.am	2009-09-04 04:11:29.000000000 +0200
 @@ -29,7 +29,7 @@ ICONS	=	anthony-binhex.gif \
  		anthony-xbm.gif \
  		anthony-xpm.gif
@@ -36,7 +36,7 @@ diff -up squid-3.1.0.13/icons/Makefile.a
  DISTCLEANFILES = 
 diff -up squid-3.1.0.13/icons/Makefile.in.build squid-3.1.0.13/icons/Makefile.in
 --- squid-3.1.0.13/icons/Makefile.in.build	2009-08-04 15:32:35.000000000 +0200
-+++ squid-3.1.0.13/icons/Makefile.in	2009-09-01 01:56:19.000000000 +0200
++++ squid-3.1.0.13/icons/Makefile.in	2009-09-04 04:19:10.000000000 +0200
 @@ -258,7 +258,7 @@ ICONS = anthony-binhex.gif \
  		anthony-xbm.gif \
  		anthony-xpm.gif
@@ -48,7 +48,7 @@ diff -up squid-3.1.0.13/icons/Makefile.i
  DISTCLEANFILES = 
 diff -up squid-3.1.0.13/src/Makefile.am.build squid-3.1.0.13/src/Makefile.am
 --- squid-3.1.0.13/src/Makefile.am.build	2009-08-04 15:32:13.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.am	2009-09-01 01:55:37.000000000 +0200
++++ squid-3.1.0.13/src/Makefile.am	2009-09-04 04:18:01.000000000 +0200
 @@ -639,7 +639,9 @@ sysconf_DATA = \
  	squid.conf.documented \
  	mime.conf.default
@@ -60,7 +60,7 @@ diff -up squid-3.1.0.13/src/Makefile.am.
  	mib.txt
  
  LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
-@@ -712,13 +714,13 @@ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_
+@@ -712,17 +714,17 @@ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_
  DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
  DEFAULT_PID_FILE        = @DEFAULT_PIDFILE@
  DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
@@ -78,6 +78,11 @@ diff -up squid-3.1.0.13/src/Makefile.am.
  DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@
  
  # Make location configure settings available to the code
+-DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
++DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(pkgdatadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
+ 
+ snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
+ 
 @@ -785,7 +787,7 @@ cf.data: cf.data.pre Makefile
  repl_modules.cc: repl_modules.sh Makefile
  	$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
@@ -89,7 +94,7 @@ diff -up squid-3.1.0.13/src/Makefile.am.
  	else \
 diff -up squid-3.1.0.13/src/Makefile.in.build squid-3.1.0.13/src/Makefile.in
 --- squid-3.1.0.13/src/Makefile.in.build	2009-08-04 15:32:36.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.in	2009-09-01 01:56:20.000000000 +0200
++++ squid-3.1.0.13/src/Makefile.in	2009-09-04 04:19:11.000000000 +0200
 @@ -130,7 +130,7 @@ am_libsquid_la_OBJECTS = comm.lo CommCal
  	SquidConfig.lo TextException.lo
  libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
@@ -111,6 +116,15 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  HEADERS = $(noinst_HEADERS)
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
+@@ -1361,7 +1361,7 @@ DEFAULT_PIDFILE = @DEFAULT_PIDFILE@
+ 
+ # Make location configure settings available to the code
+ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
+-	-DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" \
++	-DDEFAULT_SQUID_DATA_DIR=\"$(pkgdatadir)\" \
+ 	-DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
+ DEPDIR = @DEPDIR@
+ DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
 @@ -1850,7 +1850,10 @@ sysconf_DATA = \
  	squid.conf.documented \
  	mime.conf.default



From pkgdb at fedoraproject.org  Fri Sep  4 02:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:22:28 +0000
Subject: [pkgdb] task (Fedora, 12) updated by kevin
Message-ID: <20090904022228.822ED10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for task
kevin has set commit to Approved for 107427 on task (Fedora 12)
kevin has set checkout to Approved for 107427 on task (Fedora 12)
kevin has set build to Approved for 107427 on task (Fedora 12)
kevin changed owner of task in Fedora 12 to ultrafredde

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/task



From pkgdb at fedoraproject.org  Fri Sep  4 02:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:22:28 +0000
Subject: [pkgdb] task (Fedora, 12) updated by kevin
Message-ID: <20090904022228.90E1410F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for task
kevin has set commit to Approved for 107427 on task (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on task (Fedora EPEL 5)
kevin has set build to Approved for 107427 on task (Fedora EPEL 5)
kevin changed owner of task in Fedora EPEL 5 to ultrafredde

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/task



From pkgdb at fedoraproject.org  Fri Sep  4 02:24:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:24:32 +0000
Subject: [pkgdb] gbirthday was added for tomspur
Message-ID: <20090904022432.B2B5610F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package gbirthday with summary Birthday reminder for evolution
kevin has approved Package gbirthday
kevin has added a Fedora devel branch for gbirthday with an owner of tomspur
kevin has approved gbirthday in Fedora devel
kevin has approved Package gbirthday
kevin has set commit to Approved for 107427 on gbirthday (Fedora devel)
kevin has set checkout to Approved for 107427 on gbirthday (Fedora devel)
kevin has set build to Approved for 107427 on gbirthday (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gbirthday



From pkgdb at fedoraproject.org  Fri Sep  4 02:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:24:36 +0000
Subject: [pkgdb] gbirthday summary updated by kevin
Message-ID: <20090904022436.22DE110F886@bastion2.fedora.phx.redhat.com>

kevin set package gbirthday summary to Birthday reminder for evolution

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gbirthday



From pkgdb at fedoraproject.org  Fri Sep  4 02:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:24:36 +0000
Subject: [pkgdb] gbirthday (Fedora EPEL, 5) updated by kevin
Message-ID: <20090904022436.29DDA10F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gbirthday
kevin has set commit to Approved for 107427 on gbirthday (Fedora 10)
kevin has set checkout to Approved for 107427 on gbirthday (Fedora 10)
kevin has set build to Approved for 107427 on gbirthday (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gbirthday



From pkgdb at fedoraproject.org  Fri Sep  4 02:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:24:36 +0000
Subject: [pkgdb] gbirthday (Fedora EPEL, 5) updated by kevin
Message-ID: <20090904022436.34A7210F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gbirthday
kevin has set commit to Approved for 107427 on gbirthday (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on gbirthday (Fedora EPEL 5)
kevin has set build to Approved for 107427 on gbirthday (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gbirthday



From pkgdb at fedoraproject.org  Fri Sep  4 02:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 02:24:36 +0000
Subject: [pkgdb] gbirthday (Fedora EPEL, 5) updated by kevin
Message-ID: <20090904022436.2E54510F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gbirthday
kevin has set commit to Approved for 107427 on gbirthday (Fedora 11)
kevin has set checkout to Approved for 107427 on gbirthday (Fedora 11)
kevin has set build to Approved for 107427 on gbirthday (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gbirthday



From kevin at fedoraproject.org  Fri Sep  4 02:24:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:24:44 +0000 (UTC)
Subject: rpms/gbirthday - New directory
Message-ID: <20090904022444.1989211C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gbirthday
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrl3802/rpms/gbirthday

Log Message:
Directory /cvs/pkgs/rpms/gbirthday added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:24:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:24:44 +0000 (UTC)
Subject: rpms/gbirthday/devel - New directory
Message-ID: <20090904022444.3632B11C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrl3802/rpms/gbirthday/devel

Log Message:
Directory /cvs/pkgs/rpms/gbirthday/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 02:24:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:24:50 +0000 (UTC)
Subject: rpms/gbirthday Makefile,NONE,1.1
Message-ID: <20090904022450.1BD7111C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gbirthday
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrl3802/rpms/gbirthday

Added Files:
	Makefile 
Log Message:
Setup of module gbirthday


--- NEW FILE Makefile ---
# Top level Makefile for module gbirthday
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  Fri Sep  4 02:24:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 02:24:50 +0000 (UTC)
Subject: rpms/gbirthday/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090904022450.4757511C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrl3802/rpms/gbirthday/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gbirthday


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gbirthday
# $Id: Makefile,v 1.1 2009/09/04 02:24:50 kevin Exp $
NAME := gbirthday
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 cweyl at fedoraproject.org  Fri Sep  4 02:30:12 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  4 Sep 2009 02:30:12 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox/devel import.log, NONE,
	1.1 perl-Moose-Autobox.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090904023012.B7F1311C0382@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Autobox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4718/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Moose-Autobox.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Moose-Autobox-0_09-1_fc11:HEAD:perl-Moose-Autobox-0.09-1.fc11.src.rpm:1252031403


--- NEW FILE perl-Moose-Autobox.spec ---
Name:       perl-Moose-Autobox 
Version:    0.09 
Release:    1%{?dist}
# lib/Moose/Autobox.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Autoboxed wrappers for native Perl datatypes 
Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Moose-Autobox-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Moose-Autobox
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(autobox) >= 2.23
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(Moose) >= 0.42
BuildRequires: perl(Perl6::Junction) >= 1.40000
BuildRequires: perl(Test::Exception) >= 0.21
BuildRequires: perl(Test::More) >= 0.62

# not automagically picked up
Requires:      perl(autobox)

%{?perl_default_filter}

%description
Moose::Autobox provides an implementation of SCALAR, ARRAY, HASH & CODE
for use with autobox. 


%prep
%setup -q -n Moose-Autobox-%{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 examples/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- submission

* Fri Aug 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Autobox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:18:17 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:30:12 -0000	1.2
@@ -0,0 +1 @@
+Moose-Autobox-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Autobox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:18:17 -0000	1.1
+++ sources	4 Sep 2009 02:30:12 -0000	1.2
@@ -0,0 +1 @@
+c6f9e74a9054ce59da4d593836d9d05f  Moose-Autobox-0.09.tar.gz



From cweyl at fedoraproject.org  Fri Sep  4 02:30:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  4 Sep 2009 02:30:40 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox/F-11 import.log, NONE,
	1.1 perl-Moose-Autobox.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090904023040.0A4B411C02C8@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Autobox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4925/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Moose-Autobox.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Moose-Autobox-0_09-1_fc11:F-11:perl-Moose-Autobox-0.09-1.fc11.src.rpm:1252031430


--- NEW FILE perl-Moose-Autobox.spec ---
Name:       perl-Moose-Autobox 
Version:    0.09 
Release:    1%{?dist}
# lib/Moose/Autobox.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Autoboxed wrappers for native Perl datatypes 
Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Moose-Autobox-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Moose-Autobox
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(autobox) >= 2.23
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(Moose) >= 0.42
BuildRequires: perl(Perl6::Junction) >= 1.40000
BuildRequires: perl(Test::Exception) >= 0.21
BuildRequires: perl(Test::More) >= 0.62

# not automagically picked up
Requires:      perl(autobox)

%{?perl_default_filter}

%description
Moose::Autobox provides an implementation of SCALAR, ARRAY, HASH & CODE
for use with autobox. 


%prep
%setup -q -n Moose-Autobox-%{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 examples/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- submission

* Fri Aug 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Autobox/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:18:17 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:30:39 -0000	1.2
@@ -0,0 +1 @@
+Moose-Autobox-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Autobox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:18:17 -0000	1.1
+++ sources	4 Sep 2009 02:30:39 -0000	1.2
@@ -0,0 +1 @@
+c6f9e74a9054ce59da4d593836d9d05f  Moose-Autobox-0.09.tar.gz



From cweyl at fedoraproject.org  Fri Sep  4 02:31:04 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  4 Sep 2009 02:31:04 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox/F-10 import.log, NONE,
	1.1 perl-Moose-Autobox.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090904023104.AA71E11C01EA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Autobox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5153/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Moose-Autobox.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Moose-Autobox-0_09-1_fc11:F-10:perl-Moose-Autobox-0.09-1.fc11.src.rpm:1252031455


--- NEW FILE perl-Moose-Autobox.spec ---
Name:       perl-Moose-Autobox 
Version:    0.09 
Release:    1%{?dist}
# lib/Moose/Autobox.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Autoboxed wrappers for native Perl datatypes 
Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Moose-Autobox-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Moose-Autobox
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(autobox) >= 2.23
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(Moose) >= 0.42
BuildRequires: perl(Perl6::Junction) >= 1.40000
BuildRequires: perl(Test::Exception) >= 0.21
BuildRequires: perl(Test::More) >= 0.62

# not automagically picked up
Requires:      perl(autobox)

%{?perl_default_filter}

%description
Moose::Autobox provides an implementation of SCALAR, ARRAY, HASH & CODE
for use with autobox. 


%prep
%setup -q -n Moose-Autobox-%{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 examples/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- submission

* Fri Aug 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Autobox/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:18:17 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:31:04 -0000	1.2
@@ -0,0 +1 @@
+Moose-Autobox-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Autobox/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:18:17 -0000	1.1
+++ sources	4 Sep 2009 02:31:04 -0000	1.2
@@ -0,0 +1 @@
+c6f9e74a9054ce59da4d593836d9d05f  Moose-Autobox-0.09.tar.gz



From cweyl at fedoraproject.org  Fri Sep  4 02:32:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  4 Sep 2009 02:32:52 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable/devel import.log, NONE,
	1.1 perl-MooseX-Traits-Pluggable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090904023252.39F1211C01EA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5524/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Traits-Pluggable.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Traits-Pluggable-0_08-1_fc11:HEAD:perl-MooseX-Traits-Pluggable-0.08-1.fc11.src.rpm:1252031563


--- NEW FILE perl-MooseX-Traits-Pluggable.spec ---
Name:       perl-MooseX-Traits-Pluggable 
Version:    0.08 
Release:    1%{?dist}
# lib/MooseX/Traits/Pluggable.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A pluggable extension to MooseX::Traits 
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Traits-Pluggable-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Traits-Pluggable
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Class::MOP) >= 0.84
BuildRequires: perl(CPAN)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Moose)
BuildRequires: perl(Moose::Role)
BuildRequires: perl(namespace::autoclean)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)

%description
This module adds support for class precedence search for traits and some
extra attributes, described below.

See the MooseX::Traits manpage for more information.  

%{?perl_default_filter}

%prep
%setup -q -n MooseX-Traits-Pluggable-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- submission
- br CPAN for inc::Module::Install::AutoInstall

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:19:06 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:32:52 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Traits-Pluggable-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:19:07 -0000	1.1
+++ sources	4 Sep 2009 02:32:52 -0000	1.2
@@ -0,0 +1 @@
+a74230bcf3e624344d012cb50e057c0f  MooseX-Traits-Pluggable-0.08.tar.gz



From cweyl at fedoraproject.org  Fri Sep  4 02:33:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  4 Sep 2009 02:33:18 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable/F-11 import.log, NONE,
	1.1 perl-MooseX-Traits-Pluggable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090904023318.5E70411C01EA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5753/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Traits-Pluggable.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Traits-Pluggable-0_08-1_fc11:F-11:perl-MooseX-Traits-Pluggable-0.08-1.fc11.src.rpm:1252031589


--- NEW FILE perl-MooseX-Traits-Pluggable.spec ---
Name:       perl-MooseX-Traits-Pluggable 
Version:    0.08 
Release:    1%{?dist}
# lib/MooseX/Traits/Pluggable.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A pluggable extension to MooseX::Traits 
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Traits-Pluggable-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Traits-Pluggable
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Class::MOP) >= 0.84
BuildRequires: perl(CPAN)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Moose)
BuildRequires: perl(Moose::Role)
BuildRequires: perl(namespace::autoclean)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)

%description
This module adds support for class precedence search for traits and some
extra attributes, described below.

See the MooseX::Traits manpage for more information.  

%{?perl_default_filter}

%prep
%setup -q -n MooseX-Traits-Pluggable-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- submission
- br CPAN for inc::Module::Install::AutoInstall

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:19:06 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:33:18 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Traits-Pluggable-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:19:07 -0000	1.1
+++ sources	4 Sep 2009 02:33:18 -0000	1.2
@@ -0,0 +1 @@
+a74230bcf3e624344d012cb50e057c0f  MooseX-Traits-Pluggable-0.08.tar.gz



From cweyl at fedoraproject.org  Fri Sep  4 02:33:43 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  4 Sep 2009 02:33:43 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable/F-10 import.log, NONE,
	1.1 perl-MooseX-Traits-Pluggable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090904023343.860FB11C01EA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5963/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Traits-Pluggable.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Traits-Pluggable-0_08-1_fc11:F-10:perl-MooseX-Traits-Pluggable-0.08-1.fc11.src.rpm:1252031614


--- NEW FILE perl-MooseX-Traits-Pluggable.spec ---
Name:       perl-MooseX-Traits-Pluggable 
Version:    0.08 
Release:    1%{?dist}
# lib/MooseX/Traits/Pluggable.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A pluggable extension to MooseX::Traits 
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Traits-Pluggable-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Traits-Pluggable
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Class::MOP) >= 0.84
BuildRequires: perl(CPAN)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Moose)
BuildRequires: perl(Moose::Role)
BuildRequires: perl(namespace::autoclean)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)

%description
This module adds support for class precedence search for traits and some
extra attributes, described below.

See the MooseX::Traits manpage for more information.  

%{?perl_default_filter}

%prep
%setup -q -n MooseX-Traits-Pluggable-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- submission
- br CPAN for inc::Module::Install::AutoInstall

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:19:06 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:33:43 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Traits-Pluggable-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Pluggable/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:19:07 -0000	1.1
+++ sources	4 Sep 2009 02:33:43 -0000	1.2
@@ -0,0 +1 @@
+a74230bcf3e624344d012cb50e057c0f  MooseX-Traits-Pluggable-0.08.tar.gz



From hno at fedoraproject.org  Fri Sep  4 02:37:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 02:37:45 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.135,1.136
Message-ID: <20090904023745.2007411C01EA@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6390

Modified Files:
	squid.spec 
Log Message:
3.1: Remove obsolete language setting


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- squid.spec	31 Aug 2009 18:36:45 -0000	1.135
+++ squid.spec	4 Sep 2009 02:37:44 -0000	1.136
@@ -234,95 +234,6 @@ exit 0
 
 %post
 /sbin/chkconfig --add squid
-if [ $1 = 0 ]; then
- case "$LANG" in
-  bg*)
-     DIR=Bulgarian
-     ;;
-  ca*)
-     DIR=Catalan
-     ;;
-  cs*)
-     DIR=Czech
-     ;;
-  da*)
-     DIR=Danish
-     ;;
-  nl*)
-     DIR=Dutch
-     ;;
-  en*)
-     DIR=English
-     ;;
-  ea*)
-     DIR=Estonian
-     ;;
-  fi*)
-     DIR=Finnish
-     ;;
-  fr*)
-     DIR=French
-     ;;
-  de*)
-     DIR=German
-     ;;
-  he*)
-     DIR=Hebrew
-     ;;
-  hu*)
-     DIR=Hungarian
-     ;;
-  it*)
-     DIR=Italian
-     ;;
-  ja*)
-     DIR=Japanese
-     ;;
-  kr*)
-     DIR=Korean
-     ;;
-  pl*)
-     DIR=Polish
-     ;;
-  pt*)
-     DIR=Portuguese
-     ;;
-  ro*)
-     DIR=Romanian
-     ;;
-  ru*)
-     DIR=Russian-koi8-r
-     ;;
-  sr*)
-     DIR=Serbian
-     ;;
-  sk*)
-     DIR=Slovak
-     ;;
-  es*)
-     DIR=Spanish
-     ;;
-  sv*)
-     DIR=Swedish
-     ;;
-  zh_TW*)
-     DIR=Traditional_Chinese
-     ;;
-  zh_CN*)
-     DIR=Simplify_Chinese
-     ;;
-  tr*)
-     DIR=Turkish
-     ;;
-  greek)
-     DIR=Greek
-     ;;
-  *)
-     DIR=English
-     ;;
- esac
- ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
-fi
 
 %preun
 if [ $1 = 0 ] ; then



From tomspur at fedoraproject.org  Fri Sep  4 02:45:51 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri,  4 Sep 2009 02:45:51 +0000 (UTC)
Subject: rpms/gbirthday/devel gbirthday.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904024551.0D73411C01EA@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7465/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gbirthday.spec import.log 
Log Message:
Initial import (#513083).


--- NEW FILE gbirthday.spec ---
Name:			gbirthday
Version:		0.4.2
Release:		1%{?dist}
Summary:		Birthday reminder for evolution
Group:			User Interface/Desktops
License:		GPLv2+
URL:			http://gbirthday.sourceforge.net
Source:			http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.lzma
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch

BuildRequires:	desktop-file-utils
Requires:		evolution
Requires:		python
Requires:		pygtk2

%description
GBirthday is a birthday reminder application that helps you to remember 
your evolution contacts' birthdays.
It puts an icon on notification area which will blink when there is any 
of your contacts' birthday today. You can also check if there is any of 
your contacs' birthday on next days.

%prep
%setup -q -c %{name}-%{version}

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart/
desktop-file-install \
	--add-category="TrayIcon" \
	--add-only-show-in="GNOME;KDE;XFCE;" \
	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
	%{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_bindir}/gbirthday
%{_datadir}/applications/%{name}.desktop
%{_datadir}/gbirthday/
%{_datadir}/pixmaps/gbirthday
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop

%changelog
* Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
- new release

* Sat Aug 8 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-5
- desktop file is now config
- only start if a system tray is present

* Fri Jul 31 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-4
- License is GPLv2+
- deleting patches now applied upstream

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-3
- use only buildroot

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-2
- changing name of *.patch
- properly install .desktop-file in /etc/xdg/autostart/ too
- new Group: "User Interface/Desktops"

* Thu Jul 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-1
- Inital version of this spec file


--- NEW FILE import.log ---
gbirthday-0_4_2-1_fc11:HEAD:gbirthday-0.4.2-1.fc11.src.rpm:1252032048


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:24:50 -0000	1.1
+++ .cvsignore	4 Sep 2009 02:45:50 -0000	1.2
@@ -0,0 +1 @@
+gbirthday-0.4.2.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:24:50 -0000	1.1
+++ sources	4 Sep 2009 02:45:50 -0000	1.2
@@ -0,0 +1 @@
+c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma



From hno at fedoraproject.org  Fri Sep  4 02:47:39 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 02:47:39 +0000 (UTC)
Subject: rpms/squid/devel squid.spec-3.1,1.7,1.8
Message-ID: <20090904024739.7A8CB11C01EA@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7806

Modified Files:
	squid.spec-3.1 
Log Message:
3.1: syncronise with 3.0 spec changelog


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- squid.spec-3.1	4 Sep 2009 02:11:01 -0000	1.7
+++ squid.spec-3.1	4 Sep 2009 02:47:39 -0000	1.8
@@ -2,13 +2,6 @@
 %define __perl_requires %{SOURCE98}
 ## % define __find_requires %{SOURCE99}
 
-# TODO:
-# - Still several patches to rebase. Is all really needed? Some should
-#   be possible to override with buildtime variables
-# - Error pages have changed. Squid now to language negotiation
-# - Should helpers be split in their own packages? Starting to have a fair
-#   bit of dependencies there
-
 Name:     squid
 Version:  3.1.0.13
 Release:  1%{?dist}
@@ -86,7 +79,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
-   --with-logdir='$(localstatedir)/logs' \
+   --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
@@ -342,22 +335,41 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 3.0.STABLE16-2
+* Mon Aug 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE18-3
+- Bug #520445 silence logrotate when Squid is not running
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE18-2
+- rebuilt with new openssl
+
+* Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
+- Update to 3.0.STABLE18
+
+* Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
+- Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
+
+* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-2
+- Bug #514014, update to 3.0.STABLE17 fixing the denial of service issues
+  mentioned in Squid security advisory SQUID-2009_2.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:3.0.STABLE16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 7:3.0.STABLE16-2
 - fixed patch parameter of bXXX patches
 
-* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE16-1
+* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE16-1
 - Upgrade to 3.0.STABLE16
 
-* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE15-2
+* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE15-2
 - Bug #453304 - Squid requires restart after Network Manager connection setup
 
-* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE15-1
+* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE15-1
 - Upgrade to 3.0.STABLE15
 
-* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE14-3
 - fixed ambiguous condition in the init script (exit 4)
 
-* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
 
 * Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1



From tomspur at fedoraproject.org  Fri Sep  4 02:53:22 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri,  4 Sep 2009 02:53:22 +0000 (UTC)
Subject: rpms/gbirthday/F-11 gbirthday.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090904025322.D846B11C01EA@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8855

Modified Files:
	sources 
Added Files:
	gbirthday.spec 
Log Message:
Initial import (#513083).



--- NEW FILE gbirthday.spec ---
Name:			gbirthday
Version:		0.4.2
Release:		1%{?dist}
Summary:		Birthday reminder for evolution
Group:			User Interface/Desktops
License:		GPLv2+
URL:			http://gbirthday.sourceforge.net
Source:			http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.lzma
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch

BuildRequires:	desktop-file-utils
Requires:		evolution
Requires:		python
Requires:		pygtk2

%description
GBirthday is a birthday reminder application that helps you to remember 
your evolution contacts' birthdays.
It puts an icon on notification area which will blink when there is any 
of your contacts' birthday today. You can also check if there is any of 
your contacs' birthday on next days.

%prep
%setup -q -c %{name}-%{version}

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart/
desktop-file-install \
	--add-category="TrayIcon" \
	--add-only-show-in="GNOME;KDE;XFCE;" \
	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
	%{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_bindir}/gbirthday
%{_datadir}/applications/%{name}.desktop
%{_datadir}/gbirthday/
%{_datadir}/pixmaps/gbirthday
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop

%changelog
* Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
- new release

* Sat Aug 8 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-5
- desktop file is now config
- only start if a system tray is present

* Fri Jul 31 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-4
- License is GPLv2+
- deleting patches now applied upstream

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-3
- use only buildroot

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-2
- changing name of *.patch
- properly install .desktop-file in /etc/xdg/autostart/ too
- new Group: "User Interface/Desktops"

* Thu Jul 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-1
- Inital version of this spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:24:50 -0000	1.1
+++ sources	4 Sep 2009 02:53:22 -0000	1.2
@@ -0,0 +1 @@
+c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma



From hno at fedoraproject.org  Fri Sep  4 02:57:32 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 02:57:32 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.136,1.137 squid.spec-3.1,1.8,1.9
Message-ID: <20090904025732.7DE6F11C01EA@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10351

Modified Files:
	squid.spec squid.spec-3.1 
Log Message:
Move 3.1 change to the right spec file


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- squid.spec	4 Sep 2009 02:37:44 -0000	1.136
+++ squid.spec	4 Sep 2009 02:57:32 -0000	1.137
@@ -234,6 +234,95 @@ exit 0
 
 %post
 /sbin/chkconfig --add squid
+if [ $1 = 0 ]; then
+ case "$LANG" in
+  bg*)
+     DIR=Bulgarian
+     ;;
+  ca*)
+     DIR=Catalan
+     ;;
+  cs*)
+     DIR=Czech
+     ;;
+  da*)
+     DIR=Danish
+     ;;
+  nl*)
+     DIR=Dutch
+     ;;
+  en*)
+     DIR=English
+     ;;
+  ea*)
+     DIR=Estonian
+     ;;
+  fi*)
+     DIR=Finnish
+     ;;
+  fr*)
+     DIR=French
+     ;;
+  de*)
+     DIR=German
+     ;;
+  he*)
+     DIR=Hebrew
+     ;;
+  hu*)
+     DIR=Hungarian
+     ;;
+  it*)
+     DIR=Italian
+     ;;
+  ja*)
+     DIR=Japanese
+     ;;
+  kr*)
+     DIR=Korean
+     ;;
+  pl*)
+     DIR=Polish
+     ;;
+  pt*)
+     DIR=Portuguese
+     ;;
+  ro*)
+     DIR=Romanian
+     ;;
+  ru*)
+     DIR=Russian-koi8-r
+     ;;
+  sr*)
+     DIR=Serbian
+     ;;
+  sk*)
+     DIR=Slovak
+     ;;
+  es*)
+     DIR=Spanish
+     ;;
+  sv*)
+     DIR=Swedish
+     ;;
+  zh_TW*)
+     DIR=Traditional_Chinese
+     ;;
+  zh_CN*)
+     DIR=Simplify_Chinese
+     ;;
+  tr*)
+     DIR=Turkish
+     ;;
+  greek)
+     DIR=Greek
+     ;;
+  *)
+     DIR=English
+     ;;
+ esac
+ ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
+fi
 
 %preun
 if [ $1 = 0 ] ; then


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- squid.spec-3.1	4 Sep 2009 02:47:39 -0000	1.8
+++ squid.spec-3.1	4 Sep 2009 02:57:32 -0000	1.9
@@ -228,95 +228,6 @@ exit 0
 
 %post
 /sbin/chkconfig --add squid
-if [ $1 = 0 ]; then
- case "$LANG" in
-  bg*)
-     DIR=Bulgarian
-     ;;
-  ca*)
-     DIR=Catalan
-     ;;
-  cs*)
-     DIR=Czech
-     ;;
-  da*)
-     DIR=Danish
-     ;;
-  nl*)
-     DIR=Dutch
-     ;;
-  en*)
-     DIR=English
-     ;;
-  ea*)
-     DIR=Estonian
-     ;;
-  fi*)
-     DIR=Finnish
-     ;;
-  fr*)
-     DIR=French
-     ;;
-  de*)
-     DIR=German
-     ;;
-  he*)
-     DIR=Hebrew
-     ;;
-  hu*)
-     DIR=Hungarian
-     ;;
-  it*)
-     DIR=Italian
-     ;;
-  ja*)
-     DIR=Japanese
-     ;;
-  kr*)
-     DIR=Korean
-     ;;
-  pl*)
-     DIR=Polish
-     ;;
-  pt*)
-     DIR=Portuguese
-     ;;
-  ro*)
-     DIR=Romanian
-     ;;
-  ru*)
-     DIR=Russian-koi8-r
-     ;;
-  sr*)
-     DIR=Serbian
-     ;;
-  sk*)
-     DIR=Slovak
-     ;;
-  es*)
-     DIR=Spanish
-     ;;
-  sv*)
-     DIR=Swedish
-     ;;
-  zh_TW*)
-     DIR=Traditional_Chinese
-     ;;
-  zh_CN*)
-     DIR=Simplify_Chinese
-     ;;
-  tr*)
-     DIR=Turkish
-     ;;
-  greek)
-     DIR=Greek
-     ;;
-  *)
-     DIR=English
-     ;;
- esac
- ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
-fi
 
 %preun
 if [ $1 = 0 ] ; then



From tomspur at fedoraproject.org  Fri Sep  4 03:03:45 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri,  4 Sep 2009 03:03:45 +0000 (UTC)
Subject: rpms/gbirthday/F-10 gbirthday.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090904030345.1A8A111C01EA@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12908

Modified Files:
	sources 
Added Files:
	gbirthday.spec 
Log Message:
Initial import (#513083).



--- NEW FILE gbirthday.spec ---
Name:			gbirthday
Version:		0.4.2
Release:		1%{?dist}
Summary:		Birthday reminder for evolution
Group:			User Interface/Desktops
License:		GPLv2+
URL:			http://gbirthday.sourceforge.net
Source:			http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.lzma
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch

BuildRequires:	desktop-file-utils
Requires:		evolution
Requires:		python
Requires:		pygtk2

%description
GBirthday is a birthday reminder application that helps you to remember 
your evolution contacts' birthdays.
It puts an icon on notification area which will blink when there is any 
of your contacts' birthday today. You can also check if there is any of 
your contacs' birthday on next days.

%prep
%setup -q -c %{name}-%{version}

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart/
desktop-file-install \
	--add-category="TrayIcon" \
	--add-only-show-in="GNOME;KDE;XFCE;" \
	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
	%{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_bindir}/gbirthday
%{_datadir}/applications/%{name}.desktop
%{_datadir}/gbirthday/
%{_datadir}/pixmaps/gbirthday
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop

%changelog
* Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
- new release

* Sat Aug 8 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-5
- desktop file is now config
- only start if a system tray is present

* Fri Jul 31 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-4
- License is GPLv2+
- deleting patches now applied upstream

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-3
- use only buildroot

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-2
- changing name of *.patch
- properly install .desktop-file in /etc/xdg/autostart/ too
- new Group: "User Interface/Desktops"

* Thu Jul 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-1
- Inital version of this spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:24:50 -0000	1.1
+++ sources	4 Sep 2009 03:03:44 -0000	1.2
@@ -0,0 +1 @@
+c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma



From tomspur at fedoraproject.org  Fri Sep  4 03:05:18 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri,  4 Sep 2009 03:05:18 +0000 (UTC)
Subject: rpms/gbirthday/EL-5 gbirthday.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090904030518.BED4511C01EA@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13196

Modified Files:
	sources 
Added Files:
	gbirthday.spec 
Log Message:
Initial import (#513083).



--- NEW FILE gbirthday.spec ---
Name:			gbirthday
Version:		0.4.2
Release:		1%{?dist}
Summary:		Birthday reminder for evolution
Group:			User Interface/Desktops
License:		GPLv2+
URL:			http://gbirthday.sourceforge.net
Source:			http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.lzma
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:		noarch

BuildRequires:	desktop-file-utils
Requires:		evolution
Requires:		python
Requires:		pygtk2

%description
GBirthday is a birthday reminder application that helps you to remember 
your evolution contacts' birthdays.
It puts an icon on notification area which will blink when there is any 
of your contacts' birthday today. You can also check if there is any of 
your contacs' birthday on next days.

%prep
%setup -q -c %{name}-%{version}

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart/
desktop-file-install \
	--add-category="TrayIcon" \
	--add-only-show-in="GNOME;KDE;XFCE;" \
	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
	%{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_bindir}/gbirthday
%{_datadir}/applications/%{name}.desktop
%{_datadir}/gbirthday/
%{_datadir}/pixmaps/gbirthday
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop

%changelog
* Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
- new release

* Sat Aug 8 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-5
- desktop file is now config
- only start if a system tray is present

* Fri Jul 31 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-4
- License is GPLv2+
- deleting patches now applied upstream

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-3
- use only buildroot

* Wed Jul 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-2
- changing name of *.patch
- properly install .desktop-file in /etc/xdg/autostart/ too
- new Group: "User Interface/Desktops"

* Thu Jul 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.1-1
- Inital version of this spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:24:50 -0000	1.1
+++ sources	4 Sep 2009 03:05:18 -0000	1.2
@@ -0,0 +1 @@
+c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma



From jcollie at fedoraproject.org  Fri Sep  4 03:14:10 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  4 Sep 2009 03:14:10 +0000 (UTC)
Subject: rpms/asterisk/F-10 .cvsignore, 1.20,
	1.21 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.8,
	1.9 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 
	1.7, 1.8 asterisk-strip.sh, 1.4, 1.5 asterisk.spec, 1.44,
	1.45 sources, 1.20,
	1.21 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.7,
	NONE 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.7,
	NONE 0007-Build-using-external-libedit.patch, 1.7,
	NONE 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 
	1.4, NONE 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,
	1.4, NONE 0012-Merged-revisions-162275-via-svnmerge-from.patch,
	1.3, NONE 0013-Update-autoconf.patch, 1.3,
	NONE 0016-Fix-a-reversed-logic-ast_strlen_zero.patch, 1.1, NONE
Message-ID: <20090904031410.76A4711C01EA@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14457

Modified Files:
	.cvsignore 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	asterisk-strip.sh asterisk.spec sources 
Removed Files:
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch 
	0016-Fix-a-reversed-logic-ast_strlen_zero.patch 
Log Message:
* Thu Sep  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-1
- Drop chan_mobile, too difficult to maintain as a patch
- Update to 1.6.0.15 and drop unneeded patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	23 Jan 2009 22:30:35 -0000	1.20
+++ .cvsignore	4 Sep 2009 03:14:09 -0000	1.21
@@ -1 +1,3 @@
-asterisk-1.6.0.5-stripped.tar.gz
+asterisk-1.6.0.15-stripped.tar.gz
+asterisk-1.6.0.15.tar.gz.asc
+asterisk-developer-pubring.gpg

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
 modules.conf.sample |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Jan 2009 03:10:28 -0000	1.8
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Sep 2009 03:14:09 -0000	1.9
@@ -1,20 +1,13 @@
-From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
-Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
-
----
- configs/modules.conf.sample |   27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
-
-diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
-index 2ca3c03..ae20637 100644
---- a/configs/modules.conf.sample
-+++ b/configs/modules.conf.sample
-@@ -37,3 +37,30 @@ load => res_musiconhold.so
+Index: configs/modules.conf.sample
+===================================================================
+--- configs/modules.conf.sample	(revision 216221)
++++ configs/modules.conf.sample	(working copy)
+@@ -36,4 +36,30 @@
+ ;
  noload => chan_alsa.so
  ;noload => chan_oss.so
- ;noload => chan_console.so
+-noload => chan_console.so
++;noload => chan_console.so
 +
 +;
 +; Voicemail storage selection
@@ -41,7 +34,3 @@ index 2ca3c03..ae20637 100644
 +;
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
-+
--- 
-1.6.1
-

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:
 Makefile |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Jan 2009 03:10:28 -0000	1.7
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Sep 2009 03:14:09 -0000	1.8
@@ -1,53 +1,17 @@
-From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
-From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
-Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/15] Minor changes to reduce packaging changes made by the Fedora maintainer.
- (closes issue #12974)
-  Reported by: jcollie
-  Patches:
-        0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412)
-
-git-svn-id: http://svn.digium.com/svn/asterisk/trunk at 134312 614ede4d-c843-0410-af14-a771ab80d22e
----
- Makefile |   16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 788e524..05a58d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -222,10 +222,16 @@ ifeq ($(OSARCH),linux-gnu)
- endif
- 
- ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
--ASTCFLAGS+=-pipe
-+  ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
-+    ASTCFLAGS+=-pipe
-+  endif
-+endif
-+
-+ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
-+  ASTCFLAGS+=-Wall
- endif
- 
--ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-+ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
- 
- ifeq ($(AST_DEVMODE),yes)
-   ASTCFLAGS+=-Werror
-@@ -242,8 +248,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
-   ASTLDFLAGS+=-L/usr/local/lib
+Index: Makefile
+===================================================================
+--- Makefile	(revision 216221)
++++ Makefile	(working copy)
+@@ -241,8 +241,10 @@
+   _ASTCFLAGS+=-isystem /usr/local/include
  endif
  
 -ifneq ($(PROC),ultrasparc)
--  ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+ifeq ($(findstring -march,$(ASTCFLAGS)),)
+-  _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
++ifeq ($(findstring -march,$(_ASTCFLAGS)),)
 +  ifneq ($(PROC),ultrasparc)
-+    ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
++    _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 +  endif
  endif
  
  ifeq ($(PROC),ppc)
--- 
-1.6.1
-


Index: asterisk-strip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk-strip.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- asterisk-strip.sh	10 Oct 2008 17:16:34 -0000	1.4
+++ asterisk-strip.sh	4 Sep 2009 03:14:10 -0000	1.5
@@ -1,11 +1,45 @@
 #!/bin/sh
 
 version=$1
+
+if [ -z $version ]; then
+    echo "Please specify a version!"
+    exit 1
+fi
+
+wget --continue --timestamping http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz \
+                               http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz.asc
+
+if [ ! $? ]; then
+    echo "Unable to download!"
+    exit 1
+fi
+
 if [ ! -f asterisk-$version.tar.gz ]; then
     echo "Can't find asterisk-$version.tar.gz!"
     exit 1
 fi
 
+if [ ! -f asterisk-$version.tar.gz.asc ]; then
+    echo "Can't find asterisk-$version.tar.gz.asc!"
+    exit 1
+fi
+
+gpg --keyring=$(pwd)/asterisk-developer-pubring.gpg --verify asterisk-$version.tar.gz.asc asterisk-$version.tar.gz
+
+if [ ! $? ]; then
+    echo "Bad signature!!!!"
+    exit 1
+fi
+
+echo
+read -p "Does the GPG signature look OK? " -n 1
+echo
+
+if [ $REPLY != "Y" -a $REPLY != "y" ]; then
+    exit 1
+fi
+
 tar xf asterisk-$version.tar.gz
 rm asterisk-$version/sounds/*.tar.gz
 tar czf asterisk-$version-stripped.tar.gz asterisk-$version
@@ -18,5 +52,9 @@ echo "#"
 echo "# SHA1 Sums"
 echo "# ========="
 sha1sum asterisk-$version.tar.gz  asterisk-$version-stripped.tar.gz  | sed -e 's/^/# /'
+echo "#"
+echo "# SHA256 Sums"
+echo "# ========="
+sha256sum asterisk-$version.tar.gz  asterisk-$version-stripped.tar.gz  | sed -e 's/^/# /'
 
-
+make new-sources FILES="asterisk-$version-stripped.tar.gz asterisk-$version.tar.gz.asc asterisk-developer-pubring.gpg"


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- asterisk.spec	24 Jan 2009 03:16:32 -0000	1.44
+++ asterisk.spec	4 Sep 2009 03:14:10 -0000	1.45
@@ -2,8 +2,8 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.5
-Release: 2%{?dist}
+Version: 1.6.0.15
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,18 @@ URL: http://www.asterisk.org/
 
 # MD5 Sums
 # ========
-# 11210cf7c59cde03d928743e71fcb556  asterisk-1.6.0.5.tar.gz
-# 29bdc7428266b75aac77d66acd8c88a0  asterisk-1.6.0.5-stripped.tar.gz
+# d319f52d8d1d70f69583901e56720c30  asterisk-1.6.0.15.tar.gz
+# 99f689457465e013f3402dfe029967ee  asterisk-1.6.0.15-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# f2a2cd9be274dc4a7e6001f877197863b4ba8e15  asterisk-1.6.0.5.tar.gz
-# 25b92e9675d72c784018bddf0ddb458cab9e4185  asterisk-1.6.0.5-stripped.tar.gz
+# 31b2ad242d103cef7509e0fae4f31eb0b00a855e  asterisk-1.6.0.15.tar.gz
+# 1326c6ab27b22dc447905293b54b1f1af2f91c18  asterisk-1.6.0.15-stripped.tar.gz
+#
+# SHA256 Sums
+# =========
+# 159bf2c39ed2926d97f535c8d46bcf6c80853bab1269d596241c6ed30b27b92a  asterisk-1.6.0.15.tar.gz
+# 823ff57f5ae10e5ff5ca711ab52d0bc30148e94d1ef9f80de499d8ce28520242  asterisk-1.6.0.15-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -37,22 +42,15 @@ Patch1:  0001-Modify-init-scripts-for-be
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch3:  0003-Allow-alternate-extensions-to-be-specified-in-users.patch
 Patch4:  0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
-Patch5:  0005-Add-chan_mobile-from-asterisk-addons.patch
-Patch6:  0006-Use-pkgconfig-to-check-for-Lua.patch
-Patch7:  0007-Build-using-external-libedit.patch
 Patch8:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch9:  0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
-Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
-Patch13: 0013-Update-autoconf.patch
 Patch14: 0014-Fix-up-some-paths.patch
 Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch16: 0016-Fix-a-reversed-logic-ast_strlen_zero.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-#BuildRequires: autoconf
-#BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: automake
 
 # core build requirements
 BuildRequires: openssl-devel
@@ -81,9 +79,6 @@ BuildRequires: libvorbis-devel
 # codec_gsm
 BuildRequires: gsm-devel
 
-# cli
-BuildRequires: libedit-devel
-
 Requires(pre): %{_sbindir}/useradd
 Requires(pre): %{_sbindir}/groupadd
 Requires(post): /sbin/chkconfig
@@ -93,6 +88,9 @@ Requires(preun): /sbin/service
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 
+# we are dropping the chan_mobile patch
+Obsoletes: asterisk-mobile <= 1.6.0.5-2
+
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
 all of the features you would expect from a PBX and more. Asterisk
@@ -264,15 +262,15 @@ Requires: asterisk = %{version}-%{releas
 %description minivm
 MiniVM application for Asterisk.
 
-%package mobile
-Summary: Asterisk channel driver for bluetooth phones and headsets
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-BuildRequires: bluez-libs-devel
-
-%description mobile
-Asterisk channel driver to allow Bluetooth cell/mobile phones to be
-used as FXO devices, and headsets as FXS devices.
+#%package mobile
+#Summary: Asterisk channel driver for bluetooth phones and headsets
+#Group: Applications/Internet
+#Requires: asterisk = %{version}-%{release}
+#BuildRequires: bluez-libs-devel
+#
+#%description mobile
+#Asterisk channel driver to allow Bluetooth cell/mobile phones to be
+#used as FXO devices, and headsets as FXS devices.
 
 %package odbc
 Summary: Applications for Asterisk that use ODBC (except voicemail)
@@ -423,20 +421,13 @@ local filesystem.
 %prep
 %setup0 -q
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch4 -p0
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -699,6 +690,7 @@ fi
 %{_libdir}/asterisk/modules/format_vox.so
 %{_libdir}/asterisk/modules/format_wav_gsm.so
 %{_libdir}/asterisk/modules/format_wav.so
+%{_libdir}/asterisk/modules/func_audiohookinherit.so
 %{_libdir}/asterisk/modules/func_base64.so
 %{_libdir}/asterisk/modules/func_blacklist.so
 %{_libdir}/asterisk/modules/func_callerid.so
@@ -751,14 +743,14 @@ fi
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.so
 
-#%{_sbindir}/aelparse
+%{_sbindir}/aelparse
 %{_sbindir}/astcanary
 %{_sbindir}/asterisk
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
-%{_sbindir}/check_expr
-#%{_sbindir}/conf2ael
+#%{_sbindir}/check_expr
+%{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
 %{_sbindir}/safe_asterisk
@@ -956,11 +948,11 @@ fi
 %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
-%files mobile
-%defattr(-,root,root,-)
-%doc doc/chan_mobile.txt
-%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
-%{_libdir}/asterisk/modules/chan_mobile.so
+#%files mobile
+#%defattr(-,root,root,-)
+#%doc doc/chan_mobile.txt
+#%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
+#%{_libdir}/asterisk/modules/chan_mobile.so
 
 %files odbc
 %defattr(-,root,root,-)
@@ -1054,6 +1046,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Sep  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-1
+- Drop chan_mobile, too difficult to maintain as a patch
+- Update to 1.6.0.15 and drop unneeded patches
+
 * Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-2
 - Add a patch to fix a problem with the manager interface.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	23 Jan 2009 22:30:35 -0000	1.20
+++ sources	4 Sep 2009 03:14:10 -0000	1.21
@@ -1 +1,3 @@
-29bdc7428266b75aac77d66acd8c88a0  asterisk-1.6.0.5-stripped.tar.gz
+99f689457465e013f3402dfe029967ee  asterisk-1.6.0.15-stripped.tar.gz
+050fc71eae387ee71d751fb53a060a78  asterisk-1.6.0.15.tar.gz.asc
+4c2feab99acb254a49048b93da97ad42  asterisk-developer-pubring.gpg


--- 0005-Add-chan_mobile-from-asterisk-addons.patch DELETED ---


--- 0006-Use-pkgconfig-to-check-for-Lua.patch DELETED ---


--- 0007-Build-using-external-libedit.patch DELETED ---


--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch DELETED ---


--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch DELETED ---


--- 0012-Merged-revisions-162275-via-svnmerge-from.patch DELETED ---


--- 0013-Update-autoconf.patch DELETED ---


--- 0016-Fix-a-reversed-logic-ast_strlen_zero.patch DELETED ---



From jcollie at fedoraproject.org  Fri Sep  4 03:22:54 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  4 Sep 2009 03:22:54 +0000 (UTC)
Subject: rpms/gramps/F-11 .cvsignore, 1.27, 1.28 gramps.spec, 1.46,
	1.47 sources, 1.27, 1.28
Message-ID: <20090904032254.7047511C01EA@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gramps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15599

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Fri Aug 21 2009 Warren Togami <wtogami at redhat.com> - 3.1.2-1
- 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	10 Mar 2009 13:09:12 -0000	1.27
+++ .cvsignore	4 Sep 2009 03:22:53 -0000	1.28
@@ -1 +1 @@
-gramps-3.1.1.tar.gz
+gramps-3.1.2.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-11/gramps.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gramps.spec	27 Mar 2009 04:43:27 -0000	1.46
+++ gramps.spec	4 Sep 2009 03:22:53 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        3.1.1
-Release:        3%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -122,6 +122,12 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Aug 21 2009 Warren Togami <wtogami at redhat.com> - 3.1.2-1
+- 3.1.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 27 2009 Warren Togami <wtogami at redhat.com> - 3.1.1-3
 - frefont -> gnu-free* automatic detected for Fedora 11+
   Turns out gramps used them during PDF chart generation.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	10 Mar 2009 13:09:12 -0000	1.27
+++ sources	4 Sep 2009 03:22:53 -0000	1.28
@@ -1 +1 @@
-c99ddec4a984989202e25c667fce9984  gramps-3.1.1.tar.gz
+c2e825a212524e78cae9ddbbcb96a302  gramps-3.1.2.tar.gz



From hno at fedoraproject.org  Fri Sep  4 03:39:43 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 03:39:43 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.47, 1.48 sources, 1.50,
	1.51 squid.init, 
	1.13, 1.14 squid.spec, 1.137, 1.138 squid.sysconfig, 1.2,
	1.3 FAQ.sgml, 1.6, NONE import.log, 1.1,
	NONE squid-3.0.STABLE1-build.patch, 1.4,
	NONE squid-3.0.STABLE1-config.patch, 1.3,
	NONE squid-3.0.STABLE1-location.patch, 1.2,
	NONE squid-3.0.STABLE15-smb-path.patch, 1.1, NONE squid.spec-3.1,
	1.9, NONE
Message-ID: <20090904033943.38D9111C01EA@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301

Modified Files:
	.cvsignore sources squid.init squid.spec squid.sysconfig 
Removed Files:
	FAQ.sgml import.log squid-3.0.STABLE1-build.patch 
	squid-3.0.STABLE1-config.patch 
	squid-3.0.STABLE1-location.patch 
	squid-3.0.STABLE15-smb-path.patch squid.spec-3.1 
Log Message:
Update to Squid-3.1

  - IPv6 support
  - NTLM passthru
  - Follow X-Forwarded-For
  - and more



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	4 Aug 2009 19:56:19 -0000	1.47
+++ .cvsignore	4 Sep 2009 03:39:42 -0000	1.48
@@ -1 +1,3 @@
-squid-3.0.STABLE18.tar.bz2
+squid-3.1.0.13.tar.bz2
+squid-3.1.0.13.tar.bz2.asc
+b9694.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	4 Aug 2009 19:56:19 -0000	1.50
+++ sources	4 Sep 2009 03:39:42 -0000	1.51
@@ -1 +1,3 @@
-ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2
+a7e3f6c35853a8ad200ba448004417da  squid-3.1.0.13.tar.bz2
+56e2fc1fc8bc3c24d77daf4d5bb8c768  squid-3.1.0.13.tar.bz2.asc
+c764a5ffa0171ffadf61011dc8dd4cad  b9694.patch


Index: squid.init
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- squid.init	28 Apr 2009 09:11:55 -0000	1.13
+++ squid.init	4 Sep 2009 03:39:42 -0000	1.14
@@ -29,7 +29,7 @@ fi
 
 # don't raise an error if the config file is incomplete
 # set defaults instead:
-SQUID_OPTS=${SQUID_OPTS:-"-D"}
+SQUID_OPTS=${SQUID_OPTS:-""}
 SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
 SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}
 SQUID_CONF=${SQUID_CONF:-"/etc/squid/squid.conf"}
@@ -42,7 +42,6 @@ prog="$SQUID"
 # determine which one is the cache_swap directory
 CACHE_SWAP=`sed -e 's/#.*//g' $SQUID_CONF | \
 	grep cache_dir | awk '{ print $3 }'`
-[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/spool/squid
 
 RETVAL=0
 
@@ -71,7 +70,7 @@ start() {
 	for adir in $CACHE_SWAP; do
 		if [ ! -d $adir/00 ]; then
 			echo -n "init_cache_dir $adir... "
-			$SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
+			$SQUID -z -F >> /var/log/squid/squid.out 2>&1
 		fi
 	done
 	echo -n $"Starting $prog: "


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- squid.spec	4 Sep 2009 02:57:32 -0000	1.137
+++ squid.spec	4 Sep 2009 03:39:42 -0000	1.138
@@ -3,15 +3,15 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE18
-Release:  3%{?dist}
+Version:  3.1.0.13
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
-Source:   http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2
-Source1:  FAQ.sgml
+Source:   http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2
+Source1:  http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
 Source2:  squid.init
 Source3:  squid.logrotate
 Source4:  squid.sysconfig
@@ -21,19 +21,24 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
+# Upstream fix, but have not reached 3.1 yet
+Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
+Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
+Patch005: squid-3.1.0.13-alias-link.patch
 
 # External patches
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-3.0.STABLE1-config.patch
-Patch202: squid-3.0.STABLE1-location.patch
-Patch203: squid-3.0.STABLE1-build.patch
+Patch201: squid-3.1.0.9-config.patch
+Patch202: squid-3.1.0.9-location.patch
+Patch203: squid-3.1.0.13-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
-Patch205: squid-3.0.STABLE15-smb-path.patch
+Patch205: squid-3.1.0.13-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +47,7 @@ Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
+BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
 Obsoletes: squid-novm
 
 %description
@@ -60,6 +65,11 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9694
+%patch002 -p0 -b .b9696
+%patch003 -p0 -b .b9704
+%patch004 -p0 -b .b9707
+%patch005 -p0 -b .alias-link
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -71,34 +81,35 @@ lookup program (dnsserver), a program fo
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
 %configure \
    --exec_prefix=/usr \
-   --bindir=%{_sbindir} \
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
+   --with-logdir='$(localstatedir)/log/squid' \
+   --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
+   --enable-follow-x-forwarded-for \
    --enable-auth="basic,digest,ntlm,negotiate" \
-   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
+   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
+   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
+   --enable-digest-auth-helpers="password,ldap,eDirectory" \
+   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
-   --enable-digest-auth-helpers="password" \
    --enable-epoll \
-   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
    --enable-icap-client \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-ntlm-auth-helpers="SMB,fakeauth" \
    --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
    --enable-ssl \
-   --enable-storeio="aufs,diskd,null,ufs" \
+   --enable-storeio="aufs,diskd,ufs" \
    --enable-useragent-log \
    --enable-wccpv2 \
    --with-aio \
@@ -108,27 +119,17 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-openssl=/usr/kerberos \
    --with-pthreads
 
-# following options are no longer supported
-#   --with-winbind-auth-challenge \
-#   --enable-follow-x-forwarded-for \
-#   --enable-fd-config \
-#   --with-maxfd=16384 \
-#   --enable-underscores \
+# following options should be enabled but fails building
+#   --enable-negotiate-auth-helpers="squid_kerb_auth"
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
 
-mkdir faq
-cp %{SOURCE1} faq
-cd faq
-sgml2html FAQ.sgml
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall  \
         sysconfdir=$RPM_BUILD_ROOT/etc/squid \
         localstatedir=$RPM_BUILD_ROOT/var \
-        bindir=$RPM_BUILD_ROOT/%{_sbindir} \
         libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
 echo "
 #
@@ -146,9 +147,6 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi 
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
-ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
-
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
@@ -167,8 +165,11 @@ chmod 644 contrib/url-normalizer.pl cont
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
+# squid.conf.documented is documentation. We ship that in doc/
+rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
+
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
+rm -f $RPM_BUILD_ROOT%{_bindir}/{RunAccel,RunCache}
 rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
 
 %clean
@@ -176,41 +177,40 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc faq/*\.html README ChangeLog QUICKSTART
+%doc README ChangeLog QUICKSTART src/squid.conf.documented
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
 %attr(755,root,root) %dir /etc/squid
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
-%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
-%attr(4750,root,squid) %{_libdir}/squid/pam_auth
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
 %config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
 %config(noreplace) /etc/squid/mime.conf
+%config(noreplace) /etc/squid/errorpage.css
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
-%config(noreplace) /etc/squid/mib.txt
 # These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
 %config /etc/squid/mime.conf.default
+%config /etc/squid/errorpage.css.default
 %config /etc/squid/cachemgr.conf.default
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
 
-%config(noreplace) /etc/squid/errors
 %dir %{_datadir}/squid
 %attr(-,root,root) %{_datadir}/squid/errors
-%attr(-,root,root) /etc/squid/icons
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons
+%{_datadir}/squid/mib.txt
 %{_sbindir}/squid
-%{_sbindir}/squidclient
+%{_bindir}/squidclient
 %{_mandir}/man8/*
+%{_mandir}/man1/*
 %{_libdir}/squid/*
 
 %pre
@@ -234,95 +234,6 @@ exit 0
 
 %post
 /sbin/chkconfig --add squid
-if [ $1 = 0 ]; then
- case "$LANG" in
-  bg*)
-     DIR=Bulgarian
-     ;;
-  ca*)
-     DIR=Catalan
-     ;;
-  cs*)
-     DIR=Czech
-     ;;
-  da*)
-     DIR=Danish
-     ;;
-  nl*)
-     DIR=Dutch
-     ;;
-  en*)
-     DIR=English
-     ;;
-  ea*)
-     DIR=Estonian
-     ;;
-  fi*)
-     DIR=Finnish
-     ;;
-  fr*)
-     DIR=French
-     ;;
-  de*)
-     DIR=German
-     ;;
-  he*)
-     DIR=Hebrew
-     ;;
-  hu*)
-     DIR=Hungarian
-     ;;
-  it*)
-     DIR=Italian
-     ;;
-  ja*)
-     DIR=Japanese
-     ;;
-  kr*)
-     DIR=Korean
-     ;;
-  pl*)
-     DIR=Polish
-     ;;
-  pt*)
-     DIR=Portuguese
-     ;;
-  ro*)
-     DIR=Romanian
-     ;;
-  ru*)
-     DIR=Russian-koi8-r
-     ;;
-  sr*)
-     DIR=Serbian
-     ;;
-  sk*)
-     DIR=Slovak
-     ;;
-  es*)
-     DIR=Spanish
-     ;;
-  sv*)
-     DIR=Swedish
-     ;;
-  zh_TW*)
-     DIR=Traditional_Chinese
-     ;;
-  zh_CN*)
-     DIR=Simplify_Chinese
-     ;;
-  tr*)
-     DIR=Turkish
-     ;;
-  greek)
-     DIR=Greek
-     ;;
-  *)
-     DIR=English
-     ;;
- esac
- ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
-fi
 
 %preun
 if [ $1 = 0 ] ; then
@@ -341,6 +252,15 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-1
+- Upgrade to next upstream release 3.1.0.13 with many new features
+  * IPv6 support
+  * NTLM-passthru
+  * Kerberos/Negotiate authentication scheme support
+  * Localized error pages based on browser language preferences
+  * Follow X-Forwarded-For capability
+  * and more..
+
 * Mon Aug 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE18-3
 - Bug #520445 silence logrotate when Squid is not running
 


Index: squid.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.sysconfig	8 Oct 2008 06:45:52 -0000	1.2
+++ squid.sysconfig	4 Sep 2009 03:39:43 -0000	1.3
@@ -1,7 +1,5 @@
 # default squid options
-# -D disables initial dns checks. If you most likely will not to have an
-#    internet connection when you start squid, uncomment this
-SQUID_OPTS="-D"
+SQUID_OPTS=""
 
 # Time to wait for Squid to shut down when asked. Should not be necessary
 # most of the time.


--- FAQ.sgml DELETED ---


--- import.log DELETED ---


--- squid-3.0.STABLE1-build.patch DELETED ---


--- squid-3.0.STABLE1-config.patch DELETED ---


--- squid-3.0.STABLE1-location.patch DELETED ---


--- squid-3.0.STABLE15-smb-path.patch DELETED ---


--- squid.spec-3.1 DELETED ---



From hno at fedoraproject.org  Fri Sep  4 03:42:16 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 03:42:16 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore,1.48,1.49 sources,1.51,1.52
Message-ID: <20090904034216.CF21C11C01EA@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19837

Modified Files:
	.cvsignore sources 
Log Message:
3.1 sources uploaded


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	4 Sep 2009 03:39:42 -0000	1.48
+++ .cvsignore	4 Sep 2009 03:42:16 -0000	1.49
@@ -1,3 +1,6 @@
 squid-3.1.0.13.tar.bz2
 squid-3.1.0.13.tar.bz2.asc
 b9694.patch
+b9696.patch
+b9704.patch
+b9707.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	4 Sep 2009 03:39:42 -0000	1.51
+++ sources	4 Sep 2009 03:42:16 -0000	1.52
@@ -1,3 +1,6 @@
 a7e3f6c35853a8ad200ba448004417da  squid-3.1.0.13.tar.bz2
 56e2fc1fc8bc3c24d77daf4d5bb8c768  squid-3.1.0.13.tar.bz2.asc
 c764a5ffa0171ffadf61011dc8dd4cad  b9694.patch
+e7a8c54548fa45519d8c9d7a885a821a  b9696.patch
+bf71774b13a1506d9a1dffd2cd6daf34  b9704.patch
+a31a23ec33542a9ed2c486ee44c60550  b9707.patch



From jcollie at fedoraproject.org  Fri Sep  4 03:46:10 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  4 Sep 2009 03:46:10 +0000 (UTC)
Subject: rpms/asterisk/F-10 asterisk.spec,1.45,1.46
Message-ID: <20090904034610.5FDB011C01EA@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20342

Modified Files:
	asterisk.spec 
Log Message:
* Thu Sep  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-2
- Create /var/lib/asterisk/keys



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- asterisk.spec	4 Sep 2009 03:14:10 -0000	1.45
+++ asterisk.spec	4 Sep 2009 03:46:10 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -526,6 +526,7 @@ install -D -p -m 0755 apps/app_voicemail
 mkdir -p %{buildroot}%{_datadir}/asterisk/moh/
 mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
+mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk/keys
 mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
@@ -824,6 +825,7 @@ fi
 %dir %{_datadir}/asterisk/sounds/
 
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk/keys
 
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv/
@@ -1046,6 +1048,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Sep  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-2
+- Create /var/lib/asterisk/keys
+
 * Thu Sep  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.15-1
 - Drop chan_mobile, too difficult to maintain as a patch
 - Update to 1.6.0.15 and drop unneeded patches



From hno at fedoraproject.org  Fri Sep  4 04:14:37 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri,  4 Sep 2009 04:14:37 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.138,1.139
Message-ID: <20090904041437.3C5BE11C0082@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11912

Modified Files:
	squid.spec 
Log Message:
Build required db4-devel


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- squid.spec	4 Sep 2009 03:39:42 -0000	1.138
+++ squid.spec	4 Sep 2009 04:14:36 -0000	1.139
@@ -47,7 +47,7 @@ Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
+BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel db4-devel
 Obsoletes: squid-novm
 
 %description



From aalam at fedoraproject.org  Fri Sep  4 04:18:28 2009
From: aalam at fedoraproject.org (aalam)
Date: Fri,  4 Sep 2009 04:18:28 +0000 (UTC)
Subject: rpms/saab-fonts/devel saab-fonts-fontconfig.conf, NONE,
	1.1 saab-fonts.spec, 1.2, 1.3
Message-ID: <20090904041828.DC8DD11C0082@cvs1.fedora.phx.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/saab-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12394

Modified Files:
	saab-fonts.spec 
Added Files:
	saab-fonts-fontconfig.conf 
Log Message:
Updating spec file and add conf file


--- NEW FILE saab-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Saab</family>
    </prefer>
  </alias>
  <alias>
    <family>Saab</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>  



Index: saab-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/saab-fonts/devel/saab-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- saab-fonts.spec	27 Jul 2009 03:44:05 -0000	1.2
+++ saab-fonts.spec	4 Sep 2009 04:18:28 -0000	1.3
@@ -1,14 +1,16 @@
 %global fontname saab
+%global fontconf 66-%{fontname}.conf
 
 Name:        %{fontname}-fonts
 Version:     0.91
-Release:     2%{?dist}
+Release:     3%{?dist}
 Summary:     Free Punjabi Unicode OpenType Font
 
 Group:       User Interface/X
 License:     GPLv2+ with exceptions
 URL:         http://guca.sourceforge.net/typography/fonts/saab/
 Source0:     http://downloads.sf.net/guca/saab.0.91.zip
+Source1:   %{name}-fontconfig.conf
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fontpackages-devel
@@ -30,13 +32,24 @@ rm -rf $RPM_BUILD_ROOT
 install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
 install -m 0644 -p Saab.otf $RPM_BUILD_ROOT%{_fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%_font_pkg Saab.otf
+%_font_pkg Saab.otf %{fontconf}
 %doc
 
 %changelog
+* Tue Sep 04 2009 A S Alam <aalam at redhat.com> - 0.91-3
+- Add fontconfig conf file
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From phuang at fedoraproject.org  Fri Sep  4 04:29:20 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Sep 2009 04:29:20 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.41, 1.42 ibus.spec, 1.87, 1.88 sources,
	1.46, 1.47
Message-ID: <20090904042920.EDE7811C0082@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17574

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20090904


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	28 Aug 2009 06:19:36 -0000	1.41
+++ .cvsignore	4 Sep 2009 04:29:20 -0000	1.42
@@ -1,2 +1 @@
-ibus-1.2.0.20090828.tar.gz
-icons.tar.gz
+ibus-1.2.0.20090904.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- ibus.spec	30 Aug 2009 22:59:56 -0000	1.87
+++ ibus.spec	4 Sep 2009 04:29:20 -0000	1.88
@@ -7,16 +7,16 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090828
-Release:    2%{?dist}
+Version:    1.2.0.20090904
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-Source2:    icons.tar.gz
-Patch0:     ibus-HEAD.patch
+# Source2:    icons.tar.gz
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,7 +114,7 @@ The ibus-devel-docs package contains dev
 
 
 %prep
-%setup -q -a2
+%setup -q -a1
 # %patch0 -p1
 
 %build
@@ -131,14 +131,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
-# install icons
-install -pm 644 -D icons/IBus4-16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status/ibus-off.png
-install -pm 644 -D icons/IBus4-22.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/status/ibus-off.png
-install -pm 644 -D icons/IBus4-24.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/status/ibus-off.png
-install -pm 644 -D icons/IBus4-32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/status/ibus-off.png
-install -pm 644 -D icons/IBus4-48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/status/ibus-off.png
-install -pm 644 -D icons/IBus4-48.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/status/ibus-off.svg
-
 # install xinput config file
 install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
 
@@ -242,6 +234,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-1
+- Update to 1.2.0.20090904
+
 * Mon Aug 31 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-2
 - Change icon path in ibus.conf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	28 Aug 2009 06:19:37 -0000	1.46
+++ sources	4 Sep 2009 04:29:20 -0000	1.47
@@ -1,2 +1 @@
-4945b6cec33288fc5916a163133f927f  ibus-1.2.0.20090828.tar.gz
-cf57c152f07c90c72aa8c3281a65e80c  icons.tar.gz
+35e422490b409f738f9861ee13dfacf7  ibus-1.2.0.20090904.tar.gz



From phuang at fedoraproject.org  Fri Sep  4 04:40:13 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Sep 2009 04:40:13 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.88,1.89
Message-ID: <20090904044013.2414911C0381@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19089

Modified Files:
	ibus.spec 
Log Message:
Fix spec typo


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- ibus.spec	4 Sep 2009 04:29:20 -0000	1.88
+++ ibus.spec	4 Sep 2009 04:40:13 -0000	1.89
@@ -114,7 +114,7 @@ The ibus-devel-docs package contains dev
 
 
 %prep
-%setup -q -a1
+%setup -q
 # %patch0 -p1
 
 %build



From aalam at fedoraproject.org  Fri Sep  4 04:49:31 2009
From: aalam at fedoraproject.org (aalam)
Date: Fri,  4 Sep 2009 04:49:31 +0000 (UTC)
Subject: rpms/saab-fonts/devel saab-fonts.spec,1.3,1.4
Message-ID: <20090904044931.515FB11C0082@cvs1.fedora.phx.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/saab-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23340

Modified Files:
	saab-fonts.spec 
Log Message:
Change font pirority from 66 ->67


Index: saab-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/saab-fonts/devel/saab-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- saab-fonts.spec	4 Sep 2009 04:18:28 -0000	1.3
+++ saab-fonts.spec	4 Sep 2009 04:49:31 -0000	1.4
@@ -1,5 +1,5 @@
 %global fontname saab
-%global fontconf 66-%{fontname}.conf
+%global fontconf 67-%{fontname}.conf
 
 Name:        %{fontname}-fonts
 Version:     0.91
@@ -43,7 +43,7 @@ ln -s %{_fontconfig_templatedir}/%{fontc
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%_font_pkg Saab.otf %{fontconf}
+%_font_pkg Saab.otf -f %{fontconf}
 %doc
 
 %changelog



From iankent at fedoraproject.org  Fri Sep  4 04:53:05 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri,  4 Sep 2009 04:53:05 +0000 (UTC)
Subject: rpms/autofs/devel .cvsignore, 1.20, 1.21 autofs.spec, 1.287,
	1.288 sources, 1.21, 1.22
Message-ID: <20090904045305.D89A311C0082@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24164

Modified Files:
	.cvsignore autofs.spec sources 
Log Message:
* Fri Sep 4 2009 Ian Kent <ikent at redhat.com> - 1:5.0.5-1
- update source to latest upstream version.
  - this is essentially a consolidation of the patches already in this rpm.
- add dist tag to match latest RHEL-5 package tag format.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Nov 2008 07:58:03 -0000	1.20
+++ .cvsignore	4 Sep 2009 04:53:05 -0000	1.21
@@ -1 +1 @@
-autofs-5.0.4.tar.bz2
+autofs-5.0.5.tar.bz2


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- autofs.spec	3 Sep 2009 08:17:07 -0000	1.287
+++ autofs.spec	4 Sep 2009 04:53:05 -0000	1.288
@@ -3,78 +3,13 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
-Version: 5.0.4
-Release: 39
+Version: 5.0.5
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://wiki.autofs.net/
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-Patch1: autofs-5.0.4-fix-dumb-libxml2-check.patch
-Patch2: autofs-5.0.4-expire-specific-submount-only.patch
-Patch3: autofs-5.0.4-fix-negative-cache-non-existent-key.patch
-Patch4: autofs-5.0.4-fix-ldap-detection.patch
-Patch5: autofs-5.0.4-use-CLOEXEC-flag.patch
-Patch6: autofs-5.0.4-fix-select-fd-limit.patch
-Patch7: autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch
-Patch8: autofs-5.0.4-fix-quoted-mess.patch
-Patch9: autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch
-Patch10: autofs-5.0.4-fix-hosts-map-use-after-free.patch
-Patch11: autofs-5.0.4-uris-list-locking-fix.patch
-Patch12: autofs-5.0.4-renew-sasl-creds-upon-reconnect-fail.patch
-Patch13: autofs-5.0.4-library-reload-fix-update.patch
-Patch14: autofs-5.0.4-force-unlink-umount.patch
-Patch15: autofs-5.0.4-always-read-file-maps.patch
-Patch16: autofs-5.0.4-code-analysis-corrections.patch
-Patch17: autofs-5.0.4-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch
-Patch18: autofs-5.0.4-easy-alloca-replacements.patch
-Patch19: autofs-5.0.4-configure-libtirpc.patch
-Patch20: autofs-5.0.4-ipv6-name-and-address-support.patch
-Patch21: autofs-5.0.4-ipv6-parse.patch
-Patch22: autofs-5.0.4-use-CLOEXEC-flag-setmntent-include-fix.patch
-Patch23: autofs-5.0.4-easy-alloca-replacements-fix.patch
-Patch24: autofs-5.0.4-libxml2-workaround-fix.patch
-Patch25: autofs-5.0.4-configure-libtirpc-fix.patch
-Patch26: autofs-5.0.4-add-nfs-mount-proto-default-conf-option.patch
-Patch27: autofs-5.0.4-fix-bad-token-declare.patch
-Patch28: autofs-5.0.4-fix-return-start-status-on-fail.patch
-Patch29: autofs-5.0.4-fix-double-free-in-expire_proc.patch
-Patch30: autofs-5.0.4-another-easy-alloca-replacements-fix.patch
-Patch31: autofs-5.0.4-add-lsb-init-script-parameter-block.patch
-Patch32: autofs-5.0.4-always-read-file-maps-fix.patch
-Patch33: autofs-5.0.4-use-misc-device.patch
-Patch34: autofs-5.0.4-fix-restorecon.patch
-Patch35: autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch
-Patch36: autofs-5.0.4-fix-lsb-init-script-header.patch
-Patch37: autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch
-Patch38: autofs-5.0.4-fix-st_remove_tasks-locking.patch
-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-use-intr-as-hosts-mount-default.patch
-Patch43: autofs-5.0.4-fix-kernel-includes.patch
-Patch44: autofs-5.0.4-dont-umount-existing-direct-mount-on-reread.patch
-Patch45: autofs-5.0.4-library-reload-fix-update-fix.patch
-Patch46: autofs-5.0.4-improve-manual-umount-recovery.patch
-Patch47: autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch
-Patch48: autofs-5.0.4-always-read-file-maps-multi-map-fix.patch
-Patch49: autofs-5.0.4-always-read-file-maps-key-lookup-fixes.patch
-Patch50: autofs-5.0.4-use-srv-query-for-domain-dn.patch
-Patch51: autofs-5.0.4-fix-incorrect-dclist-free.patch
-Patch52: autofs-5.0.4-srv-lookup-handle-endian.patch
-Patch53: autofs-5.0.4-library-reload-fix-update-fix-2.patch
-Patch54: autofs-5.0.4-fix-notify-mount-message-path.patch
-Patch55: autofs-5.0.4-remount-we-created-mount-point-fix.patch
-Patch56: autofs-5.0.4-fix-double-free-in-do_sasl_bind.patch
-Patch57: autofs-5.0.4-manual-umount-recovery-fixes.patch
-Patch58: autofs-5.0.4-fix-map-type-info-parse-error.patch
-Patch59: autofs-5.0.4-fix-map-type-info-parse-error-update.patch
-Patch60: autofs-5.0.4-fix-rpc-fd-leak.patch
-Patch61: autofs-5.0.4-allow-automount-daemon-to-dump-core.patch
-Patch62: autofs-5.0.4-fix-pthread-push-order-in-expire_proc_direct.patch
-Patch63: autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch
-Patch64: autofs-5.0.4-fix-direct-map-cache-locking.patch
-Patch65: autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.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
@@ -116,71 +51,6 @@ inkludera n?tfilsystem, CD-ROM, floppyd
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -233,6 +103,11 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Fri Sep 4 2009 Ian Kent <ikent at redhat.com> - 1:5.0.5-1
+- update source to latest upstream version.
+  - this is essentially a consolidation of the patches already in this rpm.
+- add dist tag to match latest RHEL-5 package tag format.
+
 * Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-39
 - fix libxml2 non-thread-safe calls.
 - fix direct map cache locking.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	11 Nov 2008 07:58:04 -0000	1.21
+++ sources	4 Sep 2009 04:53:05 -0000	1.22
@@ -1 +1 @@
-2646dde61edd08dd952255558c733c08  autofs-5.0.4.tar.bz2
+a1d262cb6ebef0c2dd0fe22232fb3d5a  autofs-5.0.5.tar.bz2



From iankent at fedoraproject.org  Fri Sep  4 05:02:48 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri,  4 Sep 2009 05:02:48 +0000 (UTC)
Subject: rpms/autofs/devel
	autofs-5.0.4-add-lsb-init-script-parameter-block.patch, 1.1,
	NONE autofs-5.0.4-add-nfs-mount-proto-default-conf-option.patch,
	1.1, NONE autofs-5.0.4-allow-automount-daemon-to-dump-core.patch,
	1.2, NONE autofs-5.0.4-always-read-file-maps-fix.patch, 1.1,
	NONE autofs-5.0.4-always-read-file-maps-key-lookup-fixes.patch,
	1.1, NONE autofs-5.0.4-always-read-file-maps-multi-map-fix.patch,
	1.1, NONE autofs-5.0.4-always-read-file-maps.patch, 1.1,
	NONE autofs-5.0.4-another-easy-alloca-replacements-fix.patch,
	1.1, NONE autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch,
	1.1, NONE autofs-5.0.4-code-analysis-corrections.patch, 1.1,
	NONE autofs-5.0.4-configure-libtirpc-fix.patch, 1.2,
	NONE autofs-5.0.4-configure-libtirpc.patch, 1.1,
	NONE autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch, 1.1,
	NONE autofs-5.0.4-dont-umount-existing-direct-mount-on-reread.patch, 
	1.1, NONE autofs-5.0.4-easy-alloca-replacements-fix.patch, 1.2,
	NONE autofs-5.0.4-easy-alloca-replacements.patch, 1.1,
	NONE autofs-5.0.4-expire-specific-submount-only.patch, 1.1,
	NONE autofs-5.0.4-fix-bad-token-declare.patch, 1.1,
	NONE autofs-5.0.4-fix-direct-map-cache-locking.patch, 1.1, NONE
	autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch,
	1.1, NONE autofs-5.0.4-fix-double-free-in-do_sasl_bind.patch,
	1.1, NONE autofs-5.0.4-fix-double-free-in-expire_proc.patch, 1.1,
	NONE autofs-5.0.4-fix-dumb-libxml2-check.patch, 1.1,
	NONE autofs-5.0.4-fix-hosts-map-use-after-free.patch, 1.1,
	NONE autofs-5.0.4-fix-incorrect-dclist-free.patch, 1.1,
	NONE autofs-5.0.4-fix-kernel-includes.patch, 1.1,
	NONE autofs-5.0.4-fix-ldap-detection.patch, 1.1,
	NONE autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch, 1.1,
	NONE autofs-5.0.4-fix-lsb-init-script-header.patch, 1.1,
	NONE autofs-5.0.4-fix-map-type-info-parse-error-update.patch,
	1.1, NONE autofs-5.0.4-fix-map-type-info-parse-error.patch, 1.1,
	NONE autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch, 1.1,
	NONE autofs-5.0.4-fix-negative-cache-non-existent-key.patch, 1.1,
	NONE autofs-5.0.4-fix-notify-mount-message-path.patch, 1.1,
	NONE autofs-5.0.4-fix-pthread-push-order-in-expire_proc_direct.patch, 
	1.1, NONE autofs-5.0.4-fix-quoted-mess.patch, 1.1,
	NONE autofs-5.0.4-fix-restorecon.patch, 1.1,
	NONE autofs-5.0.4-fix-return-start-status-on-fail.patch, 1.1,
	NONE autofs-5.0.4-fix-rpc-fd-leak.patch, 1.1,
	NONE autofs-5.0.4-fix-select-fd-limit.patch, 1.1,
	NONE autofs-5.0.4-fix-st_remove_tasks-locking.patch, 1.1,
	NONE autofs-5.0.4-force-unlink-umount.patch, 1.1,
	NONE autofs-5.0.4-improve-manual-umount-recovery.patch, 1.1,
	NONE autofs-5.0.4-ipv6-name-and-address-support.patch, 1.1,
	NONE autofs-5.0.4-ipv6-parse.patch, 1.1,
	NONE autofs-5.0.4-library-reload-fix-update-fix-2.patch, 1.1,
	NONE autofs-5.0.4-library-reload-fix-update-fix.patch, 1.1,
	NONE autofs-5.0.4-library-reload-fix-update.patch, 1.1,
	NONE autofs-5.0.4-libxml2-workaround-fix.patch, 1.2, NONE
	autofs-5.0.4-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch,
	1.1,
	NONE autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch,
	1.1, NONE autofs-5.0.4-manual-umount-recovery-fixes.patch, 1.1,
	NONE autofs-5.0.4-remount-we-created-mount-point-fix.patch, 1.1,
	NONE autofs-5.0.4-renew-sasl-creds-upon-reconnect-fail.patch, 1.1,
	NONE autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch,
	1.1, NONE autofs-5.0.4-srv-lookup-handle-endian.patch, 1.1,
	NONE autofs-5.0.4-uris-list-locking-fix.patch, 1.1,
	NONE autofs-5.0.4-use-CLOEXEC-flag-setmntent-include-fix.patch,
	1.1, NONE autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch, 1.1,
	NONE autofs-5.0.4-use-CLOEXEC-flag.patch, 1.2,
	NONE autofs-5.0.4-use-intr-as-hosts-mount-default.patch, 1.1,
	NONE autofs-5.0.4-use-misc-device.patch, 1.1,
	NONE autofs-5.0.4-use-percent-hack-for-master.patch, 1.1,
	NONE autofs-5.0.4-use-srv-query-for-domain-dn.patch, 1.1,
	NONE autofs-5.0.4-zero-s_magic-is-valid.patch, 1.1, NONE
Message-ID: <20090904050248.2891911C0082@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27043

Removed Files:
	autofs-5.0.4-add-lsb-init-script-parameter-block.patch 
	autofs-5.0.4-add-nfs-mount-proto-default-conf-option.patch 
	autofs-5.0.4-allow-automount-daemon-to-dump-core.patch 
	autofs-5.0.4-always-read-file-maps-fix.patch 
	autofs-5.0.4-always-read-file-maps-key-lookup-fixes.patch 
	autofs-5.0.4-always-read-file-maps-multi-map-fix.patch 
	autofs-5.0.4-always-read-file-maps.patch 
	autofs-5.0.4-another-easy-alloca-replacements-fix.patch 
	autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch 
	autofs-5.0.4-code-analysis-corrections.patch 
	autofs-5.0.4-configure-libtirpc-fix.patch 
	autofs-5.0.4-configure-libtirpc.patch 
	autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch 
	autofs-5.0.4-dont-umount-existing-direct-mount-on-reread.patch 
	autofs-5.0.4-easy-alloca-replacements-fix.patch 
	autofs-5.0.4-easy-alloca-replacements.patch 
	autofs-5.0.4-expire-specific-submount-only.patch 
	autofs-5.0.4-fix-bad-token-declare.patch 
	autofs-5.0.4-fix-direct-map-cache-locking.patch 
	autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch 
	autofs-5.0.4-fix-double-free-in-do_sasl_bind.patch 
	autofs-5.0.4-fix-double-free-in-expire_proc.patch 
	autofs-5.0.4-fix-dumb-libxml2-check.patch 
	autofs-5.0.4-fix-hosts-map-use-after-free.patch 
	autofs-5.0.4-fix-incorrect-dclist-free.patch 
	autofs-5.0.4-fix-kernel-includes.patch 
	autofs-5.0.4-fix-ldap-detection.patch 
	autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch 
	autofs-5.0.4-fix-lsb-init-script-header.patch 
	autofs-5.0.4-fix-map-type-info-parse-error-update.patch 
	autofs-5.0.4-fix-map-type-info-parse-error.patch 
	autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch 
	autofs-5.0.4-fix-negative-cache-non-existent-key.patch 
	autofs-5.0.4-fix-notify-mount-message-path.patch 
	autofs-5.0.4-fix-pthread-push-order-in-expire_proc_direct.patch 
	autofs-5.0.4-fix-quoted-mess.patch 
	autofs-5.0.4-fix-restorecon.patch 
	autofs-5.0.4-fix-return-start-status-on-fail.patch 
	autofs-5.0.4-fix-rpc-fd-leak.patch 
	autofs-5.0.4-fix-select-fd-limit.patch 
	autofs-5.0.4-fix-st_remove_tasks-locking.patch 
	autofs-5.0.4-force-unlink-umount.patch 
	autofs-5.0.4-improve-manual-umount-recovery.patch 
	autofs-5.0.4-ipv6-name-and-address-support.patch 
	autofs-5.0.4-ipv6-parse.patch 
	autofs-5.0.4-library-reload-fix-update-fix-2.patch 
	autofs-5.0.4-library-reload-fix-update-fix.patch 
	autofs-5.0.4-library-reload-fix-update.patch 
	autofs-5.0.4-libxml2-workaround-fix.patch 
	autofs-5.0.4-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch 
	autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch 
	autofs-5.0.4-manual-umount-recovery-fixes.patch 
	autofs-5.0.4-remount-we-created-mount-point-fix.patch 
	autofs-5.0.4-renew-sasl-creds-upon-reconnect-fail.patch 
	autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch 
	autofs-5.0.4-srv-lookup-handle-endian.patch 
	autofs-5.0.4-uris-list-locking-fix.patch 
	autofs-5.0.4-use-CLOEXEC-flag-setmntent-include-fix.patch 
	autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch 
	autofs-5.0.4-use-CLOEXEC-flag.patch 
	autofs-5.0.4-use-intr-as-hosts-mount-default.patch 
	autofs-5.0.4-use-misc-device.patch 
	autofs-5.0.4-use-percent-hack-for-master.patch 
	autofs-5.0.4-use-srv-query-for-domain-dn.patch 
	autofs-5.0.4-zero-s_magic-is-valid.patch 
Log Message:
* Fri Sep 4 2009 Ian Kent <ikent at redhat.com> - 1:5.0.5-1
- update source to latest upstream version.
  - this is essentially a consolidation of the patches already in this rpm.
- add dist tag to match latest RHEL-5 package tag format.
- also, remove now unused patches.



--- autofs-5.0.4-add-lsb-init-script-parameter-block.patch DELETED ---


--- autofs-5.0.4-add-nfs-mount-proto-default-conf-option.patch DELETED ---


--- autofs-5.0.4-allow-automount-daemon-to-dump-core.patch DELETED ---


--- autofs-5.0.4-always-read-file-maps-fix.patch DELETED ---


--- autofs-5.0.4-always-read-file-maps-key-lookup-fixes.patch DELETED ---


--- autofs-5.0.4-always-read-file-maps-multi-map-fix.patch DELETED ---


--- autofs-5.0.4-always-read-file-maps.patch DELETED ---


--- autofs-5.0.4-another-easy-alloca-replacements-fix.patch DELETED ---


--- autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch DELETED ---


--- autofs-5.0.4-code-analysis-corrections.patch DELETED ---


--- autofs-5.0.4-configure-libtirpc-fix.patch DELETED ---


--- autofs-5.0.4-configure-libtirpc.patch DELETED ---


--- autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch DELETED ---


--- autofs-5.0.4-dont-umount-existing-direct-mount-on-reread.patch DELETED ---


--- autofs-5.0.4-easy-alloca-replacements-fix.patch DELETED ---


--- autofs-5.0.4-easy-alloca-replacements.patch DELETED ---


--- autofs-5.0.4-expire-specific-submount-only.patch DELETED ---


--- autofs-5.0.4-fix-bad-token-declare.patch DELETED ---


--- autofs-5.0.4-fix-direct-map-cache-locking.patch DELETED ---


--- autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch DELETED ---


--- autofs-5.0.4-fix-double-free-in-do_sasl_bind.patch DELETED ---


--- autofs-5.0.4-fix-double-free-in-expire_proc.patch DELETED ---


--- autofs-5.0.4-fix-dumb-libxml2-check.patch DELETED ---


--- autofs-5.0.4-fix-hosts-map-use-after-free.patch DELETED ---


--- autofs-5.0.4-fix-incorrect-dclist-free.patch DELETED ---


--- autofs-5.0.4-fix-kernel-includes.patch DELETED ---


--- autofs-5.0.4-fix-ldap-detection.patch DELETED ---


--- autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch DELETED ---


--- autofs-5.0.4-fix-lsb-init-script-header.patch DELETED ---


--- autofs-5.0.4-fix-map-type-info-parse-error-update.patch DELETED ---


--- autofs-5.0.4-fix-map-type-info-parse-error.patch DELETED ---


--- autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch DELETED ---


--- autofs-5.0.4-fix-negative-cache-non-existent-key.patch DELETED ---


--- autofs-5.0.4-fix-notify-mount-message-path.patch DELETED ---


--- autofs-5.0.4-fix-pthread-push-order-in-expire_proc_direct.patch DELETED ---


--- autofs-5.0.4-fix-quoted-mess.patch DELETED ---


--- autofs-5.0.4-fix-restorecon.patch DELETED ---


--- autofs-5.0.4-fix-return-start-status-on-fail.patch DELETED ---


--- autofs-5.0.4-fix-rpc-fd-leak.patch DELETED ---


--- autofs-5.0.4-fix-select-fd-limit.patch DELETED ---


--- autofs-5.0.4-fix-st_remove_tasks-locking.patch DELETED ---


--- autofs-5.0.4-force-unlink-umount.patch DELETED ---


--- autofs-5.0.4-improve-manual-umount-recovery.patch DELETED ---


--- autofs-5.0.4-ipv6-name-and-address-support.patch DELETED ---


--- autofs-5.0.4-ipv6-parse.patch DELETED ---


--- autofs-5.0.4-library-reload-fix-update-fix-2.patch DELETED ---


--- autofs-5.0.4-library-reload-fix-update-fix.patch DELETED ---


--- autofs-5.0.4-library-reload-fix-update.patch DELETED ---


--- autofs-5.0.4-libxml2-workaround-fix.patch DELETED ---


--- autofs-5.0.4-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch DELETED ---


--- autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch DELETED ---


--- autofs-5.0.4-manual-umount-recovery-fixes.patch DELETED ---


--- autofs-5.0.4-remount-we-created-mount-point-fix.patch DELETED ---


--- autofs-5.0.4-renew-sasl-creds-upon-reconnect-fail.patch DELETED ---


--- autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch DELETED ---


--- autofs-5.0.4-srv-lookup-handle-endian.patch DELETED ---


--- autofs-5.0.4-uris-list-locking-fix.patch DELETED ---


--- autofs-5.0.4-use-CLOEXEC-flag-setmntent-include-fix.patch DELETED ---


--- autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch DELETED ---


--- autofs-5.0.4-use-CLOEXEC-flag.patch DELETED ---


--- autofs-5.0.4-use-intr-as-hosts-mount-default.patch DELETED ---


--- autofs-5.0.4-use-misc-device.patch DELETED ---


--- autofs-5.0.4-use-percent-hack-for-master.patch DELETED ---


--- autofs-5.0.4-use-srv-query-for-domain-dn.patch DELETED ---


--- autofs-5.0.4-zero-s_magic-is-valid.patch DELETED ---



From salimma at fedoraproject.org  Fri Sep  4 05:27:42 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  4 Sep 2009 05:27:42 +0000 (UTC)
Subject: rpms/python-sphinx/F-11 .cvsignore, 1.7, 1.8 python-sphinx.spec,
	1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090904052742.3744B11C0082@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3171/F-11

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Fri Sep  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.3-1
- Update to 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Aug 2009 05:46:15 -0000	1.7
+++ .cvsignore	4 Sep 2009 05:27:41 -0000	1.8
@@ -1 +1 @@
-Sphinx-0.6.2.tar.gz
+Sphinx-0.6.3.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-11/python-sphinx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-sphinx.spec	20 Aug 2009 05:46:15 -0000	1.11
+++ python-sphinx.spec	4 Sep 2009 05:27:41 -0000	1.12
@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.6.2
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.3-1
+- Update to 0.6.3
+
 * Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.2-1
 - Update to 0.6.2 -- upstream bugfix requested inside bz#512438
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Aug 2009 05:46:16 -0000	1.7
+++ sources	4 Sep 2009 05:27:41 -0000	1.8
@@ -1 +1 @@
-c8f79e171addc73342cc2e775dc78880  Sphinx-0.6.2.tar.gz
+b8ba063eeeaf818a7ea07fd28d9614a9  Sphinx-0.6.3.tar.gz



From salimma at fedoraproject.org  Fri Sep  4 05:27:42 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  4 Sep 2009 05:27:42 +0000 (UTC)
Subject: rpms/python-sphinx/devel .cvsignore, 1.8, 1.9 python-sphinx.spec,
	1.14, 1.15 sources, 1.8, 1.9
Message-ID: <20090904052742.5A91F11C0082@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3171/devel

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Fri Sep  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.3-1
- Update to 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Aug 2009 19:55:10 -0000	1.8
+++ .cvsignore	4 Sep 2009 05:27:42 -0000	1.9
@@ -1 +1 @@
-Sphinx-0.6.2.tar.gz
+Sphinx-0.6.3.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/python-sphinx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- python-sphinx.spec	17 Aug 2009 19:55:10 -0000	1.14
+++ python-sphinx.spec	4 Sep 2009 05:27:42 -0000	1.15
@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.6.2
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.3-1
+- Update to 0.6.3
+
 * Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.2-1
 - Update to 0.6.2 -- upstream bugfix requested inside bz#512438
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Aug 2009 19:55:10 -0000	1.8
+++ sources	4 Sep 2009 05:27:42 -0000	1.9
@@ -1 +1 @@
-c8f79e171addc73342cc2e775dc78880  Sphinx-0.6.2.tar.gz
+b8ba063eeeaf818a7ea07fd28d9614a9  Sphinx-0.6.3.tar.gz



From bojan at fedoraproject.org  Fri Sep  4 06:38:24 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri,  4 Sep 2009 06:38:24 +0000 (UTC)
Subject: rpms/viewvc/EL-5 README.httpd, NONE, 1.1 viewvc-lexer-mimetypes.py, 
	NONE, 1.1 sources, 1.8, 1.9 viewvc.spec, 1.8,
	1.9 viewvc-temp-location.patch, 1.1, NONE
Message-ID: <20090904063824.D5F0711C0082@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24107

Modified Files:
	sources viewvc.spec 
Added Files:
	README.httpd viewvc-lexer-mimetypes.py 
Removed Files:
	viewvc-temp-location.patch 
Log Message:
Bump up to 1.1.2.


--- NEW FILE README.httpd ---
In order to run ViewVC under Apache and mod_python, you must install
viewvc-httpd package.


--- NEW FILE viewvc-lexer-mimetypes.py ---
#!/usr/bin/python

import sys
import re
from pygments.lexers import get_all_lexers

for fullname, names, exts, mimetype in get_all_lexers():
  if len(exts) > len(mimetype):
    for j in range(len(mimetype)):
      line=0
      for i in range(len(exts)):
        if re.match('\*\.',exts[i]):
          if i == 0:
            print mimetype[j],
            line=1
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
          else:
            print exts[i][2:],
        if line==1 and i == len(exts)-1:
          print
  elif len(exts) == 1:
    for i in range(len(mimetype)):
      if re.match('\*\.',exts[0]):
        if re.search('\[[0-9]+\]',exts[0]):
          s=re.search('\[[0-9]+\]',exts[0]).span()[0]+1
          e=re.search('\[[0-9]+\]',exts[0]).span()[1]-1
          print mimetype[i],
          for k in range(s,e):
            print exts[0][2:s-1]+exts[0][k]+exts[0][e+1:],
          print
        else:
          print mimetype[i], exts[0][2:]
  else:
    for i in range(len(mimetype)):
      if len(exts) > i:
        if re.match('\*\.',exts[i]):
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            print mimetype[i],
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
            print
          else:
            print mimetype[i], exts[i][2:]


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Aug 2009 22:25:23 -0000	1.8
+++ sources	4 Sep 2009 06:38:22 -0000	1.9
@@ -1 +1 @@
-5aa48bb866f65bfcf32aa0cd581bf7d3  viewvc-1.0.9.tar.gz
+8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/viewvc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- viewvc.spec	11 Aug 2009 22:25:23 -0000	1.8
+++ viewvc.spec	4 Sep 2009 06:38:22 -0000	1.9
@@ -1,22 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-# EL4 & EL5 do not have cvsgraph or enscript.. yet
-%if 0%{?rhel}
-%define with_cvsgraph_enscript 0
-%else
-%define with_cvsgraph_enscript 1
-%endif
-
-# EL4 has a subversion that does not meet the minimum reqs for subversion
-%if 0%{?rhel} && "%rhel" < "5"
-%define with_subversion 0
-%else
-%define with_subversion 1
-%endif
-
-
 Name:           viewvc
-Version:        1.0.9
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -25,21 +10,19 @@ License:        BSD
 URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
-Patch0:         viewvc-temp-location.patch
+Source2:        README.httpd
+Source3:        viewvc-lexer-mimetypes.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-11
 Conflicts:      selinux-policy < 2.4.6-46
 
 BuildArch:      noarch
-BuildRequires:  python-devel >= 2.0
-Requires:       mod_python, rcs, diffutils
-%if 0%{with_subversion}
+BuildRequires:  python-devel >= 2.0, python-pygments
+Requires:       webserver, rcs, diffutils
 Requires:       subversion >= 1.2
-%endif
-%if 0%{with_cvsgraph_enscript}
-Requires:       enscript, cvsgraph
-%endif
+Requires:       cvsgraph
+Requires:       python-pygments
 
 %description
 ViewVC is a browser interface for CVS and Subversion version control
@@ -49,13 +32,17 @@ as well as diffs between those versions.
 of the report-like functionality you expect out of your version control tool,
 but much more prettily than the average textual command-line program output.
 
-%if 0%{!?with_subversion}
-This version only supports CVS repositories.
-%endif
+%package httpd
+Summary:        ViewVC configuration for Apache/mod_python
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}, mod_python
+
+%description httpd
+ViewVC configuration for Apache/mod_python. This package should provide ViewVC
+with decent performance when run under Apache.
 
 %prep
 %setup -q
-%patch0 -p0 -b .temp-location
 
 %build
 
@@ -82,29 +69,27 @@ This version only supports CVS repositor
 
 # Fix paths in configuration
 %{__perl} -pi \
-  -e 's|templates/|%{_datadir}/viewvc/templates/|g;' \
-  -e 's|^template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
-  -e 's|^#docroot = .*|docroot = /viewvc-static|;' \
-  -e 's|^cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
-  %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
-
-%if 0%{with_cvsgraph_enscript}
-%{__perl} -pi \
-  -e 's|^use_cvsgraph = .*|use_cvsgraph = 1|;' \
-  -e 's|^use_enscript = .*|use_enscript = 1|;' \
+  -e 's|^#* *template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
+  -e 's|^#* *docroot = .*|docroot = /viewvc-static|;' \
+  -e 's|^#* *cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+  -e 's|^#* *use_cvsgraph = .*|use_cvsgraph = 1|;' \
   %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
-%endif
 
 # Install config to sysconf directory
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/viewvc.conf %{buildroot}%{_sysconfdir}/viewvc/viewvc.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
+%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
+%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf
 
-# Install Apache configuration
+%{SOURCE3} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
+
+# Install Apache configuration and README
 %{__sed} -e s,__datadir__,%{_datadir}, \
          -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewvc.conf
 %{__install} -Dp -m0644 viewvc.conf %{buildroot}/etc/httpd/conf.d/viewvc.conf
+%{__cp} %{SOURCE2} README.httpd
 
 # mod_python files mustn't be executable since they don't have shebang
 # make rpmlint happy!
@@ -118,14 +103,20 @@ This version only supports CVS repositor
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGES README INSTALL TODO COMMITTERS LICENSE.html docs
+%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE.html docs
 %config(noreplace) %{_sysconfdir}/viewvc
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 %{python_sitelib}/*
 %{_datadir}/*
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
+%files httpd
+%defattr(-, root, root, -)
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
+
 %changelog
+* Fri Sep  4 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
+- bump up to 1.1.2
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.9-1
 - bump up to 1.0.9
 - security fix: validate the 'view' parameter to avoid XSS attack


--- viewvc-temp-location.patch DELETED ---



From cchance at fedoraproject.org  Fri Sep  4 06:54:09 2009
From: cchance at fedoraproject.org (cchance)
Date: Fri,  4 Sep 2009 06:54:09 +0000 (UTC)
Subject: rpms/ibus-table/devel .cvsignore, 1.12, 1.13 ibus-table.spec, 1.25, 
	1.26 sources, 1.13, 1.14
Message-ID: <20090904065409.75D1411C0082@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
updated source w/ parsing enhancement for table entries with comments.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Sep 2009 01:38:53 -0000	1.12
+++ .cvsignore	4 Sep 2009 06:54:07 -0000	1.13
@@ -1,2 +1 @@
-ibus-table-1.2.0.20090804.tar.gz
-ibus-table-1.2.0.20090902.tar.gz
+ibus-table-1.2.0.20090904.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ibus-table.spec	3 Sep 2009 01:38:53 -0000	1.25
+++ ibus-table.spec	4 Sep 2009 06:54:07 -0000	1.26
@@ -1,6 +1,6 @@
 Name:       ibus-table
-Version:    1.2.0.20090902
-Release:    2%{?dist}
+Version:    1.2.0.20090904
+Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -16,19 +16,11 @@ BuildArch:  noarch
 %description
 The package contains general Table engine for IBus platform.
 
-%package additional
-Summary:    Additional tables for general table engine of IBus
-Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description additional
-This package contains additional tables.
-
 %prep
 %setup -q
 
 %build
-%configure --disable-static --enable-additional
+%configure --disable-static
 %__make %{?_smp_mflags}
 
 %install
@@ -40,10 +32,6 @@ This package contains additional tables.
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post additional
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
@@ -114,14 +102,10 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_libexecdir}/ibus-setup-table
 %{_libexecdir}/ibus-table-meter
 
-%files additional
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/tables/compose.db
-%{_datadir}/%{name}/tables/latex.db
-%{_datadir}/%{name}/icons/compose.svg
-%{_datadir}/%{name}/icons/latex.svg
-
 %changelog
+* Fri Sep 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090904-1.fc12
+- Updated source with additional tables separated.
+
 * Thu Sep 03 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090902-2.fc12
 - Rebuilt.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Sep 2009 01:38:53 -0000	1.13
+++ sources	4 Sep 2009 06:54:07 -0000	1.14
@@ -1,2 +1 @@
-86efc5aa421eeffe26b4dd5718387738  ibus-table-1.2.0.20090804.tar.gz
-a87a42535c63fe89dc25c47cea658290  ibus-table-1.2.0.20090902.tar.gz
+0ca33287ad0efe0c3a4ef4520c8a2c3d  ibus-table-1.2.0.20090904.tar.gz



From bojan at fedoraproject.org  Fri Sep  4 06:54:36 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri,  4 Sep 2009 06:54:36 +0000 (UTC)
Subject: rpms/viewvc/F-10 sources, 1.8, 1.9 viewvc.spec, 1.15,
	1.16 viewvc-allow-tar.patch, 1.1,
	NONE viewvc-temp-location.patch, 1.1, NONE
Message-ID: <20090904065436.E3FB611C0082@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29403

Modified Files:
	sources viewvc.spec 
Removed Files:
	viewvc-allow-tar.patch viewvc-temp-location.patch 
Log Message:
Bump up to 1.1.2.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Aug 2009 21:56:32 -0000	1.8
+++ sources	4 Sep 2009 06:54:36 -0000	1.9
@@ -1 +1 @@
-5aa48bb866f65bfcf32aa0cd581bf7d3  viewvc-1.0.9.tar.gz
+8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/viewvc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- viewvc.spec	11 Aug 2009 21:56:32 -0000	1.15
+++ viewvc.spec	4 Sep 2009 06:54:36 -0000	1.16
@@ -1,22 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-# EL4 & EL5 do not have cvsgraph or enscript.. yet
-%if 0%{?rhel}
-%define with_cvsgraph_enscript 0
-%else
-%define with_cvsgraph_enscript 1
-%endif
-
-# EL4 has a subversion that does not meet the minimum reqs for subversion
-%if 0%{?rhel} && "%rhel" < "5"
-%define with_subversion 0
-%else
-%define with_subversion 1
-%endif
-
-
 Name:           viewvc
-Version:        1.0.9
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -26,22 +11,18 @@ URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
-Patch0:         viewvc-temp-location.patch
-Patch1:         viewvc-allow-tar.patch
+Source3:        viewvc-lexer-mimetypes.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
 Conflicts:      selinux-policy < 2.5.10-2
 
 BuildArch:      noarch
-BuildRequires:  python-devel >= 2.0
+BuildRequires:  python-devel >= 2.0, python-pygments
 Requires:       webserver, rcs, diffutils
-%if 0%{with_subversion}
 Requires:       subversion >= 1.2
-%endif
-%if 0%{with_cvsgraph_enscript}
-Requires:       enscript, cvsgraph
-%endif
+Requires:       cvsgraph
+Requires:       python-pygments
 
 %description
 ViewVC is a browser interface for CVS and Subversion version control
@@ -51,10 +32,6 @@ as well as diffs between those versions.
 of the report-like functionality you expect out of your version control tool,
 but much more prettily than the average textual command-line program output.
 
-%if 0%{!?with_subversion}
-This version only supports CVS repositories.
-%endif
-
 %package httpd
 Summary:        ViewVC configuration for Apache/mod_python
 Group:          Development/Tools
@@ -66,8 +43,6 @@ with decent performance when run under A
 
 %prep
 %setup -q
-%patch0 -p0 -b .temp-location
-%patch1 -p0 -b .allow-tar
 
 %build
 
@@ -94,24 +69,21 @@ with decent performance when run under A
 
 # Fix paths in configuration
 %{__perl} -pi \
-  -e 's|templates/|%{_datadir}/viewvc/templates/|g;' \
-  -e 's|^template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
-  -e 's|^#docroot = .*|docroot = /viewvc-static|;' \
-  -e 's|^cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+  -e 's|^#* *template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
+  -e 's|^#* *docroot = .*|docroot = /viewvc-static|;' \
+  -e 's|^#* *cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+  -e 's|^#* *use_cvsgraph = .*|use_cvsgraph = 1|;' \
   %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 
-%if 0%{with_cvsgraph_enscript}
-%{__perl} -pi \
-  -e 's|^use_cvsgraph = .*|use_cvsgraph = 1|;' \
-  -e 's|^use_enscript = .*|use_enscript = 1|;' \
-  %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
-%endif
-
 # Install config to sysconf directory
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/viewvc.conf %{buildroot}%{_sysconfdir}/viewvc/viewvc.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
+%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
+%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf
+
+%{SOURCE3} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
 
 # Install Apache configuration and README
 %{__sed} -e s,__datadir__,%{_datadir}, \
@@ -127,9 +99,6 @@ with decent performance when run under A
 %{__mv} %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/viewvc.py \
         %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/viewvc-mp.py
 
-# Kill patch backup file
-%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/lib/viewvc.py.temp-location
-
 # Make spool directory for temp files
 %{__mkdir} -p %{buildroot}%{_localstatedir}/spool/viewvc
 
@@ -138,7 +107,7 @@ with decent performance when run under A
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGES README README.httpd INSTALL TODO COMMITTERS LICENSE.html docs
+%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE.html docs
 %config(noreplace) %{_sysconfdir}/viewvc
 %{python_sitelib}/*
 %{_datadir}/*
@@ -149,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Fri Sep  4 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
+- bump up to 1.1.2
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.9-1
 - bump up to 1.0.9
 - security fix: validate the 'view' parameter to avoid XSS attack


--- viewvc-allow-tar.patch DELETED ---


--- viewvc-temp-location.patch DELETED ---



From bojan at fedoraproject.org  Fri Sep  4 07:00:14 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri,  4 Sep 2009 07:00:14 +0000 (UTC)
Subject: rpms/viewvc/F-10 viewvc-lexer-mimetypes.py,NONE,1.1
Message-ID: <20090904070014.CD75511C0382@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv374

Added Files:
	viewvc-lexer-mimetypes.py 
Log Message:
Add mimetypes generator.


--- NEW FILE viewvc-lexer-mimetypes.py ---
#!/usr/bin/python

import sys
import re
from pygments.lexers import get_all_lexers

for fullname, names, exts, mimetype in get_all_lexers():
  if len(exts) > len(mimetype):
    for j in range(len(mimetype)):
      line=0
      for i in range(len(exts)):
        if re.match('\*\.',exts[i]):
          if i == 0:
            print mimetype[j],
            line=1
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
          else:
            print exts[i][2:],
        if line==1 and i == len(exts)-1:
          print
  elif len(exts) == 1:
    for i in range(len(mimetype)):
      if re.match('\*\.',exts[0]):
        if re.search('\[[0-9]+\]',exts[0]):
          s=re.search('\[[0-9]+\]',exts[0]).span()[0]+1
          e=re.search('\[[0-9]+\]',exts[0]).span()[1]-1
          print mimetype[i],
          for k in range(s,e):
            print exts[0][2:s-1]+exts[0][k]+exts[0][e+1:],
          print
        else:
          print mimetype[i], exts[0][2:]
  else:
    for i in range(len(mimetype)):
      if len(exts) > i:
        if re.match('\*\.',exts[i]):
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            print mimetype[i],
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
            print
          else:
            print mimetype[i], exts[i][2:]



From markmc at fedoraproject.org  Fri Sep  4 07:22:11 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  4 Sep 2009 07:22:11 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-no-kvm-segfault.patch,1.1,1.2
Message-ID: <20090904072211.39E9711C0082@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7992

Modified Files:
	qemu-fix-no-kvm-segfault.patch 
Log Message:
Sync from git


qemu-fix-no-kvm-segfault.patch:
 exec.c |    4 ----
 1 file changed, 4 deletions(-)

Index: qemu-fix-no-kvm-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-no-kvm-segfault.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-no-kvm-segfault.patch	20 Aug 2009 12:56:37 -0000	1.1
+++ qemu-fix-no-kvm-segfault.patch	4 Sep 2009 07:22:09 -0000	1.2
@@ -1,5 +1,5 @@
-From add286b6e753f14e4ae0ab6b831441aea0d35497 Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones at f12rawhidex64.home.annexia.org>
+From aa1620047bb49079f4c114326d43fb9aa7a26065 Mon Sep 17 00:00:00 2001
+From: Richard Jones <rjones at redhat.com>
 Date: Thu, 20 Aug 2009 13:52:20 +0100
 Subject: [PATCH] Workaround segfault when qemu-kvm runs inside a VM (RHBZ#516543).
 
@@ -11,15 +11,18 @@ http://www.mail-archive.com/kvm at vger.ker
 
 Note: NOT UPSTREAM and this is something of a hack.  Upstream are
 still debating how they really want to fix this.
+
+Signed-off-by: Richard Jones <rjones at redhat.com>
+Fedora-patch: qemu-fix-no-kvm-segfault.patch
 ---
  exec.c |    3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)
 
 diff --git a/exec.c b/exec.c
-index 705bcf2..2091516 100644
+index 88bcff5..721fcff 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -422,9 +422,6 @@ static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
+@@ -421,9 +421,6 @@ static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
  
  static void code_gen_alloc(unsigned long tb_size)
  {
@@ -30,5 +33,5 @@ index 705bcf2..2091516 100644
      code_gen_buffer = static_code_gen_buffer;
      code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE;
 -- 
-1.6.4
+1.6.2.5
 



From mtasaka at fedoraproject.org  Fri Sep  4 07:29:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Sep 2009 07:29:41 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.396, 1.397 jd.spec, 1.456, 1.457 sources,
	1.397, 1.398
Message-ID: <20090904072941.16D2C11C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8805/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- .cvsignore	30 Aug 2009 06:37:29 -0000	1.396
+++ .cvsignore	4 Sep 2009 07:29:40 -0000	1.397
@@ -1 +1 @@
-jd-2.4.2-svn3054_trunk.tgz
+jd-2.4.2-svn3055_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -p -r1.456 -r1.457
--- jd.spec	30 Aug 2009 06:37:29 -0000	1.456
+++ jd.spec	4 Sep 2009 07:29:40 -0000	1.457
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3054_trunk
+%define         strtag        svn3055_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3054
+* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3055
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- sources	30 Aug 2009 06:37:29 -0000	1.397
+++ sources	4 Sep 2009 07:29:40 -0000	1.398
@@ -1 +1 @@
-26b788eb750ba90ecb8ef1ded3909b7e  jd-2.4.2-svn3054_trunk.tgz
+1ee4aa47b29ee812bfc712c2ea890bb6  jd-2.4.2-svn3055_trunk.tgz



From mtasaka at fedoraproject.org  Fri Sep  4 07:29:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Sep 2009 07:29:41 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.390, 1.391 jd.spec, 1.452, 1.453 sources,
	1.391, 1.392
Message-ID: <20090904072941.5771F11C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8805/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- .cvsignore	30 Aug 2009 06:37:31 -0000	1.390
+++ .cvsignore	4 Sep 2009 07:29:40 -0000	1.391
@@ -1 +1 @@
-jd-2.4.2-svn3054_trunk.tgz
+jd-2.4.2-svn3055_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -p -r1.452 -r1.453
--- jd.spec	30 Aug 2009 06:37:31 -0000	1.452
+++ jd.spec	4 Sep 2009 07:29:41 -0000	1.453
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3054_trunk
+%define         strtag        svn3055_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3054
+* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3055
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- sources	30 Aug 2009 06:37:31 -0000	1.391
+++ sources	4 Sep 2009 07:29:41 -0000	1.392
@@ -1 +1 @@
-26b788eb750ba90ecb8ef1ded3909b7e  jd-2.4.2-svn3054_trunk.tgz
+1ee4aa47b29ee812bfc712c2ea890bb6  jd-2.4.2-svn3055_trunk.tgz



From jwrdegoede at fedoraproject.org  Fri Sep  4 07:41:10 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  4 Sep 2009 07:41:10 +0000 (UTC)
Subject: rpms/python-pyblock/devel .cvsignore, 1.41, 1.42 python-pyblock.spec,
	1.67, 1.68 sources, 1.44, 1.45
Message-ID: <20090904074110.8BCB611C0082@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
* Fri Sep  4 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-1
- Catch dmraid.GroupingError in getRaidSets() (#521033)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	2 Apr 2009 20:07:02 -0000	1.41
+++ .cvsignore	4 Sep 2009 07:41:09 -0000	1.42
@@ -1 +1 @@
-pyblock-0.42.tar.bz2
+pyblock-0.43.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- python-pyblock.spec	26 Jul 2009 20:55:22 -0000	1.67
+++ python-pyblock.spec	4 Sep 2009 07:41:09 -0000	1.68
@@ -5,8 +5,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.42
-Release: 2%{?dist}
+Version: 0.43
+Release: 1%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Fri Sep  4 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-1
+- Catch dmraid.GroupingError in getRaidSets() (#521033)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.42-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	2 Apr 2009 20:07:02 -0000	1.44
+++ sources	4 Sep 2009 07:41:09 -0000	1.45
@@ -1 +1 @@
-6500aeb42b1f53432204291e8626cd57  pyblock-0.42.tar.bz2
+a1f458ab7cf45aa9a3ff6850c43bd32d  pyblock-0.43.tar.bz2



From eseyman at fedoraproject.org  Fri Sep  4 07:57:06 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri,  4 Sep 2009 07:57:06 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel import.log, NONE,
	1.1 perl-CGI-Application-Plugin-DBIC-Schema.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904075706.50B3A11C0082@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12725/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-DBIC-Schema.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-DBIC-Schema-0_2-1_fc11:HEAD:perl-CGI-Application-Plugin-DBIC-Schema-0.2-1.fc11.src.rpm:1252050983


--- NEW FILE perl-CGI-Application-Plugin-DBIC-Schema.spec ---
Name:           perl-CGI-Application-Plugin-DBIC-Schema
Version:        0.2
Release:        1%{?dist}
Summary:        Easy DBIx::Class access from CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-DBIC-Schema/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Plugin-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
Requires:       perl(CGI::Application)
Requires:       perl(DBIx::Class)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::DBIC::Schema adds easy access to a
DBIx::Class::Schema to your Titanium or CGI::Application modules. Lazy
loading is used to prevent a database connection from being made if the
schema method is not called during the request. In other words, the
database connection is not created until it is actually needed.

%prep
%setup -q -n CGI-Application-Plugin-DBIC-Schema-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 01 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.2-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:14:23 -0000	1.1
+++ .cvsignore	4 Sep 2009 07:57:05 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:14:23 -0000	1.1
+++ sources	4 Sep 2009 07:57:05 -0000	1.2
@@ -0,0 +1 @@
+a76923798dc1e03dd67f5bd0542fe3c5  CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz



From eseyman at fedoraproject.org  Fri Sep  4 07:58:13 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri,  4 Sep 2009 07:58:13 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-12 import.log, NONE, 
	1.1 perl-CGI-Application-Plugin-DBIC-Schema.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904075813.60AA311C0082@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13011/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-DBIC-Schema.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-DBIC-Schema-0_2-1_fc11:F-12:perl-CGI-Application-Plugin-DBIC-Schema-0.2-1.fc11.src.rpm:1252051050


--- NEW FILE perl-CGI-Application-Plugin-DBIC-Schema.spec ---
Name:           perl-CGI-Application-Plugin-DBIC-Schema
Version:        0.2
Release:        1%{?dist}
Summary:        Easy DBIx::Class access from CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-DBIC-Schema/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Plugin-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
Requires:       perl(CGI::Application)
Requires:       perl(DBIx::Class)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::DBIC::Schema adds easy access to a
DBIx::Class::Schema to your Titanium or CGI::Application modules. Lazy
loading is used to prevent a database connection from being made if the
schema method is not called during the request. In other words, the
database connection is not created until it is actually needed.

%prep
%setup -q -n CGI-Application-Plugin-DBIC-Schema-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 01 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.2-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:14:23 -0000	1.1
+++ .cvsignore	4 Sep 2009 07:58:13 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:14:23 -0000	1.1
+++ sources	4 Sep 2009 07:58:13 -0000	1.2
@@ -0,0 +1 @@
+a76923798dc1e03dd67f5bd0542fe3c5  CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz



From eseyman at fedoraproject.org  Fri Sep  4 08:01:52 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri,  4 Sep 2009 08:01:52 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-11 import.log, NONE, 
	1.1 perl-CGI-Application-Plugin-DBIC-Schema.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904080152.EFC6B11C0082@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13551/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-DBIC-Schema.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-DBIC-Schema-0_2-1_fc11:F-11:perl-CGI-Application-Plugin-DBIC-Schema-0.2-1.fc11.src.rpm:1252051269


--- NEW FILE perl-CGI-Application-Plugin-DBIC-Schema.spec ---
Name:           perl-CGI-Application-Plugin-DBIC-Schema
Version:        0.2
Release:        1%{?dist}
Summary:        Easy DBIx::Class access from CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-DBIC-Schema/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Plugin-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
Requires:       perl(CGI::Application)
Requires:       perl(DBIx::Class)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::DBIC::Schema adds easy access to a
DBIx::Class::Schema to your Titanium or CGI::Application modules. Lazy
loading is used to prevent a database connection from being made if the
schema method is not called during the request. In other words, the
database connection is not created until it is actually needed.

%prep
%setup -q -n CGI-Application-Plugin-DBIC-Schema-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 01 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.2-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:14:23 -0000	1.1
+++ .cvsignore	4 Sep 2009 08:01:51 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:14:23 -0000	1.1
+++ sources	4 Sep 2009 08:01:52 -0000	1.2
@@ -0,0 +1 @@
+a76923798dc1e03dd67f5bd0542fe3c5  CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz



From eseyman at fedoraproject.org  Fri Sep  4 08:04:56 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri,  4 Sep 2009 08:04:56 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-10 import.log, NONE, 
	1.1 perl-CGI-Application-Plugin-DBIC-Schema.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904080456.868C111C0082@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14702/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-DBIC-Schema.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-DBIC-Schema-0_2-1_fc11:F-10:perl-CGI-Application-Plugin-DBIC-Schema-0.2-1.fc11.src.rpm:1252051453


--- NEW FILE perl-CGI-Application-Plugin-DBIC-Schema.spec ---
Name:           perl-CGI-Application-Plugin-DBIC-Schema
Version:        0.2
Release:        1%{?dist}
Summary:        Easy DBIx::Class access from CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-DBIC-Schema/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Plugin-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
Requires:       perl(CGI::Application)
Requires:       perl(DBIx::Class)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::DBIC::Schema adds easy access to a
DBIx::Class::Schema to your Titanium or CGI::Application modules. Lazy
loading is used to prevent a database connection from being made if the
schema method is not called during the request. In other words, the
database connection is not created until it is actually needed.

%prep
%setup -q -n CGI-Application-Plugin-DBIC-Schema-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 01 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.2-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:14:23 -0000	1.1
+++ .cvsignore	4 Sep 2009 08:04:56 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:14:23 -0000	1.1
+++ sources	4 Sep 2009 08:04:56 -0000	1.2
@@ -0,0 +1 @@
+a76923798dc1e03dd67f5bd0542fe3c5  CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz



From akurtakov at fedoraproject.org  Fri Sep  4 08:18:40 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Sep 2009 08:18:40 +0000 (UTC)
Subject: rpms/felix-osgi-obr/devel felix-osgi-obr.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904081840.9007A11C0082@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/felix-osgi-obr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16559/devel

Modified Files:
	.cvsignore sources 
Added Files:
	felix-osgi-obr.spec 
Log Message:
Initial import.


--- NEW FILE felix-osgi-obr.spec ---
%global bundle org.osgi.service.obr

Name:           felix-osgi-obr
Version:        1.0.2
Release:        2%{?dist}
Summary:        Felix OSGi OBR Service API

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
Source0:        http://www.apache.org/dist/felix/org.osgi.service.obr-%{version}-project.tar.gz
Source1:        build.xml.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ant
BuildRequires:  jpackage-utils
BuildRequires:  felix-osgi-core
Requires:       felix-osgi-core
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
BuildArch: noarch

%description
OSGi OBR Service API.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{bundle}-%{version}

tar xf %{SOURCE1}

mkdir -p .m2/repository

%build
export CLASSPATH=$(build-classpath felix/org.osgi.core)
ant -Dbuild.sysclasspath=only \
    -Dmaven.settings.offline=true \
    -Dmaven.repo.local=.m2/repository \
    package javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/felix
install -m 644 target/%{bundle}-%{version}.jar \
        %{buildroot}%{_javadir}/felix/%{bundle}-%{version}.jar

(cd %{buildroot}%{_javadir}/felix && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP.felix-%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE
%{_javadir}/felix/*.jar
%{_datadir}/maven2/poms/JPP.felix-%{name}.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.2-2
- Fix line length.

* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.2-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-obr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Sep 2009 15:10:54 -0000	1.1
+++ .cvsignore	4 Sep 2009 08:18:38 -0000	1.2
@@ -0,0 +1,2 @@
+build.xml.tar.gz
+org.osgi.service.obr-1.0.2-project.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/felix-osgi-obr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Sep 2009 15:10:54 -0000	1.1
+++ sources	4 Sep 2009 08:18:38 -0000	1.2
@@ -0,0 +1,2 @@
+b2235378b04f1ec953eceaac37d9e97d  build.xml.tar.gz
+cda8d61716cf0d67887f3d5a2cac417b  org.osgi.service.obr-1.0.2-project.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  4 08:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 08:25:42 +0000
Subject: [pkgdb] mutt had acl change status
Message-ID: <20090904082542.BC62F10F874@bastion2.fedora.phx.redhat.com>

mlichvar has set the commit acl on mutt (Fedora devel) to Approved for deji

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutt



From pkgdb at fedoraproject.org  Fri Sep  4 08:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 08:25:50 +0000
Subject: [pkgdb] mutt had acl change status
Message-ID: <20090904082550.3E91D10F883@bastion2.fedora.phx.redhat.com>

mlichvar has set the commit acl on mutt (Fedora 10) to Approved for deji

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutt



From pkgdb at fedoraproject.org  Fri Sep  4 08:25:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 08:25:52 +0000
Subject: [pkgdb] mutt had acl change status
Message-ID: <20090904082553.2576B10F893@bastion2.fedora.phx.redhat.com>

mlichvar has set the commit acl on mutt (Fedora 11) to Approved for deji

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutt



From timlau at fedoraproject.org  Fri Sep  4 08:26:06 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Fri,  4 Sep 2009 08:26:06 +0000 (UTC)
Subject: rpms/yumex/devel .cvsignore, 1.41, 1.42 sources, 1.60,
	1.61 yumex.spec, 1.73, 1.74
Message-ID: <20090904082606.C304911C0082@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18000

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Yumex Nextgen 2.9.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	15 Nov 2008 13:04:51 -0000	1.41
+++ .cvsignore	4 Sep 2009 08:26:06 -0000	1.42
@@ -1 +1 @@
-yumex-2.0.5.tar.gz
+yumex-2.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	16 Nov 2008 06:21:34 -0000	1.60
+++ sources	4 Sep 2009 08:26:06 -0000	1.61
@@ -1 +1 @@
-57686187efb6abe645b416f4b63d9c37  yumex-2.0.5.tar.gz
+7deef927bd34bc5b6c704fbcd33896fa  yumex-2.9.0.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- yumex.spec	27 Jul 2009 08:58:16 -0000	1.73
+++ yumex.spec	4 Sep 2009 08:26:06 -0000	1.74
@@ -1,16 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.5
-Release:  7%{?dist}
+Version:  2.9.0
+Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
 License:  GPLv2+
 URL:      http://www.yum-extender.org
 Source0:  http://www.yum-extender.org/dnl/yumex/source/%{name}-%{version}.tar.gz
-Patch0:   fix-python26-syntax-errors.patch
-
 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -20,10 +18,12 @@ BuildRequires: gettext
 BuildRequires: intltool
 
 
-Requires: yum >= 3.2
-Requires: pygtk2
+Requires: yum >= 3.2.21
+Requires: pygtk2 >= 2.14
 Requires: usermode
-Requires: pygtk2-libglade
+Requires: pexpect
+Requires: python-enum
+Requires: python-iniparse
 
 %description
 Graphical User Interface for Yum.
@@ -31,7 +31,7 @@ Graphical User Interface for Yum.
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 make
@@ -57,30 +57,58 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f  %{name}.lang
 %defattr(-, root, root, -)
-%doc COPYING ChangeLog
+%doc COPYING ChangeLog TODO
 %{_datadir}/pixmaps/yumex
 %{_datadir}/yumex
-%{_bindir}/yumex
-%{python_sitelib}/yumgui/
+%{_bindir}/yumex*
+%{python_sitelib}/yumexbackend/
+%{python_sitelib}/yumexbase/
+%{python_sitelib}/yumexgui/
+%{python_sitelib}/guihelpers/
 %config(noreplace)  %{_sysconfdir}/yumex.profiles.conf
 %config(noreplace)  %{_sysconfdir}/yumex.conf
-%config(noreplace) %{_sysconfdir}/pam.d/yumex
-%config(noreplace) %{_sysconfdir}/security/console.apps/yumex
+%config %{_sysconfdir}/pam.d/yumex-yum-backend
+%config %{_sysconfdir}/security/console.apps/yumex-yum-backend
 
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Dec 9 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-5
-- Update Requires: yum to 3.2
-- Added patch to fix python 2.6 syntax errors
-* Sat Nov 15 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-1
-- Release 2.0.5
+* Sun Aug 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
+- bumped version to 2.9.0-1
+* Sun Aug 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.13.pre
+- bumped version to 2.9.0-0.13.pre
+* Mon Aug 24 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.12.pre
+- bumped version to 2.9.0-0.12.pre
+* Fri Aug 21 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.11.pre
+- bumped version to 2.9.0-0.11.pre
+* Fri Aug 7 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.10.pre
+- bumped version to 2.9.0-0.10.pre
+* Thu Aug 6 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.9.pre
+- bumped version to 2.9.0-0.9.pre
+- handle new yumex-yum-backend in %%files section 
+* Sun May 24 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.8.pre
+- bumped version to 2.9.0-0.8.pre
+* Wed May 20 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.7.pre
+- bumped version to 2.9.0-0.7.pre
+* Sun May 10 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.6.pre
+- bumped version to 2.9.0-0.6.pre
+* Wed May 6 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.5.pre
+- bumped version to 2.9.0-0.5.pre
+* Thu Apr 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.4.pre
+- bumped version to 2.9.0-0.4.pre
+- added minimum version for pygtk requirement
+* Sat Apr 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.3.pre
+- bumped version to 2.9.0-0.3.pre
+* Tue Apr 21 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.2.pre
+- bumped version to 2.9.0-0.2.pre
+* Tue Apr 21 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.1.pre
+- bumped version to 2.9.0-0.1.pre
+* Tue Apr 21 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.1.0-0.2.pre
+- Added guihelpers to %%files
+* Fri Oct 24 2008 Tim Lauridsen <timlau at fedoraproject.org> - 2.1.0-0.1.pre
+- bumped version to 2.1.0-0.1.pre
+- added pexpect & python-enum requires.
+- added yumex* python modules to %%files
 * Thu Feb 21 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.4-1
 - Release 2.0.4
 * Mon Nov 19 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.3-2



From than at fedoraproject.org  Fri Sep  4 09:12:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 09:12:42 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-11 kdepim-runtime.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090904091242.6EB8B11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24752

Modified Files:
	kdepim-runtime.spec sources 
Log Message:
4.3.1



Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-11/kdepim-runtime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-runtime.spec	5 Aug 2009 12:54:03 -0000	1.1
+++ kdepim-runtime.spec	4 Sep 2009 09:12:41 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 12:54:03 -0000	1.2
+++ sources	4 Sep 2009 09:12:41 -0000	1.3
@@ -1 +1 @@
-d29f9b0921534309d4595de5c9b619f1  kdepim-runtime-4.3.0.tar.bz2
+a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Sep  4 09:13:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 09:13:53 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-10 kdepim-runtime.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090904091353.5B53311C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24913

Modified Files:
	kdepim-runtime.spec sources 
Log Message:
4.3.1



Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-10/kdepim-runtime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-runtime.spec	5 Aug 2009 12:54:03 -0000	1.1
+++ kdepim-runtime.spec	4 Sep 2009 09:13:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 12:54:03 -0000	1.2
+++ sources	4 Sep 2009 09:13:53 -0000	1.3
@@ -1 +1 @@
-d29f9b0921534309d4595de5c9b619f1  kdepim-runtime-4.3.0.tar.bz2
+a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2



From peter at fedoraproject.org  Fri Sep  4 09:14:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  4 Sep 2009 09:14:47 +0000 (UTC)
Subject: rpms/flashrom/devel flashrom-0.9.1.tar.bz2.asc, NONE, 1.1 .cvsignore,
	1.15, 1.16 flashrom.spec, 1.20, 1.21 import.log, 1.7,
	1.8 sources, 1.15, 1.16 flashrom--Makefile_cleanup.diff, 1.7, NONE
Message-ID: <20090904091447.712D111C0082@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25177/devel

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Added Files:
	flashrom-0.9.1.tar.bz2.asc 
Removed Files:
	flashrom--Makefile_cleanup.diff 
Log Message:
Ver. 0.9.1


--- NEW FILE flashrom-0.9.1.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)

iD8DBQBKnov8RdNMz2eF/AERAr2mAJ9mkXCumIdebw0OsjUe+pghuo3huwCg81Pj
lPXfOR1NtZWm/R9G8JN0WWA=
=e1RW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 06:06:21 -0000	1.15
+++ .cvsignore	4 Sep 2009 09:14:47 -0000	1.16
@@ -1 +1 @@
-flashrom-0.9.0.tar.bz2
+flashrom-0.9.1.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/flashrom.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- flashrom.spec	24 Jul 2009 22:52:06 -0000	1.20
+++ flashrom.spec	4 Sep 2009 09:14:47 -0000	1.21
@@ -1,12 +1,12 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0.9.0
-Release:	2%{?dist}
+Version:	0.9.1
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
-URL:		http://coreboot.org/flashrom
+URL:		http://flashrom.org
 Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
-Patch0:		flashrom--Makefile_cleanup.diff
+Source1:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,16 +20,13 @@ and write new contents on the chips ("fl
 
 %prep
 %setup -q
-%patch0 -p0 -b .Makefile_cleanup
 
 %build
 CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+%{__make} install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -41,6 +38,12 @@ install -D -p -m644 %{name}.8 $RPM_BUILD
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Fri Sep  4 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.1-1
+- Ver. 0.9.1
+- See release notes at http://www.coreboot.org/Flashrom/0.9.1
+- Dropped the only patch (no longer needed)
+- Changed project's URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	5 May 2009 06:06:21 -0000	1.7
+++ import.log	4 Sep 2009 09:14:47 -0000	1.8
@@ -5,3 +5,4 @@ flashrom-0-0_15_20090112svn3852_fc10:HEA
 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
+flashrom-0_9_1-1_fc11:HEAD:flashrom-0.9.1-1.fc11.src.rpm:1252055642


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 06:06:21 -0000	1.15
+++ sources	4 Sep 2009 09:14:47 -0000	1.16
@@ -1 +1 @@
-e9953bc012b07ce20e83f253e5199c2a  flashrom-0.9.0.tar.bz2
+2b7cc0e45a0ac4c6d43c0f7cd05b041a  flashrom-0.9.1.tar.bz2


--- flashrom--Makefile_cleanup.diff DELETED ---



From peter at fedoraproject.org  Fri Sep  4 09:16:27 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  4 Sep 2009 09:16:27 +0000 (UTC)
Subject: rpms/flashrom/F-11 flashrom-0.9.1.tar.bz2.asc, NONE, 1.1 .cvsignore,
	1.15, 1.16 flashrom.spec, 1.19, 1.20 import.log, 1.7,
	1.8 sources, 1.15, 1.16 flashrom--Makefile_cleanup.diff, 1.7, NONE
Message-ID: <20090904091627.51A5611C0082@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25542/F-11

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Added Files:
	flashrom-0.9.1.tar.bz2.asc 
Removed Files:
	flashrom--Makefile_cleanup.diff 
Log Message:
Ver. 0.9.1


--- NEW FILE flashrom-0.9.1.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)

iD8DBQBKnov8RdNMz2eF/AERAr2mAJ9mkXCumIdebw0OsjUe+pghuo3huwCg81Pj
lPXfOR1NtZWm/R9G8JN0WWA=
=e1RW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 06:08:35 -0000	1.15
+++ .cvsignore	4 Sep 2009 09:16:27 -0000	1.16
@@ -1 +1 @@
-flashrom-0.9.0.tar.bz2
+flashrom-0.9.1.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-11/flashrom.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- flashrom.spec	5 May 2009 06:08:35 -0000	1.19
+++ flashrom.spec	4 Sep 2009 09:16:27 -0000	1.20
@@ -1,12 +1,12 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0.9.0
+Version:	0.9.1
 Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
-URL:		http://coreboot.org/flashrom
+URL:		http://flashrom.org
 Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
-Patch0:		flashrom--Makefile_cleanup.diff
+Source1:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,16 +20,13 @@ and write new contents on the chips ("fl
 
 %prep
 %setup -q
-%patch0 -p0 -b .Makefile_cleanup
 
 %build
 CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+%{__make} install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -41,6 +38,15 @@ install -D -p -m644 %{name}.8 $RPM_BUILD
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Fri Sep  4 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.1-1
+- Ver. 0.9.1
+- See release notes at http://www.coreboot.org/Flashrom/0.9.1
+- Dropped the only patch (no longer needed)
+- Changed project's URL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May  5 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.0-1
 - Ver. 0.9.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-11/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	5 May 2009 06:08:35 -0000	1.7
+++ import.log	4 Sep 2009 09:16:27 -0000	1.8
@@ -5,3 +5,4 @@ flashrom-0-0_15_20090112svn3852_fc10:HEA
 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
+flashrom-0_9_1-1_fc11:F-11:flashrom-0.9.1-1.fc11.src.rpm:1252055761


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 06:08:35 -0000	1.15
+++ sources	4 Sep 2009 09:16:27 -0000	1.16
@@ -1 +1 @@
-e9953bc012b07ce20e83f253e5199c2a  flashrom-0.9.0.tar.bz2
+2b7cc0e45a0ac4c6d43c0f7cd05b041a  flashrom-0.9.1.tar.bz2


--- flashrom--Makefile_cleanup.diff DELETED ---



From peter at fedoraproject.org  Fri Sep  4 09:17:27 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  4 Sep 2009 09:17:27 +0000 (UTC)
Subject: rpms/flashrom/F-10 flashrom-0.9.1.tar.bz2.asc, NONE, 1.1 .cvsignore,
	1.15, 1.16 flashrom.spec, 1.18, 1.19 import.log, 1.7,
	1.8 sources, 1.15, 1.16 flashrom--Makefile_cleanup.diff, 1.7, NONE
Message-ID: <20090904091727.B7C0311C0082@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25823/F-10

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Added Files:
	flashrom-0.9.1.tar.bz2.asc 
Removed Files:
	flashrom--Makefile_cleanup.diff 
Log Message:
Ver. 0.9.1


--- NEW FILE flashrom-0.9.1.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)

iD8DBQBKnov8RdNMz2eF/AERAr2mAJ9mkXCumIdebw0OsjUe+pghuo3huwCg81Pj
lPXfOR1NtZWm/R9G8JN0WWA=
=e1RW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 06:11:18 -0000	1.15
+++ .cvsignore	4 Sep 2009 09:17:27 -0000	1.16
@@ -1 +1 @@
-flashrom-0.9.0.tar.bz2
+flashrom-0.9.1.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/flashrom.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- flashrom.spec	5 May 2009 06:11:18 -0000	1.18
+++ flashrom.spec	4 Sep 2009 09:17:27 -0000	1.19
@@ -1,12 +1,12 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0.9.0
+Version:	0.9.1
 Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
-URL:		http://coreboot.org/flashrom
+URL:		http://flashrom.org
 Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
-Patch0:		flashrom--Makefile_cleanup.diff
+Source1:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,16 +20,13 @@ and write new contents on the chips ("fl
 
 %prep
 %setup -q
-%patch0 -p0 -b .Makefile_cleanup
 
 %build
 CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+%{__make} install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -41,6 +38,15 @@ install -D -p -m644 %{name}.8 $RPM_BUILD
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Fri Sep  4 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.1-1
+- Ver. 0.9.1
+- See release notes at http://www.coreboot.org/Flashrom/0.9.1
+- Dropped the only patch (no longer needed)
+- Changed project's URL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May  5 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.0-1
 - Ver. 0.9.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	5 May 2009 06:11:18 -0000	1.7
+++ import.log	4 Sep 2009 09:17:27 -0000	1.8
@@ -5,3 +5,4 @@ flashrom-0-0_15_20090112svn3852_fc10:F-1
 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
+flashrom-0_9_1-1_fc11:F-10:flashrom-0.9.1-1.fc11.src.rpm:1252055824


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 06:11:18 -0000	1.15
+++ sources	4 Sep 2009 09:17:27 -0000	1.16
@@ -1 +1 @@
-e9953bc012b07ce20e83f253e5199c2a  flashrom-0.9.0.tar.bz2
+2b7cc0e45a0ac4c6d43c0f7cd05b041a  flashrom-0.9.1.tar.bz2


--- flashrom--Makefile_cleanup.diff DELETED ---



From peter at fedoraproject.org  Fri Sep  4 09:18:30 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  4 Sep 2009 09:18:30 +0000 (UTC)
Subject: rpms/flashrom/EL-5 flashrom-0.9.1.tar.bz2.asc, NONE, 1.1 .cvsignore,
	1.15, 1.16 flashrom.spec, 1.17, 1.18 import.log, 1.7,
	1.8 sources, 1.15, 1.16 flashrom--Makefile_cleanup.diff, 1.7, NONE
Message-ID: <20090904091830.F02BA11C0082@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26141/EL-5

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Added Files:
	flashrom-0.9.1.tar.bz2.asc 
Removed Files:
	flashrom--Makefile_cleanup.diff 
Log Message:
Ver. 0.9.1


--- NEW FILE flashrom-0.9.1.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)

iD8DBQBKnov8RdNMz2eF/AERAr2mAJ9mkXCumIdebw0OsjUe+pghuo3huwCg81Pj
lPXfOR1NtZWm/R9G8JN0WWA=
=e1RW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 06:14:31 -0000	1.15
+++ .cvsignore	4 Sep 2009 09:18:30 -0000	1.16
@@ -1 +1 @@
-flashrom-0.9.0.tar.bz2
+flashrom-0.9.1.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/flashrom.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- flashrom.spec	5 May 2009 06:14:31 -0000	1.17
+++ flashrom.spec	4 Sep 2009 09:18:30 -0000	1.18
@@ -1,12 +1,12 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0.9.0
+Version:	0.9.1
 Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
-URL:		http://coreboot.org/flashrom
+URL:		http://flashrom.org
 Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
-Patch0:		flashrom--Makefile_cleanup.diff
+Source1:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,16 +20,13 @@ and write new contents on the chips ("fl
 
 %prep
 %setup -q
-%patch0 -p0 -b .Makefile_cleanup
 
 %build
 CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+%{__make} install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -41,6 +38,15 @@ install -D -p -m644 %{name}.8 $RPM_BUILD
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Fri Sep  4 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.1-1
+- Ver. 0.9.1
+- See release notes at http://www.coreboot.org/Flashrom/0.9.1
+- Dropped the only patch (no longer needed)
+- Changed project's URL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May  5 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.0-1
 - Ver. 0.9.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	5 May 2009 06:14:31 -0000	1.7
+++ import.log	4 Sep 2009 09:18:30 -0000	1.8
@@ -5,3 +5,4 @@ flashrom-0-0_15_20090112svn3852_fc10:EL-
 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
+flashrom-0_9_1-1_fc11:EL-5:flashrom-0.9.1-1.fc11.src.rpm:1252055885


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 06:14:31 -0000	1.15
+++ sources	4 Sep 2009 09:18:30 -0000	1.16
@@ -1 +1 @@
-e9953bc012b07ce20e83f253e5199c2a  flashrom-0.9.0.tar.bz2
+2b7cc0e45a0ac4c6d43c0f7cd05b041a  flashrom-0.9.1.tar.bz2


--- flashrom--Makefile_cleanup.diff DELETED ---



From peter at fedoraproject.org  Fri Sep  4 09:22:46 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  4 Sep 2009 09:22:46 +0000 (UTC)
Subject: rpms/flashrom/EL-4 flashrom-0.9.1.tar.bz2.asc, NONE, 1.1 .cvsignore,
	1.15, 1.16 flashrom.spec, 1.17, 1.18 import.log, 1.7,
	1.8 sources, 1.15, 1.16 flashrom--Makefile_cleanup.diff, 1.7, NONE
Message-ID: <20090904092246.6548511C0082@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26766/EL-4

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Added Files:
	flashrom-0.9.1.tar.bz2.asc 
Removed Files:
	flashrom--Makefile_cleanup.diff 
Log Message:
Ver. 0.9.1


--- NEW FILE flashrom-0.9.1.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)

iD8DBQBKnov8RdNMz2eF/AERAr2mAJ9mkXCumIdebw0OsjUe+pghuo3huwCg81Pj
lPXfOR1NtZWm/R9G8JN0WWA=
=e1RW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 06:16:47 -0000	1.15
+++ .cvsignore	4 Sep 2009 09:22:46 -0000	1.16
@@ -1 +1 @@
-flashrom-0.9.0.tar.bz2
+flashrom-0.9.1.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/flashrom.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- flashrom.spec	5 May 2009 06:16:47 -0000	1.17
+++ flashrom.spec	4 Sep 2009 09:22:46 -0000	1.18
@@ -1,12 +1,12 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0.9.0
+Version:	0.9.1
 Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
-URL:		http://coreboot.org/flashrom
+URL:		http://flashrom.org
 Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
-Patch0:		flashrom--Makefile_cleanup.diff
+Source1:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2.asc
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,16 +20,13 @@ and write new contents on the chips ("fl
 
 %prep
 %setup -q
-%patch0 -p0 -b .Makefile_cleanup
 
 %build
 CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+%{__make} install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -41,6 +38,15 @@ install -D -p -m644 %{name}.8 $RPM_BUILD
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Fri Sep  4 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.1-1
+- Ver. 0.9.1
+- See release notes at http://www.coreboot.org/Flashrom/0.9.1
+- Dropped the only patch (no longer needed)
+- Changed project's URL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May  5 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.0-1
 - Ver. 0.9.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	5 May 2009 06:16:47 -0000	1.7
+++ import.log	4 Sep 2009 09:22:46 -0000	1.8
@@ -5,3 +5,4 @@ flashrom-0-0_15_20090112svn3852_fc10:EL-
 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
+flashrom-0_9_1-1_fc11:EL-4:flashrom-0.9.1-1.fc11.src.rpm:1252056138


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 06:16:47 -0000	1.15
+++ sources	4 Sep 2009 09:22:46 -0000	1.16
@@ -1 +1 @@
-e9953bc012b07ce20e83f253e5199c2a  flashrom-0.9.0.tar.bz2
+2b7cc0e45a0ac4c6d43c0f7cd05b041a  flashrom-0.9.1.tar.bz2


--- flashrom--Makefile_cleanup.diff DELETED ---



From pbrobinson at fedoraproject.org  Fri Sep  4 09:35:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Sep 2009 09:35:27 +0000 (UTC)
Subject: rpms/csound/devel csound-default-pulse.patch,NONE,1.1
Message-ID: <20090904093527.844D011C0082@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30675

Added Files:
	csound-default-pulse.patch 
Log Message:
- add pulseaudio patch

csound-default-pulse.patch:
 csound.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE csound-default-pulse.patch ---
--- Csound5.10.1/Top/csound.c.orig	2009-09-04 10:25:12.000000000 +0100
+++ Csound5.10.1/Top/csound.c	2009-09-04 10:25:21.000000000 +0100
@@ -929,7 +929,7 @@
 #ifdef OLPC
     strcpy(s, "alsa");
 #else
-    strcpy(s, "PortAudio");
+    strcpy(s, "pulse");
 #endif
     csoundCreateConfigurationVariable(p, "rtaudio", s, CSOUNDCFG_STRING,
                                       0, NULL, &max_len,



From pbrobinson at fedoraproject.org  Fri Sep  4 09:37:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Sep 2009 09:37:00 +0000 (UTC)
Subject: rpms/csound/F-11 csound-default-pulse.patch,NONE,1.1
Message-ID: <20090904093700.D6D3111C0082@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32513

Added Files:
	csound-default-pulse.patch 
Log Message:
- add pulseaudio patch

csound-default-pulse.patch:
 csound.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE csound-default-pulse.patch ---
--- Csound5.10.1/Top/csound.c.orig	2009-09-04 10:25:12.000000000 +0100
+++ Csound5.10.1/Top/csound.c	2009-09-04 10:25:21.000000000 +0100
@@ -929,7 +929,7 @@
 #ifdef OLPC
     strcpy(s, "alsa");
 #else
-    strcpy(s, "PortAudio");
+    strcpy(s, "pulse");
 #endif
     csoundCreateConfigurationVariable(p, "rtaudio", s, CSOUNDCFG_STRING,
                                       0, NULL, &max_len,



From markmc at fedoraproject.org  Fri Sep  4 10:09:56 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  4 Sep 2009 10:09:56 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-use-statfs-to-determine-huge-page-size.patch,
	NONE, 1.1 qemu.spec, 1.100, 1.101
Message-ID: <20090904100956.7C94811C0082@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10568

Modified Files:
	qemu.spec 
Added Files:
	qemu-use-statfs-to-determine-huge-page-size.patch 
Log Message:
* Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-3
- Use statfs to determine huge page size, fixing fd leak (#519378)


qemu-use-statfs-to-determine-huge-page-size.patch:
 sysemu.h |    2 +-
 vl.c     |   43 +++++++++++++++++++------------------------
 2 files changed, 20 insertions(+), 25 deletions(-)

--- NEW FILE qemu-use-statfs-to-determine-huge-page-size.patch ---
>From 046661932789fd11acc1293e2106a3eba3e6c840 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel at amd.com>
Date: Fri, 27 Mar 2009 15:34:38 +0100
Subject: [PATCH] Use statfs to determine size of huge pages

The current method of finding out the size of huge pages does not work
reliably anymore. Current Linux supports more than one huge page size
but /proc/meminfo only show one of the supported sizes.
To find out the real page size used can be found by calling statfs. This
patch changes qemu to use statfs instead of parsing /proc/meminfo.

(cherry picked from commit f1ac0931a1aeadab2569b7001ec35250e695d94f)

Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-use-statfs-to-determine-huge-page-size.patch
---
 sysemu.h |    2 +-
 vl.c     |   42 +++++++++++++++++++-----------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/sysemu.h b/sysemu.h
index 7ca08c1..e8e746d 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -100,7 +100,7 @@ extern int graphic_rotate;
 extern int no_quit;
 extern int semihosting_enabled;
 extern int old_param;
-extern int hpagesize;
+extern long hpagesize;
 extern const char *bootp_filename;
 
 #ifdef USE_KQEMU
diff --git a/vl.c b/vl.c
index 1774d1c..0bfa380 100644
--- a/vl.c
+++ b/vl.c
@@ -62,6 +62,7 @@
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
+#include <sys/vfs.h>
 #include <netinet/in.h>
 #include <net/if.h>
 #if defined(__NetBSD__)
@@ -256,7 +257,7 @@ const char *mem_path = NULL;
 #ifdef MAP_POPULATE
 int mem_prealloc = 1;	/* force preallocation of physical target memory */
 #endif
-int hpagesize = 0;
+long hpagesize = 0;
 const char *cpu_vendor_string;
 #ifdef TARGET_ARM
 int old_param = 0;
@@ -4722,32 +4723,27 @@ void qemu_get_launch_info(int *argc, char ***argv, int *opt_daemonize, const cha
 }
 
 #ifdef USE_KVM
-static int gethugepagesize(void)
+
+#define HUGETLBFS_MAGIC       0x958458f6
+
+static long gethugepagesize(const char *path)
 {
-    int ret, fd;
-    char buf[4096];
-    const char *needle = "Hugepagesize:";
-    char *size;
-    unsigned long hugepagesize;
+    struct statfs fs;
+    int ret;
 
-    fd = open("/proc/meminfo", O_RDONLY);
-    if (fd < 0) {
-	perror("open");
-	exit(0);
-    }
+    do {
+	    ret = statfs(path, &fs);
+    } while (ret != 0 && errno == EINTR);
 
-    ret = read(fd, buf, sizeof(buf));
-    if (ret < 0) {
-	perror("read");
-	exit(0);
+    if (ret != 0) {
+	    perror("statfs");
+	    return 0;
     }
 
-    size = strstr(buf, needle);
-    if (!size)
-	return 0;
-    size += strlen(needle);
-    hugepagesize = strtol(size, NULL, 0);
-    return hugepagesize;
+    if (fs.f_type != HUGETLBFS_MAGIC)
+	    fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path);
+
+    return fs.f_bsize;
 }
 
 static void *alloc_mem_area(size_t memory, unsigned long *len, const char *path)
@@ -4767,7 +4763,7 @@ static void *alloc_mem_area(size_t memory, unsigned long *len, const char *path)
     if (asprintf(&filename, "%s/kvm.XXXXXX", path) == -1)
 	return NULL;
 
-    hpagesize = gethugepagesize() * 1024;
+    hpagesize = gethugepagesize(path);
     if (!hpagesize)
 	return NULL;
 
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- qemu.spec	18 Aug 2009 10:06:17 -0000	1.100
+++ qemu.spec	4 Sep 2009 10:09:56 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -29,6 +29,7 @@ Patch13: qemu-bios-bigger-roms.patch
 Patch14: qemu-kvm-fix-kerneldir-includes.patch
 Patch15: qemu-avoid-harmless-msr-warnings.patch
 Patch16: qemu-ppc-on-ppc.patch
+Patch17: qemu-use-statfs-to-determine-huge-page-size.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -225,6 +226,7 @@ such as kvmtrace and kvm_stat.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -467,6 +469,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-3
+- Use statfs to determine huge page size, fixing fd leak (#519378)
+
 * Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-2
 - Allow blacklisting of kvm modules (#517866)
 



From twaugh at fedoraproject.org  Fri Sep  4 10:12:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Sep 2009 10:12:44 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-get-devices.patch, 1.1,
	1.2 system-config-printer.spec, 1.282, 1.283
Message-ID: <20090904101244.B31C111C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10943

Modified Files:
	system-config-printer-get-devices.patch 
	system-config-printer.spec 
Log Message:
* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
- Further speed improvement when fetching devices.


system-config-printer-get-devices.patch:
 cupshelpers/cupshelpers.py |    4 
 cupspk.py                  |   18 +++
 gtkspinner.py              |    2 
 system-config-printer.py   |  205 ++++++++++++++++++++++++++++++---------------
 timedops.py                |   38 ++++++--
 5 files changed, 188 insertions(+), 79 deletions(-)

Index: system-config-printer-get-devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer-get-devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-get-devices.patch	3 Sep 2009 16:48:08 -0000	1.1
+++ system-config-printer-get-devices.patch	4 Sep 2009 10:12:44 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices system-config-printer-1.1.12/cupshelpers/cupshelpers.py
 --- system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-03 17:40:01.312306795 +0100
++++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-04 10:41:43.122388349 +0100
 @@ -541,7 +541,7 @@ class Device:
          
          return result
@@ -21,7 +21,7 @@ diff -up system-config-printer-1.1.12/cu
          devices[uri] = device
 diff -up system-config-printer-1.1.12/cupspk.py.get-devices system-config-printer-1.1.12/cupspk.py
 --- system-config-printer-1.1.12/cupspk.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/cupspk.py	2009-09-03 17:39:54.649306311 +0100
++++ system-config-printer-1.1.12/cupspk.py	2009-09-04 10:41:43.125389269 +0100
 @@ -304,12 +304,13 @@ class Connection:
      def getDevices(self, *args, **kwds):
          use_pycups = False
@@ -59,7 +59,7 @@ diff -up system-config-printer-1.1.12/cu
          result = self._call_with_pk_and_fallback(use_pycups,
 diff -up system-config-printer-1.1.12/gtkspinner.py.get-devices system-config-printer-1.1.12/gtkspinner.py
 --- system-config-printer-1.1.12/gtkspinner.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/gtkspinner.py	2009-09-03 17:40:15.558428680 +0100
++++ system-config-printer-1.1.12/gtkspinner.py	2009-09-04 10:41:43.126388753 +0100
 @@ -65,7 +65,7 @@ class Spinner:
      def _next_frame (self):
          n = self._current_frame + 1
@@ -70,8 +70,8 @@ diff -up system-config-printer-1.1.12/gt
          self._set_frame (n)
          return True
 diff -up system-config-printer-1.1.12/system-config-printer.py.get-devices system-config-printer-1.1.12/system-config-printer.py
---- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-03 17:39:28.893432444 +0100
-+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-03 17:42:09.536304232 +0100
+--- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-04 10:41:43.112387975 +0100
++++ system-config-printer-1.1.12/system-config-printer.py	2009-09-04 10:41:50.189513008 +0100
 @@ -3681,6 +3681,7 @@ class NewPrinterGUI(GtkGUI):
          self.ntbkNPDownloadableDriverProperties.set_show_tabs(False)
  
@@ -80,15 +80,7 @@ diff -up system-config-printer-1.1.12/sy
  
          # Set up OpenPrinting widgets.
          self.openprinting = cupshelpers.openprinting.OpenPrinting ()
-@@ -3716,6 +3717,7 @@ class NewPrinterGUI(GtkGUI):
-         slct.set_select_function (self.device_select_function)
-         self.tvNPDevices.set_row_separator_func (self.device_row_separator_fn)
-         self.tvNPDevices.connect ("row-activated", self.device_row_activated)
-+        self.tvNPDevices.connect ("row-expanded", self.device_row_expanded)
- 
-         # Devices expander
-         self.expNPDeviceURIs.connect ("notify::expanded",
-@@ -3765,6 +3767,19 @@ class NewPrinterGUI(GtkGUI):
+@@ -3765,6 +3766,19 @@ class NewPrinterGUI(GtkGUI):
          ppd_filter.add_pattern("*")
          self.filechooserPPD.add_filter(ppd_filter)
  
@@ -108,7 +100,18 @@ diff -up system-config-printer-1.1.12/sy
      def show_IPP_Error (self, exception, message):
          return show_IPP_Error (exception, message, parent=self.NewPrinterWindow)
  
-@@ -4611,32 +4626,48 @@ class NewPrinterGUI(GtkGUI):
+@@ -4172,6 +4186,10 @@ class NewPrinterGUI(GtkGUI):
+     # Navigation buttons
+ 
+     def on_NPCancel(self, widget, event=None):
++        if self.fetchDevices_op:
++            self.fetchDevices_op.cancel ()
++            self.dec_spinner_task ()
++
+         self.NewPrinterWindow.hide()
+         if self.openprinting_query_handle != None:
+             self.openprinting.cancelOperation (self.openprinting_query_handle)
+@@ -4611,32 +4629,48 @@ class NewPrinterGUI(GtkGUI):
              self.btnNPForward.set_sensitive(
                  self.mainapp.checkNPName(new_text))
  
@@ -177,7 +180,7 @@ diff -up system-config-printer-1.1.12/sy
  
      def install_hplip_plugin(self, uri):
          """
-@@ -4949,23 +4980,53 @@ class NewPrinterGUI(GtkGUI):
+@@ -4949,23 +4983,66 @@ class NewPrinterGUI(GtkGUI):
          return (host, uri)
  
      def fillDeviceTab(self, current_uri=None):
@@ -215,13 +218,14 @@ diff -up system-config-printer-1.1.12/sy
 +        self.expNPDeviceURIs.hide ()
 +        self.inc_spinner_task ()
 +
-+        TimedOperation (self.fetchDevices,
-+                        kwargs={"network": False},
-+                        callback=self.got_devices,
-+                        context=current_uri)
++        self.fetchDevices_op = TimedOperation (self.fetchDevices,
++                                               kwargs={"network": False},
++                                               callback=self.got_devices,
++                                               context=(current_uri, False))
 +
-+    def got_devices (self, result, exception, current_uri=None):
++    def got_devices (self, result, exception, context):
 +        self.dec_spinner_task ()
++        (current_uri, network) = context
 +        if exception:
 +            try:
 +                raise exception
@@ -229,6 +233,18 @@ diff -up system-config-printer-1.1.12/sy
 +                nonfatalException()
 +            return
  
++        if network:
++            self.fetchDevices_op = None
++        else:
++            # Now we've got the local devices, start a request for the
++            # network devices.
++            context = (current_uri, True)
++            self.inc_spinner_task ()
++            self.fetchDevices_op = TimedOperation (self.fetchDevices,
++                                                   kwargs={"network": True},
++                                                   callback=self.got_devices,
++                                                   context=context)
++
 +        devices = result
          if current_uri:
              if devices.has_key (current_uri):
@@ -241,7 +257,7 @@ diff -up system-config-printer-1.1.12/sy
              else:
                  current = cupshelpers.Device (current_uri)
                  current.info = "Current device"
-@@ -5008,7 +5069,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5008,7 +5085,7 @@ class NewPrinterGUI(GtkGUI):
                                                   "hal", "beh",
                                                   "scsi", "http", "delete"),
                           devices)
@@ -250,7 +266,7 @@ diff -up system-config-printer-1.1.12/sy
          for device in devices:
              physicaldevice = PhysicalDevice (device)
              try:
-@@ -5016,43 +5077,32 @@ class NewPrinterGUI(GtkGUI):
+@@ -5016,43 +5093,32 @@ class NewPrinterGUI(GtkGUI):
                  self.devices[i].add_device (device)
              except ValueError:
                  self.devices.append (physicaldevice)
@@ -308,7 +324,7 @@ diff -up system-config-printer-1.1.12/sy
              if network:
                  if devs[0].uri != devs[0].type:
                      # An actual network printer device.  Put this at the top.
-@@ -5062,24 +5112,31 @@ class NewPrinterGUI(GtkGUI):
+@@ -5062,24 +5128,31 @@ class NewPrinterGUI(GtkGUI):
                      # If this is the currently selected device we need
                      # to expand the "Network Printer" row so that it
                      # is visible.
@@ -329,10 +345,10 @@ diff -up system-config-printer-1.1.12/sy
 +                        break
 +
 +                    iter = model.iter_next (iter)
-+
-+                iter = model.insert_before (None, iter, row=row)
  
 -            if device_select_index == i:
++                iter = model.insert_before (None, iter, row=row)
++
 +            if device == current_device:
                  device_select_path = model.get_path (iter)
                  self.tvNPDevices.scroll_to_cell (device_select_path,
@@ -345,7 +361,7 @@ diff -up system-config-printer-1.1.12/sy
          connection_select_path = 0
          if current_uri:
              model = self.tvNPDeviceURIs.get_model ()
-@@ -5093,6 +5150,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5093,6 +5166,9 @@ class NewPrinterGUI(GtkGUI):
  
                  iter = model.iter_next (iter)
                  i += 1
@@ -355,21 +371,7 @@ diff -up system-config-printer-1.1.12/sy
  
          column = self.tvNPDeviceURIs.get_column (0)
          self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
-@@ -5538,6 +5598,13 @@ class NewPrinterGUI(GtkGUI):
-         else:
-             view.expand_row (path, False)
- 
-+    def device_row_expanded (self, view, iter, path):
-+        if not self.devices_network_fetched:
-+            self.devices_network_fetched = True
-+            self.inc_spinner_task ()
-+            TimedOperation (self.fetchDevices, kwargs={'network': True},
-+                            callback=self.got_devices)
-+
-     def device_select_function (self, path):
-         """
-         Allow this path to be selected as long as there
-@@ -5552,6 +5619,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5552,6 +5628,7 @@ class NewPrinterGUI(GtkGUI):
          return False
  
      def on_tvNPDevices_cursor_changed(self, widget):
@@ -377,7 +379,7 @@ diff -up system-config-printer-1.1.12/sy
          path, column = widget.get_cursor ()
          if path == None:
              return
-@@ -5855,8 +5923,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5855,8 +5932,7 @@ class NewPrinterGUI(GtkGUI):
          self.network_found = 0
          self.lblNetworkFindSearching.show_all ()
          finder = probe_printer.PrinterFinder ()
@@ -387,7 +389,7 @@ diff -up system-config-printer-1.1.12/sy
          finder.find (host, found_callback)
  
      def found_network_printer_callback (self, new_device):
-@@ -5885,8 +5952,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5885,8 +5961,7 @@ class NewPrinterGUI(GtkGUI):
                  path = model.get_path (iter)
                  self.tvNPDevices.set_cursor (path)
          else:
@@ -399,8 +401,8 @@ diff -up system-config-printer-1.1.12/sy
              self.btnNetworkFind.set_sensitive (True)
 diff -up system-config-printer-1.1.12/timedops.py.get-devices system-config-printer-1.1.12/timedops.py
 --- system-config-printer-1.1.12/timedops.py.get-devices	2009-08-25 15:01:41.000000000 +0100
-+++ system-config-printer-1.1.12/timedops.py	2009-09-03 17:39:48.935433815 +0100
-@@ -152,16 +152,24 @@ class OperationThread(threading.Thread):
++++ system-config-printer-1.1.12/timedops.py	2009-09-04 10:41:50.191513591 +0100
+@@ -152,16 +152,25 @@ class OperationThread(threading.Thread):
  
  class TimedOperation(Timed):
      def __init__ (self, target, args=(), kwargs={}, parent=None,
@@ -416,17 +418,18 @@ diff -up system-config-printer-1.1.12/ti
                                         kwargs=kwargs)
          self.thread.start ()
  
-+        if self.callback:
++        self.use_callback = callback != None
++        if self.use_callback:
 +            self.timeout_source = gobject.timeout_add (50, self._check_thread)
 +
      def run (self):
-+        if self.callback:
++        if self.use_callback:
 +            raise RuntimeError
 +
          if self.show_dialog:
              wait = gtk.MessageDialog (self.parent,
                                        gtk.DIALOG_MODAL |
-@@ -170,7 +178,7 @@ class TimedOperation(Timed):
+@@ -170,7 +179,7 @@ class TimedOperation(Timed):
                                        gtk.BUTTONS_CANCEL,
                                        _("Please wait"))
              wait.connect ("delete_event", lambda *args: False)
@@ -435,7 +438,7 @@ diff -up system-config-printer-1.1.12/ti
              if self.parent:
                  wait.set_transient_for (self.parent)
  
-@@ -178,7 +186,7 @@ class TimedOperation(Timed):
+@@ -178,7 +187,7 @@ class TimedOperation(Timed):
              wait.format_secondary_text (_("Gathering information"))
              wait.show_all ()
  
@@ -444,7 +447,7 @@ diff -up system-config-printer-1.1.12/ti
          gtk.main ()
          gobject.source_remove (self.timeout_source)
          if self.show_dialog:
-@@ -186,20 +194,32 @@ class TimedOperation(Timed):
+@@ -186,20 +195,33 @@ class TimedOperation(Timed):
  
          return self.thread.collect_result ()
  
@@ -457,12 +460,13 @@ diff -up system-config-printer-1.1.12/ti
 -        # Thread has finished.  Stop the sub-loop.
 -        gtk.main_quit ()
 +        # Thread has finished.  Stop the sub-loop or trigger callback.
-+        if self.callback:
-+            if self.context != None:
-+                self.callback (self.thread.result, self.thread.exception,
-+                               self.context)
-+            else:
-+                self.callback (self.thread.result, self.thread.exception)
++        if self.use_callback:
++            if self.callback != None:
++                if self.context != None:
++                    self.callback (self.thread.result, self.thread.exception,
++                                   self.context)
++                else:
++                    self.callback (self.thread.result, self.thread.exception)
 +        else:
 +            gtk.main_quit ()
 +
@@ -476,7 +480,7 @@ diff -up system-config-printer-1.1.12/ti
      def cancel (self):
          debugprint ("Command canceled")
 -        gtk.main_quit ()
-+        if self.callback:
++        if self.use_callback:
 +            self.callback = None
 +        else:
 +            gtk.main_quit ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- system-config-printer.spec	3 Sep 2009 16:48:08 -0000	1.282
+++ system-config-printer.spec	4 Sep 2009 10:12:44 -0000	1.283
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -177,6 +177,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
+- Further speed improvement when fetching devices.
+
 * Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
 - Speed improvement when fetching devices.
 - Allow raw devices to be changed.



From twaugh at fedoraproject.org  Fri Sep  4 10:13:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Sep 2009 10:13:07 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-get-devices.patch, 1.1,
	1.2 system-config-printer.spec, 1.291, 1.292
Message-ID: <20090904101307.B4D6211C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11034

Modified Files:
	system-config-printer-get-devices.patch 
	system-config-printer.spec 
Log Message:
* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
- Further speed improvement when fetching devices.


system-config-printer-get-devices.patch:
 cupshelpers/cupshelpers.py |    4 
 cupspk.py                  |   18 +++
 gtkspinner.py              |    2 
 system-config-printer.py   |  220 ++++++++++++++++++++++++++++-----------------
 timedops.py                |   38 ++++++-
 5 files changed, 189 insertions(+), 93 deletions(-)

Index: system-config-printer-get-devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-get-devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-get-devices.patch	3 Sep 2009 16:53:27 -0000	1.1
+++ system-config-printer-get-devices.patch	4 Sep 2009 10:13:07 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices system-config-printer-1.1.12/cupshelpers/cupshelpers.py
 --- system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-03 17:44:32.610304039 +0100
++++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-04 10:40:45.092512574 +0100
 @@ -541,7 +541,7 @@ class Device:
          
          return result
@@ -20,8 +20,8 @@ diff -up system-config-printer-1.1.12/cu
          device = Device(uri, **data)
          devices[uri] = device
 diff -up system-config-printer-1.1.12/cupspk.py.get-devices system-config-printer-1.1.12/cupspk.py
---- system-config-printer-1.1.12/cupspk.py.get-devices	2009-09-03 17:44:32.513304908 +0100
-+++ system-config-printer-1.1.12/cupspk.py	2009-09-03 17:44:32.612310211 +0100
+--- system-config-printer-1.1.12/cupspk.py.get-devices	2009-09-04 10:40:45.010390541 +0100
++++ system-config-printer-1.1.12/cupspk.py	2009-09-04 10:40:45.095512451 +0100
 @@ -311,12 +311,13 @@ class Connection:
      def getDevices(self, *args, **kwds):
          use_pycups = False
@@ -59,7 +59,7 @@ diff -up system-config-printer-1.1.12/cu
          result = self._call_with_pk_and_fallback(use_pycups,
 diff -up system-config-printer-1.1.12/gtkspinner.py.get-devices system-config-printer-1.1.12/gtkspinner.py
 --- system-config-printer-1.1.12/gtkspinner.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/gtkspinner.py	2009-09-03 17:44:32.614305510 +0100
++++ system-config-printer-1.1.12/gtkspinner.py	2009-09-04 10:40:45.096512525 +0100
 @@ -65,7 +65,7 @@ class Spinner:
      def _next_frame (self):
          n = self._current_frame + 1
@@ -70,8 +70,8 @@ diff -up system-config-printer-1.1.12/gt
          self._set_frame (n)
          return True
 diff -up system-config-printer-1.1.12/system-config-printer.py.get-devices system-config-printer-1.1.12/system-config-printer.py
---- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-03 17:44:32.601305285 +0100
-+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-03 17:45:23.411307659 +0100
+--- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-04 10:40:45.074388881 +0100
++++ system-config-printer-1.1.12/system-config-printer.py	2009-09-04 10:40:54.528387635 +0100
 @@ -3681,6 +3681,7 @@ class NewPrinterGUI(GtkGUI):
          self.ntbkNPDownloadableDriverProperties.set_show_tabs(False)
  
@@ -80,15 +80,7 @@ diff -up system-config-printer-1.1.12/sy
  
          # Set up OpenPrinting widgets.
          self.openprinting = cupshelpers.openprinting.OpenPrinting ()
-@@ -3716,6 +3717,7 @@ class NewPrinterGUI(GtkGUI):
-         slct.set_select_function (self.device_select_function)
-         self.tvNPDevices.set_row_separator_func (self.device_row_separator_fn)
-         self.tvNPDevices.connect ("row-activated", self.device_row_activated)
-+        self.tvNPDevices.connect ("row-expanded", self.device_row_expanded)
- 
-         # Devices expander
-         self.expNPDeviceURIs.connect ("notify::expanded",
-@@ -3765,6 +3767,19 @@ class NewPrinterGUI(GtkGUI):
+@@ -3765,6 +3766,19 @@ class NewPrinterGUI(GtkGUI):
          ppd_filter.add_pattern("*")
          self.filechooserPPD.add_filter(ppd_filter)
  
@@ -108,7 +100,18 @@ diff -up system-config-printer-1.1.12/sy
      def show_IPP_Error (self, exception, message):
          return show_IPP_Error (exception, message, parent=self.NewPrinterWindow)
  
-@@ -4611,45 +4626,48 @@ class NewPrinterGUI(GtkGUI):
+@@ -4172,6 +4186,10 @@ class NewPrinterGUI(GtkGUI):
+     # Navigation buttons
+ 
+     def on_NPCancel(self, widget, event=None):
++        if self.fetchDevices_op:
++            self.fetchDevices_op.cancel ()
++            self.dec_spinner_task ()
++
+         self.NewPrinterWindow.hide()
+         if self.openprinting_query_handle != None:
+             self.openprinting.cancelOperation (self.openprinting_query_handle)
+@@ -4611,45 +4629,48 @@ class NewPrinterGUI(GtkGUI):
              self.btnNPForward.set_sensitive(
                  self.mainapp.checkNPName(new_text))
  
@@ -191,7 +194,7 @@ diff -up system-config-printer-1.1.12/sy
  
      def install_hplip_plugin(self, uri):
          """
-@@ -4962,23 +4980,53 @@ class NewPrinterGUI(GtkGUI):
+@@ -4962,23 +4983,66 @@ class NewPrinterGUI(GtkGUI):
          return (host, uri)
  
      def fillDeviceTab(self, current_uri=None):
@@ -229,19 +232,32 @@ diff -up system-config-printer-1.1.12/sy
 +        self.expNPDeviceURIs.hide ()
 +        self.inc_spinner_task ()
 +
-+        TimedOperation (self.fetchDevices,
-+                        kwargs={"network": False},
-+                        callback=self.got_devices,
-+                        context=current_uri)
++        self.fetchDevices_op = TimedOperation (self.fetchDevices,
++                                               kwargs={"network": False},
++                                               callback=self.got_devices,
++                                               context=(current_uri, False))
 +
-+    def got_devices (self, result, exception, current_uri=None):
++    def got_devices (self, result, exception, context):
 +        self.dec_spinner_task ()
++        (current_uri, network) = context
 +        if exception:
 +            try:
 +                raise exception
 +            except:
 +                nonfatalException()
 +            return
++
++        if network:
++            self.fetchDevices_op = None
++        else:
++            # Now we've got the local devices, start a request for the
++            # network devices.
++            context = (current_uri, True)
++            self.inc_spinner_task ()
++            self.fetchDevices_op = TimedOperation (self.fetchDevices,
++                                                   kwargs={"network": True},
++                                                   callback=self.got_devices,
++                                                   context=context)
  
 +        devices = result
          if current_uri:
@@ -255,7 +271,7 @@ diff -up system-config-printer-1.1.12/sy
              else:
                  current = cupshelpers.Device (current_uri)
                  current.info = "Current device"
-@@ -5021,7 +5069,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5021,7 +5085,7 @@ class NewPrinterGUI(GtkGUI):
                                                   "hal", "beh",
                                                   "scsi", "http", "delete"),
                           devices)
@@ -264,7 +280,7 @@ diff -up system-config-printer-1.1.12/sy
          for device in devices:
              physicaldevice = PhysicalDevice (device)
              try:
-@@ -5029,43 +5077,32 @@ class NewPrinterGUI(GtkGUI):
+@@ -5029,43 +5093,32 @@ class NewPrinterGUI(GtkGUI):
                  self.devices[i].add_device (device)
              except ValueError:
                  self.devices.append (physicaldevice)
@@ -322,7 +338,7 @@ diff -up system-config-printer-1.1.12/sy
              if network:
                  if devs[0].uri != devs[0].type:
                      # An actual network printer device.  Put this at the top.
-@@ -5075,24 +5112,31 @@ class NewPrinterGUI(GtkGUI):
+@@ -5075,24 +5128,31 @@ class NewPrinterGUI(GtkGUI):
                      # If this is the currently selected device we need
                      # to expand the "Network Printer" row so that it
                      # is visible.
@@ -343,10 +359,10 @@ diff -up system-config-printer-1.1.12/sy
 +                        break
 +
 +                    iter = model.iter_next (iter)
-+
-+                iter = model.insert_before (None, iter, row=row)
  
 -            if device_select_index == i:
++                iter = model.insert_before (None, iter, row=row)
++
 +            if device == current_device:
                  device_select_path = model.get_path (iter)
                  self.tvNPDevices.scroll_to_cell (device_select_path,
@@ -359,7 +375,7 @@ diff -up system-config-printer-1.1.12/sy
          connection_select_path = 0
          if current_uri:
              model = self.tvNPDeviceURIs.get_model ()
-@@ -5106,6 +5150,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5106,6 +5166,9 @@ class NewPrinterGUI(GtkGUI):
  
                  iter = model.iter_next (iter)
                  i += 1
@@ -369,21 +385,7 @@ diff -up system-config-printer-1.1.12/sy
  
          column = self.tvNPDeviceURIs.get_column (0)
          self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
-@@ -5551,6 +5598,13 @@ class NewPrinterGUI(GtkGUI):
-         else:
-             view.expand_row (path, False)
- 
-+    def device_row_expanded (self, view, iter, path):
-+        if not self.devices_network_fetched:
-+            self.devices_network_fetched = True
-+            self.inc_spinner_task ()
-+            TimedOperation (self.fetchDevices, kwargs={'network': True},
-+                            callback=self.got_devices)
-+
-     def device_select_function (self, path):
-         """
-         Allow this path to be selected as long as there
-@@ -5565,6 +5619,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5565,6 +5628,7 @@ class NewPrinterGUI(GtkGUI):
          return False
  
      def on_tvNPDevices_cursor_changed(self, widget):
@@ -391,7 +393,7 @@ diff -up system-config-printer-1.1.12/sy
          path, column = widget.get_cursor ()
          if path == None:
              return
-@@ -5868,8 +5923,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5868,8 +5932,7 @@ class NewPrinterGUI(GtkGUI):
          self.network_found = 0
          self.lblNetworkFindSearching.show_all ()
          finder = probe_printer.PrinterFinder ()
@@ -401,7 +403,7 @@ diff -up system-config-printer-1.1.12/sy
          finder.find (host, found_callback)
  
      def found_network_printer_callback (self, new_device):
-@@ -5898,8 +5952,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5898,8 +5961,7 @@ class NewPrinterGUI(GtkGUI):
                  path = model.get_path (iter)
                  self.tvNPDevices.set_cursor (path)
          else:
@@ -413,8 +415,8 @@ diff -up system-config-printer-1.1.12/sy
              self.btnNetworkFind.set_sensitive (True)
 diff -up system-config-printer-1.1.12/timedops.py.get-devices system-config-printer-1.1.12/timedops.py
 --- system-config-printer-1.1.12/timedops.py.get-devices	2009-08-25 15:01:41.000000000 +0100
-+++ system-config-printer-1.1.12/timedops.py	2009-09-03 17:44:32.629302805 +0100
-@@ -152,16 +152,24 @@ class OperationThread(threading.Thread):
++++ system-config-printer-1.1.12/timedops.py	2009-09-04 10:40:54.530391539 +0100
+@@ -152,16 +152,25 @@ class OperationThread(threading.Thread):
  
  class TimedOperation(Timed):
      def __init__ (self, target, args=(), kwargs={}, parent=None,
@@ -430,17 +432,18 @@ diff -up system-config-printer-1.1.12/ti
                                         kwargs=kwargs)
          self.thread.start ()
  
-+        if self.callback:
++        self.use_callback = callback != None
++        if self.use_callback:
 +            self.timeout_source = gobject.timeout_add (50, self._check_thread)
 +
      def run (self):
-+        if self.callback:
++        if self.use_callback:
 +            raise RuntimeError
 +
          if self.show_dialog:
              wait = gtk.MessageDialog (self.parent,
                                        gtk.DIALOG_MODAL |
-@@ -170,7 +178,7 @@ class TimedOperation(Timed):
+@@ -170,7 +179,7 @@ class TimedOperation(Timed):
                                        gtk.BUTTONS_CANCEL,
                                        _("Please wait"))
              wait.connect ("delete_event", lambda *args: False)
@@ -449,7 +452,7 @@ diff -up system-config-printer-1.1.12/ti
              if self.parent:
                  wait.set_transient_for (self.parent)
  
-@@ -178,7 +186,7 @@ class TimedOperation(Timed):
+@@ -178,7 +187,7 @@ class TimedOperation(Timed):
              wait.format_secondary_text (_("Gathering information"))
              wait.show_all ()
  
@@ -458,7 +461,7 @@ diff -up system-config-printer-1.1.12/ti
          gtk.main ()
          gobject.source_remove (self.timeout_source)
          if self.show_dialog:
-@@ -186,20 +194,32 @@ class TimedOperation(Timed):
+@@ -186,20 +195,33 @@ class TimedOperation(Timed):
  
          return self.thread.collect_result ()
  
@@ -471,12 +474,13 @@ diff -up system-config-printer-1.1.12/ti
 -        # Thread has finished.  Stop the sub-loop.
 -        gtk.main_quit ()
 +        # Thread has finished.  Stop the sub-loop or trigger callback.
-+        if self.callback:
-+            if self.context != None:
-+                self.callback (self.thread.result, self.thread.exception,
-+                               self.context)
-+            else:
-+                self.callback (self.thread.result, self.thread.exception)
++        if self.use_callback:
++            if self.callback != None:
++                if self.context != None:
++                    self.callback (self.thread.result, self.thread.exception,
++                                   self.context)
++                else:
++                    self.callback (self.thread.result, self.thread.exception)
 +        else:
 +            gtk.main_quit ()
 +
@@ -490,7 +494,7 @@ diff -up system-config-printer-1.1.12/ti
      def cancel (self):
          debugprint ("Command canceled")
 -        gtk.main_quit ()
-+        if self.callback:
++        if self.use_callback:
 +            self.callback = None
 +        else:
 +            gtk.main_quit ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- system-config-printer.spec	3 Sep 2009 16:53:27 -0000	1.291
+++ system-config-printer.spec	4 Sep 2009 10:13:07 -0000	1.292
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -205,6 +205,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
+- Further speed improvement when fetching devices.
+
 * Thu Sep  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
 - Speed improvement when fetching devices.
 - Allow raw devices to be changed.



From mschwendt at fedoraproject.org  Fri Sep  4 10:21:32 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  4 Sep 2009 10:21:32 +0000 (UTC)
Subject: rpms/taglib/devel taglib-1.5-1.6-ogg.patch, 1.1,
	1.2 taglib-1.5-1.6-toolkit.patch, 1.1, 1.2 taglib.spec, 1.42, 1.43
Message-ID: <20090904102132.612E411C0082@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14859

Modified Files:
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib.spec 
Log Message:
* Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
- Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and
  really add tstring bug-fix:
  * Split Ogg packets larger than 64k into multiple pages. (BUG:171957)
  * Fixed a possible crash in the non-const version of String::operator[]
    and in String::operator+=. (BUG:169389)


taglib-1.5-1.6-ogg.patch:
 taglib-1.5/taglib/ogg/oggfile.cpp |   99 ++++++++++++++++++++++++++++++++-
 taglib-1.5/taglib/ogg/oggpage.cpp |  112 +++++++++++++++++++++++++++++++++-----
 taglib-1.5/taglib/ogg/oggpage.h   |    8 ++
 taglib/taglib/ogg/xiphcomment.cpp |   18 ++++--
 4 files changed, 213 insertions(+), 24 deletions(-)

Index: taglib-1.5-1.6-ogg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib-1.5-1.6-ogg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- taglib-1.5-1.6-ogg.patch	22 Aug 2009 10:44:20 -0000	1.1
+++ taglib-1.5-1.6-ogg.patch	4 Sep 2009 10:21:31 -0000	1.2
@@ -44,3 +44,287 @@ diff -Nur taglib-1.5/taglib/ogg/xiphcomm
    if(i == 0)
      removeField("TRACKNUMBER");
    else
+diff -Nur taglib-1.5-orig/taglib/ogg/oggfile.cpp taglib-1.5/taglib/ogg/oggfile.cpp
+--- taglib-1.5-orig/taglib/ogg/oggfile.cpp	2008-02-04 16:14:46.000000000 +0100
++++ taglib-1.5/taglib/ogg/oggfile.cpp	2009-09-04 11:46:54.859122796 +0200
+@@ -270,11 +270,28 @@
+   return true;
+ }
+ 
+-void Ogg::File::writePageGroup(const List<int> &pageGroup)
++void Ogg::File::writePageGroup(const List<int> &thePageGroup)
+ {
+-  if(pageGroup.isEmpty())
++  if(thePageGroup.isEmpty())
+     return;
+ 
++
++  // pages in the pageGroup and packets must be equivalent 
++  // (originalSize and size of packets would not work together), 
++  // therefore we sometimes have to add pages to the group
++  List<int> pageGroup(thePageGroup);
++  while (!d->pages[pageGroup.back()]->header()->lastPacketCompleted()) {
++    if (d->currentPage->header()->pageSequenceNumber() == pageGroup.back()) {
++      if (nextPage() == false) {
++        debug("broken ogg file");
++        return;
++      }
++      pageGroup.append(d->currentPage->header()->pageSequenceNumber());
++    } else {
++      pageGroup.append(pageGroup.back() + 1);
++    }
++  }
++
+   ByteVectorList packets;
+ 
+   // If the first page of the group isn't dirty, append its partial content here.
+@@ -313,6 +330,52 @@
+                                       d->streamSerialNumber, pageGroup.front(),
+                                       continued, completed);
+ 
++  List<Page *> renumberedPages;
++
++  // Correct the page numbering of following pages
++
++  if (pages.back()->header()->pageSequenceNumber() != pageGroup.back()) {
++
++    // TODO: change the internal data structure so that we don't need to hold the 
++    // complete file in memory (is unavoidable at the moment)
++
++    // read the complete stream
++    while(!d->currentPage->header()->lastPageOfStream()) {
++      if(nextPage() == false) {
++        debug("broken ogg file");
++        break;
++      }
++    }
++
++    // create a gap for the new pages
++    int numberOfNewPages = pages.back()->header()->pageSequenceNumber() - pageGroup.back();
++    List<Page *>::Iterator pageIter = d->pages.begin();
++    for(int i = 0; i < pageGroup.back(); i++) {
++      if(pageIter != d->pages.end()) {
++        ++pageIter;
++      }
++      else {
++        debug("Ogg::File::writePageGroup() -- Page sequence is broken in original file.");
++        break;
++      }
++    }
++
++    ++pageIter;
++    for(; pageIter != d->pages.end(); ++pageIter) {
++      Ogg::Page *newPage =
++        (*pageIter)->getCopyWithNewPageSequenceNumber(
++            (*pageIter)->header()->pageSequenceNumber() + numberOfNewPages);
++
++      ByteVector data;
++      data.append(newPage->render());
++      insert(data, newPage->fileOffset(), data.size());
++
++      renumberedPages.append(newPage);
++    }
++  }
++
++  // insert the new data
++
+   ByteVector data;
+   for(List<Page *>::ConstIterator it = pages.begin(); it != pages.end(); ++it)
+     data.append((*it)->render());
+@@ -328,9 +391,37 @@
+   // Update the page index to include the pages we just created and to delete the
+   // old pages.
+ 
++  // First step: Pages that contain the comment data
++
+   for(List<Page *>::ConstIterator it = pages.begin(); it != pages.end(); ++it) {
+     const int index = (*it)->header()->pageSequenceNumber();
+-    delete d->pages[index];
+-    d->pages[index] = *it;
++    if(index < static_cast<int>(d->pages.size())) {
++      delete d->pages[index];
++      d->pages[index] = *it;
++    }
++    else if(index == d->pages.size()) {
++      d->pages.append(*it);
++    }
++    else {
++      // oops - there's a hole in the sequence
++      debug("Ogg::File::writePageGroup() -- Page sequence is broken.");
++    }
++  }
++
++  // Second step: the renumbered pages
++
++  for(List<Page *>::ConstIterator it = renumberedPages.begin(); it != renumberedPages.end(); ++it) {
++    const int index = (*it)->header()->pageSequenceNumber();
++    if(index < static_cast<int>(d->pages.size())) {
++      delete d->pages[index];
++      d->pages[index] = *it;
++    }
++    else if(index == d->pages.size()) {
++      d->pages.append(*it);
++    }
++    else {
++      // oops - there's a hole in the sequence
++      debug("Ogg::File::writePageGroup() -- Page sequence is broken.");
++    }
+   }
+ }
+diff -Nur taglib-1.5-orig/taglib/ogg/oggpage.cpp taglib-1.5/taglib/ogg/oggpage.cpp
+--- taglib-1.5-orig/taglib/ogg/oggpage.cpp	2008-02-04 16:14:46.000000000 +0100
++++ taglib-1.5/taglib/ogg/oggpage.cpp	2009-09-04 11:47:00.527115729 +0200
+@@ -116,12 +116,14 @@
+     flags = ContainsPacketFlags(flags | CompletePacket);
+   }
+ 
+-  // Or if the page is (a) the first page and it's complete or (b) the last page
+-  // and it's complete or (c) a page in the middle.
+-
+-  else if((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
+-          (flags & EndsWithPacket && d->header.lastPacketCompleted()) ||
+-          (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket)))
++  // Or if there is more than one page and the page is 
++  // (a) the first page and it's complete or 
++  // (b) the last page and it's complete or 
++  // (c) a page in the middle.
++  else if(packetCount() > 1 &&
++          ((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
++           (flags & EndsWithPacket && d->header.lastPacketCompleted()) ||
++           (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket))))
+   {
+     flags = ContainsPacketFlags(flags | CompletePacket);
+   }
+@@ -208,20 +210,101 @@
+   for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it)
+     totalSize += (*it).size();
+ 
+-  if(strategy == Repaginate || totalSize + packets.size() > 255 * 256) {
+-    debug("Ogg::Page::paginate() -- Sorry!  Repagination is not yet implemented.");
+-    return l;
+-  }
++  // Handle creation of multiple pages with appropriate pagination.
++  if(strategy == Repaginate || totalSize + packets.size() > 255 * 255) {
+ 
+-  // TODO: Handle creation of multiple pages here with appropriate pagination.
++    // SPLITSIZE must be a multiple of 255 in order to get the lacing values right
++    // create pages of about 8KB each
++#define SPLITSIZE (32*255)
++
++    int pageIndex = 0;
++
++    for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it) {
++      bool continued = false;
++
++      // mark very first packet?
++      if(firstPacketContinued && it==packets.begin()) {
++        continued = true;
++      }
++
++      // append to buf
++      ByteVector packetBuf;
++      packetBuf.append(*it);
++
++      while(packetBuf.size() > SPLITSIZE) {
++        // output a Page
++        ByteVector packetForOnePage;
++        packetForOnePage.resize(SPLITSIZE);
++        std::copy(packetBuf.begin(), packetBuf.begin() + SPLITSIZE, packetForOnePage.begin());
++
++        ByteVectorList packetList;
++        packetList.append(packetForOnePage);
++        Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued, false, false);
++        l.append(p);
++
++        pageIndex++;
++        continued = true;
++        packetBuf = packetBuf.mid(SPLITSIZE);
++      }
++
++      ByteVectorList::ConstIterator jt = it;
++      ++jt;
++      bool lastPacketInList = (jt == packets.end());
++
++      // output a page for the rest (we output one packet per page, so this one should be completed)
++      ByteVectorList packetList;
++      packetList.append(packetBuf);
++
++      bool isVeryLastPacket = false;
++      if(containsLastPacket) {
++        // mark the very last output page as last of stream
++        ByteVectorList::ConstIterator jt = it;
++        ++jt;
++        if(jt == packets.end()) {
++          isVeryLastPacket = true;
++        }
++      }
++
++      Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued,
++                         lastPacketInList ? lastPacketCompleted : true, 
++                         isVeryLastPacket);
++      pageIndex++;
+ 
+-  Page *p = new Page(packets, streamSerialNumber, firstPage, firstPacketContinued,
+-                     lastPacketCompleted, containsLastPacket);
+-  l.append(p);
++      l.append(p);
++    }
++  }
++  else {
++    Page *p = new Page(packets, streamSerialNumber, firstPage, firstPacketContinued,
++                       lastPacketCompleted, containsLastPacket);
++    l.append(p);
++  }
+ 
+   return l;
+ }
+ 
++Ogg::Page* Ogg::Page::getCopyWithNewPageSequenceNumber(int sequenceNumber)
++{
++  Page *pResultPage = NULL;
++
++  // TODO: a copy constructor would be helpful
++
++  if(d->file == 0) {
++    pResultPage = new Page(
++        d->packets,
++        d->header.streamSerialNumber(),
++        sequenceNumber,
++        d->header.firstPacketContinued(),
++        d->header.lastPacketCompleted(),
++        d->header.lastPageOfStream());
++  }
++  else
++  {
++    pResultPage = new Page(d->file, d->fileOffset);
++    pResultPage->d->header.setPageSequenceNumber(sequenceNumber);
++  }
++  return pResultPage;
++}
++
+ ////////////////////////////////////////////////////////////////////////////////
+ // protected members
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -254,3 +337,4 @@
+   d->packets = packets;
+   d->header.setPacketSizes(packetSizes);
+ }
++
+diff -Nur taglib-1.5-orig/taglib/ogg/oggpage.h taglib-1.5/taglib/ogg/oggpage.h
+--- taglib-1.5-orig/taglib/ogg/oggpage.h	2008-02-04 16:14:46.000000000 +0100
++++ taglib-1.5/taglib/ogg/oggpage.h	2009-09-04 11:47:06.387120297 +0200
+@@ -70,6 +70,14 @@
+        */
+       const PageHeader *header() const;
+ 
++      /*! 
++       * Returns a copy of the page with \a sequenceNumber set as sequence number.
++       * 
++       * \see header()
++       * \see PageHeader::setPageSequenceNumber()
++       */
++      Page* getCopyWithNewPageSequenceNumber(int sequenceNumber);
++
+       /*!
+        * Returns the index of the first packet wholly or partially contained in
+        * this page.

taglib-1.5-1.6-toolkit.patch:
 taglib-1.5/taglib/toolkit/tstring.cpp     |    6 +++++-
 taglib-1.5/taglib/toolkit/tstring.h       |    2 +-
 taglib/taglib/toolkit/tbytevector.cpp     |    4 ++--
 taglib/taglib/toolkit/tbytevector.h       |    2 +-
 taglib/taglib/toolkit/tbytevectorlist.cpp |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

Index: taglib-1.5-1.6-toolkit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib-1.5-1.6-toolkit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- taglib-1.5-1.6-toolkit.patch	22 Aug 2009 10:44:21 -0000	1.1
+++ taglib-1.5-1.6-toolkit.patch	4 Sep 2009 10:21:32 -0000	1.2
@@ -40,3 +40,45 @@ diff -Nur taglib-1.5/taglib/toolkit/tbyt
        l.append(v.mid(previousOffset, offset - previousOffset));
      else
        l.append(ByteVector::null);
+diff -Nur taglib-1.5-orig/taglib/toolkit/tstring.cpp taglib-1.5/taglib/toolkit/tstring.cpp
+--- taglib-1.5-orig/taglib/toolkit/tstring.cpp	2008-02-04 16:14:45.000000000 +0100
++++ taglib-1.5/taglib/toolkit/tstring.cpp	2009-09-04 12:07:00.506121756 +0200
+@@ -35,7 +35,7 @@
+ 
+   inline unsigned short byteSwap(unsigned short x)
+   {
+-    return ((x) >> 8) & 0xff | ((x) & 0xff) << 8;
++    return (((x) >> 8) & 0xff) | (((x) & 0xff) << 8);
+   }
+ 
+   inline unsigned short combine(unsigned char c1, unsigned char c2)
+@@ -510,6 +510,8 @@
+ 
+ TagLib::wchar &String::operator[](int i)
+ {
++  detach();
++
+   return d->data[i];
+ }
+ 
+@@ -558,6 +560,8 @@
+ 
+ String &String::operator+=(char c)
+ {
++  detach();
++
+   d->data += uchar(c);
+   return *this;
+ }
+diff -Nur taglib-1.5-orig/taglib/toolkit/tstring.h taglib-1.5/taglib/toolkit/tstring.h
+--- taglib-1.5-orig/taglib/toolkit/tstring.h	2008-02-04 16:14:45.000000000 +0100
++++ taglib-1.5/taglib/toolkit/tstring.h	2009-09-04 12:07:03.465121011 +0200
+@@ -31,7 +31,7 @@
+ #include "tbytevector.h"
+ 
+ #include <string>
+-#include <ostream>
++#include <iostream>
+ 
+ /*!
+  * \relates TagLib::String


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- taglib.spec	23 Aug 2009 18:44:02 -0000	1.42
+++ taglib.spec	4 Sep 2009 10:21:32 -0000	1.43
@@ -12,7 +12,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -171,6 +171,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
+- Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and
+  really add tstring bug-fix:
+  * Split Ogg packets larger than 64k into multiple pages. (BUG:171957)
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+
 * Sun Aug 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-7
 - Build API documentation into -doc package.
 



From markmc at fedoraproject.org  Fri Sep  4 10:34:33 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  4 Sep 2009 10:34:33 +0000 (UTC)
Subject: rpms/qemu/devel qemu-allow-pulseaudio-to-be-the-default.patch, NONE,
	1.1 qemu.spec, 1.123, 1.124
Message-ID: <20090904103433.3351B11C0082@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20629

Modified Files:
	qemu.spec 
Added Files:
	qemu-allow-pulseaudio-to-be-the-default.patch 
Log Message:
* Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.9.rc1
- Make pulseaudio the default audio backend (#519540, #495964, #496627)


qemu-allow-pulseaudio-to-be-the-default.patch:
 paaudio.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE qemu-allow-pulseaudio-to-be-the-default.patch ---
>From 01c3198a8f0d933c9b219acaf087c675d729bbf7 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 4 Sep 2009 11:24:03 +0100
Subject: [PATCH] Allow pulseaudio backend to be the default

We're seeing various issues with the SDL audio backend and want to
switch to the pulseaudio backend. See e.g.

  https://bugzilla.redhat.com/495964
  https://bugzilla.redhat.com/519540
  https://bugzilla.redhat.com/496627

The pulseaudio backend seems to work well, so we should allow it to be
selected as the default.

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-allow-pulseaudio-to-be-the-default.patch
---
 audio/paaudio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/audio/paaudio.c b/audio/paaudio.c
index a50fccc..547e252 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -507,7 +507,7 @@ struct audio_driver pa_audio_driver = {
     INIT_FIELD (init           = ) qpa_audio_init,
     INIT_FIELD (fini           = ) qpa_audio_fini,
     INIT_FIELD (pcm_ops        = ) &qpa_pcm_ops,
-    INIT_FIELD (can_be_default = ) 0,
+    INIT_FIELD (can_be_default = ) 1,
     INIT_FIELD (max_voices_out = ) INT_MAX,
     INIT_FIELD (max_voices_in  = ) INT_MAX,
     INIT_FIELD (voice_size_out = ) sizeof (PAVoiceOut),
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- qemu.spec	20 Aug 2009 12:57:48 -0000	1.123
+++ qemu.spec	4 Sep 2009 10:34:32 -0000	1.124
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.8.%{kvmvertag}%{?dist}
+Release: 0.9.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -34,19 +34,12 @@ Patch05: qemu-fix-extboot-signrom.patch
 # Fix virtio_net with -net user (bug #516022)
 Patch06: qemu-fix-vnet-hdr-slirp-bustage.patch
 
-# Fix segfault when qemu-kvm is invoked inside a VM (where HVM is not
-# available).  RHBZ#516543
-#
-# Regression was introduced by this commit:
-# http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commitdiff;h=b8083e930efc1ee85a7ad7e700dbd0f52ebb32dd
-#
-# Upstream discussion:
-# http://www.mail-archive.com/kvm at vger.kernel.org/msg19890.html
-#
-# Note: NOT UPSTREAM and this is something of a hack.  Upstream are
-# still debating how they really want to fix this.
+# Fix segfault when qemu-kvm is invoked inside a VM (bug #516543)
 Patch07: qemu-fix-no-kvm-segfault.patch
 
+# Allow the pulseudio backend to be the default
+Patch08: qemu-allow-pulseaudio-to-be-the-default.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -234,6 +227,7 @@ such as kvmtrace and kvm_stat.
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -498,6 +492,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.9.rc1
+- Make pulseaudio the default audio backend (#519540, #495964, #496627)
+
 * Thu Aug 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2:0.10.91-0.8.rc1
 - Fix segfault when qemu-kvm is invoked inside a VM (#516543)
 



From markmc at fedoraproject.org  Fri Sep  4 10:38:39 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  4 Sep 2009 10:38:39 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-allow-pulseaudio-to-be-the-default.patch, NONE, 
	1.1 qemu.spec, 1.101, 1.102
Message-ID: <20090904103839.E621611C0082@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21787

Modified Files:
	qemu.spec 
Added Files:
	qemu-allow-pulseaudio-to-be-the-default.patch 
Log Message:
* Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-4
- Make pulseaudio the default audio backend (#519540, #495964, #496627)


qemu-allow-pulseaudio-to-be-the-default.patch:
 paaudio.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE qemu-allow-pulseaudio-to-be-the-default.patch ---
>From a9459944fec8e338826eedbce844ce5c1c1ff948 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 4 Sep 2009 11:24:03 +0100
Subject: [PATCH] Allow pulseaudio backend to be the default

We're seeing various issues with the SDL audio backend and want to
switch to the pulseaudio backend. See e.g.

  https://bugzilla.redhat.com/495964
  https://bugzilla.redhat.com/519540
  https://bugzilla.redhat.com/496627

The pulseaudio backend seems to work well, so we should allow it to be
selected as the default.

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-allow-pulseaudio-to-be-the-default.patch
---
 audio/paaudio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/audio/paaudio.c b/audio/paaudio.c
index ff43bdd..081087a 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -507,7 +507,7 @@ struct audio_driver pa_audio_driver = {
     INIT_FIELD (init           = ) qpa_audio_init,
     INIT_FIELD (fini           = ) qpa_audio_fini,
     INIT_FIELD (pcm_ops        = ) &qpa_pcm_ops,
-    INIT_FIELD (can_be_default = ) 0,
+    INIT_FIELD (can_be_default = ) 1,
     INIT_FIELD (max_voices_out = ) INT_MAX,
     INIT_FIELD (max_voices_in  = ) INT_MAX,
     INIT_FIELD (voice_size_out = ) sizeof (PAVoiceOut),
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- qemu.spec	4 Sep 2009 10:09:56 -0000	1.101
+++ qemu.spec	4 Sep 2009 10:38:39 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -30,6 +30,7 @@ Patch14: qemu-kvm-fix-kerneldir-includes
 Patch15: qemu-avoid-harmless-msr-warnings.patch
 Patch16: qemu-ppc-on-ppc.patch
 Patch17: qemu-use-statfs-to-determine-huge-page-size.patch
+Patch18: qemu-allow-pulseaudio-to-be-the-default.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -227,6 +228,7 @@ such as kvmtrace and kvm_stat.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -469,6 +471,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-4
+- Make pulseaudio the default audio backend (#519540, #495964, #496627)
+
 * Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-3
 - Use statfs to determine huge page size, fixing fd leak (#519378)
 



From phuang at fedoraproject.org  Fri Sep  4 10:42:49 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Sep 2009 10:42:49 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.89,1.90 sources,1.47,1.48
Message-ID: <20090904104249.C1BF411C0082@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22469

Modified Files:
	ibus.spec sources 
Log Message:
Refresh the tarball


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- ibus.spec	4 Sep 2009 04:40:13 -0000	1.89
+++ ibus.spec	4 Sep 2009 10:42:49 -0000	1.90
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20090904
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -234,6 +234,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-2
+- Refresh the tarball.
+
 * Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-1
 - Update to 1.2.0.20090904
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	4 Sep 2009 04:29:20 -0000	1.47
+++ sources	4 Sep 2009 10:42:49 -0000	1.48
@@ -1 +1 @@
-35e422490b409f738f9861ee13dfacf7  ibus-1.2.0.20090904.tar.gz
+77af615da11d5c30b331951172c449fb  ibus-1.2.0.20090904.tar.gz



From twaugh at fedoraproject.org  Fri Sep  4 10:46:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Sep 2009 10:46:55 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-get-devices.patch, NONE,
	1.1 system-config-printer.spec, 1.250, 1.251
Message-ID: <20090904104655.453A211C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23177

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-get-devices.patch 
Log Message:
* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
- Speed improvement when fetching devices.


system-config-printer-get-devices.patch:
 cupshelpers/cupshelpers.py |    4 
 cupspk.py                  |   18 +++
 gtkspinner.py              |    2 
 system-config-printer.py   |  205 ++++++++++++++++++++++++++++++---------------
 timedops.py                |   38 ++++++--
 5 files changed, 188 insertions(+), 79 deletions(-)

--- NEW FILE system-config-printer-get-devices.patch ---
diff -up system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices system-config-printer-1.1.12/cupshelpers/cupshelpers.py
--- system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-04 11:16:44.304515617 +0100
@@ -541,7 +541,7 @@ class Device:
         
         return result
 
-def getDevices(connection):
+def getDevices(connection, **kw):
     """
     Obtain a list of available CUPS devices.
 
@@ -550,7 +550,7 @@ def getDevices(connection):
     @returns: a list of L{Device} objects
     @raise cups.IPPError: IPP Error
     """
-    devices = connection.getDevices()
+    devices = connection.getDevices(**kw)
     for uri, data in devices.iteritems():
         device = Device(uri, **data)
         devices[uri] = device
diff -up system-config-printer-1.1.12/cupspk.py.get-devices system-config-printer-1.1.12/cupspk.py
--- system-config-printer-1.1.12/cupspk.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupspk.py	2009-09-04 11:16:44.306513306 +0100
@@ -304,12 +304,13 @@ class Connection:
     def getDevices(self, *args, **kwds):
         use_pycups = False
 
-        timeout = 0
+        limit = 0
         include_schemes = ''
         exclude_schemes = ''
+        timeout = 0
 
-        if len(args) == 3:
-            (use_pycups, timeout, include_schemes, exclude_schemes) = self._args_to_tuple([int, str, str], *args)
+        if len(args) == 4:
+            (use_pycups, limit, include_schemes, exclude_schemes, timeout) = self._args_to_tuple([int, str, str, int], *args)
         else:
             if kwds.has_key('timeout'):
                 timeout = kwds['timeout']
@@ -320,6 +321,17 @@ class Connection:
             if kwds.has_key('exclude_schemes'):
                 exclude_schemes = kwds['exclude_schemes']
 
+        # Convert from list to string
+        if len (include_schemes) > 0:
+            include_schemes = reduce (lambda x, y: x + "," + y, include_schemes)
+        else:
+            include_schemes = ""
+
+        if len (exclude_schemes) > 0:
+            exclude_schemes = reduce (lambda x, y: x + "," + y, exclude_schemes)
+        else:
+            exclude_schemes = ""
+
         pk_args = (timeout, include_schemes, exclude_schemes)
 
         result = self._call_with_pk_and_fallback(use_pycups,
diff -up system-config-printer-1.1.12/gtkspinner.py.get-devices system-config-printer-1.1.12/gtkspinner.py
--- system-config-printer-1.1.12/gtkspinner.py.get-devices	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/gtkspinner.py	2009-09-04 11:16:44.308513947 +0100
@@ -65,7 +65,7 @@ class Spinner:
     def _next_frame (self):
         n = self._current_frame + 1
         if n >= self.n_frames:
-            n = 0
+            n = 1
 
         self._set_frame (n)
         return True
diff -up system-config-printer-1.1.12/system-config-printer.py.get-devices system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-04 11:14:50.153515535 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-04 11:16:44.317512571 +0100
@@ -3681,6 +3681,7 @@ class NewPrinterGUI(GtkGUI):
         self.ntbkNPDownloadableDriverProperties.set_show_tabs(False)
 
         self.spinner = gtkspinner.Spinner (self.imgProcessWorking)
+        self.spinner_count = 0
 
         # Set up OpenPrinting widgets.
         self.openprinting = cupshelpers.openprinting.OpenPrinting ()
@@ -3765,6 +3766,19 @@ class NewPrinterGUI(GtkGUI):
         ppd_filter.add_pattern("*")
         self.filechooserPPD.add_filter(ppd_filter)
 
+    def inc_spinner_task (self):
+        if self.spinner_count == 0:
+            self.imgProcessWorking.show ()
+            self.spinner.start ()
+
+        self.spinner_count += 1
+
+    def dec_spinner_task (self):
+        self.spinner_count -= 1
+        if self.spinner_count == 0:
+            self.imgProcessWorking.hide ()
+            self.spinner.stop ()
+
     def show_IPP_Error (self, exception, message):
         return show_IPP_Error (exception, message, parent=self.NewPrinterWindow)
 
@@ -4172,6 +4186,10 @@ class NewPrinterGUI(GtkGUI):
     # Navigation buttons
 
     def on_NPCancel(self, widget, event=None):
+        if self.fetchDevices_op:
+            self.fetchDevices_op.cancel ()
+            self.dec_spinner_task ()
+
         self.NewPrinterWindow.hide()
         if self.openprinting_query_handle != None:
             self.openprinting.cancelOperation (self.openprinting_query_handle)
@@ -4611,32 +4629,48 @@ class NewPrinterGUI(GtkGUI):
             self.btnNPForward.set_sensitive(
                 self.mainapp.checkNPName(new_text))
 
-    def fetchDevices(self, parent=None):
+    def fetchDevices(self, parent=None, network=False):
         debugprint ("fetchDevices")
-        self.lblWait.set_markup ('<span weight="bold" size="larger">' +
-                                 _('Searching') + '</span>\n\n' +
-                                 _('Searching for printers'))
-        if parent == None:
-            parent = self.mainapp.PrintersWindow
-        self.WaitWindow.set_transient_for (parent)
-        self.WaitWindow.show_now ()
-        self.busy (self.WaitWindow)
-        while gtk.events_pending ():
-            gtk.main_iteration ()
 
-        debugprint ("Fetching devices")
-        self.mainapp.cups._begin_operation (_("fetching device list"))
+        have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
+        if not have_polkit_1:
+            if network:
+                return {}
+
+            network = True
+
+        network_schemes = ["dnssd", "snmp"]
         try:
-            devices = cupshelpers.getDevices(self.mainapp.cups)
-        except:
-            self.mainapp.cups._end_operation ()
-            self.WaitWindow.hide ()
+            c = authconn.Connection (host=self.mainapp.connect_server,
+                                     parent=parent, lock=True)
+            debugprint ("in get_devices: connected")
+            c._begin_operation (_("fetching device list"))
+            try:
+                if network:
+                    debugprint ("Fetching network devices")
+                    ret = cupshelpers.getDevices (c,
+                                                  include_schemes=network_schemes)
+                else:
+                    debugprint ("Fetching local devices")
+                    ret = cupshelpers.getDevices (c,
+                                                  exclude_schemes=network_schemes)
+            except TypeError:
+                # include_schemes/exclude_schemes requires pycups >= 1.9.46
+                if network:
+                    ret = {}
+                else:
+                    debugprint ("Fetching all devices")
+                    debugprint ("in get_devices: getDevices")
+                    ret = cupshelpers.getDevices (c)
+        except RuntimeError:
+            raise
+        except cups.IPPError:
+            c._end_operation ()
             raise
 
-        self.mainapp.cups._end_operation ()
-        self.WaitWindow.hide ()
+        c._end_operation ()
         debugprint ("Got devices")
-        return devices
+        return ret
 
     def install_hplip_plugin(self, uri):
         """
@@ -4949,23 +4983,66 @@ class NewPrinterGUI(GtkGUI):
         return (host, uri)
 
     def fillDeviceTab(self, current_uri=None):
-        try:
-            devices = self.fetchDevices()
-        except cups.IPPError, (e, msg):
-            self.show_IPP_Error(e, msg)
-            devices = {}
-        except:
-            nonfatalException()
-            devices = {}
+        self.device_selected = -1
+        model = gtk.TreeStore (gobject.TYPE_STRING,   # device-info
+                               gobject.TYPE_PYOBJECT, # PhysicalDevice obj
+                               gobject.TYPE_BOOLEAN)  # Separator?
+        other = cupshelpers.Device('', **{'device-info' :_("Other")})
+        physother = PhysicalDevice (other)
+        self.devices = [physother]
+        model.append (None, row=[physother.get_info (), physother, False])
+        network_iter = model.append (None, row=[_("Network Printer"),
+                                                None,
+                                                False])
+        network_dict = { 'device-class': 'network',
+                         'device-info': _("Find Network Printer") }
+        network = cupshelpers.Device ('network', **network_dict)
+        find_nw_iter = model.append (network_iter,
+                                     row=[network_dict['device-info'],
+                                          PhysicalDevice (network), False])
+        model.insert_after (network_iter, find_nw_iter, row=['', None, True])
+        self.devices_find_nw_iter = find_nw_iter
+        self.devices_network_iter = network_iter
+        self.devices_network_fetched = False
+        self.tvNPDevices.set_model (model)
+        self.entNPTDevice.set_text ('')
+        self.expNPDeviceURIs.hide ()
+        self.inc_spinner_task ()
+
+        self.fetchDevices_op = TimedOperation (self.fetchDevices,
+                                               kwargs={"network": False},
+                                               callback=self.got_devices,
+                                               context=(current_uri, False))
+
+    def got_devices (self, result, exception, context):
+        self.dec_spinner_task ()
+        (current_uri, network) = context
+        if exception:
+            try:
+                raise exception
+            except:
+                nonfatalException()
+            return
 
+        if network:
+            self.fetchDevices_op = None
+        else:
+            # Now we've got the local devices, start a request for the
+            # network devices.
+            context = (current_uri, True)
+            self.inc_spinner_task ()
+            self.fetchDevices_op = TimedOperation (self.fetchDevices,
+                                                   kwargs={"network": True},
+                                                   callback=self.got_devices,
+                                                   context=context)
+
+        devices = result
         if current_uri:
             if devices.has_key (current_uri):
                 current = devices.pop(current_uri)
-                current.info += _(" (Current)")
             elif devices.has_key (current_uri.replace (":9100", "")):
                 current_uri = current_uri.replace (":9100", "")
                 current = devices.pop(current_uri)
-                current.info += _(" (Current)")
             else:
                 current = cupshelpers.Device (current_uri)
                 current.info = "Current device"
@@ -5008,7 +5085,7 @@ class NewPrinterGUI(GtkGUI):
                                                  "hal", "beh",
                                                  "scsi", "http", "delete"),
                          devices)
-        self.devices = []
+        newdevices = []
         for device in devices:
             physicaldevice = PhysicalDevice (device)
             try:
@@ -5016,43 +5093,32 @@ class NewPrinterGUI(GtkGUI):
                 self.devices[i].add_device (device)
             except ValueError:
                 self.devices.append (physicaldevice)
+                newdevices.append (physicaldevice)
 
         self.devices.sort()
-        other = cupshelpers.Device('', **{'device-info' :_("Other")})
-        self.devices.append (PhysicalDevice (other))
-        device_select_index = 0
         if current_uri:
             current_device = PhysicalDevice (current)
             try:
                 i = self.devices.index (current_device)
                 self.devices[i].add_device (current)
-                device_select_index = i
-                devs = self.devices[i].get_devices ()
+                current_device = self.devices[i]
             except ValueError:
-                self.devices.insert(0, current_device)
+                self.devices.append (current_device)
+                newdevices.append (current_device)
+        else:
+            current_device = None
 
-        model = gtk.TreeStore (gobject.TYPE_STRING,   # device-info
-                               gobject.TYPE_PYOBJECT, # PhysicalDevice obj
-                               gobject.TYPE_BOOLEAN)  # Separator?
-        network_iter = model.append (None, row=[_("Network Printer"),
-                                                None,
-                                                False])
-        network_dict = { 'device-class': 'network',
-                         'device-info': _("Find Network Printer") }
-        network = cupshelpers.Device ('network', **network_dict)
-        find_nw_iter = model.append (network_iter,
-                                     row=[network_dict['device-info'],
-                                          PhysicalDevice (network), False])
-        model.insert_after (network_iter, find_nw_iter, row=['', None, True])
-        self.devices_find_nw_iter = find_nw_iter
-        self.tvNPDevices.set_model (model)
+        model = self.tvNPDevices.get_model ()
 
-        i = 0
-        device_select_path = None
-        for device in self.devices:
+        network_iter = self.devices_network_iter
+        find_nw_iter = self.devices_find_nw_iter
+        for device in newdevices:
             devs = device.get_devices ()
             network = devs[0].device_class == 'network'
-            row=[device.get_info (), device, False]
+            info = device.get_info ()
+            if device == current_device:
+                info += _(" (Current)")
+            row=[info, device, False]
             if network:
                 if devs[0].uri != devs[0].type:
                     # An actual network printer device.  Put this at the top.
@@ -5062,24 +5128,31 @@ class NewPrinterGUI(GtkGUI):
                     # If this is the currently selected device we need
                     # to expand the "Network Printer" row so that it
                     # is visible.
-                    if device_select_index == i:
+                    if device == current_device:
                         network_path = model.get_path (network_iter)
                         self.tvNPDevices.expand_row (network_path, False)
                 else:
                     # Just a method of finding one.
                     iter = model.append (network_iter, row=row)
             else:
-                iter = model.insert_before(None, network_iter, row=row)
+                # Insert this local device in order.
+                iter = model.get_iter_first ()
+                while iter != network_iter:
+                    physdev = model.get_value (iter, 1)
+                    if physdev > device:
+                        break
+
+                    iter = model.iter_next (iter)
 
-            if device_select_index == i:
+                iter = model.insert_before (None, iter, row=row)
+
+            if device == current_device:
                 device_select_path = model.get_path (iter)
                 self.tvNPDevices.scroll_to_cell (device_select_path,
                                                  row_align=0.5)
                 column = self.tvNPDevices.get_column (0)
                 self.tvNPDevices.set_cursor (device_select_path, column)
 
-            i += 1
-
         connection_select_path = 0
         if current_uri:
             model = self.tvNPDeviceURIs.get_model ()
@@ -5093,6 +5166,9 @@ class NewPrinterGUI(GtkGUI):
 
                 iter = model.iter_next (iter)
                 i += 1
+        elif not self.device_selected:
+            column = self.tvNPDevices.get_column (0)
+            self.tvNPDevices.set_cursor ((0,), column)
 
         column = self.tvNPDeviceURIs.get_column (0)
         self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
@@ -5552,6 +5628,7 @@ class NewPrinterGUI(GtkGUI):
         return False
 
     def on_tvNPDevices_cursor_changed(self, widget):
+        self.device_selected += 1
         path, column = widget.get_cursor ()
         if path == None:
             return
@@ -5855,8 +5932,7 @@ class NewPrinterGUI(GtkGUI):
         self.network_found = 0
         self.lblNetworkFindSearching.show_all ()
         finder = probe_printer.PrinterFinder ()
-        self.imgProcessWorking.show ()
-        self.spinner.start ()
+        self.inc_spinner_task ()
         finder.find (host, found_callback)
 
     def found_network_printer_callback (self, new_device):
@@ -5885,8 +5961,7 @@ class NewPrinterGUI(GtkGUI):
                 path = model.get_path (iter)
                 self.tvNPDevices.set_cursor (path)
         else:
-            self.imgProcessWorking.hide ()
-            self.spinner.stop ()
+            self.dec_spinner_task ()
             self.lblNetworkFindSearching.hide ()
             self.entNPTNetworkHostname.set_sensitive (True)
             self.btnNetworkFind.set_sensitive (True)
diff -up system-config-printer-1.1.12/timedops.py.get-devices system-config-printer-1.1.12/timedops.py
--- system-config-printer-1.1.12/timedops.py.get-devices	2009-08-25 15:01:41.000000000 +0100
+++ system-config-printer-1.1.12/timedops.py	2009-09-04 11:16:44.320513808 +0100
@@ -152,16 +152,25 @@ class OperationThread(threading.Thread):
 
 class TimedOperation(Timed):
     def __init__ (self, target, args=(), kwargs={}, parent=None,
-                  show_dialog=False):
+                  show_dialog=False, callback=None, context=None):
         self.wait_window = None
         self.parent = parent
         self.show_dialog = show_dialog
+        self.callback = callback
+        self.context = context
         self.thread = OperationThread (target=target,
                                        args=args,
                                        kwargs=kwargs)
         self.thread.start ()
 
+        self.use_callback = callback != None
+        if self.use_callback:
+            self.timeout_source = gobject.timeout_add (50, self._check_thread)
+
     def run (self):
+        if self.use_callback:
+            raise RuntimeError
+
         if self.show_dialog:
             wait = gtk.MessageDialog (self.parent,
                                       gtk.DIALOG_MODAL |
@@ -170,7 +179,7 @@ class TimedOperation(Timed):
                                       gtk.BUTTONS_CANCEL,
                                       _("Please wait"))
             wait.connect ("delete_event", lambda *args: False)
-            wait.connect ("response", self.wait_window_response)
+            wait.connect ("response", self._wait_window_response)
             if self.parent:
                 wait.set_transient_for (self.parent)
 
@@ -178,7 +187,7 @@ class TimedOperation(Timed):
             wait.format_secondary_text (_("Gathering information"))
             wait.show_all ()
 
-        self.timeout_source = gobject.timeout_add (50, self.check_thread)
+        self.timeout_source = gobject.timeout_add (50, self._check_thread)
         gtk.main ()
         gobject.source_remove (self.timeout_source)
         if self.show_dialog:
@@ -186,20 +195,33 @@ class TimedOperation(Timed):
 
         return self.thread.collect_result ()
 
-    def check_thread (self):
+    def _check_thread (self):
         if self.thread.isAlive ():
             # Thread still running.
             return True
 
-        # Thread has finished.  Stop the sub-loop.
-        gtk.main_quit ()
+        # Thread has finished.  Stop the sub-loop or trigger callback.
+        if self.use_callback:
+            if self.callback != None:
+                if self.context != None:
+                    self.callback (self.thread.result, self.thread.exception,
+                                   self.context)
+                else:
+                    self.callback (self.thread.result, self.thread.exception)
+        else:
+            gtk.main_quit ()
+
         return False
 
-    def wait_window_response (self, dialog, response):
+    def _wait_window_response (self, dialog, response):
         if response == gtk.RESPONSE_CANCEL:
             self.cancel ()
 
     def cancel (self):
         debugprint ("Command canceled")
-        gtk.main_quit ()
+        if self.use_callback:
+            self.callback = None
+        else:
+            gtk.main_quit ()
+
         return False


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- system-config-printer.spec	28 Aug 2009 15:53:16 -0000	1.250
+++ system-config-printer.spec	4 Sep 2009 10:46:55 -0000	1.251
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch3: system-config-printer-icon-load-
 Patch4: system-config-printer-older-gtk.patch
 Patch5: system-config-printer-proxy-auth.patch
 Patch6: system-config-printer-ppdippstr.patch
+Patch7: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -74,6 +75,7 @@ the configuration tool.
 %patch4 -p1 -b .older-gtk
 %patch5 -p1 -b .proxy-auth
 %patch6 -p1 -b .ppdippstr
+%patch7 -p1 -b .get-devices
 
 %build
 %configure
@@ -175,6 +177,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
+- Speed improvement when fetching devices.
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
 - Fixed PPD/IPP string translation.
 - Fixed proxy authentication.



From pkgdb at fedoraproject.org  Fri Sep  4 11:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:08:55 +0000
Subject: [pkgdb] abrt: mnowak has requested watchbugzilla
Message-ID: <20090904110855.9A66C10F85C@bastion2.fedora.phx.redhat.com>

mnowak has requested the watchbugzilla acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:08:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:08:57 +0000
Subject: [pkgdb] abrt: mnowak has requested watchcommits
Message-ID: <20090904110857.8F5EF10F893@bastion2.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:09:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:09:11 +0000
Subject: [pkgdb] abrt: mnowak has requested watchcommits
Message-ID: <20090904110911.8E57E10F895@bastion2.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on abrt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:09:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:09:45 +0000
Subject: [pkgdb] abrt: mnowak has requested watchbugzilla
Message-ID: <20090904110945.4DC3610F874@bastion2.fedora.phx.redhat.com>

mnowak has requested the watchbugzilla acl on abrt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:09:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:09:53 +0000
Subject: [pkgdb] abrt: mnowak has requested watchbugzilla
Message-ID: <20090904110953.52D9010F883@bastion2.fedora.phx.redhat.com>

mnowak has requested the watchbugzilla acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:09:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:09:59 +0000
Subject: [pkgdb] abrt: mnowak has requested watchcommits
Message-ID: <20090904111000.7234910F87F@bastion2.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:17:50 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090904111750.E9F2C10F85C@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora devel) to Approved for mnowak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:17:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:17:51 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090904111751.E859710F883@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora devel) to Approved for mnowak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:17:55 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090904111755.72F0D10F8A0@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 10) to Approved for mnowak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:17:55 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090904111755.723E310F89C@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 10) to Approved for mnowak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:17:58 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090904111758.8C03610F8A6@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 11) to Approved for mnowak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Sep  4 11:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 11:17:58 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090904111759.009F110F8AB@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 11) to Approved for mnowak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From mjakubicek at fedoraproject.org  Fri Sep  4 11:22:12 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri,  4 Sep 2009 11:22:12 +0000 (UTC)
Subject: rpms/vips/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 vips.spec,
	1.27, 1.28
Message-ID: <20090904112212.1806011C0082@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/vips/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11429

Modified Files:
	.cvsignore sources vips.spec 
Log Message:
- Update to 7.18.2 to sync with fixed nip2 FTBFS.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vips/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	29 Dec 2008 03:44:40 -0000	1.13
+++ .cvsignore	4 Sep 2009 11:22:11 -0000	1.14
@@ -1 +1 @@
-vips-7.16.4.tar.gz
+vips-7.18.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vips/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	29 Dec 2008 03:44:40 -0000	1.13
+++ sources	4 Sep 2009 11:22:11 -0000	1.14
@@ -1 +1 @@
-7aae3e3467d58c6c06979a10ec4f1624  vips-7.16.4.tar.gz
+c750c3a84410e8d1f5bea231fbf50cb9  vips-7.18.2.tar.gz


Index: vips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vips/devel/vips.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- vips.spec	27 Jul 2009 06:54:23 -0000	1.27
+++ vips.spec	4 Sep 2009 11:22:11 -0000	1.28
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		vips
-Version:	7.16.4
-Release:	4%{?dist}
-Summary: 	C/C++ library for processing large images
+Version:	7.18.2
+Release:	1%{?dist}
+Summary:	C/C++ library for processing large images
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.18.2-1
+- Update to 7.18.2 to sync with fixed nip2 FTBFS.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.16.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Sep  4 11:24:48 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri,  4 Sep 2009 11:24:48 +0000 (UTC)
Subject: rpms/nip2/devel nip2-7.18.2-gtk.patch, NONE, 1.1 .cvsignore, 1.14, 
	1.15 nip2.spec, 1.24, 1.25 sources, 1.14, 1.15
Message-ID: <20090904112449.0256111C0082@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/nip2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13259

Modified Files:
	.cvsignore nip2.spec sources 
Added Files:
	nip2-7.18.2-gtk.patch 
Log Message:
- Fix FTBFS: update to 7.18.2, added nip2-7.18.2-gtk.patch to build with gtk >= 2.17



nip2-7.18.2-gtk.patch:
 gtkitementry.c |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE nip2-7.18.2-gtk.patch ---
--- nip2-7.18.2/src/gtkitementry.c.orig	2009-09-04 12:47:59.000000000 +0200
+++ nip2-7.18.2/src/gtkitementry.c	2009-09-04 12:50:36.000000000 +0200
@@ -693,23 +693,23 @@
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
 
-  if (new_text_length + entry->n_bytes + 1 > entry->text_size)
+  if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
     {
-      while (new_text_length + entry->n_bytes + 1 > entry->text_size)
+      while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
 	{
-	  if (entry->text_size == 0)
-	    entry->text_size = MIN_SIZE;
+	  if (entry->x_text_size == 0)
+	    entry->x_text_size = MIN_SIZE;
 	  else
 	    {
-	      if (2 * (guint)entry->text_size < MAX_SIZE &&
-		  2 * (guint)entry->text_size > entry->text_size)
-		entry->text_size *= 2;
+	      if (2 * (guint)entry->x_text_size < MAX_SIZE &&
+		  2 * (guint)entry->x_text_size > entry->x_text_size)
+		entry->x_text_size *= 2;
 	      else
 		{
-		  entry->text_size = MAX_SIZE;
-		  if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
+		  entry->x_text_size = MAX_SIZE;
+		  if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
 		    {
-		      new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
+		      new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
 		      new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
 		      n_chars = g_utf8_strlen (new_text, new_text_length);
 		    }
@@ -718,19 +718,19 @@
 	    }
 	}
 
-      entry->text = g_realloc (entry->text, entry->text_size);
+      entry->text = g_realloc (entry->text, entry->x_text_size);
     }
 
   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
 
-  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
+  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
   memcpy (entry->text + index, new_text, new_text_length);
 
-  entry->n_bytes += new_text_length;
+  entry->x_n_bytes += new_text_length;
   entry->text_length += n_chars;
 
   /* NUL terminate for safety and convenience */
-  entry->text[entry->n_bytes] = '\0';
+  entry->text[entry->x_n_bytes] = '\0';
   
   if (entry->current_pos > *position)
     entry->current_pos += n_chars;
@@ -763,9 +763,9 @@
       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
 
-      g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
+      g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
       entry->text_length -= (end_pos - start_pos);
-      entry->n_bytes -= (end_index - start_index);
+      entry->x_n_bytes -= (end_index - start_index);
       
       if (entry->current_pos > start_pos)
 	entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
@@ -1032,7 +1032,7 @@
 {
   gtk_im_context_set_surrounding (context,
                                   entry->text,
-                                  entry->n_bytes,
+                                  entry->x_n_bytes,
                                   g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
 
   return TRUE;
@@ -1233,7 +1233,7 @@
       
       if (entry->visible)
         {
-          g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+          g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
           g_string_insert (tmp_string, cursor_index, preedit_string);
         }
       else
@@ -1242,7 +1242,7 @@
           gint preedit_len_chars;
           gunichar invisible_char;
           
-          ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+          ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
           preedit_len_chars = g_utf8_strlen (preedit_string, -1);
           ch_len += preedit_len_chars;
 
@@ -1276,7 +1276,7 @@
     {
       if (entry->visible)
         {
-          pango_layout_set_text (layout, entry->text, entry->n_bytes);
+          pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
         }
       else
         {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	29 Dec 2008 05:14:30 -0000	1.14
+++ .cvsignore	4 Sep 2009 11:24:48 -0000	1.15
@@ -1 +1 @@
-nip2-7.16.4.tar.gz
+nip2-7.18.2.tar.gz


Index: nip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nip2.spec	25 Jul 2009 19:23:56 -0000	1.24
+++ nip2.spec	4 Sep 2009 11:24:48 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		nip2
-Version:	7.16.4
-Release:	4%{?dist}
+Version:	7.18.2
+Release:	1%{?dist}
 Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
@@ -9,6 +9,8 @@ URL:		http://www.vips.ecs.soton.ac.uk/
 Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.16/%{name}-%{version}.tar.gz
 Source1:	nip2.desktop
 Patch0:		nip2-7.16.3-guidedir.patch
+# Patch has been sent to VIPSIP at JISCMAIL.AC.UK on 2009/09/04
+Patch1:		nip2-7.18.2-gtk.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,7 +19,6 @@ BuildRequires:	gtk2-devel shared-mime-in
 BuildRequires:	flex bison intltool fftw-devel libxml2-devel gettext
 BuildRequires:	desktop-file-utils gsl-devel xdg-utils
 BuildRequires:	automake autoconf libtool
-#Requires:
 
 
 # description taken from Debian package
@@ -38,6 +39,7 @@ GIMP should be used instead.
 
 # fix location of help in program to look in correct path
 %patch0 -p1 -b .guidedir
+%patch1 -p1 -b .gtk
 
 # CVS dirs
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.18.2-1
+- Fix FTBFS: update to 7.18.2, added nip2-7.18.2-gtk.patch to build with gtk >= 2.17
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.16.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	29 Dec 2008 05:14:31 -0000	1.14
+++ sources	4 Sep 2009 11:24:48 -0000	1.15
@@ -1 +1 @@
-53ce003ee0873399dbc5a11b6cfd38f7  nip2-7.16.4.tar.gz
+791c1fa6aef3e1c559359ca9a9899dcf  nip2-7.18.2.tar.gz



From pghmcfc at fedoraproject.org  Fri Sep  4 11:25:37 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri,  4 Sep 2009 11:25:37 +0000 (UTC)
Subject: rpms/gtkwave/devel .cvsignore, 1.58, 1.59 gtkwave.spec, 1.67,
	1.68 sources, 1.58, 1.59
Message-ID: <20090904112537.E654111C0082@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13960

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	5 Aug 2009 09:34:39 -0000	1.58
+++ .cvsignore	4 Sep 2009 11:25:37 -0000	1.59
@@ -1 +1 @@
-gtkwave-3.2.2.tar.gz
+gtkwave-3.2.3.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gtkwave.spec	6 Aug 2009 20:23:42 -0000	1.67
+++ gtkwave.spec	4 Sep 2009 11:25:37 -0000	1.68
@@ -2,8 +2,8 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.2.2
-Release:	%{?prerel:0.}3%{?prerel:.%{prerel}}%{?dist}
+Version:	3.2.3
+Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
@@ -23,6 +23,9 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
+# Fix permissions in bundled liblzma for debuginfo
+%{__chmod} -x src/liblzma/*.[ch]
+
 # Note that GTKWave is a GUI application but no desktop entry is provided for it.
 # This is because the application required at least one mandatory parameter (file
 # to view) and cannot be opened in a "no file" mode from a menu.
@@ -100,6 +103,10 @@ done
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Fri Sep  4 2009 Paul Howarth <paul at city-fan.org> 3.2.3-1
+- update to 3.2.3
+- fix permissions in bundled liblzma for debuginfo
+
 * Thu Aug  6 2009 Paul Howarth <paul at city-fan.org> 3.2.2-3
 - drop patch for #515672, not needed with gcc 4.4.1-4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	5 Aug 2009 09:34:39 -0000	1.58
+++ sources	4 Sep 2009 11:25:37 -0000	1.59
@@ -1 +1 @@
-644f090233f50c8e51ed9ad6b6bcf48b  gtkwave-3.2.2.tar.gz
+dcc427903a8f5e958c099f108958dce8  gtkwave-3.2.3.tar.gz



From caolanm at fedoraproject.org  Fri Sep  4 11:38:45 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  4 Sep 2009 11:38:45 +0000 (UTC)
Subject: rpms/hunspell-da/devel .cvsignore, 1.18, 1.19 hunspell-da.spec, 1.20,
	1.21 sources, 1.18, 1.19
Message-ID: <20090904113845.837FD11C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-da/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19424

Modified Files:
	.cvsignore hunspell-da.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 May 2009 11:34:36 -0000	1.18
+++ .cvsignore	4 Sep 2009 11:38:44 -0000	1.19
@@ -1 +1 @@
-myspell-da-1.7.28.tar.bz2
+myspell-da-1.7.29.tar.bz2


Index: hunspell-da.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/hunspell-da.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- hunspell-da.spec	25 Jul 2009 02:23:34 -0000	1.20
+++ hunspell-da.spec	4 Sep 2009 11:38:44 -0000	1.21
@@ -1,7 +1,7 @@
 Name: hunspell-da
 Summary: Danish hunspell dictionaries
-Version: 1.7.28
-Release: 2%{?dist}
+Version: 1.7.29
+Release: 1%{?dist}
 Source: http://da.speling.org/filer/myspell-da-%{version}.tar.bz2
 Group: Applications/Text
 URL: http://da.speling.org/
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Sep 04 2009 Caolan McNamara <caolanm at redhat.com> - 1.7.29-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.28-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	19 May 2009 11:34:37 -0000	1.18
+++ sources	4 Sep 2009 11:38:44 -0000	1.19
@@ -1 +1 @@
-777b2ede9e7171462e58d5e49447ae37  myspell-da-1.7.28.tar.bz2
+6381ac4ef1efde4492511ce4c3b227f4  myspell-da-1.7.29.tar.bz2



From caolanm at fedoraproject.org  Fri Sep  4 11:39:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  4 Sep 2009 11:39:55 +0000 (UTC)
Subject: rpms/hunspell-fo/devel .cvsignore, 1.7, 1.8 hunspell-fo.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <20090904113955.3137411C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-fo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20324

Modified Files:
	.cvsignore hunspell-fo.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Aug 2009 13:53:09 -0000	1.7
+++ .cvsignore	4 Sep 2009 11:39:54 -0000	1.8
@@ -1 +1 @@
-myspell-fo-0.2.36.tar.bz2
+myspell-fo-0.2.37.tar.bz2


Index: hunspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/hunspell-fo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- hunspell-fo.spec	10 Aug 2009 13:53:09 -0000	1.9
+++ hunspell-fo.spec	4 Sep 2009 11:39:55 -0000	1.10
@@ -1,7 +1,7 @@
 Name: hunspell-fo
 Summary: Faroese hunspell dictionaries
-Version: 0.2.36
-Release: 4%{?dist}
+Version: 0.2.37
+Release: 1%{?dist}
 Source: http://fo.speling.org/filer/myspell-fo-%{version}.tar.bz2
 Group: Applications/Text
 URL: http://fo.speling.org/
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Sep 04 2009 Caolan McNamara <caolanm at redhat.com> - 0.2.37-1
+- latest version
+
 * Mon Aug 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.2.36-4
 - .gz -> .bz2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Aug 2009 13:53:09 -0000	1.7
+++ sources	4 Sep 2009 11:39:55 -0000	1.8
@@ -1 +1 @@
-29a2a6f1b85f3b957497763957a8755f  myspell-fo-0.2.36.tar.bz2
+97101413d961943def7562c45d0131e0  myspell-fo-0.2.37.tar.bz2



From jnovy at fedoraproject.org  Fri Sep  4 11:55:45 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  4 Sep 2009 11:55:45 +0000 (UTC)
Subject: rpms/cproto/devel .cvsignore, 1.6, 1.7 cproto.spec, 1.15,
	1.16 sources, 1.6, 1.7
Message-ID: <20090904115545.C1E2511C0082@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/cproto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22997

Modified Files:
	.cvsignore cproto.spec sources 
Log Message:
* Fri Sep  4 2009 Jindrich Novy <jnovy at redhat.com> 4.7h-1
- update to 4.7h



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cproto/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Nov 2008 07:15:50 -0000	1.6
+++ .cvsignore	4 Sep 2009 11:55:44 -0000	1.7
@@ -1 +1 @@
-cproto-4.7g.tgz
+cproto-4.7h.tgz


Index: cproto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cproto/devel/cproto.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cproto.spec	24 Jul 2009 19:35:18 -0000	1.15
+++ cproto.spec	4 Sep 2009 11:55:44 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Generates function prototypes and variable declarations from C code
 Name: cproto
-Version: 4.7g
-Release: 3%{?dist}
+Version: 4.7h
+Release: 1%{?dist}
 License: Public Domain
 Group: Development/Tools
 Source: ftp://invisible-island.net/cproto/cproto-%{version}.tgz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/cproto.*
 
 %changelog
+* Fri Sep  4 2009 Jindrich Novy <jnovy at redhat.com> 4.7h-1
+- update to 4.7h
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7g-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cproto/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Nov 2008 07:15:50 -0000	1.6
+++ sources	4 Sep 2009 11:55:44 -0000	1.7
@@ -1 +1 @@
-6d7756f36e504c83fbfc29afa3aeb344  cproto-4.7g.tgz
+8fd0ff4aa00b5c2730ade74b617b2e0f  cproto-4.7h.tgz



From akurtakov at fedoraproject.org  Fri Sep  4 12:00:59 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Sep 2009 12:00:59 +0000 (UTC)
Subject: rpms/ant-contrib/devel ant-contrib.spec,1.6,1.7
Message-ID: <20090904120059.58B6F11C0082@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/ant-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24970/devel

Modified Files:
	ant-contrib.spec 
Log Message:
- Drop gcj_support.
- Install as proper ant plugin.


Index: ant-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant-contrib/devel/ant-contrib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ant-contrib.spec	24 Jul 2009 16:54:08 -0000	1.6
+++ ant-contrib.spec	4 Sep 2009 12:00:59 -0000	1.7
@@ -1,10 +1,9 @@
-%define gcj_support 1
 %define beta_number b2
 
 Summary:        Collection of tasks for Ant
-Name:           ant-contrib 
+Name:           ant-contrib
 Version:        1.0
-Release:        0.8.%{beta_number}%{?dist}
+Release:        0.9.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
@@ -17,22 +16,17 @@ BuildRequires:  ant-junit >= 1.6.2
 BuildRequires:  ant-nodeps >= 1.6.2
 BuildRequires:  xerces-j2
 BuildRequires:  bcel >= 5.0
-%if %{gcj_support}
-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
 BuildRequires:  java-devel >= 1.4.2
 Requires:       java >= 1.4.2
-%endif
 Requires:       junit >= 3.8.0
 Requires:       ant >= 1.6.2
 Requires:       xerces-j2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 %description
-The Ant-Contrib project is a collection of tasks 
-(and at one point maybe types and other tools) 
+The Ant-Contrib project is a collection of tasks
+(and at one point maybe types and other tools)
 for Apache Ant.
 
 %package        javadoc
@@ -40,7 +34,7 @@ Summary:        Javadoc for %{name}
 Group:          Documentation
 
 %description    javadoc
-%{summary}.
+Api documentation for %{name}.
 
 %prep
 %setup -q  -n %{name}
@@ -62,14 +56,13 @@ CLASSPATH=build/lib/ant-contrib-%{versio
 echo $ANT_HOME
 ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -Dpm 644 build/lib/%{name}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+      $RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
 # javadoc
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -77,37 +70,12 @@ cp -pr build/docs/api/* $RPM_BUILD_ROOT%
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 rm -rf build/docs/api
 
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{_javadir}/ant/*.jar
 %doc build/docs/LICENSE.txt
 %doc build/docs/tasks/*
 
@@ -119,6 +87,10 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.9.b2
+- Drop gcj_support.
+- Install as proper ant plugin.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.8.b2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Sep  4 12:08:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri,  4 Sep 2009 12:08:42 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-cmll-noasm.patch, NONE,
	1.1 openssl.spec, 1.140, 1.141
Message-ID: <20090904120842.5013B11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27393

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-cmll-noasm.patch 
Log Message:
* Fri Sep  4 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.7.beta3
- temporarily disable x86_64 camellia assembler code (#521127)


openssl-1.0.0-beta3-cmll-noasm.patch:
 Configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-cmll-noasm.patch ---
diff -up openssl-1.0.0-beta3/Configure.cmll-noasm openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.cmll-noasm	2009-09-04 13:44:53.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-09-04 13:46:08.000000000 +0200
@@ -125,7 +125,7 @@ my $x86_asm="x86cpuid.o:bn-586.o co-586.
 
 my $x86_elf_asm="$x86_asm:elf";
 
-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o";
+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:";
 my $ia64_asm="ia64cpuid.o:bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::void";
 my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::void";
 my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::void";


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- openssl.spec	31 Aug 2009 11:07:49 -0000	1.140
+++ openssl.spec	4 Sep 2009 12:08:42 -0000	1.141
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.6.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -63,6 +63,7 @@ Patch49: openssl-0.9.8k-algo-doc.patch
 Patch50: openssl-1.0.0-beta3-curl.patch
 Patch51: openssl-1.0.0-beta3-const.patch
 Patch52: openssl-1.0.0-beta3-dss1.patch
+Patch53: openssl-1.0.0-beta3-cmll-noasm.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
@@ -147,6 +148,7 @@ from other formats to the formats used b
 %patch50 -p1 -b .curl
 %patch51 -p1 -b .const
 %patch52 -p1 -b .dss1
+%patch53 -p1 -b .cmll-noasm
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 
@@ -397,6 +399,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep  4 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.7.beta3
+- temporarily disable x86_64 camellia assembler code (#521127)
+
 * Mon Aug 31 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.6.beta3
 - fix openssl dgst -dss1 (#520152)
 



From than at fedoraproject.org  Fri Sep  4 12:22:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 12:22:14 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-CVE-2009-2702.patch, NONE,
	1.1 kdelibs.spec, 1.513, 1.514
Message-ID: <20090904122214.2505B11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30156

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-CVE-2009-2702.patch 
Log Message:
security fix for -CVE-2009-2702


kdelibs-4.3.1-CVE-2009-2702.patch:
 kopenssl.cpp        |    9 +++++++++
 kopenssl.h          |    6 +++++-
 ksslcertificate.cpp |    4 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-CVE-2009-2702.patch ---
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopenssl.cpp
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp	2008-10-23 01:05:00.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-04 14:09:22.000000000 +0200
@@ -196,6 +196,7 @@
 static X509_NAME *(*K_X509_NAME_new)() = 0L;
 static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
 static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
 static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
 
 #endif
@@ -530,6 +531,7 @@
       K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
 #endif
    }
 
@@ -1577,6 +1579,13 @@
    return 0L;
 }
 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
 STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
   return 0L;
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl.h
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.h	2009-05-19 14:06:53.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-04 14:09:22.000000000 +0200
@@ -589,13 +589,17 @@
     */
    void ASN1_INTEGER_free(ASN1_INTEGER *x);
 
-
    /*
     *  ASN1_STRING_data
     */
    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
    /*
+    * ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
     *
     */
    int OBJ_obj2nid(ASN1_OBJECT *o);
diff -Nur kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp
--- kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp	2009-01-16 16:07:05.000000000 +0100
+++ kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp	2009-09-04 14:09:22.000000000 +0200
@@ -1305,7 +1305,9 @@
         }
 
         QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
-        if (!s.isEmpty()) {
+        if (!s.isEmpty()  &&
+                /* skip subjectAltNames with embedded NULs */
+                s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
             rc += s;
         }
     }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -p -r1.513 -r1.514
--- kdelibs.spec	2 Sep 2009 17:57:44 -0000	1.513
+++ kdelibs.spec	4 Sep 2009 12:22:13 -0000	1.514
@@ -4,17 +4,13 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
 %{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
-%else
-Name: kdelibs4
-%endif
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -41,12 +37,8 @@ Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
-%if "%{name}" == "kdelibs"
 Requires: kdelibs-common
-%endif
-%if 0%{?fedora} >= 9
 Requires: hunspell
-%endif
 Requires: phonon%{?_isa} >= %{phonon_ver} 
 Requires: soprano%{?_isa} >= %{soprano_ver} 
 Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
@@ -87,6 +79,9 @@ Patch22: kdelibs-4.3.0-bookmarks.patch
 # upstream
 # 4.3 branch
 
+# security fix
+Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
+
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
 #Requires: qt4%{?_isa} >= %{_qt4_version}
@@ -96,10 +91,6 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
-%if 0%{?fedora} < 9
-# we don't want a hard dependency on aspell on F9+, use enchant only
-BuildRequires: aspell-devel
-%endif
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
@@ -146,13 +137,11 @@ Provides: kross(qtscript) = %{version}-%
 %description
 Libraries for the K Desktop Environment 4.
 
-%if "%{name}" == "kdelibs"
 %package common
 Group: System Environment/Libraries
 Summary: Common files for KDE 3 and KDE 4 libraries
 %description common
 This package includes the common files for the KDE 3 and KDE 4 libraries.
-%endif
 
 %package devel
 Group: Development/Libraries
@@ -162,10 +151,8 @@ Conflicts: kdebase-runtime < 4.2.90
 Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
-%endif
 Requires: cmake >= 2.6.2-3
 Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
@@ -185,14 +172,7 @@ Summary: KDE 4 API documentation
 # Not strictly required -- Rex
 # Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 Requires: kde-filesystem
-%if "%{name}" != "kdelibs4"
 Provides: kdelibs4-apidocs = %{version}-%{release}
-#else
-# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
-# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be
-# worth it anyway.
-#Provides: kdelibs-apidocs = 6:%{version}-%{release}
-%endif
 
 %description apidocs
 This package includes the KDE 4 API documentation in HTML
@@ -218,6 +198,8 @@ format for easy browsing.
 # upstream patches
 # 4.3
 
+# security fix
+%patch200 -p1 -b .CVE-2009-2702
 
 %build
 
@@ -402,6 +384,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- security fix for -CVE-2009-2702
+
 * Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
 - Patch for kde#160679
 



From than at fedoraproject.org  Fri Sep  4 12:25:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 12:25:54 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-CVE-2009-2702.patch, NONE,
	1.1 kdelibs.spec, 1.494, 1.495
Message-ID: <20090904122554.C8AD011C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30780

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-CVE-2009-2702.patch 
Log Message:
security fix for -CVE-2009-2702



kdelibs-4.3.1-CVE-2009-2702.patch:
 kopenssl.cpp        |    9 +++++++++
 kopenssl.h          |    6 +++++-
 ksslcertificate.cpp |    4 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-CVE-2009-2702.patch ---
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopenssl.cpp
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp	2008-10-23 01:05:00.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-04 14:09:22.000000000 +0200
@@ -196,6 +196,7 @@
 static X509_NAME *(*K_X509_NAME_new)() = 0L;
 static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
 static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
 static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
 
 #endif
@@ -530,6 +531,7 @@
       K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
 #endif
    }
 
@@ -1577,6 +1579,13 @@
    return 0L;
 }
 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
 STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
   return 0L;
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl.h
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.h	2009-05-19 14:06:53.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-04 14:09:22.000000000 +0200
@@ -589,13 +589,17 @@
     */
    void ASN1_INTEGER_free(ASN1_INTEGER *x);
 
-
    /*
     *  ASN1_STRING_data
     */
    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
    /*
+    * ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
     *
     */
    int OBJ_obj2nid(ASN1_OBJECT *o);
diff -Nur kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp
--- kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp	2009-01-16 16:07:05.000000000 +0100
+++ kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp	2009-09-04 14:09:22.000000000 +0200
@@ -1305,7 +1305,9 @@
         }
 
         QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
-        if (!s.isEmpty()) {
+        if (!s.isEmpty()  &&
+                /* skip subjectAltNames with embedded NULs */
+                s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
             rc += s;
         }
     }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- kdelibs.spec	2 Sep 2009 18:01:35 -0000	1.494
+++ kdelibs.spec	4 Sep 2009 12:25:54 -0000	1.495
@@ -4,17 +4,13 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
 %{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
-%else
-Name: kdelibs4
-%endif
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -41,12 +37,8 @@ Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
-%if "%{name}" == "kdelibs"
 Requires: kdelibs-common
-%endif
-%if 0%{?fedora} >= 9
 Requires: hunspell
-%endif
 Requires: phonon%{?_isa} >= %{phonon_ver} 
 Requires: soprano%{?_isa} >= %{soprano_ver} 
 Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
@@ -80,12 +72,16 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
+Patch21: kdelibs-4.3.1-ossl-1.x.patch
 # patch to fix keditbookmarks crash (kde#160679)
 Patch22: kdelibs-4.3.0-bookmarks.patch
 
 # upstream
 # 4.3 branch
 
+# security fix
+Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
+
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
 #Requires: qt4%{?_isa} >= %{_qt4_version}
@@ -95,10 +91,6 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
-%if 0%{?fedora} < 9
-# we don't want a hard dependency on aspell on F9+, use enchant only
-BuildRequires: aspell-devel
-%endif
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
@@ -145,13 +137,11 @@ Provides: kross(qtscript) = %{version}-%
 %description
 Libraries for the K Desktop Environment 4.
 
-%if "%{name}" == "kdelibs"
 %package common
 Group: System Environment/Libraries
 Summary: Common files for KDE 3 and KDE 4 libraries
 %description common
 This package includes the common files for the KDE 3 and KDE 4 libraries.
-%endif
 
 %package devel
 Group: Development/Libraries
@@ -161,10 +151,8 @@ Conflicts: kdebase-runtime < 4.2.90
 Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
-%endif
 Requires: cmake >= 2.6.2-3
 Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
@@ -184,14 +172,7 @@ Summary: KDE 4 API documentation
 # Not strictly required -- Rex
 # Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 Requires: kde-filesystem
-%if "%{name}" != "kdelibs4"
 Provides: kdelibs4-apidocs = %{version}-%{release}
-#else
-# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
-# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be
-# worth it anyway.
-#Provides: kdelibs-apidocs = 6:%{version}-%{release}
-%endif
 
 %description apidocs
 This package includes the KDE 4 API documentation in HTML
@@ -211,11 +192,14 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
+%patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
 
 # upstream patches
 # 4.3
 
+# security fix
+%patch200 -p1 -b .CVE-2009-2702
 
 %build
 
@@ -400,11 +384,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- security fix for -CVE-2009-2702
+
 * Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
 - Patch for kde#160679
 
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- openssl-1.0 build fixes
 
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - BR: xz-devel



From than at fedoraproject.org  Fri Sep  4 12:27:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 12:27:04 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-CVE-2009-2702.patch, NONE,
	1.1 kdelibs.spec, 1.440, 1.441
Message-ID: <20090904122704.ADCA411C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31103

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-CVE-2009-2702.patch 
Log Message:
security fix for -CVE-2009-2702


kdelibs-4.3.1-CVE-2009-2702.patch:
 kopenssl.cpp        |    9 +++++++++
 kopenssl.h          |    6 +++++-
 ksslcertificate.cpp |    4 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-CVE-2009-2702.patch ---
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopenssl.cpp
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp	2008-10-23 01:05:00.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-04 14:09:22.000000000 +0200
@@ -196,6 +196,7 @@
 static X509_NAME *(*K_X509_NAME_new)() = 0L;
 static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
 static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
 static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
 
 #endif
@@ -530,6 +531,7 @@
       K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
 #endif
    }
 
@@ -1577,6 +1579,13 @@
    return 0L;
 }
 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
 STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
   return 0L;
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl.h
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.h	2009-05-19 14:06:53.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-04 14:09:22.000000000 +0200
@@ -589,13 +589,17 @@
     */
    void ASN1_INTEGER_free(ASN1_INTEGER *x);
 
-
    /*
     *  ASN1_STRING_data
     */
    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
    /*
+    * ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
     *
     */
    int OBJ_obj2nid(ASN1_OBJECT *o);
diff -Nur kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp
--- kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp	2009-01-16 16:07:05.000000000 +0100
+++ kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp	2009-09-04 14:09:22.000000000 +0200
@@ -1305,7 +1305,9 @@
         }
 
         QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
-        if (!s.isEmpty()) {
+        if (!s.isEmpty()  &&
+                /* skip subjectAltNames with embedded NULs */
+                s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
             rc += s;
         }
     }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -p -r1.440 -r1.441
--- kdelibs.spec	2 Sep 2009 18:57:49 -0000	1.440
+++ kdelibs.spec	4 Sep 2009 12:27:04 -0000	1.441
@@ -4,17 +4,13 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
 %{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
-%else
-Name: kdelibs4
-%endif
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -41,12 +37,8 @@ Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
-%if "%{name}" == "kdelibs"
 Requires: kdelibs-common
-%endif
-%if 0%{?fedora} >= 9
 Requires: hunspell
-%endif
 Requires: phonon%{?_isa} >= %{phonon_ver} 
 Requires: soprano%{?_isa} >= %{soprano_ver} 
 Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
@@ -80,12 +72,16 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
+Patch21: kdelibs-4.3.1-ossl-1.x.patch
 # patch to fix keditbookmarks crash (kde#160679)
 Patch22: kdelibs-4.3.0-bookmarks.patch
 
 # upstream
 # 4.3 branch
 
+# security fix
+Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
+
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
 #Requires: qt4%{?_isa} >= %{_qt4_version}
@@ -95,10 +91,6 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
-%if 0%{?fedora} < 9
-# we don't want a hard dependency on aspell on F9+, use enchant only
-BuildRequires: aspell-devel
-%endif
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
@@ -145,13 +137,11 @@ Provides: kross(qtscript) = %{version}-%
 %description
 Libraries for the K Desktop Environment 4.
 
-%if "%{name}" == "kdelibs"
 %package common
 Group: System Environment/Libraries
 Summary: Common files for KDE 3 and KDE 4 libraries
 %description common
 This package includes the common files for the KDE 3 and KDE 4 libraries.
-%endif
 
 %package devel
 Group: Development/Libraries
@@ -161,10 +151,8 @@ Conflicts: kdebase-runtime < 4.2.90
 Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
-%endif
 Requires: cmake >= 2.6.2-3
 Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
@@ -184,14 +172,7 @@ Summary: KDE 4 API documentation
 # Not strictly required -- Rex
 # Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 Requires: kde-filesystem
-%if "%{name}" != "kdelibs4"
 Provides: kdelibs4-apidocs = %{version}-%{release}
-#else
-# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
-# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be
-# worth it anyway.
-#Provides: kdelibs-apidocs = 6:%{version}-%{release}
-%endif
 
 %description apidocs
 This package includes the KDE 4 API documentation in HTML
@@ -211,11 +192,14 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
+%patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
 
 # upstream patches
 # 4.3
 
+# security fix
+%patch200 -p1 -b .CVE-2009-2702
 
 %build
 
@@ -400,11 +384,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- security fix for -CVE-2009-2702
+
 * Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
 - Patch for kde#160679
 
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- openssl-1.0 build fixes
 
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - BR: xz-devel



From jnovy at fedoraproject.org  Fri Sep  4 12:27:17 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  4 Sep 2009 12:27:17 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-configfix.patch, NONE, 1.1 .cvsignore,
	1.57, 1.58 netpbm-10.35-svgtopam.patch, 1.2, 1.3 netpbm.spec,
	1.144, 1.145 sources, 1.61, 1.62
Message-ID: <20090904122717.5603611C0082@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31163

Modified Files:
	.cvsignore netpbm-10.35-svgtopam.patch netpbm.spec sources 
Added Files:
	netpbm-10.35-configfix.patch 
Log Message:
* Fri Sep  4 2009 Jindrich Novy <jnovy at redhat.com> 10.35.67-1
- update to 10.35.67
- fix configuration


netpbm-10.35-configfix.patch:
 configure.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-10.35-configfix.patch ---
diff -up netpbm-10.35.67/buildtools/configure.pl.configfix netpbm-10.35.67/buildtools/configure.pl
--- netpbm-10.35.67/buildtools/configure.pl.configfix	2009-09-04 13:56:59.000000000 +0200
+++ netpbm-10.35.67/buildtools/configure.pl	2009-09-04 14:16:48.000000000 +0200
@@ -1893,7 +1893,7 @@ if ($platform eq "GNU") {
         # We don't know what to do here.  We used to (before 10.20) just
         # just assume the compiler was gcc.  We know that the gcc stuff
         # above does NOT work for HP native compiler.
-        push(@config_mk, "LDSHLIB =\n");
+        push(@Makefile_config, "LDSHLIB =\n");
     }
 } elsif ($platform eq "AIX") {
     push(@Makefile_config, 'LDFLAGS = -L /usr/pubsw/lib', "\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	29 Jul 2009 11:37:51 -0000	1.57
+++ .cvsignore	4 Sep 2009 12:27:16 -0000	1.58
@@ -1 +1 @@
-netpbm-10.35.66.tar.bz2
+netpbm-10.35.67.tar.bz2

netpbm-10.35-svgtopam.patch:
 Makefile |    4 ----
 1 file changed, 4 deletions(-)

Index: netpbm-10.35-svgtopam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-10.35-svgtopam.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netpbm-10.35-svgtopam.patch	29 Jul 2009 12:38:18 -0000	1.2
+++ netpbm-10.35-svgtopam.patch	4 Sep 2009 12:27:17 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up netpbm-10.35.58/converter/other/Makefile.svgtopam netpbm-10.35.58/converter/other/Makefile
---- netpbm-10.35.58/converter/other/Makefile.svgtopam	2009-01-19 09:23:58.000000000 +0100
-+++ netpbm-10.35.58/converter/other/Makefile	2009-03-23 13:17:22.000000000 +0100
+diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile
+--- netpbm-10.35.67/converter/other/Makefile.svgtopam	2009-09-04 13:57:06.000000000 +0200
++++ netpbm-10.35.67/converter/other/Makefile	2009-09-04 14:09:00.000000000 +0200
 @@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
    BINARIES += pnmtops
  endif


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- netpbm.spec	29 Jul 2009 12:38:18 -0000	1.144
+++ netpbm.spec	4 Sep 2009 12:27:17 -0000	1.145
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.66
+Version: 10.35.67
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -31,6 +31,7 @@ Patch22: netpbm-10.35-pnmmontagefix.patc
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
 Patch29: netpbm-10.35-svgtopam.patch
+Patch30: netpbm-10.35-configfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -92,6 +93,7 @@ netpbm-progs.  You'll also need to insta
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
 %patch29 -p1 -b .svgtopam
+%patch30 -p1 -b .configfix
 
 %build
 ./configure <<EOF
@@ -217,6 +219,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Sep  4 2009 Jindrich Novy <jnovy at redhat.com> 10.35.67-1
+- update to 10.35.67
+- fix configuration
+
 * Wed Jul 29 2009 Jindrich Novy <jnovy at redhat.com> 10.35.66-1
 - update to 10.35.66
 - sync svgatopam patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	29 Jul 2009 11:37:51 -0000	1.61
+++ sources	4 Sep 2009 12:27:17 -0000	1.62
@@ -1 +1 @@
-bb8d716535f9359fb95bcafa81b7304b  netpbm-10.35.66.tar.bz2
+6d9b4ec5ffbbb42cd63c94b010694194  netpbm-10.35.67.tar.bz2



From tuxbrewr at fedoraproject.org  Fri Sep  4 12:43:30 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Fri,  4 Sep 2009 12:43:30 +0000 (UTC)
Subject: rpms/quassel/devel .cvsignore, 1.8, 1.9 quassel.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20090904124330.47D3811C0082@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2162

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
Release candidate 1 for v0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 Apr 2009 19:35:46 -0000	1.8
+++ .cvsignore	4 Sep 2009 12:43:29 -0000	1.9
@@ -1 +1 @@
-quassel-0.4.1.tar.bz2
+quassel-0.5-rc1.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- quassel.spec	27 Jul 2009 02:39:53 -0000	1.12
+++ quassel.spec	4 Sep 2009 12:43:29 -0000	1.13
@@ -1,12 +1,12 @@
 Name:    quassel
-Summary: QT4 Based distrubuted IRC system
-Version: 0.4.1
-Release: 3%{?dist}
+Summary: A modern distrubuted IRC system
+Version: 0.5
+Release: 0.1.rc1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
 URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
+Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2
 Source1: %{name}.desktop
 Source2: %{name}core.desktop
 Source3: %{name}client.desktop
@@ -39,7 +39,7 @@ Group: Applications/Internet
 Quassel client 
 
 %prep
-%setup -q -n quassel-%{version}
+%setup -q -n quassel-0.5-rc1
 
 %build
 
@@ -108,6 +108,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Thu Sep 03 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5-0.1.rc1
+- New release candidate
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Apr 2009 19:35:46 -0000	1.8
+++ sources	4 Sep 2009 12:43:29 -0000	1.9
@@ -1 +1 @@
-bf89e3ff2e12c64d9cf8b1445e46039f  quassel-0.4.1.tar.bz2
+472408317a0e99d659ee10a2a6c9e1bf  quassel-0.5-rc1.tar.bz2



From than at fedoraproject.org  Fri Sep  4 12:48:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 12:48:11 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs-3.5.10-CVE-2009-2702.patch, NONE,
	1.1 kdelibs3.spec, 1.67, 1.68
Message-ID: <20090904124811.CBF0711C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2917

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-CVE-2009-2702.patch 
Log Message:
* fix for CVE-2009-2702
* drop support fedora <10


kdelibs-3.5.10-CVE-2009-2702.patch:
 kopenssl.cc        |    9 +++++++++
 kopenssl.h         |    5 +++++
 ksslcertificate.cc |    4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.10-CVE-2009-2702.patch ---
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc kdelibs-3.5.4/kio/kssl/kopenssl.cc
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc	2009-08-31 20:50:12.000000000 +0200
+++ kdelibs-3.5.4/kio/kssl/kopenssl.cc	2009-08-31 21:46:47.000000000 +0200
@@ -196,6 +196,7 @@ static int (*K_X509_NAME_add_entry_by_tx
 static X509_NAME *(*K_X509_NAME_new)() = 0L;
 static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
 static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
 static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
 
 #endif
@@ -498,6 +499,7 @@ KConfig *cfg;
       K_X509_NAME_new = (X509_NAME *(*)()) _cryptoLib->symbol("X509_NAME_new");
       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) _cryptoLib->symbol("X509_REQ_set_subject_name");
       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_length");
 #endif
    }
 
@@ -1549,6 +1551,13 @@ unsigned char *KOpenSSLProxy::ASN1_STRIN
    return 0L;
 }
 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
 STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
   return 0L;
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.h kdelibs-3.5.4/kio/kssl/kopenssl.h
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.h	2006-07-22 10:16:39.000000000 +0200
+++ kdelibs-3.5.4/kio/kssl/kopenssl.h	2009-08-31 21:46:47.000000000 +0200
@@ -622,6 +622,11 @@ public:
    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
    /*
+    *  ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
     *  
     */
    int OBJ_obj2nid(ASN1_OBJECT *o);
diff -pruN kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc kdelibs-3.5.4/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc	2006-01-19 18:06:12.000000000 +0100
+++ kdelibs-3.5.4/kio/kssl/ksslcertificate.cc	2009-08-31 21:54:38.000000000 +0200
@@ -1099,7 +1099,9 @@ QStringList KSSLCertificate::subjAltName
 		}
 
 		QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
-		if (!s.isEmpty()) {
+		if (!s.isEmpty()  &&
+				/* skip subjectAltNames with embedded NULs */
+				s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
 			rc += s;
 		}
 	}


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kdelibs3.spec	3 Sep 2009 12:44:07 -0000	1.67
+++ kdelibs3.spec	4 Sep 2009 12:48:11 -0000	1.68
@@ -8,13 +8,7 @@
 
 %define arts 1
 %define arts_ev 8:1.5.10
-
-%if 0%{?fedora} > 8
 %define qt3 qt3
-%else
-%define qt3_epoch 1:
-%define qt3 qt
-%endif
 %define qt3_version 3.3.8b
 %define qt3_ev %{?qt3_epoch}%{qt3_version} 
 # unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
@@ -36,18 +30,11 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 14%{?dist}
+Release: 15%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
 Provides: kdelibs = 6:%{version}-%{release}
-%else
-Name: kdelibs
-Epoch: 6
-Obsoletes: kdelibs3 < %{version}-%{release}
-Provides: kdelibs3 = %{version}-%{release}
-%endif
 
 License: LGPLv2
 Url: http://www.kde.org/
@@ -108,6 +95,8 @@ Patch202: kdelibs-3.5.4-CVE-2009-1687.pa
 Patch203: kdelibs-3.5.4-CVE-2009-1690.patch
 # fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
 Patch204: kdelibs-3.5.10-cve-2009-1698.patch
+# fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
+Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 
 #{?arts:Requires: arts >= %{arts_ev}}
 #Requires: %{qt3} >= %{qt3_ev}
@@ -116,22 +105,18 @@ Requires: hicolor-icon-theme
 Requires: kde-settings >= 3.5
 %endif
 Requires: kde-filesystem
-%if "%{name}" != "kdelibs"
 Requires: kdelibs-common
-%endif
 Requires: redhat-menus
 Requires: shadow-utils
 BuildRequires: sudo
 Requires(hint): sudo
 
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define   libkdnssd libkdnssd
 # omit for now, may contribute to http://bugzilla.redhat.com/441222 
 #Requires: %{libkdnssd}
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
-%endif
 
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
@@ -163,24 +148,16 @@ BuildRequires: libart_lgpl-devel
 BuildRequires: bzip2-devel
 BuildRequires: libtiff-devel
 BuildRequires: libacl-devel libattr-devel
-%if 0%{?fedora} >= 9
 BuildRequires: enchant-devel
 Requires: hunspell
-%else
-BuildRequires: aspell-devel
-%endif
 BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
 %define _with_libutempter 1
 BuildRequires: libutempter-devel
-%else
-BuildRequires: utempter
-%endif
 BuildRequires: findutils
 BuildRequires: jasper-devel
 BuildRequires: OpenEXR-devel
@@ -211,13 +188,8 @@ kimgio (image manipulation).
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE 3 applications.
-%if "%{name}" == "kdelibs"
-Obsoletes: kdelibs3-devel < %{version}-%{release}
-Provides:  kdelibs3-devel = %{version}-%{release}
-%else
 Obsoletes: kdelibs-devel < 6:%{version}-%{release}
 Provides:  kdelibs-devel = 6:%{version}-%{release}
-%endif
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{qt3}-devel
 Requires: openssl-devel
@@ -231,15 +203,9 @@ applications for KDE 3.
 Group: Development/Documentation
 Summary: KDE 3 API documentation.
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}
-%if "%{name}" == "kdelibs"
-Provides: kdelibs3-apidocs = %{version}-%{release}
-%else
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
-%endif
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 
 %description apidocs
 This package includes the KDE 3 API documentation in HTML
@@ -266,16 +232,12 @@ format for easy browsing
 %patch43 -p1 -b .lang
 %patch45 -p1 -b .xdg-autostart
 %patch46 -p1 -b .kate-vhdl
-%if 0%{?fedora} >= 9
 %patch48 -p1 -b .kspell
 %patch49 -p1 -b .kspell2
 %patch50 -p1 -b .no-ispell
-%endif
 %patch51 -p1 -b .cupsserverbin
 %patch52 -p1 -b .KDE3
-%if "%{name}" != "kdelibs"
 %patch53 -p1 -b .drkonqi-kde4
-%endif
 %patch54 -p1 -b .flock-redefinition
 %patch55 -p1 -b .latex-syntax
 
@@ -289,6 +251,7 @@ format for easy browsing
 %patch202 -p1 -b .cve-2009-1687
 %patch203 -p1 -b .cve-2009-1690
 %patch204 -p1 -b .cve-2009-1698
+%patch205 -p1 -b .cve-2009-2702
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -331,11 +294,7 @@ export DO_NOT_COMPILE="libkscreensaver"
    --enable-sendfile \
    --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
    --with-alsa \
-%if 0%{?fedora} >= 9
    --without-aspell \
-%else
-   --with-aspell \
-%endif
    --without-hspell \
    --disable-libfam \
    --enable-dnotify \
@@ -384,13 +343,6 @@ popd
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
 
-%if "%{name}" == "kdelibs"
-# menus
-mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
-mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
-   %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
-%endif
-
 # Use hicolor-icon-theme rpm/pkg instead (#178319)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 
@@ -426,7 +378,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.
 rm -f %{buildroot}%{_libdir}/libkdnssd.la
 %{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
 
-%if "%{name}" != "kdelibs"
 # remove conflicts with kdelibs-4
 rm -f %{buildroot}%{_bindir}/checkXML
 rm -f %{buildroot}%{_bindir}/ksvgtopng
@@ -484,8 +435,6 @@ rm -f %{buildroot}%{_bindir}/preparetips
 # don't show kresources
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
 
-%endif
-
 %if 0%{?include_crystalsvg} == 0
 # remove all crystalsvg icons for now
 rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
@@ -600,15 +549,7 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/servicetypes/*
 %ghost %{_datadir}/services/ksycoca
 %{_docdir}/HTML/en/kspell
-%if "%{name}" == "kdelibs"
-%{_sysconfdir}/xdg/menus/*.menu
-%{_datadir}/autostart/*
-# include also the conflicting file in kdelibs fedora < 9
-%{_docdir}/HTML/en/common
-%{_datadir}/locale/all_languages
-%else
 %{_docdir}/HTML/en/common/*
-%endif
 %if 0%{?include_crystalsvg}
 %{_datadir}/icons/crystalsvg/
 %endif
@@ -616,12 +557,6 @@ touch --no-create %{_datadir}/icons/crys
 %files devel
 %defattr(-,root,root,-)
 # include also the conflicting file in kdelibs-devel fedora < 9
-%if "%{name}" == "kdelibs"
-%{_bindir}/checkXML
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/preparetips
-%endif
 %{_bindir}/dcopidl*
 %{_bindir}/kconfig_compiler
 %{_bindir}/makekdewidgets
@@ -640,6 +575,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-15
+- fix for CVE-2009-2702
+
 * Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-14
 - kde.(sh|csh): drop KDE_IS_PRELINKED (workaround bug #515539)
 



From nhorman at fedoraproject.org  Fri Sep  4 12:54:26 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri,  4 Sep 2009 12:54:26 +0000 (UTC)
Subject: rpms/kexec-tools/F-11 kexec-tools.spec, 1.135, 1.136 mkdumprd, 1.28,
	1.29
Message-ID: <20090904125426.0D8DD11C0082@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4162

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz521186


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/kexec-tools.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- kexec-tools.spec	31 Aug 2009 12:33:01 -0000	1.135
+++ kexec-tools.spec	4 Sep 2009 12:54:25 -0000	1.136
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@ done
 
 
 %changelog
+* Fri Sep 04 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-15
+- Fix inclusion of stata_nv in initramfs (bz 521186)
+
 * Mon Aug 31 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-14
 - Update firstboot so it works properly (bz 508167)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/mkdumprd,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mkdumprd	27 Aug 2009 19:58:57 -0000	1.28
+++ mkdumprd	4 Sep 2009 12:54:25 -0000	1.29
@@ -1077,6 +1077,17 @@ if [ -n "$CORE_COLLECTOR" -a ! -e /sys/k
 fi
 
 #include extra user-specified modules for kdump initrd
+#EXTRA HACK:
+#sata_nv doesn't seem to have any path for me to detect it in sys
+#nor does it seem to wind up listed in any module dep chain 
+#so lets just check for it here via lsmod, and if we find it, assume we need it
+#
+lsmod | grep -q sata_nv
+if [ $? == 0 ]
+then
+   extra_kdump_mods="$extra_kdump_mods stata_nv"
+fi 
+
 for n in $extra_kdump_mods; do
     findmodule $n
 done



From rrakus at fedoraproject.org  Fri Sep  4 12:59:22 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri,  4 Sep 2009 12:59:22 +0000 (UTC)
Subject: rpms/bash/devel bash-4.0-nobits.patch, NONE, 1.1 bash.spec, 1.187,
	1.188
Message-ID: <20090904125922.9470D11C0082@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5642

Modified Files:
	bash.spec 
Added Files:
	bash-4.0-nobits.patch 
Log Message:
check if interp section is NOBITS. define Recycles pids

bash-4.0-nobits.patch:
 execute_cmd.c |  111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 107 insertions(+), 4 deletions(-)

--- NEW FILE bash-4.0-nobits.patch ---
diff -up bash-4.0/execute_cmd.c.nobits bash-4.0/execute_cmd.c
--- bash-4.0/execute_cmd.c.nobits	2009-08-11 11:53:38.000000000 +0200
+++ bash-4.0/execute_cmd.c	2009-08-14 16:18:18.000000000 +0200
@@ -4747,6 +4747,7 @@ shell_execve (command, args, env)
 	      && memcmp (sample, ELFMAG, SELFMAG) == 0)
 	    {
 	      off_t offset = -1;
+              int dynamic_nobits = 0;
 
 	      /* It is an ELF file.  Now determine whether it is dynamically
 		 linked and if yes, get the offset of the interpreter
@@ -4756,13 +4757,61 @@ shell_execve (command, args, env)
 		{
 		  Elf32_Ehdr ehdr;
 		  Elf32_Phdr *phdr;
-		  int nphdr;
+                  Elf32_Shdr *shdr;
+		  int nphdr, nshdr;
 
 		  /* We have to copy the data since the sample buffer
 		     might not be aligned correctly to be accessed as
 		     an Elf32_Ehdr struct.  */
 		  memcpy (&ehdr, sample, sizeof (Elf32_Ehdr));
 
+		  nshdr = ehdr.e_shnum;
+		  shdr = (Elf32_Shdr *) malloc (nshdr * ehdr.e_shentsize);
+                  
+		  if (shdr != NULL)
+		    {
+#ifdef HAVE_PREAD
+		      sample_len = pread (fd, shdr, nshdr * ehdr.e_shentsize,
+					  ehdr.e_shoff);
+#else
+		      if (lseek (fd, ehdr.e_shoff, SEEK_SET) != -1)
+			sample_len = read (fd, shdr,
+					   nshdr * ehdr.e_shentsize);
+		      else
+			sample_len = -1;
+#endif
+		      if (sample_len == nshdr * ehdr.e_shentsize)
+                        {
+                          char *strings = (char *) malloc (shdr[ehdr.e_shstrndx].sh_size);
+                          if (strings != NULL)
+                            {
+#ifdef HAVE_PREAD
+		              sample_len = pread (fd, strings,
+                                             shdr[ehdr.e_shstrndx].sh_size,
+					     shdr[ehdr.e_shstrndx].sh_offset);
+#else
+		              if (lseek (fd, shdr[ehdr.e_shstrndx].sh_offset,
+                                         SEEK_SET) != -1)
+			        sample_len = read (fd, strings,
+			  		       shdr[ehdr.e_shstrndx].sh_size);
+		              else
+			        sample_len = -1;
+#endif
+                              if (sample_len == shdr[ehdr.e_shstrndx].sh_size)
+			        while (nshdr-- > 0)
+                                  if (strcmp (strings + shdr[nshdr].sh_name,
+                                              ".interp") == 0 &&
+                                      shdr[nshdr].sh_type == SHT_NOBITS)
+                                    {
+                                      dynamic_nobits++;
+                                      break;
+                                    }
+                              free (strings);
+                            }
+                        }
+		      free (shdr);
+		    }
+
 		  nphdr = ehdr.e_phnum;
 		  phdr = (Elf32_Phdr *) malloc (nphdr * ehdr.e_phentsize);
 		  if (phdr != NULL)
@@ -4792,13 +4841,60 @@ shell_execve (command, args, env)
 		{
 		  Elf64_Ehdr ehdr;
 		  Elf64_Phdr *phdr;
-		  int nphdr;
+                  Elf64_Shdr *shdr;
+		  int nphdr, nshdr;
 
 		  /* We have to copy the data since the sample buffer
 		     might not be aligned correctly to be accessed as
 		     an Elf64_Ehdr struct.  */
 		  memcpy (&ehdr, sample, sizeof (Elf64_Ehdr));
 
+		  nshdr = ehdr.e_shnum;
+		  shdr = (Elf64_Shdr *) malloc (nshdr * ehdr.e_shentsize);
+		  if (shdr != NULL)
+		    {
+#ifdef HAVE_PREAD
+		      sample_len = pread (fd, shdr, nshdr * ehdr.e_shentsize,
+					  ehdr.e_shoff);
+#else
+		      if (lseek (fd, ehdr.e_shoff, SEEK_SET) != -1)
+			sample_len = read (fd, shdr,
+					   nshdr * ehdr.e_shentsize);
+		      else
+			sample_len = -1;
+#endif
+		      if (sample_len == nshdr * ehdr.e_shentsize)
+                        {
+                          char *strings = (char *) malloc (shdr[ehdr.e_shstrndx].sh_size);
+                          if (strings != NULL)
+                            {
+#ifdef HAVE_PREAD
+		              sample_len = pread (fd, strings,
+                                             shdr[ehdr.e_shstrndx].sh_size,
+					     shdr[ehdr.e_shstrndx].sh_offset);
+#else
+		              if (lseek (fd, shdr[ehdr.e_shstrndx].sh_offset,
+                                         SEEK_SET) != -1)
+			        sample_len = read (fd, strings,
+			  		       shdr[ehdr.e_shstrndx].sh_size);
+		              else
+			        sample_len = -1;
+#endif
+                              if (sample_len == shdr[ehdr.e_shstrndx].sh_size)
+			        while (nshdr-- > 0)
+                                  if (strcmp (strings + shdr[nshdr].sh_name,
+                                              ".interp") == 0 &&
+                                      shdr[nshdr].sh_type == SHT_NOBITS)
+                                    {
+                                      dynamic_nobits++;
+                                      break;
+                                    }
+                              free (strings);
+                            }
+                        }
+		      free (shdr);
+		    }
+
 		  nphdr = ehdr.e_phnum;
 		  phdr = (Elf64_Phdr *) malloc (nphdr * ehdr.e_phentsize);
 		  if (phdr != NULL)
@@ -4858,8 +4954,15 @@ shell_execve (command, args, env)
 		    {
 		      close (fd);
 		      errno = i;
-		      sys_error ("%s: %s: bad ELF interpreter", command,
-				 interp);
+                      if (dynamic_nobits > 0)
+                        {
+                          sys_error ("%s: bad ELF interpreter", command);
+                        }
+                      else
+                        {
+		          sys_error ("%s: %s: bad ELF interpreter", command,
+				     interp);
+                        }
 		      free (interp);
 		      return (EX_NOEXEC);
 		    }


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- bash.spec	26 Aug 2009 14:53:31 -0000	1.187
+++ bash.spec	4 Sep 2009 12:59:22 -0000	1.188
@@ -74,6 +74,9 @@ Patch118: bash-tty-tests.patch
 # 518644, alloc memory for key in associative array creation
 Patch122: bash-4.0-key_alloc.patch
 
+# 484809, check if interp section is NOBITS
+Patch123: bash-4.0-nobits.patch
+
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -154,6 +157,7 @@ This package contains documentation file
 #%patch120 -p1 -b .no_debug_output
 #%patch121 -p1 -b .pipelines_handling
 %patch122 -p1 -b .key_alloc
+%patch123 -p1 -b .nobits
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -161,8 +165,11 @@ echo %{release} > _patchlevel
 %build
 autoconf
 %configure --with-bash-malloc=no --with-afs
-make "CPPFLAGS=-D_GNU_SOURCE `getconf LFS_CFLAGS`"
-#make "CPPFLAGS=-DUSE_POSIX_GLOB_LIBRARY -D_GNU_SOURCE `getconf LFS_CFLAGS`"
+
+# Recycles pids is neccessary. When bash's last fork's pid was X
+# and new fork's pid is also X, bash has to wait for this same pid.
+# Without Recycles pids bash will not wait.
+make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS `getconf LFS_CFLAGS`"
 %check
 make check
 
@@ -317,6 +324,10 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Sep 04 2009 Roman Rakus <rrakus at redhat.com> - 4.0.28-3
+- check if interp section is NOBITS
+- define Recycles pids
+
 * Wed Aug 26 2009 Roman Rakus <rrakus at redhat.com> - 4.0.28-2
 - alloc memory for key in creation associative array (#518644)
 



From rrakus at fedoraproject.org  Fri Sep  4 13:04:17 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri,  4 Sep 2009 13:04:17 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.188,1.189
Message-ID: <20090904130417.71DF511C0082@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6781

Modified Files:
	bash.spec 
Log Message:
Fixed release tag


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- bash.spec	4 Sep 2009 12:59:22 -0000	1.188
+++ bash.spec	4 Sep 2009 13:04:17 -0000	1.189
@@ -5,7 +5,7 @@
 Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash



From mnagy at fedoraproject.org  Fri Sep  4 13:07:00 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri,  4 Sep 2009 13:07:00 +0000 (UTC)
Subject: rpms/bind-dyndb-ldap/F-11 bind-dyndb-ldap-reconnection.patch, NONE, 
	1.1 bind-dyndb-ldap.spec, 1.3, 1.4
Message-ID: <20090904130700.9589611C0082@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-serv7211

Modified Files:
	bind-dyndb-ldap.spec 
Added Files:
	bind-dyndb-ldap-reconnection.patch 
Log Message:
* Fri Sep 04 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.4.a1
- fix reconnection to the LDAP server


bind-dyndb-ldap-reconnection.patch:
 ldap_helper.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bind-dyndb-ldap-reconnection.patch ---
diff -up bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.reconnection bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c
--- bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.reconnection	2009-09-04 14:45:52.088622308 +0200
+++ bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c	2009-09-04 14:55:25.643684393 +0200
@@ -1521,10 +1521,11 @@ ldap_connect(ldap_instance_t *ldap_inst)
 	LDAP_OPT_CHECK(ret, "failed to set timeout: %s", ldap_err2string(ret));
 	*/
 
+	if (ldap_inst->handle != NULL)
+		ldap_unbind_ext_s(ldap_inst->handle, NULL, NULL);
 	ldap_inst->handle = ld;
-	ldap_reconnect(ldap_inst);
 
-	return ISC_R_SUCCESS;
+	return ldap_reconnect(ldap_inst);
 
 cleanup:
 
@@ -1636,11 +1637,10 @@ handle_connection_error(ldap_instance_t 
 		*result = ISC_R_SUCCESS;
 		ldap_inst->tries = 0;
 		return 0;
-	} else if (err_code == LDAP_SERVER_DOWN) {
+	} else if (err_code == LDAP_SERVER_DOWN || err_code == LDAP_CONNECT_ERROR) {
 		if (ldap_inst->tries == 0)
 			log_error("connection to the LDAP server was lost");
-		*result = ldap_reconnect(ldap_inst);
-		if (*result == ISC_R_SUCCESS)
+		if (ldap_connect(ldap_inst) == ISC_R_SUCCESS)
 			return 1;
 	} else {
 		err_string = ldap_err2string(err_code);


Index: bind-dyndb-ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/bind-dyndb-ldap/F-11/bind-dyndb-ldap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bind-dyndb-ldap.spec	31 Aug 2009 09:11:33 -0000	1.3
+++ bind-dyndb-ldap.spec	4 Sep 2009 13:07:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bind-dyndb-ldap
 Version:        0.1.0
-Release:        0.3.a1%{?dist}
+Release:        0.4.a1%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRequires:  openldap-devel
 Requires:       bind >= 9.6.1-0.3.b1
 
 Patch0:         bind-dyndb-ldap-bool_case.patch
+Patch1:         bind-dyndb-ldap-reconnection.patch
 
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
@@ -25,6 +26,7 @@ off of your LDAP server.
 %setup -q -n %{name}-%{version}a1
 
 %patch0 -p1 -b .bool_case
+%patch1 -p1 -b .reconnection
 
 
 %build
@@ -52,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 04 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.4.a1
+- fix reconnection to the LDAP server
+
 * Mon Aug 31 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.3.a1
 - Use uppercase boolean values (#520256)
 



From simo at fedoraproject.org  Fri Sep  4 13:14:10 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Fri,  4 Sep 2009 13:14:10 +0000 (UTC)
Subject: rpms/samba/F-10 .cvsignore, 1.62, 1.63 samba.spec, 1.177,
	1.178 sources, 1.67, 1.68
Message-ID: <20090904131410.6CA3711C0082@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9336

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
* Fri Sep  4 2009 Simo Sorce <ssorce at redhat.com> - 3.2.14-0.35
- Update to 3.2.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	16 Jun 2009 09:38:13 -0000	1.62
+++ .cvsignore	4 Sep 2009 13:14:09 -0000	1.63
@@ -1 +1 @@
-samba-3.2.12.tar.gz
+samba-3.2.14.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- samba.spec	16 Jun 2009 11:59:40 -0000	1.177
+++ samba.spec	4 Sep 2009 13:14:10 -0000	1.178
@@ -1,5 +1,5 @@
-%define main_release 34
-%define samba_version 3.2.12
+%define main_release 35
+%define samba_version 3.2.14
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.12
+Version: 3.2.14
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -826,6 +826,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri Sep  4 2009 Simo Sorce <ssorce at redhat.com> - 3.2.14-0.35
+- Update to 3.2.14
+
 * Tue Jun 16 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.12-0.34
 - Update to 3.2.12
 - Update pam_winbind.conf file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	16 Jun 2009 11:00:20 -0000	1.67
+++ sources	4 Sep 2009 13:14:10 -0000	1.68
@@ -1 +1 @@
-67828d33f21d93e321fad5cfa823d482  samba-3.2.12.tar.gz
+6c744ab876f2199ebc432d41ecf0b743  samba-3.2.14.tar.gz



From than at fedoraproject.org  Fri Sep  4 13:15:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 13:15:47 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec, 1.205,
	1.206 kdebindings-4.2.4-fix-kpythonpluginfactory.patch, 1.1, NONE
Message-ID: <20090904131547.28ACA11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9914

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.2.4-fix-kpythonpluginfactory.patch 
Log Message:
sync



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- kdebindings.spec	1 Sep 2009 17:16:57 -0000	1.205
+++ kdebindings.spec	4 Sep 2009 13:15:46 -0000	1.206
@@ -8,11 +8,18 @@
 %define csharp 1
 %endif
 %endif
+%if 0%{?fedora}
+# FIXME: Krossfalcon doesn't build in Rawhide (Falcon 0.9.x).
+#        It's also not working properly. And there are no Falcon bindings for
+#        the libraries anyway, just the Kross backend. -- Kevin
+%if 0%{?fedora} < 12
 %define falcon 1
+%endif
 %define php 1
 %define ruby 1
 %define smoke 1
 %define java 0
+%endif
 
 %define pykde4_akonadi 1
 %define pyqt4_version 4.5.2
@@ -29,7 +36,7 @@
 
 Name: kdebindings
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -43,8 +50,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdebindings-qyoto-examples.patch
 # workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
 Patch1:  kdebindings-4.2.85-old-PyQt4.patch
-# make the Python plugin factory work without python-devel
-Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
 
 ## upstream patches
 
@@ -55,13 +60,13 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+%if 0%{?fedora} && 0%{?fedora} < 12
 BuildRequires:  polkit-qt-devel
+%endif
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
-%if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.4
-%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
@@ -250,9 +255,6 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-## Manually speciify PYTHON_LIBRARIES below in lieu of
-## a better, working, upstreamable patch
-#patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
 
@@ -305,6 +307,12 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if !0%{?fedora} || 0%{?fedora} >= 12
+# zap polkit-qt stuff which gets installed even without polkit-qt available
+rm -rf %{buildroot}%{_kde4_datadir}/sip/PyKDE4/polkitqt/
+rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples/polkitqtExamples/
+%endif
+
 # HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
 rm -fv %{buildroot}%{_bindir}/pykdeuic4
 mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
@@ -507,8 +515,18 @@ fi
 
 
 %changelog
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- also disable polkit-qt on EL6+
+- also remove polkit-qt sip files and examples on F12+/EL6+
+
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
+- only (temporarily) disable Falcon on F12+
+- drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
+- remove unused (commented out) patch
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- temporarily disable Falcon bindings (build fails with Falcon 0.9.x)
 
 * Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
 - re-enable php bindings (rawhide)


--- kdebindings-4.2.4-fix-kpythonpluginfactory.patch DELETED ---



From than at fedoraproject.org  Fri Sep  4 13:16:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 13:16:47 +0000 (UTC)
Subject: rpms/kdebindings/F-10 kdebindings.spec, 1.165,
	1.166 kdebindings-4.2.4-fix-kpythonpluginfactory.patch, 1.1, NONE
Message-ID: <20090904131647.89D8611C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10328

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.2.4-fix-kpythonpluginfactory.patch 
Log Message:
drop kdebindings-4.2.4-fix-kpythonpluginfactory.patch



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- kdebindings.spec	1 Sep 2009 17:16:56 -0000	1.165
+++ kdebindings.spec	4 Sep 2009 13:16:47 -0000	1.166
@@ -8,11 +8,18 @@
 %define csharp 1
 %endif
 %endif
+%if 0%{?fedora}
+# FIXME: Krossfalcon doesn't build in Rawhide (Falcon 0.9.x).
+#        It's also not working properly. And there are no Falcon bindings for
+#        the libraries anyway, just the Kross backend. -- Kevin
+%if 0%{?fedora} < 12
 %define falcon 1
+%endif
 %define php 1
 %define ruby 1
 %define smoke 1
 %define java 0
+%endif
 
 %define pykde4_akonadi 1
 %define pyqt4_version 4.5.2
@@ -29,7 +36,7 @@
 
 Name: kdebindings
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -43,8 +50,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdebindings-qyoto-examples.patch
 # workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
 Patch1:  kdebindings-4.2.85-old-PyQt4.patch
-# make the Python plugin factory work without python-devel
-Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
 
 ## upstream patches
 
@@ -55,13 +60,13 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+%if 0%{?fedora} && 0%{?fedora} < 12
 BuildRequires:  polkit-qt-devel
+%endif
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
-%if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.4
-%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
@@ -250,9 +255,6 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-## Manually speciify PYTHON_LIBRARIES below in lieu of
-## a better, working, upstreamable patch
-#patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
 
@@ -305,6 +307,12 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if !0%{?fedora} || 0%{?fedora} >= 12
+# zap polkit-qt stuff which gets installed even without polkit-qt available
+rm -rf %{buildroot}%{_kde4_datadir}/sip/PyKDE4/polkitqt/
+rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples/polkitqtExamples/
+%endif
+
 # HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
 rm -fv %{buildroot}%{_bindir}/pykdeuic4
 mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
@@ -507,8 +515,18 @@ fi
 
 
 %changelog
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- also disable polkit-qt on EL6+
+- also remove polkit-qt sip files and examples on F12+/EL6+
+
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
+- only (temporarily) disable Falcon on F12+
+- drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
+- remove unused (commented out) patch
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- temporarily disable Falcon bindings (build fails with Falcon 0.9.x)
 
 * Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
 - re-enable php bindings (rawhide)


--- kdebindings-4.2.4-fix-kpythonpluginfactory.patch DELETED ---



From than at fedoraproject.org  Fri Sep  4 13:19:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 13:19:48 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.64,1.65 sources,1.25,1.26
Message-ID: <20090904131948.5180B11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11023

Modified Files:
	kde-l10n.spec sources 
Log Message:
4.3.1



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- kde-l10n.spec	5 Aug 2009 15:46:12 -0000	1.64
+++ kde-l10n.spec	4 Sep 2009 13:19:47 -0000	1.65
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -941,6 +941,7 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
 %lang(ca) %{_datadir}/locale/ca/entry.desktop
 %lang(ca) %{_kde4_appsdir}/khangman/ca.txt
+%lang(ca) %{_kde4_appsdir}/ktuberling/sounds/ca*
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
 %lang(ca) %{_kde4_docdir}/HTML/ca
@@ -1394,7 +1395,6 @@ rm -rf %{buildroot}
 %lang(sr) %{_kde4_docdir}/HTML/sr at latin
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/*
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr at latin/*
-%lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/*
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
@@ -1498,6 +1498,9 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Aug 2009 15:46:12 -0000	1.25
+++ sources	4 Sep 2009 13:19:48 -0000	1.26
@@ -1,56 +1,56 @@
-97be5e3b2f06b86dcd2a3bdc4a9db55c  kde-l10n-ar-4.3.0.tar.bz2
-fb0a71d21cf32e48a28916d365b4cd96  kde-l10n-bg-4.3.0.tar.bz2
-26164201b1d8b6c922385353f2a7aefb  kde-l10n-bn_IN-4.3.0.tar.bz2
-1f9e2f387083be475ec995c0e965b1cf  kde-l10n-ca-4.3.0.tar.bz2
-f19c3a3bfae24f4caf98a40f6bed7463  kde-l10n-csb-4.3.0.tar.bz2
-8d8ec27742416e134b2990abbd9af14b  kde-l10n-cs-4.3.0.tar.bz2
-b81c512af946a1e365c2eada3d82e4e0  kde-l10n-da-4.3.0.tar.bz2
-c7ca5df8998b4ae0977bc706db86d89f  kde-l10n-de-4.3.0.tar.bz2
-24b9e6117c254a7eb42bb7ac3ee5956e  kde-l10n-el-4.3.0.tar.bz2
-1596bbb2848517bba0cf50854de47e89  kde-l10n-en_GB-4.3.0.tar.bz2
-34dc196b2395e3a3223346cf2dafde5a  kde-l10n-es-4.3.0.tar.bz2
-aeb0683e93853f67c50ba2fcd1e4a41c  kde-l10n-et-4.3.0.tar.bz2
-f513bfa2c570f733bb36279b06d96136  kde-l10n-eu-4.3.0.tar.bz2
-dc151141386e6e1af9dc2b405dd8a9d9  kde-l10n-fi-4.3.0.tar.bz2
-faa1b6b4d9640c9a45f0e86a5af64091  kde-l10n-fr-4.3.0.tar.bz2
-145deb5a130537b5abd8c75c316f88a5  kde-l10n-ga-4.3.0.tar.bz2
-fde9f9726edf1ba1a32302ea285a1bf5  kde-l10n-gl-4.3.0.tar.bz2
-fdda752dc37f1957662c8c8eb5fb581c  kde-l10n-gu-4.3.0.tar.bz2
-f6ca255a2759ac90a1dbef609d0f173e  kde-l10n-he-4.3.0.tar.bz2
-ad1bd358a3bf4a515e95607edfdde4c9  kde-l10n-hi-4.3.0.tar.bz2
-ba442f81bc3ed72710e5ea1c44c2949d  kde-l10n-hu-4.3.0.tar.bz2
-40e82eea13e31644bf3982ab56595d18  kde-l10n-is-4.3.0.tar.bz2
-7974d9d51286c0bbe3ce9201cea05372  kde-l10n-it-4.3.0.tar.bz2
-e0bc5aecab2dab8a32a7a379c3bda98c  kde-l10n-ja-4.3.0.tar.bz2
-c007430e5839c943c27d2c08a3271c01  kde-l10n-kk-4.3.0.tar.bz2
-4cde7eb586388fb3268aecc901c2f297  kde-l10n-km-4.3.0.tar.bz2
-e08b0161309fc03c0178a357f45c38e0  kde-l10n-kn-4.3.0.tar.bz2
-9a10bf30852acd34040c6fa8fcf1bc27  kde-l10n-ko-4.3.0.tar.bz2
-80dbde92c9cc2a3b18ddc8f8e6bf6228  kde-l10n-ku-4.3.0.tar.bz2
-0f7d011ce2e22f92e7e814445cf6ff97  kde-l10n-lt-4.3.0.tar.bz2
-e097c2d2be217ae29cb769504356281c  kde-l10n-lv-4.3.0.tar.bz2
-2eda87bfb1490736fc0bd245177b015e  kde-l10n-mai-4.3.0.tar.bz2
-853109465d2dc4031f0cd729775cca55  kde-l10n-mk-4.3.0.tar.bz2
-953f5f1d4cbb785cc4d8ef4a488c6661  kde-l10n-ml-4.3.0.tar.bz2
-c8d80300e921f31eca1ab8ea1de85ceb  kde-l10n-mr-4.3.0.tar.bz2
-cfe753a7bebfda9f5f6f25399d8dad0c  kde-l10n-nb-4.3.0.tar.bz2
-b7b453507e58788503835fec4eddd5a9  kde-l10n-nds-4.3.0.tar.bz2
-9118bfb78b280b0228f4f299420f98ea  kde-l10n-nl-4.3.0.tar.bz2
-f6863912c5d4d326097e1f995299dbc1  kde-l10n-nn-4.3.0.tar.bz2
-a533709989a31c15600ddf9a3e3a7301  kde-l10n-pa-4.3.0.tar.bz2
-25fb4028a7bb2000b06363e23efec62d  kde-l10n-pl-4.3.0.tar.bz2
-0020f01a730b5511712a89e13a1d4d76  kde-l10n-pt_BR-4.3.0.tar.bz2
-257a995ca6c0adaab8024445dbce848f  kde-l10n-pt-4.3.0.tar.bz2
-f29614843f53950f87efe76fdb05d3d1  kde-l10n-ro-4.3.0.tar.bz2
-5bc404cea173009d5a817685ca61bcad  kde-l10n-ru-4.3.0.tar.bz2
-24945e807ad3703f546a7f6787cb0345  kde-l10n-sk-4.3.0.tar.bz2
-02117baab6317032245d6ae9f958eb45  kde-l10n-sl-4.3.0.tar.bz2
-26338c314a2a3da58f93e8f606b185c2  kde-l10n-sr-4.3.0.tar.bz2
-7499b0fb6ddbb10c2f2e0fb0e88cb097  kde-l10n-sv-4.3.0.tar.bz2
-539ee71a082043ba788bf6c18a75d7d2  kde-l10n-tg-4.3.0.tar.bz2
-2c5dd52012d3e21eaefde4211bee2d1c  kde-l10n-th-4.3.0.tar.bz2
-0d163e01436737a8f4b74d99527997a2  kde-l10n-tr-4.3.0.tar.bz2
-43be454febc2f9ca48b66fd5ce057898  kde-l10n-uk-4.3.0.tar.bz2
-76bc9dbac978806a7cd73a53fdbe8b69  kde-l10n-wa-4.3.0.tar.bz2
-7d0ddb25d6f6e21858b7811bfbd61458  kde-l10n-zh_CN-4.3.0.tar.bz2
-ce2a8abf6d8a43a4823ba2e19ad05649  kde-l10n-zh_TW-4.3.0.tar.bz2
+c8c1693b21bb3bde8903247288fd3859  kde-l10n-ar-4.3.1.tar.bz2
+fdc30435d4ac28b6113e9add14d728f3  kde-l10n-bg-4.3.1.tar.bz2
+c95e4fbb0ef37dfebedb7e0df62c9683  kde-l10n-bn_IN-4.3.1.tar.bz2
+18cf7a34ce6d7ffa4c38a56cb17e0fbb  kde-l10n-ca-4.3.1.tar.bz2
+bf81e4c48b250d3c8f1ecbfb80377a59  kde-l10n-csb-4.3.1.tar.bz2
+62d5a25f8f3cc2b2004525ecd69716a8  kde-l10n-cs-4.3.1.tar.bz2
+ec96cfdb8516e4d2db83a65bf403a421  kde-l10n-da-4.3.1.tar.bz2
+d379f16c94661c8068b068f8f58d1d40  kde-l10n-de-4.3.1.tar.bz2
+8ac584b59a437082a57e7be3d473f90e  kde-l10n-el-4.3.1.tar.bz2
+6968cf5e2a49aa21758115051c5f4940  kde-l10n-en_GB-4.3.1.tar.bz2
+31b3f07ce55dc8aae6bec971f338bcf3  kde-l10n-es-4.3.1.tar.bz2
+0dae18323c2c4ea560fd7bc25ecddffb  kde-l10n-et-4.3.1.tar.bz2
+eecc074d5328fb1429a9d1ac36bf96f0  kde-l10n-eu-4.3.1.tar.bz2
+34bd78b5686ab86335b2074468a95822  kde-l10n-fi-4.3.1.tar.bz2
+f6479abd82fafc1b32660d724a20cd35  kde-l10n-fr-4.3.1.tar.bz2
+e61c44e6f25efc33c02b1af0fc61076b  kde-l10n-ga-4.3.1.tar.bz2
+9104d134a008c1a0e610084139768a27  kde-l10n-gl-4.3.1.tar.bz2
+3134ea1fa9069e735ae884ec53ff51fa  kde-l10n-gu-4.3.1.tar.bz2
+e7c36e7bfac29b6f35e5f9f595bd3fee  kde-l10n-he-4.3.1.tar.bz2
+e6ef88ac651f31527fde274030fe29ae  kde-l10n-hi-4.3.1.tar.bz2
+f535c3f52fe6fd6dd62f47cf3b050c72  kde-l10n-hu-4.3.1.tar.bz2
+1ffcfc820005647e0a005e263a9f1805  kde-l10n-is-4.3.1.tar.bz2
+66db81f855de8c62c077361dab4eeb1c  kde-l10n-it-4.3.1.tar.bz2
+15e9b5a45a6236139342151e2a80b6cc  kde-l10n-ja-4.3.1.tar.bz2
+7673863d17d0c8b959eff3e8cef7eb5c  kde-l10n-kk-4.3.1.tar.bz2
+1edb34c62a7267f2e0ab221f16c87f97  kde-l10n-km-4.3.1.tar.bz2
+f9d545f3adbf0917dce523555319d6cd  kde-l10n-kn-4.3.1.tar.bz2
+a1bc1560b7c20d2e1bd9e3004b2a75f7  kde-l10n-ko-4.3.1.tar.bz2
+8e471b1e2af1c6cf4ee2c94fe0e61068  kde-l10n-ku-4.3.1.tar.bz2
+f22f07e005140407de1c91f5e8c6b014  kde-l10n-lt-4.3.1.tar.bz2
+870daf8a524c2540bf68b7db0a40b418  kde-l10n-lv-4.3.1.tar.bz2
+16ab057fbe49091a1b1b165c68748c63  kde-l10n-mai-4.3.1.tar.bz2
+225c1583a846661569e43073164de493  kde-l10n-mk-4.3.1.tar.bz2
+2098d129f0f337436ddfa8deec1fb01a  kde-l10n-ml-4.3.1.tar.bz2
+f9fb45491de0c96399cd0032939b051b  kde-l10n-mr-4.3.1.tar.bz2
+7c61e71082eb4f5ac795a7de4b7d2901  kde-l10n-nb-4.3.1.tar.bz2
+c6ad03ce2427d9729ff4cd64c6451ade  kde-l10n-nds-4.3.1.tar.bz2
+0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
+20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
+b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
+695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
+57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
+3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
+656297b8627cf9bc1db089654c674d32  kde-l10n-ru-4.3.1.tar.bz2
+b096baa157d4bcf5f01f8a6d5a1ee405  kde-l10n-sk-4.3.1.tar.bz2
+f1019fbba6989d90b3512bab1bb3a436  kde-l10n-sl-4.3.1.tar.bz2
+08835b959267532a05de9805ff07935a  kde-l10n-sr-4.3.1.tar.bz2
+02168b49698842860329b3de9ff19487  kde-l10n-sv-4.3.1.tar.bz2
+1eb1ca133761be4ff4ce3d0e7f256c97  kde-l10n-tg-4.3.1.tar.bz2
+555af7ceff07e1aaa15f7e0c2a8cf2cc  kde-l10n-th-4.3.1.tar.bz2
+f705391dccc8557e0d9b874c0c2d3597  kde-l10n-tr-4.3.1.tar.bz2
+6bafe18044438254e118bb97319bff6d  kde-l10n-uk-4.3.1.tar.bz2
+8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
+44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
+2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
+7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Sep  4 13:21:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 13:21:12 +0000 (UTC)
Subject: rpms/kde-l10n/F-11 kde-l10n.spec,1.84,1.85 sources,1.29,1.30
Message-ID: <20090904132112.1549311C0082@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-serv11158

Modified Files:
	kde-l10n.spec sources 
Log Message:
4.3.1



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/kde-l10n.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- kde-l10n.spec	5 Aug 2009 15:46:13 -0000	1.84
+++ kde-l10n.spec	4 Sep 2009 13:21:11 -0000	1.85
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -941,6 +941,7 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
 %lang(ca) %{_datadir}/locale/ca/entry.desktop
 %lang(ca) %{_kde4_appsdir}/khangman/ca.txt
+%lang(ca) %{_kde4_appsdir}/ktuberling/sounds/ca*
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
 %lang(ca) %{_kde4_docdir}/HTML/ca
@@ -1394,7 +1395,6 @@ rm -rf %{buildroot}
 %lang(sr) %{_kde4_docdir}/HTML/sr at latin
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/*
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr at latin/*
-%lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/*
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
@@ -1498,6 +1498,9 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	5 Aug 2009 15:46:13 -0000	1.29
+++ sources	4 Sep 2009 13:21:11 -0000	1.30
@@ -1,56 +1,56 @@
-97be5e3b2f06b86dcd2a3bdc4a9db55c  kde-l10n-ar-4.3.0.tar.bz2
-fb0a71d21cf32e48a28916d365b4cd96  kde-l10n-bg-4.3.0.tar.bz2
-26164201b1d8b6c922385353f2a7aefb  kde-l10n-bn_IN-4.3.0.tar.bz2
-1f9e2f387083be475ec995c0e965b1cf  kde-l10n-ca-4.3.0.tar.bz2
-f19c3a3bfae24f4caf98a40f6bed7463  kde-l10n-csb-4.3.0.tar.bz2
-8d8ec27742416e134b2990abbd9af14b  kde-l10n-cs-4.3.0.tar.bz2
-b81c512af946a1e365c2eada3d82e4e0  kde-l10n-da-4.3.0.tar.bz2
-c7ca5df8998b4ae0977bc706db86d89f  kde-l10n-de-4.3.0.tar.bz2
-24b9e6117c254a7eb42bb7ac3ee5956e  kde-l10n-el-4.3.0.tar.bz2
-1596bbb2848517bba0cf50854de47e89  kde-l10n-en_GB-4.3.0.tar.bz2
-34dc196b2395e3a3223346cf2dafde5a  kde-l10n-es-4.3.0.tar.bz2
-aeb0683e93853f67c50ba2fcd1e4a41c  kde-l10n-et-4.3.0.tar.bz2
-f513bfa2c570f733bb36279b06d96136  kde-l10n-eu-4.3.0.tar.bz2
-dc151141386e6e1af9dc2b405dd8a9d9  kde-l10n-fi-4.3.0.tar.bz2
-faa1b6b4d9640c9a45f0e86a5af64091  kde-l10n-fr-4.3.0.tar.bz2
-145deb5a130537b5abd8c75c316f88a5  kde-l10n-ga-4.3.0.tar.bz2
-fde9f9726edf1ba1a32302ea285a1bf5  kde-l10n-gl-4.3.0.tar.bz2
-fdda752dc37f1957662c8c8eb5fb581c  kde-l10n-gu-4.3.0.tar.bz2
-f6ca255a2759ac90a1dbef609d0f173e  kde-l10n-he-4.3.0.tar.bz2
-ad1bd358a3bf4a515e95607edfdde4c9  kde-l10n-hi-4.3.0.tar.bz2
-ba442f81bc3ed72710e5ea1c44c2949d  kde-l10n-hu-4.3.0.tar.bz2
-40e82eea13e31644bf3982ab56595d18  kde-l10n-is-4.3.0.tar.bz2
-7974d9d51286c0bbe3ce9201cea05372  kde-l10n-it-4.3.0.tar.bz2
-e0bc5aecab2dab8a32a7a379c3bda98c  kde-l10n-ja-4.3.0.tar.bz2
-c007430e5839c943c27d2c08a3271c01  kde-l10n-kk-4.3.0.tar.bz2
-4cde7eb586388fb3268aecc901c2f297  kde-l10n-km-4.3.0.tar.bz2
-e08b0161309fc03c0178a357f45c38e0  kde-l10n-kn-4.3.0.tar.bz2
-9a10bf30852acd34040c6fa8fcf1bc27  kde-l10n-ko-4.3.0.tar.bz2
-80dbde92c9cc2a3b18ddc8f8e6bf6228  kde-l10n-ku-4.3.0.tar.bz2
-0f7d011ce2e22f92e7e814445cf6ff97  kde-l10n-lt-4.3.0.tar.bz2
-e097c2d2be217ae29cb769504356281c  kde-l10n-lv-4.3.0.tar.bz2
-2eda87bfb1490736fc0bd245177b015e  kde-l10n-mai-4.3.0.tar.bz2
-853109465d2dc4031f0cd729775cca55  kde-l10n-mk-4.3.0.tar.bz2
-953f5f1d4cbb785cc4d8ef4a488c6661  kde-l10n-ml-4.3.0.tar.bz2
-c8d80300e921f31eca1ab8ea1de85ceb  kde-l10n-mr-4.3.0.tar.bz2
-cfe753a7bebfda9f5f6f25399d8dad0c  kde-l10n-nb-4.3.0.tar.bz2
-b7b453507e58788503835fec4eddd5a9  kde-l10n-nds-4.3.0.tar.bz2
-9118bfb78b280b0228f4f299420f98ea  kde-l10n-nl-4.3.0.tar.bz2
-f6863912c5d4d326097e1f995299dbc1  kde-l10n-nn-4.3.0.tar.bz2
-a533709989a31c15600ddf9a3e3a7301  kde-l10n-pa-4.3.0.tar.bz2
-25fb4028a7bb2000b06363e23efec62d  kde-l10n-pl-4.3.0.tar.bz2
-0020f01a730b5511712a89e13a1d4d76  kde-l10n-pt_BR-4.3.0.tar.bz2
-257a995ca6c0adaab8024445dbce848f  kde-l10n-pt-4.3.0.tar.bz2
-f29614843f53950f87efe76fdb05d3d1  kde-l10n-ro-4.3.0.tar.bz2
-5bc404cea173009d5a817685ca61bcad  kde-l10n-ru-4.3.0.tar.bz2
-24945e807ad3703f546a7f6787cb0345  kde-l10n-sk-4.3.0.tar.bz2
-02117baab6317032245d6ae9f958eb45  kde-l10n-sl-4.3.0.tar.bz2
-26338c314a2a3da58f93e8f606b185c2  kde-l10n-sr-4.3.0.tar.bz2
-7499b0fb6ddbb10c2f2e0fb0e88cb097  kde-l10n-sv-4.3.0.tar.bz2
-539ee71a082043ba788bf6c18a75d7d2  kde-l10n-tg-4.3.0.tar.bz2
-2c5dd52012d3e21eaefde4211bee2d1c  kde-l10n-th-4.3.0.tar.bz2
-0d163e01436737a8f4b74d99527997a2  kde-l10n-tr-4.3.0.tar.bz2
-43be454febc2f9ca48b66fd5ce057898  kde-l10n-uk-4.3.0.tar.bz2
-76bc9dbac978806a7cd73a53fdbe8b69  kde-l10n-wa-4.3.0.tar.bz2
-7d0ddb25d6f6e21858b7811bfbd61458  kde-l10n-zh_CN-4.3.0.tar.bz2
-ce2a8abf6d8a43a4823ba2e19ad05649  kde-l10n-zh_TW-4.3.0.tar.bz2
+c8c1693b21bb3bde8903247288fd3859  kde-l10n-ar-4.3.1.tar.bz2
+fdc30435d4ac28b6113e9add14d728f3  kde-l10n-bg-4.3.1.tar.bz2
+c95e4fbb0ef37dfebedb7e0df62c9683  kde-l10n-bn_IN-4.3.1.tar.bz2
+18cf7a34ce6d7ffa4c38a56cb17e0fbb  kde-l10n-ca-4.3.1.tar.bz2
+bf81e4c48b250d3c8f1ecbfb80377a59  kde-l10n-csb-4.3.1.tar.bz2
+62d5a25f8f3cc2b2004525ecd69716a8  kde-l10n-cs-4.3.1.tar.bz2
+ec96cfdb8516e4d2db83a65bf403a421  kde-l10n-da-4.3.1.tar.bz2
+d379f16c94661c8068b068f8f58d1d40  kde-l10n-de-4.3.1.tar.bz2
+8ac584b59a437082a57e7be3d473f90e  kde-l10n-el-4.3.1.tar.bz2
+6968cf5e2a49aa21758115051c5f4940  kde-l10n-en_GB-4.3.1.tar.bz2
+31b3f07ce55dc8aae6bec971f338bcf3  kde-l10n-es-4.3.1.tar.bz2
+0dae18323c2c4ea560fd7bc25ecddffb  kde-l10n-et-4.3.1.tar.bz2
+eecc074d5328fb1429a9d1ac36bf96f0  kde-l10n-eu-4.3.1.tar.bz2
+34bd78b5686ab86335b2074468a95822  kde-l10n-fi-4.3.1.tar.bz2
+f6479abd82fafc1b32660d724a20cd35  kde-l10n-fr-4.3.1.tar.bz2
+e61c44e6f25efc33c02b1af0fc61076b  kde-l10n-ga-4.3.1.tar.bz2
+9104d134a008c1a0e610084139768a27  kde-l10n-gl-4.3.1.tar.bz2
+3134ea1fa9069e735ae884ec53ff51fa  kde-l10n-gu-4.3.1.tar.bz2
+e7c36e7bfac29b6f35e5f9f595bd3fee  kde-l10n-he-4.3.1.tar.bz2
+e6ef88ac651f31527fde274030fe29ae  kde-l10n-hi-4.3.1.tar.bz2
+f535c3f52fe6fd6dd62f47cf3b050c72  kde-l10n-hu-4.3.1.tar.bz2
+1ffcfc820005647e0a005e263a9f1805  kde-l10n-is-4.3.1.tar.bz2
+66db81f855de8c62c077361dab4eeb1c  kde-l10n-it-4.3.1.tar.bz2
+15e9b5a45a6236139342151e2a80b6cc  kde-l10n-ja-4.3.1.tar.bz2
+7673863d17d0c8b959eff3e8cef7eb5c  kde-l10n-kk-4.3.1.tar.bz2
+1edb34c62a7267f2e0ab221f16c87f97  kde-l10n-km-4.3.1.tar.bz2
+f9d545f3adbf0917dce523555319d6cd  kde-l10n-kn-4.3.1.tar.bz2
+a1bc1560b7c20d2e1bd9e3004b2a75f7  kde-l10n-ko-4.3.1.tar.bz2
+8e471b1e2af1c6cf4ee2c94fe0e61068  kde-l10n-ku-4.3.1.tar.bz2
+f22f07e005140407de1c91f5e8c6b014  kde-l10n-lt-4.3.1.tar.bz2
+870daf8a524c2540bf68b7db0a40b418  kde-l10n-lv-4.3.1.tar.bz2
+16ab057fbe49091a1b1b165c68748c63  kde-l10n-mai-4.3.1.tar.bz2
+225c1583a846661569e43073164de493  kde-l10n-mk-4.3.1.tar.bz2
+2098d129f0f337436ddfa8deec1fb01a  kde-l10n-ml-4.3.1.tar.bz2
+f9fb45491de0c96399cd0032939b051b  kde-l10n-mr-4.3.1.tar.bz2
+7c61e71082eb4f5ac795a7de4b7d2901  kde-l10n-nb-4.3.1.tar.bz2
+c6ad03ce2427d9729ff4cd64c6451ade  kde-l10n-nds-4.3.1.tar.bz2
+0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
+20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
+b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
+695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
+57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
+3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
+656297b8627cf9bc1db089654c674d32  kde-l10n-ru-4.3.1.tar.bz2
+b096baa157d4bcf5f01f8a6d5a1ee405  kde-l10n-sk-4.3.1.tar.bz2
+f1019fbba6989d90b3512bab1bb3a436  kde-l10n-sl-4.3.1.tar.bz2
+08835b959267532a05de9805ff07935a  kde-l10n-sr-4.3.1.tar.bz2
+02168b49698842860329b3de9ff19487  kde-l10n-sv-4.3.1.tar.bz2
+1eb1ca133761be4ff4ce3d0e7f256c97  kde-l10n-tg-4.3.1.tar.bz2
+555af7ceff07e1aaa15f7e0c2a8cf2cc  kde-l10n-th-4.3.1.tar.bz2
+f705391dccc8557e0d9b874c0c2d3597  kde-l10n-tr-4.3.1.tar.bz2
+6bafe18044438254e118bb97319bff6d  kde-l10n-uk-4.3.1.tar.bz2
+8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
+44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
+2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
+7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2



From rdieter at fedoraproject.org  Fri Sep  4 13:26:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  4 Sep 2009 13:26:16 +0000 (UTC)
Subject: rpms/kmymoney2/devel kmymoney2-1.0.0-no_it_locale.patch, NONE,
	1.1 kmymoney2.spec, 1.42, 1.43
Message-ID: <20090904132617.060CF11C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11955

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-1.0.0-no_it_locale.patch 
Log Message:
sync changes from EL-5 branch


kmymoney2-1.0.0-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.0-no_it_locale.patch ---
diff -up kmymoney2-1.0.0/po/Makefile.in.no_it kmymoney2-1.0.0/po/Makefile.in
--- kmymoney2-1.0.0/po/Makefile.in.no_it	2009-08-16 23:43:29.000000000 -0500
+++ kmymoney2-1.0.0/po/Makefile.in	2009-09-03 14:39:56.000000000 -0500
@@ -309,8 +309,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = ru.po it.po lt.po pt_BR.po da.po sk.po ca.po nl.po es_AR.po fi.po gl.po fr.po pl.po de.po en_GB.po es.po tr.po cs.po sv.po ro.po pt.po zh_CN.po
-GMOFILES = ru.gmo it.gmo lt.gmo pt_BR.gmo da.gmo sk.gmo ca.gmo nl.gmo es_AR.gmo fi.gmo gl.gmo fr.gmo pl.gmo de.gmo en_GB.gmo es.gmo tr.gmo cs.gmo sv.gmo ro.gmo pt.gmo zh_CN.gmo
+POFILES = ru.po lt.po pt_BR.po da.po sk.po ca.po nl.po es_AR.po fi.po gl.po fr.po pl.po de.po en_GB.po es.po tr.po cs.po sv.po ro.po pt.po zh_CN.po
+GMOFILES = ru.gmo lt.gmo pt_BR.gmo da.gmo sk.gmo ca.gmo nl.gmo es_AR.gmo fi.gmo gl.gmo fr.gmo pl.gmo de.gmo en_GB.gmo es.gmo tr.gmo cs.gmo sv.gmo ro.gmo pt.gmo zh_CN.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kmymoney2.spec	20 Aug 2009 14:03:58 -0000	1.42
+++ kmymoney2.spec	4 Sep 2009 13:26:15 -0000	1.43
@@ -1,6 +1,4 @@
 
-# FIXME/TODO: Requires aqbanking (v3?) + latest kmm_kbanking plugin.  arg. -- Rex
-#define _enable_kbanking --enable-kbanking
 %define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 
@@ -26,6 +24,9 @@ Group:	 Applications/Productivity
 Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# RHEL5's gettext doesn't grok it.po
+Patch1: kmymoney2-1.0.0-no_it_locale.patch
+
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
@@ -34,7 +35,6 @@ Provides:  kmymoney = %{version}-%{relea
 Obsoletes: kmymoney2 < 0.9.3-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-%{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: html2ps
@@ -74,6 +74,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %prep
 %setup -q -n kmymoney2-%{version}
 
+%if 0%{?rhel}
+%patch1 -p1 -b .no_it_locale
+%endif
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -84,7 +88,6 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
-  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
@@ -99,6 +102,10 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+desktop-file-install \
+  --vendor="" --dir=%{buildroot}%{_datadir}/applications/kde/ \
+  %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
+
 ## File lists
 # locale's
 %find_lang %{name}
@@ -125,7 +132,6 @@ rm -rf %{buildroot}%{_datadir}/icons/*/s
 
 
 %check 
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
 # Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
 



From than at fedoraproject.org  Fri Sep  4 13:31:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 13:31:44 +0000 (UTC)
Subject: rpms/kdemultimedia/F-11 kdemultimedia-4.2.3-noxine.patch,1.1,NONE
Message-ID: <20090904133144.115F511C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12756

Removed Files:
	kdemultimedia-4.2.3-noxine.patch 
Log Message:
drop unused patch



--- kdemultimedia-4.2.3-noxine.patch DELETED ---



From lennart at fedoraproject.org  Fri Sep  4 13:44:40 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri,  4 Sep 2009 13:44:40 +0000 (UTC)
Subject: rpms/pulseaudio/F-11
	0001-memblock-rate-limit-Pool-full-message.patch, NONE,
	1.1 0002-pacmd-handle-multi-word-commands-in-argv-properly.patch,
	NONE,
	1.1 0003-protocol-native-compare-uint64_t-variable-with-uint6.patch, 
	NONE,
	1.1 0004-proplist-allow-setting-of-zero-length-data-propertie.patch, 
	NONE,
	1.1 0005-native-make-sure-clients-cannot-trigger-an-assert-by.patch, 
	NONE, 1.1 pulseaudio.spec, 1.86, 1.87
Message-ID: <20090904134440.0FB8911C0082@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16669

Modified Files:
	pulseaudio.spec 
Added Files:
	0001-memblock-rate-limit-Pool-full-message.patch 
	0002-pacmd-handle-multi-word-commands-in-argv-properly.patch 
	0003-protocol-native-compare-uint64_t-variable-with-uint6.patch 
	0004-proplist-allow-setting-of-zero-length-data-propertie.patch 
	0005-native-make-sure-clients-cannot-trigger-an-assert-by.patch 
Log Message:
Backport 5 patches

0001-memblock-rate-limit-Pool-full-message.patch:
 memblock.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-memblock-rate-limit-Pool-full-message.patch ---
>From 05f239a74a18fbda2406e2fc306a0f6c1b764d8a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Wed, 12 Aug 2009 21:40:38 +0200
Subject: [PATCH 1/5] memblock: rate limit 'Pool full' message

---
 src/pulsecore/memblock.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c
index 6cc0ff3..cb70f27 100644
--- a/src/pulsecore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -255,7 +255,8 @@ static struct mempool_slot* mempool_allocate_slot(pa_mempool *p) {
             slot = (struct mempool_slot*) ((uint8_t*) p->memory.ptr + (p->block_size * (size_t) idx));
 
         if (!slot) {
-            pa_log_info("Pool full");
+            if (pa_log_ratelimit())
+                pa_log_debug("Pool full");
             pa_atomic_inc(&p->stat.n_pool_full);
             return NULL;
         }
-- 
1.6.4.2


0002-pacmd-handle-multi-word-commands-in-argv-properly.patch:
 pacmd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0002-pacmd-handle-multi-word-commands-in-argv-properly.patch ---
>From 81eeb0667edddf587981f99631370dbcd00be3f2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 14 Aug 2009 04:12:36 +0200
Subject: [PATCH 2/5] pacmd: handle multi word commands in argv[] properly

---
 src/utils/pacmd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index d94f266..46c44c2 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -106,7 +106,7 @@ int main(int argc, char*argv[]) {
             size_t k;
 
             k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i]));
-            memcpy(ibuf + ibuf_length, argv[1], k);
+            memcpy(ibuf + ibuf_length, argv[i], k);
             ibuf_length += k;
 
             if (ibuf_length < sizeof(ibuf)) {
-- 
1.6.4.2


0003-protocol-native-compare-uint64_t-variable-with-uint6.patch:
 protocol-native.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0003-protocol-native-compare-uint64_t-variable-with-uint6.patch ---
>From 35ccb319e6a1e8e7ada88d85ede16612c140fefe Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 27 Aug 2009 00:04:33 +0200
Subject: [PATCH 3/5] protocol-native: compare uint64_t variable with (uint64_t) -1 instead of (size_t) -1 for compat with 32bit archs

---
 src/pulsecore/protocol-native.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index aecaf71..1ac26c0 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -1283,7 +1283,8 @@ static void handle_seek(playback_stream *s, int64_t indexw) {
 
             pa_log_debug("Requesting rewind due to end of underrun.");
             pa_sink_input_request_rewind(s->sink_input,
-                                         (size_t) (s->sink_input->thread_info.underrun_for == (size_t) -1 ? 0 : s->sink_input->thread_info.underrun_for),
+                                         (size_t) (s->sink_input->thread_info.underrun_for == (uint64_t) -1 ? 0 :
+                                                   s->sink_input->thread_info.underrun_for),
                                          FALSE, TRUE, FALSE);
         }
 
-- 
1.6.4.2


0004-proplist-allow-setting-of-zero-length-data-propertie.patch:
 proplist.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE 0004-proplist-allow-setting-of-zero-length-data-propertie.patch ---
>From b10bddf99bdda3a776d5f92bcb7c07a2b16b91e0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 27 Aug 2009 05:33:45 +0200
Subject: [PATCH 4/5] proplist: allow setting of zero-length data properties

---
 src/pulse/proplist.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c
index db4c934..274f708 100644
--- a/src/pulse/proplist.c
+++ b/src/pulse/proplist.c
@@ -236,7 +236,7 @@ int pa_proplist_set(pa_proplist *p, const char *key, const void *data, size_t nb
 
     pa_assert(p);
     pa_assert(key);
-    pa_assert(data);
+    pa_assert(data || nbytes == 0);
 
     if (!property_name_valid(key))
         return -1;
@@ -249,7 +249,8 @@ int pa_proplist_set(pa_proplist *p, const char *key, const void *data, size_t nb
         pa_xfree(prop->value);
 
     prop->value = pa_xmalloc(nbytes+1);
-    memcpy(prop->value, data, nbytes);
+    if (nbytes > 0)
+        memcpy(prop->value, data, nbytes);
     ((char*) prop->value)[nbytes] = 0;
     prop->nbytes = nbytes;
 
-- 
1.6.4.2


0005-native-make-sure-clients-cannot-trigger-an-assert-by.patch:
 protocol-native.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE 0005-native-make-sure-clients-cannot-trigger-an-assert-by.patch ---
>From 9333e89f66231e64aac539c1cc0e5f8398a25a12 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Sat, 29 Aug 2009 06:11:02 +0200
Subject: [PATCH 5/5] native: make sure clients cannot trigger an assert by sending us invalid volume info

---
 src/pulsecore/protocol-native.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 1ac26c0..d52b872 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -3322,12 +3322,19 @@ static void command_set_volume(
 
     CHECK_VALIDITY(c->pstream, si || sink || source, tag, PA_ERR_NOENTITY);
 
-    if (sink)
+    if (sink) {
+        CHECK_VALIDITY(c->pstream, pa_cvolume_compatible(&volume, &sink->sample_spec), tag, PA_ERR_INVALID);
+
         pa_sink_set_volume(sink, &volume, TRUE, TRUE, TRUE);
-    else if (source)
+    } else if (source) {
+        CHECK_VALIDITY(c->pstream, pa_cvolume_compatible(&volume, &source->sample_spec), tag, PA_ERR_INVALID);
+
         pa_source_set_volume(source, &volume);
-    else if (si)
+    } else if (si) {
+        CHECK_VALIDITY(c->pstream, pa_cvolume_compatible(&volume, &si->sample_spec), tag, PA_ERR_INVALID);
+
         pa_sink_input_set_volume(si, &volume, TRUE, TRUE);
+    }
 
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
@@ -3368,7 +3375,6 @@ static void command_set_mute(
     switch (command) {
 
         case PA_COMMAND_SET_SINK_MUTE:
-
             if (idx != PA_INVALID_INDEX)
                 sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
             else
-- 
1.6.4.2



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-11/pulseaudio.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- pulseaudio.spec	28 Jul 2009 21:07:42 -0000	1.86
+++ pulseaudio.spec	4 Sep 2009 13:44:39 -0000	1.87
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	16%{?dist}
+Release:	17%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -37,6 +37,11 @@ Patch26: 0001-sample-fix-build-on-BE-arc
 Patch27: 0001-alsa-properly-convert-return-values-of-snd_strerror.patch
 Patch28: 0001-alsa-remove-debug-code.patch
 Patch29: 0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch
+Patch30: 0001-memblock-rate-limit-Pool-full-message.patch
+Patch31: 0002-pacmd-handle-multi-word-commands-in-argv-properly.patch
+Patch32: 0003-protocol-native-compare-uint64_t-variable-with-uint6.patch
+Patch33: 0004-proplist-allow-setting-of-zero-length-data-propertie.patch
+Patch34: 0005-native-make-sure-clients-cannot-trigger-an-assert-by.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -246,6 +251,11 @@ This package contains command line utili
 %patch27 -p1 
 %patch28 -p1 
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1 
+%patch32 -p1 
+%patch33 -p1 
+%patch34 -p1
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -466,6 +476,10 @@ groupadd -r pulse-access &>/dev/null || 
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Fri Sep 4 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-17
+- Backport 5 patches
+- Closes #520586
+
 * Tue Jul 28 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-16
 - Fix up patch
 



From linville at fedoraproject.org  Fri Sep  4 13:53:29 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri,  4 Sep 2009 13:53:29 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore, 1.11, 1.12 iw.spec, 1.15, 1.16 sources,
	1.11, 1.12
Message-ID: <20090904135329.6F68811C0082@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17963

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Aug 2009 19:41:37 -0000	1.11
+++ .cvsignore	4 Sep 2009 13:53:29 -0000	1.12
@@ -1 +1 @@
-iw-0.9.16.tar.bz2
+iw-0.9.17.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iw.spec	17 Aug 2009 19:41:37 -0000	1.15
+++ iw.spec	4 Sep 2009 13:53:29 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           iw
-Version:        0.9.16
+Version:        0.9.17
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-1
+- Update to 0.9.17
+
 * Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.16-1
 - Update to 0.9.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Aug 2009 19:41:37 -0000	1.11
+++ sources	4 Sep 2009 13:53:29 -0000	1.12
@@ -1 +1 @@
-775f8d1856b0856acbfc960fafe48325  iw-0.9.16.tar.bz2
+427841093ac11c5cbc025a3e13aac139  iw-0.9.17.tar.bz2



From kkofler at fedoraproject.org  Fri Sep  4 13:54:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  4 Sep 2009 13:54:49 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.68,1.69
Message-ID: <20090904135449.96A5411C0082@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18254/devel

Modified Files:
	kdelibs3.spec 
Log Message:
Remove obsolete comment.


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- kdelibs3.spec	4 Sep 2009 12:48:11 -0000	1.68
+++ kdelibs3.spec	4 Sep 2009 13:54:49 -0000	1.69
@@ -556,7 +556,6 @@ touch --no-create %{_datadir}/icons/crys
 
 %files devel
 %defattr(-,root,root,-)
-# include also the conflicting file in kdelibs-devel fedora < 9
 %{_bindir}/dcopidl*
 %{_bindir}/kconfig_compiler
 %{_bindir}/makekdewidgets



From twaugh at fedoraproject.org  Fri Sep  4 14:07:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Sep 2009 14:07:20 +0000 (UTC)
Subject: rpms/cups/devel cups-avahi.patch,1.6,1.7 cups.spec,1.515,1.516
Message-ID: <20090904140720.BF6FA11C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21485

Modified Files:
	cups-avahi.patch cups.spec 
Log Message:
* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
- Fixed the dnssd backend so that it only reports devices once avahi
  resolution has completed.  This makes it report Device IDs
  (bug #521110).


cups-avahi.patch:
 backend/dnssd.c              |  544 ++++++++++++++++++++++++++++++++++++-------
 config-scripts/cups-dnssd.m4 |   15 +
 config.h.in                  |    7 
 cups/http-support.c          |  177 +++++++++++++
 4 files changed, 657 insertions(+), 86 deletions(-)

Index: cups-avahi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-avahi.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cups-avahi.patch	28 Aug 2009 21:06:46 -0000	1.6
+++ cups-avahi.patch	4 Sep 2009 14:07:20 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
 --- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
-+++ cups-1.4.0/backend/dnssd.c	2009-08-28 21:44:27.262137662 +0100
++++ cups-1.4.0/backend/dnssd.c	2009-09-04 14:57:04.730388833 +0100
 @@ -22,6 +22,7 @@
   *   exec_backend()          - Execute the backend that corresponds to the
   *                             resolved service name.
@@ -29,17 +29,20 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  
  /*
-@@ -52,7 +64,9 @@ typedef enum
+@@ -52,7 +64,12 @@ typedef enum
  
  typedef struct
  {
 +#ifdef HAVE_DNSSD
    DNSServiceRef	ref;			/* Service reference for resolve */
 +#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int		resolved;		/* Did we resolve the device? */
++#endif /* HAVE_AVAHI */
    char		*name,			/* Service name */
  		*domain,		/* Domain name */
  		*fullName,		/* Full name */
-@@ -64,6 +78,20 @@ typedef struct
+@@ -64,6 +81,20 @@ typedef struct
  		sent;			/* Did we list the device? */
  } cups_device_t;
  
@@ -60,7 +63,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  /*
   * Local globals...
-@@ -77,6 +105,7 @@ static int		job_canceled = 0;
+@@ -77,6 +108,7 @@ static int		job_canceled = 0;
   * Local functions...
   */
  
@@ -68,7 +71,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void		browse_callback(DNSServiceRef sdRef,
  			                DNSServiceFlags flags,
  				        uint32_t interfaceIndex,
-@@ -92,12 +121,6 @@ static void		browse_local_callback(DNSSe
+@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
  					      const char *regtype,
  					      const char *replyDomain,
  					      void *context);
@@ -81,7 +84,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void		query_callback(DNSServiceRef sdRef,
  			               DNSServiceFlags flags,
  				       uint32_t interfaceIndex,
-@@ -106,9 +129,111 @@ static void		query_callback(DNSServiceRe
+@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
  				       uint16_t rrclass, uint16_t rdlen,
  				       const void *rdata, uint32_t ttl,
  				       void *context);
@@ -193,7 +196,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  /*
   * 'main()' - Browse for printers.
-@@ -119,6 +244,13 @@ main(int  argc,				/* I - Number of comm
+@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
       char *argv[])			/* I - Command-line arguments */
  {
    const char	*name;			/* Backend name */
@@ -207,7 +210,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
    DNSServiceRef	main_ref,		/* Main service reference */
  		fax_ipp_ref,		/* IPP fax service reference */
  		ipp_ref,		/* IPP service reference */
-@@ -130,12 +262,11 @@ main(int  argc,				/* I - Number of comm
+@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
  		pdl_datastream_ref,	/* AppSocket service reference */
  		printer_ref,		/* LPD service reference */
  		riousbprint_ref;	/* Remote IO service reference */
@@ -225,7 +228,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
    struct sigaction action;		/* Actions for POSIX signals */
  #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -194,6 +325,49 @@ main(int  argc,				/* I - Number of comm
+@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
    * Browse for different kinds of printers...
    */
  
@@ -275,7 +278,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
    if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
    {
      perror("ERROR: Unable to create service connection");
-@@ -245,6 +419,7 @@ main(int  argc,				/* I - Number of comm
+@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
    riousbprint_ref = main_ref;
    DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
                     "_riousbprint._tcp", NULL, browse_callback, devices);
@@ -283,7 +286,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
   /*
    * Loop until we are killed...
-@@ -252,6 +427,9 @@ main(int  argc,				/* I - Number of comm
+@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
  
    while (!job_canceled)
    {
@@ -293,7 +296,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
      FD_ZERO(&input);
      FD_SET(fd, &input);
  
-@@ -271,11 +449,35 @@ main(int  argc,				/* I - Number of comm
+@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
      }
      else
      {
@@ -329,7 +332,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
        cups_device_t *best;		/* Best matching device */
        char	device_uri[1024];	/* Device URI */
        int	count;			/* Number of queries */
-@@ -285,6 +487,7 @@ main(int  argc,				/* I - Number of comm
+@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
                 best = NULL, count = 0;
             device;
  	   device = (cups_device_t *)cupsArrayNext(devices))
@@ -337,13 +340,18 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
          if (!device->ref && !device->sent)
  	{
  	 /*
-@@ -313,14 +516,18 @@ main(int  argc,				/* I - Number of comm
+@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
  	      count ++;
            }
  	}
 -	else if (!device->sent)
 +	else
 +#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++	if (!device->resolved)
++	  continue;
++        else
++#endif /* HAVE_AVAHI */
 +	if (!device->sent)
  	{
 +#ifdef HAVE_DNSSD
@@ -357,7 +365,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
            if (!best)
  	    best = device;
-@@ -372,6 +579,7 @@ main(int  argc,				/* I - Number of comm
+@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
   * 'browse_callback()' - Browse devices.
   */
  
@@ -365,7 +373,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void
  browse_callback(
      DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +613,14 @@ browse_callback(
+@@ -405,12 +621,14 @@ browse_callback(
  
    get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
  }
@@ -380,7 +388,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void
  browse_local_callback(
      DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +666,7 @@ browse_local_callback(
+@@ -456,6 +674,7 @@ browse_local_callback(
  	  device->fullName);
    device->sent = 1;
  }
@@ -388,7 +396,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  
  /*
-@@ -528,6 +739,32 @@ exec_backend(char **argv)		/* I - Comman
+@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
    exit(CUPS_BACKEND_STOP);
  }
  
@@ -421,7 +429,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  /*
   * 'get_device()' - Create or update a device.
-@@ -550,18 +787,7 @@ get_device(cups_array_t *devices,	/* I -
+@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
    */
  
    key.name = (char *)serviceName;
@@ -441,7 +449,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
    for (device = cupsArrayFind(devices, &key);
         device;
-@@ -581,8 +807,14 @@ get_device(cups_array_t *devices,	/* I -
+@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
          free(device->domain);
  	device->domain = strdup(replyDomain);
  
@@ -456,7 +464,17 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  	free(device->fullName);
  	device->fullName = strdup(fullName);
        }
-@@ -609,7 +841,13 @@ get_device(cups_array_t *devices,	/* I -
+@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
+   device->domain   = strdup(replyDomain);
+   device->type     = key.type;
+   device->priority = 50;
++#ifdef HAVE_AVAHI
++  device->resolved = 0;
++#endif /* HAVE_AVAHI */
+ 
+   cupsArrayAdd(devices, device);
+ 
+@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
    * Set the "full name" of this service, which is used for queries...
    */
  
@@ -470,7 +488,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
    device->fullName = strdup(fullName);
  
    return (device);
-@@ -620,6 +858,7 @@ get_device(cups_array_t *devices,	/* I -
+@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
   * 'query_callback()' - Process query data.
   */
  
@@ -478,7 +496,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void
  query_callback(
      DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +878,7 @@ query_callback(
+@@ -639,7 +889,7 @@ query_callback(
  		*ptr;			/* Pointer into string */
    cups_device_t	dkey,			/* Search key */
  		*device;		/* Device */
@@ -487,7 +505,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
    fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
                    "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -673,84 +912,211 @@ query_callback(
+@@ -673,84 +923,212 @@ query_callback(
    if ((ptr = strstr(name, "._")) != NULL)
      *ptr = '\0';
  
@@ -586,13 +604,13 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
 +    * Let the main loop know to announce the device.
 +    */
 +
++    device->resolved = 1;
 +    avahi_got_callback = 1;
 +  }
    else
 -    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
 +    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
- 
--  for (device = cupsArrayFind(devices, &dkey);
++
 +  avahi_service_resolver_free (resolver);
 +}
 +
@@ -653,7 +671,8 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
 +    }
 +
 +    break;
-+
+ 
+-  for (device = cupsArrayFind(devices, &dkey);
 +  case AVAHI_BROWSER_REMOVE:
 +  case AVAHI_BROWSER_ALL_FOR_NOW:
 +  case AVAHI_BROWSER_CACHE_EXHAUSTED:
@@ -751,7 +770,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
          if (!strncasecmp(key, "usb_", 4))
  	{
  	 /*
-@@ -805,6 +1171,10 @@ query_callback(
+@@ -805,6 +1183,10 @@ query_callback(
  	  if (device->type == CUPS_DEVICE_PRINTER)
  	    device->sent = 1;
  	}
@@ -762,7 +781,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
        }
  
        if (device->device_id)
-@@ -854,11 +1224,9 @@ query_callback(
+@@ -854,11 +1236,9 @@ query_callback(
      }
    }
  
@@ -777,7 +796,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
   */
 diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
 --- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
-+++ cups-1.4.0/config.h.in	2009-08-28 21:44:27.265137528 +0100
++++ cups-1.4.0/config.h.in	2009-09-04 14:57:04.733388405 +0100
 @@ -336,6 +336,13 @@
  
  
@@ -794,7 +813,7 @@ diff -up cups-1.4.0/config.h.in.avahi cu
  
 diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
 --- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-08-28 21:44:27.263138688 +0100
++++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-09-04 14:57:04.731388902 +0100
 @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
  DNSSDLIBS=""
  DNSSD_BACKEND=""
@@ -819,7 +838,7 @@ diff -up cups-1.4.0/config-scripts/cups-
  		case "$uname" in
 diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 --- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
-+++ cups-1.4.0/cups/http-support.c	2009-08-28 21:44:27.267137550 +0100
++++ cups-1.4.0/cups/http-support.c	2009-09-04 14:57:04.736398674 +0100
 @@ -55,6 +55,11 @@
  #  include <dns_sd.h>
  #  include <poll.h>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -p -r1.515 -r1.516
--- cups.spec	1 Sep 2009 14:15:46 -0000	1.515
+++ cups.spec	4 Sep 2009 14:07:20 -0000	1.516
@@ -523,7 +523,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
+* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
+- Fixed the dnssd backend so that it only reports devices once avahi
+  resolution has completed.  This makes it report Device IDs
+  (bug #521110).
 - Fix locale code for Norwegian (bug #520379).
 
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1



From twaugh at fedoraproject.org  Fri Sep  4 14:07:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Sep 2009 14:07:55 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.516,1.517
Message-ID: <20090904140755.E567911C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21674

Modified Files:
	cups.spec 
Log Message:
Fixed bug ID.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -p -r1.516 -r1.517
--- cups.spec	4 Sep 2009 14:07:20 -0000	1.516
+++ cups.spec	4 Sep 2009 14:07:55 -0000	1.517
@@ -526,7 +526,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
 - Fixed the dnssd backend so that it only reports devices once avahi
   resolution has completed.  This makes it report Device IDs
-  (bug #521110).
+  (bug #520858).
 - Fix locale code for Norwegian (bug #520379).
 
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1



From twaugh at fedoraproject.org  Fri Sep  4 14:08:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Sep 2009 14:08:35 +0000 (UTC)
Subject: rpms/cups/F-11 cups-avahi.patch,1.6,1.7 cups.spec,1.516,1.517
Message-ID: <20090904140835.C018511C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21942

Modified Files:
	cups-avahi.patch cups.spec 
Log Message:
* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
- Fixed the dnssd backend so that it only reports devices once avahi
  resolution has completed.  This makes it report Device IDs
  (bug #520858).


cups-avahi.patch:
 backend/dnssd.c              |  544 ++++++++++++++++++++++++++++++++++++-------
 config-scripts/cups-dnssd.m4 |   15 +
 config.h.in                  |    7 
 cups/http-support.c          |  177 +++++++++++++
 4 files changed, 657 insertions(+), 86 deletions(-)

Index: cups-avahi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-avahi.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cups-avahi.patch	28 Aug 2009 21:30:05 -0000	1.6
+++ cups-avahi.patch	4 Sep 2009 14:08:35 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
 --- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
-+++ cups-1.4.0/backend/dnssd.c	2009-08-28 21:44:27.262137662 +0100
++++ cups-1.4.0/backend/dnssd.c	2009-09-04 14:57:04.730388833 +0100
 @@ -22,6 +22,7 @@
   *   exec_backend()          - Execute the backend that corresponds to the
   *                             resolved service name.
@@ -29,17 +29,20 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  
  /*
-@@ -52,7 +64,9 @@ typedef enum
+@@ -52,7 +64,12 @@ typedef enum
  
  typedef struct
  {
 +#ifdef HAVE_DNSSD
    DNSServiceRef	ref;			/* Service reference for resolve */
 +#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int		resolved;		/* Did we resolve the device? */
++#endif /* HAVE_AVAHI */
    char		*name,			/* Service name */
  		*domain,		/* Domain name */
  		*fullName,		/* Full name */
-@@ -64,6 +78,20 @@ typedef struct
+@@ -64,6 +81,20 @@ typedef struct
  		sent;			/* Did we list the device? */
  } cups_device_t;
  
@@ -60,7 +63,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  /*
   * Local globals...
-@@ -77,6 +105,7 @@ static int		job_canceled = 0;
+@@ -77,6 +108,7 @@ static int		job_canceled = 0;
   * Local functions...
   */
  
@@ -68,7 +71,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void		browse_callback(DNSServiceRef sdRef,
  			                DNSServiceFlags flags,
  				        uint32_t interfaceIndex,
-@@ -92,12 +121,6 @@ static void		browse_local_callback(DNSSe
+@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
  					      const char *regtype,
  					      const char *replyDomain,
  					      void *context);
@@ -81,7 +84,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void		query_callback(DNSServiceRef sdRef,
  			               DNSServiceFlags flags,
  				       uint32_t interfaceIndex,
-@@ -106,9 +129,111 @@ static void		query_callback(DNSServiceRe
+@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
  				       uint16_t rrclass, uint16_t rdlen,
  				       const void *rdata, uint32_t ttl,
  				       void *context);
@@ -193,7 +196,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  /*
   * 'main()' - Browse for printers.
-@@ -119,6 +244,13 @@ main(int  argc,				/* I - Number of comm
+@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
       char *argv[])			/* I - Command-line arguments */
  {
    const char	*name;			/* Backend name */
@@ -207,7 +210,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
    DNSServiceRef	main_ref,		/* Main service reference */
  		fax_ipp_ref,		/* IPP fax service reference */
  		ipp_ref,		/* IPP service reference */
-@@ -130,12 +262,11 @@ main(int  argc,				/* I - Number of comm
+@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
  		pdl_datastream_ref,	/* AppSocket service reference */
  		printer_ref,		/* LPD service reference */
  		riousbprint_ref;	/* Remote IO service reference */
@@ -225,7 +228,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
    struct sigaction action;		/* Actions for POSIX signals */
  #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -194,6 +325,49 @@ main(int  argc,				/* I - Number of comm
+@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
    * Browse for different kinds of printers...
    */
  
@@ -275,7 +278,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
    if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
    {
      perror("ERROR: Unable to create service connection");
-@@ -245,6 +419,7 @@ main(int  argc,				/* I - Number of comm
+@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
    riousbprint_ref = main_ref;
    DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
                     "_riousbprint._tcp", NULL, browse_callback, devices);
@@ -283,7 +286,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
   /*
    * Loop until we are killed...
-@@ -252,6 +427,9 @@ main(int  argc,				/* I - Number of comm
+@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
  
    while (!job_canceled)
    {
@@ -293,7 +296,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
      FD_ZERO(&input);
      FD_SET(fd, &input);
  
-@@ -271,11 +449,35 @@ main(int  argc,				/* I - Number of comm
+@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
      }
      else
      {
@@ -329,7 +332,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
        cups_device_t *best;		/* Best matching device */
        char	device_uri[1024];	/* Device URI */
        int	count;			/* Number of queries */
-@@ -285,6 +487,7 @@ main(int  argc,				/* I - Number of comm
+@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
                 best = NULL, count = 0;
             device;
  	   device = (cups_device_t *)cupsArrayNext(devices))
@@ -337,13 +340,18 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
          if (!device->ref && !device->sent)
  	{
  	 /*
-@@ -313,14 +516,18 @@ main(int  argc,				/* I - Number of comm
+@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
  	      count ++;
            }
  	}
 -	else if (!device->sent)
 +	else
 +#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++	if (!device->resolved)
++	  continue;
++        else
++#endif /* HAVE_AVAHI */
 +	if (!device->sent)
  	{
 +#ifdef HAVE_DNSSD
@@ -357,7 +365,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
            if (!best)
  	    best = device;
-@@ -372,6 +579,7 @@ main(int  argc,				/* I - Number of comm
+@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
   * 'browse_callback()' - Browse devices.
   */
  
@@ -365,7 +373,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void
  browse_callback(
      DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +613,14 @@ browse_callback(
+@@ -405,12 +621,14 @@ browse_callback(
  
    get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
  }
@@ -380,7 +388,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void
  browse_local_callback(
      DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +666,7 @@ browse_local_callback(
+@@ -456,6 +674,7 @@ browse_local_callback(
  	  device->fullName);
    device->sent = 1;
  }
@@ -388,7 +396,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  
  /*
-@@ -528,6 +739,32 @@ exec_backend(char **argv)		/* I - Comman
+@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
    exit(CUPS_BACKEND_STOP);
  }
  
@@ -421,7 +429,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
  /*
   * 'get_device()' - Create or update a device.
-@@ -550,18 +787,7 @@ get_device(cups_array_t *devices,	/* I -
+@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
    */
  
    key.name = (char *)serviceName;
@@ -441,7 +449,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
    for (device = cupsArrayFind(devices, &key);
         device;
-@@ -581,8 +807,14 @@ get_device(cups_array_t *devices,	/* I -
+@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
          free(device->domain);
  	device->domain = strdup(replyDomain);
  
@@ -456,7 +464,17 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  	free(device->fullName);
  	device->fullName = strdup(fullName);
        }
-@@ -609,7 +841,13 @@ get_device(cups_array_t *devices,	/* I -
+@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
+   device->domain   = strdup(replyDomain);
+   device->type     = key.type;
+   device->priority = 50;
++#ifdef HAVE_AVAHI
++  device->resolved = 0;
++#endif /* HAVE_AVAHI */
+ 
+   cupsArrayAdd(devices, device);
+ 
+@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
    * Set the "full name" of this service, which is used for queries...
    */
  
@@ -470,7 +488,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
    device->fullName = strdup(fullName);
  
    return (device);
-@@ -620,6 +858,7 @@ get_device(cups_array_t *devices,	/* I -
+@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
   * 'query_callback()' - Process query data.
   */
  
@@ -478,7 +496,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  static void
  query_callback(
      DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +878,7 @@ query_callback(
+@@ -639,7 +889,7 @@ query_callback(
  		*ptr;			/* Pointer into string */
    cups_device_t	dkey,			/* Search key */
  		*device;		/* Device */
@@ -487,7 +505,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
  
    fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
                    "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -673,84 +912,211 @@ query_callback(
+@@ -673,84 +923,212 @@ query_callback(
    if ((ptr = strstr(name, "._")) != NULL)
      *ptr = '\0';
  
@@ -586,13 +604,13 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
 +    * Let the main loop know to announce the device.
 +    */
 +
++    device->resolved = 1;
 +    avahi_got_callback = 1;
 +  }
    else
 -    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
 +    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
- 
--  for (device = cupsArrayFind(devices, &dkey);
++
 +  avahi_service_resolver_free (resolver);
 +}
 +
@@ -653,7 +671,8 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
 +    }
 +
 +    break;
-+
+ 
+-  for (device = cupsArrayFind(devices, &dkey);
 +  case AVAHI_BROWSER_REMOVE:
 +  case AVAHI_BROWSER_ALL_FOR_NOW:
 +  case AVAHI_BROWSER_CACHE_EXHAUSTED:
@@ -751,7 +770,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
          if (!strncasecmp(key, "usb_", 4))
  	{
  	 /*
-@@ -805,6 +1171,10 @@ query_callback(
+@@ -805,6 +1183,10 @@ query_callback(
  	  if (device->type == CUPS_DEVICE_PRINTER)
  	    device->sent = 1;
  	}
@@ -762,7 +781,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
        }
  
        if (device->device_id)
-@@ -854,11 +1224,9 @@ query_callback(
+@@ -854,11 +1236,9 @@ query_callback(
      }
    }
  
@@ -777,7 +796,7 @@ diff -up cups-1.4.0/backend/dnssd.c.avah
   */
 diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
 --- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
-+++ cups-1.4.0/config.h.in	2009-08-28 21:44:27.265137528 +0100
++++ cups-1.4.0/config.h.in	2009-09-04 14:57:04.733388405 +0100
 @@ -336,6 +336,13 @@
  
  
@@ -794,7 +813,7 @@ diff -up cups-1.4.0/config.h.in.avahi cu
  
 diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
 --- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-08-28 21:44:27.263138688 +0100
++++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-09-04 14:57:04.731388902 +0100
 @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
  DNSSDLIBS=""
  DNSSD_BACKEND=""
@@ -819,7 +838,7 @@ diff -up cups-1.4.0/config-scripts/cups-
  		case "$uname" in
 diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 --- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
-+++ cups-1.4.0/cups/http-support.c	2009-08-28 21:44:27.267137550 +0100
++++ cups-1.4.0/cups/http-support.c	2009-09-04 14:57:04.736398674 +0100
 @@ -55,6 +55,11 @@
  #  include <dns_sd.h>
  #  include <poll.h>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -p -r1.516 -r1.517
--- cups.spec	28 Aug 2009 21:30:05 -0000	1.516
+++ cups.spec	4 Sep 2009 14:08:35 -0000	1.517
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -519,6 +519,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
+- Fixed the dnssd backend so that it only reports devices once avahi
+  resolution has completed.  This makes it report Device IDs
+  (bug #520858).
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
 - 1.4.0.
 



From gerd at fedoraproject.org  Fri Sep  4 14:24:23 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Fri,  4 Sep 2009 14:24:23 +0000 (UTC)
Subject: rpms/parrot/F-12 - New directory
Message-ID: <20090904142423.B3EF811C0417@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25285/F-12

Log Message:
Directory /cvs/pkgs/rpms/parrot/F-12 added to the repository




From gerd at fedoraproject.org  Fri Sep  4 14:28:33 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Fri,  4 Sep 2009 14:28:33 +0000 (UTC)
Subject: rpms/parrot/F-12 Makefile, NONE, 1.1 import.log, NONE,
	1.1 parrot-1.x.0.patch, NONE, 1.1 parrot.spec, NONE,
	1.1 patch-1.5.0.ppc, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090904142833.8C24011C0082@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25746/F-12

Added Files:
	Makefile import.log parrot-1.x.0.patch parrot.spec 
	patch-1.5.0.ppc sources 
Log Message:
move from devel to F-12 branch



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---
parrot-1_5_0-2_fc11:F-12:parrot-1.5.0-2.fc11.src.rpm:1252074189

parrot-1.x.0.patch:
 config/gen/makefiles/parrot_pc.in |    2 +-
 lib/Parrot/Install.pm             |   10 ++++++++++
 tools/dev/install_files.pl        |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE parrot-1.x.0.patch ---
--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
+++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
@@ -163,7 +163,7 @@
             # libdir as it is typically done with automake installed packages.
             # If there is a use case to make this configurable we'll add a
             # seperate --pkgconfigdir option.
-            $filehash->{DestDirs} = ['pkgconfig', $parrotdir];
+            $filehash->{DestDirs} = ['pkgconfig'];
             return($filehash);
         },
     },
--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
+++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
@@ -7,4 +7,4 @@
 Description: virtual machine to execute bytecode for interpreted languages
 Version: @VERSION@
 Libs: -L${libdir} -lparrot @icu_shared@ @libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}@versiondir@
--- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
+++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
@@ -220,6 +220,16 @@
         else {
             next unless -e $src;
             next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+            if (-l $src) { 
+                # check if the system supports symbolic linking 
+                use Config; 
+                if ($Config{d_symlink} && $Config{d_readlink}) { 
+                # copy as symbolic link 
+                    symlink(readlink($src), $dest); 
+                    print "$dest\n"; 
+                    next; 
+                } 
+            } 
             copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
             print "$dest\n";
         }


--- NEW FILE parrot.spec ---
Name:           parrot
Version:        1.5.0
Release:        2%{?dist}
Summary:        Parrot is a virtual machine
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://www.parrot.org/

Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz

Patch1:         patch-1.5.0.ppc
%ifarch %{ix86} x86_64 ppc64
Patch0:         parrot-1.x.0.patch
%else
# The PowerPC-architecture
Patch0:         patch-1.5.0.ppc
%endif

# patches file:           tools/dev/install_files.pl
# It is responsible to have no subdirectory under pkgconfig.
#
# patches file:           config/gen/makefiles/parrot_pc.in
# So "pkg-config parrot --cflags" works correct
#
# see for upstream:       https://trac.parrot.org/parrot/ticket/509
# patched file:           lib/Parrot/Install.pm
# is to have the symlink:    libparrot.so  ->  libparrot.so.%{version}
# Without this %{_libdir}/libparrot.so would not be a symbolic link to
# %{_libdir}/libparrot.so.%{version}  

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel
BuildRequires:  ncurses-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::Simple)
BuildRequires:  ctags
BuildRequires:  openssl-devel
BuildRequires:  flex
 

%package docs
Summary:        Parrot Virtual Machine documentation
Group:          Documentation
Requires:       perl(strict)
Requires:       perl(warnings)
BuildArch:      noarch

#--

%package devel
Summary:        Parrot Virtual Machine development headers and libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

#--

%package tools
Summary:        Parrot Virtual Machine development for languages
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Pod::Simple)
Requires:       perl(File::Which) >= 0.05
Requires:       perl(Parrot::OpLib::core)
# It is necessary to have installed the package "perl-Perl-Critic" to install
# the parrot-tools
Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}
Provides:       perl(Parrot::OpLib::core) = %{version}


%description
Parrot is a virtual machine designed to efficiently compile and execute
bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
as well as variety of other languages.

#--

%description docs
Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
examples about the Parrot Virtual Machine.

#--

%description devel
Parrot Virtual Machine development headers and libraries.

#--

%description tools
Parrot Virtual Machine development files for building languages.


%prep
%setup -q
%patch0 -p0


cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' \
                            -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
EOF

%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%ifarch %{ix86} x86_64
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
%else
# The PowerPC-architecture do not build with the '-maccumulate-outgoing-args'
# option.
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
%endif

%{__perl} Configure.pl \
    --prefix=%{_usr} \
    --libdir=%{_libdir} \
    --sysconfdir=%{_sysconfdir} \
    --infodir=%{_datadir}/info \
    --mandir=%{_mandir} \
    --cc="%{__cc}" \
    --cxx=%{__cxx} \
    --optimize="$RPM_OPT_FLAGS" \
    --parrot_is_shared \
    --disable-rpath \
    --lex=%{_bindir}/flex \
    --yacc=%{_bindir}/yacc \
    --libs='-lcurses -lm'

# The LD_LIBRARY_PATH hack is needed for "miniparrot"
# to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# pbc_to_exe would not build if %{_smp_mflags} would used
make
make parrot_utils
make installable
make html


%install
rm -rf $RPM_BUILD_ROOT

# install-dev: Same as 'install' taget but also install support for 
#              language development 
make install-dev DESTDIR=$RPM_BUILD_ROOT

#Creating man-pages
%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
pod2man --section=1 --name=parrot docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot.1.gz
pod2man --section=1 --name=parrot_debugger src/parrot_debugger.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_debugger.1.gz
pod2man --section=1 --name=pbc_disassemble src/pbc_disassemble.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_disassemble.1.gz
pod2man --section=1 --name=pbc_dump src/pbc_dump.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_dump.1.gz
pod2man --section=1 --name=pbc_merge src/pbc_merge.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_merge.1.gz
pod2man --section=1 --name=parrot_config tools/build/parrot_config_c.pl | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_config.1.gz
pod2man --section=1 --name=pbc_to_exe tools/dev/pbc_to_exe.pir | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_to_exe.1.gz

%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/


# Drop the docs so rpm can pick them up itself.
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}

# Force permissions on doc directories.
find docs examples -type d -exec chmod 755 {} \;
find docs examples -type f -exec chmod 644 {} \;

# Force permissions on shared versioned libs so they get stripped.
# The parrot-install-script don't set the permissions right
# With changed permissions the dependencies will be found
find %{RPM_PAR_LIB_DIR}dynext -type f -name '*.so' -exec chmod 755 {} \;

# Remove module that should be install instead (perl(File::Which))
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/File


# Added to reduce output errors when using rpmlint

# Force permission on perl-scripts in the "tools" subdirctory
find %{RPM_PAR_LIB_DIR}tools -type f -name "*.pl" -exec chmod 755 {} \; \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
# Set path to parrot binary and Force permission
find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
    -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
    -exec chmod 755 {} \;

# Remove doc-files with zero-length
find docs/html -type f -size 0 -exec rm -f {} \;

# Set path for installed programs in docs package
find examples/json -type f -name "*.pir" \
    -exec %{__sed} -i -e '1 s&#!../../parrot&#!/usr/bin/parrot&' {} \;
find examples -type f -name "*.pl" \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/pir/befunge/t/basic.t' \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -type f -name "*.py" \
    -exec %{__sed} -i -e '1 s&#! python&#!/usr/bin/python&' {} \;
find examples -type f -name "*.rb" \
    -exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;

find examples -type f -name "*.pir" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
find examples/shootout -type f -name "random.pasm" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/01-tests.t' \
    -exec %{__sed} -i -e '1 s&#!perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/shootout/revcomp.pir' \
    -exec %{__sed} -i -e '1 s&#!parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/harness' \
    -exec %{__perl} -pi -e 's/\r$//' {} \;

find examples/languages -type f -name harness \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
for file in docs/book/pct/ch04_pge.pod docs/memory_internals.pod; do
        %{__mv} $file timestamp
        iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
        touch -r timestamp $file
done
%{__rm} -f timestamp


%check
# 'make fulltest' is done by default; it take a lot of time
export LD_LIBRARY_PATH=$( pwd )/blib/lib
FULL='full'
%{?_without_fulltest: FULL=''}
%{?!_without_tests: make ${FULL}test}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
%doc RESPONSIBLE_PARTIES TODO LICENSE
%{_bindir}/parrot
%{_libdir}/parrot/
%exclude %{_libdir}/parrot/%{version}/tools
%exclude %{_libdir}/parrot/%{version}/VERSION
%{_libdir}/libparrot.so.*
%{_mandir}/man1/parrot.1.gz

%files docs
%defattr(-,root,root,-)
%doc docs examples

%files devel
%defattr(-,root,root,-)
%{_bindir}/parrot_config
%{_bindir}/parrot_debugger
%{_bindir}/pbc_disassemble
%{_bindir}/pbc_merge
%{_bindir}/pbc_to_exe
%{_bindir}/pbc_dump
%{_includedir}/parrot
%{_libdir}/libparrot.so
%exclude %{_libdir}/libparrot.a
%{_libdir}/pkgconfig/*
%{_mandir}/man1/parrot_config.1.gz
%{_mandir}/man1/parrot_debugger.1.gz
%{_mandir}/man1/pbc_disassemble.1.gz
%{_mandir}/man1/pbc_merge.1.gz
%{_mandir}/man1/pbc_to_exe.1.gz
%{_mandir}/man1/pbc_dump.1.gz

%files tools
%defattr(-,root,root,-)
# Files for building languages
%{_libdir}/parrot/%{version}/tools/*
%{_libdir}/parrot/%{version}/VERSION
%{_usr}/src/parrot/*


%changelog
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
- rebuilt with new openssl

* Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
- new upstream version

* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
- ppc test included again
- include the necessary module Parrot::OpLib::core
- change the place of header files to /usr/include/parrot/<version>
- install the files /usr/src/parrot/*

* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
- add the new disable-rpath configure option

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add filtering Provides
- change requires for docs-subpackage
- enable test suite
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package
- added make html

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BuildRequires ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.
- Force permissions on shared libraries so rpmbuild strips them.
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.
- Add -lcurses to get readline detection to work.
- Add BuildRequires libicu-devel.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created


--- NEW FILE patch-1.5.0.ppc ---
--- ChangeLog	2009-08-18 15:29:26.000000000 +0200
+++ ChangeLog	2009-08-20 19:56:36.000000000 +0200
@@ -1,4 +1,4 @@
-#1 $Id: ChangeLog 40184 2009-07-21 08:08:33Z cotto $
+#1 $Id: ChangeLog 40625 2009-08-18 16:10:36Z whiteknight $
 
 2009.8.18     Whiteknight
     * Released 1.5.0
@@ -3817,9 +3817,9 @@
 2002-01-04 16:09  dan
 
 	* classes/: genclass.pl, perlarray.pmc, perlint.pmc, perlnum.pmc,
-	perlstring.pmc, perlundef.pmc:	- genclass.pl attempts to put $Id: ChangeLog 40184 2009-07-21 08:08:33Z cotto $
+	perlstring.pmc, perlundef.pmc:	- genclass.pl attempts to put $Id: ChangeLog 40625 2009-08-18 16:10:36Z whiteknight $
 	into generated files
-	   but the $Id: ChangeLog 40184 2009-07-21 08:08:33Z cotto $ string gets mangled when it's committed.
+	   but the $Id: ChangeLog 40625 2009-08-18 16:10:36Z whiteknight $ string gets mangled when it's committed.
 	   This patch fixes the existing .pmc files and fixes genclass.pl.
 
 	 - Makes capitalization in .pmc header match actual filenames
--- compilers/imcc/parser_util.c	2009-08-02 14:36:27.000000000 +0200
+++ compilers/imcc/parser_util.c	2009-08-20 19:56:29.000000000 +0200
@@ -8,7 +8,7 @@
  *
  * parser support functions
  *
- * $Id: parser_util.c 40268 2009-07-25 19:53:04Z whiteknight $
+ * $Id: parser_util.c 40643 2009-08-18 22:57:11Z bacek $
  *
  */
 
@@ -693,7 +693,7 @@
     IMCC_pop_parser_state(interp, yyscanner);
 
     if (!IMCC_INFO(interp)->error_code) {
-        Parrot_sub *sub_data;
+        Parrot_Sub_attributes *sub_data;
 
         /*
          * create sub PMC
--- compilers/imcc/pbc.c	2009-08-07 02:50:19.000000000 +0200
+++ compilers/imcc/pbc.c	2009-08-20 19:56:28.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002-2009, Parrot Foundation.
- * $Id: pbc.c 40414 2009-08-05 11:29:16Z bacek $
+ * $Id: pbc.c 40643 2009-08-18 22:57:11Z bacek $
  */
 
 #include "imc.h"
@@ -1205,7 +1205,7 @@
                 while (n) {
                     STRING     *lex_name;
                     const int   k = n->color;
-                    Parrot_sub *sub;
+                    Parrot_Sub_attributes *sub;
                     PARROT_ASSERT(k >= 0);
 
                     lex_name = constants[k]->u.string;
@@ -1255,7 +1255,7 @@
     subs_t      *s;
     PMC         *current;
     STRING      *cur_name;
-    Parrot_sub *sub;
+    Parrot_Sub_attributes *sub;
     size_t      len;
 
     if (!unit->outer)
@@ -1320,9 +1320,9 @@
 add_const_pmc_sub(PARROT_INTERP, ARGMOD(SymReg *r), size_t offs, size_t end)
 {
     ASSERT_ARGS(add_const_pmc_sub)
-    PMC                 *ns_pmc;
-    PMC                 *sub_pmc;
-    Parrot_sub          *sub, *outer_sub;
+    PMC                   *ns_pmc;
+    PMC                   *sub_pmc;
+    Parrot_Sub_attributes *sub, *outer_sub;
 
     const int            k            = add_const_table(interp);
     PackFile_ConstTable * const ct    = interp->code->const_table;
--- compilers/pirc/src/bcgen.c	2009-08-02 14:36:27.000000000 +0200
+++ compilers/pirc/src/bcgen.c	2009-08-20 19:56:29.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: bcgen.c 38095 2009-04-13 14:20:12Z coke $
+ * $Id: bcgen.c 40676 2009-08-20 15:11:44Z fperrad $
  * Copyright (C) 2008-2009, Parrot Foundation.
  */
 #include <stdio.h>
@@ -910,7 +910,7 @@
 {
     ASSERT_ARGS(find_outer_sub)
     PMC          *current;
-    Parrot_sub   *sub;
+    Parrot_Sub_attributes *sub;
     STRING       *cur_name;
     size_t        len;
     global_label *outersub;
@@ -1131,7 +1131,7 @@
 {
     ASSERT_ARGS(add_sub_pmc)
     PMC                   *sub_pmc;        /* the "Sub" pmc, or a variant, such as "Coroutine" */
-    Parrot_sub            *sub;
+    Parrot_Sub_attributes *sub;
     int                    subconst_index; /* index in const table for the sub pmc */
     int                    subname_index;
     int                    i;              /* for loop iterator */
--- config/gen/core_pmcs.pm	2009-07-08 02:19:09.000000000 +0200
+++ config/gen/core_pmcs.pm	2009-08-20 19:56:31.000000000 +0200
@@ -1,5 +1,5 @@
 # Copyright (C) 2001-2009, Parrot Foundation.
-# $Id: core_pmcs.pm 38777 2009-05-14 19:43:11Z petdance $
+# $Id: core_pmcs.pm 40651 2009-08-19 08:55:58Z NotFound $
 
 =head1 NAME
 
@@ -116,26 +116,20 @@
     __attribute__nonnull__(1)
     __attribute__nonnull__(2);
 
-extern void Parrot_initialize_core_pmcs(PARROT_INTERP)
+extern void Parrot_initialize_core_pmcs(PARROT_INTERP, int pass)
     __attribute__nonnull__(1);
 
-void Parrot_initialize_core_pmcs(PARROT_INTERP)
+void Parrot_initialize_core_pmcs(PARROT_INTERP, int pass)
 {
-    int pass;
-    for (pass = 0; pass <= 1; ++pass) {
-        /* first the PMC with the highest enum
-         * this reduces MMD table resize action */
+    /* first the PMC with the highest enum
+     * this reduces MMD table resize action */
 END_C
 
-    print {$OUT} "        Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
+    print {$OUT} "    Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
         foreach ( @pmcs[ -1 .. -1 ] );
-    print {$OUT} "        Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
+    print {$OUT} "    Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
         foreach ( @pmcs[ 0 .. $#pmcs - 1 ] );
     print {$OUT} <<'END_C';
-        if (!pass) {
-            parrot_global_setup_2(interp);
-        }
-    }
 }
 
 static void register_pmc(PARROT_INTERP, NOTNULL(PMC *registry), int pmc_id)
--- config/gen/platform/generic/platform_limits.h	2009-07-22 02:33:43.000000000 +0200
+++ config/gen/platform/generic/platform_limits.h	2009-08-20 19:56:31.000000000 +0200
@@ -1,6 +1,6 @@
 /*
- * $Id: platform_limits.h 40176 2009-07-21 00:33:45Z whiteknight $
- * Copyright (C) 2008, Parrot Foundation.
+ * $Id: platform_limits.h 40634 2009-08-18 21:23:45Z mikehh $
+ * Copyright (C) 2009, Parrot Foundation.
  */
 
 #ifndef PARROT_PLATFORM_GENERIC_PLATFORM_LIMITS_GUARD
@@ -14,6 +14,11 @@
 
 /* LLONG_MAX doesn't appear to be provided for some compilers of Win64, so
    try to define them here. */
+#include "parrot/has_header.h"
+#if PARROT_HAS_HEADER_LIMITS
+#  include <limits.h>
+#endif
+
 #ifdef _MSC_VER
 #  ifndef LLONG_MAX
 #    define LLONG_MAX _I64_MAX
--- config/init/defaults.pm	2009-07-28 14:52:00.000000000 +0200
+++ config/init/defaults.pm	2009-08-20 19:56:30.000000000 +0200
@@ -1,5 +1,5 @@
 # Copyright (C) 2001-2007, Parrot Foundation.
-# $Id: defaults.pm 40296 2009-07-28 03:24:55Z chromatic $
+# $Id: defaults.pm 40635 2009-08-18 21:34:54Z chromatic $
 
 =head1 NAME
 
--- CREDITS	2009-08-18 15:29:26.000000000 +0200
+++ CREDITS	2009-08-20 19:56:36.000000000 +0200
@@ -1,6 +1,6 @@
 =pod
 
-?# $Id: CREDITS 40495 2009-08-11 22:19:23Z mikehh $
+?# $Id: CREDITS 40625 2009-08-18 16:10:36Z whiteknight $
 
     Following in the steps of other open source projects that
     eventually take over the world, here is the partial list
--- DEPRECATED.pod	2009-08-15 15:06:27.000000000 +0200
+++ DEPRECATED.pod	2009-08-20 19:56:36.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: DEPRECATED.pod 40557 2009-08-15 10:41:06Z dukeleto $
+# $Id: DEPRECATED.pod 40621 2009-08-18 14:30:59Z coke $
 
 =head1 Purpose
[...4592 lines suppressed...]
+
+*/
+
+PARROT_EXPORT
+void
+Parrot_initialize_core_vtables(PARROT_INTERP)
+{
+    ASSERT_ARGS(Parrot_initialize_core_vtables)
+
+    if (! interp->vtables) {
+        parrot_alloc_vtables(interp);
+        Parrot_initialize_core_pmcs(interp, 0);
+    }
+}
+
+/*
  * Local variables:
  *   c-file-style: "parrot"
  * End:
Bin?rdateien t/native_pbc/annotations.pbc and t/native_pbc/annotations.pbc sind verschieden.
Bin?rdateien t/native_pbc/integer_1.pbc and t/native_pbc/integer_1.pbc sind verschieden.
Bin?rdateien t/native_pbc/number_1.pbc and t/native_pbc/number_1.pbc sind verschieden.
Bin?rdateien t/native_pbc/string_1.pbc and t/native_pbc/string_1.pbc sind verschieden.
--- t/op/arithmetics.t	2009-08-16 13:54:58.000000000 +0200
+++ t/op/arithmetics.t	2009-08-20 19:56:30.000000000 +0200
@@ -1,13 +1,13 @@
 #!perl
 # Copyright (C) 2001-2009, Parrot Foundation.
-# $Id: arithmetics.t 40588 2009-08-16 09:00:17Z dukeleto $
+# $Id: arithmetics.t 40671 2009-08-20 09:17:12Z dukeleto $
 
 use strict;
 use warnings;
 use lib qw( . lib ../lib ../../lib );
 
 use Test::More;
-use Parrot::Test tests => 26;
+use Parrot::Test tests => 27;
 
 # test for GMP
 use Parrot::Config;
@@ -697,6 +697,33 @@
 -Inf
 OUTPUT
 
+TODO: {
+
+local $TODO = 'rounding nan/inf gives something like -2147483648';
+pir_output_is(<<CODE,<<OUTPUT, "TT #370 Rounding inf/nan");
+.sub 'main'
+        \$N0 = 'Inf'
+        \$I0 = floor \$N0
+        say \$I0
+        \$N0 = 'NaN'
+        \$I0 = floor \$N0
+        say \$I0
+        \$N0 = 'Inf'
+        \$I0 = ceil \$N0
+        say \$I0
+        \$N0 = 'NaN'
+        \$I0 = ceil \$N0
+        say \$I0
+    .end
+CODE
+Inf
+NaN
+Inf
+NaN
+OUTPUT
+
+}
+
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4
Nur in t/op: exit.t.
--- tools/dev/nm.pl	2009-07-08 02:19:04.000000000 +0200
+++ tools/dev/nm.pl	2009-06-28 22:26:06.000000000 +0200
@@ -143,7 +143,7 @@
 $VERSION = sprintf "%d.%d", q$Revision: 37201 $ =~ /(\d+)/g;    # jhi at iki.fi;
 
 my $ME       = basename($0);
-my $RCS_DATE = q$Date: 2009-03-08 08:07:48 -0400 (Sun, 08 Mar 2009) $;
+my $RCS_DATE = q$Date: 2009-03-08 13:07:48 +0100 (So, 08. M?r 2009) $;
 
 my $nm_cmd = 'nm';
 my $nm_opt = '';
--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
+++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
@@ -163,7 +163,7 @@
             # libdir as it is typically done with automake installed packages.
             # If there is a use case to make this configurable we'll add a
             # seperate --pkgconfigdir option.
-            $filehash->{DestDirs} = ['pkgconfig', $parrotdir];
+            $filehash->{DestDirs} = ['pkgconfig'];
             return($filehash);
         },
     },
--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
+++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
@@ -7,4 +7,4 @@
 Description: virtual machine to execute bytecode for interpreted languages
 Version: @VERSION@
 Libs: -L${libdir} -lparrot @icu_shared@ @libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}@versiondir@
--- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
+++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
@@ -220,6 +220,16 @@
         else {
             next unless -e $src;
             next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+            if (-l $src) { 
+                # check if the system supports symbolic linking 
+                use Config; 
+                if ($Config{d_symlink} && $Config{d_readlink}) { 
+                # copy as symbolic link 
+                    symlink(readlink($src), $dest); 
+                    print "$dest\n"; 
+                    next; 
+                } 
+            } 
             copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
             print "$dest\n";
         }
--- /dev/null	2009-07-29 14:58:11.425144471 +0200
+++ t/op/exit.t	2009-08-20 19:56:30.000000000 +0200
@@ -0,0 +1,72 @@
+#!perl
+# Copyright (C) 2009, Parrot Foundation.
+# $Id: exit.t 40662 2009-08-19 18:02:12Z mikehh $
+
+use strict;
+use warnings;
+use lib qw( . lib ../lib ../../lib );
+
+use Test::More;
+use Parrot::Test tests => 7;
+
+=head1 NAME
+
+t/op/exit.t - Testing the exit pseudo-opcode
+
+=head1 SYNOPSIS
+
+    % prove t/op/exit.t
+
+=head1 DESCRIPTION
+
+Test both success and failure exit status.
+
+=cut
+
+pir_exit_code_is( <<'CODE', 0, 'pir exit with success' );
+.sub main
+    exit 0
+.end
+CODE
+
+pir_exit_code_is( <<'CODE', 1, 'pir exit with failure' );
+.sub main
+    exit 1
+.end
+CODE
+
+pasm_exit_code_is( <<'CODE', 1, 'pasm exit with failure' );
+    exit 1
+CODE
+
+pasm_exit_code_is( <<'CODE', 0, 'pasm exit without failure' );
+    exit 0
+CODE
+
+# If you know of a better place to put these tests, please put them there
+
+pir_exit_code_is( <<'CODE', 0, 'pir exits with success by default' );
+.sub main
+    $S0 = "cheese"
+.end
+CODE
+
+TODO: {
+    local $TODO = 'pasm exits with 1 by default';
+    pasm_exit_code_is( <<'CODE', 0, 'exit with success by default' );
+        set I0, 0
+CODE
+
+}
+TODO: {
+    local $TODO = 'pbc exits with 1 by default';
+    # Should we be using this file?
+    my $pbc = File::Spec->catfile(qw/ t native_pbc integer_1.pbc /);
+    pbc_exit_code_is($pbc, 0, 'pbc exits with 0 by default');
+}
+
+#   mode: cperl
+#   cperl-indent-level: 4
+#   fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:


--- NEW FILE sources ---
f209c337b488bfa244520d38502ef330  parrot-1.5.0.tar.gz



From nosnilmot at fedoraproject.org  Fri Sep  4 14:38:02 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Fri,  4 Sep 2009 14:38:02 +0000 (UTC)
Subject: rpms/libsilc/devel silc-toolkit-1.1.8-stringformat2.patch, NONE,
	1.1 libsilc.spec, 1.28, 1.29
Message-ID: <20090904143802.0F17011C0082@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27752/devel

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-stringformat2.patch 
Log Message:
- Backport patch to fix additional string format vulnerabilities (#515648)


silc-toolkit-1.1.8-stringformat2.patch:
 command.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-stringformat2.patch ---
From: Pekka Riikonen <priikone at silcnet.org>
Date: Fri, 7 Aug 2009 11:48:46 +0000 (+0300)
Subject: More string format fixes in silcd and client libary
X-Git-Tag: silc.toolkit.1.1.10^0
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=8cb801cf6482666818e721822ce81c81ec818908

More string format fixes in silcd and client libary
---

diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c
index 0e72368..1a4b446 100644
--- a/lib/silcclient/command.c
+++ b/lib/silcclient/command.c
@@ -956,7 +956,7 @@ SILC_FSM_STATE(silc_client_command_topic)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2144,7 +2144,7 @@ SILC_FSM_STATE(silc_client_command_kick)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2554,7 +2554,7 @@ SILC_FSM_STATE(silc_client_command_leave)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2621,7 +2621,7 @@ SILC_FSM_STATE(silc_client_command_users)
     }
 
     if (conn->client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libsilc.spec	5 Aug 2009 15:01:06 -0000	1.28
+++ libsilc.spec	4 Sep 2009 14:38:01 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 5%{dist}
+Release: 6%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -11,6 +11,7 @@ Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
 Patch3:  silc-toolkit-1.1.8-libtool.patch
 Patch4:  silc-toolkit-1.1.8-stringformat.patch
+Patch5:  silc-toolkit-1.1.8-stringformat2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -46,6 +47,7 @@ applications.
 %patch2 -p1 -b .docinst
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .stringformat
+%patch5 -p1 -b .stringformat2
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-6
+- Backport patch to fix additional string format vulnerabilities (#515648)
+
 * Wed Aug 05 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-5
 - Backport patch to fix string format vulnerability (#515648)
 



From nosnilmot at fedoraproject.org  Fri Sep  4 14:38:02 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Fri,  4 Sep 2009 14:38:02 +0000 (UTC)
Subject: rpms/libsilc/F-11 silc-toolkit-1.1.8-stringformat2.patch, NONE,
	1.1 libsilc.spec, 1.27, 1.28
Message-ID: <20090904143802.5858B11C0082@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27752/F-11

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-stringformat2.patch 
Log Message:
- Backport patch to fix additional string format vulnerabilities (#515648)


silc-toolkit-1.1.8-stringformat2.patch:
 command.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-stringformat2.patch ---
From: Pekka Riikonen <priikone at silcnet.org>
Date: Fri, 7 Aug 2009 11:48:46 +0000 (+0300)
Subject: More string format fixes in silcd and client libary
X-Git-Tag: silc.toolkit.1.1.10^0
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=8cb801cf6482666818e721822ce81c81ec818908

More string format fixes in silcd and client libary
---

diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c
index 0e72368..1a4b446 100644
--- a/lib/silcclient/command.c
+++ b/lib/silcclient/command.c
@@ -956,7 +956,7 @@ SILC_FSM_STATE(silc_client_command_topic)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2144,7 +2144,7 @@ SILC_FSM_STATE(silc_client_command_kick)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2554,7 +2554,7 @@ SILC_FSM_STATE(silc_client_command_leave)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2621,7 +2621,7 @@ SILC_FSM_STATE(silc_client_command_users)
     }
 
     if (conn->client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-11/libsilc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libsilc.spec	5 Aug 2009 15:01:06 -0000	1.27
+++ libsilc.spec	4 Sep 2009 14:38:02 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 5%{dist}
+Release: 6%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -11,6 +11,7 @@ Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
 Patch3:  silc-toolkit-1.1.8-libtool.patch
 Patch4:  silc-toolkit-1.1.8-stringformat.patch
+Patch5:  silc-toolkit-1.1.8-stringformat2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -46,6 +47,7 @@ applications.
 %patch2 -p1 -b .docinst
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .stringformat
+%patch5 -p1 -b .stringformat2
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-6
+- Backport patch to fix additional string format vulnerabilities (#515648)
+
 * Wed Aug 05 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-5
 - Backport patch to fix string format vulnerability (#515648)
 



From nosnilmot at fedoraproject.org  Fri Sep  4 14:38:02 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Fri,  4 Sep 2009 14:38:02 +0000 (UTC)
Subject: rpms/libsilc/F-10 silc-toolkit-1.1.8-stringformat2.patch, NONE,
	1.1 libsilc.spec, 1.25, 1.26
Message-ID: <20090904143802.A008311C0082@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27752/F-10

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-stringformat2.patch 
Log Message:
- Backport patch to fix additional string format vulnerabilities (#515648)


silc-toolkit-1.1.8-stringformat2.patch:
 command.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-stringformat2.patch ---
From: Pekka Riikonen <priikone at silcnet.org>
Date: Fri, 7 Aug 2009 11:48:46 +0000 (+0300)
Subject: More string format fixes in silcd and client libary
X-Git-Tag: silc.toolkit.1.1.10^0
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=8cb801cf6482666818e721822ce81c81ec818908

More string format fixes in silcd and client libary
---

diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c
index 0e72368..1a4b446 100644
--- a/lib/silcclient/command.c
+++ b/lib/silcclient/command.c
@@ -956,7 +956,7 @@ SILC_FSM_STATE(silc_client_command_topic)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2144,7 +2144,7 @@ SILC_FSM_STATE(silc_client_command_kick)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2554,7 +2554,7 @@ SILC_FSM_STATE(silc_client_command_leave)
     }
 
     if (client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,
@@ -2621,7 +2621,7 @@ SILC_FSM_STATE(silc_client_command_users)
     }
 
     if (conn->client->internal->params->full_channel_names)
-      silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+      silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
     else
       silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
 		    conn->current_channel->channel_name,


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-10/libsilc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libsilc.spec	5 Aug 2009 15:01:05 -0000	1.25
+++ libsilc.spec	4 Sep 2009 14:38:02 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 5%{dist}
+Release: 6%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -11,6 +11,7 @@ Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
 Patch3:  silc-toolkit-1.1.8-libtool.patch
 Patch4:  silc-toolkit-1.1.8-stringformat.patch
+Patch5:  silc-toolkit-1.1.8-stringformat2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -46,6 +47,7 @@ applications.
 %patch2 -p1 -b .docinst
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .stringformat
+%patch5 -p1 -b .stringformat2
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-6
+- Backport patch to fix additional string format vulnerabilities (#515648)
+
 * Wed Aug 05 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-5
 - Backport patch to fix string format vulnerability (#515648)
 



From gerd at fedoraproject.org  Fri Sep  4 15:11:26 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Fri,  4 Sep 2009 15:11:26 +0000 (UTC)
Subject: rpms/parrot/devel import.log, 1.12, 1.13 parrot.spec, 1.16,
	1.17 sources, 1.7, 1.8 patch-1.5.0.ppc, 1.1, NONE
Message-ID: <20090904151126.BDB0E11C0082@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3170/devel

Modified Files:
	import.log parrot.spec sources 
Removed Files:
	patch-1.5.0.ppc 
Log Message:
test for new devel branch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	21 Aug 2009 16:18:02 -0000	1.12
+++ import.log	4 Sep 2009 15:11:24 -0000	1.13
@@ -10,3 +10,4 @@ parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.
 parrot-1_4_0-6_fc11:HEAD:parrot-1.4.0-6.fc11.src.rpm:1249129173
 parrot-1_4_0-8_fc11:HEAD:parrot-1.4.0-8.fc11.src.rpm:1249350002
 parrot-1_5_0-1_fc11:HEAD:parrot-1.5.0-1.fc11.src.rpm:1250871327
+parrot-1_5_0-2_40969svn_fc11:HEAD:parrot-1.5.0-2.40969svn.fc11.src.rpm:1252076899


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- parrot.spec	22 Aug 2009 07:44:17 -0000	1.16
+++ parrot.spec	4 Sep 2009 15:11:24 -0000	1.17
@@ -1,21 +1,16 @@
 Name:           parrot
 Version:        1.5.0
-Release:        2%{?dist}
+Release:        2.40969svn%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
+ExcludeArch:ppc64
 
-Patch1:         patch-1.5.0.ppc
-%ifarch %{ix86} x86_64 ppc64
-Patch0:         parrot-1.x.0.patch
-%else
-# The PowerPC-architecture
-Patch0:         patch-1.5.0.ppc
-%endif
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/SVN-checkout/%{version}/parrot-%{version}.tar.gz
 
+Patch0:         parrot-1.x.0.patch
 # patches file:           tools/dev/install_files.pl
 # It is responsible to have no subdirectory under pkgconfig.
 #
@@ -39,6 +34,7 @@ BuildRequires:  perl(Test::Simple)
 BuildRequires:  ctags
 BuildRequires:  openssl-devel
 BuildRequires:  flex
+BuildRequires:  bison
  
 
 %package docs
@@ -131,7 +127,6 @@ chmod +x %{__perl_provides}
     --parrot_is_shared \
     --disable-rpath \
     --lex=%{_bindir}/flex \
-    --yacc=%{_bindir}/yacc \
     --libs='-lcurses -lm'
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
@@ -292,16 +287,13 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
 - new upstream version
+- add man pages
 
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
-- ppc test included again
 - include the necessary module Parrot::OpLib::core
 - change the place of header files to /usr/include/parrot/<version>
 - install the files /usr/src/parrot/*
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
@@ -340,9 +332,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
-- Update to 0.5.3.
-
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Aug 2009 16:18:03 -0000	1.7
+++ sources	4 Sep 2009 15:11:25 -0000	1.8
@@ -1 +1 @@
-f209c337b488bfa244520d38502ef330  parrot-1.5.0.tar.gz
+3484552ba01980c1a397141b01c7351b  parrot-1.5.0.tar.gz


--- patch-1.5.0.ppc DELETED ---



From wcohen at fedoraproject.org  Fri Sep  4 15:17:27 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri,  4 Sep 2009 15:17:27 +0000 (UTC)
Subject: rpms/oprofile/F-11 .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 oprofile.spec, 1.79, 1.80 oprofile-basename.patch, 1.1,
	NONE oprofile-iaperf.patch, 1.1, NONE oprofile-verbose.patch,
	1.1, NONE
Message-ID: <20090904151727.16A0311C0082@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5124

Modified Files:
	.cvsignore sources oprofile.spec 
Removed Files:
	oprofile-basename.patch oprofile-iaperf.patch 
	oprofile-verbose.patch 
Log Message:
Import oprofile 0.9.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Jul 2008 19:45:30 -0000	1.14
+++ .cvsignore	4 Sep 2009 15:17:26 -0000	1.15
@@ -1 +1 @@
-oprofile-0.9.4.tar.gz
+oprofile-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Jul 2008 19:45:30 -0000	1.15
+++ sources	4 Sep 2009 15:17:26 -0000	1.16
@@ -1 +1 @@
-82b059379895cf125261d7d773465915  oprofile-0.9.4.tar.gz
+4b2ceca3fa013c95cc8d47c790807dc2  oprofile-0.9.5.tar.gz


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- oprofile.spec	16 Jul 2009 18:58:20 -0000	1.79
+++ oprofile.spec	4 Sep 2009 15:17:26 -0000	1.80
@@ -1,9 +1,7 @@
-%define DATE 20070717
-%define oprofile_version 0.9.4
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.4
-Release: 12%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -14,11 +12,7 @@ Requires(pre): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
-#Patch100: oprofile-gcc43.patch
-Patch101: oprofile-basename.patch
-Patch102: oprofile-iaperf.patch
-Patch103: oprofile-verbose.patch
-Patch104: oprofile-jvmpi-lgpl.patch
+#Patch104: oprofile-jvmpi-lgpl.patch
 
 URL: http://oprofile.sf.net
 
@@ -85,12 +79,8 @@ agent library.
 %patch10 -p1 -b .guess2
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-%patch83 -p1 -b .xen
-#%patch100 -p1 -b .gcc43
-%patch101 -p1 -b .basename
-%patch102 -p1 -b .iaperf
-%patch103 -p1 -b .verbose
-%patch104 -p1 -b .lgpl
+#%patch83 -p1 -b .xen
+#%patch104 -p1 -b .lgpl
 
 ./autogen.sh
 
@@ -133,9 +123,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-#the following is an ugly hack
-rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/oprofile
-rm -rf ${RPM_BUILD_ROOT}/usr/share/mangled-name
+# We want the manuals in the special doc dir, not the generic doc install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
+mkdir docs.installed
+mv $RPM_BUILD_ROOT%{_datadir}/doc/oprofile/* docs.installed/
 
 #hack to make header files available
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
@@ -172,7 +165,8 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc doc/oprofile.html
+%doc  docs.installed/*
+%doc COPYING
 
 %{_bindir}/ophelp
 %{_bindir}/opimport
@@ -213,9 +207,6 @@ exit 0
 %{_libdir}/liboputil++.a
 %{_libdir}/liboputil.a
 
-%doc doc/op-jit-devel.html
-%doc doc/opreport.xsd
-
 %files gui
 %defattr(-,root,root)
 
@@ -232,6 +223,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
+- Rebase on OProfile 0.9.5.
+
 * Thu Jul 16 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-12
 - Add shadow-utils to requires. Resolves: rhbz #501357
 - Add LGPL license to provided java support. Resolves: rhbz #474666


--- oprofile-basename.patch DELETED ---


--- oprofile-iaperf.patch DELETED ---


--- oprofile-verbose.patch DELETED ---



From wcohen at fedoraproject.org  Fri Sep  4 15:22:32 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri,  4 Sep 2009 15:22:32 +0000 (UTC)
Subject: rpms/oprofile/F-11 oprofile-0.7-libs.patch, 1.5,
	1.6 oprofile-jvmpi-lgpl.patch, 1.1, NONE
Message-ID: <20090904152232.1B84A11C0082@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6973

Modified Files:
	oprofile-0.7-libs.patch 
Removed Files:
	oprofile-jvmpi-lgpl.patch 
Log Message:
Update patches for oprofile-0.9.5.


oprofile-0.7-libs.patch:
 daemon/Makefile.am       |    4 ++--
 gui/Makefile.am          |    4 ++--
 libabi/Makefile.am       |   10 +++++-----
 libabi/tests/Makefile.am |    6 +++---
 libutil++/Makefile.am    |    4 ++--
 libutil/Makefile.am      |    4 ++--
 opjitconv/Makefile.am    |    2 +-
 pp/Makefile.am           |    4 ++--
 utils/Makefile.am        |    2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile-0.7-libs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- oprofile-0.7-libs.patch	18 Jul 2008 19:45:30 -0000	1.5
+++ oprofile-0.7-libs.patch	4 Sep 2009 15:22:31 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up oprofile-0.9.4rc1/daemon/Makefile.am.libs oprofile-0.9.4rc1/daemon/Makefile.am
---- oprofile-0.9.4rc1/daemon/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/daemon/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -43,9 +43,9 @@ bin_PROGRAMS = oprofiled
+diff -up oprofile-0.9.5/daemon/Makefile.am.libs oprofile-0.9.5/daemon/Makefile.am
+--- oprofile-0.9.5/daemon/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/daemon/Makefile.am	2009-08-04 14:01:40.000000000 -0400
+@@ -50,9 +50,9 @@ bin_PROGRAMS = oprofiled
  
  oprofiled_LDADD = \
  	liblegacy/liblegacy.a \
@@ -13,9 +13,9 @@ diff -up oprofile-0.9.4rc1/daemon/Makefi
 +	../libutil/liboputil.a
  
  oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -up oprofile-0.9.4rc1/gui/Makefile.am.libs oprofile-0.9.4rc1/gui/Makefile.am
---- oprofile-0.9.4rc1/gui/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/gui/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/gui/Makefile.am.libs oprofile-0.9.5/gui/Makefile.am
+--- oprofile-0.9.5/gui/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/gui/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start
  oprof_start_SOURCES = $(dist_sources)
  nodist_oprof_start_SOURCES = oprof_start.moc.cpp
@@ -28,9 +28,9 @@ diff -up oprofile-0.9.4rc1/gui/Makefile.
  	ui/liboprof_start.a \
  	@QT_LDFLAGS@ \
  	@QT_LIB@ \
-diff -up oprofile-0.9.4rc1/libabi/Makefile.am.libs oprofile-0.9.4rc1/libabi/Makefile.am
---- oprofile-0.9.4rc1/libabi/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/Makefile.am.libs oprofile-0.9.5/libabi/Makefile.am
+--- oprofile-0.9.5/libabi/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -10,15 +10,15 @@ AM_CPPFLAGS = \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -52,9 +52,9 @@ diff -up oprofile-0.9.4rc1/libabi/Makefi
 -	../libutil/libutil.a
 +	../libutil++/liboputil++.a \
 +	../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs oprofile-0.9.4rc1/libabi/tests/Makefile.am
---- oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/tests/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/tests/Makefile.am.libs oprofile-0.9.5/libabi/tests/Makefile.am
+--- oprofile-0.9.5/libabi/tests/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/tests/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -13,9 +13,9 @@ check_PROGRAMS = abi_test
  
  abi_test_SOURCES = abi_test.cpp
@@ -68,11 +68,11 @@ diff -up oprofile-0.9.4rc1/libabi/tests/
 -	../../libutil/libutil.a
 +	../../libutil++/liboputil++.a \
 +	../../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libutil/Makefile.am.libs oprofile-0.9.4rc1/libutil/Makefile.am
---- oprofile-0.9.4rc1/libutil/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -2,8 +2,8 @@ SUBDIRS = . tests
- 
+diff -up oprofile-0.9.5/libutil/Makefile.am.libs oprofile-0.9.5/libutil/Makefile.am
+--- oprofile-0.9.5/libutil/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil/Makefile.am	2009-08-04 14:05:32.000000000 -0400
+@@ -3,8 +3,8 @@ SUBDIRS = . tests
+ AM_CPPFLAGS=-I ${top_srcdir}/libop
  AM_CFLAGS = @OP_CFLAGS@
  
 -noinst_LIBRARIES = libutil.a
@@ -82,9 +82,9 @@ diff -up oprofile-0.9.4rc1/libutil/Makef
  	op_deviceio.c \
  	op_lockfile.c \
  	op_file.c \
-diff -up oprofile-0.9.4rc1/libutil++/Makefile.am.libs oprofile-0.9.4rc1/libutil++/Makefile.am
---- oprofile-0.9.4rc1/libutil++/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil++/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libutil++/Makefile.am.libs oprofile-0.9.5/libutil++/Makefile.am
+--- oprofile-0.9.5/libutil++/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil++/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,8 +7,8 @@ AM_CPPFLAGS= \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -96,9 +96,9 @@ diff -up oprofile-0.9.4rc1/libutil++/Mak
  	op_bfd.cpp \
  	op_bfd.h \
  	bfd_support.cpp \
-diff -up oprofile-0.9.4rc1/opjitconv/Makefile.am.libs oprofile-0.9.4rc1/opjitconv/Makefile.am
---- oprofile-0.9.4rc1/opjitconv/Makefile.am.libs	2008-06-01 13:42:53.000000000 -0400
-+++ oprofile-0.9.4rc1/opjitconv/Makefile.am	2008-06-01 13:43:04.000000000 -0400
+diff -up oprofile-0.9.5/opjitconv/Makefile.am.libs oprofile-0.9.5/opjitconv/Makefile.am
+--- oprofile-0.9.5/opjitconv/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/opjitconv/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv
  LIBS = @BFD_LIBS@
  
@@ -108,9 +108,9 @@ diff -up oprofile-0.9.4rc1/opjitconv/Mak
  
  opjitconv_LDADD = $(needed_libs)
  
-diff -up oprofile-0.9.4rc1/pp/Makefile.am.libs oprofile-0.9.4rc1/pp/Makefile.am
---- oprofile-0.9.4rc1/pp/Makefile.am.libs	2008-05-21 14:52:30.000000000 -0400
-+++ oprofile-0.9.4rc1/pp/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/pp/Makefile.am.libs oprofile-0.9.5/pp/Makefile.am
+--- oprofile-0.9.5/pp/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/pp/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -19,9 +19,9 @@ common_libs =  \
  	../libpp/libpp.a \
  	../libopt++/libopt++.a \
@@ -123,9 +123,9 @@ diff -up oprofile-0.9.4rc1/pp/Makefile.a
  	../libdb/libodb.a
  
  opreport_SOURCES = opreport.cpp \
-diff -up oprofile-0.9.4rc1/utils/Makefile.am.libs oprofile-0.9.4rc1/utils/Makefile.am
---- oprofile-0.9.4rc1/utils/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/utils/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/utils/Makefile.am.libs oprofile-0.9.5/utils/Makefile.am
+--- oprofile-0.9.5/utils/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/utils/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp
  dist_bin_SCRIPTS = opcontrol
  


--- oprofile-jvmpi-lgpl.patch DELETED ---



From wcohen at fedoraproject.org  Fri Sep  4 15:29:05 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri,  4 Sep 2009 15:29:05 +0000 (UTC)
Subject: rpms/oprofile/F-11 oprofile.spec,1.80,1.81
Message-ID: <20090904152905.CF78911C0082@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328

Modified Files:
	oprofile.spec 
Log Message:
Bump version for tag.



Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- oprofile.spec	4 Sep 2009 15:17:26 -0000	1.80
+++ oprofile.spec	4 Sep 2009 15:29:05 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -223,6 +223,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
+- Bump version and rebuild.
+
 * Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
 - Rebase on OProfile 0.9.5.
 



From wcohen at fedoraproject.org  Fri Sep  4 15:31:55 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri,  4 Sep 2009 15:31:55 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile.spec,1.81,1.82
Message-ID: <20090904153155.3C08511C0082@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8989

Modified Files:
	oprofile.spec 
Log Message:
Bump version and rebuild.



Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- oprofile.spec	4 Aug 2009 18:21:44 -0000	1.81
+++ oprofile.spec	4 Sep 2009 15:31:55 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -223,6 +223,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
+- Bump version and rebuild.
+
 * Mon Aug 3 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
 - Rebase on OProfile 0.9.5.
 



From wcohen at fedoraproject.org  Fri Sep  4 15:40:32 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri,  4 Sep 2009 15:40:32 +0000 (UTC)
Subject: rpms/oprofile/F-10 .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 oprofile.spec, 1.76, 1.77 oprofile-0.7-libs.patch, 1.5, 1.6
Message-ID: <20090904154032.B474E11C0382@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10303

Modified Files:
	.cvsignore sources oprofile.spec oprofile-0.7-libs.patch 
Log Message:
Rebase on oprofile-0.9.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Jul 2008 19:45:30 -0000	1.14
+++ .cvsignore	4 Sep 2009 15:40:32 -0000	1.15
@@ -1 +1 @@
-oprofile-0.9.4.tar.gz
+oprofile-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Jul 2008 19:45:30 -0000	1.15
+++ sources	4 Sep 2009 15:40:32 -0000	1.16
@@ -1 +1 @@
-82b059379895cf125261d7d773465915  oprofile-0.9.4.tar.gz
+4b2ceca3fa013c95cc8d47c790807dc2  oprofile-0.9.5.tar.gz


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- oprofile.spec	16 Jul 2009 19:04:56 -0000	1.76
+++ oprofile.spec	4 Sep 2009 15:40:32 -0000	1.77
@@ -1,9 +1,7 @@
-%define DATE 20070717
-%define oprofile_version 0.9.4
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.4
-Release: 12%{?dist}
+Version: 0.9.5
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -14,11 +12,7 @@ Requires(pre): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
-#Patch100: oprofile-gcc43.patch
-Patch101: oprofile-basename.patch
-Patch102: oprofile-iaperf.patch
-Patch103: oprofile-verbose.patch
-Patch104: oprofile-jvmpi-lgpl.patch
+#Patch104: oprofile-jvmpi-lgpl.patch
 
 URL: http://oprofile.sf.net
 
@@ -85,12 +79,8 @@ agent library.
 %patch10 -p1 -b .guess2
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-%patch83 -p1 -b .xen
-#%patch100 -p1 -b .gcc43
-%patch101 -p1 -b .basename
-%patch102 -p1 -b .iaperf
-%patch103 -p1 -b .verbose
-%patch104 -p1 -b .lgpl
+#%patch83 -p1 -b .xen
+#%patch104 -p1 -b .lgpl
 
 ./autogen.sh
 
@@ -133,9 +123,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-#the following is an ugly hack
-rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/oprofile
-rm -rf ${RPM_BUILD_ROOT}/usr/share/mangled-name
+# We want the manuals in the special doc dir, not the generic doc install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
+mkdir docs.installed
+mv $RPM_BUILD_ROOT%{_datadir}/doc/oprofile/* docs.installed/
 
 #hack to make header files available
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
@@ -172,7 +165,8 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc doc/oprofile.html
+%doc  docs.installed/*
+%doc COPYING
 
 %{_bindir}/ophelp
 %{_bindir}/opimport
@@ -213,9 +207,6 @@ exit 0
 %{_libdir}/liboputil++.a
 %{_libdir}/liboputil.a
 
-%doc doc/op-jit-devel.html
-%doc doc/opreport.xsd
-
 %files gui
 %defattr(-,root,root)
 
@@ -232,6 +223,12 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
+- Bump version and rebuild.
+
+* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
+- Rebase on OProfile 0.9.5.
+
 * Thu Jul 16 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-12
 - Add shadow-utils to requires. Resolves: rhbz #501357
 - Add LGPL license to provided java support. Resolves: rhbz #474666

oprofile-0.7-libs.patch:
 daemon/Makefile.am       |    4 ++--
 gui/Makefile.am          |    4 ++--
 libabi/Makefile.am       |   10 +++++-----
 libabi/tests/Makefile.am |    6 +++---
 libutil++/Makefile.am    |    4 ++--
 libutil/Makefile.am      |    4 ++--
 opjitconv/Makefile.am    |    2 +-
 pp/Makefile.am           |    4 ++--
 utils/Makefile.am        |    2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile-0.7-libs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- oprofile-0.7-libs.patch	18 Jul 2008 19:45:30 -0000	1.5
+++ oprofile-0.7-libs.patch	4 Sep 2009 15:40:32 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up oprofile-0.9.4rc1/daemon/Makefile.am.libs oprofile-0.9.4rc1/daemon/Makefile.am
---- oprofile-0.9.4rc1/daemon/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/daemon/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -43,9 +43,9 @@ bin_PROGRAMS = oprofiled
+diff -up oprofile-0.9.5/daemon/Makefile.am.libs oprofile-0.9.5/daemon/Makefile.am
+--- oprofile-0.9.5/daemon/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/daemon/Makefile.am	2009-08-04 14:01:40.000000000 -0400
+@@ -50,9 +50,9 @@ bin_PROGRAMS = oprofiled
  
  oprofiled_LDADD = \
  	liblegacy/liblegacy.a \
@@ -13,9 +13,9 @@ diff -up oprofile-0.9.4rc1/daemon/Makefi
 +	../libutil/liboputil.a
  
  oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -up oprofile-0.9.4rc1/gui/Makefile.am.libs oprofile-0.9.4rc1/gui/Makefile.am
---- oprofile-0.9.4rc1/gui/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/gui/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/gui/Makefile.am.libs oprofile-0.9.5/gui/Makefile.am
+--- oprofile-0.9.5/gui/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/gui/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start
  oprof_start_SOURCES = $(dist_sources)
  nodist_oprof_start_SOURCES = oprof_start.moc.cpp
@@ -28,9 +28,9 @@ diff -up oprofile-0.9.4rc1/gui/Makefile.
  	ui/liboprof_start.a \
  	@QT_LDFLAGS@ \
  	@QT_LIB@ \
-diff -up oprofile-0.9.4rc1/libabi/Makefile.am.libs oprofile-0.9.4rc1/libabi/Makefile.am
---- oprofile-0.9.4rc1/libabi/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/Makefile.am.libs oprofile-0.9.5/libabi/Makefile.am
+--- oprofile-0.9.5/libabi/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -10,15 +10,15 @@ AM_CPPFLAGS = \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -52,9 +52,9 @@ diff -up oprofile-0.9.4rc1/libabi/Makefi
 -	../libutil/libutil.a
 +	../libutil++/liboputil++.a \
 +	../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs oprofile-0.9.4rc1/libabi/tests/Makefile.am
---- oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/tests/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/tests/Makefile.am.libs oprofile-0.9.5/libabi/tests/Makefile.am
+--- oprofile-0.9.5/libabi/tests/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/tests/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -13,9 +13,9 @@ check_PROGRAMS = abi_test
  
  abi_test_SOURCES = abi_test.cpp
@@ -68,11 +68,11 @@ diff -up oprofile-0.9.4rc1/libabi/tests/
 -	../../libutil/libutil.a
 +	../../libutil++/liboputil++.a \
 +	../../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libutil/Makefile.am.libs oprofile-0.9.4rc1/libutil/Makefile.am
---- oprofile-0.9.4rc1/libutil/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -2,8 +2,8 @@ SUBDIRS = . tests
- 
+diff -up oprofile-0.9.5/libutil/Makefile.am.libs oprofile-0.9.5/libutil/Makefile.am
+--- oprofile-0.9.5/libutil/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil/Makefile.am	2009-08-04 14:05:32.000000000 -0400
+@@ -3,8 +3,8 @@ SUBDIRS = . tests
+ AM_CPPFLAGS=-I ${top_srcdir}/libop
  AM_CFLAGS = @OP_CFLAGS@
  
 -noinst_LIBRARIES = libutil.a
@@ -82,9 +82,9 @@ diff -up oprofile-0.9.4rc1/libutil/Makef
  	op_deviceio.c \
  	op_lockfile.c \
  	op_file.c \
-diff -up oprofile-0.9.4rc1/libutil++/Makefile.am.libs oprofile-0.9.4rc1/libutil++/Makefile.am
---- oprofile-0.9.4rc1/libutil++/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil++/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libutil++/Makefile.am.libs oprofile-0.9.5/libutil++/Makefile.am
+--- oprofile-0.9.5/libutil++/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil++/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,8 +7,8 @@ AM_CPPFLAGS= \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -96,9 +96,9 @@ diff -up oprofile-0.9.4rc1/libutil++/Mak
  	op_bfd.cpp \
  	op_bfd.h \
  	bfd_support.cpp \
-diff -up oprofile-0.9.4rc1/opjitconv/Makefile.am.libs oprofile-0.9.4rc1/opjitconv/Makefile.am
---- oprofile-0.9.4rc1/opjitconv/Makefile.am.libs	2008-06-01 13:42:53.000000000 -0400
-+++ oprofile-0.9.4rc1/opjitconv/Makefile.am	2008-06-01 13:43:04.000000000 -0400
+diff -up oprofile-0.9.5/opjitconv/Makefile.am.libs oprofile-0.9.5/opjitconv/Makefile.am
+--- oprofile-0.9.5/opjitconv/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/opjitconv/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv
  LIBS = @BFD_LIBS@
  
@@ -108,9 +108,9 @@ diff -up oprofile-0.9.4rc1/opjitconv/Mak
  
  opjitconv_LDADD = $(needed_libs)
  
-diff -up oprofile-0.9.4rc1/pp/Makefile.am.libs oprofile-0.9.4rc1/pp/Makefile.am
---- oprofile-0.9.4rc1/pp/Makefile.am.libs	2008-05-21 14:52:30.000000000 -0400
-+++ oprofile-0.9.4rc1/pp/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/pp/Makefile.am.libs oprofile-0.9.5/pp/Makefile.am
+--- oprofile-0.9.5/pp/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/pp/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -19,9 +19,9 @@ common_libs =  \
  	../libpp/libpp.a \
  	../libopt++/libopt++.a \
@@ -123,9 +123,9 @@ diff -up oprofile-0.9.4rc1/pp/Makefile.a
  	../libdb/libodb.a
  
  opreport_SOURCES = opreport.cpp \
-diff -up oprofile-0.9.4rc1/utils/Makefile.am.libs oprofile-0.9.4rc1/utils/Makefile.am
---- oprofile-0.9.4rc1/utils/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/utils/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/utils/Makefile.am.libs oprofile-0.9.5/utils/Makefile.am
+--- oprofile-0.9.5/utils/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/utils/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp
  dist_bin_SCRIPTS = opcontrol
  



From ttorcz at fedoraproject.org  Fri Sep  4 15:49:30 2009
From: ttorcz at fedoraproject.org (Tomasz Torcz)
Date: Fri,  4 Sep 2009 15:49:30 +0000 (UTC)
Subject: rpms/hdapsd/devel 99-hdapsd.rules, NONE, 1.1 hdapsd.event, NONE,
	1.1 hdapsd.spec, NONE, 1.1 hdapsd.sysconfig, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904154930.45AC711C0082@cvs1.fedora.phx.redhat.com>

Author: ttorcz

Update of /cvs/pkgs/rpms/hdapsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12485/devel

Modified Files:
	.cvsignore sources 
Added Files:
	99-hdapsd.rules hdapsd.event hdapsd.spec hdapsd.sysconfig 
	import.log 
Log Message:
* Fri Sep 04 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-4
- use version macro in in Source0, as per review suggestion (#505928 #9)




--- NEW FILE 99-hdapsd.rules ---
# emit event for each block device added
ACTION=="add",    SUBSYSTEM=="block", KERNEL=="*[!0-9]", RUN="/usr/sbin/initctl emit block-device-added %k -eDEVNAME"


--- NEW FILE hdapsd.event ---
# hdapsd starting script
# laptops seldom have >2 HDD, so we care only about first two

start on block-device-added sd[ab][!0-9]
instance
nice -5

script
	. /etc/sysconfig/hdapsd

	/usr/sbin//hdapsd -b -l -d $1 $HDAPSD_OPTIONS
end script



--- NEW FILE hdapsd.spec ---
Name:		hdapsd	
Version:	20090401
Release:	4%{?dist}
Summary:	Protects hard drives by parking head when fall is detected

Group:		Applications/System
License:	GPLv2+
URL:		http://hdaps.sourceforge.net/
Source0:	http://downloads.sourceforge.net/hdaps/hdapsd-%{version}.tar.gz
Source1:	hdapsd.event
Source2:	hdapsd.sysconfig
Source3:	99-hdapsd.rules
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description

This is a disk protection user-space daemon. It monitors the acceleration
values through the HDAPS/AMS interfaces and automatically initiates disk head
parking if a fall or sliding of the laptop is detected.

HDAPS is typically found in ThinkPad laptops and AMS in Apple laptops.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/event.d/
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/event.d/hdapsd
cp -p %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/hdapsd
cp -p %SOURCE3 %{buildroot}%{_sysconfdir}/udev/rules.d/
# remove docs installed by "make install", will be installed in proper dir by %doc
rm -rf %{buildroot}%{_defaultdocdir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_sbindir}/*
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%config(noreplace) %{_sysconfdir}/event.d/hdapsd
%config(noreplace) %{_sysconfdir}/sysconfig/hdapsd
%{_mandir}/man8/hdapsd.8.gz
%doc AUTHORS
%doc COPYING
%doc ChangeLog
%doc README


%changelog
* Fri Sep 04 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-4
- use version macro in in Source0, as per review suggestion (#505928 #9)

* Tue Jun 21 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-3
- fixes from review: URL source, proper build root macro
- minor cleanup of event file

* Sun Jun 17 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-2
- mark upstart event file and udev rule as config files

* Sun Jun 14 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-1
- initial version


--- NEW FILE hdapsd.sysconfig ---
# default sensivity is 15; bump it a little and enable adaptive tuning
HDAPSD_OPTIONS="-s 22 -a"


--- NEW FILE import.log ---
hdapsd-20090401-4_fc12:HEAD:hdapsd-20090401-4.fc12.src.rpm:1252079234


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdapsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:22:36 -0000	1.1
+++ .cvsignore	4 Sep 2009 15:49:29 -0000	1.2
@@ -0,0 +1 @@
+hdapsd-20090401.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdapsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:22:36 -0000	1.1
+++ sources	4 Sep 2009 15:49:30 -0000	1.2
@@ -0,0 +1 @@
+897cee8b0192febd127470f3e9506aeb  hdapsd-20090401.tar.gz



From otaylor at fedoraproject.org  Fri Sep  4 15:52:01 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Fri,  4 Sep 2009 15:52:01 +0000 (UTC)
Subject: rpms/desktop-effects/devel .cvsignore, 1.2, 1.3 desktop-effects.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090904155201.EE5C611C0082@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13840

Modified Files:
	.cvsignore desktop-effects.spec sources 
Log Message:
* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 0.8.2-1
- Update to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Aug 2009 20:16:52 -0000	1.2
+++ .cvsignore	4 Sep 2009 15:52:01 -0000	1.3
@@ -1 +1,2 @@
 desktop-effects-0.8.1.tar.bz2
+desktop-effects-0.8.2.tar.bz2


Index: desktop-effects.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/desktop-effects.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- desktop-effects.spec	24 Aug 2009 20:16:52 -0000	1.1
+++ desktop-effects.spec	4 Sep 2009 15:52:01 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           desktop-effects
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Switch GNOME window management and effects
 
@@ -66,6 +66,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
 fi
 
 %changelog
+* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 0.8.2-1
+- Update to 0.8.2
+
 * Mon Aug 24 2009 Owen Taylor <otaylor at redhat.com> - 0.8.1-1
 - Update to 0.8.1 (fixes leftover debugging hack)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Aug 2009 20:16:52 -0000	1.2
+++ sources	4 Sep 2009 15:52:01 -0000	1.3
@@ -1 +1 @@
-6550cc3095f0d14f0bf2a5a1d0df1dc5  desktop-effects-0.8.1.tar.bz2
+806fc8eef9788ae1ca7654d7cae75e7d  desktop-effects-0.8.2.tar.bz2



From ttorcz at fedoraproject.org  Fri Sep  4 15:52:46 2009
From: ttorcz at fedoraproject.org (Tomasz Torcz)
Date: Fri,  4 Sep 2009 15:52:46 +0000 (UTC)
Subject: rpms/hdapsd/F-12 99-hdapsd.rules, NONE, 1.1 hdapsd.event, NONE,
	1.1 hdapsd.spec, NONE, 1.1 hdapsd.sysconfig, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090904155246.5575011C0082@cvs1.fedora.phx.redhat.com>

Author: ttorcz

Update of /cvs/pkgs/rpms/hdapsd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14054/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	99-hdapsd.rules hdapsd.event hdapsd.spec hdapsd.sysconfig 
	import.log 
Log Message:
* Fri Sep 04 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-4
- use version macro in in Source0, as per review suggestion (#505928 #9)




--- NEW FILE 99-hdapsd.rules ---
# emit event for each block device added
ACTION=="add",    SUBSYSTEM=="block", KERNEL=="*[!0-9]", RUN="/usr/sbin/initctl emit block-device-added %k -eDEVNAME"


--- NEW FILE hdapsd.event ---
# hdapsd starting script
# laptops seldom have >2 HDD, so we care only about first two

start on block-device-added sd[ab][!0-9]
instance
nice -5

script
	. /etc/sysconfig/hdapsd

	/usr/sbin//hdapsd -b -l -d $1 $HDAPSD_OPTIONS
end script



--- NEW FILE hdapsd.spec ---
Name:		hdapsd	
Version:	20090401
Release:	4%{?dist}
Summary:	Protects hard drives by parking head when fall is detected

Group:		Applications/System
License:	GPLv2+
URL:		http://hdaps.sourceforge.net/
Source0:	http://downloads.sourceforge.net/hdaps/hdapsd-%{version}.tar.gz
Source1:	hdapsd.event
Source2:	hdapsd.sysconfig
Source3:	99-hdapsd.rules
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description

This is a disk protection user-space daemon. It monitors the acceleration
values through the HDAPS/AMS interfaces and automatically initiates disk head
parking if a fall or sliding of the laptop is detected.

HDAPS is typically found in ThinkPad laptops and AMS in Apple laptops.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/event.d/
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/event.d/hdapsd
cp -p %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/hdapsd
cp -p %SOURCE3 %{buildroot}%{_sysconfdir}/udev/rules.d/
# remove docs installed by "make install", will be installed in proper dir by %doc
rm -rf %{buildroot}%{_defaultdocdir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_sbindir}/*
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%config(noreplace) %{_sysconfdir}/event.d/hdapsd
%config(noreplace) %{_sysconfdir}/sysconfig/hdapsd
%{_mandir}/man8/hdapsd.8.gz
%doc AUTHORS
%doc COPYING
%doc ChangeLog
%doc README


%changelog
* Fri Sep 04 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-4
- use version macro in in Source0, as per review suggestion (#505928 #9)

* Tue Jun 21 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-3
- fixes from review: URL source, proper build root macro
- minor cleanup of event file

* Sun Jun 17 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-2
- mark upstart event file and udev rule as config files

* Sun Jun 14 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-1
- initial version


--- NEW FILE hdapsd.sysconfig ---
# default sensivity is 15; bump it a little and enable adaptive tuning
HDAPSD_OPTIONS="-s 22 -a"


--- NEW FILE import.log ---
hdapsd-20090401-4_fc12:F-12:hdapsd-20090401-4.fc12.src.rpm:1252079537


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdapsd/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:22:36 -0000	1.1
+++ .cvsignore	4 Sep 2009 15:52:45 -0000	1.2
@@ -0,0 +1 @@
+hdapsd-20090401.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdapsd/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:22:36 -0000	1.1
+++ sources	4 Sep 2009 15:52:46 -0000	1.2
@@ -0,0 +1 @@
+897cee8b0192febd127470f3e9506aeb  hdapsd-20090401.tar.gz



From nhorman at fedoraproject.org  Fri Sep  4 15:54:13 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri,  4 Sep 2009 15:54:13 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance.init, 1.12, 1.13 irqbalance.spec, 
	1.63, 1.64
Message-ID: <20090904155413.7372611C0082@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14381

Modified Files:
	irqbalance.init irqbalance.spec 
Log Message:
Resolves: bz521246


Index: irqbalance.init
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- irqbalance.init	31 Jul 2009 18:01:38 -0000	1.12
+++ irqbalance.init	4 Sep 2009 15:54:13 -0000	1.13
@@ -79,14 +79,14 @@ case "$1" in
   status)
 	status irqbalance
 	;;
-  restart|reload)
+  restart|reload|force-reload)
 	restart
 	;;
   condrestart)
 	[ -f /var/lock/subsys/irqbalance ] && restart || :
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart|force-reload}"
 	exit 1
 	;;
 esac


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- irqbalance.spec	2 Sep 2009 12:57:56 -0000	1.63
+++ irqbalance.spec	4 Sep 2009 15:54:13 -0000	1.64
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	23%{?dist}
+Release:	24%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -82,6 +82,9 @@ exit 0
 
 
 %changelog
+* Fri Sep 04 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-24
+- Fixing irqbalance initscript (bz 521246)
+
 * Wed Sep 02 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-23
 - Fixing BuildRequires for new config script
 



From otaylor at fedoraproject.org  Fri Sep  4 16:01:55 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Fri,  4 Sep 2009 16:01:55 +0000 (UTC)
Subject: rpms/desktop-effects/devel desktop-effects.spec,1.2,1.3
Message-ID: <20090904160155.3E4AA11C0082@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15587

Modified Files:
	desktop-effects.spec 
Log Message:
* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 0.8.2-2
- Add missing BuildRequires on mesa-libGL-devel



Index: desktop-effects.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/desktop-effects.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- desktop-effects.spec	4 Sep 2009 15:52:01 -0000	1.2
+++ desktop-effects.spec	4 Sep 2009 16:01:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           desktop-effects
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Switch GNOME window management and effects
 
 Group:          User Interface/Desktops
@@ -15,6 +15,7 @@ BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
 BuildRequires:  libXcomposite-devel
+BuildRequires:  mesa-libGL-devel
 
 Requires:       gnome-session
 Requires:       hicolor-icon-theme
@@ -66,6 +67,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
 fi
 
 %changelog
+* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 0.8.2-2
+- Add missing BuildRequires on mesa-libGL-devel
+
 * Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 0.8.2-1
 - Update to 0.8.2
 



From pkgdb at fedoraproject.org  Fri Sep  4 16:14:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:14:19 +0000
Subject: [pkgdb] perl-Digest-SHA (Fedora EPEL, 5) updated by wtogami
Message-ID: <20090904161419.DF5D810F882@bastion2.fedora.phx.redhat.com>

wtogami added a Fedora EPEL 5 branch for perl-Digest-SHA
wtogami has set commit to Approved for 107427 on perl-Digest-SHA (Fedora EPEL 5)
wtogami has set checkout to Approved for 107427 on perl-Digest-SHA (Fedora EPEL 5)
wtogami has set build to Approved for 107427 on perl-Digest-SHA (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Digest-SHA



From pkgdb at fedoraproject.org  Fri Sep  4 16:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:16:46 +0000
Subject: [pkgdb] perl-Digest-SHA ownership updated
Message-ID: <20090904161646.8F39F10F859@bastion2.fedora.phx.redhat.com>

Package perl-Digest-SHA in Fedora EPEL 5 was orphaned by wtogami

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Digest-SHA



From pkgdb at fedoraproject.org  Fri Sep  4 16:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:16:50 +0000
Subject: [pkgdb] perl-Digest-SHA ownership updated
Message-ID: <20090904161650.A523110F882@bastion2.fedora.phx.redhat.com>

Package perl-Digest-SHA in Fedora EPEL 5 is now owned by wtogami

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Digest-SHA



From pkgdb at fedoraproject.org  Fri Sep  4 16:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:17:04 +0000
Subject: [pkgdb] perl-Mail-DKIM (Fedora EPEL, 5) updated by wtogami
Message-ID: <20090904161704.BC0FD10F886@bastion2.fedora.phx.redhat.com>

wtogami added a Fedora EPEL 5 branch for perl-Mail-DKIM
wtogami has set commit to Approved for 107427 on perl-Mail-DKIM (Fedora EPEL 5)
wtogami has set checkout to Approved for 107427 on perl-Mail-DKIM (Fedora EPEL 5)
wtogami has set build to Approved for 107427 on perl-Mail-DKIM (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Fri Sep  4 16:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:17:54 +0000
Subject: [pkgdb] perl-Mail-DKIM: wtogami has requested watchbugzilla
Message-ID: <20090904161754.79F7A10F85C@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchbugzilla acl on perl-Mail-DKIM (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Fri Sep  4 16:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:17:57 +0000
Subject: [pkgdb] perl-Mail-DKIM: wtogami has requested watchcommits
Message-ID: <20090904161757.7916810F88C@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchcommits acl on perl-Mail-DKIM (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Fri Sep  4 16:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:18:09 +0000
Subject: [pkgdb] perl-Mail-DKIM had acl change status
Message-ID: <20090904161810.09E6D10F89D@bastion2.fedora.phx.redhat.com>

wtogami has set the watchbugzilla acl on perl-Mail-DKIM (Fedora EPEL 5) to Approved for wtogami

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Fri Sep  4 16:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:17:59 +0000
Subject: [pkgdb] perl-Mail-DKIM: wtogami has requested commit
Message-ID: <20090904161759.43EDD10F895@bastion2.fedora.phx.redhat.com>

wtogami has requested the commit acl on perl-Mail-DKIM (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Fri Sep  4 16:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:18:12 +0000
Subject: [pkgdb] perl-Mail-DKIM had acl change status
Message-ID: <20090904161813.2710C10F8A0@bastion2.fedora.phx.redhat.com>

wtogami has set the watchcommits acl on perl-Mail-DKIM (Fedora EPEL 5) to Approved for wtogami

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Fri Sep  4 16:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 16:18:16 +0000
Subject: [pkgdb] perl-Mail-DKIM had acl change status
Message-ID: <20090904161816.33B3A10F8A1@bastion2.fedora.phx.redhat.com>

wtogami has set the commit acl on perl-Mail-DKIM (Fedora EPEL 5) to Approved for wtogami

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From linville at fedoraproject.org  Fri Sep  4 16:21:41 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri,  4 Sep 2009 16:21:41 +0000 (UTC)
Subject: rpms/iw/devel iw-avoid-section-type-conflict-on-ppc64.patch, NONE, 
	1.1 iw.spec, 1.16, 1.17
Message-ID: <20090904162141.99CF211C0082@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20568

Modified Files:
	iw.spec 
Added Files:
	iw-avoid-section-type-conflict-on-ppc64.patch 
Log Message:
Revert "separate commands into sections", section type conflicts on ppc64

iw-avoid-section-type-conflict-on-ppc64.patch:
 Makefile    |    1 
 connect.c   |    4 -
 ibss.c      |    2 
 info.c      |    2 
 interface.c |    2 
 iw.c        |  122 +++++++++++++++++++++++++++++++++++++-----------------------
 iw.h        |   38 ++++++++++++++----
 link.c      |    8 +--
 mpath.c     |    2 
 reg.c       |    2 
 scan.c      |   16 +++----
 sections.c  |    4 +
 station.c   |    2 
 13 files changed, 136 insertions(+), 69 deletions(-)

--- NEW FILE iw-avoid-section-type-conflict-on-ppc64.patch ---
commit 4698bfc235c20e955466b6362df2a39f7478c13f
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Mon Aug 24 12:53:34 2009 +0200

    separate commands into sections
    
    The ad-hoc way of parsing the command "tree" didn't
    really work out, so separate the commands better
    into sections and parse by that.

diff --git a/Makefile b/Makefile
index e356ae4..cb5fcc1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ OBJS = iw.o genl.o event.o info.o phy.o \
 	interface.o ibss.o station.o util.o \
 	mesh.o mpath.o scan.o reg.o version.o \
 	reason.o status.o connect.o link.o
+OBJS += sections.o
 ALL = iw
 
 NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
diff --git a/connect.c b/connect.c
index 91be62a..ced289f 100644
--- a/connect.c
+++ b/connect.c
@@ -67,7 +67,6 @@ static int disconnect(struct nl80211_state *state,
 TOPLEVEL(disconnect, NULL,
 	NL80211_CMD_DISCONNECT, 0, CIB_NETDEV, disconnect,
 	"Disconnect from the current network.");
-HIDDEN(conn, establish, "", NL80211_CMD_CONNECT, 0, CIB_NETDEV, iw_conn);
 
 static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
 		      struct nl_msg *msg, int argc, char **argv)
@@ -97,7 +96,7 @@ static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
 	if (!conn_argv)
 		return -ENOMEM;
 	conn_argv[0] = dev;
-	conn_argv[1] = "conn";
+	conn_argv[1] = "connect";
 	conn_argv[2] = "establish";
 	for (i = 0; i < argc; i++)
 		conn_argv[i + 3] = argv[i];
@@ -138,3 +137,4 @@ TOPLEVEL(connect, "[-w] <SSID> [<freq in MHz>] [<bssid>] [key 0:abcde d:1:616263
 	0, 0, CIB_NETDEV, iw_connect,
 	"Join the network with the given SSID (and frequency, BSSID).\n"
 	"With -w, wait for the connect to finish or fail.");
+HIDDEN(connect, establish, "", NL80211_CMD_CONNECT, 0, CIB_NETDEV, iw_conn);
diff --git a/ibss.c b/ibss.c
index 8785e7a..4715ac8 100644
--- a/ibss.c
+++ b/ibss.c
@@ -9,6 +9,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(ibss);
+
 static int join_ibss(struct nl80211_state *state,
 		     struct nl_cb *cb,
 		     struct nl_msg *msg,
diff --git a/info.c b/info.c
index 1b5e443..7bca69d 100644
--- a/info.c
+++ b/info.c
@@ -282,7 +282,7 @@ static int handle_info(struct nl80211_state *state,
 
 	return 0;
 }
-TOPLEVEL(info, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_PHY, handle_info,
+__COMMAND(NULL, info, "info", NULL, NL80211_CMD_GET_WIPHY, 0, 0, CIB_PHY, handle_info,
 	 "Show capabilities for the specified wireless device.");
 TOPLEVEL(list, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info,
 	 "List all wireless devices and their capabilities.");
diff --git a/interface.c b/interface.c
index d3f6e2d..bf1335a 100644
--- a/interface.c
+++ b/interface.c
@@ -18,6 +18,8 @@
 			"otherbss: show frames from other BSSes\n"\
 			"cook:     use cooked mode"
 
+SECTION(interface);
+
 static char *mntr_flags[NL80211_MNTR_FLAG_MAX + 1] = {
 	"none",
 	"fcsfail",
diff --git a/iw.c b/iw.c
index 2525492..8fcf2f6 100644
--- a/iw.c
+++ b/iw.c
@@ -94,12 +94,17 @@ static void nl80211_cleanup(struct nl80211_state *state)
 	nl_socket_free(state->nl_sock);
 }
 
-__COMMAND(NULL, NULL, "", NULL, 0, 0, 0, CIB_NONE, NULL, NULL);
-__COMMAND(NULL, NULL, "", NULL, 1, 0, 0, CIB_NONE, NULL, NULL);
-
 static int cmd_size;
 
-static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
+extern struct cmd __start___cmd;
+extern struct cmd __stop___cmd;
+
+#define for_each_cmd(_cmd)					\
+	for (_cmd = &__start___cmd; _cmd < &__stop___cmd;		\
+	     _cmd = (const struct cmd *)((char *)_cmd + cmd_size))
+
+
+static void __usage_cmd(const struct cmd *cmd, char *indent, bool full)
 {
 	const char *start, *lend, *end;
 
@@ -115,8 +120,8 @@ static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
 		printf("dev <devname> ");
 		break;
 	}
-	if (cmd->section)
-		printf("%s ", cmd->section);
+	if (cmd->parent && cmd->parent->name)
+		printf("%s ", cmd->parent->name);
 	printf("%s", cmd->name);
 	if (cmd->args)
 		printf(" %s", cmd->args);
@@ -156,17 +161,26 @@ static const char *argv0;
 
 static void usage(bool full)
 {
-	struct cmd *cmd;
+	const struct cmd *section, *cmd;
 
 	printf("Usage:\t%s [options] command\n", argv0);
 	usage_options();
 	printf("\t--version\tshow version (%s)\n", iw_version);
 	printf("Commands:\n");
-	for (cmd = &__start___cmd; cmd < &__stop___cmd;
-	     cmd = (struct cmd *)((char *)cmd + cmd_size)) {
-		if (!cmd->handler || cmd->hidden)
+	for_each_cmd(section) {
+		if (section->parent)
 			continue;
-		__usage_cmd(cmd, "\t", full);
+
+		if (section->handler && !section->hidden)
+			__usage_cmd(section, "\t", full);
+
+		for_each_cmd(cmd) {
+			if (section != cmd->parent)
+				continue;
+			if (!cmd->handler || cmd->hidden)
+				continue;
+			__usage_cmd(cmd, "\t", full);
+		}
 	}
 	printf("\nYou can omit the 'phy' or 'dev' if "
 			"the identification is unique,\n"
@@ -186,7 +200,7 @@ static int print_help(struct nl80211_state *state,
 TOPLEVEL(help, NULL, 0, 0, CIB_NONE, print_help,
 	 "Print usage for each command.");
 
-static void usage_cmd(struct cmd *cmd)
+static void usage_cmd(const struct cmd *cmd)
 {
 	printf("Usage:\t%s [options] ", argv0);
 	__usage_cmd(cmd, "", true);
@@ -238,9 +252,9 @@ static int ack_handler(struct nl_msg *msg, void *arg)
 }
 
 static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
-			int argc, char **argv, struct cmd **cmdout)
+			int argc, char **argv, const struct cmd **cmdout)
 {
-	struct cmd *cmd, *match = NULL;
+	const struct cmd *cmd, *match = NULL, *sectcmd;
 	struct nl_cb *cb;
 	struct nl_msg *msg;
 	int devidx = 0;
@@ -285,44 +299,61 @@ static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
 	if (devidx < 0)
 		return -errno;
 
-	section = command = *argv;
+	section = *argv;
 	argc--;
 	argv++;
 
-	for (cmd = &__start___cmd; cmd < &__stop___cmd;
-	     cmd = (struct cmd *)((char *)cmd + cmd_size)) {
-		if (!cmd->handler)
+	for_each_cmd(sectcmd) {
+		if (sectcmd->parent)
 			continue;
-		if (cmd->idby != command_idby)
+		/* ok ... bit of a hack for the dupe 'info' section */
+		if (match && sectcmd->idby != command_idby)
 			continue;
-		if (cmd->section) {
-			if (strcmp(cmd->section, section))
+		if (strcmp(sectcmd->name, section) == 0)
+			match = sectcmd;
+	}
+
+	sectcmd = match;
+	match = NULL;
+	if (!sectcmd)
+		return 1;
+
+	if (argc > 0) {
+		command = *argv;
+
+		for_each_cmd(cmd) {
+			if (!cmd->handler)
 				continue;
-			/* this is a bit icky ... */
-			if (command == section) {
-				if (argc <= 0) {
-					if (match)
-						break;
-					return 1;
-				}
-				command = *argv;
-				argc--;
-				argv++;
-			}
-		} else if (section != command)
-			continue;
-		if (strcmp(cmd->name, command))
-			continue;
-		if (argc && !cmd->args)
-			continue;
+			if (cmd->parent != sectcmd)
+				continue;
+			if (cmd->idby != command_idby)
+				continue;
+			if (strcmp(cmd->name, command))
+				continue;
+			if (argc > 1 && !cmd->args)
+				continue;
+			match = cmd;
+			break;
+		}
 
-		match = cmd;
+		if (match) {
+			argc--;
+			argv++;
+		}
 	}
 
-	cmd = match;
-
-	if (!cmd)
-		return 1;
+	if (match)
+		cmd = match;
+	else {
+		/* Use the section itself, if possible. */
+		cmd = sectcmd;
+		if (argc && !cmd->args)
+			return 1;
+		if (cmd->idby != command_idby)
+			return 1;
+		if (!cmd->handler)
+			return 1;
+	}
 
 	if (cmdout)
 		*cmdout = cmd;
@@ -396,11 +427,10 @@ int main(int argc, char **argv)
 {
 	struct nl80211_state nlstate;
 	int err;
-	struct cmd *cmd = NULL;
+	const struct cmd *cmd = NULL;
 
 	/* calculate command size including padding */
-	cmd_size = abs((long)&__cmd_NULL_NULL_1_CIB_NONE_0
-	             - (long)&__cmd_NULL_NULL_0_CIB_NONE_0);
+	cmd_size = abs((long)&__section_set - (long)&__section_get);
 	/* strip off self */
 	argc--;
 	argv0 = *argv++;
diff --git a/iw.h b/iw.h
index 94948ec..511a1db 100644
--- a/iw.h
+++ b/iw.h
@@ -35,7 +35,6 @@ enum id_input {
 };
 
 struct cmd {
-	const char *section;
 	const char *name;
 	const char *args;
 	const char *help;
@@ -52,6 +51,7 @@ struct cmd {
 		       struct nl_cb *cb,
 		       struct nl_msg *msg,
 		       int argc, char **argv);
+	const struct cmd *parent;
 };
 
 #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
@@ -60,7 +60,6 @@ struct cmd {
 	static const struct cmd						\
 	__cmd ## _ ## _symname ## _ ## _handler ## _ ## _nlcmd ## _ ## _idby ## _ ## _hidden\
 	__attribute__((used)) __attribute__((section("__cmd")))	= {	\
-		.section = (_section),					\
 		.name = (_name),					\
 		.args = (_args),					\
 		.cmd = (_nlcmd),					\
@@ -69,15 +68,34 @@ struct cmd {
 		.idby = (_idby),					\
 		.handler = (_handler),					\
 		.help = (_help),					\
+		.parent = _section,					\
 	 }
 #define COMMAND(section, name, args, cmd, flags, idby, handler, help)	\
-	__COMMAND(#section, name, #name, args, cmd, flags, 0, idby, handler, help)
+	__COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 0, idby, handler, help)
 #define HIDDEN(section, name, args, cmd, flags, idby, handler)		\
-	__COMMAND(#section, name, #name, args, cmd, flags, 1, idby, handler, NULL)
-#define TOPLEVEL(name, args, cmd, flags, idby, handler, help)		\
-	__COMMAND(NULL, name, #name, args, cmd, flags, 0, idby, handler, help)
-extern struct cmd __start___cmd;
-extern struct cmd __stop___cmd;
+	__COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 1, idby, handler, NULL)
+
+#define TOPLEVEL(_name, _args, _nlcmd, _flags, _idby, _handler, _help)	\
+	const struct cmd						\
+	__section ## _ ## _name						\
+	__attribute__((used)) __attribute__((section("__cmd")))	= {	\
+		.name = (#_name),					\
+		.args = (_args),					\
+		.cmd = (_nlcmd),					\
+		.nl_msg_flags = (_flags),				\
+		.idby = (_idby),					\
+		.handler = (_handler),					\
+		.help = (_help),					\
+	 }
+#define SECTION(_name)							\
+	const struct cmd __section ## _ ## _name			\
+	__attribute__((used)) __attribute__((section("__cmd"))) = {	\
+		.name = (#_name),					\
+		.hidden = 1,						\
+	}
+
+#define DECLARE_SECTION(_name)						\
+	extern const struct cmd __section ## _ ## _name;
 
 extern const char iw_version[];
 
@@ -125,4 +143,8 @@ enum print_ie_type {
 void print_ies(unsigned char *ie, int ielen, bool unknown,
 	       enum print_ie_type ptype);
 
+
+DECLARE_SECTION(set);
+DECLARE_SECTION(get);
+
 #endif /* __IW_H */
diff --git a/link.c b/link.c
index 03acf58..c17f055 100644
--- a/link.c
+++ b/link.c
@@ -105,8 +105,6 @@ static int handle_scan_for_link(struct nl80211_state *state,
 	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, link_bss_handler, &lr);
 	return 0;
 }
-HIDDEN(link, get_bss, NULL, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
-	CIB_NETDEV, handle_scan_for_link);
 
 static int print_link_sta(struct nl_msg *msg, void *arg)
 {
@@ -213,8 +211,6 @@ static int handle_link_sta(struct nl80211_state *state,
  nla_put_failure:
 	return -ENOBUFS;
 }
-HIDDEN(link, get_sta, "", NL80211_CMD_GET_STATION, 0,
-	CIB_NETDEV, handle_link_sta);
 
 static int handle_link(struct nl80211_state *state, struct nl_cb *cb,
 		       struct nl_msg *msg, int argc, char **argv)
@@ -255,3 +251,7 @@ static int handle_link(struct nl80211_state *state, struct nl_cb *cb,
 }
 TOPLEVEL(link, NULL, 0, 0, CIB_NETDEV, handle_link,
 	 "Print information about the current link, if any.");
+HIDDEN(link, get_sta, "", NL80211_CMD_GET_STATION, 0,
+	CIB_NETDEV, handle_link_sta);
+HIDDEN(link, get_bss, NULL, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
+	CIB_NETDEV, handle_scan_for_link);
diff --git a/mpath.c b/mpath.c
index d590cff..e848481 100644
--- a/mpath.c
+++ b/mpath.c
@@ -11,6 +11,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(mpath);
+
 enum plink_state {
 	LISTEN,
 	OPN_SNT,
diff --git a/reg.c b/reg.c
index a6bd74c..7f82e08 100644
--- a/reg.c
+++ b/reg.c
@@ -12,6 +12,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(reg);
+
 #define MHZ_TO_KHZ(freq) ((freq) * 1000)
 #define KHZ_TO_MHZ(freq) ((freq) / 1000)
 #define DBI_TO_MBI(gain) ((gain) * 100)
diff --git a/scan.c b/scan.c
index b2d986b..9941775 100644
--- a/scan.c
+++ b/scan.c
@@ -108,10 +108,6 @@ static int handle_scan(struct nl80211_state *state,
 	nlmsg_free(freqs);
 	return err;
 }
-COMMAND(scan, trigger, "[freq <freq>*] [ssid <ssid>*|passive]",
-	NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan,
-	 "Trigger a scan on the given frequencies with probing for the given\n"
-	 "SSIDs (or wildcard if not given) unless passive scanning is requested.");
 
 static void tab_on_first(bool *first)
 {
@@ -877,10 +873,6 @@ static int handle_scan_dump(struct nl80211_state *state,
 		  &scan_params);
 	return 0;
 }
-COMMAND(scan, dump, "[-u]",
-	NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump,
-	"Dump the current scan results. If -u is specified, print unknown\n"
-	"data in scan results.");
 
 static int handle_scan_combined(struct nl80211_state *state,
 				struct nl_cb *cb,
@@ -959,3 +951,11 @@ TOPLEVEL(scan, "[-u] [freq <freq>*] [ssid <ssid>*|passive]", 0, 0,
 	 "Scan on the given frequencies and probe for the given SSIDs\n"
 	 "(or wildcard if not given) unless passive scanning is requested.\n"
 	 "If -u is specified print unknown data in the scan results.");
+COMMAND(scan, dump, "[-u]",
+	NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump,
+	"Dump the current scan results. If -u is specified, print unknown\n"
+	"data in scan results.");
+COMMAND(scan, trigger, "[freq <freq>*] [ssid <ssid>*|passive]",
+	NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan,
+	 "Trigger a scan on the given frequencies with probing for the given\n"
+	 "SSIDs (or wildcard if not given) unless passive scanning is requested.");
diff --git a/sections.c b/sections.c
new file mode 100644
index 0000000..38095f6
--- /dev/null
+++ b/sections.c
@@ -0,0 +1,4 @@
+#include "iw.h"
+
+SECTION(get);
+SECTION(set);
diff --git a/station.c b/station.c
index 33a9cad..0fff92d 100644
--- a/station.c
+++ b/station.c
@@ -11,6 +11,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(station);
+
 enum plink_state {
 	LISTEN,
 	OPN_SNT,


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- iw.spec	4 Sep 2009 13:53:29 -0000	1.16
+++ iw.spec	4 Sep 2009 16:21:41 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -13,6 +13,8 @@ BuildRequires: kernel-devel >= 2.6.24 
 BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
+Patch0:         iw-avoid-section-type-conflict-on-ppc64.patch
+
 %description
 iw is a new nl80211 based CLI configuration utility for wireless devices.
 Currently you can only use this utility to configure devices which
@@ -21,6 +23,7 @@ only because most new wireless devices b
 
 %prep
 %setup -q
+%patch0 -p1 -R
 
 
 %build
@@ -43,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-2
+- Revert "separate commands into sections", section type conflicts on ppc64
+
 * Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-1
 - Update to 0.9.17
 



From wtogami at fedoraproject.org  Fri Sep  4 16:24:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri,  4 Sep 2009 16:24:54 +0000 (UTC)
Subject: rpms/perl-Digest-SHA/EL-5 .cvsignore, 1.2, 1.3 perl-Digest-SHA.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090904162454.A34CE11C0082@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Digest-SHA/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22224

Modified Files:
	.cvsignore perl-Digest-SHA.spec sources 
Log Message:
5.47 for EPEL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-SHA/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 20:59:54 -0000	1.2
+++ .cvsignore	4 Sep 2009 16:24:54 -0000	1.3
@@ -1 +1 @@
-Digest-SHA-5.44.tar.gz
+Digest-SHA-5.47.tar.gz


Index: perl-Digest-SHA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-SHA/EL-5/perl-Digest-SHA.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Digest-SHA.spec	20 Jun 2007 20:59:54 -0000	1.1
+++ perl-Digest-SHA.spec	4 Sep 2009 16:24:54 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Digest-SHA
-Version:        5.44
-Release:        5%{?dist}
+Version:        5.47
+Release:        1%{?dist}
 Summary:        Perl extension for SHA-1/224/256/384/512
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Digest-SHA/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSHELOR/Digest-SHA-%{version}.tar.gz
@@ -57,6 +57,19 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 04 2009 Warren Togami <wtogami at redhat.com> - 5.47-1
+- 5.47-1
+
+* Thu Apr 10 2008 Wes Hardaker <wjhns174 at hardakers.net> - 5.46-1
+- Update to upstream 5.46 for minor bug fixes
+
+* Fri Nov  9 2007 Wes Hardaker <wjhns174 at hardakers.net> - 5.45-1
+- Update to upstream 5.45
+- Change license to match new licensing tags
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.44-6
+- Rebuild for selinux ppc32 issue.
+
 * Fri Jun  1 2007 Wes Hardaker <wjhns174 at hardakers.net> - 5.44-5
 - fix changelog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-SHA/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jun 2007 20:59:54 -0000	1.2
+++ sources	4 Sep 2009 16:24:54 -0000	1.3
@@ -1 +1 @@
-bddab365973a795baddc3ec3fb84d16e  Digest-SHA-5.44.tar.gz
+03ff8e4ea73a1c2c5de005d5e4160e94  Digest-SHA-5.47.tar.gz



From hadess at fedoraproject.org  Fri Sep  4 16:37:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  4 Sep 2009 16:37:46 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.45, 1.46 bluez.spec, 1.94,
	1.95 sources, 1.45, 1.46
Message-ID: <20090904163746.1F76211C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26324

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Fri Sep 04 2009 Bastien Nocera <bnocera at redhat.com> 4.52-1
- Update to 4.52



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	3 Sep 2009 09:36:56 -0000	1.45
+++ .cvsignore	4 Sep 2009 16:37:45 -0000	1.46
@@ -1 +1 @@
-bluez-4.51.tar.gz
+bluez-4.52.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- bluez.spec	3 Sep 2009 09:57:36 -0000	1.94
+++ bluez.spec	4 Sep 2009 16:37:45 -0000	1.95
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.51
+Version: 4.52
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -271,6 +271,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Fri Sep 04 2009 Bastien Nocera <bnocera at redhat.com> 4.52-1
+- Update to 4.52
+
 * Thu Sep 03 2009 Bastien Nocera <bnocera at redhat.com> 4.51-1
 - Update to 4.51
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	3 Sep 2009 09:36:56 -0000	1.45
+++ sources	4 Sep 2009 16:37:45 -0000	1.46
@@ -1 +1 @@
-9693387139bc0c68657fbfe8ceb2fd8d  bluez-4.51.tar.gz
+a5da4cdb7135dc55afa28447a186bd2a  bluez-4.52.tar.gz



From nosnilmot at fedoraproject.org  Fri Sep  4 16:50:19 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Fri,  4 Sep 2009 16:50:19 +0000 (UTC)
Subject: rpms/libsilc/devel silc-toolkit-1.1.8-CVE-2008-7160.patch, NONE,
	1.1 libsilc.spec, 1.29, 1.30
Message-ID: <20090904165019.34B0311C0380@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28981/devel

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-CVE-2008-7160.patch 
Log Message:
- Backport patch to fix stack corruption (CVE-2008-7160) (#521256)


silc-toolkit-1.1.8-CVE-2008-7160.patch:
 silchttpserver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE silc-toolkit-1.1.8-CVE-2008-7160.patch ---
From: Kp <kp at valhallalegends.com>
Date: Sat, 13 Dec 2008 03:38:54 +0000 (-0600)
Subject: HTTP: fix stack overwrite due to format string error.
X-Git-Tag: silc.server.1.1.15~6^2~8
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=b2b91b074b6701455053425b583a6fd0beedc8cc

HTTP: fix stack overwrite due to format string error.

On AMD64, %lu refers to a 64-bit unsigned value, but the address passed
to sscanf points to a 32-bit unsigned value.  This causes an adjoining
value on the stack to be overwritten with data from the converted
integer.  Fix the format string to match the size of the supplied value,
and remove the pointer cast.
---

diff --git a/lib/silchttp/silchttpserver.c b/lib/silchttp/silchttpserver.c
index cd94c40..e83d2f3 100644
--- a/lib/silchttp/silchttpserver.c
+++ b/lib/silchttp/silchttpserver.c
@@ -194,7 +194,7 @@ static SilcBool silc_http_server_parse(SilcHttpServer httpd,
 
     /* Check we have received all data */
     cl = silc_mime_get_field(conn->curheaders, "Content-Length");
-    if (cl && sscanf(cl, "%lu", (unsigned long *)&cll) == 1) {
+    if (cl && sscanf(cl, "%u", &cll) == 1) {
       if (data_len < cll) {
 	/* More data to come */
 	silc_mime_free(conn->curheaders);


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libsilc.spec	4 Sep 2009 14:38:01 -0000	1.29
+++ libsilc.spec	4 Sep 2009 16:50:18 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 6%{dist}
+Release: 7%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -12,6 +12,7 @@ Patch2:  silc-toolkit-1.1.5-docinst.patc
 Patch3:  silc-toolkit-1.1.8-libtool.patch
 Patch4:  silc-toolkit-1.1.8-stringformat.patch
 Patch5:  silc-toolkit-1.1.8-stringformat2.patch
+Patch6:  silc-toolkit-1.1.8-CVE-2008-7160.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -48,6 +49,7 @@ applications.
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .stringformat
 %patch5 -p1 -b .stringformat2
+%patch6 -p1 -b .CVE-2008-7160
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -137,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-7
+- Backport patch to fix stack corruption (CVE-2008-7160) (#521256)
+
 * Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-6
 - Backport patch to fix additional string format vulnerabilities (#515648)
 



From nosnilmot at fedoraproject.org  Fri Sep  4 16:50:19 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Fri,  4 Sep 2009 16:50:19 +0000 (UTC)
Subject: rpms/libsilc/F-10 silc-toolkit-1.1.8-CVE-2008-7160.patch, NONE,
	1.1 libsilc.spec, 1.26, 1.27
Message-ID: <20090904165019.5296E11C0380@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28981/F-10

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-CVE-2008-7160.patch 
Log Message:
- Backport patch to fix stack corruption (CVE-2008-7160) (#521256)


silc-toolkit-1.1.8-CVE-2008-7160.patch:
 silchttpserver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE silc-toolkit-1.1.8-CVE-2008-7160.patch ---
From: Kp <kp at valhallalegends.com>
Date: Sat, 13 Dec 2008 03:38:54 +0000 (-0600)
Subject: HTTP: fix stack overwrite due to format string error.
X-Git-Tag: silc.server.1.1.15~6^2~8
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=b2b91b074b6701455053425b583a6fd0beedc8cc

HTTP: fix stack overwrite due to format string error.

On AMD64, %lu refers to a 64-bit unsigned value, but the address passed
to sscanf points to a 32-bit unsigned value.  This causes an adjoining
value on the stack to be overwritten with data from the converted
integer.  Fix the format string to match the size of the supplied value,
and remove the pointer cast.
---

diff --git a/lib/silchttp/silchttpserver.c b/lib/silchttp/silchttpserver.c
index cd94c40..e83d2f3 100644
--- a/lib/silchttp/silchttpserver.c
+++ b/lib/silchttp/silchttpserver.c
@@ -194,7 +194,7 @@ static SilcBool silc_http_server_parse(SilcHttpServer httpd,
 
     /* Check we have received all data */
     cl = silc_mime_get_field(conn->curheaders, "Content-Length");
-    if (cl && sscanf(cl, "%lu", (unsigned long *)&cll) == 1) {
+    if (cl && sscanf(cl, "%u", &cll) == 1) {
       if (data_len < cll) {
 	/* More data to come */
 	silc_mime_free(conn->curheaders);


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-10/libsilc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libsilc.spec	4 Sep 2009 14:38:02 -0000	1.26
+++ libsilc.spec	4 Sep 2009 16:50:19 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 6%{dist}
+Release: 7%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -12,6 +12,7 @@ Patch2:  silc-toolkit-1.1.5-docinst.patc
 Patch3:  silc-toolkit-1.1.8-libtool.patch
 Patch4:  silc-toolkit-1.1.8-stringformat.patch
 Patch5:  silc-toolkit-1.1.8-stringformat2.patch
+Patch6:  silc-toolkit-1.1.8-CVE-2008-7160.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -48,6 +49,7 @@ applications.
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .stringformat
 %patch5 -p1 -b .stringformat2
+%patch6 -p1 -b .CVE-2008-7160
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -137,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-7
+- Backport patch to fix stack corruption (CVE-2008-7160) (#521256)
+
 * Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-6
 - Backport patch to fix additional string format vulnerabilities (#515648)
 



From nosnilmot at fedoraproject.org  Fri Sep  4 16:50:19 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Fri,  4 Sep 2009 16:50:19 +0000 (UTC)
Subject: rpms/libsilc/F-11 silc-toolkit-1.1.8-CVE-2008-7160.patch, NONE,
	1.1 libsilc.spec, 1.28, 1.29
Message-ID: <20090904165019.7D94311C0380@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28981/F-11

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-CVE-2008-7160.patch 
Log Message:
- Backport patch to fix stack corruption (CVE-2008-7160) (#521256)


silc-toolkit-1.1.8-CVE-2008-7160.patch:
 silchttpserver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE silc-toolkit-1.1.8-CVE-2008-7160.patch ---
From: Kp <kp at valhallalegends.com>
Date: Sat, 13 Dec 2008 03:38:54 +0000 (-0600)
Subject: HTTP: fix stack overwrite due to format string error.
X-Git-Tag: silc.server.1.1.15~6^2~8
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=b2b91b074b6701455053425b583a6fd0beedc8cc

HTTP: fix stack overwrite due to format string error.

On AMD64, %lu refers to a 64-bit unsigned value, but the address passed
to sscanf points to a 32-bit unsigned value.  This causes an adjoining
value on the stack to be overwritten with data from the converted
integer.  Fix the format string to match the size of the supplied value,
and remove the pointer cast.
---

diff --git a/lib/silchttp/silchttpserver.c b/lib/silchttp/silchttpserver.c
index cd94c40..e83d2f3 100644
--- a/lib/silchttp/silchttpserver.c
+++ b/lib/silchttp/silchttpserver.c
@@ -194,7 +194,7 @@ static SilcBool silc_http_server_parse(SilcHttpServer httpd,
 
     /* Check we have received all data */
     cl = silc_mime_get_field(conn->curheaders, "Content-Length");
-    if (cl && sscanf(cl, "%lu", (unsigned long *)&cll) == 1) {
+    if (cl && sscanf(cl, "%u", &cll) == 1) {
       if (data_len < cll) {
 	/* More data to come */
 	silc_mime_free(conn->curheaders);


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-11/libsilc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libsilc.spec	4 Sep 2009 14:38:02 -0000	1.28
+++ libsilc.spec	4 Sep 2009 16:50:19 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 6%{dist}
+Release: 7%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -12,6 +12,7 @@ Patch2:  silc-toolkit-1.1.5-docinst.patc
 Patch3:  silc-toolkit-1.1.8-libtool.patch
 Patch4:  silc-toolkit-1.1.8-stringformat.patch
 Patch5:  silc-toolkit-1.1.8-stringformat2.patch
+Patch6:  silc-toolkit-1.1.8-CVE-2008-7160.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -48,6 +49,7 @@ applications.
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .stringformat
 %patch5 -p1 -b .stringformat2
+%patch6 -p1 -b .CVE-2008-7160
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -137,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-7
+- Backport patch to fix stack corruption (CVE-2008-7160) (#521256)
+
 * Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-6
 - Backport patch to fix additional string format vulnerabilities (#515648)
 



From than at fedoraproject.org  Fri Sep  4 17:00:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 17:00:38 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames.spec,1.119,1.120
Message-ID: <20090904170038.422AF11C02C8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31046

Modified Files:
	kdegames.spec 
Log Message:
_default_patch_fuzz 2



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- kdegames.spec	1 Sep 2009 17:29:52 -0000	1.119
+++ kdegames.spec	4 Sep 2009 17:00:37 -0000	1.120
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6



From than at fedoraproject.org  Fri Sep  4 17:03:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 17:03:20 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames.spec,1.131,1.132
Message-ID: <20090904170320.924BA11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384

Modified Files:
	kdegames.spec 
Log Message:
_default_patch_fuzz 2



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- kdegames.spec	1 Sep 2009 17:29:52 -0000	1.131
+++ kdegames.spec	4 Sep 2009 17:03:20 -0000	1.132
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6



From emaldonado at fedoraproject.org  Fri Sep  4 17:12:00 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:12:00 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.11,1.12
Message-ID: <20090904171200.5749E11C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6739

Modified Files:
	nss-util.spec 
Log Message:
Don't require sqlite


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nss-util.spec	3 Sep 2009 21:35:27 -0000	1.11
+++ nss-util.spec	4 Sep 2009 17:12:00 -0000	1.12
@@ -8,7 +8,6 @@ License:          MPLv1.1 or GPLv2+ or L
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
-Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    zlib-devel
@@ -64,7 +63,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
@@ -128,6 +126,8 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-u
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 
+# FIXME - Bug 521155
+# Will fix later for stability reasons
 # Copy the binary libraries we want
 for file in libnssutil3.so
 do
@@ -161,7 +161,8 @@ done
 
 %files devel
 %defattr(-,root,root)
-# this is a symbolic link to the shared library in /%{_lib}
+# FIXME - bug 521155, will fix later for stability
+# this is a symbolic link to the shared library in "%"{_lib}
 %{_libdir}/libnssutil3.so
 # package configuration files
 %{_libdir}/pkgconfig/nss-util.pc
@@ -205,6 +206,7 @@ done
 %changelog
 * Thu Sep 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
 - Update to 3.12.4
+- Don't require sqlite
 
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-15
 - Bump the release number for a chained build of nss-util, nss-softokn and nss



From emaldonado at fedoraproject.org  Fri Sep  4 17:14:44 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:14:44 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.16,1.17
Message-ID: <20090904171444.8A2F811C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8073

Modified Files:
	nss-softokn.spec 
Log Message:
update to 3.12.4, don't require sqlite, and fix postun logic


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nss-softokn.spec	31 Aug 2009 17:09:12 -0000	1.16
+++ nss-softokn.spec	4 Sep 2009 17:14:44 -0000	1.17
@@ -16,15 +16,14 @@
 
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
-Version:          3.12.3.99.3
-Release:          24%{?dist}
+Version:          3.12.4
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
-Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-util-devel >= %{version}
@@ -52,11 +51,6 @@ Source2:          nss-softokn.pc.in
 Source3:          nss-softokn-config.in
 Source4:          nss-softokn-prelink.conf
 
-# patches moved here from nss because they affect softoken only
-# won't be needed when we upgrade to 3.12.4
-Patch1:           nss-nolocalsql.patch
-Patch2:           nss-stubs-bug502133.patch
-
 %description
 Network Security Services Softoken Cryptographic Module
 
@@ -90,11 +84,6 @@ Header and Library files for doing devel
 %prep
 %setup -q
 
-# patches moved here from nss because they affect softokn only
-# they won't be needed when we upgrade to 3.12.4
-%patch1 -p0
-%patch2 -p0 -b .502133
-
 %build
 
 FREEBL_NO_DEPEND=1
@@ -195,6 +184,7 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
+# FIXME - bug 521155, will fix later for stability
 # Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
 do
@@ -202,6 +192,7 @@ do
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
+# FIXME - bug 521155, will fix later for stability
 # Make sure chk files can be found in both places
 for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
 do
@@ -241,7 +232,7 @@ done
 # 2) prelink is already installed, and nss-softokn is installed or upgraded
 %triggerin -- prelink
 %{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
- %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 # This trigger scriptlet is run when:
 # 1) prelink is installed, and nss-softokn removed
@@ -250,17 +241,20 @@ done
 [ $2 = 0 ] || exit 0
 %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
-
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 != 0 ] || %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
-
+[ $1 > 0 ] then;
+  %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+fi
+exit 0
 
 %files
 %defattr(-,root,root)
+# FIXME - bug 521155, will fix later for stability
+# this would be replaced with the ones in devel
 /%{_lib}/libnssdbm3.so
 /%{_lib}/libnssdbm3.chk
 /%{_lib}/libsoftokn3.so
@@ -283,6 +277,8 @@ done
 
 %files devel
 %defattr(-,root,root)
+# FIXME - bug 521155, will fix later for stability
+# these ar currently symbloc links to the libraries in "%"{_lib}
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libsoftokn3.chk
 %{_libdir}/libfreebl3.so
@@ -312,6 +308,11 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Sep 01 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Fix logic on postun
+- Don't require sqlite
+
 * Mon Aug 31 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-24
 - Fixed test on %postun to avoid returning 1 when nss-softokn instances still remain
 



From emaldonado at fedoraproject.org  Fri Sep  4 17:21:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:21:49 +0000 (UTC)
Subject: rpms/nss-softokn/devel sources,1.2,1.3
Message-ID: <20090904172149.2249B11C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9716

Modified Files:
	sources 
Log Message:
Updated to 3.12.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Aug 2009 23:50:25 -0000	1.2
+++ sources	4 Sep 2009 17:21:48 -0000	1.3
@@ -1 +1 @@
-8ce48b882e74d1be03aced9d455b834f  nss-softokn-3.12.3.99.3-stripped.tar.bz2
+954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2



From emaldonado at fedoraproject.org  Fri Sep  4 17:28:22 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:28:22 +0000 (UTC)
Subject: rpms/nss-softokn/devel sources,1.3,1.4
Message-ID: <20090904172822.C599211C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12298

Modified Files:
	sources 
Log Message:
Fix the name of the source tar ball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2009 17:21:48 -0000	1.3
+++ sources	4 Sep 2009 17:28:22 -0000	1.4
@@ -1 +1 @@
-954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+d4f0a0b8824bb9864f18f38ec965873c  nss-softokn-3.12.4-stripped.tar.bz2



From emaldonado at fedoraproject.org  Fri Sep  4 17:33:58 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:33:58 +0000 (UTC)
Subject: rpms/nss/devel nss-stubs-bug502133.patch, 1.5,
	NONE nss-nolocalsql.patch, 1.6, NONE
Message-ID: <20090904173358.93FC011C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13469

Removed Files:
	nss-stubs-bug502133.patch nss-nolocalsql.patch 
Log Message:
Not needed once we upd



--- nss-stubs-bug502133.patch DELETED ---


--- nss-nolocalsql.patch DELETED ---



From emaldonado at fedoraproject.org  Fri Sep  4 17:35:52 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:35:52 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-stubs-bug502133.patch, 1.1,
	NONE nss-nolocalsql.patch, 1.1, NONE
Message-ID: <20090904173552.614D811C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14160

Removed Files:
	nss-stubs-bug502133.patch nss-nolocalsql.patch 
Log Message:
Patches already applied in 3.12.4


--- nss-stubs-bug502133.patch DELETED ---


--- nss-nolocalsql.patch DELETED ---



From cebbert at fedoraproject.org  Fri Sep  4 17:47:08 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  4 Sep 2009 17:47:08 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch,
	NONE, 1.1 linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch, NONE,
	1.1 kernel.spec, 1.1726, 1.1727 lirc-2.6.31.patch, 1.2, 1.3
Message-ID: <20090904174708.E100F11C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18474

Modified Files:
	kernel.spec lirc-2.6.31.patch 
Added Files:
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
Log Message:
Added additional fixes needed for #514787:
  linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch
Fix up lirc patch context so it applies.

linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch:
 lmb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu, 27 Aug 2009 07:20:30 +0000 (+1000)
Subject: lmb: Remove __init from lmb_end_of_DRAM()
X-Git-Tag: v2.6.31-rc8~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4f8ee2c9cc0e885d2bb50ef26db66150ab25213e

lmb: Remove __init from lmb_end_of_DRAM()

We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
without IOMMU, but this function is marked as __init.

I don't think there's a clean way to get the top of RAM max_pfn doesn't
appear to include highmem or I missed (or we have a bug :-) so for now,
let's just avoid having a broken 2.6.31 by making this function
non-__init and we can revisit later.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/lib/lmb.c b/lib/lmb.c
index e4a6482..0343c05 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
 	return lmb.memory.size;
 }
 
-u64 __init lmb_end_of_DRAM(void)
+u64 lmb_end_of_DRAM(void)
 {
 	int idx = lmb.memory.cnt - 1;
 

linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch:
 lmb.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 31 Aug 2009 03:48:16 +0000 (+1000)
Subject: lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1a37f184fa7824982a5f434c06981ec46a66cef7

lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h

My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
was also marked as such in the .h

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index c46c895..2442e3f 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
 extern u64 __init __lmb_alloc_base(u64 size,
 		u64 align, u64 max_addr);
 extern u64 __init lmb_phys_mem_size(void);
-extern u64 __init lmb_end_of_DRAM(void);
+extern u64 lmb_end_of_DRAM(void);
 extern void __init lmb_enforce_memory_limit(u64 memory_limit);
 extern int __init lmb_is_reserved(u64 addr);
 extern int lmb_find(struct lmb_property *res);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -p -r1.1726 -r1.1727
--- kernel.spec	2 Sep 2009 04:21:36 -0000	1.1726
+++ kernel.spec	4 Sep 2009 17:47:08 -0000	1.1727
@@ -604,8 +604,10 @@ Patch83: linux-2.6-mm-lru-dont-evict-map
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
-Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch148: linux-2.6-ppc64-vs-broadcom.patch
+Patch145: linux-2.6-imac-transparent-bridge.patch
+Patch146: linux-2.6-ppc64-vs-broadcom.patch
+Patch147: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
+Patch148: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1197,7 +1199,9 @@ ApplyPatch linux-2.6-vio-modalias.patch
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
 # Fix b43 support on no-iommu devices with <1GiB RAM
 ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
- 
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
+
 #
 # SPARC64
 #
@@ -1977,6 +1981,11 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-48
+- Added additional fixes needed for #514787:
+  linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch
+- Fix up lirc patch context so it applies.
+
 * Wed Sep 02 2009 Jarod Wilson <jarod at redhat.com>
 - Make it possible to rmmod lirc_zilog w/o it hanging indefinitely
 - Add transmit support (via port 2 only) on 1st-gen mceusb transceiver

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1243 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15601 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/lirc-2.6.31.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc-2.6.31.patch	2 Sep 2009 04:21:37 -0000	1.2
+++ lirc-2.6.31.patch	4 Sep 2009 17:47:08 -0000	1.3
@@ -53,8 +53,8 @@ index 8dca9d8..f25dc26 100644
 +S:	Maintained
 +
  LINUX SECURITY MODULE (LSM) FRAMEWORK
- M:	Chris Wright <chrisw at sous-sol.org>
- L:	linux-security-module at vger.kernel.org
+ P:	Chris Wright
+ M:	chrisw at sous-sol.org
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index cd50c00..442f94f 100644
 --- a/drivers/input/Kconfig



From emaldonado at fedoraproject.org  Fri Sep  4 17:52:45 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 17:52:45 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.17,1.18
Message-ID: <20090904175245.680AB11C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20106

Modified Files:
	nss-softokn.spec 
Log Message:
Update nss-util-version to 3.12.4


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nss-softokn.spec	4 Sep 2009 17:14:44 -0000	1.17
+++ nss-softokn.spec	4 Sep 2009 17:52:45 -0000	1.18
@@ -1,6 +1,6 @@
 %global nspr_version 4.8
 %global nss_name nss
-%global nss_util_version 3.12.3.99.3
+%global nss_util_version 3.12.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 



From jmoskovc at fedoraproject.org  Fri Sep  4 17:55:36 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri,  4 Sep 2009 17:55:36 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.9, 1.10 abrt.init, 1.1, 1.2 abrt.spec,
	1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20090904175536.6E06B11C0082@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20586

Modified Files:
	.cvsignore abrt.init abrt.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	31 Aug 2009 12:55:40 -0000	1.9
+++ .cvsignore	4 Sep 2009 17:55:36 -0000	1.10
@@ -1 +1 @@
-abrt-0.0.8.tar.gz
+abrt-0.0.8.5.tar.gz


Index: abrt.init
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abrt.init	3 Mar 2009 21:09:07 -0000	1.1
+++ abrt.init	4 Sep 2009 17:55:36 -0000	1.2
@@ -1,15 +1,16 @@
 #!/bin/bash
 # Starts the abrt daemon
 #
-# chkconfig: - 82 16
+# chkconfig: 35 82 16
 # description: Daemon to detect crashing apps
-# processname: abrt
+# processname: abrtd
 ### BEGIN INIT INFO
 # Provides: abrt
 # Required-Start: $syslog $local_fs
 # Required-Stop: $syslog $local_fs
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start and stop crash-carcher daemon
+# Default-Stop: 0 1 2 6
+# Default-Start: 3 5
+# Short-Description: start and stop abrt daemon
 # Description: Listen and dispatch crash events
 ### END INIT INFO
 
@@ -25,22 +26,22 @@ RETVAL=0
 check() {
 	# Check that we're a privileged user
 	[ `id -u` = 0 ] || exit 4
-	
+
 	# Check if abrt is executable
-	test -x /usr/sbin/abrt || exit 5
+	test -x /usr/sbin/abrtd || exit 5
 }
 
 start() {
 
 	check
-	
+
 	# Check if it is already running
 	if [ ! -f /var/lock/subsys/abrt ]; then
-		echo -n $"Starting abrt daemon: "	
-	    daemon /usr/sbin/abrt
-	    RETVAL=$?
-	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt
-	    echo
+		echo -n $"Starting abrt daemon: "
+		daemon /usr/sbin/abrtd
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt
+		echo
 	fi
 	return $RETVAL
 }
@@ -48,24 +49,24 @@ start() {
 stop() {
 
 	check
-	
+
 	echo -n $"Stopping abrt daemon: "
-	killproc /usr/sbin/abrt
+	killproc /usr/sbin/abrtd
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/abrt
 	echo
-    return $RETVAL
+	return $RETVAL
 }
 
 
 restart() {
 	stop
 	start
-}	
+}
 
 reload() {
 	restart
-}	
+}
 
 case "$1" in
 start)


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- abrt.spec	31 Aug 2009 12:55:40 -0000	1.13
+++ abrt.spec	4 Sep 2009 17:55:36 -0000	1.14
@@ -3,13 +3,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 0.0.8
+Version: 0.0.8.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
 Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz
 Source1: abrt.init
+BuildRequires: dbus-devel
 BuildRequires: dbus-c++-devel
 BuildRequires: gtk2-devel
 BuildRequires: curl-devel
@@ -56,6 +57,7 @@ Requires: dbus-python, pygtk2, pygtk2-li
 Provides: abrt-applet = %{version}-%{release}
 Obsoletes: abrt-applet < 0.0.5
 Conflicts: abrt-applet < 0.0.5
+Obsoletes: bug-buddy
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -75,7 +77,7 @@ Summary: %{name}'s kerneloops addon
 Group: System Environment/Libraries
 Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
-Conflicts: kerneloops
+Obsoletes: kerneloops
 Obsoletes: abrt-plugin-kerneloops
 
 %description addon-kerneloops
@@ -199,7 +201,7 @@ make install DESTDIR=$RPM_BUILD_ROOT man
 # remove all .la and .a files
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
-install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/%{name}
+install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd
 mkdir -p $RPM_BUILD_ROOT/var/cache/%{name}
 
 desktop-file-install \
@@ -214,14 +216,14 @@ desktop-file-install \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add %{name}
+/sbin/chkconfig --add %{name}d
 
 %post libs -p /sbin/ldconfig
 
 %preun
-if [ "$1" = 0 ] ; then
-  service %{name} stop >/dev/null 2>&1
-  /sbin/chkconfig --del %{name}
+if [ "$1" -eq "0" ] ; then
+  service %{name}d stop >/dev/null 2>&1
+  /sbin/chkconfig --del %{name}d
 fi
 
 %postun libs -p /sbin/ldconfig
@@ -229,10 +231,10 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING
-%{_sbindir}/%{name}
+%{_sbindir}/%{name}d
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf
-%{_initrddir}/%{name}
+%{_initrddir}/%{name}d
 %dir /var/cache/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
@@ -335,6 +337,22 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep  4 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.8.5-1
+- new version
+- APPLET: added about dialog, removed popup, if icon is not visible, fixed (trac#43) (jmoskovc at redhat.com)
+- renamed abrt to abrtd, few minor spec file fixes (jmoskovc at redhat.com)
+- Made abrt service start by deafult (jmoskovc at redhat.com)
+- add gettext support for all plugins (npajkovs at redhat.com)
+- APPLET: removed the warning bubble about not running abrt service (walters)
+- APPLET: changed tooltip rhbz#520293 (jmoskovc at redhat.com)
+- CommLayerServerDBus: rewrote to use dbus, not dbus-c++ (vda.linux at googlemail.com)
+- fixed timeout on boot causing [ FAILED ] message (vda.linux at googlemail.com)
+- and many other fixes
+
+* Wed Sep 02 2009  Colin Walters <watlers at verbum.org> 0.0.8-2
+- Change Conflicts: kerneloops to be an Obsoletes so we do the right thing
+  on upgrades.  Also add an Obsoletes: bug-buddy.
+
 * Wed Aug 26 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.8-1
 - new version
 - resolved: Bug 518420 -  ordinary user's abrt-applet shows up for root owned crashes (npajkovs)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 Aug 2009 12:55:40 -0000	1.10
+++ sources	4 Sep 2009 17:55:36 -0000	1.11
@@ -1 +1 @@
-0945b2fd88a2d8acd31a171e4a65ed16  abrt-0.0.8.tar.gz
+a66bdfb2d95a2a7c71ac6aa56be98d5e  abrt-0.0.8.5.tar.gz



From emaldonado at fedoraproject.org  Fri Sep  4 18:00:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 18:00:08 +0000 (UTC)
Subject: rpms/nss-softokn/devel .cvsignore,1.2,1.3
Message-ID: <20090904180008.54D7D11C0382@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21337

Modified Files:
	.cvsignore 
Log Message:
correct the source archive to ignore


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Aug 2009 23:52:31 -0000	1.2
+++ .cvsignore	4 Sep 2009 18:00:08 -0000	1.3
@@ -1 +1 @@
-nss-softokn-3.12.3.99.3-stripped.tar.bz2
+nss-softokn-3.12.4-stripped.tar.bz2



From rdieter at fedoraproject.org  Fri Sep  4 18:11:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  4 Sep 2009 18:11:48 +0000 (UTC)
Subject: rpms/OpenEXR/devel OpenEXR.spec,1.29,1.30
Message-ID: <20090904181148.A4E3411C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/OpenEXR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28035

Modified Files:
	OpenEXR.spec 
Log Message:
support -libs on rhel6+ (bug #521309)



Index: OpenEXR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- OpenEXR.spec	29 Jul 2009 18:31:47 -0000	1.29
+++ OpenEXR.spec	4 Sep 2009 18:11:48 -0000	1.30
@@ -1,5 +1,5 @@
 
-%if 0%{?fedora} > 7
+%if 0%{?fedora} > 7 || 0%{?rhel} > 5
 # make -libs subpkg
 %define libs 1
 %endif



From notting at fedoraproject.org  Fri Sep  4 18:27:26 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  4 Sep 2009 18:27:26 +0000 (UTC)
Subject: rpms/initscripts/devel initscripts.spec,1.198,1.199
Message-ID: <20090904182726.7C22E11C0082@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31729

Modified Files:
	initscripts.spec 
Log Message:
Tweak conflict.



Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- initscripts.spec	2 Sep 2009 21:38:27 -0000	1.198
+++ initscripts.spec	4 Sep 2009 18:27:26 -0000	1.199
@@ -6,7 +6,7 @@ Version: 8.98
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1
+Release: 1.1
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuse
 Requires: udev >= 125-1
 Requires: popt >= 1.12-2
 Requires: cpio
-Conflicts: mkinitrd < 4.0, kernel < 2.6.31, mdadm < 2.6.4-3
+Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
@@ -251,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Sep  4 2009 Bill Nottingham <notting at redhat.com> - 8.98-1.1
+- tweak kernel conflict
+
 * Wed Sep  2 2009 Bill Nottingham <notting at redhat.com> - 8.98-1
 - sysconfig.txt: doucment DHCP_HOSTNAME (#498052)
 - 88-clock.rules: Use --systz instead of --hctosys. (#517886, #489494)



From pkgdb at fedoraproject.org  Fri Sep  4 18:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 18:29:47 +0000
Subject: [pkgdb] initscripts: mitr has given up watchcommits
Message-ID: <20090904182947.EEE3A10F859@bastion2.fedora.phx.redhat.com>

mitr has given up the watchcommits acl on initscripts (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Fri Sep  4 18:29:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 18:29:56 +0000
Subject: [pkgdb] initscripts: mitr has given up watchcommits
Message-ID: <20090904182956.88AEB10F890@bastion2.fedora.phx.redhat.com>

mitr has given up the watchcommits acl on initscripts (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Fri Sep  4 18:30:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 18:30:00 +0000
Subject: [pkgdb] initscripts: mitr has given up watchcommits
Message-ID: <20090904182959.E789A10F859@bastion2.fedora.phx.redhat.com>

mitr has given up the watchcommits acl on initscripts (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Fri Sep  4 18:30:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 18:30:05 +0000
Subject: [pkgdb] initscripts: mitr has given up watchcommits
Message-ID: <20090904183005.BD35510F895@bastion2.fedora.phx.redhat.com>

mitr has given up the watchcommits acl on initscripts (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Fri Sep  4 18:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 18:30:07 +0000
Subject: [pkgdb] initscripts: mitr has given up watchcommits
Message-ID: <20090904183007.C6F2810F874@bastion2.fedora.phx.redhat.com>

mitr has given up the watchcommits acl on initscripts (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From wcohen at fedoraproject.org  Fri Sep  4 18:30:32 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri,  4 Sep 2009 18:30:32 +0000 (UTC)
Subject: rpms/oprofile/F-10 oprofile-basename.patch, 1.1,
	NONE oprofile-iaperf.patch, 1.1, NONE oprofile-jvmpi-lgpl.patch,
	1.1, NONE oprofile-verbose.patch, 1.1, NONE
Message-ID: <20090904183032.75AF311C02C8@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32529

Removed Files:
	oprofile-basename.patch oprofile-iaperf.patch 
	oprofile-jvmpi-lgpl.patch oprofile-verbose.patch 
Log Message:
Remove unneeded patches.



--- oprofile-basename.patch DELETED ---


--- oprofile-iaperf.patch DELETED ---


--- oprofile-jvmpi-lgpl.patch DELETED ---


--- oprofile-verbose.patch DELETED ---



From cwickert at fedoraproject.org  Fri Sep  4 18:31:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 18:31:22 +0000 (UTC)
Subject: rpms/rednotebook/F-10 .cvsignore, 1.13, 1.14 rednotebook.spec, 1.17,
	1.18 sources, 1.16, 1.17
Message-ID: <20090904183122.1E37511C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv398/F-10

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Updated to new upstream version 0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	29 Aug 2009 22:34:29 -0000	1.13
+++ .cvsignore	4 Sep 2009 18:31:21 -0000	1.14
@@ -1 +1 @@
-rednotebook-0.8.5.tar.gz
+rednotebook-0.8.6.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/rednotebook.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rednotebook.spec	29 Aug 2009 22:34:29 -0000	1.17
+++ rednotebook.spec	4 Sep 2009 18:31:21 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
+- Updated to new upstream version 0.8.6
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
 - Updated to new upstream version 0.8.5 (fixes #518778)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Aug 2009 22:34:30 -0000	1.16
+++ sources	4 Sep 2009 18:31:21 -0000	1.17
@@ -1 +1 @@
-129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz
+bd4d3962a558c6d7f8952e10b24c2689  rednotebook-0.8.6.tar.gz



From cwickert at fedoraproject.org  Fri Sep  4 18:31:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 18:31:22 +0000 (UTC)
Subject: rpms/rednotebook/F-11 .cvsignore, 1.14, 1.15 rednotebook.spec, 1.17,
	1.18 sources, 1.17, 1.18
Message-ID: <20090904183122.5E1BF11C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv398/F-11

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Updated to new upstream version 0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	29 Aug 2009 22:34:29 -0000	1.14
+++ .cvsignore	4 Sep 2009 18:31:22 -0000	1.15
@@ -1 +1 @@
-rednotebook-0.8.5.tar.gz
+rednotebook-0.8.6.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rednotebook.spec	29 Aug 2009 22:34:29 -0000	1.17
+++ rednotebook.spec	4 Sep 2009 18:31:22 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
+- Updated to new upstream version 0.8.6
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
 - Updated to new upstream version 0.8.5 (fixes #518778)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	29 Aug 2009 22:34:29 -0000	1.17
+++ sources	4 Sep 2009 18:31:22 -0000	1.18
@@ -1 +1 @@
-129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz
+bd4d3962a558c6d7f8952e10b24c2689  rednotebook-0.8.6.tar.gz



From cwickert at fedoraproject.org  Fri Sep  4 18:31:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 18:31:22 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.19, 1.20 rednotebook.spec, 1.19,
	1.20 sources, 1.19, 1.20
Message-ID: <20090904183122.A4A2111C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv398/devel

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Updated to new upstream version 0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	29 Aug 2009 22:30:10 -0000	1.19
+++ .cvsignore	4 Sep 2009 18:31:22 -0000	1.20
@@ -1 +1 @@
-rednotebook-0.8.5.tar.gz
+rednotebook-0.8.6.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- rednotebook.spec	29 Aug 2009 22:30:10 -0000	1.19
+++ rednotebook.spec	4 Sep 2009 18:31:22 -0000	1.20
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
+- Updated to new upstream version 0.8.6
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
 - Updated to new upstream version 0.8.5 (fixes #518778)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Aug 2009 22:30:10 -0000	1.19
+++ sources	4 Sep 2009 18:31:22 -0000	1.20
@@ -1 +1 @@
-129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz
+bd4d3962a558c6d7f8952e10b24c2689  rednotebook-0.8.6.tar.gz



From notting at fedoraproject.org  Fri Sep  4 18:48:10 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  4 Sep 2009 18:48:10 +0000 (UTC)
Subject: rpms/mash/F-11 .cvsignore, 1.44, 1.45 mash.spec, 1.50, 1.51 sources,
	1.46, 1.47
Message-ID: <20090904184810.9DB7311C0381@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3581

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
Update for F-11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	27 Apr 2009 18:39:38 -0000	1.44
+++ .cvsignore	4 Sep 2009 18:48:10 -0000	1.45
@@ -1 +1 @@
-mash-0.5.3.tar.gz
+mash-0.5.8.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/mash.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- mash.spec	27 Apr 2009 18:39:38 -0000	1.50
+++ mash.spec	4 Sep 2009 18:48:10 -0000	1.51
@@ -1,13 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.3
-Release:        1%{?dist}
+Version:        0.5.8
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.redhat.com/notting/mash/
-Source0:        http://people.redhat.com/notting/mash/%{name}-%{version}.tar.gz
+URL:            http://fedorahosted.org/releases/m/a/mash/
+Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
+Patch1:		mash-f12key.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -21,6 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,33 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Aug 11 2009 Bill Nottingham <notting at redhat.com> 0.5.8-3
+- add new F12 key to rawhide mash config
+
+* Fri Jul 24 2009 Bill Nottingham <notting at redhat.com> 0.5.8-2
+- disable deltas for rawhide during payload format mass rebuild
+
+* Mon Jun 29 2009 Bill Nottingham <notting at redhat.com> 0.5.8-1
+- noarch packages can have debuginfo too (#508746)
+- remove wine-arts from multilib whitelist (not needed, doesn't exist)
+
+* Tue Jun 23 2009 Bill Nottingham <notting at redhat.com> 0.5.7-1
+- when using previous runs for deltas, only look in the appropriate arch dirs
+- wine multilib fixes
+
+* Mon Jun 22 2009 Bill Nottingham <notting at redhat.com> 0.5.6-1
+- more gtk2 multilib (#507165)
+- minor transaction speedups
+- handle new yum arch-setting API. (<skvidal at fedoraproject.org>)
+
+* Fri May  8 2009 Bill Nottingham <notting at redhat.com> 0.5.5-1
+- fix setting delta_dirs in config file
+- canonicalize -o option if passed as a relative path
+
+* Wed May  6 2009 Bill Nottingham <notting at redhat.com> 0.5.4-1
+- allow configuring createrepo hash type
+- remove old config files
+
 * Mon Apr 27 2009 Bill Nottingham <notting at redhat.com> 0.5.3-1
 - when copying in old deltas, make sure the signatures match current packages
 - don't delta source and debuginfo packages


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	27 Apr 2009 18:39:38 -0000	1.46
+++ sources	4 Sep 2009 18:48:10 -0000	1.47
@@ -1 +1 @@
-a487d6e4192fb01b44dfb6aa46caa571  mash-0.5.3.tar.gz
+bf01baab29a01b70028bd2668d4455ea  mash-0.5.8.tar.gz



From notting at fedoraproject.org  Fri Sep  4 18:49:21 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  4 Sep 2009 18:49:21 +0000 (UTC)
Subject: rpms/mash/F-11 mash-nosigcheck.patch,NONE,1.1 mash.spec,1.51,1.52
Message-ID: <20090904184921.E5A9711C0082@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3777

Modified Files:
	mash.spec 
Added Files:
	mash-nosigcheck.patch 
Log Message:
Add nosigcheck patch from EL-5.


mash-nosigcheck.patch:
 metadata.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mash-nosigcheck.patch ---
diff -up mash-0.5.8/mash/metadata.py.foo mash-0.5.8/mash/metadata.py
--- mash-0.5.8/mash/metadata.py.foo	2009-06-23 11:05:52.000000000 -0400
+++ mash-0.5.8/mash/metadata.py	2009-07-21 16:06:53.000000000 -0400
@@ -117,8 +117,7 @@ class MetadataNew:
             hdr = rpmUtils.miscutils.hdrFromPackage(ts, file)
             fname = '%s-%s-%s.%s.rpm' % (hdr['name'], hdr['version'], hdr['release'], hdr['arch'])
             if fname in list.keys():
-                if _sigmatches(hdr, list[fname]):
-                    return True
+                return True
             return False
 
         def _copy(file, path):


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/mash.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- mash.spec	4 Sep 2009 18:48:10 -0000	1.51
+++ mash.spec	4 Sep 2009 18:49:21 -0000	1.52
@@ -9,6 +9,7 @@ License:        GPL
 URL:            http://fedorahosted.org/releases/m/a/mash/
 Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
 Patch1:		mash-f12key.patch
+Patch2:		mash-nosigcheck.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -23,6 +24,7 @@ any multlib RPMs that are necessary.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build



From akurtakov at fedoraproject.org  Fri Sep  4 18:52:49 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Sep 2009 18:52:49 +0000 (UTC)
Subject: rpms/ant-contrib/devel ant-contrib.spec,1.7,1.8
Message-ID: <20090904185249.53D8F11C0082@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/ant-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5021/devel

Modified Files:
	ant-contrib.spec 
Log Message:
Install ant contrib in ant.d.


Index: ant-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant-contrib/devel/ant-contrib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ant-contrib.spec	4 Sep 2009 12:00:59 -0000	1.7
+++ ant-contrib.spec	4 Sep 2009 18:52:49 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.9.%{beta_number}%{?dist}
+Release:        0.10.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
@@ -70,11 +70,15 @@ cp -pr build/docs/api/* $RPM_BUILD_ROOT%
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 rm -rf build/docs/api
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
+echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_sysconfdir}/ant.d/ant-contrib
 %{_javadir}/ant/*.jar
 %doc build/docs/LICENSE.txt
 %doc build/docs/tasks/*
@@ -87,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.10.b2
+- Install ant contrib in ant.d.
+
 * Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.9.b2
 - Drop gcj_support.
 - Install as proper ant plugin.



From notting at fedoraproject.org  Fri Sep  4 18:53:59 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  4 Sep 2009 18:53:59 +0000 (UTC)
Subject: rpms/mash/F-11 mash-f12key.patch,NONE,1.1
Message-ID: <20090904185359.F0B0211C0082@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5323

Added Files:
	mash-f12key.patch 
Log Message:
add the patch

mash-f12key.patch:
 rawhide.mash |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mash-f12key.patch ---
commit 190201a52d9067e276f9e71ca5a68a338b4d8917
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Aug 10 15:32:18 2009 -0400

    Add F12 key.

diff --git a/configs/rawhide.mash b/configs/rawhide.mash
index 124de62..6a68ef8 100644
--- a/configs/rawhide.mash
+++ b/configs/rawhide.mash
@@ -10,7 +10,7 @@ multilib_method = devel
 tag = dist-rawhide
 inherit = True
 strict_keys = False
-keys = D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+keys = 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
 repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/
 repoviewtitle = "Fedora Rawhide - %(arch)s"
 arches = i386 x86_64 ppc ppc64



From lucilanga at fedoraproject.org  Fri Sep  4 19:11:17 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  4 Sep 2009 19:11:17 +0000 (UTC)
Subject: rpms/evolution-rspam/F-10 .cvsignore, 1.3, 1.4 evolution-rspam.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090904191117.6113F11C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8032

Modified Files:
	.cvsignore evolution-rspam.spec sources 
Log Message:
* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
- drop patch0 (fixed upstream)
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Apr 2009 19:33:38 -0000	1.3
+++ .cvsignore	4 Sep 2009 19:11:17 -0000	1.4
@@ -1 +1 @@
-evolution-rspam-0.0.8.tar.gz
+evolution-rspam-0.0.10.tar.gz


Index: evolution-rspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-10/evolution-rspam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- evolution-rspam.spec	13 Apr 2009 19:32:19 -0000	1.4
+++ evolution-rspam.spec	4 Sep 2009 19:11:17 -0000	1.5
@@ -1,13 +1,12 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
-Version: 0.0.8
+Version: 0.0.10
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Report_as_Spam
-Patch: rspam-0.0.8-razorconfig.patch
 
 Requires: perl-Razor-Agent
 Requires: pyzor
@@ -28,7 +27,6 @@ See README for more information about re
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .razor
 
 %build
 %configure
@@ -71,6 +69,10 @@ fi
 %{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so
 
 %changelog
+* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
+- drop patch0 (fixed upstream)
+- new upstream release
+
 * Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-1
 - update BR
 - new upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Apr 2009 19:33:39 -0000	1.3
+++ sources	4 Sep 2009 19:11:17 -0000	1.4
@@ -1 +1 @@
-dd8fe595fc36947731d6ab2aacb11eba  evolution-rspam-0.0.8.tar.gz
+07519547dbed3d1b64869a735e9dd595  evolution-rspam-0.0.10.tar.gz



From gavin at fedoraproject.org  Fri Sep  4 19:14:26 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Fri,  4 Sep 2009 19:14:26 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.6, 1.7 etoys.spec, 1.7, 1.8 sources, 
	1.6, 1.7
Message-ID: <20090904191426.A23A811C0082@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8473

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to upstream 4.0.2258



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Aug 2009 01:39:16 -0000	1.6
+++ .cvsignore	4 Sep 2009 19:14:26 -0000	1.7
@@ -1 +1 @@
-etoys-4.0.2247.tar.gz
+etoys-4.0.2258.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- etoys.spec	30 Aug 2009 01:39:16 -0000	1.7
+++ etoys.spec	4 Sep 2009 19:14:26 -0000	1.8
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2247
+%define version 4.0.2258
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -89,12 +89,12 @@ update-desktop-database &> /dev/null || 
 %endif
 %doc ChangeLog LICENSE NOTICE README
 %dir %{_datadir}/etoys
-%{_datadir}/etoys/EtoysActivity.007.pr
+%{_datadir}/etoys/EtoysActivity.017.pr
 %{_datadir}/etoys/EtoysV4.sources
 %{_datadir}/etoys/ExampleEtoys
-%{_datadir}/etoys/Gallery.020.pr
+%{_datadir}/etoys/Gallery.024.pr
 %{_datadir}/etoys/QuickGuides
-%{_datadir}/etoys/Tutorials.009.pr
+%{_datadir}/etoys/Tutorials.011.pr
 %{_datadir}/etoys/etoys.changes
 %{_datadir}/etoys/etoys.image
 %{_bindir}/etoys
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Sep  4 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2258-1
+- pulled in latest upstream release 4.0.2258
+
 * Sat Aug 29 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2247-1
 - pulled in latest upstream release 4.0.2247
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Aug 2009 01:39:16 -0000	1.6
+++ sources	4 Sep 2009 19:14:26 -0000	1.7
@@ -1 +1 @@
-2c1798f176fdf1d5446916a8194ba771  etoys-4.0.2247.tar.gz
+3500170671ddad33cdf8c79a5967aa28  etoys-4.0.2258.tar.gz



From lucilanga at fedoraproject.org  Fri Sep  4 19:26:47 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  4 Sep 2009 19:26:47 +0000 (UTC)
Subject: rpms/evolution-rspam/F-11 .cvsignore, 1.3, 1.4 evolution-rspam.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20090904192647.CDBEB11C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11626

Modified Files:
	.cvsignore evolution-rspam.spec sources 
Log Message:
* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-2
- drop patch0 (fixed upstream)
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Mar 2009 07:53:58 -0000	1.3
+++ .cvsignore	4 Sep 2009 19:26:47 -0000	1.4
@@ -1 +1 @@
-evolution-rspam-0.0.8.tar.gz
+evolution-rspam-0.0.10.tar.gz


Index: evolution-rspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-11/evolution-rspam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- evolution-rspam.spec	6 Apr 2009 05:50:35 -0000	1.7
+++ evolution-rspam.spec	4 Sep 2009 19:26:47 -0000	1.8
@@ -1,13 +1,12 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
-Version: 0.0.8
-Release: 3%{?dist}
+Version: 0.0.10
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Report_as_Spam
-Patch: rspam-0.0.8-razorconfig.patch
 
 Requires: perl-Razor-Agent
 Requires: pyzor
@@ -28,7 +27,6 @@ See README for more information about re
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .razorconfig
 
 %build
 %configure
@@ -76,6 +74,13 @@ fi
 %doc TODO
 
 %changelog
+* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-2
+- drop patch0 (fixed upstream)
+- new upstream release
+
+* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
+- new upstream release
+
 * Mon Apr 06 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-3
 - fix for bug #492319
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Mar 2009 07:53:58 -0000	1.3
+++ sources	4 Sep 2009 19:26:47 -0000	1.4
@@ -1 +1 @@
-dd8fe595fc36947731d6ab2aacb11eba  evolution-rspam-0.0.8.tar.gz
+07519547dbed3d1b64869a735e9dd595  evolution-rspam-0.0.10.tar.gz



From lucilanga at fedoraproject.org  Fri Sep  4 19:28:53 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  4 Sep 2009 19:28:53 +0000 (UTC)
Subject: rpms/evolution-rspam/F-11 evolution-rspam.spec,1.8,1.9
Message-ID: <20090904192853.D7C5B11C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12038

Modified Files:
	evolution-rspam.spec 
Log Message:
* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
- drop patch0 (fixed upstream)
- new upstream release


Index: evolution-rspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-11/evolution-rspam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- evolution-rspam.spec	4 Sep 2009 19:26:47 -0000	1.8
+++ evolution-rspam.spec	4 Sep 2009 19:28:53 -0000	1.9
@@ -1,7 +1,7 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
 Version: 0.0.10
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -74,11 +74,8 @@ fi
 %doc TODO
 
 %changelog
-* Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-2
-- drop patch0 (fixed upstream)
-- new upstream release
-
 * Fri Sep 04 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
+- drop patch0 (fixed upstream)
 - new upstream release
 
 * Mon Apr 06 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-3



From gavin at fedoraproject.org  Fri Sep  4 19:30:43 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Fri,  4 Sep 2009 19:30:43 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.6, 1.7 etoys.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <20090904193043.DF24511C0082@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12438

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to upstream 4.0.2258



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Aug 2009 01:59:50 -0000	1.6
+++ .cvsignore	4 Sep 2009 19:30:43 -0000	1.7
@@ -1 +1 @@
-etoys-4.0.2247.tar.gz
+etoys-4.0.2258.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- etoys.spec	30 Aug 2009 01:59:50 -0000	1.6
+++ etoys.spec	4 Sep 2009 19:30:43 -0000	1.7
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2247
+%define version 4.0.2258
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -89,12 +89,12 @@ update-desktop-database &> /dev/null || 
 %endif
 %doc ChangeLog LICENSE NOTICE README
 %dir %{_datadir}/etoys
-%{_datadir}/etoys/EtoysActivity.007.pr
+%{_datadir}/etoys/EtoysActivity.017.pr
 %{_datadir}/etoys/EtoysV4.sources
 %{_datadir}/etoys/ExampleEtoys
-%{_datadir}/etoys/Gallery.020.pr
+%{_datadir}/etoys/Gallery.024.pr
 %{_datadir}/etoys/QuickGuides
-%{_datadir}/etoys/Tutorials.009.pr
+%{_datadir}/etoys/Tutorials.011.pr
 %{_datadir}/etoys/etoys.changes
 %{_datadir}/etoys/etoys.image
 %{_bindir}/etoys
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Sep  4 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2258-1
+- pulled in latest upstream release 4.0.2258
+
 * Sat Aug 29 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2247-1
 - pulled in latest upstream release 4.0.2247
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Aug 2009 01:59:51 -0000	1.6
+++ sources	4 Sep 2009 19:30:43 -0000	1.7
@@ -1 +1 @@
-2c1798f176fdf1d5446916a8194ba771  etoys-4.0.2247.tar.gz
+3500170671ddad33cdf8c79a5967aa28  etoys-4.0.2258.tar.gz



From lucilanga at fedoraproject.org  Fri Sep  4 19:35:46 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  4 Sep 2009 19:35:46 +0000 (UTC)
Subject: rpms/evolution-rspam/devel .cvsignore, 1.3, 1.4 evolution-rspam.spec,
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090904193546.B3DF311C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13550

Modified Files:
	.cvsignore evolution-rspam.spec sources 
Log Message:
* Thu Sep 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
- drop patch0 (fixed upstream)
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Mar 2009 07:53:58 -0000	1.3
+++ .cvsignore	4 Sep 2009 19:35:46 -0000	1.4
@@ -1 +1 @@
-evolution-rspam-0.0.8.tar.gz
+evolution-rspam-0.0.10.tar.gz


Index: evolution-rspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/devel/evolution-rspam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- evolution-rspam.spec	24 Jul 2009 22:23:42 -0000	1.8
+++ evolution-rspam.spec	4 Sep 2009 19:35:46 -0000	1.9
@@ -1,13 +1,12 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
-Version: 0.0.8
-Release: 4%{?dist}
+Version: 0.0.10
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Report_as_Spam
-Patch: rspam-0.0.8-razorconfig.patch
 
 Requires: perl-Razor-Agent
 Requires: pyzor
@@ -28,7 +27,6 @@ See README for more information about re
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .razorconfig
 
 %build
 %configure
@@ -76,6 +74,10 @@ fi
 %doc TODO
 
 %changelog
+* Thu Sep 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.10-1
+- drop patch0 (fixed upstream)
+- new upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Mar 2009 07:53:58 -0000	1.3
+++ sources	4 Sep 2009 19:35:46 -0000	1.4
@@ -1 +1 @@
-dd8fe595fc36947731d6ab2aacb11eba  evolution-rspam-0.0.8.tar.gz
+07519547dbed3d1b64869a735e9dd595  evolution-rspam-0.0.10.tar.gz



From spot at fedoraproject.org  Fri Sep  4 19:58:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  4 Sep 2009 19:58:13 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 fedora-logos.spec, 1.129, 1.130 sources,
	1.100, 1.101
Message-ID: <20090904195813.EC7EA11C0082@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20924/F-11

Modified Files:
	fedora-logos.spec sources 
Log Message:
11.0.7


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- fedora-logos.spec	19 May 2009 17:36:07 -0000	1.129
+++ fedora-logos.spec	4 Sep 2009 19:58:13 -0000	1.130
@@ -1,18 +1,11 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.6
+Version: 11.0.7
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
-
-# The trademarks contained in this file are the property of Red Hat, Inc.  No
-# license to these trademarks is provided or is necessary if you merely
-# replicate the Fedora code as you downloaded it from the Fedora Project
-# website.  However, there are permissions granted for the use of these marks
-# under certain other conditions.  You may find those permissions at
-# http://fedoraproject.org/wiki/Legal/TrademarkGuidelines and COPYING file.
-License:  Not licensed.  See COPYING file for trademark permission.
+License: Licensed only for approved usage, see COPYING for details. 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -28,12 +21,17 @@ BuildRequires: kde-filesystem
 
 %description
 The fedora-logos package contains image files which incorporate the 
-Fedora trademark and the RPM logo (the "Marks").
-The Marks are trademarks or registered trademarks of Red Hat, Inc.
-in the United States and other countries and are used by permission.
+Fedora trademarks (the "Marks"). The Marks are trademarks or registered 
+trademarks of Red Hat, Inc. in the United States and other countries and 
+are used by permission.
+
+This package and its content may not be distributed with anything but
+unmodified packages from Fedora Project. It can be used in a Fedora Spin, 
+but not in a Fedora Remix. If necessary, this package can be replaced by 
+the more liberally licensed generic-logos package.
 
-See the included COPYING file for information on copying and
-redistribution.
+See the included COPYING file for full information on copying and 
+redistribution of this package and its contents.
 
 %prep
 %setup -q
@@ -43,16 +41,6 @@ redistribution.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
-for i in redhat-pixmaps/*; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
-done
-(cd $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat; \
-for i in *-mini.xpm; do \
-  linkfile=`echo $i | sed -e "s/\(.*\)-mini/mini-\1/"` ; \
-  ln -s $i $linkfile ; \
-done)
-
 # should be ifarch i386
 mkdir -p $RPM_BUILD_ROOT/boot/grub
 install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
@@ -189,6 +177,12 @@ fi
 # end i386 bits
 
 %changelog
+* Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.7-1
+- Update to 11.0.7, fix license tag, description
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.6-1
 - drop "lowres" image, saves a small amount of diskspace
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	19 May 2009 17:36:08 -0000	1.100
+++ sources	4 Sep 2009 19:58:13 -0000	1.101
@@ -1 +1 @@
-2b3c487849e8d94b9f0c2e409f576e5a  fedora-logos-11.0.6.tar.bz2
+46f5981c3c8eb412b2d6c7b94bd6618d  fedora-logos-11.0.7.tar.bz2



From spot at fedoraproject.org  Fri Sep  4 19:58:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  4 Sep 2009 19:58:14 +0000 (UTC)
Subject: rpms/fedora-logos/devel .cvsignore, 1.86, 1.87 fedora-logos.spec,
	1.130, 1.131 sources, 1.100, 1.101
Message-ID: <20090904195814.3206111C0082@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20924/devel

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
11.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	18 May 2009 20:50:59 -0000	1.86
+++ .cvsignore	4 Sep 2009 19:58:13 -0000	1.87
@@ -1 +1 @@
-fedora-logos-11.0.6.tar.bz2
+fedora-logos-11.0.7.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- fedora-logos.spec	24 Jul 2009 22:36:41 -0000	1.130
+++ fedora-logos.spec	4 Sep 2009 19:58:14 -0000	1.131
@@ -1,18 +1,11 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.6
-Release: 2%{?dist}
+Version: 11.0.7
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
-
-# The trademarks contained in this file are the property of Red Hat, Inc.  No
-# license to these trademarks is provided or is necessary if you merely
-# replicate the Fedora code as you downloaded it from the Fedora Project
-# website.  However, there are permissions granted for the use of these marks
-# under certain other conditions.  You may find those permissions at
-# http://fedoraproject.org/wiki/Legal/TrademarkGuidelines and COPYING file.
-License:  Not licensed.  See COPYING file for trademark permission.
+License: Licensed only for approved usage, see COPYING for details. 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -28,12 +21,17 @@ BuildRequires: kde-filesystem
 
 %description
 The fedora-logos package contains image files which incorporate the 
-Fedora trademark and the RPM logo (the "Marks").
-The Marks are trademarks or registered trademarks of Red Hat, Inc.
-in the United States and other countries and are used by permission.
+Fedora trademarks (the "Marks"). The Marks are trademarks or registered 
+trademarks of Red Hat, Inc. in the United States and other countries and 
+are used by permission.
+
+This package and its content may not be distributed with anything but
+unmodified packages from Fedora Project. It can be used in a Fedora Spin, 
+but not in a Fedora Remix. If necessary, this package can be replaced by 
+the more liberally licensed generic-logos package.
 
-See the included COPYING file for information on copying and
-redistribution.
+See the included COPYING file for full information on copying and 
+redistribution of this package and its contents.
 
 %prep
 %setup -q
@@ -43,16 +41,6 @@ redistribution.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
-for i in redhat-pixmaps/*; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
-done
-(cd $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat; \
-for i in *-mini.xpm; do \
-  linkfile=`echo $i | sed -e "s/\(.*\)-mini/mini-\1/"` ; \
-  ln -s $i $linkfile ; \
-done)
-
 # should be ifarch i386
 mkdir -p $RPM_BUILD_ROOT/boot/grub
 install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
@@ -189,6 +177,9 @@ fi
 # end i386 bits
 
 %changelog
+* Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.7-1
+- Update to 11.0.7, fix license tag, description
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	18 May 2009 20:50:59 -0000	1.100
+++ sources	4 Sep 2009 19:58:14 -0000	1.101
@@ -1 +1 @@
-2b3c487849e8d94b9f0c2e409f576e5a  fedora-logos-11.0.6.tar.bz2
+46f5981c3c8eb412b2d6c7b94bd6618d  fedora-logos-11.0.7.tar.bz2



From gavin at fedoraproject.org  Fri Sep  4 20:06:34 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Fri,  4 Sep 2009 20:06:34 +0000 (UTC)
Subject: rpms/etoys/F-10 .cvsignore, 1.6, 1.7 etoys.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090904200634.834FB11C0082@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22985

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to upstream 4.0.2258



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Aug 2009 02:12:17 -0000	1.6
+++ .cvsignore	4 Sep 2009 20:06:34 -0000	1.7
@@ -1 +1 @@
-etoys-4.0.2247.tar.gz
+etoys-4.0.2258.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/etoys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- etoys.spec	30 Aug 2009 02:12:17 -0000	1.5
+++ etoys.spec	4 Sep 2009 20:06:34 -0000	1.6
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2247
+%define version 4.0.2258
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -89,12 +89,12 @@ update-desktop-database &> /dev/null || 
 %endif
 %doc ChangeLog LICENSE NOTICE README
 %dir %{_datadir}/etoys
-%{_datadir}/etoys/EtoysActivity.007.pr
+%{_datadir}/etoys/EtoysActivity.017.pr
 %{_datadir}/etoys/EtoysV4.sources
 %{_datadir}/etoys/ExampleEtoys
-%{_datadir}/etoys/Gallery.020.pr
+%{_datadir}/etoys/Gallery.024.pr
 %{_datadir}/etoys/QuickGuides
-%{_datadir}/etoys/Tutorials.009.pr
+%{_datadir}/etoys/Tutorials.011.pr
 %{_datadir}/etoys/etoys.changes
 %{_datadir}/etoys/etoys.image
 %{_bindir}/etoys
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Sep  4 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2258-1
+- pulled in latest upstream release 4.0.2258
+
 * Sat Aug 29 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2247-1
 - pulled in latest upstream release 4.0.2247
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Aug 2009 02:12:18 -0000	1.6
+++ sources	4 Sep 2009 20:06:34 -0000	1.7
@@ -1 +1 @@
-2c1798f176fdf1d5446916a8194ba771  etoys-4.0.2247.tar.gz
+3500170671ddad33cdf8c79a5967aa28  etoys-4.0.2258.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  4 20:14:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:14:20 +0000
Subject: [pkgdb] constantine-kde-theme was added for jreznik
Message-ID: <20090904201421.0F81010F874@bastion2.fedora.phx.redhat.com>

kevin has added Package constantine-kde-theme with summary Constantine KDE Theme
kevin has approved Package constantine-kde-theme
kevin has added a Fedora devel branch for constantine-kde-theme with an owner of jreznik
kevin has approved constantine-kde-theme in Fedora devel
kevin has approved Package constantine-kde-theme
kevin has set commit to Approved for 107427 on constantine-kde-theme (Fedora devel)
kevin has set checkout to Approved for 107427 on constantine-kde-theme (Fedora devel)
kevin has set build to Approved for 107427 on constantine-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/constantine-kde-theme



From pkgdb at fedoraproject.org  Fri Sep  4 20:14:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:14:24 +0000
Subject: [pkgdb] constantine-kde-theme summary updated by kevin
Message-ID: <20090904201425.25DB910F87F@bastion2.fedora.phx.redhat.com>

kevin set package constantine-kde-theme summary to Constantine KDE Theme

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/constantine-kde-theme



From pkgdb at fedoraproject.org  Fri Sep  4 20:14:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:14:24 +0000
Subject: [pkgdb] constantine-kde-theme (Fedora, devel) updated by kevin
Message-ID: <20090904201425.3A45F10F896@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on constantine-kde-theme (Fedora devel) for rdieter
kevin approved watchcommits on constantine-kde-theme (Fedora devel) for rdieter
kevin approved commit on constantine-kde-theme (Fedora devel) for rdieter
kevin approved build on constantine-kde-theme (Fedora devel) for rdieter
kevin approved approveacls on constantine-kde-theme (Fedora devel) for rdieter
kevin approved watchbugzilla on constantine-kde-theme (Fedora devel) for kkofler
kevin approved watchcommits on constantine-kde-theme (Fedora devel) for kkofler
kevin approved commit on constantine-kde-theme (Fedora devel) for kkofler
kevin approved build on constantine-kde-theme (Fedora devel) for kkofler
kevin approved approveacls on constantine-kde-theme (Fedora devel) for kkofler
kevin approved watchbugzilla on constantine-kde-theme (Fedora devel) for ltinkl
kevin approved watchcommits on constantine-kde-theme (Fedora devel) for ltinkl
kevin approved commit on constantine-kde-theme (Fedora devel) for ltinkl
kevin approved build on constantine-kde-theme (Fedora devel) for ltinkl
kevin approved approveacls on constantine-kde-theme (Fedora devel) for ltinkl
kevin approved watchbugzilla on constantine-kde-theme (Fedora devel) for than
kevin approved watchcommits on constantine-kde-theme (Fedora devel) for than
kevin approved commit on constantine-kde-theme (Fedora devel) for than
kevin approved build on constantine-kde-theme (Fedora devel) for than
kevin approved approveacls on constantine-kde-theme (Fedora devel) for than

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/constantine-kde-theme



From kevin at fedoraproject.org  Fri Sep  4 20:14:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 20:14:32 +0000 (UTC)
Subject: rpms/constantine-kde-theme - New directory
Message-ID: <20090904201432.2203811C0082@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/constantine-kde-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg24487/rpms/constantine-kde-theme

Log Message:
Directory /cvs/pkgs/rpms/constantine-kde-theme added to the repository




From kevin at fedoraproject.org  Fri Sep  4 20:14:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 20:14:32 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel - New directory
Message-ID: <20090904201432.4E37111C02C8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg24487/rpms/constantine-kde-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/constantine-kde-theme/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  4 20:14:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 20:14:38 +0000 (UTC)
Subject: rpms/constantine-kde-theme Makefile,NONE,1.1
Message-ID: <20090904201438.C14FF11C0082@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/constantine-kde-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg24487/rpms/constantine-kde-theme

Added Files:
	Makefile 
Log Message:
Setup of module constantine-kde-theme


--- NEW FILE Makefile ---
# Top level Makefile for module constantine-kde-theme
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  Fri Sep  4 20:14:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Sep 2009 20:14:39 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090904201439.06BF411C0082@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg24487/rpms/constantine-kde-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module constantine-kde-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: constantine-kde-theme
# $Id: Makefile,v 1.1 2009/09/04 20:14:38 kevin Exp $
NAME := constantine-kde-theme
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 Sep  4 20:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:16:18 +0000
Subject: [pkgdb] rgmanager summary updated by kevin
Message-ID: <20090904201618.5EB7410F882@bastion2.fedora.phx.redhat.com>

kevin set package rgmanager summary to Open Source HA Resource Group Failover for Red Hat Cluster

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rgmanager



From pkgdb at fedoraproject.org  Fri Sep  4 20:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:16:18 +0000
Subject: [pkgdb] rgmanager (Fedora, 10) updated by kevin
Message-ID: <20090904201618.7374110F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rgmanager
kevin has set commit to Approved for 107427 on rgmanager (Fedora 10)
kevin has set checkout to Approved for 107427 on rgmanager (Fedora 10)
kevin has set build to Approved for 107427 on rgmanager (Fedora 10)
kevin changed owner of rgmanager in Fedora 10 to fabbione
kevin approved watchbugzilla on rgmanager (Fedora 10) for lon
kevin approved watchcommits on rgmanager (Fedora 10) for lon
kevin approved commit on rgmanager (Fedora 10) for lon
kevin approved build on rgmanager (Fedora 10) for lon
kevin approved approveacls on rgmanager (Fedora 10) for lon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rgmanager



From pkgdb at fedoraproject.org  Fri Sep  4 20:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:16:18 +0000
Subject: [pkgdb] rgmanager (Fedora, 10) updated by kevin
Message-ID: <20090904201618.8E32B10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rgmanager
kevin has set commit to Approved for 107427 on rgmanager (Fedora 11)
kevin has set checkout to Approved for 107427 on rgmanager (Fedora 11)
kevin has set build to Approved for 107427 on rgmanager (Fedora 11)
kevin changed owner of rgmanager in Fedora 11 to fabbione
kevin approved watchbugzilla on rgmanager (Fedora 11) for lon
kevin approved watchcommits on rgmanager (Fedora 11) for lon
kevin approved commit on rgmanager (Fedora 11) for lon
kevin approved build on rgmanager (Fedora 11) for lon
kevin approved approveacls on rgmanager (Fedora 11) for lon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rgmanager



From pkgdb at fedoraproject.org  Fri Sep  4 20:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:16:18 +0000
Subject: [pkgdb] rgmanager (Fedora, 10) updated by kevin
Message-ID: <20090904201618.AB7BB10F8A5@bastion2.fedora.phx.redhat.com>

kevin changed owner of rgmanager in Fedora devel to fabbione
kevin approved watchbugzilla on rgmanager (Fedora devel) for lon
kevin approved watchcommits on rgmanager (Fedora devel) for lon
kevin approved commit on rgmanager (Fedora devel) for lon
kevin approved build on rgmanager (Fedora devel) for lon
kevin approved approveacls on rgmanager (Fedora devel) for lon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rgmanager



From pkgdb at fedoraproject.org  Fri Sep  4 20:18:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:18:05 +0000
Subject: [pkgdb] glew (Fedora EPEL, 4) updated by kevin
Message-ID: <20090904201805.A661D10F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for glew
kevin has set commit to Approved for 107427 on glew (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on glew (Fedora EPEL 4)
kevin has set build to Approved for 107427 on glew (Fedora EPEL 4)
kevin changed owner of glew in Fedora EPEL 4 to orion

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glew



From pkgdb at fedoraproject.org  Fri Sep  4 20:18:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:18:05 +0000
Subject: [pkgdb] glew (Fedora EPEL, 4) updated by kevin
Message-ID: <20090904201805.C199A10F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for glew
kevin has set commit to Approved for 107427 on glew (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on glew (Fedora EPEL 5)
kevin has set build to Approved for 107427 on glew (Fedora EPEL 5)
kevin changed owner of glew in Fedora EPEL 5 to orion

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glew



From pkgdb at fedoraproject.org  Fri Sep  4 20:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:19:15 +0000
Subject: [pkgdb] perl-Math-Calc-Units (Fedora EPEL, 5) updated by kevin
Message-ID: <20090904201916.08BAE10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Math-Calc-Units
kevin has set commit to Approved for 107427 on perl-Math-Calc-Units (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-Math-Calc-Units (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-Math-Calc-Units (Fedora EPEL 5)
kevin changed owner of perl-Math-Calc-Units in Fedora EPEL 5 to ruben
kevin approved watchbugzilla on perl-Math-Calc-Units (Fedora EPEL 5) for jpo
kevin approved watchcommits on perl-Math-Calc-Units (Fedora EPEL 5) for jpo
kevin approved commit on perl-Math-Calc-Units (Fedora EPEL 5) for jpo
kevin approved build on perl-Math-Calc-Units (Fedora EPEL 5) for jpo
kevin approved approveacls on perl-Math-Calc-Units (Fedora EPEL 5) for jpo

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Calc-Units



From than at fedoraproject.org  Fri Sep  4 20:19:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 20:19:42 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs-3.5.10-ossl-1.x.patch, NONE,
	1.1 kdelibs3.spec, 1.69, 1.70
Message-ID: <20090904201942.372CC11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25492

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-ossl-1.x.patch 
Log Message:
openssl-1.0 build fixes


kdelibs-3.5.10-ossl-1.x.patch:
 kopenssl.cc        |   29 +++++++++++++++++++----------
 kopenssl.h         |   16 ++++++++++++++--
 ksmimecrypto.cc    |    2 +-
 ksslcertificate.cc |   32 +++++++++++++++++++++++---------
 4 files changed, 57 insertions(+), 22 deletions(-)

--- NEW FILE kdelibs-3.5.10-ossl-1.x.patch ---
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 18:59:57.000000000 +0200
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 22:05:21.000000000 +0200
@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
 static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
                                    const EVP_CIPHER *,unsigned char *,int ,
                                             pem_password_cb *, void *) = 0L;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
+#else
 static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
 static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
 static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
+#endif
 static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
 static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
 static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
@@ -430,9 +435,14 @@ KConfig *cfg;
       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
+#else
       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
+#endif
       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
@@ -594,7 +604,7 @@ KConfig *cfg;
       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
 #endif
 
 
@@ -982,19 +992,18 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
    else return -1;
 }
 
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
+   else return -1;
+}
+#else
 ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
    else return 0L;
 }
-
-
-int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-   if (K_ASN1_i2d_fp && K_i2d_ASN1_HEADER)
-        return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-   else return -1;
-}
-
+#endif
 
 int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 21:57:38.000000000 +0200
@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
 #include <openssl/stack.h>
 #include <openssl/bn.h>
 #undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
 #endif
 
 #include <kstaticdeleter.h>
@@ -446,12 +449,12 @@ public:
     */
    int PEM_write_bio_X509(BIO *bp, X509 *x);
 
-
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
    /*
     *   X509_asn1_meth - used for netscape output
     */
    ASN1_METHOD *X509_asn1_meth();
-
+#endif
 
    /*
     *   ASN1_i2d_fp - used for netscape output
@@ -531,6 +534,9 @@ public:
     */
    void sk_free(STACK *s);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
 
    /* 
     *  Number of elements in the stack
@@ -543,6 +549,9 @@ public:
     */
    char *sk_value(STACK *s, int n);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
 
    /* 
     *  Create a new stack
@@ -555,6 +564,9 @@ public:
     */
    int sk_push(STACK *s, char *d);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
 
    /* 
     *  Duplicate the stack
diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 18:59:57.000000000 +0200
@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
 
 
 STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
-    STACK_OF(X509) *x509 = sk_new(NULL);
+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
     KSSLCertificate *cert = certs.first();
     while(cert) {
 	sk_X509_push(x509, cert->getCert());
diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 22:08:34.000000000 +0200
@@ -1003,17 +1003,31 @@ return qba;
 QByteArray KSSLCertificate::toNetscape() {
 QByteArray qba;
 #ifdef KSSL_HAVE_SSL
-ASN1_HEADER ah;
-ASN1_OCTET_STRING os;
-KTempFile ktf;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	NETSCAPE_X509 nx;
+	ASN1_OCTET_STRING hdr;
+#else
+   ASN1_HEADER ah;
+   ASN1_OCTET_STRING os;
+#endif
+	KTempFile ktf;
 
-	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-	os.length = strlen(NETSCAPE_CERT_HDR);
-	ah.header = &os;
-	ah.data = (char *)getCert();
-	ah.meth = d->kossl->X509_asn1_meth();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
+	hdr.length = strlen(NETSCAPE_CERT_HDR);
+	nx.header = &hdr;
+	nx.cert = getCert();
+
+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
+#else
+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+   os.length = strlen(NETSCAPE_CERT_HDR);
+   ah.header = &os;
+   ah.data = (char *)getCert();
+   ah.meth = d->kossl->X509_asn1_meth();
 
-	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+#endif
 
 	ktf.close();
 


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- kdelibs3.spec	4 Sep 2009 13:54:49 -0000	1.69
+++ kdelibs3.spec	4 Sep 2009 20:19:42 -0000	1.70
@@ -30,7 +30,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -83,6 +83,7 @@ Patch101: kde-3.5-libtool-shlibext.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
+Patch105: kdelibs-3.5.10-ossl-1.x.patch
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -244,6 +245,7 @@ format for easy browsing
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
 %patch104 -p1 -b .gcc44
+%patch105 -p1 -b .ossl-1.x
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -574,6 +576,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-16
+- openssl-1.0 build fixes
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-15
 - fix for CVE-2009-2702
 



From emaldonado at fedoraproject.org  Fri Sep  4 20:27:11 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 20:27:11 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.18,1.19
Message-ID: <20090904202711.3856311C0381@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992

Modified Files:
	nss-softokn.spec 
Log Message:
Retagging to pick up the correct .cvsignore


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nss-softokn.spec	4 Sep 2009 17:52:45 -0000	1.18
+++ nss-softokn.spec	4 Sep 2009 20:27:10 -0000	1.19
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -308,6 +308,9 @@ exit 0
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Fri Sep 04 2009 serstring=Elio Maldonado<emaldona at redhat.cpm> - 3.12.4-2
+- Retagging to pick up the correct .cvsignore
+
 * Tue Sep 01 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
 - Update to 3.12.4
 - Fix logic on postun



From pkgdb at fedoraproject.org  Fri Sep  4 20:28:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 20:28:41 +0000
Subject: [pkgdb] bind: jroysdon has requested watchcommits
Message-ID: <20090904202841.CC74210F85C@bastion2.fedora.phx.redhat.com>

jroysdon has requested the watchcommits acl on bind (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind



From orion at fedoraproject.org  Fri Sep  4 20:34:34 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  4 Sep 2009 20:34:34 +0000 (UTC)
Subject: rpms/glew/EL-5 glew-1.5.1-makefile.patch, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.2, 1.3 glew.spec, 1.1, 1.2 sources, 1.2,
	1.3 LICENSE-README.fedora, 1.1,
	NONE glew-1.3.6-pathandstrip.patch, 1.1,
	NONE glew-1.4.0-auto-make.patch, 1.1,
	NONE glew-1.4.0-license-doc.patch, 1.1,
	NONE glew-1.4.0-unused-direct-shlib-dependency.patch, 1.1, NONE
Message-ID: <20090904203434.A93B611C0082@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/glew/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29933/EL-5

Modified Files:
	.cvsignore glew.spec sources 
Added Files:
	glew-1.5.1-makefile.patch import.log 
Removed Files:
	LICENSE-README.fedora glew-1.3.6-pathandstrip.patch 
	glew-1.4.0-auto-make.patch glew-1.4.0-license-doc.patch 
	glew-1.4.0-unused-direct-shlib-dependency.patch 
Log Message:
Update to 1.5.1 - sync from devel

glew-1.5.1-makefile.patch:
 Makefile              |   14 +++++++-------
 config/Makefile.linux |   10 ++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

--- NEW FILE glew-1.5.1-makefile.patch ---
diff -up glew/config/Makefile.linux.org glew/config/Makefile.linux
--- glew/config/Makefile.linux.org	2008-11-03 07:25:20.000000000 +0100
+++ glew/config/Makefile.linux	2008-11-13 19:38:43.000000000 +0100
@@ -7,14 +7,8 @@ endif
 PICFLAG = -fPIC
 LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
 M_ARCH ?= $(shell arch)
-ifeq (x86_64,${M_ARCH})
-LDFLAGS.EXTRA = -L/usr/X11R6/lib64
-LIBDIR = $(GLEW_DEST)/lib64
-else
-LDFLAGS.EXTRA = -L/usr/X11R6/lib
-LIBDIR = $(GLEW_DEST)/lib
-endif
-LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
+LIBDIR = $(GLEW_DEST)$(libdir)
+LDFLAGS.GL = -lGL
 LDFLAGS.STATIC = -Wl,-Bstatic
 LDFLAGS.DYNAMIC = -Wl,-Bdynamic
 NAME = GLEW
diff -up glew/Makefile.org glew/Makefile
--- glew/Makefile.org	2008-11-03 07:25:21.000000000 +0100
+++ glew/Makefile	2008-11-13 19:39:41.000000000 +0100
@@ -41,16 +41,16 @@ $(error "Platform '$(SYSTEM)' not suppor
 endif
 
 GLEW_DEST ?= /usr
-BINDIR ?= $(GLEW_DEST)/bin
-LIBDIR ?= $(GLEW_DEST)/lib
-INCDIR ?= $(GLEW_DEST)/include/GL
+BINDIR ?= $(GLEW_DEST)$(bindir)
+LIBDIR ?= $(GLEW_DEST)$(libdir)
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
 SHARED_OBJ_EXT ?= o
 TARDIR = ../glew-$(GLEW_VERSION)
 TARBALL = ../glew_$(GLEW_VERSION).tar.gz
 
 AR = ar
 INSTALL = install
-STRIP = strip
+STRIP = true
 RM = rm -f
 LN = ln -sf
 ifeq ($(MAKECMDGOALS), debug)
@@ -95,7 +95,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS
 	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.SRCS) $(BIN.LIBS)
 
 bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS) lib/$(LIB.SHARED)
-	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS)
+	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS) -lGLU
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) -o $@ $<
@@ -117,7 +117,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
 else
 	$(STRIP) -x lib/$(LIB.SHARED)
-	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
+	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
 endif
 # development files
@@ -132,7 +132,7 @@ else
 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
 endif
 # utilities
-	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
+	$(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
 
 uninstall:
 	$(RM) $(INCDIR)/wglew.h


--- NEW FILE import.log ---
glew-1_5_1-3_fc12:EL-5:glew-1.5.1-3.fc12.src.rpm:1252096280


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Aug 2007 06:30:25 -0000	1.2
+++ .cvsignore	4 Sep 2009 20:34:33 -0000	1.3
@@ -1,2 +1 @@
-glew-1.4.0-src-clean.tgz
-glew-mesa-replacement-headers.tgz
+glew-1.5.1-src.tgz


Index: glew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-5/glew.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glew.spec	19 Aug 2007 06:30:25 -0000	1.1
+++ glew.spec	4 Sep 2009 20:34:34 -0000	1.2
@@ -1,26 +1,13 @@
 Name:           glew
-Version:        1.4.0
+Version:        1.5.1
 Release:        3%{?dist}
 Summary:        The OpenGL Extension Wrangler Library
 Group:          System Environment/Libraries
-License:        BSD
+License:        BSD and MIT
 URL:            http://glew.sourceforge.net
-# This is http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz
-# With the following files removed because they are subject to the
-# "SGI Free Software License B" resp "GLX Public License" :
-# include/GL/glew.h include/GL/glxew.h auto/src/glew_head.h
-# auto/src/glxew_head.h auto/src/sgi_license.h auto/src/glx_license.h
-# doc/sgi.txt doc/glx.txt
-Source0:        glew-%{version}-src-clean.tgz
-# These are modified headers from Mesa, with all post GL[x] 1.1 defines and
-# prototypes removed, these replace the removed encumbered auto/src/glew_head.h
-# and auto/src/glxew_head.h files
-Source1:        glew-mesa-replacement-headers.tgz
-Source2:        LICENSE-README.fedora
-Patch0:         glew-1.3.6-pathandstrip.patch
-Patch1:         glew-1.4.0-auto-make.patch
-Patch2:         glew-1.4.0-unused-direct-shlib-dependency.patch
-Patch3:         glew-1.4.0-license-doc.patch
+
+Source0:        http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz
+Patch0:         glew-1.5.1-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel
 
@@ -44,19 +31,13 @@ Development files for glew
 
 
 %prep
-%setup -q -a 1 -n %{name}
+%setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-cp %{SOURCE2} .
-mkdir auto/registry
-touch auto/registry/.dummy auto/extensions/.dummy
-make -C auto ../include/GL/glew.h
-make -C auto ../include/GL/glxew.h
 
+sed -i -e 's/\r//g' config/config.guess
 
 %build
+
 make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS"
 
 
@@ -78,18 +59,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-README.fedora
+%doc LICENSE.txt
 %{_bindir}/*
 %{_libdir}/libGLEW.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/*
 %{_libdir}/libGLEW.so
 %{_includedir}/GL/*.h
-
+%doc doc/*
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Nov 13 2008 Jochen Schmitt <Jochen herr-schmitt de> - 1.5.1-1
+- New upstream release (#469639)
+- Fix licenseing issue with developer documentation
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.0-2
+- Autorebuild for GCC 4.3
+
+* Mon Jan 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.0-1
+- New upstream version, now SGI licensed stuff free out of the box!
+- Unfortunately some of the included docs are under a non free license,
+  therefor this package is based on a modified tarbal with these files removed
+
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-4
+- Add missing GL_FLOAT_MATXxX defines
+
 * Sat Aug 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-3
 - Fix multiple unused direct shlib dependencies in libGLEW.so
 - Remove the "SGI Free Software License B" and "GLX Public License" tekst from


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Aug 2007 06:30:25 -0000	1.2
+++ sources	4 Sep 2009 20:34:34 -0000	1.3
@@ -1,2 +1 @@
-c8b8f2db1b68886baf6c0849807884b4  glew-1.4.0-src-clean.tgz
-211daf41c394153f3d989195898145a6  glew-mesa-replacement-headers.tgz
+759a59853dfaae4d007b414a3c1712f2  glew-1.5.1-src.tgz


--- LICENSE-README.fedora DELETED ---


--- glew-1.3.6-pathandstrip.patch DELETED ---


--- glew-1.4.0-auto-make.patch DELETED ---


--- glew-1.4.0-license-doc.patch DELETED ---


--- glew-1.4.0-unused-direct-shlib-dependency.patch DELETED ---



From emaldonado at fedoraproject.org  Fri Sep  4 20:42:41 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 20:42:41 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.12,1.13
Message-ID: <20090904204241.2E51511C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31942

Modified Files:
	nss-util.spec 
Log Message:
Retagging for a chained build


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nss-util.spec	4 Sep 2009 17:12:00 -0000	1.12
+++ nss-util.spec	4 Sep 2009 20:42:41 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -204,6 +204,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Fri Sep 04 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
+Retagging for a chained build
+
 * Thu Sep 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
 - Update to 3.12.4
 - Don't require sqlite



From orion at fedoraproject.org  Fri Sep  4 20:47:29 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  4 Sep 2009 20:47:29 +0000 (UTC)
Subject: rpms/glew/EL-4 glew.spec,1.7,1.8
Message-ID: <20090904204729.3C7BA11C0082@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/glew/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv659

Modified Files:
	glew.spec 
Log Message:
* Fri Sep 4 2009 Orion Poplawski <orion at cora.nwra.com> - 1.5.1-3.1
- Fixup BR and patch for EL-4



Index: glew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glew/EL-4/glew.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- glew.spec	25 Jul 2009 00:18:57 -0000	1.7
+++ glew.spec	4 Sep 2009 20:47:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           glew
 Version:        1.5.1
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        The OpenGL Extension Wrangler Library
 Group:          System Environment/Libraries
 License:        BSD and MIT
@@ -9,6 +9,7 @@ URL:            http://glew.sourceforge.
 Source0:        http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz
 Patch0:         glew-1.5.1-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  xorg-x11-Mesa-libGLU
 BuildRequires:  libGLU-devel
 
 %description
@@ -24,6 +25,7 @@ Mac OS X, FreeBSD, Irix, and Solaris.
 Summary:        Development files for glew
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       xorg-x11-Mesa-libGLU
 Requires:       libGLU-devel
 
 %description devel
@@ -32,6 +34,8 @@ Development files for glew
 
 %prep
 %setup -q -n %{name}
+tr -d '\r' < config/Makefile.linux > config/Makefile.linux.new
+mv config/Makefile.linux.new config/Makefile.linux
 %patch0 -p1
 
 sed -i -e 's/\r//g' config/config.guess
@@ -70,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 
 %changelog
+* Fri Sep 4 2009 Orion Poplawski <orion at cora.nwra.com> - 1.5.1-3.1
+- Fixup BR and patch for EL-4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Fri Sep  4 20:51:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 20:51:16 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.13,1.14
Message-ID: <20090904205116.89B7111C0380@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1648

Modified Files:
	nss-util.spec 
Log Message:
Retagging for a chained build


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nss-util.spec	4 Sep 2009 20:42:41 -0000	1.13
+++ nss-util.spec	4 Sep 2009 20:51:16 -0000	1.14
@@ -205,7 +205,7 @@ done
 
 %changelog
 * Fri Sep 04 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
-Retagging for a chained build
+- Retagging for a chained build
 
 * Thu Sep 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
 - Update to 3.12.4



From pkgdb at fedoraproject.org  Fri Sep  4 21:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 21:12:27 +0000
Subject: [pkgdb] ghasher: maximilinux has requested watchcommits
Message-ID: <20090904211227.AC4E410F840@bastion2.fedora.phx.redhat.com>

maximilinux has requested the watchcommits acl on ghasher (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Fri Sep  4 21:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Sep 2009 21:12:27 +0000
Subject: [pkgdb] ghasher: maximilinux has requested watchbugzilla
Message-ID: <20090904211227.E295D10F85C@bastion2.fedora.phx.redhat.com>

maximilinux has requested the watchbugzilla acl on ghasher (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From than at fedoraproject.org  Fri Sep  4 21:16:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 21:16:08 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs-3.5.10-ossl-1.x.patch,1.1,1.2
Message-ID: <20090904211608.0F58111C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7818

Modified Files:
	kdelibs-3.5.10-ossl-1.x.patch 
Log Message:
openssl-1.0 build fixes



kdelibs-3.5.10-ossl-1.x.patch:
 kopenssl.cc        |   22 +++++++++++++++++++---
 kopenssl.h         |   16 ++++++++++++++--
 ksmimecrypto.cc    |    2 +-
 ksslcertificate.cc |   32 +++++++++++++++++++++++---------
 4 files changed, 57 insertions(+), 15 deletions(-)

Index: kdelibs-3.5.10-ossl-1.x.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs-3.5.10-ossl-1.x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-3.5.10-ossl-1.x.patch	4 Sep 2009 20:19:41 -0000	1.1
+++ kdelibs-3.5.10-ossl-1.x.patch	4 Sep 2009 21:16:07 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 18:59:57.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 22:05:21.000000000 +0200
+--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
 @@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
  static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
                                     const EVP_CIPHER *,unsigned char *,int ,
@@ -40,7 +40,7 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenss
  #endif
  
  
-@@ -982,19 +992,18 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
+@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
     else return -1;
  }
  
@@ -55,22 +55,18 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenss
  ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
     if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
     else return 0L;
+@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
+         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
+    else return -1;
  }
 -
--
--int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
--   if (K_ASN1_i2d_fp && K_i2d_ASN1_HEADER)
--        return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
--   else return -1;
--}
--
 +#endif
  
  int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
     if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
 diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
 --- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 21:57:38.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
 @@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
  #include <openssl/stack.h>
  #include <openssl/bn.h>
@@ -128,7 +124,7 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenss
      *  Duplicate the stack
 diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
 --- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 18:59:57.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
 @@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
  
  
@@ -140,7 +136,7 @@ diff -up kdelibs-3.5.10/kio/kssl/ksmimec
  	sk_X509_push(x509, cert->getCert());
 diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
 --- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 22:08:34.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
 @@ -1003,17 +1003,31 @@ return qba;
  QByteArray KSSLCertificate::toNetscape() {
  QByteArray qba;



From thm at fedoraproject.org  Fri Sep  4 21:21:20 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  4 Sep 2009 21:21:20 +0000 (UTC)
Subject: rpms/lmms/devel lmms-0.4.5-libdir.patch, NONE,
	1.1 lmms-0.4.5-libexecdir.patch, NONE,
	1.1 lmms-0.4.5-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 README.fedora, 1.2, 1.3 import.log, 1.4, 1.5 lmms.spec, 1.6,
	1.7 sources, 1.5, 1.6 lmms-0.4.4-fltk-1.1.9-consts.patch, 1.1,
	NONE lmms-0.4.4-fltk-1.1.9-gcc44.patch, 1.1,
	NONE lmms-0.4.4-libdir.patch, 1.1,
	NONE lmms-0.4.4-libexecdir.patch, 1.1,
	NONE lmms-0.4.4-vst-nowine.patch, 1.1, NONE
Message-ID: <20090904212120.4B78A11C0082@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/lmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8887/devel

Modified Files:
	.cvsignore README.fedora import.log lmms.spec sources 
Added Files:
	lmms-0.4.5-libdir.patch lmms-0.4.5-libexecdir.patch 
	lmms-0.4.5-vst-nowine.patch 
Removed Files:
	lmms-0.4.4-fltk-1.1.9-consts.patch 
	lmms-0.4.4-fltk-1.1.9-gcc44.patch lmms-0.4.4-libdir.patch 
	lmms-0.4.4-libexecdir.patch lmms-0.4.4-vst-nowine.patch 
Log Message:
Update to 0.4.5.

lmms-0.4.5-libdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.5-libdir.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-08-11 18:52:15.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:47:48.000000000 +0200
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})

lmms-0.4.5-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/remote_plugin.cpp         |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lmms-0.4.5-libexecdir.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-09-04 20:49:03.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
diff -up lmms-0.4.5/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.5/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.5/plugins/vst_base/CMakeLists.txt.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/plugins/vst_base/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND(
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
diff -up lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -120,7 +120,7 @@ ENDIF(LMMS_BUILD_WIN32)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
 
 ADD_EXECUTABLE(remote_zynaddsubfx remote_zynaddsubfx.cpp ${ZYN_SRC} ${MXML_SRC})
-INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET remote_zynaddsubfx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/remote_zynaddsubfx.exe)
diff -up lmms-0.4.5/src/core/remote_plugin.cpp.orig lmms-0.4.5/src/core/remote_plugin.cpp
--- lmms-0.4.5/src/core/remote_plugin.cpp.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/src/core/remote_plugin.cpp	2009-09-04 20:49:16.000000000 +0200
@@ -88,8 +88,8 @@ remotePlugin::remotePlugin( const QStrin
 	m_outputCount( DEFAULT_CHANNELS )
 {
 	lock();
-	QString exec = configManager::inst()->pluginDir() +
-					QDir::separator() + _plugin_executable;
+	QString exec = QString( LIBEXEC_DIR ) + 
+		QDir::separator() + _plugin_executable;
 	QStringList args;
 	// swap in and out for bidirectional communication
 	args << QString::number( out()->shmKey() );

lmms-0.4.5-vst-nowine.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE lmms-0.4.5-vst-nowine.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-09-04 20:51:11.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:51:32.000000000 +0200
@@ -329,6 +329,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
 	SET(STATUS_VST "OK")
 ENDIF(LMMS_BUILD_WIN32)
+IF(WANT_VST_NOWINE)
+	SET(LMMS_SUPPORT_VST TRUE)
+ENDIF(WANT_VST_NOWINE)
 
 
 # check for libsamplerate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 May 2009 18:40:58 -0000	1.4
+++ .cvsignore	4 Sep 2009 21:21:19 -0000	1.5
@@ -1 +1 @@
-lmms-0.4.4.stripped.tar.bz2
+lmms-0.4.5.stripped.tar.bz2


Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/README.fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.fedora	19 May 2009 18:40:59 -0000	1.2
+++ README.fedora	4 Sep 2009 21:21:19 -0000	1.3
@@ -1,254 +1,254 @@
 For legal reasons, the following files have been removed from the
 original tarfile:
 
-lmms-0.4.4/data/projects/tutorials/editing_note_volumes.mmp
-lmms-0.4.4/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
-lmms-0.4.4/data/projects/covers/MonkeyIsland1-Intro.mmpz
-lmms-0.4.4/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
-lmms-0.4.4/data/projects/oldstuff/MaxFellner-Ease.mmp
-lmms-0.4.4/data/projects/oldstuff/time_machine.mmp
-lmms-0.4.4/data/projects/oldstuff/Mart-Dirt_Track.mmp
-lmms-0.4.4/data/projects/oldstuff/1st.mmp
-lmms-0.4.4/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
-lmms-0.4.4/data/projects/demos/beat_collection.mmp
-lmms-0.4.4/data/projects/demos/demo5.mmp
-lmms-0.4.4/data/projects/demos/newFangled.mmpz
-lmms-0.4.4/data/projects/demos/TobyDox-Crystallo.mmp
-lmms-0.4.4/data/projects/demos/loop_collection.mmp
-lmms-0.4.4/data/projects/demos/demo1.mmp
-lmms-0.4.4/data/projects/demos/demo4.mmp
-lmms-0.4.4/data/projects/demos/demo3.mmp
-lmms-0.4.4/data/projects/demos/lb302quick.mmpz
-lmms-0.4.4/data/projects/demos/demo2.mmp
-lmms-0.4.4/data/projects/demos/demo6.mmp
-lmms-0.4.4/data/projects/demos/some_basslines.mmp
-lmms-0.4.4/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
-lmms-0.4.4/data/projects/cool_songs/MysthR-Living.mmpz
-lmms-0.4.4/data/projects/cool_songs/Siegel-DreamWave.mmp
-lmms-0.4.4/data/projects/cool_songs/Silva-ElvesCall.mmp
-lmms-0.4.4/data/projects/cool_songs/TobyDox-Psycho.mmp
-lmms-0.4.4/data/projects/cool_songs/Chris-RaveRiff.mmpz
-lmms-0.4.4/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
-lmms-0.4.4/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-lmms-0.4.4/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
-lmms-0.4.4/data/projects/cool_songs/Chris-HorizonRemix.mmp
-lmms-0.4.4/data/projects/cool_songs/j1m-DingDong.mmp
-lmms-0.4.4/data/projects/cool_songs/Djeezus-BeatRolls.mmp
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
-lmms-0.4.4/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
-lmms-0.4.4/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
-lmms-0.4.4/data/projects/cool_songs/Malex-Horizon4.mmp
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-Underline.mmp
-lmms-0.4.4/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
-lmms-0.4.4/data/projects/cool_songs/SharkyX-Experiments.mmp
-lmms-0.4.4/data/projects/cool_songs/Skiessi-Onion.mmpz
-lmms-0.4.4/data/projects/cool_songs/TobyDox-Confused.mmp
-lmms-0.4.4/data/projects/cool_songs/Siegel-SpeedTrack.mmp
-lmms-0.4.4/data/projects/cool_songs/Djeezus-Oscilisous.mmp
-lmms-0.4.4/data/samples/latin/latin_brass01.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar03.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar01.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar02.ogg
-lmms-0.4.4/data/samples/shapes/technosynth3.wav
-lmms-0.4.4/data/samples/shapes/technosynth1.wav
-lmms-0.4.4/data/samples/shapes/technosynth2.wav
-lmms-0.4.4/data/samples/shapes/additive2.wav
-lmms-0.4.4/data/samples/shapes/harmonics.wav
-lmms-0.4.4/data/samples/shapes/micro.wav
-lmms-0.4.4/data/samples/shapes/bunglist2.wav
-lmms-0.4.4/data/samples/shapes/bunglist3.wav
-lmms-0.4.4/data/samples/shapes/saw+sine.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw2.ogg
-lmms-0.4.4/data/samples/shapes/bunglist.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw.ogg
-lmms-0.4.4/data/samples/shapes/roundbass.wav
-lmms-0.4.4/data/samples/shapes/bunglist9.wav
-lmms-0.4.4/data/samples/shapes/bunglist7.wav
-lmms-0.4.4/data/samples/shapes/low_sine.wav
-lmms-0.4.4/data/samples/shapes/bunglist4.wav
-lmms-0.4.4/data/samples/shapes/bunglist5.wav
-lmms-0.4.4/data/samples/shapes/sine_dist.ogg
-lmms-0.4.4/data/samples/shapes/technobass.wav
-lmms-0.4.4/data/samples/shapes/roundsaw.ogg
-lmms-0.4.4/data/samples/shapes/technosynth6.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw_dist.ogg
-lmms-0.4.4/data/samples/shapes/bunglist6.wav
-lmms-0.4.4/data/samples/shapes/moog.wav
-lmms-0.4.4/data/samples/shapes/bunglist8.wav
-lmms-0.4.4/data/samples/shapes/additive.wav
-lmms-0.4.4/data/samples/shapes/technosynth5.wav
-lmms-0.4.4/data/samples/shapes/technosynth4.wav
-lmms-0.4.4/data/samples/shapes/vowel_a.wav
-lmms-0.4.4/data/samples/shapes/vowel_u.wav
-lmms-0.4.4/data/samples/basses/bass_punch01.ogg
-lmms-0.4.4/data/samples/basses/bass_acid01.ogg
-lmms-0.4.4/data/samples/basses/rave_bass02.ogg
-lmms-0.4.4/data/samples/basses/bass_hard02.ogg
-lmms-0.4.4/data/samples/basses/rave_bass01.ogg
-lmms-0.4.4/data/samples/basses/bass_hard01.ogg
-lmms-0.4.4/data/samples/basses/synth_acid02.ogg
-lmms-0.4.4/data/samples/basses/horror_bass01.ogg
-lmms-0.4.4/data/samples/basses/matrix1000_pluck01.ogg
-lmms-0.4.4/data/samples/basses/bass01.ogg
-lmms-0.4.4/data/samples/basses/bass_acid02.ogg
-lmms-0.4.4/data/samples/basses/synth_acid01.ogg
-lmms-0.4.4/data/samples/basses/techno_synth01.ogg
-lmms-0.4.4/data/samples/basses/rave_bass04.ogg
-lmms-0.4.4/data/samples/basses/rave_bass03.ogg
-lmms-0.4.4/data/samples/effects/explode01.ogg
-lmms-0.4.4/data/samples/effects/warp01.ogg
-lmms-0.4.4/data/samples/effects/filter_sweep01.ogg
-lmms-0.4.4/data/samples/effects/start01.ogg
-lmms-0.4.4/data/samples/effects/wind_chimes01.ogg
-lmms-0.4.4/data/samples/effects/scratch01.ogg
-lmms-0.4.4/data/samples/effects/warp02.ogg
-lmms-0.4.4/data/samples/effects/chroma_sound_effect01.ogg
-lmms-0.4.4/data/samples/effects/stop01.ogg
-lmms-0.4.4/data/samples/effects/start02.ogg
-lmms-0.4.4/data/samples/beats/house_loop01.ogg
-lmms-0.4.4/data/samples/beats/break02.ogg
-lmms-0.4.4/data/samples/beats/909beat01.ogg
-lmms-0.4.4/data/samples/beats/break03.ogg
-lmms-0.4.4/data/samples/beats/electro_beat02.ogg
-lmms-0.4.4/data/samples/beats/electro_beat01.ogg
-lmms-0.4.4/data/samples/beats/jungle01.ogg
-lmms-0.4.4/data/samples/beats/rave_hihat01.ogg
-lmms-0.4.4/data/samples/beats/rave_kick01.ogg
-lmms-0.4.4/data/samples/beats/rave_kick02.ogg
-lmms-0.4.4/data/samples/beats/break01.ogg
-lmms-0.4.4/data/samples/beats/rave_snare01.ogg
-lmms-0.4.4/data/samples/beats/rave_hihat02.ogg
-lmms-0.4.4/data/samples/stringsnpads/bell_choir02.ogg
-lmms-0.4.4/data/samples/stringsnpads/strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/korg_poly6_drone01.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/chorus02.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings03.ogg
-lmms-0.4.4/data/samples/stringsnpads/chorus01.ogg
-lmms-0.4.4/data/samples/stringsnpads/juno_pad01.ogg
-lmms-0.4.4/data/samples/stringsnpads/orion_string01.ogg
-lmms-0.4.4/data/samples/stringsnpads/rave_choir01.ogg
-lmms-0.4.4/data/samples/stringsnpads/bell_choir01.ogg
-lmms-0.4.4/data/samples/stringsnpads/heaven_strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/nord_ambient01.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings02.ogg
-lmms-0.4.4/data/samples/bassloopes/briff01.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_bass01.ogg
-lmms-0.4.4/data/samples/bassloopes/rave_bass02.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth02.ogg
-lmms-0.4.4/data/samples/bassloopes/tb303_01.ogg
-lmms-0.4.4/data/samples/bassloopes/rave_bass01.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth03.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_bass02.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth04.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth01.ogg
-lmms-0.4.4/data/samples/instruments/violin_double_stop01.ogg
-lmms-0.4.4/data/samples/instruments/bassslap01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ01.ogg
-lmms-0.4.4/data/samples/instruments/e_piano_accord01.ogg
-lmms-0.4.4/data/samples/instruments/flute01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_medium_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ04.ogg
-lmms-0.4.4/data/samples/instruments/trumpet01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_slight_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/e_organ01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ03.ogg
-lmms-0.4.4/data/samples/instruments/piano02.ogg
-lmms-0.4.4/data/samples/instruments/cello01.ogg
-lmms-0.4.4/data/samples/instruments/piano01.ogg
-lmms-0.4.4/data/samples/instruments/violin_fingered01.ogg
-lmms-0.4.4/data/samples/instruments/violin_pizzicato01.ogg
-lmms-0.4.4/data/samples/instruments/e_piano_accord02.ogg
-lmms-0.4.4/data/samples/instruments/harpsichord01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar01.ogg
-lmms-0.4.4/data/samples/instruments/bassslap02.ogg
-lmms-0.4.4/data/samples/instruments/church_organ02.ogg
-lmms-0.4.4/data/samples/misc/applause01.ogg
-lmms-0.4.4/data/samples/misc/breath01.ogg
-lmms-0.4.4/data/samples/misc/raving_crowd01.ogg
-lmms-0.4.4/data/samples/misc/hit02.ogg
-lmms-0.4.4/data/samples/misc/dong01.ogg
-lmms-0.4.4/data/samples/misc/hit01.ogg
-lmms-0.4.4/data/samples/misc/bass!.ogg
-lmms-0.4.4/data/samples/misc/dong03.ogg
-lmms-0.4.4/data/samples/misc/undefined01.ogg
-lmms-0.4.4/data/samples/misc/metronome01.ogg
-lmms-0.4.4/data/samples/misc/buzz!.ogg
-lmms-0.4.4/data/samples/misc/dong02.ogg
-lmms-0.4.4/data/samples/misc/electric_ping01.ogg
-lmms-0.4.4/data/samples/misc/metalish_dong01.ogg
-lmms-0.4.4/data/samples/misc/snaph01.ogg
-lmms-0.4.4/data/samples/drums/kick_soft01.ogg
-lmms-0.4.4/data/samples/drums/snare_rim01.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened02.ogg
-lmms-0.4.4/data/samples/drums/snare05.ogg
-lmms-0.4.4/data/samples/drums/bassdrum_acoustic02.ogg
-lmms-0.4.4/data/samples/drums/kick_hard01.ogg
-lmms-0.4.4/data/samples/drums/sidestick01.ogg
-lmms-0.4.4/data/samples/drums/clap01.ogg
-lmms-0.4.4/data/samples/drums/snare02.ogg
-lmms-0.4.4/data/samples/drums/clap02.ogg
-lmms-0.4.4/data/samples/drums/snare04.ogg
-lmms-0.4.4/data/samples/drums/bassdrum03.ogg
-lmms-0.4.4/data/samples/drums/tom_low01.ogg
-lmms-0.4.4/data/samples/drums/bassdrum02.ogg
-lmms-0.4.4/data/samples/drums/tom02.ogg
-lmms-0.4.4/data/samples/drums/shaker03.ogg
-lmms-0.4.4/data/samples/drums/kick_hiphop01.ogg
-lmms-0.4.4/data/samples/drums/clap03.ogg
-lmms-0.4.4/data/samples/drums/snare_muffled02.ogg
-lmms-0.4.4/data/samples/drums/tom01.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed03.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed05.ogg
-lmms-0.4.4/data/samples/drums/tom_hi01.ogg
-lmms-0.4.4/data/samples/drums/kick01.ogg
-lmms-0.4.4/data/samples/drums/shaker01.ogg
-lmms-0.4.4/data/samples/drums/tom05.ogg
-lmms-0.4.4/data/samples/drums/ride01.ogg
-lmms-0.4.4/data/samples/drums/shaker02.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened01.ogg
-lmms-0.4.4/data/samples/drums/snare06.ogg
-lmms-0.4.4/data/samples/drums/kick_soft02.ogg
-lmms-0.4.4/data/samples/drums/kick_long01.ogg
-lmms-0.4.4/data/samples/drums/kick04.ogg
-lmms-0.4.4/data/samples/drums/snare07.ogg
-lmms-0.4.4/data/samples/drums/bassdrum04.ogg
-lmms-0.4.4/data/samples/drums/crash02.ogg
-lmms-0.4.4/data/samples/drums/tom04.ogg
-lmms-0.4.4/data/samples/drums/kick02.ogg
-lmms-0.4.4/data/samples/drums/nasty_rim01.ogg
-lmms-0.4.4/data/samples/drums/bassdrum_acoustic01.ogg
-lmms-0.4.4/data/samples/drums/ride02.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed02.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed01.ogg
-lmms-0.4.4/data/samples/drums/snare01.ogg
-lmms-0.4.4/data/samples/drums/wood01.ogg
-lmms-0.4.4/data/samples/drums/nasty_bass01.ogg
-lmms-0.4.4/data/samples/drums/snare_hiphop02.ogg
-lmms-0.4.4/data/samples/drums/kick_distorted01.ogg
-lmms-0.4.4/data/samples/drums/zap01.ogg
-lmms-0.4.4/data/samples/drums/clav01.ogg
-lmms-0.4.4/data/samples/drums/rim01.ogg
-lmms-0.4.4/data/samples/drums/nasty_snare01.ogg
-lmms-0.4.4/data/samples/drums/snare_harsh01.ogg
-lmms-0.4.4/data/samples/drums/clav02.ogg
-lmms-0.4.4/data/samples/drums/clap04.ogg
-lmms-0.4.4/data/samples/drums/snare_muffled01.ogg
-lmms-0.4.4/data/samples/drums/kick03.ogg
-lmms-0.4.4/data/samples/drums/snare_acoustic01.ogg
-lmms-0.4.4/data/samples/drums/kick_hardcore01.ogg
-lmms-0.4.4/data/samples/drums/hihat_foot_pedal01.ogg
-lmms-0.4.4/data/samples/drums/snare_short01.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed04.ogg
-lmms-0.4.4/data/samples/drums/bassdrum01.ogg
-lmms-0.4.4/data/samples/drums/snare03.ogg
-lmms-0.4.4/data/samples/drums/zap02.ogg
-lmms-0.4.4/data/samples/drums/snare_hiphop01.ogg
-lmms-0.4.4/data/samples/drums/snare_electro01.ogg
-lmms-0.4.4/data/samples/drums/tom_mid01.ogg
-lmms-0.4.4/data/samples/drums/tom03.ogg
-lmms-0.4.4/data/samples/drums/crash01.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened03.ogg
-lmms-0.4.4/data/samples/drums/zap03.ogg
+lmms-0.4.5/data/projects/tutorials/editing_note_volumes.mmp
+lmms-0.4.5/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
+lmms-0.4.5/data/projects/covers/MonkeyIsland1-Intro.mmpz
+lmms-0.4.5/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
+lmms-0.4.5/data/projects/oldstuff/MaxFellner-Ease.mmp
+lmms-0.4.5/data/projects/oldstuff/time_machine.mmp
+lmms-0.4.5/data/projects/oldstuff/Mart-Dirt_Track.mmp
+lmms-0.4.5/data/projects/oldstuff/1st.mmp
+lmms-0.4.5/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
+lmms-0.4.5/data/projects/demos/beat_collection.mmp
+lmms-0.4.5/data/projects/demos/demo5.mmp
+lmms-0.4.5/data/projects/demos/newFangled.mmpz
+lmms-0.4.5/data/projects/demos/TobyDox-Crystallo.mmp
+lmms-0.4.5/data/projects/demos/loop_collection.mmp
+lmms-0.4.5/data/projects/demos/demo1.mmp
+lmms-0.4.5/data/projects/demos/demo4.mmp
+lmms-0.4.5/data/projects/demos/demo3.mmp
+lmms-0.4.5/data/projects/demos/lb302quick.mmpz
+lmms-0.4.5/data/projects/demos/demo2.mmp
+lmms-0.4.5/data/projects/demos/demo6.mmp
+lmms-0.4.5/data/projects/demos/some_basslines.mmp
+lmms-0.4.5/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
+lmms-0.4.5/data/projects/cool_songs/MysthR-Living.mmpz
+lmms-0.4.5/data/projects/cool_songs/Siegel-DreamWave.mmp
+lmms-0.4.5/data/projects/cool_songs/Silva-ElvesCall.mmp
+lmms-0.4.5/data/projects/cool_songs/TobyDox-Psycho.mmp
+lmms-0.4.5/data/projects/cool_songs/Chris-RaveRiff.mmpz
+lmms-0.4.5/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
+lmms-0.4.5/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
+lmms-0.4.5/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
+lmms-0.4.5/data/projects/cool_songs/Chris-HorizonRemix.mmp
+lmms-0.4.5/data/projects/cool_songs/j1m-DingDong.mmp
+lmms-0.4.5/data/projects/cool_songs/Djeezus-BeatRolls.mmp
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
+lmms-0.4.5/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
+lmms-0.4.5/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
+lmms-0.4.5/data/projects/cool_songs/Malex-Horizon4.mmp
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-Underline.mmp
+lmms-0.4.5/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
+lmms-0.4.5/data/projects/cool_songs/SharkyX-Experiments.mmp
+lmms-0.4.5/data/projects/cool_songs/Skiessi-Onion.mmpz
+lmms-0.4.5/data/projects/cool_songs/TobyDox-Confused.mmp
+lmms-0.4.5/data/projects/cool_songs/Siegel-SpeedTrack.mmp
+lmms-0.4.5/data/projects/cool_songs/Djeezus-Oscilisous.mmp
+lmms-0.4.5/data/samples/latin/latin_brass01.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar03.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar01.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar02.ogg
+lmms-0.4.5/data/samples/shapes/technosynth3.wav
+lmms-0.4.5/data/samples/shapes/technosynth1.wav
+lmms-0.4.5/data/samples/shapes/technosynth2.wav
+lmms-0.4.5/data/samples/shapes/additive2.wav
+lmms-0.4.5/data/samples/shapes/harmonics.wav
+lmms-0.4.5/data/samples/shapes/micro.wav
+lmms-0.4.5/data/samples/shapes/bunglist2.wav
+lmms-0.4.5/data/samples/shapes/bunglist3.wav
+lmms-0.4.5/data/samples/shapes/saw+sine.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw2.ogg
+lmms-0.4.5/data/samples/shapes/bunglist.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw.ogg
+lmms-0.4.5/data/samples/shapes/roundbass.wav
+lmms-0.4.5/data/samples/shapes/bunglist9.wav
+lmms-0.4.5/data/samples/shapes/bunglist7.wav
+lmms-0.4.5/data/samples/shapes/low_sine.wav
+lmms-0.4.5/data/samples/shapes/bunglist4.wav
+lmms-0.4.5/data/samples/shapes/bunglist5.wav
+lmms-0.4.5/data/samples/shapes/sine_dist.ogg
+lmms-0.4.5/data/samples/shapes/technobass.wav
+lmms-0.4.5/data/samples/shapes/roundsaw.ogg
+lmms-0.4.5/data/samples/shapes/technosynth6.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw_dist.ogg
+lmms-0.4.5/data/samples/shapes/bunglist6.wav
+lmms-0.4.5/data/samples/shapes/moog.wav
+lmms-0.4.5/data/samples/shapes/bunglist8.wav
+lmms-0.4.5/data/samples/shapes/additive.wav
+lmms-0.4.5/data/samples/shapes/technosynth5.wav
+lmms-0.4.5/data/samples/shapes/technosynth4.wav
+lmms-0.4.5/data/samples/shapes/vowel_a.wav
+lmms-0.4.5/data/samples/shapes/vowel_u.wav
+lmms-0.4.5/data/samples/basses/bass_punch01.ogg
+lmms-0.4.5/data/samples/basses/bass_acid01.ogg
+lmms-0.4.5/data/samples/basses/rave_bass02.ogg
+lmms-0.4.5/data/samples/basses/bass_hard02.ogg
+lmms-0.4.5/data/samples/basses/rave_bass01.ogg
+lmms-0.4.5/data/samples/basses/bass_hard01.ogg
+lmms-0.4.5/data/samples/basses/synth_acid02.ogg
+lmms-0.4.5/data/samples/basses/horror_bass01.ogg
+lmms-0.4.5/data/samples/basses/matrix1000_pluck01.ogg
+lmms-0.4.5/data/samples/basses/bass01.ogg
+lmms-0.4.5/data/samples/basses/bass_acid02.ogg
+lmms-0.4.5/data/samples/basses/synth_acid01.ogg
+lmms-0.4.5/data/samples/basses/techno_synth01.ogg
+lmms-0.4.5/data/samples/basses/rave_bass04.ogg
+lmms-0.4.5/data/samples/basses/rave_bass03.ogg
+lmms-0.4.5/data/samples/effects/explode01.ogg
+lmms-0.4.5/data/samples/effects/warp01.ogg
+lmms-0.4.5/data/samples/effects/filter_sweep01.ogg
+lmms-0.4.5/data/samples/effects/start01.ogg
+lmms-0.4.5/data/samples/effects/wind_chimes01.ogg
+lmms-0.4.5/data/samples/effects/scratch01.ogg
+lmms-0.4.5/data/samples/effects/warp02.ogg
+lmms-0.4.5/data/samples/effects/chroma_sound_effect01.ogg
+lmms-0.4.5/data/samples/effects/stop01.ogg
+lmms-0.4.5/data/samples/effects/start02.ogg
+lmms-0.4.5/data/samples/beats/house_loop01.ogg
+lmms-0.4.5/data/samples/beats/break02.ogg
+lmms-0.4.5/data/samples/beats/909beat01.ogg
+lmms-0.4.5/data/samples/beats/break03.ogg
+lmms-0.4.5/data/samples/beats/electro_beat02.ogg
+lmms-0.4.5/data/samples/beats/electro_beat01.ogg
+lmms-0.4.5/data/samples/beats/jungle01.ogg
+lmms-0.4.5/data/samples/beats/rave_hihat01.ogg
+lmms-0.4.5/data/samples/beats/rave_kick01.ogg
+lmms-0.4.5/data/samples/beats/rave_kick02.ogg
+lmms-0.4.5/data/samples/beats/break01.ogg
+lmms-0.4.5/data/samples/beats/rave_snare01.ogg
+lmms-0.4.5/data/samples/beats/rave_hihat02.ogg
+lmms-0.4.5/data/samples/stringsnpads/bell_choir02.ogg
+lmms-0.4.5/data/samples/stringsnpads/strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/korg_poly6_drone01.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/chorus02.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings03.ogg
+lmms-0.4.5/data/samples/stringsnpads/chorus01.ogg
+lmms-0.4.5/data/samples/stringsnpads/juno_pad01.ogg
+lmms-0.4.5/data/samples/stringsnpads/orion_string01.ogg
+lmms-0.4.5/data/samples/stringsnpads/rave_choir01.ogg
+lmms-0.4.5/data/samples/stringsnpads/bell_choir01.ogg
+lmms-0.4.5/data/samples/stringsnpads/heaven_strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/nord_ambient01.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings02.ogg
+lmms-0.4.5/data/samples/bassloopes/briff01.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_bass01.ogg
+lmms-0.4.5/data/samples/bassloopes/rave_bass02.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth02.ogg
+lmms-0.4.5/data/samples/bassloopes/tb303_01.ogg
+lmms-0.4.5/data/samples/bassloopes/rave_bass01.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth03.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_bass02.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth04.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth01.ogg
+lmms-0.4.5/data/samples/instruments/violin_double_stop01.ogg
+lmms-0.4.5/data/samples/instruments/bassslap01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ01.ogg
+lmms-0.4.5/data/samples/instruments/e_piano_accord01.ogg
+lmms-0.4.5/data/samples/instruments/flute01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_medium_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ04.ogg
+lmms-0.4.5/data/samples/instruments/trumpet01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_slight_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/e_organ01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ03.ogg
+lmms-0.4.5/data/samples/instruments/piano02.ogg
+lmms-0.4.5/data/samples/instruments/cello01.ogg
+lmms-0.4.5/data/samples/instruments/piano01.ogg
+lmms-0.4.5/data/samples/instruments/violin_fingered01.ogg
+lmms-0.4.5/data/samples/instruments/violin_pizzicato01.ogg
+lmms-0.4.5/data/samples/instruments/e_piano_accord02.ogg
+lmms-0.4.5/data/samples/instruments/harpsichord01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar01.ogg
+lmms-0.4.5/data/samples/instruments/bassslap02.ogg
+lmms-0.4.5/data/samples/instruments/church_organ02.ogg
+lmms-0.4.5/data/samples/misc/applause01.ogg
+lmms-0.4.5/data/samples/misc/breath01.ogg
+lmms-0.4.5/data/samples/misc/raving_crowd01.ogg
+lmms-0.4.5/data/samples/misc/hit02.ogg
+lmms-0.4.5/data/samples/misc/dong01.ogg
+lmms-0.4.5/data/samples/misc/hit01.ogg
+lmms-0.4.5/data/samples/misc/bass!.ogg
+lmms-0.4.5/data/samples/misc/dong03.ogg
+lmms-0.4.5/data/samples/misc/undefined01.ogg
+lmms-0.4.5/data/samples/misc/metronome01.ogg
+lmms-0.4.5/data/samples/misc/buzz!.ogg
+lmms-0.4.5/data/samples/misc/dong02.ogg
+lmms-0.4.5/data/samples/misc/electric_ping01.ogg
+lmms-0.4.5/data/samples/misc/metalish_dong01.ogg
+lmms-0.4.5/data/samples/misc/snaph01.ogg
+lmms-0.4.5/data/samples/drums/kick_soft01.ogg
+lmms-0.4.5/data/samples/drums/snare_rim01.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened02.ogg
+lmms-0.4.5/data/samples/drums/snare05.ogg
+lmms-0.4.5/data/samples/drums/bassdrum_acoustic02.ogg
+lmms-0.4.5/data/samples/drums/kick_hard01.ogg
+lmms-0.4.5/data/samples/drums/sidestick01.ogg
+lmms-0.4.5/data/samples/drums/clap01.ogg
+lmms-0.4.5/data/samples/drums/snare02.ogg
+lmms-0.4.5/data/samples/drums/clap02.ogg
+lmms-0.4.5/data/samples/drums/snare04.ogg
+lmms-0.4.5/data/samples/drums/bassdrum03.ogg
+lmms-0.4.5/data/samples/drums/tom_low01.ogg
+lmms-0.4.5/data/samples/drums/bassdrum02.ogg
+lmms-0.4.5/data/samples/drums/tom02.ogg
+lmms-0.4.5/data/samples/drums/shaker03.ogg
+lmms-0.4.5/data/samples/drums/kick_hiphop01.ogg
+lmms-0.4.5/data/samples/drums/clap03.ogg
+lmms-0.4.5/data/samples/drums/snare_muffled02.ogg
+lmms-0.4.5/data/samples/drums/tom01.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed03.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed05.ogg
+lmms-0.4.5/data/samples/drums/tom_hi01.ogg
+lmms-0.4.5/data/samples/drums/kick01.ogg
+lmms-0.4.5/data/samples/drums/shaker01.ogg
+lmms-0.4.5/data/samples/drums/tom05.ogg
+lmms-0.4.5/data/samples/drums/ride01.ogg
+lmms-0.4.5/data/samples/drums/shaker02.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened01.ogg
+lmms-0.4.5/data/samples/drums/snare06.ogg
+lmms-0.4.5/data/samples/drums/kick_soft02.ogg
+lmms-0.4.5/data/samples/drums/kick_long01.ogg
+lmms-0.4.5/data/samples/drums/kick04.ogg
+lmms-0.4.5/data/samples/drums/snare07.ogg
+lmms-0.4.5/data/samples/drums/bassdrum04.ogg
+lmms-0.4.5/data/samples/drums/crash02.ogg
+lmms-0.4.5/data/samples/drums/tom04.ogg
+lmms-0.4.5/data/samples/drums/kick02.ogg
+lmms-0.4.5/data/samples/drums/nasty_rim01.ogg
+lmms-0.4.5/data/samples/drums/bassdrum_acoustic01.ogg
+lmms-0.4.5/data/samples/drums/ride02.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed02.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed01.ogg
+lmms-0.4.5/data/samples/drums/snare01.ogg
+lmms-0.4.5/data/samples/drums/wood01.ogg
+lmms-0.4.5/data/samples/drums/nasty_bass01.ogg
+lmms-0.4.5/data/samples/drums/snare_hiphop02.ogg
+lmms-0.4.5/data/samples/drums/kick_distorted01.ogg
+lmms-0.4.5/data/samples/drums/zap01.ogg
+lmms-0.4.5/data/samples/drums/clav01.ogg
+lmms-0.4.5/data/samples/drums/rim01.ogg
+lmms-0.4.5/data/samples/drums/nasty_snare01.ogg
+lmms-0.4.5/data/samples/drums/snare_harsh01.ogg
+lmms-0.4.5/data/samples/drums/clav02.ogg
+lmms-0.4.5/data/samples/drums/clap04.ogg
+lmms-0.4.5/data/samples/drums/snare_muffled01.ogg
+lmms-0.4.5/data/samples/drums/kick03.ogg
+lmms-0.4.5/data/samples/drums/snare_acoustic01.ogg
+lmms-0.4.5/data/samples/drums/kick_hardcore01.ogg
+lmms-0.4.5/data/samples/drums/hihat_foot_pedal01.ogg
+lmms-0.4.5/data/samples/drums/snare_short01.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed04.ogg
+lmms-0.4.5/data/samples/drums/bassdrum01.ogg
+lmms-0.4.5/data/samples/drums/snare03.ogg
+lmms-0.4.5/data/samples/drums/zap02.ogg
+lmms-0.4.5/data/samples/drums/snare_hiphop01.ogg
+lmms-0.4.5/data/samples/drums/snare_electro01.ogg
+lmms-0.4.5/data/samples/drums/tom_mid01.ogg
+lmms-0.4.5/data/samples/drums/tom03.ogg
+lmms-0.4.5/data/samples/drums/crash01.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened03.ogg
+lmms-0.4.5/data/samples/drums/zap03.ogg


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 May 2009 18:40:59 -0000	1.4
+++ import.log	4 Sep 2009 21:21:19 -0000	1.5
@@ -2,3 +2,4 @@ lmms-0_4_2-3_fc10:HEAD:lmms-0.4.2-3.fc10
 lmms-0_4_2-4_fc10:HEAD:lmms-0.4.2-4.fc10.src.rpm:1235166451
 lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10.src.rpm:1236642380
 lmms-0_4_4-1_fc11:HEAD:lmms-0.4.4-1.fc11.src.rpm:1242758267
+lmms-0_4_5-1_fc11:HEAD:lmms-0.4.5-1.fc11.src.rpm:1252099213


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/lmms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lmms.spec	25 Jul 2009 11:12:37 -0000	1.6
+++ lmms.spec	4 Sep 2009 21:21:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lmms
-Version:        0.4.4
-Release:        2%{?dist}
+Version:        0.4.5
+Release:        1%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -16,6 +16,7 @@ Group:          Applications/Multimedia
 #     - cmt: GPLv2(+?)
 #     - swh: GPLv2+
 #     - tap: GPLv2+
+#     - calf: GPLv2+ and LGPLv2+
 #   - GNU UnRTF (flp_import plugin): GPLv3+
 #   - Portsmf (midi_import plugin): MIT
 #   - Blip_Buffer and Gb_Snd_Emu (papu plugin): LGPLv2.1+
@@ -35,18 +36,15 @@ Source0:        %{name}-%{version}.strip
 Source1:        README.fedora
 
 # our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.4-libdir.patch
+Patch0:         lmms-0.4.5-libdir.patch
 
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.4-libexecdir.patch
+Patch1:         lmms-0.4.5-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.4-vst-nowine.patch
+Patch2:         lmms-0.4.5-vst-nowine.patch
 
-# patches borrowed from the fltk package
-Patch3:         lmms-0.4.4-fltk-1.1.9-consts.patch
-Patch4:         lmms-0.4.4-fltk-1.1.9-gcc44.patch
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
 # developers, not possibe because there are to many changes.
@@ -61,6 +59,7 @@ BuildRequires:  jack-audio-connection-ki
 BuildRequires:  alsa-lib-devel
 BuildRequires:  pulseaudio-libs-devel
 
+# we need at least version 0.1.7 of libsamplerate 
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  fftw3-devel
@@ -80,6 +79,7 @@ BuildRequires:  wine-devel 
 Requires:       ladspa-caps-plugins
 Requires:       ladspa-tap-plugins
 Requires:       ladspa-swh-plugins
+Requires:       ladspa-calf-plugins
 # the version included in lmms contains patches sent to, but not yet
 # applied by cmt's upstream.
 #Requires: ladspa-cmt-plugins
@@ -129,10 +129,6 @@ developing addons for %{name}.
 %patch0 -p1 -b .libdir
 %patch1 -p1 -b .libexecdir
 %patch2 -p1 -b .nowine
-%patch3 -p1 -b .consts
-%if 0%{?fedora} > 10
-%patch4 -p1 -b .gcc44
-%endif
 
 # remove spurious x-bits
 find . -type f -exec chmod 0644 {} \;
@@ -147,6 +143,7 @@ find . -type f -exec chmod 0644 {} \;
        -DWANT_CAPS:BOOL=OFF \
        -DWANT_TAP:BOOL=OFF \
        -DWANT_SWH:BOOL=OFF \
+       -DWANT_CALF:BOOL=OFF \
 %ifarch %ix86
        -DWANT_VST:BOOL=ON \
 %else
@@ -223,6 +220,11 @@ This package contains the necessary file
 
 
 %changelog
+* Fri Sep  4 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.5-1
+- Udate to 0.4.5.
+- Rebase patches, and drop fltk patches not needed anymore.
+- Add a dependency on the Calf LADSPA plugins.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 May 2009 18:40:59 -0000	1.5
+++ sources	4 Sep 2009 21:21:19 -0000	1.6
@@ -1 +1 @@
-ec84f9c766742b4ebfa37ac06bebe391  lmms-0.4.4.stripped.tar.bz2
+efbd9ddef0a975cffe9abc2da8b04143  lmms-0.4.5.stripped.tar.bz2


--- lmms-0.4.4-fltk-1.1.9-consts.patch DELETED ---


--- lmms-0.4.4-fltk-1.1.9-gcc44.patch DELETED ---


--- lmms-0.4.4-libdir.patch DELETED ---


--- lmms-0.4.4-libexecdir.patch DELETED ---


--- lmms-0.4.4-vst-nowine.patch DELETED ---



From spot at fedoraproject.org  Fri Sep  4 21:22:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  4 Sep 2009 21:22:32 +0000 (UTC)
Subject: rpms/lapack/F-11 Makefile.blas, 1.5, 1.6 Makefile.lapack, 1.4,
	1.5 lapack.spec, 1.20, 1.21 sources, 1.5, 1.6
Message-ID: <20090904212232.4DB4A11C0082@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lapack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9250/F-11

Modified Files:
	Makefile.blas Makefile.lapack lapack.spec sources 
Log Message:
update to 3.2.1 everywhere, fix miscompile bug (bz 520518)


Index: Makefile.blas
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-11/Makefile.blas,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Makefile.blas	25 May 2007 22:08:50 -0000	1.5
+++ Makefile.blas	4 Sep 2009 21:22:32 -0000	1.6
@@ -2,30 +2,31 @@ clean:
 	rm -f *.o libblas.a libblas.so*
 
 OBJS=	caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o \
-	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o \
-	cher2k.o cherk.o chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o \
+	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher2.o cher2k.o \
+	cher.o cherk.o chpmv.o chpr2.o chpr.o crotg.o cscal.o csrot.o \
 	csscal.o cswap.o csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o \
 	ctpmv.o ctpsv.o ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o \
 	daxpy.o dcabs1.o dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o \
-	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o \
-	dspr.o dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o \
-	dsyr2k.o dsyrk.o dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o \
-	dtrmv.o dtrsm.o dtrsv.o dzasum.o dznrm2.o icamax.o idamax.o \
-	isamax.o izamax.o lsame.o sasum.o saxpy.o scasum.o scnrm2.o \
-	scopy.o sdot.o sdsdot.o sgbmv.o sgemm.o sgemv.o sger.o snrm2.o \
-	srot.o srotg.o srotm.o srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o \
-	sswap.o ssymm.o ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o \
-	stbmv.o stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o \
-	strsv.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o \
-	zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o \
-	zhemv.o zher.o zher2.o zher2k.o zherk.o zhpmv.o zhpr.o \
-	zhpr2.o zrotg.o zscal.o zswap.o zsymm.o zsyr2k.o zsyrk.o \
-	ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o ztrmv.o ztrsm.o \
-	ztrsv.o scabs1.o
+	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o \
+	dscal.o dsdot.o dspmv.o dspr2.o dspr.o dswap.o dsymm.o \
+	dsymv.o dsyr2.o dsyr2k.o dsyr.o dsyrk.o dtbmv.o dtbsv.o \
+	dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o dzasum.o \
+	dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o sasum.o \
+	saxpy.o scabs1.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o \
+	sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o \
+	srotmg.o ssbmv.o sscal.o sspmv.o sspr2.o sspr.o sswap.o \
+	ssymm.o ssymv.o ssyr2.o ssyr2k.o ssyr.o ssyrk.o stbmv.o \
+	stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o \
+	xerbla_array.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o \
+	zdrot.o zdscal.o zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o \
+	zhbmv.o zhemm.o zhemv.o zher2.o zher2k.o zher.o zherk.o \
+	zhpmv.o zhpr2.o zhpr.o zrotg.o zscal.o zswap.o zsymm.o \
+	zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o \
+	ztrmv.o ztrsm.o ztrsv.o
 
 static: $(OBJS)
 	ar ruv libblas.a $(OBJS)
 	ranlib libblas.a
 
 shared: $(OBJS)
-	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.1.1 $(OBJS) -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.2.1 $(OBJS) -lm -lgfortran -lc


Index: Makefile.lapack
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-11/Makefile.lapack,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- Makefile.lapack	25 May 2007 22:08:50 -0000	1.4
+++ Makefile.lapack	4 Sep 2009 21:22:32 -0000	1.5
@@ -1,237 +1,293 @@
+include ../make.inc
+
 clean:
 	rm -f *.o liblapack*
 
-OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o \
-	cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o \
-	cgebd2.o cgebrd.o cgecon.o cgeequ.o cgees.o cgeesx.o \
-	cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o \
-	cgelq2.o cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o \
-	cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o \
-	cgeqrf.o cgerfs.o cgerq2.o cgerqf.o cgesc2.o cgesdd.o \
-	cgesvd.o cgesv.o cgesvx.o cgetc2.o cgetf2.o cgetrf.o \
-	cgetri.o cgetrs.o cggbak.o cggbal.o cgges.o cggesx.o \
-	cggev.o cggevx.o cggglm.o cgghrd.o cgglse.o cggqrf.o \
-	cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o cgtsv.o \
-	cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
-	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o \
-	checon.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o \
-	chegst.o chegvd.o chegv.o chegvx.o cherfs.o chesv.o \
-	chesvx.o chetd2.o chetf2.o chetrd.o chetrf.o chetri.o \
-	chetrs.o chgeqz.o chpcon.o chpevd.o chpev.o chpevx.o \
-	chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
-	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o \
-	chseqr.o clabrd.o clacgv.o clacn2.o clacon.o clacp2.o \
-	clacpy.o clacrm.o clacrt.o cladiv.o claed0.o claed7.o \
-	claed8.o claein.o claesy.o claev2.o clag2z.o clags2.o \
-	clagtm.o clahef.o clahqr.o clahr2.o clahrd.o claic1.o \
-	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \
-	clanhb.o clanhe.o clanhp.o clanhs.o clanht.o clansb.o \
-	clansp.o clansy.o clantb.o clantp.o clantr.o clapll.o \
-	clapmt.o claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
-	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o \
-	claqr4.o claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o \
-	clar2v.o clarcm.o clarfb.o clarf.o clarfg.o clarft.o \
-	clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \
+OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb.o cgbequ.o cgbrfs.o \
+	cgbsv.o cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o \
+	cgebal.o cgebd2.o cgebrd.o cgecon.o cgeequb.o cgeequ.o cgees.o \
+	cgeesx.o cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o \
+	cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o cgelsy.o cgeql2.o \
+	cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o \
+	cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesvd.o cgesv.o cgesvx.o \
+	cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o cggbak.o \
+	cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o cgghrd.o \
+	cgglse.o cggqrf.o cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o \
+	cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
+	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o checon.o \
+	cheequb.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o chegst.o \
+	chegvd.o chegv.o chegvx.o cherfs.o chesv.o chesvx.o \
+	chetd2.o chetf2.o chetrd.o chetrf.o chetri.o chetrs.o \
+	chfrk.o chgeqz.o chla_transtype.o chpcon.o chpevd.o chpev.o \
+	chpevx.o chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
+	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o \
+	clabrd.o clacgv.o clacn2.o clacon.o clacp2.o clacpy.o clacrm.o \
+	clacrt.o cladiv.o claed0.o claed7.o claed8.o claein.o claesy.o \
+	claev2.o clag2z.o \
+	clags2.o clagtm.o \
+	clahef.o \
+	clahqr.o clahr2.o clahrd.o claic1.o \
+	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o clanhb.o \
+	clanhe.o clanhf.o clanhp.o clanhs.o clanht.o clansb.o clansp.o \
+	clansy.o clantb.o clantp.o clantr.o clapll.o clapmt.o \
+	claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
+	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o \
+	claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o clar2v.o clarcm.o \
+	clarfb.o clarf.o clarfg.o clarfp.o clarft.o clarfx.o clargv.o \
+	clarnv.o clarrv.o clartg.o clartv.o \
 	clarzb.o clarz.o clarzt.o clascl.o claset.o clasr.o \
-	classq.o claswp.o clasyf.o clatbs.o clatdf.o clatps.o \
-	clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o clauum.o \
-	cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o cpbsvx.o \
-	cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
-	cposv.o cposvx.o cpotf2.o cpotrf.o cpotri.o cpotrs.o \
-	cppcon.o cppequ.o cpprfs.o cppsv.o cppsvx.o cpptrf.o \
-	cpptri.o cpptrs.o cptcon.o cpteqr.o cptrfs.o cptsv.o \
-	cptsvx.o cpttrf.o cpttrs.o cptts2.o crot.o cspcon.o \
-	cspmv.o cspr.o csprfs.o cspsv.o cspsvx.o csptrf.o \
-	csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
-	cstein.o cstemr.o csteqr.o csycon.o csymv.o csyr.o \
-	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o \
-	csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
-	ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o \
-	ctpcon.o ctprfs.o ctptri.o ctptrs.o ctrcon.o ctrevc.o \
-	ctrexc.o ctrrfs.o ctrsen.o ctrsna.o ctrsyl.o ctrti2.o \
-	ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \
-	cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o \
-	cungr2.o cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o \
-	cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o cunmr2.o \
-	cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
-	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequ.o \
-	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o \
-	dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequ.o \
-	dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
-	dgehd2.o dgehrd.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
-	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o \
-	dgeqpf.o dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o \
-	dgesc2.o dgesdd.o dgesvd.o dgesv.o dgesvx.o dgetc2.o \
-	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o \
-	dgges.o dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o \
-	dgglse.o dggqrf.o dggrqf.o dggsvd.o dggsvp.o dgtcon.o \
-	dgtrfs.o dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o \
-	dhgeqz.o dhsein.o dhseqr.o disnan.o dlabad.o dlabrd.o \
-	dlacn2.o dlacon.o dlacpy.o dladiv.o dlae2.o dlaebz.o \
-	dlaed0.o dlaed1.o dlaed2.o dlaed3.o dlaed4.o dlaed5.o \
-	dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o dlaein.o \
-	dlaev2.o dlaexc.o dlag2.o dlag2s.o dlags2.o dlagtf.o \
-	dlagtm.o dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o \
-	dlaic1.o dlaisnan.o dlaln2.o dlals0.o dlalsa.o \
-	dlalsd.o dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o \
-	dlanhs.o dlansb.o dlansp.o dlanst.o dlansy.o dlantb.o \
-	dlantp.o dlantr.o dlanv2.o dlapll.o dlapmt.o dlapy2.o \
-	dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqr0.o \
-	dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o dlaqsb.o \
-	dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
-	dlarf.o dlarfg.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
-	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o dlarrf.o \
-	dlarrj.o dlarrk.o dlarrr.o dlarrv.o dlartg.o dlartv.o \
-	dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o dlascl.o \
-	dlasd0.o dlasd1.o dlasd2.o dlasd3.o dlasd4.o dlasd5.o \
-	dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o dlasdt.o \
-	dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
-	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o \
-	dlasy2.o dlasyf.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
-	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o dlazq3.o \
-	dlazq4.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o \
-	dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \
-	dorgrq.o dorgtr.o dorm2l.o dorm2r.o dormbr.o dormhr.o \
-	dorml2.o dormlq.o dormql.o dormqr.o dormr2.o dormr3.o \
-	dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \
-	dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
-	dpocon.o dpoequ.o dporfs.o dposv.o dposvx.o dpotf2.o \
-	dpotrf.o dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o \
-	dppsv.o dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \
-	dpteqr.o dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o \
-	dptts2.o drscl.o dsbevd.o dsbev.o dsbevx.o dsbgst.o \
-	dsbgvd.o dsbgv.o dsbgvx.o dsbtrd.o dsgesv.o dspcon.o \
-	dspevd.o dspev.o dspevx.o dspgst.o dspgvd.o dspgv.o \
-	dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o dsptrf.o \
-	dsptri.o dsptrs.o dstebz.o dstedc.o dstegr.o dstein.o \
-	dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o dstevr.o \
-	dstevx.o dsycon.o dsyevd.o dsyev.o dsyevr.o dsyevx.o \
-	dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
-	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o dsytrf.o \
-	dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o \
-	dtgex2.o dtgexc.o dtgsen.o dtgsja.o dtgsna.o dtgsy2.o \
-	dtgsyl.o dtpcon.o dtprfs.o dtptri.o dtptrs.o dtrcon.o \
-	dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
-	dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dzsum1.o \
-	icmax1.o ieeeck.o ilaenv.o ilaver.o iparmq.o izmax1.o \
-	lsamen.o sbdsdc.o sbdsqr.o scsum1.o sdisna.o sgbbrd.o \
-	sgbcon.o sgbequ.o sgbrfs.o sgbsv.o sgbsvx.o sgbtf2.o \
-	sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o sgebrd.o \
-	sgecon.o sgeequ.o sgees.o sgeesx.o sgeev.o sgeevx.o \
-	sgegs.o sgegv.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
-	sgelsd.o sgels.o sgelss.o sgelsx.o sgelsy.o sgeql2.o \
-	sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o sgeqrf.o sgerfs.o \
-	sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesvd.o sgesv.o \
-	sgesvx.o sgetc2.o sgetf2.o sgetrf.o sgetri.o sgetrs.o \
-	sggbak.o sggbal.o sgges.o sggesx.o sggev.o sggevx.o \
-	sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o sggsvd.o \
-	sggsvp.o sgtcon.o sgtrfs.o sgtsv.o sgtsvx.o sgttrf.o \
-	sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o sisnan.o \
-	slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
-	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o \
-	slaed4.o slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o \
-	slaeda.o slaein.o slaev2.o slaexc.o slag2d.o slag2.o \
-	slags2.o slagtf.o slagtm.o slagts.o slagv2.o slahqr.o \
-	slahr2.o slahrd.o slaic1.o slaisnan.o slaln2.o \
-	slals0.o slalsa.o slalsd.o slamrg.o slaneg.o slangb.o \
-	slange.o slangt.o slanhs.o slansb.o slansp.o slanst.o \
-	slansy.o slantb.o slantp.o slantr.o slanv2.o slapll.o \
-	slapmt.o slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
-	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o \
-	slaqr5.o slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o \
-	slar2v.o slarfb.o slarf.o slarfg.o slarft.o slarfx.o \
-	slargv.o slarnv.o slarra.o slarrb.o slarrc.o slarrd.o \
-	slarre.o slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
-	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o \
-	slas2.o slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
-	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o \
-	slasdq.o slasdt.o slaset.o slasq1.o slasq2.o slasq3.o \
-	slasq4.o slasq5.o slasq6.o slasr.o slasrt.o slassq.o \
-	slasv2.o slaswp.o slasy2.o slasyf.o slatbs.o slatdf.o \
-	slatps.o slatrd.o slatrs.o slatrz.o slatzm.o slauu2.o \
-	slauum.o slazq3.o slazq4.o sopgtr.o sopmtr.o sorg2l.o \
-	sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o \
-	sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
-	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o \
-	sormr2.o sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o \
-	spbequ.o spbrfs.o spbstf.o spbsv.o spbsvx.o spbtf2.o \
-	spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o \
-	sposvx.o spotf2.o spotrf.o spotri.o spotrs.o sppcon.o \
-	sppequ.o spprfs.o sppsv.o sppsvx.o spptrf.o spptri.o \
-	spptrs.o sptcon.o spteqr.o sptrfs.o sptsv.o sptsvx.o \
-	spttrf.o spttrs.o sptts2.o srscl.o ssbevd.o ssbev.o \
-	ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o ssbtrd.o \
-	sspcon.o sspevd.o sspev.o sspevx.o sspgst.o sspgvd.o \
-	sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
-	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o \
-	sstein.o sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o \
-	sstevr.o sstevx.o ssycon.o ssyevd.o ssyev.o ssyevr.o \
-	ssyevx.o ssygs2.o ssygst.o ssygvd.o ssygv.o ssygvx.o \
-	ssyrfs.o ssysv.o ssysvx.o ssytd2.o ssytf2.o ssytrd.o \
-	ssytrf.o ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o \
-	stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o stgsna.o \
-	stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
-	strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o \
-	strsyl.o strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o \
-	xerbla.o zbdsqr.o zcgesv.o zdrscl.o zgbbrd.o \
-	zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
-	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \
-	zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \
-	zgegs.o zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
-	zgelsd.o zgels.o zgelss.o zgelsx.o zgelsy.o zgeql2.o \
-	zgeqlf.o zgeqp3.o zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o \
-	zgerq2.o zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o \
-	zgesvx.o zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o \
-	zggbak.o zggbal.o zgges.o zggesx.o zggev.o zggevx.o \
-	zggglm.o zgghrd.o zgglse.o zggqrf.o zggrqf.o zggsvd.o \
-	zggsvp.o zgtcon.o zgtrfs.o zgtsv.o zgtsvx.o zgttrf.o \
-	zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o zhbgst.o \
-	zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheevd.o \
-	zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
-	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o zhetd2.o \
-	zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhgeqz.o \
-	zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
-	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o \
-	zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \
-	zlacgv.o zlacn2.o zlacon.o zlacp2.o zlacpy.o zlacrm.o \
-	zlacrt.o zladiv.o zlaed0.o zlaed7.o zlaed8.o zlaein.o \
-	zlaesy.o zlaev2.o zlag2c.o zlags2.o zlagtm.o zlahef.o \
-	zlahqr.o zlahr2.o zlahrd.o zlaic1.o zlals0.o zlalsa.o \
-	zlalsd.o zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o \
-	zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o \
-	zlantb.o zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o \
-	zlaqge.o zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o \
-	zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \
-	zlaqsb.o zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o zlarcm.o \
-	zlarfb.o zlarf.o zlarfg.o zlarft.o zlarfx.o zlargv.o \
-	zlarnv.o zlarrv.o zlartg.o zlartv.o zlarzb.o zlarz.o \
-	zlarzt.o zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
-	zlasyf.o zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o \
-	zlatrz.o zlatzm.o zlauu2.o zlauum.o zpbcon.o zpbequ.o \
-	zpbrfs.o zpbstf.o zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o \
-	zpbtrs.o zpocon.o zpoequ.o zporfs.o zposv.o zposvx.o \
-	zpotf2.o zpotrf.o zpotri.o zpotrs.o zppcon.o zppequ.o \
-	zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o zpptrs.o \
-	zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o \
-	zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o zspr.o \
-	zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
+	classq.o claswp.o clasyf.o \
+	clatbs.o \
+	clatdf.o clatps.o clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o \
+	clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
+	cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpftrf.o cpftri.o cpftrs.o \
+	cpocon.o cpoequb.o cpoequ.o cporfs.o cposv.o cposvx.o \
+	cpotf2.o cpotrf.o cpotri.o cpotrs.o cppcon.o cppequ.o \
+	cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o cpstf2.o \
+	cpstrf.o cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o \
+	cpttrs.o cptts2.o crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
+	cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
+	cstein.o cstemr.o csteqr.o csycon.o csyequb.o csymv.o csyr.o \
+	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o \
+	csytri.o csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctfsm.o ctftri.o \
+	ctfttp.o ctfttr.o ctgevc.o ctgex2.o ctgexc.o ctgsen.o ctgsja.o \
+	ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o ctprfs.o ctptri.o ctptrs.o \
+	ctpttf.o ctpttr.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o \
+	ctrsna.o ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctrttf.o ctrttp.o \
+	ctzrqf.o ctzrzf.o cung2l.o cung2r.o cungbr.o cunghr.o cungl2.o \
+	cunglq.o cungql.o cungqr.o cungr2.o cungrq.o cungtr.o cunm2l.o \
+	cunm2r.o cunmbr.o cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o \
+	cunmr2.o cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
+	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequb.o dgbequ.o \
+	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o \
+ 	dgbtrs.o dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequb.o \
+ 	dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
+	dgehd2.o dgehrd.o dgejsv.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
+	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o dgeqpf.o \
+	dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o dgesc2.o \
+	dgesdd.o dgesvd.o dgesv.o dgesvj.o dgesvx.o dgetc2.o \
+	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o dgges.o \
+	dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o dgglse.o dggqrf.o \
+	dggrqf.o dggsvd.o dggsvp.o dgsvj0.o dgsvj1.o dgtcon.o dgtrfs.o \
+	dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o dhsein.o \
+	dhseqr.o disnan.o dlabad.o dlabrd.o dlacn2.o dlacon.o dlacpy.o \
+	dladiv.o dlae2.o dlaebz.o dlaed0.o dlaed1.o dlaed2.o dlaed3.o \
+	dlaed4.o dlaed5.o dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o \
+	dlaein.o dlaev2.o dlaexc.o dlag2.o dlag2s.o \
+	dlags2.o dlagtf.o dlagtm.o \
+	dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o dlaic1.o \
+	dlaisnan.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
+	dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o \
+	dlansf.o dlansp.o dlanst.o dlansy.o dlantb.o dlantp.o dlantr.o \
+	dlanv2.o dlapll.o dlapmt.o \
+	dlapy2.o dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o \
+	dlaqps.o dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
+	dlaqsb.o dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
+	dlarf.o dlarfg.o dlarfp.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
+	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o \
+	dlarrf.o dlarrj.o dlarrk.o dlarrr.o dlarrv.o \
+	dlartg.o dlartv.o dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o \
+	dlascl.o dlasd0.o dlasd1.o dlasd2.o dlasd3.o \
+	dlasd4.o dlasd5.o dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o \
+	dlasdt.o dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
+	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o dlasy2.o \
+	dlasyf.o \
+	dlat2s.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
+	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o \
+	dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o dorghr.o dorgl2.o \
+	dorglq.o dorgql.o dorgqr.o dorgr2.o dorgrq.o dorgtr.o dorm2l.o \
+	dorm2r.o dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o \
+	dormr2.o dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o \
+	dpbrfs.o dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
+	dpftrf.o dpftri.o dpftrs.o dpocon.o dpoequb.o dpoequ.o \
+	dporfs.o dposv.o dposvx.o dpotf2.o dpotrf.o \
+	dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o dppsv.o dppsvx.o \
+	dpptrf.o dpptri.o dpptrs.o dpstf2.o dpstrf.o dptcon.o dpteqr.o \
+	dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o dptts2.o drscl.o \
+	dsbevd.o dsbev.o dsbevx.o dsbgst.o dsbgvd.o dsbgv.o dsbgvx.o \
+	dsbtrd.o dsfrk.o dsgesv.o dspcon.o dspevd.o dspev.o dspevx.o \
+	dspgst.o dspgvd.o dspgv.o dspgvx.o dsposv.o dsprfs.o dspsv.o \
+	dspsvx.o dsptrd.o dsptrf.o dsptri.o dsptrs.o dstebz.o dstedc.o \
+	dstegr.o dstein.o dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o \
+	dstevr.o dstevx.o dsycon.o dsyequb.o dsyevd.o dsyev.o dsyevr.o \
+	dsyevx.o dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
+	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o \
+	dsytrf.o dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtfsm.o \
+	dtftri.o dtfttp.o dtfttr.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
+	dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
+	dtptrs.o dtpttf.o dtpttr.o dtrcon.o dtrevc.o dtrexc.o dtrrfs.o \
+	dtrsen.o dtrsna.o dtrsyl.o dtrti2.o dtrtri.o dtrtrs.o dtrttf.o \
+	dtrttp.o dtzrqf.o dtzrzf.o dzsum1.o icmax1.o ieeeck.o ilaclc.o \
+	ilaclr.o iladiag.o iladlc.o iladlr.o ilaenv.o ilaprec.o \
+	ilaslc.o ilaslr.o ilatrans.o ilauplo.o ilaver.o ilazlc.o \
+	ilazlr.o iparmq.o izmax1.o lsamen.o sbdsdc.o sbdsqr.o scsum1.o \
+	sdisna.o sgbbrd.o sgbcon.o sgbequb.o sgbequ.o sgbrfs.o \
+	sgbsv.o sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o \
+	sgebak.o sgebal.o sgebd2.o sgebrd.o sgecon.o sgeequb.o sgeequ.o \
+	sgees.o sgeesx.o sgeev.o sgeevx.o sgegs.o sgegv.o sgehd2.o \
+	sgehrd.o sgejsv.o sgelq2.o sgelqf.o sgelsd.o sgels.o sgelss.o \
+	sgelsx.o sgelsy.o sgeql2.o sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o \
+	sgeqrf.o sgerfs.o sgerq2.o sgerqf.o sgesc2.o sgesdd.o \
+	sgesvd.o sgesv.o sgesvj.o sgesvx.o sgetc2.o sgetf2.o \
+	sgetrf.o sgetri.o sgetrs.o sggbak.o sggbal.o sgges.o sggesx.o \
+	sggev.o sggevx.o sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o \
+	sggsvd.o sggsvp.o sgsvj0.o sgsvj1.o sgtcon.o sgtrfs.o sgtsv.o \
+	sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o \
+	sisnan.o slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
+	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o \
+	slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o slaeda.o slaein.o \
+	slaev2.o slaexc.o slag2d.o slag2.o \
+	slags2.o slagtf.o slagtm.o slagts.o \
+	slagv2.o slahqr.o slahr2.o slahrd.o slaic1.o slaisnan.o \
+	slaln2.o slals0.o slalsa.o slalsd.o slamrg.o \
+	slaneg.o slangb.o slange.o slangt.o slanhs.o slansb.o slansf.o \
+	slansp.o slanst.o slansy.o slantb.o slantp.o slantr.o slanv2.o \
+	slapll.o slapmt.o \
+	slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
+	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
+	slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o slar2v.o slarfb.o \
+	slarf.o slarfg.o slarfp.o slarft.o slarfx.o slargv.o slarnv.o \
+	slarra.o slarrb.o slarrc.o slarrd.o slarre.o \
+	slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
+	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o slas2.o \
+	slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
+	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o slasdq.o \
+	slasdt.o slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o \
+	slasq6.o slasr.o slasrt.o slassq.o slasv2.o slaswp.o slasy2.o \
+	slasyf.o slatbs.o slatdf.o slatps.o slatrd.o slatrs.o \
+	slatrz.o slatzm.o slauu2.o slauum.o sopgtr.o \
+	sopmtr.o sorg2l.o sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o \
+	sorgql.o sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
+	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
+	sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
+	spbstf.o spbsv.o spbsvx.o spbtf2.o spbtrf.o spbtrs.o spftrf.o \
+	spftri.o spftrs.o spocon.o spoequb.o spoequ.o sporfs.o \
+	sposv.o sposvx.o spotf2.o spotrf.o \
+	spotri.o spotrs.o sppcon.o sppequ.o spprfs.o sppsv.o sppsvx.o \
+	spptrf.o spptri.o spptrs.o spstf2.o spstrf.o sptcon.o spteqr.o \
+	sptrfs.o sptsv.o sptsvx.o spttrf.o spttrs.o sptts2.o srscl.o \
+	ssbevd.o ssbev.o ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o \
+	ssbtrd.o ssfrk.o sspcon.o sspevd.o sspev.o sspevx.o sspgst.o \
+	sspgvd.o sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
+	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o sstein.o \
+	sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o sstevr.o sstevx.o \
+	ssycon.o ssyequb.o ssyevd.o ssyev.o ssyevr.o ssyevx.o ssygs2.o \
+	ssygst.o ssygvd.o ssygv.o ssygvx.o ssyrfs.o ssysv.o \
+	ssysvx.o ssytd2.o ssytf2.o ssytrd.o ssytrf.o \
+	ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o stfsm.o stftri.o \
+	stfttp.o stfttr.o stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o \
+	stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
+	stpttf.o stpttr.o strcon.o strevc.o strexc.o strrfs.o strsen.o \
+	strsna.o strsyl.o strti2.o strtri.o strtrs.o strttf.o strttp.o \
+	stzrqf.o stzrzf.o xerbla_array.o xerbla.o zbdsqr.o zcgesv.o \
+	zcposv.o zdrscl.o zgbbrd.o zgbcon.o zgbequb.o zgbequ.o \
+	zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
+	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o zgecon.o \
+	zgeequb.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o zgegs.o \
+	zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o zgelsd.o zgels.o \
+	zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
+	zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerq2.o \
+	zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o zgesvx.o \
+	zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o zggbak.o zggbal.o \
+	zgges.o zggesx.o zggev.o zggevx.o zggglm.o zgghrd.o zgglse.o \
+	zggqrf.o zggrqf.o zggsvd.o zggsvp.o zgtcon.o zgtrfs.o zgtsv.o \
+	zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o \
+	zhbgst.o zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheequb.o \
+	zheevd.o zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
+	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o \
+	zhetd2.o zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhfrk.o \
+	zhgeqz.o zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
+	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o zhptrf.o \
+	zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o zlacgv.o zlacn2.o \
+	zlacon.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o zlaed0.o \
+	zlaed7.o zlaed8.o zlaein.o zlaesy.o zlaev2.o zlag2c.o \
+	zlags2.o \
+	zlagtm.o zlahef.o \
+	zlahqr.o zlahr2.o \
+	zlahrd.o zlaic1.o zlals0.o zlalsa.o zlalsd.o \
+	zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o zlanhf.o zlanhp.o \
+	zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o zlantp.o \
+	zlantr.o zlapll.o zlapmt.o \
+	zlaqgb.o zlaqge.o \
+	zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqr0.o zlaqr1.o \
+	zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o zlaqsb.o zlaqsp.o zlaqsy.o \
+	zlar1v.o zlar2v.o zlarcm.o zlarfb.o zlarf.o zlarfg.o zlarfp.o \
+	zlarft.o zlarfx.o zlargv.o zlarnv.o zlarrv.o \
+	zlartg.o zlartv.o zlarzb.o zlarz.o zlarzt.o \
+	zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
+	zlasyf.o \
+	zlat2c.o zlatbs.o \
+	zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
+	zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o \
+	zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpftrf.o zpftri.o \
+	zpftrs.o zpocon.o zpoequb.o zpoequ.o zporfs.o \
+	zposv.o zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o \
+	zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o \
+	zpptrs.o zpstf2.o zpstrf.o zptcon.o zpteqr.o zptrfs.o zptsv.o \
+	zptsvx.o zpttrf.o zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o \
+	zspr.o zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
 	zstedc.o zstegr.o zstein.o zstemr.o zsteqr.o zsycon.o \
-	zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o \
-	zsytrf.o zsytri.o zsytrs.o ztbcon.o ztbrfs.o ztbtrs.o \
-	ztgevc.o ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o \
-	ztgsy2.o ztgsyl.o ztpcon.o ztprfs.o ztptri.o ztptrs.o \
-	ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
-	ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o \
-	zung2l.o zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o \
-	zungql.o zungqr.o zungr2.o zungrq.o zungtr.o zunm2l.o \
-	zunm2r.o zunmbr.o zunmhr.o zunml2.o zunmlq.o zunmql.o \
-	zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o zunmtr.o \
-	zupgtr.o zupmtr.o ../INSTALL/dlamch.o ../INSTALL/dsecnd_INT_ETIME.o \
-	../INSTALL/lsame.o ../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
+	zsyequb.o zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o \
+	zsytf2.o zsytrf.o zsytri.o zsytrs.o ztbcon.o \
+	ztbrfs.o ztbtrs.o ztfsm.o ztftri.o ztfttp.o ztfttr.o ztgevc.o \
+	ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o \
+	ztpcon.o ztprfs.o ztptri.o ztptrs.o ztpttf.o ztpttr.o ztrcon.o \
+	ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o ztrsyl.o ztrti2.o \
+	ztrtri.o ztrtrs.o ztrttf.o ztrttp.o ztzrqf.o ztzrzf.o zung2l.o \
+	zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o \
+	zungr2.o zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o \
+	zunml2.o zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o \
+	zunmrz.o zunmtr.o zupgtr.o zupmtr.o ../INSTALL/dlamch.o \
+	../INSTALL/dsecnd_INT_ETIME.o ../INSTALL/lsame.o \
+	../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
+
+SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
+   sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o			\
+   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
+   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
+   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
+   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
+   slascl2.o sla_wwaddw.o
+
+DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
+   dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o			\
+   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
+   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
+   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
+   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
+   dlascl2.o dla_wwaddw.o
+
+CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o		\
+   cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o				\
+   csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o		\
+   cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o			\
+   cposvxx.o cporfsx.o cla_porfsx_extended.o				\
+   cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o			\
+   cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o		\
+   cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o			\
+   chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o		\
+   cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o			\
+   cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
+
+ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
+   zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o	\
+   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
+   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
+   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
+   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o	\
+   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
+   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
+   zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
+
+ALLXAUX =
+
+ifdef USEXBLAS
+ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX)
+endif
 
-static: $(OBJS)
+static: $(OBJS) $(ALLXOBJ)
 	ar ruv liblapack.a $(OBJS)
 	ranlib liblapack.a
 
-shared: $(OBJS)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.1.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc
+shared: $(OBJS) $(ALLXOBJ)
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.2.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc


Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-11/lapack.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- lapack.spec	25 Feb 2009 12:33:31 -0000	1.20
+++ lapack.spec	4 Sep 2009 21:22:32 -0000	1.21
@@ -1,17 +1,17 @@
-Summary: The LAPACK libraries for numerical linear algebra.
+Summary: Numerical linear algebra package libraries
 Name: lapack
-Version: 3.1.1
-Release: 5%{?dist}
+Version: 3.2.1
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
 Source0: http://www.netlib.org/lapack/lapack-%{version}.tgz
+Source1: http://www.netlib.org/lapack/manpages.tgz
 Source2: Makefile.blas
 Source3: Makefile.lapack
 Source4: http://www.netlib.org/lapack/lapackqref.ps
 Source5: http://www.netlib.org/blas/blasqr.ps
 Patch3: lapack-3.1.1-make.inc.patch
-Obsoletes: lapack-man
 BuildRequires: gcc-gfortran
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,39 +33,41 @@ Summary: LAPACK development libraries
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: blas-devel = %{version}-%{release}
+Provides: lapack-static = %{version}-%{release}
 
 %description devel
 LAPACK development libraries for applications that link statically.
 
 %package -n blas
-Summary: The BLAS (Basic Linear Algebra Subprograms) library.
+Summary: The Basic Linear Algebra Subprograms library
 Group: Development/Libraries
-Obsoletes: lapack-blas blas-man
 
 %description -n blas
 BLAS (Basic Linear Algebra Subprograms) is a standard library which
-provides a number of basic algorithms for numerical algebra. Man
-pages for blas are available in the blas-man package.
+provides a number of basic algorithms for numerical algebra. 
 
 %package -n blas-devel
-Summary: LAPACK development libraries
+Summary: BLAS development libraries
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 Requires: gcc-gfortran
+Provides: blas-static = %{version}-%{release}
 
 %description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep
 %setup -q 
-%setup -q -D -T
+%setup -q -D -T -a1
 %patch3 -p1
 cp -f INSTALL/make.inc.gfortran make.inc
-cp -f $RPM_SOURCE_DIR/Makefile.blas BLAS/SRC/Makefile
-cp -f $RPM_SOURCE_DIR/Makefile.lapack SRC/Makefile
+cp -f %{SOURCE2} BLAS/SRC/Makefile
+cp -f %{SOURCE3} SRC/Makefile
+
+mv lapack-3.2.0/manpages/ manpages/
 
 #Empty
-rm -f man/manl/zbcon.l
+rm -f manpages/man/manl/zbcon.l
 
 %build
 
@@ -80,17 +82,14 @@ cp libblas.a ${RPM_BUILD_DIR}/%{name}-%{
 make clean
 FFLAGS="$RPM_OPT_O_FLAGS -fPIC" make dcabs1.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
-cp libblas.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/
+cp libblas.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-ln -s libblas.so.3.1.1 libblas.so
-
-# Some files don't like -O2, but -Os is fine
-RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|')
+ln -s libblas.so.%{version} libblas.so
 
 # Build the static dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
-make NOOPT="$RPM_OPT_SIZE_FLAGS" OPTS="$RPM_OPT_FLAGS"
+make NOOPT="$RPM_OPT_O_FLAGS" OPTS="$RPM_OPT_FLAGS"
 popd
 
 # Build the static lapack library
@@ -99,41 +98,41 @@ make FFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RP
 cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-# Build the shared dlamch, dsecnd, lsame, second, slamch bits
+# Build the static with pic dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
-# Build the shared lapack library
+# Build the static with pic lapack library
 pushd SRC
 make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
-cp liblapack.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
+cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
 popd
 
-# Buuld the static with pic dlamch, dsecnd, lsame, second, slamch bits
+# Build the shared dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
-# Build the static with pic lapack library
+# Build the shared lapack library
 pushd SRC
 make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
-cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
+cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-cp %{SOURCE4} lapackqref.ps
-cp %{SOURCE5} blasqr.ps
+cp -p %{SOURCE4} lapackqref.ps
+cp -p %{SOURCE5} blasqr.ps
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl
 
-for f in liblapack.so.3.1.1 libblas.so.3.1.1 libblas.a liblapack.a liblapack_pic.a; do
+for f in liblapack.so.%{version} libblas.so.%{version} libblas.a liblapack.a liblapack_pic.a; do
   cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f
 done
 
@@ -148,12 +147,12 @@ cp -f manpages/blas/man/manl/* ${RPM_BUI
 cp -f manpages/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl
 
 cd ${RPM_BUILD_ROOT}%{_libdir}
-ln -sf liblapack.so.3.1.1 liblapack.so
-ln -sf liblapack.so.3.1.1 liblapack.so.3
-ln -sf liblapack.so.3.1.1 liblapack.so.3.1
-ln -sf libblas.so.3.1.1 libblas.so
-ln -sf libblas.so.3.1.1 libblas.so.3
-ln -sf libblas.so.3.1.1 libblas.so.3.1
+ln -sf liblapack.so.%{version} liblapack.so
+ln -sf liblapack.so.%{version} liblapack.so.3
+ln -sf liblapack.so.%{version} liblapack.so.3.2
+ln -sf libblas.so.%{version} libblas.so
+ln -sf libblas.so.%{version} libblas.so.3
+ln -sf libblas.so.%{version} libblas.so.3.2
 
 %post -p /sbin/ldconfig
 
@@ -187,6 +186,21 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-3
+- use RPM_OPT_O_FLAGS (-O0) everywhere necessary, drop RPM_OPT_SIZE_FLAGS (-Os) (bz 520518)
+
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-2
+- don't enable xblas yet
+
+* Fri Aug 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-1
+- update to 3.2.1, spec file cleanups
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 3.1.1-7
+- Convert specfile to UTF-8.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -281,7 +295,7 @@ rm -fr ${RPM_BUILD_ROOT}
 * Sun Nov 10 2002 Jeff Johnson <jbj at redhat.com> 3.0-19
 - rebuild with x86_64.
 
-* Thu Jul 18 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-18
+* Thu Jul 18 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-18
 - Remove an empty man page (#63569)
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -290,44 +304,44 @@ rm -fr ${RPM_BUILD_ROOT}
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed May  1 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-15
+* Wed May  1 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-15
 - Rebuild
 
-* Thu Feb 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-14
+* Thu Feb 21 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-14
 - Rebuild
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Aug 13 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-12
+* Mon Aug 13 2001 Trond Eivind Glomsrod <teg at redhat.com> 3.0-12
 - The man-pages for xerbla and lsame were in blas-man and lapack-man (#51605)
 
-* Fri Jun  8 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun  8 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Reenable optimization for IA64
 
-* Fri May 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri May 25 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Add all patches from the LAPACK site as of 2001-05-25
 - Use this workaround for IA64 instead
 - Remove SPARC workaround
 - Don't exclude IA64
 
-* Thu Dec 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Dec 07 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - rebuild for main distribution
 
-* Mon Nov 20 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Nov 20 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - add the LAPACK Quick Reference Guide to the docs
 - add the BLAS Quick Reference Guide to the docs
 
-* Tue Aug 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Aug 01 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - fix lack of ldconfig in postuninstall script
 
 * Mon Jul 24 2000 Prospector <prospector at redhat.com>
 - rebuilt
 
-* Mon Jul 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 10 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - updated with the latest updates (new tarfile..) from netlib 
 
-* Thu Jun 15 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jun 15 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - use %%{_mandir}
 - added some flags to work around SPARC compiler bug
 
@@ -356,12 +370,12 @@ rm -fr ${RPM_BUILD_ROOT}
 * Fri Jul 17 1998 Jeff Johnson <jbj at redhat.com>
 - repackage for powertools.
 
-* Sun Feb 15 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Feb 15 1998 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-9]
  - No code updates, just built with a customized rpm -
    this should make dependencies right.
 
-* Sat Feb 07 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Feb 07 1998 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-8]
  - Total rewrite of the spec file
  - Added my own makefiles - libs should build better,
@@ -373,16 +387,16 @@ rm -fr ${RPM_BUILD_ROOT}
    (oh - and as always: Dedicated to the girl I
    love, Eline Skirnisdottir)
 
-* Sat Dec 06 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Dec 06 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-7]
   - added a dependency to glibc, so people don't try with libc5
 
-* Thu Nov 20 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Thu Nov 20 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
   [lapack-2.0-6]
   - removed etime.c
   - compiled with egcs, and for glibc 2.0
 
-* Sun Oct 12 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Oct 12 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
   [lapack-2.0-5]
   - added a changelog
   - cleaned up building of shared libs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 May 2007 22:08:50 -0000	1.5
+++ sources	4 Sep 2009 21:22:32 -0000	1.6
@@ -1 +1,2 @@
-00b21551a899bcfbaa7b8443e1faeef9  lapack-3.1.1.tgz
+a3202a4f9e2f15ffd05d15dab4ac7857  lapack-3.2.1.tgz
+145007cab915504caec382289462a166  manpages.tgz



From spot at fedoraproject.org  Fri Sep  4 21:22:31 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  4 Sep 2009 21:22:31 +0000 (UTC)
Subject: rpms/lapack/F-10 Makefile.blas, 1.5, 1.6 Makefile.lapack, 1.4,
	1.5 lapack.spec, 1.19, 1.20 sources, 1.5, 1.6
Message-ID: <20090904212231.EE98111C0082@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lapack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9250/F-10

Modified Files:
	Makefile.blas Makefile.lapack lapack.spec sources 
Log Message:
update to 3.2.1 everywhere, fix miscompile bug (bz 520518)


Index: Makefile.blas
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-10/Makefile.blas,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Makefile.blas	25 May 2007 22:08:50 -0000	1.5
+++ Makefile.blas	4 Sep 2009 21:22:31 -0000	1.6
@@ -2,30 +2,31 @@ clean:
 	rm -f *.o libblas.a libblas.so*
 
 OBJS=	caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o \
-	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o \
-	cher2k.o cherk.o chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o \
+	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher2.o cher2k.o \
+	cher.o cherk.o chpmv.o chpr2.o chpr.o crotg.o cscal.o csrot.o \
 	csscal.o cswap.o csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o \
 	ctpmv.o ctpsv.o ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o \
 	daxpy.o dcabs1.o dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o \
-	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o \
-	dspr.o dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o \
-	dsyr2k.o dsyrk.o dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o \
-	dtrmv.o dtrsm.o dtrsv.o dzasum.o dznrm2.o icamax.o idamax.o \
-	isamax.o izamax.o lsame.o sasum.o saxpy.o scasum.o scnrm2.o \
-	scopy.o sdot.o sdsdot.o sgbmv.o sgemm.o sgemv.o sger.o snrm2.o \
-	srot.o srotg.o srotm.o srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o \
-	sswap.o ssymm.o ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o \
-	stbmv.o stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o \
-	strsv.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o \
-	zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o \
-	zhemv.o zher.o zher2.o zher2k.o zherk.o zhpmv.o zhpr.o \
-	zhpr2.o zrotg.o zscal.o zswap.o zsymm.o zsyr2k.o zsyrk.o \
-	ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o ztrmv.o ztrsm.o \
-	ztrsv.o scabs1.o
+	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o \
+	dscal.o dsdot.o dspmv.o dspr2.o dspr.o dswap.o dsymm.o \
+	dsymv.o dsyr2.o dsyr2k.o dsyr.o dsyrk.o dtbmv.o dtbsv.o \
+	dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o dzasum.o \
+	dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o sasum.o \
+	saxpy.o scabs1.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o \
+	sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o \
+	srotmg.o ssbmv.o sscal.o sspmv.o sspr2.o sspr.o sswap.o \
+	ssymm.o ssymv.o ssyr2.o ssyr2k.o ssyr.o ssyrk.o stbmv.o \
+	stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o \
+	xerbla_array.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o \
+	zdrot.o zdscal.o zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o \
+	zhbmv.o zhemm.o zhemv.o zher2.o zher2k.o zher.o zherk.o \
+	zhpmv.o zhpr2.o zhpr.o zrotg.o zscal.o zswap.o zsymm.o \
+	zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o \
+	ztrmv.o ztrsm.o ztrsv.o
 
 static: $(OBJS)
 	ar ruv libblas.a $(OBJS)
 	ranlib libblas.a
 
 shared: $(OBJS)
-	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.1.1 $(OBJS) -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.2.1 $(OBJS) -lm -lgfortran -lc


Index: Makefile.lapack
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-10/Makefile.lapack,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- Makefile.lapack	25 May 2007 22:08:50 -0000	1.4
+++ Makefile.lapack	4 Sep 2009 21:22:31 -0000	1.5
@@ -1,237 +1,293 @@
+include ../make.inc
+
 clean:
 	rm -f *.o liblapack*
 
-OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o \
-	cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o \
-	cgebd2.o cgebrd.o cgecon.o cgeequ.o cgees.o cgeesx.o \
-	cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o \
-	cgelq2.o cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o \
-	cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o \
-	cgeqrf.o cgerfs.o cgerq2.o cgerqf.o cgesc2.o cgesdd.o \
-	cgesvd.o cgesv.o cgesvx.o cgetc2.o cgetf2.o cgetrf.o \
-	cgetri.o cgetrs.o cggbak.o cggbal.o cgges.o cggesx.o \
-	cggev.o cggevx.o cggglm.o cgghrd.o cgglse.o cggqrf.o \
-	cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o cgtsv.o \
-	cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
-	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o \
-	checon.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o \
-	chegst.o chegvd.o chegv.o chegvx.o cherfs.o chesv.o \
-	chesvx.o chetd2.o chetf2.o chetrd.o chetrf.o chetri.o \
-	chetrs.o chgeqz.o chpcon.o chpevd.o chpev.o chpevx.o \
-	chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
-	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o \
-	chseqr.o clabrd.o clacgv.o clacn2.o clacon.o clacp2.o \
-	clacpy.o clacrm.o clacrt.o cladiv.o claed0.o claed7.o \
-	claed8.o claein.o claesy.o claev2.o clag2z.o clags2.o \
-	clagtm.o clahef.o clahqr.o clahr2.o clahrd.o claic1.o \
-	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \
-	clanhb.o clanhe.o clanhp.o clanhs.o clanht.o clansb.o \
-	clansp.o clansy.o clantb.o clantp.o clantr.o clapll.o \
-	clapmt.o claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
-	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o \
-	claqr4.o claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o \
-	clar2v.o clarcm.o clarfb.o clarf.o clarfg.o clarft.o \
-	clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \
+OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb.o cgbequ.o cgbrfs.o \
+	cgbsv.o cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o \
+	cgebal.o cgebd2.o cgebrd.o cgecon.o cgeequb.o cgeequ.o cgees.o \
+	cgeesx.o cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o \
+	cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o cgelsy.o cgeql2.o \
+	cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o \
+	cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesvd.o cgesv.o cgesvx.o \
+	cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o cggbak.o \
+	cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o cgghrd.o \
+	cgglse.o cggqrf.o cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o \
+	cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
+	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o checon.o \
+	cheequb.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o chegst.o \
+	chegvd.o chegv.o chegvx.o cherfs.o chesv.o chesvx.o \
+	chetd2.o chetf2.o chetrd.o chetrf.o chetri.o chetrs.o \
+	chfrk.o chgeqz.o chla_transtype.o chpcon.o chpevd.o chpev.o \
+	chpevx.o chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
+	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o \
+	clabrd.o clacgv.o clacn2.o clacon.o clacp2.o clacpy.o clacrm.o \
+	clacrt.o cladiv.o claed0.o claed7.o claed8.o claein.o claesy.o \
+	claev2.o clag2z.o \
+	clags2.o clagtm.o \
+	clahef.o \
+	clahqr.o clahr2.o clahrd.o claic1.o \
+	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o clanhb.o \
+	clanhe.o clanhf.o clanhp.o clanhs.o clanht.o clansb.o clansp.o \
+	clansy.o clantb.o clantp.o clantr.o clapll.o clapmt.o \
+	claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
+	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o \
+	claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o clar2v.o clarcm.o \
+	clarfb.o clarf.o clarfg.o clarfp.o clarft.o clarfx.o clargv.o \
+	clarnv.o clarrv.o clartg.o clartv.o \
 	clarzb.o clarz.o clarzt.o clascl.o claset.o clasr.o \
-	classq.o claswp.o clasyf.o clatbs.o clatdf.o clatps.o \
-	clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o clauum.o \
-	cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o cpbsvx.o \
-	cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
-	cposv.o cposvx.o cpotf2.o cpotrf.o cpotri.o cpotrs.o \
-	cppcon.o cppequ.o cpprfs.o cppsv.o cppsvx.o cpptrf.o \
-	cpptri.o cpptrs.o cptcon.o cpteqr.o cptrfs.o cptsv.o \
-	cptsvx.o cpttrf.o cpttrs.o cptts2.o crot.o cspcon.o \
-	cspmv.o cspr.o csprfs.o cspsv.o cspsvx.o csptrf.o \
-	csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
-	cstein.o cstemr.o csteqr.o csycon.o csymv.o csyr.o \
-	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o \
-	csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
-	ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o \
-	ctpcon.o ctprfs.o ctptri.o ctptrs.o ctrcon.o ctrevc.o \
-	ctrexc.o ctrrfs.o ctrsen.o ctrsna.o ctrsyl.o ctrti2.o \
-	ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \
-	cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o \
-	cungr2.o cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o \
-	cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o cunmr2.o \
-	cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
-	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequ.o \
-	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o \
-	dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequ.o \
-	dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
-	dgehd2.o dgehrd.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
-	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o \
-	dgeqpf.o dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o \
-	dgesc2.o dgesdd.o dgesvd.o dgesv.o dgesvx.o dgetc2.o \
-	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o \
-	dgges.o dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o \
-	dgglse.o dggqrf.o dggrqf.o dggsvd.o dggsvp.o dgtcon.o \
-	dgtrfs.o dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o \
-	dhgeqz.o dhsein.o dhseqr.o disnan.o dlabad.o dlabrd.o \
-	dlacn2.o dlacon.o dlacpy.o dladiv.o dlae2.o dlaebz.o \
-	dlaed0.o dlaed1.o dlaed2.o dlaed3.o dlaed4.o dlaed5.o \
-	dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o dlaein.o \
-	dlaev2.o dlaexc.o dlag2.o dlag2s.o dlags2.o dlagtf.o \
-	dlagtm.o dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o \
-	dlaic1.o dlaisnan.o dlaln2.o dlals0.o dlalsa.o \
-	dlalsd.o dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o \
-	dlanhs.o dlansb.o dlansp.o dlanst.o dlansy.o dlantb.o \
-	dlantp.o dlantr.o dlanv2.o dlapll.o dlapmt.o dlapy2.o \
-	dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqr0.o \
-	dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o dlaqsb.o \
-	dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
-	dlarf.o dlarfg.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
-	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o dlarrf.o \
-	dlarrj.o dlarrk.o dlarrr.o dlarrv.o dlartg.o dlartv.o \
-	dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o dlascl.o \
-	dlasd0.o dlasd1.o dlasd2.o dlasd3.o dlasd4.o dlasd5.o \
-	dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o dlasdt.o \
-	dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
-	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o \
-	dlasy2.o dlasyf.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
-	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o dlazq3.o \
-	dlazq4.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o \
-	dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \
-	dorgrq.o dorgtr.o dorm2l.o dorm2r.o dormbr.o dormhr.o \
-	dorml2.o dormlq.o dormql.o dormqr.o dormr2.o dormr3.o \
-	dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \
-	dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
-	dpocon.o dpoequ.o dporfs.o dposv.o dposvx.o dpotf2.o \
-	dpotrf.o dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o \
-	dppsv.o dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \
-	dpteqr.o dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o \
-	dptts2.o drscl.o dsbevd.o dsbev.o dsbevx.o dsbgst.o \
-	dsbgvd.o dsbgv.o dsbgvx.o dsbtrd.o dsgesv.o dspcon.o \
-	dspevd.o dspev.o dspevx.o dspgst.o dspgvd.o dspgv.o \
-	dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o dsptrf.o \
-	dsptri.o dsptrs.o dstebz.o dstedc.o dstegr.o dstein.o \
-	dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o dstevr.o \
-	dstevx.o dsycon.o dsyevd.o dsyev.o dsyevr.o dsyevx.o \
-	dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
-	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o dsytrf.o \
-	dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o \
-	dtgex2.o dtgexc.o dtgsen.o dtgsja.o dtgsna.o dtgsy2.o \
-	dtgsyl.o dtpcon.o dtprfs.o dtptri.o dtptrs.o dtrcon.o \
-	dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
-	dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dzsum1.o \
-	icmax1.o ieeeck.o ilaenv.o ilaver.o iparmq.o izmax1.o \
-	lsamen.o sbdsdc.o sbdsqr.o scsum1.o sdisna.o sgbbrd.o \
-	sgbcon.o sgbequ.o sgbrfs.o sgbsv.o sgbsvx.o sgbtf2.o \
-	sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o sgebrd.o \
-	sgecon.o sgeequ.o sgees.o sgeesx.o sgeev.o sgeevx.o \
-	sgegs.o sgegv.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
-	sgelsd.o sgels.o sgelss.o sgelsx.o sgelsy.o sgeql2.o \
-	sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o sgeqrf.o sgerfs.o \
-	sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesvd.o sgesv.o \
-	sgesvx.o sgetc2.o sgetf2.o sgetrf.o sgetri.o sgetrs.o \
-	sggbak.o sggbal.o sgges.o sggesx.o sggev.o sggevx.o \
-	sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o sggsvd.o \
-	sggsvp.o sgtcon.o sgtrfs.o sgtsv.o sgtsvx.o sgttrf.o \
-	sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o sisnan.o \
-	slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
-	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o \
-	slaed4.o slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o \
-	slaeda.o slaein.o slaev2.o slaexc.o slag2d.o slag2.o \
-	slags2.o slagtf.o slagtm.o slagts.o slagv2.o slahqr.o \
-	slahr2.o slahrd.o slaic1.o slaisnan.o slaln2.o \
-	slals0.o slalsa.o slalsd.o slamrg.o slaneg.o slangb.o \
-	slange.o slangt.o slanhs.o slansb.o slansp.o slanst.o \
-	slansy.o slantb.o slantp.o slantr.o slanv2.o slapll.o \
-	slapmt.o slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
-	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o \
-	slaqr5.o slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o \
-	slar2v.o slarfb.o slarf.o slarfg.o slarft.o slarfx.o \
-	slargv.o slarnv.o slarra.o slarrb.o slarrc.o slarrd.o \
-	slarre.o slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
-	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o \
-	slas2.o slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
-	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o \
-	slasdq.o slasdt.o slaset.o slasq1.o slasq2.o slasq3.o \
-	slasq4.o slasq5.o slasq6.o slasr.o slasrt.o slassq.o \
-	slasv2.o slaswp.o slasy2.o slasyf.o slatbs.o slatdf.o \
-	slatps.o slatrd.o slatrs.o slatrz.o slatzm.o slauu2.o \
-	slauum.o slazq3.o slazq4.o sopgtr.o sopmtr.o sorg2l.o \
-	sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o \
-	sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
-	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o \
-	sormr2.o sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o \
-	spbequ.o spbrfs.o spbstf.o spbsv.o spbsvx.o spbtf2.o \
-	spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o \
-	sposvx.o spotf2.o spotrf.o spotri.o spotrs.o sppcon.o \
-	sppequ.o spprfs.o sppsv.o sppsvx.o spptrf.o spptri.o \
-	spptrs.o sptcon.o spteqr.o sptrfs.o sptsv.o sptsvx.o \
-	spttrf.o spttrs.o sptts2.o srscl.o ssbevd.o ssbev.o \
-	ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o ssbtrd.o \
-	sspcon.o sspevd.o sspev.o sspevx.o sspgst.o sspgvd.o \
-	sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
-	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o \
-	sstein.o sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o \
-	sstevr.o sstevx.o ssycon.o ssyevd.o ssyev.o ssyevr.o \
-	ssyevx.o ssygs2.o ssygst.o ssygvd.o ssygv.o ssygvx.o \
-	ssyrfs.o ssysv.o ssysvx.o ssytd2.o ssytf2.o ssytrd.o \
-	ssytrf.o ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o \
-	stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o stgsna.o \
-	stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
-	strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o \
-	strsyl.o strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o \
-	xerbla.o zbdsqr.o zcgesv.o zdrscl.o zgbbrd.o \
-	zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
-	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \
-	zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \
-	zgegs.o zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
-	zgelsd.o zgels.o zgelss.o zgelsx.o zgelsy.o zgeql2.o \
-	zgeqlf.o zgeqp3.o zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o \
-	zgerq2.o zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o \
-	zgesvx.o zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o \
-	zggbak.o zggbal.o zgges.o zggesx.o zggev.o zggevx.o \
-	zggglm.o zgghrd.o zgglse.o zggqrf.o zggrqf.o zggsvd.o \
-	zggsvp.o zgtcon.o zgtrfs.o zgtsv.o zgtsvx.o zgttrf.o \
-	zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o zhbgst.o \
-	zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheevd.o \
-	zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
-	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o zhetd2.o \
-	zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhgeqz.o \
-	zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
-	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o \
-	zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \
-	zlacgv.o zlacn2.o zlacon.o zlacp2.o zlacpy.o zlacrm.o \
-	zlacrt.o zladiv.o zlaed0.o zlaed7.o zlaed8.o zlaein.o \
-	zlaesy.o zlaev2.o zlag2c.o zlags2.o zlagtm.o zlahef.o \
-	zlahqr.o zlahr2.o zlahrd.o zlaic1.o zlals0.o zlalsa.o \
-	zlalsd.o zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o \
-	zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o \
-	zlantb.o zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o \
-	zlaqge.o zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o \
-	zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \
-	zlaqsb.o zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o zlarcm.o \
-	zlarfb.o zlarf.o zlarfg.o zlarft.o zlarfx.o zlargv.o \
-	zlarnv.o zlarrv.o zlartg.o zlartv.o zlarzb.o zlarz.o \
-	zlarzt.o zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
-	zlasyf.o zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o \
-	zlatrz.o zlatzm.o zlauu2.o zlauum.o zpbcon.o zpbequ.o \
-	zpbrfs.o zpbstf.o zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o \
-	zpbtrs.o zpocon.o zpoequ.o zporfs.o zposv.o zposvx.o \
-	zpotf2.o zpotrf.o zpotri.o zpotrs.o zppcon.o zppequ.o \
-	zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o zpptrs.o \
-	zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o \
-	zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o zspr.o \
-	zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
+	classq.o claswp.o clasyf.o \
+	clatbs.o \
+	clatdf.o clatps.o clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o \
+	clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
+	cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpftrf.o cpftri.o cpftrs.o \
+	cpocon.o cpoequb.o cpoequ.o cporfs.o cposv.o cposvx.o \
+	cpotf2.o cpotrf.o cpotri.o cpotrs.o cppcon.o cppequ.o \
+	cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o cpstf2.o \
+	cpstrf.o cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o \
+	cpttrs.o cptts2.o crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
+	cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
+	cstein.o cstemr.o csteqr.o csycon.o csyequb.o csymv.o csyr.o \
+	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o \
+	csytri.o csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctfsm.o ctftri.o \
+	ctfttp.o ctfttr.o ctgevc.o ctgex2.o ctgexc.o ctgsen.o ctgsja.o \
+	ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o ctprfs.o ctptri.o ctptrs.o \
+	ctpttf.o ctpttr.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o \
+	ctrsna.o ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctrttf.o ctrttp.o \
+	ctzrqf.o ctzrzf.o cung2l.o cung2r.o cungbr.o cunghr.o cungl2.o \
+	cunglq.o cungql.o cungqr.o cungr2.o cungrq.o cungtr.o cunm2l.o \
+	cunm2r.o cunmbr.o cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o \
+	cunmr2.o cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
+	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequb.o dgbequ.o \
+	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o \
+ 	dgbtrs.o dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequb.o \
+ 	dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
+	dgehd2.o dgehrd.o dgejsv.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
+	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o dgeqpf.o \
+	dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o dgesc2.o \
+	dgesdd.o dgesvd.o dgesv.o dgesvj.o dgesvx.o dgetc2.o \
+	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o dgges.o \
+	dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o dgglse.o dggqrf.o \
+	dggrqf.o dggsvd.o dggsvp.o dgsvj0.o dgsvj1.o dgtcon.o dgtrfs.o \
+	dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o dhsein.o \
+	dhseqr.o disnan.o dlabad.o dlabrd.o dlacn2.o dlacon.o dlacpy.o \
+	dladiv.o dlae2.o dlaebz.o dlaed0.o dlaed1.o dlaed2.o dlaed3.o \
+	dlaed4.o dlaed5.o dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o \
+	dlaein.o dlaev2.o dlaexc.o dlag2.o dlag2s.o \
+	dlags2.o dlagtf.o dlagtm.o \
+	dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o dlaic1.o \
+	dlaisnan.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
+	dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o \
+	dlansf.o dlansp.o dlanst.o dlansy.o dlantb.o dlantp.o dlantr.o \
+	dlanv2.o dlapll.o dlapmt.o \
+	dlapy2.o dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o \
+	dlaqps.o dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
+	dlaqsb.o dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
+	dlarf.o dlarfg.o dlarfp.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
+	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o \
+	dlarrf.o dlarrj.o dlarrk.o dlarrr.o dlarrv.o \
+	dlartg.o dlartv.o dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o \
+	dlascl.o dlasd0.o dlasd1.o dlasd2.o dlasd3.o \
+	dlasd4.o dlasd5.o dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o \
+	dlasdt.o dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
+	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o dlasy2.o \
+	dlasyf.o \
+	dlat2s.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
+	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o \
+	dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o dorghr.o dorgl2.o \
+	dorglq.o dorgql.o dorgqr.o dorgr2.o dorgrq.o dorgtr.o dorm2l.o \
+	dorm2r.o dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o \
+	dormr2.o dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o \
+	dpbrfs.o dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
+	dpftrf.o dpftri.o dpftrs.o dpocon.o dpoequb.o dpoequ.o \
+	dporfs.o dposv.o dposvx.o dpotf2.o dpotrf.o \
+	dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o dppsv.o dppsvx.o \
+	dpptrf.o dpptri.o dpptrs.o dpstf2.o dpstrf.o dptcon.o dpteqr.o \
+	dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o dptts2.o drscl.o \
+	dsbevd.o dsbev.o dsbevx.o dsbgst.o dsbgvd.o dsbgv.o dsbgvx.o \
+	dsbtrd.o dsfrk.o dsgesv.o dspcon.o dspevd.o dspev.o dspevx.o \
+	dspgst.o dspgvd.o dspgv.o dspgvx.o dsposv.o dsprfs.o dspsv.o \
+	dspsvx.o dsptrd.o dsptrf.o dsptri.o dsptrs.o dstebz.o dstedc.o \
+	dstegr.o dstein.o dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o \
+	dstevr.o dstevx.o dsycon.o dsyequb.o dsyevd.o dsyev.o dsyevr.o \
+	dsyevx.o dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
+	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o \
+	dsytrf.o dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtfsm.o \
+	dtftri.o dtfttp.o dtfttr.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
+	dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
+	dtptrs.o dtpttf.o dtpttr.o dtrcon.o dtrevc.o dtrexc.o dtrrfs.o \
+	dtrsen.o dtrsna.o dtrsyl.o dtrti2.o dtrtri.o dtrtrs.o dtrttf.o \
+	dtrttp.o dtzrqf.o dtzrzf.o dzsum1.o icmax1.o ieeeck.o ilaclc.o \
+	ilaclr.o iladiag.o iladlc.o iladlr.o ilaenv.o ilaprec.o \
+	ilaslc.o ilaslr.o ilatrans.o ilauplo.o ilaver.o ilazlc.o \
+	ilazlr.o iparmq.o izmax1.o lsamen.o sbdsdc.o sbdsqr.o scsum1.o \
+	sdisna.o sgbbrd.o sgbcon.o sgbequb.o sgbequ.o sgbrfs.o \
+	sgbsv.o sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o \
+	sgebak.o sgebal.o sgebd2.o sgebrd.o sgecon.o sgeequb.o sgeequ.o \
+	sgees.o sgeesx.o sgeev.o sgeevx.o sgegs.o sgegv.o sgehd2.o \
+	sgehrd.o sgejsv.o sgelq2.o sgelqf.o sgelsd.o sgels.o sgelss.o \
+	sgelsx.o sgelsy.o sgeql2.o sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o \
+	sgeqrf.o sgerfs.o sgerq2.o sgerqf.o sgesc2.o sgesdd.o \
+	sgesvd.o sgesv.o sgesvj.o sgesvx.o sgetc2.o sgetf2.o \
+	sgetrf.o sgetri.o sgetrs.o sggbak.o sggbal.o sgges.o sggesx.o \
+	sggev.o sggevx.o sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o \
+	sggsvd.o sggsvp.o sgsvj0.o sgsvj1.o sgtcon.o sgtrfs.o sgtsv.o \
+	sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o \
+	sisnan.o slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
+	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o \
+	slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o slaeda.o slaein.o \
+	slaev2.o slaexc.o slag2d.o slag2.o \
+	slags2.o slagtf.o slagtm.o slagts.o \
+	slagv2.o slahqr.o slahr2.o slahrd.o slaic1.o slaisnan.o \
+	slaln2.o slals0.o slalsa.o slalsd.o slamrg.o \
+	slaneg.o slangb.o slange.o slangt.o slanhs.o slansb.o slansf.o \
+	slansp.o slanst.o slansy.o slantb.o slantp.o slantr.o slanv2.o \
+	slapll.o slapmt.o \
+	slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
+	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
+	slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o slar2v.o slarfb.o \
+	slarf.o slarfg.o slarfp.o slarft.o slarfx.o slargv.o slarnv.o \
+	slarra.o slarrb.o slarrc.o slarrd.o slarre.o \
+	slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
+	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o slas2.o \
+	slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
+	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o slasdq.o \
+	slasdt.o slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o \
+	slasq6.o slasr.o slasrt.o slassq.o slasv2.o slaswp.o slasy2.o \
+	slasyf.o slatbs.o slatdf.o slatps.o slatrd.o slatrs.o \
+	slatrz.o slatzm.o slauu2.o slauum.o sopgtr.o \
+	sopmtr.o sorg2l.o sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o \
+	sorgql.o sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
+	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
+	sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
+	spbstf.o spbsv.o spbsvx.o spbtf2.o spbtrf.o spbtrs.o spftrf.o \
+	spftri.o spftrs.o spocon.o spoequb.o spoequ.o sporfs.o \
+	sposv.o sposvx.o spotf2.o spotrf.o \
+	spotri.o spotrs.o sppcon.o sppequ.o spprfs.o sppsv.o sppsvx.o \
+	spptrf.o spptri.o spptrs.o spstf2.o spstrf.o sptcon.o spteqr.o \
+	sptrfs.o sptsv.o sptsvx.o spttrf.o spttrs.o sptts2.o srscl.o \
+	ssbevd.o ssbev.o ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o \
+	ssbtrd.o ssfrk.o sspcon.o sspevd.o sspev.o sspevx.o sspgst.o \
+	sspgvd.o sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
+	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o sstein.o \
+	sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o sstevr.o sstevx.o \
+	ssycon.o ssyequb.o ssyevd.o ssyev.o ssyevr.o ssyevx.o ssygs2.o \
+	ssygst.o ssygvd.o ssygv.o ssygvx.o ssyrfs.o ssysv.o \
+	ssysvx.o ssytd2.o ssytf2.o ssytrd.o ssytrf.o \
+	ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o stfsm.o stftri.o \
+	stfttp.o stfttr.o stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o \
+	stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
+	stpttf.o stpttr.o strcon.o strevc.o strexc.o strrfs.o strsen.o \
+	strsna.o strsyl.o strti2.o strtri.o strtrs.o strttf.o strttp.o \
+	stzrqf.o stzrzf.o xerbla_array.o xerbla.o zbdsqr.o zcgesv.o \
+	zcposv.o zdrscl.o zgbbrd.o zgbcon.o zgbequb.o zgbequ.o \
+	zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
+	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o zgecon.o \
+	zgeequb.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o zgegs.o \
+	zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o zgelsd.o zgels.o \
+	zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
+	zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerq2.o \
+	zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o zgesvx.o \
+	zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o zggbak.o zggbal.o \
+	zgges.o zggesx.o zggev.o zggevx.o zggglm.o zgghrd.o zgglse.o \
+	zggqrf.o zggrqf.o zggsvd.o zggsvp.o zgtcon.o zgtrfs.o zgtsv.o \
+	zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o \
+	zhbgst.o zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheequb.o \
+	zheevd.o zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
+	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o \
+	zhetd2.o zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhfrk.o \
+	zhgeqz.o zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
+	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o zhptrf.o \
+	zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o zlacgv.o zlacn2.o \
+	zlacon.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o zlaed0.o \
+	zlaed7.o zlaed8.o zlaein.o zlaesy.o zlaev2.o zlag2c.o \
+	zlags2.o \
+	zlagtm.o zlahef.o \
+	zlahqr.o zlahr2.o \
+	zlahrd.o zlaic1.o zlals0.o zlalsa.o zlalsd.o \
+	zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o zlanhf.o zlanhp.o \
+	zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o zlantp.o \
+	zlantr.o zlapll.o zlapmt.o \
+	zlaqgb.o zlaqge.o \
+	zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqr0.o zlaqr1.o \
+	zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o zlaqsb.o zlaqsp.o zlaqsy.o \
+	zlar1v.o zlar2v.o zlarcm.o zlarfb.o zlarf.o zlarfg.o zlarfp.o \
+	zlarft.o zlarfx.o zlargv.o zlarnv.o zlarrv.o \
+	zlartg.o zlartv.o zlarzb.o zlarz.o zlarzt.o \
+	zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
+	zlasyf.o \
+	zlat2c.o zlatbs.o \
+	zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
+	zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o \
+	zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpftrf.o zpftri.o \
+	zpftrs.o zpocon.o zpoequb.o zpoequ.o zporfs.o \
+	zposv.o zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o \
+	zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o \
+	zpptrs.o zpstf2.o zpstrf.o zptcon.o zpteqr.o zptrfs.o zptsv.o \
+	zptsvx.o zpttrf.o zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o \
+	zspr.o zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
 	zstedc.o zstegr.o zstein.o zstemr.o zsteqr.o zsycon.o \
-	zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o \
-	zsytrf.o zsytri.o zsytrs.o ztbcon.o ztbrfs.o ztbtrs.o \
-	ztgevc.o ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o \
-	ztgsy2.o ztgsyl.o ztpcon.o ztprfs.o ztptri.o ztptrs.o \
-	ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
-	ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o \
-	zung2l.o zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o \
-	zungql.o zungqr.o zungr2.o zungrq.o zungtr.o zunm2l.o \
-	zunm2r.o zunmbr.o zunmhr.o zunml2.o zunmlq.o zunmql.o \
-	zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o zunmtr.o \
-	zupgtr.o zupmtr.o ../INSTALL/dlamch.o ../INSTALL/dsecnd_INT_ETIME.o \
-	../INSTALL/lsame.o ../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
+	zsyequb.o zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o \
+	zsytf2.o zsytrf.o zsytri.o zsytrs.o ztbcon.o \
+	ztbrfs.o ztbtrs.o ztfsm.o ztftri.o ztfttp.o ztfttr.o ztgevc.o \
+	ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o \
+	ztpcon.o ztprfs.o ztptri.o ztptrs.o ztpttf.o ztpttr.o ztrcon.o \
+	ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o ztrsyl.o ztrti2.o \
+	ztrtri.o ztrtrs.o ztrttf.o ztrttp.o ztzrqf.o ztzrzf.o zung2l.o \
+	zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o \
+	zungr2.o zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o \
+	zunml2.o zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o \
+	zunmrz.o zunmtr.o zupgtr.o zupmtr.o ../INSTALL/dlamch.o \
+	../INSTALL/dsecnd_INT_ETIME.o ../INSTALL/lsame.o \
+	../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
+
+SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
+   sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o			\
+   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
+   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
+   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
+   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
+   slascl2.o sla_wwaddw.o
+
+DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
+   dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o			\
+   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
+   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
+   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
+   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
+   dlascl2.o dla_wwaddw.o
+
+CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o		\
+   cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o				\
+   csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o		\
+   cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o			\
+   cposvxx.o cporfsx.o cla_porfsx_extended.o				\
+   cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o			\
+   cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o		\
+   cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o			\
+   chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o		\
+   cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o			\
+   cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
+
+ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
+   zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o	\
+   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
+   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
+   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
+   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o	\
+   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
+   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
+   zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
+
+ALLXAUX =
+
+ifdef USEXBLAS
+ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX)
+endif
 
-static: $(OBJS)
+static: $(OBJS) $(ALLXOBJ)
 	ar ruv liblapack.a $(OBJS)
 	ranlib liblapack.a
 
-shared: $(OBJS)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.1.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc
+shared: $(OBJS) $(ALLXOBJ)
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.2.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc


Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-10/lapack.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- lapack.spec	8 Jul 2008 17:10:02 -0000	1.19
+++ lapack.spec	4 Sep 2009 21:22:31 -0000	1.20
@@ -1,17 +1,17 @@
-Summary: The LAPACK libraries for numerical linear algebra.
+Summary: Numerical linear algebra package libraries
 Name: lapack
-Version: 3.1.1
-Release: 4%{?dist}
+Version: 3.2.1
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
 Source0: http://www.netlib.org/lapack/lapack-%{version}.tgz
+Source1: http://www.netlib.org/lapack/manpages.tgz
 Source2: Makefile.blas
 Source3: Makefile.lapack
 Source4: http://www.netlib.org/lapack/lapackqref.ps
 Source5: http://www.netlib.org/blas/blasqr.ps
 Patch3: lapack-3.1.1-make.inc.patch
-Obsoletes: lapack-man
 BuildRequires: gcc-gfortran
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,39 +33,41 @@ Summary: LAPACK development libraries
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: blas-devel = %{version}-%{release}
+Provides: lapack-static = %{version}-%{release}
 
 %description devel
 LAPACK development libraries for applications that link statically.
 
 %package -n blas
-Summary: The BLAS (Basic Linear Algebra Subprograms) library.
+Summary: The Basic Linear Algebra Subprograms library
 Group: Development/Libraries
-Obsoletes: lapack-blas blas-man
 
 %description -n blas
 BLAS (Basic Linear Algebra Subprograms) is a standard library which
-provides a number of basic algorithms for numerical algebra. Man
-pages for blas are available in the blas-man package.
+provides a number of basic algorithms for numerical algebra. 
 
 %package -n blas-devel
-Summary: LAPACK development libraries
+Summary: BLAS development libraries
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 Requires: gcc-gfortran
+Provides: blas-static = %{version}-%{release}
 
 %description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep
 %setup -q 
-%setup -q -D -T
+%setup -q -D -T -a1
 %patch3 -p1
 cp -f INSTALL/make.inc.gfortran make.inc
-cp -f $RPM_SOURCE_DIR/Makefile.blas BLAS/SRC/Makefile
-cp -f $RPM_SOURCE_DIR/Makefile.lapack SRC/Makefile
+cp -f %{SOURCE2} BLAS/SRC/Makefile
+cp -f %{SOURCE3} SRC/Makefile
+
+mv lapack-3.2.0/manpages/ manpages/
 
 #Empty
-rm -f man/manl/zbcon.l
+rm -f manpages/man/manl/zbcon.l
 
 %build
 
@@ -80,17 +82,14 @@ cp libblas.a ${RPM_BUILD_DIR}/%{name}-%{
 make clean
 FFLAGS="$RPM_OPT_O_FLAGS -fPIC" make dcabs1.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
-cp libblas.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/
+cp libblas.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-ln -s libblas.so.3.1.1 libblas.so
-
-# Some files don't like -O2, but -Os is fine
-RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|')
+ln -s libblas.so.%{version} libblas.so
 
 # Build the static dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
-make NOOPT="$RPM_OPT_SIZE_FLAGS" OPTS="$RPM_OPT_FLAGS"
+make NOOPT="$RPM_OPT_O_FLAGS" OPTS="$RPM_OPT_FLAGS"
 popd
 
 # Build the static lapack library
@@ -99,41 +98,41 @@ make FFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RP
 cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-# Build the shared dlamch, dsecnd, lsame, second, slamch bits
+# Build the static with pic dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
-# Build the shared lapack library
+# Build the static with pic lapack library
 pushd SRC
 make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
-cp liblapack.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
+cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
 popd
 
-# Buuld the static with pic dlamch, dsecnd, lsame, second, slamch bits
+# Build the shared dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
-# Build the static with pic lapack library
+# Build the shared lapack library
 pushd SRC
 make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
-cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
+cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-cp %{SOURCE4} lapackqref.ps
-cp %{SOURCE5} blasqr.ps
+cp -p %{SOURCE4} lapackqref.ps
+cp -p %{SOURCE5} blasqr.ps
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl
 
-for f in liblapack.so.3.1.1 libblas.so.3.1.1 libblas.a liblapack.a liblapack_pic.a; do
+for f in liblapack.so.%{version} libblas.so.%{version} libblas.a liblapack.a liblapack_pic.a; do
   cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f
 done
 
@@ -148,12 +147,12 @@ cp -f manpages/blas/man/manl/* ${RPM_BUI
 cp -f manpages/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl
 
 cd ${RPM_BUILD_ROOT}%{_libdir}
-ln -sf liblapack.so.3.1.1 liblapack.so
-ln -sf liblapack.so.3.1.1 liblapack.so.3
-ln -sf liblapack.so.3.1.1 liblapack.so.3.1
-ln -sf libblas.so.3.1.1 libblas.so
-ln -sf libblas.so.3.1.1 libblas.so.3
-ln -sf libblas.so.3.1.1 libblas.so.3.1
+ln -sf liblapack.so.%{version} liblapack.so
+ln -sf liblapack.so.%{version} liblapack.so.3
+ln -sf liblapack.so.%{version} liblapack.so.3.2
+ln -sf libblas.so.%{version} libblas.so
+ln -sf libblas.so.%{version} libblas.so.3
+ln -sf libblas.so.%{version} libblas.so.3.2
 
 %post -p /sbin/ldconfig
 
@@ -187,6 +186,24 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-3
+- use RPM_OPT_O_FLAGS (-O0) everywhere necessary, drop RPM_OPT_SIZE_FLAGS (-Os) (bz 520518)
+
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-2
+- don't enable xblas yet
+
+* Fri Aug 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-1
+- update to 3.2.1, spec file cleanups
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 3.1.1-7
+- Convert specfile to UTF-8.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.1-4
 - fix missing dependencies (bz 442915)
 
@@ -278,7 +295,7 @@ rm -fr ${RPM_BUILD_ROOT}
 * Sun Nov 10 2002 Jeff Johnson <jbj at redhat.com> 3.0-19
 - rebuild with x86_64.
 
-* Thu Jul 18 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-18
+* Thu Jul 18 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-18
 - Remove an empty man page (#63569)
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -287,44 +304,44 @@ rm -fr ${RPM_BUILD_ROOT}
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed May  1 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-15
+* Wed May  1 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-15
 - Rebuild
 
-* Thu Feb 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-14
+* Thu Feb 21 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-14
 - Rebuild
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Aug 13 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-12
+* Mon Aug 13 2001 Trond Eivind Glomsrod <teg at redhat.com> 3.0-12
 - The man-pages for xerbla and lsame were in blas-man and lapack-man (#51605)
 
-* Fri Jun  8 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun  8 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Reenable optimization for IA64
 
-* Fri May 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri May 25 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Add all patches from the LAPACK site as of 2001-05-25
 - Use this workaround for IA64 instead
 - Remove SPARC workaround
 - Don't exclude IA64
 
-* Thu Dec 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Dec 07 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - rebuild for main distribution
 
-* Mon Nov 20 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Nov 20 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - add the LAPACK Quick Reference Guide to the docs
 - add the BLAS Quick Reference Guide to the docs
 
-* Tue Aug 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Aug 01 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - fix lack of ldconfig in postuninstall script
 
 * Mon Jul 24 2000 Prospector <prospector at redhat.com>
 - rebuilt
 
-* Mon Jul 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 10 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - updated with the latest updates (new tarfile..) from netlib 
 
-* Thu Jun 15 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jun 15 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - use %%{_mandir}
 - added some flags to work around SPARC compiler bug
 
@@ -353,12 +370,12 @@ rm -fr ${RPM_BUILD_ROOT}
 * Fri Jul 17 1998 Jeff Johnson <jbj at redhat.com>
 - repackage for powertools.
 
-* Sun Feb 15 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Feb 15 1998 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-9]
  - No code updates, just built with a customized rpm -
    this should make dependencies right.
 
-* Sat Feb 07 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Feb 07 1998 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-8]
  - Total rewrite of the spec file
  - Added my own makefiles - libs should build better,
@@ -370,16 +387,16 @@ rm -fr ${RPM_BUILD_ROOT}
    (oh - and as always: Dedicated to the girl I
    love, Eline Skirnisdottir)
 
-* Sat Dec 06 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Dec 06 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-7]
   - added a dependency to glibc, so people don't try with libc5
 
-* Thu Nov 20 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Thu Nov 20 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
   [lapack-2.0-6]
   - removed etime.c
   - compiled with egcs, and for glibc 2.0
 
-* Sun Oct 12 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Oct 12 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
   [lapack-2.0-5]
   - added a changelog
   - cleaned up building of shared libs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 May 2007 22:08:50 -0000	1.5
+++ sources	4 Sep 2009 21:22:31 -0000	1.6
@@ -1 +1,2 @@
-00b21551a899bcfbaa7b8443e1faeef9  lapack-3.1.1.tgz
+a3202a4f9e2f15ffd05d15dab4ac7857  lapack-3.2.1.tgz
+145007cab915504caec382289462a166  manpages.tgz



From spot at fedoraproject.org  Fri Sep  4 21:22:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  4 Sep 2009 21:22:32 +0000 (UTC)
Subject: rpms/lapack/devel lapack.spec,1.24,1.25
Message-ID: <20090904212232.7309A11C0082@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9250/devel

Modified Files:
	lapack.spec 
Log Message:
update to 3.2.1 everywhere, fix miscompile bug (bz 520518)


Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lapack.spec	20 Aug 2009 16:18:36 -0000	1.24
+++ lapack.spec	4 Sep 2009 21:22:32 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Numerical linear algebra package libraries
 Name: lapack
 Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -87,12 +87,9 @@ popd
 
 ln -s libblas.so.%{version} libblas.so
 
-# Some files don't like -O2, but -Os is fine
-RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|')
-
 # Build the static dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
-make NOOPT="$RPM_OPT_SIZE_FLAGS" OPTS="$RPM_OPT_FLAGS"
+make NOOPT="$RPM_OPT_O_FLAGS" OPTS="$RPM_OPT_FLAGS"
 popd
 
 # Build the static lapack library
@@ -101,30 +98,30 @@ make FFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RP
 cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-# Build the shared dlamch, dsecnd, lsame, second, slamch bits
+# Build the static with pic dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
-# Build the shared lapack library
+# Build the static with pic lapack library
 pushd SRC
 make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
-cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
+cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
 popd
 
-# Buuld the static with pic dlamch, dsecnd, lsame, second, slamch bits
+# Build the shared dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
-# Build the static with pic lapack library
+# Build the shared lapack library
 pushd SRC
 make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
-cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
+cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
 cp -p %{SOURCE4} lapackqref.ps
@@ -189,6 +186,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-3
+- use RPM_OPT_O_FLAGS (-O0) everywhere necessary, drop RPM_OPT_SIZE_FLAGS (-Os) (bz 520518)
+
 * Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-2
 - don't enable xblas yet
 



From thm at fedoraproject.org  Fri Sep  4 21:29:31 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  4 Sep 2009 21:29:31 +0000 (UTC)
Subject: rpms/lmms/F-11 lmms-0.4.5-libdir.patch, NONE,
	1.1 lmms-0.4.5-libexecdir.patch, NONE,
	1.1 lmms-0.4.5-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 README.fedora, 1.2, 1.3 import.log, 1.4, 1.5 lmms.spec, 1.5,
	1.6 sources, 1.5, 1.6 lmms-0.4.4-fltk-1.1.9-consts.patch, 1.1,
	NONE lmms-0.4.4-fltk-1.1.9-gcc44.patch, 1.1,
	NONE lmms-0.4.4-libdir.patch, 1.1,
	NONE lmms-0.4.4-libexecdir.patch, 1.1,
	NONE lmms-0.4.4-vst-nowine.patch, 1.1, NONE
Message-ID: <20090904212931.E28A611C0082@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/lmms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12090/F-11

Modified Files:
	.cvsignore README.fedora import.log lmms.spec sources 
Added Files:
	lmms-0.4.5-libdir.patch lmms-0.4.5-libexecdir.patch 
	lmms-0.4.5-vst-nowine.patch 
Removed Files:
	lmms-0.4.4-fltk-1.1.9-consts.patch 
	lmms-0.4.4-fltk-1.1.9-gcc44.patch lmms-0.4.4-libdir.patch 
	lmms-0.4.4-libexecdir.patch lmms-0.4.4-vst-nowine.patch 
Log Message:
Update to 0.4.5.

lmms-0.4.5-libdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.5-libdir.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-08-11 18:52:15.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:47:48.000000000 +0200
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})

lmms-0.4.5-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/remote_plugin.cpp         |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lmms-0.4.5-libexecdir.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-09-04 20:49:03.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
diff -up lmms-0.4.5/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.5/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.5/plugins/vst_base/CMakeLists.txt.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/plugins/vst_base/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND(
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
diff -up lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -120,7 +120,7 @@ ENDIF(LMMS_BUILD_WIN32)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
 
 ADD_EXECUTABLE(remote_zynaddsubfx remote_zynaddsubfx.cpp ${ZYN_SRC} ${MXML_SRC})
-INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET remote_zynaddsubfx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/remote_zynaddsubfx.exe)
diff -up lmms-0.4.5/src/core/remote_plugin.cpp.orig lmms-0.4.5/src/core/remote_plugin.cpp
--- lmms-0.4.5/src/core/remote_plugin.cpp.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/src/core/remote_plugin.cpp	2009-09-04 20:49:16.000000000 +0200
@@ -88,8 +88,8 @@ remotePlugin::remotePlugin( const QStrin
 	m_outputCount( DEFAULT_CHANNELS )
 {
 	lock();
-	QString exec = configManager::inst()->pluginDir() +
-					QDir::separator() + _plugin_executable;
+	QString exec = QString( LIBEXEC_DIR ) + 
+		QDir::separator() + _plugin_executable;
 	QStringList args;
 	// swap in and out for bidirectional communication
 	args << QString::number( out()->shmKey() );

lmms-0.4.5-vst-nowine.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE lmms-0.4.5-vst-nowine.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-09-04 20:51:11.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:51:32.000000000 +0200
@@ -329,6 +329,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
 	SET(STATUS_VST "OK")
 ENDIF(LMMS_BUILD_WIN32)
+IF(WANT_VST_NOWINE)
+	SET(LMMS_SUPPORT_VST TRUE)
+ENDIF(WANT_VST_NOWINE)
 
 
 # check for libsamplerate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 May 2009 18:47:29 -0000	1.4
+++ .cvsignore	4 Sep 2009 21:29:31 -0000	1.5
@@ -1 +1 @@
-lmms-0.4.4.stripped.tar.bz2
+lmms-0.4.5.stripped.tar.bz2


Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/README.fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.fedora	19 May 2009 18:47:29 -0000	1.2
+++ README.fedora	4 Sep 2009 21:29:31 -0000	1.3
@@ -1,254 +1,254 @@
 For legal reasons, the following files have been removed from the
 original tarfile:
 
-lmms-0.4.4/data/projects/tutorials/editing_note_volumes.mmp
-lmms-0.4.4/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
-lmms-0.4.4/data/projects/covers/MonkeyIsland1-Intro.mmpz
-lmms-0.4.4/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
-lmms-0.4.4/data/projects/oldstuff/MaxFellner-Ease.mmp
-lmms-0.4.4/data/projects/oldstuff/time_machine.mmp
-lmms-0.4.4/data/projects/oldstuff/Mart-Dirt_Track.mmp
-lmms-0.4.4/data/projects/oldstuff/1st.mmp
-lmms-0.4.4/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
-lmms-0.4.4/data/projects/demos/beat_collection.mmp
-lmms-0.4.4/data/projects/demos/demo5.mmp
-lmms-0.4.4/data/projects/demos/newFangled.mmpz
-lmms-0.4.4/data/projects/demos/TobyDox-Crystallo.mmp
-lmms-0.4.4/data/projects/demos/loop_collection.mmp
-lmms-0.4.4/data/projects/demos/demo1.mmp
-lmms-0.4.4/data/projects/demos/demo4.mmp
-lmms-0.4.4/data/projects/demos/demo3.mmp
-lmms-0.4.4/data/projects/demos/lb302quick.mmpz
-lmms-0.4.4/data/projects/demos/demo2.mmp
-lmms-0.4.4/data/projects/demos/demo6.mmp
-lmms-0.4.4/data/projects/demos/some_basslines.mmp
-lmms-0.4.4/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
-lmms-0.4.4/data/projects/cool_songs/MysthR-Living.mmpz
-lmms-0.4.4/data/projects/cool_songs/Siegel-DreamWave.mmp
-lmms-0.4.4/data/projects/cool_songs/Silva-ElvesCall.mmp
-lmms-0.4.4/data/projects/cool_songs/TobyDox-Psycho.mmp
-lmms-0.4.4/data/projects/cool_songs/Chris-RaveRiff.mmpz
-lmms-0.4.4/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
-lmms-0.4.4/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-lmms-0.4.4/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
-lmms-0.4.4/data/projects/cool_songs/Chris-HorizonRemix.mmp
-lmms-0.4.4/data/projects/cool_songs/j1m-DingDong.mmp
-lmms-0.4.4/data/projects/cool_songs/Djeezus-BeatRolls.mmp
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
-lmms-0.4.4/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
-lmms-0.4.4/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
-lmms-0.4.4/data/projects/cool_songs/Malex-Horizon4.mmp
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-Underline.mmp
-lmms-0.4.4/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
-lmms-0.4.4/data/projects/cool_songs/SharkyX-Experiments.mmp
-lmms-0.4.4/data/projects/cool_songs/Skiessi-Onion.mmpz
-lmms-0.4.4/data/projects/cool_songs/TobyDox-Confused.mmp
-lmms-0.4.4/data/projects/cool_songs/Siegel-SpeedTrack.mmp
-lmms-0.4.4/data/projects/cool_songs/Djeezus-Oscilisous.mmp
-lmms-0.4.4/data/samples/latin/latin_brass01.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar03.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar01.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar02.ogg
-lmms-0.4.4/data/samples/shapes/technosynth3.wav
-lmms-0.4.4/data/samples/shapes/technosynth1.wav
-lmms-0.4.4/data/samples/shapes/technosynth2.wav
-lmms-0.4.4/data/samples/shapes/additive2.wav
-lmms-0.4.4/data/samples/shapes/harmonics.wav
-lmms-0.4.4/data/samples/shapes/micro.wav
-lmms-0.4.4/data/samples/shapes/bunglist2.wav
-lmms-0.4.4/data/samples/shapes/bunglist3.wav
-lmms-0.4.4/data/samples/shapes/saw+sine.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw2.ogg
-lmms-0.4.4/data/samples/shapes/bunglist.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw.ogg
-lmms-0.4.4/data/samples/shapes/roundbass.wav
-lmms-0.4.4/data/samples/shapes/bunglist9.wav
-lmms-0.4.4/data/samples/shapes/bunglist7.wav
-lmms-0.4.4/data/samples/shapes/low_sine.wav
-lmms-0.4.4/data/samples/shapes/bunglist4.wav
-lmms-0.4.4/data/samples/shapes/bunglist5.wav
-lmms-0.4.4/data/samples/shapes/sine_dist.ogg
-lmms-0.4.4/data/samples/shapes/technobass.wav
-lmms-0.4.4/data/samples/shapes/roundsaw.ogg
-lmms-0.4.4/data/samples/shapes/technosynth6.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw_dist.ogg
-lmms-0.4.4/data/samples/shapes/bunglist6.wav
-lmms-0.4.4/data/samples/shapes/moog.wav
-lmms-0.4.4/data/samples/shapes/bunglist8.wav
-lmms-0.4.4/data/samples/shapes/additive.wav
-lmms-0.4.4/data/samples/shapes/technosynth5.wav
-lmms-0.4.4/data/samples/shapes/technosynth4.wav
-lmms-0.4.4/data/samples/shapes/vowel_a.wav
-lmms-0.4.4/data/samples/shapes/vowel_u.wav
-lmms-0.4.4/data/samples/basses/bass_punch01.ogg
-lmms-0.4.4/data/samples/basses/bass_acid01.ogg
-lmms-0.4.4/data/samples/basses/rave_bass02.ogg
-lmms-0.4.4/data/samples/basses/bass_hard02.ogg
-lmms-0.4.4/data/samples/basses/rave_bass01.ogg
-lmms-0.4.4/data/samples/basses/bass_hard01.ogg
-lmms-0.4.4/data/samples/basses/synth_acid02.ogg
-lmms-0.4.4/data/samples/basses/horror_bass01.ogg
-lmms-0.4.4/data/samples/basses/matrix1000_pluck01.ogg
-lmms-0.4.4/data/samples/basses/bass01.ogg
-lmms-0.4.4/data/samples/basses/bass_acid02.ogg
-lmms-0.4.4/data/samples/basses/synth_acid01.ogg
-lmms-0.4.4/data/samples/basses/techno_synth01.ogg
-lmms-0.4.4/data/samples/basses/rave_bass04.ogg
-lmms-0.4.4/data/samples/basses/rave_bass03.ogg
-lmms-0.4.4/data/samples/effects/explode01.ogg
-lmms-0.4.4/data/samples/effects/warp01.ogg
-lmms-0.4.4/data/samples/effects/filter_sweep01.ogg
-lmms-0.4.4/data/samples/effects/start01.ogg
-lmms-0.4.4/data/samples/effects/wind_chimes01.ogg
-lmms-0.4.4/data/samples/effects/scratch01.ogg
-lmms-0.4.4/data/samples/effects/warp02.ogg
-lmms-0.4.4/data/samples/effects/chroma_sound_effect01.ogg
-lmms-0.4.4/data/samples/effects/stop01.ogg
-lmms-0.4.4/data/samples/effects/start02.ogg
-lmms-0.4.4/data/samples/beats/house_loop01.ogg
-lmms-0.4.4/data/samples/beats/break02.ogg
-lmms-0.4.4/data/samples/beats/909beat01.ogg
-lmms-0.4.4/data/samples/beats/break03.ogg
-lmms-0.4.4/data/samples/beats/electro_beat02.ogg
-lmms-0.4.4/data/samples/beats/electro_beat01.ogg
-lmms-0.4.4/data/samples/beats/jungle01.ogg
-lmms-0.4.4/data/samples/beats/rave_hihat01.ogg
-lmms-0.4.4/data/samples/beats/rave_kick01.ogg
-lmms-0.4.4/data/samples/beats/rave_kick02.ogg
-lmms-0.4.4/data/samples/beats/break01.ogg
-lmms-0.4.4/data/samples/beats/rave_snare01.ogg
-lmms-0.4.4/data/samples/beats/rave_hihat02.ogg
-lmms-0.4.4/data/samples/stringsnpads/bell_choir02.ogg
-lmms-0.4.4/data/samples/stringsnpads/strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/korg_poly6_drone01.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/chorus02.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings03.ogg
-lmms-0.4.4/data/samples/stringsnpads/chorus01.ogg
-lmms-0.4.4/data/samples/stringsnpads/juno_pad01.ogg
-lmms-0.4.4/data/samples/stringsnpads/orion_string01.ogg
-lmms-0.4.4/data/samples/stringsnpads/rave_choir01.ogg
-lmms-0.4.4/data/samples/stringsnpads/bell_choir01.ogg
-lmms-0.4.4/data/samples/stringsnpads/heaven_strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/nord_ambient01.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings02.ogg
-lmms-0.4.4/data/samples/bassloopes/briff01.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_bass01.ogg
-lmms-0.4.4/data/samples/bassloopes/rave_bass02.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth02.ogg
-lmms-0.4.4/data/samples/bassloopes/tb303_01.ogg
-lmms-0.4.4/data/samples/bassloopes/rave_bass01.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth03.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_bass02.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth04.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth01.ogg
-lmms-0.4.4/data/samples/instruments/violin_double_stop01.ogg
-lmms-0.4.4/data/samples/instruments/bassslap01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ01.ogg
-lmms-0.4.4/data/samples/instruments/e_piano_accord01.ogg
-lmms-0.4.4/data/samples/instruments/flute01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_medium_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ04.ogg
-lmms-0.4.4/data/samples/instruments/trumpet01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_slight_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/e_organ01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ03.ogg
-lmms-0.4.4/data/samples/instruments/piano02.ogg
-lmms-0.4.4/data/samples/instruments/cello01.ogg
-lmms-0.4.4/data/samples/instruments/piano01.ogg
-lmms-0.4.4/data/samples/instruments/violin_fingered01.ogg
-lmms-0.4.4/data/samples/instruments/violin_pizzicato01.ogg
-lmms-0.4.4/data/samples/instruments/e_piano_accord02.ogg
-lmms-0.4.4/data/samples/instruments/harpsichord01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar01.ogg
-lmms-0.4.4/data/samples/instruments/bassslap02.ogg
-lmms-0.4.4/data/samples/instruments/church_organ02.ogg
-lmms-0.4.4/data/samples/misc/applause01.ogg
-lmms-0.4.4/data/samples/misc/breath01.ogg
-lmms-0.4.4/data/samples/misc/raving_crowd01.ogg
-lmms-0.4.4/data/samples/misc/hit02.ogg
-lmms-0.4.4/data/samples/misc/dong01.ogg
-lmms-0.4.4/data/samples/misc/hit01.ogg
-lmms-0.4.4/data/samples/misc/bass!.ogg
-lmms-0.4.4/data/samples/misc/dong03.ogg
-lmms-0.4.4/data/samples/misc/undefined01.ogg
-lmms-0.4.4/data/samples/misc/metronome01.ogg
-lmms-0.4.4/data/samples/misc/buzz!.ogg
-lmms-0.4.4/data/samples/misc/dong02.ogg
-lmms-0.4.4/data/samples/misc/electric_ping01.ogg
-lmms-0.4.4/data/samples/misc/metalish_dong01.ogg
-lmms-0.4.4/data/samples/misc/snaph01.ogg
-lmms-0.4.4/data/samples/drums/kick_soft01.ogg
-lmms-0.4.4/data/samples/drums/snare_rim01.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened02.ogg
-lmms-0.4.4/data/samples/drums/snare05.ogg
-lmms-0.4.4/data/samples/drums/bassdrum_acoustic02.ogg
-lmms-0.4.4/data/samples/drums/kick_hard01.ogg
-lmms-0.4.4/data/samples/drums/sidestick01.ogg
-lmms-0.4.4/data/samples/drums/clap01.ogg
-lmms-0.4.4/data/samples/drums/snare02.ogg
-lmms-0.4.4/data/samples/drums/clap02.ogg
-lmms-0.4.4/data/samples/drums/snare04.ogg
-lmms-0.4.4/data/samples/drums/bassdrum03.ogg
-lmms-0.4.4/data/samples/drums/tom_low01.ogg
-lmms-0.4.4/data/samples/drums/bassdrum02.ogg
-lmms-0.4.4/data/samples/drums/tom02.ogg
-lmms-0.4.4/data/samples/drums/shaker03.ogg
-lmms-0.4.4/data/samples/drums/kick_hiphop01.ogg
-lmms-0.4.4/data/samples/drums/clap03.ogg
-lmms-0.4.4/data/samples/drums/snare_muffled02.ogg
-lmms-0.4.4/data/samples/drums/tom01.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed03.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed05.ogg
-lmms-0.4.4/data/samples/drums/tom_hi01.ogg
-lmms-0.4.4/data/samples/drums/kick01.ogg
-lmms-0.4.4/data/samples/drums/shaker01.ogg
-lmms-0.4.4/data/samples/drums/tom05.ogg
-lmms-0.4.4/data/samples/drums/ride01.ogg
-lmms-0.4.4/data/samples/drums/shaker02.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened01.ogg
-lmms-0.4.4/data/samples/drums/snare06.ogg
-lmms-0.4.4/data/samples/drums/kick_soft02.ogg
-lmms-0.4.4/data/samples/drums/kick_long01.ogg
-lmms-0.4.4/data/samples/drums/kick04.ogg
-lmms-0.4.4/data/samples/drums/snare07.ogg
-lmms-0.4.4/data/samples/drums/bassdrum04.ogg
-lmms-0.4.4/data/samples/drums/crash02.ogg
-lmms-0.4.4/data/samples/drums/tom04.ogg
-lmms-0.4.4/data/samples/drums/kick02.ogg
-lmms-0.4.4/data/samples/drums/nasty_rim01.ogg
-lmms-0.4.4/data/samples/drums/bassdrum_acoustic01.ogg
-lmms-0.4.4/data/samples/drums/ride02.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed02.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed01.ogg
-lmms-0.4.4/data/samples/drums/snare01.ogg
-lmms-0.4.4/data/samples/drums/wood01.ogg
-lmms-0.4.4/data/samples/drums/nasty_bass01.ogg
-lmms-0.4.4/data/samples/drums/snare_hiphop02.ogg
-lmms-0.4.4/data/samples/drums/kick_distorted01.ogg
-lmms-0.4.4/data/samples/drums/zap01.ogg
-lmms-0.4.4/data/samples/drums/clav01.ogg
-lmms-0.4.4/data/samples/drums/rim01.ogg
-lmms-0.4.4/data/samples/drums/nasty_snare01.ogg
-lmms-0.4.4/data/samples/drums/snare_harsh01.ogg
-lmms-0.4.4/data/samples/drums/clav02.ogg
-lmms-0.4.4/data/samples/drums/clap04.ogg
-lmms-0.4.4/data/samples/drums/snare_muffled01.ogg
-lmms-0.4.4/data/samples/drums/kick03.ogg
-lmms-0.4.4/data/samples/drums/snare_acoustic01.ogg
-lmms-0.4.4/data/samples/drums/kick_hardcore01.ogg
-lmms-0.4.4/data/samples/drums/hihat_foot_pedal01.ogg
-lmms-0.4.4/data/samples/drums/snare_short01.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed04.ogg
-lmms-0.4.4/data/samples/drums/bassdrum01.ogg
-lmms-0.4.4/data/samples/drums/snare03.ogg
-lmms-0.4.4/data/samples/drums/zap02.ogg
-lmms-0.4.4/data/samples/drums/snare_hiphop01.ogg
-lmms-0.4.4/data/samples/drums/snare_electro01.ogg
-lmms-0.4.4/data/samples/drums/tom_mid01.ogg
-lmms-0.4.4/data/samples/drums/tom03.ogg
-lmms-0.4.4/data/samples/drums/crash01.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened03.ogg
-lmms-0.4.4/data/samples/drums/zap03.ogg
+lmms-0.4.5/data/projects/tutorials/editing_note_volumes.mmp
+lmms-0.4.5/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
+lmms-0.4.5/data/projects/covers/MonkeyIsland1-Intro.mmpz
+lmms-0.4.5/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
+lmms-0.4.5/data/projects/oldstuff/MaxFellner-Ease.mmp
+lmms-0.4.5/data/projects/oldstuff/time_machine.mmp
+lmms-0.4.5/data/projects/oldstuff/Mart-Dirt_Track.mmp
+lmms-0.4.5/data/projects/oldstuff/1st.mmp
+lmms-0.4.5/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
+lmms-0.4.5/data/projects/demos/beat_collection.mmp
+lmms-0.4.5/data/projects/demos/demo5.mmp
+lmms-0.4.5/data/projects/demos/newFangled.mmpz
+lmms-0.4.5/data/projects/demos/TobyDox-Crystallo.mmp
+lmms-0.4.5/data/projects/demos/loop_collection.mmp
+lmms-0.4.5/data/projects/demos/demo1.mmp
+lmms-0.4.5/data/projects/demos/demo4.mmp
+lmms-0.4.5/data/projects/demos/demo3.mmp
+lmms-0.4.5/data/projects/demos/lb302quick.mmpz
+lmms-0.4.5/data/projects/demos/demo2.mmp
+lmms-0.4.5/data/projects/demos/demo6.mmp
+lmms-0.4.5/data/projects/demos/some_basslines.mmp
+lmms-0.4.5/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
+lmms-0.4.5/data/projects/cool_songs/MysthR-Living.mmpz
+lmms-0.4.5/data/projects/cool_songs/Siegel-DreamWave.mmp
+lmms-0.4.5/data/projects/cool_songs/Silva-ElvesCall.mmp
+lmms-0.4.5/data/projects/cool_songs/TobyDox-Psycho.mmp
+lmms-0.4.5/data/projects/cool_songs/Chris-RaveRiff.mmpz
+lmms-0.4.5/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
+lmms-0.4.5/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
+lmms-0.4.5/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
+lmms-0.4.5/data/projects/cool_songs/Chris-HorizonRemix.mmp
+lmms-0.4.5/data/projects/cool_songs/j1m-DingDong.mmp
+lmms-0.4.5/data/projects/cool_songs/Djeezus-BeatRolls.mmp
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
+lmms-0.4.5/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
+lmms-0.4.5/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
+lmms-0.4.5/data/projects/cool_songs/Malex-Horizon4.mmp
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-Underline.mmp
+lmms-0.4.5/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
+lmms-0.4.5/data/projects/cool_songs/SharkyX-Experiments.mmp
+lmms-0.4.5/data/projects/cool_songs/Skiessi-Onion.mmpz
+lmms-0.4.5/data/projects/cool_songs/TobyDox-Confused.mmp
+lmms-0.4.5/data/projects/cool_songs/Siegel-SpeedTrack.mmp
+lmms-0.4.5/data/projects/cool_songs/Djeezus-Oscilisous.mmp
+lmms-0.4.5/data/samples/latin/latin_brass01.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar03.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar01.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar02.ogg
+lmms-0.4.5/data/samples/shapes/technosynth3.wav
+lmms-0.4.5/data/samples/shapes/technosynth1.wav
+lmms-0.4.5/data/samples/shapes/technosynth2.wav
+lmms-0.4.5/data/samples/shapes/additive2.wav
+lmms-0.4.5/data/samples/shapes/harmonics.wav
+lmms-0.4.5/data/samples/shapes/micro.wav
+lmms-0.4.5/data/samples/shapes/bunglist2.wav
+lmms-0.4.5/data/samples/shapes/bunglist3.wav
+lmms-0.4.5/data/samples/shapes/saw+sine.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw2.ogg
+lmms-0.4.5/data/samples/shapes/bunglist.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw.ogg
+lmms-0.4.5/data/samples/shapes/roundbass.wav
+lmms-0.4.5/data/samples/shapes/bunglist9.wav
+lmms-0.4.5/data/samples/shapes/bunglist7.wav
+lmms-0.4.5/data/samples/shapes/low_sine.wav
+lmms-0.4.5/data/samples/shapes/bunglist4.wav
+lmms-0.4.5/data/samples/shapes/bunglist5.wav
+lmms-0.4.5/data/samples/shapes/sine_dist.ogg
+lmms-0.4.5/data/samples/shapes/technobass.wav
+lmms-0.4.5/data/samples/shapes/roundsaw.ogg
+lmms-0.4.5/data/samples/shapes/technosynth6.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw_dist.ogg
+lmms-0.4.5/data/samples/shapes/bunglist6.wav
+lmms-0.4.5/data/samples/shapes/moog.wav
+lmms-0.4.5/data/samples/shapes/bunglist8.wav
+lmms-0.4.5/data/samples/shapes/additive.wav
+lmms-0.4.5/data/samples/shapes/technosynth5.wav
+lmms-0.4.5/data/samples/shapes/technosynth4.wav
+lmms-0.4.5/data/samples/shapes/vowel_a.wav
+lmms-0.4.5/data/samples/shapes/vowel_u.wav
+lmms-0.4.5/data/samples/basses/bass_punch01.ogg
+lmms-0.4.5/data/samples/basses/bass_acid01.ogg
+lmms-0.4.5/data/samples/basses/rave_bass02.ogg
+lmms-0.4.5/data/samples/basses/bass_hard02.ogg
+lmms-0.4.5/data/samples/basses/rave_bass01.ogg
+lmms-0.4.5/data/samples/basses/bass_hard01.ogg
+lmms-0.4.5/data/samples/basses/synth_acid02.ogg
+lmms-0.4.5/data/samples/basses/horror_bass01.ogg
+lmms-0.4.5/data/samples/basses/matrix1000_pluck01.ogg
+lmms-0.4.5/data/samples/basses/bass01.ogg
+lmms-0.4.5/data/samples/basses/bass_acid02.ogg
+lmms-0.4.5/data/samples/basses/synth_acid01.ogg
+lmms-0.4.5/data/samples/basses/techno_synth01.ogg
+lmms-0.4.5/data/samples/basses/rave_bass04.ogg
+lmms-0.4.5/data/samples/basses/rave_bass03.ogg
+lmms-0.4.5/data/samples/effects/explode01.ogg
+lmms-0.4.5/data/samples/effects/warp01.ogg
+lmms-0.4.5/data/samples/effects/filter_sweep01.ogg
+lmms-0.4.5/data/samples/effects/start01.ogg
+lmms-0.4.5/data/samples/effects/wind_chimes01.ogg
+lmms-0.4.5/data/samples/effects/scratch01.ogg
+lmms-0.4.5/data/samples/effects/warp02.ogg
+lmms-0.4.5/data/samples/effects/chroma_sound_effect01.ogg
+lmms-0.4.5/data/samples/effects/stop01.ogg
+lmms-0.4.5/data/samples/effects/start02.ogg
+lmms-0.4.5/data/samples/beats/house_loop01.ogg
+lmms-0.4.5/data/samples/beats/break02.ogg
+lmms-0.4.5/data/samples/beats/909beat01.ogg
+lmms-0.4.5/data/samples/beats/break03.ogg
+lmms-0.4.5/data/samples/beats/electro_beat02.ogg
+lmms-0.4.5/data/samples/beats/electro_beat01.ogg
+lmms-0.4.5/data/samples/beats/jungle01.ogg
+lmms-0.4.5/data/samples/beats/rave_hihat01.ogg
+lmms-0.4.5/data/samples/beats/rave_kick01.ogg
+lmms-0.4.5/data/samples/beats/rave_kick02.ogg
+lmms-0.4.5/data/samples/beats/break01.ogg
+lmms-0.4.5/data/samples/beats/rave_snare01.ogg
+lmms-0.4.5/data/samples/beats/rave_hihat02.ogg
+lmms-0.4.5/data/samples/stringsnpads/bell_choir02.ogg
+lmms-0.4.5/data/samples/stringsnpads/strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/korg_poly6_drone01.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/chorus02.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings03.ogg
+lmms-0.4.5/data/samples/stringsnpads/chorus01.ogg
+lmms-0.4.5/data/samples/stringsnpads/juno_pad01.ogg
+lmms-0.4.5/data/samples/stringsnpads/orion_string01.ogg
+lmms-0.4.5/data/samples/stringsnpads/rave_choir01.ogg
+lmms-0.4.5/data/samples/stringsnpads/bell_choir01.ogg
+lmms-0.4.5/data/samples/stringsnpads/heaven_strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/nord_ambient01.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings02.ogg
+lmms-0.4.5/data/samples/bassloopes/briff01.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_bass01.ogg
+lmms-0.4.5/data/samples/bassloopes/rave_bass02.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth02.ogg
+lmms-0.4.5/data/samples/bassloopes/tb303_01.ogg
+lmms-0.4.5/data/samples/bassloopes/rave_bass01.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth03.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_bass02.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth04.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth01.ogg
+lmms-0.4.5/data/samples/instruments/violin_double_stop01.ogg
+lmms-0.4.5/data/samples/instruments/bassslap01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ01.ogg
+lmms-0.4.5/data/samples/instruments/e_piano_accord01.ogg
+lmms-0.4.5/data/samples/instruments/flute01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_medium_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ04.ogg
+lmms-0.4.5/data/samples/instruments/trumpet01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_slight_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/e_organ01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ03.ogg
+lmms-0.4.5/data/samples/instruments/piano02.ogg
+lmms-0.4.5/data/samples/instruments/cello01.ogg
+lmms-0.4.5/data/samples/instruments/piano01.ogg
+lmms-0.4.5/data/samples/instruments/violin_fingered01.ogg
+lmms-0.4.5/data/samples/instruments/violin_pizzicato01.ogg
+lmms-0.4.5/data/samples/instruments/e_piano_accord02.ogg
+lmms-0.4.5/data/samples/instruments/harpsichord01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar01.ogg
+lmms-0.4.5/data/samples/instruments/bassslap02.ogg
+lmms-0.4.5/data/samples/instruments/church_organ02.ogg
+lmms-0.4.5/data/samples/misc/applause01.ogg
+lmms-0.4.5/data/samples/misc/breath01.ogg
+lmms-0.4.5/data/samples/misc/raving_crowd01.ogg
+lmms-0.4.5/data/samples/misc/hit02.ogg
+lmms-0.4.5/data/samples/misc/dong01.ogg
+lmms-0.4.5/data/samples/misc/hit01.ogg
+lmms-0.4.5/data/samples/misc/bass!.ogg
+lmms-0.4.5/data/samples/misc/dong03.ogg
+lmms-0.4.5/data/samples/misc/undefined01.ogg
+lmms-0.4.5/data/samples/misc/metronome01.ogg
+lmms-0.4.5/data/samples/misc/buzz!.ogg
+lmms-0.4.5/data/samples/misc/dong02.ogg
+lmms-0.4.5/data/samples/misc/electric_ping01.ogg
+lmms-0.4.5/data/samples/misc/metalish_dong01.ogg
+lmms-0.4.5/data/samples/misc/snaph01.ogg
+lmms-0.4.5/data/samples/drums/kick_soft01.ogg
+lmms-0.4.5/data/samples/drums/snare_rim01.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened02.ogg
+lmms-0.4.5/data/samples/drums/snare05.ogg
+lmms-0.4.5/data/samples/drums/bassdrum_acoustic02.ogg
+lmms-0.4.5/data/samples/drums/kick_hard01.ogg
+lmms-0.4.5/data/samples/drums/sidestick01.ogg
+lmms-0.4.5/data/samples/drums/clap01.ogg
+lmms-0.4.5/data/samples/drums/snare02.ogg
+lmms-0.4.5/data/samples/drums/clap02.ogg
+lmms-0.4.5/data/samples/drums/snare04.ogg
+lmms-0.4.5/data/samples/drums/bassdrum03.ogg
+lmms-0.4.5/data/samples/drums/tom_low01.ogg
+lmms-0.4.5/data/samples/drums/bassdrum02.ogg
+lmms-0.4.5/data/samples/drums/tom02.ogg
+lmms-0.4.5/data/samples/drums/shaker03.ogg
+lmms-0.4.5/data/samples/drums/kick_hiphop01.ogg
+lmms-0.4.5/data/samples/drums/clap03.ogg
+lmms-0.4.5/data/samples/drums/snare_muffled02.ogg
+lmms-0.4.5/data/samples/drums/tom01.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed03.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed05.ogg
+lmms-0.4.5/data/samples/drums/tom_hi01.ogg
+lmms-0.4.5/data/samples/drums/kick01.ogg
+lmms-0.4.5/data/samples/drums/shaker01.ogg
+lmms-0.4.5/data/samples/drums/tom05.ogg
+lmms-0.4.5/data/samples/drums/ride01.ogg
+lmms-0.4.5/data/samples/drums/shaker02.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened01.ogg
+lmms-0.4.5/data/samples/drums/snare06.ogg
+lmms-0.4.5/data/samples/drums/kick_soft02.ogg
+lmms-0.4.5/data/samples/drums/kick_long01.ogg
+lmms-0.4.5/data/samples/drums/kick04.ogg
+lmms-0.4.5/data/samples/drums/snare07.ogg
+lmms-0.4.5/data/samples/drums/bassdrum04.ogg
+lmms-0.4.5/data/samples/drums/crash02.ogg
+lmms-0.4.5/data/samples/drums/tom04.ogg
+lmms-0.4.5/data/samples/drums/kick02.ogg
+lmms-0.4.5/data/samples/drums/nasty_rim01.ogg
+lmms-0.4.5/data/samples/drums/bassdrum_acoustic01.ogg
+lmms-0.4.5/data/samples/drums/ride02.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed02.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed01.ogg
+lmms-0.4.5/data/samples/drums/snare01.ogg
+lmms-0.4.5/data/samples/drums/wood01.ogg
+lmms-0.4.5/data/samples/drums/nasty_bass01.ogg
+lmms-0.4.5/data/samples/drums/snare_hiphop02.ogg
+lmms-0.4.5/data/samples/drums/kick_distorted01.ogg
+lmms-0.4.5/data/samples/drums/zap01.ogg
+lmms-0.4.5/data/samples/drums/clav01.ogg
+lmms-0.4.5/data/samples/drums/rim01.ogg
+lmms-0.4.5/data/samples/drums/nasty_snare01.ogg
+lmms-0.4.5/data/samples/drums/snare_harsh01.ogg
+lmms-0.4.5/data/samples/drums/clav02.ogg
+lmms-0.4.5/data/samples/drums/clap04.ogg
+lmms-0.4.5/data/samples/drums/snare_muffled01.ogg
+lmms-0.4.5/data/samples/drums/kick03.ogg
+lmms-0.4.5/data/samples/drums/snare_acoustic01.ogg
+lmms-0.4.5/data/samples/drums/kick_hardcore01.ogg
+lmms-0.4.5/data/samples/drums/hihat_foot_pedal01.ogg
+lmms-0.4.5/data/samples/drums/snare_short01.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed04.ogg
+lmms-0.4.5/data/samples/drums/bassdrum01.ogg
+lmms-0.4.5/data/samples/drums/snare03.ogg
+lmms-0.4.5/data/samples/drums/zap02.ogg
+lmms-0.4.5/data/samples/drums/snare_hiphop01.ogg
+lmms-0.4.5/data/samples/drums/snare_electro01.ogg
+lmms-0.4.5/data/samples/drums/tom_mid01.ogg
+lmms-0.4.5/data/samples/drums/tom03.ogg
+lmms-0.4.5/data/samples/drums/crash01.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened03.ogg
+lmms-0.4.5/data/samples/drums/zap03.ogg


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 May 2009 18:47:30 -0000	1.4
+++ import.log	4 Sep 2009 21:29:31 -0000	1.5
@@ -2,3 +2,4 @@ lmms-0_4_2-3_fc10:HEAD:lmms-0.4.2-3.fc10
 lmms-0_4_2-4_fc10:HEAD:lmms-0.4.2-4.fc10.src.rpm:1235166451
 lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10.src.rpm:1236642380
 lmms-0_4_4-1_fc11:F-11:lmms-0.4.4-1.fc11.src.rpm:1242758782
+lmms-0_4_5-1_fc11:F-11:lmms-0.4.5-1.fc11.src.rpm:1252099682


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/lmms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lmms.spec	19 May 2009 18:47:30 -0000	1.5
+++ lmms.spec	4 Sep 2009 21:29:31 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           lmms
-Version:        0.4.4
+Version:        0.4.5
 Release:        1%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
@@ -16,6 +16,7 @@ Group:          Applications/Multimedia
 #     - cmt: GPLv2(+?)
 #     - swh: GPLv2+
 #     - tap: GPLv2+
+#     - calf: GPLv2+ and LGPLv2+
 #   - GNU UnRTF (flp_import plugin): GPLv3+
 #   - Portsmf (midi_import plugin): MIT
 #   - Blip_Buffer and Gb_Snd_Emu (papu plugin): LGPLv2.1+
@@ -35,18 +36,15 @@ Source0:        %{name}-%{version}.strip
 Source1:        README.fedora
 
 # our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.4-libdir.patch
+Patch0:         lmms-0.4.5-libdir.patch
 
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.4-libexecdir.patch
+Patch1:         lmms-0.4.5-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.4-vst-nowine.patch
+Patch2:         lmms-0.4.5-vst-nowine.patch
 
-# patches borrowed from the fltk package
-Patch3:         lmms-0.4.4-fltk-1.1.9-consts.patch
-Patch4:         lmms-0.4.4-fltk-1.1.9-gcc44.patch
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
 # developers, not possibe because there are to many changes.
@@ -61,6 +59,7 @@ BuildRequires:  jack-audio-connection-ki
 BuildRequires:  alsa-lib-devel
 BuildRequires:  pulseaudio-libs-devel
 
+# we need at least version 0.1.7 of libsamplerate 
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  fftw3-devel
@@ -80,6 +79,7 @@ BuildRequires:  wine-devel 
 Requires:       ladspa-caps-plugins
 Requires:       ladspa-tap-plugins
 Requires:       ladspa-swh-plugins
+Requires:       ladspa-calf-plugins
 # the version included in lmms contains patches sent to, but not yet
 # applied by cmt's upstream.
 #Requires: ladspa-cmt-plugins
@@ -129,10 +129,6 @@ developing addons for %{name}.
 %patch0 -p1 -b .libdir
 %patch1 -p1 -b .libexecdir
 %patch2 -p1 -b .nowine
-%patch3 -p1 -b .consts
-%if 0%{?fedora} > 10
-%patch4 -p1 -b .gcc44
-%endif
 
 # remove spurious x-bits
 find . -type f -exec chmod 0644 {} \;
@@ -147,6 +143,7 @@ find . -type f -exec chmod 0644 {} \;
        -DWANT_CAPS:BOOL=OFF \
        -DWANT_TAP:BOOL=OFF \
        -DWANT_SWH:BOOL=OFF \
+       -DWANT_CALF:BOOL=OFF \
 %ifarch %ix86
        -DWANT_VST:BOOL=ON \
 %else
@@ -223,6 +220,14 @@ This package contains the necessary file
 
 
 %changelog
+* Fri Sep  4 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.5-1
+- Udate to 0.4.5.
+- Rebase patches, and drop fltk patches not needed anymore.
+- Add a dependency on the Calf LADSPA plugins.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.4-1
 - Update to 0.4.4.
 - Need to borrow patches for embedded fltk from the fltk package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 May 2009 18:47:30 -0000	1.5
+++ sources	4 Sep 2009 21:29:31 -0000	1.6
@@ -1 +1 @@
-ec84f9c766742b4ebfa37ac06bebe391  lmms-0.4.4.stripped.tar.bz2
+efbd9ddef0a975cffe9abc2da8b04143  lmms-0.4.5.stripped.tar.bz2


--- lmms-0.4.4-fltk-1.1.9-consts.patch DELETED ---


--- lmms-0.4.4-fltk-1.1.9-gcc44.patch DELETED ---


--- lmms-0.4.4-libdir.patch DELETED ---


--- lmms-0.4.4-libexecdir.patch DELETED ---


--- lmms-0.4.4-vst-nowine.patch DELETED ---



From rdieter at fedoraproject.org  Fri Sep  4 21:33:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  4 Sep 2009 21:33:46 +0000 (UTC)
Subject: rpms/gnupg2/devel .cvsignore, 1.30, 1.31 gnupg2.spec, 1.93,
	1.94 sources, 1.32, 1.33
Message-ID: <20090904213346.12A0511C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13314

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Fri Sep 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-1
- gnupg-2.0.13
- Unable to use gpg-agent + input methods (#228953)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	17 Jun 2009 13:09:15 -0000	1.30
+++ .cvsignore	4 Sep 2009 21:33:45 -0000	1.31
@@ -1,2 +1,2 @@
-gnupg-2.0.12.tar.bz2
-gnupg-2.0.12.tar.bz2.sig
+gnupg-2.0.13.tar.bz2
+gnupg-2.0.13.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- gnupg2.spec	25 Jul 2009 00:58:35 -0000	1.93
+++ gnupg2.spec	4 Sep 2009 21:33:45 -0000	1.94
@@ -1,16 +1,19 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.12
-Release: 2%{?dist}
+Version: 2.0.13
+Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig
+# svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
+#Source0: gnupg2-20090809svn.tar.bz2
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#BuildRequires: automake libtool texinfo transfig
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
@@ -66,7 +69,7 @@ dependency on other modules at run and b
 
 
 %prep
-%setup -q -n gnupg-%{version}%{?pre}
+%setup -q -n gnupg-%{version}
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
@@ -77,6 +80,10 @@ dependency on other modules at run and b
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
+# fix temp broken docs
+#sed -i -e 's/^@include version.texi//' doc/gnupg.texi
+#./autogen.sh
+
 
 %build
 
@@ -122,7 +129,7 @@ rm -f %{buildroot}%{_infodir}/dir
 # need scratch gpg database for tests
 mkdir -p $HOME/.gnupg
 # some gpg2 tests (still) FAIL on non i386 platforms
-make -k check ||:
+make -k check 
 
 
 %post
@@ -167,6 +174,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-1
+- gnupg-2.0.13
+- Unable to use gpg-agent + input methods (#228953)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	17 Jun 2009 13:09:15 -0000	1.32
+++ sources	4 Sep 2009 21:33:45 -0000	1.33
@@ -1,2 +1,2 @@
-4718d8a8cd3eac100951d8b162cf537b  gnupg-2.0.12.tar.bz2
-88e8d5d64cff885d0e6a29ffb71d1537  gnupg-2.0.12.tar.bz2.sig
+41bd7629d815b90c15b37bb31c2f07c0  gnupg-2.0.13.tar.bz2
+39dde2ae7b98ffa2100c31b368f2e2ec  gnupg-2.0.13.tar.bz2.sig



From thm at fedoraproject.org  Fri Sep  4 21:34:08 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  4 Sep 2009 21:34:08 +0000 (UTC)
Subject: rpms/lmms/F-10 lmms-0.4.5-libdir.patch, NONE,
	1.1 lmms-0.4.5-libexecdir.patch, NONE,
	1.1 lmms-0.4.5-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 README.fedora, 1.1, 1.2 import.log, 1.1, 1.2 lmms.spec, 1.1,
	1.2 sources, 1.2, 1.3 lmms-0.4.4-fltk-1.1.9-consts.patch, 1.1,
	NONE lmms-0.4.4-fltk-1.1.9-gcc44.patch, 1.1,
	NONE lmms-0.4.4-libdir.patch, 1.1,
	NONE lmms-0.4.4-libexecdir.patch, 1.1,
	NONE lmms-0.4.4-vst-nowine.patch, 1.1, NONE
Message-ID: <20090904213408.E6B7D11C0082@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/lmms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13511/F-10

Modified Files:
	.cvsignore README.fedora import.log lmms.spec sources 
Added Files:
	lmms-0.4.5-libdir.patch lmms-0.4.5-libexecdir.patch 
	lmms-0.4.5-vst-nowine.patch 
Removed Files:
	lmms-0.4.4-fltk-1.1.9-consts.patch 
	lmms-0.4.4-fltk-1.1.9-gcc44.patch lmms-0.4.4-libdir.patch 
	lmms-0.4.4-libexecdir.patch lmms-0.4.4-vst-nowine.patch 
Log Message:
Update to 0.4.5.

lmms-0.4.5-libdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.5-libdir.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-08-11 18:52:15.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:47:48.000000000 +0200
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})

lmms-0.4.5-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/remote_plugin.cpp         |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lmms-0.4.5-libexecdir.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-09-04 20:49:03.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
diff -up lmms-0.4.5/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.5/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.5/plugins/vst_base/CMakeLists.txt.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/plugins/vst_base/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND(
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
diff -up lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/plugins/zynaddsubfx/CMakeLists.txt	2009-09-04 20:49:16.000000000 +0200
@@ -120,7 +120,7 @@ ENDIF(LMMS_BUILD_WIN32)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
 
 ADD_EXECUTABLE(remote_zynaddsubfx remote_zynaddsubfx.cpp ${ZYN_SRC} ${MXML_SRC})
-INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET remote_zynaddsubfx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/remote_zynaddsubfx.exe)
diff -up lmms-0.4.5/src/core/remote_plugin.cpp.orig lmms-0.4.5/src/core/remote_plugin.cpp
--- lmms-0.4.5/src/core/remote_plugin.cpp.orig	2009-08-11 18:52:18.000000000 +0200
+++ lmms-0.4.5/src/core/remote_plugin.cpp	2009-09-04 20:49:16.000000000 +0200
@@ -88,8 +88,8 @@ remotePlugin::remotePlugin( const QStrin
 	m_outputCount( DEFAULT_CHANNELS )
 {
 	lock();
-	QString exec = configManager::inst()->pluginDir() +
-					QDir::separator() + _plugin_executable;
+	QString exec = QString( LIBEXEC_DIR ) + 
+		QDir::separator() + _plugin_executable;
 	QStringList args;
 	// swap in and out for bidirectional communication
 	args << QString::number( out()->shmKey() );

lmms-0.4.5-vst-nowine.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE lmms-0.4.5-vst-nowine.patch ---
diff -up lmms-0.4.5/CMakeLists.txt.orig lmms-0.4.5/CMakeLists.txt
--- lmms-0.4.5/CMakeLists.txt.orig	2009-09-04 20:51:11.000000000 +0200
+++ lmms-0.4.5/CMakeLists.txt	2009-09-04 20:51:32.000000000 +0200
@@ -329,6 +329,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
 	SET(STATUS_VST "OK")
 ENDIF(LMMS_BUILD_WIN32)
+IF(WANT_VST_NOWINE)
+	SET(LMMS_SUPPORT_VST TRUE)
+ENDIF(WANT_VST_NOWINE)
 
 
 # check for libsamplerate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 May 2009 19:00:43 -0000	1.2
+++ .cvsignore	4 Sep 2009 21:34:08 -0000	1.3
@@ -1 +1 @@
-lmms-0.4.4.stripped.tar.bz2
+lmms-0.4.5.stripped.tar.bz2


Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.fedora	19 May 2009 19:00:43 -0000	1.1
+++ README.fedora	4 Sep 2009 21:34:08 -0000	1.2
@@ -1,254 +1,254 @@
 For legal reasons, the following files have been removed from the
 original tarfile:
 
-lmms-0.4.4/data/projects/tutorials/editing_note_volumes.mmp
-lmms-0.4.4/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
-lmms-0.4.4/data/projects/covers/MonkeyIsland1-Intro.mmpz
-lmms-0.4.4/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
-lmms-0.4.4/data/projects/oldstuff/MaxFellner-Ease.mmp
-lmms-0.4.4/data/projects/oldstuff/time_machine.mmp
-lmms-0.4.4/data/projects/oldstuff/Mart-Dirt_Track.mmp
-lmms-0.4.4/data/projects/oldstuff/1st.mmp
-lmms-0.4.4/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
-lmms-0.4.4/data/projects/demos/beat_collection.mmp
-lmms-0.4.4/data/projects/demos/demo5.mmp
-lmms-0.4.4/data/projects/demos/newFangled.mmpz
-lmms-0.4.4/data/projects/demos/TobyDox-Crystallo.mmp
-lmms-0.4.4/data/projects/demos/loop_collection.mmp
-lmms-0.4.4/data/projects/demos/demo1.mmp
-lmms-0.4.4/data/projects/demos/demo4.mmp
-lmms-0.4.4/data/projects/demos/demo3.mmp
-lmms-0.4.4/data/projects/demos/lb302quick.mmpz
-lmms-0.4.4/data/projects/demos/demo2.mmp
-lmms-0.4.4/data/projects/demos/demo6.mmp
-lmms-0.4.4/data/projects/demos/some_basslines.mmp
-lmms-0.4.4/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
-lmms-0.4.4/data/projects/cool_songs/MysthR-Living.mmpz
-lmms-0.4.4/data/projects/cool_songs/Siegel-DreamWave.mmp
-lmms-0.4.4/data/projects/cool_songs/Silva-ElvesCall.mmp
-lmms-0.4.4/data/projects/cool_songs/TobyDox-Psycho.mmp
-lmms-0.4.4/data/projects/cool_songs/Chris-RaveRiff.mmpz
-lmms-0.4.4/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
-lmms-0.4.4/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-lmms-0.4.4/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
-lmms-0.4.4/data/projects/cool_songs/Chris-HorizonRemix.mmp
-lmms-0.4.4/data/projects/cool_songs/j1m-DingDong.mmp
-lmms-0.4.4/data/projects/cool_songs/Djeezus-BeatRolls.mmp
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
-lmms-0.4.4/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
-lmms-0.4.4/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
-lmms-0.4.4/data/projects/cool_songs/Malex-Horizon4.mmp
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-Underline.mmp
-lmms-0.4.4/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
-lmms-0.4.4/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
-lmms-0.4.4/data/projects/cool_songs/SharkyX-Experiments.mmp
-lmms-0.4.4/data/projects/cool_songs/Skiessi-Onion.mmpz
-lmms-0.4.4/data/projects/cool_songs/TobyDox-Confused.mmp
-lmms-0.4.4/data/projects/cool_songs/Siegel-SpeedTrack.mmp
-lmms-0.4.4/data/projects/cool_songs/Djeezus-Oscilisous.mmp
-lmms-0.4.4/data/samples/latin/latin_brass01.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar03.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar01.ogg
-lmms-0.4.4/data/samples/latin/latin_guitar02.ogg
-lmms-0.4.4/data/samples/shapes/technosynth3.wav
-lmms-0.4.4/data/samples/shapes/technosynth1.wav
-lmms-0.4.4/data/samples/shapes/technosynth2.wav
-lmms-0.4.4/data/samples/shapes/additive2.wav
-lmms-0.4.4/data/samples/shapes/harmonics.wav
-lmms-0.4.4/data/samples/shapes/micro.wav
-lmms-0.4.4/data/samples/shapes/bunglist2.wav
-lmms-0.4.4/data/samples/shapes/bunglist3.wav
-lmms-0.4.4/data/samples/shapes/saw+sine.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw2.ogg
-lmms-0.4.4/data/samples/shapes/bunglist.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw.ogg
-lmms-0.4.4/data/samples/shapes/roundbass.wav
-lmms-0.4.4/data/samples/shapes/bunglist9.wav
-lmms-0.4.4/data/samples/shapes/bunglist7.wav
-lmms-0.4.4/data/samples/shapes/low_sine.wav
-lmms-0.4.4/data/samples/shapes/bunglist4.wav
-lmms-0.4.4/data/samples/shapes/bunglist5.wav
-lmms-0.4.4/data/samples/shapes/sine_dist.ogg
-lmms-0.4.4/data/samples/shapes/technobass.wav
-lmms-0.4.4/data/samples/shapes/roundsaw.ogg
-lmms-0.4.4/data/samples/shapes/technosynth6.wav
-lmms-0.4.4/data/samples/shapes/smooth_inv_saw_dist.ogg
-lmms-0.4.4/data/samples/shapes/bunglist6.wav
-lmms-0.4.4/data/samples/shapes/moog.wav
-lmms-0.4.4/data/samples/shapes/bunglist8.wav
-lmms-0.4.4/data/samples/shapes/additive.wav
-lmms-0.4.4/data/samples/shapes/technosynth5.wav
-lmms-0.4.4/data/samples/shapes/technosynth4.wav
-lmms-0.4.4/data/samples/shapes/vowel_a.wav
-lmms-0.4.4/data/samples/shapes/vowel_u.wav
-lmms-0.4.4/data/samples/basses/bass_punch01.ogg
-lmms-0.4.4/data/samples/basses/bass_acid01.ogg
-lmms-0.4.4/data/samples/basses/rave_bass02.ogg
-lmms-0.4.4/data/samples/basses/bass_hard02.ogg
-lmms-0.4.4/data/samples/basses/rave_bass01.ogg
-lmms-0.4.4/data/samples/basses/bass_hard01.ogg
-lmms-0.4.4/data/samples/basses/synth_acid02.ogg
-lmms-0.4.4/data/samples/basses/horror_bass01.ogg
-lmms-0.4.4/data/samples/basses/matrix1000_pluck01.ogg
-lmms-0.4.4/data/samples/basses/bass01.ogg
-lmms-0.4.4/data/samples/basses/bass_acid02.ogg
-lmms-0.4.4/data/samples/basses/synth_acid01.ogg
-lmms-0.4.4/data/samples/basses/techno_synth01.ogg
-lmms-0.4.4/data/samples/basses/rave_bass04.ogg
-lmms-0.4.4/data/samples/basses/rave_bass03.ogg
-lmms-0.4.4/data/samples/effects/explode01.ogg
-lmms-0.4.4/data/samples/effects/warp01.ogg
-lmms-0.4.4/data/samples/effects/filter_sweep01.ogg
-lmms-0.4.4/data/samples/effects/start01.ogg
-lmms-0.4.4/data/samples/effects/wind_chimes01.ogg
-lmms-0.4.4/data/samples/effects/scratch01.ogg
-lmms-0.4.4/data/samples/effects/warp02.ogg
-lmms-0.4.4/data/samples/effects/chroma_sound_effect01.ogg
-lmms-0.4.4/data/samples/effects/stop01.ogg
-lmms-0.4.4/data/samples/effects/start02.ogg
-lmms-0.4.4/data/samples/beats/house_loop01.ogg
-lmms-0.4.4/data/samples/beats/break02.ogg
-lmms-0.4.4/data/samples/beats/909beat01.ogg
-lmms-0.4.4/data/samples/beats/break03.ogg
-lmms-0.4.4/data/samples/beats/electro_beat02.ogg
-lmms-0.4.4/data/samples/beats/electro_beat01.ogg
-lmms-0.4.4/data/samples/beats/jungle01.ogg
-lmms-0.4.4/data/samples/beats/rave_hihat01.ogg
-lmms-0.4.4/data/samples/beats/rave_kick01.ogg
-lmms-0.4.4/data/samples/beats/rave_kick02.ogg
-lmms-0.4.4/data/samples/beats/break01.ogg
-lmms-0.4.4/data/samples/beats/rave_snare01.ogg
-lmms-0.4.4/data/samples/beats/rave_hihat02.ogg
-lmms-0.4.4/data/samples/stringsnpads/bell_choir02.ogg
-lmms-0.4.4/data/samples/stringsnpads/strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/korg_poly6_drone01.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/chorus02.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings03.ogg
-lmms-0.4.4/data/samples/stringsnpads/chorus01.ogg
-lmms-0.4.4/data/samples/stringsnpads/juno_pad01.ogg
-lmms-0.4.4/data/samples/stringsnpads/orion_string01.ogg
-lmms-0.4.4/data/samples/stringsnpads/rave_choir01.ogg
-lmms-0.4.4/data/samples/stringsnpads/bell_choir01.ogg
-lmms-0.4.4/data/samples/stringsnpads/heaven_strings01.ogg
-lmms-0.4.4/data/samples/stringsnpads/nord_ambient01.ogg
-lmms-0.4.4/data/samples/stringsnpads/space_strings02.ogg
-lmms-0.4.4/data/samples/bassloopes/briff01.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_bass01.ogg
-lmms-0.4.4/data/samples/bassloopes/rave_bass02.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth02.ogg
-lmms-0.4.4/data/samples/bassloopes/tb303_01.ogg
-lmms-0.4.4/data/samples/bassloopes/rave_bass01.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth03.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_bass02.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth04.ogg
-lmms-0.4.4/data/samples/bassloopes/techno_synth01.ogg
-lmms-0.4.4/data/samples/instruments/violin_double_stop01.ogg
-lmms-0.4.4/data/samples/instruments/bassslap01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ01.ogg
-lmms-0.4.4/data/samples/instruments/e_piano_accord01.ogg
-lmms-0.4.4/data/samples/instruments/flute01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_medium_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ04.ogg
-lmms-0.4.4/data/samples/instruments/trumpet01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_slight_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
-lmms-0.4.4/data/samples/instruments/e_organ01.ogg
-lmms-0.4.4/data/samples/instruments/church_organ03.ogg
-lmms-0.4.4/data/samples/instruments/piano02.ogg
-lmms-0.4.4/data/samples/instruments/cello01.ogg
-lmms-0.4.4/data/samples/instruments/piano01.ogg
-lmms-0.4.4/data/samples/instruments/violin_fingered01.ogg
-lmms-0.4.4/data/samples/instruments/violin_pizzicato01.ogg
-lmms-0.4.4/data/samples/instruments/e_piano_accord02.ogg
-lmms-0.4.4/data/samples/instruments/harpsichord01.ogg
-lmms-0.4.4/data/samples/instruments/steel_guitar01.ogg
-lmms-0.4.4/data/samples/instruments/bassslap02.ogg
-lmms-0.4.4/data/samples/instruments/church_organ02.ogg
-lmms-0.4.4/data/samples/misc/applause01.ogg
-lmms-0.4.4/data/samples/misc/breath01.ogg
-lmms-0.4.4/data/samples/misc/raving_crowd01.ogg
-lmms-0.4.4/data/samples/misc/hit02.ogg
-lmms-0.4.4/data/samples/misc/dong01.ogg
-lmms-0.4.4/data/samples/misc/hit01.ogg
-lmms-0.4.4/data/samples/misc/bass!.ogg
-lmms-0.4.4/data/samples/misc/dong03.ogg
-lmms-0.4.4/data/samples/misc/undefined01.ogg
-lmms-0.4.4/data/samples/misc/metronome01.ogg
-lmms-0.4.4/data/samples/misc/buzz!.ogg
-lmms-0.4.4/data/samples/misc/dong02.ogg
-lmms-0.4.4/data/samples/misc/electric_ping01.ogg
-lmms-0.4.4/data/samples/misc/metalish_dong01.ogg
-lmms-0.4.4/data/samples/misc/snaph01.ogg
-lmms-0.4.4/data/samples/drums/kick_soft01.ogg
-lmms-0.4.4/data/samples/drums/snare_rim01.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened02.ogg
-lmms-0.4.4/data/samples/drums/snare05.ogg
-lmms-0.4.4/data/samples/drums/bassdrum_acoustic02.ogg
-lmms-0.4.4/data/samples/drums/kick_hard01.ogg
-lmms-0.4.4/data/samples/drums/sidestick01.ogg
-lmms-0.4.4/data/samples/drums/clap01.ogg
-lmms-0.4.4/data/samples/drums/snare02.ogg
-lmms-0.4.4/data/samples/drums/clap02.ogg
-lmms-0.4.4/data/samples/drums/snare04.ogg
-lmms-0.4.4/data/samples/drums/bassdrum03.ogg
-lmms-0.4.4/data/samples/drums/tom_low01.ogg
-lmms-0.4.4/data/samples/drums/bassdrum02.ogg
-lmms-0.4.4/data/samples/drums/tom02.ogg
-lmms-0.4.4/data/samples/drums/shaker03.ogg
-lmms-0.4.4/data/samples/drums/kick_hiphop01.ogg
-lmms-0.4.4/data/samples/drums/clap03.ogg
-lmms-0.4.4/data/samples/drums/snare_muffled02.ogg
-lmms-0.4.4/data/samples/drums/tom01.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed03.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed05.ogg
-lmms-0.4.4/data/samples/drums/tom_hi01.ogg
-lmms-0.4.4/data/samples/drums/kick01.ogg
-lmms-0.4.4/data/samples/drums/shaker01.ogg
-lmms-0.4.4/data/samples/drums/tom05.ogg
-lmms-0.4.4/data/samples/drums/ride01.ogg
-lmms-0.4.4/data/samples/drums/shaker02.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened01.ogg
-lmms-0.4.4/data/samples/drums/snare06.ogg
-lmms-0.4.4/data/samples/drums/kick_soft02.ogg
-lmms-0.4.4/data/samples/drums/kick_long01.ogg
-lmms-0.4.4/data/samples/drums/kick04.ogg
-lmms-0.4.4/data/samples/drums/snare07.ogg
-lmms-0.4.4/data/samples/drums/bassdrum04.ogg
-lmms-0.4.4/data/samples/drums/crash02.ogg
-lmms-0.4.4/data/samples/drums/tom04.ogg
-lmms-0.4.4/data/samples/drums/kick02.ogg
-lmms-0.4.4/data/samples/drums/nasty_rim01.ogg
-lmms-0.4.4/data/samples/drums/bassdrum_acoustic01.ogg
-lmms-0.4.4/data/samples/drums/ride02.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed02.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed01.ogg
-lmms-0.4.4/data/samples/drums/snare01.ogg
-lmms-0.4.4/data/samples/drums/wood01.ogg
-lmms-0.4.4/data/samples/drums/nasty_bass01.ogg
-lmms-0.4.4/data/samples/drums/snare_hiphop02.ogg
-lmms-0.4.4/data/samples/drums/kick_distorted01.ogg
-lmms-0.4.4/data/samples/drums/zap01.ogg
-lmms-0.4.4/data/samples/drums/clav01.ogg
-lmms-0.4.4/data/samples/drums/rim01.ogg
-lmms-0.4.4/data/samples/drums/nasty_snare01.ogg
-lmms-0.4.4/data/samples/drums/snare_harsh01.ogg
-lmms-0.4.4/data/samples/drums/clav02.ogg
-lmms-0.4.4/data/samples/drums/clap04.ogg
-lmms-0.4.4/data/samples/drums/snare_muffled01.ogg
-lmms-0.4.4/data/samples/drums/kick03.ogg
-lmms-0.4.4/data/samples/drums/snare_acoustic01.ogg
-lmms-0.4.4/data/samples/drums/kick_hardcore01.ogg
-lmms-0.4.4/data/samples/drums/hihat_foot_pedal01.ogg
-lmms-0.4.4/data/samples/drums/snare_short01.ogg
-lmms-0.4.4/data/samples/drums/hihat_closed04.ogg
-lmms-0.4.4/data/samples/drums/bassdrum01.ogg
-lmms-0.4.4/data/samples/drums/snare03.ogg
-lmms-0.4.4/data/samples/drums/zap02.ogg
-lmms-0.4.4/data/samples/drums/snare_hiphop01.ogg
-lmms-0.4.4/data/samples/drums/snare_electro01.ogg
-lmms-0.4.4/data/samples/drums/tom_mid01.ogg
-lmms-0.4.4/data/samples/drums/tom03.ogg
-lmms-0.4.4/data/samples/drums/crash01.ogg
-lmms-0.4.4/data/samples/drums/hihat_opened03.ogg
-lmms-0.4.4/data/samples/drums/zap03.ogg
+lmms-0.4.5/data/projects/tutorials/editing_note_volumes.mmp
+lmms-0.4.5/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
+lmms-0.4.5/data/projects/covers/MonkeyIsland1-Intro.mmpz
+lmms-0.4.5/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
+lmms-0.4.5/data/projects/oldstuff/MaxFellner-Ease.mmp
+lmms-0.4.5/data/projects/oldstuff/time_machine.mmp
+lmms-0.4.5/data/projects/oldstuff/Mart-Dirt_Track.mmp
+lmms-0.4.5/data/projects/oldstuff/1st.mmp
+lmms-0.4.5/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
+lmms-0.4.5/data/projects/demos/beat_collection.mmp
+lmms-0.4.5/data/projects/demos/demo5.mmp
+lmms-0.4.5/data/projects/demos/newFangled.mmpz
+lmms-0.4.5/data/projects/demos/TobyDox-Crystallo.mmp
+lmms-0.4.5/data/projects/demos/loop_collection.mmp
+lmms-0.4.5/data/projects/demos/demo1.mmp
+lmms-0.4.5/data/projects/demos/demo4.mmp
+lmms-0.4.5/data/projects/demos/demo3.mmp
+lmms-0.4.5/data/projects/demos/lb302quick.mmpz
+lmms-0.4.5/data/projects/demos/demo2.mmp
+lmms-0.4.5/data/projects/demos/demo6.mmp
+lmms-0.4.5/data/projects/demos/some_basslines.mmp
+lmms-0.4.5/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
+lmms-0.4.5/data/projects/cool_songs/MysthR-Living.mmpz
+lmms-0.4.5/data/projects/cool_songs/Siegel-DreamWave.mmp
+lmms-0.4.5/data/projects/cool_songs/Silva-ElvesCall.mmp
+lmms-0.4.5/data/projects/cool_songs/TobyDox-Psycho.mmp
+lmms-0.4.5/data/projects/cool_songs/Chris-RaveRiff.mmpz
+lmms-0.4.5/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
+lmms-0.4.5/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
+lmms-0.4.5/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
+lmms-0.4.5/data/projects/cool_songs/Chris-HorizonRemix.mmp
+lmms-0.4.5/data/projects/cool_songs/j1m-DingDong.mmp
+lmms-0.4.5/data/projects/cool_songs/Djeezus-BeatRolls.mmp
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
+lmms-0.4.5/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
+lmms-0.4.5/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
+lmms-0.4.5/data/projects/cool_songs/Malex-Horizon4.mmp
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-Underline.mmp
+lmms-0.4.5/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
+lmms-0.4.5/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
+lmms-0.4.5/data/projects/cool_songs/SharkyX-Experiments.mmp
+lmms-0.4.5/data/projects/cool_songs/Skiessi-Onion.mmpz
+lmms-0.4.5/data/projects/cool_songs/TobyDox-Confused.mmp
+lmms-0.4.5/data/projects/cool_songs/Siegel-SpeedTrack.mmp
+lmms-0.4.5/data/projects/cool_songs/Djeezus-Oscilisous.mmp
+lmms-0.4.5/data/samples/latin/latin_brass01.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar03.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar01.ogg
+lmms-0.4.5/data/samples/latin/latin_guitar02.ogg
+lmms-0.4.5/data/samples/shapes/technosynth3.wav
+lmms-0.4.5/data/samples/shapes/technosynth1.wav
+lmms-0.4.5/data/samples/shapes/technosynth2.wav
+lmms-0.4.5/data/samples/shapes/additive2.wav
+lmms-0.4.5/data/samples/shapes/harmonics.wav
+lmms-0.4.5/data/samples/shapes/micro.wav
+lmms-0.4.5/data/samples/shapes/bunglist2.wav
+lmms-0.4.5/data/samples/shapes/bunglist3.wav
+lmms-0.4.5/data/samples/shapes/saw+sine.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw2.ogg
+lmms-0.4.5/data/samples/shapes/bunglist.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw.ogg
+lmms-0.4.5/data/samples/shapes/roundbass.wav
+lmms-0.4.5/data/samples/shapes/bunglist9.wav
+lmms-0.4.5/data/samples/shapes/bunglist7.wav
+lmms-0.4.5/data/samples/shapes/low_sine.wav
+lmms-0.4.5/data/samples/shapes/bunglist4.wav
+lmms-0.4.5/data/samples/shapes/bunglist5.wav
+lmms-0.4.5/data/samples/shapes/sine_dist.ogg
+lmms-0.4.5/data/samples/shapes/technobass.wav
+lmms-0.4.5/data/samples/shapes/roundsaw.ogg
+lmms-0.4.5/data/samples/shapes/technosynth6.wav
+lmms-0.4.5/data/samples/shapes/smooth_inv_saw_dist.ogg
+lmms-0.4.5/data/samples/shapes/bunglist6.wav
+lmms-0.4.5/data/samples/shapes/moog.wav
+lmms-0.4.5/data/samples/shapes/bunglist8.wav
+lmms-0.4.5/data/samples/shapes/additive.wav
+lmms-0.4.5/data/samples/shapes/technosynth5.wav
+lmms-0.4.5/data/samples/shapes/technosynth4.wav
+lmms-0.4.5/data/samples/shapes/vowel_a.wav
+lmms-0.4.5/data/samples/shapes/vowel_u.wav
+lmms-0.4.5/data/samples/basses/bass_punch01.ogg
+lmms-0.4.5/data/samples/basses/bass_acid01.ogg
+lmms-0.4.5/data/samples/basses/rave_bass02.ogg
+lmms-0.4.5/data/samples/basses/bass_hard02.ogg
+lmms-0.4.5/data/samples/basses/rave_bass01.ogg
+lmms-0.4.5/data/samples/basses/bass_hard01.ogg
+lmms-0.4.5/data/samples/basses/synth_acid02.ogg
+lmms-0.4.5/data/samples/basses/horror_bass01.ogg
+lmms-0.4.5/data/samples/basses/matrix1000_pluck01.ogg
+lmms-0.4.5/data/samples/basses/bass01.ogg
+lmms-0.4.5/data/samples/basses/bass_acid02.ogg
+lmms-0.4.5/data/samples/basses/synth_acid01.ogg
+lmms-0.4.5/data/samples/basses/techno_synth01.ogg
+lmms-0.4.5/data/samples/basses/rave_bass04.ogg
+lmms-0.4.5/data/samples/basses/rave_bass03.ogg
+lmms-0.4.5/data/samples/effects/explode01.ogg
+lmms-0.4.5/data/samples/effects/warp01.ogg
+lmms-0.4.5/data/samples/effects/filter_sweep01.ogg
+lmms-0.4.5/data/samples/effects/start01.ogg
+lmms-0.4.5/data/samples/effects/wind_chimes01.ogg
+lmms-0.4.5/data/samples/effects/scratch01.ogg
+lmms-0.4.5/data/samples/effects/warp02.ogg
+lmms-0.4.5/data/samples/effects/chroma_sound_effect01.ogg
+lmms-0.4.5/data/samples/effects/stop01.ogg
+lmms-0.4.5/data/samples/effects/start02.ogg
+lmms-0.4.5/data/samples/beats/house_loop01.ogg
+lmms-0.4.5/data/samples/beats/break02.ogg
+lmms-0.4.5/data/samples/beats/909beat01.ogg
+lmms-0.4.5/data/samples/beats/break03.ogg
+lmms-0.4.5/data/samples/beats/electro_beat02.ogg
+lmms-0.4.5/data/samples/beats/electro_beat01.ogg
+lmms-0.4.5/data/samples/beats/jungle01.ogg
+lmms-0.4.5/data/samples/beats/rave_hihat01.ogg
+lmms-0.4.5/data/samples/beats/rave_kick01.ogg
+lmms-0.4.5/data/samples/beats/rave_kick02.ogg
+lmms-0.4.5/data/samples/beats/break01.ogg
+lmms-0.4.5/data/samples/beats/rave_snare01.ogg
+lmms-0.4.5/data/samples/beats/rave_hihat02.ogg
+lmms-0.4.5/data/samples/stringsnpads/bell_choir02.ogg
+lmms-0.4.5/data/samples/stringsnpads/strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/korg_poly6_drone01.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/chorus02.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings03.ogg
+lmms-0.4.5/data/samples/stringsnpads/chorus01.ogg
+lmms-0.4.5/data/samples/stringsnpads/juno_pad01.ogg
+lmms-0.4.5/data/samples/stringsnpads/orion_string01.ogg
+lmms-0.4.5/data/samples/stringsnpads/rave_choir01.ogg
+lmms-0.4.5/data/samples/stringsnpads/bell_choir01.ogg
+lmms-0.4.5/data/samples/stringsnpads/heaven_strings01.ogg
+lmms-0.4.5/data/samples/stringsnpads/nord_ambient01.ogg
+lmms-0.4.5/data/samples/stringsnpads/space_strings02.ogg
+lmms-0.4.5/data/samples/bassloopes/briff01.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_bass01.ogg
+lmms-0.4.5/data/samples/bassloopes/rave_bass02.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth02.ogg
+lmms-0.4.5/data/samples/bassloopes/tb303_01.ogg
+lmms-0.4.5/data/samples/bassloopes/rave_bass01.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth03.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_bass02.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth04.ogg
+lmms-0.4.5/data/samples/bassloopes/techno_synth01.ogg
+lmms-0.4.5/data/samples/instruments/violin_double_stop01.ogg
+lmms-0.4.5/data/samples/instruments/bassslap01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ01.ogg
+lmms-0.4.5/data/samples/instruments/e_piano_accord01.ogg
+lmms-0.4.5/data/samples/instruments/flute01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_medium_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ04.ogg
+lmms-0.4.5/data/samples/instruments/trumpet01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_slight_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
+lmms-0.4.5/data/samples/instruments/e_organ01.ogg
+lmms-0.4.5/data/samples/instruments/church_organ03.ogg
+lmms-0.4.5/data/samples/instruments/piano02.ogg
+lmms-0.4.5/data/samples/instruments/cello01.ogg
+lmms-0.4.5/data/samples/instruments/piano01.ogg
+lmms-0.4.5/data/samples/instruments/violin_fingered01.ogg
+lmms-0.4.5/data/samples/instruments/violin_pizzicato01.ogg
+lmms-0.4.5/data/samples/instruments/e_piano_accord02.ogg
+lmms-0.4.5/data/samples/instruments/harpsichord01.ogg
+lmms-0.4.5/data/samples/instruments/steel_guitar01.ogg
+lmms-0.4.5/data/samples/instruments/bassslap02.ogg
+lmms-0.4.5/data/samples/instruments/church_organ02.ogg
+lmms-0.4.5/data/samples/misc/applause01.ogg
+lmms-0.4.5/data/samples/misc/breath01.ogg
+lmms-0.4.5/data/samples/misc/raving_crowd01.ogg
+lmms-0.4.5/data/samples/misc/hit02.ogg
+lmms-0.4.5/data/samples/misc/dong01.ogg
+lmms-0.4.5/data/samples/misc/hit01.ogg
+lmms-0.4.5/data/samples/misc/bass!.ogg
+lmms-0.4.5/data/samples/misc/dong03.ogg
+lmms-0.4.5/data/samples/misc/undefined01.ogg
+lmms-0.4.5/data/samples/misc/metronome01.ogg
+lmms-0.4.5/data/samples/misc/buzz!.ogg
+lmms-0.4.5/data/samples/misc/dong02.ogg
+lmms-0.4.5/data/samples/misc/electric_ping01.ogg
+lmms-0.4.5/data/samples/misc/metalish_dong01.ogg
+lmms-0.4.5/data/samples/misc/snaph01.ogg
+lmms-0.4.5/data/samples/drums/kick_soft01.ogg
+lmms-0.4.5/data/samples/drums/snare_rim01.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened02.ogg
+lmms-0.4.5/data/samples/drums/snare05.ogg
+lmms-0.4.5/data/samples/drums/bassdrum_acoustic02.ogg
+lmms-0.4.5/data/samples/drums/kick_hard01.ogg
+lmms-0.4.5/data/samples/drums/sidestick01.ogg
+lmms-0.4.5/data/samples/drums/clap01.ogg
+lmms-0.4.5/data/samples/drums/snare02.ogg
+lmms-0.4.5/data/samples/drums/clap02.ogg
+lmms-0.4.5/data/samples/drums/snare04.ogg
+lmms-0.4.5/data/samples/drums/bassdrum03.ogg
+lmms-0.4.5/data/samples/drums/tom_low01.ogg
+lmms-0.4.5/data/samples/drums/bassdrum02.ogg
+lmms-0.4.5/data/samples/drums/tom02.ogg
+lmms-0.4.5/data/samples/drums/shaker03.ogg
+lmms-0.4.5/data/samples/drums/kick_hiphop01.ogg
+lmms-0.4.5/data/samples/drums/clap03.ogg
+lmms-0.4.5/data/samples/drums/snare_muffled02.ogg
+lmms-0.4.5/data/samples/drums/tom01.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed03.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed05.ogg
+lmms-0.4.5/data/samples/drums/tom_hi01.ogg
+lmms-0.4.5/data/samples/drums/kick01.ogg
+lmms-0.4.5/data/samples/drums/shaker01.ogg
+lmms-0.4.5/data/samples/drums/tom05.ogg
+lmms-0.4.5/data/samples/drums/ride01.ogg
+lmms-0.4.5/data/samples/drums/shaker02.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened01.ogg
+lmms-0.4.5/data/samples/drums/snare06.ogg
+lmms-0.4.5/data/samples/drums/kick_soft02.ogg
+lmms-0.4.5/data/samples/drums/kick_long01.ogg
+lmms-0.4.5/data/samples/drums/kick04.ogg
+lmms-0.4.5/data/samples/drums/snare07.ogg
+lmms-0.4.5/data/samples/drums/bassdrum04.ogg
+lmms-0.4.5/data/samples/drums/crash02.ogg
+lmms-0.4.5/data/samples/drums/tom04.ogg
+lmms-0.4.5/data/samples/drums/kick02.ogg
+lmms-0.4.5/data/samples/drums/nasty_rim01.ogg
+lmms-0.4.5/data/samples/drums/bassdrum_acoustic01.ogg
+lmms-0.4.5/data/samples/drums/ride02.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed02.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed01.ogg
+lmms-0.4.5/data/samples/drums/snare01.ogg
+lmms-0.4.5/data/samples/drums/wood01.ogg
+lmms-0.4.5/data/samples/drums/nasty_bass01.ogg
+lmms-0.4.5/data/samples/drums/snare_hiphop02.ogg
+lmms-0.4.5/data/samples/drums/kick_distorted01.ogg
+lmms-0.4.5/data/samples/drums/zap01.ogg
+lmms-0.4.5/data/samples/drums/clav01.ogg
+lmms-0.4.5/data/samples/drums/rim01.ogg
+lmms-0.4.5/data/samples/drums/nasty_snare01.ogg
+lmms-0.4.5/data/samples/drums/snare_harsh01.ogg
+lmms-0.4.5/data/samples/drums/clav02.ogg
+lmms-0.4.5/data/samples/drums/clap04.ogg
+lmms-0.4.5/data/samples/drums/snare_muffled01.ogg
+lmms-0.4.5/data/samples/drums/kick03.ogg
+lmms-0.4.5/data/samples/drums/snare_acoustic01.ogg
+lmms-0.4.5/data/samples/drums/kick_hardcore01.ogg
+lmms-0.4.5/data/samples/drums/hihat_foot_pedal01.ogg
+lmms-0.4.5/data/samples/drums/snare_short01.ogg
+lmms-0.4.5/data/samples/drums/hihat_closed04.ogg
+lmms-0.4.5/data/samples/drums/bassdrum01.ogg
+lmms-0.4.5/data/samples/drums/snare03.ogg
+lmms-0.4.5/data/samples/drums/zap02.ogg
+lmms-0.4.5/data/samples/drums/snare_hiphop01.ogg
+lmms-0.4.5/data/samples/drums/snare_electro01.ogg
+lmms-0.4.5/data/samples/drums/tom_mid01.ogg
+lmms-0.4.5/data/samples/drums/tom03.ogg
+lmms-0.4.5/data/samples/drums/crash01.ogg
+lmms-0.4.5/data/samples/drums/hihat_opened03.ogg
+lmms-0.4.5/data/samples/drums/zap03.ogg


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 May 2009 19:00:43 -0000	1.1
+++ import.log	4 Sep 2009 21:34:08 -0000	1.2
@@ -1 +1,2 @@
 lmms-0_4_4-1_fc11:F-10:lmms-0.4.4-1.fc11.src.rpm:1242759602
+lmms-0_4_5-1_fc11:F-10:lmms-0.4.5-1.fc11.src.rpm:1252099985


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/lmms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lmms.spec	19 May 2009 19:00:43 -0000	1.1
+++ lmms.spec	4 Sep 2009 21:34:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           lmms
-Version:        0.4.4
+Version:        0.4.5
 Release:        1%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
@@ -16,6 +16,7 @@ Group:          Applications/Multimedia
 #     - cmt: GPLv2(+?)
 #     - swh: GPLv2+
 #     - tap: GPLv2+
+#     - calf: GPLv2+ and LGPLv2+
 #   - GNU UnRTF (flp_import plugin): GPLv3+
 #   - Portsmf (midi_import plugin): MIT
 #   - Blip_Buffer and Gb_Snd_Emu (papu plugin): LGPLv2.1+
@@ -35,18 +36,15 @@ Source0:        %{name}-%{version}.strip
 Source1:        README.fedora
 
 # our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.4-libdir.patch
+Patch0:         lmms-0.4.5-libdir.patch
 
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.4-libexecdir.patch
+Patch1:         lmms-0.4.5-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.4-vst-nowine.patch
+Patch2:         lmms-0.4.5-vst-nowine.patch
 
-# patches borrowed from the fltk package
-Patch3:         lmms-0.4.4-fltk-1.1.9-consts.patch
-Patch4:         lmms-0.4.4-fltk-1.1.9-gcc44.patch
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
 # developers, not possibe because there are to many changes.
@@ -61,6 +59,7 @@ BuildRequires:  jack-audio-connection-ki
 BuildRequires:  alsa-lib-devel
 BuildRequires:  pulseaudio-libs-devel
 
+# we need at least version 0.1.7 of libsamplerate 
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  fftw3-devel
@@ -80,6 +79,7 @@ BuildRequires:  wine-devel 
 Requires:       ladspa-caps-plugins
 Requires:       ladspa-tap-plugins
 Requires:       ladspa-swh-plugins
+Requires:       ladspa-calf-plugins
 # the version included in lmms contains patches sent to, but not yet
 # applied by cmt's upstream.
 #Requires: ladspa-cmt-plugins
@@ -129,10 +129,6 @@ developing addons for %{name}.
 %patch0 -p1 -b .libdir
 %patch1 -p1 -b .libexecdir
 %patch2 -p1 -b .nowine
-%patch3 -p1 -b .consts
-%if 0%{?fedora} > 10
-%patch4 -p1 -b .gcc44
-%endif
 
 # remove spurious x-bits
 find . -type f -exec chmod 0644 {} \;
@@ -147,6 +143,7 @@ find . -type f -exec chmod 0644 {} \;
        -DWANT_CAPS:BOOL=OFF \
        -DWANT_TAP:BOOL=OFF \
        -DWANT_SWH:BOOL=OFF \
+       -DWANT_CALF:BOOL=OFF \
 %ifarch %ix86
        -DWANT_VST:BOOL=ON \
 %else
@@ -223,6 +220,14 @@ This package contains the necessary file
 
 
 %changelog
+* Fri Sep  4 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.5-1
+- Udate to 0.4.5.
+- Rebase patches, and drop fltk patches not needed anymore.
+- Add a dependency on the Calf LADSPA plugins.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.4-1
 - Update to 0.4.4.
 - Need to borrow patches for embedded fltk from the fltk package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 May 2009 19:00:43 -0000	1.2
+++ sources	4 Sep 2009 21:34:08 -0000	1.3
@@ -1 +1 @@
-ec84f9c766742b4ebfa37ac06bebe391  lmms-0.4.4.stripped.tar.bz2
+efbd9ddef0a975cffe9abc2da8b04143  lmms-0.4.5.stripped.tar.bz2


--- lmms-0.4.4-fltk-1.1.9-consts.patch DELETED ---


--- lmms-0.4.4-fltk-1.1.9-gcc44.patch DELETED ---


--- lmms-0.4.4-libdir.patch DELETED ---


--- lmms-0.4.4-libexecdir.patch DELETED ---


--- lmms-0.4.4-vst-nowine.patch DELETED ---



From than at fedoraproject.org  Fri Sep  4 21:34:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 21:34:31 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase-3.5.10-ossl-1.x.patch, NONE,
	1.1 kdebase3.spec, 1.86, 1.87
Message-ID: <20090904213431.1795711C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13445

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.10-ossl-1.x.patch 
Log Message:
- openssl-1.0 build fixes


kdebase-3.5.10-ossl-1.x.patch:
 crypto.cpp |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE kdebase-3.5.10-ossl-1.x.patch ---
diff -up kdebase-3.5.10/kcontrol/crypto/crypto.cpp.orig kdebase-3.5.10/kcontrol/crypto/crypto.cpp
--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp.orig	2009-09-04 23:03:34.000000000 +0200
+++ kdebase-3.5.10/kcontrol/crypto/crypto.cpp	2009-09-04 23:28:12.000000000 +0200
@@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() {
 unsigned int i;
 SSL_CTX *ctx;
 SSL *ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+const SSL_METHOD *meth;
+#else
 SSL_METHOD *meth;
+#endif
 
   SSLv2Box->clear();
   SSLv3Box->clear();
@@ -2337,7 +2341,11 @@ SSL_METHOD *meth;
   CipherItem *item;
   for (i=0; ; i++) {
     int j, k;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER *sc;
+#else
     SSL_CIPHER *sc;
+#endif
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;
@@ -2365,7 +2373,11 @@ SSL_METHOD *meth;
 
   for (i=0; ; i++) {
     int j, k;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER *sc;
+#else
     SSL_CIPHER *sc;
+#endif
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;


Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- kdebase3.spec	21 Aug 2009 14:07:39 -0000	1.86
+++ kdebase3.spec	4 Sep 2009 21:34:30 -0000	1.87
@@ -5,18 +5,13 @@
 %define redhatify 1
 %define make_cvs 1
 %define arts 1
-
-%if 0%{?fedora} > 7
-# make -libs subpkg
 %define libs 1
-%endif
 
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdebase3
 Summary: K Desktop Environment 3 - core files
 Obsoletes: kdebase < 6:%{version}-%{release}
@@ -24,16 +19,6 @@ Provides: kdebase = 6:%{version}-%{relea
 
 # make -pim-ioslaves subpkg
 %define pim 1
-%else
-Epoch: 6
-Name: kdebase
-Summary: K Desktop Environment - core files
-Obsoletes: kdebase3 = %{version}-%{release}
-Provides: kdebase3 = %{version}-%{release}
-
-# make -extras subpkg
-%define extras 1
-%endif
 
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
@@ -89,6 +74,7 @@ Patch36: kdebase-3.5.9-userdiskmount.pat
 Patch37: kdebase-3.5.10-libkrdb_dep.patch
 # http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
 Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
+Patch101: kdebase-3.5.10-ossl-1.x.patch
 
 # security fixes
 
@@ -322,6 +308,7 @@ Protocol handlers (KIOslaves) for person
 %patch37 -p1 -b .libkrdb_dep
 %endif
 %patch100 -p1 -b .minicli-decimal-comma
+%patch101 -p1 -b .ossl-1.x
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -881,6 +868,9 @@ fi
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-14
+- openssl-1.0 build fixes
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.5.10-13
 - rebuilt with new openssl
 



From mjakubicek at fedoraproject.org  Fri Sep  4 21:43:28 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri,  4 Sep 2009 21:43:28 +0000 (UTC)
Subject: rpms/maildrop/devel maildrop.spec,1.5,1.6
Message-ID: <20090904214328.C9C4611C0082@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/maildrop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16575

Modified Files:
	maildrop.spec 
Log Message:
- Fix FTBFS: prevent 'install: will not overwrite just-created' error




Index: maildrop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maildrop/devel/maildrop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- maildrop.spec	25 Jul 2009 11:39:45 -0000	1.5
+++ maildrop.spec	4 Sep 2009 21:43:28 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Mail delivery agent with filtering abilities
 Name: maildrop
 Version: 2.0.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 # Exception is explicit permission to link to OpenSSL
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -56,6 +56,9 @@ autoreconf
   --enable-use-dotlock=1 \
   --enable-syslog=1 \
   --enable-sendmail=%{_sbindir}/sendmail
+# prevent 'install: will not overwrite just-created' error
+#?notification sent to courier-maildrop at lists.sourceforge.net on 2009/09/04
+sed -i 's|DELIVERQUOTAMAN = maildirquota.7 deliverquota.8|DELIVERQUOTAMAN =|' Makefile
 make
 
 %install
@@ -86,6 +89,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.0.4-11
+- Fix FTBFS: prevent 'install: will not overwrite just-created' error
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From walters at fedoraproject.org  Fri Sep  4 21:43:34 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Fri,  4 Sep 2009 21:43:34 +0000 (UTC)
Subject: rpms/gobject-introspection/devel .cvsignore, 1.5,
	1.6 gobject-introspection.spec, 1.14, 1.15 sources, 1.5, 1.6
Message-ID: <20090904214334.D556911C0082@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16689

Modified Files:
	.cvsignore gobject-introspection.spec sources 
Log Message:
* Fri Sep 11 2009 Colin Walters <walters at verbum.org> - 0.6.5-1
- New upstream
- Drop libtool dep 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:09:12 -0000	1.5
+++ .cvsignore	4 Sep 2009 21:43:34 -0000	1.6
@@ -1 +1 @@
-gobject-introspection-0.6.4.tar.gz
+gobject-introspection-0.6.5.tar.gz


Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gobject-introspection.spec	28 Aug 2009 17:11:38 -0000	1.14
+++ gobject-introspection.spec	4 Sep 2009 21:43:34 -0000	1.15
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gobject-introspection
-Version:        0.6.4
-Release:        2%{?dist}
+Version:        0.6.5
+Release:        1%{?dist}
 Summary:        Introspection system for GObject-based libraries
 
 Group:		Development/Libraries
@@ -30,9 +30,6 @@ BuildRequires:  fontconfig-devel
 BuildRequires:  libXft-devel
 BuildRequires:  freetype-devel
 
-# temporary dep for http://bugzilla.gnome.org/show_bug.cgi?id=592968
-BuildRequires: libtool
-
 %description
 GObject Introspection can scan C header and source files in order to
 generate introspection "typelib" files.  It also provides an API to examine
@@ -98,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.gz
 
 %changelog
+* Fri Sep 11 2009 Colin Walters <walters at verbum.org> - 0.6.5-1
+- New upstream
+- Drop libtool dep 
+
 * Fri Aug 28 2009 Colin Walters <walters at verbum.org> - 0.6.4-2
 - Add dep on libtool temporarily
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 16:09:12 -0000	1.5
+++ sources	4 Sep 2009 21:43:34 -0000	1.6
@@ -1 +1 @@
-9729cb0bcf9ca6d311b1c94a8726d113  gobject-introspection-0.6.4.tar.gz
+e0f419a2bf6326c96d5291680cad97fa  gobject-introspection-0.6.5.tar.gz



From mbarnes at fedoraproject.org  Fri Sep  4 21:58:05 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri,  4 Sep 2009 21:58:05 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.19,
	1.116.2.20 evolution.spec, 
	1.394.2.39, 1.394.2.40 sources, 1.116.2.23, 1.116.2.24
Message-ID: <20090904215805.712E011C0082@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22217

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Fri Sep 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.3.fc12
- Snapshot of "kill-bonobo" progress at commit 35929a3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.19
retrieving revision 1.116.2.20
diff -u -p -r1.116.2.19 -r1.116.2.20
--- .cvsignore	3 Sep 2009 02:31:29 -0000	1.116.2.19
+++ .cvsignore	4 Sep 2009 21:58:04 -0000	1.116.2.20
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-74457fd.tar.bz2
+evolution-2.29.1-kill-bonobo-35929a3.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.39
retrieving revision 1.394.2.40
diff -u -p -r1.394.2.39 -r1.394.2.40
--- evolution.spec	3 Sep 2009 03:08:20 -0000	1.394.2.39
+++ evolution.spec	4 Sep 2009 21:58:04 -0000	1.394.2.40
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 74457fd
+%define hash 35929a3
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.2%{?dist}
+Release: 1.kb.3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -679,11 +679,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Fri Sep 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.3.fc12
+- Snapshot of "kill-bonobo" progress at commit 35929a3.
+
 * Wed Sep 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.2.fc12
-- Snapshot of "kill-bonobo" branch at commit 74457fd.
+- Snapshot of "kill-bonobo" progress at commit 74457fd.
 
 * Tue Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
-- Snapshot of "kill-bonobo" branch at commit f945e64.
+- Snapshot of "kill-bonobo" progress at commit f945e64.
 - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
   compatibility with Fedora 12.
 - Relax evolution-data-server requirement.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.23
retrieving revision 1.116.2.24
diff -u -p -r1.116.2.23 -r1.116.2.24
--- sources	3 Sep 2009 02:31:29 -0000	1.116.2.23
+++ sources	4 Sep 2009 21:58:05 -0000	1.116.2.24
@@ -1 +1 @@
-430d4e5ead977fa1e270a106a70caaf2  evolution-2.29.1-kill-bonobo-74457fd.tar.bz2
+0bf1036d94b9d4c92f188aa766cf344d  evolution-2.29.1-kill-bonobo-35929a3.tar.bz2



From cwickert at fedoraproject.org  Fri Sep  4 22:04:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 22:04:49 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xfce4-clipman-plugin.spec, 1.23, 1.24
Message-ID: <20090904220449.EAF3911C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24257

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
- Update to 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Jul 2009 16:23:13 -0000	1.10
+++ .cvsignore	4 Sep 2009 22:04:49 -0000	1.11
@@ -1 +1 @@
-xfce4-clipman-plugin-1.0.2.tar.bz2
+xfce4-clipman-plugin-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Jul 2009 16:23:13 -0000	1.10
+++ sources	4 Sep 2009 22:04:49 -0000	1.11
@@ -1 +1 @@
-37fb51a8e268819c5e0c71e26ef4d0f8  xfce4-clipman-plugin-1.0.2.tar.bz2
+bf038078ec3566c06d2ef400a91756d1  xfce4-clipman-plugin-1.1.0.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xfce4-clipman-plugin.spec	27 Jul 2009 07:50:08 -0000	1.23
+++ xfce4-clipman-plugin.spec	4 Sep 2009 22:04:49 -0000	1.24
@@ -1,12 +1,12 @@
 Name:           xfce4-clipman-plugin
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Clipboard manager plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
@@ -75,8 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 #%{_libexecdir}/xfce4/panel-plugins/%{name}
 %config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml
-%{_bindir}/%{name}
+%{_bindir}/xfce4-clipman
+%{_bindir}/xfce4-clipman-settings
 %{_bindir}/xfce4-popup-clipman
+%{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/xfce4/doc/*/images/clipman-*.png
@@ -85,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Fri Sep  4 22:07:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 22:07:59 +0000 (UTC)
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.11, 1.12 sources, 1.11, 
	1.12 xfce4-notes-plugin.spec, 1.20, 1.21
Message-ID: <20090904220759.56DFD11C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-notes-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25339

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.1-1
- Update to 1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Jul 2009 00:58:38 -0000	1.11
+++ .cvsignore	4 Sep 2009 22:07:59 -0000	1.12
@@ -1 +1 @@
-xfce4-notes-plugin-1.7.0.tar.bz2
+xfce4-notes-plugin-1.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Jul 2009 00:58:38 -0000	1.11
+++ sources	4 Sep 2009 22:07:59 -0000	1.12
@@ -1 +1 @@
-a08f6febf6e6dd8b90767f83a179e24c  xfce4-notes-plugin-1.7.0.tar.bz2
+c6d27d8c566fbd98a14bd59273da0adf  xfce4-notes-plugin-1.7.1.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xfce4-notes-plugin.spec	27 Jul 2009 07:54:06 -0000	1.20
+++ xfce4-notes-plugin.spec	4 Sep 2009 22:07:59 -0000	1.21
@@ -1,12 +1,12 @@
 Name:		xfce4-notes-plugin
-Version:	1.7.0
-Release:	2%{?dist}
+Version:	1.7.1
+Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel
@@ -57,7 +57,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/xfce4-notes-settings
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
@@ -67,6 +67,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.1-1
+- Update to 1.7.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Fri Sep  4 22:18:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 22:18:23 +0000 (UTC)
Subject: rpms/xfce4-notes-plugin/F-11 .cvsignore, 1.11, 1.12 sources, 1.11, 
	1.12 xfce4-notes-plugin.spec, 1.19, 1.20
Message-ID: <20090904221823.E43A111C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-notes-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27408

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.1-1
- Update to 1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Jul 2009 01:02:14 -0000	1.11
+++ .cvsignore	4 Sep 2009 22:18:22 -0000	1.12
@@ -1 +1 @@
-xfce4-notes-plugin-1.7.0.tar.bz2
+xfce4-notes-plugin-1.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Jul 2009 01:02:14 -0000	1.11
+++ sources	4 Sep 2009 22:18:22 -0000	1.12
@@ -1 +1 @@
-a08f6febf6e6dd8b90767f83a179e24c  xfce4-notes-plugin-1.7.0.tar.bz2
+c6d27d8c566fbd98a14bd59273da0adf  xfce4-notes-plugin-1.7.1.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/F-11/xfce4-notes-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-notes-plugin.spec	4 Jul 2009 01:02:14 -0000	1.19
+++ xfce4-notes-plugin.spec	4 Sep 2009 22:18:22 -0000	1.20
@@ -1,12 +1,12 @@
 Name:		xfce4-notes-plugin
-Version:	1.7.0
+Version:	1.7.1
 Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel
@@ -57,7 +57,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/xfce4-notes-settings
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
@@ -67,6 +67,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.1-1
+- Update to 1.7.1
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.0-1
 - Update to 1.7.0
 - Update gtk-update-icon-cache scriptlets



From cwickert at fedoraproject.org  Fri Sep  4 22:25:10 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 22:25:10 +0000 (UTC)
Subject: rpms/xfmpc/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfmpc.spec, 
	1.8, 1.9
Message-ID: <20090904222510.DC7C811C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfmpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28968

Modified Files:
	.cvsignore sources xfmpc.spec 
Log Message:
* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
- Update to 0.2.0
- Unclude new manpage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfmpc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Mar 2009 21:45:31 -0000	1.4
+++ .cvsignore	4 Sep 2009 22:25:10 -0000	1.5
@@ -1 +1 @@
-xfmpc-0.1.0.tar.bz2
+xfmpc-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfmpc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Mar 2009 21:45:31 -0000	1.4
+++ sources	4 Sep 2009 22:25:10 -0000	1.5
@@ -1 +1 @@
-6708fad6f927b3a4810c05b1721387f9  xfmpc-0.1.0.tar.bz2
+96249284da0d43a93f5bf17865e34fad  xfmpc-0.2.0.tar.bz2


Index: xfmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfmpc/devel/xfmpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xfmpc.spec	27 Jul 2009 08:00:17 -0000	1.8
+++ xfmpc.spec	4 Sep 2009 22:25:10 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           xfmpc
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        A MPD client for the Xfce desktop environment
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0, libmpd-devel >= 0.15.0
@@ -45,9 +45,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog IDEAS NEWS README THANKS
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
+- Update to 0.2.0
+- Unclude new manpage
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Fri Sep  4 22:27:40 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri,  4 Sep 2009 22:27:40 +0000 (UTC)
Subject: rpms/xrdp/devel import.log,1.1,1.2 xrdp.spec,1.2,1.3
Message-ID: <20090904222740.8CED111C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30903/devel

Modified Files:
	import.log xrdp.spec 
Log Message:
- fix bz 519294



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 18:01:35 -0000	1.1
+++ import.log	4 Sep 2009 22:27:40 -0000	1.2
@@ -1 +1,2 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272824
+xrdp-0_5_0-0_4_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.4.20090811cvs.fc12.src.rpm:1252103027


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/xrdp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp.spec	26 Aug 2009 15:22:56 -0000	1.2
+++ xrdp.spec	4 Sep 2009 22:27:40 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.3.%{cvs}%{?dist}
+Release:   0.4.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -58,6 +58,18 @@ terminal server / remote desktop clients
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
 
+#Low is 40 bit key and everything from client to server is encrypted.
+#Medium is 40 bit key, everything both ways is encrypted.
+#High is 128 bit key everything both ways is encrypted.
+
+# increase encryption to 128 bit's
+%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
+
+#include system-auth into pam.d/xrdp-sesman
+echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
+echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
+
+
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -159,6 +171,10 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
+- increase encryption to 128 bit's
+- include system-auth into /etc/pam.d/xrdp-sesman
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
 - rebuild with new openssl
 



From cwickert at fedoraproject.org  Fri Sep  4 22:29:48 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 22:29:48 +0000 (UTC)
Subject: rpms/xfmpc/devel xfmpc.spec,1.9,1.10
Message-ID: <20090904222948.3EF7511C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfmpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32643

Modified Files:
	xfmpc.spec 
Log Message:
fix trivial typo


Index: xfmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfmpc/devel/xfmpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xfmpc.spec	4 Sep 2009 22:25:10 -0000	1.9
+++ xfmpc.spec	4 Sep 2009 22:29:48 -0000	1.10
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
 - Update to 0.2.0
-- Unclude new manpage
+- Include new manpage
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From itamarjp at fedoraproject.org  Fri Sep  4 22:35:42 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri,  4 Sep 2009 22:35:42 +0000 (UTC)
Subject: rpms/xrdp/F-11 import.log,1.1,1.2 xrdp.spec,1.1,1.2
Message-ID: <20090904223542.6CF4411C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1764/F-11

Modified Files:
	import.log xrdp.spec 
Log Message:
- fix bz 519294



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 18:04:04 -0000	1.1
+++ import.log	4 Sep 2009 22:35:41 -0000	1.2
@@ -1 +1,2 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:F-11:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272977
+xrdp-0_5_0-0_3_20090811cvs_fc12:F-11:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103630


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-11/xrdp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrdp.spec	14 Aug 2009 18:04:04 -0000	1.1
+++ xrdp.spec	4 Sep 2009 22:35:41 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.2.%{cvs}%{?dist}
+Release:   0.3.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -58,6 +58,17 @@ terminal server / remote desktop clients
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
 
+#Low is 40 bit key and everything from client to server is encrypted.
+#Medium is 40 bit key, everything both ways is encrypted.
+#High is 128 bit key everything both ways is encrypted.
+
+# increase encryption to 128 bit's
+%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
+
+#include system-auth into pam.d/xrdp-sesman
+echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
+echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
+
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -159,6 +170,11 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+- increase encryption to 128 bit's
+- include system-auth into /etc/pam.d/xrdp-sesman
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -167,7 +183,6 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
-
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From itamarjp at fedoraproject.org  Fri Sep  4 22:37:29 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri,  4 Sep 2009 22:37:29 +0000 (UTC)
Subject: rpms/xrdp/F-10 import.log,1.1,1.2 xrdp.spec,1.1,1.2
Message-ID: <20090904223729.0A2F911C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2548/F-10

Modified Files:
	import.log xrdp.spec 
Log Message:
- fix bz 519294



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 18:06:35 -0000	1.1
+++ import.log	4 Sep 2009 22:37:27 -0000	1.2
@@ -1 +1,2 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:F-10:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273132
+xrdp-0_5_0-0_3_20090811cvs_fc12:F-10:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103784


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/xrdp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrdp.spec	14 Aug 2009 18:06:35 -0000	1.1
+++ xrdp.spec	4 Sep 2009 22:37:27 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.2.%{cvs}%{?dist}
+Release:   0.3.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -58,6 +58,17 @@ terminal server / remote desktop clients
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
 
+#Low is 40 bit key and everything from client to server is encrypted.
+#Medium is 40 bit key, everything both ways is encrypted.
+#High is 128 bit key everything both ways is encrypted.
+
+# increase encryption to 128 bit's
+%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
+
+#include system-auth into pam.d/xrdp-sesman
+echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
+echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
+
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -159,6 +170,11 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+- increase encryption to 128 bit's
+- include system-auth into /etc/pam.d/xrdp-sesman
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -167,7 +183,6 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
-
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From itamarjp at fedoraproject.org  Fri Sep  4 22:39:24 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri,  4 Sep 2009 22:39:24 +0000 (UTC)
Subject: rpms/xrdp/EL-5 import.log,1.1,1.2 xrdp.spec,1.1,1.2
Message-ID: <20090904223924.1D58D11C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3453/EL-5

Modified Files:
	import.log xrdp.spec 
Log Message:
- fix bz 519294



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 18:09:12 -0000	1.1
+++ import.log	4 Sep 2009 22:39:23 -0000	1.2
@@ -1 +1,2 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:EL-5:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273281
+xrdp-0_5_0-0_3_20090811cvs_fc12:EL-5:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103881


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-5/xrdp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrdp.spec	14 Aug 2009 18:09:12 -0000	1.1
+++ xrdp.spec	4 Sep 2009 22:39:23 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.2.%{cvs}%{?dist}
+Release:   0.3.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -58,6 +58,17 @@ terminal server / remote desktop clients
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
 
+#Low is 40 bit key and everything from client to server is encrypted.
+#Medium is 40 bit key, everything both ways is encrypted.
+#High is 128 bit key everything both ways is encrypted.
+
+# increase encryption to 128 bit's
+%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
+
+#include system-auth into pam.d/xrdp-sesman
+echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
+echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
+
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -159,6 +170,11 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+- increase encryption to 128 bit's
+- include system-auth into /etc/pam.d/xrdp-sesman
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -167,7 +183,6 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
-
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From itamarjp at fedoraproject.org  Fri Sep  4 22:44:04 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri,  4 Sep 2009 22:44:04 +0000 (UTC)
Subject: rpms/xrdp/EL-4 import.log,1.1,1.2 xrdp.spec,1.1,1.2
Message-ID: <20090904224404.5790B11C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4846/EL-4

Modified Files:
	import.log xrdp.spec 
Log Message:
fix bz 519294



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 18:11:22 -0000	1.1
+++ import.log	4 Sep 2009 22:44:04 -0000	1.2
@@ -1 +1,2 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:EL-4:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273423
+xrdp-0_5_0-0_3_20090811cvs_fc12:EL-4:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103993


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-4/xrdp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrdp.spec	14 Aug 2009 18:11:22 -0000	1.1
+++ xrdp.spec	4 Sep 2009 22:44:04 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.2.%{cvs}%{?dist}
+Release:   0.3.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -58,6 +58,17 @@ terminal server / remote desktop clients
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
 
+#Low is 40 bit key and everything from client to server is encrypted.
+#Medium is 40 bit key, everything both ways is encrypted.
+#High is 128 bit key everything both ways is encrypted.
+
+# increase encryption to 128 bit's
+%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
+
+#include system-auth into pam.d/xrdp-sesman
+echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
+echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
+
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -159,6 +170,11 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+- increase encryption to 128 bit's
+- include system-auth into /etc/pam.d/xrdp-sesman
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -167,7 +183,6 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
-
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From mbarnes at fedoraproject.org  Fri Sep  4 22:44:49 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri,  4 Sep 2009 22:44:49 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.40,1.394.2.41
Message-ID: <20090904224449.D5C5811C0082@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6965

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix file list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.40
retrieving revision 1.394.2.41
diff -u -p -r1.394.2.40 -r1.394.2.41
--- evolution.spec	4 Sep 2009 21:58:04 -0000	1.394.2.40
+++ evolution.spec	4 Sep 2009 22:44:49 -0000	1.394.2.41
@@ -595,8 +595,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-publish-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 
-#%{evo_plugin_dir}/org-gnome-save-calendar.eplug
-#%{evo_plugin_dir}/liborg-gnome-save-calendar.so
+%{evo_plugin_dir}/org-gnome-save-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
 %{evo_plugin_dir}/org-gnome-subject-thread.eplug
 %{evo_plugin_dir}/liborg-gnome-subject-thread.so



From than at fedoraproject.org  Fri Sep  4 22:45:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 22:45:45 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec,1.87,1.88
Message-ID: <20090904224545.3796F11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7644

Modified Files:
	kdebase3.spec 
Log Message:
* drop support fedora < 10




Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kdebase3.spec	4 Sep 2009 21:34:30 -0000	1.87
+++ kdebase3.spec	4 Sep 2009 22:45:44 -0000	1.88
@@ -7,6 +7,7 @@
 %define arts 1
 %define libs 1
 
+%define _with_libutempter 1
 %define _with_samba --with-samba
 
 Version: 3.5.10
@@ -106,38 +107,10 @@ Requires: psmisc
 Requires: eject
 %endif
 
-%if "%{name}" == "kdebase"
-# upgrade path for former kde-redhat'ers
-Obsoletes: %{name}-kdm < %{epoch}:%{version}-%{release}
-Provides:  %{name}-kdm = %{epoch}:%{version}-%{release}
-# when/if -kdm is ever packaged separately
-Requires: kde-settings-kdm
-
-# See http://bugzilla.redhat.com/191306
-Requires(hint): htdig
-# man2html
-Requires(hint): man
-
-# startkde references: df mktemp test which xargs xmessage xprop xrandr xrdb xset xsetroot
-Requires: coreutils
-Requires: findutils
-Requires: mktemp
-Requires: which
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-Requires: xorg-x11-apps
-Requires: xorg-x11-utils
-Requires: xorg-x11-server-utils
-%endif
-%endif
-
-BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: kdelibs3-devel >= %{version}-16
 BuildRequires: libxslt-devel libxml2-devel
 %if 0%{?_with_samba:1}
-%if 0%{?fedora} > 6
 BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba 
-%endif
 %endif
 BuildRequires: pam-devel
 BuildRequires: gettext
@@ -148,7 +121,6 @@ BuildRequires: automake libtool
 %endif
 BuildRequires: pkgconfig
 BuildRequires: doxygen
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %ifarch %{ix86} x86_64 ia64 ppc ppc64
 %define _with_suspend 1
 Requires: pm-utils
@@ -156,7 +128,6 @@ Requires: pm-utils
 %define _with_hal --with-hal
 # dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
 BuildRequires: dbus-devel hal-devel
-%endif
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: openldap-devel
@@ -164,7 +135,6 @@ BuildRequires: cyrus-sasl-devel
 BuildRequires: libart_lgpl-devel
 ## X11 support details (xmkmf, bdftopcf)
 BuildRequires: xorg-x11-font-utils
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires: imake
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libfontenc-devel
@@ -179,46 +149,22 @@ BuildRequires: libXext-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: libxkbfile-devel
-%endif
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-# See also http://bugzilla.redhat.com/205767
-%define _with_libutempter 1
-%endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
-%if 0%{?fedora} < 9 
-BuildRequires: lm_sensors-devel
-%endif
 %endif
 BuildRequires: OpenEXR-devel
 BuildRequires: gtk2-devel
 
-%if "%{name}" == "kdebase"
-%description
-Core applications for the K Desktop Environment.  Included are: kdm
-(replacement for xdm), kwin (window manager), konqueror (filemanager,
-web browser, ftp client, ...), konsole (xterm replacement), kpanel
-(application starter and desktop pager), kaudio (audio server),
-kdehelp (viewer for kde help files, info and man pages), kthememgr
-(system for managing alternate theme packages) plus other KDE
-components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind,
-kfontmanager, kmenuedit).
-%else
 %description
 Core runtime files for the K Desktop Environment 3, for compatibility with KDE 3
 applications.
-%endif
 
 # FIXME/TODO: Is kdebase3-devel really useful?
 %package devel
 Summary: Development files for %{name}
-%if "%{name}" == "kdebase"
-Provides: kdebase3-devel = %{version}-%{release}
-%else
 Provides: kdebase-devel = 6:%{version}-%{release}
 Obsoletes: kdebase-devel < 6:%{version}-%{release}
-%endif
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs3-devel
 Group: Development/Libraries
@@ -245,15 +191,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
-%if "%{name}" == "kdebase"
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
-%else
 Obsoletes: kdebase-libs < 6:%{version}-%{release}
 Provides: kdebase-libs = 6:%{version}-%{release}
 # helps multilib upgrades
 Obsoletes: kdebase < 6:%{version}-%{release}
-%endif
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -300,17 +241,11 @@ Protocol handlers (KIOslaves) for person
 %patch28 -p1 -b .kdm-alternatebackground
 %patch30 -p1 -b .bz#265801
 %patch31 -p1 -b .konsolesu-kdesu
-%if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
-%endif
-%if "%{name}" != "kdebase"
-# F9+ only - we do want to runRdb on F8
 %patch37 -p1 -b .libkrdb_dep
-%endif
 %patch100 -p1 -b .minicli-decimal-comma
 %patch101 -p1 -b .ossl-1.x
 
-%if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343
 sed -i.omit -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' \
@@ -320,7 +255,6 @@ sed -i.omit -e 's|^FONTINST_SUBDIR=kfont
   -e 's/locale//' \
   -e 's/screensaver//' -e 's/style//' -e 's/taskbar//' -e 's/xinerama//' \
   kcontrol/Makefile.am
-%endif
 
 # security fixes
 
@@ -344,7 +278,6 @@ install -p -m644 %{SOURCE9} %{SOURCE10} 
 # set some default enviroments
 unset QTDIR && . /etc/profile.d/qt.sh
 
-%if "%{name}" != "kdebase"
 export DO_NOT_COMPILE="kappfinder kdesktop kdesu klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb"
@@ -352,7 +285,6 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE k
 # Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves
 # kate for kscope
 # export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
-%endif
 
 %configure \
    --enable-new-ldflags \
@@ -402,10 +334,6 @@ rm -rf %{buildroot}
 
 make RUN_KAPPFINDER=no DESTDIR=%{buildroot} install
 
-%if "%{name}" == "kdebase"
-install -p -m755 mailsettings %{buildroot}%{_bindir}/
-%endif
-
 # Nuke man2html - we get it from man
 find %{buildroot} -name "man2html*" | xargs rm -rf
 
@@ -462,43 +390,6 @@ rm -f %{buildroot}%{_datadir}/fonts/over
 # now in kde-filesystem (see #321771)
 rm -f %{buildroot}%{_datadir}/applnk/.hidden/.directory
 
-%if "%{name}" == "kdebase"
-
-install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
-
-# xsession support
-mkdir -p %{buildroot}%{_datadir}/xsessions/
-ln -s %{_datadir}/apps/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
-
-# install logrotate script
-install -p -m 644 -D %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
-
-# own %{_datadir}/apps/kdm/faces
-mkdir -p %{buildroot}%{_datadir}/apps/kdm/faces
-pushd %{buildroot}%{_datadir}/apps/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
-popd
-
-## install pam configuration files
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-install -p -m644 -D %{SOURCE5}    $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
-%else
-install -p -m644 -D %{SOURCE50}   $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
-%endif
-
-# create/own /var/lib/kdm/kdmsts (#442081)
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm/kdmsts
-
-%else
-# FIXME/TODO: initial removal. Check if the simple rm breaks anything.
-
 # remove conflicts with kdebase-workspace
 pushd %{buildroot}%{_bindir}
 rm -f genkdmconf kaccess kappfinder kapplymousetheme kate kbookmarkmerger \
@@ -587,7 +478,6 @@ rm -rf %{buildroot}%{_datadir}/apps/apps
 rm -rf %{buildroot}%{_datadir}/apps/ksmserver
 rm -rf %{buildroot}%{_datadir}/applnk
 rm -rf %{buildroot}/etc/xdg/menus/
-%endif
 
 %clean
 rm -rf %{buildroot}



From cwickert at fedoraproject.org  Fri Sep  4 22:48:41 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  4 Sep 2009 22:48:41 +0000 (UTC)
Subject: rpms/lxmusic/devel .cvsignore, 1.3, 1.4 lxmusic.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090904224841.EAFF211C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9101

Modified Files:
	.cvsignore lxmusic.spec sources 
Log Message:
* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
- Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 20:56:39 -0000	1.3
+++ .cvsignore	4 Sep 2009 22:48:41 -0000	1.4
@@ -1 +1 @@
-lxmusic-0.3.0.tar.gz
+lxmusic-0.4.0.tar.gz


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxmusic.spec	11 Aug 2009 20:56:39 -0000	1.4
+++ lxmusic.spec	4 Sep 2009 22:48:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           lxmusic
-Version:        0.3.0
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0
+
 * Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-1
 - update to 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 20:56:39 -0000	1.3
+++ sources	4 Sep 2009 22:48:41 -0000	1.4
@@ -1 +1 @@
-bb197a65d66f315fdc24c9f727dc53e2  lxmusic-0.3.0.tar.gz
+744eebed9b44e3f744fe90f360a1af3c  lxmusic-0.4.0.tar.gz



From than at fedoraproject.org  Fri Sep  4 22:54:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 22:54:21 +0000 (UTC)
Subject: rpms/kdeutils/F-10 kdeutils-4.3.1-kscd-lirc.patch,NONE,1.1
Message-ID: <20090904225421.56C5E11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10747

Added Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
apply kdeutils-4.3.1-kscd-lirc.patch


kdeutils-4.3.1-kscd-lirc.patch:
 CMakeLists.txt |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE kdeutils-4.3.1-kscd-lirc.patch ---
diff -up kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt.orig kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt
--- kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt.orig	2009-08-31 11:45:26.000000000 +0200
+++ kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt	2009-08-31 11:45:31.000000000 +0200
@@ -11,7 +11,6 @@ install( FILES 
     konqueror.profile.xml 
     suspend.profile.xml
     shutdown.profile.xml
-    kscd.profile.xml
     DESTINATION ${DATA_INSTALL_DIR}/profiles)
 
 



From than at fedoraproject.org  Fri Sep  4 22:55:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 22:55:24 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils-4.3.1-kscd-lirc.patch,NONE,1.1
Message-ID: <20090904225524.2EF1711C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11066

Added Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
apply kdeutils-4.3.1-kscd-lirc.patch


kdeutils-4.3.1-kscd-lirc.patch:
 CMakeLists.txt |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE kdeutils-4.3.1-kscd-lirc.patch ---
diff -up kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt.orig kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt
--- kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt.orig	2009-08-31 11:45:26.000000000 +0200
+++ kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt	2009-08-31 11:45:31.000000000 +0200
@@ -11,7 +11,6 @@ install( FILES 
     konqueror.profile.xml 
     suspend.profile.xml
     shutdown.profile.xml
-    kscd.profile.xml
     DESTINATION ${DATA_INSTALL_DIR}/profiles)
 
 



From than at fedoraproject.org  Fri Sep  4 23:05:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Sep 2009 23:05:28 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.28, 1.29 kde-l10n.spec, 1.93,
	1.94 sources, 1.32, 1.33 subdirs-kde-l10n, 1.18, 1.19
Message-ID: <20090904230528.5593A11C0082@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14096

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
add missing Croatian localization




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	28 Aug 2009 20:46:32 -0000	1.28
+++ .cvsignore	4 Sep 2009 23:05:27 -0000	1.29
@@ -334,3 +334,4 @@ kde-l10n-uk-4.3.1.tar.bz2
 kde-l10n-wa-4.3.1.tar.bz2
 kde-l10n-zh_CN-4.3.1.tar.bz2
 kde-l10n-zh_TW-4.3.1.tar.bz2
+kde-l10n-hr-4.3.1.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kde-l10n.spec	2 Sep 2009 14:36:36 -0000	1.93
+++ kde-l10n.spec	4 Sep 2009 23:05:27 -0000	1.94
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.3.1
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -71,7 +71,7 @@ Source58: ftp://ftp.kde.org/pub/kde/stab
 Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
 Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
 Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
-
+Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
 # upstream patches
@@ -1498,6 +1498,9 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- add missing Croatian localization
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	2 Sep 2009 09:22:36 -0000	1.32
+++ sources	4 Sep 2009 23:05:27 -0000	1.33
@@ -54,3 +54,4 @@ f705391dccc8557e0d9b874c0c2d3597  kde-l1
 44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
 2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
 7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
+7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- subdirs-kde-l10n	19 May 2009 16:40:00 -0000	1.18
+++ subdirs-kde-l10n	4 Sep 2009 23:05:27 -0000	1.19
@@ -18,6 +18,7 @@ gl
 gu
 he
 hi
+hr
 hu
 is
 it



From cebbert at fedoraproject.org  Fri Sep  4 23:06:08 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  4 Sep 2009 23:06:08 +0000 (UTC)
Subject: rpms/kernel/devel/scripts combine.sh,NONE,1.1
Message-ID: <20090904230608.563B511C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14401

Added Files:
	combine.sh 
Log Message:
add script to generate combined patches from quilt


--- NEW FILE combine.sh ---
#! /bin/sh

# combine a set of quilt patches

# $1 : base dir (source tree)
# $2 : quilt dir (patches to apply)
# $3 : pre-patch to apply first (optional)

# e.g.:
# combine.sh /home/user/fedora/trunk/kernel/F-11/kernel-2.6.30/vanilla-2.6.30 \
#            /home/user/git/stable-queue/queue-2.6.30 \
#            /home/user/fedora/trunk/kernel/F-11/patch-2.6.30.5.bz2

if [ $# -lt 2 ] ; then
  exit 1
fi

TD="combine_temp.d"

cd $1 || exit 1
cd ..
[ -d $TD ] && rm -Rf $TD
mkdir $TD || exit 1
cd $TD

cp -al ../$(basename $1) work.d
cd work.d
[ "$3" ] && bzcat $3 | patch -p1 -s
ln -s $2 patches
[ -h patches ] || exit 1
quilt snapshot
quilt upgrade
quilt push -a -q
quilt diff --snapshot >../combined.patch



From jspaleta at fedoraproject.org  Fri Sep  4 23:10:09 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Fri,  4 Sep 2009 23:10:09 +0000 (UTC)
Subject: rpms/gourmet/devel gourmet.spec,1.18,1.19
Message-ID: <20090904231009.1C5BB11C0417@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15457

Modified Files:
	gourmet.spec 
Log Message:
* Fri Sep 4 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-4
- add gnome-python2-gtkspell for spellingchecking plugin support



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/gourmet.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gourmet.spec	25 Aug 2009 16:06:45 -0000	1.18
+++ gourmet.spec	4 Sep 2009 23:10:08 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.15.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
@@ -18,7 +18,7 @@ BuildRequires:  gettext,intltool
 
 Requires: gnome-python2, gnome-python2-gnomeprint
 Requires: metakit
-Requires: pygtk2 
+Requires: pygtk2, gnome-python2-gtkspell 
 Requires: PyRTF,python-sqlalchemy
 Requires: python-imaging, python-sqlite2, pygtk2-libglade, python-reportlab
 %description
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Fri Sep 4 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-4
+- add gnome-python2-gtkspell for spellingchecking plugin support
+
 * Tue Aug 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-3
 - add python-sqlalchemy runtime dep.
 



From otaylor at fedoraproject.org  Fri Sep  4 23:10:09 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Fri,  4 Sep 2009 23:10:09 +0000 (UTC)
Subject: rpms/mutter/devel .cvsignore, 1.4, 1.5 mutter.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20090904231009.485C111C0417@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15414

Modified Files:
	.cvsignore mutter.spec sources 
Log Message:
* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.4-1
- Update to 2.27.4
- Remove workaround for #520209



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 23:39:15 -0000	1.4
+++ .cvsignore	4 Sep 2009 23:10:08 -0000	1.5
@@ -1,3 +1,4 @@
 mutter-2.27.1.tar.bz2
 mutter-2.27.2.tar.bz2
 mutter-2.27.3.tar.bz2
+mutter-2.27.4.tar.bz2


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mutter.spec	29 Aug 2009 22:05:13 -0000	1.9
+++ mutter.spec	4 Sep 2009 23:10:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mutter
-Version:        2.27.3
-Release:        3%{?dist}
+Version:        2.27.4
+Release:        1%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
@@ -9,9 +9,6 @@ URL:            http://git.gnome.org/cgi
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Workaround for glibc bug https://bugzilla.redhat.com/show_bug.cgi?id=520209
-Patch0: mutter-math-workaround.patch
-
 BuildRequires: clutter-devel
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -64,7 +61,6 @@ utilities for testing Metacity/Mutter th
 
 %prep
 %setup -q
-%patch0 -p1 -b .math-workaround
 
 %build
 %configure --with-clutter --disable-static
@@ -151,6 +147,10 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.4-1
+- Remove workaround for #520209
+- Update to 2.27.4
+
 * Sat Aug 29 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-3
 - Fix %%preun GConf script to properly be for package removal
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 23:39:15 -0000	1.4
+++ sources	4 Sep 2009 23:10:09 -0000	1.5
@@ -1,3 +1 @@
-973f59241bb1554bc046bd0ac4aea564  mutter-2.27.1.tar.bz2
-9b7e9ffcb14e90c9f31c973383a1a432  mutter-2.27.2.tar.bz2
-59c977f67ba9e507229d4b0088136ebb  mutter-2.27.3.tar.bz2
+694d159af907cf785ab99d03756c6807  mutter-2.27.4.tar.bz2



From emaldonado at fedoraproject.org  Fri Sep  4 23:20:19 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 23:20:19 +0000 (UTC)
Subject: rpms/nss/devel sources,1.26,1.27 .cvsignore,1.25,1.26
Message-ID: <20090904232019.B393B11C0381@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17884

Modified Files:
	sources .cvsignore 
Log Message:
Update to 3.12.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	23 Jun 2009 00:58:55 -0000	1.26
+++ sources	4 Sep 2009 23:20:17 -0000	1.27
@@ -1,2 +1 @@
-bdac5df4a93c67222a60fabc121921c3  nss-pem-20090622.tar.bz2
-bf79d625096067fed3511c0bc6c64c27  nss-3.12.3.99.3-stripped.tar.bz2
+954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	23 Jun 2009 01:00:16 -0000	1.25
+++ .cvsignore	4 Sep 2009 23:20:17 -0000	1.26
@@ -1,2 +1 @@
-nss-pem-20090622.tar.bz2
-nss-3.12.3.99.3-stripped.tar.bz2
+nss-3.12.4-stripped.tar.bz2



From jspaleta at fedoraproject.org  Fri Sep  4 23:22:12 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Fri,  4 Sep 2009 23:22:12 +0000 (UTC)
Subject: rpms/gourmet/F-11 gourmet.spec,1.16,1.17
Message-ID: <20090904232212.508D611C0082@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18475

Modified Files:
	gourmet.spec 
Log Message:
* Fri Sep 4 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-4
- add gnome-python2-gtkspell for spellingchecking plugin support



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/F-11/gourmet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gourmet.spec	25 Aug 2009 16:51:13 -0000	1.16
+++ gourmet.spec	4 Sep 2009 23:22:12 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.15.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
@@ -18,7 +18,7 @@ BuildRequires:  gettext,intltool
 
 Requires: gnome-python2, gnome-python2-gnomeprint
 Requires: metakit
-Requires: pygtk2 
+Requires: pygtk2, gnome-python2-gtkspell 
 Requires: PyRTF,python-sqlalchemy
 Requires: python-imaging, python-sqlite2, pygtk2-libglade, python-reportlab
 %description
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Fri Sep 4 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-4
+- add gnome-python2-gtkspell for spellingchecking plugin support
+
 * Tue Aug 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-3
 - add python-sqlalchemy runtime dep.
 



From emaldonado at fedoraproject.org  Fri Sep  4 23:26:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 23:26:54 +0000 (UTC)
Subject: rpms/nss/devel sources,1.27,1.28
Message-ID: <20090904232654.E6DBA11C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19760

Modified Files:
	sources 
Log Message:
restore the pem source tar file line


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	4 Sep 2009 23:20:17 -0000	1.27
+++ sources	4 Sep 2009 23:26:54 -0000	1.28
@@ -1 +1,2 @@
+bdac5df4a93c67222a60fabc121921c3  nss-pem-20090622.tar.bz2
 954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2



From jistone at fedoraproject.org  Fri Sep  4 23:31:57 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Fri,  4 Sep 2009 23:31:57 +0000 (UTC)
Subject: rpms/systemtap/devel dtrace-default-output-path.patch, NONE,
	1.1 systemtap.spec, 1.51, 1.52
Message-ID: <20090904233157.A85A711C0082@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21323

Modified Files:
	systemtap.spec 
Added Files:
	dtrace-default-output-path.patch 
Log Message:
Fix the default output path of dtrace


dtrace-default-output-path.patch:
 dtrace.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE dtrace-default-output-path.patch ---
commit 1b8fc7c8a443c0a8982133da6cc22a0c986a4ad4
Author: Stan Cox <scox at redhat.com>
Date:   Fri Aug 28 17:16:00 2009 -0400

    Have dtrace use [wd] as the default dir when -o isn't given.
    
    * dtrace.in: Generate the output file from basename of input filename.

diff --git a/dtrace.in b/dtrace.in
index 168bfb1..5365c31 100755
--- a/dtrace.in
+++ b/dtrace.in
@@ -162,6 +162,7 @@ if (build_header == False and build_source == False):
 if (filename == ""):
     if (s_filename != ""):
 	(filename,ext) = os.path.splitext(s_filename)
+        filename = os.path.basename(filename)
     else:
         usage
         sys.exit(1)


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- systemtap.spec	13 Aug 2009 00:17:24 -0000	1.51
+++ systemtap.spec	4 Sep 2009 23:31:57 -0000	1.52
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -49,6 +49,8 @@ BuildRequires: elfutils-devel >= %{elfut
 Requires: crash
 %endif
 
+Patch2: dtrace-default-output-path.patch
+
 %if %{with_docs}
 BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
 # On F10, xmlto's pdf support was broken off into a sub-package,
@@ -161,6 +163,8 @@ find . \( -name configure -o -name confi
 cd ..
 %endif
 
+%patch2 -p1
+
 %build
 
 %if %{with_bundled_elfutils}
@@ -381,6 +385,9 @@ exit 0
 
 
 %changelog
+* Fri Sep  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-4
+- Fix the default output path of dtrace (upstream commit 3a45db13)
+
 * Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
 - Fix uprobes error suppression in %post and %preun (#515870)
   (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)



From firewing at fedoraproject.org  Fri Sep  4 23:55:13 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri,  4 Sep 2009 23:55:13 +0000 (UTC)
Subject: rpms/fwbackups/F-10 fwbackups-1.43.3rc4-stdoutfd.patch, NONE,
	1.1 fwbackups.spec, 1.30, 1.31
Message-ID: <20090904235513.D3FCF11C0082@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27342/F-10

Modified Files:
	fwbackups.spec 
Added Files:
	fwbackups-1.43.3rc4-stdoutfd.patch 
Log Message:
* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
- Add patch to fix stdoufd bug during backups


fwbackups-1.43.3rc4-stdoutfd.patch:
 __init__.py.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE fwbackups-1.43.3rc4-stdoutfd.patch ---
--- a/src/fwbackups/__init__.py.in
+++ b/src/fwbackups/__init__.py.in
@@ -58,14 +58,14 @@ class fwbackupsError(Exception):
   def __str__(self):
     return repr(self.value)
 
-def execute(command, env=None, shell=False):
+def execute(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command, wait for it to finish"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub.wait(), sub.stdout, sub.stderr
 
-def executeSub(command, env=None, shell=False):
+def executeSub(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command in the background"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub
 
 def kill(PID, signal):


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/fwbackups.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fwbackups.spec	22 Aug 2009 20:36:25 -0000	1.30
+++ fwbackups.spec	4 Sep 2009 23:55:13 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.6.rc4%{?dist}
+Release:           0.7.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
@@ -11,6 +11,8 @@ Source0:           http://downloads.diff
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
+Patch0:            fwbackups-1.43.3rc4-stdoutfd.patch
+
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
 BuildRequires:     intltool
@@ -34,6 +36,7 @@ or from the contents of an external fold
 
 %prep
 %setup -q -n %{name}-%{version}rc4
+%patch0 -p1 -b .stdoutfd
 
 %build
 %configure
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}/
 
 %changelog
+* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
+- Add patch to fix stdoufd bug during backups
+
 * Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
 - Update to 1.43.3rc4 (fixes #518690)
 



From firewing at fedoraproject.org  Fri Sep  4 23:55:14 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri,  4 Sep 2009 23:55:14 +0000 (UTC)
Subject: rpms/fwbackups/F-11 fwbackups-1.43.3rc4-stdoutfd.patch, NONE,
	1.1 fwbackups.spec, 1.30, 1.31
Message-ID: <20090904235514.0355E11C0082@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27342/F-11

Modified Files:
	fwbackups.spec 
Added Files:
	fwbackups-1.43.3rc4-stdoutfd.patch 
Log Message:
* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
- Add patch to fix stdoufd bug during backups


fwbackups-1.43.3rc4-stdoutfd.patch:
 __init__.py.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE fwbackups-1.43.3rc4-stdoutfd.patch ---
--- a/src/fwbackups/__init__.py.in
+++ b/src/fwbackups/__init__.py.in
@@ -58,14 +58,14 @@ class fwbackupsError(Exception):
   def __str__(self):
     return repr(self.value)
 
-def execute(command, env=None, shell=False):
+def execute(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command, wait for it to finish"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub.wait(), sub.stdout, sub.stderr
 
-def executeSub(command, env=None, shell=False):
+def executeSub(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command in the background"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub
 
 def kill(PID, signal):


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/fwbackups.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fwbackups.spec	22 Aug 2009 20:25:40 -0000	1.30
+++ fwbackups.spec	4 Sep 2009 23:55:13 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.6.rc4%{?dist}
+Release:           0.7.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
@@ -11,6 +11,8 @@ Source0:           http://downloads.diff
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
+Patch0:            fwbackups-1.43.3rc4-stdoutfd.patch
+
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
 BuildRequires:     intltool
@@ -34,6 +36,7 @@ or from the contents of an external fold
 
 %prep
 %setup -q -n %{name}-%{version}rc4
+%patch0 -p1 -b .stdoutfd
 
 %build
 %configure
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}/
 
 %changelog
+* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
+- Add patch to fix stdoufd bug during backups
+
 * Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
 - Update to 1.43.3rc4 (fixes #518690)
 



From firewing at fedoraproject.org  Fri Sep  4 23:55:15 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri,  4 Sep 2009 23:55:15 +0000 (UTC)
Subject: rpms/fwbackups/devel fwbackups-1.43.3rc4-stdoutfd.patch, NONE,
	1.1 fwbackups.spec, 1.33, 1.34
Message-ID: <20090904235515.2A04411C0082@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27367

Modified Files:
	fwbackups.spec 
Added Files:
	fwbackups-1.43.3rc4-stdoutfd.patch 
Log Message:
* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.8.rc4
- Add patch to fix stdoufd bug during backups


fwbackups-1.43.3rc4-stdoutfd.patch:
 __init__.py.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE fwbackups-1.43.3rc4-stdoutfd.patch ---
--- a/src/fwbackups/__init__.py.in
+++ b/src/fwbackups/__init__.py.in
@@ -58,14 +58,14 @@ class fwbackupsError(Exception):
   def __str__(self):
     return repr(self.value)
 
-def execute(command, env=None, shell=False):
+def execute(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command, wait for it to finish"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub.wait(), sub.stdout, sub.stderr
 
-def executeSub(command, env=None, shell=False):
+def executeSub(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command in the background"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub
 
 def kill(PID, signal):


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/fwbackups.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- fwbackups.spec	22 Aug 2009 20:36:25 -0000	1.33
+++ fwbackups.spec	4 Sep 2009 23:55:15 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.7.rc4%{?dist}
+Release:           0.8.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
@@ -11,6 +11,8 @@ Source0:           http://downloads.diff
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
+Patch0:            fwbackups-1.43.3rc4-stdoutfd.patch
+
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
 BuildRequires:     intltool
@@ -34,6 +36,7 @@ or from the contents of an external fold
 
 %prep
 %setup -q -n %{name}-%{version}rc4
+%patch0 -p1 -b .stdoutfd
 
 %build
 %configure
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}/
 
 %changelog
+* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.8.rc4
+- Add patch to fix stdoufd bug during backups
+
 * Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
 - Update to 1.43.3rc4 (fixes #518690)
 



From emaldonado at fedoraproject.org  Fri Sep  4 23:58:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Sep 2009 23:58:16 +0000 (UTC)
Subject: rpms/nss/devel nss-nolocalsql.patch,1.7,1.8
Message-ID: <20090904235816.A20F011C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28981

Added Files:
	nss-nolocalsql.patch 
Log Message:
restoring the patch to fix ppc and ppc64 coredumps

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: nss-nolocalsql.patch
diff -N nss-nolocalsql.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-nolocalsql.patch	4 Sep 2009 23:58:16 -0000	1.8
@@ -0,0 +1,52 @@
+diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
++++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
+@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
+ DIRS := $(filter-out fortcrypt,$(DIRS))
+ endif
+ 
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-DIRS := sqlite $(DIRS)
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#DIRS := sqlite $(DIRS)
++#endif
++#endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ CSRCS = \
+ 	dbmshim.c \
+diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ EXPORTS = \
+ 	secmodt.h \



From mjakubicek at fedoraproject.org  Sat Sep  5 00:12:29 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat,  5 Sep 2009 00:12:29 +0000 (UTC)
Subject: rpms/gget/devel gget-0.0.4-epiphany.patch, 1.1, 1.2 gget.spec, 1.3,
	1.4
Message-ID: <20090905001229.6D43C11C0082@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/gget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1477

Modified Files:
	gget-0.0.4-epiphany.patch gget.spec 
Log Message:
- Fix FTBFS:
- Disabled epiphany extension as epiphany >= 2.27 has no python support
- Updated gget-0.0.4-epiphany.patch just in case the extension would be enabled
  in the future.
- Added BR: gtk2-devel, desktop-file-utils (was pulled in by epiphany-devel previously)



gget-0.0.4-epiphany.patch:
 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: gget-0.0.4-epiphany.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gget/devel/gget-0.0.4-epiphany.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gget-0.0.4-epiphany.patch	27 Feb 2009 19:11:55 -0000	1.1
+++ gget-0.0.4-epiphany.patch	5 Sep 2009 00:12:29 -0000	1.2
@@ -6,7 +6,7 @@ diff -duru gget-0.0.4.orig/configure gge
  echo "${ECHO_T}" >&6; }
  
 -				VALID_EPIPHANY_VERSIONS="2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
-+				VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
++				VALID_EPIPHANY_VERSIONS="2.27 2.26 2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
  	for v in $VALID_EPIPHANY_VERSIONS; do
  
  		{ echo "$as_me:$LINENO: checking for Epiphany $v" >&5
@@ -18,7 +18,7 @@ diff -duru gget-0.0.4.orig/configure.ac 
  	dnl need to see the handling of the epiphany_version variable in the
  	dnl epiphany extension code
 -	VALID_EPIPHANY_VERSIONS="2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
-+	VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
++	VALID_EPIPHANY_VERSIONS="2.27 2.26 2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
  	for v in $VALID_EPIPHANY_VERSIONS; do
  	
  		AC_MSG_CHECKING([for Epiphany $v])


Index: gget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gget/devel/gget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gget.spec	10 Aug 2009 19:46:00 -0000	1.3
+++ gget.spec	5 Sep 2009 00:12:29 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           gget
 Version:        0.0.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Download Manager for the GNOME desktop
 Group:          Applications/Internet
 License:        GPLv2+
@@ -22,6 +22,8 @@ BuildRequires:  gnome-python2-extras >= 
 BuildRequires:  dbus-python-devel >= 0.82
 BuildRequires:  notify-python >= 0.1.1
 BuildRequires:  intltool
+BuildRequires:  gtk2-devel
+BuildRequires:  desktop-file-utils
 Requires:       python
 Requires:       gnome-python2-gnomedesktop
 Requires:       gnome-python2-extras
@@ -35,22 +37,15 @@ Requires(preun):GConf2
 GGet is a download manager for Gnome. It supports FTP, HTTP,
 and Metalink downloads.
 
-%package epiphany-extension
-Summary:        GGet extensions for epiphany
-Group:          Applications/Internet
-BuildRequires:  epiphany-devel
-Requires:       %{name} = %{version}
-Requires:       epiphany
-
-%description epiphany-extension
-GGet extension for the Epiphany web browser
-
 %prep
 %setup -q
 %patch0 -p1 -b .epiphany
 
 %build
-%configure
+# There is no python support in epiphany >= 2.27
+# Read http://live.gnome.org/TwoPointTwentyseven/ReleaseNotes
+#?and http://bugzilla.gnome.org/show_bug.cgi?id=572602
+%configure --disable-epiphany-extension
 make %{?_smp_mflags}
 
 
@@ -108,11 +103,14 @@ update-mime-database %{_datadir}/mime &>
 %{python_sitelib}/%{name}
 %{_bindir}/%{name}
 
-%files epiphany-extension
-%defattr (-,root,root,-)
-%{_libdir}/epiphany/*/extensions/gget*
-
 %changelog
+* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.0.4-12
+- Fix FTBFS: 
+- Disabled epiphany extension as epiphany >= 2.27 has no python support
+- Updated gget-0.0.4-epiphany.patch just in case the extension would be enabled
+  in the future.
+- Added BR: gtk2-devel, desktop-file-utils (was pulled in by epiphany-devel previously)
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.4-11
 - Use bzipped upstream tarball.
 



From otaylor at fedoraproject.org  Sat Sep  5 00:35:37 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat,  5 Sep 2009 00:35:37 +0000 (UTC)
Subject: rpms/gnome-shell/devel .cvsignore, 1.3, 1.4 gnome-shell.spec, 1.5, 
	1.6 sources, 1.3, 1.4
Message-ID: <20090905003537.3523711C0082@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12208

Modified Files:
	.cvsignore gnome-shell.spec sources 
Log Message:
* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.2-1
- Update to 2.27.2
- Add an explicit dep on gobject-introspection 0.6.5 which is required 
  for the new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Aug 2009 00:30:24 -0000	1.3
+++ .cvsignore	5 Sep 2009 00:35:36 -0000	1.4
@@ -1,2 +1,3 @@
 gnome-shell-2.27.0.tar.bz2
 gnome-shell-2.27.1.tar.bz2
+gnome-shell-2.27.2.tar.bz2


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-shell.spec	29 Aug 2009 22:01:57 -0000	1.5
+++ gnome-shell.spec	5 Sep 2009 00:35:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        2.27.1
-Release:        4
+Version:        2.27.2
+Release:        1
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -10,6 +10,7 @@ Source0:        http://ftp.gnome.org/pub
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %define clutter_version 1.0.0
+%define gobject_introspection_version 0.6.5
 %define mutter_version 2.27.3
 
 BuildRequires:  clutter-devel >= %{clutter_version}
@@ -20,6 +21,7 @@ BuildRequires:  gjs-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gnome-desktop-devel
 BuildRequires:  gnome-menus-devel
+BuildRequires:  gobject-introspection > %{gobject_introspection_version}
 # for screencast recorder functionality
 BuildRequires:  gstreamer-devel
 BuildRequires:  gtk2-devel
@@ -34,6 +36,7 @@ Requires:       desktop-effects
 Requires:       GConf2
 # wrapper script uses to restart old GNOME session if run --replace
 # from the command line
+Requires:       gobject-introspection > %{gobject_introspection_version}
 Requires:       gnome-python2-gconf
 Requires:       pygobject2
 # wrapper script uses to figure out available GLX capabilities
@@ -115,6 +118,11 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.2-1
+- Update to 2.27.2
+- Add an explicit dep on gobject-introspection 0.6.5 which is required 
+  for the new version
+
 * Sat Aug 29 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-4
 - Fix GConf %%preun script to properly be for package removal
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Aug 2009 00:30:24 -0000	1.3
+++ sources	5 Sep 2009 00:35:37 -0000	1.4
@@ -1 +1 @@
-545c430995be8cd3c7b997f244135135  gnome-shell-2.27.1.tar.bz2
+a24dfca62f92623ceaca66bdc99ceda1  gnome-shell-2.27.2.tar.bz2



From cebbert at fedoraproject.org  Sat Sep  5 00:36:37 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat,  5 Sep 2009 00:36:37 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1765,1.1766
Message-ID: <20090905003637.E141B11C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12501

Modified Files:
	kernel.spec 
Log Message:
Fix kernel build errors when building firmware by removing the
  .config file before that step and restoring it afterward.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -p -r1.1765 -r1.1766
--- kernel.spec	3 Sep 2009 21:47:33 -0000	1.1765
+++ kernel.spec	5 Sep 2009 00:36:37 -0000	1.1766
@@ -772,7 +772,6 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
-Buildarch: noarch
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -979,6 +978,12 @@ ApplyOptionalPatch()
   fi
 }
 
+# we don't want a .config file when building firmware: it just confuses the build system
+%define build_firmware \
+   mv .config .config.firmware_save \
+   make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install \
+   mv .config.firmware_save .config
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1773,7 +1778,7 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 %endif
 
 %if %{with_firmware}
-make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+%{build_firmware}
 %endif
 
 %if %{with_bootwrapper}
@@ -1783,7 +1788,7 @@ make DESTDIR=$RPM_BUILD_ROOT bootwrapper
 %if %{with_dracut}
 %if !%{with_firmware}
 # dracut needs the firmware files
-    make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+    %{build_firmware}
 %endif
     for i in $RPM_BUILD_ROOT/lib/modules/*; do
 	[ -d $i ] || continue
@@ -2022,6 +2027,10 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.203.rc8.git2
+- Fix kernel build errors when building firmware by removing the
+  .config file before that step and restoring it afterward.
+
 * Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
 - drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
   disconnected.



From otaylor at fedoraproject.org  Sat Sep  5 00:42:24 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat,  5 Sep 2009 00:42:24 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.6,1.7
Message-ID: <20090905004224.7D2F911C0082@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14346

Modified Files:
	gnome-shell.spec 
Log Message:
* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.2-
- Test for gobject-introspection version should be >= not >



Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-shell.spec	5 Sep 2009 00:35:36 -0000	1.6
+++ gnome-shell.spec	5 Sep 2009 00:42:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.27.2
-Release:        1
+Release:        2
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -21,7 +21,7 @@ BuildRequires:  gjs-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gnome-desktop-devel
 BuildRequires:  gnome-menus-devel
-BuildRequires:  gobject-introspection > %{gobject_introspection_version}
+BuildRequires:  gobject-introspection >= %{gobject_introspection_version}
 # for screencast recorder functionality
 BuildRequires:  gstreamer-devel
 BuildRequires:  gtk2-devel
@@ -36,7 +36,7 @@ Requires:       desktop-effects
 Requires:       GConf2
 # wrapper script uses to restart old GNOME session if run --replace
 # from the command line
-Requires:       gobject-introspection > %{gobject_introspection_version}
+Requires:       gobject-introspection >= %{gobject_introspection_version}
 Requires:       gnome-python2-gconf
 Requires:       pygobject2
 # wrapper script uses to figure out available GLX capabilities
@@ -118,6 +118,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.2-2
+- Test for gobject-introspection version should be >= not >
+
 * Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.2-1
 - Update to 2.27.2
 - Add an explicit dep on gobject-introspection 0.6.5 which is required 



From cebbert at fedoraproject.org  Sat Sep  5 00:55:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat,  5 Sep 2009 00:55:07 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1727,1.1728
Message-ID: <20090905005507.25E1511C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17812

Modified Files:
	kernel.spec 
Log Message:
Fix build system getting confused during firmware install.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1727
retrieving revision 1.1728
diff -u -p -r1.1727 -r1.1728
--- kernel.spec	4 Sep 2009 17:47:08 -0000	1.1727
+++ kernel.spec	5 Sep 2009 00:55:06 -0000	1.1728
@@ -1774,7 +1774,10 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 %endif
 
 %if %{with_firmware}
+# having a .config file present during firmware install creates confusion
+mv .config .config.firmware_save
 make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+mv .config.firmware_save .config
 %endif
 
 %if %{with_bootwrapper}
@@ -1981,6 +1984,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-49
+- Fix build system getting confused during firmware install.
+
 * Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-48
 - Added additional fixes needed for #514787:
   linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch



From emaldonado at fedoraproject.org  Sat Sep  5 00:57:47 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 00:57:47 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.109,1.110
Message-ID: <20090905005747.91BE711C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19077

Modified Files:
	nss.spec 
Log Message:
update to 3.12.4


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- nss.spec	1 Sep 2009 00:11:24 -0000	1.109
+++ nss.spec	5 Sep 2009 00:57:47 -0000	1.110
@@ -1,12 +1,12 @@
 %global nspr_version 4.8
-%global nss_util_version 3.12.3.99.3
-%global nss_softokn_version 3.12.3.99.3
+%global nss_util_version 3.12.4
+%global nss_softokn_version 3.12.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.3.99.3
-Release:          30%{?dist}
+Version:          3.12.4
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -32,13 +32,9 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source12:         %{name}-pem-20090622.tar.bz2
-Source13:         PayPalEE.cert
-Source14:         PayPalICA.cert
 
-Patch1:           nss-no-rpath.patch
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           nss-stubs-bug502133.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -91,14 +87,8 @@ low level services.
 %setup -q
 %setup -q -T -D -n %{name}-%{version} -a 12
 
-%patch1 -p0
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .502133
-
-#need newer certs to make test suite work
-#remove once we update to NSS 3.12.4
-cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
 
 
 %build
@@ -439,6 +429,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Sep 01 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
+- Update to 3.12.4
+
 * Mon Aug 31 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-30
 - Fix FORTIFY_SOURCE buffer overflows in test suite on ppc and ppc64 - bug 519766
 - Fixed requires and buildrequires as per recommendations in spec file review



From mjakubicek at fedoraproject.org  Sat Sep  5 01:00:32 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat,  5 Sep 2009 01:00:32 +0000 (UTC)
Subject: rpms/smart/devel smart.spec,1.44,1.45
Message-ID: <20090905010032.2B2E311C02C8@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21266

Modified Files:
	smart.spec 
Log Message:
- Fix FTBFS: accept automake 1.11




Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/smart.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- smart.spec	27 Jul 2009 04:28:23 -0000	1.44
+++ smart.spec	5 Sep 2009 01:00:31 -0000	1.45
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.2
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -87,6 +87,8 @@ if test -f /%{_lib}/security/pam_stack.s
   perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' smart.pam
   touch -r %{SOURCE2} smart.pam
 fi
+# Reported as https://bugs.launchpad.net/smart/+bug/424642
+sed -i 's#automake\*1\.10\*#automake*1.10* | automake*1.11*#' contrib/ksmarttray/admin/cvs.sh
 
 %build
 CFLAGS="%{optflags}"
@@ -207,6 +209,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.2-66
+- Fix FTBFS: accept automake 1.11
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-65
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sat Sep  5 01:01:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  5 Sep 2009 01:01:20 +0000 (UTC)
Subject: rpms/gnupg2/F-11 .cvsignore, 1.30, 1.31 gnupg2.spec, 1.92,
	1.93 sources, 1.32, 1.33
Message-ID: <20090905010120.811EC11C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22234

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Fri Sep 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-1
- gnupg-2.0.13
- Unable to use gpg-agent + input methods (#228953)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	22 Jun 2009 16:55:57 -0000	1.30
+++ .cvsignore	5 Sep 2009 01:01:20 -0000	1.31
@@ -1,2 +1,2 @@
-gnupg-2.0.12.tar.bz2
-gnupg-2.0.12.tar.bz2.sig
+gnupg-2.0.13.tar.bz2
+gnupg-2.0.13.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-11/gnupg2.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- gnupg2.spec	22 Jun 2009 16:55:57 -0000	1.92
+++ gnupg2.spec	5 Sep 2009 01:01:20 -0000	1.93
@@ -1,16 +1,19 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.12
+Version: 2.0.13
 Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig
+# svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
+#Source0: gnupg2-20090809svn.tar.bz2
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#BuildRequires: automake libtool texinfo transfig
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
@@ -66,7 +69,7 @@ dependency on other modules at run and b
 
 
 %prep
-%setup -q -n gnupg-%{version}%{?pre}
+%setup -q -n gnupg-%{version}
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
@@ -77,6 +80,10 @@ dependency on other modules at run and b
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
+# fix temp broken docs
+#sed -i -e 's/^@include version.texi//' doc/gnupg.texi
+#./autogen.sh
+
 
 %build
 
@@ -122,7 +129,7 @@ rm -f %{buildroot}%{_infodir}/dir
 # need scratch gpg database for tests
 mkdir -p $HOME/.gnupg
 # some gpg2 tests (still) FAIL on non i386 platforms
-make -k check ||:
+make -k check 
 
 
 %post
@@ -167,6 +174,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-1
+- gnupg-2.0.13
+- Unable to use gpg-agent + input methods (#228953)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.12-1
 - gnupg-2.0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	22 Jun 2009 16:55:57 -0000	1.32
+++ sources	5 Sep 2009 01:01:20 -0000	1.33
@@ -1,2 +1,2 @@
-4718d8a8cd3eac100951d8b162cf537b  gnupg-2.0.12.tar.bz2
-88e8d5d64cff885d0e6a29ffb71d1537  gnupg-2.0.12.tar.bz2.sig
+41bd7629d815b90c15b37bb31c2f07c0  gnupg-2.0.13.tar.bz2
+39dde2ae7b98ffa2100c31b368f2e2ec  gnupg-2.0.13.tar.bz2.sig



From cwickert at fedoraproject.org  Sat Sep  5 01:16:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Sep 2009 01:16:55 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, 1.24,
	1.25
Message-ID: <20090905011655.386C311C0082@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29724

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
minor cleanup


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xfce4-clipman-plugin.spec	4 Sep 2009 22:04:49 -0000	1.24
+++ xfce4-clipman-plugin.spec	5 Sep 2009 01:16:55 -0000	1.25
@@ -72,13 +72,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-#%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_libexecdir}/xfce4/panel-plugins/%{name}
 %config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml
 %{_bindir}/xfce4-clipman
 %{_bindir}/xfce4-clipman-settings
 %{_bindir}/xfce4-popup-clipman
-%{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/xfce4/doc/*/images/clipman-*.png



From cebbert at fedoraproject.org  Sat Sep  5 01:22:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat,  5 Sep 2009 01:22:31 +0000 (UTC)
Subject: rpms/kernel/devel hdpvr-ir-enable.patch,1.4,1.5
Message-ID: <20090905012231.5D28311C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31459

Modified Files:
	hdpvr-ir-enable.patch 
Log Message:
quickfix use of LINUX_VERSION_CODE causing compile failure

hdpvr-ir-enable.patch:
 Makefile     |    4 --
 hdpvr-core.c |   12 ++------
 hdpvr-i2c.c  |   88 +++++++++++++++++++++++++++++++++++++++++------------------
 hdpvr.h      |    2 -
 4 files changed, 68 insertions(+), 38 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hdpvr-ir-enable.patch	3 Sep 2009 21:02:14 -0000	1.4
+++ hdpvr-ir-enable.patch	5 Sep 2009 01:22:31 -0000	1.5
@@ -142,7 +142,7 @@ index c4b5d15..7cd977f 100644
 +	.class		= I2C_CLASS_TV_ANALOG,
 +};
 +
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
++#if 1
 +static struct i2c_board_info hdpvr_i2c_board_info = {
 +	I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
 +	I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
@@ -203,7 +203,7 @@ index c4b5d15..7cd977f 100644
 +	if (retval)
 +		goto error;
 +
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
++#if 1
 +	i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
 +#endif
  



From mclasen at fedoraproject.org  Sat Sep  5 01:50:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Sep 2009 01:50:14 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.114, 1.115 glib2.spec, 1.215,
	1.216 sources, 1.116, 1.117
Message-ID: <20090905015015.07C2C11C0380@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11224

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.21.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- .cvsignore	24 Aug 2009 19:14:29 -0000	1.114
+++ .cvsignore	5 Sep 2009 01:50:14 -0000	1.115
@@ -1 +1 @@
-glib-2.21.5.tar.bz2
+glib-2.21.6.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- glib2.spec	24 Aug 2009 19:14:29 -0000	1.215
+++ glib2.spec	5 Sep 2009 01:50:14 -0000	1.216
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.21.5
+Version: 2.21.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Sep  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.21.6-1
+- Update to 2.21.6
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.21.5-1
 - Update to 2.21.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	24 Aug 2009 19:14:29 -0000	1.116
+++ sources	5 Sep 2009 01:50:14 -0000	1.117
@@ -1 +1 @@
-5f3f19c4a8088c51e21cad5b8ea166e5  glib-2.21.5.tar.bz2
+3b0452fbd877db53dafabdc074600cb8  glib-2.21.6.tar.bz2



From cebbert at fedoraproject.org  Sat Sep  5 02:40:59 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat,  5 Sep 2009 02:40:59 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.31.bz2.sign, NONE,
	1.1.2.1 patch-2.6.27.32-rc1.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.18, 1.960.2.19 kernel.spec, 1.1206.2.85,
	1.1206.2.86 linux-2.6-upstream-reverts.patch, 1.6.2.1,
	1.6.2.2 sources, 1.922.2.18, 1.922.2.19 upstream, 1.834.2.18,
	1.834.2.19
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch,
	1.1.2.2, NONE kvm-make-efer-reads-safe-when-efer-does-not-exist.patch,
	1.1.2.1,
	NONE kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch,
	1.1.2.1, NONE linux-2.6-cdrom-door-status.patch, 1.4.2.1,
	NONE linux-2.6-char-remove-low_latency-nozomi-mxser.patch, 1.1.2.1,
	NONE linux-2.6-parport-quickfix-the-proc-registration-bug.patch,
	1.1.2.2, NONE linux-2.6-usb-remove-low-latency-hack.patch,
	1.1.2.2, NONE patch-2.6.27.30.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090905024059.A6E0E11C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24288

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.31.bz2.sign patch-2.6.27.32-rc1.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch 
	kvm-make-efer-reads-safe-when-efer-does-not-exist.patch 
	kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch 
	linux-2.6-cdrom-door-status.patch 
	linux-2.6-char-remove-low_latency-nozomi-mxser.patch 
	linux-2.6-parport-quickfix-the-proc-registration-bug.patch 
	linux-2.6-usb-remove-low-latency-hack.patch 
	patch-2.6.27.30.bz2.sign 
Log Message:
2.6.27.31: no functional changes, update had been manually applied already.
2.6.27.32-rc1: drop upstream patches:
  linux-2.6-usb-remove-low-latency-hack.patch
  linux-2.6-char-remove-low_latency-nozomi-mxser.patch
  linux-2.6-cdrom-door-status.patch
  kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
  kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
  linux-2.6-parport-quickfix-the-proc-registration-bug.patch
  do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch


--- NEW FILE patch-2.6.27.31.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKiXncyGugalF9Dw4RAkktAJ0WJtXGLmUEhW9gQNSQmA6zUVeuyACghj3Z
6NgX4eOyjHeldWCdffQTYeY=
=Y1UN
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.27.32-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKoXZYyGugalF9Dw4RApDgAJ4/jmoWGSo15z3T4g3SJ2q2chCkggCghvk4
2hJxkClG4DilRWTIaXJSsbE=
=KZq0
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.18
retrieving revision 1.960.2.19
diff -u -p -r1.960.2.18 -r1.960.2.19
--- .cvsignore	17 Aug 2009 02:11:54 -0000	1.960.2.18
+++ .cvsignore	5 Sep 2009 02:40:57 -0000	1.960.2.19
@@ -4,4 +4,5 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.30.bz2
+patch-2.6.27.31.bz2
+patch-2.6.27.32-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.85
retrieving revision 1.1206.2.86
diff -u -p -r1.1206.2.85 -r1.1206.2.86
--- kernel.spec	31 Aug 2009 19:24:37 -0000	1.1206.2.85
+++ kernel.spec	5 Sep 2009 02:40:58 -0000	1.1206.2.86
@@ -39,9 +39,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 30
+%define stable_update 32
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -639,8 +639,6 @@ Patch454: linux-2.6-input.git-i8042-add-
 # 490250
 Patch455: linux-2.6-input.git-i8042-add-vostro-1510-to-nomux.patch
 
-Patch458: linux-2.6-char-remove-low_latency-nozomi-mxser.patch
-
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -673,10 +671,6 @@ Patch1101: linux-2.6-default-mmf_dump_el
 Patch1515: linux-2.6.27-lirc.patch
 Patch1520: linux-2.6-hdpvr.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
-
 # nouveau + drm fixes
 Patch1800: nvidia-agp.patch
 Patch1810: drm-next.patch
@@ -736,8 +730,6 @@ Patch2201: linux-2.6-firewire-git-pendin
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 Patch2301: linux-2.6-usb-option-increase-outgoing-buffers.patch
-# kill more misuse of tty->low_latency flag
-Patch2302: linux-2.6-usb-remove-low-latency-hack.patch
 
 # Add fips_enable flag
 Patch2400: linux-2.6-crypto-fips_enable.patch
@@ -780,16 +772,11 @@ Patch3140: linux-2.6.27-fix-video_open.p
 # Fix simultaneous use of hvr-1800 and pvr-500 (#480728)
 Patch3141: v4l-dvb-fix-cx25840-firmware-load.patch
 
-Patch4000: kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
-Patch4010: kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
-
-Patch11000: linux-2.6-parport-quickfix-the-proc-registration-bug.patch
 Patch11010: linux-2.6-dev-zero-avoid-oom-lockup.patch
 
 Patch12000: linux-2.6-virtio-blk-dont-bounce-highmem-requests.patch
 
 Patch13000: make-mmap_min_addr-suck-less.patch
-Patch13001: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
 %endif
 
@@ -1205,7 +1192,6 @@ ApplyPatch linux-2.6.27.9-ext4-cap-check
 # USB
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-option-increase-outgoing-buffers.patch
-ApplyPatch linux-2.6-usb-remove-low-latency-hack.patch
 
 # Add the ability to turn FIPS-compliant mode on or off at boot
 ApplyPatch linux-2.6-crypto-fips_enable.patch
@@ -1274,8 +1260,6 @@ ApplyPatch linux-2.6.27-hwmon-applesmc-2
 ApplyPatch linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
 # 490250
 ApplyPatch linux-2.6-input.git-i8042-add-vostro-1510-to-nomux.patch
-# from f-11: fix oopses in nozomi and mxser driver
-ApplyPatch linux-2.6-char-remove-low_latency-nozomi-mxser.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1335,10 +1319,6 @@ ApplyPatch linux-2.6.27-lirc.patch
 # http://hg.jannau.net/hdpvr/
 ApplyPatch linux-2.6-hdpvr.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 linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
@@ -1418,12 +1398,6 @@ ApplyPatch disable-p4-cpufreq-ui.patch
 ApplyPatch linux-2.6.27-fix-video_open.patch
 ApplyPatch v4l-dvb-fix-cx25840-firmware-load.patch
 
-ApplyPatch kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
-ApplyPatch kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
-
-# finally fix the proc registration bug (F11#503773 and others)
-ApplyPatch linux-2.6-parport-quickfix-the-proc-registration-bug.patch
-
 ApplyPatch linux-2.6-dev-zero-avoid-oom-lockup.patch
 
 # fix oops with virtio block driver requests (#510304)
@@ -1431,8 +1405,6 @@ ApplyPatch linux-2.6-virtio-blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
-ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2008,6 +1980,17 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.86.rc1
+- 2.6.27.31: no functional changes, update had been manually applied already.
+- 2.6.27.32-rc1: drop upstream patches:
+  linux-2.6-usb-remove-low-latency-hack.patch
+  linux-2.6-char-remove-low_latency-nozomi-mxser.patch
+  linux-2.6-cdrom-door-status.patch
+  kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
+  kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
+  linux-2.6-parport-quickfix-the-proc-registration-bug.patch
+  do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
 * Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
 - Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
 

linux-2.6-upstream-reverts.patch:
 firewire/fw-cdev.c        |    6 +++---
 firewire/fw-sbp2.c        |   38 +++++++++++++++++++++++++++-----------
 firewire/fw-topology.c    |    6 ++++--
 firewire/fw-transaction.h |    2 +-
 gpu/drm/i915/i915_dma.c   |    2 +-
 5 files changed, 36 insertions(+), 18 deletions(-)

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.1 -r1.6.2.2
--- linux-2.6-upstream-reverts.patch	17 Aug 2009 04:43:07 -0000	1.6.2.1
+++ linux-2.6-upstream-reverts.patch	5 Sep 2009 02:40:58 -0000	1.6.2.2
@@ -382,45 +382,3 @@ Signed-off-by: Greg Kroah-Hartman <gregk
  	int gap_count;
  	bool beta_repeaters_present;
  
-From 69130c7cf96ea853dc5be599dd6a4b98907d39cc Mon Sep 17 00:00:00 2001
-From: Eric Sandeen <sandeen at redhat.com>
-Date: Thu, 6 Aug 2009 15:07:37 -0700
-Subject: compat_ioctl: hook up compat handler for FIEMAP ioctl
-
-From: Eric Sandeen <sandeen at redhat.com>
-
-commit 69130c7cf96ea853dc5be599dd6a4b98907d39cc upstream.
-
-The FIEMAP_IOC_FIEMAP mapping ioctl was missing a 32-bit compat handler,
-which means that 32-bit suerspace on 64-bit kernels cannot use this ioctl
-command.
-
-The structure is nicely aligned, padded, and sized, so it is just this
-simple.
-
-Tested w/ 32-bit ioctl tester (from Josef) on a 64-bit kernel on ext4.
-
-Signed-off-by: Eric Sandeen <sandeen at redhat.com>
-Cc: <linux-ext4 at vger.kernel.org>
-Cc: Mark Lord <lkml at rtr.ca>
-Cc: Arnd Bergmann <arnd at arndb.de>
-Cc: Josef Bacik <josef at redhat.com>
-Cc: Jan Kara <jack at suse.cz>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- fs/compat_ioctl.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/fs/compat_ioctl.c
-+++ b/fs/compat_ioctl.c
-@@ -1910,6 +1910,7 @@ COMPATIBLE_IOCTL(FIONCLEX)
- COMPATIBLE_IOCTL(FIOASYNC)
- COMPATIBLE_IOCTL(FIONBIO)
- COMPATIBLE_IOCTL(FIONREAD)  /* This is also TIOCINQ */
-+COMPATIBLE_IOCTL(FS_IOC_FIEMAP)
- /* 0x00 */
- COMPATIBLE_IOCTL(FIBMAP)
- COMPATIBLE_IOCTL(FIGETBSZ)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.18
retrieving revision 1.922.2.19
diff -u -p -r1.922.2.18 -r1.922.2.19
--- sources	17 Aug 2009 02:11:54 -0000	1.922.2.18
+++ sources	5 Sep 2009 02:40:59 -0000	1.922.2.19
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-f55adbeb6e3a44e814ce2a192a9ecf8b  patch-2.6.27.30.bz2
+adfb289efee5dce61e532678317c0b4c  patch-2.6.27.31.bz2
+6b9c084b6771c1a96c5e42d4218f9de9  patch-2.6.27.32-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.18
retrieving revision 1.834.2.19
diff -u -p -r1.834.2.18 -r1.834.2.19
--- upstream	17 Aug 2009 02:11:55 -0000	1.834.2.18
+++ upstream	5 Sep 2009 02:40:59 -0000	1.834.2.19
@@ -1,3 +1,4 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.30.bz2
+patch-2.6.27.31.bz2
+patch-2.6.27.32-rc1.bz2
 


--- do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch DELETED ---


--- kvm-make-efer-reads-safe-when-efer-does-not-exist.patch DELETED ---


--- kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch DELETED ---


--- linux-2.6-cdrom-door-status.patch DELETED ---


--- linux-2.6-char-remove-low_latency-nozomi-mxser.patch DELETED ---


--- linux-2.6-parport-quickfix-the-proc-registration-bug.patch DELETED ---


--- linux-2.6-usb-remove-low-latency-hack.patch DELETED ---


--- patch-2.6.27.30.bz2.sign DELETED ---



From cebbert at fedoraproject.org  Sat Sep  5 02:53:41 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat,  5 Sep 2009 02:53:41 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-nfsd-report-short-writes-fix.patch, NONE,
	1.1.2.2 linux-2.6-nfsd-report-short-writes.patch, NONE,
	1.1.2.2 kernel.spec, 1.1206.2.86, 1.1206.2.87
Message-ID: <20090905025341.75B1A11C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28303

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-nfsd-report-short-writes-fix.patch 
	linux-2.6-nfsd-report-short-writes.patch 
Log Message:
Copy fix for NFS short write reporting from F-10 2.6.29 kernel (#493500)

linux-2.6-nfsd-report-short-writes-fix.patch:
 vfs.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-nfsd-report-short-writes-fix.patch ---
From: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Tue, 19 May 2009 04:03:15 +0000 (+0800)
Subject: nfsd: fix hung up of nfs client while sync write data to nfs server
X-Git-Tag: v2.6.30-rc8~20^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a0d24b295aed7a9daf4ca36bd4784e4d40f82303

nfsd: fix hung up of nfs client while sync write data to nfs server

Commit 'Short write in nfsd becomes a full write to the client'
(31dec2538e45e9fff2007ea1f4c6bae9f78db724) broken the sync write.
With the following commands to reproduce:

  $ mount -t nfs -o sync 192.168.0.21:/nfsroot /mnt
  $ cd /mnt
  $ echo aaaa > temp.txt

Then nfs client is hung up.

In SYNC mode the server alaways return the write count 0 to the
client. This is because the value of host_err in nfsd_vfs_write()
will be overwrite in SYNC mode by 'host_err=nfsd_sync(file);',
and then we return host_err(which is now 0) as write count.

This patch fixed the problem.

Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
---

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 6c68ffd..b660435 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1015,6 +1015,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
 	set_fs(oldfs);
 	if (host_err >= 0) {
+		*cnt = host_err;
 		nfsdstats.io_write += host_err;
 		fsnotify_modify(file->f_path.dentry);
 	}
@@ -1060,10 +1061,9 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	}
 
 	dprintk("nfsd: write complete host_err=%d\n", host_err);
-	if (host_err >= 0) {
+	if (host_err >= 0)
 		err = 0;
-		*cnt = host_err;
-	} else
+	else
 		err = nfserrno(host_err);
 out:
 	return err;

linux-2.6-nfsd-report-short-writes.patch:
 fs/nfsd/nfs3proc.c        |    5 +++--
 fs/nfsd/nfs4proc.c        |    7 +++++--
 fs/nfsd/nfsproc.c         |    3 ++-
 fs/nfsd/vfs.c             |   13 +++++++------
 include/linux/nfsd/nfsd.h |    2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-nfsd-report-short-writes.patch ---
From: David Shaw <dshaw at jabberwocky.com>
Date: Fri, 6 Mar 2009 01:16:14 +0000 (-0500)
Subject: Short write in nfsd becomes a full write to the client
X-Git-Tag: v2.6.30-rc1~183^2~52
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=31dec2538e45e9fff2007ea1f4c6bae9f78db724

Short write in nfsd becomes a full write to the client

If a filesystem being written to via NFS returns a short write count
(as opposed to an error) to nfsd, nfsd treats that as a success for
the entire write, rather than the short count that actually succeeded.

For example, given a 8192 byte write, if the underlying filesystem
only writes 4096 bytes, nfsd will ack back to the nfs client that all
8192 bytes were written.  The nfs client does have retry logic for
short writes, but this is never called as the client is told the
complete write succeeded.

There are probably other ways it could happen, but in my case it
happened with a fuse (filesystem in userspace) filesystem which can
rather easily have a partial write.

Here is a patch to properly return the short write count to the
client.

Signed-off-by: David Shaw <dshaw at jabberwocky.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
---

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 579ce8c..7c9fe83 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -203,6 +203,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp,
 					 struct nfsd3_writeres  *resp)
 {
 	__be32	nfserr;
+	unsigned long cnt = argp->len;
 
 	dprintk("nfsd: WRITE(3)    %s %d bytes at %ld%s\n",
 				SVCFH_fmt(&argp->fh),
@@ -215,9 +216,9 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp,
 	nfserr = nfsd_write(rqstp, &resp->fh, NULL,
 				   argp->offset,
 				   rqstp->rq_vec, argp->vlen,
-				   argp->len,
+				   &cnt,
 				   &resp->committed);
-	resp->count = argp->count;
+	resp->count = cnt;
 	RETURN_STATUS(nfserr);
 }
 
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 77f584f..283d77a 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -682,6 +682,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	struct file *filp = NULL;
 	u32 *p;
 	__be32 status = nfs_ok;
+	unsigned long cnt;
 
 	/* no need to check permission - this will be done in nfsd_write() */
 
@@ -700,7 +701,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 		return status;
 	}
 
-	write->wr_bytes_written = write->wr_buflen;
+	cnt = write->wr_buflen;
 	write->wr_how_written = write->wr_stable_how;
 	p = (u32 *)write->wr_verifier.data;
 	*p++ = nfssvc_boot.tv_sec;
@@ -708,10 +709,12 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
 	status =  nfsd_write(rqstp, &cstate->current_fh, filp,
 			     write->wr_offset, rqstp->rq_vec, write->wr_vlen,
-			     write->wr_buflen, &write->wr_how_written);
+			     &cnt, &write->wr_how_written);
 	if (filp)
 		fput(filp);
 
+	write->wr_bytes_written = cnt;
+
 	if (status == nfserr_symlink)
 		status = nfserr_inval;
 	return status;
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 6f7f263..e298e26 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -180,6 +180,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp,
 {
 	__be32	nfserr;
 	int	stable = 1;
+	unsigned long cnt = argp->len;
 
 	dprintk("nfsd: WRITE    %s %d bytes at %d\n",
 		SVCFH_fmt(&argp->fh),
@@ -188,7 +189,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp,
 	nfserr = nfsd_write(rqstp, fh_copy(&resp->fh, &argp->fh), NULL,
 				   argp->offset,
 				   rqstp->rq_vec, argp->vlen,
-				   argp->len,
+			           &cnt,
 				   &stable);
 	return nfsd_return_attrs(nfserr, resp);
 }
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 0c07629..54404d7 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -960,7 +960,7 @@ static void kill_suid(struct dentry *dentry)
 static __be32
 nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 				loff_t offset, struct kvec *vec, int vlen,
-	   			unsigned long cnt, int *stablep)
+				unsigned long *cnt, int *stablep)
 {
 	struct svc_export	*exp;
 	struct dentry		*dentry;
@@ -974,7 +974,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	err = nfserr_perm;
 
 	if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
-		(!lock_may_write(file->f_path.dentry->d_inode, offset, cnt)))
+		(!lock_may_write(file->f_path.dentry->d_inode, offset, *cnt)))
 		goto out;
 #endif
 
@@ -1006,7 +1006,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
 	set_fs(oldfs);
 	if (host_err >= 0) {
-		nfsdstats.io_write += cnt;
+		nfsdstats.io_write += host_err;
 		fsnotify_modify(file->f_path.dentry);
 	}
 
@@ -1051,9 +1051,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	}
 
 	dprintk("nfsd: write complete host_err=%d\n", host_err);
-	if (host_err >= 0)
+	if (host_err >= 0) {
 		err = 0;
-	else 
+		*cnt = host_err;
+	} else
 		err = nfserrno(host_err);
 out:
 	return err;
@@ -1095,7 +1096,7 @@ out:
  */
 __be32
 nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
-		loff_t offset, struct kvec *vec, int vlen, unsigned long cnt,
+		loff_t offset, struct kvec *vec, int vlen, unsigned long *cnt,
 		int *stablep)
 {
 	__be32			err = 0;
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 16f7b40..54beda1 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -105,7 +105,7 @@ void		nfsd_close(struct file *);
 __be32 		nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
 				loff_t, struct kvec *, int, unsigned long *);
 __be32 		nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
-				loff_t, struct kvec *,int, unsigned long, int *);
+				loff_t, struct kvec *,int, unsigned long *, int *);
 __be32		nfsd_readlink(struct svc_rqst *, struct svc_fh *,
 				char *, int *);
 __be32		nfsd_symlink(struct svc_rqst *, struct svc_fh *,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.86
retrieving revision 1.1206.2.87
diff -u -p -r1.1206.2.86 -r1.1206.2.87
--- kernel.spec	5 Sep 2009 02:40:58 -0000	1.1206.2.86
+++ kernel.spec	5 Sep 2009 02:53:39 -0000	1.1206.2.87
@@ -778,6 +778,10 @@ Patch12000: linux-2.6-virtio-blk-dont-bo
 
 Patch13000: make-mmap_min_addr-suck-less.patch
 
+# fix NFS short writes (#493500)
+Patch14000: linux-2.6-nfsd-report-short-writes-fix.patch
+Patch14001: linux-2.6-nfsd-report-short-writes.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1405,6 +1409,10 @@ ApplyPatch linux-2.6-virtio-blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
+# fix NFS short writes (#493500)
+ApplyPatch linux-2.6-nfsd-report-short-writes.patch
+ApplyPatch linux-2.6-nfsd-report-short-writes-fix.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1980,6 +1988,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.87.rc1
+- Copy fix for NFS short write reporting from F-10 2.6.29 kernel (#493500)
+
 * Fri Sep 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.86.rc1
 - 2.6.27.31: no functional changes, update had been manually applied already.
 - 2.6.27.32-rc1: drop upstream patches:



From kkofler at fedoraproject.org  Sat Sep  5 02:54:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Sep 2009 02:54:00 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.94,1.95
Message-ID: <20090905025400.089C211C0082@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28663/devel

Modified Files:
	kde-l10n.spec 
Log Message:
Enable subpackage for Croatian so this actually builds.


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kde-l10n.spec	4 Sep 2009 23:05:27 -0000	1.94
+++ kde-l10n.spec	5 Sep 2009 02:53:59 -0000	1.95
@@ -1111,12 +1111,10 @@ rm -rf %{buildroot}
 %lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
 %lang(hi) %{_datadir}/locale/hi/entry.desktop
 
-%if %{buildall}
 %files Croatian
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
-%endif
 
 %files Hungarian
 %defattr(-,root,root)



From kkofler at fedoraproject.org  Sat Sep  5 02:56:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Sep 2009 02:56:30 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec, 1.65, 1.66 sources, 1.26,
	1.27 subdirs-kde-l10n, 1.18, 1.19
Message-ID: <20090905025630.B6C8F11C0082@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29815/F-10

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
Sync from devel:

* Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
- add missing Croatian localization


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- kde-l10n.spec	4 Sep 2009 13:19:47 -0000	1.65
+++ kde-l10n.spec	5 Sep 2009 02:56:30 -0000	1.66
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.3.1
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -71,7 +71,7 @@ Source58: ftp://ftp.kde.org/pub/kde/stab
 Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
 Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
 Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
-
+Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
 # upstream patches
@@ -1111,12 +1111,10 @@ rm -rf %{buildroot}
 %lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
 %lang(hi) %{_datadir}/locale/hi/entry.desktop
 
-%if %{buildall}
 %files Croatian
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
-%endif
 
 %files Hungarian
 %defattr(-,root,root)
@@ -1498,6 +1496,9 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- add missing Croatian localization
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	4 Sep 2009 13:19:48 -0000	1.26
+++ sources	5 Sep 2009 02:56:30 -0000	1.27
@@ -54,3 +54,4 @@ f705391dccc8557e0d9b874c0c2d3597  kde-l1
 44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
 2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
 7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
+7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/subdirs-kde-l10n,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- subdirs-kde-l10n	5 Aug 2009 15:46:12 -0000	1.18
+++ subdirs-kde-l10n	5 Sep 2009 02:56:30 -0000	1.19
@@ -18,6 +18,7 @@ gl
 gu
 he
 hi
+hr
 hu
 is
 it



From kkofler at fedoraproject.org  Sat Sep  5 02:56:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Sep 2009 02:56:31 +0000 (UTC)
Subject: rpms/kde-l10n/F-11 kde-l10n.spec, 1.85, 1.86 sources, 1.30,
	1.31 subdirs-kde-l10n, 1.19, 1.20
Message-ID: <20090905025631.0B23911C0082@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29815/F-11

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
Sync from devel:

* Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
- add missing Croatian localization


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/kde-l10n.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- kde-l10n.spec	4 Sep 2009 13:21:11 -0000	1.85
+++ kde-l10n.spec	5 Sep 2009 02:56:30 -0000	1.86
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.3.1
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -71,7 +71,7 @@ Source58: ftp://ftp.kde.org/pub/kde/stab
 Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
 Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
 Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
-
+Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
 # upstream patches
@@ -1111,12 +1111,10 @@ rm -rf %{buildroot}
 %lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
 %lang(hi) %{_datadir}/locale/hi/entry.desktop
 
-%if %{buildall}
 %files Croatian
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
-%endif
 
 %files Hungarian
 %defattr(-,root,root)
@@ -1498,6 +1496,9 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- add missing Croatian localization
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	4 Sep 2009 13:21:11 -0000	1.30
+++ sources	5 Sep 2009 02:56:30 -0000	1.31
@@ -54,3 +54,4 @@ f705391dccc8557e0d9b874c0c2d3597  kde-l1
 44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
 2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
 7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
+7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/subdirs-kde-l10n,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- subdirs-kde-l10n	5 Aug 2009 15:46:13 -0000	1.19
+++ subdirs-kde-l10n	5 Sep 2009 02:56:30 -0000	1.20
@@ -18,6 +18,7 @@ gl
 gu
 he
 hi
+hr
 hu
 is
 it



From mclasen at fedoraproject.org  Sat Sep  5 04:54:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Sep 2009 04:54:08 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.115, 1.116 gtk2.spec, 1.399,
	1.400 sources, 1.124, 1.125
Message-ID: <20090905045408.325CB11C02C8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27790

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.17.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	1 Sep 2009 13:44:36 -0000	1.115
+++ .cvsignore	5 Sep 2009 04:54:06 -0000	1.116
@@ -1 +1 @@
-gtk+-2.17.10.tar.bz2
+gtk+-2.17.11.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- gtk2.spec	1 Sep 2009 13:44:36 -0000	1.399
+++ gtk2.spec	5 Sep 2009 04:54:06 -0000	1.400
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.10
+%define base_version 2.17.11
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -382,6 +382,9 @@ fi
 
 
 %changelog
+* Sat Sep  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.11-1
+- Update to 2.17.11
+
 * Tue Sep  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.10-1
 - Update to 2.17.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- sources	1 Sep 2009 13:44:36 -0000	1.124
+++ sources	5 Sep 2009 04:54:07 -0000	1.125
@@ -1 +1 @@
-9fe31cc177993fdec187e6f44fc3b60b  gtk+-2.17.10.tar.bz2
+46b3b78d9140b40efe8efaa8c477d1cd  gtk+-2.17.11.tar.bz2



From mclasen at fedoraproject.org  Sat Sep  5 05:01:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Sep 2009 05:01:28 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.400,1.401
Message-ID: <20090905050128.D3A6611C02C8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29447

Modified Files:
	gtk2.spec 
Log Message:
fix spec



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- gtk2.spec	5 Sep 2009 04:54:06 -0000	1.400
+++ gtk2.spec	5 Sep 2009 05:01:28 -0000	1.401
@@ -36,7 +36,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: jasper-devel
 BuildRequires: libXi-devel
 BuildRequires: libpng-devel >= %{libpng_version}
-BuildRequires: automake17 autoconf libtool pkgconfig
+BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: gettext
 BuildRequires: gtk-doc
 BuildRequires: cups-devel
@@ -148,10 +148,7 @@ rm --force ./gtk/gtkmarshalers.h
 libtoolize --force --copy
 
 # Patch0 modifies gdk-pixbuf/Makefile.am
-aclocal-1.7
-automake-1.7
-autoconf
-autoheader
+autoreconf
 
 if ! pkg-config --exists pangoxft ; then
         echo "No pangoxft.pc!"



From emaldonado at fedoraproject.org  Sat Sep  5 05:22:45 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 05:22:45 +0000 (UTC)
Subject: rpms/nss/devel PayPalEE.cert,1.1,NONE PayPalICA.cert,1.1,NONE
Message-ID: <20090905052245.D62E811C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2891

Removed Files:
	PayPalEE.cert PayPalICA.cert 
Log Message:
no loger needed


--- PayPalEE.cert DELETED ---


--- PayPalICA.cert DELETED ---



From abompard at fedoraproject.org  Sat Sep  5 05:27:12 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  5 Sep 2009 05:27:12 +0000 (UTC)
Subject: rpms/spring/F-11 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 spring.spec,
	1.6, 1.7
Message-ID: <20090905052712.E13FB11C0374@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6392

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sat Sep 05 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.1-1
- New release: 0.80.4.1 (bugfix)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Sep 2009 06:11:18 -0000	1.5
+++ .cvsignore	5 Sep 2009 05:27:12 -0000	1.6
@@ -1 +1 @@
-spring_0.80.4_src.tar.lzma
+spring_0.80.4.1_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Sep 2009 06:11:18 -0000	1.5
+++ sources	5 Sep 2009 05:27:12 -0000	1.6
@@ -1 +1 @@
-b0119298031fd1aa4aca77086a438d00  spring_0.80.4_src.tar.lzma
+e37ee73567012d3e4fa9931cddb8088a  spring_0.80.4.1_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- spring.spec	3 Sep 2009 06:11:18 -0000	1.6
+++ spring.spec	5 Sep 2009 05:27:12 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4
+Version:        0.80.4.1
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.html README.Fedora Documentation/*
+%doc LICENSE.html README.AUTHORS README.LICENSE README.Fedora Documentation/*
 %{_bindir}/*
 %{_libdir}/libunitsync.so
 %{_libdir}/libspringserver.so
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 05 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.1-1
+- New release: 0.80.4.1 (bugfix)
+
 * Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
 - New release: 0.80.4
 



From remi at fedoraproject.org  Sat Sep  5 05:35:05 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  5 Sep 2009 05:35:05 +0000 (UTC)
Subject: rpms/php-pear/devel .cvsignore, 1.17, 1.18 php-pear.spec, 1.37,
	1.38 sources, 1.17, 1.18
Message-ID: <20090905053505.9A65911C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8577

Modified Files:
	.cvsignore php-pear.spec sources 
Log Message:
update to PEAR 1.9.0 and XML_RPC 1.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	30 May 2009 08:19:19 -0000	1.17
+++ .cvsignore	5 Sep 2009 05:35:05 -0000	1.18
@@ -1,6 +1,6 @@
 Archive_Tar-1.3.3.tgz
 Console_Getopt-1.2.3.tgz
-PEAR-1.8.1.tgz
+PEAR-1.9.0.tgz
 Structures_Graph-1.0.2.tgz
-XML_RPC-1.5.1.tgz
+XML_RPC-1.5.2.tgz
 XML_Util-1.2.1.tgz


Index: php-pear.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- php-pear.spec	26 Jul 2009 18:07:33 -0000	1.37
+++ php-pear.spec	5 Sep 2009 05:35:05 -0000	1.38
@@ -1,7 +1,7 @@
 
 %global peardir %{_datadir}/pear
 
-%global xmlrpcver 1.5.1
+%global xmlrpcver 1.5.2
 %global getoptver 1.2.3
 %global arctarver 1.3.3
 %global structver 1.0.2
@@ -9,8 +9,8 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.8.1
-Release: 2%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 Epoch: 1
 License: PHP
 Group: Development/Languages
@@ -159,6 +159,9 @@ rm new-pear.conf
 
 
 %changelog
+* Sat Sep 05 2009 Remi Collet <Fedora at FamilleCollet.com> 1:1.9.0-1
+- update to PEAR 1.9.0, XML_RPC 1.5.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	30 May 2009 08:19:19 -0000	1.17
+++ sources	5 Sep 2009 05:35:05 -0000	1.18
@@ -1,6 +1,6 @@
 38d443cba3f2dc378fdadb73075dcad9  Archive_Tar-1.3.3.tgz
 d7618327f9302a7191893768982de823  Console_Getopt-1.2.3.tgz
-03f7d3b1aececfd45302c9235103299c  PEAR-1.8.1.tgz
+2f0056187b5f527c0f418f83014fc2a7  PEAR-1.9.0.tgz
 2664e2d024048f982e12fad4d1bfbb87  Structures_Graph-1.0.2.tgz
-1b516162ad65971b5fd04a7c279627ec  XML_RPC-1.5.1.tgz
+8a4dd27585d30b39717f3f58bb1f94f5  XML_RPC-1.5.2.tgz
 b8d4efcdb11b308b179f7bb63043284f  XML_Util-1.2.1.tgz



From mclasen at fedoraproject.org  Sat Sep  5 05:35:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Sep 2009 05:35:13 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2-fix-install.patch, NONE, 1.1 gtk2.spec, 1.401, 
	1.402
Message-ID: <20090905053513.C373A11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8615

Modified Files:
	gtk2.spec 
Added Files:
	gtk2-fix-install.patch 
Log Message:
Fix build


gtk2-fix-install.patch:
 po-properties/Makefile.in.in |    2 +-
 po/Makefile.in.in            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gtk2-fix-install.patch ---
diff -up gtk+-2.17.11/po/Makefile.in.in.fix-install gtk+-2.17.11/po/Makefile.in.in
--- gtk+-2.17.11/po/Makefile.in.in.fix-install	2009-09-05 01:19:45.303824009 -0400
+++ gtk+-2.17.11/po/Makefile.in.in	2009-09-05 01:19:14.632573806 -0400
@@ -126,7 +126,7 @@ install-data: install-data- at USE_NLS@
 install-data-no: all
 install-data-yes: all
 	$(mkdir_p) $(DESTDIR)$(datadir); \
-	@catalogs='$(CATALOGS)'; \
+	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \
diff -up gtk+-2.17.11/po-properties/Makefile.in.in.fix-install gtk+-2.17.11/po-properties/Makefile.in.in
--- gtk+-2.17.11/po-properties/Makefile.in.in.fix-install	2009-09-05 01:19:54.543583934 -0400
+++ gtk+-2.17.11/po-properties/Makefile.in.in	2009-09-05 01:20:16.427830666 -0400
@@ -107,7 +107,7 @@ install-data: install-data- at USE_NLS@
 install-data-no: all
 install-data-yes: all
 	$(mkdir_p) $(DESTDIR)$(datadir); \
-	@catalogs='$(CATALOGS)'; \
+	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- gtk2.spec	5 Sep 2009 05:01:28 -0000	1.401
+++ gtk2.spec	5 Sep 2009 05:35:13 -0000	1.402
@@ -28,6 +28,8 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 
+Patch1: gtk2-fix-install.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -138,6 +140,7 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
+%patch1 -p1 -b .fix-install
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -215,17 +218,17 @@ make install DESTDIR=$RPM_BUILD_ROOT    
 %find_lang gtk20
 %find_lang gtk20-properties
 
-./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
 #
 # Make cleaned-up versions of tutorials, examples, and faq for installation
 #
-./mkinstalldirs tmpdocs
+mkdir -p tmpdocs
 cp -aR docs/tutorial/html tmpdocs/tutorial
 cp -aR docs/faq/html tmpdocs/faq
 
 for dir in examples/* ; do
   if [ -d $dir ] ; then
-     ./mkinstalldirs tmpdocs/$dir
+     mkdir -p tmpdocs/$dir
      for file in $dir/* ; do
        install -m 0644 $file tmpdocs/$dir
      done



From abompard at fedoraproject.org  Sat Sep  5 05:51:02 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  5 Sep 2009 05:51:02 +0000 (UTC)
Subject: rpms/spring/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 spring.spec,
	1.8, 1.9
Message-ID: <20090905055102.EB66811C00E5@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16379

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sat Sep 05 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.1-1
- New release: 0.80.4.1 (bugfix)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Sep 2009 06:11:18 -0000	1.6
+++ .cvsignore	5 Sep 2009 05:51:02 -0000	1.7
@@ -1 +1 @@
-spring_0.80.4_src.tar.lzma
+spring_0.80.4.1_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Sep 2009 06:11:18 -0000	1.6
+++ sources	5 Sep 2009 05:51:02 -0000	1.7
@@ -1 +1 @@
-b0119298031fd1aa4aca77086a438d00  spring_0.80.4_src.tar.lzma
+e37ee73567012d3e4fa9931cddb8088a  spring_0.80.4.1_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- spring.spec	3 Sep 2009 06:11:18 -0000	1.8
+++ spring.spec	5 Sep 2009 05:51:02 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4
+Version:        0.80.4.1
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.html README.Fedora Documentation/*
+%doc LICENSE.html README.AUTHORS README.LICENSE README.Fedora Documentation/*
 %{_bindir}/*
 %{_libdir}/libunitsync.so
 %{_libdir}/libspringserver.so
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 05 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.1-1
+- New release: 0.80.4.1 (bugfix)
+
 * Thu Sep 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4-1
 - New release: 0.80.4
 



From jreznik at fedoraproject.org  Sat Sep  5 07:31:59 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Sat,  5 Sep 2009 07:31:59 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090905073159.91C8C11C00E5@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15026

Modified Files:
	.cvsignore sources 
Added Files:
	constantine-kde-theme.spec 
Log Message:
* Fri Sep 04 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.2-1
- KDM theme

* Thu Sep 03 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.1-1
- wallpapers moved to backgrounds package
- ksplash theme

* Thu Aug 06 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.0-1
- initial package



--- NEW FILE constantine-kde-theme.spec ---
Name:		constantine-kde-theme
Version:	11.90.2
Release:	1%{?dist}
Summary:	Constantine KDE Theme

Group:		User Interface/Desktops
License:	GPLv2+ and CC-BY-SA

# We are upstream for this package
URL:		https://fedorahosted.org/fedora-kde-artwork/
Source0:	https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	kde-filesystem
Requires:	kde-filesystem
Requires:	system-logos
# TODO: correct Constantine Requires
Requires:	constantine-backgrounds >= 11.90.0-1



%description
This is Constantine KDE Theme Artwork containing KSplash theme and KDM theme.

%prep
%setup -q


%build
# blank

%install
rm -rf %{buildroot}

# KDM
mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
cp -rp kdm/Constantine/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
(cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/Constantine/
ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine.png
ln -s ../../../../../pixmaps/system-logo-white.png system-logo-white.png
)

#mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
#cp -rp kdm/users %{buildroot}/%{_kde4_appsdir}/kdm/pics

# KSplash
mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
cp -rp ksplash/Constantine/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
ln -s ../../../../../../backgrounds/constantine/default/standard/constantine.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Constantine/2048x1536/constantine.png
mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Constantine/1920x1200/
ln -s ../../../../../../backgrounds/constantine/default/wide/constantine.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Constantine/1920x1200/constantine.png

# end finally drag logo
ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Constantine/2048x1536/logo.png

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README COPYING.CC-BY-SA COPYING.GPLv2
%{_kde4_appsdir}/kdm/themes/Constantine/
%{_kde4_appsdir}/ksplash/Themes/Constantine/
#%{_kde4_appsdir}/kdm/pics/users/default_constantine.png


%changelog
* Fri Sep 04 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.2-1
- KDM theme

* Thu Sep 03 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.1-1
- wallpapers moved to backgrounds package
- ksplash theme

* Thu Aug 06 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.0-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 20:14:38 -0000	1.1
+++ .cvsignore	5 Sep 2009 07:31:57 -0000	1.2
@@ -0,0 +1 @@
+constantine-kde-theme-11.90.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 20:14:38 -0000	1.1
+++ sources	5 Sep 2009 07:31:57 -0000	1.2
@@ -0,0 +1 @@
+7d73d3b9e1e00343d624c048b375393f  constantine-kde-theme-11.90.2.tar.bz2



From alexh at fedoraproject.org  Sat Sep  5 07:48:40 2009
From: alexh at fedoraproject.org (alexh)
Date: Sat,  5 Sep 2009 07:48:40 +0000 (UTC)
Subject: rpms/log4c/F-11 Fix-array-priority-names.patch, NONE, 1.1 log4c.spec,
	1.3, 1.4
Message-ID: <20090905074840.732E211C00E5@cvs1.fedora.phx.redhat.com>

Author: alexh

Update of /cvs/pkgs/rpms/log4c/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788

Modified Files:
	log4c.spec 
Added Files:
	Fix-array-priority-names.patch 
Log Message:
* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-6
- Added patch to fix incorrect array length checking (upstream bug 2844132)
- Correctly included patch to fix underquoting in M4 file (bug #507427)


Fix-array-priority-names.patch:
 defaultAppender.c |    9 ++++++---
 test_log4c.c      |    1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE Fix-array-priority-names.patch ---
diff --git a/defaultAppender.c b/defaultAppender.c
index 272b70c..7cbbdf3 100644
--- a/defaultAppender.c
+++ b/defaultAppender.c
@@ -43,6 +43,8 @@ static char *priorityNames[] = {
     "EMERGENCY",
 };
 
+#define NumberOfPriorities (sizeof(priorityNames) / sizeof(priorityNames[0]))
+
 static void doAppend(struct LogAppender* this, struct LogEvent* ev);
 
 static struct DefaultLogAppender {
@@ -64,12 +66,13 @@ static void doAppend(struct LogAppender* this0, struct LogEvent* ev) {
     if (ev->priority < 0) {
         pn = "Negative Priority NOT ALLOWED!!";
     }
-    else if (ev->priority < sizeof(priorityNames)) {
+    else if (ev->priority < NumberOfPriorities) {
         pn = priorityNames[ev->priority];
     } else {
         sprintf(buf, "%s+%d",
-                priorityNames[sizeof(priorityNames)-1],
-                ev->priority - sizeof(priorityNames) + 1);
+                priorityNames[NumberOfPriorities - 1],
+                ev->priority - NumberOfPriorities + 1);
+        pn = buf;
     }
     fprintf(stderr, "%-7s ", pn);
     fprintf(stderr, "%s:%d: ", ev->fileName, ev->lineNum);
diff --git a/test_log4c.c b/test_log4c.c
index 4bb6035..b92d74e 100644
--- a/test_log4c.c
+++ b/test_log4c.c
@@ -45,6 +45,7 @@ int main(int ac, char **av) {
         const char *msg = log_setControlString(av[1]);
         if (*msg) fprintf(stderr, "ERROR: %s\n", msg);
     }
+    CLOG4(Top, 10, "val=%d", 10);
     DEBUG2("val=%d", 1);
     WARNING2("val=%d", 2);
     CDEBUG4(Top, "val=%d%s", 3, "!");

 	  	 


Index: log4c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4c/F-11/log4c.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- log4c.spec	30 Jul 2009 06:54:30 -0000	1.3
+++ log4c.spec	5 Sep 2009 07:48:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		log4c
 Version:	1.2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Library for logging application messages
 
 Group:		System Environment/Libraries
@@ -8,6 +8,7 @@ License:	LGPLv2+
 URL:		http://log4c.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		507427-Fix-M4-file.patch
+Patch1:		Fix-array-priority-names.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	expat-devel
 
@@ -29,6 +30,8 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q 
+%patch0
+%patch1
 
 %build
 %configure --disable-static
@@ -62,6 +65,10 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/log4c.m4
 
 %changelog
+* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-6
+- Added patch to fix incorrect array length checking (upstream bug 2844132)
+- Correctly included patch to fix underquoting in M4 file (bug #507427)
+
 * Thu Jul 30 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-5
 - Added patch to fix underquoting in M4 file (bug #507427)
 



From alexh at fedoraproject.org  Sat Sep  5 08:18:11 2009
From: alexh at fedoraproject.org (alexh)
Date: Sat,  5 Sep 2009 08:18:11 +0000 (UTC)
Subject: rpms/log4c/F-11 log4c.spec, 1.4, 1.5 Fix-array-priority-names.patch,
	1.1, NONE
Message-ID: <20090905081811.9A14C11C00E5@cvs1.fedora.phx.redhat.com>

Author: alexh

Update of /cvs/pkgs/rpms/log4c/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30647

Modified Files:
	log4c.spec 
Removed Files:
	Fix-array-priority-names.patch 
Log Message:
* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-7
- Remove patch applied incorrectly (upstream bug 2844132)



Index: log4c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4c/F-11/log4c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- log4c.spec	5 Sep 2009 07:48:38 -0000	1.4
+++ log4c.spec	5 Sep 2009 08:18:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		log4c
 Version:	1.2.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Library for logging application messages
 
 Group:		System Environment/Libraries
@@ -8,7 +8,6 @@ License:	LGPLv2+
 URL:		http://log4c.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		507427-Fix-M4-file.patch
-Patch1:		Fix-array-priority-names.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	expat-devel
 
@@ -30,8 +29,7 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q 
-%patch0
-%patch1
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -65,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/log4c.m4
 
 %changelog
+* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-7
+- Remove patch applied incorrectly (upstream bug 2844132)
+
 * Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-6
 - Added patch to fix incorrect array length checking (upstream bug 2844132)
 - Correctly included patch to fix underquoting in M4 file (bug #507427)


--- Fix-array-priority-names.patch DELETED ---



From iarnell at fedoraproject.org  Sat Sep  5 08:33:31 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat,  5 Sep 2009 08:33:31 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-EncodedColumn/devel .cvsignore, 1.3,
	1.4 perl-DBIx-Class-EncodedColumn.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090905083331.57DD311C00E5@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2496

Modified Files:
	.cvsignore perl-DBIx-Class-EncodedColumn.spec sources 
Log Message:
* Sat Sep 05 2009 Iain Arnell <iarnell at gmail.com> 0.00004-1
- update to latest upstream (minor documentation fix)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Sep 2009 03:58:46 -0000	1.3
+++ .cvsignore	5 Sep 2009 08:33:30 -0000	1.4
@@ -1 +1 @@
-DBIx-Class-EncodedColumn-0.00003.tar.gz
+DBIx-Class-EncodedColumn-0.00004.tar.gz


Index: perl-DBIx-Class-EncodedColumn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/perl-DBIx-Class-EncodedColumn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DBIx-Class-EncodedColumn.spec	2 Sep 2009 03:58:46 -0000	1.4
+++ perl-DBIx-Class-EncodedColumn.spec	5 Sep 2009 08:33:31 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-Class-EncodedColumn
-Version:        0.00003
+Version:        0.00004
 Release:        1%{?dist}
 Summary:        Automatically encode columns
 License:        GPL+ or Artistic
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 05 2009 Iain Arnell <iarnell at gmail.com> 0.00004-1
+- update to latest upstream (minor documentation fix)
+
 * Wed Sep 02 2009 Iain Arnell <iarnell at gmail.com> 0.00003-1
 - update to latest upstream (copyright notice added)
 - remove temporary BRs due to BZ #499768


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Sep 2009 03:58:46 -0000	1.3
+++ sources	5 Sep 2009 08:33:31 -0000	1.4
@@ -1 +1 @@
-3a2613af1c10219654150b59f076a620  DBIx-Class-EncodedColumn-0.00003.tar.gz
+4dc99811f29f054bdfd526735bcbc357  DBIx-Class-EncodedColumn-0.00004.tar.gz



From alexh at fedoraproject.org  Sat Sep  5 08:34:42 2009
From: alexh at fedoraproject.org (alexh)
Date: Sat,  5 Sep 2009 08:34:42 +0000 (UTC)
Subject: rpms/log4c/devel 507427-Fix-M4-file.patch, NONE, 1.1 log4c.spec, 1.3,
	1.4
Message-ID: <20090905083442.658EB11C00E5@cvs1.fedora.phx.redhat.com>

Author: alexh

Update of /cvs/pkgs/rpms/log4c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2885

Modified Files:
	log4c.spec 
Added Files:
	507427-Fix-M4-file.patch 
Log Message:
* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-7
- Added patch to fix underquoting in M4 file (bug #507427)


507427-Fix-M4-file.patch:
 log4c.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 507427-Fix-M4-file.patch ---
diff -Nadru log4c-1.2.1/log4c.m4 log4c-1.2.1-fixed/log4c.m4
--- log4c-1.2.1/log4c.m4	2007-09-24 20:12:16.000000000 +0100
+++ log4c-1.2.1-fixed/log4c.m4	2009-07-30 07:38:06.232116855 +0100
@@ -4,7 +4,7 @@
 dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
 dnl
-AC_DEFUN(AM_PATH_LOG4C,
+AC_DEFUN([AM_PATH_LOG4C],
 [dnl 
 dnl Get the cflags and libraries from the log4c-config script
 dnl


Index: log4c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4c/devel/log4c.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- log4c.spec	25 Jul 2009 11:13:28 -0000	1.3
+++ log4c.spec	5 Sep 2009 08:34:42 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		log4c
 Version:	1.2.1
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Library for logging application messages
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://log4c.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		507427-Fix-M4-file.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	expat-devel
 
@@ -28,6 +29,7 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -61,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/log4c.m4
 
 %changelog
+* Sat Sep 05 2009 Alex (Fedora Packaging Account) <fedora at alexhudson.com> - 1.2.1-7
+- Added patch to fix underquoting in M4 file (bug #507427)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chitlesh at fedoraproject.org  Sat Sep  5 08:36:51 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Sep 2009 08:36:51 +0000 (UTC)
Subject: rpms/kpolynome/devel import.log,NONE,1.1 kpolynome.spec,1.10,1.11
Message-ID: <20090905083651.81FC811C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/kpolynome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3529/devel

Modified Files:
	kpolynome.spec 
Added Files:
	import.log 
Log Message:
bug 511534 FTBFS kpolynome-0.1.2-13.fc11


--- NEW FILE import.log ---
kpolynome-0_1_2-15_fc11:HEAD:kpolynome-0.1.2-15.fc11.src.rpm:1252139657


Index: kpolynome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpolynome/devel/kpolynome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kpolynome.spec	25 Jul 2009 04:46:13 -0000	1.10
+++ kpolynome.spec	5 Sep 2009 08:36:51 -0000	1.11
@@ -1,13 +1,13 @@
 Name:             kpolynome
 #Version          0.1-2   second upstream release
 Version:          0.1.2
-Release:          14%{?dist}
+Release:          15%{?dist}
 Summary:          A polynome calculation program
 
 License:          GPLv2
 Group:            Applications/Engineering
 URL:              http://sourceforge.net/projects/%{name}
-Source:           http://sourceforge.net/projects/%{name}/%{name}-0.1-2.tar.gz
+Source:           http://downloads.sourceforge.net/project/kpolynome/Source/0.1-2/%{name}-0.1-2.tar.gz
 Patch0:           kpolynome-0.1-2-desktop.patch
 Patch1:           %{name}-%{version}-autotools.patch
 Patch2:           kpolynome-0.1-gcc43.patch
@@ -30,10 +30,10 @@ based on given data coordinates.
 %patch1 -p0 -b .autotools
 %patch2 -p1 -b .gcc43
 
-%{__make} -f admin/Makefile.common cvs
-
-
+# Fix for 511534 FTBFS kpolynome-0.1.2-13.fc11
+%{__sed} -i "s|automake\*1.10\*|automake\*1.11\*|" admin/cvs.sh
 
+%{__make} -f admin/Makefile.common cvs
 
 %build
 %configure --disable-rpath
@@ -82,6 +82,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 
 %changelog
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.1.2-15
+- Fixed for 511534 FTBFS kpolynome-0.1.2-13.fc11
+- Improved Source url
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Sat Sep  5 08:56:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  5 Sep 2009 08:56:56 +0000 (UTC)
Subject: rpms/audacity/devel audacity-1.3.9-libdir.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 audacity.spec, 1.81, 1.82 sources, 1.13,
	1.14 audacity-1.3.8-audiodevdefaults.patch, 1.1,
	NONE audacity-1.3.8-libdir.patch, 1.1, NONE
Message-ID: <20090905085656.8B30D11C00E5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8976

Modified Files:
	.cvsignore audacity.spec sources 
Added Files:
	audacity-1.3.9-libdir.patch 
Removed Files:
	audacity-1.3.8-audiodevdefaults.patch 
	audacity-1.3.8-libdir.patch 
Log Message:
* Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
- upgrade to 1.3.9-beta
- upstream's changes in the device prefs code make the audiodevdefaults
  patch unnecessary afaic see


audacity-1.3.9-libdir.patch:
 LoadLadspa.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-libdir.patch ---
diff -Nur audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp	2009-08-31 12:45:40.000000000 +0200
+++ audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp	2009-09-03 12:01:49.823505468 +0200
@@ -286,7 +286,7 @@
 
    #ifdef __WXGTK__
    wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
-   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
+   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
    wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
    #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 Jul 2009 19:55:15 -0000	1.11
+++ .cvsignore	5 Sep 2009 08:56:54 -0000	1.12
@@ -1 +1 @@
-audacity-minsrc-1.3.8.tar.bz2
+audacity-minsrc-1.3.9.tar.bz2


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- audacity.spec	24 Jul 2009 17:32:13 -0000	1.81
+++ audacity.spec	5 Sep 2009 08:56:55 -0000	1.82
@@ -1,11 +1,11 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.8
+%define tartopdir audacity-src-1.3.9
 
 Name: audacity
-Version: 1.3.8
-Release: 0.3.beta%{?dist}
+Version: 1.3.9
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -16,10 +16,9 @@ Source1: audacity.png
 Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
-Patch2: audacity-1.3.8-libdir.patch
+Patch2: audacity-1.3.9-libdir.patch
 Patch3: audacity-1.3.8-gsocket-conflict.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
-Patch7: audacity-1.3.8-audiodevdefaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -72,7 +71,6 @@ grep -q -s __RPM_LIB * -R && exit 1
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
-%patch7 -p1 -b .audiodevdefaults
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -148,6 +146,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
+- upgrade to 1.3.9-beta
+- upstream's changes in the device prefs code make the audiodevdefaults
+  patch unnecessary afaic see
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-0.3.beta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	20 Jul 2009 19:55:16 -0000	1.13
+++ sources	5 Sep 2009 08:56:55 -0000	1.14
@@ -1 +1 @@
-88b3c68663a06f146fe822b91608e8f1  audacity-minsrc-1.3.8.tar.bz2
+0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2


--- audacity-1.3.8-audiodevdefaults.patch DELETED ---


--- audacity-1.3.8-libdir.patch DELETED ---



From epienbro at fedoraproject.org  Sat Sep  5 09:05:49 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat,  5 Sep 2009 09:05:49 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.9, 1.10 mingw32-glib2.spec, 
	1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20090905090549.2268511C00E5@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10745

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.21.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	27 Aug 2009 20:43:19 -0000	1.9
+++ .cvsignore	5 Sep 2009 09:05:48 -0000	1.10
@@ -1 +1 @@
-glib-2.21.5.tar.bz2
+glib-2.21.6.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mingw32-glib2.spec	27 Aug 2009 20:43:19 -0000	1.14
+++ mingw32-glib2.spec	5 Sep 2009 09:05:48 -0000	1.15
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.21.5
+Version:        2.21.6
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep  5 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.6-1
+- Update to 2.21.6
+
 * Mon Aug 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.5-1
 - Update to 2.21.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Aug 2009 20:43:20 -0000	1.9
+++ sources	5 Sep 2009 09:05:48 -0000	1.10
@@ -1 +1 @@
-5f3f19c4a8088c51e21cad5b8ea166e5  glib-2.21.5.tar.bz2
+3b0452fbd877db53dafabdc074600cb8  glib-2.21.6.tar.bz2



From epienbro at fedoraproject.org  Sat Sep  5 09:09:50 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat,  5 Sep 2009 09:09:50 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.9, 1.10 mingw32-gtk2.spec,
	1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20090905090950.F414811C00E5@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11659

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.17.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Sep 2009 17:23:47 -0000	1.9
+++ .cvsignore	5 Sep 2009 09:09:50 -0000	1.10
@@ -1 +1 @@
-gtk+-2.17.10.tar.bz2
+gtk+-2.17.11.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mingw32-gtk2.spec	1 Sep 2009 17:23:47 -0000	1.13
+++ mingw32-gtk2.spec	5 Sep 2009 09:09:50 -0000	1.14
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.17.10
+Version:        2.17.11
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -332,6 +332,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Sat Sep  5 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-1
+- Update to 2.17.11
+
 * Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.10-1
 - Update to 2.17.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Sep 2009 17:23:47 -0000	1.9
+++ sources	5 Sep 2009 09:09:50 -0000	1.10
@@ -1 +1 @@
-9fe31cc177993fdec187e6f44fc3b60b  gtk+-2.17.10.tar.bz2
+46b3b78d9140b40efe8efaa8c477d1cd  gtk+-2.17.11.tar.bz2



From chitlesh at fedoraproject.org  Sat Sep  5 09:14:39 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Sep 2009 09:14:39 +0000 (UTC)
Subject: rpms/ktechlab/F-11 import.log,1.3,1.4 ktechlab.spec,1.25,1.26
Message-ID: <20090905091439.EB8C911C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ktechlab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14227/F-11

Modified Files:
	import.log ktechlab.spec 
Log Message:
Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Mar 2009 21:33:53 -0000	1.3
+++ import.log	5 Sep 2009 09:14:39 -0000	1.4
@@ -1,3 +1,4 @@
 ktechlab-0_3_69-9_20081031svn_fc9:HEAD:ktechlab-0.3.69-9.20081031svn.fc9.src.rpm:1225612333
 ktechlab-0_3_69-10_20081031svn_fc9:HEAD:ktechlab-0.3.69-10.20081031svn.fc9.src.rpm:1225739868
 ktechlab-0_3_70-1_20090304svn_fc10:HEAD:ktechlab-0.3.70-1.20090304svn.fc10.src.rpm:1236288682
+ktechlab-0_3_70-2_20090304svn_fc11:F-11:ktechlab-0.3.70-2.20090304svn.fc11.src.rpm:1252141862


Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/F-11/ktechlab.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ktechlab.spec	5 Mar 2009 21:33:53 -0000	1.25
+++ ktechlab.spec	5 Sep 2009 09:14:39 -0000	1.26
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3.70
-Release:          1.20090304svn%{?dist}
+Release:          2.20090304svn%{?dist}
 # revision checkout 238
 
 Summary:          Development and simulation of microcontrollers and electronic circuits
@@ -45,9 +45,17 @@ to KTechlab.
 chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf autom4te.cache
 
+# Fix for Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+%{__sed} -i "s|automake\*1.10\*|automake\*1.11\*|" admin/cvs.sh
+
 %patch0 -p0 -b .multilib
+
+# Upstream already applied this patch
 %patch1 -p0 -b .gpsim
 
+# /usr/bin/install: will not overwrite just-created
+%{__sed} -i "s|while.png for.png||" icons/pics/Makefile.am
+
 %build
 
 %{__make} -f Makefile.cvs
@@ -59,7 +67,7 @@ chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor ""                \
     --remove-category Education                 \
     --remove-category Science                   \
     --delete-original                           \
@@ -104,13 +112,17 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/apps/katepart/syntax/microbe.xml
 %{_datadir}/config.kcfg/%{name}.kcfg
 %{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_sysconfdir}/profile.d/%{name}.sh
 
 
 %Changelog
-* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900403svn
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-2.200900304svn
+- Fixed Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+- Rebuilt to improve stability : gpsim-0.23
+
+* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900304svn
 - new svn checkout 238
 - included patch from upstream, Julian B?ume, to build on gpsim 0.23
 



From chitlesh at fedoraproject.org  Sat Sep  5 09:17:00 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Sep 2009 09:17:00 +0000 (UTC)
Subject: rpms/ktechlab/devel import.log,1.3,1.4 ktechlab.spec,1.26,1.27
Message-ID: <20090905091700.133A511C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ktechlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14973/devel

Modified Files:
	import.log ktechlab.spec 
Log Message:
Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Mar 2009 21:33:53 -0000	1.3
+++ import.log	5 Sep 2009 09:16:59 -0000	1.4
@@ -1,3 +1,4 @@
 ktechlab-0_3_69-9_20081031svn_fc9:HEAD:ktechlab-0.3.69-9.20081031svn.fc9.src.rpm:1225612333
 ktechlab-0_3_69-10_20081031svn_fc9:HEAD:ktechlab-0.3.69-10.20081031svn.fc9.src.rpm:1225739868
 ktechlab-0_3_70-1_20090304svn_fc10:HEAD:ktechlab-0.3.70-1.20090304svn.fc10.src.rpm:1236288682
+ktechlab-0_3_70-2_20090304svn_fc11:HEAD:ktechlab-0.3.70-2.20090304svn.fc11.src.rpm:1252141978


Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ktechlab.spec	25 Jul 2009 04:50:21 -0000	1.26
+++ ktechlab.spec	5 Sep 2009 09:16:59 -0000	1.27
@@ -45,9 +45,17 @@ to KTechlab.
 chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf autom4te.cache
 
+# Fix for Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+%{__sed} -i "s|automake\*1.10\*|automake\*1.11\*|" admin/cvs.sh
+
 %patch0 -p0 -b .multilib
+
+# Upstream already applied this patch
 %patch1 -p0 -b .gpsim
 
+# /usr/bin/install: will not overwrite just-created
+%{__sed} -i "s|while.png for.png||" icons/pics/Makefile.am
+
 %build
 
 %{__make} -f Makefile.cvs
@@ -59,7 +67,7 @@ chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor ""                \
     --remove-category Education                 \
     --remove-category Science                   \
     --delete-original                           \
@@ -104,13 +112,17 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/apps/katepart/syntax/microbe.xml
 %{_datadir}/config.kcfg/%{name}.kcfg
 %{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_sysconfdir}/profile.d/%{name}.sh
 
 
 %Changelog
-* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900403svn
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-2.200900304svn
+- Fixed Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+- Rebuilt to improve stability : gpsim-0.23
+
+* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900304svn
 - new svn checkout 238
 - included patch from upstream, Julian B?ume, to build on gpsim 0.23
 



From chitlesh at fedoraproject.org  Sat Sep  5 09:19:22 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Sep 2009 09:19:22 +0000 (UTC)
Subject: rpms/ktechlab/EL-5 ktechlab-detect_gpsim.patch, NONE, 1.1 import.log,
	1.1, 1.2 ktechlab.spec, 1.2, 1.3 sources, 1.1, 1.2
Message-ID: <20090905091922.4213111C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ktechlab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16211/EL-5

Modified Files:
	import.log ktechlab.spec sources 
Added Files:
	ktechlab-detect_gpsim.patch 
Log Message:
Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11

ktechlab-detect_gpsim.patch:
 configure.in.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ktechlab-detect_gpsim.patch ---
Index: configure.in.in
===================================================================
--- configure.in.in	(revision 239)
+++ configure.in.in	(working copy)
@@ -30,7 +30,7 @@
 #include <gpsim/gpsim_interface.h>
 #include <gpsim/breakpoints.h>
 #include <gpsim/gpsim_time.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); }
+void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); exit_gpsim(0); }
 	],
 	[],
 	AC_MSG_RESULT( yes )
@@ -47,7 +47,7 @@
 #include <gpsim/gpsim_time.h>
 #include <gpsim/symbol.h>
 #include <gpsim/program_files.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); }
+void func() { (void)cycles; (void)initialize_gpsim_core(); exit_gpsim(0); }
 	],
 	[],
 	AC_MSG_RESULT( yes )


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	8 Nov 2008 00:02:32 -0000	1.1
+++ import.log	5 Sep 2009 09:19:21 -0000	1.2
@@ -1 +1,2 @@
 ktechlab-0_3_69-10_20081031svn_fc10:EL-5:ktechlab-0.3.69-10.20081031svn.fc10.src.rpm:1226102477
+ktechlab-0_3_70-2_20090304svn_fc11:EL-5:ktechlab-0.3.70-2.20090304svn.fc11.src.rpm:1252142150


Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/EL-5/ktechlab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ktechlab.spec	11 Nov 2008 21:09:21 -0000	1.2
+++ ktechlab.spec	5 Sep 2009 09:19:21 -0000	1.3
@@ -1,7 +1,7 @@
 Name:             ktechlab
-Version:          0.3.69
-Release:          11.20081031svn%{?dist}
-# revision checkout 150
+Version:          0.3.70
+Release:          2.20090304svn%{?dist}
+# revision checkout 238
 
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
@@ -9,21 +9,16 @@ License:          GPLv2
 Group:            Applications/Engineering
 
 URL:              http://sourceforge.net/projects/ktechlab/
-Source:           %{name}-svn20081031.tar.bz2
+Source:           %{name}-0.3.7.tar.gz
 
 Patch0:           ktechlab-0.3.6-multilib.patch
+Patch1:           ktechlab-detect_gpsim.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    gpsim-devel readline-devel
+BuildRequires:    gpsim-devel readline-devel kdelibs3-devel
 BuildRequires:    desktop-file-utils autoconf automake
 
-%if 0%{?fedora} > 8
-BuildRequires:    kdelibs3-devel
-%else
-BuildRequires:    kdelibs-devel
-%endif
-
 # Ktechlab requires gputils for PIC simulation.
 Requires:         gputils electronics-menu sdcc
 
@@ -44,13 +39,23 @@ to KTechlab.
 * Integrated assembler and disassembler via gpasm and gpdasm.
 
 %prep
-%setup -q -n %{name}-svn20081031
+%setup -q -n %{name}-0.3.7
+
 
 chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf autom4te.cache
 
+# Fix for Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+%{__sed} -i "s|automake\*1.10\*|automake\*1.11\*|" admin/cvs.sh
+
 %patch0 -p0 -b .multilib
 
+# Upstream already applied this patch
+%patch1 -p0 -b .gpsim
+
+# /usr/bin/install: will not overwrite just-created
+%{__sed} -i "s|while.png for.png||" icons/pics/Makefile.am
+
 %build
 
 %{__make} -f Makefile.cvs
@@ -62,7 +67,7 @@ chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor ""                \
     --remove-category Education                 \
     --remove-category Science                   \
     --delete-original                           \
@@ -81,10 +86,6 @@ chmod 0755 %{buildroot}%{_sysconfdir}/pr
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
 
-#fixing missing icon
-%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/
-
-
 %find_lang %{name}
 
 %clean
@@ -111,14 +112,22 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/apps/katepart/syntax/microbe.xml
 %{_datadir}/config.kcfg/%{name}.kcfg
 %{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_sysconfdir}/profile.d/%{name}.sh
 
 
 %Changelog
-* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-11.20081031svn
-- fixed BR kdelibX-devel for epel
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-2.200900304svn
+- Fixed Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+- Rebuilt to improve stability : gpsim-0.23
+
+* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900304svn
+- new svn checkout 238
+- included patch from upstream, Julian B?ume, to build on gpsim 0.23
+
+* Sat Jan 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-11.20090131svn
+- new svn checkout 175
 
 * Mon Nov 03 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-10.20081031svn
 - added sdcc as Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Nov 2008 00:02:32 -0000	1.1
+++ sources	5 Sep 2009 09:19:21 -0000	1.2
@@ -1 +1 @@
-79f08b90fc086520094f9086ae3aed1f  ktechlab-svn20081031.tar.bz2
+328bb07a777241a1ccb54162eea5de6f  ktechlab-0.3.7.tar.gz



From chitlesh at fedoraproject.org  Sat Sep  5 09:21:05 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Sep 2009 09:21:05 +0000 (UTC)
Subject: rpms/ktechlab/F-10 import.log,1.3,1.4 ktechlab.spec,1.24,1.25
Message-ID: <20090905092105.D474411C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ktechlab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16663/F-10

Modified Files:
	import.log ktechlab.spec 
Log Message:
Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Mar 2009 21:29:42 -0000	1.3
+++ import.log	5 Sep 2009 09:21:05 -0000	1.4
@@ -1,3 +1,4 @@
 ktechlab-0_3_69-9_20081031svn_fc9:HEAD:ktechlab-0.3.69-9.20081031svn.fc9.src.rpm:1225612333
 ktechlab-0_3_69-10_20081031svn_fc9:HEAD:ktechlab-0.3.69-10.20081031svn.fc9.src.rpm:1225739868
 ktechlab-0_3_70-1_20090304svn_fc10:F-10:ktechlab-0.3.70-1.20090304svn.fc10.src.rpm:1236288430
+ktechlab-0_3_70-2_20090304svn_fc11:F-10:ktechlab-0.3.70-2.20090304svn.fc11.src.rpm:1252142262


Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/F-10/ktechlab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ktechlab.spec	5 Mar 2009 21:29:42 -0000	1.24
+++ ktechlab.spec	5 Sep 2009 09:21:05 -0000	1.25
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3.70
-Release:          1.20090304svn%{?dist}
+Release:          2.20090304svn%{?dist}
 # revision checkout 238
 
 Summary:          Development and simulation of microcontrollers and electronic circuits
@@ -45,9 +45,17 @@ to KTechlab.
 chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf autom4te.cache
 
+# Fix for Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+%{__sed} -i "s|automake\*1.10\*|automake\*1.11\*|" admin/cvs.sh
+
 %patch0 -p0 -b .multilib
+
+# Upstream already applied this patch
 %patch1 -p0 -b .gpsim
 
+# /usr/bin/install: will not overwrite just-created
+%{__sed} -i "s|while.png for.png||" icons/pics/Makefile.am
+
 %build
 
 %{__make} -f Makefile.cvs
@@ -59,7 +67,7 @@ chmod +x ./admin/detect-autoconf.pl
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor ""                \
     --remove-category Education                 \
     --remove-category Science                   \
     --delete-original                           \
@@ -104,13 +112,17 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/apps/katepart/syntax/microbe.xml
 %{_datadir}/config.kcfg/%{name}.kcfg
 %{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_sysconfdir}/profile.d/%{name}.sh
 
 
 %Changelog
-* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900403svn
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-2.200900304svn
+- Fixed Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+- Rebuilt to improve stability : gpsim-0.23
+
+* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900304svn
 - new svn checkout 238
 - included patch from upstream, Julian B?ume, to build on gpsim 0.23
 



From chitlesh at fedoraproject.org  Sat Sep  5 09:47:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Sep 2009 09:47:48 +0000 (UTC)
Subject: rpms/ktechlab/devel ktechlab.spec,1.27,1.28
Message-ID: <20090905094748.0604E11C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ktechlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26763

Modified Files:
	ktechlab.spec 
Log Message:
Fixed rawhide built


Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ktechlab.spec	5 Sep 2009 09:16:59 -0000	1.27
+++ ktechlab.spec	5 Sep 2009 09:47:47 -0000	1.28
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3.70
-Release:          2.20090304svn%{?dist}
+Release:          3.20090304svn%{?dist}
 # revision checkout 238
 
 Summary:          Development and simulation of microcontrollers and electronic circuits
@@ -118,6 +118,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-3.200900304svn
+- Fixed rawhide built
+
 * Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-2.200900304svn
 - Fixed Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11
 - Rebuilt to improve stability : gpsim-0.23



From epienbro at fedoraproject.org  Sat Sep  5 09:52:03 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat,  5 Sep 2009 09:52:03 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel gtk2-fix-install.patch, NONE,
	1.1 mingw32-gtk2.spec, 1.14, 1.15
Message-ID: <20090905095203.4940411C00E5@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28642

Modified Files:
	mingw32-gtk2.spec 
Added Files:
	gtk2-fix-install.patch 
Log Message:
Added a patch from the native gtk2 package to fix translation detection


gtk2-fix-install.patch:
 po-properties/Makefile.in.in |    2 +-
 po/Makefile.in.in            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gtk2-fix-install.patch ---
diff -up gtk+-2.17.11/po/Makefile.in.in.fix-install gtk+-2.17.11/po/Makefile.in.in
--- gtk+-2.17.11/po/Makefile.in.in.fix-install	2009-09-05 01:19:45.303824009 -0400
+++ gtk+-2.17.11/po/Makefile.in.in	2009-09-05 01:19:14.632573806 -0400
@@ -126,7 +126,7 @@ install-data: install-data- at USE_NLS@
 install-data-no: all
 install-data-yes: all
 	$(mkdir_p) $(DESTDIR)$(datadir); \
-	@catalogs='$(CATALOGS)'; \
+	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \
diff -up gtk+-2.17.11/po-properties/Makefile.in.in.fix-install gtk+-2.17.11/po-properties/Makefile.in.in
--- gtk+-2.17.11/po-properties/Makefile.in.in.fix-install	2009-09-05 01:19:54.543583934 -0400
+++ gtk+-2.17.11/po-properties/Makefile.in.in	2009-09-05 01:20:16.427830666 -0400
@@ -107,7 +107,7 @@ install-data: install-data- at USE_NLS@
 install-data-no: all
 install-data-yes: all
 	$(mkdir_p) $(DESTDIR)$(datadir); \
-	@catalogs='$(CATALOGS)'; \
+	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mingw32-gtk2.spec	5 Sep 2009 09:09:50 -0000	1.14
+++ mingw32-gtk2.spec	5 Sep 2009 09:52:03 -0000	1.15
@@ -21,6 +21,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
 Source1:        gdk-pixbuf.loaders
 
+# Patch to fix the translations detection (got broken in GTK 2.17.11)
+Patch0:         gtk2-fix-install.patch
+
 # Fix use of extended buttons in gtkstatusicon.
 Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 
@@ -88,6 +91,8 @@ Static version of the MinGW Windows Gtk2
 %prep
 %setup -q -n gtk+-%{version}
 
+%patch0 -p1
+
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0



From andriy at fedoraproject.org  Sat Sep  5 10:33:08 2009
From: andriy at fedoraproject.org (Andy Shevchenko)
Date: Sat,  5 Sep 2009 10:33:08 +0000 (UTC)
Subject: rpms/python-alsa/devel .cvsignore, 1.6, 1.7 python-alsa.spec, 1.11, 
	1.12 sources, 1.6, 1.7
Message-ID: <20090905103308.EE1B411C00E5@cvs1.fedora.phx.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/python-alsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8015

Modified Files:
	.cvsignore python-alsa.spec sources 
Log Message:
Update to release 1.0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 May 2009 19:40:14 -0000	1.6
+++ .cvsignore	5 Sep 2009 10:33:08 -0000	1.7
@@ -1 +1 @@
-pyalsa-1.0.20.tar.bz2
+pyalsa-1.0.21.tar.bz2


Index: python-alsa.spec
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/devel/python-alsa.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-alsa.spec	26 Jul 2009 20:07:21 -0000	1.11
+++ python-alsa.spec	5 Sep 2009 10:33:08 -0000	1.12
@@ -5,8 +5,8 @@
 
 Summary:	Python binding for the ALSA library
 Name:		python-alsa
-Version:	1.0.20
-Release:	1%{?rcver_dot}%{?dist}.1
+Version:	1.0.21
+Release:	1%{?rcver_dot}%{?dist}
 License:	LGPLv2+
 Group:		Development/Languages
 Source0:	ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-%{version}%{?rcver}.tar.bz2
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Sat Sep 05 2009 Andy Shevchenko <andy at smile.org.ua> - 1.0.21-1
+- update to release 1.0.21
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2009 19:40:14 -0000	1.6
+++ sources	5 Sep 2009 10:33:08 -0000	1.7
@@ -1 +1 @@
-486bcc6a9c45508879811f1cf77423c4  pyalsa-1.0.20.tar.bz2
+660f87168ffa288af2fe28fb1361dc32  pyalsa-1.0.21.tar.bz2



From andriy at fedoraproject.org  Sat Sep  5 10:39:42 2009
From: andriy at fedoraproject.org (Andy Shevchenko)
Date: Sat,  5 Sep 2009 10:39:42 +0000 (UTC)
Subject: rpms/python-alsa/F-11 .cvsignore, 1.6, 1.7 python-alsa.spec, 1.10, 
	1.11 sources, 1.6, 1.7
Message-ID: <20090905103942.B7BE111C00E5@cvs1.fedora.phx.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/python-alsa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11238

Modified Files:
	.cvsignore python-alsa.spec sources 
Log Message:
Update to release 1.0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 May 2009 19:47:39 -0000	1.6
+++ .cvsignore	5 Sep 2009 10:39:42 -0000	1.7
@@ -1 +1 @@
-pyalsa-1.0.20.tar.bz2
+pyalsa-1.0.21.tar.bz2


Index: python-alsa.spec
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/F-11/python-alsa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-alsa.spec	11 May 2009 19:47:39 -0000	1.10
+++ python-alsa.spec	5 Sep 2009 10:39:42 -0000	1.11
@@ -5,7 +5,7 @@
 
 Summary:	Python binding for the ALSA library
 Name:		python-alsa
-Version:	1.0.20
+Version:	1.0.21
 Release:	1%{?rcver_dot}%{?dist}
 License:	LGPLv2+
 Group:		Development/Languages
@@ -41,6 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Sat Sep 05 2009 Andy Shevchenko <andy at smile.org.ua> - 1.0.21-1
+- update to release 1.0.21
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 11 2009 Andy Shevchenko <andy at smile.org.ua> - 1.0.20-1
 - update to release 1.0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2009 19:47:39 -0000	1.6
+++ sources	5 Sep 2009 10:39:42 -0000	1.7
@@ -1 +1 @@
-486bcc6a9c45508879811f1cf77423c4  pyalsa-1.0.20.tar.bz2
+660f87168ffa288af2fe28fb1361dc32  pyalsa-1.0.21.tar.bz2



From andriy at fedoraproject.org  Sat Sep  5 10:46:07 2009
From: andriy at fedoraproject.org (Andy Shevchenko)
Date: Sat,  5 Sep 2009 10:46:07 +0000 (UTC)
Subject: rpms/python-alsa/F-10 .cvsignore, 1.6, 1.7 python-alsa.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20090905104607.4021511C00E5@cvs1.fedora.phx.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/python-alsa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16439

Modified Files:
	.cvsignore python-alsa.spec sources 
Log Message:
Update to release 1.0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 May 2009 19:49:53 -0000	1.6
+++ .cvsignore	5 Sep 2009 10:46:06 -0000	1.7
@@ -1 +1 @@
-pyalsa-1.0.20.tar.bz2
+pyalsa-1.0.21.tar.bz2


Index: python-alsa.spec
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/F-10/python-alsa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-alsa.spec	11 May 2009 19:49:53 -0000	1.8
+++ python-alsa.spec	5 Sep 2009 10:46:06 -0000	1.9
@@ -5,7 +5,7 @@
 
 Summary:	Python binding for the ALSA library
 Name:		python-alsa
-Version:	1.0.20
+Version:	1.0.21
 Release:	1%{?rcver_dot}%{?dist}
 License:	LGPLv2+
 Group:		Development/Languages
@@ -41,6 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Sat Sep 05 2009 Andy Shevchenko <andy at smile.org.ua> - 1.0.21-1
+- update to release 1.0.21
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 11 2009 Andy Shevchenko <andy at smile.org.ua> - 1.0.20-1
 - update to release 1.0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-alsa/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2009 19:49:53 -0000	1.6
+++ sources	5 Sep 2009 10:46:06 -0000	1.7
@@ -1 +1 @@
-486bcc6a9c45508879811f1cf77423c4  pyalsa-1.0.20.tar.bz2
+660f87168ffa288af2fe28fb1361dc32  pyalsa-1.0.21.tar.bz2



From kasal at fedoraproject.org  Sat Sep  5 12:31:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sat,  5 Sep 2009 12:31:57 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSpp/devel perl-ExtUtils-XSpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090905123157.6C41811C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-ExtUtils-XSpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32337/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-ExtUtils-XSpp.spec 
Log Message:
Initial import (#518637).



--- NEW FILE perl-ExtUtils-XSpp.spec ---
Name:           perl-ExtUtils-XSpp
Version:        0.04
Release:        2%{?dist}
Summary:        C++ variant of Perl's XS language
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/ExtUtils-XSpp/
Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Base)
BuildRequires:  perl(Test::Differences)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
ExtUtils::XSpp handles the XS++ language, used to create an extension interface
between Perl and C++ code/library.

%prep
%setup -q -n ExtUtils-XSpp-%{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 -empty -exec rmdir {} \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README XSP.yp
%{_bindir}/xspp
%{perl_vendorlib}/ExtUtils*
%{_mandir}/man?/*

%changelog
* Tue Aug 25 2009 Stepan Kasal <skasal at redhat.com> 0.04-2
- follow suggestions from Parag's review

* Fri Aug 21 2009 Stepan Kasal <skasal at redhat.com> 0.04-1
- Specfile created from a one autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSpp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:22:46 -0000	1.1
+++ .cvsignore	5 Sep 2009 12:31:57 -0000	1.2
@@ -0,0 +1 @@
+ExtUtils-XSpp-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSpp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:22:46 -0000	1.1
+++ sources	5 Sep 2009 12:31:57 -0000	1.2
@@ -0,0 +1 @@
+cfb4f2a2cf079fe675fdf9ea5ee61e64  ExtUtils-XSpp-0.04.tar.gz



From timj at fedoraproject.org  Sat Sep  5 13:03:19 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Sat,  5 Sep 2009 13:03:19 +0000 (UTC)
Subject: rpms/rapidsvn/F-10 .cvsignore, 1.6, 1.7 rapidsvn.spec, 1.17,
	1.18 sources, 1.7, 1.8
Message-ID: <20090905130320.06EAF11C00E5@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/rapidsvn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7902

Modified Files:
	.cvsignore rapidsvn.spec sources 
Log Message:
Update to v0.10.0  
Set default attrs for subpackages
Rebuild fixes #520800



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/F-10/.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	5 Sep 2009 13:03:18 -0000	1.7
@@ -1 +1 @@
-rapidsvn-0.9.6.tar.gz
+rapidsvn-0.10.0.tar.gz


Index: rapidsvn.spec
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/F-10/rapidsvn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rapidsvn.spec	9 May 2009 13:08:25 -0000	1.17
+++ rapidsvn.spec	5 Sep 2009 13:03:18 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           rapidsvn
-Version:        0.9.8
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        Graphical interface for the Subversion revision control system
 
@@ -17,7 +17,7 @@ Requires:       svncpp = %{version}
 
 BuildRequires:  apr-devel, apr-util-devel
 BuildRequires:  libtool >= 1.4.2
-BuildRequires:	openldap-devel
+BuildRequires:  openldap-devel
 
 # For doc generation; rapidsvn needs the "dot" tool from graphviz
 BuildRequires:  docbook-style-xsl >= 1.58.1, doxygen, libxslt >= 1.0.27
@@ -60,6 +60,9 @@ Install this package if you need to comp
 %prep
 %setup -q
 
+# Fix broken configure
+sed -i s_src/tests/svncpp/Makefile__ configure
+
 %{__cat} <<EOF >rapidsvn.desktop
 [Desktop Entry]
 Encoding=UTF-8
@@ -113,15 +116,6 @@ desktop-file-install --vendor fedora    
 # Remove libtool stuff
 rm -f %{buildroot}%{_libdir}/libsvncpp.{a,la}
 
-%check
-pushd src/tests/svncpp
-make
-./svncpptest | grep OK
-if [ $? != 0 ]; then
-	echo "svncpp tests failed"
-	exit 5
-fi
-
 %clean
 rm -rf %{buildroot}
 
@@ -137,14 +131,21 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %files -n svncpp
+%defattr(-,root,root,-)
 %{_libdir}/libsvncpp.so.*
 
 %files -n svncpp-devel
+%defattr(-,root,root,-)
 %doc doc/svncpp/html
 %{_includedir}/svncpp/
 %{_libdir}/libsvncpp.so
 
 %changelog
+* Sat Sep 05 2009 Tim Jackson <rpm at timj.co.uk> 0.10.0-1
+- Update to v0.10.0
+- Set default attrs for subpackages
+- Rebuild fixes #520800
+
 * Tue Apr 14 2009 Tim Jackson <rpm at timj.co.uk> 0.9.8-1
 - Update to v0.9.8
 - License is now GPLv3+
@@ -208,7 +209,7 @@ rm -rf %{buildroot}
 - Spin off svncpp and svncpp-devel subpackages
 - svncpp has ldconfig in post/postun
 - Add --with-svn-lib which should fix build on x86_64
-- Add %check section using package's inbuilt tests (requires cppunit)
+- Add %%check section using package's inbuilt tests (requires cppunit)
 
 * Thu Apr 27 2006 Tim Jackson <rpm at timj.co.uk> 0.9.1-1
 - Initial package for Fedora Extras; based originally on an old DAG spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 May 2009 13:08:26 -0000	1.7
+++ sources	5 Sep 2009 13:03:18 -0000	1.8
@@ -1 +1 @@
-1b49d893027ae83dbcff3d7508b3f42f  rapidsvn-0.9.8.tar.gz
+8af1f19768557537e4acb91e45e6142f  rapidsvn-0.10.0.tar.gz



From kasal at fedoraproject.org  Sat Sep  5 13:13:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sat,  5 Sep 2009 13:13:02 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/devel .cvsignore, 1.5,
	1.6 perl-Mail-IMAPClient.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090905131302.0E5D011C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Mail-IMAPClient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10150

Modified Files:
	.cvsignore perl-Mail-IMAPClient.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-IMAPClient/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2009 20:44:53 -0000	1.5
+++ .cvsignore	5 Sep 2009 13:13:01 -0000	1.6
@@ -1 +1 @@
-Mail-IMAPClient-3.14.tar.gz
+Mail-IMAPClient-3.20.tar.gz


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-IMAPClient/devel/perl-Mail-IMAPClient.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Mail-IMAPClient.spec	26 Jul 2009 09:07:40 -0000	1.9
+++ perl-Mail-IMAPClient.spec	5 Sep 2009 13:13:01 -0000	1.10
@@ -1,11 +1,11 @@
 Name:           perl-Mail-IMAPClient
-Version:        3.14
-Release:        2%{?dist}
+Version:        3.20
+Release:        1%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Mail-IMAPClient/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/Mail-IMAPClient-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PL/PLOBBES/Mail-IMAPClient-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(IO::Socket), perl(constant), perl(Socket)
 BuildRequires:  perl(IO::File), perl(IO::Select), perl(Fcntl), perl(Errno), perl(Carp)
@@ -19,20 +19,18 @@ to and an IMAP conversation with an IMAP
 
 %prep
 %setup -q -n Mail-IMAPClient-%{version}
+sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' examples/*.pl
 
 %build
+# the extended tests cannot be run without an IMAP server
 yes n | %{__perl} Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find examples -type f -exec chmod -x {} 2>/dev/null ';'
-find examples -type f -exec sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' {} 2>/dev/null ';'
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-chmod -x $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/IMAPClient/BodyStructure.pm
 
 %check
 make test
@@ -47,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 3.20-1
+- new upstream source
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-IMAPClient/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 20:44:53 -0000	1.5
+++ sources	5 Sep 2009 13:13:01 -0000	1.6
@@ -1 +1 @@
-bd099eda25cc0cc44e1cecf3f7f22a79  Mail-IMAPClient-3.14.tar.gz
+bc5220b5540e4103f2111c94dcb1c938  Mail-IMAPClient-3.20.tar.gz



From kasal at fedoraproject.org  Sat Sep  5 13:13:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sat,  5 Sep 2009 13:13:42 +0000 (UTC)
Subject: rpms/perl-Wx/devel .cvsignore, 1.20, 1.21 perl-Wx.spec, 1.34,
	1.35 sources, 1.20, 1.21
Message-ID: <20090905131342.434B311C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10463

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	3 Jun 2009 14:23:37 -0000	1.20
+++ .cvsignore	5 Sep 2009 13:13:42 -0000	1.21
@@ -1 +1 @@
-Wx-0.91.tar.gz
+Wx-0.92.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- perl-Wx.spec	25 Aug 2009 13:29:20 -0000	1.34
+++ perl-Wx.spec	5 Sep 2009 13:13:42 -0000	1.35
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Wx
-Version:        0.91
-Release:        8%{?dist}
+Version:        0.92
+Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -19,6 +19,7 @@ BuildRequires:  wxGTK-devel
 BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.21
+BuildRequires:  perl(ExtUtils::XSpp)
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::More), perl(Test::Harness)
 BuildRequires:  perl(Test::Pod)
@@ -95,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 0.92-1
+- new upstream version
+
 * Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-8
 - rebuild with perl-Alien-wxWidgets-0.44-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	3 Jun 2009 14:23:37 -0000	1.20
+++ sources	5 Sep 2009 13:13:42 -0000	1.21
@@ -1 +1 @@
-415318d84c0c6dc69dcf760c0d8bc3ba  Wx-0.91.tar.gz
+273a8770f290a66026bf6ea15060b6ae  Wx-0.92.tar.gz



From mschwendt at fedoraproject.org  Sat Sep  5 13:25:08 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  5 Sep 2009 13:25:08 +0000 (UTC)
Subject: rpms/audacity/F-11 audacity-1.3.8-gsocket-conflict.patch, NONE,
	1.1 audacity-1.3.9-libdir.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 audacity.spec, 1.77, 1.78 sources, 1.12, 1.13 README, 1.26,
	NONE audacity-1.3.6-flac-import.patch, 1.2,
	NONE audacity-1.3.7-audiodevdefaults.patch, 1.2,
	NONE audacity-1.3.7-libdir.patch, 1.2,
	NONE audacity-1.3.7-portaudio-non-mmap-alsa.patch, 1.3,
	NONE audacity-1.3.7-repeat.patch, 1.2, NONE
Message-ID: <20090905132508.7D5D811C00E5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13562

Modified Files:
	.cvsignore audacity.spec sources 
Added Files:
	audacity-1.3.8-gsocket-conflict.patch 
	audacity-1.3.9-libdir.patch 
Removed Files:
	README audacity-1.3.6-flac-import.patch 
	audacity-1.3.7-audiodevdefaults.patch 
	audacity-1.3.7-libdir.patch 
	audacity-1.3.7-portaudio-non-mmap-alsa.patch 
	audacity-1.3.7-repeat.patch 
Log Message:
sync with F-12 devel to offer as F-11 test-update

audacity-1.3.8-gsocket-conflict.patch:
 AudacityApp.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE audacity-1.3.8-gsocket-conflict.patch ---
diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp audacity-src-1.3.8/src/AudacityApp.cpp
--- audacity-src-1.3.8-orig/src/AudacityApp.cpp	2009-07-16 05:27:35.000000000 +0200
+++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 23:45:41.000000000 +0200
@@ -331,7 +331,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <dlfcn.h>
-#include <gtk/gtk.h>
+/*#include <gtk/gtk.h>*/
+#include <glib/gtypes.h>
+#include <glib-object.h>
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;

audacity-1.3.9-libdir.patch:
 LoadLadspa.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-libdir.patch ---
diff -Nur audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp	2009-08-31 12:45:40.000000000 +0200
+++ audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp	2009-09-03 12:01:49.823505468 +0200
@@ -286,7 +286,7 @@
 
    #ifdef __WXGTK__
    wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
-   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
+   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
    wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
    #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Feb 2009 14:21:16 -0000	1.10
+++ .cvsignore	5 Sep 2009 13:25:04 -0000	1.11
@@ -1 +1 @@
-audacity-minsrc-1.3.7.tar.bz2
+audacity-minsrc-1.3.9.tar.bz2


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/audacity.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- audacity.spec	13 May 2009 08:37:01 -0000	1.77
+++ audacity.spec	5 Sep 2009 13:25:06 -0000	1.78
@@ -1,27 +1,24 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.7
+%define tartopdir audacity-src-1.3.9
 
 Name: audacity
-Version: 1.3.7
-Release: 0.7.beta%{?dist}
+Version: 1.3.9
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://audacity.sourceforge.net
 
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-1.3.7.tar.bz2
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.bz2
 Source1: audacity.png
 Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
-Patch2: audacity-1.3.7-libdir.patch
-Patch3: audacity-1.3.6-flac-import.patch
-Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch
-Patch5: audacity-1.3.7-repeat.patch
+Patch2: audacity-1.3.9-libdir.patch
+Patch3: audacity-1.3.8-gsocket-conflict.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
-Patch7: audacity-1.3.7-audiodevdefaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -32,6 +29,7 @@ BuildRequires: gettext
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: ladspa-devel
 BuildRequires: libid3tag-devel
+BuildRequires: taglib-devel
 BuildRequires: libogg-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
@@ -69,13 +67,10 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .dumb-flac-import
-%patch4 -p1 -b .pa-non-mmap-alsa
-%patch5 -p1 -b .repeat
+%patch3 -p1 -b .gsocket-conflict
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
-%patch7 -p1 -b .audiodevdefaults
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -110,6 +105,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+# Audacity 1.3.8-beta complains if the help/manual directories
+# don't exist.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
+
 %{find_lang} %{name}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -147,6 +146,27 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
+- upgrade to 1.3.9-beta
+- upstream's changes in the device prefs code make the audiodevdefaults
+  patch unnecessary afaic see
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-0.3.beta
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.2.beta
+- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
+  conflicts with wxGTK's GSocket class (gsocket.h): as a work-around,
+  include less glib headers
+
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
+- upgrade to 1.3.8-beta
+- BR taglib-devel
+- patches merged/obsoleted upstream:
+  audacity-1.3.7-portaudio-non-mmap-alsa.patch
+  audacity-1.3.7-repeat.patch
+  audacity-1.3.6-flac-import.patch
+
 * Wed May 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.7.beta
 - retag up-to-date files and copy to F-10/F-11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Feb 2009 14:21:17 -0000	1.12
+++ sources	5 Sep 2009 13:25:06 -0000	1.13
@@ -1 +1 @@
-7dcbcd8ed417413fd824d446001058d9  audacity-minsrc-1.3.7.tar.bz2
+0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2


--- README DELETED ---


--- audacity-1.3.6-flac-import.patch DELETED ---


--- audacity-1.3.7-audiodevdefaults.patch DELETED ---


--- audacity-1.3.7-libdir.patch DELETED ---


--- audacity-1.3.7-portaudio-non-mmap-alsa.patch DELETED ---


--- audacity-1.3.7-repeat.patch DELETED ---



From karsten at fedoraproject.org  Sat Sep  5 13:32:08 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sat,  5 Sep 2009 13:32:08 +0000 (UTC)
Subject: rpms/firebird/devel firebird-s390x.patch, NONE, 1.1 firebird.spec,
	1.9, 1.10
Message-ID: <20090905133208.8439F11C00E5@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16204

Modified Files:
	firebird.spec 
Added Files:
	firebird-s390x.patch 
Log Message:
- fix build on s390x for F-12 mass rebuild (Dan Hor?k)



firebird-s390x.patch:
 builds/posix/prefix.linux_s390x |   31 +++++++++++++++++++++++++++++++
 configure.in                    |   10 ++++++++++
 src/jrd/common.h                |    4 ++++
 src/jrd/inf_pub.h               |    1 +
 src/jrd/pag.cpp                 |    8 ++++++--
 src/jrd/utl.cpp                 |    3 ++-
 src/remote/xdr.cpp              |    2 +-
 7 files changed, 55 insertions(+), 4 deletions(-)

--- NEW FILE firebird-s390x.patch ---
diff -up Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x.s390x Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x
--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x.s390x	2009-09-04 17:27:31.000000000 -0400
+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x	2009-09-04 17:27:31.000000000 -0400
@@ -0,0 +1,31 @@
+# The contents of this file are subject to the Interbase Public
+# License Version 1.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy
+# of the License at http://www.Inprise.com/IPL.html
+#
+# Software distributed under the License is distributed on an
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+# or implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code was created by Inprise Corporation
+# and its predecessors. Portions created by Inprise Corporation are
+# Copyright (C) Inprise Corporation.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# Start of file prefix.linux:	$(VERSION)	$(PLATFORM)
+#
+# 3. Sep 2009 Karsten Hopp     - initial verion
+
+COMMON_FLAGS=-m64 -DLINUX -pipe -MMD -fPIC -DS390X -DFB_SEND_FLAGS=MSG_NOSIGNAL -fmessage-length=0 -fsigned-char
+PROD_FLAGS=-ggdb -march=z9-109 -mtune=z10 -O2 -DNDEBUG $(COMMON_FLAGS)
+DEV_FLAGS=-ggdb -p -Wall -Wno-switch  $(COMMON_FLAGS)
+CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+
+OS_ServerFiles=inet_server.cpp
+
+EMBED_UTIL_TARGETS=gstat gds_drop gsec nbackup fb_lock_print fbsvcmgr
+CLIENT_UTIL_TARGETS=gds_drop gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr
+
+Physical_IO_Module=os/posix/unix.cpp
diff -up Firebird-2.1.3.18185-0/configure.in.s390x Firebird-2.1.3.18185-0/configure.in
--- Firebird-2.1.3.18185-0/configure.in.s390x	2009-09-04 18:33:27.000000000 -0400
+++ Firebird-2.1.3.18185-0/configure.in	2009-09-04 18:33:37.000000000 -0400
@@ -182,6 +182,16 @@ dnl CPU_TYPE=ppc64
     SHRLIB_EXT=so
     ;;
 
+  s390x-*-linux*)
+    MAKEFILE_PREFIX=linux_s390x
+    INSTALL_PREFIX=linux
+    PLATFORM=LINUX
+    AC_DEFINE(LINUX, 1, [Define this if OS is Linux])
+    LOCK_MANAGER_FLG=Y
+    EDITLINE_FLG=Y
+    SHRLIB_EXT=so
+    ;;
+
   powerpc*-*-linux*)
     MAKEFILE_PREFIX=linux_powerpc
     INSTALL_PREFIX=linux
diff -up Firebird-2.1.3.18185-0/src/jrd/common.h.s390x Firebird-2.1.3.18185-0/src/jrd/common.h
--- Firebird-2.1.3.18185-0/src/jrd/common.h.s390x	2008-12-23 03:34:32.000000000 -0500
+++ Firebird-2.1.3.18185-0/src/jrd/common.h	2009-09-04 17:27:31.000000000 -0400
@@ -151,6 +151,10 @@
 #define RISC_ALIGNMENT
 #endif // IA64
 
+#ifdef S390X
+#define IMPLEMENTATION  isc_info_db_impl_linux_s390x /* 78  */
+#endif /* s390x */
+
 #define MEMMOVE(from, to, length)		memmove ((void *)to, (void *)from, (size_t) length)
 #define MOVE_FAST(from, to, length)       memcpy (to, from, (int) (length))
 #define MOVE_FASTER(from, to, length)     memcpy (to, from, (int) (length))
diff -up Firebird-2.1.3.18185-0/src/jrd/inf_pub.h.s390x Firebird-2.1.3.18185-0/src/jrd/inf_pub.h
--- Firebird-2.1.3.18185-0/src/jrd/inf_pub.h.s390x	2008-06-09 07:16:32.000000000 -0400
+++ Firebird-2.1.3.18185-0/src/jrd/inf_pub.h	2009-09-04 17:27:31.000000000 -0400
@@ -207,6 +207,7 @@ enum  info_db_implementations
 	isc_info_db_impl_linux_ia64 = 76,
 
 	isc_info_db_impl_darwin_ppc64 = 77,
+	isc_info_db_impl_linux_s390x = 78,
 
 	isc_info_db_impl_last_value   // Leave this LAST!
 };
diff -up Firebird-2.1.3.18185-0/src/jrd/pag.cpp.s390x Firebird-2.1.3.18185-0/src/jrd/pag.cpp
--- Firebird-2.1.3.18185-0/src/jrd/pag.cpp.s390x	2009-01-06 16:25:22.000000000 -0500
+++ Firebird-2.1.3.18185-0/src/jrd/pag.cpp	2009-09-04 17:27:31.000000000 -0400
@@ -160,9 +160,10 @@ static const int CLASS_SOLARIS_AMD64 = 3
 static const int CLASS_LINUX_ARM = 33;    // LINUX/ARM
 static const int CLASS_LINUX_IA64 = 34;    // LINUX/IA64
 static const int CLASS_DARWIN_PPC64 = 35; // Darwin/PowerPC64
+static const int CLASS_LINUX_S390X = 36;    // LINUX/s390x
 
 static const int CLASS_MAX10 = CLASS_LINUX_AMD64;	// This should not be changed, no new ports with ODS10
-static const int CLASS_MAX = CLASS_DARWIN_PPC64;
+static const int CLASS_MAX = CLASS_LINUX_S390X;
 
 // ARCHITECTURE COMPATIBILITY CLASSES
 
@@ -253,7 +254,8 @@ static ArchitectureType archMatrix[CLASS
 	archLittleEndian, // CLASS_SOLARIS_AMD64
 	archLittleEndian, // CLASS_LINUX_ARM
 	archLittleEndian, // CLASS_LINUX_IA64
-	archBigEndian	  // CLASS_DARWIN_PPC64
+	archBigEndian,	  // CLASS_DARWIN_PPC64
+	archBigEndian     // CLASS_LINUX_S390X
 };
 
 #ifdef sun
@@ -311,6 +313,8 @@ const SSHORT CLASS		= CLASS_LINUX_MIPSEL
 const SSHORT CLASS		= CLASS_LINUX_MIPS;
 #elif defined(IA64)
 const SSHORT CLASS		= CLASS_LINUX_IA64;
+#elif defined(S390X)
+const SSHORT CLASS		= CLASS_LINUX_S390X;
 #else
 #error no support on other hardware for Linux
 #endif
diff -up Firebird-2.1.3.18185-0/src/jrd/utl.cpp.s390x Firebird-2.1.3.18185-0/src/jrd/utl.cpp
--- Firebird-2.1.3.18185-0/src/jrd/utl.cpp.s390x	2008-12-10 10:22:17.000000000 -0500
+++ Firebird-2.1.3.18185-0/src/jrd/utl.cpp	2009-09-04 18:31:07.000000000 -0400
@@ -244,7 +244,8 @@ static const TEXT* const impl_implementa
     "Firebird/sun/amd64",	/* 74 */	
     "Firebird/linux ARM",	/* 75 */
     "Firebird/linux IA64",	/* 76 */
-	"Firebird/Darwin/PowerPC64"	/* 77 */
+	"Firebird/Darwin/PowerPC64",	/* 77 */
+    "Firebird/linux S390X"	/* 78 */
 };
 
 
diff -up Firebird-2.1.3.18185-0/src/remote/xdr.cpp.s390x Firebird-2.1.3.18185-0/src/remote/xdr.cpp
--- Firebird-2.1.3.18185-0/src/remote/xdr.cpp.s390x	2008-06-09 07:16:44.000000000 -0400
+++ Firebird-2.1.3.18185-0/src/remote/xdr.cpp	2009-09-04 17:27:31.000000000 -0400
@@ -45,7 +45,7 @@
 // ASF: Currently, all little-endian are SWAP_DOUBLE and big-endian aren't.
 #if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(ARM) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64)
 #define		SWAP_DOUBLE
-#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPUX) || defined(MIPS) || defined(__ppc64__)
+#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPUX) || defined(MIPS) || defined(__ppc64__) || defined(S390X) || defined(__s390x__)
 #undef		SWAP_DOUBLE
 #else
 #error "Define SWAP_DOUBLE for your platform correctly !"


Index: firebird.spec
===================================================================
RCS file: /cvs/extras/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- firebird.spec	10 Aug 2009 22:44:03 -0000	1.9
+++ firebird.spec	5 Sep 2009 13:32:08 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -23,6 +23,7 @@ Patch1:		firebird-edit-fix.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
+Patch5:		firebird-s390x.patch
 
 
 BuildRequires:	autoconf
@@ -134,6 +135,7 @@ iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/RE
 %patch0
 %patch3
 %patch4
+%patch5 -p1
 
 %build
 
@@ -533,6 +535,9 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Karsten Hopp <karsten at redhat.com> 2.1.3.18185.0-5
+- fix build on s390x for F-12 mass rebuild (Dan Hor?k)
+
 * Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
 - build it against system edit lib
 - set correct setuid for Classic lock manager



From spot at fedoraproject.org  Sat Sep  5 13:32:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  5 Sep 2009 13:32:28 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/EL-4 perl-Mail-IMAPClient.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090905133228.D1C7211C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16306/EL-4

Modified Files:
	perl-Mail-IMAPClient.spec sources 
Log Message:
bump to 3.20


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/EL-4/perl-Mail-IMAPClient.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Mail-IMAPClient.spec	26 Aug 2007 16:30:32 -0000	1.2
+++ perl-Mail-IMAPClient.spec	5 Sep 2009 13:32:28 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Mail-IMAPClient
-Version:        2.2.9
-Release:        4%{?dist}
+Version:        3.20
+Release:        1%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Mail-IMAPClient/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DJ/DJKERNEN/Mail-IMAPClient-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PL/PLOBBES/Mail-IMAPClient-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(IO::Socket), perl(constant), perl(Socket)
 BuildRequires:  perl(IO::File), perl(IO::Select), perl(Fcntl), perl(Errno), perl(Carp)
@@ -19,20 +19,18 @@ to and an IMAP conversation with an IMAP
 
 %prep
 %setup -q -n Mail-IMAPClient-%{version}
+sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' examples/*.pl
 
 %build
+# the extended tests cannot be run without an IMAP server
 yes n | %{__perl} Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find examples -type f -exec chmod -x {} 2>/dev/null ';'
-find examples -type f -exec sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' {} 2>/dev/null ';'
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-chmod -x $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/IMAPClient/BodyStructure.pm
 
 %check
 make test
@@ -42,11 +40,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docs/ examples/
+%doc Changes COPYRIGHT README examples/
 %{perl_vendorlib}/Mail/
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 3.20-1
+- new upstream source
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.14-1
+- update to 3.14
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.08-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.08-1
+- 3.08
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.05-1
+- 3.05
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.9-6
+- Rebuild for perl 5.10 (again)
+
+* Mon Jan 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.9-5
+- rebuild for new perl
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.9-4
 - license tag fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2007 19:41:52 -0000	1.2
+++ sources	5 Sep 2009 13:32:28 -0000	1.3
@@ -1 +1 @@
-21c1901d55a2d57f73840cad478c665d  Mail-IMAPClient-2.2.9.tar.gz
+bc5220b5540e4103f2111c94dcb1c938  Mail-IMAPClient-3.20.tar.gz



From spot at fedoraproject.org  Sat Sep  5 13:32:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  5 Sep 2009 13:32:29 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/EL-5 perl-Mail-IMAPClient.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090905133229.11C5711C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16306/EL-5

Modified Files:
	perl-Mail-IMAPClient.spec sources 
Log Message:
bump to 3.20


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/EL-5/perl-Mail-IMAPClient.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Mail-IMAPClient.spec	26 Aug 2007 16:30:35 -0000	1.2
+++ perl-Mail-IMAPClient.spec	5 Sep 2009 13:32:28 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Mail-IMAPClient
-Version:        2.2.9
-Release:        4%{?dist}
+Version:        3.20
+Release:        1%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Mail-IMAPClient/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DJ/DJKERNEN/Mail-IMAPClient-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PL/PLOBBES/Mail-IMAPClient-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(IO::Socket), perl(constant), perl(Socket)
 BuildRequires:  perl(IO::File), perl(IO::Select), perl(Fcntl), perl(Errno), perl(Carp)
@@ -19,20 +19,18 @@ to and an IMAP conversation with an IMAP
 
 %prep
 %setup -q -n Mail-IMAPClient-%{version}
+sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' examples/*.pl
 
 %build
+# the extended tests cannot be run without an IMAP server
 yes n | %{__perl} Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find examples -type f -exec chmod -x {} 2>/dev/null ';'
-find examples -type f -exec sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' {} 2>/dev/null ';'
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-chmod -x $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/IMAPClient/BodyStructure.pm
 
 %check
 make test
@@ -42,11 +40,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docs/ examples/
+%doc Changes COPYRIGHT README examples/
 %{perl_vendorlib}/Mail/
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 3.20-1
+- new upstream source
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.14-1
+- update to 3.14
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.08-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.08-1
+- 3.08
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.05-1
+- 3.05
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.9-6
+- Rebuild for perl 5.10 (again)
+
+* Mon Jan 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.9-5
+- rebuild for new perl
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.9-4
 - license tag fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2007 19:45:33 -0000	1.2
+++ sources	5 Sep 2009 13:32:28 -0000	1.3
@@ -1 +1 @@
-21c1901d55a2d57f73840cad478c665d  Mail-IMAPClient-2.2.9.tar.gz
+bc5220b5540e4103f2111c94dcb1c938  Mail-IMAPClient-3.20.tar.gz



From spot at fedoraproject.org  Sat Sep  5 13:32:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  5 Sep 2009 13:32:29 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/F-11 perl-Mail-IMAPClient.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090905133229.6958B11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16306/F-11

Modified Files:
	perl-Mail-IMAPClient.spec sources 
Log Message:
bump to 3.20


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/F-11/perl-Mail-IMAPClient.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Mail-IMAPClient.spec	13 Mar 2009 20:44:53 -0000	1.8
+++ perl-Mail-IMAPClient.spec	5 Sep 2009 13:32:29 -0000	1.9
@@ -1,11 +1,11 @@
 Name:           perl-Mail-IMAPClient
-Version:        3.14
+Version:        3.20
 Release:        1%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Mail-IMAPClient/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/Mail-IMAPClient-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PL/PLOBBES/Mail-IMAPClient-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(IO::Socket), perl(constant), perl(Socket)
 BuildRequires:  perl(IO::File), perl(IO::Select), perl(Fcntl), perl(Errno), perl(Carp)
@@ -19,20 +19,18 @@ to and an IMAP conversation with an IMAP
 
 %prep
 %setup -q -n Mail-IMAPClient-%{version}
+sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' examples/*.pl
 
 %build
+# the extended tests cannot be run without an IMAP server
 yes n | %{__perl} Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find examples -type f -exec chmod -x {} 2>/dev/null ';'
-find examples -type f -exec sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' {} 2>/dev/null ';'
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-chmod -x $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/IMAPClient/BodyStructure.pm
 
 %check
 make test
@@ -47,6 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 3.20-1
+- new upstream source
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.14-1
 - update to 3.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 20:44:53 -0000	1.5
+++ sources	5 Sep 2009 13:32:29 -0000	1.6
@@ -1 +1 @@
-bd099eda25cc0cc44e1cecf3f7f22a79  Mail-IMAPClient-3.14.tar.gz
+bc5220b5540e4103f2111c94dcb1c938  Mail-IMAPClient-3.20.tar.gz



From spot at fedoraproject.org  Sat Sep  5 13:32:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  5 Sep 2009 13:32:29 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/F-10 perl-Mail-IMAPClient.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090905133229.3D27F11C02C8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16306/F-10

Modified Files:
	perl-Mail-IMAPClient.spec sources 
Log Message:
bump to 3.20


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/F-10/perl-Mail-IMAPClient.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Mail-IMAPClient.spec	21 Jul 2008 19:10:01 -0000	1.6
+++ perl-Mail-IMAPClient.spec	5 Sep 2009 13:32:29 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           perl-Mail-IMAPClient
-Version:        3.08
+Version:        3.20
 Release:        1%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Mail-IMAPClient/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/Mail-IMAPClient-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PL/PLOBBES/Mail-IMAPClient-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(IO::Socket), perl(constant), perl(Socket)
 BuildRequires:  perl(IO::File), perl(IO::Select), perl(Fcntl), perl(Errno), perl(Carp)
@@ -19,20 +19,18 @@ to and an IMAP conversation with an IMAP
 
 %prep
 %setup -q -n Mail-IMAPClient-%{version}
+sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' examples/*.pl
 
 %build
+# the extended tests cannot be run without an IMAP server
 yes n | %{__perl} Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find examples -type f -exec chmod -x {} 2>/dev/null ';'
-find examples -type f -exec sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' {} 2>/dev/null ';'
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-chmod -x $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/IMAPClient/BodyStructure.pm
 
 %check
 make test
@@ -47,6 +45,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 3.20-1
+- new upstream source
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.14-1
+- update to 3.14
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.08-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.08-1
 - 3.08
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Jul 2008 19:10:01 -0000	1.4
+++ sources	5 Sep 2009 13:32:29 -0000	1.5
@@ -1 +1 @@
-688f219e676b0c9da0ce2892449c7c1f  Mail-IMAPClient-3.08.tar.gz
+bc5220b5540e4103f2111c94dcb1c938  Mail-IMAPClient-3.20.tar.gz



From pbrobinson at fedoraproject.org  Sat Sep  5 13:38:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  5 Sep 2009 13:38:31 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.52,1.53
Message-ID: <20090905133831.397D811C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210

Modified Files:
	sugar-toolkit.spec 
Log Message:
- Drop Requires: gettext, it should be just a BuildReq


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sugar-toolkit.spec	2 Sep 2009 08:59:27 -0000	1.52
+++ sugar-toolkit.spec	5 Sep 2009 13:38:30 -0000	1.53
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.85.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -37,7 +37,6 @@ Requires: sugar-base
 Requires: sugar-presence-service
 Requires: python-simplejson
 Requires: python-json
-Requires: gettext
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -69,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep 05 2009 Peter Robinson <pbrobinson at gmail.com> - 0.85.6-2
+- Drop Requires: gettext, it should be just a BuildReq
+
 * Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.6-1
 - New upstream release
 



From pbrobinson at fedoraproject.org  Sat Sep  5 13:57:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  5 Sep 2009 13:57:26 +0000 (UTC)
Subject: rpms/csound/devel csound.spec,1.31,1.32
Message-ID: <20090905135726.28C9511C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26340

Modified Files:
	csound.spec 
Log Message:
- Build fixes, set PulseAudio as default


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- csound.spec	18 Aug 2009 15:37:52 -0000	1.31
+++ csound.spec	5 Sep 2009 13:57:25 -0000	1.32
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       11%{?dist}
+Release:       12%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -32,6 +32,7 @@ BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 BuildRequires: libvorbis-devel libogg-devel
 BuildRequires: gettext
+BuildRequires: gcc-c++ boost-devel
 
 Obsoletes: csound-tutorial <= 5.08
 Obsoletes: olpcsound <= 5.08.92
@@ -48,8 +49,10 @@ Patch5: csound-5.10.1-64-bit-plugin-path
 Patch6: csound-5.10.1-fix-conflicts.patch
 Patch7: csound-5.10.1-fix-locale-install.patch
 Patch8: csound-5.10.1-enable-oggplay.patch
+
 Patch9: csound-2817271-soname.patch
 Patch0: csound-fixpython.patch
+Patch10: csound-default-pulse.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -193,6 +196,7 @@ Canonical Reference Manual for Csound.
 %patch7 -p1 -b .fix-local-install
 %patch8 -p1 -b .enable-oggplay
 %patch9 -p1 -b .2817271-soname
+%patch10 -p1 -b .default-pulse
 
 tar xf %{SOURCE1}
 (cd manual; unzip -q %{SOURCE2})
@@ -377,7 +381,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-java
 
 %files tk
@@ -420,12 +424,15 @@ fi
 %{_libdir}/%{name}/plugins/libvirtual.so
 
 %files manual
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc manual/copying.txt manual/credits.txt manual/readme.txt manual/news.txt
 %doc manual/html/*
 %doc manual/examples
 
 %changelog
+* Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
+- Build fixes, set PulseAudio as default
+
 * Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
 - Further python build fixes
 



From pbrobinson at fedoraproject.org  Sat Sep  5 13:59:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  5 Sep 2009 13:59:25 +0000 (UTC)
Subject: rpms/csound/devel import.log,1.1,NONE
Message-ID: <20090905135925.C491911C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27666

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From caolanm at fedoraproject.org  Sat Sep  5 14:11:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  5 Sep 2009 14:11:07 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.14,1.15
Message-ID: <20090905141107.3F5C111C00E5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30526

Modified Files:
	tabled.spec 
Log Message:
rebuild for dependencies


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tabled.spec	27 Aug 2009 15:27:13 -0000	1.14
+++ tabled.spec	5 Sep 2009 14:11:06 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -105,6 +105,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sat Sep 05 2009 Caol?n McNamara <caolanm at redhat.com> - 0.3-5
+- rebuild for dependencies
+
 * Thu Aug 27 2009 Warren Togami <wtogami at redhat.com> - 0.3-4
 - rebuild
 



From pbrobinson at fedoraproject.org  Sat Sep  5 14:12:07 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  5 Sep 2009 14:12:07 +0000 (UTC)
Subject: rpms/csound/devel csound.spec,1.32,1.33
Message-ID: <20090905141207.02A5B11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30914

Modified Files:
	csound.spec 
Log Message:
- fix ChangeLog


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- csound.spec	5 Sep 2009 13:57:25 -0000	1.32
+++ csound.spec	5 Sep 2009 14:12:06 -0000	1.33
@@ -430,12 +430,9 @@ fi
 %doc manual/examples
 
 %changelog
-* Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
+* Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
 - Build fixes, set PulseAudio as default
 
-* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
-- Further python build fixes
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Sat Sep  5 14:19:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  5 Sep 2009 14:19:12 +0000 (UTC)
Subject: rpms/csound/F-11 csound-fixpython.patch, NONE, 1.1 csound.spec, 1.25,
	1.26
Message-ID: <20090905141912.D0CD611C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384

Modified Files:
	csound.spec 
Added Files:
	csound-fixpython.patch 
Log Message:
 Build fixes, set PulseAudio as default

csound-fixpython.patch:
 install.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE csound-fixpython.patch ---
--- Csound5.10.1/install.py.orig	2009-08-18 09:58:32.000000000 +0100
+++ Csound5.10.1/install.py	2009-08-18 09:59:39.000000000 +0100
@@ -269,9 +269,6 @@
             err = installLink(i, concatPath([libDir, 'libcsound.so']))
         elif i[:15] == 'libcsound64.so.':
             err = installLink(i, concatPath([libDir, 'libcsound64.so']))
-        elif i == 'libcsnd.so':
-            err = installLink(concatPath([libDir, i]),
-                              concatPath([pythonDir2, '_csnd.so']))
         elif i == 'lib_CsoundVST.so':
             err = installLink(concatPath([libDir, i]),
                               concatPath([pythonDir2, '_CsoundVST.so']))
@@ -287,7 +284,7 @@
 #err = installFile('opcodes.dir', pluginDir)
 installErrors = installErrors or err
 pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
-for i in ['libcsound.so', 'libcsound64.so']:
+for i in ['libcsound.so', 'libcsound64.so', 'libcsnd.so']:
     if i in pluginList:
         pluginList.remove(i)
 for i in pluginList:
@@ -304,6 +301,7 @@
 
 print ' === Installing language interfaces ==='
 wrapperList = [['csnd\\.py', '0', pythonDir],
+               ['_csnd\\.so', '1', pythonDir],
                ['loris\\.py', '0', pythonDir],
                ['CsoundVST\\.py', '0', pythonDir],
                ['scoregen\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-11/csound.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- csound.spec	16 Jul 2009 11:18:02 -0000	1.25
+++ csound.spec	5 Sep 2009 14:19:11 -0000	1.26
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       9%{?dist}
+Release:       12%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -23,7 +23,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-devel
 BuildRequires: python python-devel
 BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel pulseaudio-libs-devel
-BuildRequires: fluidsynth-devel liblo-devel dssi-devel
+BuildRequires: fluidsynth-devel liblo-devel dssi-devel lua-devel
 BuildRequires: fltk-devel fltk-fluid
 BuildRequires: java-devel >= 1.4.0
 BuildRequires: jpackage-utils >= 1.5
@@ -32,6 +32,7 @@ BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 BuildRequires: libvorbis-devel libogg-devel
 BuildRequires: gettext
+BuildRequires: gcc-c++ boost-devel
 
 Obsoletes: csound-tutorial <= 5.08
 Obsoletes: olpcsound <= 5.08.92
@@ -48,7 +49,10 @@ Patch5: csound-5.10.1-64-bit-plugin-path
 Patch6: csound-5.10.1-fix-conflicts.patch
 Patch7: csound-5.10.1-fix-locale-install.patch
 Patch8: csound-5.10.1-enable-oggplay.patch
+
 Patch9: csound-2817271-soname.patch
+Patch0: csound-fixpython.patch
+Patch10: csound-default-pulse.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -182,6 +186,7 @@ Canonical Reference Manual for Csound.
 
 %prep
 %setup -q -n Csound5.10.1
+%patch0 -p1 -b .fixpython
 %patch1 -p1 -b .no-usr-local
 %patch2 -p1 -b .default-opcodedir
 %patch3 -p1 -b .rtalsa
@@ -191,6 +196,7 @@ Canonical Reference Manual for Csound.
 %patch7 -p1 -b .fix-local-install
 %patch8 -p1 -b .enable-oggplay
 %patch9 -p1 -b .2817271-soname
+%patch10 -p1 -b .default-pulse
 
 tar xf %{SOURCE1}
 (cd manual; unzip -q %{SOURCE2})
@@ -218,7 +224,10 @@ scons dynamicCsoundLibrary=1 \
       useFluidsynth=1 \
       generatePdf=0 \
       buildCsound5GUI=1 \
+      pythonVersion=2.6 \
       buildPythonOpcodes=1 \
+      buildPythonWrapper=1 \
+      buildLuaWrapper=1 \
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
@@ -311,7 +320,7 @@ fi
 %{_libdir}/%{name}/plugins/libbarmodel.so
 %{_libdir}/%{name}/plugins/libcompress.so
 %{_libdir}/%{name}/plugins/libcontrol.so
-%{_libdir}/%{name}/plugins/libcsnd.so
+%{_libdir}/%{name}/plugins/libchua.so
 %{_libdir}/%{name}/plugins/libcs_date.so
 %{_libdir}/%{name}/plugins/libcs_pan2.so
 %{_libdir}/%{name}/plugins/libcs_pvs_ops.so
@@ -358,10 +367,10 @@ fi
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
-%{_libdir}/libcsnd.so
 
 %files python
 %defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
 %{_libdir}/python%{pyver}/site-packages/*
 
 %files java
@@ -372,7 +381,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-java
 
 %files tk
@@ -415,12 +424,18 @@ fi
 %{_libdir}/%{name}/plugins/libvirtual.so
 
 %files manual
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc manual/copying.txt manual/credits.txt manual/readme.txt manual/news.txt
 %doc manual/html/*
 %doc manual/examples
 
 %changelog
+* Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
+- Build fixes, set PulseAudio as default
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-9
 - Update included files
 



From cebbert at fedoraproject.org  Sat Sep  5 14:19:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat,  5 Sep 2009 14:19:57 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-compile-fixes.patch,1.178,1.178.12.1
Message-ID: <20090905141957.469DE11C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv656

Modified Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-compile-fixes.patch 
Log Message:
fix 2.6.27.32-rc1 build

linux-2.6-compile-fixes.patch:
 b/arch/powerpc/sysdev/fsl_lbc.c |    1 +
 fs/ocfs2/aops.c                 |    1 +
 2 files changed, 2 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.178
retrieving revision 1.178.12.1
diff -u -p -r1.178 -r1.178.12.1
--- linux-2.6-compile-fixes.patch	8 Oct 2008 22:32:46 -0000	1.178
+++ linux-2.6-compile-fixes.patch	5 Sep 2009 14:19:56 -0000	1.178.12.1
@@ -22,3 +22,21 @@ index 422c8fa..1c6c522 100644
  
  struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  EXPORT_SYMBOL(fsl_lbc_regs);
+
+2.6.27.32-rc1 is missing this line, causing:
+fs/ocfs2/aops.c: In function 'ocfs2_write_cluster':
+fs/ocfs2/aops.c:1286: error: 'should_zero' undeclared (first use in this function)
+
+Caused by patch #41:
+ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
+
+--- linux-2.6.27.x86_64.orig/fs/ocfs2/aops.c
++++ linux-2.6.27.x86_64/fs/ocfs2/aops.c
+@@ -1234,6 +1234,7 @@ out:
+  */
+ static int ocfs2_write_cluster(struct address_space *mapping,
+ 			       u32 phys, unsigned int unwritten,
++			       unsigned int should_zero,
+ 			       struct ocfs2_alloc_context *data_ac,
+ 			       struct ocfs2_alloc_context *meta_ac,
+ 			       struct ocfs2_write_ctxt *wc, u32 cpos,



From eponyme at fedoraproject.org  Sat Sep  5 14:49:36 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  5 Sep 2009 14:49:36 +0000 (UTC)
Subject: rpms/abby/devel .cvsignore, 1.5, 1.6 abby.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20090905144936.5CD1711C00E5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12643

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Aug 2009 13:38:24 -0000	1.5
+++ .cvsignore	5 Sep 2009 14:49:34 -0000	1.6
@@ -1 +1 @@
-abby-0.4.2.tar.bz2
+abby-0.4.3.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/abby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- abby.spec	3 Aug 2009 13:38:24 -0000	1.5
+++ abby.spec	5 Sep 2009 14:49:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.3-1
+- Update to 0.4.3
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1
 - Update to 0.4.2
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Aug 2009 13:38:24 -0000	1.5
+++ sources	5 Sep 2009 14:49:34 -0000	1.6
@@ -1 +1 @@
-5ee4b1d085461a7fda7bba46c4fa677b  abby-0.4.2.tar.bz2
+943a2d2c33ba8d7c437b814f0da71f67  abby-0.4.3.tar.bz2



From eponyme at fedoraproject.org  Sat Sep  5 14:51:09 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  5 Sep 2009 14:51:09 +0000 (UTC)
Subject: rpms/abby/F-11 .cvsignore, 1.5, 1.6 abby.spec, 1.4, 1.5 sources, 1.5,
	1.6
Message-ID: <20090905145109.2299811C0417@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13111

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Aug 2009 13:39:55 -0000	1.5
+++ .cvsignore	5 Sep 2009 14:51:08 -0000	1.6
@@ -1 +1 @@
-abby-0.4.2.tar.bz2
+abby-0.4.3.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/abby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- abby.spec	3 Aug 2009 13:39:55 -0000	1.4
+++ abby.spec	5 Sep 2009 14:51:08 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.3-1
+- Update to 0.4.3
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1
 - Update to 0.4.2
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Aug 2009 13:39:55 -0000	1.5
+++ sources	5 Sep 2009 14:51:08 -0000	1.6
@@ -1 +1 @@
-5ee4b1d085461a7fda7bba46c4fa677b  abby-0.4.2.tar.bz2
+943a2d2c33ba8d7c437b814f0da71f67  abby-0.4.3.tar.bz2



From eponyme at fedoraproject.org  Sat Sep  5 14:52:12 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  5 Sep 2009 14:52:12 +0000 (UTC)
Subject: rpms/abby/F-10 .cvsignore, 1.5, 1.6 abby.spec, 1.4, 1.5 sources, 1.5,
	1.6
Message-ID: <20090905145212.E110511C00E5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13452

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Aug 2009 13:40:59 -0000	1.5
+++ .cvsignore	5 Sep 2009 14:52:12 -0000	1.6
@@ -1 +1 @@
-abby-0.4.2.tar.bz2
+abby-0.4.3.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/abby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- abby.spec	3 Aug 2009 13:40:59 -0000	1.4
+++ abby.spec	5 Sep 2009 14:52:12 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.3-1
+- Update to 0.4.3
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1
 - Update to 0.4.2
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Aug 2009 13:40:59 -0000	1.5
+++ sources	5 Sep 2009 14:52:12 -0000	1.6
@@ -1 +1 @@
-5ee4b1d085461a7fda7bba46c4fa677b  abby-0.4.2.tar.bz2
+943a2d2c33ba8d7c437b814f0da71f67  abby-0.4.3.tar.bz2



From eponyme at fedoraproject.org  Sat Sep  5 14:54:21 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  5 Sep 2009 14:54:21 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.7, 1.8 cclive.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <20090905145421.8B07611C00E5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14076

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Aug 2009 17:05:58 -0000	1.7
+++ .cvsignore	5 Sep 2009 14:54:21 -0000	1.8
@@ -1 +1 @@
-cclive-0.4.7.tar.bz2
+cclive-0.5.0.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cclive.spec	16 Aug 2009 17:05:58 -0000	1.7
+++ cclive.spec	5 Sep 2009 14:54:21 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.7
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -9,7 +9,7 @@ URL:            http://code.google.com/p
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcurl-devel
+BuildRequires:  libcurl-devel pcre-devel
 
 %description
 cclive is a command line video extraction utility similar to clive but with
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1
+- Update to 0.5.0
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
 - Update to 0.4.7
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Aug 2009 17:05:58 -0000	1.7
+++ sources	5 Sep 2009 14:54:21 -0000	1.8
@@ -1 +1 @@
-ea7ea8143471690d8972bf9caf21660b  cclive-0.4.7.tar.bz2
+081c631f7ed64f31e5802f294d2f60f9  cclive-0.5.0.tar.bz2



From eponyme at fedoraproject.org  Sat Sep  5 14:55:29 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  5 Sep 2009 14:55:29 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.7, 1.8 cclive.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20090905145529.D85FA11C00E5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14444

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Aug 2009 17:07:03 -0000	1.7
+++ .cvsignore	5 Sep 2009 14:55:29 -0000	1.8
@@ -1 +1 @@
-cclive-0.4.7.tar.bz2
+cclive-0.5.0.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cclive.spec	16 Aug 2009 17:07:03 -0000	1.6
+++ cclive.spec	5 Sep 2009 14:55:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.7
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -9,7 +9,7 @@ URL:            http://code.google.com/p
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcurl-devel
+BuildRequires:  libcurl-devel pcre-devel
 
 %description
 cclive is a command line video extraction utility similar to clive but with
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1
+- Update to 0.5.0
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
 - Update to 0.4.7
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Aug 2009 17:07:03 -0000	1.7
+++ sources	5 Sep 2009 14:55:29 -0000	1.8
@@ -1 +1 @@
-ea7ea8143471690d8972bf9caf21660b  cclive-0.4.7.tar.bz2
+081c631f7ed64f31e5802f294d2f60f9  cclive-0.5.0.tar.bz2



From eponyme at fedoraproject.org  Sat Sep  5 14:56:29 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  5 Sep 2009 14:56:29 +0000 (UTC)
Subject: rpms/cclive/F-10 .cvsignore, 1.7, 1.8 cclive.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20090905145629.5308911C00E5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14753

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Aug 2009 17:08:04 -0000	1.7
+++ .cvsignore	5 Sep 2009 14:56:29 -0000	1.8
@@ -1 +1 @@
-cclive-0.4.7.tar.bz2
+cclive-0.5.0.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/cclive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cclive.spec	16 Aug 2009 17:08:04 -0000	1.6
+++ cclive.spec	5 Sep 2009 14:56:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.7
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -9,7 +9,7 @@ URL:            http://code.google.com/p
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcurl-devel
+BuildRequires:  libcurl-devel pcre-devel
 
 %description
 cclive is a command line video extraction utility similar to clive but with
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1
+- Update to 0.5.0
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
 - Update to 0.4.7
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Aug 2009 17:08:04 -0000	1.7
+++ sources	5 Sep 2009 14:56:29 -0000	1.8
@@ -1 +1 @@
-ea7ea8143471690d8972bf9caf21660b  cclive-0.4.7.tar.bz2
+081c631f7ed64f31e5802f294d2f60f9  cclive-0.5.0.tar.bz2



From djuran at fedoraproject.org  Sat Sep  5 17:50:46 2009
From: djuran at fedoraproject.org (David Juran)
Date: Sat,  5 Sep 2009 17:50:46 +0000 (UTC)
Subject: rpms/azureus/F-11 azureus-no-update-manager-CoreUpdateChecker.patch,
	1.5, 1.6 azureus-no-update-manager-PluginInstallerImpl.patch,
	1.3, 1.4 azureus-no-update-manager-PluginUpdatePlugin.patch, 1.1,
	1.2 azureus-no-update-manager-SWTUpdateChecker.patch, 1.6,
	1.7 azureus-no-update-manager-UpdateMonitor.patch, 1.7,
	1.8 azureus-no-updates-PluginInitializer.patch, 1.3,
	1.4 azureus-no-updates-PluginInterfaceImpl.patch, 1.3,
	1.4 azureus.script, 1.23, 1.24 azureus.spec, 1.76, 1.77
Message-ID: <20090905175046.EEFEC11C00E5@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5756

Modified Files:
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-PluginInstallerImpl.patch 
	azureus-no-update-manager-PluginUpdatePlugin.patch 
	azureus-no-update-manager-SWTUpdateChecker.patch 
	azureus-no-update-manager-UpdateMonitor.patch 
	azureus-no-updates-PluginInitializer.patch 
	azureus-no-updates-PluginInterfaceImpl.patch azureus.script 
	azureus.spec 
Log Message:
- Fix SWT dir on x86_64 (Bz 515228)
- revive the no-updates patches


azureus-no-update-manager-CoreUpdateChecker.patch:
 CoreUpdateChecker.java |  302 -------------------------------------------------
 1 file changed, 1 insertion(+), 301 deletions(-)

Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- azureus-no-update-manager-CoreUpdateChecker.patch	3 Dec 2007 17:03:21 -0000	1.5
+++ azureus-no-update-manager-CoreUpdateChecker.patch	5 Sep 2009 17:50:45 -0000	1.6
@@ -1,6 +1,7 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/update/CoreUpdateChecker.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java	2007-12-03 10:30:37.000000000 -0500
-@@ -124,8 +124,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker	2008-09-15 14:16:22.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java	2009-09-03 20:44:17.000000000 +0300
+@@ -125,8 +125,6 @@ CoreUpdateChecker
  		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
  		
  		rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +10,7 @@
  	}
  	
  	public String
-@@ -144,302 +142,10 @@
+@@ -145,309 +143,11 @@ CoreUpdateChecker
  	checkForUpdate(
  		final UpdateChecker	checker )
  	{
@@ -24,6 +25,11 @@
 -      
 -			displayUserMessage( decoded );
 -			
+-			// No point complaining later if we don't have any data in the map (which is
+-			// more likely due to network problems rather than the version check server
+-			// *actually* returning a map with nothing in it. 
+-			if (decoded.isEmpty()) {return;}
+-			
 -			String latest_version;
 -			String latest_file_name;
 -			
@@ -188,7 +194,7 @@
 -			if ( info_b != null ){
 -			
 -				try{
--					info = new String( info_b );
+-					info = new String( info_b, "UTF-8" );
 -				
 -				}catch( Throwable e ){
 -					
@@ -301,6 +307,8 @@
 -			
 -			Debug.printStackTrace( e );
 -			
+-			checker.reportProgress( "Failed to check for core update: " + Debug.getNestedExceptionMessage(e));
+-			
 -			checker.failed();
 -			
 -		}finally{
@@ -309,6 +317,7 @@
  			
  			first_check = false;
 -		}
++
  	}
  	
        

azureus-no-update-manager-PluginInstallerImpl.patch:
 PluginInstallerImpl.java |  394 +++++++++++++++++++++++------------------------
 1 file changed, 195 insertions(+), 199 deletions(-)

Index: azureus-no-update-manager-PluginInstallerImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-PluginInstallerImpl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-update-manager-PluginInstallerImpl.patch	3 Dec 2007 17:03:21 -0000	1.3
+++ azureus-no-update-manager-PluginInstallerImpl.patch	5 Sep 2009 17:50:45 -0000	1.4
@@ -1,22 +1,165 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2007-12-03 10:32:17.000000000 -0500
-@@ -181,13 +181,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl.patch azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl.patch	2008-09-25 14:32:04.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2009-09-05 19:50:42.000000000 +0300
+@@ -376,87 +376,87 @@ PluginInstallerImpl
  	{
  		PluginUpdatePlugin	pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
  		
--		UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
--		
+-		UpdateManagerImpl	uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
++// 		UpdateManagerImpl	uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
+ 		
 -		UpdateCheckInstance	inst = 
 -			uman.createEmptyUpdateCheckInstance( 
 -					UpdateCheckInstance.UCI_INSTALL,
--					"update.instance.install" );
+-					"update.instance.install",
+-					low_noise );
 -		
+-		if ( listener != null ){
+-			
+-			inst.addListener(
+-				new UpdateCheckInstanceListener()
+-				{
+-					public void
+-					cancelled(
+-						UpdateCheckInstance		instance )
+-					{
+-						listener.failed( new PluginException( "Installation cancelled" ));
+-					}
+-					
+-					public void
+-					complete(
+-						UpdateCheckInstance		instance )
+-					{
+-						final Update[] updates = instance.getUpdates();
++// 		UpdateCheckInstance	inst = 
++// 			uman.createEmptyUpdateCheckInstance( 
++// 					UpdateCheckInstance.UCI_INSTALL,
++// 					"update.instance.install",
++// 					low_noise );
++		
++// 		if ( listener != null ){
++			
++// 			inst.addListener(
++// 				new UpdateCheckInstanceListener()
++// 				{
++// 					public void
++// 					cancelled(
++// 						UpdateCheckInstance		instance )
++// 					{
++// 						listener.failed( new PluginException( "Installation cancelled" ));
++// 					}
++					
++// 					public void
++// 					complete(
++// 						UpdateCheckInstance		instance )
++// 					{
++// 						final Update[] updates = instance.getUpdates();
+ 						
+-						if ( updates.length == 0 ){
++// 						if ( updates.length == 0 ){
+ 														
+-							listener.failed( new PluginException( "No updates were added during check process" ));
++// 							listener.failed( new PluginException( "No updates were added during check process" ));
+ 							
+-						}else{
++// 						}else{
+ 							
+-							for (int i=0;i<updates.length;i++){
++// 							for (int i=0;i<updates.length;i++){
+ 								
+-								updates[i].addListener(
+-									new UpdateListener()
+-									{
+-										private boolean	cancelled;
++// 								updates[i].addListener(
++// 									new UpdateListener()
++// 									{
++// 										private boolean	cancelled;
+ 										
+-										public void 
+-										cancelled(
+-											Update update) 
+-										{
+-											cancelled = true;
++// 										public void 
++// 										cancelled(
++// 											Update update) 
++// 										{
++// 											cancelled = true;
+ 											
+-											check();
+-										}
++// 											check();
++// 										}
+ 										
+-										public void 
+-										complete(
+-											Update update ) 
+-										{
+-											check();
+-										}
++// 										public void 
++// 										complete(
++// 											Update update ) 
++// 										{
++// 											check();
++// 										}
+ 										
+-										protected void
+-										check()
+-										{
+-											for (int i=0;i<updates.length;i++){
++// 										protected void
++// 										check()
++// 										{
++// 											for (int i=0;i<updates.length;i++){
+ 												
+-												if ( !updates[i].isCancelled() && !updates[i].isComplete()){
++// 												if ( !updates[i].isCancelled() && !updates[i].isComplete()){
+ 													
+-													return;
+-												}
+-											}
++// 													return;
++// 												}
++// 											}
+ 											
+-											if ( cancelled ){
++// 											if ( cancelled ){
+ 												
+-												listener.failed( new PluginException( "Installation cancelled" ));
++// 												listener.failed( new PluginException( "Installation cancelled" ));
+ 												
+-											}else{
++// 											}else{
+ 												
+-												listener.done();
+-											}
+-										}
+-									});
+-							}
+-						}
+-					}
+-				});
+-		}
++// 												listener.done();
++// 											}
++// 										}
++// 									});
++// 							}
++// 						}
++// 					}
++// 				});
++// 		}
+ 		
  		try{
  			
- 			for (int i=0;i<plugins.length;i++){
-@@ -254,23 +247,6 @@
+@@ -522,56 +522,52 @@ PluginInstallerImpl
+ 				
+ 					final PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id, false );
  					
- 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
+-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
++// 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
  							
 -					inst.addListener(
 -						new UpdateCheckInstanceListener()
@@ -25,20 +168,67 @@
 -							cancelled(
 -								UpdateCheckInstance		instance )
 -							{
--								dummy_plugin.requestUnload();
+-								try{
++// 					inst.addListener(
++// 						new UpdateCheckInstanceListener()
++// 						{
++// 							public void
++// 							cancelled(
++// 								UpdateCheckInstance		instance )
++// 							{
++// 								try{
+ 								
+-									dummy_plugin_interface.getPluginState().unload();
++// 									dummy_plugin_interface.getPluginState().unload();
+ 									
+-								}catch( Throwable e ){
++// 								}catch( Throwable e ){
+ 									
+-									Debug.out( "Failed to unload plugin", e );
+-								}
 -							}
--							
++// 									Debug.out( "Failed to unload plugin", e );
++// 								}
++// 							}
+ 							
 -							public void
 -							complete(
 -								UpdateCheckInstance		instance )
 -							{
--								dummy_plugin.requestUnload();
+-								PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
++// 							public void
++// 							complete(
++// 								UpdateCheckInstance		instance )
++// 							{
++// 								PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
+ 								
+-								if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
++// 								if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
+ 									
+-									try{
+-										pi.getPluginState().unload();
++// 									try{
++// 										pi.getPluginState().unload();
+ 										
+-									}catch( Throwable e ){
++// 									}catch( Throwable e ){
+ 										
+-										Debug.out( "Failed to unload plugin", e );
+-									}
+-								}
++// 										Debug.out( "Failed to unload plugin", e );
++// 									}
++// 								}
+ 
 -							}
 -						});
- 				}else{
+-				}else{
++// 							}
++// 						});
++// 				}else{
  					
- 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-@@ -278,12 +254,8 @@
+-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
++// 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
  				}
  			}
  		
@@ -51,24 +241,33 @@
  			if ( e instanceof PluginException ){
  				
  				throw((PluginException)e);
-@@ -347,138 +319,6 @@
+@@ -635,138 +631,138 @@ PluginInstallerImpl
  			}
  		}
  		
 -		try{
 -			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
--			
++// 		try{
++// 			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
+ 			
 -			UpdateCheckInstance	inst = 
 -				uman.createEmptyUpdateCheckInstance(
 -						UpdateCheckInstance.UCI_UNINSTALL,
 -						"update.instance.uninstall");
--
++// 			UpdateCheckInstance	inst = 
++// 				uman.createEmptyUpdateCheckInstance(
++// 						UpdateCheckInstance.UCI_UNINSTALL,
++// 						"update.instance.uninstall");
+ 
 -			for (int i=0;i<pis.length;i++){
--				
++// 			for (int i=0;i<pis.length;i++){
+ 				
 -				final PluginInterface	pi = pis[i];
--				
++// 				final PluginInterface	pi = pis[i];
+ 				
 -				final String	plugin_dir = pi.getPluginDirectoryName();
--
++// 				final String	plugin_dir = pi.getPluginDirectoryName();
+ 
 -				inst.addUpdatableComponent(
 -					new UpdatableComponent()
 -					{
@@ -83,7 +282,21 @@
 -						{
 -							return( 0 );
 -						}
--						
++// 				inst.addUpdatableComponent(
++// 					new UpdatableComponent()
++// 					{
++// 						public String
++// 						getName()
++// 						{
++// 							return( pi.getPluginName());
++// 						}
++					
++// 						public int
++// 						getMaximumCheckTime()
++// 						{
++// 							return( 0 );
++// 						}
+ 						
 -						public void
 -						checkForUpdate(
 -							final UpdateChecker	checker )
@@ -91,7 +304,14 @@
 -							try{
 -								ResourceDownloader rd = 
 -									manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
--								
++// 						public void
++// 						checkForUpdate(
++// 							final UpdateChecker	checker )
++// 						{
++// 							try{
++// 								ResourceDownloader rd = 
++// 									manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
+ 								
 -								rd.addListener(
 -									new ResourceDownloaderAdapter()
 -									{
@@ -101,31 +321,54 @@
 -											InputStream			data )
 -										{
 -											try{
--												if ( pi.isUnloadable()){
--											
--													pi.unload();
--													
+-												if ( pi.getPluginState().isUnloadable()){
++// 								rd.addListener(
++// 									new ResourceDownloaderAdapter()
++// 									{
++// 										public boolean
++// 										completed(
++// 											ResourceDownloader	downloader,
++// 											InputStream			data )
++// 										{
++// 											try{
++// 												if ( pi.getPluginState().isUnloadable()){
+ 											
+-													pi.getPluginState().unload();
++// 													pi.getPluginState().unload();
+ 													
 -													FileUtil.recursiveDelete( new File( plugin_dir ));
--												
++// 													FileUtil.recursiveDelete( new File( plugin_dir ));
+ 												
 -												}
--																
++// 												}
+ 																
 -												UpdateInstaller installer = checker.createInstaller();
--													
++// 												UpdateInstaller installer = checker.createInstaller();
+ 													
 -												installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
--											
--												
++// 												installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
+ 											
+ 												
 -											}catch( Throwable e ){
--												
++// 											}catch( Throwable e ){
+ 												
 -												Debug.printStackTrace(e);
 -												Logger.log(new LogAlert(LogAlert.REPEATABLE,
 -														"Plugin uninstall failed", e));
 -											}
--											
++// 												Debug.printStackTrace(e);
++// 												Logger.log(new LogAlert(LogAlert.REPEATABLE,
++// 														"Plugin uninstall failed", e));
++// 											}
+ 											
 -												// don't close the stream as we process it later
--												
++// 												// don't close the stream as we process it later
+ 												
 -											return( true );
 -										}
--										
++// 											return( true );
++// 										}
+ 										
 -										public void
 -										failed(
 -											ResourceDownloader			downloader,
@@ -137,13 +380,27 @@
 -											}
 -										}
 -									});
--	
++// 										public void
++// 										failed(
++// 											ResourceDownloader			downloader,
++// 											ResourceDownloaderException e )
++// 										{
++// 											if ( !downloader.isCancelled()){
++// 												Logger.log(new LogAlert(LogAlert.REPEATABLE,
++// 														"Plugin uninstall failed", e));
++// 											}
++// 										}
++// 									});
+ 	
 -									// the plugin may have > 1 plugin interfaces, make the name up appropriately
--								
++// 									// the plugin may have > 1 plugin interfaces, make the name up appropriately
+ 								
 -								String	update_name = "";
--									
++// 								String	update_name = "";
+ 									
 -								PluginInterface[]	ifs = manager.getPluginInterfaces();
--								
++// 								PluginInterface[]	ifs = manager.getPluginInterfaces();
+ 								
 -							    Arrays.sort( 
 -							    		ifs,
 -									  	new Comparator()
@@ -156,37 +413,70 @@
 -								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
 -								      		}
 -										});
--							    
++// 							    Arrays.sort( 
++// 							    		ifs,
++// 									  	new Comparator()
++// 										{
++// 								      		public int 
++// 											compare(
++// 												Object o1, 
++// 												Object o2)
++// 								      		{
++// 								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
++// 								      		}
++// 										});
+ 							    
 -								for (int i=0;i<ifs.length;i++){
--									
++// 								for (int i=0;i<ifs.length;i++){
+ 									
 -									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
--									
++// 									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
+ 									
 -										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
 -									}
 -								}
--								
++// 										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
++// 									}
++// 								}
+ 								
 -								checker.addUpdate(
 -									update_name,
 -									new String[]{ "Uninstall: " + plugin_dir},
 -									pi.getPluginVersion(),
 -									rd,
--									pi.isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
--									
+-									pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
++// 								checker.addUpdate(
++// 									update_name,
++// 									new String[]{ "Uninstall: " + plugin_dir},
++// 									pi.getPluginVersion(),
++// 									rd,
++// 									pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
+ 									
 -							}finally{
--								
++// 							}finally{
+ 								
 -								checker.completed();
 -							}
--								
++// 								checker.completed();
++// 							}
+ 								
 -						}
 -					}, false );
 -			}
--
++// 						}
++// 					}, false );
++// 			}
+ 
 -			inst.start();
--			
++// 			inst.start();
+ 			
 -		}catch( Throwable e ){
--			
++// 		}catch( Throwable e ){
+ 			
 -			Debug.printStackTrace(e);
 -		}
++// 			Debug.printStackTrace(e);
++// 		}
  	}
  	
  	protected PluginInterface

azureus-no-update-manager-PluginUpdatePlugin.patch:
 PluginUpdatePlugin.java |  234 ++++++++++++++++++++++++------------------------
 1 file changed, 117 insertions(+), 117 deletions(-)

Index: azureus-no-update-manager-PluginUpdatePlugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-PluginUpdatePlugin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-no-update-manager-PluginUpdatePlugin.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-PluginUpdatePlugin.patch	5 Sep 2009 17:50:45 -0000	1.2
@@ -1,11 +1,13 @@
---- org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.orig	2006-02-09 23:32:49.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java	2006-02-09 23:33:49.000000000 -0500
-@@ -130,20 +130,6 @@
- 		
- 		config.addBooleanParameter2( "enable.update", "Plugin.pluginupdate.enablecheck", true );
- 				
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin	2008-09-25 14:32:04.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java	2009-09-05 17:29:07.000000000 +0300
+@@ -138,19 +138,19 @@ PluginUpdatePlugin
+ 	initComplete(
+ 		final PluginConfig		plugin_config )
+ 	{
 -		UpdateManager	update_manager = plugin_interface.getUpdateManager();
--		
++// 		UpdateManager	update_manager = plugin_interface.getUpdateManager();
+ 		
 -		update_manager.addListener(
 -			new UpdateManagerListener()
 -			{
@@ -15,17 +17,25 @@
 -				{
 -					SFPluginDetailsLoaderFactory.getSingleton().reset();
 -				}
--				
++// 		update_manager.addListener(
++// 			new UpdateManagerListener()
++// 			{
++// 				public void
++// 				checkInstanceCreated(
++// 					UpdateCheckInstance	inst )
++// 				{
++// 					SFPluginDetailsLoaderFactory.getSingleton().reset();
++// 				}
+ 				
 -			});
--		
- 		final PluginManager	plugin_manager = plugin_interface.getPluginManager();
++// 			});
  		
- 		PluginInterface[]	plugins = plugin_manager.getPlugins();
-@@ -169,134 +155,6 @@
+ 		final PluginManager	plugin_manager = plugin_interface.getPluginManager();
  		
+@@ -178,133 +178,133 @@ PluginUpdatePlugin
  		final int f_non_mandatory_count	= non_mandatory_count;
  		final int f_mandatory_count		= mandatory_count;
--		
+ 		
 -		update_manager.registerUpdatableComponent( 
 -			new UpdatableComponent()
 -			{
@@ -34,51 +44,86 @@
 -				{
 -					return( "Non-mandatory plugins" );
 -				}
--				
++// 		update_manager.registerUpdatableComponent( 
++// 			new UpdatableComponent()
++// 			{
++// 				public String
++// 				getName()
++// 				{
++// 					return( "Non-mandatory plugins" );
++// 				}
+ 				
 -				public int
 -				getMaximumCheckTime()
 -				{
 -					return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
 -				}	
--				
++// 				public int
++// 				getMaximumCheckTime()
++// 				{
++// 					return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
++// 				}	
+ 				
 -				public void
 -				checkForUpdate(
 -					UpdateChecker	checker )
 -				{
 -					if ( checkForUpdateSupport( checker, null, false ) == 0 ){
--						
++// 				public void
++// 				checkForUpdate(
++// 					UpdateChecker	checker )
++// 				{
++// 					if ( checkForUpdateSupport( checker, null, false ) == 0 ){
+ 						
 -						String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
--						
++// 						String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
+ 						
 -						boolean	found_one = false;
--						
++// 						boolean	found_one = false;
+ 						
 -						for (int i=0;i<rps.length;i++){
--							
++// 						for (int i=0;i<rps.length;i++){
+ 							
 -							String	rp_id = rps[i];
--							
--							if ( plugin_manager.getPluginInterfaceByID( rp_id ) != null ){
--								
++// 							String	rp_id = rps[i];
+ 							
+-							if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
++// 							if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
+ 								
 -									// already installed
--								
++// 									// already installed
+ 								
 -								continue;
 -							}
--							
++// 								continue;
++// 							}
+ 							
 -							final String	config_key = "recommended.processed." + rp_id;
--							
++// 							final String	config_key = "recommended.processed." + rp_id;
+ 							
 -							if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
--								
++// 							if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
+ 								
 -								try{
 -									final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
--									
++// 								try{
++// 									final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
+ 									
 -									StandardPlugin[]	sps = installer.getStandardPlugins();
--									
++// 									StandardPlugin[]	sps = installer.getStandardPlugins();
+ 									
 -									for (int j=0;j<sps.length;j++){
--										
++// 									for (int j=0;j<sps.length;j++){
+ 										
 -										final StandardPlugin	sp = sps[j];
--										
++// 										final StandardPlugin	sp = sps[j];
+ 										
 -										if ( sp.getId().equals( rp_id )){
--										
++// 										if ( sp.getId().equals( rp_id )){
+ 										
 -											found_one = true;
--											
++// 											found_one = true;
+ 											
 -											checker.getCheckInstance().addListener(
 -												new UpdateCheckInstanceListener()
 -												{
@@ -87,15 +132,29 @@
 -														UpdateCheckInstance		instance )
 -													{													
 -													}
--													
++// 											checker.getCheckInstance().addListener(
++// 												new UpdateCheckInstanceListener()
++// 												{
++// 													public void
++// 													cancelled(
++// 														UpdateCheckInstance		instance )
++// 													{													
++// 													}
+ 													
 -													public void
 -													complete(
 -														UpdateCheckInstance		instance )
 -													{
 -														if ( instance.getUpdates().length == 0 ){
--															
++// 													public void
++// 													complete(
++// 														UpdateCheckInstance		instance )
++// 													{
++// 														if ( instance.getUpdates().length == 0 ){
+ 															
 -															installRecommendedPlugin( installer, sp );
--															
++// 															installRecommendedPlugin( installer, sp );
+ 															
 -															plugin_config.setPluginParameter( config_key, true );
 -														}
 -													}
@@ -153,6 +212,63 @@
 -					log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
 -				}
 -			});
++// 															plugin_config.setPluginParameter( config_key, true );
++// 														}
++// 													}
++// 												});
++											
++// 											break;
++// 										}
++// 									}
++									
++// 								}catch( Throwable e ){
++									
++// 								}
++// 							}
++							
++// 							if ( found_one ){
++								
++// 								break;
++// 							}
++// 						}
++// 					}
++// 				}
++				
++// 			}, false );
++		
++// 		update_manager.registerUpdatableComponent( 
++// 				new UpdatableComponent()
++// 				{
++// 					public String
++// 					getName()
++// 					{
++// 						return( "Mandatory plugins" );
++// 					}
++					
++// 					public int
++// 					getMaximumCheckTime()
++// 					{
++// 						return( f_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
++// 					}
++					
++// 					public void
++// 					checkForUpdate(
++// 						UpdateChecker	checker )
++// 					{
++// 						checkForUpdateSupport( checker, null, true );
++// 					}			
++// 				}, true );
++		
++// 		update_manager.addListener(
++// 			new UpdateManagerListener()
++// 			{
++// 				public void
++// 				checkInstanceCreated(
++// 					UpdateCheckInstance	instance )
++// 				{
++// 					log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
++// 				}
++// 			});
  	}
  	
  	protected void

azureus-no-update-manager-SWTUpdateChecker.patch:
 SWTUpdateChecker.java |  226 +++++++++++++++++++++++++-------------------------
 1 file changed, 113 insertions(+), 113 deletions(-)

Index: azureus-no-update-manager-SWTUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-SWTUpdateChecker.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- azureus-no-update-manager-SWTUpdateChecker.patch	7 Dec 2007 15:58:19 -0000	1.6
+++ azureus-no-update-manager-SWTUpdateChecker.patch	5 Sep 2009 17:50:45 -0000	1.7
@@ -1,10 +1,12 @@
---- iorigorg/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2007-12-07 09:52:45.000000000 -0500
-@@ -64,180 +64,12 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
+--- azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker	2008-08-20 12:14:50.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2009-09-05 17:34:43.000000000 +0300
+@@ -64,180 +64,180 @@ public class SWTUpdateChecker implements
    public static void
    initialize()
    {
 -    PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
++//     PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
    }
    
    public SWTUpdateChecker() {    
@@ -13,87 +15,138 @@
    public void checkForUpdate(final UpdateChecker checker) {
 -  	try{
 -	    SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
--	    
--     	boolean	update_required  = 	versionGetter.needsUpdate() && 
--     								System.getProperty("azureus.skipSWTcheck") == null ;
--    	
++//   	try{
++// 	    SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
+ 	    
+-     	boolean	update_required  = 	System.getProperty("azureus.skipSWTcheck") == null && versionGetter.needsUpdate();
++//      	boolean	update_required  = 	System.getProperty("azureus.skipSWTcheck") == null && versionGetter.needsUpdate();
+     	
 -	    if ( update_required ){
--        	    
++// 	    if ( update_required ){
+         	    
 -	       	int	update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
--
++// 	       	int	update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
+ 
 -	    	try{
 -		        URL	swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
--		        
++// 	    	try{
++// 		        URL	swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
+ 		        
 -		        if ( swt_url != null ){
--		        	
++// 		        if ( swt_url != null ){
+ 		        	
 -		        	String	url_str = swt_url.toExternalForm();
--	
++// 		        	String	url_str = swt_url.toExternalForm();
+ 	
 -		        	if ( url_str.startsWith("jar:file:")){
--	
++// 		        	if ( url_str.startsWith("jar:file:")){
+ 	
 -		        		File jar_file = FileUtil.getJarFileFromURL(url_str);
--		        		
++// 		        		File jar_file = FileUtil.getJarFileFromURL(url_str);
+ 		        		
 -		        		String	expected_location;
--		        		
++// 		        		String	expected_location;
+ 		        		
 -		        	    if ( Constants.isOSX ){
--		        	        	  
++// 		        	    if ( Constants.isOSX ){
+ 		        	        	  
 -		        	    	expected_location = checker.getCheckInstance().getManager().getInstallDir() + OSX_APP + "/Contents/Resources/Java";
--		        	            
++// 		        	    	expected_location = checker.getCheckInstance().getManager().getInstallDir() + OSX_APP + "/Contents/Resources/Java";
+ 		        	            
 -		        	    }else{ 
--		        	        	  
++// 		        	    }else{ 
+ 		        	        	  
 -		        	    	expected_location = checker.getCheckInstance().getManager().getInstallDir();
 -		        	    }
--		        	    
++// 		        	    	expected_location = checker.getCheckInstance().getManager().getInstallDir();
++// 		        	    }
+ 		        	    
 -		        	    File	expected_dir = new File( expected_location );
--		        	    
++// 		        	    File	expected_dir = new File( expected_location );
+ 		        	    
 -		        	    File	jar_file_dir = jar_file.getParentFile();
--		        	    
++// 		        	    File	jar_file_dir = jar_file.getParentFile();
+ 		        	    
 -		        	    	// sanity check
--		        	    
++// 		        	    	// sanity check
+ 		        	    
 -		        	    if ( expected_dir.exists() && jar_file_dir.exists() ){
--		        	    	
++// 		        	    if ( expected_dir.exists() && jar_file_dir.exists() ){
+ 		        	    	
 -		        	    	expected_dir	= expected_dir.getCanonicalFile();
 -		        	    	jar_file_dir	= jar_file_dir.getCanonicalFile();
--		        	    	
++// 		        	    	expected_dir	= expected_dir.getCanonicalFile();
++// 		        	    	jar_file_dir	= jar_file_dir.getCanonicalFile();
+ 		        	    	
 -		        	    	if ( expected_dir.equals( jar_file_dir )){
--		        	    	
++// 		        	    	if ( expected_dir.equals( jar_file_dir )){
+ 		        	    	
 -		        	    			// everything looks ok
--		        	    		
++// 		        	    			// everything looks ok
+ 		        	    		
 -		        	    		if ( update_prevented_version != -1 ){
--		        	    			
++// 		        	    		if ( update_prevented_version != -1 ){
+ 		        	    			
 -		        	    			update_prevented_version	= -1;
--		        	    			
++// 		        	    			update_prevented_version	= -1;
+ 		        	    			
 -			        	    		COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
 -		        	    		}
 -		        	    	}else{
--		        	    		
++// 			        	    		COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
++// 		        	    		}
++// 		        	    	}else{
+ 		        	    		
 -		        	    			// we need to periodically remind the user there's a problem as they need to realise that
 -		        	    			// it is causing ALL updates (core/plugin) to fail
--		        	    		
++// 		        	    			// we need to periodically remind the user there's a problem as they need to realise that
++// 		        	    			// it is causing ALL updates (core/plugin) to fail
+ 		        	    		
+-		        	    		String	alert = 
+-		        	    			MessageText.getString( 
+-		        	    					"swt.alert.cant.update", 
+-		        	    					new String[]{
+-			        	    					String.valueOf( versionGetter.getCurrentVersion()),
+-			        	    					String.valueOf( versionGetter.getLatestVersion()),
+-		        	    						jar_file_dir.toString(), 
+-		        	    						expected_dir.toString()});
++// 		        	    		String	alert = 
++// 		        	    			MessageText.getString( 
++// 		        	    					"swt.alert.cant.update", 
++// 		        	    					new String[]{
++// 			        	    					String.valueOf( versionGetter.getCurrentVersion()),
++// 			        	    					String.valueOf( versionGetter.getLatestVersion()),
++// 		        	    						jar_file_dir.toString(), 
++// 		        	    						expected_dir.toString()});
+ 		        	    		
+-		        	    		checker.reportProgress( alert );
++// 		        	    		checker.reportProgress( alert );
+ 		        	    		
 -		        	    		long	last_prompt = COConfigurationManager.getLongParameter( "swt.update.prevented.version.time", 0 );
 -		        	    		long	now			= SystemTime.getCurrentTime();
--		        	    		
++// 		        	    		long	last_prompt = COConfigurationManager.getLongParameter( "swt.update.prevented.version.time", 0 );
++// 		        	    		long	now			= SystemTime.getCurrentTime();
+ 		        	    		
 -		        	    		boolean force = now < last_prompt || now - last_prompt > 7*24*60*60*1000;
--		        	    		
++// 		        	    		boolean force = now < last_prompt || now - last_prompt > 7*24*60*60*1000;
+ 		        	    		
 -		        	    		if ( !checker.getCheckInstance().isAutomatic()){
--		        	    			
++// 		        	    		if ( !checker.getCheckInstance().isAutomatic()){
+ 		        	    			
 -		        	    			force = true;
 -		        	    		}
--		        	    		
++// 		        	    			force = true;
++// 		        	    		}
+ 		        	    		
 -		        		    	if ( force || update_prevented_version != versionGetter.getCurrentVersion()){
--			        		    		
--			        	    		String	alert = 
--			        	    			MessageText.getString( 
--			        	    					"swt.alert.cant.update", 
--			        	    					new String[]{
--				        	    					String.valueOf( versionGetter.getCurrentVersion()),
--				        	    					String.valueOf( versionGetter.getLatestVersion()),
--			        	    						jar_file_dir.toString(), 
--			        	    						expected_dir.toString()});
--			        	    		
++// 		        		    	if ( force || update_prevented_version != versionGetter.getCurrentVersion()){
+ 			        		    				        	    		
 -			        	     		Logger.log(	new LogAlert(LogAlert.REPEATABLE, LogEvent.LT_ERROR, alert ));
--			        						
++// 			        	     		Logger.log(	new LogAlert(LogAlert.REPEATABLE, LogEvent.LT_ERROR, alert ));
+ 			        						
 -			        	     		update_prevented_version = versionGetter.getCurrentVersion();
--			        	     		
++// 			        	     		update_prevented_version = versionGetter.getCurrentVersion();
+ 			        	     		
 -			        	    		COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
 -			        	    		COConfigurationManager.setParameter( "swt.update.prevented.version.time", now );
 -		        		    	}
@@ -102,25 +155,43 @@
 -		        	}
 -		        }
 -	    	}catch( Throwable e ){
--		    	
++// 			        	    		COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
++// 			        	    		COConfigurationManager.setParameter( "swt.update.prevented.version.time", now );
++// 		        		    	}
++// 		        	    	}
++// 		        	    }
++// 		        	}
++// 		        }
++// 	    	}catch( Throwable e ){
+ 		    	
 -		    	Debug.printStackTrace(e);		    	
 -	    	}
--	    
++// 		    	Debug.printStackTrace(e);		    	
++// 	    	}
+ 	    
 -		    if ( update_prevented_version == versionGetter.getCurrentVersion()){
--			
++// 		    if ( update_prevented_version == versionGetter.getCurrentVersion()){
+ 			
 -		    	Logger.log(new LogEvent(LOGID, LogEvent.LT_ERROR, "SWT update aborted due to previously reported issues regarding its install location" ));
--		    			
++// 		    	Logger.log(new LogEvent(LOGID, LogEvent.LT_ERROR, "SWT update aborted due to previously reported issues regarding its install location" ));
+ 		    			
 -				checker.failed();
--				
++// 				checker.failed();
+ 				
 -				checker.getCheckInstance().cancel();
--				
++// 				checker.getCheckInstance().cancel();
+ 				
 -				return;
 -		    }
--	    	    	 
++// 				return;
++// 		    }
+ 	    	    	 
 -	      String[] mirrors = versionGetter.getMirrors();
--	      
++// 	      String[] mirrors = versionGetter.getMirrors();
+ 	      
 -	      ResourceDownloader swtDownloader = null;
--	      
++// 	      ResourceDownloader swtDownloader = null;
+ 	      
 -          ResourceDownloaderFactory factory = ResourceDownloaderFactoryImpl.getSingleton();
 -          List downloaders =  new ArrayList();
 -          for(int i = 0 ; i < mirrors.length ; i++) {
@@ -136,31 +207,62 @@
 -          ResourceDownloader[] resourceDownloaders = 
 -            (ResourceDownloader[]) 
 -            downloaders.toArray(new ResourceDownloader[downloaders.size()]);
--          
++//           ResourceDownloaderFactory factory = ResourceDownloaderFactoryImpl.getSingleton();
++//           List downloaders =  new ArrayList();
++//           for(int i = 0 ; i < mirrors.length ; i++) {
++//             try {
++//               downloaders.add(factory.getSuffixBasedDownloader(factory.create(new URL(mirrors[i]))));
++//             } catch(MalformedURLException e) {
++//               //Do nothing
++//             	if (Logger.isEnabled())
++// 								Logger.log(new LogEvent(LOGID, LogEvent.LT_WARNING,
++// 										"Cannot use URL " + mirrors[i] + " (not valid)"));
++//             }
++//           }
++//           ResourceDownloader[] resourceDownloaders = 
++//             (ResourceDownloader[]) 
++//             downloaders.toArray(new ResourceDownloader[downloaders.size()]);
+           
 -          swtDownloader = factory.getRandomDownloader(resourceDownloaders);
--	      
++//           swtDownloader = factory.getRandomDownloader(resourceDownloaders);
+ 	      
 -	      	// get the size so its cached up
--	      
++// 	      	// get the size so its cached up
+ 	      
 -	      try{
 -	      	swtDownloader.getSize();
--	      	
++// 	      try{
++// 	      	swtDownloader.getSize();
+ 	      	
 -	      }catch( ResourceDownloaderException e ){
--	      
++// 	      }catch( ResourceDownloaderException e ){
+ 	      
 -	      	Debug.printStackTrace( e );
 -	      }
--	      
++// 	      	Debug.printStackTrace( e );
++// 	      }
+ 	      
 -	      final Update update = 
 -	    	  checker.addUpdate("SWT Library for " + versionGetter.getPlatform(),
--		          new String[] {"SWT is the graphical library used by Azureus"},
+-		          new String[] {"SWT is the graphical library used by " + Constants.APP_NAME},
 -		          "" + versionGetter.getLatestVersion(),
 -		          swtDownloader,
 -		          Update.RESTART_REQUIRED_YES
 -	          );
--	      
++// 	      final Update update = 
++// 	    	  checker.addUpdate("SWT Library for " + versionGetter.getPlatform(),
++// 		          new String[] {"SWT is the graphical library used by " + Constants.APP_NAME},
++// 		          "" + versionGetter.getLatestVersion(),
++// 		          swtDownloader,
++// 		          Update.RESTART_REQUIRED_YES
++// 	          );
+ 	      
 -	      update.setDescriptionURL(versionGetter.getInfoURL());
--	      
++// 	      update.setDescriptionURL(versionGetter.getInfoURL());
+ 	      
 -	      swtDownloader.addListener(new ResourceDownloaderAdapter() {
--		        
++// 	      swtDownloader.addListener(new ResourceDownloaderAdapter() {
+ 		        
 -		        public boolean completed(ResourceDownloader downloader, InputStream data) {
 -		          //On completion, process the InputStream to store temp files
 -		          return processData(checker,update,downloader,data);
@@ -170,14 +272,26 @@
 -  	}catch( Throwable e ){
 -  		Logger.log(new LogAlert(LogAlert.UNREPEATABLE,
 -					"SWT Version check failed", e));
--  		
++// 		        public boolean completed(ResourceDownloader downloader, InputStream data) {
++// 		          //On completion, process the InputStream to store temp files
++// 		          return processData(checker,update,downloader,data);
++// 		        }
++// 		      });
++// 	    }
++//   	}catch( Throwable e ){
++//   		Logger.log(new LogAlert(LogAlert.UNREPEATABLE,
++// 					"SWT Version check failed", e));
+   		
 -  		checker.failed();
--  		
++//   		checker.failed();
+   		
 -  	}finally{
--  		
++//   	}finally{
+   		
 -  		checker.completed();
 -  	}
--    
++//   		checker.completed();
++//   	}
+     
    }
    
-   private boolean 

azureus-no-update-manager-UpdateMonitor.patch:
 UpdateMonitor.java |  221 +++++++++++++----------------------------------------
 1 file changed, 57 insertions(+), 164 deletions(-)

Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- azureus-no-update-manager-UpdateMonitor.patch	29 Jan 2008 16:02:38 -0000	1.7
+++ azureus-no-update-manager-UpdateMonitor.patch	5 Sep 2009 17:50:45 -0000	1.8
@@ -1,17 +1,27 @@
---- origorg/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2007-11-30 10:44:14.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2008-01-29 10:08:47.000000000 -0500
-@@ -89,70 +89,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
+--- azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor	2008-10-01 15:58:50.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2009-09-05 17:40:13.000000000 +0300
+@@ -99,66 +99,66 @@ public class UpdateMonitor
  	protected UpdateMonitor(AzureusCore _azureus_core) {
  		azCore = _azureus_core;
  
 -		PluginInterface defPI = azCore.getPluginManager().getDefaultPluginInterface();
 -		UpdateManager um = defPI.getUpdateManager();
--
++// 		PluginInterface defPI = azCore.getPluginManager().getDefaultPluginInterface();
++// 		UpdateManager um = defPI.getUpdateManager();
+ 
 -		um.addListener(new UpdateManagerListener() {
 -			public void checkInstanceCreated(UpdateCheckInstance instance) {
 -				instance.addListener(UpdateMonitor.this);
--				
--				new updateStatusChanger(instance);
++// 		um.addListener(new UpdateManagerListener() {
++// 			public void checkInstanceCreated(UpdateCheckInstance instance) {
++// 				instance.addListener(UpdateMonitor.this);
+ 				
+-				if ( !instance.isLowNoise()){
++// 				if ( !instance.isLowNoise()){
+ 				
+-					new updateStatusChanger(instance);
+-				}
 -			}
 -		});
 -
@@ -61,17 +71,61 @@
 -						performAutoCheck(false);
 -					}
 -				});
--
--		// wait a bit before starting check to give rest of AZ time to initialise 
--		new DelayedEvent("UpdateMon:wait", 2500, new AERunnable() {
--			public void runSupport() {
--				performAutoCheck(true);
--			}
--		});
- 	}
++// 					new updateStatusChanger(instance);
++// 				}
++// 			}
++// 		});
++
++// 		um.addVerificationListener(new UpdateManagerVerificationListener() {
++// 			public boolean acceptUnVerifiedUpdate(final Update update) {
++// 				UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
++// 				if (uiFunctions != null) {
++// 					String title = MessageText.getString(MSG_PREFIX
++// 							+ "accept.unverified.title");
++// 					String text = MessageText.getString(MSG_PREFIX
++// 							+ "accept.unverified.text", new String[] {
++// 						update.getName()
++// 					});
++// 					return uiFunctions.promptUser(title, text, new String[] {
++// 						MessageText.getString("Button.yes"),
++// 						MessageText.getString("Button.no")
++// 					}, 1, MSG_PREFIX + "accept.unverified",
++// 							MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
++// 							0) == 0;
++// 				}
++
++// 				return false;
++// 			}
++
++// 			public void verificationFailed(final Update update, final Throwable cause) {
++// 				final String cause_str = Debug.getNestedExceptionMessage(cause);
++// 				UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
++// 				if (uiFunctions != null) {
++// 					String title = MessageText.getString(MSG_PREFIX
++// 							+ "verification.failed.title");
++// 					String text = MessageText.getString(MSG_PREFIX
++// 							+ "verification.failed.text", new String[] {
++// 						update.getName(),
++// 						cause_str
++// 					});
++// 					uiFunctions.promptUser(title, text, new String[] {
++// 						MessageText.getString("Button.ok")
++// 					}, 0, null, null, false, 0);
++// 				}
++// 			}
++// 		});
++
++
++// 		SimpleTimer.addPeriodicEvent("UpdateMon:autocheck",
++// 				AUTO_UPDATE_CHECK_PERIOD, new TimerEventPerformer() {
++// 					public void perform(TimerEvent ev) {
++// 						performAutoCheck(false);
++// 					}
++// 				});
  
- 	protected class updateStatusChanger
-@@ -306,43 +242,6 @@
+ 		DelayedTask delayed_task = 
+ 			UtilitiesImpl.addDelayedTask(
+@@ -380,43 +380,6 @@ public class UpdateMonitor
  	}
  	
  	protected void performAutoCheck(final boolean start_of_day) {
@@ -115,7 +169,7 @@
  	}
  
  	public void 
-@@ -352,76 +251,6 @@
+@@ -426,76 +389,6 @@ public class UpdateMonitor
  		final boolean						isRecheck,
  		final UpdateCheckInstanceListener 	l ) 
  	{

azureus-no-updates-PluginInitializer.patch:
 PluginInitializer.java |   51 ++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

Index: azureus-no-updates-PluginInitializer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-updates-PluginInitializer.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-updates-PluginInitializer.patch	3 Dec 2007 17:03:21 -0000	1.3
+++ azureus-no-updates-PluginInitializer.patch	5 Sep 2009 17:50:45 -0000	1.4
@@ -1,6 +1,7 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2007-12-03 10:27:39.000000000 -0500
-@@ -44,13 +44,8 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer	2008-10-31 16:25:38.000000000 +0200
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2009-09-02 21:53:06.000000000 +0300
+@@ -44,13 +44,8 @@ import org.gudy.azureus2.core3.logging.*
  import org.gudy.azureus2.plugins.*;
  import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
  import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
@@ -14,61 +15,87 @@
  
  /**
   * @author Olivier
-@@ -91,11 +86,6 @@
-    					"azbpsharehoster", 
+@@ -95,12 +90,12 @@ PluginInitializer
     					"ShareHoster",
- 					"true" },
+ 					"true",
+ 					"false"},
 -   			{	 PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER, 
 -   					"org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin", 
 -   					"azbppluginupdate", 
 -   					"PluginUpdate",
--					"true" },
- 			{	 PluginManagerDefaults.PID_CLIENT_ID, 
- 				    "com.aelitis.azureus.plugins.clientid.ClientIDPlugin", 
- 				    "azbpclientid", 
-@@ -121,16 +111,6 @@
- 					"azbpmagnet", 
+-					"true",
+-					"true"},
++//    			{	 PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER, 
++//    					"org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin", 
++//    					"azbppluginupdate", 
++//    					"PluginUpdate",
++// 					"true",
++// 					"true"},
+ 			{	 PluginManagerDefaults.PID_UPNP, 
+ 				    "com.aelitis.azureus.plugins.upnp.UPnPPlugin", 
+ 				    "azbpupnp", 
+@@ -125,18 +120,18 @@ PluginInitializer
  					"Magnet URI Handler",
- 					"true" },
+ 					"true",
+ 					"false"},
 -			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
 -   					"org.gudy.azureus2.update.CoreUpdateChecker", 
 -   					"azbpcoreupdater", 
 -   					"CoreUpdater",
--					"true" },
+-					"true",
+-					"true"},
 -			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
 -   					"org.gudy.azureus2.update.CorePatchChecker", 
 -   					"azbpcorepatcher", 
 -   					"CorePatcher",
--					"true" },
+-					"true",
+-					"true"},
++// 			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
++//    					"org.gudy.azureus2.update.CoreUpdateChecker", 
++//    					"azbpcoreupdater", 
++//    					"CoreUpdater",
++// 					"true",
++// 					"true"},
++// 			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
++//    					"org.gudy.azureus2.update.CorePatchChecker", 
++//    					"azbpcorepatcher", 
++//    					"CorePatcher",
++// 					"true",
++// 					"true"},
  	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
     					"org.gudy.azureus2.platform.PlatformManagerPluginDelegate", 
     					"azplatform2", 
-@@ -316,11 +296,7 @@
+@@ -420,11 +415,11 @@ PluginInitializer
    	
    	core_operation 	= _core_operation;
      
 -    UpdateManagerImpl.getSingleton( azureus_core );	// initialise the update manager
--       
++	//    UpdateManagerImpl.getSingleton( azureus_core );	// initialise the update manager
+        
      plugin_manager = PluginManagerImpl.getSingleton( this );
--    
+     
 -    UpdaterUtils.checkBootstrapPlugins();
++    //   UpdaterUtils.checkBootstrapPlugins();
    }
    
-   protected boolean
-@@ -946,16 +922,11 @@
- 	      
+   protected void
+@@ -1122,8 +1117,8 @@ PluginInitializer
  	      if ( load_failure != null ){
- 	      		  
--	    	  	// don't complain about our internal one
--	    	  
+ 	    	  plugin_interface.setAsFailed();
+ 	    	  
+-	    	// don't complain about our internal one
 -	    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
--	    		  
- 		      	String	msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
- 		   	 
- 		      	Logger.log(new LogAlert(LogAlert.UNREPEATABLE, msg, load_failure));
++		  //	    	// don't complain about our internal one
++		  //	    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
+ 	    		  
+ 		      	String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
+ 		      	LogAlert la;
+@@ -1136,7 +1131,7 @@ PluginInitializer
+ 		      	Logger.log(la);
  	
- 		      	System.out.println( msg + " : " + load_failure);
+ 		      	System.out.println( msg + ": " + load_failure);
 -		      }
++			//		      }
  	      }
    		}
  	      

azureus-no-updates-PluginInterfaceImpl.patch:
 PluginInterfaceImpl.java |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: azureus-no-updates-PluginInterfaceImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-updates-PluginInterfaceImpl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-updates-PluginInterfaceImpl.patch	29 May 2006 16:02:45 -0000	1.3
+++ azureus-no-updates-PluginInterfaceImpl.patch	5 Sep 2009 17:50:45 -0000	1.4
@@ -1,6 +1,7 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig	2006-05-02 02:33:14.000000000 -0700
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2006-05-12 09:58:07.000000000 -0700
-@@ -48,7 +48,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.no-updates-PluginInterfaceImpl azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.no-updates-PluginInterfaceImpl	2008-08-20 08:20:26.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2009-09-03 20:35:39.000000000 +0300
+@@ -50,7 +50,6 @@ import org.gudy.azureus2.pluginsimpl.loc
  import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository;
  import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl;
  import org.gudy.azureus2.pluginsimpl.local.utils.*;
@@ -8,12 +9,12 @@
  import org.gudy.azureus2.plugins.ipc.IPCInterface;
  import org.gudy.azureus2.plugins.ipfilter.IPFilter;
  import org.gudy.azureus2.plugins.tracker.Tracker;
-@@ -412,7 +411,7 @@
+@@ -426,7 +425,7 @@ PluginInterfaceImpl 
    public UpdateManager
    getUpdateManager()
    {
 -  	return( UpdateManagerImpl.getSingleton( initialiser.getAzureusCore()));
-+      return( null );
++  	return( null );
    }
  
-   public PeerProtocolManager
+   


Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus.script,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- azureus.script	1 Sep 2009 18:38:26 -0000	1.23
+++ azureus.script	5 Sep 2009 17:50:45 -0000	1.24
@@ -12,7 +12,6 @@ SCRIPT_VERSION=2
 rm -rf $APPDIR/plugins
 mkdir -p $APPDIR/plugins
 pushd $APPDIR/plugins > /dev/null 2>&1
-
 if ls /usr/share/azureus/plugins/* > /dev/null 2>&1;then
     for pdir in /usr/share/azureus/plugins/*; do
 	ln -s $pdir .;
@@ -25,10 +24,12 @@ case $(uname -i) in
         *64)
                 eval $(grep '^GRE_PATH=' /etc/gre.d/gre64.conf)
                 SWT=/usr/lib64/eclipse/swt.jar
+		LIBDIR=/usr/lib64
                 ;;
         *)
                 eval $(grep '^GRE_PATH=' /etc/gre.d/gre.conf)
                 SWT=/usr/lib/eclipse/swt.jar
+		LIBDIR=/usr/lib
                 ;;
 esac
 MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:/usr/lib/eclipse/plugins/:/usr/lib/eclipse/:/usr/lib/ CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- azureus.spec	1 Sep 2009 18:38:26 -0000	1.76
+++ azureus.spec	5 Sep 2009 17:50:45 -0000	1.77
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	4.0.0.4
-Release:	4%{?dist}
+Release:	6%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -23,7 +23,7 @@ Patch2:		azureus-cache-size.patch
 Patch3:		azureus-remove-manifest-classpath.patch
 Patch9:		azureus-no-shared-plugins.patch
 Patch12:	azureus-no-updates-PluginInitializer.patch
-#Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
+Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
 Patch14:	azureus-no-update-manager-AzureusCoreImpl.patch
 Patch15:	azureus-no-update-manager-CorePatchChecker.patch
 Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
@@ -77,16 +77,16 @@ advanced users.
 %patch2 -p0
 %patch3 -p0
 %patch9 -p0
-#%patch12 -p0
-#%patch13 -p0
+%patch12 -p1 -b .no-updates-PluginInitializer
+%patch13 -p1 -b .no-updates-PluginInterfaceImpl
 %patch14 -p0
 %patch15 -p0
-#%patch16 -p0
-#%patch18 -p0
-#%patch19 -p0
-#%patch20 -p0
-#%patch22 -p0
-#%patch23 -p0
+%patch16 -p1 -b .no-update-manager-CoreUpdateChecker
+%patch18 -p1 -b .no-update-manager-PluginInstallerImpl
+%patch19 -p1 -b .no-update-manager-PluginUpdatePlugin
+%patch20 -p1 -b .no-update-manager-SWTUpdateChecker
+%patch22 -p1 -b .no-update-manager-UpdateMonitor
+#%patch23 -p1 -b .no-update-manager-PluginInstallerImpl-2
 %patch27 -p0
 %patch28 -p0
 #%patch31 -p0
@@ -151,7 +151,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadi
 install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 # TODO: fix launcher to be multilib-safe
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
-sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
 
 #install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
 #install -pm 644 plugins/azplugins/azplugins_2.1.6.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_2.1.6.jar
@@ -212,6 +211,12 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Wed Sep  2 2009 David Juran <david at juran.se> - 4.0.0.4-6
+- revive the no-updates patches
+
+* Wed Sep  2 2009 David Juran <david at juran.se> - 4.0.0.4-5
+ - Fix SWT dir on x86_64 (Bz 515228)
+
 * Tue Sep  1 2009 David Juran <david at juran.se> - 4.0.0.4-4
 - fix start-script to work when  /usr/share/azureus/plugins/ is empty
 



From djuran at fedoraproject.org  Sat Sep  5 17:53:41 2009
From: djuran at fedoraproject.org (David Juran)
Date: Sat,  5 Sep 2009 17:53:41 +0000 (UTC)
Subject: rpms/azureus/F-11 azureus-no-update-manager-PluginInstallerImpl,
	NONE, 1.1
Message-ID: <20090905175341.B6B9611C00E5@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8299

Added Files:
	azureus-no-update-manager-PluginInstallerImpl 
Log Message:
adding missing patch



--- NEW FILE azureus-no-update-manager-PluginInstallerImpl ---
diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java
--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl	2008-09-25 14:32:04.000000000 +0300
+++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2009-09-05 19:18:15.000000000 +0300
@@ -376,87 +376,87 @@ PluginInstallerImpl
 	{
 		PluginUpdatePlugin	pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
 		
-		UpdateManagerImpl	uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
+// 		UpdateManagerImpl	uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
 		
-		UpdateCheckInstance	inst = 
-			uman.createEmptyUpdateCheckInstance( 
-					UpdateCheckInstance.UCI_INSTALL,
-					"update.instance.install",
-					low_noise );
-		
-		if ( listener != null ){
-			
-			inst.addListener(
-				new UpdateCheckInstanceListener()
-				{
-					public void
-					cancelled(
-						UpdateCheckInstance		instance )
-					{
-						listener.failed( new PluginException( "Installation cancelled" ));
-					}
-					
-					public void
-					complete(
-						UpdateCheckInstance		instance )
-					{
-						final Update[] updates = instance.getUpdates();
+// 		UpdateCheckInstance	inst = 
+// 			uman.createEmptyUpdateCheckInstance( 
+// 					UpdateCheckInstance.UCI_INSTALL,
+// 					"update.instance.install",
+// 					low_noise );
+		
+// 		if ( listener != null ){
+			
+// 			inst.addListener(
+// 				new UpdateCheckInstanceListener()
+// 				{
+// 					public void
+// 					cancelled(
+// 						UpdateCheckInstance		instance )
+// 					{
+// 						listener.failed( new PluginException( "Installation cancelled" ));
+// 					}
+					
+// 					public void
+// 					complete(
+// 						UpdateCheckInstance		instance )
+// 					{
+// 						final Update[] updates = instance.getUpdates();
 						
-						if ( updates.length == 0 ){
+// 						if ( updates.length == 0 ){
 														
-							listener.failed( new PluginException( "No updates were added during check process" ));
+// 							listener.failed( new PluginException( "No updates were added during check process" ));
 							
-						}else{
+// 						}else{
 							
-							for (int i=0;i<updates.length;i++){
+// 							for (int i=0;i<updates.length;i++){
 								
-								updates[i].addListener(
-									new UpdateListener()
-									{
-										private boolean	cancelled;
+// 								updates[i].addListener(
+// 									new UpdateListener()
+// 									{
+// 										private boolean	cancelled;
 										
-										public void 
-										cancelled(
-											Update update) 
-										{
-											cancelled = true;
+// 										public void 
+// 										cancelled(
+// 											Update update) 
+// 										{
+// 											cancelled = true;
 											
-											check();
-										}
+// 											check();
+// 										}
 										
-										public void 
-										complete(
-											Update update ) 
-										{
-											check();
-										}
+// 										public void 
+// 										complete(
+// 											Update update ) 
+// 										{
+// 											check();
+// 										}
 										
-										protected void
-										check()
-										{
-											for (int i=0;i<updates.length;i++){
+// 										protected void
+// 										check()
+// 										{
+// 											for (int i=0;i<updates.length;i++){
 												
-												if ( !updates[i].isCancelled() && !updates[i].isComplete()){
+// 												if ( !updates[i].isCancelled() && !updates[i].isComplete()){
 													
-													return;
-												}
-											}
+// 													return;
+// 												}
+// 											}
 											
-											if ( cancelled ){
+// 											if ( cancelled ){
 												
-												listener.failed( new PluginException( "Installation cancelled" ));
+// 												listener.failed( new PluginException( "Installation cancelled" ));
 												
-											}else{
+// 											}else{
 												
-												listener.done();
-											}
-										}
-									});
-							}
-						}
-					}
-				});
-		}
+// 												listener.done();
+// 											}
+// 										}
+// 									});
+// 							}
+// 						}
+// 					}
+// 				});
+// 		}
 		
 		try{
 			
@@ -522,56 +522,52 @@ PluginInstallerImpl
 				
 					final PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id, false );
 					
-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
+// 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
 							
-					inst.addListener(
-						new UpdateCheckInstanceListener()
-						{
-							public void
-							cancelled(
-								UpdateCheckInstance		instance )
-							{
-								try{
+// 					inst.addListener(
+// 						new UpdateCheckInstanceListener()
+// 						{
+// 							public void
+// 							cancelled(
+// 								UpdateCheckInstance		instance )
+// 							{
+// 								try{
 								
-									dummy_plugin_interface.getPluginState().unload();
+// 									dummy_plugin_interface.getPluginState().unload();
 									
-								}catch( Throwable e ){
+// 								}catch( Throwable e ){
 									
-									Debug.out( "Failed to unload plugin", e );
-								}
-							}
+// 									Debug.out( "Failed to unload plugin", e );
+// 								}
+// 							}
 							
-							public void
-							complete(
-								UpdateCheckInstance		instance )
-							{
-								PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
+// 							public void
+// 							complete(
+// 								UpdateCheckInstance		instance )
+// 							{
+// 								PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
 								
-								if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
+// 								if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
 									
-									try{
-										pi.getPluginState().unload();
+// 									try{
+// 										pi.getPluginState().unload();
 										
-									}catch( Throwable e ){
+// 									}catch( Throwable e ){
 										
-										Debug.out( "Failed to unload plugin", e );
-									}
-								}
+// 										Debug.out( "Failed to unload plugin", e );
+// 									}
+// 								}
 
-							}
-						});
-				}else{
+// 							}
+// 						});
+// 				}else{
 					
-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
+// 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
 				}
 			}
 		
-			inst.start();
-			
 		}catch( Throwable e ){
 			
-			inst.cancel();
-			
 			if ( e instanceof PluginException ){
 				
 				throw((PluginException)e);
@@ -635,138 +631,138 @@ PluginInstallerImpl
 			}
 		}
 		
-		try{
-			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
+// 		try{
+// 			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
 			
-			UpdateCheckInstance	inst = 
-				uman.createEmptyUpdateCheckInstance(
-						UpdateCheckInstance.UCI_UNINSTALL,
-						"update.instance.uninstall");
+// 			UpdateCheckInstance	inst = 
+// 				uman.createEmptyUpdateCheckInstance(
+// 						UpdateCheckInstance.UCI_UNINSTALL,
+// 						"update.instance.uninstall");
 
-			for (int i=0;i<pis.length;i++){
+// 			for (int i=0;i<pis.length;i++){
 				
-				final PluginInterface	pi = pis[i];
+// 				final PluginInterface	pi = pis[i];
 				
-				final String	plugin_dir = pi.getPluginDirectoryName();
+// 				final String	plugin_dir = pi.getPluginDirectoryName();
 
-				inst.addUpdatableComponent(
-					new UpdatableComponent()
-					{
-						public String
-						getName()
-						{
-							return( pi.getPluginName());
-						}
-					
-						public int
-						getMaximumCheckTime()
-						{
-							return( 0 );
-						}
+// 				inst.addUpdatableComponent(
+// 					new UpdatableComponent()
+// 					{
+// 						public String
+// 						getName()
+// 						{
+// 							return( pi.getPluginName());
+// 						}
+					
+// 						public int
+// 						getMaximumCheckTime()
+// 						{
+// 							return( 0 );
+// 						}
 						
-						public void
-						checkForUpdate(
-							final UpdateChecker	checker )
-						{
-							try{
-								ResourceDownloader rd = 
-									manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
+// 						public void
+// 						checkForUpdate(
+// 							final UpdateChecker	checker )
+// 						{
+// 							try{
+// 								ResourceDownloader rd = 
+// 									manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
 								
-								rd.addListener(
-									new ResourceDownloaderAdapter()
-									{
-										public boolean
-										completed(
-											ResourceDownloader	downloader,
-											InputStream			data )
-										{
-											try{
-												if ( pi.getPluginState().isUnloadable()){
+// 								rd.addListener(
+// 									new ResourceDownloaderAdapter()
+// 									{
+// 										public boolean
+// 										completed(
+// 											ResourceDownloader	downloader,
+// 											InputStream			data )
+// 										{
+// 											try{
+// 												if ( pi.getPluginState().isUnloadable()){
 											
-													pi.getPluginState().unload();
+// 													pi.getPluginState().unload();
 													
-													FileUtil.recursiveDelete( new File( plugin_dir ));
+// 													FileUtil.recursiveDelete( new File( plugin_dir ));
 												
-												}
+// 												}
 																
-												UpdateInstaller installer = checker.createInstaller();
+// 												UpdateInstaller installer = checker.createInstaller();
 													
-												installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
+// 												installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
 											
 												
-											}catch( Throwable e ){
+// 											}catch( Throwable e ){
 												
-												Debug.printStackTrace(e);
-												Logger.log(new LogAlert(LogAlert.REPEATABLE,
-														"Plugin uninstall failed", e));
-											}
+// 												Debug.printStackTrace(e);
+// 												Logger.log(new LogAlert(LogAlert.REPEATABLE,
+// 														"Plugin uninstall failed", e));
+// 											}
 											
-												// don't close the stream as we process it later
+// 												// don't close the stream as we process it later
 												
-											return( true );
-										}
+// 											return( true );
+// 										}
 										
-										public void
-										failed(
-											ResourceDownloader			downloader,
-											ResourceDownloaderException e )
-										{
-											if ( !downloader.isCancelled()){
-												Logger.log(new LogAlert(LogAlert.REPEATABLE,
-														"Plugin uninstall failed", e));
-											}
-										}
-									});
+// 										public void
+// 										failed(
+// 											ResourceDownloader			downloader,
+// 											ResourceDownloaderException e )
+// 										{
+// 											if ( !downloader.isCancelled()){
+// 												Logger.log(new LogAlert(LogAlert.REPEATABLE,
+// 														"Plugin uninstall failed", e));
+// 											}
+// 										}
+// 									});
 	
-									// the plugin may have > 1 plugin interfaces, make the name up appropriately
+// 									// the plugin may have > 1 plugin interfaces, make the name up appropriately
 								
-								String	update_name = "";
+// 								String	update_name = "";
 									
-								PluginInterface[]	ifs = manager.getPluginInterfaces();
+// 								PluginInterface[]	ifs = manager.getPluginInterfaces();
 								
-							    Arrays.sort( 
-							    		ifs,
-									  	new Comparator()
-										{
-								      		public int 
-											compare(
-												Object o1, 
-												Object o2)
-								      		{
-								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
-								      		}
-										});
+// 							    Arrays.sort( 
+// 							    		ifs,
+// 									  	new Comparator()
+// 										{
+// 								      		public int 
+// 											compare(
+// 												Object o1, 
+// 												Object o2)
+// 								      		{
+// 								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
+// 								      		}
+// 										});
 							    
-								for (int i=0;i<ifs.length;i++){
+// 								for (int i=0;i<ifs.length;i++){
 									
-									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
+// 									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
 									
-										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
-									}
-								}
+// 										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
+// 									}
+// 								}
 								
-								checker.addUpdate(
-									update_name,
-									new String[]{ "Uninstall: " + plugin_dir},
-									pi.getPluginVersion(),
-									rd,
-									pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
+// 								checker.addUpdate(
+// 									update_name,
+// 									new String[]{ "Uninstall: " + plugin_dir},
+// 									pi.getPluginVersion(),
+// 									rd,
+// 									pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
 									
-							}finally{
+// 							}finally{
 								
-								checker.completed();
-							}
+// 								checker.completed();
+// 							}
 								
-						}
-					}, false );
-			}
+// 						}
+// 					}, false );
+// 			}
 
-			inst.start();
+// 			inst.start();
 			
-		}catch( Throwable e ){
+// 		}catch( Throwable e ){
 			
-			Debug.printStackTrace(e);
-		}
+// 			Debug.printStackTrace(e);
+// 		}
 	}
 	
 	protected PluginInterface



From emaldonado at fedoraproject.org  Sat Sep  5 18:49:19 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 18:49:19 +0000 (UTC)
Subject: rpms/nss-util/devel nss-nolocalsql.patch,NONE,1.1
Message-ID: <20090905184919.6D74C11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5599

Added Files:
	nss-nolocalsql.patch 
Log Message:
restore this patch, it is crucial in nss and must be applied here for consistency

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE nss-nolocalsql.patch ---
diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
+++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
 DIRS := $(filter-out fortcrypt,$(DIRS))
 endif
 
-ifndef MOZILLA_CLIENT
-ifndef NSS_USE_SYSTEM_SQLITE
-DIRS := sqlite $(DIRS)
-endif
-endif
+#ifndef MOZILLA_CLIENT
+#ifndef NSS_USE_SYSTEM_SQLITE
+#DIRS := sqlite $(DIRS)
+#endif
+#endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 CSRCS = \
 	dbmshim.c \
diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
+++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 EXPORTS = \
 	secmodt.h \



From emaldonado at fedoraproject.org  Sat Sep  5 18:49:46 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 18:49:46 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-nolocalsql.patch,1.2,1.3
Message-ID: <20090905184946.65AFC11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5748

Added Files:
	nss-nolocalsql.patch 
Log Message:
restore this patch, it is crucial in nss and must be applied here for consistency

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: nss-nolocalsql.patch
diff -N nss-nolocalsql.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-nolocalsql.patch	5 Sep 2009 18:49:46 -0000	1.3
@@ -0,0 +1,52 @@
+diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
++++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
+@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
+ DIRS := $(filter-out fortcrypt,$(DIRS))
+ endif
+ 
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-DIRS := sqlite $(DIRS)
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#DIRS := sqlite $(DIRS)
++#endif
++#endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ CSRCS = \
+ 	dbmshim.c \
+diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ EXPORTS = \
+ 	secmodt.h \



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:36 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested watchbugzilla
Message-ID: <20090905185336.5A8DD10F87F@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-iconv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:37 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested approveacls
Message-ID: <20090905185337.0369C10F88C@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-iconv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:37 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested commit
Message-ID: <20090905185337.3FF7710F89C@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-iconv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:42 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested watchcommits
Message-ID: <20090905185342.3DFB210F8B2@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-iconv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:51 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested watchbugzilla
Message-ID: <20090905185351.2C65410F8B6@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-iconv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:51 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested commit
Message-ID: <20090905185351.D826F10F8BC@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-iconv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:52 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested approveacls
Message-ID: <20090905185353.0645910F8C1@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-iconv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Sat Sep  5 18:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 18:53:54 +0000
Subject: [pkgdb] mingw32-iconv: epienbro has requested watchcommits
Message-ID: <20090905185354.877AE10F8C6@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-iconv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From myoung at fedoraproject.org  Sat Sep  5 19:00:39 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat,  5 Sep 2009 19:00:39 +0000 (UTC)
Subject: rpms/kernel/devel drm-ddc-caching-bug.patch, NONE,
	1.1.2.2 kernel.spec, 
	1.1294.2.62, 1.1294.2.63 lirc-2.6.31.patch, 1.2.2.2,
	1.2.2.3 xen.pvops.patch, 1.1.2.39, 1.1.2.40 xen.pvops.post.patch,
	1.1.2.25, 1.1.2.26 xen.pvops.pre.patch, 1.1.2.16, 1.1.2.17
Message-ID: <20090905190039.2759611C0349@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8305

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec lirc-2.6.31.patch xen.pvops.patch 
	xen.pvops.post.patch xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-ddc-caching-bug.patch 
Log Message:
update pvops which includes swiotlb updates and a network fix and try a drm build fix


drm-ddc-caching-bug.patch:
 drm_crtc_helper.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE drm-ddc-caching-bug.patch ---
When an output was disconnected, its mode list would remain.  If you later
plugged into a sink with no EDID (projector, etc), you'd inherit the mode
list from the old sink, which is not what you want.

diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx	2009-09-03 16:56:11.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-03 16:57:24.911505245 -0400
@@ -104,8 +104,7 @@ int drm_helper_probe_single_connector_mo
 	if (connector->status == connector_status_disconnected) {
 		DRM_DEBUG_KMS("%s is disconnected\n",
 			  drm_get_connector_name(connector));
-		/* TODO set EDID to NULL */
-		return 0;
+		goto prune;
 	}
 
 	count = (*connector_funcs->get_modes)(connector);
@@ -130,7 +129,7 @@ int drm_helper_probe_single_connector_mo
 								   mode);
 	}
 
-
+prune:
 	drm_mode_prune_invalid(dev, &connector->modes, true);
 
 	if (list_empty(&connector->modes))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.62
retrieving revision 1.1294.2.63
diff -u -p -r1.1294.2.62 -r1.1294.2.63
--- kernel.spec	3 Sep 2009 20:37:22 -0000	1.1294.2.62
+++ kernel.spec	5 Sep 2009 19:00:23 -0000	1.1294.2.63
@@ -702,6 +702,7 @@ Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
 Patch1827: drm-rv710-ucode-fix.patch
 Patch1828: drm-god-shut-up-about-edid-already.patch
+Patch1829: drm-ddc-caching-bug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -777,7 +778,6 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
-Buildarch: noarch
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -984,6 +984,12 @@ ApplyOptionalPatch()
   fi
 }
 
+# we don't want a .config file when building firmware: it just confuses the build system
+%define build_firmware \
+   mv .config .config.firmware_save \
+   make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install \
+   mv .config.firmware_save .config
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1330,6 +1336,7 @@ ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
 ApplyPatch drm-rv710-ucode-fix.patch
 ApplyPatch drm-god-shut-up-about-edid-already.patch
+ApplyPatch drm-ddc-caching-bug.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1780,7 +1787,7 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 %endif
 
 %if %{with_firmware}
-make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+%{build_firmware}
 %endif
 
 %if %{with_bootwrapper}
@@ -1790,7 +1797,7 @@ make DESTDIR=$RPM_BUILD_ROOT bootwrapper
 %if %{with_dracut}
 %if !%{with_firmware}
 # dracut needs the firmware files
-    make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+    %{build_firmware}
 %endif
     for i in $RPM_BUILD_ROOT/lib/modules/*; do
 	[ -d $i ] || continue
@@ -2029,6 +2036,22 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 04 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops which includes swiotlb updates and a network fix
+- try a drm build fix
+- re-enable CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS options
+
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.203.rc8.git2
+- Fix kernel build errors when building firmware by removing the
+  .config file before that step and restoring it afterward.
+
+* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
+- drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
+  disconnected.
+
+* Thu Sep 03 2009 Jarod Wilson <jarod at redhat.com>
+- Update hdpvr and lirc_zilog drivers for 2.6.31 i2c
+
 * Thu Sep 03 2009 Michael Young <m.a.young at durham.ac.uk>
 - Update pvops patch to try stack protector on i686 again
 - disable linux-2.6-xen-stack-protector-fix.patch as we already have it

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15600 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.31.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.2 -r1.2.2.3
--- lirc-2.6.31.patch	3 Sep 2009 20:02:38 -0000	1.2.2.2
+++ lirc-2.6.31.patch	5 Sep 2009 19:00:23 -0000	1.2.2.3
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Tuesday, September 01, 2009
+Last updated: Thursday, September 03, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -24,7 +24,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
- drivers/input/lirc/lirc_mceusb.c      | 1244 ++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
  drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
@@ -33,7 +33,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
- 26 files changed, 15602 insertions(+), 0 deletions(-)
+ 26 files changed, 15600 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 8dca9d8..f25dc26 100644
@@ -7658,10 +7658,10 @@ index 0000000..3d53181
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..3dd4cfb
+index 0000000..8b48a56
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1244 @@
+@@ -0,0 +1,1242 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -7675,12 +7675,12 @@ index 0000000..3dd4cfb
 + *
 + * Original lirc_mceusb driver deprecated in favor of this driver, which
 + * supports the 1st-gen device now too. Transmitting on the 1st-gen device
-+ * is as yet untested, but receiving definitely works.
++ * only functions on port #2 at the moment.
 + *
 + * Support for 1st-gen device added June 2009,
 + * by Jarod Wilson <jarod at wilsonet.com>
 + *
-+ * Transmission support for 1st-gen device added August 2009,
++ * Initial transmission support for 1st-gen device added August 2009,
 + * by Patrick Calhoun <phineas at ou.edu>
 + *
 + * Derived from ATI USB driver by Paul Miller and the original
@@ -8791,32 +8791,30 @@ index 0000000..3dd4cfb
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_out, pin_init3, sizeof(pin_init3),
 +				     MCEUSB_OUTBOUND);
-+		/* if we don't issue the correct number of receives
-+		 * (MCEUSB_INBOUND) for each outbound, then the first few ir
-+		 * pulses will be interpreted by the usb_async_callback routine
-+		 * - we should ensure we have the right amount OR less - as the
-+		 * mceusb_dev_recv routine will handle the control packets OK -
-+		 * they start with 0x9f - but the async callback doesn't handle
-+		 * ir pulse packets
-+		 */
-+		request_packet_async(ir, ep_in, NULL, maxp, 0);
-+	} else {
++	} else if (ir->flags.microsoft_gen1) {
 +		/* original ms mce device requires some additional setup */
-+		if (ir->flags.microsoft_gen1)
-+			mceusb_gen1_init(ir);
++		mceusb_gen1_init(ir);
++	} else {
 +
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
 +		request_packet_async(ir, ep_out, init1,
 +				     sizeof(init1), MCEUSB_OUTBOUND);
 +		request_packet_async(ir, ep_in, NULL, maxp, MCEUSB_INBOUND);
-+		/* This breaks transmit on orig ms mce device */
-+		if (!ir->flags.microsoft_gen1)
-+			request_packet_async(ir, ep_out, init2,
-+					     sizeof(init2), MCEUSB_OUTBOUND);
-+		request_packet_async(ir, ep_in, NULL, maxp, 0);
++		request_packet_async(ir, ep_out, init2,
++				     sizeof(init2), MCEUSB_OUTBOUND);
 +	}
 +
++	/*
++	 * if we don't issue the correct number of receives (MCEUSB_INBOUND)
++	 * for each outbound, then the first few ir pulses will be interpreted
++	 * by the usb_async_callback routine - we should ensure we have the
++	 * right amount OR less - as the mceusb_dev_recv routine will handle
++	 * the control packets OK - they start with 0x9f - but the async
++	 * callback doesn't handle ir pulse packets
++	 */
++	request_packet_async(ir, ep_in, NULL, maxp, 0);
++
 +	usb_set_intfdata(intf, ir);
 +
 +	return 0;
@@ -14406,7 +14404,7 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..f86db02
+index 0000000..c4080f5
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1395 @@
@@ -14476,31 +14474,30 @@ index 0000000..f86db02
 +	struct lirc_driver l;
 +
 +	/* Device info */
-+	struct mutex       lock;
-+	int		   open;
++	struct mutex lock;
++	int open;
 +
 +	/* RX device */
-+	struct i2c_client  c_rx;
++	struct i2c_client c_rx;
++	int have_rx;
 +
 +	/* RX device buffer & lock */
 +	struct lirc_buffer buf;
-+	struct mutex       buf_lock;
++	struct mutex buf_lock;
 +
 +	/* RX polling thread data */
-+	struct completion  *t_notify;
-+	struct completion  *t_notify2;
-+	int		   shutdown;
++	struct completion *t_notify;
++	struct completion *t_notify2;
++	int shutdown;
 +	struct task_struct *task;
 +
 +	/* RX read data */
-+	unsigned char      b[3];
++	unsigned char b[3];
 +
 +	/* TX device */
-+	struct i2c_client  c_tx;
-+	int		   need_boot;
-+
-+	/* # devices, for shutdown */
-+	int		   devs;
++	struct i2c_client c_tx;
++	int need_boot;
++	int have_tx;
 +};
 +
 +/* Minor -> data mapping */
@@ -14531,13 +14528,15 @@ index 0000000..f86db02
 +};
 +
 +static struct tx_data_struct *tx_data;
-+struct mutex tx_data_lock;
++static struct mutex tx_data_lock;
 +
-+#define DEVICE_NAME "lirc_zilog"
 +#define zilog_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, \
 +					## args)
 +#define zilog_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 +
++#define ZILOG_HAUPPAUGE_IR_RX_NAME "Zilog/Hauppauge IR RX"
++#define ZILOG_HAUPPAUGE_IR_TX_NAME "Zilog/Hauppauge IR TX"
++
 +/* module parameters */
 +static int debug;	/* debug output */
 +static int disable_rx;	/* disable RX device */
@@ -14547,7 +14546,7 @@ index 0000000..f86db02
 +#define dprintk(fmt, args...)						\
 +	do {								\
 +		if (debug)						\
-+			printk(KERN_DEBUG DEVICE_NAME ": " fmt,		\
++			printk(KERN_DEBUG KBUILD_MODNAME ": " fmt,	\
 +				 ## args);				\
 +	} while (0)
 +
@@ -14926,8 +14925,8 @@ index 0000000..f86db02
 +		zilog_error("unexpected IR TX response: %02x\n", buf[0]);
 +		return 0;
 +	}
-+	zilog_notify("Zilog/Hauppauge IR blaster: firmware version "
-+		     "%d.%d.%d\n", buf[1], buf[2], buf[3]);
++	zilog_notify("Zilog/Hauppauge IR blaster firmware version "
++		     "%d.%d.%d loaded\n", buf[1], buf[2], buf[3]);
 +
 +	return 0;
 +}
@@ -14962,7 +14961,7 @@ index 0000000..f86db02
 +	int ret;
 +	unsigned int i;
 +	unsigned char *data, version, num_global_fixed;
-+	const struct firmware *fw_entry = NULL;
++	const struct firmware *fw_entry;
 +
 +	/* Already loaded? */
 +	mutex_lock(&tx_data_lock);
@@ -14979,7 +14978,7 @@ index 0000000..f86db02
 +		ret = ret < 0 ? ret : -EFAULT;
 +		goto out;
 +	}
-+	zilog_notify("firmware of size %zu loaded\n", fw_entry->size);
++	dprintk("firmware of size %zu loaded\n", fw_entry->size);
 +
 +	/* Parse the file */
 +	tx_data = vmalloc(sizeof(*tx_data));
@@ -15026,7 +15025,7 @@ index 0000000..f86db02
 +			      &tx_data->num_code_sets))
 +		goto corrupt;
 +
-+	zilog_notify("%u codesets loaded\n", tx_data->num_code_sets);
++	dprintk("%u IR blaster codesets loaded\n", tx_data->num_code_sets);
 +
 +	tx_data->code_sets = vmalloc(
 +		tx_data->num_code_sets * sizeof(char *));
@@ -15520,7 +15519,6 @@ index 0000000..f86db02
 +	.owner		= THIS_MODULE
 +};
 +
-+static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
 +static int ir_remove(struct i2c_client *client);
 +static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
@@ -15528,14 +15526,16 @@ index 0000000..f86db02
 +static const struct i2c_device_id ir_transceiver_id[] = {
 +	/* Generic entry for any IR transceiver */
 +	{ "ir_video", 0 },
-+	/* IR device specific entries could be added here */
++	/* IR device specific entries should be added here */
++	{ "ir_tx_z8f0811_haup", 0 },
++	{ "ir_rx_z8f0811_haup", 0 },
 +	{ }
 +};
 +
 +static struct i2c_driver driver = {
 +	.driver = {
 +		.owner	= THIS_MODULE,
-+		.name	= "i2c ir driver",
++		.name	= "Zilog/Hauppauge i2c IR",
 +	},
 +	.probe		= ir_probe,
 +	.remove		= ir_remove,
@@ -15543,11 +15543,6 @@ index 0000000..f86db02
 +	.id_table	= ir_transceiver_id,
 +};
 +
-+static struct i2c_client client_template = {
-+	.name	= "unset",
-+	.driver	= &driver
-+};
-+
 +static struct file_operations lirc_fops = {
 +	.owner		= THIS_MODULE,
 +	.llseek		= lseek,
@@ -15559,30 +15554,107 @@ index 0000000..f86db02
 +	.release	= close
 +};
 +
-+static int i2c_attach(struct i2c_client *client, struct IR *ir)
++static int ir_remove(struct i2c_client *client)
 +{
-+	i2c_set_clientdata(client, ir);
++	struct IR *ir = i2c_get_clientdata(client);
++
++	mutex_lock(&ir->lock);
++
++	if (ir->have_rx || ir->have_tx) {
++		DECLARE_COMPLETION(tn);
++		DECLARE_COMPLETION(tn2);
++
++		/* end up polling thread */
++		if (ir->task && !IS_ERR(ir->task)) {
++			ir->t_notify = &tn;
++			ir->t_notify2 = &tn2;
++			ir->shutdown = 1;
++			wake_up_process(ir->task);
++			complete(&tn2);
++			wait_for_completion(&tn);
++			ir->t_notify = NULL;
++			ir->t_notify2 = NULL;
++		}
++
++	} else {
++		mutex_unlock(&ir->lock);
++		zilog_error("%s: detached from something we didn't "
++			    "attach to\n", __func__);
++		return -ENODEV;
++	}
++
++	/* unregister lirc driver */
++	if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
++		lirc_unregister_driver(ir->l.minor);
++		ir_devices[ir->l.minor] = NULL;
++	}
++
++	/* free memory */
++	lirc_buffer_free(&ir->buf);
++	mutex_unlock(&ir->lock);
++	kfree(ir);
 +
-+	++ir->devs;
 +	return 0;
 +}
 +
-+static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx)
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 +{
-+	struct IR *ir;
++	struct IR *ir = NULL;
++	struct i2c_adapter *adap = client->adapter;
++	char buf;
 +	int ret;
++	int have_rx = 0, have_tx = 0;
++
++	dprintk("%s: adapter id=0x%x, client addr=0x%02x\n",
++		__func__, adap->id, client->addr);
 +
-+	printk("lirc_zilog: chip found with %s\n",
++	/* if this isn't an appropriate device, bail w/-ENODEV now */
++	if (!(adap->id == I2C_HW_B_BT848 ||
++#ifdef I2C_HW_B_HDPVR
++	      adap->id == I2C_HW_B_HDPVR ||
++#endif
++	      adap->id == I2C_HW_B_CX2341X))
++		goto out_nodev;
++
++	/*
++	 * The external IR receiver is at i2c address 0x71.
++	 * The IR transmitter is at 0x70.
++	 */
++	client->addr = 0x70;
++
++	if (!disable_tx) {
++		if (i2c_master_recv(client, &buf, 1) == 1)
++			have_tx = 1;
++		dprintk("probe 0x70 @ %s: %s\n",
++			adap->name, have_tx ? "success" : "failed");
++	}
++
++	if (!disable_rx) {
++		client->addr = 0x71;
++		if (i2c_master_recv(client, &buf, 1) == 1)
++			have_rx = 1;
++		dprintk("probe 0x71 @ %s: %s\n",
++			adap->name, have_rx ? "success" : "failed");
++	}
++
++	if (!(have_rx || have_tx)) {
++		zilog_error("%s: no devices found\n", adap->name);
++		goto out_nodev;
++	}
++
++	printk(KERN_INFO "lirc_zilog: chip found with %s\n",
 +		have_rx && have_tx ? "RX and TX" :
 +			have_rx ? "RX only" : "TX only");
 +
 +	ir = kzalloc(sizeof(struct IR), GFP_KERNEL);
-+	if (ir == NULL)
-+		return -ENOMEM;
-+	if (lirc_buffer_init(&ir->buf, 2, BUFLEN/2) != 0) {
-+		kfree(ir);
-+		return -ENOMEM;
-+	}
++
++	if (!ir)
++		goto out_nomem;
++
++	ret = lirc_buffer_init(&ir->buf, 2, BUFLEN / 2);
++	if (ret)
++		goto out_nomem;
++
 +	mutex_init(&ir->lock);
 +	mutex_init(&ir->buf_lock);
 +	ir->need_boot = 1;
@@ -15590,18 +15662,17 @@ index 0000000..f86db02
 +	memcpy(&ir->l, &lirc_template, sizeof(struct lirc_driver));
 +	ir->l.minor = -1;
 +
++	/* I2C attach to device */
++	i2c_set_clientdata(client, ir);
++
 +	/* initialise RX device */
-+	client_template.adapter = adap;
-+	memcpy(&ir->c_rx, &client_template, sizeof(struct i2c_client));
 +	if (have_rx) {
 +		DECLARE_COMPLETION(tn);
++		memcpy(&ir->c_rx, client, sizeof(struct i2c_client));
 +
-+		/* I2C attach to device */
 +		ir->c_rx.addr = 0x71;
-+		strncpy(ir->c_rx.name, "Zilog/Hauppauge RX", I2C_NAME_SIZE);
-+		ret = i2c_attach(&ir->c_rx, ir);
-+		if (ret != 0)
-+			goto err;
++		strncpy(ir->c_rx.name, ZILOG_HAUPPAUGE_IR_RX_NAME,
++			I2C_NAME_SIZE);
 +
 +		/* try to fire up polling thread */
 +		ir->t_notify = &tn;
@@ -15614,24 +15685,23 @@ index 0000000..f86db02
 +		}
 +		wait_for_completion(&tn);
 +		ir->t_notify = NULL;
++		ir->have_rx = 1;
 +	}
 +
 +	/* initialise TX device */
-+	memcpy(&ir->c_tx, &client_template, sizeof(struct i2c_client));
 +	if (have_tx) {
-+		/* I2C attach to device */
++		memcpy(&ir->c_tx, client, sizeof(struct i2c_client));
 +		ir->c_tx.addr = 0x70;
-+		strncpy(ir->c_tx.name, "Zilog/Hauppauge TX", I2C_NAME_SIZE);
-+		ret = i2c_attach(&ir->c_tx, ir);
-+		if (ret != 0)
-+			goto err;
++		strncpy(ir->c_tx.name, ZILOG_HAUPPAUGE_IR_TX_NAME,
++			I2C_NAME_SIZE);
++		ir->have_tx = 1;
 +	}
 +
 +	/* set lirc_dev stuff */
 +	ir->l.code_length = 13;
 +	ir->l.rbuf	  = &ir->buf;
-+	ir->l.fops	= &lirc_fops;
-+	ir->l.data	= ir;
++	ir->l.fops	  = &lirc_fops;
++	ir->l.data	  = ir;
 +	ir->l.minor       = minor;
 +	ir->l.sample_rate = 0;
 +
@@ -15658,6 +15728,7 @@ index 0000000..f86db02
 +		if (ret != 0)
 +			goto err;
 +	}
++
 +	return 0;
 +
 +err:
@@ -15667,100 +15738,15 @@ index 0000000..f86db02
 +	if (ir->c_tx.addr)
 +		ir_remove(&ir->c_tx);
 +	return ret;
-+}
-+
-+static int ir_remove(struct i2c_client *client)
-+{
-+	struct IR *ir = i2c_get_clientdata(client);
-+	mutex_lock(&ir->lock);
-+
-+	if (client == &ir->c_rx) {
-+		DECLARE_COMPLETION(tn);
-+		DECLARE_COMPLETION(tn2);
-+
-+		/* end up polling thread */
-+		if (ir->task && !IS_ERR(ir->task)) {
-+			ir->t_notify = &tn;
-+			ir->t_notify2 = &tn2;
-+			ir->shutdown = 1;
-+			wake_up_process(ir->task);
-+			complete(&tn2);
-+			wait_for_completion(&tn);
-+			ir->t_notify = NULL;
-+			ir->t_notify2 = NULL;
-+		}
-+
-+	} else {
-+		mutex_unlock(&ir->lock);
-+		zilog_error("%s: detached from something we didn't "
-+			    "attach to\n", __func__);
-+		return -ENODEV;
-+	}
-+
-+	--ir->devs;
-+	if (ir->devs < 0) {
-+		mutex_unlock(&ir->lock);
-+		zilog_error("%s: invalid device count\n", __func__);
-+		return -ENODEV;
-+	} else if (ir->devs == 0) {
-+		/* unregister lirc driver */
-+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
-+			lirc_unregister_driver(ir->l.minor);
-+			ir_devices[ir->l.minor] = NULL;
-+		}
 +
-+		/* free memory */
-+		lirc_buffer_free(&ir->buf);
-+		mutex_unlock(&ir->lock);
-+		kfree(ir);
-+		return 0;
-+	}
-+	mutex_unlock(&ir->lock);
-+	return 0;
-+}
++out_nodev:
++	zilog_error("no device found\n");
++	return -ENODEV;
 +
-+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
-+{
-+	struct i2c_adapter *adap = client->adapter;
-+	char buf;
-+
-+	if (adap->id == I2C_HW_B_BT848 ||
-+#ifdef I2C_HW_B_HDPVR
-+	    adap->id == I2C_HW_B_HDPVR ||
-+#endif
-+	    adap->id == I2C_HW_B_CX2341X) {
-+		int have_rx = 0, have_tx = 0;
-+
-+		/*
-+		 * The external IR receiver is at i2c address 0x71.
-+		 * The IR transmitter is at 0x70.
-+		 */
-+		client->addr = 0x70;
-+
-+		if (!disable_rx) {
-+			if (i2c_master_recv(client, &buf, 1) == 1)
-+				have_rx = 1;
-+			dprintk("probe 0x70 @ %s: %s\n",
-+				adap->name,
-+				have_rx ? "yes" : "no");
-+		}
-+
-+		if (!disable_tx) {
-+			client->addr = 0x71;
-+			if (i2c_master_recv(client, &buf, 1) == 1)
-+				have_tx = 1;
-+			dprintk("probe 0x71 @ %s: %s\n",
-+				adap->name,
-+				have_tx ? "yes" : "no");
-+		}
-+
-+		if (have_rx || have_tx)
-+			return ir_attach(adap, have_rx, have_tx);
-+		else
-+			zilog_error("%s: no devices found\n", adap->name);
-+	}
-+
-+	return 0;
++out_nomem:
++	zilog_error("memory allocation failure\n");
++	kfree(ir);
++	return -ENOMEM;
 +}
 +
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
@@ -15771,10 +15757,21 @@ index 0000000..f86db02
 +
 +static int __init zilog_init(void)
 +{
++	int ret;
++
++	zilog_notify("Zilog/Hauppauge IR driver initializing\n");
++
 +	mutex_init(&tx_data_lock);
++
 +	request_module("firmware_class");
-+	i2c_add_driver(&driver);
-+	return 0;
++
++	ret = i2c_add_driver(&driver);
++	if (ret)
++		zilog_error("initialization failed\n");
++	else
++		zilog_notify("initialization complete\n");
++
++	return ret;
 +}
 +
 +static void __exit zilog_exit(void)
@@ -15782,6 +15779,7 @@ index 0000000..f86db02
 +	i2c_del_driver(&driver);
 +	/* if loaded */
 +	fw_unload();
++	zilog_notify("Zilog/Hauppauge IR driver unloaded\n");
 +}
 +
 +module_init(zilog_init);

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 ------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/include/asm/xen/swiotlb.h         |   12 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   49 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    8 
 arch/x86/kernel/pci-swiotlb.c              |   25 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    4 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  202 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |  988 +++++++++++++++++
 arch/x86/xen/pci.c                         |  111 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  271 ++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 +++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 +++++++++
 drivers/xen/events.c                       |  422 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 +++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 +++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1604 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +-----
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 +++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |  102 +
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 139 files changed, 12619 insertions(+), 1339 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.39
retrieving revision 1.1.2.40
diff -u -p -r1.1.2.39 -r1.1.2.40
--- xen.pvops.patch	3 Sep 2009 20:37:22 -0000	1.1.2.39
+++ xen.pvops.patch	5 Sep 2009 19:00:23 -0000	1.1.2.40
@@ -2040,6 +2040,24 @@ index 0000000..cb84abe
 +#endif
 +
 +#endif	/* _ASM_X86_XEN_PCI_H */
+diff --git a/arch/x86/include/asm/xen/swiotlb.h b/arch/x86/include/asm/xen/swiotlb.h
+new file mode 100644
+index 0000000..81d8502
+--- /dev/null
++++ b/arch/x86/include/asm/xen/swiotlb.h
+@@ -0,0 +1,12 @@
++#ifndef _ASM_X86_XEN_SWIOTLB_H
++#define _ASM_X86_XEN_SWIOTLB_H
++
++#ifdef CONFIG_PCI_XEN
++extern int xen_swiotlb_init(void);
++extern void xen_swiotlb_init_alloc(void);
++#else
++static inline int xen_swiotlb_init(void) { return -ENODEV; }
++static void xen_swiotlb_init_alloc(void) { }
++#endif
++
++#endif
 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
 index 430d5b2..96f9ecb 100644
 --- a/arch/x86/kernel/Makefile
@@ -2140,7 +2158,7 @@ index ca93638..9eff23c 100644
  #include "sleep.h"
  
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index d2ed6c5..18d957e 100644
+index d2ed6c5..77151ce 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -63,8 +63,11 @@
@@ -2200,7 +2218,17 @@ index d2ed6c5..18d957e 100644
  
  	if (sis_apic_bug)
  		writel(reg, &io_apic->index);
-@@ -3489,6 +3511,9 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+@@ -3140,6 +3162,9 @@ static int __init ioapic_init_sysfs(void)
+ 	struct sys_device * dev;
+ 	int i, size, error;
+ 
++	if (xen_initial_domain())
++		return 0;
++
+ 	error = sysdev_class_register(&ioapic_sysdev_class);
+ 	if (error)
+ 		return error;
+@@ -3489,6 +3514,9 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
  	if (type == PCI_CAP_ID_MSI && nvec > 1)
  		return 1;
  
@@ -2210,7 +2238,7 @@ index d2ed6c5..18d957e 100644
  	node = dev_to_node(&dev->dev);
  	irq_want = nr_irqs_gsi;
  	sub_handle = 0;
-@@ -3538,7 +3563,10 @@ error:
+@@ -3538,7 +3566,10 @@ error:
  
  void arch_teardown_msi_irq(unsigned int irq)
  {
@@ -2222,7 +2250,7 @@ index d2ed6c5..18d957e 100644
  }
  
  #if defined (CONFIG_DMAR) || defined (CONFIG_INTR_REMAP)
-@@ -3854,6 +3882,11 @@ void __init probe_nr_irqs_gsi(void)
+@@ -3854,6 +3885,11 @@ void __init probe_nr_irqs_gsi(void)
  	printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
  }
  
@@ -2234,7 +2262,7 @@ index d2ed6c5..18d957e 100644
  #ifdef CONFIG_SPARSE_IRQ
  int __init arch_probe_nr_irqs(void)
  {
-@@ -4147,6 +4180,11 @@ void __init ioapic_init_mappings(void)
+@@ -4147,6 +4183,11 @@ void __init ioapic_init_mappings(void)
  	struct resource *ioapic_res;
  	int i;
  
@@ -2885,36 +2913,46 @@ index 70ec9b9..cef3d70 100644
  
  	.start_context_switch = paravirt_nop,
 diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 1a041bc..ee5162e 100644
+index 1a041bc..90da583 100644
 --- a/arch/x86/kernel/pci-dma.c
 +++ b/arch/x86/kernel/pci-dma.c
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,8 @@
  #include <asm/gart.h>
  #include <asm/calgary.h>
  #include <asm/amd_iommu.h>
 +#include <asm/xen/iommu.h>
++#include <asm/xen/swiotlb.h>
  
  static int forbid_dac __read_mostly;
  
-@@ -281,6 +282,8 @@ static int __init pci_iommu_init(void)
+@@ -128,6 +130,8 @@ void __init pci_iommu_alloc(void)
+ 
+ 	amd_iommu_detect();
+ 
++	xen_swiotlb_init_alloc();
++
+ 	pci_swiotlb_init();
+ }
+ 
+@@ -281,6 +285,10 @@ static int __init pci_iommu_init(void)
  	dma_debug_add_bus(&pci_bus_type);
  #endif
  
 +	xen_iommu_init();
 +
++	xen_swiotlb_init();
++
  	calgary_iommu_init();
  
  	intel_iommu_init();
 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 6af96ee..efe3691 100644
+index 6af96ee..e8a3501 100644
 --- a/arch/x86/kernel/pci-swiotlb.c
 +++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -11,32 +11,9 @@
- #include <asm/swiotlb.h>
- #include <asm/dma.h>
+@@ -13,31 +13,6 @@
+ 
+ int swiotlb __read_mostly;
  
--int swiotlb __read_mostly;
--
 -void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
 -{
 -	return alloc_bootmem_low_pages(size);
@@ -2929,8 +2967,7 @@ index 6af96ee..efe3691 100644
 -{
 -	return paddr;
 -}
-+#include <xen/swiotlb.h>
- 
+-
 -phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
 -{
 -	return baddr;
@@ -2940,20 +2977,10 @@ index 6af96ee..efe3691 100644
 -{
 -	return 0;
 -}
-+int swiotlb __read_mostly;
- 
+-
  static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
  					dma_addr_t *dma_handle, gfp_t flags)
-@@ -75,6 +52,9 @@ void __init pci_swiotlb_init(void)
- 		iommu_pass_through)
- 	       swiotlb = 1;
- #endif
-+	if (xen_wants_swiotlb())
-+		swiotlb = 1;
-+
- 	if (swiotlb_force)
- 		swiotlb = 1;
- 	if (swiotlb) {
+ {
 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
 index 071166a..cbf8440 100644
 --- a/arch/x86/kernel/process.c
@@ -3679,7 +3706,7 @@ index 0000000..ee0db39
 +#endif
 +}
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index eb33aaa..97a2764 100644
+index eb33aaa..7119d45 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -51,6 +51,7 @@
@@ -3970,7 +3997,7 @@ index eb33aaa..97a2764 100644
  
  	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
  		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
-@@ -1019,16 +1157,9 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1019,17 +1153,8 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_smp_init();
  
@@ -3984,11 +4011,11 @@ index eb33aaa..97a2764 100644
 -	__supported_pte_mask &= ~_PAGE_GLOBAL;
 -	if (!xen_initial_domain())
 -		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
-+	__supported_pte_mask |= _PAGE_IOMAP;
- 
+-
  #ifdef CONFIG_X86_64
  	/* Work out if we support NX */
-@@ -1044,6 +1175,7 @@ asmlinkage void __init xen_start_kernel(void)
+ 	check_efer();
+@@ -1044,6 +1169,7 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_raw_console_write("mapping kernel into physical memory\n");
  	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
@@ -3996,7 +4023,7 @@ index eb33aaa..97a2764 100644
  
  	init_mm.pgd = pgd;
  
-@@ -1053,9 +1185,21 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1053,9 +1179,21 @@ asmlinkage void __init xen_start_kernel(void)
  	if (xen_feature(XENFEAT_supervisor_mode_kernel))
  		pv_info.kernel_rpl = 0;
  
@@ -4018,7 +4045,7 @@ index eb33aaa..97a2764 100644
  #ifdef CONFIG_X86_32
  	/* set up basic CPUID stuff */
  	cpu_detect(&new_cpu_data);
-@@ -1075,6 +1219,16 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1075,6 +1213,16 @@ asmlinkage void __init xen_start_kernel(void)
  		add_preferred_console("xenboot", 0, NULL);
  		add_preferred_console("tty", 0, NULL);
  		add_preferred_console("hvc", 0, NULL);
@@ -4586,126 +4613,1061 @@ index 4ceb285..a654a49 100644
 +	struct remap_data *rmd = data;
 +	pte_t pte = pte_mkspecial(pfn_pte(rmd->mfn++, rmd->prot));
 +
-+	rmd->mmu_update->ptr = arbitrary_virt_to_machine(ptep).maddr;
-+	rmd->mmu_update->val = pte_val_ma(pte);
-+	rmd->mmu_update++;
++	rmd->mmu_update->ptr = arbitrary_virt_to_machine(ptep).maddr;
++	rmd->mmu_update->val = pte_val_ma(pte);
++	rmd->mmu_update++;
++
++	return 0;
++}
++
++int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
++			       unsigned long addr,
++			       unsigned long mfn, int nr,
++			       pgprot_t prot, unsigned domid)
++{
++	struct remap_data rmd;
++	struct mmu_update mmu_update[REMAP_BATCH_SIZE];
++	int batch;
++	unsigned long range;
++	int err = 0;
++
++	prot = __pgprot(pgprot_val(prot) | _PAGE_IOMAP);
++
++	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
++
++	rmd.mfn = mfn;
++	rmd.prot = prot;
++
++	while (nr) {
++		batch = min(REMAP_BATCH_SIZE, nr);
++		range = (unsigned long)batch << PAGE_SHIFT;
++
++		rmd.mmu_update = mmu_update;
++		err = apply_to_page_range(vma->vm_mm, addr, range,
++					  remap_area_mfn_pte_fn, &rmd);
++		if (err)
++			goto out;
++
++		err = -EFAULT;
++		if (HYPERVISOR_mmu_update(mmu_update, batch, NULL, domid) < 0)
++			goto out;
++
++		nr -= batch;
++		addr += range;
++	}
++
++	err = 0;
++out:
++
++	flush_tlb_all();
++
++	return err;
++}
++EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);
++
+ #ifdef CONFIG_XEN_DEBUG_FS
+ 
+ static struct dentry *d_mmu_debug;
+diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
+new file mode 100644
+index 0000000..19b78e2
+--- /dev/null
++++ b/arch/x86/xen/pci-swiotlb.c
+@@ -0,0 +1,988 @@
++/*
++ * Dynamic DMA mapping support.
++ *
++ * This implementation is a fallback for platforms that do not support
++ * I/O TLBs (aka DMA address translation hardware).
++ * Copyright (C) 2000 Asit Mallick <Asit.K.Mallick at intel.com>
++ * Copyright (C) 2000 Goutham Rao <goutham.rao at intel.com>
++ * Copyright (C) 2000, 2003 Hewlett-Packard Co
++ *	David Mosberger-Tang <davidm at hpl.hp.com>
++ *
++ * 03/05/07 davidm	Switch from PCI-DMA to generic device DMA API.
++ * 00/12/13 davidm	Rename to swiotlb.c and add mark_clean() to avoid
++ *			unnecessary i-cache flushing.
++ * 04/07/.. ak		Better overflow handling. Assorted fixes.
++ * 05/09/10 linville	Add support for syncing ranges, support syncing for
++ *			DMA_BIDIRECTIONAL mappings, miscellaneous cleanup.
++ * 08/12/11 beckyb	Add highmem support
++ */
++
++#include <linux/cache.h>
++#include <linux/dma-mapping.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/spinlock.h>
++#include <linux/string.h>
++#include <xen/swiotlb.h>
++#include <linux/pfn.h>
++#include <linux/types.h>
++#include <linux/ctype.h>
++#include <linux/highmem.h>
++
++#include <asm/io.h>
++#include <asm/dma.h>
++#include <asm/scatterlist.h>
++
++#include <linux/init.h>
++#include <linux/bootmem.h>
++#include <linux/iommu-helper.h>
++#include <asm/iommu.h>
++
++#include <xen/interface/xen.h>
++#include <xen/grant_table.h>
++#include <xen/page.h>
++#include <xen/xen-ops.h>
++
++#define OFFSET(val,align) ((unsigned long)	\
++	                   ( (val) & ( (align) - 1)))
++
++#define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT))
++
++/*
++ * Minimum IO TLB size to bother booting with.  Systems with mainly
++ * 64bit capable cards will only lightly use the swiotlb.  If we can't
++ * allocate a contiguous 1MB, we're probably in trouble anyway.
++ */
++#define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT)
++
++/*
++ * Enumeration for sync targets
++ */
++enum dma_sync_target {
++	SYNC_FOR_CPU = 0,
++	SYNC_FOR_DEVICE = 1,
++};
++
++/*
++ * Used to do a quick range check in unmap_single and
++ * sync_single_*, to see if the memory was in fact allocated by this
++ * API.
++ */
++static char *xen_io_tlb_start, *xen_io_tlb_end;
++
++/*
++ * The number of IO TLB blocks (in groups of 64) betweeen xen_io_tlb_start and
++ * xen_io_tlb_end.  This is command line adjustable via setup_xen_io_tlb_npages.
++ */
++static unsigned long xen_io_tlb_nslabs;
++
++/*
++ * When the IOMMU overflows we return a fallback buffer. This sets the size.
++ */
++static unsigned long xen_io_tlb_overflow = 32*1024;
++
++void *xen_io_tlb_overflow_buffer;
++
++/*
++ * This is a free list describing the number of free entries available from
++ * each index
++ */
++static unsigned int *xen_io_tlb_list;
++static unsigned int xen_io_tlb_index;
++
++/*
++ * We need to save away the original address corresponding to a mapped entry
++ * for the sync operations.
++ */
++static phys_addr_t *xen_io_tlb_orig_addr;
++
++/*
++ * Protect the above data structures in the map and unmap calls
++ */
++static DEFINE_SPINLOCK(xen_io_tlb_lock);
++
++
++void * __weak __init xen_swiotlb_alloc_boot(size_t size, unsigned long nslabs)
++{
++	return alloc_bootmem_low_pages(size);
++}
++
++void * __weak xen_swiotlb_alloc(unsigned order, unsigned long nslabs)
++{
++	return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
++}
++
++dma_addr_t __weak xen_swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
++{
++	return phys_to_machine(XPADDR(paddr)).maddr;;
++}
++
++phys_addr_t __weak xen_swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
++{
++	return machine_to_phys(XMADDR(baddr)).paddr;
++}
++
++static dma_addr_t xen_swiotlb_virt_to_bus(struct device *hwdev,
++				      volatile void *address)
++{
++	return xen_swiotlb_phys_to_bus(hwdev, virt_to_phys(address));
++}
++
++void * __weak xen_swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address)
++{
++	return phys_to_virt(xen_swiotlb_bus_to_phys(hwdev, address));
++}
++
++int __weak xen_swiotlb_arch_address_needs_mapping(struct device *hwdev,
++					       dma_addr_t addr, size_t size)
++{
++	return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size);
++}
++
++static int check_pages_physically_contiguous(unsigned long pfn,
++					     unsigned int offset,
++					     size_t length)
++{
++	unsigned long next_mfn;
++	int i;
++	int nr_pages;
++
++	next_mfn = pfn_to_mfn(pfn);
++	nr_pages = (offset + length + PAGE_SIZE-1) >> PAGE_SHIFT;
++
++	for (i = 1; i < nr_pages; i++) {
++		if (pfn_to_mfn(++pfn) != ++next_mfn)
++			return 0;
++	}
++	return 1;
++}
++
++static int range_straddles_page_boundary(phys_addr_t p, size_t size)
++{
++	unsigned long pfn = PFN_DOWN(p);
++	unsigned int offset = p & ~PAGE_MASK;
++
++	if (offset + size <= PAGE_SIZE)
++		return 0;
++	if (check_pages_physically_contiguous(pfn, offset, size))
++		return 0;
++	return 1;
++}
++int __weak xen_swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size)
++{
++	return range_straddles_page_boundary(paddr, size);
++}
++
++static void xen_swiotlb_print_info(unsigned long bytes)
++{
++	phys_addr_t pstart, pend;
++
++	pstart = virt_to_phys(xen_io_tlb_start);
++	pend = virt_to_phys(xen_io_tlb_end);
++
++	printk(KERN_INFO "Placing %luMB Xen software IO TLB between %p - %p\n",
++	       bytes >> 20, xen_io_tlb_start, xen_io_tlb_end);
++	printk(KERN_INFO "Xen software IO TLB at phys %#llx - %#llx\n",
++	       (unsigned long long)pstart,
++	       (unsigned long long)pend);
++}
++
++/*
++ * Statically reserve bounce buffer space and initialize bounce buffer data
++ * structures for the software IO TLB used to implement the DMA API.
++ */
++void __init
++xen_swiotlb_init_with_default_size(size_t default_size)
++{
++	unsigned long i, bytes;
++
++	if (!xen_io_tlb_nslabs) {
++		xen_io_tlb_nslabs = (default_size >> IO_TLB_SHIFT);
++		xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE);
++	}
++
++	bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT;
++
++	/*
++	 * Get IO TLB memory from the low pages
++	 */
++	xen_io_tlb_start = xen_swiotlb_alloc_boot(bytes, xen_io_tlb_nslabs);
++	if (!xen_io_tlb_start)
++		panic("Cannot allocate Xen-SWIOTLB buffer");
++	xen_io_tlb_end = xen_io_tlb_start + bytes;
++  	xen_swiotlb_fixup(xen_io_tlb_start, bytes, xen_io_tlb_nslabs);
++	/*
++	 * Allocate and initialize the free list array.  This array is used
++	 * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE
++	 * between xen_io_tlb_start and xen_io_tlb_end.
++	 */
++	xen_io_tlb_list = alloc_bootmem(xen_io_tlb_nslabs * sizeof(int));
++	for (i = 0; i < xen_io_tlb_nslabs; i++)
++ 		xen_io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE);
++	xen_io_tlb_index = 0;
++	xen_io_tlb_orig_addr = alloc_bootmem(xen_io_tlb_nslabs * sizeof(phys_addr_t));
++
++	/*
++	 * Get the overflow emergency buffer
++	 */
++	xen_io_tlb_overflow_buffer = xen_swiotlb_alloc_boot(xen_io_tlb_overflow,
++						    xen_io_tlb_overflow >> IO_TLB_SHIFT);
++	if (!xen_io_tlb_overflow_buffer)
++		panic("Cannot allocate Xen-SWIOTLB overflow buffer!\n");
++
++	xen_swiotlb_fixup(xen_io_tlb_overflow_buffer, xen_io_tlb_overflow,
++			  xen_io_tlb_overflow >> IO_TLB_SHIFT);
++
++	xen_swiotlb_print_info(bytes);
++}
++
++/*
++ * Systems with larger DMA zones (those that don't support ISA) can
++ * initialize the swiotlb later using the slab allocator if needed.
++ * This should be just like above, but with some error catching.
++ */
++int
++xen_swiotlb_late_init_with_default_size(size_t default_size)
++{
++	unsigned long i, bytes, req_nslabs = xen_io_tlb_nslabs;
++	unsigned int order;
++
++	if (!xen_io_tlb_nslabs) {
++		xen_io_tlb_nslabs = (default_size >> IO_TLB_SHIFT);
++		xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE);
++	}
++
++	/*
++	 * Get IO TLB memory from the low pages
++	 */
++	order = get_order(xen_io_tlb_nslabs << IO_TLB_SHIFT);
++	xen_io_tlb_nslabs = SLABS_PER_PAGE << order;
++	bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT;
++
++	while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) {
++		xen_io_tlb_start = xen_swiotlb_alloc(order, xen_io_tlb_nslabs);
++		if (xen_io_tlb_start)
++			break;
++		order--;
++	}
++
++	if (!xen_io_tlb_start)
++		goto cleanup1;
++
++	if (order != get_order(bytes)) {
++		printk(KERN_WARNING "Warning: only able to allocate %ld MB "
++		       "for Xen software IO TLB\n", (PAGE_SIZE << order) >> 20);
++		xen_io_tlb_nslabs = SLABS_PER_PAGE << order;
++		bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT;
++	}
++	xen_io_tlb_end = xen_io_tlb_start + bytes;
++  	xen_swiotlb_fixup(xen_io_tlb_start, bytes, xen_io_tlb_nslabs);
++	memset(xen_io_tlb_start, 0, bytes);
++
++	/*
++	 * Allocate and initialize the free list array.  This array is used
++	 * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE
++	 * between xen_io_tlb_start and xen_io_tlb_end.
++	 */
++	xen_io_tlb_list = (unsigned int *)__get_free_pages(GFP_KERNEL,
++	                              get_order(xen_io_tlb_nslabs * sizeof(int)));
++	if (!xen_io_tlb_list)
++		goto cleanup2;
++
++	for (i = 0; i < xen_io_tlb_nslabs; i++)
++ 		xen_io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE);
++	xen_io_tlb_index = 0;
++
++	xen_io_tlb_orig_addr = (phys_addr_t *)
++		__get_free_pages(GFP_KERNEL,
++				 get_order(xen_io_tlb_nslabs *
++					   sizeof(phys_addr_t)));
++	if (!xen_io_tlb_orig_addr)
++		goto cleanup3;
++
++	xen_swiotlb_fixup(xen_io_tlb_overflow_buffer, xen_io_tlb_overflow,
++			  xen_io_tlb_overflow >> IO_TLB_SHIFT);
++	memset(xen_io_tlb_orig_addr, 0, xen_io_tlb_nslabs * sizeof(phys_addr_t));
++
++	/*
++	 * Get the overflow emergency buffer
++	 */
++	xen_io_tlb_overflow_buffer = (void *)__get_free_pages(GFP_DMA,
++	                                          get_order(xen_io_tlb_overflow));
++	if (!xen_io_tlb_overflow_buffer)
++		goto cleanup4;
++
++	xen_swiotlb_print_info(bytes);
++
++	return 0;
++
++cleanup4:
++	free_pages((unsigned long)xen_io_tlb_orig_addr,
++		   get_order(xen_io_tlb_nslabs * sizeof(phys_addr_t)));
++	xen_io_tlb_orig_addr = NULL;
++cleanup3:
++	free_pages((unsigned long)xen_io_tlb_list, get_order(xen_io_tlb_nslabs *
++	                                                 sizeof(int)));
++	xen_io_tlb_list = NULL;
++cleanup2:
++	xen_io_tlb_end = NULL;
++	free_pages((unsigned long)xen_io_tlb_start, order);
++	xen_io_tlb_start = NULL;
++cleanup1:
++	xen_io_tlb_nslabs = req_nslabs;
++	return -ENOMEM;
++}
++
++static inline int
++address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size)
++{
++	return xen_swiotlb_arch_address_needs_mapping(hwdev, addr, size);
++}
++
++static inline int range_needs_mapping(phys_addr_t paddr, size_t size)
++{
++	return swiotlb_force || xen_swiotlb_arch_range_needs_mapping(paddr, size);
++}
++
++static int is_xen_swiotlb_buffer(char *addr)
++{
++	return addr >= xen_io_tlb_start && addr < xen_io_tlb_end;
++}
++
++/*
++ * Bounce: copy the swiotlb buffer back to the original dma location
++ */
++static void xen_swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
++			   enum dma_data_direction dir)
++{
++	unsigned long pfn = PFN_DOWN(phys);
++
++	if (PageHighMem(pfn_to_page(pfn))) {
++		/* The buffer does not have a mapping.  Map it in and copy */
++		unsigned int offset = phys & ~PAGE_MASK;
++		char *buffer;
++		unsigned int sz = 0;
++		unsigned long flags;
++
++		while (size) {
++			sz = min_t(size_t, PAGE_SIZE - offset, size);
++
++			local_irq_save(flags);
++			buffer = kmap_atomic(pfn_to_page(pfn),
++					     KM_BOUNCE_READ);
++			if (dir == DMA_TO_DEVICE)
++				memcpy(dma_addr, buffer + offset, sz);
++			else
++				memcpy(buffer + offset, dma_addr, sz);
++			kunmap_atomic(buffer, KM_BOUNCE_READ);
++			local_irq_restore(flags);
++
++			size -= sz;
++			pfn++;
++			dma_addr += sz;
++			offset = 0;
++		}
++	} else {
++		if (dir == DMA_TO_DEVICE)
++			memcpy(dma_addr, phys_to_virt(phys), size);
++		else
++			memcpy(phys_to_virt(phys), dma_addr, size);
++	}
++}
++
++/*
++ * Allocates bounce buffer and returns its kernel virtual address.
++ */
++static void *
++map_single(struct device *hwdev, phys_addr_t phys, size_t size, int dir)
++{
++	unsigned long flags;
++	char *dma_addr;
++	unsigned int nslots, stride, index, wrap;
++	int i;
++	unsigned long start_dma_addr;
++	unsigned long mask;
++	unsigned long offset_slots;
++	unsigned long max_slots;
++
++	mask = dma_get_seg_boundary(hwdev);
++	start_dma_addr = xen_swiotlb_virt_to_bus(hwdev, xen_io_tlb_start) & mask;
++
++	offset_slots = ALIGN(start_dma_addr, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
++
++	/*
++ 	 * Carefully handle integer overflow which can occur when mask == ~0UL.
++ 	 */
++	max_slots = mask + 1
++		    ? ALIGN(mask + 1, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT
++		    : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);
++
++	/*
++	 * For mappings greater than a page, we limit the stride (and
++	 * hence alignment) to a page size.
++	 */
++	nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
++	if (size > PAGE_SIZE)
++		stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT));
++	else
++		stride = 1;
++
++	BUG_ON(!nslots);
++
++	/*
++	 * Find suitable number of IO TLB entries size that will fit this
++	 * request and allocate a buffer from that IO TLB pool.
++	 */
++	spin_lock_irqsave(&xen_io_tlb_lock, flags);
++	index = ALIGN(xen_io_tlb_index, stride);
++	if (index >= xen_io_tlb_nslabs)
++		index = 0;
++	wrap = index;
++
++	do {
++		while (iommu_is_span_boundary(index, nslots, offset_slots,
++					      max_slots)) {
++			index += stride;
++			if (index >= xen_io_tlb_nslabs)
++				index = 0;
++			if (index == wrap)
++				goto not_found;
++		}
++
++		/*
++		 * If we find a slot that indicates we have 'nslots' number of
++		 * contiguous buffers, we allocate the buffers from that slot
++		 * and mark the entries as '0' indicating unavailable.
++		 */
++		if (xen_io_tlb_list[index] >= nslots) {
++			int count = 0;
++
++			for (i = index; i < (int) (index + nslots); i++)
++				xen_io_tlb_list[i] = 0;
++			for (i = index - 1; (OFFSET(i, IO_TLB_SEGSIZE) != IO_TLB_SEGSIZE - 1) && xen_io_tlb_list[i]; i--)
++				xen_io_tlb_list[i] = ++count;
++			dma_addr = xen_io_tlb_start + (index << IO_TLB_SHIFT);
++
++			/*
++			 * Update the indices to avoid searching in the next
++			 * round.
++			 */
++			xen_io_tlb_index = ((index + nslots) < xen_io_tlb_nslabs
++					? (index + nslots) : 0);
++
++			goto found;
++		}
++		index += stride;
++		if (index >= xen_io_tlb_nslabs)
++			index = 0;
++	} while (index != wrap);
++
++not_found:
++	spin_unlock_irqrestore(&xen_io_tlb_lock, flags);
++	return NULL;
++found:
++	spin_unlock_irqrestore(&xen_io_tlb_lock, flags);
++
++	/*
++	 * Save away the mapping from the original address to the DMA address.
++	 * This is needed when we sync the memory.  Then we sync the buffer if
++	 * needed.
++	 */
++	for (i = 0; i < nslots; i++)
++		xen_io_tlb_orig_addr[index+i] = phys + (i << IO_TLB_SHIFT);
++	if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)
++		xen_swiotlb_bounce(phys, dma_addr, size, DMA_TO_DEVICE);
++
++	return dma_addr;
++}
++
++/*
++ * dma_addr is the kernel virtual address of the bounce buffer to unmap.
++ */
++static void
++do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
++{
++	unsigned long flags;
++	int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
++	int index = (dma_addr - xen_io_tlb_start) >> IO_TLB_SHIFT;
++	phys_addr_t phys = xen_io_tlb_orig_addr[index];
++
++	/*
++	 * First, sync the memory before unmapping the entry
++	 */
++	if (phys && ((dir == DMA_FROM_DEVICE) || (dir == DMA_BIDIRECTIONAL)))
++		xen_swiotlb_bounce(phys, dma_addr, size, DMA_FROM_DEVICE);
++
++	/*
++	 * Return the buffer to the free list by setting the corresponding
++	 * entries to indicate the number of contigous entries available.
++	 * While returning the entries to the free list, we merge the entries
++	 * with slots below and above the pool being returned.
++	 */
++	spin_lock_irqsave(&xen_io_tlb_lock, flags);
++	{
++		count = ((index + nslots) < ALIGN(index + 1, IO_TLB_SEGSIZE) ?
++			 xen_io_tlb_list[index + nslots] : 0);
++		/*
++		 * Step 1: return the slots to the free list, merging the
++		 * slots with superceeding slots
++		 */
++		for (i = index + nslots - 1; i >= index; i--)
++			xen_io_tlb_list[i] = ++count;
++		/*
++		 * Step 2: merge the returned slots with the preceding slots,
++		 * if available (non zero)
++		 */
++		for (i = index - 1; (OFFSET(i, IO_TLB_SEGSIZE) != IO_TLB_SEGSIZE -1) && xen_io_tlb_list[i]; i--)
++			xen_io_tlb_list[i] = ++count;
++	}
++	spin_unlock_irqrestore(&xen_io_tlb_lock, flags);
++}
++
++static void
++sync_single(struct device *hwdev, char *dma_addr, size_t size,
++	    int dir, int target)
++{
++	int index = (dma_addr - xen_io_tlb_start) >> IO_TLB_SHIFT;
++	phys_addr_t phys = xen_io_tlb_orig_addr[index];
++
++	phys += ((unsigned long)dma_addr & ((1 << IO_TLB_SHIFT) - 1));
++
++	switch (target) {
++	case SYNC_FOR_CPU:
++		if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))
++			xen_swiotlb_bounce(phys, dma_addr, size, DMA_FROM_DEVICE);
++		else
++			BUG_ON(dir != DMA_TO_DEVICE);
++		break;
++	case SYNC_FOR_DEVICE:
++		if (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))
++			xen_swiotlb_bounce(phys, dma_addr, size, DMA_TO_DEVICE);
++		else
++			BUG_ON(dir != DMA_FROM_DEVICE);
++		break;
++	default:
++		BUG();
++	}
++}
++
++void *
++xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
++		       dma_addr_t *dma_handle, gfp_t flags)
++{
++	void *ret;
++	unsigned int order = get_order(size);
++	unsigned long vstart;
++	u64 mask;
++
++	/*
++	 * Ignore region specifiers - the kernel's ideas of
++	 * pseudo-phys memory layout has nothing to do with the
++	 * machine physical layout.  We can't allocate highmem
++	 * because we can't return a pointer to it.
++	 */
++	flags &= ~(__GFP_DMA | __GFP_HIGHMEM);
++
++	if (dma_alloc_from_coherent(hwdev, size, dma_handle, &ret))
++		return ret;
++
++	vstart = __get_free_pages(flags, order);
++	ret = (void *)vstart;
++
++	if (hwdev != NULL && hwdev->coherent_dma_mask)
++		mask = hwdev->coherent_dma_mask;
++	else
++		mask = DMA_BIT_MASK(32);
++
++	if (ret != NULL) {
++		if (xen_create_contiguous_region(vstart, order,
++						 fls64(mask)) != 0) {
++			free_pages(vstart, order);
++			return NULL;
++		}
++		memset(ret, 0, size);
++		*dma_handle = virt_to_machine(ret).maddr;
++	}
++	return ret;
++}
++
++void
++xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
++		      dma_addr_t dma_handle)
++{
++	int order = get_order(size);
++
++	if (dma_release_from_coherent(hwdev, order, vaddr))
++		return;
++
++	xen_destroy_contiguous_region((unsigned long)vaddr, order);
++	free_pages((unsigned long)vaddr, order);
++}
++
++static void
++xen_swiotlb_full(struct device *dev, size_t size, int dir, int do_panic)
++{
++	/*
++	 * Ran out of IOMMU space for this operation. This is very bad.
++	 * Unfortunately the drivers cannot handle this operation properly.
++	 * unless they check for dma_mapping_error (most don't)
++	 * When the mapping is small enough return a static buffer to limit
++	 * the damage, or panic when the transfer is too big.
++	 */
++	printk(KERN_ERR "Xen-DMA: Out of Xen-SWIOTLB space for %zu bytes at "
++	       "device %s\n", size, dev ? dev_name(dev) : "?");
++
++	if (size > xen_io_tlb_overflow && do_panic) {
++		if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)
++			panic("Xen-DMA: Memory would be corrupted\n");
++		if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)
++			panic("Xen-DMA: Random memory would be DMAed\n");
++	}
++}
++
++/*
++ * Map a single buffer of the indicated size for DMA in streaming mode.  The
++ * physical address to use is returned.
++ *
++ * Once the device is given the dma address, the device owns this memory until
++ * either xen_swiotlb_unmap_page or xen_swiotlb_dma_sync_single is performed.
++ */
++dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
++			    unsigned long offset, size_t size,
++			    enum dma_data_direction dir,
++			    struct dma_attrs *attrs)
++{
++	phys_addr_t phys = page_to_phys(page) + offset;
++	dma_addr_t dev_addr = xen_swiotlb_phys_to_bus(dev, phys);
++	void *map;
++
++	BUG_ON(dir == DMA_NONE);
++	/*
++	 * If the address happens to be in the device's DMA window,
++	 * we can safely return the device addr and not worry about bounce
++	 * buffering it.
++	 */
++	if (!address_needs_mapping(dev, dev_addr, size) &&
++	    !range_needs_mapping(phys, size))
++		return dev_addr;
++
++	/*
++	 * Oh well, have to allocate and map a bounce buffer.
++	 */
++	map = map_single(dev, phys, size, dir);
++	if (!map) {
++		xen_swiotlb_full(dev, size, dir, 1);
++		map = xen_io_tlb_overflow_buffer;
++	}
++
++	dev_addr = xen_swiotlb_virt_to_bus(dev, map);
++
++	/*
++	 * Ensure that the address returned is DMA'ble
++	 */
++	if (address_needs_mapping(dev, dev_addr, size))
++		panic("xen_swiotlb_map_single: bounce buffer is not DMA'ble");
++
++	return dev_addr;
++}
++
++/*
++ * Unmap a single streaming mode DMA translation.  The dma_addr and size must
++ * match what was provided for in a previous xen_swiotlb_map_page call.  All
++ * other usages are undefined.
++ *
++ * After this call, reads by the cpu to the buffer are guaranteed to see
++ * whatever the device wrote there.
++ */
++static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,
++			 size_t size, int dir)
++{
++	char *dma_addr = xen_swiotlb_bus_to_virt(hwdev, dev_addr);
++
++	BUG_ON(dir == DMA_NONE);
++
++	if (is_xen_swiotlb_buffer(dma_addr)) {
++		do_unmap_single(hwdev, dma_addr, size, dir);
++		return;
++	}
++
++	if (dir != DMA_FROM_DEVICE)
++		return;
++
++	dma_mark_clean(dma_addr, size);
++}
++
++void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
++			size_t size, enum dma_data_direction dir,
++			struct dma_attrs *attrs)
++{
++	unmap_single(hwdev, dev_addr, size, dir);
++}
++
++/*
++ * Make physical memory consistent for a single streaming mode DMA translation
++ * after a transfer.
++ *
++ * If you perform a xen_swiotlb_map_page() but wish to interrogate the buffer
++ * using the cpu, yet do not wish to teardown the dma mapping, you must
++ * call this function before doing so.  At the next point you give the dma
++ * address back to the card, you must first perform a
++ * xen_swiotlb_dma_sync_for_device, and then the device again owns the buffer
++ */
++static void
++xen_swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
++		    size_t size, int dir, int target)
++{
++	char *dma_addr = xen_swiotlb_bus_to_virt(hwdev, dev_addr);
++
++	BUG_ON(dir == DMA_NONE);
++
++	if (is_xen_swiotlb_buffer(dma_addr)) {
++		sync_single(hwdev, dma_addr, size, dir, target);
++		return;
++	}
++
++	if (dir != DMA_FROM_DEVICE)
++		return;
 +
-+	return 0;
++	dma_mark_clean(dma_addr, size);
 +}
 +
-+int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
-+			       unsigned long addr,
-+			       unsigned long mfn, int nr,
-+			       pgprot_t prot, unsigned domid)
++void
++xen_swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
++			    size_t size, enum dma_data_direction dir)
 +{
-+	struct remap_data rmd;
-+	struct mmu_update mmu_update[REMAP_BATCH_SIZE];
-+	int batch;
-+	unsigned long range;
-+	int err = 0;
++	xen_swiotlb_sync_single(hwdev, dev_addr, size, dir, SYNC_FOR_CPU);
++}
 +
-+	prot = __pgprot(pgprot_val(prot) | _PAGE_IOMAP);
++void
++xen_swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
++			       size_t size, enum dma_data_direction dir)
++{
++	xen_swiotlb_sync_single(hwdev, dev_addr, size, dir, SYNC_FOR_DEVICE);
++}
 +
-+	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
++/*
++ * Same as above, but for a sub-range of the mapping.
++ */
++static void
++xen_swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr,
++			  unsigned long offset, size_t size,
++			  int dir, int target)
++{
++	xen_swiotlb_sync_single(hwdev, dev_addr + offset, size, dir, target);
++}
 +
-+	rmd.mfn = mfn;
-+	rmd.prot = prot;
++void
++xen_swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
++				  unsigned long offset, size_t size,
++				  enum dma_data_direction dir)
++{
++	xen_swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir,
++				  SYNC_FOR_CPU);
++}
 +
-+	while (nr) {
-+		batch = min(REMAP_BATCH_SIZE, nr);
-+		range = (unsigned long)batch << PAGE_SHIFT;
++void
++xen_swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr,
++				     unsigned long offset, size_t size,
++				     enum dma_data_direction dir)
++{
++	xen_swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir,
++				  SYNC_FOR_DEVICE);
++}
 +
-+		rmd.mmu_update = mmu_update;
-+		err = apply_to_page_range(vma->vm_mm, addr, range,
-+					  remap_area_mfn_pte_fn, &rmd);
-+		if (err)
-+			goto out;
++/*
++ * Map a set of buffers described by scatterlist in streaming mode for DMA.
++ * This is the scatter-gather version of the above xen_swiotlb_map_page
++ * interface.  Here the scatter gather list elements are each tagged with the
++ * appropriate dma address and length.  They are obtained via
++ * sg_dma_{address,length}(SG).
++ *
++ * NOTE: An implementation may be able to use a smaller number of
++ *       DMA address/length pairs than there are SG table elements.
++ *       (for example via virtual mapping capabilities)
++ *       The routine returns the number of addr/length pairs actually
++ *       used, at most nents.
++ *
++ * Device ownership issues as mentioned above for xen_swiotlb_map_page are the
++ * same here.
++ */
++int
++xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
++		     enum dma_data_direction dir, struct dma_attrs *attrs)
++{
++	struct scatterlist *sg;
++	int i;
 +
-+		err = -EFAULT;
-+		if (HYPERVISOR_mmu_update(mmu_update, batch, NULL, domid) < 0)
-+			goto out;
++	BUG_ON(dir == DMA_NONE);
 +
-+		nr -= batch;
-+		addr += range;
++	for_each_sg(sgl, sg, nelems, i) {
++		phys_addr_t paddr = sg_phys(sg);
++		dma_addr_t dev_addr = xen_swiotlb_phys_to_bus(hwdev, paddr);
++
++		if (range_needs_mapping(paddr, sg->length) ||
++		    address_needs_mapping(hwdev, dev_addr, sg->length)) {
++			void *map = map_single(hwdev, sg_phys(sg),
++					       sg->length, dir);
++			if (!map) {
++				/* Don't panic here, we expect map_sg users
++				   to do proper error handling. */
++				xen_swiotlb_full(hwdev, sg->length, dir, 0);
++				xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,
++						       attrs);
++				sgl[0].dma_length = 0;
++				return 0;
++			}
++			sg->dma_address = xen_swiotlb_virt_to_bus(hwdev, map);
++		} else
++			sg->dma_address = dev_addr;
++		sg->dma_length = sg->length;
 +	}
++	return nelems;
++}
 +
-+	err = 0;
-+out:
++int
++xen_swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
++	       int dir)
++{
++	return xen_swiotlb_map_sg_attrs(hwdev, sgl, nelems, dir, NULL);
++}
 +
-+	flush_tlb_all();
++/*
++ * Unmap a set of streaming mode DMA translations.  Again, cpu read rules
++ * concerning calls here are the same as for xen_swiotlb_unmap_page() above.
++ */
++void
++xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
++		       int nelems, enum dma_data_direction dir, struct dma_attrs *attrs)
++{
++	struct scatterlist *sg;
++	int i;
 +
-+	return err;
-+}
-+EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);
++	BUG_ON(dir == DMA_NONE);
 +
- #ifdef CONFIG_XEN_DEBUG_FS
- 
- static struct dentry *d_mmu_debug;
-diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
-new file mode 100644
-index 0000000..3b96c87
---- /dev/null
-+++ b/arch/x86/xen/pci-swiotlb.c
-@@ -0,0 +1,53 @@
-+#include <linux/bootmem.h>
-+#include <linux/gfp.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/swiotlb.h>
++	for_each_sg(sgl, sg, nelems, i)
++		unmap_single(hwdev, sg->dma_address, sg->dma_length, dir);
 +
-+#include <xen/swiotlb.h>
-+#include <asm/xen/hypervisor.h>
++}
 +
-+/* 
-+ * This file defines overrides for weak functions with default
-+ * implementations in lib/swiotlb.c.
-+ */
++void
++xen_swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
++		 int dir)
++{
++	return xen_swiotlb_unmap_sg_attrs(hwdev, sgl, nelems, dir, NULL);
++}
 +
-+void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
++/*
++ * Make physical memory consistent for a set of streaming mode DMA translations
++ * after a transfer.
++ *
++ * The same as xen_swiotlb_sync_single_* but for a scatter-gather list, same rules
++ * and usage.
++ */
++static void
++xen_swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
++		int nelems, int dir, int target)
 +{
-+	void *ret = alloc_bootmem_low_pages(size);
++	struct scatterlist *sg;
++	int i;
 +
-+	if (ret && xen_pv_domain())
-+		xen_swiotlb_fixup(ret, size, nslabs);
++	for_each_sg(sgl, sg, nelems, i)
++		xen_swiotlb_sync_single(hwdev, sg->dma_address,
++				    sg->dma_length, dir, target);
++}
 +
-+	return ret;
++void
++xen_swiotlb_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
++			int nelems, enum dma_data_direction dir)
++{
++	xen_swiotlb_sync_sg(hwdev, sg, nelems, dir, SYNC_FOR_CPU);
 +}
 +
-+void *swiotlb_alloc(unsigned order, unsigned long nslabs)
++void
++xen_swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
++			   int nelems, enum dma_data_direction dir)
 +{
-+	/* Never called on x86.  Warn, just in case it ever is. */
-+	WARN_ON(1);
-+	return NULL;
++	xen_swiotlb_sync_sg(hwdev, sg, nelems, dir, SYNC_FOR_DEVICE);
 +}
 +
-+dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
++int
++xen_swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)
 +{
-+	if (xen_pv_domain())
-+		return xen_phys_to_bus(paddr);
++	return (dma_addr == xen_swiotlb_virt_to_bus(hwdev, xen_io_tlb_overflow_buffer));
++}
 +
-+	return paddr;
++/*
++ * Return whether the given device DMA address mask can be supported
++ * properly.  For example, if your device can only drive the low 24-bits
++ * during bus mastering, then you would pass 0x00ffffff as the mask to
++ * this function.
++ */
++int
++xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)
++{
++	return xen_swiotlb_virt_to_bus(hwdev, xen_io_tlb_end - 1) <= mask;
 +}
 +
-+phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
++static int max_dma_bits = 32;
++
++void
++xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs)
 +{
-+	if (xen_pv_domain())
-+		return xen_bus_to_phys(baddr);
++	int i, rc;
++	int dma_bits;
++
++	printk(KERN_DEBUG "xen_swiotlb_fixup: buf=%p size=%zu\n",
++		buf, size);
++
++	dma_bits = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT) + PAGE_SHIFT;
++
++	i = 0;
++	do {
++		int slabs = min(nslabs - i, (unsigned long)IO_TLB_SEGSIZE);
++
++		do {
++			rc = xen_create_contiguous_region(
++				(unsigned long)buf + (i << IO_TLB_SHIFT),
++				get_order(slabs << IO_TLB_SHIFT),
++				dma_bits);
++		} while (rc && dma_bits++ < max_dma_bits);
++		if (rc)
++			panic(KERN_ERR "xen_create_contiguous_region failed\n");
 +
-+	return baddr;
++		i += slabs;
++	} while(i < nslabs);
 +}
++static struct dma_map_ops xen_swiotlb_dma_ops = {
++	.mapping_error = xen_swiotlb_dma_mapping_error,
++	.alloc_coherent = xen_swiotlb_alloc_coherent,
++	.free_coherent = xen_swiotlb_free_coherent,
++	.sync_single_for_cpu = xen_swiotlb_sync_single_for_cpu,
++	.sync_single_for_device = xen_swiotlb_sync_single_for_device,
++	.sync_single_range_for_cpu = xen_swiotlb_sync_single_range_for_cpu,
++	.sync_single_range_for_device = xen_swiotlb_sync_single_range_for_device,
++	.sync_sg_for_cpu = xen_swiotlb_sync_sg_for_cpu,
++	.sync_sg_for_device = xen_swiotlb_sync_sg_for_device,
++	.map_sg = xen_swiotlb_map_sg_attrs,
++	.unmap_sg = xen_swiotlb_unmap_sg_attrs,
++	.map_page = xen_swiotlb_map_page,
++	.unmap_page = xen_swiotlb_unmap_page,
++	.dma_supported = NULL,
++};
 +
-+int swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size)
++int __init xen_swiotlb_init(void)
 +{
-+	if (xen_pv_domain())
-+		return xen_range_needs_mapping(paddr, size);
-+
-+	return 0;
++	if (xen_pv_domain() && xen_initial_domain()) {
++		iommu_detected = 1;
++		return 0;
++	}
++	return -ENODEV;
++}
++void __init xen_swiotlb_init_alloc(void)
++{
++	if (xen_pv_domain() && xen_initial_domain()) {
++		printk(KERN_INFO "PCI-DMA: Using Xen software bounce buffering for IO (Xen-SWIOTLB)\n");
++		xen_swiotlb_init_with_default_size(64 * (1<<20));	/* default to 64MB */
++		dma_ops = &xen_swiotlb_dma_ops;
++	}
 +}
 diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
 new file mode 100644
-index 0000000..60bab67
+index 0000000..44d91ad
 --- /dev/null
 +++ b/arch/x86/xen/pci.c
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,111 @@
 +#include <linux/kernel.h>
 +#include <linux/acpi.h>
 +#include <linux/pci.h>
@@ -4798,13 +5760,12 @@ index 0000000..60bab67
 +#ifdef CONFIG_PCI_MSI
 +int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 +{
-+	unsigned int irq;
-+	int ret;
++	int irq, ret;
 +	struct msi_desc *msidesc;
 +
 +	list_for_each_entry(msidesc, &dev->msi_list, list) {
 +		irq = xen_create_msi_irq(dev, msidesc, type);
-+		if (irq == 0)
++		if (irq < 0)
 +			return -1;
 +
 +		ret = set_irq_msi(irq, msidesc);
@@ -5618,10 +6579,10 @@ index 1ebd6b4..3590082 100644
  obj-$(CONFIG_PCI_IOV) += iov.o
 diff --git a/drivers/pci/xen-iommu.c b/drivers/pci/xen-iommu.c
 new file mode 100644
-index 0000000..b1a7d93
+index 0000000..9ba63b1
 --- /dev/null
 +++ b/drivers/pci/xen-iommu.c
-@@ -0,0 +1,332 @@
+@@ -0,0 +1,271 @@
 +#include <linux/types.h>
 +#include <linux/mm.h>
 +#include <linux/string.h>
@@ -5637,7 +6598,6 @@ index 0000000..b1a7d93
 +#include <xen/grant_table.h>
 +#include <xen/page.h>
 +#include <xen/xen-ops.h>
-+#include <xen/swiotlb.h>
 +
 +#include <asm/iommu.h>
 +#include <asm/swiotlb.h>
@@ -5661,40 +6621,6 @@ index 0000000..b1a7d93
 +} while (0)
 +
 +
-+static int max_dma_bits = 32;
-+
-+void xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs)
-+{
-+	int i, rc;
-+	int dma_bits;
-+
-+	printk(KERN_DEBUG "xen_swiotlb_fixup: buf=%p size=%zu\n",
-+		buf, size);
-+
-+	dma_bits = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT) + PAGE_SHIFT;
-+
-+	i = 0;
-+	do {
-+		int slabs = min(nslabs - i, (unsigned long)IO_TLB_SEGSIZE);
-+
-+		do {
-+			rc = xen_create_contiguous_region(
-+				(unsigned long)buf + (i << IO_TLB_SHIFT),
-+				get_order(slabs << IO_TLB_SHIFT),
-+				dma_bits);
-+		} while (rc && dma_bits++ < max_dma_bits);
-+		if (rc)
-+			panic(KERN_ERR "xen_create_contiguous_region failed\n");
-+
-+		i += slabs;
-+	} while(i < nslabs);
-+}
-+
-+int xen_wants_swiotlb(void)
-+{
-+	return xen_initial_domain();
-+}
-+
 +dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
 +{
 +	return phys_to_machine(XPADDR(paddr)).maddr;
@@ -5914,44 +6840,18 @@ index 0000000..b1a7d93
 +	.is_phys = 0,
 +};
 +
-+static struct dma_map_ops xen_swiotlb_dma_ops = {
-+	.dma_supported = swiotlb_dma_supported,
-+
-+	.alloc_coherent = xen_alloc_coherent,
-+	.free_coherent = xen_free_coherent,
-+
-+	.map_page = swiotlb_map_page,
-+	.unmap_page = swiotlb_unmap_page,
-+
-+	.map_sg = swiotlb_map_sg_attrs,
-+	.unmap_sg = swiotlb_unmap_sg_attrs,
-+
-+	.mapping_error = swiotlb_dma_mapping_error,
-+
-+	.sync_single_for_cpu = swiotlb_sync_single_for_cpu,
-+	.sync_single_for_device = swiotlb_sync_single_for_device,
-+	.sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
-+	.sync_single_range_for_device = swiotlb_sync_single_range_for_device,
-+	.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
-+	.sync_sg_for_device = swiotlb_sync_sg_for_device,
-+
-+	.is_phys = 0,
-+};
-+
 +void __init xen_iommu_init(void)
 +{
 +	if (!xen_pv_domain())
 +		return;
 +
++	if (xen_initial_domain()) /* For dom0, the IOMMU is handled by arch/x86/xen/pci-swiotlb.c. */
++		return;
++
 +	printk(KERN_INFO "Xen: Initializing Xen DMA ops\n");
 +
 +	force_iommu = 0;
 +	dma_ops = &xen_dma_ops;
-+
-+	if (swiotlb) {
-+		printk(KERN_INFO "Xen: Enabling DMA fallback to swiotlb\n");
-+		dma_ops = &xen_swiotlb_dma_ops;
-+	}
 +}
 +
 diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
@@ -8531,7 +9431,7 @@ index 0000000..650f4b3
 +	(void)xenbus_register_backend(&blkback);
 +}
 diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index abad71b..96aebd4 100644
+index abad71b..68c287c 100644
 --- a/drivers/xen/events.c
 +++ b/drivers/xen/events.c
 @@ -16,7 +16,7 @@
@@ -8568,11 +9468,13 @@ index abad71b..96aebd4 100644
  /*
   * This lock protects updates to the following mapping and reference-count
   * arrays. The lock does not need to be acquired to read the mapping tables.
-@@ -83,20 +90,25 @@ struct irq_info
+@@ -82,21 +89,26 @@ struct irq_info
+ 		unsigned short virq;
  		enum ipi_vector ipi;
  		struct {
- 			unsigned short gsi;
+-			unsigned short gsi;
 -			unsigned short vector;
++			unsigned short nr;
 +			unsigned char vector;
 +			unsigned char flags;
  		} pirq;
@@ -8608,6 +9510,28 @@ index abad71b..96aebd4 100644
  
  /* Constructor for packed IRQ information. */
  static struct irq_info mk_unbound_info(void)
+@@ -132,10 +145,10 @@ static struct irq_info mk_virq_info(unsigned short evtchn, unsigned short virq)
+ }
+ 
+ static struct irq_info mk_pirq_info(unsigned short evtchn,
+-				    unsigned short gsi, unsigned short vector)
++				    unsigned short pirq, unsigned short vector)
+ {
+ 	return (struct irq_info) { .type = IRQT_PIRQ, .evtchn = evtchn,
+-			.cpu = 0, .u.pirq = { .gsi = gsi, .vector = vector } };
++			.cpu = 0, .u.pirq = { .nr = pirq, .vector = vector } };
+ }
+ 
+ /*
+@@ -184,7 +197,7 @@ static unsigned gsi_from_irq(unsigned irq)
+ 	BUG_ON(info == NULL);
+ 	BUG_ON(info->type != IRQT_PIRQ);
+ 
+-	return info->u.pirq.gsi;
++	return info->u.pirq.nr;
+ }
+ 
+ static unsigned vector_from_irq(unsigned irq)
 @@ -218,6 +231,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
  	return ret;
  }
@@ -8650,7 +9574,7 @@ index abad71b..96aebd4 100644
  		if (irq_info[irq].type == IRQT_UNBOUND)
  			break;
  
-@@ -350,6 +384,299 @@ static int find_unbound_irq(void)
+@@ -350,6 +384,300 @@ static int find_unbound_irq(void)
  	return irq;
  }
  
@@ -8662,7 +9586,8 @@ index abad71b..96aebd4 100644
 +
 +static void pirq_unmask_notify(int irq)
 +{
-+	struct physdev_eoi eoi = { .irq = irq };
++	struct irq_info *info = info_for_irq(irq);
++	struct physdev_eoi eoi = { .irq = info->u.pirq.nr };
 +
 +	if (unlikely(pirq_needs_eoi(irq))) {
 +		int rc = HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi);
@@ -8677,7 +9602,7 @@ index abad71b..96aebd4 100644
 +
 +	BUG_ON(info->type != IRQT_PIRQ);
 +
-+	irq_status.irq = irq;
++	irq_status.irq = info->u.pirq.nr;
 +	if (HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status))
 +		irq_status.flags = 0;
 +
@@ -8705,7 +9630,7 @@ index abad71b..96aebd4 100644
 +	if (VALID_EVTCHN(evtchn))
 +		goto out;
 +
-+	bind_pirq.pirq = irq;
++	bind_pirq.pirq = info->u.pirq.nr;
 +	/* NB. We are happy to share unless we are probing. */
 +	bind_pirq.flags = probing_irq(irq) ? 0 : BIND_PIRQ__WILL_SHARE;
 +	rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
@@ -8836,7 +9761,7 @@ index abad71b..96aebd4 100644
 +	set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
 +				      handle_level_irq, name);
 +
-+	irq_op.irq = irq;
++	irq_op.irq = gsi;
 +	if (HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &irq_op)) {
 +		dynamic_irq_cleanup(irq);
 +		irq = -ENOSPC;
@@ -8854,6 +9779,7 @@ index abad71b..96aebd4 100644
 +{
 +	struct irq_desc *desc;
 +	struct physdev_unmap_pirq unmap_irq;
++	struct irq_info *info = info_for_irq(irq);
 +	int rc = -ENOENT;
 +
 +	spin_lock(&irq_mapping_update_lock);
@@ -8862,11 +9788,11 @@ index abad71b..96aebd4 100644
 +	if (!desc)
 +		goto out;
 +
-+	unmap_irq.pirq = irq;
++	unmap_irq.pirq = info->u.pirq.nr;
 +	unmap_irq.domid = DOMID_SELF;
 +	rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq);
 +	if (rc) {
-+		printk(KERN_WARNING "unmap irq failed %x\n", rc);
++		printk(KERN_WARNING "unmap irq failed %d\n", rc);
 +		goto out;
 +	}
 +
@@ -8892,6 +9818,7 @@ index abad71b..96aebd4 100644
 +	map_irq.domid = domid;
 +	map_irq.type = MAP_PIRQ_TYPE_MSI;
 +	map_irq.index = -1;
++	map_irq.pirq = -1;
 +	map_irq.bus = dev->bus->number;
 +	map_irq.devfn = dev->devfn;
 +
@@ -8913,12 +9840,10 @@ index abad71b..96aebd4 100644
 +	if (irq == -1)
 +		goto out;
 +
-+	map_irq.pirq = irq;
-+
 +	rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
 +	if (rc) {
 +
-+		printk(KERN_WARNING "xen map irq failed %x\n", rc);
++		printk(KERN_WARNING "xen map irq failed %d\n", rc);
 +
 +		dynamic_irq_cleanup(irq);
 +
@@ -8926,7 +9851,7 @@ index abad71b..96aebd4 100644
 +		goto out;
 +	}
 +
-+	irq_info[irq] = mk_pirq_info(0, -1, map_irq.index);
++	irq_info[irq] = mk_pirq_info(0, map_irq.pirq, map_irq.index);
 +	set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
 +			handle_level_irq,
 +			(type == PCI_CAP_ID_MSIX) ? "msi-x":"msi");
@@ -8950,7 +9875,7 @@ index abad71b..96aebd4 100644
  int bind_evtchn_to_irq(unsigned int evtchn)
  {
  	int irq;
-@@ -409,8 +736,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+@@ -409,8 +737,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
  	return irq;
  }
  
@@ -8975,7 +9900,7 @@ index abad71b..96aebd4 100644
  {
  	struct evtchn_bind_virq bind_virq;
  	int evtchn, irq;
-@@ -501,6 +843,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
+@@ -501,6 +844,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
  }
  EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
  
@@ -9005,7 +9930,7 @@ index abad71b..96aebd4 100644
  int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
  			    irq_handler_t handler,
  			    unsigned long irqflags, const char *devname, void *dev_id)
-@@ -532,6 +897,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
+@@ -532,6 +898,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
  	if (irq < 0)
  		return irq;
  
@@ -9013,7 +9938,7 @@ index abad71b..96aebd4 100644
  	retval = request_irq(irq, handler, irqflags, devname, dev_id);
  	if (retval != 0) {
  		unbind_from_irq(irq);
-@@ -924,13 +1290,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
+@@ -924,13 +1291,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
  	.retrigger	= retrigger_dynirq,
  };
  
@@ -9053,7 +9978,7 @@ index abad71b..96aebd4 100644
  
  	init_evtchn_cpu_bindings();
  
-@@ -939,4 +1330,6 @@ void __init xen_init_IRQ(void)
+@@ -939,4 +1331,6 @@ void __init xen_init_IRQ(void)
  		mask_evtchn(i);
  
  	irq_ctx_init(smp_processor_id());
@@ -10063,10 +10988,10 @@ index 0000000..21c1f95
 +}
 diff --git a/drivers/xen/netback/netback.c b/drivers/xen/netback/netback.c
 new file mode 100644
-index 0000000..80b424f
+index 0000000..7c0f05b
 --- /dev/null
 +++ b/drivers/xen/netback/netback.c
-@@ -0,0 +1,1513 @@
+@@ -0,0 +1,1604 @@
 +/******************************************************************************
 + * drivers/xen/netback/netback.c
 + *
@@ -10254,6 +11179,82 @@ index 0000000..80b424f
 +		tasklet_schedule(&net_tx_tasklet);
 +}
 +
++static struct sk_buff *netbk_copy_skb(struct sk_buff *skb)
++{
++	struct skb_shared_info *ninfo;
++	struct sk_buff *nskb;
++	unsigned long offset;
++	int ret;
++	int len;
++	int headlen;
++
++	BUG_ON(skb_shinfo(skb)->frag_list != NULL);
++
++	nskb = alloc_skb(SKB_MAX_HEAD(0), GFP_ATOMIC | __GFP_NOWARN);
++	if (unlikely(!nskb))
++		goto err;
++
++	skb_reserve(nskb, NET_SKB_PAD + NET_IP_ALIGN);
++	headlen = skb_end_pointer(nskb) - nskb->data;
++	if (headlen > skb_headlen(skb))
++		headlen = skb_headlen(skb);
++	ret = skb_copy_bits(skb, 0, __skb_put(nskb, headlen), headlen);
++	BUG_ON(ret);
++
++	ninfo = skb_shinfo(nskb);
++	ninfo->gso_size = skb_shinfo(skb)->gso_size;
++	ninfo->gso_type = skb_shinfo(skb)->gso_type;
++
++	offset = headlen;
++	len = skb->len - headlen;
++
++	nskb->len = skb->len;
++	nskb->data_len = len;
++	nskb->truesize += len;
++
++	while (len) {
++		struct page *page;
++		int copy;
++		int zero;
++
++		if (unlikely(ninfo->nr_frags >= MAX_SKB_FRAGS)) {
++			dump_stack();
++			goto err_free;
++		}
++
++		copy = len >= PAGE_SIZE ? PAGE_SIZE : len;
++		zero = len >= PAGE_SIZE ? 0 : __GFP_ZERO;
++
++		page = alloc_page(GFP_ATOMIC | __GFP_NOWARN | zero);
++		if (unlikely(!page))
++			goto err_free;
++
++		ret = skb_copy_bits(skb, offset, page_address(page), copy);
++		BUG_ON(ret);
++
++		ninfo->frags[ninfo->nr_frags].page = page;
++		ninfo->frags[ninfo->nr_frags].page_offset = 0;
++		ninfo->frags[ninfo->nr_frags].size = copy;
++		ninfo->nr_frags++;
++
++		offset += copy;
++		len -= copy;
++	}
++
++	offset = nskb->data - skb->data;
++
++	nskb->transport_header = skb->transport_header + offset;
++	nskb->network_header = skb->network_header + offset;
++	nskb->mac_header = skb->mac_header + offset;
++
++	return nskb;
++
++ err_free:
++	kfree_skb(nskb);
++ err:
++	return NULL;
++}
++
 +static inline int netbk_max_required_rx_slots(struct xen_netif *netif)
 +{
 +	if (netif->features & (NETIF_F_SG|NETIF_F_TSO))
@@ -10287,6 +11288,21 @@ index 0000000..80b424f
 +	if (unlikely(!netif_schedulable(netif) || netbk_queue_full(netif)))
 +		goto drop;
 +
++	/*
++	 * XXX For now we also copy skbuffs whose head crosses a page
++	 * boundary, because netbk_gop_skb can't handle them.
++	 */
++	if ((skb_headlen(skb) + offset_in_page(skb->data)) >= PAGE_SIZE) {
++		struct sk_buff *nskb = netbk_copy_skb(skb);
++		if ( unlikely(nskb == NULL) )
++			goto drop;
++		/* Copy only the header fields we use in this driver. */
++		nskb->dev = skb->dev;
++		nskb->ip_summed = skb->ip_summed;
++		dev_kfree_skb(skb);
++		skb = nskb;
++	}
++
 +	netif->rx_req_cons_peek += skb_shinfo(skb)->nr_frags + 1 +
 +				   !!skb_shinfo(skb)->gso_size;
 +	netif_get(netif);
@@ -15662,28 +16678,112 @@ index 0000000..b42cdfd
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
 diff --git a/include/xen/swiotlb.h b/include/xen/swiotlb.h
 new file mode 100644
-index 0000000..75d1da1
+index 0000000..670233c
 --- /dev/null
 +++ b/include/xen/swiotlb.h
-@@ -0,0 +1,18 @@
-+#ifndef _XEN_SWIOTLB_H
-+#define _XEN_SWIOTLB_H
-+
-+extern void xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs);
-+extern phys_addr_t xen_bus_to_phys(dma_addr_t daddr);
-+extern dma_addr_t xen_phys_to_bus(phys_addr_t paddr);
-+extern int xen_range_needs_mapping(phys_addr_t phys, size_t size);
+@@ -0,0 +1,102 @@
++#ifndef __LINUX_XEN_SWIOTLB_H
++#define __LINUX_XEN_SWIOTLB_H
 +
-+#ifdef CONFIG_PCI_XEN
-+extern int xen_wants_swiotlb(void);
-+#else
-+static inline int xen_wants_swiotlb(void)
-+{
-+	return 0;
-+}
-+#endif
++#include <linux/types.h>
++
++struct device;
++struct dma_attrs;
++struct scatterlist;
++
++/*
++ * Maximum allowable number of contiguous slabs to map,
++ * must be a power of 2.  What is the appropriate value ?
++ * The complexity of {map,unmap}_single is linearly dependent on this value.
++ */
++#define IO_TLB_SEGSIZE	128
++
++
++/*
++ * log of the size of each IO TLB slab.  The number of slabs is command line
++ * controllable.
++ */
++#define IO_TLB_SHIFT 11
++
++extern void *xen_swiotlb_alloc_boot(size_t bytes, unsigned long nslabs);
++extern void *xen_swiotlb_alloc(unsigned order, unsigned long nslabs);
++
++extern dma_addr_t xen_swiotlb_phys_to_bus(struct device *hwdev,
++				      phys_addr_t address);
++extern phys_addr_t xen_swiotlb_bus_to_phys(struct device *hwdev,
++				       dma_addr_t address);
++
++extern int xen_swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size);
++
++extern void
++*xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
++			dma_addr_t *dma_handle, gfp_t flags);
++
++extern void
++xen_swiotlb_free_coherent(struct device *hwdev, size_t size,
++		      void *vaddr, dma_addr_t dma_handle);
++
++extern dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
++				   unsigned long offset, size_t size,
++				   enum dma_data_direction dir,
++				   struct dma_attrs *attrs);
++extern void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
++			       size_t size, enum dma_data_direction dir,
++			       struct dma_attrs *attrs);
++
++extern int
++xen_swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,
++	       int direction);
++
++extern void
++xen_swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
++		 int direction);
++
++extern int
++xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
++		     enum dma_data_direction dir, struct dma_attrs *attrs);
++
++extern void
++xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
++		       int nelems, enum dma_data_direction dir,
++		       struct dma_attrs *attrs);
++
++extern void
++xen_swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
++			    size_t size, enum dma_data_direction dir);
++
++extern void
++xen_swiotlb_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
++			int nelems, enum dma_data_direction dir);
++
++extern void
++xen_swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
++			       size_t size, enum dma_data_direction dir);
++
++extern void
++xen_swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
++			   int nelems, enum dma_data_direction dir);
++
++extern void
++xen_swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
++				  unsigned long offset, size_t size,
++				  enum dma_data_direction dir);
++
++extern void
++xen_swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr,
++				     unsigned long offset, size_t size,
++				     enum dma_data_direction dir);
++
++extern int
++xen_swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);
++
++extern int
++xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);
++
++extern void
++xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs);
 +
-+#endif /* _XEN_SWIOTLB_H */
++#endif /* __LINUX_XEN_SWIOTLB_H */
 diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
 index 883a21b..9769738 100644
 --- a/include/xen/xen-ops.h

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/include/linux/swiotlb.h               |    1 +
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 24 insertions(+)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -p -r1.1.2.25 -r1.1.2.26
--- xen.pvops.post.patch	24 Aug 2009 21:34:54 -0000	1.1.2.25
+++ xen.pvops.post.patch	5 Sep 2009 19:00:27 -0000	1.1.2.26
@@ -68,19 +68,15 @@ index 2202b62..f371fe8 100644
  }
  
  int __init pcibios_init(void)
-diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 6af96ee..1e66b18 100644
---- a/arch/x86/kernel/pci-swiotlb.c
-+++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -71,9 +71,8 @@ void __init pci_swiotlb_init(void)
- {
- 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
- #ifdef CONFIG_X86_64
--	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
--		iommu_pass_through)
--	       swiotlb = 1;
-+	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
-+		swiotlb = 1;
- #endif
- 	if (xen_wants_swiotlb())
- 		swiotlb = 1;
+diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
+index cb1a663..f4ebffb 100644
+--- a/include/linux/swiotlb.h
++++ b/include/linux/swiotlb.h
+@@ -2,6 +2,7 @@
+ #define __LINUX_SWIOTLB_H
+ 
+ #include <linux/types.h>
++#include <linux/dma-mapping.h>
+ 
+ struct device;
+ struct dma_attrs;

xen.pvops.pre.patch:
 b/arch/x86/include/asm/paravirt.h |    3 ---
 b/arch/x86/kernel/process_32.c    |    3 +--
 b/arch/x86/pci/common.c           |   16 ----------------
 drivers/pci/pci.h                 |    2 --
 4 files changed, 1 insertion(+), 23 deletions(-)

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -p -r1.1.2.16 -r1.1.2.17
--- xen.pvops.pre.patch	10 Aug 2009 21:22:20 -0000	1.1.2.16
+++ xen.pvops.pre.patch	5 Sep 2009 19:00:27 -0000	1.1.2.17
@@ -2,7 +2,6 @@ temporarily revert various Fedora change
 Affected patches;
 linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h
 linux-2.6-execshield.patch - arch/x86/include/asm/paravirt.h arch/x86/kernel/process_32.c
-linux-2.6-intel-iommu-updates.patch - arch/x86/kernel/pci-swiotlb.c
 linux-2.6-pci-cacheline-sizing.patch - arch/x86/pci/common.c
 
 --- a/drivers/pci/pci.h	2009-04-24 20:46:50.000000000 +0100
@@ -74,19 +73,3 @@ index 2202b62..f371fe8 100644
  	pcibios_resource_survey();
  
  	if (pci_bf_sort >= pci_force_bf)
-diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 6af96ee..1e66b18 100644
---- a/arch/x86/kernel/pci-swiotlb.c
-+++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -71,8 +71,9 @@ void __init pci_swiotlb_init(void)
- {
- 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
- #ifdef CONFIG_X86_64
--	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
--		swiotlb = 1;
-+	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
-+		iommu_pass_through)
-+	       swiotlb = 1;
- #endif
- 	if (swiotlb_force)
- 		swiotlb = 1;



From myoung at fedoraproject.org  Sat Sep  5 19:02:24 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat,  5 Sep 2009 19:02:24 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.238.6.37,
	1.238.6.38 hdpvr-ir-enable.patch, 1.2.2.3, 1.2.2.4 kernel.spec,
	1.1294.2.63, 1.1294.2.64
Message-ID: <20090905190224.9924E11C00E5@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8969

Modified Files:
      Tag: private-myoung-dom0-branch
	config-generic hdpvr-ir-enable.patch kernel.spec 
Log Message:
missed a couple of file changes



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.37
retrieving revision 1.238.6.38
diff -u -p -r1.238.6.37 -r1.238.6.38
--- config-generic	3 Sep 2009 20:02:36 -0000	1.238.6.37
+++ config-generic	5 Sep 2009 19:02:23 -0000	1.238.6.38
@@ -2235,7 +2235,7 @@ CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
@@ -2244,9 +2244,9 @@ CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_VIA=m
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_NOUVEAU_KMS is not set
-# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_KMS=y
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I2C_CH7006=m
 
 #

hdpvr-ir-enable.patch:
 Makefile     |    4 --
 hdpvr-core.c |   12 ++------
 hdpvr-i2c.c  |   88 +++++++++++++++++++++++++++++++++++++++++------------------
 hdpvr.h      |    2 -
 4 files changed, 68 insertions(+), 38 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.3 -r1.2.2.4
--- hdpvr-ir-enable.patch	3 Sep 2009 20:02:36 -0000	1.2.2.3
+++ hdpvr-ir-enable.patch	5 Sep 2009 19:02:24 -0000	1.2.2.4
@@ -1,10 +1,11 @@
 From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
 
 ---
- drivers/media/video/hdpvr/Makefile     |    4 +--
- drivers/media/video/hdpvr/hdpvr-core.c |    7 ++--
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   49 ++++++++++++++++++++++++++-----
- 3 files changed, 45 insertions(+), 15 deletions(-)
+ drivers/media/video/hdpvr/Makefile     |    4 +-
+ drivers/media/video/hdpvr/hdpvr-core.c |   12 ++---
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   88 ++++++++++++++++++++++---------
+ drivers/media/video/hdpvr/hdpvr.h      |    2 +-
+ 4 files changed, 68 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
 index e0230fc..79ad2e1 100644
@@ -19,7 +20,7 @@ index e0230fc..79ad2e1 100644
  obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
  
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..9fa3d8d 100644
+index 188bd5a..d2bb4c2 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
 @@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
@@ -34,30 +35,42 @@ index 188bd5a..9fa3d8d 100644
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
-@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+@@ -414,12 +413,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
  	mutex_unlock(&dev->io_mutex);
  
  	/* deregister I2C adapter */
 -#ifdef CONFIG_I2C
 +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
  	mutex_lock(&dev->i2c_mutex);
- 	if (dev->i2c_adapter)
- 		i2c_del_adapter(dev->i2c_adapter);
+-	if (dev->i2c_adapter)
+-		i2c_del_adapter(dev->i2c_adapter);
+-	kfree(dev->i2c_adapter);
+-	dev->i2c_adapter = NULL;
++	i2c_del_adapter(&dev->i2c_adapter);
+ 	mutex_unlock(&dev->i2c_mutex);
+ #endif /* CONFIG_I2C */
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..bc33607 100644
+index c4b5d15..7cd977f 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -10,6 +10,8 @@
+@@ -10,6 +10,7 @@
   *
   */
  
 +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+
  #include <linux/i2c.h>
  
  #include "hdpvr.h"
-@@ -22,7 +24,7 @@
- #define REQTYPE_I2C_WRITE_STATT	0xd0
+@@ -19,10 +20,13 @@
+ 
+ #define REQTYPE_I2C_READ	0xb1
+ #define REQTYPE_I2C_WRITE	0xb0
+-#define REQTYPE_I2C_WRITE_STATT	0xd0
++#define REQTYPE_I2C_WRITE_STAT	0xd0
++
++#define HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR	0x70
++#define HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR	0x71
  
  static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
 -			  char *data, int len)
@@ -65,7 +78,7 @@ index c4b5d15..bc33607 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,7 +36,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -74,7 +87,7 @@ index c4b5d15..bc33607 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +50,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  }
  
  static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -83,7 +96,7 @@ index c4b5d15..bc33607 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,17 +61,17 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -92,7 +105,19 @@ index c4b5d15..bc33607 100644
  
  	if (ret < 0)
  		goto error;
-@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+ 
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_rcvctrlpipe(dev->udev, 0),
+-			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
++			      REQTYPE_I2C_WRITE_STAT, CTRL_READ_REQUEST,
+ 			      0, 0, buf, 2, 1000);
+ 
+-	if (ret == 2)
++	if ((ret == 2) && (buf[1] == (len - 1)))
+ 		ret = 0;
+ 	else if (ret >= 0)
+ 		ret = -EIO;
+@@ -93,10 +97,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)
  			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -105,10 +130,25 @@ index c4b5d15..bc33607 100644
  	}
  
  	mutex_unlock(&dev->i2c_mutex);
-@@ -114,15 +116,39 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,32 +118,64 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
++static struct i2c_adapter hdpvr_i2c_adap_template = {
++	.name		= "Hauppauge HD PVR I2C",
++	.owner		= THIS_MODULE,
++	.id		= I2C_HW_B_HDPVR,
++	.algo		= &hdpvr_algo,
++	.class		= I2C_CLASS_TV_ANALOG,
++};
++
++#if 1
++static struct i2c_board_info hdpvr_i2c_board_info = {
++	I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
++	I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
++};
++#endif
++
 +static int hdpvr_activate_ir(struct hdpvr_device *dev)
 +{
 +	char buffer[8];
@@ -128,41 +168,60 @@ index c4b5d15..bc33607 100644
 +	return 0;
 +}
 +
-+
  int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  {
- 	struct i2c_adapter *i2c_adap;
-+	struct i2c_board_info info;
+-	struct i2c_adapter *i2c_adap;
  	int retval = -ENOMEM;
-+	const unsigned short addr_list[] = { 0x54, I2C_CLIENT_END };
- 
- 	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
- 	if (i2c_adap == NULL)
- 		goto error;
  
+-	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
+-	if (i2c_adap == NULL)
+-		goto error;
 +	hdpvr_activate_ir(dev);
 +
- 	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
- 		sizeof(i2c_adap->name));
- 	i2c_adap->algo  = &hdpvr_algo;
-@@ -135,11 +161,18 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
++	memcpy(&dev->i2c_adapter, &hdpvr_i2c_adap_template,
++	       sizeof(struct i2c_adapter));
  
- 	retval = i2c_add_adapter(i2c_adap);
+-	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
+-		sizeof(i2c_adap->name));
+-	i2c_adap->algo  = &hdpvr_algo;
+-	i2c_adap->class = I2C_CLASS_TV_ANALOG;
+-	i2c_adap->id    = I2C_HW_B_HDPVR;
+-	i2c_adap->owner = THIS_MODULE;
+-	i2c_adap->dev.parent = &dev->udev->dev;
++	dev->i2c_adapter.dev.parent = &dev->udev->dev;
+ 
+-	i2c_set_adapdata(i2c_adap, dev);
++	i2c_set_adapdata(&dev->i2c_adapter, dev);
+ 
+-	retval = i2c_add_adapter(i2c_adap);
++	retval = i2c_add_adapter(&dev->i2c_adapter);
  
 -	if (!retval)
-+	if (!retval) {
- 		dev->i2c_adapter = i2c_adap;
+-		dev->i2c_adapter = i2c_adap;
 -	else
-+		memset(&info, 0, sizeof(struct i2c_board_info));
-+		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-+		i2c_new_probed_device(&dev->i2c_adapter, &info, addr_list);
-+
-+	} else {
- 		kfree(i2c_adap);
-+	}
+-		kfree(i2c_adap);
++	if (retval)
++		goto error;
++
++#if 1
++	i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
++#endif
  
  error:
  	return retval;
  }
 +
 +#endif /* CONFIG_I2C */
+diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
+index 1edd875..173aefa 100644
+--- a/drivers/media/video/hdpvr/hdpvr.h
++++ b/drivers/media/video/hdpvr/hdpvr.h
+@@ -101,7 +101,7 @@ struct hdpvr_device {
+ 	struct work_struct	worker;
+ 
+ 	/* I2C adapter */
+-	struct i2c_adapter	*i2c_adapter;
++	struct i2c_adapter	i2c_adapter;
+ 	/* I2C lock */
+ 	struct mutex		i2c_mutex;
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.63
retrieving revision 1.1294.2.64
diff -u -p -r1.1294.2.63 -r1.1294.2.64
--- kernel.spec	5 Sep 2009 19:00:23 -0000	1.1294.2.63
+++ kernel.spec	5 Sep 2009 19:02:24 -0000	1.1294.2.64
@@ -2039,7 +2039,7 @@ fi
 * Sat Sep 04 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops which includes swiotlb updates and a network fix
 - try a drm build fix
-- re-enable CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS options
+- therefore re-enable CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS options
 
 * Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.203.rc8.git2
 - Fix kernel build errors when building firmware by removing the



From xulchris at fedoraproject.org  Sat Sep  5 19:16:01 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 19:16:01 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject-FormBuilder/F-10 .cvsignore, 1.4,
	1.5 php-pear-DB-DataObject-FormBuilder.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090905191601.0B17A11C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13555/F-10

Modified Files:
	.cvsignore php-pear-DB-DataObject-FormBuilder.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Apr 2007 19:06:16 -0000	1.4
+++ .cvsignore	5 Sep 2009 19:16:00 -0000	1.5
@@ -1 +1 @@
-DB_DataObject_FormBuilder-1.0.0RC7.tgz
+DB_DataObject_FormBuilder-1.0.0.tgz


Index: php-pear-DB-DataObject-FormBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-10/php-pear-DB-DataObject-FormBuilder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-DB-DataObject-FormBuilder.spec	13 Jun 2008 21:12:46 -0000	1.7
+++ php-pear-DB-DataObject-FormBuilder.spec	5 Sep 2009 19:16:00 -0000	1.8
@@ -1,16 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name DB_DataObject_FormBuilder
-%define beta RC7
 
 Name:           php-pear-DB-DataObject-FormBuilder
 Version:        1.0.0
-Release:        0.6.%{beta}%{?dist}
+Release:        1%{?dist}
 Summary:        Automatically build HTML_QuickForm objects
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,17 +45,17 @@ control at any stage of the process.
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
-cd %{pear_name}-%{version}%{beta}
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
@@ -92,7 +91,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}%{beta}/docdir/%{pear_name}/*
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/DB/DataObject/FormBuilder*
 %{pear_testdir}/%{pear_name}
@@ -100,6 +99,15 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.0.0-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.8.RC7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.7.RC7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Jun 13 2008 Jon Stanley <jonstanley at gmail.com> - 1.0.0-0.6.RC7
 - Rebuild
 - Fix license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Apr 2007 19:06:17 -0000	1.4
+++ sources	5 Sep 2009 19:16:00 -0000	1.5
@@ -1 +1 @@
-f00fef6a743f20e074009c7e196c9a7d  DB_DataObject_FormBuilder-1.0.0RC7.tgz
+87feb6eac19a8d318152d68e44fcf658  DB_DataObject_FormBuilder-1.0.0.tgz



From xulchris at fedoraproject.org  Sat Sep  5 19:16:00 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 19:16:00 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject-FormBuilder/EL-5 .cvsignore, 1.4,
	1.5 php-pear-DB-DataObject-FormBuilder.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20090905191600.DC6EF11C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13555/EL-5

Modified Files:
	.cvsignore php-pear-DB-DataObject-FormBuilder.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Apr 2007 19:06:13 -0000	1.4
+++ .cvsignore	5 Sep 2009 19:16:00 -0000	1.5
@@ -1 +1 @@
-DB_DataObject_FormBuilder-1.0.0RC7.tgz
+DB_DataObject_FormBuilder-1.0.0.tgz


Index: php-pear-DB-DataObject-FormBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/EL-5/php-pear-DB-DataObject-FormBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-DB-DataObject-FormBuilder.spec	6 May 2007 17:04:02 -0000	1.6
+++ php-pear-DB-DataObject-FormBuilder.spec	5 Sep 2009 19:16:00 -0000	1.7
@@ -1,16 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name DB_DataObject_FormBuilder
-%define beta RC7
 
 Name:           php-pear-DB-DataObject-FormBuilder
 Version:        1.0.0
-Release:        0.5.%{beta}%{?dist}
+Release:        1%{?dist}
 Summary:        Automatically build HTML_QuickForm objects
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,17 +45,17 @@ control at any stage of the process.
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
-cd %{pear_name}-%{version}%{beta}
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
@@ -92,7 +91,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}%{beta}/docdir/%{pear_name}/*
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/DB/DataObject/FormBuilder*
 %{pear_testdir}/%{pear_name}
@@ -100,6 +99,19 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.0.0-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.8.RC7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.7.RC7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jun 13 2008 Jon Stanley <jonstanley at gmail.com> - 1.0.0-0.6.RC7
+- Rebuild
+- Fix license tag
+
 * Sun May 06 2007 Christopher Stone <chris.stone at gmail.com> 1.0.0-0.5.RC7
 - Require new HTML_QuickForm_ElementGrid package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Apr 2007 19:06:13 -0000	1.4
+++ sources	5 Sep 2009 19:16:00 -0000	1.5
@@ -1 +1 @@
-f00fef6a743f20e074009c7e196c9a7d  DB_DataObject_FormBuilder-1.0.0RC7.tgz
+87feb6eac19a8d318152d68e44fcf658  DB_DataObject_FormBuilder-1.0.0.tgz



From xulchris at fedoraproject.org  Sat Sep  5 19:16:01 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 19:16:01 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject-FormBuilder/F-11 .cvsignore, 1.4,
	1.5 php-pear-DB-DataObject-FormBuilder.spec, 1.8, 1.9 sources,
	1.4, 1.5
Message-ID: <20090905191601.373E311C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13555/F-11

Modified Files:
	.cvsignore php-pear-DB-DataObject-FormBuilder.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Apr 2007 19:06:16 -0000	1.4
+++ .cvsignore	5 Sep 2009 19:16:01 -0000	1.5
@@ -1 +1 @@
-DB_DataObject_FormBuilder-1.0.0RC7.tgz
+DB_DataObject_FormBuilder-1.0.0.tgz


Index: php-pear-DB-DataObject-FormBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-11/php-pear-DB-DataObject-FormBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-DB-DataObject-FormBuilder.spec	26 Feb 2009 20:54:20 -0000	1.8
+++ php-pear-DB-DataObject-FormBuilder.spec	5 Sep 2009 19:16:01 -0000	1.9
@@ -1,16 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name DB_DataObject_FormBuilder
-%define beta RC7
 
 Name:           php-pear-DB-DataObject-FormBuilder
 Version:        1.0.0
-Release:        0.7.%{beta}%{?dist}
+Release:        1%{?dist}
 Summary:        Automatically build HTML_QuickForm objects
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,17 +45,17 @@ control at any stage of the process.
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
-cd %{pear_name}-%{version}%{beta}
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
@@ -92,7 +91,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}%{beta}/docdir/%{pear_name}/*
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/DB/DataObject/FormBuilder*
 %{pear_testdir}/%{pear_name}
@@ -100,6 +99,12 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.0.0-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.8.RC7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.7.RC7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Apr 2007 19:06:17 -0000	1.4
+++ sources	5 Sep 2009 19:16:01 -0000	1.5
@@ -1 +1 @@
-f00fef6a743f20e074009c7e196c9a7d  DB_DataObject_FormBuilder-1.0.0RC7.tgz
+87feb6eac19a8d318152d68e44fcf658  DB_DataObject_FormBuilder-1.0.0.tgz



From xulchris at fedoraproject.org  Sat Sep  5 19:16:01 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 19:16:01 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel .cvsignore, 1.4,
	1.5 php-pear-DB-DataObject-FormBuilder.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <20090905191601.6166F11C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13555/devel

Modified Files:
	.cvsignore php-pear-DB-DataObject-FormBuilder.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Apr 2007 19:06:16 -0000	1.4
+++ .cvsignore	5 Sep 2009 19:16:01 -0000	1.5
@@ -1 +1 @@
-DB_DataObject_FormBuilder-1.0.0RC7.tgz
+DB_DataObject_FormBuilder-1.0.0.tgz


Index: php-pear-DB-DataObject-FormBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/devel/php-pear-DB-DataObject-FormBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- php-pear-DB-DataObject-FormBuilder.spec	26 Jul 2009 18:12:47 -0000	1.9
+++ php-pear-DB-DataObject-FormBuilder.spec	5 Sep 2009 19:16:01 -0000	1.10
@@ -1,16 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name DB_DataObject_FormBuilder
-%define beta RC7
 
 Name:           php-pear-DB-DataObject-FormBuilder
 Version:        1.0.0
-Release:        0.8.%{beta}%{?dist}
+Release:        1%{?dist}
 Summary:        Automatically build HTML_QuickForm objects
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,17 +45,17 @@ control at any stage of the process.
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
-cd %{pear_name}-%{version}%{beta}
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
@@ -92,7 +91,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}%{beta}/docdir/%{pear_name}/*
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/DB/DataObject/FormBuilder*
 %{pear_testdir}/%{pear_name}
@@ -100,6 +99,9 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.0.0-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.8.RC7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject-FormBuilder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Apr 2007 19:06:17 -0000	1.4
+++ sources	5 Sep 2009 19:16:01 -0000	1.5
@@ -1 +1 @@
-f00fef6a743f20e074009c7e196c9a7d  DB_DataObject_FormBuilder-1.0.0RC7.tgz
+87feb6eac19a8d318152d68e44fcf658  DB_DataObject_FormBuilder-1.0.0.tgz



From emaldonado at fedoraproject.org  Sat Sep  5 19:45:11 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 19:45:11 +0000 (UTC)
Subject: rpms/nss-util/devel nss-nolocalsql.patch,1.1,1.2
Message-ID: <20090905194511.1E34E11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23419

Modified Files:
	nss-nolocalsql.patch 
Log Message:
Patch only mozilla/nss/lib/Makefile

nss-nolocalsql.patch:
 Makefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-nolocalsql.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-nolocalsql.patch	5 Sep 2009 18:49:19 -0000	1.1
+++ nss-nolocalsql.patch	5 Sep 2009 19:45:10 -0000	1.2
@@ -18,35 +18,3 @@ diff -up ./mozilla/security/nss/lib/Make
  
  #######################################################################
  # (5) Execute "global" rules. (OPTIONAL)                              #
-diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
-+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
-@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
- 
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
- 
- CSRCS = \
- 	dbmshim.c \
-diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
---- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
-+++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
-@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
- 
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
- 
- EXPORTS = \
- 	secmodt.h \



From xulchris at fedoraproject.org  Sat Sep  5 20:07:12 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 20:07:12 +0000 (UTC)
Subject: rpms/php-pear-File-Passwd/F-11 .cvsignore, 1.2,
	1.3 php-pear-File-Passwd.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090905200712.5DD6C11C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-Passwd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32475/F-11

Modified Files:
	.cvsignore php-pear-File-Passwd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 03:51:33 -0000	1.2
+++ .cvsignore	5 Sep 2009 20:07:12 -0000	1.3
@@ -1 +1 @@
-File_Passwd-1.1.6.tgz
+File_Passwd-1.1.7.tgz


Index: php-pear-File-Passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/F-11/php-pear-File-Passwd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-File-Passwd.spec	26 Feb 2009 21:11:00 -0000	1.3
+++ php-pear-File-Passwd.spec	5 Sep 2009 20:07:12 -0000	1.4
@@ -2,8 +2,8 @@
 %define pear_name File_Passwd
 
 Name:           php-pear-File-Passwd
-Version:        1.1.6
-Release:        4%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        Manipulate many kinds of password files
 
 Group:          Development/Languages
@@ -88,6 +88,12 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.1.7-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 03:51:33 -0000	1.2
+++ sources	5 Sep 2009 20:07:12 -0000	1.3
@@ -1 +1 @@
-e4dafa1eae878ff83d349b28719e8e29  File_Passwd-1.1.6.tgz
+b11d5dac02ddd93fdfdd4756a0868afe  File_Passwd-1.1.7.tgz



From xulchris at fedoraproject.org  Sat Sep  5 20:07:12 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 20:07:12 +0000 (UTC)
Subject: rpms/php-pear-File-Passwd/F-10 .cvsignore, 1.2,
	1.3 php-pear-File-Passwd.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090905200712.05C7711C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-Passwd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32475/F-10

Modified Files:
	.cvsignore php-pear-File-Passwd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 03:51:33 -0000	1.2
+++ .cvsignore	5 Sep 2009 20:07:11 -0000	1.3
@@ -1 +1 @@
-File_Passwd-1.1.6.tgz
+File_Passwd-1.1.7.tgz


Index: php-pear-File-Passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/F-10/php-pear-File-Passwd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-File-Passwd.spec	14 Jun 2008 15:45:11 -0000	1.2
+++ php-pear-File-Passwd.spec	5 Sep 2009 20:07:11 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name File_Passwd
 
 Name:           php-pear-File-Passwd
-Version:        1.1.6
-Release:        3%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        Manipulate many kinds of password files
 
 Group:          Development/Languages
@@ -88,6 +88,15 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.1.7-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jun 14 2008 Christopher Stone <chris.stone at gmail.com> 1.1.6-3
 - Rebuild for vendor tag (bz #451361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 03:51:33 -0000	1.2
+++ sources	5 Sep 2009 20:07:11 -0000	1.3
@@ -1 +1 @@
-e4dafa1eae878ff83d349b28719e8e29  File_Passwd-1.1.6.tgz
+b11d5dac02ddd93fdfdd4756a0868afe  File_Passwd-1.1.7.tgz



From xulchris at fedoraproject.org  Sat Sep  5 20:07:12 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 20:07:12 +0000 (UTC)
Subject: rpms/php-pear-File-Passwd/devel .cvsignore, 1.2,
	1.3 php-pear-File-Passwd.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090905200712.ADDA411C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-Passwd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32475/devel

Modified Files:
	.cvsignore php-pear-File-Passwd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 03:51:33 -0000	1.2
+++ .cvsignore	5 Sep 2009 20:07:12 -0000	1.3
@@ -1 +1 @@
-File_Passwd-1.1.6.tgz
+File_Passwd-1.1.7.tgz


Index: php-pear-File-Passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/devel/php-pear-File-Passwd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-File-Passwd.spec	26 Jul 2009 18:14:45 -0000	1.4
+++ php-pear-File-Passwd.spec	5 Sep 2009 20:07:12 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name File_Passwd
 
 Name:           php-pear-File-Passwd
-Version:        1.1.6
-Release:        5%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        Manipulate many kinds of password files
 
 Group:          Development/Languages
@@ -88,6 +88,9 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.1.7-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 03:51:33 -0000	1.2
+++ sources	5 Sep 2009 20:07:12 -0000	1.3
@@ -1 +1 @@
-e4dafa1eae878ff83d349b28719e8e29  File_Passwd-1.1.6.tgz
+b11d5dac02ddd93fdfdd4756a0868afe  File_Passwd-1.1.7.tgz



From xulchris at fedoraproject.org  Sat Sep  5 20:07:11 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 20:07:11 +0000 (UTC)
Subject: rpms/php-pear-File-Passwd/EL-5 .cvsignore, 1.2,
	1.3 php-pear-File-Passwd.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090905200711.D5C9B11C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-Passwd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32475/EL-5

Modified Files:
	.cvsignore php-pear-File-Passwd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 03:58:27 -0000	1.2
+++ .cvsignore	5 Sep 2009 20:07:11 -0000	1.3
@@ -1 +1 @@
-File_Passwd-1.1.6.tgz
+File_Passwd-1.1.7.tgz


Index: php-pear-File-Passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/EL-5/php-pear-File-Passwd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-pear-File-Passwd.spec	15 May 2007 03:58:27 -0000	1.1
+++ php-pear-File-Passwd.spec	5 Sep 2009 20:07:11 -0000	1.2
@@ -2,12 +2,12 @@
 %define pear_name File_Passwd
 
 Name:           php-pear-File-Passwd
-Version:        1.1.6
-Release:        2%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        Manipulate many kinds of password files
 
 Group:          Development/Languages
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/File_Passwd
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -88,6 +88,18 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.1.7-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jun 14 2008 Christopher Stone <chris.stone at gmail.com> 1.1.6-3
+- Rebuild for vendor tag (bz #451361)
+
 * Sun May 13 2007 Christopher Stone <chris.stone at gmail.com> 1.1.6-2
 - Include samba extension as default for Fedora
 - Exclude samba extension from Enterprise Linux


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-Passwd/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 03:58:27 -0000	1.2
+++ sources	5 Sep 2009 20:07:11 -0000	1.3
@@ -1 +1 @@
-e4dafa1eae878ff83d349b28719e8e29  File_Passwd-1.1.6.tgz
+b11d5dac02ddd93fdfdd4756a0868afe  File_Passwd-1.1.7.tgz



From pkgdb at fedoraproject.org  Sat Sep  5 20:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 20:24:50 +0000
Subject: [pkgdb] cherokee: arbiter has requested watchcommits
Message-ID: <20090905202451.0C2D510F894@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on cherokee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep  5 20:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 20:24:51 +0000
Subject: [pkgdb] cherokee: arbiter has requested watchbugzilla
Message-ID: <20090905202451.7797E10F89C@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on cherokee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep  5 20:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Sep 2009 20:24:54 +0000
Subject: [pkgdb] cherokee: arbiter has requested commit
Message-ID: <20090905202454.F10C110F89F@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on cherokee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From svahl at fedoraproject.org  Sat Sep  5 20:52:40 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 20:52:40 +0000 (UTC)
Subject: rpms/kcoloredit/F-10 .cvsignore, 1.11, 1.12 kcoloredit.spec, 1.16, 
	1.17 sources, 1.12, 1.13
Message-ID: <20090905205240.B54DB11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kcoloredit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12669/F-10

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Aug 2009 16:50:11 -0000	1.11
+++ .cvsignore	5 Sep 2009 20:52:40 -0000	1.12
@@ -1,2 +1 @@
-kcoloredit-2.0.0-kde4.2.4.tar.bz2
-kcoloredit-2.0.0-kde4.3.0.tar.bz2
+kcoloredit-2.0.0-kde4.3.1.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-10/kcoloredit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kcoloredit.spec	11 Aug 2009 16:50:11 -0000	1.16
+++ kcoloredit.spec	5 Sep 2009 20:52:40 -0000	1.17
@@ -4,7 +4,7 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        A color palette Editor
 
@@ -83,6 +83,9 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 16:50:11 -0000	1.12
+++ sources	5 Sep 2009 20:52:40 -0000	1.13
@@ -1 +1 @@
-4d4c7809dd3275299ff31cdfb784ddab  kcoloredit-2.0.0-kde4.3.0.tar.bz2
+8307023ee8759c250962e034bf563b1a  kcoloredit-2.0.0-kde4.3.1.tar.bz2



From svahl at fedoraproject.org  Sat Sep  5 20:52:40 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 20:52:40 +0000 (UTC)
Subject: rpms/kcoloredit/F-11 .cvsignore, 1.12, 1.13 kcoloredit.spec, 1.17, 
	1.18 sources, 1.13, 1.14
Message-ID: <20090905205240.E88BE11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kcoloredit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12669/F-11

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Aug 2009 16:50:11 -0000	1.12
+++ .cvsignore	5 Sep 2009 20:52:40 -0000	1.13
@@ -1,2 +1 @@
-kcoloredit-2.0.0-kde4.2.4.tar.bz2
-kcoloredit-2.0.0-kde4.3.0.tar.bz2
+kcoloredit-2.0.0-kde4.3.1.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-11/kcoloredit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kcoloredit.spec	11 Aug 2009 16:50:11 -0000	1.17
+++ kcoloredit.spec	5 Sep 2009 20:52:40 -0000	1.18
@@ -4,7 +4,7 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        A color palette Editor
 
@@ -83,6 +83,9 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Aug 2009 16:50:11 -0000	1.13
+++ sources	5 Sep 2009 20:52:40 -0000	1.14
@@ -1 +1 @@
-4d4c7809dd3275299ff31cdfb784ddab  kcoloredit-2.0.0-kde4.3.0.tar.bz2
+8307023ee8759c250962e034bf563b1a  kcoloredit-2.0.0-kde4.3.1.tar.bz2



From svahl at fedoraproject.org  Sat Sep  5 20:55:47 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 20:55:47 +0000 (UTC)
Subject: rpms/kiconedit/F-10 .cvsignore, 1.11, 1.12 kiconedit.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <20090905205547.B9F1C11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kiconedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13583/F-10

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Aug 2009 17:15:43 -0000	1.11
+++ .cvsignore	5 Sep 2009 20:55:47 -0000	1.12
@@ -1,2 +1 @@
-kiconedit-4.2.4.tar.bz2
-kiconedit-4.3.0.tar.bz2
+kiconedit-4.3.1.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-10/kiconedit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kiconedit.spec	11 Aug 2009 17:15:43 -0000	1.16
+++ kiconedit.spec	5 Sep 2009 20:55:47 -0000	1.17
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        An icon editor
 
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 17:15:43 -0000	1.12
+++ sources	5 Sep 2009 20:55:47 -0000	1.13
@@ -1 +1 @@
-b01877aa6da21b50f0550c43c6b86cfe  kiconedit-4.3.0.tar.bz2
+211d2de7aae9b2eb5594550b40ebe70b  kiconedit-4.3.1.tar.bz2



From svahl at fedoraproject.org  Sat Sep  5 20:55:47 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 20:55:47 +0000 (UTC)
Subject: rpms/kiconedit/F-11 .cvsignore, 1.12, 1.13 kiconedit.spec, 1.20,
	1.21 sources, 1.13, 1.14
Message-ID: <20090905205547.D91BD11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kiconedit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13583/F-11

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Aug 2009 17:15:44 -0000	1.12
+++ .cvsignore	5 Sep 2009 20:55:47 -0000	1.13
@@ -1,2 +1 @@
-kiconedit-4.2.4.tar.bz2
-kiconedit-4.3.0.tar.bz2
+kiconedit-4.3.1.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-11/kiconedit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kiconedit.spec	11 Aug 2009 17:15:44 -0000	1.20
+++ kiconedit.spec	5 Sep 2009 20:55:47 -0000	1.21
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        An icon editor
 
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Aug 2009 17:15:44 -0000	1.13
+++ sources	5 Sep 2009 20:55:47 -0000	1.14
@@ -1 +1 @@
-b01877aa6da21b50f0550c43c6b86cfe  kiconedit-4.3.0.tar.bz2
+211d2de7aae9b2eb5594550b40ebe70b  kiconedit-4.3.1.tar.bz2



From svahl at fedoraproject.org  Sat Sep  5 21:07:16 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 21:07:16 +0000 (UTC)
Subject: rpms/kgrab/F-10 .cvsignore, 1.9, 1.10 kgrab.spec, 1.16, 1.17 sources,
	1.10, 1.11
Message-ID: <20090905210716.5B4C911C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17079/F-10

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.1.1-19
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Aug 2009 17:04:32 -0000	1.9
+++ .cvsignore	5 Sep 2009 21:07:15 -0000	1.10
@@ -1,2 +1 @@
-kgrab-0.1.1-kde4.2.4.tar.bz2
-kgrab-0.1.1-kde4.3.0.tar.bz2
+kgrab-0.1.1-kde4.3.1.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-10/kgrab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kgrab.spec	11 Aug 2009 17:04:32 -0000	1.16
+++ kgrab.spec	5 Sep 2009 21:07:15 -0000	1.17
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.3.0
+%define kdeversion 4.3.1
 
 Name:           kgrab
 Version:        0.1.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.1.1-19
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 0.1.1-18
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 17:04:32 -0000	1.10
+++ sources	5 Sep 2009 21:07:15 -0000	1.11
@@ -1 +1 @@
-199d59f03900236c0dbc771d617b49f6  kgrab-0.1.1-kde4.3.0.tar.bz2
+73e7a23426f1a448957a0192f88831e0  kgrab-0.1.1-kde4.3.1.tar.bz2



From svahl at fedoraproject.org  Sat Sep  5 21:07:16 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 21:07:16 +0000 (UTC)
Subject: rpms/kgrab/F-11 .cvsignore, 1.10, 1.11 kgrab.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20090905210716.BFECC11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17079/F-11

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.1.1-19
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Aug 2009 17:04:32 -0000	1.10
+++ .cvsignore	5 Sep 2009 21:07:16 -0000	1.11
@@ -1,2 +1 @@
-kgrab-0.1.1-kde4.2.4.tar.bz2
-kgrab-0.1.1-kde4.3.0.tar.bz2
+kgrab-0.1.1-kde4.3.1.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-11/kgrab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kgrab.spec	11 Aug 2009 17:04:32 -0000	1.19
+++ kgrab.spec	5 Sep 2009 21:07:16 -0000	1.20
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.3.0
+%define kdeversion 4.3.1
 
 Name:           kgrab
 Version:        0.1.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.1.1-19
+- 4.3.1
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 0.1.1-18
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 17:04:32 -0000	1.10
+++ sources	5 Sep 2009 21:07:16 -0000	1.11
@@ -1 +1 @@
-199d59f03900236c0dbc771d617b49f6  kgrab-0.1.1-kde4.3.0.tar.bz2
+73e7a23426f1a448957a0192f88831e0  kgrab-0.1.1-kde4.3.1.tar.bz2



From emaldonado at fedoraproject.org  Sat Sep  5 21:19:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 21:19:59 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-config.in,1.4,1.5
Message-ID: <20090905211959.474CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20814

Modified Files:
	nss-util-config.in 
Log Message:
no -rpath-link


Index: nss-util-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util-config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-util-config.in	28 Aug 2009 05:04:47 -0000	1.4
+++ nss-util-config.in	5 Sep 2009 21:19:59 -0000	1.5
@@ -112,7 +112,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      libdirs="-Wl,$libdir -L$libdir"
       if test -n "$lib_nssutil"; then
 	libdirs="$libdirs -lnssutil${major_version}"
       fi



From emaldonado at fedoraproject.org  Sat Sep  5 21:21:22 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 21:21:22 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-config.in,1.2,1.3
Message-ID: <20090905212122.2BCA911C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21177

Modified Files:
	nss-softokn-config.in 
Log Message:
no rpath-link


Index: nss-softokn-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-softokn-config.in	28 Aug 2009 05:15:26 -0000	1.2
+++ nss-softokn-config.in	5 Sep 2009 21:21:21 -0000	1.3
@@ -122,7 +122,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      libdirs="-Wl,$libdir -L$libdir"
       if test -n "$lib_ssl"; then
 	libdirs="$libdirs -lssl${major_version}"
       fi



From emaldonado at fedoraproject.org  Sat Sep  5 21:22:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 21:22:06 +0000 (UTC)
Subject: rpms/nss/devel nss-config.in,1.4,1.5
Message-ID: <20090905212206.2AC1011C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21379

Modified Files:
	nss-config.in 
Log Message:
no rpath-link


Index: nss-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-config.in	27 Aug 2009 23:42:46 -0000	1.4
+++ nss-config.in	5 Sep 2009 21:22:05 -0000	1.5
@@ -122,7 +122,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      libdirs="-Wl,$libdir -L$libdir"
       if test -n "$lib_ssl"; then
 	libdirs="$libdirs -lssl${major_version}"
       fi



From svahl at fedoraproject.org  Sat Sep  5 21:23:05 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 21:23:05 +0000 (UTC)
Subject: rpms/skanlite/F-11 .cvsignore, 1.3, 1.4 skanlite.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090905212305.2791E11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/skanlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21644/F-11

Modified Files:
	.cvsignore skanlite.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.3-5
- KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 19:54:41 -0000	1.3
+++ .cvsignore	5 Sep 2009 21:23:05 -0000	1.4
@@ -1 +1 @@
-skanlite-0.3-kde4.3.0.tar.bz2
+skanlite-0.3-kde4.3.1.tar.bz2


Index: skanlite.spec
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-11/skanlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skanlite.spec	11 Aug 2009 19:54:41 -0000	1.2
+++ skanlite.spec	5 Sep 2009 21:23:05 -0000	1.3
@@ -1,8 +1,8 @@
-%global kdeversion 4.3.0
+%global kdeversion 4.3.1
 
 Name:           skanlite
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.3-5
+- KDE 4.3.1
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.3-4
 - KDE 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 19:54:41 -0000	1.3
+++ sources	5 Sep 2009 21:23:05 -0000	1.4
@@ -1 +1 @@
-cf72ef82553627e21406084a12e9b5eb  skanlite-0.3-kde4.3.0.tar.bz2
+ffe6c35bb6dc9096380c940ac2bc3e6e  skanlite-0.3-kde4.3.1.tar.bz2



From svahl at fedoraproject.org  Sat Sep  5 21:23:04 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat,  5 Sep 2009 21:23:04 +0000 (UTC)
Subject: rpms/skanlite/F-10 .cvsignore, 1.3, 1.4 skanlite.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090905212304.ED32B11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/skanlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21644/F-10

Modified Files:
	.cvsignore skanlite.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.3-5
- KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 19:54:41 -0000	1.3
+++ .cvsignore	5 Sep 2009 21:23:04 -0000	1.4
@@ -1 +1 @@
-skanlite-0.3-kde4.3.0.tar.bz2
+skanlite-0.3-kde4.3.1.tar.bz2


Index: skanlite.spec
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-10/skanlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skanlite.spec	11 Aug 2009 19:54:41 -0000	1.2
+++ skanlite.spec	5 Sep 2009 21:23:04 -0000	1.3
@@ -1,8 +1,8 @@
-%global kdeversion 4.3.0
+%global kdeversion 4.3.1
 
 Name:           skanlite
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 0.3-5
+- KDE 4.3.1
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.3-4
 - KDE 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 19:54:41 -0000	1.3
+++ sources	5 Sep 2009 21:23:04 -0000	1.4
@@ -1 +1 @@
-cf72ef82553627e21406084a12e9b5eb  skanlite-0.3-kde4.3.0.tar.bz2
+ffe6c35bb6dc9096380c940ac2bc3e6e  skanlite-0.3-kde4.3.1.tar.bz2



From emaldonado at fedoraproject.org  Sat Sep  5 21:33:38 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 21:33:38 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.14,1.15
Message-ID: <20090905213338.9B7C911C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24469

Modified Files:
	nss-util.spec 
Log Message:
single copy of shared libraries, no rpath-link, nolocalsql patch subset for util


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nss-util.spec	4 Sep 2009 20:51:16 -0000	1.14
+++ nss-util.spec	5 Sep 2009 21:33:38 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -32,6 +32,7 @@ Source1:          nss-split-util.sh
 Source2:          nss-util.pc.in
 Source3:          nss-util-config.in
 
+Patch2:           nss-nolocalsql.patch
 
 %description
 Utilities for Network Security Services and the Softoken module
@@ -53,6 +54,8 @@ Header and library files for doing devel
 %prep
 %setup -q
 
+%patch2 -p0
+
 %build
 
 # Enable compiler optimizations and disable debugging code
@@ -126,13 +129,9 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-u
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 
-# FIXME - Bug 521155
-# Will fix later for stability reasons
-# Copy the binary libraries we want
 for file in libnssutil3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # Copy the include files we want
@@ -161,9 +160,6 @@ done
 
 %files devel
 %defattr(-,root,root)
-# FIXME - bug 521155, will fix later for stability
-# this is a symbolic link to the shared library in "%"{_lib}
-%{_libdir}/libnssutil3.so
 # package configuration files
 %{_libdir}/pkgconfig/nss-util.pc
 %{_bindir}/nss-util-config
@@ -204,6 +200,11 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
+- Remove symbolic links to shared libraries from devel - 521155
+- Apply nss-nolocalsql patch subset for nss-util
+- No rpath-link in nss-util-config
+
 * Fri Sep 04 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
 - Retagging for a chained build
 
@@ -218,7 +219,7 @@ done
 - Cleanup nss-util-config.in
 
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-13
-nss-util-devel doesn't require nss-devel
+- nss-util-devel doesn't require nss-devel
 
 * Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-12
 - bump to unique nvr



From xulchris at fedoraproject.org  Sat Sep  5 21:34:25 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 21:34:25 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm/EL-5 .cvsignore, 1.4,
	1.5 php-pear-HTML-QuickForm.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090905213425.219BA11C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTML-QuickForm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24656/EL-5

Modified Files:
	.cvsignore php-pear-HTML-QuickForm.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 20:34:38 -0000	1.4
+++ .cvsignore	5 Sep 2009 21:34:24 -0000	1.5
@@ -1 +1 @@
-HTML_QuickForm-3.2.10.tgz
+HTML_QuickForm-3.2.11.tgz


Index: php-pear-HTML-QuickForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/EL-5/php-pear-HTML-QuickForm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-HTML-QuickForm.spec	22 Nov 2007 20:34:38 -0000	1.4
+++ php-pear-HTML-QuickForm.spec	5 Sep 2009 21:34:24 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name HTML_QuickForm
 
 Name:           php-pear-HTML-QuickForm
-Version:        3.2.10
+Version:        3.2.11
 Release:        1%{?dist}
 Summary:        Class for creating, validating, processing HTML forms
 
@@ -57,6 +57,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+# fix line endings
+find docdir/HTML_QuickForm/docs -type f -exec sed -i 's/\r//' {} \;
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -89,6 +91,16 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 3.2.11-1
+- Upstream sync
+- Fix line endings in docs
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 22 2007 Christopher Stone <chris.stone at gmail.com> 3.2.10-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Nov 2007 20:34:38 -0000	1.4
+++ sources	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-1764dd563d7a5e843602ac23b007cb35  HTML_QuickForm-3.2.10.tgz
+2320341c734fec60549a3e5145fbe8e7  HTML_QuickForm-3.2.11.tgz



From xulchris at fedoraproject.org  Sat Sep  5 21:34:25 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 21:34:25 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm/F-10 .cvsignore, 1.4,
	1.5 php-pear-HTML-QuickForm.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090905213425.4EAC711C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24656/F-10

Modified Files:
	.cvsignore php-pear-HTML-QuickForm.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 20:34:51 -0000	1.4
+++ .cvsignore	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-HTML_QuickForm-3.2.10.tgz
+HTML_QuickForm-3.2.11.tgz


Index: php-pear-HTML-QuickForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-10/php-pear-HTML-QuickForm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-HTML-QuickForm.spec	22 Nov 2007 20:34:51 -0000	1.4
+++ php-pear-HTML-QuickForm.spec	5 Sep 2009 21:34:25 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name HTML_QuickForm
 
 Name:           php-pear-HTML-QuickForm
-Version:        3.2.10
+Version:        3.2.11
 Release:        1%{?dist}
 Summary:        Class for creating, validating, processing HTML forms
 
@@ -57,6 +57,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+# fix line endings
+find docdir/HTML_QuickForm/docs -type f -exec sed -i 's/\r//' {} \;
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -89,6 +91,16 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 3.2.11-1
+- Upstream sync
+- Fix line endings in docs
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 22 2007 Christopher Stone <chris.stone at gmail.com> 3.2.10-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Nov 2007 20:34:51 -0000	1.4
+++ sources	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-1764dd563d7a5e843602ac23b007cb35  HTML_QuickForm-3.2.10.tgz
+2320341c734fec60549a3e5145fbe8e7  HTML_QuickForm-3.2.11.tgz



From xulchris at fedoraproject.org  Sat Sep  5 21:34:25 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 21:34:25 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm/devel .cvsignore, 1.4,
	1.5 php-pear-HTML-QuickForm.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090905213425.ACAC511C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTML-QuickForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24656/devel

Modified Files:
	.cvsignore php-pear-HTML-QuickForm.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 20:34:51 -0000	1.4
+++ .cvsignore	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-HTML_QuickForm-3.2.10.tgz
+HTML_QuickForm-3.2.11.tgz


Index: php-pear-HTML-QuickForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/devel/php-pear-HTML-QuickForm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-HTML-QuickForm.spec	26 Jul 2009 18:15:30 -0000	1.6
+++ php-pear-HTML-QuickForm.spec	5 Sep 2009 21:34:25 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name HTML_QuickForm
 
 Name:           php-pear-HTML-QuickForm
-Version:        3.2.10
-Release:        3%{?dist}
+Version:        3.2.11
+Release:        1%{?dist}
 Summary:        Class for creating, validating, processing HTML forms
 
 Group:          Development/Libraries
@@ -57,6 +57,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+# fix line endings
+find docdir/HTML_QuickForm/docs -type f -exec sed -i 's/\r//' {} \;
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -89,6 +91,10 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 3.2.11-1
+- Upstream sync
+- Fix line endings in docs
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Nov 2007 20:34:51 -0000	1.4
+++ sources	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-1764dd563d7a5e843602ac23b007cb35  HTML_QuickForm-3.2.10.tgz
+2320341c734fec60549a3e5145fbe8e7  HTML_QuickForm-3.2.11.tgz



From xulchris at fedoraproject.org  Sat Sep  5 21:34:25 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat,  5 Sep 2009 21:34:25 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm/F-11 .cvsignore, 1.4,
	1.5 php-pear-HTML-QuickForm.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090905213425.7926811C00E5@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24656/F-11

Modified Files:
	.cvsignore php-pear-HTML-QuickForm.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 20:34:51 -0000	1.4
+++ .cvsignore	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-HTML_QuickForm-3.2.10.tgz
+HTML_QuickForm-3.2.11.tgz


Index: php-pear-HTML-QuickForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-11/php-pear-HTML-QuickForm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-HTML-QuickForm.spec	26 Feb 2009 21:13:57 -0000	1.5
+++ php-pear-HTML-QuickForm.spec	5 Sep 2009 21:34:25 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name HTML_QuickForm
 
 Name:           php-pear-HTML-QuickForm
-Version:        3.2.10
-Release:        2%{?dist}
+Version:        3.2.11
+Release:        1%{?dist}
 Summary:        Class for creating, validating, processing HTML forms
 
 Group:          Development/Libraries
@@ -57,6 +57,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+# fix line endings
+find docdir/HTML_QuickForm/docs -type f -exec sed -i 's/\r//' {} \;
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -89,6 +91,13 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 3.2.11-1
+- Upstream sync
+- Fix line endings in docs
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML-QuickForm/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Nov 2007 20:34:51 -0000	1.4
+++ sources	5 Sep 2009 21:34:25 -0000	1.5
@@ -1 +1 @@
-1764dd563d7a5e843602ac23b007cb35  HTML_QuickForm-3.2.10.tgz
+2320341c734fec60549a3e5145fbe8e7  HTML_QuickForm-3.2.11.tgz



From emaldonado at fedoraproject.org  Sat Sep  5 21:38:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 21:38:08 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.19,1.20
Message-ID: <20090905213808.BA19211C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26288

Modified Files:
	nss-softokn.spec 
Log Message:
single copy of shared libraries, apply nss-nolocalsql patch, no rpath-link in nss-softokn-config


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nss-softokn.spec	4 Sep 2009 20:27:10 -0000	1.19
+++ nss-softokn.spec	5 Sep 2009 21:38:08 -0000	1.20
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -51,6 +51,8 @@ Source2:          nss-softokn.pc.in
 Source3:          nss-softokn-config.in
 Source4:          nss-softokn-prelink.conf
 
+Patch2:           nss-nolocalsql.patch
+
 %description
 Network Security Services Softoken Cryptographic Module
 
@@ -84,6 +86,8 @@ Header and Library files for doing devel
 %prep
 %setup -q
 
+%patch2 -p0
+
 %build
 
 FREEBL_NO_DEPEND=1
@@ -184,19 +188,9 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
-# FIXME - bug 521155, will fix later for stability
-# Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
-
-# FIXME - bug 521155, will fix later for stability
-# Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
-do
-  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # install our prelink configuration file
@@ -246,15 +240,13 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 > 0 ] then;
+if [ $1 > 0 ] then;
   %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 fi
 exit 0
 
 %files
 %defattr(-,root,root)
-# FIXME - bug 521155, will fix later for stability
-# this would be replaced with the ones in devel
 /%{_lib}/libnssdbm3.so
 /%{_lib}/libnssdbm3.chk
 /%{_lib}/libsoftokn3.so
@@ -277,14 +269,6 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
-# FIXME - bug 521155, will fix later for stability
-# these ar currently symbloc links to the libraries in "%"{_lib}
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
-%{_libdir}/libnssdbm3.so
-%{_libdir}/libnssdbm3.chk
 %{_libdir}/pkgconfig/nss-softokn.pc
 %{_bindir}/nss-softokn-config
 
@@ -308,6 +292,11 @@ exit 0
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
+- Remove symblic links to shared libraries from devel - 521155
+- Apply the nss-nolocalsql patch
+- No rpath-link in nss-softokn-config
+
 * Fri Sep 04 2009 serstring=Elio Maldonado<emaldona at redhat.cpm> - 3.12.4-2
 - Retagging to pick up the correct .cvsignore
 



From cwickert at fedoraproject.org  Sat Sep  5 22:17:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Sep 2009 22:17:32 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.291,1.292 comps-f10.xml.in,1.268,1.269
Message-ID: <20090905221732.421DA11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4676

Modified Files:
	comps-f11.xml.in comps-f10.xml.in 
Log Message:
add gbirthday


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- comps-f11.xml.in	31 Aug 2009 09:13:22 -0000	1.291
+++ comps-f11.xml.in	5 Sep 2009 22:17:31 -0000	1.292
@@ -4330,6 +4330,7 @@
       <packagereq type="optional">dates</packagereq>
       <packagereq type="optional">dayplanner</packagereq>
       <packagereq type="optional">dia</packagereq>
+      <packagereq type="optional">gbirthday</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">gfa</packagereq>
       <packagereq type="optional">glabels</packagereq>


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- comps-f10.xml.in	31 Aug 2009 09:11:35 -0000	1.268
+++ comps-f10.xml.in	5 Sep 2009 22:17:31 -0000	1.269
@@ -3726,6 +3726,7 @@
       <packagereq type="optional">dates</packagereq>
       <packagereq type="optional">dayplanner</packagereq>
       <packagereq type="optional">dia</packagereq>
+      <packagereq type="optional">gbirthday</packagereq>      
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">gfa</packagereq>
       <packagereq type="optional">glabels</packagereq>



From cwickert at fedoraproject.org  Sat Sep  5 22:20:10 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Sep 2009 22:20:10 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.106,1.107
Message-ID: <20090905222010.22F4811C0417@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5336

Modified Files:
	comps-f12.xml.in 
Log Message:
add gbirthday, remove orphaned gfa


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- comps-f12.xml.in	4 Sep 2009 00:41:30 -0000	1.106
+++ comps-f12.xml.in	5 Sep 2009 22:20:09 -0000	1.107
@@ -4509,8 +4509,8 @@
       <packagereq type="optional">dates</packagereq>
       <packagereq type="optional">dayplanner</packagereq>
       <packagereq type="optional">dia</packagereq>
+      <packagereq type="optional">gbirthday</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
-      <packagereq type="optional">gfa</packagereq>
       <packagereq type="optional">glabels</packagereq>
       <packagereq type="optional">glista</packagereq>
       <packagereq type="optional">glom</packagereq>



From emaldonado at fedoraproject.org  Sat Sep  5 23:09:47 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat,  5 Sep 2009 23:09:47 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.110,1.111
Message-ID: <20090905230948.29D9811C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30609

Modified Files:
	nss.spec 
Log Message:
Single copy if the shared libraries (521155), no rpath-link in nss-config nss.spec (rpmlint)


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- nss.spec	5 Sep 2009 00:57:47 -0000	1.110
+++ nss.spec	5 Sep 2009 23:09:42 -0000	1.111
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -232,7 +232,6 @@ echo "test suite completed"
 for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # Install the empty NSS db files
@@ -355,11 +354,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libnss3.so
-%{_libdir}/libssl3.so
-%{_libdir}/libsmime3.so
-%{_libdir}/libnssckbi.so
-%{_libdir}/libnsspem.so
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
@@ -429,6 +423,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
+- Remove symbolic links to shared libraries from devel - 521155
+- No rpath-link in nss-softokn-config
+
 * Tue Sep 01 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
 - Update to 3.12.4
 



From cebbert at fedoraproject.org  Sun Sep  6 00:33:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun,  6 Sep 2009 00:33:35 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc9.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1122, 1.1123 kernel.spec, 1.1766, 1.1767 sources, 1.1080,
	1.1081 upstream, 1.994, 1.995 patch-2.6.31-rc8-git2.bz2.sign,
	1.1, NONE patch-2.6.31-rc8.bz2.sign, 1.1, NONE
Message-ID: <20090906003335.478C011C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2206

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc9.bz2.sign 
Removed Files:
	patch-2.6.31-rc8-git2.bz2.sign patch-2.6.31-rc8.bz2.sign 
Log Message:
2.6.31-rc9


--- NEW FILE patch-2.6.31-rc9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKovlayGugalF9Dw4RAkk0AJoCjxkRhn21P4GpKJbKUQeXZXg6FgCeKjQm
AbtTln6nNxKiwM6vSzNRQ0E=
=qFuK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1122
retrieving revision 1.1123
diff -u -p -r1.1122 -r1.1123
--- .cvsignore	1 Sep 2009 17:08:26 -0000	1.1122
+++ .cvsignore	6 Sep 2009 00:33:32 -0000	1.1123
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git2.bz2
+patch-2.6.31-rc9.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1766
retrieving revision 1.1767
diff -u -p -r1.1766 -r1.1767
--- kernel.spec	5 Sep 2009 00:36:37 -0000	1.1766
+++ kernel.spec	6 Sep 2009 00:33:32 -0000	1.1767
@@ -59,9 +59,9 @@ 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 8
+%define rcrev 9
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -2027,6 +2027,9 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 05 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.204.rc9
+- 2.6.31-rc9
+
 * Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.203.rc8.git2
 - Fix kernel build errors when building firmware by removing the
   .config file before that step and restoring it afterward.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1080
retrieving revision 1.1081
diff -u -p -r1.1080 -r1.1081
--- sources	1 Sep 2009 17:08:26 -0000	1.1080
+++ sources	6 Sep 2009 00:33:33 -0000	1.1081
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2
-81cac9f7aa9cfa526ce4cfedb4e0f739  patch-2.6.31-rc8-git2.bz2
+6bb612cbd006be9bdfaa6ff29ce090ea  patch-2.6.31-rc9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.994
retrieving revision 1.995
diff -u -p -r1.994 -r1.995
--- upstream	1 Sep 2009 17:08:26 -0000	1.994
+++ upstream	6 Sep 2009 00:33:33 -0000	1.995
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git2.bz2
+patch-2.6.31-rc9.bz2


--- patch-2.6.31-rc8-git2.bz2.sign DELETED ---


--- patch-2.6.31-rc8.bz2.sign DELETED ---



From nosnilmot at fedoraproject.org  Sun Sep  6 01:43:00 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 01:43:00 +0000 (UTC)
Subject: rpms/libsilc/devel .cvsignore, 1.7, 1.8 libsilc.spec, 1.30,
	1.31 sources, 1.7, 1.8
Message-ID: <20090906014301.13DB811C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28483

Modified Files:
	.cvsignore libsilc.spec sources 
Log Message:
Update to 1.1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Dec 2008 16:43:56 -0000	1.7
+++ .cvsignore	6 Sep 2009 01:42:58 -0000	1.8
@@ -1 +1 @@
-silc-toolkit-1.1.8.tar.bz2
+silc-toolkit-1.1.10.tar.bz2


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libsilc.spec	4 Sep 2009 16:50:18 -0000	1.30
+++ libsilc.spec	6 Sep 2009 01:42:58 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
-Version: 1.1.8
-Release: 7%{dist}
+Version: 1.1.10
+Release: 1%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -9,10 +9,6 @@ Source0: http://www.silcnet.org/download
 Patch0:  silc-toolkit-1.1-wordsize.patch
 Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
-Patch3:  silc-toolkit-1.1.8-libtool.patch
-Patch4:  silc-toolkit-1.1.8-stringformat.patch
-Patch5:  silc-toolkit-1.1.8-stringformat2.patch
-Patch6:  silc-toolkit-1.1.8-CVE-2008-7160.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -46,10 +42,6 @@ applications.
 %patch0 -p1 -b .wordsize
 %patch1 -p1 -b .libidn
 %patch2 -p1 -b .docinst
-%patch3 -p1 -b .libtool
-%patch4 -p1 -b .stringformat
-%patch5 -p1 -b .stringformat2
-%patch6 -p1 -b .CVE-2008-7160
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -139,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.10-1
+- Update to 1.1.10
+
 * Fri Sep 04 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-7
 - Backport patch to fix stack corruption (CVE-2008-7160) (#521256)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Dec 2008 16:43:56 -0000	1.7
+++ sources	6 Sep 2009 01:42:58 -0000	1.8
@@ -1 +1 @@
-96235138d7228522b1fe1ff8fc371708  silc-toolkit-1.1.8.tar.bz2
+f742b64064c40a2d22520549746cf2b4  silc-toolkit-1.1.10.tar.bz2



From nosnilmot at fedoraproject.org  Sun Sep  6 01:43:41 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 01:43:41 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.33, 1.34 pidgin.spec, 1.94,
	1.95 sources, 1.33, 1.34
Message-ID: <20090906014341.DAD9C11C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28878/devel

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Update to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	19 Aug 2009 17:46:41 -0000	1.33
+++ .cvsignore	6 Sep 2009 01:43:41 -0000	1.34
@@ -1 +1,2 @@
-pidgin-2.6.1.tar.bz2
+pidgin-2.6.2.tar.bz2
+pidgin-2.6.2.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- pidgin.spec	19 Aug 2009 17:46:42 -0000	1.94
+++ pidgin.spec	6 Sep 2009 01:43:41 -0000	1.95
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.1
+Version:	2.6.2
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -614,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
+- 2.6.2 Fixes a number of crashes
+
 * Wed Aug 19 2009 Warren Togami <wtogami at redhat.com> 2.6.1-1
 - 2.6.1: Fix a crash when some users send you a link in a Yahoo IM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	19 Aug 2009 17:46:42 -0000	1.33
+++ sources	6 Sep 2009 01:43:41 -0000	1.34
@@ -1 +1,2 @@
 306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2
+a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2



From nosnilmot at fedoraproject.org  Sun Sep  6 01:43:42 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 01:43:42 +0000 (UTC)
Subject: rpms/pidgin/F-10 .cvsignore, 1.28, 1.29 pidgin.spec, 1.80,
	1.81 sources, 1.28, 1.29
Message-ID: <20090906014342.A39E511C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28878/F-10

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Update to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	19 Aug 2009 18:12:02 -0000	1.28
+++ .cvsignore	6 Sep 2009 01:43:42 -0000	1.29
@@ -1 +1 @@
-pidgin-2.6.1.tar.bz2
+pidgin-2.6.2.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- pidgin.spec	19 Aug 2009 18:12:02 -0000	1.80
+++ pidgin.spec	6 Sep 2009 01:43:42 -0000	1.81
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.1
+Version:	2.6.2
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -614,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
+- 2.6.2 Fixes a number of crashes
+
 * Wed Aug 19 2009 Warren Togami <wtogami at redhat.com> 2.6.1-1
 - 2.6.1: Fix a crash when some users send you a link in a Yahoo IM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	19 Aug 2009 18:12:02 -0000	1.28
+++ sources	6 Sep 2009 01:43:42 -0000	1.29
@@ -1 +1 @@
-306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2
+a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2



From nosnilmot at fedoraproject.org  Sun Sep  6 01:43:42 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 01:43:42 +0000 (UTC)
Subject: rpms/pidgin/F-11 .cvsignore, 1.28, 1.29 pidgin.spec, 1.75,
	1.76 sources, 1.28, 1.29
Message-ID: <20090906014342.58FC811C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28878/F-11

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Update to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	19 Aug 2009 18:11:00 -0000	1.28
+++ .cvsignore	6 Sep 2009 01:43:41 -0000	1.29
@@ -1 +1 @@
-pidgin-2.6.1.tar.bz2
+pidgin-2.6.2.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pidgin.spec	19 Aug 2009 18:11:00 -0000	1.75
+++ pidgin.spec	6 Sep 2009 01:43:41 -0000	1.76
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.1
+Version:	2.6.2
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -614,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
+- 2.6.2 Fixes a number of crashes
+
 * Wed Aug 19 2009 Warren Togami <wtogami at redhat.com> 2.6.1-1
 - 2.6.1: Fix a crash when some users send you a link in a Yahoo IM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	19 Aug 2009 18:11:00 -0000	1.28
+++ sources	6 Sep 2009 01:43:42 -0000	1.29
@@ -1 +1 @@
-306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2
+a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2



From nosnilmot at fedoraproject.org  Sun Sep  6 01:53:00 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 01:53:00 +0000 (UTC)
Subject: rpms/libsilc/devel silc-toolkit-1.1.8-CVE-2008-7160.patch, 1.1,
	NONE silc-toolkit-1.1.8-libtool.patch, 1.1,
	NONE silc-toolkit-1.1.8-stringformat.patch, 1.1,
	NONE silc-toolkit-1.1.8-stringformat2.patch, 1.1, NONE
Message-ID: <20090906015300.9489F11C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2516

Removed Files:
	silc-toolkit-1.1.8-CVE-2008-7160.patch 
	silc-toolkit-1.1.8-libtool.patch 
	silc-toolkit-1.1.8-stringformat.patch 
	silc-toolkit-1.1.8-stringformat2.patch 
Log Message:
Remove no longer required patches



--- silc-toolkit-1.1.8-CVE-2008-7160.patch DELETED ---


--- silc-toolkit-1.1.8-libtool.patch DELETED ---


--- silc-toolkit-1.1.8-stringformat.patch DELETED ---


--- silc-toolkit-1.1.8-stringformat2.patch DELETED ---



From nosnilmot at fedoraproject.org  Sun Sep  6 01:58:49 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 01:58:49 +0000 (UTC)
Subject: rpms/pidgin/F-10 pidgin.spec,1.81,1.82
Message-ID: <20090906015849.E153611C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4122

Modified Files:
	pidgin.spec 
Log Message:
- VV support needs to be explicitly disabled on F10



Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- pidgin.spec	6 Sep 2009 01:43:42 -0000	1.81
+++ pidgin.spec	6 Sep 2009 01:58:49 -0000	1.82
@@ -82,7 +82,7 @@
 
 Name:		pidgin
 Version:	2.6.2
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -412,6 +412,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{libidn_support}
 	SWITCHES="$SWITCHES --disable-idn"
 %endif
+%if ! %{vv_support}
+	SWITCHES="$SWITCHES --disable-vv"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -614,6 +617,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1.1
+- VV support needs to be explicitly disabled on F10
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
 - 2.6.2 Fixes a number of crashes
 



From nosnilmot at fedoraproject.org  Sun Sep  6 02:05:16 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 02:05:16 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.95,1.96
Message-ID: <20090906020516.9D92011C00E5@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5939/devel

Modified Files:
	pidgin.spec 
Log Message:
sync spec files on devel & F-11


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- pidgin.spec	6 Sep 2009 01:43:41 -0000	1.95
+++ pidgin.spec	6 Sep 2009 02:05:16 -0000	1.96
@@ -412,6 +412,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{libidn_support}
 	SWITCHES="$SWITCHES --disable-idn"
 %endif
+%if ! %{vv_support}
+	SWITCHES="$SWITCHES --disable-vv"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -614,6 +617,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1.1
+- VV support needs to be explicitly disabled on F10
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
 - 2.6.2 Fixes a number of crashes
 



From nosnilmot at fedoraproject.org  Sun Sep  6 02:05:16 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Sun,  6 Sep 2009 02:05:16 +0000 (UTC)
Subject: rpms/pidgin/F-11 pidgin.spec,1.76,1.77
Message-ID: <20090906020516.C9A9811C02C8@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5939/F-11

Modified Files:
	pidgin.spec 
Log Message:
sync spec files on devel & F-11


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- pidgin.spec	6 Sep 2009 01:43:41 -0000	1.76
+++ pidgin.spec	6 Sep 2009 02:05:16 -0000	1.77
@@ -412,6 +412,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{libidn_support}
 	SWITCHES="$SWITCHES --disable-idn"
 %endif
+%if ! %{vv_support}
+	SWITCHES="$SWITCHES --disable-vv"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -614,6 +617,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1.1
+- VV support needs to be explicitly disabled on F10
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
 - 2.6.2 Fixes a number of crashes
 



From nb at fedoraproject.org  Sun Sep  6 02:17:49 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sun,  6 Sep 2009 02:17:49 +0000 (UTC)
Subject: rpms/imapsync/devel imapsync.spec,1.9,1.10
Message-ID: <20090906021749.8049211C00E5@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10159

Modified Files:
	imapsync.spec 
Log Message:
Fix broken dependency on perl-Mail-IMAPClient >= 3.19



Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/devel/imapsync.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- imapsync.spec	5 Aug 2009 05:10:30 -0000	1.9
+++ imapsync.spec	6 Sep 2009 02:17:49 -0000	1.10
@@ -1,7 +1,7 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
 Version: 1.286
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
@@ -20,7 +20,7 @@ Requires: perl(Term::ReadKey)
 Requires: perl(IO::Socket::SSL)
 Requires: perl(Test::Simple)
 Requires: perl(Mail::Box)
-Requires: perl(Mail::IMAPClient)
+Requires: perl(Mail::IMAPClient) >= 3.19
 Requires: perl(Date::Manip)
 
 



From nb at fedoraproject.org  Sun Sep  6 02:22:33 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sun,  6 Sep 2009 02:22:33 +0000 (UTC)
Subject: rpms/imapsync/EL-5 imapsync.spec,1.2,1.3
Message-ID: <20090906022233.44FC311C00E5@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12375

Modified Files:
	imapsync.spec 
Log Message:
Fix broken dependency, indicate requires perl-Mail-IMAPClient >= 3.19


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/EL-5/imapsync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- imapsync.spec	5 Aug 2009 05:15:30 -0000	1.2
+++ imapsync.spec	6 Sep 2009 02:22:32 -0000	1.3
@@ -1,7 +1,7 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
 Version: 1.286
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
@@ -20,7 +20,7 @@ Requires: perl(Term::ReadKey)
 Requires: perl(IO::Socket::SSL)
 Requires: perl(Test::Simple)
 Requires: perl(Mail::Box)
-Requires: perl(Mail::IMAPClient)
+Requires: perl(Mail::IMAPClient) >= 3.19
 Requires: perl(Date::Manip)
 
 



From nb at fedoraproject.org  Sun Sep  6 02:24:30 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sun,  6 Sep 2009 02:24:30 +0000 (UTC)
Subject: rpms/imapsync/F-10 imapsync.spec,1.7,1.8
Message-ID: <20090906022430.A1C5D11C00E5@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13012

Modified Files:
	imapsync.spec 
Log Message:
Fix broken dependency, indicate requires perl-Mail-IMAPClient >= 3.19


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-10/imapsync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- imapsync.spec	5 Aug 2009 05:12:24 -0000	1.7
+++ imapsync.spec	6 Sep 2009 02:24:30 -0000	1.8
@@ -1,7 +1,7 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
 Version: 1.286
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
@@ -20,7 +20,7 @@ Requires: perl(Term::ReadKey)
 Requires: perl(IO::Socket::SSL)
 Requires: perl(Test::Simple)
 Requires: perl(Mail::Box)
-Requires: perl(Mail::IMAPClient)
+Requires: perl(Mail::IMAPClient) >= 3.19
 Requires: perl(Date::Manip)
 
 



From nb at fedoraproject.org  Sun Sep  6 02:27:55 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sun,  6 Sep 2009 02:27:55 +0000 (UTC)
Subject: rpms/imapsync/F-11 imapsync.spec,1.8,1.9
Message-ID: <20090906022755.6B5B611C00E5@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14080

Modified Files:
	imapsync.spec 
Log Message:
Fix broken dependency, indicate requires perl-Mail-IMAPClient >= 3.19


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-11/imapsync.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- imapsync.spec	5 Aug 2009 05:14:06 -0000	1.8
+++ imapsync.spec	6 Sep 2009 02:27:55 -0000	1.9
@@ -1,7 +1,7 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
 Version: 1.286
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
@@ -20,7 +20,7 @@ Requires: perl(Term::ReadKey)
 Requires: perl(IO::Socket::SSL)
 Requires: perl(Test::Simple)
 Requires: perl(Mail::Box)
-Requires: perl(Mail::IMAPClient)
+Requires: perl(Mail::IMAPClient) >= 3.19
 Requires: perl(Date::Manip)
 
 



From kkofler at fedoraproject.org  Sun Sep  6 02:42:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  6 Sep 2009 02:42:21 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-ossl-1.x.patch,NONE,1.1
Message-ID: <20090906024221.5A9CB11C02C8@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18754/F-10

Added Files:
	kdelibs-4.3.1-ossl-1.x.patch 
Log Message:
Add missing patch.

kdelibs-4.3.1-ossl-1.x.patch:
 kopenssl.cpp |    2 +-
 kopenssl.h   |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-ossl-1.x.patch ---
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig kdelibs-4.3.1/kio/kssl/kopenssl.cpp
--- kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig	2009-09-01 21:58:06.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-01 22:08:16.000000000 +0200
@@ -622,7 +622,7 @@ KOpenSSLProxy::KOpenSSLProxy()
       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
 #endif
 
 
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.h.orig kdelibs-4.3.1/kio/kssl/kopenssl.h
--- kdelibs-4.3.1/kio/kssl/kopenssl.h.orig	2009-09-01 21:58:31.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-01 22:48:44.000000000 +0200
@@ -44,6 +44,14 @@ class KOpenSSLProxyPrivate;
 #include <openssl/stack.h>
 #include <openssl/bn.h>
 #undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define OSSL_SKVALUE_RTYPE void
+#define OSSL_MORECONST const
+#else
+#define OSSL_SKVALUE_RTYPE char
+#define OSSL_MORECONST
+#endif
 #endif
 
 /**
@@ -505,6 +513,9 @@ public:
     */
    void sk_free(STACK *s);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
 
    /*
     *  Number of elements in the stack
@@ -517,6 +528,9 @@ public:
     */
    char *sk_value(STACK *s, int n);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
 
    /*
     *  Create a new stack
@@ -529,6 +543,10 @@ public:
     */
    int sk_push(STACK *s, char *d);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
+
 
    /*
     *  Duplicate the stack



From kkofler at fedoraproject.org  Sun Sep  6 02:42:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  6 Sep 2009 02:42:21 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-ossl-1.x.patch,NONE,1.1
Message-ID: <20090906024221.53AC911C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18754/F-11

Added Files:
	kdelibs-4.3.1-ossl-1.x.patch 
Log Message:
Add missing patch.

kdelibs-4.3.1-ossl-1.x.patch:
 kopenssl.cpp |    2 +-
 kopenssl.h   |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-ossl-1.x.patch ---
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig kdelibs-4.3.1/kio/kssl/kopenssl.cpp
--- kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig	2009-09-01 21:58:06.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-01 22:08:16.000000000 +0200
@@ -622,7 +622,7 @@ KOpenSSLProxy::KOpenSSLProxy()
       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
 #endif
 
 
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.h.orig kdelibs-4.3.1/kio/kssl/kopenssl.h
--- kdelibs-4.3.1/kio/kssl/kopenssl.h.orig	2009-09-01 21:58:31.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-01 22:48:44.000000000 +0200
@@ -44,6 +44,14 @@ class KOpenSSLProxyPrivate;
 #include <openssl/stack.h>
 #include <openssl/bn.h>
 #undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define OSSL_SKVALUE_RTYPE void
+#define OSSL_MORECONST const
+#else
+#define OSSL_SKVALUE_RTYPE char
+#define OSSL_MORECONST
+#endif
 #endif
 
 /**
@@ -505,6 +513,9 @@ public:
     */
    void sk_free(STACK *s);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
 
    /*
     *  Number of elements in the stack
@@ -517,6 +528,9 @@ public:
     */
    char *sk_value(STACK *s, int n);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
 
    /*
     *  Create a new stack
@@ -529,6 +543,10 @@ public:
     */
    int sk_push(STACK *s, char *d);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
+
 
    /*
     *  Duplicate the stack



From kkofler at fedoraproject.org  Sun Sep  6 02:53:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  6 Sep 2009 02:53:35 +0000 (UTC)
Subject: rpms/kdelibs3/F-10 kdelibs-3.5.10-CVE-2009-2702.patch, NONE,
	1.1 kdelibs3.spec, 1.44, 1.45
Message-ID: <20090906025336.013AF11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24577/F-10

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-CVE-2009-2702.patch 
Log Message:
* Sun Sep 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13.1
- fix for CVE-2009-2702

(Note: I haven't synced the whole thing from devel because it contains the temporary "drop KDE_IS_PRELINKED" workaround and because the only other change was the OpenSSL 1.x fix which isn't needed in F10/F11 anyway.)

kdelibs-3.5.10-CVE-2009-2702.patch:
 kopenssl.cc        |    9 +++++++++
 kopenssl.h         |    5 +++++
 ksslcertificate.cc |    4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.10-CVE-2009-2702.patch ---
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc kdelibs-3.5.4/kio/kssl/kopenssl.cc
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc	2009-08-31 20:50:12.000000000 +0200
+++ kdelibs-3.5.4/kio/kssl/kopenssl.cc	2009-08-31 21:46:47.000000000 +0200
@@ -196,6 +196,7 @@ static int (*K_X509_NAME_add_entry_by_tx
 static X509_NAME *(*K_X509_NAME_new)() = 0L;
 static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
 static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
 static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
 
 #endif
@@ -498,6 +499,7 @@ KConfig *cfg;
       K_X509_NAME_new = (X509_NAME *(*)()) _cryptoLib->symbol("X509_NAME_new");
       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) _cryptoLib->symbol("X509_REQ_set_subject_name");
       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_length");
 #endif
    }
 
@@ -1549,6 +1551,13 @@ unsigned char *KOpenSSLProxy::ASN1_STRIN
    return 0L;
 }
 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
 STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
   return 0L;
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.h kdelibs-3.5.4/kio/kssl/kopenssl.h
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.h	2006-07-22 10:16:39.000000000 +0200
+++ kdelibs-3.5.4/kio/kssl/kopenssl.h	2009-08-31 21:46:47.000000000 +0200
@@ -622,6 +622,11 @@ public:
    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
    /*
+    *  ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
     *  
     */
    int OBJ_obj2nid(ASN1_OBJECT *o);
diff -pruN kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc kdelibs-3.5.4/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc	2006-01-19 18:06:12.000000000 +0100
+++ kdelibs-3.5.4/kio/kssl/ksslcertificate.cc	2009-08-31 21:54:38.000000000 +0200
@@ -1099,7 +1099,9 @@ QStringList KSSLCertificate::subjAltName
 		}
 
 		QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
-		if (!s.isEmpty()) {
+		if (!s.isEmpty()  &&
+				/* skip subjectAltNames with embedded NULs */
+				s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
 			rc += s;
 		}
 	}


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-10/kdelibs3.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- kdelibs3.spec	26 Jul 2009 05:37:15 -0000	1.44
+++ kdelibs3.spec	6 Sep 2009 02:53:35 -0000	1.45
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 13%{?dist}
+Release: 13%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -108,6 +108,8 @@ Patch202: kdelibs-3.5.4-CVE-2009-1687.pa
 Patch203: kdelibs-3.5.4-CVE-2009-1690.patch
 # fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
 Patch204: kdelibs-3.5.10-cve-2009-1698.patch
+# fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
+Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 
 #{?arts:Requires: arts >= %{arts_ev}}
 #Requires: %{qt3} >= %{qt3_ev}
@@ -289,6 +291,7 @@ format for easy browsing
 %patch202 -p1 -b .cve-2009-1687
 %patch203 -p1 -b .cve-2009-1690
 %patch204 -p1 -b .cve-2009-1698
+%patch205 -p1 -b .cve-2009-2702
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -640,6 +643,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Sun Sep 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13.1
+- fix for CVE-2009-2702
+
 * Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13
 - fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references



From kkofler at fedoraproject.org  Sun Sep  6 02:53:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  6 Sep 2009 02:53:36 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs-3.5.10-CVE-2009-2702.patch, NONE,
	1.1 kdelibs3.spec, 1.62, 1.63
Message-ID: <20090906025336.3BE1711C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24577/F-11

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-CVE-2009-2702.patch 
Log Message:
* Sun Sep 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13.1
- fix for CVE-2009-2702

(Note: I haven't synced the whole thing from devel because it contains the temporary "drop KDE_IS_PRELINKED" workaround and because the only other change was the OpenSSL 1.x fix which isn't needed in F10/F11 anyway.)

kdelibs-3.5.10-CVE-2009-2702.patch:
 kopenssl.cc        |    9 +++++++++
 kopenssl.h         |    5 +++++
 ksslcertificate.cc |    4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.10-CVE-2009-2702.patch ---
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc kdelibs-3.5.4/kio/kssl/kopenssl.cc
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc	2009-08-31 20:50:12.000000000 +0200
+++ kdelibs-3.5.4/kio/kssl/kopenssl.cc	2009-08-31 21:46:47.000000000 +0200
@@ -196,6 +196,7 @@ static int (*K_X509_NAME_add_entry_by_tx
 static X509_NAME *(*K_X509_NAME_new)() = 0L;
 static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
 static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
 static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
 
 #endif
@@ -498,6 +499,7 @@ KConfig *cfg;
       K_X509_NAME_new = (X509_NAME *(*)()) _cryptoLib->symbol("X509_NAME_new");
       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) _cryptoLib->symbol("X509_REQ_set_subject_name");
       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_length");
 #endif
    }
 
@@ -1549,6 +1551,13 @@ unsigned char *KOpenSSLProxy::ASN1_STRIN
    return 0L;
 }
 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
 STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
   return 0L;
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.h kdelibs-3.5.4/kio/kssl/kopenssl.h
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.h	2006-07-22 10:16:39.000000000 +0200
+++ kdelibs-3.5.4/kio/kssl/kopenssl.h	2009-08-31 21:46:47.000000000 +0200
@@ -622,6 +622,11 @@ public:
    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
 
    /*
+    *  ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
     *  
     */
    int OBJ_obj2nid(ASN1_OBJECT *o);
diff -pruN kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc kdelibs-3.5.4/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc	2006-01-19 18:06:12.000000000 +0100
+++ kdelibs-3.5.4/kio/kssl/ksslcertificate.cc	2009-08-31 21:54:38.000000000 +0200
@@ -1099,7 +1099,9 @@ QStringList KSSLCertificate::subjAltName
 		}
 
 		QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
-		if (!s.isEmpty()) {
+		if (!s.isEmpty()  &&
+				/* skip subjectAltNames with embedded NULs */
+				s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
 			rc += s;
 		}
 	}


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- kdelibs3.spec	26 Jul 2009 05:34:08 -0000	1.62
+++ kdelibs3.spec	6 Sep 2009 02:53:36 -0000	1.63
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 13%{?dist}
+Release: 13%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -108,6 +108,8 @@ Patch202: kdelibs-3.5.4-CVE-2009-1687.pa
 Patch203: kdelibs-3.5.4-CVE-2009-1690.patch
 # fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
 Patch204: kdelibs-3.5.10-cve-2009-1698.patch
+# fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
+Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 
 #{?arts:Requires: arts >= %{arts_ev}}
 #Requires: %{qt3} >= %{qt3_ev}
@@ -289,6 +291,7 @@ format for easy browsing
 %patch202 -p1 -b .cve-2009-1687
 %patch203 -p1 -b .cve-2009-1690
 %patch204 -p1 -b .cve-2009-1698
+%patch205 -p1 -b .cve-2009-2702
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -640,6 +643,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Sun Sep 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13.1
+- fix for CVE-2009-2702
+
 * Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13
 - fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references



From mclasen at fedoraproject.org  Sun Sep  6 02:59:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  6 Sep 2009 02:59:50 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre-prefs.patch, NONE, 1.1 vinagre.spec, 1.54,
	1.55
Message-ID: <20090906025950.C9D7811C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26290

Modified Files:
	vinagre.spec 
Added Files:
	vinagre-prefs.patch 
Log Message:
Fix warnings at startup


vinagre-prefs.patch:
 vinagre-prefs.c |   42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

--- NEW FILE vinagre-prefs.patch ---
--- vinagre-2.27.91/vinagre/vinagre-prefs.c	2009-07-30 16:13:29.000000000 -0400
+++ hacked/vinagre/vinagre-prefs.c	2009-09-05 22:51:22.750568356 -0400
@@ -152,41 +152,51 @@
 static void
 vinagre_prefs_set_bool (VinagrePrefs *prefs, const gchar* key, gboolean value)
 {
-  g_return_if_fail (gconf_client_key_is_writable (
-		    prefs->priv->gconf_client, key, NULL));
+  GError *error = NULL;
 
-  gconf_client_set_bool (prefs->priv->gconf_client, key, value, NULL);
+  if (!gconf_client_set_bool (prefs->priv->gconf_client, key, value, &error))
+    {
+      g_warning ("Setting key %s failed: %s", key, error->message);
+      g_error_free (error);
+    }
 }
 
 static void
 vinagre_prefs_set_int (VinagrePrefs *prefs, const gchar* key, gint value)
 {
-  g_return_if_fail (gconf_client_key_is_writable (
-		    prefs->priv->gconf_client, key, NULL));
+  GError *error = NULL;
 
-  gconf_client_set_int (prefs->priv->gconf_client, key, value, NULL);
+  if (!gconf_client_set_int (prefs->priv->gconf_client, key, value, &error))
+    {
+      g_warning ("Setting key %s failed: %s", key, error->message);
+      g_error_free (error);
+    }
 }
 
 static void
 vinagre_prefs_set_string (VinagrePrefs *prefs, const gchar *key, const gchar *value)
 {
-  g_return_if_fail (gconf_client_key_is_writable (
-		    prefs->priv->gconf_client, key, NULL));
+  GError *error = NULL;
 
-  gconf_client_set_string (prefs->priv->gconf_client, key, value, NULL);
+  if (!gconf_client_set_string (prefs->priv->gconf_client, key, value, &error))
+    {
+      g_warning ("Setting key %s failed: %s", key, error->message);
+      g_error_free (error);
+    }
 }
 
 static void
 vinagre_prefs_set_list (VinagrePrefs *prefs, const gchar* key, GSList *list)
 {
-  g_return_if_fail (gconf_client_key_is_writable (
-		    prefs->priv->gconf_client, key, NULL));
+  GError *error = NULL;
 
-  gconf_client_set_list (prefs->priv->gconf_client,
-			 key,
-			 GCONF_VALUE_STRING,
-			 list,
-			 NULL);
+  if (!gconf_client_set_list (prefs->priv->gconf_client, key,
+			      GCONF_VALUE_STRING, list,
+			      &error))
+    {
+      g_warning ("Setting key %s failed: %s", key, error->message);
+      g_error_free (error);
+    }
 }
 
 static void


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- vinagre.spec	4 Sep 2009 00:15:50 -0000	1.54
+++ vinagre.spec	6 Sep 2009 02:59:50 -0000	1.55
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	2.27.91
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -26,7 +26,10 @@ BuildRequires:  telepathy-glib-devel
 # for /usr/share/dbus-1/services
 Requires: dbus
 
+# fixed upstream
 Patch0: vinagre-unique-ids.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=594286
+Patch1: vinagre-prefs.patch
 
 %description
 Vinagre is a VNC client for the GNOME desktop.
@@ -52,6 +55,7 @@ to vinagre.
 %prep
 %setup -q
 %patch0 -p1 -b .unique-ids
+%patch1 -p1 -b .prefs
 
 %build
 %configure --enable-avahi=yes --disable-static
@@ -158,6 +162,9 @@ fi
 
 
 %changelog
+* Sat Sep  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-3
+- Fix warnings at startup (#521382)
+
 * Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-2
 - Make ids unique
 



From salimma at fedoraproject.org  Sun Sep  6 03:00:39 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun,  6 Sep 2009 03:00:39 +0000 (UTC)
Subject: rpms/llvm/devel llvm-2.5-Base.td-x86_32.patch, NONE,
	1.1 llvm-2.5-tclsh_check.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 llvm.spec, 1.15, 1.16 sources, 1.6, 1.7
Message-ID: <20090906030039.51C7811C0374@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26396

Modified Files:
	.cvsignore llvm.spec sources 
Added Files:
	llvm-2.5-Base.td-x86_32.patch llvm-2.5-tclsh_check.patch 
Log Message:
Commit llvm-gcc source


llvm-2.5-Base.td-x86_32.patch:
 Base.td |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE llvm-2.5-Base.td-x86_32.patch ---
--- tools/llvmc/plugins/Base/Base.td.orig	2009-03-28 21:25:47.000000000 +0100
+++ tools/llvmc/plugins/Base/Base.td	2009-03-28 21:26:29.000000000 +0100
@@ -113,7 +113,7 @@
 [(in_language "llvm-bitcode"),
  (out_language "assembler"),
  (output_suffix "s"),
- (cmd_line "llc -relocation-model=pic -f $INFILE -o $OUTFILE"),
+ (cmd_line "llc -f $INFILE -o $OUTFILE"),
  (actions (case (switch_on "S"), (stop_compilation)))
 ]>;
 

llvm-2.5-tclsh_check.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE llvm-2.5-tclsh_check.patch ---
--- llvm-2.5/configure.tclsh_check	2009-02-03 00:29:49.000000000 -0500
+++ llvm-2.5/configure	2009-09-05 12:25:54.761389908 -0400
@@ -8032,7 +8032,7 @@
 else
 
 if test x"${with_tclinclude}" != x ; then
-  if test -f ${with_tclinclude}/tclsh ; then
+  if test -f ${with_tclinclude}/tcl.h ; then
     ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
   elif test -f ${with_tclinclude}/src/tclsh ; then
     ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Mar 2009 00:27:31 -0000	1.6
+++ .cvsignore	6 Sep 2009 03:00:38 -0000	1.7
@@ -1 +1,2 @@
 llvm-2.5.tar.gz
+llvm-gcc-4.2-2.5.source.tar.gz


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- llvm.spec	22 Aug 2009 21:18:32 -0000	1.15
+++ llvm.spec	6 Sep 2009 03:00:39 -0000	1.16
@@ -7,15 +7,18 @@
 #   The llvm-gcc package doesn't currently build.
 
 %define lgcc_version 4.2
+# attempt turning on llvm-gcc
+%define _with_gcc 1
 
 # LLVM object files don't contain build IDs.  I don't know why yet.
 # Suppress their generation for now.
 
-%define debug_package %{nil}
+%define _missing_build_ids_terminate_build 0
+#define debug_package %{nil}
 
 Name:           llvm
 Version:        2.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -29,6 +32,8 @@ Patch0:         llvm-2.1-fix-sed.patch
 Patch1:         llvm-2.4-fix-ocaml.patch
 # http://llvm.org/bugs/show_bug.cgi?id=3726
 Patch2:         llvm-2.5-gcc44.patch
+Patch3:         llvm-2.5-tclsh_check.patch
+Patch4:         llvm-2.5-Base.td-x86_32.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -39,6 +44,8 @@ BuildRequires:  gcc-c++ >= 3.4
 BuildRequires:  groff
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  ocaml-ocamldoc
+# for DejaGNU test suite
+BuildRequires:  dejagnu tcl-devel
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 BuildRequires:  doxygen graphviz
 %endif
@@ -146,63 +153,75 @@ for developing applications that use %{n
 %patch0 -p1 -b .fix-sed
 %patch1 -p1 -b .fix-ocaml
 %patch2 -p1 -b .gcc44
+%patch3 -p1 -b .tclsh_check
+
+%ifarch %{ix86}
+%patch4 -p0 -b .ix86pic
+%endif
 
 %build
 # Note: --enable-pic can be turned off when 2.6 comes out
 #       and up to 2.5, unsafe on 32-bit archs (in our case,
 #       anything but x86_64)
-%configure \
-  --libdir=%{_libdir}/%{name} \
-  --datadir=%{_datadir}/%{name}-%{version} \
-  --disable-static \
-  --enable-assertions \
+# Disabling assertions now, rec. by pure and needed for OpenGTL
+mkdir obj && cd obj
+../configure \
+  --prefix=%{_prefix} \
+  --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
-  --enable-optimized \
-%ifnarch %ix86
+%ifnarch %{ix86}
   --enable-pic
 %endif
-#   --enable-targets=host-only \
+
+# configure does not properly specify libdir
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
-# tools-only VERBOSE=1 OmitFramePointer='' REQUIRES_EH=1 \
-#  OPTIMIZE_OPTION='%{optflags}'
 
 %if %{?_with_gcc:1}%{!?_with_gcc:0}
 # Build llvm-gcc.
 
-export PATH=%{_builddir}/%{?buildsubdir}/Release/bin:$PATH
-
-mkdir llvm-gcc%{lgcc_version}-%{version}.source/build
-cd llvm-gcc%{lgcc_version}-%{version}.source/build
+export PATH=%{_builddir}/obj/Release-Asserts/bin:$PATH
+cd ..
+mkdir gcc-obj
+cd gcc-obj
 
-../configure \
-  --host=%{_host} \
-  --build=%{_build} \
-  --target=%{_target_platform} \
-  --prefix=%{_libdir}/llvm-gcc \
-  --libdir=%{_libdir}/llvm-gcc/%{_lib} \
-  --enable-threads \
-  --disable-nls \
+../llvm-gcc-%{lgcc_version}-%{version}.source/configure \
+  --prefix=%{_prefix} \
+  --libdir=%{_libdir} \
+  --enable-languages=ada,c,c++ \
+  --enable-checking \
+  --enable-llvm=$PWD/../obj \
+  --disable-bootstrap \
 %ifarch x86_64
   --disable-multilib \
   --disable-shared \
 %endif
-  --enable-languages=c,c++ \
-  --enable-llvm=%{_builddir}/%{?buildsubdir} \
   --program-prefix=llvm-
+
 make %{_smp_mflags} LLVM_VERSION_INFO=%{version}
 %endif
 
+%check
+(cd obj && make check) 2>&1 | tee testlogs.txt ; true
+
+# Report failures and unexpected successes
+echo
+cat testlogs.txt | grep FAIL
+cat testlogs.txt | grep XPASS
+echo
+
+
 %install
 rm -rf %{buildroot}
+cd obj
 chmod -x examples/Makefile
 # OVERRIDE_libdir used by our patched Makefile.ocaml:
 # see http://llvm.org/bugs/show_bug.cgi?id=3153
 make install DESTDIR=%{buildroot} \
-     PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
-     OVERRIDE_libdir=%{_libdir}/%{name}/%{name} \
-     PROJ_docsdir=`pwd`/moredocs
+     OVERRIDE_libdir=%{_libdir} \
+     PROJ_docsdir=`pwd`/../moredocs
 
 #make install \
 #  PROJ_prefix=%{buildroot}/%{_prefix} \
@@ -218,7 +237,7 @@ find %{buildroot} -name .dir -print0 | x
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
 
 # Get rid of erroneously installed example files.
-rm %{buildroot}%{_libdir}/%{name}/LLVMHello.*
+rm %{buildroot}%{_libdir}/LLVMHello.*
 
 # And OCaml .o files
 rm %{buildroot}%{_libdir}/ocaml/*.o
@@ -234,7 +253,7 @@ rm %{buildroot}%{_bindir}/gcc{as,ld}
 sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
   %{buildroot}%{_bindir}/llvm-config
 
-chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa]
+chmod -x %{buildroot}%{_libdir}/*.[oa]
 
 # remove documentation makefiles:
 # they require the build directory to work
@@ -270,7 +289,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt
+%doc CREDITS.TXT LICENSE.TXT README.txt testlogs.txt
 %exclude %{_bindir}/llvm-config
 %{_bindir}/bugpoint
 %{_bindir}/llc
@@ -292,7 +311,8 @@ rm -rf %{buildroot}
 %{_bindir}/llvm-config
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
-%{_libdir}/%{name}
+%exclude %{_libdir}/ocaml
+%{_libdir}/*
 
 
 %files ocaml
@@ -352,6 +372,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
+- Disable assertions (needed by OpenGTL)
+- Align spec file with upstream build instructions
+- Enable llvm-gcc
+- Enable unit tests
+
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
 - Only disable PIC on %%ix86; ppc actually needs it
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Mar 2009 00:27:31 -0000	1.6
+++ sources	6 Sep 2009 03:00:39 -0000	1.7
@@ -1 +1,2 @@
 55df2ea8665c8094ad2ef85187b9fc74  llvm-2.5.tar.gz
+c5800d85059fcf80429a86c536127595  llvm-gcc-4.2-2.5.source.tar.gz



From cebbert at fedoraproject.org  Sun Sep  6 04:59:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun,  6 Sep 2009 04:59:31 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-ocfs2-handle-len-0.patch, NONE,
	1.1.2.1 linux-2.6-slub-fix-destroy-by-rcu.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.87, 1.1206.2.88
Message-ID: <20090906045931.9EE6B11C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29162

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-ocfs2-handle-len-0.patch 
	linux-2.6-slub-fix-destroy-by-rcu.patch 
Log Message:
Add patches requested for the next stable release:
   linux-2.6-slub-fix-destroy-by-rcu.patch (fixes bug in 2.6.27.29)
   linux-2.6-ocfs2-handle-len-0.patch (fixes bug in 2.6.27.32-rc1)

linux-2.6-ocfs2-handle-len-0.patch:
 aops.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-ocfs2-handle-len-0.patch ---
From: Sunil Mushran <sunil.mushran at oracle.com>
Date: Fri, 4 Sep 2009 18:12:01 +0000 (-0700)
Subject: ocfs2: ocfs2_write_begin_nolock() should handle len=0
X-Git-Tag: v2.6.31-rc9~20^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8379e7c46cc48f51197dd663fc6676f47f2a1e71

ocfs2: ocfs2_write_begin_nolock() should handle len=0

Bug introduced by mainline commit e7432675f8ca868a4af365759a8d4c3779a3d922
The bug causes ocfs2_write_begin_nolock() to oops when len=0.

Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Cc: stable at kernel.org
Signed-off-by: Joel Becker <joel.becker at oracle.com>
---

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index b401654..8a1e615 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1747,8 +1747,8 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,
 	 * we know zeros will only be needed in the first and/or last cluster.
 	 */
 	if (clusters_to_alloc || extents_to_split ||
-	    wc->w_desc[0].c_needs_zero ||
-	    wc->w_desc[wc->w_clen - 1].c_needs_zero)
+	    (wc->w_clen && (wc->w_desc[0].c_needs_zero ||
+			    wc->w_desc[wc->w_clen - 1].c_needs_zero)))
 		cluster_of_pages = 1;
 	else
 		cluster_of_pages = 0;

linux-2.6-slub-fix-destroy-by-rcu.patch:
 slub.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-slub-fix-destroy-by-rcu.patch ---
From: Eric Dumazet <eric.dumazet at gmail.com>
Date: Thu, 3 Sep 2009 19:38:59 +0000 (+0300)
Subject: slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU
X-Git-Tag: v2.6.31-rc9~13^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d76b1590e06a63a3d8697168cd0aabf1c4b3cb3a

slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU

kmem_cache_destroy() should call rcu_barrier() *after* kmem_cache_close() and
*before* sysfs_slab_remove() or risk rcu_free_slab() being called after
kmem_cache is deleted (kfreed).

rmmod nf_conntrack can crash the machine because it has to kmem_cache_destroy()
a SLAB_DESTROY_BY_RCU enabled cache.

Cc: <stable at kernel.org>
Reported-by: Zdenek Kabelac <zdenek.kabelac at gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
Acked-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
---

diff --git a/mm/slub.c b/mm/slub.c
index b9f1491..b627675 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2594,8 +2594,6 @@ static inline int kmem_cache_close(struct kmem_cache *s)
  */
 void kmem_cache_destroy(struct kmem_cache *s)
 {
-	if (s->flags & SLAB_DESTROY_BY_RCU)
-		rcu_barrier();
 	down_write(&slub_lock);
 	s->refcount--;
 	if (!s->refcount) {
@@ -2606,6 +2604,8 @@ void kmem_cache_destroy(struct kmem_cache *s)
 				"still has objects.\n", s->name, __func__);
 			dump_stack();
 		}
+		if (s->flags & SLAB_DESTROY_BY_RCU)
+			rcu_barrier();
 		sysfs_slab_remove(s);
 	} else
 		up_write(&slub_lock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.87
retrieving revision 1.1206.2.88
diff -u -p -r1.1206.2.87 -r1.1206.2.88
--- kernel.spec	5 Sep 2009 02:53:39 -0000	1.1206.2.87
+++ kernel.spec	6 Sep 2009 04:59:29 -0000	1.1206.2.88
@@ -782,6 +782,10 @@ Patch13000: make-mmap_min_addr-suck-less
 Patch14000: linux-2.6-nfsd-report-short-writes-fix.patch
 Patch14001: linux-2.6-nfsd-report-short-writes.patch
 
+# patches requested for the next -stable release
+Patch14010: linux-2.6-slub-fix-destroy-by-rcu.patch
+Patch14011: linux-2.6-ocfs2-handle-len-0.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1413,6 +1417,10 @@ ApplyPatch make-mmap_min_addr-suck-less.
 ApplyPatch linux-2.6-nfsd-report-short-writes.patch
 ApplyPatch linux-2.6-nfsd-report-short-writes-fix.patch
 
+# patches requested for the next -stable release
+ApplyPatch linux-2.6-slub-fix-destroy-by-rcu.patch
+ApplyPatch linux-2.6-ocfs2-handle-len-0.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1988,6 +1996,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Sep 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.88.rc1
+- Add patches requested for the next stable release:
+   linux-2.6-slub-fix-destroy-by-rcu.patch (fixes bug in 2.6.27.29)
+   linux-2.6-ocfs2-handle-len-0.patch (fixes bug in 2.6.27.32-rc1)
+
 * Fri Sep 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.87.rc1
 - Copy fix for NFS short write reporting from F-10 2.6.29 kernel (#493500)
 



From iarnell at fedoraproject.org  Sun Sep  6 07:29:00 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun,  6 Sep 2009 07:29:00 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-JSON/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-View-JSON.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090906072900.D9F9A11C00E5@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-View-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2045

Modified Files:
	.cvsignore perl-Catalyst-View-JSON.spec sources 
Log Message:
* Sun Sep 06 2009 Iain Arnell <iarnell at gmail.com> 0.26-1
- update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-JSON/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 May 2009 07:10:01 -0000	1.3
+++ .cvsignore	6 Sep 2009 07:28:58 -0000	1.4
@@ -1 +1 @@
-Catalyst-View-JSON-0.25.tar.gz
+Catalyst-View-JSON-0.26.tar.gz


Index: perl-Catalyst-View-JSON.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-JSON/devel/perl-Catalyst-View-JSON.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-View-JSON.spec	26 Jul 2009 04:18:05 -0000	1.5
+++ perl-Catalyst-View-JSON.spec	6 Sep 2009 07:28:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-View-JSON
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        JSON view for your data
 License:        GPL+ or Artistic 2.0
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 06 2009 Iain Arnell <iarnell at gmail.com> 0.26-1
+- update to latest upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-JSON/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 May 2009 07:10:01 -0000	1.3
+++ sources	6 Sep 2009 07:28:58 -0000	1.4
@@ -1 +1 @@
-5877fddd83dd3380d4ea9866dad3727a  Catalyst-View-JSON-0.25.tar.gz
+01f792cc9d09eb1f258504b391fffe63  Catalyst-View-JSON-0.26.tar.gz



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:27 +0000
Subject: [pkgdb] mailcap: scop has requested watchcommits
Message-ID: <20090906101327.096B710F896@bastion2.fedora.phx.redhat.com>

scop has requested the watchcommits acl on mailcap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mailcap



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:27 +0000
Subject: [pkgdb] mailcap: scop has requested commit
Message-ID: <20090906101327.C4F3F10F89C@bastion2.fedora.phx.redhat.com>

scop has requested the commit acl on mailcap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mailcap



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:30 +0000
Subject: [pkgdb] disktype had acl change status
Message-ID: <20090906101330.EE67B10F8A0@bastion2.fedora.phx.redhat.com>

richardfearn has set the watchbugzilla acl on disktype (Fedora devel) to Approved for kwizart

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:32 +0000
Subject: [pkgdb] disktype had acl change status
Message-ID: <20090906101332.AE70A10F881@bastion2.fedora.phx.redhat.com>

richardfearn has set the watchcommits acl on disktype (Fedora devel) to Approved for kwizart

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:35 +0000
Subject: [pkgdb] disktype had acl change status
Message-ID: <20090906101335.1426410F8A1@bastion2.fedora.phx.redhat.com>

richardfearn has set the commit acl on disktype (Fedora devel) to Approved for kwizart

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:42 +0000
Subject: [pkgdb] disktype had acl change status
Message-ID: <20090906101342.6FA0810F8A5@bastion2.fedora.phx.redhat.com>

richardfearn has set the watchbugzilla acl on disktype (Fedora EPEL 5) to Approved for kwizart

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:43 +0000
Subject: [pkgdb] disktype had acl change status
Message-ID: <20090906101343.35E6510F895@bastion2.fedora.phx.redhat.com>

richardfearn has set the watchcommits acl on disktype (Fedora EPEL 5) to Approved for kwizart

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:43 +0000
Subject: [pkgdb] disktype had acl change status
Message-ID: <20090906101343.EF38510F8A9@bastion2.fedora.phx.redhat.com>

richardfearn has set the commit acl on disktype (Fedora EPEL 5) to Approved for kwizart

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/disktype



From pkgdb at fedoraproject.org  Sun Sep  6 10:13:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 10:13:48 +0000
Subject: [pkgdb] mailcap: scop has requested watchbugzilla
Message-ID: <20090906101348.BBB5510F8AC@bastion2.fedora.phx.redhat.com>

scop has requested the watchbugzilla acl on mailcap (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mailcap



From jreznik at fedoraproject.org  Sun Sep  6 10:47:20 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Sun,  6 Sep 2009 10:47:20 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.1,
	1.2
Message-ID: <20090906104720.72D3A11C00E5@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11485

Modified Files:
	constantine-kde-theme.spec 
Log Message:
* Sun Sep 06 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.2-2
- more resolutions for KDM theme
- c-b-kde BR, bumped version



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- constantine-kde-theme.spec	5 Sep 2009 07:31:57 -0000	1.1
+++ constantine-kde-theme.spec	6 Sep 2009 10:47:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
 Version:	11.90.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -14,8 +14,9 @@ BuildArch:	noarch
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos
-# TODO: correct Constantine Requires
-Requires:	constantine-backgrounds >= 11.90.0-1
+# TODO: correct Constantine Requires?
+Requires:	constantine-backgrounds >= 11.90.2-1
+Requires:	constantine-backgrounds-kde >= 11.90.2-1
 
 
 
@@ -36,6 +37,34 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 cp -rp kdm/Constantine/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 (cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/Constantine/
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-640x480.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-800x480.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-800x600.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1024x600.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1024x768.png
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1152x720.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1152x864.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1200x900.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1280x720.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1280x768.png
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1280x800.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1280x960.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1366x768.png
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1440x900.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1440x1080.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1600x1200.png
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1680x1050.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1920x1080.png
+ln -s ../../../../../backgrounds/constantine/default/wide/constantine.png constantine-1920x1200.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-1920x1440.png
+ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine-2048x1536.png
+# KDM falls back to this one if there's no match
 ln -s ../../../../../backgrounds/constantine/default/standard/constantine.png constantine.png
 ln -s ../../../../../pixmaps/system-logo-white.png system-logo-white.png
 )
@@ -66,6 +95,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 06 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.2-2
+- more resolutions for KDM theme
+- c-b-kde BR, bumped version
+
 * Fri Sep 04 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.2-1
 - KDM theme
 



From pbrobinson at fedoraproject.org  Sun Sep  6 12:18:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Sep 2009 12:18:35 +0000 (UTC)
Subject: rpms/xapian-bindings/devel xapian-bindings-Makefile-fix.patch, NONE,
	1.1 xapian-bindings.spec, 1.24, 1.25
Message-ID: <20090906121835.1022F11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4094

Modified Files:
	xapian-bindings.spec 
Added Files:
	xapian-bindings-Makefile-fix.patch 
Log Message:
- Patch to fix python bindings build

xapian-bindings-Makefile-fix.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xapian-bindings-Makefile-fix.patch ---
--- xapian-bindings-1.0.15/python/Makefile.in	2009-08-26 22:53:09.000000000 +0100
+++ xapian-bindings-1.0.14/python/Makefile.in	2009-07-21 17:43:30.000000000 +0100
@@ -837,7 +837,7 @@
 
 _xapian$(PYTHON_SO): _xapian.la
 	$(LIBTOOL) --config > libtoolconfig.tmp
-	. libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
+	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
 	rm -f libtoolconfig.tmp
 
 # Clean any databases created by test cases.
--- xapian-bindings-1.0.15/python/Makefile.am	2009-08-26 22:51:01.000000000 +0100
+++ xapian-bindings-1.0.14/python/Makefile.am	2009-07-21 17:39:27.000000000 +0100
@@ -63,7 +63,7 @@
 
 _xapian$(PYTHON_SO): _xapian.la
 	$(LIBTOOL) --config > libtoolconfig.tmp
-	. libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
+	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
 	rm -f libtoolconfig.tmp
 
 CLEANFILES = \


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xapian-bindings.spec	27 Aug 2009 17:24:39 -0000	1.24
+++ xapian-bindings.spec	6 Sep 2009 12:18:34 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
 Version: 1.0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://www.xapian.org/
@@ -14,6 +14,8 @@ BuildRequires: autoconf automake libtool
 BuildRequires: ruby-devel ruby
 BuildRequires: xapian-core-devel == %{version}
 Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0: xapian-bindings-Makefile-fix.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -44,7 +46,8 @@ indexing and search facilities to applic
 files needed for developing Ruby scripts which use Xapian
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
+%patch0 -p1 -b .Makefile-fix
 
 %build
 %configure --with-python --with-ruby
@@ -75,8 +78,10 @@ rm -rf %{buildroot}%{buildroot}/usr/shar
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
-
 %changelog
+* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-2
+- Patch to fix python bindings build
+
 * Thu Aug 27 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15.1
 - Update to 1.0.15
 



From pbrobinson at fedoraproject.org  Sun Sep  6 12:25:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Sep 2009 12:25:06 +0000 (UTC)
Subject: rpms/xapian-bindings/F-11 xapian-bindings-Makefile-fix.patch, NONE, 
	1.1 .cvsignore, 1.9, 1.10 sources, 1.10,
	1.11 xapian-bindings.spec, 1.20, 1.21
Message-ID: <20090906122506.D601F11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6075

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Added Files:
	xapian-bindings-Makefile-fix.patch 
Log Message:
- Update to 1.0.15

xapian-bindings-Makefile-fix.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xapian-bindings-Makefile-fix.patch ---
--- xapian-bindings-1.0.15/python/Makefile.in	2009-08-26 22:53:09.000000000 +0100
+++ xapian-bindings-1.0.14/python/Makefile.in	2009-07-21 17:43:30.000000000 +0100
@@ -837,7 +837,7 @@
 
 _xapian$(PYTHON_SO): _xapian.la
 	$(LIBTOOL) --config > libtoolconfig.tmp
-	. libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
+	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
 	rm -f libtoolconfig.tmp
 
 # Clean any databases created by test cases.
--- xapian-bindings-1.0.15/python/Makefile.am	2009-08-26 22:51:01.000000000 +0100
+++ xapian-bindings-1.0.14/python/Makefile.am	2009-07-21 17:39:27.000000000 +0100
@@ -63,7 +63,7 @@
 
 _xapian$(PYTHON_SO): _xapian.la
 	$(LIBTOOL) --config > libtoolconfig.tmp
-	. libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
+	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
 	rm -f libtoolconfig.tmp
 
 CLEANFILES = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Aug 2009 12:43:29 -0000	1.9
+++ .cvsignore	6 Sep 2009 12:25:06 -0000	1.10
@@ -1 +1 @@
-xapian-bindings-1.0.14.tar.gz
+xapian-bindings-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Aug 2009 12:43:29 -0000	1.10
+++ sources	6 Sep 2009 12:25:06 -0000	1.11
@@ -1 +1 @@
-d6f86ccc3d1a534902e1cf8df1cb43f3  xapian-bindings-1.0.14.tar.gz
+d365969f5ba7fa99d369ef479862c4fe  xapian-bindings-1.0.15.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/xapian-bindings.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xapian-bindings.spec	3 Aug 2009 12:43:30 -0000	1.20
+++ xapian-bindings.spec	6 Sep 2009 12:25:06 -0000	1.21
@@ -4,7 +4,7 @@
 
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
-Version: 1.0.14
+Version: 1.0.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
@@ -14,6 +14,8 @@ BuildRequires: autoconf automake libtool
 BuildRequires: ruby-devel ruby
 BuildRequires: xapian-core-devel == %{version}
 Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0: xapian-bindings-Makefile-fix.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -44,7 +46,8 @@ indexing and search facilities to applic
 files needed for developing Ruby scripts which use Xapian
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
+%patch0 -p1 -b .Makefile-fix
 
 %build
 %configure --with-python --with-ruby
@@ -75,8 +78,10 @@ rm -rf %{buildroot}%{buildroot}/usr/shar
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
-
 %changelog
+* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
+- Update to 1.0.15
+
 * Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14.1
 - Update to 1.0.14
 



From pbrobinson at fedoraproject.org  Sun Sep  6 12:29:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Sep 2009 12:29:23 +0000 (UTC)
Subject: rpms/xapian-bindings/F-10 xapian-bindings-Makefile-fix.patch, NONE, 
	1.1 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 xapian-bindings.spec,
	1.15, 1.16
Message-ID: <20090906122923.425E111C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7934

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Added Files:
	xapian-bindings-Makefile-fix.patch 
Log Message:
- Update to 1.0.15

xapian-bindings-Makefile-fix.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xapian-bindings-Makefile-fix.patch ---
--- xapian-bindings-1.0.15/python/Makefile.in	2009-08-26 22:53:09.000000000 +0100
+++ xapian-bindings-1.0.14/python/Makefile.in	2009-07-21 17:43:30.000000000 +0100
@@ -837,7 +837,7 @@
 
 _xapian$(PYTHON_SO): _xapian.la
 	$(LIBTOOL) --config > libtoolconfig.tmp
-	. libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
+	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
 	rm -f libtoolconfig.tmp
 
 # Clean any databases created by test cases.
--- xapian-bindings-1.0.15/python/Makefile.am	2009-08-26 22:51:01.000000000 +0100
+++ xapian-bindings-1.0.14/python/Makefile.am	2009-07-21 17:39:27.000000000 +0100
@@ -63,7 +63,7 @@
 
 _xapian$(PYTHON_SO): _xapian.la
 	$(LIBTOOL) --config > libtoolconfig.tmp
-	. libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
+	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
 	rm -f libtoolconfig.tmp
 
 CLEANFILES = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Dec 2008 13:20:54 -0000	1.7
+++ .cvsignore	6 Sep 2009 12:29:23 -0000	1.8
@@ -1 +1 @@
-xapian-bindings-1.0.9.tar.gz
+xapian-bindings-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	8 Dec 2008 13:20:55 -0000	1.8
+++ sources	6 Sep 2009 12:29:23 -0000	1.9
@@ -1 +1 @@
-fa37abeb8927dde6b8f9655c893ebfac  xapian-bindings-1.0.9.tar.gz
+d365969f5ba7fa99d369ef479862c4fe  xapian-bindings-1.0.15.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-10/xapian-bindings.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xapian-bindings.spec	8 Dec 2008 13:20:55 -0000	1.15
+++ xapian-bindings.spec	6 Sep 2009 12:29:23 -0000	1.16
@@ -4,7 +4,7 @@
 
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
-Version: 1.0.9
+Version: 1.0.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
@@ -14,6 +14,8 @@ BuildRequires: autoconf automake libtool
 BuildRequires: ruby-devel ruby
 BuildRequires: xapian-core-devel == %{version}
 Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0: xapian-bindings-Makefile-fix.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,6 +27,7 @@ files needed for scripts which use Xapia
 %package python
 Group: Development/Libraries
 Summary: Files needed for developing Python scripts which use Xapian
+Obsoletes: pyxapian
 
 %description python
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -43,7 +46,8 @@ indexing and search facilities to applic
 files needed for developing Ruby scripts which use Xapian
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
+%patch0 -p1 -b .Makefile-fix
 
 %build
 %configure --with-python --with-ruby
@@ -74,9 +78,11 @@ rm -rf %{buildroot}%{buildroot}/usr/shar
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
-
 %changelog
-* Mon Dec 08 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-1
+* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
+- Update to 1.0.15
+
+* Sat Nov 29 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-1
 - Update to 1.0.9
 
 * Sat Oct 11 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.8-1
@@ -119,4 +125,3 @@ rm -rf %{buildroot}%{buildroot}/usr/shar
 
 * Mon Jun 18 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.0.1-1
 - Initial build
-



From mycae at fedoraproject.org  Sun Sep  6 12:54:22 2009
From: mycae at fedoraproject.org (mycae)
Date: Sun,  6 Sep 2009 12:54:22 +0000 (UTC)
Subject: rpms/cpptasks/devel cpptasks.spec,1.2,1.3
Message-ID: <20090906125422.D0FB911C00E5@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19690

Modified Files:
	cpptasks.spec 
Log Message:
* BR needed whitespace



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/devel/cpptasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cpptasks.spec	3 Sep 2009 13:46:24 -0000	1.2
+++ cpptasks.spec	6 Sep 2009 12:54:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -34,7 +34,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}>=%{version}-%{release}
+Requires:	%{name} >= %{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sun Sep 06 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
+- Insert space needed for subdep 
+
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove excess BR
 - Fix subpackage dep



From mycae at fedoraproject.org  Sun Sep  6 12:57:49 2009
From: mycae at fedoraproject.org (mycae)
Date: Sun,  6 Sep 2009 12:57:49 +0000 (UTC)
Subject: rpms/cpptasks/EL-5 cpptasks.spec,1.3,1.4
Message-ID: <20090906125749.8505511C00E5@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21092/EL-5

Modified Files:
	cpptasks.spec 
Log Message:
- Add whitespace to F10,F11, EL5



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/EL-5/cpptasks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpptasks.spec	3 Sep 2009 13:30:27 -0000	1.3
+++ cpptasks.spec	6 Sep 2009 12:57:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -33,7 +33,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}>=%{version}-%{release}
+Requires:	%{name} >= %{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-5
+- Add whitespace to Req
+
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
 - Remove excess BR
 - Fix subpackage dep



From mycae at fedoraproject.org  Sun Sep  6 12:57:49 2009
From: mycae at fedoraproject.org (mycae)
Date: Sun,  6 Sep 2009 12:57:49 +0000 (UTC)
Subject: rpms/cpptasks/F-10 cpptasks.spec,1.5,1.6
Message-ID: <20090906125749.A0FA411C0418@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21092/F-10

Modified Files:
	cpptasks.spec 
Log Message:
- Add whitespace to F10,F11, EL5



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/cpptasks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cpptasks.spec	3 Sep 2009 13:40:25 -0000	1.5
+++ cpptasks.spec	6 Sep 2009 12:57:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -34,7 +34,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}>=%{version}-%{release}
+Requires:	%{name} >= %{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-5
+- Req needs whitespace
+
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
 - tag bump
 



From mycae at fedoraproject.org  Sun Sep  6 12:57:49 2009
From: mycae at fedoraproject.org (mycae)
Date: Sun,  6 Sep 2009 12:57:49 +0000 (UTC)
Subject: rpms/cpptasks/F-11 cpptasks.spec,1.2,1.3
Message-ID: <20090906125749.C804A11C00E5@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21092/F-11

Modified Files:
	cpptasks.spec 
Log Message:
- Add whitespace to F10,F11, EL5



Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-11/cpptasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cpptasks.spec	3 Sep 2009 13:33:00 -0000	1.2
+++ cpptasks.spec	6 Sep 2009 12:57:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -34,7 +34,7 @@ MIDL and Windows Resource files.
 %package        javadoc
 Summary:	Javadoc for %{name}
 Group:		Documentation
-Requires:	%{name}>=%{version}-%{release}
+Requires:	%{name} >= %{version}-%{release}
 Requires:	jpackage-utils
 
 %description	javadoc
@@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sun Sep 06 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
+- Add whitespace to Req
+
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove excess BR
 - Fix subpackage dep



From heffer at fedoraproject.org  Sun Sep  6 13:04:59 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun,  6 Sep 2009 13:04:59 +0000 (UTC)
Subject: rpms/nforenum/F-10 import.log, NONE, 1.1 nforenum-gcc44.patch, NONE,
	1.1 nforenum.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090906130459.C48D711C00E5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/nforenum/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25268/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nforenum-gcc44.patch nforenum.spec 
Log Message:
initial import of nforenum



--- NEW FILE import.log ---
nforenum-3_4_7-0_2_r2184_fc11:F-10:nforenum-3.4.7-0.2.r2184.fc11.src.rpm:1252242269

nforenum-gcc44.patch:
 getopt.c   |    2 +-
 pseudo.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE nforenum-gcc44.patch ---
Index: pseudo.cpp
===================================================================
--- pseudo.cpp	(revision 2184)
+++ pseudo.cpp	(working copy)
@@ -23,6 +23,7 @@
 #include<iostream>
 #include<iomanip>
 #include<cstdarg>
+#include<fstream>
 
 /* If your compiler errors on the following line, boost is not
  * properly installed.
Index: getopt.c
===================================================================
--- getopt.c	(revision 2184)
+++ getopt.c	(working copy)
@@ -498,7 +498,7 @@
 
   {
     char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    const char *temp = my_index (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
     if (*nextchar == '\0')


--- NEW FILE nforenum.spec ---
Name:           nforenum
Version:        3.4.7
Release:        0.2.r2184%{?dist}
Summary:        A format correcter and linter for the NFO language
Group:          Development/Tools
License:        GPLv2+
URL:            http://users.tt-forums.net/dalestan/nforenum/
# svn export -r2184 svn://svn.ttdpatch.net/misc/nforenum/
# tar --xz -cf nforenum-r2184.tar.xz nforenum
Source0:        nforenum-r2184.tar.xz
# fix some header includes and a const char* cast
Patch0:         nforenum-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  boost-devel


%description
nforenum takes as input any number of files that contain something that vaguely
resembles valid NFO, and produces, to the best of its ability, encodable NFO
files, one for each input file.
It also detects and warns about some common mistakes made in NFO coding. All
errors that will cause TTDPatch to reject the GRF during the initialization or
activation phases should be detected; if any are not, it is a bug and should be
reported as such.
Sprites that are too short, not of the correct type (real/pseudo/&c.), too
long, or otherwise not in agreement with their data or the preceeding sprites
are all detected. 

%prep
%setup -q -n %{name}
%patch0 -p0 -b .fedora

for f in doc/COMMANDS.en.txt; do
  iconv -f iso8859-1 -t utf-8 $f >$f.conv 
  touch -r $f $f.conv
  mv $f.conv $f
done


%build
V=1 CFLAGAPP="%{optflags}" make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -D -m 755 renum %{buildroot}%{_bindir}/nforenum


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt COPYING.txt TODO.txt
%doc doc/
%{_bindir}/*


%changelog
* Sun Sep 06 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.2.r2184
- incorporated changes as suggested in #519118

* Mon Aug 24 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.1.r2184
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:13:14 -0000	1.1
+++ .cvsignore	6 Sep 2009 13:04:59 -0000	1.2
@@ -0,0 +1 @@
+nforenum-r2184.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:13:14 -0000	1.1
+++ sources	6 Sep 2009 13:04:59 -0000	1.2
@@ -0,0 +1 @@
+d0b4614ba67556e1e7d8240da6aa1a7a  nforenum-r2184.tar.xz



From heffer at fedoraproject.org  Sun Sep  6 13:06:53 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun,  6 Sep 2009 13:06:53 +0000 (UTC)
Subject: rpms/nforenum/F-11 import.log, NONE, 1.1 nforenum-gcc44.patch, NONE,
	1.1 nforenum.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090906130653.5155111C00E5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/nforenum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25829/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nforenum-gcc44.patch nforenum.spec 
Log Message:
initial import of nforenum



--- NEW FILE import.log ---
nforenum-3_4_7-0_2_r2184_fc11:F-11:nforenum-3.4.7-0.2.r2184.fc11.src.rpm:1252242343

nforenum-gcc44.patch:
 getopt.c   |    2 +-
 pseudo.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE nforenum-gcc44.patch ---
Index: pseudo.cpp
===================================================================
--- pseudo.cpp	(revision 2184)
+++ pseudo.cpp	(working copy)
@@ -23,6 +23,7 @@
 #include<iostream>
 #include<iomanip>
 #include<cstdarg>
+#include<fstream>
 
 /* If your compiler errors on the following line, boost is not
  * properly installed.
Index: getopt.c
===================================================================
--- getopt.c	(revision 2184)
+++ getopt.c	(working copy)
@@ -498,7 +498,7 @@
 
   {
     char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    const char *temp = my_index (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
     if (*nextchar == '\0')


--- NEW FILE nforenum.spec ---
Name:           nforenum
Version:        3.4.7
Release:        0.2.r2184%{?dist}
Summary:        A format correcter and linter for the NFO language
Group:          Development/Tools
License:        GPLv2+
URL:            http://users.tt-forums.net/dalestan/nforenum/
# svn export -r2184 svn://svn.ttdpatch.net/misc/nforenum/
# tar --xz -cf nforenum-r2184.tar.xz nforenum
Source0:        nforenum-r2184.tar.xz
# fix some header includes and a const char* cast
Patch0:         nforenum-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  boost-devel


%description
nforenum takes as input any number of files that contain something that vaguely
resembles valid NFO, and produces, to the best of its ability, encodable NFO
files, one for each input file.
It also detects and warns about some common mistakes made in NFO coding. All
errors that will cause TTDPatch to reject the GRF during the initialization or
activation phases should be detected; if any are not, it is a bug and should be
reported as such.
Sprites that are too short, not of the correct type (real/pseudo/&c.), too
long, or otherwise not in agreement with their data or the preceeding sprites
are all detected. 

%prep
%setup -q -n %{name}
%patch0 -p0 -b .fedora

for f in doc/COMMANDS.en.txt; do
  iconv -f iso8859-1 -t utf-8 $f >$f.conv 
  touch -r $f $f.conv
  mv $f.conv $f
done


%build
V=1 CFLAGAPP="%{optflags}" make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -D -m 755 renum %{buildroot}%{_bindir}/nforenum


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt COPYING.txt TODO.txt
%doc doc/
%{_bindir}/*


%changelog
* Sun Sep 06 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.2.r2184
- incorporated changes as suggested in #519118

* Mon Aug 24 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.1.r2184
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:13:14 -0000	1.1
+++ .cvsignore	6 Sep 2009 13:06:53 -0000	1.2
@@ -0,0 +1 @@
+nforenum-r2184.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:13:14 -0000	1.1
+++ sources	6 Sep 2009 13:06:53 -0000	1.2
@@ -0,0 +1 @@
+d0b4614ba67556e1e7d8240da6aa1a7a  nforenum-r2184.tar.xz



From heffer at fedoraproject.org  Sun Sep  6 13:12:26 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun,  6 Sep 2009 13:12:26 +0000 (UTC)
Subject: rpms/nforenum/devel import.log, NONE, 1.1 nforenum-gcc44.patch, NONE,
	1.1 nforenum.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090906131226.6EDBA11C00E5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/nforenum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27710/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nforenum-gcc44.patch nforenum.spec 
Log Message:
initial import of nforenum



--- NEW FILE import.log ---
nforenum-3_4_7-0_2_r2184_fc11:HEAD:nforenum-3.4.7-0.2.r2184.fc11.src.rpm:1252242507

nforenum-gcc44.patch:
 getopt.c   |    2 +-
 pseudo.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE nforenum-gcc44.patch ---
Index: pseudo.cpp
===================================================================
--- pseudo.cpp	(revision 2184)
+++ pseudo.cpp	(working copy)
@@ -23,6 +23,7 @@
 #include<iostream>
 #include<iomanip>
 #include<cstdarg>
+#include<fstream>
 
 /* If your compiler errors on the following line, boost is not
  * properly installed.
Index: getopt.c
===================================================================
--- getopt.c	(revision 2184)
+++ getopt.c	(working copy)
@@ -498,7 +498,7 @@
 
   {
     char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    const char *temp = my_index (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
     if (*nextchar == '\0')


--- NEW FILE nforenum.spec ---
Name:           nforenum
Version:        3.4.7
Release:        0.2.r2184%{?dist}
Summary:        A format correcter and linter for the NFO language
Group:          Development/Tools
License:        GPLv2+
URL:            http://users.tt-forums.net/dalestan/nforenum/
# svn export -r2184 svn://svn.ttdpatch.net/misc/nforenum/
# tar --xz -cf nforenum-r2184.tar.xz nforenum
Source0:        nforenum-r2184.tar.xz
# fix some header includes and a const char* cast
Patch0:         nforenum-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  boost-devel


%description
nforenum takes as input any number of files that contain something that vaguely
resembles valid NFO, and produces, to the best of its ability, encodable NFO
files, one for each input file.
It also detects and warns about some common mistakes made in NFO coding. All
errors that will cause TTDPatch to reject the GRF during the initialization or
activation phases should be detected; if any are not, it is a bug and should be
reported as such.
Sprites that are too short, not of the correct type (real/pseudo/&c.), too
long, or otherwise not in agreement with their data or the preceeding sprites
are all detected. 

%prep
%setup -q -n %{name}
%patch0 -p0 -b .fedora

for f in doc/COMMANDS.en.txt; do
  iconv -f iso8859-1 -t utf-8 $f >$f.conv 
  touch -r $f $f.conv
  mv $f.conv $f
done


%build
V=1 CFLAGAPP="%{optflags}" make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -D -m 755 renum %{buildroot}%{_bindir}/nforenum


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt COPYING.txt TODO.txt
%doc doc/
%{_bindir}/*


%changelog
* Sun Sep 06 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.2.r2184
- incorporated changes as suggested in #519118

* Mon Aug 24 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.1.r2184
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:13:14 -0000	1.1
+++ .cvsignore	6 Sep 2009 13:12:26 -0000	1.2
@@ -0,0 +1 @@
+nforenum-r2184.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:13:14 -0000	1.1
+++ sources	6 Sep 2009 13:12:26 -0000	1.2
@@ -0,0 +1 @@
+d0b4614ba67556e1e7d8240da6aa1a7a  nforenum-r2184.tar.xz



From markmc at fedoraproject.org  Sun Sep  6 13:46:21 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun,  6 Sep 2009 13:46:21 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.45, 1.46 libvirt.spec, 1.173,
	1.174 sources, 1.46,
	1.47 libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch,
	1.2, NONE libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch,
	1.2, NONE libvirt-0.7.0-numa-ignore-fail.patch, 1.2,
	NONE libvirt-0.7.0-policy-kit-rewrite.patch, 1.2,
	NONE libvirt-add-pci-hostdev-hotplug-support.patch, 1.1,
	NONE libvirt-add-space-to-nodedev-list-tree.patch, 1.1,
	NONE libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch,
	1.1, NONE libvirt-allow-pm-reset-on-multi-function-pci-devices.patch, 
	1.1, NONE libvirt-fix-device-list-update-after-detach.patch, 1.1,
	NONE libvirt-fix-migration-completion-with-newer-qemu.patch, 1.1,
	NONE libvirt-improve-pci-hostdev-reset-error-message.patch, 1.1,
	NONE libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch,
	1.1, NONE
Message-ID: <20090906134621.5976911C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7401

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch 
	libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch 
	libvirt-0.7.0-numa-ignore-fail.patch 
	libvirt-0.7.0-policy-kit-rewrite.patch 
	libvirt-add-pci-hostdev-hotplug-support.patch 
	libvirt-add-space-to-nodedev-list-tree.patch 
	libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch 
	libvirt-allow-pm-reset-on-multi-function-pci-devices.patch 
	libvirt-fix-device-list-update-after-detach.patch 
	libvirt-fix-migration-completion-with-newer-qemu.patch 
	libvirt-improve-pci-hostdev-reset-error-message.patch 
	libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch 
Log Message:
* Sun Sep  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.1.gitg3ef2e05
- Update to pre-release git snapshot of 0.7.1
- Drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	5 Aug 2009 15:24:45 -0000	1.45
+++ .cvsignore	6 Sep 2009 13:46:19 -0000	1.46
@@ -3,12 +3,3 @@
 i686
 x86_64
 libvirt-*.tar.gz
-libvirt-0.6.0.tar.gz
-libvirt-0.6.1.tar.gz
-libvirt-0.6.2.tar.gz
-libvirt-0.6.3.tar.gz
-libvirt-0.6.4.tar.gz
-libvirt-0.6.5.tar.gz
-libvirt-0.7.0-0.1.gitf055724.tar.gz
-libvirt-0.7.0-0.6.gite195b43.tar.gz
-libvirt-0.7.0.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- libvirt.spec	21 Aug 2009 10:19:53 -0000	1.173
+++ libvirt.spec	6 Sep 2009 13:46:19 -0000	1.174
@@ -12,6 +12,7 @@
 %define with_libvirtd      0%{!?_without_libvirtd:1}
 %define with_uml           0%{!?_without_uml:1}
 %define with_one           0%{!?_without_one:1}
+%define with_phyp          0%{!?_without_phyp:1}
 %define with_network       0%{!?_without_network:1}
 %define with_storage_fs    0%{!?_without_storage_fs:1}
 %define with_storage_lvm   0%{!?_without_storage_lvm:1}
@@ -24,9 +25,6 @@
 %define with_capng         0%{!?_without_capng:0}
 %define with_netcf         0%{!?_without_netcf:0}
 
-# default to off
-%define with_phyp          0%{!?_without_phyp:0}
-
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i586 i686 x86_64 ia64
 %define with_xen 0
@@ -74,55 +72,19 @@
 %define with_one    0
 %endif
 
+%define git_snapshot git3ef2e05
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.7.0
-Release: 6%{?dist}%{?extra_release}
+Version: 0.7.1
+Release: 0.1.%{git_snapshot}%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
-
-# Make sure qemu can access kernel/initrd (bug #516034)
-Patch01: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
-
-# Don't fail to start network if ipv6 modules is not loaded (bug #516497)
-Patch02: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
-
-# Policykit rewrite (bug #499970)
-# NB remove autoreconf hack & extra BRs when this goes away
-Patch03: libvirt-0.7.0-policy-kit-rewrite.patch
-
-# Log and ignore NUMA topology problems (rhbz #506590)
-Patch04: libvirt-0.7.0-numa-ignore-fail.patch
-
-# Minor 'virsh nodedev-list --tree' annoyance, fix from upstream
-Patch05: libvirt-add-space-to-nodedev-list-tree.patch
-
-# Fixes list corruption after disk hot-unplug
-Patch06: libvirt-fix-device-list-update-after-detach.patch
-
-# Re-attach PCI host devices after guest shuts down (bug #499561)
-Patch07: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
-
-# Allow PM reset on multi-function PCI devices (bug #515689)
-Patch08: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
-
-# Fix stupid PCI reset error message (#499678)
-Patch09: libvirt-improve-pci-hostdev-reset-error-message.patch
-
-# Allow PCI bus reset to reset other devices (#499678)
-Patch10: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
-
-# Add PCI host device hotplug support
-Patch11: libvirt-add-pci-hostdev-hotplug-support.patch
-
-# Fix migration completion with newer versions of qemu (#516187)
-Patch12: libvirt-fix-migration-completion-with-newer-qemu.patch
+Source: http://libvirt.org/sources/libvirt-%{version}-%{git_snapshot}.tar.gz
 
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
-Patch200: libvirt-0.6.4-svirt-sound.patch
+Patch00: libvirt-0.6.4-svirt-sound.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -150,8 +112,10 @@ BuildRequires: util-linux
 BuildRequires: nfs-utils
 Requires: nfs-utils
 # For glusterfs
+%if 0%{?fedora} >= 11
 Requires: glusterfs-client >= 2.0.1
 %endif
+%endif
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -236,7 +200,7 @@ BuildRequires: numactl-devel
 BuildRequires: libcap-ng-devel >= 0.5.0
 %endif
 %if %{with_phyp}
-BuildRequires: libssh-devel >= 0.3.1
+BuildRequires: libssh2-devel
 %endif
 %if %{with_netcf}
 BuildRequires: netcf-devel
@@ -245,9 +209,6 @@ BuildRequires: netcf-devel
 # Fedora build root suckage
 BuildRequires: gawk
 
-# Temp hack for patch 3
-BuildRequires: libtool autoconf automake gettext cvs
-
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -301,20 +262,7 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-
-%patch200 -p1
+%patch00 -p1
 
 %build
 %if ! %{with_xen}
@@ -405,9 +353,6 @@ of recent versions of Linux (and other O
 %define _without_netcf --without-netcf
 %endif
 
-# Temp hack for patch 3
-autoreconf -if
-
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -566,7 +511,7 @@ fi
 %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
-%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/run/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
 %dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
 %dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
 %endif
@@ -644,6 +589,8 @@ fi
 %{_datadir}/libvirt/schemas/nodedev.rng
 %{_datadir}/libvirt/schemas/capability.rng
 %{_datadir}/libvirt/schemas/interface.rng
+%{_datadir}/libvirt/schemas/secret.rng
+%{_datadir}/libvirt/schemas/storageencryption.rng
 
 %if %{with_sasl}
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
@@ -681,6 +628,10 @@ fi
 %endif
 
 %changelog
+* Sun Sep  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.1.gitg3ef2e05
+- Update to pre-release git snapshot of 0.7.1
+- Drop upstreamed patches
+
 * Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-6
 - Fix migration completion with newer versions of qemu (#516187)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	5 Aug 2009 15:24:45 -0000	1.46
+++ sources	6 Sep 2009 13:46:19 -0000	1.47
@@ -1 +1 @@
-8c2c14a7695c9c661004bcfc6468d62d  libvirt-0.7.0.tar.gz
+d47a8065f71e68d60ff020ba9b370801  libvirt-0.7.1-git3ef2e05.tar.gz


--- libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch DELETED ---


--- libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch DELETED ---


--- libvirt-0.7.0-numa-ignore-fail.patch DELETED ---


--- libvirt-0.7.0-policy-kit-rewrite.patch DELETED ---


--- libvirt-add-pci-hostdev-hotplug-support.patch DELETED ---


--- libvirt-add-space-to-nodedev-list-tree.patch DELETED ---


--- libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch DELETED ---


--- libvirt-allow-pm-reset-on-multi-function-pci-devices.patch DELETED ---


--- libvirt-fix-device-list-update-after-detach.patch DELETED ---


--- libvirt-fix-migration-completion-with-newer-qemu.patch DELETED ---


--- libvirt-improve-pci-hostdev-reset-error-message.patch DELETED ---


--- libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch DELETED ---



From ruben at fedoraproject.org  Sun Sep  6 14:32:10 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Sun,  6 Sep 2009 14:32:10 +0000 (UTC)
Subject: rpms/rsnapshot/devel rsnapshot-fix-include-conf.patch, NONE,
	1.1 rsnapshot.spec, 1.15, 1.16
Message-ID: <20090906143210.D7E0B11C00E5@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/rsnapshot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25319

Modified Files:
	rsnapshot.spec 
Added Files:
	rsnapshot-fix-include-conf.patch 
Log Message:
* Sun Sep 06 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.3.1-4
- The include_conf directive doesn't handle backticks as documented.
  This is already fixed upstream in cvs but not in a release yet.


rsnapshot-fix-include-conf.patch:
 rsnapshot-program.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rsnapshot-fix-include-conf.patch ---
diff -up rsnapshot-1.3.1/rsnapshot-program.pl.orig rsnapshot-1.3.1/rsnapshot-program.pl
--- rsnapshot-1.3.1/rsnapshot-program.pl.orig	2009-09-06 16:28:38.000000000 +0200
+++ rsnapshot-1.3.1/rsnapshot-program.pl	2009-09-06 16:27:51.000000000 +0200
@@ -504,8 +504,8 @@ sub parse_config_file {
 	# open the config file
 	my $config_file = shift() || $config_file;
 	my $CONFIG;
-	if($config_file =~ /^`.*`$/) {
-	    open($CONFIG, "$config_file|") ||
+	if($config_file =~ /^`(.*)`$/) {
+	    open($CONFIG, "$1|") ||
 	        bail("Couldn't execute \"$config_file\" to get config information\nAre you sure you have permission?");
 	} else {
 	    $CONFIG = IO::File->new($config_file)


Index: rsnapshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/rsnapshot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rsnapshot.spec	27 Jul 2009 03:16:00 -0000	1.15
+++ rsnapshot.spec	6 Sep 2009 14:32:09 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           rsnapshot
 Version:        1.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Local and remote filesystem snapshot utility
 Group:          Applications/System
 License:        GPLv2+
@@ -17,6 +17,7 @@ BuildArch:      noarch
 # This patch enables a few defaults in the config file that make sense to have
 # enabled in linux.
 Patch0:         rsnapshot.conf.patch
+Patch1:		rsnapshot-fix-include-conf.patch
 BuildRequires:  rsync
 BuildRequires:  openssh-clients
 Requires:       openssh-clients
@@ -29,6 +30,7 @@ filesystems.  It uses hard links to save
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 # Disable the config-file testing during configure because it freaks out if
 # you're building as non-root on a system that actually has rsnapshot installed.
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 06 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.3.1-4
+- The include_conf directive doesn't handle backticks as documented.
+  This is already fixed upstream in cvs but not in a release yet.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mathstuf at fedoraproject.org  Sun Sep  6 14:44:49 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun,  6 Sep 2009 14:44:49 +0000 (UTC)
Subject: rpms/bilbo/devel .cvsignore, 1.2, 1.3 bilbo.spec, 1.1, 1.2 sources, 
	1.2, 1.3 bilbo-0.9-license-headers.patch, 1.1,
	NONE bilbo-0.9-licenses.patch, 1.1,
	NONE bilbo-0.9-localdeletion.patch, 1.1,
	NONE bilbo-0.9-postdate-utc.patch, 1.1, NONE
Message-ID: <20090906144449.E9C0211C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/bilbo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30218

Modified Files:
	.cvsignore bilbo.spec sources 
Removed Files:
	bilbo-0.9-license-headers.patch bilbo-0.9-licenses.patch 
	bilbo-0.9-localdeletion.patch bilbo-0.9-postdate-utc.patch 
Log Message:
Update to 1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Aug 2009 22:10:48 -0000	1.2
+++ .cvsignore	6 Sep 2009 14:44:47 -0000	1.3
@@ -1 +1 @@
-bilbo-0.9.tar.gz
+bilbo-1.0-src.tar.gz


Index: bilbo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/devel/bilbo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bilbo.spec	28 Aug 2009 22:10:48 -0000	1.1
+++ bilbo.spec	6 Sep 2009 14:44:48 -0000	1.2
@@ -1,19 +1,14 @@
 Name:           bilbo
-Version:        0.9
-Release:        3%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Blogging client, focused on simplicity and usability
 
 Group:          Applications/Internet
 License:        GPLv3+ and LGPLv2+
 URL:            http://bilbo.gnufolks.org/
-Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9/bilbo-0.9.tar.gz
-#Beta version
-#Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9.951.0Beta1/bilbo-0.9.95.tar.gz
-#Backported patch
-Patch200:       bilbo-0.9-localdeletion.patch
-Patch201:       bilbo-0.9-licenses.patch
-Patch202:       bilbo-0.9-license-headers.patch
-Patch203:       bilbo-0.9-postdate-utc.patch
+# Real URL
+# http://www.ohloh.net/p/bilbo/download?filename=bilbo-1.0-src.tar.gz
+Source0:        http://d10xg45o6p6dbl.cloudfront.net/projects/b/bilbo/bilbo-1.0-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel
@@ -28,11 +23,7 @@ GData with WYSIWYG and HTML editing avai
 
 
 %prep
-%setup -q
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
+%setup -q -n %{name}
 
 %build
 mkdir %{_target_platform}
@@ -74,10 +65,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS bilbo/COPYING.GPL3 bilbokblog/COPYING.LGPL
+%doc AUTHORS CHANGELOG bilbo/COPYING.GPL3 bilbokblog/COPYING.LGPL README
 %{_kde4_bindir}/bilbo
 %{_kde4_libdir}/libbilbokblog.so.4
-%{_kde4_libdir}/libbilbokblog.so.4.2.1
+%{_kde4_libdir}/libbilbokblog.so.4.2.2
 %{_kde4_datadir}/applications/kde4/bilbo.desktop
 %{_kde4_configdir}.kcfg/bilbo.kcfg
 %{_kde4_iconsdir}/hicolor/*/*/*.png
@@ -85,6 +76,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 06 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-1
+- Update to 1.0
+
 * Thu Aug 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-3
 - Add icon cache snippets
 - Backport licensing fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Aug 2009 22:10:48 -0000	1.2
+++ sources	6 Sep 2009 14:44:48 -0000	1.3
@@ -1 +1 @@
-396da4f5fc1d91d692eefaf8e9871795  bilbo-0.9.tar.gz
+dcbb7e8392d13bebe94cd6405b2c86a9  bilbo-1.0-src.tar.gz


--- bilbo-0.9-license-headers.patch DELETED ---


--- bilbo-0.9-licenses.patch DELETED ---


--- bilbo-0.9-localdeletion.patch DELETED ---


--- bilbo-0.9-postdate-utc.patch DELETED ---



From mathstuf at fedoraproject.org  Sun Sep  6 15:01:19 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun,  6 Sep 2009 15:01:19 +0000 (UTC)
Subject: rpms/trac-accountmanager-plugin/devel pull-from-svn.sh, NONE,
	1.1 replace-MessageWrapper-with-genshi-markup.patch, NONE,
	1.1 trac-accountmanager-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090906150119.779BD11C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/trac-accountmanager-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1573

Modified Files:
	.cvsignore sources 
Added Files:
	pull-from-svn.sh 
	replace-MessageWrapper-with-genshi-markup.patch 
	trac-accountmanager-plugin.spec 
Log Message:
Initial build


--- NEW FILE pull-from-svn.sh ---
#!/bin/bash

# Source for trac-accountmanager-plugin comes from SVN repository at trac-hacks.org
site=http://trac-hacks.org/
repo=svn/accountmanagerplugin
tarname=TracAccountManager

# Specify the branch and revision we're after, plus the version upstream calls itself
branch=0.11
svnrel=5836
version=0.2.1

# Pull the desired version from svn
svn checkout -r ${svnrel} ${site}${repo}/${branch} ${tarname}-${version}

# Make timestamps be that of last upstream change
find ${tarname}-${version} -name .svn -prune -o -print |
while read pathname
do
	timestamp=$(svn info ${pathname} | awk '/^Last Changed Date:/ { print $4 " " $5 " " $6 }')
	touch --date="${timestamp}" ${pathname}
done

# Make a tarball
cd ${tarname}-${version}
python setup.py sdist --formats bztar
cd -
mv ${tarname}-${version}/dist/${tarname}-${version}dev-r${svnrel}.tar.bz2 .

# Display checkout status
svn info ${tarname}-${version} | grep "Last Changed"

# Remove the svn checkout
rm -rf ${tarname}-${version}

replace-MessageWrapper-with-genshi-markup.patch:
 web_ui.py |   19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

--- NEW FILE replace-MessageWrapper-with-genshi-markup.patch ---
Index: /accountmanagerplugin/trunk/acct_mgr/web_ui.py
===================================================================
--- /accountmanagerplugin/trunk/acct_mgr/web_ui.py (revision 4638)
+++ /accountmanagerplugin/trunk/acct_mgr/web_ui.py (revision 5478)
@@ -25,4 +25,5 @@
 from trac.web import chrome
 from trac.web.chrome import INavigationContributor, ITemplateProvider
+from genshi.core import Markup
 from genshi.builder import tag
 
@@ -236,5 +237,5 @@
                     del(req.session['force_change_passwd'])
                     req.session.save()
-                    chrome.add_notice(req, MessageWrapper(tag(
+                    chrome.add_notice(req, Markup(tag(
                         "Thank you for taking the time to update your password."
                     )))
@@ -245,5 +246,5 @@
                 data.update({'error': 'Invalid action'})
         if force_change_password:
-            chrome.add_warning(req, MessageWrapper(tag(
+            chrome.add_warning(req, Markup(tag(
                 "You are required to change password because of a recent "
                 "password change request. ",
@@ -500,14 +501,4 @@
 
 
-class MessageWrapper(object):
-    """Wrapper for add_warning and add_notice to work around the requirement
-    for a % operator."""
-    def __init__(self, body):
-        self.body = body
-
-    def __mod__(self, rhs):
-        return self.body
-
-
 class EmailVerificationNotification(SingleUserNofification):
     template_name = 'verify_email.txt'
@@ -542,5 +533,5 @@
             return handler
         if handler is not self and 'email_verification_token' in req.session:
-            chrome.add_warning(req, MessageWrapper(tag.span(
+            chrome.add_warning(req, Markup(tag.span(
                     'Your permissions have been limited until you ',
                     tag.a(href=req.href.verify_email())(
@@ -559,5 +550,5 @@
             req.session['email_verification_sent_to'] = req.session.get('email')
             self._send_email(req)
-            chrome.add_notice(req, MessageWrapper(tag.span(
+            chrome.add_notice(req, Markup(tag.span(
                     'An email has been sent to ', req.session['email'],
                     ' with a token to ',


--- NEW FILE trac-accountmanager-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define svnrev 5836

Name:           trac-accountmanager-plugin
Version:        0.2.1
Release:        0.3.20090522svn%{svnrev}%{?dist}
Summary:        Trac plugin for account registration and management

Group:          Applications/Internet
License:        Copyright only
URL:            http://trac-hacks.org/wiki/AccountManagerPlugin
Source0:        TracAccountManager-%{version}dev-r%{svnrev}.tar.bz2
Source1:        pull-from-svn.sh
# http://trac-hacks.org/changeset/5478?format=diff
Patch0:         replace-MessageWrapper-with-genshi-markup.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       trac >= 0.11
Requires:       python-setuptools

%description
The AccountManagerPlugin offers several features for managing user accounts:
 * allow users to register new accounts
 * login via an HTML form instead of using HTTP authentication
 * allow existing users to change their passwords or delete their accounts
 * send a new password to users who've forgotten their password
 * administer user accounts using the trac web interface


%prep
%setup -n TracAccountManager-%{version}dev-r%{svnrev} -q
# Upstream trunk patch for http://trac-hacks.org/ticket/4125
# (broken email verification in trac 0.11.4)
%patch0 -p3


%build
%{__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 README contrib/sessionstore_convert.py
%{python_sitelib}/*


%changelog
* Fri Aug 28 2009 Ben Boeckel <MathStuf at gmail.com> - 0.2.1-0.3.20090522svn5836
- Remove comments
- Fix tarball

* Thu Aug 27 2009 Ben Boeckel <MathStuf at gmail.com> - 0.2.1-0.2.20090522svn5836
- Merge spec with Paul Howarth's

* Thu Aug 06 2009 Ben Boeckel <MathStuf at gmail.com> - 0.2.1-0.1.20090522svn5836
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-accountmanager-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:16:07 -0000	1.1
+++ .cvsignore	6 Sep 2009 15:01:18 -0000	1.2
@@ -0,0 +1 @@
+TracAccountManager-0.2.1dev-r5836.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-accountmanager-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:16:07 -0000	1.1
+++ sources	6 Sep 2009 15:01:18 -0000	1.2
@@ -0,0 +1 @@
+b0518641a63bd3ece9b51ca8f84e7089  TracAccountManager-0.2.1dev-r5836.tar.bz2



From mathstuf at fedoraproject.org  Sun Sep  6 15:06:43 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun,  6 Sep 2009 15:06:43 +0000 (UTC)
Subject: rpms/trac-accountmanager-plugin/F-11 pull-from-svn.sh, NONE,
	1.1 replace-MessageWrapper-with-genshi-markup.patch, NONE,
	1.1 trac-accountmanager-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090906150643.BDA6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/trac-accountmanager-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4126

Modified Files:
	.cvsignore sources 
Added Files:
	pull-from-svn.sh 
	replace-MessageWrapper-with-genshi-markup.patch 
	trac-accountmanager-plugin.spec 
Log Message:
Initial build


--- NEW FILE pull-from-svn.sh ---
#!/bin/bash

# Source for trac-accountmanager-plugin comes from SVN repository at trac-hacks.org
site=http://trac-hacks.org/
repo=svn/accountmanagerplugin
tarname=TracAccountManager

# Specify the branch and revision we're after, plus the version upstream calls itself
branch=0.11
svnrel=5836
version=0.2.1

# Pull the desired version from svn
svn checkout -r ${svnrel} ${site}${repo}/${branch} ${tarname}-${version}

# Make timestamps be that of last upstream change
find ${tarname}-${version} -name .svn -prune -o -print |
while read pathname
do
	timestamp=$(svn info ${pathname} | awk '/^Last Changed Date:/ { print $4 " " $5 " " $6 }')
	touch --date="${timestamp}" ${pathname}
done

# Make a tarball
cd ${tarname}-${version}
python setup.py sdist --formats bztar
cd -
mv ${tarname}-${version}/dist/${tarname}-${version}dev-r${svnrel}.tar.bz2 .

# Display checkout status
svn info ${tarname}-${version} | grep "Last Changed"

# Remove the svn checkout
rm -rf ${tarname}-${version}

replace-MessageWrapper-with-genshi-markup.patch:
 web_ui.py |   19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

--- NEW FILE replace-MessageWrapper-with-genshi-markup.patch ---
Index: /accountmanagerplugin/trunk/acct_mgr/web_ui.py
===================================================================
--- /accountmanagerplugin/trunk/acct_mgr/web_ui.py (revision 4638)
+++ /accountmanagerplugin/trunk/acct_mgr/web_ui.py (revision 5478)
@@ -25,4 +25,5 @@
 from trac.web import chrome
 from trac.web.chrome import INavigationContributor, ITemplateProvider
+from genshi.core import Markup
 from genshi.builder import tag
 
@@ -236,5 +237,5 @@
                     del(req.session['force_change_passwd'])
                     req.session.save()
-                    chrome.add_notice(req, MessageWrapper(tag(
+                    chrome.add_notice(req, Markup(tag(
                         "Thank you for taking the time to update your password."
                     )))
@@ -245,5 +246,5 @@
                 data.update({'error': 'Invalid action'})
         if force_change_password:
-            chrome.add_warning(req, MessageWrapper(tag(
+            chrome.add_warning(req, Markup(tag(
                 "You are required to change password because of a recent "
                 "password change request. ",
@@ -500,14 +501,4 @@
 
 
-class MessageWrapper(object):
-    """Wrapper for add_warning and add_notice to work around the requirement
-    for a % operator."""
-    def __init__(self, body):
-        self.body = body
-
-    def __mod__(self, rhs):
-        return self.body
-
-
 class EmailVerificationNotification(SingleUserNofification):
     template_name = 'verify_email.txt'
@@ -542,5 +533,5 @@
             return handler
         if handler is not self and 'email_verification_token' in req.session:
-            chrome.add_warning(req, MessageWrapper(tag.span(
+            chrome.add_warning(req, Markup(tag.span(
                     'Your permissions have been limited until you ',
                     tag.a(href=req.href.verify_email())(
@@ -559,5 +550,5 @@
             req.session['email_verification_sent_to'] = req.session.get('email')
             self._send_email(req)
-            chrome.add_notice(req, MessageWrapper(tag.span(
+            chrome.add_notice(req, Markup(tag.span(
                     'An email has been sent to ', req.session['email'],
                     ' with a token to ',


--- NEW FILE trac-accountmanager-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define svnrev 5836

Name:           trac-accountmanager-plugin
Version:        0.2.1
Release:        0.3.20090522svn%{svnrev}%{?dist}
Summary:        Trac plugin for account registration and management

Group:          Applications/Internet
License:        Copyright only
URL:            http://trac-hacks.org/wiki/AccountManagerPlugin
Source0:        TracAccountManager-%{version}dev-r%{svnrev}.tar.bz2
Source1:        pull-from-svn.sh
# http://trac-hacks.org/changeset/5478?format=diff
Patch0:         replace-MessageWrapper-with-genshi-markup.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       trac >= 0.11
Requires:       python-setuptools

%description
The AccountManagerPlugin offers several features for managing user accounts:
 * allow users to register new accounts
 * login via an HTML form instead of using HTTP authentication
 * allow existing users to change their passwords or delete their accounts
 * send a new password to users who've forgotten their password
 * administer user accounts using the trac web interface


%prep
%setup -n TracAccountManager-%{version}dev-r%{svnrev} -q
# Upstream trunk patch for http://trac-hacks.org/ticket/4125
# (broken email verification in trac 0.11.4)
%patch0 -p3


%build
%{__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 README contrib/sessionstore_convert.py
%{python_sitelib}/*


%changelog
* Fri Aug 28 2009 Ben Boeckel <MathStuf at gmail.com> - 0.2.1-0.3.20090522svn5836
- Remove comments
- Fix tarball

* Thu Aug 27 2009 Ben Boeckel <MathStuf at gmail.com> - 0.2.1-0.2.20090522svn5836
- Merge spec with Paul Howarth's

* Thu Aug 06 2009 Ben Boeckel <MathStuf at gmail.com> - 0.2.1-0.1.20090522svn5836
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-accountmanager-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:16:07 -0000	1.1
+++ .cvsignore	6 Sep 2009 15:06:43 -0000	1.2
@@ -0,0 +1 @@
+TracAccountManager-0.2.1dev-r5836.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-accountmanager-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:16:07 -0000	1.1
+++ sources	6 Sep 2009 15:06:43 -0000	1.2
@@ -0,0 +1 @@
+b0518641a63bd3ece9b51ca8f84e7089  TracAccountManager-0.2.1dev-r5836.tar.bz2



From pbrobinson at fedoraproject.org  Sun Sep  6 15:32:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Sep 2009 15:32:09 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/devel .cvsignore, 1.4,
	1.5 moblin-gtk-engine.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090906153210.1D18B11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-gtk-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16453

Modified Files:
	.cvsignore moblin-gtk-engine.spec sources 
Log Message:
- New upstream 1.0.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Jul 2009 19:22:52 -0000	1.4
+++ .cvsignore	6 Sep 2009 15:32:08 -0000	1.5
@@ -1 +1 @@
-moblin-gtk-engine-0.4.1.tar.bz2
+moblin-gtk-engine-1.0.0.tar.bz2


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/moblin-gtk-engine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-gtk-engine.spec	13 Aug 2009 13:37:13 -0000	1.4
+++ moblin-gtk-engine.spec	6 Sep 2009 15:32:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           moblin-gtk-engine
-Version:        0.4.1
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GTK engine for Moblin
 
 Group:          User Interface/Desktops
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Moblin-Netbook/metacity-1
 
 %changelog
+* Sun Sep  6 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-1
+- New upstream 1.0.0 release
+
 * Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.1-2
 - Specifiy the Moblin rather than Mist icon theme
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Jul 2009 19:22:52 -0000	1.4
+++ sources	6 Sep 2009 15:32:08 -0000	1.5
@@ -1 +1 @@
-f846fcce0ce2ccc1f30d1e94451e569e  moblin-gtk-engine-0.4.1.tar.bz2
+ed20c17d5c896ebafc937afb4e3bdad0  moblin-gtk-engine-1.0.0.tar.bz2



From svahl at fedoraproject.org  Sun Sep  6 16:11:27 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sun,  6 Sep 2009 16:11:27 +0000 (UTC)
Subject: rpms/konq-plugins/F-10 .cvsignore, 1.10, 1.11 konq-plugins.spec,
	1.19, 1.20 sources, 1.13, 1.14
Message-ID: <20090906161127.94CF811C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24615/F-10

Modified Files:
	.cvsignore konq-plugins.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1
- use scriplet for HTML docdirs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Aug 2009 16:39:52 -0000	1.10
+++ .cvsignore	6 Sep 2009 16:11:27 -0000	1.11
@@ -1 +1 @@
-konq-plugins-4.3.0.tar.bz2
+konq-plugins-4.3.1.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/konq-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- konq-plugins.spec	11 Aug 2009 16:39:52 -0000	1.19
+++ konq-plugins.spec	6 Sep 2009 16:11:27 -0000	1.20
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
@@ -73,6 +73,16 @@ do
   cat $locale.lang >> %{name}.lang
 done
 
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
+  fi
+done
+fi
+
 
 %clean
 rm -rf %{buildroot}
@@ -107,26 +117,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
+%{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_docdir}/HTML/en/konq-plugins/
-%lang(ca) %{_kde4_docdir}/HTML/ca/konq-plugins/
-%lang(de) %{_kde4_docdir}/HTML/de/konq-plugins/
-%lang(et) %{_kde4_docdir}/HTML/et/konq-plugins/
-%lang(fr) %{_kde4_docdir}/HTML/fr/konq-plugins/
-%lang(it) %{_kde4_docdir}/HTML/it/konq-plugins/
-%lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins/
-%lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins/
-%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/konq-plugins/
-%lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins/
-%lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins/
-
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+- use scriplet for HTML docdirs
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
 * KDE 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Aug 2009 16:39:52 -0000	1.13
+++ sources	6 Sep 2009 16:11:27 -0000	1.14
@@ -1 +1 @@
-527d61a6774aee7c053c48b5842db4fb  konq-plugins-4.3.0.tar.bz2
+57ba2ab5e7c6bdad8d6ac7644b151b32  konq-plugins-4.3.1.tar.bz2



From svahl at fedoraproject.org  Sun Sep  6 16:11:27 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sun,  6 Sep 2009 16:11:27 +0000 (UTC)
Subject: rpms/konq-plugins/F-11 .cvsignore, 1.12, 1.13 konq-plugins.spec,
	1.29, 1.30 sources, 1.13, 1.14
Message-ID: <20090906161127.CA45F11C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24615/F-11

Modified Files:
	.cvsignore konq-plugins.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1
- use scriplet for HTML docdirs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Aug 2009 16:39:52 -0000	1.12
+++ .cvsignore	6 Sep 2009 16:11:27 -0000	1.13
@@ -1 +1 @@
-konq-plugins-4.3.0.tar.bz2
+konq-plugins-4.3.1.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-11/konq-plugins.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- konq-plugins.spec	11 Aug 2009 16:39:52 -0000	1.29
+++ konq-plugins.spec	6 Sep 2009 16:11:27 -0000	1.30
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
@@ -73,6 +73,16 @@ do
   cat $locale.lang >> %{name}.lang
 done
 
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
+  fi
+done
+fi
+
 
 %clean
 rm -rf %{buildroot}
@@ -107,26 +117,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
+%{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_docdir}/HTML/en/konq-plugins/
-%lang(ca) %{_kde4_docdir}/HTML/ca/konq-plugins/
-%lang(de) %{_kde4_docdir}/HTML/de/konq-plugins/
-%lang(et) %{_kde4_docdir}/HTML/et/konq-plugins/
-%lang(fr) %{_kde4_docdir}/HTML/fr/konq-plugins/
-%lang(it) %{_kde4_docdir}/HTML/it/konq-plugins/
-%lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins/
-%lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins/
-%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/konq-plugins/
-%lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins/
-%lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins/
-
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
+- 4.3.1
+- use scriplet for HTML docdirs
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
 * KDE 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Aug 2009 16:39:52 -0000	1.13
+++ sources	6 Sep 2009 16:11:27 -0000	1.14
@@ -1 +1 @@
-527d61a6774aee7c053c48b5842db4fb  konq-plugins-4.3.0.tar.bz2
+57ba2ab5e7c6bdad8d6ac7644b151b32  konq-plugins-4.3.1.tar.bz2



From svahl at fedoraproject.org  Sun Sep  6 16:45:37 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sun,  6 Sep 2009 16:45:37 +0000 (UTC)
Subject: rpms/kopete-cryptography/F-10 .cvsignore, 1.4,
	1.5 kopete-cryptography.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090906164537.E1E4011C00E5@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kopete-cryptography/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31528/F-10

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.3.0-13
- 1.3.0-kde4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Aug 2009 19:31:33 -0000	1.4
+++ .cvsignore	6 Sep 2009 16:45:37 -0000	1.5
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.3.0.tar.bz2
+kopete-cryptography-1.3.0-kde4.3.1.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-10/kopete-cryptography.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kopete-cryptography.spec	11 Aug 2009 19:31:33 -0000	1.6
+++ kopete-cryptography.spec	6 Sep 2009 16:45:37 -0000	1.7
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion 4.3.0
+%define kdeversion 4.3.1
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.3.0-13
+- 1.3.0-kde4.3.1
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.3.0-12
 - 1.3.0-kde4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Aug 2009 19:31:33 -0000	1.4
+++ sources	6 Sep 2009 16:45:37 -0000	1.5
@@ -1 +1 @@
-ea214f8749208130bde77a18814106bc  kopete-cryptography-1.3.0-kde4.3.0.tar.bz2
+609f72a0884941bbefcd331de7c9f939  kopete-cryptography-1.3.0-kde4.3.1.tar.bz2



From svahl at fedoraproject.org  Sun Sep  6 16:45:38 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sun,  6 Sep 2009 16:45:38 +0000 (UTC)
Subject: rpms/kopete-cryptography/F-11 .cvsignore, 1.5,
	1.6 kopete-cryptography.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090906164538.08C8711C0418@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kopete-cryptography/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31528/F-11

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.3.0-13
- 1.3.0-kde4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Aug 2009 19:31:33 -0000	1.5
+++ .cvsignore	6 Sep 2009 16:45:37 -0000	1.6
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.3.0.tar.bz2
+kopete-cryptography-1.3.0-kde4.3.1.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-11/kopete-cryptography.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kopete-cryptography.spec	11 Aug 2009 19:31:33 -0000	1.9
+++ kopete-cryptography.spec	6 Sep 2009 16:45:37 -0000	1.10
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion 4.3.0
+%define kdeversion 4.3.1
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.3.0-13
+- 1.3.0-kde4.3.1
+
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.3.0-12
 - 1.3.0-kde4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 19:31:33 -0000	1.5
+++ sources	6 Sep 2009 16:45:37 -0000	1.6
@@ -1 +1 @@
-ea214f8749208130bde77a18814106bc  kopete-cryptography-1.3.0-kde4.3.0.tar.bz2
+609f72a0884941bbefcd331de7c9f939  kopete-cryptography-1.3.0-kde4.3.1.tar.bz2



From bruno at fedoraproject.org  Sun Sep  6 16:48:48 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun,  6 Sep 2009 16:48:48 +0000 (UTC)
Subject: rpms/colossus/devel .cvsignore, 1.6, 1.7 colossus.spec, 1.8,
	1.9 import.log, 1.5, 1.6 sources, 1.6, 1.7 4495.patch, 1.3, NONE
Message-ID: <20090906164848.19D9C11C00E5@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32680/devel

Modified Files:
	.cvsignore colossus.spec import.log sources 
Removed Files:
	4495.patch 
Log Message:
Rebasing to 0.9.2.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Aug 2009 20:33:33 -0000	1.6
+++ .cvsignore	6 Sep 2009 16:48:47 -0000	1.7
@@ -1 +1 @@
-colossus-20090817-4489.tar.gz
+colossus-20090906-4519.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- colossus.spec	19 Aug 2009 06:47:15 -0000	1.8
+++ colossus.spec	6 Sep 2009 16:48:47 -0000	1.9
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4489
-%define         revdate    20090817
-Version:        0.9.1
-Release:        2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4519
+%define         revdate    20090906
+Version:        0.9.2
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,7 +20,6 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
-Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -65,7 +64,6 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
-%patch1
 
 %build
 
@@ -181,6 +179,19 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
+- Rebase to 0.9.2
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+- Fixed: 2835558 WARNING: Could not find creature with name none
+- Fixed: 2820231 Illegal rangestrike
+- Fixed: 2848651 and 2828028: Legion flyouts
+- Fixed: 2837746 Balrog variant: Caretaker counts not reset between games
+- Fixed: 2839241 Faulty anchor tags (Crossreference links in docs worked for Inetnet Explorer but not for Netscape)
+- Make loading and saving of Balrog games work
+- Make Auto Done act properly when there is no Recruit action or undo possible
+- Add in save game also a property that tells with which release / revision of Colossus that save game was created.
+- Eliminated some race situations in game startup (thread interaction/notifications)
+
 * Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
 - Fix for desert LOS bug
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	17 Aug 2009 20:33:33 -0000	1.5
+++ import.log	6 Sep 2009 16:48:47 -0000	1.6
@@ -3,3 +3,4 @@ colossus-0-0_4_20090725svn4454_fc11:HEAD
 colossus-0-0_5_20090726svn4462_fc11:HEAD:colossus-0-0.5.20090726svn4462.fc11.src.rpm:1248643266
 colossus-0_9_0-1_20090810svn4482_fc11:HEAD:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249966312
 colossus-0_9_1-1_20090817svn4489_fc11:HEAD:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541173
+colossus-0_9_2-1_20090906svn4519_fc11:HEAD:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255689


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Aug 2009 20:33:33 -0000	1.6
+++ sources	6 Sep 2009 16:48:47 -0000	1.7
@@ -1 +1 @@
-3f55310339968f1c885f89678c22c73c  colossus-20090817-4489.tar.gz
+29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz


--- 4495.patch DELETED ---



From bruno at fedoraproject.org  Sun Sep  6 16:49:49 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun,  6 Sep 2009 16:49:49 +0000 (UTC)
Subject: rpms/colossus/F-10 .cvsignore, 1.4, 1.5 colossus.spec, 1.5,
	1.6 import.log, 1.3, 1.4 sources, 1.4, 1.5 4495.patch, 1.1, NONE
Message-ID: <20090906164949.392FF11C00E5@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv823/F-10

Modified Files:
	.cvsignore colossus.spec import.log sources 
Removed Files:
	4495.patch 
Log Message:
Rebasing to 0.9.2.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 20:37:08 -0000	1.4
+++ .cvsignore	6 Sep 2009 16:49:48 -0000	1.5
@@ -1 +1 @@
-colossus-20090817-4489.tar.gz
+colossus-20090906-4519.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- colossus.spec	19 Aug 2009 08:15:20 -0000	1.5
+++ colossus.spec	6 Sep 2009 16:49:49 -0000	1.6
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4489
-%define         revdate    20090817
-Version:        0.9.1
-Release:        2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4519
+%define         revdate    20090906
+Version:        0.9.2
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,7 +20,6 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
-Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -65,7 +64,6 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
-%patch1
 
 %build
 
@@ -181,6 +179,19 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
+- Rebase to 0.9.2
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+- Fixed: 2835558 WARNING: Could not find creature with name none
+- Fixed: 2820231 Illegal rangestrike
+- Fixed: 2848651 and 2828028: Legion flyouts
+- Fixed: 2837746 Balrog variant: Caretaker counts not reset between games
+- Fixed: 2839241 Faulty anchor tags (Crossreference links in docs worked for Inetnet Explorer but not for Netscape)
+- Make loading and saving of Balrog games work
+- Make Auto Done act properly when there is no Recruit action or undo possible
+- Add in save game also a property that tells with which release / revision of Colossus that save game was created.
+- Eliminated some race situations in game startup (thread interaction/notifications)
+
 * Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
 - Fix for desert LOS bug
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	17 Aug 2009 20:37:08 -0000	1.3
+++ import.log	6 Sep 2009 16:49:49 -0000	1.4
@@ -1,3 +1,4 @@
 colossus-0-0_2_20090710svn4432_fc11:F-10:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247454273
 colossus-0_9_0-1_20090810svn4482_fc11:F-10:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249969651
 colossus-0_9_1-1_20090817svn4489_fc11:F-10:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541400
+colossus-0_9_2-1_20090906svn4519_fc11:F-10:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255765


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 20:37:08 -0000	1.4
+++ sources	6 Sep 2009 16:49:49 -0000	1.5
@@ -1 +1 @@
-3f55310339968f1c885f89678c22c73c  colossus-20090817-4489.tar.gz
+29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz


--- 4495.patch DELETED ---



From bruno at fedoraproject.org  Sun Sep  6 16:50:41 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun,  6 Sep 2009 16:50:41 +0000 (UTC)
Subject: rpms/colossus/F-11 .cvsignore, 1.4, 1.5 colossus.spec, 1.5,
	1.6 import.log, 1.3, 1.4 sources, 1.4, 1.5 4495.patch, 1.1, NONE
Message-ID: <20090906165041.E842311C043A@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1681/F-11

Modified Files:
	.cvsignore colossus.spec import.log sources 
Removed Files:
	4495.patch 
Log Message:
Rebasing to 0.9.2.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 20:36:03 -0000	1.4
+++ .cvsignore	6 Sep 2009 16:50:41 -0000	1.5
@@ -1 +1 @@
-colossus-20090817-4489.tar.gz
+colossus-20090906-4519.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- colossus.spec	19 Aug 2009 08:15:32 -0000	1.5
+++ colossus.spec	6 Sep 2009 16:50:41 -0000	1.6
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4489
-%define         revdate    20090817
-Version:        0.9.1
-Release:        2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4519
+%define         revdate    20090906
+Version:        0.9.2
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,7 +20,6 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
-Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -65,7 +64,6 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
-%patch1
 
 %build
 
@@ -181,6 +179,19 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
+- Rebase to 0.9.2
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+- Fixed: 2835558 WARNING: Could not find creature with name none
+- Fixed: 2820231 Illegal rangestrike
+- Fixed: 2848651 and 2828028: Legion flyouts
+- Fixed: 2837746 Balrog variant: Caretaker counts not reset between games
+- Fixed: 2839241 Faulty anchor tags (Crossreference links in docs worked for Inetnet Explorer but not for Netscape)
+- Make loading and saving of Balrog games work
+- Make Auto Done act properly when there is no Recruit action or undo possible
+- Add in save game also a property that tells with which release / revision of Colossus that save game was created.
+- Eliminated some race situations in game startup (thread interaction/notifications)
+
 * Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
 - Fix for desert LOS bug
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	17 Aug 2009 20:36:04 -0000	1.3
+++ import.log	6 Sep 2009 16:50:41 -0000	1.4
@@ -1,3 +1,4 @@
 colossus-0-0_2_20090710svn4432_fc11:F-11:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247454127
 colossus-0_9_0-1_20090810svn4482_fc11:F-11:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249969718
 colossus-0_9_1-1_20090817svn4489_fc11:F-11:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541304
+colossus-0_9_2-1_20090906svn4519_fc11:F-11:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255815


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 20:36:04 -0000	1.4
+++ sources	6 Sep 2009 16:50:41 -0000	1.5
@@ -1 +1 @@
-3f55310339968f1c885f89678c22c73c  colossus-20090817-4489.tar.gz
+29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz


--- 4495.patch DELETED ---



From vpv at fedoraproject.org  Sun Sep  6 17:22:02 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun,  6 Sep 2009 17:22:02 +0000 (UTC)
Subject: rpms/vdr-skinsoppalusikka/devel vdr-skinsoppalusikka.spec, 1.13,
	1.14
Message-ID: <20090906172202.ECF8D11C00E5@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10601

Modified Files:
	vdr-skinsoppalusikka.spec 
Log Message:
* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.4-3
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-skinsoppalusikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel/vdr-skinsoppalusikka.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vdr-skinsoppalusikka.spec	27 Jul 2009 06:46:53 -0000	1.13
+++ vdr-skinsoppalusikka.spec	6 Sep 2009 17:22:02 -0000	1.14
@@ -1,12 +1,12 @@
-%define pname     skinsoppalusikka
-%define vardir    %(vdr-config --vardir    2>/dev/null || echo ERROR)
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     skinsoppalusikka
+%global vardir    %(vdr-config --vardir    2>/dev/null || echo ERROR)
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 
 Name:           vdr-%{pname}
 Version:        1.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The "Soppalusikka" skin for VDR
 
 Group:          Applications/Multimedia
@@ -17,7 +17,11 @@ Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.6.0 gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
+
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
 
 %description
 The "Soppalusikka" is a standalone skin providing the good old "ElchiAIO"
@@ -62,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.4-3
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From vpv at fedoraproject.org  Sun Sep  6 17:24:33 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun,  6 Sep 2009 17:24:33 +0000 (UTC)
Subject: rpms/vdr-tvonscreen/devel vdr-tvonscreen.spec,1.6,1.7
Message-ID: <20090906172433.D5A1111C00E5@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/vdr-tvonscreen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11306

Modified Files:
	vdr-tvonscreen.spec 
Log Message:
* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0.141-7
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-tvonscreen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-tvonscreen/devel/vdr-tvonscreen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vdr-tvonscreen.spec	27 Jul 2009 06:48:11 -0000	1.6
+++ vdr-tvonscreen.spec	6 Sep 2009 17:24:33 -0000	1.7
@@ -1,11 +1,11 @@
-%define pname     tvonscreen
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     tvonscreen
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
 Version:        1.0.141
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enhanced EPG data viewer for VDR
 
 Group:          Applications/Multimedia
@@ -22,7 +22,11 @@ Patch2:         tvonscreen-1.0.141-i18n-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.6.0 gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
+
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
 
 %description
 This VDR plugin shows EPG data on VDR's OSD in a similar way as a TV
@@ -68,6 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0.141-7
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.141-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Sun Sep  6 17:26:48 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun,  6 Sep 2009 17:26:48 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.20,1.21
Message-ID: <20090906172648.1877B11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11966

Modified Files:
	nss-softokn.spec 
Log Message:
Fix syntax error in postun


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nss-softokn.spec	5 Sep 2009 21:38:08 -0000	1.20
+++ nss-softokn.spec	6 Sep 2009 17:26:47 -0000	1.21
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-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
@@ -240,7 +240,7 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-if [ $1 > 0 ] then;
+if [ $1 > 0 ]; then
   %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 fi
 exit 0
@@ -292,6 +292,9 @@ exit 0
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sun Sep 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
+- Fix syntax error in postun
+
 * Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
 - Remove symblic links to shared libraries from devel - 521155
 - Apply the nss-nolocalsql patch



From vpv at fedoraproject.org  Sun Sep  6 17:31:26 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun,  6 Sep 2009 17:31:26 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.15,1.16
Message-ID: <20090906173126.C015511C00E5@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13097

Modified Files:
	mozvoikko.spec 
Log Message:
* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-2
- Use global instead of define, except in gecko_ver as that might be used
  in the xulrunner rebuild scripts.



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mozvoikko.spec	10 Aug 2009 19:54:40 -0000	1.15
+++ mozvoikko.spec	6 Sep 2009 17:31:26 -0000	1.16
@@ -1,18 +1,18 @@
 # For the xulrunner unstable requires
 %define gecko_ver 1.9.1.2
 # These come from install.rdf
-%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-%define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
+%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+%global firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
 # These requires are hardcoded in the sources
-%define libvoikko libvoikko.so.1
-%define libmalaga libmalaga.so.7
+%global libvoikko libvoikko.so.1
+%global libmalaga libmalaga.so.7
 %ifarch x86_64 ppc64 ia64 sparc64 s390x
-%define mark64  ()(64bit)
+%global mark64  ()(64bit)
 %endif
 
 Name:           mozvoikko
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-2
+- Use global instead of define, except in gecko_ver as that might be used
+  in the xulrunner rebuild scripts.
+
 * Mon Aug 10 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-1
 - Update to 1.0.
 - Use "official" upstream source, the RC sources have been removed. 



From emaldonado at fedoraproject.org  Sun Sep  6 17:38:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun,  6 Sep 2009 17:38:59 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.21,1.22
Message-ID: <20090906173859.6ACCB11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14952

Modified Files:
	nss-softokn.spec 
Log Message:
Postuninstall scriptlet finishes quietly


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nss-softokn.spec	6 Sep 2009 17:26:47 -0000	1.21
+++ nss-softokn.spec	6 Sep 2009 17:38:59 -0000	1.22
@@ -240,10 +240,8 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-if [ $1 > 0 ]; then
-  %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
-fi
-exit 0
+[ $1 = 0 ] || exit 0
+%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 %files
 %defattr(-,root,root)
@@ -293,7 +291,7 @@ exit 0
 
 %changelog
 * Sun Sep 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
-- Fix syntax error in postun
+- Postuninstall scriptlet finishes quietly
 
 * Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
 - Remove symblic links to shared libraries from devel - 521155



From nim at fedoraproject.org  Sun Sep  6 17:53:56 2009
From: nim at fedoraproject.org (nim)
Date: Sun,  6 Sep 2009 17:53:56 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel adf-accanthis-fonts.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090906175356.424C611C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19316/devel

Modified Files:
	adf-accanthis-fonts.spec import.log sources 
Log Message:
upstream stealth update


Index: adf-accanthis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- adf-accanthis-fonts.spec	24 Jul 2009 16:35:17 -0000	1.2
+++ adf-accanthis-fonts.spec	6 Sep 2009 17:53:55 -0000	1.3
@@ -17,7 +17,7 @@ Accanthis is well suited to book typeset
 Name:      %{fontname}-fonts
 # Use the main PS version (as documented in NOTICE)
 Version:   1.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   A ?modernized? garaldic serif typeface, ?Galliard? alternative
 
 Group:     User Interface/X
@@ -126,7 +126,13 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
+* Sun Sep 06 2009 <nicolas.mailhot at laposte.net>
+- 1.6-4
+? Stealth upstream update
+
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+? 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jul 13 2009 <nicolas.mailhot at laposte.net>


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Jul 2009 18:18:05 -0000	1.1
+++ import.log	6 Sep 2009 17:53:56 -0000	1.2
@@ -1 +1,2 @@
 adf-accanthis-fonts-1_6-2_fc12:HEAD:adf-accanthis-fonts-1.6-2.fc12.src.rpm:1247768269
+adf-accanthis-fonts-1_6-4_fc12:HEAD:adf-accanthis-fonts-1.6-4.fc12.src.rpm:1252259605


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 18:18:05 -0000	1.2
+++ sources	6 Sep 2009 17:53:56 -0000	1.3
@@ -1,2 +1,2 @@
 67d95f1e596cccae209c40b67062757d  Accanthis-Cat.pdf
-8db8f207b4c8dc248d84f7f8af017e51  Accanthis-Std.zip
+b03ad3d0fb8b35a0694693d742c5fd12  Accanthis-Std.zip



From nim at fedoraproject.org  Sun Sep  6 18:01:08 2009
From: nim at fedoraproject.org (nim)
Date: Sun,  6 Sep 2009 18:01:08 +0000 (UTC)
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.53, 1.54 dejavu-fonts.spec,
	1.102, 1.103 import.log, 1.16, 1.17 sources, 1.53, 1.54
Message-ID: <20090906180108.3655111C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21326/devel

Modified Files:
	.cvsignore dejavu-fonts.spec import.log sources 
Log Message:
2.30


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	14 Mar 2009 19:05:29 -0000	1.53
+++ .cvsignore	6 Sep 2009 18:01:07 -0000	1.54
@@ -1 +1 @@
-dejavu-fonts-2.29.tar.bz2
+dejavu-fonts-2.30.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- dejavu-fonts.spec	24 Jul 2009 20:08:10 -0000	1.102
+++ dejavu-fonts.spec	6 Sep 2009 18:01:07 -0000	1.103
@@ -19,8 +19,8 @@ original style, using an open collaborat
 
 
 Name:    %{fontname}-fonts
-Version: 2.29
-Release: 4%{?alphatag}%{?dist}
+Version: 2.30
+Release: 1%{?alphatag}%{?dist}
 Summary: DejaVu fonts
 
 Group:     User Interface/X
@@ -205,7 +205,11 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.29-4
+* Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.30-1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 2.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sat May 23 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	23 May 2009 13:14:43 -0000	1.16
+++ import.log	6 Sep 2009 18:01:07 -0000	1.17
@@ -14,3 +14,4 @@ dejavu-fonts-2_28-5_fc11:HEAD:dejavu-fon
 dejavu-fonts-2_29-1_fc11:HEAD:dejavu-fonts-2.29-1.fc11.src.rpm:1237057458
 dejavu-fonts-2_29-2_fc11:HEAD:dejavu-fonts-2.29-2.fc11.src.rpm:1237143073
 dejavu-fonts-2_29-3_fc11:HEAD:dejavu-fonts-2.29-3.fc11.src.rpm:1243084445
+dejavu-fonts-2_30-1_fc12:HEAD:dejavu-fonts-2.30-1.fc12.src.rpm:1252259820


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	14 Mar 2009 19:05:29 -0000	1.53
+++ sources	6 Sep 2009 18:01:07 -0000	1.54
@@ -1 +1 @@
-4728d26da8daa5b4ebe87c428d745b06  dejavu-fonts-2.29.tar.bz2
+c042e582a83dbc57b3cb49b8a70753af  dejavu-fonts-2.30.tar.bz2



From djuran at fedoraproject.org  Sun Sep  6 18:07:52 2009
From: djuran at fedoraproject.org (David Juran)
Date: Sun,  6 Sep 2009 18:07:52 +0000 (UTC)
Subject: rpms/cpqarrayd/F-11 cpqarrayd-2.3-message-overrun.patch, NONE,
	1.1 cpqarrayd.spec, 1.7, 1.8
Message-ID: <20090906180752.4813E11C00E5@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/cpqarrayd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23329

Modified Files:
	cpqarrayd.spec 
Added Files:
	cpqarrayd-2.3-message-overrun.patch 
Log Message:
- fix message overrun (Bz 519660)


cpqarrayd-2.3-message-overrun.patch:
 cciss_functions.c |    5 -
 cciss_structs.h   |    6 -
 discover.c        |   11 +--
 status.c          |  164 +++++++++++++++++++++++++++++++++---------------------
 4 files changed, 113 insertions(+), 73 deletions(-)

--- NEW FILE cpqarrayd-2.3-message-overrun.patch ---
diff -ruN cpqarrayd-2.3-save/cciss_functions.c cpqarrayd-2.3/cciss_functions.c
--- cpqarrayd-2.3-save/cciss_functions.c	2007-12-03 17:06:22.000000000 +0000
+++ cpqarrayd-2.3/cciss_functions.c	2009-08-27 09:34:23.000000000 +0100
@@ -161,17 +161,18 @@
 	iocommand.buf = buffer;
 
 	result = ioctl (device_fd, CCISS_PASSTHRU, &iocommand);
-	if (result < 0)
-	{
+	if (result < 0) {
 		perror (" * ioctl failed");
 		return -1;
 	}
 
 	if (iocommand.error_info.CommandStatus == 1) {
 		printf (" * Command succeeded with dataoverrun (code %d)\n", iocommand.error_info.CommandStatus);
+		return 1;
 	}
 	else if (iocommand.error_info.CommandStatus == 2) {
 		printf (" * Command succeeded with dataunderrun (code %d)\n", iocommand.error_info.CommandStatus);
+		return 2;
 	}
 	else if (iocommand.error_info.CommandStatus != 0)
 	{
diff -ruN cpqarrayd-2.3-save/cciss_structs.h cpqarrayd-2.3/cciss_structs.h
--- cpqarrayd-2.3-save/cciss_structs.h	2005-12-16 11:17:44.000000000 +0000
+++ cpqarrayd-2.3/cciss_structs.h	2009-08-27 09:34:23.000000000 +0100
@@ -37,9 +37,9 @@
 #define CISS_MAX_PHYS_LUN       1024
 
 #define CompareEvent(event,par_class,par_subclass,par_detail) \
-                     ((event.class.class==par_class) && \
-					 (event.class.subclass == par_subclass) && \
-					 (event.class.detail == par_detail))
+                     ((event->class.class==par_class) && \
+					 (event->class.subclass == par_subclass) && \
+					 (event->class.detail == par_detail))
 
 #pragma pack(1) /* these structures must be byte aligned */
 typedef struct _cciss_event_physicaldrivechange {
diff -ruN cpqarrayd-2.3-save/discover.c cpqarrayd-2.3/discover.c
--- cpqarrayd-2.3-save/discover.c	2009-08-26 21:37:55.000000000 +0100
+++ cpqarrayd-2.3/discover.c	2009-08-27 09:35:03.000000000 +0100
@@ -300,7 +300,7 @@
 int cciss_interrogate_controller (struct opts opts, const char *devicefile) {
   int devicefd;
   cciss_report_logicallun_struct logicalluns;
-  cciss_event_type event;
+  cciss_event_type *event;
   int listlength = 0;
   int result;
   
@@ -328,13 +328,14 @@
   if (opts.verbose) printf("  Found a CCISS Controller (%d Logical drives)\n",
 			   ctrls_found[ctrls_found_num].num_logd_found);
 
-  result = cciss_get_event(devicefd, 1, &event);
+  event = malloc(sizeof(cciss_event_type));
+  result = cciss_get_event(devicefd, 1, event);
   while (!CompareEvent(event,0,0,0)) {
     printf ("DEBUG: Discarding old event %d/%d/%d\n",
-	    event.class.class, event.class.subclass, event.class.detail);
-    result = cciss_get_event(devicefd, 0, &event);
+	    event->class.class, event->class.subclass, event->class.detail);
+    result = cciss_get_event(devicefd, 0, event);
   }
-
+  free(event);
   close (devicefd);
 
   ctrls_found_num++;
diff -ruN cpqarrayd-2.3-save/status.c cpqarrayd-2.3/status.c
--- cpqarrayd-2.3-save/status.c	2009-08-26 21:37:55.000000000 +0100
+++ cpqarrayd-2.3/status.c	2009-08-27 09:34:23.000000000 +0100
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <errno.h>
 #include <string.h>
 #if defined(HAVE_LINUX_COMPILER_H)
   #include <linux/compiler.h>
@@ -59,7 +60,7 @@
   ida_ioctl_t io, io2;
   int status, nr_blks, blks_tr, trap_stat;
   float pvalue;
-  char statusmsg[1024];
+  char *statusmsg;
   int counter;
   
     
@@ -135,19 +136,26 @@
 		    ctrls_found[ctrl_cntr].log_disk[logd_cntr].status, status,
 		    pvalue);
 	  }
-	  sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue);
-	  if (opts.debug) {
-	      printf("DEBUG: sending traps.\n");
-	  }
-	  /* Send a trap, syslog if send_trap returns !0. */
-	  if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
-	    syslog(LOG_WARNING, 
-		   "problem sending snmp trap (sendtrap() returned %d)\n",
-		   trap_stat);
+	  if (asprintf(&statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue) > 0) {
 	    if (opts.debug) {
-	      printf("DEBUG: Problem sending snmp trap",
-		     "(sendtrap() returned %d)\n", 
+	      printf("DEBUG: sending traps.\n");
+	    }
+	    /* Send a trap, syslog if send_trap returns !0. */
+	    if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
+	      syslog(LOG_WARNING, 
+		     "problem sending snmp trap (sendtrap() returned %d)\n",
 		     trap_stat);
+	      if (opts.debug) {
+		printf("DEBUG: Problem sending snmp trap",
+		       "(sendtrap() returned %d)\n", 
+		       trap_stat);
+	      }
+	    }
+	    free(statusmsg);
+	  } else {
+	    syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	    if (opts.debug) {
+	      printf ("Cannot allocate memory for statusmsg\n");
 	    }
 	  }
 	}
@@ -164,21 +172,28 @@
 		    ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue,
 		    pvalue);
 	  }
-	  sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue);
-	  if (opts.debug) {
-	      printf("DEBUG: sending traps.\n");
-	  }
-	  if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
-	    syslog(LOG_WARNING,
-		   "problem sending snmp trap (sendtrap() returned %d)\n",
-		   trap_stat);
+	  if (asprintf(&statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue) > 0) {
 	    if (opts.debug) {
-	      printf("DEBUG: Problem sending snmp trap ",
-		     "(sendtrap() returned %d)\n",
+	      printf("DEBUG: sending traps.\n");
+	    }
+	    if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
+	      syslog(LOG_WARNING,
+		     "problem sending snmp trap (sendtrap() returned %d)\n",
 		     trap_stat);
+	      if (opts.debug) {
+		printf("DEBUG: Problem sending snmp trap ",
+		       "(sendtrap() returned %d)\n",
+		       trap_stat);
+	      }
+	    }
+	    free(statusmsg);
+	    ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue;
+	  } else {
+	    syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	    if (opts.debug) {
+	      printf ("Cannot allocate memory for statusmsg\n");
 	    }
 	  }
-	  ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue;
 	}
 	ctrls_found[ctrl_cntr].log_disk[logd_cntr].status = status;
     }
@@ -198,73 +213,96 @@
   int logd_cntr;
   int status, nr_blks, blks_tr, trap_stat;
   float pvalue;
-  char statusmsg[1024];
+  char *statusmsg;
   int counter;
-  cciss_event_type event;
+  cciss_event_type *event;
   
     
-  for ( ctrl_cntr=0;
-        ctrl_cntr <  ctrls_found_num;
-        ctrl_cntr++) {
+  for ( ctrl_cntr=0; ctrl_cntr <  ctrls_found_num; ctrl_cntr++) {
+
     if (ctrls_found[ctrl_cntr].ctrl_type != CTRLTYPE_CCISS) {
       break;
     }
 
-    devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY);
+    if (opts.debug) {
+      printf ("Open device %s\n", ctrls_found[ctrl_cntr].devicefile);
+    }
+
+    if ((devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY)) == -1) {
+      syslog(LOG_ERR, "Cannot open %s because %s", ctrls_found[ctrl_cntr].devicefile, strerror(errno));
+      if (opts.debug) {
+	printf ("Cannot open %s because %s", ctrls_found[ctrl_cntr].devicefile, strerror(errno));
+      }
+      continue;
+    }
     
-    result = cciss_get_event(devicefd, 0, &event);
+    event = malloc(sizeof(cciss_event_type));
+    result = cciss_get_event(devicefd, 0, event);
     while (!CompareEvent(event,0,0,0)) {
       printf ("DEBUG: Got event %d/%d/%d\n",
-	      event.class.class, event.class.subclass, event.class.detail);
+	      event->class.class, event->class.subclass, event->class.detail);
       if (CompareEvent(event,5,0,0)) {
-	snprintf(statusmsg, 2048, "CCISS controler %s logical volume %d changed state to %s.",
-		 ctrls_found[ctrl_cntr].devicefile,
-		 event.detail.logstatchange.logicaldrivenumber,
-		 logicaldrivestatusstr[event.detail.logstatchange.newlogicaldrivestate]);
-	status = event.detail.logstatchange.newlogicaldrivestate;
-	syslog(LOG_WARNING, statusmsg);
-	if (opts.debug) {
-	  printf (statusmsg);
-	}
-	if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
-	  syslog(LOG_WARNING, 
-		 "problem sending snmp trap (sendtrap() returned %d)\n",
-		 trap_stat);
+	if(asprintf(&statusmsg, "CCISS controler %s logical volume %d changed state to %s.",
+		    ctrls_found[ctrl_cntr].devicefile,
+		    event->detail.logstatchange.logicaldrivenumber,
+		    logicaldrivestatusstr[event->detail.logstatchange.newlogicaldrivestate]) > 0) {
+	  status = event->detail.logstatchange.newlogicaldrivestate;
+	  syslog(LOG_WARNING, statusmsg);
 	  if (opts.debug) {
-	    printf("DEBUG: Problem sending snmp trap",
-		   "(sendtrap() returned %d)\n", 
+	    printf ("%s\n", statusmsg);
+	  }
+	  if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
+	    syslog(LOG_WARNING, 
+		   "problem sending snmp trap (sendtrap() returned %d)\n",
 		   trap_stat);
+	    if (opts.debug) {
+	      printf("DEBUG: Problem sending snmp trap",
+		     "(sendtrap() returned %d)\n", 
+		     trap_stat);
+	    }
+	  }
+	  free(statusmsg);
+	} else {
+	  syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	  if (opts.debug) {
+	    printf ("Cannot allocate memory for statusmsg\n");
 	  }
 	}
       }
       else {
-	snprintf(statusmsg, 2048, "CCISS controler %s reported: %s.",
-		 ctrls_found[ctrl_cntr].devicefile,
-		 event.mesgstring);
-	status = 255;
-	syslog(LOG_WARNING, statusmsg);
-	if (opts.debug) {
-	  printf (statusmsg);
-	}
-	if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
-	  syslog(LOG_WARNING, 
-		 "problem sending snmp trap (sendtrap() returned %d)\n",
-		 trap_stat);
+	if(asprintf(statusmsg, "CCISS controler %s reported: %s.",
+		    ctrls_found[ctrl_cntr].devicefile,
+		    event->mesgstring) > 0) {
+	  status = 255;
+	  syslog(LOG_WARNING, statusmsg);
 	  if (opts.debug) {
-	    printf("DEBUG: Problem sending snmp trap",
-		   "(sendtrap() returned %d)\n", 
+	    printf (statusmsg);
+	  }
+	  if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
+	    syslog(LOG_WARNING, 
+		   "problem sending snmp trap (sendtrap() returned %d)\n",
 		   trap_stat);
+	    if (opts.debug) {
+	      printf("DEBUG: Problem sending snmp trap",
+		     "(sendtrap() returned %d)\n", 
+		     trap_stat);
+	    }
+	  }
+	  free(statusmsg);
+	} else {
+	  syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	  if (opts.debug) {
+	    printf ("Cannot allocate memory for statusmsg\n");
 	  }
 	}
       }
-      result = cciss_get_event(devicefd, 0, &event);
+      result = cciss_get_event(devicefd, 0, event);
     }
-
+    free(event);
     close (devicefd);
   }
 
   return 1;
- 
 }
 
 


Index: cpqarrayd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpqarrayd/F-11/cpqarrayd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cpqarrayd.spec	24 Feb 2009 09:30:12 -0000	1.7
+++ cpqarrayd.spec	6 Sep 2009 18:07:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           cpqarrayd
 Version:        2.3        
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Software for monitoring HP(Compaq) arraycontrollers
 Group:          System Environment/Base
 License:        GPLv2+
@@ -8,6 +8,7 @@ URL:            http://www.strocamp.net/
 Source0:        http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz
 Patch0:         cpqarrayd-2.3.no_ida.patch
 Patch1:         cpqarrayd-2.3.sysVinit.patch
+Patch2:		cpqarrayd-2.3-message-overrun.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +30,7 @@ disabled in this package due to build is
 %setup -q
 %patch0 -p1 -b .no_ida
 %patch1 -p1 -b .sysVinit
+%patch2 -p1 -b .message-overrun
 
 %build
 autoreconf -si
@@ -70,6 +72,9 @@ fi
 %doc %_mandir/man1/cpqarrayd*
 
 %changelog
+* Sun Sep  6 2009 David Juran <david at juran.se> - 2.3-10
+- fix message overrun (Bz 519660)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Sun Sep  6 18:36:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Sep 2009 18:36:25 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel moblin-icon-theme.spec,1.2,1.3
Message-ID: <20090906183625.66D3111C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31090

Modified Files:
	moblin-icon-theme.spec 
Log Message:
- Capitalise the theme name


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-icon-theme.spec	3 Aug 2009 19:50:57 -0000	1.2
+++ moblin-icon-theme.spec	6 Sep 2009 18:36:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-icon-theme
 Version:        0.7
-Release:        2
+Release:        3
 Summary:        Moblin icon theme
 
 Group:          User Interface/Desktops
@@ -53,6 +53,9 @@ for size in 16x16 24x24 48x48; do
   )
 done
 
+# Name the theme correctly
+sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/moblin/index.theme
+
 %clean
 rm -rf %{buildroot}
 
@@ -76,6 +79,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-3
+- Capitalise the theme name
+
 * Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-2
 - Some more package optimisations
 



From nim at fedoraproject.org  Sun Sep  6 18:45:44 2009
From: nim at fedoraproject.org (nim)
Date: Sun,  6 Sep 2009 18:45:44 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel .cvsignore, 1.4,
	1.5 apanov-heuristica-fonts.spec, 1.10, 1.11 import.log, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090906184544.1DF7C11C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1976/devel

Modified Files:
	.cvsignore apanov-heuristica-fonts.spec import.log sources 
Log Message:
0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Jul 2009 22:16:52 -0000	1.4
+++ .cvsignore	6 Sep 2009 18:45:43 -0000	1.5
@@ -1 +1 @@
-heuristica-src-20090507.tar.bz2
+heuristica-src-0.2.tar.xz


Index: apanov-heuristica-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- apanov-heuristica-fonts.spec	24 Jul 2009 16:57:04 -0000	1.10
+++ apanov-heuristica-fonts.spec	6 Sep 2009 18:45:43 -0000	1.11
@@ -4,14 +4,15 @@
 %global archivename heuristica-src-%{version}
 
 Name:    %{fontname}-fonts
-Version: 20090507
-Release: 2%{?dist}
+Version: 0.2
+Release: 1%{?dist}
+Epoch:   1
 Summary: Heuristica font
 
 Group:     User Interface/X
 License:   OFL
 URL:       ftp://ftp.dvo.ru/pub/Font/heuristica/
-Source0:   %{url}%{archivename}.tar.bz2
+Source0:   %{url}%{archivename}.tar.xz
 Source1:   %{name}-fontconfig.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -27,9 +28,19 @@ font that was released to the TeX Users 
 
 %prep
 %setup -q -c
+for txt in *.txt ; do
+   fold -s $txt > $txt.new
+   sed -i 's/\r//' $txt.new
+   touch -r $txt $txt.new
+   mv $txt.new $txt
+done
 
 
 %build
+
+# bug #512504 needs to be fixed in fonttools for plain make to work
+# http://bugzilla.redhat.com/show_bug.cgi?id=512504
+
 make %{?_smp_mflags} Heuristica-Regular.otf Heuristica-Bold.otf \
                      Heuristica-Italic.otf Heuristica-BoldItalic.otf
 
@@ -59,8 +70,12 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090507-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1:0.2-1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20090507-2
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jul 14 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090507-1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	14 Jul 2009 22:16:52 -0000	1.7
+++ import.log	6 Sep 2009 18:45:43 -0000	1.8
@@ -5,3 +5,4 @@ apanov-heuristica-fonts-20090125-3_fc11:
 apanov-heuristica-fonts-20090125-3_fc11:HEAD:apanov-heuristica-fonts-20090125-3.fc11.src.rpm:1235377618
 apanov-heuristica-fonts-20090125-5_fc11:HEAD:apanov-heuristica-fonts-20090125-5.fc11.src.rpm:1237147311
 apanov-heuristica-fonts-20090507-1_fc12:HEAD:apanov-heuristica-fonts-20090507-1.fc12.src.rpm:1247609683
+apanov-heuristica-fonts-0_2-1_fc12:HEAD:apanov-heuristica-fonts-0.2-1.fc12.src.rpm:1252262664


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Jul 2009 22:16:52 -0000	1.4
+++ sources	6 Sep 2009 18:45:43 -0000	1.5
@@ -1 +1 @@
-0c395cbb906b7a82467bd90a88a4671a  heuristica-src-20090507.tar.bz2
+eab9b8bdca120ebdbf1ac90cde70eddd  heuristica-src-0.2.tar.xz



From spot at fedoraproject.org  Sun Sep  6 18:52:07 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  6 Sep 2009 18:52:07 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.55, 1.56 asymptote.spec, 1.69,
	1.70 sources, 1.55, 1.56
Message-ID: <20090906185207.B90CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3510

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.86


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	24 Aug 2009 19:02:57 -0000	1.55
+++ .cvsignore	6 Sep 2009 18:52:07 -0000	1.56
@@ -1 +1 @@
-asymptote-1.85.src.tgz
+asymptote-1.86.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- asymptote.spec	24 Aug 2009 19:02:57 -0000	1.69
+++ asymptote.spec	6 Sep 2009 18:52:07 -0000	1.70
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.85
+Version:        1.86
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -150,6 +150,9 @@ fi
 
 
 %changelog
+* Sun Sep  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.86-1
+- update to 1.86
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.85-1
 - update to 1.85
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	24 Aug 2009 19:02:57 -0000	1.55
+++ sources	6 Sep 2009 18:52:07 -0000	1.56
@@ -1 +1 @@
-41254066198abeb4379fc3989891b670  asymptote-1.85.src.tgz
+0dc9c827a5e6f3577b5bc5966cb90ca8  asymptote-1.86.src.tgz



From salimma at fedoraproject.org  Sun Sep  6 18:58:35 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun,  6 Sep 2009 18:58:35 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.16,1.17
Message-ID: <20090906185835.35D1511C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5572

Modified Files:
	llvm.spec 
Log Message:
Fix llvm-gcc target name



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- llvm.spec	6 Sep 2009 03:00:39 -0000	1.16
+++ llvm.spec	6 Sep 2009 18:58:34 -0000	1.17
@@ -187,10 +187,11 @@ cd ..
 mkdir gcc-obj
 cd gcc-obj
 
-../llvm-gcc-%{lgcc_version}-%{version}.source/configure \
-  --prefix=%{_prefix} \
-  --libdir=%{_libdir} \
-  --enable-languages=ada,c,c++ \
+../llvm-gcc%{lgcc_version}-%{version}.source/configure \
+  --target=%{_target_platform} \
+  --prefix=%{_libdir}/llvm-gcc \
+  --libdir=%{_libdir}/llvm-gcc/%{_lib} \
+  --enable-languages=c,c++ \
   --enable-checking \
   --enable-llvm=$PWD/../obj \
   --disable-bootstrap \
@@ -250,7 +251,7 @@ rm %{buildroot}%{_libdir}/ocaml/*.o
 # Remove deprecated tools.
 rm %{buildroot}%{_bindir}/gcc{as,ld}
 
-sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
+sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}",' \
   %{buildroot}%{_bindir}/llvm-config
 
 chmod -x %{buildroot}%{_libdir}/*.[oa]
@@ -262,7 +263,7 @@ find examples -name 'Makefile'
 %if %{?_with_gcc:1}%{!?_with_gcc:0}
 # Install llvm-gcc.
 
-make -C llvm-gcc%{lgcc_version}-%{version}.source/build install DESTDIR=%{buildroot}
+make -C ../gcc-obj install DESTDIR=%{buildroot}
 cd %{buildroot}%{_libdir}/llvm-gcc/%{_lib}
 find . -name '*.la' -print0 | xargs -0r rm
 find . -name '*.a' -exec %{buildroot}%{_bindir}/llvm-ranlib {} \;
@@ -272,8 +273,8 @@ rm llvm-cpp llvm-gccbug llvm-gcov %{_tar
 cd ..
 mv man/man1/llvm-gcc.1 man/man1/llvm-g++.1 %{buildroot}%{_mandir}/man1
 rm -r info man %{_lib}/libiberty.a
-rm -r libexec/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-rm -r %{_lib}/gcc/%{_target_platform}/%{lgcc_version}/install-tools
+rm -r libexec/gcc/%{_target_platform}/*/install-tools
+rm -r %{_lib}/gcc/%{_target_platform}/*/install-tools
 %endif
 
 
@@ -372,7 +373,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
+* Sat Sep  6 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
 - Disable assertions (needed by OpenGTL)
 - Align spec file with upstream build instructions
 - Enable llvm-gcc



From nim at fedoraproject.org  Sun Sep  6 19:15:38 2009
From: nim at fedoraproject.org (nim)
Date: Sun,  6 Sep 2009 19:15:38 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel .cvsignore, 1.4,
	1.5 google-droid-fonts.spec, 1.9, 1.10 import.log, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090906191538.509E111C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9875/devel

Modified Files:
	.cvsignore google-droid-fonts.spec import.log sources 
Log Message:
upstream stealth update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Jul 2009 14:40:50 -0000	1.4
+++ .cvsignore	6 Sep 2009 19:15:37 -0000	1.5
@@ -1,9 +1,9 @@
 DroidSans-Bold.ttf
-DroidSans.ttf
 DroidSansFallback.ttf
-DroidSansJapanese.ttf
 DroidSansMono.ttf
 DroidSerif-Bold.ttf
 DroidSerif-BoldItalic.ttf
 DroidSerif-Italic.ttf
 DroidSerif-Regular.ttf
+DroidSans.ttf
+DroidSansJapanese.ttf


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- google-droid-fonts.spec	25 Jul 2009 14:40:50 -0000	1.9
+++ google-droid-fonts.spec	6 Sep 2009 19:15:37 -0000	1.10
@@ -10,9 +10,9 @@ on a mobile handset when rendered in app
 other screen text.
 
 Name:    %{fontname}-fonts
-# No sane versionning upstream
-Version: 20090320
-Release: 3%{?dist}
+# No sane versionning upstream, use the date we did a git dump
+Version: 20090906
+Release: 1%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -138,6 +138,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-1
+? upstream stealth update
+
 * Sat Jul 25 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090320-3
 ? try to fit Japanese in


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	25 Jul 2009 14:40:50 -0000	1.6
+++ import.log	6 Sep 2009 19:15:37 -0000	1.7
@@ -4,3 +4,4 @@ google-droid-fonts-1_0_112-4_fc11:HEAD:g
 google-droid-fonts-1_0_112-5_fc11:HEAD:google-droid-fonts-1.0.112-5.fc11.src.rpm:1235379417
 google-droid-fonts-20090320-1_fc12:HEAD:google-droid-fonts-20090320-1.fc12.src.rpm:1248519226
 google-droid-fonts-20090320-3_fc12:HEAD:google-droid-fonts-20090320-3.fc12.src.rpm:1248532826
+google-droid-fonts-20090906-1_fc12:HEAD:google-droid-fonts-20090906-1.fc12.src.rpm:1252264176


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Jul 2009 14:40:51 -0000	1.4
+++ sources	6 Sep 2009 19:15:37 -0000	1.5
@@ -1,9 +1,9 @@
 2afdf28d5cdd079b41968cdabf1b469e  DroidSans-Bold.ttf
-6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
 4caeadd734f4be9973163bdf02ea6cf5  DroidSansFallback.ttf
-8fbc87c7c5089a8e86c670b93a78964f  DroidSansJapanese.ttf
 3922dfe38a36da7d6edfb1fe77b276fb  DroidSansMono.ttf
 849a92990a80cbb665bfc74fd03743bd  DroidSerif-Bold.ttf
 a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
 a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
 bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf
+9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
+6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf



From salimma at fedoraproject.org  Sun Sep  6 19:31:09 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun,  6 Sep 2009 19:31:09 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.17,1.18
Message-ID: <20090906193109.1FFFD11C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14275

Modified Files:
	llvm.spec 
Log Message:
Abort plan to enable llvm-gcc; builds on x86_64 but not ix86. Will enable
clang instead




Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- llvm.spec	6 Sep 2009 18:58:34 -0000	1.17
+++ llvm.spec	6 Sep 2009 19:31:08 -0000	1.18
@@ -4,11 +4,10 @@
 #   The doxygen docs are HUGE, so they are not built by default.
 #
 # --with gcc
-#   The llvm-gcc package doesn't currently build.
+#   The llvm-gcc package doesn't currently build
+#   (builds on x86_64, not on i686). Plan is to enable clang instead.
 
 %define lgcc_version 4.2
-# attempt turning on llvm-gcc
-%define _with_gcc 1
 
 # LLVM object files don't contain build IDs.  I don't know why yet.
 # Suppress their generation for now.
@@ -376,7 +375,6 @@ rm -rf %{buildroot}
 * Sat Sep  6 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
 - Disable assertions (needed by OpenGTL)
 - Align spec file with upstream build instructions
-- Enable llvm-gcc
 - Enable unit tests
 
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5



From scop at fedoraproject.org  Sun Sep  6 19:48:44 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  6 Sep 2009 19:48:44 +0000 (UTC)
Subject: rpms/bouncycastle/devel bouncycastle.spec,1.19,1.20
Message-ID: <20090906194845.03F9711C00E5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19779

Modified Files:
	bouncycastle.spec 
Log Message:
* Sun Sep  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.43-6
- Include improvements from #521475:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %javac and %jar macros.
- Run test suite during build (ignoring failures for now).
- Follow upstream in excluding various test suite classes from jar; drop
  dependency on junit4.



Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- bouncycastle.spec	26 Aug 2009 21:48:21 -0000	1.19
+++ bouncycastle.spec	6 Sep 2009 19:48:44 -0000	1.20
@@ -5,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.43
-Release:          5%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -30,9 +30,8 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    junit4
-Requires:         junit4
 
-Provides:         bcprov == %{version}-%{release}
+Provides:         bcprov = %{version}-%{release}
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -62,13 +61,15 @@ unzip -qq src.zip -d src/
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4)
-  javac -g -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcprov-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
+  files="$files $(find . -type f -path '*/org/bouncycastle/util/test/*.class')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
   test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -101,6 +102,17 @@ install -dm 755 $RPM_BUILD_ROOT%{_mavenp
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom
 %add_to_maven_depmap org.bouncycastle bcprov-jdk16 %{version} JPP bcprov
 
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    # TODO: failures; get them fixed and remove || :
+    %java org.junit.runner.JUnitCore $test || :
+  done
+popd
+
+
 %post
 {
   # Rebuild the list of security providers in classpath.security
@@ -184,6 +196,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}/
 
 %changelog
+* Sun Sep  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.43-6
+- Include improvements from #521475:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build (ignoring failures for now).
+- Follow upstream in excluding various test suite classes from jar; drop
+  dependency on junit4.
+
 * Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
 - Add maven POM
 



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:33 +0000
Subject: [pkgdb] python-gasp: sdz has requested approveacls
Message-ID: <20090906202733.E6C3610F87C@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on python-gasp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:34 +0000
Subject: [pkgdb] python-gasp: sdz has requested commit
Message-ID: <20090906202734.2ED4410F884@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on python-gasp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:36 +0000
Subject: [pkgdb] python-gasp: sdz has requested watchcommits
Message-ID: <20090906202736.576F610F893@bastion2.fedora.phx.redhat.com>

sdz has requested the watchcommits acl on python-gasp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:38 +0000
Subject: [pkgdb] python-gasp: sdz has requested watchbugzilla
Message-ID: <20090906202738.5C36D10F896@bastion2.fedora.phx.redhat.com>

sdz has requested the watchbugzilla acl on python-gasp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:45 +0000
Subject: [pkgdb] python-gasp: sdz has requested approveacls
Message-ID: <20090906202745.E5D4A10F8A0@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on python-gasp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:47 +0000
Subject: [pkgdb] python-gasp: sdz has requested commit
Message-ID: <20090906202747.19DDA10F8A2@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on python-gasp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:47 +0000
Subject: [pkgdb] python-gasp: sdz has requested watchcommits
Message-ID: <20090906202748.34C8010F8A5@bastion2.fedora.phx.redhat.com>

sdz has requested the watchcommits acl on python-gasp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:49 +0000
Subject: [pkgdb] python-gasp: sdz has requested watchbugzilla
Message-ID: <20090906202749.4ECBC10F8A9@bastion2.fedora.phx.redhat.com>

sdz has requested the watchbugzilla acl on python-gasp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:51 +0000
Subject: [pkgdb] python-gasp: sdz has requested approveacls
Message-ID: <20090906202751.3A53A10F8AC@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on python-gasp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:52 +0000
Subject: [pkgdb] python-gasp: sdz has requested commit
Message-ID: <20090906202752.90DB910F8B0@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on python-gasp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:53 +0000
Subject: [pkgdb] python-gasp: sdz has requested watchcommits
Message-ID: <20090906202753.1F1BB10F8B3@bastion2.fedora.phx.redhat.com>

sdz has requested the watchcommits acl on python-gasp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:27:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:27:54 +0000
Subject: [pkgdb] python-gasp: sdz has requested watchbugzilla
Message-ID: <20090906202754.73BA810F8B7@bastion2.fedora.phx.redhat.com>

sdz has requested the watchbugzilla acl on python-gasp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From salimma at fedoraproject.org  Sun Sep  6 20:32:54 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun,  6 Sep 2009 20:32:54 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.18,1.19
Message-ID: <20090906203254.7456011C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31178

Modified Files:
	llvm.spec 
Log Message:
Restore previous directory layout. This is hopefully the final 2.5-series
spec



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- llvm.spec	6 Sep 2009 19:31:08 -0000	1.18
+++ llvm.spec	6 Sep 2009 20:32:54 -0000	1.19
@@ -166,6 +166,7 @@ for developing applications that use %{n
 mkdir obj && cd obj
 ../configure \
   --prefix=%{_prefix} \
+  --libdir=%{_libdir}/llvm \
   --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
@@ -174,7 +175,7 @@ mkdir obj && cd obj
 %endif
 
 # configure does not properly specify libdir
-sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/llvm|g' Makefile.config
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
 
@@ -220,7 +221,7 @@ chmod -x examples/Makefile
 # OVERRIDE_libdir used by our patched Makefile.ocaml:
 # see http://llvm.org/bugs/show_bug.cgi?id=3153
 make install DESTDIR=%{buildroot} \
-     OVERRIDE_libdir=%{_libdir} \
+     OVERRIDE_libdir=%{_libdir}/llvm \
      PROJ_docsdir=`pwd`/../moredocs
 
 #make install \
@@ -237,7 +238,7 @@ find %{buildroot} -name .dir -print0 | x
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
 
 # Get rid of erroneously installed example files.
-rm %{buildroot}%{_libdir}/LLVMHello.*
+rm %{buildroot}%{_libdir}/llvm/LLVMHello.*
 
 # And OCaml .o files
 rm %{buildroot}%{_libdir}/ocaml/*.o
@@ -311,8 +312,7 @@ rm -rf %{buildroot}
 %{_bindir}/llvm-config
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
-%exclude %{_libdir}/ocaml
-%{_libdir}/*
+%{_libdir}/llvm
 
 
 %files ocaml



From pkgdb at fedoraproject.org  Sun Sep  6 20:36:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:36:41 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20090906203641.87A4110F87C@bastion2.fedora.phx.redhat.com>

lfaraone has set the watchcommits acl on python-gasp (Fedora devel) to Approved for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:36:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:36:41 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20090906203641.D350110F884@bastion2.fedora.phx.redhat.com>

lfaraone has set the watchbugzilla acl on python-gasp (Fedora devel) to Approved for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:36:44 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20090906203644.4D99410F896@bastion2.fedora.phx.redhat.com>

lfaraone has set the approveacls acl on python-gasp (Fedora devel) to Approved for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Sun Sep  6 20:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:36:43 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20090906203643.1AFDF10F893@bastion2.fedora.phx.redhat.com>

lfaraone has set the commit acl on python-gasp (Fedora devel) to Approved for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From emaldonado at fedoraproject.org  Sun Sep  6 20:37:47 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun,  6 Sep 2009 20:37:47 +0000 (UTC)
Subject: rpms/nss/devel nss-pem-509705.patch,NONE,1.1
Message-ID: <20090906203747.56A3B11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32615

Added Files:
	nss-pem-509705.patch 
Log Message:
PEM module fixes to implement memory management for internal objects and fix crash when processing malformed key files : bz #509705, #51209

nss-pem-509705.patch:
 ckpem.h    |   26 ++++++
 pfind.c    |   12 ++-
 pinst.c    |  112 ++++++++++++++++++-----------
 pobject.c  |  229 ++++++++++++++++++++++++++++++++++++++-----------------------
 psession.c |  129 ++++------------------------------
 util.c     |   20 +++--
 6 files changed, 278 insertions(+), 250 deletions(-)

--- NEW FILE nss-pem-509705.patch ---
diff -r -u -p nss-3.12.4-orig/mozilla/security/nss/lib/ckfw/pem/ckpem.h nss-3.12.4/mozilla/security/nss/lib/ckfw/pem/ckpem.h
--- ./mozilla/security/nss/lib/ckfw/pem/ckpem.h	2009-06-22 14:47:20.000000000 -0700
+++ ./mozilla/security/nss/lib/ckfw/pem/ckpem.h	2009-09-06 12:00:25.121446590 -0700
@@ -101,6 +101,17 @@ typedef enum {
   pemTrust
 } pemObjectType;
 
+typedef struct pemInternalObjectStr pemInternalObject;
+typedef struct pemObjectListItemStr pemObjectListItem;
+
+/*
+ * singly-linked list of internal objects
+ */
+struct pemObjectListItemStr {
+  pemInternalObject     *io;
+  pemObjectListItem     *next;
+};
+
 /*
  * all the various types of objects are abstracted away in cobject and
  * cfind as pemInternalObjects.
@@ -121,8 +132,16 @@ struct pemInternalObjectStr {
   char            *nickname;
   NSSCKMDObject   mdObject;
   CK_SLOT_ID      slotID;
+  CK_ULONG        gobjIndex;
+  int             refCount;
+
+  /* used by pem_mdFindObjects_Next */
+  CK_BBOOL        extRef;
+
+  /* If list != NULL, the object contains no useful data except of the list
+   * of slave objects */
+  pemObjectListItem *list;
 };
-typedef struct pemInternalObjectStr pemInternalObject;
 
 struct pemTokenStr {
   PRBool          logged_in;
@@ -221,8 +240,9 @@ PRBool pem_ParseString(const char* input
 PRBool pem_FreeParsedStrings(PRInt32 numStrings, char** instrings);
 
 pemInternalObject *
-CreateObject(CK_OBJECT_CLASS objClass, pemObjectType type, SECItem *certDER,
-             SECItem *keyDER, char *filename, int objid, CK_SLOT_ID slotID);
+AddObjectIfNeeded(CK_OBJECT_CLASS objClass, pemObjectType type,
+                  SECItem *certDER, SECItem *keyDER, char *filename, int objid,
+                  CK_SLOT_ID slotID);
 
 void pem_DestroyInternalObject (pemInternalObject *io);
 
diff -r -u -p nss-3.12.4-orig/mozilla/security/nss/lib/ckfw/pem/pfind.c nss-3.12.4/mozilla/security/nss/lib/ckfw/pem/pfind.c
--- ./mozilla/security/nss/lib/ckfw/pem/pfind.c	2009-06-22 11:31:11.000000000 -0700
+++ ./mozilla/security/nss/lib/ckfw/pem/pfind.c	2009-09-06 12:00:46.459451657 -0700
@@ -131,6 +131,13 @@ pem_mdFindObjects_Next
 
     plog("Creating object for type %d\n", io->type);
 
+    if (!io->extRef) {
+        /* increase reference count only once as ckfw will free the found
+         * object only once */
+        io->extRef = CK_TRUE;
+        io->refCount ++;
+    }
+
     return pem_CreateMDObject(arena, io, pError);
 }
 
@@ -313,8 +320,11 @@ collect_objects(CK_ATTRIBUTE_PTR pTempla
         goto done; /* no other object types we understand in this module */
     }
 
-    /* find object */
+    /* find objects */
     for (i = 0; i < pem_nobjs; i++) {
+        if (NULL == gobj[i])
+            continue;
+
         plog("  %d type = %d\n", i, gobj[i]->type);
         if ((type == gobj[i]->type)
             && (slotID == gobj[i]->slotID)
diff -r -u -p nss-3.12.4-orig/mozilla/security/nss/lib/ckfw/pem/pinst.c nss-3.12.4/mozilla/security/nss/lib/ckfw/pem/pinst.c
--- ./mozilla/security/nss/lib/ckfw/pem/pinst.c	2009-06-22 11:30:05.000000000 -0700
+++ ./mozilla/security/nss/lib/ckfw/pem/pinst.c	2009-09-06 12:02:49.674446636 -0700
@@ -56,24 +56,6 @@ PRInt32 count = 0;
 
 #define PEM_ITEM_CHUNK  512
 
-#define PUT_Object(obj,err) \
-  { \
-    if (count >= size) { \
-    gobj = gobj ? \
-                nss_ZREALLOCARRAY(gobj, pemInternalObject *, \
-                               (size+PEM_ITEM_CHUNK) ) : \
-                nss_ZNEWARRAY(NULL, pemInternalObject *, \
-                               (size+PEM_ITEM_CHUNK) ) ; \
-      if ((pemInternalObject **)NULL == gobj) { \
-        err = CKR_HOST_MEMORY; \
-        goto loser; \
-      } \
-      size += PEM_ITEM_CHUNK; \
-    } \
-    (gobj)[ count ] = (obj); \
-    count++; \
-  }
-
 /*
  * simple cert decoder to avoid the cost of asn1 engine
  */
@@ -195,7 +177,7 @@ GetCertFields(unsigned char *cert, int c
     return SECSuccess;
 }
 
-pemInternalObject *
+static pemInternalObject *
 CreateObject(CK_OBJECT_CLASS objClass,
              pemObjectType type, SECItem * certDER,
              SECItem * keyDER, char *filename,
@@ -286,6 +268,67 @@ CreateObject(CK_OBJECT_CLASS objClass,
     return o;
 }
 
+pemInternalObject *
+AddObjectIfNeeded(CK_OBJECT_CLASS objClass,
+                  pemObjectType type, SECItem * certDER,
+                  SECItem * keyDER, char *filename,
+                  int objid, CK_SLOT_ID slotID)
+{
+    int i;
+
+    /* FIXME: copy-pasted from CreateObject */
+    const char *nickname = strrchr(filename, '/');
+    if (nickname)
+        nickname++;
+    else
+        nickname = filename;
+
+    /* first look for the object in gobj, it might be already there */
+    for (i = 0; i < pem_nobjs; i++) {
+        if (NULL == gobj[i])
+            continue;
+
+        if ((gobj[i]->objClass == objClass)
+                && (gobj[i]->type == type)
+                && (gobj[i]->slotID == slotID)
+#if 0
+                /* FIXME: is it safe to return object with different objid? */
+                && (atoi(gobj[i]->id.data) == objid)
+#endif
+                && (0 == strcmp(gobj[i]->nickname, nickname))) {
+
+            plog("AddObjectIfNeeded: re-using internal object #%i\n", i);
+            gobj[i]->refCount ++;
+            return gobj[i];
+        }
+    }
+
+    /* object not found, we need to create it */
+    pemInternalObject *io = CreateObject(objClass, type, certDER, keyDER,
+                                         filename, objid, slotID);
+
+    io->gobjIndex = count;
+
+    /* add object to global array */
+    if (count >= size) {
+        gobj = gobj ?
+            nss_ZREALLOCARRAY(gobj, pemInternalObject *,
+                    (size+PEM_ITEM_CHUNK) ) :
+            nss_ZNEWARRAY(NULL, pemInternalObject *,
+                    (size+PEM_ITEM_CHUNK) ) ;
+
+        if ((pemInternalObject **)NULL == gobj)
+            return NULL;
+        size += PEM_ITEM_CHUNK;
+    }
+    gobj[count] = io;
+    count++;
+    pem_nobjs++;
+
+    io->refCount ++;
+    return io;
+}
+
 CK_RV
 AddCertificate(char *certfile, char *keyfile, PRBool cacert,
                CK_SLOT_ID slotID)
@@ -314,44 +357,37 @@ AddCertificate(char *certfile, char *key
 
             snprintf(nickname, 1024, "%s - %d", certfile, i);
 
-            o = CreateObject(CKO_CERTIFICATE, pemCert, objs[i], NULL,
-                             nickname, 0, slotID);
+            o = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert, objs[i], NULL,
+                                   nickname, 0, slotID);
             if (o == NULL) {
                 error = CKR_GENERAL_ERROR;
                 goto loser;
             }
-            PUT_Object(o, error);
             if (error != CKR_OK)
                 goto loser;
             o = NULL;
-            pem_nobjs++;
 
             /* Add the CA trust object */
-            o = CreateObject(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL,
-                             nickname, 0, slotID);
+            o = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL,
+                                   nickname, 0, slotID);
             if (o == NULL) {
                 error = CKR_GENERAL_ERROR;
                 goto loser;
             }
-            PUT_Object(o, error);
-            pem_nobjs++;
         }                       /* for */
     } else {
         objid = pem_nobjs + 1;
-        o = CreateObject(CKO_CERTIFICATE, pemCert, objs[0], NULL, certfile,
-                         objid, slotID);
+        o = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert, objs[0], NULL, certfile,
+                              objid, slotID);
         if (o == NULL) {
             error = CKR_GENERAL_ERROR;
             goto loser;
         }
 
-        PUT_Object(o, error);
-
         if (error != CKR_OK)
             goto loser;
 
         o = NULL;
-        pem_nobjs++;
 
         if (keyfile) {          /* add the private key */
             SECItem **keyobjs = NULL;
@@ -363,15 +399,12 @@ AddCertificate(char *certfile, char *key
                 error = CKR_GENERAL_ERROR;
                 goto loser;
             }
-            o = CreateObject(CKO_PRIVATE_KEY, pemBareKey, objs[0],
-                             keyobjs[0], certfile, objid, slotID);
+            o = AddObjectIfNeeded(CKO_PRIVATE_KEY, pemBareKey, objs[0],
+                                  keyobjs[0], certfile, objid, slotID);
             if (o == NULL) {
                 error = CKR_GENERAL_ERROR;
                 goto loser;
             }
-
-            PUT_Object(o, error);
-            pem_nobjs++;
         }
     }
 
@@ -487,15 +520,10 @@ pem_Finalize
     NSSCKFWInstance * fwInstance
 )
 {
-    int i;
-
     plog("pem_Finalize\n");
     if (!pemInitialized)
         return;
 
-    for (i = 0; i < pem_nobjs; ++i)
-        pem_DestroyInternalObject(gobj[i]);
-
     nss_ZFreeIf(gobj);
     gobj = NULL;
 
diff -r -u -p nss-3.12.4-orig/mozilla/security/nss/lib/ckfw/pem/pobject.c nss-3.12.4/mozilla/security/nss/lib/ckfw/pem/pobject.c
--- ./mozilla/security/nss/lib/ckfw/pem/pobject.c	2009-06-22 11:29:44.000000000 -0700
+++ ./mozilla/security/nss/lib/ckfw/pem/pobject.c	2009-09-06 12:05:06.837446214 -0700
@@ -51,24 +51,12 @@ NSS_EXTERN_DATA pemInternalObject **gobj
 NSS_EXTERN_DATA int pem_nobjs;
 NSS_EXTERN_DATA int token_needsLogin[NUM_SLOTS];
 
-#define PEM_ITEM_CHUNK  512
-#define PUT_Object(obj,err) \
-  { \
-    if (count >= size) { \
-    gobj = gobj ? \
-                nss_ZREALLOCARRAY(gobj, pemInternalObject *, \
-                               (size+PEM_ITEM_CHUNK) ) : \
-                nss_ZNEWARRAY(NULL, pemInternalObject *, \
-                               (size+PEM_ITEM_CHUNK) ) ; \
-      if ((pemInternalObject **)NULL == gobj) { \
-        err = CKR_HOST_MEMORY; \
-        goto loser; \
-      } \
-      size += PEM_ITEM_CHUNK; \
-    } \
-    (gobj)[ count ] = (obj); \
-    count++; \
-  }
+#define APPEND_LIST_ITEM(item) do { \
+    item->next = nss_ZNEW(NULL, pemObjectListItem); \
+    if (NULL == item->next) \
+      goto loser; \
+    item = item->next; \
+} while (0)
 
 const CK_ATTRIBUTE_TYPE certAttrs[] = {
     CKA_CLASS,
@@ -559,12 +547,41 @@ pem_FetchAttribute
     return NULL;
 }
 
+/*
+ * Destroy internal object or list object if refCount becomes zero (after
+ * decrement). Safe to call with NULL argument.
+ */
 void
 pem_DestroyInternalObject
 (
     pemInternalObject * io
 )
 {
+    if (NULL == io)
+        /* nothing to destroy */
+        return;
+
+    if (NULL != io->list) {
+        /* destroy list object */
+        pemObjectListItem *item = io->list;
+        while (item) {
+            pemObjectListItem *next = item->next;
+
+            /* recursion of maximal depth 1 */
+            pem_DestroyInternalObject(item->io);
+
+            nss_ZFreeIf(item);
+            item = next;
+        }
+        nss_ZFreeIf(io);
+        return;
+    }
+
+    io->refCount --;
+    if (0 < io->refCount)
+        return;
+
+    /* destroy internal object */
     switch (io->type) {
     case pemRaw:
         return;
@@ -610,12 +627,17 @@ pem_DestroyInternalObject
             free(io->u.key.ivstring);
         break;
     }
+
+    if (NULL != gobj)
+        /* remove reference to self from the global array */
+        gobj[io->gobjIndex] = NULL;
+
     nss_ZFreeIf(io);
     return;
 }
 
 /*
- * Finalize - unneeded
+ * Finalize - needed
  * Destroy - CKR_SESSION_READ_ONLY
  * IsTokenObject - CK_TRUE
  * GetAttributeCount
@@ -623,9 +645,25 @@ pem_DestroyInternalObject
  * GetAttributeSize
  * GetAttribute
  * SetAttribute - unneeded
- * GetObjectSize
+ * GetObjectSize - unneeded
  */
 
+static void
+pem_mdObject_Finalize
+(
+    NSSCKMDObject * mdObject,
+    NSSCKFWObject * fwObject,
+    NSSCKMDSession * mdSession,
+    NSSCKFWSession * fwSession,
+    NSSCKMDToken * mdToken,
+    NSSCKFWToken * fwToken,
+    NSSCKMDInstance * mdInstance,
+    NSSCKFWInstance * fwInstance
+)
+{
+    pem_DestroyInternalObject((pemInternalObject *) mdObject->etc);
+}
+
 static CK_RV
 pem_mdObject_Destroy
 (
@@ -677,6 +715,14 @@ pem_mdObject_GetAttributeCount
 {
     pemInternalObject *io = (pemInternalObject *) mdObject->etc;
 
+    if (NULL != io->list) {
+        /* list object --> use the first item in the list */
+        NSSCKMDObject *md = &(io->list->io->mdObject);
+        return md->GetAttributeCount(md, fwObject, mdSession, fwSession,
+                                     mdToken, fwToken, mdInstance, fwInstance,
+                                     pError);
+    }
+
     if (pemRaw == io->type) {
         return io->u.raw.n;
     }
@@ -714,10 +760,19 @@ pem_mdObject_GetAttributeTypes
     CK_ULONG i;
     CK_RV error = CKR_OK;
     const CK_ATTRIBUTE_TYPE *attrs = NULL;
-    CK_ULONG size =
-        pem_mdObject_GetAttributeCount(mdObject, fwObject, mdSession,
-                                       fwSession, mdToken, fwToken, mdInstance,
-                                       fwInstance, &error);
+    CK_ULONG size;
+
+    if (NULL != io->list) {
+        /* list object --> use the first item in the list */
+        NSSCKMDObject *md = &(io->list->io->mdObject);
+        return md->GetAttributeTypes(md, fwObject, mdSession, fwSession,
+                                     mdToken, fwToken, mdInstance, fwInstance,
+                                     typeArray, ulCount);
+    }
+
+    size = pem_mdObject_GetAttributeCount(mdObject, fwObject, mdSession,
+                                          fwSession, mdToken, fwToken, mdInstance,
+                                          fwInstance, &error);
 
     if (size != ulCount) {
         return CKR_BUFFER_TOO_SMALL;
@@ -762,9 +817,16 @@ pem_mdObject_GetAttributeSize
 )
 {
     pemInternalObject *io = (pemInternalObject *) mdObject->etc;
-
     const NSSItem *b;
 
+    if (NULL != io->list) {
+        /* list object --> use the first item in the list */
+        NSSCKMDObject *md = &(io->list->io->mdObject);
+        return md->GetAttributeSize(md, fwObject, mdSession, fwSession,
+                                    mdToken, fwToken, mdInstance, fwInstance,
+                                    attribute, pError);
+    }
+
     b = pem_FetchAttribute(io, attribute);
 
     if ((const NSSItem *) NULL == b) {
@@ -792,6 +854,14 @@ pem_mdObject_GetAttribute
     NSSCKFWItem mdItem;
     pemInternalObject *io = (pemInternalObject *) mdObject->etc;
 
+    if (NULL != io->list) {
+        /* list object --> use the first item in the list */
+        NSSCKMDObject *md = &(io->list->io->mdObject);
+        return md->GetAttribute(md, fwObject, mdSession, fwSession,
+                                mdToken, fwToken, mdInstance, fwInstance,
+                                attribute, pError);
+    }
+
     mdItem.needsFreeing = PR_FALSE;
     mdItem.item = (NSSItem *) pem_FetchAttribute(io, attribute);
 
@@ -910,31 +980,10 @@ pem_GetStringAttribute
     return str;
 }
 
-static CK_ULONG
-pem_mdObject_GetObjectSize
-(
-    NSSCKMDObject * mdObject,
-    NSSCKFWObject * fwObject,
-    NSSCKMDSession * mdSession,
-    NSSCKFWSession * fwSession,
-    NSSCKMDToken * mdToken,
-    NSSCKFWToken * fwToken,
-    NSSCKMDInstance * mdInstance,
-    NSSCKFWInstance * fwInstance,
-    CK_RV * pError
-)
-{
-    /* pemInternalObject *io = (pemInternalObject *) mdObject->etc; */
-    CK_ULONG rv = 1;
-
-    /* size is irrelevant to this token */
-    return rv;
-}
-
 static const NSSCKMDObject
 pem_prototype_mdObject = {
     (void *) NULL,              /* etc */
-    NULL,                       /* Finalize */
+    pem_mdObject_Finalize,
     pem_mdObject_Destroy,
     pem_mdObject_IsTokenObject,
     pem_mdObject_GetAttributeCount,
@@ -943,7 +992,7 @@ pem_prototype_mdObject = {
     pem_mdObject_GetAttribute,
     NULL,                       /* FreeAttribute */
     NULL,                       /* SetAttribute */
-    pem_mdObject_GetObjectSize,
+    NULL,                       /* GetObjectSize */
     (void *) NULL               /* null terminator */
 };
 
@@ -982,7 +1031,6 @@ pem_CreateObject
 )
 {
     CK_OBJECT_CLASS objClass;
-    pemInternalObject *io = NULL;
     CK_BBOOL isToken;
     NSSCKFWSlot *fwSlot;
     CK_SLOT_ID slotID;
@@ -991,13 +1039,12 @@ pem_CreateObject
     SECItem **derlist = NULL;
     int nobjs = 0;
     int i;
-    int objid, count, size;
+    int objid;
     pemToken *token;
     int cipher;
     char *ivstring = NULL;
-
-    count = pem_nobjs;
-    size = (count / PEM_ITEM_CHUNK) * PEM_ITEM_CHUNK;
+    pemInternalObject *listObj = NULL;
+    pemObjectListItem *listItem = NULL;
 
     /*
      * only create token objects
@@ -1048,6 +1095,20 @@ pem_CreateObject
                          * private key creation */
     }
 #endif
+
+    listObj = nss_ZNEW(NULL, pemInternalObject);
+    if (NULL == listObj) {
+        nss_ZFreeIf(filename);
+        return NULL;
+    }
+
+    listItem = listObj->list = nss_ZNEW(NULL, pemObjectListItem);
+    if (NULL == listItem) {
+        nss_ZFreeIf(listObj);
+        nss_ZFreeIf(filename);
+        return NULL;
+    }
+
     if (objClass == CKO_CERTIFICATE) {
         int i;
 
@@ -1058,6 +1119,9 @@ pem_CreateObject
         objid = -1;
         /* Brute force: find the id of the key, if any, in this slot */
         for (i = 0; i < pem_nobjs; i++) {
+            if (NULL == gobj[i])
+                continue;
+
             if ((slotID == gobj[i]->slotID)
                 && (gobj[i]->type == pemBareKey)) {
                 objid = atoi(gobj[i]->id.data);
@@ -1078,33 +1142,28 @@ pem_CreateObject
 
                 snprintf(nickname, 1024, "%s - %d", filename, c);
 
-                io = (pemInternalObject *) CreateObject(CKO_CERTIFICATE,
-                                                        pemCert, derlist[c],
-                                                        NULL, nickname, 0,
-                                                        slotID);
-                if (io == NULL)
+                if (c)
+                    APPEND_LIST_ITEM(listItem);
+                listItem->io = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert,
+                                                 derlist[c], NULL, nickname, 0,
+                                                 slotID);
+                if (listItem->io == NULL)
                     goto loser;
-                PUT_Object(io, *pError);
-                pem_nobjs++;
 
                 /* Add the trust object */
-                io = CreateObject(CKO_NETSCAPE_TRUST, pemTrust, derlist[c],
-                                  NULL, nickname, 0, slotID);
-                if (io == NULL)
+                APPEND_LIST_ITEM(listItem);
+                listItem->io = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust,
+                                                 derlist[c], NULL, nickname, 0,
+                                                 slotID);
+                if (listItem->io == NULL)
                     goto loser;
-
-                PUT_Object(io, *pError);
-                pem_nobjs++;
             }
         } else {
-            io = (pemInternalObject *) CreateObject(CKO_CERTIFICATE,
-                                                    pemCert, derlist[0],
-                                                    NULL, filename, objid,
-                                                    slotID);
-            if (io == NULL)
+            listItem->io = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert,
+                                             derlist[0], NULL, filename, objid,
+                                             slotID);
+            if (listItem->io == NULL)
                 goto loser;
-            PUT_Object(io, *pError);
-            pem_nobjs++;
         }
     } else if (objClass == CKO_PRIVATE_KEY) {
         /* Brute force: find the id of the certificate, if any, in this slot */
@@ -1120,6 +1179,9 @@ pem_CreateObject
 
         objid = -1;
         for (i = 0; i < pem_nobjs; i++) {
+            if (NULL == gobj[i])
+                continue;
+
             if ((slotID == gobj[i]->slotID) && (gobj[i]->type == pemCert)) {
                 objid = atoi(gobj[i]->id.data);
                 certDER.data =
@@ -1134,22 +1196,21 @@ pem_CreateObject
         if (objid == -1)
             objid = pem_nobjs + 1;
 
-        io = (pemInternalObject *) CreateObject(CKO_PRIVATE_KEY,
-                                                pemBareKey, &certDER,
-                                                derlist[0], filename,
-                                                objid, slotID);
-        if (io == NULL)
+        listItem->io =  AddObjectIfNeeded(CKO_PRIVATE_KEY, pemBareKey, &certDER,
+                                          derlist[0], filename, objid, slotID);
+        if (listItem->io == NULL)
             goto loser;
-        io->u.key.ivstring = ivstring;
-        io->u.key.cipher = cipher;
-        PUT_Object(io, *pError);
-        pem_nobjs++;
+
+        listItem->io->u.key.ivstring = ivstring;
+        listItem->io->u.key.cipher = cipher;
         nss_ZFreeIf(certDER.data);
 
         /* If the key was encrypted then free the session to make it appear that
          * the token was removed so we can force a login.
          */
         if (cipher) {
+            /* FIXME: Why 1.0s? Is it enough? Isn't it too much?
+             * What about e.g. 3.14s? */
             PRIntervalTime onesec = PR_SecondsToInterval(1);
             token_needsLogin[slotID - 1] = PR_TRUE;
 
@@ -1175,8 +1236,8 @@ pem_CreateObject
     }
     nss_ZFreeIf(filename);
     nss_ZFreeIf(derlist);
-    if ((pemInternalObject *) NULL == io) {
+    if ((pemInternalObject *) NULL == listItem->io) {
         return (NSSCKMDObject *) NULL;
     }
-    return pem_CreateMDObject(NULL, io, pError);
+    return pem_CreateMDObject(NULL, listObj, pError);
 }
diff -r -u -p nss-3.12.4-orig/mozilla/security/nss/lib/ckfw/pem/psession.c nss-3.12.4/mozilla/security/nss/lib/ckfw/pem/psession.c
--- ./mozilla/security/nss/lib/ckfw/pem/psession.c	2009-06-22 13:55:16.000000000 -0700
+++ ./mozilla/security/nss/lib/ckfw/pem/psession.c	2009-09-06 12:05:55.979449599 -0700
@@ -158,6 +158,9 @@ pem_mdSession_CreateObject
                             ulAttributeCount, pError);
 }
 
+/*
+ * increase refCount of internal object(s)
+ */
 NSSCKMDObject *
 pem_mdSession_CopyObject
 (
@@ -175,120 +178,19 @@ pem_mdSession_CopyObject
     CK_RV * pError
 )
 {
-    pemInternalObject *new = NULL;
-    NSSCKMDObject *mdObject = nssCKFWObject_GetMDObject(fwOldObject);
-    pemInternalObject *old = (pemInternalObject *) mdObject->etc;
-    CK_RV error = CKR_OK;
-
-    plog("pem_mdSession_CopyObject: ");
-    /*
-     * now handle the various object types
-     */
-    *pError = CKR_OK;
-    switch (old->type) {
-    case pemCert:
-        plog("pemCert\n");
-        if ((pemInternalObject *) NULL == 0) {
-            new = nss_ZNEW(NULL, pemInternalObject);
-            if ((pemInternalObject *) NULL == new) {
-                *pError = CKR_HOST_MEMORY;
-                goto loser;
-            }
-            memset(&new->u.cert, 0, sizeof(new->u.cert));
-            new->objClass = CKO_CERTIFICATE;
-            new->type = pemCert;
-            new->derCert = nss_ZNEW(NULL, SECItem);
-            new->derCert->data =
-                (void *) nss_ZAlloc(NULL, old->derCert->len);
-            new->derCert->len = old->derCert->len;
-            nsslibc_memcpy(new->derCert->data, old->derCert->data,
-                        old->derCert->len);
-            new->nickname =
-                (char *) nss_ZAlloc(NULL, strlen(old->nickname) + 1);
-            strcpy(new->nickname, old->nickname);
-            new->id.data = (void *) nss_ZAlloc(NULL, old->id.size);
-            (void) nsslibc_memcpy(new->id.data, old->id.data,
-                                  old->id.size);
-            new->id.size = old->id.size;
-        }
-        break;
-    case pemBareKey:
-        plog("pemBareKey\n");
-        if ((pemInternalObject *) NULL == 0) {
-            new = nss_ZNEW(NULL, pemInternalObject);
-            if ((pemInternalObject *) NULL == new) {
-                *pError = CKR_HOST_MEMORY;
-                goto loser;
-            }
-            memset(&new->u.key, 0, sizeof(new->u.key));
-            new->objClass = CKO_PRIVATE_KEY;
-            new->type = pemBareKey;
-            new->derCert = nss_ZNEW(NULL, SECItem);
-            new->derCert->data =
-                (void *) nss_ZAlloc(NULL, old->derCert->len);
-            new->derCert->len = old->derCert->len;
-            new->id.data = (void *) nss_ZAlloc(NULL, old->id.size);
-            (void) nsslibc_memcpy(new->id.data, old->id.data,
-                                  old->id.size);
-            new->id.size = old->id.size;
-            nsslibc_memcpy(new->derCert->data, old->derCert->data,
-                        old->derCert->len);
-            new->nickname =
-                (char *) nss_ZAlloc(NULL, strlen(old->nickname) + 1);
-            strcpy(new->nickname, old->nickname);
-            new->u.key.key.privateKey = nss_ZNEW(NULL, SECItem);
-            new->u.key.key.privateKey->data =
-                (void *) nss_ZAlloc(NULL, old->u.key.key.privateKey->len);
-            new->u.key.key.privateKey->len =
-                old->u.key.key.privateKey->len;
-            nsslibc_memcpy(new->u.key.key.privateKey->data,
-                           old->u.key.key.privateKey->data,
-                           old->u.key.key.privateKey->len);
-        }
-        goto done;
-        break;
-    case pemTrust:
-        plog("pemTrust\n");
-        if ((pemInternalObject *) NULL == 0) {
-            new = nss_ZNEW(NULL, pemInternalObject);
-            if ((pemInternalObject *) NULL == new) {
-                *pError = CKR_HOST_MEMORY;
-                goto loser;
-            }
-            memset(&new->u.trust, 0, sizeof(new->u.trust));
-            new->objClass = CKO_CERTIFICATE;
-            new->type = pemTrust;
-            new->derCert = nss_ZNEW(NULL, SECItem);
-            new->derCert->data =
-                (void *) nss_ZAlloc(NULL, old->derCert->len);
-            new->derCert->len = old->derCert->len;
-            nsslibc_memcpy(new->derCert->data, old->derCert->data,
-                        old->derCert->len);
-            new->nickname =
-                (char *) nss_ZAlloc(NULL, strlen(old->nickname) + 1);
-            strcpy(new->nickname, old->nickname);
-            new->id.data = (void *) nss_ZAlloc(NULL, old->id.size);
-            (void) nsslibc_memcpy(new->id.data, old->id.data,
-                                  old->id.size);
-            new->id.size = old->id.size;
+    pemInternalObject *io = (pemInternalObject *) mdOldObject->etc;
+
+    if (NULL == io->list) {
+        io->refCount ++;
+    } else {
+        /* go through list of objects */
+        pemObjectListItem *item = io->list;
+        while (item) {
+            item->io->refCount ++;
+            item = item->next;
         }
-        goto done;
-    default:
-        plog("Unknown: %08x\n", old->type);
-        goto done; /* no other object types we understand in this module */
-    }
-    if (CKR_OK != *pError) {
-        goto loser;
     }
-
-  done:
-    *pError = CKR_OK;
-    return (NSSCKMDObject *) pem_CreateMDObject(arena, new, &error);
-
-  loser:
-    *pError = CKR_GENERAL_ERROR;
-    return (NSSCKMDObject *) NULL;
-
+    return mdOldObject;
 }
 
 CK_RV
@@ -333,6 +235,9 @@ pem_mdSession_Login
 
     /* Find the right key object */
     for (i = 0; i < pem_nobjs; i++) {
+        if (NULL == gobj[i])
+            continue;
+
         if ((slotID == gobj[i]->slotID) && (gobj[i]->type == pemBareKey)) {
             io = gobj[i];
             break;
diff -r -u -p nss-3.12.4-orig/mozilla/security/nss/lib/ckfw/pem/util.c nss-3.12.4/mozilla/security/nss/lib/ckfw/pem/util.c
--- ./mozilla/security/nss/lib/ckfw/pem/util.c	2009-06-22 11:27:17.000000000 -0700
+++ ./mozilla/security/nss/lib/ckfw/pem/util.c	2009-09-06 12:06:19.731446505 -0700
@@ -168,9 +168,13 @@ ReadDERFromFile(SECItem *** derlist, cha
                     key = 1;
 		    c = body;
 		    body = strchr(body, '\n');
+		    if (NULL == body)
+			goto loser;
 		    body++;
 		    if (strncmp(body, "Proc-Type: 4,ENCRYPTED", 22) == 0) {
 			body = strchr(body, '\n');
+			if (NULL == body)
+			    goto loser;
 			body++;
 			if (strncmp(body, "DEK-Info: ", 10) == 0) {
 			    body += 10;
@@ -202,8 +206,8 @@ ReadDERFromFile(SECItem *** derlist, cha
 		    }
 		}
 		der = (SECItem *) malloc(sizeof(SECItem));
-        if (der == NULL)
-            goto loser;
+                if (der == NULL)
+                    goto loser;
 
 		char *trailer = NULL;
 		asc = body;
@@ -223,15 +227,15 @@ ReadDERFromFile(SECItem *** derlist, cha
 		/* Convert to binary */
 		rv = ATOB_ConvertAsciiToItem(der, body);
 		if (rv) {
-            free(der);
+                    free(der);
 		    goto loser;
 		}
-        if ((certsonly && !key) || (!certsonly && key)) {
+                if ((certsonly && !key) || (!certsonly && key)) {
 		    PUT_Object(der, error);
-        } else {
-            free(der->data);
-            free(der);
-        }
+                } else {
+                    free(der->data);
+                    free(der);
+                }
 	    }			/* while */
 	} else {		/* No headers and footers, translate the blob */
 	    der = nss_ZNEW(NULL, SECItem);



From emaldonado at fedoraproject.org  Sun Sep  6 20:39:23 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun,  6 Sep 2009 20:39:23 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.111,1.112
Message-ID: <20090906203923.BEBC611C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv546

Modified Files:
	nss.spec 
Log Message:
PEM module fixes to implement memory management for internal objects and fix crash when processing malformed key files : bz #509705, #51209


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- nss.spec	5 Sep 2009 23:09:42 -0000	1.111
+++ nss.spec	6 Sep 2009 20:39:23 -0000	1.112
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -35,6 +35,7 @@ Source12:         %{name}-pem-20090622.t
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
+Patch7:           nss-pem-509705.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -89,7 +90,7 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-
+%patch7 -p0 -b .509705
 
 %build
 
@@ -423,6 +424,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sun Sep 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
+- PEM module implements memory management for internal objects - 509705
+- PEM module doesn't crash when processing malformed key files - 512019
+
 * Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
 - Remove symbolic links to shared libraries from devel - 521155
 - No rpath-link in nss-softokn-config



From transif at fedoraproject.org  Sun Sep  6 20:48:46 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun,  6 Sep 2009 20:48:46 +0000 (UTC)
Subject: comps/po sr.po,1.26,1.27
Message-ID: <20090906204846.6148E11C00E5@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3035/po

Modified Files:
	sr.po 
Log Message:
Sending translation for Serbian


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.26 -r 1.27 sr.poIndex: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sr.po	29 Apr 2009 21:07:33 -0000	1.26
+++ sr.po	6 Sep 2009 20:48:45 -0000	1.27
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 19:06+0000\n"
-"PO-Revision-Date: 2009-04-29 22:03+0100\n"
+"POT-Creation-Date: 2009-09-06 19:29+0000\n"
+"PO-Revision-Date: 2009-09-06 21:23+0100\n"
 "Last-Translator: Milo? Komar?evi? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,300 +19,321 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "?????? ????? ???????? ???? ???? ????? ?? ???????? ????????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "??????????????? ??????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????? ?? ??????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "??????? ?? ????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "???????? ?? ???????? ?????? ???????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????? ?? ???????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "??????? ?? ?????????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??????? ?? ????????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "????????? ? ??????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
-msgstr "??????? ??????? ?? ?????????? ????? Ruby."
+msgstr "??????? ??????? ?? ?????????? ????? ????."
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "??????? ?? ?????????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "??????? ?? ?????????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??????? ?? ?????????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "??????? ?? ????????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "??????? ?? ????????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????? ?? ????????? ???????????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "??????? ?? ?????????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "????? ?? ???????? ??????? ????????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "??????? ?? ????????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "??????? ?? ??????????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "??????? ?? ???????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
[...1883 lines suppressed...]
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1394,7 +1503,8 @@ msgstr ""
 "??????? ?? ??????????????? ??????????? ???????? ? 32-????? Windows ??????, "
 "?????? ?????????, ? ???????? ???????????, ??? ?????? Fedora ???????."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1402,15 +1512,18 @@ msgstr ""
 "??????? ?? ?????? ???????? ????????? Objective CAML ?????????? ????? ? "
 "??????????."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "??????? ?? ???????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "??????? ?? ?????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1418,23 +1531,85 @@ msgstr ""
 "??? ????? ?? ???? ?????? ???? ?? ??????? ?? ??????, ??????, ??????, ? "
 "???????? ???????."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "??????? ?? ??????????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??????? ?? ????????????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+"???? ?????? ???? ????? ?????????????? ???????? ?????? ?? GNOME ????????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"???? ?????? ???? ????? ?????? ????????? ?? ?????????????? ???????? ?????? ?? "
+"??? Fedora ??????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "????? ? ??????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "????? ? ?????? ?? Fedora ????????? ? ??????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "???????? ?????? (???????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "???????? ?????? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????? ???????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "??????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ?? ?????? X11 ????? ???????? ??????????? ?? ???????? ?? ?????? "
+"??????????? ??????????????? ??? ??? ?? ?????????, ??????? ??????? ??? "
+"??????? ????????."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "??????? ?????????? ?????? ? ?????????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "?????? ????? ????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "?????? ?? ????? ???????? ?? ?????????/?????????/MID ???????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????? ?? ????? ???????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????? ?? ?????????? ??????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1442,7 +1617,7 @@ msgstr ""
 "GNOME ?? ????????, ???????? ?????????? ???????? ???? ?????? ?????, ????? "
 "????????, ????????? ?????, ? ???????? ????????? ??????????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1450,7 +1625,7 @@ msgstr ""
 "KDE ?? ????????, ???????? ?????????? ???????? ???? ?????? ?????, ????? "
 "????????, ????????? ?????, ? ???????? ????????? ??????????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1458,11 +1633,11 @@ msgstr ""
 "????????? ????????? ??????, ??? ?? ???????? ?? ???????? ? ?????? ????????. "
 "???? ?? ??? ?? Emacs ? Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ???????? ??????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1470,30 +1645,36 @@ msgstr ""
 "??? ?????? ??????????? ???????? ????????????? ? DocBook ??????, ?? ????? "
 "???? ?????????? ? HTML, PDF, Postscript, ? ?????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??? ????? ?? ???? ??????? ??????? ?? ??????? ??????."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ????? ?? ???? ?????? ? ??????? ?? ???????? ????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ????? ?? ???? ?????? ? ??????? ?? ????? ????????."
+
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "Eclipse ??????????? ???????? ????????."



From transif at fedoraproject.org  Sun Sep  6 20:49:22 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun,  6 Sep 2009 20:49:22 +0000 (UTC)
Subject: comps/po sr@latin.po,1.26,1.27
Message-ID: <20090906204922.DF08E11C00E5@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3307/po

Modified Files:
	sr at latin.po 
Log Message:
Sending translation for Serbian (Latin)


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.26 -r 1.27 sr at latin.poIndex: sr at latin.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at latin.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sr at latin.po	29 Apr 2009 21:09:25 -0000	1.26
+++ sr at latin.po	6 Sep 2009 20:49:22 -0000	1.27
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 19:06+0000\n"
-"PO-Revision-Date: 2009-04-29 22:03+0100\n"
+"POT-Creation-Date: 2009-09-06 19:29+0000\n"
+"PO-Revision-Date: 2009-09-06 21:23+0100\n"
 "Last-Translator: Milo? Komar?evi? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,279 +19,300 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Lagano radno okru?enje koje radi dobro na slabijim ma?inama."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administrativne alatke"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Podr?ka za afrikanski"
 
-#: ../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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Podr?ka za albanski"
 
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Programi"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Programi za obavljanje raznih poslova"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Podr?ka za arapski"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Podr?ka za jermenski"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Podr?ka za asame?ki"
 
-#: ../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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autorstvo i izdava?tvo"
 
-#: ../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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Osnova"
 
-#: ../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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Osnovni sistem"
 
-#: ../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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
-msgstr "Osnovna podr?ka za programski jezik Ruby."
+msgstr "Osnovna podr?ka za programski jezik Rubi."
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Podr?ka za baskijski"
 
-#: ../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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Podr?ka za beloruski"
 
-#: ../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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Podr?ka za bengalski"
 
-#: ../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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Podr?ka za butanski"
 
-#: ../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-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Podr?ka za bosanski"
 
-#: ../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-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Podr?ka za brazilski portugalski"
 
-#: ../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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Podr?ka za bretanjski"
 
-#: ../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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Grupa za izgradnju sistema izgradnje"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Podr?ka za bugarski"
 
-#: ../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-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Podr?ka za katalonski"
 
-#: ../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-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "Podr?ka za kineski"
 
-#: ../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-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
[...1878 lines suppressed...]
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1394,7 +1503,8 @@ msgstr ""
 "Podr?ka za me?uplatformsko kompiliranje programa u 32-bitne Windows ciljeve, "
 "njihovo testiranje, i pravljenje instalatera, sve unutar Fedora sistema."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1402,15 +1512,18 @@ msgstr ""
 "Podr?ka za razvoj softvera koriste?i Objective CAML programski jezik i "
 "biblioteke."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Podr?ka za svahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Podr?ka za tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1418,23 +1531,85 @@ msgstr ""
 "Ova grupa je skup alatki koje se koriste za dizajn, izmenu, obradu, i "
 "pakovanje fontova."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Podr?ka za turkmenski"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Podr?ka za gornjelu?i?ki"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+"Skup paketa koji pru?a funkcionalnost kriti?ne putanje za GNOME okru?enje"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"Skup paketa koji pru?a deljenu platformu za funkcionalnost kriti?ne putanje "
+"za sva Fedora izdanja"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Knjige i vodi?i"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Knjige i vodi?i za Fedora korisnike i programere"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Kriti?na putanja (osnovno)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Kriti?na putanja (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Server imenika"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskel"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE je lagano X11 radno okru?enje dizajnirano za ra?unare sa slabim "
+"hardverskim specifikacijama kao ?to su netbukovi, mobilni ure?aji ili "
+"stariji ra?unari."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Serveri identiteta ma?ina i korisnika."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin radno okru?enje"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin je radno okru?enje za netbukove/nettopove/MID ure?aje."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Programi za razne poslove"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Podr?ka za telefonsko umre?avanje"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1442,7 +1617,7 @@ msgstr ""
 "GNOME je napredno, grafi?ko korisni?ko okru?enje koje sadr?i panel, radnu "
 "povr?inu, sistemske ikone, i grafi?ko upravljanje datotekama."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1450,7 +1625,7 @@ msgstr ""
 "KDE je napredno, grafi?ko korisni?ko okru?enje koje sadr?i panel, radnu "
 "povr?inu, sistemske ikone, i grafi?ko upravljanje datotekama."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1458,11 +1633,11 @@ msgstr ""
 "Takozvani ure?iva?i teksta, ovo su programi za pravljenje i izmenu datoteka. "
 "Neki od njih su Emacs i Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ure?iva? teksta."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1470,30 +1645,36 @@ msgstr ""
 "Ove alatke omogu?avaju pravljenje dokumentacije u DocBook obliku, pa potom "
 "njeno pretvaranje u HTML, PDF, Postscript, i tekst."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Ova grupa je skup mre?nih servera za posebne namene."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr "Ova grupa je skup alatki i resursa za arapsko okru?enje."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr "Ova grupa je skup alatki i resursa za hebrejsko okru?enje."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr "Ova grupa je skup alatki i resursa za japansko okru?enje."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr "Ova grupa je skup alatki i resursa za ?e?ko okru?enje."
+
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "Eclipse integrisano razvojno okru?enje."



From pkgdb at fedoraproject.org  Sun Sep  6 20:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:58:53 +0000
Subject: [pkgdb] openvpn: kalev has requested watchcommits
Message-ID: <20090906205853.D4C9110F87E@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on openvpn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sun Sep  6 20:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 20:58:55 +0000
Subject: [pkgdb] openvpn: kalev has requested commit
Message-ID: <20090906205855.D516310F890@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on openvpn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sun Sep  6 21:29:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 21:29:54 +0000
Subject: [pkgdb] slim ownership updated
Message-ID: <20090906212954.530B310F87E@bastion2.fedora.phx.redhat.com>

Package slim in Fedora devel was orphaned by afb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Sun Sep  6 22:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:04:46 +0000
Subject: [pkgdb] autoconf F-12 cloned from devel
Message-ID: <20090906220446.B9C0210F87C@bastion2.fedora.phx.redhat.com>

kevin cloned autoconf F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/autoconf



From pkgdb at fedoraproject.org  Sun Sep  6 22:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:05:41 +0000
Subject: [pkgdb] lxde-icon-theme was added for cwickert
Message-ID: <20090906220542.0A1A810F881@bastion2.fedora.phx.redhat.com>

kevin has added Package lxde-icon-theme with summary Default icon theme for LXDE
kevin has approved Package lxde-icon-theme
kevin has added a Fedora devel branch for lxde-icon-theme with an owner of cwickert
kevin has approved lxde-icon-theme in Fedora devel
kevin has approved Package lxde-icon-theme
kevin has set commit to Approved for 107427 on lxde-icon-theme (Fedora devel)
kevin has set checkout to Approved for 107427 on lxde-icon-theme (Fedora devel)
kevin has set build to Approved for 107427 on lxde-icon-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lxde-icon-theme



From pkgdb at fedoraproject.org  Sun Sep  6 22:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:05:45 +0000
Subject: [pkgdb] lxde-icon-theme summary updated by kevin
Message-ID: <20090906220545.C3BA610F88A@bastion2.fedora.phx.redhat.com>

kevin set package lxde-icon-theme summary to Default icon theme for LXDE

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lxde-icon-theme



From pkgdb at fedoraproject.org  Sun Sep  6 22:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:05:45 +0000
Subject: [pkgdb] lxde-icon-theme (Fedora, 10) updated by kevin
Message-ID: <20090906220546.03A9010F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lxde-icon-theme
kevin has set commit to Approved for 107427 on lxde-icon-theme (Fedora 10)
kevin has set checkout to Approved for 107427 on lxde-icon-theme (Fedora 10)
kevin has set build to Approved for 107427 on lxde-icon-theme (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lxde-icon-theme



From pkgdb at fedoraproject.org  Sun Sep  6 22:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:05:45 +0000
Subject: [pkgdb] lxde-icon-theme (Fedora, 10) updated by kevin
Message-ID: <20090906220546.2CA2D10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lxde-icon-theme
kevin has set commit to Approved for 107427 on lxde-icon-theme (Fedora 11)
kevin has set checkout to Approved for 107427 on lxde-icon-theme (Fedora 11)
kevin has set build to Approved for 107427 on lxde-icon-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lxde-icon-theme



From kevin at fedoraproject.org  Sun Sep  6 22:05:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:05:54 +0000 (UTC)
Subject: rpms/lxde-icon-theme - New directory
Message-ID: <20090906220554.1608811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-icon-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY22433/rpms/lxde-icon-theme

Log Message:
Directory /cvs/pkgs/rpms/lxde-icon-theme added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:05:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:05:54 +0000 (UTC)
Subject: rpms/lxde-icon-theme/devel - New directory
Message-ID: <20090906220554.429B611C0418@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY22433/rpms/lxde-icon-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/lxde-icon-theme/devel added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:06:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:06:00 +0000 (UTC)
Subject: rpms/lxde-icon-theme Makefile,NONE,1.1
Message-ID: <20090906220600.74E2711C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-icon-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY22433/rpms/lxde-icon-theme

Added Files:
	Makefile 
Log Message:
Setup of module lxde-icon-theme


--- NEW FILE Makefile ---
# Top level Makefile for module lxde-icon-theme
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  Sun Sep  6 22:06:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:06:00 +0000 (UTC)
Subject: rpms/lxde-icon-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090906220600.AE9DA11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY22433/rpms/lxde-icon-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lxde-icon-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lxde-icon-theme
# $Id: Makefile,v 1.1 2009/09/06 22:06:00 kevin Exp $
NAME := lxde-icon-theme
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  Sun Sep  6 22:07:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:07:20 +0000
Subject: [pkgdb] sslogger was added for ebrand
Message-ID: <20090906220720.324AA10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package sslogger with summary A keystroke logging utility for privileged user escalation
kevin has approved Package sslogger
kevin has added a Fedora devel branch for sslogger with an owner of ebrand
kevin has approved sslogger in Fedora devel
kevin has approved Package sslogger
kevin has set commit to Approved for 107427 on sslogger (Fedora devel)
kevin has set checkout to Approved for 107427 on sslogger (Fedora devel)
kevin has set build to Approved for 107427 on sslogger (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sslogger



From pkgdb at fedoraproject.org  Sun Sep  6 22:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:07:24 +0000
Subject: [pkgdb] sslogger summary updated by kevin
Message-ID: <20090906220724.6C5B810F895@bastion2.fedora.phx.redhat.com>

kevin set package sslogger summary to A keystroke logging utility for privileged user escalation

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sslogger



From pkgdb at fedoraproject.org  Sun Sep  6 22:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:07:24 +0000
Subject: [pkgdb] sslogger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090906220724.704AC10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sslogger
kevin has set commit to Approved for 107427 on sslogger (Fedora 10)
kevin has set checkout to Approved for 107427 on sslogger (Fedora 10)
kevin has set build to Approved for 107427 on sslogger (Fedora 10)
kevin approved watchbugzilla on sslogger (Fedora 10) for mtasaka
kevin approved watchcommits on sslogger (Fedora 10) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sslogger



From pkgdb at fedoraproject.org  Sun Sep  6 22:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:07:24 +0000
Subject: [pkgdb] sslogger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090906220724.7AAC710F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sslogger
kevin has set commit to Approved for 107427 on sslogger (Fedora 11)
kevin has set checkout to Approved for 107427 on sslogger (Fedora 11)
kevin has set build to Approved for 107427 on sslogger (Fedora 11)
kevin approved watchbugzilla on sslogger (Fedora 11) for mtasaka
kevin approved watchcommits on sslogger (Fedora 11) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sslogger



From pkgdb at fedoraproject.org  Sun Sep  6 22:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:07:24 +0000
Subject: [pkgdb] sslogger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090906220724.8292D10F8A2@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sslogger (Fedora devel) for mtasaka
kevin approved watchcommits on sslogger (Fedora devel) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sslogger



From kevin at fedoraproject.org  Sun Sep  6 22:07:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:07:33 +0000 (UTC)
Subject: rpms/sslogger/devel - New directory
Message-ID: <20090906220733.4840011C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sslogger/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj23062/rpms/sslogger/devel

Log Message:
Directory /cvs/pkgs/rpms/sslogger/devel added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:07:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:07:33 +0000 (UTC)
Subject: rpms/sslogger - New directory
Message-ID: <20090906220733.163EC11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sslogger
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj23062/rpms/sslogger

Log Message:
Directory /cvs/pkgs/rpms/sslogger added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:07:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:07:39 +0000 (UTC)
Subject: rpms/sslogger Makefile,NONE,1.1
Message-ID: <20090906220739.6DA5811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sslogger
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj23062/rpms/sslogger

Added Files:
	Makefile 
Log Message:
Setup of module sslogger


--- NEW FILE Makefile ---
# Top level Makefile for module sslogger
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  Sun Sep  6 22:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:07:24 +0000
Subject: [pkgdb] sslogger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090906220724.9327010F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sslogger
kevin has set commit to Approved for 107427 on sslogger (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sslogger (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sslogger (Fedora EPEL 5)
kevin approved watchbugzilla on sslogger (Fedora EPEL 5) for mtasaka
kevin approved watchcommits on sslogger (Fedora EPEL 5) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sslogger



From kevin at fedoraproject.org  Sun Sep  6 22:07:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:07:39 +0000 (UTC)
Subject: rpms/sslogger/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090906220739.C4E5611C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sslogger/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj23062/rpms/sslogger/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sslogger


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sslogger
# $Id: Makefile,v 1.1 2009/09/06 22:07:39 kevin Exp $
NAME := sslogger
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  Sun Sep  6 22:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:08:16 +0000
Subject: [pkgdb] gnome-mud was added for elanthis
Message-ID: <20090906220816.915CB10F896@bastion2.fedora.phx.redhat.com>

kevin has added Package gnome-mud with summary MUD client for GNOME desktop
kevin has approved Package gnome-mud
kevin has added a Fedora devel branch for gnome-mud with an owner of elanthis
kevin has approved gnome-mud in Fedora devel
kevin has approved Package gnome-mud
kevin has set commit to Approved for 107427 on gnome-mud (Fedora devel)
kevin has set checkout to Approved for 107427 on gnome-mud (Fedora devel)
kevin has set build to Approved for 107427 on gnome-mud (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-mud



From pkgdb at fedoraproject.org  Sun Sep  6 22:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:08:18 +0000
Subject: [pkgdb] gnome-mud summary updated by kevin
Message-ID: <20090906220818.54B6510F89A@bastion2.fedora.phx.redhat.com>

kevin set package gnome-mud summary to MUD client for GNOME desktop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-mud



From pkgdb at fedoraproject.org  Sun Sep  6 22:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:08:18 +0000
Subject: [pkgdb] gnome-mud (Fedora, 12) updated by kevin
Message-ID: <20090906220818.5DD6810F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gnome-mud
kevin has set commit to Approved for 107427 on gnome-mud (Fedora 12)
kevin has set checkout to Approved for 107427 on gnome-mud (Fedora 12)
kevin has set build to Approved for 107427 on gnome-mud (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-mud



From kevin at fedoraproject.org  Sun Sep  6 22:08:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:08:26 +0000 (UTC)
Subject: rpms/gnome-mud - New directory
Message-ID: <20090906220826.1CCCD11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-mud
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23473/rpms/gnome-mud

Log Message:
Directory /cvs/pkgs/rpms/gnome-mud added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:08:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:08:26 +0000 (UTC)
Subject: rpms/gnome-mud/devel - New directory
Message-ID: <20090906220826.5A8D911C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-mud/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23473/rpms/gnome-mud/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-mud/devel added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:08:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:08:33 +0000 (UTC)
Subject: rpms/gnome-mud Makefile,NONE,1.1
Message-ID: <20090906220833.0D80411C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-mud
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23473/rpms/gnome-mud

Added Files:
	Makefile 
Log Message:
Setup of module gnome-mud


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-mud
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  Sun Sep  6 22:08:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:08:33 +0000 (UTC)
Subject: rpms/gnome-mud/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090906220833.5F52411C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-mud/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23473/rpms/gnome-mud/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-mud


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-mud
# $Id: Makefile,v 1.1 2009/09/06 22:08:33 kevin Exp $
NAME := gnome-mud
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  Sun Sep  6 22:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:09:05 +0000
Subject: [pkgdb] libtelnet was added for elanthis
Message-ID: <20090906220905.E5D0B10F88A@bastion2.fedora.phx.redhat.com>

kevin has added Package libtelnet with summary TELNET protocol parsing framework
kevin has approved Package libtelnet
kevin has added a Fedora devel branch for libtelnet with an owner of elanthis
kevin has approved libtelnet in Fedora devel
kevin has approved Package libtelnet
kevin has set commit to Approved for 107427 on libtelnet (Fedora devel)
kevin has set checkout to Approved for 107427 on libtelnet (Fedora devel)
kevin has set build to Approved for 107427 on libtelnet (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtelnet



From pkgdb at fedoraproject.org  Sun Sep  6 22:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:09:07 +0000
Subject: [pkgdb] libtelnet summary updated by kevin
Message-ID: <20090906220907.22FFA10F8A1@bastion2.fedora.phx.redhat.com>

kevin set package libtelnet summary to TELNET protocol parsing framework

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtelnet



From pkgdb at fedoraproject.org  Sun Sep  6 22:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Sep 2009 22:09:07 +0000
Subject: [pkgdb] libtelnet (Fedora, 12) updated by kevin
Message-ID: <20090906220907.4708810F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for libtelnet
kevin has set commit to Approved for 107427 on libtelnet (Fedora 12)
kevin has set checkout to Approved for 107427 on libtelnet (Fedora 12)
kevin has set build to Approved for 107427 on libtelnet (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtelnet



From kevin at fedoraproject.org  Sun Sep  6 22:09:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:09:22 +0000 (UTC)
Subject: rpms/libtelnet - New directory
Message-ID: <20090906220922.196B311C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libtelnet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE23816/rpms/libtelnet

Log Message:
Directory /cvs/pkgs/rpms/libtelnet added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:09:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:09:22 +0000 (UTC)
Subject: rpms/libtelnet/devel - New directory
Message-ID: <20090906220922.42D4311C0423@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libtelnet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE23816/rpms/libtelnet/devel

Log Message:
Directory /cvs/pkgs/rpms/libtelnet/devel added to the repository




From kevin at fedoraproject.org  Sun Sep  6 22:09:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:09:29 +0000 (UTC)
Subject: rpms/libtelnet Makefile,NONE,1.1
Message-ID: <20090906220929.05E8411C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libtelnet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE23816/rpms/libtelnet

Added Files:
	Makefile 
Log Message:
Setup of module libtelnet


--- NEW FILE Makefile ---
# Top level Makefile for module libtelnet
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  Sun Sep  6 22:09:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Sep 2009 22:09:29 +0000 (UTC)
Subject: rpms/libtelnet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090906220929.B017D11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libtelnet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE23816/rpms/libtelnet/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtelnet


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libtelnet
# $Id: Makefile,v 1.1 2009/09/06 22:09:29 kevin Exp $
NAME := libtelnet
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 wtogami at fedoraproject.org  Sun Sep  6 22:53:57 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sun,  6 Sep 2009 22:53:57 +0000 (UTC)
Subject: rpms/wesnoth/devel .cvsignore, 1.40, 1.41 sources, 1.40,
	1.41 wesnoth.spec, 1.82, 1.83
Message-ID: <20090906225357.E1FF711C00E5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/wtogami/wesnoth/devel

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
1.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	6 Jul 2009 01:06:46 -0000	1.40
+++ .cvsignore	6 Sep 2009 22:53:55 -0000	1.41
@@ -1 +1 @@
-wesnoth-1.6.4.tar.bz2
+wesnoth-1.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	6 Jul 2009 01:06:46 -0000	1.40
+++ sources	6 Sep 2009 22:53:55 -0000	1.41
@@ -1 +1 @@
-c8bc4c5b2be28e29563dfe3f89eafd51  wesnoth-1.6.4.tar.bz2
+493826bbd9ba355930765a7e8fe3749a  wesnoth-1.6.5.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- wesnoth.spec	27 Jul 2009 07:11:09 -0000	1.82
+++ wesnoth.spec	6 Sep 2009 22:53:55 -0000	1.83
@@ -1,6 +1,6 @@
 Name:           wesnoth
-Version:        1.6.4
-Release:        3%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -253,6 +253,9 @@ fi
 #%endif
 
 %changelog
+* Sun Sep 06 2009 Warren Togami <wtogami at redhat.com> - 1.6.5-1
+- 1.6.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cchance at fedoraproject.org  Mon Sep  7 00:18:01 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon,  7 Sep 2009 00:18:01 +0000 (UTC)
Subject: rpms/ibus-table-translit/devel .cvsignore, 1.2,
	1.3 ibus-table-translit.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090907001801.B7F0711C00E5@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-translit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28924

Modified Files:
	.cvsignore ibus-table-translit.spec sources 
Log Message:
updated source & introduce russian translit


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-translit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 05:01:42 -0000	1.2
+++ .cvsignore	7 Sep 2009 00:18:00 -0000	1.3
@@ -1 +1 @@
-ibus-table-translit-1.2.0.20090720.tar.gz
+ibus-table-translit-1.2.0.20090907.tar.gz


Index: ibus-table-translit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-translit/devel/ibus-table-translit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-table-translit.spec	7 Aug 2009 05:01:42 -0000	1.1
+++ ibus-table-translit.spec	7 Sep 2009 00:18:00 -0000	1.2
@@ -1,7 +1,7 @@
 Name:       ibus-table-translit
-Version:    1.2.0.20090720
-Release:    2%{?dist}
-Summary:    Translit input methods for ibus-table
+Version:    1.2.0.20090907
+Release:    1%{?dist}
+Summary:    Translit tables for ibus-table
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -15,7 +15,7 @@ Requires(post):   ibus >= 1.2, ibus-tabl
 BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
 
 %description
-The package contains Translit input methods for Table engine of IBus platform. 
+The package contains Translit tables for IBus-Table. 
 
 %prep
 %setup -q
@@ -35,14 +35,21 @@ export IBUS_TABLE_CREATEDB="%{_bindir}/i
 %post
 cd %{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n translit.db
+%{_bindir}/ibus-table-createdb -i -n translit-ua.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_datadir}/ibus-table/tables/translit.db
+%{_datadir}/ibus-table/tables/translit-ua.db
 %{_datadir}/ibus-table/icons/translit.png
+%{_datadir}/ibus-table/icons/translit-ua.png
 
 %changelog
+* Mon Sep 07 2009 Caius 'kaio' Chance <kaio at kaio.me> - 1.2.0.20090907-1.fc12
+- Updated source.
+- Introduced Ukrainian Translit table.
+
 * Wed Jul 22 2009 Caius 'kaio' Chance <kaio at kaio.me> - 1.2.0.20090720-2.fc12
 - Removed BuildRequires of gettext-devel and automake.
 - Removed directories that do not need to own.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-translit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 05:01:42 -0000	1.2
+++ sources	7 Sep 2009 00:18:00 -0000	1.3
@@ -1 +1 @@
-a77c76c5494622fb71a3184fa39b3876  ibus-table-translit-1.2.0.20090720.tar.gz
+6489e406e550dc5128818ce779394d3a  ibus-table-translit-1.2.0.20090907.tar.gz



From mclasen at fedoraproject.org  Mon Sep  7 00:54:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 00:54:59 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.107,1.108
Message-ID: <20090907005459.2AB6411C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5911

Modified Files:
	comps-f12.xml.in 
Log Message:
Install vinagre by default



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- comps-f12.xml.in	5 Sep 2009 22:20:09 -0000	1.107
+++ comps-f12.xml.in	7 Sep 2009 00:54:58 -0000	1.108
@@ -2505,6 +2505,7 @@
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">seahorse</packagereq>
+      <packagereq type="default">vinagre</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
       <packagereq type="default">yum-presto</packagereq>
@@ -2574,7 +2575,6 @@
       <packagereq type="optional">tomboy</packagereq>
       <packagereq type="optional">tracker-search-tool</packagereq>
       <packagereq type="optional">verbiste-gnome</packagereq>
-      <packagereq type="optional">vinagre</packagereq>
       <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
       <packagereq type="optional">xiphos</packagereq>



From pkgdb at fedoraproject.org  Mon Sep  7 00:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 00:59:47 +0000
Subject: [pkgdb] openvpn had acl change status
Message-ID: <20090907005947.B8AF610F85E@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on openvpn (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Mon Sep  7 00:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 00:59:49 +0000
Subject: [pkgdb] openvpn had acl change status
Message-ID: <20090907005949.C8D1710F881@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on openvpn (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:09 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010409.23AB510F85E@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:10 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010411.0351110F881@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:15 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010415.9C6E410F895@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora EPEL 4) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:12 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010412.179BB10F890@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Sys-Virt (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:16 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010416.D9D8F10F89B@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora EPEL 4) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:21 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010421.70ED310F85E@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:21 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010421.D566F10F8A1@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:24 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010424.9819E10F8A4@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 7) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:25 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010425.6A11B10F8A8@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 7) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:28 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010428.4119C10F8AB@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 5) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:28 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010428.DBA2010F8AF@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 5) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:32 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010432.1FAA610F8B2@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 6) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:32 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010432.B84C910F87E@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 6) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:37 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010437.CAF2F10F881@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:37 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010437.D37FD10F8B6@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:40 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010441.0601010F8BC@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:41 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010441.5A71D10F8BF@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:45 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010445.51C3A10F890@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Sys-Virt (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:47 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010447.A78D610F895@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:48 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010448.3A4A310F8C3@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:51 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010451.BE31F10F8C7@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Sys-Virt (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:53 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010453.0C65F10F8CA@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Sys-Virt (Fedora 11) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:04:55 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010455.6300910F8CE@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Sys-Virt (Fedora 11) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:01 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010501.55F3010F8CD@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:03 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010503.63E9C10F8D1@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:06 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010506.35C7410F8D3@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:09 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010509.3702310F89F@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:10 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010511.0D87110F8D6@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 6) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:13 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010513.BEB6A10F8D9@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 5) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:16 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010516.E518110F8A2@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:18 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010518.343D610F8A5@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora EPEL 5) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:20 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010520.88F0810F8E0@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora EPEL 4) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:05:23 +0000
Subject: [pkgdb] perl-Sys-Virt had acl change status
Message-ID: <20090907010523.4786210F8ED@bastion2.fedora.phx.redhat.com>

steve has set the approveacls acl on perl-Sys-Virt (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:44 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010744.A7B8C10F8A0@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on tuxtype2 (Fedora devel) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:44 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010744.EB0C110F8B7@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on tuxtype2 (Fedora devel) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:45 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010745.DB26110F8BD@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on tuxtype2 (Fedora devel) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:53 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010753.8446D10F8C3@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on tuxtype2 (Fedora 10) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:53 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010753.E85C510F8C5@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on tuxtype2 (Fedora 10) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:58 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010758.CD62110F8CD@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on tuxtype2 (Fedora 11) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:55 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010755.B7B4F10F8C9@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on tuxtype2 (Fedora 10) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:07:59 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010759.C013410F8D0@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on tuxtype2 (Fedora 11) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:00 +0000
Subject: [pkgdb] tuxtype2 had acl change status
Message-ID: <20090907010800.8C9E510F8D4@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on tuxtype2 (Fedora 11) to Approved for trasher

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuxtype2



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:28 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010828.4E5D610F8A6@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora devel) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:29 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010829.9765510F8AA@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Parse-CPAN-Meta (Fedora devel) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:29 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010830.10BAD10F8D8@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Parse-CPAN-Meta (Fedora devel) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:35 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010835.2785110F8DC@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora 9) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:35 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010835.7B78A10F8DF@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Parse-CPAN-Meta (Fedora 9) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:36 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010836.E446B10F87C@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Parse-CPAN-Meta (Fedora 9) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:43 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010843.4D19C10F8AD@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora 10) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:44 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010844.3940410F8EE@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Parse-CPAN-Meta (Fedora 10) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:45 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010845.B466A10F87E@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Parse-CPAN-Meta (Fedora 10) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:48 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010848.6353C10F8FC@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora 11) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:48 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010849.03F2D10F8FF@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Parse-CPAN-Meta (Fedora 11) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:08:50 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta had acl change status
Message-ID: <20090907010850.5D94210F902@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Parse-CPAN-Meta (Fedora 11) to Approved for corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:13 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011613.4121810F85E@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-DateTime-Set (Fedora devel) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:14 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011614.1E16910F881@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-DateTime-Set (Fedora devel) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:15 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011615.3BEF710F890@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-DateTime-Set (Fedora devel) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:18 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011618.660C410F895@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-DateTime-Set (Fedora EPEL 4) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:19 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011619.0D0FD10F89C@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-DateTime-Set (Fedora EPEL 4) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:20 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011620.4673010F89F@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-DateTime-Set (Fedora EPEL 4) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:22 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011622.E845910F8A2@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-DateTime-Set (Fedora EPEL 5) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:24 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011624.2CD1C10F8A5@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-DateTime-Set (Fedora EPEL 5) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:25 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011625.2D72E10F85E@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-DateTime-Set (Fedora EPEL 5) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:32 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011632.6D5B710F8AA@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-DateTime-Set (Fedora 11) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:33 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011633.6E2AD10F8AD@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-DateTime-Set (Fedora 11) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:16:34 +0000
Subject: [pkgdb] perl-DateTime-Set had acl change status
Message-ID: <20090907011635.108C510F8B1@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-DateTime-Set (Fedora 11) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Set



From pkgdb at fedoraproject.org  Mon Sep  7 01:17:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:17:52 +0000
Subject: [pkgdb] perl-Set-Infinite had acl change status
Message-ID: <20090907011752.DA2A310F8A3@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Set-Infinite (Fedora EPEL 4) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Set-Infinite



From pkgdb at fedoraproject.org  Mon Sep  7 01:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:17:54 +0000
Subject: [pkgdb] perl-Set-Infinite had acl change status
Message-ID: <20090907011754.3688E10F8A6@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Set-Infinite (Fedora EPEL 4) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Set-Infinite



From pkgdb at fedoraproject.org  Mon Sep  7 01:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:17:55 +0000
Subject: [pkgdb] perl-Set-Infinite had acl change status
Message-ID: <20090907011755.39C3910F88A@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Set-Infinite (Fedora EPEL 4) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Set-Infinite



From pkgdb at fedoraproject.org  Mon Sep  7 01:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:17:57 +0000
Subject: [pkgdb] perl-Set-Infinite had acl change status
Message-ID: <20090907011757.8D33510F890@bastion2.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Set-Infinite (Fedora EPEL 5) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Set-Infinite



From pkgdb at fedoraproject.org  Mon Sep  7 01:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:17:58 +0000
Subject: [pkgdb] perl-Set-Infinite had acl change status
Message-ID: <20090907011758.70CCE10F8AC@bastion2.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Set-Infinite (Fedora EPEL 5) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Set-Infinite



From pkgdb at fedoraproject.org  Mon Sep  7 01:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 01:17:59 +0000
Subject: [pkgdb] perl-Set-Infinite had acl change status
Message-ID: <20090907011759.3907510F8B0@bastion2.fedora.phx.redhat.com>

steve has set the commit acl on perl-Set-Infinite (Fedora EPEL 5) to Approved for xavierb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Set-Infinite



From dwalsh at fedoraproject.org  Mon Sep  7 01:18:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  7 Sep 2009 01:18:06 +0000 (UTC)
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.52,
	1.53 policy-F12.patch, 1.71, 1.72 selinux-policy.spec, 1.911, 1.912
Message-ID: <20090907011806.7E27C11C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13382

Modified Files:
	booleans-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Sep 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-4
- Allow xserver to use  netlink_kobject_uevent_socket



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- booleans-targeted.conf	18 Aug 2009 12:34:25 -0000	1.52
+++ booleans-targeted.conf	7 Sep 2009 01:18:05 -0000	1.53
@@ -8,7 +8,7 @@ allow_execmod = false
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = true
+allow_execstack = false
 
 # Allow ftpd to read cifs directories.
 # 

policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  289 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   24 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1396 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 314 files changed, 14626 insertions(+), 2940 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- policy-F12.patch	2 Sep 2009 13:33:14 -0000	1.71
+++ policy-F12.patch	7 Sep 2009 01:18:05 -0000	1.72
@@ -277,7 +277,7 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.30/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/prelink.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/prelink.if	2009-09-04 10:32:08.000000000 -0400
 @@ -140,3 +140,22 @@
  	files_search_var_lib($1)
  	manage_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
@@ -293,14 +293,25 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`prelink_relabelfrom_var_lib',`
++interface(`prelink_relabel_var_lib',`
 +	gen_require(`
 +		type prelink_var_lib_t;
 +	')
 +
 +	files_search_var_lib($1)
-+	relabelfrom_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
++	relabel_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.30/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/prelink.te	2009-09-04 11:49:19.000000000 -0400
+@@ -89,6 +89,7 @@
+ miscfiles_read_localization(prelink_t)
+ 
+ userdom_use_user_terminals(prelink_t)
++userdom_manage_user_home_content(prelink_t)
+ 
+ optional_policy(`
+ 	amanda_manage_lib(prelink_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.30/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/admin/readahead.te	2009-08-31 13:40:47.000000000 -0400
@@ -964,6 +975,18 @@ diff -b -B --ignore-all-space --exclude-
  	kismet_manage_log(tmpreaper_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tzdata.te serefpolicy-3.6.30/policy/modules/admin/tzdata.te
+--- nsaserefpolicy/policy/modules/admin/tzdata.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/tzdata.te	2009-09-04 11:18:45.000000000 -0400
+@@ -19,6 +19,8 @@
+ files_read_etc_files(tzdata_t)
+ files_search_spool(tzdata_t)
+ 
++fs_getattr_xattr_fs(tzdata_t)
++
+ term_dontaudit_list_ptys(tzdata_t)
+ 
+ locallogin_dontaudit_use_fds(tzdata_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.6.30/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/admin/usermanage.if	2009-08-31 13:40:47.000000000 -0400
@@ -1125,7 +1148,7 @@ diff -b -B --ignore-all-space --exclude-
  sysnet_dns_name_resolve(awstats_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/calamaris.te serefpolicy-3.6.30/policy/modules/apps/calamaris.te
 --- nsaserefpolicy/policy/modules/apps/calamaris.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/apps/calamaris.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/apps/calamaris.te	2009-09-02 09:37:44.000000000 -0400
 @@ -59,12 +59,12 @@
  
  libs_read_lib_files(calamaris_t)
@@ -3726,8 +3749,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.30/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/apps/sandbox.te	2009-08-31 13:40:47.000000000 -0400
-@@ -0,0 +1,302 @@
++++ serefpolicy-3.6.30/policy/modules/apps/sandbox.te	2009-09-03 10:41:22.000000000 -0400
+@@ -0,0 +1,304 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -3873,6 +3896,7 @@ diff -b -B --ignore-all-space --exclude-
 +auth_use_nsswitch(sandbox_x_domain)
 +
 +init_read_utmp(sandbox_x_domain)
++init_dontaudit_write_utmp(sandbox_x_domain)
 +
 +miscfiles_read_localization(sandbox_x_domain)
 +
@@ -3892,10 +3916,11 @@ diff -b -B --ignore-all-space --exclude-
 +	cups_read_rw_config(sandbox_x_domain)
 +')
 +
-+#============= sandbox_x_t ==============
-+allow sandbox_x_t home_root_t:dir search;
-+allow sandbox_x_t user_devpts_t:chr_file { read write };
++userdom_dontaudit_use_user_terminals(sandbox_x_domain)
 +
++#============= sandbox_x_t ==============
++files_search_home(sandbox_x_t)
++userdom_use_user_ptys(sandbox_x_t)
 +
 +########################################
 +#
@@ -4370,8 +4395,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.30/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/apps/wine.te	2009-08-31 13:40:47.000000000 -0400
-@@ -9,20 +9,35 @@
++++ serefpolicy-3.6.30/policy/modules/apps/wine.te	2009-09-02 09:37:57.000000000 -0400
+@@ -9,20 +9,36 @@
  type wine_t;
  type wine_exec_t;
  application_domain(wine_t, wine_exec_t)
@@ -4387,6 +4412,7 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
  	allow wine_t self:process { execstack execmem execheap };
 -	unconfined_domain_noaudit(wine_t)
++allow wine_t self:fifo_file manage_fifo_file_perms;
 +
 +domain_mmap_low_type(wine_t)
 +tunable_policy(`mmap_low_allowed',`
@@ -4413,7 +4439,13 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.30/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/corecommands.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/corecommands.fc	2009-09-03 10:35:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-
++c
+ #
+ # /bin
+ #
 @@ -54,6 +54,7 @@
  /etc/cron.weekly/.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cron.monthly/.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -4440,15 +4472,24 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -221,6 +226,7 @@
+@@ -221,6 +226,8 @@
  /usr/share/PackageKit/pk-upgrade-distro\.sh -- 	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/PackageKit/helpers(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
 +/usr/share/sandbox/sandboxX.sh -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/smolt/client(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall/configpath	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall-perl(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall-shell(/.*)?	gen_context(system_u:object_r:bin_t,s0)
-@@ -315,3 +321,21 @@
+@@ -263,6 +270,7 @@
+ /usr/share/ssl/misc(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/switchdesk/switchdesk-gui\.py -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/system-config-date/system-config-date\.py -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/system-config-selinux/polgen\.py -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/system-config-selinux/system-config-selinux\.py -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/system-config-display/system-config-display -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/system-config-httpd/system-config-httpd -- gen_context(system_u:object_r:bin_t,s0)
+@@ -315,3 +323,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5642,7 +5683,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.30/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/filesystem.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/filesystem.if	2009-09-04 11:37:45.000000000 -0400
 @@ -1537,6 +1537,24 @@
  
  ########################################
@@ -7390,8 +7431,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.30/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/roles/unconfineduser.te	2009-08-31 13:40:47.000000000 -0400
-@@ -0,0 +1,392 @@
++++ serefpolicy-3.6.30/policy/modules/roles/unconfineduser.te	2009-09-04 10:33:43.000000000 -0400
+@@ -0,0 +1,393 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7670,6 +7711,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	rtkit_daemon_system_domain(unconfined_t)
++	rtkit_daemon_system_domain(unconfined_execmem_t)
 +')
 +
 +optional_policy(`
@@ -8133,8 +8175,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.30/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/services/abrt.te	2009-08-31 13:40:47.000000000 -0400
-@@ -0,0 +1,124 @@
++++ serefpolicy-3.6.30/policy/modules/services/abrt.te	2009-09-06 15:27:50.000000000 -0400
+@@ -0,0 +1,120 @@
 +
 +policy_module(abrt,1.0.0)
 +
@@ -8146,6 +8188,7 @@ diff -b -B --ignore-all-space --exclude-
 +type abrt_t;
 +type abrt_exec_t;
 +init_daemon_domain(abrt_t,abrt_exec_t)
++dbus_system_domain(abrt_t,abrt_exec_t)
 +
 +type abrt_initrc_exec_t;
 +init_script_file(abrt_initrc_exec_t)
@@ -8237,11 +8280,6 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_certs(abrt_t)
 +miscfiles_read_localization(abrt_t)
 +
-+optional_policy(`
-+	dbus_connect_system_bus(abrt_t)
-+	dbus_system_bus_client(abrt_t)
-+')
-+
 +# to run bugzilla plugin
 +# read ~/.abrt/Bugzilla.conf
 +userdom_read_user_home_content_files(abrt_t)
@@ -10383,7 +10421,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.30/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/cron.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/cron.te	2009-09-04 10:32:17.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10704,7 +10742,7 @@ diff -b -B --ignore-all-space --exclude-
 +	prelink_manage_lib(system_cronjob_t)
 +	prelink_manage_log(system_cronjob_t)
 +	prelink_read_cache(system_cronjob_t)
-+	prelink_relabelfrom_var_lib(system_cronjob_t)
++	prelink_relabel_var_lib(system_cronjob_t)
  ')
  
  optional_policy(`
@@ -14023,7 +14061,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.30/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/policykit.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/policykit.te	2009-09-04 11:37:59.000000000 -0400
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -14091,7 +14129,7 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -92,12 +112,13 @@
+@@ -92,12 +112,14 @@
  manage_files_pattern(policykit_auth_t, policykit_var_run_t, policykit_var_run_t)
  files_pid_filetrans(policykit_auth_t, policykit_var_run_t, { file dir })
  
@@ -14101,13 +14139,14 @@ diff -b -B --ignore-all-space --exclude-
  files_read_usr_files(policykit_auth_t)
  
 +fs_getattr_all_fs(polkit_auth_t)
++fs_search_tmpfs(polkit_auth_t)
 +
  auth_use_nsswitch(policykit_auth_t)
 +auth_domtrans_chk_passwd(policykit_auth_t)
  
  logging_send_syslog_msg(policykit_auth_t)
  
-@@ -106,7 +127,7 @@
+@@ -106,7 +128,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -14116,7 +14155,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -119,6 +140,14 @@
+@@ -119,6 +141,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -14131,7 +14170,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -126,7 +155,8 @@
+@@ -126,7 +156,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -14141,7 +14180,7 @@ diff -b -B --ignore-all-space --exclude-
  allow policykit_grant_t self:unix_dgram_socket create_socket_perms;
  allow policykit_grant_t self:unix_stream_socket create_stream_socket_perms;
  
-@@ -156,9 +186,12 @@
+@@ -156,9 +187,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -14155,7 +14194,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -170,7 +203,8 @@
+@@ -170,7 +204,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -14942,7 +14981,16 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.6.30/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/ppp.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/ppp.te	2009-09-04 10:22:17.000000000 -0400
+@@ -38,7 +38,7 @@
+ files_type(pppd_etc_rw_t)
+ 
+ type pppd_initrc_exec_t alias pppd_script_exec_t;
+-files_type(pppd_initrc_exec_t)
++init_script_file(pppd_initrc_exec_t)
+ 
+ # pppd_secret_t is the type of the pap and chap password files
+ type pppd_secret_t;
 @@ -193,6 +193,8 @@
  
  optional_policy(`
@@ -15473,7 +15521,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/libexec/rtkit-daemon	--	gen_context(system_u:object_r:rtkit_daemon_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit_daemon.if serefpolicy-3.6.30/policy/modules/services/rtkit_daemon.if
 --- nsaserefpolicy/policy/modules/services/rtkit_daemon.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/services/rtkit_daemon.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/rtkit_daemon.if	2009-09-04 10:33:29.000000000 -0400
 @@ -0,0 +1,63 @@
 +
 +## <summary>policy for rtkit_daemon</summary>
@@ -16520,7 +16568,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te	2009-08-31 17:31:34.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te	2009-09-06 15:49:01.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -16582,7 +16630,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,70 @@
+@@ -94,23 +113,73 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -16647,7 +16695,10 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
 +
 +optional_policy(`
-+	rpm_read_db(setroubleshoot_fixit_t)
++	rpm_signull(setroubleshootd_fixit_t)
++	rpm_read_db(setroubleshootd_fixit_t)
++	rpm_dontaudit_manage_db(setroubleshootd_fixit_t)
++	rpm_use_script_fds(setroubleshootd_fixit_t)
 +')
 +
 +optional_policy(`
@@ -19635,7 +19686,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.30/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/xserver.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/xserver.te	2009-09-04 09:41:10.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -19793,7 +19844,7 @@ diff -b -B --ignore-all-space --exclude-
  domain_use_interactive_fds(xauth_t)
  
  files_read_etc_files(xauth_t)
-@@ -300,20 +325,29 @@
+@@ -300,20 +325,31 @@
  # XDM Local policy
  #
  
@@ -19815,6 +19866,8 @@ diff -b -B --ignore-all-space --exclude-
  allow xdm_t self:appletalk_socket create_socket_perms;
  allow xdm_t self:key { search link write };
  
++allow xdm_t xauth_home_t:file rw_file_perms;
++
  allow xdm_t xconsole_device_t:fifo_file { getattr setattr };
 +manage_dirs_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
 +manage_files_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
@@ -19826,7 +19879,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -329,22 +363,39 @@
+@@ -329,22 +365,39 @@
  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 })
@@ -19869,7 +19922,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 +409,7 @@
+@@ -358,6 +411,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -19877,7 +19930,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 +418,14 @@
+@@ -366,10 +420,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -19893,7 +19946,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +445,13 @@
+@@ -389,11 +447,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -19907,7 +19960,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 +459,7 @@
+@@ -401,6 +461,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -19915,7 +19968,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 +472,17 @@
+@@ -413,14 +474,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -19935,7 +19988,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +493,13 @@
+@@ -431,9 +495,13 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -19949,7 +20002,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +508,7 @@
+@@ -442,6 +510,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -19957,7 +20010,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +517,7 @@
+@@ -450,6 +519,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -19965,7 +20018,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +528,11 @@
+@@ -460,10 +530,11 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -19979,7 +20032,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 +541,9 @@
+@@ -472,6 +543,9 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -19989,7 +20042,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +576,12 @@
+@@ -504,10 +578,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -20002,7 +20055,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +589,46 @@
+@@ -515,12 +591,46 @@
  ')
  
  optional_policy(`
@@ -20049,7 +20102,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +650,30 @@
+@@ -542,6 +652,30 @@
  ')
  
  optional_policy(`
@@ -20080,7 +20133,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +682,9 @@
+@@ -550,8 +684,9 @@
  ')
  
  optional_policy(`
@@ -20092,7 +20145,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +693,6 @@
+@@ -560,7 +695,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -20100,7 +20153,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +703,10 @@
+@@ -571,6 +705,10 @@
  ')
  
  optional_policy(`
@@ -20111,7 +20164,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +723,9 @@
+@@ -587,10 +725,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -20123,11 +20176,12 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +737,11 @@
+@@ -602,9 +739,12 @@
  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;
 +allow xserver_t self:netlink_selinux_socket create_socket_perms;
++allow xserver_t self:netlink_kobject_uevent_socket create_socket_perms;
  
  # Device rules
  allow x_domain xserver_t:x_device { read getattr use setattr setfocus grab bell };
@@ -20135,7 +20189,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +753,14 @@
+@@ -616,13 +756,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -20151,7 +20205,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 +773,19 @@
+@@ -635,9 +776,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -20171,7 +20225,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +819,6 @@
+@@ -671,7 +822,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -20179,7 +20233,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +828,12 @@
+@@ -681,9 +831,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -20193,7 +20247,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +848,12 @@
+@@ -698,8 +851,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -20206,7 +20260,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +875,7 @@
+@@ -721,6 +878,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -20214,7 +20268,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +898,7 @@
+@@ -743,7 +901,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -20223,7 +20277,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +930,20 @@
+@@ -775,12 +933,20 @@
  ')
  
  optional_policy(`
@@ -20245,7 +20299,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,7 +970,7 @@
+@@ -807,7 +973,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -20254,7 +20308,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)
-@@ -828,9 +991,14 @@
+@@ -828,9 +994,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -20269,7 +20323,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)
-@@ -845,11 +1013,14 @@
+@@ -845,11 +1016,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -20285,7 +20339,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1053,8 @@
+@@ -882,6 +1056,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -20294,7 +20348,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1079,8 @@
+@@ -906,6 +1082,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 };
  
@@ -20303,7 +20357,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 };
-@@ -973,17 +1148,49 @@
+@@ -973,17 +1151,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -21121,7 +21175,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.30/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/init.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/init.if	2009-09-03 10:39:12.000000000 -0400
 @@ -174,6 +174,7 @@
  	role system_r types $1;
  
@@ -22492,7 +22546,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.30/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/libraries.fc	2009-09-01 08:55:51.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/libraries.fc	2009-09-04 11:35:21.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -22542,7 +22596,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/(.*/)?java/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
-@@ -115,27 +120,31 @@
+@@ -115,27 +120,30 @@
  
  /usr/(.*/)?nvidia/.+\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -22550,13 +22604,12 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/vlc/codec/librealvideo_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/vlc/codec/libdmo_plugin\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/vlc/codec/librealaudio_plugin\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
 +/usr/lib64/vlc/codec/librealvideo_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib64/vlc/codec/libdmo_plugin\.so	   --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib64/vlc/codec/librealaudio_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/catalyst/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+
+ 
  /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22582,7 +22635,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/(local/)?.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:lib_t,s0)
  /usr/(local/)?lib(64)?/wine/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -143,11 +152,8 @@
+@@ -143,11 +151,8 @@
  /usr/NX/lib/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/NX/lib/libjpeg\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -22594,7 +22647,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/drivers/nvidia_drv\.o -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -168,12 +174,12 @@
+@@ -168,12 +173,12 @@
  
  # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
@@ -22609,7 +22662,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib/maxima/[^/]+/binary-gcl/maxima	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/mozilla/plugins/libvlcplugin\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/nx/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -185,15 +191,10 @@
+@@ -185,15 +190,10 @@
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22626,7 +22679,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -228,31 +229,17 @@
+@@ -228,31 +228,17 @@
  /usr/lib(64)?/ladspa/sc3_1427\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/sc4_1882\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/se4_1883\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22662,7 +22715,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -268,8 +255,8 @@
+@@ -268,8 +254,8 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -22673,7 +22726,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -295,6 +282,8 @@
+@@ -295,6 +281,8 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22682,7 +22735,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +296,94 @@
+@@ -307,10 +295,96 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -22739,6 +22792,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
++/usr/lib(64)?/yafaray/libDarkSky.so 	   --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
 +ifdef(`fixed',`
 +/usr/lib(64)?/libavfilter\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libavdevice\.so.*	 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -23787,8 +23842,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.6.30/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/raid.te	2009-08-31 13:40:47.000000000 -0400
-@@ -44,6 +44,7 @@
++++ serefpolicy-3.6.30/policy/modules/system/raid.te	2009-09-06 15:32:46.000000000 -0400
+@@ -44,11 +44,13 @@
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
  dev_dontaudit_getattr_generic_blk_files(mdadm_t)
  dev_read_realtime_clock(mdadm_t)
@@ -23796,6 +23851,12 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(mdadm_t)
  
+ files_read_etc_files(mdadm_t)
+ files_read_etc_runtime_files(mdadm_t)
++files_dontaudit_getattr_tmpfs_files(mdadm_t)
+ 
+ fs_search_auto_mountpoints(mdadm_t)
+ fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.6.30/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/system/selinuxutil.fc	2009-08-31 13:40:47.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -p -r1.911 -r1.912
--- selinux-policy.spec	2 Sep 2009 13:33:15 -0000	1.911
+++ selinux-policy.spec	7 Sep 2009 01:18:06 -0000	1.912
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.30
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -165,7 +165,7 @@ if [ -s /etc/selinux/config ]; then \
 	. %{_sysconfdir}/selinux/config; \
 	FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
 	if [ "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT} ]; then \
-		cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
+	   [ -f ${FILE_CONTEXT}.pre ] || cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
 	fi \
 fi
 
@@ -443,6 +443,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-4
+- Allow xserver to use  netlink_kobject_uevent_socket
+
+* Thu Sep 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-3
+- Fixes for sandbox 
+
 * Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-2
 - Dontaudit setroubleshootfix looking at /root directory
 



From dwalsh at fedoraproject.org  Mon Sep  7 01:29:08 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  7 Sep 2009 01:29:08 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.72,1.73
Message-ID: <20090907012908.494C911C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17152

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Sep 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-4
- Allow xserver to use  netlink_kobject_uevent_socket


policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  289 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   24 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1396 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 314 files changed, 14626 insertions(+), 2940 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- policy-F12.patch	7 Sep 2009 01:18:05 -0000	1.72
+++ policy-F12.patch	7 Sep 2009 01:29:07 -0000	1.73
@@ -16568,14 +16568,14 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te	2009-09-06 15:49:01.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/setroubleshoot.te	2009-09-06 21:25:04.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
  
-+type setroubleshoot_fixit_t;
-+type setroubleshoot_fixit_exec_t;
-+dbus_system_domain(setroubleshoot_fixit_t, setroubleshoot_fixit_exec_t)
++	type setroubleshoot_fixit_t;
++	type setroubleshoot_fixit_exec_t;
++	dbus_system_domain(setroubleshoot_fixit_t, setroubleshoot_fixit_exec_t)
 +
  ########################################
  #
@@ -16584,10 +16584,10 @@ diff -b -B --ignore-all-space --exclude-
  
 -allow setroubleshootd_t self:capability { dac_override sys_tty_config };
 -allow setroubleshootd_t self:process { signull signal getattr getsched };
-+allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
-+allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
++	allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
++	allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
 +# if bad library causes setroubleshoot to require these, we want to give it so setroubleshoot can continue to run
-+allow setroubleshootd_t self:process { execmem execstack };
++	allow setroubleshootd_t self:process { execmem execstack };
  allow setroubleshootd_t self:fifo_file rw_fifo_file_perms;
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -16595,10 +16595,10 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_kernel_sysctls(setroubleshootd_t)
  kernel_read_system_state(setroubleshootd_t)
-+kernel_read_net_sysctls(setroubleshootd_t)
++	kernel_read_net_sysctls(setroubleshootd_t)
  kernel_read_network_state(setroubleshootd_t)
-+kernel_dontaudit_list_all_proc(setroubleshootd_t)
-+kernel_read_unlabeled_state(setroubleshootd_t)
++	kernel_dontaudit_list_all_proc(setroubleshootd_t)
++	kernel_read_unlabeled_state(setroubleshootd_t)
  
  corecmd_exec_bin(setroubleshootd_t)
  corecmd_exec_shell(setroubleshootd_t)
@@ -16606,27 +16606,27 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_read_urand(setroubleshootd_t)
  dev_read_sysfs(setroubleshootd_t)
-+dev_getattr_all_blk_files(setroubleshootd_t)
-+dev_getattr_all_chr_files(setroubleshootd_t)
++	dev_getattr_all_blk_files(setroubleshootd_t)
++	dev_getattr_all_chr_files(setroubleshootd_t)
  
  domain_dontaudit_search_all_domains_state(setroubleshootd_t)
-+domain_signull_all_domains(setroubleshootd_t)
++	domain_signull_all_domains(setroubleshootd_t)
  
  files_read_usr_files(setroubleshootd_t)
  files_read_etc_files(setroubleshootd_t)
 -files_getattr_all_dirs(setroubleshootd_t)
-+files_list_all(setroubleshootd_t)
++	files_list_all(setroubleshootd_t)
  files_getattr_all_files(setroubleshootd_t)
-+files_getattr_all_pipes(setroubleshootd_t)
-+files_getattr_all_sockets(setroubleshootd_t)
-+files_read_all_symlinks(setroubleshootd_t)
++	files_getattr_all_pipes(setroubleshootd_t)
++	files_getattr_all_sockets(setroubleshootd_t)
++	files_read_all_symlinks(setroubleshootd_t)
  
  fs_getattr_all_dirs(setroubleshootd_t)
  fs_getattr_all_files(setroubleshootd_t)
-+fs_read_fusefs_symlinks(setroubleshootd_t)
-+fs_dontaudit_read_nfs_files(setroubleshootd_t)
-+fs_dontaudit_read_cifs_files(setroubleshootd_t)
-+fs_list_inotifyfs(setroubleshootd_t)
++	fs_read_fusefs_symlinks(setroubleshootd_t)
++	fs_dontaudit_read_nfs_files(setroubleshootd_t)
++	fs_dontaudit_read_cifs_files(setroubleshootd_t)
++	fs_list_inotifyfs(setroubleshootd_t)
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
@@ -16634,7 +16634,7 @@ diff -b -B --ignore-all-space --exclude-
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
-+logging_send_audit_msgs(setroubleshootd_t)
++	logging_send_audit_msgs(setroubleshootd_t)
  logging_send_syslog_msg(setroubleshootd_t)
  logging_stream_connect_dispatcher(setroubleshootd_t)
  
@@ -16642,22 +16642,22 @@ diff -b -B --ignore-all-space --exclude-
  seutil_read_file_contexts(setroubleshootd_t)
 -
 -sysnet_read_config(setroubleshootd_t)
-+seutil_read_bin_policy(setroubleshootd_t)
++	seutil_read_bin_policy(setroubleshootd_t)
  
  userdom_dontaudit_read_user_home_content_files(setroubleshootd_t)
  
  optional_policy(`
-+	locate_read_lib_files(setroubleshootd_t)
-+')
++		locate_read_lib_files(setroubleshootd_t)
++	')
 +
-+optional_policy(`
++	optional_policy(`
  	dbus_system_bus_client(setroubleshootd_t)
  	dbus_connect_system_bus(setroubleshootd_t)
-+	dbus_system_domain(setroubleshootd_t, setroubleshootd_exec_t)
++		dbus_system_domain(setroubleshootd_t, setroubleshootd_exec_t)
  ')
  
  optional_policy(`
-+	rpm_signull(setroubleshootd_t)
++		rpm_signull(setroubleshootd_t)
  	rpm_read_db(setroubleshootd_t)
  	rpm_dontaudit_manage_db(setroubleshootd_t)
  	rpm_use_script_fds(setroubleshootd_t)
@@ -16667,38 +16667,38 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# setroubleshoot_fixit local policy
 +#
-+allow setroubleshoot_fixit_t self:capability sys_nice;
-+allow setroubleshoot_fixit_t self:process { setsched getsched };
-+allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
-+allow setroubleshoot_fixit_t self:unix_dgram_socket create_socket_perms;
++	allow setroubleshoot_fixit_t self:capability sys_nice;
++	allow setroubleshoot_fixit_t self:process { setsched getsched };
++	allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
++	allow setroubleshoot_fixit_t self:unix_dgram_socket create_socket_perms;
 +
-+setroubleshoot_dbus_chat(setroubleshoot_fixit_t)
++	setroubleshoot_dbus_chat(setroubleshoot_fixit_t)
 +
-+corecmd_exec_bin(setroubleshoot_fixit_t)
-+corecmd_exec_shell(setroubleshoot_fixit_t)
++	corecmd_exec_bin(setroubleshoot_fixit_t)
++	corecmd_exec_shell(setroubleshoot_fixit_t)
 +
-+seutil_domtrans_restorecon(setroubleshoot_fixit_t)
++	seutil_domtrans_restorecon(setroubleshoot_fixit_t)
 +
-+files_read_usr_files(setroubleshoot_fixit_t)
-+files_read_etc_files(setroubleshoot_fixit_t)
-+files_list_tmp(setroubleshoot_fixit_t)
++	files_read_usr_files(setroubleshoot_fixit_t)
++	files_read_etc_files(setroubleshoot_fixit_t)
++	files_list_tmp(setroubleshoot_fixit_t)
 +
-+kernel_read_system_state(setroubleshoot_fixit_t)
++	kernel_read_system_state(setroubleshoot_fixit_t)
 +
-+auth_use_nsswitch(setroubleshoot_fixit_t)
++	auth_use_nsswitch(setroubleshoot_fixit_t)
 +
-+logging_send_audit_msgs(setroubleshoot_fixit_t)
-+logging_send_syslog_msg(setroubleshoot_fixit_t)
++	logging_send_audit_msgs(setroubleshoot_fixit_t)
++	logging_send_syslog_msg(setroubleshoot_fixit_t)
 +
-+miscfiles_read_localization(setroubleshoot_fixit_t)
++	miscfiles_read_localization(setroubleshoot_fixit_t)
 +
-+userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
++	userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
 +
-+optional_policy(`
-+	rpm_signull(setroubleshootd_fixit_t)
-+	rpm_read_db(setroubleshootd_fixit_t)
-+	rpm_dontaudit_manage_db(setroubleshootd_fixit_t)
-+	rpm_use_script_fds(setroubleshootd_fixit_t)
++	optional_policy(`
++		rpm_signull(setroubleshoot_fixit_t)
++	rpm_read_db(setroubleshoot_fixit_t)
++	rpm_dontaudit_manage_db(setroubleshoot_fixit_t)
++	rpm_use_script_fds(setroubleshoot_fixit_t)
 +')
 +
 +optional_policy(`



From mclasen at fedoraproject.org  Mon Sep  7 01:30:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 01:30:04 +0000 (UTC)
Subject: rpms/nautilus/devel uninhibit-me-harder.patch, NONE,
	1.1 nautilus.spec, 1.283, 1.284
Message-ID: <20090907013004.11A5211C043D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17313

Modified Files:
	nautilus.spec 
Added Files:
	uninhibit-me-harder.patch 
Log Message:
Fix uninhibiting


uninhibit-me-harder.patch:
 nautilus-file-utilities.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE uninhibit-me-harder.patch ---
diff -up nautilus-2.27.91/libnautilus-private/nautilus-file-utilities.c.release-your-inhibitions nautilus-2.27.91/libnautilus-private/nautilus-file-utilities.c
--- nautilus-2.27.91/libnautilus-private/nautilus-file-utilities.c.release-your-inhibitions	2009-09-06 21:25:01.462765511 -0400
+++ nautilus-2.27.91/libnautilus-private/nautilus-file-utilities.c	2009-09-06 21:25:34.998778724 -0400
@@ -1100,7 +1100,7 @@ nautilus_uninhibit_power_manager (gint c
 {
 	DBusGProxy *proxy;
 	GError *error;
-	g_return_if_fail (cookie < 0);
+	g_return_if_fail (cookie > 0);
 
 	proxy = get_power_manager_proxy ();
 


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- nautilus.spec	27 Aug 2009 00:11:21 -0000	1.283
+++ nautilus.spec	7 Sep 2009 01:30:03 -0000	1.284
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.27.91
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -87,6 +87,7 @@ Patch17:	nautilus-filetype-symlink-fix.p
 
 # from upstream
 Patch20:        nautilus-dupe-id.patch
+Patch21:	uninhibit-me-harder.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -125,6 +126,7 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch20 -p1 -b .dupe-id
+%patch21 -p1 -b .uninhibit-me-harder
 
 %build
 
@@ -265,6 +267,9 @@ fi
 
 
 %changelog
+* Sun Sep  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-3
+- Fix uninhibiting when long-running operations are over
+
 * Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-2
 - Make nautilus-file-management-properties not crash on start
 



From mclasen at fedoraproject.org  Mon Sep  7 01:37:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 01:37:18 +0000 (UTC)
Subject: rpms/gtk2/devel root-event-mask.patch, NONE, 1.1 gtk2.spec, 1.402,
	1.403
Message-ID: <20090907013718.764FE11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19132

Modified Files:
	gtk2.spec 
Added Files:
	root-event-mask.patch 
Log Message:
Fix initial event maks of the root window


root-event-mask.patch:
 gdkwindow-x11.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE root-event-mask.patch ---
diff -up gtk+-2.17.11/gdk/x11/gdkwindow-x11.c.event-mask gtk+-2.17.11/gdk/x11/gdkwindow-x11.c
--- gtk+-2.17.11/gdk/x11/gdkwindow-x11.c.event-mask	2009-09-06 21:31:08.926764157 -0400
+++ gtk+-2.17.11/gdk/x11/gdkwindow-x11.c	2009-09-06 21:32:03.142614346 -0400
@@ -455,8 +455,12 @@ _gdk_windowing_window_init (GdkScreen * 
   private->width = WidthOfScreen (screen_x11->xscreen);
   private->height = HeightOfScreen (screen_x11->xscreen);
   private->viewable = TRUE;
+
+  /* see init_randr_support() in gdkscreen-x11.c */
+  private->event_mask = GDK_STRUCTURE_MASK;
+
   _gdk_window_update_size (screen_x11->root_window);
-  
+
   _gdk_xid_table_insert (screen_x11->display,
 			 &screen_x11->xroot_window,
 			 screen_x11->root_window);


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- gtk2.spec	5 Sep 2009 05:35:13 -0000	1.402
+++ gtk2.spec	7 Sep 2009 01:37:18 -0000	1.403
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -28,7 +28,9 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 
+# from upstream
 Patch1: gtk2-fix-install.patch
+Patch2: root-event-mask.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -141,6 +143,7 @@ This package contains developer document
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .fix-install
+%patch2 -p1 -b .root-event-mask
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -382,6 +385,9 @@ fi
 
 
 %changelog
+* Sun Sep  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.11-2
+- Fix the initial event mask for the root window (#521137)
+
 * Sat Sep  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.11-1
 - Update to 2.17.11
 



From alexlan at fedoraproject.org  Mon Sep  7 02:23:57 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon,  7 Sep 2009 02:23:57 +0000 (UTC)
Subject: rpms/octave/devel octave.spec,1.89,1.90
Message-ID: <20090907022357.8B78D11C00E5@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7465

Modified Files:
	octave.spec 
Log Message:
* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-3
- Disable make check temporarily to get a build against newly fixed lapack



Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- octave.spec	3 Sep 2009 17:31:55 -0000	1.89
+++ octave.spec	7 Sep 2009 02:23:57 -0000	1.90
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        3.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -117,8 +117,8 @@ touch %{buildroot}%{_datadir}/%{name}/oc
 mkdir interpreter
 cp -a doc/interpreter/*.pdf doc/interpreter/HTML/ interpreter/
 
-%check
-make check
+#check
+#make check
 
 %clean
 rm -rf %{buildroot}
@@ -170,6 +170,9 @@ fi
 
 
 %changelog
+* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-3
+- Disable make check temporarily to get a build against newly fixed lapack
+
 * Wed Sep 2 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.2-2
 - Add make check
 



From alexlan at fedoraproject.org  Mon Sep  7 02:25:30 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon,  7 Sep 2009 02:25:30 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.84,1.85
Message-ID: <20090907022530.2ABB811C00E5@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7858

Modified Files:
	octave-forge.spec 
Log Message:
* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-13
- Rebuild against new lapack/octave combination to fix ieee problem



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- octave-forge.spec	31 Aug 2009 11:06:35 -0000	1.84
+++ octave-forge.spec	7 Sep 2009 02:25:30 -0000	1.85
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -249,6 +249,9 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-13
+- Rebuild against new lapack/octave combination to fix ieee problem
+
 * Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-12
 - Add patch from upstream SVN (r6073) for 'vrml'
 - Disable 'fixed' package again, patch fixed the build but fails at



From fujiwara at fedoraproject.org  Mon Sep  7 03:24:20 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Mon,  7 Sep 2009 03:24:20 +0000 (UTC)
Subject: rpms/ibus-anthy/devel .cvsignore, 1.17, 1.18 ibus-anthy.spec, 1.22, 
	1.23 sources, 1.18, 1.19
Message-ID: <20090907032420.8F4CB11C00E5@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29532

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:

Fix bug 510978 - "Typing Method" configuration doesn't work
Fix bug 518373 - ibus setup tools need to set gettext textdomain dir.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	4 Aug 2009 05:52:47 -0000	1.17
+++ .cvsignore	7 Sep 2009 03:24:18 -0000	1.18
@@ -1 +1 @@
-ibus-anthy-1.2.0.20090804.tar.gz
+ibus-anthy-1.2.0.20090907.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ibus-anthy.spec	13 Aug 2009 10:40:30 -0000	1.22
+++ ibus-anthy.spec	7 Sep 2009 03:24:19 -0000	1.23
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define require_ibus_version 1.2.0
+%define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
-Version:    1.2.0.20090813
+Version:    1.2.0.20090907
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -57,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Mon Sep 07 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090907-1
+- Update to 1.2.0.20090907
+- Fix bug 510978 - "Typing Method" configuration doesn't work
+- Fix bug 518373 - ibus setup tools need to set gettext textdomain dir.
+
 * Thu Aug 13 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090813-1
 - Update to 1.2.0.20090813
 - Fix bug 509483 - reconversion feature doesn't work


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	13 Aug 2009 07:27:57 -0000	1.18
+++ sources	7 Sep 2009 03:24:19 -0000	1.19
@@ -1 +1 @@
-6a1bfb19a95fcfd31ee801218d915468  ibus-anthy-1.2.0.20090813.tar.gz
+29a02d3148f5683981f250807a9c78c6  ibus-anthy-1.2.0.20090907.tar.gz



From rdieter at fedoraproject.org  Mon Sep  7 03:25:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  7 Sep 2009 03:25:30 +0000 (UTC)
Subject: rpms/kmymoney2/devel .cvsignore, 1.16, 1.17 kmymoney2.spec, 1.43,
	1.44 sources, 1.15, 1.16
Message-ID: <20090907032530.6AE4C11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30518

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- kmymoney2-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	20 Aug 2009 03:04:23 -0000	1.16
+++ .cvsignore	7 Sep 2009 03:25:30 -0000	1.17
@@ -1 +1 @@
-kmymoney2-1.0.0.tar.bz2
+kmymoney2-1.0.1.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- kmymoney2.spec	4 Sep 2009 13:26:15 -0000	1.43
+++ kmymoney2.spec	7 Sep 2009 03:25:30 -0000	1.44
@@ -13,9 +13,11 @@
 BuildRequires: libutempter-devel
 %endif
 
+%define _with_check 1 
+
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -86,7 +88,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --disable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -210,6 +212,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- kmymoney2-1.0.1
+
 * Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
 - kmymoney2-1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Aug 2009 03:04:23 -0000	1.15
+++ sources	7 Sep 2009 03:25:30 -0000	1.16
@@ -1 +1 @@
-f702ea77ff5bf6aec727768da34d98ec  kmymoney2-1.0.0.tar.bz2
+7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2



From jcollie at fedoraproject.org  Mon Sep  7 04:50:11 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  7 Sep 2009 04:50:11 +0000 (UTC)
Subject: rpms/asterisk/F-11 .cvsignore, 1.21,
	1.22 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.10, 1.11 0005-Build-using-external-libedit.patch, 1.5,
	1.6 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.4, 1.5 asterisk.spec, 1.51, 1.52 menuselect.makeopts, 1.5,
	1.6 sources, 1.21,
	1.22 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.6,
	NONE 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.6,
	NONE 0007-Define-missing-variable-when-compiling-on-PPC.patch, 1.4,
	NONE 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 
	1.4, NONE 0013-Bridging-work-as-of-svn-rev-174216.patch, 1.1,
	NONE 0014-Adding-in-CLI-apps.patch, 1.1,
	NONE 0015-Update-autoconf.patch, 1.1, NONE
Message-ID: <20090907045011.90CBF11C043A@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14924

Modified Files:
	.cvsignore 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0005-Build-using-external-libedit.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	asterisk.spec menuselect.makeopts sources 
Removed Files:
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Define-missing-variable-when-compiling-on-PPC.patch 
	0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0013-Bridging-work-as-of-svn-rev-174216.patch 
	0014-Adding-in-CLI-apps.patch 0015-Update-autoconf.patch 
Log Message:
* Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
- Update to 1.6.1.6
- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	5 Mar 2009 14:12:22 -0000	1.21
+++ .cvsignore	7 Sep 2009 04:50:08 -0000	1.22
@@ -1,3 +1,3 @@
-asterisk-1.6.1-rc1-stripped.tar.gz
-asterisk-1.6.1-rc1.tar.gz.asc
+asterisk-1.6.1.6-stripped.tar.gz
+asterisk-1.6.1.6.tar.gz.asc
 asterisk-developer-pubring.gpg

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
 modules.conf.sample |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	7 Sep 2009 04:50:08 -0000	1.11
@@ -1,20 +1,11 @@
-From fa2cd0b2b289e51cba4329c420d2da1855f860c5 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
-Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
-
----
- configs/modules.conf.sample |   26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
-index 8f73de1..7dd8940 100644
---- a/configs/modules.conf.sample
-+++ b/configs/modules.conf.sample
-@@ -44,3 +44,29 @@ noload => chan_alsa.so
- ; 
- ;noload => res_timing_dahdi.so
- ;noload => res_timing_pthread.so
+Index: configs/modules.conf.sample
+===================================================================
+--- configs/modules.conf.sample	(revision 216642)
++++ configs/modules.conf.sample	(working copy)
+@@ -38,3 +38,29 @@
+ ;noload => chan_oss.so
+ noload => chan_console.so
+ ;
 +
 +;
 +; Voicemail storage selection
@@ -41,6 +32,3 @@ index 8f73de1..7dd8940 100644
 +;
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
--- 
-1.6.1
-

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0005-Build-using-external-libedit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0005-Build-using-external-libedit.patch	9 Feb 2009 05:54:21 -0000	1.5
+++ 0005-Build-using-external-libedit.patch	7 Sep 2009 04:50:09 -0000	1.6
@@ -1,21 +1,8 @@
-From 64a709b530b0fc1dd74805641f7279a6f83e97b7 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 05/15] Build using external libedit.
-
----
- build_tools/menuselect-deps.in |    1 +
- configure.ac                   |   22 ++++++++++++++++++++++
- main/Makefile                  |    8 +++++---
- main/cli.c                     |    3 ++-
- makeopts.in                    |    4 ++++
- 5 files changed, 34 insertions(+), 4 deletions(-)
-
-diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 6d94984..7832687 100644
---- a/build_tools/menuselect-deps.in
-+++ b/build_tools/menuselect-deps.in
-@@ -18,6 +18,7 @@ ISDNNET=@PBX_ISDNNET@
+Index: build_tools/menuselect-deps.in
+===================================================================
+--- build_tools/menuselect-deps.in	(revision 216642)
++++ build_tools/menuselect-deps.in	(working copy)
+@@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
  JACK=@PBX_JACK@
  LDAP=@PBX_LDAP@
@@ -23,11 +10,11 @@ index 6d94984..7832687 100644
  LTDL=@PBX_LTDL@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
-diff --git a/configure.ac b/configure.ac
-index 4519ec9..891548f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -230,6 +230,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 216642)
++++ configure.ac	(working copy)
+@@ -232,6 +232,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -35,7 +22,7 @@ index 4519ec9..891548f 100644
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1602,6 +1603,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1621,6 +1622,27 @@
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -48,7 +35,7 @@ index 4519ec9..891548f 100644
 +   if test "${PKGCONFIG}" != "no"; then
 +      if ${PKGCONFIG} --exists libedit; then
 +         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
-+	 LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
++         LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
 +         LIBEDIT_OBJ=
 +         PBX_LIBEDIT=1
 +         AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
@@ -63,26 +50,26 @@ index 4519ec9..891548f 100644
  if test "${USE_CURL}" != "no"; then
     AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
     if test ! x"${CURL_CONFIG}" = xNo; then
-diff --git a/main/Makefile b/main/Makefile
-index 446bbb2..86a0f3c 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -138,6 +138,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+Index: main/Makefile
+===================================================================
+--- main/Makefile	(revision 216642)
++++ main/Makefile	(working copy)
+@@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
  	rm ast_expr2.o ast_expr2f.o 
  
 +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 +
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
- http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
+ http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -170,13 +172,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -161,13 +163,13 @@
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
- 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
 -	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
@@ -93,11 +80,11 @@ index 446bbb2..86a0f3c 100644
  endif
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
-diff --git a/main/cli.c b/main/cli.c
-index f6982ad..286d775 100644
---- a/main/cli.c
-+++ b/main/cli.c
-@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+Index: main/cli.c
+===================================================================
+--- main/cli.c	(revision 216642)
++++ main/cli.c	(working copy)
+@@ -34,6 +34,8 @@
  #include <ctype.h>
  #include <regex.h>
  
@@ -106,7 +93,7 @@ index f6982ad..286d775 100644
  #include "asterisk/cli.h"
  #include "asterisk/linkedlists.h"
  #include "asterisk/module.h"
-@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -42,7 +44,6 @@
  #include "asterisk/utils.h"
  #include "asterisk/app.h"
  #include "asterisk/lock.h"
@@ -114,11 +101,11 @@ index f6982ad..286d775 100644
  #include "asterisk/threadstorage.h"
  
  /*!
-diff --git a/makeopts.in b/makeopts.in
-index a5b2a5f..e2a8306 100644
---- a/makeopts.in
-+++ b/makeopts.in
-@@ -249,3 +249,7 @@ TINFO_DIR=@TINFO_DIR@
+Index: makeopts.in
+===================================================================
+--- makeopts.in	(revision 216642)
++++ makeopts.in	(working copy)
+@@ -246,3 +246,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
@@ -126,6 +113,3 @@ index a5b2a5f..e2a8306 100644
 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
--- 
-1.6.1
-

0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	9 Feb 2009 05:54:21 -0000	1.4
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	7 Sep 2009 04:50:09 -0000	1.5
@@ -1,18 +1,9 @@
-From 0d6267e70e805371772d4375318d08437fe6b5ca Mon Sep 17 00:00:00 2001
-From: Caolan McNamara <caolanm at redhat.com>
-Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 08/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
-
----
- configure.ac |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 891548f..5cfc205 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1475,7 +1475,17 @@ then
-     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 216642)
++++ configure.ac	(working copy)
+@@ -1493,7 +1493,17 @@
+     AST_CHECK_OSPTK([3], [5], [0])
  fi
  
 -AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
@@ -30,6 +21,3 @@ index 891548f..5cfc205 100644
  
  AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
  
--- 
-1.6.1
-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- asterisk.spec	5 Mar 2009 14:12:22 -0000	1.51
+++ asterisk.spec	7 Sep 2009 04:50:09 -0000	1.52
@@ -1,9 +1,9 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define _rc 1
+#define _rc 1
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1
-Release: 0.23.%{?_rc:rc%{_rc}}%{?dist}
+Version: 1.6.1.6
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,18 +19,18 @@ URL: http://www.asterisk.org/
 
 # MD5 Sums
 # ========
-# 29f7285b673d52b49d91c8e797acbbb0  asterisk-1.6.1-rc1.tar.gz
-# d77d5521c9e742c81356f49ebcf6051a  asterisk-1.6.1-rc1-stripped.tar.gz
+# 63a928373e741524aac09d8c078df7d5  asterisk-1.6.1.6.tar.gz
+# 4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 517176cad6ecf1e223749ae927a5989f2d2c0c29  asterisk-1.6.1-rc1.tar.gz
-# 1fe8c924945ff04acd7883f086cf7f1ce0fc8d88  asterisk-1.6.1-rc1-stripped.tar.gz
+# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1  asterisk-1.6.1.6.tar.gz
+# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1  asterisk-1.6.1.6-stripped.tar.gz
 #
 # SHA256 Sums
 # =========
-# 730dea578f72b51ff13f21320ff81f06e1c10a02a0f723b61c5bf8e47bee5e3b  asterisk-1.6.1-rc1.tar.gz
-# 93b2635208318c834917fad0a75fd59d04c282ca15d7dba2ba494cee22e88b73  asterisk-1.6.1-rc1-stripped.tar.gz
+# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22  asterisk-1.6.1.6.tar.gz
+# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3  asterisk-1.6.1.6-stripped.tar.gz
 
 Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -42,24 +42,17 @@ Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
-Patch3:  0003-Add-chan_mobile-from-asterisk-addons.patch
-Patch4:  0004-Use-pkgconfig-to-check-for-Lua.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
-Patch7:  0007-Define-missing-variable-when-compiling-on-PPC.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch9:  0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch13: 0013-Bridging-work-as-of-svn-rev-174216.patch
-Patch14: 0014-Adding-in-CLI-apps.patch
-Patch15: 0015-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-#BuildRequires: autoconf
-#BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: automake
 
 # core build requirements
 BuildRequires: openssl-devel
@@ -102,6 +95,7 @@ Requires(preun): /sbin/service
 
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
+Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
 
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -138,15 +132,6 @@ Requires: asterisk = %{version}-%{releas
 API documentation for Asterisk.
 %endif
 
-#%package conference
-#Summary: Audio/video conferencing application for Asterisk
-#Group: Applications/Internet
-#Requires: asterisk = %{version}-%{release}
-#BuildRequires: speex-devel
-#
-#%description conference
-#Audio/video conferencing application for Asterisk.
-
 %package curl
 Summary: Modules for Asterisk that use cURL
 Group: Applications/Internet
@@ -283,16 +268,6 @@ Requires: asterisk = %{version}-%{releas
 %description minivm
 MiniVM application for Asterisk.
 
-%package mobile
-Summary: Asterisk channel driver for bluetooth phones and headsets
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-BuildRequires: bluez-libs-devel
-
-%description mobile
-Asterisk channel driver to allow Bluetooth cell/mobile phones to be
-used as FXO devices, and headsets as FXS devices.
-
 %package odbc
 Summary: Applications for Asterisk that use ODBC (except voicemail)
 Group: Applications/Internet
@@ -442,20 +417,13 @@ local filesystem.
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch2 -p0
+%patch5 -p0
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch8 -p0
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -474,16 +442,11 @@ chmod -x contrib/scripts/dbsep.cgi
 
 %build
 
-# if we are building for i386 promote the CPU arch to i486 for atomic operations support
-%ifarch i386
-%define optflags %{__global_cflags} -m32 -march=i486 -mtune=generic -fasynchronous-unwind-tables -Werror-implicit-function-declaration
-%else
 %define optflags %(rpm --eval %%{optflags}) -Werror-implicit-function-declaration
-%endif
 
-#aclocal -I autoconf
-#autoconf
-#autoheader
+aclocal -I autoconf
+autoconf
+autoheader
 
 pushd menuselect/mxml
 %configure
@@ -634,12 +597,10 @@ fi
 %{_libdir}/asterisk/modules/app_alarmreceiver.so
 %{_libdir}/asterisk/modules/app_amd.so
 %{_libdir}/asterisk/modules/app_authenticate.so
-%{_libdir}/asterisk/modules/app_bridgetest.so
 %{_libdir}/asterisk/modules/app_cdr.so
 %{_libdir}/asterisk/modules/app_chanisavail.so
 %{_libdir}/asterisk/modules/app_channelredirect.so
 %{_libdir}/asterisk/modules/app_chanspy.so
-%{_libdir}/asterisk/modules/app_confbridge.so
 %{_libdir}/asterisk/modules/app_controlplayback.so
 %{_libdir}/asterisk/modules/app_db.so
 %{_libdir}/asterisk/modules/app_dial.so
@@ -660,7 +621,6 @@ fi
 %{_libdir}/asterisk/modules/app_morsecode.so
 %{_libdir}/asterisk/modules/app_nbscat.so
 %{_libdir}/asterisk/modules/app_parkandannounce.so
-#%{_libdir}/asterisk/modules/app_pickupchan.so
 %{_libdir}/asterisk/modules/app_playback.so
 %{_libdir}/asterisk/modules/app_privacy.so
 %{_libdir}/asterisk/modules/app_queue.so
@@ -688,16 +648,10 @@ fi
 %{_libdir}/asterisk/modules/app_waituntil.so
 %{_libdir}/asterisk/modules/app_while.so
 %{_libdir}/asterisk/modules/app_zapateller.so
-%{_libdir}/asterisk/modules/bridge_builtin_features.so
-%{_libdir}/asterisk/modules/bridge_multiplexed.so
-%{_libdir}/asterisk/modules/bridge_simple.so
-%{_libdir}/asterisk/modules/bridge_softmix.so
 %{_libdir}/asterisk/modules/cdr_csv.so
 %{_libdir}/asterisk/modules/cdr_custom.so
 %{_libdir}/asterisk/modules/cdr_manager.so
 %{_libdir}/asterisk/modules/chan_agent.so
-%{_libdir}/asterisk/modules/chan_bridge.so
-%{_libdir}/asterisk/modules/chan_features.so
 %{_libdir}/asterisk/modules/chan_iax2.so
 %{_libdir}/asterisk/modules/chan_local.so
 %{_libdir}/asterisk/modules/chan_mgcp.so
@@ -784,6 +738,7 @@ fi
 %{_libdir}/asterisk/modules/res_speech.so
 %{_libdir}/asterisk/modules/res_timing_pthread.so
 %{_libdir}/asterisk/modules/test_dlinklists.so
+%{_libdir}/asterisk/modules/test_heap.so
 
 %{_sbindir}/aelparse
 %{_sbindir}/astcanary
@@ -791,7 +746,6 @@ fi
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
-%{_sbindir}/check_expr
 %{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
@@ -898,16 +852,6 @@ fi
 %doc doc/api/html/*
 %endif
 
-#%files conference
-#%defattr(-,root,root,-)
-#%doc apps/conference/CLI.txt
-#%doc apps/conference/Flags.txt
-#%doc apps/conference/LICENSE
-#%doc apps/conference/README
-#%doc apps/conference/README.videoswitch
-#%doc apps/conference/TODO
-#%{_libdir}/asterisk/modules/app_conference.so
-
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
@@ -1001,12 +945,6 @@ fi
 %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
-%files mobile
-%defattr(-,root,root,-)
-%doc doc/chan_mobile.txt
-%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
-%{_libdir}/asterisk/modules/chan_mobile.so
-
 %files odbc
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
@@ -1099,6 +1037,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
+- Update to 1.6.1.6
+- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.
+
 * Thu Mar  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.23.rc1
 - Rebuild to pick up new AIS and ODBC deps.
 - Update script that strips out bad content from tarball to do the


Index: menuselect.makeopts
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/menuselect.makeopts,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- menuselect.makeopts	9 Feb 2009 05:54:22 -0000	1.5
+++ menuselect.makeopts	7 Sep 2009 04:50:09 -0000	1.6
@@ -1,5 +1,4 @@
 MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_rpt app_skel 
-MENUSELECT_BRIDGES=bridge_zaptel
 MENUSELECT_CDR=cdr_sqlite
 MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb 
 MENUSELECT_CODECS=codec_ilbc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	5 Mar 2009 14:12:22 -0000	1.21
+++ sources	7 Sep 2009 04:50:09 -0000	1.22
@@ -1,3 +1,3 @@
-d77d5521c9e742c81356f49ebcf6051a  asterisk-1.6.1-rc1-stripped.tar.gz
-2ed78cc8eae3b293c5295444e891462e  asterisk-1.6.1-rc1.tar.gz.asc
-4c2feab99acb254a49048b93da97ad42  asterisk-developer-pubring.gpg
+4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
+0c07f535bada3bca06d459ed3a416f22  asterisk-1.6.1.6.tar.gz.asc
+dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg


--- 0003-Add-chan_mobile-from-asterisk-addons.patch DELETED ---


--- 0004-Use-pkgconfig-to-check-for-Lua.patch DELETED ---


--- 0007-Define-missing-variable-when-compiling-on-PPC.patch DELETED ---


--- 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch DELETED ---


--- 0013-Bridging-work-as-of-svn-rev-174216.patch DELETED ---


--- 0014-Adding-in-CLI-apps.patch DELETED ---


--- 0015-Update-autoconf.patch DELETED ---



From alexlan at fedoraproject.org  Mon Sep  7 05:14:03 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon,  7 Sep 2009 05:14:03 +0000 (UTC)
Subject: rpms/atlas/devel atlas.spec,1.27,1.28
Message-ID: <20090907051403.D07C011C00DB@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23150

Modified Files:
	atlas.spec 
Log Message:
* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.8.3-9
- Rebuild against fixed lapack (see #520518)



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- atlas.spec	12 Aug 2009 04:27:51 -0000	1.27
+++ atlas.spec	7 Sep 2009 05:14:03 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -285,6 +285,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.8.3-9
+- Rebuild against fixed lapack (see #520518)
+
 * Wed Aug 13 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-8
 - Revert the last change, it doesn't solve the problem. 
 



From mjakubicek at fedoraproject.org  Mon Sep  7 05:27:53 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon,  7 Sep 2009 05:27:53 +0000 (UTC)
Subject: rpms/PyQwt/devel .cvsignore, 1.2, 1.3 PyQwt.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <20090907052753.AC64A11C00DB@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/PyQwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29101

Modified Files:
	.cvsignore PyQwt.spec sources 
Log Message:
- Fix FTBFS: Update to 5.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jan 2009 14:49:22 -0000	1.2
+++ .cvsignore	7 Sep 2009 05:27:53 -0000	1.3
@@ -1 +1 @@
-PyQwt-5.1.0.tar.gz
+PyQwt-5.2.0.tar.gz


Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/PyQwt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- PyQwt.spec	24 Jul 2009 16:02:55 -0000	1.3
+++ PyQwt.spec	7 Sep 2009 05:27:53 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           PyQwt
-Version:        5.1.0
-Release:        5%{?dist}
+Version:        5.2.0
+Release:        1%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -53,6 +53,10 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
+cd ..
+mv sphinx/build/latex/PyQwt.pdf sphinx
+mv sphinx/build/html sphinx
+rm -rf sphinx/build
 
 # non-executable script
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
@@ -65,15 +69,18 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc ANNOUNCEMENT-%{version} README
 %doc COPYING*
-%{python_sitearch}/PyQt4/Qwt5/
+%{python_sitearch}/PyQt4/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc Doc/*
+%doc sphinx/*
 %doc qt4examples/ 
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Sun Sep  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.2.0-1
+- Fix FTBFS: Update to 5.2.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jan 2009 14:49:22 -0000	1.2
+++ sources	7 Sep 2009 05:27:53 -0000	1.3
@@ -1 +1 @@
-c9d662a0d4fc95cec75d3c526e4e748a  PyQwt-5.1.0.tar.gz
+fcd6c6029090d473dcc9df497516eae7  PyQwt-5.2.0.tar.gz



From jcollie at fedoraproject.org  Mon Sep  7 05:43:14 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  7 Sep 2009 05:43:14 +0000 (UTC)
Subject: rpms/asterisk/devel .cvsignore, 1.21,
	1.22 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.10, 1.11 0005-Build-using-external-libedit.patch, 1.5,
	1.6 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.4, 1.5 asterisk.spec, 1.54, 1.55 menuselect.makeopts, 1.5,
	1.6 sources, 1.21,
	1.22 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.6,
	NONE 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.6,
	NONE 0007-Define-missing-variable-when-compiling-on-PPC.patch, 1.4,
	NONE 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 
	1.4, NONE 0013-Bridging-work-as-of-svn-rev-174216.patch, 1.1,
	NONE 0014-Adding-in-CLI-apps.patch, 1.1,
	NONE 0015-Update-autoconf.patch, 1.1, NONE 0016-pagecount.patch,
	1.1, NONE
Message-ID: <20090907054314.B132C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv518

Modified Files:
	.cvsignore 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0005-Build-using-external-libedit.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	asterisk.spec menuselect.makeopts sources 
Removed Files:
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Define-missing-variable-when-compiling-on-PPC.patch 
	0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0013-Bridging-work-as-of-svn-rev-174216.patch 
	0014-Adding-in-CLI-apps.patch 0015-Update-autoconf.patch 
	0016-pagecount.patch 
Log Message:
* Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
- Update to 1.6.1.6
- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	5 Mar 2009 14:12:22 -0000	1.21
+++ .cvsignore	7 Sep 2009 05:43:12 -0000	1.22
@@ -1,3 +1,3 @@
-asterisk-1.6.1-rc1-stripped.tar.gz
-asterisk-1.6.1-rc1.tar.gz.asc
+asterisk-1.6.1.6-stripped.tar.gz
+asterisk-1.6.1.6.tar.gz.asc
 asterisk-developer-pubring.gpg

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
 modules.conf.sample |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	7 Sep 2009 05:43:12 -0000	1.11
@@ -1,20 +1,11 @@
-From fa2cd0b2b289e51cba4329c420d2da1855f860c5 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
-Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
-
----
- configs/modules.conf.sample |   26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
-index 8f73de1..7dd8940 100644
---- a/configs/modules.conf.sample
-+++ b/configs/modules.conf.sample
-@@ -44,3 +44,29 @@ noload => chan_alsa.so
- ; 
- ;noload => res_timing_dahdi.so
- ;noload => res_timing_pthread.so
+Index: configs/modules.conf.sample
+===================================================================
+--- configs/modules.conf.sample	(revision 216642)
++++ configs/modules.conf.sample	(working copy)
+@@ -38,3 +38,29 @@
+ ;noload => chan_oss.so
+ noload => chan_console.so
+ ;
 +
 +;
 +; Voicemail storage selection
@@ -41,6 +32,3 @@ index 8f73de1..7dd8940 100644
 +;
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
--- 
-1.6.1
-

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0005-Build-using-external-libedit.patch	9 Feb 2009 05:54:21 -0000	1.5
+++ 0005-Build-using-external-libedit.patch	7 Sep 2009 05:43:12 -0000	1.6
@@ -1,21 +1,8 @@
-From 64a709b530b0fc1dd74805641f7279a6f83e97b7 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 05/15] Build using external libedit.
-
----
- build_tools/menuselect-deps.in |    1 +
- configure.ac                   |   22 ++++++++++++++++++++++
- main/Makefile                  |    8 +++++---
- main/cli.c                     |    3 ++-
- makeopts.in                    |    4 ++++
- 5 files changed, 34 insertions(+), 4 deletions(-)
-
-diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 6d94984..7832687 100644
---- a/build_tools/menuselect-deps.in
-+++ b/build_tools/menuselect-deps.in
-@@ -18,6 +18,7 @@ ISDNNET=@PBX_ISDNNET@
+Index: build_tools/menuselect-deps.in
+===================================================================
+--- build_tools/menuselect-deps.in	(revision 216642)
++++ build_tools/menuselect-deps.in	(working copy)
+@@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
  JACK=@PBX_JACK@
  LDAP=@PBX_LDAP@
@@ -23,11 +10,11 @@ index 6d94984..7832687 100644
  LTDL=@PBX_LTDL@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
-diff --git a/configure.ac b/configure.ac
-index 4519ec9..891548f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -230,6 +230,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 216642)
++++ configure.ac	(working copy)
+@@ -232,6 +232,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -35,7 +22,7 @@ index 4519ec9..891548f 100644
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1602,6 +1603,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1621,6 +1622,27 @@
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -48,7 +35,7 @@ index 4519ec9..891548f 100644
 +   if test "${PKGCONFIG}" != "no"; then
 +      if ${PKGCONFIG} --exists libedit; then
 +         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
-+	 LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
++         LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
 +         LIBEDIT_OBJ=
 +         PBX_LIBEDIT=1
 +         AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
@@ -63,26 +50,26 @@ index 4519ec9..891548f 100644
  if test "${USE_CURL}" != "no"; then
     AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
     if test ! x"${CURL_CONFIG}" = xNo; then
-diff --git a/main/Makefile b/main/Makefile
-index 446bbb2..86a0f3c 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -138,6 +138,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+Index: main/Makefile
+===================================================================
+--- main/Makefile	(revision 216642)
++++ main/Makefile	(working copy)
+@@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
  	rm ast_expr2.o ast_expr2f.o 
  
 +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 +
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
- http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
+ http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -170,13 +172,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -161,13 +163,13 @@
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
- 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
 -	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
@@ -93,11 +80,11 @@ index 446bbb2..86a0f3c 100644
  endif
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
-diff --git a/main/cli.c b/main/cli.c
-index f6982ad..286d775 100644
---- a/main/cli.c
-+++ b/main/cli.c
-@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+Index: main/cli.c
+===================================================================
+--- main/cli.c	(revision 216642)
++++ main/cli.c	(working copy)
+@@ -34,6 +34,8 @@
  #include <ctype.h>
  #include <regex.h>
  
@@ -106,7 +93,7 @@ index f6982ad..286d775 100644
  #include "asterisk/cli.h"
  #include "asterisk/linkedlists.h"
  #include "asterisk/module.h"
-@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -42,7 +44,6 @@
  #include "asterisk/utils.h"
  #include "asterisk/app.h"
  #include "asterisk/lock.h"
@@ -114,11 +101,11 @@ index f6982ad..286d775 100644
  #include "asterisk/threadstorage.h"
  
  /*!
-diff --git a/makeopts.in b/makeopts.in
-index a5b2a5f..e2a8306 100644
---- a/makeopts.in
-+++ b/makeopts.in
-@@ -249,3 +249,7 @@ TINFO_DIR=@TINFO_DIR@
+Index: makeopts.in
+===================================================================
+--- makeopts.in	(revision 216642)
++++ makeopts.in	(working copy)
+@@ -246,3 +246,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
@@ -126,6 +113,3 @@ index a5b2a5f..e2a8306 100644
 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
--- 
-1.6.1
-

0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	9 Feb 2009 05:54:21 -0000	1.4
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	7 Sep 2009 05:43:12 -0000	1.5
@@ -1,18 +1,9 @@
-From 0d6267e70e805371772d4375318d08437fe6b5ca Mon Sep 17 00:00:00 2001
-From: Caolan McNamara <caolanm at redhat.com>
-Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 08/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
-
----
- configure.ac |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 891548f..5cfc205 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1475,7 +1475,17 @@ then
-     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 216642)
++++ configure.ac	(working copy)
+@@ -1493,7 +1493,17 @@
+     AST_CHECK_OSPTK([3], [5], [0])
  fi
  
 -AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
@@ -30,6 +21,3 @@ index 891548f..5cfc205 100644
  
  AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
  
--- 
-1.6.1
-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- asterisk.spec	2 Sep 2009 02:53:49 -0000	1.54
+++ asterisk.spec	7 Sep 2009 05:43:14 -0000	1.55
@@ -1,9 +1,9 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define _rc 1
+#define _rc 1
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1
-Release: 0.26.%{?_rc:rc%{_rc}}%{?dist}
+Version: 1.6.1.6
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,18 +19,18 @@ URL: http://www.asterisk.org/
 
 # MD5 Sums
 # ========
-# 29f7285b673d52b49d91c8e797acbbb0  asterisk-1.6.1-rc1.tar.gz
-# d77d5521c9e742c81356f49ebcf6051a  asterisk-1.6.1-rc1-stripped.tar.gz
+# 63a928373e741524aac09d8c078df7d5  asterisk-1.6.1.6.tar.gz
+# 4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 517176cad6ecf1e223749ae927a5989f2d2c0c29  asterisk-1.6.1-rc1.tar.gz
-# 1fe8c924945ff04acd7883f086cf7f1ce0fc8d88  asterisk-1.6.1-rc1-stripped.tar.gz
+# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1  asterisk-1.6.1.6.tar.gz
+# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1  asterisk-1.6.1.6-stripped.tar.gz
 #
 # SHA256 Sums
 # =========
-# 730dea578f72b51ff13f21320ff81f06e1c10a02a0f723b61c5bf8e47bee5e3b  asterisk-1.6.1-rc1.tar.gz
-# 93b2635208318c834917fad0a75fd59d04c282ca15d7dba2ba494cee22e88b73  asterisk-1.6.1-rc1-stripped.tar.gz
+# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22  asterisk-1.6.1.6.tar.gz
+# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3  asterisk-1.6.1.6-stripped.tar.gz
 
 Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -42,25 +42,17 @@ Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
-Patch3:  0003-Add-chan_mobile-from-asterisk-addons.patch
-Patch4:  0004-Use-pkgconfig-to-check-for-Lua.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
-Patch7:  0007-Define-missing-variable-when-compiling-on-PPC.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch9:  0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch13: 0013-Bridging-work-as-of-svn-rev-174216.patch
-Patch14: 0014-Adding-in-CLI-apps.patch
-Patch15: 0015-Update-autoconf.patch
-Patch16: 0016-pagecount.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-#BuildRequires: autoconf
-#BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: automake
 
 # core build requirements
 BuildRequires: openssl-devel
@@ -103,6 +95,7 @@ Requires(preun): /sbin/service
 
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
+Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
 
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -139,15 +132,6 @@ Requires: asterisk = %{version}-%{releas
 API documentation for Asterisk.
 %endif
 
-#%package conference
-#Summary: Audio/video conferencing application for Asterisk
-#Group: Applications/Internet
-#Requires: asterisk = %{version}-%{release}
-#BuildRequires: speex-devel
-#
-#%description conference
-#Audio/video conferencing application for Asterisk.
-
 %package curl
 Summary: Modules for Asterisk that use cURL
 Group: Applications/Internet
@@ -284,16 +268,6 @@ Requires: asterisk = %{version}-%{releas
 %description minivm
 MiniVM application for Asterisk.
 
-%package mobile
-Summary: Asterisk channel driver for bluetooth phones and headsets
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-BuildRequires: bluez-libs-devel
-
-%description mobile
-Asterisk channel driver to allow Bluetooth cell/mobile phones to be
-used as FXO devices, and headsets as FXS devices.
-
 %package odbc
 Summary: Applications for Asterisk that use ODBC (except voicemail)
 Group: Applications/Internet
@@ -443,21 +417,13 @@ local filesystem.
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch2 -p0
+%patch5 -p0
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch8 -p0
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -476,16 +442,11 @@ chmod -x contrib/scripts/dbsep.cgi
 
 %build
 
-# if we are building for i386 promote the CPU arch to i486 for atomic operations support
-%ifarch i386
-%define optflags %{__global_cflags} -m32 -march=i486 -mtune=generic -fasynchronous-unwind-tables -Werror-implicit-function-declaration
-%else
 %define optflags %(rpm --eval %%{optflags}) -Werror-implicit-function-declaration
-%endif
 
-#aclocal -I autoconf
-#autoconf
-#autoheader
+aclocal -I autoconf
+autoconf
+autoheader
 
 pushd menuselect/mxml
 %configure
@@ -636,12 +597,10 @@ fi
 %{_libdir}/asterisk/modules/app_alarmreceiver.so
 %{_libdir}/asterisk/modules/app_amd.so
 %{_libdir}/asterisk/modules/app_authenticate.so
-%{_libdir}/asterisk/modules/app_bridgetest.so
 %{_libdir}/asterisk/modules/app_cdr.so
 %{_libdir}/asterisk/modules/app_chanisavail.so
 %{_libdir}/asterisk/modules/app_channelredirect.so
 %{_libdir}/asterisk/modules/app_chanspy.so
-%{_libdir}/asterisk/modules/app_confbridge.so
 %{_libdir}/asterisk/modules/app_controlplayback.so
 %{_libdir}/asterisk/modules/app_db.so
 %{_libdir}/asterisk/modules/app_dial.so
@@ -662,7 +621,6 @@ fi
 %{_libdir}/asterisk/modules/app_morsecode.so
 %{_libdir}/asterisk/modules/app_nbscat.so
 %{_libdir}/asterisk/modules/app_parkandannounce.so
-#%{_libdir}/asterisk/modules/app_pickupchan.so
 %{_libdir}/asterisk/modules/app_playback.so
 %{_libdir}/asterisk/modules/app_privacy.so
 %{_libdir}/asterisk/modules/app_queue.so
@@ -690,16 +648,10 @@ fi
 %{_libdir}/asterisk/modules/app_waituntil.so
 %{_libdir}/asterisk/modules/app_while.so
 %{_libdir}/asterisk/modules/app_zapateller.so
-%{_libdir}/asterisk/modules/bridge_builtin_features.so
-%{_libdir}/asterisk/modules/bridge_multiplexed.so
-%{_libdir}/asterisk/modules/bridge_simple.so
-%{_libdir}/asterisk/modules/bridge_softmix.so
 %{_libdir}/asterisk/modules/cdr_csv.so
 %{_libdir}/asterisk/modules/cdr_custom.so
 %{_libdir}/asterisk/modules/cdr_manager.so
 %{_libdir}/asterisk/modules/chan_agent.so
-%{_libdir}/asterisk/modules/chan_bridge.so
-%{_libdir}/asterisk/modules/chan_features.so
 %{_libdir}/asterisk/modules/chan_iax2.so
 %{_libdir}/asterisk/modules/chan_local.so
 %{_libdir}/asterisk/modules/chan_mgcp.so
@@ -786,6 +738,7 @@ fi
 %{_libdir}/asterisk/modules/res_speech.so
 %{_libdir}/asterisk/modules/res_timing_pthread.so
 %{_libdir}/asterisk/modules/test_dlinklists.so
+%{_libdir}/asterisk/modules/test_heap.so
 
 %{_sbindir}/aelparse
 %{_sbindir}/astcanary
@@ -793,7 +746,6 @@ fi
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
-%{_sbindir}/check_expr
 %{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
@@ -900,16 +852,6 @@ fi
 %doc doc/api/html/*
 %endif
 
-#%files conference
-#%defattr(-,root,root,-)
-#%doc apps/conference/CLI.txt
-#%doc apps/conference/Flags.txt
-#%doc apps/conference/LICENSE
-#%doc apps/conference/README
-#%doc apps/conference/README.videoswitch
-#%doc apps/conference/TODO
-#%{_libdir}/asterisk/modules/app_conference.so
-
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
@@ -1003,12 +945,6 @@ fi
 %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
-%files mobile
-%defattr(-,root,root,-)
-%doc doc/chan_mobile.txt
-%config(noreplace) %{_sysconfdir}/asterisk/mobile.conf
-%{_libdir}/asterisk/modules/chan_mobile.so
-
 %files odbc
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
@@ -1101,6 +1037,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
+- Update to 1.6.1.6
+- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.
+
 * Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
 - Add a patch from Quentin Armitage and rebuld.
 


Index: menuselect.makeopts
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/menuselect.makeopts,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- menuselect.makeopts	9 Feb 2009 05:54:22 -0000	1.5
+++ menuselect.makeopts	7 Sep 2009 05:43:14 -0000	1.6
@@ -1,5 +1,4 @@
 MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_rpt app_skel 
-MENUSELECT_BRIDGES=bridge_zaptel
 MENUSELECT_CDR=cdr_sqlite
 MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb 
 MENUSELECT_CODECS=codec_ilbc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	5 Mar 2009 14:12:22 -0000	1.21
+++ sources	7 Sep 2009 05:43:14 -0000	1.22
@@ -1,3 +1,3 @@
-d77d5521c9e742c81356f49ebcf6051a  asterisk-1.6.1-rc1-stripped.tar.gz
-2ed78cc8eae3b293c5295444e891462e  asterisk-1.6.1-rc1.tar.gz.asc
-4c2feab99acb254a49048b93da97ad42  asterisk-developer-pubring.gpg
+4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
+0c07f535bada3bca06d459ed3a416f22  asterisk-1.6.1.6.tar.gz.asc
+dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg


--- 0003-Add-chan_mobile-from-asterisk-addons.patch DELETED ---


--- 0004-Use-pkgconfig-to-check-for-Lua.patch DELETED ---


--- 0007-Define-missing-variable-when-compiling-on-PPC.patch DELETED ---


--- 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch DELETED ---


--- 0013-Bridging-work-as-of-svn-rev-174216.patch DELETED ---


--- 0014-Adding-in-CLI-apps.patch DELETED ---


--- 0015-Update-autoconf.patch DELETED ---


--- 0016-pagecount.patch DELETED ---



From whot at fedoraproject.org  Mon Sep  7 05:54:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  7 Sep 2009 05:54:51 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.73, 1.74 sources, 1.68,
	1.69 xorg-x11-server.spec, 1.482, 1.483
Message-ID: <20090907055451.649B411C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4178

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Log Message:
* Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.900-1
- xserver 1.6.99.900 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	3 Sep 2009 03:11:21 -0000	1.73
+++ .cvsignore	7 Sep 2009 05:54:49 -0000	1.74
@@ -1 +1 @@
-xorg-server-20090903.tar.xz
+xorg-server-1.6.99.900.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	3 Sep 2009 03:11:21 -0000	1.68
+++ sources	7 Sep 2009 05:54:50 -0000	1.69
@@ -1 +1 @@
-d1e78cc3b2455b9d307bf52c10db2e0d  xorg-server-20090903.tar.xz
+e12b367b44e27def991f4542d85a9c63  xorg-server-1.6.99.900.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -p -r1.482 -r1.483
--- xorg-x11-server.spec	3 Sep 2009 03:11:21 -0000	1.482
+++ xorg-x11-server.spec	7 Sep 2009 05:54:50 -0000	1.483
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090903
+#define gitdate 20090903
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.99
-Release:   45.%{gitdate}%{?dist}
+Version:   1.6.99.900
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -504,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.900-1
+- xserver 1.6.99.900 
+
 * Thu Sep 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-45.20090903
 - Today's git snapshot.
 



From mjakubicek at fedoraproject.org  Mon Sep  7 06:00:18 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon,  7 Sep 2009 06:00:18 +0000 (UTC)
Subject: rpms/spambayes/devel spambayes.spec,1.5,1.6
Message-ID: <20090907060018.16F3C11C043A@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/spambayes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5586

Modified Files:
	spambayes.spec 
Log Message:
- Fix FTBFS: remove %%exclude of Python's byte-compiled files under %%{_bindir},
  not necessary anymore (has been fixed in brp-python-bytecompile)



Index: spambayes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spambayes/devel/spambayes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- spambayes.spec	27 Jul 2009 04:38:23 -0000	1.5
+++ spambayes.spec	7 Sep 2009 06:00:17 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           spambayes
 Version:        1.0.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Bayesian anti-spam filter
 
 Group:          Development/Languages
@@ -68,11 +68,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.txt
 %{python_sitelib}/*
 %{_bindir}/*
-%exclude %{_bindir}/*.pyo
-%exclude %{_bindir}/*.pyc
 
 
 %changelog
+* Mon Sep  7 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.0.4-9
+- Fix FTBFS: remove %%exclude of Python's byte-compiled files under %%{_bindir},
+  not necessary anymore (has been fixed in brp-python-bytecompile)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kalev at fedoraproject.org  Mon Sep  7 06:28:06 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Mon,  7 Sep 2009 06:28:06 +0000 (UTC)
Subject: rpms/openvpn/devel .cvsignore, 1.24, 1.25 openvpn.spec, 1.46,
	1.47 sources, 1.24, 1.25
Message-ID: <20090907062806.5EEB711C00DB@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12806

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
- Update to 2.1_rc19
- Build with pkcs11-helper



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	30 Nov 2008 14:27:28 -0000	1.24
+++ .cvsignore	7 Sep 2009 06:28:03 -0000	1.25
@@ -1,2 +1,2 @@
-openvpn-2.1_rc15.tar.gz
-openvpn-2.1_rc15.tar.gz.asc
+openvpn-2.1_rc19.tar.gz
+openvpn-2.1_rc19.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- openvpn.spec	21 Aug 2009 15:08:58 -0000	1.46
+++ openvpn.spec	7 Sep 2009 06:28:04 -0000	1.47
@@ -1,10 +1,10 @@
-%define prerelease rc15
+%define prerelease rc19
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.34%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.35%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -24,6 +24,7 @@ BuildRoot:         %{_tmppath}/%{name}-%
 BuildRequires:     lzo-devel
 BuildRequires:     openssl-devel
 BuildRequires:     pam-devel
+BuildRequires:     pkcs11-helper-devel
 # For /sbin/ip.
 BuildRequires:     iproute
 # We need /dev/net/tun.
@@ -169,6 +170,10 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Sep 06 2009 Kalev Lember <kalev at smartlink.ee> - 2.1-0.35.rc19
+- Update to 2.1_rc19
+- Build with pkcs11-helper
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1-0.34.rc15
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	30 Nov 2008 14:27:28 -0000	1.24
+++ sources	7 Sep 2009 06:28:04 -0000	1.25
@@ -1,2 +1,2 @@
-14a35b05c5a16292d149592d1dad0302  openvpn-2.1_rc15.tar.gz
-148c13b3c0f6d5eef99755df7bf84526  openvpn-2.1_rc15.tar.gz.asc
+ba2ee667a8b7606b125b7d32f47ca578  openvpn-2.1_rc19.tar.gz
+60dd63b0b37cabb5f467e1ededd013ce  openvpn-2.1_rc19.tar.gz.asc



From whot at fedoraproject.org  Mon Sep  7 06:36:58 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  7 Sep 2009 06:36:58 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel xorg-x11-drv-synaptics.spec, 1.33,
	1.34
Message-ID: <20090907063658.2CBC911C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15451

Modified Files:
	xorg-x11-drv-synaptics.spec 
Log Message:
* Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-6.20090907
- Update to today's git master (synaptics 1.1.99.1)



Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-synaptics.spec	28 Jul 2009 04:25:29 -0000	1.33
+++ xorg-x11-drv-synaptics.spec	7 Sep 2009 06:36:57 -0000	1.34
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/input
 
-%define gitdate 20090728
+%define gitdate 20090907
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.99
-Release:        5.%{gitdate}%{?dist}
+Release:        6.%{gitdate}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -121,6 +121,9 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-6.20090907
+- Update to today's git master (synaptics 1.1.99.1)
+
 * Tue Jul 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-5.20090728
 - Update to today's git master.
 



From whot at fedoraproject.org  Mon Sep  7 06:53:29 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  7 Sep 2009 06:53:29 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel .cvsignore, 1.17, 1.18 sources,
	1.17, 1.18 xorg-x11-drv-synaptics.spec, 1.34, 1.35
Message-ID: <20090907065329.7923611C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20064

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Log Message:
* Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-7.20090907
- This time with the tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	28 Jul 2009 04:25:29 -0000	1.17
+++ .cvsignore	7 Sep 2009 06:53:28 -0000	1.18
@@ -1 +1 @@
-xf86-input-synaptics-20090728.tar.bz2
+xf86-input-synaptics-20090907.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	28 Jul 2009 04:25:29 -0000	1.17
+++ sources	7 Sep 2009 06:53:28 -0000	1.18
@@ -1 +1 @@
-d68ac190ec16f7f21bdf1c009a475f40  xf86-input-synaptics-20090728.tar.bz2
+3ab1532a478275138ec5602793fb4d07  xf86-input-synaptics-20090907.tar.bz2


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-synaptics.spec	7 Sep 2009 06:36:57 -0000	1.34
+++ xorg-x11-drv-synaptics.spec	7 Sep 2009 06:53:28 -0000	1.35
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.99
-Release:        6.%{gitdate}%{?dist}
+Release:        7.%{gitdate}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -121,6 +121,9 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-7.20090907
+- This time with the tarball.
+
 * Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-6.20090907
 - Update to today's git master (synaptics 1.1.99.1)
 



From salimma at fedoraproject.org  Mon Sep  7 06:59:48 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 06:59:48 +0000 (UTC)
Subject: rpms/llvm/devel llvm-2.6-destdir-clang.patch, NONE,
	1.1 llvm-2.6-destdir.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 llvm.spec, 1.19, 1.20 sources, 1.7,
	1.8 llvm-2.1-fix-sed.patch, 1.1, NONE llvm-2.4-fix-ocaml.patch,
	1.1, NONE llvm-2.5-gcc44.patch, 1.1, NONE
Message-ID: <20090907065948.458B711C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21705

Modified Files:
	.cvsignore llvm.spec sources 
Added Files:
	llvm-2.6-destdir-clang.patch llvm-2.6-destdir.patch 
Removed Files:
	llvm-2.1-fix-sed.patch llvm-2.4-fix-ocaml.patch 
	llvm-2.5-gcc44.patch 
Log Message:
* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.1.pre1
- First 2.6 prerelease
- Enable Clang front-end
- Enable debuginfo generation


llvm-2.6-destdir-clang.patch:
 docs/Makefile           |   18 +++++++++---------
 docs/tools/Makefile     |    6 +++---
 tools/clang-cc/Makefile |    3 +--
 3 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE llvm-2.6-destdir-clang.patch ---
>From 01c48a60e0a3bcd2e4d6829f2f0186d4ee6ef504 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erickt at pixar.com>
Date: Fri, 21 Aug 2009 12:37:18 -0700
Subject: [PATCH] Use LLVM's new DESTDIR-less PROJ_* variables.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.4"

This is a multi-part message in MIME format.
--------------1.6.4
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 docs/Makefile           |   18 +++++++++---------
 docs/tools/Makefile     |    6 +++---
 tools/clang-cc/Makefile |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)


--------------1.6.4
Content-Type: text/x-patch; name="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch"

diff --git docs/Makefile docs/Makefile
index 9b706c7..e9bbb28 100644
--- docs/Makefile
+++ docs/Makefile
@@ -48,11 +48,11 @@ generated:: doxygen
 
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
 	$(Echo) Installing HTML documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-#	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+#	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 	$(Echo) Packaging HTML documentation
@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 
 install-doxygen: doxygen
 	$(Echo) Installing doxygen documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
 
@@ -94,4 +94,4 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
 
 uninstall-local::
 	$(Echo) Uninstalling Documentation
-	$(Verb) $(RM) -rf $(PROJ_docsdir)
+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
diff --git docs/tools/Makefile docs/tools/Makefile
index 90eb776..8107754 100644
--- docs/tools/Makefile
+++ docs/tools/Makefile
@@ -81,9 +81,9 @@ EXTRA_DIST := $(POD)
 clean-local::
 	$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
 
-HTML_DIR := $(PROJ_docsdir)/html/clang
-MAN_DIR  := $(PROJ_mandir)/man1
-PS_DIR   := $(PROJ_docsdir)/ps
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/clang
+MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
+PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
 
 install-html:: $(HTML)
 	$(Echo) Installing HTML Clang Tools Documentation
diff --git tools/clang-cc/Makefile tools/clang-cc/Makefile
index 874a42f..7c31f37 100644
--- tools/clang-cc/Makefile
+++ tools/clang-cc/Makefile
@@ -27,6 +27,6 @@ USEDLIBS = clangFrontend.a clangCodeGen.a clangAnalysis.a 	\
 
 # clang-cc lives in a special location; we can get away with this
 # because nothing else gets installed from here.
-PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/libexec
+PROJ_bindir := $(PROJ_prefix)/libexec
 
 include $(LLVM_SRC_ROOT)/Makefile.rules

--------------1.6.4--



llvm-2.6-destdir.patch:
 Makefile.config.in         |   16 +++++++--------
 Makefile.rules             |   46 ++++++++++++++++++++++-----------------------
 docs/CommandGuide/Makefile |    6 ++---
 docs/Makefile              |   24 +++++++++++------------
 docs/tutorial/Makefile     |    2 -
 lib/VMCore/Makefile        |    4 +--
 tools/gccas/Makefile       |    4 +--
 tools/gccld/Makefile       |    4 +--
 tools/llvm-config/Makefile |    5 +---
 9 files changed, 55 insertions(+), 56 deletions(-)

--- NEW FILE llvm-2.6-destdir.patch ---
>From 5a380ce5d1c8d5a1474764a7a54a1e2072fddb03 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <idadesub at users.sourceforge.net>
Date: Fri, 21 Aug 2009 11:59:01 -0700
Subject: [PATCH] Rewrite makefiles to explicitly reference DESTDIR so we can not bake DESTDIR
 into the O'Caml symlinks.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.4"

This is a multi-part message in MIME format.
--------------1.6.4
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 Makefile.config.in         |   16 +++++++-------
 Makefile.rules             |   46 ++++++++++++++++++++++----------------------
 docs/CommandGuide/Makefile |    6 ++--
 docs/Makefile              |   24 +++++++++++-----------
 docs/tutorial/Makefile     |    2 +-
 lib/VMCore/Makefile        |    4 +-
 tools/gccas/Makefile       |    4 +-
 tools/gccld/Makefile       |    4 +-
 tools/llvm-config/Makefile |    4 +-
 9 files changed, 55 insertions(+), 55 deletions(-)


--------------1.6.4
Content-Type: text/x-patch; name="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"

diff --git Makefile.config.in Makefile.config.in
index ecd0595..73656f7 100644
--- Makefile.config.in
+++ Makefile.config.in
@@ -76,14 +76,14 @@ endif
 
 LLVMMAKE := $(LLVM_SRC_ROOT)/make
 
-PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
-PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
-PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
-PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
-PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
-PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
-PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
-PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
+PROJ_bindir     := $(PROJ_prefix)/bin
+PROJ_libdir     := $(PROJ_prefix)/lib
+PROJ_datadir    := $(PROJ_prefix)/share
+PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
+PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
+PROJ_includedir := $(PROJ_prefix)/include
+PROJ_infodir    := $(PROJ_prefix)/info
+PROJ_mandir     := $(PROJ_prefix)/share/man
 
 # Determine if we're on a unix type operating system
 LLVM_ON_UNIX:=@LLVM_ON_UNIX@
diff --git Makefile.rules Makefile.rules
index 5556684..08965f3 100644
--- Makefile.rules
+++ Makefile.rules
@@ -720,7 +720,7 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
 # in the file so they get built before dependencies
 #---------------------------------------------------------
 
-$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
+$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
 	$(Verb) $(MKDIR) $@
 
 # To create other directories, as needed, and timestamp their creation
@@ -842,22 +842,22 @@ install-local::
 uninstall-local::
 	$(Echo) UnInstall circumvented with NO_INSTALL
 else
-install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
-	$(Echo) Installing Configuration Files To $(PROJ_etcdir)
+install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
+	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
           if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
+            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
           elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
-            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
+            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
           else \
             $(ECHO) Error: cannot find config file $${file}. ; \
           fi \
 	done
 
 uninstall-local::
-	$(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
+	$(Echo) Uninstalling Configuration Files From $(DESTDIR)$(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
-	  $(RM) -f $(PROJ_etcdir)/$${file} ; \
+	  $(RM) -f $(DESTDIR)$(PROJ_etcdir)/$${file} ; \
 	done
 endif
 
@@ -944,7 +944,7 @@ endif
 ifdef BYTECODE_DESTINATION
 ModuleDestDir := $(BYTECODE_DESTINATION)
 else
-ModuleDestDir := $(PROJ_libdir)
+ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
 endif
 
 ifdef NO_INSTALL
@@ -1023,17 +1023,17 @@ install-local::
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
+DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
 
 install-local:: $(DestSharedLib)
 
-$(DestSharedLib): $(LibName.SO) $(PROJ_libdir)
+$(DestSharedLib): $(LibName.SO) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
 	$(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
 
 uninstall-local::
 	$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
-	-$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
+	-$(Verb) $(RM) -f $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).*
 endif
 endif
 
@@ -1078,7 +1078,7 @@ endif
 ifdef BYTECODE_DESTINATION
 BytecodeDestDir := $(BYTECODE_DESTINATION)
 else
-BytecodeDestDir := $(PROJ_libdir)
+BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
 endif
 
 DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).bca
@@ -1141,13 +1141,13 @@ install-local::
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
+DestArchiveLib := $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).a
 
 install-local:: $(DestArchiveLib)
 
-$(DestArchiveLib): $(LibName.A) $(PROJ_libdir)
+$(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
-	$(Verb) $(MKDIR) $(PROJ_libdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
 	$(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib)
 
 uninstall-local::
@@ -1225,11 +1225,11 @@ install-local::
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestTool = $(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
+DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
 
 install-local:: $(DestTool)
 
-$(DestTool): $(ToolBuildPath) $(PROJ_bindir)
+$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir)
 	$(Echo) Installing $(BuildMode) $(DestTool)
 	$(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
 
@@ -1824,25 +1824,25 @@ uninstall-local::
 else
 install-local::
 	$(Echo) Installing include files
-	$(Verb) $(MKDIR) $(PROJ_includedir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
 	$(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	  for  hdr in `find . -type f '!' '(' -name '*~' \
 	      -o -name '.#*' -o -name '*.in' ')' -print | grep -v CVS | \
 	      grep -v .svn` ; do \
-	    instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
+	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
 	    if test \! -d "$$instdir" ; then \
 	      $(EchoCmd) Making install directory $$instdir ; \
 	      $(MKDIR) $$instdir ;\
 	    fi ; \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 	$(Verb) if test -d "$(PROJ_OBJ_ROOT)/include" ; then \
 	  cd $(PROJ_OBJ_ROOT)/include && \
 	  for hdr in `find . -type f -print | grep -v CVS` ; do \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 endif
@@ -1854,10 +1854,10 @@ uninstall-local::
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
 	      '!' '(' -name '*~' -o -name '.#*' \
         -o -name '*.in' ')' -print ')' | \
-        grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
+        grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
-      -print ')' | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
+      -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
 	fi
 endif
 endif
diff --git docs/CommandGuide/Makefile docs/CommandGuide/Makefile
index cf77e6a..28835ac 100644
--- docs/CommandGuide/Makefile
+++ docs/CommandGuide/Makefile
@@ -71,9 +71,9 @@ EXTRA_DIST := $(POD) index.html
 clean-local::
 	$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
 
-HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
-MAN_DIR  := $(PROJ_mandir)/man1
-PS_DIR   := $(PROJ_docsdir)/ps
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
+MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
+PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
 
 install-local:: $(HTML) $(MAN) $(PS)
 	$(Echo) Installing HTML CommandGuide Documentation
diff --git docs/Makefile docs/Makefile
index 310c4bd..30cd8a7 100644
--- docs/Makefile
+++ docs/Makefile
@@ -48,11 +48,11 @@ generated:: doxygen ocamldoc
 
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
 	$(Echo) Installing HTML documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 	$(Echo) Packaging HTML documentation
@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 
 install-doxygen: doxygen
 	$(Echo) Installing doxygen documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
 
@@ -94,11 +94,11 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
 
 install-ocamldoc: ocamldoc
 	$(Echo) Installing ocamldoc documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
 
 ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
 
@@ -122,4 +122,4 @@ $(PROJ_OBJ_DIR)/ocamldoc.tar.gz:
 
 uninstall-local::
 	$(Echo) Uninstalling Documentation
-	$(Verb) $(RM) -rf $(PROJ_docsdir)
+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
diff --git docs/tutorial/Makefile docs/tutorial/Makefile
index 6169bb8..9082ad4 100644
--- docs/tutorial/Makefile
+++ docs/tutorial/Makefile
@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.common
 
 HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
 EXTRA_DIST := $(HTML) index.html
-HTML_DIR   := $(PROJ_docsdir)/html/tutorial
+HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
 
 install-local:: $(HTML)
 	$(Echo) Installing HTML Tutorial Documentation
diff --git lib/VMCore/Makefile lib/VMCore/Makefile
index e9d3dc8..c4817a5 100644
--- lib/VMCore/Makefile
+++ lib/VMCore/Makefile
@@ -29,5 +29,5 @@ $(GENFILE): $(ObjDir)/Intrinsics.gen.tmp
 	    changed significantly. )
 
 install-local:: $(GENFILE)
-	$(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
-	$(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
+	$(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
+	$(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
diff --git tools/gccas/Makefile tools/gccas/Makefile
index ff84d96..594f9e4 100644
--- tools/gccas/Makefile
+++ tools/gccas/Makefile
@@ -10,9 +10,9 @@ LEVEL = ../..
 
 include $(LEVEL)/Makefile.common
 
-install-local:: $(PROJ_bindir)/gccas
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccas
 	
-$(PROJ_bindir)/gccas : gccas.sh Makefile
+$(DESTDIR)$(PROJ_bindir)/gccas : gccas.sh Makefile
 	$(Echo) Installing gccas shell script.
 	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
 	$(Verb) chmod 0755 $@
diff --git tools/gccld/Makefile tools/gccld/Makefile
index b2d3f73..8ec0307 100644
--- tools/gccld/Makefile
+++ tools/gccld/Makefile
@@ -11,9 +11,9 @@ LEVEL = ../..
 
 include $(LEVEL)/Makefile.common
 
-install-local:: $(PROJ_bindir)/gccld
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccld
 	
-$(PROJ_bindir)/gccld : gccld.sh Makefile
+$(DESTDIR)$(PROJ_bindir)/gccld : gccld.sh Makefile
 	$(Echo) Installing gccld shell script.
 	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
 	$(Verb) chmod 0755 $@
diff --git tools/llvm-config/Makefile tools/llvm-config/Makefile
index 6eedca0..8659681 100644
--- tools/llvm-config/Makefile
+++ tools/llvm-config/Makefile
@@ -87,6 +87,6 @@ clean-local::
 	  $(LibDeps) GenLibDeps.out
 install-local:: all-local
 	$(Echo) Installing llvm-config
-	$(Verb) $(MKDIR) $(PROJ_bindir)
-	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
+	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
 

--------------1.6.4--




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Sep 2009 03:00:38 -0000	1.7
+++ .cvsignore	7 Sep 2009 06:59:47 -0000	1.8
@@ -1,2 +1,2 @@
-llvm-2.5.tar.gz
-llvm-gcc-4.2-2.5.source.tar.gz
+llvm-2.6.tar.gz
+clang-2.6.tar.gz


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- llvm.spec	6 Sep 2009 20:32:54 -0000	1.19
+++ llvm.spec	7 Sep 2009 06:59:47 -0000	1.20
@@ -2,37 +2,24 @@
 #
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
-#
-# --with gcc
-#   The llvm-gcc package doesn't currently build
-#   (builds on x86_64, not on i686). Plan is to enable clang instead.
-
-%define lgcc_version 4.2
-
-# LLVM object files don't contain build IDs.  I don't know why yet.
-# Suppress their generation for now.
-
-%define _missing_build_ids_terminate_build 0
-#define debug_package %{nil}
 
 Name:           llvm
-Version:        2.5
-Release:        6%{?dist}
+Version:        2.6
+Release:        0.1.pre1%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-Source1:        http://llvm.org/releases/%{version}/llvm-gcc-%{lgcc_version}-%{version}.source.tar.gz
-%endif
-Patch0:         llvm-2.1-fix-sed.patch
-Patch1:         llvm-2.4-fix-ocaml.patch
-# http://llvm.org/bugs/show_bug.cgi?id=3726
-Patch2:         llvm-2.5-gcc44.patch
-Patch3:         llvm-2.5-tclsh_check.patch
-Patch4:         llvm-2.5-Base.td-x86_32.patch
+Source0:        http://llvm.org/prereleases/%{version}/llvm-%{version}.tar.gz
+Source1:        http://llvm.org/prereleases/%{version}/clang-%{version}.tar.gz
+# http://llvm.org/bugs/show_bug.cgi?id=3153
+Patch0:         llvm-2.6-destdir.patch
+Patch1:         llvm-2.6-destdir-clang.patch
+# http://llvm.org/bugs/show_bug.cgi?id=4911
+Patch2:         llvm-2.5-tclsh_check.patch
+# http://llvm.org/bugs/show_bug.cgi?id=3239
+Patch3:         llvm-2.5-Base.td-x86_32.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -60,11 +47,6 @@ arbitrary programming languages.  The co
 mirror sets of programming tools as well as libraries with equivalent
 functionality.
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-It currently supports compilation of C and C++ programs, using front
-ends derived from GCC %{lgcc_version}.
-%endif
-
 
 %package devel
 Summary:        Libraries and header files for LLVM
@@ -87,30 +69,21 @@ Requires:       %{name} = %{version}-%{r
 Documentation for the LLVM compiler infrastructure.
 
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-
-%package gcc
-Summary:        C compiler for LLVM
-License:        GPL+
+%package clang
+Summary:        A C language family frontend for LLVM
+License:        NCSA
 Group:          Development/Languages
 Requires:       %{name} = %{version}-%{release}
 
-
-%description gcc
-C compiler for LLVM.
-
-
-%package gcc-c++
-Summary:        C++ compiler for LLVM
-License:        GPL+
-Group:          Development/Languages
-Requires:       %{name}-gcc = %{version}-%{release}
-
-
-%description gcc-c++
-C++ compiler for LLVM.
-
-%endif
+%description clang
+clang: noun
+    1. A loud, resonant, metallic sound.
+    2. The strident call of a crane or goose.
+    3. C-language family front-end toolkit.
+
+The goal of the Clang project is to create a new C, C++, Objective C
+and Objective C++ front-end for the LLVM compiler. Its qqqtools are built
+as libraries and designed to be loosely-coupled and extendable.
 
 
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
@@ -146,16 +119,28 @@ The %{name}-ocaml-devel package contains
 for developing applications that use %{name}-ocaml.
 
 
+%package ocaml-doc
+Summary:        Documentation for LLVM's OCaml binding
+Group:          Documentation
+Requires:       %{name}-ocaml = %{version}-%{release}
+
+%description ocaml-doc
+HTML documentation for LLVM's OCaml binding.
+
+
+
 %prep
-%setup -q -n llvm-%{version} %{?_with_gcc:-a1}
+%setup -q -n llvm-%{version} -a1 %{?_with_gcc:-a2}
+mv clang-2.6 tools/clang
 
-%patch0 -p1 -b .fix-sed
-%patch1 -p1 -b .fix-ocaml
-%patch2 -p1 -b .gcc44
-%patch3 -p1 -b .tclsh_check
+%patch0 -p0 -b .destdir
+pushd tools/clang
+%patch1 -p0 -b .destdir-clang
+popd
+%patch2 -p1 -b .tclsh_check
 
 %ifarch %{ix86}
-%patch4 -p0 -b .ix86pic
+%patch3 -p0 -b .ix86pic
 %endif
 
 %build
@@ -166,7 +151,7 @@ for developing applications that use %{n
 mkdir obj && cd obj
 ../configure \
   --prefix=%{_prefix} \
-  --libdir=%{_libdir}/llvm \
+  --libdir=%{_libdir}/%{name} \
   --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
@@ -174,108 +159,55 @@ mkdir obj && cd obj
   --enable-pic
 %endif
 
+# FIXME file this
 # configure does not properly specify libdir
-sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/llvm|g' Makefile.config
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-# Build llvm-gcc.
-
-export PATH=%{_builddir}/obj/Release-Asserts/bin:$PATH
-cd ..
-mkdir gcc-obj
-cd gcc-obj
-
-../llvm-gcc%{lgcc_version}-%{version}.source/configure \
-  --target=%{_target_platform} \
-  --prefix=%{_libdir}/llvm-gcc \
-  --libdir=%{_libdir}/llvm-gcc/%{_lib} \
-  --enable-languages=c,c++ \
-  --enable-checking \
-  --enable-llvm=$PWD/../obj \
-  --disable-bootstrap \
-%ifarch x86_64
-  --disable-multilib \
-  --disable-shared \
-%endif
-  --program-prefix=llvm-
-
-make %{_smp_mflags} LLVM_VERSION_INFO=%{version}
-%endif
 
 %check
-(cd obj && make check) 2>&1 | tee testlogs.txt ; true
-
-# Report failures and unexpected successes
-echo
-cat testlogs.txt | grep FAIL
-cat testlogs.txt | grep XPASS
-echo
+cd obj && make check
 
 
 %install
 rm -rf %{buildroot}
 cd obj
 chmod -x examples/Makefile
-# OVERRIDE_libdir used by our patched Makefile.ocaml:
-# see http://llvm.org/bugs/show_bug.cgi?id=3153
+
+# Fix hard-coded libdir for clang Headers
+sed -i 's|(PROJ_prefix)/lib/clang|(PROJ_prefix)/%{_lib}/clang|g' \
+     tools/clang/lib/Headers/Makefile
+
 make install DESTDIR=%{buildroot} \
-     OVERRIDE_libdir=%{_libdir}/llvm \
-     PROJ_docsdir=`pwd`/../moredocs
+     PROJ_docsdir=/moredocs
+
+# Move documentation back to build directory
+# 
+mv %{buildroot}/moredocs ../
+rm ../moredocs/*.tar.gz
+rm ../moredocs/ocamldoc/html/*.tar.gz
 
-#make install \
-#  PROJ_prefix=%{buildroot}/%{_prefix} \
-#  PROJ_bindir=%{buildroot}/%{_bindir} \
-#  PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
-#  PROJ_datadir=%{buildroot}/%{_datadir} \
-#  PROJ_docsdir=%{buildroot}/%{_docdir}/%{name}-%{version} \
-#  PROJ_etcdir=%{buildroot}/%{_datadir}/%{name}-%{version} \
-#  PROJ_includedir=%{buildroot}/%{_includedir} \
-#  PROJ_infodir=%{buildroot}/%{_infodir} \
-#  PROJ_mandir=%{buildroot}/%{_mandir}
 find %{buildroot} -name .dir -print0 | xargs -0r rm -f
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
+file %{buildroot}/%{_libdir}/llvm/*.so | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
+chrpath -d %{buildroot}/%{_libexecdir}/clang-cc
 
 # Get rid of erroneously installed example files.
-rm %{buildroot}%{_libdir}/llvm/LLVMHello.*
-
-# And OCaml .o files
-rm %{buildroot}%{_libdir}/ocaml/*.o
-
-# Use relative links for ocaml's libLLVM*.a
-#(cd %{buildroot}%{_libdir}/ocaml && for i in libLLVM*.a; do
-#    ln -sf %{_libdir}/llvm/$i $i;
-# done)
+rm %{buildroot}%{_libdir}/%{name}/*LLVMHello.*
 
 # Remove deprecated tools.
 rm %{buildroot}%{_bindir}/gcc{as,ld}
 
-sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}",' \
+# FIXME file this bug
+sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
   %{buildroot}%{_bindir}/llvm-config
 
-chmod -x %{buildroot}%{_libdir}/*.[oa]
+chmod -x %{buildroot}%{_libdir}/*/*.a
 
 # remove documentation makefiles:
 # they require the build directory to work
-find examples -name 'Makefile'
-
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-# Install llvm-gcc.
-
-make -C ../gcc-obj install DESTDIR=%{buildroot}
-cd %{buildroot}%{_libdir}/llvm-gcc/%{_lib}
-find . -name '*.la' -print0 | xargs -0r rm
-find . -name '*.a' -exec %{buildroot}%{_bindir}/llvm-ranlib {} \;
-cd ../bin
-ln llvm-c++ llvm-gcc llvm-g++ %{buildroot}%{_bindir}
-rm llvm-cpp llvm-gccbug llvm-gcov %{_target_platform}-gcc*
-cd ..
-mv man/man1/llvm-gcc.1 man/man1/llvm-g++.1 %{buildroot}%{_mandir}/man1
-rm -r info man %{_lib}/libiberty.a
-rm -r libexec/gcc/%{_target_platform}/*/install-tools
-rm -r %{_lib}/gcc/%{_target_platform}/*/install-tools
-%endif
+find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %clean
@@ -290,7 +222,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt testlogs.txt
+%doc CREDITS.TXT LICENSE.TXT README.txt
 %exclude %{_bindir}/llvm-config
 %{_bindir}/bugpoint
 %{_bindir}/llc
@@ -312,8 +244,21 @@ rm -rf %{buildroot}
 %{_bindir}/llvm-config
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
-%{_libdir}/llvm
+%{_libdir}/%{name}
+
+
+%files clang
+%defattr(-,root,root,-)
+%{_bindir}/clang*
+%{_bindir}/FileCheck
+%{_bindir}/FileUpdate
+%{_bindir}/tblgen
+%{_libdir}/clang
+%{_libexecdir}/clang-cc
 
+%files doc
+%defattr(-,root,root,-)
+%doc examples moredocs/html
 
 %files ocaml
 %defattr(-,root,root,-)
@@ -326,10 +271,9 @@ rm -rf %{buildroot}
 %{_libdir}/ocaml/*.cmx*
 %{_libdir}/ocaml/*.mli
 
-%files doc
+%files ocaml-doc
 %defattr(-,root,root,-)
-%doc docs/*.{html,css} docs/img examples moredocs/*
-
+%doc moredocs/ocamldoc/html/*
 
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %files apidoc
@@ -338,41 +282,14 @@ rm -rf %{buildroot}
 %endif
 
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-%files gcc
-%defattr(-,root,root,-)
-%{_bindir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc/bin
-%dir %{_libdir}/llvm-gcc/include
-%dir %{_libdir}/llvm-gcc/%{_lib}
-%dir %{_libdir}/llvm-gcc/libexec
-%dir %{_libdir}/llvm-gcc/libexec/gcc
-%dir %{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}
-%{_libdir}/llvm-gcc/%{_lib}/gcc
-%{_libdir}/llvm-gcc/%{_lib}/libmudflap*.a
-%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-gcc
-%{_libdir}/llvm-gcc/bin/llvm-gcc
-%{_libdir}/llvm-gcc/include/mf-runtime.h
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/collect2
-%doc %{_mandir}/man1/llvm-gcc.*
-
-
-%files gcc-c++
-%defattr(-,root,root,-)
-%{_bindir}/llvm-[cg]++
-%{_libdir}/llvm-gcc/%{_lib}/lib*++.a
-%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-[cg]++
-%{_libdir}/llvm-gcc/bin/llvm-[cg]++
-%{_libdir}/llvm-gcc/include/c++
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1plus
-%doc %{_mandir}/man1/llvm-g++.*
-%endif
-
 
 %changelog
-* Sat Sep  6 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
+* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.1.pre1
+- First 2.6 prerelease
+- Enable Clang front-end
+- Enable debuginfo generation
+
+* Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
 - Disable assertions (needed by OpenGTL)
 - Align spec file with upstream build instructions
 - Enable unit tests


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Sep 2009 03:00:39 -0000	1.7
+++ sources	7 Sep 2009 06:59:47 -0000	1.8
@@ -1,2 +1,2 @@
-55df2ea8665c8094ad2ef85187b9fc74  llvm-2.5.tar.gz
-c5800d85059fcf80429a86c536127595  llvm-gcc-4.2-2.5.source.tar.gz
+d4d2cfbb962eca0c96aa1d794e23a681  llvm-2.6.tar.gz
+80a2a9bbe8fa7c403b2ec7aca8b4108f  clang-2.6.tar.gz


--- llvm-2.1-fix-sed.patch DELETED ---


--- llvm-2.4-fix-ocaml.patch DELETED ---


--- llvm-2.5-gcc44.patch DELETED ---



From markmc at fedoraproject.org  Mon Sep  7 07:02:09 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  7 Sep 2009 07:02:09 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-msix-error-handling-on-older-kernels.patch,
	NONE, 1.1 qemu.spec, 1.124, 1.125
Message-ID: <20090907070209.1E63811C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22395

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-msix-error-handling-on-older-kernels.patch 
Log Message:
* Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.10.rc1
- Fix MSI-X error handling on older kernels (#519787)


qemu-fix-msix-error-handling-on-older-kernels.patch:
 msix.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE qemu-fix-msix-error-handling-on-older-kernels.patch ---
>From 057fb1b4b227bc49aa00b08da5f177b50c020693 Mon Sep 17 00:00:00 2001
From: Michael S. Tsirkin <mst at redhat.com>
Date: Thu, 23 Jul 2009 16:34:13 +0300
Subject: [PATCH] Fix error handling in msix vector add

When adding a vector fails, the used counter should
not be incremented, otherwise on vector change we will
try to update the routing entry.

(cherry picked from commit aca6915d92743b11ac5555d6e412cc4737f27f34)

Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-msix-error-handling-on-older-kernels.patch
---
 hw/msix.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/msix.c b/hw/msix.c
index 974268d..b6c3f17 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -503,13 +503,19 @@ void msix_reset(PCIDevice *dev)
 /* Mark vector as used. */
 int msix_vector_use(PCIDevice *dev, unsigned vector)
 {
+    int ret;
     if (vector >= dev->msix_entries_nr)
         return -EINVAL;
-    if (dev->msix_entry_used[vector]++)
+    if (dev->msix_entry_used[vector]) {
         return 0;
+    }
     if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) {
-        return kvm_msix_add(dev, vector);
+        ret = kvm_msix_add(dev, vector);
+        if (ret) {
+            return ret;
+        }
     }
+    ++dev->msix_entry_used[vector];
     return 0;
 }
 
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- qemu.spec	4 Sep 2009 10:34:32 -0000	1.124
+++ qemu.spec	7 Sep 2009 07:02:08 -0000	1.125
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.9.%{kvmvertag}%{?dist}
+Release: 0.10.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -40,6 +40,9 @@ Patch07: qemu-fix-no-kvm-segfault.patch
 # Allow the pulseudio backend to be the default
 Patch08: qemu-allow-pulseaudio-to-be-the-default.patch
 
+# Fix MSI-X error handling on older kernels (#519787)
+Patch09: qemu-fix-msix-error-handling-on-older-kernels.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -228,6 +231,7 @@ such as kvmtrace and kvm_stat.
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -492,6 +496,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.10.rc1
+- Fix MSI-X error handling on older kernels (#519787)
+
 * Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.9.rc1
 - Make pulseaudio the default audio backend (#519540, #495964, #496627)
 



From hno at fedoraproject.org  Mon Sep  7 07:42:06 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon,  7 Sep 2009 07:42:06 +0000 (UTC)
Subject: rpms/squid/devel squid.spec, 1.139, 1.140 squid-3.1.0.13-build.patch,
	1.3, NONE
Message-ID: <20090907074206.80F3911C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv600

Modified Files:
	squid.spec 
Removed Files:
	squid-3.1.0.13-build.patch 
Log Message:
Use proper configure options instead of patching in pkgdata etc.. 



Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- squid.spec	4 Sep 2009 04:14:36 -0000	1.139
+++ squid.spec	7 Sep 2009 07:42:04 -0000	1.140
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -36,7 +36,6 @@ Patch005: squid-3.1.0.13-alias-link.patc
 # will break upstream ones.
 Patch201: squid-3.1.0.9-config.patch
 Patch202: squid-3.1.0.9-location.patch
-Patch203: squid-3.1.0.13-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.1.0.13-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
@@ -72,7 +71,6 @@ lookup program (dnsserver), a program fo
 %patch005 -p0 -b .alias-link
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
-%patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
@@ -83,7 +81,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --exec_prefix=/usr \
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
-   --datadir=%{_datadir} \
+   --datadir=%{_datadir}/squid \
    --sysconfdir=/etc/squid \
    --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
@@ -116,21 +114,22 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-default-user="squid" \
    --with-filedescriptors=16384 \
    --with-dl \
-   --with-openssl=/usr/kerberos \
+   --with-openssl \
    --with-pthreads
 
-# following options should be enabled but fails building
+# following options should be enabled but fails Fedora QA chechs
 #   --enable-negotiate-auth-helpers="squid_kerb_auth"
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
-make %{?_smp_mflags}
+make \
+	DEFAULT_SWAP_DIR='$(localstatedir)/spool/squid' \
+	%{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall  \
-        sysconfdir=$RPM_BUILD_ROOT/etc/squid \
-        localstatedir=$RPM_BUILD_ROOT/var \
-        libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
+make \
+	DESTDIR=$RPM_BUILD_ROOT \
+	install
 echo "
 #
 # This is /etc/httpd/conf.d/squid.conf


--- squid-3.1.0.13-build.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:38 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074339.0106E10F890@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-iconv (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:39 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074339.CB5E710F89A@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-iconv (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:40 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074341.149E110F8A0@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-iconv (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:41 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074341.A94CA10F8A5@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-iconv (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:45 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074346.040D910F8AB@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-iconv (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:46 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074346.C32E110F8B1@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-iconv (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:48 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074348.7430A10F8B4@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-iconv (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 07:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 07:43:49 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090907074349.8DD3410F8BF@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-iconv (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Sep  7 08:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 08:07:24 +0000
Subject: [pkgdb] mailcap had acl change status
Message-ID: <20090907080724.9F61710F87E@bastion2.fedora.phx.redhat.com>

mlichvar has set the watchbugzilla acl on mailcap (Fedora devel) to Approved for scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mailcap



From pkgdb at fedoraproject.org  Mon Sep  7 08:07:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 08:07:26 +0000
Subject: [pkgdb] mailcap had acl change status
Message-ID: <20090907080726.89A8910F893@bastion2.fedora.phx.redhat.com>

mlichvar has set the watchcommits acl on mailcap (Fedora devel) to Approved for scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mailcap



From pkgdb at fedoraproject.org  Mon Sep  7 08:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 08:07:28 +0000
Subject: [pkgdb] mailcap had acl change status
Message-ID: <20090907080728.B5A3110F896@bastion2.fedora.phx.redhat.com>

mlichvar has set the commit acl on mailcap (Fedora devel) to Approved for scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mailcap



From hno at fedoraproject.org  Mon Sep  7 08:17:34 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon,  7 Sep 2009 08:17:34 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.140,1.141
Message-ID: <20090907081734.BF71A11C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9439

Modified Files:
	squid.spec 
Log Message:
removed build patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- squid.spec	7 Sep 2009 07:42:04 -0000	1.140
+++ squid.spec	7 Sep 2009 08:17:34 -0000	1.141
@@ -251,6 +251,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 07 2009 Henrik Nordstrom <henrik at henriknordtrom.net> - 7:3.1.0.13-2
+- Cleaned up packaging to ease future maintenance
+
 * Fri Sep 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-1
 - Upgrade to next upstream release 3.1.0.13 with many new features
   * IPv6 support



From pkgdb at fedoraproject.org  Mon Sep  7 08:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 08:30:09 +0000
Subject: [pkgdb] bind had acl change status
Message-ID: <20090907083009.6DBA610F85E@bastion2.fedora.phx.redhat.com>

atkac has set the watchcommits acl on bind (Fedora 11) to Approved for jroysdon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind



From mjakubicek at fedoraproject.org  Mon Sep  7 08:30:10 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon,  7 Sep 2009 08:30:10 +0000 (UTC)
Subject: rpms/arj/devel arj-3.10.22-quotes.patch, NONE, 1.1 arj.spec, 1.10,
	1.11
Message-ID: <20090907083010.A561111C043D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/arj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14944

Modified Files:
	arj.spec 
Added Files:
	arj-3.10.22-quotes.patch 
Log Message:
- Fix FTBFS: added arj-3.10.22-quotes.patch



arj-3.10.22-quotes.patch:
 gnu/makefile.in |    2 +-
 makefile        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arj-3.10.22-quotes.patch ---
--- arj-3.10.22/makefile.orig	2009-09-07 07:50:22.000000000 +0200
+++ arj-3.10.22/makefile	2009-09-07 07:50:32.000000000 +0200
@@ -1633,7 +1633,7 @@
  $(CC) $(ARJ_COPT)
 $(BASEDIR)\fmsg_arj.c $(BASEDIR)\imsg_arj.c $(BASEDIR)\nmsg_arj.c: $(BASEDIR)\tools\$(MSGBIND) $(RESFILE)
  $(BASEDIR)\tools\msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)
-
+ sed -i 's|_""|\\""|' $(BASEDIR)/fmsg_arj.c
 #
 # REARJ utility
 #
--- arj-3.10.22/gnu/makefile.in.orig	2004-04-17 13:28:06.000000000 +0200
+++ arj-3.10.22/gnu/makefile.in	2009-09-07 07:58:42.000000000 +0200
@@ -356,7 +356,7 @@
 
 $(BASEDIR)/fmsg_arj.c $(BASEDIR)/imsg_arj.c $(BASEDIR)/nmsg_arj.c: $(TOOLS_DIR)/msgbind$x $(RESFILE)
 	$(TOOLS_DIR)/msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)
-
+	sed -i 's|_""|\\""|' $(BASEDIR)/fmsg_arj.c
 #
 # REARJ utility
 #


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/devel/arj.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- arj.spec	19 Aug 2009 08:40:48 -0000	1.10
+++ arj.spec	7 Sep 2009 08:30:08 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Archiver for .arj files
 Name:		arj
 Version:	3.10.22
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL+
 Group:		Applications/Archiving
 URL:		http://arj.sourceforge.net/
@@ -12,6 +12,8 @@ Source2:	unarj.1
 Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
 Patch1:		arj-3.10.22-missing-protos.patch
 Patch2:		arj-3.10.22-custom-printf.patch
+#?Filed into upstream bugtracker as https://sourceforge.net/tracker/?func=detail&aid=2853421&group_id=49820&atid=457566
+Patch3:		arj-3.10.22-quotes.patch
 BuildRequires:	autoconf
 Provides:	unarj = %{version}-%{release}
 Obsoletes:	unarj < 3
@@ -28,6 +30,7 @@ Software, Inc.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
@@ -69,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*arj*1.*
 
 %changelog
+* Sun Sep  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> 3.10.22-11
+- Fix FTBFS: added arj-3.10.22-quotes.patch
+
 * Wed Aug 19 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-10
 - Disabled the even with patches broken parallel builds again
 



From schwab at fedoraproject.org  Mon Sep  7 09:07:15 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon,  7 Sep 2009 09:07:15 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.287, 1.288 glibc-fedora.patch, 1.321,
	1.322 glibc.spec, 1.414, 1.415 import.log, 1.30, 1.31 sources,
	1.312, 1.313
Message-ID: <20090907090715.37E2411C00DB@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31242/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- .cvsignore	3 Sep 2009 09:16:24 -0000	1.287
+++ .cvsignore	7 Sep 2009 09:07:09 -0000	1.288
@@ -1,2 +1,2 @@
-glibc-2.10-327-g01034d7-fedora.tar.bz2
-glibc-2.10-327-g01034d7.tar.bz2
+glibc-2.10-330-gd76da20-fedora.tar.bz2
+glibc-2.10-330-gd76da20.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   28 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- glibc-fedora.patch	3 Sep 2009 09:16:25 -0000	1.321
+++ glibc-fedora.patch	7 Sep 2009 09:07:09 -0000	1.322
@@ -1,6 +1,6 @@
---- glibc-2.10-327-g01034d7/ChangeLog
-+++ glibc-2.10.90-19/ChangeLog
-@@ -563,6 +563,11 @@
+--- glibc-2.10-330-gd76da20/ChangeLog
++++ glibc-2.10.90-20/ChangeLog
+@@ -577,6 +577,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -828,6 +833,11 @@
+@@ -842,6 +847,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9226,6 +9236,13 @@
+@@ -9240,6 +9250,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9521,6 +9538,10 @@
+@@ -9535,6 +9552,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10778,6 +10799,15 @@
+@@ -10792,6 +10813,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,8 +65,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-327-g01034d7/ChangeLog.15
-+++ glibc-2.10.90-19/ChangeLog.15
+--- glibc-2.10-330-gd76da20/ChangeLog.15
++++ glibc-2.10.90-20/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -132,8 +132,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-327-g01034d7/ChangeLog.16
-+++ glibc-2.10.90-19/ChangeLog.16
+--- glibc-2.10-330-gd76da20/ChangeLog.16
++++ glibc-2.10.90-20/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -305,8 +305,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-327-g01034d7/Makeconfig
-+++ glibc-2.10.90-19/Makeconfig
+--- glibc-2.10-330-gd76da20/Makeconfig
++++ glibc-2.10.90-20/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -323,8 +323,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-327-g01034d7/csu/Makefile
-+++ glibc-2.10.90-19/csu/Makefile
+--- glibc-2.10-330-gd76da20/csu/Makefile
++++ glibc-2.10.90-20/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -335,8 +335,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-327-g01034d7/csu/elf-init.c
-+++ glibc-2.10.90-19/csu/elf-init.c
+--- glibc-2.10-330-gd76da20/csu/elf-init.c
++++ glibc-2.10.90-20/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -361,8 +361,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-327-g01034d7/debug/tst-chk1.c
-+++ glibc-2.10.90-19/debug/tst-chk1.c
+--- glibc-2.10-330-gd76da20/debug/tst-chk1.c
++++ glibc-2.10.90-20/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -391,8 +391,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-327-g01034d7/elf/ldconfig.c
-+++ glibc-2.10.90-19/elf/ldconfig.c
+--- glibc-2.10-330-gd76da20/elf/ldconfig.c
++++ glibc-2.10.90-20/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -474,8 +474,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-327-g01034d7/elf/tst-stackguard1.c
-+++ glibc-2.10.90-19/elf/tst-stackguard1.c
+--- glibc-2.10-330-gd76da20/elf/tst-stackguard1.c
++++ glibc-2.10.90-20/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -500,16 +500,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-327-g01034d7/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-19/include/bits/stdlib-ldbl.h
+--- glibc-2.10-330-gd76da20/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-20/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-327-g01034d7/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-19/include/bits/wchar-ldbl.h
+--- glibc-2.10-330-gd76da20/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-20/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-327-g01034d7/include/features.h
-+++ glibc-2.10.90-19/include/features.h
+--- glibc-2.10-330-gd76da20/include/features.h
++++ glibc-2.10.90-20/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -526,8 +526,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-327-g01034d7/intl/locale.alias
-+++ glibc-2.10.90-19/intl/locale.alias
+--- glibc-2.10-330-gd76da20/intl/locale.alias
++++ glibc-2.10.90-20/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -537,8 +537,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-327-g01034d7/libio/stdio.h
-+++ glibc-2.10.90-19/libio/stdio.h
+--- glibc-2.10-330-gd76da20/libio/stdio.h
++++ glibc-2.10.90-20/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -552,8 +552,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-327-g01034d7/locale/iso-4217.def
-+++ glibc-2.10.90-19/locale/iso-4217.def
+--- glibc-2.10-330-gd76da20/locale/iso-4217.def
++++ glibc-2.10.90-20/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -645,8 +645,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-327-g01034d7/locale/programs/locarchive.c
-+++ glibc-2.10.90-19/locale/programs/locarchive.c
+--- glibc-2.10-330-gd76da20/locale/programs/locarchive.c
++++ glibc-2.10.90-20/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -678,8 +678,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-327-g01034d7/localedata/Makefile
-+++ glibc-2.10.90-19/localedata/Makefile
+--- glibc-2.10-330-gd76da20/localedata/Makefile
++++ glibc-2.10.90-20/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -688,8 +688,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-327-g01034d7/localedata/SUPPORTED
-+++ glibc-2.10.90-19/localedata/SUPPORTED
+--- glibc-2.10-330-gd76da20/localedata/SUPPORTED
++++ glibc-2.10.90-20/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -731,8 +731,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-327-g01034d7/localedata/locales/cy_GB
-+++ glibc-2.10.90-19/localedata/locales/cy_GB
+--- glibc-2.10-330-gd76da20/localedata/locales/cy_GB
++++ glibc-2.10.90-20/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -747,8 +747,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-327-g01034d7/localedata/locales/en_GB
-+++ glibc-2.10.90-19/localedata/locales/en_GB
+--- glibc-2.10-330-gd76da20/localedata/locales/en_GB
++++ glibc-2.10.90-20/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -760,8 +760,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-327-g01034d7/localedata/locales/no_NO
-+++ glibc-2.10.90-19/localedata/locales/no_NO
+--- glibc-2.10-330-gd76da20/localedata/locales/no_NO
++++ glibc-2.10.90-20/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -832,8 +832,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-327-g01034d7/localedata/locales/zh_TW
-+++ glibc-2.10.90-19/localedata/locales/zh_TW
+--- glibc-2.10-330-gd76da20/localedata/locales/zh_TW
++++ glibc-2.10.90-20/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -861,8 +861,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-327-g01034d7/malloc/mcheck.c
-+++ glibc-2.10.90-19/malloc/mcheck.c
+--- glibc-2.10-330-gd76da20/malloc/mcheck.c
++++ glibc-2.10.90-20/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -938,8 +938,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-327-g01034d7/manual/libc.texinfo
-+++ glibc-2.10.90-19/manual/libc.texinfo
+--- glibc-2.10-330-gd76da20/manual/libc.texinfo
++++ glibc-2.10.90-20/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -949,8 +949,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-327-g01034d7/misc/sys/cdefs.h
-+++ glibc-2.10.90-19/misc/sys/cdefs.h
+--- glibc-2.10-330-gd76da20/misc/sys/cdefs.h
++++ glibc-2.10.90-20/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -994,16 +994,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-327-g01034d7/nis/nss
-+++ glibc-2.10.90-19/nis/nss
+--- glibc-2.10-330-gd76da20/nis/nss
++++ glibc-2.10.90-20/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-327-g01034d7/nptl/ChangeLog
-+++ glibc-2.10.90-19/nptl/ChangeLog
+--- glibc-2.10-330-gd76da20/nptl/ChangeLog
++++ glibc-2.10.90-20/nptl/ChangeLog
 @@ -3713,6 +3713,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1044,8 +1044,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-327-g01034d7/nptl/Makefile
-+++ glibc-2.10.90-19/nptl/Makefile
+--- glibc-2.10-330-gd76da20/nptl/Makefile
++++ glibc-2.10.90-20/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1078,8 +1078,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-327-g01034d7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-19/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-330-gd76da20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1088,8 +1088,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-327-g01034d7/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-19/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-330-gd76da20/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-20/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1097,8 +1097,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-327-g01034d7/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-19/nptl/tst-stackguard1.c
+--- glibc-2.10-330-gd76da20/nptl/tst-stackguard1.c
++++ glibc-2.10.90-20/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1123,8 +1123,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-327-g01034d7/nscd/nscd.conf
-+++ glibc-2.10.90-19/nscd/nscd.conf
+--- glibc-2.10-330-gd76da20/nscd/nscd.conf
++++ glibc-2.10.90-20/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1134,8 +1134,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-327-g01034d7/nscd/nscd.init
-+++ glibc-2.10.90-19/nscd/nscd.init
+--- glibc-2.10-330-gd76da20/nscd/nscd.init
++++ glibc-2.10.90-20/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1192,8 +1192,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-327-g01034d7/posix/Makefile
-+++ glibc-2.10.90-19/posix/Makefile
+--- glibc-2.10-330-gd76da20/posix/Makefile
++++ glibc-2.10.90-20/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1214,8 +1214,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-327-g01034d7/posix/getconf.speclist.h
-+++ glibc-2.10.90-19/posix/getconf.speclist.h
+--- glibc-2.10-330-gd76da20/posix/getconf.speclist.h
++++ glibc-2.10.90-20/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1256,8 +1256,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-327-g01034d7/streams/Makefile
-+++ glibc-2.10.90-19/streams/Makefile
+--- glibc-2.10-330-gd76da20/streams/Makefile
++++ glibc-2.10.90-20/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1267,8 +1267,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-327-g01034d7/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-19/sysdeps/generic/dl-cache.h
+--- glibc-2.10-330-gd76da20/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-20/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1284,8 +1284,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-327-g01034d7/sysdeps/i386/Makefile
-+++ glibc-2.10.90-19/sysdeps/i386/Makefile
+--- glibc-2.10-330-gd76da20/sysdeps/i386/Makefile
++++ glibc-2.10.90-20/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1310,8 +1310,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-327-g01034d7/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-19/sysdeps/ia64/Makefile
+--- glibc-2.10-330-gd76da20/sysdeps/ia64/Makefile
++++ glibc-2.10.90-20/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1323,8 +1323,8 @@
  endif
  endif
  
---- glibc-2.10-327-g01034d7/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-19/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-330-gd76da20/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-20/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1676,8 +1676,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-327-g01034d7/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-19/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-330-gd76da20/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-20/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1763,8 +1763,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-327-g01034d7/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-19/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-330-gd76da20/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-20/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1773,8 +1773,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-327-g01034d7/sysdeps/unix/nice.c
-+++ glibc-2.10.90-19/sysdeps/unix/nice.c
+--- glibc-2.10-330-gd76da20/sysdeps/unix/nice.c
++++ glibc-2.10.90-20/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1789,8 +1789,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1806,8 +1806,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1855,8 +1855,8 @@
      }
    else
  #endif
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1899,8 +1899,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1919,8 +1919,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1981,8 +1981,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2015,29 +2015,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2063,8 +2063,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2074,8 +2074,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2121,8 +2121,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-327-g01034d7/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-19/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2141,8 +2141,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-327-g01034d7/timezone/zic.c
-+++ glibc-2.10.90-19/timezone/zic.c
+--- glibc-2.10-330-gd76da20/timezone/zic.c
++++ glibc-2.10.90-20/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- glibc.spec	3 Sep 2009 09:16:25 -0000	1.414
+++ glibc.spec	7 Sep 2009 09:07:10 -0000	1.415
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-327-g01034d7
+%define glibcsrcdir glibc-2.10-330-gd76da20
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 20
+Release: 21
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1029,6 +1029,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Sep  7 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-21
+- Update from master.
+  - Fix strstr/strcasestr on i386 (#519226).
+
 * Thu Sep  3 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-20
 - Update from master.
   - Fix strstr/strcasestr/fma/fmaf on x86_64 (#519226).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- import.log	3 Sep 2009 09:16:25 -0000	1.30
+++ import.log	7 Sep 2009 09:07:10 -0000	1.31
@@ -28,3 +28,4 @@ glibc-2_10_90-17:HEAD:glibc-2.10.90-17.s
 glibc-2_10_90-18:HEAD:glibc-2.10.90-18.src.rpm:1251802906
 glibc-2_10_90-19:HEAD:glibc-2.10.90-19.src.rpm:1251889856
 glibc-2_10_90-20:HEAD:glibc-2.10.90-20.src.rpm:1251969190
+glibc-2_10_90-21:HEAD:glibc-2.10.90-21.src.rpm:1252314102


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- sources	3 Sep 2009 09:16:25 -0000	1.312
+++ sources	7 Sep 2009 09:07:10 -0000	1.313
@@ -1,2 +1,2 @@
-f09abd16c8c4af2b8b121d1fc0c3bcf8  glibc-2.10-327-g01034d7-fedora.tar.bz2
-6ca9cac4ff45488909e548278d888620  glibc-2.10-327-g01034d7.tar.bz2
+ef40c728d91ed19586b58497d91383fa  glibc-2.10-330-gd76da20-fedora.tar.bz2
+9f6e94c84392136723f0c4f249123ae2  glibc-2.10-330-gd76da20.tar.bz2



From lkundrak at fedoraproject.org  Mon Sep  7 09:28:27 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 09:28:27 +0000 (UTC)
Subject: rpms/perl-HTML-Template-Pro/devel .cvsignore, 1.5,
	1.6 perl-HTML-Template-Pro.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090907092827.ABEC611C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14414

Modified Files:
	.cvsignore perl-HTML-Template-Pro.spec sources 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.87-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 May 2009 06:32:20 -0000	1.5
+++ .cvsignore	7 Sep 2009 09:28:26 -0000	1.6
@@ -1 +1 @@
-HTML-Template-Pro-0.74.tar.gz
+HTML-Template-Pro-0.87.tar.gz


Index: perl-HTML-Template-Pro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel/perl-HTML-Template-Pro.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-HTML-Template-Pro.spec	26 Jul 2009 06:31:02 -0000	1.7
+++ perl-HTML-Template-Pro.spec	7 Sep 2009 09:28:26 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Pro
-Version:        0.74
+Version:        0.87
 Release:        2%{?dist}
 Summary:        Perl/XS module to use HTML Templates from CGI scripts
 License:        GPL+ or Artistic
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.87-1
+- New upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.74-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 May 2009 06:32:20 -0000	1.5
+++ sources	7 Sep 2009 09:28:26 -0000	1.6
@@ -1 +1 @@
-d811e3758a55a2186d59207f87965d25  HTML-Template-Pro-0.74.tar.gz
+258172089e55fd957c0bdb879878a6da  HTML-Template-Pro-0.87.tar.gz



From mschwendt at fedoraproject.org  Mon Sep  7 09:28:53 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  7 Sep 2009 09:28:53 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.30,1.31
Message-ID: <20090907092853.72B4B11C00DB@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14859

Modified Files:
	rc-modified 
Log Message:
support Yum 3.2.24 API changes related to arch list - copied from yum-utils repoclosure


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rc-modified	11 Aug 2009 07:35:28 -0000	1.30
+++ rc-modified	7 Sep 2009 09:28:52 -0000	1.31
@@ -70,7 +70,10 @@
     def __init__(self, arch = None, config = "/etc/yum.conf"):
         yum.YumBase.__init__(self)
 
-        self.arch = arch
+        if yum.__version__ < '3.2.24':
+            self.arch = arch
+        else:
+            self._rc_arches = arch
         if yum.__version__ < '3.0':  # TODO: check
             self.doConfigSetup(fn = config)
         else:
@@ -103,7 +106,18 @@
     
     def readMetadata(self):
         self.doRepoSetup()
-        self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
+
+        if yum.__version__ < '3.2.24':
+            self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
+        else:
+            archs = []
+            if not self._rc_arches:
+                archs.extend(self.arch.archlist)
+            else:
+                for arch in self._rc_arches:
+                    archs.extend(self.arch.get_arch_list(arch))
+            self.doSackSetup(archs)
+
         for repo in self.repos.listEnabled():
             try:  # TODO: when exactly did this change from "with=" to "mdtype="?
                 self.repos.populateSack(which=[repo.id], mdtype='filelists')



From lkundrak at fedoraproject.org  Mon Sep  7 09:31:25 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 09:31:25 +0000 (UTC)
Subject: rpms/perl-HTML-Template-Pro/devel perl-HTML-Template-Pro.spec, 1.8, 
	1.9
Message-ID: <20090907093125.BF8FF11C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16813

Modified Files:
	perl-HTML-Template-Pro.spec 
Log Message:
Fix release number


Index: perl-HTML-Template-Pro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel/perl-HTML-Template-Pro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-HTML-Template-Pro.spec	7 Sep 2009 09:28:26 -0000	1.8
+++ perl-HTML-Template-Pro.spec	7 Sep 2009 09:31:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template-Pro
 Version:        0.87
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Perl/XS module to use HTML Templates from CGI scripts
 License:        GPL+ or Artistic
 Group:          Development/Libraries



From lkundrak at fedoraproject.org  Mon Sep  7 09:31:47 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 09:31:47 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-Archive/devel .cvsignore, 1.4,
	1.5 perl-TAP-Harness-Archive.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090907093147.0994E11C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17119

Modified Files:
	.cvsignore perl-TAP-Harness-Archive.spec sources 
Log Message:
* Mon Sep 07 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.14-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Sep 2008 21:40:36 -0000	1.4
+++ .cvsignore	7 Sep 2009 09:31:46 -0000	1.5
@@ -1 +1 @@
-TAP-Harness-Archive-0.12.tar.gz
+TAP-Harness-Archive-0.14.tar.gz


Index: perl-TAP-Harness-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/perl-TAP-Harness-Archive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-TAP-Harness-Archive.spec	26 Jul 2009 16:39:32 -0000	1.5
+++ perl-TAP-Harness-Archive.spec	7 Sep 2009 09:31:46 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness-Archive
-Version:        0.12
-Release:        3%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Create an archive of TAP test results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.14-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Sep 2008 21:40:36 -0000	1.4
+++ sources	7 Sep 2009 09:31:46 -0000	1.5
@@ -1 +1 @@
-0bc01720af0da25bd921a0216a5637e4  TAP-Harness-Archive-0.12.tar.gz
+f7417c336ebb9c28937f494f05e342bb  TAP-Harness-Archive-0.14.tar.gz



From mschwendt at fedoraproject.org  Mon Sep  7 09:31:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  7 Sep 2009 09:31:57 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.31,1.32
Message-ID: <20090907093157.058D911C00DB@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377

Modified Files:
	rc-modified 
Log Message:
revert previous commit, breaks the tool really badly


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rc-modified	7 Sep 2009 09:28:52 -0000	1.31
+++ rc-modified	7 Sep 2009 09:31:56 -0000	1.32
@@ -70,10 +70,7 @@
     def __init__(self, arch = None, config = "/etc/yum.conf"):
         yum.YumBase.__init__(self)
 
-        if yum.__version__ < '3.2.24':
-            self.arch = arch
-        else:
-            self._rc_arches = arch
+        self.arch = arch
         if yum.__version__ < '3.0':  # TODO: check
             self.doConfigSetup(fn = config)
         else:
@@ -106,18 +103,7 @@
     
     def readMetadata(self):
         self.doRepoSetup()
-
-        if yum.__version__ < '3.2.24':
-            self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
-        else:
-            archs = []
-            if not self._rc_arches:
-                archs.extend(self.arch.archlist)
-            else:
-                for arch in self._rc_arches:
-                    archs.extend(self.arch.get_arch_list(arch))
-            self.doSackSetup(archs)
-
+        self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
         for repo in self.repos.listEnabled():
             try:  # TODO: when exactly did this change from "with=" to "mdtype="?
                 self.repos.populateSack(which=[repo.id], mdtype='filelists')



From lkundrak at fedoraproject.org  Mon Sep  7 09:32:55 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 09:32:55 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-Archive/devel perl-TAP-Harness-Archive.spec,
	1.6, 1.7
Message-ID: <20090907093255.E139811C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18186

Modified Files:
	perl-TAP-Harness-Archive.spec 
Log Message:
* Mon Sep 07 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.14-1
- New upstream version



Index: perl-TAP-Harness-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/perl-TAP-Harness-Archive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-TAP-Harness-Archive.spec	7 Sep 2009 09:31:46 -0000	1.6
+++ perl-TAP-Harness-Archive.spec	7 Sep 2009 09:32:55 -0000	1.7
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 07 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.14-1
+* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.14-1
 - New upstream version
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-3



From harald at fedoraproject.org  Mon Sep  7 09:45:00 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  7 Sep 2009 09:45:00 +0000 (UTC)
Subject: rpms/dracut/devel
	0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch,
	NONE, 1.1 dracut.spec, 1.19, 1.20
Message-ID: <20090907094500.9938311C00DB@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28111

Modified Files:
	dracut.spec 
Added Files:
	0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch 
Log Message:
* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)


0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch ---
>From 96f3cf1d27268f3784f420ebb52228f3e6b08e77 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 11:40:20 +0200
Subject: [PATCH 7/8] 95udev-rules: fixed c&p bug which did not install 61-persistent-storage.rules

---
 modules.d/95udev-rules/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
index cf22d1e..695e472 100755
--- a/modules.d/95udev-rules/install
+++ b/modules.d/95udev-rules/install
@@ -23,7 +23,7 @@ if [ ! -x /lib/udev/vol_id ]; then
 else
     inst_rules "$moddir/59-persistent-storage-volid.rules"
 fi
-inst_rules "$moddir/61-persistent-storage-volid.rules"
+inst_rules "$moddir/61-persistent-storage.rules"
     
 for i in \
 ata_id \
-- 
1.6.2.5



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- dracut.spec	3 Sep 2009 15:32:41 -0000	1.19
+++ dracut.spec	7 Sep 2009 09:44:58 -0000	1.20
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 001
-Release: 2%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -22,7 +22,7 @@ Source0: dracut-%{version}%{?dashgittag}
 
 Patch1: 0005-mdraid-add-grep-for-convenience.patch
 Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
-
+Patch3: 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
@@ -109,6 +109,7 @@ This package contains tools to assemble 
 %setup -q -n %{name}-%{version}%{?dashgittag}
 %patch1 -p1 
 %patch2 -p1 
+%patch3 -p1 
 
 %build
 make
@@ -185,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
+- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
+
 * Thu Sep 03 2009 Harald Hoyer <harald at redhat.com> 001-2
 - fixed missing grep for md
 - reorder cleanup



From lkundrak at fedoraproject.org  Mon Sep  7 09:47:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 09:47:59 +0000 (UTC)
Subject: rpms/perl-HTML-Template-Pro/devel perl-HTML-Template-Pro.spec, 1.9, 
	1.10
Message-ID: <20090907094759.7777F11C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29484

Modified Files:
	perl-HTML-Template-Pro.spec 
Log Message:
Fix license


Index: perl-HTML-Template-Pro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel/perl-HTML-Template-Pro.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-HTML-Template-Pro.spec	7 Sep 2009 09:31:25 -0000	1.9
+++ perl-HTML-Template-Pro.spec	7 Sep 2009 09:47:59 -0000	1.10
@@ -2,7 +2,7 @@ Name:           perl-HTML-Template-Pro
 Version:        0.87
 Release:        1%{?dist}
 Summary:        Perl/XS module to use HTML Templates from CGI scripts
-License:        GPL+ or Artistic
+License:        GPL+ or Artistic or LGPLv2+
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/HTML-Template-Pro/
 Source0:        http://www.cpan.org/authors/id/V/VI/VIY/HTML-Template-Pro-%{version}.tar.gz
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ARTISTIC Changes FAQ GPL README README.ru
+%doc ARTISTIC Changes FAQ LGPL README README.ru
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/HTML*
 %{_mandir}/man3/*



From lkundrak at fedoraproject.org  Mon Sep  7 09:48:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 09:48:40 +0000 (UTC)
Subject: rpms/perl-XML-Atom-SimpleFeed/devel .cvsignore, 1.3,
	1.4 perl-XML-Atom-SimpleFeed.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090907094840.C770B11C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-XML-Atom-SimpleFeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29713

Modified Files:
	.cvsignore perl-XML-Atom-SimpleFeed.spec sources 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.86-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Atom-SimpleFeed/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2008 21:33:54 -0000	1.3
+++ .cvsignore	7 Sep 2009 09:48:40 -0000	1.4
@@ -1 +1 @@
-XML-Atom-SimpleFeed-0.82.tar.gz
+XML-Atom-SimpleFeed-0.86.tar.gz


Index: perl-XML-Atom-SimpleFeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Atom-SimpleFeed/devel/perl-XML-Atom-SimpleFeed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-XML-Atom-SimpleFeed.spec	26 Jul 2009 17:31:52 -0000	1.5
+++ perl-XML-Atom-SimpleFeed.spec	7 Sep 2009 09:48:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-XML-Atom-SimpleFeed
-Version:        0.82
-Release:        3%{?dist}
+Version:        0.86
+Release:        1%{?dist}
 Summary:        No-fuss generation of Atom syndication feeds
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.86-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Atom-SimpleFeed/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2008 21:33:54 -0000	1.3
+++ sources	7 Sep 2009 09:48:40 -0000	1.4
@@ -1 +1 @@
-2570500ec05b0d9fb9d21e19a52ce313  XML-Atom-SimpleFeed-0.82.tar.gz
+7bb14dbc0871fa360c7237823c9f1bc1  XML-Atom-SimpleFeed-0.86.tar.gz



From cwickert at fedoraproject.org  Mon Sep  7 09:49:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  7 Sep 2009 09:49:19 +0000 (UTC)
Subject: rpms/lxde-icon-theme/devel import.log, NONE,
	1.1 lxde-icon-theme.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090907094919.24C5211C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29431/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lxde-icon-theme.spec 
Log Message:
Initial import of lxde-icon-theme. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=521431



--- NEW FILE import.log ---
lxde-icon-theme-0_4_2-2:HEAD:lxde-icon-theme-0.4.2-2.src.rpm:1252316680


--- NEW FILE lxde-icon-theme.spec ---
Name:           lxde-icon-theme
Version:        0.4.2
Release:        2
Summary:        Default icon theme for LXDE

Group:          User Interface/Desktops
License:        LGPLv3
URL:            http://nuovext.pwsp.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/lxde-common-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       filesystem
BuildArch:      noarch
Provides:       nuoveXT2-icon-theme = 2.2

%description
nuoveXT2 is a very complete set of icons for several operating systems. It is 
also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.


%prep
%setup -qn lxde-common-%{version}

%build
%configure


%install
rm -rf $RPM_BUILD_ROOT
# we only install the icon theme
cd icon-theme
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
touch $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/icon-theme.cache


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc icon-theme/AUTHORS icon-theme/COPYING
%dir %{_datadir}/icons/nuoveXT2/
%{_datadir}/icons/nuoveXT2/*/*
%{_datadir}/icons/nuoveXT2/index.theme
%ghost %{_datadir}/icons/nuoveXT2/icon-theme.cache


%changelog
* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Bump release for review

* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2

* Sat Jun 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1

* Mon Apr 14 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:06:00 -0000	1.1
+++ .cvsignore	7 Sep 2009 09:49:18 -0000	1.2
@@ -0,0 +1 @@
+lxde-common-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:06:00 -0000	1.1
+++ sources	7 Sep 2009 09:49:18 -0000	1.2
@@ -0,0 +1 @@
+81978c149ef7f349d904c4796d623ee6  lxde-common-0.4.2.tar.bz2



From tbzatek at fedoraproject.org  Mon Sep  7 09:51:35 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  7 Sep 2009 09:51:35 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.99, 1.100 nautilus.spec, 1.284,
	1.285 sources, 1.104,
	1.105 nautilus-2.21.1-dynamic-search-r2.patch, 1.2,
	NONE nautilus-2.22.0-treeview-xds-dnd-2.patch, 1.1,
	NONE nautilus-2.26.1-dnd-not-recurse.patch, 1.1,
	NONE nautilus-dupe-id.patch, 1.1, NONE nautilus-leaks.patch, 1.1,
	NONE nautilus-menu-icons3.patch, 1.1,
	NONE nautilus_always_open_appicon.patch, 1.1,
	NONE nautilus_gtk_mount_operation_signal.patch, 1.1,
	NONE nautilus_menu_icons_only2.patch, 1.1,
	NONE nautilus_new_windows_after_mount.patch, 1.1,
	NONE small-leaks.patch, 1.1, NONE uninhibit-me-harder.patch, 1.1, NONE
Message-ID: <20090907095135.C11C911C00DB@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30559

Modified Files:
	.cvsignore nautilus.spec sources 
Removed Files:
	nautilus-2.21.1-dynamic-search-r2.patch 
	nautilus-2.22.0-treeview-xds-dnd-2.patch 
	nautilus-2.26.1-dnd-not-recurse.patch nautilus-dupe-id.patch 
	nautilus-leaks.patch nautilus-menu-icons3.patch 
	nautilus_always_open_appicon.patch 
	nautilus_gtk_mount_operation_signal.patch 
	nautilus_menu_icons_only2.patch 
	nautilus_new_windows_after_mount.patch small-leaks.patch 
	uninhibit-me-harder.patch 
Log Message:
* Mon Sep  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.92-1
- Update to 2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore	25 Aug 2009 00:34:41 -0000	1.99
+++ .cvsignore	7 Sep 2009 09:51:34 -0000	1.100
@@ -1 +1 @@
-nautilus-2.27.91.tar.bz2
+nautilus-2.27.92.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- nautilus.spec	7 Sep 2009 01:30:03 -0000	1.284
+++ nautilus.spec	7 Sep 2009 09:51:34 -0000	1.285
@@ -14,8 +14,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.27.91
-Release:	3%{?dist}
+Version: 	2.27.92
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -85,10 +85,6 @@ Patch10:        nautilus-gvfs-desktop-ke
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# from upstream
-Patch20:        nautilus-dupe-id.patch
-Patch21:	uninhibit-me-harder.patch
-
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -125,8 +121,6 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch20 -p1 -b .dupe-id
-%patch21 -p1 -b .uninhibit-me-harder
 
 %build
 
@@ -267,6 +261,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Sun Sep  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-3
 - Fix uninhibiting when long-running operations are over
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- sources	25 Aug 2009 00:34:41 -0000	1.104
+++ sources	7 Sep 2009 09:51:35 -0000	1.105
@@ -1 +1 @@
-a7f654d0553307e80985aceb08946224  nautilus-2.27.91.tar.bz2
+46b5677e652ec008bb9d611f402d9375  nautilus-2.27.92.tar.bz2


--- nautilus-2.21.1-dynamic-search-r2.patch DELETED ---


--- nautilus-2.22.0-treeview-xds-dnd-2.patch DELETED ---


--- nautilus-2.26.1-dnd-not-recurse.patch DELETED ---


--- nautilus-dupe-id.patch DELETED ---


--- nautilus-leaks.patch DELETED ---


--- nautilus-menu-icons3.patch DELETED ---


--- nautilus_always_open_appicon.patch DELETED ---


--- nautilus_gtk_mount_operation_signal.patch DELETED ---


--- nautilus_menu_icons_only2.patch DELETED ---


--- nautilus_new_windows_after_mount.patch DELETED ---


--- small-leaks.patch DELETED ---


--- uninhibit-me-harder.patch DELETED ---



From cwickert at fedoraproject.org  Mon Sep  7 09:53:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  7 Sep 2009 09:53:01 +0000 (UTC)
Subject: rpms/lxde-icon-theme/F-11 lxde-icon-theme.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090907095301.3AC0F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31158/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	lxde-icon-theme.spec 
Log Message:
Initial build of lxde-icon-theme for this branch


--- NEW FILE lxde-icon-theme.spec ---
Name:           lxde-icon-theme
Version:        0.4.2
Release:        2
Summary:        Default icon theme for LXDE

Group:          User Interface/Desktops
License:        LGPLv3
URL:            http://nuovext.pwsp.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/lxde-common-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       filesystem
BuildArch:      noarch
Provides:       nuoveXT2-icon-theme = 2.2

%description
nuoveXT2 is a very complete set of icons for several operating systems. It is 
also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.


%prep
%setup -qn lxde-common-%{version}

%build
%configure


%install
rm -rf $RPM_BUILD_ROOT
# we only install the icon theme
cd icon-theme
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
touch $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/icon-theme.cache


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc icon-theme/AUTHORS icon-theme/COPYING
%dir %{_datadir}/icons/nuoveXT2/
%{_datadir}/icons/nuoveXT2/*/*
%{_datadir}/icons/nuoveXT2/index.theme
%ghost %{_datadir}/icons/nuoveXT2/icon-theme.cache


%changelog
* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Bump release for review

* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2

* Sat Jun 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1

* Mon Apr 14 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:06:00 -0000	1.1
+++ .cvsignore	7 Sep 2009 09:53:00 -0000	1.2
@@ -0,0 +1 @@
+lxde-common-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:06:00 -0000	1.1
+++ sources	7 Sep 2009 09:53:01 -0000	1.2
@@ -0,0 +1 @@
+81978c149ef7f349d904c4796d623ee6  lxde-common-0.4.2.tar.bz2



From cwickert at fedoraproject.org  Mon Sep  7 09:53:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  7 Sep 2009 09:53:01 +0000 (UTC)
Subject: rpms/lxde-icon-theme/F-10 lxde-icon-theme.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090907095301.A230F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-icon-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31158/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	lxde-icon-theme.spec 
Log Message:
Initial build of lxde-icon-theme for this branch


--- NEW FILE lxde-icon-theme.spec ---
Name:           lxde-icon-theme
Version:        0.4.2
Release:        2
Summary:        Default icon theme for LXDE

Group:          User Interface/Desktops
License:        LGPLv3
URL:            http://nuovext.pwsp.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/lxde-common-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       filesystem
BuildArch:      noarch
Provides:       nuoveXT2-icon-theme = 2.2

%description
nuoveXT2 is a very complete set of icons for several operating systems. It is 
also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.


%prep
%setup -qn lxde-common-%{version}

%build
%configure


%install
rm -rf $RPM_BUILD_ROOT
# we only install the icon theme
cd icon-theme
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
touch $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/icon-theme.cache


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc icon-theme/AUTHORS icon-theme/COPYING
%dir %{_datadir}/icons/nuoveXT2/
%{_datadir}/icons/nuoveXT2/*/*
%{_datadir}/icons/nuoveXT2/index.theme
%ghost %{_datadir}/icons/nuoveXT2/icon-theme.cache


%changelog
* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Bump release for review

* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2

* Sat Jun 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1

* Mon Apr 14 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:06:00 -0000	1.1
+++ .cvsignore	7 Sep 2009 09:53:01 -0000	1.2
@@ -0,0 +1 @@
+lxde-common-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:06:00 -0000	1.1
+++ sources	7 Sep 2009 09:53:01 -0000	1.2
@@ -0,0 +1 @@
+81978c149ef7f349d904c4796d623ee6  lxde-common-0.4.2.tar.bz2



From denis at fedoraproject.org  Mon Sep  7 09:53:24 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  7 Sep 2009 09:53:24 +0000 (UTC)
Subject: rpms/cluttermm/devel cluttermm-0.9.4-wrapinit.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 cluttermm.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090907095324.59FD511C00DB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cluttermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31584

Modified Files:
	.cvsignore cluttermm.spec sources 
Added Files:
	cluttermm-0.9.4-wrapinit.patch 
Log Message:
- Updated to latest git, to compile against clutter 1.0 API
- Added patch to work around automake oddity


cluttermm-0.9.4-wrapinit.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cluttermm-0.9.4-wrapinit.patch ---
--- cluttermm-0.9.4/clutter/cluttermm/Makefile.in~	2009-09-07 11:01:34.000000000 +0200
+++ cluttermm-0.9.4/clutter/cluttermm/Makefile.in	2009-09-07 11:40:33.340803731 +0200
@@ -289,7 +289,7 @@
 sublib_cflags = $(CLUTTERMM_CFLAGS)
 sublib_topdir = clutter
 files_extra_h = init.h main.h utility.h threads.h frame-source.h \
-	event.h wrap_init.h wrap_init.h
+	event.h wrap_init.h
 files_extra_cc = init.cc main.cc utility.cc threads.cc frame-source.cc event.cc
 files_hg = \
 actor.hg \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Jul 2009 08:35:32 -0000	1.6
+++ .cvsignore	7 Sep 2009 09:53:23 -0000	1.7
@@ -1 +1 @@
-cluttermm-0.9.4.tar.bz2
+cluttermm-0.9.4.20090907git.tar.bz2


Index: cluttermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/cluttermm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cluttermm.spec	24 Jul 2009 19:10:28 -0000	1.8
+++ cluttermm.spec	7 Sep 2009 09:53:24 -0000	1.9
@@ -1,16 +1,20 @@
+%define snapshot .20090907git
+
 Name:           cluttermm
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        3%{snapshot}%{?dist}
 
 Summary:        C++ wrapper for clutter library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/cluttermm/0.9/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/cluttermm/0.9/%{name}-%{version}%{snapshot}.tar.bz2
+Patch0:         cluttermm-0.9.4-wrapinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 0.9.4
+BuildRequires: glib2-devel >= 2.21.6
 BuildRequires: glibmm24-devel >= 2.14
 BuildRequires: pangomm-devel >= 2.12
 BuildRequires: cairomm-devel
@@ -40,6 +44,7 @@ developing gstreamermm applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .wrapinit
 
 
 %build
@@ -80,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  7 2009 Denis Leroy <denis at poolshark.org> - 0.9.4-3.git20090907
+- Updated to latest git, to compile against clutter 1.0 API
+- Added patch to work around automake oddity
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Jul 2009 08:35:32 -0000	1.6
+++ sources	7 Sep 2009 09:53:24 -0000	1.7
@@ -1 +1 @@
-4ab5d370a0af13e026003e473d8dc187  cluttermm-0.9.4.tar.bz2
+8e686e2bb4b1a20c134fa1ac7b29d357  cluttermm-0.9.4.20090907git.tar.bz2



From caolanm at fedoraproject.org  Mon Sep  7 09:58:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  7 Sep 2009 09:58:37 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf.gnomeXXXXX.gdk-pixbuf.patch, NONE,
	1.1 libgsf.spec, 1.72, 1.73
Message-ID: <20090907095837.AA50611C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv796

Modified Files:
	libgsf.spec 
Added Files:
	libgsf.gnomeXXXXX.gdk-pixbuf.patch 
Log Message:
Resolves: rhbz#521513 try gdk-pixbuf before ImageMagick convert

libgsf.gnomeXXXXX.gdk-pixbuf.patch:
 configure.in            |   22 ++++++++++++++++++++++
 gsf-config.h.in         |    3 +++
 thumbnailer/Makefile.am |    4 ++--
 thumbnailer/main.c      |   19 +++++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)

--- NEW FILE libgsf.gnomeXXXXX.gdk-pixbuf.patch ---
diff -ru libgsf-1.14.15.ori/configure.in libgsf-1.14.15/configure.in
--- libgsf-1.14.15.ori/configure.in	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/configure.in	2009-09-07 10:30:22.000000000 +0100
@@ -468,6 +468,28 @@
 fi
 AC_SUBST(BONOBO_REQ)
 
+want_gdk_pixbuf=no
+dnl check for gdk_pixbuf
+AC_ARG_WITH(gdk_pixbuf,
+    AC_HELP_STRING([--without-gdk-pixbuf],[disable the use of gdk-pixbuf]),
+    [case "${withval}" in
+    yes) want_gdk_pixbuf=yes ;;
+    no) want_gdk_pixbuf=no ;;
+    *) AC_MSG_ERROR(bad value ${withval} for --with-gdk-pixbuf) ;;
+    esac],
+    [want_gdk_pixbuf=auto]) dnl Default value
+
+if test $want_gdk_pixbuf = no ; then 
+    AC_MSG_WARN([gdk-pixbuf support disabled, as requested (Use --with-gdk-pixbuf to enable)])
+else
+    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,
+        [AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Define if gdk-pixbuf is available])],
+	[if test $want_gdk_pixbuf = yes; then
+	    AC_MSG_ERROR([gdk-pixbuf support requested, but not available.])
+	 else
+	    AC_MSG_WARN([gdk-pixbuf support disabled, unable to find required version])
+	 fi])
+fi
 
 have_gnome=no
 if test $want_gnome = no ; then 
diff -ru libgsf-1.14.15.ori/gsf-config.h.in libgsf-1.14.15/gsf-config.h.in
--- libgsf-1.14.15.ori/gsf-config.h.in	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/gsf-config.h.in	2009-09-07 10:32:10.000000000 +0100
@@ -30,6 +30,9 @@
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
+/* Define if gdk-pixbuf is available */
+#undef HAVE_GDK_PIXBUF
+
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
diff -ru libgsf-1.14.15.ori/thumbnailer/main.c libgsf-1.14.15/thumbnailer/main.c
--- libgsf-1.14.15.ori/thumbnailer/main.c	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/thumbnailer/main.c	2009-09-07 10:33:13.000000000 +0100
@@ -32,6 +32,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <glib.h>
+#include <gsf-config.h>
+
+#ifdef HAVE_GDK_PIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
 
 #ifdef HAVE_SETRLIMI
 #include <sys/resource.h>
@@ -62,6 +67,20 @@
 	GError *error;
 	gint exit_status;
 
+#ifdef HAVE_GDK_PIXBUF
+	GdkPixbuf* pixbuf;
+
+	pixbuf = gdk_pixbuf_new_from_file_at_scale (in_filename, thumb_size, thumb_size, 
+            TRUE, NULL);
+	if (pixbuf)
+	{
+		gboolean success = gdk_pixbuf_save (pixbuf, out_filename, "png", NULL, NULL);
+		g_object_unref (pixbuf);
+		if (success)
+			return;
+	}
+#endif
+
 	in_quote = g_shell_quote (in_filename);
 	out_quote = g_shell_quote (out_filename);
 	cmd_line = g_strdup_printf ("convert %s +matte -thumbnail %dx%d png:%s",
diff -ru libgsf-1.14.15.ori/thumbnailer/Makefile.am libgsf-1.14.15/thumbnailer/Makefile.am
--- libgsf-1.14.15.ori/thumbnailer/Makefile.am	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/thumbnailer/Makefile.am	2009-09-07 10:33:39.000000000 +0100
@@ -1,7 +1,7 @@
 @INTLTOOL_SCHEMAS_RULE@
 
-AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(LIBXML_CFLAGS)
-LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(LIBXML_CFLAGS)
+LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) $(GDK_PIXBUF_LIBS)
 
 bin_PROGRAMS = gsf-office-thumbnailer
 


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- libgsf.spec	25 Jul 2009 05:50:15 -0000	1.72
+++ libgsf.spec	7 Sep 2009 09:58:37 -0000	1.73
@@ -4,15 +4,16 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
 URL: http://www.gnome.org/projects/libgsf/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel, perl-XML-Parser
+BuildRequires: glib2-devel, perl-XML-Parser, autoconf
 BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel
+Patch0: libgsf.gnomeXXXXX.gdk-pixbuf.patch
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -58,8 +59,10 @@ Python bindings for libgsf
 
 %prep
 %setup -q
+%patch0 -p1 -b .gnomeXXXXX.gdk-pixbuf
 
 %build
+autoreconf
 %configure --disable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
@@ -133,6 +136,9 @@ fi
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> 1.14.15-4
+- Resolves: rhbz#521513 try gdk-pixbuf before ImageMagick convert
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Mon Sep  7 10:02:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  7 Sep 2009 10:02:54 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf.gnome594359.gdk-pixbuf.patch, NONE,
	1.1 libgsf.spec, 1.73, 1.74 libgsf.gnomeXXXXX.gdk-pixbuf.patch,
	1.1, NONE
Message-ID: <20090907100254.DC6C011C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1975

Modified Files:
	libgsf.spec 
Added Files:
	libgsf.gnome594359.gdk-pixbuf.patch 
Removed Files:
	libgsf.gnomeXXXXX.gdk-pixbuf.patch 
Log Message:
rename patch

libgsf.gnome594359.gdk-pixbuf.patch:
 configure.in            |   22 ++++++++++++++++++++++
 gsf-config.h.in         |    3 +++
 thumbnailer/Makefile.am |    4 ++--
 thumbnailer/main.c      |   19 +++++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)

--- NEW FILE libgsf.gnome594359.gdk-pixbuf.patch ---
diff -ru libgsf-1.14.15.ori/configure.in libgsf-1.14.15/configure.in
--- libgsf-1.14.15.ori/configure.in	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/configure.in	2009-09-07 10:30:22.000000000 +0100
@@ -468,6 +468,28 @@
 fi
 AC_SUBST(BONOBO_REQ)
 
+want_gdk_pixbuf=no
+dnl check for gdk_pixbuf
+AC_ARG_WITH(gdk_pixbuf,
+    AC_HELP_STRING([--without-gdk-pixbuf],[disable the use of gdk-pixbuf]),
+    [case "${withval}" in
+    yes) want_gdk_pixbuf=yes ;;
+    no) want_gdk_pixbuf=no ;;
+    *) AC_MSG_ERROR(bad value ${withval} for --with-gdk-pixbuf) ;;
+    esac],
+    [want_gdk_pixbuf=auto]) dnl Default value
+
+if test $want_gdk_pixbuf = no ; then 
+    AC_MSG_WARN([gdk-pixbuf support disabled, as requested (Use --with-gdk-pixbuf to enable)])
+else
+    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,
+        [AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Define if gdk-pixbuf is available])],
+	[if test $want_gdk_pixbuf = yes; then
+	    AC_MSG_ERROR([gdk-pixbuf support requested, but not available.])
+	 else
+	    AC_MSG_WARN([gdk-pixbuf support disabled, unable to find required version])
+	 fi])
+fi
 
 have_gnome=no
 if test $want_gnome = no ; then 
diff -ru libgsf-1.14.15.ori/gsf-config.h.in libgsf-1.14.15/gsf-config.h.in
--- libgsf-1.14.15.ori/gsf-config.h.in	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/gsf-config.h.in	2009-09-07 10:32:10.000000000 +0100
@@ -30,6 +30,9 @@
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
+/* Define if gdk-pixbuf is available */
+#undef HAVE_GDK_PIXBUF
+
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
diff -ru libgsf-1.14.15.ori/thumbnailer/main.c libgsf-1.14.15/thumbnailer/main.c
--- libgsf-1.14.15.ori/thumbnailer/main.c	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/thumbnailer/main.c	2009-09-07 10:33:13.000000000 +0100
@@ -32,6 +32,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <glib.h>
+#include <gsf-config.h>
+
+#ifdef HAVE_GDK_PIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
 
 #ifdef HAVE_SETRLIMI
 #include <sys/resource.h>
@@ -62,6 +67,20 @@
 	GError *error;
 	gint exit_status;
 
+#ifdef HAVE_GDK_PIXBUF
+	GdkPixbuf* pixbuf;
+
+	pixbuf = gdk_pixbuf_new_from_file_at_scale (in_filename, thumb_size, thumb_size, 
+            TRUE, NULL);
+	if (pixbuf)
+	{
+		gboolean success = gdk_pixbuf_save (pixbuf, out_filename, "png", NULL, NULL);
+		g_object_unref (pixbuf);
+		if (success)
+			return;
+	}
+#endif
+
 	in_quote = g_shell_quote (in_filename);
 	out_quote = g_shell_quote (out_filename);
 	cmd_line = g_strdup_printf ("convert %s +matte -thumbnail %dx%d png:%s",
diff -ru libgsf-1.14.15.ori/thumbnailer/Makefile.am libgsf-1.14.15/thumbnailer/Makefile.am
--- libgsf-1.14.15.ori/thumbnailer/Makefile.am	2009-09-07 09:24:35.000000000 +0100
+++ libgsf-1.14.15/thumbnailer/Makefile.am	2009-09-07 10:33:39.000000000 +0100
@@ -1,7 +1,7 @@
 @INTLTOOL_SCHEMAS_RULE@
 
-AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(LIBXML_CFLAGS)
-LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(LIBXML_CFLAGS)
+LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) $(GDK_PIXBUF_LIBS)
 
 bin_PROGRAMS = gsf-office-thumbnailer
 


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- libgsf.spec	7 Sep 2009 09:58:37 -0000	1.73
+++ libgsf.spec	7 Sep 2009 10:02:54 -0000	1.74
@@ -13,7 +13,7 @@ Buildroot: %{_tmppath}/%{name}-%{version
 BuildRequires: glib2-devel, perl-XML-Parser, autoconf
 BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel
-Patch0: libgsf.gnomeXXXXX.gdk-pixbuf.patch
+Patch0: libgsf.gnome594359.gdk-pixbuf.patch
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -59,7 +59,7 @@ Python bindings for libgsf
 
 %prep
 %setup -q
-%patch0 -p1 -b .gnomeXXXXX.gdk-pixbuf
+%patch0 -p1 -b .gnome594359.gdk-pixbuf
 
 %build
 autoreconf


--- libgsf.gnomeXXXXX.gdk-pixbuf.patch DELETED ---



From ultrafredde at fedoraproject.org  Mon Sep  7 10:02:59 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Mon,  7 Sep 2009 10:02:59 +0000 (UTC)
Subject: rpms/task/F-10 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 sources,
	1.6, 1.7 task.spec, 1.5, 1.6
Message-ID: <20090907100259.81AA811C00DB@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2061/F-10

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Aug 2009 22:01:39 -0000	1.5
+++ .cvsignore	7 Sep 2009 10:02:59 -0000	1.6
@@ -1 +1 @@
-task-1.8.1.tar.gz
+task-1.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	20 Aug 2009 22:01:39 -0000	1.5
+++ import.log	7 Sep 2009 10:02:59 -0000	1.6
@@ -3,3 +3,4 @@ task-1_7_1-1_fc10:F-10:task-1.7.1-1.fc10
 task-1_7_1-2_fc10:F-10:task-1.7.1-2.fc10.src.rpm:1244564097
 task-1_8_0-1_fc10:F-10:task-1.8.0-1.fc10.src.rpm:1249996577
 task-1_8_1-1_fc10:F-10:task-1.8.1-1.fc10.src.rpm:1250805496
+task-1_8_2-1_fc10:F-10:task-1.8.2-1.fc10.src.rpm:1252317762


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 22:01:39 -0000	1.6
+++ sources	7 Sep 2009 10:02:59 -0000	1.7
@@ -1 +1 @@
-c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz
+1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/task.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- task.spec	20 Aug 2009 22:01:39 -0000	1.5
+++ task.spec	7 Sep 2009 10:02:59 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
+  Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1
   Intial RPM for task bugfix release 1.8.1
 * Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
@@ -60,12 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta1-1
   Intial RPM for task beta release 1.8.0.beta1
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-2
-- Fixed inclusion of manpages.
+  Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1
-- Initial RPM for bugfix release 1.7.1.
-- Updated references to new project homepage in spec file. 
+  Initial RPM for bugfix release 1.7.1.
+  Updated references to new project homepage in spec file. 
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-2
-- Changed license to GPLv2+ and removed Requires macro.
-- See https://bugzilla.redhat.com/show_bug.cgi?id=501498
+  Changed license to GPLv2+ and removed Requires macro.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=501498
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-1
-- Initial RPM.
+  Initial RPM.



From sharkcz at fedoraproject.org  Mon Sep  7 10:02:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Sep 2009 10:02:56 +0000 (UTC)
Subject: rpms/hercules/devel hercules-3.06-extgui.patch, NONE,
	1.1 hercules.spec, 1.25, 1.26
Message-ID: <20090907100256.BB97E11C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013

Modified Files:
	hercules.spec 
Added Files:
	hercules-3.06-extgui.patch 
Log Message:
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-4
- enable support for external gui


hercules-3.06-extgui.patch:
 configure.ac |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE hercules-3.06-extgui.patch ---
>From 9da5ff0f3b27791ecb3caa4f04a86262189ab670 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 10:36:06 +0200
Subject: [PATCH] do not limit external GUI to Windows only, it now exists also on Linux

---
 configure.ac |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4cea2d..c73c6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,13 +1689,6 @@ fi
 
 #------------------------------------------------------------------------------
 
-if test "$hc_cv_opt_external_gui" = "yes"  &&
-   test "$hc_cv_is_windows"      != "yes"; then
-
-   AC_MSG_RESULT( [ERROR: external-gui currently only supported on Windows platforms] )
-   hc_error=yes
-fi
-
 if test "$hc_cv_opt_external_gui"  = "yes"  &&
    test "$hc_cv_opt_dynamic_load" != "yes"; then
 
-- 
1.6.3.3



Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- hercules.spec	25 Jul 2009 02:07:17 -0000	1.25
+++ hercules.spec	7 Sep 2009 10:02:56 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -13,6 +13,7 @@ Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
 Patch2: %{name}-3.06-preproc.patch
+Patch3: %{name}-3.06-extgui.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
 BuildRequires: libtool libtool-ltdl-devel
@@ -31,6 +32,7 @@ printer-keyboard, 3270 terminal, and 328
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # refresh for recent libtool
 rm autoconf/libtool.m4
@@ -52,6 +54,7 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 %build
 %configure \
+    --enable-external-gui \
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
 
@@ -99,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-4
+- enable support for external gui
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.06-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Sep  7 10:04:13 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Sep 2009 10:04:13 +0000 (UTC)
Subject: rpms/hercules/F-11 hercules-3.06-extgui.patch, NONE,
	1.1 hercules.spec, 1.24, 1.25
Message-ID: <20090907100413.550BD11C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2509

Modified Files:
	hercules.spec 
Added Files:
	hercules-3.06-extgui.patch 
Log Message:
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-3
- enable support for external gui


hercules-3.06-extgui.patch:
 configure.ac |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE hercules-3.06-extgui.patch ---
>From 9da5ff0f3b27791ecb3caa4f04a86262189ab670 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 10:36:06 +0200
Subject: [PATCH] do not limit external GUI to Windows only, it now exists also on Linux

---
 configure.ac |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4cea2d..c73c6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,13 +1689,6 @@ fi
 
 #------------------------------------------------------------------------------
 
-if test "$hc_cv_opt_external_gui" = "yes"  &&
-   test "$hc_cv_is_windows"      != "yes"; then
-
-   AC_MSG_RESULT( [ERROR: external-gui currently only supported on Windows platforms] )
-   hc_error=yes
-fi
-
 if test "$hc_cv_opt_external_gui"  = "yes"  &&
    test "$hc_cv_opt_dynamic_load" != "yes"; then
 
-- 
1.6.3.3



Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-11/hercules.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- hercules.spec	25 Feb 2009 03:39:17 -0000	1.24
+++ hercules.spec	7 Sep 2009 10:04:13 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -13,6 +13,7 @@ Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
 Patch2: %{name}-3.06-preproc.patch
+Patch3: %{name}-3.06-extgui.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
 BuildRequires: libtool libtool-ltdl-devel
@@ -31,6 +32,7 @@ printer-keyboard, 3270 terminal, and 328
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # refresh for recent libtool
 rm autoconf/libtool.m4
@@ -52,6 +54,7 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 %build
 %configure \
+    --enable-external-gui \
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
 
@@ -99,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-3
+- enable support for external gui
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Sep  7 10:05:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Sep 2009 10:05:14 +0000 (UTC)
Subject: rpms/hercules/F-10 hercules-3.06-extgui.patch, NONE,
	1.1 hercules.spec, 1.23, 1.24
Message-ID: <20090907100514.52C5211C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2847

Modified Files:
	hercules.spec 
Added Files:
	hercules-3.06-extgui.patch 
Log Message:
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-2
- enable support for external gui


hercules-3.06-extgui.patch:
 configure.ac |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE hercules-3.06-extgui.patch ---
>From 9da5ff0f3b27791ecb3caa4f04a86262189ab670 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 10:36:06 +0200
Subject: [PATCH] do not limit external GUI to Windows only, it now exists also on Linux

---
 configure.ac |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4cea2d..c73c6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,13 +1689,6 @@ fi
 
 #------------------------------------------------------------------------------
 
-if test "$hc_cv_opt_external_gui" = "yes"  &&
-   test "$hc_cv_is_windows"      != "yes"; then
-
-   AC_MSG_RESULT( [ERROR: external-gui currently only supported on Windows platforms] )
-   hc_error=yes
-fi
-
 if test "$hc_cv_opt_external_gui"  = "yes"  &&
    test "$hc_cv_opt_dynamic_load" != "yes"; then
 
-- 
1.6.3.3



Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-10/hercules.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- hercules.spec	19 Feb 2009 06:37:04 -0000	1.23
+++ hercules.spec	7 Sep 2009 10:05:14 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -13,6 +13,7 @@ Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
 Patch2: %{name}-3.06-preproc.patch
+Patch3: %{name}-3.06-extgui.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
 BuildRequires: libtool libtool-ltdl-devel
@@ -31,6 +32,7 @@ printer-keyboard, 3270 terminal, and 328
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # refresh for recent libtool
 rm autoconf/libtool.m4
@@ -52,6 +54,7 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 %build
 %configure \
+    --enable-external-gui \
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
 
@@ -99,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-2
+- enable support for external gui
+
 * Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 3.06-1
 - update to upstream version 3.06
 - use system ltdl library



From sharkcz at fedoraproject.org  Mon Sep  7 10:06:19 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Sep 2009 10:06:19 +0000 (UTC)
Subject: rpms/hercules/EL-5 hercules-3.06-extgui.patch, NONE,
	1.1 hercules.spec, 1.16, 1.17
Message-ID: <20090907100619.A559D11C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3218

Modified Files:
	hercules.spec 
Added Files:
	hercules-3.06-extgui.patch 
Log Message:
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-2
- enable support for external gui


hercules-3.06-extgui.patch:
 configure.ac |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE hercules-3.06-extgui.patch ---
>From 9da5ff0f3b27791ecb3caa4f04a86262189ab670 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 10:36:06 +0200
Subject: [PATCH] do not limit external GUI to Windows only, it now exists also on Linux

---
 configure.ac |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4cea2d..c73c6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,13 +1689,6 @@ fi
 
 #------------------------------------------------------------------------------
 
-if test "$hc_cv_opt_external_gui" = "yes"  &&
-   test "$hc_cv_is_windows"      != "yes"; then
-
-   AC_MSG_RESULT( [ERROR: external-gui currently only supported on Windows platforms] )
-   hc_error=yes
-fi
-
 if test "$hc_cv_opt_external_gui"  = "yes"  &&
    test "$hc_cv_opt_dynamic_load" != "yes"; then
 
-- 
1.6.3.3



Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/hercules.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hercules.spec	19 Feb 2009 06:55:30 -0000	1.16
+++ hercules.spec	7 Sep 2009 10:06:19 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -13,6 +13,7 @@ Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
 Patch2: %{name}-3.06-preproc.patch
+Patch3: %{name}-3.06-extgui.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
 BuildRequires: libtool libtool-ltdl-devel
@@ -31,6 +32,7 @@ printer-keyboard, 3270 terminal, and 328
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # refresh for recent libtool
 rm autoconf/libtool.m4
@@ -52,6 +54,7 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 %build
 %configure \
+    --enable-external-gui \
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
 
@@ -99,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-2
+- enable support for external gui
+
 * Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 3.06-1
 - update to upstream version 3.06
 - use system ltdl library



From ultrafredde at fedoraproject.org  Mon Sep  7 10:14:03 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Mon,  7 Sep 2009 10:14:03 +0000 (UTC)
Subject: rpms/task/F-11 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 sources,
	1.6, 1.7 task.spec, 1.5, 1.6
Message-ID: <20090907101403.D667511C00DB@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5158/F-11

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Aug 2009 22:10:15 -0000	1.5
+++ .cvsignore	7 Sep 2009 10:14:03 -0000	1.6
@@ -1 +1 @@
-task-1.8.1.tar.gz
+task-1.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	20 Aug 2009 22:10:16 -0000	1.5
+++ import.log	7 Sep 2009 10:14:03 -0000	1.6
@@ -3,3 +3,4 @@ task-1_7_1-1_fc10:F-11:task-1.7.1-1.fc10
 task-1_7_1-2_fc10:F-11:task-1.7.1-2.fc10.src.rpm:1244564752
 task-1_8_0-1_fc10:F-11:task-1.8.0-1.fc10.src.rpm:1249997080
 task-1_8_1-1_fc10:F-11:task-1.8.1-1.fc10.src.rpm:1250806196
+task-1_8_2-1_fc10:F-11:task-1.8.2-1.fc10.src.rpm:1252318424


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 22:10:16 -0000	1.6
+++ sources	7 Sep 2009 10:14:03 -0000	1.7
@@ -1 +1 @@
-c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz
+1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/task.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- task.spec	20 Aug 2009 22:10:16 -0000	1.5
+++ task.spec	7 Sep 2009 10:14:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
+  Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1
   Intial RPM for task bugfix release 1.8.1
 * Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
@@ -60,12 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta1-1
   Intial RPM for task beta release 1.8.0.beta1
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-2
-- Fixed inclusion of manpages.
+  Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1
-- Initial RPM for bugfix release 1.7.1.
-- Updated references to new project homepage in spec file. 
+  Initial RPM for bugfix release 1.7.1.
+  Updated references to new project homepage in spec file. 
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-2
-- Changed license to GPLv2+ and removed Requires macro.
-- See https://bugzilla.redhat.com/show_bug.cgi?id=501498
+  Changed license to GPLv2+ and removed Requires macro.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=501498
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-1
-- Initial RPM.
+  Initial RPM.



From jfch2222 at fedoraproject.org  Mon Sep  7 10:20:22 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon,  7 Sep 2009 10:20:22 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-homechroot.patch, 1.5,
	1.6 openssh.spec, 1.163, 1.164
Message-ID: <20090907102022.BC84111C043A@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9120

Modified Files:
	openssh-5.2p1-homechroot.patch openssh.spec 
Log Message:
Add check for nosuid, nodev in homechroot


openssh-5.2p1-homechroot.patch:
 chrootenv.h        |   32 ++++++++++++++++++++++
 session.c          |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 sftp-common.c      |    5 ++-
 sftp-server-main.c |    3 ++
 sftp.c             |    2 +
 sshd_config.0      |    8 +++++
 sshd_config.5      |   11 +++++++
 7 files changed, 134 insertions(+), 4 deletions(-)

Index: openssh-5.2p1-homechroot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-homechroot.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openssh-5.2p1-homechroot.patch	24 Jul 2009 06:15:35 -0000	1.5
+++ openssh-5.2p1-homechroot.patch	7 Sep 2009 10:20:22 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up /dev/null openssh-5.2p1/chrootenv.h
---- /dev/null	2009-07-23 14:57:23.604046842 +0200
-+++ openssh-5.2p1/chrootenv.h	2009-07-24 07:11:29.000000000 +0200
+--- /dev/null	2009-08-19 20:21:50.796466837 +0200
++++ openssh-5.2p1/chrootenv.h	2009-08-19 23:22:15.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* $OpenBSD: session.h,v 1.30 2008/05/08 12:21:16 djm Exp $ */
 +
@@ -35,8 +35,8 @@ diff -up /dev/null openssh-5.2p1/chroote
 +#endif
 +
 diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
---- openssh-5.2p1/session.c.homechroot	2009-07-24 07:11:22.000000000 +0200
-+++ openssh-5.2p1/session.c	2009-07-24 07:33:14.000000000 +0200
+--- openssh-5.2p1/session.c.homechroot	2009-08-19 23:22:14.000000000 +0200
++++ openssh-5.2p1/session.c	2009-08-19 23:22:15.000000000 +0200
 @@ -119,6 +119,8 @@ void	do_child(Session *, const char *);
  void	do_motd(void);
  int	check_quietlogin(Session *, const char *);
@@ -58,7 +58,69 @@ diff -up openssh-5.2p1/session.c.homechr
  #ifdef SSH_AUDIT_EVENTS
  	if (command != NULL)
  		PRIVSEP(audit_run_command(command));
-@@ -1408,6 +1415,7 @@ safely_chroot(const char *path, uid_t ui
+@@ -1399,6 +1406,61 @@ do_nologin(struct passwd *pw)
+ }
+ 
+ /*
++ * Test if filesystem is mounted nosuid and nodev
++ */
++
++static void
++test_nosuid (dev_t fs)
++{
++	FILE *f;
++	struct stat st;
++	char buf[4096], *s, *on, *mountpoint, *opt;
++	int nodev, nosuid;
++
++	if (!(f = popen ("/bin/mount", "r")))
++		fatal ("%s: popen(\"/bin/mount\", \"r\"): %s",
++		    __func__, strerror (errno));
++	for (;;) {
++		s = fgets (buf, sizeof (buf), f);
++		if (ferror (f))
++			fatal ("%s: read from popen: %s", __func__,
++			    strerror (errno));
++		if (!s) {
++			pclose (f);
++			fatal ("cannot found filesystem with the chroot directory");
++		}
++		(void) strtok (buf, " ");
++		on = strtok (NULL, " ");
++		if (strcmp (on, "on")) {
++			pclose (f);
++			fatal ("bad format of mount output");
++		}
++		mountpoint = strtok (NULL, " ");
++		if (stat(mountpoint, &st) != 0) {
++			pclose (f);
++			fatal("%s: stat(\"%s\"): %s", __func__,
++			    mountpoint, strerror(errno));
++		}
++		if (fs != st.st_dev)
++			continue;
++		nodev = nosuid = 0;
++		for (opt = strtok (NULL, "("); opt; opt = strtok (NULL, " ,)")) {
++			if (!strcmp (opt, "nodev"))
++				nodev = 1;
++			else if (!strcmp (opt, "nosuid"))
++				nosuid = 1;
++			else if (!strcmp (opt, "noexec"))
++				nosuid = 1;
++			if (nodev && nosuid) {
++				pclose (f);
++				return;
++			}
++		}
++		fatal ("chroot into directory without nodev or nosuid");
++	}	
++}
++
++/*
+  * Chroot into a directory after checking it for safety: all path components
+  * must be root-owned directories with strict permissions.
+  */
+@@ -1408,6 +1470,7 @@ safely_chroot(const char *path, uid_t ui
  	const char *cp;
  	char component[MAXPATHLEN];
  	struct stat st;
@@ -66,7 +128,7 @@ diff -up openssh-5.2p1/session.c.homechr
  
  	if (*path != '/')
  		fatal("chroot path does not begin at root");
-@@ -1419,7 +1427,7 @@ safely_chroot(const char *path, uid_t ui
+@@ -1419,7 +1482,7 @@ safely_chroot(const char *path, uid_t ui
  	 * root-owned directory with strict permissions.
  	 */
  	for (cp = path; cp != NULL;) {
@@ -75,7 +137,7 @@ diff -up openssh-5.2p1/session.c.homechr
  			strlcpy(component, path, sizeof(component));
  		else {
  			cp++;
-@@ -1432,15 +1440,19 @@ safely_chroot(const char *path, uid_t ui
+@@ -1432,14 +1495,20 @@ safely_chroot(const char *path, uid_t ui
  		if (stat(component, &st) != 0)
  			fatal("%s: stat(\"%s\"): %s", __func__,
  			    component, strerror(errno));
@@ -87,30 +149,30 @@ diff -up openssh-5.2p1/session.c.homechr
  		if (!S_ISDIR(st.st_mode))
  			fatal("chroot path %s\"%s\" is not a directory",
  			    cp == NULL ? "" : "component ", component);
--
- 	}
++	}
 +	setenv ("TZ", "/etc/localtime", 0);
 +	tzset ();
-+
-+	if (st.st_uid != uid)
+ 
++	if (st.st_uid) {
++		test_nosuid (st.st_dev);
 +		++chroot_no_tree;
+ 	}
  
  	if (chdir(path) == -1)
- 		fatal("Unable to chdir to chroot path \"%s\": "
-@@ -1451,6 +1463,10 @@ safely_chroot(const char *path, uid_t ui
+@@ -1451,6 +1520,10 @@ safely_chroot(const char *path, uid_t ui
  	if (chdir("/") == -1)
  		fatal("%s: chdir(/) after chroot: %s",
  		    __func__, strerror(errno));
 +
 +	if (access ("/etc/localtime", R_OK) < 0)
-+			++chroot_no_tree;
++		++chroot_no_tree;
 +
  	verbose("Changed root directory to \"%s\"", path);
  }
  
 diff -up openssh-5.2p1/sftp.c.homechroot openssh-5.2p1/sftp.c
 --- openssh-5.2p1/sftp.c.homechroot	2009-02-14 06:26:19.000000000 +0100
-+++ openssh-5.2p1/sftp.c	2009-07-24 07:11:29.000000000 +0200
++++ openssh-5.2p1/sftp.c	2009-08-19 23:22:15.000000000 +0200
 @@ -94,6 +94,8 @@ int remote_glob(struct sftp_conn *, cons
  
  extern char *__progname;
@@ -122,7 +184,7 @@ diff -up openssh-5.2p1/sftp.c.homechroot
  
 diff -up openssh-5.2p1/sftp-common.c.homechroot openssh-5.2p1/sftp-common.c
 --- openssh-5.2p1/sftp-common.c.homechroot	2006-08-05 04:39:40.000000000 +0200
-+++ openssh-5.2p1/sftp-common.c	2009-07-24 07:11:29.000000000 +0200
++++ openssh-5.2p1/sftp-common.c	2009-08-19 23:22:15.000000000 +0200
 @@ -40,6 +40,7 @@
  #include "xmalloc.h"
  #include "buffer.h"
@@ -149,7 +211,7 @@ diff -up openssh-5.2p1/sftp-common.c.hom
  		snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid);
 diff -up openssh-5.2p1/sftp-server-main.c.homechroot openssh-5.2p1/sftp-server-main.c
 --- openssh-5.2p1/sftp-server-main.c.homechroot	2009-02-21 22:47:02.000000000 +0100
-+++ openssh-5.2p1/sftp-server-main.c	2009-07-24 07:11:29.000000000 +0200
++++ openssh-5.2p1/sftp-server-main.c	2009-08-19 23:22:15.000000000 +0200
 @@ -22,11 +22,14 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -165,3 +227,42 @@ diff -up openssh-5.2p1/sftp-server-main.
  void
  cleanup_exit(int i)
  {
+diff -up openssh-5.2p1/sshd_config.0.homechroot openssh-5.2p1/sshd_config.0
+--- openssh-5.2p1/sshd_config.0.homechroot	2009-08-19 23:22:14.000000000 +0200
++++ openssh-5.2p1/sshd_config.0	2009-08-19 23:31:26.000000000 +0200
+@@ -112,6 +112,14 @@ DESCRIPTION
+              essary if the in-process sftp server is used (see Subsystem for
+              details).
+ 
++             In the special case when only sftp is used, not ssh nor scp, it
++             is possible to use ChrootDirectory %h or ChrootDirectory
++             /some/path/%u. The file system containing this directory must be
++             mounted with options nodev and either nosuid or noexec. The owner
++             of the directory should be the user. The ownership of the other
++             components of the path must fulfill the usual conditions. No adi-
++             tional files are required to be present in the directory.
++
+              The default is not to chroot(2).
+ 
+      Ciphers
+diff -up openssh-5.2p1/sshd_config.5.homechroot openssh-5.2p1/sshd_config.5
+--- openssh-5.2p1/sshd_config.5.homechroot	2009-08-19 23:22:14.000000000 +0200
++++ openssh-5.2p1/sshd_config.5	2009-08-19 23:22:15.000000000 +0200
+@@ -219,6 +219,17 @@ in-process sftp server is used (see
+ .Cm Subsystem
+ for details).
+ .Pp
++In the special case when only sftp is used, not ssh nor scp,
++it is possible to use
++.Cm ChrootDirectory
++%h or
++.Cm ChrootDirectory
++/some/path/%u. The file system containing this directory must be
++mounted with options nodev and either nosuid or noexec. The owner of the 
++directory should be the user. The ownership of the other components of the path
++must fulfill the usual conditions. No aditional files are required to be present
++in the directory.
++.Pp
+ The default is not to
+ .Xr chroot 2 .
+ .It Cm Ciphers


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- openssh.spec	1 Sep 2009 18:51:41 -0000	1.163
+++ openssh.spec	7 Sep 2009 10:20:22 -0000	1.164
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 23%{?dist}%{?rescue_rel}
+Release: 24%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -468,6 +468,9 @@ fi
 %endif
 
 %changelog
+* Mon Sep  7 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-24
+- Add check for nosuid, nodev in homechroot
+
 * Tue Sep  1 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-23
 - add correct patch for ip-opts
 



From ultrafredde at fedoraproject.org  Mon Sep  7 10:23:59 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Mon,  7 Sep 2009 10:23:59 +0000 (UTC)
Subject: rpms/task/F-12 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 sources,
	1.6, 1.7 task.spec, 1.6, 1.7
Message-ID: <20090907102359.B676B11C00DB@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12271/F-12

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Aug 2009 22:22:01 -0000	1.5
+++ .cvsignore	7 Sep 2009 10:23:59 -0000	1.6
@@ -1 +1 @@
-task-1.8.1.tar.gz
+task-1.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	20 Aug 2009 22:22:02 -0000	1.5
+++ import.log	7 Sep 2009 10:23:59 -0000	1.6
@@ -3,3 +3,4 @@ task-1_7_1-1_fc10:HEAD:task-1.7.1-1.fc10
 task-1_7_1-2_fc10:HEAD:task-1.7.1-2.fc10.src.rpm:1244565493
 task-1_8_0-1_fc10:HEAD:task-1.8.0-1.fc10.src.rpm:1249997682
 task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10.src.rpm:1250806897
+task-1_8_2-1_fc10:F-12:task-1.8.2-1.fc10.src.rpm:1252318919


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 22:22:02 -0000	1.6
+++ sources	7 Sep 2009 10:23:59 -0000	1.7
@@ -1 +1 @@
-c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz
+1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/task.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- task.spec	20 Aug 2009 22:22:02 -0000	1.6
+++ task.spec	7 Sep 2009 10:23:59 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
+  Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1
   Intial RPM for task bugfix release 1.8.1
 * Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
@@ -60,12 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta1-1
   Intial RPM for task beta release 1.8.0.beta1
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-2
-- Fixed inclusion of manpages.
+  Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1
-- Initial RPM for bugfix release 1.7.1.
-- Updated references to new project homepage in spec file. 
+  Initial RPM for bugfix release 1.7.1.
+  Updated references to new project homepage in spec file. 
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-2
-- Changed license to GPLv2+ and removed Requires macro.
-- See https://bugzilla.redhat.com/show_bug.cgi?id=501498
+  Changed license to GPLv2+ and removed Requires macro.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=501498
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-1
-- Initial RPM.
+  Initial RPM.



From harald at fedoraproject.org  Mon Sep  7 10:24:11 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  7 Sep 2009 10:24:11 +0000 (UTC)
Subject: rpms/dracut/F-11 0005-mdraid-add-grep-for-convenience.patch, NONE, 
	1.1 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch, 
	NONE,
	1.1 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch,
	NONE, 1.1 dracut.spec, 1.9, 1.10
Message-ID: <20090907102411.549A911C00DB@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785

Modified Files:
	dracut.spec 
Added Files:
	0005-mdraid-add-grep-for-convenience.patch 
	0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch 
	0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch 
Log Message:
* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)


0005-mdraid-add-grep-for-convenience.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-mdraid-add-grep-for-convenience.patch ---
>From 429aa1a2c29dd42fbc91e956a8a77675773cc46d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 3 Sep 2009 17:11:03 +0200
Subject: [PATCH 5/6] mdraid: add grep for convenience

---
 modules.d/90mdraid/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 60f289a..497e5b0 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dracut_install mdadm partx
+dracut_install mdadm partx grep
 
 
 # XXX: mdmon really needs to run as non-root?
-- 
1.6.2.5


0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch:
 90crypt/install  |    2 +-
 90dmraid/install |    2 +-
 90lvm/install    |    2 +-
 90mdraid/install |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch ---
>From e4dec3d6b66ad6cc3c5b0646459c4ba2db1808b7 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 3 Sep 2009 17:11:57 +0200
Subject: [PATCH 6/6] {crypt,dmraid,lvm,mdraid}: cleanup with pre-pivot 30 and 31

---
 modules.d/90crypt/install  |    2 +-
 modules.d/90dmraid/install |    2 +-
 modules.d/90lvm/install    |    2 +-
 modules.d/90mdraid/install |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules.d/90crypt/install b/modules.d/90crypt/install
index 5108fef..b15440c 100755
--- a/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@ -4,4 +4,4 @@ inst_rules "$moddir/70-luks.rules"
 inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
 inst_hook cmdline 30 "$moddir/parse-crypt.sh"
 inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/crypt-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/crypt-cleanup.sh"
diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 704728b..b66257c 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -4,4 +4,4 @@ inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 inst_rules 64-md-raid.rules
 inst_rules "$moddir/61-dmraid-imsm.rules"
 inst_hook pre-pivot 30 "$moddir/dmraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/dmraid-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/dmraid-cleanup.sh"
diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
index eb27159..ad4d2e2 100755
--- a/modules.d/90lvm/install
+++ b/modules.d/90lvm/install
@@ -13,4 +13,4 @@ fi
 inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
 inst_hook cmdline 30 "$moddir/parse-lvm.sh"
 inst_hook pre-pivot 30 "$moddir/lvm-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/lvm-cleanup.sh"
\ No newline at end of file
+inst_hook pre-pivot 31 "$moddir/lvm-cleanup.sh"
\ No newline at end of file
diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 497e5b0..71c313b 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -34,4 +34,4 @@ fi
 inst "$moddir/mdraid_start.sh" /sbin/mdraid_start
 inst_hook pre-trigger 30 "$moddir/parse-md.sh"
 inst_hook pre-pivot 30 "$moddir/mdraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/mdraid-cleanup.sh"
\ No newline at end of file
+inst_hook pre-pivot 31 "$moddir/mdraid-cleanup.sh"
-- 
1.6.2.5


0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch ---
>From 96f3cf1d27268f3784f420ebb52228f3e6b08e77 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 11:40:20 +0200
Subject: [PATCH 7/8] 95udev-rules: fixed c&p bug which did not install 61-persistent-storage.rules

---
 modules.d/95udev-rules/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
index cf22d1e..695e472 100755
--- a/modules.d/95udev-rules/install
+++ b/modules.d/95udev-rules/install
@@ -23,7 +23,7 @@ if [ ! -x /lib/udev/vol_id ]; then
 else
     inst_rules "$moddir/59-persistent-storage-volid.rules"
 fi
-inst_rules "$moddir/61-persistent-storage-volid.rules"
+inst_rules "$moddir/61-persistent-storage.rules"
     
 for i in \
 ata_id \
-- 
1.6.2.5



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dracut.spec	2 Sep 2009 13:58:33 -0000	1.9
+++ dracut.spec	7 Sep 2009 10:24:11 -0000	1.10
@@ -13,12 +13,17 @@
 
 Name: dracut
 Version: 001
-Release: 1%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
+
+Patch1: 0005-mdraid-add-grep-for-convenience.patch
+Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
+Patch3: 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
@@ -102,6 +107,9 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 make
@@ -179,6 +187,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
+- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
+
+* Thu Sep 03 2009 Harald Hoyer <harald at redhat.com> 001-2
+- fixed missing grep for md
+- reorder cleanup
+
 * Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
 - version 001
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS



From lkundrak at fedoraproject.org  Mon Sep  7 10:25:27 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 10:25:27 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Selenium/devel .cvsignore, 1.3,
	1.4 perl-Test-WWW-Selenium.spec, 1.5, 1.6 sources, 1.4,
	1.5 perl-Test-WWW-Selenium-1.15-headers.patch, 1.1, NONE
Message-ID: <20090907102527.0BE0311C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Test-WWW-Selenium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13421

Modified Files:
	.cvsignore perl-Test-WWW-Selenium.spec sources 
Removed Files:
	perl-Test-WWW-Selenium-1.15-headers.patch 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.18-1
- Newer release, update API support to 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Selenium/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2008 18:08:01 -0000	1.3
+++ .cvsignore	7 Sep 2009 10:25:26 -0000	1.4
@@ -1 +1,2 @@
-Test-WWW-Selenium-1.15-2299.tar.gz
+selenium-core-1.0.1.zip
+Test-WWW-Selenium-1.18.tar.gz


Index: perl-Test-WWW-Selenium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Selenium/devel/perl-Test-WWW-Selenium.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-WWW-Selenium.spec	26 Jul 2009 16:59:54 -0000	1.5
+++ perl-Test-WWW-Selenium.spec	7 Sep 2009 10:25:26 -0000	1.6
@@ -1,20 +1,14 @@
+%global selenium_version 1.0.1
+
 Name:           perl-Test-WWW-Selenium
-Version:        1.15
-Release:        5.20081021svn%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        Perl Client for the Selenium Remote Control test tool
 License:        (GPL+ or Artistic) and ASL 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Test-WWW-Selenium/
-# svn export -r2299 https://svn.openqa.org/svn/selenium-rc/trunk/clients/perl at 2299 Test-WWW-Selenium-1.15
-# perl Test-WWW-Selenium-1.15/util/fetch_iedoc_xml.pl
-# mkdir Test-WWW-Selenium-1.15/target
-# mv iedoc.xml Test-WWW-Selenium-1.15/target
-# (cd Test-WWW-Selenium-1.15; perl util/create_www_selenium.pl)
-# tar czf Test-WWW-Selenium-1.15-2299.tar.gz Test-WWW-Selenium-1.15
-
-Source0:        Test-WWW-Selenium-1.15-2299.tar.gz
-#Source0:        http://www.perl.org/authors/id/L/LU/LUKEC/%{name}-%{version}.tar.gz
-Patch0:         perl-Test-WWW-Selenium-1.15-headers.patch
+Source0:        http://www.perl.org/authors/id/L/LU/LUKEC/Test-WWW-Selenium-%{version}.tar.gz
+Source1:        http://release.seleniumhq.org/selenium-core/%{selenium_version}/selenium-core-%{selenium_version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -38,10 +32,16 @@ directly with the browser using AJAX (Xm
 
 %prep
 %setup -q -n Test-WWW-Selenium-%{version}
-%patch0 -p1 -b .headers
+
+# Newer API definition
+mkdir -p target
+unzip -c %{SOURCE1} core/iedoc.xml >target/iedoc.xml
 
 
 %build
+# Recreate module with newer API
+%{__perl} util/create_www_selenium.pl
+
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.18-1
+- Newer release, update API support to 1.0.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-5.20081021svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Selenium/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2008 18:47:58 -0000	1.4
+++ sources	7 Sep 2009 10:25:26 -0000	1.5
@@ -1 +1,2 @@
-e0117893c0be302a2f6233d54b40a2ab  Test-WWW-Selenium-1.15-2299.tar.gz
+31833c856b59a87cf7958a020bf6907c  selenium-core-1.0.1.zip
+0615263ba747894c63b0f96b3018620e  Test-WWW-Selenium-1.18.tar.gz


--- perl-Test-WWW-Selenium-1.15-headers.patch DELETED ---



From tbzatek at fedoraproject.org  Mon Sep  7 10:33:02 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  7 Sep 2009 10:33:02 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.46, 1.47 gvfs.spec, 1.153,
	1.154 sources, 1.46, 1.47 gvfs-1.2.2-dnssd-deadlock.patch, 1.1,
	NONE gvfs-1.2.3-sftp-40sec-timeout.patch, 1.1,
	NONE gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch, 1.1,
	NONE gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch,
	1.1, NONE gvfs-1.3.4-output-stream-callback-arg.patch, 1.1,
	NONE gvfs-1.3.4-smb-browse-fake-content-type.patch, 1.1,
	NONE gvfs-1.3.5-gdaemonmount-root-path.patch, 1.1,
	NONE gvfs-1.3.5-mkdir-exists-error.patch, 1.1,
	NONE gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch, 
	1.1, NONE gvfs-non-interactive-mounts.patch, 1.1, NONE
Message-ID: <20090907103302.3479911C00DB@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15466

Modified Files:
	.cvsignore gvfs.spec sources 
Removed Files:
	gvfs-1.2.2-dnssd-deadlock.patch 
	gvfs-1.2.3-sftp-40sec-timeout.patch 
	gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch 
	gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch 
	gvfs-1.3.4-output-stream-callback-arg.patch 
	gvfs-1.3.4-smb-browse-fake-content-type.patch 
	gvfs-1.3.5-gdaemonmount-root-path.patch 
	gvfs-1.3.5-mkdir-exists-error.patch 
	gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch 
	gvfs-non-interactive-mounts.patch 
Log Message:
* Mon Sep  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.6-1
- Update to 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	24 Aug 2009 22:46:44 -0000	1.46
+++ .cvsignore	7 Sep 2009 10:33:01 -0000	1.47
@@ -1 +1 @@
-gvfs-1.3.5.tar.bz2
+gvfs-1.3.6.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- gvfs.spec	27 Aug 2009 02:45:16 -0000	1.153
+++ gvfs.spec	7 Sep 2009 10:33:02 -0000	1.154
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.3.5
-Release: 2%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -20,7 +20,7 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: GConf2-devel
-BuildRequires: gnome-disk-utility-devel >= 0.4
+BuildRequires: gnome-disk-utility-devel >= 0.5
 BuildRequires: PolicyKit-devel
 # This is a hack until the xfce4-notifyd dependency issue is fixed
 # https://fedorahosted.org/rel-eng/ticket/1788
@@ -38,8 +38,6 @@ Patch1: gvfs-archive-integration.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
 Patch10: 0001-Add-AFC-backend.patch
 
-Patch11: gvfs-non-interactive-mounts.patch
-
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -132,7 +130,6 @@ and iPod Touches to applications using g
 %setup -q
 %patch1 -p1 -b .archive-integration
 %patch10 -p1 -b .afc
-%patch11 -p1 -b .non-interactive-mounts
 
 %build
 
@@ -286,6 +283,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Mon Sep  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.6-1
+- Update to 1.3.6
+
 * Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.5-2
 - Don't mount interactively during login
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	24 Aug 2009 22:46:44 -0000	1.46
+++ sources	7 Sep 2009 10:33:02 -0000	1.47
@@ -1 +1 @@
-3d3d43f381716d973880ef55abea1aa6  gvfs-1.3.5.tar.bz2
+743f5ae84cd13273ee0197f4cfd6d5a9  gvfs-1.3.6.tar.bz2


--- gvfs-1.2.2-dnssd-deadlock.patch DELETED ---


--- gvfs-1.2.3-sftp-40sec-timeout.patch DELETED ---


--- gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch DELETED ---


--- gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch DELETED ---


--- gvfs-1.3.4-output-stream-callback-arg.patch DELETED ---


--- gvfs-1.3.4-smb-browse-fake-content-type.patch DELETED ---


--- gvfs-1.3.5-gdaemonmount-root-path.patch DELETED ---


--- gvfs-1.3.5-mkdir-exists-error.patch DELETED ---


--- gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch DELETED ---


--- gvfs-non-interactive-mounts.patch DELETED ---



From ultrafredde at fedoraproject.org  Mon Sep  7 10:34:16 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Mon,  7 Sep 2009 10:34:16 +0000 (UTC)
Subject: rpms/task/devel .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 sources,
	1.6, 1.7 task.spec, 1.6, 1.7
Message-ID: <20090907103416.AAF5C11C00DB@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15973/devel

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Aug 2009 22:22:01 -0000	1.5
+++ .cvsignore	7 Sep 2009 10:34:16 -0000	1.6
@@ -1 +1 @@
-task-1.8.1.tar.gz
+task-1.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	20 Aug 2009 22:22:02 -0000	1.5
+++ import.log	7 Sep 2009 10:34:16 -0000	1.6
@@ -3,3 +3,4 @@ task-1_7_1-1_fc10:HEAD:task-1.7.1-1.fc10
 task-1_7_1-2_fc10:HEAD:task-1.7.1-2.fc10.src.rpm:1244565493
 task-1_8_0-1_fc10:HEAD:task-1.8.0-1.fc10.src.rpm:1249997682
 task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10.src.rpm:1250806897
+task-1_8_2-1_fc10:HEAD:task-1.8.2-1.fc10.src.rpm:1252319639


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 22:22:02 -0000	1.6
+++ sources	7 Sep 2009 10:34:16 -0000	1.7
@@ -1 +1 @@
-c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz
+1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/task.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- task.spec	20 Aug 2009 22:22:02 -0000	1.6
+++ task.spec	7 Sep 2009 10:34:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
+  Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1
   Intial RPM for task bugfix release 1.8.1
 * Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
@@ -60,12 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta1-1
   Intial RPM for task beta release 1.8.0.beta1
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-2
-- Fixed inclusion of manpages.
+  Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1
-- Initial RPM for bugfix release 1.7.1.
-- Updated references to new project homepage in spec file. 
+  Initial RPM for bugfix release 1.7.1.
+  Updated references to new project homepage in spec file. 
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-2
-- Changed license to GPLv2+ and removed Requires macro.
-- See https://bugzilla.redhat.com/show_bug.cgi?id=501498
+  Changed license to GPLv2+ and removed Requires macro.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=501498
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-1
-- Initial RPM.
+  Initial RPM.



From lkundrak at fedoraproject.org  Mon Sep  7 10:39:10 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 10:39:10 +0000 (UTC)
Subject: rpms/centerim/devel centerim.spec, 1.23,
	1.24 centerim-4.22.7-nss.patch, 1.1, NONE
Message-ID: <20090907103910.C3D8511C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377

Modified Files:
	centerim.spec 
Removed Files:
	centerim-4.22.7-nss.patch 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.8-1
- New upstream release
- Our NSS patch integrated



Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- centerim.spec	21 Aug 2009 12:42:39 -0000	1.23
+++ centerim.spec	7 Sep 2009 10:39:10 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           centerim
-Version:        4.22.7
-Release:        3%{?dist}
+Version:        4.22.8
+Release:        1%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,12 +8,11 @@ Summary:        Text mode menu- and wind
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.bz2
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
 Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
-Patch1:         centerim-4.22.7-nss.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +45,6 @@ Internal RSS reader and a client for Liv
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
-%patch1 -p1 -b .nss
 
 iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
 touch -r ChangeLog ChangeLog.utf8
@@ -100,8 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.22.7-3
-- rebuilt with new openssl
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.8-1
+- New upstream release
+- Our NSS patch integrated
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


--- centerim-4.22.7-nss.patch DELETED ---



From lkundrak at fedoraproject.org  Mon Sep  7 10:47:02 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 10:47:02 +0000 (UTC)
Subject: rpms/centerim/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20090907104702.D45C311C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19342

Modified Files:
	.cvsignore sources 
Log Message:
Update sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Apr 2009 17:29:05 -0000	1.12
+++ .cvsignore	7 Sep 2009 10:47:02 -0000	1.13
@@ -1 +1 @@
-centerim-4.22.7.tar.bz2
+centerim-4.22.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Apr 2009 17:29:05 -0000	1.12
+++ sources	7 Sep 2009 10:47:02 -0000	1.13
@@ -1 +1 @@
-2db303baa9b7680c2cccb3314bfa7ae2  centerim-4.22.7.tar.bz2
+24f3d0f7c064f429879bc1626273b59b  centerim-4.22.8.tar.gz



From perex at fedoraproject.org  Mon Sep  7 10:47:15 2009
From: perex at fedoraproject.org (perex)
Date: Mon,  7 Sep 2009 10:47:15 +0000 (UTC)
Subject: rpms/alsa-lib/F-11 alsa-lib-1.0.21-weight.patch, NONE,
	1.1 alsa-lib.spec, 1.84, 1.85
Message-ID: <20090907104715.D4C1311C00DB@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-serv19457

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.21-weight.patch 
Log Message:
alsa-lib: weight patch

alsa-lib-1.0.21-weight.patch:
 simple_none.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE alsa-lib-1.0.21-weight.patch ---
>From ac9de424bc0a896e8e30b5ec176daf924a2cefb2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Mon, 31 Aug 2009 16:41:12 +0200
Subject: [PATCH] mixer: Add Speaker and Beep names to the weight list

Added strings "Speaker" and "Beep" to the weight list so that the entries
appear in more appropriate positions.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 src/mixer/simple_none.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 4802200..9259a08 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -134,6 +134,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
 	static const char *const names[] = {
 		"Master",
 		"Headphone",
+		"Speaker",
 		"Tone",
 		"Bass",
 		"Treble",
@@ -158,6 +159,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
 		"I2S",
 		"IEC958",
 		"PC Speaker",
+		"Beep",
 		"Aux",
 		"Mono",
 		"Playback",
-- 
1.5.5.1



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- alsa-lib.spec	2 Sep 2009 08:14:23 -0000	1.84
+++ alsa-lib.spec	7 Sep 2009 10:47:15 -0000	1.85
@@ -1,3 +1,4 @@
+
 #define  prever         rc3
 #define  prever_dot     .rc3
 #define postver		a
@@ -5,7 +6,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -13,6 +14,7 @@ Source10: asound.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
+Patch5:  alsa-lib-1.0.21-weight.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -44,6 +46,7 @@ against the ALSA libraries and interface
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
+%patch5 -p1 -b .weight
 
 %build
 %configure --disable-aload
@@ -93,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Sep  7 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-2
+- Added mixer weight patch for Speaker and Beep controls
+
 * Wed Sep  2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
 - Updated to 1.0.21 final
 



From transif at fedoraproject.org  Mon Sep  7 10:55:10 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Sep 2009 10:55:10 +0000 (UTC)
Subject: comps/po sk.po,1.22,1.23
Message-ID: <20090907105510.0392F11C00DB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22194/po

Modified Files:
	sk.po 
Log Message:
Sending translation for Slovak


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.22 -r 1.23 sk.poIndex: sk.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sk.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sk.po	4 May 2009 12:44:52 -0000	1.22
+++ sk.po	7 Sep 2009 10:55:09 -0000	1.23
@@ -5,295 +5,315 @@
 # Marcel Telka <marcel at telka.sk>, 2003, 2004.
 # Pavol ?imo <palo.simo at gmail.com>, 2007.
 # Ondrej ?ulek <feonsu at gmail.com>, 2008, 2009.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: comp-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-04 08:09+0000\n"
-"PO-Revision-Date: 2009-05-04 11:24+0200\n"
+"POT-Creation-Date: 2009-09-07 08:17+0000\n"
+"PO-Revision-Date: 2009-09-07 11:48+0200\n"
 "Last-Translator: Ondrej ?ulek <feonsu at gmail.com>\n"
 "Language-Team: Slovak <fedora-trans-sk at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "Jednoduch? pracovn? prostredie, ktor? dobre pracuje na pomal??ch po??ta?och."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administr?torsk? n?stroje"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Juhoafrick? podpora"
 
-#: ../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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Alb?nska podpora"
 
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplik?cie"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplik?cie na vykon?vanie r?znych ?loh"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arabsk? podpora"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Arm?nska podpora"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Assamsk? podpora"
 
-#: ../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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "P?sanie a publikovanie"
 
-#: ../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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Z?klad"
 
-#: ../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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Z?klad syst?mu"
 
-#: ../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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Z?kladn? podpora pre programovac? jazyk 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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Baskick? podpora"
 
-#: ../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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Bielorusk? podpora"
 
-#: ../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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Beng?lska podpora"
 
-#: ../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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "But?nska podpora"
 
-#: ../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-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Bosnianska podpora"
 
-#: ../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-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Braz?lska podpora (portugal?ina)"
 
-#: ../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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Bret?nska podpora"
 
-#: ../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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Skupina zostavovania syst?mu"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Bulharsk? podpora"
 
-#: ../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-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Katal?nska podpora"
 
-#: ../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-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
[...1897 lines suppressed...]
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1412,7 +1520,8 @@ msgstr ""
 "Podpora pre kr??ov? kompil?ciu 32 bitov?ch Windows programov, ich testovanie "
 "a vytv?ranie in?tal?torov. A to v?etko pomocou Fedory."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1420,15 +1529,18 @@ msgstr ""
 "Podpora pre v?voj programov pou?it?m programovacieho jazyka a kni?n?c "
 "Objective CAML."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Swahilsk? podpora"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Tetum podpora"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1436,23 +1548,85 @@ msgstr ""
 "T?to skupina zah??a n?stroje pou??vane k n?vrhu, vytv?raniu a ?prave p?sem a "
 "bal??kov s p?smami."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Turkm?nska podpora"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Podpora hornolu?ickej srb?tiny"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+"S?bor bal??kov, ktor? poskytuj? funkcionalitu kritickej cesty pre prostredie "
+"GNOME"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"S?bor bal??kov, ktor? poskytuj? zdielan? platformu pre funkcionalitu "
+"kritickej cesty pre v?etky Fedora spin."
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Knihy a pr?ru?ky"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Knihy a pr?ru?ky pre u??vate?ov a v?voj?rov Fedory"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Kritick? cesta (z?klad)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Kritick? cesta (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Adres?rov? server"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE je jednoduch? pracovn? prostredie X11 navrhnut? pre slab?ie po??ta?e "
+"ako netbooky, mobiln? zariadenia a star?ie po??ta?e."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Servery na identifik?ciu po??ta?ov a u??vate?ov"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Pracovn? prostredie Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin je pracovn? prostredie pre NebBook/NetTop/MID zariadenia."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplik?cie pre r?zne ?lohy"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Podpora telefonick?ho pripojenia"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1460,7 +1634,7 @@ msgstr ""
 "GNOME je v?konn? grafick? pou??vate?sk? rozhranie, ktor? obsahuje panel, "
 "pracovn? plochu, syst?mov? ikony a grafick?ho spr?vcu s?borov."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1468,7 +1642,7 @@ msgstr ""
 "KDE je v?konn? grafick? pou??vate?sk? rozhranie, ktor? obsahuje panel, "
 "pracovn? plochu, syst?mov? ikony a grafick?ho spr?vcu s?borov."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1476,11 +1650,11 @@ msgstr ""
 "Tieto programy, niekedy naz?van? textov? editory, v?m umo?nia vytv?ra? a "
 "upravova? s?bory. Toto zah??a aj Emacs a Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "Textov? editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1488,30 +1662,36 @@ msgstr ""
 "Tieto n?stroje v?m umo?nia vytv?ra? dokument?ciu vo form?te DocBook a "
 "konvertova? ju do HTML, PDF, Postscriptu a textu."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "T?to skupina je kolekciou sie?ov?ch serverov pre ?pecifick? ?lohy."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr "T?to skupina je kolekciou n?strojov a zdrojov arabsk?ch prostred?."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr "T?to skupina je kolekciou n?strojov a zdrojov hebrejsk?ch prostred?."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr "T?to skupina je kolekciou n?strojov a zdrojov japonsk?ch prostred?."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 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 "Eclipse"
+#~ msgstr "Eclipse"
+
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "Integrovan? v?vojov? prostredie Eclipse"



From lkundrak at fedoraproject.org  Mon Sep  7 11:00:55 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 11:00:55 +0000 (UTC)
Subject: rpms/ovaldi/devel .cvsignore, 1.6, 1.7 ovaldi.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20090907110055.E565A11C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/ovaldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23939

Modified Files:
	.cvsignore ovaldi.spec sources 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-1
- New upstream relase



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Oct 2008 08:21:51 -0000	1.6
+++ .cvsignore	7 Sep 2009 11:00:55 -0000	1.7
@@ -1 +1 @@
-ovaldi-5.5.4-src.tar.bz2
+ovaldi-5.5.25-src.zip


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ovaldi.spec	25 Jul 2009 21:01:42 -0000	1.14
+++ ovaldi.spec	7 Sep 2009 11:00:55 -0000	1.15
@@ -1,12 +1,12 @@
 Name:           ovaldi
-Version:        5.5.4
-Release:        4%{?dist}
+Version:        5.5.25
+Release:        1%{?dist}
 Summary:        Reference implementation of the OVAL interpreter
 
 Group:          Applications/System
 License:        BSD
 URL:            http://oval.mitre.org/language/download/interpreter/index.html
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
 Patch0:         ovaldi-5.4.2-rpm46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-1
+- New upstream relase
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Oct 2008 08:21:51 -0000	1.6
+++ sources	7 Sep 2009 11:00:55 -0000	1.7
@@ -1 +1 @@
-033015941c873ad62a0bb4ade54b6c06  ovaldi-5.5.4-src.tar.bz2
+f450664a2f1ee06a86947606217022f9  ovaldi-5.5.25-src.zip



From pbrobinson at fedoraproject.org  Mon Sep  7 11:07:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Sep 2009 11:07:39 +0000 (UTC)
Subject: rpms/bisho/devel .cvsignore, 1.3, 1.4 bisho.spec, 1.6, 1.7 sources, 
	1.3, 1.4 bisho-fixgconfschemas.patch, 1.1, NONE
Message-ID: <20090907110739.6C6CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27511

Modified Files:
	.cvsignore bisho.spec sources 
Removed Files:
	bisho-fixgconfschemas.patch 
Log Message:
- New upstream 0.12 release, drop upstream patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Aug 2009 11:10:19 -0000	1.3
+++ .cvsignore	7 Sep 2009 11:07:38 -0000	1.4
@@ -1 +1 @@
-bisho-0.11.tar.bz2
+bisho-0.12.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bisho.spec	3 Sep 2009 13:12:17 -0000	1.6
+++ bisho.spec	7 Sep 2009 11:07:39 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           bisho
-Version:        0.11
-Release:        4%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:		bisho-fixgconfschemas.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
@@ -33,7 +32,6 @@ aggregation service.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixgconfschemas
 mv  $RPM_BUILD_DIR/%{name}-%{version}/data/callback.schemas.in $RPM_BUILD_DIR/%{name}-%{version}/data/bisho.schemas.in
 
 # Don't run configure from autogen.sh
@@ -94,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-1
+- New upstream 0.12 release, drop upstream patch
+
 * Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-4
 - Update gconf scriptlets for schema file name change
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Aug 2009 11:10:19 -0000	1.3
+++ sources	7 Sep 2009 11:07:39 -0000	1.4
@@ -1 +1 @@
-068810a307169019f48398046652aea0  bisho-0.11.tar.bz2
+664e71935a7ae720858212522f189ccd  bisho-0.12.tar.bz2


--- bisho-fixgconfschemas.patch DELETED ---



From cwickert at fedoraproject.org  Mon Sep  7 11:38:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  7 Sep 2009 11:38:49 +0000 (UTC)
Subject: rpms/lxde-icon-theme/F-10 lxde-icon-theme.spec,1.1,1.2
Message-ID: <20090907113849.2DAD411C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-icon-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4846/F-10

Modified Files:
	lxde-icon-theme.spec 
Log Message:
add disttag to avoid buildsys troubles


Index: lxde-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/F-10/lxde-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-icon-theme.spec	7 Sep 2009 09:53:01 -0000	1.1
+++ lxde-icon-theme.spec	7 Sep 2009 11:38:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lxde-icon-theme
 Version:        0.4.2
-Release:        2
+Release:        2%{?dist}
 Summary:        Default icon theme for LXDE
 
 Group:          User Interface/Desktops



From cwickert at fedoraproject.org  Mon Sep  7 11:38:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  7 Sep 2009 11:38:49 +0000 (UTC)
Subject: rpms/lxde-icon-theme/F-11 lxde-icon-theme.spec,1.1,1.2
Message-ID: <20090907113849.4AB8211C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4846/F-11

Modified Files:
	lxde-icon-theme.spec 
Log Message:
add disttag to avoid buildsys troubles


Index: lxde-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/F-11/lxde-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-icon-theme.spec	7 Sep 2009 09:53:01 -0000	1.1
+++ lxde-icon-theme.spec	7 Sep 2009 11:38:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lxde-icon-theme
 Version:        0.4.2
-Release:        2
+Release:        2%{?dist}
 Summary:        Default icon theme for LXDE
 
 Group:          User Interface/Desktops



From cwickert at fedoraproject.org  Mon Sep  7 11:38:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  7 Sep 2009 11:38:49 +0000 (UTC)
Subject: rpms/lxde-icon-theme/devel lxde-icon-theme.spec,1.1,1.2
Message-ID: <20090907113849.6A04F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4846/devel

Modified Files:
	lxde-icon-theme.spec 
Log Message:
add disttag to avoid buildsys troubles


Index: lxde-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-icon-theme/devel/lxde-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-icon-theme.spec	7 Sep 2009 09:49:18 -0000	1.1
+++ lxde-icon-theme.spec	7 Sep 2009 11:38:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lxde-icon-theme
 Version:        0.4.2
-Release:        2
+Release:        2%{?dist}
 Summary:        Default icon theme for LXDE
 
 Group:          User Interface/Desktops



From perex at fedoraproject.org  Mon Sep  7 11:50:10 2009
From: perex at fedoraproject.org (perex)
Date: Mon,  7 Sep 2009 11:50:10 +0000 (UTC)
Subject: rpms/alsa-utils/F-11 alsactl-init-add-speaker.patch, NONE,
	1.1 alsa-utils.spec, 1.86, 1.87
Message-ID: <20090907115010.AFB4D11C043A@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8959

Modified Files:
	alsa-utils.spec 
Added Files:
	alsactl-init-add-speaker.patch 
Log Message:
alsa-utils: add speaker initialization

alsactl-init-add-speaker.patch:
 default |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

--- NEW FILE alsactl-init-add-speaker.patch ---
>From e02f8e8aba21357eacce483bd46106624863c5a3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 12 Aug 2009 12:45:05 +0200
Subject: [PATCH] alsactl - Initialize Speaker volume to 0dB when Master is present

Initialize Speaker volume to 0dB as well as Headphone when Master
is present.  Also initialize Headphone,1 for machines with dual
headphones.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 alsactl/init/default |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/alsactl/init/default b/alsactl/init/default
index f2c0539..a2069e3 100644
--- a/alsactl/init/default
+++ b/alsactl/init/default
@@ -39,7 +39,7 @@ CTL{reset}="mixer"
 CTL{name}="Front Playback Volume",PROGRAM!="__ctl_search",GOTO="front0_end"
 # if master volume control is present, turn front volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="front0_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="front0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="front0_end"
 CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
 LABEL="front0_end"
 CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \
@@ -56,8 +56,23 @@ CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \
   CTL{values}="on"
 
 CTL{reset}="mixer"
-CTL{name}="Speaker Playback Volume",PROGRAM=="__ctl_search", \
-  CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
+CTL{name}="Headphone Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search",\
+  GOTO="headphone1_end"
+# if master volume control is present, turn headphone volume to max
+ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone1_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone1_end"
+CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
+LABEL="headphone1_end"
+CTL{name}="Headphone Playback Switch",CTL{index}="1",PROGRAM=="__ctl_search", \
+  CTL{values}="on"
+
+CTL{reset}="mixer"
+CTL{name}="Sepaker Playback Volume",PROGRAM!="__ctl_search",GOTO="speaker0_end"
+# if master volume control is present, turn speaker volume to max
+ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="speaker0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="speaker0_end"
+CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
+LABEL="speaker0_end"
 CTL{name}="Speaker Playback Switch",PROGRAM=="__ctl_search", \
   CTL{values}="on"
 
@@ -72,7 +87,7 @@ CTL{name}="PCM Playback Volume",PROGRAM!="__ctl_search", \
  CTL{name}="PCM Volume",PROGRAM!="__ctl_search", GOTO="pcm0_end"
 # if master volume control is present, turn PCM volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm0_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm0_end"
 # exception - some HDA codecs have shifted dB range
 CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm0_end"
 CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm0_end"
@@ -86,7 +101,7 @@ CTL{name}="PCM Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search", \
   CTL{name}="PCM Volume",PROGRAM!="__ctl_search",GOTO="pcm1_end"
 # if master volume control is present, turn PCM volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm1_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm1_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm1_end"
 # exception - some HDA codecs have shifted dB range
 CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm1_end"
 CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm1_end"
@@ -125,7 +140,7 @@ CTL{reset}="mixer"
 CTL{name}="CD Playback Volume",PROGRAM!="__ctl_search", GOTO="cd0_end"
 # if master volume control is present, turn CD volume to max
 ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="cd0_end"
-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="cd0_end"
+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="cd0_end"
 # exception - some HDA codecs have shifted dB range
 CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="cd0_end"
 CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="cd0_end"
-- 
1.5.5.1



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-11/alsa-utils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- alsa-utils.spec	3 Sep 2009 11:26:30 -0000	1.86
+++ alsa-utils.spec	7 Sep 2009 11:50:10 -0000	1.87
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -14,6 +14,7 @@ Source6: alsa-info.sh
 Source10: alsa.rules
 Source11: alsactl.conf
 Patch1:  alsactl-init-fix-headphone2.patch
+Patch2:  alsactl-init-add-speaker.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -28,6 +29,7 @@ Architecture (ALSA).
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 %patch1 -p1 -b .headphone
+%patch2 -p1 -b .speaker
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf



From mschwendt at fedoraproject.org  Mon Sep  7 11:56:50 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  7 Sep 2009 11:56:50 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.32,1.33
Message-ID: <20090907115650.7AB1311C00DB@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14743

Modified Files:
	rc-modified 
Log Message:
add conditional support for Yum 3.2.24 arch list changes


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rc-modified	7 Sep 2009 09:31:56 -0000	1.32
+++ rc-modified	7 Sep 2009 11:56:49 -0000	1.33
@@ -25,6 +25,7 @@
 import os
 import re
 import string
+import errno
 
 # For patched "yum" and "rpmUtils" (post 2.6.1 checkForObsolete support).
 # Comment this to use system yum.
@@ -47,8 +48,9 @@
     parser = OptionParser(usage=usage)
     parser.add_option("-c", "--config", default='/etc/yum.conf',
         help='config file to use (defaults to /etc/yum.conf)')
-    parser.add_option("-a", "--arch", default=None,
-        help='check as if running the specified arch (default: current arch)')
+    parser.add_option("-a", "--arch", default=[], action='append',
+        help='check packages of the given archs, can be specified multiple ' +
+             'times (default: current arch)')
     parser.add_option("-r", "--repoid", default=[], action='append',
         help="specify repo ids to query, can be specified multiple times (default is all enabled)")
     parser.add_option("-t", "--tempcache", default=False, action="store_true", 
@@ -67,10 +69,16 @@
     return (opts, args)
 
 class RepoClosure(yum.YumBase):
-    def __init__(self, arch = None, config = "/etc/yum.conf"):
+    def __init__(self, arch = [], config = "/etc/yum.conf"):
         yum.YumBase.__init__(self)
 
-        self.arch = arch
+        if yum.__version__ < '3.2.24':
+            if arch:
+                self.arch = arch[0]
+            else:
+                self.arch = None
+        else:
+            self._rc_arches = arch
         if yum.__version__ < '3.0':  # TODO: check
             self.doConfigSetup(fn = config)
         else:
@@ -103,7 +111,18 @@
     
     def readMetadata(self):
         self.doRepoSetup()
-        self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
+
+        if yum.__version__ < '3.2.24':
+            self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
+        else:
+            archs = []
+            if not self._rc_arches:
+                archs.extend(self.arch.archlist)
+            else:
+                for arch in self._rc_arches:
+                    archs.extend(self.arch.get_arch_list(arch))
+            self.doSackSetup(archs)
+
         for repo in self.repos.listEnabled():
             try:  # TODO: when exactly did this change from "with=" to "mdtype="?
                 self.repos.populateSack(which=[repo.id], mdtype='filelists')
@@ -317,6 +336,11 @@
 
 def main():
     (opts, cruft) = parseArgs()
+    if yum.__version__ < '3.2.24':
+        if len(opts.arch)>1:
+            print 'ERROR: can handle only a single arch with Yum < 3.2.24'
+            sys.exit(errno.EINVAL)
+
     my = RepoClosure(arch = opts.arch, config = opts.config)
     my.guessMultiLibProbs = not opts.nomultilibhack
     my.rawhidehack = opts.rawhidehack



From mlichvar at fedoraproject.org  Mon Sep  7 12:07:57 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon,  7 Sep 2009 12:07:57 +0000 (UTC)
Subject: rpms/slang/devel .cvsignore, 1.15, 1.16 slang.spec, 1.56,
	1.57 sources, 1.15, 1.16
Message-ID: <20090907120757.8AD8911C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21595

Modified Files:
	.cvsignore slang.spec sources 
Log Message:
- update to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	3 Aug 2009 16:15:14 -0000	1.15
+++ .cvsignore	7 Sep 2009 12:07:57 -0000	1.16
@@ -1 +1 @@
-slang-2.2.0.tar.bz2
+slang-2.2.1.tar.bz2


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- slang.spec	3 Aug 2009 16:15:14 -0000	1.56
+++ slang.spec	7 Sep 2009 12:07:57 -0000	1.57
@@ -1,6 +1,6 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.2.0
+Version: 2.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -38,6 +38,7 @@ the S-Lang distribution.
 Summary: Development files for the S-Lang extension language
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package contains files which you'll need if you want to
@@ -105,6 +106,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc doc/*/cslang*.txt doc/*/cref.txt
 %{_libdir}/libslang*.so
+%{_libdir}/pkgconfig/slang.pc
 %{_includedir}/slang
 
 %files static
@@ -112,6 +114,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Sep 07 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.1-1
+- update to 2.2.1
+
 * Mon Aug 03 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.0-1
 - update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	3 Aug 2009 16:15:14 -0000	1.15
+++ sources	7 Sep 2009 12:07:57 -0000	1.16
@@ -1 +1 @@
-2593b390c6db81b840f6b48b0e768fa0  slang-2.2.0.tar.bz2
+51b7e9c29c6812f304531713e2ebf969  slang-2.2.1.tar.bz2



From dtardon at fedoraproject.org  Mon Sep  7 12:08:29 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon,  7 Sep 2009 12:08:29 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1933,
	1.1934 workspace.unifypaper01.patch, 1.1, 1.2
Message-ID: <20090907120829.BB89311C00DB@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22149

Modified Files:
	openoffice.org.spec workspace.unifypaper01.patch 
Log Message:
Resolves: rhbz#521460 - wrong page size for A3/A5


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1933
retrieving revision 1.1934
diff -u -p -r1.1933 -r1.1934
--- openoffice.org.spec	2 Sep 2009 13:45:41 -0000	1.1933
+++ openoffice.org.spec	7 Sep 2009 12:08:28 -0000	1.1934
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4173,6 +4173,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3-UNBUILT
+- Resolves: rhbz#521460 - wrong page size for A3/A5
+
 * Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
 - Resolves: rhbz#520772 copy/paste cockup
 

workspace.unifypaper01.patch:
 i18npool/inc/i18npool/paper.hxx                    |  155 
 i18npool/prj/build.lst                             |    3 
 i18npool/prj/d.lst                                 |    6 
 i18npool/source/paper/makefile.mk                  |   75 
 i18npool/source/paper/paper.cxx                    |  473 +
 psprint/source/printer/printerinfomanager.cxx      |   75 
 psprint/util/makefile.mk                           |    1 
 reportdesign/source/core/api/ReportDefinition.cxx  |    2 
 reportdesign/source/ui/report/ReportController.cxx |    4 
 sc/source/core/data/stlsheet.cxx                   |    8 
 sc/source/filter/excel/biffdump.cxx                | 9864 +++++++++++++++++++++
 sc/source/filter/excel/xlpage.cxx                  |  206 
 sc/source/filter/html/htmlimp.cxx                  |    4 
 sc/source/ui/app/transobj.cxx                      |    2 
 sc/source/ui/inc/printfun.hxx                      |    2 
 sc/source/ui/view/printfun.cxx                     |    4 
 scp2/source/ooo/file_library_ooo.scp               |    2 
 scp2/source/ooo/module_hidden_ooo.scp              |    1 
 sd/source/core/drawdoc2.cxx                        |    5 
 sd/source/ui/app/sdmod1.cxx                        |    4 
 sd/source/ui/dlg/dlgpage.cxx                       |    4 
 sd/source/ui/view/PrintManager.cxx                 |    4 
 sfx2/source/doc/printhelper.cxx                    |   89 
 solenv/inc/libs.mk                                 |    2 
 starmath/source/unomodel.cxx                       |   28 
 svx/inc/svx/dialogs.hrc                            |   42 
 svx/inc/svx/paperinf.hxx                           |  116 
 svx/inc/svx/svxenum.hxx                            |   43 
 svx/source/dialog/page.cxx                         |   32 
 svx/source/dialog/page.h                           |   42 
 svx/source/dialog/page.hxx                         |    9 
 svx/source/dialog/page.src                         |  128 
 svx/source/items/paperinf.cxx                      |  298 
 svx/source/items/paraitem.cxx                      |    1 
 svx/util/makefile.mk                               |    1 
 sw/inc/bookmrk.hxx                                 |  218 
 sw/source/core/doc/docdesc.cxx                     |    6 
 sw/source/core/doc/poolfmt.cxx                     |    2 
 sw/source/core/unocore/unostyle.cxx                |    5 
 sw/source/core/view/vprint.cxx                     |    2 
 sw/source/filter/basflt/shellio.cxx                |    7 
 sw/source/filter/rtf/swparrtf.cxx                  |   10 
 sw/source/filter/rtf/wrtrtf.cxx                    |    5 
 sw/source/filter/ww8/dump/ww8scan.cxx              |    2 
 sw/source/filter/ww8/writerwordglue.cxx            |   49 
 sw/source/filter/ww8/writerwordglue.hxx            |   19 
 sw/source/filter/ww8/ww8atr.cxx                    |    9 
 sw/source/filter/ww8/ww8par6.cxx                   |   13 
 sw/source/filter/ww8/ww8scan.cxx                   |    2 
 sw/source/filter/ww8/ww8scan.hxx                   |    5 
 sw/source/ui/app/appenv.cxx                        |    5 
 sw/source/ui/dochdl/swdtflvr.cxx                   |    2 
 sw/source/ui/envelp/envfmt.cxx                     |   26 
 sw/source/ui/envelp/envimg.cxx                     |    5 
 sw/source/ui/frmdlg/colex.cxx                      |    2 
 sw/source/ui/inc/colex.hxx                         |    3 
 sw/source/ui/uiview/pview.cxx                      |    6 
 sw/source/ui/uiview/viewport.cxx                   |    5 
 swext/mediawiki/build.xml                          |    6 
 vcl/aqua/source/gdi/salprn.cxx                     |    8 
 vcl/inc/vcl/jobset.h                               |    2 
 vcl/inc/vcl/print.hxx                              |    9 
 vcl/inc/vcl/prntypes.hxx                           |   28 
 vcl/inc/vcl/salprn.hxx                             |    2 
 vcl/source/gdi/print.cxx                           |  154 
 vcl/unx/headless/svpprn.cxx                        |   42 
 vcl/unx/source/gdi/salprnpsp.cxx                   |   44 
 vcl/util/linksvp/makefile.mk                       |    1 
 vcl/util/makefile.mk                               |    4 
 vcl/win/source/gdi/salprn.cxx                      |  325 
 writerfilter/source/dmapper/ConversionHelper.cxx   |   51 
 writerfilter/source/dmapper/ConversionHelper.hxx   |    1 
 writerfilter/source/dmapper/DomainMapper.cxx       |   24 
 writerfilter/source/dmapper/PropertyMap.cxx        |   10 
 writerfilter/util/makefile.mk                      |    1 
 75 files changed, 11637 insertions(+), 1218 deletions(-)

Index: workspace.unifypaper01.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/workspace.unifypaper01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.unifypaper01.patch	28 Aug 2009 09:43:31 -0000	1.1
+++ workspace.unifypaper01.patch	7 Sep 2009 12:08:29 -0000	1.2
@@ -11240,7 +11240,8 @@ diff -ru --exclude='unxlng*.pro' --exclu
  	ItemList [ en-US ] =
  	{
 -			 < "A3" ; PAPERSIZE_A3 ; > ;
--		< "A4" ; PAPERSIZE_A4 ; > ;
++		< "A3" ; PAPERSIZE_A3 ; > ;
+ 		< "A4" ; PAPERSIZE_A4 ; > ;
  		< "A5" ; PAPERSIZE_A5 ; > ;
 -		< "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
 -		< "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
@@ -11248,21 +11249,15 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
 -        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
 -        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "A4" ; PAPERSIZE_A4 ; > ;
-+		< "A3" ; PAPERSIZE_A3 ; > ;
-+		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-+		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
 +		< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
++		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
++		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
++		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
++		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
++		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
  		< "Letter" ; PAPERSIZE_LETTER ; > ;
  		< "Legal" ; PAPERSIZE_LEGAL ; > ;
-+		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  		< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-+		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-+		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-+		< "16 Kai" ; PAPERSIZE_KAI16; > ;
-+		< "32 Kai" ; PAPERSIZE_KAI32; > ;
-+		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
  		< "User" ; PAPERSIZE_USER ; > ;
 -		< "C4" ; PAPERSIZE_C4 ; > ;
 -		< "C5" ; PAPERSIZE_C5 ; > ;
@@ -11279,17 +11274,21 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -		< "32 kai" ; PAPERSIZE_KAI32; > ;
 -		< "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
 -	};
-+		< "DL Envelope" ; PAPERSIZE_DL ; > ;
++		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
 +		< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
 +		< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-+		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-+		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "DL Envelope" ; PAPERSIZE_DL ; > ;
 +		< "#6 3/4 (Personal) Envelope" ; PAPERSIZE_COM675; > ;
 +		< "#8 (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
 +		< "#9 Envelope" ; PAPERSIZE_COM9; > ;
 +		< "#10 Envelope" ; PAPERSIZE_COM10; > ;
 +		< "#11 Envelope" ; PAPERSIZE_COM11; > ;
 +		< "#12 Envelope" ; PAPERSIZE_COM12; > ;
++		< "16 Kai" ; PAPERSIZE_KAI16; > ;
++		< "32 Kai" ; PAPERSIZE_KAI32; > ;
++		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
++		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  	};
 +};
  StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
@@ -11297,10 +11296,11 @@ diff -ru --exclude='unxlng*.pro' --exclu
  	ItemList [ en-US ] =
  	{
 -			 < "A0" ; PAPERSIZE_A0 ; > ;
--		< "A1" ; PAPERSIZE_A1 ; > ;
--		< "A2" ; PAPERSIZE_A2 ; > ;
--		< "A3" ; PAPERSIZE_A3 ; > ;
--		< "A4" ; PAPERSIZE_A4 ; > ;
++		< "A0" ; PAPERSIZE_A0 ; > ;
+ 		< "A1" ; PAPERSIZE_A1 ; > ;
+ 		< "A2" ; PAPERSIZE_A2 ; > ;
+ 		< "A3" ; PAPERSIZE_A3 ; > ;
+ 		< "A4" ; PAPERSIZE_A4 ; > ;
  		< "A5" ; PAPERSIZE_A5 ; > ;
 -		< "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
 -		< "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
@@ -11308,24 +11308,15 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
 -        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
 -        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "A4" ; PAPERSIZE_A4 ; > ;
-+		< "A3" ; PAPERSIZE_A3 ; > ;
-+		< "A2" ; PAPERSIZE_A2 ; > ;
-+		< "A1" ; PAPERSIZE_A1 ; > ;
-+		< "A0" ; PAPERSIZE_A0 ; > ;
-+		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-+		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
 +		< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
++		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
++		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
++		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
++		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
++		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
  		< "Letter" ; PAPERSIZE_LETTER ; > ;
  		< "Legal" ; PAPERSIZE_LEGAL ; > ;
-+		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  		< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-+		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-+		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-+		< "16 Kai" ; PAPERSIZE_KAI16; > ;
-+		< "32 Kai" ; PAPERSIZE_KAI32; > ;
-+		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
  		< "User" ; PAPERSIZE_USER ; > ;
 -		< "C4" ; PAPERSIZE_C4 ; > ;
 -		< "C5" ; PAPERSIZE_C5 ; > ;
@@ -11333,17 +11324,21 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -		< "C6/5" ; PAPERSIZE_C65 ; > ;
 -		< "DL" ; PAPERSIZE_DL ; > ;
 -		< "Slide" ; PAPERSIZE_DIA ; > ;
-+		< "DL Envelope" ; PAPERSIZE_DL ; > ;
++		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
 +		< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
 +		< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-+		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-+		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "DL Envelope" ; PAPERSIZE_DL ; > ;
 +		< "Dia Slide" ; PAPERSIZE_DIA ; > ;
  		< "Screen" ; PAPERSIZE_SCREEN ; > ;
 -		< "16 kai" ; PAPERSIZE_KAI16; > ;
 -		< "32 kai" ; PAPERSIZE_KAI32; > ;
 -		< "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
 -	};
++		< "16 Kai" ; PAPERSIZE_KAI16; > ;
++		< "32 Kai" ; PAPERSIZE_KAI32; > ;
++		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
++		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  	};
 +};
  String RID_SVXSTR_PAPERBIN



From dtardon at fedoraproject.org  Mon Sep  7 12:09:32 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon,  7 Sep 2009 12:09:32 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1999,
	1.2000 workspace.unifypaper01.patch, 1.3, 1.4
Message-ID: <20090907120932.AF5CB11C00DB@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23120

Modified Files:
	openoffice.org.spec workspace.unifypaper01.patch 
Log Message:
Resolves: rhbz#521460 - wrong page size for A3/A5


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1999
retrieving revision 1.2000
diff -u -p -r1.1999 -r1.2000
--- openoffice.org.spec	3 Sep 2009 13:04:03 -0000	1.1999
+++ openoffice.org.spec	7 Sep 2009 12:09:32 -0000	1.2000
@@ -4212,8 +4212,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Sep 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
+* Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6-UNBUILT
 - Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
+- Resolves: rhbz#521460 - wrong page size for A3/A5
 
 * Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
 - Resolves: rhbz#520772 copy/paste cockup

workspace.unifypaper01.patch:
 i18npool/inc/i18npool/paper.hxx                    |  155 
 i18npool/prj/build.lst                             |    3 
 i18npool/prj/d.lst                                 |    6 
 i18npool/source/paper/makefile.mk                  |   75 
 i18npool/source/paper/paper.cxx                    |  473 +
 psprint/source/printer/printerinfomanager.cxx      |   75 
 psprint/util/makefile.mk                           |    1 
 reportdesign/source/core/api/ReportDefinition.cxx  |    2 
 reportdesign/source/ui/report/ReportController.cxx |    4 
 sc/source/core/data/stlsheet.cxx                   |    8 
 sc/source/filter/excel/biffdump.cxx                | 9864 +++++++++++++++++++++
 sc/source/filter/excel/xlpage.cxx                  |  206 
 sc/source/filter/html/htmlimp.cxx                  |    4 
 sc/source/ui/app/transobj.cxx                      |    2 
 sc/source/ui/inc/printfun.hxx                      |    2 
 sc/source/ui/view/printfun.cxx                     |    4 
 scp2/source/ooo/file_library_ooo.scp               |    2 
 scp2/source/ooo/module_hidden_ooo.scp              |    1 
 sd/source/core/drawdoc2.cxx                        |    5 
 sd/source/ui/app/sdmod1.cxx                        |    4 
 sd/source/ui/dlg/dlgpage.cxx                       |    4 
 sd/source/ui/view/PrintManager.cxx                 |    4 
 sfx2/source/doc/printhelper.cxx                    |   89 
 solenv/inc/libs.mk                                 |    2 
 starmath/source/unomodel.cxx                       |   28 
 svx/inc/svx/dialogs.hrc                            |   42 
 svx/inc/svx/paperinf.hxx                           |  116 
 svx/inc/svx/svxenum.hxx                            |   43 
 svx/source/dialog/page.cxx                         |   32 
 svx/source/dialog/page.h                           |   42 
 svx/source/dialog/page.hxx                         |    9 
 svx/source/dialog/page.src                         |  128 
 svx/source/items/paperinf.cxx                      |  298 
 svx/source/items/paraitem.cxx                      |    1 
 svx/util/makefile.mk                               |    1 
 sw/inc/bookmrk.hxx                                 |  218 
 sw/source/core/doc/docdesc.cxx                     |    6 
 sw/source/core/doc/poolfmt.cxx                     |    2 
 sw/source/core/unocore/unostyle.cxx                |    5 
 sw/source/core/view/vprint.cxx                     |    2 
 sw/source/filter/basflt/shellio.cxx                |    7 
 sw/source/filter/rtf/swparrtf.cxx                  |   10 
 sw/source/filter/rtf/wrtrtf.cxx                    |    5 
 sw/source/filter/ww8/dump/ww8scan.cxx              |    2 
 sw/source/filter/ww8/writerwordglue.cxx            |   49 
 sw/source/filter/ww8/writerwordglue.hxx            |   19 
 sw/source/filter/ww8/ww8atr.cxx                    |    9 
 sw/source/filter/ww8/ww8par6.cxx                   |   13 
 sw/source/filter/ww8/ww8scan.cxx                   |    2 
 sw/source/filter/ww8/ww8scan.hxx                   |    5 
 sw/source/ui/app/appenv.cxx                        |    5 
 sw/source/ui/dochdl/swdtflvr.cxx                   |    2 
 sw/source/ui/envelp/envfmt.cxx                     |   26 
 sw/source/ui/envelp/envimg.cxx                     |    5 
 sw/source/ui/frmdlg/colex.cxx                      |    2 
 sw/source/ui/inc/colex.hxx                         |    3 
 sw/source/ui/uiview/pview.cxx                      |    6 
 sw/source/ui/uiview/viewport.cxx                   |    5 
 swext/mediawiki/build.xml                          |    6 
 vcl/aqua/source/gdi/salprn.cxx                     |    8 
 vcl/inc/vcl/jobset.h                               |    2 
 vcl/inc/vcl/print.hxx                              |    9 
 vcl/inc/vcl/prntypes.hxx                           |   28 
 vcl/inc/vcl/salprn.hxx                             |    2 
 vcl/source/gdi/print.cxx                           |  154 
 vcl/unx/headless/svpprn.cxx                        |   42 
 vcl/unx/source/gdi/salprnpsp.cxx                   |   44 
 vcl/util/linksvp/makefile.mk                       |    1 
 vcl/util/makefile.mk                               |    4 
 vcl/win/source/gdi/salprn.cxx                      |  325 
 writerfilter/source/dmapper/ConversionHelper.cxx   |   51 
 writerfilter/source/dmapper/ConversionHelper.hxx   |    1 
 writerfilter/source/dmapper/DomainMapper.cxx       |   24 
 writerfilter/source/dmapper/PropertyMap.cxx        |   10 
 writerfilter/util/makefile.mk                      |    1 
 75 files changed, 11637 insertions(+), 1218 deletions(-)

Index: workspace.unifypaper01.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/workspace.unifypaper01.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.unifypaper01.patch	11 Jun 2009 14:26:50 -0000	1.3
+++ workspace.unifypaper01.patch	7 Sep 2009 12:09:32 -0000	1.4
@@ -11240,7 +11240,8 @@ diff -ru --exclude='unxlng*.pro' --exclu
  	ItemList [ en-US ] =
  	{
 -			 < "A3" ; PAPERSIZE_A3 ; > ;
--		< "A4" ; PAPERSIZE_A4 ; > ;
++		< "A3" ; PAPERSIZE_A3 ; > ;
+ 		< "A4" ; PAPERSIZE_A4 ; > ;
  		< "A5" ; PAPERSIZE_A5 ; > ;
 -		< "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
 -		< "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
@@ -11248,21 +11249,15 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
 -        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
 -        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "A4" ; PAPERSIZE_A4 ; > ;
-+		< "A3" ; PAPERSIZE_A3 ; > ;
-+		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-+		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
 +		< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
++		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
++		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
++		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
++		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
++		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
  		< "Letter" ; PAPERSIZE_LETTER ; > ;
  		< "Legal" ; PAPERSIZE_LEGAL ; > ;
-+		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  		< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-+		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-+		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-+		< "16 Kai" ; PAPERSIZE_KAI16; > ;
-+		< "32 Kai" ; PAPERSIZE_KAI32; > ;
-+		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
  		< "User" ; PAPERSIZE_USER ; > ;
 -		< "C4" ; PAPERSIZE_C4 ; > ;
 -		< "C5" ; PAPERSIZE_C5 ; > ;
@@ -11279,17 +11274,21 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -		< "32 kai" ; PAPERSIZE_KAI32; > ;
 -		< "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
 -	};
-+		< "DL Envelope" ; PAPERSIZE_DL ; > ;
++		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
 +		< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
 +		< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-+		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-+		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "DL Envelope" ; PAPERSIZE_DL ; > ;
 +		< "#6 3/4 (Personal) Envelope" ; PAPERSIZE_COM675; > ;
 +		< "#8 (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
 +		< "#9 Envelope" ; PAPERSIZE_COM9; > ;
 +		< "#10 Envelope" ; PAPERSIZE_COM10; > ;
 +		< "#11 Envelope" ; PAPERSIZE_COM11; > ;
 +		< "#12 Envelope" ; PAPERSIZE_COM12; > ;
++		< "16 Kai" ; PAPERSIZE_KAI16; > ;
++		< "32 Kai" ; PAPERSIZE_KAI32; > ;
++		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
++		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  	};
 +};
  StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
@@ -11297,10 +11296,11 @@ diff -ru --exclude='unxlng*.pro' --exclu
  	ItemList [ en-US ] =
  	{
 -			 < "A0" ; PAPERSIZE_A0 ; > ;
--		< "A1" ; PAPERSIZE_A1 ; > ;
--		< "A2" ; PAPERSIZE_A2 ; > ;
--		< "A3" ; PAPERSIZE_A3 ; > ;
--		< "A4" ; PAPERSIZE_A4 ; > ;
++		< "A0" ; PAPERSIZE_A0 ; > ;
+ 		< "A1" ; PAPERSIZE_A1 ; > ;
+ 		< "A2" ; PAPERSIZE_A2 ; > ;
+ 		< "A3" ; PAPERSIZE_A3 ; > ;
+ 		< "A4" ; PAPERSIZE_A4 ; > ;
  		< "A5" ; PAPERSIZE_A5 ; > ;
 -		< "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
 -		< "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
@@ -11308,24 +11308,15 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
 -        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
 -        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "A4" ; PAPERSIZE_A4 ; > ;
-+		< "A3" ; PAPERSIZE_A3 ; > ;
-+		< "A2" ; PAPERSIZE_A2 ; > ;
-+		< "A1" ; PAPERSIZE_A1 ; > ;
-+		< "A0" ; PAPERSIZE_A0 ; > ;
-+		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-+		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
 +		< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
++		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
++		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
++		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
++		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
++		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
  		< "Letter" ; PAPERSIZE_LETTER ; > ;
  		< "Legal" ; PAPERSIZE_LEGAL ; > ;
-+		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  		< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-+		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-+		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-+		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-+		< "16 Kai" ; PAPERSIZE_KAI16; > ;
-+		< "32 Kai" ; PAPERSIZE_KAI32; > ;
-+		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
  		< "User" ; PAPERSIZE_USER ; > ;
 -		< "C4" ; PAPERSIZE_C4 ; > ;
 -		< "C5" ; PAPERSIZE_C5 ; > ;
@@ -11333,17 +11324,21 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -		< "C6/5" ; PAPERSIZE_C65 ; > ;
 -		< "DL" ; PAPERSIZE_DL ; > ;
 -		< "Slide" ; PAPERSIZE_DIA ; > ;
-+		< "DL Envelope" ; PAPERSIZE_DL ; > ;
++		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
 +		< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
 +		< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-+		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-+		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
++		< "DL Envelope" ; PAPERSIZE_DL ; > ;
 +		< "Dia Slide" ; PAPERSIZE_DIA ; > ;
  		< "Screen" ; PAPERSIZE_SCREEN ; > ;
 -		< "16 kai" ; PAPERSIZE_KAI16; > ;
 -		< "32 kai" ; PAPERSIZE_KAI32; > ;
 -		< "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
 -	};
++		< "16 Kai" ; PAPERSIZE_KAI16; > ;
++		< "32 Kai" ; PAPERSIZE_KAI32; > ;
++		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
++		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
  	};
 +};
  String RID_SVXSTR_PAPERBIN



From jcollie at fedoraproject.org  Mon Sep  7 12:12:57 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  7 Sep 2009 12:12:57 +0000 (UTC)
Subject: rpms/gnonlin/devel gnonlin.spec,1.31,1.32
Message-ID: <20090907121257.6777211C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25754

Modified Files:
	gnonlin.spec 
Log Message:
* Mon Sep  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13-1
- Update to 0.10.13 "Service of Quality"
-
- Features of this release
-     
-       * Fix QoS event handling
-       * Fix racyness in source pad handlings
-       * GnlOperation: Add signal to know input stream priorities
- 
- Bugs fixed in this release
-      
-       * 583145 : Seeking on pending pipelines should return True.



Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gnonlin.spec	2 Sep 2009 18:21:43 -0000	1.31
+++ gnonlin.spec	7 Sep 2009 12:12:57 -0000	1.32
@@ -2,14 +2,14 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.12.3
-Release:        0.2%{?dist}
+Version:        0.10.13
+Release:        1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gnonlin.sourceforge.net/
-Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= %{gst_req}
@@ -45,6 +45,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Mon Sep  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13-1
+- Update to 0.10.13 "Service of Quality"
+-
+- Features of this release
+-     
+-       * Fix QoS event handling
+-       * Fix racyness in source pad handlings
+-       * GnlOperation: Add signal to know input stream priorities
+- 
+- Bugs fixed in this release
+-      
+-       * 583145 : Seeking on pending pipelines should return True.
+
 * Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.2
 - Doh!
 



From rhughes at fedoraproject.org  Mon Sep  7 12:13:03 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Sep 2009 12:13:03 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.55, 1.56 PackageKit.spec, 1.116,
	1.117 sources, 1.56, 1.57
Message-ID: <20090907121303.8559311C00DB@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25797

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-1
- Update to 0.5.2.
- Many new and updated translations.
- Many small bugfixes and speedups.
- Added the PostscriptDriver rpm provides functionality.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	3 Sep 2009 17:41:16 -0000	1.55
+++ .cvsignore	7 Sep 2009 12:13:03 -0000	1.56
@@ -1 +1 @@
-PackageKit-0.5.2-20090903.tar.gz
+PackageKit-0.5.2.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- PackageKit.spec	3 Sep 2009 17:41:16 -0000	1.116
+++ PackageKit.spec	7 Sep 2009 12:13:03 -0000	1.117
@@ -10,13 +10,13 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.2
-Release:   0.2.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+#Release:   0.2.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-#Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
+#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fedora-specific: set Vendor.conf up for Fedora.
@@ -238,8 +238,8 @@ after firmware has been installed by Pac
 user to restart the computer or remove and re-insert the device.
 
 %prep
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 
@@ -439,6 +439,12 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-1
+- Update to 0.5.2.
+- Many new and updated translations.
+- Many small bugfixes and speedups.
+- Added the PostscriptDriver rpm provides functionality.
+
 * Thu Sep 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090903git
 - Update to a newer git snapshot from the 0.5.x series.
 - Fixes NetworkManager build time configure check.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	3 Sep 2009 17:41:16 -0000	1.56
+++ sources	7 Sep 2009 12:13:03 -0000	1.57
@@ -1 +1 @@
-1971b0360127c0d1ed32af3fc197ac82  PackageKit-0.5.2-20090903.tar.gz
+e406ad5e776e31c99e70c7cf6e7bcdc4  PackageKit-0.5.2.tar.gz



From jcollie at fedoraproject.org  Mon Sep  7 12:13:47 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  7 Sep 2009 12:13:47 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <20090907121347.683C411C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26112

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13-1
- Update to 0.10.13 "Service of Quality"
-
- Features of this release
-     
-       * Fix QoS event handling
-       * Fix racyness in source pad handlings
-       * GnlOperation: Add signal to know input stream priorities
- 
- Bugs fixed in this release
-      
-       * 583145 : Seeking on pending pipelines should return True.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	2 Sep 2009 18:21:43 -0000	1.19
+++ .cvsignore	7 Sep 2009 12:13:47 -0000	1.20
@@ -1 +1 @@
-gnonlin-0.10.12.3.tar.bz2
+gnonlin-0.10.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	2 Sep 2009 18:21:43 -0000	1.19
+++ sources	7 Sep 2009 12:13:47 -0000	1.20
@@ -1 +1 @@
-16bc0ef8f1e497c3cbd4d0ea6a11cbef  gnonlin-0.10.12.3.tar.bz2
+424647c776e641b318f5d4ec67dc37a4  gnonlin-0.10.13.tar.bz2



From jcollie at fedoraproject.org  Mon Sep  7 12:20:55 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  7 Sep 2009 12:20:55 +0000 (UTC)
Subject: rpms/gnonlin/F-11 .cvsignore, 1.16, 1.17 gnonlin.spec, 1.27,
	1.28 sources, 1.16, 1.17
Message-ID: <20090907122055.C410B11C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30944

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Mon Sep  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13-1
- Update to 0.10.13 "Service of Quality"
-
- Features of this release
-     
-       * Fix QoS event handling
-       * Fix racyness in source pad handlings
-       * GnlOperation: Add signal to know input stream priorities
- 
- Bugs fixed in this release
-      
-       * 583145 : Seeking on pending pipelines should return True.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	29 Aug 2009 21:29:29 -0000	1.16
+++ .cvsignore	7 Sep 2009 12:20:55 -0000	1.17
@@ -1 +1 @@
-gnonlin-0.10.12.2.tar.bz2
+gnonlin-0.10.13.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/gnonlin.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gnonlin.spec	29 Aug 2009 21:29:29 -0000	1.27
+++ gnonlin.spec	7 Sep 2009 12:20:55 -0000	1.28
@@ -2,14 +2,14 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.12.2
-Release:        0.1%{?dist}
+Version:        0.10.13
+Release:        1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gnonlin.sourceforge.net/
-Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= %{gst_req}
@@ -45,6 +45,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Mon Sep  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13-1
+- Update to 0.10.13 "Service of Quality"
+-
+- Features of this release
+-     
+-       * Fix QoS event handling
+-       * Fix racyness in source pad handlings
+-       * GnlOperation: Add signal to know input stream priorities
+- 
+- Bugs fixed in this release
+-      
+-       * 583145 : Seeking on pending pipelines should return True.
+
+* Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.2
+- Doh!
+
+* Wed Sep  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.3-0.1
+- Update to latest prelrelease
+
 * Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.2-0.1
 - Update to prerelease for 0.10.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Aug 2009 21:29:29 -0000	1.16
+++ sources	7 Sep 2009 12:20:55 -0000	1.17
@@ -1 +1 @@
-ac2fc4be5cc1bfdd303ea1400301df86  gnonlin-0.10.12.2.tar.bz2
+424647c776e641b318f5d4ec67dc37a4  gnonlin-0.10.13.tar.bz2



From hadess at fedoraproject.org  Mon Sep  7 12:22:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 12:22:57 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.482,
	1.483 gnome-control-center-2.25.2-gecos.patch, 1.4, 1.5
Message-ID: <20090907122257.E845911C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32717

Modified Files:
	control-center.spec gnome-control-center-2.25.2-gecos.patch 
Log Message:
* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-5
- Update "gecos" about-me patch to apply



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -p -r1.482 -r1.483
--- control-center.spec	29 Aug 2009 04:39:01 -0000	1.482
+++ control-center.spec	7 Sep 2009 12:22:56 -0000	1.483
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -195,7 +195,7 @@ for the GNOME desktop.
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
-#%patch96 -p1 -b .gecos
+%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 
 %patch7 -p1 -b .make-default
@@ -383,6 +383,9 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-5
+- Update "gecos" about-me patch to apply
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-4
 - Move related files to -extra, too
 

gnome-control-center-2.25.2-gecos.patch:
 capplets/about-me/Makefile.am              |   12 
 capplets/about-me/eel-accessibility.c      |  413 ++
 capplets/about-me/eel-accessibility.h      |  152 
 capplets/about-me/eel-editable-label.c     | 4410 +++++++++++++++++++++++++++++
 capplets/about-me/eel-editable-label.h     |  142 
 capplets/about-me/eel-marshal.c            |  556 +++
 capplets/about-me/eel-marshal.h            |  116 
 capplets/about-me/gnome-about-me-dialog.ui |   21 
 capplets/about-me/gnome-about-me.c         |  210 +
 configure.in                               |    3 
 10 files changed, 6026 insertions(+), 9 deletions(-)

Index: gnome-control-center-2.25.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-control-center-2.25.2-gecos.patch	11 Mar 2009 17:32:50 -0000	1.4
+++ gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 12:22:57 -0000	1.5
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.c
---- /dev/null	2008-12-16 15:36:17.645108819 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.c	2008-12-16 21:16:16.000000000 -0500
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/eel-accessibility.c gnome-control-center-2.27.91/capplets/about-me/eel-accessibility.c
+--- gnome-control-center-2.27.91.old/capplets/about-me/eel-accessibility.c	1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/eel-accessibility.c	2009-09-07 13:04:39.000000000 +0100
 @@ -0,0 +1,413 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/* eel-accessibility.h - Utility functions for accessibility
@@ -415,9 +415,9 @@ diff -up /dev/null gnome-control-center-
 +		atk_object_set_description (atk_object, description);
 +	}
 +}
-diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.h
---- /dev/null	2008-12-16 15:36:17.645108819 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/eel-accessibility.h	2008-12-16 21:16:16.000000000 -0500
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/eel-accessibility.h gnome-control-center-2.27.91/capplets/about-me/eel-accessibility.h
+--- gnome-control-center-2.27.91.old/capplets/about-me/eel-accessibility.h	1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/eel-accessibility.h	2009-09-07 13:04:39.000000000 +0100
 @@ -0,0 +1,152 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/* eel-accessibility.h - Utility functions for accessibility
@@ -571,9 +571,9 @@ diff -up /dev/null gnome-control-center-
 +
 +
 +#endif /* EEL_ACCESSIBILITY_H */
-diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.c
---- /dev/null	2008-12-16 15:36:17.645108819 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.c	2008-12-16 21:17:57.000000000 -0500
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/eel-editable-label.c gnome-control-center-2.27.91/capplets/about-me/eel-editable-label.c
+--- gnome-control-center-2.27.91.old/capplets/about-me/eel-editable-label.c	1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/eel-editable-label.c	2009-09-07 13:04:39.000000000 +0100
 @@ -0,0 +1,4410 @@
 +/* GTK - The GIMP Toolkit
 + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
@@ -4985,9 +4985,9 @@ diff -up /dev/null gnome-control-center-
 +  return eel_accessibility_set_atk_object_return (widget, accessible);
 +}
 +
-diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.h
---- /dev/null	2008-12-16 15:36:17.645108819 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/eel-editable-label.h	2008-12-16 21:16:16.000000000 -0500
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/eel-editable-label.h gnome-control-center-2.27.91/capplets/about-me/eel-editable-label.h
+--- gnome-control-center-2.27.91.old/capplets/about-me/eel-editable-label.h	1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/eel-editable-label.h	2009-09-07 13:04:39.000000000 +0100
 @@ -0,0 +1,142 @@
 +/* GTK - The GIMP Toolkit
 + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
@@ -5131,9 +5131,9 @@ diff -up /dev/null gnome-control-center-
 +
 +
 +#endif /* __EEL_EDITABLE_LABEL_H__ */
-diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-marshal.c
---- /dev/null	2008-12-16 15:36:17.645108819 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/eel-marshal.c	2008-12-16 21:16:16.000000000 -0500
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/eel-marshal.c gnome-control-center-2.27.91/capplets/about-me/eel-marshal.c
+--- gnome-control-center-2.27.91.old/capplets/about-me/eel-marshal.c	1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/eel-marshal.c	2009-09-07 13:04:39.000000000 +0100
 @@ -0,0 +1,556 @@
 +
 +#include	<glib-object.h>
@@ -5691,9 +5691,9 @@ diff -up /dev/null gnome-control-center-
 +            data2);
 +}
 +
-diff -up /dev/null gnome-control-center-2.25.2/capplets/about-me/eel-marshal.h
---- /dev/null	2008-12-16 15:36:17.645108819 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/eel-marshal.h	2008-12-16 21:16:16.000000000 -0500
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/eel-marshal.h gnome-control-center-2.27.91/capplets/about-me/eel-marshal.h
+--- gnome-control-center-2.27.91.old/capplets/about-me/eel-marshal.h	1970-01-01 01:00:00.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/eel-marshal.h	2009-09-07 13:04:39.000000000 +0100
 @@ -0,0 +1,116 @@
 +
 +#ifndef __eel_marshal_MARSHAL_H__
@@ -5811,11 +5811,11 @@ diff -up /dev/null gnome-control-center-
 +
 +#endif /* __eel_marshal_MARSHAL_H__ */
 +
-diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.gecos	2008-12-16 21:16:16.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c	2008-12-16 21:16:16.000000000 -0500
-@@ -39,6 +39,8 @@
- #endif
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/gnome-about-me.c gnome-control-center-2.27.91/capplets/about-me/gnome-about-me.c
+--- gnome-control-center-2.27.91.old/capplets/about-me/gnome-about-me.c	2009-09-07 13:02:57.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/gnome-about-me.c	2009-09-07 13:04:39.000000000 +0100
+@@ -34,6 +34,8 @@
+ #include <libgnomeui/gnome-desktop-thumbnail.h>
  
  #include "e-image-chooser.h"
 +#include "eel-editable-label.h"
@@ -5823,7 +5823,7 @@ diff -up gnome-control-center-2.25.2/cap
  #include "gnome-about-me-fingerprint.h"
  #include "marshal.h"
  
-@@ -69,6 +71,7 @@ typedef struct {
+@@ -65,6 +67,7 @@ typedef struct {
  	gboolean      	 have_image;
  	gboolean      	 image_changed;
  	gboolean      	 create_self;
@@ -5831,7 +5831,7 @@ diff -up gnome-control-center-2.25.2/cap
  
  	gchar        	*person;
  	gchar 		*login;
-@@ -148,7 +151,7 @@ struct WidToCid ids[] = {
+@@ -144,7 +147,7 @@ struct WidToCid ids[] = {
  #define ATTRIBUTE_OTHER "OTHER"
  
  static void about_me_set_address_field (EContactAddress *, guint, gchar *);
@@ -5840,7 +5840,7 @@ diff -up gnome-control-center-2.25.2/cap
  
  /*** Utility functions ***/
  static void
-@@ -285,6 +288,50 @@ about_me_commit (GnomeAboutMe *me)
+@@ -259,6 +262,50 @@ about_me_commit (GnomeAboutMe *me)
  	me->create_self = FALSE;
  }
  
@@ -5891,30 +5891,7 @@ diff -up gnome-control-center-2.25.2/cap
  static gboolean
  about_me_commit_from_timeout (GnomeAboutMe *me)
  {
-@@ -354,22 +401,6 @@ about_me_focus_out (GtkWidget *widget, G
- 	return FALSE;
- }
- 
--static char *
--get_user_login (void)
--{
--	char buf[LINE_MAX * 4];
--	struct passwd pwd, *err;
--
--	int i;
--#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS)
--	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
--	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
--#else
--	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
--	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
--#endif
--}
--
- /*
-  * Helpers
-  */
-@@ -873,6 +904,8 @@ about_me_button_clicked_cb (GtkDialog *d
+@@ -807,6 +854,8 @@ about_me_button_clicked_cb (GtkDialog *d
  			g_source_remove (me->commit_timeout_id);
  			about_me_commit (me);
  		}
@@ -5923,7 +5900,7 @@ diff -up gnome-control-center-2.25.2/cap
  
  		about_me_destroy (me);
  		gtk_main_quit ();
-@@ -893,6 +926,144 @@ about_me_fingerprint_button_clicked_cb (
+@@ -827,6 +876,144 @@ about_me_fingerprint_button_clicked_cb (
  				    me->disable_fingerprint_button);
  }
  
@@ -6068,7 +6045,7 @@ diff -up gnome-control-center-2.25.2/cap
  static gint
  about_me_setup_dialog (void)
  {
-@@ -903,6 +1074,8 @@ about_me_setup_dialog (void)
+@@ -837,6 +1024,8 @@ about_me_setup_dialog (void)
  	GError 	     *error = NULL;
  	GList        *chain;
  	gchar        *str;
@@ -6077,7 +6054,7 @@ diff -up gnome-control-center-2.25.2/cap
  
  	me = g_new0 (GnomeAboutMe, 1);
  
-@@ -983,6 +1156,25 @@ about_me_setup_dialog (void)
+@@ -920,6 +1109,25 @@ about_me_setup_dialog (void)
  	gtk_label_set_markup (GTK_LABEL (widget), str);
  	g_free (str);
  
@@ -6103,61 +6080,46 @@ diff -up gnome-control-center-2.25.2/cap
  	widget = WID ("login");
  	gtk_label_set_text (GTK_LABEL (widget), me->login);
  
-diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade
---- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade.gecos	2008-12-01 08:32:12.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.glade	2008-12-16 21:16:16.000000000 -0500
-@@ -101,23 +101,30 @@
- 		  </child>
- 
- 		  <child>
--		    <widget class="GtkLabel" id="fullname">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Full Name</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">False</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
-+                    <widget class="GtkButton" id="fullnamebox">
-+                      <property name="relief">GTK_RELIEF_NONE</property>
-+                      <property name="focus_on_click">True</property>
-+ 
-+                      <child>
-+                        <widget class="GtkLabel" id="fullname">
-+                          <property name="visible">True</property>
-+                          <property name="label" translatable="yes">Full Name</property>
-+                          <property name="use_underline">False</property>
-+                          <property name="use_markup">False</property>
-+                          <property name="justify">GTK_JUSTIFY_LEFT</property>
-+                          <property name="wrap">False</property>
-+                          <property name="selectable">False</property>
-+                          <property name="xalign">0</property>
-+                          <property name="yalign">0.5</property>
-+                          <property name="xpad">0</property>
-+                          <property name="ypad">0</property>
-+                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+                          <property name="width_chars">-1</property>
-+                          <property name="single_line_mode">False</property>
-+                          <property name="angle">0</property>
-+                        </widget>
-+                      </child>
-+                    </widget>
- 		    <packing>
- 		      <property name="padding">0</property>
- 		      <property name="expand">False</property>
-diff -up gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos gnome-control-center-2.25.2/capplets/about-me/Makefile.am
---- gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos	2008-12-02 11:52:42.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/Makefile.am	2008-12-16 21:16:16.000000000 -0500
-@@ -9,13 +9,16 @@ pixmap_files = 				\
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/gnome-about-me-dialog.ui gnome-control-center-2.27.91/capplets/about-me/gnome-about-me-dialog.ui
+--- gnome-control-center-2.27.91.old/capplets/about-me/gnome-about-me-dialog.ui	2009-08-06 15:11:23.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/gnome-about-me-dialog.ui	2009-09-07 13:18:44.000000000 +0100
+@@ -44,15 +44,28 @@
+                       </packing>
+                     </child>
+                     <child>
+-                      <object class="GtkLabel" id="fullname">
++                      <object class="GtkButton" id="fullnamebox">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Full Name</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">False</property>
++                        <child>
++                          <object class="GtkLabel" id="fullname">
++                            <property name="visible">True</property>
++                            <property name="yalign">0</property>
++                            <property name="label" translatable="yes">Full Name</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">0</property>
++                          </packing>
++                          <placeholder/>
++                        </child>
+                       </object>
+                       <packing>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+-                        <property name="position">1</property>
++                        <property name="position">0</property>
+                       </packing>
+                     </child>
+                   </object>
+diff -uprN gnome-control-center-2.27.91.old/capplets/about-me/Makefile.am gnome-control-center-2.27.91/capplets/about-me/Makefile.am
+--- gnome-control-center-2.27.91.old/capplets/about-me/Makefile.am	2009-08-24 11:54:41.000000000 +0100
++++ gnome-control-center-2.27.91/capplets/about-me/Makefile.am	2009-09-07 13:05:28.000000000 +0100
+@@ -7,13 +7,16 @@ ui_files = gnome-about-me-dialog.ui gnom
  Desktop_in_files = gnome-about-me.desktop.in
  
  gnome_about_me_SOURCES =	 	\
@@ -6177,27 +6139,27 @@ diff -up gnome-control-center-2.25.2/cap
  	gnome-about-me-fingerprint.c	\
  	gnome-about-me-fingerprint.h	\
  	$(MARSHALFILES)			\
-@@ -28,7 +31,7 @@ bin_PROGRAMS = gnome-about-me
+@@ -31,7 +34,7 @@ marshal.c: fprintd-marshal.list
  if BUILD_ABOUTME
  bin_PROGRAMS = gnome-about-me
  
--gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
-+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) $(GAIL_LIBS)
+-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS)
++gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(GAIL_LIBS)
  gnome_about_me_LDFLAGS = -export-dynamic
  
  @INTLTOOL_DESKTOP_RULE@
-@@ -43,6 +46,7 @@ INCLUDES = \
+@@ -45,6 +48,7 @@ ui_DATA = $(ui_files)
+ INCLUDES = \
  	$(GNOMECC_CAPPLETS_CFLAGS) \
  	$(LIBEBOOK_CFLAGS) \
- 	$(POLKIT_GNOME_CFLAGS) \
 +	$(GAIL_CFLAGS) \
  	-DDATADIR="\"$(datadir)\"" \
  	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
- 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-diff -up gnome-control-center-2.25.2/configure.in.gecos gnome-control-center-2.25.2/configure.in
---- gnome-control-center-2.25.2/configure.in.gecos	2008-12-16 21:16:16.000000000 -0500
-+++ gnome-control-center-2.25.2/configure.in	2008-12-16 21:16:16.000000000 -0500
-@@ -97,6 +97,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
+ 	-DGNOMECC_UI_DIR="\"$(uidir)\"" \
+diff -uprN gnome-control-center-2.27.91.old/configure.in gnome-control-center-2.27.91/configure.in
+--- gnome-control-center-2.27.91.old/configure.in	2009-09-07 13:02:57.000000000 +0100
++++ gnome-control-center-2.27.91/configure.in	2009-09-07 13:04:42.000000000 +0100
+@@ -98,6 +98,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
  PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
  PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
  PKG_CHECK_MODULES(GIO, gio-2.0)
@@ -6205,8 +6167,8 @@ diff -up gnome-control-center-2.25.2/con
  
  gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
  gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
-@@ -200,6 +201,8 @@ if test "x$enable_aboutme" = "xyes"; the
-   		    has_polkit=false)
+@@ -225,6 +226,8 @@ if test "x$enable_aboutme" = "xyes"; the
+                     [Define if evolution-data-server libebook-1.2 is available])])
  fi
  
 +PKG_CHECK_MODULES(GAIL, [gail])



From lkundrak at fedoraproject.org  Mon Sep  7 12:24:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 12:24:09 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec,1.82,1.83 sources,1.24,1.25
Message-ID: <20090907122409.403F611C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1501

Modified Files:
	inkscape.spec sources 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre2.20090907svn
- Update to a post-pre2 snapshot



Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- inkscape.spec	10 Aug 2009 03:43:55 -0000	1.82
+++ inkscape.spec	7 Sep 2009 12:24:08 -0000	1.83
@@ -2,14 +2,14 @@
 
 Name:           inkscape
 Version:        0.47
-Release:        0.15.pre1.20090810svn%{?dist}
+Release:        0.15.pre2.20090907svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22040 inkscape
+# svn export -r22202 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22202 inkscape
 # tar cf - inkscape |xz -9 -c >inkscape.tar.xz
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
@@ -232,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre2.20090907svn
+- Update to a post-pre2 snapshot
+
 * Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
 - Update to a post-pre1 snapshot
 - Drop upstreamed CRC32 fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Aug 2009 03:43:55 -0000	1.24
+++ sources	7 Sep 2009 12:24:08 -0000	1.25
@@ -1 +1 @@
-13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz
+2a5d70e3924f049a5d5b43cd2075cd8c  inkscape.tar.xz



From akurtakov at fedoraproject.org  Mon Sep  7 12:33:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon,  7 Sep 2009 12:33:33 +0000 (UTC)
Subject: rpms/eclipse-cmakeed/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 eclipse-cmakeed.spec, 1.4, 1.5
Message-ID: <20090907123333.99F1711C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-cmakeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9668/devel

Modified Files:
	sources .cvsignore eclipse-cmakeed.spec 
Log Message:
Update to upstream 1.1.4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cmakeed/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Feb 2009 06:33:16 -0000	1.2
+++ sources	7 Sep 2009 12:33:33 -0000	1.3
@@ -1 +1 @@
-edc6086d750d427d0326b17c0927a41f  CMakeEd-Src_1.1.2.tar.gz
+42c536686943d7e4442700d91c0731db  CMakeEd-Src_1.1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cmakeed/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Feb 2009 06:33:16 -0000	1.2
+++ .cvsignore	7 Sep 2009 12:33:33 -0000	1.3
@@ -1 +1,2 @@
 CMakeEd-Src_1.1.2.tar.gz
+CMakeEd-Src_1.1.4.tar.gz


Index: eclipse-cmakeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cmakeed/devel/eclipse-cmakeed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-cmakeed.spec	24 Jul 2009 20:52:08 -0000	1.4
+++ eclipse-cmakeed.spec	7 Sep 2009 12:33:33 -0000	1.5
@@ -1,9 +1,9 @@
-%define eclipse_base   %{_libdir}/eclipse
-%define install_loc    %{_datadir}/eclipse/dropins/cmakeed
+%global eclipse_base   %{_libdir}/eclipse
+%global install_loc    %{_datadir}/eclipse/dropins/cmakeed
 
 Name:           eclipse-cmakeed
-Version:        1.1.2
-Release:        4%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        CMake Editor plug-in for Eclipse
 
 Group:          Development/Tools
@@ -22,19 +22,19 @@ The CMakeEd plug-in provides an editor f
 an editor for files named CMakeLists.txt and *.cmake.
 
 %prep
-%setup -q -n 1_1_2
+%setup -q -n 1_1_4
 #remove jar files
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 
 %build
-%{eclipse_base}/buildscripts/pdebuild 
+%{eclipse_base}/buildscripts/pdebuild
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
-     build/rpmBuild/com.cthing.cmakeed.feature.zip 
+     build/rpmBuild/com.cthing.cmakeed.feature.zip
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -45,6 +45,9 @@ find -name '*.jar' -o -name '*.class' -e
 %doc com.cthing.cmakeed.feature/License.html
 
 %changelog
+* Sun Sep 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1.1.4-1
+- Update to upstream 1.1.4.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Mon Sep  7 12:45:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 12:45:54 +0000 (UTC)
Subject: rpms/control-center/devel gnome-control-center-2.25.2-gecos.patch,
	1.5, 1.6
Message-ID: <20090907124554.1C00D11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12986

Modified Files:
	gnome-control-center-2.25.2-gecos.patch 
Log Message:
Remove polkit-gnome req

gnome-control-center-2.25.2-gecos.patch:
 capplets/about-me/Makefile.am              |   12 
 capplets/about-me/eel-accessibility.c      |  413 ++
 capplets/about-me/eel-accessibility.h      |  152 
 capplets/about-me/eel-editable-label.c     | 4410 +++++++++++++++++++++++++++++
 capplets/about-me/eel-editable-label.h     |  142 
 capplets/about-me/eel-marshal.c            |  556 +++
 capplets/about-me/eel-marshal.h            |  116 
 capplets/about-me/gnome-about-me-dialog.ui |   21 
 capplets/about-me/gnome-about-me.c         |  210 +
 configure.in                               |    2 
 10 files changed, 6025 insertions(+), 9 deletions(-)

Index: gnome-control-center-2.25.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 12:22:57 -0000	1.5
+++ gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 12:45:53 -0000	1.6
@@ -6159,14 +6159,6 @@ diff -uprN gnome-control-center-2.27.91.
 diff -uprN gnome-control-center-2.27.91.old/configure.in gnome-control-center-2.27.91/configure.in
 --- gnome-control-center-2.27.91.old/configure.in	2009-09-07 13:02:57.000000000 +0100
 +++ gnome-control-center-2.27.91/configure.in	2009-09-07 13:04:42.000000000 +0100
-@@ -98,6 +98,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
- PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
- PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
- PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome)
- 
- gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
- gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
 @@ -225,6 +226,8 @@ if test "x$enable_aboutme" = "xyes"; the
                      [Define if evolution-data-server libebook-1.2 is available])])
  fi



From michich at fedoraproject.org  Mon Sep  7 12:53:02 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon,  7 Sep 2009 12:53:02 +0000 (UTC)
Subject: rpms/opencryptoki/devel opencryptoki-2.3.0-fix-nss-breakage.patch, 
	NONE, 1.1 opencryptoki.spec, 1.4, 1.5
Message-ID: <20090907125302.883E711C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/opencryptoki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15558

Modified Files:
	opencryptoki.spec 
Added Files:
	opencryptoki-2.3.0-fix-nss-breakage.patch 
Log Message:
* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-4
- Added opencryptoki-2.3.0-fix-nss-breakage.patch on upstream request.


opencryptoki-2.3.0-fix-nss-breakage.patch:
 api_interface.c |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE opencryptoki-2.3.0-fix-nss-breakage.patch ---
Rajiv Andrade kindly asked me to apply this patch.
It's committed in upstream CVS since 2009-09-04.
-- Michal

Subject: [PATCH] Fix NSS breakage, don't change caller's C_Initialize args
From: 	Klaus Heinrich Kiwi <klausk at linux.vnet.ibm.com>

 Setting CKF_SERIAL_SESSION bit on CK_C_INITIALIZE_ARGS struct passed
 by the caller is breaking at least one outstanding PKCS#11 user: NSS,
 which qualifies this field as 'const'.
 PKCS#11 standard doesn't specify this as a const field, but this
 particular flag is depracated anyway and openCryptoki doesn't
 really care for it, so leaving it alone won't probably cause any
 harm.


Signed-off-by: Klaus Heinrich Kiwi <klausk at linux.vnet.ibm.com>
---
 usr/lib/pkcs11/api/api_interface.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/usr/lib/pkcs11/api/api_interface.c b/usr/lib/pkcs11/api/api_interface.c
index 57519d4..dabd711 100755
--- a/usr/lib/pkcs11/api/api_interface.c
+++ b/usr/lib/pkcs11/api/api_interface.c
@@ -3324,11 +3324,6 @@ C_Initialize ( CK_VOID_PTR pVoid )
             LOGIT(LOG_DEBUG,"Can't create OS threads.... This is OK");
          }

-	 /* CFK_SERIAL_SESSION is deprecated, so we should just turn
-	  * it on within the code automatically, instead of requiring
-	  * the application to do it. */
-	 pArg->flags |= CKF_SERIAL_SESSION;
-
          // Since this is an initialization path, we will be verbose in the
          // code rather than efficient.
          // 
-- 
1.6.2.5


Index: opencryptoki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/opencryptoki.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- opencryptoki.spec	21 Aug 2009 14:51:25 -0000	1.4
+++ opencryptoki.spec	7 Sep 2009 12:53:02 -0000	1.5
@@ -1,12 +1,13 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version:		2.3.0
-Release:		3%{?dist}
+Release:		4%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
 Source:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}-2.2.8-do-not-create-group-in-pkcs11_startup.patch
+Patch1:			%{name}-2.3.0-fix-nss-breakage.patch
 BuildRoot:		%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(pre):		shadow-utils coreutils sed
 Requires(post):		chkconfig
@@ -46,6 +47,7 @@ based applications.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Upstream tarball has unnecessary executable perms set on the sources
@@ -136,6 +138,9 @@ exit 0
 
 
 %changelog
+* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-4
+- Added opencryptoki-2.3.0-fix-nss-breakage.patch on upstream request.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.0-3
 - rebuilt with new openssl
 



From hadess at fedoraproject.org  Mon Sep  7 13:02:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 13:02:28 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.483,
	1.484 gnome-control-center-2.25.2-gecos.patch, 1.6, 1.7
Message-ID: <20090907130228.36AD211C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19411

Modified Files:
	control-center.spec gnome-control-center-2.25.2-gecos.patch 
Log Message:
Lazy man's port to GtkBuilder


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- control-center.spec	7 Sep 2009 12:22:56 -0000	1.483
+++ control-center.spec	7 Sep 2009 13:02:27 -0000	1.484
@@ -195,12 +195,12 @@ for the GNOME desktop.
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
-%patch96 -p1 -b .gecos
+#%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 
 %patch7 -p1 -b .make-default
 
-autoreconf -f -i
+#autoreconf -f -i
 
 %build
 

gnome-control-center-2.25.2-gecos.patch:
 capplets/about-me/Makefile.am              |   12 
 capplets/about-me/eel-accessibility.c      |  413 ++
 capplets/about-me/eel-accessibility.h      |  152 
 capplets/about-me/eel-editable-label.c     | 4410 +++++++++++++++++++++++++++++
 capplets/about-me/eel-editable-label.h     |  142 
 capplets/about-me/eel-marshal.c            |  556 +++
 capplets/about-me/eel-marshal.h            |  116 
 capplets/about-me/gnome-about-me-dialog.ui |   21 
 capplets/about-me/gnome-about-me.c         |  210 +
 configure.in                               |    2 
 10 files changed, 6025 insertions(+), 9 deletions(-)

Index: gnome-control-center-2.25.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 12:45:53 -0000	1.6
+++ gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 13:02:27 -0000	1.7
@@ -5910,7 +5910,7 @@ diff -uprN gnome-control-center-2.27.91.
 +        GtkWidget    *widget;
 +        GList        *list;
 +        GtkWidget    *c;
-+        GladeXML     *dialog;
++        GtkBuilder   *dialog;
 + 
 +        dialog = me->dialog;
 + 
@@ -5978,7 +5978,7 @@ diff -uprN gnome-control-center-2.27.91.
 +        GtkWidget   *main_dialog;
 +	const gchar *text;
 +	gchar *str;
-+	GladeXML     *dialog;
++	GtkBuilder  *dialog;
 +
 +	if (!me->editing_username)
 +		return;



From salimma at fedoraproject.org  Mon Sep  7 13:07:34 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 13:07:34 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec, 1.20, 1.21 llvm-2.5-Base.td-x86_32.patch,
	1.1, NONE
Message-ID: <20090907130734.6200811C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20102

Modified Files:
	llvm.spec 
Removed Files:
	llvm-2.5-Base.td-x86_32.patch 
Log Message:
Remove obsoleted 32-bit patch



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- llvm.spec	7 Sep 2009 06:59:47 -0000	1.20
+++ llvm.spec	7 Sep 2009 13:07:34 -0000	1.21
@@ -18,8 +18,6 @@ Patch0:         llvm-2.6-destdir.patch
 Patch1:         llvm-2.6-destdir-clang.patch
 # http://llvm.org/bugs/show_bug.cgi?id=4911
 Patch2:         llvm-2.5-tclsh_check.patch
-# http://llvm.org/bugs/show_bug.cgi?id=3239
-Patch3:         llvm-2.5-Base.td-x86_32.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -139,9 +137,6 @@ pushd tools/clang
 popd
 %patch2 -p1 -b .tclsh_check
 
-%ifarch %{ix86}
-%patch3 -p0 -b .ix86pic
-%endif
 
 %build
 # Note: --enable-pic can be turned off when 2.6 comes out


--- llvm-2.5-Base.td-x86_32.patch DELETED ---



From hadess at fedoraproject.org  Mon Sep  7 13:15:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 13:15:11 +0000 (UTC)
Subject: rpms/gnome-user-share/devel
	0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch,
	NONE, 1.1 gnome-user-share.spec, 1.58, 1.59
Message-ID: <20090907131511.6F5F011C0419@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23997

Modified Files:
	gnome-user-share.spec 
Added Files:
	0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch 
Log Message:
* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-2
- Init i18n system for gnome-user-share


0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch:
 user_share.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch ---
>From faecaeb8f4f84a03528b29e82f12138f9d55dd13 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 7 Sep 2009 14:11:33 +0100
Subject: [PATCH] =?utf-8?q?Bug=C2=A0594252=20-=20WebDAV=20share=20name=20untraslated=20at=20runtime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Init the i18n system in our session daemon, otherwise we
won't ever translate anything...
---
 src/user_share.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/user_share.c b/src/user_share.c
index 07868c0..6a982c0 100644
--- a/src/user_share.c
+++ b/src/user_share.c
@@ -475,6 +475,10 @@ main (int argc, char **argv)
 	Window selection_owner;
 	Atom xatom;
 
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	gtk_init (&argc, &argv);
 
 	if (g_strcmp0 (g_get_real_name (), "root") == 0) {
@@ -489,7 +493,7 @@ main (int argc, char **argv)
 
 	xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 	if (xdisplay == NULL) {
-		fprintf (stderr, "Can't open display\n");
+		g_warning ("Can't open display");
 		return 1;
 	}
 
-- 
1.6.2.5



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- gnome-user-share.spec	2 Sep 2009 12:38:09 -0000	1.58
+++ gnome-user-share.spec	7 Sep 2009 13:15:11 -0000	1.59
@@ -1,13 +1,15 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.27.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.27/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=594252
+Patch1: 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -47,6 +49,7 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
+%patch1 -p1 -b .i18n
 
 %build
 %configure
@@ -124,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-2
+- Init i18n system for gnome-user-share
+
 * Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-1
 - Update to 2.27.0
 



From lkundrak at fedoraproject.org  Mon Sep  7 13:17:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 13:17:41 +0000 (UTC)
Subject: rpms/yofrankie-bge/devel .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 yofrankie-bge.spec, 1.5, 1.6
Message-ID: <20090907131741.DF5FE11C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/yofrankie-bge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24688

Modified Files:
	.cvsignore sources yofrankie-bge.spec 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1b-1.20090907svn
- New upstream snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yofrankie-bge/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 06:12:50 -0000	1.2
+++ .cvsignore	7 Sep 2009 13:17:41 -0000	1.3
@@ -1 +1 @@
-yofrankie-bge.tar.lzma
+yofrankie-bge.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yofrankie-bge/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 13:55:50 -0000	1.3
+++ sources	7 Sep 2009 13:17:41 -0000	1.4
@@ -1 +1 @@
-0aa3d210a69be80a90055bcb7257579b  yofrankie-bge.tar.lzma
+fb217acaaa034d7374af301c1c61b3e5  yofrankie-bge.tar.xz


Index: yofrankie-bge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yofrankie-bge/devel/yofrankie-bge.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- yofrankie-bge.spec	27 Jul 2009 08:54:31 -0000	1.5
+++ yofrankie-bge.spec	7 Sep 2009 13:17:41 -0000	1.6
@@ -2,8 +2,11 @@ Name:           yofrankie-bge
 # Upstream developer claims the following:
 # The site puts the last "technical demo" before the DVD release at
 # version 1.2; that may make the DVD version 1.3.
-Version:        1.4
-Release:        0.5.20090412svn
+# Then upstream released versions 1.1, 1.1a, 1.1b; so we introduced
+# epoch.
+Version:        1.1b
+Epoch:          1
+Release:        1.20090907svn
 Summary:        3D Game with characters from Big Buck Bunny movie
 
 Group:          Amusements/Games
@@ -18,8 +21,8 @@ Group:          Amusements/Games
 License:        CC-BY and Freely redistributable without restriction
 URL:            http://www.yofrankie.org/
 # svn export -r34 https://svn.blender.org/svnroot/yofrankie at 34 yofrankie-bge
-# tar cf - yofrankie-bge |lzma -c -9 >yofrankie-bge.tar.lzma
-Source0:        yofrankie-bge.tar.lzma
+# tar cf - yofrankie-bge |xz -c -9 >yofrankie-bge.tar.xz
+Source0:        yofrankie-bge.tar.xz
 # This is the license as it is on the Game DVD
 # Game developer confirmed that this is the license to be used here
 # and was asked to include it in SVN repository
@@ -91,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1b-1.20090907svn
+- New upstream snapshot
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20090412svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Mon Sep  7 13:32:32 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 13:32:32 +0000 (UTC)
Subject: rpms/qemu/EL-5 qemu.spec,1.27,1.28
Message-ID: <20090907133232.4B8C111C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/qemu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28960

Modified Files:
	qemu.spec 
Log Message:
* Sun May 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.5-1.2
- Drop bogus dependency



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/EL-5/qemu.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- qemu.spec	30 Jun 2009 07:44:34 -0000	1.27
+++ qemu.spec	7 Sep 2009 13:32:31 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.5
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -90,7 +90,6 @@ platform.
 Summary: QEMU system emulator for ppc
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: openbios-ppc
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
@@ -315,6 +314,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun May 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.5-1.2
+- Drop bogus dependency
+
 * Tue Jun 30 2009 Richard Jones <rjones at redhat.com> - 2:0.10.5-1.el5.1
 - Package version regressed in EPEL 5 after the move to Koji. Force rebuild.
 



From lkundrak at fedoraproject.org  Mon Sep  7 13:33:43 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 13:33:43 +0000 (UTC)
Subject: rpms/qemu/EL-5 qemu.spec,1.28,1.29
Message-ID: <20090907133343.5DAF211C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/qemu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287

Modified Files:
	qemu.spec 
Log Message:
* Sun May 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.5-1.2
- Drop bogus dependency



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/EL-5/qemu.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- qemu.spec	7 Sep 2009 13:32:31 -0000	1.28
+++ qemu.spec	7 Sep 2009 13:33:43 -0000	1.29
@@ -314,7 +314,7 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
-* Sun May 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.5-1.2
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.5-1.2
 - Drop bogus dependency
 
 * Tue Jun 30 2009 Richard Jones <rjones at redhat.com> - 2:0.10.5-1.el5.1



From rhughes at fedoraproject.org  Mon Sep  7 13:34:59 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Sep 2009 13:34:59 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.67,
	1.68 gnome-power-manager.spec, 1.173, 1.174 sources, 1.68, 1.69
Message-ID: <20090907133459.7F7B711C00DB@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29625

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.92-1
- Update to 2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	24 Aug 2009 10:41:03 -0000	1.67
+++ .cvsignore	7 Sep 2009 13:34:59 -0000	1.68
@@ -1 +1 @@
-gnome-power-manager-2.27.91.tar.bz2
+gnome-power-manager-2.27.92.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- gnome-power-manager.spec	24 Aug 2009 10:41:03 -0000	1.173
+++ gnome-power-manager.spec	7 Sep 2009 13:34:59 -0000	1.174
@@ -4,7 +4,7 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
@@ -181,6 +181,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	24 Aug 2009 10:41:03 -0000	1.68
+++ sources	7 Sep 2009 13:34:59 -0000	1.69
@@ -1 +1 @@
-ec817ce482a9da2dbc2a78d40d384e3c  gnome-power-manager-2.27.91.tar.bz2
+50b94d77dadd073fa66aec1aecec5879  gnome-power-manager-2.27.92.tar.bz2



From rhughes at fedoraproject.org  Mon Sep  7 13:35:20 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Sep 2009 13:35:20 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.54,
	1.55 gnome-packagekit.spec, 1.98, 1.99 sources, 1.55, 1.56
Message-ID: <20090907133520.379D911C00DB@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29787

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.92-1
- New upstream version.
- Many updated translations.
- Add simulation of installed files.
- Don't show duplicate package names in the reboot tooltip.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	24 Aug 2009 15:13:18 -0000	1.54
+++ .cvsignore	7 Sep 2009 13:35:19 -0000	1.55
@@ -1 +1 @@
-gnome-packagekit-2.27.91.tar.bz2
+gnome-packagekit-2.27.92.tar.bz2


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- gnome-packagekit.spec	24 Aug 2009 15:13:18 -0000	1.98
+++ gnome-packagekit.spec	7 Sep 2009 13:35:20 -0000	1.99
@@ -8,15 +8,15 @@
 %define devicekit_version		003
 %define devicekit_power_version		007
 %define libcanberra_version		0.10
-%define alphatag			20090727
+#%define alphatag			20090727
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.27.91
+Version:   2.27.92
 #Release:   0.1.%{?alphatag}git%{?dist}
-Release:   2%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -223,6 +223,12 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.92-1
+- New upstream version.
+- Many updated translations.
+- Add simulation of installed files.
+- Don't show duplicate package names in the reboot tooltip.
+
 * Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-2
 - Actually upload the correct tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	24 Aug 2009 15:13:18 -0000	1.55
+++ sources	7 Sep 2009 13:35:20 -0000	1.56
@@ -1 +1 @@
-cb39d7818d627ebb5bd0d489b550ba4d  gnome-packagekit-2.27.91.tar.bz2
+9f4582a2dcf4521eeb2b91fa458a21d8  gnome-packagekit-2.27.92.tar.bz2



From chitlesh at fedoraproject.org  Mon Sep  7 13:36:44 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Sep 2009 13:36:44 +0000 (UTC)
Subject: rpms/emacs-verilog-mode/EL-5 .cvsignore, 1.2,
	1.3 emacs-verilog-mode.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090907133644.E7B0C11C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/emacs-verilog-mode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30648/EL-5

Modified Files:
	.cvsignore emacs-verilog-mode.spec import.log sources 
Log Message:
531


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-verilog-mode/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Jul 2009 14:46:57 -0000	1.2
+++ .cvsignore	7 Sep 2009 13:36:44 -0000	1.3
@@ -1 +1 @@
-verilog-mode-528.el.gz
+verilog-mode-531.el.gz


Index: emacs-verilog-mode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-verilog-mode/EL-5/emacs-verilog-mode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- emacs-verilog-mode.spec	31 Jul 2009 14:46:57 -0000	1.1
+++ emacs-verilog-mode.spec	7 Sep 2009 13:36:44 -0000	1.2
@@ -1,7 +1,7 @@
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
 %if %($(pkg-config emacs) ; echo $?)
-%define emacs_version  22.2
+%define emacs_version  21.0
 %define emacs_lispdir  %{_datadir}/emacs/site-lisp
 %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
 %else
@@ -13,7 +13,7 @@
 %define realname verilog-mode
 
 Name:           emacs-%{realname}
-Version:        528
+Version:        531
 Release:        1%{?dist}
 Summary:        Verilog mode for Emacs
 
@@ -25,7 +25,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  emacs-el
 BuildRequires:  emacs
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs >= %{emacs_version}
 BuildArch:      noarch
 
 %description
@@ -80,6 +80,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 531-1
+- update to 531
+- fixed broken dependency for EL-5
+
 * Thu Jul 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 528-1
 - update to 528
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-verilog-mode/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	31 Jul 2009 14:46:58 -0000	1.1
+++ import.log	7 Sep 2009 13:36:44 -0000	1.2
@@ -1 +1,2 @@
 emacs-verilog-mode-528-1_fc11:EL-5:emacs-verilog-mode-528-1.fc11.src.rpm:1249051366
+emacs-verilog-mode-531-1_fc11:EL-5:emacs-verilog-mode-531-1.fc11.src.rpm:1252330416


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-verilog-mode/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jul 2009 14:46:58 -0000	1.2
+++ sources	7 Sep 2009 13:36:44 -0000	1.3
@@ -1 +1 @@
-effbbf14e5467b2c2c0ed4c69fa1476e  verilog-mode-528.el.gz
+7d57cad5adef59e4564a1240282c7d2a  verilog-mode-531.el.gz



From chitlesh at fedoraproject.org  Mon Sep  7 13:38:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Sep 2009 13:38:10 +0000 (UTC)
Subject: rpms/emacs-verilog-mode/devel emacs-verilog-mode.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090907133810.C614511C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/emacs-verilog-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-verilog-mode.spec import.log 
Log Message:
531


--- NEW FILE emacs-verilog-mode.spec ---
# If the emacs-el package has installed a pkgconfig file, use that to determine
# install locations and Emacs version at build time, otherwise set defaults.
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version  21.0
%define emacs_lispdir  %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version  %{expand:%(pkg-config emacs --modversion)}
%define emacs_lispdir  %{expand:%(pkg-config emacs --variable sitepkglispdir)}
%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
%endif

%define realname verilog-mode

Name:           emacs-%{realname}
Version:        531
Release:        1%{?dist}
Summary:        Verilog mode for Emacs

Group:          Applications/Engineering
License:        GPLv3+
URL:            http://www.veripool.org/wiki/verilog-mode/
Source0:        http://www.veripool.org/ftp/%{realname}-%{version}.el.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  emacs-el
BuildRequires:  emacs
Requires:       emacs >= %{emacs_version}
BuildArch:      noarch

%description
Verilog-mode.el is a free Verilog mode for Emacs
which provides context-sensitive highlighting,
auto indenting, and provides macro expansion
capabilities to greatly reduce Verilog coding time.

%prep
#setup -q
# /bin/tar: This does not look like a tar archive
rm -rf   %{_builddir}/%{name}-%{version}
mkdir -p %{_builddir}/%{name}-%{version}
cd       %{_builddir}/%{name}-%{version}
gunzip < %{SOURCE0} > %{realname}.el


%build

cd %{name}-%{version}
cat > %{realname}.el.site-start << EOF
;; Load verilog mode only when needed
(autoload 'verilog-mode "verilog-mode" "Verilog mode" t )
;; Any files that end in .v should be in verilog mode
(setq auto-mode-alist (cons '("\\.v\\'" . verilog-mode) auto-mode-alist))
;; Any files in verilog mode should have their keywords colorized
(add-hook 'verilog-mode-hook '(lambda () (font-lock-mode 1)))
EOF

%install
rm -rf %{buildroot}

cd %{name}-%{version}

%{__install} -d %{buildroot}%{emacs_lispdir}
%{__install} -d %{buildroot}%{emacs_startdir}

emacs -batch -f batch-byte-compile %{realname}.el
%{__install} -pm 0644 %{realname}.el %{realname}.elc %{buildroot}%{emacs_lispdir}/
%{__install} -pm 0644 %{realname}.el.site-start %{buildroot}%{emacs_startdir}/%{realname}-init.el


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/%{realname}.el
%{emacs_lispdir}/%{realname}.elc
%{emacs_startdir}/%{realname}-init.el


%changelog
* Mon Sep 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 531-1
- update to 531
- fixed broken dependency for EL-5

* Thu Jul 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 528-1
- update to 528

* Thu May 14 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 502-1
- update to 502

* Sun Jan 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 463-1
- initial package


--- NEW FILE import.log ---
emacs-verilog-mode-531-1_fc11:HEAD:emacs-verilog-mode-531-1.fc11.src.rpm:1252330528


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-verilog-mode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Jul 2009 22:54:25 -0000	1.1
+++ .cvsignore	7 Sep 2009 13:38:10 -0000	1.2
@@ -0,0 +1 @@
+verilog-mode-531.el.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-verilog-mode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Jul 2009 22:54:25 -0000	1.1
+++ sources	7 Sep 2009 13:38:10 -0000	1.2
@@ -0,0 +1 @@
+7d57cad5adef59e4564a1240282c7d2a  verilog-mode-531.el.gz



From pghmcfc at fedoraproject.org  Mon Sep  7 13:40:45 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  7 Sep 2009 13:40:45 +0000 (UTC)
Subject: rpms/proftpd/EL-4 proftpd-1.3.2a-mlsd.patch, NONE, 1.1 proftpd.spec,
	1.15, 1.16
Message-ID: <20090907134045.B565B11C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32010/EL-4

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2a-mlsd.patch 
Log Message:
Add upstream patch for MLSD with dirnames containing glob chars (#521634)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |  101 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

--- NEW FILE proftpd-1.3.2a-mlsd.patch ---
--- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
+++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
@@ -22,7 +22,7 @@
  * resulting executable, without including the source code for OpenSSL in the
  * source distribution.
  *
- * $Id: mod_facts.c,v 1.13.2.1 2009/04/28 21:17:45 castaglia Exp $
+ * $Id: mod_facts.c,v 1.22 2009/04/09 15:59:38 castaglia Exp $
  */
 
 #include "conf.h"
@@ -227,7 +227,17 @@
     ptr = buf + buflen;
   }
 
-  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
+   * to include an LF at the end; it is appended by pr_response_send_raw().
+   * But MLSD entries DO need the trailing LF, so that it can be converted
+   * into a CRLF sequence by pr_data_xfer().
+   */
+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+
+  } else {
+    snprintf(ptr, bufsz - buflen, " %s", info->path);
+  }
 
   buf[bufsz-1] = '\0';
   buflen = strlen(buf);
@@ -244,11 +254,17 @@
  * channel, wherease MLSD's output is sent via a data transfer, much like
  * LIST or NLST.
  */
-static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
+static char *mlinfo_buf = NULL;
+static size_t mlinfo_bufsz = 0;
 static size_t mlinfo_buflen = 0;
 
 static void facts_mlinfobuf_init(void) {
-  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
+  if (mlinfo_buf == NULL) {
+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
+  }
+
+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
   mlinfo_buflen = 0;
 }
 
@@ -261,11 +277,11 @@
   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
    * mlinfo_buf.
    */
-  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
     (void) facts_mlinfobuf_flush();
   }
 
-  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
   mlinfo_buflen += buflen;
 }
 
@@ -358,6 +374,8 @@
   char buf[PR_TUNABLE_BUFFER_SIZE];
 
   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
+
+  /* The trailing CRLF will be added by pr_response_send_raw(). */
   pr_response_send_raw("%s", buf);
 }
 
@@ -595,7 +613,6 @@
  */
 
 MODRET facts_mff(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *facts, *ptr;
 
@@ -606,18 +623,16 @@
 
   facts = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -739,7 +754,6 @@
 }
 
 MODRET facts_mfmt(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *timestamp, *ptr;
   int res;
@@ -751,18 +765,16 @@
 
   timestamp = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -820,33 +832,28 @@
   DIR *dirh;
   struct dirent *dent;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
     return PR_ERROR(cmd);
   }
 
-  /* RFC3659 explicitly does NOT support glob characters. */
+  /* RFC3659 explicitly does NOT support glob characters.  So warn about
+   * this, but let the command continue as is.  We don't actually call
+   * glob(3) here, so no expansion will occur.
+   */
   if (strpbrk(decoded_path, "{[*?") != NULL) {
-    pr_log_debug(DEBUG2, MOD_FACTS_VERSION ": unable to handle MLSD command: "
-      "target '%s' contains glob characters", decoded_path);
-    pr_response_add_err(R_550, _("Unable to handle command"));
-    return PR_ERROR(cmd);
+    pr_log_debug(DEBUG9, MOD_FACTS_VERSION ": glob characters in MLSD ('%s') "
+      "ignored", decoded_path);
   }
 
   /* Make sure that the given path is actually a directory. */
@@ -870,11 +877,11 @@
     int xerrno = errno;
 
     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
-      "error reading directory '%s': %s", session.user,
+      "error opening directory '%s': %s", session.user,
       (unsigned long) session.uid, (unsigned long) session.gid,
       decoded_path, strerror(xerrno));
 
-    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
     return PR_ERROR(cmd);
   }
 
@@ -899,16 +906,14 @@
     /* Check that the file can be listed. */
     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
     if (abs_path) {
-      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
       
     } else {
       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
       if (abs_path == NULL)
         abs_path = rel_path;
 
-      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
     }
 
     if (!res || hidden) {
@@ -955,20 +960,15 @@
   const char *path, *decoded_path;
   struct mlinfo info;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
       &hidden)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
@@ -1155,6 +1155,7 @@
 
   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
   pr_feat_add("MFMT");
+  pr_feat_add("TVFS");
 
   facts_mlst_feat_add(session.pool);
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- proftpd.spec	2 Sep 2009 09:56:32 -0000	1.15
+++ proftpd.spec	7 Sep 2009 13:40:45 -0000	1.16
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 4
+%global rpmrel 5
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
+Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -98,6 +99,10 @@ Module to add PostgreSQL support to the 
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
+# Fix MLSD for directories containing shell metacharacters (#521634)
+# (upstream patch)
+%patch3 -p1 -b .mlsd
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -285,6 +290,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
+- Add upstream patch for MLSD with dirnames containing glob chars (#521634)
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
 - New DSO module: mod_exec (#520214)
 



From pghmcfc at fedoraproject.org  Mon Sep  7 13:40:45 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  7 Sep 2009 13:40:45 +0000 (UTC)
Subject: rpms/proftpd/EL-5 proftpd-1.3.2a-mlsd.patch, NONE, 1.1 proftpd.spec,
	1.35, 1.36
Message-ID: <20090907134045.CDEB611C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32010/EL-5

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2a-mlsd.patch 
Log Message:
Add upstream patch for MLSD with dirnames containing glob chars (#521634)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |  101 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

--- NEW FILE proftpd-1.3.2a-mlsd.patch ---
--- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
+++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
@@ -22,7 +22,7 @@
  * resulting executable, without including the source code for OpenSSL in the
  * source distribution.
  *
- * $Id: mod_facts.c,v 1.13.2.1 2009/04/28 21:17:45 castaglia Exp $
+ * $Id: mod_facts.c,v 1.22 2009/04/09 15:59:38 castaglia Exp $
  */
 
 #include "conf.h"
@@ -227,7 +227,17 @@
     ptr = buf + buflen;
   }
 
-  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
+   * to include an LF at the end; it is appended by pr_response_send_raw().
+   * But MLSD entries DO need the trailing LF, so that it can be converted
+   * into a CRLF sequence by pr_data_xfer().
+   */
+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+
+  } else {
+    snprintf(ptr, bufsz - buflen, " %s", info->path);
+  }
 
   buf[bufsz-1] = '\0';
   buflen = strlen(buf);
@@ -244,11 +254,17 @@
  * channel, wherease MLSD's output is sent via a data transfer, much like
  * LIST or NLST.
  */
-static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
+static char *mlinfo_buf = NULL;
+static size_t mlinfo_bufsz = 0;
 static size_t mlinfo_buflen = 0;
 
 static void facts_mlinfobuf_init(void) {
-  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
+  if (mlinfo_buf == NULL) {
+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
+  }
+
+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
   mlinfo_buflen = 0;
 }
 
@@ -261,11 +277,11 @@
   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
    * mlinfo_buf.
    */
-  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
     (void) facts_mlinfobuf_flush();
   }
 
-  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
   mlinfo_buflen += buflen;
 }
 
@@ -358,6 +374,8 @@
   char buf[PR_TUNABLE_BUFFER_SIZE];
 
   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
+
+  /* The trailing CRLF will be added by pr_response_send_raw(). */
   pr_response_send_raw("%s", buf);
 }
 
@@ -595,7 +613,6 @@
  */
 
 MODRET facts_mff(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *facts, *ptr;
 
@@ -606,18 +623,16 @@
 
   facts = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -739,7 +754,6 @@
 }
 
 MODRET facts_mfmt(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *timestamp, *ptr;
   int res;
@@ -751,18 +765,16 @@
 
   timestamp = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -820,33 +832,28 @@
   DIR *dirh;
   struct dirent *dent;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
     return PR_ERROR(cmd);
   }
 
-  /* RFC3659 explicitly does NOT support glob characters. */
+  /* RFC3659 explicitly does NOT support glob characters.  So warn about
+   * this, but let the command continue as is.  We don't actually call
+   * glob(3) here, so no expansion will occur.
+   */
   if (strpbrk(decoded_path, "{[*?") != NULL) {
-    pr_log_debug(DEBUG2, MOD_FACTS_VERSION ": unable to handle MLSD command: "
-      "target '%s' contains glob characters", decoded_path);
-    pr_response_add_err(R_550, _("Unable to handle command"));
-    return PR_ERROR(cmd);
+    pr_log_debug(DEBUG9, MOD_FACTS_VERSION ": glob characters in MLSD ('%s') "
+      "ignored", decoded_path);
   }
 
   /* Make sure that the given path is actually a directory. */
@@ -870,11 +877,11 @@
     int xerrno = errno;
 
     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
-      "error reading directory '%s': %s", session.user,
+      "error opening directory '%s': %s", session.user,
       (unsigned long) session.uid, (unsigned long) session.gid,
       decoded_path, strerror(xerrno));
 
-    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
     return PR_ERROR(cmd);
   }
 
@@ -899,16 +906,14 @@
     /* Check that the file can be listed. */
     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
     if (abs_path) {
-      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
       
     } else {
       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
       if (abs_path == NULL)
         abs_path = rel_path;
 
-      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
     }
 
     if (!res || hidden) {
@@ -955,20 +960,15 @@
   const char *path, *decoded_path;
   struct mlinfo info;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
       &hidden)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
@@ -1155,6 +1155,7 @@
 
   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
   pr_feat_add("MFMT");
+  pr_feat_add("TVFS");
 
   facts_mlst_feat_add(session.pool);
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- proftpd.spec	2 Sep 2009 09:56:33 -0000	1.35
+++ proftpd.spec	7 Sep 2009 13:40:45 -0000	1.36
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 4
+%global rpmrel 5
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
+Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -98,6 +99,10 @@ Module to add PostgreSQL support to the 
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
+# Fix MLSD for directories containing shell metacharacters (#521634)
+# (upstream patch)
+%patch3 -p1 -b .mlsd
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -285,6 +290,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
+- Add upstream patch for MLSD with dirnames containing glob chars (#521634)
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
 - New DSO module: mod_exec (#520214)
 



From pghmcfc at fedoraproject.org  Mon Sep  7 13:40:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  7 Sep 2009 13:40:46 +0000 (UTC)
Subject: rpms/proftpd/F-11 proftpd-1.3.2a-mlsd.patch, NONE, 1.1 proftpd.spec,
	1.50, 1.51
Message-ID: <20090907134046.53A3711C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32010/F-11

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2a-mlsd.patch 
Log Message:
Add upstream patch for MLSD with dirnames containing glob chars (#521634)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |  101 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

--- NEW FILE proftpd-1.3.2a-mlsd.patch ---
--- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
+++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
@@ -22,7 +22,7 @@
  * resulting executable, without including the source code for OpenSSL in the
  * source distribution.
  *
- * $Id: mod_facts.c,v 1.13.2.1 2009/04/28 21:17:45 castaglia Exp $
+ * $Id: mod_facts.c,v 1.22 2009/04/09 15:59:38 castaglia Exp $
  */
 
 #include "conf.h"
@@ -227,7 +227,17 @@
     ptr = buf + buflen;
   }
 
-  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
+   * to include an LF at the end; it is appended by pr_response_send_raw().
+   * But MLSD entries DO need the trailing LF, so that it can be converted
+   * into a CRLF sequence by pr_data_xfer().
+   */
+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+
+  } else {
+    snprintf(ptr, bufsz - buflen, " %s", info->path);
+  }
 
   buf[bufsz-1] = '\0';
   buflen = strlen(buf);
@@ -244,11 +254,17 @@
  * channel, wherease MLSD's output is sent via a data transfer, much like
  * LIST or NLST.
  */
-static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
+static char *mlinfo_buf = NULL;
+static size_t mlinfo_bufsz = 0;
 static size_t mlinfo_buflen = 0;
 
 static void facts_mlinfobuf_init(void) {
-  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
+  if (mlinfo_buf == NULL) {
+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
+  }
+
+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
   mlinfo_buflen = 0;
 }
 
@@ -261,11 +277,11 @@
   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
    * mlinfo_buf.
    */
-  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
     (void) facts_mlinfobuf_flush();
   }
 
-  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
   mlinfo_buflen += buflen;
 }
 
@@ -358,6 +374,8 @@
   char buf[PR_TUNABLE_BUFFER_SIZE];
 
   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
+
+  /* The trailing CRLF will be added by pr_response_send_raw(). */
   pr_response_send_raw("%s", buf);
 }
 
@@ -595,7 +613,6 @@
  */
 
 MODRET facts_mff(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *facts, *ptr;
 
@@ -606,18 +623,16 @@
 
   facts = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -739,7 +754,6 @@
 }
 
 MODRET facts_mfmt(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *timestamp, *ptr;
   int res;
@@ -751,18 +765,16 @@
 
   timestamp = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -820,33 +832,28 @@
   DIR *dirh;
   struct dirent *dent;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
     return PR_ERROR(cmd);
   }
 
-  /* RFC3659 explicitly does NOT support glob characters. */
+  /* RFC3659 explicitly does NOT support glob characters.  So warn about
+   * this, but let the command continue as is.  We don't actually call
+   * glob(3) here, so no expansion will occur.
+   */
   if (strpbrk(decoded_path, "{[*?") != NULL) {
-    pr_log_debug(DEBUG2, MOD_FACTS_VERSION ": unable to handle MLSD command: "
-      "target '%s' contains glob characters", decoded_path);
-    pr_response_add_err(R_550, _("Unable to handle command"));
-    return PR_ERROR(cmd);
+    pr_log_debug(DEBUG9, MOD_FACTS_VERSION ": glob characters in MLSD ('%s') "
+      "ignored", decoded_path);
   }
 
   /* Make sure that the given path is actually a directory. */
@@ -870,11 +877,11 @@
     int xerrno = errno;
 
     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
-      "error reading directory '%s': %s", session.user,
+      "error opening directory '%s': %s", session.user,
       (unsigned long) session.uid, (unsigned long) session.gid,
       decoded_path, strerror(xerrno));
 
-    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
     return PR_ERROR(cmd);
   }
 
@@ -899,16 +906,14 @@
     /* Check that the file can be listed. */
     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
     if (abs_path) {
-      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
       
     } else {
       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
       if (abs_path == NULL)
         abs_path = rel_path;
 
-      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
     }
 
     if (!res || hidden) {
@@ -955,20 +960,15 @@
   const char *path, *decoded_path;
   struct mlinfo info;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
       &hidden)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
@@ -1155,6 +1155,7 @@
 
   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
   pr_feat_add("MFMT");
+  pr_feat_add("TVFS");
 
   facts_mlst_feat_add(session.pool);
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- proftpd.spec	2 Sep 2009 09:56:33 -0000	1.50
+++ proftpd.spec	7 Sep 2009 13:40:46 -0000	1.51
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 4
+%global rpmrel 5
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
+Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -98,6 +99,10 @@ Module to add PostgreSQL support to the 
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
+# Fix MLSD for directories containing shell metacharacters (#521634)
+# (upstream patch)
+%patch3 -p1 -b .mlsd
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -285,6 +290,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
+- Add upstream patch for MLSD with dirnames containing glob chars (#521634)
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
 - New DSO module: mod_exec (#520214)
 



From pghmcfc at fedoraproject.org  Mon Sep  7 13:40:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  7 Sep 2009 13:40:46 +0000 (UTC)
Subject: rpms/proftpd/F-10 proftpd-1.3.2a-mlsd.patch, NONE, 1.1 proftpd.spec,
	1.47, 1.48
Message-ID: <20090907134046.1E22911C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32010/F-10

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2a-mlsd.patch 
Log Message:
Add upstream patch for MLSD with dirnames containing glob chars (#521634)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |  101 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

--- NEW FILE proftpd-1.3.2a-mlsd.patch ---
--- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
+++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
@@ -22,7 +22,7 @@
  * resulting executable, without including the source code for OpenSSL in the
  * source distribution.
  *
- * $Id: mod_facts.c,v 1.13.2.1 2009/04/28 21:17:45 castaglia Exp $
+ * $Id: mod_facts.c,v 1.22 2009/04/09 15:59:38 castaglia Exp $
  */
 
 #include "conf.h"
@@ -227,7 +227,17 @@
     ptr = buf + buflen;
   }
 
-  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
+   * to include an LF at the end; it is appended by pr_response_send_raw().
+   * But MLSD entries DO need the trailing LF, so that it can be converted
+   * into a CRLF sequence by pr_data_xfer().
+   */
+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+
+  } else {
+    snprintf(ptr, bufsz - buflen, " %s", info->path);
+  }
 
   buf[bufsz-1] = '\0';
   buflen = strlen(buf);
@@ -244,11 +254,17 @@
  * channel, wherease MLSD's output is sent via a data transfer, much like
  * LIST or NLST.
  */
-static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
+static char *mlinfo_buf = NULL;
+static size_t mlinfo_bufsz = 0;
 static size_t mlinfo_buflen = 0;
 
 static void facts_mlinfobuf_init(void) {
-  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
+  if (mlinfo_buf == NULL) {
+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
+  }
+
+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
   mlinfo_buflen = 0;
 }
 
@@ -261,11 +277,11 @@
   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
    * mlinfo_buf.
    */
-  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
     (void) facts_mlinfobuf_flush();
   }
 
-  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
   mlinfo_buflen += buflen;
 }
 
@@ -358,6 +374,8 @@
   char buf[PR_TUNABLE_BUFFER_SIZE];
 
   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
+
+  /* The trailing CRLF will be added by pr_response_send_raw(). */
   pr_response_send_raw("%s", buf);
 }
 
@@ -595,7 +613,6 @@
  */
 
 MODRET facts_mff(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *facts, *ptr;
 
@@ -606,18 +623,16 @@
 
   facts = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -739,7 +754,6 @@
 }
 
 MODRET facts_mfmt(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *timestamp, *ptr;
   int res;
@@ -751,18 +765,16 @@
 
   timestamp = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -820,33 +832,28 @@
   DIR *dirh;
   struct dirent *dent;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
     return PR_ERROR(cmd);
   }
 
-  /* RFC3659 explicitly does NOT support glob characters. */
+  /* RFC3659 explicitly does NOT support glob characters.  So warn about
+   * this, but let the command continue as is.  We don't actually call
+   * glob(3) here, so no expansion will occur.
+   */
   if (strpbrk(decoded_path, "{[*?") != NULL) {
-    pr_log_debug(DEBUG2, MOD_FACTS_VERSION ": unable to handle MLSD command: "
-      "target '%s' contains glob characters", decoded_path);
-    pr_response_add_err(R_550, _("Unable to handle command"));
-    return PR_ERROR(cmd);
+    pr_log_debug(DEBUG9, MOD_FACTS_VERSION ": glob characters in MLSD ('%s') "
+      "ignored", decoded_path);
   }
 
   /* Make sure that the given path is actually a directory. */
@@ -870,11 +877,11 @@
     int xerrno = errno;
 
     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
-      "error reading directory '%s': %s", session.user,
+      "error opening directory '%s': %s", session.user,
       (unsigned long) session.uid, (unsigned long) session.gid,
       decoded_path, strerror(xerrno));
 
-    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
     return PR_ERROR(cmd);
   }
 
@@ -899,16 +906,14 @@
     /* Check that the file can be listed. */
     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
     if (abs_path) {
-      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
       
     } else {
       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
       if (abs_path == NULL)
         abs_path = rel_path;
 
-      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
     }
 
     if (!res || hidden) {
@@ -955,20 +960,15 @@
   const char *path, *decoded_path;
   struct mlinfo info;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
       &hidden)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
@@ -1155,6 +1155,7 @@
 
   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
   pr_feat_add("MFMT");
+  pr_feat_add("TVFS");
 
   facts_mlst_feat_add(session.pool);
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- proftpd.spec	2 Sep 2009 09:56:33 -0000	1.47
+++ proftpd.spec	7 Sep 2009 13:40:45 -0000	1.48
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 4
+%global rpmrel 5
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
+Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -98,6 +99,10 @@ Module to add PostgreSQL support to the 
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
+# Fix MLSD for directories containing shell metacharacters (#521634)
+# (upstream patch)
+%patch3 -p1 -b .mlsd
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -285,6 +290,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
+- Add upstream patch for MLSD with dirnames containing glob chars (#521634)
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
 - New DSO module: mod_exec (#520214)
 



From pghmcfc at fedoraproject.org  Mon Sep  7 13:40:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  7 Sep 2009 13:40:46 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd-1.3.2a-mlsd.patch, NONE, 1.1 proftpd.spec,
	1.54, 1.55
Message-ID: <20090907134046.9031B11C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32010/devel

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2a-mlsd.patch 
Log Message:
Add upstream patch for MLSD with dirnames containing glob chars (#521634)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |  101 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

--- NEW FILE proftpd-1.3.2a-mlsd.patch ---
--- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
+++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
@@ -22,7 +22,7 @@
  * resulting executable, without including the source code for OpenSSL in the
  * source distribution.
  *
- * $Id: mod_facts.c,v 1.13.2.1 2009/04/28 21:17:45 castaglia Exp $
+ * $Id: mod_facts.c,v 1.22 2009/04/09 15:59:38 castaglia Exp $
  */
 
 #include "conf.h"
@@ -227,7 +227,17 @@
     ptr = buf + buflen;
   }
 
-  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
+   * to include an LF at the end; it is appended by pr_response_send_raw().
+   * But MLSD entries DO need the trailing LF, so that it can be converted
+   * into a CRLF sequence by pr_data_xfer().
+   */
+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
+
+  } else {
+    snprintf(ptr, bufsz - buflen, " %s", info->path);
+  }
 
   buf[bufsz-1] = '\0';
   buflen = strlen(buf);
@@ -244,11 +254,17 @@
  * channel, wherease MLSD's output is sent via a data transfer, much like
  * LIST or NLST.
  */
-static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
+static char *mlinfo_buf = NULL;
+static size_t mlinfo_bufsz = 0;
 static size_t mlinfo_buflen = 0;
 
 static void facts_mlinfobuf_init(void) {
-  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
+  if (mlinfo_buf == NULL) {
+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
+  }
+
+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
   mlinfo_buflen = 0;
 }
 
@@ -261,11 +277,11 @@
   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
    * mlinfo_buf.
    */
-  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
     (void) facts_mlinfobuf_flush();
   }
 
-  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
   mlinfo_buflen += buflen;
 }
 
@@ -358,6 +374,8 @@
   char buf[PR_TUNABLE_BUFFER_SIZE];
 
   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
+
+  /* The trailing CRLF will be added by pr_response_send_raw(). */
   pr_response_send_raw("%s", buf);
 }
 
@@ -595,7 +613,6 @@
  */
 
 MODRET facts_mff(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *facts, *ptr;
 
@@ -606,18 +623,16 @@
 
   facts = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -739,7 +754,6 @@
 }
 
 MODRET facts_mfmt(cmd_rec *cmd) {
-  register unsigned int i;
   const char *path, *decoded_path;
   char *timestamp, *ptr;
   int res;
@@ -751,18 +765,16 @@
 
   timestamp = cmd->argv[1];
 
-  /* The path can contain spaces; it is thus the concatenation of all of the
-   * arguments after the timestamp.
+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
+   * find the FIRST space in cmd->arg; the path is everything past that space.
    */
-  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
-  for (i = 3; i < cmd->argc; i++) {
-    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
-  }
+  ptr = strchr(cmd->arg, ' ');
+  path = pstrdup(cmd->tmp_pool, ptr + 1);
 
   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
@@ -820,33 +832,28 @@
   DIR *dirh;
   struct dirent *dent;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-      NULL)) {
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
     pr_response_add_err(R_550, _("Unable to handle command"));
     return PR_ERROR(cmd);
   }
 
-  /* RFC3659 explicitly does NOT support glob characters. */
+  /* RFC3659 explicitly does NOT support glob characters.  So warn about
+   * this, but let the command continue as is.  We don't actually call
+   * glob(3) here, so no expansion will occur.
+   */
   if (strpbrk(decoded_path, "{[*?") != NULL) {
-    pr_log_debug(DEBUG2, MOD_FACTS_VERSION ": unable to handle MLSD command: "
-      "target '%s' contains glob characters", decoded_path);
-    pr_response_add_err(R_550, _("Unable to handle command"));
-    return PR_ERROR(cmd);
+    pr_log_debug(DEBUG9, MOD_FACTS_VERSION ": glob characters in MLSD ('%s') "
+      "ignored", decoded_path);
   }
 
   /* Make sure that the given path is actually a directory. */
@@ -870,11 +877,11 @@
     int xerrno = errno;
 
     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
-      "error reading directory '%s': %s", session.user,
+      "error opening directory '%s': %s", session.user,
       (unsigned long) session.uid, (unsigned long) session.gid,
       decoded_path, strerror(xerrno));
 
-    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
     return PR_ERROR(cmd);
   }
 
@@ -899,16 +906,14 @@
     /* Check that the file can be listed. */
     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
     if (abs_path) {
-      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
       
     } else {
       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
       if (abs_path == NULL)
         abs_path = rel_path;
 
-      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
-        &hidden);
+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
     }
 
     if (!res || hidden) {
@@ -955,20 +960,15 @@
   const char *path, *decoded_path;
   struct mlinfo info;
 
-  if (cmd->argc > 2) {
-    pr_response_add_err(R_501, _("Invalid number of arguments"));
-    return PR_ERROR(cmd);
-  }
-
   if (cmd->argc != 1) {
-    path = cmd->argv[1];
+    path = pstrdup(cmd->tmp_pool, cmd->arg);
     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
 
   } else {
     decoded_path = path = pr_fs_getcwd();
   }
 
-  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
       &hidden)) {
     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
       cmd->argv[0]);
@@ -1155,6 +1155,7 @@
 
   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
   pr_feat_add("MFMT");
+  pr_feat_add("TVFS");
 
   facts_mlst_feat_add(session.pool);
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- proftpd.spec	2 Sep 2009 09:44:31 -0000	1.54
+++ proftpd.spec	7 Sep 2009 13:40:46 -0000	1.55
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 4
+%global rpmrel 5
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
+Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -98,6 +99,10 @@ Module to add PostgreSQL support to the 
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
+# Fix MLSD for directories containing shell metacharacters (#521634)
+# (upstream patch)
+%patch3 -p1 -b .mlsd
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -285,6 +290,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
+- Add upstream patch for MLSD with dirnames containing glob chars (#521634)
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
 - New DSO module: mod_exec (#520214)
 



From chitlesh at fedoraproject.org  Mon Sep  7 13:43:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Sep 2009 13:43:40 +0000 (UTC)
Subject: rpms/dinotrace/EL-5 dinotrace.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090907134340.EA87C11C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/dinotrace/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv448/EL-5

Modified Files:
	dinotrace.spec import.log 
Log Message:
fixed built for EL-5


Index: dinotrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dinotrace/EL-5/dinotrace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dinotrace.spec	2 Aug 2009 21:55:02 -0000	1.1
+++ dinotrace.spec	7 Sep 2009 13:43:40 -0000	1.2
@@ -1,7 +1,7 @@
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
 %if %($(pkg-config emacs) ; echo $?)
-%define emacs_version  22.2
+%define emacs_version  21.0
 %define emacs_lispdir  %{_datadir}/emacs/site-lisp
 %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
 %else
@@ -12,7 +12,7 @@
 
 Name:           dinotrace
 Version:        9.4a
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Waveform viewer for electronics
 
 URL:            http://www.veripool.org/wiki/dinotrace
@@ -26,6 +26,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  lesstif-devel
 %else
 BuildRequires:  openmotif-devel
+BuildRequires:  pkgconfig
 %endif
 
 BuildRequires:  desktop-file-utils
@@ -55,7 +56,7 @@ Summary:           Elisp source files fo
 Group:             Development/Libraries
 BuildRequires:     emacs-el
 BuildRequires:     emacs
-Requires:          emacs(bin) >= %{emacs_version}
+Requires:          emacs >= %{emacs_version}
 Requires:          %{name} = %{version}-%{release}
 %if 0%{?rhel}
 BuildRequires:     emacs-verilog-mode
@@ -158,6 +159,9 @@ fi
 %{emacs_startdir}/%{name}-init.el
 
 %Changelog
+* Sat Aug 15 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-5
+- Added pkgconfig as BR for EL-5
+
 * Sun Aug 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-4
 - Fixing buildrequires for EL-5 branch
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dinotrace/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Aug 2009 21:55:02 -0000	1.1
+++ import.log	7 Sep 2009 13:43:40 -0000	1.2
@@ -1 +1,2 @@
 dinotrace-9_4a-4_fc11:EL-5:dinotrace-9.4a-4.fc11.src.rpm:1249250007
+dinotrace-9_4a-5_fc11:EL-5:dinotrace-9.4a-5.fc11.src.rpm:1252330836



From chitlesh at fedoraproject.org  Mon Sep  7 13:44:23 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Sep 2009 13:44:23 +0000 (UTC)
Subject: rpms/dinotrace/devel dinotrace.spec,1.3,1.4 import.log,1.2,1.3
Message-ID: <20090907134423.8782411C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/dinotrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv790/devel

Modified Files:
	dinotrace.spec import.log 
Log Message:
fixed built for EL-5


Index: dinotrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dinotrace/devel/dinotrace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dinotrace.spec	24 Jul 2009 20:17:34 -0000	1.3
+++ dinotrace.spec	7 Sep 2009 13:44:23 -0000	1.4
@@ -1,7 +1,7 @@
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
 %if %($(pkg-config emacs) ; echo $?)
-%define emacs_version  22.2
+%define emacs_version  21.0
 %define emacs_lispdir  %{_datadir}/emacs/site-lisp
 %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
 %else
@@ -12,10 +12,10 @@
 
 Name:           dinotrace
 Version:        9.4a
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Waveform viewer for electronics
 
-Url:            http://www.veripool.org/wiki/dinotrace
+URL:            http://www.veripool.org/wiki/dinotrace
 Source0:        http://www.veripool.com/ftp/%{name}-%{version}.tgz
 
 License:        GPLv3+
@@ -26,7 +26,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  lesstif-devel
 %else
 BuildRequires:  openmotif-devel
-Requires:       emacs-verilog-mode
+BuildRequires:  pkgconfig
 %endif
 
 BuildRequires:  desktop-file-utils
@@ -56,8 +56,13 @@ Summary:           Elisp source files fo
 Group:             Development/Libraries
 BuildRequires:     emacs-el
 BuildRequires:     emacs
-Requires:          emacs(bin) >= %{emacs_version}
+Requires:          emacs >= %{emacs_version}
 Requires:          %{name} = %{version}-%{release}
+%if 0%{?rhel}
+BuildRequires:     emacs-verilog-mode
+Requires:          emacs-verilog-mode
+%endif
+
 
 %description -n emacs-%{name}
 This package provides emacs support for %{name}
@@ -80,7 +85,7 @@ cat > %{name}.desktop << EOF
 Encoding=UTF-8
 Name=Waveform viewer
 GenericName=Dinotrace
-Comment=Waveform viewer for electronics
+Comment=Dinotrace which can be used with emacs for advance design
 Type=Application
 Exec=dinotrace
 Icon=utilities-system-monitor
@@ -154,6 +159,12 @@ fi
 %{emacs_startdir}/%{name}-init.el
 
 %Changelog
+* Sat Aug 15 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-5
+- Added pkgconfig as BR for EL-5
+
+* Sun Aug 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-4
+- Fixing buildrequires for EL-5 branch
+
 * Wed Jun 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-3
 - fixed sub package requires
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dinotrace/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Jun 2009 08:43:03 -0000	1.2
+++ import.log	7 Sep 2009 13:44:23 -0000	1.3
@@ -1,2 +1,3 @@
 dinotrace-9_4a-2_fc10:HEAD:dinotrace-9.4a-2.fc10.src.rpm:1243418062
 dinotrace-9_4a-3_fc11:HEAD:dinotrace-9.4a-3.fc11.src.rpm:1244623354
+dinotrace-9_4a-5_fc11:HEAD:dinotrace-9.4a-5.fc11.src.rpm:1252330914



From lkundrak at fedoraproject.org  Mon Sep  7 13:51:36 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 13:51:36 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec,1.83,1.84
Message-ID: <20090907135136.BCE4611C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2798

Modified Files:
	inkscape.spec 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
- Move inkview man page to -view subpackage (#515358)
- Add license, etc. to main package



Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- inkscape.spec	7 Sep 2009 12:24:08 -0000	1.83
+++ inkscape.spec	7 Sep 2009 13:51:36 -0000	1.84
@@ -2,7 +2,7 @@
 
 Name:           inkscape
 Version:        0.47
-Release:        0.15.pre2.20090907svn%{?dist}
+Release:        0.16.pre2.20090907svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -214,13 +214,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-inkscape.desktop
 %{_datadir}/pixmaps/inkscape.png
 %{_mandir}/man1/inkscape.1*
-%{_mandir}/man1/inkview.1*
 %{_mandir}/fr/man1/inkscape.1*
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %files view
 %defattr(-,root,root,-)
 %{_bindir}/inkview
+%{_mandir}/man1/inkview.1*
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
@@ -232,6 +233,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
+- Move inkview man page to -view subpackage (#515358)
+- Add license, etc. to main package
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre2.20090907svn
 - Update to a post-pre2 snapshot
 



From lkundrak at fedoraproject.org  Mon Sep  7 13:55:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Sep 2009 13:55:13 +0000 (UTC)
Subject: rpms/inkscape/F-11 import.log, 1.1, 1.2 inkscape.spec, 1.77,
	1.78 sources, 1.25, 1.26
Message-ID: <20090907135513.8388311C00DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3657/F-11

Modified Files:
	import.log inkscape.spec sources 
Log Message:
Merge from devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Aug 2009 05:16:34 -0000	1.1
+++ import.log	7 Sep 2009 13:55:13 -0000	1.2
@@ -1 +1,2 @@
 inkscape-0_47-0_15_pre1_20090810svn_fc12:F-11:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249880790
+inkscape-0_47-0_16_pre2_20090907svn_fc12:F-11:inkscape-0.47-0.16.pre2.20090907svn.fc12.src.rpm:1252331611


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/inkscape.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- inkscape.spec	10 Aug 2009 05:16:34 -0000	1.77
+++ inkscape.spec	7 Sep 2009 13:55:13 -0000	1.78
@@ -2,14 +2,14 @@
 
 Name:           inkscape
 Version:        0.47
-Release:        0.15.pre1.20090810svn%{?dist}
+Release:        0.16.pre2.20090907svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22040 inkscape
+# svn export -r22202 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22202 inkscape
 # tar cf - inkscape |xz -9 -c >inkscape.tar.xz
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
@@ -214,13 +214,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-inkscape.desktop
 %{_datadir}/pixmaps/inkscape.png
 %{_mandir}/man1/inkscape.1*
-%{_mandir}/man1/inkview.1*
 %{_mandir}/fr/man1/inkscape.1*
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %files view
 %defattr(-,root,root,-)
 %{_bindir}/inkview
+%{_mandir}/man1/inkview.1*
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
@@ -232,6 +233,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
+- Move inkview man page to -view subpackage (#515358)
+- Add license, etc. to main package
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre2.20090907svn
+- Update to a post-pre2 snapshot
+
 * Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
 - Update to a post-pre1 snapshot
 - Drop upstreamed CRC32 fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	10 Aug 2009 05:30:04 -0000	1.25
+++ sources	7 Sep 2009 13:55:13 -0000	1.26
@@ -1 +1 @@
-13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz
+2a5d70e3924f049a5d5b43cd2075cd8c  inkscape.tar.xz



From than at fedoraproject.org  Mon Sep  7 14:00:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Sep 2009 14:00:32 +0000 (UTC)
Subject: rpms/efax/devel efax-0.9a-001114-crash.patch, NONE, 1.1 efax.spec, 
	1.26, 1.27
Message-ID: <20090907140032.1D45C11C0419@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/efax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4937

Modified Files:
	efax.spec 
Added Files:
	efax-0.9a-001114-crash.patch 
Log Message:
* fix a crash in efix



efax-0.9a-001114-crash.patch:
 efix.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE efax-0.9a-001114-crash.patch ---
diff -up efax-0.9a-001114/efix.c.orig efax-0.9a-001114/efix.c
--- efax-0.9a-001114/efix.c.orig	2009-09-07 15:55:23.000000000 +0200
+++ efax-0.9a-001114/efix.c	2009-09-07 15:56:34.000000000 +0200
@@ -235,7 +235,8 @@ int main( int argc, char **argv)
   float				/* values used: */
     xres = 0, yres = 0, xsz = 0, ysz = 0 ;
 
-  IFILE ifile, ovfile ;
+  IFILE ifile = { 0 };
+  IFILE ovfile = { 0 };
   OFILE ofile ;
 
   char **ifnames,  *ovfnames [ 2 ] = { 0, 0 } ;


Index: efax.spec
===================================================================
RCS file: /cvs/extras/rpms/efax/devel/efax.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- efax.spec	24 Jul 2009 21:03:59 -0000	1.26
+++ efax.spec	7 Sep 2009 14:00:31 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A program for faxing using a Class 1, 2 or 2.0 fax modem.
 Name: efax
 Version: 0.9a
-Release: 5.001114%{?dist}
+Release: 6.001114%{?dist}
 License: GPLv2+
 Group: Applications/Communications
 Url: http://www.cce.com/efax/
@@ -15,6 +15,7 @@ Patch6: efax-0.9-misc.patch
 Patch7: efax-0.9-viewcmd.patch
 Patch8: efax-0.9-quote.patch
 Patch9: efax-0.9-msg-va_list.patch
+Patch10: efax-0.9a-001114-crash.patch
 
 ExcludeArch: s390 s390x
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,6 +41,7 @@ Class 1, 2 or 2.0 fax modem.
 %patch7 -p1 -b .viewcmd
 %patch8 -p1 -b .quote
 %patch9 -p1 -b .msg-va_list
+%patch10 -p1 -b .crash
 
 %build
 make RPM_OPT_FLAGS="-ansi $RPM_OPT_FLAGS"
@@ -65,6 +67,9 @@ rm -rf %{buildroot}
 %dir %{_localstatedir}/log/fax
 
 %changelog
+* Mon Sep 07 2009 Than Ngo <than at redhat.com> - 0.9a-6.001114
+- fix a crash in efix
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9a-5.001114
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Mon Sep  7 14:10:02 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 14:10:02 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.57, 1.58 gnome-media.spec,
	1.177, 1.178 sources, 1.56, 1.57
Message-ID: <20090907141002.9608611C043D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9212

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
- Update to 2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	13 Aug 2009 22:51:32 -0000	1.57
+++ .cvsignore	7 Sep 2009 14:10:02 -0000	1.58
@@ -1 +1 @@
-gnome-media-2.27.90.fix.tar.bz2
+gnome-media-2.27.91.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- gnome-media.spec	13 Aug 2009 22:51:32 -0000	1.177
+++ gnome-media.spec	7 Sep 2009 14:10:02 -0000	1.178
@@ -13,7 +13,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.27.90.fix
+Version:        2.27.91
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
@@ -314,6 +314,9 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Thu Aug 13 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90.fix-1
 - Update to 2.27.90.fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	13 Aug 2009 22:51:32 -0000	1.56
+++ sources	7 Sep 2009 14:10:02 -0000	1.57
@@ -1 +1 @@
-b2a95ada8b70385ce965338a152242e9  gnome-media-2.27.90.fix.tar.bz2
+56a5c6ba6c67b3f6efd2920404febcc2  gnome-media-2.27.91.tar.bz2



From salimma at fedoraproject.org  Mon Sep  7 14:11:08 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 14:11:08 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.21,1.22
Message-ID: <20090907141108.AC07311C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9408

Modified Files:
	llvm.spec 
Log Message:
Only fix permissions on real files, not symlinks



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- llvm.spec	7 Sep 2009 13:07:34 -0000	1.21
+++ llvm.spec	7 Sep 2009 14:11:08 -0000	1.22
@@ -198,7 +198,7 @@ rm %{buildroot}%{_bindir}/gcc{as,ld}
 sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
   %{buildroot}%{_bindir}/llvm-config
 
-chmod -x %{buildroot}%{_libdir}/*/*.a
+chmod -x %{buildroot}%{_libdir}/%{name}/*.a
 
 # remove documentation makefiles:
 # they require the build directory to work



From rvokal at fedoraproject.org  Mon Sep  7 14:11:44 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon,  7 Sep 2009 14:11:44 +0000 (UTC)
Subject: rpms/finger/devel bsd-finger-0.17-init-realname.patch, NONE,
	1.1 finger.spec, 1.29, 1.30
Message-ID: <20090907141144.2004411C00DB@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/finger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9683

Modified Files:
	finger.spec 
Added Files:
	bsd-finger-0.17-init-realname.patch 
Log Message:
- init realname fix (#520203)

bsd-finger-0.17-init-realname.patch:
 util.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE bsd-finger-0.17-init-realname.patch ---
--- bsd-finger-0.17-orig/finger/util.c	2009-08-24 19:14:49.145387327 +0300
+++ bsd-finger-0.17/finger/util.c	2009-08-29 00:47:59.661649249 +0300
@@ -98,6 +98,7 @@
 
 	pn->uid = pw->pw_uid;
 	pn->name = strdup(pw->pw_name);
+	pn->realname = "";
 	pn->dir = strdup(pw->pw_dir);
 	pn->shell = strdup(pw->pw_shell);
 


Index: finger.spec
===================================================================
RCS file: /cvs/extras/rpms/finger/devel/finger.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- finger.spec	24 Jul 2009 22:47:31 -0000	1.29
+++ finger.spec	7 Sep 2009 14:11:43 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: The finger client
 Name: finger
 Version: 0.17
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch7: bsd-finger-0.17-typo.patch
 Patch8: bsd-finger-0.17-strip.patch
 Patch9: bsd-finger-0.17-utmp.patch
 Patch10: bsd-finger-wide-char-support5.patch
+Patch11: bsd-finger-0.17-init-realname.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glibc-devel
 
@@ -55,6 +56,7 @@ and you'd like finger information to be 
 %patch8 -p1 -b .strip
 %patch9 -p1 -b .utmp
 %patch10 -p1 -b .widechar
+%patch11 -p1 
 
 %build
 sh configure --enable-ipv6
@@ -96,6 +98,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/fingerd.8*
 
 %changelog
+* Mon Sep  7 2009 Radek Vokal <rvokal at redhat.com> - 0.17-39
+- init realname fix (#520203)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Mon Sep  7 14:14:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 14:14:53 +0000 (UTC)
Subject: rpms/gnome-media/F-11 .cvsignore, 1.53, 1.54 gnome-media.spec, 1.174,
	1.175 sources, 1.52, 1.53
Message-ID: <20090907141453.602DB11C00DB@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-serv10419

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
- Update to 2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	13 Aug 2009 23:22:54 -0000	1.53
+++ .cvsignore	7 Sep 2009 14:14:53 -0000	1.54
@@ -1 +1 @@
-gnome-media-2.27.90.fix.tar.bz2
+gnome-media-2.27.91.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- gnome-media.spec	13 Aug 2009 23:22:54 -0000	1.174
+++ gnome-media.spec	7 Sep 2009 14:14:53 -0000	1.175
@@ -13,7 +13,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.27.90.fix
+Version:        2.27.91
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
@@ -247,6 +247,9 @@ scrollkeeper-update -q || :
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90.fix-1
 - Update to 2.27.90.fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	13 Aug 2009 23:22:54 -0000	1.52
+++ sources	7 Sep 2009 14:14:53 -0000	1.53
@@ -1 +1 @@
-b2a95ada8b70385ce965338a152242e9  gnome-media-2.27.90.fix.tar.bz2
+56a5c6ba6c67b3f6efd2920404febcc2  gnome-media-2.27.91.tar.bz2



From markmc at fedoraproject.org  Mon Sep  7 14:22:20 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  7 Sep 2009 14:22:20 +0000 (UTC)
Subject: rpms/qemu/devel qemu-add-ksm-support.patch, 1.2,
	1.3 qemu-allow-pulseaudio-to-be-the-default.patch, 1.1,
	1.2 qemu-bios-bigger-roms.patch, 1.10,
	1.11 qemu-fix-linux-user-build-on-ppc.patch, 1.6,
	1.7 qemu-fix-msix-error-handling-on-older-kernels.patch, 1.1,
	1.2 qemu-fix-no-kvm-segfault.patch, 1.2, 1.3 qemu.spec, 1.125,
	1.126 sources, 1.20, 1.21 qemu-fix-extboot-signrom.patch, 1.2,
	NONE qemu-fix-optionrom-install.patch, 1.2,
	NONE qemu-fix-vnet-hdr-slirp-bustage.patch, 1.1, NONE
Message-ID: <20090907142220.8728311C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11939

Modified Files:
	qemu-add-ksm-support.patch 
	qemu-allow-pulseaudio-to-be-the-default.patch 
	qemu-bios-bigger-roms.patch 
	qemu-fix-linux-user-build-on-ppc.patch 
	qemu-fix-msix-error-handling-on-older-kernels.patch 
	qemu-fix-no-kvm-segfault.patch qemu.spec sources 
Removed Files:
	qemu-fix-extboot-signrom.patch 
	qemu-fix-optionrom-install.patch 
	qemu-fix-vnet-hdr-slirp-bustage.patch 
Log Message:
* Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-1
- Update to qemu-kvm-0.11.0-rc2
- Drop upstreamed patches
- extboot install now fixed upstream
- Re-place TCG init fix (#516543) with the one gone upstream


qemu-add-ksm-support.patch:
 exec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: qemu-add-ksm-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-ksm-support.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-add-ksm-support.patch	4 Aug 2009 14:48:15 -0000	1.2
+++ qemu-add-ksm-support.patch	7 Sep 2009 14:22:19 -0000	1.3
@@ -1,4 +1,4 @@
-From 729b681039015c718e476b8f294480b179ed726d Mon Sep 17 00:00:00 2001
+From 4d64a615f69458c202561fcc01e8e0505fa46ee9 Mon Sep 17 00:00:00 2001
 From: Izik Eidus <ieidus at redhat.com>
 Date: Tue, 28 Jul 2009 19:14:26 +0300
 Subject: [PATCH] kvm userspace: ksm support
@@ -13,10 +13,10 @@ Fedora-patch: qemu-add-ksm-support.patch
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/exec.c b/exec.c
-index 2134697..88bcff5 100644
+index 0655b4b..b93f7b8 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -2578,6 +2578,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
+@@ -2579,6 +2579,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
      new_block->host = file_ram_alloc(size, mem_path);
      if (!new_block->host) {
          new_block->host = qemu_vmalloc(size);

qemu-allow-pulseaudio-to-be-the-default.patch:
 paaudio.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: qemu-allow-pulseaudio-to-be-the-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-allow-pulseaudio-to-be-the-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-allow-pulseaudio-to-be-the-default.patch	4 Sep 2009 10:34:32 -0000	1.1
+++ qemu-allow-pulseaudio-to-be-the-default.patch	7 Sep 2009 14:22:20 -0000	1.2
@@ -1,4 +1,4 @@
-From 01c3198a8f0d933c9b219acaf087c675d729bbf7 Mon Sep 17 00:00:00 2001
+From 4f5019c88e710be0aa597c81017b683d494c532d Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 4 Sep 2009 11:24:03 +0100
 Subject: [PATCH] Allow pulseaudio backend to be the default

qemu-bios-bigger-roms.patch:
 rombios.c |   34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qemu-bios-bigger-roms.patch	4 Aug 2009 14:48:15 -0000	1.10
+++ qemu-bios-bigger-roms.patch	7 Sep 2009 14:22:20 -0000	1.11
@@ -1,4 +1,4 @@
-From 7f871498235ac7591bd4398a745735081290c1a2 Mon Sep 17 00:00:00 2001
+From f751c8937a81116469149357359c767a71ee8ebd Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:31:41 +0100
 Subject: [PATCH] compute checksum for roms bigger than a segment

qemu-fix-linux-user-build-on-ppc.patch:
 elf.h                |    2 ++
 linux-user/elfload.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: qemu-fix-linux-user-build-on-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-linux-user-build-on-ppc.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qemu-fix-linux-user-build-on-ppc.patch	4 Aug 2009 14:48:16 -0000	1.6
+++ qemu-fix-linux-user-build-on-ppc.patch	7 Sep 2009 14:22:20 -0000	1.7
@@ -1,4 +1,4 @@
-From 1cdc8e879b1e2140cc48c1a76718c336f42b0a7d Mon Sep 17 00:00:00 2001
+From 22c6c8c5dfe66a5e7f81dd4a296e1b2b245c5d28 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 29 Jun 2009 14:49:03 +0100
 Subject: [PATCH] Fix linux-user build on ppc
@@ -58,7 +58,7 @@ index b042002..14f8aa1 100644
  /* ARM specific declarations */
  
 diff --git a/linux-user/elfload.c b/linux-user/elfload.c
-index d31cca7..3ccfdda 100644
+index 3a8268b..d283f73 100644
 --- a/linux-user/elfload.c
 +++ b/linux-user/elfload.c
 @@ -134,6 +134,7 @@ static inline void init_thread(struct target_pt_regs *regs, struct image_info *i

qemu-fix-msix-error-handling-on-older-kernels.patch:
 msix.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: qemu-fix-msix-error-handling-on-older-kernels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-msix-error-handling-on-older-kernels.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-msix-error-handling-on-older-kernels.patch	7 Sep 2009 07:02:08 -0000	1.1
+++ qemu-fix-msix-error-handling-on-older-kernels.patch	7 Sep 2009 14:22:20 -0000	1.2
@@ -1,4 +1,4 @@
-From 057fb1b4b227bc49aa00b08da5f177b50c020693 Mon Sep 17 00:00:00 2001
+From 0b341eda83cd2f01134d5b13300d97c07a3abced Mon Sep 17 00:00:00 2001
 From: Michael S. Tsirkin <mst at redhat.com>
 Date: Thu, 23 Jul 2009 16:34:13 +0300
 Subject: [PATCH] Fix error handling in msix vector add

qemu-fix-no-kvm-segfault.patch:
 vl.c |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Index: qemu-fix-no-kvm-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-no-kvm-segfault.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-fix-no-kvm-segfault.patch	4 Sep 2009 07:22:09 -0000	1.2
+++ qemu-fix-no-kvm-segfault.patch	7 Sep 2009 14:22:20 -0000	1.3
@@ -1,37 +1,78 @@
-From aa1620047bb49079f4c114326d43fb9aa7a26065 Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones at redhat.com>
-Date: Thu, 20 Aug 2009 13:52:20 +0100
-Subject: [PATCH] Workaround segfault when qemu-kvm runs inside a VM (RHBZ#516543).
-
-Regression was introduced by this commit:
-http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commitdiff;h=b8083e930efc1ee85a7ad7e700dbd0f52ebb32dd
-
-Upstream discussion:
-http://www.mail-archive.com/kvm at vger.kernel.org/msg19890.html
-
-Note: NOT UPSTREAM and this is something of a hack.  Upstream are
-still debating how they really want to fix this.
-
-Signed-off-by: Richard Jones <rjones at redhat.com>
+From 00782050707fbb999bfffe722794490d2211a0a9 Mon Sep 17 00:00:00 2001
+From: Dustin Kirkland <kirkland at canonical.com>
+Date: Fri, 4 Sep 2009 14:38:30 -0500
+Subject: [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm
+
+qemu-kvm segfaults on systems without access to /dev/kvm.
+The global kvm_allowed is being set too late in vl.c.
+
+This patch moves the kvm initialization a bit higher in the
+vl.c main, just after the daemonize fork.
+
+This fix is intended to be a short term solution, solving the
+segfaults.
+
+In the longer term, the suggested approach requires a bit more
+development and testing:
+ * If no arg given          => try kvm, try kqemu, try tcg
+ * If --accelmode arg given => try $arg, and fail if unavailable
+
+(cherry picked from commit c06b44bfc9814930b6a94db7bbeb3be1cd39c0d2)
+
+Signed-off-by: Dustin Kirkland <kirkland at canonical.com>
+Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
+Signed-off-by: Mark McLoughlin <markmc at redhat.com>
 Fedora-patch: qemu-fix-no-kvm-segfault.patch
 ---
- exec.c |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ vl.c |   28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/exec.c b/exec.c
-index 88bcff5..721fcff 100644
---- a/exec.c
-+++ b/exec.c
-@@ -421,9 +421,6 @@ static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
+diff --git a/vl.c b/vl.c
+index db75470..26bced8 100644
+--- a/vl.c
++++ b/vl.c
+@@ -5831,6 +5831,20 @@ int main(int argc, char **argv, char **envp)
+     }
+ #endif
+ 
++    if (kvm_enabled()) {
++        int ret;
++
++        ret = kvm_init(smp_cpus);
++        if (ret < 0) {
++#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION)
++            fprintf(stderr, "failed to initialize KVM\n");
++            exit(1);
++#endif
++            fprintf(stderr, "Could not initialize KVM, will disable KVM support\n");
++            kvm_allowed = 0;
++        }
++    }
++
+ #ifdef CONFIG_KQEMU
+     if (smp_cpus > 1)
+         kqemu_allowed = 0;
+@@ -6002,20 +6016,6 @@ int main(int argc, char **argv, char **envp)
+         }
+     }
  
- static void code_gen_alloc(unsigned long tb_size)
- {
--    if (kvm_enabled())
--        return;
+-    if (kvm_enabled()) {
+-        int ret;
+-
+-        ret = kvm_init(smp_cpus);
+-        if (ret < 0) {
+-#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION)
+-            fprintf(stderr, "failed to initialize KVM\n");
+-            exit(1);
+-#endif
+-            fprintf(stderr, "Could not initialize KVM, will disable KVM support\n");
+-	     kvm_allowed = 0;
+-        }
+-    }
 -
- #ifdef USE_STATIC_CODE_GEN_BUFFER
-     code_gen_buffer = static_code_gen_buffer;
-     code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE;
+     if (monitor_device) {
+         monitor_hd = qemu_chr_open("monitor", monitor_device, NULL);
+         if (!monitor_hd) {
 -- 
 1.6.2.5
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- qemu.spec	7 Sep 2009 07:02:08 -0000	1.125
+++ qemu.spec	7 Sep 2009 14:22:20 -0000	1.126
@@ -1,10 +1,9 @@
-%define kvmvertag  rc1
-%define kvmverfull kvm-0.11.0-rc1
+%define kvmverfull kvm-0.11.0-rc2
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10.91
-Release: 0.10.%{kvmvertag}%{?dist}
+Version: 0.10.92
+Release: 1%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -22,26 +21,17 @@ Patch01: qemu-bios-bigger-roms.patch
 # Works around broken linux-user build on ppc
 Patch02: qemu-fix-linux-user-build-on-ppc.patch
 
-# Make sure multiboot.bin/extboot.bin gets installed
-Patch03: qemu-fix-optionrom-install.patch
+# Allow the pulseudio backend to be the default
+Patch03: qemu-allow-pulseaudio-to-be-the-default.patch
 
 # Add KSM support - see https://fedoraproject.org/wiki/Features/KSM
 Patch04: qemu-add-ksm-support.patch
 
-# Fix extboot checksum (bug #514899)
-Patch05: qemu-fix-extboot-signrom.patch
-
-# Fix virtio_net with -net user (bug #516022)
-Patch06: qemu-fix-vnet-hdr-slirp-bustage.patch
+# Fix MSI-X error handling on older kernels (#519787)
+Patch05: qemu-fix-msix-error-handling-on-older-kernels.patch
 
 # Fix segfault when qemu-kvm is invoked inside a VM (bug #516543)
-Patch07: qemu-fix-no-kvm-segfault.patch
-
-# Allow the pulseudio backend to be the default
-Patch08: qemu-allow-pulseaudio-to-be-the-default.patch
-
-# Fix MSI-X error handling on older kernels (#519787)
-Patch09: qemu-fix-msix-error-handling-on-older-kernels.patch
+Patch06: qemu-fix-no-kvm-segfault.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -229,9 +219,6 @@ such as kvmtrace and kvm_stat.
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -496,6 +483,12 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-1
+- Update to qemu-kvm-0.11.0-rc2
+- Drop upstreamed patches
+- extboot install now fixed upstream
+- Re-place TCG init fix (#516543) with the one gone upstream
+
 * Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.10.rc1
 - Fix MSI-X error handling on older kernels (#519787)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 14:48:16 -0000	1.20
+++ sources	7 Sep 2009 14:22:20 -0000	1.21
@@ -1 +1 @@
-bef21a81a3e81cfbaf92e9f2c4219575  qemu-kvm-0.11.0-rc1.tar.gz
+35294f8c77250eae6ef48c713fe92803  qemu-kvm-0.11.0-rc2.tar.gz


--- qemu-fix-extboot-signrom.patch DELETED ---


--- qemu-fix-optionrom-install.patch DELETED ---


--- qemu-fix-vnet-hdr-slirp-bustage.patch DELETED ---



From michich at fedoraproject.org  Mon Sep  7 14:26:22 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon,  7 Sep 2009 14:26:22 +0000 (UTC)
Subject: rpms/jabbim/devel .cvsignore, 1.15, 1.16 jabbim.spec, 1.32,
	1.33 sources, 1.24,
	1.25 jabbim-0.4-fix-rosterStyle-preferences.diff, 1.1, NONE
Message-ID: <20090907142622.E6ED411C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13055

Modified Files:
	.cvsignore jabbim.spec sources 
Removed Files:
	jabbim-0.4-fix-rosterStyle-preferences.diff 
Log Message:
* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
- Update to SVN rev. 4223:
  - fixes chat with contacts who have non-ASCII User Mood string
  - various other bugfixes
  - new Jabber Disk Manager - supports directories
- Dropped jabbim-0.4-fix-rosterStyle-preferences.diff.
- Compress tarball with xz.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	13 Apr 2009 14:01:03 -0000	1.15
+++ .cvsignore	7 Sep 2009 14:26:22 -0000	1.16
@@ -1 +1 @@
-jabbim-svn20090408.tar.bz2
+jabbim-svn20090907.tar.xz


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- jabbim.spec	25 Jul 2009 03:45:47 -0000	1.32
+++ jabbim.spec	7 Sep 2009 14:26:22 -0000	1.33
@@ -1,8 +1,8 @@
-%global	svnrev	4103
-%global	svndate	20090408
+%global	svnrev	4223
+%global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.6.svn%{svndate}%{?dist}
+Release:	0.7.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -10,10 +10,9 @@ License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
 # svn export -r %{svnrev} svn://dev.jabbim.cz/jabbim/trunk jabbim-svn%{svndate}
-# tar -cjf jabbim-svn%{svndate}.tar.bz2 jabbim-svn%{svndate}/
-Source0:	jabbim-svn%{svndate}.tar.bz2
+# tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
+Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
-Patch1:		jabbim-0.4-fix-rosterStyle-preferences.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,7 +41,6 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
-%patch1 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
 
@@ -98,6 +96,14 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
+- Update to SVN rev. 4223:
+  - fixes chat with contacts who have non-ASCII User Mood string
+  - various other bugfixes
+  - new Jabber Disk Manager - supports directories
+- Dropped jabbim-0.4-fix-rosterStyle-preferences.diff.
+- Compress tarball with xz.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-0.6.svn20090408
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	13 Apr 2009 14:01:03 -0000	1.24
+++ sources	7 Sep 2009 14:26:22 -0000	1.25
@@ -1 +1 @@
-9405f481a8a06060fbc4cb909e54d584  jabbim-svn20090408.tar.bz2
+ceb797ba531211ccde339172da4f040d  jabbim-svn20090907.tar.xz


--- jabbim-0.4-fix-rosterStyle-preferences.diff DELETED ---



From chitlesh at fedoraproject.org  Mon Sep  7 14:31:14 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Sep 2009 14:31:14 +0000 (UTC)
Subject: rpms/tkgate/EL-5 import.log, NONE, 1.1 tkgate-2.0-doc.patch, NONE, 
	1.1 tkgate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090907143114.B3A4E11C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/tkgate/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14880/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tkgate-2.0-doc.patch tkgate.spec 
Log Message:
EL-5 tkgate first push


--- NEW FILE import.log ---
tkgate-2_0-7_beta9_fc11:EL-5:tkgate-2.0-7.beta9.fc11.src.rpm:1252333236

tkgate-2.0-doc.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tkgate-2.0-doc.patch ---
--- Makefile.in	2009-01-11 01:13:54.000000000 +0100
+++ Makefile.in_m	2009-01-21 22:47:18.000000000 +0100
@@ -216,7 +216,7 @@
 #
 # List of directories that contain data files necessary for tkgate to run.
 #
-TKG_DATADIRS = scripts bindings doc gdf images locale povray primitives vlib vpd test
+TKG_DATADIRS = scripts bindings gdf images locale povray primitives vlib vpd
 
 #
 # Subdirectories in which more makefiles can be found 
@@ -226,7 +226,7 @@
 #
 # List of data files in this directory that should be included with a tkgate distribution.
 #
-dist_pkgdata_DATA = README README.verga COPYING INSTALL TODO site-preferences license.txt pkg-comment pkg-descr
+dist_pkgdata_DATA =
 
 #
 # List of man pages for tkgate


--- NEW FILE tkgate.spec ---
Name:           tkgate
Version:        2.0
Release:        7.beta9%{?dist}
Summary:        An event driven digital circuit simulator

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://www.tkgate.org/

Patch0:         tkgate-2.0-doc.patch
Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b9.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tk-devel tcl-devel libICE-devel libSM-devel
BuildRequires:  desktop-file-utils

Requires:       electronics-menu

%description
TkGate is a event driven digital circuit simulator
based on Verilog. TkGate
supports a wide range of primitive circuit elements as
well as user-defined modules for hierarchical design.

%package ca
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description ca
This package contains the Catalan locales and examples for tkgate, 
Digital Circuit Simulator

%package cs
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description cs
This package contains the Czech locales and examples for tkgate, 
Digital Circuit Simulator

%package cy
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description cy
This package contains the Welsh locales and examples for tkgate, 
Digital Circuit Simulator

%package de
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description de
This package contains the German locales and examples for tkgate, 
Digital Circuit Simulator

%package es
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description es
This package contains the Spanish locales and examples for tkgate, 
Digital Circuit Simulator

%package fr
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description fr
This package contains the French locales and examples for tkgate, 
Digital Circuit Simulator

%package it
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description it
This package contains the Italian locales and examples for tkgate, 
Digital Circuit Simulator


%package ja
Summary:           Locales and examples for tkgate, Digital Circuit Simulator
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description ja
This package contains the Japanese locales and examples for tkgate, 
Digital Circuit Simulator


%prep
%setup -q -n %{name}-%{version}-b9

%patch0 -p0 -b .doc

sed -i "s|\"\${tkg_gateHome}/libexec/verga\"|\"%{_bindir}/verga\"|" scripts/parms.tcl

sed -i "s|license.txt||" scripts/license.tcl
sed -i "s|TKGATE_LIBDIRS=\"\(.*\)\"|TKGATE_LIBDIRS=\"\1 %{_libdir}\"|" configure
# E: backup-file-in-package
find . -type f -name "*~" -exec rm -f  {} ';'
find . -type f -name "\#*\#" -exec rm -f  {} ';'

# spurious-executable-perm
chmod 0755 scripts/tree.tcl
chmod 0644 test/verga/maketests.sh
chmod 0644 test/verga/runtests.sh

# E: zero-length
%{__rm} -f locale/{en,ja}/tutorials/definition.txt
%{__rm} -f bindings/none
%{__rm} -f scripts/dip.tcl
%{__rm} -f test/verga/grammar.out


cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=Digital circuit simulator
GenericName=Verilog circuit simulator
Comment=TkGate
Type=Application
Exec=tkgate
Icon=tkgate
Categories=Engineering;Electronics;
EOF


%build
%configure
%{__make} %{?_smp_mflags} 


%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}

# Symlink points to BuildRoot:
%{__rm} -rf %{buildroot}%{_datadir}/%{name}/libexec/


# desktop file and its icon
desktop-file-install --vendor fedora           \
    --dir %{buildroot}%{_datadir}/applications \
    %{name}.desktop

install -d %{buildroot}%{_datadir}/pixmaps/
install -pm 0644 images/run01.gif %{buildroot}%{_datadir}/pixmaps/%{name}.png
cp -p site-preferences %{buildroot}%{_datadir}/%{name}/site-preferences

%clean
%{__rm} -rf %{buildroot}

%files ca
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/ca/*

%files cs
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/cs/*

%files cy
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/cy/*

%files de
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/de/*

%files es
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/es/*

%files fr
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/fr/*

%files it
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/it/*

%files ja
%defattr(-,root,root,-)
%{_datadir}/%{name}/locale/ja/*


%files
%defattr(-,root,root,-)
%doc README README.verga COPYING
%doc license.txt pkg-comment pkg-descr TODO
%doc doc/ test/
%{_bindir}/gmac
%{_bindir}/%{name}
%{_bindir}/verga
%{_datadir}/%{name}
%{_mandir}/man1/gmac.1.gz
%{_mandir}/man1/tkgate.1.gz
%{_mandir}/man1/verga.1.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%exclude %{_datadir}/%{name}/locale/ca
%exclude %{_datadir}/%{name}/locale/cs
%exclude %{_datadir}/%{name}/locale/cy
%exclude %{_datadir}/%{name}/locale/de
%exclude %{_datadir}/%{name}/locale/es
%exclude %{_datadir}/%{name}/locale/fr
%exclude %{_datadir}/%{name}/locale/it
%exclude %{_datadir}/%{name}/locale/ja

%changelog
* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.0-7.beta9
- updated to beta 9

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6.beta7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Fri Mar 6 2009 Thibault North <tnorth [AT] fedoraproject DOT org> - 2.0-5.beta7
- Minor fixes required for the package

* Thu Mar 5 2009 Thibault North <tnorth [AT] fedoraproject DOT org> - 2.0-4.beta7
- Fixes in installed files

* Tue Feb 24 2009 Thibault North <tnorth [AT] fedoraproject DOT org> - 2.0-1.beta7
- Updated to beta7

* Thu Feb 20 2009 Thibault North <tnorth [AT] fedoraproject DOT org> - 2.0-3.beta6
- Updated to beta6
- Separated locales
- Compilation fixes for 64 bits arch

* Wed Jan 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.0-2.beta4
- updated to beta4

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.0-1.alpha11
- Initial package for fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Mar 2009 17:08:19 -0000	1.1
+++ .cvsignore	7 Sep 2009 14:31:14 -0000	1.2
@@ -0,0 +1 @@
+tkgate-2.0-b9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Mar 2009 17:08:19 -0000	1.1
+++ sources	7 Sep 2009 14:31:14 -0000	1.2
@@ -0,0 +1 @@
+951de17427f49e6635946081cf1d2b70  tkgate-2.0-b9.tar.gz



From mhlavink at fedoraproject.org  Mon Sep  7 14:37:58 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Sep 2009 14:37:58 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.13-bufov.patch, NONE,
	1.1 cyrus-imapd.spec, 1.57, 1.58
Message-ID: <20090907143758.ABBF911C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16325

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.13-bufov.patch 
Log Message:
fix buffer overflow in cyrus sieve


cyrus-imapd-2.3.13-bufov.patch:
 script.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE cyrus-imapd-2.3.13-bufov.patch ---
--- src/sieve/script.c	2008/03/24 20:08:46	1.67
+++ src/sieve/script.c	2009/09/02 13:56:18	1.68
@@ -40,7 +40,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $
+ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
 	ret |= keep_ret;
         if (keep_ret == SIEVE_OK)
             snprintf(actions_string+strlen(actions_string),
-		     sizeof(actions_string)-strlen(actions_string),
+		     ACTIONS_STRING_LEN-strlen(actions_string),
 		     "Kept\n");
 	else {
 	    implicit_keep = 0;	/* don't try an implicit keep again */
@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
 	    
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string), 
+			 ACTIONS_STRING_LEN-strlen(actions_string), 
 			 "Rejected with: %s\n", a->u.rej.msg);
 
 	    break;
@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
 
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Filed into: %s\n",a->u.fil.mailbox);
 	    break;
 	case ACTION_KEEP:
@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
 			       &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Kept\n");
 	    break;
 	case ACTION_REDIRECT:
@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
 				   &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Redirected to %s\n", a->u.red.addr);
 	    break;
 	case ACTION_DISCARD:
@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
 				      &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Discarded\n");
 	    break;
 
@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
 
 		    if (ret == SIEVE_OK)
 			snprintf(actions_string+strlen(actions_string),
-				 sizeof(actions_string)-strlen(actions_string),
+				 ACTIONS_STRING_LEN-strlen(actions_string),
 				 "Sent vacation reply\n");
 
 		} else if (ret == SIEVE_DONE) {
 		    snprintf(actions_string+strlen(actions_string),
-			     sizeof(actions_string)-strlen(actions_string),
+			     ACTIONS_STRING_LEN-strlen(actions_string),
 			     "Vacation reply suppressed\n");
 
 		    ret = SIEVE_OK;


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- cyrus-imapd.spec	21 Aug 2009 12:55:44 -0000	1.57
+++ cyrus-imapd.spec	7 Sep 2009 14:37:58 -0000	1.58
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -116,6 +116,7 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defa
 Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
+Patch20: cyrus-imapd-2.3.13-bufov.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
@@ -213,6 +214,7 @@ one running the server.
 %patch15 -p1 -b .make_md5_defaults
 %patch18 -p1 -b .krb4
 %patch19 -p1 -b .db4.7
+%patch20 -p1 -b .bufov
 
 # only to update config.* files
 automake -a -f -c || :
@@ -729,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-5
+- fix buffer overflow in cyrus sieve (#521010)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-4
 - rebuilt with new openssl
 



From mhlavink at fedoraproject.org  Mon Sep  7 14:41:58 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Sep 2009 14:41:58 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-10 cyrus-imapd-2.3.13-bufov.patch, NONE,
	1.1 cyrus-imapd.spec, 1.51, 1.52
Message-ID: <20090907144158.A72A111C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18007

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.13-bufov.patch 
Log Message:
fix buffer overflow in cyrus sieve


cyrus-imapd-2.3.13-bufov.patch:
 script.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE cyrus-imapd-2.3.13-bufov.patch ---
--- src/sieve/script.c	2008/03/24 20:08:46	1.67
+++ src/sieve/script.c	2009/09/02 13:56:18	1.68
@@ -40,7 +40,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $
+ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
 	ret |= keep_ret;
         if (keep_ret == SIEVE_OK)
             snprintf(actions_string+strlen(actions_string),
-		     sizeof(actions_string)-strlen(actions_string),
+		     ACTIONS_STRING_LEN-strlen(actions_string),
 		     "Kept\n");
 	else {
 	    implicit_keep = 0;	/* don't try an implicit keep again */
@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
 	    
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string), 
+			 ACTIONS_STRING_LEN-strlen(actions_string), 
 			 "Rejected with: %s\n", a->u.rej.msg);
 
 	    break;
@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
 
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Filed into: %s\n",a->u.fil.mailbox);
 	    break;
 	case ACTION_KEEP:
@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
 			       &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Kept\n");
 	    break;
 	case ACTION_REDIRECT:
@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
 				   &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Redirected to %s\n", a->u.red.addr);
 	    break;
 	case ACTION_DISCARD:
@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
 				      &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Discarded\n");
 	    break;
 
@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
 
 		    if (ret == SIEVE_OK)
 			snprintf(actions_string+strlen(actions_string),
-				 sizeof(actions_string)-strlen(actions_string),
+				 ACTIONS_STRING_LEN-strlen(actions_string),
 				 "Sent vacation reply\n");
 
 		} else if (ret == SIEVE_DONE) {
 		    snprintf(actions_string+strlen(actions_string),
-			     sizeof(actions_string)-strlen(actions_string),
+			     ACTIONS_STRING_LEN-strlen(actions_string),
 			     "Vacation reply suppressed\n");
 
 		    ret = SIEVE_OK;


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- cyrus-imapd.spec	26 May 2009 11:28:24 -0000	1.51
+++ cyrus-imapd.spec	7 Sep 2009 14:41:58 -0000	1.52
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -116,6 +116,7 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defa
 Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
+Patch20: cyrus-imapd-2.3.13-bufov.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
@@ -213,6 +214,7 @@ one running the server.
 %patch15 -p1 -b .make_md5_defaults
 %patch18 -p1 -b .krb4
 %patch19 -p1 -b .db4.7
+%patch20 -p1 -b .bufov
 
 # only to update config.* files
 automake -a -f -c || :
@@ -729,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-2
+- fix buffer overflow in cyrus sieve (#521010)
+
 * Tue May 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-1
 - updated to 2.3.14
 - spec clean-up



From mhlavink at fedoraproject.org  Mon Sep  7 14:42:02 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Sep 2009 14:42:02 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-11 cyrus-imapd-2.3.13-bufov.patch, NONE,
	1.1 cyrus-imapd.spec, 1.54, 1.55
Message-ID: <20090907144202.C48B811C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17943

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.13-bufov.patch 
Log Message:
fix buffer overflow in cyrus sieve


cyrus-imapd-2.3.13-bufov.patch:
 script.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE cyrus-imapd-2.3.13-bufov.patch ---
--- src/sieve/script.c	2008/03/24 20:08:46	1.67
+++ src/sieve/script.c	2009/09/02 13:56:18	1.68
@@ -40,7 +40,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $
+ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
 	ret |= keep_ret;
         if (keep_ret == SIEVE_OK)
             snprintf(actions_string+strlen(actions_string),
-		     sizeof(actions_string)-strlen(actions_string),
+		     ACTIONS_STRING_LEN-strlen(actions_string),
 		     "Kept\n");
 	else {
 	    implicit_keep = 0;	/* don't try an implicit keep again */
@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
 	    
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string), 
+			 ACTIONS_STRING_LEN-strlen(actions_string), 
 			 "Rejected with: %s\n", a->u.rej.msg);
 
 	    break;
@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
 
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Filed into: %s\n",a->u.fil.mailbox);
 	    break;
 	case ACTION_KEEP:
@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
 			       &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Kept\n");
 	    break;
 	case ACTION_REDIRECT:
@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
 				   &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Redirected to %s\n", a->u.red.addr);
 	    break;
 	case ACTION_DISCARD:
@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
 				      &errmsg);
 	    if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
-			 sizeof(actions_string)-strlen(actions_string),
+			 ACTIONS_STRING_LEN-strlen(actions_string),
 			 "Discarded\n");
 	    break;
 
@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
 
 		    if (ret == SIEVE_OK)
 			snprintf(actions_string+strlen(actions_string),
-				 sizeof(actions_string)-strlen(actions_string),
+				 ACTIONS_STRING_LEN-strlen(actions_string),
 				 "Sent vacation reply\n");
 
 		} else if (ret == SIEVE_DONE) {
 		    snprintf(actions_string+strlen(actions_string),
-			     sizeof(actions_string)-strlen(actions_string),
+			     ACTIONS_STRING_LEN-strlen(actions_string),
 			     "Vacation reply suppressed\n");
 
 		    ret = SIEVE_OK;


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- cyrus-imapd.spec	1 Jul 2009 08:22:49 -0000	1.54
+++ cyrus-imapd.spec	7 Sep 2009 14:42:02 -0000	1.55
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -116,6 +116,7 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defa
 Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
+Patch20: cyrus-imapd-2.3.13-bufov.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
@@ -213,6 +214,7 @@ one running the server.
 %patch15 -p1 -b .make_md5_defaults
 %patch18 -p1 -b .krb4
 %patch19 -p1 -b .db4.7
+%patch20 -p1 -b .bufov
 
 # only to update config.* files
 automake -a -f -c || :
@@ -729,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-2
+- fix buffer overflow in cyrus sieve (#521010)
+
 * Thu Apr 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-1
 - updated to 2.3.14
 



From michich at fedoraproject.org  Mon Sep  7 14:42:18 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon,  7 Sep 2009 14:42:18 +0000 (UTC)
Subject: rpms/jabbim/F-11 jabbim.spec, 1.31, 1.32 sources, 1.24,
	1.25 jabbim-0.4-fix-rosterStyle-preferences.diff, 1.1, NONE
Message-ID: <20090907144218.A79F411C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18407

Modified Files:
	jabbim.spec sources 
Removed Files:
	jabbim-0.4-fix-rosterStyle-preferences.diff 
Log Message:
* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
- Update to SVN rev. 4223:
  - fixes chat with contacts who have non-ASCII User Mood string
  - various other bugfixes
  - new Jabber Disk Manager - supports directories
- Dropped jabbim-0.4-fix-rosterStyle-preferences.diff.
- Compress tarball with xz.



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/jabbim.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- jabbim.spec	13 Apr 2009 14:01:03 -0000	1.31
+++ jabbim.spec	7 Sep 2009 14:42:18 -0000	1.32
@@ -1,8 +1,8 @@
-%global	svnrev	4103
-%global	svndate	20090408
+%global	svnrev	4223
+%global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.5.svn%{svndate}%{?dist}
+Release:	0.7.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -10,10 +10,9 @@ License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
 # svn export -r %{svnrev} svn://dev.jabbim.cz/jabbim/trunk jabbim-svn%{svndate}
-# tar -cjf jabbim-svn%{svndate}.tar.bz2 jabbim-svn%{svndate}/
-Source0:	jabbim-svn%{svndate}.tar.bz2
+# tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
+Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
-Patch1:		jabbim-0.4-fix-rosterStyle-preferences.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,7 +41,6 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
-%patch1 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
 
@@ -98,6 +96,14 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
+- Update to SVN rev. 4223:
+  - fixes chat with contacts who have non-ASCII User Mood string
+  - various other bugfixes
+  - new Jabber Disk Manager - supports directories
+- Dropped jabbim-0.4-fix-rosterStyle-preferences.diff.
+- Compress tarball with xz.
+
 * Mon Apr 13 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.5.svn20090408
 - Update to SVN rev. 4103:
   - bugfixes for filetransfer, uniemoticons, logging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	13 Apr 2009 14:01:03 -0000	1.24
+++ sources	7 Sep 2009 14:42:18 -0000	1.25
@@ -1 +1 @@
-9405f481a8a06060fbc4cb909e54d584  jabbim-svn20090408.tar.bz2
+ceb797ba531211ccde339172da4f040d  jabbim-svn20090907.tar.xz


--- jabbim-0.4-fix-rosterStyle-preferences.diff DELETED ---



From than at fedoraproject.org  Mon Sep  7 14:49:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Sep 2009 14:49:54 +0000 (UTC)
Subject: rpms/rp-pppoe/devel pppoe-connect, 1.2, 1.3 pppoe-start, 1.2,
	1.3 pppoe-stop, 1.1, 1.2 rp-pppoe.spec, 1.46, 1.47
Message-ID: <20090907144954.A973411C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22540

Modified Files:
	pppoe-connect pppoe-start pppoe-stop rp-pppoe.spec 
Log Message:
add feature, save and restore all information about default routes bz#191242



Index: pppoe-connect
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/pppoe-connect,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pppoe-connect	11 Nov 2008 15:10:31 -0000	1.2
+++ pppoe-connect	7 Sep 2009 14:49:54 -0000	1.3
@@ -279,9 +279,11 @@ if test "$DEFROUTE" != "no" ; then
     DEFAULTROUTE="defaultroute"
     # pppd will no longer delete an existing default route
     # so we have to help it out a little here.
-    DEFRT=`ip route list | awk '/^default / { print $3 }'`
-    [ -n "${DEFRT}" ] && echo $DEFRT > /etc/default-route
-    route del default >/dev/null 2>&1
+    DEFRT=$(ip route list match 0/0)
+    [ -n "${DEFRT}" ] && echo "$DEFRT" > /etc/default-routes
+    echo "$DEFRT" | while read spec; do
+        ip route del $spec;
+    done
 else
     DEFAULTROUTE=""
 fi
@@ -351,9 +353,11 @@ echo $$ > $PIDFILE
 
 while [ true ] ; do
     if [ "${DEFROUTE}" != "no" ] ; then
-        DEFRT=`ip route list | awk '/^default / { print $3 }'`
-        [ -n "${DEFRT}" ] && echo $DEFRT > /etc/default-route
-        route del default >/dev/null 2>&1
+        DEFRT=$(ip route list match 0/0)
+        [ -n "${DEFRT}" ] && echo "$DEFRT" > /etc/default-routes
+        echo "$DEFRT" | while read spec; do
+            ip route del $spec;
+        done
     fi
 
     if test "$BR2684DEV" != ""; then


Index: pppoe-start
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/pppoe-start,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pppoe-start	20 Mar 2007 19:00:47 -0000	1.2
+++ pppoe-start	7 Sep 2009 14:49:54 -0000	1.3
@@ -217,9 +217,11 @@ kill $CONNECT_PID > /dev/null 2>&1
 rm -f "$PIDFILE" "$PIDFILE.pppd" "$PIDFILE.pppoe" "$PIDFILE.start"
 
 # add old default gw back
-if [ -s /etc/default-route ] ; then
-    route add default gw `cat /etc/default-route`
-    rm -f /etc/default-route
+if [ -s /etc/default-routes ] ; then
+    while read spec; do
+        /sbin/ip route add $spec
+    done < /etc/default-routes
+    rm -f /etc/default-routes
 fi
 
 exit 1


Index: pppoe-stop
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/pppoe-stop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pppoe-stop	20 Mar 2007 18:29:36 -0000	1.1
+++ pppoe-stop	7 Sep 2009 14:49:54 -0000	1.2
@@ -132,9 +132,11 @@ else
 fi
 
 # add old default gw back
-if [ -s /etc/default-route ] ; then
-    route add default gw `cat /etc/default-route`
-    rm -f /etc/default-route
+if [ -s /etc/default-routes ] ; then
+    while read spec; do
+        /sbin/ip route add $spec
+    done < /etc/default-routes
+    rm -f /etc/default-routes
 fi
 
 exit 0


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rp-pppoe.spec	27 Jul 2009 03:09:49 -0000	1.46
+++ rp-pppoe.spec	7 Sep 2009 14:49:54 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -145,6 +145,9 @@ exit 0
 %{_mandir}/man?/*
 
 %changelog
+* Mon Sep 07 2009 Than Ngo <than at redhat.com> - 3.10-4
+- add feature, save and restore all information about default routes bz#191242
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From transif at fedoraproject.org  Mon Sep  7 14:50:48 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Sep 2009 14:50:48 +0000 (UTC)
Subject: comps/po te.po,1.20,1.21
Message-ID: <20090907145048.606F011C00DB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22937/po

Modified Files:
	te.po 
Log Message:
Sending translation for Telugu


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 te.poIndex: te.po
===================================================================
RCS file: /cvs/pkgs/comps/po/te.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- te.po	26 May 2009 08:53:45 -0000	1.20
+++ te.po	7 Sep 2009 14:50:48 -0000	1.21
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 08:22+0000\n"
-"PO-Revision-Date: 2009-05-26 14:22+0530\n"
+"POT-Creation-Date: 2009-09-01 02:22+0000\n"
+"PO-Revision-Date: 2009-09-07 16:49+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,280 +27,302 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "?????? ???????? ?????????? ???????? ??? ?????? ????????? ???????????? ????????????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????? ???????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "???????? ????? ????????? ???????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????? ????? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???? ???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ??????? ????? ????? ??????."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "??????????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ?????????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????????????? ??????? ?????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
[...1831 lines suppressed...]
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "??????????? ??????"
 
-#: ../comps-f11.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "????? ?????????? ?????????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1374,21 +1485,25 @@ msgstr ""
 "32 bit Windows ???????? ????? ??????-????????? ????????????? ??????????, ?????? ???????????, ????? "
 "???????????? ??????????, ????? Fedora ????."
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?????????? CAML ????????????? ????? ????? ?????????? ?????????? ????????? ??????????? ???????????."
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ??????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1396,23 +1511,81 @@ msgstr ""
 "? ????? ???????? ?????? ???????, ?????????????, ??????????, ???????????? ??????? "
 "??????????? ??????? ???????."
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "?????? ????????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "GNOME ????????????? ????????? ???? ????????????? ?????????????? ????????? ?????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "????? Fedora ????????? ????????? ???? ??????????? ????? ?????????? ?????????? ??????? ????????? ?????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????????? ????? ??????????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ?????????????? ????? ???????????????? ?????????? ????? ??????????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????????? ???? (????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "????????? ???? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????????? ??????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "????????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"???????????, ?????? ????????? ???? ??? ?????????????? ?????? ?????????? ????????? ?????????? ????? "
+"??????????????? ??????????? X11 ?????????? ?????????????? LXDE."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "????? ????? ??????????? ????????? ???????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "???????? ?????????? ??????????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "???????? ?????? NetBook/NetTop/MID ??????? ????? ?????????? ??????????????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????? ?????????? ????? ????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "????? ???????????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1420,7 +1593,7 @@ msgstr ""
 "GNOME ??????????? graphical user interface. ??? ????????, ?????, ????????? ?????? ????? "
 "??????? ????????????? ?????????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1429,7 +1602,7 @@ msgstr ""
 "???? ????????? ?????????.KDE ??????????? ?????????? ??????? ??????????? ????. ??? ????, "
 "????????? ????, ????? "
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1437,11 +1610,11 @@ msgstr ""
 "???????????? ????????????? ?????? ?????? ??????? ?????????? ????? ??????? ??????????? "
 "????????????????. ??? Emacs ????? vi?? ???????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ??? ???????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1449,27 +1622,27 @@ msgstr ""
 "? ???????? DocBook ????????? ????? ?????? HTML, PDF, Postscript, ????? ??????.??????????? "
 "????????? ????????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "? ????? ??????? ????????? ????? ?????????? ?????? ????? ??????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ??????????? ? ????? ????????? ????? ??????? ????? ????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???? ??????????? ? ????? ????????? ????? ??????? ????? ????."
 



From pbrobinson at fedoraproject.org  Mon Sep  7 14:51:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Sep 2009 14:51:11 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.7,1.8
Message-ID: <20090907145111.5AB7911C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23048

Modified Files:
	bisho.spec 
Log Message:
- Drop other changes from upstream patch


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bisho.spec	7 Sep 2009 11:07:39 -0000	1.7
+++ bisho.spec	7 Sep 2009 14:51:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -32,7 +32,6 @@ aggregation service.
 
 %prep
 %setup -q
-mv  $RPM_BUILD_DIR/%{name}-%{version}/data/callback.schemas.in $RPM_BUILD_DIR/%{name}-%{version}/data/bisho.schemas.in
 
 # Don't run configure from autogen.sh
 sed -i 's|echo|exit 0|g' autogen.sh
@@ -92,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-2
+- Drop other changes from upstream patch
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-1
 - New upstream 0.12 release, drop upstream patch
 



From salimma at fedoraproject.org  Mon Sep  7 14:52:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 14:52:53 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.22,1.23
Message-ID: <20090907145253.4740811C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23353

Modified Files:
	llvm.spec 
Log Message:
Treat test failures as advisory only; some currently fail on i686



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- llvm.spec	7 Sep 2009 14:11:08 -0000	1.22
+++ llvm.spec	7 Sep 2009 14:52:52 -0000	1.23
@@ -162,7 +162,8 @@ make %{_smp_mflags} OPTIMIZE_OPTION='%{o
 
 
 %check
-cd obj && make check
+# 2 tests currently fail on i686
+cd obj && make check; true
 
 
 %install



From pvrabec at fedoraproject.org  Mon Sep  7 14:56:09 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  7 Sep 2009 14:56:09 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.4.2-fixes.patch, NONE,
	1.1 shadow-4.1.4.2-leak.patch, NONE,
	1.1 shadow-4.1.4.2-redhat.patch, NONE, 1.1 .cvsignore, 1.23,
	1.24 shadow-utils.spec, 1.138, 1.139 sources, 1.24,
	1.25 shadow-4.1.4-redhat.patch, 1.1,
	NONE shadow-4.1.4.1-largeGroup.patch, 1.1,
	NONE shadow-4.1.4.1-ldap.patch, 1.1,
	NONE shadow-4.1.4.1-sysacc.patch, 1.2, NONE
Message-ID: <20090907145609.B4FE611C00DB@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24127

Modified Files:
	.cvsignore shadow-utils.spec sources 
Added Files:
	shadow-4.1.4.2-fixes.patch shadow-4.1.4.2-leak.patch 
	shadow-4.1.4.2-redhat.patch 
Removed Files:
	shadow-4.1.4-redhat.patch shadow-4.1.4.1-largeGroup.patch 
	shadow-4.1.4.1-ldap.patch shadow-4.1.4.1-sysacc.patch 
Log Message:
upgrade


shadow-4.1.4.2-fixes.patch:
 lib/commonio.c    |    2 +-
 libmisc/cleanup.c |    2 +-
 libmisc/limits.c  |    2 +-
 libmisc/utmp.c    |    5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE shadow-4.1.4.2-fixes.patch ---
diff -up shadow-4.1.4.2/lib/commonio.c.fixes shadow-4.1.4.2/lib/commonio.c
--- shadow-4.1.4.2/lib/commonio.c.fixes	2009-09-07 15:51:28.312139467 +0200
+++ shadow-4.1.4.2/lib/commonio.c	2009-09-07 15:52:00.788140456 +0200
@@ -710,7 +710,7 @@ commonio_sort (struct commonio_db *db, i
 	db->tail->prev = entries[n - 1];
 	db->tail->next = NULL;
 
-	for (i = 1; i < n; i++) {
+	for (i = 1; i < (n-1); i++) {
 		entries[i]->prev = entries[i - 1];
 		entries[i]->next = entries[i + 1];
 	}
diff -up shadow-4.1.4.2/libmisc/cleanup.c.fixes shadow-4.1.4.2/libmisc/cleanup.c
--- shadow-4.1.4.2/libmisc/cleanup.c.fixes	2009-09-07 15:52:22.449035388 +0200
+++ shadow-4.1.4.2/libmisc/cleanup.c	2009-09-07 15:55:06.632033653 +0200
@@ -107,7 +107,7 @@ void del_cleanup (cleanup_function pcf)
 	assert (i<CLEANUP_FUNCTIONS);
 
 	/* Move the rest of the cleanup functions */
-	for (; i<CLEANUP_FUNCTIONS; i++) {
+	for (; i<(CLEANUP_FUNCTIONS - 1); i++) {
 		/* Make sure the cleanup function was specified only once */
 		assert (cleanup_functions[i+1] != pcf);
 
diff -up shadow-4.1.4.2/libmisc/limits.c.fixes shadow-4.1.4.2/libmisc/limits.c
--- shadow-4.1.4.2/libmisc/limits.c.fixes	2009-09-07 15:55:38.734034494 +0200
+++ shadow-4.1.4.2/libmisc/limits.c	2009-09-07 15:56:10.545044166 +0200
@@ -167,7 +167,7 @@ static int check_logins (const char *nam
 	 * includes the user who is currently trying to log in.
 	 */
 	if (count > limit) {
-		SYSLOG ((LOG_WARN, "Too many logins (max %d) for %s\n",
+		SYSLOG ((LOG_WARN, "Too many logins (max %lu) for %s\n",
 			 limit, name));
 		return LOGIN_ERROR_LOGIN;
 	}
diff -up shadow-4.1.4.2/libmisc/utmp.c.fixes shadow-4.1.4.2/libmisc/utmp.c
--- shadow-4.1.4.2/libmisc/utmp.c.fixes	2009-09-07 15:56:30.534033865 +0200
+++ shadow-4.1.4.2/libmisc/utmp.c	2009-09-07 16:11:23.049069289 +0200
@@ -56,7 +56,7 @@ static bool is_my_tty (const char *tty)
 	/* full_tty shall be at least sizeof utmp.ut_line + 5 */
 	char full_tty[200];
 	/* tmptty shall be bigger than full_tty */
-	static char tmptty[sizeof (full_tty)+1];
+	static char tmptty[sizeof (full_tty)+1] = "";
 
 	if ('/' != *tty) {
 		(void) snprintf (full_tty, sizeof full_tty, "/dev/%s", tty);
@@ -71,7 +71,7 @@ static bool is_my_tty (const char *tty)
 		}
 	}
 
-	if (NULL == tmptty) {
+	if ('\0' == tmptty[0]) {
 		(void) puts (_("Unable to determine your tty name."));
 		exit (EXIT_FAILURE);
 	} else if (strncmp (tty, tmptty, sizeof (tmptty)) != 0) {
@@ -200,7 +200,6 @@ static void updwtmpx (const char *filena
 		strcpy (hostname, host);
 #ifdef HAVE_STRUCT_UTMP_UT_HOST
 	} else if (   (NULL != ut)
-	           && (NULL != ut->ut_host)
 	           && ('\0' != ut->ut_host[0])) {
 		hostname = (char *) xmalloc (sizeof (ut->ut_host) + 1);
 		strncpy (hostname, ut->ut_host, sizeof (ut->ut_host));

shadow-4.1.4.2-leak.patch:
 lib/groupmem.c    |   13 +++++++++++++
 lib/pwmem.c       |   15 +++++++++++++++
 lib/shadowmem.c   |    3 +++
 libmisc/copydir.c |    1 +
 4 files changed, 32 insertions(+)

--- NEW FILE shadow-4.1.4.2-leak.patch ---
diff -up shadow-4.1.4.2/lib/groupmem.c.leak shadow-4.1.4.2/lib/groupmem.c
--- shadow-4.1.4.2/lib/groupmem.c.leak	2009-04-23 19:43:27.000000000 +0200
+++ shadow-4.1.4.2/lib/groupmem.c	2009-09-07 15:43:23.314129427 +0200
@@ -51,10 +51,13 @@
 	*gr = *grent;
 	gr->gr_name = strdup (grent->gr_name);
 	if (NULL == gr->gr_name) {
+		free(gr);
 		return NULL;
 	}
 	gr->gr_passwd = strdup (grent->gr_passwd);
 	if (NULL == gr->gr_passwd) {
+		free(gr->gr_name);
+		free(gr);
 		return NULL;
 	}
 
@@ -62,11 +65,21 @@
 
 	gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *));
 	if (NULL == gr->gr_mem) {
+		free(gr->gr_passwd);
+		free(gr->gr_name);
+		free(gr);
 		return NULL;
 	}
 	for (i = 0; grent->gr_mem[i]; i++) {
 		gr->gr_mem[i] = strdup (grent->gr_mem[i]);
 		if (NULL == gr->gr_mem[i]) {
+                        int j;
+                        for (j=0; j<i; j++)
+                                free(gr->gr_mem[j]);
+                        free(gr->gr_mem);
+                        free(gr->gr_passwd);
+                        free(gr->gr_name);
+                        free(gr);
 			return NULL;
 		}
 	}
diff -up shadow-4.1.4.2/libmisc/copydir.c.leak shadow-4.1.4.2/libmisc/copydir.c
--- shadow-4.1.4.2/libmisc/copydir.c.leak	2009-05-22 12:16:14.000000000 +0200
+++ shadow-4.1.4.2/libmisc/copydir.c	2009-09-07 15:41:49.217192095 +0200
@@ -443,6 +443,7 @@ static char *readlink_malloc (const char
 		nchars = readlink (filename, buffer, size);
 
 		if (nchars < 0) {
+			free(buffer);
 			return NULL;
 		}
 
diff -up shadow-4.1.4.2/lib/pwmem.c.leak shadow-4.1.4.2/lib/pwmem.c
--- shadow-4.1.4.2/lib/pwmem.c.leak	2009-04-23 19:43:27.000000000 +0200
+++ shadow-4.1.4.2/lib/pwmem.c	2009-09-07 15:41:49.218203063 +0200
@@ -51,22 +51,37 @@
 	*pw = *pwent;
 	pw->pw_name = strdup (pwent->pw_name);
 	if (NULL == pw->pw_name) {
+		free(pw);
 		return NULL;
 	}
 	pw->pw_passwd = strdup (pwent->pw_passwd);
 	if (NULL == pw->pw_passwd) {
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 	pw->pw_gecos = strdup (pwent->pw_gecos);
 	if (NULL == pw->pw_gecos) {
+		free(pw->pw_passwd);
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 	pw->pw_dir = strdup (pwent->pw_dir);
 	if (NULL == pw->pw_dir) {
+		free(pw->pw_gecos);
+		free(pw->pw_passwd);
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 	pw->pw_shell = strdup (pwent->pw_shell);
 	if (NULL == pw->pw_shell) {
+		free(pw->pw_dir);
+		free(pw->pw_gecos);
+		free(pw->pw_passwd);
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 
diff -up shadow-4.1.4.2/lib/shadowmem.c.leak shadow-4.1.4.2/lib/shadowmem.c
--- shadow-4.1.4.2/lib/shadowmem.c.leak	2009-04-23 19:43:27.000000000 +0200
+++ shadow-4.1.4.2/lib/shadowmem.c	2009-09-07 15:41:49.218203063 +0200
@@ -52,10 +52,13 @@
 	*sp = *spent;
 	sp->sp_namp = strdup (spent->sp_namp);
 	if (NULL == sp->sp_namp) {
+                free(sp);
 		return NULL;
 	}
 	sp->sp_pwdp = strdup (spent->sp_pwdp);
 	if (NULL == sp->sp_pwdp) {
+                free(sp->sp_namp);
+                free(sp);
 		return NULL;
 	}
 

shadow-4.1.4.2-redhat.patch:
 libmisc/find_new_gid.c |    6 +++---
 libmisc/find_new_uid.c |    6 +++---
 src/useradd.c          |    9 +++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

--- NEW FILE shadow-4.1.4.2-redhat.patch ---
diff -up shadow-4.1.4.2/libmisc/find_new_gid.c.redhat shadow-4.1.4.2/libmisc/find_new_gid.c
--- shadow-4.1.4.2/libmisc/find_new_gid.c.redhat	2009-07-18 01:53:42.000000000 +0200
+++ shadow-4.1.4.2/libmisc/find_new_gid.c	2009-09-07 16:34:26.640814090 +0200
@@ -58,11 +58,11 @@ int find_new_gid (bool sys_group,
 	assert (gid != NULL);
 
 	if (!sys_group) {
-		gid_min = (gid_t) getdef_ulong ("GID_MIN", 1000UL);
+		gid_min = (gid_t) getdef_ulong ("GID_MIN", 500UL);
 		gid_max = (gid_t) getdef_ulong ("GID_MAX", 60000UL);
 	} else {
-		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 101UL);
-		gid_max = (gid_t) getdef_ulong ("GID_MIN", 1000UL) - 1;
+		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 201UL);
+		gid_max = (gid_t) getdef_ulong ("GID_MIN", 500UL) - 1;
 		gid_max = (gid_t) getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
 	}
 	used_gids = alloca (sizeof (bool) * (gid_max +1));
diff -up shadow-4.1.4.2/libmisc/find_new_uid.c.redhat shadow-4.1.4.2/libmisc/find_new_uid.c
--- shadow-4.1.4.2/libmisc/find_new_uid.c.redhat	2009-07-18 01:53:43.000000000 +0200
+++ shadow-4.1.4.2/libmisc/find_new_uid.c	2009-09-07 16:34:19.695877000 +0200
@@ -58,11 +58,11 @@ int find_new_uid (bool sys_user,
 	assert (uid != NULL);
 
 	if (!sys_user) {
-		uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
+		uid_min = (uid_t) getdef_ulong ("UID_MIN", 500UL);
 		uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
 	} else {
-		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL);
-		uid_max = (uid_t) getdef_ulong ("UID_MIN", 1000UL) - 1;
+		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 201UL);
+		uid_max = (uid_t) getdef_ulong ("UID_MIN", 500UL) - 1;
 		uid_max = (uid_t) getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
 	}
 	used_uids = alloca (sizeof (bool) * (uid_max +1));
diff -up shadow-4.1.4.2/src/useradd.c.redhat shadow-4.1.4.2/src/useradd.c
--- shadow-4.1.4.2/src/useradd.c.redhat	2009-06-06 00:16:58.000000000 +0200
+++ shadow-4.1.4.2/src/useradd.c	2009-09-07 16:34:01.402878101 +0200
@@ -90,7 +90,7 @@ char *Prog;
 static gid_t def_group = 100;
 static const char *def_gname = "other";
 static const char *def_home = "/home";
-static const char *def_shell = "";
+static const char *def_shell = "/sbin/nologin";
 static const char *def_template = SKEL_DIR;
 static const char *def_create_mail_spool = "no";
 
@@ -102,7 +102,7 @@ static char def_file[] = USER_DEFAULTS_F
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 
 static const char *user_name = "";
-static const char *user_pass = "!";
+static const char *user_pass = "!!";
 static uid_t user_id;
 static gid_t user_gid;
 static const char *user_comment = "";
@@ -989,9 +989,9 @@ static void process_flags (int argc, cha
 		};
 		while ((c = getopt_long (argc, argv,
 #ifdef WITH_SELINUX
-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:",
+		                         "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:UZ:",
 #else
-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
+		                         "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:U",
 #endif
 		                         long_options, NULL)) != -1) {
 			switch (c) {
@@ -1141,6 +1141,7 @@ static void process_flags (int argc, cha
 			case 'M':
 				Mflg = true;
 				break;
+			case 'n':
 			case 'N':
 				Nflg = true;
 				break;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	16 Jun 2009 13:23:28 -0000	1.23
+++ .cvsignore	7 Sep 2009 14:56:08 -0000	1.24
@@ -1 +1 @@
-shadow-4.1.4.1.tar.bz2
+shadow-4.1.4.2.tar.bz2


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- shadow-utils.spec	21 Aug 2009 11:18:13 -0000	1.138
+++ shadow-utils.spec	7 Sep 2009 14:56:09 -0000	1.139
@@ -1,17 +1,16 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
-Version: 4.1.4.1
-Release: 7%{?dist}
+Version: 4.1.4.2
+Release: 1%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.17-login.defs
 Source2: shadow-4.0.18.1-useradd
-Patch0: shadow-4.1.4-redhat.patch
+Patch0: shadow-4.1.4.2-redhat.patch
 Patch1: shadow-4.1.4.1-goodname.patch
-Patch2: shadow-4.1.4.1-largeGroup.patch
-Patch3: shadow-4.1.4.1-ldap.patch
-Patch4: shadow-4.1.4.1-sysacc.patch
+Patch2: shadow-4.1.4.2-leak.patch
+Patch3: shadow-4.1.4.2-fixes.patch
 License: BSD and GPLv2+
 Group: System Environment/Base
 BuildRequires: libselinux-devel >= 1.25.2-1
@@ -37,10 +36,9 @@ are used for managing group accounts.
 %prep
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
-%patch1 -p1 -b .goodname
-%patch2 -p1 -b .largeGroup
-%patch3 -p1 -b .ldap
-%patch4 -p1 -b .sysacc
+#%patch1 -p1 -b .goodname
+#%patch2 -p1 -b .leak
+#%patch3 -p1 -b .fixes
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -182,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Mon Sep 07 2009 Peter Vrabec <pvrabec at redhat.com> - 2:4.1.4.2-1
+- upgrade
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:4.1.4.1-7
 - rebuilt with new audit
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	16 Jun 2009 13:23:28 -0000	1.24
+++ sources	7 Sep 2009 14:56:09 -0000	1.25
@@ -1 +1 @@
-62f7dae4cb54fa84e478c4602d58cbe8  shadow-4.1.4.1.tar.bz2
+d593a9cab93c48ee0a6ba056db8c1997  shadow-4.1.4.2.tar.bz2


--- shadow-4.1.4-redhat.patch DELETED ---


--- shadow-4.1.4.1-largeGroup.patch DELETED ---


--- shadow-4.1.4.1-ldap.patch DELETED ---


--- shadow-4.1.4.1-sysacc.patch DELETED ---



From pbrobinson at fedoraproject.org  Mon Sep  7 14:58:19 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Sep 2009 14:58:19 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.8,1.9
Message-ID: <20090907145819.D344611C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25626

Modified Files:
	bisho.spec 
Log Message:
- rebuild


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bisho.spec	7 Sep 2009 14:51:11 -0000	1.8
+++ bisho.spec	7 Sep 2009 14:58:19 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -91,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-3
+- Rebuild
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-2
 - Drop other changes from upstream patch
 



From hadess at fedoraproject.org  Mon Sep  7 15:02:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 15:02:30 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11
	0001-Update-gnome-volume-control-code-from-master.patch, NONE,
	1.1 0002-Bug-590073-gnome-settings-daemon-crashed-with-SI.patch,
	NONE, 1.1 0003-Update-gnome-volume-control-code.patch, NONE,
	1.1 0004-Update-volume-control-code-for-new-API.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.109, 1.110
Message-ID: <20090907150230.1017C11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	0001-Update-gnome-volume-control-code-from-master.patch 
	0002-Bug-590073-gnome-settings-daemon-crashed-with-SI.patch 
	0003-Update-gnome-volume-control-code.patch 
	0004-Update-volume-control-code-for-new-API.patch 
Log Message:
* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-10
- Update volume code from 2.27


0001-Update-gnome-volume-control-code-from-master.patch:
 cut-n-paste/gvc-channel-map.c         |  175 ++++++++++++++++++---
 cut-n-paste/gvc-channel-map.h         |   24 ++
 cut-n-paste/gvc-mixer-control.c       |  276 +++++++++++++++++++++++++++-------
 cut-n-paste/gvc-mixer-control.h       |    1 
 cut-n-paste/gvc-mixer-event-role.c    |   29 +--
 cut-n-paste/gvc-mixer-event-role.h    |    5 
 cut-n-paste/gvc-mixer-sink-input.c    |   40 ++--
 cut-n-paste/gvc-mixer-sink.c          |   53 +++---
 cut-n-paste/gvc-mixer-source-output.c |    6 
 cut-n-paste/gvc-mixer-source.c        |   48 ++---
 cut-n-paste/gvc-mixer-stream.c        |  225 ++++++++++++++++++++++++---
 cut-n-paste/gvc-mixer-stream.h        |   23 ++
 gsd-media-keys-manager.c              |   11 -
 13 files changed, 708 insertions(+), 208 deletions(-)

--- NEW FILE 0001-Update-gnome-volume-control-code-from-master.patch ---
>From dffcd6f60cb6984b28d673d013b436de4ee54f4e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 22 Jun 2009 15:40:19 +0100
Subject: [PATCH 1/4] Update gnome-volume-control code from master

And make slight changes to gsd-media-keys-manager.c to match
the new API.
---
 plugins/media-keys/cut-n-paste/gvc-channel-map.c   |  175 +++++++++++--
 plugins/media-keys/cut-n-paste/gvc-channel-map.h   |   24 ++-
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c |  276 ++++++++++++++++----
 plugins/media-keys/cut-n-paste/gvc-mixer-control.h |    1 +
 .../media-keys/cut-n-paste/gvc-mixer-event-role.c  |   29 +-
 .../media-keys/cut-n-paste/gvc-mixer-event-role.h  |    5 +-
 .../media-keys/cut-n-paste/gvc-mixer-sink-input.c  |   40 ++--
 plugins/media-keys/cut-n-paste/gvc-mixer-sink.c    |   53 ++--
 .../cut-n-paste/gvc-mixer-source-output.c          |    6 +-
 plugins/media-keys/cut-n-paste/gvc-mixer-source.c  |   48 ++--
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.c  |  225 ++++++++++++++---
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.h  |   23 ++-
 plugins/media-keys/gsd-media-keys-manager.c        |   10 +-
 13 files changed, 708 insertions(+), 207 deletions(-)

diff --git a/plugins/media-keys/cut-n-paste/gvc-channel-map.c b/plugins/media-keys/cut-n-paste/gvc-channel-map.c
index e7c9b22..32750ef 100644
--- a/plugins/media-keys/cut-n-paste/gvc-channel-map.c
+++ b/plugins/media-keys/cut-n-paste/gvc-channel-map.c
@@ -33,15 +33,26 @@
 
 #define GVC_CHANNEL_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_CHANNEL_MAP, GvcChannelMapPrivate))
 
+#ifndef PA_CHECK_VERSION
+#define PA_CHECK_VERSION(major,minor,micro)                             \
+        ((PA_MAJOR > (major)) ||                                        \
+         (PA_MAJOR == (major) && PA_MINOR > (minor)) ||                 \
+         (PA_MAJOR == (major) && PA_MINOR == (minor) && PA_MICRO >= (micro)))
+#endif
+
+
 struct GvcChannelMapPrivate
 {
-        guint                 num_channels;
-        pa_channel_position_t positions[PA_CHANNELS_MAX];
-        gdouble               gains[PA_CHANNELS_MAX];
+        pa_channel_map        pa_map;
+        pa_cvolume            pa_volume;
+        gdouble               extern_volume[NUM_TYPES]; /* volume, balance, fade, lfe */
+        gboolean              can_balance;
+        gboolean              can_fade;
+        gboolean              has_lfe;
 };
 
 enum {
-        GAINS_CHANGED,
+        VOLUME_CHANGED,
         LAST_SIGNAL
 };
 
@@ -53,25 +64,135 @@ static void     gvc_channel_map_finalize   (GObject            *object);
 
 G_DEFINE_TYPE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT)
 
+/* FIXME remove when we depend on a newer PA */
+static int
+gvc_pa_channel_map_has_position (const pa_channel_map *map, pa_channel_position_t p) {
+        unsigned c;
+
+        g_return_val_if_fail(pa_channel_map_valid(map), 0);
+        g_return_val_if_fail(p < PA_CHANNEL_POSITION_MAX, 0);
+
+        for (c = 0; c < map->channels; c++)
+                if (map->map[c] == p)
+                        return 1;
+
+        return 0;
+}
+
+#if !PA_CHECK_VERSION(0,9,16)
+/* The PulseAudio master increase version only when tagged, so let's avoid clashing with pa_ namespace */
+#define pa_cvolume_get_position gvc_cvolume_get_position
+static pa_volume_t
+gvc_cvolume_get_position (pa_cvolume *cv, const pa_channel_map *map, pa_channel_position_t t) {
+        unsigned c;
+        pa_volume_t v = PA_VOLUME_MUTED;
+
+        g_assert(cv);
+        g_assert(map);
+
+        g_return_val_if_fail(pa_cvolume_compatible_with_channel_map(cv, map), PA_VOLUME_MUTED);
+        g_return_val_if_fail(t < PA_CHANNEL_POSITION_MAX, PA_VOLUME_MUTED);
+
+        for (c = 0; c < map->channels; c++)
+                if (map->map[c] == t)
+                        if (cv->values[c] > v)
+                                v = cv->values[c];
+
+        return v;
+}
+#endif
+
 guint
 gvc_channel_map_get_num_channels (GvcChannelMap *map)
 {
         g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), 0);
-        return map->priv->num_channels;
+
+        if (!pa_channel_map_valid(&map->priv->pa_map))
+                return 0;
+
+        return map->priv->pa_map.channels;
+}
+
+const gdouble *
+gvc_channel_map_get_volume (GvcChannelMap *map)
+{
+        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
+
+        if (!pa_channel_map_valid(&map->priv->pa_map))
+                return NULL;
+
+        map->priv->extern_volume[VOLUME] = (gdouble) pa_cvolume_max (&map->priv->pa_volume);
+        if (gvc_channel_map_can_balance (map))
+                map->priv->extern_volume[BALANCE] = (gdouble) pa_cvolume_get_balance (&map->priv->pa_volume, &map->priv->pa_map);
+        else
+                map->priv->extern_volume[BALANCE] = 0;
+        if (gvc_channel_map_can_fade (map))
+                map->priv->extern_volume[FADE] = (gdouble) pa_cvolume_get_fade (&map->priv->pa_volume, &map->priv->pa_map);
+        else
+                map->priv->extern_volume[FADE] = 0;
+        if (gvc_channel_map_has_lfe (map))
+                map->priv->extern_volume[LFE] = (gdouble) pa_cvolume_get_position (&map->priv->pa_volume, &map->priv->pa_map, PA_CHANNEL_POSITION_LFE);
+        else
+                map->priv->extern_volume[LFE] = 0;
+
+        return map->priv->extern_volume;
+}
+
+gboolean
+gvc_channel_map_can_balance (GvcChannelMap  *map)
+{
+        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), FALSE);
+
+        return map->priv->can_balance;
+}
+
+gboolean
+gvc_channel_map_can_fade (GvcChannelMap  *map)
+{
+        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), FALSE);
+
+        return map->priv->can_fade;
+}
+
+const char *
+gvc_channel_map_get_mapping (GvcChannelMap  *map)
+{
+        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
+
+        if (!pa_channel_map_valid(&map->priv->pa_map))
+                return NULL;
+
+        return pa_channel_map_to_pretty_name (&map->priv->pa_map);
 }
 
-gdouble *
-gvc_channel_map_get_gains (GvcChannelMap *map)
+gboolean
+gvc_channel_map_has_lfe (GvcChannelMap  *map)
+{
+        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), FALSE);
+
+        return map->priv->has_lfe;
+}
+
+const pa_channel_map *
+gvc_channel_map_get_pa_channel_map (GvcChannelMap  *map)
 {
         g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-        return map->priv->gains;
+
+        if (!pa_channel_map_valid(&map->priv->pa_map))
+                return NULL;
+
+        return &map->priv->pa_map;
 }
 
-pa_channel_position_t *
-gvc_channel_map_get_positions (GvcChannelMap *map)
+const pa_cvolume *
+gvc_channel_map_get_cvolume (GvcChannelMap  *map)
 {
         g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-        return map->priv->positions;
+
+        if (!pa_channel_map_valid(&map->priv->pa_map))
+                return NULL;
+
+        return &map->priv->pa_volume;
 }
 
 static void
@@ -81,11 +202,11 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass)
 
         gobject_class->finalize = gvc_channel_map_finalize;
 
-        signals [GAINS_CHANGED] =
-                g_signal_new ("gains-changed",
+        signals [VOLUME_CHANGED] =
+                g_signal_new ("volume-changed",
                               G_TYPE_FROM_CLASS (klass),
                               G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GvcChannelMapClass, gains_changed),
+                              G_STRUCT_OFFSET (GvcChannelMapClass, volume_changed),
                               NULL, NULL,
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE, 0);
@@ -94,10 +215,19 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass)
 }
 
 void
-gvc_channel_map_gains_changed (GvcChannelMap *map)
+gvc_channel_map_volume_changed (GvcChannelMap     *map,
+                                const pa_cvolume  *cv)
 {
         g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
-        g_signal_emit (map, signals[GAINS_CHANGED], 0);
+        g_return_if_fail (cv != NULL);
+        g_return_if_fail (pa_cvolume_compatible_with_channel_map(cv, &map->priv->pa_map));
+
+        if (pa_cvolume_equal(cv, &map->priv->pa_volume))
+                return;
+
+        map->priv->pa_volume = *cv;
+
+        g_signal_emit (map, signals[VOLUME_CHANGED], 0);
 }
 
 static void
@@ -133,13 +263,14 @@ static void
 set_from_pa_map (GvcChannelMap        *map,
                  const pa_channel_map *pa_map)
 {
-        guint i;
+        g_assert (pa_channel_map_valid(pa_map));
+
+        map->priv->can_balance = pa_channel_map_can_balance (pa_map);
+        map->priv->can_fade = pa_channel_map_can_fade (pa_map);
+        map->priv->has_lfe = gvc_pa_channel_map_has_position (pa_map, PA_CHANNEL_POSITION_LFE);
 
-        map->priv->num_channels = pa_map->channels;
-        for (i = 0; i < pa_map->channels; i++) {
-                map->priv->positions[i] = pa_map->map[i];
-                map->priv->gains[i] = 1.0;
-        }
+        map->priv->pa_map = *pa_map;
+        pa_cvolume_set(&map->priv->pa_volume, pa_map->channels, PA_VOLUME_NORM);
 }
 
 GvcChannelMap *
diff --git a/plugins/media-keys/cut-n-paste/gvc-channel-map.h b/plugins/media-keys/cut-n-paste/gvc-channel-map.h
index 963904f..b35c9cb 100644
--- a/plugins/media-keys/cut-n-paste/gvc-channel-map.h
+++ b/plugins/media-keys/cut-n-paste/gvc-channel-map.h
@@ -44,19 +44,35 @@ typedef struct
 typedef struct
 {
         GObjectClass           parent_class;
-        void (*gains_changed) (GvcChannelMap *channel_map);
+        void (*volume_changed) (GvcChannelMap *channel_map);
 } GvcChannelMapClass;
 
+enum {
+        VOLUME,
+        BALANCE,
+        FADE,
+        LFE,
+};
+
+#define NUM_TYPES LFE + 1
+
 GType                   gvc_channel_map_get_type                (void);
 
 GvcChannelMap *         gvc_channel_map_new                     (void);
 GvcChannelMap *         gvc_channel_map_new_from_pa_channel_map (const pa_channel_map *map);
 guint                   gvc_channel_map_get_num_channels        (GvcChannelMap  *map);
-pa_channel_position_t * gvc_channel_map_get_positions           (GvcChannelMap  *map);
-gdouble *               gvc_channel_map_get_gains               (GvcChannelMap  *map);
+const gdouble *         gvc_channel_map_get_volume              (GvcChannelMap  *map);
+gboolean                gvc_channel_map_can_balance             (GvcChannelMap  *map);
+gboolean                gvc_channel_map_can_fade                (GvcChannelMap  *map);
+gboolean                gvc_channel_map_has_lfe                 (GvcChannelMap  *map);
 
-void                    gvc_channel_map_gains_changed           (GvcChannelMap  *map);
+void                    gvc_channel_map_volume_changed          (GvcChannelMap    *map,
+                                                                 const pa_cvolume *cv);
+const char *            gvc_channel_map_get_mapping             (GvcChannelMap  *map);
 
+/* private */
+const pa_cvolume *      gvc_channel_map_get_cvolume             (GvcChannelMap  *map);
+const pa_channel_map *  gvc_channel_map_get_pa_channel_map      (GvcChannelMap  *map);
 G_END_DECLS
 
 #endif /* __GVC_CHANNEL_MAP_H */
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
index e7dd18b..92b0286 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
@@ -48,6 +48,7 @@ struct GvcMixerControlPrivate
         pa_mainloop_api  *pa_api;
         pa_context       *pa_context;
         int               n_outstanding;
+        guint             reconnect_id;
 
         gboolean          default_sink_is_set;
         guint             default_sink_id;
@@ -65,9 +66,12 @@ struct GvcMixerControlPrivate
         GHashTable       *sink_inputs; /* routable output streams */
         GHashTable       *source_outputs; /* routable input streams */
         GHashTable       *clients;
+
+        GvcMixerStream   *new_default_stream; /* new default stream, used in gvc_mixer_control_set_default_sink () */
 };
 
 enum {
+        CONNECTING,
         READY,
         STREAM_ADDED,
         STREAM_REMOVED,
@@ -104,6 +108,42 @@ 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_stream == 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 = gvc_mixer_stream_get_name (control->priv->new_default_stream);
+
+        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: %s",
+                           pa_strerror (pa_context_errno (control->priv->pa_context)));
+                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)
@@ -118,7 +158,23 @@ gvc_mixer_control_set_default_sink (GvcMixerControl *control,
                                          NULL,
                                          NULL);
         if (o == NULL) {
-                g_warning ("pa_context_set_default_sink() failed");
+                g_warning ("pa_context_set_default_sink() failed: %s",
+                           pa_strerror (pa_context_errno (control->priv->pa_context)));
+                return FALSE;
+        }
+
+        pa_operation_unref (o);
+
+        control->priv->new_default_stream = stream;
+        g_object_add_weak_pointer (G_OBJECT (stream), (gpointer *) &control->priv->new_default_stream);
+
+        o = pa_ext_stream_restore_read (control->priv->pa_context,
+                                        gvc_mixer_control_stream_restore_cb,
+                                        control);
+
+        if (o == NULL) {
+                g_warning ("pa_ext_stream_restore_read() failed: %s",
+                           pa_strerror (pa_context_errno (control->priv->pa_context)));
                 return FALSE;
         }
 
@@ -220,6 +276,13 @@ gvc_stream_collate (GvcMixerStream *a,
         namea = gvc_mixer_stream_get_name (a);
         nameb = gvc_mixer_stream_get_name (b);
 
+        if (nameb == NULL && namea == NULL)
+                return 0;
+        if (nameb == NULL)
+                return 1;
+        if (namea == NULL)
+                return -1;
+
         return g_utf8_collate (namea, nameb);
 }
 
@@ -320,12 +383,14 @@ _set_default_source (GvcMixerControl *control,
 {
         guint new_id;
 
-        new_id = 0;
-
-        if (stream != NULL) {
-                new_id = gvc_mixer_stream_get_id (stream);
+        if (stream == NULL) {
+                control->priv->default_source_id = 0;
+                control->priv->default_source_is_set = FALSE;
+                return;
         }
 
+        new_id = gvc_mixer_stream_get_id (stream);
+
         if (control->priv->default_source_id != new_id) {
                 control->priv->default_source_id = new_id;
                 control->priv->default_source_is_set = TRUE;
@@ -342,12 +407,14 @@ _set_default_sink (GvcMixerControl *control,
 {
         guint new_id;
 
-        new_id = 0;
-
-        if (stream != NULL) {
-                new_id = gvc_mixer_stream_get_id (stream);
+        if (stream == NULL) {
+                control->priv->default_sink_id = 0;
+                control->priv->default_sink_is_set = FALSE;
+                return;
         }
 
+        new_id = gvc_mixer_stream_get_id (stream);
+
         if (control->priv->default_sink_id != new_id) {
                 control->priv->default_sink_id = new_id;
                 control->priv->default_sink_is_set = TRUE;
@@ -495,6 +562,7 @@ update_sink (GvcMixerControl    *control,
         GvcMixerStream *stream;
         gboolean        is_new;
         pa_volume_t     max_volume;
+        GvcChannelMap  *map;
         char            map_buff[PA_CHANNEL_MAP_SNPRINT_MAX];
 
         pa_channel_map_snprint (map_buff, PA_CHANNEL_MAP_SNPRINT_MAX, &info->channel_map);
@@ -506,22 +574,21 @@ update_sink (GvcMixerControl    *control,
                  map_buff);
 #endif
 
-        /* for now completely ignore virtual streams */
-        if (!(info->flags & PA_SINK_HARDWARE)) {
-                return;
-        }
-
+        map = NULL;
         is_new = FALSE;
         stream = g_hash_table_lookup (control->priv->sinks,
                                       GUINT_TO_POINTER (info->index));
         if (stream == NULL) {
-                GvcChannelMap *map;
                 map = gvc_channel_map_new_from_pa_channel_map (&info->channel_map);
                 stream = gvc_mixer_sink_new (control->priv->pa_context,
                                              info->index,
                                              map);
                 g_object_unref (map);
                 is_new = TRUE;
+        } else if (gvc_mixer_stream_is_running (stream)) {
+                /* Ignore events if volume changes are outstanding */
+                g_debug ("Ignoring event, volume changes are outstanding");
+                return;
         }
 
         max_volume = pa_cvolume_max (&info->volume);
@@ -531,11 +598,6 @@ update_sink (GvcMixerControl    *control,
         gvc_mixer_stream_set_volume (stream, (guint)max_volume);
         gvc_mixer_stream_set_is_muted (stream, info->mute);
         gvc_mixer_stream_set_can_decibel (stream, !!(info->flags & PA_SINK_DECIBEL_VOLUME));
-        if (!!(info->flags & PA_SINK_DECIBEL_VOLUME)) {
-                gdouble db;
-                db = pa_sw_volume_to_dB (max_volume);
-                gvc_mixer_stream_set_decibel (stream, db);
-        }
 
         if (is_new) {
                 g_hash_table_insert (control->priv->sinks,
@@ -549,6 +611,10 @@ update_sink (GvcMixerControl    *control,
             && strcmp (control->priv->default_sink_name, info->name) == 0) {
                 _set_default_sink (control, stream);
         }
+
+        if (map == NULL)
+                map = gvc_mixer_stream_get_channel_map (stream);
+        gvc_channel_map_volume_changed (map, &info->volume);
 }
 
 static void
@@ -566,8 +632,8 @@ update_source (GvcMixerControl      *control,
                  info->description);
 #endif
 
-        /* for now completely ignore virtual streams */
-        if (!(info->flags & PA_SOURCE_HARDWARE)) {
+        /* completely ignore monitors, they're not real sources */
+        if (info->monitor_of_sink != PA_INVALID_INDEX) {
                 return;
         }
 
@@ -583,6 +649,10 @@ update_source (GvcMixerControl      *control,
                                                map);
                 g_object_unref (map);
                 is_new = TRUE;
+        } else if (gvc_mixer_stream_is_running (stream)) {
+                /* Ignore events if volume changes are outstanding */
+                g_debug ("Ignoring event, volume changes are outstanding");
+                return;
         }
 
         max_volume = pa_cvolume_max (&info->volume);
@@ -593,11 +663,7 @@ update_source (GvcMixerControl      *control,
         gvc_mixer_stream_set_volume (stream, (guint)max_volume);
         gvc_mixer_stream_set_is_muted (stream, info->mute);
         gvc_mixer_stream_set_can_decibel (stream, !!(info->flags & PA_SOURCE_DECIBEL_VOLUME));
-        if (!!(info->flags & PA_SINK_DECIBEL_VOLUME)) {
-                gdouble db;
-                db = pa_sw_volume_to_dB (max_volume);
-                gvc_mixer_stream_set_decibel (stream, db);
-        }
+        gvc_mixer_stream_set_base_volume (stream, (guint32) info->base_volume);
 
         if (is_new) {
                 g_hash_table_insert (control->priv->sources,
@@ -662,6 +728,34 @@ set_icon_name_from_proplist (GvcMixerStream *stream,
 }
 
 static void
+set_is_event_stream_from_proplist (GvcMixerStream *stream,
+                                   pa_proplist    *l)
+{
+        const char *t;
+        gboolean is_event_stream;
+
+        is_event_stream = FALSE;
+
+        if ((t = pa_proplist_gets (l, PA_PROP_MEDIA_ROLE))) {
+                if (g_str_equal (t, "event"))
+                        is_event_stream = TRUE;
+        }
+
+        gvc_mixer_stream_set_is_event_stream (stream, is_event_stream);
+}
+
+static void
+set_application_id_from_proplist (GvcMixerStream *stream,
+                                  pa_proplist    *l)
+{
+        const char *t;
+
+        if ((t = pa_proplist_gets (l, PA_PROP_APPLICATION_ID))) {
+                gvc_mixer_stream_set_application_id (stream, t);
+        }
+}
+
+static void
 update_sink_input (GvcMixerControl          *control,
                    const pa_sink_input_info *info)
 {
@@ -690,6 +784,10 @@ update_sink_input (GvcMixerControl          *control,
                                                    map);
                 g_object_unref (map);
                 is_new = TRUE;
+        } else if (gvc_mixer_stream_is_running (stream)) {
+                /* Ignore events if volume changes are outstanding */
+                g_debug ("Ignoring event, volume changes are outstanding");
+                return;
         }
 
         max_volume = pa_cvolume_max (&info->volume);
@@ -699,9 +797,12 @@ update_sink_input (GvcMixerControl          *control,
         gvc_mixer_stream_set_name (stream, name);
         gvc_mixer_stream_set_description (stream, info->name);
 
+        set_application_id_from_proplist (stream, info->proplist);
+        set_is_event_stream_from_proplist (stream, info->proplist);
         set_icon_name_from_proplist (stream, info->proplist, "applications-multimedia");
         gvc_mixer_stream_set_volume (stream, (guint)max_volume);
         gvc_mixer_stream_set_is_muted (stream, info->mute);
+        gvc_mixer_stream_set_is_virtual (stream, info->client == PA_INVALID_INDEX);
 
         if (is_new) {
                 g_hash_table_insert (control->priv->sink_inputs,
@@ -745,7 +846,9 @@ update_source_output (GvcMixerControl             *control,
 
         gvc_mixer_stream_set_name (stream, name);
         gvc_mixer_stream_set_description (stream, info->name);
-        set_icon_name_from_proplist (stream, info->proplist, "applications-multimedia");
+        set_application_id_from_proplist (stream, info->proplist);
+        set_is_event_stream_from_proplist (stream, info->proplist);
+        set_icon_name_from_proplist (stream, info->proplist, "audio-input-microphone");
 
         if (is_new) {
                 g_hash_table_insert (control->priv->source_outputs,
@@ -938,8 +1041,16 @@ update_event_role_stream (GvcMixerControl                  *control,
         is_new = FALSE;
 
         if (!control->priv->event_sink_input_is_set) {
+                pa_channel_map pa_map;
+                GvcChannelMap *map;
+
+                pa_map.channels = 1;
+                pa_map.map[0] = PA_CHANNEL_POSITION_MONO;
+                map = gvc_channel_map_new_from_pa_channel_map (&pa_map);
+
                 stream = gvc_mixer_event_role_new (control->priv->pa_context,
-                                                   info->device);
+                                                   info->device,
+                                                   map);
                 control->priv->event_sink_input_id = gvc_mixer_stream_get_id (stream);
                 control->priv->event_sink_input_is_set = TRUE;
 
@@ -1346,6 +1457,78 @@ gvc_mixer_control_ready (GvcMixerControl *control)
 }
 
 static void
+gvc_mixer_new_pa_context (GvcMixerControl *self)
+{
+        pa_proplist     *proplist;
+
+        g_return_if_fail (self);
+        g_return_if_fail (!self->priv->pa_context);
+
+        /* FIXME: read these from an object property */
+        proplist = pa_proplist_new ();
+        pa_proplist_sets (proplist,
+                          PA_PROP_APPLICATION_NAME,
+                          _("GNOME Volume Control"));
+        pa_proplist_sets (proplist,
+                          PA_PROP_APPLICATION_ID,
+                          "org.gnome.VolumeControl");
+        pa_proplist_sets (proplist,
+                          PA_PROP_APPLICATION_ICON_NAME,
+                          "multimedia-volume-control");
+        pa_proplist_sets (proplist,
+                          PA_PROP_APPLICATION_VERSION,
+                          PACKAGE_VERSION);
+
+        self->priv->pa_context = pa_context_new_with_proplist (self->priv->pa_api, NULL, proplist);
+
+        pa_proplist_free (proplist);
+        g_assert (self->priv->pa_context);
+}
+
+static void
+remove_all_streams (GvcMixerControl *control, GHashTable *hash_table)
+{
+        GHashTableIter iter;
+        gpointer key, value;
+
+        g_hash_table_iter_init (&iter, hash_table);
+        while (g_hash_table_iter_next (&iter, &key, &value)) {
+                remove_stream (control, value);
+                g_hash_table_iter_remove (&iter);
+        }
+}
+
+static gboolean
+idle_reconnect (gpointer data)
+{
+        GvcMixerControl *control = GVC_MIXER_CONTROL (data);
+        GHashTableIter iter;
+        gpointer key, value;
+
+        g_return_val_if_fail (control, FALSE);
+
+        if (control->priv->pa_context) {
+                pa_context_unref (control->priv->pa_context);
+                control->priv->pa_context = NULL;
+                gvc_mixer_new_pa_context (control);
+        }
+
+        remove_all_streams (control, control->priv->sinks);
+        remove_all_streams (control, control->priv->sources);
+        remove_all_streams (control, control->priv->sink_inputs);
+        remove_all_streams (control, control->priv->source_outputs);
+
+        g_hash_table_iter_init (&iter, control->priv->clients);
+        while (g_hash_table_iter_next (&iter, &key, &value))
+                g_hash_table_iter_remove (&iter);
+
+        gvc_mixer_control_open (control); /* cannot fail */
+
+        control->priv->reconnect_id = 0;
+        return FALSE;
+}
+
+static void
 _pa_context_state_cb (pa_context *context,
                       void       *userdata)
 {
@@ -1363,7 +1546,9 @@ _pa_context_state_cb (pa_context *context,
                 break;
 
         case PA_CONTEXT_FAILED:
-                g_warning ("Connection failed");
+                g_warning ("Connection failed, reconnecting...");
+                if (control->priv->reconnect_id == 0)
+                        control->priv->reconnect_id = g_idle_add (idle_reconnect, control);
                 break;
 
         case PA_CONTEXT_TERMINATED:
@@ -1386,7 +1571,8 @@ gvc_mixer_control_open (GvcMixerControl *control)
                                        _pa_context_state_cb,
                                        control);
 
-        res = pa_context_connect (control->priv->pa_context, NULL, (pa_context_flags_t) 0, NULL);
+        g_signal_emit (G_OBJECT (control), signals[CONNECTING], 0);
+        res = pa_context_connect (control->priv->pa_context, NULL, (pa_context_flags_t) PA_CONTEXT_NOFAIL, NULL);
         if (res < 0) {
                 g_warning ("Failed to connect context: %s",
                            pa_strerror (pa_context_errno (control->priv->pa_context)));
@@ -1465,30 +1651,12 @@ gvc_mixer_control_constructor (GType                  type,
 {
         GObject         *object;
         GvcMixerControl *self;
-        pa_proplist     *proplist;
 
         object = G_OBJECT_CLASS (gvc_mixer_control_parent_class)->constructor (type, n_construct_properties, construct_params);
 
         self = GVC_MIXER_CONTROL (object);
 
-        /* FIXME: read these from an object property */
-        proplist = pa_proplist_new ();
-        pa_proplist_sets (proplist,
-                          PA_PROP_APPLICATION_NAME,
-                          _("GNOME Volume Control"));
-        pa_proplist_sets (proplist,
-                          PA_PROP_APPLICATION_ID,
-                          "org.gnome.VolumeControl");
-        pa_proplist_sets (proplist,
-                          PA_PROP_APPLICATION_ICON_NAME,
-                          "multimedia-volume-control");
-        pa_proplist_sets (proplist,
-                          PA_PROP_APPLICATION_VERSION,
-                          PACKAGE_VERSION);
-
-        self->priv->pa_context = pa_context_new_with_proplist (self->priv->pa_api, NULL, proplist);
-        g_assert (self->priv->pa_context);
-        pa_proplist_free (proplist);
+        gvc_mixer_new_pa_context (self);
 
         return object;
 }
@@ -1502,6 +1670,14 @@ gvc_mixer_control_class_init (GvcMixerControlClass *klass)
         object_class->dispose = gvc_mixer_control_dispose;
         object_class->finalize = gvc_mixer_control_finalize;
 
+        signals [CONNECTING] =
+                g_signal_new ("connecting",
+                              G_TYPE_FROM_CLASS (klass),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (GvcMixerControlClass, connecting),
+                              NULL, NULL,
+                              g_cclosure_marshal_VOID__VOID,
+                              G_TYPE_NONE, 0);
         signals [READY] =
                 g_signal_new ("ready",
                               G_TYPE_FROM_CLASS (klass),
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-control.h b/plugins/media-keys/cut-n-paste/gvc-mixer-control.h
index 33e745a..3de9e62 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-control.h
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-control.h
@@ -46,6 +46,7 @@ typedef struct
 {
         GObjectClass            parent_class;
 
+        void (*connecting)             (GvcMixerControl *control);
         void (*ready)                  (GvcMixerControl *control);
         void (*stream_added)           (GvcMixerControl *control,
                                         guint            id);
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c
index b5469ca..69e38ce 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c
@@ -53,21 +53,22 @@ G_DEFINE_TYPE (GvcMixerEventRole, gvc_mixer_event_role, GVC_TYPE_MIXER_STREAM)
 
 static gboolean
 update_settings (GvcMixerEventRole *role,
-                 guint              volume,
-                 gboolean           is_muted)
+                 gboolean           is_muted,
+                 gpointer          *op)
 {
         pa_operation              *o;
         guint                      index;
+        GvcChannelMap     *map;
         pa_context                *context;
         pa_ext_stream_restore_info info;
 
         index = gvc_mixer_stream_get_index (GVC_MIXER_STREAM (role));
 
-        pa_cvolume_set (&info.volume, 1, (pa_volume_t)volume);
+        map = gvc_mixer_stream_get_channel_map (GVC_MIXER_STREAM(role));
 
+        info.volume = *gvc_channel_map_get_cvolume(map);
         info.name = "sink-input-by-media-role:event";
-        info.channel_map.channels = 1;
-        info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
+        info.channel_map = *gvc_channel_map_get_pa_channel_map(map);
         info.device = role->priv->device;
         info.mute = is_muted;
 
@@ -86,18 +87,17 @@ update_settings (GvcMixerEventRole *role,
                 return FALSE;
         }
 
-        pa_operation_unref(o);
+	if (op != NULL)
+		*op = o;
 
         return TRUE;
 }
 
 static gboolean
-gvc_mixer_event_role_change_volume (GvcMixerStream *stream,
-                                    guint           volume)
+gvc_mixer_event_role_push_volume (GvcMixerStream *stream, gpointer *op)
 {
         return update_settings (GVC_MIXER_EVENT_ROLE (stream),
-                                volume,
-                                gvc_mixer_stream_get_is_muted (stream));
+                                gvc_mixer_stream_get_is_muted (stream), op);
 }
 
 static gboolean
@@ -105,8 +105,7 @@ gvc_mixer_event_role_change_is_muted (GvcMixerStream *stream,
                                       gboolean        is_muted)
 {
         return update_settings (GVC_MIXER_EVENT_ROLE (stream),
-                                gvc_mixer_stream_get_volume (stream),
-                                is_muted);
+                                is_muted, NULL);
 }
 
 static gboolean
@@ -184,7 +183,7 @@ gvc_mixer_event_role_class_init (GvcMixerEventRoleClass *klass)
         object_class->set_property = gvc_mixer_event_role_set_property;
         object_class->get_property = gvc_mixer_event_role_get_property;
 
-        stream_class->change_volume = gvc_mixer_event_role_change_volume;
+        stream_class->push_volume = gvc_mixer_event_role_push_volume;
         stream_class->change_is_muted = gvc_mixer_event_role_change_is_muted;
 
         g_object_class_install_property (object_class,
@@ -224,7 +223,8 @@ gvc_mixer_event_role_finalize (GObject *object)
 
 GvcMixerStream *
 gvc_mixer_event_role_new (pa_context *context,
-                          const char *device)
+                          const char *device,
+                          GvcChannelMap *channel_map)
 {
         GObject *object;
 
@@ -232,6 +232,7 @@ gvc_mixer_event_role_new (pa_context *context,
                                "pa-context", context,
                                "index", 0,
                                "device", device,
+                               "channel-map", channel_map,
                                NULL);
 
         return GVC_MIXER_STREAM (object);
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.h b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.h
index 280c597..ab4c509 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.h
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.h
@@ -48,8 +48,9 @@ typedef struct
 
 GType               gvc_mixer_event_role_get_type      (void);
 
-GvcMixerStream *    gvc_mixer_event_role_new           (pa_context *context,
-                                                        const char *device);
+GvcMixerStream *    gvc_mixer_event_role_new           (pa_context    *context,
+                                                        const char    *device,
+                                                        GvcChannelMap *channel_map);
 
 G_END_DECLS
 
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c b/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c
index b2c7172..35551bb 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c
@@ -40,44 +40,33 @@ struct GvcMixerSinkInputPrivate
 
 static void     gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass);
 static void     gvc_mixer_sink_input_init       (GvcMixerSinkInput      *mixer_sink_input);
-static void     gvc_mixer_sink_input_finalize   (GObject            *object);
+static void     gvc_mixer_sink_input_finalize   (GObject                *object);
+static void     gvc_mixer_sink_input_dispose    (GObject                *object);
 
 G_DEFINE_TYPE (GvcMixerSinkInput, gvc_mixer_sink_input, GVC_TYPE_MIXER_STREAM)
 
 static gboolean
-gvc_mixer_sink_input_change_volume (GvcMixerStream *stream,
-                                    guint           volume)
+gvc_mixer_sink_input_push_volume (GvcMixerStream *stream, gpointer *op)
 {
         pa_operation      *o;
         guint              index;
         GvcChannelMap     *map;
         pa_context        *context;
-        pa_cvolume         cv;
-        guint              i;
+        const pa_cvolume  *cv;
         guint              num_channels;
-        gdouble           *gains;
 
         index = gvc_mixer_stream_get_index (stream);
 
         map = gvc_mixer_stream_get_channel_map (stream);
         num_channels = gvc_channel_map_get_num_channels (map);
-        gains = gvc_channel_map_get_gains (map);
 
-        /* set all values to nominal level */
-        pa_cvolume_set (&cv, num_channels, (pa_volume_t)volume);
-
-        /* apply channel gain mapping */
-        for (i = 0; i < num_channels; i++) {
-                pa_volume_t v;
-                v = (double) volume * gains[i];
-                cv.values[i] = v;
-        }
+        cv = gvc_channel_map_get_cvolume(map);
 
         context = gvc_mixer_stream_get_pa_context (stream);
 
         o = pa_context_set_sink_input_volume (context,
                                               index,
-                                              &cv,
+                                              cv,
                                               NULL,
                                               NULL);
 
@@ -86,7 +75,7 @@ gvc_mixer_sink_input_change_volume (GvcMixerStream *stream,
                 return FALSE;
         }
 
-        pa_operation_unref(o);
+        *op = o;
 
         return TRUE;
 }
@@ -140,9 +129,10 @@ gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass)
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
         object_class->constructor = gvc_mixer_sink_input_constructor;
+        object_class->dispose = gvc_mixer_sink_input_dispose;
         object_class->finalize = gvc_mixer_sink_input_finalize;
 
-        stream_class->change_volume = gvc_mixer_sink_input_change_volume;
+        stream_class->push_volume = gvc_mixer_sink_input_push_volume;
         stream_class->change_is_muted = gvc_mixer_sink_input_change_is_muted;
 
         g_type_class_add_private (klass, sizeof (GvcMixerSinkInputPrivate));
@@ -152,7 +142,19 @@ static void
 gvc_mixer_sink_input_init (GvcMixerSinkInput *sink_input)
 {
         sink_input->priv = GVC_MIXER_SINK_INPUT_GET_PRIVATE (sink_input);
+}
+
+static void
+gvc_mixer_sink_input_dispose (GObject *object)
+{
+        GvcMixerSinkInput *mixer_sink_input;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GVC_IS_MIXER_SINK_INPUT (object));
+
+        mixer_sink_input = GVC_MIXER_SINK_INPUT (object);
 
+        G_OBJECT_CLASS (gvc_mixer_sink_input_parent_class)->dispose (object);
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c b/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c
index 76eb3d7..06e5af6 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c
@@ -40,57 +40,41 @@ struct GvcMixerSinkPrivate
 
 static void     gvc_mixer_sink_class_init (GvcMixerSinkClass *klass);
 static void     gvc_mixer_sink_init       (GvcMixerSink      *mixer_sink);
-static void     gvc_mixer_sink_finalize   (GObject            *object);
+static void     gvc_mixer_sink_finalize   (GObject           *object);
+static void     gvc_mixer_sink_dispose    (GObject           *object);
 
 G_DEFINE_TYPE (GvcMixerSink, gvc_mixer_sink, GVC_TYPE_MIXER_STREAM)
 
 static gboolean
-gvc_mixer_sink_change_volume (GvcMixerStream *stream,
-                              guint           volume)
+gvc_mixer_sink_push_volume (GvcMixerStream *stream, gpointer *op)
 {
         pa_operation      *o;
         guint              index;
         GvcChannelMap     *map;
         pa_context        *context;
-        pa_cvolume         cv;
-        guint              i;
-        guint              num_channels;
-        gdouble           *gains;
+        const pa_cvolume  *cv;
 
         index = gvc_mixer_stream_get_index (stream);
 
-
         map = gvc_mixer_stream_get_channel_map (stream);
-        num_channels = gvc_channel_map_get_num_channels (map);
-        gains = gvc_channel_map_get_gains (map);
-
-        g_debug ("Changing volume for sink: n=%d vol=%u", num_channels, (guint)volume);
 
-        /* set all values to nominal level */
-        pa_cvolume_set (&cv, num_channels, (pa_volume_t)volume);
-
-        /* apply channel gain mapping */
-        for (i = 0; i < num_channels; i++) {
-                pa_volume_t v;
-                v = (double) volume * gains[i];
-                g_debug ("Channel %d v=%u", i, v);
-                cv.values[i] = v;
-        }
+        /* set the volume */
+        cv = gvc_channel_map_get_cvolume(map);
 
         context = gvc_mixer_stream_get_pa_context (stream);
 
         o = pa_context_set_sink_volume_by_index (context,
                                                  index,
-                                                 &cv,
+                                                 cv,
                                                  NULL,
                                                  NULL);
 
         if (o == NULL) {
-                g_warning ("pa_context_set_sink_volume_by_index() failed");
+                g_warning ("pa_context_set_sink_volume_by_index() failed: %s", pa_strerror(pa_context_errno(context)));
                 return FALSE;
         }
 
-        pa_operation_unref(o);
+        *op = o;
 
         return TRUE;
 }
@@ -113,7 +97,7 @@ gvc_mixer_sink_change_is_muted (GvcMixerStream *stream,
                                                NULL);
 
         if (o == NULL) {
-                g_warning ("pa_context_set_sink_mute_by_index() failed");
+                g_warning ("pa_context_set_sink_mute_by_index() failed: %s", pa_strerror(pa_context_errno(context)));
                 return FALSE;
         }
 
@@ -127,7 +111,7 @@ gvc_mixer_sink_constructor (GType                  type,
                             guint                  n_construct_properties,
                             GObjectConstructParam *construct_params)
 {
-        GObject       *object;
+        GObject      *object;
         GvcMixerSink *self;
 
         object = G_OBJECT_CLASS (gvc_mixer_sink_parent_class)->constructor (type, n_construct_properties, construct_params);
@@ -144,9 +128,10 @@ gvc_mixer_sink_class_init (GvcMixerSinkClass *klass)
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
         object_class->constructor = gvc_mixer_sink_constructor;
+        object_class->dispose = gvc_mixer_sink_dispose;
         object_class->finalize = gvc_mixer_sink_finalize;
 
-        stream_class->change_volume = gvc_mixer_sink_change_volume;
+        stream_class->push_volume = gvc_mixer_sink_push_volume;
         stream_class->change_is_muted = gvc_mixer_sink_change_is_muted;
 
         g_type_class_add_private (klass, sizeof (GvcMixerSinkPrivate));
@@ -156,7 +141,19 @@ static void
 gvc_mixer_sink_init (GvcMixerSink *sink)
 {
         sink->priv = GVC_MIXER_SINK_GET_PRIVATE (sink);
+}
+
+static void
+gvc_mixer_sink_dispose (GObject *object)
+{
+        GvcMixerSink *mixer_sink;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GVC_IS_MIXER_SINK (object));
+
+        mixer_sink = GVC_MIXER_SINK (object);
 
+        G_OBJECT_CLASS (gvc_mixer_sink_parent_class)->dispose (object);
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c b/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c
index b71ad23..b4cc34d 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c
@@ -45,10 +45,10 @@ static void     gvc_mixer_source_output_finalize   (GObject            *object);
 G_DEFINE_TYPE (GvcMixerSourceOutput, gvc_mixer_source_output, GVC_TYPE_MIXER_STREAM)
 
 static gboolean
-gvc_mixer_source_output_change_volume (GvcMixerStream *stream,
-                                       guint           volume)
+gvc_mixer_source_output_push_volume (GvcMixerStream *stream, gpointer *op)
 {
         /* FIXME: */
+        *op = NULL;
         return TRUE;
 }
 
@@ -84,7 +84,7 @@ gvc_mixer_source_output_class_init (GvcMixerSourceOutputClass *klass)
         object_class->constructor = gvc_mixer_source_output_constructor;
         object_class->finalize = gvc_mixer_source_output_finalize;
 
-        stream_class->change_volume = gvc_mixer_source_output_change_volume;
+        stream_class->push_volume = gvc_mixer_source_output_push_volume;
         stream_class->change_is_muted = gvc_mixer_source_output_change_is_muted;
 
         g_type_class_add_private (klass, sizeof (GvcMixerSourceOutputPrivate));
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-source.c b/plugins/media-keys/cut-n-paste/gvc-mixer-source.c
index de1b09e..ae02d85 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-source.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-source.c
@@ -41,53 +41,40 @@ struct GvcMixerSourcePrivate
 static void     gvc_mixer_source_class_init (GvcMixerSourceClass *klass);
 static void     gvc_mixer_source_init       (GvcMixerSource      *mixer_source);
 static void     gvc_mixer_source_finalize   (GObject            *object);
+static void     gvc_mixer_source_dispose    (GObject           *object);
 
 G_DEFINE_TYPE (GvcMixerSource, gvc_mixer_source, GVC_TYPE_MIXER_STREAM)
 
 static gboolean
-gvc_mixer_source_change_volume (GvcMixerStream *stream,
-                              guint           volume)
+gvc_mixer_source_push_volume (GvcMixerStream *stream, gpointer *op)
 {
         pa_operation      *o;
         guint              index;
         GvcChannelMap     *map;
         pa_context        *context;
-        pa_cvolume         cv;
-        guint              num_channels;
-        guint              i;
-        gdouble           *gains;
+        const pa_cvolume  *cv;
 
         index = gvc_mixer_stream_get_index (stream);
 
         map = gvc_mixer_stream_get_channel_map (stream);
-        num_channels = gvc_channel_map_get_num_channels (map);
-        gains = gvc_channel_map_get_gains (map);
 
-        /* set all values to nominal level */
-        pa_cvolume_set (&cv, num_channels, (pa_volume_t)volume);
-
-
-        /* apply channel gain mapping */
-        for (i = 0; i < num_channels; i++) {
-                pa_volume_t v;
-                v = (double) volume * gains[i];
-                cv.values[i] = v;
-        }
+        /* set the volume */
+        cv = gvc_channel_map_get_cvolume (map);
 
         context = gvc_mixer_stream_get_pa_context (stream);
 
         o = pa_context_set_source_volume_by_index (context,
                                                    index,
-                                                   &cv,
+                                                   cv,
                                                    NULL,
                                                    NULL);
 
         if (o == NULL) {
-                g_warning ("pa_context_set_source_volume_by_index() failed");
+                g_warning ("pa_context_set_source_volume_by_index() failed: %s", pa_strerror(pa_context_errno(context)));
                 return FALSE;
         }
 
-        pa_operation_unref(o);
+        *op = o;
 
         return TRUE;
 }
@@ -110,7 +97,7 @@ gvc_mixer_source_change_is_muted (GvcMixerStream *stream,
                                                  NULL);
 
         if (o == NULL) {
-                g_warning ("pa_context_set_source_mute_by_index() failed");
+                g_warning ("pa_context_set_source_mute_by_index() failed: %s", pa_strerror(pa_context_errno(context)));
                 return FALSE;
         }
 
@@ -124,7 +111,7 @@ gvc_mixer_source_constructor (GType                  type,
                             guint                  n_construct_properties,
                             GObjectConstructParam *construct_params)
 {
-        GObject       *object;
+        GObject        *object;
         GvcMixerSource *self;
 
         object = G_OBJECT_CLASS (gvc_mixer_source_parent_class)->constructor (type, n_construct_properties, construct_params);
@@ -141,9 +128,10 @@ gvc_mixer_source_class_init (GvcMixerSourceClass *klass)
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
         object_class->constructor = gvc_mixer_source_constructor;
+        object_class->dispose = gvc_mixer_source_dispose;
         object_class->finalize = gvc_mixer_source_finalize;
 
-        stream_class->change_volume = gvc_mixer_source_change_volume;
+        stream_class->push_volume = gvc_mixer_source_push_volume;
         stream_class->change_is_muted = gvc_mixer_source_change_is_muted;
 
         g_type_class_add_private (klass, sizeof (GvcMixerSourcePrivate));
@@ -153,7 +141,19 @@ static void
 gvc_mixer_source_init (GvcMixerSource *source)
 {
         source->priv = GVC_MIXER_SOURCE_GET_PRIVATE (source);
+}
+
+static void
+gvc_mixer_source_dispose (GObject *object)
+{
+        GvcMixerSource *mixer_source;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GVC_IS_MIXER_SOURCE (object));
+
+        mixer_source = GVC_MIXER_SOURCE (object);
 
+        G_OBJECT_CLASS (gvc_mixer_source_parent_class)->dispose (object);
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
index 69d8598..e5cfb19 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
@@ -41,13 +41,16 @@ struct GvcMixerStreamPrivate
         guint          id;
         guint          index;
         GvcChannelMap *channel_map;
-        guint          volume;
-        gdouble        decibel;
         char          *name;
         char          *description;
+        char          *application_id;
         char          *icon_name;
         gboolean       is_muted;
         gboolean       can_decibel;
+        gboolean       is_event_stream;
+        gboolean       is_virtual;
+        pa_volume_t    base_volume;
+        pa_operation  *change_volume_op;
 };
 
 enum
@@ -59,11 +62,14 @@ enum
         PROP_INDEX,
         PROP_NAME,
         PROP_DESCRIPTION,
+        PROP_APPLICATION_ID,
         PROP_ICON_NAME,
         PROP_VOLUME,
         PROP_DECIBEL,
         PROP_IS_MUTED,
-        PROP_CAN_DECIBEL
+        PROP_CAN_DECIBEL,
+        PROP_IS_EVENT_STREAM,
+        PROP_IS_VIRTUAL,
 };
 
 static void     gvc_mixer_stream_class_init (GvcMixerStreamClass *klass);
@@ -114,28 +120,36 @@ gvc_mixer_stream_get_channel_map (GvcMixerStream *stream)
         return stream->priv->channel_map;
 }
 
-guint
+pa_volume_t
 gvc_mixer_stream_get_volume (GvcMixerStream *stream)
 {
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), 0);
-        return stream->priv->volume;
+
+        return (pa_volume_t) gvc_channel_map_get_volume(stream->priv->channel_map)[VOLUME];
 }
 
 gdouble
 gvc_mixer_stream_get_decibel (GvcMixerStream *stream)
 {
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), 0);
-        return stream->priv->decibel;
+
+        return pa_sw_volume_to_dB(
+                        (pa_volume_t) gvc_channel_map_get_volume(stream->priv->channel_map)[VOLUME]);
 }
 
 gboolean
 gvc_mixer_stream_set_volume (GvcMixerStream *stream,
-                             pa_volume_t     volume)
+                              pa_volume_t     volume)
 {
+        pa_cvolume cv;
+
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
 
-        if (volume != stream->priv->volume) {
-                stream->priv->volume = volume;
+        cv = *gvc_channel_map_get_cvolume(stream->priv->channel_map);
+        pa_cvolume_scale(&cv, volume);
+
+        if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
+                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv);
                 g_object_notify (G_OBJECT (stream), "volume");
         }
 
@@ -146,11 +160,16 @@ gboolean
 gvc_mixer_stream_set_decibel (GvcMixerStream *stream,
                               gdouble         db)
 {
+        pa_cvolume cv;
+
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
 
-        if (db != stream->priv->decibel) {
-                stream->priv->decibel = db;
-                g_object_notify (G_OBJECT (stream), "decibel");
+        cv = *gvc_channel_map_get_cvolume(stream->priv->channel_map);
+        pa_cvolume_scale(&cv, pa_sw_volume_from_dB(db));
+
+        if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
+                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv);
+                g_object_notify (G_OBJECT (stream), "volume");
         }
 
         return TRUE;
@@ -238,12 +257,73 @@ gvc_mixer_stream_set_description (GvcMixerStream *stream,
         return TRUE;
 }
 
+gboolean
+gvc_mixer_stream_is_event_stream (GvcMixerStream *stream)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        return stream->priv->is_event_stream;
+}
+
+gboolean
+gvc_mixer_stream_set_is_event_stream (GvcMixerStream *stream,
+                                      gboolean is_event_stream)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        stream->priv->is_event_stream = is_event_stream;
+        g_object_notify (G_OBJECT (stream), "is-event-stream");
+
+        return TRUE;
+}
+
+gboolean
+gvc_mixer_stream_is_virtual (GvcMixerStream *stream)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        return stream->priv->is_virtual;
+}
+
+gboolean
+gvc_mixer_stream_set_is_virtual (GvcMixerStream *stream,
+                                 gboolean is_virtual)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        stream->priv->is_virtual = is_virtual;
+        g_object_notify (G_OBJECT (stream), "is-virtual");
+
+        return TRUE;
+}
+
+const char *
+gvc_mixer_stream_get_application_id (GvcMixerStream *stream)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), NULL);
+        return stream->priv->application_id;
+}
+
+gboolean
+gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
+                                     const char *application_id)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        g_free (stream->priv->application_id);
+        stream->priv->application_id = g_strdup (application_id);
+        g_object_notify (G_OBJECT (stream), "application-id");
+
+        return TRUE;
+}
+
 static void
-on_channel_map_gains_changed (GvcChannelMap  *channel_map,
-                              GvcMixerStream *stream)
+on_channel_map_volume_changed (GvcChannelMap  *channel_map,
+                               GvcMixerStream *stream)
 {
-        g_debug ("Gains changed");
-        gvc_mixer_stream_change_volume (stream, stream->priv->volume);
+        gvc_mixer_stream_push_volume (stream);
+
+        g_object_notify (G_OBJECT (stream), "volume");
 }
 
 static gboolean
@@ -258,7 +338,7 @@ gvc_mixer_stream_set_channel_map (GvcMixerStream *stream,
 
         if (stream->priv->channel_map != NULL) {
                 g_signal_handlers_disconnect_by_func (stream->priv->channel_map,
-                                                      on_channel_map_gains_changed,
+                                                      on_channel_map_volume_changed,
                                                       stream);
                 g_object_unref (stream->priv->channel_map);
         }
@@ -267,8 +347,8 @@ gvc_mixer_stream_set_channel_map (GvcMixerStream *stream,
 
         if (stream->priv->channel_map != NULL) {
                 g_signal_connect (stream->priv->channel_map,
-                                  "gains-changed",
-                                  G_CALLBACK (on_channel_map_gains_changed),
+                                  "volume-changed",
+                                  G_CALLBACK (on_channel_map_volume_changed),
                                   stream);
 
                 g_object_notify (G_OBJECT (stream), "channel-map");
@@ -297,6 +377,25 @@ gvc_mixer_stream_set_icon_name (GvcMixerStream *stream,
         return TRUE;
 }
 
+pa_volume_t
+gvc_mixer_stream_get_base_volume (GvcMixerStream *stream)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), 0);
+
+        return stream->priv->base_volume;
+}
+
+gboolean
+gvc_mixer_stream_set_base_volume (GvcMixerStream *stream,
+                                  pa_volume_t base_volume)
+{
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        stream->priv->base_volume = base_volume;
+
+        return TRUE;
+}
+
 static void
 gvc_mixer_stream_set_property (GObject       *object,
                                guint          prop_id,
@@ -324,6 +423,9 @@ gvc_mixer_stream_set_property (GObject       *object,
         case PROP_DESCRIPTION:
                 gvc_mixer_stream_set_description (self, g_value_get_string (value));
                 break;
+        case PROP_APPLICATION_ID:
+                gvc_mixer_stream_set_application_id (self, g_value_get_string (value));
+                break;
         case PROP_ICON_NAME:
                 gvc_mixer_stream_set_icon_name (self, g_value_get_string (value));
                 break;
@@ -336,6 +438,12 @@ gvc_mixer_stream_set_property (GObject       *object,
         case PROP_IS_MUTED:
                 gvc_mixer_stream_set_is_muted (self, g_value_get_boolean (value));
                 break;
+        case PROP_IS_EVENT_STREAM:
+                gvc_mixer_stream_set_is_event_stream (self, g_value_get_boolean (value));
+                break;
+        case PROP_IS_VIRTUAL:
+                gvc_mixer_stream_set_is_virtual (self, g_value_get_boolean (value));
+                break;
         case PROP_CAN_DECIBEL:
                 gvc_mixer_stream_set_can_decibel (self, g_value_get_boolean (value));
                 break;
@@ -372,18 +480,29 @@ gvc_mixer_stream_get_property (GObject     *object,
         case PROP_DESCRIPTION:
                 g_value_set_string (value, self->priv->description);
                 break;
+        case PROP_APPLICATION_ID:
+                g_value_set_string (value, self->priv->application_id);
+                break;
         case PROP_ICON_NAME:
                 g_value_set_string (value, self->priv->icon_name);
                 break;
         case PROP_VOLUME:
-                g_value_set_ulong (value, self->priv->volume);
+                g_value_set_ulong (value,
+                                   pa_cvolume_max(gvc_channel_map_get_cvolume(self->priv->channel_map)));
                 break;
         case PROP_DECIBEL:
-                g_value_set_double (value, self->priv->decibel);
+                g_value_set_double (value,
+                                    pa_sw_volume_to_dB(pa_cvolume_max(gvc_channel_map_get_cvolume(self->priv->channel_map))));
                 break;
         case PROP_IS_MUTED:
                 g_value_set_boolean (value, self->priv->is_muted);
                 break;
+        case PROP_IS_EVENT_STREAM:
+                g_value_set_boolean (value, self->priv->is_event_stream);
+                break;
+        case PROP_IS_VIRTUAL:
+                g_value_set_boolean (value, self->priv->is_virtual);
+                break;
         case PROP_CAN_DECIBEL:
                 g_value_set_boolean (value, self->priv->can_decibel);
                 break;
@@ -411,8 +530,7 @@ gvc_mixer_stream_constructor (GType                  type,
 }
 
 static gboolean
-gvc_mixer_stream_real_change_volume (GvcMixerStream *stream,
-                                     guint           volume)
+gvc_mixer_stream_real_push_volume (GvcMixerStream *stream, gpointer *op)
 {
         return FALSE;
 }
@@ -425,12 +543,17 @@ gvc_mixer_stream_real_change_is_muted (GvcMixerStream *stream,
 }
 
 gboolean
-gvc_mixer_stream_change_volume (GvcMixerStream *stream,
-                                guint           volume)
+gvc_mixer_stream_push_volume (GvcMixerStream *stream)
 {
+        pa_operation *op;
         gboolean ret;
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
-        ret = GVC_MIXER_STREAM_GET_CLASS (stream)->change_volume (stream, volume);
+        ret = GVC_MIXER_STREAM_GET_CLASS (stream)->push_volume (stream, (gpointer *) &op);
+        if (ret) {
+                if (stream->priv->change_volume_op != NULL)
+                        pa_operation_unref (stream->priv->change_volume_op);
+                stream->priv->change_volume_op = op;
+        }
         return ret;
 }
 
@@ -444,6 +567,21 @@ gvc_mixer_stream_change_is_muted (GvcMixerStream *stream,
         return ret;
 }
 
+gboolean
+gvc_mixer_stream_is_running (GvcMixerStream *stream)
+{
+        if (stream->priv->change_volume_op == NULL)
+                return FALSE;
+
+        if ((pa_operation_get_state(stream->priv->change_volume_op) == PA_OPERATION_RUNNING))
+                return TRUE;
+
+        pa_operation_unref(stream->priv->change_volume_op);
+        stream->priv->change_volume_op = NULL;
+
+        return FALSE;
+}
+
 static void
 gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
 {
@@ -454,7 +592,7 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
         gobject_class->set_property = gvc_mixer_stream_set_property;
         gobject_class->get_property = gvc_mixer_stream_get_property;
 
-        klass->change_volume = gvc_mixer_stream_real_change_volume;
+        klass->push_volume = gvc_mixer_stream_real_push_volume;
         klass->change_is_muted = gvc_mixer_stream_real_change_is_muted;
 
         g_object_class_install_property (gobject_class,
@@ -490,7 +628,7 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                              "Volume",
                                                              "The volume for this stream",
                                                              0, G_MAXULONG, 0,
-                                                             G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+                                                             G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class,
                                          PROP_DECIBEL,
                                          g_param_spec_double ("decibel",
@@ -514,6 +652,13 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                               NULL,
                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
         g_object_class_install_property (gobject_class,
+                                         PROP_APPLICATION_ID,
+                                         g_param_spec_string ("application-id",
+                                                              "Application identifier",
+                                                              "Application identifier for this stream",
+                                                              NULL,
+                                                              G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (gobject_class,
                                          PROP_ICON_NAME,
                                          g_param_spec_string ("icon-name",
                                                               "Icon Name",
@@ -534,7 +679,20 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                                "Whether stream volume can be converted to decibel units",
                                                                FALSE,
                                                                G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
+        g_object_class_install_property (gobject_class,
+                                         PROP_IS_EVENT_STREAM,
+                                         g_param_spec_boolean ("is-event-stream",
+                                                               "is event stream",
+                                                               "Whether stream's role is to play an event",
+                                                               FALSE,
+                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (gobject_class,
+                                         PROP_IS_VIRTUAL,
+                                         g_param_spec_boolean ("is-virtual",
+                                                               "is virtual stream",
+                                                               "Whether the stream is virtual",
+                                                               FALSE,
+                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
         g_type_class_add_private (klass, sizeof (GvcMixerStreamPrivate));
 }
 
@@ -542,7 +700,6 @@ static void
 gvc_mixer_stream_init (GvcMixerStream *stream)
 {
         stream->priv = GVC_MIXER_STREAM_GET_PRIVATE (stream);
-
 }
 
 static void
@@ -563,8 +720,16 @@ gvc_mixer_stream_finalize (GObject *object)
         g_free (mixer_stream->priv->description);
         mixer_stream->priv->description = NULL;
 
+        g_free (mixer_stream->priv->application_id);
+        mixer_stream->priv->application_id = NULL;
+
         g_free (mixer_stream->priv->icon_name);
         mixer_stream->priv->icon_name = NULL;
 
+       if (mixer_stream->priv->change_volume_op) {
+               pa_operation_unref(mixer_stream->priv->change_volume_op);
+               mixer_stream->priv->change_volume_op = NULL;
+       }
+
         G_OBJECT_CLASS (gvc_mixer_stream_parent_class)->finalize (object);
 }
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.h b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.h
index 3dee03b..4171ca3 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.h
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.h
@@ -48,8 +48,7 @@ typedef struct
         GObjectClass           parent_class;
 
         /* vtable */
-        gboolean (*change_volume)   (GvcMixerStream *stream,
-                                     guint           volume);
+        gboolean (*push_volume)   (GvcMixerStream *stream, gpointer *operation);
         gboolean (*change_is_muted) (GvcMixerStream *stream,
                                      gboolean        is_muted);
 } GvcMixerStreamClass;
@@ -61,22 +60,26 @@ guint               gvc_mixer_stream_get_index       (GvcMixerStream *stream);
 guint               gvc_mixer_stream_get_id          (GvcMixerStream *stream);
 GvcChannelMap *     gvc_mixer_stream_get_channel_map (GvcMixerStream *stream);
 
-guint               gvc_mixer_stream_get_volume      (GvcMixerStream *stream);
+pa_volume_t         gvc_mixer_stream_get_volume      (GvcMixerStream *stream);
 gdouble             gvc_mixer_stream_get_decibel     (GvcMixerStream *stream);
-gboolean            gvc_mixer_stream_change_volume   (GvcMixerStream *stream,
-                                                      guint           volume);
+gboolean            gvc_mixer_stream_push_volume     (GvcMixerStream *stream);
+pa_volume_t         gvc_mixer_stream_get_base_volume (GvcMixerStream *stream);
 
 gboolean            gvc_mixer_stream_get_is_muted    (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_get_can_decibel (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_change_is_muted (GvcMixerStream *stream,
                                                       gboolean        is_muted);
+gboolean            gvc_mixer_stream_is_running      (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_name        (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_icon_name   (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_description (GvcMixerStream *stream);
+const char *        gvc_mixer_stream_get_application_id (GvcMixerStream *stream);
+gboolean            gvc_mixer_stream_is_event_stream (GvcMixerStream *stream);
+gboolean            gvc_mixer_stream_is_virtual      (GvcMixerStream *stream);
 
 /* private */
 gboolean            gvc_mixer_stream_set_volume      (GvcMixerStream *stream,
-                                                      guint           volume);
+                                                      pa_volume_t     volume);
 gboolean            gvc_mixer_stream_set_decibel     (GvcMixerStream *stream,
                                                       gdouble         db);
 gboolean            gvc_mixer_stream_set_is_muted    (GvcMixerStream *stream,
@@ -89,6 +92,14 @@ gboolean            gvc_mixer_stream_set_description (GvcMixerStream *stream,
                                                       const char     *description);
 gboolean            gvc_mixer_stream_set_icon_name   (GvcMixerStream *stream,
                                                       const char     *name);
+gboolean            gvc_mixer_stream_set_is_event_stream (GvcMixerStream *stream,
+                                                          gboolean is_event_stream);
+gboolean            gvc_mixer_stream_set_is_virtual  (GvcMixerStream *stream,
+                                                      gboolean is_event_stream);
+gboolean            gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
+                                                         const char *application_id);
+gboolean            gvc_mixer_stream_set_base_volume (GvcMixerStream *stream,
+                                                      pa_volume_t     base_volume);
 
 G_END_DECLS
 
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index d35048c..3eeea71 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -687,17 +687,17 @@ do_sound_action (GsdMediaKeysManager *manager,
                 if (!muted && (vol <= norm_vol_step)) {
                         manager->priv->num_expected_update_signals = 2;
                         gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
-                        gvc_mixer_stream_change_volume (manager->priv->stream, 0);
+                        gvc_mixer_stream_set_volume (manager->priv->stream, 0);
                 } else if (!muted) {
                         manager->priv->num_expected_update_signals = 1;
-                        gvc_mixer_stream_change_volume (manager->priv->stream, vol - norm_vol_step);
+                        gvc_mixer_stream_set_volume (manager->priv->stream, vol - norm_vol_step);
                 }
                 break;
         case VOLUME_UP_KEY:
                 if (muted) {
                         if (vol == 0) {
                                 manager->priv->num_expected_update_signals = 2;
-                                gvc_mixer_stream_change_volume (manager->priv->stream, vol + norm_vol_step);
+                                gvc_mixer_stream_set_volume (manager->priv->stream, vol + norm_vol_step);
                                 gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
                         } else {
                                 manager->priv->num_expected_update_signals = 1;
@@ -707,9 +707,9 @@ do_sound_action (GsdMediaKeysManager *manager,
                         if (vol < MAX_VOLUME) {
                                 manager->priv->num_expected_update_signals = 1;
                                 if (vol + norm_vol_step >= MAX_VOLUME) {
-                                        gvc_mixer_stream_change_volume (manager->priv->stream, MAX_VOLUME);
+                                        gvc_mixer_stream_set_volume (manager->priv->stream, MAX_VOLUME);
                                 } else {
-                                        gvc_mixer_stream_change_volume (manager->priv->stream, vol + norm_vol_step);
+                                        gvc_mixer_stream_set_volume (manager->priv->stream, vol + norm_vol_step);
                                 }
                         }
                 }
-- 
1.6.2.5


0002-Bug-590073-gnome-settings-daemon-crashed-with-SI.patch:
 gsd-media-keys-manager.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0002-Bug-590073-gnome-settings-daemon-crashed-with-SI.patch ---
>From 604a1f534e703b9d492f886ffabdca879df824ef Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson at googlemail.com>
Date: Fri, 31 Jul 2009 16:59:36 +0100
Subject: [PATCH 2/4] =?utf-8?q?Bug=20590073=20=E2=80=93=20gnome-settings-daemon=20crashed=20with=20SIGSEGV=20in=20gvc=5Fmixer=5Fstream=5Fis=5Frunning()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Fix crasher when the default sink changes, we were unref'ing
streams, when never ref'ing them.
---
 plugins/media-keys/gsd-media-keys-manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 3eeea71..8438875 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -740,7 +740,7 @@ update_default_sink (GsdMediaKeysManager *manager)
         }
 
         if (stream != NULL) {
-                manager->priv->stream = stream;
+                manager->priv->stream = g_object_ref (stream);
                 g_signal_connect (G_OBJECT (manager->priv->stream), "notify::volume",
                                   G_CALLBACK (on_stream_event_notify), manager);
                 g_signal_connect (G_OBJECT (manager->priv->stream), "notify::is-muted",
-- 
1.6.2.5


0003-Update-gnome-volume-control-code.patch:
 cut-n-paste/gvc-channel-map.c   |   15 +++++++++++----
 cut-n-paste/gvc-channel-map.h   |    5 +++--
 cut-n-paste/gvc-mixer-control.c |    2 +-
 cut-n-paste/gvc-mixer-stream.c  |   16 +++++++++++++---
 gsd-media-keys-manager.c        |    4 +++-
 5 files changed, 31 insertions(+), 11 deletions(-)

--- NEW FILE 0003-Update-gnome-volume-control-code.patch ---
>From aec15023ea43ab636df75e7237a6452c90bc5eb3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 14 Aug 2009 18:16:10 +0100
Subject: [PATCH 3/4] Update gnome-volume-control code

Should cut down on the feedback loops.
---
 plugins/media-keys/cut-n-paste/gvc-channel-map.c   |   15 +++++++++++----
 plugins/media-keys/cut-n-paste/gvc-channel-map.h   |    5 +++--
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c |    2 +-
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.c  |   16 +++++++++++++---
 plugins/media-keys/gsd-media-keys-manager.c        |    3 +++
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/plugins/media-keys/cut-n-paste/gvc-channel-map.c b/plugins/media-keys/cut-n-paste/gvc-channel-map.c
index 32750ef..ea3e5af 100644
--- a/plugins/media-keys/cut-n-paste/gvc-channel-map.c
+++ b/plugins/media-keys/cut-n-paste/gvc-channel-map.c
@@ -44,6 +44,7 @@
 struct GvcChannelMapPrivate
 {
         pa_channel_map        pa_map;
+        gboolean              pa_volume_is_set;
         pa_cvolume            pa_volume;
         gdouble               extern_volume[NUM_TYPES]; /* volume, balance, fade, lfe */
         gboolean              can_balance;
@@ -208,15 +209,16 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GvcChannelMapClass, volume_changed),
                               NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE, 0);
+                              g_cclosure_marshal_VOID__BOOLEAN,
+                              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
         g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate));
 }
 
 void
 gvc_channel_map_volume_changed (GvcChannelMap     *map,
-                                const pa_cvolume  *cv)
+                                const pa_cvolume  *cv,
+                                gboolean           set)
 {
         g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
         g_return_if_fail (cv != NULL);
@@ -227,13 +229,18 @@ gvc_channel_map_volume_changed (GvcChannelMap     *map,
 
         map->priv->pa_volume = *cv;
 
-        g_signal_emit (map, signals[VOLUME_CHANGED], 0);
+        if (map->priv->pa_volume_is_set == FALSE) {
+                map->priv->pa_volume_is_set = TRUE;
+                return;
+        }
+        g_signal_emit (map, signals[VOLUME_CHANGED], 0, set);
 }
 
 static void
 gvc_channel_map_init (GvcChannelMap *map)
 {
         map->priv = GVC_CHANNEL_MAP_GET_PRIVATE (map);
+        map->priv->pa_volume_is_set = FALSE;
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-channel-map.h b/plugins/media-keys/cut-n-paste/gvc-channel-map.h
index b35c9cb..497ce69 100644
--- a/plugins/media-keys/cut-n-paste/gvc-channel-map.h
+++ b/plugins/media-keys/cut-n-paste/gvc-channel-map.h
@@ -44,7 +44,7 @@ typedef struct
 typedef struct
 {
         GObjectClass           parent_class;
-        void (*volume_changed) (GvcChannelMap *channel_map);
+        void (*volume_changed) (GvcChannelMap *channel_map, gboolean set);
 } GvcChannelMapClass;
 
 enum {
@@ -67,7 +67,8 @@ gboolean                gvc_channel_map_can_fade                (GvcChannelMap
 gboolean                gvc_channel_map_has_lfe                 (GvcChannelMap  *map);
 
 void                    gvc_channel_map_volume_changed          (GvcChannelMap    *map,
-                                                                 const pa_cvolume *cv);
+                                                                 const pa_cvolume *cv,
+                                                                 gboolean          set);
 const char *            gvc_channel_map_get_mapping             (GvcChannelMap  *map);
 
 /* private */
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
index 92b0286..6986202 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
@@ -614,7 +614,7 @@ update_sink (GvcMixerControl    *control,
 
         if (map == NULL)
                 map = gvc_mixer_stream_get_channel_map (stream);
-        gvc_channel_map_volume_changed (map, &info->volume);
+        gvc_channel_map_volume_changed (map, &info->volume, TRUE);
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
index e5cfb19..0f8bea7 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
@@ -149,7 +149,7 @@ gvc_mixer_stream_set_volume (GvcMixerStream *stream,
         pa_cvolume_scale(&cv, volume);
 
         if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
-                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv);
+                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv, FALSE);
                 g_object_notify (G_OBJECT (stream), "volume");
         }
 
@@ -168,7 +168,7 @@ gvc_mixer_stream_set_decibel (GvcMixerStream *stream,
         pa_cvolume_scale(&cv, pa_sw_volume_from_dB(db));
 
         if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
-                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv);
+                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv, FALSE);
                 g_object_notify (G_OBJECT (stream), "volume");
         }
 
@@ -319,9 +319,11 @@ gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
 
 static void
 on_channel_map_volume_changed (GvcChannelMap  *channel_map,
+                               gboolean        set,
                                GvcMixerStream *stream)
 {
-        gvc_mixer_stream_push_volume (stream);
+        if (set == TRUE)
+                gvc_mixer_stream_push_volume (stream);
 
         g_object_notify (G_OBJECT (stream), "volume");
 }
@@ -547,7 +549,15 @@ gvc_mixer_stream_push_volume (GvcMixerStream *stream)
 {
         pa_operation *op;
         gboolean ret;
+
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        if (stream->priv->is_event_stream != FALSE)
+                return TRUE;
+
+        g_debug ("Pushing new volume to stream '%s' (%s)",
+                 stream->priv->description, stream->priv->name);
+
         ret = GVC_MIXER_STREAM_GET_CLASS (stream)->push_volume (stream, (gpointer *) &op);
         if (ret) {
                 if (stream->priv->change_volume_op != NULL)
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 8438875..2b14bcc 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -688,9 +688,11 @@ do_sound_action (GsdMediaKeysManager *manager,
                         manager->priv->num_expected_update_signals = 2;
                         gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
                         gvc_mixer_stream_set_volume (manager->priv->stream, 0);
+                        gvc_mixer_stream_push_volume (manager->priv->stream);
                 } else if (!muted) {
                         manager->priv->num_expected_update_signals = 1;
                         gvc_mixer_stream_set_volume (manager->priv->stream, vol - norm_vol_step);
+                        gvc_mixer_stream_push_volume (manager->priv->stream);
                 }
                 break;
         case VOLUME_UP_KEY:
@@ -698,6 +700,7 @@ do_sound_action (GsdMediaKeysManager *manager,
                         if (vol == 0) {
                                 manager->priv->num_expected_update_signals = 2;
                                 gvc_mixer_stream_set_volume (manager->priv->stream, vol + norm_vol_step);
+                                gvc_mixer_stream_push_volume (manager->priv->stream);
                                 gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
                         } else {
                                 manager->priv->num_expected_update_signals = 1;
-- 
1.6.2.5


0004-Update-volume-control-code-for-new-API.patch:
 gsd-media-keys-manager.c |   89 ++++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 62 deletions(-)

--- NEW FILE 0004-Update-volume-control-code-for-new-API.patch ---
>From 98664ae573c2fb96ff2ff56294c2d69e4bfcc73b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 18 Aug 2009 14:00:09 +0100
Subject: [PATCH 4/4] Update volume control code for new API

Only push volume changes if they are necessary, and
remove the "expected signals" crud.

We shouldn't be waiting for PA to actually do the changes
before displaying them, and we should always show feedback
to the user when they pressed a key.
---
 plugins/media-keys/gsd-media-keys-manager.c |   88 ++++++++------------------
 1 files changed, 27 insertions(+), 61 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 2b14bcc..33b4675 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -87,9 +87,6 @@ struct GsdMediaKeysManagerPrivate
         /* Volume bits */
         GvcMixerControl *volume;
         GvcMixerStream  *stream;
-        /* Number of expected update signals, zero meaning we
-         * shouldn't be showing any update dialogues */
-        guint            num_expected_update_signals;
 #endif /* HAVE_PULSE */
         GtkWidget       *dialog;
         GConfClient     *conf_client;
@@ -616,23 +613,10 @@ do_eject_action (GsdMediaKeysManager *manager)
 
 #ifdef HAVE_PULSE
 static void
-update_dialog (GsdMediaKeysManager *manager)
+update_dialog (GsdMediaKeysManager *manager,
+               guint vol,
+               gboolean muted)
 {
-        gboolean muted;
-        guint vol;
-
-	/* Not expecting a dialogue to show up */
-        if (manager->priv->num_expected_update_signals == 0)
-                return;
-
-	/* If we aren't expecting any more updates, show the dialogue */
-        manager->priv->num_expected_update_signals--;
-        if (manager->priv->num_expected_update_signals != 0)
-                return;
-
-        vol = gvc_mixer_stream_get_volume (manager->priv->stream);
-        muted = gvc_mixer_stream_get_is_muted (manager->priv->stream);
-
         dialog_init (manager);
         gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
                                                 muted);
@@ -644,14 +628,6 @@ update_dialog (GsdMediaKeysManager *manager)
 }
 
 static void
-on_stream_event_notify (GObject             *object,
-                        GParamSpec          *pspec,
-                        GsdMediaKeysManager *manager)
-{
-        update_dialog (manager);
-}
-
-static void
 do_sound_action (GsdMediaKeysManager *manager,
                  int                  type)
 {
@@ -674,56 +650,52 @@ do_sound_action (GsdMediaKeysManager *manager,
         /* FIXME: this is racy */
         vol = gvc_mixer_stream_get_volume (manager->priv->stream);
         muted = gvc_mixer_stream_get_is_muted (manager->priv->stream);
-        /* By default, we would be showing a dialogue
-         * based on the current values, eg. an unchanged dialogue */
-        manager->priv->num_expected_update_signals = 0;
 
         switch (type) {
         case MUTE_KEY:
-                manager->priv->num_expected_update_signals = 1;
-                gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
+                muted = !muted;
+                gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
                 break;
         case VOLUME_DOWN_KEY:
                 if (!muted && (vol <= norm_vol_step)) {
-                        manager->priv->num_expected_update_signals = 2;
-                        gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
-                        gvc_mixer_stream_set_volume (manager->priv->stream, 0);
-                        gvc_mixer_stream_push_volume (manager->priv->stream);
+                        muted = !muted;
+                        vol = 0;
+                        gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
+                        if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
+                                gvc_mixer_stream_push_volume (manager->priv->stream);
                 } else if (!muted) {
-                        manager->priv->num_expected_update_signals = 1;
-                        gvc_mixer_stream_set_volume (manager->priv->stream, vol - norm_vol_step);
-                        gvc_mixer_stream_push_volume (manager->priv->stream);
+                        vol = vol - norm_vol_step;
+                        if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
+                                gvc_mixer_stream_push_volume (manager->priv->stream);
                 }
                 break;
         case VOLUME_UP_KEY:
                 if (muted) {
+                        muted = !muted;
                         if (vol == 0) {
-                                manager->priv->num_expected_update_signals = 2;
-                                gvc_mixer_stream_set_volume (manager->priv->stream, vol + norm_vol_step);
-                                gvc_mixer_stream_push_volume (manager->priv->stream);
-                                gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
+                               vol = vol + norm_vol_step;
+                               gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
+                               if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
+                                        gvc_mixer_stream_push_volume (manager->priv->stream);
                         } else {
-                                manager->priv->num_expected_update_signals = 1;
-                                gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
+                                gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
                         }
                 } else {
                         if (vol < MAX_VOLUME) {
-                                manager->priv->num_expected_update_signals = 1;
+                                gboolean set;
                                 if (vol + norm_vol_step >= MAX_VOLUME) {
-                                        gvc_mixer_stream_set_volume (manager->priv->stream, MAX_VOLUME);
+                                        vol = MAX_VOLUME;
                                 } else {
-                                        gvc_mixer_stream_set_volume (manager->priv->stream, vol + norm_vol_step);
+                                        vol = vol + norm_vol_step;
                                 }
+                                if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
+                                        gvc_mixer_stream_push_volume (manager->priv->stream);
                         }
                 }
                 break;
         }
 
-        /* We didn't actually make any changes, so force showing the dialogue */
-        if (manager->priv->num_expected_update_signals == 0) {
-                manager->priv->num_expected_update_signals = 1;
-                update_dialog (manager);
-        }
+        update_dialog (manager, vol, muted);
 }
 
 static void
@@ -736,18 +708,12 @@ update_default_sink (GsdMediaKeysManager *manager)
                 return;
 
         if (manager->priv->stream != NULL) {
-                g_signal_handlers_disconnect_by_func (G_OBJECT (manager->priv->stream),
-                                                      G_CALLBACK (on_stream_event_notify), manager);
                 g_object_unref (manager->priv->stream);
                 manager->priv->stream = NULL;
         }
 
         if (stream != NULL) {
                 manager->priv->stream = g_object_ref (stream);
-                g_signal_connect (G_OBJECT (manager->priv->stream), "notify::volume",
-                                  G_CALLBACK (on_stream_event_notify), manager);
-                g_signal_connect (G_OBJECT (manager->priv->stream), "notify::is-muted",
-                                  G_CALLBACK (on_stream_event_notify), manager);
         } else {
                 g_warning ("Unable to get default sink");
         }
@@ -755,7 +721,7 @@ update_default_sink (GsdMediaKeysManager *manager)
 
 static void
 on_control_ready (GvcMixerControl     *control,
-		  GsdMediaKeysManager *manager)
+                  GsdMediaKeysManager *manager)
 {
         update_default_sink (manager);
 }
@@ -1081,7 +1047,7 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
          */
         gnome_settings_profile_start ("gvc_mixer_control_new");
 
-        manager->priv->volume = gvc_mixer_control_new ();
+        manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys");
 
         g_signal_connect (manager->priv->volume,
                           "ready",
-- 
1.6.2.5



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- gnome-settings-daemon.spec	26 Aug 2009 04:00:05 -0000	1.109
+++ gnome-settings-daemon.spec	7 Sep 2009 15:02:29 -0000	1.110
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -53,6 +53,12 @@ Patch16:	there-can-be-only-one.patch
 Patch17:	syndaemon-k.patch
 Patch18:	buttonmapping.patch
 
+# Updated from 2.27 branch
+Patch90:	0001-Update-gnome-volume-control-code-from-master.patch
+Patch91:	0002-Bug-590073-gnome-settings-daemon-crashed-with-SI.patch
+Patch92:	0003-Update-gnome-volume-control-code.patch
+Patch93:	0004-Update-volume-control-code-for-new-API.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -81,6 +87,11 @@ developing applications that use %{name}
 %patch17 -p1 -b .syndaemon-k
 %patch18 -p1 -b .buttonmapping
 
+%patch90 -p1
+%patch91 -p1
+%patch92 -p1
+%patch93 -p1
+
 autoreconf -i -f
 
 %build
@@ -192,6 +203,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-10
+- Update volume code from 2.27
+
 * Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-9
 - buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
   mappings for core devices instead (#502129).



From hadess at fedoraproject.org  Mon Sep  7 15:12:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 15:12:23 +0000 (UTC)
Subject: rpms/gnokii/devel .cvsignore, 1.13, 1.14 gnokii.spec, 1.40,
	1.41 sources, 1.13, 1.14
Message-ID: <20090907151224.039DC11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30090

Modified Files:
	.cvsignore gnokii.spec sources 
Log Message:
* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 0.6.28-1
- Update to 0.6.28



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Oct 2008 07:33:50 -0000	1.13
+++ .cvsignore	7 Sep 2009 15:12:21 -0000	1.14
@@ -1 +1 @@
-gnokii-0.6.27.tar.bz2
+gnokii-0.6.28.tar.bz2


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gnokii.spec	21 Aug 2009 13:41:28 -0000	1.40
+++ gnokii.spec	7 Sep 2009 15:12:22 -0000	1.41
@@ -1,8 +1,8 @@
 # TODO: merge patches upstream where applicable
 
 Name:           gnokii
-Version:        0.6.27
-Release:        7%{?dist}
+Version:        0.6.28
+Release:        1%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -228,6 +228,9 @@ fi
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 0.6.28-1
+- Update to 0.6.28
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.27-7
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Oct 2008 07:33:50 -0000	1.13
+++ sources	7 Sep 2009 15:12:22 -0000	1.14
@@ -1 +1 @@
-fd0ae7996a2e2a2c29e9f3c625df8f3d  gnokii-0.6.27.tar.bz2
+55d5567ea5d1ebf8cdc7ad662691fee1  gnokii-0.6.28.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:05 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151405.0EB6110F881@bastion2.fedora.phx.redhat.com>

Package attr in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:05 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151405.E687810F88A@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:06 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151406.8F12610F893@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:07 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151407.9997C10F895@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:08 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151409.433E510F85E@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:09 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151409.C71D010F89A@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:23 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151423.B603C10F87E@bastion2.fedora.phx.redhat.com>

Package attr in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:14:48 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151449.0C66710F87C@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Mon Sep  7 15:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 15:15:25 +0000
Subject: [pkgdb] attr ownership updated
Message-ID: <20090907151525.76CEE10F87C@bastion2.fedora.phx.redhat.com>

Package attr in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/attr



From hadess at fedoraproject.org  Mon Sep  7 15:23:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 15:23:26 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11
	0001-Update-cut-n-paste-from-gnome-media.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.110, 1.111
Message-ID: <20090907152326.2C83011C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3115

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	0001-Update-cut-n-paste-from-gnome-media.patch 
Log Message:
Add missing patch

0001-Update-cut-n-paste-from-gnome-media.patch:
 gvc-mixer-control.c |   68 ++++++++++++++++++++++++++++++++++++++++++++++++----
 gvc-mixer-control.h |    2 -
 gvc-mixer-stream.c  |    4 +--
 3 files changed, 66 insertions(+), 8 deletions(-)

--- NEW FILE 0001-Update-cut-n-paste-from-gnome-media.patch ---
>From 8f75352b50bee9a5ed839eaa0b4fa899bbd540ce Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 18 Aug 2009 13:59:32 +0100
Subject: [PATCH] Update cut'n'paste from gnome-media

Slightly changed APIs.
---
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c |   68 ++++++++++++++++++--
 plugins/media-keys/cut-n-paste/gvc-mixer-control.h |    2 +-
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.c  |    3 +-
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
index 6986202..dc2ea2f 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
@@ -42,6 +42,11 @@
 
 #define GVC_MIXER_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_CONTROL, GvcMixerControlPrivate))
 
+enum {
+        PROP_0,
+        PROP_NAME
+};
+
 struct GvcMixerControlPrivate
 {
         pa_glib_mainloop *pa_mainloop;
@@ -49,6 +54,7 @@ struct GvcMixerControlPrivate
         pa_context       *pa_context;
         int               n_outstanding;
         guint             reconnect_id;
+        char             *name;
 
         gboolean          default_sink_is_set;
         guint             default_sink_id;
@@ -614,7 +620,7 @@ update_sink (GvcMixerControl    *control,
 
         if (map == NULL)
                 map = gvc_mixer_stream_get_channel_map (stream);
-        gvc_channel_map_volume_changed (map, &info->volume, TRUE);
+        gvc_channel_map_volume_changed (map, &info->volume, FALSE);
 }
 
 static void
@@ -1464,11 +1470,10 @@ gvc_mixer_new_pa_context (GvcMixerControl *self)
         g_return_if_fail (self);
         g_return_if_fail (!self->priv->pa_context);
 
-        /* FIXME: read these from an object property */
         proplist = pa_proplist_new ();
         pa_proplist_sets (proplist,
                           PA_PROP_APPLICATION_NAME,
-                          _("GNOME Volume Control"));
+                          self->priv->name);
         pa_proplist_sets (proplist,
                           PA_PROP_APPLICATION_ID,
                           "org.gnome.VolumeControl");
@@ -1644,6 +1649,45 @@ gvc_mixer_control_dispose (GObject *object)
         G_OBJECT_CLASS (gvc_mixer_control_parent_class)->dispose (object);
 }
 
+static void
+gvc_mixer_control_set_property (GObject       *object,
+                                guint          prop_id,
+                                const GValue  *value,
+                                GParamSpec    *pspec)
+{
+        GvcMixerControl *self = GVC_MIXER_CONTROL (object);
+
+        switch (prop_id) {
+        case PROP_NAME:
+                g_free (self->priv->name);
+                self->priv->name = g_value_dup_string (value);
+                g_object_notify (G_OBJECT (self), "name");
+                break;
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+gvc_mixer_control_get_property (GObject     *object,
+                                guint        prop_id,
+                                GValue      *value,
+                                GParamSpec  *pspec)
+{
+        GvcMixerControl *self = GVC_MIXER_CONTROL (object);
+
+        switch (prop_id) {
+        case PROP_NAME:
+                g_value_set_string (value, self->priv->name);
+                break;
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+
 static GObject *
 gvc_mixer_control_constructor (GType                  type,
                                guint                  n_construct_properties,
@@ -1669,6 +1713,16 @@ gvc_mixer_control_class_init (GvcMixerControlClass *klass)
         object_class->constructor = gvc_mixer_control_constructor;
         object_class->dispose = gvc_mixer_control_dispose;
         object_class->finalize = gvc_mixer_control_finalize;
+        object_class->set_property = gvc_mixer_control_set_property;
+        object_class->get_property = gvc_mixer_control_get_property;
+
+        g_object_class_install_property (object_class,
+                                         PROP_NAME,
+                                         g_param_spec_string ("name",
+                                                              "Name",
+                                                              "Name to display for this mixer control",
+                                                              NULL,
+                                                              G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
 
         signals [CONNECTING] =
                 g_signal_new ("connecting",
@@ -1751,15 +1805,19 @@ gvc_mixer_control_finalize (GObject *object)
         g_return_if_fail (GVC_IS_MIXER_CONTROL (object));
 
         mixer_control = GVC_MIXER_CONTROL (object);
+        g_free (mixer_control->priv->name);
+        mixer_control->priv->name = NULL;
 
         g_return_if_fail (mixer_control->priv != NULL);
         G_OBJECT_CLASS (gvc_mixer_control_parent_class)->finalize (object);
 }
 
 GvcMixerControl *
-gvc_mixer_control_new (void)
+gvc_mixer_control_new (const char *name)
 {
         GObject *control;
-        control = g_object_new (GVC_TYPE_MIXER_CONTROL, NULL);
+        control = g_object_new (GVC_TYPE_MIXER_CONTROL,
+                                "name", name,
+                                NULL);
         return GVC_MIXER_CONTROL (control);
 }
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-control.h b/plugins/media-keys/cut-n-paste/gvc-mixer-control.h
index 3de9e62..cba7c5a 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-control.h
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-control.h
@@ -60,7 +60,7 @@ typedef struct
 
 GType               gvc_mixer_control_get_type            (void);
 
-GvcMixerControl *   gvc_mixer_control_new                 (void);
+GvcMixerControl *   gvc_mixer_control_new                 (const char *name);
 
 gboolean            gvc_mixer_control_open                (GvcMixerControl *control);
 gboolean            gvc_mixer_control_close               (GvcMixerControl *control);
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
index 0f8bea7..45f64f4 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
@@ -151,9 +151,10 @@ gvc_mixer_stream_set_volume (GvcMixerStream *stream,
         if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
                 gvc_channel_map_volume_changed(stream->priv->channel_map, &cv, FALSE);
                 g_object_notify (G_OBJECT (stream), "volume");
+                return TRUE;
         }
 
-        return TRUE;
+        return FALSE;
 }
 
 gboolean
-- 
1.6.2.5



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- gnome-settings-daemon.spec	7 Sep 2009 15:02:29 -0000	1.110
+++ gnome-settings-daemon.spec	7 Sep 2009 15:23:25 -0000	1.111
@@ -58,6 +58,7 @@ Patch90:	0001-Update-gnome-volume-contro
 Patch91:	0002-Bug-590073-gnome-settings-daemon-crashed-with-SI.patch
 Patch92:	0003-Update-gnome-volume-control-code.patch
 Patch93:	0004-Update-volume-control-code-for-new-API.patch
+Patch94:	0001-Update-cut-n-paste-from-gnome-media.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -91,6 +92,7 @@ developing applications that use %{name}
 %patch91 -p1
 %patch92 -p1
 %patch93 -p1
+%patch94 -p1
 
 autoreconf -i -f
 



From hadess at fedoraproject.org  Mon Sep  7 15:26:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 15:26:53 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.41,1.42
Message-ID: <20090907152653.BC62211C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5554

Modified Files:
	gnokii.spec 
Log Message:
Don't apply obsolete patch


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gnokii.spec	7 Sep 2009 15:12:22 -0000	1.41
+++ gnokii.spec	7 Sep 2009 15:26:53 -0000	1.42
@@ -96,7 +96,7 @@ Requires:       pkgconfig
 
 %prep
 %setup -q
-%patch0 -p0
+#%patch0 -p0
 %patch1 -p0
 install -pm 644 %{SOURCE5} smsd2mail.sh
 install -pm 644 %{SOURCE6} README.smsd2mail



From fujiwara at fedoraproject.org  Mon Sep  7 15:28:16 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Mon,  7 Sep 2009 15:28:16 +0000 (UTC)
Subject: rpms/ibus-anthy/devel ibus-anthy-HEAD.patch, 1.1,
	1.2 ibus-anthy.spec, 1.23, 1.24
Message-ID: <20090907152816.DF01E11C00DB@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6400

Modified Files:
	ibus-anthy-HEAD.patch ibus-anthy.spec 
Log Message:

Fix a build issue


ibus-anthy-HEAD.patch:
 ChangeLog          |    8 ++
 engine/Makefile.am |    9 +--
 engine/Makefile.in |    9 +--
 engine/thumb.py    |  153 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 171 insertions(+), 8 deletions(-)

Index: ibus-anthy-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy-HEAD.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-anthy-HEAD.patch	12 Jun 2009 22:25:58 -0000	1.1
+++ ibus-anthy-HEAD.patch	7 Sep 2009 15:28:16 -0000	1.2
@@ -1 +1,214 @@
-
+diff -urNp ibus-anthy-1.2.0.20090907-old/ChangeLog ibus-anthy-1.2.0.20090907/ChangeLog
+--- ibus-anthy-1.2.0.20090907-old/ChangeLog	2009-09-07 11:41:22.000000000 +0900
++++ ibus-anthy-1.2.0.20090907/ChangeLog	2009-09-07 23:24:51.000000000 +0900
+@@ -1,3 +1,11 @@
++commit 4a9511c2691b83fc7f7e02e693e44ff9c80f9c34
++Author: fujiwarat <takao.fujiwara1 at gmail.com>
++Date:   2009-09-07 23:19:54 +0900
++
++    Fix 507 No module named thumb
++
++M	engine/Makefile.am
++
+ commit 627a6346eeebea547adb547e6254983cea6bc429
+ Author: fujiwarat <takao.fujiwara1 at gmail.com>
+ Date:   2009-09-07 11:37:46 +0900
+diff -urNp ibus-anthy-1.2.0.20090907-old/engine/Makefile.am ibus-anthy-1.2.0.20090907/engine/Makefile.am
+--- ibus-anthy-1.2.0.20090907-old/engine/Makefile.am	2009-09-07 11:40:46.000000000 +0900
++++ ibus-anthy-1.2.0.20090907/engine/Makefile.am	2009-09-07 23:23:58.000000000 +0900
+@@ -21,12 +21,13 @@
+ engine_anthy_PYTHON = \
+ 	engine.py \
+ 	factory.py \
+-	main.py \
+-	tables.py \
+ 	jastring.py \
+-	segment.py \
+-	romaji.py \
+ 	kana.py \
++	main.py \
++	romaji.py \
++	segment.py \
++	tables.py \
++	thumb.py \
+ 	$(NULL)
+ engine_anthydir = $(pkgdatadir)/engine
+ 
+diff -urNp ibus-anthy-1.2.0.20090907-old/engine/Makefile.in ibus-anthy-1.2.0.20090907/engine/Makefile.in
+--- ibus-anthy-1.2.0.20090907-old/engine/Makefile.in	2009-09-07 11:41:04.000000000 +0900
++++ ibus-anthy-1.2.0.20090907/engine/Makefile.in	2009-09-07 23:24:34.000000000 +0900
+@@ -273,12 +273,13 @@ top_srcdir = @top_srcdir@
+ engine_anthy_PYTHON = \
+ 	engine.py \
+ 	factory.py \
+-	main.py \
+-	tables.py \
+ 	jastring.py \
+-	segment.py \
+-	romaji.py \
+ 	kana.py \
++	main.py \
++	romaji.py \
++	segment.py \
++	tables.py \
++	thumb.py \
+ 	$(NULL)
+ 
+ engine_anthydir = $(pkgdatadir)/engine
+diff -urNp ibus-anthy-1.2.0.20090907-old/engine/thumb.py ibus-anthy-1.2.0.20090907/engine/thumb.py
+--- ibus-anthy-1.2.0.20090907-old/engine/thumb.py	1970-01-01 09:00:00.000000000 +0900
++++ ibus-anthy-1.2.0.20090907/engine/thumb.py	2009-09-07 23:23:58.000000000 +0900
+@@ -0,0 +1,153 @@
++# -*- coding: utf-8 -*-
++
++import gtk
++import gobject
++import time
++
++import segment
++
++
++_table = {
++    'q': [u'?', u'',   u'?'],
++    'w': [u'?', u'?', u'?'],
++    'e': [u'?', u'?', u'?'],
++    'r': [u'?', u'?', u'?'],
++    't': [u'?', u'?', u'?'],
++
++    'y': [u'?', u'?', u'?'],
++    'u': [u'?', u'?', u'?'],
++    'i': [u'?', u'?', u'?'],
++    'o': [u'?', u'?', u'?'],
++    'p': [u',',  u'?', u'?'],
++    '@': [u'?', u'',   u''],
++    '[': [u'?', u'?', u''],
++
++    'a': [u'?', u'',   u'?'],
++    's': [u'?', u'?', u'?'],
++    'd': [u'?', u'?', u'?'],
++    'f': [u'?', u'?', u'?'],
++    'g': [u'?', u'?', u'?'],
++
++    'h': [u'?', u'?', u'?'],
++    'j': [u'?', u'?', u'?'],
++    'k': [u'?', u'?', u'?'],
++    'l': [u'?', u'?', u'?'],
++    ';': [u'?', u'?', u''],
++
++    'z': [u'.',  u'',   u'?'],
++    'x': [u'?', u'?', u'?'],
++    'c': [u'?', u'?', u'?'],
++    'v': [u'?', u'?', u'?'],
++    'b': [u'?', u'?', u'?'],
++
++    'n': [u'?', u'?', u'?'],
++    'm': [u'?', u'?', u'?'],
++    ',': [u'?', u'?', u'?'],
++    '.': [u'?', u'?', u'?'],
++    '/': [u'?', u'?', u''],
++
++    '1': [u'1',  u'',   u'?'],
++    '2': [u'2',  u'',   u'/'],
++    '4': [u'4',  u'',   u'?'],
++    '5': [u'5',  u'',   u'?'],
++
++    '6': [u'6',  u'[',  u''],
++    '7': [u'7',  u']',  u''],
++    '8': [u'8',  u'(',  u''],
++    '9': [u'9',  u')',  u''],
++}
++
++_shift_table = {
++    'H': u'?',
++    'X': u'?',
++    'V': u'?',
++    'B': u'?',
++    '>': u'?',
++}
++
++table = {}
++shift_table = {}
++r_table = {}
++
++for k in _table.keys():
++    table[ord(k)] = _table[k]
++    for c in _table[k]:
++        r_table[c] = k
++
++for k in _shift_table.keys():
++    shift_table[ord(k)] = _shift_table[k]
++    r_table[_shift_table[k]] = k
++
++kana_voiced_consonant_rule = {
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++    u"??" : u"?",
++}
++
++_UNFINISHED_HIRAGANA = set(u"????????????????????")
++
++class ThumbShiftSegment(segment.Segment):
++    
++    def __init__(self, enchars=u"", jachars=u""):
++        if not jachars:
++            if u'!' <= enchars <= u'~':
++                jachars = segment.unichar_half_to_full(enchars)
++            else:
++                jachars = enchars
++                enchars = r_table.get(jachars, u'')
++        super(ThumbShiftSegment, self).__init__(enchars, jachars)
++
++    def is_finished(self):
++        return not (self._jachars in _UNFINISHED_HIRAGANA)
++
++    def append(self, enchar):
++        if enchar == u"\0" or enchar == u"":
++            return []
++        text = self._jachars + enchar
++        jachars = kana_voiced_consonant_rule.get(text, None)
++        if jachars:
++            self._enchars = self._enchars + r_table.get(enchar, u'')
++            self._jachars = jachars
++            return []
++        return [ThumbShiftSegment(enchar)]
++
++    def prepend(self, enchar):
++        if enchar == u"\0" or enchar == u"":
++            return []
++        if self._jachars == u"":
++            if 0x21 <= enchars <= 0x7e:
++                self._enchars = enchar
++                self._jachars = segment.unichar_half_to_full(enchars)
++            else:
++                self._enchars = r_table.get(enchar, u'')
++                self._jachars = enchar
++            return []
++        return [ThumbShiftSegment(enchar)]
++
++    def pop(self, index=-1):
++        self._enchars = u''
++        self._jachars = u''
++        return
++


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ibus-anthy.spec	7 Sep 2009 03:24:19 -0000	1.23
+++ ibus-anthy.spec	7 Sep 2009 15:28:16 -0000	1.24
@@ -2,13 +2,13 @@
 %define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
 Version:    1.2.0.20090907
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Patch0:     ibus-anthy-HEAD.patch
+Patch0:     ibus-anthy-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@ libanthy.
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Mon Sep 07 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090907-2
+- Fix a build issue
+
 * Mon Sep 07 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090907-1
 - Update to 1.2.0.20090907
 - Fix bug 510978 - "Typing Method" configuration doesn't work



From hadess at fedoraproject.org  Mon Sep  7 15:39:55 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 15:39:55 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.42,1.43
Message-ID: <20090907153955.85EEE11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9548

Modified Files:
	gnokii.spec 
Log Message:
Add intltool BR


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gnokii.spec	7 Sep 2009 15:26:53 -0000	1.42
+++ gnokii.spec	7 Sep 2009 15:39:55 -0000	1.43
@@ -36,7 +36,7 @@ BuildRequires:	libXt-devel
 BuildRequires:	libXpm-devel 
 BuildRequires:	pcsc-lite-devel
 BuildRequires:	readline-devel
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	perl(XML::Parser) intltool
 Requires(pre):  %{_sbindir}/groupadd
 
 %description



From mcrha at fedoraproject.org  Mon Sep  7 15:40:02 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon,  7 Sep 2009 15:40:02 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.101, 1.102 gtkhtml3.spec, 1.158, 
	1.159 sources, 1.101, 1.102
Message-ID: <20090907154002.37BCF11C043D@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9517

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 3.27.92-1.fc12
- Update to 3.27.92




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	24 Aug 2009 10:03:41 -0000	1.101
+++ .cvsignore	7 Sep 2009 15:40:01 -0000	1.102
@@ -1 +1 @@
-gtkhtml-3.27.91.tar.bz2
+gtkhtml-3.27.92.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- gtkhtml3.spec	24 Aug 2009 10:03:41 -0000	1.158
+++ gtkhtml3.spec	7 Sep 2009 15:40:02 -0000	1.159
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.27.91
+Version: 3.27.92
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 3.27.92-1.fc12
+- Update to 3.27.92
+
 * Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 3.27.91-1.fc12
 - Update to 3.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	24 Aug 2009 10:03:41 -0000	1.101
+++ sources	7 Sep 2009 15:40:02 -0000	1.102
@@ -1 +1 @@
-f1c36826886078f6899b0e5f5dfa5a08  gtkhtml-3.27.91.tar.bz2
+566e7bc724d51c69cef2af501800db71  gtkhtml-3.27.92.tar.bz2



From mcrha at fedoraproject.org  Mon Sep  7 15:53:07 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon,  7 Sep 2009 15:53:07 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.113,
	1.114 evolution-data-server.spec, 1.275, 1.276 sources, 1.113, 1.114
Message-ID: <20090907155307.0EDBC11C00DB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
- Update to 2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- .cvsignore	24 Aug 2009 10:52:49 -0000	1.113
+++ .cvsignore	7 Sep 2009 15:53:06 -0000	1.114
@@ -1 +1 @@
-evolution-data-server-2.27.91.tar.bz2
+evolution-data-server-2.27.92.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- evolution-data-server.spec	27 Aug 2009 15:07:23 -0000	1.275
+++ evolution-data-server.spec	7 Sep 2009 15:53:06 -0000	1.276
@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.27.91
-Release: 3%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
+- Update to 2.27.92
+
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-3.fc12
 - Rebuild with old OpenSSL, er something...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources	24 Aug 2009 10:52:49 -0000	1.113
+++ sources	7 Sep 2009 15:53:06 -0000	1.114
@@ -1 +1 @@
-00503d1ad0c6afba8ed8543fd80e1adb  evolution-data-server-2.27.91.tar.bz2
+cd77443d0466724fafc2034f0e3405fd  evolution-data-server-2.27.92.tar.bz2



From hadess at fedoraproject.org  Mon Sep  7 16:07:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Sep 2009 16:07:20 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.43,1.44
Message-ID: <20090907160720.1CD0111C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19399

Modified Files:
	gnokii.spec 
Log Message:
Fix file list


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gnokii.spec	7 Sep 2009 15:39:55 -0000	1.43
+++ gnokii.spec	7 Sep 2009 16:07:19 -0000	1.44
@@ -197,7 +197,6 @@ fi
 %{_datadir}/pixmaps/xgnokii.png
 %{_datadir}/applications/*xgnokii.desktop
 %{_mandir}/man1/xgnokii.1*
-%{_prefix}/share/xgnokii/
 
 %files smsd
 %defattr(-,root,root,-)



From mcrha at fedoraproject.org  Mon Sep  7 16:13:34 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon,  7 Sep 2009 16:13:34 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.120, 1.121 evolution.spec, 1.414,
	1.415 sources, 1.120, 1.121
Message-ID: <20090907161334.EB68611C00DB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22415

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
- Update to 2.27.92




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- .cvsignore	24 Aug 2009 11:07:27 -0000	1.120
+++ .cvsignore	7 Sep 2009 16:13:34 -0000	1.121
@@ -1 +1 @@
-evolution-2.27.91.tar.bz2
+evolution-2.27.92.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- evolution.spec	24 Aug 2009 11:07:27 -0000	1.414
+++ evolution.spec	7 Sep 2009 16:13:34 -0000	1.415
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
 - Update to 2.27.91
 - Remove patch for GNOME bug #591414 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	24 Aug 2009 11:07:27 -0000	1.120
+++ sources	7 Sep 2009 16:13:34 -0000	1.121
@@ -1 +1 @@
-4f28ce4302ec26ea1b3ecb93c920c07c  evolution-2.27.91.tar.bz2
+75cf92e71dc6cb7d10c4a59b85c601e2  evolution-2.27.92.tar.bz2



From nphilipp at fedoraproject.org  Mon Sep  7 16:15:15 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon,  7 Sep 2009 16:15:15 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.106, 1.107 sources,
	1.117, 1.118 system-config-date.spec, 1.125, 1.126
Message-ID: <20090907161515.E08BF11C00DB@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23037

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.48


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	2 Sep 2009 15:01:09 -0000	1.106
+++ .cvsignore	7 Sep 2009 16:15:15 -0000	1.107
@@ -1 +1 @@
-system-config-date-1.9.47.tar.bz2
+system-config-date-1.9.48.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- sources	2 Sep 2009 15:55:23 -0000	1.117
+++ sources	7 Sep 2009 16:15:15 -0000	1.118
@@ -1 +1 @@
-60511fece116d7621dcb56f99f2d5a61  system-config-date-1.9.47.tar.bz2
+f5083fb1619ebe49d9bc2310279765c7  system-config-date-1.9.48.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- system-config-date.spec	2 Sep 2009 15:55:24 -0000	1.125
+++ system-config-date.spec	7 Sep 2009 16:15:15 -0000	1.126
@@ -1,3 +1,6 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
+%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
+
 # Command line configurables
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
@@ -14,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.47
+Version: 1.9.48
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -107,9 +110,6 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/system-config-date
-%{_bindir}/system-config-time
-%{_bindir}/dateconfig
-%{_sbindir}/timeconfig
 %{_datadir}/system-config-date
 %{_datadir}/applications/system-config-date.desktop
 %{_datadir}/system-config-date/pixmaps/system-config-date.png
@@ -119,17 +119,21 @@ fi
 %{_mandir}/ja/man8/system-config-date*
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-date
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-date
-%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-time
-%config(noreplace) %{_sysconfdir}/pam.d/system-config-time
-%config(noreplace) %{_sysconfdir}/security/console.apps/dateconfig
-%config(noreplace) %{_sysconfdir}/pam.d/dateconfig
+%{python_sitelib}/scdate
+%{python_sitelib}/scdate-%{version}-py%{python_version}.egg-info
+#%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Mon Sep 07 2009 Nils Philippsen <nils at redhat.com> - 1.9.48-1
+- use string object methods instead of string module
+- get rid of timeconfig and compat program names
+- move backend code into scdate.core module
+
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.47-1
 - import gettext from each module again (#520799)
 
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.46-1
-- use new gtk toolkit API
+- use new gtk tooltip API
 
 * Tue Sep 01 2009 Nils Philippsen <nils at redhat.com>
 - use slip.util.files.linkorcopyfile() (#512046)



From than at fedoraproject.org  Mon Sep  7 16:15:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Sep 2009 16:15:17 +0000 (UTC)
Subject: rpms/rp-pppoe/devel pppoe-server.init, NONE, 1.1 rp-pppoe.spec, 1.47,
	1.48
Message-ID: <20090907161517.18DB511C0424@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21771

Modified Files:
	rp-pppoe.spec 
Added Files:
	pppoe-server.init 
Log Message:
- add feature, save and restore all information about default routes bz#191242
- add startup script for pppoe-server bz#507123




--- NEW FILE pppoe-server.init ---
#!/bin/sh
#
# pppoe-server: Starts the PPPoE Server.
#
# chkconfig: 2345 10 92
# description:  pppoe-server is a user-space server for PPPoE (Point-to-Point Protocol over Eth- \
#               ernet) for Linux and other UNIX systems.  pppoe-server works in concert with the \
#               pppoe client to respond to PPPoE discovery packets and set up PPPoE sessions.
# processname:  /sbin/pppoe-server
# config:       /etc/ppp/pppoe-server-options

. /etc/rc.d/init.d/functions
RETVAL=0
prog=pppoe-server

check() {
        # Check that we're a privileged user
        [ `id -u` = 0 ] || exit 4

        # Check if acpid is executable
        test -x /sbin/$prog || exit 5
}

start() {
        check
        echo -n $"Starting $prog: "
        daemon /sbin/$prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
        return $RETVAL
}

stop() {
       check
        echo -n $"Stopping $prog: "
        killproc /sbin/$prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
        return $RETVAL
}

restart() {
        stop
        start
}

case "$1" in
    start)
        start
        ;;
    stop)
        stop
        ;;
    restart)
        restart
        ;;
    reload)
        echo "$0: Unimplemented feature."
        RETVAL=3
        ;;
    force-reload)
        echo "$0: Unimplemented feature."
        RETVAL=3
        ;;
    condrestart)
        if [ -f /var/lock/subsys/pppoe-server ]; then
            restart
        fi
        ;;
    status)
        status pppoe-server
        RETVAL=$?
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
        RETVAL=3
        ;;
esac

exit $RETVAL


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- rp-pppoe.spec	7 Sep 2009 14:49:54 -0000	1.47
+++ rp-pppoe.spec	7 Sep 2009 16:15:16 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -11,6 +11,7 @@ Source2: pppoe-setup
 Source3: pppoe-start
 Source4: pppoe-status
 Source5: pppoe-stop
+Source6: pppoe-server.init
 
 Patch0: rp-pppoe-3.8-redhat.patch
 
@@ -61,6 +62,7 @@ install -m 0755 %{SOURCE2} %{buildroot}/
 install -m 0755 %{SOURCE3} %{buildroot}/sbin
 install -m 0755 %{SOURCE4} %{buildroot}/sbin
 install -m 0755 %{SOURCE5} %{buildroot}/sbin
+install -m 0755 %{SOURCE6} %{buildroot}/etc/rc.d/init.d/pppoe-server
 
 pushd %{buildroot}%{_sbindir}
 ln -s ../../sbin/* .
@@ -147,6 +149,7 @@ exit 0
 %changelog
 * Mon Sep 07 2009 Than Ngo <than at redhat.com> - 3.10-4
 - add feature, save and restore all information about default routes bz#191242
+- add startup script for pppoe-server bz#507123
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From mcrha at fedoraproject.org  Mon Sep  7 16:17:15 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon,  7 Sep 2009 16:17:15 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.48,
	1.49 evolution-exchange.spec, 1.72, 1.73 sources, 1.48, 1.49
Message-ID: <20090907161715.BF08311C00DB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
- Update to 2.27.92




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	24 Aug 2009 11:19:10 -0000	1.48
+++ .cvsignore	7 Sep 2009 16:17:15 -0000	1.49
@@ -1 +1 @@
-evolution-exchange-2.27.91.tar.bz2
+evolution-exchange-2.27.92.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- evolution-exchange.spec	30 Aug 2009 14:03:58 -0000	1.72
+++ evolution-exchange.spec	7 Sep 2009 16:17:15 -0000	1.73
@@ -17,8 +17,8 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.27.91
-Release: 3%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
+- Update to 2.27.92
+
 * Sun Aug 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-3.fc12
 - Rebuild again.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Aug 2009 11:19:11 -0000	1.48
+++ sources	7 Sep 2009 16:17:15 -0000	1.49
@@ -1 +1 @@
-eafad1ffb69389878b12757114e1574d  evolution-exchange-2.27.91.tar.bz2
+8333048c4569296d75e243ff20b85138  evolution-exchange-2.27.92.tar.bz2



From than at fedoraproject.org  Mon Sep  7 16:17:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Sep 2009 16:17:47 +0000 (UTC)
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.48,1.49
Message-ID: <20090907161747.5525711C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24717

Modified Files:
	rp-pppoe.spec 
Log Message:
fix file list



Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- rp-pppoe.spec	7 Sep 2009 16:15:16 -0000	1.48
+++ rp-pppoe.spec	7 Sep 2009 16:17:47 -0000	1.49
@@ -62,7 +62,7 @@ install -m 0755 %{SOURCE2} %{buildroot}/
 install -m 0755 %{SOURCE3} %{buildroot}/sbin
 install -m 0755 %{SOURCE4} %{buildroot}/sbin
 install -m 0755 %{SOURCE5} %{buildroot}/sbin
-install -m 0755 %{SOURCE6} %{buildroot}/etc/rc.d/init.d/pppoe-server
+install -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/etc/rc.d/init.d/pppoe-server
 
 pushd %{buildroot}%{_sbindir}
 ln -s ../../sbin/* .
@@ -142,6 +142,7 @@ exit 0
 %doc configs
 %config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
 %config(noreplace) %{_sysconfdir}/ppp/firewall*
+%config(noreplace) %{_sysconfdir}/etc/rc.d/init.d/*
 /sbin/*
 %{_sbindir}/*
 %{_mandir}/man?/*



From mcrha at fedoraproject.org  Mon Sep  7 16:23:04 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon,  7 Sep 2009 16:23:04 +0000 (UTC)
Subject: rpms/evolution-mapi/devel .cvsignore, 1.13, 1.14 evolution-mapi.spec,
	1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20090907162304.32DA611C00DB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26770

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Log Message:
* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 0.27.92-1
- Update to 0.27.92




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Aug 2009 11:34:10 -0000	1.13
+++ .cvsignore	7 Sep 2009 16:23:03 -0000	1.14
@@ -1 +1 @@
-evolution-mapi-0.27.91.tar.bz2
+evolution-mapi-0.27.92.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- evolution-mapi.spec	24 Aug 2009 11:34:10 -0000	1.17
+++ evolution-mapi.spec	7 Sep 2009 16:23:03 -0000	1.18
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.27.91
+Version: 0.27.92
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 0.27.92-1
+- Update to 0.27.92
+
 * Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 0.27.91-1
 - Update to 0.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	24 Aug 2009 11:34:11 -0000	1.13
+++ sources	7 Sep 2009 16:23:03 -0000	1.14
@@ -1 +1 @@
-6085d71635aa31d6bfca11aafb258a45  evolution-mapi-0.27.91.tar.bz2
+7c8bc781e821e7243028f4488f951fb5  evolution-mapi-0.27.92.tar.bz2



From nphilipp at fedoraproject.org  Mon Sep  7 16:23:59 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon,  7 Sep 2009 16:23:59 +0000 (UTC)
Subject: rpms/system-config-date/devel sources, 1.118,
	1.119 system-config-date.spec, 1.126, 1.127
Message-ID: <20090907162359.D06CF11C00DB@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27160

Modified Files:
	sources system-config-date.spec 
Log Message:
add BR: python-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	7 Sep 2009 16:15:15 -0000	1.118
+++ sources	7 Sep 2009 16:23:59 -0000	1.119
@@ -1 +1 @@
-f5083fb1619ebe49d9bc2310279765c7  system-config-date-1.9.48.tar.bz2
+4b65073d4af73e4bfddc4a56a65d68f6  system-config-date-1.9.48.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- system-config-date.spec	7 Sep 2009 16:15:15 -0000	1.126
+++ system-config-date.spec	7 Sep 2009 16:23:59 -0000	1.127
@@ -38,6 +38,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
+BuildRequires: python-devel
 
 Requires: libselinux-python
 Requires: ntp



From than at fedoraproject.org  Mon Sep  7 16:26:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Sep 2009 16:26:59 +0000 (UTC)
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.49,1.50
Message-ID: <20090907162659.0EA1B11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28424

Modified Files:
	rp-pppoe.spec 
Log Message:
fix file list



Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- rp-pppoe.spec	7 Sep 2009 16:17:47 -0000	1.49
+++ rp-pppoe.spec	7 Sep 2009 16:26:58 -0000	1.50
@@ -53,6 +53,8 @@ make
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/sbin
+mkdir -p %{buildroot}%{_sysconfdir}/etc/rc.d/init.d
+
 make -C src install DESTDIR=%{buildroot}
 
 mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin



From s4504kr at fedoraproject.org  Mon Sep  7 16:43:44 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  7 Sep 2009 16:43:44 +0000 (UTC)
Subject: rpms/blender/devel .cvsignore, 1.19, 1.20 blender-repack.sh, 1.3,
	1.4 blender.spec, 1.124, 1.125 sources, 1.25, 1.26
Message-ID: <20090907164344.2996F11C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3709

Modified Files:
	.cvsignore blender-repack.sh blender.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	19 Jun 2009 13:54:39 -0000	1.19
+++ .cvsignore	7 Sep 2009 16:43:43 -0000	1.20
@@ -1,4 +1 @@
-blender-2.49a-repack.tar.bz2
-blender-2.49-repack.tar.bz2
-blender-2.49.tar.gz
-blender-2.49a.tar.gz
+blender-2.49b-repack.tar.bz2


Index: blender-repack.sh
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-repack.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- blender-repack.sh	3 Aug 2009 16:38:43 -0000	1.3
+++ blender-repack.sh	7 Sep 2009 16:43:43 -0000	1.4
@@ -12,7 +12,7 @@ cleanup() {
 
 unset CDPATH
 pwd=$(pwd)
-BVERSION=2.49a
+BVERSION=2.49b
 
 pushd "$tmp"
 if [ -e $pwd/blender-${BVERSION}.tar.gz ] ; then


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- blender.spec	11 Aug 2009 18:17:32 -0000	1.124
+++ blender.spec	7 Sep 2009 16:43:43 -0000	1.125
@@ -4,8 +4,8 @@
 %global fontname blender
 
 Name:           blender
-Version:        2.49a
-Release: 	6%{?dist}
+Version:        2.49b
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -244,8 +244,11 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
-* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.49a-6
-- Build again neu freealut relase (openalut-soft)
+* Mon Sep  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-1
+- New upstream release (#520780)
+
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-6
+- Build again new freealut relase (openalut-soft)
 
 * Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-5
 - Revoke using of system FTGL library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Jun 2009 13:54:39 -0000	1.25
+++ sources	7 Sep 2009 16:43:43 -0000	1.26
@@ -1,2 +1 @@
-827f8faeb622b758e01920fabd115598  blender-2.49a-repack.tar.bz2
-b21da9b1c0fab564fa6aa09d6debf652  blender-2.49-repack.tar.bz2
+8537ec34afbd72ea517843efdc4b0cae  blender-2.49b-repack.tar.bz2



From th0br0 at fedoraproject.org  Mon Sep  7 16:58:26 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 16:58:26 +0000 (UTC)
Subject: rpms/canto/F-10 .cvsignore, 1.3, 1.4 canto.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090907165826.848BF11C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7266

Modified Files:
	.cvsignore canto.spec sources 
Log Message:
Update to 0.7.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 20:43:38 -0000	1.3
+++ .cvsignore	7 Sep 2009 16:58:24 -0000	1.4
@@ -1 +1 @@
-canto-0.6.13.tar.gz
+canto-0.7.4.tar.gz


Index: canto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-10/canto.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- canto.spec	12 Jun 2009 20:43:38 -0000	1.2
+++ canto.spec	7 Sep 2009 16:58:24 -0000	1.3
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		canto
-Version:	0.6.13
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	Atom/RSS feed reader based on ncurses
 Group:		Applications/Internet
@@ -36,13 +36,14 @@ CFLAGS="%{optflags}" %{__python} setup.p
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/canto_html.py
+sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/cfg/{sources,base}.py
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README
 %{_bindir}/%{name}*
 %{_mandir}/man1/%{name}*
 %attr(0644,root,root) %{python_sitearch}/%{name}/widecurse.so
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/*
 
 %changelog
+* Mon Sep 7 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.7.4-1
+- Updated to 0.7.4
+- Removed TODO from %%doc as it is no longer supplied by upstream
+
 * Fri Jun 12 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.13-1
 - Updated to 0.6.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 20:43:38 -0000	1.3
+++ sources	7 Sep 2009 16:58:24 -0000	1.4
@@ -1 +1 @@
-7836cf54cbb0af48d3d68a8aa86432b7  canto-0.6.13.tar.gz
+dc011bdc1047585d4ebb97243ba3e631  canto-0.7.4.tar.gz



From mtasaka at fedoraproject.org  Mon Sep  7 17:03:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  7 Sep 2009 17:03:17 +0000 (UTC)
Subject: rpms/kazehakase/devel kazehakase-0.5.7-rev3832-dbus.patch, NONE,
	1.1 .cvsignore, 1.36, 1.37 kazehakase.spec, 1.93, 1.94 sources,
	1.36, 1.37 kazehakase-rev3773-gtk021705.patch, 1.1, NONE
Message-ID: <20090907170317.3CEAC11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8521

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-rev3832-dbus.patch 
Removed Files:
	kazehakase-rev3773-gtk021705.patch 
Log Message:
* Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
- Try rev 3832 for new dbus feature
- Kill ruby support until it gets compiled


kazehakase-0.5.7-rev3832-dbus.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kazehakase-0.5.7-rev3832-dbus.patch ---
Index: dbus/Makefile.am
===================================================================
--- dbus/Makefile.am	(revision 3832)
+++ dbus/Makefile.am	(working copy)
@@ -6,6 +6,7 @@
 INCLUDES =					\
 	-I$(top_srcdir)/src/bookmarks		\
 	-I$(top_srcdir)/src			\
+	-I$(top_srcdir)/src/utils			\
 	-I$(top_builddir)/libegg/pixbufthumbnail
 
 CLEANFILES = $(BUILT_SOURCES)
@@ -37,7 +38,7 @@
 sample_browser_LDADD = 				\
         $(GTK_LIBS)	                        \
         $(DBUS_GLIB_LIBS)                       \
-	$(top_builddir)/dbus/libkzdbus.la	\
+	libkzdbus.la	\
         $(top_builddir)/src/libkazehakase.la 
 
 kz-dbus-embed-agent-server-bindings.h: kazehakase-embed.xml


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Aug 2009 05:37:09 -0000	1.36
+++ .cvsignore	7 Sep 2009 17:03:16 -0000	1.37
@@ -1 +1 @@
-kazehakase-0.5.7.tar.gz
+kazehakase-0.5.7-svn3832_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kazehakase.spec	29 Aug 2009 06:15:48 -0000	1.93
+++ kazehakase.spec	7 Sep 2009 17:03:16 -0000	1.94
@@ -12,13 +12,18 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%undefine		usesvn		
+# Kill ruby extension for F-13 until it gets compiled
+%if 0%{?fedora} >= 13
+%define		support_ruby	0
+%endif
+
+%define		usesvn		1
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1
+%define		Geckover	1.9.1.2
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -31,10 +36,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		43338
-%define		svnver		3783_trunk
+%define		svnver		3832_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	3
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -54,8 +59,13 @@ URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
+%if 0%{?fedora} <= 11
+Patch15:	kazehakase-0.5.7-gtk0218.patch
+%endif
+Patch16:	kazehakase-0.5.7-rev3832-dbus.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	dbus-devel
 BuildRequires:	expat-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	gtk2-devel
@@ -112,6 +122,9 @@ This package uses Gecko for HTML renderi
 %package	base
 Summary:	Base package of Kazehakase
 Group:		Applications/Internet
+%if %{support_ruby} < 1
+Obsoletes:	%{name}-ruby < %{version}-%{release}
+%endif
 
 %description	base
 This package contains base files for Kazehakase.
@@ -177,6 +190,11 @@ This package uses WebKit for HTML render
 
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
+%if 0%{?fedora} <= 11
+# Reverse!!
+%patch15 -p0 -b .gtk -R
+%endif
+%patch16 -p0 -b .mak
 
 %if %{need_autogen}
 sh autogen.sh
@@ -233,6 +251,9 @@ export CFLAGS="%{optflags} -DVERSION_VEN
 %configure \
 	--disable-shave \
 	--enable-migemo \
+%if %{support_ruby} < 1
+	--with-ruby=no \
+%endif
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
@@ -270,10 +291,13 @@ desktop-file-install \
 %config(noreplace) %{_sysconfdir}/%{name}/mozilla/*.xml
 
 %{_bindir}/%{name}
+%{_bindir}/kz-embed-process
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/embed/
 %dir %{_libdir}/%{name}/search/
+
 %{_libdir}/%{name}/libkazehakase.so.*
+%{_libdir}/%{name}/embed/per_process.so
 
 %dir %{_datadir}/%{name}/
 %if %{support_ruby}
@@ -317,6 +341,10 @@ desktop-file-install \
 %endif
 
 %changelog
+* Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
+- Try rev 3832 for new dbus feature
+- Kill ruby support until it gets compiled
+
 * Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
 - Update to 0.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	29 Aug 2009 05:37:10 -0000	1.36
+++ sources	7 Sep 2009 17:03:16 -0000	1.37
@@ -1 +1 @@
-1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz
+c0dc821388840869ba4ef97e14d02661  kazehakase-0.5.7-svn3832_trunk.tar.gz


--- kazehakase-rev3773-gtk021705.patch DELETED ---



From th0br0 at fedoraproject.org  Mon Sep  7 17:05:50 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 17:05:50 +0000 (UTC)
Subject: rpms/canto/F-11 canto.spec,1.3,1.4
Message-ID: <20090907170550.BB71111C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9996

Modified Files:
	canto.spec 
Log Message:
Update to 0.7.4


Index: canto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-11/canto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- canto.spec	12 Jun 2009 20:41:49 -0000	1.3
+++ canto.spec	7 Sep 2009 17:05:50 -0000	1.4
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		canto
-Version:	0.6.13
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	Atom/RSS feed reader based on ncurses
 Group:		Applications/Internet
@@ -36,13 +36,14 @@ CFLAGS="%{optflags}" %{__python} setup.p
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/canto_html.py
+sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/cfg/{sources,base}.py
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README
 %{_bindir}/%{name}*
 %{_mandir}/man1/%{name}*
 %attr(0644,root,root) %{python_sitearch}/%{name}/widecurse.so
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/*
 
 %changelog
+* Mon Sep 7 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.7.4-1
+- Updated to 0.7.4
+- Removed TODO from %%doc as it is no longer supplied by upstream
+
 * Fri Jun 12 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.13-1
 - Updated to 0.6.13
 



From th0br0 at fedoraproject.org  Mon Sep  7 17:09:14 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 17:09:14 +0000 (UTC)
Subject: rpms/canto/F-11 sources,1.3,1.4
Message-ID: <20090907170914.0BA6B11C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11094

Modified Files:
	sources 
Log Message:
forgot the sources file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 20:41:49 -0000	1.3
+++ sources	7 Sep 2009 17:09:13 -0000	1.4
@@ -1 +1 @@
-7836cf54cbb0af48d3d68a8aa86432b7  canto-0.6.13.tar.gz
+dc011bdc1047585d4ebb97243ba3e631  canto-0.7.4.tar.gz



From th0br0 at fedoraproject.org  Mon Sep  7 17:12:33 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 17:12:33 +0000 (UTC)
Subject: rpms/canto/devel .cvsignore, 1.3, 1.4 canto.spec, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <20090907171233.3A4CD11C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12092

Modified Files:
	.cvsignore canto.spec sources 
Log Message:
update to 0.7.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 20:45:18 -0000	1.3
+++ .cvsignore	7 Sep 2009 17:12:32 -0000	1.4
@@ -1 +1 @@
-canto-0.6.13.tar.gz
+canto-0.7.4.tar.gz


Index: canto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canto/devel/canto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- canto.spec	24 Jul 2009 18:39:59 -0000	1.3
+++ canto.spec	7 Sep 2009 17:12:32 -0000	1.4
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		canto
-Version:	0.6.13
-Release:	2%{?dist}
+Version:	0.7.4
+Release:	1%{?dist}
 Summary:	Atom/RSS feed reader based on ncurses
 Group:		Applications/Internet
 License:	GPLv2
@@ -36,13 +36,14 @@ CFLAGS="%{optflags}" %{__python} setup.p
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/canto_html.py
+sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/cfg/{sources,base}.py
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README
 %{_bindir}/%{name}*
 %{_mandir}/man1/%{name}*
 %attr(0644,root,root) %{python_sitearch}/%{name}/widecurse.so
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/*
 
 %changelog
+* Mon Sep 7 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.7.4-1
+- Updated to 0.7.4
+- Removed TODO from %%doc as it is no longer supplied by upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 20:45:18 -0000	1.3
+++ sources	7 Sep 2009 17:12:33 -0000	1.4
@@ -1 +1 @@
-7836cf54cbb0af48d3d68a8aa86432b7  canto-0.6.13.tar.gz
+dc011bdc1047585d4ebb97243ba3e631  canto-0.7.4.tar.gz



From th0br0 at fedoraproject.org  Mon Sep  7 17:15:43 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 17:15:43 +0000 (UTC)
Subject: rpms/pidgin-gfire/F-10 .cvsignore, 1.3, 1.4 pidgin-gfire.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090907171543.E3EC511C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/pidgin-gfire/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13073

Modified Files:
	.cvsignore pidgin-gfire.spec sources 
Log Message:
update to 0.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 21:07:17 -0000	1.3
+++ .cvsignore	7 Sep 2009 17:15:43 -0000	1.4
@@ -1 +1 @@
-gfire-0.8.2.tar.gz
+pidgin-gfire-0.8.3.tar.gz


Index: pidgin-gfire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/F-10/pidgin-gfire.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-gfire.spec	12 Jun 2009 21:07:17 -0000	1.2
+++ pidgin-gfire.spec	7 Sep 2009 17:15:43 -0000	1.3
@@ -1,14 +1,14 @@
 %global srcname gfire
 
 Name:		pidgin-gfire
-Version:	0.8.2
+Version:	0.8.3
 Release:	1%{?dist}
 Summary:	Xfire plugin for Pidgin
 
 Group:		Applications/Communications
 License:	GPLv3+
-URL:		http://gfire.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+URL:		http://www.gfireproject.org/
+Source0:	http://downloads.sourceforge.net/%{srcname}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	pidgin-devel
@@ -30,7 +30,7 @@ Features:
 	* Set custom status
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q 
 chmod 0644 AUTHORS ChangeLog COPYING NEWS README
 chmod 0644 src/*.c src/*.h
 chmod 0644 gfire_config.h
@@ -60,6 +60,10 @@ rm -rf %{buildroot}
 %{_datadir}/purple/%{srcname}/
 
 %changelog
+* Mon Sep 7 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.8.3-1
+- Updated to version 0.8.3
+- Changes to Source0 due to new upstream file naming
+
 * Fri Jun 12 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.8.2-1
 - Updated to version 0.8.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 21:07:17 -0000	1.3
+++ sources	7 Sep 2009 17:15:43 -0000	1.4
@@ -1 +1 @@
-c0a75b72b856a9ece80bf6f4133345da  gfire-0.8.2.tar.gz
+a0780772d05163bb5d70ef25ad818968  pidgin-gfire-0.8.3.tar.gz



From th0br0 at fedoraproject.org  Mon Sep  7 17:18:53 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 17:18:53 +0000 (UTC)
Subject: rpms/pidgin-gfire/F-11 .cvsignore, 1.3, 1.4 pidgin-gfire.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090907171853.17A2A11C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/pidgin-gfire/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13948

Modified Files:
	.cvsignore pidgin-gfire.spec sources 
Log Message:
update to 0.7.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 21:04:46 -0000	1.3
+++ .cvsignore	7 Sep 2009 17:18:52 -0000	1.4
@@ -1 +1 @@
-gfire-0.8.2.tar.gz
+pidgin-gfire-0.8.3.tar.gz


Index: pidgin-gfire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/F-11/pidgin-gfire.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-gfire.spec	12 Jun 2009 21:04:46 -0000	1.2
+++ pidgin-gfire.spec	7 Sep 2009 17:18:52 -0000	1.3
@@ -1,14 +1,14 @@
 %global srcname gfire
 
 Name:		pidgin-gfire
-Version:	0.8.2
+Version:	0.8.3
 Release:	1%{?dist}
 Summary:	Xfire plugin for Pidgin
 
 Group:		Applications/Communications
 License:	GPLv3+
-URL:		http://gfire.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+URL:		http://www.gfireproject.org/
+Source0:	http://downloads.sourceforge.net/%{srcname}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	pidgin-devel
@@ -30,7 +30,7 @@ Features:
 	* Set custom status
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q 
 chmod 0644 AUTHORS ChangeLog COPYING NEWS README
 chmod 0644 src/*.c src/*.h
 chmod 0644 gfire_config.h
@@ -60,6 +60,10 @@ rm -rf %{buildroot}
 %{_datadir}/purple/%{srcname}/
 
 %changelog
+* Mon Sep 7 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.8.3-1
+- Updated to version 0.8.3
+- Changes to Source0 due to new upstream file naming
+
 * Fri Jun 12 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.8.2-1
 - Updated to version 0.8.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 21:04:46 -0000	1.3
+++ sources	7 Sep 2009 17:18:52 -0000	1.4
@@ -1 +1 @@
-c0a75b72b856a9ece80bf6f4133345da  gfire-0.8.2.tar.gz
+a0780772d05163bb5d70ef25ad818968  pidgin-gfire-0.8.3.tar.gz



From th0br0 at fedoraproject.org  Mon Sep  7 17:22:10 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon,  7 Sep 2009 17:22:10 +0000 (UTC)
Subject: rpms/pidgin-gfire/devel .cvsignore, 1.3, 1.4 pidgin-gfire.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090907172210.2C1D811C00DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/pidgin-gfire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14985

Modified Files:
	.cvsignore pidgin-gfire.spec sources 
Log Message:
update to 0.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 21:10:06 -0000	1.3
+++ .cvsignore	7 Sep 2009 17:22:09 -0000	1.4
@@ -1 +1 @@
-gfire-0.8.2.tar.gz
+pidgin-gfire-0.8.3.tar.gz


Index: pidgin-gfire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/devel/pidgin-gfire.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pidgin-gfire.spec	26 Jul 2009 18:43:08 -0000	1.3
+++ pidgin-gfire.spec	7 Sep 2009 17:22:09 -0000	1.4
@@ -1,14 +1,14 @@
 %global srcname gfire
 
 Name:		pidgin-gfire
-Version:	0.8.2
-Release:	2%{?dist}
+Version:	0.8.3
+Release:	1%{?dist}
 Summary:	Xfire plugin for Pidgin
 
 Group:		Applications/Communications
 License:	GPLv3+
-URL:		http://gfire.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+URL:		http://www.gfireproject.org/
+Source0:	http://downloads.sourceforge.net/%{srcname}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	pidgin-devel
@@ -30,7 +30,7 @@ Features:
 	* Set custom status
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q 
 chmod 0644 AUTHORS ChangeLog COPYING NEWS README
 chmod 0644 src/*.c src/*.h
 chmod 0644 gfire_config.h
@@ -60,6 +60,10 @@ rm -rf %{buildroot}
 %{_datadir}/purple/%{srcname}/
 
 %changelog
+* Mon Sep 7 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.8.3-1
+- Updated to version 0.8.3
+- Changes to Source0 due to new upstream file naming
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-gfire/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 21:10:06 -0000	1.3
+++ sources	7 Sep 2009 17:22:09 -0000	1.4
@@ -1 +1 @@
-c0a75b72b856a9ece80bf6f4133345da  gfire-0.8.2.tar.gz
+a0780772d05163bb5d70ef25ad818968  pidgin-gfire-0.8.3.tar.gz



From harald at fedoraproject.org  Mon Sep  7 17:22:37 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  7 Sep 2009 17:22:37 +0000 (UTC)
Subject: rpms/dracut/devel 0009-mdraid_start.sh-fixed-raid-activation.patch, 
	NONE, 1.1 0010-add-scp-to-debug-module.patch, NONE,
	1.1 0011-mdraid-cleanup-do-not-stop-mdraid-container.patch, NONE,
	1.1 0012-added-initqueue-settled-and-refactored-code.patch, NONE,
	1.1 dracut.spec, 1.20, 1.21
Message-ID: <20090907172237.207AE11C00DB@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15146

Modified Files:
	dracut.spec 
Added Files:
	0009-mdraid_start.sh-fixed-raid-activation.patch 
	0010-add-scp-to-debug-module.patch 
	0011-mdraid-cleanup-do-not-stop-mdraid-container.patch 
	0012-added-initqueue-settled-and-refactored-code.patch 
Log Message:
* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-4
- fixed mdraid for IMSM


0009-mdraid_start.sh-fixed-raid-activation.patch:
 90mdraid/65-md-incremental-imsm.rules |    6 ++++++
 90mdraid/install                      |    3 ++-
 90mdraid/mdcontainer_start.sh         |    9 +++++++++
 90mdraid/mdraid_start.sh              |   18 ++----------------
 95debug/install                       |    3 +--
 5 files changed, 20 insertions(+), 19 deletions(-)

--- NEW FILE 0009-mdraid_start.sh-fixed-raid-activation.patch ---
>From 587b3497c149780f8c4e680d19a880418c5cc8bb Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 14:11:18 +0200
Subject: [PATCH 09/12] mdraid_start.sh: fixed raid activation

---
 modules.d/90mdraid/65-md-incremental-imsm.rules |    6 ++++++
 modules.d/90mdraid/install                      |    3 ++-
 modules.d/90mdraid/mdcontainer_start.sh         |    9 +++++++++
 modules.d/90mdraid/mdraid_start.sh              |   18 ++----------------
 modules.d/95debug/install                       |    2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100755 modules.d/90mdraid/mdcontainer_start.sh

diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index 8385fb4..5104fc5 100644
--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -23,3 +23,9 @@ RUN+="/sbin/mdadm -I --no-degraded $env{DEVNAME}"
 RUN+="/bin/sh -c '>/tmp/.mdraid_start-%k; /bin/ln -s /sbin/mdraid_start /initqueue/mdraid_start.sh'"
 
 LABEL="md_inc_end"
+
+ACTION=="add|change", \
+	ENV{DEVTYPE}!="partition", \
+	ENV{MD_LEVEL}=="container", \
+	TEST!="/tmp/.mdcontainer_start-%k", \
+	RUN+="/bin/sh -c '>/tmp/.mdcontainer_start-%k; initqueue /sbin/mdcontainer_start $env{DEVNAME}'"
diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 71c313b..c2de3bb 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dracut_install mdadm partx grep
+dracut_install mdadm partx 
 
 
 # XXX: mdmon really needs to run as non-root?
@@ -32,6 +32,7 @@ if [ -x  /sbin/mdmon ] ; then
 fi 
 
 inst "$moddir/mdraid_start.sh" /sbin/mdraid_start
+inst "$moddir/mdcontainer_start.sh" /sbin/mdcontainer_start
 inst_hook pre-trigger 30 "$moddir/parse-md.sh"
 inst_hook pre-pivot 30 "$moddir/mdraid-cleanup.sh"
 inst_hook pre-pivot 31 "$moddir/mdraid-cleanup.sh"
diff --git a/modules.d/90mdraid/mdcontainer_start.sh b/modules.d/90mdraid/mdcontainer_start.sh
new file mode 100755
index 0000000..403b62b
--- /dev/null
+++ b/modules.d/90mdraid/mdcontainer_start.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+. /lib/dracut-lib.sh
+
+if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
+    # run mdadm if udev has settled
+    md=$1
+    # and activate any containers
+    mdadm -IR $md 2>&1 | vinfo
+fi
diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index a6868bd..55e7d9c 100755
--- a/modules.d/90mdraid/mdraid_start.sh
+++ b/modules.d/90mdraid/mdraid_start.sh
@@ -4,20 +4,6 @@ if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
     [ -h "$job" ] && rm -f "$job"
     # run mdadm if udev has settled
     info "Assembling MD RAID arrays"
-
-    # and activate any containers
-    for md in /dev/md?*; do
-        case $md in
-	    /dev/md*p*) ;;
-	    *)
-                if mdadm --query --test --detail $md 2>&1|grep -q 'does not appear to be active'; then
-		    info "Starting MD RAID array $md"
-                    mdadm -R $md 2>&1 | vinfo
-                    if mdadm --query --test --detail $md 2>&1|grep -q 'does not appear to be active'; then
-                        mdadm -IR $md 2>&1 | vinfo
-                    fi
-                    udevsettle
-               fi
-        esac
-    done
+    mdadm -IRs 2>&1 | vinfo
+    udevsettle 
 fi
diff --git a/modules.d/95debug/install b/modules.d/95debug/install
index 1597187..1c7afaf 100755
--- a/modules.d/95debug/install
+++ b/modules.d/95debug/install
@@ -1,3 +1,3 @@
 #!/bin/bash
 dracut_install -o ps grep more cat rm strace free showmount 
-dracut_install -o ping netstat rpcinfo
+dracut_install -o ping netstat rpcinfo vi
-- 
1.6.2.5


0010-add-scp-to-debug-module.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0010-add-scp-to-debug-module.patch ---
>From 4f4a79b1a13f9961030a3d97743274116f72054a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 17:10:19 +0200
Subject: [PATCH 10/12] add scp to debug module

---
 modules.d/95debug/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/95debug/install b/modules.d/95debug/install
index 1c7afaf..cd8c48c 100755
--- a/modules.d/95debug/install
+++ b/modules.d/95debug/install
@@ -1,3 +1,3 @@
 #!/bin/bash
 dracut_install -o ps grep more cat rm strace free showmount 
-dracut_install -o ping netstat rpcinfo vi
+dracut_install -o ping netstat rpcinfo vi scp
-- 
1.6.2.5


0011-mdraid-cleanup-do-not-stop-mdraid-container.patch:
 mdraid-cleanup.sh |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 0011-mdraid-cleanup-do-not-stop-mdraid-container.patch ---
>From 906dedf4d57f03545094e75482072b12873926f8 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 17:53:37 +0200
Subject: [PATCH 11/12] mdraid-cleanup: do not stop mdraid container

---
 modules.d/90mdraid/mdraid-cleanup.sh |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
index 9c4469d..dc3b86f 100755
--- a/modules.d/90mdraid/mdraid-cleanup.sh
+++ b/modules.d/90mdraid/mdraid-cleanup.sh
@@ -1,4 +1,15 @@
 # stop everything which is not busy
-for i in /dev/md*; do
-    mdadm --stop $i >/dev/null 2>&1
+for i in /dev/md* /dev/md/*; do
+    [ -b $i ] || continue
+
+    mddetail=$(udevadm info --query=property --name=$i)
+    case "$mddetail" in 
+	*MD_LEVEL=container*) 
+	    ;;
+	*DEVTYPE=partition*)
+	    ;;
+	*)
+	    mdadm --stop $i >/dev/null 2>&1
+	    ;;
+    esac
 done
-- 
1.6.2.5


0012-added-initqueue-settled-and-refactored-code.patch:
 b/modules.d/90crypt/cryptroot-ask.sh                  |    2 
 b/modules.d/90dmraid/61-dmraid-imsm.rules             |    4 -
 b/modules.d/90dmraid/dmraid.sh                        |   45 ++++++-------
 b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh |    4 -
 b/modules.d/90lvm/64-lvm.rules                        |    9 +-
 b/modules.d/90lvm/install                             |    7 --
 b/modules.d/90lvm/lvm_scan.sh                         |   61 ++++++++----------
 b/modules.d/90mdraid/65-md-incremental-imsm.rules     |   42 +++++++++++-
 b/modules.d/90mdraid/mdcontainer_start.sh             |    9 --
 b/modules.d/90mdraid/mdraid_start.sh                  |   11 +--
 b/modules.d/95rootfs-block/block-genrules.sh          |    2 
 b/modules.d/99base/dracut-lib.sh                      |    7 ++
 b/modules.d/99base/init                               |   17 ++++-
 b/modules.d/99base/initqueue                          |   34 +++++++---
 b/modules.d/99base/install                            |    2 
 modules.d/90lvm/64-lvm-vol_id.rules                   |   22 ------
 16 files changed, 160 insertions(+), 118 deletions(-)

--- NEW FILE 0012-added-initqueue-settled-and-refactored-code.patch ---
>From 273b197d75da0165ce5ad22bcab6697bc22dbb04 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 17:40:04 +0200
Subject: [PATCH 12/12] added initqueue-settled and refactored code

---
 modules.d/90crypt/cryptroot-ask.sh                 |    2 -
 modules.d/90dmraid/61-dmraid-imsm.rules            |    4 +-
 modules.d/90dmraid/dmraid.sh                       |   45 +++++++--------
 .../90dmsquash-live/dmsquash-live-genrules.sh      |    4 +-
 modules.d/90lvm/64-lvm-vol_id.rules                |   22 -------
 modules.d/90lvm/64-lvm.rules                       |    9 ++-
 modules.d/90lvm/install                            |    7 +--
 modules.d/90lvm/lvm_scan.sh                        |   61 +++++++++----------
 modules.d/90mdraid/65-md-incremental-imsm.rules    |   42 ++++++++++++-
 modules.d/90mdraid/mdcontainer_start.sh            |    9 +--
 modules.d/90mdraid/mdraid_start.sh                 |   11 +--
 modules.d/95rootfs-block/block-genrules.sh         |    2 +-
 modules.d/99base/dracut-lib.sh                     |    7 ++
 modules.d/99base/init                              |   17 +++++-
 modules.d/99base/initqueue                         |   34 +++++++++--
 modules.d/99base/install                           |    1 +
 16 files changed, 160 insertions(+), 117 deletions(-)
 delete mode 100644 modules.d/90lvm/64-lvm-vol_id.rules

diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index a2ebde6..7872d64 100755
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -35,6 +35,4 @@ fi
 # mark device as asked
 >> /tmp/cryptroot-asked-$2
 
-udevsettle
-
 exit 0
diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
index 172e09f..d610643 100644
--- a/modules.d/90dmraid/61-dmraid-imsm.rules
+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
@@ -11,7 +11,9 @@ ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
 ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
 TEST=="/tmp/.dmraid_scan-%k", GOTO="dm_end"
 
-RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
+RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan"
+
+ACTION=="change", RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k'"
 
 ENV{DEVTYPE}!="partition", \
     RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
index 2cd6773..e382233 100755
--- a/modules.d/90dmraid/dmraid.sh
+++ b/modules.d/90dmraid/dmraid.sh
@@ -1,28 +1,25 @@
 #!/bin/sh
 
-if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-    [ -h "$job" ] && rm -f "$job"
-    DM_RAIDS=$(getargs rd_DM_UUID=)
-    # run dmraid if udev has settled
-    info "Scanning for dmraid devices $DM_RAIDS"
-    if [ -n "$DM_RAIDS" ]; then
-	# only activate specified DM RAIDS
-	SETS=$(dmraid -c -s)
-	info "Found dmraid sets:"
-	echo $SETS|vinfo
-	for r in $DM_RAIDS; do 
-	    for s in $SETS; do 
-		if [ "${s##$r}" != "$s" ]; then
-		    info "Activating $s"
-		    dmraid -ay $s 2>&1 | vinfo
-                    udevsettle
-		fi
-	    done
+. /lib/dracut-lib.sh
+
+DM_RAIDS=$(getargs rd_DM_UUID=)
+# run dmraid if udev has settled
+info "Scanning for dmraid devices $DM_RAIDS"
+if [ -n "$DM_RAIDS" ]; then
+    # only activate specified DM RAIDS
+    SETS=$(dmraid -c -s)
+    info "Found dmraid sets:"
+    echo $SETS|vinfo
+    for r in $DM_RAIDS; do 
+	for s in $SETS; do 
+	    if [ "${s##$r}" != "$s" ]; then
+		info "Activating $s"
+		dmraid -ay $s 2>&1 | vinfo
+                udevsettle
+	    fi
 	done
-    else 
-	# scan and activate all DM RAIDS
-	dmraid -ay 2>&1 | vinfo
-        udevsettle
-    fi
+    done
+else 
+    # scan and activate all DM RAIDS
+    dmraid -ay 2>&1 | vinfo
 fi
-
diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
index a3858e1..4bf993d 100644
--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
@@ -4,9 +4,9 @@ if [ "${root%%:*}" = "live" ]; then
     	${root#live:/dev/} 
     printf 'SYMLINK=="%s", SYMLINK+="live"\n' \
 	${root#live:/dev/} 
-    printf 'KERNEL=="%s", RUN+="/sbin/initqueue --onetime /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+    printf 'KERNEL=="%s", RUN+="/sbin/initqueue --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
     	${root#live:/dev/} 
-    printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --onetime /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+    printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
 	${root#live:/dev/} 
 
     ) >> /etc/udev/rules.d/99-live-mount.rules
diff --git a/modules.d/90lvm/64-lvm-vol_id.rules b/modules.d/90lvm/64-lvm-vol_id.rules
deleted file mode 100644
index 4f349a6..0000000
--- a/modules.d/90lvm/64-lvm-vol_id.rules
+++ /dev/null
@@ -1,22 +0,0 @@
-# hacky rules to try to activate lvm when we get new block devs...
-#
-# Copyright 2008, Red Hat, Inc.
-# Jeremy Katz <katzj at redhat.com>
-
-
-SUBSYSTEM!="block", GOTO="lvm_end"
-ACTION!="add|change", GOTO="lvm_end"
-KERNEL=="dm-[0-9]*", ACTION!="change", GOTO="lvm_end"
-
-ENV{ID_FS_TYPE}=="LVM2_member", \
-    TEST!="/tmp/.lvm_scan-%k", \
-    RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k; /bin/ln -fs /sbin/lvm_scan /initqueue/lvm_scan.sh'"
-
-KERNEL!="dm-[0-9]*", GOTO="lvm_end"
-
-OPTIONS="link_priority=-100"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-
-LABEL="lvm_end"
diff --git a/modules.d/90lvm/64-lvm.rules b/modules.d/90lvm/64-lvm.rules
index 0a053ae..a200add 100644
--- a/modules.d/90lvm/64-lvm.rules
+++ b/modules.d/90lvm/64-lvm.rules
@@ -7,9 +7,12 @@
 SUBSYSTEM!="block", GOTO="lvm_end"
 ACTION!="add|change", GOTO="lvm_end"
 KERNEL=="dm-[0-9]*", ACTION=="add", GOTO="lvm_end"
+ENV{ID_FS_TYPE}!="LVM2_member", GOTO="lvm_end"
 
-ENV{ID_FS_TYPE}=="LVM2_member", \
-    TEST!="/tmp/.lvm_scan-%k", \
-    RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k; /bin/ln -fs /sbin/lvm_scan /initqueue/lvm_scan.sh'"
+TEST!="/tmp/.lvm_change-%k", \
+    RUN+="/sbin/initqueue --settled --onetime --unique /sbin/lvm_scan"
+
+ACTION=="add", RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k;'"
+ACTION=="change", RUN+="/bin/sh -c '>/tmp/.lvm_change-%k;>/tmp/.lvm_scan-%k;'"
 
 LABEL="lvm_end"
diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
index ad4d2e2..c0952e2 100755
--- a/modules.d/90lvm/install
+++ b/modules.d/90lvm/install
@@ -1,10 +1,7 @@
 #!/bin/bash
 inst lvm
-if [ -x /lib/udev/vol_id ]; then
-    inst_rules "$moddir/64-lvm-vol_id.rules" 64-device-mapper.rules
-else
-    inst_rules "$moddir/64-lvm.rules" 64-device-mapper.rules
-fi
+
+inst_rules "$moddir/64-lvm.rules" 64-lvm.rules
 
 if [[ $hostonly ]]; then 
     [ -f /etc/lvm/lvm.conf ] && inst /etc/lvm/lvm.conf
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index a40b677..f606055 100755
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -1,38 +1,35 @@
 #!/bin/sh
 
-if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-    [ -h "$job" ] && rm -f "$job"
-    # run lvm scan if udev has settled
+# run lvm scan if udev has settled
 
-    VGS=$(getargs rd_LVM_VG=)
+. /lib/dracut-lib.sh
 
-    [ -d /etc/lvm ] || mkdir -p /etc/lvm
-    # build a list of devices to scan
-    lvmdevs=$(
-	for f in /tmp/.lvm_scan-*; do
-	    [ -e "$f" ] || continue
-	    echo -n "${f##/tmp/.lvm_scan-} "
-	done
-	)
+VGS=$(getargs rd_LVM_VG=)
 
-    if [ ! -e /etc/lvm/lvm.conf ]; then 
-        {
-	    echo 'devices {';
-	    echo -n '    filter = [ '
-	    for dev in $lvmdevs; do
-		printf '"a|^/dev/%s$|", ' $dev;
-	    done;
-	    echo '"r/.*/" ]';
-	    echo 'types = [ "blkext", 1024 , "cciss0", 1024 ]'
-	    echo '}';	  
-        } > /etc/lvm/lvm.conf
-	lvmwritten=1
-    fi
-    info "Scanning devices $lvmdevs for LVM volume groups $VGS"
-    lvm vgscan 2>&1 | vinfo
-    lvm vgchange -ay $VGS 2>&1 | vinfo
-    [ "$lvmwritten" ] && rm -f /etc/lvm/lvm.conf
-    unset lvmwritten
-    udevsettle
-fi
+[ -d /etc/lvm ] || mkdir -p /etc/lvm
+# build a list of devices to scan
+lvmdevs=$(
+    for f in /tmp/.lvm_scan-*; do
+	[ -e "$f" ] || continue
+	echo -n "${f##/tmp/.lvm_scan-} "
+    done
+)
 
+if [ ! -e /etc/lvm/lvm.conf ]; then 
+    {
+	echo 'devices {';
+	echo -n '    filter = [ '
+	for dev in $lvmdevs; do
+	    printf '"a|^/dev/%s$|", ' $dev;
+	done;
+	echo '"r/.*/" ]';
+	echo 'types = [ "blkext", 1024 , "cciss0", 1024 ]'
+	echo '}';	  
+    } > /etc/lvm/lvm.conf
+    lvmwritten=1
+fi
+info "Scanning devices $lvmdevs for LVM volume groups $VGS"
+lvm vgscan 2>&1 | vinfo
+lvm vgchange -ay $VGS 2>&1 | vinfo
+[ "$lvmwritten" ] && rm -f /etc/lvm/lvm.conf
+unset lvmwritten
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index 5104fc5..0a06988 100644
--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -20,12 +20,46 @@ ENV{DEVTYPE}!="partition", \
 
 RUN+="/sbin/mdadm -I --no-degraded $env{DEVNAME}"
 
-RUN+="/bin/sh -c '>/tmp/.mdraid_start-%k; /bin/ln -s /sbin/mdraid_start /initqueue/mdraid_start.sh'"
-
 LABEL="md_inc_end"
 
+#
+# Handle non-container raid arrays
+#
+ACTION=="add|change", \
+	KERNEL=="md[0-9]*|md/*", \
+	ENV{DEVTYPE}!="partition", \
+	ENV{MD_LEVEL}!="container", \
+	GOTO="do_raidstart"
+
+GOTO="end_raidstart"
+
+LABEL="do_raidstart"
+
+TEST!="/tmp/.mdraid_start-%k", \
+	RUN+="/sbin/initqueue --settled --onetime --unique /sbin/mdraid_start"
+
+ACTION=="change", \
+	RUN+="/bin/sh -c '>/tmp/.mdraid_start-%k'"
+
+LABEL="end_raidstart"
+
+#
+# Handle container raid arrays
+#
 ACTION=="add|change", \
+	KERNEL=="md[0-9]*|md/*", \
 	ENV{DEVTYPE}!="partition", \
 	ENV{MD_LEVEL}=="container", \
-	TEST!="/tmp/.mdcontainer_start-%k", \
-	RUN+="/bin/sh -c '>/tmp/.mdcontainer_start-%k; initqueue /sbin/mdcontainer_start $env{DEVNAME}'"
+	GOTO="do_container"
+
+GOTO="end_container"
+
+LABEL="do_container"
+
+TEST!="/tmp/.mdcontainer_start-%k", \
+	RUN+="/sbin/initqueue --settled --onetime /sbin/mdcontainer_start $env{DEVNAME}"
+
+ACTION=="change", \
+	RUN+="/bin/sh -c '>/tmp/.mdcontainer_start-%k'"
+
+LABEL="end_container"
diff --git a/modules.d/90mdraid/mdcontainer_start.sh b/modules.d/90mdraid/mdcontainer_start.sh
index 403b62b..4cb282d 100755
--- a/modules.d/90mdraid/mdcontainer_start.sh
+++ b/modules.d/90mdraid/mdcontainer_start.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 . /lib/dracut-lib.sh
 
-if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-    # run mdadm if udev has settled
-    md=$1
-    # and activate any containers
-    mdadm -IR $md 2>&1 | vinfo
-fi
+md=$1
+# and activate any containers
+mdadm -IR $md 2>&1 | vinfo
diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index 55e7d9c..ee9362c 100755
--- a/modules.d/90mdraid/mdraid_start.sh
+++ b/modules.d/90mdraid/mdraid_start.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-    [ -h "$job" ] && rm -f "$job"
-    # run mdadm if udev has settled
-    info "Assembling MD RAID arrays"
-    mdadm -IRs 2>&1 | vinfo
-    udevsettle 
-fi
+. /lib/dracut-lib.sh
+# run mdadm if udev has settled
+info "Assembling MD RAID arrays"
+mdadm -IRs 2>&1 | vinfo
diff --git a/modules.d/95rootfs-block/block-genrules.sh b/modules.d/95rootfs-block/block-genrules.sh
index 10471ea..f12a6b9 100644
--- a/modules.d/95rootfs-block/block-genrules.sh
+++ b/modules.d/95rootfs-block/block-genrules.sh
@@ -8,5 +8,5 @@ if [ "${root%%:*}" = "block" ]; then
     (
     printf '[ -e "%s" ] && { ln -s "%s" /dev/root; rm "$job"; }\n' \
 	"${root#block:}" "${root#block:}"
-    ) >> /initqueue/blocksymlink.sh
+    ) >> /initqueue-settled/blocksymlink.sh
 fi
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index a717bb4..9e33cf3 100644
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -117,3 +117,10 @@ udevsettle() {
         udevadm settle --timeout=30
     fi
 }
+
+if [ -e /proc/cmdline ]; then
+	if getarg rdinitdebug; then
+	    set -x
+	fi
+fi
+
diff --git a/modules.d/99base/init b/modules.d/99base/init
index d94a3a2..14505ed 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -138,7 +138,22 @@ while :; do
     [ -n "$queuetriggered" ] && continue
 
     if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-        # no more udev jobs
+        unset queuetriggered
+	for job in /initqueue-settled/*.sh; do
+	    [ -e "$job" ] || break
+
+	    queuetriggered="1"
+
+            job=$job . $job
+	    
+            # bail out, if we have mounted the root filesystem
+            [ -d "$NEWROOT/proc" ] && break 2;
+
+            # check if root can be mounted
+            [ -e /dev/root ] && break 2;
+	done
+
+        # no more udev jobs and queues empty.
         sleep 0.5
         i=$(($i+1))
         [ $i -gt 20 ] \
diff --git a/modules.d/99base/initqueue b/modules.d/99base/initqueue
index a5c6ef6..b2d4406 100755
--- a/modules.d/99base/initqueue
+++ b/modules.d/99base/initqueue
@@ -1,12 +1,32 @@
 #!/bin/sh
 
-if [ "$1" = "--onetime" ]; then
-    onetime="yes"
-    shift
+. /lib/dracut-lib.sh
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+	--onetime)
+	    onetime="yes"
+	    shift;;
+	--settled)
+	    settled="-settled"
+	    shift;;
+	--unique)
+	    unique="yes"
+	    shift;;
+	*)
+	    break;;
+    esac
+done
+
+if [ -z "$unique" ]; then
+	job=$$
+else
+	job=${1##*/}
 fi
-echo "$@" > /tmp/$$.sh
+
+echo "$@" > /tmp/${job}.sh
 if [ -n "$onetime" ]; then
-   echo '[ -e "$job" ] && rm "$job"' >> /tmp/$$.sh
+   echo '[ -e "$job" ] && rm "$job"' >> /tmp/${job}.sh
 fi
-mv /tmp/$$.sh /initqueue/
->> /initqueue/work
+mv -f /tmp/${job}.sh /initqueue${settled}/
+[ -z "$settled" ] && >> /initqueue/work
diff --git a/modules.d/99base/install b/modules.d/99base/install
index bc2336a..08ca8f0 100755
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -9,6 +9,7 @@ fi
 inst "$moddir/init" "/init"
 inst "$moddir/initqueue" "/sbin/initqueue"
 mkdir -p ${initdir}/initqueue
+mkdir -p ${initdir}/initqueue-settled
 mkdir -p ${initdir}/tmp
 # Bail out if switch_root does not exist
 if which switch_root >/dev/null 2>&1; then
-- 
1.6.2.5



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- dracut.spec	7 Sep 2009 09:44:58 -0000	1.20
+++ dracut.spec	7 Sep 2009 17:22:36 -0000	1.21
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 001
-Release: 3%{?rdist}
+Release: 4%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -23,6 +23,10 @@ Source0: dracut-%{version}%{?dashgittag}
 Patch1: 0005-mdraid-add-grep-for-convenience.patch
 Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
 Patch3: 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch
+Patch4: 0009-mdraid_start.sh-fixed-raid-activation.patch
+Patch5: 0010-add-scp-to-debug-module.patch
+Patch6: 0011-mdraid-cleanup-do-not-stop-mdraid-container.patch
+Patch7: 0012-added-initqueue-settled-and-refactored-code.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
@@ -110,6 +114,10 @@ This package contains tools to assemble 
 %patch1 -p1 
 %patch2 -p1 
 %patch3 -p1 
+%patch4 -p1 
+%patch5 -p1 
+%patch6 -p1 
+%patch7 -p1 
 
 %build
 make
@@ -186,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-4
+- fixed mdraid for IMSM
+
 * Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
 - fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
 



From salimma at fedoraproject.org  Mon Sep  7 17:24:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 17:24:07 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.23,1.24
Message-ID: <20090907172407.EC21011C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15584

Modified Files:
	llvm.spec 
Log Message:
Fix testsuite error: BR on python



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- llvm.spec	7 Sep 2009 14:52:52 -0000	1.23
+++ llvm.spec	7 Sep 2009 17:24:07 -0000	1.24
@@ -29,7 +29,7 @@ BuildRequires:  groff
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  ocaml-ocamldoc
 # for DejaGNU test suite
-BuildRequires:  dejagnu tcl-devel
+BuildRequires:  dejagnu tcl-devel python
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 BuildRequires:  doxygen graphviz
 %endif
@@ -162,8 +162,7 @@ make %{_smp_mflags} OPTIMIZE_OPTION='%{o
 
 
 %check
-# 2 tests currently fail on i686
-cd obj && make check; true
+cd obj && make check
 
 
 %install



From salimma at fedoraproject.org  Mon Sep  7 17:54:35 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 17:54:35 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.24,1.25
Message-ID: <20090907175435.B574E11C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24541

Modified Files:
	llvm.spec 
Log Message:
Disable unit tests on PPC for now



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- llvm.spec	7 Sep 2009 17:24:07 -0000	1.24
+++ llvm.spec	7 Sep 2009 17:54:33 -0000	1.25
@@ -162,7 +162,9 @@ make %{_smp_mflags} OPTIMIZE_OPTION='%{o
 
 
 %check
+%ifnarch ppc
 cd obj && make check
+%endif
 
 
 %install



From pkgdb at fedoraproject.org  Mon Sep  7 18:02:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 18:02:41 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested watchbugzilla
Message-ID: <20090907180241.EB2DE10F87C@bastion2.fedora.phx.redhat.com>

stefansf has requested the watchbugzilla acl on pyicq-t (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Mon Sep  7 18:02:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Sep 2009 18:02:44 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested watchcommits
Message-ID: <20090907180244.74E6110F884@bastion2.fedora.phx.redhat.com>

stefansf has requested the watchcommits acl on pyicq-t (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From epienbro at fedoraproject.org  Mon Sep  7 18:07:09 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon,  7 Sep 2009 18:07:09 +0000 (UTC)
Subject: rpms/mingw32-iconv/devel mingw32-iconv.spec,1.4,1.5
Message-ID: <20090907180709.D786D11C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-iconv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27792

Modified Files:
	mingw32-iconv.spec 
Log Message:
* Mon Sep  7 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12-11
- Fixed %defattr line
- Added -static subpackage
- Use %global instead of %define
- Automatically generate debuginfo subpackage



Index: mingw32-iconv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-iconv/devel/mingw32-iconv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-iconv.spec	25 Jul 2009 12:19:48 -0000	1.4
+++ mingw32-iconv.spec	7 Sep 2009 18:07:09 -0000	1.5
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:      mingw32-iconv
 Version:   1.12
-Release:   10%{?dist}
+Release:   11%{?dist}
 Summary:   GNU libraries and utilities for character set conversion
 
 License:   GPLv2+ and LGPLv2+
@@ -16,7 +17,7 @@ Source0:   http://ftp.gnu.org/pub/gnu/li
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 52
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 
@@ -31,12 +32,24 @@ BuildRequires: mingw32-binutils
 MinGW Windows Iconv library
 
 
+%package static
+Summary:        Static version of the MinGW Windows Iconv library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Iconv library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libiconv-%{version}
 
 
 %build
-%{_mingw32_configure}
+%{_mingw32_configure} --enable-static --enable-shared
 make
 
 
@@ -60,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING COPYING.LIB
 %{_mingw32_bindir}/iconv
 %{_mingw32_bindir}/libcharset-1.dll
@@ -69,14 +82,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_includedir}/libcharset.h
 %{_mingw32_includedir}/localcharset.h
 %{_mingw32_libdir}/charset.alias
-%{_mingw32_libdir}/libcharset.a
 %{_mingw32_libdir}/libcharset.dll.a
 %{_mingw32_libdir}/libcharset.la
 %{_mingw32_libdir}/libiconv.dll.a
 %{_mingw32_libdir}/libiconv.la
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcharset.a
+%{_mingw32_libdir}/libiconv.a
+
 
 %changelog
+* Mon Sep  7 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12-11
+- Fixed %%defattr line
+- Added -static subpackage
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Mon Sep  7 19:09:40 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 19:09:40 +0000 (UTC)
Subject: rpms/nss/devel nss-pem-509705.patch,1.1,NONE
Message-ID: <20090907190940.5DFE711C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18194

Removed Files:
	nss-pem-509705.patch 
Log Message:
patch incorporated in the pem enabling source archive


--- nss-pem-509705.patch DELETED ---



From emaldonado at fedoraproject.org  Mon Sep  7 19:11:05 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 19:11:05 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.112,1.113
Message-ID: <20090907191105.2AECA11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18524

Modified Files:
	nss.spec 
Log Message:
Update pem enabling source tar with latest fixes (509705, 51209)


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- nss.spec	6 Sep 2009 20:39:23 -0000	1.112
+++ nss.spec	7 Sep 2009 19:11:04 -0000	1.113
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-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
@@ -31,11 +31,10 @@ Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-Source12:         %{name}-pem-20090622.tar.bz2
+Source12:         %{name}-pem-20090907.tar.bz2
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           nss-pem-509705.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -90,7 +89,6 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .509705
 
 %build
 
@@ -424,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Sep 07 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
+- Update pem enabling source tar with latest fixes (509705, 51209)
+
 * Sun Sep 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
 - PEM module implements memory management for internal objects - 509705
 - PEM module doesn't crash when processing malformed key files - 512019



From emaldonado at fedoraproject.org  Mon Sep  7 19:16:20 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 19:16:20 +0000 (UTC)
Subject: rpms/nss/devel sources,1.28,1.29
Message-ID: <20090907191620.9C79D11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19945

Modified Files:
	sources 
Log Message:
Updated pem enabling source archive


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	4 Sep 2009 23:26:54 -0000	1.28
+++ sources	7 Sep 2009 19:16:20 -0000	1.29
@@ -1,2 +1,2 @@
-bdac5df4a93c67222a60fabc121921c3  nss-pem-20090622.tar.bz2
 954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2



From emaldonado at fedoraproject.org  Mon Sep  7 19:16:36 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 19:16:36 +0000 (UTC)
Subject: rpms/nss/devel .cvsignore,1.26,1.27
Message-ID: <20090907191636.3C64111C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20147

Modified Files:
	.cvsignore 
Log Message:
Updated pem enabling source archive


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	4 Sep 2009 23:20:17 -0000	1.26
+++ .cvsignore	7 Sep 2009 19:16:35 -0000	1.27
@@ -1 +1,2 @@
 nss-3.12.4-stripped.tar.bz2
+nss-pem-20090907.tar.bz2



From emaldonado at fedoraproject.org  Mon Sep  7 19:19:31 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 19:19:31 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.113,1.114
Message-ID: <20090907191931.B34D011C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21443

Modified Files:
	nss.spec 
Log Message:
retagging to pick up new sources


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- nss.spec	7 Sep 2009 19:11:04 -0000	1.113
+++ nss.spec	7 Sep 2009 19:19:31 -0000	1.114
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -422,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Sep 07 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
+- Retagging to pick up new sources
+
 * Mon Sep 07 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
 - Update pem enabling source tar with latest fixes (509705, 51209)
 



From nim at fedoraproject.org  Mon Sep  7 19:30:07 2009
From: nim at fedoraproject.org (nim)
Date: Mon,  7 Sep 2009 19:30:07 +0000 (UTC)
Subject: rpms/dejavu-fonts/devel
	dejavu-fonts-2.30-bad-serif-condensed-metadata.patch, NONE,
	1.1 dejavu-fonts.spec, 1.103, 1.104 import.log, 1.17, 1.18
Message-ID: <20090907193007.D3F0011C043D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24033/devel

Modified Files:
	dejavu-fonts.spec import.log 
Added Files:
	dejavu-fonts-2.30-bad-serif-condensed-metadata.patch 
Log Message:
fix serif condensed italic metadata

dejavu-fonts-2.30-bad-serif-condensed-metadata.patch:
 scripts/narrow.pe                   |   62 ++++++++++++++++++++++++++++++++++++
 src/DejaVuSerifCondensed-Italic.sfd |    4 +-
 status.txt                          |    2 -
 3 files changed, 65 insertions(+), 3 deletions(-)

--- NEW FILE dejavu-fonts-2.30-bad-serif-condensed-metadata.patch ---
diff -uNr dejavu-fonts-2.30/scripts/narrow.pe dejavu-fonts.trunk/scripts/narrow.pe
--- dejavu-fonts-2.30/scripts/narrow.pe	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts.trunk/scripts/narrow.pe	2009-09-07 12:15:18.000000000 +0200
@@ -0,0 +1,62 @@
+#!/usr/bin/env fontforge
+# $Id$
+
+# script file for FontForge for font narrowing
+# usage: fontforge -script narrow.pe scale *.sfd
+#   created files have suffix .narrow
+
+# DejaVu Condensed have scale 90
+
+if ($version < "20050209")
+  Error("Your version of FontForge transforms glyphs w/o content");
+endif
+if ($argc < 2)
+  Error("usage: scale sfds...")
+endif
+scale = Strtol($argv[1])
+i = 2
+while (i < $argc)
+  Open($argv[i], 1)
+  SelectAll()
+  Scale(scale, 100, 0, 0)
+  # Panose changes are valid only for DejaVu fonts (I guess)
+  SetPanose(3, 6)
+  new_fontname = $fontname
+  old_familyname = $familyname
+  j = Strstr(new_fontname, "-Roman")
+  if (j > -1)
+    new_fontname = Strsub(new_fontname, 0, j)
+  endif
+  j = Strstr(new_fontname, "-")
+  if (j > -1)
+    new_fontname = Strsub(new_fontname, 0, j) + "Condensed" + Strsub(new_fontname, j)
+  else
+    new_fontname = new_fontname + "Condensed"
+  endif
+  new_fullname = $fullname
+  newprefsubfamily = "Condensed"
+  new_subfamily = $weight
+  j = Strstr(new_fullname, "Bold")
+  if (j == -1)
+    j = Strstr(new_fullname, "Oblique")
+  endif
+  if (j == -1)
+    j = Strstr(new_fullname, "Italic")
+  endif
+  if (j > -1)
+    new_subfamily = Strsub(new_fullname, j)
+    new_fullname = Strsub(new_fullname, 0, j) + "Condensed " + new_subfamily
+    newprefsubfamily = newprefsubfamily + " " + new_subfamily
+  else
+    new_fullname = new_fullname + " Condensed"
+  endif
+  new_familyname = $familyname + " Condensed"
+  SetFontNames(new_fontname, new_familyname, new_fullname)
+  SetOS2Value("Width",4)
+  SetTTFName(1033, 2, new_subfamily) # ttf_subfamily
+  SetTTFName(1033, 3, new_fullname) # ttf_uniqueid
+  SetTTFName(1033, 16, old_familyname) # ttf_preffamilyname
+  SetTTFName(1033, 17, newprefsubfamily) # ttf_prefmodifiers
+  Save($argv[i] + ".narrow")
+  i++
+endloop
diff -uNr dejavu-fonts-2.30/src/DejaVuSerifCondensed-Italic.sfd dejavu-fonts.trunk/src/DejaVuSerifCondensed-Italic.sfd
--- dejavu-fonts-2.30/src/DejaVuSerifCondensed-Italic.sfd	2009-08-27 16:26:37.000000000 +0200
+++ dejavu-fonts.trunk/src/DejaVuSerifCondensed-Italic.sfd	2009-09-07 12:17:08.000000000 +0200
@@ -1,6 +1,6 @@
 SplineFontDB: 3.0
 FontName: DejaVuSerifCondensed-Italic
-FullName: DejaVu Serif Italic Condensed
+FullName: DejaVu Serif Condensed Italic
 FamilyName: DejaVu Serif Condensed
 Weight: Book
 Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.\nDejaVu changes are in public domain\n
@@ -1899,7 +1899,7 @@
   3
   1
 EndShort
-LangName: 1033 "" "" "Book" "DejaVu Serif Italic Condensed" "" "Version 2.30" "" "" "DejaVu fonts team" "" "" "http://dejavu.sourceforge.net" "" "Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.+AAoACgAA-Bitstream Vera Fonts Copyright+AAoA-------------------------------+AAoACgAA-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.+AAoACgAA-Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (+ACIA-Fonts+ACIA) and associated documentation files (the +ACIA-Font Software+ACIA), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:+AAoACgAA-The above copyright and trademark notices and this permission notice shall be 
 included in all copies of one or more of the Font Software typefaces.+AAoACgAA-The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or  or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words +ACIA-Bitstream+ACIA or the word +ACIA-Vera+ACIA.+AAoACgAA-This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the +ACIA-Bitstream Vera+ACIA names.+AAoACgAA-The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.+AAoACgAA-THE FONT SOFTWARE IS PROVIDED +ACIA-AS IS+ACIA, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
  TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.+AAoACgAA-Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. +AAoA" "http://dejavu.sourceforge.net/wiki/index.php/License" "" "DejaVu Serif" "Condensed" 
+LangName: 1033 "" "" "Italic" "DejaVu Serif Condensed Italic" "" "Version 2.30" "" "" "DejaVu fonts team" "" "" "http://dejavu.sourceforge.net" "" "Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.+AAoACgAA-Bitstream Vera Fonts Copyright+AAoA-------------------------------+AAoACgAA-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.+AAoACgAA-Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (+ACIA-Fonts+ACIA) and associated documentation files (the +ACIA-Font Software+ACIA), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:+AAoACgAA-The above copyright and trademark notices and this permission notice shall b
 e included in all copies of one or more of the Font Software typefaces.+AAoACgAA-The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or  or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words +ACIA-Bitstream+ACIA or the word +ACIA-Vera+ACIA.+AAoACgAA-This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the +ACIA-Bitstream Vera+ACIA names.+AAoACgAA-The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.+AAoACgAA-THE FONT SOFTWARE IS PROVIDED +ACIA-AS IS+ACIA, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATEN
 T, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.+AAoACgAA-Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. +AAoA" "http://dejavu.sourceforge.net/wiki/index.php/License" "" "DejaVu Serif" "Condensed Italic" 
 Encoding: UnicodeFull
 UnicodeInterp: none
 NameList: AGL without afii
diff -uNr dejavu-fonts-2.30/status.txt dejavu-fonts.trunk/status.txt
--- dejavu-fonts-2.30/status.txt	2009-08-27 16:55:00.000000000 +0200
+++ dejavu-fonts.trunk/status.txt	2009-08-27 16:43:39.000000000 +0200
@@ -1,5 +1,5 @@
 This is the status file for DejaVu fonts
-($Id: status.txt 2362 2009-08-27 14:43:39Z ben_laenen $)
+($Id$)
 
 original = present in original Bitstream Vera 1.10
 <version> = added in DejaVu fonts <version>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- dejavu-fonts.spec	6 Sep 2009 18:01:07 -0000	1.103
+++ dejavu-fonts.spec	7 Sep 2009 19:30:07 -0000	1.104
@@ -20,13 +20,14 @@ original style, using an open collaborat
 
 Name:    %{fontname}-fonts
 Version: 2.30
-Release: 1%{?alphatag}%{?dist}
+Release: 2%{?alphatag}%{?dist}
 Summary: DejaVu fonts
 
 Group:     User Interface/X
 License:   Bitstream Vera and Public Domain
 URL:       http://%{name}.org/
 Source0:   %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
+Patch0:    %{name}-2.30-bad-serif-condensed-metadata.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Older fontforge versions will not work due to sfd format changes
@@ -163,7 +164,7 @@ unicode coverage restricted to Latin, Gr
 
 %prep
 %setup -q -n %{archivename}
-
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} VERSION=%{version} FC-LANG="" \
@@ -205,6 +206,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep  7 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.30-2
+? patch to fix bug #505129 Serif Condensed Italic is not Serif Condensed
+
 * Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.30-1
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	6 Sep 2009 18:01:07 -0000	1.17
+++ import.log	7 Sep 2009 19:30:07 -0000	1.18
@@ -15,3 +15,4 @@ dejavu-fonts-2_29-1_fc11:HEAD:dejavu-fon
 dejavu-fonts-2_29-2_fc11:HEAD:dejavu-fonts-2.29-2.fc11.src.rpm:1237143073
 dejavu-fonts-2_29-3_fc11:HEAD:dejavu-fonts-2.29-3.fc11.src.rpm:1243084445
 dejavu-fonts-2_30-1_fc12:HEAD:dejavu-fonts-2.30-1.fc12.src.rpm:1252259820
+dejavu-fonts-2_30-2_fc12:HEAD:dejavu-fonts-2.30-2.fc12.src.rpm:1252351124



From s4504kr at fedoraproject.org  Mon Sep  7 19:33:12 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  7 Sep 2009 19:33:12 +0000 (UTC)
Subject: rpms/inadyn/devel dead.package,NONE,1.1
Message-ID: <20090907193312.2EC9311C043A@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/inadyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24979

Added Files:
	dead.package 
Log Message:
Retired inadyn


--- NEW FILE dead.package ---
Inadyn-mt is the successor of inadyn, so this package is obsolete.



From s4504kr at fedoraproject.org  Mon Sep  7 19:34:27 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  7 Sep 2009 19:34:27 +0000 (UTC)
Subject: rpms/inadyn/devel Makefile, 1.1, NONE inadyn.conf, 1.1,
	NONE inadyn.init, 1.6, NONE inadyn.spec, 1.22, NONE sources, 1.5, NONE
Message-ID: <20090907193427.593A611C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/inadyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25311

Removed Files:
	Makefile inadyn.conf inadyn.init inadyn.spec sources 
Log Message:
Retired inadyn


--- Makefile DELETED ---


--- inadyn.conf DELETED ---


--- inadyn.init DELETED ---


--- inadyn.spec DELETED ---


--- sources DELETED ---



From s4504kr at fedoraproject.org  Mon Sep  7 19:35:39 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  7 Sep 2009 19:35:39 +0000 (UTC)
Subject: rpms/inadyn/F-10 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE inadyn.conf, 1.1, NONE inadyn.init, 1.6,
	NONE inadyn.spec, 1.20, NONE sources, 1.5, NONE
Message-ID: <20090907193539.65DD111C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/inadyn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25620

Added Files:
	dead.package 
Removed Files:
	Makefile branch inadyn.conf inadyn.init inadyn.spec sources 
Log Message:
Retired inadyn


--- NEW FILE dead.package ---
Inadyn-mt is the successor of inadyn, so this package is obsolete.

--- Makefile DELETED ---


--- branch DELETED ---


--- inadyn.conf DELETED ---


--- inadyn.init DELETED ---


--- inadyn.spec DELETED ---


--- sources DELETED ---



From nim at fedoraproject.org  Mon Sep  7 19:36:14 2009
From: nim at fedoraproject.org (nim)
Date: Mon,  7 Sep 2009 19:36:14 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel
	google-droid-fonts-sans-fontconfig.conf, 
	1.2, 1.3 google-droid-fonts.spec, 1.10, 1.11 import.log, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090907193614.B3A9711C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25795/devel

Modified Files:
	google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts.spec import.log sources 
Log Message:
First level fix for Droid CJK problems


Index: google-droid-fonts-sans-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- google-droid-fonts-sans-fontconfig.conf	25 Jul 2009 10:54:37 -0000	1.2
+++ google-droid-fonts-sans-fontconfig.conf	7 Sep 2009 19:36:14 -0000	1.3
@@ -13,27 +13,46 @@
       <family>sans-serif</family>
     </default>
   </alias>
-  <!-- CJK users should check this actually works for them -->
+  <alias>
+    <family>Droid Sans Japanese</family>
+    <default>
+      <family>Droid Sans</family>
+    </default>
+  </alias>
+  <alias>
+    <family>Droid Sans Fallback</family>
+    <default>
+      <family>Droid Sans</family>
+    </default>
+  </alias>
   <match target="scan">
-    <test name="lang">
-      <string>ja-jp</string>
+    <test name="family">
+      <string>Droid Sans</string>
     </test>
+    <edit name="fontversion">
+      <int>3</int>
+    </edit>
+  </match>
+  <match target="scan">
     <test name="family">
       <string>Droid Sans Japanese</string>
     </test>
     <edit name="family">
       <string>Droid Sans</string>
     </edit>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
   </match>
   <match target="scan">
-    <test name="lang" compare="not_eq">
-      <string>ja-jp</string>
-    </test>
     <test name="family">
       <string>Droid Sans Fallback</string>
     </test>
     <edit name="family">
       <string>Droid Sans</string>
     </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
   </match>
 </fontconfig>


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- google-droid-fonts.spec	6 Sep 2009 19:15:37 -0000	1.10
+++ google-droid-fonts.spec	7 Sep 2009 19:36:14 -0000	1.11
@@ -12,7 +12,7 @@ other screen text.
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use the date we did a git dump
 Version: 20090906
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -138,6 +138,11 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sun Sep  7 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-2
+? first-level CJK fixes (as suggested by Behdad in bug #517789, complete fix
+   needs the rpm changes traced in bug #521697)
+
 * Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090906-1
 ? upstream stealth update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	6 Sep 2009 19:15:37 -0000	1.7
+++ import.log	7 Sep 2009 19:36:14 -0000	1.8
@@ -5,3 +5,4 @@ google-droid-fonts-1_0_112-5_fc11:HEAD:g
 google-droid-fonts-20090320-1_fc12:HEAD:google-droid-fonts-20090320-1.fc12.src.rpm:1248519226
 google-droid-fonts-20090320-3_fc12:HEAD:google-droid-fonts-20090320-3.fc12.src.rpm:1248532826
 google-droid-fonts-20090906-1_fc12:HEAD:google-droid-fonts-20090906-1.fc12.src.rpm:1252264176
+google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.rpm:1252351928


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Sep 2009 19:15:37 -0000	1.5
+++ sources	7 Sep 2009 19:36:14 -0000	1.6
@@ -5,5 +5,5 @@
 a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
 a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
 bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf
-9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
-6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf
+6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
+8fbc87c7c5089a8e86c670b93a78964f  DroidSansJapanese.ttf



From s4504kr at fedoraproject.org  Mon Sep  7 19:36:46 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  7 Sep 2009 19:36:46 +0000 (UTC)
Subject: rpms/inadyn/F-11 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE inadyn.conf, 1.1, NONE inadyn.init, 1.6,
	NONE inadyn.spec, 1.21, NONE sources, 1.5, NONE
Message-ID: <20090907193646.C9F1711C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/inadyn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26066

Added Files:
	dead.package 
Removed Files:
	Makefile branch inadyn.conf inadyn.init inadyn.spec sources 
Log Message:
Retired inadyn


--- NEW FILE dead.package ---
Inadyn-mt is the successor of inadyn, so this package is obsolete.

--- Makefile DELETED ---


--- branch DELETED ---


--- inadyn.conf DELETED ---


--- inadyn.init DELETED ---


--- inadyn.spec DELETED ---


--- sources DELETED ---



From s4504kr at fedoraproject.org  Mon Sep  7 19:42:11 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  7 Sep 2009 19:42:11 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.269, 1.270 comps-f11.xml.in, 1.292,
	1.293 comps-f12.xml.in, 1.108, 1.109 comps-f13.xml.in, 1.3, 1.4
Message-ID: <20090907194211.5E91711C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27967

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Renaming inadyn into inadyn-mt


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- comps-f10.xml.in	5 Sep 2009 22:17:31 -0000	1.269
+++ comps-f10.xml.in	7 Sep 2009 19:42:10 -0000	1.270
@@ -4483,7 +4483,7 @@
       <packagereq type="optional">hfsplus-tools</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
-      <packagereq type="optional">inadyn</packagereq>
+      <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- comps-f11.xml.in	5 Sep 2009 22:17:31 -0000	1.292
+++ comps-f11.xml.in	7 Sep 2009 19:42:10 -0000	1.293
@@ -5174,7 +5174,7 @@
       <packagereq type="optional">hfsplus-tools</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
-      <packagereq type="optional">inadyn</packagereq>
+      <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- comps-f12.xml.in	7 Sep 2009 00:54:58 -0000	1.108
+++ comps-f12.xml.in	7 Sep 2009 19:42:11 -0000	1.109
@@ -5355,7 +5355,7 @@
       <packagereq type="optional">hfsplus-tools</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
-      <packagereq type="optional">inadyn</packagereq>
+      <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- comps-f13.xml.in	3 Sep 2009 15:55:27 -0000	1.3
+++ comps-f13.xml.in	7 Sep 2009 19:42:11 -0000	1.4
@@ -5353,7 +5353,7 @@
       <packagereq type="optional">hfsplus-tools</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
-      <packagereq type="optional">inadyn</packagereq>
+      <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>



From pbrobinson at fedoraproject.org  Mon Sep  7 20:41:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Sep 2009 20:41:01 +0000 (UTC)
Subject: rpms/nbtk/devel .cvsignore, 1.4, 1.5 nbtk.spec, 1.20, 1.21 sources, 
	1.4, 1.5 nbtk-clutter1-pkcfg.patch, 1.1,
	NONE nbtk-clutter1.patch, 1.1, NONE
Message-ID: <20090907204101.9E36F11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16783

Modified Files:
	.cvsignore nbtk.spec sources 
Removed Files:
	nbtk-clutter1-pkcfg.patch nbtk-clutter1.patch 
Log Message:
- A 1.0.0 pre release snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Jul 2009 22:52:37 -0000	1.4
+++ .cvsignore	7 Sep 2009 20:41:00 -0000	1.5
@@ -1 +1 @@
-nbtk-0.16.3.tar.bz2
+nbtk-1.0.0.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nbtk.spec	13 Aug 2009 13:34:02 -0000	1.20
+++ nbtk.spec	7 Sep 2009 20:41:01 -0000	1.21
@@ -1,20 +1,20 @@
 Name:           nbtk
-Version:        0.16.3
-Release:        11%{?dist}
+Version:        1.0.0
+Release:        0.1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:		nbtk-clutter1.patch
-Patch1:		nbtk-clutter1-pkcfg.patch
+# Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+# git archive --format=tar --prefix=nbtk-1.0.0/ ff163ba | bzip2 > nbtk-1.0.0.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
 BuildRequires: gtk2-devel
-BuildRequires: ccss-devel
+BuildRequires: libccss-devel
 BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
@@ -40,8 +40,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .clutter1
-%patch1 -p1 -b .clutter1-pkcfg
 
 # Don't run configure from autogen.sh
 sed -i '/configure/d' autogen.sh
@@ -50,15 +48,17 @@ sed -i '/configure/d' autogen.sh
 %build
 autoreconf
 %configure --enable-gtk-doc --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
+%find_lang %{name}-1.0
+
 %clean
 rm -rf %{buildroot}
 
@@ -66,7 +66,7 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}-1.0.lang
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_bindir}/nbtk-create-image-cache
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1
+- A 1.0.0 pre release snapshot
+
 * Thu Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-11
 - Rebuild against new ccss, update BuildReq to new ccss name
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Jul 2009 22:52:37 -0000	1.4
+++ sources	7 Sep 2009 20:41:01 -0000	1.5
@@ -1 +1 @@
-8d9c48381f99f80b488fab5dcdc30b9a  nbtk-0.16.3.tar.bz2
+2eb59819848e1b3a6deb0818f8e322af  nbtk-1.0.0.tar.bz2


--- nbtk-clutter1-pkcfg.patch DELETED ---


--- nbtk-clutter1.patch DELETED ---



From xulchris at fedoraproject.org  Mon Sep  7 20:41:04 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 20:41:04 +0000 (UTC)
Subject: rpms/php-pear-File-SMBPasswd/EL-5 .cvsignore, 1.2,
	1.3 php-pear-File-SMBPasswd.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090907204104.993EE11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-SMBPasswd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16661/EL-5

Modified Files:
	.cvsignore php-pear-File-SMBPasswd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 13:05:48 -0000	1.2
+++ .cvsignore	7 Sep 2009 20:41:04 -0000	1.3
@@ -1 +1 @@
-File_SMBPasswd-1.0.2.tgz
+File_SMBPasswd-1.0.3.tgz


Index: php-pear-File-SMBPasswd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/EL-5/php-pear-File-SMBPasswd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-pear-File-SMBPasswd.spec	15 May 2007 13:05:48 -0000	1.1
+++ php-pear-File-SMBPasswd.spec	7 Sep 2009 20:41:04 -0000	1.2
@@ -2,7 +2,7 @@
 %define pear_name File_SMBPasswd
 
 Name:           php-pear-File-SMBPasswd
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Class for managing SAMBA style password files
 
@@ -76,5 +76,17 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jun 14 2008 Christopher Stone <chris.stone at gmail.com> 1.0.2-2
+- Rebuild for vendor tag (bz #451362)
+
 * Tue Mar 13 2007 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
 - Initial Fedora release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 13:05:48 -0000	1.2
+++ sources	7 Sep 2009 20:41:04 -0000	1.3
@@ -1 +1 @@
-dcb06b21db84f1bf64cf94eb364d8fb9  File_SMBPasswd-1.0.2.tgz
+b6a4239e011073e3344df2decee4eef4  File_SMBPasswd-1.0.3.tgz



From xulchris at fedoraproject.org  Mon Sep  7 20:41:04 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 20:41:04 +0000 (UTC)
Subject: rpms/php-pear-File-SMBPasswd/F-10 .cvsignore, 1.2,
	1.3 php-pear-File-SMBPasswd.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090907204104.DF62911C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16661/F-10

Modified Files:
	.cvsignore php-pear-File-SMBPasswd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 13:02:34 -0000	1.2
+++ .cvsignore	7 Sep 2009 20:41:04 -0000	1.3
@@ -1 +1 @@
-File_SMBPasswd-1.0.2.tgz
+File_SMBPasswd-1.0.3.tgz


Index: php-pear-File-SMBPasswd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-10/php-pear-File-SMBPasswd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-File-SMBPasswd.spec	14 Jun 2008 15:54:53 -0000	1.2
+++ php-pear-File-SMBPasswd.spec	7 Sep 2009 20:41:04 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name File_SMBPasswd
 
 Name:           php-pear-File-SMBPasswd
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Class for managing SAMBA style password files
 
 Group:          Development/Languages
@@ -76,6 +76,15 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jun 14 2008 Christopher Stone <chris.stone at gmail.com> 1.0.2-2
 - Rebuild for vendor tag (bz #451362)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 13:02:34 -0000	1.2
+++ sources	7 Sep 2009 20:41:04 -0000	1.3
@@ -1 +1 @@
-dcb06b21db84f1bf64cf94eb364d8fb9  File_SMBPasswd-1.0.2.tgz
+b6a4239e011073e3344df2decee4eef4  File_SMBPasswd-1.0.3.tgz



From xulchris at fedoraproject.org  Mon Sep  7 20:41:05 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 20:41:05 +0000 (UTC)
Subject: rpms/php-pear-File-SMBPasswd/F-11 .cvsignore, 1.2,
	1.3 php-pear-File-SMBPasswd.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090907204105.5969F11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16661/F-11

Modified Files:
	.cvsignore php-pear-File-SMBPasswd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 13:02:34 -0000	1.2
+++ .cvsignore	7 Sep 2009 20:41:04 -0000	1.3
@@ -1 +1 @@
-File_SMBPasswd-1.0.2.tgz
+File_SMBPasswd-1.0.3.tgz


Index: php-pear-File-SMBPasswd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-11/php-pear-File-SMBPasswd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-File-SMBPasswd.spec	26 Feb 2009 21:11:59 -0000	1.3
+++ php-pear-File-SMBPasswd.spec	7 Sep 2009 20:41:04 -0000	1.4
@@ -2,8 +2,8 @@
 %define pear_name File_SMBPasswd
 
 Name:           php-pear-File-SMBPasswd
-Version:        1.0.2
-Release:        3%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Class for managing SAMBA style password files
 
 Group:          Development/Languages
@@ -76,6 +76,12 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 13:02:34 -0000	1.2
+++ sources	7 Sep 2009 20:41:05 -0000	1.3
@@ -1 +1 @@
-dcb06b21db84f1bf64cf94eb364d8fb9  File_SMBPasswd-1.0.2.tgz
+b6a4239e011073e3344df2decee4eef4  File_SMBPasswd-1.0.3.tgz



From xulchris at fedoraproject.org  Mon Sep  7 20:41:05 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 20:41:05 +0000 (UTC)
Subject: rpms/php-pear-File-SMBPasswd/devel .cvsignore, 1.2,
	1.3 php-pear-File-SMBPasswd.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090907204105.B059C11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-File-SMBPasswd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16661/devel

Modified Files:
	.cvsignore php-pear-File-SMBPasswd.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2007 13:02:34 -0000	1.2
+++ .cvsignore	7 Sep 2009 20:41:05 -0000	1.3
@@ -1 +1 @@
-File_SMBPasswd-1.0.2.tgz
+File_SMBPasswd-1.0.3.tgz


Index: php-pear-File-SMBPasswd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/devel/php-pear-File-SMBPasswd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-File-SMBPasswd.spec	26 Jul 2009 18:14:59 -0000	1.4
+++ php-pear-File-SMBPasswd.spec	7 Sep 2009 20:41:05 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name File_SMBPasswd
 
 Name:           php-pear-File-SMBPasswd
-Version:        1.0.2
-Release:        4%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Class for managing SAMBA style password files
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-File-SMBPasswd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2007 13:02:34 -0000	1.2
+++ sources	7 Sep 2009 20:41:05 -0000	1.3
@@ -1 +1 @@
-dcb06b21db84f1bf64cf94eb364d8fb9  File_SMBPasswd-1.0.2.tgz
+b6a4239e011073e3344df2decee4eef4  File_SMBPasswd-1.0.3.tgz



From pbrobinson at fedoraproject.org  Mon Sep  7 20:56:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Sep 2009 20:56:50 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.21,1.22
Message-ID: <20090907205650.E56CF11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22640

Modified Files:
	nbtk.spec 
Log Message:
- Add gettext and intltool for translations


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nbtk.spec	7 Sep 2009 20:41:01 -0000	1.21
+++ nbtk.spec	7 Sep 2009 20:56:50 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.0.0
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -15,6 +15,9 @@ BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
 BuildRequires: gtk2-devel
 BuildRequires: libccss-devel
+BuildRequires: pkgconfig
+BuildRequires: intltool
+BuildRequires: gettext
 BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.2
+- Add gettext and intltool for translations
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1
 - A 1.0.0 pre release snapshot
 



From ruben at fedoraproject.org  Mon Sep  7 21:03:12 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon,  7 Sep 2009 21:03:12 +0000 (UTC)
Subject: rpms/python-foolscap/devel .cvsignore, 1.2, 1.3 python-foolscap.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090907210312.AE21F11C00DB@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25152

Modified Files:
	.cvsignore python-foolscap.spec sources 
Log Message:
* Mon Sep 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-1
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 13:34:58 -0000	1.2
+++ .cvsignore	7 Sep 2009 21:03:12 -0000	1.3
@@ -1 +1 @@
-foolscap-0.3.2.tar.gz
+foolscap-0.4.2.tar.gz


Index: python-foolscap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/python-foolscap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-foolscap.spec	26 Jul 2009 20:24:10 -0000	1.2
+++ python-foolscap.spec	7 Sep 2009 21:03:12 -0000	1.3
@@ -3,8 +3,8 @@
 %define modulename foolscap
 
 Name:           python-%{modulename}
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        Next-generation RPC protocol, intended to replace Perspective Broker
 
 Group:          Development/Languages
@@ -48,8 +48,13 @@ rm -rf %{buildroot}
 %{python_sitelib}/*egg-info
 
 %{_bindir}/flogtool
+%{_bindir}/flappclient
+%{_bindir}/flappserver
 
 %changelog
+* Mon Sep 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-1
+- Upstream released new version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 13:34:58 -0000	1.2
+++ sources	7 Sep 2009 21:03:12 -0000	1.3
@@ -1 +1 @@
-635b9b6967504f3a03b8b05be4ca06a5  foolscap-0.3.2.tar.gz
+90618c9e51b718dc7d4cdf8b71edaee4  foolscap-0.4.2.tar.gz



From salimma at fedoraproject.org  Mon Sep  7 21:05:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 21:05:32 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.25,1.26
Message-ID: <20090907210532.AAE3811C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25785

Modified Files:
	llvm.spec 
Log Message:
* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.2.pre1
- PIC is now enabled by default; explicitly disable on %{ix86}



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- llvm.spec	7 Sep 2009 17:54:33 -0000	1.25
+++ llvm.spec	7 Sep 2009 21:05:32 -0000	1.26
@@ -5,7 +5,7 @@
 
 Name:           llvm
 Version:        2.6
-Release:        0.1.pre1%{?dist}
+Release:        0.2.pre1%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -139,9 +139,6 @@ popd
 
 
 %build
-# Note: --enable-pic can be turned off when 2.6 comes out
-#       and up to 2.5, unsafe on 32-bit archs (in our case,
-#       anything but x86_64)
 # Disabling assertions now, rec. by pure and needed for OpenGTL
 mkdir obj && cd obj
 ../configure \
@@ -150,8 +147,8 @@ mkdir obj && cd obj
   --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
-%ifnarch %{ix86}
-  --enable-pic
+%ifarch %{ix86}
+  --enable-pic=no
 %endif
 
 # FIXME file this
@@ -281,6 +278,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.2.pre1
+- PIC is now enabled by default; explicitly disable on %%{ix86}
+
 * Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.1.pre1
 - First 2.6 prerelease
 - Enable Clang front-end



From xulchris at fedoraproject.org  Mon Sep  7 21:09:02 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:09:02 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/F-10 .cvsignore, 1.5,
	1.6 php-pear-HTTP-Request.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090907210902.4616B11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594/F-10

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Sep 2008 07:41:37 -0000	1.5
+++ .cvsignore	7 Sep 2009 21:09:02 -0000	1.6
@@ -1 +1 @@
-HTTP_Request-1.4.3.tgz
+HTTP_Request-1.4.4.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-10/php-pear-HTTP-Request.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-HTTP-Request.spec	12 Sep 2008 07:41:37 -0000	1.5
+++ php-pear-HTTP-Request.spec	7 Sep 2009 21:09:02 -0000	1.6
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.3
+Version:        1.4.4
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -82,6 +82,15 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.4.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 1.4.3-1
 - Upstream sync
 - Update Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Sep 2008 07:41:37 -0000	1.5
+++ sources	7 Sep 2009 21:09:02 -0000	1.6
@@ -1 +1 @@
-0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz
+e7590ac0b912362b7ce85e247aefa8a6  HTTP_Request-1.4.4.tgz



From xulchris at fedoraproject.org  Mon Sep  7 21:09:02 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:09:02 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/EL-5 .cvsignore, 1.5,
	1.6 php-pear-HTTP-Request.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090907210902.1ACEF11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594/EL-5

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Sep 2008 07:41:36 -0000	1.5
+++ .cvsignore	7 Sep 2009 21:09:01 -0000	1.6
@@ -1 +1 @@
-HTTP_Request-1.4.3.tgz
+HTTP_Request-1.4.4.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5/php-pear-HTTP-Request.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-HTTP-Request.spec	12 Sep 2008 07:41:36 -0000	1.5
+++ php-pear-HTTP-Request.spec	7 Sep 2009 21:09:01 -0000	1.6
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.3
+Version:        1.4.4
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -82,6 +82,15 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.4.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 1.4.3-1
 - Upstream sync
 - Update Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Sep 2008 07:41:36 -0000	1.5
+++ sources	7 Sep 2009 21:09:01 -0000	1.6
@@ -1 +1 @@
-0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz
+e7590ac0b912362b7ce85e247aefa8a6  HTTP_Request-1.4.4.tgz



From xulchris at fedoraproject.org  Mon Sep  7 21:09:02 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:09:02 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/devel .cvsignore, 1.5,
	1.6 php-pear-HTTP-Request.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090907210902.C0A1411C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594/devel

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Sep 2008 07:41:37 -0000	1.5
+++ .cvsignore	7 Sep 2009 21:09:02 -0000	1.6
@@ -1 +1 @@
-HTTP_Request-1.4.3.tgz
+HTTP_Request-1.4.4.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/devel/php-pear-HTTP-Request.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-HTTP-Request.spec	26 Jul 2009 18:17:16 -0000	1.7
+++ php-pear-HTTP-Request.spec	7 Sep 2009 21:09:02 -0000	1.8
@@ -2,8 +2,8 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.3
-Release:        3%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.4.4-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Sep 2008 07:41:37 -0000	1.5
+++ sources	7 Sep 2009 21:09:02 -0000	1.6
@@ -1 +1 @@
-0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz
+e7590ac0b912362b7ce85e247aefa8a6  HTTP_Request-1.4.4.tgz



From xulchris at fedoraproject.org  Mon Sep  7 21:09:02 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:09:02 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/F-11 .cvsignore, 1.5,
	1.6 php-pear-HTTP-Request.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090907210902.7EAC811C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594/F-11

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Sep 2008 07:41:37 -0000	1.5
+++ .cvsignore	7 Sep 2009 21:09:02 -0000	1.6
@@ -1 +1 @@
-HTTP_Request-1.4.3.tgz
+HTTP_Request-1.4.4.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-11/php-pear-HTTP-Request.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-HTTP-Request.spec	26 Feb 2009 21:19:38 -0000	1.6
+++ php-pear-HTTP-Request.spec	7 Sep 2009 21:09:02 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.3
-Release:        2%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
 Group:          Development/Libraries
@@ -82,6 +82,12 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.4.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Sep 2008 07:41:37 -0000	1.5
+++ sources	7 Sep 2009 21:09:02 -0000	1.6
@@ -1 +1 @@
-0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz
+e7590ac0b912362b7ce85e247aefa8a6  HTTP_Request-1.4.4.tgz



From jsteffan at fedoraproject.org  Mon Sep  7 21:17:22 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Mon,  7 Sep 2009 21:17:22 +0000 (UTC)
Subject: rpms/jigdo/F-10 jigdo.desktop,1.1,1.2
Message-ID: <20090907211722.E025E11C00DB@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/jigdo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28895/F-10

Modified Files:
	jigdo.desktop 
Log Message:
Update .desktop Categories. (BZ#520374)



Index: jigdo.desktop
===================================================================
RCS file: /cvs/extras/rpms/jigdo/F-10/jigdo.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jigdo.desktop	22 Mar 2006 04:35:15 -0000	1.1
+++ jigdo.desktop	7 Sep 2009 21:17:22 -0000	1.2
@@ -7,5 +7,5 @@ Icon=jigdo-icon.png
 Terminal=false
 StartupWMClass="jigdo"
 Type=Application
-Categories=GTK;Application;Network;
+Categories=GTK;Network;FileTransfer;
 Encoding=UTF-8



From jsteffan at fedoraproject.org  Mon Sep  7 21:17:23 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Mon,  7 Sep 2009 21:17:23 +0000 (UTC)
Subject: rpms/jigdo/F-11 jigdo.desktop,1.1,1.2
Message-ID: <20090907211723.10C2C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/jigdo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28895/F-11

Modified Files:
	jigdo.desktop 
Log Message:
Update .desktop Categories. (BZ#520374)



Index: jigdo.desktop
===================================================================
RCS file: /cvs/extras/rpms/jigdo/F-11/jigdo.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jigdo.desktop	22 Mar 2006 04:35:15 -0000	1.1
+++ jigdo.desktop	7 Sep 2009 21:17:22 -0000	1.2
@@ -7,5 +7,5 @@ Icon=jigdo-icon.png
 Terminal=false
 StartupWMClass="jigdo"
 Type=Application
-Categories=GTK;Application;Network;
+Categories=GTK;Network;FileTransfer;
 Encoding=UTF-8



From jsteffan at fedoraproject.org  Mon Sep  7 21:17:23 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Mon,  7 Sep 2009 21:17:23 +0000 (UTC)
Subject: rpms/jigdo/devel jigdo.desktop,1.1,1.2
Message-ID: <20090907211723.3E79A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/jigdo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28895/devel

Modified Files:
	jigdo.desktop 
Log Message:
Update .desktop Categories. (BZ#520374)



Index: jigdo.desktop
===================================================================
RCS file: /cvs/extras/rpms/jigdo/devel/jigdo.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jigdo.desktop	22 Mar 2006 04:35:15 -0000	1.1
+++ jigdo.desktop	7 Sep 2009 21:17:23 -0000	1.2
@@ -7,5 +7,5 @@ Icon=jigdo-icon.png
 Terminal=false
 StartupWMClass="jigdo"
 Type=Application
-Categories=GTK;Application;Network;
+Categories=GTK;Network;FileTransfer;
 Encoding=UTF-8



From emaldonado at fedoraproject.org  Mon Sep  7 21:29:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 21:29:08 +0000 (UTC)
Subject: rpms/nss/F-11 PayPalEE.cert, 1.1, NONE PayPalICA.cert, 1.1,
	NONE nss-no-rpath.patch, 1.1, NONE nss-stubs-bug502133.patch,
	1.1, NONE
Message-ID: <20090907212908.0F37211C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31565

Removed Files:
	PayPalEE.cert PayPalICA.cert nss-no-rpath.patch 
	nss-stubs-bug502133.patch 
Log Message:
not needed with nss 3.12.4


--- PayPalEE.cert DELETED ---


--- PayPalICA.cert DELETED ---


--- nss-no-rpath.patch DELETED ---


--- nss-stubs-bug502133.patch DELETED ---



From emaldonado at fedoraproject.org  Mon Sep  7 21:34:58 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 21:34:58 +0000 (UTC)
Subject: rpms/nss/F-11 sources,1.26,1.27 .cvsignore,1.25,1.26
Message-ID: <20090907213458.B4B2811C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2052

Modified Files:
	sources .cvsignore 
Log Message:
update sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	23 Jun 2009 02:22:39 -0000	1.26
+++ sources	7 Sep 2009 21:34:58 -0000	1.27
@@ -1,2 +1,2 @@
-bdac5df4a93c67222a60fabc121921c3  nss-pem-20090622.tar.bz2
-bf79d625096067fed3511c0bc6c64c27  nss-3.12.3.99.3-stripped.tar.bz2
+954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	23 Jun 2009 02:22:39 -0000	1.25
+++ .cvsignore	7 Sep 2009 21:34:58 -0000	1.26
@@ -1,2 +1,2 @@
-nss-pem-20090622.tar.bz2
-nss-3.12.3.99.3-stripped.tar.bz2
+nss-3.12.4-stripped.tar.bz2
+nss-pem-20090907.tar.bz2



From alexlan at fedoraproject.org  Mon Sep  7 21:40:06 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon,  7 Sep 2009 21:40:06 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.85,1.86
Message-ID: <20090907214006.2C03D11C043D@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3071

Modified Files:
	octave-forge.spec 
Log Message:
* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-14
- Re-enable java subpackage, now building
- Rebuild against new atlas, fixes the ieee warnings.



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- octave-forge.spec	7 Sep 2009 02:25:30 -0000	1.85
+++ octave-forge.spec	7 Sep 2009 21:40:05 -0000	1.86
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -96,8 +96,7 @@ Provides: octave-generate_html = 0.0.9
 # temporarily disable: doesn't yet build
 # Provides: octave-graceplot = 1.0.8
 Provides: octave-integration = 1.0.7
-# temporarily disable: doesn't yet build
-# Provides: octave-java = 1.2.6
+Provides: octave-java = 1.2.6
 # octave-jhandles is removed
 Provides: octave-mapping = 1.0.7
 Provides: octave-msh = 0.1.1
@@ -150,9 +149,7 @@ rm main/ftp-*.tar.gz
 rm main/fixed-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
-# 9. exclude java --  doesn't build against Octave 3.2
-rm extra/java-*.tar.gz
-# 10. exclude spanish -- doesn't build against Octave 3.2
+# 9. exclude spanish -- doesn't build against Octave 3.2
 rm language/spanish-*.tar.gz
 
 #Unpack everything
@@ -172,8 +169,8 @@ done
 #apply patches
 %patch0 -p0
 %patch1 -p0
-#disable patch for the moment, not building 'java'
-#patch2 -p0
+%patch2 -p0
+# excluding fixed package
 #patch3 -p0
 %patch4 -p0
 
@@ -249,6 +246,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-14
+- Re-enable java subpackage, now building
+- Rebuild against new atlas, fixes the ieee warnings.
+
 * Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-13
 - Rebuild against new lapack/octave combination to fix ieee problem
 



From emaldonado at fedoraproject.org  Mon Sep  7 21:40:30 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  7 Sep 2009 21:40:30 +0000 (UTC)
Subject: rpms/nss/F-11 nss.spec,1.74,1.75
Message-ID: <20090907214030.4A64211C043D@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3214

Modified Files:
	nss.spec 
Log Message:
Updat to 3.12.4, update to new pem sources, assorted spec file fixes from f12 review


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- nss.spec	16 Aug 2009 05:16:56 -0000	1.74
+++ nss.spec	7 Sep 2009 21:40:30 -0000	1.75
@@ -1,4 +1,4 @@
-%global nspr_version 4.7
+%global nspr_version 4.8
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 # Produce .chk files for the final stripped binaries
@@ -12,8 +12,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.3.99.3
-Release:          2.11.4%{?dist}
+Version:          3.12.4
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -37,14 +37,10 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source8:          nss-prelink.conf
-Source12:         %{name}-pem-20090622.tar.bz2
-Source13:         PayPalEE.cert
-Source14:         PayPalICA.cert
+Source12:         %{name}-pem-20090907.tar.bz2
 
-Patch1:           nss-no-rpath.patch
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           nss-stubs-bug502133.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -111,14 +107,8 @@ low level services.
 %setup -q
 %setup -q -T -D -n %{name}-%{version} -a 12
 
-%patch1 -p0
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .502133
-
-#need newer certs to make test suite work
-#remove once we update to NSS 3.12.4
-cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
 
 
 %build
@@ -134,9 +124,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-#export NSPR_INCLUDE_DIR=`nspr-config --includedir`
-#export NSPR_LIB_DIR=`nspr-config --libdir`
-
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
@@ -228,7 +215,9 @@ killall $RANDSERV || :
 rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
+
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
+
 cd ../../../../
 
 killall $RANDSERV || :
@@ -269,52 +258,49 @@ done
 
 # Install the empty NSS db files
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
-%{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
-%{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
-%{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+%{__install} -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
+%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
+%{__install} -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-%{__install} -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
+%{__install} -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
-  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  %{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Copy the binaries we want
 for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
 done
 
 # Copy the binaries we ship as unsupported
 for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
 
 # Copy the include files we want
 for file in mozilla/dist/public/nss/*.h
 do
-  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
 # Copy the package configuration files
-%{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
@@ -363,7 +349,6 @@ done
 %{unsupported_tools_directory}/vfyserv
 %{unsupported_tools_directory}/vfychain
 
-
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
@@ -483,6 +468,13 @@ done
 
 
 %changelog
+* Mon Sep 07 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Update the nss pem enabling source archive to roll in bug fixes
+- pem module implements memory management for internal objects - 509705
+- pem module doesn't crash when processing malformed key files - 512019
+- preserve timestamps and ensure proper execute bits on installed files
+
 * Mon Jun 22 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-2.11.4
 - Fixed problems uncovered by mass rebuild with new version of rpmbuild
 * Mon Jun 22 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-2.11.3



From alexlan at fedoraproject.org  Mon Sep  7 21:41:16 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon,  7 Sep 2009 21:41:16 +0000 (UTC)
Subject: rpms/octave/devel octave.spec,1.90,1.91
Message-ID: <20090907214116.7935B11C00DB@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3881

Modified Files:
	octave.spec 
Log Message:
* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-4
- Rebuild against new ATLAS



Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- octave.spec	7 Sep 2009 02:23:57 -0000	1.90
+++ octave.spec	7 Sep 2009 21:41:16 -0000	1.91
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        3.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -170,6 +170,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-4
+- Rebuild against new ATLAS
+
 * Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-3
 - Disable make check temporarily to get a build against newly fixed lapack
 



From xulchris at fedoraproject.org  Mon Sep  7 21:43:18 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:43:18 +0000 (UTC)
Subject: rpms/php-pear-Image-Canvas/F-10 .cvsignore, 1.3,
	1.4 php-pear-Image-Canvas.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090907214318.E860811C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Canvas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6191/F-10

Modified Files:
	.cvsignore php-pear-Image-Canvas.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 23:13:40 -0000	1.3
+++ .cvsignore	7 Sep 2009 21:43:18 -0000	1.4
@@ -1 +1 @@
-Image_Canvas-0.3.1.tgz
+Image_Canvas-0.3.2.tgz


Index: php-pear-Image-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/F-10/php-pear-Image-Canvas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Image-Canvas.spec	28 Aug 2008 18:54:10 -0000	1.3
+++ php-pear-Image-Canvas.spec	7 Sep 2009 21:43:18 -0000	1.4
@@ -2,8 +2,8 @@
 %define pear_name Image_Canvas
 
 Name:           php-pear-Image-Canvas
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        Common interface to image drawing
 
 Group:          Development/Libraries
@@ -85,10 +85,21 @@ fi
 %doc %{pear_name}-%{version}/README.Fedora
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Image/Canvas*
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 0.3.2-1
+- Upstream sync
+- Add new %%{datadir}
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.1-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 23:13:40 -0000	1.3
+++ sources	7 Sep 2009 21:43:18 -0000	1.4
@@ -1 +1 @@
-9a1cabea0044f9afa7ac700d5f1f783b  Image_Canvas-0.3.1.tgz
+0ffb421ade2f9c8234861cc73550e503  Image_Canvas-0.3.2.tgz



From xulchris at fedoraproject.org  Mon Sep  7 21:43:18 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:43:18 +0000 (UTC)
Subject: rpms/php-pear-Image-Canvas/EL-5 .cvsignore, 1.3,
	1.4 php-pear-Image-Canvas.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090907214318.AAB0211C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Canvas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6191/EL-5

Modified Files:
	.cvsignore php-pear-Image-Canvas.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 23:13:23 -0000	1.3
+++ .cvsignore	7 Sep 2009 21:43:18 -0000	1.4
@@ -1 +1 @@
-Image_Canvas-0.3.1.tgz
+Image_Canvas-0.3.2.tgz


Index: php-pear-Image-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/EL-5/php-pear-Image-Canvas.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-Image-Canvas.spec	2 Jul 2007 23:13:23 -0000	1.2
+++ php-pear-Image-Canvas.spec	7 Sep 2009 21:43:18 -0000	1.3
@@ -2,12 +2,12 @@
 %define pear_name Image_Canvas
 
 Name:           php-pear-Image-Canvas
-Version:        0.3.1
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        Common interface to image drawing
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://pear.php.net/package/Image_Canvas
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,10 +85,24 @@ fi
 %doc %{pear_name}-%{version}/README.Fedora
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Image/Canvas*
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 0.3.2-1
+- Upstream sync
+- Add new %%{datadir}
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.1-2
+- fix license tag
+
 * Mon Jul 02 2007 Christopher Stone <chris.stone at gmail.com> 0.3.1-1
 - Upstream Sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 23:13:23 -0000	1.3
+++ sources	7 Sep 2009 21:43:18 -0000	1.4
@@ -1 +1 @@
-9a1cabea0044f9afa7ac700d5f1f783b  Image_Canvas-0.3.1.tgz
+0ffb421ade2f9c8234861cc73550e503  Image_Canvas-0.3.2.tgz



From xulchris at fedoraproject.org  Mon Sep  7 21:43:19 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:43:19 +0000 (UTC)
Subject: rpms/php-pear-Image-Canvas/F-11 .cvsignore, 1.3,
	1.4 php-pear-Image-Canvas.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090907214319.3B47311C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Canvas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6191/F-11

Modified Files:
	.cvsignore php-pear-Image-Canvas.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 23:13:40 -0000	1.3
+++ .cvsignore	7 Sep 2009 21:43:18 -0000	1.4
@@ -1 +1 @@
-Image_Canvas-0.3.1.tgz
+Image_Canvas-0.3.2.tgz


Index: php-pear-Image-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/F-11/php-pear-Image-Canvas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Image-Canvas.spec	26 Feb 2009 21:29:42 -0000	1.4
+++ php-pear-Image-Canvas.spec	7 Sep 2009 21:43:19 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name Image_Canvas
 
 Name:           php-pear-Image-Canvas
-Version:        0.3.1
-Release:        3%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        Common interface to image drawing
 
 Group:          Development/Libraries
@@ -85,10 +85,18 @@ fi
 %doc %{pear_name}-%{version}/README.Fedora
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Image/Canvas*
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 0.3.2-1
+- Upstream sync
+- Add new %%{datadir}
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 23:13:40 -0000	1.3
+++ sources	7 Sep 2009 21:43:19 -0000	1.4
@@ -1 +1 @@
-9a1cabea0044f9afa7ac700d5f1f783b  Image_Canvas-0.3.1.tgz
+0ffb421ade2f9c8234861cc73550e503  Image_Canvas-0.3.2.tgz



From xulchris at fedoraproject.org  Mon Sep  7 21:43:19 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 21:43:19 +0000 (UTC)
Subject: rpms/php-pear-Image-Canvas/devel .cvsignore, 1.3,
	1.4 php-pear-Image-Canvas.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090907214319.7C88311C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Canvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6191/devel

Modified Files:
	.cvsignore php-pear-Image-Canvas.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 23:13:40 -0000	1.3
+++ .cvsignore	7 Sep 2009 21:43:19 -0000	1.4
@@ -1 +1 @@
-Image_Canvas-0.3.1.tgz
+Image_Canvas-0.3.2.tgz


Index: php-pear-Image-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/devel/php-pear-Image-Canvas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Image-Canvas.spec	26 Jul 2009 18:17:47 -0000	1.5
+++ php-pear-Image-Canvas.spec	7 Sep 2009 21:43:19 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name Image_Canvas
 
 Name:           php-pear-Image-Canvas
-Version:        0.3.1
-Release:        4%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        Common interface to image drawing
 
 Group:          Development/Libraries
@@ -85,10 +85,15 @@ fi
 %doc %{pear_name}-%{version}/README.Fedora
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Image/Canvas*
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 0.3.2-1
+- Upstream sync
+- Add new %%{datadir}
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 23:13:40 -0000	1.3
+++ sources	7 Sep 2009 21:43:19 -0000	1.4
@@ -1 +1 @@
-9a1cabea0044f9afa7ac700d5f1f783b  Image_Canvas-0.3.1.tgz
+0ffb421ade2f9c8234861cc73550e503  Image_Canvas-0.3.2.tgz



From mclasen at fedoraproject.org  Mon Sep  7 21:55:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 21:55:55 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.66, 1.67 gcalctool.spec, 1.97,
	1.98 sources, 1.67, 1.68
Message-ID: <20090907215555.6E95711C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9986

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	26 Aug 2009 02:25:44 -0000	1.66
+++ .cvsignore	7 Sep 2009 21:55:55 -0000	1.67
@@ -1 +1 @@
-gcalctool-5.27.91.tar.bz2
+gcalctool-5.27.92.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- gcalctool.spec	26 Aug 2009 02:25:44 -0000	1.97
+++ gcalctool.spec	7 Sep 2009 21:55:55 -0000	1.98
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.27.91
+Version:        5.27.92
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.92-1
+- Update to 5.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.91-1
 - Update to 5.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	26 Aug 2009 02:25:44 -0000	1.67
+++ sources	7 Sep 2009 21:55:55 -0000	1.68
@@ -1 +1 @@
-c7d622fc9a61c5d0960337bc9b002ff9  gcalctool-5.27.91.tar.bz2
+80ab59d9415c17676df702f7882f6135  gcalctool-5.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 21:58:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 21:58:49 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.57, 1.58 orca.spec, 1.96, 1.97 sources,
	1.58, 1.59
Message-ID: <20090907215849.77BEF11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10794

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	25 Aug 2009 02:03:05 -0000	1.57
+++ .cvsignore	7 Sep 2009 21:58:49 -0000	1.58
@@ -1 +1 @@
-orca-2.27.91.tar.bz2
+orca-2.27.92.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- orca.spec	25 Aug 2009 02:03:06 -0000	1.96
+++ orca.spec	7 Sep 2009 21:58:49 -0000	1.97
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.27.91
+Version:	2.27.92
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	25 Aug 2009 02:03:06 -0000	1.58
+++ sources	7 Sep 2009 21:58:49 -0000	1.59
@@ -1 +1 @@
-c799b7963cd2809de159a34590159d54  orca-2.27.91.tar.bz2
+5d8438c08c653917e69b9e1c66f54491  orca-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 22:00:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:00:46 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.62, 1.63 gnome-terminal.spec,
	1.127, 1.128 sources, 1.63, 1.64
Message-ID: <20090907220046.38FF811C0419@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11455

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	20 Aug 2009 02:09:03 -0000	1.62
+++ .cvsignore	7 Sep 2009 22:00:45 -0000	1.63
@@ -1 +1 @@
-gnome-terminal-2.27.91.tar.bz2
+gnome-terminal-2.27.92.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- gnome-terminal.spec	20 Aug 2009 02:09:03 -0000	1.127
+++ gnome-terminal.spec	7 Sep 2009 22:00:45 -0000	1.128
@@ -10,7 +10,7 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -136,6 +136,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	20 Aug 2009 02:09:03 -0000	1.63
+++ sources	7 Sep 2009 22:00:46 -0000	1.64
@@ -1 +1 @@
-42b643e0d1940c473af31e752e17a482  gnome-terminal-2.27.91.tar.bz2
+12638697d4070223f3c314b386ca7c3e  gnome-terminal-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 22:06:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:06:43 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.44, 1.45 gok.spec, 1.86, 1.87 sources, 
	1.44, 1.45
Message-ID: <20090907220643.5749B11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13097

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	25 Aug 2009 02:05:50 -0000	1.44
+++ .cvsignore	7 Sep 2009 22:06:42 -0000	1.45
@@ -1 +1 @@
-gok-2.27.91.tar.bz2
+gok-2.27.92.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- gok.spec	25 Aug 2009 02:05:50 -0000	1.86
+++ gok.spec	7 Sep 2009 22:06:43 -0000	1.87
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
@@ -150,6 +150,9 @@ scrollkeeper-update -q
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	25 Aug 2009 02:05:50 -0000	1.44
+++ sources	7 Sep 2009 22:06:43 -0000	1.45
@@ -1 +1 @@
-1dc6b51b5f17573bbcffd43b2b06e1d3  gok-2.27.91.tar.bz2
+15a661791e8c242c23f3b39f3474f2e7  gok-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 22:09:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:09:15 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.61, 1.62 at-spi.spec, 1.119,
	1.120 sources, 1.61, 1.62
Message-ID: <20090907220915.3D19511C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13732

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	25 Aug 2009 01:19:35 -0000	1.61
+++ .cvsignore	7 Sep 2009 22:09:14 -0000	1.62
@@ -1 +1 @@
-at-spi-1.27.91.tar.bz2
+at-spi-1.27.92.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- at-spi.spec	25 Aug 2009 01:27:55 -0000	1.119
+++ at-spi.spec	7 Sep 2009 22:09:15 -0000	1.120
@@ -9,7 +9,7 @@
 
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
-Version: 1.27.91
+Version: 1.27.92
 Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.27/%{name}-%{version}.tar.bz2
@@ -153,8 +153,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 1.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1.27.91-1
-- YUpdate to 2.27.91
+- Update to 2.27.91
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	25 Aug 2009 01:19:35 -0000	1.61
+++ sources	7 Sep 2009 22:09:15 -0000	1.62
@@ -1 +1 @@
-2d872beac64c9311851f1120ce0ae50d  at-spi-1.27.91.tar.bz2
+5431fe32d10190cf755f950934e4f68b  at-spi-1.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 22:11:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:11:42 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.27, 1.28 mousetweaks.spec, 1.34,
	1.35 sources, 1.27, 1.28
Message-ID: <20090907221142.862C511C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14417

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	25 Aug 2009 01:27:49 -0000	1.27
+++ .cvsignore	7 Sep 2009 22:11:42 -0000	1.28
@@ -1 +1 @@
-mousetweaks-2.27.91.tar.bz2
+mousetweaks-2.27.92.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- mousetweaks.spec	25 Aug 2009 01:27:49 -0000	1.34
+++ mousetweaks.spec	7 Sep 2009 22:11:42 -0000	1.35
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.27.91
+Version:	2.27.92
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -108,6 +108,9 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	25 Aug 2009 01:27:49 -0000	1.27
+++ sources	7 Sep 2009 22:11:42 -0000	1.28
@@ -1 +1 @@
-1bfd44b288c960eb3ae10c146c8e474f  mousetweaks-2.27.91.tar.bz2
+cfdbf3d6de0fd423ccdf0bb16493c64e  mousetweaks-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 22:27:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:27:51 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.24, 1.25 devhelp.spec, 1.113,
	1.114 sources, 1.24, 1.25
Message-ID: <20090907222751.B590111C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16316

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	13 Aug 2009 01:23:36 -0000	1.24
+++ .cvsignore	7 Sep 2009 22:27:50 -0000	1.25
@@ -1 +1 @@
-devhelp-0.23.1.tar.bz2
+devhelp-2.27.92.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- devhelp.spec	21 Aug 2009 18:37:01 -0000	1.113
+++ devhelp.spec	7 Sep 2009 22:27:50 -0000	1.114
@@ -5,13 +5,13 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.23.1
-Release: 2%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
 URL: http://developer.imendio.com/projects/devhelp
-Source: http://download.gnome.org/sources/devhelp/0.23/devhelp-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/devhelp/2.27/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Dependencies ###
@@ -136,6 +136,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Fri Aug 21 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23.1-2
 - Remove patch for GNOME bug #572022 to help fix RH bug #518481.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	13 Aug 2009 01:23:36 -0000	1.24
+++ sources	7 Sep 2009 22:27:50 -0000	1.25
@@ -1 +1 @@
-9bb80a1e82eb0de57cdd7f4234880b2f  devhelp-0.23.1.tar.bz2
+b796dacbff2c9cd2b7f5f44113a34a0b  devhelp-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  7 22:29:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:29:30 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.120,1.121
Message-ID: <20090907222930.955E411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19103

Modified Files:
	at-spi.spec 
Log Message:
Fix BRs



Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- at-spi.spec	7 Sep 2009 22:09:15 -0000	1.120
+++ at-spi.spec	7 Sep 2009 22:29:30 -0000	1.121
@@ -33,6 +33,7 @@ BuildRequires: libbonobo-devel >= %{libb
 BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: atk-devel >= %{atk_version}
+BuildRequires: dbus-glib-devel
 BuildRequires: GConf2-devel
 BuildRequires: fontconfig
 BuildRequires: gettext



From mclasen at fedoraproject.org  Mon Sep  7 22:33:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:33:37 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.32,
	1.33 gnome-settings-daemon.spec, 1.119, 1.120 sources, 1.33, 1.34
Message-ID: <20090907223337.804B411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20151

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	25 Aug 2009 01:55:38 -0000	1.32
+++ .cvsignore	7 Sep 2009 22:33:37 -0000	1.33
@@ -1 +1 @@
-gnome-settings-daemon-2.27.91.tar.bz2
+gnome-settings-daemon-2.27.92.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- gnome-settings-daemon.spec	30 Aug 2009 06:43:29 -0000	1.119
+++ gnome-settings-daemon.spec	7 Sep 2009 22:33:37 -0000	1.120
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.27.91
-Release:	3%{?dist}
+Version:	2.27.92
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -34,12 +34,6 @@ BuildRequires:  fontconfig-devel
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=524499
-Patch13:	locate-pointer-process.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593112
-Patch14:	buttonmapping.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593115
-Patch15:        locate-pointer-csw.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -60,9 +54,6 @@ developing applications that use %{name}
 %setup -q
 
 %patch12 -p1 -b .lefthand-touchpad
-%patch13 -p1 -b .locate-pointer
-%patch14 -p1 -b .buttonmap
-%patch15 -p1 -b .locate-pointer-csw
 
 autoreconf -i -f
 
@@ -176,6 +167,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Sun Aug 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-3
 - Make 'Locate Pointer' work with metacity again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	25 Aug 2009 01:55:38 -0000	1.33
+++ sources	7 Sep 2009 22:33:37 -0000	1.34
@@ -1 +1 @@
-cb5ce91b824bb46031531195f9dbe4c4  gnome-settings-daemon-2.27.91.tar.bz2
+6f35379b8bddc729dd4144b54b3557bc  gnome-settings-daemon-2.27.92.tar.bz2



From xulchris at fedoraproject.org  Mon Sep  7 22:34:15 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 22:34:15 +0000 (UTC)
Subject: rpms/php-pear-Image-Canvas/devel php-pear-Image-Canvas.spec, 1.6,
	1.7
Message-ID: <20090907223415.58BB611C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Canvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20577

Modified Files:
	php-pear-Image-Canvas.spec 
Log Message:
update BR


Index: php-pear-Image-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Canvas/devel/php-pear-Image-Canvas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-Image-Canvas.spec	7 Sep 2009 21:43:19 -0000	1.6
+++ php-pear-Image-Canvas.spec	7 Sep 2009 22:34:15 -0000	1.7
@@ -13,7 +13,7 @@ Source0:        http://pear.php.net/get/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.8.1
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Image_Color) >= 1.0.0
 #Requires(hint): php-pecl-pdflib
@@ -93,6 +93,7 @@ fi
 * Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 0.3.2-1
 - Upstream sync
 - Add new %%{datadir}
+- Update build requires
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From silas at fedoraproject.org  Mon Sep  7 22:37:16 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Mon,  7 Sep 2009 22:37:16 +0000 (UTC)
Subject: rpms/tokyotyrant/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 tokyotyrant.spec, 1.1,
	1.2 tokyotyrant.sysconfig, 1.1, 1.2
Message-ID: <20090907223716.3AE3811C00DB@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21522/devel

Modified Files:
	.cvsignore import.log sources tokyotyrant.spec 
	tokyotyrant.sysconfig 
Log Message:
* Mon Sep 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.34-1
- Update to 1.1.34



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Aug 2009 04:54:40 -0000	1.2
+++ .cvsignore	7 Sep 2009 22:37:15 -0000	1.3
@@ -1 +1 @@
-tokyotyrant-1.1.33.tar.gz
+tokyotyrant-1.1.34.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Aug 2009 04:54:40 -0000	1.1
+++ import.log	7 Sep 2009 22:37:15 -0000	1.2
@@ -1 +1,2 @@
 tokyotyrant-1_1_33-5_fc12:HEAD:tokyotyrant-1.1.33-5.fc12.src.rpm:1251175673
+tokyotyrant-1_1_34-1_fc12:HEAD:tokyotyrant-1.1.34-1.fc12.src.rpm:1252362410


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Aug 2009 04:54:40 -0000	1.2
+++ sources	7 Sep 2009 22:37:15 -0000	1.3
@@ -1 +1 @@
-880d6af48458bc04b993bdae6ecc543d  tokyotyrant-1.1.33.tar.gz
+7b2e956419d5faf29eee55d59896e9d6  tokyotyrant-1.1.34.tar.gz


Index: tokyotyrant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/tokyotyrant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tokyotyrant.spec	25 Aug 2009 04:54:40 -0000	1.1
+++ tokyotyrant.spec	7 Sep 2009 22:37:15 -0000	1.2
@@ -1,12 +1,12 @@
 Name:             tokyotyrant
-Version:          1.1.33
-Release:          5%{?dist}
+Version:          1.1.34
+Release:          1%{?dist}
 Summary:          A network interface to Tokyo Cabinet
 
 Group:            Applications/Databases
 License:          LGPLv2+
-URL:              http://tokyocabinet.sourceforge.net
-Source0:          http://tokyocabinet.sourceforge.net/tyrantpkg/%{name}-%{version}.tar.gz
+URL:              http://1978th.net/tokyotyrant/
+Source0:          http://1978th.net/tokyotyrant/%{name}-%{version}.tar.gz
 Source1:          tokyotyrant.logrotate
 Source2:          tokyotyrant.init
 Source3:          tokyotyrant.sysconfig
@@ -134,6 +134,9 @@ fi
 %{_mandir}/man3/t*.gz
 
 %changelog
+* Mon Sep 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.34-1
+- Update to 1.1.34
+
 * Fri Aug 21 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-5
 - Fix url
 


Index: tokyotyrant.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/tokyotyrant.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tokyotyrant.sysconfig	25 Aug 2009 04:54:40 -0000	1.1
+++ tokyotyrant.sysconfig	7 Sep 2009 22:37:16 -0000	1.2
@@ -4,3 +4,10 @@ PORT="1978"
 THREADS="8"
 TIMEOUT="0"
 OPTIONS=""
+
+# Hash database (default)
+DATABASE="$basedir/casket.tch#bnum=1000000"
+# B+ tree database
+#DATABASE="$basedir/casket.tcb#bnum=1000000"
+# Table database
+#DATABASE="$basedir/casket.tct#bnum=1000000"



From xulchris at fedoraproject.org  Mon Sep  7 22:39:54 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 22:39:54 +0000 (UTC)
Subject: rpms/php-pear-Image-Color/devel .cvsignore, 1.2,
	1.3 php-pear-Image-Color.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20090907223954.EB2EE11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Color/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22355/devel

Modified Files:
	.cvsignore php-pear-Image-Color.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Dec 2006 19:39:57 -0000	1.2
+++ .cvsignore	7 Sep 2009 22:39:54 -0000	1.3
@@ -1 +1 @@
-Image_Color-1.0.2.tgz
+Image_Color-1.0.3.tgz


Index: php-pear-Image-Color.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/devel/php-pear-Image-Color.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-Image-Color.spec	26 Jul 2009 18:18:08 -0000	1.7
+++ php-pear-Image-Color.spec	7 Sep 2009 22:39:54 -0000	1.8
@@ -2,8 +2,8 @@
 %define pear_name Image_Color
 
 Name:           php-pear-Image-Color
-Version:        1.0.2
-Release:        7%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Manage and handles color data and conversions
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Dec 2006 19:39:57 -0000	1.2
+++ sources	7 Sep 2009 22:39:54 -0000	1.3
@@ -1 +1 @@
-a4a1a6f5c0f72d235930902cc1ee2e94  Image_Color-1.0.2.tgz
+78412abd1d54be0de3c5d9efe53af5a2  Image_Color-1.0.3.tgz



From xulchris at fedoraproject.org  Mon Sep  7 22:39:54 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 22:39:54 +0000 (UTC)
Subject: rpms/php-pear-Image-Color/F-11 .cvsignore, 1.2,
	1.3 php-pear-Image-Color.spec, 1.6, 1.7 sources, 1.2, 1.3
Message-ID: <20090907223954.B411111C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Color/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22355/F-11

Modified Files:
	.cvsignore php-pear-Image-Color.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Dec 2006 19:39:57 -0000	1.2
+++ .cvsignore	7 Sep 2009 22:39:54 -0000	1.3
@@ -1 +1 @@
-Image_Color-1.0.2.tgz
+Image_Color-1.0.3.tgz


Index: php-pear-Image-Color.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/F-11/php-pear-Image-Color.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-Image-Color.spec	26 Feb 2009 21:30:55 -0000	1.6
+++ php-pear-Image-Color.spec	7 Sep 2009 22:39:54 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name Image_Color
 
 Name:           php-pear-Image-Color
-Version:        1.0.2
-Release:        6%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Manage and handles color data and conversions
 
 Group:          Development/Libraries
@@ -74,6 +74,12 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Dec 2006 19:39:57 -0000	1.2
+++ sources	7 Sep 2009 22:39:54 -0000	1.3
@@ -1 +1 @@
-a4a1a6f5c0f72d235930902cc1ee2e94  Image_Color-1.0.2.tgz
+78412abd1d54be0de3c5d9efe53af5a2  Image_Color-1.0.3.tgz



From xulchris at fedoraproject.org  Mon Sep  7 22:39:54 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 22:39:54 +0000 (UTC)
Subject: rpms/php-pear-Image-Color/EL-5 .cvsignore, 1.2,
	1.3 php-pear-Image-Color.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090907223954.4B74211C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Color/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22355/EL-5

Modified Files:
	.cvsignore php-pear-Image-Color.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Dec 2006 19:39:57 -0000	1.2
+++ .cvsignore	7 Sep 2009 22:39:53 -0000	1.3
@@ -1 +1 @@
-Image_Color-1.0.2.tgz
+Image_Color-1.0.3.tgz


Index: php-pear-Image-Color.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/EL-5/php-pear-Image-Color.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Image-Color.spec	23 Oct 2008 20:48:34 -0000	1.4
+++ php-pear-Image-Color.spec	7 Sep 2009 22:39:53 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name Image_Color
 
 Name:           php-pear-Image-Color
-Version:        1.0.2
-Release:        5%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Manage and handles color data and conversions
 
 Group:          Development/Libraries
@@ -74,6 +74,15 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 1.0.2-5
 - Update LICENSE to 3.01
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Dec 2006 19:39:57 -0000	1.2
+++ sources	7 Sep 2009 22:39:53 -0000	1.3
@@ -1 +1 @@
-a4a1a6f5c0f72d235930902cc1ee2e94  Image_Color-1.0.2.tgz
+78412abd1d54be0de3c5d9efe53af5a2  Image_Color-1.0.3.tgz



From xulchris at fedoraproject.org  Mon Sep  7 22:39:54 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 22:39:54 +0000 (UTC)
Subject: rpms/php-pear-Image-Color/F-10 .cvsignore, 1.2,
	1.3 php-pear-Image-Color.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090907223954.7F4BC11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-Color/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22355/F-10

Modified Files:
	.cvsignore php-pear-Image-Color.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Dec 2006 19:39:57 -0000	1.2
+++ .cvsignore	7 Sep 2009 22:39:54 -0000	1.3
@@ -1 +1 @@
-Image_Color-1.0.2.tgz
+Image_Color-1.0.3.tgz


Index: php-pear-Image-Color.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/F-10/php-pear-Image-Color.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Image-Color.spec	23 Oct 2008 20:48:35 -0000	1.5
+++ php-pear-Image-Color.spec	7 Sep 2009 22:39:54 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name Image_Color
 
 Name:           php-pear-Image-Color
-Version:        1.0.2
-Release:        5%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Manage and handles color data and conversions
 
 Group:          Development/Libraries
@@ -74,6 +74,15 @@ fi
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 1.0.2-5
 - Update LICENSE to 3.01
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-Color/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Dec 2006 19:39:57 -0000	1.2
+++ sources	7 Sep 2009 22:39:54 -0000	1.3
@@ -1 +1 @@
-a4a1a6f5c0f72d235930902cc1ee2e94  Image_Color-1.0.2.tgz
+78412abd1d54be0de3c5d9efe53af5a2  Image_Color-1.0.3.tgz



From salimma at fedoraproject.org  Mon Sep  7 22:44:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  7 Sep 2009 22:44:07 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.26,1.27
Message-ID: <20090907224407.CE46C11C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25726

Modified Files:
	llvm.spec 
Log Message:
* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.3.pre1
- Package Clang's static analyzer tools



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- llvm.spec	7 Sep 2009 21:05:32 -0000	1.26
+++ llvm.spec	7 Sep 2009 22:44:07 -0000	1.27
@@ -5,7 +5,7 @@
 
 Name:           llvm
 Version:        2.6
-Release:        0.2.pre1%{?dist}
+Release:        0.3.pre1%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -140,6 +140,7 @@ popd
 
 %build
 # Disabling assertions now, rec. by pure and needed for OpenGTL
+# no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
 mkdir obj && cd obj
 ../configure \
   --prefix=%{_prefix} \
@@ -159,6 +160,8 @@ make %{_smp_mflags} OPTIMIZE_OPTION='%{o
 
 
 %check
+# some tests fail on PPC
+# http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
 %ifnarch ppc
 cd obj && make check
 %endif
@@ -176,6 +179,10 @@ sed -i 's|(PROJ_prefix)/lib/clang|(PROJ_
 make install DESTDIR=%{buildroot} \
      PROJ_docsdir=/moredocs
 
+# Static analyzer not installed by default:
+# http://clang-analyzer.llvm.org/installation#OtherPlatforms
+cp -p tools/clang/{util/scan-build,tools/scan-view} %{buildroot}%{_bindir}/
+
 # Move documentation back to build directory
 # 
 mv %{buildroot}/moredocs ../
@@ -246,6 +253,8 @@ rm -rf %{buildroot}
 %{_bindir}/clang*
 %{_bindir}/FileCheck
 %{_bindir}/FileUpdate
+%{_bindir}/scan-build
+%{_bindir}/scan-view
 %{_bindir}/tblgen
 %{_libdir}/clang
 %{_libexecdir}/clang-cc
@@ -278,6 +287,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.3.pre1
+- Package Clang's static analyzer tools
+
 * Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.2.pre1
 - PIC is now enabled by default; explicitly disable on %%{ix86}
 



From mclasen at fedoraproject.org  Mon Sep  7 22:54:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 22:54:36 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.114,1.115
Message-ID: <20090907225436.2A57411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27945

Modified Files:
	devhelp.spec 
Log Message:
fix Rs



Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- devhelp.spec	7 Sep 2009 22:27:50 -0000	1.114
+++ devhelp.spec	7 Sep 2009 22:54:35 -0000	1.115
@@ -29,9 +29,10 @@ BuildRequires: libwnck-devel >= %{libwnc
 BuildRequires: gtk2-devel
 BuildRequires: WebKit-gtk-devel
 BuildRequires: GConf2-devel
+BuildRequires: unique-devel
 
 %description
-Devhelp is an API documentation browser for the GNOME desktop. 
+Devhelp is an API documentation browser for the GNOME desktop.
 It works natively with API documentation generated by gtk-doc.
 
 %package devel



From pbrobinson at fedoraproject.org  Mon Sep  7 23:03:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Sep 2009 23:03:49 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel .cvsignore, 1.2,
	1.3 moblin-icon-theme.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090907230349.32CCA11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31649

Modified Files:
	.cvsignore moblin-icon-theme.spec sources 
Log Message:
- Upstream git snapshot to pull in icon updates


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Aug 2009 10:37:19 -0000	1.2
+++ .cvsignore	7 Sep 2009 23:03:48 -0000	1.3
@@ -1 +1 @@
-moblin-icon-theme-0.7.tar.bz2
+moblin-icon-theme-0.7.1.tar.bz2


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-icon-theme.spec	6 Sep 2009 18:36:24 -0000	1.3
+++ moblin-icon-theme.spec	7 Sep 2009 23:03:48 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           moblin-icon-theme
-Version:        0.7
-Release:        3
+Version:        0.7.1
+Release:        0.1
 Summary:        Moblin icon theme
 
 Group:          User Interface/Desktops
 License:        CC-BY-SA
 URL:            http://www.moblin.org/
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+#Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+#git archive --format=tar --prefix=moblin-icon-theme-0.7.1/ b88b673 | bzip2 > moblin-icon-theme-0.7.1.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -79,6 +81,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.1-0.1
+- Upstream git snapshot to pull in icon updates
+
 * Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-3
 - Capitalise the theme name
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Aug 2009 10:37:20 -0000	1.2
+++ sources	7 Sep 2009 23:03:48 -0000	1.3
@@ -1 +1 @@
-0af21d9b6933f2563e42db370bf04e7b  moblin-icon-theme-0.7.tar.bz2
+08c0ed0055b78fd3aaadfaaf99974afe  moblin-icon-theme-0.7.1.tar.bz2



From ruben at fedoraproject.org  Mon Sep  7 23:21:42 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon,  7 Sep 2009 23:21:42 +0000 (UTC)
Subject: rpms/python-foolscap/devel
	foolscap-disable-randomly-failing-test.patch, NONE,
	1.1 python-foolscap.spec, 1.3, 1.4
Message-ID: <20090907232142.DD0A511C00DB@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7779

Modified Files:
	python-foolscap.spec 
Added Files:
	foolscap-disable-randomly-failing-test.patch 
Log Message:
* Tue Sep 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-2
- Disable a single test which only fails in Koji


foolscap-disable-randomly-failing-test.patch:
 test_tub.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE foolscap-disable-randomly-failing-test.patch ---
diff -up foolscap-0.4.2/foolscap/test/test_tub.py.orig foolscap-0.4.2/foolscap/test/test_tub.py
--- foolscap-0.4.2/foolscap/test/test_tub.py.orig	2009-09-08 01:13:49.000000000 +0200
+++ foolscap-0.4.2/foolscap/test/test_tub.py	2009-09-08 01:14:11.000000000 +0200
@@ -47,11 +47,11 @@ uXVWwCwZgjHHsG5+jhGheZjvKXl+RS71Z6dQjwOY
 """
 
 class TestCertFile(unittest.TestCase):
-    def test_generate(self):
-        t = Tub()
-        certdata = t.getCertData()
-        self.failUnless("BEGIN CERTIFICATE" in certdata)
-        self.failUnless("BEGIN RSA PRIVATE KEY" in certdata)
+    #def test_generate(self):
+    #    t = Tub()
+    #    certdata = t.getCertData()
+    #    self.failUnless("BEGIN CERTIFICATE" in certdata)
+    #    self.failUnless("BEGIN RSA PRIVATE KEY" in certdata)
 
     def test_certdata(self):
         t1 = Tub()


Index: python-foolscap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/python-foolscap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-foolscap.spec	7 Sep 2009 21:03:12 -0000	1.3
+++ python-foolscap.spec	7 Sep 2009 23:21:41 -0000	1.4
@@ -4,13 +4,14 @@
 
 Name:           python-%{modulename}
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Next-generation RPC protocol, intended to replace Perspective Broker
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://foolscap.lothar.com
 Source0:        http://foolscap.lothar.com/releases/%{modulename}-%{version}.tar.gz
+Patch0:		foolscap-disable-randomly-failing-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,9 @@ object reference system, and a capabilit
 %prep
 %setup -q -n %{modulename}-%{version}
 
+# test_certdata only fails in Koji for some reason
+%patch0 -p1
+
 %build
 %{__python} setup.py build
 find doc/ -name \*.py | xargs chmod 0644
@@ -52,6 +56,9 @@ rm -rf %{buildroot}
 %{_bindir}/flappserver
 
 %changelog
+* Tue Sep 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-2
+- Disable a single test which only fails in Koji
+
 * Mon Sep 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-1
 - Upstream released new version
 



From cebbert at fedoraproject.org  Mon Sep  7 23:21:56 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  7 Sep 2009 23:21:56 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch,
	NONE, 
	1.1.2.1 linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch, NONE,
	1.1.2.1 linux-2.6-ppc64-vs-broadcom.patch, NONE,
	1.1.2.2 kernel.spec, 1.1206.2.88, 1.1206.2.89
Message-ID: <20090907232156.BA41311C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7911

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
Backport fix for b43 on ppc64 to 2.6.27 (#514787)

linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch:
 lmb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu, 27 Aug 2009 07:20:30 +0000 (+1000)
Subject: lmb: Remove __init from lmb_end_of_DRAM()
X-Git-Tag: v2.6.31-rc8~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4f8ee2c9cc0e885d2bb50ef26db66150ab25213e

lmb: Remove __init from lmb_end_of_DRAM()

We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
without IOMMU, but this function is marked as __init.

I don't think there's a clean way to get the top of RAM max_pfn doesn't
appear to include highmem or I missed (or we have a bug :-) so for now,
let's just avoid having a broken 2.6.31 by making this function
non-__init and we can revisit later.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/lib/lmb.c b/lib/lmb.c
index e4a6482..0343c05 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
 	return lmb.memory.size;
 }
 
-u64 __init lmb_end_of_DRAM(void)
+u64 lmb_end_of_DRAM(void)
 {
 	int idx = lmb.memory.cnt - 1;
 

linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch:
 lmb.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 31 Aug 2009 03:48:16 +0000 (+1000)
Subject: lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1a37f184fa7824982a5f434c06981ec46a66cef7

lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h

My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
was also marked as such in the .h

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index c46c895..2442e3f 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
 extern u64 __init __lmb_alloc_base(u64 size,
 		u64 align, u64 max_addr);
 extern u64 __init lmb_phys_mem_size(void);
-extern u64 __init lmb_end_of_DRAM(void);
+extern u64 lmb_end_of_DRAM(void);
 extern void __init lmb_enforce_memory_limit(u64 memory_limit);
 extern int __init lmb_is_reserved(u64 addr);
 extern int lmb_find(struct lmb_property *res);

linux-2.6-ppc64-vs-broadcom.patch:
 dma_64.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom.patch ---
>From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 10 Aug 2009 16:36:38 +1000
Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM

[ <cebbert at redhat.com> : backport to 2.6.27 ]

On an iMac G5, the b43 driver is failing to initialise because trying to
set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
in the machine anyway:
	https://bugzilla.redhat.com/show_bug.cgi?id=514787

We should probably let it succeed if the available RAM in the system
doesn't exceed the requested limit.

Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---
 arch/powerpc/kernel/dma_64.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 20a60d6..ccf129d 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
@@ -7,6 +7,7 @@
 
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/lmb.h>
 #include <asm/bug.h>
 #include <asm/iommu.h>
 #include <asm/abs_addr.h>
@@ -90,11 +91,10 @@ static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
 
 static int dma_direct_dma_supported(struct device *dev, u64 mask)
 {
-	/* Could be improved to check for memory though it better be
-	 * done via some global so platforms can set the limit in case
+	/* Could be improved so platforms can set the limit in case
 	 * they have limited DMA windows
 	 */
-	return mask >= DMA_32BIT_MASK;
+	return mask >= (lmb_end_of_DRAM() - 1);
 }
 
 struct dma_mapping_ops dma_direct_ops = {
-- 
1.6.2.5



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.88
retrieving revision 1.1206.2.89
diff -u -p -r1.1206.2.88 -r1.1206.2.89
--- kernel.spec	6 Sep 2009 04:59:29 -0000	1.1206.2.88
+++ kernel.spec	7 Sep 2009 23:21:55 -0000	1.1206.2.89
@@ -786,6 +786,11 @@ Patch14001: linux-2.6-nfsd-report-short-
 Patch14010: linux-2.6-slub-fix-destroy-by-rcu.patch
 Patch14011: linux-2.6-ocfs2-handle-len-0.patch
 
+# send for -stable
+Patch15000: linux-2.6-ppc64-vs-broadcom.patch
+Patch15001: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
+Patch15002: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1421,6 +1426,11 @@ ApplyPatch linux-2.6-nfsd-report-short-w
 ApplyPatch linux-2.6-slub-fix-destroy-by-rcu.patch
 ApplyPatch linux-2.6-ocfs2-handle-len-0.patch
 
+# send for -stable:
+ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1996,6 +2006,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.89.rc1
+- Backport fix for b43 on ppc64 to 2.6.27 (#514787)
+
 * Sun Sep 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.88.rc1
 - Add patches requested for the next stable release:
    linux-2.6-slub-fix-destroy-by-rcu.patch (fixes bug in 2.6.27.29)



From xulchris at fedoraproject.org  Mon Sep  7 23:28:28 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 23:28:28 +0000 (UTC)
Subject: rpms/php-pear-Net-POP3/F-10 .cvsignore, 1.2,
	1.3 php-pear-Net-POP3.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090907232828.469E711C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-POP3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12991/F-10

Modified Files:
	.cvsignore php-pear-Net-POP3.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jan 2007 22:17:14 -0000	1.2
+++ .cvsignore	7 Sep 2009 23:28:27 -0000	1.3
@@ -1 +1 @@
-Net_POP3-1.3.6.tgz
+Net_POP3-1.3.7.tgz


Index: php-pear-Net-POP3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/F-10/php-pear-Net-POP3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-pear-Net-POP3.spec	13 Jan 2007 22:17:14 -0000	1.1
+++ php-pear-Net-POP3.spec	7 Sep 2009 23:28:28 -0000	1.2
@@ -2,8 +2,8 @@
 %define pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
-Version:        1.3.6
-Release:        2%{?dist}
+Version:        1.3.7
+Release:        1%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
 Group:          Development/Languages
@@ -28,7 +28,7 @@ optional Auth_SASL package.
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -44,6 +44,10 @@ cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
@@ -69,12 +73,23 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Net/POP3.php
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.3.7-1
+- Upstream sync
+- Remove test dir
+- Add doc dir
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 13 2007 Christopher Stone <chris.stone at gmail.com> 1.3.6-2
 - Fix Requires for Auth_SASL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jan 2007 22:17:14 -0000	1.2
+++ sources	7 Sep 2009 23:28:28 -0000	1.3
@@ -1 +1 @@
-dad6200744d2c8f326fbec1f5e0c8249  Net_POP3-1.3.6.tgz
+eda6572e03b955ae0ca4345ddf2e4e33  Net_POP3-1.3.7.tgz



From xulchris at fedoraproject.org  Mon Sep  7 23:28:27 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 23:28:27 +0000 (UTC)
Subject: rpms/php-pear-Net-POP3/EL-5 .cvsignore, 1.2,
	1.3 php-pear-Net-POP3.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090907232828.0C2E811C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-POP3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12991/EL-5

Modified Files:
	.cvsignore php-pear-Net-POP3.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jan 2007 22:17:14 -0000	1.2
+++ .cvsignore	7 Sep 2009 23:28:27 -0000	1.3
@@ -1 +1 @@
-Net_POP3-1.3.6.tgz
+Net_POP3-1.3.7.tgz


Index: php-pear-Net-POP3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/EL-5/php-pear-Net-POP3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-pear-Net-POP3.spec	13 Jan 2007 22:17:14 -0000	1.1
+++ php-pear-Net-POP3.spec	7 Sep 2009 23:28:27 -0000	1.2
@@ -2,8 +2,8 @@
 %define pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
-Version:        1.3.6
-Release:        2%{?dist}
+Version:        1.3.7
+Release:        1%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
 Group:          Development/Languages
@@ -28,7 +28,7 @@ optional Auth_SASL package.
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -44,6 +44,10 @@ cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
@@ -69,12 +73,23 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Net/POP3.php
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.3.7-1
+- Upstream sync
+- Remove test dir
+- Add doc dir
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 13 2007 Christopher Stone <chris.stone at gmail.com> 1.3.6-2
 - Fix Requires for Auth_SASL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jan 2007 22:17:14 -0000	1.2
+++ sources	7 Sep 2009 23:28:27 -0000	1.3
@@ -1 +1 @@
-dad6200744d2c8f326fbec1f5e0c8249  Net_POP3-1.3.6.tgz
+eda6572e03b955ae0ca4345ddf2e4e33  Net_POP3-1.3.7.tgz



From xulchris at fedoraproject.org  Mon Sep  7 23:28:28 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 23:28:28 +0000 (UTC)
Subject: rpms/php-pear-Net-POP3/F-11 .cvsignore, 1.2,
	1.3 php-pear-Net-POP3.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090907232828.8B21C11C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-POP3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12991/F-11

Modified Files:
	.cvsignore php-pear-Net-POP3.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jan 2007 22:17:14 -0000	1.2
+++ .cvsignore	7 Sep 2009 23:28:28 -0000	1.3
@@ -1 +1 @@
-Net_POP3-1.3.6.tgz
+Net_POP3-1.3.7.tgz


Index: php-pear-Net-POP3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/F-11/php-pear-Net-POP3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-Net-POP3.spec	26 Feb 2009 21:48:37 -0000	1.2
+++ php-pear-Net-POP3.spec	7 Sep 2009 23:28:28 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
-Version:        1.3.6
-Release:        3%{?dist}
+Version:        1.3.7
+Release:        1%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
 Group:          Development/Languages
@@ -28,7 +28,7 @@ optional Auth_SASL package.
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -44,6 +44,10 @@ cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
@@ -69,12 +73,20 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Net/POP3.php
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.3.7-1
+- Upstream sync
+- Remove test dir
+- Add doc dir
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jan 2007 22:17:14 -0000	1.2
+++ sources	7 Sep 2009 23:28:28 -0000	1.3
@@ -1 +1 @@
-dad6200744d2c8f326fbec1f5e0c8249  Net_POP3-1.3.6.tgz
+eda6572e03b955ae0ca4345ddf2e4e33  Net_POP3-1.3.7.tgz



From xulchris at fedoraproject.org  Mon Sep  7 23:28:28 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Mon,  7 Sep 2009 23:28:28 +0000 (UTC)
Subject: rpms/php-pear-Net-POP3/devel .cvsignore, 1.2,
	1.3 php-pear-Net-POP3.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090907232828.D785311C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-POP3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12991/devel

Modified Files:
	.cvsignore php-pear-Net-POP3.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jan 2007 22:17:14 -0000	1.2
+++ .cvsignore	7 Sep 2009 23:28:28 -0000	1.3
@@ -1 +1 @@
-Net_POP3-1.3.6.tgz
+Net_POP3-1.3.7.tgz


Index: php-pear-Net-POP3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/devel/php-pear-Net-POP3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Net-POP3.spec	26 Jul 2009 18:22:50 -0000	1.3
+++ php-pear-Net-POP3.spec	7 Sep 2009 23:28:28 -0000	1.4
@@ -2,8 +2,8 @@
 %define pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
-Version:        1.3.6
-Release:        4%{?dist}
+Version:        1.3.7
+Release:        1%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
 Group:          Development/Languages
@@ -28,7 +28,7 @@ optional Auth_SASL package.
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -44,6 +44,10 @@ cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
@@ -69,12 +73,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Net/POP3.php
 
 
 %changelog
+* Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.3.7-1
+- Upstream sync
+- Remove test dir
+- Add doc dir
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-POP3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jan 2007 22:17:14 -0000	1.2
+++ sources	7 Sep 2009 23:28:28 -0000	1.3
@@ -1 +1 @@
-dad6200744d2c8f326fbec1f5e0c8249  Net_POP3-1.3.6.tgz
+eda6572e03b955ae0ca4345ddf2e4e33  Net_POP3-1.3.7.tgz



From mclasen at fedoraproject.org  Mon Sep  7 23:31:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 23:31:36 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 vinagre.spec, 1.55, 1.56
Message-ID: <20090907233136.CE33611C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15266

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	25 Aug 2009 20:20:48 -0000	1.28
+++ .cvsignore	7 Sep 2009 23:31:36 -0000	1.29
@@ -1 +1 @@
-vinagre-2.27.91.tar.bz2
+vinagre-2.27.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	25 Aug 2009 20:20:48 -0000	1.28
+++ sources	7 Sep 2009 23:31:36 -0000	1.29
@@ -1 +1 @@
-e776cd376b5f9b1537c84da093f4e589  vinagre-2.27.91.tar.bz2
+e0ed6668f6ee78bf225a30ab4bbdc576  vinagre-2.27.92.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- vinagre.spec	6 Sep 2009 02:59:50 -0000	1.55
+++ vinagre.spec	7 Sep 2009 23:31:36 -0000	1.56
@@ -1,6 +1,6 @@
 Name:		vinagre
-Version:	2.27.91
-Release:	3%{?dist}
+Version:	2.27.92
+Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -26,11 +26,6 @@ BuildRequires:  telepathy-glib-devel
 # for /usr/share/dbus-1/services
 Requires: dbus
 
-# fixed upstream
-Patch0: vinagre-unique-ids.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=594286
-Patch1: vinagre-prefs.patch
-
 %description
 Vinagre is a VNC client for the GNOME desktop.
 
@@ -54,8 +49,6 @@ to vinagre.
 
 %prep
 %setup -q
-%patch0 -p1 -b .unique-ids
-%patch1 -p1 -b .prefs
 
 %build
 %configure --enable-avahi=yes --disable-static
@@ -162,6 +155,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Sat Sep  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-3
 - Fix warnings at startup (#521382)
 



From emoret at fedoraproject.org  Mon Sep  7 23:54:29 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Mon,  7 Sep 2009 23:54:29 +0000 (UTC)
Subject: rpms/alsa-plugins/devel maemo.conf, NONE, 1.1 .cvsignore, 1.9,
	1.10 alsa-plugins.spec, 1.26, 1.27 sources, 1.9,
	1.10 0001-alsa-plugins-pulse-Implement-pause.patch, 1.3,
	NONE 0002-pulse-get-rid-of-a-number-of-assert-s.patch, 1.1,
	NONE 0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch,
	1.1, NONE 0004-pulse-unify-destruction-of-snd_pulse_t.patch, 1.1,
	NONE 0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch, 
	1.1,
	NONE 0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch, 
	1.1,
	NONE 0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch, 
	1.1, NONE 0008-pulse-get-rid-of-redundant-state-variable.patch,
	1.1, NONE 0009-pulse-unify-stream-context-state-checks.patch,
	1.1, NONE 0010-pulse-rework-object-destruction-paths-a-bit.patch, 1.1,
	NONE 0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch, 
	1.1, NONE
Message-ID: <20090907235429.A2FFD11C00DB@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24665

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Added Files:
	maemo.conf 
Removed Files:
	0001-alsa-plugins-pulse-Implement-pause.patch 
	0002-pulse-get-rid-of-a-number-of-assert-s.patch 
	0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch 
	0004-pulse-unify-destruction-of-snd_pulse_t.patch 
	0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch 
	0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch 
	0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch 
	0008-pulse-get-rid-of-redundant-state-variable.patch 
	0009-pulse-unify-stream-context-state-checks.patch 
	0010-pulse-rework-object-destruction-paths-a-bit.patch 
	0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch 
Log Message:
Updated to 1.0.21
Patch clean up
Added maemo subpackage



--- NEW FILE maemo.conf ---
# PCM
pcm.!default {
	type alsa_dsp
	playback_device_file ["/dev/dsptask/pcm2"]
	recording_device_file ["/dev/dsptask/pcm_rec"]
}

# Mixer
ctl.!default {
	type dsp_ctl
	playback_devices ["/dev/dsptask/pcm2"]
	recording_devices ["/dev/dsptask/pcm_rec"]
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 May 2009 05:51:46 -0000	1.9
+++ .cvsignore	7 Sep 2009 23:54:27 -0000	1.10
@@ -1 +1 @@
-alsa-plugins-1.0.20.tar.bz2
+alsa-plugins-1.0.21.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- alsa-plugins.spec	4 Aug 2009 22:15:24 -0000	1.26
+++ alsa-plugins.spec	7 Sep 2009 23:54:28 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
-Version:        1.0.20
-Release:        5%{?dist}
+Version:        1.0.21
+Release:        1%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -15,18 +15,8 @@ Source5:        upmix.conf
 Source6:        vdownmix.conf
 Source7:        pulse-default.conf
 Source8:        arcamav.conf
+Source9:        maemo.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		0001-alsa-plugins-pulse-Implement-pause.patch
-Patch2:		0002-pulse-get-rid-of-a-number-of-assert-s.patch
-Patch3:		0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch
-Patch4:		0004-pulse-unify-destruction-of-snd_pulse_t.patch
-Patch5:		0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch
-Patch6:		0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch
-Patch7:		0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch
-Patch8:		0008-pulse-get-rid-of-redundant-state-variable.patch
-Patch9:		0009-pulse-unify-stream-context-state-checks.patch
-Patch10:	0010-pulse-rework-object-destruction-paths-a-bit.patch
-Patch11:	0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch
 
 BuildRequires:  alsa-lib-devel
 
@@ -37,7 +27,8 @@ functionality to the Linux operating sys
 This package includes plugins for ALSA.
 
 %package jack
-Requires:       jack-audio-connection-kit, alsa-utils
+Requires:       alsa-utils
+Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -61,7 +52,8 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
-Requires:       pulseaudio, alsa-utils
+Requires:       alsa-utils
+Requires:       pulseaudio
 BuildRequires:  pulseaudio-lib-devel
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
@@ -132,23 +124,23 @@ The rate plugin is an external rate conv
 (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
 pre-processing of a mono stream like denoise using libspeex DSP API.
 
+%package maemo
+BuildRequires:  alsa-lib-devel = %{version}
+Summary:        Maemo plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description maemo
+This plugin converts the ALSA API over PCM task nodes protocol. In this way,
+ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch1 -p1 
-%patch2 -p1 
-%patch3 -p1 
-%patch4 -p1 
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 %configure --disable-static \
-           --with-speex=lib
+           --with-speex=lib \
+           --enable-maemo-plugin \
+           --enable-maemo-resource-manager
 make %{?_smp_mflags}
 
 %install
@@ -156,20 +148,21 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 \
-               %SOURCE3 %SOURCE4 \
-               %SOURCE5 %SOURCE6 \
+install -m 644 %SOURCE1 \
+               %SOURCE2 \
+               %SOURCE3 \
+               %SOURCE4 \
+               %SOURCE5 \
+               %SOURCE6 \
                %SOURCE8 \
+               %SOURCE9 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+# pulseaudio configuration file
 install -m 644 %SOURCE7 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
-# Removing the maemo plugins
-find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
-                        -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \;
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -245,8 +238,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so
 %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
 
+%files maemo
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-maemo
+%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
+%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
+
 
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-1
+- Updated to 1.0.21
+- Patch clean up
+- Added maemo subpackage
+
 * Tue Aug 4 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-5
 - Add a couple of more clean up patches for the pulse plugin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 May 2009 05:51:46 -0000	1.9
+++ sources	7 Sep 2009 23:54:28 -0000	1.10
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7  alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01  alsa-plugins-1.0.21.tar.bz2


--- 0001-alsa-plugins-pulse-Implement-pause.patch DELETED ---


--- 0002-pulse-get-rid-of-a-number-of-assert-s.patch DELETED ---


--- 0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch DELETED ---


--- 0004-pulse-unify-destruction-of-snd_pulse_t.patch DELETED ---


--- 0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch DELETED ---


--- 0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch DELETED ---


--- 0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch DELETED ---


--- 0008-pulse-get-rid-of-redundant-state-variable.patch DELETED ---


--- 0009-pulse-unify-stream-context-state-checks.patch DELETED ---


--- 0010-pulse-rework-object-destruction-paths-a-bit.patch DELETED ---


--- 0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch DELETED ---



From mclasen at fedoraproject.org  Mon Sep  7 23:57:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Sep 2009 23:57:32 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.51, 1.52 sources, 1.51, 1.52 vino.spec,
	1.105, 1.106
Message-ID: <20090907235732.DE72811C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25905

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	25 Aug 2009 20:18:20 -0000	1.51
+++ .cvsignore	7 Sep 2009 23:57:32 -0000	1.52
@@ -1 +1 @@
-vino-2.27.91.tar.bz2
+vino-2.27.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	25 Aug 2009 20:18:20 -0000	1.51
+++ sources	7 Sep 2009 23:57:32 -0000	1.52
@@ -1 +1 @@
-8c220bb3c0770c4f9820e8f30395c65d  vino-2.27.91.tar.bz2
+120b5291d09936384264f19855317b67  vino-2.27.92.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- vino.spec	25 Aug 2009 20:18:20 -0000	1.105
+++ vino.spec	7 Sep 2009 23:57:32 -0000	1.106
@@ -9,7 +9,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.27/%{name}-%{version}.tar.bz2
@@ -129,6 +129,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 



From emoret at fedoraproject.org  Tue Sep  8 00:07:03 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Tue,  8 Sep 2009 00:07:03 +0000 (UTC)
Subject: rpms/alsa-plugins/devel alsa-plugins.spec,1.27,1.28
Message-ID: <20090908000703.BF45711C00DB@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497

Modified Files:
	alsa-plugins.spec 
Log Message:
Added missing dbus-devel dependency to maemo subpackage



Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- alsa-plugins.spec	7 Sep 2009 23:54:28 -0000	1.27
+++ alsa-plugins.spec	8 Sep 2009 00:07:02 -0000	1.28
@@ -126,6 +126,7 @@ pre-processing of a mono stream like den
 
 %package maemo
 BuildRequires:  alsa-lib-devel = %{version}
+BuildRequires:  dbus-devel
 Summary:        Maemo plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+



From mclasen at fedoraproject.org  Tue Sep  8 00:07:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:07:34 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.27, 1.28 brasero.spec, 1.61,
	1.62 sources, 1.27, 1.28
Message-ID: <20090908000734.74B4711C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28468

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	25 Aug 2009 21:22:39 -0000	1.27
+++ .cvsignore	8 Sep 2009 00:07:32 -0000	1.28
@@ -1 +1 @@
-brasero-2.27.91.tar.bz2
+brasero-2.27.92.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- brasero.spec	25 Aug 2009 21:22:39 -0000	1.61
+++ brasero.spec	8 Sep 2009 00:07:32 -0000	1.62
@@ -1,5 +1,5 @@
 Name:      brasero
-Version:   2.27.91
+Version:   2.27.92
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -203,6 +203,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	25 Aug 2009 21:22:39 -0000	1.27
+++ sources	8 Sep 2009 00:07:32 -0000	1.28
@@ -1 +1 @@
-d6482a43808d9233e8edccf2008c0f05  brasero-2.27.91.tar.bz2
+32461934eeb0ed74a3f7ea033104e998  brasero-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 00:08:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:08:52 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.82, 1.83 gnome-themes.spec,
	1.146, 1.147 sources, 1.87, 1.88
Message-ID: <20090908000852.B12F411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29538

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	25 Aug 2009 02:14:53 -0000	1.82
+++ .cvsignore	8 Sep 2009 00:08:52 -0000	1.83
@@ -1 +1 @@
-gnome-themes-2.27.91.tar.bz2
+gnome-themes-2.27.92.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- gnome-themes.spec	25 Aug 2009 02:14:53 -0000	1.146
+++ gnome-themes.spec	8 Sep 2009 00:08:52 -0000	1.147
@@ -1,6 +1,6 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.27.91
+Version: 2.27.92
 Release:1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.27/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	25 Aug 2009 02:14:53 -0000	1.87
+++ sources	8 Sep 2009 00:08:52 -0000	1.88
@@ -1 +1 @@
-07c20c0db310dc0eec00606319d034a4  gnome-themes-2.27.91.tar.bz2
+fb5baf8945c52a43e059935c6610835a  gnome-themes-2.27.92.tar.bz2



From nucleo at fedoraproject.org  Tue Sep  8 00:12:16 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue,  8 Sep 2009 00:12:16 +0000 (UTC)
Subject: rpms/kvirc/devel .cvsignore, 1.6, 1.7 kvirc.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <20090908001216.40DCF11C00DB@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30622

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
KVIrc 4.0 release candidate 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 20:16:34 -0000	1.6
+++ .cvsignore	8 Sep 2009 00:12:15 -0000	1.7
@@ -1 +1 @@
-kvirc-20090831svn3442.tar.bz2
+kvirc-4.0rc1.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kvirc.spec	31 Aug 2009 20:16:34 -0000	1.11
+++ kvirc.spec	8 Sep 2009 00:12:15 -0000	1.12
@@ -1,18 +1,14 @@
-%define           rev 3442
-%define           pre 20090831svn%{rev}
+%define           rev 3462
+%define           pre rc1
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.15.%{pre}%{?dist}
+Release:          0.16.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  svn export -r 3442 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090831svn3442.tar.bz2 kvirc
-Source0:          %{name}-%{pre}.tar.bz2
+Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -27,7 +23,7 @@ and the KVIrc Development Team with the 
 many IRC addicted developers around the world.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-4.0%{pre}
 
 %build
 %{cmake}  \
@@ -75,7 +71,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc doc/FAQ doc/README COPYING
+%doc doc/FAQ doc/README COPYING ChangeLog
 %{_bindir}/%{name}
 %{_libdir}/libkvilib.so.4
 %{_libdir}/libkvilib.so.4.0.0
@@ -130,9 +126,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Tue Sep  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.16.rc1
+- KVIrc 4.0 release candidate 1
+
 * Sun Aug 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.15.20090831svn3442
-- r3442: added option for using cmake flags from environment variables
-- Added -DUSE_ENV_FLAGS=ON for using default cmake flags
+- svn snapshot 3442 that includes option for using environment variables
+- Added -DUSE_ENV_FLAGS=ON for using default compiler flags
 
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	31 Aug 2009 20:16:34 -0000	1.6
+++ sources	8 Sep 2009 00:12:16 -0000	1.7
@@ -1 +1 @@
-48e1fd92e1aa24e2cb8c29ef649f35ac  kvirc-20090831svn3442.tar.bz2
+092206ada148236a9e62351c98d59560  kvirc-4.0rc1.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 00:12:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:12:17 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.16,
	1.17 gnome-backgrounds.spec, 1.27, 1.28 sources, 1.16, 1.17
Message-ID: <20090908001217.98B9811C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30575

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	17 Mar 2009 19:02:18 -0000	1.16
+++ .cvsignore	8 Sep 2009 00:12:17 -0000	1.17
@@ -1 +1 @@
-gnome-backgrounds-2.24.1.tar.bz2
+gnome-backgrounds-2.27.91.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gnome-backgrounds.spec	3 Aug 2009 01:45:31 -0000	1.27
+++ gnome-backgrounds.spec	8 Sep 2009 00:12:17 -0000	1.28
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.24.1
-Release: 3%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.24/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: intltool
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/*
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-3
 - Co-own /usr/share/backgrounds instead of requiring desktop-backgrounds-basic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	17 Mar 2009 19:02:18 -0000	1.16
+++ sources	8 Sep 2009 00:12:17 -0000	1.17
@@ -1 +1 @@
-28e09fcdeef5616bc612b36e5068e413  gnome-backgrounds-2.24.1.tar.bz2
+8e96cf62bbb05dddb29d6acabecbbab6  gnome-backgrounds-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 00:15:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:15:08 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.55, 1.56 libsoup.spec, 1.100,
	1.101 sources, 1.55, 1.56
Message-ID: <20090908001508.1DFD611C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31594

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	24 Aug 2009 21:07:06 -0000	1.55
+++ .cvsignore	8 Sep 2009 00:15:07 -0000	1.56
@@ -1 +1 @@
-libsoup-2.27.91.tar.bz2
+libsoup-2.27.92.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- libsoup.spec	25 Aug 2009 00:50:27 -0000	1.100
+++ libsoup.spec	8 Sep 2009 00:15:07 -0000	1.101
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	24 Aug 2009 21:07:06 -0000	1.55
+++ sources	8 Sep 2009 00:15:07 -0000	1.56
@@ -1 +1 @@
-58e5518a483fbef0b72f142e63f43e9f  libsoup-2.27.91.tar.bz2
+2e80693a4af29d4d82266b3327c5461a  libsoup-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 00:23:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:23:43 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel gnome-backgrounds-paths.patch,1.3,1.4
Message-ID: <20090908002343.2D6E311C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2472

Modified Files:
	gnome-backgrounds-paths.patch 
Log Message:
update patch


gnome-backgrounds-paths.patch:
 abstract/gnome-abstract.xml.in.in |   10 +++++-----
 nature/gnome-nature.xml.in.in     |   24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

Index: gnome-backgrounds-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/gnome-backgrounds-paths.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-backgrounds-paths.patch	22 Aug 2008 17:59:29 -0000	1.3
+++ gnome-backgrounds-paths.patch	8 Sep 2009 00:23:42 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up gnome-backgrounds-2.23.90/abstract/gnome-abstract.xml.in.in.paths gnome-backgrounds-2.23.90/abstract/gnome-abstract.xml.in.in
---- gnome-backgrounds-2.23.90/abstract/gnome-abstract.xml.in.in.paths	2008-08-17 15:59:55.000000000 -0400
-+++ gnome-backgrounds-2.23.90/abstract/gnome-abstract.xml.in.in	2008-08-22 13:57:42.000000000 -0400
+diff -up gnome-backgrounds-2.27.91/abstract/gnome-abstract.xml.in.in.paths gnome-backgrounds-2.27.91/abstract/gnome-abstract.xml.in.in
+--- gnome-backgrounds-2.27.91/abstract/gnome-abstract.xml.in.in.paths	2009-09-07 17:23:44.000000000 -0400
++++ gnome-backgrounds-2.27.91/abstract/gnome-abstract.xml.in.in	2009-09-07 20:19:57.545152359 -0400
 @@ -3,7 +3,7 @@
  <wallpapers>
  	<wallpaper deleted="false">
@@ -44,9 +44,9 @@ diff -up gnome-backgrounds-2.23.90/abstr
  		<shade_type>solid</shade_type>
  		<pcolor>#1166AA</pcolor>
  		<options>zoom</options>
-diff -up gnome-backgrounds-2.23.90/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.23.90/nature/gnome-nature.xml.in.in
---- gnome-backgrounds-2.23.90/nature/gnome-nature.xml.in.in.paths	2008-08-04 18:04:59.000000000 -0400
-+++ gnome-backgrounds-2.23.90/nature/gnome-nature.xml.in.in	2008-08-22 13:55:21.000000000 -0400
+diff -up gnome-backgrounds-2.27.91/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.27.91/nature/gnome-nature.xml.in.in
+--- gnome-backgrounds-2.27.91/nature/gnome-nature.xml.in.in.paths	2009-09-07 17:23:44.000000000 -0400
++++ gnome-backgrounds-2.27.91/nature/gnome-nature.xml.in.in	2009-09-07 20:21:27.094141125 -0400
 @@ -5,64 +5,64 @@
  	<!-- Translators: This is the name of a desktop background image that shows an orange/red flower.
  		You might want to translate it into the equivalent words of your language  -->
@@ -77,8 +77,8 @@ diff -up gnome-backgrounds-2.23.90/natur
  	</wallpaper>
  	<wallpaper deleted="false">
  		<_name>Storm</_name>
--		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg</filename>
-+		<filename>@datadir@/backgrounds/nature/Dune.jpg</filename>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Storm.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Storm.jpg</filename>
  		<options>zoom</options>
  	</wallpaper>
  	<wallpaper deleted="false">



From mclasen at fedoraproject.org  Tue Sep  8 00:24:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:24:10 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.34, 1.35 cheese.spec, 1.61,
	1.62 sources, 1.34, 1.35
Message-ID: <20090908002410.4A35011C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1612

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	25 Aug 2009 02:37:04 -0000	1.34
+++ .cvsignore	8 Sep 2009 00:24:09 -0000	1.35
@@ -1 +1 @@
-cheese-2.27.91.tar.bz2
+cheese-2.27.92.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cheese.spec	25 Aug 2009 02:37:04 -0000	1.61
+++ cheese.spec	8 Sep 2009 00:24:10 -0000	1.62
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.27.91
+Version:        2.27.92
 Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
@@ -126,6 +126,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	25 Aug 2009 02:37:04 -0000	1.34
+++ sources	8 Sep 2009 00:24:10 -0000	1.35
@@ -1 +1 @@
-ba7d1ab6f4f671ad46bcc5addc9a14f1  cheese-2.27.91.tar.bz2
+3c1b1cc62d6ce7ba91124e075e6db77a  cheese-2.27.92.tar.bz2



From emoret at fedoraproject.org  Tue Sep  8 00:25:49 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Tue,  8 Sep 2009 00:25:49 +0000 (UTC)
Subject: rpms/alsa-plugins/devel alsa-plugins.spec,1.28,1.29
Message-ID: <20090908002549.B5BE011C00DB@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2943

Modified Files:
	alsa-plugins.spec 
Log Message:
Up package



Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- alsa-plugins.spec	8 Sep 2009 00:07:02 -0000	1.28
+++ alsa-plugins.spec	8 Sep 2009 00:25:49 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -248,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-2
+- Added missing dbus-devel dependency to maemo subpackage
+
 * Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-1
 - Updated to 1.0.21
 - Patch clean up



From mclasen at fedoraproject.org  Tue Sep  8 00:30:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:30:23 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.91, 1.92 file-roller.spec,
	1.154, 1.155 sources, 1.91, 1.92
Message-ID: <20090908003023.C692811C043A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4533

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	25 Aug 2009 02:00:47 -0000	1.91
+++ .cvsignore	8 Sep 2009 00:30:22 -0000	1.92
@@ -1 +1 @@
-file-roller-2.27.91.tar.bz2
+file-roller-2.27.92.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- file-roller.spec	25 Aug 2009 02:00:47 -0000	1.154
+++ file-roller.spec	8 Sep 2009 00:30:22 -0000	1.155
@@ -10,7 +10,7 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.27.91
+Version:	2.27.92
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -127,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	25 Aug 2009 02:00:47 -0000	1.91
+++ sources	8 Sep 2009 00:30:22 -0000	1.92
@@ -1 +1 @@
-6bded6c57b3489c926d089fea388f788  file-roller-2.27.91.tar.bz2
+92eb4195b1c78a33db881af17acd5868  file-roller-2.27.92.tar.bz2



From nucleo at fedoraproject.org  Tue Sep  8 00:33:15 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue,  8 Sep 2009 00:33:15 +0000 (UTC)
Subject: rpms/kvirc/F-11 .cvsignore, 1.6, 1.7 kvirc.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090908003315.D22E111C00DB@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6516

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
KVIrc 4.0 release candidate 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 20:44:20 -0000	1.6
+++ .cvsignore	8 Sep 2009 00:33:14 -0000	1.7
@@ -1 +1 @@
-kvirc-20090831svn3442.tar.bz2
+kvirc-4.0rc1.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kvirc.spec	31 Aug 2009 20:44:20 -0000	1.5
+++ kvirc.spec	8 Sep 2009 00:33:15 -0000	1.6
@@ -1,18 +1,14 @@
-%define           rev 3442
-%define           pre 20090831svn%{rev}
+%define           rev 3462
+%define           pre rc1
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.15.%{pre}%{?dist}
+Release:          0.16.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  svn export -r 3442 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090831svn3442.tar.bz2 kvirc
-Source0:          %{name}-%{pre}.tar.bz2
+Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -27,7 +23,7 @@ and the KVIrc Development Team with the 
 many IRC addicted developers around the world.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-4.0%{pre}
 
 %build
 %{cmake}  \
@@ -75,7 +71,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc doc/FAQ doc/README COPYING
+%doc doc/FAQ doc/README COPYING ChangeLog
 %{_bindir}/%{name}
 %{_libdir}/libkvilib.so.4
 %{_libdir}/libkvilib.so.4.0.0
@@ -130,9 +126,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Tue Sep  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.16.rc1
+- KVIrc 4.0 release candidate 1
+
 * Sun Aug 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.15.20090831svn3442
-- r3442: added option for using cmake flags from environment variables
-- Added -DUSE_ENV_FLAGS=ON for using default cmake flags
+- svn snapshot 3442 that includes option for using environment variables
+- Added -DUSE_ENV_FLAGS=ON for using default compiler flags
 
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	31 Aug 2009 20:44:20 -0000	1.6
+++ sources	8 Sep 2009 00:33:15 -0000	1.7
@@ -1 +1 @@
-48e1fd92e1aa24e2cb8c29ef649f35ac  kvirc-20090831svn3442.tar.bz2
+092206ada148236a9e62351c98d59560  kvirc-4.0rc1.tar.bz2



From nucleo at fedoraproject.org  Tue Sep  8 00:35:24 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue,  8 Sep 2009 00:35:24 +0000 (UTC)
Subject: rpms/kvirc/F-10 .cvsignore, 1.6, 1.7 kvirc.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090908003524.7FAC611C00DB@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7986

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
KVIrc 4.0 release candidate 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 21:04:41 -0000	1.6
+++ .cvsignore	8 Sep 2009 00:35:23 -0000	1.7
@@ -1 +1 @@
-kvirc-20090831svn3442.tar.bz2
+kvirc-4.0rc1.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/kvirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kvirc.spec	31 Aug 2009 21:04:41 -0000	1.5
+++ kvirc.spec	8 Sep 2009 00:35:23 -0000	1.6
@@ -1,18 +1,14 @@
-%define           rev 3442
-%define           pre 20090831svn%{rev}
+%define           rev 3462
+%define           pre rc1
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.15.%{pre}%{?dist}
+Release:          0.16.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  svn export -r 3442 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090831svn3442.tar.bz2 kvirc
-Source0:          %{name}-%{pre}.tar.bz2
+Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -27,7 +23,7 @@ and the KVIrc Development Team with the 
 many IRC addicted developers around the world.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-4.0%{pre}
 
 %build
 %{cmake}  \
@@ -75,7 +71,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc doc/FAQ doc/README COPYING
+%doc doc/FAQ doc/README COPYING ChangeLog
 %{_bindir}/%{name}
 %{_libdir}/libkvilib.so.4
 %{_libdir}/libkvilib.so.4.0.0
@@ -130,9 +126,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Tue Sep  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.16.rc1
+- KVIrc 4.0 release candidate 1
+
 * Sun Aug 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.15.20090831svn3442
-- r3442: added option for using cmake flags from environment variables
-- Added -DUSE_ENV_FLAGS=ON for using default cmake flags
+- svn snapshot 3442 that includes option for using environment variables
+- Added -DUSE_ENV_FLAGS=ON for using default compiler flags
 
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	31 Aug 2009 21:04:41 -0000	1.6
+++ sources	8 Sep 2009 00:35:23 -0000	1.7
@@ -1 +1 @@
-48e1fd92e1aa24e2cb8c29ef649f35ac  kvirc-20090831svn3442.tar.bz2
+092206ada148236a9e62351c98d59560  kvirc-4.0rc1.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 00:55:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:55:34 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.103, 1.104 gnome-games.spec,
	1.228, 1.229 sources, 1.108, 1.109
Message-ID: <20090908005534.11DED11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24695

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	14 Aug 2009 22:52:00 -0000	1.103
+++ .cvsignore	8 Sep 2009 00:55:33 -0000	1.104
@@ -1 +1 @@
-gnome-games-2.27.90.tar.bz2
+gnome-games-2.27.92.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- gnome-games.spec	23 Aug 2009 06:02:13 -0000	1.228
+++ gnome-games.spec	8 Sep 2009 00:55:33 -0000	1.229
@@ -45,8 +45,8 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.27.90
-Release: 2%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -55,17 +55,6 @@ Source: http://download.gnome.org/source
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592774
-Patch2: mines-visible-fix.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=574118
-Patch3: mines-redraw-fix.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=592775
-Patch4: mines-cosmetics.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=592776
-Patch5: mines-keys-fix.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=592777
-Patch6: mines-sensitive-fix.patch
-
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
 URL: http://projects.gnome.org/gnome-games/
@@ -144,12 +133,6 @@ This package contains user documentation
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
 
-%patch2 -p1 -b .visible-fix
-%patch3 -p1 -b .redraw-fix
-%patch4 -p1 -b .cosmetics
-%patch5 -p1 -b .keys-fix
-%patch6 -p1 -b .sensitive-fix
-
 sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
   -e 's/GNOMEtris/GnomeFallingBlocks/g' \
   po/*.po gnometris/help/*/*.po gnometris/help/C/gnometris.xml \
@@ -502,6 +485,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
 - Fix various issues in Mines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	14 Aug 2009 22:52:01 -0000	1.108
+++ sources	8 Sep 2009 00:55:33 -0000	1.109
@@ -1 +1 @@
-7b2da877c34ac13009adf64d0f89ba31  gnome-games-2.27.90.tar.bz2
+306b7d85a9b7985fde570e672edb9e3c  gnome-games-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 00:56:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 00:56:29 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.41,
	1.42 gnome-doc-utils.spec, 1.74, 1.75 sources, 1.41, 1.42
Message-ID: <20090908005629.8EB2411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24198

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.17.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	25 Aug 2009 02:13:09 -0000	1.41
+++ .cvsignore	8 Sep 2009 00:56:29 -0000	1.42
@@ -1 +1 @@
-gnome-doc-utils-0.17.4.tar.bz2
+gnome-doc-utils-0.17.5.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- gnome-doc-utils.spec	25 Aug 2009 02:13:09 -0000	1.74
+++ gnome-doc-utils.spec	8 Sep 2009 00:56:29 -0000	1.75
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.17.4
+Version: 0.17.5
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xml/mallard
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 0.17.5-1
+- Update to 0.17.5
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.17.4-1
 - Update to 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	25 Aug 2009 02:13:09 -0000	1.41
+++ sources	8 Sep 2009 00:56:29 -0000	1.42
@@ -1 +1 @@
-708ec43e56a1e07f70bb435d2142dcd2  gnome-doc-utils-0.17.4.tar.bz2
+74060b2e8c35ee1ee4b5b15469afc681  gnome-doc-utils-0.17.5.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 01:00:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 01:00:09 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.95, 1.96 gedit.spec, 1.203,
	1.204 sources, 1.97, 1.98
Message-ID: <20090908010009.3270211C043D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26092

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.27.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	25 Aug 2009 02:23:33 -0000	1.95
+++ .cvsignore	8 Sep 2009 01:00:08 -0000	1.96
@@ -1 +1 @@
-gedit-2.27.5.tar.bz2
+gedit-2.27.6.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- gedit.spec	25 Aug 2009 02:23:33 -0000	1.203
+++ gedit.spec	8 Sep 2009 01:00:08 -0000	1.204
@@ -17,7 +17,7 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.27.5
+Version: 	2.27.6
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.6-1
+- Update to 2.27.6
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	25 Aug 2009 02:23:33 -0000	1.97
+++ sources	8 Sep 2009 01:00:08 -0000	1.98
@@ -1 +1 @@
-f567d96a10490c9bade811b94e855e67  gedit-2.27.5.tar.bz2
+8cdf5f1a8b87f3fab8bf9d878f167f0a  gedit-2.27.6.tar.bz2



From alexlan at fedoraproject.org  Tue Sep  8 01:40:26 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue,  8 Sep 2009 01:40:26 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.86,1.87
Message-ID: <20090908014026.AB2E711C043D@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5032

Modified Files:
	octave-forge.spec 
Log Message:
* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-15
- Re-enable 'fixed' subpackage, builds now, this closes #510841
- ftp, graceplot and spanish packages need fixing upstream, leave
  disabled for the moment



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- octave-forge.spec	7 Sep 2009 21:40:05 -0000	1.86
+++ octave-forge.spec	8 Sep 2009 01:40:26 -0000	1.87
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -66,7 +66,6 @@ Provides: octave-odepkg = 0.6.7
 Provides: octave-optim = 1.0.6
 Provides: octave-optiminterp = 0.3.2
 Provides: octave-outliers = 0.13.9
-# temporarily disable: still not yet ported to Octave 3.2.x
 Provides: octave-parallel = 2.0.1
 Provides: octave-physicalconstants = 0.1.7
 Provides: octave-plot = 1.0.7
@@ -145,11 +144,9 @@ rm extra/windows-*.tar.gz
 rm main/database-*.tar.gz
 # 6. exclude ftp -- SWIG wrappers are broken
 rm main/ftp-*.tar.gz
-# 7. exclude fixed --  doesn't build against Octave 3.2
-rm main/fixed-*.tar.gz
-# 8. exclude graceplot --  doesn't build against Octave 3.2
+# 7. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
-# 9. exclude spanish -- doesn't build against Octave 3.2
+# 8. exclude spanish -- doesn't build against Octave 3.2
 rm language/spanish-*.tar.gz
 
 #Unpack everything
@@ -170,8 +167,7 @@ done
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
-# excluding fixed package
-#patch3 -p0
+%patch3 -p0
 %patch4 -p0
 
 #Install with -nodeps
@@ -246,6 +242,11 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-15
+- Re-enable 'fixed' subpackage, builds now, this closes #510841
+- ftp, graceplot and spanish packages need fixing upstream, leave
+  disabled for the moment
+
 * Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-14
 - Re-enable java subpackage, now building
 - Rebuild against new atlas, fixes the ieee warnings.



From mclasen at fedoraproject.org  Tue Sep  8 01:40:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 01:40:27 +0000 (UTC)
Subject: rpms/yelp/devel .cvsignore, 1.53, 1.54 sources, 1.55, 1.56 yelp.spec,
	1.169, 1.170
Message-ID: <20090908014027.1BC7511C043D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4983

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.27.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	25 Aug 2009 02:56:15 -0000	1.53
+++ .cvsignore	8 Sep 2009 01:40:26 -0000	1.54
@@ -1 +1 @@
-yelp-2.27.4.tar.bz2
+yelp-2.27.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	25 Aug 2009 02:56:15 -0000	1.55
+++ sources	8 Sep 2009 01:40:26 -0000	1.56
@@ -1 +1 @@
-69f50e2396c8806c17147fafc2dd8adf  yelp-2.27.4.tar.bz2
+a8fcac62f492c3ab031dd61fc8e1231c  yelp-2.27.5.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- yelp.spec	25 Aug 2009 03:36:31 -0000	1.169
+++ yelp.spec	8 Sep 2009 01:40:26 -0000	1.170
@@ -18,7 +18,7 @@
 
 Summary: Help browser for the GNOME desktop
 Name: yelp
-Version: 2.27.4
+Version: 2.27.5
 Release: 1%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.27/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
@@ -160,6 +160,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
+- Update to 2.27.5
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
 - Update to 2.27.4
 



From mclasen at fedoraproject.org  Tue Sep  8 01:55:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 01:55:10 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.21, 1.22 hamster-applet.spec,
	1.30, 1.31 sources, 1.21, 1.22
Message-ID: <20090908015510.05D1211C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9697

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	11 Aug 2009 05:08:26 -0000	1.21
+++ .cvsignore	8 Sep 2009 01:55:09 -0000	1.22
@@ -1 +1 @@
-hamster-applet-2.27.90.tar.bz2
+hamster-applet-2.27.92.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- hamster-applet.spec	11 Aug 2009 05:08:26 -0000	1.30
+++ hamster-applet.spec	8 Sep 2009 01:55:09 -0000	1.31
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.27.90
+Version:        2.27.92
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at fredhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at fredhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	11 Aug 2009 05:08:26 -0000	1.21
+++ sources	8 Sep 2009 01:55:09 -0000	1.22
@@ -1 +1 @@
-901d5f7cd7bead6871efea3a4ab2ccd5  hamster-applet-2.27.90.tar.bz2
+166a7f506b5137caa7677763e41ce2f5  hamster-applet-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 02:02:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 02:02:56 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.49, 1.50 sources, 1.49,
	1.50 tomboy.spec, 1.123, 1.124
Message-ID: <20090908020256.E97EA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11779

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.15.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	25 Aug 2009 02:44:12 -0000	1.49
+++ .cvsignore	8 Sep 2009 02:02:56 -0000	1.50
@@ -1 +1 @@
-tomboy-0.15.6.tar.bz2
+tomboy-0.15.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	25 Aug 2009 02:44:12 -0000	1.49
+++ sources	8 Sep 2009 02:02:56 -0000	1.50
@@ -1 +1 @@
-966ee38e413a5ca0a8c27218d3b05763  tomboy-0.15.6.tar.bz2
+9be72244668f4ba5b8f1006139b6d736  tomboy-0.15.7.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- tomboy.spec	25 Aug 2009 02:44:12 -0000	1.123
+++ tomboy.spec	8 Sep 2009 02:02:56 -0000	1.124
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.15.6
+Version:        0.15.7
 Release: 	1%{?dist}
 Summary:        Note-taking application
 
@@ -11,8 +11,6 @@ License:        LGPLv2+ and GPLv2+ and M
 URL:            http://projects.gnome.org/tomboy/
 Source0:        http://download.gnome.org/sources/tomboy/0.15/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=533537
-Patch3:		tomboy-applet-no-sm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,7 +51,6 @@ to develop addins that add new functiona
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper
-%patch3 -p1 -b .applet-no-sm
 
 autoreconf -f -i
 
@@ -140,6 +137,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.7-1
+- Update to 0.15.7
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.6-1
 - Update to 0.15.6
 



From cebbert at fedoraproject.org  Tue Sep  8 02:05:24 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  8 Sep 2009 02:05:24 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc9-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1123, 1.1124 drm-next.patch, 1.14, 1.15 kernel.spec, 1.1767,
	1.1768 sources, 1.1081, 1.1082 upstream, 1.995, 1.996
Message-ID: <20090908020524.F00B011C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12662

Modified Files:
	.cvsignore drm-next.patch kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc9-git1.bz2.sign 
Log Message:
2.6.31-rc9-git1
Temporarily hack the drm-next patch so it still applies; the result
  should still be safe to build.


--- NEW FILE patch-2.6.31-rc9-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKpaHgyGugalF9Dw4RAjG0AJ9iyaDGA/3EWXiq1HbHWX1x/yvNWQCbBJ4A
zDd5W0ppc/RrFYmMcjyoW9M=
=UTVQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1123
retrieving revision 1.1124
diff -u -p -r1.1123 -r1.1124
--- .cvsignore	6 Sep 2009 00:33:32 -0000	1.1123
+++ .cvsignore	8 Sep 2009 02:05:23 -0000	1.1124
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc9.bz2
+patch-2.6.31-rc9-git1.bz2

drm-next.patch:
 drivers/gpu/drm/Makefile               |    2 
 drivers/gpu/drm/drm_crtc.c             |   76 ++-
 drivers/gpu/drm/drm_crtc_helper.c      |   44 +
 drivers/gpu/drm/drm_drv.c              |    4 
 drivers/gpu/drm/drm_edid.c             |   70 ++-
 drivers/gpu/drm/drm_encoder_slave.c    |  116 +++++
 drivers/gpu/drm/drm_modes.c            |  424 ++++++++++++++++++-
 drivers/gpu/drm/drm_sysfs.c            |   28 +
 drivers/gpu/drm/i915/i915_dma.c        |   35 -
 drivers/gpu/drm/i915/intel_lvds.c      |   22 
 drivers/gpu/drm/i915/intel_sdvo.c      |   41 -
 drivers/gpu/drm/radeon/Makefile        |   15 
 drivers/gpu/drm/radeon/mkregtable.c    |  726 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/r300.c          |   45 --
 drivers/gpu/drm/radeon/radeon_object.h |    1 
 drivers/gpu/drm/radeon/radeon_ttm.c    |   33 +
 drivers/gpu/drm/radeon/reg_srcs/r300   |  728 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/reg_srcs/rv515  |  486 ++++++++++++++++++++++
 drivers/gpu/drm/radeon/rv515.c         |   64 --
 drivers/gpu/drm/ttm/ttm_bo.c           |  295 ++++++++-----
 drivers/gpu/drm/ttm/ttm_bo_util.c      |    4 
 drivers/gpu/drm/ttm/ttm_global.c       |    4 
 drivers/gpu/drm/ttm/ttm_memory.c       |  508 +++++++++++++++++++----
 drivers/gpu/drm/ttm/ttm_module.c       |   58 ++
 drivers/gpu/drm/ttm/ttm_tt.c           |   37 -
 include/drm/drmP.h                     |   50 +-
 include/drm/drm_crtc.h                 |   12 
 include/drm/drm_encoder_slave.h        |  162 +++++++
 include/drm/drm_mode.h                 |   11 
 include/drm/drm_sysfs.h                |   12 
 include/drm/ttm/ttm_bo_api.h           |   13 
 include/drm/ttm/ttm_bo_driver.h        |   94 +++-
 include/drm/ttm/ttm_memory.h           |   43 +
 include/drm/ttm/ttm_module.h           |    2 
 34 files changed, 3763 insertions(+), 502 deletions(-)

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- drm-next.patch	25 Aug 2009 00:53:28 -0000	1.14
+++ drm-next.patch	8 Sep 2009 02:05:24 -0000	1.15
@@ -2751,7 +2751,7 @@ index c47579d..482d6b2 100644
 -	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 -	0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF,
 -	0x00000000, 0x00000000, 0x00000000, 0x00000000,
--	0x0003FC01, 0xFFFFFFF8, 0xFE800B19,
+-	0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
 -};
 -
  static int r300_packet0_check(struct radeon_cs_parser *p,
@@ -4131,7 +4131,7 @@ index 31a7f66..60a194f 100644
 -	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 -	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF,
 -	0x00000000, 0x00000000, 0x00000000, 0x00000000,
--	0x0003FC01, 0x3FFFFCF8, 0xFE800B19, 0xFFFFFFFF,
+-	0x0003FC01, 0x3FFFFCF8, 0xFF800B19, 0xFFDFFFFF,
 -	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 -	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 -	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1767
retrieving revision 1.1768
diff -u -p -r1.1767 -r1.1768
--- kernel.spec	6 Sep 2009 00:33:32 -0000	1.1767
+++ kernel.spec	8 Sep 2009 02:05:24 -0000	1.1768
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 9
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -2027,6 +2027,11 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 07 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.205.rc9.git1
+- 2.6.31-rc9-git1
+- Temporarily hack the drm-next patch so it still applies; the result
+  should still be safe to build.
+
 * Sat Sep 05 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.204.rc9
 - 2.6.31-rc9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1081
retrieving revision 1.1082
diff -u -p -r1.1081 -r1.1082
--- sources	6 Sep 2009 00:33:33 -0000	1.1081
+++ sources	8 Sep 2009 02:05:24 -0000	1.1082
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 6bb612cbd006be9bdfaa6ff29ce090ea  patch-2.6.31-rc9.bz2
+157d7877a9425f5effbb4a150121ddd8  patch-2.6.31-rc9-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.995
retrieving revision 1.996
diff -u -p -r1.995 -r1.996
--- upstream	6 Sep 2009 00:33:33 -0000	1.995
+++ upstream	8 Sep 2009 02:05:24 -0000	1.996
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc9.bz2
+patch-2.6.31-rc9-git1.bz2



From mclasen at fedoraproject.org  Tue Sep  8 02:26:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 02:26:02 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.120, 
	1.121
Message-ID: <20090908022602.E7DF711C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18824

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
temporarily drop lefthand patch



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- gnome-settings-daemon.spec	7 Sep 2009 22:33:37 -0000	1.120
+++ gnome-settings-daemon.spec	8 Sep 2009 02:26:02 -0000	1.121
@@ -33,7 +33,7 @@ BuildRequires:  autoconf, automake, libt
 BuildRequires:  fontconfig-devel
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
-Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
+#Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -53,7 +53,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-%patch12 -p1 -b .lefthand-touchpad
+#%patch12 -p1 -b .lefthand-touchpad
 
 autoreconf -i -f
 



From mclasen at fedoraproject.org  Tue Sep  8 02:32:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 02:32:22 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkit-1.1.14-atomic-word.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 webkitgtk.spec,
	1.18, 1.19
Message-ID: <20090908023222.B2DC611C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21854

Modified Files:
	.cvsignore sources webkitgtk.spec 
Added Files:
	webkit-1.1.14-atomic-word.patch 
Log Message:
1.1.14


webkit-1.1.14-atomic-word.patch:
 Platform.h  |    9 ++++++++-
 Threading.h |   14 +++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

--- NEW FILE webkit-1.1.14-atomic-word.patch ---
diff -up webkit-1.1.14/JavaScriptCore/wtf/Platform.h.atomic-word webkit-1.1.14/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.14/JavaScriptCore/wtf/Platform.h.atomic-word	2009-09-04 14:51:45.000000000 -0400
+++ webkit-1.1.14/JavaScriptCore/wtf/Platform.h	2009-09-07 21:52:29.696143904 -0400
@@ -282,9 +282,16 @@
 #endif
 
 /* PLATFORM(SPARC64) */
-#if defined(__sparc64__)
+#if defined(__sparc64__)\
+    || defined(__sparc__) && defined(_arch64__)
 #define WTF_PLATFORM_SPARC64 1
 #define WTF_PLATFORM_BIG_ENDIAN 1
+#else
+/* PLATFORM(SPARC) */
+#if defined(__sparc__)
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
 #endif
 
 /* PLATFORM(WINCE) && PLATFORM(QT)
diff -up webkit-1.1.14/JavaScriptCore/wtf/Threading.h.atomic-word webkit-1.1.14/JavaScriptCore/wtf/Threading.h
--- webkit-1.1.14/JavaScriptCore/wtf/Threading.h.atomic-word	2009-09-04 08:30:57.000000000 -0400
+++ webkit-1.1.14/JavaScriptCore/wtf/Threading.h	2009-09-07 21:59:39.149138812 -0400
@@ -231,14 +231,14 @@ inline int atomicDecrement(int volatile*
 #elif COMPILER(GCC)
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
-inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
-inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
+inline int atomicIncrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
+inline int atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
 
 #endif
 
 class ThreadSafeSharedBase : public Noncopyable {
 public:
-    ThreadSafeSharedBase(int initialRefCount = 1)
+    ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
         : m_refCount(initialRefCount)
     {
     }
@@ -258,12 +258,12 @@ public:
         return refCount() == 1;
     }
 
-    int refCount() const
+    _Atomic_word refCount() const
     {
 #if !USE(LOCKFREE_THREADSAFESHARED)
         MutexLocker locker(m_mutex);
 #endif
-        return static_cast<int const volatile &>(m_refCount);
+        return static_cast<_Atomic_word const volatile &>(m_refCount);
     }
 
 protected:
@@ -290,7 +290,7 @@ private:
     template<class T>
     friend class CrossThreadRefCounted;
 
-    int m_refCount;
+    _Atomic_word m_refCount;
 #if !USE(LOCKFREE_THREADSAFESHARED)
     mutable Mutex m_mutex;
 #endif
@@ -298,7 +298,7 @@ private:
 
 template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
 public:
-    ThreadSafeShared(int initialRefCount = 1)
+    ThreadSafeShared(_Atomic_word initialRefCount = 1)
         : ThreadSafeSharedBase(initialRefCount)
     {
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Aug 2009 13:46:42 -0000	1.9
+++ .cvsignore	8 Sep 2009 02:32:22 -0000	1.10
@@ -1 +1 @@
-webkit-1.1.13.tar.gz
+webkit-1.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	25 Aug 2009 13:46:42 -0000	1.9
+++ sources	8 Sep 2009 02:32:22 -0000	1.10
@@ -1 +1 @@
-627d5ac4b2c7a967e5a5ccb175e459ea  webkit-1.1.13.tar.gz
+bff87d1ddc562223cb99201950d7e138  webkit-1.1.14.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- webkitgtk.spec	25 Aug 2009 13:46:42 -0000	1.18
+++ webkitgtk.spec	8 Sep 2009 02:32:22 -0000	1.19
@@ -34,7 +34,7 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.13
+Version:	1.1.14
 Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
@@ -47,7 +47,7 @@ URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-Patch0: 	webkit-1.1.12-atomic-word.patch
+Patch0: 	webkit-1.1.14-atomic-word.patch
 Patch1: 	webkit-1.1.13-no-execmem.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,11 +59,10 @@ BuildRequires:	flex
 BuildRequires:	geoclue-devel
 BuildRequires:	gettext
 BuildRequires:	gperf
-BuildRequires:	gnome-keyring-devel
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	gtk2-devel
-BuildRequires:	libsoup-devel >= 2.27.4
+BuildRequires:	libsoup-devel >= 2.27.91
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libxslt-devel
@@ -111,11 +110,11 @@ LICENSE, README, and AUTHORS files.
 
 %prep
 %setup -qn "webkit-%{version}"
-%patch0 -p1
+%patch0 -p1 -b .atomic-word
 %patch1 -p1 -b .no-execmem
 
 %build
-%configure							\
+CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
 			--enable-gnomekeyring			\
 			--enable-geolocation			\
 %{?with_3dtransforms:	--enable-3D-transforms		}	\
@@ -124,7 +123,7 @@ LICENSE, README, and AUTHORS files.
 %{?with_pango:		--with-font-backend=pango	}	\
 %{?with_svg:		--enable-svg-filters		}	\
 %{?with_wml:		--enable-wml			}
-	
+
 make %{?_smp_mflags}
 
 
@@ -153,7 +152,7 @@ install -m 755 Programs/GtkLauncher %{bu
 %add_to_doc_files WebKit/gtk/po/README
 
 %add_to_doc_files JavaScriptCore/AUTHORS
-%add_to_doc_files JavaScriptCore/pcre/AUTHORS   
+%add_to_doc_files JavaScriptCore/pcre/AUTHORS
 
 %add_to_doc_files JavaScriptCore/THANKS
 
@@ -189,6 +188,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.14-1
+- Update to 1.1.14
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.13-1
 - Update to 1.1.13
 



From mclasen at fedoraproject.org  Tue Sep  8 02:37:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 02:37:11 +0000 (UTC)
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.29,
	1.30 gnome-user-docs.spec, 1.43, 1.44 sources, 1.29, 1.30
Message-ID: <20090908023711.BD94D11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23321

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.27.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	25 Aug 2009 02:09:25 -0000	1.29
+++ .cvsignore	8 Sep 2009 02:37:11 -0000	1.30
@@ -1 +1 @@
-gnome-user-docs-2.27.1.tar.bz2
+gnome-user-docs-2.27.2.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gnome-user-docs.spec	25 Aug 2009 02:09:25 -0000	1.43
+++ gnome-user-docs.spec	8 Sep 2009 02:37:11 -0000	1.44
@@ -1,6 +1,6 @@
-Summary:        GNOME User Documentation
+ummary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.27.1
+Version:        2.27.2
 Release:	1%{?dist}
 License:        GFDL
 Source:         http://download.gnome.org/sources/gnome-user-docs/2.27/gnome-user-docs-%{version}.tar.bz2
@@ -53,6 +53,9 @@ exit 0
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-1
+- Update to 2.27.2
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.1-1
 - Update to 2.27.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	25 Aug 2009 02:09:25 -0000	1.29
+++ sources	8 Sep 2009 02:37:11 -0000	1.30
@@ -1 +1 @@
-e98cc366e36568c39da66d2e4523fd2e  gnome-user-docs-2.27.1.tar.bz2
+cca915e452ff6ec51215ae4d50ef1bfd  gnome-user-docs-2.27.2.tar.bz2



From elanthis at fedoraproject.org  Tue Sep  8 02:38:20 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Tue,  8 Sep 2009 02:38:20 +0000 (UTC)
Subject: rpms/libtelnet/devel import.log, NONE, 1.1 libtelnet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090908023820.A301611C00DB@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/libtelnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23513/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libtelnet.spec 
Log Message:
* Wed Sep 07 2009 Sean Middleditch <sean at middleditch.us> 0.11-1
Initial commit to Fedora cvs.



--- NEW FILE import.log ---
libtelnet-0_11-1_fc12:HEAD:libtelnet-0.11-1.fc12.src.rpm:1252377332


--- NEW FILE libtelnet.spec ---
Name:		libtelnet
Version:	0.11
Release:	1%{?dist}
Summary:	TELNET protocol parsing framework

Group:		System Environment/Libraries
License:	Public Domain
URL:		http://github.com/elanthis/libtelnet
Source0:	http://cloud.github.com/downloads/elanthis/libtelnet/libtelnet-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: zlib-devel

%description
Small library for parsing the TELNET protocol, responding to TELNET
commands via an event interface, and generating valid TELNET commands.

libtelnet includes support for the non-official MCCP, MCCP2, ZMP, and
MSSP protocols used by MUD servers and clients.

%package devel
Summary: Header files for libtelnet
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header files for developing applications making use of libtelnet.

%package utils
Summary: TELNET utility programs from libtelnet
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}

%description utils
Provides three utilities based on the libtelnet library.
  * telnet-proxy - a TELNET proxy and debugging daemon
  * telnet-client - simple TELNET client
  * telnet-chatd - no-features chat server for testing TELNET clients.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf "$RPM_BUILD_ROOT"
make install INSTALL="install -p" DESTDIR="$RPM_BUILD_ROOT"
rm "$RPM_BUILD_ROOT%{_libdir}"/*.la

%clean
rm -rf "$RPM_BUILD_ROOT"

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*

%files utils 
%defattr(-,root,root,-)
%{_bindir}/*

%changelog
* Wed Aug 31 2009 Sean Middleditch <sean at middleditch.us> 0.11-1
- Update to libtelnet 0.11.
- Add BuildRequires on zlib-devel.
- Added INSTALL='install -p' to install script.
- Renamed -bin subpackage to -utils.
- Added COPYING and NEWS to main package document list.
- Removed document files from subpackages.

* Wed Aug 29 2009 Sean Middleditch <sean at middleditch.us> 0.10-2
- Corrected URL.
- Removed unnecessary Build-Requires.
- Fixed up use of defattr macro.
- Removed use of makeinstall macro.
- Merged the individual utility packages into a single libtelnet-bin package.

* Wed Jul 29 2009 Sean Middleditch <sean at middleditch.us> 0.10-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:09:29 -0000	1.1
+++ .cvsignore	8 Sep 2009 02:38:20 -0000	1.2
@@ -0,0 +1 @@
+libtelnet-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:09:29 -0000	1.1
+++ sources	8 Sep 2009 02:38:20 -0000	1.2
@@ -0,0 +1 @@
+6a0b9f6951f509ff4086b405ab112a30  libtelnet-0.11.tar.gz



From mclasen at fedoraproject.org  Tue Sep  8 02:41:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 02:41:35 +0000 (UTC)
Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.44,1.45
Message-ID: <20090908024135.1307C11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24580

Modified Files:
	gnome-user-docs.spec 
Log Message:
fix spec



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnome-user-docs.spec	8 Sep 2009 02:37:11 -0000	1.44
+++ gnome-user-docs.spec	8 Sep 2009 02:41:34 -0000	1.45
@@ -1,4 +1,4 @@
-ummary:        GNOME User Documentation
+Summary:        GNOME User Documentation
 Name:           gnome-user-docs
 Version:        2.27.2
 Release:	1%{?dist}



From elanthis at fedoraproject.org  Tue Sep  8 02:49:07 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Tue,  8 Sep 2009 02:49:07 +0000 (UTC)
Subject: rpms/libtelnet/F-12 import.log, NONE, 1.1 libtelnet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090908024907.6820A11C00DB@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/libtelnet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26876/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libtelnet.spec 
Log Message:
* Wed Sep 07 2009 Sean Middleditch <sean at middleditch.us> 0.10-1
- Initial import to Fedora CVS.



--- NEW FILE import.log ---
libtelnet-0_11-1_fc12:F-12:libtelnet-0.11-1.fc12.src.rpm:1252378091


--- NEW FILE libtelnet.spec ---
Name:		libtelnet
Version:	0.11
Release:	1%{?dist}
Summary:	TELNET protocol parsing framework

Group:		System Environment/Libraries
License:	Public Domain
URL:		http://github.com/elanthis/libtelnet
Source0:	http://cloud.github.com/downloads/elanthis/libtelnet/libtelnet-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: zlib-devel

%description
Small library for parsing the TELNET protocol, responding to TELNET
commands via an event interface, and generating valid TELNET commands.

libtelnet includes support for the non-official MCCP, MCCP2, ZMP, and
MSSP protocols used by MUD servers and clients.

%package devel
Summary: Header files for libtelnet
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header files for developing applications making use of libtelnet.

%package utils
Summary: TELNET utility programs from libtelnet
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}

%description utils
Provides three utilities based on the libtelnet library.
  * telnet-proxy - a TELNET proxy and debugging daemon
  * telnet-client - simple TELNET client
  * telnet-chatd - no-features chat server for testing TELNET clients.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf "$RPM_BUILD_ROOT"
make install INSTALL="install -p" DESTDIR="$RPM_BUILD_ROOT"
rm "$RPM_BUILD_ROOT%{_libdir}"/*.la

%clean
rm -rf "$RPM_BUILD_ROOT"

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*

%files utils 
%defattr(-,root,root,-)
%{_bindir}/*

%changelog
* Wed Aug 31 2009 Sean Middleditch <sean at middleditch.us> 0.11-1
- Update to libtelnet 0.11.
- Add BuildRequires on zlib-devel.
- Added INSTALL='install -p' to install script.
- Renamed -bin subpackage to -utils.
- Added COPYING and NEWS to main package document list.
- Removed document files from subpackages.

* Wed Aug 29 2009 Sean Middleditch <sean at middleditch.us> 0.10-2
- Corrected URL.
- Removed unnecessary Build-Requires.
- Fixed up use of defattr macro.
- Removed use of makeinstall macro.
- Merged the individual utility packages into a single libtelnet-bin package.

* Wed Jul 29 2009 Sean Middleditch <sean at middleditch.us> 0.10-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:09:29 -0000	1.1
+++ .cvsignore	8 Sep 2009 02:49:07 -0000	1.2
@@ -0,0 +1 @@
+libtelnet-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:09:29 -0000	1.1
+++ sources	8 Sep 2009 02:49:07 -0000	1.2
@@ -0,0 +1 @@
+6a0b9f6951f509ff4086b405ab112a30  libtelnet-0.11.tar.gz



From emoret at fedoraproject.org  Tue Sep  8 03:05:11 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Tue,  8 Sep 2009 03:05:11 +0000 (UTC)
Subject: rpms/alsa-plugins/F-11 maemo.conf, NONE, 1.1 .cvsignore, 1.8,
	1.9 alsa-plugins.spec, 1.22, 1.23 sources, 1.8, 1.9
Message-ID: <20090908030511.64EB711C00DB@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31849

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Added Files:
	maemo.conf 
Log Message:
Updated to 1.0.21
Added maemo subpackage



--- NEW FILE maemo.conf ---
# PCM
pcm.!default {
	type alsa_dsp
	playback_device_file ["/dev/dsptask/pcm2"]
	recording_device_file ["/dev/dsptask/pcm_rec"]
}

# Mixer
ctl.!default {
	type dsp_ctl
	playback_devices ["/dev/dsptask/pcm2"]
	recording_devices ["/dev/dsptask/pcm_rec"]
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Jun 2009 07:17:59 -0000	1.8
+++ .cvsignore	8 Sep 2009 03:05:09 -0000	1.9
@@ -1 +1 @@
-alsa-plugins-1.0.20.tar.bz2
+alsa-plugins-1.0.21.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-11/alsa-plugins.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- alsa-plugins.spec	3 Jul 2009 00:50:10 -0000	1.22
+++ alsa-plugins.spec	8 Sep 2009 03:05:09 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           alsa-plugins
-Version:        1.0.20
+Version:        1.0.21
 Release:        2%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -15,6 +15,7 @@ Source5:        upmix.conf
 Source6:        vdownmix.conf
 Source7:        pulse-default.conf
 Source8:        arcamav.conf
+Source9:        maemo.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -26,7 +27,8 @@ functionality to the Linux operating sys
 This package includes plugins for ALSA.
 
 %package jack
-Requires:       jack-audio-connection-kit, alsa-utils
+Requires:       alsa-utils
+Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -50,7 +52,8 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
-Requires:       pulseaudio, alsa-utils
+Requires:       alsa-utils
+Requires:       pulseaudio
 BuildRequires:  pulseaudio-lib-devel
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
@@ -121,12 +124,24 @@ The rate plugin is an external rate conv
 (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
 pre-processing of a mono stream like denoise using libspeex DSP API.
 
+%package maemo
+BuildRequires:  alsa-lib-devel = %{version}
+BuildRequires:  dbus-devel
+Summary:        Maemo plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description maemo
+This plugin converts the ALSA API over PCM task nodes protocol. In this way,
+ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
 %build
 %configure --disable-static \
-           --with-speex=lib
+           --with-speex=lib \
+           --enable-maemo-plugin \
+           --enable-maemo-resource-manager
 make %{?_smp_mflags}
 
 %install
@@ -134,20 +149,21 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 \
-               %SOURCE3 %SOURCE4 \
-               %SOURCE5 %SOURCE6 \
+install -m 644 %SOURCE1 \
+               %SOURCE2 \
+               %SOURCE3 \
+               %SOURCE4 \
+               %SOURCE5 \
+               %SOURCE6 \
                %SOURCE8 \
+               %SOURCE9 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+# pulseaudio configuration file
 install -m 644 %SOURCE7 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
-# Removing the maemo plugins
-find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
-                        -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \;
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -223,8 +239,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so
 %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
 
+%files maemo
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-maemo
+%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
+%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
+
 
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-2
+- Added missing dbus-devel dependency to maemo subpackage
+
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-1
+- Updated to 1.0.21
+- Patch clean up
+- Added maemo subpackage
+
+* Tue Aug 4 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-5
+- Add a couple of more clean up patches for the pulse plugin
+
+* Fri Jul 31 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-4
+- Add a couple of clean up patches for the pulse plugin
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 24 2009 Eric Moret <eric.moret at gmail.com> - 1.0.20-2
 - Added speex subpackage
 - Removed ascii-art from jack's plugin description


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Jun 2009 07:18:00 -0000	1.8
+++ sources	8 Sep 2009 03:05:09 -0000	1.9
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7  alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01  alsa-plugins-1.0.21.tar.bz2



From emoret at fedoraproject.org  Tue Sep  8 03:14:26 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Tue,  8 Sep 2009 03:14:26 +0000 (UTC)
Subject: rpms/alsa-plugins/F-10 maemo.conf, NONE, 1.1 .cvsignore, 1.7,
	1.8 alsa-plugins.spec, 1.19, 1.20 sources, 1.7, 1.8
Message-ID: <20090908031426.E310911C00DB@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1844

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Added Files:
	maemo.conf 
Log Message:
Updated to 1.0.21



--- NEW FILE maemo.conf ---
# PCM
pcm.!default {
	type alsa_dsp
	playback_device_file ["/dev/dsptask/pcm2"]
	recording_device_file ["/dev/dsptask/pcm_rec"]
}

# Mixer
ctl.!default {
	type dsp_ctl
	playback_devices ["/dev/dsptask/pcm2"]
	recording_devices ["/dev/dsptask/pcm_rec"]
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Dec 2008 07:49:11 -0000	1.7
+++ .cvsignore	8 Sep 2009 03:14:26 -0000	1.8
@@ -1 +1 @@
-alsa-plugins-1.0.18.tar.bz2
+alsa-plugins-1.0.21.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-10/alsa-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- alsa-plugins.spec	29 Dec 2008 09:00:34 -0000	1.19
+++ alsa-plugins.spec	8 Sep 2009 03:14:26 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           alsa-plugins
-Version:        1.0.18
+Version:        1.0.21
 Release:        2%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -9,10 +9,13 @@ URL:            http://www.alsa-project.
 Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
 Source1:        jack.conf
 Source2:        pcm-oss.conf
+Source3:        speex.conf
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
 Source7:        pulse-default.conf
+Source8:        arcamav.conf
+Source9:        maemo.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -24,6 +27,7 @@ functionality to the Linux operating sys
 This package includes plugins for ALSA.
 
 %package jack
+Requires:       alsa-utils
 Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
@@ -33,13 +37,10 @@ License:        LGPLv2+
 This plugin converts the ALSA API over JACK (Jack Audio Connection
 Kit, http://jackit.sf.net) API.  ALSA native applications can work
 transparently together with jackd for both playback and capture.
-
-    ALSA apps (playback) -> ALSA-lib -> JACK plugin -> JACK daemon
-    ALSA apps (capture) <- ALSA-lib <- JACK plugin <- JACK daemon
-
 This plugin provides the PCM type "jack"
 
 %package oss
+Requires:       alsa-utils
 BuildRequires:  alsa-lib-devel
 Summary:        Oss PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -51,8 +52,9 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
-BuildRequires:  pulseaudio-lib-devel
+Requires:       alsa-utils
 Requires:       pulseaudio
+BuildRequires:  pulseaudio-lib-devel
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -63,6 +65,7 @@ sound across a network. There are two pl
 one for mixer control.
 
 %package samplerate
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        External rate converter plugin for ALSA
 Group:          System Environment/Libraries
@@ -72,6 +75,7 @@ This plugin is an external rate converte
 Castro Lopo.
 
 %package upmix
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        Upmixer channel expander plugin for ALSA
 Group:          System Environment/Libraries
@@ -82,6 +86,7 @@ The upmix plugin is an easy-to-use plugi
 by the slave PCM or explicitly via channel option.
 
 %package vdownmix
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        Downmixer to stereo plugin for ALSA
 Group:          System Environment/Libraries
@@ -100,12 +105,43 @@ License:        LGPLv2+
 The usbstream plugin is for snd-usb-us122l driver. It converts PCM
 stream to USB specific stream.
 
+%package arcamav
+Summary:        Arcam AV amplifier plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description arcamav
+This plugin exposes the controls for an Arcam AV amplifier
+(see: http://www.arcam.co.uk/) as an ALSA mixer device.
+
+%package speex
+Requires:       speex
+BuildRequires:  speex-devel
+Summary:        Rate Converter Plugin Using Speex Resampler
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description speex
+The rate plugin is an external rate converter using the Speex resampler
+(aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
+pre-processing of a mono stream like denoise using libspeex DSP API.
+
+%package maemo
+BuildRequires:  alsa-lib-devel = %{version}
+BuildRequires:  dbus-devel
+Summary:        Maemo plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description maemo
+This plugin converts the ALSA API over PCM task nodes protocol. In this way,
+ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
 %build
 %configure --disable-static \
-           --without-speex
+           --with-speex=lib \
+           --enable-maemo-plugin \
+           --enable-maemo-resource-manager
 make %{?_smp_mflags}
 
 %install
@@ -113,18 +149,21 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 \
-               %SOURCE4 %SOURCE5 %SOURCE6 \
-                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+install -m 644 %SOURCE1 \
+               %SOURCE2 \
+               %SOURCE3 \
+               %SOURCE4 \
+               %SOURCE5 \
+               %SOURCE6 \
+               %SOURCE8 \
+               %SOURCE9 \
+               ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+# pulseaudio configuration file
 install -m 644 %SOURCE7 \
-                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
+               ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
-# Removing the maemo plugins
-find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
-                        -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \;
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -135,12 +174,14 @@ rm -rf $RPM_BUILD_ROOT
 %files jack
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-jack
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
 
 %files oss
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-pcm-oss
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
@@ -156,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %files samplerate
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/samplerate.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so
@@ -166,12 +208,14 @@ rm -rf $RPM_BUILD_ROOT
 %files upmix
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/upmix.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
 
 %files vdownmix
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/vdownmix.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
@@ -180,7 +224,63 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYING.GPL
 %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
 
+%files arcamav
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-arcam-av
+%config(noreplace) %{_sysconfdir}/alsa/pcm/arcamav.conf
+%{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so
+
+%files speex
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt
+%config(noreplace) %{_sysconfdir}/alsa/pcm/speex.conf
+%{_libdir}/alsa-lib/libasound_module_pcm_speex.so
+%{_libdir}/alsa-lib/libasound_module_rate_speexrate.so
+%{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so
+%{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
+
+%files maemo
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-maemo
+%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
+%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
+
+
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-2
+- Added missing dbus-devel dependency to maemo subpackage
+
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-1
+- Updated to 1.0.21
+- Patch clean up
+- Added maemo subpackage
+
+* Tue Aug 4 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-5
+- Add a couple of more clean up patches for the pulse plugin
+
+* Fri Jul 31 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-4
+- Add a couple of clean up patches for the pulse plugin
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Eric Moret <eric.moret at gmail.com> - 1.0.20-2
+- Added speex subpackage
+- Removed ascii-art from jack's plugin description
+
+* Fri May 8 2009 Eric Moret <eric.moret at gmail.com> - 1.0.20-1
+- Updated to 1.0.20
+- Added arcam-av subpackage
+
+* Fri Apr 24 2009 Eric Moret <eric.moret at gmail.com> - 1.0.19-1
+- Updated to 1.0.19
+- Added Requires: alsa-utils to address #483322
+- Added dir {_sysconfdir}/alsa/pcm to address #483322
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 28 2008 Eric Moret <eric.moret at gmail.com> - 1.0.18-2
 - Updated to 1.0.18 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Dec 2008 07:49:11 -0000	1.7
+++ sources	8 Sep 2009 03:14:26 -0000	1.8
@@ -1 +1 @@
-4a798b47ba10c17aed66dff234d31b24  alsa-plugins-1.0.18.tar.bz2
+392d016c0948c54978c0505f24271e01  alsa-plugins-1.0.21.tar.bz2



From salimma at fedoraproject.org  Tue Sep  8 03:19:40 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  8 Sep 2009 03:19:40 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.27,1.28
Message-ID: <20090908031940.1BE1111C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3446

Modified Files:
	llvm.spec 
Log Message:
Fix clang-analyzer subpackage



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- llvm.spec	7 Sep 2009 22:44:07 -0000	1.27
+++ llvm.spec	8 Sep 2009 03:19:39 -0000	1.28
@@ -84,6 +84,22 @@ and Objective C++ front-end for the LLVM
 as libraries and designed to be loosely-coupled and extendable.
 
 
+%package clang-analyzer
+Summary:        A source code analysis framework
+License:        NCSA
+Group:          Development/Languages
+Requires:       %{name}-clang = %{version}-%{release}
+# not picked up automatically since files are currently not instaled
+# in standard Python hierarchies yet
+Requires:       python
+
+%description clang-analyzer
+The Clang Static Analyzer consists of both a source code analysis
+framework and a standalone tool that finds bugs in C and Objective-C
+programs. The standalone tool is invoked from the command-line, and is
+intended to run in tandem with a build of a project or code base.
+
+
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %package apidoc
 Summary:        API documentation for LLVM
@@ -181,7 +197,25 @@ make install DESTDIR=%{buildroot} \
 
 # Static analyzer not installed by default:
 # http://clang-analyzer.llvm.org/installation#OtherPlatforms
-cp -p tools/clang/{util/scan-build,tools/scan-view} %{buildroot}%{_bindir}/
+mkdir -p %{buildroot}%{_libdir}/clang-analyzer/libexec
+# link clang-cc for scan-build to find
+ln -s %{_libexecdir}/clang-cc %{buildroot}%{_libdir}/clang-analyzer/libexec/
+# create launchers
+for f in scan-{build,view}; do
+  ln -s %{_libdir}/clang-analyzer/$f %{buildroot}%{_bindir}/$f << EOF
+done
+
+pushd ../tools/clang/utils
+cp -p ccc-analyzer %{buildroot}%{_libdir}/clang-analyzer/libexec/
+
+for f in scan-build scanview.css sorttable.js; do
+  cp -p $f %{buildroot}%{_libdir}/clang-analyzer/
+done
+popd
+
+pushd ../tools/clang/tools/scan-view
+cp -pr * %{buildroot}%{_libdir}/clang-analyzer/
+popd
 
 # Move documentation back to build directory
 # 
@@ -230,6 +264,8 @@ rm -rf %{buildroot}
 %{_bindir}/lli
 %{_bindir}/llvm*
 %{_bindir}/opt
+%exclude %{_mandir}/man1/clang.1.*
+%exclude %{_mandir}/man1/FileCheck.1.*
 %doc %{_mandir}/man1/*.1.gz
 
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
@@ -253,11 +289,18 @@ rm -rf %{buildroot}
 %{_bindir}/clang*
 %{_bindir}/FileCheck
 %{_bindir}/FileUpdate
-%{_bindir}/scan-build
-%{_bindir}/scan-view
 %{_bindir}/tblgen
 %{_libdir}/clang
 %{_libexecdir}/clang-cc
+%doc %{_mandir}/man1/clang.1.*
+%doc %{_mandir}/man1/FileCheck.1.*
+
+
+%files clang-analyzer
+%defattr(-,root,root,-)
+%{_bindir}/scan-build
+%{_bindir}/scan-view
+%{_libdir}/clang-analyzer
 
 %files doc
 %defattr(-,root,root,-)



From mbarnes at fedoraproject.org  Tue Sep  8 03:20:31 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  8 Sep 2009 03:20:31 +0000 (UTC)
Subject: rpms/evolution/devel evolution-kb-override-version.patch, 1.1.2.2, 
	1.1.2.3 evolution.spec, 1.394.2.41, 1.394.2.42
Message-ID: <20090908032031.57C0411C043A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3743

Modified Files:
      Tag: private-mbarnes-kb
	evolution-kb-override-version.patch evolution.spec 
Log Message:

* Mon Sep 07 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.4.fc12
- Further lower the minimum evolution-data-server version.


evolution-kb-override-version.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: evolution-kb-override-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/Attic/evolution-kb-override-version.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.2 -r1.1.2.3
--- evolution-kb-override-version.patch	1 Sep 2009 19:38:01 -0000	1.1.2.2
+++ evolution-kb-override-version.patch	8 Sep 2009 03:20:30 -0000	1.1.2.3
@@ -27,7 +27,7 @@ diff -up evolution-2.29.1-kill-bonobo-f9
  m4_define([glib_minimum_version], [2.20.0])
  m4_define([gtk_minimum_version], [2.16.0])
 -m4_define([eds_minimum_version], [evo_version])
-+m4_define([eds_minimum_version], [2.27.91])
++m4_define([eds_minimum_version], [2.27.1])
  m4_define([gnome_icon_theme_minimum_version], [2.19.91])
  m4_define([gnome_desktop_minimum_version], [2.26.0])
  m4_define([libbonobo_minimum_version], [2.20.3])


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.41
retrieving revision 1.394.2.42
diff -u -p -r1.394.2.41 -r1.394.2.42
--- evolution.spec	4 Sep 2009 22:44:49 -0000	1.394.2.41
+++ evolution.spec	8 Sep 2009 03:20:31 -0000	1.394.2.42
@@ -3,7 +3,7 @@
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.27.91
+%define eds_version 2.27.1
 %define glib2_version 2.16.0
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.3%{?dist}
+Release: 1.kb.4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -679,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Sep 07 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.4.fc12
+- Further lower the minimum evolution-data-server version.
+
 * Fri Sep 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.3.fc12
 - Snapshot of "kill-bonobo" progress at commit 35929a3.
 



From mtasaka at fedoraproject.org  Tue Sep  8 03:33:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  8 Sep 2009 03:33:30 +0000 (UTC)
Subject: rpms/alexandria/F-11
	alexandria-0.6.5-search-result-sanity-check.patch, 1.1,
	1.2 alexandria.spec, 1.39, 1.40
Message-ID: <20090908033330.90F4711C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8635/F-11

Modified Files:
	alexandria-0.6.5-search-result-sanity-check.patch 
	alexandria.spec 
Log Message:
* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Wrong patch of sanity check patch applied on F-10/11, fixing...


alexandria-0.6.5-search-result-sanity-check.patch:
 book_providers.rb |    3 +++
 1 file changed, 3 insertions(+)

Index: alexandria-0.6.5-search-result-sanity-check.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria-0.6.5-search-result-sanity-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-search-result-sanity-check.patch	19 Aug 2009 22:13:59 -0000	1.1
+++ alexandria-0.6.5-search-result-sanity-check.patch	8 Sep 2009 03:33:30 -0000	1.2
@@ -1,13 +1,13 @@
 Index: lib/alexandria/book_providers.rb
 ===================================================================
---- lib/alexandria/book_providers.rb	(revision 1085)
-+++ lib/alexandria/book_providers.rb	(working copy)
+--- lib/alexandria/book_providers.rb	(revision 1086)
++++ lib/alexandria/book_providers.rb	(revision 1087)
 @@ -46,6 +46,9 @@
          self.instance.notify_observers(:searching, factory.fullname) # new
          results = factory.search(criterion, type)
  
 +        # sanity check if at least one valid result is actually found
-+        results.delete_if { |book, cover| ((!book) || (!cover)) }
++        results.delete_if { |book, cover| book.nil? }
 +
          if results.length == 0
            self.instance.changed


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- alexandria.spec	2 Sep 2009 15:05:56 -0000	1.39
+++ alexandria.spec	8 Sep 2009 03:33:30 -0000	1.40
@@ -12,7 +12,7 @@
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}
+Release:	%{rel}%{?dist}.1
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
@@ -219,6 +219,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Wrong patch of sanity check patch applied on F-10/11, fixing...
+
 * Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
 - Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
 



From mtasaka at fedoraproject.org  Tue Sep  8 03:33:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  8 Sep 2009 03:33:30 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria.spec,1.32,1.33
Message-ID: <20090908033330.6424011C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8635/F-10

Modified Files:
	alexandria.spec 
Log Message:
* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Wrong patch of sanity check patch applied on F-10/11, fixing...



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- alexandria.spec	2 Sep 2009 15:05:56 -0000	1.32
+++ alexandria.spec	8 Sep 2009 03:33:30 -0000	1.33
@@ -12,7 +12,7 @@
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}
+Release:	%{rel}%{?dist}.1
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
@@ -219,6 +219,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Wrong patch of sanity check patch applied on F-10/11, fixing...
+
 * Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
 - Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
 



From airlied at fedoraproject.org  Tue Sep  8 03:38:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 03:38:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.30, 1.31 sources, 1.30,
	1.31 xorg-x11-drv-ati.spec, 1.184,
	1.185 radeon-6.13-dri2-init.patch, 1.1, NONE
Message-ID: <20090908033852.B518F11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10263

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Removed Files:
	radeon-6.13-dri2-init.patch 
Log Message:
* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.3.20090908git651fe5a47
- New snapshot with r600 kms support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	21 Aug 2009 03:29:10 -0000	1.30
+++ .cvsignore	8 Sep 2009 03:38:52 -0000	1.31
@@ -1 +1 @@
-xf86-video-ati-20090821.tar.xz
+xf86-video-ati-20090908.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	21 Aug 2009 03:29:11 -0000	1.30
+++ sources	8 Sep 2009 03:38:52 -0000	1.31
@@ -1 +1 @@
-b2b452333f35258394111e57b5db90b6  xf86-video-ati-20090821.tar.xz
+673b162543e819092e15cc3aa9648aae  xf86-video-ati-20090908.tar.xz


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- xorg-x11-drv-ati.spec	21 Aug 2009 18:34:03 -0000	1.184
+++ xorg-x11-drv-ati.spec	8 Sep 2009 03:38:52 -0000	1.185
@@ -1,13 +1,13 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20090821
-%define gitversion b1b77a4d6
+%define gitdate 20090908
+%define gitversion 651fe5a47
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.2.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.3.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,7 +21,6 @@ Source1:    mkxinf
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
-Patch14:    radeon-6.13-dri2-init.patch
 
 ExcludeArch: s390 s390x
 
@@ -48,7 +47,6 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
-%patch14 -p1 -b .dri2-init
 
 %build
 autoreconf -iv
@@ -82,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.3.20090908git651fe5a47
+- New snapshot with r600 kms support
+
 * Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 6.13.0-0.2.20090821gitb1b77a4d6
 - radeon-6.13-dri2-init.patch: Fix DRI2 init.
 


--- radeon-6.13-dri2-init.patch DELETED ---



From salimma at fedoraproject.org  Tue Sep  8 03:42:40 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  8 Sep 2009 03:42:40 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.28,1.29
Message-ID: <20090908034240.1245511C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11360

Modified Files:
	llvm.spec 
Log Message:
Fix typo



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- llvm.spec	8 Sep 2009 03:19:39 -0000	1.28
+++ llvm.spec	8 Sep 2009 03:42:39 -0000	1.29
@@ -202,7 +202,7 @@ mkdir -p %{buildroot}%{_libdir}/clang-an
 ln -s %{_libexecdir}/clang-cc %{buildroot}%{_libdir}/clang-analyzer/libexec/
 # create launchers
 for f in scan-{build,view}; do
-  ln -s %{_libdir}/clang-analyzer/$f %{buildroot}%{_bindir}/$f << EOF
+  ln -s %{_libdir}/clang-analyzer/$f %{buildroot}%{_bindir}/$f
 done
 
 pushd ../tools/clang/utils



From airlied at fedoraproject.org  Tue Sep  8 03:47:18 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 03:47:18 +0000 (UTC)
Subject: rpms/kernel/devel drm-next.patch, 1.15, 1.16 drm-page-flip.patch,
	1.4, 
	1.5 kernel.spec, 1.1768, 1.1769 drm-ddc-caching-bug.patch, 1.1,
	NONE drm-god-shut-up-about-edid-already.patch, 1.1,
	NONE drm-r600-kms.patch, 1.4, NONE drm-rv710-ucode-fix.patch,
	1.1, NONE
Message-ID: <20090908034718.14C4D11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13348

Modified Files:
	drm-next.patch drm-page-flip.patch kernel.spec 
Removed Files:
	drm-ddc-caching-bug.patch 
	drm-god-shut-up-about-edid-already.patch drm-r600-kms.patch 
	drm-rv710-ucode-fix.patch 
Log Message:
* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.206.rc9.git1
- drm: rebase to drm-next - r600 accel + kms should start working now


drm-next.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   77 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  220 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  504 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  701 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  435 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  737 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  100 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1047 
 b/drivers/gpu/drm/radeon/r100_track.h             |  124 
 b/drivers/gpu/drm/radeon/r100d.h                  |   76 
 b/drivers/gpu/drm/radeon/r200.c                   |  456 
 b/drivers/gpu/drm/radeon/r300.c                   |  411 
 b/drivers/gpu/drm/radeon/r300d.h                  |   76 
 b/drivers/gpu/drm/radeon/r600.c                   | 1714 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  855 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  777 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  658 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  126 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  159 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |   79 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  215 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  128 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  340 
 b/drivers/gpu/drm/radeon/radeon_display.c         |   18 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   21 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  146 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  115 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  670 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   54 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   44 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  339 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   52 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  119 
 b/drivers/gpu/drm/radeon/radeon_share.h           |   77 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   18 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |    2 
 b/drivers/gpu/drm/radeon/rs600.c                  |   60 
 b/drivers/gpu/drm/radeon/rs690.c                  |    1 
 b/drivers/gpu/drm/radeon/rv515.c                  |  518 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  |  987 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   16 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |   82 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 154 files changed, 33671 insertions(+), 41498 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.15 -r 1.16 drm-next.patchIndex: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- drm-next.patch	8 Sep 2009 02:05:24 -0000	1.15
+++ drm-next.patch	8 Sep 2009 03:47:16 -0000	1.16
@@ -1,393 +1,154 @@
-commit 50f153036c9d9e4ae1768d5ca9c2ad4184f7a0b7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 21 13:21:01 2009 +1000
-
-    drm/radeon/kms: generate the safe register tables.
-    
-    Previously we just made these offline and included them,
-    but no reason we can't generate them at build time.
-    
-    TODO: add rs690 + r100/r200 when done.
-    should we do rs480/rs690 no tcl version?
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 759e4f83f418f4001e724042b4c0e408d615d9ec
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Thu Aug 20 10:29:09 2009 +0200
-
-    drm/ttm: Fixes for "Memory accounting rework."
-    
-    ttm:
-    Fix error paths when kobject_add returns an error.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Thu Aug 20 10:29:08 2009 +0200
-
-    drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
-    
-    ttm:
-    Remove a stray debug printout.
-    Remove a re-init of the lru spinlock at device init.
-    
-    radeon:
-    Fix the size of the bo_global allocation.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 51c8b4071d84d46cc100baa5931ad06b2a823c95
-Merge: a987fca... 6c30c53...
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 20 13:38:04 2009 +1000
-
-    Merge Linus master to drm-next
-    
-    linux-next conflict reported needed resolution.
-    
-    Conflicts:
-    	drivers/gpu/drm/drm_crtc.c
-    	drivers/gpu/drm/drm_edid.c
-    	drivers/gpu/drm/i915/intel_sdvo.c
-    	drivers/gpu/drm/radeon/radeon_ttm.c
-    	drivers/gpu/drm/ttm/ttm_bo.c
-
-commit a987fcaa805fcb24ba885c2e29fd4fdb6816f08f
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Tue Aug 18 16:51:56 2009 +0200
-
-    ttm: Make parts of a struct ttm_bo_device global.
-    
-    Common resources, like memory accounting and swap lists should be
-    global and not per device. Introduce a struct ttm_bo_global to
-    accomodate this, and register it with sysfs. Add a small sysfs interface
-    to return the number of active buffer objects.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit 5fd9cbad3a4ae82c83c55b9c621d156c326724ef
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Mon Aug 17 16:28:39 2009 +0200
-
-    drm/ttm: Memory accounting rework.
-    
-    Use inclusive zones to simplify accounting and its sysfs representation.
-    Use DMA32 accounting where applicable.
-    
-    Add a sysfs interface to make the heuristically determined limits
-    readable and configurable.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit e9840be8c23601285a70520b4898818f28ce8c2b
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Tue Aug 18 10:27:57 2009 +0200
-
-    drm/ttm: Add a virtual ttm sysfs device.
-    
-    The device directory will be the base directory of the
-    sysfs representation of other ttm subsystems.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit 327c225bd548bf7871f116a0baa5ebdac884e452
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Mon Aug 17 16:28:37 2009 +0200
-
-    drm: Enable drm drivers to add drm sysfs devices.
-    
-    Export utility functions for drivers to add specialized devices in the
-    sysfs drm class subdirectory.
-    
-    Initially this will be needed form TTM to add a virtual device that
-    handles power management.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit a0724fcf829e5afb66159ef68cb16a805ea11b42
-Author: Pekka Paalanen <pq at iki.fi>
-Date:   Mon Aug 17 01:18:38 2009 +0300
-
-    drm/ttm: optimize bo_kmap_type values
-    
-    A micro-optimization on the function ttm_kmap_obj_virtual().
-    
-    By defining the values of enum ttm_bo_kmap_obj::bo_kmap_type to have a
-    bit indicating iomem, size of the function ttm_kmap_obj_virtual() will be
-    reduced by 16 bytes on x86_64 (gcc 4.1.2).
-    
-    ttm_kmap_obj_virtual() may be heavily used, when buffer objects are
-    accessed via wrappers, that work for both kinds of memory addresses:
-    iomem cookies and kernel virtual.
-    
-    Signed-off-by: Pekka Paalanen <pq at iki.fi>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 949ef70e2d1a5c12178875f513df34fc85d91a38
-Author: Pekka Paalanen <pq at iki.fi>
-Date:   Mon Aug 17 19:49:19 2009 +0300
-
-    drm/kms: no need to return void value (encoder)
-    
-    Cc: Francisco Jerez <currojerez at riseup.net>
-    Signed-off-by: Pekka Paalanen <pq at iki.fi>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 53bd83899f5ba6b0da8f5ef976129273854a72d4
-Author: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date:   Wed Jul 1 10:04:40 2009 -0700
-
-    drm: clarify scaling property names
-    
-    Now that we're using the scaling property in the Intel driver I noticed
-    that the names were a bit confusing.  I've corrected them according to
-    our discussion on IRC and the mailing list, though I've left out
-    potential new additions for a new scaling property with an integer (or
-    two) for the scaling factor.  None of the drivers implement that today,
-    but if someone wants to do it, I think it could be done with the
-    addition of a single new type and a new property to describe the
-    scaling factor in the X and Y directions.
-    
-    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-    Acked-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 776f3360de6ed246e973577828f725681120fd7a
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Wed Aug 19 15:56:37 2009 +1000
-
-    drm: fixup includes in encoder slave header files.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 453a7d46dca88704ed88b364c445ff55680a8557
-Author: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date:   Wed Aug 19 15:51:55 2009 +1000
-
-    drm: remove root requirement from DRM_IOCTL_SET_VERSION (+ DRM_IOCTL_AUTH_MAGIC)
-    
-    Just a DRM_MASTER flag is sufficient here, though maybe this call is
-    totally deprecated anyway (xf86-video-intel still calls it though).
-    
-    (airlied: drop ioctl auth_magic as discussed on mailing list also)
-    
-    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit cfcf4738cd6b5d7bed1473acad76d6430cf1fb0a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 13 13:31:54 2009 +1000
-
-    drm: fixup include file in drm_encoder_slave
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
[...78299 lines suppressed...]
++ * of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
++ * USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ *
++ **************************************************************************/
++/*
++ * Authors:
++ * Dave Airlie <airlied at redhat.com>
++ */
++
++#ifndef _DRM_CACHE_H_
++#define _DRM_CACHE_H_
++
++void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
++
++#endif
 diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
-index 7300fb8..db92a83 100644
+index 7300fb8..ae1e9e1 100644
 --- a/include/drm/drm_crtc.h
 +++ b/include/drm/drm_crtc.h
-@@ -572,6 +572,12 @@ struct drm_mode_config {
+@@ -259,6 +259,8 @@ struct drm_framebuffer {
+ 	void *fbdev;
+ 	u32 pseudo_palette[17];
+ 	struct list_head filp_head;
++	/* if you are using the helper */
++	void *helper_private;
+ };
+ 
+ struct drm_property_blob {
+@@ -572,6 +574,12 @@ struct drm_mode_config {
  	struct drm_property *tv_right_margin_property;
  	struct drm_property *tv_top_margin_property;
  	struct drm_property *tv_bottom_margin_property;
@@ -5844,7 +80603,7 @@ index 7300fb8..db92a83 100644
  
  	/* Optional properties */
  	struct drm_property *scaling_mode_property;
-@@ -736,4 +742,10 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+@@ -736,4 +744,12 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
@@ -5854,7 +80613,30 @@ index 7300fb8..db92a83 100644
 +extern struct drm_display_mode *drm_gtf_mode(struct drm_device *dev,
 +				int hdisplay, int vdisplay, int vrefresh,
 +				bool interlaced, int margins);
++extern int drm_add_modes_noedid(struct drm_connector *connector,
++				int hdisplay, int vdisplay);
  #endif /* __DRM_CRTC_H__ */
+diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
+index 6769ff6..4c8daca 100644
+--- a/include/drm/drm_crtc_helper.h
++++ b/include/drm/drm_crtc_helper.h
+@@ -79,6 +79,8 @@ struct drm_encoder_helper_funcs {
+ 	/* detect for DAC style encoders */
+ 	enum drm_connector_status (*detect)(struct drm_encoder *encoder,
+ 					    struct drm_connector *connector);
++	/* disable encoder when not in use - more explicit than dpms off */
++	void (*disable)(struct drm_encoder *encoder);
+ };
+ 
+ struct drm_connector_helper_funcs {
+@@ -98,6 +100,7 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+ 				     int x, int y,
+ 				     struct drm_framebuffer *old_fb);
+ extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
++extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
+ 
+ extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode);
+ 
 diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h
 new file mode 100644
 index 0000000..2f65633
@@ -6023,6 +80805,117 @@ index 0000000..2f65633
 +void drm_i2c_encoder_destroy(struct drm_encoder *encoder);
 +
 +#endif
+diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
+new file mode 100644
+index 0000000..88fffbd
+--- /dev/null
++++ b/include/drm/drm_fb_helper.h
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2006-2009 Red Hat Inc.
++ * Copyright (c) 2006-2008 Intel Corporation
++ * Copyright (c) 2007 Dave Airlie <airlied at linux.ie>
++ *
++ * DRM framebuffer helper functions
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that copyright
++ * notice and this permission notice appear in supporting documentation, and
++ * that the name of the copyright holders not be used in advertising or
++ * publicity pertaining to distribution of the software without specific,
++ * written prior permission.  The copyright holders make no representations
++ * about the suitability of this software for any purpose.  It is provided "as
++ * is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++ * OF THIS SOFTWARE.
++ *
++ * Authors:
++ *      Dave Airlie <airlied at linux.ie>
++ *      Jesse Barnes <jesse.barnes at intel.com>
++ */
++#ifndef DRM_FB_HELPER_H
++#define DRM_FB_HELPER_H
++
++struct drm_fb_helper_crtc {
++	uint32_t crtc_id;
++	struct drm_mode_set mode_set;
++};
++
++struct drm_fb_helper_funcs {
++	void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
++			  u16 blue, int regno);
++};
++
++struct drm_fb_helper {
++	struct drm_framebuffer *fb;
++	struct drm_device *dev;
++	struct drm_display_mode *mode;
++	int crtc_count;
++	struct drm_fb_helper_crtc *crtc_info;
++	struct drm_fb_helper_funcs *funcs;
++	int conn_limit;
++	struct list_head kernel_fb_list;
++};
++
++int drm_fb_helper_single_fb_probe(struct drm_device *dev,
++				  int (*fb_create)(struct drm_device *dev,
++						   uint32_t fb_width,
++						   uint32_t fb_height,
++						   uint32_t surface_width,
++						   uint32_t surface_height,
++						   struct drm_framebuffer **fb_ptr));
++int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count,
++				  int max_conn);
++void drm_fb_helper_free(struct drm_fb_helper *helper);
++int drm_fb_helper_blank(int blank, struct fb_info *info);
++int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
++			      struct fb_info *info);
++int drm_fb_helper_set_par(struct fb_info *info);
++int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
++			    struct fb_info *info);
++int drm_fb_helper_setcolreg(unsigned regno,
++			    unsigned red,
++			    unsigned green,
++			    unsigned blue,
++			    unsigned transp,
++			    struct fb_info *info);
++
++void drm_fb_helper_restore(void);
++void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
++			    uint32_t fb_width, uint32_t fb_height);
++void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch);
++
++#endif
+diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
+index f833207..62329f9 100644
+--- a/include/drm/drm_mm.h
++++ b/include/drm/drm_mm.h
+@@ -37,6 +37,9 @@
+  * Generic range manager structs
+  */
+ #include <linux/list.h>
++#ifdef CONFIG_DEBUG_FS
++#include <linux/seq_file.h>
++#endif
+ 
+ struct drm_mm_node {
+ 	struct list_head fl_entry;
+@@ -96,4 +99,8 @@ static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block)
+ 	return block->mm;
+ }
+ 
++#ifdef CONFIG_DEBUG_FS
++int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm);
++#endif
++
+ #endif
 diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
 index ae304cc..1f90841 100644
 --- a/include/drm/drm_mode.h

drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                            |  169 +++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                     |   12 +
 b/drivers/gpu/drm/drm_drv.c                             |    1 
 b/drivers/gpu/drm/drm_fops.c                            |   68 ++++++
 b/drivers/gpu/drm/drm_irq.c                             |   43 ++++
 b/drivers/gpu/drm/i915/i915_drv.c                       |    1 
 b/drivers/gpu/drm/i915/intel_display.c                  |   26 +-
 b/drivers/gpu/drm/radeon/radeon_display.c               |    3 
 b/include/drm/drm.h                                     |   25 ++
 b/include/drm/drmP.h                                    |   32 +++
 b/include/drm/drm_crtc.h                                |   27 ++
 b/include/drm/drm_crtc_helper.h                         |    4 
 b/include/drm/drm_mode.h                                |   16 +
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 15 files changed, 415 insertions(+), 16 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drm-page-flip.patch	25 Aug 2009 00:53:29 -0000	1.4
+++ drm-page-flip.patch	8 Sep 2009 03:47:17 -0000	1.5
@@ -1,6 +1,7 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c	2009-08-25 09:52:41.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index ba728ad..4b7e748 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
 @@ -34,6 +34,8 @@
  #include "drmP.h"
  #include "drm_crtc.h"
@@ -10,7 +11,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  struct drm_prop_enum_list {
  	int type;
  	char *name;
-@@ -329,6 +331,34 @@ void drm_framebuffer_cleanup(struct drm_
+@@ -330,6 +332,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
  EXPORT_SYMBOL(drm_framebuffer_cleanup);
  
  /**
@@ -45,7 +46,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
   * drm_crtc_init - Initialise a new CRTC object
   * @dev: DRM device
   * @crtc: CRTC object to init
-@@ -339,17 +369,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
+@@ -340,17 +370,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
   *
   * Inits a new object created as base part of an driver crtc object.
   */
@@ -66,7 +67,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_crtc_init);
-@@ -368,6 +400,9 @@ void drm_crtc_cleanup(struct drm_crtc *c
+@@ -369,6 +401,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
  {
  	struct drm_device *dev = crtc->dev;
  
@@ -76,7 +77,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (crtc->gamma_store) {
  		kfree(crtc->gamma_store);
  		crtc->gamma_store = NULL;
-@@ -375,6 +410,7 @@ void drm_crtc_cleanup(struct drm_crtc *c
+@@ -376,6 +411,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
  
  	drm_mode_object_put(dev, &crtc->base);
  	list_del(&crtc->head);
@@ -84,7 +85,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->mode_config.num_crtc--;
  }
  EXPORT_SYMBOL(drm_crtc_cleanup);
-@@ -2478,3 +2514,134 @@ out:
+@@ -2479,3 +2515,134 @@ out:
  	mutex_unlock(&dev->mode_config.mutex);
  	return ret;
  }
@@ -219,10 +220,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +
 +	return ret;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-08-25 09:52:41.000000000 +1000
-@@ -874,8 +874,10 @@ int drm_crtc_helper_set_config(struct dr
+diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
+index ff447f1..fec66f9 100644
+--- a/drivers/gpu/drm/drm_crtc_helper.c
++++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -872,8 +872,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
  		old_fb = set->crtc->fb;
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
@@ -231,9 +233,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  						set->x, set->y, old_fb);
 +		mutex_unlock(&dev->struct_mutex);
  		if (ret != 0)
- 		    goto fail_set_mode;
+ 			goto fail;
  	}
-@@ -1101,3 +1103,13 @@ int drm_helper_resume_force_mode(struct 
+@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -247,10 +249,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 +}
 +EXPORT_SYMBOL(drm_crtc_helper_set_base);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c	2009-08-25 09:52:41.000000000 +1000
-@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[
+diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
+index a75ca63..672f473 100644
+--- a/drivers/gpu/drm/drm_drv.c
++++ b/drivers/gpu/drm/drm_drv.c
+@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
@@ -258,10 +261,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c	2009-08-25 09:52:41.000000000 +1000
-@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode 
+diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
+index 251bc0e..dcd9c66 100644
+--- a/drivers/gpu/drm/drm_fops.c
++++ b/drivers/gpu/drm/drm_fops.c
+@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
  
  	INIT_LIST_HEAD(&priv->lhead);
  	INIT_LIST_HEAD(&priv->fbs);
@@ -270,7 +274,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
-@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, str
+@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
  {
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev = file_priv->minor->dev;
@@ -280,7 +284,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	int retcode = 0;
  
  	lock_kernel();
-@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, str
+@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
  	if (file_priv->minor->master)
  		drm_master_release(dev, filp);
  
@@ -300,7 +304,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_release(dev, file_priv);
  
-@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, str
+@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
  }
  EXPORT_SYMBOL(drm_release);
  
@@ -358,9 +362,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	return mask;
  }
  EXPORT_SYMBOL(drm_poll);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:52:41.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index f85aaf2..2fe0be4 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
 @@ -34,6 +34,7 @@
   */
  
@@ -369,7 +374,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  #include <linux/interrupt.h>	/* For task queue support */
  
-@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *
+@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
  	return 0;
  }
  
@@ -414,7 +419,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static void vblank_disable_fn(unsigned long arg)
  {
  	struct drm_device *dev = (struct drm_device *)arg;
-@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *d
+@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
  		atomic_set(&dev->vblank_refcount[i], 0);
  	}
  
@@ -423,7 +428,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->vblank_disable_allowed = 0;
  
  	return 0;
-@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device
+@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
  {
  	atomic_inc(&dev->_vblank_count[crtc]);
  	DRM_WAKEUP(&dev->vbl_queue[crtc]);
@@ -431,10 +436,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  }
  EXPORT_SYMBOL(drm_handle_vblank);
 +
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-08-25 09:52:41.000000000 +1000
-@@ -203,6 +203,7 @@ static struct drm_driver driver = {
+diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
+index dbe568c..b81305e 100644
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -206,6 +206,7 @@ static struct drm_driver driver = {
  		 .mmap = drm_gem_mmap,
  		 .poll = drm_poll,
  		 .fasync = drm_fasync,
@@ -442,10 +448,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #ifdef CONFIG_COMPAT
  		 .compat_ioctl = i915_compat_ioctl,
  #endif
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:52:41.000000000 +1000
-@@ -917,6 +917,8 @@ intel_pipe_set_base(struct drm_crtc *crt
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 155719f..0d6e677 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -973,6 +973,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	u32 dspcntr, alignment;
  	int ret;
  
@@ -454,7 +461,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	/* no fb bound */
  	if (!crtc->fb) {
  		DRM_DEBUG("No FB bound\n");
-@@ -952,17 +954,14 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1008,17 +1010,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		BUG();
  	}
  
@@ -472,7 +479,15 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		return ret;
  	}
  
-@@ -998,7 +997,6 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1029,7 +1028,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+ 		ret = i915_gem_object_get_fence_reg(obj);
+ 		if (ret != 0) {
+ 			i915_gem_object_unpin(obj);
+-			mutex_unlock(&dev->struct_mutex);
+ 			return ret;
+ 		}
+ 	}
+@@ -1054,7 +1052,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	default:
  		DRM_ERROR("Unknown color depth\n");
  		i915_gem_object_unpin(obj);
@@ -480,7 +495,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		return -EINVAL;
  	}
  	if (IS_I965G(dev)) {
-@@ -1026,13 +1024,11 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1086,17 +1083,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		I915_READ(dspbase);
  	}
  
@@ -488,14 +503,18 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 -
  	if (old_fb) {
  		intel_fb = to_intel_framebuffer(old_fb);
+ 		obj_priv = intel_fb->obj->driver_private;
 +		intel_wait_for_vblank(dev);
  		i915_gem_object_unpin(intel_fb->obj);
  	}
--	mutex_unlock(&dev->struct_mutex);
+ 	intel_increase_pllclock(crtc, true);
  
+-	mutex_unlock(&dev->struct_mutex);
+-
  	if (!dev->primary->master)
  		return 0;
-@@ -2605,7 +2601,9 @@ static int intel_crtc_mode_set(struct dr
+ 
+@@ -2732,7 +2726,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  	I915_WRITE(dspcntr_reg, dspcntr);
  
  	/* Flush the plane changes */
@@ -505,7 +524,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	intel_update_watermarks(dev);
  
-@@ -3081,6 +3079,7 @@ static const struct drm_crtc_funcs intel
+@@ -3521,6 +3517,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
  	.gamma_set = intel_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = intel_crtc_destroy,
@@ -513,7 +532,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  
-@@ -3093,7 +3092,7 @@ static void intel_crtc_init(struct drm_d
+@@ -3533,7 +3530,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
  	if (intel_crtc == NULL)
  		return;
  
@@ -522,7 +541,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
  	intel_crtc->pipe = pipe;
-@@ -3327,9 +3326,18 @@ static int intel_user_framebuffer_create
+@@ -3717,9 +3714,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
  	return drm_gem_handle_create(file_priv, object, handle);
  }
  
@@ -541,34 +560,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-08-25 09:52:41.000000000 +1000
-@@ -1122,7 +1122,7 @@ nv04_crtc_create(struct drm_device *dev,
- 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
- 	nv_crtc->mode_set.num_connectors = 0;
- 
--	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
-+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
- 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
- 
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-08-25 09:52:41.000000000 +1000
-@@ -810,7 +810,7 @@ nv50_crtc_create(struct drm_device *dev,
- 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
- 	crtc->mode_set.num_connectors = 0;
- 
--	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
-+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
- 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
- 
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf	2009-08-25 09:35:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c	2009-08-25 09:52:41.000000000 +1000
-@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeo
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index 9d817a6..6f2dabf 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -168,6 +168,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
@@ -576,7 +572,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
-@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_
+@@ -180,7 +181,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
  	if (radeon_crtc == NULL)
  		return;
  
@@ -585,21 +581,131 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
  	radeon_crtc->crtc_id = index;
-diff -up linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf linux-2.6.30.noarch/include/drm/drm_crtc_helper.h
---- linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_crtc_helper.h	2009-08-25 09:52:41.000000000 +1000
-@@ -123,4 +123,8 @@ static inline void drm_connector_helper_
- }
+diff --git a/include/drm/drm.h b/include/drm/drm.h
+index 7cb50bd..1920323 100644
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -686,6 +686,7 @@ struct drm_gem_open {
+ #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
++#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
  
- extern int drm_helper_resume_force_mode(struct drm_device *dev);
+ /**
+  * Device specific ioctls should only be in their respective headers
+@@ -698,6 +699,30 @@ struct drm_gem_open {
+ #define DRM_COMMAND_BASE                0x40
+ #define DRM_COMMAND_END			0xA0
+ 
++/**
++ * Header for events written back to userspace on the drm fd.  The
++ * type defines the type of event, the length specifies the total
++ * length of the event (including the header), and user_data is
++ * typically a 64 bit value passed with the ioctl that triggered the
++ * event.  A read on the drm fd will always only return complete
++ * events, that is, if for example the read buffer is 100 bytes, and
++ * there are two 64 byte events pending, only one will be returned.
++ */
++struct drm_event {
++	__u32 type;
++	__u32 length;
++};
 +
-+extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
-+				    struct drm_framebuffer *old_fb);
++#define DRM_EVENT_MODE_PAGE_FLIP 0x01
 +
- #endif
-diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.pf linux-2.6.30.noarch/include/drm/drm_crtc.h
---- linux-2.6.30.noarch/include/drm/drm_crtc.h.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-08-25 09:52:41.000000000 +1000
++struct drm_event_page_flip {
++	struct drm_event base;
++	__u64 user_data;
++	__u32 tv_sec;
++	__u32 tv_usec;
++	__u32 frame;
++};
++
+ /* typedef area */
+ #ifndef __KERNEL__
+ typedef struct drm_clip_rect drm_clip_rect_t;
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index eeefb63..5431888 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -426,6 +426,14 @@ struct drm_buf_entry {
+ 	struct drm_freelist freelist;
+ };
+ 
++/* Event queued up for userspace to read */
++struct drm_pending_event {
++	struct drm_event *event;
++	struct list_head link;
++	struct drm_file *file_priv;
++	void (*destroy) (struct drm_pending_event *event);
++};
++
+ /** File private data */
+ struct drm_file {
+ 	int authenticated;
+@@ -449,6 +457,9 @@ struct drm_file {
+ 	struct drm_master *master; /* master this node is currently associated with
+ 				      N.B. not always minor->master */
+ 	struct list_head fbs;
++
++	wait_queue_head_t event_wait;
++	struct list_head event_list;
+ };
+ 
+ /** Wait queue */
+@@ -897,6 +908,16 @@ struct drm_minor {
+ 	struct drm_mode_group mode_group;
+ };
+ 
++struct drm_pending_flip {
++	struct drm_pending_event pending_event;
++	struct drm_framebuffer *old_fb;
++	struct drm_crtc *crtc;
++	u32 frame;
++	int pipe;
++	struct list_head link;
++	struct drm_event_page_flip event;
++};
++
+ /**
+  * DRM device structure. This structure represent a complete card that
+  * may contain multiple heads.
+@@ -996,6 +1017,13 @@ struct drm_device {
+ 
+ 	u32 max_vblank_count;           /**< size of vblank counter register */
+ 
++	struct work_struct flip_work;
++
++	/**
++	 * List of objects waiting on flip completion
++	 */
++	struct list_head flip_list;
++
+ 	/*@} */
+ 	cycles_t ctx_start;
+ 	cycles_t lck_start;
+@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_device *dev);
+ extern int drm_open(struct inode *inode, struct file *filp);
+ extern int drm_stub_open(struct inode *inode, struct file *filp);
+ extern int drm_fasync(int fd, struct file *filp, int on);
++extern ssize_t drm_read(struct file *filp, char __user *buffer,
++			size_t count, loff_t *offset);
+ extern int drm_release(struct inode *inode, struct file *filp);
+ 
+ 				/* Mapping support (drm_vm.h) */
+@@ -1298,6 +1328,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
+ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+ extern int drm_modeset_ctl(struct drm_device *dev, void *data,
+ 			   struct drm_file *file_priv);
++extern void drm_finish_pending_flip(struct drm_device *dev,
++				   struct drm_pending_flip *f, u32 frame);
+ 
+ 				/* AGP/GART support (drm_agpsupport.h) */
+ extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
+diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
+index ae1e9e1..525f770 100644
+--- a/include/drm/drm_crtc.h
++++ b/include/drm/drm_crtc.h
 @@ -238,6 +238,12 @@ struct drm_display_info {
  };
  
@@ -613,7 +719,7 @@ diff -up linux-2.6.30.noarch/include/drm
  	void (*destroy)(struct drm_framebuffer *framebuffer);
  	int (*create_handle)(struct drm_framebuffer *fb,
  			     struct drm_file *file_priv,
-@@ -288,6 +294,7 @@ struct drm_property {
+@@ -290,6 +296,7 @@ struct drm_property {
  struct drm_crtc;
  struct drm_connector;
  struct drm_encoder;
@@ -621,7 +727,7 @@ diff -up linux-2.6.30.noarch/include/drm
  
  /**
   * drm_crtc_funcs - control CRTCs for a given device
-@@ -331,17 +338,29 @@ struct drm_crtc_funcs {
+@@ -333,17 +340,29 @@ struct drm_crtc_funcs {
  	void (*destroy)(struct drm_crtc *crtc);
  
  	int (*set_config)(struct drm_mode_set *set);
@@ -651,7 +757,7 @@ diff -up linux-2.6.30.noarch/include/drm
   *
   * Each CRTC may have one or more connectors associated with it.  This structure
   * allows the CRTC to be controlled.
-@@ -359,6 +378,7 @@ struct drm_crtc {
+@@ -361,6 +380,7 @@ struct drm_crtc {
  
  	struct drm_display_mode mode;
  
@@ -659,7 +765,7 @@ diff -up linux-2.6.30.noarch/include/drm
  	int x, y;
  	struct drm_display_mode *desired_mode;
  	int desired_x, desired_y;
-@@ -368,6 +388,10 @@ struct drm_crtc {
+@@ -370,6 +390,10 @@ struct drm_crtc {
  	uint32_t gamma_size;
  	uint16_t *gamma_store;
  
@@ -670,7 +776,7 @@ diff -up linux-2.6.30.noarch/include/drm
  	/* if you are using the helper */
  	void *helper_private;
  };
-@@ -595,6 +619,7 @@ struct drm_mode_config {
+@@ -597,6 +621,7 @@ struct drm_mode_config {
  
  extern void drm_crtc_init(struct drm_device *dev,
  			  struct drm_crtc *crtc,
@@ -678,7 +784,7 @@ diff -up linux-2.6.30.noarch/include/drm
  			  const struct drm_crtc_funcs *funcs);
  extern void drm_crtc_cleanup(struct drm_crtc *crtc);
  
-@@ -742,6 +767,8 @@ extern int drm_mode_gamma_get_ioctl(stru
+@@ -744,6 +769,8 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
@@ -687,51 +793,23 @@ diff -up linux-2.6.30.noarch/include/drm
  extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
  				int hdisplay, int vdisplay, int vrefresh,
  				bool reduced, bool interlaced);
-diff -up linux-2.6.30.noarch/include/drm/drm.h.pf linux-2.6.30.noarch/include/drm/drm.h
---- linux-2.6.30.noarch/include/drm/drm.h.pf	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm.h	2009-08-25 09:52:41.000000000 +1000
-@@ -686,6 +686,7 @@ struct drm_gem_open {
- #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
- 
- /**
-  * Device specific ioctls should only be in their respective headers
-@@ -698,6 +699,30 @@ struct drm_gem_open {
- #define DRM_COMMAND_BASE                0x40
- #define DRM_COMMAND_END			0xA0
+diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
+index 4c8daca..b5bd0b8 100644
+--- a/include/drm/drm_crtc_helper.h
++++ b/include/drm/drm_crtc_helper.h
+@@ -126,4 +126,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
+ }
  
-+/**
-+ * Header for events written back to userspace on the drm fd.  The
-+ * type defines the type of event, the length specifies the total
-+ * length of the event (including the header), and user_data is
-+ * typically a 64 bit value passed with the ioctl that triggered the
-+ * event.  A read on the drm fd will always only return complete
-+ * events, that is, if for example the read buffer is 100 bytes, and
-+ * there are two 64 byte events pending, only one will be returned.
-+ */
-+struct drm_event {
-+	__u32 type;
-+	__u32 length;
-+};
-+
-+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
+ extern int drm_helper_resume_force_mode(struct drm_device *dev);
 +
-+struct drm_event_page_flip {
-+	struct drm_event base;
-+	__u64 user_data;
-+	__u32 tv_sec;
-+	__u32 tv_usec;
-+	__u32 frame;
-+};
++extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
++				    struct drm_framebuffer *old_fb);
 +
- /* typedef area */
- #ifndef __KERNEL__
- typedef struct drm_clip_rect drm_clip_rect_t;
-diff -up linux-2.6.30.noarch/include/drm/drm_mode.h.pf linux-2.6.30.noarch/include/drm/drm_mode.h
---- linux-2.6.30.noarch/include/drm/drm_mode.h.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_mode.h	2009-08-25 09:52:41.000000000 +1000
+ #endif
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index 1f90841..6f08a77 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
 @@ -268,4 +268,20 @@ struct drm_mode_crtc_lut {
  	__u64 blue;
  };
@@ -753,80 +831,27 @@ diff -up linux-2.6.30.noarch/include/drm
 +};
 +
  #endif
-diff -up linux-2.6.30.noarch/include/drm/drmP.h.pf linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:52:41.000000000 +1000
-@@ -426,6 +426,14 @@ struct drm_buf_entry {
- 	struct drm_freelist freelist;
- };
- 
-+/* Event queued up for userspace to read */
-+struct drm_pending_event {
-+	struct drm_event *event;
-+	struct list_head link;
-+	struct drm_file *file_priv;
-+	void (*destroy) (struct drm_pending_event *event);
-+};
-+
- /** File private data */
- struct drm_file {
- 	int authenticated;
-@@ -449,6 +457,9 @@ struct drm_file {
- 	struct drm_master *master; /* master this node is currently associated with
- 				      N.B. not always minor->master */
- 	struct list_head fbs;
-+
-+	wait_queue_head_t event_wait;
-+	struct list_head event_list;
- };
- 
- /** Wait queue */
-@@ -897,6 +908,16 @@ struct drm_minor {
- 	struct drm_mode_group mode_group;
- };
- 
-+struct drm_pending_flip {
-+	struct drm_pending_event pending_event;
-+	struct drm_framebuffer *old_fb;
-+	struct drm_crtc *crtc;
-+	u32 frame;
-+	int pipe;
-+	struct list_head link;
-+	struct drm_event_page_flip event;
-+};
-+
- /**
-  * DRM device structure. This structure represent a complete card that
-  * may contain multiple heads.
-@@ -996,6 +1017,13 @@ struct drm_device {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-08-25 09:52:41.000000000 +1000
+@@ -1122,7 +1122,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
+ 	nv_crtc->mode_set.num_connectors = 0;
  
- 	u32 max_vblank_count;           /**< size of vblank counter register */
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
  
-+	struct work_struct flip_work;
-+
-+	/**
-+	 * List of objects waiting on flip completion
-+	 */
-+	struct list_head flip_list;
-+
- 	/*@} */
- 	cycles_t ctx_start;
- 	cycles_t lck_start;
-@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_devi
- extern int drm_open(struct inode *inode, struct file *filp);
- extern int drm_stub_open(struct inode *inode, struct file *filp);
- extern int drm_fasync(int fd, struct file *filp, int on);
-+extern ssize_t drm_read(struct file *filp, char __user *buffer,
-+			size_t count, loff_t *offset);
- extern int drm_release(struct inode *inode, struct file *filp);
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-08-25 09:52:41.000000000 +1000
+@@ -810,7 +810,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
+ 	crtc->mode_set.num_connectors = 0;
  
- 				/* Mapping support (drm_vm.h) */
-@@ -1300,6 +1330,8 @@ extern void drm_vblank_pre_modeset(struc
- extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
- extern int drm_modeset_ctl(struct drm_device *dev, void *data,
- 			   struct drm_file *file_priv);
-+extern void drm_finish_pending_flip(struct drm_device *dev,
-+				   struct drm_pending_flip *f, u32 frame);
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
  
- 				/* AGP/GART support (drm_agpsupport.h) */
- extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1768
retrieving revision 1.1769
diff -u -p -r1.1768 -r1.1769
--- kernel.spec	8 Sep 2009 02:05:24 -0000	1.1768
+++ kernel.spec	8 Sep 2009 03:47:17 -0000	1.1769
@@ -696,10 +696,6 @@ Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
-Patch1826: drm-r600-kms.patch
-Patch1827: drm-rv710-ucode-fix.patch
-Patch1828: drm-god-shut-up-about-edid-already.patch
-Patch1829: drm-ddc-caching-bug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1327,10 +1323,6 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
-ApplyPatch drm-r600-kms.patch
-ApplyPatch drm-rv710-ucode-fix.patch
-ApplyPatch drm-god-shut-up-about-edid-already.patch
-ApplyPatch drm-ddc-caching-bug.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1339,7 +1331,8 @@ ApplyPatch drm-i915-resume-force-mode.pa
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-intel-pm.patch
+#this appears to be upstream - mjg59?
+#ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2027,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.206.rc9.git1
+- drm: rebase to drm-next - r600 accel + kms should start working now
+
 * Mon Sep 07 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.205.rc9.git1
 - 2.6.31-rc9-git1
 - Temporarily hack the drm-next patch so it still applies; the result


--- drm-ddc-caching-bug.patch DELETED ---


--- drm-god-shut-up-about-edid-already.patch DELETED ---


--- drm-r600-kms.patch DELETED ---


--- drm-rv710-ucode-fix.patch DELETED ---



From emoret at fedoraproject.org  Tue Sep  8 03:50:31 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Tue,  8 Sep 2009 03:50:31 +0000 (UTC)
Subject: rpms/alsa-plugins/F-10 arcamav.conf,NONE,1.1 speex.conf,NONE,1.1
Message-ID: <20090908035031.1B75A11C043A@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14220

Added Files:
	arcamav.conf speex.conf 
Log Message:
Adding arcamav.conf and speex.conf



***** Error reading new file: [Errno 2] No such file or directory: 'arcamav.conf'

***** Error reading new file: [Errno 2] No such file or directory: 'speex.conf'



From emoret at fedoraproject.org  Tue Sep  8 03:54:54 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Tue,  8 Sep 2009 03:54:54 +0000 (UTC)
Subject: rpms/alsa-plugins/F-10 alsa-plugins.spec,1.20,1.21
Message-ID: <20090908035454.E231E11C00DB@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16147

Modified Files:
	alsa-plugins.spec 
Log Message:
Up release



Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-10/alsa-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- alsa-plugins.spec	8 Sep 2009 03:14:26 -0000	1.20
+++ alsa-plugins.spec	8 Sep 2009 03:54:54 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -248,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-3
+- Added arcamav.conf and speex.conf missing in F-10 branch
+
 * Mon Sep 7 2009 Eric Moret <eric.moret at gmail.com> - 1.0.21-2
 - Added missing dbus-devel dependency to maemo subpackage
 



From airlied at fedoraproject.org  Tue Sep  8 04:03:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 04:03:56 +0000 (UTC)
Subject: rpms/kernel/devel drm-vga-arb.patch, 1.6, 1.7 kernel.spec, 1.1769, 
	1.1770
Message-ID: <20090908040356.8CE6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4496

Modified Files:
	drm-vga-arb.patch kernel.spec 
Log Message:
* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.207.rc9.git1
- drm-vga-arb.patch: update to avoid lockdep + add r600 support


drm-vga-arb.patch:
 drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h        |    1 +
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600d.h         |    1 +
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    4 +++-
 13 files changed, 132 insertions(+), 1 deletion(-)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- drm-vga-arb.patch	25 Aug 2009 00:53:29 -0000	1.6
+++ drm-vga-arb.patch	8 Sep 2009 04:03:56 -0000	1.7
@@ -1,7 +1,29 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:57:03.000000000 +1000
-@@ -38,6 +38,7 @@
+From ba0d10c754ca30de35063a5e14c92bb7328a9f32 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 8 Sep 2009 13:54:31 +1000
+Subject: [PATCH] drm-vga-arb.patch
+
+---
+ drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
+ drivers/gpu/drm/i915/i915_drv.h        |    1 +
+ drivers/gpu/drm/i915/i915_reg.h        |    1 +
+ drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
+ drivers/gpu/drm/i915/intel_drv.h       |    1 +
+ drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
+ drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
+ drivers/gpu/drm/radeon/r600d.h         |    1 +
+ drivers/gpu/drm/radeon/radeon.h        |    2 ++
+ drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
+ drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
+ include/drm/drmP.h                     |    3 +++
+ 13 files changed, 132 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index f85aaf2..0a6f0b3 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
+@@ -37,6 +37,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
  
@@ -9,7 +31,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /**
   * Get interrupt from bus id.
   *
-@@ -212,6 +213,26 @@ err:
+@@ -171,6 +172,26 @@ err:
  }
  EXPORT_SYMBOL(drm_vblank_init);
  
@@ -36,7 +58,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /**
   * Install IRQ handler.
   *
-@@ -272,6 +293,9 @@ int drm_irq_install(struct drm_device *d
+@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *dev)
  		return ret;
  	}
  
@@ -46,7 +68,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	/* After installing handler */
  	ret = dev->driver->irq_postinstall(dev);
  	if (ret < 0) {
-@@ -320,6 +344,9 @@ int drm_irq_uninstall(struct drm_device 
+@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device * dev)
  
  	DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
@@ -56,10 +78,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->driver->irq_uninstall(dev);
  
  	free_irq(dev->pdev->irq, dev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-25 09:57:03.000000000 +1000
-@@ -32,6 +32,7 @@
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 9909505..5a49a18 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -33,6 +33,7 @@
  #include "intel_drv.h"
  #include "i915_drm.h"
  #include "i915_drv.h"
@@ -67,7 +90,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  /* Really want an OS-independent resettable timer.  Would like to have
   * this loop run for (eg) 3 sec, but have the timer reset every time
-@@ -979,6 +980,19 @@ static int i915_probe_agp(struct drm_dev
+@@ -1012,6 +1013,19 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
  	return 0;
  }
  
@@ -87,7 +110,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1024,6 +1038,11 @@ static int i915_load_modeset_init(struct
+@@ -1057,6 +1071,11 @@ static int i915_load_modeset_init(struct drm_device *dev,
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -99,7 +122,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1284,6 +1303,7 @@ int i915_driver_unload(struct drm_device
+@@ -1324,6 +1343,7 @@ int i915_driver_unload(struct drm_device *dev)
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -107,10 +130,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	}
  
  	if (dev->pdev->msi_enabled)
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-25 09:57:03.000000000 +1000
-@@ -761,6 +761,7 @@ static inline void opregion_enable_asle(
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index 77ed060..a0632f8 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -766,6 +766,7 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
  /* modesetting */
  extern void intel_modeset_init(struct drm_device *dev);
  extern void intel_modeset_cleanup(struct drm_device *dev);
@@ -118,9 +142,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  /**
   * Lock test for when it's just for synchronization of ring access.
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-25 09:57:03.000000000 +1000
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index e38cd21..3f79635 100644
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -129,10 +154,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #define INTEL_GMCH_ENABLED	0x4
  #define INTEL_GMCH_MEM_MASK	0x1
  #define INTEL_GMCH_MEM_64M	0x1
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:57:03.000000000 +1000
-@@ -3871,3 +3871,26 @@ struct drm_encoder *intel_best_encoder(s
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 155719f..0227b16 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -3917,3 +3917,20 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
  
  	return &intel_output->enc;
  }
@@ -142,36 +168,32 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 + */
 +int intel_modeset_vga_set_state(struct drm_device *dev, bool state)
 +{
-+	struct pci_dev *bridge_dev;
++	struct drm_i915_private *dev_priv = dev->dev_private;
 +	u16 gmch_ctrl;
 +
-+	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
-+	if (!bridge_dev) {
-+		DRM_ERROR("Can't disable VGA, no bridge\n");
-+		return -1;
-+	}
-+
-+	pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
++	pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
 +	if (state)
 +		gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE;
 +	else
 +		gmch_ctrl |= INTEL_GMCH_VGA_DISABLE;
-+	pci_write_config_word(bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
++	pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
 +	return 0;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-25 09:57:03.000000000 +1000
-@@ -161,4 +161,5 @@ extern int intel_framebuffer_create(stru
+diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
+index b9e47f1..3a0004f 100644
+--- a/drivers/gpu/drm/i915/intel_drv.h
++++ b/drivers/gpu/drm/i915/intel_drv.h
+@@ -178,4 +178,5 @@ extern int intel_framebuffer_create(struct drm_device *dev,
  				    struct drm_mode_fb_cmd *mode_cmd,
  				    struct drm_framebuffer **fb,
  				    struct drm_gem_object *obj);
 +
  #endif /* __INTEL_DRV_H__ */
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-25 09:57:03.000000000 +1000
-@@ -1574,6 +1574,20 @@ void r100_vram_init_sizes(struct radeon_
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index 5708c07..386ddbc 100644
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -1916,6 +1916,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -192,10 +214,68 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-25 09:57:03.000000000 +1000
-@@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_devi
+diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
+index d8fcef4..3417dff 100644
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -1444,6 +1444,20 @@ bool r600_card_posted(struct radeon_device *rdev)
+ 	return false;
+ }
+ 
++void r600_vga_set_state(struct radeon_device *rdev, bool state)
++{
++	uint32_t temp;
++
++	temp = RREG32(CONFIG_CNTL);
++	if (state == false) {
++		temp &= ~(1<<0);
++		temp |= (1<<1);
++	} else {
++		temp &= ~(1<<1);
++	}
++	WREG32(CONFIG_CNTL, temp);
++}
++
+ int r600_resume(struct radeon_device *rdev)
+ {
+ 	int r;
+diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
+index 723295f..4a9028a 100644
+--- a/drivers/gpu/drm/radeon/r600d.h
++++ b/drivers/gpu/drm/radeon/r600d.h
+@@ -78,6 +78,7 @@
+ #define CB_COLOR0_MASK                                  0x28100
+ 
+ #define	CONFIG_MEMSIZE					0x5428
++#define CONFIG_CNTL					0x5424
+ #define	CP_STAT						0x8680
+ #define	CP_COHER_BASE					0x85F8
+ #define	CP_DEBUG					0xC1FC
+diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
+index 3299733..98a0c7f 100644
+--- a/drivers/gpu/drm/radeon/radeon.h
++++ b/drivers/gpu/drm/radeon/radeon.h
+@@ -592,6 +592,7 @@ struct radeon_asic {
+ 	int (*suspend)(struct radeon_device *rdev);
+ 	void (*errata)(struct radeon_device *rdev);
+ 	void (*vram_info)(struct radeon_device *rdev);
++	void (*vga_set_state)(struct radeon_device *rdev, bool state);
+ 	int (*gpu_reset)(struct radeon_device *rdev);
+ 	int (*mc_init)(struct radeon_device *rdev);
+ 	void (*mc_fini)(struct radeon_device *rdev);
+@@ -901,6 +902,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
+ #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
+ #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
+ #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
++#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
+ #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
+ #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
+ #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
+diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
+index e87bb91..fd18cd6 100644
+--- a/drivers/gpu/drm/radeon/radeon_asic.h
++++ b/drivers/gpu/drm/radeon/radeon_asic.h
+@@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
  void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
  void r100_errata(struct radeon_device *rdev);
  void r100_vram_info(struct radeon_device *rdev);
@@ -203,7 +283,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -85,6 +86,7 @@ static struct radeon_asic r100_asic = {
+@@ -87,6 +88,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -211,7 +291,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -149,6 +151,7 @@ static struct radeon_asic r300_asic = {
+@@ -152,6 +154,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -219,7 +299,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -193,6 +196,7 @@ static struct radeon_asic r420_asic = {
+@@ -197,6 +200,7 @@ static struct radeon_asic r420_asic = {
  	.init = &r300_init,
  	.errata = &r420_errata,
  	.vram_info = &r420_vram_info,
@@ -227,7 +307,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r420_mc_init,
  	.mc_fini = &r420_mc_fini,
-@@ -244,6 +248,7 @@ static struct radeon_asic rs400_asic = {
+@@ -249,6 +253,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -235,23 +315,23 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -299,6 +304,7 @@ static struct radeon_asic rs600_asic = {
- 	.init = &r300_init,
+@@ -306,6 +311,7 @@ static struct radeon_asic rs600_asic = {
+ 	.init = &rs600_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -346,6 +352,7 @@ static struct radeon_asic rs690_asic = {
- 	.init = &rs690_init,
+@@ -353,6 +359,7 @@ static struct radeon_asic rs690_asic = {
+ 	.init = &rs600_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -399,6 +406,7 @@ static struct radeon_asic rv515_asic = {
+@@ -407,6 +414,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -259,7 +339,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -445,6 +453,7 @@ static struct radeon_asic r520_asic = {
+@@ -454,6 +462,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -267,9 +347,34 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-25 09:57:03.000000000 +1000
+@@ -495,6 +504,7 @@ int r600_init(struct radeon_device *rdev);
+ void r600_fini(struct radeon_device *rdev);
+ int r600_suspend(struct radeon_device *rdev);
+ int r600_resume(struct radeon_device *rdev);
++void r600_vga_set_state(struct radeon_device *rdev, bool state);
+ int r600_wb_init(struct radeon_device *rdev);
+ void r600_wb_fini(struct radeon_device *rdev);
+ void r600_cp_commit(struct radeon_device *rdev);
+@@ -531,6 +541,7 @@ static struct radeon_asic r600_asic = {
+ 	.resume = &r600_resume,
+ 	.cp_commit = &r600_cp_commit,
+ 	.vram_info = NULL,
++	.vga_set_state = &r600_vga_set_state,
+ 	.gpu_reset = &r600_gpu_reset,
+ 	.mc_init = NULL,
+ 	.mc_fini = NULL,
+@@ -581,6 +592,7 @@ static struct radeon_asic rv770_asic = {
+ 	.cp_commit = &r600_cp_commit,
+ 	.vram_info = NULL,
+ 	.gpu_reset = &rv770_gpu_reset,
++	.vga_set_state = &r600_vga_set_state,
+ 	.mc_init = NULL,
+ 	.mc_fini = NULL,
+ 	.wb_init = &r600_wb_init,
+diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
+index f2469c5..764d2f8 100644
+--- a/drivers/gpu/drm/radeon/radeon_device.c
++++ b/drivers/gpu/drm/radeon/radeon_device.c
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -278,7 +383,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_d
+@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
  int radeon_modeset_init(struct radeon_device *rdev);
  void radeon_modeset_fini(struct radeon_device *rdev);
  
@@ -297,7 +402,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /*
   * Radeon device.
   */
-@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_dev
+@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_device *rdev,
  		/* Initialize surface registers */
  		radeon_surface_init(rdev);
  
@@ -310,7 +415,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		/* TODO: disable VGA need to use VGA request */
  		/* BIOS*/
  		if (!radeon_get_bios(rdev)) {
-@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_de
+@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_device *rdev)
  		radeon_agp_fini(rdev);
  #endif
  		radeon_irq_kms_fini(rdev);
@@ -318,29 +423,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		radeon_fence_driver_fini(rdev);
  		radeon_clocks_fini(rdev);
  		radeon_object_fini(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-25 09:57:03.000000000 +1000
-@@ -580,6 +580,7 @@ struct radeon_asic {
- 	int (*suspend)(struct radeon_device *rdev);
- 	void (*errata)(struct radeon_device *rdev);
- 	void (*vram_info)(struct radeon_device *rdev);
-+	void (*vga_set_state)(struct radeon_device *rdev, bool state);
- 	int (*gpu_reset)(struct radeon_device *rdev);
- 	int (*mc_init)(struct radeon_device *rdev);
- 	void (*mc_fini)(struct radeon_device *rdev);
-@@ -917,6 +918,7 @@ static inline void radeon_ring_write(str
- #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
- #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
- #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
-+#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
- #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
- #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
- #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
-diff -up linux-2.6.30.noarch/include/drm/drmP.h.da linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:57:03.000000000 +1000
-@@ -821,6 +821,9 @@ struct drm_driver {
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index eeefb63..c8e64bb 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -810,6 +810,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
  
@@ -350,3 +437,6 @@ diff -up linux-2.6.30.noarch/include/drm
  	/* Driver private ops for this object */
  	struct vm_operations_struct *gem_vm_ops;
  
+-- 
+1.6.0.6
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1769
retrieving revision 1.1770
diff -u -p -r1.1769 -r1.1770
--- kernel.spec	8 Sep 2009 03:47:17 -0000	1.1769
+++ kernel.spec	8 Sep 2009 04:03:56 -0000	1.1770
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.207.rc9.git1
+- drm-vga-arb.patch: update to avoid lockdep + add r600 support
+
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.206.rc9.git1
 - drm: rebase to drm-next - r600 accel + kms should start working now
 



From tagoh at fedoraproject.org  Tue Sep  8 04:13:33 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  8 Sep 2009 04:13:33 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-unref-notify.patch, NONE,
	1.1 imsettings.spec, 1.37, 1.38
Message-ID: <20090908041333.4256F11C0082@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-unref-notify.patch 
Log Message:
* Tue Sep  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-2
- Fix aborting after dbus session closed. (#520976)

imsettings-unref-notify.patch:
 factory.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE imsettings-unref-notify.patch ---
2009-09-08  Akira TAGOH  <akira at tagoh.org>

	* src/factory.c (imsettings_manager_real_finalize): unreference the object.

Index: src/factory.c
===================================================================
--- src/factory.c	(????? 329)
+++ src/factory.c	(????? 330)
@@ -844,7 +844,7 @@
 	if (priv->body2info)
 		g_hash_table_destroy(priv->body2info);
 	if (priv->notify)
-		notify_notification_close(priv->notify, NULL);
+		g_object_unref(priv->notify);
 
 	if (G_OBJECT_CLASS (imsettings_manager_parent_class)->finalize)
 		G_OBJECT_CLASS (imsettings_manager_parent_class)->finalize(object);


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- imsettings.spec	1 Sep 2009 13:39:10 -0000	1.37
+++ imsettings.spec	8 Sep 2009 04:13:33 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +18,7 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-unref-notify.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -86,6 +87,7 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
+%patch2 -p1 -b .2-unref
 
 %build
 %configure	\
@@ -211,6 +213,9 @@ fi
 
 
 %changelog
+* Tue Sep  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-2
+- Fix aborting after dbus session closed. (#520976)
+
 * Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
 - New upstream release.
   - Fix taking CPU load after switching IM.



From dcantrel at fedoraproject.org  Tue Sep  8 04:17:58 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  8 Sep 2009 04:17:58 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.663, 1.664 anaconda.spec, 1.813, 
	1.814 sources, 1.797, 1.798
Message-ID: <20090908041758.A22C711C0082@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12583

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 07 2009 David Cantrell <dcantrell at redhat.com> - 12.21-1
- Require python-meh (#521661) (dcantrell)
- Handle UnknownSwapError when turning on existing swap volumes. (dcantrell)
- Check for a valid interface in swapErrorDialog, exit without one.
  (dcantrell)
- On SuspendError, allow users to skip/format/exit like OldSwapError.
  (dcantrell)
- Raise exception if detected swap volumes are not Linux v1 swap space.
  (dcantrell)
- Handle OldSwapError (#510817) (dcantrell)
- Support a force=True argument on SwapSpace.create() (dcantrell)
- Skip all Makefiles and the liveinst subdirectory in 'make updates'
  (dcantrell)
- Make anaconda know its version number (#520061) (dcantrell)
- Add top back to the stage2 image. (clumens)
- Do not put device node path, but the fs UUID in fstab for mdraid:
  (#519337) (hdegoede)
- Expose common fsset methods and properties in class Storage. (dcantrell)
- Don't display the warning about not enough memory on a VNC install
  (#521109). (clumens)
- The vtoc.h header has moved from the kernel to s390utils (karsten,
  #520830). (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -p -r1.663 -r1.664
--- .cvsignore	3 Sep 2009 02:33:30 -0000	1.663
+++ .cvsignore	8 Sep 2009 04:17:58 -0000	1.664
@@ -1 +1 @@
-anaconda-12.20.tar.bz2
+anaconda-12.21.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -p -r1.813 -r1.814
--- anaconda.spec	3 Sep 2009 02:33:30 -0000	1.813
+++ anaconda.spec	8 Sep 2009 04:17:58 -0000	1.814
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.20
+Version: 12.21
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -79,7 +79,11 @@ BuildRequires: dbus-devel >= %{dbusver}
 BuildRequires: desktop-file-utils
 %endif
 BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver}
+%ifarch s390 s390x
+BuildRequires: s390utils-devel
+%endif
 
+Requires: python-meh
 Requires: policycoreutils
 Requires: rpm-python >= %{rpmpythonver}
 Requires: comps-extras
@@ -210,6 +214,29 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Sep 07 2009 David Cantrell <dcantrell at redhat.com> - 12.21-1
+- Require python-meh (#521661) (dcantrell)
+- Handle UnknownSwapError when turning on existing swap volumes. (dcantrell)
+- Check for a valid interface in swapErrorDialog, exit without one.
+  (dcantrell)
+- On SuspendError, allow users to skip/format/exit like OldSwapError.
+  (dcantrell)
+- Raise exception if detected swap volumes are not Linux v1 swap space.
+  (dcantrell)
+- Handle OldSwapError (#510817) (dcantrell)
+- Support a force=True argument on SwapSpace.create() (dcantrell)
+- Skip all Makefiles and the liveinst subdirectory in 'make updates'
+  (dcantrell)
+- Make anaconda know its version number (#520061) (dcantrell)
+- Add top back to the stage2 image. (clumens)
+- Do not put device node path, but the fs UUID in fstab for mdraid:
+  (#519337) (hdegoede)
+- Expose common fsset methods and properties in class Storage. (dcantrell)
+- Don't display the warning about not enough memory on a VNC install
+  (#521109). (clumens)
+- The vtoc.h header has moved from the kernel to s390utils (karsten,
+  #520830). (clumens)
+
 * Wed Sep 02 2009 David Cantrell <dcantrell at redhat.com> - 12.20-1
 - Rename mostlyclean-glade to mostlyclean-liveinst. (dcantrell)
 - Handle rootPath referencing a chroot value or actual path (#519665)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -p -r1.797 -r1.798
--- sources	3 Sep 2009 02:33:30 -0000	1.797
+++ sources	8 Sep 2009 04:17:58 -0000	1.798
@@ -1 +1 @@
-f117ebba1cc50fe6b3ccc1f37c619e27  anaconda-12.20.tar.bz2
+7820416851e1cdc9cddbcbccc3735a73  anaconda-12.21.tar.bz2



From bskeggs at fedoraproject.org  Tue Sep  8 04:18:49 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  8 Sep 2009 04:18:49 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.45, 1.46 kernel.spec, 1.1770,
	1.1771
Message-ID: <20090908041849.1B4E611C0082@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12803

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.208.rc9.git1
- drm-nouveau.patch: latest upstream + rebase onto drm-next


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  689 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  432 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1201 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  350 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  943 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  796 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57747 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.45 -r 1.46 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- drm-nouveau.patch	25 Aug 2009 03:15:09 -0000	1.45
+++ drm-nouveau.patch	8 Sep 2009 04:18:48 -0000	1.46
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..49b21cc 100644
+index e4d971c..7fe8a4c 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -143,3 +143,47 @@ config DRM_SAVAGE
+@@ -153,3 +153,48 @@ config DRM_SAVAGE
  	help
  	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
  	  chipset. If M is selected the module will be called savage.
@@ -10,6 +10,7 @@ index 39b393d..49b21cc 100644
 +config DRM_NOUVEAU
 +	tristate "Nouveau (nVidia) cards"
 +	depends on DRM
++	select DRM_KMS_HELPER
 +	select DRM_TTM
 +	select FB_CFB_FILLRECT
 +	select FB_CFB_COPYAREA
@@ -51,10 +52,10 @@ index 39b393d..49b21cc 100644
 +
 +endmenu
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 5f0aec4..f0ef455 100644
+index 3c8827a..d22e64b 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -27,3 +27,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -31,3 +31,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
  obj-$(CONFIG_DRM_SIS)   += sis/
  obj-$(CONFIG_DRM_SAVAGE)+= savage/
  obj-$(CONFIG_DRM_VIA)	+=via/
@@ -130,10 +131,10 @@ index 0000000..6d2abaf
 +obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
 new file mode 100644
-index 0000000..47421ba
+index 0000000..0a3f7a0
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,529 @@
+@@ -0,0 +1,532 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -600,13 +601,11 @@ index 0000000..47421ba
 +				   ch7006_tv_norm);
 +	}
 +
-+	if (ch7006_scale) {
-+		if (ch7006_scale >= 0 && ch7006_scale <= 2)
-+			priv->scale = ch7006_scale;
-+		else
-+			ch7006_err(client, "Invalid scale setting \"%d\".\n",
-+				   ch7006_scale);
-+	}
++	if (ch7006_scale >= 0 && ch7006_scale <= 2)
++		priv->scale = ch7006_scale;
++	else
++		ch7006_err(client, "Invalid scale setting \"%d\".\n",
++			   ch7006_scale);
 +
 +	return 0;
 +}
@@ -651,11 +650,16 @@ index 0000000..47421ba
 +
 +char *ch7006_tv_norm = NULL;
 +module_param_named(tv_norm, ch7006_tv_norm, charp, 0600);
-+MODULE_PARM_DESC(tv_norm, "Default TV norm.");
++MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
++		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, PAL-60, NTSC-M, NTSC-J.\n"
++		 "\t\tDefault: PAL");
 +
-+int ch7006_scale = 0;
++int ch7006_scale = 1;
 +module_param_named(scale, ch7006_scale, int, 0600);
-+MODULE_PARM_DESC(scale, "Default scale.");
++MODULE_PARM_DESC(scale, "Default scale.\n"
++		 "\t\tSupported: 0 -> Select video modes with a higher blanking ratio.\n"
++		 "\t\t\t1 -> Select default video modes.\n"
++		 "\t\t\t2 -> Select video modes with a lower blanking ratio.");
 +
 +MODULE_AUTHOR("Francisco Jerez <currojerez at riseup.net>");
 +MODULE_DESCRIPTION("Chrontel ch7006 TV encoder driver");
@@ -1684,10 +1688,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..1500eed
+index 0000000..b37ad94
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5190 @@
+@@ -0,0 +1,5209 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -5001,7 +5005,7 @@ index 0000000..1500eed
 +
 +int
 +nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent,
-+			       int pxclk)
++			       uint32_t sub, int pxclk)
 +{
 +	/* The display script table is located by the BIT 'U' table.
 +	 *
@@ -5031,7 +5035,7 @@ index 0000000..1500eed
 +	uint8_t *table = &bios->data[bios->display.script_table_ptr];
 +	uint8_t *entry, *otable = NULL;
 +	uint16_t script;
-+	int i, sub;
++	int i;
 +
 +	if (!bios->display.script_table_ptr) {
 +		NV_ERROR(dev, "No pointer to output script table\n");
@@ -5102,39 +5106,19 @@ index 0000000..1500eed
 +		return 1;
 +	}
 +
-+	/* Anyone have an idea to know which to use for certain? */
-+	switch (dcbent->type) {
-+	case OUTPUT_LVDS:
-+		if (nouveau_uscript_lvds >= 0)
-+			sub = nouveau_uscript_lvds;
-+		else {
-+			/* 0x0000 0x0100 0x0200 0x0300 */
-+			if (pxclk > bios->fp.duallink_transition_clk)
-+				sub = 0x0100;
-+			else
-+				sub = 0x0000;
++	if (pxclk < -2 || pxclk > 0) {
++		/* Try to find matching script table entry */
++		for (i = 0; i < otable[5]; i++) {
++			if (ROM16(otable[table[4] + i*6]) == sub)
++				break;
 +		}
-+		break;
-+	case OUTPUT_TMDS:
-+		if (nouveau_uscript_tmds >= 0)
-+			sub = nouveau_uscript_tmds;
-+		else
-+			sub = 0x0001; /* 0x0001 0x0002 0x0105 */
-+		break;
-+	default:
-+		sub = 0x00ff; /* 0x00ff */
-+		break;
-+	}
 +
-+	for (i = 0; i < otable[5]; i++) {
-+		if (ROM16(otable[table[4] + i*6]) == sub)
-+			break;
-+	}
-+
-+	if (i == otable[5]) {
-+		NV_ERROR(dev, "Table 0x%04x not found for %d/%d, using first\n",
-+			 sub, dcbent->type, dcbent->or);
-+		i = 0;
++		if (i == otable[5]) {
++			NV_ERROR(dev, "Table 0x%04x not found for %d/%d, "
++				      "using first\n",
++				 sub, dcbent->type, dcbent->or);
++			i = 0;
++		}
 +	}
 +
 +	bios->display.head = ffs(dcbent->or) - 1;
@@ -6263,10 +6247,8 @@ index 0000000..1500eed
 +	entry->type = conn & 0xf;
 +	entry->i2c_index = (conn >> 4) & 0xf;
 +	entry->heads = (conn >> 8) & 0xf;
-+	if (bdcb->version >= 0x30)
++	if (bdcb->version >= 0x40)
 +		entry->connector = (conn >> 12) & 0xf;
-+	else
-+		entry->connector = entry->i2c_index; /* sorta */
 +	entry->bus = (conn >> 16) & 0xf;
 +	entry->location = (conn >> 20) & 0x3;
 +	entry->or = (conn >> 24) & 0xf;
@@ -6613,7 +6595,45 @@ index 0000000..1500eed
 +	return (dcb->entries ? 0 : -ENXIO);
 +}
 +
-+static void fixup_legacy_i2c(struct nvbios *bios)
++static void
++fixup_legacy_connector(struct nvbios *bios)
++{
++	struct bios_parsed_dcb *bdcb = &bios->bdcb;
++	struct parsed_dcb *dcb = &bdcb->dcb;
++	int high = 0, i;
++
++	/* DCB 3.0 also has the table in most cases, but there are some cards
++	 * where the table is filled with stub entries, and the DCB entriy
[...2564 lines suppressed...]
++		if (pxclk >= 165000)
++			script |= 0x0100;
++
++		if (nouveau_uscript_tmds >= 0) {
++			NV_INFO(dev, "override script 0x%04x with 0x%04x"
++				     "for output TMDS-%d\n", script,
++				     nouveau_uscript_tmds, or);
++			script = nouveau_uscript_tmds;
++		}
++		break;
++	case OUTPUT_ANALOG:
++		script = 0xff;
++		break;
++	default:
++		NV_ERROR(dev, "modeset on unsupported output type!\n");
++		break;
++	}
++
++	return script;
++}
++
 +static void
 +nv50_display_vblank_crtc_handler(struct drm_device *dev, int crtc)
 +{
@@ -33162,7 +32807,7 @@ index 0000000..7ddb760
 +
 +	nv_wr32(dev, 0x619494, nv_rd32(dev, 0x619494) & ~8);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, -1);
++	nouveau_bios_run_display_table(dev, dcbent, 0, -1);
 +
 +ack:
 +	nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK10);
@@ -33172,10 +32817,8 @@ index 0000000..7ddb760
 +static void
 +nv50_display_unk20_handler(struct drm_device *dev)
 +{
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+	struct nvbios *bios = &dev_priv->VBIOS;
 +	struct dcb_entry *dcbent;
-+	uint32_t tmp, pclk;
++	uint32_t tmp, pclk, script;
 +	int head, or, ret;
 +
 +	ret = nv50_display_irq_head(dev, &head, &dcbent);
@@ -33183,30 +32826,24 @@ index 0000000..7ddb760
 +		goto ack;
 +	or = ffs(dcbent->or) - 1;
 +	pclk = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(head, CLOCK)) & 0x3fffff;
++	script = nv50_display_script_select(dev, dcbent, pclk);
 +
 +	NV_DEBUG(dev, "head %d pxclk: %dKHz\n", head, pclk);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, -2);
++	nouveau_bios_run_display_table(dev, dcbent, 0, -2);
 +
 +	nv50_crtc_set_clock(dev, head, pclk);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, pclk);
++	nouveau_bios_run_display_table(dev, dcbent, script, pclk);
 +
 +	tmp = nv_rd32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(head));
 +	tmp &= ~0x000000f;
 +	nv_wr32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(head), tmp);
 +
 +	if (dcbent->type != OUTPUT_ANALOG) {
-+		int tclk;
-+
-+		if (dcbent->type == OUTPUT_LVDS)
-+			tclk = bios->fp.duallink_transition_clk;
-+		else
-+			tclk = 165000;
-+
 +		tmp = nv_rd32(dev, NV50_PDISPLAY_SOR_CLK_CTRL2(or));
 +		tmp &= ~0x00000f0f;
-+		if (pclk > tclk)
++		if (script & 0x0100)
 +			tmp |= 0x00000101;
 +		nv_wr32(dev, NV50_PDISPLAY_SOR_CLK_CTRL2(or), tmp);
 +	} else {
@@ -33222,14 +32859,15 @@ index 0000000..7ddb760
 +nv50_display_unk40_handler(struct drm_device *dev)
 +{
 +	struct dcb_entry *dcbent;
-+	int head, pclk, ret;
++	int head, pclk, script, ret;
 +
 +	ret = nv50_display_irq_head(dev, &head, &dcbent);
 +	if (ret)
 +		goto ack;
 +	pclk = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(head, CLOCK)) & 0x3fffff;
++	script = nv50_display_script_select(dev, dcbent, pclk);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, -pclk);
++	nouveau_bios_run_display_table(dev, dcbent, script, -pclk);
 +
 +ack:
 +	nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK40);
@@ -34246,10 +33884,10 @@ index 0000000..3d12e12
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..72db3cf
+index 0000000..108f672
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,437 @@
+@@ -0,0 +1,439 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34434,8 +34072,10 @@ index 0000000..72db3cf
 +	struct nouveau_gpuobj *ramin = chan->ramin->gpuobj;
 +	struct nouveau_gpuobj *ctx;
 +	uint32_t *ctxvals = NULL;
-+	int grctx_size = 0x70000, hdr;
-+	int ret, pos;
++	uint32_t grctx_size = 0x70000;
++	int hdr;
++	int ret;
++	int pos;
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
@@ -57530,10 +57170,10 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..9ae8ec3
+index 0000000..45b0ff7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,253 @@
+@@ -0,0 +1,250 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -57592,17 +57232,11 @@ index 0000000..9ae8ec3
 +static void nv50_sor_dpms(struct drm_encoder *drm_encoder, int mode)
 +{
 +	struct drm_device *dev = drm_encoder->dev;
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_encoder *encoder = nouveau_encoder(drm_encoder);
 +	uint32_t val;
 +	int or = encoder->or;
 +
-+	NV_DEBUG(dev, "or %d\n", encoder->or);
-+
-+	if (dev_priv->in_modeset) {
-+		nv50_sor_disconnect(encoder);
-+		return;
-+	}
++	NV_DEBUG(dev, "or %d mode %d\n", or, mode);
 +
 +	/* wait for it to be done */
 +	if (!nv_wait(NV50_PDISPLAY_SOR_DPMS_CTRL(or),
@@ -57646,9 +57280,13 @@ index 0000000..9ae8ec3
 +	struct nouveau_encoder *encoder = nouveau_encoder(drm_encoder);
 +	struct nouveau_connector *connector;
 +
++	NV_DEBUG(drm_encoder->dev, "or %d\n", encoder->or);
++
 +	connector = nouveau_encoder_connector_get(encoder);
-+	if (!connector)
++	if (!connector) {
++		NV_ERROR(drm_encoder->dev, "Encoder has no connector\n");
 +		return false;
++	}
 +
 +	if (connector->scaling_mode != DRM_MODE_SCALE_NONE &&
 +	     connector->native_mode) {
@@ -57682,10 +57320,7 @@ index 0000000..9ae8ec3
 +
 +	NV_DEBUG(dev, "or %d\n", encoder->or);
 +
-+	ret = dev_priv->in_modeset;
-+	dev_priv->in_modeset = false;
 +	nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_ON);
-+	dev_priv->in_modeset = ret;
 +
 +	if (to_drm_encoder(encoder)->encoder_type != DRM_MODE_ENCODER_LVDS) {
 +		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_TMDS;
@@ -57779,6 +57414,8 @@ index 0000000..9ae8ec3
 +	encoder->dcb = entry;
 +	encoder->or = ffs(entry->or) - 1;
 +
++	encoder->disconnect = nv50_sor_disconnect;
++
 +	drm_encoder_init(dev, to_drm_encoder(encoder), &nv50_sor_encoder_funcs, type);
 +	drm_encoder_helper_add(to_drm_encoder(encoder), &nv50_sor_helper_funcs);
 +
@@ -58373,7 +58010,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 e0f1c1f..84e2fa6 100644
+index eeefb63..1345c39 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -p -r1.1770 -r1.1771
--- kernel.spec	8 Sep 2009 04:03:56 -0000	1.1770
+++ kernel.spec	8 Sep 2009 04:18:48 -0000	1.1771
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.208.rc9.git1
+- drm-nouveau.patch: latest upstream + rebase onto drm-next
+
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.207.rc9.git1
 - drm-vga-arb.patch: update to avoid lockdep + add r600 support
 



From tagoh at fedoraproject.org  Tue Sep  8 04:28:35 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  8 Sep 2009 04:28:35 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings.spec,1.38,1.39
Message-ID: <20090908042835.8055311C0082@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16541

Modified Files:
	imsettings.spec 
Log Message:
fix a typo


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- imsettings.spec	8 Sep 2009 04:13:33 -0000	1.38
+++ imsettings.spec	8 Sep 2009 04:28:35 -0000	1.39
@@ -87,7 +87,7 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
-%patch2 -p1 -b .2-unref
+%patch2 -p0 -b .2-unref
 
 %build
 %configure	\



From airlied at fedoraproject.org  Tue Sep  8 04:57:22 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 04:57:22 +0000 (UTC)
Subject: rpms/kernel/devel drm-next.patch, 1.16, 1.17 kernel.spec, 1.1771,
	1.1772
Message-ID: <20090908045722.D118A11C0082@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26642

Modified Files:
	drm-next.patch kernel.spec 
Log Message:
* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.209.rc9.git1
- drm-next.patch: fix r600 signal interruption return value


drm-next.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   77 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  220 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  504 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  701 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  435 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  737 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  100 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1047 
 b/drivers/gpu/drm/radeon/r100_track.h             |  124 
 b/drivers/gpu/drm/radeon/r100d.h                  |   76 
 b/drivers/gpu/drm/radeon/r200.c                   |  456 
 b/drivers/gpu/drm/radeon/r300.c                   |  411 
 b/drivers/gpu/drm/radeon/r300d.h                  |   76 
 b/drivers/gpu/drm/radeon/r600.c                   | 1714 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  855 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  777 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  658 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  126 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  159 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |   79 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  215 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  128 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  340 
 b/drivers/gpu/drm/radeon/radeon_display.c         |   18 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   21 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  146 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  115 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  670 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   58 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   44 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  339 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   52 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  119 
 b/drivers/gpu/drm/radeon/radeon_share.h           |   77 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   18 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |    2 
 b/drivers/gpu/drm/radeon/rs600.c                  |   60 
 b/drivers/gpu/drm/radeon/rs690.c                  |    1 
 b/drivers/gpu/drm/radeon/rv515.c                  |  518 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  |  987 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   16 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |   82 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 154 files changed, 33675 insertions(+), 41498 deletions(-)

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- drm-next.patch	8 Sep 2009 03:47:16 -0000	1.16
+++ drm-next.patch	8 Sep 2009 04:57:21 -0000	1.17
@@ -56103,7 +56103,7 @@ index ec383ed..ebb5895 100644
  }
  EXPORT_SYMBOL(radeonfb_remove);
 diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
-index b4e48dd..506dd4d 100644
+index b4e48dd..01a8963 100644
 --- a/drivers/gpu/drm/radeon/radeon_fence.c
 +++ b/drivers/gpu/drm/radeon/radeon_fence.c
 @@ -53,9 +53,9 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
@@ -56154,7 +56154,7 @@ index b4e48dd..506dd4d 100644
 +			schedule_timeout(1);
 +
 +		if (intr && signal_pending(current)) {
-+			ret = -ERESTART;
++			ret = -ERESTARTSYS;
 +			break;
 +		}
 +	}
@@ -56175,13 +56175,17 @@ index b4e48dd..506dd4d 100644
  	if (fence == NULL) {
  		WARN(1, "Querying an invalid fence : %p !\n", fence);
  		return 0;
-@@ -185,13 +224,18 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+@@ -185,13 +224,22 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
  	if (radeon_fence_signaled(fence)) {
  		return 0;
  	}
 +
-+	if (rdev->family >= CHIP_R600)
-+		return r600_fence_wait(fence, intr, 0);
++	if (rdev->family >= CHIP_R600) {
++		r = r600_fence_wait(fence, intr, 0);
++		if (r == -ERESTARTSYS)
++			return -EBUSY;
++		return r;
++	}
 +
  retry:
  	cur_jiffies = jiffies;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -p -r1.1771 -r1.1772
--- kernel.spec	8 Sep 2009 04:18:48 -0000	1.1771
+++ kernel.spec	8 Sep 2009 04:57:22 -0000	1.1772
@@ -2020,7 +2020,10 @@ fi
 # and build.
 
 %changelog
-* Tue Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.208.rc9.git1
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.209.rc9.git1
+- drm-next.patch: fix r600 signal interruption return value
+
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.208.rc9.git1
 - drm-nouveau.patch: latest upstream + rebase onto drm-next
 
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.207.rc9.git1



From ausil at fedoraproject.org  Tue Sep  8 05:01:51 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  8 Sep 2009 05:01:51 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sunffb/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-sunffb.spec, 1.5, 1.6
Message-ID: <20090908050151.D564211C0082@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27639

Modified Files:
	.cvsignore sources xorg-x11-drv-sunffb.spec 
Log Message:
update to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Apr 2009 17:45:13 -0000	1.3
+++ .cvsignore	8 Sep 2009 05:01:51 -0000	1.4
@@ -1 +1 @@
-xf86-video-sunffb-1.2.0.tar.bz2
+xf86-video-sunffb-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Apr 2009 17:45:13 -0000	1.3
+++ sources	8 Sep 2009 05:01:51 -0000	1.4
@@ -1 +1 @@
-816842de26bce8a935f3c9c3cfedbc42  xf86-video-sunffb-1.2.0.tar.bz2
+1bb374fe5ab3ed780d353b2b12ba6255  xf86-video-sunffb-1.2.1.tar.bz2


Index: xorg-x11-drv-sunffb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/xorg-x11-drv-sunffb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xorg-x11-drv-sunffb.spec	27 Jul 2009 08:32:44 -0000	1.5
+++ xorg-x11-drv-sunffb.spec	8 Sep 2009 05:01:51 -0000	1.6
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 sunffb video driver
 Name:      xorg-x11-drv-sunffb
-Version:   1.2.0
-Release:   2%{?dist}
+Version:   1.2.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch0:    sunffb-sparc64.patch
@@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # we are not building sparc64 at this time because we need to do some assembly work
 ExclusiveArch: sparcv9 sparc64
 
-BuildRequires: xorg-x11-server-devel libdrm-devel
+BuildRequires: xorg-x11-server-sdk libdrm-devel
 BuildRequires: automake autoconf gettext libtool
 
 Requires:  xorg-x11-server-Xorg
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/*.4*
 
 %changelog
+* Mon Sep 07 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.1-1
+- update to 1.2.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Tue Sep  8 05:41:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  8 Sep 2009 05:41:04 +0000 (UTC)
Subject: rpms/xscreensaver/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xscreensaver.spec, 1.97, 1.98
Message-ID: <20090908054104.B143511C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7784

Modified Files:
	.cvsignore sources xscreensaver.spec 
Log Message:
* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
- Update to 5.10
- All non Fedora-specific patches applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Sep 2009 14:10:33 -0000	1.12
+++ .cvsignore	8 Sep 2009 05:41:04 -0000	1.13
@@ -1 +1 @@
-xscreensaver-5.09.tar.gz
+xscreensaver-5.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Sep 2009 14:10:33 -0000	1.12
+++ sources	8 Sep 2009 05:41:04 -0000	1.13
@@ -1 +1 @@
-f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz
+0d7205f9da8e3f1b83bcda549d73a7c4  xscreensaver-5.10.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- xscreensaver.spec	3 Sep 2009 14:34:03 -0000	1.97
+++ xscreensaver.spec	8 Sep 2009 05:41:04 -0000	1.98
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.09
+%define mainversion   5.10
 %define beta_ver      %{nil}
 
 
@@ -45,13 +45,6 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Generate missing header files
-Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
-# Kill warnings with -std=c89
-Patch51:	xscreensaver-5.09-kill-c89-warning.patch
-# Ubuntu bug 418419, sent upstream
-# Another SIGFPE when hack's window size is too small:
-Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
 #
 # Not sent to upstream yet, must do later
@@ -209,9 +202,6 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .missing
-%patch51 -p1 -b .c89
-%patch55 -p1 -b .small
 
 change_option(){
    set +x
@@ -676,6 +666,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
+- Update to 5.10
+- All non Fedora-specific patches applied upstream
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
 - Update to 5.09
 - Drop patches applied by upstream (1 patch still pending on upstream



From airlied at fedoraproject.org  Tue Sep  8 06:09:58 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 06:09:58 +0000 (UTC)
Subject: rpms/kernel/devel drm-page-flip.patch, 1.5, 1.6 kernel.spec, 1.1772,
	1.1773
Message-ID: <20090908060958.E192A11C0082@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18090

Modified Files:
	drm-page-flip.patch kernel.spec 
Log Message:
* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.210.rc9.git1
- drm-page-flip.patch: rebase again


drm-page-flip.patch:
 drivers/gpu/drm/drm_crtc.c              |  169 +++++++++++++++++++++++++++++++-
 drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
 drivers/gpu/drm/drm_drv.c               |    1 
 drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++
 drivers/gpu/drm/drm_irq.c               |   43 ++++++++
 drivers/gpu/drm/i915/i915_drv.c         |    1 
 drivers/gpu/drm/i915/intel_display.c    |   26 +++-
 drivers/gpu/drm/nouveau/nv04_crtc.c     |    2 
 drivers/gpu/drm/nouveau/nv50_crtc.c     |    2 
 drivers/gpu/drm/radeon/radeon_display.c |    3 
 include/drm/drm.h                       |   25 ++++
 include/drm/drmP.h                      |   32 ++++++
 include/drm/drm_crtc.h                  |   27 +++++
 include/drm/drm_crtc_helper.h           |    4 
 include/drm/drm_mode.h                  |   16 +++
 15 files changed, 415 insertions(+), 16 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- drm-page-flip.patch	8 Sep 2009 03:47:17 -0000	1.5
+++ drm-page-flip.patch	8 Sep 2009 06:09:56 -0000	1.6
@@ -1,7 +1,6 @@
-diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index ba728ad..4b7e748 100644
---- a/drivers/gpu/drm/drm_crtc.c
-+++ b/drivers/gpu/drm/drm_crtc.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c	2009-09-08 16:08:09.000000000 +1000
 @@ -34,6 +34,8 @@
  #include "drmP.h"
  #include "drm_crtc.h"
@@ -11,7 +10,7 @@ index ba728ad..4b7e748 100644
  struct drm_prop_enum_list {
  	int type;
  	char *name;
-@@ -330,6 +332,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
+@@ -330,6 +332,34 @@ void drm_framebuffer_cleanup(struct drm_
  EXPORT_SYMBOL(drm_framebuffer_cleanup);
  
  /**
@@ -67,7 +66,7 @@ index ba728ad..4b7e748 100644
  	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_crtc_init);
-@@ -369,6 +401,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
+@@ -369,6 +401,9 @@ void drm_crtc_cleanup(struct drm_crtc *c
  {
  	struct drm_device *dev = crtc->dev;
  
@@ -77,7 +76,7 @@ index ba728ad..4b7e748 100644
  	if (crtc->gamma_store) {
  		kfree(crtc->gamma_store);
  		crtc->gamma_store = NULL;
-@@ -376,6 +411,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
+@@ -376,6 +411,7 @@ void drm_crtc_cleanup(struct drm_crtc *c
  
  	drm_mode_object_put(dev, &crtc->base);
  	list_del(&crtc->head);
@@ -220,11 +219,10 @@ index ba728ad..4b7e748 100644
 +
 +	return ret;
 +}
-diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index ff447f1..fec66f9 100644
---- a/drivers/gpu/drm/drm_crtc_helper.c
-+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -872,8 +872,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-08 16:08:09.000000000 +1000
+@@ -872,8 +872,10 @@ int drm_crtc_helper_set_config(struct dr
  		old_fb = set->crtc->fb;
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
@@ -235,7 +233,7 @@ index ff447f1..fec66f9 100644
  		if (ret != 0)
  			goto fail;
  	}
-@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
+@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct 
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -249,11 +247,10 @@ index ff447f1..fec66f9 100644
 +	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 +}
 +EXPORT_SYMBOL(drm_crtc_helper_set_base);
-diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index a75ca63..672f473 100644
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c	2009-09-08 16:08:09.000000000 +1000
+@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
@@ -261,11 +258,10 @@ index a75ca63..672f473 100644
  };
  
  #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
-diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 251bc0e..dcd9c66 100644
---- a/drivers/gpu/drm/drm_fops.c
-+++ b/drivers/gpu/drm/drm_fops.c
-@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.da	2009-09-08 13:14:32.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c	2009-09-08 16:08:09.000000000 +1000
+@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode 
  
  	INIT_LIST_HEAD(&priv->lhead);
  	INIT_LIST_HEAD(&priv->fbs);
@@ -274,7 +270,7 @@ index 251bc0e..dcd9c66 100644
  
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
-@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, str
  {
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev = file_priv->minor->dev;
@@ -284,7 +280,7 @@ index 251bc0e..dcd9c66 100644
  	int retcode = 0;
  
  	lock_kernel();
-@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, str
  	if (file_priv->minor->master)
  		drm_master_release(dev, filp);
  
@@ -304,7 +300,7 @@ index 251bc0e..dcd9c66 100644
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_release(dev, file_priv);
  
-@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, str
  }
  EXPORT_SYMBOL(drm_release);
  
@@ -362,10 +358,9 @@ index 251bc0e..dcd9c66 100644
 +	return mask;
  }
  EXPORT_SYMBOL(drm_poll);
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index f85aaf2..2fe0be4 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da	2009-09-08 13:14:32.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-09-08 16:08:09.000000000 +1000
 @@ -34,6 +34,7 @@
   */
  
@@ -374,7 +369,7 @@ index f85aaf2..2fe0be4 100644
  
  #include <linux/interrupt.h>	/* For task queue support */
  
-@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
+@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *
  	return 0;
  }
  
@@ -419,7 +414,7 @@ index f85aaf2..2fe0be4 100644
  static void vblank_disable_fn(unsigned long arg)
  {
  	struct drm_device *dev = (struct drm_device *)arg;
-@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
+@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *d
  		atomic_set(&dev->vblank_refcount[i], 0);
  	}
  
@@ -428,7 +423,7 @@ index f85aaf2..2fe0be4 100644
  	dev->vblank_disable_allowed = 0;
  
  	return 0;
-@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
+@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device
  {
  	atomic_inc(&dev->_vblank_count[crtc]);
  	DRM_WAKEUP(&dev->vbl_queue[crtc]);
@@ -436,10 +431,9 @@ index f85aaf2..2fe0be4 100644
  }
  EXPORT_SYMBOL(drm_handle_vblank);
 +
-diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index dbe568c..b81305e 100644
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-09-08 16:08:09.000000000 +1000
 @@ -206,6 +206,7 @@ static struct drm_driver driver = {
  		 .mmap = drm_gem_mmap,
  		 .poll = drm_poll,
@@ -448,11 +442,10 @@ index dbe568c..b81305e 100644
  #ifdef CONFIG_COMPAT
  		 .compat_ioctl = i915_compat_ioctl,
  #endif
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 155719f..0d6e677 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -973,6 +973,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-09-08 16:08:09.000000000 +1000
+@@ -973,6 +973,8 @@ intel_pipe_set_base(struct drm_crtc *crt
  	u32 dspcntr, alignment;
  	int ret;
  
@@ -461,7 +454,7 @@ index 155719f..0d6e677 100644
  	/* no fb bound */
  	if (!crtc->fb) {
  		DRM_DEBUG("No FB bound\n");
-@@ -1008,17 +1010,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1008,17 +1010,14 @@ intel_pipe_set_base(struct drm_crtc *crt
  		BUG();
  	}
  
@@ -479,7 +472,7 @@ index 155719f..0d6e677 100644
  		return ret;
  	}
  
-@@ -1029,7 +1028,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1029,7 +1028,6 @@ intel_pipe_set_base(struct drm_crtc *crt
  		ret = i915_gem_object_get_fence_reg(obj);
  		if (ret != 0) {
  			i915_gem_object_unpin(obj);
@@ -487,7 +480,7 @@ index 155719f..0d6e677 100644
  			return ret;
  		}
  	}
-@@ -1054,7 +1052,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1054,7 +1052,6 @@ intel_pipe_set_base(struct drm_crtc *crt
  	default:
  		DRM_ERROR("Unknown color depth\n");
  		i915_gem_object_unpin(obj);
@@ -495,7 +488,7 @@ index 155719f..0d6e677 100644
  		return -EINVAL;
  	}
  	if (IS_I965G(dev)) {
-@@ -1086,17 +1083,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1086,17 +1083,14 @@ intel_pipe_set_base(struct drm_crtc *crt
  		I915_READ(dspbase);
  	}
  
@@ -514,7 +507,7 @@ index 155719f..0d6e677 100644
  	if (!dev->primary->master)
  		return 0;
  
-@@ -2732,7 +2726,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2732,7 +2726,9 @@ static int intel_crtc_mode_set(struct dr
  	I915_WRITE(dspcntr_reg, dspcntr);
  
  	/* Flush the plane changes */
@@ -524,7 +517,7 @@ index 155719f..0d6e677 100644
  
  	intel_update_watermarks(dev);
  
-@@ -3521,6 +3517,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
+@@ -3521,6 +3517,7 @@ static const struct drm_crtc_funcs intel
  	.gamma_set = intel_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = intel_crtc_destroy,
@@ -532,7 +525,7 @@ index 155719f..0d6e677 100644
  };
  
  
-@@ -3533,7 +3530,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3533,7 +3530,7 @@ static void intel_crtc_init(struct drm_d
  	if (intel_crtc == NULL)
  		return;
  
@@ -541,7 +534,7 @@ index 155719f..0d6e677 100644
  
  	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
  	intel_crtc->pipe = pipe;
-@@ -3717,9 +3714,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
+@@ -3717,9 +3714,18 @@ static int intel_user_framebuffer_create
  	return drm_gem_handle_create(file_priv, object, handle);
  }
  
@@ -560,11 +553,34 @@ index 155719f..0d6e677 100644
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 9d817a6..6f2dabf 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -168,6 +168,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -993,7 +993,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->index = crtc_num;
+ 	nv_crtc->last_dpms = NV_DPMS_CLEARED;
+ 
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -777,7 +777,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->set_dither = nv50_crtc_set_dither;
+ 	crtc->set_scale = nv50_crtc_set_scale;
+ 
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c	2009-09-08 16:08:09.000000000 +1000
+@@ -168,6 +168,7 @@ static const struct drm_crtc_funcs radeo
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
@@ -572,7 +588,7 @@ index 9d817a6..6f2dabf 100644
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
-@@ -180,7 +181,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
+@@ -180,7 +181,7 @@ static void radeon_crtc_init(struct drm_
  	if (radeon_crtc == NULL)
  		return;
  
@@ -581,131 +597,9 @@ index 9d817a6..6f2dabf 100644
  
  	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
  	radeon_crtc->crtc_id = index;
-diff --git a/include/drm/drm.h b/include/drm/drm.h
-index 7cb50bd..1920323 100644
---- a/include/drm/drm.h
-+++ b/include/drm/drm.h
-@@ -686,6 +686,7 @@ struct drm_gem_open {
- #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
- 
- /**
-  * Device specific ioctls should only be in their respective headers
-@@ -698,6 +699,30 @@ struct drm_gem_open {
- #define DRM_COMMAND_BASE                0x40
- #define DRM_COMMAND_END			0xA0
- 
-+/**
-+ * Header for events written back to userspace on the drm fd.  The
-+ * type defines the type of event, the length specifies the total
-+ * length of the event (including the header), and user_data is
-+ * typically a 64 bit value passed with the ioctl that triggered the
-+ * event.  A read on the drm fd will always only return complete
-+ * events, that is, if for example the read buffer is 100 bytes, and
-+ * there are two 64 byte events pending, only one will be returned.
-+ */
-+struct drm_event {
-+	__u32 type;
-+	__u32 length;
-+};
-+
-+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
-+
-+struct drm_event_page_flip {
-+	struct drm_event base;
-+	__u64 user_data;
-+	__u32 tv_sec;
-+	__u32 tv_usec;
-+	__u32 frame;
-+};
-+
- /* typedef area */
- #ifndef __KERNEL__
- typedef struct drm_clip_rect drm_clip_rect_t;
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index eeefb63..5431888 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -426,6 +426,14 @@ struct drm_buf_entry {
- 	struct drm_freelist freelist;
- };
- 
-+/* Event queued up for userspace to read */
-+struct drm_pending_event {
-+	struct drm_event *event;
-+	struct list_head link;
-+	struct drm_file *file_priv;
-+	void (*destroy) (struct drm_pending_event *event);
-+};
-+
- /** File private data */
- struct drm_file {
- 	int authenticated;
-@@ -449,6 +457,9 @@ struct drm_file {
- 	struct drm_master *master; /* master this node is currently associated with
- 				      N.B. not always minor->master */
- 	struct list_head fbs;
-+
-+	wait_queue_head_t event_wait;
-+	struct list_head event_list;
- };
- 
- /** Wait queue */
-@@ -897,6 +908,16 @@ struct drm_minor {
- 	struct drm_mode_group mode_group;
- };
- 
-+struct drm_pending_flip {
-+	struct drm_pending_event pending_event;
-+	struct drm_framebuffer *old_fb;
-+	struct drm_crtc *crtc;
-+	u32 frame;
-+	int pipe;
-+	struct list_head link;
-+	struct drm_event_page_flip event;
-+};
-+
- /**
-  * DRM device structure. This structure represent a complete card that
-  * may contain multiple heads.
-@@ -996,6 +1017,13 @@ struct drm_device {
- 
- 	u32 max_vblank_count;           /**< size of vblank counter register */
- 
-+	struct work_struct flip_work;
-+
-+	/**
-+	 * List of objects waiting on flip completion
-+	 */
-+	struct list_head flip_list;
-+
- 	/*@} */
- 	cycles_t ctx_start;
- 	cycles_t lck_start;
-@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_device *dev);
- extern int drm_open(struct inode *inode, struct file *filp);
- extern int drm_stub_open(struct inode *inode, struct file *filp);
- extern int drm_fasync(int fd, struct file *filp, int on);
-+extern ssize_t drm_read(struct file *filp, char __user *buffer,
-+			size_t count, loff_t *offset);
- extern int drm_release(struct inode *inode, struct file *filp);
- 
- 				/* Mapping support (drm_vm.h) */
-@@ -1298,6 +1328,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
- extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
- extern int drm_modeset_ctl(struct drm_device *dev, void *data,
- 			   struct drm_file *file_priv);
-+extern void drm_finish_pending_flip(struct drm_device *dev,
-+				   struct drm_pending_flip *f, u32 frame);
- 
- 				/* AGP/GART support (drm_agpsupport.h) */
- extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
-diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
-index ae1e9e1..525f770 100644
---- a/include/drm/drm_crtc.h
-+++ b/include/drm/drm_crtc.h
+diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.da linux-2.6.30.noarch/include/drm/drm_crtc.h
+--- linux-2.6.30.noarch/include/drm/drm_crtc.h.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-09-08 16:08:09.000000000 +1000
 @@ -238,6 +238,12 @@ struct drm_display_info {
  };
  
@@ -784,7 +678,7 @@ index ae1e9e1..525f770 100644
  			  const struct drm_crtc_funcs *funcs);
  extern void drm_crtc_cleanup(struct drm_crtc *crtc);
  
-@@ -744,6 +769,8 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+@@ -744,6 +769,8 @@ extern int drm_mode_gamma_get_ioctl(stru
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
@@ -793,11 +687,10 @@ index ae1e9e1..525f770 100644
  extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
  				int hdisplay, int vdisplay, int vrefresh,
  				bool reduced, bool interlaced);
-diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 4c8daca..b5bd0b8 100644
---- a/include/drm/drm_crtc_helper.h
-+++ b/include/drm/drm_crtc_helper.h
-@@ -126,4 +126,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
+diff -up linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.da linux-2.6.30.noarch/include/drm/drm_crtc_helper.h
+--- linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_crtc_helper.h	2009-09-08 16:08:09.000000000 +1000
+@@ -126,4 +126,8 @@ static inline void drm_connector_helper_
  }
  
  extern int drm_helper_resume_force_mode(struct drm_device *dev);
@@ -806,10 +699,51 @@ index 4c8daca..b5bd0b8 100644
 +				    struct drm_framebuffer *old_fb);
 +
  #endif
-diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
-index 1f90841..6f08a77 100644
---- a/include/drm/drm_mode.h
-+++ b/include/drm/drm_mode.h
+diff -up linux-2.6.30.noarch/include/drm/drm.h.da linux-2.6.30.noarch/include/drm/drm.h
+--- linux-2.6.30.noarch/include/drm/drm.h.da	2009-06-10 13:05:27.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm.h	2009-09-08 16:08:09.000000000 +1000
+@@ -686,6 +686,7 @@ struct drm_gem_open {
+ #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
++#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
+ 
+ /**
+  * Device specific ioctls should only be in their respective headers
+@@ -698,6 +699,30 @@ struct drm_gem_open {
+ #define DRM_COMMAND_BASE                0x40
+ #define DRM_COMMAND_END			0xA0
+ 
++/**
++ * Header for events written back to userspace on the drm fd.  The
++ * type defines the type of event, the length specifies the total
++ * length of the event (including the header), and user_data is
++ * typically a 64 bit value passed with the ioctl that triggered the
++ * event.  A read on the drm fd will always only return complete
++ * events, that is, if for example the read buffer is 100 bytes, and
++ * there are two 64 byte events pending, only one will be returned.
++ */
++struct drm_event {
++	__u32 type;
++	__u32 length;
++};
++
++#define DRM_EVENT_MODE_PAGE_FLIP 0x01
++
++struct drm_event_page_flip {
++	struct drm_event base;
++	__u64 user_data;
++	__u32 tv_sec;
++	__u32 tv_usec;
++	__u32 frame;
++};
++
+ /* typedef area */
+ #ifndef __KERNEL__
+ typedef struct drm_clip_rect drm_clip_rect_t;
+diff -up linux-2.6.30.noarch/include/drm/drm_mode.h.da linux-2.6.30.noarch/include/drm/drm_mode.h
+--- linux-2.6.30.noarch/include/drm/drm_mode.h.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_mode.h	2009-09-08 16:08:09.000000000 +1000
 @@ -268,4 +268,20 @@ struct drm_mode_crtc_lut {
  	__u64 blue;
  };
@@ -831,27 +765,80 @@ index 1f90841..6f08a77 100644
 +};
 +
  #endif
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-08-25 09:52:41.000000000 +1000
-@@ -1122,7 +1122,7 @@ nv04_crtc_create(struct drm_device *dev,
- 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
- 	nv_crtc->mode_set.num_connectors = 0;
+diff -up linux-2.6.30.noarch/include/drm/drmP.h.da linux-2.6.30.noarch/include/drm/drmP.h
+--- linux-2.6.30.noarch/include/drm/drmP.h.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drmP.h	2009-09-08 16:08:09.000000000 +1000
+@@ -426,6 +426,14 @@ struct drm_buf_entry {
+ 	struct drm_freelist freelist;
+ };
  
--	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
-+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
- 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
++/* Event queued up for userspace to read */
++struct drm_pending_event {
++	struct drm_event *event;
++	struct list_head link;
++	struct drm_file *file_priv;
++	void (*destroy) (struct drm_pending_event *event);
++};
++
+ /** File private data */
+ struct drm_file {
+ 	int authenticated;
+@@ -449,6 +457,9 @@ struct drm_file {
+ 	struct drm_master *master; /* master this node is currently associated with
+ 				      N.B. not always minor->master */
+ 	struct list_head fbs;
++
++	wait_queue_head_t event_wait;
++	struct list_head event_list;
+ };
  
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-08-25 09:52:41.000000000 +1000
-@@ -810,7 +810,7 @@ nv50_crtc_create(struct drm_device *dev,
- 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
- 	crtc->mode_set.num_connectors = 0;
+ /** Wait queue */
+@@ -897,6 +908,16 @@ struct drm_minor {
+ 	struct drm_mode_group mode_group;
+ };
  
--	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
-+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
- 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
++struct drm_pending_flip {
++	struct drm_pending_event pending_event;
++	struct drm_framebuffer *old_fb;
++	struct drm_crtc *crtc;
++	u32 frame;
++	int pipe;
++	struct list_head link;
++	struct drm_event_page_flip event;
++};
++
+ /**
+  * DRM device structure. This structure represent a complete card that
+  * may contain multiple heads.
+@@ -996,6 +1017,13 @@ struct drm_device {
+ 
+ 	u32 max_vblank_count;           /**< size of vblank counter register */
  
++	struct work_struct flip_work;
++
++	/**
++	 * List of objects waiting on flip completion
++	 */
++	struct list_head flip_list;
++
+ 	/*@} */
+ 	cycles_t ctx_start;
+ 	cycles_t lck_start;
+@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_devi
+ extern int drm_open(struct inode *inode, struct file *filp);
+ extern int drm_stub_open(struct inode *inode, struct file *filp);
+ extern int drm_fasync(int fd, struct file *filp, int on);
++extern ssize_t drm_read(struct file *filp, char __user *buffer,
++			size_t count, loff_t *offset);
+ extern int drm_release(struct inode *inode, struct file *filp);
+ 
+ 				/* Mapping support (drm_vm.h) */
+@@ -1300,6 +1330,8 @@ extern void drm_vblank_pre_modeset(struc
+ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+ extern int drm_modeset_ctl(struct drm_device *dev, void *data,
+ 			   struct drm_file *file_priv);
++extern void drm_finish_pending_flip(struct drm_device *dev,
++				   struct drm_pending_flip *f, u32 frame);
+ 
+ 				/* AGP/GART support (drm_agpsupport.h) */
+ extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -p -r1.1772 -r1.1773
--- kernel.spec	8 Sep 2009 04:57:22 -0000	1.1772
+++ kernel.spec	8 Sep 2009 06:09:56 -0000	1.1773
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.210.rc9.git1
+- drm-page-flip.patch: rebase again
+
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.209.rc9.git1
 - drm-next.patch: fix r600 signal interruption return value
 



From mtasaka at fedoraproject.org  Tue Sep  8 06:11:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  8 Sep 2009 06:11:13 +0000 (UTC)
Subject: rpms/xscreensaver/F-10 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xscreensaver.spec, 1.82,
	1.83 xscreensaver-5.08-hacks-window-too-small.patch, 1.1,
	NONE xscreensaver-5.09-hacks-missing-header-creation.patch, 1.1, NONE
Message-ID: <20090908061113.73BF011C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19033/F-10

Modified Files:
	.cvsignore sources xscreensaver.spec 
Removed Files:
	xscreensaver-5.08-hacks-window-too-small.patch 
	xscreensaver-5.09-hacks-missing-header-creation.patch 
Log Message:
* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
- Update to 5.10
- All non Fedora-specific patches applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Sep 2009 14:10:32 -0000	1.12
+++ .cvsignore	8 Sep 2009 06:11:12 -0000	1.13
@@ -1 +1 @@
-xscreensaver-5.09.tar.gz
+xscreensaver-5.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Sep 2009 14:10:32 -0000	1.12
+++ sources	8 Sep 2009 06:11:12 -0000	1.13
@@ -1 +1 @@
-f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz
+0d7205f9da8e3f1b83bcda549d73a7c4  xscreensaver-5.10.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- xscreensaver.spec	3 Sep 2009 14:10:33 -0000	1.82
+++ xscreensaver.spec	8 Sep 2009 06:11:13 -0000	1.83
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.09
+%define mainversion   5.10
 %define beta_ver      %{nil}
 
 
@@ -45,11 +45,6 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Generate missing header files
-Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
-# Ubuntu bug 418419, sent upstream
-# Another SIGFPE when hack's window size is too small:
-Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
 #
 # Not sent to upstream yet, must do later
@@ -207,8 +202,6 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .missing
-%patch55 -p1 -b .small
 
 change_option(){
    set +x
@@ -673,11 +666,16 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
+- Update to 5.10
+- All non Fedora-specific patches applied upstream
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
 - Update to 5.09
 - Drop patches applied by upstream (1 patch still pending on upstream
   + 2 Fedora specific patches left)
 - Add one patch to generate missing header files
+- Suppress compilation warnings with -std=c89
 
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small


--- xscreensaver-5.08-hacks-window-too-small.patch DELETED ---


--- xscreensaver-5.09-hacks-missing-header-creation.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Sep  8 06:11:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  8 Sep 2009 06:11:15 +0000 (UTC)
Subject: rpms/xscreensaver/devel
	xscreensaver-5.08-hacks-window-too-small.patch, 1.1,
	NONE xscreensaver-5.09-hacks-missing-header-creation.patch, 1.1,
	NONE xscreensaver-5.09-kill-c89-warning.patch, 1.1, NONE
Message-ID: <20090908061115.07EF411C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19033/devel

Removed Files:
	xscreensaver-5.08-hacks-window-too-small.patch 
	xscreensaver-5.09-hacks-missing-header-creation.patch 
	xscreensaver-5.09-kill-c89-warning.patch 
Log Message:
* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
- Update to 5.10
- All non Fedora-specific patches applied upstream



--- xscreensaver-5.08-hacks-window-too-small.patch DELETED ---


--- xscreensaver-5.09-hacks-missing-header-creation.patch DELETED ---


--- xscreensaver-5.09-kill-c89-warning.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Sep  8 06:11:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  8 Sep 2009 06:11:14 +0000 (UTC)
Subject: rpms/xscreensaver/F-11 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xscreensaver.spec, 1.93,
	1.94 xscreensaver-5.08-hacks-window-too-small.patch, 1.1,
	NONE xscreensaver-5.09-hacks-missing-header-creation.patch, 1.1, NONE
Message-ID: <20090908061114.4D1B011C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19033/F-11

Modified Files:
	.cvsignore sources xscreensaver.spec 
Removed Files:
	xscreensaver-5.08-hacks-window-too-small.patch 
	xscreensaver-5.09-hacks-missing-header-creation.patch 
Log Message:
* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
- Update to 5.10
- All non Fedora-specific patches applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Sep 2009 14:10:33 -0000	1.12
+++ .cvsignore	8 Sep 2009 06:11:13 -0000	1.13
@@ -1 +1 @@
-xscreensaver-5.09.tar.gz
+xscreensaver-5.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Sep 2009 14:10:33 -0000	1.12
+++ sources	8 Sep 2009 06:11:13 -0000	1.13
@@ -1 +1 @@
-f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz
+0d7205f9da8e3f1b83bcda549d73a7c4  xscreensaver-5.10.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- xscreensaver.spec	3 Sep 2009 14:10:33 -0000	1.93
+++ xscreensaver.spec	8 Sep 2009 06:11:14 -0000	1.94
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.09
+%define mainversion   5.10
 %define beta_ver      %{nil}
 
 
@@ -45,11 +45,6 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Generate missing header files
-Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
-# Ubuntu bug 418419, sent upstream
-# Another SIGFPE when hack's window size is too small:
-Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
 #
 # Not sent to upstream yet, must do later
@@ -207,8 +202,6 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .missing
-%patch55 -p1 -b .small
 
 change_option(){
    set +x
@@ -673,11 +666,16 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
+- Update to 5.10
+- All non Fedora-specific patches applied upstream
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
 - Update to 5.09
 - Drop patches applied by upstream (1 patch still pending on upstream
   + 2 Fedora specific patches left)
 - Add one patch to generate missing header files
+- Suppress compilation warnings with -std=c89
 
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small


--- xscreensaver-5.08-hacks-window-too-small.patch DELETED ---


--- xscreensaver-5.09-hacks-missing-header-creation.patch DELETED ---



From ovasik at fedoraproject.org  Tue Sep  8 07:02:08 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  8 Sep 2009 07:02:08 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.66, 1.67 setup.spec, 1.84,
	1.85 sources, 1.67, 1.68
Message-ID: <20090908070208.EED1A11C0082@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4295

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
Reserve uidgid pair 108:108 for ovirt, 111:111 for saned


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	17 Aug 2009 10:39:38 -0000	1.66
+++ .cvsignore	8 Sep 2009 07:02:07 -0000	1.67
@@ -1 +1 @@
-setup-2.8.8.tar.bz2
+setup-2.8.9.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- setup.spec	17 Aug 2009 10:39:39 -0000	1.84
+++ setup.spec	8 Sep 2009 07:02:07 -0000	1.85
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.8
+Version: 2.8.9
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -89,6 +89,11 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.9-1
+- reserve uidgid pair 108:108 for ovirt from libvirt (#513261)
+- reserve uidgid pair 111:111 for saned from sane-backends
+  (#520634)
+
 * Mon Aug 17 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.8-1
 - change permissions on /etc/shadow and /etc/gshadow to 0000 and
   use capabilities for them(#517577)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	17 Aug 2009 10:39:39 -0000	1.67
+++ sources	8 Sep 2009 07:02:07 -0000	1.68
@@ -1 +1 @@
-f3412ac581439c8436158127b78101da  setup-2.8.8.tar.bz2
+81e244266ec935d8a8d57c00475f20e9  setup-2.8.9.tar.bz2



From bskeggs at fedoraproject.org  Tue Sep  8 07:11:34 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  8 Sep 2009 07:11:34 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.46, 1.47 kernel.spec, 1.1773,
	1.1774
Message-ID: <20090908071135.C35AA11C0082@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.211.rc9.git1
- drm-nouveau.patch: more misc fixes


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  689 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  432 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1201 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  350 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  942 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57749 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- drm-nouveau.patch	8 Sep 2009 04:18:48 -0000	1.46
+++ drm-nouveau.patch	8 Sep 2009 07:11:25 -0000	1.47
@@ -9686,7 +9686,7 @@ index 0000000..75dbe9b
 +#endif /* __NOUVEAU_CONNECTOR_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h
 new file mode 100644
-index 0000000..af61663
+index 0000000..49fa7b2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h
 @@ -0,0 +1,95 @@
@@ -9736,7 +9736,7 @@ index 0000000..af61663
 +		int cpp;
 +		bool blanked;
 +		uint32_t offset;
-+		bool tiled;
++		uint32_t tile_flags;
 +	} fb;
 +
 +	struct {
@@ -12454,7 +12454,7 @@ index 0000000..0f40414
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
 new file mode 100644
-index 0000000..32b4bb9
+index 0000000..230a99b
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
 @@ -0,0 +1,261 @@
@@ -12664,7 +12664,7 @@ index 0000000..32b4bb9
 +			schedule_timeout(1);
 +
 +		if (intr && signal_pending(current)) {
-+			ret = -ERESTART;
++			ret = -ERESTARTSYS;
 +			break;
 +		}
 +	}
@@ -12721,10 +12721,10 @@ index 0000000..32b4bb9
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
 new file mode 100644
-index 0000000..f0c78a8
+index 0000000..226eca2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -0,0 +1,943 @@
+@@ -0,0 +1,942 @@
 +/*
 + * Copyright (C) 2008 Ben Skeggs.
 + * All Rights Reserved.
@@ -13037,15 +13037,16 @@ index 0000000..f0c78a8
 +				     chan->fence.sequence);
 +		if (ret) {
 +			nouveau_gem_pushbuf_backoff(list);
-+			if (ret == -EAGAIN) {
++			if (ret == -EAGAIN)
 +				ret = ttm_bo_wait_unreserved(&nvbo->bo, false);
-+				if (unlikely(ret))
-+					goto out_unref;
-+				goto retry;
-+			} else
++			drm_gem_object_unreference(gem);
++			if (ret)
 +				goto out_unref;
++			goto retry;
 +		}
 +
++		list_add_tail(&nvbo->entry, list);
++
 +		if (unlikely(atomic_read(&nvbo->bo.cpu_writers) > 0)) {
 +			nouveau_gem_pushbuf_backoff(list);
 +			ret = ttm_bo_wait_cpu(&nvbo->bo, false);
@@ -13053,8 +13054,6 @@ index 0000000..f0c78a8
 +				goto out_unref;
 +			goto retry;
 +		}
-+
-+		list_add_tail(&nvbo->entry, list);
 +	}
 +
 +	b = pbbo;
@@ -30798,10 +30797,10 @@ index 0000000..2a3495e
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..8fb1ef8
+index 0000000..641a85a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,796 @@
+@@ -0,0 +1,799 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -30952,11 +30951,14 @@ index 0000000..8fb1ef8
 +		OUT_RING  (evo, crtc->fb.offset >> 8);
 +		OUT_RING  (evo, 0);
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, FB_DMA), 1);
-+		if (dev_priv->chipset != 0x50 && crtc->fb.tiled)
-+			if (crtc->fb.cpp == 2)
++		if (dev_priv->chipset != 0x50)
++			if (crtc->fb.tile_flags == 0x7a00)
++				OUT_RING(evo, NvEvoFB32);
++			else
++			if (crtc->fb.tile_flags == 0x7000)
 +				OUT_RING(evo, NvEvoFB16);
 +			else
-+				OUT_RING(evo, NvEvoFB32);
++				OUT_RING(evo, NvEvoVRAM);
 +		else
 +			OUT_RING(evo, NvEvoVRAM);
 +	}
@@ -31365,7 +31367,7 @@ index 0000000..8fb1ef8
 +	}
 +
 +	crtc->fb.offset = fb->nvbo->bo.offset - dev_priv->vm_vram_base;
-+	crtc->fb.tiled = fb->nvbo->tile_flags ? true : false;
++	crtc->fb.tile_flags = fb->nvbo->tile_flags;
 +	crtc->fb.cpp = drm_fb->bits_per_pixel / 8;
 +	if (!crtc->fb.blanked && dev_priv->chipset != 0x50) {
 +		ret = RING_SPACE(evo, 2);
@@ -31373,12 +31375,12 @@ index 0000000..8fb1ef8
 +			return ret;
 +
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, FB_DMA), 1);
-+		if (crtc->fb.tiled) {
-+			if (crtc->fb.cpp == 4)
-+				OUT_RING  (evo, NvEvoFB32);
-+			else
-+				OUT_RING  (evo, NvEvoFB16);
-+		} else
++		if (crtc->fb.tile_flags == 0x7a00)
++			OUT_RING  (evo, NvEvoFB32);
++		else
++		if (crtc->fb.tile_flags == 0x7000)
++			OUT_RING  (evo, NvEvoFB16);
++		else
 +			OUT_RING  (evo, NvEvoVRAM);
 +	}
 +
@@ -31390,7 +31392,7 @@ index 0000000..8fb1ef8
 +	OUT_RING  (evo, crtc->fb.offset >> 8);
 +	OUT_RING  (evo, 0);
 +	OUT_RING  (evo, (drm_fb->height << 16) | drm_fb->width);
-+	if (!crtc->fb.tiled) {
++	if (!crtc->fb.tile_flags) {
 +		OUT_RING  (evo, drm_fb->pitch | (1 << 20));
 +	} else {
 +		OUT_RING  (evo, ((drm_fb->pitch / 4) << 4) |


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1773
retrieving revision 1.1774
diff -u -p -r1.1773 -r1.1774
--- kernel.spec	8 Sep 2009 06:09:56 -0000	1.1773
+++ kernel.spec	8 Sep 2009 07:11:29 -0000	1.1774
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.211.rc9.git1
+- drm-nouveau.patch: more misc fixes
+
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.210.rc9.git1
 - drm-page-flip.patch: rebase again
 



From bskeggs at fedoraproject.org  Tue Sep  8 07:32:16 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  8 Sep 2009 07:32:16 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.47, 1.48 kernel.spec, 1.1774,
	1.1775
Message-ID: <20090908073216.D657B11C0082@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13406

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.212.rc9.git1
- drm-nouveau.patch: fix ppc build



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  689 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  432 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1201 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  942 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57754 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- drm-nouveau.patch	8 Sep 2009 07:11:25 -0000	1.47
+++ drm-nouveau.patch	8 Sep 2009 07:32:13 -0000	1.48
@@ -12044,10 +12044,10 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..f46d543
+index 0000000..6f1bfdc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
-@@ -0,0 +1,350 @@
+@@ -0,0 +1,355 @@
 +/*
 + * Copyright ? 2007 David Airlie
 + *
@@ -12173,6 +12173,7 @@ index 0000000..f46d543
 +	.gamma_set = nouveau_fbcon_gamma_set,
 +};
 +
++#if defined(__i386__) || defined(__x86_64__)
 +static bool
 +nouveau_fbcon_has_vesafb(struct drm_device *dev)
 +{
@@ -12207,6 +12208,7 @@ index 0000000..f46d543
 +
 +	return true;
 +}
++#endif
 +
 +static int
 +nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
@@ -12305,6 +12307,7 @@ index 0000000..f46d543
 +	info->fix.mmio_len = pci_resource_len(dev->pdev, 1);
 +
 +	/* Set aperture base/size for vesafb takeover */
++#if defined(__i386__) || defined(__x86_64__)
 +	if (nouveau_fbcon_has_vesafb(dev)) {
 +		/* Some NVIDIA VBIOS' are stupid and decide to put the
 +		 * framebuffer in the middle of the PRAMIN BAR for
@@ -12315,7 +12318,9 @@ index 0000000..f46d543
 +		 */
 +		info->aperture_base = screen_info.lfb_base;
 +		info->aperture_size = screen_info.lfb_size * 65536;
-+	} else {
++	} else
++#endif
++	{
 +		info->aperture_base = info->fix.mmio_start;
 +		info->aperture_size = info->fix.mmio_len;
 +	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1774
retrieving revision 1.1775
diff -u -p -r1.1774 -r1.1775
--- kernel.spec	8 Sep 2009 07:11:29 -0000	1.1774
+++ kernel.spec	8 Sep 2009 07:32:14 -0000	1.1775
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.212.rc9.git1
+- drm-nouveau.patch: fix ppc build
+
 * Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.211.rc9.git1
 - drm-nouveau.patch: more misc fixes
 



From michich at fedoraproject.org  Tue Sep  8 07:32:52 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue,  8 Sep 2009 07:32:52 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim.spec,1.33,1.34
Message-ID: <20090908073252.A5EDA11C0082@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13724

Modified Files:
	jabbim.spec 
Log Message:
* Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
- Fix compact-style roster drawing bug.
  (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- jabbim.spec	7 Sep 2009 14:26:22 -0000	1.33
+++ jabbim.spec	8 Sep 2009 07:32:52 -0000	1.34
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.7.svn%{svndate}%{?dist}
+Release:	0.8.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,6 +13,7 @@ URL:		http://dev.jabbim.cz/jabbim
 # tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,8 +42,9 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
+%patch1 -p1
 # replace runtime detection of the SVN revision with hardcoded info
-sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
+sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
@@ -96,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
+- Fix compact-style roster drawing bug.
+  (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)
+
 * Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
 - Update to SVN rev. 4223:
   - fixes chat with contacts who have non-ASCII User Mood string



From michich at fedoraproject.org  Tue Sep  8 07:34:29 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue,  8 Sep 2009 07:34:29 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim-0.5-fix-compact-roster-drawing.diff, NONE, 
	1.1
Message-ID: <20090908073429.7973311C0082@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14307

Added Files:
	jabbim-0.5-fix-compact-roster-drawing.diff 
Log Message:
cvs add the patch


jabbim-0.5-fix-compact-roster-drawing.diff:
 style.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jabbim-0.5-fix-compact-roster-drawing.diff ---
commit 1e6896cb9cd32df467baf44cdb0abbfe478b04ec
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Tue Sep 8 07:26:54 2009 +0000

    Roster drawing fix
    
    With compact roster style and a non-ASCII contact name, opening a chat
    with the contact would cause the roster to stop drawing all contacts
    below it. Caused by QString+unicode mismatch.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk at 4224 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/rosterstyles/compact/style.py b/rosterstyles/compact/style.py
index b07ae16..04ea89d 100644
--- a/rosterstyles/compact/style.py
+++ b/rosterstyles/compact/style.py
@@ -148,9 +148,9 @@ class rosterStyle:
 					res=" ("+str(len(self.roster.main.client.roster['users'][useritem.jid].resources))+")"
 
 				if self.roster.theme:
-					doc.setHtml("<font color=\""+self.roster.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Text).name()+"\">"+useritem.escapedName+res+"</font>")
+					doc.setHtml("<font color=\""+unicode(self.roster.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Text).name())+"\">"+useritem.escapedName+res+"</font>")
 				else:
-					doc.setHtml("<font color=\""+self.roster.palet.color(QtGui.QPalette.HighlightedText).name()+"\">"+useritem.escapedName+res+"</font>")
+					doc.setHtml("<font color=\""+unicode(self.roster.palet.color(QtGui.QPalette.HighlightedText).name())+"\">"+useritem.escapedName+res+"</font>")
 
 				painter.save()
 				painter.translate(x+41,y+(22-fontHeight)/2)



From michich at fedoraproject.org  Tue Sep  8 07:41:51 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue,  8 Sep 2009 07:41:51 +0000 (UTC)
Subject: rpms/jabbim/F-11 jabbim-0.5-fix-compact-roster-drawing.diff, NONE, 
	1.1 jabbim.spec, 1.32, 1.33
Message-ID: <20090908074151.D1BE511C0082@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16295

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.5-fix-compact-roster-drawing.diff 
Log Message:
* Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
- Fix compact-style roster drawing bug.
  (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)


jabbim-0.5-fix-compact-roster-drawing.diff:
 style.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jabbim-0.5-fix-compact-roster-drawing.diff ---
commit 1e6896cb9cd32df467baf44cdb0abbfe478b04ec
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Tue Sep 8 07:26:54 2009 +0000

    Roster drawing fix
    
    With compact roster style and a non-ASCII contact name, opening a chat
    with the contact would cause the roster to stop drawing all contacts
    below it. Caused by QString+unicode mismatch.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk at 4224 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/rosterstyles/compact/style.py b/rosterstyles/compact/style.py
index b07ae16..04ea89d 100644
--- a/rosterstyles/compact/style.py
+++ b/rosterstyles/compact/style.py
@@ -148,9 +148,9 @@ class rosterStyle:
 					res=" ("+str(len(self.roster.main.client.roster['users'][useritem.jid].resources))+")"
 
 				if self.roster.theme:
-					doc.setHtml("<font color=\""+self.roster.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Text).name()+"\">"+useritem.escapedName+res+"</font>")
+					doc.setHtml("<font color=\""+unicode(self.roster.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Text).name())+"\">"+useritem.escapedName+res+"</font>")
 				else:
-					doc.setHtml("<font color=\""+self.roster.palet.color(QtGui.QPalette.HighlightedText).name()+"\">"+useritem.escapedName+res+"</font>")
+					doc.setHtml("<font color=\""+unicode(self.roster.palet.color(QtGui.QPalette.HighlightedText).name())+"\">"+useritem.escapedName+res+"</font>")
 
 				painter.save()
 				painter.translate(x+41,y+(22-fontHeight)/2)


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/jabbim.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- jabbim.spec	7 Sep 2009 14:42:18 -0000	1.32
+++ jabbim.spec	8 Sep 2009 07:41:51 -0000	1.33
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.7.svn%{svndate}%{?dist}
+Release:	0.8.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,6 +13,7 @@ URL:		http://dev.jabbim.cz/jabbim
 # tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,8 +42,9 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
+%patch1 -p1
 # replace runtime detection of the SVN revision with hardcoded info
-sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
+sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
@@ -96,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
+- Fix compact-style roster drawing bug.
+  (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)
+
 * Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
 - Update to SVN rev. 4223:
   - fixes chat with contacts who have non-ASCII User Mood string



From denis at fedoraproject.org  Tue Sep  8 07:49:07 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue,  8 Sep 2009 07:49:07 +0000 (UTC)
Subject: rpms/libsigc++20/devel .cvsignore, 1.9, 1.10 libsigc++.spec, 1.21, 
	1.22 sources, 1.10, 1.11
Message-ID: <20090908074907.CC51811C0082@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libsigc++20/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20379

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to upstream version 2.2.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Aug 2009 07:09:02 -0000	1.9
+++ .cvsignore	8 Sep 2009 07:49:07 -0000	1.10
@@ -1 +1 @@
-libsigc++-2.2.4.1.tar.bz2
+libsigc++-2.2.4.2.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libsigc++.spec	30 Aug 2009 07:09:02 -0000	1.21
+++ libsigc++.spec	8 Sep 2009 07:49:07 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           libsigc++20
-Version:        2.2.4.1
+Version:        2.2.4.2
 Release:        1%{?dist}
 
 Summary:        Typesafe signal framework for C++
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  8 2009 Denis Leroy <denis at poolshark.org> - 2.2.4.2-1
+- Update to upstream version 2.2.4.2
+
 * Sat Aug 29 2009 Denis Leroy <denis at poolshark.org> - 2.2.4.1-1
 - Update to upstream 2.2.4.1
 - Added devhelp book and necessary BRs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 Aug 2009 07:09:02 -0000	1.10
+++ sources	8 Sep 2009 07:49:07 -0000	1.11
@@ -1 +1 @@
-3a362dbcd23a9c3bcb2a257fac8a9466  libsigc++-2.2.4.1.tar.bz2
+545edbb7b54eec4f723323d3158c0e0c  libsigc++-2.2.4.2.tar.bz2



From dwmw2 at fedoraproject.org  Tue Sep  8 08:12:00 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue,  8 Sep 2009 08:12:00 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch,
	NONE, 
	1.1.2.2 linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch, NONE,
	1.1.2.2 kernel.spec, 1.1679.2.21,
	1.1679.2.22 linux-2.6-ppc64-vs-broadcom.patch, 1.1.2.1, 1.1.2.2
Message-ID: <20090908081200.A23FA11C0082@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27678

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec linux-2.6-ppc64-vs-broadcom.patch 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
Log Message:
Fix oops introduced by Ben's changes to the G5 iommu fix


linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch:
 lmb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu, 27 Aug 2009 07:20:30 +0000 (+1000)
Subject: lmb: Remove __init from lmb_end_of_DRAM()
X-Git-Tag: v2.6.31-rc8~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4f8ee2c9cc0e885d2bb50ef26db66150ab25213e

lmb: Remove __init from lmb_end_of_DRAM()

We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
without IOMMU, but this function is marked as __init.

I don't think there's a clean way to get the top of RAM max_pfn doesn't
appear to include highmem or I missed (or we have a bug :-) so for now,
let's just avoid having a broken 2.6.31 by making this function
non-__init and we can revisit later.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/lib/lmb.c b/lib/lmb.c
index e4a6482..0343c05 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
 	return lmb.memory.size;
 }
 
-u64 __init lmb_end_of_DRAM(void)
+u64 lmb_end_of_DRAM(void)
 {
 	int idx = lmb.memory.cnt - 1;
 

linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch:
 lmb.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 31 Aug 2009 03:48:16 +0000 (+1000)
Subject: lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1a37f184fa7824982a5f434c06981ec46a66cef7

lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h

My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
was also marked as such in the .h

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index c46c895..2442e3f 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
 extern u64 __init __lmb_alloc_base(u64 size,
 		u64 align, u64 max_addr);
 extern u64 __init lmb_phys_mem_size(void);
-extern u64 __init lmb_end_of_DRAM(void);
+extern u64 lmb_end_of_DRAM(void);
 extern void __init lmb_enforce_memory_limit(u64 memory_limit);
 extern int __init lmb_is_reserved(u64 addr);
 extern int lmb_find(struct lmb_property *res);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.21
retrieving revision 1.1679.2.22
diff -u -p -r1.1679.2.21 -r1.1679.2.22
--- kernel.spec	1 Sep 2009 20:56:52 -0000	1.1679.2.21
+++ kernel.spec	8 Sep 2009 08:11:58 -0000	1.1679.2.22
@@ -619,8 +619,10 @@ Patch51: posix-timers-fix-oops-in-clock_
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
-Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch148: linux-2.6-ppc64-vs-broadcom.patch
+Patch145: linux-2.6-imac-transparent-bridge.patch
+Patch146: linux-2.6-ppc64-vs-broadcom.patch
+Patch147: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
+Patch148: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1279,6 +1281,8 @@ ApplyPatch linux-2.6-vio-modalias.patch
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
 # Fix b43 support on no-iommu devices with <1GiB RAM
 ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
 
 #
 # SPARC64
@@ -2188,6 +2192,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Added additional fixes needed for #514787:
+  linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch
+
 * Tue Sep 01 2009 Eric Sandeen <sandeen at redhat.com>
 - Fix NFS vs. XFS oops (#502236)
 

linux-2.6-ppc64-vs-broadcom.patch:
 arch/powerpc/kernel/dma.c |    6 +++---
 include/linux/lmb.h       |    2 +-
 lib/lmb.c                 |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6-ppc64-vs-broadcom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-ppc64-vs-broadcom.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- linux-2.6-ppc64-vs-broadcom.patch	21 Aug 2009 09:50:37 -0000	1.1.2.1
+++ linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:11:59 -0000	1.1.2.2
@@ -1,21 +1,49 @@
-From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
-From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date: Mon, 10 Aug 2009 16:36:38 +1000
-Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
-
-On an iMac G5, the b43 driver is failing to initialise because trying to
-set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
-in the machine anyway:
-	https://bugzilla.redhat.com/show_bug.cgi?id=514787
-
-We should probably let it succeed if the available RAM in the system
-doesn't exceed the requested limit.
-
-Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
----
- arch/powerpc/kernel/dma.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+commit b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9
+Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date:   Mon Aug 10 16:36:38 2009 +1000
+
+    powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
+    
+    On an iMac G5, the b43 driver is failing to initialise because trying to
+    set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
+    in the machine anyway:
+        https://bugzilla.redhat.com/show_bug.cgi?id=514787
+    
+    We should probably let it succeed if the available RAM in the system
+    doesn't exceed the requested limit.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+
+commit 4f8ee2c9cc0e885d2bb50ef26db66150ab25213e
+Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date:   Thu Aug 27 17:20:30 2009 +1000
+
+    lmb: Remove __init from lmb_end_of_DRAM()
+    
+    We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
+    without IOMMU, but this function is marked as __init.
+    
+    I don't think there's a clean way to get the top of RAM max_pfn doesn't
+    appear to include highmem or I missed (or we have a bug :-) so for now,
+    let's just avoid having a broken 2.6.31 by making this function
+    non-__init and we can revisit later.
+    
+    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+commit 1a37f184fa7824982a5f434c06981ec46a66cef7
+Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date:   Mon Aug 31 13:48:16 2009 +1000
+
+    lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
+    
+    My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
+    lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
+    was also marked as such in the .h
+    
+    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
 diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
 index 20a60d6..ccf129d 100644
@@ -43,6 +71,29 @@ index 20a60d6..ccf129d 100644
  #else
  	return 1;
  #endif
--- 
-1.6.2.5
-
+diff --git a/include/linux/lmb.h b/include/linux/lmb.h
+index c46c895..2442e3f 100644
+--- a/include/linux/lmb.h
++++ b/include/linux/lmb.h
+@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
+ extern u64 __init __lmb_alloc_base(u64 size,
+ 		u64 align, u64 max_addr);
+ extern u64 __init lmb_phys_mem_size(void);
+-extern u64 __init lmb_end_of_DRAM(void);
++extern u64 lmb_end_of_DRAM(void);
+ extern void __init lmb_enforce_memory_limit(u64 memory_limit);
+ extern int __init lmb_is_reserved(u64 addr);
+ extern int lmb_find(struct lmb_property *res);
+diff --git a/lib/lmb.c b/lib/lmb.c
+index e4a6482..0343c05 100644
+--- a/lib/lmb.c
++++ b/lib/lmb.c
+@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
+ 	return lmb.memory.size;
+ }
+ 
+-u64 __init lmb_end_of_DRAM(void)
++u64 lmb_end_of_DRAM(void)
+ {
+ 	int idx = lmb.memory.cnt - 1;
+ 



From dwmw2 at fedoraproject.org  Tue Sep  8 08:21:27 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue,  8 Sep 2009 08:21:27 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom.patch,1.1.2.2,1.1.2.3
Message-ID: <20090908082127.63A6E11C0082@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30651

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
oops, revert changes to original patch file. I copied what we had in other branches and put the fixes in separate files

linux-2.6-ppc64-vs-broadcom.patch:
 dma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6-ppc64-vs-broadcom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-ppc64-vs-broadcom.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.2 -r1.1.2.3
--- linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:11:59 -0000	1.1.2.2
+++ linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:21:26 -0000	1.1.2.3
@@ -1,49 +1,21 @@
-commit b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9
-Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date:   Mon Aug 10 16:36:38 2009 +1000
-
-    powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
-    
-    On an iMac G5, the b43 driver is failing to initialise because trying to
-    set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
-    in the machine anyway:
-        https://bugzilla.redhat.com/show_bug.cgi?id=514787
-    
-    We should probably let it succeed if the available RAM in the system
-    doesn't exceed the requested limit.
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-
-commit 4f8ee2c9cc0e885d2bb50ef26db66150ab25213e
-Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date:   Thu Aug 27 17:20:30 2009 +1000
-
-    lmb: Remove __init from lmb_end_of_DRAM()
-    
-    We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
-    without IOMMU, but this function is marked as __init.
-    
-    I don't think there's a clean way to get the top of RAM max_pfn doesn't
-    appear to include highmem or I missed (or we have a bug :-) so for now,
-    let's just avoid having a broken 2.6.31 by making this function
-    non-__init and we can revisit later.
-    
-    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-
-commit 1a37f184fa7824982a5f434c06981ec46a66cef7
-Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Date:   Mon Aug 31 13:48:16 2009 +1000
-
-    lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
-    
-    My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
-    lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
-    was also marked as such in the .h
-    
-    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date: Mon, 10 Aug 2009 16:36:38 +1000
+Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
+
+On an iMac G5, the b43 driver is failing to initialise because trying to
+set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
+in the machine anyway:
+	https://bugzilla.redhat.com/show_bug.cgi?id=514787
+
+We should probably let it succeed if the available RAM in the system
+doesn't exceed the requested limit.
+
+Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+---
+ arch/powerpc/kernel/dma.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
 index 20a60d6..ccf129d 100644
@@ -66,34 +38,11 @@ index 20a60d6..ccf129d 100644
 +	/* Could be improved so platforms can set the limit in case
  	 * they have limited DMA windows
  	 */
--	return mask >= DMA_32BIT_MASK;
+-	return mask >= DMA_BIT_MASK(32);
 +	return mask >= (lmb_end_of_DRAM() - 1);
  #else
  	return 1;
  #endif
-diff --git a/include/linux/lmb.h b/include/linux/lmb.h
-index c46c895..2442e3f 100644
---- a/include/linux/lmb.h
-+++ b/include/linux/lmb.h
-@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
- extern u64 __init __lmb_alloc_base(u64 size,
- 		u64 align, u64 max_addr);
- extern u64 __init lmb_phys_mem_size(void);
--extern u64 __init lmb_end_of_DRAM(void);
-+extern u64 lmb_end_of_DRAM(void);
- extern void __init lmb_enforce_memory_limit(u64 memory_limit);
- extern int __init lmb_is_reserved(u64 addr);
- extern int lmb_find(struct lmb_property *res);
-diff --git a/lib/lmb.c b/lib/lmb.c
-index e4a6482..0343c05 100644
---- a/lib/lmb.c
-+++ b/lib/lmb.c
-@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
- 	return lmb.memory.size;
- }
- 
--u64 __init lmb_end_of_DRAM(void)
-+u64 lmb_end_of_DRAM(void)
- {
- 	int idx = lmb.memory.cnt - 1;
- 
+-- 
+1.6.2.5
+



From dwmw2 at fedoraproject.org  Tue Sep  8 08:22:52 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue,  8 Sep 2009 08:22:52 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom.patch,1.1.2.3,1.1.2.4
Message-ID: <20090908082252.1113C11C0082@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31075

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
and make it build again

linux-2.6-ppc64-vs-broadcom.patch:
 dma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6-ppc64-vs-broadcom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-ppc64-vs-broadcom.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:21:26 -0000	1.1.2.3
+++ linux-2.6-ppc64-vs-broadcom.patch	8 Sep 2009 08:22:51 -0000	1.1.2.4
@@ -38,7 +38,7 @@ index 20a60d6..ccf129d 100644
 +	/* Could be improved so platforms can set the limit in case
  	 * they have limited DMA windows
  	 */
--	return mask >= DMA_BIT_MASK(32);
+-	return mask >= DMA_32BIT_MASK;
 +	return mask >= (lmb_end_of_DRAM() - 1);
  #else
  	return 1;



From ovasik at fedoraproject.org  Tue Sep  8 08:46:57 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  8 Sep 2009 08:46:57 +0000 (UTC)
Subject: rpms/coreutils/F-11 coreutils-7.2-ls-fr_FR-misalignment.patch, NONE,
	1.1 coreutils-7.5-ls-inode.patch, NONE, 1.1 coreutils.spec,
	1.259, 1.260
Message-ID: <20090908084657.87C6911C0082@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7858

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-7.2-ls-fr_FR-misalignment.patch 
	coreutils-7.5-ls-inode.patch 
Log Message:
ls -i print consistent inode numbers also for mount points(#453709), process install-info only with info files present(#515970), fix misalignment in ls -l for fr_FR.UTF_8 locales(#517626)

coreutils-7.2-ls-fr_FR-misalignment.patch:
 lib/gnulib.mk  |    6 +
 lib/mbsalign.c |  236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/mbsalign.h |   23 +++++
 src/ls.c       |  105 ++++++++++++++++++++++++-
 4 files changed, 367 insertions(+), 3 deletions(-)

--- NEW FILE coreutils-7.2-ls-fr_FR-misalignment.patch ---
diff -urNp coreutils-7.2-orig/lib/gnulib.mk coreutils-7.2/lib/gnulib.mk
--- coreutils-7.2-orig/lib/gnulib.mk	2009-03-26 09:12:33.000000000 +0100
+++ coreutils-7.2/lib/gnulib.mk	2009-09-08 10:08:09.000000000 +0200
@@ -1600,6 +1600,12 @@ EXTRA_DIST += str-kmp.h
 
 ## end   gnulib module mbsstr
 
+## begin gnulib module mbsalign
+
+libcoreutils_a_SOURCES += mbsalign.c mbsalign.h
+
+## end   gnulib module mbsalign
+
 ## begin gnulib module mbswidth
 
 libcoreutils_a_SOURCES += mbswidth.h mbswidth.c
diff -urNp coreutils-7.2-orig/lib/mbsalign.c coreutils-7.2/lib/mbsalign.c
--- coreutils-7.2-orig/lib/mbsalign.c	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.2/lib/mbsalign.c	2009-08-15 17:25:32.000000000 +0200
@@ -0,0 +1,236 @@
+/* Align/Truncate a string in a given screen width
+   Copyright (C) 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by P?draig Brady.  */
+
+#include <config.h>
+#include "mbsalign.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <limits.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#ifndef MIN
+# define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+/* Replace non printable chars.
+   Return 1 if replacement made, 0 otherwise.  */
+
+static bool
+wc_ensure_printable (wchar_t *wchars)
+{
+  bool replaced = false;
+  wchar_t *wc = wchars;
+  while (*wc)
+    {
+      if (!iswprint ((wint_t) *wc))
+        {
+          *wc = 0xFFFD; /* L'\uFFFD' (replacement char) */
+          replaced = true;
+        }
+      wc++;
+    }
+  return replaced;
+}
+
+/* Truncate wchar string to width cells.
+ * Returns number of cells used.  */
+
+static size_t
+wc_truncate (wchar_t *wc, size_t width)
+{
+  size_t cells = 0;
+  int next_cells = 0;
+
+  while (*wc)
+    {
+      next_cells = wcwidth (*wc);
+      if (next_cells == -1) /* non printable */
+        {
+          *wc = 0xFFFD; /* L'\uFFFD' (replacement char) */
+          next_cells = 1;
+        }
+      if (cells + next_cells > width)
+        break;
+      cells += next_cells;
+      wc++;
+    }
+  *wc = L'\0';
+  return cells;
+}
+
+/* FIXME: move this function to gnulib as it's missing on:
+   OpenBSD 3.8, IRIX 5.3, Solaris 2.5.1, mingw, BeOS  */
+
+static int
+rpl_wcswidth (const wchar_t *s, size_t n)
+{
+  int ret = 0;
+
+  while (n-- > 0 && *s != L'\0')
+    {
+      int nwidth = wcwidth (*s++);
+      if (nwidth == -1)             /* non printable */
+        return -1;
+      if (ret > (INT_MAX - nwidth)) /* overflow */
+        return -1;
+      ret += nwidth;
+    }
+
+  return ret;
+}
+
+/* Write N_SPACES space characters to DEST while ensuring
+   nothing is written beyond DEST_END. A terminating NUL
+   is always added to DEST.
+   A pointer to the terminating NUL is returned.  */
+
+static char*
+mbs_align_pad (char *dest, const char* dest_end, size_t n_spaces)
+{
+  /* FIXME: Should we pad with "figure space" (\u2007)
+     if non ascii data present?  */
+  while (n_spaces-- && (dest < dest_end))
+    *dest++ = ' ';
+  *dest = '\0';
+  return dest;
+}
+
+/* Align a string, SRC, in a field of *WIDTH columns, handling multi-byte
+   characters; write the result into the DEST_SIZE-byte buffer, DEST.
+   ALIGNMENT specifies whether to left- or right-justify or to center.
+   If SRC requires more than *WIDTH columns, truncate it to fit.
+   When centering, the number of trailing spaces may be one less than the
+   number of leading spaces. The FLAGS parameter is unused at present.
+   Return the length in bytes required for the final result, not counting
+   the trailing NUL.  A return value of DEST_SIZE or larger means there
+   wasn't enough space.  DEST will be NUL terminated in any case.
+   Return (size_t) -1 upon error (invalid multi-byte sequence in SRC,
+   or malloc failure).
+   Update *WIDTH to indicate how many columns were used before padding.  */
+
+size_t
+mbsalign (const char *src, char *dest, size_t dest_size,
+          size_t *width, mbs_align_t align, int flags)
+{
+  size_t ret = -1;
+  size_t src_size = strlen (src) + 1;
+  char *newstr = NULL;
+  wchar_t *str_wc = NULL;
+  const char *str_to_print = src;
+  size_t n_cols = src_size - 1;
+  size_t n_used_bytes = n_cols; /* Not including NUL */
+  size_t n_spaces = 0;
+  bool conversion = false;
+  bool wc_enabled = false;
+
+  /* In multi-byte locales convert to wide characters
+     to allow easy truncation. Also determine number
+     of screen columns used.  */
+  if (MB_CUR_MAX > 1)
+    {
+      size_t src_chars = mbstowcs (NULL, src, 0);
+      if (src_chars == (size_t) -1)
+        goto mbsalign_cleanup;
+      src_chars += 1; /* make space for NUL */
+      str_wc = malloc (src_chars * sizeof (wchar_t));
+      if (str_wc == NULL)
+        goto mbsalign_cleanup;
+      if (mbstowcs (str_wc, src, src_chars) > 0)
+        {
+          str_wc[src_chars - 1] = L'\0';
+          wc_enabled = true;
+          conversion = wc_ensure_printable (str_wc);
+          n_cols = rpl_wcswidth (str_wc, src_chars);
+        }
+    }
+
+  /* If we transformed or need to truncate the source string
+     then create a modified copy of it.  */
+  if (conversion || (n_cols > *width))
+    {
+      newstr = malloc (src_size);
+      if (newstr == NULL)
+        goto mbsalign_cleanup;
+      str_to_print = newstr;
+      if (wc_enabled)
+        {
+          n_cols = wc_truncate (str_wc, *width);
+          n_used_bytes = wcstombs (newstr, str_wc, src_size);
+        }
+      else
+        {
+          n_cols = *width;
+          n_used_bytes = n_cols;
+          memcpy (newstr, src, n_cols);
+          newstr[n_cols] = '\0';
+        }
+    }
+
+  if (*width > n_cols)
+    n_spaces = *width - n_cols;
+
+  /* indicate to caller how many cells needed (not including padding).  */
+  *width = n_cols;
+
+  /* indicate to caller how many bytes needed (not including NUL).  */
+  ret = n_used_bytes + (n_spaces * 1);
+
+  /* Write as much NUL terminated output to DEST as possible.  */
+  if (dest_size != 0)
+    {
+      char *dest_end = dest + dest_size - 1;
+      size_t start_spaces = n_spaces / 2 + n_spaces % 2;
+      size_t end_spaces = n_spaces / 2;
+
+      switch (align)
+        {
+        case MBS_ALIGN_CENTER:
+          start_spaces = n_spaces / 2 + n_spaces % 2;
+          end_spaces = n_spaces / 2;
+          break;
+        case MBS_ALIGN_LEFT:
+          start_spaces = 0;
+          end_spaces = n_spaces;
+          break;
+        case MBS_ALIGN_RIGHT:
+          start_spaces = n_spaces;
+          end_spaces = 0;
+          break;
+        }
+
+      dest = mbs_align_pad (dest, dest_end, start_spaces);
+      dest = mempcpy(dest, str_to_print, MIN (n_used_bytes, dest_end - dest));
+      dest = mbs_align_pad (dest, dest_end, end_spaces);
+    }
+
+mbsalign_cleanup:
+
+  free (str_wc);
+  free (newstr);
+
+  return ret;
+}
+/*
+ * Local variables:
+ *  indent-tabs-mode: nil
+ * End:
+ */
diff -urNp coreutils-7.2-orig/lib/mbsalign.h coreutils-7.2/lib/mbsalign.h
--- coreutils-7.2-orig/lib/mbsalign.h	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.2/lib/mbsalign.h	2009-08-15 17:25:32.000000000 +0200
@@ -0,0 +1,23 @@
+/* Align/Truncate a string in a given screen width
+   Copyright (C) 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <stddef.h>
+
+typedef enum { MBS_ALIGN_LEFT, MBS_ALIGN_RIGHT, MBS_ALIGN_CENTER } mbs_align_t;
+
+size_t
+mbsalign (const char *src, char *dest, size_t dest_size,
+          size_t *width, mbs_align_t align, int flags);
diff -urNp coreutils-7.2-orig/src/ls.c coreutils-7.2/src/ls.c
--- coreutils-7.2-orig/src/ls.c	2009-09-08 10:00:39.000000000 +0200
+++ coreutils-7.2/src/ls.c	2009-09-08 10:13:41.000000000 +0200
@@ -63,6 +63,10 @@
 #include <selinux/selinux.h>
 #include <wchar.h>
 
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+
 /* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is
    present.  */
 #ifndef SA_NOCLDSTOP
@@ -105,6 +109,7 @@
 #include "strftime.h"
 #include "xstrtol.h"
 #include "areadlink.h"
+#include "mbsalign.h"
 
 #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \
 		      : (ls_mode == LS_MULTI_COL \
@@ -719,6 +724,11 @@ static char const *long_time_format[2] =
        screen columns small, because many people work in windows with
        only 80 columns.  But make this as wide as the other string
        below, for recent files.  */
+    /* TRANSLATORS: ls output needs to be aligned for ease of reading,
+       so be wary of using variable width fields from the locale.
+       Note %b is handled specially by ls and aligned correctly.
+       Note also that specifying a width as in %5b is erroneous as strftime
+       will count bytes rather than characters in multibyte locales.  */
     N_("%b %e  %Y"),
     /* strftime format for recent files (younger than 6 months), in -l
        output.  This should contain the month, day and time (at
@@ -727,6 +737,11 @@ static char const *long_time_format[2] =
        screen columns small, because many people work in windows with
        only 80 columns.  But make this as wide as the other string
        above, for non-recent files.  */
+    /* TRANSLATORS: ls output needs to be aligned for ease of reading,
+       so be wary of using variable width fields from the locale.
+       Note %b is handled specially by ls and aligned correctly.
+       Note also that specifying a width as in %5b is erroneous as strftime
+       will count bytes rather than characters in multibyte locales.  */
     N_("%b %e %H:%M")
   };
 
@@ -1007,6 +1022,57 @@ dired_dump_obstack (const char *prefix, 
     }
 }
 
+/* Read the abbreviated month names from the locale, to align them
+   and to determine the max width of the field and to truncate names
+   greater than our max allowed.
+   Note even though this handles multibyte locales correctly
+   it's not restricted to them as single byte locales can have
+   variable width abbreviated months and also precomputing/caching
+   the names was seen to increase the performance of ls significantly.  */
+
+/* max number of display cells to use */
+enum { MAX_MON_WIDTH = 5 };
+/* In the unlikely event that the abmon[] storage is not big enough
+   an error message will be displayed, and we revert to using
+   unmodified abbreviated month names from the locale database.  */
+static char abmon[12][MAX_MON_WIDTH * 2 * MB_LEN_MAX + 1];
+/* minimum width needed to align %b, 0 => don't use precomputed values.  */
+static size_t required_mon_width;
+
+static size_t
+abmon_init (void)
+{
+#ifdef HAVE_NL_LANGINFO
+  required_mon_width = MAX_MON_WIDTH;
+  size_t curr_max_width;
+  do
+    {
+      curr_max_width = required_mon_width;
+      required_mon_width = 0;
+      for (int i = 0; i < 12; i++)
+       {
+         size_t width = curr_max_width;
+
+         int req = mbsalign (nl_langinfo (ABMON_1 + i),
+                             abmon[i], sizeof (abmon[i]),
+                             &width, MBS_ALIGN_LEFT, 0);
+
+         if (req == -1 || req >= sizeof(abmon[i]))
+           {
+             required_mon_width = 0; /* ignore precomputed strings.  */
+             return required_mon_width;
+           }
+
+         required_mon_width = MAX (required_mon_width, width);
+       }
+    }
+  while (curr_max_width > required_mon_width);
+#endif
+
+  return required_mon_width;
+}
+
+
 static size_t
 dev_ino_hash (void const *x, size_t table_size)
 {
@@ -1997,6 +2063,10 @@ decode_switches (int argc, char **argv)
 		  }
 	      }
 	  }
+       /* Note we leave %5b etc. alone so user widths/flags are honoured.  */
+       if (strstr(long_time_format[0],"%b") || strstr(long_time_format[1],"%b"))
+        if (!abmon_init())
+          error (0, 0, _("error initializing month strings"));
     }
 
   return optind;
@@ -3375,6 +3445,35 @@ print_current_files (void)
     }
 }
 
+/* Replace the first %b with precomputed aligned month names.
+   Note on glibc-2.7 on linux at least this speeds up the whole `ls -lU`
+   process by around 17%, compared to letting strftime() handle the %b.  */
+
+static size_t
+align_nstrftime (char *src, size_t size, char const *fmt, struct tm const *tm,
+                int __utc, int __ns)
+{
+  const char *nfmt = fmt;
+  /* In the unlikely event that rpl_fmt below is not large enough,
+     the replacement is not done.  A malloc here slows ls down by 2%  */
+  char rpl_fmt[sizeof (abmon[0]) + 100];
+  char *pb = NULL;
+  if (required_mon_width && (pb = strstr (fmt, "%b")))
+    {
+      if (strlen(fmt) < (sizeof (rpl_fmt) - sizeof (abmon[0]) + 2))
+       {
+         char *pfmt = rpl_fmt;
+         nfmt = rpl_fmt;
+
+         pfmt = mempcpy (pfmt, fmt, pb - fmt);
+         pfmt = stpcpy (pfmt, abmon[tm->tm_mon]);
+         strcpy (pfmt, pb + 2);
+       }
+    }
+  size_t ret = nstrftime (src, size, nfmt, tm, __utc, __ns);
+  return ret;
+}
+
 /* Return the expected number of columns in a long-format time stamp,
    or zero if it cannot be calculated.  */
 
@@ -3399,7 +3498,7 @@ long_time_expected_width (void)
       if (tm)
 	{
 	  size_t len =
-	    nstrftime (buf, sizeof buf, long_time_format[0], tm, 0, 0);
+	    align_nstrftime (buf, sizeof buf, long_time_format[0], tm, 0, 0);
 	  if (len != 0)
 	    width = mbsnwidth (buf, len, 0);
 	}
@@ -3740,8 +3839,8 @@ print_long_format (const struct fileinfo
 
       /* We assume here that all time zones are offset from UTC by a
 	 whole number of seconds.  */
-      s = nstrftime (p, TIME_STAMP_LEN_MAXIMUM + 1, fmt,
-		     when_local, 0, when_timespec.tv_nsec);
+      s = align_nstrftime (p, TIME_STAMP_LEN_MAXIMUM + 1, fmt,
+		           when_local, 0, when_timespec.tv_nsec);
     }
 
   if (s || !*p)

coreutils-7.5-ls-inode.patch:
 src/ls.c                          |   23 +++++++++++-
 tests/Makefile.am                 |    1 
 tests/ls/readdir-mountpoint-inode |   72 ++++++++++++++++++++++++++++++++++++++
 tests/ls/stat-vs-dirent           |    8 ----
 4 files changed, 96 insertions(+), 8 deletions(-)

--- NEW FILE coreutils-7.5-ls-inode.patch ---
>From 3af748aa25193e8a5a8fe520cd967cfbc4d71cb8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 2 Jul 2008 18:01:43 +0200
Subject: [PATCH] ls -i: print consistent inode numbers also for mount points

On most unix- and linux-based kernels, ls -i DIR_CONTAINING_MOUNT_POINT
would print the wrong inode number for any entry that is a mount point.
It would do that by relying on readdir's dirent.d_ino values, while
most readdir implementations return the inode number of the underlying,
inaccessible directory.  Thus, it is not consistent with what you'd
get when applying stat to the same entry.  This bug led to surprising
results like "ls -i" and "ls -i --color" printing different numbers (ls
must usually "stat" a file to colorize its name).  This change makes it
so that on offending systems, ls must stat non-command-line-arguments
for which otherwise it would be able to use "for free" dirent.d_ino
values.  Regardless of this change, ls is already required to stat every
command-line argument.  Note: versions of GNU ls prior to coreutils-6.0
did not perform the invalid optimization, and hence always printed
correct inode numbers.  Thus, for the sake of correctness, ls -i is
forgoing the readdir optimization, for any kernel (including linux!)
with POSIX-nonconforming readdir.  Note that currently, only Cygwin has
been agile enough to conform.

* src/ls.c (RELIABLE_D_INO): Define.
(print_dir): Use it.
For plenty of discussion, see this long thread:
http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/14020
This bug was introduced by the 2006-02-26 commit, 33eb3efe:
"In ls, avoid calling stat for --inode (-i), when possible."
* tests/ls/readdir-mountpoint-inode: New test.
* tests/Makefile.am (TESTS): Add it.
* tests/ls/stat-vs-dirent: Don't suppress failure of this test,
now that ls -i is fixed.  Though note that it doesn't test well,
since it compares only the always-stat'd command-line arguments.
---
 src/ls.c                          |   23 +++++++++++-
 tests/Makefile.am                 |    1 +
 tests/ls/readdir-mountpoint-inode |   72 +++++++++++++++++++++++++++++++++++++
 tests/ls/stat-vs-dirent           |    7 +---
 4 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100755 tests/ls/readdir-mountpoint-inode

diff --git a/src/ls.c b/src/ls.c
index 6316dfa..553090d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -126,6 +126,26 @@
    Subtracting doesn't always work, due to overflow.  */
 #define longdiff(a, b) ((a) < (b) ? -1 : (a) > (b))

+/* Unix-based readdir implementations have historically returned a dirent.d_ino
+   value that is sometimes not equal to the stat-obtained st_ino value for
+   that same entry.  This error occurs for a readdir entry that refers
+   to a mount point.  readdir's error is to return the inode number of
+   the underlying directory -- one that typically cannot be stat'ed, as
+   long as a file system is mounted on that directory.  RELIABLE_D_INO
+   encapsulates whether we can use the more efficient approach of relying
+   on readdir-supplied d_ino values, or whether we must incur the cost of
+   calling stat or lstat to obtain each guaranteed-valid inode number.  */
+
+#ifndef READDIR_LIES_ABOUT_MOUNTPOINT_D_INO
+# define READDIR_LIES_ABOUT_MOUNTPOINT_D_INO 1
+#endif
+
+#if READDIR_LIES_ABOUT_MOUNTPOINT_D_INO
+# define RELIABLE_D_INO(dp) NOT_AN_INODE_NUMBER
+#else
+# define RELIABLE_D_INO(dp) D_INO (dp)
+#endif
+
 #if ! HAVE_STRUCT_STAT_ST_AUTHOR
 # define st_author st_uid
 #endif
@@ -2501,7 +2521,8 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
 # endif
 		}
 #endif
-	      total_blocks += gobble_file (next->d_name, type, D_INO (next),
+              total_blocks += gobble_file (next->d_name, type,
+                                           RELIABLE_D_INO (next),
					   false, name);

	      /* In this narrow case, print out each name right away, so
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3177056..0151cb0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -358,6 +358,7 @@ TESTS =                                             \
   ls/no-arg					\
   ls/no-cap					\
   ls/proc-selinux-segfault			\
+  ls/readdir-mountpoint-inode                  \
   ls/recursive					\
   ls/rt-1					\
   ls/stat-dtype					\
diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode
new file mode 100755
index 0000000..763cab1
--- /dev/null
+++ b/tests/ls/readdir-mountpoint-inode
@@ -0,0 +1,72 @@
+#!/bin/sh
+# ensure that ls -i works also for mount points
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  ls --version
+fi
+
+. $srcdir/test-lib.sh
+
+fail=0
+
+mount_points=$(df --local -P 2>&1 | sed -n 's,.*[0-9]% \(/.\),\1,p')
+test -z "$mount_points" && skip_test_ "this test requires a non-root mount point"
+
+# Given e.g., /dev/shm, produce the list of GNU ls options that
+# let us list just that entry using readdir data from its parent:
+# ls -i -I '[^s]*' -I 's[^h]*' -I 'sh[^m]*' -I 'shm?*' -I '.?*' \
+# -I '?' -I '??' /dev
+
+ls_ignore_options()
+{
+  name=$1
+  opts="-I '.?*' -I '$name?*'"
+  while :; do
+    glob=$(echo "$name"|sed 's/\(.*\)\(.\)$/\1[^\2]*/')
+    opts="$opts -I '$glob'"
+    name=$(echo "$name"|sed 's/.$//')
+    test -z "$name" && break
+    glob=$(echo "$name"|sed 's/./?/g')
+    opts="$opts -I '$glob'"
+  done
+  echo "$opts"
+}
+
+inode_via_readdir()
+{
+  mount_point=$1
+  base=$(basename $mount_point)
+  case $base in
+    .*) skip_test_ 'mount point component starts with "."' ;;
+    *[*?]*) skip_test_ 'mount point component contains "?" or "*"' ;;
+  esac
+  opts=$(ls_ignore_options "$base")
+  parent_dir=$(dirname $mount_point)
+  eval "ls -i $opts $parent_dir" | sed 's/ .*//'
+}
+
+# FIXME: use a timeout, in case stat'ing mount points takes too long.
+
+for dir in $mount_points; do
+  readdir_inode=$(inode_via_readdir $dir)
+  stat_inode=$(env stat --format=%i $dir)
+  test "$readdir_inode" = "$stat_inode" || fail=1
+done
+
+Exit $fail
diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent
index c1d7ff5..064ec12 100755
--- a/tests/ls/stat-vs-dirent
+++ b/tests/ls/stat-vs-dirent
@@ -49,12 +49,7 @@ while :; do
 	The flaw isn't serious for coreutils, but it might break other tools,
 	so you should report it to your operating system vendor." 1>&2

-      # This test fails too often, and we don't want to be distracted
-      # with reports, since the code that could be affected by the losing
-      # behavior (pwd and getcwd) works around any mismatch.
-      # So do continue to issue the warning, but don't count it as a
-      # real failure.
-      # fail=1
+      fail=1
       break
     fi
   fi
--
1.6.4.2.363.g2d6e


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-11/coreutils.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- coreutils.spec	5 Aug 2009 08:56:45 -0000	1.259
+++ coreutils.spec	8 Sep 2009 08:46:55 -0000	1.260
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -21,6 +21,8 @@ Source203:  coreutils-runuser-l.pamd
 # From upstream
 Patch1: coreutils-7.4-ls-1U.patch
 Patch2: coreutils-7.4-install-SELinux.patch
+Patch3: coreutils-7.5-ls-inode.patch
+Patch4: coreutils-7.2-ls-fr_FR-misalignment.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -103,6 +105,8 @@ the old GNU fileutils, sh-utils, and tex
 # From upstream
 %patch1 -p1 -b .ls-1U
 %patch2 -p1 -b .install-SELinux
+%patch3 -p1 -b .lsinode
+%patch4 -p1 -b .frenchmonths
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -250,19 +254,25 @@ rm -rf $RPM_BUILD_ROOT
 # coreutils.info. else their postun'll be run too late
 # and install-info will fail badly because of duplicates
 for file in sh-utils textutils fileutils; do
+  if [ -f %{_infodir}/$file.info ]; then
     /sbin/install-info --delete %{_infodir}/$file.info --dir=%{_infodir}/dir &> /dev/null || :
+  fi
 done
 
 %preun
 if [ $1 = 0 ]; then
+  if [ -f %{_infodir}/%{name}.info ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+  fi
 fi
 
 %post
 /bin/grep -v '(sh-utils)\|(fileutils)\|(textutils)' %{_infodir}/dir > \
   %{_infodir}/dir.rpmmodify || exit 0
     /bin/mv -f %{_infodir}/dir.rpmmodify %{_infodir}/dir
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -f %{_infodir}/%{name}.info ]; then
+  /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -315,6 +325,12 @@ fi
 /sbin/runuser
 
 %changelog
+* Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> - 7.2-4
+- ls -i: print consistent inode numbers also for mount points
+  (#453709)
+- do process install-info only with info files present(#515970)
+- fix misalignment in ls -l in fr_FR locales(#517626)
+
 * Wed Aug 05 2009 Kamil Dudka <kdudka at redhat.com> - 7.2-3
 - ls -1U with two or more arguments (or with -R or -s) works properly again
 - install runs faster again with SELinux enabled (#479502)



From harald at fedoraproject.org  Tue Sep  8 09:54:39 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  8 Sep 2009 09:54:39 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.21,1.22
Message-ID: <20090908095439.5591711C0082@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31476

Modified Files:
	dracut.spec 
Log Message:
* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-5
- patch does not honor file modes, fixed them manually



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- dracut.spec	7 Sep 2009 17:22:36 -0000	1.21
+++ dracut.spec	8 Sep 2009 09:54:37 -0000	1.22
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 001
-Release: 4%{?rdist}
+Release: 5%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -118,6 +118,7 @@ This package contains tools to assemble 
 %patch5 -p1 
 %patch6 -p1 
 %patch7 -p1 
+chmod a+x modules.d/*/*.sh
 
 %build
 make
@@ -194,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-5
+- patch does not honor file modes, fixed them manually
+
 * Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-4
 - fixed mdraid for IMSM
 



From hadess at fedoraproject.org  Tue Sep  8 10:24:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 10:24:26 +0000 (UTC)
Subject: rpms/python-Coherence/devel .cvsignore, 1.8,
	1.9 python-Coherence.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20090908102426.45A9911C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-Coherence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8884

Modified Files:
	.cvsignore python-Coherence.spec sources 
Log Message:
* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 0.6.4-1
- Update to 0.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-Coherence/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Feb 2009 01:46:52 -0000	1.8
+++ .cvsignore	8 Sep 2009 10:24:26 -0000	1.9
@@ -1 +1 @@
-Coherence-0.6.2.tar.gz
+Coherence-0.6.4.tar.gz


Index: python-Coherence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-Coherence/devel/python-Coherence.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-Coherence.spec	26 Jul 2009 20:02:05 -0000	1.12
+++ python-Coherence.spec	8 Sep 2009 10:24:26 -0000	1.13
@@ -2,8 +2,8 @@
 
 Summary: Python framework to participate in digital living networks
 Name: python-Coherence
-Version: 0.6.2
-Release: 3%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 License: MIT
 Group: Development/Languages
 URL: https://coherence.beebits.net/
@@ -72,6 +72,9 @@ find coherence -type f -exec \
 
 
 %changelog
+* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 0.6.4-1
+- Update to 0.6.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-Coherence/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Feb 2009 01:46:52 -0000	1.8
+++ sources	8 Sep 2009 10:24:26 -0000	1.9
@@ -1 +1 @@
-feaeeaa68cae420c0c365c3c27b2a21e  Coherence-0.6.2.tar.gz
+d8e78089928a894d87073cdeedf8d2df  Coherence-0.6.4.tar.gz



From hadess at fedoraproject.org  Tue Sep  8 10:32:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 10:32:09 +0000 (UTC)
Subject: rpms/totem/devel .cvsignore, 1.76, 1.77 sources, 1.76,
	1.77 totem.spec, 1.253, 1.254
Message-ID: <20090908103209.5FE6A11C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10970

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-1
- Update to 2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	23 Jul 2009 22:29:27 -0000	1.76
+++ .cvsignore	8 Sep 2009 10:32:09 -0000	1.77
@@ -1 +1 @@
-totem-2.27.2.tar.bz2
+totem-2.27.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	23 Jul 2009 22:29:27 -0000	1.76
+++ sources	8 Sep 2009 10:32:09 -0000	1.77
@@ -1 +1 @@
-184b4e80f4535cc10b425478ecff42fc  totem-2.27.2.tar.bz2
+b2cfb39e272be8cb452b392be57daf02  totem-2.27.92.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- totem.spec	29 Aug 2009 14:17:33 -0000	1.253
+++ totem.spec	8 Sep 2009 10:32:09 -0000	1.254
@@ -5,8 +5,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.27.2
-Release: 8%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -381,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> - 2.27.2-8
 - rebuilt with new openssl
 



From stransky at fedoraproject.org  Tue Sep  8 10:45:01 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue,  8 Sep 2009 10:45:01 +0000 (UTC)
Subject: rpms/seamonkey/F-11 .cvsignore, 1.25, 1.26 seamonkey.spec, 1.55,
	1.56 sources, 1.26, 1.27
Message-ID: <20090908104501.B099B11C0082@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15053

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
Update to 1.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	10 Jul 2009 09:54:36 -0000	1.25
+++ .cvsignore	8 Sep 2009 10:45:01 -0000	1.26
@@ -1,2 +1,3 @@
 seamonkey-1.1.16.source.tar.bz2
 seamonkey-1.1.17.source.tar.bz2
+seamonkey-1.1.18.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-11/seamonkey.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- seamonkey.spec	10 Jul 2009 09:54:37 -0000	1.55
+++ seamonkey.spec	8 Sep 2009 10:45:01 -0000	1.56
@@ -10,7 +10,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.1.17
+Version:        1.1.18
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
@@ -436,6 +436,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Sep 8 2009 Martin Stransky <stransky at redhat.com> 1.1.18-1
+- Update to 1.1.18
+
 * Fri Jul 10 2009 Martin Stransky <stransky at redhat.com> 1.1.17-1
 - Update to 1.1.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	10 Jul 2009 09:54:37 -0000	1.26
+++ sources	8 Sep 2009 10:45:01 -0000	1.27
@@ -1 +1 @@
-9eba600ba6ca522b8eada9a0a8e890e2  seamonkey-1.1.17.source.tar.bz2
+ef4455becf3a12833dca7dd92854aeaa  seamonkey-1.1.18.source.tar.bz2



From hadess at fedoraproject.org  Tue Sep  8 10:48:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 10:48:31 +0000 (UTC)
Subject: rpms/totem/devel totem.spec, 1.254, 1.255 button-images.patch, 1.1,
	NONE
Message-ID: <20090908104831.8B39C11C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16054

Modified Files:
	totem.spec 
Removed Files:
	button-images.patch 
Log Message:
Remove obsolete patch


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -p -r1.254 -r1.255
--- totem.spec	8 Sep 2009 10:32:09 -0000	1.254
+++ totem.spec	8 Sep 2009 10:48:31 -0000	1.255
@@ -13,9 +13,6 @@ URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.27/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592760
-Patch0: button-images.patch
-
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 Requires(post): GConf2 >= 2.14
@@ -184,7 +181,6 @@ audio and video files in the properties 
 
 %prep
 %setup -q
-%patch0 -p1 -b .button-images
 
 %build
 


--- button-images.patch DELETED ---



From stransky at fedoraproject.org  Tue Sep  8 10:58:23 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue,  8 Sep 2009 10:58:23 +0000 (UTC)
Subject: rpms/seamonkey/F-11 seamonkey.spec,1.56,1.57
Message-ID: <20090908105823.7385011C0082@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18705

Modified Files:
	seamonkey.spec 
Log Message:
Added fuzz


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-11/seamonkey.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- seamonkey.spec	8 Sep 2009 10:45:01 -0000	1.56
+++ seamonkey.spec	8 Sep 2009 10:58:23 -0000	1.57
@@ -5,6 +5,8 @@
 %define minimum_build_nss_version 3.12
 
 %define _unpackaged_files_terminate_build 0
+%define _default_patch_fuzz 2
+
 %define builddir %{_builddir}/%{name}-%{version}
 %define mozdir %{_libdir}/seamonkey-%{version}
 



From jskala at fedoraproject.org  Tue Sep  8 11:05:03 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue,  8 Sep 2009 11:05:03 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd-2.2.0-wildchar.patch, NONE, 1.1 vsftpd.spec,
	1.98, 1.99
Message-ID: <20090908110503.77FE411C0082@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21006

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.2.0-wildchar.patch 
Log Message:
* Tue Sep 08 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-3
- fixed bug messaged in RHEL-4 #479774 - Wildcard failures with vsftpd


vsftpd-2.2.0-wildchar.patch:
 ls.c |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

--- NEW FILE vsftpd-2.2.0-wildchar.patch ---
diff -up vsftpd-2.2.0/ls.c.wildchar vsftpd-2.2.0/ls.c
--- vsftpd-2.2.0/ls.c.wildchar	2009-09-08 12:49:51.679476554 +0200
+++ vsftpd-2.2.0/ls.c	2009-09-08 12:52:53.778427990 +0200
@@ -303,24 +303,19 @@ vsf_filename_passes_filter(const struct 
       {
         goto out;
       }
-      if (!must_match_at_current_pos)
+      if (!must_match_at_current_pos && last_token == 0)
       {
-        struct mystr scan_fwd = INIT_MYSTR;
+        struct mystr last_str = INIT_MYSTR;
+        str_mid_to_end(&name_remain_str, &last_str,
+          str_getlen(&name_remain_str) - str_getlen(&s_match_needed_str));
+        locate_result = str_locate_str(&last_str, &s_match_needed_str);
+        str_free(&last_str);
 
-        str_mid_to_end(&name_remain_str, &scan_fwd,
-                        indexx + str_getlen(&s_match_needed_str));
-        /* We're allowed to be greedy, test if it match further along
-         * keep advancing indexx while we can still match.
-         */
-        while( (locate_result = str_locate_str(&scan_fwd, &s_match_needed_str)),
-            locate_result.found )
+        if (locate_result.found)
         {
-          indexx += locate_result.index + str_getlen(&s_match_needed_str);
-          str_mid_to_end(&scan_fwd, &temp_str,
-                         locate_result.index + str_getlen(&s_match_needed_str));
-          str_copy(&scan_fwd, &temp_str);
+          ret = 1;
         }
-	str_free(&scan_fwd);
+        goto out;
       }
       /* Chop matched string out of remainder */
       str_mid_to_end(&name_remain_str, &temp_str,


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- vsftpd.spec	27 Aug 2009 08:14:42 -0000	1.98
+++ vsftpd.spec	8 Sep 2009 11:05:03 -0000	1.99
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -49,6 +49,7 @@ Patch9: vsftpd-2.1.0-userlist_log.patch
 Patch10: vsftpd-2.1.0-trim.patch
 Patch12: vsftpd-2.1.1-daemonize_plus.patch
 Patch13: vsftpd-2.2.0-openssl.patch
+Patch14: vsftpd-2.2.0-wildchar.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -73,6 +74,7 @@ cp %{SOURCE1} .
 %patch10 -p1 -b .trim
 %patch12 -p1 -b .daemonize_plus
 %patch13 -p1 -b .openssl
+%patch14 -p1 -b .wildchar
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -137,6 +139,9 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-3
+- fixed bug messaged in RHEL-4 #479774 - Wildcard failures with vsftpd
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-2
 - rebuilt with new openssl
 



From jakub at fedoraproject.org  Tue Sep  8 11:05:43 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue,  8 Sep 2009 11:05:43 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-vta-cfgexpand-ptr-mode-pr41248.patch, NONE,
	1.1 gcc44-vta-cselib-subreg-of-value-pr41276.patch, NONE,
	1.1 gcc44-vta-loop-ivopts-propagate-on-release.patch, NONE,
	1.1 gcc44-vta-no-g-with-gtoggle.patch, NONE,
	1.1 gcc44-vta-phiopt-pr41232.patch, NONE,
	1.1 gcc44-vta-ssa-update-former-vops-pr41229.patch, NONE,
	1.1 .cvsignore, 1.287, 1.288 gcc.spec, 1.65, 1.66 sources, 1.291,
	1.292 gcc44-rh503816-1.patch, 1.1, NONE gcc44-rh503816-2.patch,
	1.1, NONE
Message-ID: <20090908110543.CA56411C0082@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21326

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-vta-cfgexpand-ptr-mode-pr41248.patch 
	gcc44-vta-cselib-subreg-of-value-pr41276.patch 
	gcc44-vta-loop-ivopts-propagate-on-release.patch 
	gcc44-vta-no-g-with-gtoggle.patch 
	gcc44-vta-phiopt-pr41232.patch 
	gcc44-vta-ssa-update-former-vops-pr41229.patch 
Removed Files:
	gcc44-rh503816-1.patch gcc44-rh503816-2.patch 
Log Message:
4.4.1-10

gcc44-vta-cfgexpand-ptr-mode-pr41248.patch:
 cfgexpand.c                |   59 +++++++++++++++++++++++++++++++++++++++++++--
 testsuite/gcc.dg/pr41248.c |   27 ++++++++++++++++++++
 2 files changed, 84 insertions(+), 2 deletions(-)

--- NEW FILE gcc44-vta-cfgexpand-ptr-mode-pr41248.patch ---
for  gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41248
	* cfgexpand.c (convert_debug_memory_address): New.
	(expand_debug_expr): Convert base address and offset to the same
	mode.  Use it to convert addresses to other modes.  Accept
	ptr_mode addresses.
	
for  gcc/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41248
	* gcc.dg/pr41248.c: New.

Index: gcc/cfgexpand.c
===================================================================
--- gcc/cfgexpand.c.orig	2009-09-07 19:00:20.000000000 -0300
+++ gcc/cfgexpand.c	2009-09-07 19:17:27.000000000 -0300
@@ -1966,6 +1966,38 @@ unwrap_constant (rtx x)
   return ret;
 }
 
+/* Convert X to MODE, that must be Pmode or ptr_mode, without emitting
+   any rtl.  */
+
+static rtx
+convert_debug_memory_address (enum machine_mode mode, rtx x)
+{
+  enum machine_mode xmode = GET_MODE (x);
+
+#ifndef POINTERS_EXTEND_UNSIGNED
+  gcc_assert (mode == Pmode);
+  gcc_assert (xmode == mode || xmode == VOIDmode);
+#else
+  gcc_assert (mode == Pmode || mode == ptr_mode);
+
+  if (GET_MODE (x) == mode || GET_MODE (x) == VOIDmode)
+    return x;
+
+  if (GET_MODE_BITSIZE (mode) < GET_MODE_BITSIZE (xmode))
+    x = simplify_gen_subreg (mode, x, xmode,
+			     subreg_lowpart_offset
+			     (mode, xmode));
+  else if (POINTERS_EXTEND_UNSIGNED > 0)
+    x = gen_rtx_ZERO_EXTEND (mode, x);
+  else if (!POINTERS_EXTEND_UNSIGNED)
+    x = gen_rtx_SIGN_EXTEND (mode, x);
+  else
+    gcc_unreachable ();
+#endif /* POINTERS_EXTEND_UNSIGNED */
+
+  return x;
+}
+
 /* Return an RTX equivalent to the value of the tree expression
    EXP.  */
 
@@ -2141,6 +2173,7 @@ expand_debug_expr (tree exp)
 	return NULL;
 
       gcc_assert (GET_MODE (op0) == Pmode
+		  || GET_MODE (op0) == ptr_mode
 		  || GET_CODE (op0) == CONST_INT
 		  || GET_CODE (op0) == CONST_DOUBLE);
 
@@ -2167,6 +2200,7 @@ expand_debug_expr (tree exp)
 	return NULL;
 
       gcc_assert (GET_MODE (op0) == Pmode
+		  || GET_MODE (op0) == ptr_mode
 		  || GET_CODE (op0) == CONST_INT
 		  || GET_CODE (op0) == CONST_DOUBLE);
 
@@ -2199,13 +2233,32 @@ expand_debug_expr (tree exp)
 
 	if (offset)
 	  {
+	    enum machine_mode addrmode, offmode;
+
 	    gcc_assert (MEM_P (op0));
 
+	    op0 = XEXP (op0, 0);
+	    addrmode = GET_MODE (op0);
+	    if (addrmode == VOIDmode)
+	      addrmode = Pmode;
+
 	    op1 = expand_debug_expr (offset);
 	    if (!op1)
 	      return NULL;
 
-	    op0 = gen_rtx_MEM (mode, gen_rtx_PLUS (Pmode, XEXP (op0, 0), op1));
+	    offmode = GET_MODE (op1);
+	    if (offmode == VOIDmode)
+	      offmode = TYPE_MODE (TREE_TYPE (offset));
+
+	    if (addrmode != offmode)
+	      op1 = simplify_gen_subreg (addrmode, op1, offmode,
+					 subreg_lowpart_offset (addrmode,
+								offmode));
+
+	    /* Don't use offset_address here, we don't need a
+	       recognizable address, and we don't want to generate
+	       code.  */
+	    op0 = gen_rtx_MEM (mode, gen_rtx_PLUS (addrmode, op0, op1));
 	  }
 
 	if (MEM_P (op0))
@@ -2525,7 +2578,9 @@ expand_debug_expr (tree exp)
       if (!op0 || !MEM_P (op0))
 	return NULL;
 
-      return XEXP (op0, 0);
+      op0 = convert_debug_memory_address (mode, XEXP (op0, 0));
+
+      return op0;
 
     case VECTOR_CST:
       exp = build_constructor_from_list (TREE_TYPE (exp),
Index: gcc/testsuite/gcc.dg/pr41248.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gcc/testsuite/gcc.dg/pr41248.c	2009-09-07 19:17:27.000000000 -0300
@@ -0,0 +1,27 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+
+struct __gcov_var {
+   unsigned int offset;
+   unsigned int buffer[(1 << 10) + 1];
+} __gcov_var;
+unsigned int * gcov_write_words (unsigned int words) {
+   unsigned int *result;
+   result = &__gcov_var.buffer[__gcov_var.offset];
+   return result;
+}
+
+struct gcov_ctr_summary { };
+struct gcov_summary {
+   unsigned int checksum;
+   struct gcov_ctr_summary ctrs[1];
+};
+void __gcov_write_unsigned (unsigned int);
+void __gcov_write_summary (unsigned int tag,
+			   const struct gcov_summary *summary)
+{
+   unsigned ix;
+   const struct gcov_ctr_summary *csum;
+   __gcov_write_unsigned (summary->checksum);
+   for (csum = summary->ctrs, ix = 1; ix--; csum++) { }
+}

gcc44-vta-cselib-subreg-of-value-pr41276.patch:
 cselib.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE gcc44-vta-cselib-subreg-of-value-pr41276.patch ---
for  gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41276
	* cselib.c (cselib_expand_value_rtx_1): Don't return copy of
	invalid subreg.

Index: gcc/cselib.c
===================================================================
--- gcc/cselib.c.orig	2009-08-14 08:00:12.000000000 -0300
+++ gcc/cselib.c	2009-09-07 19:17:35.000000000 -0300
@@ -1165,12 +1165,12 @@ cselib_expand_value_rtx_1 (rtx orig, str
 	scopy = simplify_gen_subreg (GET_MODE (orig), subreg,
 				     GET_MODE (SUBREG_REG (orig)),
 				     SUBREG_BYTE (orig));
-	if (scopy == NULL
-	    || (GET_CODE (scopy) == SUBREG
-		&& !REG_P (SUBREG_REG (scopy))
-		&& !MEM_P (SUBREG_REG (scopy))
-		&& (REG_P (SUBREG_REG (orig))
-		    || MEM_P (SUBREG_REG (orig)))))
+	if ((scopy == NULL
+	     || (GET_CODE (scopy) == SUBREG
+		 && !REG_P (SUBREG_REG (scopy))
+		 && !MEM_P (SUBREG_REG (scopy))))
+	    && (REG_P (SUBREG_REG (orig))
+		|| MEM_P (SUBREG_REG (orig))))
 	  return shallow_copy_rtx (orig);
 	return scopy;
       }

gcc44-vta-loop-ivopts-propagate-on-release.patch:
 tree-flow.h            |    5 ++-
 tree-ssa-loop-ivopts.c |   67 ++++++++----------------------------------------
 tree-ssa.c             |   68 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 57 deletions(-)

--- NEW FILE gcc44-vta-loop-ivopts-propagate-on-release.patch ---
for  gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	* tree-ssa-loop-ivopts.c (get_phi_with_result): Remove.
	(remove_statement): Likewise.
	(rewrite_use_nonlinear_expr): Adjust.
	(remove_unused_ivs): Collect SSA NAMEs to remove and call...
	* tree-ssa.c (release_defs_bitset): ... this.  New.
	* tree-flow.h (release_defs_bitset): Declare.

Index: gcc/tree-ssa-loop-ivopts.c
===================================================================
--- gcc/tree-ssa-loop-ivopts.c.orig	2009-09-07 19:00:52.000000000 -0300
+++ gcc/tree-ssa-loop-ivopts.c	2009-09-07 19:15:39.000000000 -0300
@@ -5038,42 +5038,6 @@ create_new_ivs (struct ivopts_data *data
     }
 }
 
-/* Returns the phi-node in BB with result RESULT.  */
-
-static gimple
-get_phi_with_result (basic_block bb, tree result)
-{
-  gimple_stmt_iterator i = gsi_start_phis (bb);
-
-  for (; !gsi_end_p (i); gsi_next (&i))
-    if (gimple_phi_result (gsi_stmt (i)) == result)
-      return gsi_stmt (i);
-
-  gcc_unreachable ();
-  return NULL;
-}
-
-
-/* Removes statement STMT (real or a phi node).  If INCLUDING_DEFINED_NAME
-   is true, remove also the ssa name defined by the statement.  */
-
-static void
-remove_statement (gimple stmt, bool including_defined_name)
-{
-  if (gimple_code (stmt) == GIMPLE_PHI)
-    {
-      gimple bb_phi = get_phi_with_result (gimple_bb (stmt), 
-					 gimple_phi_result (stmt));
-      gimple_stmt_iterator bsi = gsi_for_stmt (bb_phi);
-      remove_phi_node (&bsi, including_defined_name);
-    }
-  else
-    {
-      gimple_stmt_iterator bsi = gsi_for_stmt (stmt);
-      gsi_remove (&bsi, true);
-      release_defs (stmt); 
-    }
-}
 
 /* Rewrites USE (definition of iv used in a nonlinear expression)
    using candidate CAND.  */
@@ -5176,7 +5140,9 @@ rewrite_use_nonlinear_expr (struct ivopt
     {
       ass = gimple_build_assign (tgt, op);
       gsi_insert_before (&bsi, ass, GSI_SAME_STMT);
-      remove_statement (use->stmt, false);
+
+      bsi = gsi_for_stmt (use->stmt);
+      remove_phi_node (&bsi, false);
     }
   else
     {
@@ -5414,7 +5380,11 @@ remove_unused_ivs (struct ivopts_data *d
 {
   unsigned j;
   bitmap_iterator bi;
+  bitmap toremove = BITMAP_ALLOC (NULL);
 
+  /* Figure out an order in which to release SSA DEFs so that we don't
+     release something that we'd have to propagate into a debug stmt
+     afterwards.  */
   EXECUTE_IF_SET_IN_BITMAP (data->relevant, 0, j, bi)
     {
       struct version_info *info;
@@ -5425,25 +5395,12 @@ remove_unused_ivs (struct ivopts_data *d
 	  && !info->inv_id
 	  && !info->iv->have_use_for
 	  && !info->preserve_biv)
-	{
-	  if (MAY_HAVE_DEBUG_STMTS)
-	    {
-	      gimple stmt;
-	      imm_use_iterator iter;
-
-	      FOR_EACH_IMM_USE_STMT (stmt, iter, info->iv->ssa_name)
-		{
-		  if (!gimple_debug_bind_p (stmt))
-		    continue;
-
-		  /* ??? We can probably do better than this.  */
-		  gimple_debug_bind_reset_value (stmt);
-		  update_stmt (stmt);
-		}
-	    }
-	  remove_statement (SSA_NAME_DEF_STMT (info->iv->ssa_name), true);
-	}
+	bitmap_set_bit (toremove, SSA_NAME_VERSION (info->iv->ssa_name));
     }
+
+  release_defs_bitset (toremove);
+
+  BITMAP_FREE (toremove);
 }
 
 /* Frees data allocated by the optimization of a single loop.  */
Index: gcc/tree-flow.h
===================================================================
--- gcc/tree-flow.h.orig	2009-07-12 08:19:36.000000000 -0300
+++ gcc/tree-flow.h	2009-09-07 19:15:39.000000000 -0300
@@ -586,9 +586,10 @@ typedef struct 
        (VAR) = next_referenced_var (&(ITER))) 
 
 void propagate_defs_into_debug_stmts (gimple, basic_block,
-				  const gimple_stmt_iterator *);
+				      const gimple_stmt_iterator *);
 void propagate_var_def_into_debug_stmts (tree, basic_block,
-					  const gimple_stmt_iterator *);
+					 const gimple_stmt_iterator *);
+void release_defs_bitset (bitmap toremove);
 
 typedef struct
 {
Index: gcc/tree-ssa.c
===================================================================
--- gcc/tree-ssa.c.orig	2009-09-01 16:16:04.000000000 -0300
+++ gcc/tree-ssa.c	2009-09-07 19:15:39.000000000 -0300
@@ -440,6 +440,74 @@ propagate_defs_into_debug_stmts (gimple 
     }
 }
 
+/* Delete SSA DEFs for SSA versions in the TOREMOVE bitmap, removing
+   dominated stmts before their dominators, so that release_ssa_defs
+   stands a chance of propagating DEFs into debug bind stmts.  */
+
+void
+release_defs_bitset (bitmap toremove)
+{
+  unsigned j;
+  bitmap_iterator bi;
+
+  /* Performing a topological sort is probably overkill, this will
+     most likely run in slightly superlinear time, rather than the
+     pathological quadratic worst case.  */
+  while (!bitmap_empty_p (toremove))
+    EXECUTE_IF_SET_IN_BITMAP (toremove, 0, j, bi)
+      {
+	bool remove_now = true;
+	tree var = ssa_name (j);
+	gimple stmt;
+	imm_use_iterator uit;
+
+	FOR_EACH_IMM_USE_STMT (stmt, uit, var)
+	  {
+	    ssa_op_iter dit;
+	    def_operand_p def_p;
+
+	    /* We can't propagate PHI nodes into debug stmts.  */
+	    if (gimple_code (stmt) == GIMPLE_PHI
+		|| is_gimple_debug (stmt))
+	      continue;
+
+	    /* If we find another definition to remove that uses
+	       the one we're looking at, defer the removal of this
+	       one, so that it can be propagated into debug stmts
+	       after the other is.  */
+	    FOR_EACH_SSA_DEF_OPERAND (def_p, stmt, dit, SSA_OP_DEF)
+	      {
+		tree odef = DEF_FROM_PTR (def_p);
+
+		if (bitmap_bit_p (toremove, SSA_NAME_VERSION (odef)))
+		  {
+		    remove_now = false;
+		    break;
+		  }
+	      }
+
+	    if (!remove_now)
+	      BREAK_FROM_IMM_USE_STMT (uit);
+	  }
+
+	if (remove_now)
+	  {
+	    gimple def = SSA_NAME_DEF_STMT (var);
+	    gimple_stmt_iterator gsi = gsi_for_stmt (def);
+
+	    if (gimple_code (def) == GIMPLE_PHI)
+	      remove_phi_node (&gsi, true);
+	    else
+	      {
+		gsi_remove (&gsi, true);
+		release_defs (def);
+	      }
+
+	    bitmap_clear_bit (toremove, j);
+	  }
+      }
+}
+
 /* Return true if SSA_NAME is malformed and mark it visited.
 
    IS_VIRTUAL is true if this SSA_NAME was found inside a virtual

gcc44-vta-no-g-with-gtoggle.patch:
 toplev.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-vta-no-g-with-gtoggle.patch ---
Index: gcc/toplev.c
===================================================================
--- gcc/toplev.c.orig	2009-09-07 19:11:47.000000000 -0300
+++ gcc/toplev.c	2009-09-07 19:17:31.000000000 -0300
@@ -1796,7 +1796,12 @@ process_options (void)
   if (flag_gtoggle)
     {
       if (debug_info_level == DINFO_LEVEL_NONE)
-	debug_info_level = DINFO_LEVEL_NORMAL;
+	{
+	  debug_info_level = DINFO_LEVEL_NORMAL;
+
+	  if (write_symbols == NO_DEBUG)
+	    write_symbols = PREFERRED_DEBUGGING_TYPE;
+	}
       else
 	debug_info_level = DINFO_LEVEL_NONE;
     }

gcc44-vta-phiopt-pr41232.patch:
 testsuite/gcc.dg/pr41232.c |   14 ++++++++++++++
 tree-ssa-phiopt.c          |    2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-vta-phiopt-pr41232.patch ---
for  gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41232
	* tree-ssa-phiopt.c (minmax_replacement): Skip debug stmts
	in the middle block.

for  gcc/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41232
	* gcc.dg/pr41232.c: New.

Index: gcc/testsuite/gcc.dg/pr41232.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gcc/testsuite/gcc.dg/pr41232.c	2009-09-07 19:15:35.000000000 -0300
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -g" } */
+extern int atoi (const char *);
+extern int sprintf (char *, const char *, ...);
+void malloc_init() {
+  char *cptr;
+  char buf[1];
+  int tmbd = atoi(cptr);
+  if (tmbd > 0)
+    tmbd = (tmbd <= 124) ? tmbd : 124;
+   else
+    tmbd = 0;
+   sprintf(buf, "%d\n", tmbd);
+}
Index: gcc/tree-ssa-phiopt.c
===================================================================
--- gcc/tree-ssa-phiopt.c.orig	2009-09-07 19:00:29.000000000 -0300
+++ gcc/tree-ssa-phiopt.c	2009-09-07 19:15:35.000000000 -0300
@@ -848,7 +848,7 @@ minmax_replacement (basic_block cond_bb,
 
       /* Move the statement from the middle block.  */
       gsi = gsi_last_bb (cond_bb);
-      gsi_from = gsi_last_bb (middle_bb);
+      gsi_from = gsi_last_nondebug_bb (middle_bb);
       gsi_move_before (&gsi_from, &gsi);
     }
 

gcc44-vta-ssa-update-former-vops-pr41229.patch:
 testsuite/gfortran.dg/pr41229.f90 |   10 ++++++++++
 tree-ssa.c                        |    3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-vta-ssa-update-former-vops-pr41229.patch ---
for  gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41229
	* tree-ssa.c (execute_update_addresses_taken): Update debug insns.

for  gcc/testsuite/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41229
	* gfortran.dg/pr41229.f90: New.

Index: gcc/testsuite/gfortran.dg/pr41229.f90
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gcc/testsuite/gfortran.dg/pr41229.f90	2009-09-07 19:16:17.000000000 -0300
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! { dg-options "-O2 -g" }
+SUBROUTINE cp_fm_triangular_multiply()
+    INTEGER, PARAMETER :: dp=KIND(0.0D0)
+    REAL(dp), ALLOCATABLE, DIMENSION(:)      :: tau, work
+    REAL(KIND=dp), DIMENSION(:, :), POINTER  :: a
+    ndim = SIZE(a,2)
+    ALLOCATE(tau(ndim),STAT=istat)
+    ALLOCATE(work(2*ndim),STAT=istat)
+END SUBROUTINE
Index: gcc/tree-ssa.c
===================================================================
--- gcc/tree-ssa.c.orig	2009-09-07 19:15:39.000000000 -0300
+++ gcc/tree-ssa.c	2009-09-07 19:17:19.000000000 -0300
@@ -2067,7 +2067,8 @@ execute_update_addresses_taken (void)
 	  if ((gimple_loaded_syms (stmt)
 	       && bitmap_intersect_p (gimple_loaded_syms (stmt), vars_updated))
 	      || (gimple_stored_syms (stmt)
-		  && bitmap_intersect_p (gimple_stored_syms (stmt), vars_updated)))
+		  && bitmap_intersect_p (gimple_stored_syms (stmt), vars_updated))
+	      || is_gimple_debug (stmt))
 	    update_stmt (stmt);
 	}
   BITMAP_FREE (not_reg_needs);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- .cvsignore	3 Sep 2009 22:28:35 -0000	1.287
+++ .cvsignore	8 Sep 2009 11:05:43 -0000	1.288
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090903.tar.bz2
+gcc-4.4.1-20090908.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gcc.spec	3 Sep 2009 22:28:35 -0000	1.65
+++ gcc.spec	8 Sep 2009 11:05:43 -0000	1.66
@@ -1,9 +1,9 @@
-%global DATE 20090903
-%global SVNREV 151396
+%global DATE 20090908
+%global SVNREV 151505
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 9
+%global gcc_release 10
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -70,6 +70,8 @@ BuildRequires: binutils >= 2.19.51.0.14
 # -static is used several times.
 BuildRequires: glibc-static
 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, sharutils
+# For VTA guality testing
+BuildRequires: gdb
 %if %{build_java}
 BuildRequires: /usr/share/java/eclipse-ecj.jar, zip, unzip
 %if %{bootstrap_java}
@@ -157,8 +159,12 @@ Patch15: gcc44-raw-string.patch
 Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
-Patch19: gcc44-rh503816-1.patch
-Patch20: gcc44-rh503816-2.patch
+Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
+Patch20: gcc44-vta-cselib-subreg-of-value-pr41276.patch
+Patch21: gcc44-vta-loop-ivopts-propagate-on-release.patch
+Patch22: gcc44-vta-no-g-with-gtoggle.patch
+Patch23: gcc44-vta-phiopt-pr41232.patch
+Patch24: gcc44-vta-ssa-update-former-vops-pr41229.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -464,8 +470,12 @@ which are required to compile with the G
 %if %{build_libstdcxx_docs}
 %patch18 -p0 -b .libstdc++-docs~
 %endif
-%patch19 -p0 -b .rh503816-1~
-%patch20 -p0 -b .rh503816-2~
+%patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
+%patch20 -p0 -b .vta-cselib-subreg-of-value-pr41276~
+%patch21 -p0 -b .vta-loop-ivopts-propagate-on-release~
+%patch22 -p0 -b .vta-no-g-with-gtoggle~
+%patch23 -p0 -b .vta-phiopt-pr41232~
+%patch24 -p0 -b .vta-ssa-update-former-vops-pr41229~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1805,6 +1815,13 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Sep  8 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-10
+- update from gcc-4_4-branch
+  - PRs fortran/41258, rtl-optimization/40861
+- fix scheduler not to reorder potentially trapping insns across
+  calls that might not always return (#520916, PR rtl-optimization/41239)
+- merge in VTA
+
 * Thu Sep  3 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-9
 - update from gcc-4_4-branch
   - fix wide char constant stringification


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- sources	3 Sep 2009 22:28:35 -0000	1.291
+++ sources	8 Sep 2009 11:05:43 -0000	1.292
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-67e50d0590f56a2184121e035c7907c8  gcc-4.4.1-20090903.tar.bz2
+12f92325baf664989136ea6c7585273f  gcc-4.4.1-20090908.tar.bz2


--- gcc44-rh503816-1.patch DELETED ---


--- gcc44-rh503816-2.patch DELETED ---



From stransky at fedoraproject.org  Tue Sep  8 11:29:18 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue,  8 Sep 2009 11:29:18 +0000 (UTC)
Subject: rpms/seamonkey/F-11 seamonkey-1.1.18-sqlite.patch, NONE,
	1.1 seamonkey.spec, 1.57, 1.58
Message-ID: <20090908112918.9E15811C0082@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28337

Modified Files:
	seamonkey.spec 
Added Files:
	seamonkey-1.1.18-sqlite.patch 
Log Message:
Sqlite patch

seamonkey-1.1.18-sqlite.patch:
 db/sqlite3/src/Makefile.in |    4 ++--
 storage/build/Makefile.in  |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE seamonkey-1.1.18-sqlite.patch ---
diff -up seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in.old seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in
--- seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in.old	2009-08-10 19:59:12.000000000 +0200
+++ seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in	2009-09-08 13:14:23.000000000 +0200
@@ -44,9 +44,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE           = sqlite3
-LIBRARY_NAME     = sqlite3
+LIBRARY_NAME     = sqlite3_s
 MODULE_NAME      = sqlite3
-FORCE_SHARED_LIB = 1
+FORCE_STATIC_LIB = 1
 VISIBILITY_FLAGS =
 
 ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
diff -up seamonkey-1.1.18/mozilla/storage/build/Makefile.in.old seamonkey-1.1.18/mozilla/storage/build/Makefile.in
--- seamonkey-1.1.18/mozilla/storage/build/Makefile.in.old	2009-08-07 22:37:55.000000000 +0200
+++ seamonkey-1.1.18/mozilla/storage/build/Makefile.in	2009-09-08 13:16:20.000000000 +0200
@@ -69,9 +69,8 @@ LOCAL_INCLUDES = \
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \
 	$(NULL)
- 
-EXTRA_DSO_LIBS += sqlite3
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-11/seamonkey.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- seamonkey.spec	8 Sep 2009 10:58:23 -0000	1.57
+++ seamonkey.spec	8 Sep 2009 11:29:18 -0000	1.58
@@ -52,6 +52,7 @@ Patch220:       seamonkey-fedora-home-pa
 Patch225:       mozilla-nspr-packages.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
 Patch304:       mozilla-1.7.5-g-application-name.patch
+Patch305:       seamonkey-1.1.18-sqlite.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -138,6 +139,7 @@ cd mozilla
 %patch225 -p1
 %patch301 -p1
 %patch304 -p0
+%patch305 -p2 -b .sqlite
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig



From caolanm at fedoraproject.org  Tue Sep  8 11:51:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Sep 2009 11:51:04 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.dr69.patch, NONE,
	1.1 openoffice.org.spec, 1.2000,
	1.2001 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch, 1.1, NONE
Message-ID: <20090908115104.75BF211C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2410

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.dr69.patch 
Removed Files:
	openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch 
Log Message:
build

workspace.dr69.patch:
 chart2uno.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE workspace.dr69.patch ---
Index: sc/source/ui/unoobj/chart2uno.cxx
===================================================================
--- sc/source/ui/unoobj/chart2uno.cxx	(.../tags/DEV300_m54)	(revision 275870)
+++ sc/source/ui/unoobj/chart2uno.cxx	(.../cws/dr69)	(revision 275870)
@@ -500,6 +500,10 @@
         ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr);
         SCCOLROW n1 = aData.Ref1.nCol;
         SCCOLROW n2 = aData.Ref2.nCol;
+        if (n1 > MAXCOL)
+            n1 = MAXCOL;
+        if (n2 > MAXCOL)
+            n2 = MAXCOL;
         SCCOLROW nTmp = n2 - n1 + 1;
         if (n1 < mnStartCol)
             mnStartCol = static_cast<SCCOL>(n1);
@@ -510,14 +514,18 @@
 
         n1 = aData.Ref1.nRow;
         n2 = aData.Ref2.nRow;
+        if (n1 > MAXROW)
+            n1 = MAXROW;
+        if (n2 > MAXROW)
+            n2 = MAXROW;
         nTmp = n2 - n1 + 1;
 
         if (n1 < mnStartRow)
-            mnStartRow = static_cast<SCCOL>(n1);
+            mnStartRow = static_cast<SCROW>(n1);
         if (n2 > nEndRow)
-            nEndRow = static_cast<SCCOL>(n2);
+            nEndRow = static_cast<SCROW>(n2);
         if (nTmp > nMaxRows)
-            nMaxRows = static_cast<SCCOL>(nTmp);
+            nMaxRows = static_cast<SCROW>(nTmp);
     }
 
     // total column size ?


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2000
retrieving revision 1.2001
diff -u -p -r1.2000 -r1.2001
--- openoffice.org.spec	7 Sep 2009 12:09:32 -0000	1.2000
+++ openoffice.org.spec	8 Sep 2009 11:51:04 -0000	1.2001
@@ -158,7 +158,7 @@ Patch80: openoffice.org-3.1.1.ooo104329.
 Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
-Patch84: openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
+Patch84: workspace.dr69.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1702,7 +1702,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch81 -p0 -b .workspace.os131.patch
 %patch82 -p0 -b .workspace.vcl102.patch
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
-%patch84 -p0 -b .ooo104484.sc.wrong.cast.patch
+%patch84 -p0 -b .workspace.dr69.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4212,8 +4212,8 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6-UNBUILT
-- Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
+* Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
+- Resolves: ooo#104484 workspace.dr69.patch
 - Resolves: rhbz#521460 - wrong page size for A3/A5
 
 * Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.5


--- openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch DELETED ---



From caolanm at fedoraproject.org  Tue Sep  8 11:51:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Sep 2009 11:51:43 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1934,1.1935
Message-ID: <20090908115143.4C7AD11C0082@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-serv2717

Modified Files:
	openoffice.org.spec 
Log Message:
build busted paper translations


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1934
retrieving revision 1.1935
diff -u -p -r1.1934 -r1.1935
--- openoffice.org.spec	7 Sep 2009 12:08:28 -0000	1.1934
+++ openoffice.org.spec	8 Sep 2009 11:51:42 -0000	1.1935
@@ -4173,8 +4173,8 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3-UNBUILT
-- Resolves: rhbz#521460 - wrong page size for A3/A5
+* Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
+- Resolves: rhbz#521460 - wrong UI label for A3/A5 page sizes in translations
 
 * Wed Sep 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
 - Resolves: rhbz#520772 copy/paste cockup



From caolanm at fedoraproject.org  Tue Sep  8 11:52:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Sep 2009 11:52:56 +0000 (UTC)
Subject: rpms/mythes-sk/devel mythes-sk.spec,1.16,1.17 sources,1.12,1.13
Message-ID: <20090908115256.6AAF811C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3189

Modified Files:
	mythes-sk.spec sources 
Log Message:
latest version


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mythes-sk.spec	8 Aug 2009 08:42:08 -0000	1.16
+++ mythes-sk.spec	8 Sep 2009 11:52:56 -0000	1.17
@@ -1,6 +1,6 @@
 Name: mythes-sk
 Summary: Slovak thesaurus
-%define upstreamid 20090807
+%define upstreamid 20090907
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.sk-spell.sk.cx/thesaurus/download/OOo-Thesaurus2-sk_SK.zip
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Tue Sep 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090907-1
+- latest version
+
 * Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090807-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Aug 2009 08:42:08 -0000	1.12
+++ sources	8 Sep 2009 11:52:56 -0000	1.13
@@ -1 +1 @@
-7531549a790294ff33b6fc4242433959  OOo-Thesaurus2-sk_SK.zip
+768add5cd02128bde7f87f853805f0cb  OOo-Thesaurus2-sk_SK.zip



From caolanm at fedoraproject.org  Tue Sep  8 11:53:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Sep 2009 11:53:49 +0000 (UTC)
Subject: rpms/mythes-es/devel mythes-es.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20090908115349.AFE2011C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-es/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3568

Modified Files:
	mythes-es.spec sources 
Log Message:
latest version


Index: mythes-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/mythes-es.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mythes-es.spec	8 Aug 2009 08:44:18 -0000	1.9
+++ mythes-es.spec	8 Sep 2009 11:53:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name: mythes-es
 Summary: Spanish thesaurus
-%define upstreamid 20090808
+%define upstreamid 20090908
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://openthes-es.berlios.de/download/OOo2-thes_es_ES.tar.bz2
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 0.20090908-1
+- latest version
+
 * Sat Aug 08 2009 Caol?n McNamara <caolanm at redhat.com> - 0.20090808-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 08:44:18 -0000	1.7
+++ sources	8 Sep 2009 11:53:49 -0000	1.8
@@ -1 +1 @@
-57b245e02eb0db37b06a5b0654fe0dd7  OOo2-thes_es_ES.tar.bz2
+4786e2afb8b0f585bd94bacec5935614  OOo2-thes_es_ES.tar.bz2



From caolanm at fedoraproject.org  Tue Sep  8 11:55:36 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Sep 2009 11:55:36 +0000 (UTC)
Subject: rpms/mythes-sl/devel mythes-sl.spec,1.10,1.11 sources,1.7,1.8
Message-ID: <20090908115536.2E2DB11C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4164

Modified Files:
	mythes-sl.spec sources 
Log Message:
latest version


Index: mythes-sl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/mythes-sl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mythes-sl.spec	8 Aug 2009 08:45:27 -0000	1.10
+++ mythes-sl.spec	8 Sep 2009 11:55:35 -0000	1.11
@@ -1,6 +1,6 @@
 Name: mythes-sl
 Summary: Slovenian thesaurus
-%define upstreamid 20090808
+%define upstreamid 20090908
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://193.2.66.133:85/download/thes_sl_SI_v2.zip
@@ -41,7 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
-* Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090708-1
+* Tue Sep 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090908-1
+- latest version
+
+* Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090808-1
 - latest version
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090708-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 08:45:27 -0000	1.7
+++ sources	8 Sep 2009 11:55:35 -0000	1.8
@@ -1 +1 @@
-725bf66eb1b76b6cc6d93342398a14cb  thes_sl_SI_v2.zip
+20c93cf8357d05228212f73b52fa831f  thes_sl_SI_v2.zip



From caolanm at fedoraproject.org  Tue Sep  8 11:56:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Sep 2009 11:56:54 +0000 (UTC)
Subject: rpms/hunspell-pl/devel .cvsignore, 1.44, 1.45 hunspell-pl.spec, 1.49,
	1.50 sources, 1.44, 1.45
Message-ID: <20090908115654.B2B6C11C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4661

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	8 Aug 2009 08:46:59 -0000	1.44
+++ .cvsignore	8 Sep 2009 11:56:54 -0000	1.45
@@ -1,2 +1 @@
-sjp-myspell-pl-20090708.zip
-sjp-myspell-pl-20090808.zip
+sjp-myspell-pl-20090908.zip


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- hunspell-pl.spec	8 Aug 2009 08:46:59 -0000	1.49
+++ hunspell-pl.spec	8 Sep 2009 11:56:54 -0000	1.50
@@ -1,6 +1,6 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20090808
+%define upstreamid 20090908
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Sep 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090908-1
+- latest version
+
 * Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090808-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	8 Aug 2009 08:46:59 -0000	1.44
+++ sources	8 Sep 2009 11:56:54 -0000	1.45
@@ -1 +1 @@
-12ac267ca3f82112f2ea10a05466f9fa  sjp-myspell-pl-20090808.zip
+e900061bbd148cfaa8531b2724a65edd  sjp-myspell-pl-20090908.zip



From stransky at fedoraproject.org  Tue Sep  8 12:28:37 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue,  8 Sep 2009 12:28:37 +0000 (UTC)
Subject: rpms/seamonkey/F-10 seamonkey-1.1.18-sqlite.patch, NONE,
	1.1 seamonkey.spec, 1.53, 1.54 sources, 1.26, 1.27
Message-ID: <20090908122837.9711511C0082@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13470

Modified Files:
	seamonkey.spec sources 
Added Files:
	seamonkey-1.1.18-sqlite.patch 
Log Message:
Update to 1.1.18

seamonkey-1.1.18-sqlite.patch:
 db/sqlite3/src/Makefile.in |    4 ++--
 storage/build/Makefile.in  |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE seamonkey-1.1.18-sqlite.patch ---
diff -up seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in.old seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in
--- seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in.old	2009-08-10 19:59:12.000000000 +0200
+++ seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in	2009-09-08 13:14:23.000000000 +0200
@@ -44,9 +44,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE           = sqlite3
-LIBRARY_NAME     = sqlite3
+LIBRARY_NAME     = sqlite3_s
 MODULE_NAME      = sqlite3
-FORCE_SHARED_LIB = 1
+FORCE_STATIC_LIB = 1
 VISIBILITY_FLAGS =
 
 ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
diff -up seamonkey-1.1.18/mozilla/storage/build/Makefile.in.old seamonkey-1.1.18/mozilla/storage/build/Makefile.in
--- seamonkey-1.1.18/mozilla/storage/build/Makefile.in.old	2009-08-07 22:37:55.000000000 +0200
+++ seamonkey-1.1.18/mozilla/storage/build/Makefile.in	2009-09-08 13:16:20.000000000 +0200
@@ -69,9 +69,8 @@ LOCAL_INCLUDES = \
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \
 	$(NULL)
- 
-EXTRA_DSO_LIBS += sqlite3
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- seamonkey.spec	10 Jul 2009 11:19:14 -0000	1.53
+++ seamonkey.spec	8 Sep 2009 12:28:37 -0000	1.54
@@ -11,7 +11,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.1.17
+Version:        1.1.18
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
@@ -51,6 +51,7 @@ Patch220:       seamonkey-fedora-home-pa
 Patch225:       mozilla-nspr-packages.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
 Patch304:       mozilla-1.7.5-g-application-name.patch
+Patch305:       seamonkey-1.1.18-sqlite.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -139,6 +140,7 @@ cd mozilla
 %patch225 -p1
 %patch301 -p1
 %patch304 -p0
+%patch305 -p2 -b .sqlite
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -437,6 +439,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Sep 8 2009 Martin Stransky <stransky at redhat.com> 1.1.18-1
+- Update to 1.1.18
+
 * Fri Jul 10 2009 Martin Stransky <stransky at redhat.com> 1.1.17-1
 - Update to 1.1.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	10 Jul 2009 11:19:14 -0000	1.26
+++ sources	8 Sep 2009 12:28:37 -0000	1.27
@@ -1 +1 @@
-9eba600ba6ca522b8eada9a0a8e890e2  seamonkey-1.1.17.source.tar.bz2
+ef4455becf3a12833dca7dd92854aeaa  seamonkey-1.1.18.source.tar.bz2



From jolsa at fedoraproject.org  Tue Sep  8 12:33:48 2009
From: jolsa at fedoraproject.org (Jiri Olsa)
Date: Tue,  8 Sep 2009 12:33:48 +0000 (UTC)
Subject: rpms/latrace/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 latrace.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090908123348.1F67C11C0082@cvs1.fedora.phx.redhat.com>

Author: jolsa

Update of /cvs/extras/rpms/latrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15754/devel

Modified Files:
	.cvsignore import.log latrace.spec sources 
Log Message:
0.5.7-1 import



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/latrace/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Aug 2009 08:35:25 -0000	1.2
+++ .cvsignore	8 Sep 2009 12:33:47 -0000	1.3
@@ -1 +1 @@
-latrace-0.5.6.tar.bz2
+latrace-0.5.7.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/latrace/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Aug 2009 08:35:25 -0000	1.1
+++ import.log	8 Sep 2009 12:33:47 -0000	1.2
@@ -1 +1,2 @@
 latrace-0_5_6-1_fc11:HEAD:latrace-0.5.6-1.fc11.src.rpm:1249547703
+latrace-0_5_7-1_fc11:HEAD:latrace-0.5.7-1.fc11.src.rpm:1252413167


Index: latrace.spec
===================================================================
RCS file: /cvs/extras/rpms/latrace/devel/latrace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- latrace.spec	6 Aug 2009 08:35:25 -0000	1.1
+++ latrace.spec	8 Sep 2009 12:33:47 -0000	1.2
@@ -1,14 +1,14 @@
 Name:           latrace
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?dist}
 Summary:        LD_AUDIT feature frontend for glibc 2.4+
 Group:          Development/Debuggers
 License:        GPLv3+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-URL:            http://latrace.sourceforge.net/
-Source:         http://downloads.sourceforge.net/latrace/%{name}-%{version}.tar.bz2
+URL:            http://people.redhat.com/jolsa/latrace
+Source:         http://people.redhat.com/jolsa/latrace/dl/%{name}-%{version}.tar.bz2
 ExclusiveArch:  %{ix86} x86_64 arm
-BuildRequires:  autoconf bison asciidoc xmlto
+BuildRequires:  autoconf bison asciidoc xmlto binutils-devel
 
 %description
 allows you to trace library calls and get their statistics in a
@@ -42,6 +42,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 08 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.7
+- updated to new version
+- upstream download moved
+
 * Sun Jul 05 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.6-1
 - updates based on the Fedora review comments
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/latrace/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Aug 2009 08:35:25 -0000	1.2
+++ sources	8 Sep 2009 12:33:47 -0000	1.3
@@ -1 +1 @@
-c47ba7e6461b3101e0c170c37320b5c7  latrace-0.5.6.tar.bz2
+aeb0fbe6e8265f492206f497cfde1e3c  latrace-0.5.7.tar.bz2



From jolsa at fedoraproject.org  Tue Sep  8 12:38:53 2009
From: jolsa at fedoraproject.org (Jiri Olsa)
Date: Tue,  8 Sep 2009 12:38:53 +0000 (UTC)
Subject: rpms/latrace/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 latrace.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090908123853.4D13511C0082@cvs1.fedora.phx.redhat.com>

Author: jolsa

Update of /cvs/extras/rpms/latrace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17833/F-11

Modified Files:
	.cvsignore import.log latrace.spec sources 
Log Message:
0.5.7-1 import



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/latrace/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Aug 2009 08:39:55 -0000	1.2
+++ .cvsignore	8 Sep 2009 12:38:53 -0000	1.3
@@ -1 +1 @@
-latrace-0.5.6.tar.bz2
+latrace-0.5.7.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/latrace/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Aug 2009 08:39:55 -0000	1.1
+++ import.log	8 Sep 2009 12:38:53 -0000	1.2
@@ -1 +1,2 @@
 latrace-0_5_6-1_fc11:F-11:latrace-0.5.6-1.fc11.src.rpm:1249547963
+latrace-0_5_7-1_fc11:F-11:latrace-0.5.7-1.fc11.src.rpm:1252413500


Index: latrace.spec
===================================================================
RCS file: /cvs/extras/rpms/latrace/F-11/latrace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- latrace.spec	6 Aug 2009 08:39:55 -0000	1.1
+++ latrace.spec	8 Sep 2009 12:38:53 -0000	1.2
@@ -1,14 +1,14 @@
 Name:           latrace
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?dist}
 Summary:        LD_AUDIT feature frontend for glibc 2.4+
 Group:          Development/Debuggers
 License:        GPLv3+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-URL:            http://latrace.sourceforge.net/
-Source:         http://downloads.sourceforge.net/latrace/%{name}-%{version}.tar.bz2
+URL:            http://people.redhat.com/jolsa/latrace
+Source:         http://people.redhat.com/jolsa/latrace/dl/%{name}-%{version}.tar.bz2
 ExclusiveArch:  %{ix86} x86_64 arm
-BuildRequires:  autoconf bison asciidoc xmlto
+BuildRequires:  autoconf bison asciidoc xmlto binutils-devel
 
 %description
 allows you to trace library calls and get their statistics in a
@@ -42,6 +42,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 08 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.7
+- updated to new version
+- upstream download moved
+
 * Sun Jul 05 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.6-1
 - updates based on the Fedora review comments
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/latrace/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Aug 2009 08:39:55 -0000	1.2
+++ sources	8 Sep 2009 12:38:53 -0000	1.3
@@ -1 +1 @@
-c47ba7e6461b3101e0c170c37320b5c7  latrace-0.5.6.tar.bz2
+aeb0fbe6e8265f492206f497cfde1e3c  latrace-0.5.7.tar.bz2



From stransky at fedoraproject.org  Tue Sep  8 12:40:37 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue,  8 Sep 2009 12:40:37 +0000 (UTC)
Subject: rpms/seamonkey/F-10 seamonkey.spec,1.54,1.55
Message-ID: <20090908124037.DA84411C043D@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18482

Modified Files:
	seamonkey.spec 
Log Message:
fuzz fuzz fuzz


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- seamonkey.spec	8 Sep 2009 12:28:37 -0000	1.54
+++ seamonkey.spec	8 Sep 2009 12:40:37 -0000	1.55
@@ -5,6 +5,7 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
+%define _default_patch_fuzz 2
 %define _unpackaged_files_terminate_build 0
 %define builddir %{_builddir}/%{name}-%{version}
 %define mozdir %{_libdir}/seamonkey-%{version}



From dwalsh at fedoraproject.org  Tue Sep  8 13:08:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  8 Sep 2009 13:08:11 +0000 (UTC)
Subject: rpms/libsepol/devel .cvsignore, 1.144, 1.145 libsepol.spec, 1.193, 
	1.194 sources, 1.145, 1.146
Message-ID: <20090908130811.4A0C611C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27209

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.38-1
- Upgrade to latest from NSA
	* Check last offset in the module package against the file size.
	Reported by Manoj Srivastava for bug filed by Max Kellermann.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- .cvsignore	7 Jul 2009 19:33:39 -0000	1.144
+++ .cvsignore	8 Sep 2009 13:08:10 -0000	1.145
@@ -144,3 +144,4 @@ libsepol-2.0.34.tgz
 libsepol-2.0.35.tgz
 libsepol-2.0.36.tgz
 libsepol-2.0.37.tgz
+libsepol-2.0.38.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- libsepol.spec	25 Jul 2009 08:36:05 -0000	1.193
+++ libsepol.spec	8 Sep 2009 13:08:10 -0000	1.194
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.37
-Release: 2%{?dist}
+Version: 2.0.38
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -96,6 +96,11 @@ exit 0
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.38-1
+- Upgrade to latest from NSA
+	* Check last offset in the module package against the file size.
+	Reported by Manoj Srivastava for bug filed by Max Kellermann.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- sources	7 Jul 2009 19:33:40 -0000	1.145
+++ sources	8 Sep 2009 13:08:11 -0000	1.146
@@ -1 +1 @@
-16f73152ee7bbc78103cbb5a76190b62  libsepol-2.0.37.tgz
+3beeb2bc678f9fb51770a19691ba2c72  libsepol-2.0.38.tgz



From dwalsh at fedoraproject.org  Tue Sep  8 13:09:19 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  8 Sep 2009 13:09:19 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.186, 1.187 libselinux.spec,
	1.375, 1.376 sources, 1.189, 1.190
Message-ID: <20090908130919.9C39611C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28170

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-1
- Update to upstream 
	* Removal of reference counting on userspace AVC SID's.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- .cvsignore	14 Jul 2009 15:29:54 -0000	1.186
+++ .cvsignore	8 Sep 2009 13:09:19 -0000	1.187
@@ -169,3 +169,4 @@ libselinux-2.0.82.tgz
 libselinux-2.0.83.tgz
 libselinux-2.0.84.tgz
 libselinux-2.0.85.tgz
+libselinux-2.0.86.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- libselinux.spec	25 Jul 2009 08:35:31 -0000	1.375
+++ libselinux.spec	8 Sep 2009 13:09:19 -0000	1.376
@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.85
-Release: 2%{?dist}
+Version: 2.0.86
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -165,6 +165,10 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-1
+- Update to upstream 
+	* Removal of reference counting on userspace AVC SID's.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.85-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- sources	14 Jul 2009 15:29:55 -0000	1.189
+++ sources	8 Sep 2009 13:09:19 -0000	1.190
@@ -1 +1 @@
-c014e9527a14fbd38c784b01124cee7d  libselinux-2.0.85.tgz
+c9939f17d81cb62f4050db0a0f2a54f6  libselinux-2.0.86.tgz



From dwalsh at fedoraproject.org  Tue Sep  8 14:16:03 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  8 Sep 2009 14:16:03 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.201,
	1.202 policycoreutils-po.patch, 1.54,
	1.55 policycoreutils-rhat.patch, 1.437,
	1.438 policycoreutils.spec, 1.637, 1.638 sources, 1.209, 1.210
Message-ID: <20090908141603.ECBAD11C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28026

Modified Files:
	.cvsignore policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils.spec sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-1
- Update to upstream
        * Add semanage dontaudit to turn off dontaudits from Dan Walsh.
        * Fix semanage to set correct mode for setrans file from Dan Walsh.
        * Fix malformed dictionary in portRecord from Dan Walsh.
	* Restore symlink handling support to restorecon based on a patch by
	Martin Orr.  This fixes the restorecon /dev/stdin performed by Debian
	udev scripts that was broken by policycoreutils 2.0.70.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- .cvsignore	18 Aug 2009 19:25:04 -0000	1.201
+++ .cvsignore	8 Sep 2009 14:15:50 -0000	1.202
@@ -206,3 +206,4 @@ policycoreutils-2.0.70.tgz
 policycoreutils_man_ru2.tar.bz2
 policycoreutils-2.0.71.tgz
 sepolgen-1.0.17.tgz
+policycoreutils-2.0.73.tgz

policycoreutils-po.patch:
 Makefile            |   28 
 POTFILES            |   28 
 POTFILES.in         |    1 
 af.po               | 2449 +++++++++++++++++++++++--
 am.po               | 2449 +++++++++++++++++++++++--
 ar.po               | 2449 +++++++++++++++++++++++--
 as.po               | 3499 ++++++++++++++++++++++--------------
 be.po               | 2449 +++++++++++++++++++++++--
 bg.po               | 3605 ++++++++++++++++++++++---------------
 bn.po               | 2449 +++++++++++++++++++++++--
 bn_IN.po            | 4066 ++++++++++++++++++++++++------------------
 bs.po               | 2505 +++++++++++++++++++++++---
 ca.po               | 2906 +++++++++++++++++++++++++-----
 cs.po               | 2841 ++++++++++++++++++++++++-----
 cy.po               | 2449 +++++++++++++++++++++++--
 da.po               | 3128 +++++++++++++++++++++++++++-----
 de.po               | 3810 ++++++++++++++++++++++-----------------
 el.po               | 2512 +++++++++++++++++++++++---
 en_GB.po            | 2505 +++++++++++++++++++++++---
 es.po               | 4575 ++++++++++++++++++++++++++---------------------
 et.po               | 2447 +++++++++++++++++++++++--
 eu_ES.po            | 2449 +++++++++++++++++++++++--
 fa.po               | 2449 +++++++++++++++++++++++--
 fi.po               | 3158 ++++++++++++++++++++++++++++----
 fr.po               | 3856 +++++++++++++++++++++++-----------------
 gl.po               | 2447 +++++++++++++++++++++++--
 gu.po               | 4130 ++++++++++++++++++++++++------------------
 he.po               | 2449 +++++++++++++++++++++++--
 hi.po               | 4117 ++++++++++++++++++++++++------------------
 hr.po               | 2997 ++++++++++++++++++++-----------
 hu.po               | 3071 +++++++++++++++++++++++++++----
 hy.po               | 2449 +++++++++++++++++++++++--
 id.po               | 2447 +++++++++++++++++++++++--
 is.po               | 2449 +++++++++++++++++++++++--
 it.po               | 4531 ++++++++++++++++++++++++++---------------------
 ja.po               | 4183 ++++++++++++++++++++++++-------------------
 ka.po               | 2449 +++++++++++++++++++++++--
 kn.po               | 3841 ++++++++++-----------------------------
 ko.po               | 2793 ++++++++++++++++++++++++-----
 ku.po               | 2449 +++++++++++++++++++++++--
 lo.po               | 2449 +++++++++++++++++++++++--
 lt.po               | 2449 +++++++++++++++++++++++--
 lv.po               | 2449 +++++++++++++++++++++++--
 mai.po              | 3462 ++++++++++++++++++++++++++++++++++++
 mk.po               | 2505 +++++++++++++++++++++++---
 ml.po               | 4274 ++++++++++++++++++++++++--------------------
 mr.po               | 4156 ++++++++++++++++++++++++-------------------
 ms.po               | 2498 +++++++++++++++++++++++--
 my.po               | 2449 +++++++++++++++++++++++--
 nb.po               | 2485 +++++++++++++++++++++++--
 nl.po               | 2920 ++++++++++++++++++++++++------
 nn.po               | 2449 +++++++++++++++++++++++--
 no.po               | 1272 -------------
 nso.po              | 2449 +++++++++++++++++++++++--
 or.po               | 3984 +++++++++++++++++++++++------------------
 pa.po               | 4075 +++++++++++++++++++++++-------------------
 pl.po               | 4014 +++++++++++++++++++++++------------------
 policycoreutils.pot | 2431 +++++++++++++++++++++++--
 pt.po               | 4999 ++++++++++++++++++++++++++++------------------------
 pt_BR.po            | 4979 ++++++++++++++++++++++++++++-----------------------
 ro.po               | 2449 +++++++++++++++++++++++--
 ru.po               | 3459 +++++++++++++++++++++++------------
 si.po               | 2449 +++++++++++++++++++++++--
 sk.po               | 2505 +++++++++++++++++++++++---
 sl.po               | 2449 +++++++++++++++++++++++--
 sq.po               | 2449 +++++++++++++++++++++++--
 sr.po               | 4125 ++++++++++++++++++++++++------------------
 sr at latin.po         | 4135 ++++++++++++++++++++++++-------------------
 sv.po               | 3165 ++++++++++++++++++++++----------
 ta.po               | 3935 ++++++++++++++++++++++++++--------------
 te.po               | 4069 +++++++++++++++++++++++-------------------
 th.po               | 2449 +++++++++++++++++++++++--
 tr.po               | 2449 +++++++++++++++++++++++--
 uk.po               | 2505 +++++++++++++++++++++++---
 ur.po               | 2449 +++++++++++++++++++++++--
 vi.po               | 2449 +++++++++++++++++++++++--
 zh_CN.po            | 3887 +++++++++++++++++++++++-----------------
 zh_TW.po            | 4174 ++++++++++++++++++++++++-------------------
 zu.po               | 2449 +++++++++++++++++++++++--
 79 files changed, 173072 insertions(+), 59540 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.54 -r 1.55 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- policycoreutils-po.patch	29 Jul 2009 13:43:53 -0000	1.54
+++ policycoreutils-po.patch	8 Sep 2009 14:15:50 -0000	1.55
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.67/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.73/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/af.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/af.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3045,9 +3045,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.67/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.73/po/am.po
 --- nsapolicycoreutils/po/am.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/am.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/am.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6092,9 +6092,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.67/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.73/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/ar.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/ar.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -9139,9 +9139,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.67/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.73/po/as.po
 --- nsapolicycoreutils/po/as.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/as.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/as.po	2009-09-08 09:38:58.000000000 -0400
 @@ -1,23 +1,23 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -13726,9 +13726,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "MLS/\n"
 -#~ "MCS Level"
 -#~ msgstr "????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.67/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.73/po/be.po
 --- nsapolicycoreutils/po/be.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/be.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/be.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -16773,9 +16773,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.67/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.73/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/bg.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/bg.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21342,9 +21342,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgid "Requires value"
  #~ msgstr "??????? ????????"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.67/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.73/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/bn_IN.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/bn_IN.po	2009-09-08 09:38:58.000000000 -0400
 @@ -9,10 +9,10 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -26103,9 +26103,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Enforcing\n"
 -#~ "Permissive\n"
 -#~ "Disabled\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.67/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.73/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/bn.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/bn.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -29150,9 +29150,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.67/po/bs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.73/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/bs.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/bs.po	2009-09-08 09:38:58.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -32287,9 +32287,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Zahtijeva vrijednost"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.67/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.73/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/ca.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/ca.po	2009-09-08 09:38:58.000000000 -0400
 @@ -5,6 +5,8 @@
  #
  # Josep Puigdemont Casamaj? <josep.puigdemont at gmail.com>, 2006.
@@ -35811,9 +35811,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
 -#~ msgid "Options Error: %s "
 -#~ msgstr "Error en les opcions: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.67/po/cs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.73/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/cs.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/cs.po	2009-09-08 09:38:58.000000000 -0400
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -39433,9 +39433,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgid "<b>Device number:</b>"
  #~ msgstr "<b>??slo za??zen?:</b>"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.67/po/cy.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.73/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/cy.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/cy.po	2009-09-08 09:38:58.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -42480,9 +42480,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.67/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.73/po/da.po
 --- nsapolicycoreutils/po/da.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/da.po	2009-07-07 16:48:10.000000000 -0400
++++ policycoreutils-2.0.73/po/da.po	2009-09-08 09:38:58.000000000 -0400
 @@ -1,24 +1,25 @@
 -# translation of da.po to
 -# Danish messages for policycoreutils.
@@ -46376,15 +46376,15 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ "skal du k?re \n"
  #~ "\n"
  #~ "semodule -i %s.pp\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.67/po/de.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.73/po/de.po
 --- nsapolicycoreutils/po/de.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/de.po	2009-07-07 16:48:10.000000000 -0400
-@@ -1,26 +1,24 @@
++++ policycoreutils-2.0.73/po/de.po	2009-09-08 09:38:58.000000000 -0400
+@@ -1,4 +1,3 @@
 -# translation of policycoreutils.HEAD.de.po to German
  # German translation of policycoreutils.
  # Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
  #
--#
+@@ -6,23 +5,24 @@
  # Holger Wansing <linux at wansing-online.de>, 2006.
  # Timo Trinks <ttrinks at redhat.com>, 2006, 2007.
  # Michael Sch?nitzer <michael at schoenitzer.de>, 2007.
@@ -46392,7 +46392,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Fabian Affolter <fab at fedoraproject.org>, 2008,2009.
  # Timo Trinks <ttrinks at redhat.com>, 2008.
  # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
-+#
++# Michael M?nch <micm at fedoraproject.org.org>, 2009.
  msgid ""
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD.de\n"
@@ -46402,8 +46402,8 @@ diff --exclude-from=exclude -N -u -r nsa
 -"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
 -"Language-Team: German <i18 at redhat.com>\n"
 +"POT-Creation-Date: 2008-09-09 13:24-0400\n"
-+"PO-Revision-Date: 2009-06-17 15:13+0100\n"
-+"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
++"PO-Revision-Date: 2009-07-11 10:02+0200\n"
++"Last-Translator: Michael M?nch <micm at fedoraproject.org>\n"
 +"Language-Team: German <fedora-trans-de at redhat.com>\n"
  "MIME-Version: 1.0\n"
[...16868 lines suppressed...]
 +msgid "Toggle between all and customized file context"
-+msgstr ""
- 
--#~ msgid "FTP"
--#~ msgstr "FTP"
++msgstr "Toggle ?????? ???????????????????? ??????? ??????? ?????? ???????????? ?????"
++
 +#: ../gui/system-config-selinux.glade:2150
 +msgid "label38"
 +msgstr "label38"
  
--#~ msgid "Zebra"
--#~ msgstr "Zebra"
+-#~ msgid "Label Prefix"
+-#~ msgstr "?????????? ?????"
 +#: ../gui/system-config-selinux.glade:2187
 +msgid "Add SELinux User Mapping"
 +msgstr "SELinux ????? ????????? ?????????"
  
--#~ msgid "Disable SELinux protection for ftpd daemon"
--#~ msgstr "ftpd daemon???? SELinux ?????????? ??????????????"
+-#~ msgid "MLS/MCS Level"
+-#~ msgstr "MLS/MCS ????"
 +#: ../gui/system-config-selinux.glade:2203
 +msgid "Modify SELinux User Mapping"
 +msgstr "SELinux ????? ????????? ?????????"
@@ -249827,10 +251579,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +#: ../gui/system-config-selinux.glade:2816
 +#: ../gui/system-config-selinux.glade:2834
 +msgid "Toggle between Customized and All Ports"
-+msgstr ""
- 
--#~ msgid "Disable SELinux protection for httpd daemon"
--#~ msgstr "httpd daemon???? SELinux ?????????? ??????????????"
++msgstr "Toggle ?????? ???????????????????? ??????? ??????? ????????????? ?????"
++
 +#: ../gui/system-config-selinux.glade:2954
 +msgid "label42"
 +msgstr "label42"
@@ -249846,41 +251596,27 @@ diff --exclude-from=exclude -N -u -r nsa
 +#: ../gui/system-config-selinux.glade:3023
 +msgid "Remove loadable policy module"
 +msgstr "??????????? ?????? ???????? ?????????"
- 
--#~ msgid "Disable SELinux protection for pppd daemon"
--#~ msgstr "pppd daemon???? SELinux ?????????? ??????????????"
++
 +#: ../gui/system-config-selinux.glade:3059
-+msgid ""
-+"Enable/Disable additional audit rules, that are normally not reported in the "
-+"log files."
-+msgstr ""
- 
--#~ msgid "Disable SELinux protection for the mozilla ppp daemon"
--#~ msgstr "mozilla ppp daemon???? SELinux ?????????? ??????????????"
++msgid "Enable/Disable additional audit rules, that are normally not reported in the log files."
++msgstr "??????? ???????????????? ??????? ????????????/???????????, ????? ??????????? ????????? ???????????????."
++
 +#: ../gui/system-config-selinux.glade:3179
 +msgid "label44"
 +msgstr "label44"
- 
--#~ msgid "Spam Assassin"
--#~ msgstr "Spam Assassin"
++
 +#: ../gui/system-config-selinux.glade:3216
 +msgid "Change process mode to permissive."
-+msgstr ""
- 
--#~ msgid "Disable SELinux protection for zebra daemon"
--#~ msgstr "zebra daemon???? SELinux ?????????? ??????????????"
++msgstr "????? ???????? ????????????? ?????????."
++
 +#: ../gui/system-config-selinux.glade:3234
 +msgid "Change process mode to enforcing"
-+msgstr ""
- 
--#~ msgid "Label Prefix"
--#~ msgstr "?????????? ?????"
++msgstr "????? ???????? ??????????? ?????????"
++
 +#: ../gui/system-config-selinux.glade:3326
 +msgid "Process Domain"
-+msgstr ""
- 
--#~ msgid "MLS/MCS Level"
--#~ msgstr "MLS/MCS ????"
++msgstr "??????????? ?????????????????"
++
 +#: ../gui/system-config-selinux.glade:3354
 +msgid "label59"
 +msgstr "label59"
@@ -249906,9 +251642,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "MLS/\n"
 -#~ "MCS ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.67/po/te.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.73/po/te.po
 --- nsapolicycoreutils/po/te.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/te.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/te.po	2009-09-08 09:38:59.000000000 -0400
 @@ -1,21 +1,23 @@
 -# translation of new_policycoreutils.HEAD.te.po to Telugu
 +# translation of policycoreutils.HEAD.te.po to Telugu
@@ -254687,9 +256423,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "???????\n"
 -#~ "????????\n"
 -#~ "????????\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.67/po/th.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.73/po/th.po
 --- nsapolicycoreutils/po/th.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/th.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/th.po	2009-09-08 09:38:59.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -257734,9 +259470,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.67/po/tr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.73/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/tr.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/tr.po	2009-09-08 09:38:59.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -260781,9 +262517,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.67/po/uk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.73/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/uk.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/uk.po	2009-09-08 09:38:59.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -263918,9 +265654,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "???????? ??????? ????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.67/po/ur.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.73/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/ur.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/ur.po	2009-09-08 09:38:59.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -266965,9 +268701,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.67/po/vi.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.73/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/vi.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/vi.po	2009-09-08 09:38:59.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -270012,9 +271748,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.67/po/zh_CN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.73/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/zh_CN.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/zh_CN.po	2009-09-08 09:38:59.000000000 -0400
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -274633,9 +276369,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
 -#~ msgid "SELinux user '%s' is required"
 -#~ msgstr "SELinux ?? '%s' ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.67/po/zh_TW.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.73/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/zh_TW.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/zh_TW.po	2009-09-08 09:38:59.000000000 -0400
 @@ -1,19 +1,19 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -279551,9 +281287,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "tcp\n"
 -#~ "udp"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.67/po/zu.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.73/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.67/po/zu.po	2009-07-07 16:48:11.000000000 -0400
++++ policycoreutils-2.0.73/po/zu.po	2009-09-08 09:38:59.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  200 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   13 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   33 +
 semanage/seobject.py                        |   15 
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   51 +-
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 27 files changed, 1837 insertions(+), 950 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -p -r1.437 -r1.438
--- policycoreutils-rhat.patch	28 Aug 2009 18:18:46 -0000	1.437
+++ policycoreutils-rhat.patch	8 Sep 2009 14:15:59 -0000	1.438
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.71/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.73/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/audit2allow/audit2allow	2009-09-08 09:21:08.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -38,18 +38,29 @@ diff --exclude-from=exclude --exclude=se
          else:
              # This is the default if no input is specified
              f = sys.stdin
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.73/load_policy/Makefile
+--- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.73/load_policy/Makefile	2009-09-08 10:08:07.000000000 -0400
+@@ -1,6 +1,6 @@
+ # Installation directories.
+ PREFIX ?= ${DESTDIR}/usr
+-SBINDIR ?= $(PREFIX)/sbin
++SBINDIR ?= $(DESTDIR)/sbin
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
+ 
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.73/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/Makefile	2009-09-08 09:21:08.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 sandbox 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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.71/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.73/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/Makefile	2009-09-08 09:21:08.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -96,16 +107,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service	2009-09-08 09:21:08.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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.71/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.73/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.c	2009-09-08 09:21:08.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -596,9 +607,9 @@ diff --exclude-from=exclude --exclude=se
  }
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.73/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.conf	2009-09-08 09:21:08.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -609,9 +620,9 @@ diff --exclude-from=exclude --exclude=se
  /root/.ssh/*
 -
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.71/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.73/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.desktop	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -620,9 +631,9 @@ diff --exclude-from=exclude --exclude=se
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.71/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.73/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.h	2009-09-08 09:21:08.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -647,15 +658,15 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.73/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.71/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.73/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/user.c	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/user.c	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -894,9 +905,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.71/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.73/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/watch.c	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1152,9 +1163,9 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.71/sandbox/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.73/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/Makefile	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/Makefile	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1187,10 +1198,10 @@ diff --exclude-from=exclude --exclude=se
 +	../../scripts/Lindent $(wildcard *.[ch])
 +
 +relabel:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.71/sandbox/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandbox	2009-08-28 14:07:24.000000000 -0400
-@@ -0,0 +1,202 @@
++++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-08 09:21:08.000000000 -0400
+@@ -0,0 +1,200 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1347,8 +1358,6 @@ diff --exclude-from=exclude --exclude=se
 +                         if not os.path.exists("/usr/sbin/seunshare"):
 +                                raise ValueError("""/usr/sbin/seunshare required for sandbox -X, to install you need to execute 
 +#yum install /usr/sbin/seunshare""")
-+                         else:
-+                                print "exists"
 +                         import warnings
 +                         warnings.simplefilter("ignore")
 +                         newhomedir = os.tempnam(".", ".sandbox%s")
@@ -1393,9 +1402,9 @@ diff --exclude-from=exclude --exclude=se
 +        
 +    sys.exit(rc)
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.71/sandbox/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.73/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandbox.8	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox.8	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1423,9 +1432,9 @@ diff --exclude-from=exclude --exclude=se
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.71/sandbox/sandboxX.sh
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.73/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandboxX.sh	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandboxX.sh	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,13 @@
 +#!/bin/bash 
 +(Xephyr -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
@@ -1440,9 +1449,9 @@ diff --exclude-from=exclude --exclude=se
 +exit $EXITCODE
 +break
 +done
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.71/sandbox/seunshare.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.73/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/seunshare.c	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/seunshare.c	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,203 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -1479,7 +1488,7 @@ diff --exclude-from=exclude --exclude=se
 +		if (capng_lock() < 0) 
 +			return -1;
 +	} else {
-+		if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, CAP_SETPCAP, -1) < 0) { 
++		if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_SETPCAP, -1) < 0) { 
 +			return -1;
 +		}
 +	}
@@ -1647,9 +1656,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.73/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/scripts/chcat	2009-09-08 09:21:08.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1659,9 +1668,9 @@ diff --exclude-from=exclude --exclude=se
      
      sys.exit(errors)
      
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.71/scripts/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.73/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/scripts/Makefile	2009-09-08 09:21:08.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1671,18 +1680,10 @@ diff --exclude-from=exclude --exclude=se
  
  install: all
  	-mkdir -p $(BINDIR)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage	2009-08-28 14:07:24.000000000 -0400
-@@ -68,6 +68,7 @@
- 	-h, --help       Display this message
- 	-n, --noheading  Do not print heading when listing OBJECTS
-         -S, --store      Select and alternate SELinux store to manage
-+        --dontaudit      Turn on or off dontaudit rules
- 
- Object-specific Options (see above):
- 
-@@ -84,6 +85,7 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.73/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.73/semanage/semanage	2009-09-08 09:21:08.000000000 -0400
+@@ -85,6 +85,7 @@
          -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
@@ -1690,7 +1691,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")
-@@ -192,6 +194,9 @@
+@@ -194,6 +195,9 @@
  		locallist = False
  		use_file = False
                  store = ""
@@ -1700,7 +1701,7 @@ diff --exclude-from=exclude --exclude=se
  			
  		object = argv[0]
  		option_dict=get_options()
-@@ -201,10 +206,12 @@
+@@ -203,10 +207,12 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
@@ -1714,7 +1715,7 @@ diff --exclude-from=exclude --exclude=se
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -248,9 +255,15 @@
+@@ -250,9 +256,15 @@
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
@@ -1730,7 +1731,7 @@ diff --exclude-from=exclude --exclude=se
  			if o == "-h" or o == "--help":
                                 raise ValueError(_("%s bad option") % o)
  
-@@ -324,6 +337,9 @@
+@@ -326,6 +338,9 @@
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
  		
@@ -1740,7 +1741,7 @@ diff --exclude-from=exclude --exclude=se
  		if object == "translation":
  			OBJECT = seobject.setransRecords()
  		
-@@ -362,11 +378,17 @@
+@@ -370,11 +385,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -1759,7 +1760,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -386,6 +408,9 @@
+@@ -394,6 +415,9 @@
  				rlist = roles.split()
  				OBJECT.modify(target, rlist, selevel, serange, prefix)
  
@@ -1769,7 +1770,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -396,7 +421,10 @@
+@@ -404,7 +428,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -1781,92 +1782,10 @@ diff --exclude-from=exclude --exclude=se
  
                          return
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.71/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-28 14:07:24.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,7 +21,7 @@
- #
- #  
- 
--import pwd, grp, string, selinux, tempfile, os, re, sys
-+import pwd, grp, string, selinux, tempfile, os, re, sys, stat
- from semanage import *;
- PROGNAME="policycoreutils"
- import sepolgen.module as module
-@@ -273,6 +273,7 @@
- 		(fd, newfilename) = tempfile.mkstemp('', self.filename)
- 		os.write(fd, self.out())
- 		os.close(fd)
-+                os.chmod(newfilename, os.stat(self.filename)[stat.ST_MODE])
- 		os.rename(newfilename, self.filename)
-                 os.system("/sbin/service mcstrans reload > /dev/null")
- 
-@@ -983,7 +984,7 @@
- 			proto_str = semanage_port_get_proto_str(proto)
- 			low = semanage_port_get_low(port)
- 			high = semanage_port_get_high(port)
--			ddict[(low, high)] = (ctype, proto_str, level)
-+			ddict[(low, high, proto_str)] = (ctype, level)
- 		return ddict
- 
- 	def get_all_by_type(self, locallist = 0):
-@@ -1408,6 +1409,48 @@
- class fcontextRecords(semanageRecords):
- 	def __init__(self, store = ""):
- 		semanageRecords.__init__(self, store)
-+                self.equiv = {}
-+                self.equal_ind = False
-+                try:
-+                       fd = open(selinux.selinux_file_context_subs_path(), "r")
-+                       for i in fd.readlines():
-+                              src, dst = i.split()
-+                              self.equiv[src] = dst
-+                       fd.close()
-+                except IOError:
-+                       pass
-+
-+        def commit(self):
-+                if self.equal_ind:
-+                       subs_file = selinux.selinux_file_context_subs_path()
-+                       tmpfile = "%s.tmp" % subs_file
-+                       fd = open(tmpfile, "w")
-+                       for src in self.equiv.keys():
-+                              fd.write("%s %s\n" % (src, self.equiv[src]))
-+                       fd.close()
-+                       try:
-+                              os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE])
-+                       except:
-+                              pass
-+                       os.rename(tmpfile,subs_file)
-+                       self.equal_ind = False
-+		semanageRecords.commit(self)
-+
-+        def add_equal(self, src, dst):
-+                self.begin()
-+                if src in self.equiv.keys():
-+                       raise ValueError(_("Equivalence class for %s already exists") % src)
-+                self.equiv[src] = dst
-+                self.equal_ind = True
-+                self.commit()
-+
-+        def modify_equal(self, src, dst):
-+                self.begin()
-+                if src not in self.equiv.keys():
-+                       raise ValueError(_("Equivalence class for %s does not exists") % src)
-+                self.equiv[src] = dst
-+                self.equal_ind = True
-+                self.commit()
- 
-         def createcon(self, target, seuser = "system_u"):
-                 (rc, con) = semanage_context_create(self.sh)
-@@ -1574,9 +1617,16 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.73/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.73/semanage/seobject.py	2009-09-08 09:21:08.000000000 -0400
+@@ -1586,18 +1586,25 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -1883,7 +1802,18 @@ diff --exclude-from=exclude --exclude=se
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
-@@ -1632,11 +1682,11 @@
+ 
+-		(rc, exists) = semanage_fcontext_exists_local(self.sh, k)
++		(rc,exists) = semanage_fcontext_exists_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 		if not exists:
+-			(rc, exists) = semanage_fcontext_exists(self.sh, k)
++			(rc,exists) = semanage_fcontext_exists(self.sh, k)
+ 			if rc < 0:
+ 				raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 			if exists:
+@@ -1644,11 +1651,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -1897,22 +1827,9 @@ diff --exclude-from=exclude --exclude=se
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1645,6 +1695,12 @@
- 					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 <<None>>" % (k[0], k[1])
-+                if len(self.equiv.keys()) > 0:
-+                       if heading:
-+                              print _("\nSELinux fcontext Equivalence \n")
-+                       
-+                       for src in self.equiv.keys():
-+                              print "%s == %s" % (src, self.equiv[src])
- 				
- class booleanRecords(semanageRecords):
- 	def __init__(self, store = ""):
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.71/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.73/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/semodule/semodule.8	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-08 09:21:08.000000000 -0400
 @@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
@@ -1926,92 +1843,9 @@ diff --exclude-from=exclude --exclude=se
  .B  \-r,\-\-remove=MODULE_NAME
  remove existing module
  .TP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8.enable policycoreutils-2.0.71/semodule/semodule.8.enable
---- nsapolicycoreutils/semodule/semodule.8.enable	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/semodule/semodule.8.enable	2009-08-12 12:08:15.000000000 -0400
-@@ -0,0 +1,79 @@
-+.TH SEMODULE "8" "Nov 2005" "Security Enhanced Linux" NSA
-+.SH NAME 
-+semodule \- Manage SELinux policy modules.
-+
-+.SH SYNOPSIS
-+.B semodule [options]... MODE [MODES]...
-+.br
-+.SH DESCRIPTION
-+.PP
-+semodule is the tool used to manage SELinux policy modules,
-+including installing, upgrading, listing and removing modules.  
-+semodule may also be used to force a rebuild of policy from the
-+module store and/or to force a reload of policy without performing
-+any other transaction.  semodule acts on module packages created
-+by semodule_package.  Conventionally, these files have a .pp suffix
-+(policy package), although this is not mandated in any way.
-+
-+.SH "OPTIONS"
-+.TP
-+.B \-R, \-\-reload
-+force a reload of policy
-+.TP
-+.B \-B, \-\-build		
-+force a rebuild of policy (also reloads unless -n is used)
-+.TP
-+.B \-D, \-\-disable_dontaudit
-+Temporarily remove dontaudits from policy.  Reverts whenever policy is rebuilt
-+.TP
-+.B \-i,\-\-install=MODULE_PKG
-+install/replace a module package
-+.TP
-+.B  \-u,\-\-upgrade=MODULE_PKG
-+upgrade an existing module package
-+.TP
-+.B  \-b,\-\-base=MODULE_PKG   
-+install/replace base module package
-+.TP
-+.B  \-r,\-\-remove=MODULE_NAME
-+remove existing module
-+.TP
-+.B  \-l,\-\-list-modules      
-+display list of installed modules (other than base)
-+.TP
-+.B  \-s,\-\-store	   
-+name of the store to operate on
-+.TP
-+.B  \-n,\-\-noreload	
-+do not reload policy after commit
-+.TP
-+.B  \-h,\-\-help        
-+prints help message and quit
-+.TP
-+.B  \-v,\-\-verbose     
-+be verbose
-+
-+.SH EXAMPLE
-+.nf
-+# Install or replace a base policy package.
-+$ semodule -b base.pp
-+# Install or replace a non-base policy package.
-+$ semodule -i httpd.pp
-+# List non-base modules.
-+$ semodule -l
-+# Turn on all AVC Messages for which SELinux currently is "dontaudit"ing.
-+$ semodule -DB
-+# Turn "dontaudit" rules back on.
-+$ semodule -B
-+# Install or replace all non-base modules in the current directory.
-+$ semodule -i *.pp
-+# Install or replace all modules in the current directory.
-+$ ls *.pp | grep -Ev "base.pp|enableaudit.pp" | xargs /usr/sbin/semodule -b base.pp -i
-+.fi
-+
-+.SH SEE ALSO
-+.B checkmodule(8), semodule_package(8)
-+.SH AUTHORS
-+.nf
-+This manual page was written by Dan Walsh <dwalsh at redhat.com>.
-+The program was written by Karl MacMillan <kmacmillan at tresys.com>, Joshua Brindle <jbrindle at tresys.com>, Jason Tang <jtang at tresys.com>
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.71/semodule/semodule.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.73/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.71/semodule/semodule.c	2009-08-28 14:08:55.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-08 09:21:08.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -2126,467 +1960,9 @@ diff --exclude-from=exclude --exclude=se
  						semanage_module_info_datum_destroy
  						    (m);
  					}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c.enable policycoreutils-2.0.71/semodule/semodule.c.enable
---- nsapolicycoreutils/semodule/semodule.c.enable	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/semodule/semodule.c.enable	2009-08-12 12:08:15.000000000 -0400
-@@ -0,0 +1,454 @@
-+/* Authors: Karl MacMillan <kmacmillan at tresys.com>
-+ *          Joshua Brindle <jbrindle at tresys.com>
-+ *          Jason Tang <jtang at tresys.com>
-+ *
-+ * Copyright (C) 2004-2005 Tresys Technology, LLC
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License as
-+ *      published by the Free Software Foundation, version 2.
-+ */
-+
-+#include <fcntl.h>
-+#include <getopt.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+
-+#include <semanage/modules.h>
-+
-+enum client_modes { NO_MODE, INSTALL_M, UPGRADE_M, BASE_M, REMOVE_M,
-+	LIST_M, RELOAD
-+};
-+/* list of modes in which one ought to commit afterwards */
-+static const int do_commit[] = {
-+	0, 1, 1, 1, 1,
-+	0, 0
-+};
-+
-+struct command {
-+	enum client_modes mode;
-+	char *arg;
-+};
-+static struct command *commands = NULL;
-+static int num_commands = 0;
-+
-+/* options given on command line */
-+static int verbose;
-+static int reload;
-+static int no_reload;
-+static int create_store;
-+static int build;
-+static int disable_dontaudit;
-+
-+static semanage_handle_t *sh = NULL;
-+static char *store;
-+
-+extern char *optarg;
-+extern int optind;
-+
-+static void cleanup(void)
-+{
-+	while (--num_commands >= 0) {
-+		free(commands[num_commands].arg);
-+	}
-+	free(commands);
-+}
-+
-+/* Signal handlers. */
-+static void handle_signal(int sig_num)
-+{
-+	if (sig_num == SIGINT || sig_num == SIGQUIT || sig_num == SIGTERM) {
-+		/* catch these signals, and then drop them */
-+	}
-+}
-+
-+static void set_store(char *storename)
-+{
-+	/* For now this only supports a store name, later on this 
-+	 * should support an address for a remote connection */
-+
-+	if ((store = strdup(storename)) == NULL) {
-+		fprintf(stderr, "Out of memory!\n");
-+		goto bad;
-+	}
-+
-+	return;
-+
-+      bad:
-+	cleanup();
-+	exit(1);
-+}
-+
-+/* Establish signal handlers for the process. */
-+static void create_signal_handlers(void)
-+{
-+	if (signal(SIGINT, handle_signal) == SIG_ERR ||
-+	    signal(SIGQUIT, handle_signal) == SIG_ERR ||
-+	    signal(SIGTERM, handle_signal) == SIG_ERR) {
-+		fprintf(stderr, "Could not set up signal handler.\n");
-+		exit(255);
-+	}
-+}
-+
-+static void usage(char *progname)
-+{
-+	printf("usage:  %s [options]... MODE [MODES]...\n", progname);
-+	printf("Manage SELinux policy modules.\n");
-+	printf("MODES:\n");
-+	printf("  -R, --reload		    reload policy\n");
-+	printf("  -B, --build		    build and reload policy\n");
-+	printf("  -i,--install=MODULE_PKG   install a new module\n");
-+	printf("  -u,--upgrade=MODULE_PKG   upgrade existing module\n");
-+	printf("  -b,--base=MODULE_PKG      install new base module\n");
-+	printf("  -r,--remove=MODULE_NAME   remove existing module\n");
-+	printf
-+	    ("  -l,--list-modules         display list of installed modules\n");
-+	printf("Other options:\n");
-+	printf("  -s,--store	   name of the store to operate on\n");
-+	printf("  -n,--noreload	   do not reload policy after commit\n");
-+	printf("  -h,--help        print this message and quit\n");
-+	printf("  -v,--verbose     be verbose\n");
-+	printf("  -D,--disable_dontaudit	Remove dontaudits from policy\n");
-+}
-+
-+/* Sets the global mode variable to new_mode, but only if no other
-+ * mode has been given. */
-+static void set_mode(enum client_modes new_mode, char *arg)
-+{
-+	struct command *c;
-+	char *s;
-+	if ((c = realloc(commands, sizeof(*c) * (num_commands + 1))) == NULL) {
-+		fprintf(stderr, "Out of memory!\n");
-+		cleanup();
-+		exit(1);
-+	}
-+	commands = c;
-+	commands[num_commands].mode = new_mode;
-+	commands[num_commands].arg = NULL;
-+	num_commands++;
-+	if (arg != NULL) {
-+		if ((s = strdup(arg)) == NULL) {
-+			fprintf(stderr, "Out of memory!\n");
-+			cleanup();
-+			exit(1);
-+		}
-+		commands[num_commands - 1].arg = s;
-+	}
-+}
-+
-+/* Parse command line and set global options. */
-+static void parse_command_line(int argc, char **argv)
-+{
-+	static struct option opts[] = {
-+		{"store", required_argument, NULL, 's'},
-+		{"base", required_argument, NULL, 'b'},
-+		{"help", 0, NULL, 'h'},
-+		{"install", required_argument, NULL, 'i'},
-+		{"list-modules", 0, NULL, 'l'},
-+		{"verbose", 0, NULL, 'v'},
-+		{"remove", required_argument, NULL, 'r'},
-+		{"upgrade", required_argument, NULL, 'u'},
-+		{"reload", 0, NULL, 'R'},
-+		{"noreload", 0, NULL, 'n'},
-+		{"build", 0, NULL, 'B'},
-+		{"disable_dontaudit", 0, NULL, 'D'},
-+		{NULL, 0, NULL, 0}
-+	};
-+	int i;
-+	verbose = 0;
-+	reload = 0;
-+	no_reload = 0;
-+	create_store = 0;
-+	while ((i =
-+		getopt_long(argc, argv, "s:b:hi:lvqr:u:RnBD", opts,
-+			    NULL)) != -1) {
-+		switch (i) {
-+		case 'b':
-+			set_mode(BASE_M, optarg);
-+			create_store = 1;
-+			break;
-+		case 'h':
-+			usage(argv[0]);
-+			exit(0);
-+		case 'i':
-+			set_mode(INSTALL_M, optarg);
-+			break;
-+		case 'l':
-+			set_mode(LIST_M, NULL);
-+			break;
-+		case 'v':
-+			verbose = 1;
-+			break;
-+		case 'r':
-+			set_mode(REMOVE_M, optarg);
-+			break;
-+		case 'u':
-+			set_mode(UPGRADE_M, optarg);
-+			break;
-+		case 's':
-+			set_store(optarg);
-+			break;
-+		case 'R':
-+			reload = 1;
-+			break;
-+		case 'n':
-+			no_reload = 1;
-+			break;
-+		case 'B':
-+			build = 1;
-+			break;
-+		case 'D':
-+			disable_dontaudit = 1;
-+			break;
-+		case '?':
-+		default:{
-+				usage(argv[0]);
-+				exit(1);
-+			}
-+		}
-+	}
-+	if ((build || reload) && num_commands) {
-+		fprintf(stderr,
-+			"build or reload should not be used with other commands\n");
-+		usage(argv[0]);
-+		exit(1);
-+	}
-+	if (num_commands == 0 && reload == 0 && build == 0) {
-+		fprintf(stderr, "At least one mode must be specified.\n");
-+		usage(argv[0]);
-+		exit(1);
-+	}
-+
-+	if (optind < argc) {
-+		int mode;
-+		/* if -i/u/r was the last command treat any remaining
-+		 * arguments as args. Will allow 'semodule -i *.pp' to
-+		 * work as expected.
-+		 */
-+
-+		if (commands && commands[num_commands - 1].mode == INSTALL_M) {
-+			mode = INSTALL_M;
-+		} else if (commands && commands[num_commands - 1].mode == UPGRADE_M) {
-+			mode = UPGRADE_M;
-+		} else if (commands && commands[num_commands - 1].mode == REMOVE_M) {
-+			mode = REMOVE_M;
-+		} else {
-+			fprintf(stderr, "unknown additional arguments:\n");
-+			while (optind < argc)
-+				fprintf(stderr, " %s", argv[optind++]);
-+			fprintf(stderr, "\n\n");
-+			usage(argv[0]);
-+			exit(1);
-+		}
-+		while (optind < argc)
-+			set_mode(mode, argv[optind++]);
-+	}
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+	int i, commit = 0;
-+	int result;
-+	int status = EXIT_FAILURE;
-+
-+	create_signal_handlers();
-+	parse_command_line(argc, argv);
-+
-+	if (build)
-+		commit = 1;
-+
-+	sh = semanage_handle_create();
-+	if (!sh) {
-+		fprintf(stderr, "%s:  Could not create semanage handle\n",
-+			argv[0]);
-+		goto cleanup_nohandle;
-+	}
-+
-+	if (store) {
-+		/* Set the store we want to connect to, before connecting.
-+		 * this will always set a direct connection now, an additional
-+		 * option will need to be used later to specify a policy server 
-+		 * location */
-+		semanage_select_store(sh, store, SEMANAGE_CON_DIRECT);
-+	}
-+
-+	/* if installing base module create store if necessary, for bootstrapping */
-+	semanage_set_create_store(sh, create_store);
-+
-+	if (!create_store) {
-+		if (!semanage_is_managed(sh)) {
-+			fprintf(stderr,
-+				"%s: SELinux policy is not managed or store cannot be accessed.\n",
-+				argv[0]);
-+			goto cleanup;
-+		}
-+
-+		if (semanage_access_check(sh) < SEMANAGE_CAN_READ) {
-+			fprintf(stderr, "%s: Cannot read policy store.\n",
-+				argv[0]);
-+			goto cleanup;
-+		}
-+	}
-+
-+	if ((result = semanage_connect(sh)) < 0) {
-+		fprintf(stderr, "%s:  Could not connect to policy handler\n",
-+			argv[0]);
-+		goto cleanup;
-+	}
-+
-+	if (reload) {
-+		if ((result = semanage_reload_policy(sh)) < 0) {
-+			fprintf(stderr, "%s:  Could not reload policy\n",
-+				argv[0]);
-+			goto cleanup;
-+		}
-+	}
-+
-+	if (build) {
-+		if ((result = semanage_begin_transaction(sh)) < 0) {
-+			fprintf(stderr, "%s:  Could not begin transaction:  %s\n",
-+				argv[0], errno ? strerror(errno) : "");
-+			goto cleanup;
-+		}
-+	}
-+
-+	for (i = 0; i < num_commands; i++) {
-+		enum client_modes mode = commands[i].mode;
-+		char *mode_arg = commands[i].arg;
-+		switch (mode) {
-+		case INSTALL_M:{
-+				if (verbose) {
-+					printf
-+					    ("Attempting to install module '%s':\n",
-+					     mode_arg);
-+				}
-+				result =
-+				    semanage_module_install_file(sh, mode_arg);
-+				break;
-+			}
-+		case UPGRADE_M:{
-+				if (verbose) {
-+					printf
-+					    ("Attempting to upgrade module '%s':\n",
-+					     mode_arg);
-+				}
-+				result =
-+				    semanage_module_upgrade_file(sh, mode_arg);
-+				break;
-+			}
-+		case BASE_M:{
-+				if (verbose) {
-+					printf
-+					    ("Attempting to install base module '%s':\n",
-+					     mode_arg);
-+				}
-+				result =
-+				    semanage_module_install_base_file(sh, mode_arg);
-+				break;
-+			}
-+		case REMOVE_M:{
-+				if (verbose) {
-+					printf
-+					    ("Attempting to remove module '%s':\n",
-+					     mode_arg);
-+				}
-+				result = semanage_module_remove(sh, mode_arg);
-+				if ( result == -2 ) { 
-+					continue;
-+				}
-+				break;
-+			}
-+		case LIST_M:{
-+				semanage_module_info_t *modinfo;
-+				int num_modules;
-+				if (verbose) {
-+					printf
-+					    ("Attempting to list active modules:\n");
-+				}
-+				if ((result =
-+				     semanage_module_list(sh, &modinfo,
-+							  &num_modules)) >= 0) {
-+					int j;
-+					if (num_modules == 0) {
-+						printf("No modules.\n");
-+					}
-+					for (j = 0; j < num_modules; j++) {
-+						semanage_module_info_t *m =
-+						    semanage_module_list_nth
-+						    (modinfo, j);
-+						printf("%s\t%s\n",
-+						       semanage_module_get_name
-+						       (m),
-+						       semanage_module_get_version
-+						       (m));
-+						semanage_module_info_datum_destroy
-+						    (m);
-+					}
-+					free(modinfo);
-+				}
-+				break;
-+			}
-+		default:{
-+				fprintf(stderr,
-+					"%s:  Unknown mode specified.\n",
-+					argv[0]);
-+				usage(argv[0]);
-+				goto cleanup;
-+			}
-+		}
-+		commit += do_commit[mode];
-+		if (result < 0) {
-+			fprintf(stderr, "%s:  Failed on %s!\n", argv[0],
-+				mode_arg ? : "list");
-+			goto cleanup;
-+		} else if (verbose) {
-+			printf("Ok: return value of %d.\n", result);
-+		}
-+	}
-+
-+	if (commit) {
-+		if (verbose)
-+			printf("Committing changes:\n");
-+		if (no_reload)
-+			semanage_set_reload(sh, 0);
-+		if (build)
-+			semanage_set_rebuild(sh, 1);
-+		if (disable_dontaudit)
-+			semanage_set_disable_dontaudit(sh, 1);
-+		else if (build)
-+			semanage_set_disable_dontaudit(sh, 0);
-+
-+		result = semanage_commit(sh);
-+	}
-+
-+	if (result < 0) {
-+		fprintf(stderr, "%s:  Failed!\n", argv[0]);
-+		goto cleanup;
-+	} else if (commit && verbose) {
-+		printf("Ok: transaction number %d.\n", result);
-+	}
-+
-+	if (semanage_disconnect(sh) < 0) {
-+		fprintf(stderr, "%s:  Error disconnecting\n", argv[0]);
-+		goto cleanup;
-+	}
-+	status = EXIT_SUCCESS;
-+
-+      cleanup:
-+	if (semanage_is_connected(sh)) {
-+		if (semanage_disconnect(sh) < 0) {
-+			fprintf(stderr, "%s:  Error disconnecting\n", argv[0]);
-+		}
-+	}
-+	semanage_handle_destroy(sh);
-+
-+      cleanup_nohandle:
-+	cleanup();
-+	exit(status);
-+}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.71/setfiles/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.73/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-08 09:21:08.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -2605,9 +1981,9 @@ diff --exclude-from=exclude --exclude=se
  
  restorecon: setfiles
  	ln -sf setfiles restorecon
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.71/setfiles/restore.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.73/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.c	2009-09-08 09:27:33.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2864,7 +2240,7 @@ diff --exclude-from=exclude --exclude=se
 +	return rc;
 +}
 +
-+int process_one(char *name, int recurse)
++int process_one(char *name, int recurse_this_path)
 +{
 +	int rc = 0;
 +	const char *namelist[2] = {name, NULL};
@@ -2913,7 +2289,7 @@ diff --exclude-from=exclude --exclude=se
 +			fts_set(fts_handle, ftsent, FTS_SKIP);
 +		if (rc == ERR)
 +			goto err;
-+		if (!recurse)
++		if (!recurse_this_path)
 +			break;
 +	} while ((ftsent = fts_read(fts_handle)) != NULL);
 +
@@ -3128,9 +2504,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.71/setfiles/restore.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.73/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-28 14:07:24.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.h	2009-09-08 09:21:08.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -3181,9 +2557,9 @@ diff --exclude-from=exclude --exclude=se
 +int process_one(char *name, int recurse);
 +
 +#endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.71/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-08-12 12:08:15.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-28 14:07:24.000000000 -0400
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-08 09:49:37.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE
@@ -3212,7 +2588,7 @@ diff --exclude-from=exclude --exclude=se
  #include <libgen.h>
  #ifdef USE_AUDIT
  #include <libaudit.h>
-@@ -32,287 +18,28 @@
+@@ -32,40 +18,22 @@
  static int mass_relabel;
  static int mass_relabel_errs;
  
@@ -3223,7 +2599,7 @@ diff --exclude-from=exclude --exclude=se
 -#define STAT_BLOCK_SIZE 1
 -static int progress = 0;
 -static unsigned long long count = 0;
- 
+-
 -#define MAX_EXCLUDES 1000
 -static int excludeCtr = 0;
 -struct edir {
@@ -3231,11 +2607,11 @@ diff --exclude-from=exclude --exclude=se
 -	size_t size;
 -};
 -static struct edir excludeArray[MAX_EXCLUDES];
-+/* cmdline opts*/
  
--/*
-- * Command-line options.
-- */
+ /*
+  * Command-line options.
+  */
++
  static char *policyfile = NULL;
 -static int debug = 0;
 -static int change = 1;
@@ -3247,7 +2623,7 @@ diff --exclude-from=exclude --exclude=se
  static int null_terminated = 0;
 -static char *rootpath = NULL;
 -static int rootpathlen = 0;
--static int recurse; /* Recursive descent. */
+ static int recurse; /* Recursive descent. */
  static int errors;
 +static int ignore_enoent;
 +static struct restore_opts r_opts;
@@ -3259,10 +2635,10 @@ diff --exclude-from=exclude --exclude=se
  
  #define SETFILES "setfiles"
  #define RESTORECON "restorecon"
- static int iamrestorecon;
+@@ -73,246 +41,9 @@
  
  /* Behavior flags determined based on setfiles vs. restorecon */
--static int expand_realpath;  /* Expand paths via realpath. */
+ static int expand_realpath;  /* Expand paths via realpath. */
 -static int abort_on_error; /* Abort the file tree walk upon an error. */
 -static int add_assoc; /* Track inode associations for conflict detection. */
 -static int fts_flags; /* Flags to fts, e.g. follow links, follow mounts */
@@ -3506,7 +2882,7 @@ diff --exclude-from=exclude --exclude=se
  void usage(const char *const name)
  {
  	if (iamrestorecon) {
-@@ -334,194 +61,30 @@
+@@ -334,194 +65,30 @@
  void inc_err()
  {
  	nerr++;
@@ -3635,7 +3011,7 @@ diff --exclude-from=exclude --exclude=se
 -
 -	if (context)
 -		freecon(context);
--
+ 
 -	/*
 -	 * Do not relabel the file if -n was used.
 -	 */
@@ -3674,7 +3050,7 @@ diff --exclude-from=exclude --exclude=se
 -			progname, ftsent->fts_path);
 -		return SKIP;
 -	}
- 
+-
 -	int rc = restore(ftsent);
 -	if (rc == ERR) {
 -		if (!abort_on_error)
@@ -3710,11 +3086,11 @@ diff --exclude-from=exclude --exclude=se
  }
  
  int canoncon(char **contextp)
-@@ -545,90 +108,7 @@
- 	return rc;
+@@ -585,77 +152,6 @@
+ 	return 0;
  }
  
--static int process_one(char *name)
+-static int process_one(char *name, int recurse_this_path)
 -{
 -	int rc = 0;
 -	const char *namelist[2];
@@ -3722,18 +3098,6 @@ diff --exclude-from=exclude --exclude=se
 -	FTS *fts_handle;
 -	FTSENT *ftsent;
 -
--	if (expand_realpath) {
--		char *p;
--		p = realpath(name, NULL);
--		if (!p) {
--			fprintf(stderr, "realpath(%s) failed %s\n", name,
--				strerror(errno));
--			return -1;
--		}
--		name = p;
--	}
--
--
 -	if (!strcmp(name, "/"))
 -		mass_relabel = 1;
 -
@@ -3773,7 +3137,7 @@ diff --exclude-from=exclude --exclude=se
 -			fts_set(fts_handle, ftsent, FTS_SKIP);
 -		if (rc == ERR)
 -			goto err;
--		if (!recurse)
+-		if (!recurse_this_path)
 -			break;
 -	} while ((ftsent = fts_read(fts_handle)) != NULL);
 -
@@ -3788,24 +3152,30 @@ diff --exclude-from=exclude --exclude=se
 -	}
 -	if (fts_handle)
 -		fts_close(fts_handle);
--	if (expand_realpath)
--		free(name);
 -	return rc;
- 
+-
 -err:
 -	if (!strcmp(name, "/"))
 -		mass_relabel_errs = 1;
 -	rc = -1;
 -	goto out;
 -}
+-
+ static int process_one_realpath(char *name)
+ {
+ 	int rc = 0;
+@@ -668,7 +164,7 @@
+ 		rc = lstat(name, &sb);
+ 		if (rc < 0) {
+ 			fprintf(stderr, "%s:  lstat(%s) failed:  %s\n",
+-				progname, name,	strerror(errno));
++				r_opts.progname, name,	strerror(errno));
+ 			return -1;
+ 		}
  
- #ifndef USE_AUDIT
- static void maybe_audit_mass_relabel(void)
-@@ -729,27 +209,37 @@
- 	int use_input_file = 0;
+@@ -802,20 +298,30 @@
  	char *buf = NULL;
  	size_t buf_len;
-+	int recurse; /* Recursive descent. */
  	char *base;
 -	struct selinux_opt opts[] = {
 -		{ SELABEL_OPT_VALIDATE, NULL },
@@ -3842,17 +3212,10 @@ diff --exclude-from=exclude --exclude=se
  	
  	if (!strcmp(base, SETFILES)) {
  		/* 
- 		 * setfiles:  
- 		 * Recursive descent,
--		 * Does not expand paths via realpath, 
- 		 * Aborts on errors during the file tree walk, 
- 		 * Try to track inode associations for conflict detection,
- 		 * Does not follow mounts,
-@@ -757,29 +247,26 @@
- 		 */
+@@ -830,28 +336,28 @@
  		iamrestorecon = 0;
  		recurse = 1;
--		expand_realpath = 0;
+ 		expand_realpath = 0;
 -		abort_on_error = 1;
 -		add_assoc = 1;
 -		fts_flags = FTS_PHYSICAL | FTS_XDEV;
@@ -3866,6 +3229,7 @@ diff --exclude-from=exclude --exclude=se
  		 * No recursive descent unless -r/-R,
 -		 * Expands paths via realpath, 
  		 * Do not abort on errors during the file tree walk,
++		 * Expands paths via realpath, 
  		 * Do not try to track inode associations for conflict detection,
  		 * Follows mounts,
  		 * Does lazy validation of contexts upon use. 
@@ -3875,7 +3239,7 @@ diff --exclude-from=exclude --exclude=se
  			printf("Executed with an unrecognized name (%s), defaulting to %s behavior.\n", base, RESTORECON);
  		iamrestorecon = 1;
  		recurse = 0;
--		expand_realpath = 1;
+ 		expand_realpath = 1;
 -		abort_on_error = 0;
 -		add_assoc = 0;
 -		fts_flags = FTS_PHYSICAL;
@@ -3885,19 +3249,7 @@ diff --exclude-from=exclude --exclude=se
  		ctx_validate = 0;
  
  		/* restorecon only:  silent exit if no SELinux.
-@@ -828,11 +315,6 @@
- 			}
- 		case 'e':
- 			remove_exclude(optarg);
--			if (lstat(optarg, &sb) < 0 && errno != EACCES) {
--				fprintf(stderr, "Can't stat exclude path \"%s\", %s - ignoring.\n",
--					optarg, strerror(errno));
--				break;
--			}
- 			if (add_exclude(optarg))
- 				exit(1);
- 			break;
-@@ -841,37 +323,37 @@
+@@ -913,37 +419,37 @@
  			input_filename = optarg;
  			break;			
  		case 'd':
@@ -3944,12 +3296,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'R':
  		case 'r':
-@@ -880,11 +362,11 @@
- 				break;
- 			}
- 			if (optind + 1 >= argc) {
--				fprintf(stderr, "usage:  %s -r rootpath\n",
-+				fprintf(stderr, "usage:  %s -r r_opts.rootpath\n",
+@@ -956,7 +462,7 @@
  					argv[0]);
  				exit(1);
  			}
@@ -3958,7 +3305,7 @@ diff --exclude-from=exclude --exclude=se
  				fprintf(stderr,
  					"%s: only one -r can be specified\n",
  					argv[0]);
-@@ -895,23 +377,23 @@
+@@ -967,23 +473,23 @@
  		case 's':
  			use_input_file = 1;
  			input_filename = "-";
@@ -3987,7 +3334,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'W':
  			warn_no_match = 1;
-@@ -959,18 +441,13 @@
+@@ -1031,18 +537,13 @@
  	}
  
  	/* Load the file contexts configuration and check it. */
@@ -4009,38 +3356,18 @@ diff --exclude-from=exclude --exclude=se
  	if (use_input_file) {
  		FILE *f = stdin;
  		ssize_t len;
-@@ -987,31 +464,49 @@
+@@ -1059,6 +560,9 @@
  		delim = (null_terminated != 0) ? '\0' : '\n';
  		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
  			buf[len - 1] = 0;
--			errors |= process_one(buf);
 +			if (!strcmp(buf, "/"))
 +				mass_relabel = 1;
 +	
-+			char *filename = realpath(buf, NULL);
-+			if (!filename) {
-+				fprintf(stderr, "realpath(%s) failed %s\n", buf,
-+					strerror(errno));
-+				return -1;
-+			}
-+			errors |= process_one(filename, recurse) < 0;
-+			free(filename);
+ 			errors |= process_one_realpath(buf);
  		}
  		if (strcmp(input_filename, "-") != 0)
- 			fclose(f);
- 	} else {
- 		for (i = optind; i < argc; i++) {
--			errors |= process_one(argv[i]);
-+			if (!strcmp(argv[i], "/"))
-+				mass_relabel = 1;
-+			char *filename = realpath(argv[i], NULL);
-+			if (!filename) {
-+				fprintf(stderr, "realpath(%s) failed %s\n", argv[i],
-+					strerror(errno));
-+				return -1;
-+			}
-+			errors |= process_one(filename, recurse) < 0;
-+			free(filename);
+@@ -1068,22 +572,21 @@
+ 			errors |= process_one_realpath(argv[i]);
  		}
  	}
 -


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -p -r1.637 -r1.638
--- policycoreutils.spec	2 Sep 2009 15:09:25 -0000	1.637
+++ policycoreutils.spec	8 Sep 2009 14:16:00 -0000	1.638
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.17
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.71
-Release: 15%{?dist}
+Version: 2.0.73
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -226,11 +226,11 @@ rm -rf %{buildroot}
 /sbin/restorecon
 /sbin/fixfiles
 /sbin/setfiles
+/sbin/load_policy
 %{_sbindir}/genhomedircon
 %{_sbindir}/restorecond
 %{_sbindir}/setsebool
 %{_sbindir}/semodule
-%{_sbindir}/load_policy
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
 %{_sbindir}/open_init_pty
@@ -295,6 +295,18 @@ fi
 exit 0
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-1
+- Update to upstream
+        * Add semanage dontaudit to turn off dontaudits from Dan Walsh.
+        * Fix semanage to set correct mode for setrans file from Dan Walsh.
+        * Fix malformed dictionary in portRecord from Dan Walsh.
+	* Restore symlink handling support to restorecon based on a patch by
+	Martin Orr.  This fixes the restorecon /dev/stdin performed by Debian
+	udev scripts that was broken by policycoreutils 2.0.70.
+
+* Thu Sep 3 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-15
+- Add DAC_OVERRIED to seunshare
+
 * Wed Sep  2 2009 Bill Nottingham <notting at redhat.com> 2.0.71-15
 - Fix typo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- sources	18 Aug 2009 19:25:06 -0000	1.209
+++ sources	8 Sep 2009 14:16:00 -0000	1.210
@@ -1,3 +1,2 @@
-00fd9d86bd6a8066da710d6fda910b01  policycoreutils-2.0.71.tgz
-59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2
 480cc64a050735fa1163a87dc89c4f49  sepolgen-1.0.17.tgz
+08fa7fe2f943b7776ee767824318f615  policycoreutils-2.0.73.tgz



From dwalsh at fedoraproject.org  Tue Sep  8 14:23:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  8 Sep 2009 14:23:40 +0000 (UTC)
Subject: rpms/policycoreutils/devel sources,1.210,1.211
Message-ID: <20090908142340.10CD211C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30161

Modified Files:
	sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-1
- Update to upstream
        * Add semanage dontaudit to turn off dontaudits from Dan Walsh.
        * Fix semanage to set correct mode for setrans file from Dan Walsh.
        * Fix malformed dictionary in portRecord from Dan Walsh.
	* Restore symlink handling support to restorecon based on a patch by
	Martin Orr.  This fixes the restorecon /dev/stdin performed by Debian
	udev scripts that was broken by policycoreutils 2.0.70.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- sources	8 Sep 2009 14:16:00 -0000	1.210
+++ sources	8 Sep 2009 14:23:39 -0000	1.211
@@ -1,2 +1,3 @@
 480cc64a050735fa1163a87dc89c4f49  sepolgen-1.0.17.tgz
 08fa7fe2f943b7776ee767824318f615  policycoreutils-2.0.73.tgz
+59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2



From dwalsh at fedoraproject.org  Tue Sep  8 14:30:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  8 Sep 2009 14:30:36 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.73,
	1.74 selinux-policy.spec, 1.912, 1.913
Message-ID: <20090908143036.9328111C0419@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32029

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-5
- Lots of fixes for initrc and other unconfined domains


policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  289 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    2 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  276 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1397 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 316 files changed, 14655 insertions(+), 2939 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- policy-F12.patch	7 Sep 2009 01:29:07 -0000	1.73
+++ policy-F12.patch	8 Sep 2009 14:30:35 -0000	1.74
@@ -989,7 +989,7 @@ diff -b -B --ignore-all-space --exclude-
  locallogin_dontaudit_use_fds(tzdata_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.6.30/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/usermanage.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/usermanage.if	2009-09-08 07:14:39.000000000 -0400
 @@ -274,6 +274,11 @@
  	usermanage_domtrans_useradd($1)
  	role $2 types useradd_t;
@@ -1004,7 +1004,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.30/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/usermanage.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/usermanage.te	2009-09-08 07:19:05.000000000 -0400
 @@ -209,6 +209,7 @@
  files_manage_etc_files(groupadd_t)
  files_relabel_etc_files(groupadd_t)
@@ -1046,7 +1046,11 @@ diff -b -B --ignore-all-space --exclude-
  
  files_manage_etc_files(useradd_t)
  files_search_var_lib(useradd_t)
-@@ -468,15 +468,12 @@
+@@ -465,18 +465,16 @@
+ selinux_compute_relabel_context(useradd_t)
+ selinux_compute_user_contexts(useradd_t)
+ 
++term_use_console(useradd_t)
  term_use_all_user_ttys(useradd_t)
  term_use_all_user_ptys(useradd_t)
  
@@ -1065,19 +1069,19 @@ diff -b -B --ignore-all-space --exclude-
  
  init_use_fds(useradd_t)
  init_rw_utmp(useradd_t)
-@@ -494,10 +491,7 @@
+@@ -494,10 +492,8 @@
  
  userdom_use_unpriv_users_fds(useradd_t)
  # Add/remove user home directories
 -userdom_manage_user_home_content_dirs(useradd_t)
 -userdom_manage_user_home_content_files(useradd_t)
--userdom_home_filetrans_user_home_dir(useradd_t)
+ userdom_home_filetrans_user_home_dir(useradd_t)
 -userdom_user_home_dir_filetrans_user_home_content(useradd_t, notdevfile_class_set)
 +userdom_manage_home_role(system_r, useradd_t)
  
  mta_manage_spool(useradd_t)
  
-@@ -521,6 +515,12 @@
+@@ -521,6 +517,12 @@
  ')
  
  optional_policy(`
@@ -1398,7 +1402,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/libexec/gnome-system-monitor-mechanism 	--      gen_context(system_u:object_r:gnomesystemmm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.30/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/apps/gnome.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/apps/gnome.if	2009-09-08 07:07:37.000000000 -0400
 @@ -89,5 +89,175 @@
  
  	allow $1 gnome_home_t:dir manage_dir_perms;
@@ -4395,12 +4399,16 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.30/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/apps/wine.te	2009-09-02 09:37:57.000000000 -0400
-@@ -9,20 +9,36 @@
++++ serefpolicy-3.6.30/policy/modules/apps/wine.te	2009-09-08 07:24:41.000000000 -0400
+@@ -9,20 +9,46 @@
  type wine_t;
  type wine_exec_t;
  application_domain(wine_t, wine_exec_t)
 +role system_r types wine_t;
++
++type wine_tmp_t;
++files_tmp_file(wine_tmp_t)
++ubac_constrained(wine_tmp_t)
  
  ########################################
  #
@@ -4414,6 +4422,12 @@ diff -b -B --ignore-all-space --exclude-
 -	unconfined_domain_noaudit(wine_t)
 +allow wine_t self:fifo_file manage_fifo_file_perms;
 +
++can_exec(wine_t, wine_exec_t)
++
++manage_dirs_pattern(wine_t, wine_tmp_t, wine_tmp_t)
++manage_files_pattern(wine_t, wine_tmp_t, wine_tmp_t)
++files_tmp_filetrans(wine_t, wine_tmp_t,{ file dir })
++
 +domain_mmap_low_type(wine_t)
 +tunable_policy(`mmap_low_allowed',`
 +	domain_mmap_low(wine_t)
@@ -4428,7 +4442,7 @@ diff -b -B --ignore-all-space --exclude-
   	')
 +
 +optional_policy(`
-+	unconfined_domain(wine_t)
++	unconfined_domain_noaudit(wine_t)
 +')
 +
 +optional_policy(`
@@ -4513,7 +4527,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/gimp/.*/plug-ins(/.*)?  gen_context(system_u:object_r:bin_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.30/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/corecommands.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/corecommands.if	2009-09-07 07:16:21.000000000 -0400
 @@ -893,6 +893,7 @@
  
  	read_lnk_files_pattern($1, bin_t, bin_t)
@@ -4522,6 +4536,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+@@ -973,6 +974,7 @@
+ 		type bin_t;
+ 	')
+ 
++	manage_dirs_pattern($1, bin_t, exec_type)
+ 	manage_files_pattern($1, bin_t, exec_type)
+ 	manage_lnk_files_pattern($1, bin_t, bin_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.30/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/kernel/corenetwork.te.in	2009-08-31 13:40:47.000000000 -0400
@@ -5246,7 +5268,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.30/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/files.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/files.if	2009-09-07 06:40:00.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5683,7 +5705,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.30/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/filesystem.if	2009-09-04 11:37:45.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/filesystem.if	2009-09-08 07:44:43.000000000 -0400
 @@ -1537,6 +1537,24 @@
  
  ########################################
@@ -6142,7 +6164,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/tty		-c	gen_context(system_u:object_r:devtty_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.6.30/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/terminal.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/terminal.if	2009-09-08 07:17:17.000000000 -0400
 @@ -173,7 +173,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -8028,14 +8050,14 @@ diff -b -B --ignore-all-space --exclude-
 +gen_user(xguest_u, user, xguest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.fc serefpolicy-3.6.30/policy/modules/services/abrt.fc
 --- nsaserefpolicy/policy/modules/services/abrt.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/services/abrt.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/abrt.fc	2009-09-07 13:12:20.000000000 -0400
 @@ -0,0 +1,13 @@
 +
 +/etc/rc\.d/init\.d/abrt	        --      gen_context(system_u:object_r:abrt_initrc_exec_t,s0)
 +
 +/etc/abrt(/.*)?                         gen_context(system_u:object_r:abrt_etc_t,s0)
 +
-+/usr/sbin/abrt                  --      gen_context(system_u:object_r:abrt_exec_t,s0)
++/usr/sbin/abrtd                  --      gen_context(system_u:object_r:abrt_exec_t,s0)
 +
 +/var/cache/abrt(/.*)?                   gen_context(system_u:object_r:abrt_var_cache_t,s0)
 +
@@ -11273,7 +11295,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 devicekit_t:process { ptrace signal_perms getattr };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.30/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/devicekit.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/devicekit.te	2009-09-07 07:18:47.000000000 -0400
 @@ -36,12 +36,15 @@
  manage_dirs_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
  manage_files_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
@@ -11295,7 +11317,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  
 -allow devicekit_disk_t self:capability { chown dac_override fowner fsetid sys_nice sys_ptrace sys_rawio };
-+allow devicekit_disk_t self:capability { chown dac_override fowner fsetid net_admin sys_nice sys_ptrace sys_rawio };
++allow devicekit_disk_t self:capability { chown setuid setgid dac_override fowner fsetid net_admin sys_nice sys_ptrace sys_rawio };
 +allow devicekit_disk_t self:process signal_perms;
 +
  allow devicekit_disk_t self:fifo_file rw_fifo_file_perms;
@@ -11495,8 +11517,16 @@ diff -b -B --ignore-all-space --exclude-
  # dovecot deliver local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.30/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/exim.te	2009-08-31 13:40:47.000000000 -0400
-@@ -191,6 +191,10 @@
++++ serefpolicy-3.6.30/policy/modules/services/exim.te	2009-09-07 06:39:57.000000000 -0400
+@@ -111,6 +111,7 @@
+ files_search_var(exim_t)
+ files_read_etc_files(exim_t)
+ files_read_etc_runtime_files(exim_t)
++files_getattr_all_mountpoints(exim_t)
+ 
+ fs_getattr_xattr_fs(exim_t)
+ fs_list_inotifyfs(exim_t)
+@@ -191,6 +192,10 @@
  ')
  
  optional_policy(`
@@ -11945,7 +11975,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.30/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/hal.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/hal.te	2009-09-07 07:18:31.000000000 -0400
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -12184,6 +12214,18 @@ diff -b -B --ignore-all-space --exclude-
 +
 +permissive hddtemp_t;
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.6.30/policy/modules/services/inetd.te
+--- nsaserefpolicy/policy/modules/services/inetd.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/inetd.te	2009-09-08 06:38:44.000000000 -0400
+@@ -138,6 +138,8 @@
+ files_read_etc_files(inetd_t)
+ files_read_etc_runtime_files(inetd_t)
+ 
++auth_use_nsswitch(inetd_t)
++
+ logging_send_syslog_msg(inetd_t)
+ 
+ miscfiles_read_localization(inetd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.6.30/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/services/kerberos.te	2009-08-31 13:40:47.000000000 -0400
@@ -18321,7 +18363,7 @@ 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.30/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/virt.te	2009-08-31 13:57:44.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/virt.te	2009-09-08 10:19:57.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -18367,7 +18409,7 @@ diff -b -B --ignore-all-space --exclude-
  type virt_log_t;
  logging_log_file(virt_log_t)
  
-@@ -48,18 +75,38 @@
+@@ -48,27 +75,58 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -18408,7 +18450,12 @@ 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)
  
-@@ -69,6 +116,14 @@
++manage_dirs_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
++manage_files_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
++
+ manage_dirs_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
+ manage_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
+ 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)
  
  manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
@@ -18423,7 +18470,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)
-@@ -87,6 +142,7 @@
+@@ -87,6 +145,7 @@
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
  kernel_load_module(virtd_t)
@@ -18431,7 +18478,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,30 +153,52 @@
+@@ -97,30 +156,52 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -18487,7 +18534,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -130,7 +208,14 @@
+@@ -130,7 +211,14 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -18502,7 +18549,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +253,35 @@
+@@ -168,22 +256,35 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -18525,16 +18572,16 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	lvm_domtrans(virtd_t)
 +')
- 
- optional_policy(`
--	qemu_domtrans(virtd_t)
++
++optional_policy(`
 +        policykit_dbus_chat(virtd_t)
 +	policykit_domtrans_auth(virtd_t)
 +	policykit_domtrans_resolve(virtd_t)
 +	policykit_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)
@@ -18543,7 +18590,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +294,159 @@
+@@ -196,8 +297,159 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -21415,7 +21462,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.30/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/init.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/init.te	2009-09-08 07:47:24.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -21587,7 +21634,7 @@ diff -b -B --ignore-all-space --exclude-
 +fs_unmount_all_fs(initrc_t)
 +fs_remount_all_fs(initrc_t)
 +fs_getattr_all_fs(initrc_t)
-+fs_search_nfsd_fs(initrc_t)
++fs_search_all(initrc_t)
 +fs_getattr_nfsd_files(initrc_t)
 +
 +# initrc_t needs to do a pidof which requires ptrace
@@ -21649,9 +21696,12 @@ diff -b -B --ignore-all-space --exclude-
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -325,47 +415,13 @@
+@@ -324,48 +414,16 @@
+ files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
++files_manage_mnt_dirs(initrc_t)
++files_manage_mnt_files(initrc_t)
  
 -fs_register_binary_executable_type(initrc_t)
 -# rhgb-console writes to ramfs
@@ -21699,7 +21749,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -374,13 +430,14 @@
+@@ -374,19 +432,22 @@
  
  miscfiles_read_localization(initrc_t)
  # slapd needs to read cert files from its initscript
@@ -21715,7 +21765,15 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_user_home_content_files(initrc_t)
  # Allow access to the sysadm TTYs. Note that this will give access to the 
  # TTYs to any process in the initrc_t domain. Therefore, daemons and such
-@@ -422,8 +479,6 @@
+ # started from init should be placed in their own domain.
+ userdom_use_user_terminals(initrc_t)
+ 
++usermanage_domtrans_passwd(initrc_t)
++
+ ifdef(`distro_debian',`
+ 	dev_setattr_generic_dirs(initrc_t)
+ 
+@@ -422,8 +483,6 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -21724,7 +21782,7 @@ diff -b -B --ignore-all-space --exclude-
  	# for integrated run_init to read run_init_type.
  	# happens during boot (/sbin/rc execs init scripts)
  	seutil_read_default_contexts(initrc_t)
-@@ -450,11 +505,9 @@
+@@ -450,11 +509,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -21737,7 +21795,7 @@ diff -b -B --ignore-all-space --exclude-
  	# These seem to be from the initrd
  	# during device initialization:
  	dev_create_generic_dirs(initrc_t)
-@@ -464,6 +517,7 @@
+@@ -464,6 +521,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -21745,11 +21803,15 @@ diff -b -B --ignore-all-space --exclude-
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -492,11 +546,13 @@
+@@ -492,11 +550,17 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
 +		bind_setattr_zone_dirs(initrc_t)
++	')
++
++	optional_policy(`
++		gnome_manage_gconf_config(initrc_t)
  	')
  
  	optional_policy(`
@@ -21759,7 +21821,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -515,6 +571,33 @@
+@@ -515,6 +579,33 @@
  	')
  ')
  
@@ -21793,7 +21855,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -567,10 +650,19 @@
+@@ -567,10 +658,19 @@
  	dbus_connect_system_bus(initrc_t)
  	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
@@ -21813,7 +21875,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -590,6 +682,10 @@
+@@ -590,6 +690,10 @@
  ')
  
  optional_policy(`
@@ -21824,7 +21886,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +742,20 @@
+@@ -646,20 +750,20 @@
  ')
  
  optional_policy(`
@@ -21851,7 +21913,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +764,7 @@
+@@ -668,6 +772,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -21859,7 +21921,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -696,7 +793,6 @@
+@@ -696,7 +801,6 @@
  ')
  
  optional_policy(`
@@ -21867,7 +21929,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -718,8 +814,6 @@
+@@ -718,8 +822,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -21876,7 +21938,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -732,13 +826,16 @@
+@@ -732,13 +834,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -21893,7 +21955,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -747,6 +844,7 @@
+@@ -747,6 +852,7 @@
  
  optional_policy(`
  	udev_rw_db(initrc_t)
@@ -21901,7 +21963,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -754,6 +852,15 @@
+@@ -754,6 +860,15 @@
  ')
  
  optional_policy(`
@@ -21917,7 +21979,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +871,13 @@
+@@ -764,6 +879,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -21931,7 +21993,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +903,31 @@
+@@ -789,3 +911,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -23636,6 +23698,21 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/var/cache/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.30/policy/modules/system/mount.if
+--- nsaserefpolicy/policy/modules/system/mount.if	2009-07-29 15:15:33.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/mount.if	2009-09-08 06:58:15.000000000 -0400
+@@ -84,9 +84,11 @@
+ interface(`mount_signal',`
+ 	gen_require(`
+ 		type mount_t;
++		type unconfined_mount_t;
+ 	')
+ 
+ 	allow $1 mount_t:process signal;
++	allow $1 unconfined_mount_t:process signal;
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.30/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/system/mount.te	2009-08-31 13:40:47.000000000 -0400
@@ -26011,7 +26088,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.30/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/userdomain.if	2009-09-01 07:40:59.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/userdomain.if	2009-09-07 06:34:54.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -27140,15 +27217,16 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1247,7 @@
+@@ -1124,6 +1247,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
++	fs_getattr_all_files($1_t)
 +	fs_list_all($1_t)
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1276,6 @@
+@@ -1152,20 +1277,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27169,7 +27247,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1321,7 @@
+@@ -1211,6 +1322,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27177,7 +27255,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1387,15 @@
+@@ -1276,11 +1388,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27193,7 +27271,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1506,13 @@
+@@ -1391,12 +1507,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -27208,7 +27286,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1545,14 @@
+@@ -1429,6 +1546,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27223,7 +27301,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1568,11 @@
+@@ -1444,9 +1569,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27235,7 +27313,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1629,25 @@
+@@ -1503,6 +1630,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27261,7 +27339,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1722,8 @@
+@@ -1577,6 +1723,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27270,7 +27348,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1817,7 @@
+@@ -1670,6 +1818,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27278,7 +27356,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1945,32 @@
+@@ -1797,19 +1946,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -27318,7 +27396,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2005,7 @@
+@@ -1844,6 +2006,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -27326,7 +27404,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2553,7 @@
+@@ -2391,27 +2554,7 @@
  
  ########################################
  ## <summary>
@@ -27355,7 +27433,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2907,32 @@
+@@ -2765,11 +2908,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27390,7 +27468,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3060,25 @@
+@@ -2897,7 +3061,25 @@
  		type user_tmp_t;
  	')
  
@@ -27417,7 +27495,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3115,7 @@
+@@ -2934,6 +3116,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27425,7 +27503,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3246,559 @@
+@@ -3064,3 +3247,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -p -r1.912 -r1.913
--- selinux-policy.spec	7 Sep 2009 01:18:06 -0000	1.912
+++ selinux-policy.spec	8 Sep 2009 14:30:36 -0000	1.913
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.30
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-5
+- Lots of fixes for initrc and other unconfined domains
+
 * Fri Sep 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-4
 - Allow xserver to use  netlink_kobject_uevent_socket
 



From corsepiu at fedoraproject.org  Tue Sep  8 14:30:53 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue,  8 Sep 2009 14:30:53 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.13,
	1.14 perl-HTTP-Server-Simple.spec, 1.18, 1.19 sources, 1.13, 1.14
Message-ID: <20090908143053.7FDD511C0082@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32197

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Feb 2009 02:16:29 -0000	1.13
+++ .cvsignore	8 Sep 2009 14:30:53 -0000	1.14
@@ -1 +1 @@
-HTTP-Server-Simple-0.38.tar.gz
+HTTP-Server-Simple-0.40.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-HTTP-Server-Simple.spec	26 Jul 2009 06:35:36 -0000	1.18
+++ perl-HTTP-Server-Simple.spec	8 Sep 2009 14:30:53 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.38
-Release:        2%{?dist}
+Version:        0.40
+Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
+- Upstream update.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.38-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Feb 2009 02:16:29 -0000	1.13
+++ sources	8 Sep 2009 14:30:53 -0000	1.14
@@ -1 +1 @@
-318869b8668d949931a1499f4b2bcb81  HTTP-Server-Simple-0.38.tar.gz
+12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz



From harald at fedoraproject.org  Tue Sep  8 14:32:46 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  8 Sep 2009 14:32:46 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.8, 1.9 dracut.spec, 1.22,
	1.23 sources, 
	1.9, 1.10 0005-mdraid-add-grep-for-convenience.patch, 1.1,
	NONE 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch,
	1.1,
	NONE 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch, 
	1.1, NONE 0009-mdraid_start.sh-fixed-raid-activation.patch, 1.1,
	NONE 0010-add-scp-to-debug-module.patch, 1.1,
	NONE 0011-mdraid-cleanup-do-not-stop-mdraid-container.patch, 1.1,
	NONE 0012-added-initqueue-settled-and-refactored-code.patch, 1.1, NONE
Message-ID: <20090908143246.2009811C0082@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv415

Modified Files:
	.cvsignore dracut.spec sources 
Removed Files:
	0005-mdraid-add-grep-for-convenience.patch 
	0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch 
	0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch 
	0009-mdraid_start.sh-fixed-raid-activation.patch 
	0010-add-scp-to-debug-module.patch 
	0011-mdraid-cleanup-do-not-stop-mdraid-container.patch 
	0012-added-initqueue-settled-and-refactored-code.patch 
Log Message:
* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-6
- fixed several problems with md raid containers
- fixed selinux policy loading



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Sep 2009 13:58:47 -0000	1.8
+++ .cvsignore	8 Sep 2009 14:32:45 -0000	1.9
@@ -1 +1 @@
-dracut-001.tar.bz2
+dracut-001-f5c4374d.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dracut.spec	8 Sep 2009 09:54:37 -0000	1.22
+++ dracut.spec	8 Sep 2009 14:32:45 -0000	1.23
@@ -1,3 +1,5 @@
+%define gittag f5c4374d
+
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -13,21 +15,12 @@
 
 Name: dracut
 Version: 001
-Release: 5%{?rdist}
+Release: 6%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
-
-Patch1: 0005-mdraid-add-grep-for-convenience.patch
-Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
-Patch3: 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch
-Patch4: 0009-mdraid_start.sh-fixed-raid-activation.patch
-Patch5: 0010-add-scp-to-debug-module.patch
-Patch6: 0011-mdraid-cleanup-do-not-stop-mdraid-container.patch
-Patch7: 0012-added-initqueue-settled-and-refactored-code.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
@@ -111,18 +104,11 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1 
-%patch2 -p1 
-%patch3 -p1 
-%patch4 -p1 
-%patch5 -p1 
-%patch6 -p1 
-%patch7 -p1 
-chmod a+x modules.d/*/*.sh
 
 %build
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
@@ -195,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-6
+- fixed several problems with md raid containers
+- fixed selinux policy loading
+
 * Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-5
 - patch does not honor file modes, fixed them manually
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Sep 2009 13:58:47 -0000	1.9
+++ sources	8 Sep 2009 14:32:45 -0000	1.10
@@ -1 +1 @@
-12d60478b28876747bee3d7c8c04be95  dracut-001.tar.bz2
+36e8fcadcbd9ee4ca37e55fac35662b5  dracut-001-f5c4374d.tar.bz2


--- 0005-mdraid-add-grep-for-convenience.patch DELETED ---


--- 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch DELETED ---


--- 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch DELETED ---


--- 0009-mdraid_start.sh-fixed-raid-activation.patch DELETED ---


--- 0010-add-scp-to-debug-module.patch DELETED ---


--- 0011-mdraid-cleanup-do-not-stop-mdraid-container.patch DELETED ---


--- 0012-added-initqueue-settled-and-refactored-code.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Sep  8 14:33:55 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue,  8 Sep 2009 14:33:55 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/F-11 .cvsignore, 1.13,
	1.14 perl-HTTP-Server-Simple.spec, 1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20090908143355.00B8611C0082@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv824

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Feb 2009 02:16:29 -0000	1.13
+++ .cvsignore	8 Sep 2009 14:33:54 -0000	1.14
@@ -1 +1 @@
-HTTP-Server-Simple-0.38.tar.gz
+HTTP-Server-Simple-0.40.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-HTTP-Server-Simple.spec	28 Feb 2009 02:16:29 -0000	1.17
+++ perl-HTTP-Server-Simple.spec	8 Sep 2009 14:33:54 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.38
+Version:        0.40
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
+- Upstream update.
+
 * Sat Feb 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.38-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Feb 2009 02:16:29 -0000	1.13
+++ sources	8 Sep 2009 14:33:54 -0000	1.14
@@ -1 +1 @@
-318869b8668d949931a1499f4b2bcb81  HTTP-Server-Simple-0.38.tar.gz
+12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz



From ovasik at fedoraproject.org  Tue Sep  8 14:34:31 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  8 Sep 2009 14:34:31 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-i18n.patch, 1.36, 1.37 coreutils.spec,
	1.271, 1.272
Message-ID: <20090908143431.B0E0311C0082@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1044

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
fix sort -h for multibyte locales (reported via http://bugs.archlinux.org/task/16022)

coreutils-i18n.patch:
 coreutils-6.11/src/join.c               |  105 +++-
 coreutils-6.12-orig/src/join.c          |    5 
 coreutils-6.12/tests/Makefile.am        |    5 
 coreutils-6.12/tests/misc/cut           |    6 
 coreutils-6.8+/lib/linebuffer.h         |    8 
 coreutils-6.8+/src/cut.c                |  420 ++++++++++++++++++-
 coreutils-6.8+/src/expand.c             |  161 +++++++
 coreutils-6.8+/src/fold.c               |  312 +++++++++++++-
 coreutils-6.8+/src/join.c               |  237 ++++++++++-
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  673 ++++++++++++++++++++++++++++++--
 coreutils-6.8+/src/unexpand.c           |  226 ++++++++++
 coreutils-6.8+/src/uniq.c               |  259 +++++++++++-
 coreutils-6.8+/tests/misc/mb1.I         |    4 
 coreutils-6.8+/tests/misc/mb1.X         |    4 
 coreutils-6.8+/tests/misc/mb2.I         |    4 
 coreutils-6.8+/tests/misc/mb2.X         |    4 
 coreutils-6.8+/tests/misc/sort-mb-tests |   58 ++
 18 files changed, 2742 insertions(+), 180 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- coreutils-i18n.patch	21 Aug 2009 07:00:58 -0000	1.36
+++ coreutils-i18n.patch	8 Sep 2009 14:34:31 -0000	1.37
@@ -2204,7 +2204,7 @@ diff -urNp coreutils-6.11-orig/src/join.
  {
    struct keyfield *key = keylist;
  
-@@ -1875,6 +2265,181 @@
+@@ -1875,6 +2265,179 @@
    return key->reverse ? -diff : diff;
  }
  
@@ -2232,7 +2232,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 +
 +  for (;;)
 +    {
-+      unsigned char *translate = (unsigned char *) key->translate;
++      char const *translate = key->translate;
 +      bool const *ignore = key->ignore;
 +
 +      /* Find the lengths. */
@@ -2242,16 +2242,14 @@ diff -urNp coreutils-6.11-orig/src/join.
 +      /* Actually compare the fields. */
 +      if (key->random)
 +        diff = compare_random (texta, lena, textb, lenb);
-+      else if (key->numeric | key->general_numeric)
++      else if (key->numeric | key->general_numeric | key->human_numeric)
 +	{
 +	  char savea = *lima, saveb = *limb;
 +
 +	  *lima = *limb = '\0';
-+	  if (force_general_numcompare)
-+	    diff = general_numcompare (texta, textb);
-+	  else
-+	    diff = ((key->numeric ? numcompare : general_numcompare)
-+		(texta, textb));
++	  diff = (key->numeric ? numcompare (texta, textb)
++		  : key->general_numeric ? general_numcompare (texta, textb)
++		  : human_numcompare (texta, textb, key));
 +	  *lima = savea, *limb = saveb;
 +	}
 +      else if (key->version)


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- coreutils.spec	3 Sep 2009 15:19:58 -0000	1.271
+++ coreutils.spec	8 Sep 2009 14:34:31 -0000	1.272
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -333,6 +333,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-5
+- fix sort -h for multibyte locales (reported via
+  http://bugs.archlinux.org/task/16022)
+
 * Thu Sep 03 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-4
 - fixed regression where df -l <device> as regular user
   cause "Permission denied" (#520630, introduced by fix for



From corsepiu at fedoraproject.org  Tue Sep  8 14:35:31 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue,  8 Sep 2009 14:35:31 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/F-10 .cvsignore, 1.13,
	1.14 perl-HTTP-Server-Simple.spec, 1.16, 1.17 sources, 1.13, 1.14
Message-ID: <20090908143531.86D0511C0082@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1449

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Feb 2009 02:16:30 -0000	1.13
+++ .cvsignore	8 Sep 2009 14:35:31 -0000	1.14
@@ -1 +1 @@
-HTTP-Server-Simple-0.38.tar.gz
+HTTP-Server-Simple-0.40.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-HTTP-Server-Simple.spec	28 Feb 2009 02:16:30 -0000	1.16
+++ perl-HTTP-Server-Simple.spec	8 Sep 2009 14:35:31 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.38
+Version:        0.40
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
+- Upstream update.
+
 * Sat Feb 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.38-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Feb 2009 02:16:30 -0000	1.13
+++ sources	8 Sep 2009 14:35:31 -0000	1.14
@@ -1 +1 @@
-318869b8668d949931a1499f4b2bcb81  HTTP-Server-Simple-0.38.tar.gz
+12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz



From jgranado at fedoraproject.org  Tue Sep  8 14:38:34 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Tue,  8 Sep 2009 14:38:34 +0000 (UTC)
Subject: rpms/python-imaging/devel python-imaging-shebang.patch, NONE,
	1.1 python-imaging.spec, 1.29, 1.30
Message-ID: <20090908143834.7342F11C0082@cvs1.fedora.phx.redhat.com>

Author: jgranado

Update of /cvs/pkgs/rpms/python-imaging/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2330

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-shebang.patch 
Log Message:
Fix the shebang issue.  See https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython


python-imaging-shebang.patch:
 Sane/demo_numarray.py |    2 +-
 Sane/demo_pil.py      |    2 +-
 Scripts/pildriver.py  |    2 +-
 setup.py              |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE python-imaging-shebang.patch ---
diff -ru Imaging-1.1.6/Sane/demo_numarray.py Imaging-1.1.6-shebang/Sane/demo_numarray.py
--- Imaging-1.1.6/Sane/demo_numarray.py	2006-12-03 12:37:18.000000000 +0100
+++ Imaging-1.1.6-shebang/Sane/demo_numarray.py	2009-09-08 16:15:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 #
 # Shows how to scan a 16 bit grayscale image into a numarray object
diff -ru Imaging-1.1.6/Sane/demo_pil.py Imaging-1.1.6-shebang/Sane/demo_pil.py
--- Imaging-1.1.6/Sane/demo_pil.py	2006-12-03 12:37:18.000000000 +0100
+++ Imaging-1.1.6-shebang/Sane/demo_pil.py	2009-09-08 16:15:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 #
 # Shows how to scan a color image into a PIL rgb-image
diff -ru Imaging-1.1.6/Scripts/pildriver.py Imaging-1.1.6-shebang/Scripts/pildriver.py
--- Imaging-1.1.6/Scripts/pildriver.py	2006-12-03 12:37:18.000000000 +0100
+++ Imaging-1.1.6-shebang/Scripts/pildriver.py	2009-09-08 16:15:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 """PILdriver, an image-processing calculator using PIL.
 
 An instance of class PILDriver is essentially a software stack machine
diff -ru Imaging-1.1.6/setup.py Imaging-1.1.6-shebang/setup.py
--- Imaging-1.1.6/setup.py	2006-12-03 12:37:29.000000000 +0100
+++ Imaging-1.1.6-shebang/setup.py	2009-09-08 16:16:10.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # Setup script for PIL 1.1.5 and later
 # $Id: setup.py 2582 2005-11-11 21:54:00Z fredrik $


Index: python-imaging.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- python-imaging.spec	26 Jul 2009 20:27:47 -0000	1.29
+++ python-imaging.spec	8 Sep 2009 14:38:34 -0000	1.30
@@ -5,7 +5,7 @@
 Summary:       Python's own image processing library
 Name:          python-imaging
 Version:       1.1.6
-Release:       16%{?dist}
+Release:       17%{?dist}
 
 License:       BSD
 Group:         System Environment/Libraries
@@ -15,6 +15,7 @@ Patch0:        %{name}-no-xv.patch
 Patch1:        %{name}-lib64.patch
 Patch2:        %{name}-giftrans.patch
 Patch3:        %{name}-1.1.6-sane-types.patch
+Patch4:        %{name}-shebang.patch
 URL:           http://www.pythonware.com/products/pil/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +76,7 @@ This package contains a Tk interface for
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1 -b .sane-types
+%patch4 -p1 -b .shebang
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 %files tk -f files.tk
 
 %changelog
+* Tue Sep 08 2009 Joel Granados <jgranado at redhat.com> - 1.1.6-17
+- Fix the shebang issue.  See https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From karsten at fedoraproject.org  Tue Sep  8 15:02:04 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  8 Sep 2009 15:02:04 +0000 (UTC)
Subject: rpms/boost/devel boost.spec,1.65,1.66
Message-ID: <20090908150204.6163711C0082@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9950

Modified Files:
	boost.spec 
Log Message:
- bump release and rebuild as the package was linked with an old libicu
  during the mass rebuild on s390x



Index: boost.spec
===================================================================
RCS file: /cvs/extras/rpms/boost/devel/boost.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- boost.spec	26 Aug 2009 09:30:23 -0000	1.65
+++ boost.spec	8 Sep 2009 15:02:02 -0000	1.66
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -438,6 +438,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.39.0-6
+- bump release and rebuild as the package was linked with an old libicu 
+  during the mass rebuild on s390x
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.39.0-5
 - Make it to be usable with openssl-1.0
 



From nphilipp at fedoraproject.org  Tue Sep  8 15:09:17 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  8 Sep 2009 15:09:17 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.18, 1.19 python-slip.spec, 1.21,
	1.22 sources, 1.21, 1.22
Message-ID: <20090908150917.22D6511C0082@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14384

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	1 Sep 2009 16:26:33 -0000	1.18
+++ .cvsignore	8 Sep 2009 15:09:16 -0000	1.19
@@ -1 +1 @@
-python-slip-0.2.3.tar.bz2
+python-slip-0.2.4.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- python-slip.spec	1 Sep 2009 16:26:33 -0000	1.21
+++ python-slip.spec	8 Sep 2009 15:09:16 -0000	1.22
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.3
+Version:    0.2.4
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -92,6 +92,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 08 2009 Nils Philippsen <nils at redhat.com> - 0.2.4-1
+- fix dbus example
+
 * Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> - 0.2.3-1
 - add issamefile(), linkfile(), linkorcopyfile() to slip.util.files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	1 Sep 2009 16:26:33 -0000	1.21
+++ sources	8 Sep 2009 15:09:16 -0000	1.22
@@ -1 +1 @@
-85224f6a6e6ef47b18b6abc227b61e13  python-slip-0.2.3.tar.bz2
+62a053aa1353b758ee5bdcdc9653f6c1  python-slip-0.2.4.tar.bz2



From rdieter at fedoraproject.org  Tue Sep  8 15:23:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  8 Sep 2009 15:23:34 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.61, 1.62 kde-settings.spec,
	1.85, 1.86 sources, 1.63, 1.64
Message-ID: <20090908152334.4C67711C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22182

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6
- konversationrc: preconfigure #fedora #fedora-kde #kde #konversation channels
- kdmrc: Theme=.../Constantine
- ksplashrc: Theme=Constantine



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	3 Sep 2009 18:47:44 -0000	1.61
+++ .cvsignore	8 Sep 2009 15:23:33 -0000	1.62
@@ -1 +1 @@
-kde-settings-4.3-5.tar.bz2
+kde-settings-4.3-6.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- kde-settings.spec	3 Sep 2009 18:47:44 -0000	1.85
+++ kde-settings.spec	8 Sep 2009 15:23:33 -0000	1.86
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 5
+%define rel 6
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -150,6 +150,11 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6
+- konversationrc: preconfigure #fedora #fedora-kde #kde #konversation channels
+- kdmrc: Theme=.../Constantine
+- ksplashrc: Theme=Constantine
+
 * Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-5
 - plasma-desktop-appletsrc: wallpaper=/usr/share/wallpapers/Constantine_Mosaico/
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	3 Sep 2009 18:47:44 -0000	1.63
+++ sources	8 Sep 2009 15:23:33 -0000	1.64
@@ -1 +1 @@
-6178c6f7980cf45849081c21f331b197  kde-settings-4.3-5.tar.bz2
+cc0723c3f6aacb05fd4655d7b2101d4f  kde-settings-4.3-6.tar.bz2



From hadess at fedoraproject.org  Tue Sep  8 15:25:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 15:25:24 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel totem-pl-parser.spec,1.42,1.43
Message-ID: <20090908152524.7C47C11C0082@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-serv23265

Modified Files:
	totem-pl-parser.spec 
Log Message:
* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
- Version Obsoletes for totem-devel (#520874)



Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- totem-pl-parser.spec	11 Aug 2009 21:41:59 -0000	1.42
+++ totem-pl-parser.spec	8 Sep 2009 15:25:24 -0000	1.43
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
 Version:	2.27.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -23,7 +23,7 @@ A library to parse and save playlists, a
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Obsoletes:	totem-devel
+Obsoletes:	totem-devel < 2.21.90
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gtk2-devel
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
+- Version Obsoletes for totem-devel (#520874)
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-3
 - Fix URL
 



From pkgdb at fedoraproject.org  Tue Sep  8 15:28:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 15:28:42 +0000
Subject: [pkgdb] gnu-getopt: akurtakov has requested watchcommits
Message-ID: <20090908152842.37D2C10F881@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 15:28:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 15:28:48 +0000
Subject: [pkgdb] gnu-getopt: akurtakov has requested commit
Message-ID: <20090908152848.9EE9110F893@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 15:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 15:28:51 +0000
Subject: [pkgdb] gnu-getopt: akurtakov has requested approveacls
Message-ID: <20090908152851.B3E2410F89A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 15:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 15:28:54 +0000
Subject: [pkgdb] gnu-getopt: akurtakov has requested watchbugzilla
Message-ID: <20090908152854.E833D10F8A3@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From rdieter at fedoraproject.org  Tue Sep  8 15:45:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  8 Sep 2009 15:45:39 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.233,1.234
Message-ID: <20090908154539.409C111C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30977

Modified Files:
	kdepim.spec 
Log Message:
* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- rebuild (gnokii)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- kdepim.spec	28 Aug 2009 15:11:22 -0000	1.233
+++ kdepim.spec	8 Sep 2009 15:45:38 -0000	1.234
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -213,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- rebuild (gnokii)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From awjb at fedoraproject.org  Tue Sep  8 15:46:31 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  8 Sep 2009 15:46:31 +0000 (UTC)
Subject: rpms/libopensync-plugin-gnokii/devel libopensync-plugin-gnokii.spec,
	1.8, 1.9
Message-ID: <20090908154631.DF73D11C0082@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libopensync-plugin-gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31313

Modified Files:
	libopensync-plugin-gnokii.spec 
Log Message:
- bump



Index: libopensync-plugin-gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-gnokii/devel/libopensync-plugin-gnokii.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libopensync-plugin-gnokii.spec	25 Jul 2009 06:18:01 -0000	1.8
+++ libopensync-plugin-gnokii.spec	8 Sep 2009 15:46:31 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           libopensync-plugin-gnokii
 Epoch:          1
 Version:        0.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gnokii plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -42,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/gnokii-sync
 
 %changelog
+* Tue Sep 08 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-4
+- bump
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From behdad at fedoraproject.org  Tue Sep  8 15:49:03 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue,  8 Sep 2009 15:49:03 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.83, 1.84 sources, 1.84, 1.85 vte.spec, 
	1.157, 1.158
Message-ID: <20090908154903.0D7AC11C0082@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32673

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Tue Sep  8 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.5-1 
- Update to 0.21.5 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	25 Aug 2009 23:13:36 -0000	1.83
+++ .cvsignore	8 Sep 2009 15:49:02 -0000	1.84
@@ -1 +1 @@
-vte-0.21.4.tar.bz2
+vte-0.21.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	25 Aug 2009 23:13:36 -0000	1.84
+++ sources	8 Sep 2009 15:49:02 -0000	1.85
@@ -1 +1 @@
-b9597bb6c4ed3d48602b53f90c5fd85b  vte-0.21.4.tar.bz2
+9b4d97dfc40e4f77b7ecf2e9e89da368  vte-0.21.5.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- vte.spec	25 Aug 2009 23:13:36 -0000	1.157
+++ vte.spec	8 Sep 2009 15:49:02 -0000	1.158
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.4
+Version: 0.21.5
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Sep  8 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.5-1
+- Update to 0.21.5
+
 * Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.4-1
 - Update to 0.21.4
 



From behdad at fedoraproject.org  Tue Sep  8 15:51:57 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue,  8 Sep 2009 15:51:57 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.95, 1.96 pango.spec, 1.177,
	1.178 sources, 1.96, 1.97
Message-ID: <20090908155157.44F1211C0082@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2232

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.6-1 
- 1.25.6 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	24 Aug 2009 21:02:11 -0000	1.95
+++ .cvsignore	8 Sep 2009 15:51:56 -0000	1.96
@@ -1 +1 @@
-pango-1.25.5.tar.bz2
+pango-1.25.6.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- pango.spec	24 Aug 2009 21:03:01 -0000	1.177
+++ pango.spec	8 Sep 2009 15:51:56 -0000	1.178
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.25.5
+Version: 1.25.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.6-1
+- 1.25.6
+
 * Mon Aug 24 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.5-1
 - 1.25.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	24 Aug 2009 21:02:11 -0000	1.96
+++ sources	8 Sep 2009 15:51:56 -0000	1.97
@@ -1 +1 @@
-3f0b5f9b58f951ddaffbdb45b2d12741  pango-1.25.5.tar.bz2
+f578a348fbe5f616d104b3a5ecbd2005  pango-1.25.6.tar.bz2



From behdad at fedoraproject.org  Tue Sep  8 15:55:23 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue,  8 Sep 2009 15:55:23 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.46, 1.47 fontconfig.spec, 1.138,
	1.139 sources, 1.50, 1.51
Message-ID: <20090908155523.3CA9B11C0082@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3696

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.3-1 
- Update to 2.7.3 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	31 Aug 2009 21:41:48 -0000	1.46
+++ .cvsignore	8 Sep 2009 15:55:22 -0000	1.47
@@ -1 +1 @@
-fontconfig-2.7.2.tar.gz
+fontconfig-2.7.3.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- fontconfig.spec	31 Aug 2009 21:41:48 -0000	1.138
+++ fontconfig.spec	8 Sep 2009 15:55:22 -0000	1.139
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.7.2
+Version: 2.7.3
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -131,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.3-1
+- Update to 2.7.3
+
 * Mon Aug 31 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.2-1
 - Update to 2.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	31 Aug 2009 21:41:48 -0000	1.50
+++ sources	8 Sep 2009 15:55:23 -0000	1.51
@@ -1 +1 @@
-8d61fa6835c7f4c2398b7f2ee2feb526  fontconfig-2.7.2.tar.gz
+747d2c691c66b563c8e8c1784ce8d014  fontconfig-2.7.3.tar.gz



From hno at fedoraproject.org  Tue Sep  8 15:57:10 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue,  8 Sep 2009 15:57:10 +0000 (UTC)
Subject: rpms/squid/devel squid_kerb_auth-configure.in.patch, NONE,
	1.1 squid.spec, 1.141, 1.142
Message-ID: <20090908155710.C7E9911C0082@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4933

Modified Files:
	squid.spec 
Added Files:
	squid_kerb_auth-configure.in.patch 
Log Message:
Enable squid_kerb_auth after a bit of cleanup

squid_kerb_auth-configure.in.patch:
 configure    |   14 ++++++--------
 configure.in |   14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

--- NEW FILE squid_kerb_auth-configure.in.patch ---
diff -up squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in.kerb_auth_configure squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in.kerb_auth_configure	2009-08-04 15:32:10.000000000 +0200
+++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-09-08 17:46:17.000000000 +0200
@@ -69,7 +69,7 @@ check_mit() {
        ac_includedir=""
        ac_libdir=""
        case $sys in
-	        Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                          ac_libdir=$enableval/lib
                          ac_includedir=$enableval/include
                        else
@@ -101,7 +101,7 @@ check_mit() {
                          fi
                        fi
                        ;;
-                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                      ac_libdir=$enableval/lib
                      ac_includedir=$enableval/include
                      CPPFLAGS="$CPPFLAGS -I$ac_includedir"
@@ -142,7 +142,7 @@ check_heimdal(){
        ac_includedir=""
        ac_libdir=""
        case $sys in
-	        Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                          ac_libdir=$enableval/lib
                          ac_includedir=$enableval/include
                        else
@@ -179,7 +179,7 @@ check_heimdal(){
                          fi
                        fi
                        ;;
-                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                      ac_libdir=$enableval/lib
                      ac_includedir=$enableval/include
                      CPPFLAGS="$CPPFLAGS -I$ac_includedir"
@@ -424,8 +424,7 @@ AC_ARG_WITH([squid],
   [ squid_dir=$withval ]
 )
 
-eval ac_p_include=$includedir
-CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
+CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
 AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
 AC_TRY_RUN([
 #include <config.h>
@@ -439,8 +438,7 @@ return 1;
   ac_cv_have_squid=yes,
   ac_cv_have_squid=no)
 ])
-eval ac_p_lib=$libdir
-LDFLAGS="$LDFLAGS -L../../../lib -L$ac_p_lib $w_flag$ac_p_lib$w_flag_2"
+LDFLAGS="$LDFLAGS -L../../../lib"
 if test "x$ac_cv_have_squid" = "xyes"; then
   AC_DEFINE(HAVE_SQUID,1, [Define to 1 if you have SQUID])
   AC_CHECK_HEADERS(getaddrinfo.h getnameinfo.h util.h)
diff -up squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.kerb_auth_configure squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure
--- squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.kerb_auth_configure	2009-08-04 15:32:53.000000000 +0200
+++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure	2009-09-08 17:48:25.000000000 +0200
@@ -3766,7 +3766,7 @@ _ACEOF
        ac_includedir=""
        ac_libdir=""
        case $sys in
-	        Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                          ac_libdir=$enableval/lib
                          ac_includedir=$enableval/include
                        else
@@ -4479,7 +4479,7 @@ fi
                          fi
                        fi
                        ;;
-                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                      ac_libdir=$enableval/lib
                      ac_includedir=$enableval/include
                      CPPFLAGS="$CPPFLAGS -I$ac_includedir"
@@ -4972,7 +4972,7 @@ _ACEOF
        ac_includedir=""
        ac_libdir=""
        case $sys in
-	        Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                          ac_libdir=$enableval/lib
                          ac_includedir=$enableval/include
                        else
@@ -5303,7 +5303,7 @@ fi
                          fi
                        fi
                        ;;
-                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then
+                *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then
                      ac_libdir=$enableval/lib
                      ac_includedir=$enableval/include
                      CPPFLAGS="$CPPFLAGS -I$ac_includedir"
@@ -7033,8 +7033,7 @@ if test "${with_squid+set}" = set; then
 fi
 
 
-eval ac_p_include=$includedir
-CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
+CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
 { $as_echo "$as_me:$LINENO: checking for SQUID at '$squid_dir' " >&5
 $as_echo_n "checking for SQUID at '$squid_dir' ... " >&6; }
 if test "${ac_cv_have_squid+set}" = set; then
@@ -7104,8 +7103,7 @@ fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_squid" >&5
 $as_echo "$ac_cv_have_squid" >&6; }
-eval ac_p_lib=$libdir
-LDFLAGS="$LDFLAGS -L../../../lib -L$ac_p_lib $w_flag$ac_p_lib$w_flag_2"
+LDFLAGS="$LDFLAGS -L../../../lib"
 if test "x$ac_cv_have_squid" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- squid.spec	7 Sep 2009 08:17:34 -0000	1.141
+++ squid.spec	8 Sep 2009 15:57:10 -0000	1.142
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -23,13 +23,16 @@ Source98: perl-requires-squid.sh
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
 Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
-# Upstream fix, but have not reached 3.1 yet
 Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
 Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
 Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
+# Upstream fix, but have not reached 3.1 yet
 Patch005: squid-3.1.0.13-alias-link.patch
 
 # External patches
+# Submitted upstream on squid-dev by Markus Moeller <huaraz at moeller.plus.com>
+Patch101: squid_kerb_auth-configure.in.patch
+
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -69,6 +72,7 @@ lookup program (dnsserver), a program fo
 %patch003 -p0 -b .b9704
 %patch004 -p0 -b .b9707
 %patch005 -p0 -b .alias-link
+%patch101 -p1 -b .kerb_auth_configure
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch204 -p1 -b .perlpath
@@ -92,6 +96,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
    --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    --enable-digest-auth-helpers="password,ldap,eDirectory" \
+   --enable-negotiate-auth-helpers="squid_kerb_auth" \
    --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
@@ -117,9 +122,6 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-openssl \
    --with-pthreads
 
-# following options should be enabled but fails Fedora QA chechs
-#   --enable-negotiate-auth-helpers="squid_kerb_auth"
-
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make \
 	DEFAULT_SWAP_DIR='$(localstatedir)/spool/squid' \
@@ -251,6 +253,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 08 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-3
+- Enable squid_kerb_auth
+
 * Mon Sep 07 2009 Henrik Nordstrom <henrik at henriknordtrom.net> - 7:3.1.0.13-2
 - Cleaned up packaging to ease future maintenance
 



From jorton at fedoraproject.org  Tue Sep  8 15:58:47 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue,  8 Sep 2009 15:58:47 +0000 (UTC)
Subject: rpms/httpd/devel httpd.logrotate,1.4,1.5 httpd.spec,1.138,1.139
Message-ID: <20090908155847.0306611C0082@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6376

Modified Files:
	httpd.logrotate httpd.spec 
Log Message:
* Tue Sep  8 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
- restart service in posttrans (#491567)



Index: httpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.logrotate,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- httpd.logrotate	17 Mar 2009 13:09:35 -0000	1.4
+++ httpd.logrotate	8 Sep 2009 15:58:46 -0000	1.5
@@ -2,6 +2,7 @@
     missingok
     notifempty
     sharedscripts
+    delaycompress
     postrotate
 	/bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
     endscript


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- httpd.spec	21 Aug 2009 13:54:32 -0000	1.138
+++ httpd.spec	8 Sep 2009 15:58:46 -0000	1.139
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -349,6 +349,9 @@ if [ $1 = 0 ]; then
 	/sbin/chkconfig --del httpd
 fi
 
+%posttrans
+/sbin/service httpd condrestart >/dev/null 2>&1 || :
+
 %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
 
@@ -481,6 +484,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Sep  8 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
+- restart service in posttrans (#491567)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.13-2
 - rebuilt with new openssl
 



From hadess at fedoraproject.org  Tue Sep  8 16:04:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 16:04:23 +0000 (UTC)
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.36,1.37
Message-ID: <20090908160423.E6CD811C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-phone-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10994

Modified Files:
	gnome-phone-manager.spec 
Log Message:
* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 0.65-5
- Rebuilt for new gnokii



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gnome-phone-manager.spec	25 Jul 2009 00:43:45 -0000	1.36
+++ gnome-phone-manager.spec	8 Sep 2009 16:04:23 -0000	1.37
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.65
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -106,6 +106,9 @@ fi
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 0.65-5
+- Rebuilt for new gnokii
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Tue Sep  8 16:06:52 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  8 Sep 2009 16:06:52 +0000 (UTC)
Subject: rpms/xrdp/devel xrdp-pam-auth.patch, NONE, 1.1 import.log, 1.2,
	1.3 xrdp.spec, 1.3, 1.4
Message-ID: <20090908160652.92E3811C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12689/devel

Modified Files:
	import.log xrdp.spec 
Added Files:
	xrdp-pam-auth.patch 
Log Message:
- fix pam.d


xrdp-pam-auth.patch:
 xrdp-sesman |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xrdp-pam-auth.patch ---
diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
+++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       required	pam_unix.so shadow nullok
-account    required	pam_unix.so
+auth       include      system-auth
+account    include      system-auth


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Sep 2009 22:27:40 -0000	1.2
+++ import.log	8 Sep 2009 16:06:52 -0000	1.3
@@ -1,2 +1,3 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272824
 xrdp-0_5_0-0_4_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.4.20090811cvs.fc12.src.rpm:1252103027
+xrdp-0_5_0-0_5_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252425624


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/xrdp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xrdp.spec	4 Sep 2009 22:27:40 -0000	1.3
+++ xrdp.spec	8 Sep 2009 16:06:52 -0000	1.4
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.4.%{cvs}%{?dist}
+Release:   0.5.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -24,6 +24,8 @@ URL:       http://xrdp.sourceforge.net/
 Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: xrdp-pam-auth.patch
+
 Source1: xrdp.init
 Source2: xrdp.sysconfig
 Source3: xrdp.logrotate
@@ -54,6 +56,7 @@ terminal server / remote desktop clients
 
 %prep
 %setup -q -n %{name}-%{version}.%{cvs}
+%patch0 -p2
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -65,11 +68,6 @@ terminal server / remote desktop clients
 # increase encryption to 128 bit's
 %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
 
-#include system-auth into pam.d/xrdp-sesman
-echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
-echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
-
-
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -171,6 +169,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
+- fix xrdp-sesman pam.d to uses system-auth
+
 * Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
 - increase encryption to 128 bit's
 - include system-auth into /etc/pam.d/xrdp-sesman



From itamarjp at fedoraproject.org  Tue Sep  8 16:11:02 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  8 Sep 2009 16:11:02 +0000 (UTC)
Subject: rpms/xrdp/F-11 xrdp-pam-auth.patch, NONE, 1.1 import.log, 1.2,
	1.3 xrdp.spec, 1.2, 1.3
Message-ID: <20090908161102.E98FD11C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16125/F-11

Modified Files:
	import.log xrdp.spec 
Added Files:
	xrdp-pam-auth.patch 
Log Message:
- fix pam.d


xrdp-pam-auth.patch:
 xrdp-sesman |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xrdp-pam-auth.patch ---
diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
+++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       required	pam_unix.so shadow nullok
-account    required	pam_unix.so
+auth       include      system-auth
+account    include      system-auth


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Sep 2009 22:35:41 -0000	1.2
+++ import.log	8 Sep 2009 16:11:02 -0000	1.3
@@ -1,2 +1,3 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:F-11:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272977
 xrdp-0_5_0-0_3_20090811cvs_fc12:F-11:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103630
+xrdp-0_5_0-0_5_20090811cvs_fc12:F-11:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252426078


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-11/xrdp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp.spec	4 Sep 2009 22:35:41 -0000	1.2
+++ xrdp.spec	8 Sep 2009 16:11:02 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.3.%{cvs}%{?dist}
+Release:   0.5.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -24,6 +24,8 @@ URL:       http://xrdp.sourceforge.net/
 Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: xrdp-pam-auth.patch
+
 Source1: xrdp.init
 Source2: xrdp.sysconfig
 Source3: xrdp.logrotate
@@ -54,6 +56,7 @@ terminal server / remote desktop clients
 
 %prep
 %setup -q -n %{name}-%{version}.%{cvs}
+%patch0 -p2
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -65,10 +68,6 @@ terminal server / remote desktop clients
 # increase encryption to 128 bit's
 %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
 
-#include system-auth into pam.d/xrdp-sesman
-echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
-echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
-
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -170,11 +169,16 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
+- fix xrdp-sesman pam.d to uses system-auth
 
-* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
 - increase encryption to 128 bit's
 - include system-auth into /etc/pam.d/xrdp-sesman
 
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
+- rebuild with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -183,6 +187,7 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
+
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From itamarjp at fedoraproject.org  Tue Sep  8 16:13:37 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  8 Sep 2009 16:13:37 +0000 (UTC)
Subject: rpms/xrdp/F-10 xrdp-pam-auth.patch, NONE, 1.1 import.log, 1.2,
	1.3 xrdp.spec, 1.2, 1.3
Message-ID: <20090908161337.15B7C11C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19153/F-10

Modified Files:
	import.log xrdp.spec 
Added Files:
	xrdp-pam-auth.patch 
Log Message:
- fix pam.d


xrdp-pam-auth.patch:
 xrdp-sesman |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xrdp-pam-auth.patch ---
diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
+++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       required	pam_unix.so shadow nullok
-account    required	pam_unix.so
+auth       include      system-auth
+account    include      system-auth


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Sep 2009 22:37:27 -0000	1.2
+++ import.log	8 Sep 2009 16:13:36 -0000	1.3
@@ -1,2 +1,3 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:F-10:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273132
 xrdp-0_5_0-0_3_20090811cvs_fc12:F-10:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103784
+xrdp-0_5_0-0_5_20090811cvs_fc12:F-10:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252426308


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/xrdp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp.spec	4 Sep 2009 22:37:27 -0000	1.2
+++ xrdp.spec	8 Sep 2009 16:13:36 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.3.%{cvs}%{?dist}
+Release:   0.5.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -24,6 +24,8 @@ URL:       http://xrdp.sourceforge.net/
 Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: xrdp-pam-auth.patch
+
 Source1: xrdp.init
 Source2: xrdp.sysconfig
 Source3: xrdp.logrotate
@@ -54,6 +56,7 @@ terminal server / remote desktop clients
 
 %prep
 %setup -q -n %{name}-%{version}.%{cvs}
+%patch0 -p2
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -65,10 +68,6 @@ terminal server / remote desktop clients
 # increase encryption to 128 bit's
 %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
 
-#include system-auth into pam.d/xrdp-sesman
-echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
-echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
-
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -170,11 +169,16 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
+- fix xrdp-sesman pam.d to uses system-auth
 
-* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
 - increase encryption to 128 bit's
 - include system-auth into /etc/pam.d/xrdp-sesman
 
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
+- rebuild with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -183,6 +187,7 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
+
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From itamarjp at fedoraproject.org  Tue Sep  8 16:14:54 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  8 Sep 2009 16:14:54 +0000 (UTC)
Subject: rpms/xrdp/EL-5 xrdp-pam-auth.patch, NONE, 1.1 import.log, 1.2,
	1.3 xrdp.spec, 1.2, 1.3
Message-ID: <20090908161454.4D92A11C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20431/EL-5

Modified Files:
	import.log xrdp.spec 
Added Files:
	xrdp-pam-auth.patch 
Log Message:
- fix pam.d


xrdp-pam-auth.patch:
 xrdp-sesman |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xrdp-pam-auth.patch ---
diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
+++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       required	pam_unix.so shadow nullok
-account    required	pam_unix.so
+auth       include      system-auth
+account    include      system-auth


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Sep 2009 22:39:23 -0000	1.2
+++ import.log	8 Sep 2009 16:14:54 -0000	1.3
@@ -1,2 +1,3 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:EL-5:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273281
 xrdp-0_5_0-0_3_20090811cvs_fc12:EL-5:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103881
+xrdp-0_5_0-0_5_20090811cvs_fc12:EL-5:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252426456


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-5/xrdp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp.spec	4 Sep 2009 22:39:23 -0000	1.2
+++ xrdp.spec	8 Sep 2009 16:14:54 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.3.%{cvs}%{?dist}
+Release:   0.5.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -24,6 +24,8 @@ URL:       http://xrdp.sourceforge.net/
 Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: xrdp-pam-auth.patch
+
 Source1: xrdp.init
 Source2: xrdp.sysconfig
 Source3: xrdp.logrotate
@@ -54,6 +56,7 @@ terminal server / remote desktop clients
 
 %prep
 %setup -q -n %{name}-%{version}.%{cvs}
+%patch0 -p2
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -65,10 +68,6 @@ terminal server / remote desktop clients
 # increase encryption to 128 bit's
 %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
 
-#include system-auth into pam.d/xrdp-sesman
-echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
-echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
-
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -170,11 +169,16 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
+- fix xrdp-sesman pam.d to uses system-auth
 
-* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
 - increase encryption to 128 bit's
 - include system-auth into /etc/pam.d/xrdp-sesman
 
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
+- rebuild with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -183,6 +187,7 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
+
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From pwouters at fedoraproject.org  Tue Sep  8 16:15:32 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 16:15:32 +0000 (UTC)
Subject: rpms/dnssec-conf/devel pr.conf,NONE,1.1
Message-ID: <20090908161533.04AD711C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21026

Added Files:
	pr.conf 
Log Message:
new key for .pr. This is neccessary now because the wrong key is in DLV!



--- NEW FILE pr.conf ---
//; http://dnssec.nic.pr/keys/nic.pr.zip

trusted-keys {
"pr." 257 3 5 "AwEAAeDPv9lQ7Ej5Ld9Fz/FKLhdOajwtEXsWykj65ugIa4Di1nY6ti9ndkeR4kp1aSNlvf6N7KsjunfMJj4SccBwcY77DrxmQ+g9nI09ePMZvxF2U63Lv9BftGaIguYdkYZVSwHd1q7DdXqNkLaD4tZEHiN0h/3wBdTQUPH1IoskD1vGxiPw2egftk6sVQdvOJWaAgSpmG0eq+/e90WVTNX4/xhA17PrdQQJIheZQ3+EsDoil8kyJZC12KoHYpFklx7+aCiR2u8Fumy6ARFR4PP0n7bnBaKOgMpVzz+KI79a3USDkj9RhNog50iSWgaBM75Xu0IBNEpcCVYZYjwDESgiDXc="; // Key ID=6277
};




From itamarjp at fedoraproject.org  Tue Sep  8 16:16:14 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  8 Sep 2009 16:16:14 +0000 (UTC)
Subject: rpms/xrdp/EL-4 xrdp-pam-auth.patch, NONE, 1.1 import.log, 1.2,
	1.3 xrdp.spec, 1.2, 1.3
Message-ID: <20090908161614.70D7111C0082@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22545/EL-4

Modified Files:
	import.log xrdp.spec 
Added Files:
	xrdp-pam-auth.patch 
Log Message:
- fix pam.d


xrdp-pam-auth.patch:
 xrdp-sesman |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xrdp-pam-auth.patch ---
diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
+++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       required	pam_unix.so shadow nullok
-account    required	pam_unix.so
+auth       include      system-auth
+account    include      system-auth


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Sep 2009 22:44:04 -0000	1.2
+++ import.log	8 Sep 2009 16:16:14 -0000	1.3
@@ -1,2 +1,3 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:EL-4:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273423
 xrdp-0_5_0-0_3_20090811cvs_fc12:EL-4:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103993
+xrdp-0_5_0-0_5_20090811cvs_fc12:EL-4:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252426537


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-4/xrdp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp.spec	4 Sep 2009 22:44:04 -0000	1.2
+++ xrdp.spec	8 Sep 2009 16:16:14 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.3.%{cvs}%{?dist}
+Release:   0.5.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -24,6 +24,8 @@ URL:       http://xrdp.sourceforge.net/
 Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: xrdp-pam-auth.patch
+
 Source1: xrdp.init
 Source2: xrdp.sysconfig
 Source3: xrdp.logrotate
@@ -54,6 +56,7 @@ terminal server / remote desktop clients
 
 %prep
 %setup -q -n %{name}-%{version}.%{cvs}
+%patch0 -p2
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -65,10 +68,6 @@ terminal server / remote desktop clients
 # increase encryption to 128 bit's
 %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
 
-#include system-auth into pam.d/xrdp-sesman
-echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
-echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
-
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -170,11 +169,16 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
+- fix xrdp-sesman pam.d to uses system-auth
 
-* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
 - increase encryption to 128 bit's
 - include system-auth into /etc/pam.d/xrdp-sesman
 
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
+- rebuild with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -183,6 +187,7 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
+
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"



From pwouters at fedoraproject.org  Tue Sep  8 16:17:27 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 16:17:27 +0000 (UTC)
Subject: rpms/dnssec-conf/devel dnssec-conf.spec,1.15,1.16
Message-ID: <20090908161727.7B06211C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23601

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-4
-New key for .pr.



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dnssec-conf.spec	24 Jul 2009 20:24:34 -0000	1.15
+++ dnssec-conf.spec	8 Sep 2009 16:17:27 -0000	1.16
@@ -1,10 +1,11 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
-Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source1: pr.conf
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -34,6 +35,9 @@ rm -rf ${RPM_BUILD_ROOT}
 make PREFIX=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} ETCDIR=${RPM_BUILD_ROOT}/etc install
 install -d 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig
 install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec
+# new key for pr. This will be in version 1.22 but that one has unreleased
+# parsing code.
+cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/pki/dnssec-keys/production/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -54,6 +58,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-4
+-New key for .pr.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pwouters at fedoraproject.org  Tue Sep  8 16:18:52 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 16:18:52 +0000 (UTC)
Subject: rpms/dnssec-conf/devel dnssec-conf.spec,1.16,1.17
Message-ID: <20090908161852.6A4F111C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24957

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-5
- Bump version



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dnssec-conf.spec	8 Sep 2009 16:17:27 -0000	1.16
+++ dnssec-conf.spec	8 Sep 2009 16:18:52 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
@@ -58,8 +58,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-5
+- Bump version
+
 * Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-4
--New key for .pr.
+- New key for .pr.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From jreznik at fedoraproject.org  Tue Sep  8 16:20:59 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  8 Sep 2009 16:20:59 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel .cvsignore, 1.2,
	1.3 constantine-kde-theme.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090908162059.4514E11C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26919

Modified Files:
	.cvsignore constantine-kde-theme.spec sources 
Log Message:
* Tue Sep 09 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.3-1
- fixes widescreen background



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Sep 2009 07:31:57 -0000	1.2
+++ .cvsignore	8 Sep 2009 16:20:58 -0000	1.3
@@ -1 +1 @@
-constantine-kde-theme-11.90.2.tar.bz2
+constantine-kde-theme-11.90.3.tar.bz2


Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- constantine-kde-theme.spec	6 Sep 2009 10:47:20 -0000	1.2
+++ constantine-kde-theme.spec	8 Sep 2009 16:20:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		constantine-kde-theme
-Version:	11.90.2
+Version:	11.90.3
 Release:	2%{?dist}
 Summary:	Constantine KDE Theme
 
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 09 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.3-1
+- fixes widescreen background
+
 * Sun Sep 06 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.2-2
 - more resolutions for KDM theme
 - c-b-kde BR, bumped version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Sep 2009 07:31:57 -0000	1.2
+++ sources	8 Sep 2009 16:20:59 -0000	1.3
@@ -1 +1 @@
-7d73d3b9e1e00343d624c048b375393f  constantine-kde-theme-11.90.2.tar.bz2
+123ab7ab63496107cd6819cdd71971a6  constantine-kde-theme-11.90.3.tar.bz2



From rdieter at fedoraproject.org  Tue Sep  8 16:24:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  8 Sep 2009 16:24:30 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.29,1.30
Message-ID: <20090908162430.A4A8E11C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28755

Modified Files:
	llvm.spec 
Log Message:
mention bug#



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- llvm.spec	8 Sep 2009 03:42:39 -0000	1.29
+++ llvm.spec	8 Sep 2009 16:24:29 -0000	1.30
@@ -342,7 +342,7 @@ rm -rf %{buildroot}
 - Enable debuginfo generation
 
 * Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
-- Disable assertions (needed by OpenGTL)
+- Disable assertions (needed by OpenGTL, #521261)
 - Align spec file with upstream build instructions
 - Enable unit tests
 



From transif at fedoraproject.org  Tue Sep  8 16:30:47 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  8 Sep 2009 16:30:47 +0000 (UTC)
Subject: comps/po hu.po,1.20,1.21
Message-ID: <20090908163047.8E4A411C0419@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31296/po

Modified Files:
	hu.po 
Log Message:
Sending translation for Hungarian


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 hu.poIndex: hu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hu.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- hu.po	30 Apr 2009 04:47:44 -0000	1.20
+++ hu.po	8 Sep 2009 16:30:46 -0000	1.21
@@ -1,1558 +1,2294 @@
 # Tamas Szanto <tszanto at mol.hu>, 2004.
 # Arpad Biro <biro_arpad at yahoo.com>, 2004, 2005, 2006, 2007.
 # G?bor Szentiv?nyi <szenti at ulx.hu>, 2006.
+# Sulyok P?ter <peti at sulyok.hu>, 2009.
+# Nagy Istv?n Zolt?n <nagyesta at gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 02:09+0000\n"
-"PO-Revision-Date: 2009-04-30 06:47+0200\n"
-"Last-Translator: Sulyok P?ter <peti at sulyok.hu>\n"
+"POT-Creation-Date: 2009-09-08 14:25+0000\n"
+"PO-Revision-Date: 2009-09-08 17:46+0100\n"
+"Last-Translator: Nagy Istv?n Zolt?n <nagyesta at gmail.com>\n"
 "Language-Team: Hungarian <fedora-trans-hu at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);"
+"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
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1
+#: ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "K?nny?s?ly? asztal k?rnyezet, ami gyeng?bb g?peken is j?l haszn?lhat?."
 
-#: ../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-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5
+#: ../comps-f13.xml.in.h:5
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Adminisztr?ci?s eszk?z?k"
 
-#: ../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-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6
+#: ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Afrik?n (D?l-Afrika-i holland) t?mogat?s"
 
-#: ../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-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7
+#: ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Alb?n t?mogat?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-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9
+#: ../comps-f13.xml.in.h:9
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Alkalmaz?sok"
 
-#: ../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-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10
+#: ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Alkalmaz?sok sz?mos feladathoz"
 
-#: ../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-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11
+#: ../comps-f13.xml.in.h:11
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arab t?mogat?s"
 
-#: ../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-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12
+#: ../comps-f13.xml.in.h:12
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?rm?ny t?mogat?s"
 
-#: ../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-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13
+#: ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Assz?m (India) t?mogat?s"
 
-#: ../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-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14
+#: ../comps-f13.xml.in.h:14
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?r? ?s kiad?"
 
-#: ../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-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16
+#: ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Alap"
 
-#: ../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-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17
+#: ../comps-f13.xml.in.h:17
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Alaprendszer"
 
-#: ../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-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18
+#: ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Alapszint? t?mogat?s a ruby programoz?si nyelvhez."
 
-#: ../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-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19
+#: ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Baszk t?mogat?s"
 
-#: ../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-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20
+#: ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Feh?rorosz t?mogat?s"
 
-#: ../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-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21
+#: ../comps-f13.xml.in.h:21
[...3015 lines suppressed...]
 #~ msgid ""
 #~ "These packages allow you to configure an IMAP or Postfix mail server."
 #~ msgstr ""
 #~ "Ezek a csomagok IMAP-alap? ?s Postfix levelez?si kiszolg?l?k "
 #~ "be?ll?t?s?hoz sz?ks?gesek."
-
 #~ msgid ""
 #~ "These packages provide compatibility support for previous releases of Red "
 #~ "Hat Enterprise Linux."
 #~ msgstr ""
 #~ "Ezek a csomagok a Red Hat Enterprise Linux kor?bbi v?ltozataival val? "
 #~ "kompatibilit?s meg?rz?s?hez sz?ks?gesek."
-
 #~ msgid "Unsupported Development Libraries"
 #~ msgstr "Nem t?mogatott fejleszt?i programk?nyvt?rak"
-
 #~ msgid "Workstation Common"
 #~ msgstr "Munka?llom?s (alap)"
-
 #~ msgid "ppc64 Compatibility Arch Support"
 #~ msgstr "ppc64-kompatibilit?si t?mogat?s"
-
 #~ msgid "x86 Compatibility Arch Development Support"
 #~ msgstr "x86-kompatibilis architekt?r?ra val? fejleszt?s t?mogat?sa"
-
 #~ msgid "x86 Compatibility Arch Support"
 #~ msgstr "x86-kompatibilit?si t?mogat?s"
-
 #~ msgid "Brazilian Portuguese"
 #~ msgstr "Braz?liai portug?l"
-
 #~ msgid "English"
 #~ msgstr "Angol"
-
 #~ msgid "French"
 #~ msgstr "Francia"
-
 #~ msgid "German"
 #~ msgstr "N?met"
-
 #~ msgid "Italian"
 #~ msgstr "Olasz"
-
 #~ msgid "Spanish"
 #~ msgstr "Spanyol"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Brazilian Portuguese language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "braz?liai portug?l nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "English language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza angol "
 #~ "nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "French language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "francia nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "German language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza n?met "
 #~ "nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Italian language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza olasz "
 #~ "nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Spanish language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "spanyol nyelven."
-
 #~ msgid "Japanese"
 #~ msgstr "Jap?n"
-
 #~ msgid "Korean"
 #~ msgstr "Koreai"
-
 #~ msgid "Simplified Chinese"
 #~ msgstr "Egyszer?s?tett k?nai"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Japanese language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza jap?n "
 #~ "nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Korean language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "koreai nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Simplified Chinese language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "egyszer?s?tett k?nai nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Traditional Chinese language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "hagyom?nyos k?nai nyelven."
-
 #~ msgid "Traditional Chinese"
 #~ msgstr "Hagyom?nyos k?nai"
-
 #~ msgid "ppc64 Compatibility Arch Development Support"
 #~ msgstr "ppc64-kompatibilis architekt?r?ra val? fejleszt?s t?mogat?sa"
-
 #~ msgid "Bengali"
 #~ msgstr "beng?li"
-
 #~ msgid "Gujarati"
 #~ msgstr "gudzsar?ti"
-
 #~ msgid "Hindi"
 #~ msgstr "hindi"
-
 #~ msgid "Punjabi"
 #~ msgstr "pandzs?bi"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "beng?li nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Gujarati language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "gudzsar?ti nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Hindi language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza hindi "
 #~ "nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Punjabi language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza "
 #~ "pandzs?bi nyelven."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Tamil language."
 #~ msgstr ""
 #~ "Ez a csoport a Red Hat Enterprise Linux dokument?ci?j?t tartalmazza tamil "
 #~ "nyelven."
-
 #~ msgid "Red Hat Enterprise Linux Extras"
 #~ msgstr "Red Hat Enterprise Linux Extra csomagok"
-
 #~ msgid "Workstation"
 #~ msgstr "Munka?llom?s"
-
 #~ msgid "Workstation applications and utilities."
 #~ msgstr "Munka?llom?s-alkalmaz?sok ?s -seg?dprogramok"
-
 #~ msgid "Compatibility Arch"
 #~ msgstr "Kompatibilit?si architekt?ra"
-
 #~ msgid "Compatibility Arch Libraries"
 #~ msgstr "Kompatibilit?si architekt?ra-libt?rak"
-
 #~ msgid "Multilib library packages"
 #~ msgstr "Multilib libt?r-csomagok"
-
 #~ msgid ""
 #~ "Packages which provide functionality for the compatibility architecture."
 #~ msgstr "A kompatibilit?si architekt?ra t?mogat?s?hoz sz?ks?ges csomagok"
+



From hadess at fedoraproject.org  Tue Sep  8 16:43:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 16:43:29 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.59,1.60
Message-ID: <20090908164329.1638B11C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5678

Modified Files:
	gnome-user-share.spec 
Log Message:
* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-3
- Add a cluebar to have easy access to the file sharing preferences



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gnome-user-share.spec	7 Sep 2009 13:15:11 -0000	1.59
+++ gnome-user-share.spec	8 Sep 2009 16:43:28 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.27.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -10,6 +10,9 @@ Source0: http://download.gnome.org/sourc
 Patch0: menu-path.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=594252
 Patch1: 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=558244
+Patch2: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
+BuildRequires: intltool automake autoconf
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -50,6 +53,9 @@ The program also allows to share files u
 %setup -q
 %patch0 -p1 -b .menu-path
 %patch1 -p1 -b .i18n
+%patch2 -p1 -b .cluebar
+
+autoreconf -f -i
 
 %build
 %configure
@@ -127,6 +133,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-3
+- Add a cluebar to have easy access to the file sharing preferences
+
 * Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-2
 - Init i18n system for gnome-user-share
 



From hadess at fedoraproject.org  Tue Sep  8 16:45:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 16:45:37 +0000 (UTC)
Subject: rpms/gnome-user-share/devel
	0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch,
	NONE, 1.1
Message-ID: <20090908164537.49BCD11C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6400

Added Files:
	0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch 
Log Message:
* Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-3
- Add a cluebar to have easy access to the file sharing preferences


0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch:
 configure.in             |    8 +
 po/POTFILES.in           |    2 
 src/Makefile.am          |   12 +
 src/nautilus-share-bar.c |  226 ++++++++++++++++++++++++++++++++++++
 src/nautilus-share-bar.h |   61 +++++++++
 src/share-extension.c    |  293 ++++++++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 601 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch ---
>From b96970a6bf8f1070a3c08b1c781ef08d2ebce525 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 8 Sep 2009 17:26:35 +0100
Subject: [PATCH] =?utf-8?q?Bug=C2=A0558244=20-=20Enabling=20gnome-user-share=20requires=20changing=20preference=20in=20capplet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Add a cluebar to the Public and Downloads folders, to allow launching
the sharing preferences.
---
 configure.in             |    8 ++
 po/POTFILES.in           |    2 +
 src/Makefile.am          |   12 ++
 src/nautilus-share-bar.c |  226 +++++++++++++++++++++++++++++++++++
 src/nautilus-share-bar.h |   61 ++++++++++
 src/share-extension.c    |  292 ++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 601 insertions(+), 0 deletions(-)
 create mode 100644 src/nautilus-share-bar.c
 create mode 100644 src/nautilus-share-bar.h
 create mode 100644 src/share-extension.c

diff --git a/configure.in b/configure.in
index 256c596..b9f772e 100644
--- a/configure.in
+++ b/configure.in
@@ -124,6 +124,14 @@ AC_ARG_WITH([modules-path],
 MODULES_PATH=$with_modules_path
 AC_SUBST(MODULES_PATH)
 
+dnl===========================================================================
+dnl Check for nautilus for the share bar
+
+PKG_CHECK_MODULES(EXTENSION,
+		   libnautilus-extension)
+NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUSDIR)
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f7bdec..c094fe0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,8 @@ data/desktop_gnome_file_sharing.schemas.in
 [type: gettext/glade]data/file-share-properties.ui
 data/gnome-user-share-properties.desktop.in
 data/gnome-user-share.desktop.in.in
+src/nautilus-share-bar.c
+src/share-extension.c
 src/file-share-properties.c
 src/http.c
 src/obexpush.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 06a5243..47b22e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ INCLUDES=	\
 	-DHTTPD_MODULES_PATH=\""$(MODULES_PATH)"\"	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
+	$(EXTENSION_CFLAGS)				\
 	$(USER_SHARE_CFLAGS)				\
 	$(USER_SHARE_CONFIG_CFLAGS)			\
 	$(X_CFLAGS)
@@ -56,6 +57,17 @@ gnome_file_share_properties_SOURCES =	\
 gnome_file_share_properties_LDADD = \
 	$(USER_SHARE_CONFIG_LIBS)
 
+nautilus_extensiondir = $(NAUTILUSDIR)
+nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
+
+libnautilus_share_extension_la_SOURCES =         \
+	nautilus-share-bar.c                     \
+	nautilus-share-bar.h                     \
+	share-extension.c                        \
+	$(NULL)
+
+libnautilus_share_extension_la_LIBADD = $(EXTENSION_LIBS)
+libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined
 
 EXTRA_DIST = marshal.list
 
diff --git a/src/nautilus-share-bar.c b/src/nautilus-share-bar.c
new file mode 100644
index 0000000..b3c427c
--- /dev/null
+++ b/src/nautilus-share-bar.c
@@ -0,0 +1,226 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
+ *
+ * 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: William Jon McCann <mccann at jhu.edu>
+ *
+ */
+
+#include "config.h"
+
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+
+#include "nautilus-share-bar.h"
+
+static void nautilus_share_bar_finalize   (GObject *object);
+
+#define NAUTILUS_SHARE_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarPrivate))
+
+struct NautilusShareBarPrivate
+{
+        GtkTooltips *tooltips;
+        GtkWidget   *button;
+        GtkWidget   *label;
+        char        *str;
+};
+
+enum {
+	PROP_0,
+	PROP_LABEL
+};
+
+enum {
+       ACTIVATE,
+       LAST_SIGNAL
+};
+
+static guint           signals [LAST_SIGNAL] = { 0, };
+
+G_DEFINE_TYPE (NautilusShareBar, nautilus_share_bar, GTK_TYPE_HBOX)
+
+GtkWidget *
+nautilus_share_bar_get_button (NautilusShareBar *bar)
+{
+        GtkWidget *button;
+
+        g_return_val_if_fail (bar != NULL, NULL);
+
+        button = bar->priv->button;
+
+        return button;
+}
+
+static void
+nautilus_share_bar_set_property (GObject            *object,
+                                guint               prop_id,
+                                const GValue       *value,
+                                GParamSpec         *pspec)
+{
+        NautilusShareBar *self;
+
+        self = NAUTILUS_SHARE_BAR (object);
+
+        switch (prop_id) {
+	case PROP_LABEL: {
+		char *str;
+		g_free (self->priv->str);
+		str = g_strdup_printf ("<i>%s</i>", g_value_get_string (value));
+		gtk_label_set_markup (GTK_LABEL (self->priv->label), str);
+		self->priv->str = g_value_dup_string (value);
+		break;
+	}
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+nautilus_share_bar_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+        NautilusShareBar *self;
+
+        self = NAUTILUS_SHARE_BAR (object);
+
+        switch (prop_id) {
+	case PROP_LABEL:
+		g_value_set_string (value, self->priv->str);
+		break;
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+nautilus_share_bar_class_init (NautilusShareBarClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->finalize     = nautilus_share_bar_finalize;
+        object_class->get_property = nautilus_share_bar_get_property;
+        object_class->set_property = nautilus_share_bar_set_property;
+
+        g_type_class_add_private (klass, sizeof (NautilusShareBarPrivate));
+
+        g_object_class_install_property (G_OBJECT_CLASS(klass),
+					 PROP_LABEL, g_param_spec_string ("label",
+									  "label", "The widget's main label", NULL, G_PARAM_READWRITE));
+
+
+        signals [ACTIVATE] = g_signal_new ("activate",
+                                           G_TYPE_FROM_CLASS (klass),
+                                           G_SIGNAL_RUN_LAST,
+                                           G_STRUCT_OFFSET (NautilusShareBarClass, activate),
+                                           NULL, NULL,
+                                           g_cclosure_marshal_VOID__VOID,
+                                           G_TYPE_NONE, 0);
+
+}
+
+static void
+button_clicked_cb (GtkWidget       *button,
+                   NautilusShareBar *bar)
+{
+        g_signal_emit (bar, signals [ACTIVATE], 0);
+}
+
+static void
+nautilus_share_bar_init (NautilusShareBar *bar)
+{
+	GtkWidget   *label;
+        GtkWidget   *hbox;
+        GtkWidget   *vbox;
+        GtkWidget   *image;
+        char        *hint;
+
+        bar->priv = NAUTILUS_SHARE_BAR_GET_PRIVATE (bar);
+
+        bar->priv->tooltips = gtk_tooltips_new ();
+        g_object_ref (bar->priv->tooltips);
+        gtk_object_sink (GTK_OBJECT (bar->priv->tooltips));
+
+        hbox = GTK_WIDGET (bar);
+
+        vbox = gtk_vbox_new (FALSE, 6);
+        gtk_widget_show (vbox);
+        gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+
+        label = gtk_label_new (_("Personal File Sharing"));
+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+        gtk_widget_show (label);
+        gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+
+        bar->priv->label = gtk_label_new ("");
+        hint = g_strdup_printf ("<i>%s</i>", "");
+        gtk_label_set_markup (GTK_LABEL (bar->priv->label), hint);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
+        gtk_widget_show (bar->priv->label);
+        gtk_box_pack_start (GTK_BOX (vbox), bar->priv->label, TRUE, TRUE, 0);
+
+        bar->priv->button = gtk_button_new_with_label (_("Launch Preferences"));
+        gtk_widget_show (bar->priv->button);
+        gtk_box_pack_end (GTK_BOX (hbox), bar->priv->button, FALSE, FALSE, 0);
+
+        image = gtk_image_new_from_icon_name ("folder-remote", GTK_ICON_SIZE_BUTTON);
+        gtk_widget_show (image);
+        gtk_button_set_image (GTK_BUTTON (bar->priv->button), image);
+
+        g_signal_connect (bar->priv->button, "clicked",
+                          G_CALLBACK (button_clicked_cb),
+                          bar);
+
+        gtk_tooltips_set_tip (GTK_TOOLTIPS (bar->priv->tooltips),
+                              bar->priv->button,
+                              _("Launch Personal File Sharing Preferences"),
+                              NULL);
+}
+
+static void
+nautilus_share_bar_finalize (GObject *object)
+{
+        NautilusShareBar *bar;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (NAUTILUS_IS_SHARE_BAR (object));
+
+        bar = NAUTILUS_SHARE_BAR (object);
+
+        g_return_if_fail (bar->priv != NULL);
+
+        if (bar->priv->tooltips != NULL) {
+                g_object_unref (bar->priv->tooltips);
+        }
+
+        G_OBJECT_CLASS (nautilus_share_bar_parent_class)->finalize (object);
+}
+
+GtkWidget *
+nautilus_share_bar_new (const char *label)
+{
+        GObject *result;
+
+        result = g_object_new (NAUTILUS_TYPE_SHARE_BAR,
+        		       "label", label,
+                               NULL);
+
+        return GTK_WIDGET (result);
+}
diff --git a/src/nautilus-share-bar.h b/src/nautilus-share-bar.h
new file mode 100644
index 0000000..b7fb1fd
--- /dev/null
+++ b/src/nautilus-share-bar.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
+ *
+ * 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: William Jon McCann <mccann at jhu.edu>
+ *
+ */
+
+#ifndef __NAUTILUS_SHARE_BAR_H
+#define __NAUTILUS_SHARE_BAR_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define NAUTILUS_TYPE_SHARE_BAR         (nautilus_share_bar_get_type ())
+#define NAUTILUS_SHARE_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBar))
+#define NAUTILUS_SHARE_BAR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
+#define NAUTILUS_IS_SHARE_BAR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SHARE_BAR))
+#define NAUTILUS_IS_SHARE_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_SHARE_BAR))
+#define NAUTILUS_SHARE_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
+
+typedef struct NautilusShareBarPrivate NautilusShareBarPrivate;
+
+typedef struct
+{
+        GtkHBox                 box;
+
+        NautilusShareBarPrivate *priv;
+} NautilusShareBar;
+
+typedef struct
+{
+        GtkHBoxClass            parent_class;
+
+	void (* activate) (NautilusShareBar *bar);
+
+} NautilusShareBarClass;
+
+GType       nautilus_share_bar_get_type          (void);
+GtkWidget  *nautilus_share_bar_new               (const char *label);
+
+GtkWidget  *nautilus_share_bar_get_button        (NautilusShareBar *bar);
+
+G_END_DECLS
+
+#endif /* __GS_SHARE_BAR_H */
diff --git a/src/share-extension.c b/src/share-extension.c
new file mode 100644
index 0000000..036ecd3
--- /dev/null
+++ b/src/share-extension.c
@@ -0,0 +1,292 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * Copyright (C) 2003 Novell, Inc.
+ * Copyright (C) 2003-2004 Red Hat, Inc.
+ * Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+#include <libnautilus-extension/nautilus-menu-provider.h>
+#include <libnautilus-extension/nautilus-location-widget-provider.h>
+
+#include "nautilus-share-bar.h"
+
+#define NAUTILUS_TYPE_SHARE  (nautilus_share_get_type ())
+#define NAUTILUS_SHARE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE, NautilusShare))
+#define NAUTILUS_IS_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SHARE))
+
+typedef struct _NautilusSharePrivate NautilusSharePrivate;
+
+typedef struct
+{
+        GObject              parent_slot;
+        NautilusSharePrivate *priv;
+} NautilusShare;
+
+typedef struct
+{
+        GObjectClass parent_slot;
+} NautilusShareClass;
+
+#define NAUTILUS_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_SHARE, NautilusSharePrivate))
+
+struct _NautilusSharePrivate
+{
+        GSList       *widget_list;
+};
+
+static GType nautilus_share_get_type      (void);
+static void  nautilus_share_register_type (GTypeModule *module);
+
+static GObjectClass *parent_class;
+
+
+static void
+launch_process (char **argv, GtkWindow *parent)
+{
+        GError *error;
+        GtkWidget *dialog;
+
+        error = NULL;
+        if (!g_spawn_async (NULL,
+                            argv, NULL,
+                            0,
+                            NULL, NULL,
+                            NULL,
+                            &error)) {
+
+
+                dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING,
+						 GTK_BUTTONS_OK, _("Unable to launch the Personal File Sharing preferences"));
+
+                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
+
+                gtk_dialog_run (GTK_DIALOG (dialog));
+                gtk_widget_destroy (dialog);
+
+                g_error_free (error);
+        }
+}
+
+static void
+launch_prefs_on_window (GtkWindow *window)
+{
+        char *argv [2];
+
+        argv [0] = g_build_filename (BINDIR, "gnome-file-share-properties", NULL);
+        argv [1] = NULL;
+
+        launch_process (argv, window);
+
+        g_free (argv [0]);
+}
+
+static void
+bar_activated_cb (NautilusShareBar *bar,
+                  gpointer         data)
+{
+        launch_prefs_on_window (GTK_WINDOW (data));
+}
+
+static void
+destroyed_callback (GtkWidget    *widget,
+                    NautilusShare *share)
+{
+        share->priv->widget_list = g_slist_remove (share->priv->widget_list, widget);
+}
+
+static void
+add_widget (NautilusShare *share,
+              GtkWidget    *widget)
+{
+        share->priv->widget_list = g_slist_prepend (share->priv->widget_list, widget);
+
+        g_signal_connect (widget, "destroy",
+                          G_CALLBACK (destroyed_callback),
+                          share);
+}
+
+static GtkWidget *
+nautilus_share_get_location_widget (NautilusLocationWidgetProvider *iface,
+                                   const char                     *uri,
+                                   GtkWidget                      *window)
+{
+	GFile         *file;
+	GtkWidget     *bar;
+	NautilusShare *share;
+	guint          i;
+	gboolean       enable = FALSE;
+	const GUserDirectory special_dirs[] = { G_USER_DIRECTORY_PUBLIC_SHARE, G_USER_DIRECTORY_DOWNLOAD };
+	gboolean is_dir[] = { FALSE, FALSE };
+
+	file = g_file_new_for_uri (uri);
+
+	for (i = 0; i < G_N_ELEMENTS (special_dirs); i++) {
+		const char *path;
+
+		path = g_get_user_special_dir (special_dirs[i]);
+		if (path != NULL) {
+			GFile *dir;
+			dir = g_file_new_for_path (path);
+			if (g_file_equal (dir, file)) {
+				enable = TRUE;
+				is_dir[i] = TRUE;
+			}
+			g_object_unref (dir);
+		}
+	}
+
+	if (enable == FALSE)
+		return NULL;
+
+	share = NAUTILUS_SHARE (iface);
+
+	if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
+		bar = nautilus_share_bar_new (_("You can share files from this folder and receive files to it"));
+	} else if (is_dir[0] != FALSE) {
+		bar = nautilus_share_bar_new (_("You can share files from this folder over the network and Bluetooth"));
+	} else {
+		bar = nautilus_share_bar_new (_("You can receive files over Bluetooth into this folder"));
+	}
+
+	add_widget (share, nautilus_share_bar_get_button (NAUTILUS_SHARE_BAR (bar)));
+
+	g_signal_connect (bar, "activate",
+			  G_CALLBACK (bar_activated_cb),
+			  window);
+
+	gtk_widget_show (bar);
+
+	g_object_unref (file);
+
+        return bar;
+}
+
+static void
+nautilus_share_location_widget_provider_iface_init (NautilusLocationWidgetProviderIface *iface)
+{
+        iface->get_widget = nautilus_share_get_location_widget;
+}
+
+static void
+nautilus_share_instance_init (NautilusShare *share)
+{
+        share->priv = NAUTILUS_SHARE_GET_PRIVATE (share);
+}
+
+static void
+nautilus_share_finalize (GObject *object)
+{
+        NautilusShare *share;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (NAUTILUS_IS_SHARE (object));
+
+        share = NAUTILUS_SHARE (object);
+
+        g_return_if_fail (share->priv != NULL);
+
+        if (share->priv->widget_list != NULL) {
+                g_slist_free (share->priv->widget_list);
+        }
+
+        G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+nautilus_share_class_init (NautilusShareClass *klass)
+{
+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+        parent_class = g_type_class_peek_parent (klass);
+
+        object_class->finalize = nautilus_share_finalize;
+
+        g_type_class_add_private (klass, sizeof (NautilusSharePrivate));
+}
+
+static GType share_type = 0;
+
+static GType
+nautilus_share_get_type (void)
+{
+        return share_type;
+}
+
+static void
+nautilus_share_register_type (GTypeModule *module)
+{
+        static const GTypeInfo info = {
+                sizeof (NautilusShareClass),
+                (GBaseInitFunc) NULL,
+                (GBaseFinalizeFunc) NULL,
+                (GClassInitFunc) nautilus_share_class_init,
+                NULL,
+                NULL,
+                sizeof (NautilusShare),
+                0,
+                (GInstanceInitFunc) nautilus_share_instance_init,
+        };
+
+        static const GInterfaceInfo location_widget_provider_iface_info = {
+                (GInterfaceInitFunc) nautilus_share_location_widget_provider_iface_init,
+                NULL,
+                NULL
+        };
+
+        share_type = g_type_module_register_type (module,
+                                                 G_TYPE_OBJECT,
+                                                 "NautilusShare",
+                                                 &info, 0);
+
+        g_type_module_add_interface (module,
+                                     share_type,
+                                     NAUTILUS_TYPE_LOCATION_WIDGET_PROVIDER,
+                                     &location_widget_provider_iface_info);
+}
+
+void
+nautilus_module_initialize (GTypeModule *module)
+{
+        nautilus_share_register_type (module);
+        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+}
+
+void
+nautilus_module_shutdown (void)
+{
+}
+
+void
+nautilus_module_list_types (const GType **types,
+                            int          *num_types)
+{
+        static GType type_list [1];
+
+        type_list[0] = NAUTILUS_TYPE_SHARE;
+
+        *types = type_list;
+        *num_types = 1;
+}
-- 
1.6.2.5




From cebbert at fedoraproject.org  Tue Sep  8 17:02:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  8 Sep 2009 17:02:44 +0000 (UTC)
Subject: rpms/kernel/F-11 config-powerpc-generic, 1.42, 1.43 kernel.spec,
	1.1728, 1.1729
Message-ID: <20090908170244.E0DED11C0082@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13538

Modified Files:
	config-powerpc-generic kernel.spec 
Log Message:
Disable Amiga One support to fix powerpc coherency bug (#521703)


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- config-powerpc-generic	25 Jul 2009 04:09:16 -0000	1.42
+++ config-powerpc-generic	8 Sep 2009 17:02:44 -0000	1.43
@@ -311,7 +311,7 @@ CONFIG_USB_FHCI_HCD=m
 
 # CONFIG_DRM_RADEON_KMS is not set
 
-CONFIG_AMIGAONE=y
+# CONFIG_AMIGAONE is not set
 
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1728
retrieving revision 1.1729
diff -u -p -r1.1728 -r1.1729
--- kernel.spec	5 Sep 2009 00:55:06 -0000	1.1728
+++ kernel.spec	8 Sep 2009 17:02:44 -0000	1.1729
@@ -1984,6 +1984,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-50
+- Disable Amiga One support to fix powerpc coherency bug (#521703)
+
 * Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-49
 - Fix build system getting confused during firmware install.
 



From bpepple at fedoraproject.org  Tue Sep  8 17:03:09 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Sep 2009 17:03:09 +0000 (UTC)
Subject: rpms/papyon/devel .cvsignore, 1.2, 1.3 papyon.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090908170309.10A2811C0082@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13710

Modified Files:
	.cvsignore papyon.spec sources 
Log Message:
* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2.
- Drop BR and Req on python-crypto.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Aug 2009 02:02:11 -0000	1.2
+++ .cvsignore	8 Sep 2009 17:03:08 -0000	1.3
@@ -1 +1 @@
-papyon-0.4.1.tar.gz
+papyon-0.4.2.tar.gz


Index: papyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/papyon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- papyon.spec	15 Aug 2009 02:02:11 -0000	1.1
+++ papyon.spec	8 Sep 2009 17:03:08 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           papyon
-Version:        0.4.1
-Release:        3%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        Python libraries for MSN Messenger network
 
 Group:          Development/Languages
@@ -14,12 +14,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 
 BuildRequires:	pyOpenSSL
-BuildRequires:	python-crypto
 BuildRequires:  python-devel
 BuildRequires:	pygobject2
 
 Requires:	pyOpenSSL
-Requires:	python-crypto
 Requires:	pygobject2
 
 Provides:	pymsn = 0.3.4-1
@@ -57,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2.
+- Drop BR and Req on python-crypto.
+
 * Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-3
 - Clean up some rpmlint error.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Aug 2009 02:02:11 -0000	1.2
+++ sources	8 Sep 2009 17:03:08 -0000	1.3
@@ -1 +1 @@
-b78af3d244bf9bb6460dfec7e0f831bc  papyon-0.4.1.tar.gz
+a282fda82b6755f5ddeb68d155c2ad18  papyon-0.4.2.tar.gz



From hadess at fedoraproject.org  Tue Sep  8 17:10:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 17:10:18 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.60,1.61
Message-ID: <20090908171018.CDB2A11C043D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17034

Modified Files:
	gnome-user-share.spec 
Log Message:
add missing BRs


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gnome-user-share.spec	8 Sep 2009 16:43:28 -0000	1.60
+++ gnome-user-share.spec	8 Sep 2009 17:10:18 -0000	1.61
@@ -12,7 +12,7 @@ Patch0: menu-path.patch
 Patch1: 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=558244
 Patch2: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
-BuildRequires: intltool automake autoconf
+BuildRequires: intltool automake autoconf libtool
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -27,6 +27,7 @@ BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libnotify-devel
+BuildRequires: nautilus-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2



From bpepple at fedoraproject.org  Tue Sep  8 17:13:29 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Sep 2009 17:13:29 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.37, 1.38 empathy-broken-nm.patch,
	1.1, 
	1.2 empathy-broken-pkgconfig.patch, 1.5, 1.6 empathy.spec, 1.75,
	1.76 sources, 1.37, 1.38 empathy-desktop-category.patch, 1.1,
	NONE empathy-fix-nav-handling.patch, 1.1, NONE
Message-ID: <20090908171329.3D58C11C0082@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18043

Modified Files:
	.cvsignore empathy-broken-nm.patch 
	empathy-broken-pkgconfig.patch empathy.spec sources 
Removed Files:
	empathy-desktop-category.patch empathy-fix-nav-handling.patch 
Log Message:
* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-1
- Update to 2.27.92.
- Drop desktop category patch.  Fixed upstream.
- Drop fix-nav-handling patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	26 Aug 2009 18:39:49 -0000	1.37
+++ .cvsignore	8 Sep 2009 17:13:28 -0000	1.38
@@ -1 +1 @@
-empathy-2.27.91.1.tar.bz2
+empathy-2.27.92.tar.bz2

empathy-broken-nm.patch:
 configure    |   16 ++++++++--------
 configure.ac |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: empathy-broken-nm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-nm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- empathy-broken-nm.patch	2 Sep 2009 00:56:03 -0000	1.1
+++ empathy-broken-nm.patch	8 Sep 2009 17:13:28 -0000	1.2
@@ -1,7 +1,7 @@
-diff -urp empathy-2.27.91.1.OLD/configure empathy-2.27.91.1/configure
---- empathy-2.27.91.1.OLD/configure	2009-08-25 11:58:07.000000000 -0400
-+++ empathy-2.27.91.1/configure	2009-09-01 20:19:21.000104092 -0400
-@@ -18227,16 +18227,16 @@ if test -n "$PKG_CONFIG"; then
+diff -urp empathy-2.27.92.OLD/configure empathy-2.27.92/configure
+--- empathy-2.27.92.OLD/configure	2009-09-08 11:39:26.000000000 -0400
++++ empathy-2.27.92/configure	2009-09-08 12:53:07.792273671 -0400
+@@ -18213,16 +18213,16 @@ if test -n "$PKG_CONFIG"; then
      else
          if test -n "$PKG_CONFIG" && \
      { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
@@ -21,7 +21,7 @@ diff -urp empathy-2.27.91.1.OLD/configur
     " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -18251,16 +18251,16 @@ if test -n "$PKG_CONFIG"; then
+@@ -18237,16 +18237,16 @@ if test -n "$PKG_CONFIG"; then
      else
          if test -n "$PKG_CONFIG" && \
      { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
@@ -41,7 +41,7 @@ diff -urp empathy-2.27.91.1.OLD/configur
     " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -18281,11 +18281,11 @@ else
+@@ -18267,11 +18267,11 @@ else
  fi
          if test $_pkg_short_errors_supported = yes; then
  	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
@@ -55,9 +55,9 @@ diff -urp empathy-2.27.91.1.OLD/configur
     "`
          fi
  	# Put the nasty error message in config.log where it belongs
-diff -urp empathy-2.27.91.1.OLD/configure.ac empathy-2.27.91.1/configure.ac
---- empathy-2.27.91.1.OLD/configure.ac	2009-08-25 11:46:02.000000000 -0400
-+++ empathy-2.27.91.1/configure.ac	2009-09-01 20:18:24.951104847 -0400
+diff -urp empathy-2.27.92.OLD/configure.ac empathy-2.27.92/configure.ac
+--- empathy-2.27.92.OLD/configure.ac	2009-09-08 11:22:35.000000000 -0400
++++ empathy-2.27.92/configure.ac	2009-09-08 12:53:30.593270474 -0400
 @@ -183,7 +183,7 @@ else
  
     PKG_CHECK_MODULES(NETWORK_MANAGER,

empathy-broken-pkgconfig.patch:
 libempathy-gtk/libempathy-gtk.pc.in |    3 +--
 libempathy/libempathy.pc.in         |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: empathy-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-pkgconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- empathy-broken-pkgconfig.patch	26 Aug 2009 22:10:42 -0000	1.5
+++ empathy-broken-pkgconfig.patch	8 Sep 2009 17:13:28 -0000	1.6
@@ -1,25 +1,25 @@
-diff -urp empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in empathy-2.27.91.1/libempathy/libempathy.pc.in
---- empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in	2009-05-18 05:58:49.000000000 -0400
-+++ empathy-2.27.91.1/libempathy/libempathy.pc.in	2009-08-26 16:59:16.000000000 -0400
+diff -urp empathy-2.27.92.OLD/libempathy/libempathy.pc.in empathy-2.27.92/libempathy/libempathy.pc.in
+--- empathy-2.27.92.OLD/libempathy/libempathy.pc.in	2009-09-01 04:57:31.000000000 -0400
++++ empathy-2.27.92/libempathy/libempathy.pc.in	2009-09-08 12:55:21.078269583 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
  Name: libempathy
  Description:  Empathy base library
 -Requires: pkg-config >= 0.21
--Requires.private: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, \
+-Requires.private: glib-2.0, gobject-2.0, libxml-2.0, \
 +Requires: glib-2.0, gobject-2.0, libxml-2.0, \
                    gio-2.0, gio-unix-2.0, telepathy-glib
  Version: @VERSION@
  Libs: -L${libdir} -lempathy
-diff -urp empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in
---- empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in	2009-05-18 06:14:46.000000000 -0400
-+++ empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in	2009-08-26 16:59:39.000000000 -0400
+diff -urp empathy-2.27.92.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.27.92/libempathy-gtk/libempathy-gtk.pc.in
+--- empathy-2.27.92.OLD/libempathy-gtk/libempathy-gtk.pc.in	2009-09-01 04:57:31.000000000 -0400
++++ empathy-2.27.92/libempathy-gtk/libempathy-gtk.pc.in	2009-09-08 12:55:40.418269081 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
  Name: libempathy-gtk
  Description:  Empathy interface library
 -Requires: pkg-config >= 0.21
--Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libmissioncontrol, \
+-Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, \
 +Requires: glib-2.0, gobject-2.0, gtk+-2.0, \
                    libempathy, telepathy-glib, libcanberra-gtk
  Version: @VERSION@


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- empathy.spec	2 Sep 2009 00:56:03 -0000	1.75
+++ empathy.spec	8 Sep 2009 17:13:28 -0000	1.76
@@ -14,8 +14,8 @@
 %global libchamplain_version    0.3.6
 
 Name:		empathy
-Version:	2.27.91.1
-Release:	6%{?dist}
+Version:	2.27.92
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -31,11 +31,8 @@ Source1:	%{name}-README.ConnectionManage
 ## Removes old mission-control lookup
 ## http://bugzilla.gnome.org/show_bug.cgi?id=593224
 Patch1:		%{name}-broken-pkgconfig.patch
-Patch2:		%{name}-desktop-category.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593318
-Patch4:		%{name}-fix-nav-handling.patch
 Patch5:		%{name}-broken-nm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -138,9 +135,7 @@ bindings to the libempathy and libempath
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconfig
-%patch2 -p1 -b .desktop
 %patch3 -p1 -b .presence-icons
-%patch4 -p1 -b .fix-nav-handling
 %patch5 -p1 -b .nm
 
 # force these to be regenerated
@@ -250,6 +245,11 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-1
+- Update to 2.27.92.
+- Drop desktop category patch.  Fixed upstream.
+- Drop fix-nav-handling patch.  Fixed upstream.
+
 * Tue Sep  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-6
 - Add patch to workaround NetworkManager pc file name change.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	26 Aug 2009 18:39:49 -0000	1.37
+++ sources	8 Sep 2009 17:13:28 -0000	1.38
@@ -1 +1 @@
-6845b138d9f597932886345aeac82bc5  empathy-2.27.91.1.tar.bz2
+888f07eada6eea765123f987d208ea13  empathy-2.27.92.tar.bz2


--- empathy-desktop-category.patch DELETED ---


--- empathy-fix-nav-handling.patch DELETED ---



From scop at fedoraproject.org  Tue Sep  8 17:13:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  8 Sep 2009 17:13:57 +0000 (UTC)
Subject: rpms/perl-Config-General/devel .cvsignore, 1.13,
	1.14 perl-Config-General.spec, 1.22, 1.23 sources, 1.13, 1.14
Message-ID: <20090908171357.3DD1411C0082@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-Config-General/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18309

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Tue Sep  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.44-1
- Update to 2.44 (#521756).
- Prune pre-2005 %changelog entries.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Jul 2009 16:14:19 -0000	1.13
+++ .cvsignore	8 Sep 2009 17:13:57 -0000	1.14
@@ -1 +1 @@
-Config-General-2.43.tar.gz
+Config-General-2.44.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Config-General.spec	26 Jul 2009 16:14:19 -0000	1.22
+++ perl-Config-General.spec	8 Sep 2009 17:13:57 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           perl-Config-General
-Version:        2.43
+Version:        2.44
 Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
@@ -37,7 +37,6 @@ support for object oriented access to th
 %setup -q -n Config-General-%{version}
 %patch0 -p1
 rm -r t/Tie
-rm General/i # http://rt.cpan.org/Public/Bug/Display.html?id=48211
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 
 
@@ -70,7 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jul 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.43-1
+* Tue Sep  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.44-1
+- Update to 2.44 (#521756).
+- Prune pre-2005 %%changelog entries.
+
+* Sun Jul 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.43-1
 - Update to 2.43 (#513796).
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.42-3
@@ -79,115 +82,50 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.42-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Jan  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.42-1
+* Sun Jan  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.42-1
 - 2.42.
 - Patch test suite to use system installed Tie::IxHash.
 - Fix some spelling errors in %%description.
 - Use Source0: instead of Source:.
 
-* Sat Jun 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.40-1
+* Sat Jun 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.40-1
 - 2.40.
 
-* Tue Jun 17 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.39-1
+* Tue Jun 17 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.39-1
 - 2.39.
 
-* Tue Mar  4 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.38-1
+* Tue Mar  4 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.38-1
 - 2.38.
 
 * Fri Feb  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.37-2
 - rebuild for new perl
 
-* Tue Nov 27 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.37-1
+* Tue Nov 27 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.37-1
 - 2.37 (#398801).
 - Convert docs to UTF-8.
 
-* Tue Aug  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.33-2
+* Tue Aug  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.33-2
 - License: GPL+ or Artistic
 
-* Wed Apr 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.33-1
+* Wed Apr 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.33-1
 - 2.33.
 - BuildRequire perl(ExtUtils::MakeMaker) and perl(Test::More).
 
-* Sat Feb 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.32-1
+* Sat Feb 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.32-1
 - 2.32.
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.31-2
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.31-2
 - Fix order of arguments to find(1).
 - Drop version from perl build dependency.
 
-* Thu Jan 12 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.31-1
+* Thu Jan 12 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.31-1
 - 2.31.
 
-* Fri Sep 16 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.30-1
+* Fri Sep 16 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.30-1
 - 2.30.
 
-* Wed May 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.28-2
+* Wed May 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.28-2
 - 2.28.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.27-2
 - rebuilt
-
-* Fri Jun 18 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.27-0.fdr.1
-- Update to 2.27.
-- Bring up to date with current fedora.us Perl spec template.
-
-* Sun May  9 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.26-0.fdr.3
-- BuildRequire perl >= 1:5.6.1-34.99.6 for support for vendor installdirs.
-- Use pure_install to avoid perllocal.pod workarounds.
-
-* Sun Apr 25 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.26-0.fdr.2
-- Require perl(:MODULE_COMPAT_*).
-
-* Sun Mar 14 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.26-0.fdr.1
-- Update to 2.26.
-
-* Mon Feb  2 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.24-0.fdr.3
-- Reduce directory ownership bloat.
-
-* Mon Dec  1 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.24-0.fdr.2
-- Improve summary.
-
-* Wed Oct 22 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.24-0.fdr.1
-- Update to 2.24.
-
-* Sat Sep 27 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.23-0.fdr.1
-- Update to 2.23.
-
-* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.21-0.fdr.2
-- Install into vendor dirs.
-
-* Fri Jun 27 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.21-0.fdr.1
-- Update to 2.21.
-
-* Sat Jun 21 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.20-0.fdr.1
-- Update to 2.20.
-
-* Wed May  7 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.19-0.fdr.1
-- Update to 2.19.
-- Save .spec in UTF-8.
-
-* Fri Apr  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.18-0.fdr.1
-- First Fedora release.
-- Update to 2.18.
-
-* Fri Dec  6 2002 Ville Skytt? <ville.skytta at iki.fi> - 2.15-1cr
-- Update to 2.15.
-
-* Sun Nov 24 2002 Ville Skytt? <ville.skytta at iki.fi> - 2.14-1cr
-- Update to 2.14.
-
-* Mon Nov 11 2002 Ville Skytt? <ville.skytta at iki.fi> - 2.12-1cr
-- Update to 2.12.
-
-* Sat Nov  9 2002 Ville Skytt? <ville.skytta at iki.fi> 2.11-1cr
-- Update to 2.11.
-
-* Sat Nov  2 2002 Ville Skytt? <ville.skytta at iki.fi> 2.10-1cr
-- Update to 2.10.
-
-* Sat Oct  5 2002 Ville Skytt? <ville.skytta at iki.fi> 2.08-1cr
-- Update to 2.08.
-- Rebuild for Red Hat 8.0.
-
-* Sat Aug 24 2002 Ville Skytt? <ville.skytta at iki.fi> 2.07-1cr
-- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Jul 2009 16:14:19 -0000	1.13
+++ sources	8 Sep 2009 17:13:57 -0000	1.14
@@ -1 +1 @@
-20d142d3e784da11d25c6cf307cae851  Config-General-2.43.tar.gz
+ad17b4ae5e0142fadd9b81f264deb266  Config-General-2.44.tar.gz



From nalin at fedoraproject.org  Tue Sep  8 17:17:19 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  8 Sep 2009 17:17:19 +0000 (UTC)
Subject: rpms/nss-ldapd/devel nss-ldapd.spec,1.3,1.4
Message-ID: <20090908171719.1C43211C0082@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss-ldapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19904

Modified Files:
	nss-ldapd.spec 
Log Message:
- fix typo in a comment, capitalize the full name for "LDAP Client User" (more
  from #516049)



Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/devel/nss-ldapd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-ldapd.spec	2 Sep 2009 15:26:58 -0000	1.3
+++ nss-ldapd.spec	8 Sep 2009 17:17:18 -0000	1.4
@@ -17,7 +17,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	openldap-devel, krb5-devel
 
 # Pull in the pam_ldap module, which is currently bundled with nss_ldap, to
-# keep keep upgrades from removing the module.  When nss-ldapd grows its own
+# keep upgrades from removing the module.  When nss-ldapd grows its own
 # pam_ldap.so, we'll have to revisit this.
 Requires:	/%{_lib}/security/pam_ldap.so
 Requires(post):		/sbin/ldconfig, chkconfig, grep, sed
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 getent group  ldap  > /dev/null || \
 /usr/sbin/groupadd -r -g 55 ldap
 getent passwd nslcd > /dev/null || \
-/usr/sbin/useradd -r -g ldap -c 'LDAP client user' \
+/usr/sbin/useradd -r -g ldap -c 'LDAP Client User' \
     -u 65 -d / -s /sbin/nologin nslcd 2> /dev/null || :
 
 %post
@@ -147,6 +147,10 @@ fi
 exit 0
 
 %changelog
+* Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com>
+- fix typo in a comment, capitalize the full name for "LDAP Client User" (more
+  from #516049)
+
 * Wed Sep  2 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-1
 - update to 0.6.11
 



From hadess at fedoraproject.org  Tue Sep  8 17:17:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  8 Sep 2009 17:17:48 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.61,1.62
Message-ID: <20090908171748.B050711C0082@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20027

Modified Files:
	gnome-user-share.spec 
Log Message:
fix filelist


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- gnome-user-share.spec	8 Sep 2009 17:10:18 -0000	1.61
+++ gnome-user-share.spec	8 Sep 2009 17:17:48 -0000	1.62
@@ -69,6 +69,8 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INS
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
@@ -132,6 +134,7 @@ fi
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
+%{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
 * Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-3



From epienbro at fedoraproject.org  Tue Sep  8 17:20:33 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  8 Sep 2009 17:20:33 +0000 (UTC)
Subject: rpms/mingw32-pango/devel .cvsignore, 1.7, 1.8 mingw32-pango.spec,
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090908172033.8CE8A11C043A@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20720

Modified Files:
	.cvsignore mingw32-pango.spec sources 
Log Message:
Update to 1.25.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Aug 2009 20:46:46 -0000	1.7
+++ .cvsignore	8 Sep 2009 17:20:33 -0000	1.8
@@ -1 +1 @@
-pango-1.25.5.tar.bz2
+pango-1.25.6.tar.bz2


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-pango.spec	27 Aug 2009 20:46:46 -0000	1.9
+++ mingw32-pango.spec	8 Sep 2009 17:20:33 -0000	1.10
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.25.5
+Version:        1.25.6
 Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
@@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Tue Sep  8 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.6-1
+- Update to 1.25.6
+
 * Mon Aug 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.5-1
 - Update to 1.25.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Aug 2009 20:46:46 -0000	1.7
+++ sources	8 Sep 2009 17:20:33 -0000	1.8
@@ -1 +1 @@
-3f0b5f9b58f951ddaffbdb45b2d12741  pango-1.25.5.tar.bz2
+f578a348fbe5f616d104b3a5ecbd2005  pango-1.25.6.tar.bz2



From pwouters at fedoraproject.org  Tue Sep  8 17:22:49 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 17:22:49 +0000 (UTC)
Subject: rpms/dnssec-conf/devel pr.conf,1.1,1.2
Message-ID: <20090908172249.2AB2C11C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21943

Modified Files:
	pr.conf 
Log Message:
keep comments consistent.



Index: pr.conf
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/pr.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pr.conf	8 Sep 2009 16:15:32 -0000	1.1
+++ pr.conf	8 Sep 2009 17:22:48 -0000	1.2
@@ -1,6 +1,6 @@
 //; http://dnssec.nic.pr/keys/nic.pr.zip
 
 trusted-keys {
-"pr." 257 3 5 "AwEAAeDPv9lQ7Ej5Ld9Fz/FKLhdOajwtEXsWykj65ugIa4Di1nY6ti9ndkeR4kp1aSNlvf6N7KsjunfMJj4SccBwcY77DrxmQ+g9nI09ePMZvxF2U63Lv9BftGaIguYdkYZVSwHd1q7DdXqNkLaD4tZEHiN0h/3wBdTQUPH1IoskD1vGxiPw2egftk6sVQdvOJWaAgSpmG0eq+/e90WVTNX4/xhA17PrdQQJIheZQ3+EsDoil8kyJZC12KoHYpFklx7+aCiR2u8Fumy6ARFR4PP0n7bnBaKOgMpVzz+KI79a3USDkj9RhNog50iSWgaBM75Xu0IBNEpcCVYZYjwDESgiDXc="; // Key ID=6277
+"pr." 257 3 5 "AwEAAeDPv9lQ7Ej5Ld9Fz/FKLhdOajwtEXsWykj65ugIa4Di1nY6ti9ndkeR4kp1aSNlvf6N7KsjunfMJj4SccBwcY77DrxmQ+g9nI09ePMZvxF2U63Lv9BftGaIguYdkYZVSwHd1q7DdXqNkLaD4tZEHiN0h/3wBdTQUPH1IoskD1vGxiPw2egftk6sVQdvOJWaAgSpmG0eq+/e90WVTNX4/xhA17PrdQQJIheZQ3+EsDoil8kyJZC12KoHYpFklx7+aCiR2u8Fumy6ARFR4PP0n7bnBaKOgMpVzz+KI79a3USDkj9RhNog50iSWgaBM75Xu0IBNEpcCVYZYjwDESgiDXc="; // key id = 6277
 };
 



From zoglesby at fedoraproject.org  Tue Sep  8 17:39:13 2009
From: zoglesby at fedoraproject.org (Zach Oglesby)
Date: Tue,  8 Sep 2009 17:39:13 +0000 (UTC)
Subject: rpms/ghc-X11-xft/devel ghc-X11-xft.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090908173913.D300611C0082@cvs1.fedora.phx.redhat.com>

Author: zoglesby

Update of /cvs/pkgs/rpms/ghc-X11-xft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26468/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-X11-xft.spec import.log 
Log Message:
* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
- fix up devel, doc and prof deps
- Initial upload



--- NEW FILE ghc-X11-xft.spec ---
%global pkg_name X11-xft

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.3
Release:        3%{?dist}
Summary:        Haskell bindings to the Xft

Group:          Development/Libraries
License:        LGPLv2
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
BuildRequires:  libXft-devel
BuildRequires:  ghc-X11-devel
BuildRequires:  ghc-utf8-string-devel
%if %{with doc}
BuildRequires:  ghc-doc
BuildRequires:  ghc-X11-doc
BuildRequires:  ghc-utf8-string-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
BuildRequires:  ghc-X11-prof
BuildRequires:  ghc-utf8-string-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc,
it includes bindings to the Xft, X Free Type interface library,
and some Xrender parts.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires:       libXft-devel
Requires:       ghc-X11-devel
Requires:       ghc-utf8-string-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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}
Requires:       ghc-X11-doc
Requires:       ghc-utf8-string-doc

%description doc
This package contains development documentation files for 
the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
Requires:       ghc-X11-prof
Requires:       ghc-utf8-string-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
- fix up devel, doc and prof deps

* Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-2
- Fixed description of -doc to pass rpmlint

* Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-1
- Updated to version 0.3
- Added ghc-utf8-string-prof as build reqirment
- Added ghc-utf8-string-doc as build reqirment
- Added ghc-X11-prof as build reqirment
- Added ghc-X11-doc as build reqirment

* Mon Jul 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-4
- Added ghc-utf8-string-devel as build requirment
- Added ghc-X11-devel as build requirment

* Thu Jun 18 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-3
- Fixed License

* Fri Jun  5 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-2
- Updated to new cabal2spec

* Fri May 29 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-X11-xft-0_3-3_fc11:HEAD:ghc-X11-xft-0.3-3.fc11.src.rpm:1252431352


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11-xft/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:31:00 -0000	1.1
+++ .cvsignore	8 Sep 2009 17:39:13 -0000	1.2
@@ -0,0 +1 @@
+X11-xft-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11-xft/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:31:00 -0000	1.1
+++ sources	8 Sep 2009 17:39:13 -0000	1.2
@@ -0,0 +1 @@
+1b4a528a2a4fe5e9de715f6758ff9015  X11-xft-0.3.tar.gz



From zoglesby at fedoraproject.org  Tue Sep  8 17:42:35 2009
From: zoglesby at fedoraproject.org (Zach Oglesby)
Date: Tue,  8 Sep 2009 17:42:35 +0000 (UTC)
Subject: rpms/ghc-X11-xft/F-10 ghc-X11-xft.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090908174235.667ED11C0082@cvs1.fedora.phx.redhat.com>

Author: zoglesby

Update of /cvs/pkgs/rpms/ghc-X11-xft/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29548/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-X11-xft.spec import.log 
Log Message:
* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
- fix up devel, doc and prof deps
- Initial version uploaded



--- NEW FILE ghc-X11-xft.spec ---
%global pkg_name X11-xft

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.3
Release:        3%{?dist}
Summary:        Haskell bindings to the Xft

Group:          Development/Libraries
License:        LGPLv2
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
BuildRequires:  libXft-devel
BuildRequires:  ghc-X11-devel
BuildRequires:  ghc-utf8-string-devel
%if %{with doc}
BuildRequires:  ghc-doc
BuildRequires:  ghc-X11-doc
BuildRequires:  ghc-utf8-string-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
BuildRequires:  ghc-X11-prof
BuildRequires:  ghc-utf8-string-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc,
it includes bindings to the Xft, X Free Type interface library,
and some Xrender parts.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires:       libXft-devel
Requires:       ghc-X11-devel
Requires:       ghc-utf8-string-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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}
Requires:       ghc-X11-doc
Requires:       ghc-utf8-string-doc

%description doc
This package contains development documentation files for 
the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
Requires:       ghc-X11-prof
Requires:       ghc-utf8-string-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
- fix up devel, doc and prof deps

* Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-2
- Fixed description of -doc to pass rpmlint

* Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-1
- Updated to version 0.3
- Added ghc-utf8-string-prof as build reqirment
- Added ghc-utf8-string-doc as build reqirment
- Added ghc-X11-prof as build reqirment
- Added ghc-X11-doc as build reqirment

* Mon Jul 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-4
- Added ghc-utf8-string-devel as build requirment
- Added ghc-X11-devel as build requirment

* Thu Jun 18 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-3
- Fixed License

* Fri Jun  5 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-2
- Updated to new cabal2spec

* Fri May 29 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-X11-xft-0_3-3_fc11:F-10:ghc-X11-xft-0.3-3.fc11.src.rpm:1252431676


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11-xft/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:31:00 -0000	1.1
+++ .cvsignore	8 Sep 2009 17:42:35 -0000	1.2
@@ -0,0 +1 @@
+X11-xft-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11-xft/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:31:00 -0000	1.1
+++ sources	8 Sep 2009 17:42:35 -0000	1.2
@@ -0,0 +1 @@
+1b4a528a2a4fe5e9de715f6758ff9015  X11-xft-0.3.tar.gz



From zoglesby at fedoraproject.org  Tue Sep  8 17:44:05 2009
From: zoglesby at fedoraproject.org (Zach Oglesby)
Date: Tue,  8 Sep 2009 17:44:05 +0000 (UTC)
Subject: rpms/ghc-X11-xft/F-11 ghc-X11-xft.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090908174405.625FE11C0082@cvs1.fedora.phx.redhat.com>

Author: zoglesby

Update of /cvs/pkgs/rpms/ghc-X11-xft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31136/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-X11-xft.spec import.log 
Log Message:
* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
- fix up devel, doc and prof deps
- Initial uploaded version




--- NEW FILE ghc-X11-xft.spec ---
%global pkg_name X11-xft

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.3
Release:        3%{?dist}
Summary:        Haskell bindings to the Xft

Group:          Development/Libraries
License:        LGPLv2
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
BuildRequires:  libXft-devel
BuildRequires:  ghc-X11-devel
BuildRequires:  ghc-utf8-string-devel
%if %{with doc}
BuildRequires:  ghc-doc
BuildRequires:  ghc-X11-doc
BuildRequires:  ghc-utf8-string-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
BuildRequires:  ghc-X11-prof
BuildRequires:  ghc-utf8-string-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc,
it includes bindings to the Xft, X Free Type interface library,
and some Xrender parts.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires:       libXft-devel
Requires:       ghc-X11-devel
Requires:       ghc-utf8-string-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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}
Requires:       ghc-X11-doc
Requires:       ghc-utf8-string-doc

%description doc
This package contains development documentation files for 
the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
Requires:       ghc-X11-prof
Requires:       ghc-utf8-string-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
- fix up devel, doc and prof deps

* Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-2
- Fixed description of -doc to pass rpmlint

* Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-1
- Updated to version 0.3
- Added ghc-utf8-string-prof as build reqirment
- Added ghc-utf8-string-doc as build reqirment
- Added ghc-X11-prof as build reqirment
- Added ghc-X11-doc as build reqirment

* Mon Jul 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-4
- Added ghc-utf8-string-devel as build requirment
- Added ghc-X11-devel as build requirment

* Thu Jun 18 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-3
- Fixed License

* Fri Jun  5 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-2
- Updated to new cabal2spec

* Fri May 29 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-X11-xft-0_3-3_fc11:F-11:ghc-X11-xft-0.3-3.fc11.src.rpm:1252431804


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11-xft/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:31:00 -0000	1.1
+++ .cvsignore	8 Sep 2009 17:44:05 -0000	1.2
@@ -0,0 +1 @@
+X11-xft-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11-xft/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:31:00 -0000	1.1
+++ sources	8 Sep 2009 17:44:05 -0000	1.2
@@ -0,0 +1 @@
+1b4a528a2a4fe5e9de715f6758ff9015  X11-xft-0.3.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  8 17:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 17:52:45 +0000
Subject: [pkgdb] opensc: kalev has requested commit
Message-ID: <20090908175245.837DF10F87E@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on opensc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/opensc



From emaldonado at fedoraproject.org  Tue Sep  8 18:00:15 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  8 Sep 2009 18:00:15 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.15,1.16
Message-ID: <20090908180015.B645011C043D@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11486

Modified Files:
	nss-util.spec 
Log Message:
Installing shared libraries to %{_libdir}


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nss-util.spec	5 Sep 2009 21:33:38 -0000	1.15
+++ nss-util.spec	8 Sep 2009 18:00:15 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.4
-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
@@ -124,14 +124,14 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-u
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 
 for file in libnssutil3.so
 do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Copy the include files we want
@@ -156,7 +156,7 @@ done
 
 %files
 %defattr(-,root,root)
-/%{_lib}/libnssutil3.so
+%{_libdir}/libnssutil3.so
 
 %files devel
 %defattr(-,root,root)
@@ -200,6 +200,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
+- Installing shared libraries to %%{_libdir}
+
 * Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
 - Remove symbolic links to shared libraries from devel - 521155
 - Apply nss-nolocalsql patch subset for nss-util



From rdieter at fedoraproject.org  Tue Sep  8 18:01:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  8 Sep 2009 18:01:19 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.2-system_ca_certificates.patch, NONE,
	1.1 qt.spec, 1.323, 1.324
Message-ID: <20090908180119.4781411C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12459

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
Log Message:
* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-15
- use system ca-certificates (#521911)


qt-x11-opensource-src-4.5.2-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-system_ca_certificates.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.ca_bundle qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.ca_bundle	2009-09-08 12:30:33.197347131 -0500
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp	2009-09-08 12:41:50.295324320 -0500
@@ -482,11 +482,11 @@ void QSslSocketPrivate::resetDefaultCiph
 
 QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
 {
-#ifdef QQ_OS_UNIX
+#ifdef Q_OS_UNIX
     // Check known locations for the system's default bundle.  ### On Windows,
     // we should use CAPI to find the bundle, and not rely on default unix
     // locations.
-    const char *standardLocations[] = {"/etc/ssl/certs/",
+    const char *standardLocations[] = {"/etc/pki/tls/certs/",
 #if 0
                                        // KDE uses KConfig for its SSL store,
                                        // but it also stores the bundle at
@@ -495,13 +495,16 @@ QList<QSslCertificate> QSslSocketPrivate
 #endif
                                        0};
     const char **it = standardLocations;
+    QList<QSslCertificate> certs;
     QStringList nameFilter;
     nameFilter << QLatin1String("*.pem") << QLatin1String("*.crt");
     while (*it) {
-        if (QDirIterator(QLatin1String(*it), nameFilter).hasNext())
-            return certificatesFromPath(QLatin1String(*it));
+        QDirIterator certfilesIt(QLatin1String(*it), nameFilter);
+        while (certfilesIt.hasNext())
+            certs += QSslCertificate::fromPath(certfilesIt.next());
         ++it;
     }
+    return certs;
 #endif
 
     // Qt provides a default bundle when we cannot detect the system's default


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- qt.spec	1 Sep 2009 12:21:54 -0000	1.323
+++ qt.spec	8 Sep 2009 18:01:19 -0000	1.324
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,6 +41,9 @@ Patch16: qt-x11-opensource-src-4.5.1-kde
 Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
 Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
+# use system ca-bundle certs, http://bugzilla.redhat.com/521911
+Patch22: qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
+Requires: ca-certificates
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -347,6 +350,7 @@ Qt libraries used for drawing widgets an
 %patch17 -p1 -b .phonon-pulseaudio
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
+%patch22 -p1 -b .system_ca_certificates
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -886,6 +890,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-15
+- use system ca-certificates (#521911)
+
 * Tue Sep 01 2009 Than Ngo <than at redhat.com> - 4.5.2-14
 - drop fedora < 9 support
 - only apply ossl patch for fedora > 11



From pkgdb at fedoraproject.org  Tue Sep  8 18:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 18:04:24 +0000
Subject: [pkgdb] opensc had acl change status
Message-ID: <20090908180424.B6F4A10F884@bastion2.fedora.phx.redhat.com>

tmraz has set the commit acl on opensc (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/opensc



From pkgdb at fedoraproject.org  Tue Sep  8 18:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 18:04:46 +0000
Subject: [pkgdb] opensc had acl change status
Message-ID: <20090908180446.F0D3E10F884@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on opensc (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/opensc



From ajax at fedoraproject.org  Tue Sep  8 18:09:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  8 Sep 2009 18:09:05 +0000 (UTC)
Subject: rpms/mesa/devel mesa-7.6-hush-vblank-warning.patch,NONE,1.1
Message-ID: <20090908180905.AE85411C0082@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14740

Added Files:
	mesa-7.6-hush-vblank-warning.patch 
Log Message:
missing patch

mesa-7.6-hush-vblank-warning.patch:
 vblank.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mesa-7.6-hush-vblank-warning.patch ---
diff -up mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx mesa-20090813/src/mesa/drivers/dri/common/vblank.c
--- mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx	2009-08-13 09:28:01.000000000 -0400
+++ mesa-20090813/src/mesa/drivers/dri/common/vblank.c	2009-09-08 14:07:51.000000000 -0400
@@ -256,7 +256,7 @@ static int do_wait( drmVBlank * vbl, GLu
    if ( ret != 0 ) {
       static GLboolean first_time = GL_TRUE;
 
-      if ( first_time ) {
+      if (0) {
 	 fprintf(stderr, 
 		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"
 		 " working correctly.\nTry adjusting the vblank_mode"



From ajax at fedoraproject.org  Tue Sep  8 18:10:24 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  8 Sep 2009 18:10:24 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.483,1.484
Message-ID: <20090908181024.3CBDC11C043D@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15229

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 1.6.99.900-2
- Fix -source subtree to not include generated C files from hw/xfree86.
  Actually, just remove all C files from hw/xfree86 in -source, since we
  don't need them to build Xvnc.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- xorg-x11-server.spec	7 Sep 2009 05:54:50 -0000	1.483
+++ xorg-x11-server.spec	8 Sep 2009 18:10:23 -0000	1.484
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99.900
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -371,6 +371,8 @@ install -m 0755 %{SOURCE20} $RPM_BUILD_R
 
 find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
 xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
+# SLEDGEHAMMER
+find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 # Remove unwanted files/dirs
 {
@@ -504,6 +506,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 1.6.99.900-2
+- Fix -source subtree to not include generated C files from hw/xfree86.
+  Actually, just remove all C files from hw/xfree86 in -source, since we
+  don't need them to build Xvnc.
+
 * Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.900-1
 - xserver 1.6.99.900 
 



From emaldonado at fedoraproject.org  Tue Sep  8 18:10:38 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  8 Sep 2009 18:10:38 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.22,1.23
Message-ID: <20090908181038.6A89A11C043D@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15376

Modified Files:
	nss-softokn.spec 
Log Message:
Installing shared libraries to %{_libdir}


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nss-softokn.spec	6 Sep 2009 17:38:59 -0000	1.22
+++ nss-softokn.spec	8 Sep 2009 18:10:38 -0000	1.23
@@ -9,15 +9,15 @@
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
 %{nil}
 
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -183,14 +183,14 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
 for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
 do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # install our prelink configuration file
@@ -245,10 +245,10 @@ done
 
 %files
 %defattr(-,root,root)
-/%{_lib}/libnssdbm3.so
-/%{_lib}/libnssdbm3.chk
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
+%{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
 # shared with nss-tools
 %dir %{_libdir}/nss
 %dir %{saved_files_dir}
@@ -262,8 +262,8 @@ done
 
 %files freebl
 %defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
 
 %files devel
 %defattr(-,root,root)
@@ -290,6 +290,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
+- Installing shared libraries to %%{_libdir}
+
 * Sun Sep 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
 - Postuninstall scriptlet finishes quietly
 



From ajax at fedoraproject.org  Tue Sep  8 18:14:23 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  8 Sep 2009 18:14:23 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel kill-svideo.patch, 1.1,
	1.2 xorg-x11-drv-intel.spec, 1.26, 1.27
Message-ID: <20090908181423.0958011C0082@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16690

Modified Files:
	kill-svideo.patch xorg-x11-drv-intel.spec 
Log Message:
* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-10
- kill-svideo.patch: Treat svideo as unknown instead of disconnected.


kill-svideo.patch:
 drmmode_display.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: kill-svideo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/kill-svideo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kill-svideo.patch	24 Feb 2009 20:51:11 -0000	1.1
+++ kill-svideo.patch	8 Sep 2009 18:14:22 -0000	1.2
@@ -13,7 +13,7 @@ index d50e640..d6c7cd3 100644
 +		 * mode that fits both the panel and the tv out.  Once
 +		 * KMS learns how to detect svideo better we can
 +		 * remove this. */
-+		return DRM_MODE_DISCONNECTED;
++		return DRM_MODE_UNKNOWNCONNECTION;
 +	default:
 +		break;
 +	}


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xorg-x11-drv-intel.spec	2 Sep 2009 22:01:01 -0000	1.26
+++ xorg-x11-drv-intel.spec	8 Sep 2009 18:14:22 -0000	1.27
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-10
+- kill-svideo.patch: Treat svideo as unknown instead of disconnected.
+
 * Wed Sep 02 2009 Adam Jackson <ajax at redhat.com> 2.8.0-9
 - uevent.patch: Catch uevents for output hotplug, rescan when they happen,
   and send RANDR events for any changes.



From chitlesh at fedoraproject.org  Tue Sep  8 18:14:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Sep 2009 18:14:42 +0000 (UTC)
Subject: rpms/xcircuit/F-10 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources,
	1.5, 1.6 xcircuit.desktop, 1.4, 1.5 xcircuit.spec, 1.14, 1.15
Message-ID: <20090908181442.96FFD11C0082@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/xcircuit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16643/F-10

Modified Files:
	.cvsignore import.log sources xcircuit.desktop xcircuit.spec 
Log Message:
3.6 series 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Aug 2008 12:58:46 -0000	1.5
+++ .cvsignore	8 Sep 2009 18:14:42 -0000	1.6
@@ -1 +1 @@
-xcircuit-3.4.30.tgz
+xcircuit-3.6.161.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Aug 2008 12:58:46 -0000	1.1
+++ import.log	8 Sep 2009 18:14:42 -0000	1.2
@@ -1 +1,2 @@
 xcircuit-3_4_30-1_fc8:HEAD:xcircuit-3.4.30-1.fc8.src.rpm:1218805344
+xcircuit-3_6_161-1_fc11:F-10:xcircuit-3.6.161-1.fc11.src.rpm:1252433407


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Aug 2008 12:58:46 -0000	1.5
+++ sources	8 Sep 2009 18:14:42 -0000	1.6
@@ -1 +1 @@
-adabfa8432ad4c95344d12a821902e81  xcircuit-3.4.30.tgz
+f91c149a918f77329480005bfaa1448f  xcircuit-3.6.161.tgz


Index: xcircuit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-10/xcircuit.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xcircuit.desktop	24 Aug 2007 12:24:28 -0000	1.4
+++ xcircuit.desktop	8 Sep 2009 18:14:42 -0000	1.5
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=XCircuit Schematic
+Comment=ASIC Schematic Editor
 Exec=xcircuit
 Icon=xcircuit
 Type=Application
 Terminal=false
 GenericName=Xcircuit Schematic
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;


Index: xcircuit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-10/xcircuit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xcircuit.spec	15 Aug 2008 12:58:46 -0000	1.14
+++ xcircuit.spec	8 Sep 2009 18:14:42 -0000	1.15
@@ -1,5 +1,5 @@
 Name:             xcircuit
-Version:          3.4.30
+Version:          3.6.161
 Release:          1%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
@@ -16,10 +16,12 @@ BuildRoot:        %{_tmppath}/%{name}-%{
 
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
 BuildRequires:    ghostscript-devel, ngspice, libXpm-devel, zlib-devel
+BuildRequires:    chrpath
+
 Requires:         tk coreutils gtk2
 
 # Special FEL Gnome/KDE menu structure
-Requires: 		  electronics-menu
+Requires:         electronics-menu
 
 %description
 Xcircuit is a general-purpose drawing program and also a specific-purpose
@@ -41,17 +43,16 @@ cd %{name}-%{version}
 %{__autoconf}
 
 
-WISH=/usr/bin/wish
-export WISH
-
+export WISH=/usr/bin/wish
+export CFLAGS="$CFLAGS -g"
 
+#01/08/09 Without --enable-asg \ because it's broken
 %configure \
    --with-tcl=%{_libdir}      \
    --with-tk=%{_libdir}       \
    --with-tcllibs=%{_libdir}  \
    --with-tklibs=%{_libdir}
 
-
 %{__make} %{?_smp_mflags}
 
 
@@ -66,25 +67,25 @@ cd %{name}-%{version}
 %{__rm} -rf examples/win32
 
 # They stay
-#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.27/examples/python/.xcircuitrc
-#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.37/examples/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/python/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/.xcircuitrc
 
-chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.6/console.tcl
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
-sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.4/xcstartup.tcl
+sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.6/xcstartup.tcl
 sed -i '7 a\export TCLLIBPATH=%{_libdir}' %{buildroot}%{_bindir}/xcircuit
 
 
-desktop-file-install --vendor fedora           \
-    --add-category Engineering                 \
-    --add-category Electronics                 \
-    --remove-category Science                  \
+desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
+# removing rpath
+chrpath --delete %{buildroot}%{_libdir}/%{name}-3.6/xcircexec
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -92,16 +93,12 @@ desktop-file-install --vendor fedora    
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 
@@ -110,13 +107,22 @@ fi
 %doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
 %doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
-%{_prefix}/lib*/%{name}-3.4/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_prefix}/lib*/%{name}-3.6/
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 
-%changelog
+%Changelog
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.6.161-1
+- new upstream release 3.6.161
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Aug 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.30-1
 - new upstream release
 



From chitlesh at fedoraproject.org  Tue Sep  8 18:16:14 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Sep 2009 18:16:14 +0000 (UTC)
Subject: rpms/xcircuit/F-11 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources,
	1.5, 1.6 xcircuit.desktop, 1.4, 1.5 xcircuit.spec, 1.15, 1.16
Message-ID: <20090908181614.5CBB711C0082@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/xcircuit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17390/F-11

Modified Files:
	.cvsignore import.log sources xcircuit.desktop xcircuit.spec 
Log Message:
3.6 series


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Aug 2008 12:58:46 -0000	1.5
+++ .cvsignore	8 Sep 2009 18:16:14 -0000	1.6
@@ -1 +1 @@
-xcircuit-3.4.30.tgz
+xcircuit-3.6.161.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Aug 2008 12:58:46 -0000	1.1
+++ import.log	8 Sep 2009 18:16:14 -0000	1.2
@@ -1 +1,2 @@
 xcircuit-3_4_30-1_fc8:HEAD:xcircuit-3.4.30-1.fc8.src.rpm:1218805344
+xcircuit-3_6_161-1_fc11:F-11:xcircuit-3.6.161-1.fc11.src.rpm:1252433591


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Aug 2008 12:58:46 -0000	1.5
+++ sources	8 Sep 2009 18:16:14 -0000	1.6
@@ -1 +1 @@
-adabfa8432ad4c95344d12a821902e81  xcircuit-3.4.30.tgz
+f91c149a918f77329480005bfaa1448f  xcircuit-3.6.161.tgz


Index: xcircuit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-11/xcircuit.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xcircuit.desktop	24 Aug 2007 12:24:28 -0000	1.4
+++ xcircuit.desktop	8 Sep 2009 18:16:14 -0000	1.5
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=XCircuit Schematic
+Comment=ASIC Schematic Editor
 Exec=xcircuit
 Icon=xcircuit
 Type=Application
 Terminal=false
 GenericName=Xcircuit Schematic
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;


Index: xcircuit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-11/xcircuit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xcircuit.spec	26 Feb 2009 08:07:15 -0000	1.15
+++ xcircuit.spec	8 Sep 2009 18:16:14 -0000	1.16
@@ -1,6 +1,6 @@
 Name:             xcircuit
-Version:          3.4.30
-Release:          2%{?dist}
+Version:          3.6.161
+Release:          1%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
 License:          GPLv2
@@ -16,10 +16,12 @@ BuildRoot:        %{_tmppath}/%{name}-%{
 
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
 BuildRequires:    ghostscript-devel, ngspice, libXpm-devel, zlib-devel
+BuildRequires:    chrpath
+
 Requires:         tk coreutils gtk2
 
 # Special FEL Gnome/KDE menu structure
-Requires: 		  electronics-menu
+Requires:         electronics-menu
 
 %description
 Xcircuit is a general-purpose drawing program and also a specific-purpose
@@ -41,17 +43,16 @@ cd %{name}-%{version}
 %{__autoconf}
 
 
-WISH=/usr/bin/wish
-export WISH
-
+export WISH=/usr/bin/wish
+export CFLAGS="$CFLAGS -g"
 
+#01/08/09 Without --enable-asg \ because it's broken
 %configure \
    --with-tcl=%{_libdir}      \
    --with-tk=%{_libdir}       \
    --with-tcllibs=%{_libdir}  \
    --with-tklibs=%{_libdir}
 
-
 %{__make} %{?_smp_mflags}
 
 
@@ -66,25 +67,25 @@ cd %{name}-%{version}
 %{__rm} -rf examples/win32
 
 # They stay
-#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.27/examples/python/.xcircuitrc
-#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.37/examples/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/python/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/.xcircuitrc
 
-chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.6/console.tcl
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
-sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.4/xcstartup.tcl
+sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.6/xcstartup.tcl
 sed -i '7 a\export TCLLIBPATH=%{_libdir}' %{buildroot}%{_bindir}/xcircuit
 
 
-desktop-file-install --vendor fedora           \
-    --add-category Engineering                 \
-    --add-category Electronics                 \
-    --remove-category Science                  \
+desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
+# removing rpath
+chrpath --delete %{buildroot}%{_libdir}/%{name}-3.6/xcircexec
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -92,16 +93,12 @@ desktop-file-install --vendor fedora    
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 
@@ -110,13 +107,19 @@ fi
 %doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
 %doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
-%{_prefix}/lib*/%{name}-3.4/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_prefix}/lib*/%{name}-3.6/
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 
-%changelog
+%Changelog
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.6.161-1
+- new upstream release 3.6.161
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nalin at fedoraproject.org  Tue Sep  8 18:25:03 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  8 Sep 2009 18:25:03 +0000 (UTC)
Subject: rpms/hmaccalc/devel .cvsignore, 1.6, 1.7 hmaccalc.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090908182503.7EC6811C0082@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/hmaccalc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20527

Modified Files:
	.cvsignore hmaccalc.spec sources 
Log Message:
- error out when we previously skipped a check entry because the value to be
  checked is the wrong size
- fix estimation of the expected length for truncated values



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Sep 2009 18:58:46 -0000	1.6
+++ .cvsignore	8 Sep 2009 18:25:03 -0000	1.7
@@ -3,3 +3,4 @@ hmaccalc-0.9.7.tar.gz
 hmaccalc-0.9.8.tar.gz
 hmaccalc-0.9.9.tar.gz
 hmaccalc-0.9.10.tar.gz
+hmaccalc-0.9.11.tar.gz


Index: hmaccalc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/hmaccalc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hmaccalc.spec	3 Sep 2009 18:58:46 -0000	1.6
+++ hmaccalc.spec	8 Sep 2009 18:25:03 -0000	1.7
@@ -12,7 +12,7 @@
 	%{nil}
 
 Name:		hmaccalc
-Version:	0.9.10
+Version:	0.9.11
 Release:	1%{?dist}
 Summary:	Tools for computing and checking HMAC values for files
 
@@ -61,6 +61,11 @@ make check
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.11-1
+- error out when we previously skipped a check entry because the value to be
+  checked is the wrong size
+- fix estimation of the expected length for truncated values
+
 * Thu Sep  3 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.10-1
 - refuse to truncate output below half the size of the hash length, or 80
   bits, whichever is higher, in case we get used in a situation where


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Sep 2009 18:58:46 -0000	1.6
+++ sources	8 Sep 2009 18:25:03 -0000	1.7
@@ -1 +1 @@
-7cdafa7876106e2716c2c09b58c86573  hmaccalc-0.9.10.tar.gz
+a2ce45eb54d6202f41d307ecc53a6036  hmaccalc-0.9.11.tar.gz



From emaldonado at fedoraproject.org  Tue Sep  8 18:32:10 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  8 Sep 2009 18:32:10 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.114,1.115
Message-ID: <20090908183210.E8FB111C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23962

Modified Files:
	nss.spec 
Log Message:
Installing shared libraries to %{_libdir}


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- nss.spec	7 Sep 2009 19:19:31 -0000	1.114
+++ nss.spec	8 Sep 2009 18:32:10 -0000	1.115
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -223,14 +223,14 @@ echo "test suite completed"
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
 for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
 do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Install the empty NSS db files
@@ -319,11 +319,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 %files
 %defattr(-,root,root)
-/%{_lib}/libnss3.so
-/%{_lib}/libssl3.so
-/%{_lib}/libsmime3.so
-/%{_lib}/libnssckbi.so
-/%{_lib}/libnsspem.so
+%{_libdir}/libnss3.so
+%{_libdir}/libssl3.so
+%{_libdir}/libsmime3.so
+%{_libdir}/libnssckbi.so
+%{_libdir}/libnsspem.so
 %dir %{_sysconfdir}/pki/nssdb
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
@@ -422,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-6
+- Installing shared libraries to %%{_libdir}
+
 * Mon Sep 07 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
 - Retagging to pick up new sources
 



From ajax at fedoraproject.org  Tue Sep  8 18:38:53 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  8 Sep 2009 18:38:53 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel .cvsignore, 1.7, 1.8 copy-fb.patch,
	1.5, 1.6 dri2-page-flip.patch, 1.2,
	1.3 intel-2.8.0-kms-get-crtc.patch, 1.1, 1.2 sources, 1.8,
	1.9 xorg-x11-drv-intel.spec, 1.27, 1.28
Message-ID: <20090908183853.3342011C0082@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30032

Modified Files:
	.cvsignore copy-fb.patch dri2-page-flip.patch 
	intel-2.8.0-kms-get-crtc.patch sources xorg-x11-drv-intel.spec 
Log Message:
* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-11.20090908
- Today's git snap (driver and tools)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Aug 2009 17:59:30 -0000	1.7
+++ .cvsignore	8 Sep 2009 18:38:52 -0000	1.8
@@ -1,7 +1,2 @@
-xf86-video-intel-2.6.99.902.tar.bz2
-intel-gpu-tools-20090624.tar.bz2
-xf86-video-intel-20090624.tar.bz2
-intel-gpu-tools-20090714.tar.bz2
-xf86-video-intel-20090714.tar.bz2
-xf86-video-intel-2.8.0.tar.bz2
-xf86-video-intel-20090812.tar.bz2
+intel-gpu-tools-20090908.tar.bz2
+xf86-video-intel-20090908.tar.bz2

copy-fb.patch:
 drmmode_display.c |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    1 
 i830_driver.c     |    2 +
 3 files changed, 110 insertions(+), 1 deletion(-)

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- copy-fb.patch	14 Jul 2009 14:15:12 -0000	1.5
+++ copy-fb.patch	8 Sep 2009 18:38:52 -0000	1.6
@@ -1,8 +1,8 @@
-diff -up xf86-video-intel-20090714/src/drmmode_display.c.jx xf86-video-intel-20090714/src/drmmode_display.c
---- xf86-video-intel-20090714/src/drmmode_display.c.jx	2009-07-14 10:10:48.000000000 -0400
-+++ xf86-video-intel-20090714/src/drmmode_display.c	2009-07-14 10:10:58.000000000 -0400
-@@ -31,6 +31,8 @@
- 
+diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
+--- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 14:29:35.000000000 -0400
++++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 14:29:52.000000000 -0400
+@@ -35,6 +35,8 @@
+ #include <unistd.h>
  #include <errno.h>
  
 +#include <sys/ioctl.h>
@@ -10,7 +10,7 @@ diff -up xf86-video-intel-20090714/src/d
  #include "xorgVersion.h"
  
  #include "i830.h"
-@@ -165,7 +167,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
+@@ -314,7 +316,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
  	unsigned int pitch = pScrn->displayWidth * pI830->cpp;
  
  	if (drmmode->fb_id == 0) {
@@ -19,7 +19,7 @@ diff -up xf86-video-intel-20090714/src/d
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,
  				   pitch, pI830->front_buffer->bo->handle,
-@@ -736,6 +738,13 @@ drmmode_output_dpms(xf86OutputPtr output
+@@ -912,6 +914,13 @@ drmmode_output_dpms(xf86OutputPtr output
  	drmmode_ptr drmmode = drmmode_output->drmmode;
  	int i;
  	drmModePropertyPtr props;
@@ -33,7 +33,7 @@ diff -up xf86-video-intel-20090714/src/d
  
  	for (i = 0; i < koutput->count_props; i++) {
  		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -1087,6 +1096,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1363,6 +1372,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
  	if (old_front)
  		i830_free_memory(scrn, old_front);
  
@@ -42,7 +42,7 @@ diff -up xf86-video-intel-20090714/src/d
  	return TRUE;
  
   fail:
-@@ -1146,3 +1157,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
+@@ -1422,3 +1433,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
  
  	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
  }
@@ -141,10 +141,10 @@ diff -up xf86-video-intel-20090714/src/d
 +	(*pScreen->DestroyPixmap)(dst);
 +}
 +
-diff -up xf86-video-intel-20090714/src/i830_driver.c.jx xf86-video-intel-20090714/src/i830_driver.c
---- xf86-video-intel-20090714/src/i830_driver.c.jx	2009-07-13 19:38:34.000000000 -0400
-+++ xf86-video-intel-20090714/src/i830_driver.c	2009-07-14 10:10:58.000000000 -0400
-@@ -3057,6 +3057,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-20090908/src/i830_driver.c.jx xf86-video-intel-20090908/src/i830_driver.c
+--- xf86-video-intel-20090908/src/i830_driver.c.jx	2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830_driver.c	2009-09-08 14:29:52.000000000 -0400
+@@ -3049,6 +3049,8 @@ I830EnterVT(int scrnIndex, int flags)
         /* Clear the framebuffer */
         memset(pI830->FbBase + pScrn->fbOffset, 0,
  	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -153,14 +153,14 @@ diff -up xf86-video-intel-20090714/src/i
     }
  
     if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090714/src/i830.h.jx xf86-video-intel-20090714/src/i830.h
---- xf86-video-intel-20090714/src/i830.h.jx	2009-07-13 19:38:34.000000000 -0400
-+++ xf86-video-intel-20090714/src/i830.h	2009-07-14 10:11:17.000000000 -0400
-@@ -685,6 +685,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
+diff -up xf86-video-intel-20090908/src/i830.h.jx xf86-video-intel-20090908/src/i830.h
+--- xf86-video-intel-20090908/src/i830.h.jx	2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830.h	2009-09-08 14:30:14.000000000 -0400
+@@ -693,6 +693,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
  extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
  extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
  extern int drmmode_output_dpms_status(xf86OutputPtr output);
 +extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
  
- extern Bool i830_crtc_on(xf86CrtcPtr crtc);
- extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);

dri2-page-flip.patch:
 drmmode_display.c |  126 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    6 ++
 i830_dri.c        |   62 ++++++++++++++++++++++++--
 i830_dri.h        |    6 ++
 4 files changed, 194 insertions(+), 6 deletions(-)

Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/dri2-page-flip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dri2-page-flip.patch	12 Aug 2009 17:59:30 -0000	1.2
+++ dri2-page-flip.patch	8 Sep 2009 18:38:52 -0000	1.3
@@ -1,15 +1,15 @@
-diff -up xf86-video-intel-20090812/src/drmmode_display.c.flip xf86-video-intel-20090812/src/drmmode_display.c
---- xf86-video-intel-20090812/src/drmmode_display.c.flip	2009-08-12 10:24:52.000000000 -0400
-+++ xf86-video-intel-20090812/src/drmmode_display.c	2009-08-12 10:30:42.000000000 -0400
-@@ -30,6 +30,7 @@
- #endif
- 
+diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
+--- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 14:32:21.000000000 -0400
++++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 14:32:29.000000000 -0400
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
  #include <errno.h>
 +#include <poll.h>
  
  #include <sys/ioctl.h>
  
-@@ -45,6 +46,11 @@ typedef struct {
+@@ -49,6 +50,11 @@ typedef struct {
      uint32_t fb_id;
      drmModeResPtr mode_res;
      int cpp;
@@ -21,7 +21,7 @@ diff -up xf86-video-intel-20090812/src/d
  } drmmode_rec, *drmmode_ptr;
  
  typedef struct {
-@@ -345,6 +351,7 @@ static PixmapPtr
+@@ -496,6 +502,7 @@ static PixmapPtr
  drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
  {
  	ScrnInfoPtr pScrn = crtc->scrn;
@@ -29,7 +29,7 @@ diff -up xf86-video-intel-20090812/src/d
  	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
  	drmmode_ptr drmmode = drmmode_crtc->drmmode;
  	unsigned long rotate_pitch;
-@@ -377,12 +384,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr c
+@@ -528,12 +535,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr c
  	if (drmmode_crtc->rotate_bo)
  		i830_set_pixmap_bo(rotate_pixmap, drmmode_crtc->rotate_bo);
  
@@ -46,7 +46,7 @@ diff -up xf86-video-intel-20090812/src/d
  	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
  	drmmode_ptr drmmode = drmmode_crtc->drmmode;
  
-@@ -400,6 +411,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr 
+@@ -551,6 +562,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr 
  		dri_bo_unreference(drmmode_crtc->rotate_bo);
  		drmmode_crtc->rotate_bo = NULL;
  	}
@@ -54,7 +54,7 @@ diff -up xf86-video-intel-20090812/src/d
  }
  
  static void
-@@ -1119,15 +1131,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1399,15 +1411,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
  	return FALSE;
  }
  
@@ -167,7 +167,7 @@ diff -up xf86-video-intel-20090812/src/d
  
  	drmmode = xnfalloc(sizeof *drmmode);
  	drmmode->fd = fd;
-@@ -1167,6 +1275,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+@@ -1447,6 +1555,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
  
  	xf86InitialConfiguration(pScrn, TRUE);
  
@@ -190,9 +190,9 @@ diff -up xf86-video-intel-20090812/src/d
  	return TRUE;
  }
  
-diff -up xf86-video-intel-20090812/src/i830_dri.c.flip xf86-video-intel-20090812/src/i830_dri.c
---- xf86-video-intel-20090812/src/i830_dri.c.flip	2009-08-11 14:50:03.000000000 -0400
-+++ xf86-video-intel-20090812/src/i830_dri.c	2009-08-12 10:24:52.000000000 -0400
+diff -up xf86-video-intel-20090908/src/i830_dri.c.jx xf86-video-intel-20090908/src/i830_dri.c
+--- xf86-video-intel-20090908/src/i830_dri.c.jx	2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830_dri.c	2009-09-08 14:32:29.000000000 -0400
 @@ -45,6 +45,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  #include <errno.h>
  #include <unistd.h>
@@ -283,9 +283,9 @@ diff -up xf86-video-intel-20090812/src/i
      info.CopyRegion = I830DRI2CopyRegion;
  
      return DRI2ScreenInit(pScreen, &info);
-diff -up xf86-video-intel-20090812/src/i830_dri.h.flip xf86-video-intel-20090812/src/i830_dri.h
---- xf86-video-intel-20090812/src/i830_dri.h.flip	2009-08-11 14:50:03.000000000 -0400
-+++ xf86-video-intel-20090812/src/i830_dri.h	2009-08-12 10:24:52.000000000 -0400
+diff -up xf86-video-intel-20090908/src/i830_dri.h.jx xf86-video-intel-20090908/src/i830_dri.h
+--- xf86-video-intel-20090908/src/i830_dri.h.jx	2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830_dri.h	2009-09-08 14:32:29.000000000 -0400
 @@ -2,6 +2,7 @@
  #ifndef _I830_DRI_H
  #define _I830_DRI_H
@@ -304,9 +304,9 @@ diff -up xf86-video-intel-20090812/src/i
 +} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 +
  #endif
-diff -up xf86-video-intel-20090812/src/i830.h.flip xf86-video-intel-20090812/src/i830.h
---- xf86-video-intel-20090812/src/i830.h.flip	2009-08-12 10:24:52.000000000 -0400
-+++ xf86-video-intel-20090812/src/i830.h	2009-08-12 10:24:52.000000000 -0400
+diff -up xf86-video-intel-20090908/src/i830.h.jx xf86-video-intel-20090908/src/i830.h
+--- xf86-video-intel-20090908/src/i830.h.jx	2009-09-08 14:32:21.000000000 -0400
++++ xf86-video-intel-20090908/src/i830.h	2009-09-08 14:32:29.000000000 -0400
 @@ -65,6 +65,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
  #include "sarea.h"
  #define _XF86DRI_SERVER_
@@ -339,5 +339,5 @@ diff -up xf86-video-intel-20090812/src/i
 +extern Bool drmmode_do_pageflip(DrawablePtr pDraw, dri_bo *new_front,
 +				dri_bo *old_front, void *data);
  extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
- 
- extern Bool i830_crtc_on(xf86CrtcPtr crtc);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);

intel-2.8.0-kms-get-crtc.patch:
 drmmode_display.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

Index: intel-2.8.0-kms-get-crtc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/intel-2.8.0-kms-get-crtc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- intel-2.8.0-kms-get-crtc.patch	14 Jul 2009 14:15:12 -0000	1.1
+++ intel-2.8.0-kms-get-crtc.patch	8 Sep 2009 18:38:52 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up xf86-video-intel-20090714/src/drmmode_display.c.jx xf86-video-intel-20090714/src/drmmode_display.c
---- xf86-video-intel-20090714/src/drmmode_display.c.jx	2009-07-14 10:13:10.000000000 -0400
-+++ xf86-video-intel-20090714/src/drmmode_display.c	2009-07-14 10:13:28.000000000 -0400
-@@ -923,8 +923,19 @@ drmmode_output_set_property(xf86OutputPt
+diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
+--- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 14:30:55.000000000 -0400
++++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 14:31:09.000000000 -0400
+@@ -1195,8 +1195,19 @@ drmmode_output_get_property(xf86OutputPt
      return TRUE;
  }
  
@@ -20,4 +20,4 @@ diff -up xf86-video-intel-20090714/src/d
 +#endif
  #ifdef RANDR_12_INTERFACE
  	.set_property = drmmode_output_set_property,
- #endif
+ 	.get_property = drmmode_output_get_property,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Aug 2009 17:59:30 -0000	1.8
+++ sources	8 Sep 2009 18:38:52 -0000	1.9
@@ -1,2 +1,2 @@
-9a71381224168221894ec723bf6a98e0  intel-gpu-tools-20090714.tar.bz2
-ddb8d64e005e8ce2f9f2071ccabba86b  xf86-video-intel-20090812.tar.bz2
+d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2
+c400809c9288d9b973849f4f284b799c  xf86-video-intel-20090908.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-drv-intel.spec	8 Sep 2009 18:14:22 -0000	1.27
+++ xorg-x11-drv-intel.spec	8 Sep 2009 18:38:52 -0000	1.28
@@ -2,13 +2,13 @@
 %define legacyver   2.6.0-8
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gputoolsdate 20090714
-%define gitdate 20090812
+%define gputoolsdate 20090908
+%define gitdate 20090908
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   10%{?dist}
+Release:   11.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -30,7 +30,6 @@ Patch21: intel-2.8.0-lvds-first.patch
 
 Patch40: dri2-page-flip.patch
 
-Patch50: intel-2.8.0-shadow-no-offset.patch
 Patch60: uevent.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
@@ -84,7 +83,6 @@ Debugging tools for Intel graphics chips
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch40 -p1 -b .flip
-%patch50 -p1 -b .shadow-no-offset
 %patch60 -p1 -b .uevent
 
 %build
@@ -141,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-11.20090908
+- Today's git snap (driver and tools)
+
 * Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-10
 - kill-svideo.patch: Treat svideo as unknown instead of disconnected.
 



From sandeen at fedoraproject.org  Tue Sep  8 18:46:41 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  8 Sep 2009 18:46:41 +0000 (UTC)
Subject: rpms/fio/devel fio.spec,1.11,1.12
Message-ID: <20090908184641.70BB111C0082@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/fio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv593

Modified Files:
	fio.spec 
Log Message:
* Tue Sep 08 2009 Eric Sandeen <sandeen at redhat.com> 1.33-1
- New upstream version



Index: fio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/fio.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fio.spec	31 Jul 2009 18:26:37 -0000	1.11
+++ fio.spec	8 Sep 2009 18:46:41 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		fio
-Version:	1.32
+Version:	1.33
 Release:	1%{?dist}
 Summary:	Multithreaded IO generation tool
 
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 08 2009 Eric Sandeen <sandeen at redhat.com> 1.33-1
+- New upstream version
+
 * Fri Jul 31 2009 Eric Sandeen <sandeen at redhat.com> 1.32-1
 - New upstream version
 



From wakko666 at fedoraproject.org  Tue Sep  8 18:47:11 2009
From: wakko666 at fedoraproject.org (Brett Lentz)
Date: Tue,  8 Sep 2009 18:47:11 +0000 (UTC)
Subject: rpms/rubygem-pathname2/devel import.log, NONE,
	1.1 ruby_1_8_test_pathname.patch, NONE,
	1.1 rubygem-pathname2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090908184711.EB78511C0082@cvs1.fedora.phx.redhat.com>

Author: wakko666

Update of /cvs/pkgs/rpms/rubygem-pathname2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv774/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ruby_1_8_test_pathname.patch rubygem-pathname2.spec 
Log Message:
import rubygem-pathname2 into devel branch.



--- NEW FILE import.log ---
rubygem-pathname2-1_6_2-6_fc11:HEAD:rubygem-pathname2-1.6.2-6.fc11.src.rpm:1252435600

ruby_1_8_test_pathname.patch:
 test_pathname.rb |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE ruby_1_8_test_pathname.patch ---
--- test_pathname.rb.orig	2009-08-24 10:29:59.000000000 -0700
+++ test_pathname.rb	2009-08-24 10:34:56.411542807 -0700
@@ -6,7 +6,6 @@
 # 'rake test_c' to test the C version.
 ##############################################################################
 require 'rubygems'
-gem 'test-unit'
 
 require 'test/unit'
 require 'pathname2'
@@ -16,12 +15,10 @@
 class MyPathname < Pathname; end
 
 class TC_Pathname < Test::Unit::TestCase
-   def self.startup
+   def setup
       Dir.chdir(File.expand_path(File.dirname(__FILE__)))
       @@pwd = Dir.pwd
-   end
 
-   def setup
       @abs_path = Pathname.new('/usr/local/bin')
       @rel_path = Pathname.new('usr/local/bin')
       @trl_path = Pathname.new('/usr/local/bin/')
@@ -95,7 +92,7 @@
       case CONFIG['host_os']
          when /linux/i
             path1 = '/dev/stdin'
-            assert_equal('/dev/pts/0', Pathname.new(path1).realpath)
+            assert_equal('/dev/proc/self/fd/0', Pathname.new(path1).realpath)
          when /sunos|solaris/i
             path1 = '/dev/null'
             path2 = '/dev/stdin'


--- NEW FILE rubygem-pathname2.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname    pathname2
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Version:        1.6.2
Release:        6%{?dist}
Summary:        An alternate implementation for the Pathname library

Group:          Development/Languages
License:        Artistic 2.0
URL:            http://raa.ruby-lang.org/project/pathname2/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

Patch0:        ruby_1_8_test_pathname.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: rubygem(facade)
BuildRequires: rubygem(rake)
BuildRequires: rubygems
BuildRequires: ruby(abi) = 1.8

Requires:      rubygem(facade)
Requires:      rubygems
Requires:      ruby(abi) = 1.8

Provides:      rubygem(%{gemname}) = %{version}

%description
An alternate implementation for the Pathname library. This version treats a
 path name as a String, though with certain methods overloaded.

%prep
%setup -q -c -T

%{__mkdir_p} .%{gemdir}
gem install --local --install-dir=.%{gemdir} \
   --force --rdoc %{SOURCE0}

pushd .%{geminstdir}/test
%patch0 -p0
popd

%build

%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{gemdir}
%{__cp} -a .%{gemdir}/* %{buildroot}%{gemdir}/

%check
ruby -I$(pwd)%{geminstdir}/lib $(pwd)%{geminstdir}/test/test_pathname.rb

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %{geminstdir}
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/CHANGES
%doc %{geminstdir}/MANIFEST
%doc %{geminstdir}/README
%{gemdir}/cache/%{gemname}-%{version}.gem
%{geminstdir}/benchmarks
%{geminstdir}/examples
%{geminstdir}/lib
%{geminstdir}/test
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Tue Sep 08 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-6
- change defines to globals.

* Mon Aug 24 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-5
- change install method to allow use of patch macro.
- remove period at the end of summary.

* Mon Aug 24 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-4
- Add check section for running tests.
- Simplify a few things in the files section. 
- Add patch for running tests on ruby 1.8

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-3
- Fix a few more spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518083

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-2
- Fix a few spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518083

* Tue Aug 18 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-1
- First packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-pathname2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:17:12 -0000	1.1
+++ .cvsignore	8 Sep 2009 18:47:11 -0000	1.2
@@ -0,0 +1 @@
+pathname2-1.6.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-pathname2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:17:12 -0000	1.1
+++ sources	8 Sep 2009 18:47:11 -0000	1.2
@@ -0,0 +1 @@
+45e748f579456cfb76aa9f53fb6fb03b  pathname2-1.6.2.gem



From wakko666 at fedoraproject.org  Tue Sep  8 18:48:14 2009
From: wakko666 at fedoraproject.org (Brett Lentz)
Date: Tue,  8 Sep 2009 18:48:14 +0000 (UTC)
Subject: rpms/rubygem-pathname2/F-12 import.log, NONE,
	1.1 ruby_1_8_test_pathname.patch, NONE,
	1.1 rubygem-pathname2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090908184814.3DD1911C0082@cvs1.fedora.phx.redhat.com>

Author: wakko666

Update of /cvs/pkgs/rpms/rubygem-pathname2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1362/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ruby_1_8_test_pathname.patch rubygem-pathname2.spec 
Log Message:
import rubygem-pathname2 into F-12 branch.



--- NEW FILE import.log ---
rubygem-pathname2-1_6_2-6_fc11:F-12:rubygem-pathname2-1.6.2-6.fc11.src.rpm:1252435671

ruby_1_8_test_pathname.patch:
 test_pathname.rb |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE ruby_1_8_test_pathname.patch ---
--- test_pathname.rb.orig	2009-08-24 10:29:59.000000000 -0700
+++ test_pathname.rb	2009-08-24 10:34:56.411542807 -0700
@@ -6,7 +6,6 @@
 # 'rake test_c' to test the C version.
 ##############################################################################
 require 'rubygems'
-gem 'test-unit'
 
 require 'test/unit'
 require 'pathname2'
@@ -16,12 +15,10 @@
 class MyPathname < Pathname; end
 
 class TC_Pathname < Test::Unit::TestCase
-   def self.startup
+   def setup
       Dir.chdir(File.expand_path(File.dirname(__FILE__)))
       @@pwd = Dir.pwd
-   end
 
-   def setup
       @abs_path = Pathname.new('/usr/local/bin')
       @rel_path = Pathname.new('usr/local/bin')
       @trl_path = Pathname.new('/usr/local/bin/')
@@ -95,7 +92,7 @@
       case CONFIG['host_os']
          when /linux/i
             path1 = '/dev/stdin'
-            assert_equal('/dev/pts/0', Pathname.new(path1).realpath)
+            assert_equal('/dev/proc/self/fd/0', Pathname.new(path1).realpath)
          when /sunos|solaris/i
             path1 = '/dev/null'
             path2 = '/dev/stdin'


--- NEW FILE rubygem-pathname2.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname    pathname2
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Version:        1.6.2
Release:        6%{?dist}
Summary:        An alternate implementation for the Pathname library

Group:          Development/Languages
License:        Artistic 2.0
URL:            http://raa.ruby-lang.org/project/pathname2/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

Patch0:        ruby_1_8_test_pathname.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: rubygem(facade)
BuildRequires: rubygem(rake)
BuildRequires: rubygems
BuildRequires: ruby(abi) = 1.8

Requires:      rubygem(facade)
Requires:      rubygems
Requires:      ruby(abi) = 1.8

Provides:      rubygem(%{gemname}) = %{version}

%description
An alternate implementation for the Pathname library. This version treats a
 path name as a String, though with certain methods overloaded.

%prep
%setup -q -c -T

%{__mkdir_p} .%{gemdir}
gem install --local --install-dir=.%{gemdir} \
   --force --rdoc %{SOURCE0}

pushd .%{geminstdir}/test
%patch0 -p0
popd

%build

%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{gemdir}
%{__cp} -a .%{gemdir}/* %{buildroot}%{gemdir}/

%check
ruby -I$(pwd)%{geminstdir}/lib $(pwd)%{geminstdir}/test/test_pathname.rb

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %{geminstdir}
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/CHANGES
%doc %{geminstdir}/MANIFEST
%doc %{geminstdir}/README
%{gemdir}/cache/%{gemname}-%{version}.gem
%{geminstdir}/benchmarks
%{geminstdir}/examples
%{geminstdir}/lib
%{geminstdir}/test
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Tue Sep 08 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-6
- change defines to globals.

* Mon Aug 24 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-5
- change install method to allow use of patch macro.
- remove period at the end of summary.

* Mon Aug 24 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-4
- Add check section for running tests.
- Simplify a few things in the files section. 
- Add patch for running tests on ruby 1.8

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-3
- Fix a few more spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518083

* Thu Aug 20 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-2
- Fix a few spec file issues, as noted in https://bugzilla.redhat.com/show_bug.cgi?id=518083

* Tue Aug 18 2009 Brett Lentz <wakko666 at gmail.com> - 1.6.2-1
- First packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-pathname2/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:17:12 -0000	1.1
+++ .cvsignore	8 Sep 2009 18:48:13 -0000	1.2
@@ -0,0 +1 @@
+pathname2-1.6.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-pathname2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 02:17:12 -0000	1.1
+++ sources	8 Sep 2009 18:48:14 -0000	1.2
@@ -0,0 +1 @@
+45e748f579456cfb76aa9f53fb6fb03b  pathname2-1.6.2.gem



From sandeen at fedoraproject.org  Tue Sep  8 18:49:03 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  8 Sep 2009 18:49:03 +0000 (UTC)
Subject: rpms/fio/devel .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <20090908184903.CCA2911C0082@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/fio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1846

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 08 2009 Eric Sandeen <sandeen at redhat.com> 1.33-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	31 Jul 2009 18:26:37 -0000	1.10
+++ .cvsignore	8 Sep 2009 18:49:03 -0000	1.11
@@ -1 +1 @@
-fio-1.32.tar.bz2
+fio-1.33.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 Jul 2009 18:26:37 -0000	1.10
+++ sources	8 Sep 2009 18:49:03 -0000	1.11
@@ -1 +1 @@
-59ae314ab7662b13bc00c7d6c9557ac7  fio-1.32.tar.bz2
+6bf08836712a5de0dcd2815e45dd4b77  fio-1.33.tar.bz2



From pgordon at fedoraproject.org  Tue Sep  8 18:54:50 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue,  8 Sep 2009 18:54:50 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.34,
	1.35 epiphany-extensions.spec, 1.67, 1.68 sources, 1.34, 1.35
Message-ID: <20090908185450.4C42011C0082@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3895

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.27.92 (Yay - adblock works again!)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	25 Aug 2009 21:01:45 -0000	1.34
+++ .cvsignore	8 Sep 2009 18:54:50 -0000	1.35
@@ -1 +1 @@
-epiphany-extensions-2.27.91.tar.bz2
+epiphany-extensions-2.27.92.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- epiphany-extensions.spec	25 Aug 2009 21:01:45 -0000	1.67
+++ epiphany-extensions.spec	8 Sep 2009 18:54:50 -0000	1.68
@@ -1,9 +1,9 @@
 %global ephy_major          2.27
 %global ephy_api_version    2.27
-%global ephy_min_version    %{ephy_major}.0
+%global ephy_min_version    %{ephy_major}.4
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.91
+Version:        %{ephy_major}.92
 Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
@@ -92,6 +92,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Tue Sep 08 2009 Peter Gordon <peter at thecodergeek.com> - 2.27.92-1
+- Update to new upstream release (2.27.92): Re-enables adblock functionality. (Yay!)
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	25 Aug 2009 21:01:45 -0000	1.34
+++ sources	8 Sep 2009 18:54:50 -0000	1.35
@@ -1 +1 @@
-ba436ba0ef9df7698e537f52ec2f3b80  epiphany-extensions-2.27.91.tar.bz2
+72ae15405b6a96de3f05426bb27e69d5  epiphany-extensions-2.27.92.tar.bz2



From karsten at fedoraproject.org  Tue Sep  8 19:02:17 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  8 Sep 2009 19:02:17 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkitgtk.spec,1.19,1.20
Message-ID: <20090908190217.9710911C0082@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5737

Modified Files:
	webkitgtk.spec 
Log Message:
- bump release and rebuild as the package was linked with an old libicu
  during the mass rebuild on s390x



Index: webkitgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- webkitgtk.spec	8 Sep 2009 02:32:22 -0000	1.19
+++ webkitgtk.spec	8 Sep 2009 19:02:17 -0000	1.20
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -188,6 +188,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.1.14-2
+- bump release and rebuild as the package was linked with an old libicu
+  during the mass rebuild on s390x
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.14-1
 - Update to 1.1.14
 



From nalin at fedoraproject.org  Tue Sep  8 19:08:28 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  8 Sep 2009 19:08:28 +0000 (UTC)
Subject: rpms/krb5/devel kadmind.init, 1.16, 1.17 kpropd.init, 1.7,
	1.8 krb5.spec, 1.210, 1.211 krb5kdc.init, 1.12, 1.13
Message-ID: <20090908190828.E5DF311C0082@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7098

Modified Files:
	kadmind.init kpropd.init krb5.spec krb5kdc.init 
Log Message:
- if the init script fails to start krb5kdc/kadmind/kpropd because it's already
  running (according to status()), return 0 (part of #521772)



Index: kadmind.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kadmind.init	20 Apr 2009 20:33:32 -0000	1.16
+++ kadmind.init	8 Sep 2009 19:08:28 -0000	1.17
@@ -56,6 +56,11 @@ start() {
 	daemon ${kadmind} ${KRB5REALM:+-r ${KRB5REALM}} $KADMIND_ARGS
 	RETVAL=$?
 	echo
+	if test $RETVAL -ne 0 ; then
+	    if status ${kadmind} > /dev/null ; then
+		RETVAL=0
+	    fi
+	fi
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/kadmin
 }
 stop() {


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kpropd.init	20 Apr 2009 20:33:32 -0000	1.7
+++ kpropd.init	8 Sep 2009 19:08:28 -0000	1.8
@@ -38,6 +38,11 @@ start() {
 	daemon ${kpropd} -S
 	RETVAL=$?
 	echo
+	if test $RETVAL -ne 0 ; then
+	    if status ${kpropd} > /dev/null ; then
+		RETVAL=0
+	    fi
+	fi
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/kprop
 }
 stop() {


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- krb5.spec	24 Aug 2009 15:51:36 -0000	1.210
+++ krb5.spec	8 Sep 2009 19:08:28 -0000	1.211
@@ -208,6 +208,10 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com>
+- if the init script fails to start krb5kdc/kadmind/kpropd because it's already
+  running (according to status()), return 0 (part of #521772)
+
 * Mon Aug 24 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-7
 - work around a compile problem with new openssl
 


Index: krb5kdc.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5kdc.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- krb5kdc.init	20 Apr 2009 20:33:32 -0000	1.12
+++ krb5kdc.init	8 Sep 2009 19:08:28 -0000	1.13
@@ -41,6 +41,11 @@ start() {
 	daemon ${krb5kdc} ${KRB5REALM:+-r ${KRB5REALM}} $KRB5KDC_ARGS
 	RETVAL=$?
 	echo
+	if test $RETVAL -ne 0 ; then
+	    if status ${krb5kdc} > /dev/null ; then
+		RETVAL=0
+	    fi
+	fi
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/krb5kdc
 }
 stop() {



From nkinder at fedoraproject.org  Tue Sep  8 19:24:58 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Tue,  8 Sep 2009 19:24:58 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 389-ds-base.spec,1.4,1.5
Message-ID: <20090908192458.8213D11C0082@cvs1.fedora.phx.redhat.com>

Author: nkinder

Update of /cvs/extras/rpms/389-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11453/F-10

Modified Files:
	389-ds-base.spec 
Log Message:
Removed BuildRequires for lm_sensors on s390 and s390x


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base.spec	25 Aug 2009 20:00:51 -0000	1.4
+++ 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -23,7 +23,7 @@ BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
-%ifnarch sparc sparc64 ppc ppc64
+%ifnarch sparc sparc64 ppc ppc64 s390 s390x
 BuildRequires:    lm_sensors-devel
 %endif
 BuildRequires:    bzip2-devel
@@ -213,6 +213,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-2
+- removed BuildRequires for lm_sensors on s390 and s390x
+
 * Thu Aug 20 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.2-1
 - backed out - added template-initconfig to %files - this change is for the next major release
 - bump version to 1.2.2



From nkinder at fedoraproject.org  Tue Sep  8 19:24:58 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Tue,  8 Sep 2009 19:24:58 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 389-ds-base.spec,1.4,1.5
Message-ID: <20090908192458.B817011C0082@cvs1.fedora.phx.redhat.com>

Author: nkinder

Update of /cvs/extras/rpms/389-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11453/F-11

Modified Files:
	389-ds-base.spec 
Log Message:
Removed BuildRequires for lm_sensors on s390 and s390x


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base.spec	25 Aug 2009 20:00:51 -0000	1.4
+++ 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -23,7 +23,7 @@ BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
-%ifnarch sparc sparc64 ppc ppc64
+%ifnarch sparc sparc64 ppc ppc64 s390 s390x
 BuildRequires:    lm_sensors-devel
 %endif
 BuildRequires:    bzip2-devel
@@ -213,6 +213,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-2
+- removed BuildRequires for lm_sensors on s390 and s390x
+
 * Thu Aug 20 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.2-1
 - backed out - added template-initconfig to %files - this change is for the next major release
 - bump version to 1.2.2



From nkinder at fedoraproject.org  Tue Sep  8 19:24:58 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Tue,  8 Sep 2009 19:24:58 +0000 (UTC)
Subject: rpms/389-ds-base/devel 389-ds-base.spec,1.7,1.8
Message-ID: <20090908192458.DF20D11C0082@cvs1.fedora.phx.redhat.com>

Author: nkinder

Update of /cvs/extras/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11453/devel

Modified Files:
	389-ds-base.spec 
Log Message:
Removed BuildRequires for lm_sensors on s390 and s390x


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-ds-base.spec	1 Sep 2009 11:24:53 -0000	1.7
+++ 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -23,7 +23,7 @@ BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
-%ifnarch sparc sparc64 ppc ppc64
+%ifnarch sparc sparc64 ppc ppc64 s390 s390x
 BuildRequires:    lm_sensors-devel
 %endif
 BuildRequires:    bzip2-devel
@@ -173,6 +173,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-3
+- removed BuildRequires for lm_sensors on s390 and s390x
+
 * Tue Sep 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1.2.2-2
 - rebuild with new openssl to fix dependencies
 



From mclasen at fedoraproject.org  Tue Sep  8 19:27:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 19:27:33 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.88, 1.89 eog.spec, 1.151, 1.152 sources,
	1.88, 1.89
Message-ID: <20090908192733.CE22211C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12416

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore	25 Aug 2009 02:43:17 -0000	1.88
+++ .cvsignore	8 Sep 2009 19:27:33 -0000	1.89
@@ -1 +1 @@
-eog-2.27.91.tar.bz2
+eog-2.27.92.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- eog.spec	25 Aug 2009 02:43:17 -0000	1.151
+++ eog.spec	8 Sep 2009 19:27:33 -0000	1.152
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.27/%{name}-%{version}.tar.bz2
@@ -170,6 +170,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	25 Aug 2009 02:43:17 -0000	1.88
+++ sources	8 Sep 2009 19:27:33 -0000	1.89
@@ -1 +1 @@
-b23c7b143ab2599834a184886ba24483  eog-2.27.91.tar.bz2
+2fc072e451d7c46127feb44589671a5a  eog-2.27.92.tar.bz2



From pwouters at fedoraproject.org  Tue Sep  8 19:28:16 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 19:28:16 +0000 (UTC)
Subject: rpms/dnssec-conf/F-10 pr.conf,NONE,1.1
Message-ID: <20090908192816.BBA4B11C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13271/F-10

Added Files:
	pr.conf 
Log Message:
Added new key for PR



--- NEW FILE pr.conf ---
//; http://dnssec.nic.pr/keys/nic.pr.zip

trusted-keys {
"pr." 257 3 5 "AwEAAeDPv9lQ7Ej5Ld9Fz/FKLhdOajwtEXsWykj65ugIa4Di1nY6ti9ndkeR4kp1aSNlvf6N7KsjunfMJj4SccBwcY77DrxmQ+g9nI09ePMZvxF2U63Lv9BftGaIguYdkYZVSwHd1q7DdXqNkLaD4tZEHiN0h/3wBdTQUPH1IoskD1vGxiPw2egftk6sVQdvOJWaAgSpmG0eq+/e90WVTNX4/xhA17PrdQQJIheZQ3+EsDoil8kyJZC12KoHYpFklx7+aCiR2u8Fumy6ARFR4PP0n7bnBaKOgMpVzz+KI79a3USDkj9RhNog50iSWgaBM75Xu0IBNEpcCVYZYjwDESgiDXc="; // key id = 6277
};




From pwouters at fedoraproject.org  Tue Sep  8 19:28:17 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 19:28:17 +0000 (UTC)
Subject: rpms/dnssec-conf/F-11 pr.conf,NONE,1.1
Message-ID: <20090908192817.1103C11C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13271/F-11

Added Files:
	pr.conf 
Log Message:
Added new key for PR



--- NEW FILE pr.conf ---
//; http://dnssec.nic.pr/keys/nic.pr.zip

trusted-keys {
"pr." 257 3 5 "AwEAAeDPv9lQ7Ej5Ld9Fz/FKLhdOajwtEXsWykj65ugIa4Di1nY6ti9ndkeR4kp1aSNlvf6N7KsjunfMJj4SccBwcY77DrxmQ+g9nI09ePMZvxF2U63Lv9BftGaIguYdkYZVSwHd1q7DdXqNkLaD4tZEHiN0h/3wBdTQUPH1IoskD1vGxiPw2egftk6sVQdvOJWaAgSpmG0eq+/e90WVTNX4/xhA17PrdQQJIheZQ3+EsDoil8kyJZC12KoHYpFklx7+aCiR2u8Fumy6ARFR4PP0n7bnBaKOgMpVzz+KI79a3USDkj9RhNog50iSWgaBM75Xu0IBNEpcCVYZYjwDESgiDXc="; // key id = 6277
};




From pwouters at fedoraproject.org  Tue Sep  8 19:29:06 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 19:29:06 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 pr.conf,NONE,1.1
Message-ID: <20090908192906.3268211C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14109/EL-5

Added Files:
	pr.conf 
Log Message:
Added pr key.



--- NEW FILE pr.conf ---
//; http://dnssec.nic.pr/keys/nic.pr.zip

trusted-keys {
"pr." 257 3 5 "AwEAAeDPv9lQ7Ej5Ld9Fz/FKLhdOajwtEXsWykj65ugIa4Di1nY6ti9ndkeR4kp1aSNlvf6N7KsjunfMJj4SccBwcY77DrxmQ+g9nI09ePMZvxF2U63Lv9BftGaIguYdkYZVSwHd1q7DdXqNkLaD4tZEHiN0h/3wBdTQUPH1IoskD1vGxiPw2egftk6sVQdvOJWaAgSpmG0eq+/e90WVTNX4/xhA17PrdQQJIheZQ3+EsDoil8kyJZC12KoHYpFklx7+aCiR2u8Fumy6ARFR4PP0n7bnBaKOgMpVzz+KI79a3USDkj9RhNog50iSWgaBM75Xu0IBNEpcCVYZYjwDESgiDXc="; // key id = 6277
};




From mclasen at fedoraproject.org  Tue Sep  8 19:32:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 19:32:02 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.86, 1.87 epiphany.spec, 1.242,
	1.243 sources, 1.89, 1.90
Message-ID: <20090908193202.A795F11C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14693

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	25 Aug 2009 04:27:18 -0000	1.86
+++ .cvsignore	8 Sep 2009 19:32:02 -0000	1.87
@@ -1 +1 @@
-epiphany-2.27.91.tar.bz2
+epiphany-2.27.92.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- epiphany.spec	25 Aug 2009 04:43:00 -0000	1.242
+++ epiphany.spec	8 Sep 2009 19:32:02 -0000	1.243
@@ -7,7 +7,7 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
@@ -47,6 +47,7 @@ BuildRequires: NetworkManager-devel
 BuildRequires: pygtk2-devel, gnome-python2-devel
 BuildRequires: libnotify-devel
 BuildRequires: libsoup-devel
+BuildRequires: nss-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
@@ -244,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	25 Aug 2009 04:27:19 -0000	1.89
+++ sources	8 Sep 2009 19:32:02 -0000	1.90
@@ -1 +1 @@
-3d275ded5c0626fac0b53ef7cfb20663  epiphany-2.27.91.tar.bz2
+abb1d7171c9910cf722360674bfaf3bf  epiphany-2.27.92.tar.bz2



From pwouters at fedoraproject.org  Tue Sep  8 19:32:32 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 19:32:32 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec,1.4,1.5
Message-ID: <20090908193232.0A64411C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14801/EL-5

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> 
-New key for .pr



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/dnssec-conf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dnssec-conf.spec	15 Jun 2009 00:25:41 -0000	1.4
+++ dnssec-conf.spec	8 Sep 2009 19:32:31 -0000	1.5
@@ -33,6 +33,7 @@ make 
 rm -rf ${RPM_BUILD_ROOT}
 make PREFIX=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} ETCDIR=${RPM_BUILD_ROOT}/etc install
 install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec
+cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/pki/dnssec-keys/production/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}



From pwouters at fedoraproject.org  Tue Sep  8 19:32:32 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 19:32:32 +0000 (UTC)
Subject: rpms/dnssec-conf/F-10 dnssec-conf.spec,1.7,1.8
Message-ID: <20090908193232.464EE11C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14801/F-10

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> 
-New key for .pr



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-10/dnssec-conf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dnssec-conf.spec	15 Jun 2009 00:47:19 -0000	1.7
+++ dnssec-conf.spec	8 Sep 2009 19:32:32 -0000	1.8
@@ -1,10 +1,11 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
-Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source1: pr.conf
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -34,6 +35,8 @@ rm -rf ${RPM_BUILD_ROOT}
 make PREFIX=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} ETCDIR=${RPM_BUILD_ROOT}/etc install
 install -d 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig
 install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec
+cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/pki/dnssec-keys/production/
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -54,6 +57,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-2
+-New key for .pr.
+
 * Sun Jun 14 2009 Paul Wouters <paul at xelerance.com> - 1.21-1
 - upgraded to 1.21
 



From pwouters at fedoraproject.org  Tue Sep  8 19:32:32 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 19:32:32 +0000 (UTC)
Subject: rpms/dnssec-conf/F-11 dnssec-conf.spec,1.14,1.15
Message-ID: <20090908193232.6F1BF11C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14801/F-11

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> 
-New key for .pr



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-11/dnssec-conf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dnssec-conf.spec	15 Jun 2009 00:44:16 -0000	1.14
+++ dnssec-conf.spec	8 Sep 2009 19:32:32 -0000	1.15
@@ -1,10 +1,11 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
-Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source1: pr.conf
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -34,6 +35,7 @@ rm -rf ${RPM_BUILD_ROOT}
 make PREFIX=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} ETCDIR=${RPM_BUILD_ROOT}/etc install
 install -d 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig
 install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec
+cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/pki/dnssec-keys/production/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -54,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-2
+-New key for .pr.
+
 * Sun Jun 14 2009 Paul Wouters <paul at xelerance.com> - 1.21-1
 - upgraded to 1.21
 



From mclasen at fedoraproject.org  Tue Sep  8 19:35:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 19:35:23 +0000 (UTC)
Subject: rpms/bug-buddy/devel .cvsignore, 1.50, 1.51 bug-buddy.spec, 1.128, 
	1.129 sources, 1.50, 1.51
Message-ID: <20090908193523.C0F7511C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/bug-buddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15681

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	16 May 2009 05:38:43 -0000	1.50
+++ .cvsignore	8 Sep 2009 19:35:23 -0000	1.51
@@ -1 +1 @@
-bug-buddy-2.27.1.tar.bz2
+bug-buddy-2.27.92.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- bug-buddy.spec	24 Jul 2009 18:28:38 -0000	1.128
+++ bug-buddy.spec	8 Sep 2009 19:35:23 -0000	1.129
@@ -5,8 +5,8 @@
 %define gconf_version 2.14
 
 Name: bug-buddy
-Version: 2.27.1
-Release: 4%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 Epoch: 1
 Summary: Crash reporting utility for the GNOME desktop
 License: GPLv2 and BSD
@@ -145,6 +145,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.92-1
+- Update to 2.27.92
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.27.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	16 May 2009 05:38:43 -0000	1.50
+++ sources	8 Sep 2009 19:35:23 -0000	1.51
@@ -1 +1 @@
-8d25ed28439daf64f8b8807ddf3529e9  bug-buddy-2.27.1.tar.bz2
+b5c1865c57146e8b775312136f82507f  bug-buddy-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 19:38:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 19:38:24 +0000 (UTC)
Subject: rpms/alacarte/devel .cvsignore, 1.17, 1.18 alacarte.spec, 1.56,
	1.57 sources, 1.17, 1.18
Message-ID: <20090908193824.CEA1511C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16564

Modified Files:
	.cvsignore alacarte.spec sources 
Log Message:
0.12.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 May 2009 04:52:47 -0000	1.17
+++ .cvsignore	8 Sep 2009 19:38:24 -0000	1.18
@@ -1 +1 @@
-alacarte-0.12.1.tar.bz2
+alacarte-0.12.3.tar.bz2


Index: alacarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- alacarte.spec	24 Jul 2009 16:40:49 -0000	1.56
+++ alacarte.spec	8 Sep 2009 19:38:24 -0000	1.57
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           alacarte
-Version:        0.12.1
-Release:        2%{?dist}
+Version:        0.12.3
+Release:        1%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -79,6 +79,9 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-1
+- Update to 0.12.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 May 2009 04:52:47 -0000	1.17
+++ sources	8 Sep 2009 19:38:24 -0000	1.18
@@ -1 +1 @@
-c6d77f7e5ee6129532e4bb1a35a07194  alacarte-0.12.1.tar.bz2
+1352da31dfe8cf51d4b4065ef6ca461d  alacarte-0.12.3.tar.bz2



From s4504kr at fedoraproject.org  Tue Sep  8 19:50:06 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  8 Sep 2009 19:50:06 +0000 (UTC)
Subject: rpms/blender/F-11 blender-repack.sh, 1.1, 1.2 blender.spec, 1.114, 
	1.115 sources, 1.24, 1.25
Message-ID: <20090908195006.D8D3511C043A@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19299

Modified Files:
	blender-repack.sh blender.spec sources 
Log Message:
New upstream release


Index: blender-repack.sh
===================================================================
RCS file: /cvs/extras/rpms/blender/F-11/blender-repack.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blender-repack.sh	19 Jun 2009 14:32:08 -0000	1.1
+++ blender-repack.sh	8 Sep 2009 19:50:06 -0000	1.2
@@ -12,7 +12,7 @@ cleanup() {
 
 unset CDPATH
 pwd=$(pwd)
-BVERSION=2.49a
+BVERSION=2.49b
 
 pushd "$tmp"
 if [ -e $pwd/blender-${BVERSION}.tar.gz ] ; then
@@ -24,7 +24,7 @@ pushd extern
 #Removed because of ip
   rm -rf ffmpeg libmp3lame x264 xvidcore
 #Removed because we can expect to use system one
-  rm -rf fftw glew libopenjpeg ode qhull make verse
+#  rm -rf fftw glew libopenjpeg ode qhull make verse
 #Will have to be removed later: bFTGL
 popd
 rm -rf scons


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-11/blender.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- blender.spec	6 Jul 2009 19:49:53 -0000	1.114
+++ blender.spec	8 Sep 2009 19:50:06 -0000	1.115
@@ -4,8 +4,8 @@
 %global fontname blender
 
 Name:           blender
-Version:        2.49a
-Release: 	2%{?dist}
+Version:        2.49b
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -80,8 +80,6 @@ Requires:	  dejavu-fonts
 Provides:	  blender-fonts = %{version}-%{release}
 Obsoletes:	  blender-fonts <= 2.48a-9
 
-
-
 %description
 Blender is the essential software solution you need for 3D, from modeling,
 animation, rendering and post-production to interactive creation and playback.
@@ -110,6 +108,19 @@ Blender Game Engine.
 %patch100 -p1
 %patch101 -p1
 
+# binreloc is not a part of fedora
+rm -rf extern/ffmpeg
+rm -rf extern/fftw
+rm -rf extern/glew
+rm -rf extern/libmp3lame
+rm -rf extern/libopenjpeg
+rm -rf extern/libredcode
+rm -rf extern/ode
+rm -rf extern/x264
+rm -rf extern/xvidcore
+rm -rf extern/qhull
+rm -rf extern/make
+rm -rf extern/verse
 
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -233,6 +244,21 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Sep  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-1
+- New upstream release (#520780)
+
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-6
+- Build again new freealut relase (openalut-soft)
+
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-5
+- Revoke using of system FTGL library
+
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
+- Rebuild for python-2.6.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 kwizart < kwizart at gmail.com > - 2.49a-2
 - Fix perm on blend2renderinfo.py - raised by #506957
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	19 Jun 2009 14:32:08 -0000	1.24
+++ sources	8 Sep 2009 19:50:06 -0000	1.25
@@ -1 +1 @@
-827f8faeb622b758e01920fabd115598  blender-2.49a-repack.tar.bz2
+8537ec34afbd72ea517843efdc4b0cae  blender-2.49b-repack.tar.bz2



From s4504kr at fedoraproject.org  Tue Sep  8 19:52:27 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  8 Sep 2009 19:52:27 +0000 (UTC)
Subject: rpms/blender/F-10 blender-repack.sh, 1.1, 1.2 blender.spec, 1.98,
	1.99 sources, 1.23, 1.24
Message-ID: <20090908195227.46AE811C0082@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20729

Modified Files:
	blender-repack.sh blender.spec sources 
Log Message:
New upstream release


Index: blender-repack.sh
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender-repack.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blender-repack.sh	19 Jun 2009 14:37:50 -0000	1.1
+++ blender-repack.sh	8 Sep 2009 19:52:26 -0000	1.2
@@ -12,7 +12,7 @@ cleanup() {
 
 unset CDPATH
 pwd=$(pwd)
-BVERSION=2.49a
+BVERSION=2.49b
 
 pushd "$tmp"
 if [ -e $pwd/blender-${BVERSION}.tar.gz ] ; then
@@ -24,7 +24,7 @@ pushd extern
 #Removed because of ip
   rm -rf ffmpeg libmp3lame x264 xvidcore
 #Removed because we can expect to use system one
-  rm -rf fftw glew libopenjpeg ode qhull make verse
+#  rm -rf fftw glew libopenjpeg ode qhull make verse
 #Will have to be removed later: bFTGL
 popd
 rm -rf scons


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- blender.spec	6 Jul 2009 19:49:53 -0000	1.98
+++ blender.spec	8 Sep 2009 19:52:27 -0000	1.99
@@ -4,8 +4,8 @@
 %global fontname blender
 
 Name:           blender
-Version:        2.49a
-Release: 	2%{?dist}
+Version:        2.49b
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -80,8 +80,6 @@ Requires:	  dejavu-fonts
 Provides:	  blender-fonts = %{version}-%{release}
 Obsoletes:	  blender-fonts <= 2.48a-9
 
-
-
 %description
 Blender is the essential software solution you need for 3D, from modeling,
 animation, rendering and post-production to interactive creation and playback.
@@ -110,6 +108,19 @@ Blender Game Engine.
 %patch100 -p1
 %patch101 -p1
 
+# binreloc is not a part of fedora
+rm -rf extern/ffmpeg
+rm -rf extern/fftw
+rm -rf extern/glew
+rm -rf extern/libmp3lame
+rm -rf extern/libopenjpeg
+rm -rf extern/libredcode
+rm -rf extern/ode
+rm -rf extern/x264
+rm -rf extern/xvidcore
+rm -rf extern/qhull
+rm -rf extern/make
+rm -rf extern/verse
 
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -233,6 +244,21 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Sep  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-1
+- New upstream release (#520780)
+
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-6
+- Build again new freealut relase (openalut-soft)
+
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-5
+- Revoke using of system FTGL library
+
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
+- Rebuild for python-2.6.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 kwizart < kwizart at gmail.com > - 2.49a-2
 - Fix perm on blend2renderinfo.py - raised by #506957
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	19 Jun 2009 14:37:53 -0000	1.23
+++ sources	8 Sep 2009 19:52:27 -0000	1.24
@@ -1 +1 @@
-827f8faeb622b758e01920fabd115598  blender-2.49a-repack.tar.bz2
+8537ec34afbd72ea517843efdc4b0cae  blender-2.49b-repack.tar.bz2



From simo at fedoraproject.org  Tue Sep  8 20:04:31 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue,  8 Sep 2009 20:04:31 +0000 (UTC)
Subject: rpms/libtalloc/devel .cvsignore, 1.3, 1.4 libtalloc.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090908200431.B811211C0082@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtalloc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24596

Modified Files:
	.cvsignore libtalloc.spec sources 
Log Message:
* Tue Sep  8 2009 Simo Sorce <ssorce at redhat.com> - 2.0.0-0
- New version from upstream.
- Build also sover 1 compat library to ease packages migration



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jun 2009 18:36:02 -0000	1.3
+++ .cvsignore	8 Sep 2009 20:04:31 -0000	1.4
@@ -1 +1 @@
-talloc-1.3.1.tar.gz
+talloc-2.0.0.tar.gz


Index: libtalloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/libtalloc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libtalloc.spec	25 Jul 2009 08:43:38 -0000	1.4
+++ libtalloc.spec	8 Sep 2009 20:04:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name: libtalloc
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 2.0.0
+Release: 0%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
 License: LGPLv3+
@@ -28,7 +28,7 @@ Header files needed to develop programs 
 
 %build
 ./autogen.sh
-%configure --prefix=%{_usr}
+%configure --prefix=%{_usr} --enable-talloc-compat1
 make %{?_smp_mflags}
 
 %install
@@ -36,9 +36,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.2
 ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
 
+#Compatibility library
+ln -s libtalloc-compat1-2.0.0.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a
 rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
 
@@ -49,6 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libtalloc.so.*
+%{_libdir}/libtalloc-compat1-2.0.0.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -64,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Tue Sep  8 2009 Simo Sorce <ssorce at redhat.com> - 2.0.0-0
+- New version from upstream.
+- Build also sover 1 compat library to ease packages migration
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Jun 2009 14:54:58 -0000	1.4
+++ sources	8 Sep 2009 20:04:31 -0000	1.5
@@ -1 +1 @@
-f8969802759bde2598f4f93e84fd38c5  talloc-1.3.1.tar.gz
+edbaa660074c806a42a45b2f4569eed4  talloc-2.0.0.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  8 20:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:07:08 +0000
Subject: [pkgdb] gnu-getopt: dwalluck has requested commit
Message-ID: <20090908200708.24C3210F881@bastion2.fedora.phx.redhat.com>

dwalluck has requested the commit acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 20:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:07:10 +0000
Subject: [pkgdb] gnu-getopt: dwalluck has requested watchbugzilla
Message-ID: <20090908200710.9DC2510F895@bastion2.fedora.phx.redhat.com>

dwalluck has requested the watchbugzilla acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 20:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:07:10 +0000
Subject: [pkgdb] gnu-getopt: dwalluck has requested watchcommits
Message-ID: <20090908200710.BFFA010F89B@bastion2.fedora.phx.redhat.com>

dwalluck has requested the watchcommits acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 20:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:07:11 +0000
Subject: [pkgdb] gnu-getopt: dwalluck has requested approveacls
Message-ID: <20090908200711.6774510F89D@bastion2.fedora.phx.redhat.com>

dwalluck has requested the approveacls acl on gnu-getopt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Tue Sep  8 20:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:09:50 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090908200950.7FB4410F8AC@bastion2.fedora.phx.redhat.com>

pali has set the approveacls acl on cherokee (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From limb at fedoraproject.org  Tue Sep  8 20:17:17 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Sep 2009 20:17:17 +0000 (UTC)
Subject: rpms/xmoto/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 xmoto.spec, 1.53, 1.54
Message-ID: <20090908201717.C3E0811C0082@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28718

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	15 Apr 2009 15:04:48 -0000	1.16
+++ .cvsignore	8 Sep 2009 20:17:17 -0000	1.17
@@ -1 +1 @@
-xmoto-0.5.1-src.tar.gz
+xmoto-0.5.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	15 Apr 2009 15:04:48 -0000	1.16
+++ sources	8 Sep 2009 20:17:17 -0000	1.17
@@ -1 +1 @@
-10cb822ec8c2c7e9466806633e69be1f  xmoto-0.5.1-src.tar.gz
+1e3678ebceca21d61844efb53c140227  xmoto-0.5.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xmoto.spec	27 Jul 2009 08:19:41 -0000	1.53
+++ xmoto.spec	8 Sep 2009 20:17:17 -0000	1.54
@@ -1,5 +1,5 @@
 Name:		xmoto
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
@@ -123,6 +123,9 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Tue Sep 08 2009 Jon Ciesla <limb at jcomserv.net> 0.5.2-1
+- New upstream.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Sep  8 20:28:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:28:44 +0000
Subject: [pkgdb] ecj: akurtakov has requested watchbugzilla
Message-ID: <20090908202845.3DBA510F895@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on ecj (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ecj



From pkgdb at fedoraproject.org  Tue Sep  8 20:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:28:45 +0000
Subject: [pkgdb] ecj: akurtakov has requested watchcommits
Message-ID: <20090908202845.6BD9E10F894@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on ecj (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ecj



From pkgdb at fedoraproject.org  Tue Sep  8 20:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:28:47 +0000
Subject: [pkgdb] ecj: akurtakov has requested commit
Message-ID: <20090908202847.7797A10F89A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on ecj (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ecj



From pkgdb at fedoraproject.org  Tue Sep  8 20:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:30:22 +0000
Subject: [pkgdb] ecj had acl change status
Message-ID: <20090908203022.3BC9510F884@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on ecj (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ecj



From pkgdb at fedoraproject.org  Tue Sep  8 20:30:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:30:19 +0000
Subject: [pkgdb] ecj had acl change status
Message-ID: <20090908203020.10FA910F87C@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on ecj (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ecj



From pkgdb at fedoraproject.org  Tue Sep  8 20:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 20:30:22 +0000
Subject: [pkgdb] ecj had acl change status
Message-ID: <20090908203022.7C99510F893@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on ecj (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ecj



From dcantrel at fedoraproject.org  Tue Sep  8 20:44:23 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  8 Sep 2009 20:44:23 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.29, 1.30 dhcpv6.spec, 1.109,
	1.110 sources, 1.29, 1.30
Message-ID: <20090908204423.A2FBB11C0082@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5464

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Tue Sep 08 2009 David Cantrell <dcantrell at redhat.com> - 1.2.0-3
- Revert to dhcpv6-1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	25 Aug 2009 21:56:26 -0000	1.29
+++ .cvsignore	8 Sep 2009 20:44:23 -0000	1.30
@@ -1 +1 @@
-dhcpv6-2.0.0-alpha4.tar.gz
+dhcpv6-1.2.0.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- dhcpv6.spec	25 Aug 2009 21:56:26 -0000	1.109
+++ dhcpv6.spec	8 Sep 2009 20:44:23 -0000	1.110
@@ -1,17 +1,14 @@
 # libnl is used to communicate with the kernel via netlink
 %define libnlver 1.1
 
-# archive version number
-%define archivever 2.0.0-alpha4
-
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
-Version: 2.0.0alpha4
-Release: 1%{?dist}
+Version: 1.2.0
+Release: 4%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
-Source0: http://fedorahosted.org/releases/d/h/%{name}/%{name}-%{archivever}.tar.gz
+Source0: http://fedorahosted.org/releases/d/h/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex
@@ -21,7 +18,6 @@ BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: libnl-devel >= %{libnlver}
-BuildRequires: glib2-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig initscripts
 Requires(postun): initscripts
@@ -50,7 +46,7 @@ Provides the client for the DHCPv6 proto
 configuration of IPv6 addresses and parameters.
 
 %prep
-%setup -q -n %{name}-%{archivever}
+%setup -q
 
 %build
 %configure
@@ -97,7 +93,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING.LIB README TODO
+%doc AUTHORS ChangeLog COPYING.LIB LICENSE README TODO
 %attr(754,root,root) %{_sbindir}/dhcp6s
 %attr(754,root,root) %{_sbindir}/dhcp6r
 %attr(755,root,root) %config %{_initrddir}/dhcp6s
@@ -114,7 +110,7 @@ fi
 %files -n dhcpv6-client
 %defattr(-,root,root,-)
 %attr(750,root,root) /sbin/dhcp6c
-%doc AUTHORS ChangeLog COPYING.LIB README TODO
+%doc AUTHORS ChangeLog COPYING.LIB LICENSE README TODO
 %config(noreplace) %{_sysconfdir}/dhcp6c.conf
 %{_mandir}/man8/dhcp6c.8.gz
 %{_mandir}/man5/dhcp6c.conf.5.gz
@@ -122,23 +118,8 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
-* Tue Aug 25 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha4-1
-- Upgraded to dhcpv6-2.0.0-alpha4
-
-* Wed Aug 19 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha3-1
-- Upgraded to dhcpv6-2.0.0-alpha3
-
-* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-2
-- Remove LICENSE from the %%doc line
-
-* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-1
-- Upgraded to dhcpv6-2.0.0-alpha2
-
-* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-2
-- BuildRequires glib2-devel
-
-* Mon Aug 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-1
-- Upgraded to dhcpv6-2.0.0-alpha1
+* Tue Sep 08 2009 David Cantrell <dcantrell at redhat.com> - 1.2.0-3
+- Revert to dhcpv6-1.2.0
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	25 Aug 2009 21:56:26 -0000	1.29
+++ sources	8 Sep 2009 20:44:23 -0000	1.30
@@ -1 +1 @@
-fb14ec3583b56b1f552e63b5072a3902  dhcpv6-2.0.0-alpha4.tar.gz
+d537416b33002f56912b7f27477d8d35  dhcpv6-1.2.0.tar.gz



From pwouters at fedoraproject.org  Tue Sep  8 20:50:49 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 20:50:49 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec,1.5,1.6
Message-ID: <20090908205049.8D95911C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8398

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-2
- New key for .pr.



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/dnssec-conf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dnssec-conf.spec	8 Sep 2009 19:32:31 -0000	1.5
+++ dnssec-conf.spec	8 Sep 2009 20:50:49 -0000	1.6
@@ -1,10 +1,11 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
-Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
+Source1: pr.conf
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -54,6 +55,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-2
+- New key for .pr.
+
 * Sun Jun 14 2009 Paul Wouters <paul at xelerance.com> - 1.21-1
 - upgraded to 1.21
 



From davej at fedoraproject.org  Tue Sep  8 20:55:49 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  8 Sep 2009 20:55:49 +0000 (UTC)
Subject: rpms/kernel/devel config-s390x,1.17,1.18
Message-ID: <20090908205549.EC0D511C0082@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10685

Modified Files:
	config-s390x 
Log Message:
s390 config options. rhel. blah


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- config-s390x	23 Jul 2009 17:45:33 -0000	1.17
+++ config-s390x	8 Sep 2009 20:55:49 -0000	1.18
@@ -1,7 +1,9 @@
 CONFIG_64BIT=y
 # CONFIG_MARCH_G5 is not set
-CONFIG_MARCH_Z900=y
+# CONFIG_MARCH_Z900 is not set
+CONFIG_MARCH_Z9_109=y
 # CONFIG_MARCH_Z990 is not set
+
 CONFIG_NR_CPUS=64
 CONFIG_COMPAT=y
 



From ajax at fedoraproject.org  Tue Sep  8 20:56:56 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  8 Sep 2009 20:56:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel lvds-modes.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.28, 1.29
Message-ID: <20090908205656.D0E6511C0082@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11041

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	lvds-modes.patch 
Log Message:
* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-12.20090908
- lvds-modes.patch: Remove egregiously silly LVDS mode list construction,
  use an algorithm (ported from radeon) that actually works instead.


lvds-modes.patch:
 drmmode_display.c |  135 ++++++++++++++----------------------------------------
 1 file changed, 37 insertions(+), 98 deletions(-)

--- NEW FILE lvds-modes.patch ---
diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
--- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 15:26:36.311361982 -0400
+++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 15:57:06.526491988 -0400
@@ -701,107 +701,46 @@ static void fill_detailed_lvds_block(str
 		timing->misc |= 0x01;
 }
 
-static int drmmode_output_lvds_edid(xf86OutputPtr output,
-				struct fixed_panel_lvds *p_lvds)
+static DisplayModePtr
+drmmode_output_lvds_edid(xf86OutputPtr output, DisplayModePtr modes)
 {
-	drmmode_output_private_ptr drmmode_output = output->driver_private;
-	drmModeConnectorPtr koutput = drmmode_output->mode_output;
-	int i, j;
-	DisplayModePtr pmode;
-	xf86MonPtr	edid_mon;
-	drmModeModeInfo *mode_ptr;
-	struct detailed_monitor_section *det_mon;
+    xf86MonPtr mon = output->MonInfo;
 
-	if (output->MonInfo) {
-		/*
-		 * If there exists the EDID, we will either find a DS_RANGES
-		 * or replace a DS_VENDOR block, smashing it into a DS_RANGES
-		 * block with opern refresh to match all the default modes.
-		 */
-		int edid_det_block_num;
-		edid_mon = output->MonInfo;
-		edid_mon->features.msc |= 0x01;
-		j = -1;
-		edid_det_block_num = sizeof(edid_mon->det_mon) /
-					sizeof(edid_mon->det_mon[0]);
-		for (i = 0; i < edid_det_block_num; i++) {
-			if (edid_mon->det_mon[i].type >= DS_VENDOR && j == -1)
-				j = i;
-			if (edid_mon->det_mon[i].type == DS_RANGES) {
-				j = i;
-				break;
-			}
-		}
-		if (j != -1) {
-			struct monitor_ranges	*ranges =
-				&edid_mon->det_mon[j].section.ranges;
-			edid_mon->det_mon[j].type = DS_RANGES;
-			ranges->min_v = 0;
-			ranges->max_v = 200;
-			ranges->min_h = 0;
-			ranges->max_h = 200;
-		}
-		return 0;
-	}
-	/*
-	 * If there is no EDID, we will construct a bogus EDID for LVDS output
-	 * device. This is similar to what we have done in i830_lvds.c
-	 */
-	edid_mon = NULL;
-	edid_mon = xcalloc(1, sizeof(xf86Monitor));
-	if (!edid_mon) {
-		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-			"Can't allocate memory for edid_mon.\n");
-		return 0;
-	}
-	/* Find the fixed panel mode.
-	 * In theory when there is no EDID, KMS kernel will return only one
-	 * mode. And this can be regarded as fixed lvds panel mode.
-	 * But it will be better to traverse the mode list to get the fixed
-	 * lvds panel mode again as we don't know whether some new modes
-	 * are added for the LVDS output device
-	 */
-	j = 0;
-	for (i = 0; i < koutput->count_modes; i++) {
-		mode_ptr = &koutput->modes[i];
-		if ((mode_ptr->hdisplay == p_lvds->hdisplay) &&
-			(mode_ptr->vdisplay == p_lvds->vdisplay)) {
-			/* find the fixed panel mode */
-			j = i;
-			break;
-		}
+    if (!mon || !GTF_SUPPORTED(mon->features.msc)) {
+	DisplayModePtr i, m, p = NULL;
+	int max_x = 0, max_y = 0;
+	float max_vrefresh = 0.0;
+
+	for (m = modes; m; m = m->next) {
+	    if (m->type & M_T_PREFERRED)
+		p = m;
+	    max_x = max(max_x, m->HDisplay);
+	    max_y = max(max_y, m->VDisplay);
+	    max_vrefresh = max(max_vrefresh, xf86ModeVRefresh(m));
 	}
-	pmode = xnfalloc(sizeof(DisplayModeRec));
-	drmmode_ConvertFromKMode(output->scrn, &koutput->modes[j], pmode);
-	/*support DPM, instead of DPMS*/
-	edid_mon->features.dpms |= 0x1;
-	/*defaultly support RGB color display*/
-	edid_mon->features.display_type |= 0x1;
-	/*defaultly display support continuous-freqencey*/
-	edid_mon->features.msc |= 0x1;
-	/*defaultly  the EDID version is 1.4 */
-	edid_mon->ver.version = 1;
-	edid_mon->ver.revision = 4;
-	det_mon = edid_mon->det_mon;
-	if (pmode) {
-		/* now we construct new EDID monitor,
-		 * so filled one detailed timing block
-		 */
-		fill_detailed_lvds_block(det_mon, pmode);
-		/* the filed timing block should be set preferred*/
-		edid_mon->features.msc |= 0x2;
-		det_mon = det_mon + 1;
+
+	max_vrefresh = max(max_vrefresh, 60.0);
+	max_vrefresh *= (1 + SYNC_TOLERANCE);
+
+	m = xf86GetDefaultModes();
+
+	xf86ValidateModesSize(output->scrn, m, max_x, max_y, 0);
+
+	for (i = m; i; i = i->next) {
+	    if (xf86ModeVRefresh(i) > max_vrefresh)
+		i->status = MODE_VSYNC;
+	    if (p && i->HDisplay >= p->HDisplay &&
+		i->VDisplay >= p->VDisplay &&
+		xf86ModeVRefresh(i) >= xf86ModeVRefresh(p))
+		i->status = MODE_VSYNC;
 	}
-	/* Set wide sync ranges so we get all modes
-	 * handed to valid_mode for checking
-	 */
-	det_mon->type = DS_RANGES;
-	det_mon->section.ranges.min_v = 0;
-	det_mon->section.ranges.max_v = 200;
-	det_mon->section.ranges.min_h = 0;
-	det_mon->section.ranges.max_h = 200;
-	output->MonInfo = edid_mon;
-	return 0;
+
+	xf86PruneInvalidModes(output->scrn, &m, FALSE);
+
+	modes = xf86ModesAdd(modes, m);
+    }
+
+    return modes;
 }
 
 static DisplayModePtr
@@ -869,7 +808,7 @@ drmmode_output_get_modes(xf86OutputPtr o
 		if (!p_lvds->hdisplay || !p_lvds->vdisplay)
 			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 				"Incorrect KMS mode.\n");
-		drmmode_output_lvds_edid(output, p_lvds);
+		Modes = drmmode_output_lvds_edid(output, Modes);
 	}
 	return Modes;
 }


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-intel.spec	8 Sep 2009 18:38:52 -0000	1.28
+++ xorg-x11-drv-intel.spec	8 Sep 2009 20:56:56 -0000	1.29
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   11.%{gitdate}%{?dist}
+Release:   12.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -29,8 +29,8 @@ Patch20: intel-2.8.0-kms-get-crtc.patch
 Patch21: intel-2.8.0-lvds-first.patch
 
 Patch40: dri2-page-flip.patch
-
 Patch60: uevent.patch
+Patch70: lvds-modes.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -84,6 +84,7 @@ Debugging tools for Intel graphics chips
 %patch21 -p1 -b .lvds-first
 %patch40 -p1 -b .flip
 %patch60 -p1 -b .uevent
+%patch70 -p1 -b .lvds-modes
 
 %build
  
@@ -139,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-12.20090908
+- lvds-modes.patch: Remove egregiously silly LVDS mode list construction,
+  use an algorithm (ported from radeon) that actually works instead.
+
 * Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-11.20090908
 - Today's git snap (driver and tools)
 



From pwouters at fedoraproject.org  Tue Sep  8 21:00:44 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 21:00:44 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec,1.6,1.7
Message-ID: <20090908210044.82FBB11C0419@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9807

Modified Files:
	dnssec-conf.spec 
Log Message:
* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-3
- Bump version



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/dnssec-conf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dnssec-conf.spec	8 Sep 2009 20:50:49 -0000	1.6
+++ dnssec-conf.spec	8 Sep 2009 21:00:44 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-3
+- Bump version
+
 * Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-2
 - New key for .pr.
 



From pwouters at fedoraproject.org  Tue Sep  8 21:19:47 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue,  8 Sep 2009 21:19:47 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec,1.7,1.8
Message-ID: <20090908211947.8DA0111C0082@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26940

Modified Files:
	dnssec-conf.spec 
Log Message:
sysconfig directory was not created.



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/dnssec-conf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dnssec-conf.spec	8 Sep 2009 21:00:44 -0000	1.7
+++ dnssec-conf.spec	8 Sep 2009 21:19:47 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
@@ -33,6 +33,7 @@ make 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make PREFIX=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} ETCDIR=${RPM_BUILD_ROOT}/etc install
+install -d 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig
 install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec
 cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/pki/dnssec-keys/production/
 
@@ -55,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-4
+- sysconfig directory was not created.
+
 * Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-3
 - Bump version
 



From mclasen at fedoraproject.org  Tue Sep  8 21:27:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 21:27:09 +0000 (UTC)
Subject: rpms/alacarte/devel alacarte.spec,1.57,1.58
Message-ID: <20090908212709.898FD11C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv641

Modified Files:
	alacarte.spec 
Log Message:
bump req



Index: alacarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- alacarte.spec	8 Sep 2009 19:38:24 -0000	1.57
+++ alacarte.spec	8 Sep 2009 21:27:09 -0000	1.58
@@ -15,7 +15,7 @@ BuildArch:      noarch
 BuildRequires:  python, python-devel, gettext
 BuildRequires:  pygtk2-devel
 BuildRequires:  pkgconfig
-BuildRequires:  gnome-menus-devel >= 2.15.4
+BuildRequires:  gnome-menus-devel >= 2.27.92
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 Requires:       pygtk2, gnome-python2-gconf



From oget at fedoraproject.org  Tue Sep  8 21:28:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue,  8 Sep 2009 21:28:06 +0000 (UTC)
Subject: rpms/zynaddsubfx/devel
	zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch, NONE,
	1.1 zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch,
	NONE, 1.1 zynaddsubfx.spec, 1.16, 1.17
Message-ID: <20090908212806.9144511C0082@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1540

Modified Files:
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch 
	zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch 
Log Message:
* Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
- Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)


zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch:
 XMLwrapper.h |  253 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 195 insertions(+), 58 deletions(-)

--- NEW FILE zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch ---
From: fundamental <mark.d.mccurry at gmail.com>
Date: Fri, 4 Sep 2009 22:46:21 +0000 (-0400)
Subject: Gave XMLwrapper doxygen comments
X-Git-Url: http://zynaddsubfx.git.sourceforge.net/git/gitweb.cgi?p=zynaddsubfx%2Fzynaddsubfx;a=commitdiff_plain;h=096a2a2db9bc7d7f9bb2bf8ee12136134708ef23

Gave XMLwrapper doxygen comments
---

diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h
index 6b6849f..9519021 100644
--- a/src/Misc/XMLwrapper.h
+++ b/src/Misc/XMLwrapper.h
@@ -1,9 +1,11 @@
 /*
   ZynAddSubFX - a software synthesizer
 
-  XML.h - XML wrapper
+  XMLwrapper.h - XML wrapper
   Copyright (C) 2003-2005 Nasca Octavian Paul
+  Copyright (C) 2009-2009 Mark McCurry
   Author: Nasca Octavian Paul
+          Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of version 2 of the GNU General Public License
@@ -34,143 +36,278 @@
 //the maxim tree depth
 #define STACKSIZE 100
 
+/**Mxml wrapper*/
 class XMLwrapper
 {
 public:
+    /**
+     * Constructor.
+     * Will Construct the object and fill in top level branch
+     * */
     XMLwrapper();
-    ~XMLwrapper();
 
-    /********************************/
-    /*         SAVE to XML          */
-    /********************************/
+    /**Destructor*/
+    ~XMLwrapper();
 
-    //returns 0 if ok or -1 if the file cannot be saved
+    /**
+     * Saves the XML to a file.
+     * @param filename the name of the destination file.
+     * @returns 0 if ok or -1 if the file cannot be saved.
+     */
     int saveXMLfile(const std::string &filename);
 
-    //returns the new allocated string that contains the XML data (used for clipboard)
-    //the string is NULL terminated
+    /**
+     * Return XML tree as a string.
+     * Note: The string must be freed with free() to deallocate
+     * @returns a newly allocated NULL terminated string of the XML data.
+     */
     char *getXMLdata();
 
-    //add simple parameter (name and value)
+    /**
+     * Add simple parameter.
+     * @param name The name of the mXML node.
+     * @param val  The string value of the mXml node
+     */
     void addpar(const std::string &name,int val);
+
+    /**
+     * Adds a realtype parameter.
+     * @param name The name of the mXML node.
+     * @param val  The REALTYPE value of the node.
+     */
     void addparreal(const std::string &name,REALTYPE val);
 
-    //add boolean parameter (name and boolean value)
-    //if the value is 0 => "yes", else "no"
+    /**
+     * Add boolean parameter.
+     * \todo Fix this reverse boolean logic.
+     * @param name The name of the mXML node.
+     * @param val The boolean value of the node (0->"yes";else->"no").
+     */
     void addparbool(const std::string &name,int val);
 
-    //add string parameter (name and string)
+    /**
+     * Add string parameter.
+     * @param name The name of the mXML node.
+     * @param val  The string value of the node.
+     */
     void addparstr(const std::string &name,const std::string &val);
 
-    //add a branch
+    /**
+     * Create a new branch.
+     * @param name Name of new branch
+     * @see void endbranch()
+     */
     void beginbranch(const std::string &name);
+    /**
+     * Create a new branch.
+     * @param name Name of new branch
+     * @param id "id" value of branch
+     * @see void endbranch()
+     */
     void beginbranch(const std::string &name, int id);
 
-    //this must be called after each branch (nodes that contains child nodes)
+    /**Closes new branches.
+     * This must be called to exit each branch created by beginbranch( ).
+     * @see void beginbranch(const std::string &name)
+     * @see void beginbranch(const std::string &name, int id)
+     */
     void endbranch();
 
-    /********************************/
-    /*        LOAD from XML         */
-    /********************************/
-
-    //returns 0 if ok or -1 if the file cannot be loaded
+    /**
+     * Loads file into XMLwrapper.
+     * @param filename file to be loaded
+     * @returns 0 if ok or -1 if the file cannot be loaded
+     */
     int loadXMLfile(const std::string &filename);
 
-    //used by the clipboard
+    /**
+     * Loads string into XMLwrapper.
+     * @param xmldata NULL terminated string of XML data.
+     * @returns true if successful.
+     */
     bool putXMLdata(const char *xmldata);
 
-    //enter into the branch
-    //returns 1 if is ok, or 0 otherwise
+    /**
+     * Enters the branch.
+     * @param name Name of branch.
+     * @returns 1 if is ok, or 0 otherwise.
+     */
     int enterbranch(const std::string &name);
 
-
-    //enter into the branch with id
-    //returns 1 if is ok, or 0 otherwise
+    /**
+     * Enter into the branch \c name with id \c id.
+     * @param name Name of branch.
+     * @param id Value of branch's "id".
+     * @returns 1 if is ok, or 0 otherwise.
+     */
     int enterbranch(const std::string &name, int id);
 
-    //exits from a branch
+    /**Exits from a branch*/
     void exitbranch();
 
-    //get the the branch_id and limits it between the min and max
-    //if min==max==0, it will not limit it
-    //if there isn't any id, will return min
-    //this must be called only imediately after enterbranch()
+    /**Get the the branch_id and limits it between the min and max.
+     * if min==max==0, it will not limit it
+     * if there isn't any id, will return min
+     * this must be called only imediately after enterbranch()
+     */
     int getbranchid(int min, int max);
 
-    //it returns the parameter and limits it between min and max
-    //if min==max==0, it will not limit it
-    //if no parameter will be here, the defaultpar will be returned
+    /**
+     * Returns the integer value stored in node name.
+     * It returns the integer value between the limits min and max.
+     * If min==max==0, then the value will not be limited.
+     * If there is no location named name, then defaultpar will be returned.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     * @param min The minimum return value.
+     * @param max The maximum return value.
+     */
     int getpar(const std::string &name,int defaultpar,int min,int max);
 
-    //the same as getpar, but the limits are 0 and 127
+    /**
+     * Returns the integer value stored in the node with range [0,127].
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     int getpar127(const std::string &name,int defaultpar);
 
+    /**
+     * Returns the boolean value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     int getparbool(const std::string &name,int defaultpar);
 
+    /**
+     * Get the string value stored in the node.
+     * @param name The parameter name.
+     * @param par  Pointer to destination string
+     * @param maxstrlen Max string length for destination
+     */
     void getparstr(const std::string &name,char *par,int maxstrlen);
+
+    /**
+     * Returns the real value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     REALTYPE getparreal(const char *name,REALTYPE defaultpar);
+
+    /**
+     * Returns the real value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     * @param min The minimum value
+     * @param max The maximum value
+     */
     REALTYPE getparreal(const char *name,REALTYPE defaultpar,REALTYPE min,REALTYPE max);
 
-    bool minimal;//false if all parameters will be stored (used only for clipboard)
+    bool minimal;/**<false if all parameters will be stored (used only for clipboard)*/
 
     struct {
-        bool PADsynth_used;
-    }information;
+        bool PADsynth_used;/**<if PADsynth is used*/
+    }information;/**<Defines if PADsynth is used*/
 
-    //opens a file and parse only the "information" data on it
-    //returns "true" if all went ok or "false" on errors
+    /**
+     * Opens a file and parses the "information" section data on it.
+     * @returns "true" if all went ok or "false" on errors.
+     */
     bool checkfileinformation(const char *filename);
 
 private:
 
+    /**
+     * Save the file.
+     * @param filename File to save to
+     * @param compression Level of gzip compression
+     * @param xmldata String to be saved
+     */
     int dosavefile(const char *filename,int compression,const char *xmldata);
+
+    /**Loads the file.
+     * @param filename the name of the file
+     * @returns gunziped contents of file
+     */
     char *doloadfile(const std::string &filename);
 
 
-    mxml_node_t *tree;//all xml data
-    mxml_node_t *root;//xml data used by zynaddsubfx
-    mxml_node_t *node;//current node
-    mxml_node_t *info;//this node is used to store the information about the data
+    mxml_node_t *tree;/**<all xml data*/
+    mxml_node_t *root;/**<xml data used by zynaddsubfx*/
+    mxml_node_t *node;/**<current node*/
+    mxml_node_t *info;/**<Node used to store the information about the data*/
 
-    //adds params like this:
-    // <name>
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name>.
+     * @returns The node
+     */
     mxml_node_t *addparams0(const char *name);
 
-    //adds params like this:
-    // <name par1="val1">
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name par1="val1">.
+     * @returns The node
+     */
     mxml_node_t *addparams1(const char *name,const char *par1,const char *val1);
 
-    //adds params like this:
-    // <name par1="val1" par2="val2">
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name par1="val1" par2="val2">.
+     * @returns the node
+     */
     mxml_node_t *addparams2(const char *name,const char *par1,const char *val1,const char *par2, const char *val2);
 
+    /**
+     * Convert integer to string
+     * @param x integer input
+     * @returns string output
+     */
     char *int2str(int x);
+
+    /**
+     * Convert integer to string
+     * @param x integer input
+     * @returns string output
+     */
     char *real2str(REALTYPE x);
 
+    /**
+     * Convert string to int
+     * @param str string input
+     * @returns integer output
+     */
     int str2int(const char *str);
+
+    /**
+     * Convert string to realtype
+     * @param x integer input
+     * @returns string output
+     */
     REALTYPE str2real(const char *str);
 
+    /**Temporary string for various uses*/
     char tmpstr[TMPSTR_SIZE];
 
 
-    //this is used to store the parents
+    /**this is used to store the parents.
+     * @todo Use the stack class provided by C++*/
     mxml_node_t *parentstack[STACKSIZE];
-    int stackpos;
+    int stackpos;/**<position in stack*/
 
 
     void push(mxml_node_t *node);
+
+    /**Pops top node off of parent stack*/
     mxml_node_t *pop();
+    /**Returns top node off of parent stack*/
     mxml_node_t *peek();
 
-    //theese are used to store the values
     struct {
         struct {
-            int major,minor;
-        }xml_version;
-    }values;
+            int major;/**<major version number.*/
+            int minor;/**<minor version number.*/
+        }xml_version;/**<Stores ZynAddSubFX versioning information*/
+    }values;/**< Stores ZynAddSubFX versioning information*/
 
 };
 

zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch:
 XMLwrapper.cpp |   76 ++++++++++++++++++++++++---------------------------------
 XMLwrapper.h   |    9 ++++--
 2 files changed, 38 insertions(+), 47 deletions(-)

--- NEW FILE zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch ---
From: fundamental <mark.d.mccurry at gmail.com>
Date: Tue, 8 Sep 2009 02:59:33 +0000 (-0400)
Subject: Fixed error in XMLwrapper::doloadfile( )
X-Git-Url: http://zynaddsubfx.git.sourceforge.net/git/gitweb.cgi?p=zynaddsubfx%2Fzynaddsubfx;a=commitdiff_plain;h=5bf008e390b86944b8175c21f2a021a4d6863de2

Fixed error in XMLwrapper::doloadfile( )

Fixed error that prevented XMLwrapper from loading files on Fedora
---

diff --git a/src/Misc/XMLwrapper.cpp b/src/Misc/XMLwrapper.cpp
index 2731d41..078cbb8 100644
--- a/src/Misc/XMLwrapper.cpp
+++ b/src/Misc/XMLwrapper.cpp
@@ -21,9 +21,13 @@
 */
 
 #include "XMLwrapper.h"
+#include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstdarg>
 #include <zlib.h>
+#include <iostream>
+#include <sstream>
 
 #include "../globals.h"
 #include "Util.h"
@@ -303,48 +307,34 @@ int XMLwrapper::loadXMLfile(const string &filename)
 
 char *XMLwrapper::doloadfile(const string &filename)
 {
-    char *xmldata=NULL;
-    int filesize=-1;
-
-    //try get filesize as gzip data (first)
-    gzFile gzfile=gzopen(filename.c_str(),"rb");
-    if (gzfile!=NULL) {//this is a gzip file
-        // first check it's size
-        while (!gzeof(gzfile)) {
-            gzseek (gzfile,1024*1024,SEEK_CUR);
-            if (gztell(gzfile)>10000000) {
-                gzclose(gzfile);
-                goto notgzip;//the file is too big
-            };
-        };
-        filesize=gztell(gzfile);
-
-        //rewind the file and load the data
-        xmldata=new char[filesize+1];
-        ZERO(xmldata,filesize+1);
-
-        gzrewind(gzfile);
-        gzread(gzfile,xmldata,filesize);
+    char * xmldata = NULL;
+    gzFile gzfile  = gzopen(filename.c_str(),"rb");
 
-        gzclose(gzfile);
-        return (xmldata);
-    } else {//this is not a gzip file
-notgzip:
-        FILE *file=fopen(filename.c_str(),"rb");
-        if (file==NULL) return(NULL);
-        fseek(file,0,SEEK_END);
-        filesize=ftell(file);
+    if (gzfile != NULL) {//The possibly compressed file opened
 
-        xmldata=new char [filesize+1];
-        ZERO(xmldata,filesize+1);
+        stringstream strBuf;             //reading stream
+        const int    bufSize = 500;      //fetch size
+        char         fetchBuf[bufSize+1];//fetch buffer
+        int          read    = 0;        //chars read in last fetch
 
-        rewind(file);
-        fread(xmldata,filesize,1,file);
+        fetchBuf[bufSize] = 0;//force null termination
 
-        fclose(file);
-        return(xmldata);
-    };
-};
+        while(bufSize == (read = gzread(gzfile, fetchBuf, bufSize)))
+            strBuf << fetchBuf;
+
+        fetchBuf[read] = 0;//Truncate last partial read
+        strBuf << fetchBuf;
+
+        gzclose(gzfile);
+
+        //Place data in output format
+        string tmp = strBuf.str();
+        xmldata = new char[tmp.size()+1];
+        strncpy(xmldata, tmp.c_str(), tmp.size()+1);
+    }
+
+    return xmldata;
+}
 
 bool XMLwrapper::putXMLdata(const char *xmldata)
 {
@@ -393,6 +383,7 @@ int XMLwrapper::enterbranch(const string &name,int id)
 
 void XMLwrapper::exitbranch()
 {
+    /**@bug Does not set the current node correctly*/
     pop();
 };
 
@@ -524,13 +515,10 @@ mxml_node_t *XMLwrapper::addparams2(const char *name,const char *par1,const char
     return(element);
 };
 
-
-
-
 void XMLwrapper::push(mxml_node_t *node)
 {
     if (stackpos>=STACKSIZE-1) {
-        printf("BUG!: XMLwrapper::push() - full parentstack\n");
+        cerr << "BUG!: XMLwrapper::push() - full parentstack" << endl;
         return;
     };
     stackpos++;
@@ -542,7 +530,7 @@ void XMLwrapper::push(mxml_node_t *node)
 mxml_node_t *XMLwrapper::pop()
 {
     if (stackpos<=0) {
-        printf("BUG!: XMLwrapper::pop() - empty parentstack\n");
+        cerr << "BUG!: XMLwrapper::pop() - empty parentstack" << endl;
         return (root);
     };
     mxml_node_t *node=parentstack[stackpos];
@@ -557,7 +545,7 @@ mxml_node_t *XMLwrapper::pop()
 mxml_node_t *XMLwrapper::peek()
 {
     if (stackpos<=0) {
-        printf("BUG!: XMLwrapper::peek() - empty parentstack\n");
+        cerr << "BUG!: XMLwrapper::peek() - empty parentstack" << endl;
         return (root);
     };
     return(parentstack[stackpos]);
diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h
index 9519021..ccf875d 100644
--- a/src/Misc/XMLwrapper.h
+++ b/src/Misc/XMLwrapper.h
@@ -224,9 +224,12 @@ private:
      */
     int dosavefile(const char *filename,int compression,const char *xmldata);
 
-    /**Loads the file.
-     * @param filename the name of the file
-     * @returns gunziped contents of file
+    /**
+     * Loads specified file and returns data.
+     * 
+     * Will load a gziped file or an uncompressed file.
+     * @param filename the file
+     * @return The decompressed data
      */
     char *doloadfile(const std::string &filename);
 


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- zynaddsubfx.spec	6 Aug 2009 07:25:48 -0000	1.16
+++ zynaddsubfx.spec	8 Sep 2009 21:28:06 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -11,6 +11,11 @@ Patch0:         zynaddsubfx-jack-support
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
 Patch3:         zynaddsubfx-build-flags.patch
+# Fixed error that prevented XMLwrapper from loading files on Fedora
+# http://sourceforge.net/support/tracker.php?aid=2852148
+# Also RHBZ #518755
+Patch4:         zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch
+Patch5:         zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -35,10 +40,12 @@ effects like Reverb, Echo, Chorus, Phase
 
 %prep
 %setup -q -n ZynAddSubFX-%{version}
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1 -b .jack
+%patch1 -p0 -b .fltk1
+%patch2 -p1 -b .fltk2
+%patch3 -p1 -b .flags
+%patch4 -p1 -b .doxy
+%patch5 -p1 -b .loadfiles
 
 %build
 %ifarch %{ix86} x86_64 
@@ -125,6 +132,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
+- Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)
+
 * Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
 - Update to 2.4.0
 - Update scriptlets according to new guidelines



From pkgdb at fedoraproject.org  Tue Sep  8 21:28:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 21:28:57 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090908212857.F180610F88A@bastion2.fedora.phx.redhat.com>

arbiter has set the watchbugzilla acl on cherokee (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Tue Sep  8 21:28:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 21:28:57 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090908212857.F16EE10F884@bastion2.fedora.phx.redhat.com>

arbiter has set the watchcommits acl on cherokee (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From oget at fedoraproject.org  Tue Sep  8 21:29:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue,  8 Sep 2009 21:29:07 +0000 (UTC)
Subject: rpms/zynaddsubfx/F-11
	zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch, NONE,
	1.1 zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch,
	NONE, 1.1 zynaddsubfx.spec, 1.15, 1.16
Message-ID: <20090908212907.A5F9D11C0082@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2089

Modified Files:
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch 
	zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch 
Log Message:
* Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
- Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)


zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch:
 XMLwrapper.h |  253 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 195 insertions(+), 58 deletions(-)

--- NEW FILE zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch ---
From: fundamental <mark.d.mccurry at gmail.com>
Date: Fri, 4 Sep 2009 22:46:21 +0000 (-0400)
Subject: Gave XMLwrapper doxygen comments
X-Git-Url: http://zynaddsubfx.git.sourceforge.net/git/gitweb.cgi?p=zynaddsubfx%2Fzynaddsubfx;a=commitdiff_plain;h=096a2a2db9bc7d7f9bb2bf8ee12136134708ef23

Gave XMLwrapper doxygen comments
---

diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h
index 6b6849f..9519021 100644
--- a/src/Misc/XMLwrapper.h
+++ b/src/Misc/XMLwrapper.h
@@ -1,9 +1,11 @@
 /*
   ZynAddSubFX - a software synthesizer
 
-  XML.h - XML wrapper
+  XMLwrapper.h - XML wrapper
   Copyright (C) 2003-2005 Nasca Octavian Paul
+  Copyright (C) 2009-2009 Mark McCurry
   Author: Nasca Octavian Paul
+          Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of version 2 of the GNU General Public License
@@ -34,143 +36,278 @@
 //the maxim tree depth
 #define STACKSIZE 100
 
+/**Mxml wrapper*/
 class XMLwrapper
 {
 public:
+    /**
+     * Constructor.
+     * Will Construct the object and fill in top level branch
+     * */
     XMLwrapper();
-    ~XMLwrapper();
 
-    /********************************/
-    /*         SAVE to XML          */
-    /********************************/
+    /**Destructor*/
+    ~XMLwrapper();
 
-    //returns 0 if ok or -1 if the file cannot be saved
+    /**
+     * Saves the XML to a file.
+     * @param filename the name of the destination file.
+     * @returns 0 if ok or -1 if the file cannot be saved.
+     */
     int saveXMLfile(const std::string &filename);
 
-    //returns the new allocated string that contains the XML data (used for clipboard)
-    //the string is NULL terminated
+    /**
+     * Return XML tree as a string.
+     * Note: The string must be freed with free() to deallocate
+     * @returns a newly allocated NULL terminated string of the XML data.
+     */
     char *getXMLdata();
 
-    //add simple parameter (name and value)
+    /**
+     * Add simple parameter.
+     * @param name The name of the mXML node.
+     * @param val  The string value of the mXml node
+     */
     void addpar(const std::string &name,int val);
+
+    /**
+     * Adds a realtype parameter.
+     * @param name The name of the mXML node.
+     * @param val  The REALTYPE value of the node.
+     */
     void addparreal(const std::string &name,REALTYPE val);
 
-    //add boolean parameter (name and boolean value)
-    //if the value is 0 => "yes", else "no"
+    /**
+     * Add boolean parameter.
+     * \todo Fix this reverse boolean logic.
+     * @param name The name of the mXML node.
+     * @param val The boolean value of the node (0->"yes";else->"no").
+     */
     void addparbool(const std::string &name,int val);
 
-    //add string parameter (name and string)
+    /**
+     * Add string parameter.
+     * @param name The name of the mXML node.
+     * @param val  The string value of the node.
+     */
     void addparstr(const std::string &name,const std::string &val);
 
-    //add a branch
+    /**
+     * Create a new branch.
+     * @param name Name of new branch
+     * @see void endbranch()
+     */
     void beginbranch(const std::string &name);
+    /**
+     * Create a new branch.
+     * @param name Name of new branch
+     * @param id "id" value of branch
+     * @see void endbranch()
+     */
     void beginbranch(const std::string &name, int id);
 
-    //this must be called after each branch (nodes that contains child nodes)
+    /**Closes new branches.
+     * This must be called to exit each branch created by beginbranch( ).
+     * @see void beginbranch(const std::string &name)
+     * @see void beginbranch(const std::string &name, int id)
+     */
     void endbranch();
 
-    /********************************/
-    /*        LOAD from XML         */
-    /********************************/
-
-    //returns 0 if ok or -1 if the file cannot be loaded
+    /**
+     * Loads file into XMLwrapper.
+     * @param filename file to be loaded
+     * @returns 0 if ok or -1 if the file cannot be loaded
+     */
     int loadXMLfile(const std::string &filename);
 
-    //used by the clipboard
+    /**
+     * Loads string into XMLwrapper.
+     * @param xmldata NULL terminated string of XML data.
+     * @returns true if successful.
+     */
     bool putXMLdata(const char *xmldata);
 
-    //enter into the branch
-    //returns 1 if is ok, or 0 otherwise
+    /**
+     * Enters the branch.
+     * @param name Name of branch.
+     * @returns 1 if is ok, or 0 otherwise.
+     */
     int enterbranch(const std::string &name);
 
-
-    //enter into the branch with id
-    //returns 1 if is ok, or 0 otherwise
+    /**
+     * Enter into the branch \c name with id \c id.
+     * @param name Name of branch.
+     * @param id Value of branch's "id".
+     * @returns 1 if is ok, or 0 otherwise.
+     */
     int enterbranch(const std::string &name, int id);
 
-    //exits from a branch
+    /**Exits from a branch*/
     void exitbranch();
 
-    //get the the branch_id and limits it between the min and max
-    //if min==max==0, it will not limit it
-    //if there isn't any id, will return min
-    //this must be called only imediately after enterbranch()
+    /**Get the the branch_id and limits it between the min and max.
+     * if min==max==0, it will not limit it
+     * if there isn't any id, will return min
+     * this must be called only imediately after enterbranch()
+     */
     int getbranchid(int min, int max);
 
-    //it returns the parameter and limits it between min and max
-    //if min==max==0, it will not limit it
-    //if no parameter will be here, the defaultpar will be returned
+    /**
+     * Returns the integer value stored in node name.
+     * It returns the integer value between the limits min and max.
+     * If min==max==0, then the value will not be limited.
+     * If there is no location named name, then defaultpar will be returned.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     * @param min The minimum return value.
+     * @param max The maximum return value.
+     */
     int getpar(const std::string &name,int defaultpar,int min,int max);
 
-    //the same as getpar, but the limits are 0 and 127
+    /**
+     * Returns the integer value stored in the node with range [0,127].
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     int getpar127(const std::string &name,int defaultpar);
 
+    /**
+     * Returns the boolean value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     int getparbool(const std::string &name,int defaultpar);
 
+    /**
+     * Get the string value stored in the node.
+     * @param name The parameter name.
+     * @param par  Pointer to destination string
+     * @param maxstrlen Max string length for destination
+     */
     void getparstr(const std::string &name,char *par,int maxstrlen);
+
+    /**
+     * Returns the real value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     REALTYPE getparreal(const char *name,REALTYPE defaultpar);
+
+    /**
+     * Returns the real value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     * @param min The minimum value
+     * @param max The maximum value
+     */
     REALTYPE getparreal(const char *name,REALTYPE defaultpar,REALTYPE min,REALTYPE max);
 
-    bool minimal;//false if all parameters will be stored (used only for clipboard)
+    bool minimal;/**<false if all parameters will be stored (used only for clipboard)*/
 
     struct {
-        bool PADsynth_used;
-    }information;
+        bool PADsynth_used;/**<if PADsynth is used*/
+    }information;/**<Defines if PADsynth is used*/
 
-    //opens a file and parse only the "information" data on it
-    //returns "true" if all went ok or "false" on errors
+    /**
+     * Opens a file and parses the "information" section data on it.
+     * @returns "true" if all went ok or "false" on errors.
+     */
     bool checkfileinformation(const char *filename);
 
 private:
 
+    /**
+     * Save the file.
+     * @param filename File to save to
+     * @param compression Level of gzip compression
+     * @param xmldata String to be saved
+     */
     int dosavefile(const char *filename,int compression,const char *xmldata);
+
+    /**Loads the file.
+     * @param filename the name of the file
+     * @returns gunziped contents of file
+     */
     char *doloadfile(const std::string &filename);
 
 
-    mxml_node_t *tree;//all xml data
-    mxml_node_t *root;//xml data used by zynaddsubfx
-    mxml_node_t *node;//current node
-    mxml_node_t *info;//this node is used to store the information about the data
+    mxml_node_t *tree;/**<all xml data*/
+    mxml_node_t *root;/**<xml data used by zynaddsubfx*/
+    mxml_node_t *node;/**<current node*/
+    mxml_node_t *info;/**<Node used to store the information about the data*/
 
-    //adds params like this:
-    // <name>
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name>.
+     * @returns The node
+     */
     mxml_node_t *addparams0(const char *name);
 
-    //adds params like this:
-    // <name par1="val1">
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name par1="val1">.
+     * @returns The node
+     */
     mxml_node_t *addparams1(const char *name,const char *par1,const char *val1);
 
-    //adds params like this:
-    // <name par1="val1" par2="val2">
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name par1="val1" par2="val2">.
+     * @returns the node
+     */
     mxml_node_t *addparams2(const char *name,const char *par1,const char *val1,const char *par2, const char *val2);
 
+    /**
+     * Convert integer to string
+     * @param x integer input
+     * @returns string output
+     */
     char *int2str(int x);
+
+    /**
+     * Convert integer to string
+     * @param x integer input
+     * @returns string output
+     */
     char *real2str(REALTYPE x);
 
+    /**
+     * Convert string to int
+     * @param str string input
+     * @returns integer output
+     */
     int str2int(const char *str);
+
+    /**
+     * Convert string to realtype
+     * @param x integer input
+     * @returns string output
+     */
     REALTYPE str2real(const char *str);
 
+    /**Temporary string for various uses*/
     char tmpstr[TMPSTR_SIZE];
 
 
-    //this is used to store the parents
+    /**this is used to store the parents.
+     * @todo Use the stack class provided by C++*/
     mxml_node_t *parentstack[STACKSIZE];
-    int stackpos;
+    int stackpos;/**<position in stack*/
 
 
     void push(mxml_node_t *node);
+
+    /**Pops top node off of parent stack*/
     mxml_node_t *pop();
+    /**Returns top node off of parent stack*/
     mxml_node_t *peek();
 
-    //theese are used to store the values
     struct {
         struct {
-            int major,minor;
-        }xml_version;
-    }values;
+            int major;/**<major version number.*/
+            int minor;/**<minor version number.*/
+        }xml_version;/**<Stores ZynAddSubFX versioning information*/
+    }values;/**< Stores ZynAddSubFX versioning information*/
 
 };
 

zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch:
 XMLwrapper.cpp |   76 ++++++++++++++++++++++++---------------------------------
 XMLwrapper.h   |    9 ++++--
 2 files changed, 38 insertions(+), 47 deletions(-)

--- NEW FILE zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch ---
From: fundamental <mark.d.mccurry at gmail.com>
Date: Tue, 8 Sep 2009 02:59:33 +0000 (-0400)
Subject: Fixed error in XMLwrapper::doloadfile( )
X-Git-Url: http://zynaddsubfx.git.sourceforge.net/git/gitweb.cgi?p=zynaddsubfx%2Fzynaddsubfx;a=commitdiff_plain;h=5bf008e390b86944b8175c21f2a021a4d6863de2

Fixed error in XMLwrapper::doloadfile( )

Fixed error that prevented XMLwrapper from loading files on Fedora
---

diff --git a/src/Misc/XMLwrapper.cpp b/src/Misc/XMLwrapper.cpp
index 2731d41..078cbb8 100644
--- a/src/Misc/XMLwrapper.cpp
+++ b/src/Misc/XMLwrapper.cpp
@@ -21,9 +21,13 @@
 */
 
 #include "XMLwrapper.h"
+#include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstdarg>
 #include <zlib.h>
+#include <iostream>
+#include <sstream>
 
 #include "../globals.h"
 #include "Util.h"
@@ -303,48 +307,34 @@ int XMLwrapper::loadXMLfile(const string &filename)
 
 char *XMLwrapper::doloadfile(const string &filename)
 {
-    char *xmldata=NULL;
-    int filesize=-1;
-
-    //try get filesize as gzip data (first)
-    gzFile gzfile=gzopen(filename.c_str(),"rb");
-    if (gzfile!=NULL) {//this is a gzip file
-        // first check it's size
-        while (!gzeof(gzfile)) {
-            gzseek (gzfile,1024*1024,SEEK_CUR);
-            if (gztell(gzfile)>10000000) {
-                gzclose(gzfile);
-                goto notgzip;//the file is too big
-            };
-        };
-        filesize=gztell(gzfile);
-
-        //rewind the file and load the data
-        xmldata=new char[filesize+1];
-        ZERO(xmldata,filesize+1);
-
-        gzrewind(gzfile);
-        gzread(gzfile,xmldata,filesize);
+    char * xmldata = NULL;
+    gzFile gzfile  = gzopen(filename.c_str(),"rb");
 
-        gzclose(gzfile);
-        return (xmldata);
-    } else {//this is not a gzip file
-notgzip:
-        FILE *file=fopen(filename.c_str(),"rb");
-        if (file==NULL) return(NULL);
-        fseek(file,0,SEEK_END);
-        filesize=ftell(file);
+    if (gzfile != NULL) {//The possibly compressed file opened
 
-        xmldata=new char [filesize+1];
-        ZERO(xmldata,filesize+1);
+        stringstream strBuf;             //reading stream
+        const int    bufSize = 500;      //fetch size
+        char         fetchBuf[bufSize+1];//fetch buffer
+        int          read    = 0;        //chars read in last fetch
 
-        rewind(file);
-        fread(xmldata,filesize,1,file);
+        fetchBuf[bufSize] = 0;//force null termination
 
-        fclose(file);
-        return(xmldata);
-    };
-};
+        while(bufSize == (read = gzread(gzfile, fetchBuf, bufSize)))
+            strBuf << fetchBuf;
+
+        fetchBuf[read] = 0;//Truncate last partial read
+        strBuf << fetchBuf;
+
+        gzclose(gzfile);
+
+        //Place data in output format
+        string tmp = strBuf.str();
+        xmldata = new char[tmp.size()+1];
+        strncpy(xmldata, tmp.c_str(), tmp.size()+1);
+    }
+
+    return xmldata;
+}
 
 bool XMLwrapper::putXMLdata(const char *xmldata)
 {
@@ -393,6 +383,7 @@ int XMLwrapper::enterbranch(const string &name,int id)
 
 void XMLwrapper::exitbranch()
 {
+    /**@bug Does not set the current node correctly*/
     pop();
 };
 
@@ -524,13 +515,10 @@ mxml_node_t *XMLwrapper::addparams2(const char *name,const char *par1,const char
     return(element);
 };
 
-
-
-
 void XMLwrapper::push(mxml_node_t *node)
 {
     if (stackpos>=STACKSIZE-1) {
-        printf("BUG!: XMLwrapper::push() - full parentstack\n");
+        cerr << "BUG!: XMLwrapper::push() - full parentstack" << endl;
         return;
     };
     stackpos++;
@@ -542,7 +530,7 @@ void XMLwrapper::push(mxml_node_t *node)
 mxml_node_t *XMLwrapper::pop()
 {
     if (stackpos<=0) {
-        printf("BUG!: XMLwrapper::pop() - empty parentstack\n");
+        cerr << "BUG!: XMLwrapper::pop() - empty parentstack" << endl;
         return (root);
     };
     mxml_node_t *node=parentstack[stackpos];
@@ -557,7 +545,7 @@ mxml_node_t *XMLwrapper::pop()
 mxml_node_t *XMLwrapper::peek()
 {
     if (stackpos<=0) {
-        printf("BUG!: XMLwrapper::peek() - empty parentstack\n");
+        cerr << "BUG!: XMLwrapper::peek() - empty parentstack" << endl;
         return (root);
     };
     return(parentstack[stackpos]);
diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h
index 9519021..ccf875d 100644
--- a/src/Misc/XMLwrapper.h
+++ b/src/Misc/XMLwrapper.h
@@ -224,9 +224,12 @@ private:
      */
     int dosavefile(const char *filename,int compression,const char *xmldata);
 
-    /**Loads the file.
-     * @param filename the name of the file
-     * @returns gunziped contents of file
+    /**
+     * Loads specified file and returns data.
+     * 
+     * Will load a gziped file or an uncompressed file.
+     * @param filename the file
+     * @return The decompressed data
      */
     char *doloadfile(const std::string &filename);
 


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-11/zynaddsubfx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- zynaddsubfx.spec	6 Aug 2009 08:00:02 -0000	1.15
+++ zynaddsubfx.spec	8 Sep 2009 21:29:07 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -11,6 +11,11 @@ Patch0:         zynaddsubfx-jack-support
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
 Patch3:         zynaddsubfx-build-flags.patch
+# Fixed error that prevented XMLwrapper from loading files on Fedora
+# http://sourceforge.net/support/tracker.php?aid=2852148
+# Also RHBZ #518755
+Patch4:         zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch
+Patch5:         zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -35,10 +40,12 @@ effects like Reverb, Echo, Chorus, Phase
 
 %prep
 %setup -q -n ZynAddSubFX-%{version}
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1 -b .jack
+%patch1 -p0 -b .fltk1
+%patch2 -p1 -b .fltk2
+%patch3 -p1 -b .flags
+%patch4 -p1 -b .doxy
+%patch5 -p1 -b .loadfiles
 
 %build
 %ifarch %{ix86} x86_64 
@@ -125,6 +132,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
+- Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)
+
 * Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
 - Update to 2.4.0
 - Update scriptlets according to new guidelines



From pkgdb at fedoraproject.org  Tue Sep  8 21:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Sep 2009 21:28:59 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090908212859.643FB10F895@bastion2.fedora.phx.redhat.com>

arbiter has set the commit acl on cherokee (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From oget at fedoraproject.org  Tue Sep  8 21:29:55 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue,  8 Sep 2009 21:29:55 +0000 (UTC)
Subject: rpms/zynaddsubfx/F-10
	zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch, NONE,
	1.1 zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch,
	NONE, 1.1 zynaddsubfx.spec, 1.14, 1.15
Message-ID: <20090908212955.1966711C0082@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2408

Modified Files:
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch 
	zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch 
Log Message:
* Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
- Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)


zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch:
 XMLwrapper.h |  253 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 195 insertions(+), 58 deletions(-)

--- NEW FILE zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch ---
From: fundamental <mark.d.mccurry at gmail.com>
Date: Fri, 4 Sep 2009 22:46:21 +0000 (-0400)
Subject: Gave XMLwrapper doxygen comments
X-Git-Url: http://zynaddsubfx.git.sourceforge.net/git/gitweb.cgi?p=zynaddsubfx%2Fzynaddsubfx;a=commitdiff_plain;h=096a2a2db9bc7d7f9bb2bf8ee12136134708ef23

Gave XMLwrapper doxygen comments
---

diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h
index 6b6849f..9519021 100644
--- a/src/Misc/XMLwrapper.h
+++ b/src/Misc/XMLwrapper.h
@@ -1,9 +1,11 @@
 /*
   ZynAddSubFX - a software synthesizer
 
-  XML.h - XML wrapper
+  XMLwrapper.h - XML wrapper
   Copyright (C) 2003-2005 Nasca Octavian Paul
+  Copyright (C) 2009-2009 Mark McCurry
   Author: Nasca Octavian Paul
+          Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of version 2 of the GNU General Public License
@@ -34,143 +36,278 @@
 //the maxim tree depth
 #define STACKSIZE 100
 
+/**Mxml wrapper*/
 class XMLwrapper
 {
 public:
+    /**
+     * Constructor.
+     * Will Construct the object and fill in top level branch
+     * */
     XMLwrapper();
-    ~XMLwrapper();
 
-    /********************************/
-    /*         SAVE to XML          */
-    /********************************/
+    /**Destructor*/
+    ~XMLwrapper();
 
-    //returns 0 if ok or -1 if the file cannot be saved
+    /**
+     * Saves the XML to a file.
+     * @param filename the name of the destination file.
+     * @returns 0 if ok or -1 if the file cannot be saved.
+     */
     int saveXMLfile(const std::string &filename);
 
-    //returns the new allocated string that contains the XML data (used for clipboard)
-    //the string is NULL terminated
+    /**
+     * Return XML tree as a string.
+     * Note: The string must be freed with free() to deallocate
+     * @returns a newly allocated NULL terminated string of the XML data.
+     */
     char *getXMLdata();
 
-    //add simple parameter (name and value)
+    /**
+     * Add simple parameter.
+     * @param name The name of the mXML node.
+     * @param val  The string value of the mXml node
+     */
     void addpar(const std::string &name,int val);
+
+    /**
+     * Adds a realtype parameter.
+     * @param name The name of the mXML node.
+     * @param val  The REALTYPE value of the node.
+     */
     void addparreal(const std::string &name,REALTYPE val);
 
-    //add boolean parameter (name and boolean value)
-    //if the value is 0 => "yes", else "no"
+    /**
+     * Add boolean parameter.
+     * \todo Fix this reverse boolean logic.
+     * @param name The name of the mXML node.
+     * @param val The boolean value of the node (0->"yes";else->"no").
+     */
     void addparbool(const std::string &name,int val);
 
-    //add string parameter (name and string)
+    /**
+     * Add string parameter.
+     * @param name The name of the mXML node.
+     * @param val  The string value of the node.
+     */
     void addparstr(const std::string &name,const std::string &val);
 
-    //add a branch
+    /**
+     * Create a new branch.
+     * @param name Name of new branch
+     * @see void endbranch()
+     */
     void beginbranch(const std::string &name);
+    /**
+     * Create a new branch.
+     * @param name Name of new branch
+     * @param id "id" value of branch
+     * @see void endbranch()
+     */
     void beginbranch(const std::string &name, int id);
 
-    //this must be called after each branch (nodes that contains child nodes)
+    /**Closes new branches.
+     * This must be called to exit each branch created by beginbranch( ).
+     * @see void beginbranch(const std::string &name)
+     * @see void beginbranch(const std::string &name, int id)
+     */
     void endbranch();
 
-    /********************************/
-    /*        LOAD from XML         */
-    /********************************/
-
-    //returns 0 if ok or -1 if the file cannot be loaded
+    /**
+     * Loads file into XMLwrapper.
+     * @param filename file to be loaded
+     * @returns 0 if ok or -1 if the file cannot be loaded
+     */
     int loadXMLfile(const std::string &filename);
 
-    //used by the clipboard
+    /**
+     * Loads string into XMLwrapper.
+     * @param xmldata NULL terminated string of XML data.
+     * @returns true if successful.
+     */
     bool putXMLdata(const char *xmldata);
 
-    //enter into the branch
-    //returns 1 if is ok, or 0 otherwise
+    /**
+     * Enters the branch.
+     * @param name Name of branch.
+     * @returns 1 if is ok, or 0 otherwise.
+     */
     int enterbranch(const std::string &name);
 
-
-    //enter into the branch with id
-    //returns 1 if is ok, or 0 otherwise
+    /**
+     * Enter into the branch \c name with id \c id.
+     * @param name Name of branch.
+     * @param id Value of branch's "id".
+     * @returns 1 if is ok, or 0 otherwise.
+     */
     int enterbranch(const std::string &name, int id);
 
-    //exits from a branch
+    /**Exits from a branch*/
     void exitbranch();
 
-    //get the the branch_id and limits it between the min and max
-    //if min==max==0, it will not limit it
-    //if there isn't any id, will return min
-    //this must be called only imediately after enterbranch()
+    /**Get the the branch_id and limits it between the min and max.
+     * if min==max==0, it will not limit it
+     * if there isn't any id, will return min
+     * this must be called only imediately after enterbranch()
+     */
     int getbranchid(int min, int max);
 
-    //it returns the parameter and limits it between min and max
-    //if min==max==0, it will not limit it
-    //if no parameter will be here, the defaultpar will be returned
+    /**
+     * Returns the integer value stored in node name.
+     * It returns the integer value between the limits min and max.
+     * If min==max==0, then the value will not be limited.
+     * If there is no location named name, then defaultpar will be returned.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     * @param min The minimum return value.
+     * @param max The maximum return value.
+     */
     int getpar(const std::string &name,int defaultpar,int min,int max);
 
-    //the same as getpar, but the limits are 0 and 127
+    /**
+     * Returns the integer value stored in the node with range [0,127].
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     int getpar127(const std::string &name,int defaultpar);
 
+    /**
+     * Returns the boolean value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     int getparbool(const std::string &name,int defaultpar);
 
+    /**
+     * Get the string value stored in the node.
+     * @param name The parameter name.
+     * @param par  Pointer to destination string
+     * @param maxstrlen Max string length for destination
+     */
     void getparstr(const std::string &name,char *par,int maxstrlen);
+
+    /**
+     * Returns the real value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     */
     REALTYPE getparreal(const char *name,REALTYPE defaultpar);
+
+    /**
+     * Returns the real value stored in the node.
+     * @param name The parameter name.
+     * @param defaultpar The default value if the real value is not found.
+     * @param min The minimum value
+     * @param max The maximum value
+     */
     REALTYPE getparreal(const char *name,REALTYPE defaultpar,REALTYPE min,REALTYPE max);
 
-    bool minimal;//false if all parameters will be stored (used only for clipboard)
+    bool minimal;/**<false if all parameters will be stored (used only for clipboard)*/
 
     struct {
-        bool PADsynth_used;
-    }information;
+        bool PADsynth_used;/**<if PADsynth is used*/
+    }information;/**<Defines if PADsynth is used*/
 
-    //opens a file and parse only the "information" data on it
-    //returns "true" if all went ok or "false" on errors
+    /**
+     * Opens a file and parses the "information" section data on it.
+     * @returns "true" if all went ok or "false" on errors.
+     */
     bool checkfileinformation(const char *filename);
 
 private:
 
+    /**
+     * Save the file.
+     * @param filename File to save to
+     * @param compression Level of gzip compression
+     * @param xmldata String to be saved
+     */
     int dosavefile(const char *filename,int compression,const char *xmldata);
+
+    /**Loads the file.
+     * @param filename the name of the file
+     * @returns gunziped contents of file
+     */
     char *doloadfile(const std::string &filename);
 
 
-    mxml_node_t *tree;//all xml data
-    mxml_node_t *root;//xml data used by zynaddsubfx
-    mxml_node_t *node;//current node
-    mxml_node_t *info;//this node is used to store the information about the data
+    mxml_node_t *tree;/**<all xml data*/
+    mxml_node_t *root;/**<xml data used by zynaddsubfx*/
+    mxml_node_t *node;/**<current node*/
+    mxml_node_t *info;/**<Node used to store the information about the data*/
 
-    //adds params like this:
-    // <name>
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name>.
+     * @returns The node
+     */
     mxml_node_t *addparams0(const char *name);
 
-    //adds params like this:
-    // <name par1="val1">
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name par1="val1">.
+     * @returns The node
+     */
     mxml_node_t *addparams1(const char *name,const char *par1,const char *val1);
 
-    //adds params like this:
-    // <name par1="val1" par2="val2">
-    //returns the node
+    /**
+     * Adds params like this:
+     * <name par1="val1" par2="val2">.
+     * @returns the node
+     */
     mxml_node_t *addparams2(const char *name,const char *par1,const char *val1,const char *par2, const char *val2);
 
+    /**
+     * Convert integer to string
+     * @param x integer input
+     * @returns string output
+     */
     char *int2str(int x);
+
+    /**
+     * Convert integer to string
+     * @param x integer input
+     * @returns string output
+     */
     char *real2str(REALTYPE x);
 
+    /**
+     * Convert string to int
+     * @param str string input
+     * @returns integer output
+     */
     int str2int(const char *str);
+
+    /**
+     * Convert string to realtype
+     * @param x integer input
+     * @returns string output
+     */
     REALTYPE str2real(const char *str);
 
+    /**Temporary string for various uses*/
     char tmpstr[TMPSTR_SIZE];
 
 
-    //this is used to store the parents
+    /**this is used to store the parents.
+     * @todo Use the stack class provided by C++*/
     mxml_node_t *parentstack[STACKSIZE];
-    int stackpos;
+    int stackpos;/**<position in stack*/
 
 
     void push(mxml_node_t *node);
+
+    /**Pops top node off of parent stack*/
     mxml_node_t *pop();
+    /**Returns top node off of parent stack*/
     mxml_node_t *peek();
 
-    //theese are used to store the values
     struct {
         struct {
-            int major,minor;
-        }xml_version;
-    }values;
+            int major;/**<major version number.*/
+            int minor;/**<minor version number.*/
+        }xml_version;/**<Stores ZynAddSubFX versioning information*/
+    }values;/**< Stores ZynAddSubFX versioning information*/
 
 };
 

zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch:
 XMLwrapper.cpp |   76 ++++++++++++++++++++++++---------------------------------
 XMLwrapper.h   |    9 ++++--
 2 files changed, 38 insertions(+), 47 deletions(-)

--- NEW FILE zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch ---
From: fundamental <mark.d.mccurry at gmail.com>
Date: Tue, 8 Sep 2009 02:59:33 +0000 (-0400)
Subject: Fixed error in XMLwrapper::doloadfile( )
X-Git-Url: http://zynaddsubfx.git.sourceforge.net/git/gitweb.cgi?p=zynaddsubfx%2Fzynaddsubfx;a=commitdiff_plain;h=5bf008e390b86944b8175c21f2a021a4d6863de2

Fixed error in XMLwrapper::doloadfile( )

Fixed error that prevented XMLwrapper from loading files on Fedora
---

diff --git a/src/Misc/XMLwrapper.cpp b/src/Misc/XMLwrapper.cpp
index 2731d41..078cbb8 100644
--- a/src/Misc/XMLwrapper.cpp
+++ b/src/Misc/XMLwrapper.cpp
@@ -21,9 +21,13 @@
 */
 
 #include "XMLwrapper.h"
+#include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstdarg>
 #include <zlib.h>
+#include <iostream>
+#include <sstream>
 
 #include "../globals.h"
 #include "Util.h"
@@ -303,48 +307,34 @@ int XMLwrapper::loadXMLfile(const string &filename)
 
 char *XMLwrapper::doloadfile(const string &filename)
 {
-    char *xmldata=NULL;
-    int filesize=-1;
-
-    //try get filesize as gzip data (first)
-    gzFile gzfile=gzopen(filename.c_str(),"rb");
-    if (gzfile!=NULL) {//this is a gzip file
-        // first check it's size
-        while (!gzeof(gzfile)) {
-            gzseek (gzfile,1024*1024,SEEK_CUR);
-            if (gztell(gzfile)>10000000) {
-                gzclose(gzfile);
-                goto notgzip;//the file is too big
-            };
-        };
-        filesize=gztell(gzfile);
-
-        //rewind the file and load the data
-        xmldata=new char[filesize+1];
-        ZERO(xmldata,filesize+1);
-
-        gzrewind(gzfile);
-        gzread(gzfile,xmldata,filesize);
+    char * xmldata = NULL;
+    gzFile gzfile  = gzopen(filename.c_str(),"rb");
 
-        gzclose(gzfile);
-        return (xmldata);
-    } else {//this is not a gzip file
-notgzip:
-        FILE *file=fopen(filename.c_str(),"rb");
-        if (file==NULL) return(NULL);
-        fseek(file,0,SEEK_END);
-        filesize=ftell(file);
+    if (gzfile != NULL) {//The possibly compressed file opened
 
-        xmldata=new char [filesize+1];
-        ZERO(xmldata,filesize+1);
+        stringstream strBuf;             //reading stream
+        const int    bufSize = 500;      //fetch size
+        char         fetchBuf[bufSize+1];//fetch buffer
+        int          read    = 0;        //chars read in last fetch
 
-        rewind(file);
-        fread(xmldata,filesize,1,file);
+        fetchBuf[bufSize] = 0;//force null termination
 
-        fclose(file);
-        return(xmldata);
-    };
-};
+        while(bufSize == (read = gzread(gzfile, fetchBuf, bufSize)))
+            strBuf << fetchBuf;
+
+        fetchBuf[read] = 0;//Truncate last partial read
+        strBuf << fetchBuf;
+
+        gzclose(gzfile);
+
+        //Place data in output format
+        string tmp = strBuf.str();
+        xmldata = new char[tmp.size()+1];
+        strncpy(xmldata, tmp.c_str(), tmp.size()+1);
+    }
+
+    return xmldata;
+}
 
 bool XMLwrapper::putXMLdata(const char *xmldata)
 {
@@ -393,6 +383,7 @@ int XMLwrapper::enterbranch(const string &name,int id)
 
 void XMLwrapper::exitbranch()
 {
+    /**@bug Does not set the current node correctly*/
     pop();
 };
 
@@ -524,13 +515,10 @@ mxml_node_t *XMLwrapper::addparams2(const char *name,const char *par1,const char
     return(element);
 };
 
-
-
-
 void XMLwrapper::push(mxml_node_t *node)
 {
     if (stackpos>=STACKSIZE-1) {
-        printf("BUG!: XMLwrapper::push() - full parentstack\n");
+        cerr << "BUG!: XMLwrapper::push() - full parentstack" << endl;
         return;
     };
     stackpos++;
@@ -542,7 +530,7 @@ void XMLwrapper::push(mxml_node_t *node)
 mxml_node_t *XMLwrapper::pop()
 {
     if (stackpos<=0) {
-        printf("BUG!: XMLwrapper::pop() - empty parentstack\n");
+        cerr << "BUG!: XMLwrapper::pop() - empty parentstack" << endl;
         return (root);
     };
     mxml_node_t *node=parentstack[stackpos];
@@ -557,7 +545,7 @@ mxml_node_t *XMLwrapper::pop()
 mxml_node_t *XMLwrapper::peek()
 {
     if (stackpos<=0) {
-        printf("BUG!: XMLwrapper::peek() - empty parentstack\n");
+        cerr << "BUG!: XMLwrapper::peek() - empty parentstack" << endl;
         return (root);
     };
     return(parentstack[stackpos]);
diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h
index 9519021..ccf875d 100644
--- a/src/Misc/XMLwrapper.h
+++ b/src/Misc/XMLwrapper.h
@@ -224,9 +224,12 @@ private:
      */
     int dosavefile(const char *filename,int compression,const char *xmldata);
 
-    /**Loads the file.
-     * @param filename the name of the file
-     * @returns gunziped contents of file
+    /**
+     * Loads specified file and returns data.
+     * 
+     * Will load a gziped file or an uncompressed file.
+     * @param filename the file
+     * @return The decompressed data
      */
     char *doloadfile(const std::string &filename);
 


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-10/zynaddsubfx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- zynaddsubfx.spec	6 Aug 2009 08:02:10 -0000	1.14
+++ zynaddsubfx.spec	8 Sep 2009 21:29:54 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -11,6 +11,11 @@ Patch0:         zynaddsubfx-jack-support
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
 Patch3:         zynaddsubfx-build-flags.patch
+# Fixed error that prevented XMLwrapper from loading files on Fedora
+# http://sourceforge.net/support/tracker.php?aid=2852148
+# Also RHBZ #518755
+Patch4:         zynaddsubfx-096a2a2db9bc7d7f9bb2bf8ee12136134708ef23.patch
+Patch5:         zynaddsubfx-5bf008e390b86944b8175c21f2a021a4d6863de2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -35,10 +40,12 @@ effects like Reverb, Echo, Chorus, Phase
 
 %prep
 %setup -q -n ZynAddSubFX-%{version}
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1 -b .jack
+%patch1 -p0 -b .fltk1
+%patch2 -p1 -b .fltk2
+%patch3 -p1 -b .flags
+%patch4 -p1 -b .doxy
+%patch5 -p1 -b .loadfiles
 
 %build
 %ifarch %{ix86} x86_64 
@@ -125,6 +132,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Tue Sep 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-2
+- Bugfix: presets and parameters don't load on ix86 (RHBZ #518755)
+
 * Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
 - Update to 2.4.0
 - Update scriptlets according to new guidelines



From arbiter at fedoraproject.org  Tue Sep  8 21:43:42 2009
From: arbiter at fedoraproject.org (arbiter)
Date: Tue,  8 Sep 2009 21:43:42 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.10, 1.11 cherokee.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <20090908214342.8296F11C0082@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9443

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Sat Sep  5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.24-1
- 0.99.24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Jul 2009 20:58:52 -0000	1.10
+++ .cvsignore	8 Sep 2009 21:43:42 -0000	1.11
@@ -1 +1 @@
-cherokee-0.99.20.tar.gz
+cherokee-0.99.24.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- cherokee.spec	21 Aug 2009 12:44:44 -0000	1.20
+++ cherokee.spec	8 Sep 2009 21:43:42 -0000	1.21
@@ -10,8 +10,8 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.20
-Release:        3%{?dist}
+Version:        0.99.24
+Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -80,8 +80,6 @@ make install DESTDIR=%{buildroot}
             %{buildroot}%{_sysconfdir}/%{name}/cherokee.conf.perf_sample
 
 find  %{buildroot}%{_libdir} -name *.la -exec rm -rf {} \;
-# put SSL certs to %{_sysconfdir}/pki/%{name}
-rmdir %{buildroot}%{_sysconfdir}/%{name}/ssl
 
 mv ChangeLog ChangeLog.iso8859-1
 chmod -x COPYING
@@ -168,6 +166,9 @@ fi
 
 
 %changelog
+* Sat Sep  5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.24-1
+- 0.99.24
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.20-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Jul 2009 20:58:52 -0000	1.10
+++ sources	8 Sep 2009 21:43:42 -0000	1.11
@@ -1 +1 @@
-78a370f7b012e77ea2278c1048bae754  cherokee-0.99.20.tar.gz
+5afed8bdd6020dc5bf0ba9ec83b947f1  cherokee-0.99.24.tar.gz



From mclasen at fedoraproject.org  Tue Sep  8 21:46:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 21:46:34 +0000 (UTC)
Subject: rpms/metacity/devel .cvsignore, 1.86, 1.87 metacity.spec, 1.201,
	1.202 sources, 1.86, 1.87
Message-ID: <20090908214635.03BB711C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10193

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.27.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	31 May 2009 23:19:02 -0000	1.86
+++ .cvsignore	8 Sep 2009 21:46:34 -0000	1.87
@@ -1 +1 @@
-metacity-2.27.0.tar.bz2
+metacity-2.27.1.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- metacity.spec	2 Sep 2009 20:20:52 -0000	1.201
+++ metacity.spec	8 Sep 2009 21:46:34 -0000	1.202
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.27.0
-Release: 9%{?dist}
+Version: 2.27.1
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -16,8 +16,6 @@ Patch7: 0001-bell-increase-bell-rate-lim
 Patch8: 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=593358
 Patch9: 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=516225
-Patch10: metacity-option-to-force-fullscreen.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -83,7 +81,6 @@ API. This package exists purely for tech
 %patch7 -p1 -b .bell
 %patch8 -p1 -b .sound-cache
 %patch9 -p1 -b .tooltip
-%patch10 -p1 -b .force-fullscreen
 
 # force regeneration
 rm src/metacity.schemas
@@ -191,6 +188,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.cm> - 2.27.1-1
+- Update to 2.27.1
+
 * Wed Sep  2 2009 Peter Robinson <pbrobinson at gmail.com> - 2.27.0-9
 - Add upstreamed patch for option to force fullscreen for sugar
 - https://bugzilla.redhat.com/show_bug.cgi?id=516225


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	31 May 2009 23:19:03 -0000	1.86
+++ sources	8 Sep 2009 21:46:34 -0000	1.87
@@ -1 +1 @@
-52871631cc13b7fde1403aaee3db32d4  metacity-2.27.0.tar.bz2
+9a952cdb925912d9b3b12ad460e25894  metacity-2.27.1.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  8 22:09:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 22:09:06 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.84, 1.85 gnome-applets.spec, 
	1.352, 1.353 sources, 1.96, 1.97
Message-ID: <20090908220906.F127111C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19008

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	25 Aug 2009 19:24:16 -0000	1.84
+++ .cvsignore	8 Sep 2009 22:09:06 -0000	1.85
@@ -1 +1 @@
-gnome-applets-2.27.91.tar.bz2
+gnome-applets-2.27.92.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- gnome-applets.spec	25 Aug 2009 19:24:16 -0000	1.352
+++ gnome-applets.spec	8 Sep 2009 22:09:06 -0000	1.353
@@ -33,7 +33,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.27.91
+Version:	2.27.92
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
@@ -344,6 +344,9 @@ fi
 
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.91-1
 - 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	25 Aug 2009 21:06:03 -0000	1.96
+++ sources	8 Sep 2009 22:09:06 -0000	1.97
@@ -1,2 +1,2 @@
-458f2fefc70b5ab740816d0695d0abcf  gnome-applets-2.27.91.tar.bz2
+5b1c417ace3bc0083f0b8839709f40e4  gnome-applets-2.27.92.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep  8 22:12:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  8 Sep 2009 22:12:11 +0000 (UTC)
Subject: rpms/bickley/devel bickley-fixppc2.patch, 1.1, 1.2 bickley.spec, 1.1,
	1.2
Message-ID: <20090908221211.E98BD11C0082@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20414

Modified Files:
	bickley-fixppc2.patch bickley.spec 
Log Message:
- Updated PPC patch

bickley-fixppc2.patch:
 bkl-investigator.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: bickley-fixppc2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley-fixppc2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bickley-fixppc2.patch	31 Aug 2009 23:36:23 -0000	1.1
+++ bickley-fixppc2.patch	8 Sep 2009 22:12:11 -0000	1.2
@@ -1,11 +1,14 @@
---- bickley-0.4.3/src/bkl-investigator.c.orig	2009-07-26 15:56:02.000000000 +0100
-+++ bickley-0.4.3/src/bkl-investigator.c	2009-07-26 15:56:50.000000000 +0100
-@@ -68,8 +68,6 @@
+--- bickley-0.4.3/src/bkl-investigator.c.orig	2009-09-08 23:00:24.000000000 +0100
++++ bickley-0.4.3/src/bkl-investigator.c	2009-09-08 23:01:45.000000000 +0100
+@@ -68,6 +68,11 @@
  #elif defined (__x86_64__)
  #  define HAVE_IO_PRIO
  #  define __NR_ioprio_set 251
--#else
--#  warning "Architecture does not support ioprio modification"
++#elif defined (__powerpc__)
++#  define HAVE_IO_PRIO
++#  define __NR_ioprio_set 273
++#else
++#  error "Unsupported arch"
  #endif
  #define IOPRIO_WHO_PROCESS 1
  #define IOPRIO_CLASS_IDLE 3


Index: bickley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bickley.spec	31 Aug 2009 23:36:23 -0000	1.1
+++ bickley.spec	8 Sep 2009 22:12:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bickley
 Version:        0.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A meta data management API and framework
 
 Group:          Applications/Multimedia
@@ -126,6 +126,9 @@ gconftool-2 --makefile-install-rule \
 %{_libdir}/libkozo.so
 
 %changelog
+* Tue Sep  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-7
+- Updated PPC patch
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-6
 - Package review updates
 



From allisson at fedoraproject.org  Tue Sep  8 22:21:56 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  8 Sep 2009 22:21:56 +0000 (UTC)
Subject: rpms/emesene/devel emesene.spec,1.10,1.11 import.log,1.2,1.3
Message-ID: <20090908222156.E0F2F11C0082@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22973/devel

Modified Files:
	emesene.spec import.log 
Log Message:

Fix libmimic.so location for x86_64 and ppc64.



Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/emesene.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- emesene.spec	25 Aug 2009 14:03:47 -0000	1.10
+++ emesene.spec	8 Sep 2009 22:21:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           emesene
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
@@ -68,6 +68,10 @@ cd %{_datadir}/%name
 exec ./%name
 EOF
 
+# Fix BZ #519242
+%ifarch x86_64 ppc64
+sed -i 's/\/usr\/lib\/emesene/\/usr\/lib64\/emesene/g' %buildroot%{_datadir}/%name/%name
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,6 +119,9 @@ fi
 
 
 %changelog
+* Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
+- Fix libmimic.so location for x86_64 and ppc64.
+
 * Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-3
 - Added libmimic to pythonpath.
 - Package own /usr/share/emesene now.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Aug 2009 14:03:47 -0000	1.2
+++ import.log	8 Sep 2009 22:21:56 -0000	1.3
@@ -1,2 +1,3 @@
 emesene-1_5-2_fc11:HEAD:emesene-1.5-2.fc11.src.rpm:1251177087
 emesene-1_5-3_fc11:HEAD:emesene-1.5-3.fc11.src.rpm:1251208986
+emesene-1_5-4_fc11:HEAD:emesene-1.5-4.fc11.src.rpm:1252448480



From allisson at fedoraproject.org  Tue Sep  8 22:25:21 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  8 Sep 2009 22:25:21 +0000 (UTC)
Subject: rpms/emesene/F-11 emesene.spec,1.9,1.10 import.log,1.2,1.3
Message-ID: <20090908222521.6820711C0082@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24053/F-11

Modified Files:
	emesene.spec import.log 
Log Message:

Fix libmimic.so location for x86_64 and ppc64.



Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/emesene.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- emesene.spec	25 Aug 2009 14:05:47 -0000	1.9
+++ emesene.spec	8 Sep 2009 22:25:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           emesene
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
@@ -68,6 +68,10 @@ cd %{_datadir}/%name
 exec ./%name
 EOF
 
+# Fix BZ #519242
+%ifarch x86_64 ppc64
+sed -i 's/\/usr\/lib\/emesene/\/usr\/lib64\/emesene/g' %buildroot%{_datadir}/%name/%name
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,6 +119,9 @@ fi
 
 
 %changelog
+* Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
+- Fix libmimic.so location for x86_64 and ppc64.
+
 * Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-3
 - Added libmimic to pythonpath.
 - Package own /usr/share/emesene now.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Aug 2009 14:05:47 -0000	1.2
+++ import.log	8 Sep 2009 22:25:21 -0000	1.3
@@ -1,2 +1,3 @@
 emesene-1_5-2_fc11:F-11:emesene-1.5-2.fc11.src.rpm:1251177266
 emesene-1_5-3_fc11:F-11:emesene-1.5-3.fc11.src.rpm:1251209092
+emesene-1_5-4_fc11:F-11:emesene-1.5-4.fc11.src.rpm:1252448702



From allisson at fedoraproject.org  Tue Sep  8 22:28:38 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  8 Sep 2009 22:28:38 +0000 (UTC)
Subject: rpms/emesene/F-10 emesene.spec,1.7,1.8 import.log,1.2,1.3
Message-ID: <20090908222838.1791211C0082@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26858/F-10

Modified Files:
	emesene.spec import.log 
Log Message:

Fix libmimic.so location for x86_64 and ppc64.



Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/emesene.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- emesene.spec	25 Aug 2009 14:07:58 -0000	1.7
+++ emesene.spec	8 Sep 2009 22:28:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           emesene
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
@@ -68,6 +68,10 @@ cd %{_datadir}/%name
 exec ./%name
 EOF
 
+# Fix BZ #519242
+%ifarch x86_64 ppc64
+sed -i 's/\/usr\/lib\/emesene/\/usr\/lib64\/emesene/g' %buildroot%{_datadir}/%name/%name
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,6 +119,9 @@ fi
 
 
 %changelog
+* Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
+- Fix libmimic.so location for x86_64 and ppc64.
+
 * Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-3
 - Added libmimic to pythonpath.
 - Package own /usr/share/emesene now.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Aug 2009 14:07:58 -0000	1.2
+++ import.log	8 Sep 2009 22:28:37 -0000	1.3
@@ -1,2 +1,3 @@
 emesene-1_5-2_fc11:F-10:emesene-1.5-2.fc11.src.rpm:1251177353
 emesene-1_5-3_fc11:F-10:emesene-1.5-3.fc11.src.rpm:1251209217
+emesene-1_5-4_fc11:F-10:emesene-1.5-4.fc11.src.rpm:1252448879



From whot at fedoraproject.org  Tue Sep  8 22:29:54 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  8 Sep 2009 22:29:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.37, 1.38 commitid, 1.3, 
	1.4 sources, 1.37, 1.38 xorg-x11-drv-evdev.spec, 1.59, 1.60
Message-ID: <20090908222954.006B611C0082@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28019

Modified Files:
	.cvsignore commitid sources xorg-x11-drv-evdev.spec 
Log Message:
* Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-7.20090909
- Update to today's git master



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	14 Aug 2009 02:15:38 -0000	1.37
+++ .cvsignore	8 Sep 2009 22:29:53 -0000	1.38
@@ -1 +1 @@
-xf86-input-evdev-20090814.tar.bz2
+xf86-input-evdev-20090909.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/commitid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- commitid	14 Aug 2009 02:15:38 -0000	1.3
+++ commitid	8 Sep 2009 22:29:53 -0000	1.4
@@ -1 +1 @@
-ca0fb396f1a4b87be9f8aa7ad066e0b469c9075d
+415b6ffa958e3103eeb52af4ccd881497169eed4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	14 Aug 2009 02:15:38 -0000	1.37
+++ sources	8 Sep 2009 22:29:53 -0000	1.38
@@ -1 +1 @@
-b4da7e1563241129b493a775f66929e6  xf86-input-evdev-20090814.tar.bz2
+4c7ec291513f4626ef7db6038cb32cd8  xf86-input-evdev-20090909.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- xorg-x11-drv-evdev.spec	14 Aug 2009 02:15:38 -0000	1.59
+++ xorg-x11-drv-evdev.spec	8 Sep 2009 22:29:53 -0000	1.60
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090814
+%define gitdate 20090909
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.2.99
-Release:    6.%{gitdate}%{?dist}
+Release:    7.%{gitdate}%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -71,6 +71,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-7.20090909
+- Update to today's git master
+
 * Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-6.20090814
 - Update to today's git master
 



From mclasen at fedoraproject.org  Tue Sep  8 22:49:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Sep 2009 22:49:03 +0000 (UTC)
Subject: rpms/eog-plugins/devel .cvsignore, 1.2, 1.3 eog-plugins.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090908224903.90CBC11C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4692

Modified Files:
	.cvsignore eog-plugins.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Aug 2009 21:38:14 -0000	1.2
+++ .cvsignore	8 Sep 2009 22:49:01 -0000	1.3
@@ -1 +1 @@
-eog-plugins-2.27.91.tar.bz2
+eog-plugins-2.27.92.tar.bz2


Index: eog-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/eog-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eog-plugins.spec	28 Aug 2009 21:43:45 -0000	1.3
+++ eog-plugins.spec	8 Sep 2009 22:49:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           eog-plugins
-Version:        2.27.91
-Release:        2%{?dist}
+Version:        2.27.92
+Release:        1%{?dist}
 Summary:        A collection of plugins for the eog image viewer
 
 Group:          User Interface/Desktops
@@ -25,7 +25,7 @@ display of Exif information, Zoom to fit
 
 %build
 %configure --disable-silent-rules
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Fri Aug 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-2
 - Build verbosely
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Aug 2009 21:38:14 -0000	1.2
+++ sources	8 Sep 2009 22:49:01 -0000	1.3
@@ -1 +1 @@
-e2b4267cd9906114866fb7b9202f42bc  eog-plugins-2.27.91.tar.bz2
+88e1afeaeb0c178096ed3f444bd54cb5  eog-plugins-2.27.92.tar.bz2



From airlied at fedoraproject.org  Tue Sep  8 22:51:12 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 22:51:12 +0000 (UTC)
Subject: rpms/kernel/devel drm-next.patch, 1.17, 1.18 kernel.spec, 1.1775,
	1.1776
Message-ID: <20090908225112.7BB2B11C0082@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4623

Modified Files:
	drm-next.patch kernel.spec 
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.213.rc9.git1
- fix two bugs in r600 kms, fencing + mobile lvds


drm-next.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   77 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  220 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  504 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  701 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  435 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  737 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  100 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1047 
 b/drivers/gpu/drm/radeon/r100_track.h             |  124 
 b/drivers/gpu/drm/radeon/r100d.h                  |   76 
 b/drivers/gpu/drm/radeon/r200.c                   |  456 
 b/drivers/gpu/drm/radeon/r300.c                   |  411 
 b/drivers/gpu/drm/radeon/r300d.h                  |   76 
 b/drivers/gpu/drm/radeon/r600.c                   | 1714 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  855 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  777 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  658 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  126 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  159 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |   79 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  215 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  128 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  340 
 b/drivers/gpu/drm/radeon/radeon_display.c         |   18 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   21 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  146 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  125 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  670 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   44 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  339 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   52 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  119 
 b/drivers/gpu/drm/radeon/radeon_share.h           |   77 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   18 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |    2 
 b/drivers/gpu/drm/radeon/rs600.c                  |   60 
 b/drivers/gpu/drm/radeon/rs690.c                  |    1 
 b/drivers/gpu/drm/radeon/rv515.c                  |  518 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  |  987 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   16 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |   82 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 154 files changed, 33674 insertions(+), 41500 deletions(-)

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- drm-next.patch	8 Sep 2009 04:57:21 -0000	1.17
+++ drm-next.patch	8 Sep 2009 22:51:11 -0000	1.18
@@ -55005,7 +55005,7 @@ index 6fa32da..c7b1859 100644
  #       define R600_TC_L2_SIZE(x)                              ((x) << 5)
  #       define R600_L2_DISABLE_LATE_HIT                        (1 << 9)
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
-index 0a92706..8a353ea 100644
+index 0a92706..9ad2035 100644
 --- a/drivers/gpu/drm/radeon/radeon_encoders.c
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
 @@ -126,6 +126,23 @@ radeon_link_encoder_connector(struct drm_device *dev)
@@ -55301,6 +55301,23 @@ index 0a92706..8a353ea 100644
  		drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs);
  		break;
  	case ENCODER_OBJECT_ID_INTERNAL_DVO1:
+@@ -1345,8 +1400,14 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
+ 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+ 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+ 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+-		drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
+-		radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
++		if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
++			radeon_encoder->rmx_type = RMX_FULL;
++			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS);
++			radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);
++		} else {
++			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
++			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
++		}
+ 		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
+ 		break;
+ 	}
 diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
 index ec383ed..ebb5895 100644
 --- a/drivers/gpu/drm/radeon/radeon_fb.c
@@ -56103,7 +56120,7 @@ index ec383ed..ebb5895 100644
  }
  EXPORT_SYMBOL(radeonfb_remove);
 diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
-index b4e48dd..01a8963 100644
+index b4e48dd..3beb26d 100644
 --- a/drivers/gpu/drm/radeon/radeon_fence.c
 +++ b/drivers/gpu/drm/radeon/radeon_fence.c
 @@ -53,9 +53,9 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
@@ -56118,7 +56135,7 @@ index b4e48dd..01a8963 100644
  	fence->emited = true;
  	fence->timeout = jiffies + ((2000 * HZ) / 1000);
  	list_del(&fence->list);
-@@ -168,7 +168,47 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
+@@ -168,7 +168,38 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
  	return signaled;
  }
  
@@ -56126,17 +56143,8 @@ index b4e48dd..01a8963 100644
 +int r600_fence_wait(struct radeon_fence *fence,  bool intr, bool lazy)
 +{
 +	struct radeon_device *rdev;
-+	unsigned long cur_jiffies;
-+	unsigned long timeout;
 +	int ret = 0;
 +
-+	cur_jiffies = jiffies;
-+	timeout = HZ / 100;
-+
-+	if (time_after(fence->timeout, cur_jiffies)) {
-+		timeout = fence->timeout - cur_jiffies;
-+	}
-+
 +	rdev = fence->rdev;
 +
 +	__set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
@@ -56145,7 +56153,7 @@ index b4e48dd..01a8963 100644
 +		if (radeon_fence_signaled(fence))
 +			break;
 +
-+		if (time_after_eq(jiffies, timeout)) {
++		if (time_after_eq(jiffies, fence->timeout)) {
 +			ret = -EBUSY;
 +			break;
 +		}
@@ -56167,7 +56175,7 @@ index b4e48dd..01a8963 100644
  {
  	struct radeon_device *rdev;
  	unsigned long cur_jiffies;
-@@ -176,7 +216,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+@@ -176,7 +207,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
  	bool expired = false;
  	int r;
  
@@ -56175,7 +56183,7 @@ index b4e48dd..01a8963 100644
  	if (fence == NULL) {
  		WARN(1, "Querying an invalid fence : %p !\n", fence);
  		return 0;
-@@ -185,13 +224,22 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+@@ -185,13 +215,22 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
  	if (radeon_fence_signaled(fence)) {
  		return 0;
  	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1775
retrieving revision 1.1776
diff -u -p -r1.1775 -r1.1776
--- kernel.spec	8 Sep 2009 07:32:14 -0000	1.1775
+++ kernel.spec	8 Sep 2009 22:51:11 -0000	1.1776
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.213.rc9.git1
+- fix two bugs in r600 kms, fencing + mobile lvds
+
 * Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.212.rc9.git1
 - drm-nouveau.patch: fix ppc build
 



From airlied at fedoraproject.org  Tue Sep  8 23:06:44 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  8 Sep 2009 23:06:44 +0000 (UTC)
Subject: rpms/mesa/devel .cvsignore, 1.36, 1.37 mesa-7.6-dri2-page-flip.patch,
	1.1, 1.2 mesa.spec, 1.251, 1.252 sources, 1.38, 1.39
Message-ID: <20090908230644.73FF311C0082@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10912

Modified Files:
	.cvsignore mesa-7.6-dri2-page-flip.patch mesa.spec sources 
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 7.6-0.10
- new git snap for 090909



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	13 Aug 2009 18:57:29 -0000	1.36
+++ .cvsignore	8 Sep 2009 23:06:41 -0000	1.37
@@ -5,3 +5,4 @@ MesaLib-7.3.tar.bz2
 mesa-20090322.tar.bz2
 mesa-20090723.tar.bz2
 mesa-20090813.tar.bz2
+mesa-20090909.tar.bz2

mesa-7.6-dri2-page-flip.patch:
 include/GL/internal/dri_interface.h           |   14 ++++++++-
 src/glx/x11/dri2.c                            |   16 ++++++++++
 src/glx/x11/dri2.h                            |    3 ++
 src/glx/x11/dri2_glx.c                        |   39 ++++++++++++++++++++------
 src/mesa/drivers/dri/common/dri_util.c        |    1 
 src/mesa/drivers/dri/common/dri_util.h        |    2 +
 src/mesa/drivers/dri/intel/intel_context.c    |   15 ++++------
 src/mesa/drivers/dri/intel/intel_context.h    |    1 
 src/mesa/drivers/dri/intel/intel_extensions.h |    3 ++
 src/mesa/drivers/dri/intel/intel_screen.c     |   36 ++++++++++++++++++------
 src/mesa/drivers/dri/intel/intel_tex_image.c  |    3 +-
 11 files changed, 107 insertions(+), 26 deletions(-)

Index: mesa-7.6-dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.6-dri2-page-flip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mesa-7.6-dri2-page-flip.patch	31 Jul 2009 16:20:03 -0000	1.1
+++ mesa-7.6-dri2-page-flip.patch	8 Sep 2009 23:06:41 -0000	1.2
@@ -1,7 +1,6 @@
-diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
-index 910c916..ec6238f 100644
---- a/include/GL/internal/dri_interface.h
-+++ b/include/GL/internal/dri_interface.h
+diff -up mesa-20090909/include/GL/internal/dri_interface.h.da mesa-20090909/include/GL/internal/dri_interface.h
+--- mesa-20090909/include/GL/internal/dri_interface.h.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/include/GL/internal/dri_interface.h	2009-09-09 08:56:48.000000000 +1000
 @@ -262,10 +262,22 @@ struct __DRItexBufferExtensionRec {
   * Used by drivers that implement DRI2
   */
@@ -26,13 +25,12 @@ index 910c916..ec6238f 100644
  };
  
  
-diff --git a/src/glx/x11/dri2.c b/src/glx/x11/dri2.c
-index ebb2985..a7863ee 100644
---- a/src/glx/x11/dri2.c
-+++ b/src/glx/x11/dri2.c
-@@ -369,3 +369,19 @@ void DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
-     UnlockDisplay(dpy);
-     SyncHandle();
+diff -up mesa-20090909/src/glx/x11/dri2.c.da mesa-20090909/src/glx/x11/dri2.c
+--- mesa-20090909/src/glx/x11/dri2.c.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/glx/x11/dri2.c	2009-09-09 08:56:48.000000000 +1000
+@@ -377,3 +377,19 @@ DRI2CopyRegion(Display * dpy, XID drawab
+    UnlockDisplay(dpy);
+    SyncHandle();
  }
 +
 +void DRI2SwapBuffers(Display *dpy, XID drawable)
@@ -50,22 +48,9 @@ index ebb2985..a7863ee 100644
 +    UnlockDisplay(dpy);
 +    SyncHandle();
 +}
-diff --git a/src/glx/x11/dri2.h b/src/glx/x11/dri2.h
-index b0e61f8..fc80649 100644
---- a/src/glx/x11/dri2.h
-+++ b/src/glx/x11/dri2.h
-@@ -77,4 +77,7 @@ extern void
- DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
- 	       CARD32 dest, CARD32 src);
- 
-+extern void
-+DRI2SwapBuffers(Display *dpy, XID drawable);
-+
- #endif
-diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
-index f4865ae..48c8c71 100644
---- a/src/glx/x11/dri2_glx.c
-+++ b/src/glx/x11/dri2_glx.c
+diff -up mesa-20090909/src/glx/x11/dri2_glx.c.da mesa-20090909/src/glx/x11/dri2_glx.c
+--- mesa-20090909/src/glx/x11/dri2_glx.c.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/glx/x11/dri2_glx.c	2009-09-09 09:01:13.000000000 +1000
 @@ -35,6 +35,7 @@
  #include <X11/Xlib.h>
  #include <X11/extensions/Xfixes.h>
@@ -74,30 +59,31 @@ index f4865ae..48c8c71 100644
  #include "glxclient.h"
  #include "glcontextmodes.h"
  #include "xf86dri.h"
-@@ -63,6 +64,8 @@ struct __GLXDRIdisplayPrivateRec {
-     int driMajor;
-     int driMinor;
-     int driPatch;
+@@ -64,6 +65,8 @@ struct __GLXDRIdisplayPrivateRec
+    int driMajor;
+    int driMinor;
+    int driPatch;
 +
-+    int swapAvailable;
++   int swapAvailable;
  };
  
- struct __GLXDRIcontextPrivateRec {
-@@ -224,13 +227,6 @@ static void dri2CopySubBuffer(__GLXDRIdrawable *pdraw,
-     dri2WaitX(pdraw);
+ struct __GLXDRIcontextPrivateRec
+@@ -232,14 +235,6 @@ dri2CopySubBuffer(__GLXDRIdrawable * pdr
  }
  
--static void dri2SwapBuffers(__GLXDRIdrawable *pdraw)
+ static void
+-dri2SwapBuffers(__GLXDRIdrawable * pdraw)
 -{
--    __GLXDRIdrawablePrivate *priv = (__GLXDRIdrawablePrivate *) pdraw;
+-   __GLXDRIdrawablePrivate *priv = (__GLXDRIdrawablePrivate *) pdraw;
 -
--    dri2CopySubBuffer(pdraw, 0, 0, priv->width, priv->height);
+-   dri2CopySubBuffer(pdraw, 0, 0, priv->width, priv->height);
 -}
 -
- static void dri2WaitX(__GLXDRIdrawable *pdraw)
+-static void
+ dri2WaitX(__GLXDRIdrawable * pdraw)
  {
-     __GLXDRIdrawablePrivate *priv = (__GLXDRIdrawablePrivate *) pdraw;
-@@ -331,6 +327,31 @@ process_buffers(__GLXDRIdrawablePrivate *pdraw, DRI2Buffer *buffers,
+    __GLXDRIdrawablePrivate *priv = (__GLXDRIdrawablePrivate *) pdraw;
+@@ -342,6 +337,31 @@ process_buffers(__GLXDRIdrawablePrivate 
  
  }
  
@@ -127,23 +113,33 @@ index f4865ae..48c8c71 100644
 +}
 +
  static __DRIbuffer *
- dri2GetBuffers(__DRIdrawable *driDrawable,
- 	       int *width, int *height,
-@@ -544,6 +565,9 @@ _X_HIDDEN __GLXDRIdisplay *dri2CreateDisplay(Display *dpy)
-     }
- 
-     pdp->driPatch = 0;
-+    pdp->swapAvailable = 0;
-+    if (pdp->driMinor >= 2)
-+	pdp->swapAvailable = 1;
- 
-     pdp->base.destroyDisplay = dri2DestroyDisplay;
-     pdp->base.createScreen = dri2CreateScreen;
-diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
-index 1d94060..3c5e580 100644
---- a/src/mesa/drivers/dri/common/dri_util.c
-+++ b/src/mesa/drivers/dri/common/dri_util.c
-@@ -453,6 +453,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
+ dri2GetBuffers(__DRIdrawable * driDrawable,
+                int *width, int *height,
+@@ -559,6 +579,9 @@ dri2CreateDisplay(Display * dpy)
+    }
+ 
+    pdp->driPatch = 0;
++   pdp->swapAvailable = 0;
++   if (pdp->driMinor >= 2)
++      pdp->swapAvailable = 1;
+ 
+    pdp->base.destroyDisplay = dri2DestroyDisplay;
+    pdp->base.createScreen = dri2CreateScreen;
+diff -up mesa-20090909/src/glx/x11/dri2.h.da mesa-20090909/src/glx/x11/dri2.h
+--- mesa-20090909/src/glx/x11/dri2.h.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/glx/x11/dri2.h	2009-09-09 08:56:48.000000000 +1000
+@@ -85,4 +85,7 @@ DRI2CopyRegion(Display * dpy, XID drawab
+                XserverRegion region,
+                CARD32 dest, CARD32 src);
+ 
++extern void
++DRI2SwapBuffers(Display *dpy, XID drawable);
++
+ #endif
+diff -up mesa-20090909/src/mesa/drivers/dri/common/dri_util.c.da mesa-20090909/src/mesa/drivers/dri/common/dri_util.c
+--- mesa-20090909/src/mesa/drivers/dri/common/dri_util.c.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/common/dri_util.c	2009-09-09 08:56:48.000000000 +1000
+@@ -453,6 +453,7 @@ driCreateNewDrawable(__DRIscreen *psp, c
  
      pdp->driScreenPriv = psp;
      pdp->driContextPriv = &psp->dummyContextPriv;
@@ -151,10 +147,9 @@ index 1d94060..3c5e580 100644
  
      if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes,
  					renderType == GLX_PIXMAP_BIT)) {
-diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
-index c95a5c8..c3046d6 100644
---- a/src/mesa/drivers/dri/common/dri_util.h
-+++ b/src/mesa/drivers/dri/common/dri_util.h
+diff -up mesa-20090909/src/mesa/drivers/dri/common/dri_util.h.da mesa-20090909/src/mesa/drivers/dri/common/dri_util.h
+--- mesa-20090909/src/mesa/drivers/dri/common/dri_util.h.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/common/dri_util.h	2009-09-09 08:56:48.000000000 +1000
 @@ -380,6 +380,8 @@ struct __DRIdrawableRec {
       * GLX_MESA_swap_control.
       */
@@ -164,11 +159,10 @@ index c95a5c8..c3046d6 100644
  };
  
  /**
-diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
-index 4abb525..42e946f 100644
---- a/src/mesa/drivers/dri/intel/intel_context.c
-+++ b/src/mesa/drivers/dri/intel/intel_context.c
-@@ -71,8 +71,6 @@ int INTEL_DEBUG = (0);
+diff -up mesa-20090909/src/mesa/drivers/dri/intel/intel_context.c.da mesa-20090909/src/mesa/drivers/dri/intel/intel_context.c
+--- mesa-20090909/src/mesa/drivers/dri/intel/intel_context.c.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/intel/intel_context.c	2009-09-09 08:56:48.000000000 +1000
+@@ -72,8 +72,6 @@ int INTEL_DEBUG = (0);
  #define DRIVER_DATE_GEM                 "GEM " DRIVER_DATE
  
  
@@ -177,7 +171,7 @@ index 4abb525..42e946f 100644
  static const GLubyte *
  intelGetString(GLcontext * ctx, GLenum name)
  {
-@@ -390,6 +388,7 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
+@@ -391,6 +389,7 @@ intel_update_renderbuffers(__DRIcontext 
         }
     }
  
@@ -185,7 +179,7 @@ index 4abb525..42e946f 100644
     driUpdateFramebufferSize(&intel->ctx, drawable);
  }
  
-@@ -477,7 +476,7 @@ intelInvalidateState(GLcontext * ctx, GLuint new_state)
+@@ -478,7 +477,7 @@ intelInvalidateState(GLcontext * ctx, GL
        intel->vtbl.invalidate_state( intel, new_state );
  }
  
@@ -194,7 +188,7 @@ index 4abb525..42e946f 100644
  intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
  {
     struct intel_context *intel = intel_context(ctx);
-@@ -908,11 +907,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
+@@ -936,11 +935,7 @@ intelMakeCurrent(__DRIcontextPrivate * d
  	 (struct intel_framebuffer *) driDrawPriv->driverPrivate;
        GLframebuffer *readFb = (GLframebuffer *) driReadPriv->driverPrivate;
   
@@ -207,7 +201,7 @@ index 4abb525..42e946f 100644
            /* XXX FBO temporary fix-ups!  These are released in 
             * intelDextroyContext(), above.  Changes here should be
             * reflected there.
-@@ -1067,6 +1062,10 @@ void LOCK_HARDWARE( struct intel_context *intel )
+@@ -1095,6 +1090,10 @@ void LOCK_HARDWARE( struct intel_context
      if (intel->driDrawable) {
         intel_fb = intel->driDrawable->driverPrivate;
  
@@ -218,11 +212,10 @@ index 4abb525..42e946f 100644
         if (intel_fb)
  	  intel_rb =
  	     intel_get_renderbuffer(&intel_fb->Base,
-diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
-index 08bea88..57cb247 100644
---- a/src/mesa/drivers/dri/intel/intel_context.h
-+++ b/src/mesa/drivers/dri/intel/intel_context.h
-@@ -462,6 +462,7 @@ extern void intelGetLock(struct intel_context *intel, GLuint flags);
+diff -up mesa-20090909/src/mesa/drivers/dri/intel/intel_context.h.da mesa-20090909/src/mesa/drivers/dri/intel/intel_context.h
+--- mesa-20090909/src/mesa/drivers/dri/intel/intel_context.h.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/intel/intel_context.h	2009-09-09 08:56:48.000000000 +1000
+@@ -473,6 +473,7 @@ extern void intelGetLock(struct intel_co
  
  extern void intelFinish(GLcontext * ctx);
  extern void intelFlush(GLcontext * ctx);
@@ -230,10 +223,9 @@ index 08bea88..57cb247 100644
  
  extern void intelInitDriverFunctions(struct dd_function_table *functions);
  
-diff --git a/src/mesa/drivers/dri/intel/intel_extensions.h b/src/mesa/drivers/dri/intel/intel_extensions.h
-index 97147ec..9283ee9 100644
---- a/src/mesa/drivers/dri/intel/intel_extensions.h
-+++ b/src/mesa/drivers/dri/intel/intel_extensions.h
+diff -up mesa-20090909/src/mesa/drivers/dri/intel/intel_extensions.h.da mesa-20090909/src/mesa/drivers/dri/intel/intel_extensions.h
+--- mesa-20090909/src/mesa/drivers/dri/intel/intel_extensions.h.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/intel/intel_extensions.h	2009-09-09 08:56:48.000000000 +1000
 @@ -32,5 +32,8 @@
  extern void
  intelInitExtensions(GLcontext *ctx, GLboolean enable_imaging);
@@ -243,11 +235,10 @@ index 97147ec..9283ee9 100644
 +
  
  #endif
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index 6bbc995..7767ff9 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -225,6 +225,28 @@ static const __DRItexBufferExtension intelTexBufferExtension = {
+diff -up mesa-20090909/src/mesa/drivers/dri/intel/intel_screen.c.da mesa-20090909/src/mesa/drivers/dri/intel/intel_screen.c
+--- mesa-20090909/src/mesa/drivers/dri/intel/intel_screen.c.da	2009-09-09 08:56:16.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/intel/intel_screen.c	2009-09-09 08:56:48.000000000 +1000
+@@ -229,6 +229,28 @@ static const __DRItexBufferExtension int
     intelSetTexBuffer2,
  };
  
@@ -276,7 +267,7 @@ index 6bbc995..7767ff9 100644
  static const __DRIextension *intelScreenExtensions[] = {
      &driReadDrawableExtension,
      &driCopySubBufferExtension.base,
-@@ -233,6 +255,7 @@ static const __DRIextension *intelScreenExtensions[] = {
+@@ -237,6 +259,7 @@ static const __DRIextension *intelScreen
      &driMediaStreamCounterExtension.base,
      &intelTexOffsetExtension.base,
      &intelTexBufferExtension.base,
@@ -284,7 +275,7 @@ index 6bbc995..7767ff9 100644
      NULL
  };
  
-@@ -513,11 +536,9 @@ intelFillInModes(__DRIscreenPrivate *psp,
+@@ -517,11 +540,9 @@ intelFillInModes(__DRIscreenPrivate *psp
     unsigned back_buffer_factor;
     int i;
  
@@ -298,7 +289,7 @@ index 6bbc995..7767ff9 100644
     };
  
     uint8_t depth_bits_array[3];
-@@ -738,11 +759,10 @@ __DRIconfig **intelInitScreen2(__DRIscreenPrivate *psp)
+@@ -742,11 +763,10 @@ __DRIconfig **intelInitScreen2(__DRIscre
     intelScreenPrivate *intelScreen;
     GLenum fb_format[3];
     GLenum fb_type[3];
@@ -313,11 +304,10 @@ index 6bbc995..7767ff9 100644
     };
     uint8_t depth_bits[4], stencil_bits[4], msaa_samples_array[1];
     int color;
-diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
-index c5f5220..54c3d16 100644
---- a/src/mesa/drivers/dri/intel/intel_tex_image.c
-+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
-@@ -751,7 +751,8 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
+diff -up mesa-20090909/src/mesa/drivers/dri/intel/intel_tex_image.c.da mesa-20090909/src/mesa/drivers/dri/intel/intel_tex_image.c
+--- mesa-20090909/src/mesa/drivers/dri/intel/intel_tex_image.c.da	2009-09-09 09:43:36.000000000 +1000
++++ mesa-20090909/src/mesa/drivers/dri/intel/intel_tex_image.c	2009-09-09 08:56:48.000000000 +1000
+@@ -747,7 +747,8 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx
     if (!intelObj)
        return;
  


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- mesa.spec	13 Aug 2009 18:57:29 -0000	1.251
+++ mesa.spec	8 Sep 2009 23:06:41 -0000	1.252
@@ -13,7 +13,7 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090813
+%define gitdate 20090909
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 7.6-0.10
+- new git snap for 090909
+
 * Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 7.6-0.9
 - Today's git snap.
 - mesa-7.1-disable-intel-classic-warn.patch: Drop.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	13 Aug 2009 18:57:30 -0000	1.38
+++ sources	8 Sep 2009 23:06:42 -0000	1.39
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-e4b84f75a05c52325edde32c0fb72f09  mesa-20090813.tar.bz2
+d8b62c4067888a255900fa962670ba43  mesa-20090909.tar.bz2



From cwickert at fedoraproject.org  Tue Sep  8 23:10:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  8 Sep 2009 23:10:24 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.109,1.110 comps-f11.xml.in,1.293,1.294
Message-ID: <20090908231024.2CF9C11C043D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12815

Modified Files:
	comps-f12.xml.in comps-f11.xml.in 
Log Message:
update sugar-desktop group


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- comps-f12.xml.in	7 Sep 2009 19:42:11 -0000	1.109
+++ comps-f12.xml.in	8 Sep 2009 23:10:23 -0000	1.110
@@ -5200,9 +5200,22 @@
       <packagereq type="default">sugar-terminal</packagereq>
       <packagereq type="default">sugar-turtleart</packagereq>
       <packagereq type="default">sugar-write</packagereq>
+      <packagereq type="optional">sugar-analyze</packagereq>
+      <packagereq type="optional">sugar-clock</packagereq>
+      <packagereq type="optional">sugar-connect</packagereq>
+      <packagereq type="optional">sugar-distance</packagereq>
+      <packagereq type="optional">sugar-emulator</packagereq>
       <packagereq type="optional">sugar-finance</packagereq>
+      <packagereq type="optional">sugar-flipsticks</packagereq>
       <packagereq type="optional">sugar-help</packagereq>
+      <packagereq type="optional">sugar-implode</packagereq>
+      <packagereq type="optional">sugar-infoslicer</packagereq>
+      <packagereq type="optional">sugar-memorize</packagereq>
       <packagereq type="optional">sugar-moon</packagereq>
+      <packagereq type="optional">sugar-playgo</packagereq>
+      <packagereq type="optional">sugar-record</packagereq>
+      <packagereq type="optional">sugar-speak</packagereq>
+      <packagereq type="optional">sugar-update-control</packagereq>
       <packagereq type="optional">sugar-xoirc</packagereq>
       <packagereq type="optional">sugar-xomail</packagereq>
     </packagelist>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- comps-f11.xml.in	7 Sep 2009 19:42:10 -0000	1.293
+++ comps-f11.xml.in	8 Sep 2009 23:10:23 -0000	1.294
@@ -5020,9 +5020,22 @@
       <packagereq type="default">sugar-terminal</packagereq>
       <packagereq type="default">sugar-turtleart</packagereq>
       <packagereq type="default">sugar-write</packagereq>
+      <packagereq type="optional">sugar-analyze</packagereq>
+      <packagereq type="optional">sugar-clock</packagereq>
+      <packagereq type="optional">sugar-connect</packagereq>
+      <packagereq type="optional">sugar-distance</packagereq>
+      <packagereq type="optional">sugar-emulator</packagereq>
       <packagereq type="optional">sugar-finance</packagereq>
+      <packagereq type="optional">sugar-flipsticks</packagereq>
       <packagereq type="optional">sugar-help</packagereq>
+      <packagereq type="optional">sugar-implode</packagereq>
+      <packagereq type="optional">sugar-infoslicer</packagereq>
+      <packagereq type="optional">sugar-memorize</packagereq>
       <packagereq type="optional">sugar-moon</packagereq>
+      <packagereq type="optional">sugar-playgo</packagereq>
+      <packagereq type="optional">sugar-record</packagereq>
+      <packagereq type="optional">sugar-speak</packagereq>
+      <packagereq type="optional">sugar-update-control</packagereq>
       <packagereq type="optional">sugar-xoirc</packagereq>
       <packagereq type="optional">sugar-xomail</packagereq>
     </packagelist>



From dwalsh at fedoraproject.org  Tue Sep  8 23:55:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  8 Sep 2009 23:55:33 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.30,
	1.31 modules-mls.conf, 1.57, 1.58 modules-targeted.conf, 1.139,
	1.140 policy-F12.patch, 1.74, 1.75 selinux-policy.spec, 1.913, 1.914
Message-ID: <20090908235533.2086111C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25056

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-6
- More fixes



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- modules-minimum.conf	26 Aug 2009 20:19:01 -0000	1.30
+++ modules-minimum.conf	8 Sep 2009 23:55:30 -0000	1.31
@@ -226,6 +226,13 @@ certmaster = module
 cipe = module
 
 # Layer: services
+# Module: chronyd
+#
+# Daemon for maintaining clock time
+# 
+chronyd = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- modules-mls.conf	10 Aug 2009 18:22:10 -0000	1.57
+++ modules-mls.conf	8 Sep 2009 23:55:30 -0000	1.58
@@ -212,6 +212,13 @@ certwatch = module
 certmaster = module
 
 # Layer: services
+# Module: chronyd
+#
+# Daemon for maintaining clock time
+# 
+chronyd = module
+
+q# Layer: services
 # Module: cipe
 #
 # Encrypted tunnel daemon


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- modules-targeted.conf	26 Aug 2009 20:19:01 -0000	1.139
+++ modules-targeted.conf	8 Sep 2009 23:55:30 -0000	1.140
@@ -226,6 +226,13 @@ certmaster = module
 cipe = module
 
 # Layer: services
+# Module: chronyd
+#
+# Daemon for maintaining clock time
+# 
+chronyd = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.

policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  289 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    2 
 policy/modules/kernel/corenetwork.te.in   |   30 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  150 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   88 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  276 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1397 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 328 files changed, 15806 insertions(+), 2939 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- policy-F12.patch	8 Sep 2009 14:30:35 -0000	1.74
+++ policy-F12.patch	8 Sep 2009 23:55:30 -0000	1.75
@@ -846,8 +846,8 @@ diff -b -B --ignore-all-space --exclude-
 +## <summary>The Fedora hardware profiler client</summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.te serefpolicy-3.6.30/policy/modules/admin/smoltclient.te
 --- nsaserefpolicy/policy/modules/admin/smoltclient.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/admin/smoltclient.te	2009-08-31 13:40:47.000000000 -0400
-@@ -0,0 +1,66 @@
++++ serefpolicy-3.6.30/policy/modules/admin/smoltclient.te	2009-09-08 18:22:33.000000000 -0400
+@@ -0,0 +1,67 @@
 +policy_module(smoltclient,1.0.0)
 +
 +########################################
@@ -883,6 +883,7 @@ diff -b -B --ignore-all-space --exclude-
 +kernel_read_network_state(smoltclient_t)
 +kernel_read_kernel_sysctls(smoltclient_t)
 +
++corecmd_exec_bin(smoltclient_t)
 +corecmd_exec_shell(smoltclient_t)
 +
 +corenet_tcp_connect_http_port(smoltclient_t)
@@ -1096,8 +1097,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.6.30/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/vbetool.te	2009-08-31 13:40:47.000000000 -0400
-@@ -15,15 +15,20 @@
++++ serefpolicy-3.6.30/policy/modules/admin/vbetool.te	2009-09-08 18:00:40.000000000 -0400
+@@ -15,15 +15,22 @@
  # Local policy
  #
  
@@ -1116,11 +1117,13 @@ diff -b -B --ignore-all-space --exclude-
 +domain_mmap_low_type(vbetool_t)
 +tunable_policy(`mmap_low_allowed',`
  domain_mmap_low(vbetool_t)
++', `
++dontaudit vbetool_t self:memprotect mmap_zero;
 +')
  
  term_use_unallocated_ttys(vbetool_t)
  
-@@ -34,3 +39,8 @@
+@@ -34,3 +41,8 @@
  	hal_write_log(vbetool_t)
  	hal_dontaudit_append_lib_files(vbetool_t)
  ')
@@ -2427,7 +2430,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.30/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.30/policy/modules/apps/nsplugin.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/apps/nsplugin.if	2009-09-08 18:09:33.000000000 -0400
 @@ -0,0 +1,313 @@
 +
 +## <summary>policy for nsplugin</summary>
@@ -4546,7 +4549,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.30/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/corenetwork.te.in	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/kernel/corenetwork.te.in	2009-09-08 18:22:33.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -4555,7 +4558,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(afs_fs, tcp,2040,s0, udp,7000,s0, udp,7005,s0)
  network_port(afs_ka, udp,7004,s0)
  network_port(afs_pt, udp,7002,s0)
-@@ -87,25 +88,31 @@
+@@ -87,25 +88,32 @@
  network_port(comsat, udp,512,s0)
  network_port(cvs, tcp,2401,s0, udp,2401,s0)
  network_port(cyphesis, tcp,6767,s0, tcp,6769,s0, udp,32771,s0)
@@ -4585,10 +4588,11 @@ diff -b -B --ignore-all-space --exclude-
  network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port
  network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
 +portcon tcp 10001-10010 gen_context(system_u:object_r:http_cache_port_t, s0)
++network_port(chronyd, udp,323,s0)
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,1,s0, udp,1,s0, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
-@@ -128,7 +135,7 @@
+@@ -128,7 +136,7 @@
  network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0)
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
@@ -4597,7 +4601,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(memcache, tcp,11211,s0, udp,11211,s0)
  network_port(mmcc, tcp,5050,s0, udp,5050,s0)
  network_port(monopd, tcp,1234,s0)
-@@ -146,6 +153,12 @@
+@@ -146,6 +154,12 @@
  network_port(pegasus_https, tcp,5989,s0)
  network_port(pgpkeyserver, udp, 11371,s0, tcp,11371,s0)
  network_port(pingd, tcp,9125,s0)
@@ -4610,7 +4614,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(pop, tcp,106,s0, tcp,109,s0, tcp,110,s0, tcp,143,s0, tcp,220,s0, tcp,993,s0, tcp,995,s0, tcp,1109,s0)
  network_port(portmap, udp,111,s0, tcp,111,s0)
  network_port(postfix_policyd, tcp,10031,s0)
-@@ -172,27 +185,31 @@
+@@ -172,27 +186,31 @@
  network_port(sap, tcp,9875,s0, udp,9875,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
@@ -4645,7 +4649,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
  network_port(xfs, tcp,7100,s0)
-@@ -221,6 +238,8 @@
+@@ -221,6 +239,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -5705,8 +5709,53 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.30/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/kernel/filesystem.if	2009-09-08 07:44:43.000000000 -0400
-@@ -1537,6 +1537,24 @@
++++ serefpolicy-3.6.30/policy/modules/kernel/filesystem.if	2009-09-08 19:26:15.000000000 -0400
+@@ -1149,6 +1149,44 @@
+ 	domain_auto_transition_pattern($1, cifs_t, $2)
+ ')
+ 
++#######################################
++## <summary>
++##      Create, read, write, and delete dirs
++##      on a configfs filesystem.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fs_manage_configfs_dirs',`
++        gen_require(`
++                type configfs_t;
++        ')
++
++        manage_dirs_pattern($1,configfs_t,configfs_t)
++')
++
++#######################################
++## <summary>
++##      Create, read, write, and delete files
++##      on a configfs filesystem.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fs_manage_configfs_files',`
++        gen_require(`
++                type configfs_t;
++        ')
++
++        manage_files_pattern($1,configfs_t,configfs_t)
++')
++
+ ########################################
+ ## <summary>
+ ##	Mount a DOS filesystem, such as
+@@ -1537,6 +1575,24 @@
  
  ########################################
  ## <summary>
@@ -5731,7 +5780,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search inotifyfs filesystem. 
  ## </summary>
  ## <param name="domain">
-@@ -2542,6 +2560,42 @@
+@@ -2542,6 +2598,42 @@
  
  ########################################
  ## <summary>
@@ -5774,7 +5823,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write NFS server files.
  ## </summary>
  ## <param name="domain">
-@@ -3971,3 +4025,122 @@
+@@ -3971,3 +4063,122 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -9920,6 +9969,201 @@ diff -b -B --ignore-all-space --exclude-
  allow certmaster_t self:tcp_socket create_stream_socket_perms;
  
  # config files
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.fc serefpolicy-3.6.30/policy/modules/services/chronyd.fc
+--- nsaserefpolicy/policy/modules/services/chronyd.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/chronyd.fc	2009-09-08 18:22:33.000000000 -0400
+@@ -0,0 +1,11 @@
++
++/etc/rc\.d/init\.d/chronyd         --      gen_context(system_u:object_r:chronyd_initrc_exec_t,s0)
++
++/usr/sbin/chronyd                  --      gen_context(system_u:object_r:chronyd_exec_t,s0)
++
++/var/lib/chrony(/.*)?			   gen_context(system_u:object_r:chronyd_var_lib_t,s0)
++
++/var/log/chrony(/.*)?			   gen_context(system_u:object_r:chronyd_var_log_t,s0)
++
++/var/run/chronyd\.pid              --      gen_context(system_u:object_r:chronyd_var_run_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.if serefpolicy-3.6.30/policy/modules/services/chronyd.if
+--- nsaserefpolicy/policy/modules/services/chronyd.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/chronyd.if	2009-09-08 18:22:33.000000000 -0400
+@@ -0,0 +1,105 @@
++## <summary>chrony background daemon</summary>
++
++#####################################
++## <summary>
++##      Execute chronyd in the chronyd domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`chronyd_domtrans',`
++        gen_require(`
++                type chronyd_t, chronyd_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1, chronyd_exec_t, chronyd_t)
++')
++
++####################################
++## <summary>
++##      Execute chronyd 
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`chronyd_exec',`
++        gen_require(`
++                type chronyd_exec_t;
++        ')
++
++        can_exec($1, chronyd_exec_t)
++')
++
++#####################################
++## <summary>
++##      Read chronyd logs.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`chronyd_read_log',`
++        gen_require(`
++                type chronyd_var_log_t;
++        ')
++
++        logging_search_logs($1)
++        read_files_pattern($1, chronyd_var_log_t, chronyd_var_log_t)
++')
++
++####################################
++## <summary>
++##      All of the rules required to administrate 
++##      an chronyd environment
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++## <param name="role">
++##      <summary>
++##      The role to be allowed to manage the chronyd domain.
++##      </summary>
++## </param>
++## <rolecap/>
++#
++interface(`chronyd_admin',`
++        gen_require(`
++                type chronyd_t, chronyd_var_log_t;
++                type chronyd_var_run_t, chronyd_var_lib_t;
++                type chronyd_initrc_exec_t;
++        ')
++
++        allow $1 chronyd_t:process { ptrace signal_perms };
++        ps_process_pattern($1, chronyd_t)
++
++        init_labeled_script_domtrans($1, chronyd_initrc_exec_t)
++        domain_system_change_exemption($1)
++        role_transition $2 chronyd_initrc_exec_t system_r;
++        allow $2 system_r;
++
++        logging_search_logs($1)
++        admin_pattern($1, chronyd_var_log_t)
++
++        files_search_var_lib($1)
++        admin_pattern($1, chronyd_var_lib_t)
++
++        files_search_pids($1)
++        admin_pattern($1, chronyd_var_run_t)
++
++        files_search_tmp($1)
++        admin_pattern($1, chronyd_tmp_t)
++
++')
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.te serefpolicy-3.6.30/policy/modules/services/chronyd.te
+--- nsaserefpolicy/policy/modules/services/chronyd.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/chronyd.te	2009-09-08 18:22:33.000000000 -0400
+@@ -0,0 +1,67 @@
++policy_module(chronyd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type chronyd_t;
++type chronyd_exec_t;
++init_daemon_domain(chronyd_t, chronyd_exec_t)
++
++type chronyd_initrc_exec_t;
++init_script_file(chronyd_initrc_exec_t)
++
++# var/lib files
++type chronyd_var_lib_t;
++files_type(chronyd_var_lib_t)
++
++# log files
++type chronyd_var_log_t;
++logging_log_file(chronyd_var_log_t)
++
++# pid files
++type chronyd_var_run_t;
++files_pid_file(chronyd_var_run_t)
++
++
++########################################
++#
++# chronyd local policy
++#
++
++allow chronyd_t self:capability { setuid setgid sys_time };
++allow chronyd_t self:process { getcap setcap };
++
++allow chronyd_t self:udp_socket create_socket_perms;
++allow chronyd_t self:unix_dgram_socket create_socket_perms;
++
++# chronyd var/lib files
++manage_files_pattern(chronyd_t, chronyd_var_lib_t, chronyd_var_lib_t)
++manage_dirs_pattern(chronyd_t, chronyd_var_lib_t, chronyd_var_lib_t)
++files_var_lib_filetrans(chronyd_t,chronyd_var_lib_t, { file dir })
++
++# chronyd log files
++manage_files_pattern(chronyd_t, chronyd_var_log_t, chronyd_var_log_t)
++manage_dirs_pattern(chronyd_t, chronyd_var_log_t, chronyd_var_log_t)
++logging_log_filetrans(chronyd_t, chronyd_var_log_t,{ file dir })
++
++# chronyd pid files
++manage_files_pattern(chronyd_t, chronyd_var_run_t, chronyd_var_run_t)
++manage_dirs_pattern(chronyd_t, chronyd_var_run_t, chronyd_var_run_t)
++files_pid_filetrans(chronyd_t,chronyd_var_run_t, { file })
++
++corenet_udp_bind_ntp_port(chronyd_t)
++# bind to udp/323
++corenet_udp_bind_chronyd_port(chronyd_t)
++
++# real time clock option
++dev_rw_realtime_clock(chronyd_t)
++
++auth_use_nsswitch(chronyd_t)
++
++logging_send_syslog_msg(chronyd_t)
++
++miscfiles_read_localization(chronyd_t)
++
++permissive chronyd_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.6.30/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.30/policy/modules/services/clamav.te	2009-08-31 13:40:47.000000000 -0400
@@ -10064,84 +10308,326 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_stream_connect(consolekit_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.if serefpolicy-3.6.30/policy/modules/services/courier.if
---- nsaserefpolicy/policy/modules/services/courier.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/courier.if	2009-08-31 13:40:47.000000000 -0400
-@@ -179,6 +179,24 @@
- 
- ########################################
- ## <summary>
-+##	Read courier spool files.
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.fc serefpolicy-3.6.30/policy/modules/services/corosync.fc
+--- nsaserefpolicy/policy/modules/services/corosync.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/corosync.fc	2009-09-08 19:26:20.000000000 -0400
+@@ -0,0 +1,13 @@
++
++/etc/rc\.d/init\.d/corosync     --      gen_context(system_u:object_r:corosync_initrc_exec_t,s0)
++
++/usr/sbin/corosync              --      gen_context(system_u:object_r:corosync_exec_t,s0)
++
++/usr/sbin/ccs_tool              --      gen_context(system_u:object_r:corosync_exec_t,s0)
++
++/var/lib/corosync(/.*)?                 gen_context(system_u:object_r:corosync_var_lib_t,s0)
++
++/var/log/cluster/corosync\.log  --      gen_context(system_u:object_r:corosync_var_log_t,s0)
++
++/var/run/corosync\.pid          --      gen_context(system_u:object_r:corosync_var_run_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.if serefpolicy-3.6.30/policy/modules/services/corosync.if
+--- nsaserefpolicy/policy/modules/services/corosync.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/corosync.if	2009-09-08 19:26:20.000000000 -0400
+@@ -0,0 +1,108 @@
++## <summary>SELinux policy for Corosync Cluster Engine</summary>
++
++########################################
++## <summary>
++##      Execute a domain transition to run corosync.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
 +## </summary>
-+## <param name="prefix">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
 +## </param>
 +#
-+interface(`courier_read_spool',`
-+	gen_require(`
-+		type courier_spool_t;
-+	')
++interface(`corosync_domtrans',`
++        gen_require(`
++                type corosync_t, corosync_exec_t;
++        ')
 +
-+	read_files_pattern($1, courier_spool_t, courier_spool_t)
++        domtrans_pattern($1, corosync_exec_t, corosync_t)
 +')
 +
-+########################################
++#####################################
 +## <summary>
- ##	Read and write to courier spool pipes.
- ## </summary>
- ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.6.30/policy/modules/services/courier.te
---- nsaserefpolicy/policy/modules/services/courier.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/courier.te	2009-08-31 13:40:47.000000000 -0400
-@@ -10,6 +10,7 @@
- 
- type courier_etc_t;
- files_config_file(courier_etc_t)
-+mta_system_content(courier_etc_t)
- 
- courier_domain_template(pcp)
- 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.6.30/policy/modules/services/cron.fc
---- nsaserefpolicy/policy/modules/services/cron.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/cron.fc	2009-08-31 13:40:47.000000000 -0400
-@@ -1,3 +1,4 @@
-+/etc/rc\.d/init\.d/atd		--	gen_context(system_u:object_r:crond_initrc_exec_t,s0)
- 
- /etc/cron\.d(/.*)?			gen_context(system_u:object_r:system_cron_spool_t,s0)
- /etc/crontab			--	gen_context(system_u:object_r:system_cron_spool_t,s0)
-@@ -17,9 +18,9 @@
- /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
- /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
- 
--/var/spool/at			-d	gen_context(system_u:object_r:cron_spool_t,s0)
--/var/spool/at/spool		-d	gen_context(system_u:object_r:cron_spool_t,s0)
--/var/spool/at/[^/]*		--	<<none>>
-+/var/spool/anacron(/.*)?		gen_context(system_u:object_r:system_cron_spool_t,s0)
++##      Connect to corosync over a unix domain
++##      stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`corosync_stream_connect',`
++        gen_require(`
++                type corosync_t, corosync_var_run_t;
++        ')
 +
-+/var/spool/at(/.*)?			gen_context(system_u:object_r:user_cron_spool_t,s0)
- 
- /var/spool/cron			-d	gen_context(system_u:object_r:cron_spool_t,s0)
- #/var/spool/cron/root		--	gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
-@@ -41,7 +42,11 @@
- #/var/spool/cron/crontabs/root	--	gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
- 
- /var/spool/fcron		-d	gen_context(system_u:object_r:cron_spool_t,s0)
--/var/spool/fcron/[^/]*			<<none>>
-+/var/spool/fcron/.*			<<none>>
- /var/spool/fcron/systab\.orig	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
- /var/spool/fcron/systab		--	gen_context(system_u:object_r:system_cron_spool_t,s0)
- /var/spool/fcron/new\.systab	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
++        files_search_pids($1)
++        stream_connect_pattern($1, corosync_var_run_t, corosync_var_run_t, corosync_t)
++')
 +
-+/var/lib/glpi/files(/.*)?		gen_context(system_u:object_r:cron_var_lib_t,s0)
++#######################################
++## <summary>
++##      Allow the specified domain to read corosync's log files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`corosync_read_log',`
++        gen_require(`
++                type corosync_var_log_t;
++        ')
 +
-+/var/log/mcelog.*		--	gen_context(system_u:object_r:cron_log_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.30/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/cron.if	2009-08-31 13:40:47.000000000 -0400
-@@ -12,6 +12,10 @@
- ## </param>
++        logging_search_logs($1)
++        list_dirs_pattern($1, corosync_var_log_t, corosync_var_log_t)
++        read_files_pattern($1, corosync_var_log_t, corosync_var_log_t)
++')
++
++######################################
++## <summary>
++##      All of the rules required to administrate 
++##      an corosync environment
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++## <param name="role">
++##      <summary>
++##      The role to be allowed to manage the corosyncd domain.
++##      </summary>
++## </param>
++## <rolecap/>
++#
++interface(`corosyncd_admin',`
++        gen_require(`
++                type corosync_t, corosync_var_lib_t, corosync_var_log_t;
++                type corosync_var_run_t, corosync_tmp_t, corosync_tmpfs_t;
++                type corosync_initrc_exec_t;
++        ')
++
++        allow $1 corosync_t:process { ptrace signal_perms };
++        ps_process_pattern($1, corosync_t)
++
++        init_labeled_script_domtrans($1, corosync_initrc_exec_t)
++        domain_system_change_exemption($1)
++        role_transition $2 corosync_initrc_exec_t system_r;
++        allow $2 system_r;
++
++        files_search_var_lib($1)
++        admin_pattern($1, corosync_var_lib_t)
++
++        logging_search_logs($1)
++        admin_pattern($1, corosync_var_log_t)
++
++        files_search_pids($1)
++        admin_pattern($1, corosync_var_run_t)
++
++        files_search_tmp($1)
++        admin_pattern($1, corosync_tmp_t)
++
++        admin_pattern($1, corosync_tmpfs_t)
++')
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.te serefpolicy-3.6.30/policy/modules/services/corosync.te
+--- nsaserefpolicy/policy/modules/services/corosync.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/corosync.te	2009-09-08 19:26:20.000000000 -0400
+@@ -0,0 +1,109 @@
++
++policy_module(corosync,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type corosync_t;
++type corosync_exec_t;
++init_daemon_domain(corosync_t, corosync_exec_t)
++
++type corosync_initrc_exec_t;
++init_script_file(corosync_initrc_exec_t);
++
++# tmp files
++type corosync_tmp_t;
++files_tmp_file(corosync_tmp_t)
++
++type corosync_tmpfs_t;
++files_tmpfs_file(corosync_tmpfs_t)
++
++# log files
++type corosync_var_log_t;
++logging_log_file(corosync_var_log_t)
++
++# var/lib files
++type corosync_var_lib_t;
++files_type(corosync_var_lib_t)
++
++# pid files
++type corosync_var_run_t;
++files_pid_file(corosync_var_run_t)
++
++########################################
++#
++# corosync local policy
++#
++
++allow corosync_t self:capability { sys_nice sys_resource ipc_lock };
++allow corosync_t self:process { setsched signal };
++
++allow corosync_t self:fifo_file rw_fifo_file_perms;
++allow corosync_t self:sem create_sem_perms;
++allow corosync_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow corosync_t self:unix_dgram_socket create_socket_perms;
++allow corosync_t self:udp_socket create_socket_perms;
++
++# tmp files
++manage_dirs_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
++manage_files_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
++files_tmp_filetrans(corosync_t, corosync_tmp_t, { file dir })
++
++manage_dirs_pattern(corosync_t, corosync_tmpfs_t, corosync_tmpfs_t)
++manage_files_pattern(corosync_t, corosync_tmpfs_t, corosync_tmpfs_t)
++fs_tmpfs_filetrans(corosync_t, corosync_tmpfs_t,{ dir file })
++
++# var/lib files
++manage_files_pattern(corosync_t, corosync_var_lib_t,corosync_var_lib_t)
++manage_dirs_pattern(corosync_t, corosync_var_lib_t,corosync_var_lib_t)
++manage_sock_files_pattern(corosync_t, corosync_var_lib_t,corosync_var_lib_t)
++files_var_lib_filetrans(corosync_t,corosync_var_lib_t, { file dir sock_file })
++
++# log files
++manage_files_pattern(corosync_t, corosync_var_log_t,corosync_var_log_t)
++manage_sock_files_pattern(corosync_t, corosync_var_log_t,corosync_var_log_t)
++logging_log_filetrans(corosync_t,corosync_var_log_t,{ sock_file file })
++
++# pid file
++manage_files_pattern(corosync_t, corosync_var_run_t,corosync_var_run_t)
++manage_sock_files_pattern(corosync_t, corosync_var_run_t,corosync_var_run_t)
++files_pid_filetrans(corosync_t,corosync_var_run_t, { file sock_file })
++
++corenet_udp_bind_netsupport_port(corosync_t)
++
++corecmd_exec_bin(corosync_t)
++
++kernel_read_system_state(corosync_t)
++
++files_manage_mounttab(corosync_t)
++
++auth_use_nsswitch(corosync_t)
++
++dev_read_urand(corosync_t)
++
++libs_use_ld_so(corosync_t)
++libs_use_shared_libs(corosync_t)
++miscfiles_read_localization(corosync_t)
++
++init_rw_script_tmp_files(corosync_t)
++
++logging_send_syslog_msg(corosync_t)
++
++# to communication with RHCS
++dlm_controld_manage_tmpfs_files(corosync_t)
++dlm_controld_rw_semaphores(corosync_t)
++
++fenced_manage_tmpfs_files(corosync_t)
++fenced_rw_semaphores(corosync_t)
++
++gfs_controld_manage_tmpfs_files(corosync_t)
++gfs_controld_rw_semaphores(corosync_t)
++
++optional_policy(`
++        ccs_read_config(corosync_t)
++')
++
++permissive corosync_t;
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.if serefpolicy-3.6.30/policy/modules/services/courier.if
+--- nsaserefpolicy/policy/modules/services/courier.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/courier.if	2009-08-31 13:40:47.000000000 -0400
+@@ -179,6 +179,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Read courier spool files.
++## </summary>
++## <param name="prefix">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`courier_read_spool',`
++	gen_require(`
++		type courier_spool_t;
++	')
++
++	read_files_pattern($1, courier_spool_t, courier_spool_t)
++')
++
++########################################
++## <summary>
+ ##	Read and write to courier spool pipes.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.6.30/policy/modules/services/courier.te
+--- nsaserefpolicy/policy/modules/services/courier.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/courier.te	2009-08-31 13:40:47.000000000 -0400
+@@ -10,6 +10,7 @@
+ 
+ type courier_etc_t;
+ files_config_file(courier_etc_t)
++mta_system_content(courier_etc_t)
+ 
+ courier_domain_template(pcp)
+ 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.6.30/policy/modules/services/cron.fc
+--- nsaserefpolicy/policy/modules/services/cron.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/cron.fc	2009-08-31 13:40:47.000000000 -0400
+@@ -1,3 +1,4 @@
++/etc/rc\.d/init\.d/atd		--	gen_context(system_u:object_r:crond_initrc_exec_t,s0)
+ 
+ /etc/cron\.d(/.*)?			gen_context(system_u:object_r:system_cron_spool_t,s0)
+ /etc/crontab			--	gen_context(system_u:object_r:system_cron_spool_t,s0)
+@@ -17,9 +18,9 @@
+ /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
+ /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
+ 
+-/var/spool/at			-d	gen_context(system_u:object_r:cron_spool_t,s0)
+-/var/spool/at/spool		-d	gen_context(system_u:object_r:cron_spool_t,s0)
+-/var/spool/at/[^/]*		--	<<none>>
++/var/spool/anacron(/.*)?		gen_context(system_u:object_r:system_cron_spool_t,s0)
++
++/var/spool/at(/.*)?			gen_context(system_u:object_r:user_cron_spool_t,s0)
+ 
+ /var/spool/cron			-d	gen_context(system_u:object_r:cron_spool_t,s0)
+ #/var/spool/cron/root		--	gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
+@@ -41,7 +42,11 @@
+ #/var/spool/cron/crontabs/root	--	gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
+ 
+ /var/spool/fcron		-d	gen_context(system_u:object_r:cron_spool_t,s0)
+-/var/spool/fcron/[^/]*			<<none>>
++/var/spool/fcron/.*			<<none>>
+ /var/spool/fcron/systab\.orig	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
+ /var/spool/fcron/systab		--	gen_context(system_u:object_r:system_cron_spool_t,s0)
+ /var/spool/fcron/new\.systab	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
++
++/var/lib/glpi/files(/.*)?		gen_context(system_u:object_r:cron_var_lib_t,s0)
++
++/var/log/mcelog.*		--	gen_context(system_u:object_r:cron_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.30/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/cron.if	2009-08-31 13:40:47.000000000 -0400
+@@ -12,6 +12,10 @@
+ ## </param>
  #
  template(`cron_common_crontab_template',`
 +	gen_require(`
@@ -10443,7 +10929,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.30/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/cron.te	2009-09-04 10:32:17.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/cron.te	2009-09-08 18:12:58.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10768,17 +11254,18 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -461,8 +551,7 @@
+@@ -461,8 +551,8 @@
  ')
  
  optional_policy(`
 -	# cjp: why?
 -	squid_domtrans(system_cronjob_t)
 +	spamassassin_manage_lib_files(system_cronjob_t)
++	spamassassin_manage_home_client(system_cronjob_t)
  ')
  
  optional_policy(`
-@@ -470,24 +559,17 @@
+@@ -470,24 +560,17 @@
  ')
  
  optional_policy(`
@@ -10806,7 +11293,7 @@ diff -b -B --ignore-all-space --exclude-
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -571,6 +653,9 @@
+@@ -571,6 +654,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -10816,7 +11303,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`fcron_crond', `
  	allow crond_t user_cron_spool_t:file manage_file_perms;
  ')
-@@ -590,13 +675,5 @@
+@@ -590,13 +676,5 @@
  #
  
  optional_policy(`
@@ -11824,7 +12311,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.6.30/policy/modules/services/gpm.te
 --- nsaserefpolicy/policy/modules/services/gpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/gpm.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/gpm.te	2009-09-08 10:45:28.000000000 -0400
 @@ -27,7 +27,8 @@
  # Local policy
  #
@@ -15376,92 +15863,788 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.30/policy/modules/services/ricci.te
---- nsaserefpolicy/policy/modules/services/ricci.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/ricci.te	2009-08-31 13:40:47.000000000 -0400
-@@ -264,6 +264,7 @@
- allow ricci_modclusterd_t self:socket create_socket_perms;
- 
- allow ricci_modclusterd_t ricci_modcluster_t:unix_stream_socket connectto;
-+allow ricci_modclusterd_t ricci_modcluster_t:fifo_file rw_file_perms;
- 
- # log files
- allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
-@@ -440,6 +441,10 @@
- files_read_usr_files(ricci_modstorage_t)
- files_read_kernel_modules(ricci_modstorage_t)
- 
-+files_create_default_dir(ricci_modstorage_t)
-+files_mounton_default(ricci_modstorage_t)
-+files_manage_default(ricci_modstorage_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.fc serefpolicy-3.6.30/policy/modules/services/rgmanager.fc
+--- nsaserefpolicy/policy/modules/services/rgmanager.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/rgmanager.fc	2009-09-08 19:26:25.000000000 -0400
+@@ -0,0 +1,6 @@
++
++/usr/sbin/rgmanager                    --      gen_context(system_u:object_r:rgmanager_exec_t,s0)
++
++/var/log/cluster/rgmanager\.log        --      gen_context(system_u:object_r:rgmanager_var_log_t,s0)
++
++/var/run/rgmanager\.pid                --      gen_context(system_u:object_r:rgmanager_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.if serefpolicy-3.6.30/policy/modules/services/rgmanager.if
+--- nsaserefpolicy/policy/modules/services/rgmanager.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/rgmanager.if	2009-09-08 19:26:25.000000000 -0400
+@@ -0,0 +1,40 @@
++## <summary>SELinux policy for rgmanager</summary>
 +
- storage_raw_read_fixed_disk(ricci_modstorage_t)
- 
- term_dontaudit_use_console(ricci_modstorage_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.6.30/policy/modules/services/rpcbind.if
---- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/rpcbind.if	2009-08-31 13:40:47.000000000 -0400
-@@ -97,6 +97,26 @@
- 
- ########################################
- ## <summary>
-+##	Connect to rpcbindd over an unix stream socket.
++#######################################
++## <summary>
++##      Execute a domain transition to run rgmanager.
 +## </summary>
 +## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
++## <summary>
++##      Domain allowed to transition.
++## </summary>
 +## </param>
 +#
-+interface(`rpcbind_stream_connect',`
-+	gen_require(`
-+		type rpcbind_t, rpcbind_var_run_t;
-+	')
++interface(`rgmanager_domtrans',`
++        gen_require(`
++                type rgmanager_t, rgmanager_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domrans_pattern($1,rgmanager_exec_t,rgmanager_t)
 +
-+	files_search_pids($1)
-+	allow $1 rpcbind_var_run_t:sock_file write;
-+	allow $1 rpcbind_t:unix_stream_socket connectto;
 +')
 +
-+########################################
++#######################################
 +## <summary>
- ##	All of the rules required to administrate 
- ##	an rpcbind environment
- ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.30/policy/modules/services/rpc.if
---- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/rpc.if	2009-08-31 13:40:47.000000000 -0400
-@@ -54,7 +54,7 @@
- 	allow $1_t self:unix_dgram_socket create_socket_perms;
- 	allow $1_t self:unix_stream_socket create_stream_socket_perms;
- 	allow $1_t self:tcp_socket create_stream_socket_perms;
--	allow $1_t self:udp_socket create_socket_perms;
-+	allow $1_t self:udp_socket create_stream_socket_perms;
- 
- 	manage_dirs_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
- 	manage_files_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
-@@ -109,6 +109,10 @@
- 	userdom_dontaudit_use_unpriv_user_fds($1_t)
- 
- 	optional_policy(`
-+		rpcbind_stream_connect($1_t)
-+	')
++##      Allow read and write access to rgmanager semaphores.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`rgmanager_rw_semaphores',`
++        gen_require(`
++                type rgmanager_t;
++        ')
 +
-+	optional_policy(`
- 		seutil_sigchld_newrole($1_t)
- 	')
- 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.30/policy/modules/services/rpc.te
---- nsaserefpolicy/policy/modules/services/rpc.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/rpc.te	2009-08-31 13:40:47.000000000 -0400
-@@ -91,6 +91,8 @@
- 
- seutil_dontaudit_search_config(rpcd_t)
- 
-+userdom_signal_unpriv_users(rpcd_t)
++        allow $1 rgmanager_t:sem { unix_read unix_write associate read write };
++')
 +
- optional_policy(`
- 	automount_signal(rpcd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.te serefpolicy-3.6.30/policy/modules/services/rgmanager.te
+--- nsaserefpolicy/policy/modules/services/rgmanager.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/rgmanager.te	2009-09-08 19:26:25.000000000 -0400
+@@ -0,0 +1,54 @@
++
++policy_module(rgmanager,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type rgmanager_t;
++type rgmanager_exec_t;
++domain_type(rgmanager_t)
++init_daemon_domain(rgmanager_t, rgmanager_exec_t)
++
++# log files
++type rgmanager_var_log_t;
++logging_log_file(rgmanager_var_log_t)
++
++# pid files
++type rgmanager_var_run_t;
++files_pid_file(rgmanager_var_run_t)
++
++########################################
++#
++# rgmanager local policy
++#
++
++allow rgmanager_t self:capability { sys_nice ipc_lock };
++allow rgmanager_t self:process setsched;
++
++allow rgmanager_t self:fifo_file rw_fifo_file_perms;
++allow rgmanager_t self:unix_stream_socket { create_stream_socket_perms };
++allow rgmanager_t self:unix_dgram_socket create_socket_perms;
++allow rgmanager_t self:tcp_socket create_stream_socket_perms;
++
++# log files
++manage_files_pattern(rgmanager_t, rgmanager_var_log_t,rgmanager_var_log_t)
++logging_log_filetrans(rgmanager_t,rgmanager_var_log_t,{ file })
++
++# pid file
++manage_files_pattern(rgmanager_t, rgmanager_var_run_t,rgmanager_var_run_t)
++manage_sock_files_pattern(rgmanager_t, rgmanager_var_run_t, rgmanager_var_run_t)
++files_pid_filetrans(rgmanager_t,rgmanager_var_run_t, { file })
++
++auth_use_nsswitch(rgmanager_t)
++
++libs_use_ld_so(rgmanager_t)
++libs_use_shared_libs(rgmanager_t)
++
++logging_send_syslog_msg(rgmanager_t)
++
++miscfiles_read_localization(rgmanager_t)
++
++permissive rgmanager_t;
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.fc serefpolicy-3.6.30/policy/modules/services/rhcs.fc
+--- nsaserefpolicy/policy/modules/services/rhcs.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/rhcs.fc	2009-09-08 19:26:15.000000000 -0400
+@@ -0,0 +1,22 @@
++
++/usr/sbin/dlm_controld                 --      gen_context(system_u:object_r:dlm_controld_exec_t,s0)
++/var/log/cluster/dlm_controld\.log     --      gen_context(system_u:object_r:dlm_controld_var_log_t,s0)
++/var/run/dlm_controld\.pid             --      gen_context(system_u:object_r:dlm_controld_var_run_t,s0)
++
++/usr/sbin/fenced                       --      gen_context(system_u:object_r:fenced_exec_t,s0)
++/usr/sbin/fence_node                   --      gen_context(system_u:object_r:fenced_exec_t,s0)
++/var/log/cluster/fenced\.log           --      gen_context(system_u:object_r:fenced_var_log_t,s0)
++/var/run/fenced\.pid                   --      gen_context(system_u:object_r:fenced_var_run_t,s0)
++
++/usr/sbin/gfs_controld                 --      gen_context(system_u:object_r:gfs_controld_exec_t,s0)
++/var/log/cluster/gfs_controld\.log     --      gen_context(system_u:object_r:gfs_controld_var_log_t,s0)
++/var/run/gfs_controld\.pid             --      gen_context(system_u:object_r:gfs_controld_var_run_t,s0)
++
++/usr/sbin/groupd                       --      gen_context(system_u:object_r:groupd_exec_t,s0)
++/var/run/groupd\.pid                   --      gen_context(system_u:object_r:groupd_var_run_t,s0)
++
++/usr/sbin/qdiskd                       --      gen_context(system_u:object_r:qdiskd_exec_t,s0)
++/var/lib/qdiskd(/.*)?                          gen_context(system_u:object_r:qdiskd_var_lib_t,s0)
++/var/log/cluster/qdiskd\.log           --      gen_context(system_u:object_r:qdiskd_var_log_t,s0)
++/var/run/qdiskd\.pid                   --      gen_context(system_u:object_r:qdiskd_var_run_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.if serefpolicy-3.6.30/policy/modules/services/rhcs.if
+--- nsaserefpolicy/policy/modules/services/rhcs.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/rhcs.if	2009-09-08 19:26:15.000000000 -0400
+@@ -0,0 +1,214 @@
++## <summary>SELinux policy for RHCS - Red Hat Cluster Suite </summary>
++
++######################################
++## <summary>
++##      Execute a domain transition to run dlm_controld.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`dlm_controld_domtrans',`
++        gen_require(`
++                type dlm_controld_t, dlm_controld_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domain_trans_pattern($1,dlm_controld_exec_t,dlm_controld_t)
++
++')
++
++#####################################
++## <summary>
++##      Connect to dlm_controld over a unix domain
++##      stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dlm_controld_stream_connect',`
++        gen_require(`
++                type dlm_controld_t, dlm_controld_var_run_t;
++        ')
++
++        files_search_pids($1)
++        stream_connect_pattern($1, dlm_controld_var_run_t, dlm_controld_var_run_t, dlm_controld_t)
++')
++
++#####################################
++## <summary>
++##      Manage dlm_controld tmpfs files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`dlm_controld_manage_tmpfs_files',`
++        gen_require(`
++                type dlm_controld_tmpfs_t;
++        ')
++
++        fs_search_tmpfs($1)
++        manage_files_pattern($1, dlm_controld_tmpfs_t, dlm_controld_tmpfs_t)
++       manage_lnk_files_pattern($1, dlm_controld_tmpfs_t, dlm_controld_tmpfs_t)
++')
++
++#####################################
++## <summary>
++##      Allow read and write access to dlm_controld semaphores.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dlm_controld_rw_semaphores',`
++        gen_require(`
++                type dlm_controld_t;
++        ')
++
++        allow $1 dlm_controld_t:sem { rw_sem_perms destroy };
++')
++
++######################################
++## <summary>
++##      Execute a domain transition to run fenced.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`fenced_domtrans',`
++        gen_require(`
++                type fenced_t, fenced_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domain_trans_pattern($1,fenced_exec_t,fenced_t)
++
++')
++
++######################################
++## <summary>
++##      Connect to fenced over an unix domain stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fenced_stream_connect',`
++        gen_require(`
++                type fenced_var_run_t, fenced_t;
++        ')
++
++        allow $1 fenced_t:unix_stream_socket connectto;
++        allow $1 fenced_var_run_t:sock_file { getattr write };
++        files_search_pids($1)
++')
++
++#####################################
++## <summary>
++##      Managed fenced tmpfs files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`fenced_manage_tmpfs_files',`
++        gen_require(`
++                type fenced_tmpfs_t;
++        ')
++
++        fs_search_tmpfs($1)
++        manage_files_pattern($1, fenced_tmpfs_t, fenced_tmpfs_t)
++       manage_lnk_files_pattern($1, fenced_tmpfs_t, fenced_tmpfs_t)
++')
++       
++######################################
++## <summary>
++##      Allow read and write access to fenced semaphores.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fenced_rw_semaphores',`
++        gen_require(`
++                type fenced_t;
++        ')
++
++        allow $1 fenced_t:sem { rw_sem_perms destroy };
++')
++
++#####################################
++## <summary>
++##      Execute a domain transition to run gfs_controld.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`gfs_controld_domtrans',`
++        gen_require(`
++                type gfs_controld_t, gfs_controld_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domain_trans_pattern($1,gfs_controld_exec_t,gfs_controld_t)
++')
++
++###################################
++## <summary>
++##      Manage gfs_controld tmpfs files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`gfs_controld_manage_tmpfs_files',`
++        gen_require(`
++                type gfs_controld_tmpfs_t;
++        ')
++
++        fs_search_tmpfs($1)
++        manage_files_pattern($1, gfs_controld_tmpfs_t, gfs_controld_tmpfs_t)
++        manage_lnk_files_pattern($1, gfs_controld_tmpfs_t, gfs_controld_tmpfs_t)
++')
++       
++####################################
++## <summary>
++##      Allow read and write access to gfs_controld semaphores.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`gfs_controld_rw_semaphores',`
++        gen_require(`
++                type gfs_controld_t;
++        ')
++
++        allow $1 gfs_controld_t:sem { rw_sem_perms destroy };
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.te serefpolicy-3.6.30/policy/modules/services/rhcs.te
+--- nsaserefpolicy/policy/modules/services/rhcs.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.30/policy/modules/services/rhcs.te	2009-09-08 19:26:15.000000000 -0400
+@@ -0,0 +1,336 @@
++
++policy_module(rhcs,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type dlm_controld_t;
++type dlm_controld_exec_t;
++init_daemon_domain(dlm_controld_t, dlm_controld_exec_t)
++
++# log files
++type dlm_controld_var_log_t;
++logging_log_file(dlm_controld_var_log_t)
++
++# pid files
++type dlm_controld_var_run_t;
++files_pid_file(dlm_controld_var_run_t)
++
++type dlm_controld_tmpfs_t;
++files_tmpfs_file(dlm_controld_tmpfs_t)
++
++
++type fenced_t;
++type fenced_exec_t;
++init_daemon_domain(fenced_t, fenced_exec_t)
++
++# tmp files
++type fenced_tmp_t;
++files_tmp_file(fenced_tmp_t)
++
++type fenced_tmpfs_t;
++files_tmpfs_file(fenced_tmpfs_t)
++
++# log files
++type fenced_var_log_t;
++logging_log_file(fenced_var_log_t)
++
++# pid files
++type fenced_var_run_t;
++files_pid_file(fenced_var_run_t)
++
++
++type gfs_controld_t;
++type gfs_controld_exec_t;
++init_daemon_domain(gfs_controld_t, gfs_controld_exec_t)
++
++# log files
++type gfs_controld_var_log_t;
++logging_log_file(gfs_controld_var_log_t)
++
++# pid files
++type gfs_controld_var_run_t;
++files_pid_file(gfs_controld_var_run_t)
++
++type gfs_controld_tmpfs_t;
++files_tmpfs_file(gfs_controld_tmpfs_t) 
++
++
++type groupd_t;
++type groupd_exec_t;
++init_daemon_domain(groupd_t, groupd_exec_t)
++
++# log files
++type groupd_var_log_t;
++logging_log_file(groupd_var_log_t)
++
++# pid files
++type groupd_var_run_t;
++files_pid_file(groupd_var_run_t)
++
++type groupd_tmpfs_t;
++files_tmpfs_file(groupd_tmpfs_t)
++
++
++type qdiskd_t;
++type qdiskd_exec_t;
++init_daemon_domain(qdiskd_t, qdiskd_exec_t)
++
++type qdiskd_tmpfs_t;
++files_tmpfs_file(qdiskd_tmpfs_t)
++
++# var/lib files
++type qdiskd_var_lib_t;
++files_type(qdiskd_var_lib_t)
++
++# log files
++type qdiskd_var_log_t;
++logging_log_file(qdiskd_var_log_t)
++
++# pid files
++type qdiskd_var_run_t;
++files_pid_file(qdiskd_var_run_t)
++
++#####################################
++#
++# dlm_controld local policy
++#
++
++allow dlm_controld_t self:capability { net_admin sys_nice sys_resource };
++allow dlm_controld_t self:process setsched;
++
++allow dlm_controld_t self:sem create_sem_perms;
++allow dlm_controld_t self:fifo_file rw_fifo_file_perms;
++allow dlm_controld_t self:unix_stream_socket { create_stream_socket_perms };
++allow dlm_controld_t self:unix_dgram_socket { create_socket_perms };
++allow dlm_controld_t self:netlink_kobject_uevent_socket create_socket_perms;
++
++manage_dirs_pattern(dlm_controld_t, dlm_controld_tmpfs_t, dlm_controld_tmpfs_t)
++manage_files_pattern(dlm_controld_t, dlm_controld_tmpfs_t, dlm_controld_tmpfs_t)
++fs_tmpfs_filetrans(dlm_controld_t, dlm_controld_tmpfs_t,{ dir file })
++
++# log files
++manage_files_pattern(dlm_controld_t, dlm_controld_var_log_t,dlm_controld_var_log_t)
++logging_log_filetrans(dlm_controld_t,dlm_controld_var_log_t,{ file })
++
++# pid files
++manage_files_pattern(dlm_controld_t, dlm_controld_var_run_t, dlm_controld_var_run_t)
++manage_sock_files_pattern(dlm_controld_t, dlm_controld_var_run_t, dlm_controld_var_run_t)
++files_pid_filetrans(dlm_controld_t,dlm_controld_var_run_t, { file })
++
++stream_connect_pattern(dlm_controld_t, fenced_var_run_t, fenced_var_run_t, fenced_t)
++corosync_stream_connect(dlm_controld_t)
++
++kernel_read_system_state(dlm_controld_t)
++
++dev_rw_sysfs(dlm_controld_t)
++
++fs_manage_configfs_files(dlm_controld_t)
++fs_manage_configfs_dirs(dlm_controld_t)
++
++init_rw_script_tmp_files(dlm_controld_t)
++
++libs_use_ld_so(dlm_controld_t)
++libs_use_shared_libs(dlm_controld_t)
++
++logging_send_syslog_msg(dlm_controld_t)
++
++miscfiles_read_localization(dlm_controld_t)
++
++permissive dlm_controld_t;
++
++#######################################
++#
++# fenced local policy
++#
++
++allow fenced_t self:capability { sys_nice sys_resource };
++allow fenced_t self:process { setsched getsched };
++
++allow fenced_t self:fifo_file rw_fifo_file_perms;
++allow fenced_t self:sem create_sem_perms;
++allow fenced_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow fenced_t self:unix_dgram_socket create_socket_perms;
++allow fenced_t self:tcp_socket create_stream_socket_perms;
++allow fenced_t self:udp_socket create_socket_perms;
++
++can_exec(fenced_t,fenced_exec_t)
++
++# tmp files
++manage_dirs_pattern(fenced_t, fenced_tmp_t, fenced_tmp_t)
++manage_files_pattern(fenced_t, fenced_tmp_t, fenced_tmp_t)
++files_tmp_filetrans(fenced_t, fenced_tmp_t, { file dir })
++
++manage_dirs_pattern(fenced_t, fenced_tmpfs_t, fenced_tmpfs_t)
++manage_files_pattern(fenced_t, fenced_tmpfs_t, fenced_tmpfs_t)
++fs_tmpfs_filetrans(fenced_t, fenced_tmpfs_t,{ dir file })
++
++# log files
++manage_files_pattern(fenced_t, fenced_var_log_t,fenced_var_log_t)
++logging_log_filetrans(fenced_t,fenced_var_log_t,{ file })
++
++# pid file
++manage_files_pattern(fenced_t, fenced_var_run_t,fenced_var_run_t)
++manage_sock_files_pattern(fenced_t, fenced_var_run_t, fenced_var_run_t)
++manage_fifo_files_pattern(fenced_t, fenced_var_run_t, fenced_var_run_t)
++files_pid_filetrans(fenced_t,fenced_var_run_t, { file })
++
++corosync_stream_connect(fenced_t)
++
++corecmd_exec_bin(fenced_t)
++
++dev_list_sysfs(fenced_t)
++dev_read_urand(fenced_t)
++
++auth_use_nsswitch(fenced_t)
++
++files_read_usr_symlinks(fenced_t)
++
++libs_use_ld_so(fenced_t)
++libs_use_shared_libs(fenced_t)
++
++logging_send_syslog_msg(fenced_t)
++
++miscfiles_read_localization(fenced_t)
++
++permissive fenced_t;
++
++######################################
++#
++# gfs_controld local policy
++#
++allow gfs_controld_t self:capability { sys_nice sys_resource };
++allow gfs_controld_t self:process setsched;
++
++allow gfs_controld_t self:sem create_sem_perms;
++allow gfs_controld_t self:fifo_file rw_fifo_file_perms;
++allow gfs_controld_t self:unix_stream_socket { create_stream_socket_perms };
++allow gfs_controld_t self:unix_dgram_socket { create_socket_perms };
++allow gfs_controld_t self:netlink_kobject_uevent_socket create_socket_perms;
++
++manage_dirs_pattern(gfs_controld_t, gfs_controld_tmpfs_t, gfs_controld_tmpfs_t)
++manage_files_pattern(gfs_controld_t, gfs_controld_tmpfs_t, gfs_controld_tmpfs_t)
++fs_tmpfs_filetrans(gfs_controld_t, gfs_controld_tmpfs_t,{ dir file })
++
++# log files
++manage_files_pattern(gfs_controld_t, gfs_controld_var_log_t,gfs_controld_var_log_t)
++logging_log_filetrans(gfs_controld_t,gfs_controld_var_log_t,{ file })
++
++# pid files
++manage_files_pattern(gfs_controld_t, gfs_controld_var_run_t, gfs_controld_var_run_t)
++manage_sock_files_pattern(gfs_controld_t, gfs_controld_var_run_t, gfs_controld_var_run_t)
++files_pid_filetrans(gfs_controld_t,gfs_controld_var_run_t, { file })
++
++stream_connect_pattern(dlm_controld_t, fenced_var_run_t, fenced_var_run_t, fenced_t)
++stream_connect_pattern(gfs_controld_t, dlm_controld_var_run_t, dlm_controld_var_run_t, dlm_controld_t)
++corosync_stream_connect(gfs_controld_t)
++
++kernel_read_system_state(gfs_controld_t)
++
++dev_manage_generic_chr_files(gfs_controld_t)
++dev_read_sysfs(gfs_controld_t)
++
++init_rw_script_tmp_files(gfs_controld_t)
++
++libs_use_ld_so(gfs_controld_t)
++libs_use_shared_libs(gfs_controld_t)
++
++logging_send_syslog_msg(gfs_controld_t)
++
++miscfiles_read_localization(gfs_controld_t)
++
++permissive gfs_controld_t;
++
++#######################################
++#
++# groupd local policy
++#
++
++allow groupd_t self:capability { sys_nice sys_resource };
++allow groupd_t self:process setsched;
++
++allow groupd_t self:sem create_sem_perms;
++allow groupd_t self:fifo_file rw_fifo_file_perms;
++allow groupd_t self:unix_stream_socket create_stream_socket_perms;
++allow groupd_t self:unix_dgram_socket create_socket_perms;
++
++manage_dirs_pattern(groupd_t, groupd_tmpfs_t, groupd_tmpfs_t)
++manage_files_pattern(groupd_t, groupd_tmpfs_t, groupd_tmpfs_t)
++fs_tmpfs_filetrans(groupd_t, groupd_tmpfs_t,{ dir file })
++
++# log files
++manage_files_pattern(groupd_t, groupd_var_log_t,groupd_var_log_t)
++logging_log_filetrans(groupd_t,groupd_var_log_t,{ file })
++
++# pid files
++manage_files_pattern(groupd_t, groupd_var_run_t,groupd_var_run_t)
++manage_sock_files_pattern(groupd_t, groupd_var_run_t,groupd_var_run_t)
++files_pid_filetrans(groupd_t, groupd_var_run_t, { file })
++
++corosync_stream_connect(groupd_t)
++
++files_read_etc_files(groupd_t)
++
++libs_use_ld_so(groupd_t)
++libs_use_shared_libs(groupd_t)
++
++logging_send_syslog_msg(groupd_t)
++
++miscfiles_read_localization(groupd_t)
++
++init_rw_script_tmp_files(groupd_t)
++
++logging_send_syslog_msg(groupd_t)
++
++permissive groupd_t;
++
++######################################
++#
++# qdiskd local policy
++#
++
++allow qdiskd_t self:capability { sys_nice ipc_lock };
++allow qdiskd_t self:process setsched;
++
++allow qdiskd_t self:sem create_sem_perms;
++allow qdiskd_t self:unix_dgram_socket create_socket_perms;
++allow qdiskd_t self:fifo_file rw_fifo_file_perms;
++allow qdiskd_t self:unix_stream_socket create_stream_socket_perms;
++
++manage_files_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
++manage_dirs_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
++manage_sock_files_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
++files_var_lib_filetrans(qdiskd_t,qdiskd_var_lib_t, { file dir sock_file })
++
++# log files
++manage_files_pattern(qdiskd_t, qdiskd_var_log_t,qdiskd_var_log_t)
++manage_sock_files_pattern(qdiskd_t, qdiskd_var_log_t,qdiskd_var_log_t)
++logging_log_filetrans(qdiskd_t,qdiskd_var_log_t,{ sock_file file })
++
++manage_dirs_pattern(qdiskd_t, qdiskd_tmpfs_t, qdiskd_tmpfs_t)
++manage_files_pattern(qdiskd_t, qdiskd_tmpfs_t, qdiskd_tmpfs_t)
++fs_tmpfs_filetrans(qdiskd_t, qdiskd_tmpfs_t,{ dir file })
++
++# pid files
++manage_files_pattern(qdiskd_t, qdiskd_var_run_t,qdiskd_var_run_t)
++manage_sock_files_pattern(qdiskd_t, qdiskd_var_run_t,qdiskd_var_run_t)
++files_pid_filetrans(qdiskd_t,qdiskd_var_run_t, { file })
++
++corosync_stream_connect(qdiskd_t)
++
++kernel_read_system_state(qdiskd_t)
++
++storage_raw_rw_fixed_disk(qdiskd_t)
++
++files_read_etc_files(qdiskd_t)
++
++libs_use_ld_so(qdiskd_t)
++libs_use_shared_libs(qdiskd_t)
++
++logging_send_syslog_msg(qdiskd_t)
++
++miscfiles_read_localization(qdiskd_t)
++
++permissive qdiskd_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.30/policy/modules/services/ricci.te
+--- nsaserefpolicy/policy/modules/services/ricci.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/ricci.te	2009-08-31 13:40:47.000000000 -0400
+@@ -264,6 +264,7 @@
+ allow ricci_modclusterd_t self:socket create_socket_perms;
+ 
+ allow ricci_modclusterd_t ricci_modcluster_t:unix_stream_socket connectto;
++allow ricci_modclusterd_t ricci_modcluster_t:fifo_file rw_file_perms;
+ 
+ # log files
+ allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
+@@ -440,6 +441,10 @@
+ files_read_usr_files(ricci_modstorage_t)
+ files_read_kernel_modules(ricci_modstorage_t)
+ 
++files_create_default_dir(ricci_modstorage_t)
++files_mounton_default(ricci_modstorage_t)
++files_manage_default(ricci_modstorage_t)
++
+ storage_raw_read_fixed_disk(ricci_modstorage_t)
+ 
+ term_dontaudit_use_console(ricci_modstorage_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.6.30/policy/modules/services/rpcbind.if
+--- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/rpcbind.if	2009-08-31 13:40:47.000000000 -0400
+@@ -97,6 +97,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Connect to rpcbindd over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rpcbind_stream_connect',`
++	gen_require(`
++		type rpcbind_t, rpcbind_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 rpcbind_var_run_t:sock_file write;
++	allow $1 rpcbind_t:unix_stream_socket connectto;
++')
++
++########################################
++## <summary>
+ ##	All of the rules required to administrate 
+ ##	an rpcbind environment
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.30/policy/modules/services/rpc.if
+--- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/rpc.if	2009-08-31 13:40:47.000000000 -0400
+@@ -54,7 +54,7 @@
+ 	allow $1_t self:unix_dgram_socket create_socket_perms;
+ 	allow $1_t self:unix_stream_socket create_stream_socket_perms;
+ 	allow $1_t self:tcp_socket create_stream_socket_perms;
+-	allow $1_t self:udp_socket create_socket_perms;
++	allow $1_t self:udp_socket create_stream_socket_perms;
+ 
+ 	manage_dirs_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
+ 	manage_files_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
+@@ -109,6 +109,10 @@
+ 	userdom_dontaudit_use_unpriv_user_fds($1_t)
+ 
+ 	optional_policy(`
++		rpcbind_stream_connect($1_t)
++	')
++
++	optional_policy(`
+ 		seutil_sigchld_newrole($1_t)
+ 	')
+ 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.30/policy/modules/services/rpc.te
+--- nsaserefpolicy/policy/modules/services/rpc.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/services/rpc.te	2009-09-08 19:48:58.000000000 -0400
+@@ -91,6 +91,8 @@
+ 
+ seutil_dontaudit_search_config(rpcd_t)
+ 
++userdom_signal_unpriv_users(rpcd_t)
++
+ optional_policy(`
+ 	automount_signal(rpcd_t)
  ')
 @@ -99,6 +101,10 @@
  	nis_read_ypserv_config(rpcd_t)
@@ -15474,7 +16657,15 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # NFSD local policy
-@@ -135,6 +141,7 @@
+@@ -127,6 +133,7 @@
+ files_getattr_tmp_dirs(nfsd_t) 
+ # cjp: this should really have its own type
+ files_manage_mounttab(nfsd_t)
++files_read_etc_runtime_files(nfsd_t)
+ 
+ fs_mount_nfsd_fs(nfsd_t) 
+ fs_search_nfsd_fs(nfsd_t) 
+@@ -135,6 +142,7 @@
  fs_rw_nfsd_fs(nfsd_t) 
  
  storage_dontaudit_read_fixed_disk(nfsd_t)
@@ -15482,7 +16673,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)
-@@ -151,6 +158,7 @@
+@@ -151,6 +159,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
  ')
@@ -15490,7 +16681,15 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -189,8 +197,10 @@
+@@ -182,6 +191,7 @@
+ kernel_read_network_state(gssd_t)
+ kernel_read_network_state_symlinks(gssd_t)	
+ kernel_search_network_sysctl(gssd_t)	
++kernel_signal(gssd_t)	
+ 
+ corecmd_exec_bin(gssd_t)
+ 
+@@ -189,8 +199,10 @@
  fs_rw_rpc_sockets(gssd_t) 
  fs_read_rpc_files(gssd_t) 
  
@@ -15501,7 +16700,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(gssd_t)
  auth_manage_cache(gssd_t) 
-@@ -199,6 +209,8 @@
+@@ -199,6 +211,8 @@
  
  mount_signal(gssd_t)
  
@@ -17129,16 +18328,36 @@ diff -b -B --ignore-all-space --exclude-
 +/var/spool/MIMEDefang(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.6.30/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/spamassassin.if	2009-08-31 13:40:47.000000000 -0400
-@@ -111,6 +111,7 @@
++++ serefpolicy-3.6.30/policy/modules/services/spamassassin.if	2009-09-08 18:13:29.000000000 -0400
+@@ -111,6 +111,27 @@
  	')
  
  	domtrans_pattern($1, spamc_exec_t, spamc_t)
 +	allow $1 spamc_exec_t:file ioctl;
++')
++
++########################################
++## <summary>
++##	Manage spamc home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`spamassassin_manage_home_client',`
++	gen_require(`
++		type spamc_home_t;
++	')
++
++	manage_dirs_pattern($1, spamc_home_t, spamc_home_t)
++	manage_files_pattern($1, spamc_home_t, spamc_home_t)
++	manage_lnk_files_pattern($1, spamc_home_t, spamc_home_t)
  ')
  
  ########################################
-@@ -166,6 +167,7 @@
+@@ -166,6 +187,7 @@
  	')
  
  	files_search_var_lib($1)
@@ -17146,7 +18365,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
  ')
  
-@@ -225,3 +227,69 @@
+@@ -225,3 +247,69 @@
  
  	dontaudit $1 spamd_tmp_t:sock_file getattr;
  ')
@@ -18178,13 +19397,14 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.6.30/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/services/virt.fc	2009-08-31 13:40:47.000000000 -0400
-@@ -8,5 +8,16 @@
++++ serefpolicy-3.6.30/policy/modules/services/virt.fc	2009-09-08 18:45:04.000000000 -0400
+@@ -8,5 +8,17 @@
  
  /var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
  /var/lib/libvirt/images(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
 +/var/lib/libvirt/isos(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
 +/var/lib/libvirt/boot(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
++/var/lib/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 +
  /var/log/libvirt(/.*)?		gen_context(system_u:object_r:virt_log_t,s0)
  /var/run/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_run_t,s0)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -p -r1.913 -r1.914
--- selinux-policy.spec	8 Sep 2009 14:30:36 -0000	1.913
+++ selinux-policy.spec	8 Sep 2009 23:55:31 -0000	1.914
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.30
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-6
+- More fixes
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-5
 - Lots of fixes for initrc and other unconfined domains
 



From airlied at fedoraproject.org  Wed Sep  9 00:09:54 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  9 Sep 2009 00:09:54 +0000 (UTC)
Subject: rpms/mesa/devel sources,1.39,1.40
Message-ID: <20090909000954.9CD5211C0082@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30607

Modified Files:
	sources 
Log Message:
commit newer tarball



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	8 Sep 2009 23:06:42 -0000	1.39
+++ sources	9 Sep 2009 00:09:54 -0000	1.40
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-d8b62c4067888a255900fa962670ba43  mesa-20090909.tar.bz2
+47449707b6c52e8d6ccbf7c7084d76ba  mesa-20090909.tar.bz2



From bpepple at fedoraproject.org  Wed Sep  9 00:41:43 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed,  9 Sep 2009 00:41:43 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.82,1.83
Message-ID: <20090909004143.9EE3B11C0082@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13501

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.1.7-2
- Rebuild for new Empathy.



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- nautilus-sendto.spec	2 Sep 2009 15:09:40 -0000	1.82
+++ nautilus-sendto.spec	9 Sep 2009 00:41:43 -0000	1.83
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        1.1.7
-Release:        1%{?dist}
+Release:        2%{?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 Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.1.7-2
+- Rebuild for new Empathy.
+
 * Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 1.1.7-1
 - Update to 1.1.7
 



From whot at fedoraproject.org  Wed Sep  9 02:10:00 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  9 Sep 2009 02:10:00 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.16, 1.17 sources, 1.16, 
	1.17 xorg-x11-drv-mouse.spec, 1.33, 1.34
Message-ID: <20090909021000.6B68811C0099@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10608

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
* Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.1-1
- mouse 1.4.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	19 Jun 2009 00:45:41 -0000	1.16
+++ .cvsignore	9 Sep 2009 02:09:59 -0000	1.17
@@ -1 +1 @@
-xf86-input-mouse-20090619.tar.bz2
+xf86-input-mouse-1.4.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	19 Jun 2009 00:45:41 -0000	1.16
+++ sources	9 Sep 2009 02:10:00 -0000	1.17
@@ -1 +1 @@
-d4cad2c837538019e3355c4c960badc4  xf86-input-mouse-20090619.tar.bz2
+092c125d0d45a98f8450aefaffd5c10f  xf86-input-mouse-1.4.99.1.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-mouse.spec	27 Jul 2009 08:28:08 -0000	1.33
+++ xorg-x11-drv-mouse.spec	9 Sep 2009 02:10:00 -0000	1.34
@@ -2,19 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090619
+#define gitdate 20090619
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.4.99
-Release:   3.%{gitdate}%{?dist}.1
+Version:   1.4.99.1
+Release:   1.{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
 ExcludeArch: s390 s390x
@@ -28,8 +28,8 @@ Requires: xorg-x11-server-Xorg >= 1.5.99
 X.Org X11 mouse input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+#setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf -v --install || exit 1
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.1-1
+- mouse 1.4.99.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.99-3.20090619.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Wed Sep  9 02:15:22 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed,  9 Sep 2009 02:15:22 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 .cvsignore, 1.9, 1.10 mirrormanager.spec,
	1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20090909021522.40E3F11C0099@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11934

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
update to 1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Apr 2009 16:55:47 -0000	1.9
+++ .cvsignore	9 Sep 2009 02:15:21 -0000	1.10
@@ -1 +1 @@
-mirrormanager-1.2.11.tar.bz2
+mirrormanager-1.3.0.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mirrormanager.spec	7 Apr 2009 16:55:47 -0000	1.9
+++ mirrormanager.spec	9 Sep 2009 02:15:21 -0000	1.10
@@ -1,16 +1,16 @@
 Name:           mirrormanager
-Version:        1.2.11
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
 Group:          Applications/Internet
-License:        MIT and GPLv2 and GPLv3
+License:        MIT and GPLv2
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
-Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum
+Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14
 
 %define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
 %if "%{py_ver}" < "2.5"
@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
-%doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2 LICENSE-GPLv3
+%doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2
 %doc server/*.cfg
 
 %files client
@@ -72,6 +72,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.0-1
+- add CSRF protection, add Requires: python-fedora
+- add IPv6 capability
+- switch DNS lookups to use python-dns
+- other misc bugfixes
+
+* Thu Jul  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.12-1
+- bug fixes post F11 release
+
+* Mon Apr 20 2009 Mike McGrath <mmcgrath at fedoraproject.org> 1.2.11-2
+- Added psmisc Requires
+
 * Tue Apr  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.11-1
 - fix quite a few bugs from previous version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Apr 2009 16:55:47 -0000	1.9
+++ sources	9 Sep 2009 02:15:21 -0000	1.10
@@ -1 +1 @@
-e984e646df8154dcbe511fc8d384ceaa  mirrormanager-1.2.11.tar.bz2
+1be6ae3e072b88fe37d1e3cf01237820  mirrormanager-1.3.0.tar.bz2



From roland at fedoraproject.org  Wed Sep  9 02:16:13 2009
From: roland at fedoraproject.org (roland)
Date: Wed,  9 Sep 2009 02:16:13 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1776,1.1777
Message-ID: <20090909021613.94C5D11C0099@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140

Modified Files:
	kernel.spec 
Log Message:
compile with -fno-var-tracking-assignments, work around gcc bug #521991


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1776
retrieving revision 1.1777
diff -u -p -r1.1776 -r1.1777
--- kernel.spec	8 Sep 2009 22:51:11 -0000	1.1776
+++ kernel.spec	9 Sep 2009 02:16:13 -0000	1.1777
@@ -1162,7 +1162,7 @@ ApplyPatch linux-2.6-dell-laptop-rfkill-
 #
 # Quiesce USB host controllers before setting up the IOMMU
 ApplyPatch linux-2.6-die-closed-source-bios-muppets-die.patch
-# Some performance fixes, unify hardware/software passthrough support, and 
+# Some performance fixes, unify hardware/software passthrough support, and
 # most importantly: notice when the BIOS points us to a region that returns
 # all 0xFF, and claims that there's an IOMMU there.
 ApplyPatch linux-2.6-intel-iommu-updates.patch
@@ -1444,6 +1444,11 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
+    cat >> Makefile <<\EOF
+# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
+KBUILD_CFLAGS += -fno-var-tracking-assignments
+EOF
+
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -1794,7 +1799,7 @@ make DESTDIR=$RPM_BUILD_ROOT bootwrapper
     done
 %if !%{with_firmware}
 # remove the firmware files, if ! with_firmware
-    rm -fr $RPM_BUILD_ROOT/lib/firmware 
+    rm -fr $RPM_BUILD_ROOT/lib/firmware
 %endif
 %endif
 
@@ -2020,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep  9 2009 Roland McGrath <roland at redhat.com> 2.6.31-0.214.rc9.git1
+- compile with -fno-var-tracking-assignments, work around gcc bug #521991
+
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.213.rc9.git1
 - fix two bugs in r600 kms, fencing + mobile lvds
 
@@ -2346,7 +2354,7 @@ fi
 * Thu Jul 30 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: another DCB 1.5 entry, G80 corruption fixes, small <G80 KMS fix
 
-* Thu Jul 30 2009 Dave Airlie <airlied at redhat.com> 
+* Thu Jul 30 2009 Dave Airlie <airlied at redhat.com>
 - fix VGA ARB + kms
 
 * Wed Jul 29 2009 Dave Jones <davej at redhat.com>
@@ -3178,4 +3186,3 @@ fi
 # rpm-change-log-uses-utc: t
 # End:
 ###
-



From whot at fedoraproject.org  Wed Sep  9 02:17:50 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  9 Sep 2009 02:17:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.13, 1.14 sources,
	1.13, 1.14 xorg-x11-drv-keyboard.spec, 1.33, 1.34
Message-ID: <20090909021750.7422C11C0099@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12639

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
* Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.99.1-1
- keyboard 1.3.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	15 Jul 2009 07:17:04 -0000	1.13
+++ .cvsignore	9 Sep 2009 02:17:50 -0000	1.14
@@ -1 +1 @@
-xf86-input-keyboard-20090715.tar.bz2
+xf86-input-keyboard-1.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Jul 2009 07:17:04 -0000	1.13
+++ sources	9 Sep 2009 02:17:50 -0000	1.14
@@ -1 +1 @@
-1439c95b1031cc65a77313d9b451648c  xf86-input-keyboard-20090715.tar.bz2
+94a849a5eb041124b993e3fe4eaaa7f1  xf86-input-keyboard-1.3.99.1.tar.bz2


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-keyboard.spec	27 Jul 2009 08:27:27 -0000	1.33
+++ xorg-x11-drv-keyboard.spec	9 Sep 2009 02:17:50 -0000	1.34
@@ -2,19 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090715
+#define gitdate 20090715
 
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
-Version:    1.3.99
-Release:    3.%{gitdate}%{?dist}.1
+Version:    1.3.99.1
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 
@@ -30,8 +30,8 @@ Requires:  xkeyboard-config >= 1.2-2
 X.Org X11 keyboard input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf -v --install || exit 1
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.99.1-1
+- keyboard 1.3.99.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.99-3.20090715.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Wed Sep  9 02:31:26 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed,  9 Sep 2009 02:31:26 +0000 (UTC)
Subject: rpms/mirrormanager/devel .cvsignore, 1.6, 1.7 mirrormanager.spec,
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090909023126.341A311C0099@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16635

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
update to 1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Apr 2009 16:53:08 -0000	1.6
+++ .cvsignore	9 Sep 2009 02:31:25 -0000	1.7
@@ -1 +1 @@
-mirrormanager-1.2.11.tar.bz2
+mirrormanager-1.3.0.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/mirrormanager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mirrormanager.spec	25 Jul 2009 14:34:57 -0000	1.8
+++ mirrormanager.spec	9 Sep 2009 02:31:26 -0000	1.9
@@ -1,16 +1,16 @@
 Name:           mirrormanager
-Version:        1.2.11
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
 Group:          Applications/Internet
-License:        MIT and GPLv2 and GPLv3
+License:        MIT and GPLv2
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
-Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum
+Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14
 
 %define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
 %if "%{py_ver}" < "2.5"
@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
-%doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2 LICENSE-GPLv3
+%doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2
 %doc server/*.cfg
 
 %files client
@@ -72,8 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.0-1
+- add CSRF protection, add Requires: python-fedora
+- add IPv6 capability
+- switch DNS lookups to use python-dns
+- other misc bugfixes
+
+* Thu Jul  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.12-1
+- bug fixes post F11 release
+
+* Mon Apr 20 2009 Mike McGrath <mmcgrath at fedoraproject.org> 1.2.11-2
+- Added psmisc Requires
 
 * Tue Apr  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.11-1
 - fix quite a few bugs from previous version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Apr 2009 16:53:08 -0000	1.6
+++ sources	9 Sep 2009 02:31:26 -0000	1.7
@@ -1 +1 @@
-e984e646df8154dcbe511fc8d384ceaa  mirrormanager-1.2.11.tar.bz2
+1be6ae3e072b88fe37d1e3cf01237820  mirrormanager-1.3.0.tar.bz2



From mbarnes at fedoraproject.org  Wed Sep  9 02:33:17 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  9 Sep 2009 02:33:17 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.42,1.394.2.43
Message-ID: <20090909023317.D712211C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17421

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:

* Tue Sep 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.5.fc12
- Snapshot of "kill-bonobo" progress at commit 0a47d87.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.42
retrieving revision 1.394.2.43
diff -u -p -r1.394.2.42 -r1.394.2.43
--- evolution.spec	8 Sep 2009 03:20:31 -0000	1.394.2.42
+++ evolution.spec	9 Sep 2009 02:33:17 -0000	1.394.2.43
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 35929a3
+%define hash 0a47d87
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.4%{?dist}
+Release: 1.kb.5%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -483,7 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution/%{evo_major}
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
-%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
+#%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/evolution-backup
 %{_libexecdir}/evolution/%{evo_major}/killev
 
@@ -679,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Sep 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.5.fc12
+- Snapshot of "kill-bonobo" progress at commit 0a47d87.
+
 * Mon Sep 07 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.4.fc12
 - Further lower the minimum evolution-data-server version.
 



From mbarnes at fedoraproject.org  Wed Sep  9 02:44:27 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  9 Sep 2009 02:44:27 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.20, 1.116.2.21 sources,
	1.116.2.24, 1.116.2.25
Message-ID: <20090909024427.A721911C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20657

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore sources 
Log Message:
Forgot to upload the tarball again...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.20
retrieving revision 1.116.2.21
diff -u -p -r1.116.2.20 -r1.116.2.21
--- .cvsignore	4 Sep 2009 21:58:04 -0000	1.116.2.20
+++ .cvsignore	9 Sep 2009 02:44:27 -0000	1.116.2.21
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-35929a3.tar.bz2
+evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.24
retrieving revision 1.116.2.25
diff -u -p -r1.116.2.24 -r1.116.2.25
--- sources	4 Sep 2009 21:58:05 -0000	1.116.2.24
+++ sources	9 Sep 2009 02:44:27 -0000	1.116.2.25
@@ -1 +1 @@
-0bf1036d94b9d4c92f188aa766cf344d  evolution-2.29.1-kill-bonobo-35929a3.tar.bz2
+84efc5b17b678292d07b8da65f97122f  evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2



From bpepple at fedoraproject.org  Wed Sep  9 02:51:13 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed,  9 Sep 2009 02:51:13 +0000 (UTC)
Subject: rpms/telepathy-farsight/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 telepathy-farsight.spec, 1.8, 1.9
Message-ID: <20090909025113.9742111C0099@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22347

Modified Files:
	.cvsignore sources telepathy-farsight.spec 
Log Message:
* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-1
- Update to 0.0.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Aug 2009 14:26:49 -0000	1.6
+++ .cvsignore	9 Sep 2009 02:51:13 -0000	1.7
@@ -1 +1 @@
-telepathy-farsight-0.0.9.tar.gz
+telepathy-farsight-0.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 14:26:49 -0000	1.6
+++ sources	9 Sep 2009 02:51:13 -0000	1.7
@@ -1 +1 @@
-7dcabefe3880b592323397c0218662a0  telepathy-farsight-0.0.9.tar.gz
+cab33f249d7c1dcf449a0da6ab1cb7ef  telepathy-farsight-0.0.10.tar.gz


Index: telepathy-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/telepathy-farsight.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- telepathy-farsight.spec	25 Aug 2009 14:26:49 -0000	1.8
+++ telepathy-farsight.spec	9 Sep 2009 02:51:13 -0000	1.9
@@ -1,11 +1,11 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define dbus_ver        0.60
-%define tp_glib_ver     0.7.26
+%define tp_glib_ver     0.7.34
 %define farsight2_ver   0.0.14
 
 Name:           telepathy-farsight
-Version:        0.0.9
+Version:        0.0.10
 Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming channels
 
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-1
+- Update to 0.0.10.
+
 * Tue Aug 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
 - Update to 0.0.9.
 



From mbarnes at fedoraproject.org  Wed Sep  9 02:54:29 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  9 Sep 2009 02:54:29 +0000 (UTC)
Subject: rpms/evolution/devel evolution-kb-override-version.patch, 1.1.2.3, 
	1.1.2.4
Message-ID: <20090909025429.C36CC11C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23078

Modified Files:
      Tag: private-mbarnes-kb
	evolution-kb-override-version.patch 
Log Message:
Fix version override patch.


evolution-kb-override-version.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: evolution-kb-override-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/Attic/evolution-kb-override-version.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- evolution-kb-override-version.patch	8 Sep 2009 03:20:30 -0000	1.1.2.3
+++ evolution-kb-override-version.patch	9 Sep 2009 02:54:29 -0000	1.1.2.4
@@ -1,6 +1,6 @@
-diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac
---- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version	2009-09-01 15:02:53.028656991 -0400
-+++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac	2009-09-01 15:36:41.818612634 -0400
+diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac
+--- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
++++ evolution-2.29.1-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
 @@ -1,7 +1,7 @@
  dnl Evolution Versions
  m4_define([evo_major_version], [2])
@@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-f9
 +m4_define([eds_minimum_version], [2.27.1])
  m4_define([gnome_icon_theme_minimum_version], [2.19.91])
  m4_define([gnome_desktop_minimum_version], [2.26.0])
- m4_define([libbonobo_minimum_version], [2.20.3])
+ m4_define([libgtkhtml_minimum_version], [3.27.90])



From salimma at fedoraproject.org  Wed Sep  9 03:07:26 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 03:07:26 +0000 (UTC)
Subject: rpms/llvm/F-10 llvm-2.5-destdir.patch, NONE,
	1.1 llvm-2.5-tclsh_check.patch, NONE, 1.1 llvm.spec, 1.12,
	1.13 llvm-2.4-fix-ocaml.patch, 1.1, NONE
Message-ID: <20090909030726.D0D8811C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27831/F-10

Modified Files:
	llvm.spec 
Added Files:
	llvm-2.5-destdir.patch llvm-2.5-tclsh_check.patch 
Removed Files:
	llvm-2.4-fix-ocaml.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
- Only disable PIC on %ix86; ppc actually needs it


llvm-2.5-destdir.patch:
 Makefile.config.in         |   16 +++++++-------
 Makefile.rules             |   50 ++++++++++++++++++++++-----------------------
 docs/CommandGuide/Makefile |    6 ++---
 docs/Makefile              |   24 ++++++++++-----------
 docs/tutorial/Makefile     |    2 -
 lib/VMCore/Makefile        |    4 +--
 tools/gccas/Makefile       |    4 +--
 tools/gccld/Makefile       |    4 +--
 tools/llvm-config/Makefile |    4 +--
 9 files changed, 57 insertions(+), 57 deletions(-)

--- NEW FILE llvm-2.5-destdir.patch ---
diff -ru llvm-2.5.destdir/docs/CommandGuide/Makefile llvm-2.5/docs/CommandGuide/Makefile
--- llvm-2.5.destdir/docs/CommandGuide/Makefile	2008-06-09 03:14:31.000000000 -0400
+++ llvm-2.5/docs/CommandGuide/Makefile	2009-09-08 21:29:53.054393975 -0400
@@ -71,9 +71,9 @@
 clean-local::
 	$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
 
-HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
-MAN_DIR  := $(PROJ_mandir)/man1
-PS_DIR   := $(PROJ_docsdir)/ps
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
+MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
+PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
 
 install-local:: $(HTML) $(MAN) $(PS)
 	$(Echo) Installing HTML CommandGuide Documentation
diff -ru llvm-2.5.destdir/docs/Makefile llvm-2.5/docs/Makefile
--- llvm-2.5.destdir/docs/Makefile	2008-03-31 13:27:57.000000000 -0400
+++ llvm-2.5/docs/Makefile	2009-09-08 21:29:53.055395770 -0400
@@ -48,11 +48,11 @@
 
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
 	$(Echo) Installing HTML documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 	$(Echo) Packaging HTML documentation
@@ -63,11 +63,11 @@
 
 install-doxygen: doxygen
 	$(Echo) Installing doxygen documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
 
@@ -94,11 +94,11 @@
 
 install-ocamldoc: ocamldoc
 	$(Echo) Installing ocamldoc documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
 
 ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
 
@@ -122,4 +122,4 @@
 
 uninstall-local::
 	$(Echo) Uninstalling Documentation
-	$(Verb) $(RM) -rf $(PROJ_docsdir)
+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
diff -ru llvm-2.5.destdir/docs/tutorial/Makefile llvm-2.5/docs/tutorial/Makefile
--- llvm-2.5.destdir/docs/tutorial/Makefile	2008-03-30 16:32:18.000000000 -0400
+++ llvm-2.5/docs/tutorial/Makefile	2009-09-08 21:29:53.056390721 -0400
@@ -12,7 +12,7 @@
 
 HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
 EXTRA_DIST := $(HTML) index.html
-HTML_DIR   := $(PROJ_docsdir)/html/tutorial
+HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
 
 install-local:: $(HTML)
 	$(Echo) Installing HTML Tutorial Documentation
diff -ru llvm-2.5.destdir/lib/VMCore/Makefile llvm-2.5/lib/VMCore/Makefile
--- llvm-2.5.destdir/lib/VMCore/Makefile	2009-01-09 11:44:42.000000000 -0500
+++ llvm-2.5/lib/VMCore/Makefile	2009-09-08 21:29:53.057389443 -0400
@@ -29,5 +29,5 @@
 	    changed significantly. )
 
 install-local:: $(GENFILE)
-	$(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
-	$(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
+	$(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
+	$(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
diff -ru llvm-2.5.destdir/Makefile.config.in llvm-2.5/Makefile.config.in
--- llvm-2.5.destdir/Makefile.config.in	2009-01-09 11:44:42.000000000 -0500
+++ llvm-2.5/Makefile.config.in	2009-09-08 21:29:53.048148959 -0400
@@ -76,14 +76,14 @@
 
 LLVMMAKE := $(LLVM_SRC_ROOT)/make
 
-PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
-PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
-PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
-PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
-PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
-PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
-PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
-PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
+PROJ_bindir     := $(PROJ_prefix)/bin
+PROJ_libdir     := $(PROJ_prefix)/lib
+PROJ_datadir    := $(PROJ_prefix)/share
+PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
+PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
+PROJ_includedir := $(PROJ_prefix)/include
+PROJ_infodir    := $(PROJ_prefix)/info
+PROJ_mandir     := $(PROJ_prefix)/share/man
 
 # Determine if we're on a unix type operating system
 LLVM_ON_UNIX:=@LLVM_ON_UNIX@
diff -ru llvm-2.5.destdir/Makefile.rules llvm-2.5/Makefile.rules
--- llvm-2.5.destdir/Makefile.rules	2009-02-13 20:07:49.000000000 -0500
+++ llvm-2.5/Makefile.rules	2009-09-08 21:36:45.680391473 -0400
@@ -560,7 +560,7 @@
 # in the file so they get built before dependencies
 #---------------------------------------------------------
 
-$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
+$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
 	$(Verb) $(MKDIR) $@
 
 # To create other directories, as needed, and timestamp their creation
@@ -682,22 +682,22 @@
 uninstall-local::
 	$(Echo) UnInstall circumvented with NO_INSTALL
 else
-install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
-	$(Echo) Installing Configuration Files To $(PROJ_etcdir)
+install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
+	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
           if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
+            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
           elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
-            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
+            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
           else \
             $(ECHO) Error: cannot find config file $${file}. ; \
           fi \
 	done
 
 uninstall-local::
-	$(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
+	$(Echo) Uninstalling Configuration Files From $(DESTDIR)$(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
-	  $(RM) -f $(PROJ_etcdir)/$${file} ; \
+	  $(RM) -f $(DESTDIR)$(PROJ_etcdir)/$${file} ; \
 	done
 endif
 
@@ -784,7 +784,7 @@
 ifdef BYTECODE_DESTINATION
 ModuleDestDir := $(BYTECODE_DESTINATION)
 else
-ModuleDestDir := $(PROJ_libdir)
+ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
 endif
 
 ifdef NO_INSTALL
@@ -864,18 +864,18 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
+DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
 
 install-local:: $(DestSharedLib)
 
-$(DestSharedLib): $(LibName.LA) $(PROJ_libdir)
+$(DestSharedLib): $(LibName.LA) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
 	$(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib)
 	$(Verb) $(LIBTOOL) --finish $(PROJ_libdir)
 
 uninstall-local::
 	$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
-	-$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
+	-$(Verb) $(RM) -f $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).*
 endif
 endif
 
@@ -920,7 +920,7 @@
 ifdef BYTECODE_DESTINATION
 BytecodeDestDir := $(BYTECODE_DESTINATION)
 else
-BytecodeDestDir := $(PROJ_libdir)
+BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
 endif
 
 DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).a
@@ -978,11 +978,11 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestRelinkedLib = $(PROJ_libdir)/$(LIBRARYNAME).o
+DestRelinkedLib = $(DESTDIR)$(PROJ_libdir)/$(LIBRARYNAME).o
 
 install-local:: $(DestRelinkedLib)
 
-$(DestRelinkedLib): $(LibName.O) $(PROJ_libdir)
+$(DestRelinkedLib): $(LibName.O) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Object Library $(DestRelinkedLib)
 	$(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib)
 
@@ -1018,13 +1018,13 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
+DestArchiveLib := $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).a
 
 install-local:: $(DestArchiveLib)
 
-$(DestArchiveLib): $(LibName.A) $(PROJ_libdir)
+$(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
-	$(Verb) $(MKDIR) $(PROJ_libdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
 	$(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib)
 
 uninstall-local::
@@ -1080,11 +1080,11 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestTool = $(PROJ_bindir)/$(TOOLNAME)
+DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLNAME)
 
 install-local:: $(DestTool)
 
-$(DestTool): $(ToolBuildPath) $(PROJ_bindir)
+$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir)
 	$(Echo) Installing $(BuildMode) $(DestTool)
 	$(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
 
@@ -1652,25 +1652,25 @@
 else
 install-local::
 	$(Echo) Installing include files
-	$(Verb) $(MKDIR) $(PROJ_includedir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
 	$(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	  for  hdr in `find . -type f '!' '(' -name '*~' \
 	      -o -name '.#*' -o -name '*.in' ')' -print | grep -v CVS | \
 	      grep -v .svn` ; do \
-	    instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
+	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
 	    if test \! -d "$$instdir" ; then \
 	      $(EchoCmd) Making install directory $$instdir ; \
 	      $(MKDIR) $$instdir ;\
 	    fi ; \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 	$(Verb) if test -d "$(PROJ_OBJ_ROOT)/include" ; then \
 	  cd $(PROJ_OBJ_ROOT)/include && \
 	  for hdr in `find . -type f -print | grep -v CVS` ; do \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 endif
@@ -1682,10 +1682,10 @@
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
 	      '!' '(' -name '*~' -o -name '.#*' \
         -o -name '*.in' ')' -print ')' | \
-        grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
+        grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
-      -print ')' | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
+      -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
 	fi
 endif
 endif
diff -ru llvm-2.5.destdir/tools/gccas/Makefile llvm-2.5/tools/gccas/Makefile
--- llvm-2.5.destdir/tools/gccas/Makefile	2007-12-29 15:07:17.000000000 -0500
+++ llvm-2.5/tools/gccas/Makefile	2009-09-08 21:29:53.058390400 -0400
@@ -10,9 +10,9 @@
 
 include $(LEVEL)/Makefile.common
 
-install-local:: $(PROJ_bindir)/gccas
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccas
 	
-$(PROJ_bindir)/gccas : gccas.sh Makefile
+$(DESTDIR)$(PROJ_bindir)/gccas : gccas.sh Makefile
 	$(Echo) Installing gccas shell script.
 	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
 	$(Verb) chmod 0755 $@
diff -ru llvm-2.5.destdir/tools/gccld/Makefile llvm-2.5/tools/gccld/Makefile
--- llvm-2.5.destdir/tools/gccld/Makefile	2007-12-29 15:07:17.000000000 -0500
+++ llvm-2.5/tools/gccld/Makefile	2009-09-08 21:29:53.059390658 -0400
@@ -11,9 +11,9 @@
 
 include $(LEVEL)/Makefile.common
 
-install-local:: $(PROJ_bindir)/gccld
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccld
 	
-$(PROJ_bindir)/gccld : gccld.sh Makefile
+$(DESTDIR)$(PROJ_bindir)/gccld : gccld.sh Makefile
 	$(Echo) Installing gccld shell script.
 	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
 	$(Verb) chmod 0755 $@
diff -ru llvm-2.5.destdir/tools/llvm-config/Makefile llvm-2.5/tools/llvm-config/Makefile
--- llvm-2.5.destdir/tools/llvm-config/Makefile	2007-12-29 15:07:17.000000000 -0500
+++ llvm-2.5/tools/llvm-config/Makefile	2009-09-08 21:29:53.060389870 -0400
@@ -82,6 +82,6 @@
 	  $(LibDeps) GenLibDeps.out
 install-local:: all-local
 	$(Echo) Installing llvm-config
-	$(Verb) $(MKDIR) $(PROJ_bindir)
-	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
+	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
 

llvm-2.5-tclsh_check.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE llvm-2.5-tclsh_check.patch ---
--- llvm-2.5/configure.tclsh_check	2009-02-03 00:29:49.000000000 -0500
+++ llvm-2.5/configure	2009-09-05 12:25:54.761389908 -0400
@@ -8032,7 +8032,7 @@
 else
 
 if test x"${with_tclinclude}" != x ; then
-  if test -f ${with_tclinclude}/tclsh ; then
+  if test -f ${with_tclinclude}/tcl.h ; then
     ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
   elif test -f ${with_tclinclude}/src/tclsh ; then
     ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- llvm.spec	22 Aug 2009 21:18:32 -0000	1.12
+++ llvm.spec	9 Sep 2009 03:07:26 -0000	1.13
@@ -2,11 +2,6 @@
 #
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
-#
-# --with gcc
-#   The llvm-gcc package doesn't currently build.
-
-%define lgcc_version 4.2
 
 # LLVM object files don't contain build IDs.  I don't know why yet.
 # Suppress their generation for now.
@@ -15,20 +10,21 @@
 
 Name:           llvm
 Version:        2.5
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-Source1:        http://llvm.org/releases/%{version}/llvm-gcc-%{lgcc_version}-%{version}.source.tar.gz
-%endif
+Source0:        http://llvm.org/prereleases/%{version}/llvm-%{version}.tar.gz
 Patch0:         llvm-2.1-fix-sed.patch
-Patch1:         llvm-2.4-fix-ocaml.patch
+# http://llvm.org/bugs/show_bug.cgi?id=3153
+# backported from 2.6 patch
+Patch1:         llvm-2.5-destdir.patch
 # http://llvm.org/bugs/show_bug.cgi?id=3726
 Patch2:         llvm-2.5-gcc44.patch
+# http://llvm.org/bugs/show_bug.cgi?id=4911
+Patch3:         llvm-2.5-tclsh_check.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -39,6 +35,8 @@ BuildRequires:  gcc-c++ >= 3.4
 BuildRequires:  groff
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  ocaml-ocamldoc
+# for DejaGNU test suite
+BuildRequires:  dejagnu tcl-devel python
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 BuildRequires:  doxygen graphviz
 %endif
@@ -54,11 +52,6 @@ arbitrary programming languages.  The co
 mirror sets of programming tools as well as libraries with equivalent
 functionality.
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-It currently supports compilation of C and C++ programs, using front
-ends derived from GCC %{lgcc_version}.
-%endif
-
 
 %package devel
 Summary:        Libraries and header files for LLVM
@@ -81,32 +74,6 @@ Requires:       %{name} = %{version}-%{r
 Documentation for the LLVM compiler infrastructure.
 
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-
-%package gcc
-Summary:        C compiler for LLVM
-License:        GPL+
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-
-
-%description gcc
-C compiler for LLVM.
-
-
-%package gcc-c++
-Summary:        C++ compiler for LLVM
-License:        GPL+
-Group:          Development/Languages
-Requires:       %{name}-gcc = %{version}-%{release}
-
-
-%description gcc-c++
-C++ compiler for LLVM.
-
-%endif
-
-
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %package apidoc
 Summary:        API documentation for LLVM
@@ -140,122 +107,82 @@ The %{name}-ocaml-devel package contains
 for developing applications that use %{name}-ocaml.
 
 
-%prep
-%setup -q -n llvm-%{version} %{?_with_gcc:-a1}
+%package ocaml-doc
+Summary:        Documentation for LLVM's OCaml binding
+Group:          Documentation
+Requires:       %{name}-ocaml = %{version}-%{release}
 
+%description ocaml-doc
+HTML documentation for LLVM's OCaml binding.
+
+
+
+%prep
+%setup -q
 %patch0 -p1 -b .fix-sed
-%patch1 -p1 -b .fix-ocaml
+%patch1 -p1 -b .destdir
 %patch2 -p1 -b .gcc44
+%patch3 -p1 -b .tclsh_check
+
 
 %build
-# Note: --enable-pic can be turned off when 2.6 comes out
-#       and up to 2.5, unsafe on 32-bit archs (in our case,
-#       anything but x86_64)
-%configure \
+# Disabling assertions now, rec. by pure and needed for OpenGTL
+# no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
+mkdir obj && cd obj
+../configure \
+  --prefix=%{_prefix} \
   --libdir=%{_libdir}/%{name} \
-  --datadir=%{_datadir}/%{name}-%{version} \
-  --disable-static \
-  --enable-assertions \
+  --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
-  --enable-optimized \
-%ifnarch %ix86
-  --enable-pic
+%ifnarch %{ix86}
+  --enable-pic=yes
 %endif
-#   --enable-targets=host-only \
+
+# FIXME file this
+# configure does not properly specify libdir
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
-# tools-only VERBOSE=1 OmitFramePointer='' REQUIRES_EH=1 \
-#  OPTIMIZE_OPTION='%{optflags}'
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-# Build llvm-gcc.
 
-export PATH=%{_builddir}/%{?buildsubdir}/Release/bin:$PATH
+%check
+(cd obj && make check) 2>&1 | tee testlog.txt || true
 
-mkdir llvm-gcc%{lgcc_version}-%{version}.source/build
-cd llvm-gcc%{lgcc_version}-%{version}.source/build
-
-../configure \
-  --host=%{_host} \
-  --build=%{_build} \
-  --target=%{_target_platform} \
-  --prefix=%{_libdir}/llvm-gcc \
-  --libdir=%{_libdir}/llvm-gcc/%{_lib} \
-  --enable-threads \
-  --disable-nls \
-%ifarch x86_64
-  --disable-multilib \
-  --disable-shared \
-%endif
-  --enable-languages=c,c++ \
-  --enable-llvm=%{_builddir}/%{?buildsubdir} \
-  --program-prefix=llvm-
-make %{_smp_mflags} LLVM_VERSION_INFO=%{version}
-%endif
 
 %install
 rm -rf %{buildroot}
+cd obj
 chmod -x examples/Makefile
-# OVERRIDE_libdir used by our patched Makefile.ocaml:
-# see http://llvm.org/bugs/show_bug.cgi?id=3153
+
 make install DESTDIR=%{buildroot} \
-     PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
-     OVERRIDE_libdir=%{_libdir}/%{name}/%{name} \
-     PROJ_docsdir=`pwd`/moredocs
-
-#make install \
-#  PROJ_prefix=%{buildroot}/%{_prefix} \
-#  PROJ_bindir=%{buildroot}/%{_bindir} \
-#  PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
-#  PROJ_datadir=%{buildroot}/%{_datadir} \
-#  PROJ_docsdir=%{buildroot}/%{_docdir}/%{name}-%{version} \
-#  PROJ_etcdir=%{buildroot}/%{_datadir}/%{name}-%{version} \
-#  PROJ_includedir=%{buildroot}/%{_includedir} \
-#  PROJ_infodir=%{buildroot}/%{_infodir} \
-#  PROJ_mandir=%{buildroot}/%{_mandir}
+     PROJ_docsdir=/moredocs
+
+# Move documentation back to build directory
+# 
+mv %{buildroot}/moredocs ../
+rm ../moredocs/*.tar.gz
+rm ../moredocs/ocamldoc/html/*.tar.gz
+
 find %{buildroot} -name .dir -print0 | xargs -0r rm -f
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
+file %{buildroot}/%{_libdir}/llvm/*.so | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
 
 # Get rid of erroneously installed example files.
-rm %{buildroot}%{_libdir}/%{name}/LLVMHello.*
-
-# And OCaml .o files
-rm %{buildroot}%{_libdir}/ocaml/*.o
-
-# Use relative links for ocaml's libLLVM*.a
-#(cd %{buildroot}%{_libdir}/ocaml && for i in libLLVM*.a; do
-#    ln -sf %{_libdir}/llvm/$i $i;
-# done)
+rm %{buildroot}%{_libdir}/%{name}/*LLVMHello.*
 
 # Remove deprecated tools.
 rm %{buildroot}%{_bindir}/gcc{as,ld}
 
+# FIXME file this bug
 sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
   %{buildroot}%{_bindir}/llvm-config
 
-chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa]
+chmod -x %{buildroot}%{_libdir}/%{name}/*.a
 
 # remove documentation makefiles:
 # they require the build directory to work
-find examples -name 'Makefile'
-
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-# Install llvm-gcc.
-
-make -C llvm-gcc%{lgcc_version}-%{version}.source/build install DESTDIR=%{buildroot}
-cd %{buildroot}%{_libdir}/llvm-gcc/%{_lib}
-find . -name '*.la' -print0 | xargs -0r rm
-find . -name '*.a' -exec %{buildroot}%{_bindir}/llvm-ranlib {} \;
-cd ../bin
-ln llvm-c++ llvm-gcc llvm-g++ %{buildroot}%{_bindir}
-rm llvm-cpp llvm-gccbug llvm-gcov %{_target_platform}-gcc*
-cd ..
-mv man/man1/llvm-gcc.1 man/man1/llvm-g++.1 %{buildroot}%{_mandir}/man1
-rm -r info man %{_lib}/libiberty.a
-rm -r libexec/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-rm -r %{_lib}/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-%endif
+find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %clean
@@ -286,7 +213,6 @@ rm -rf %{buildroot}
 %exclude %{_mandir}/man1/llvm-gcc.*
 %endif
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/llvm-config
@@ -294,6 +220,9 @@ rm -rf %{buildroot}
 %{_includedir}/%{name}-c
 %{_libdir}/%{name}
 
+%files doc
+%defattr(-,root,root,-)
+%doc examples moredocs/html
 
 %files ocaml
 %defattr(-,root,root,-)
@@ -306,10 +235,9 @@ rm -rf %{buildroot}
 %{_libdir}/ocaml/*.cmx*
 %{_libdir}/ocaml/*.mli
 
-%files doc
+%files ocaml-doc
 %defattr(-,root,root,-)
-%doc docs/*.{html,css} docs/img examples moredocs/*
-
+%doc moredocs/ocamldoc/html/*
 
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %files apidoc
@@ -318,40 +246,16 @@ rm -rf %{buildroot}
 %endif
 
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-%files gcc
-%defattr(-,root,root,-)
-%{_bindir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc/bin
-%dir %{_libdir}/llvm-gcc/include
-%dir %{_libdir}/llvm-gcc/%{_lib}
-%dir %{_libdir}/llvm-gcc/libexec
-%dir %{_libdir}/llvm-gcc/libexec/gcc
-%dir %{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}
-%{_libdir}/llvm-gcc/%{_lib}/gcc
-%{_libdir}/llvm-gcc/%{_lib}/libmudflap*.a
-%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-gcc
-%{_libdir}/llvm-gcc/bin/llvm-gcc
-%{_libdir}/llvm-gcc/include/mf-runtime.h
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/collect2
-%doc %{_mandir}/man1/llvm-gcc.*
-
 
-%files gcc-c++
-%defattr(-,root,root,-)
-%{_bindir}/llvm-[cg]++
-%{_libdir}/llvm-gcc/%{_lib}/lib*++.a
-%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-[cg]++
-%{_libdir}/llvm-gcc/bin/llvm-[cg]++
-%{_libdir}/llvm-gcc/include/c++
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1plus
-%doc %{_mandir}/man1/llvm-g++.*
-%endif
+%changelog
+* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-7
+- Backport destdir patch from 2.6
 
+* Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
+- Disable assertions (needed by OpenGTL)
+- Align spec file with upstream build instructions
+- Enable unit tests
 
-%changelog
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
 - Only disable PIC on %%ix86; ppc actually needs it
 
@@ -359,10 +263,14 @@ rm -rf %{buildroot}
 - Disable use of position-independent code on 32-bit platforms
   (buggy in LLVM <= 2.5)
 
-* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.4-4
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-2
 - Remove build scripts; they require the build directory to work
 
-* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.4-3
+* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-1
+- Update to 2.5
 - Package build scripts (bug #457881)
 
 * Tue Dec  2 2008 Michel Salim <salimma at fedoraproject.org> - 2.4-2


--- llvm-2.4-fix-ocaml.patch DELETED ---



From salimma at fedoraproject.org  Wed Sep  9 03:07:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 03:07:27 +0000 (UTC)
Subject: rpms/llvm/F-11 llvm-2.5-destdir.patch, NONE,
	1.1 llvm-2.5-tclsh_check.patch, NONE, 1.1 llvm.spec, 1.13,
	1.14 llvm-2.4-fix-ocaml.patch, 1.1, NONE
Message-ID: <20090909030727.42E1F11C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27831/F-11

Modified Files:
	llvm.spec 
Added Files:
	llvm-2.5-destdir.patch llvm-2.5-tclsh_check.patch 
Removed Files:
	llvm-2.4-fix-ocaml.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
- Only disable PIC on %ix86; ppc actually needs it


llvm-2.5-destdir.patch:
 Makefile.config.in         |   16 +++++++-------
 Makefile.rules             |   50 ++++++++++++++++++++++-----------------------
 docs/CommandGuide/Makefile |    6 ++---
 docs/Makefile              |   24 ++++++++++-----------
 docs/tutorial/Makefile     |    2 -
 lib/VMCore/Makefile        |    4 +--
 tools/gccas/Makefile       |    4 +--
 tools/gccld/Makefile       |    4 +--
 tools/llvm-config/Makefile |    4 +--
 9 files changed, 57 insertions(+), 57 deletions(-)

--- NEW FILE llvm-2.5-destdir.patch ---
diff -ru llvm-2.5.destdir/docs/CommandGuide/Makefile llvm-2.5/docs/CommandGuide/Makefile
--- llvm-2.5.destdir/docs/CommandGuide/Makefile	2008-06-09 03:14:31.000000000 -0400
+++ llvm-2.5/docs/CommandGuide/Makefile	2009-09-08 21:29:53.054393975 -0400
@@ -71,9 +71,9 @@
 clean-local::
 	$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
 
-HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
-MAN_DIR  := $(PROJ_mandir)/man1
-PS_DIR   := $(PROJ_docsdir)/ps
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
+MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
+PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
 
 install-local:: $(HTML) $(MAN) $(PS)
 	$(Echo) Installing HTML CommandGuide Documentation
diff -ru llvm-2.5.destdir/docs/Makefile llvm-2.5/docs/Makefile
--- llvm-2.5.destdir/docs/Makefile	2008-03-31 13:27:57.000000000 -0400
+++ llvm-2.5/docs/Makefile	2009-09-08 21:29:53.055395770 -0400
@@ -48,11 +48,11 @@
 
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
 	$(Echo) Installing HTML documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 	$(Echo) Packaging HTML documentation
@@ -63,11 +63,11 @@
 
 install-doxygen: doxygen
 	$(Echo) Installing doxygen documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
 
@@ -94,11 +94,11 @@
 
 install-ocamldoc: ocamldoc
 	$(Echo) Installing ocamldoc documentation
-	$(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
 	  $(FIND) . -type f -exec \
-	    $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
 
 ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
 
@@ -122,4 +122,4 @@
 
 uninstall-local::
 	$(Echo) Uninstalling Documentation
-	$(Verb) $(RM) -rf $(PROJ_docsdir)
+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
diff -ru llvm-2.5.destdir/docs/tutorial/Makefile llvm-2.5/docs/tutorial/Makefile
--- llvm-2.5.destdir/docs/tutorial/Makefile	2008-03-30 16:32:18.000000000 -0400
+++ llvm-2.5/docs/tutorial/Makefile	2009-09-08 21:29:53.056390721 -0400
@@ -12,7 +12,7 @@
 
 HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
 EXTRA_DIST := $(HTML) index.html
-HTML_DIR   := $(PROJ_docsdir)/html/tutorial
+HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
 
 install-local:: $(HTML)
 	$(Echo) Installing HTML Tutorial Documentation
diff -ru llvm-2.5.destdir/lib/VMCore/Makefile llvm-2.5/lib/VMCore/Makefile
--- llvm-2.5.destdir/lib/VMCore/Makefile	2009-01-09 11:44:42.000000000 -0500
+++ llvm-2.5/lib/VMCore/Makefile	2009-09-08 21:29:53.057389443 -0400
@@ -29,5 +29,5 @@
 	    changed significantly. )
 
 install-local:: $(GENFILE)
-	$(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
-	$(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
+	$(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
+	$(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
diff -ru llvm-2.5.destdir/Makefile.config.in llvm-2.5/Makefile.config.in
--- llvm-2.5.destdir/Makefile.config.in	2009-01-09 11:44:42.000000000 -0500
+++ llvm-2.5/Makefile.config.in	2009-09-08 21:29:53.048148959 -0400
@@ -76,14 +76,14 @@
 
 LLVMMAKE := $(LLVM_SRC_ROOT)/make
 
-PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
-PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
-PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
-PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
-PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
-PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
-PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
-PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
+PROJ_bindir     := $(PROJ_prefix)/bin
+PROJ_libdir     := $(PROJ_prefix)/lib
+PROJ_datadir    := $(PROJ_prefix)/share
+PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
+PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
+PROJ_includedir := $(PROJ_prefix)/include
+PROJ_infodir    := $(PROJ_prefix)/info
+PROJ_mandir     := $(PROJ_prefix)/share/man
 
 # Determine if we're on a unix type operating system
 LLVM_ON_UNIX:=@LLVM_ON_UNIX@
diff -ru llvm-2.5.destdir/Makefile.rules llvm-2.5/Makefile.rules
--- llvm-2.5.destdir/Makefile.rules	2009-02-13 20:07:49.000000000 -0500
+++ llvm-2.5/Makefile.rules	2009-09-08 21:36:45.680391473 -0400
@@ -560,7 +560,7 @@
 # in the file so they get built before dependencies
 #---------------------------------------------------------
 
-$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
+$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
 	$(Verb) $(MKDIR) $@
 
 # To create other directories, as needed, and timestamp their creation
@@ -682,22 +682,22 @@
 uninstall-local::
 	$(Echo) UnInstall circumvented with NO_INSTALL
 else
-install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
-	$(Echo) Installing Configuration Files To $(PROJ_etcdir)
+install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
+	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
           if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
+            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
           elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
-            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
+            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
           else \
             $(ECHO) Error: cannot find config file $${file}. ; \
           fi \
 	done
 
 uninstall-local::
-	$(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
+	$(Echo) Uninstalling Configuration Files From $(DESTDIR)$(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
-	  $(RM) -f $(PROJ_etcdir)/$${file} ; \
+	  $(RM) -f $(DESTDIR)$(PROJ_etcdir)/$${file} ; \
 	done
 endif
 
@@ -784,7 +784,7 @@
 ifdef BYTECODE_DESTINATION
 ModuleDestDir := $(BYTECODE_DESTINATION)
 else
-ModuleDestDir := $(PROJ_libdir)
+ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
 endif
 
 ifdef NO_INSTALL
@@ -864,18 +864,18 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
+DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
 
 install-local:: $(DestSharedLib)
 
-$(DestSharedLib): $(LibName.LA) $(PROJ_libdir)
+$(DestSharedLib): $(LibName.LA) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
 	$(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib)
 	$(Verb) $(LIBTOOL) --finish $(PROJ_libdir)
 
 uninstall-local::
 	$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
-	-$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
+	-$(Verb) $(RM) -f $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).*
 endif
 endif
 
@@ -920,7 +920,7 @@
 ifdef BYTECODE_DESTINATION
 BytecodeDestDir := $(BYTECODE_DESTINATION)
 else
-BytecodeDestDir := $(PROJ_libdir)
+BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
 endif
 
 DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).a
@@ -978,11 +978,11 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestRelinkedLib = $(PROJ_libdir)/$(LIBRARYNAME).o
+DestRelinkedLib = $(DESTDIR)$(PROJ_libdir)/$(LIBRARYNAME).o
 
 install-local:: $(DestRelinkedLib)
 
-$(DestRelinkedLib): $(LibName.O) $(PROJ_libdir)
+$(DestRelinkedLib): $(LibName.O) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Object Library $(DestRelinkedLib)
 	$(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib)
 
@@ -1018,13 +1018,13 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
+DestArchiveLib := $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).a
 
 install-local:: $(DestArchiveLib)
 
-$(DestArchiveLib): $(LibName.A) $(PROJ_libdir)
+$(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
 	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
-	$(Verb) $(MKDIR) $(PROJ_libdir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
 	$(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib)
 
 uninstall-local::
@@ -1080,11 +1080,11 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestTool = $(PROJ_bindir)/$(TOOLNAME)
+DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLNAME)
 
 install-local:: $(DestTool)
 
-$(DestTool): $(ToolBuildPath) $(PROJ_bindir)
+$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir)
 	$(Echo) Installing $(BuildMode) $(DestTool)
 	$(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
 
@@ -1652,25 +1652,25 @@
 else
 install-local::
 	$(Echo) Installing include files
-	$(Verb) $(MKDIR) $(PROJ_includedir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
 	$(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	  for  hdr in `find . -type f '!' '(' -name '*~' \
 	      -o -name '.#*' -o -name '*.in' ')' -print | grep -v CVS | \
 	      grep -v .svn` ; do \
-	    instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
+	    instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
 	    if test \! -d "$$instdir" ; then \
 	      $(EchoCmd) Making install directory $$instdir ; \
 	      $(MKDIR) $$instdir ;\
 	    fi ; \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 	$(Verb) if test -d "$(PROJ_OBJ_ROOT)/include" ; then \
 	  cd $(PROJ_OBJ_ROOT)/include && \
 	  for hdr in `find . -type f -print | grep -v CVS` ; do \
-	    $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
+	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \
 	fi
 endif
@@ -1682,10 +1682,10 @@
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
 	      '!' '(' -name '*~' -o -name '.#*' \
         -o -name '*.in' ')' -print ')' | \
-        grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
+        grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
-      -print ')' | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
+      -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
 	fi
 endif
 endif
diff -ru llvm-2.5.destdir/tools/gccas/Makefile llvm-2.5/tools/gccas/Makefile
--- llvm-2.5.destdir/tools/gccas/Makefile	2007-12-29 15:07:17.000000000 -0500
+++ llvm-2.5/tools/gccas/Makefile	2009-09-08 21:29:53.058390400 -0400
@@ -10,9 +10,9 @@
 
 include $(LEVEL)/Makefile.common
 
-install-local:: $(PROJ_bindir)/gccas
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccas
 	
-$(PROJ_bindir)/gccas : gccas.sh Makefile
+$(DESTDIR)$(PROJ_bindir)/gccas : gccas.sh Makefile
 	$(Echo) Installing gccas shell script.
 	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
 	$(Verb) chmod 0755 $@
diff -ru llvm-2.5.destdir/tools/gccld/Makefile llvm-2.5/tools/gccld/Makefile
--- llvm-2.5.destdir/tools/gccld/Makefile	2007-12-29 15:07:17.000000000 -0500
+++ llvm-2.5/tools/gccld/Makefile	2009-09-08 21:29:53.059390658 -0400
@@ -11,9 +11,9 @@
 
 include $(LEVEL)/Makefile.common
 
-install-local:: $(PROJ_bindir)/gccld
+install-local:: $(DESTDIR)$(PROJ_bindir)/gccld
 	
-$(PROJ_bindir)/gccld : gccld.sh Makefile
+$(DESTDIR)$(PROJ_bindir)/gccld : gccld.sh Makefile
 	$(Echo) Installing gccld shell script.
 	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
 	$(Verb) chmod 0755 $@
diff -ru llvm-2.5.destdir/tools/llvm-config/Makefile llvm-2.5/tools/llvm-config/Makefile
--- llvm-2.5.destdir/tools/llvm-config/Makefile	2007-12-29 15:07:17.000000000 -0500
+++ llvm-2.5/tools/llvm-config/Makefile	2009-09-08 21:29:53.060389870 -0400
@@ -82,6 +82,6 @@
 	  $(LibDeps) GenLibDeps.out
 install-local:: all-local
 	$(Echo) Installing llvm-config
-	$(Verb) $(MKDIR) $(PROJ_bindir)
-	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
+	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
 

llvm-2.5-tclsh_check.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE llvm-2.5-tclsh_check.patch ---
--- llvm-2.5/configure.tclsh_check	2009-02-03 00:29:49.000000000 -0500
+++ llvm-2.5/configure	2009-09-05 12:25:54.761389908 -0400
@@ -8032,7 +8032,7 @@
 else
 
 if test x"${with_tclinclude}" != x ; then
-  if test -f ${with_tclinclude}/tclsh ; then
+  if test -f ${with_tclinclude}/tcl.h ; then
     ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
   elif test -f ${with_tclinclude}/src/tclsh ; then
     ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-11/llvm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- llvm.spec	22 Aug 2009 21:18:32 -0000	1.13
+++ llvm.spec	9 Sep 2009 03:07:27 -0000	1.14
@@ -2,11 +2,6 @@
 #
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
-#
-# --with gcc
-#   The llvm-gcc package doesn't currently build.
-
-%define lgcc_version 4.2
 
 # LLVM object files don't contain build IDs.  I don't know why yet.
 # Suppress their generation for now.
@@ -15,20 +10,21 @@
 
 Name:           llvm
 Version:        2.5
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-Source1:        http://llvm.org/releases/%{version}/llvm-gcc-%{lgcc_version}-%{version}.source.tar.gz
-%endif
+Source0:        http://llvm.org/prereleases/%{version}/llvm-%{version}.tar.gz
 Patch0:         llvm-2.1-fix-sed.patch
-Patch1:         llvm-2.4-fix-ocaml.patch
+# http://llvm.org/bugs/show_bug.cgi?id=3153
+# backported from 2.6 patch
+Patch1:         llvm-2.5-destdir.patch
 # http://llvm.org/bugs/show_bug.cgi?id=3726
 Patch2:         llvm-2.5-gcc44.patch
+# http://llvm.org/bugs/show_bug.cgi?id=4911
+Patch3:         llvm-2.5-tclsh_check.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -39,6 +35,8 @@ BuildRequires:  gcc-c++ >= 3.4
 BuildRequires:  groff
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  ocaml-ocamldoc
+# for DejaGNU test suite
+BuildRequires:  dejagnu tcl-devel python
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 BuildRequires:  doxygen graphviz
 %endif
@@ -54,11 +52,6 @@ arbitrary programming languages.  The co
 mirror sets of programming tools as well as libraries with equivalent
 functionality.
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-It currently supports compilation of C and C++ programs, using front
-ends derived from GCC %{lgcc_version}.
-%endif
-
 
 %package devel
 Summary:        Libraries and header files for LLVM
@@ -81,32 +74,6 @@ Requires:       %{name} = %{version}-%{r
 Documentation for the LLVM compiler infrastructure.
 
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-
-%package gcc
-Summary:        C compiler for LLVM
-License:        GPL+
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-
-
-%description gcc
-C compiler for LLVM.
-
-
-%package gcc-c++
-Summary:        C++ compiler for LLVM
-License:        GPL+
-Group:          Development/Languages
-Requires:       %{name}-gcc = %{version}-%{release}
-
-
-%description gcc-c++
-C++ compiler for LLVM.
-
-%endif
-
-
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %package apidoc
 Summary:        API documentation for LLVM
@@ -140,122 +107,82 @@ The %{name}-ocaml-devel package contains
 for developing applications that use %{name}-ocaml.
 
 
-%prep
-%setup -q -n llvm-%{version} %{?_with_gcc:-a1}
+%package ocaml-doc
+Summary:        Documentation for LLVM's OCaml binding
+Group:          Documentation
+Requires:       %{name}-ocaml = %{version}-%{release}
 
+%description ocaml-doc
+HTML documentation for LLVM's OCaml binding.
+
+
+
+%prep
+%setup -q
 %patch0 -p1 -b .fix-sed
-%patch1 -p1 -b .fix-ocaml
+%patch1 -p1 -b .destdir
 %patch2 -p1 -b .gcc44
+%patch3 -p1 -b .tclsh_check
+
 
 %build
-# Note: --enable-pic can be turned off when 2.6 comes out
-#       and up to 2.5, unsafe on 32-bit archs (in our case,
-#       anything but x86_64)
-%configure \
+# Disabling assertions now, rec. by pure and needed for OpenGTL
+# no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
+mkdir obj && cd obj
+../configure \
+  --prefix=%{_prefix} \
   --libdir=%{_libdir}/%{name} \
-  --datadir=%{_datadir}/%{name}-%{version} \
-  --disable-static \
-  --enable-assertions \
+  --disable-assertions \
   --enable-debug-runtime \
   --enable-jit \
-  --enable-optimized \
-%ifnarch %ix86
-  --enable-pic
+%ifnarch %{ix86}
+  --enable-pic=yes
 %endif
-#   --enable-targets=host-only \
+
+# FIXME file this
+# configure does not properly specify libdir
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
-# tools-only VERBOSE=1 OmitFramePointer='' REQUIRES_EH=1 \
-#  OPTIMIZE_OPTION='%{optflags}'
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-# Build llvm-gcc.
 
-export PATH=%{_builddir}/%{?buildsubdir}/Release/bin:$PATH
+%check
+(cd obj && make check) 2>&1 | tee testlog.txt || true
 
-mkdir llvm-gcc%{lgcc_version}-%{version}.source/build
-cd llvm-gcc%{lgcc_version}-%{version}.source/build
-
-../configure \
-  --host=%{_host} \
-  --build=%{_build} \
-  --target=%{_target_platform} \
-  --prefix=%{_libdir}/llvm-gcc \
-  --libdir=%{_libdir}/llvm-gcc/%{_lib} \
-  --enable-threads \
-  --disable-nls \
-%ifarch x86_64
-  --disable-multilib \
-  --disable-shared \
-%endif
-  --enable-languages=c,c++ \
-  --enable-llvm=%{_builddir}/%{?buildsubdir} \
-  --program-prefix=llvm-
-make %{_smp_mflags} LLVM_VERSION_INFO=%{version}
-%endif
 
 %install
 rm -rf %{buildroot}
+cd obj
 chmod -x examples/Makefile
-# OVERRIDE_libdir used by our patched Makefile.ocaml:
-# see http://llvm.org/bugs/show_bug.cgi?id=3153
+
 make install DESTDIR=%{buildroot} \
-     PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
-     OVERRIDE_libdir=%{_libdir}/%{name}/%{name} \
-     PROJ_docsdir=`pwd`/moredocs
-
-#make install \
-#  PROJ_prefix=%{buildroot}/%{_prefix} \
-#  PROJ_bindir=%{buildroot}/%{_bindir} \
-#  PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
-#  PROJ_datadir=%{buildroot}/%{_datadir} \
-#  PROJ_docsdir=%{buildroot}/%{_docdir}/%{name}-%{version} \
-#  PROJ_etcdir=%{buildroot}/%{_datadir}/%{name}-%{version} \
-#  PROJ_includedir=%{buildroot}/%{_includedir} \
-#  PROJ_infodir=%{buildroot}/%{_infodir} \
-#  PROJ_mandir=%{buildroot}/%{_mandir}
+     PROJ_docsdir=/moredocs
+
+# Move documentation back to build directory
+# 
+mv %{buildroot}/moredocs ../
+rm ../moredocs/*.tar.gz
+rm ../moredocs/ocamldoc/html/*.tar.gz
+
 find %{buildroot} -name .dir -print0 | xargs -0r rm -f
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
+file %{buildroot}/%{_libdir}/llvm/*.so | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
 
 # Get rid of erroneously installed example files.
-rm %{buildroot}%{_libdir}/%{name}/LLVMHello.*
-
-# And OCaml .o files
-rm %{buildroot}%{_libdir}/ocaml/*.o
-
-# Use relative links for ocaml's libLLVM*.a
-#(cd %{buildroot}%{_libdir}/ocaml && for i in libLLVM*.a; do
-#    ln -sf %{_libdir}/llvm/$i $i;
-# done)
+rm %{buildroot}%{_libdir}/%{name}/*LLVMHello.*
 
 # Remove deprecated tools.
 rm %{buildroot}%{_bindir}/gcc{as,ld}
 
+# FIXME file this bug
 sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
   %{buildroot}%{_bindir}/llvm-config
 
-chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa]
+chmod -x %{buildroot}%{_libdir}/%{name}/*.a
 
 # remove documentation makefiles:
 # they require the build directory to work
-find examples -name 'Makefile'
-
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-# Install llvm-gcc.
-
-make -C llvm-gcc%{lgcc_version}-%{version}.source/build install DESTDIR=%{buildroot}
-cd %{buildroot}%{_libdir}/llvm-gcc/%{_lib}
-find . -name '*.la' -print0 | xargs -0r rm
-find . -name '*.a' -exec %{buildroot}%{_bindir}/llvm-ranlib {} \;
-cd ../bin
-ln llvm-c++ llvm-gcc llvm-g++ %{buildroot}%{_bindir}
-rm llvm-cpp llvm-gccbug llvm-gcov %{_target_platform}-gcc*
-cd ..
-mv man/man1/llvm-gcc.1 man/man1/llvm-g++.1 %{buildroot}%{_mandir}/man1
-rm -r info man %{_lib}/libiberty.a
-rm -r libexec/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-rm -r %{_lib}/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-%endif
+find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %clean
@@ -286,7 +213,6 @@ rm -rf %{buildroot}
 %exclude %{_mandir}/man1/llvm-gcc.*
 %endif
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/llvm-config
@@ -294,6 +220,9 @@ rm -rf %{buildroot}
 %{_includedir}/%{name}-c
 %{_libdir}/%{name}
 
+%files doc
+%defattr(-,root,root,-)
+%doc examples moredocs/html
 
 %files ocaml
 %defattr(-,root,root,-)
@@ -306,10 +235,9 @@ rm -rf %{buildroot}
 %{_libdir}/ocaml/*.cmx*
 %{_libdir}/ocaml/*.mli
 
-%files doc
+%files ocaml-doc
 %defattr(-,root,root,-)
-%doc docs/*.{html,css} docs/img examples moredocs/*
-
+%doc moredocs/ocamldoc/html/*
 
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %files apidoc
@@ -318,40 +246,16 @@ rm -rf %{buildroot}
 %endif
 
 
-%if %{?_with_gcc:1}%{!?_with_gcc:0}
-%files gcc
-%defattr(-,root,root,-)
-%{_bindir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc/bin
-%dir %{_libdir}/llvm-gcc/include
-%dir %{_libdir}/llvm-gcc/%{_lib}
-%dir %{_libdir}/llvm-gcc/libexec
-%dir %{_libdir}/llvm-gcc/libexec/gcc
-%dir %{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}
-%{_libdir}/llvm-gcc/%{_lib}/gcc
-%{_libdir}/llvm-gcc/%{_lib}/libmudflap*.a
-%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-gcc
-%{_libdir}/llvm-gcc/bin/llvm-gcc
-%{_libdir}/llvm-gcc/include/mf-runtime.h
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/collect2
-%doc %{_mandir}/man1/llvm-gcc.*
-
 
-%files gcc-c++
-%defattr(-,root,root,-)
-%{_bindir}/llvm-[cg]++
-%{_libdir}/llvm-gcc/%{_lib}/lib*++.a
-%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-[cg]++
-%{_libdir}/llvm-gcc/bin/llvm-[cg]++
-%{_libdir}/llvm-gcc/include/c++
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1plus
-%doc %{_mandir}/man1/llvm-g++.*
-%endif
+%changelog
+* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-7
+- Backport destdir patch from 2.6
 
+* Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
+- Disable assertions (needed by OpenGTL)
+- Align spec file with upstream build instructions
+- Enable unit tests
 
-%changelog
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
 - Only disable PIC on %%ix86; ppc actually needs it
 
@@ -359,6 +263,9 @@ rm -rf %{buildroot}
 - Disable use of position-independent code on 32-bit platforms
   (buggy in LLVM <= 2.5)
 
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-2
 - Remove build scripts; they require the build directory to work
 


--- llvm-2.4-fix-ocaml.patch DELETED ---



From salimma at fedoraproject.org  Wed Sep  9 03:25:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 03:25:28 +0000 (UTC)
Subject: rpms/llvm/F-10 llvm.spec,1.13,1.14
Message-ID: <20090909032528.47C1A11C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428/F-10

Modified Files:
	llvm.spec 
Log Message:
Carry over removal of OCaml .o files from old spec; these files were no longer
generated in 2.6



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- llvm.spec	9 Sep 2009 03:07:26 -0000	1.13
+++ llvm.spec	9 Sep 2009 03:25:26 -0000	1.14
@@ -171,6 +171,9 @@ file %{buildroot}/%{_libdir}/llvm/*.so |
 # Get rid of erroneously installed example files.
 rm %{buildroot}%{_libdir}/%{name}/*LLVMHello.*
 
+# And OCaml .o files
+rm %{buildroot}%{_libdir}/ocaml/*.o
+
 # Remove deprecated tools.
 rm %{buildroot}%{_bindir}/gcc{as,ld}
 



From salimma at fedoraproject.org  Wed Sep  9 03:25:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 03:25:28 +0000 (UTC)
Subject: rpms/llvm/F-11 llvm.spec,1.14,1.15
Message-ID: <20090909032528.4B0E411C00EF@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428/F-11

Modified Files:
	llvm.spec 
Log Message:
Carry over removal of OCaml .o files from old spec; these files were no longer
generated in 2.6



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-11/llvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- llvm.spec	9 Sep 2009 03:07:27 -0000	1.14
+++ llvm.spec	9 Sep 2009 03:25:27 -0000	1.15
@@ -171,6 +171,9 @@ file %{buildroot}/%{_libdir}/llvm/*.so |
 # Get rid of erroneously installed example files.
 rm %{buildroot}%{_libdir}/%{name}/*LLVMHello.*
 
+# And OCaml .o files
+rm %{buildroot}%{_libdir}/ocaml/*.o
+
 # Remove deprecated tools.
 rm %{buildroot}%{_bindir}/gcc{as,ld}
 



From mbarnes at fedoraproject.org  Wed Sep  9 03:26:03 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  9 Sep 2009 03:26:03 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.43,1.394.2.44
Message-ID: <20090909032603.E504711C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1783

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
No more .server files.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.43
retrieving revision 1.394.2.44
diff -u -p -r1.394.2.43 -r1.394.2.44
--- evolution.spec	9 Sep 2009 02:33:17 -0000	1.394.2.43
+++ evolution.spec	9 Sep 2009 03:26:03 -0000	1.394.2.44
@@ -315,7 +315,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/li
 # Strip unneeded translations from .mo files.
 # This reduces the RPM size by several megabytes.
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --gettext-package=%{name}-%{evo_major} --pot
 for p in *.po; do
@@ -371,9 +371,6 @@ rm -rf $RPM_BUILD_ROOT/var/lib/scrollkee
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 
-for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
-    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
-done
 %find_lang evolution-%{evo_major} --all-name --with-gnome
 
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
@@ -448,7 +445,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/%{evo_major}
 
 # Modules:
-%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{evo_major}
 %{_libdir}/evolution/%{evo_major}/modules



From cebbert at fedoraproject.org  Wed Sep  9 03:27:29 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Sep 2009 03:27:29 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc9-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1124, 1.1125 kernel.spec, 1.1777, 1.1778 sources, 1.1082,
	1.1083 upstream, 1.996, 1.997 patch-2.6.31-rc9-git1.bz2.sign,
	1.1, NONE
Message-ID: <20090909032729.B6FCF11C0099@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2249

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc9-git2.bz2.sign 
Removed Files:
	patch-2.6.31-rc9-git1.bz2.sign 
Log Message:
2.6.31-rc9-git2


--- NEW FILE patch-2.6.31-rc9-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKpvLJyGugalF9Dw4RArSYAJwOLMd76UjxHDZ8k0QdOP3YF7vWJQCZAUgx
99rpZfL2ywQBYLN+ayByAJI=
=pfHT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -p -r1.1124 -r1.1125
--- .cvsignore	8 Sep 2009 02:05:23 -0000	1.1124
+++ .cvsignore	9 Sep 2009 03:27:29 -0000	1.1125
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc9.bz2
-patch-2.6.31-rc9-git1.bz2
+patch-2.6.31-rc9-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1777
retrieving revision 1.1778
diff -u -p -r1.1777 -r1.1778
--- kernel.spec	9 Sep 2009 02:16:13 -0000	1.1777
+++ kernel.spec	9 Sep 2009 03:27:29 -0000	1.1778
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 9
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -2025,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc9-git2
+
 * Wed Sep  9 2009 Roland McGrath <roland at redhat.com> 2.6.31-0.214.rc9.git1
 - compile with -fno-var-tracking-assignments, work around gcc bug #521991
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1082
retrieving revision 1.1083
diff -u -p -r1.1082 -r1.1083
--- sources	8 Sep 2009 02:05:24 -0000	1.1082
+++ sources	9 Sep 2009 03:27:29 -0000	1.1083
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 6bb612cbd006be9bdfaa6ff29ce090ea  patch-2.6.31-rc9.bz2
-157d7877a9425f5effbb4a150121ddd8  patch-2.6.31-rc9-git1.bz2
+157f889cd37ef9daec64cd65d8e64b3d  patch-2.6.31-rc9-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -p -r1.996 -r1.997
--- upstream	8 Sep 2009 02:05:24 -0000	1.996
+++ upstream	9 Sep 2009 03:27:29 -0000	1.997
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc9.bz2
-patch-2.6.31-rc9-git1.bz2
+patch-2.6.31-rc9-git2.bz2


--- patch-2.6.31-rc9-git1.bz2.sign DELETED ---



From mbarnes at fedoraproject.org  Wed Sep  9 03:59:28 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  9 Sep 2009 03:59:28 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.44,1.394.2.45
Message-ID: <20090909035928.A05F511C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10857

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
No more IDL files either.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.44
retrieving revision 1.394.2.45
diff -u -p -r1.394.2.44 -r1.394.2.45
--- evolution.spec	9 Sep 2009 03:26:03 -0000	1.394.2.44
+++ evolution.spec	9 Sep 2009 03:59:28 -0000	1.394.2.45
@@ -436,9 +436,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/icons/hicolor/scalable/apps/*
 
-# IDL files (should this be in devel subpackage?)
-%{_datadir}/idl/evolution-%{evo_major}
-
 # The main data directory
 # (have not attempted to split this up into an explicit list)
 %dir %{_datadir}/evolution



From xulchris at fedoraproject.org  Wed Sep  9 04:08:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Wed,  9 Sep 2009 04:08:56 +0000 (UTC)
Subject: rpms/php-pear-Net-UserAgent-Detect/EL-5 .cvsignore, 1.4,
	1.5 php-pear-Net-UserAgent-Detect.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090909040856.8426B11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4536/EL-5

Modified Files:
	.cvsignore php-pear-Net-UserAgent-Detect.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Oct 2008 19:26:53 -0000	1.4
+++ .cvsignore	9 Sep 2009 04:08:56 -0000	1.5
@@ -1 +1 @@
-Net_UserAgent_Detect-2.5.0.tgz
+Net_UserAgent_Detect-2.5.1.tgz


Index: php-pear-Net-UserAgent-Detect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/EL-5/php-pear-Net-UserAgent-Detect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Net-UserAgent-Detect.spec	13 Oct 2008 19:26:53 -0000	1.3
+++ php-pear-Net-UserAgent-Detect.spec	9 Sep 2009 04:08:56 -0000	1.4
@@ -2,7 +2,7 @@
 %define pear_name Net_UserAgent_Detect
 
 Name:           php-pear-Net-UserAgent-Detect
-Version:        2.5.0
+Version:        2.5.1
 Release:        1%{?dist}
 Summary:        Extract information from an HTTP user agent
 
@@ -76,6 +76,15 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Christopher Stone <chris.stone at gmail.com> 2.5.1-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 13 2008 Christopher Stone <chris.stone at gmail.com> 2.5.0-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Oct 2008 19:26:53 -0000	1.4
+++ sources	9 Sep 2009 04:08:56 -0000	1.5
@@ -1 +1 @@
-1844b4d0b133c6a606dc018d20059d01  Net_UserAgent_Detect-2.5.0.tgz
+960ea2b396cdc921e24df9ae481a6876  Net_UserAgent_Detect-2.5.1.tgz



From xulchris at fedoraproject.org  Wed Sep  9 04:08:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Wed,  9 Sep 2009 04:08:56 +0000 (UTC)
Subject: rpms/php-pear-Net-UserAgent-Detect/F-10 .cvsignore, 1.5,
	1.6 php-pear-Net-UserAgent-Detect.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090909040856.A771511C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4536/F-10

Modified Files:
	.cvsignore php-pear-Net-UserAgent-Detect.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Oct 2008 18:26:44 -0000	1.5
+++ .cvsignore	9 Sep 2009 04:08:56 -0000	1.6
@@ -1 +1 @@
-Net_UserAgent_Detect-2.5.0.tgz
+Net_UserAgent_Detect-2.5.1.tgz


Index: php-pear-Net-UserAgent-Detect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-10/php-pear-Net-UserAgent-Detect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Net-UserAgent-Detect.spec	13 Oct 2008 18:26:44 -0000	1.4
+++ php-pear-Net-UserAgent-Detect.spec	9 Sep 2009 04:08:56 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name Net_UserAgent_Detect
 
 Name:           php-pear-Net-UserAgent-Detect
-Version:        2.5.0
+Version:        2.5.1
 Release:        1%{?dist}
 Summary:        Extract information from an HTTP user agent
 
@@ -76,6 +76,15 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Christopher Stone <chris.stone at gmail.com> 2.5.1-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 13 2008 Christopher Stone <chris.stone at gmail.com> 2.5.0-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Oct 2008 18:26:44 -0000	1.5
+++ sources	9 Sep 2009 04:08:56 -0000	1.6
@@ -1 +1 @@
-1844b4d0b133c6a606dc018d20059d01  Net_UserAgent_Detect-2.5.0.tgz
+960ea2b396cdc921e24df9ae481a6876  Net_UserAgent_Detect-2.5.1.tgz



From xulchris at fedoraproject.org  Wed Sep  9 04:08:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Wed,  9 Sep 2009 04:08:56 +0000 (UTC)
Subject: rpms/php-pear-Net-UserAgent-Detect/F-11 .cvsignore, 1.5,
	1.6 php-pear-Net-UserAgent-Detect.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090909040856.D927D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4536/F-11

Modified Files:
	.cvsignore php-pear-Net-UserAgent-Detect.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Oct 2008 18:26:44 -0000	1.5
+++ .cvsignore	9 Sep 2009 04:08:56 -0000	1.6
@@ -1 +1 @@
-Net_UserAgent_Detect-2.5.0.tgz
+Net_UserAgent_Detect-2.5.1.tgz


Index: php-pear-Net-UserAgent-Detect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-11/php-pear-Net-UserAgent-Detect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Net-UserAgent-Detect.spec	26 Feb 2009 21:57:19 -0000	1.5
+++ php-pear-Net-UserAgent-Detect.spec	9 Sep 2009 04:08:56 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name Net_UserAgent_Detect
 
 Name:           php-pear-Net-UserAgent-Detect
-Version:        2.5.0
-Release:        2%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        Extract information from an HTTP user agent
 
 Group:          Development/Languages
@@ -76,6 +76,12 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Christopher Stone <chris.stone at gmail.com> 2.5.1-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Oct 2008 18:26:44 -0000	1.5
+++ sources	9 Sep 2009 04:08:56 -0000	1.6
@@ -1 +1 @@
-1844b4d0b133c6a606dc018d20059d01  Net_UserAgent_Detect-2.5.0.tgz
+960ea2b396cdc921e24df9ae481a6876  Net_UserAgent_Detect-2.5.1.tgz



From xulchris at fedoraproject.org  Wed Sep  9 04:08:57 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Wed,  9 Sep 2009 04:08:57 +0000 (UTC)
Subject: rpms/php-pear-Net-UserAgent-Detect/devel .cvsignore, 1.5,
	1.6 php-pear-Net-UserAgent-Detect.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090909040857.184DD11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4536/devel

Modified Files:
	.cvsignore php-pear-Net-UserAgent-Detect.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Oct 2008 18:26:44 -0000	1.5
+++ .cvsignore	9 Sep 2009 04:08:56 -0000	1.6
@@ -1 +1 @@
-Net_UserAgent_Detect-2.5.0.tgz
+Net_UserAgent_Detect-2.5.1.tgz


Index: php-pear-Net-UserAgent-Detect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/devel/php-pear-Net-UserAgent-Detect.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-Net-UserAgent-Detect.spec	26 Jul 2009 18:24:52 -0000	1.6
+++ php-pear-Net-UserAgent-Detect.spec	9 Sep 2009 04:08:56 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name Net_UserAgent_Detect
 
 Name:           php-pear-Net-UserAgent-Detect
-Version:        2.5.0
-Release:        3%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        Extract information from an HTTP user agent
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Christopher Stone <chris.stone at gmail.com> 2.5.1-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-UserAgent-Detect/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Oct 2008 18:26:44 -0000	1.5
+++ sources	9 Sep 2009 04:08:56 -0000	1.6
@@ -1 +1 @@
-1844b4d0b133c6a606dc018d20059d01  Net_UserAgent_Detect-2.5.0.tgz
+960ea2b396cdc921e24df9ae481a6876  Net_UserAgent_Detect-2.5.1.tgz



From salimma at fedoraproject.org  Wed Sep  9 04:25:20 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 04:25:20 +0000 (UTC)
Subject: rpms/llvm/F-11 llvm.spec,1.15,1.16
Message-ID: <20090909042520.60BC911C02C6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8270/F-11

Modified Files:
	llvm.spec 
Log Message:
* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-8
- Enable debuginfo (Jerry James, bz#521283)



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-11/llvm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- llvm.spec	9 Sep 2009 03:25:27 -0000	1.15
+++ llvm.spec	9 Sep 2009 04:25:20 -0000	1.16
@@ -3,14 +3,9 @@
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
 
-# LLVM object files don't contain build IDs.  I don't know why yet.
-# Suppress their generation for now.
-
-%define debug_package %{nil}
-
 Name:           llvm
 Version:        2.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -156,6 +151,7 @@ cd obj
 chmod -x examples/Makefile
 
 make install DESTDIR=%{buildroot} \
+     KEEP_SYMBOLS=1 \
      PROJ_docsdir=/moredocs
 
 # Move documentation back to build directory
@@ -251,6 +247,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-8
+- Enable debuginfo (Jerry James, bz#521283)
+
 * Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-7
 - Backport destdir patch from 2.6
 



From salimma at fedoraproject.org  Wed Sep  9 04:25:20 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 04:25:20 +0000 (UTC)
Subject: rpms/llvm/F-10 llvm.spec,1.14,1.15
Message-ID: <20090909042520.46A7211C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8270/F-10

Modified Files:
	llvm.spec 
Log Message:
* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-8
- Enable debuginfo (Jerry James, bz#521283)



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- llvm.spec	9 Sep 2009 03:25:26 -0000	1.14
+++ llvm.spec	9 Sep 2009 04:25:20 -0000	1.15
@@ -3,14 +3,9 @@
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
 
-# LLVM object files don't contain build IDs.  I don't know why yet.
-# Suppress their generation for now.
-
-%define debug_package %{nil}
-
 Name:           llvm
 Version:        2.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -156,6 +151,7 @@ cd obj
 chmod -x examples/Makefile
 
 make install DESTDIR=%{buildroot} \
+     KEEP_SYMBOLS=1 \
      PROJ_docsdir=/moredocs
 
 # Move documentation back to build directory
@@ -251,6 +247,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-8
+- Enable debuginfo (Jerry James, bz#521283)
+
 * Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-7
 - Backport destdir patch from 2.6
 



From mclasen at fedoraproject.org  Wed Sep  9 04:25:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:25:51 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.56, 1.57 gnome-menus.spec,
	1.105, 1.106 sources, 1.56, 1.57
Message-ID: <20090909042551.A620511C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8429

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	15 Jul 2009 16:04:02 -0000	1.56
+++ .cvsignore	9 Sep 2009 04:25:51 -0000	1.57
@@ -1 +1 @@
-gnome-menus-2.27.4.tar.bz2
+gnome-menus-2.27.92.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gnome-menus.spec	25 Jul 2009 00:41:42 -0000	1.105
+++ gnome-menus.spec	9 Sep 2009 04:25:51 -0000	1.106
@@ -5,8 +5,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.27.4
-Release: 2%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	15 Jul 2009 16:04:03 -0000	1.56
+++ sources	9 Sep 2009 04:25:51 -0000	1.57
@@ -1 +1 @@
-06cc8bc1a2f740bafa7d91dd7e14089c  gnome-menus-2.27.4.tar.bz2
+a65ee94cbc2b2d3cc576e18f70a0b53c  gnome-menus-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  9 04:29:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:29:23 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.75, 1.76 libwnck.spec, 1.113,
	1.114 sources, 1.75, 1.76
Message-ID: <20090909042923.6D96911C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9413

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	29 Jul 2009 02:57:17 -0000	1.75
+++ .cvsignore	9 Sep 2009 04:29:23 -0000	1.76
@@ -1 +1 @@
-libwnck-2.27.5.tar.bz2
+libwnck-2.27.92.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- libwnck.spec	29 Jul 2009 03:20:25 -0000	1.113
+++ libwnck.spec	9 Sep 2009 04:29:23 -0000	1.114
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.27.5
+Version: 2.27.92
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.27/%{name}-%{version}.tar.bz2
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	29 Jul 2009 02:57:17 -0000	1.75
+++ sources	9 Sep 2009 04:29:23 -0000	1.76
@@ -1 +1 @@
-9136894e3a078c0c79ec719f0105a630  libwnck-2.27.5.tar.bz2
+ff5cb1fdf251dc5f268c545ced722459  libwnck-2.27.92.tar.bz2



From cebbert at fedoraproject.org  Wed Sep  9 04:31:43 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Sep 2009 04:31:43 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.32.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.19, 1.960.2.20 kernel.spec, 1.1206.2.89,
	1.1206.2.90 sources, 1.922.2.19, 1.922.2.20 upstream, 1.834.2.19,
	1.834.2.20 linux-2.6-ocfs2-handle-len-0.patch, 1.1.2.1,
	NONE patch-2.6.27.31.bz2.sign, 1.1.2.1,
	NONE patch-2.6.27.32-rc1.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090909043143.3E77C11C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10158

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.32.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-ocfs2-handle-len-0.patch patch-2.6.27.31.bz2.sign 
	patch-2.6.27.32-rc1.bz2.sign 
Log Message:
2.6.27.32 final
Drop linux-2.6-ocfs2-handle-len-0.patch, added after .32-rc1


--- NEW FILE patch-2.6.27.32.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKpyqeyGugalF9Dw4RAsxTAJ98o4EQ5puRvJI+6yOPezxa21bVHwCeL/qH
PzwwydJs9BFmzJQxepgpp+k=
=TjYa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.19
retrieving revision 1.960.2.20
diff -u -p -r1.960.2.19 -r1.960.2.20
--- .cvsignore	5 Sep 2009 02:40:57 -0000	1.960.2.19
+++ .cvsignore	9 Sep 2009 04:31:42 -0000	1.960.2.20
@@ -4,5 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.31.bz2
-patch-2.6.27.32-rc1.bz2
+patch-2.6.27.32.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.89
retrieving revision 1.1206.2.90
diff -u -p -r1.1206.2.89 -r1.1206.2.90
--- kernel.spec	7 Sep 2009 23:21:55 -0000	1.1206.2.89
+++ kernel.spec	9 Sep 2009 04:31:42 -0000	1.1206.2.90
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 32
 # 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}
@@ -784,7 +784,6 @@ Patch14001: linux-2.6-nfsd-report-short-
 
 # patches requested for the next -stable release
 Patch14010: linux-2.6-slub-fix-destroy-by-rcu.patch
-Patch14011: linux-2.6-ocfs2-handle-len-0.patch
 
 # send for -stable
 Patch15000: linux-2.6-ppc64-vs-broadcom.patch
@@ -1424,7 +1423,6 @@ ApplyPatch linux-2.6-nfsd-report-short-w
 
 # patches requested for the next -stable release
 ApplyPatch linux-2.6-slub-fix-destroy-by-rcu.patch
-ApplyPatch linux-2.6-ocfs2-handle-len-0.patch
 
 # send for -stable:
 ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
@@ -2006,6 +2004,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 09 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.90
+- 2.6.27.32 final
+- Drop linux-2.6-ocfs2-handle-len-0.patch, added after .32-rc1
+
 * Mon Sep 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.89.rc1
 - Backport fix for b43 on ppc64 to 2.6.27 (#514787)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.19
retrieving revision 1.922.2.20
diff -u -p -r1.922.2.19 -r1.922.2.20
--- sources	5 Sep 2009 02:40:59 -0000	1.922.2.19
+++ sources	9 Sep 2009 04:31:42 -0000	1.922.2.20
@@ -1,3 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-adfb289efee5dce61e532678317c0b4c  patch-2.6.27.31.bz2
-6b9c084b6771c1a96c5e42d4218f9de9  patch-2.6.27.32-rc1.bz2
+3a3e67d089a707dbd8a34105ecce7d5f  patch-2.6.27.32.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.19
retrieving revision 1.834.2.20
diff -u -p -r1.834.2.19 -r1.834.2.20
--- upstream	5 Sep 2009 02:40:59 -0000	1.834.2.19
+++ upstream	9 Sep 2009 04:31:42 -0000	1.834.2.20
@@ -1,4 +1,3 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.31.bz2
-patch-2.6.27.32-rc1.bz2
+patch-2.6.27.32.bz2
 


--- linux-2.6-ocfs2-handle-len-0.patch DELETED ---


--- patch-2.6.27.31.bz2.sign DELETED ---


--- patch-2.6.27.32-rc1.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Wed Sep  9 04:37:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:37:05 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.88, 1.89 gnome-desktop.spec, 
	1.224, 1.225 sources, 1.88, 1.89
Message-ID: <20090909043705.E8CBA11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12244

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore	25 Aug 2009 20:38:32 -0000	1.88
+++ .cvsignore	9 Sep 2009 04:37:05 -0000	1.89
@@ -1 +1 @@
-gnome-desktop-2.27.91.tar.bz2
+gnome-desktop-2.27.92.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- gnome-desktop.spec	25 Aug 2009 20:38:32 -0000	1.224
+++ gnome-desktop.spec	9 Sep 2009 04:37:05 -0000	1.225
@@ -11,7 +11,7 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	25 Aug 2009 20:38:32 -0000	1.88
+++ sources	9 Sep 2009 04:37:05 -0000	1.89
@@ -1 +1 @@
-155706e4963e911396b51cd2428f08b3  gnome-desktop-2.27.91.tar.bz2
+646825d9b18abd30ab7cf7f6d1598761  gnome-desktop-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  9 04:38:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:38:36 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.24, 1.25 libgweather.spec, 1.45,
	1.46 sources, 1.24, 1.25
Message-ID: <20090909043836.A267F11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12954

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	25 Aug 2009 19:36:12 -0000	1.24
+++ .cvsignore	9 Sep 2009 04:38:36 -0000	1.25
@@ -1 +1 @@
-libgweather-2.27.91.tar.bz2
+libgweather-2.27.92.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- libgweather.spec	25 Aug 2009 19:36:12 -0000	1.45
+++ libgweather.spec	9 Sep 2009 04:38:36 -0000	1.46
@@ -1,12 +1,12 @@
 Name:           libgweather
-Version:        2.27.91
+Version:        2.27.92
 Release:        1%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/libgweather/2.26/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgweather/2.27/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  GConf2-devel >= 2.8.0
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	25 Aug 2009 19:36:12 -0000	1.24
+++ sources	9 Sep 2009 04:38:36 -0000	1.25
@@ -1 +1 @@
-0f9cc594f17b94b60f12bfe444743964  libgweather-2.27.91.tar.bz2
+b33d4e453b652b3ade3b365033d0c0cf  libgweather-2.27.92.tar.bz2



From cebbert at fedoraproject.org  Wed Sep  9 04:43:30 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Sep 2009 04:43:30 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.6.bz2.sign, NONE, 1.1 .cvsignore,
	1.1053, 1.1054 kernel.spec, 1.1729, 1.1730 sources, 1.1015,
	1.1016 upstream, 1.926, 1.927
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch,
	1.1, NONE linux-2.6-bitmap-make-ops-return-result.patch, 1.1, NONE
	linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch,
	1.1, NONE linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch,
	1.1, NONE linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch,
	1.1, NONE linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch, 1.1,
	NONE linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch,
	1.1, NONE patch-2.6.30.5.bz2.sign, 1.1, NONE
Message-ID: <20090909044330.1AC6111C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14266

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.6.bz2.sign 
Removed Files:
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch 
	linux-2.6-bitmap-make-ops-return-result.patch 
	linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch 
	linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch 
	linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch 
	linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch 
	linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch 
	patch-2.6.30.5.bz2.sign 
Log Message:
2.6.30.6
Drop patches merged in -stable:
  do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
  linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch
  linux-2.6-bitmap-make-ops-return-result.patch
  linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
  linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
  linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
  linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch


--- NEW FILE patch-2.6.30.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKpyrZyGugalF9Dw4RAjcMAJ98MHmdsqNGN3k0QjZxg8VgSVWZ8wCdFlF9
Dti1rfwH8DdcGzaYMLzRKcM=
=rjNA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -p -r1.1053 -r1.1054
--- .cvsignore	17 Aug 2009 02:32:11 -0000	1.1053
+++ .cvsignore	9 Sep 2009 04:43:29 -0000	1.1054
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.5.bz2
+patch-2.6.30.6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1729
retrieving revision 1.1730
diff -u -p -r1.1729 -r1.1730
--- kernel.spec	8 Sep 2009 17:02:44 -0000	1.1729
+++ kernel.spec	9 Sep 2009 04:43:29 -0000	1.1730
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -727,30 +727,14 @@ Patch14000: make-mmap_min_addr-suck-less
 
 # ----- patches headed for -stable -----
 
-Patch14001: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
-
-# fix hang on older x86 machines
-Patch14010: linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch
-Patch14020: linux-2.6-bitmap-make-ops-return-result.patch
-Patch14030: linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
-
-# fix race in clone()
-Patch14040: linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
-
 # Fix string overflows found by stackprotector:
 Patch14050: hda-check-strcpy-length.patch
 Patch14060: linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
 
-# fix race in kthreads
-Patch14070: linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
-
 # fix stack protector problems with xen on x86_64
 Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
-# fix amd crash in xen caused by -stable patch
-Patch14100: linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1372,30 +1356,15 @@ ApplyPatch make-mmap_min_addr-suck-less.
 # ----- patches headed for -stable -----
 
 # CVE-2009-2847
-ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
-
-# fix hang on older x86 machines
-ApplyPatch linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch
-ApplyPatch linux-2.6-bitmap-make-ops-return-result.patch
-ApplyPatch linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
-
-# fix race in clone()
-ApplyPatch linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
 
 # Fix string overflows found by stackprotector:
 ApplyPatch hda-check-strcpy-length.patch
 ApplyPatch linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
 
-# fix race in kthreads
-ApplyPatch linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
-
 # fix stack protector problems with xen on x86_64
 ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
-# another fun xen bug (#520517)
-ApplyPatch linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1984,6 +1953,17 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.6-51
+- 2.6.30.6
+- Drop patches merged in -stable:
+  do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+  linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch
+  linux-2.6-bitmap-make-ops-return-result.patch
+  linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
+  linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
+  linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
+  linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
+
 * Tue Sep 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-50
 - Disable Amiga One support to fix powerpc coherency bug (#521703)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -p -r1.1015 -r1.1016
--- sources	17 Aug 2009 02:32:12 -0000	1.1015
+++ sources	9 Sep 2009 04:43:29 -0000	1.1016
@@ -1,2 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-47841c7ff5c81a7b349a79f2fa8e9138  patch-2.6.30.5.bz2
+f89295707f68c2b349534b490c9d5f2d  patch-2.6.30.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -p -r1.926 -r1.927
--- upstream	17 Aug 2009 02:32:12 -0000	1.926
+++ upstream	9 Sep 2009 04:43:29 -0000	1.927
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.5.bz2
+patch-2.6.30.6.bz2
 


--- do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch DELETED ---


--- linux-2.6-bitmap-make-ops-return-result.patch DELETED ---


--- linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch DELETED ---


--- linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch DELETED ---


--- linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch DELETED ---


--- linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch DELETED ---


--- linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch DELETED ---


--- patch-2.6.30.5.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Wed Sep  9 04:47:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:47:15 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.77, 1.78 gnome-session.spec, 
	1.246, 1.247 sources, 1.81, 1.82
Message-ID: <20090909044715.B233B11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15189

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	29 Jul 2009 03:09:12 -0000	1.77
+++ .cvsignore	9 Sep 2009 04:47:15 -0000	1.78
@@ -1 +1 @@
-gnome-session-2.27.5.tar.bz2
+gnome-session-2.27.92.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- gnome-session.spec	13 Aug 2009 18:44:35 -0000	1.246
+++ gnome-session.spec	9 Sep 2009 04:47:15 -0000	1.247
@@ -9,8 +9,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.27.5
-Release: 2%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.27/%{name}-%{version}.tar.bz2
 Source2: gnome.desktop
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Thu Aug 13 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.5-2
 - Require polkit-desktop-policy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	29 Jul 2009 03:09:12 -0000	1.81
+++ sources	9 Sep 2009 04:47:15 -0000	1.82
@@ -1 +1 @@
-d0512f7f514262c52fe27228bdbba804  gnome-session-2.27.5.tar.bz2
+605bc85419577ffda87170f79bc850d4  gnome-session-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  9 04:52:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:52:06 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.97, 1.98 gnome-panel.spec,
	1.368, 1.369 sources, 1.100, 1.101
Message-ID: <20090909045206.8E21D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15936

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	25 Aug 2009 18:14:42 -0000	1.97
+++ .cvsignore	9 Sep 2009 04:52:06 -0000	1.98
@@ -1 +1 @@
-gnome-panel-2.27.91.tar.bz2
+gnome-panel-2.27.92.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- gnome-panel.spec	25 Aug 2009 21:10:13 -0000	1.368
+++ gnome-panel.spec	9 Sep 2009 04:52:06 -0000	1.369
@@ -9,7 +9,7 @@
 %define orbit_version 2.4.0
 %define libwnck_version 2.19.5
 %define gconf_version 2.14
-%define gnome_menus_version 2.11.1
+%define gnome_menus_version 2.27.92
 %define evolution_data_server_version 1.9.1
 %define cairo_version 1.0.0
 %define dbus_version 0.60
@@ -21,7 +21,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.27.91
+Version: 2.27.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
@@ -354,6 +354,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	25 Aug 2009 18:14:42 -0000	1.100
+++ sources	9 Sep 2009 04:52:06 -0000	1.101
@@ -1 +1 @@
-9453fed0d5fec7b9904b408e3f2826f7  gnome-panel-2.27.91.tar.bz2
+835fb6cc641e08b15ba4a7d4d0bec58b  gnome-panel-2.27.92.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  9 04:52:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 04:52:25 +0000 (UTC)
Subject: rpms/libgweather/devel gettext-not-xml.patch, NONE,
	1.1 libgweather.spec, 1.46, 1.47
Message-ID: <20090909045225.5FE5611C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16591

Modified Files:
	libgweather.spec 
Added Files:
	gettext-not-xml.patch 
Log Message:
fix patch


gettext-not-xml.patch:
 configure.in                    |   21 ---
 data/Makefile.am                |   44 +-------
 libgweather/gweather-location.c |   17 ++-
 libgweather/gweather-timezone.c |   18 ++-
 po-locations/LINGUAS            |   78 ++++++++++++++
 po-locations/Makefile.in.in     |  217 ++++++++++++++++++++++++++++++++++++++++
 po-locations/POTFILES.in        |    4 
 7 files changed, 338 insertions(+), 61 deletions(-)

--- NEW FILE gettext-not-xml.patch ---
diff -up libgweather-2.27.92/configure.in.gettext libgweather-2.27.92/configure.in
--- libgweather-2.27.92/configure.in.gettext	2009-09-08 20:08:33.000000000 -0400
+++ libgweather-2.27.92/configure.in	2009-09-09 00:48:11.570487413 -0400
@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 
+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
+IT_PO_SUBDIR([po-locations])
+
 IT_PROG_INTLTOOL([0.40.3])
 PKG_PROG_PKG_CONFIG([0.19])
 
@@ -50,13 +54,6 @@ AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
-AC_ARG_ENABLE(all-translations-in-one-xml,
-        [AC_HELP_STRING([--enable-all-translations-in-one-xml],
-                        [Put all translations in a big Locations.xml file (slow to parse)])],
-        [enable_big_xml=yes],
-        [enable_big_xml=no])
-AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
-
 AC_ARG_ENABLE(locations-compression,
         [AC_HELP_STRING([--enable-locations-compression],
                         [Compress Locations.xml files])],
@@ -253,7 +250,7 @@ AC_OUTPUT([
 Makefile
 doc/Makefile
 po/Makefile.in
-po-locations/Makefile
+po-locations/Makefile.in
 libgweather/Makefile
 libgweather/gweather.pc
 libgweather/gweather-uninstalled.pc
@@ -261,12 +258,6 @@ data/Makefile
 python/Makefile
 ])
 
-if test "x$enable_big_xml" = "xyes"; then
-	LOCATIONS_XML_TRANSLATIONS="one big file"
-else
-	LOCATIONS_XML_TRANSLATIONS="one file per translation"
-fi
-
 dnl ***************************************************************************
 dnl *** Display Summary                                                     ***
 dnl ***************************************************************************
@@ -276,6 +267,4 @@ libgweather-$VERSION configure summary:
 	Prefix:				${prefix}
 	Source code location:		${srcdir}
 	Compiler:			${CC}
-	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
-	Locations.xml compression:	${enable_locations_compression}
 " >&2
diff -up libgweather-2.27.92/data/Makefile.am.gettext libgweather-2.27.92/data/Makefile.am
--- libgweather-2.27.92/data/Makefile.am.gettext	2009-07-21 13:01:11.000000000 -0400
+++ libgweather-2.27.92/data/Makefile.am	2009-09-09 00:48:11.571480976 -0400
@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
 libgweatherlocationsdir = $(pkgdatadir)
 libgweatherlocations_in_files = Locations.xml.in
 
-if USE_ONE_BIG_XML
-
-LOCATIONS_STAMP = 
-
-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
-
-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
-	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
-		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
-	fi
-
-else # USE_ONE_BIG_XML
-
 LOCATIONS_STAMP = stamp-Locations.xml
 
-PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
-
 # Helper variable
-libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
-
-libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
 
 # We need this step so that we merge all the make Locations.xy.xml destinations
 # into one unique destination. This makes -j2 work. (Else, we end up with
 # multiple and conflicting calls to intltool-merge)
 $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
 
-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
-	for pofile in $(PO_LOCATIONS); do \
-		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
-		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
-		rm -f $$locale/$(libgweatherlocations_data);		\
-		test -d $$locale && rmdir $$locale;			\
-		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
-			gzip --force Locations.$$locale.xml;		\
-		fi;							\
-	done &&								\
-	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
-	rm -f C/$(libgweatherlocations_data) &&				\
-	test -d C && rmdir C &&						\
-	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
-		gzip --force Locations.xml;				\
-	fi &&								\
+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
+	rm -f C/$(libgweatherlocations_DATA)
+	test -d C && rmdir C
 	touch $@
 
-endif # USE_ONE_BIG_XML
-
 check:
 	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
 	$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
diff -up libgweather-2.27.92/libgweather/gweather-location.c.gettext libgweather-2.27.92/libgweather/gweather-location.c
--- libgweather-2.27.92/libgweather/gweather-location.c.gettext	2009-04-19 13:41:11.000000000 -0400
+++ libgweather-2.27.92/libgweather/gweather-location.c	2009-09-09 00:48:11.573482488 -0400
@@ -22,11 +22,14 @@
 #include <config.h>
 #endif
 
+#include "config.h"
+
 #include <string.h>
 #include <math.h>
 #include <locale.h>
 #include <gtk/gtk.h>
 #include <libxml/xmlreader.h>
+#include <libintl.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include "gweather-location.h"
@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
 
 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
 	if (!strcmp (tagname, "name") && !loc->name) {
-	    value = gweather_parser_get_localized_value (parser);
+	    char *context = NULL;
+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
+	   
+	    value = gweather_parser_get_value (parser);
 	    if (!value)
 		goto error_out;
-	    loc->name = g_strdup (value);
+
+	    if (context != NULL) {
+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
+	    	xmlFree (context);
+	    }
+	    else
+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
+	    
 	    xmlFree (value);
 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
 	    loc->sort_name = g_utf8_casefold (normalized, -1);
diff -up libgweather-2.27.92/libgweather/gweather-timezone.c.gettext libgweather-2.27.92/libgweather/gweather-timezone.c
--- libgweather-2.27.92/libgweather/gweather-timezone.c.gettext	2009-09-08 19:46:08.000000000 -0400
+++ libgweather-2.27.92/libgweather/gweather-timezone.c	2009-09-09 00:49:14.956486126 -0400
@@ -23,6 +23,7 @@
 #endif
 
 #include <string.h>
+#include <libintl.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include "gweather-timezone.h"
@@ -152,7 +153,7 @@ static GWeatherTimezone *
 parse_timezone (GWeatherParser *parser)
 {
     GWeatherTimezone *zone = NULL;
-    char *id = NULL, *name = NULL;
+    char *id = NULL, *name = NULL, *context = NULL;
     int offset = 0, dst_offset = 0;
     gboolean has_dst = FALSE;
 
@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
 		continue;
 	    }
 
-	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
-		name = gweather_parser_get_localized_value (parser);
+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
+		name = gweather_parser_get_value (parser);
+	    }
 	    else {
 		if (xmlTextReaderNext (parser->xml) != 1)
 		    break;
 	    }
 	}
     }
-
+	    
     if (parse_tzdata (id, parser->year_start, parser->year_end,
 		      &offset, &has_dst, &dst_offset)) {
 	zone = g_slice_new0 (GWeatherTimezone);
 	zone->ref_count = 1;
 	zone->id = g_strdup (id);
-	zone->name = g_strdup (name);
+	if (context != NULL)
+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
+	else
+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
 	zone->offset = offset;
 	zone->has_dst = has_dst;
 	zone->dst_offset = dst_offset;
     }
 
     xmlFree (id);
+    if (context)
+    	xmlFree (context);
     if (name)
 	xmlFree (name);
 
diff -up /dev/null libgweather-2.27.92/po-locations/LINGUAS
--- /dev/null	2009-09-08 17:05:15.194532336 -0400
+++ libgweather-2.27.92/po-locations/LINGUAS	2009-09-09 00:48:11.577480552 -0400
@@ -0,0 +1,78 @@
+ang
+ar
+as
+az
+be
+be at latin
+bg
+bn_IN
+bn
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+it
+ja
+ka
+kn
+ko
+ku
+ky
+lt
+lv
+mai
+mg
+mk
+ml
+mn
+mr
+ms
+nb
+ne
+nl
+nn
+oc
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+rw
+si
+sk
+sl
+sq
+sr at latin
+sr
+sv
+ta
+te
+th
+tr
+uk
+vi
+zh_CN
+zh_HK
+zh_TW
diff -up /dev/null libgweather-2.27.92/po-locations/Makefile.in.in
--- /dev/null	2009-09-08 17:05:15.194532336 -0400
+++ libgweather-2.27.92/po-locations/Makefile.in.in	2009-09-09 00:48:11.579481715 -0400
@@ -0,0 +1,217 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob at ximian.com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE at -locations
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po-locations
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p at .
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all- at USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data- at USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  else \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
+
+# Define this as empty until I found a useful application.
+install-exec installcheck:
+
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
+
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -up /dev/null libgweather-2.27.92/po-locations/POTFILES.in
--- /dev/null	2009-09-08 17:05:15.194532336 -0400
+++ libgweather-2.27.92/po-locations/POTFILES.in	2009-09-09 00:48:11.580481144 -0400
@@ -0,0 +1,4 @@
+# This list should contain *only* data/Locations.xml.in.
+# Everything else should be in POTFILES.skip.
+[encoding:UTF-8]
+data/Locations.xml.in


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- libgweather.spec	9 Sep 2009 04:38:36 -0000	1.46
+++ libgweather.spec	9 Sep 2009 04:52:25 -0000	1.47
@@ -20,7 +20,7 @@ BuildRequires:  gtk-doc
 BuildRequires:  autoconf automake libtool
 
 # Patch from Ubuntu...
-Patch0: 01_gettext_not_xml.patch
+Patch0: gettext-not-xml.patch
 
 %description
 libgweather is a library to access weather information from online



From cebbert at fedoraproject.org  Wed Sep  9 04:54:11 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Sep 2009 04:54:11 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-slub-fix-destroy-by-rcu.patch, NONE,
	1.1 kernel.spec, 1.1730, 1.1731
Message-ID: <20090909045411.17AAF11C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17130

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-slub-fix-destroy-by-rcu.patch 
Log Message:
Add linux-2.6-slub-fix-destroy-by-rcu.patch (fixes bug in 2.6.30.4)

linux-2.6-slub-fix-destroy-by-rcu.patch:
 slub.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-slub-fix-destroy-by-rcu.patch ---
From: Eric Dumazet <eric.dumazet at gmail.com>
Date: Thu, 3 Sep 2009 19:38:59 +0000 (+0300)
Subject: slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU
X-Git-Tag: v2.6.31-rc9~13^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d76b1590e06a63a3d8697168cd0aabf1c4b3cb3a

slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU

kmem_cache_destroy() should call rcu_barrier() *after* kmem_cache_close() and
*before* sysfs_slab_remove() or risk rcu_free_slab() being called after
kmem_cache is deleted (kfreed).

rmmod nf_conntrack can crash the machine because it has to kmem_cache_destroy()
a SLAB_DESTROY_BY_RCU enabled cache.

Cc: <stable at kernel.org>
Reported-by: Zdenek Kabelac <zdenek.kabelac at gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
Acked-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
---

diff --git a/mm/slub.c b/mm/slub.c
index b9f1491..b627675 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2594,8 +2594,6 @@ static inline int kmem_cache_close(struct kmem_cache *s)
  */
 void kmem_cache_destroy(struct kmem_cache *s)
 {
-	if (s->flags & SLAB_DESTROY_BY_RCU)
-		rcu_barrier();
 	down_write(&slub_lock);
 	s->refcount--;
 	if (!s->refcount) {
@@ -2606,6 +2604,8 @@ void kmem_cache_destroy(struct kmem_cache *s)
 				"still has objects.\n", s->name, __func__);
 			dump_stack();
 		}
+		if (s->flags & SLAB_DESTROY_BY_RCU)
+			rcu_barrier();
 		sysfs_slab_remove(s);
 	} else
 		up_write(&slub_lock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -p -r1.1730 -r1.1731
--- kernel.spec	9 Sep 2009 04:43:29 -0000	1.1730
+++ kernel.spec	9 Sep 2009 04:54:10 -0000	1.1731
@@ -731,6 +731,9 @@ Patch14000: make-mmap_min_addr-suck-less
 Patch14050: hda-check-strcpy-length.patch
 Patch14060: linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
 
+# fix bug introduced in 2.6.30.4
+Patch14070: linux-2.6-slub-fix-destroy-by-rcu.patch
+
 # fix stack protector problems with xen on x86_64
 Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
@@ -1365,6 +1368,9 @@ ApplyPatch linux-2.6-v4l-dvb-af9015-fix-
 ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
+# fix 2.6.30.4 bug
+ApplyPatch linux-2.6-slub-fix-destroy-by-rcu.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1953,6 +1959,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.6-52
+- Add linux-2.6-slub-fix-destroy-by-rcu.patch (fixes bug in 2.6.30.4)
+
 * Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.6-51
 - 2.6.30.6
 - Drop patches merged in -stable:



From mclasen at fedoraproject.org  Wed Sep  9 05:00:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 05:00:40 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.247,1.248
Message-ID: <20090909050040.217BA11C02C8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18233

Modified Files:
	gnome-session.spec 
Log Message:
fix spec



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- gnome-session.spec	9 Sep 2009 04:47:15 -0000	1.247
+++ gnome-session.spec	9 Sep 2009 05:00:39 -0000	1.248
@@ -15,10 +15,6 @@ URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.27/%{name}-%{version}.tar.bz2
 Source2: gnome.desktop
 
-# http://bugzilla.redhat.com/show_bug.cgi?id=497619
-# http://bugzilla.gnome.org/show_bug.cgi?id=585614
-Patch0: polkit1.patch
-
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,7 +81,6 @@ Desktop file to add GNOME to display man
 
 %prep
 %setup -q
-%patch0 -p1 -b .polkit1
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 



From salimma at fedoraproject.org  Wed Sep  9 05:04:13 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 05:04:13 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.30,1.31
Message-ID: <20090909050413.126F311C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19706

Modified Files:
	llvm.spec 
Log Message:
* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.4.pre1
- Properly adjust clang include dir (bz#521893)
- Enable clang unit tests



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- llvm.spec	8 Sep 2009 16:24:29 -0000	1.30
+++ llvm.spec	9 Sep 2009 05:04:12 -0000	1.31
@@ -5,7 +5,7 @@
 
 Name:           llvm
 Version:        2.6
-Release:        0.3.pre1%{?dist}
+Release:        0.4.pre1%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -153,6 +153,14 @@ pushd tools/clang
 popd
 %patch2 -p1 -b .tclsh_check
 
+# Fix hard-coded libdir for clang Headers
+%ifarch x86_64
+sed -i 's|(PROJ_prefix)/lib/clang|(PROJ_prefix)/%{_lib}/clang|g' \
+     tools/clang/lib/Headers/Makefile
+sed -i 's|lib/clang/1.0|%{_lib}/clang/1.0|g' \
+     tools/clang/lib/Driver/ToolChains.cpp
+%endif
+
 
 %build
 # Disabling assertions now, rec. by pure and needed for OpenGTL
@@ -180,6 +188,7 @@ make %{_smp_mflags} OPTIMIZE_OPTION='%{o
 # http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
 %ifnarch ppc
 cd obj && make check
+cd tools/clang && make test
 %endif
 
 
@@ -188,10 +197,6 @@ rm -rf %{buildroot}
 cd obj
 chmod -x examples/Makefile
 
-# Fix hard-coded libdir for clang Headers
-sed -i 's|(PROJ_prefix)/lib/clang|(PROJ_prefix)/%{_lib}/clang|g' \
-     tools/clang/lib/Headers/Makefile
-
 make install DESTDIR=%{buildroot} \
      PROJ_docsdir=/moredocs
 
@@ -330,6 +335,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.4.pre1
+- Properly adjust clang include dir (bz#521893)
+- Enable clang unit tests
+
 * Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.3.pre1
 - Package Clang's static analyzer tools
 
@@ -342,7 +351,7 @@ rm -rf %{buildroot}
 - Enable debuginfo generation
 
 * Sat Sep  5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
-- Disable assertions (needed by OpenGTL, #521261)
+- Disable assertions (needed by OpenGTL, bz#521261)
 - Align spec file with upstream build instructions
 - Enable unit tests
 



From airlied at fedoraproject.org  Wed Sep  9 05:08:05 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  9 Sep 2009 05:08:05 +0000 (UTC)
Subject: rpms/mesa/devel r600-fix-tfp.patch,NONE,1.1 mesa.spec,1.252,1.253
Message-ID: <20090909050805.B578811C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20431

Modified Files:
	mesa.spec 
Added Files:
	r600-fix-tfp.patch 
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 7.6-0.11
- r600 fix for TFP from irc


r600-fix-tfp.patch:
 r600_texstate.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE r600-fix-tfp.patch ---
>From 5aaa45de4c367dd6ec5daa6f4a54504b0aff1aca Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Wed, 9 Sep 2009 15:02:16 +1000
Subject: [PATCH] r600: don't setup hardware state if TFP

if we have a BO here it means TFP and we should have set it
up already.

tested by b0le on #radeon
---
 src/mesa/drivers/dri/r600/r600_texstate.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index fff6e74..ff4ef1e 100644
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -608,6 +608,10 @@ static void setup_hardware_state(context_t *rmesa, struct gl_texture_object *tex
 	int firstlevel = t->mt ? t->mt->firstLevel : 0;
 	GLuint uTexelPitch, row_align;
 
+	if ( t->bo ) {
+		return GL_TRUE;
+	}
+
 	firstImage = t->base.Image[0][firstlevel];
 
 	if (!t->image_override) {
-- 
1.6.2.5



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- mesa.spec	8 Sep 2009 23:06:41 -0000	1.252
+++ mesa.spec	9 Sep 2009 05:08:05 -0000	1.253
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.10%{?dist}
+Release: 0.11%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -43,6 +43,7 @@ Patch3: mesa-no-mach64.patch
 
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
+Patch10: r600-fix-tfp.patch
 
 Patch13: mesa-7.5-sparc64.patch
 
@@ -178,6 +179,7 @@ This package provides some demo applicat
 %patch3 -p1 -b .no-mach64
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
+%patch10 -p1 -b .r600_tfp
 %patch13 -p1 -b .sparc64
 %patch20 -p1 -b .dri2-page-flip
 %patch30 -p1 -b .vblank-warning
@@ -387,6 +389,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 7.6-0.11
+- r600 fix for TFP from irc
+
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 7.6-0.10
 - new git snap for 090909
 



From salimma at fedoraproject.org  Wed Sep  9 05:09:48 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 05:09:48 +0000 (UTC)
Subject: rpms/llvm/F-10 llvm.spec,1.15,1.16
Message-ID: <20090909050948.7370C11C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21717/F-10

Modified Files:
	llvm.spec 
Log Message:
Revert debuginfo changes for F-10 and F-11; they don't actually work
and LLVM 2.6 will land soon anyway



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- llvm.spec	9 Sep 2009 04:25:20 -0000	1.15
+++ llvm.spec	9 Sep 2009 05:09:48 -0000	1.16
@@ -3,9 +3,14 @@
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
 
+# LLVM object files don't contain build IDs.  I don't know why yet.
+# Suppress their generation for now.
+
+%define debug_package %{nil}
+
 Name:           llvm
 Version:        2.5
-Release:        8%{?dist}
+Release:        7%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -151,7 +156,6 @@ cd obj
 chmod -x examples/Makefile
 
 make install DESTDIR=%{buildroot} \
-     KEEP_SYMBOLS=1 \
      PROJ_docsdir=/moredocs
 
 # Move documentation back to build directory
@@ -247,9 +251,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-8
-- Enable debuginfo (Jerry James, bz#521283)
-
 * Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-7
 - Backport destdir patch from 2.6
 



From salimma at fedoraproject.org  Wed Sep  9 05:09:48 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 05:09:48 +0000 (UTC)
Subject: rpms/llvm/F-11 llvm.spec,1.16,1.17
Message-ID: <20090909050948.8BDE411C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21717/F-11

Modified Files:
	llvm.spec 
Log Message:
Revert debuginfo changes for F-10 and F-11; they don't actually work
and LLVM 2.6 will land soon anyway



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-11/llvm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- llvm.spec	9 Sep 2009 04:25:20 -0000	1.16
+++ llvm.spec	9 Sep 2009 05:09:48 -0000	1.17
@@ -3,9 +3,14 @@
 # --with doxygen
 #   The doxygen docs are HUGE, so they are not built by default.
 
+# LLVM object files don't contain build IDs.  I don't know why yet.
+# Suppress their generation for now.
+
+%define debug_package %{nil}
+
 Name:           llvm
 Version:        2.5
-Release:        8%{?dist}
+Release:        7%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -151,7 +156,6 @@ cd obj
 chmod -x examples/Makefile
 
 make install DESTDIR=%{buildroot} \
-     KEEP_SYMBOLS=1 \
      PROJ_docsdir=/moredocs
 
 # Move documentation back to build directory
@@ -247,9 +251,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-8
-- Enable debuginfo (Jerry James, bz#521283)
-
 * Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-7
 - Backport destdir patch from 2.6
 



From transif at fedoraproject.org  Wed Sep  9 05:41:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  9 Sep 2009 05:41:04 +0000 (UTC)
Subject: comps/po it.po,1.33,1.34
Message-ID: <20090909054104.D8AA111C00CE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30075/po

Modified Files:
	it.po 
Log Message:
Sending translation for Italian


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.33 -r 1.34 it.poIndex: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- it.po	28 Jul 2009 19:41:21 -0000	1.33
+++ it.po	9 Sep 2009 05:41:04 -0000	1.34
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.it.po to Italiano
+# translation of comps.HEAD.po to
 # Copyright (C) 2009 Red Hat, Inc.
 # This file is distributed under the same license as the comps package.
 #
@@ -12,2080 +12,1681 @@
 # Daniele Catanesi <translate at ccielogs.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.it\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-07-28 17:01+0100\n"
-"Last-Translator: Daniele Catanesi <translate at ccielogs.com>\n"
-"Language-Team: Italiano <fedora-trans-it at redhat.com>\n"
+"POT-Creation-Date: 2009-09-09 02:30+0000\n"
+"PO-Revision-Date: 2009-09-09 15:38+1000\n"
+"Last-Translator: \n"
+"Language-Team:  <it at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f7.xml.in.h:1
-#: ../comps-f8.xml.in.h:1
-#: ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1
-#: ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Un ambiente desktop performante anche su computer meno potenti."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Strumenti di amministrazione"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Supporto lingua africana"
 
-#: ../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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Supporto lingua albanese"
 
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Applicazioni generiche per vari compiti"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Supporto lingua araba"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Supporto lingua armena"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Supporto lingua 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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Redazione e publishing"
 
-#: ../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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema di 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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Supporto di base per il linguaggio di programmazione 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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Supporto lingua basca"
 
-#: ../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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Supporto lingua bielorussa"
 
-#: ../comps-f7.xml.in.h:16
-#: ../comps-f8.xml.in.h:16
-#: ../comps-f9.xml.in.h:16
[...2680 lines suppressed...]
 msgstr "Supporto lingua swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Supporto lingua 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 "Questo gruppo contiene un insieme di strumenti utili per la creazione, la modifica, la manipolazione e pacchettizzazione di font."
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
+msgid ""
+"This group is a collection of tools used in the design, modification, "
+"manipulation, and packaging of fonts."
+msgstr ""
+"Questo gruppo contiene un insieme di strumenti utili per la creazione, la "
+"modifica, la manipolazione e pacchettizzazione di font."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Supporto lingua turkmena"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Supporto lingua upper sorbian"
 
-#: ../comps-el4.xml.in.h:3
-#: ../comps-el5.xml.in.h:3
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "Un insieme di pacchetti che forniscono una funzionalit? Critical Path per il desktop di GNOME."
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "Un insieme di pacchetti che forniscono una piattaforma condivisa per la funzionalit? Critical Path su tutte le varianti di Fedora"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Libri e guide"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Libri e guide per gli sviluppatori e gli utenti di Fedora"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (di base)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Directory Server"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ? un ambiente desktop X11 semplice?ideato per computer con poche specifiche hardware come ad esempio netbook, dispositivi mobili e computer pi? vecchi."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Identity server utente e macchina"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Ambiente desktop di Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ? un ambiente desktop per i dispositivi NetBook/NetTop/MID."
+
+#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Applicazioni generiche"
 
-#: ../comps-el4.xml.in.h:12
-#: ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Accesso remoto dialup"
 
-#: ../comps-el4.xml.in.h:22
-#: ../comps-el5.xml.in.h:23
-msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "GNOME ? una potente interfaccia utente grafica, comprensiva di un gestore di file, di un pannello per gestire il desktop e delle icone di sistema."
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+msgid ""
+"GNOME is a powerful, graphical user interface which includes a panel, "
+"desktop, system icons, and a graphical file manager."
+msgstr ""
+"GNOME ? una potente interfaccia utente grafica, comprensiva di un gestore di "
+"file, di un pannello per gestire il desktop e delle icone di sistema."
 
-#: ../comps-el4.xml.in.h:35
-#: ../comps-el5.xml.in.h:35
-msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "KDE ? una potente interfaccia utente grafica, comprensiva di un gestore di file, di un pannello desktop e delle icone di sistema."
-
-#: ../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 "Spesso chiamati editor di testi, questi programmi permettono di creare e modificare file di testo. Sono compresi Emacs e Vi."
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+msgid ""
+"KDE is a powerful, graphical user interface which includes a panel, desktop, "
+"system icons, and a graphical file manager."
+msgstr ""
+"KDE ? una potente interfaccia utente grafica, comprensiva di un gestore di "
+"file, di un pannello desktop e delle icone di sistema."
 
-#: ../comps-el4.xml.in.h:50
-#: ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+msgid ""
+"Sometimes called text editors, these are programs that allow you to create "
+"and edit files. These include Emacs and Vi."
+msgstr ""
+"Spesso chiamati editor di testi, questi programmi permettono di creare e "
+"modificare file di testo. Sono compresi Emacs e Vi."
+
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "L'editor di testi 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 "Questi strumenti permettono la creazione di documenti in formato DocBook, e di convertirli nei formati HTML, PDF, Postscript e testo."
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+msgid ""
+"These tools allow you to create documentation in the DocBook format and "
+"convert them to HTML, PDF, Postscript, and text."
+msgstr ""
+"Questi strumenti permettono la creazione di documenti in formato DocBook, e "
+"di convertirli nei formati HTML, PDF, Postscript e testo."
 
-#: ../comps-el4.xml.in.h:64
-#: ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Questo gruppo contiene un insieme di server di rete per specifici protocolli"
 
-#: ../comps-el4.xml.in.h:65
-#: ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in lingua araba."
+msgstr ""
+"Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
+"lingua araba."
 
-#: ../comps-el4.xml.in.h:67
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in lingua ebraica."
+msgstr ""
+"Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
+"lingua ebraica."
 
-#: ../comps-el4.xml.in.h:68
-#: ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in lingua giapponese."
+msgstr ""
+"Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
+"lingua giapponese."
 
-#: ../comps-el4.xml.in.h:77
-#: ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
-msgstr "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in lingua ceca."
+msgstr ""
+"Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
+"lingua ceca."
 



From bskeggs at fedoraproject.org  Wed Sep  9 06:20:17 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  9 Sep 2009 06:20:17 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.48, 1.49 kernel.spec, 1.1778,
	1.1779
Message-ID: <20090909062017.4F5AF11C043A@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7813

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: add getparam to know using tile_flags is ok for scanout



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  689 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  432 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1201 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  942 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  829 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57757 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- drm-nouveau.patch	8 Sep 2009 07:32:13 -0000	1.48
+++ drm-nouveau.patch	9 Sep 2009 06:20:13 -0000	1.49
@@ -12044,7 +12044,7 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..6f1bfdc
+index 0000000..cf772af
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 @@ -0,0 +1,355 @@
@@ -12183,7 +12183,7 @@ index 0000000..6f1bfdc
 +	if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
 +		return false;
 +
-+	if (screen_info.lfb_base < pci_resource_len(pdev, 1))
++	if (screen_info.lfb_base < pci_resource_start(pdev, 1))
 +		goto not_fb;
 +
 +	if (screen_info.lfb_base + screen_info.lfb_size >=
@@ -12199,7 +12199,7 @@ index 0000000..6f1bfdc
 +			return false;
 +	}
 +
-+	if (screen_info.lfb_base < pci_resource_len(pdev, 1))
++	if (screen_info.lfb_base < pci_resource_start(pdev, ramin))
 +		return false;
 +
 +	if (screen_info.lfb_base + screen_info.lfb_size >=
@@ -19500,10 +19500,10 @@ index 0000000..d30c988
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..0f8352b
+index 0000000..b39f11e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,826 @@
+@@ -0,0 +1,829 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -20277,6 +20277,9 @@ index 0000000..0f8352b
 +
 +		getparam->value = dev_priv->sfb_gem->size;
 +		break;
++	case 0xdeadcafe00000003: /* NOUVEAU_GETPARAM_SCANOUT_TILEFLAGS */
++		getparam->value = 1;
++		break;
 +	default:
 +		NV_ERROR(dev, "unknown parameter %lld\n", getparam->param);
 +		return -EINVAL;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1778
retrieving revision 1.1779
diff -u -p -r1.1778 -r1.1779
--- kernel.spec	9 Sep 2009 03:27:29 -0000	1.1778
+++ kernel.spec	9 Sep 2009 06:20:15 -0000	1.1779
@@ -2025,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: add getparam to know using tile_flags is ok for scanout
+
 * Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc9-git2
 



From bskeggs at fedoraproject.org  Wed Sep  9 06:38:41 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  9 Sep 2009 06:38:41 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel nouveau-tile7000.patch, NONE,
	1.1 nouveau-bicubic-2x.patch, 1.10,
	1.11 nouveau-multiple-xserver.patch, 1.12,
	1.13 nouveau-transition-hack.patch, 1.13,
	1.14 xorg-x11-drv-nouveau.spec, 1.55, 1.56
Message-ID: <20090909063841.6062D11C00CE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14324

Modified Files:
	nouveau-bicubic-2x.patch nouveau-multiple-xserver.patch 
	nouveau-transition-hack.patch xorg-x11-drv-nouveau.spec 
Added Files:
	nouveau-tile7000.patch 
Log Message:
* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-8.20090904git2b5ec6a
- nouveau-tile7000.patch: workaround some display corruption on G8x



nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE nouveau-tile7000.patch ---
>From 3d2f2ba56b85fde22de2244cb9122708b461b5a7 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Wed, 9 Sep 2009 16:26:25 +1000
Subject: [PATCH 4/4] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption

---
 src/drmmode_display.c |    4 ++--
 src/nv_driver.c       |    7 ++++++-
 src/nv_type.h         |    2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 266d3a6..6cbced7 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -604,7 +604,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
 
 	if (pNv->Architecture >= NV_ARCH_50) {
 		tile_mode = 4;
-		tile_flags = (drmmode->cpp == 2) ? 0x7000 : 0x7a00;
+		tile_flags = (drmmode->cpp == 2 || pNv->pf_ok) ? 0x7000 : 0x7a00;
 		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
 		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
 	} else {
@@ -1225,7 +1225,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 
 	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
 		tile_mode = 4;
-		tile_flags = (scrn->bitsPerPixel == 16) ? 0x7000 : 0x7a00;
+		tile_flags = (scrn->bitsPerPixel == 16 || pNv->pf_ok) ? 0x7000 : 0x7a00;
 		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
 		pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
 	} else {
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 5838ce7..a70dee2 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
 {
 	NVPtr pNv = NVPTR(pScrn);
 	drmVersion *version;
+	uint64_t val;
 	char *bus_id;
 	int ret;
 
@@ -742,6 +743,10 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
 		return FALSE;
 	}
 
+	ret = nouveau_device_get_param(pNv->dev, 0xdeadcafe00000003, &val);
+	if (ret == 0)
+		pNv->pf_ok = (val == 1);
+
 	/* Check if KMS is enabled before we do anything, we don't want to
 	 * go stomping on registers behind its back
 	 */
@@ -1254,7 +1259,7 @@ NVMapMem(ScrnInfoPtr pScrn)
 	size = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
 	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
 		tile_mode = 4;
-		tile_flags = pScrn->bitsPerPixel == 16 ? 0x7000 : 0x7a00;
+		tile_flags = (pScrn->bitsPerPixel == 16 || pNv->pf_ok) ? 0x7000 : 0x7a00;
 		size *= NOUVEAU_ALIGN(pScrn->virtualY, (1 << (tile_mode + 2)));
 	} else {
 		size *= pScrn->virtualY;
diff --git a/src/nv_type.h b/src/nv_type.h
index 285392d..089b090 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -113,6 +113,8 @@ typedef struct _NVRec {
     /* Accessible AGP size */
     unsigned long	AGPSize;
 
+    Bool pf_ok;
+
     /* Various pinned memory regions */
     struct nouveau_bo * scanout;
     struct nouveau_bo * offscreen;
-- 
1.6.4.2


nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-bicubic-2x.patch	4 Sep 2009 00:44:52 -0000	1.10
+++ nouveau-bicubic-2x.patch	9 Sep 2009 06:38:38 -0000	1.11
@@ -1,7 +1,7 @@
 From 669fc0a22b4c2b6b8c9572187e151e426f039227 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
-Subject: [PATCH 3/3] xv: only use bicubic filtering when scaling >=2x
+Subject: [PATCH 3/4] xv: only use bicubic filtering when scaling >=2x
 
 ---
  src/nv30_xv_tex.c |    2 +-

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nouveau-multiple-xserver.patch	4 Sep 2009 00:44:52 -0000	1.12
+++ nouveau-multiple-xserver.patch	9 Sep 2009 06:38:38 -0000	1.13
@@ -1,7 +1,7 @@
 From bc70e6309b35633b76c48126bb967d4d85bce4df Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
-Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
+Subject: [PATCH 1/4] f12: hack to support multiple xserver instances
 
 ---
  src/nv_driver.c |   84 +++++++++++++++++++++++++++++++++++++-----------------

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nouveau-transition-hack.patch	4 Sep 2009 00:44:52 -0000	1.13
+++ nouveau-transition-hack.patch	9 Sep 2009 06:38:38 -0000	1.14
@@ -1,7 +1,7 @@
 From bb8bda06e19ac2181fd96a159e6e12ee4f5d108d Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
-Subject: [PATCH 2/3] f12: transitions
+Subject: [PATCH 2/4] f12: transitions
 
 ---
  src/drmmode_display.c |  171 ++++++++++++++++++++++++++++++++++++++++++++++++-


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- xorg-x11-drv-nouveau.spec	4 Sep 2009 00:48:27 -0000	1.55
+++ xorg-x11-drv-nouveau.spec	9 Sep 2009 06:38:38 -0000	1.56
@@ -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:   7.%{snapshot}%{?dist}
+Release:   8.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,7 @@ Patch2: nouveau-multiple-xserver.patch
 Patch3: nouveau-transition-hack.patch
 Patch6: nouveau-bicubic-2x.patch
 Patch7: nouveau-bgnr.patch
+Patch8: nouveau-tile7000.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -60,6 +61,7 @@ X.Org X11 nouveau video driver.
 %patch3 -p1 -b .transition
 %patch6 -p1 -b .bicubic
 %patch7 -p1 -b .bgnr
+%patch8 -p1 -b .tile7000
 
 %build
 autoreconf -v --install
@@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-8.20090904git2b5ec6a
+- nouveau-tile7000.patch: workaround some display corruption on G8x
+
 * Fri Sep 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-7.20090904git2b5ec6a
 - fix cursor being left enabled on wrong display
 



From bskeggs at fedoraproject.org  Wed Sep  9 06:41:34 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  9 Sep 2009 06:41:34 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.49, 1.50 kernel.spec, 1.1779,
	1.1780
Message-ID: <20090909064134.933C611C00CE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16612

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: fix display resume on pre-G8x chips


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  689 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1201 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  942 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  829 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57758 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- drm-nouveau.patch	9 Sep 2009 06:20:13 -0000	1.49
+++ drm-nouveau.patch	9 Sep 2009 06:41:33 -0000	1.50
@@ -10274,10 +10274,10 @@ index 0000000..9e439a0
 +#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..3ffc7e7
+index 0000000..f2b8b17
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
-@@ -0,0 +1,432 @@
+@@ -0,0 +1,433 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -10602,9 +10602,10 @@ index 0000000..3ffc7e7
 +		nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM);
 +	}
 +
-+	if (dev_priv->card_type < NV_50)
++	if (dev_priv->card_type < NV_50) {
 +		nv04_display_restore(dev);
-+	else
++		NVLockVgaCrtcs(dev, false);
++	} else
 +		nv50_display_init(dev);
 +
 +	/* Force CLUT to get re-loaded during modeset */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1779
retrieving revision 1.1780
diff -u -p -r1.1779 -r1.1780
--- kernel.spec	9 Sep 2009 06:20:15 -0000	1.1779
+++ kernel.spec	9 Sep 2009 06:41:34 -0000	1.1780
@@ -2026,6 +2026,9 @@ fi
 
 %changelog
 * Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: fix display resume on pre-G8x chips
+
+* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: add getparam to know using tile_flags is ok for scanout
 
 * Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>



From jsafrane at fedoraproject.org  Wed Sep  9 07:01:07 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed,  9 Sep 2009 07:01:07 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi.spec,1.22,1.23
Message-ID: <20090909070107.B2A6711C00CE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21456

Modified Files:
	freeipmi.spec 
Log Message:
Update to freeipmi-0.7.12


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- freeipmi.spec	6 Aug 2009 13:53:27 -0000	1.22
+++ freeipmi.spec	9 Sep 2009 07:01:05 -0000	1.23
@@ -5,7 +5,7 @@
 Release: 2%{?dist}
 
 Name: freeipmi
-Version: 0.7.11
+Version: 0.7.12
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -291,6 +291,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Wed Sep  9 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12
+- Update to freeipmi-0.7.12
+
 * Thu Aug  6 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.11-2
 - Fix installation with --excludedocs option (#515926)
 



From abompard at fedoraproject.org  Wed Sep  9 07:02:43 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Wed,  9 Sep 2009 07:02:43 +0000 (UTC)
Subject: rpms/springlobby/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 springlobby.spec, 1.12, 1.13
Message-ID: <20090909070243.8E38911C00CE@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22002/devel

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.22-1
- version 0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Aug 2009 11:39:45 -0000	1.6
+++ .cvsignore	9 Sep 2009 07:02:42 -0000	1.7
@@ -1 +1 @@
-springlobby-0.19.tar.bz2
+springlobby-0.22.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Aug 2009 11:39:45 -0000	1.6
+++ sources	9 Sep 2009 07:02:42 -0000	1.7
@@ -1 +1 @@
-ba0e60f5389f582fe57a7d98b1926604  springlobby-0.19.tar.bz2
+e9200084c40080a1c1b052c7dbb237b3  springlobby-0.22.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- springlobby.spec	27 Aug 2009 08:09:02 -0000	1.12
+++ springlobby.spec	9 Sep 2009 07:02:43 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           springlobby
-Version:        0.19
-Release:        2%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
 Group:          Amusements/Games
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.22-1
+- version 0.22
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.19-2
 - rebuilt with new openssl
 



From abompard at fedoraproject.org  Wed Sep  9 07:02:42 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Wed,  9 Sep 2009 07:02:42 +0000 (UTC)
Subject: rpms/springlobby/F-11 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 springlobby.spec, 1.10, 1.11
Message-ID: <20090909070242.BF7B611C00CE@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22002/F-11

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.22-1
- version 0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Aug 2009 11:39:44 -0000	1.6
+++ .cvsignore	9 Sep 2009 07:02:42 -0000	1.7
@@ -1 +1 @@
-springlobby-0.19.tar.bz2
+springlobby-0.22.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Aug 2009 11:39:44 -0000	1.6
+++ sources	9 Sep 2009 07:02:42 -0000	1.7
@@ -1 +1 @@
-ba0e60f5389f582fe57a7d98b1926604  springlobby-0.19.tar.bz2
+e9200084c40080a1c1b052c7dbb237b3  springlobby-0.22.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/springlobby.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- springlobby.spec	23 Aug 2009 11:39:44 -0000	1.10
+++ springlobby.spec	9 Sep 2009 07:02:42 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.19
+Version:        0.22
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,12 +88,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
-- version 0.19
+* Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.22-1
+- version 0.22
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-3
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.19-2
 - rebuilt with new openssl
 
+* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
+- version 0.19
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jsafrane at fedoraproject.org  Wed Sep  9 07:18:32 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed,  9 Sep 2009 07:18:32 +0000 (UTC)
Subject: rpms/freeipmi/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090909071832.D1A0011C00CE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27377

Modified Files:
	.cvsignore sources 
Log Message:
Update to freeipmi-0.7.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Jul 2009 07:25:51 -0000	1.11
+++ .cvsignore	9 Sep 2009 07:18:31 -0000	1.12
@@ -1 +1 @@
-freeipmi-0.7.11.tar.gz
+freeipmi-0.7.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Jul 2009 07:25:51 -0000	1.11
+++ sources	9 Sep 2009 07:18:31 -0000	1.12
@@ -1 +1 @@
-193b0c5b0929e0d68a12c180caef24fd  freeipmi-0.7.11.tar.gz
+881bd09c66767051cab94eda032d7039  freeipmi-0.7.12.tar.gz



From akurtakov at fedoraproject.org  Wed Sep  9 08:25:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  9 Sep 2009 08:25:08 +0000 (UTC)
Subject: rpms/ecj/devel core-3.3.0-v_771.pom,NONE,1.1 ecj.spec,1.5,1.6
Message-ID: <20090909082509.1811A11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/ecj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11039/devel

Modified Files:
	ecj.spec 
Added Files:
	core-3.3.0-v_771.pom 
Log Message:
Add maven pom and depmap.


--- NEW FILE core-3.3.0-v_771.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.eclipse.jdt</groupId>
  <artifactId>core</artifactId>
  <name>Java Development Tools Core</name>
  <version>3.3.0-v_771</version>
  <licenses>
    <license>
      <name>Eclipse Public License - v 1.0</name>
      <url>http://www.eclipse.org/org/documents/epl-v10.html</url>
    </license>
  </licenses>
  <dependencies>
    <dependency>
      <groupId>org.eclipse.core</groupId>
      <artifactId>resources</artifactId>
      <version>[3.2.0,4.0.0)</version>
    </dependency>
    <dependency>
      <groupId>org.eclipse.core</groupId>
      <artifactId>runtime</artifactId>
      <version>[3.3.0,4.0.0)</version>
    </dependency>
    <dependency>
      <groupId>org.eclipse.core</groupId>
      <artifactId>filesystem</artifactId>
      <version>[1.0.0,2.0.0)</version>
    </dependency>
    <dependency>
      <groupId>org.eclipse</groupId>
      <artifactId>text</artifactId>
      <version>[3.1.0,4.0.0)</version>
    </dependency>
    <dependency>
      <groupId>org.eclipse.team</groupId>
      <artifactId>core</artifactId>
      <version>[3.1.0,4.0.0)</version>
      <optional>true</optional>
    </dependency>
  </dependencies>
</project>

Index: ecj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/devel/ecj.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ecj.spec	24 Jul 2009 20:49:38 -0000	1.5
+++ ecj.spec	9 Sep 2009 08:25:06 -0000	1.6
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 3.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
@@ -21,6 +21,7 @@ Source1: ecj.sh.in
 # export -r eclipse_r34_1 eclipse-gcj
 # tar cjf ecj-gcj.tar.bz2 eclipse-gcj
 Source2: %{name}-gcj.tar.bz2
+Source3: http://repo2.maven.org/maven2/org/eclipse/jdt/core/3.3.0-v_771/core-3.3.0-v_771.pom
 # Always generate debug info when building RPMs (Andrew Haley)
 Patch0: %{name}-rpmdebuginfo.patch
 Patch1: %{name}-defaultto1.5.patch
@@ -51,6 +52,7 @@ the JDT Core batch compiler.
 %patch1 -p1
 %patch2 -p1
 
+cp %{SOURCE3} pom.xml
 # Use ECJ for GCJ's bytecode compiler
 tar jxf %{SOURCE2}
 mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java \
@@ -96,6 +98,13 @@ sed --in-place "s:@JAVADIR@:%{_javadir}:
 
 aot-compile-rpm
 
+# poms
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+    
+%add_to_maven_depmap org.eclipse.jdt core %{version} JPP jdtcore
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,16 +113,20 @@ if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%update_maven_depmap
 
 %postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
 %doc about.html
+%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 %{_bindir}/%{name}
 %{_javadir}/%{name}*.jar
 %{_javadir}/eclipse-%{name}*.jar
@@ -121,6 +134,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Sep 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-6
+- Add maven pom and depmaps.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From grof at fedoraproject.org  Wed Sep  9 08:53:15 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed,  9 Sep 2009 08:53:15 +0000 (UTC)
Subject: rpms/me-tv/devel .cvsignore, 1.3, 1.4 import.log, 1.3,
	1.4 me-tv.spec, 
	1.4, 1.5 sources, 1.3, 1.4 me-tv-0.9.4-compile.patch, 1.1, NONE
Message-ID: <20090909085315.6597711C00CE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/me-tv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18905/devel

Modified Files:
	.cvsignore import.log me-tv.spec sources 
Removed Files:
	me-tv-0.9.4-compile.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 08:29:01 -0000	1.3
+++ .cvsignore	9 Sep 2009 08:53:13 -0000	1.4
@@ -1 +1 @@
-me-tv-0.9.4.tar.gz
+me-tv-1.0.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jun 2009 08:29:01 -0000	1.3
+++ import.log	9 Sep 2009 08:53:13 -0000	1.4
@@ -1,3 +1,4 @@
 me-tv-0_8_12-4_fc11:HEAD:me-tv-0.8.12-4.fc10.src.rpm:1242974093
 me-tv-0_8_12-5_fc11:HEAD:me-tv-0.8.12-5.fc11.src.rpm:1242984059
 me-tv-0_9_4-1_fc11:HEAD:me-tv-0.9.4-1.fc11.src.rpm:1246264304
+me-tv-1_0_0-1_fc11:HEAD:me-tv-1.0.0-1.fc11.src.rpm:1252486615


Index: me-tv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/devel/me-tv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- me-tv.spec	25 Jul 2009 11:56:53 -0000	1.4
+++ me-tv.spec	9 Sep 2009 08:53:13 -0000	1.5
@@ -1,18 +1,18 @@
 Name:           me-tv
-Version:        0.9.4
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GNOME desktop application for watching digital television
 
 Group:          Applications/Multimedia
-License:        GPLv2+
+License:        GPLv3
 URL:            https://launchpad.net/me-tv
-Source0:        http://launchpad.net/me-tv/stable/0.8/+download/%{name}-%{version}.tar.gz
-Patch0:         me-tv-0.9.4-compile.patch
+Source0:        http://launchpad.net/me-tv/stable/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel 
 BuildRequires: libgnomemm26-devel 
 BuildRequires: libgnomeuimm26-devel
+BuildRequires: xine-lib-devel
 BuildRequires: gnet2-devel
 BuildRequires: gconfmm26-devel
 BuildRequires: gconfmm26-devel
@@ -33,7 +33,6 @@ which can be used for scheduling recordi
 
 %prep
 %setup -q
-%patch0 -p1 -b .compile
 
 %build
 %configure
@@ -70,8 +69,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 09 2009 Zarko <zarko.pintar at gmail.com> - 1.0.0-1
+- new release
+- license changed to GPLv3
 
 * Fri Jun 29 2009 Zarko <zarko.pintar at gmail.com> - 0.9.4-1
 - new release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 08:29:01 -0000	1.3
+++ sources	9 Sep 2009 08:53:13 -0000	1.4
@@ -1 +1 @@
-ae123b701fc6d4e4a8ef52fadc288df6  me-tv-0.9.4.tar.gz
+79a80a3885006fe0ee59df3c7e0f85ea  me-tv-1.0.0.tar.gz


--- me-tv-0.9.4-compile.patch DELETED ---



From chitlesh at fedoraproject.org  Wed Sep  9 08:53:52 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  9 Sep 2009 08:53:52 +0000 (UTC)
Subject: rpms/pcb/EL-5 import.log,1.1,1.2 pcb.spec,1.20,1.21
Message-ID: <20090909085352.5B47B11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19235/EL-5

Modified Files:
	import.log pcb.spec 
Log Message:
first built for EL-5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Dec 2008 18:39:52 -0000	1.1
+++ import.log	9 Sep 2009 08:53:52 -0000	1.2
@@ -1 +1,2 @@
 pcb-0_20081128-1_fc10:EL-5:pcb-0.20081128-1.fc10.src.rpm:1228329445
+pcb-0_20081128-4_fc11:EL-5:pcb-0.20081128-4.fc11.src.rpm:1252486270


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/EL-5/pcb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pcb.spec	3 Dec 2008 18:39:52 -0000	1.20
+++ pcb.spec	9 Sep 2009 08:53:52 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        1%{?dist}
+Release:        4%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -51,6 +51,11 @@ chmod 0644 example/LED
 %build
 export WISH=%{_bindir}/wish
 
+# Fixes failed build on EPEL-5
+%if 0%{?rhel}
+export CFLAGS=`echo %optflags | sed "s/-D_FORTIFY_SOURCE=2 // g" -`
+%endif
+
 %configure --disable-update-mime-database
 
 %{__make} %{?_smp_mflags}
@@ -62,7 +67,7 @@ export WISH=%{_bindir}/wish
 
 # in /usr/share/pcb/newlib/ folder, sockets is an empty folder
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -140,7 +145,7 @@ touch --no-create %{_datadir}/icons/hico
 %doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0
 %doc example/ doc/refcard.pdf doc/pcb.pdf
 
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}
 %{_bindir}/MergePCBPS
 %{_bindir}/Merge_dimPCBPS
@@ -156,6 +161,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Tue Sep 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20081128-4
+- Fixes for PCB EL-5 build.
+
 * Sat Nov 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20081128-1
 - new upstream release
 - restructuring docs, tutorials and examples



From chitlesh at fedoraproject.org  Wed Sep  9 08:56:52 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  9 Sep 2009 08:56:52 +0000 (UTC)
Subject: rpms/pcb/devel import.log,1.1,1.2 pcb.spec,1.26,1.27
Message-ID: <20090909085652.B777911C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20885/devel

Modified Files:
	import.log pcb.spec 
Log Message:
first built for EL-5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Nov 2008 20:57:58 -0000	1.1
+++ import.log	9 Sep 2009 08:56:52 -0000	1.2
@@ -1 +1,2 @@
 pcb-0_20081128-1_fc10:HEAD:pcb-0.20081128-1.fc10.src.rpm:1227992246
+pcb-0_20081128-4_fc11:HEAD:pcb-0.20081128-4.fc11.src.rpm:1252486375


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pcb.spec	25 Jul 2009 23:21:38 -0000	1.26
+++ pcb.spec	9 Sep 2009 08:56:52 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -51,6 +51,11 @@ chmod 0644 example/LED
 %build
 export WISH=%{_bindir}/wish
 
+# Fixes failed build on EPEL-5
+%if 0%{?rhel}
+export CFLAGS=`echo %optflags | sed "s/-D_FORTIFY_SOURCE=2 // g" -`
+%endif
+
 %configure --disable-update-mime-database
 
 %{__make} %{?_smp_mflags}
@@ -62,7 +67,7 @@ export WISH=%{_bindir}/wish
 
 # in /usr/share/pcb/newlib/ folder, sockets is an empty folder
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -140,7 +145,7 @@ touch --no-create %{_datadir}/icons/hico
 %doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0
 %doc example/ doc/refcard.pdf doc/pcb.pdf
 
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}
 %{_bindir}/MergePCBPS
 %{_bindir}/Merge_dimPCBPS
@@ -156,6 +161,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Tue Sep 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20081128-4
+- Fixes for PCB EL-5 build.
+
 * Sat Nov 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20081128-1
 - new upstream release
 - restructuring docs, tutorials and examples



From grof at fedoraproject.org  Wed Sep  9 08:57:14 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed,  9 Sep 2009 08:57:14 +0000 (UTC)
Subject: rpms/me-tv/F-11 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 me-tv.spec,
	1.3, 1.4 sources, 1.3, 1.4 me-tv-0.9.4-compile.patch, 1.1, NONE
Message-ID: <20090909085714.4670211C00CE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/me-tv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21358/F-11

Modified Files:
	.cvsignore import.log me-tv.spec sources 
Removed Files:
	me-tv-0.9.4-compile.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 08:33:37 -0000	1.3
+++ .cvsignore	9 Sep 2009 08:57:13 -0000	1.4
@@ -1 +1 @@
-me-tv-0.9.4.tar.gz
+me-tv-1.0.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jun 2009 08:33:37 -0000	1.3
+++ import.log	9 Sep 2009 08:57:13 -0000	1.4
@@ -1,3 +1,4 @@
 me-tv-0_8_12-4_fc11:F-11:me-tv-0.8.12-4.fc10.src.rpm:1242975097
 me-tv-0_8_12-5_fc11:F-11:me-tv-0.8.12-5.fc11.src.rpm:1242984225
 me-tv-0_9_4-1_fc11:F-11:me-tv-0.9.4-1.fc11.src.rpm:1246264585
+me-tv-1_0_0-1_fc11:F-11:me-tv-1.0.0-1.fc11.src.rpm:1252486814


Index: me-tv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/me-tv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- me-tv.spec	29 Jun 2009 08:33:37 -0000	1.3
+++ me-tv.spec	9 Sep 2009 08:57:13 -0000	1.4
@@ -1,18 +1,18 @@
 Name:           me-tv
-Version:        0.9.4
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        GNOME desktop application for watching digital television
 
 Group:          Applications/Multimedia
-License:        GPLv2+
+License:        GPLv3
 URL:            https://launchpad.net/me-tv
-Source0:        http://launchpad.net/me-tv/stable/0.8/+download/%{name}-%{version}.tar.gz
-Patch0:         me-tv-0.9.4-compile.patch
+Source0:        http://launchpad.net/me-tv/stable/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel 
 BuildRequires: libgnomemm26-devel 
 BuildRequires: libgnomeuimm26-devel
+BuildRequires: xine-lib-devel
 BuildRequires: gnet2-devel
 BuildRequires: gconfmm26-devel
 BuildRequires: gconfmm26-devel
@@ -33,7 +33,6 @@ which can be used for scheduling recordi
 
 %prep
 %setup -q
-%patch0 -p1 -b .compile
 
 %build
 %configure
@@ -70,6 +69,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Sep 09 2009 Zarko <zarko.pintar at gmail.com> - 1.0.0-1
+- new release
+- license changed to GPLv3
+
 * Fri Jun 29 2009 Zarko <zarko.pintar at gmail.com> - 0.9.4-1
 - new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 08:33:37 -0000	1.3
+++ sources	9 Sep 2009 08:57:14 -0000	1.4
@@ -1 +1 @@
-ae123b701fc6d4e4a8ef52fadc288df6  me-tv-0.9.4.tar.gz
+79a80a3885006fe0ee59df3c7e0f85ea  me-tv-1.0.0.tar.gz


--- me-tv-0.9.4-compile.patch DELETED ---



From xhorak at fedoraproject.org  Wed Sep  9 09:03:29 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 09:03:29 +0000 (UTC)
Subject: rpms/xulrunner/F-11 .cvsignore, 1.68, 1.69 sources, 1.73,
	1.74 xulrunner.spec, 1.165, 1.166
Message-ID: <20090909090329.5709A11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25502

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	30 Jun 2009 15:46:27 -0000	1.68
+++ .cvsignore	9 Sep 2009 09:03:28 -0000	1.69
@@ -1 +1,2 @@
 xulrunner-1.9.1-source.tar.bz2
+xulrunner-1.9.1.3-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	3 Aug 2009 21:03:04 -0000	1.73
+++ sources	9 Sep 2009 09:03:28 -0000	1.74
@@ -1 +1 @@
-0de7173e45df009f5a2620fcceb010fb  xulrunner-1.9.1.2-source.tar.bz2
+ca167e69180ab1230aea0763da270a95  xulrunner-1.9.1.3-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- xulrunner.spec	3 Aug 2009 21:03:04 -0000	1.165
+++ xulrunner.spec	9 Sep 2009 09:03:28 -0000	1.166
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.2
+Version:        1.9.1.3
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -452,7 +452,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> 1.9.1.1-2
+* Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.3-1
+- Update to 1.9.1.3
+
+* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-1
 - Update to 1.9.1.2
 
 * Fri Jul 17 2009 Martin Stransky <stransky at redhat.com> 1.9.1.1-1



From jakub at fedoraproject.org  Wed Sep  9 09:06:02 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  9 Sep 2009 09:06:02 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-vta-cselib-subreg-of-value-more-pr41276.patch, 
	NONE, 1.1 .cvsignore, 1.288, 1.289 gcc.spec, 1.66, 1.67 sources,
	1.292, 1.293 gcc44-vta-cselib-subreg-of-value-pr41276.patch, 1.1,
	NONE gcc44-vta-loop-ivopts-propagate-on-release.patch, 1.1,
	NONE gcc44-vta-no-g-with-gtoggle.patch, 1.1,
	NONE gcc44-vta-phiopt-pr41232.patch, 1.1,
	NONE gcc44-vta-ssa-update-former-vops-pr41229.patch, 1.1, NONE
Message-ID: <20090909090602.1586B11C00CE@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26169

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-vta-cselib-subreg-of-value-more-pr41276.patch 
Removed Files:
	gcc44-vta-cselib-subreg-of-value-pr41276.patch 
	gcc44-vta-loop-ivopts-propagate-on-release.patch 
	gcc44-vta-no-g-with-gtoggle.patch 
	gcc44-vta-phiopt-pr41232.patch 
	gcc44-vta-ssa-update-former-vops-pr41229.patch 
Log Message:
4.4.1-11

gcc44-vta-cselib-subreg-of-value-more-pr41276.patch:
 cselib.c       |   50 +++++++++++++++++++++++++++++++-------------------
 var-tracking.c |   43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 68 insertions(+), 25 deletions(-)

--- NEW FILE gcc44-vta-cselib-subreg-of-value-more-pr41276.patch ---
for  gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41276
	PR debug/41307
	* cselib.c (cselib_expand_value_rtx_cb): Document callback
	interface.
	(cselib_expand_value_rtx_1): Use callback for SUBREGs.  Adjust
	for VALUEs, to implement the documented interface.
	* var-tracking.c (vt_expand_loc_callback): Handle SUBREGs.
	Adjust for VALUEs and anything else, to implement the
	documented interface.

Index: gcc/cselib.c
===================================================================
--- gcc/cselib.c.orig	2009-09-08 19:34:10.000000000 -0300
+++ gcc/cselib.c	2009-09-09 05:20:52.000000000 -0300
@@ -1053,7 +1053,10 @@ cselib_expand_value_rtx (rtx orig, bitma
 }
 
 /* Same as cselib_expand_value_rtx, but using a callback to try to
-   resolve VALUEs that expand to nothing.  */
+   resolve some expressions.  The CB function should return ORIG if it
+   can't or does not want to deal with a certain RTX.  Any other
+   return value, including NULL, will be used as the expansion for
+   VALUE, without any further changes.  */
 
 rtx
 cselib_expand_value_rtx_cb (rtx orig, bitmap regs_active, int max_depth,
@@ -1068,6 +1071,9 @@ cselib_expand_value_rtx_cb (rtx orig, bi
   return cselib_expand_value_rtx_1 (orig, &evd, max_depth);
 }
 
+/* Internal implementation of cselib_expand_value_rtx and
+   cselib_expand_value_rtx_cb.  */
+
 static rtx
 cselib_expand_value_rtx_1 (rtx orig, struct expand_value_data *evd,
 			   int max_depth)
@@ -1158,26 +1164,36 @@ cselib_expand_value_rtx_1 (rtx orig, str
 
     case SUBREG:
       {
-	rtx subreg = cselib_expand_value_rtx_1 (SUBREG_REG (orig), evd,
-						max_depth - 1);
+	rtx subreg;
+
+	if (evd->callback)
+	  {
+	    subreg = evd->callback (orig, evd->regs_active, max_depth,
+				    evd->callback_arg);
+	    if (subreg != orig)
+	      return subreg;
+	  }
+
+	subreg = cselib_expand_value_rtx_1 (SUBREG_REG (orig), evd,
+					    max_depth - 1);
 	if (!subreg)
 	  return NULL;
 	scopy = simplify_gen_subreg (GET_MODE (orig), subreg,
 				     GET_MODE (SUBREG_REG (orig)),
 				     SUBREG_BYTE (orig));
-	if ((scopy == NULL
-	     || (GET_CODE (scopy) == SUBREG
-		 && !REG_P (SUBREG_REG (scopy))
-		 && !MEM_P (SUBREG_REG (scopy))))
-	    && (REG_P (SUBREG_REG (orig))
-		|| MEM_P (SUBREG_REG (orig))))
-	  return shallow_copy_rtx (orig);
+	if (scopy == NULL
+	    || (GET_CODE (scopy) == SUBREG
+		&& !REG_P (SUBREG_REG (scopy))
+		&& !MEM_P (SUBREG_REG (scopy))))
+	  return NULL;
+
 	return scopy;
       }
 
     case VALUE:
       {
 	rtx result;
+
 	if (dump_file && (dump_flags & TDF_DETAILS))
 	  {
 	    fputs ("\nexpanding ", dump_file);
@@ -1185,20 +1201,16 @@ cselib_expand_value_rtx_1 (rtx orig, str
 	    fputs (" into...", dump_file);
 	  }
 
-	if (!evd->callback)
-	  result = NULL;
-	else
+	if (evd->callback)
 	  {
 	    result = evd->callback (orig, evd->regs_active, max_depth,
 				    evd->callback_arg);
-	    if (result == orig)
-	      result = NULL;
-	    else if (result)
-	      result = cselib_expand_value_rtx_1 (result, evd, max_depth);
+
+	    if (result != orig)
+	      return result;
 	  }
 
-	if (!result)
-	  result = expand_loc (CSELIB_VAL_PTR (orig)->locs, evd, max_depth);
+	result = expand_loc (CSELIB_VAL_PTR (orig)->locs, evd, max_depth);
 	return result;
       }
     default:
Index: gcc/var-tracking.c
===================================================================
--- gcc/var-tracking.c.orig	2009-09-08 19:33:55.000000000 -0300
+++ gcc/var-tracking.c	2009-09-08 20:08:08.000000000 -0300
@@ -6243,7 +6243,8 @@ check_wrap_constant (enum machine_mode m
 }
 
 /* Callback for cselib_expand_value, that looks for expressions
-   holding the value in the var-tracking hash tables.  */
+   holding the value in the var-tracking hash tables.  Return X for
+   standard processing, anything else is to be used as-is.  */
 
 static rtx
 vt_expand_loc_callback (rtx x, bitmap regs, int max_depth, void *data)
@@ -6254,19 +6255,46 @@ vt_expand_loc_callback (rtx x, bitmap re
   location_chain loc;
   rtx result;
 
-  gcc_assert (GET_CODE (x) == VALUE);
+  if (GET_CODE (x) == SUBREG)
+    {
+      rtx subreg = SUBREG_REG (x);
+
+      if (GET_CODE (SUBREG_REG (x)) != VALUE)
+	return x;
+
+      subreg = cselib_expand_value_rtx_cb (SUBREG_REG (x), regs,
+					   max_depth - 1,
+					   vt_expand_loc_callback, data);
+
+      if (!subreg)
+	return NULL;
+
+      result = simplify_gen_subreg (GET_MODE (x), subreg,
+				    GET_MODE (SUBREG_REG (x)),
+				    SUBREG_BYTE (x));
+
+      /* Invalid SUBREGs are ok in debug info.  ??? We could try
+	 alternate expansions for the VALUE as well.  */
+      if (!result && (REG_P (subreg) || MEM_P (subreg)))
+	result = gen_rtx_raw_SUBREG (GET_MODE (x), subreg, SUBREG_BYTE (x));
+
+      return result;
+    }
+
+  if (GET_CODE (x) != VALUE)
+    return x;
 
   if (VALUE_RECURSED_INTO (x))
-    return NULL;
+    return x;
 
   dv = dv_from_value (x);
   var = (variable) htab_find_with_hash (vars, dv, dv_htab_hash (dv));
 
   if (!var)
-    return NULL;
+    return x;
 
   if (var->n_var_parts == 0)
-    return NULL;
+    return x;
 
   gcc_assert (var->n_var_parts == 1);
 
@@ -6283,7 +6311,10 @@ vt_expand_loc_callback (rtx x, bitmap re
     }
 
   VALUE_RECURSED_INTO (x) = false;
-  return result;
+  if (result)
+    return result;
+  else
+    return x;
 }
 
 /* Expand VALUEs in LOC, using VARS as well as cselib's equivalence


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- .cvsignore	8 Sep 2009 11:05:43 -0000	1.288
+++ .cvsignore	9 Sep 2009 09:06:00 -0000	1.289
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090908.tar.bz2
+gcc-4.4.1-20090909.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- gcc.spec	8 Sep 2009 11:05:43 -0000	1.66
+++ gcc.spec	9 Sep 2009 09:06:01 -0000	1.67
@@ -1,9 +1,9 @@
-%global DATE 20090908
-%global SVNREV 151505
+%global DATE 20090909
+%global SVNREV 151553
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 10
+%global gcc_release 11
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -160,11 +160,7 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
-Patch20: gcc44-vta-cselib-subreg-of-value-pr41276.patch
-Patch21: gcc44-vta-loop-ivopts-propagate-on-release.patch
-Patch22: gcc44-vta-no-g-with-gtoggle.patch
-Patch23: gcc44-vta-phiopt-pr41232.patch
-Patch24: gcc44-vta-ssa-update-former-vops-pr41229.patch
+Patch20: gcc44-vta-cselib-subreg-of-value-more-pr41276.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -471,11 +467,7 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
-%patch20 -p0 -b .vta-cselib-subreg-of-value-pr41276~
-%patch21 -p0 -b .vta-loop-ivopts-propagate-on-release~
-%patch22 -p0 -b .vta-no-g-with-gtoggle~
-%patch23 -p0 -b .vta-phiopt-pr41232~
-%patch24 -p0 -b .vta-ssa-update-former-vops-pr41229~
+%patch20 -p0 -b .gcc44-vta-cselib-subreg-of-value-more-pr41276~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1168,7 +1160,7 @@ echo ====================TESTING========
 ( LC_ALL=C ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}'
 echo ====================TESTING END=====================
 mkdir testlogs-%{_target_platform}-%{version}-%{release}
-for i in `find . -name \*.log | grep -F testsuite/ | grep -v 'config.log\|acats\|ada'`; do
+for i in `find . -name \*.log | grep -F testsuite/ | grep -v 'config.log\|acats.*/tests/'`; do
   ln $i testlogs-%{_target_platform}-%{version}-%{release}/ || :
 done
 tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \
@@ -1815,6 +1807,9 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Sep  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-11
+- fix ICE in tls_mem_loc_descriptor (#521991)
+
 * Tue Sep  8 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-10
 - update from gcc-4_4-branch
   - PRs fortran/41258, rtl-optimization/40861


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- sources	8 Sep 2009 11:05:43 -0000	1.292
+++ sources	9 Sep 2009 09:06:01 -0000	1.293
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-12f92325baf664989136ea6c7585273f  gcc-4.4.1-20090908.tar.bz2
+de6d4c15a234466f656b6fcb84d8c3ec  gcc-4.4.1-20090909.tar.bz2


--- gcc44-vta-cselib-subreg-of-value-pr41276.patch DELETED ---


--- gcc44-vta-loop-ivopts-propagate-on-release.patch DELETED ---


--- gcc44-vta-no-g-with-gtoggle.patch DELETED ---


--- gcc44-vta-phiopt-pr41232.patch DELETED ---


--- gcc44-vta-ssa-update-former-vops-pr41229.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Sep  9 09:06:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  9 Sep 2009 09:06:04 +0000 (UTC)
Subject: rpms/bickley/devel bickley-fixppc2.patch, 1.2, 1.3 bickley.spec, 1.2,
	1.3
Message-ID: <20090909090604.B8DDB11C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26204

Modified Files:
	bickley-fixppc2.patch bickley.spec 
Log Message:
- Include the correct updated patch

bickley-fixppc2.patch:
 bkl-investigator.c |    3 +++
 1 file changed, 3 insertions(+)

Index: bickley-fixppc2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley-fixppc2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bickley-fixppc2.patch	8 Sep 2009 22:12:11 -0000	1.2
+++ bickley-fixppc2.patch	9 Sep 2009 09:06:04 -0000	1.3
@@ -1,14 +1,12 @@
---- bickley-0.4.3/src/bkl-investigator.c.orig	2009-09-08 23:00:24.000000000 +0100
-+++ bickley-0.4.3/src/bkl-investigator.c	2009-09-08 23:01:45.000000000 +0100
-@@ -68,6 +68,11 @@
+--- bickley-0.4.3/src/bkl-investigator.c.orig	2009-09-09 10:01:42.000000000 +0100
++++ bickley-0.4.3/src/bkl-investigator.c	2009-09-09 10:02:34.000000000 +0100
+@@ -68,6 +68,9 @@
  #elif defined (__x86_64__)
  #  define HAVE_IO_PRIO
  #  define __NR_ioprio_set 251
 +#elif defined (__powerpc__)
 +#  define HAVE_IO_PRIO
 +#  define __NR_ioprio_set 273
-+#else
-+#  error "Unsupported arch"
+ #else
+ #  warning "Architecture does not support ioprio modification"
  #endif
- #define IOPRIO_WHO_PROCESS 1
- #define IOPRIO_CLASS_IDLE 3


Index: bickley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bickley.spec	8 Sep 2009 22:12:11 -0000	1.2
+++ bickley.spec	9 Sep 2009 09:06:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bickley
 Version:        0.4.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A meta data management API and framework
 
 Group:          Applications/Multimedia
@@ -126,6 +126,9 @@ gconftool-2 --makefile-install-rule \
 %{_libdir}/libkozo.so
 
 %changelog
+* Wed Sep  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-8
+- Include the correct updated patch
+
 * Tue Sep  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-7
 - Updated PPC patch
 



From airlied at fedoraproject.org  Wed Sep  9 09:09:31 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  9 Sep 2009 09:09:31 +0000 (UTC)
Subject: rpms/kernel/devel drm-page-flip.patch, 1.6, 1.7 kernel.spec, 1.1780,
	1.1781
Message-ID: <20090909090931.C482A11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27308

Modified Files:
	drm-page-flip.patch kernel.spec 
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.218.rc9.git2
- fix r600 oops with page flip patch (#520766)


drm-page-flip.patch:
 drivers/gpu/drm/drm_crtc.c              |  169 +++++++++++++++++++++++++++++++-
 drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
 drivers/gpu/drm/drm_drv.c               |    1 
 drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++
 drivers/gpu/drm/drm_irq.c               |   43 ++++++++
 drivers/gpu/drm/drm_stub.c              |    1 
 drivers/gpu/drm/i915/i915_drv.c         |    1 
 drivers/gpu/drm/i915/intel_display.c    |   26 +++-
 drivers/gpu/drm/radeon/radeon_display.c |    3 
 include/drm/drm.h                       |   25 ++++
 include/drm/drmP.h                      |   32 ++++++
 include/drm/drm_crtc.h                  |   27 +++++
 include/drm/drm_crtc_helper.h           |    4 
 include/drm/drm_mode.h                  |   16 +++
 14 files changed, 414 insertions(+), 14 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- drm-page-flip.patch	8 Sep 2009 06:09:56 -0000	1.6
+++ drm-page-flip.patch	9 Sep 2009 09:09:31 -0000	1.7
@@ -1,6 +1,7 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c	2009-09-08 16:08:09.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index ba728ad..4b7e748 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
 @@ -34,6 +34,8 @@
  #include "drmP.h"
  #include "drm_crtc.h"
@@ -10,7 +11,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  struct drm_prop_enum_list {
  	int type;
  	char *name;
-@@ -330,6 +332,34 @@ void drm_framebuffer_cleanup(struct drm_
+@@ -330,6 +332,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
  EXPORT_SYMBOL(drm_framebuffer_cleanup);
  
  /**
@@ -66,7 +67,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_crtc_init);
-@@ -369,6 +401,9 @@ void drm_crtc_cleanup(struct drm_crtc *c
+@@ -369,6 +401,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
  {
  	struct drm_device *dev = crtc->dev;
  
@@ -76,7 +77,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (crtc->gamma_store) {
  		kfree(crtc->gamma_store);
  		crtc->gamma_store = NULL;
-@@ -376,6 +411,7 @@ void drm_crtc_cleanup(struct drm_crtc *c
+@@ -376,6 +411,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
  
  	drm_mode_object_put(dev, &crtc->base);
  	list_del(&crtc->head);
@@ -219,10 +220,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +
 +	return ret;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-08 16:08:09.000000000 +1000
-@@ -872,8 +872,10 @@ int drm_crtc_helper_set_config(struct dr
+diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
+index ff447f1..fec66f9 100644
+--- a/drivers/gpu/drm/drm_crtc_helper.c
++++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -872,8 +872,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
  		old_fb = set->crtc->fb;
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
@@ -233,7 +235,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		if (ret != 0)
  			goto fail;
  	}
-@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct 
+@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -247,10 +249,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 +}
 +EXPORT_SYMBOL(drm_crtc_helper_set_base);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c	2009-09-08 16:08:09.000000000 +1000
-@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[
+diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
+index a75ca63..672f473 100644
+--- a/drivers/gpu/drm/drm_drv.c
++++ b/drivers/gpu/drm/drm_drv.c
+@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
@@ -258,10 +261,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.da	2009-09-08 13:14:32.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c	2009-09-08 16:08:09.000000000 +1000
-@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode 
+diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
+index 251bc0e..dcd9c66 100644
+--- a/drivers/gpu/drm/drm_fops.c
++++ b/drivers/gpu/drm/drm_fops.c
+@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
  
  	INIT_LIST_HEAD(&priv->lhead);
  	INIT_LIST_HEAD(&priv->fbs);
@@ -270,7 +274,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
-@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, str
+@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
  {
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev = file_priv->minor->dev;
@@ -280,7 +284,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	int retcode = 0;
  
  	lock_kernel();
-@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, str
+@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
  	if (file_priv->minor->master)
  		drm_master_release(dev, filp);
  
@@ -300,7 +304,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_release(dev, file_priv);
  
-@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, str
+@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
  }
  EXPORT_SYMBOL(drm_release);
  
@@ -358,9 +362,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	return mask;
  }
  EXPORT_SYMBOL(drm_poll);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da	2009-09-08 13:14:32.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-09-08 16:08:09.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index f85aaf2..102d19d 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
 @@ -34,6 +34,7 @@
   */
  
@@ -369,7 +374,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  #include <linux/interrupt.h>	/* For task queue support */
  
-@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *
+@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
  	return 0;
  }
  
@@ -414,16 +419,16 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static void vblank_disable_fn(unsigned long arg)
  {
  	struct drm_device *dev = (struct drm_device *)arg;
-@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *d
+@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
  		atomic_set(&dev->vblank_refcount[i], 0);
  	}
  
-+	INIT_LIST_HEAD(&dev->flip_list);
 +	INIT_WORK(&dev->flip_work, drm_flip_work_func);
++
  	dev->vblank_disable_allowed = 0;
  
  	return 0;
-@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device
+@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
  {
  	atomic_inc(&dev->_vblank_count[crtc]);
  	DRM_WAKEUP(&dev->vbl_queue[crtc]);
@@ -431,9 +436,22 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  }
  EXPORT_SYMBOL(drm_handle_vblank);
 +
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-09-08 16:08:09.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
+index 55bb8a8..65c8662 100644
+--- a/drivers/gpu/drm/drm_stub.c
++++ b/drivers/gpu/drm/drm_stub.c
+@@ -220,6 +220,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+ 	INIT_LIST_HEAD(&dev->ctxlist);
+ 	INIT_LIST_HEAD(&dev->vmalist);
+ 	INIT_LIST_HEAD(&dev->maplist);
++	INIT_LIST_HEAD(&dev->flip_list);
+ 
+ 	spin_lock_init(&dev->count_lock);
+ 	spin_lock_init(&dev->drw_lock);
+diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
+index dbe568c..b81305e 100644
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
 @@ -206,6 +206,7 @@ static struct drm_driver driver = {
  		 .mmap = drm_gem_mmap,
  		 .poll = drm_poll,
@@ -442,10 +460,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #ifdef CONFIG_COMPAT
  		 .compat_ioctl = i915_compat_ioctl,
  #endif
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-09-08 16:08:09.000000000 +1000
-@@ -973,6 +973,8 @@ intel_pipe_set_base(struct drm_crtc *crt
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 155719f..0d6e677 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -973,6 +973,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	u32 dspcntr, alignment;
  	int ret;
  
@@ -454,7 +473,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	/* no fb bound */
  	if (!crtc->fb) {
  		DRM_DEBUG("No FB bound\n");
-@@ -1008,17 +1010,14 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1008,17 +1010,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		BUG();
  	}
  
@@ -472,7 +491,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		return ret;
  	}
  
-@@ -1029,7 +1028,6 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1029,7 +1028,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		ret = i915_gem_object_get_fence_reg(obj);
  		if (ret != 0) {
  			i915_gem_object_unpin(obj);
@@ -480,7 +499,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  			return ret;
  		}
  	}
-@@ -1054,7 +1052,6 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1054,7 +1052,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	default:
  		DRM_ERROR("Unknown color depth\n");
  		i915_gem_object_unpin(obj);
@@ -488,7 +507,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		return -EINVAL;
  	}
  	if (IS_I965G(dev)) {
-@@ -1086,17 +1083,14 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1086,17 +1083,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		I915_READ(dspbase);
  	}
  
@@ -507,7 +526,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (!dev->primary->master)
  		return 0;
  
-@@ -2732,7 +2726,9 @@ static int intel_crtc_mode_set(struct dr
+@@ -2732,7 +2726,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  	I915_WRITE(dspcntr_reg, dspcntr);
  
  	/* Flush the plane changes */
@@ -517,7 +536,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	intel_update_watermarks(dev);
  
-@@ -3521,6 +3517,7 @@ static const struct drm_crtc_funcs intel
+@@ -3521,6 +3517,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
  	.gamma_set = intel_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = intel_crtc_destroy,
@@ -525,7 +544,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  
-@@ -3533,7 +3530,7 @@ static void intel_crtc_init(struct drm_d
+@@ -3533,7 +3530,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
  	if (intel_crtc == NULL)
  		return;
  
@@ -534,7 +553,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
  	intel_crtc->pipe = pipe;
-@@ -3717,9 +3714,18 @@ static int intel_user_framebuffer_create
+@@ -3717,9 +3714,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
  	return drm_gem_handle_create(file_priv, object, handle);
  }
  
@@ -553,34 +572,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-09-08 16:08:09.000000000 +1000
-@@ -993,7 +993,7 @@ nv04_crtc_create(struct drm_device *dev,
- 	nv_crtc->index = crtc_num;
- 	nv_crtc->last_dpms = NV_DPMS_CLEARED;
- 
--	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
-+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
- 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
- 
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-09-08 16:08:09.000000000 +1000
-@@ -777,7 +777,7 @@ nv50_crtc_create(struct drm_device *dev,
- 	crtc->set_dither = nv50_crtc_set_dither;
- 	crtc->set_scale = nv50_crtc_set_scale;
- 
--	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
-+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
- 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
- 
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c	2009-09-08 16:08:09.000000000 +1000
-@@ -168,6 +168,7 @@ static const struct drm_crtc_funcs radeo
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index f5739e2..0ec45bc 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -168,6 +168,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
@@ -588,7 +584,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
-@@ -180,7 +181,7 @@ static void radeon_crtc_init(struct drm_
+@@ -180,7 +181,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
  	if (radeon_crtc == NULL)
  		return;
  
@@ -597,9 +593,131 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
  	radeon_crtc->crtc_id = index;
-diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.da linux-2.6.30.noarch/include/drm/drm_crtc.h
---- linux-2.6.30.noarch/include/drm/drm_crtc.h.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-09-08 16:08:09.000000000 +1000
+diff --git a/include/drm/drm.h b/include/drm/drm.h
+index 7cb50bd..1920323 100644
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -686,6 +686,7 @@ struct drm_gem_open {
+ #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
++#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
+ 
+ /**
+  * Device specific ioctls should only be in their respective headers
+@@ -698,6 +699,30 @@ struct drm_gem_open {
+ #define DRM_COMMAND_BASE                0x40
+ #define DRM_COMMAND_END			0xA0
+ 
++/**
++ * Header for events written back to userspace on the drm fd.  The
++ * type defines the type of event, the length specifies the total
++ * length of the event (including the header), and user_data is
++ * typically a 64 bit value passed with the ioctl that triggered the
++ * event.  A read on the drm fd will always only return complete
++ * events, that is, if for example the read buffer is 100 bytes, and
++ * there are two 64 byte events pending, only one will be returned.
++ */
++struct drm_event {
++	__u32 type;
++	__u32 length;
++};
++
++#define DRM_EVENT_MODE_PAGE_FLIP 0x01
++
++struct drm_event_page_flip {
++	struct drm_event base;
++	__u64 user_data;
++	__u32 tv_sec;
++	__u32 tv_usec;
++	__u32 frame;
++};
++
+ /* typedef area */
+ #ifndef __KERNEL__
+ typedef struct drm_clip_rect drm_clip_rect_t;
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index eeefb63..5431888 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -426,6 +426,14 @@ struct drm_buf_entry {
+ 	struct drm_freelist freelist;
+ };
+ 
++/* Event queued up for userspace to read */
++struct drm_pending_event {
++	struct drm_event *event;
++	struct list_head link;
++	struct drm_file *file_priv;
++	void (*destroy) (struct drm_pending_event *event);
++};
++
+ /** File private data */
+ struct drm_file {
+ 	int authenticated;
+@@ -449,6 +457,9 @@ struct drm_file {
+ 	struct drm_master *master; /* master this node is currently associated with
+ 				      N.B. not always minor->master */
+ 	struct list_head fbs;
++
++	wait_queue_head_t event_wait;
++	struct list_head event_list;
+ };
+ 
+ /** Wait queue */
+@@ -897,6 +908,16 @@ struct drm_minor {
+ 	struct drm_mode_group mode_group;
+ };
+ 
++struct drm_pending_flip {
++	struct drm_pending_event pending_event;
++	struct drm_framebuffer *old_fb;
++	struct drm_crtc *crtc;
++	u32 frame;
++	int pipe;
++	struct list_head link;
++	struct drm_event_page_flip event;
++};
++
+ /**
+  * DRM device structure. This structure represent a complete card that
+  * may contain multiple heads.
+@@ -996,6 +1017,13 @@ struct drm_device {
+ 
+ 	u32 max_vblank_count;           /**< size of vblank counter register */
+ 
++	struct work_struct flip_work;
++
++	/**
++	 * List of objects waiting on flip completion
++	 */
++	struct list_head flip_list;
++
+ 	/*@} */
+ 	cycles_t ctx_start;
+ 	cycles_t lck_start;
+@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_device *dev);
+ extern int drm_open(struct inode *inode, struct file *filp);
+ extern int drm_stub_open(struct inode *inode, struct file *filp);
+ extern int drm_fasync(int fd, struct file *filp, int on);
++extern ssize_t drm_read(struct file *filp, char __user *buffer,
++			size_t count, loff_t *offset);
+ extern int drm_release(struct inode *inode, struct file *filp);
+ 
+ 				/* Mapping support (drm_vm.h) */
+@@ -1298,6 +1328,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
+ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+ extern int drm_modeset_ctl(struct drm_device *dev, void *data,
+ 			   struct drm_file *file_priv);
++extern void drm_finish_pending_flip(struct drm_device *dev,
++				   struct drm_pending_flip *f, u32 frame);
+ 
+ 				/* AGP/GART support (drm_agpsupport.h) */
+ extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
+diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
+index ae1e9e1..525f770 100644
+--- a/include/drm/drm_crtc.h
++++ b/include/drm/drm_crtc.h
 @@ -238,6 +238,12 @@ struct drm_display_info {
  };
  
@@ -678,7 +796,7 @@ diff -up linux-2.6.30.noarch/include/drm
  			  const struct drm_crtc_funcs *funcs);
  extern void drm_crtc_cleanup(struct drm_crtc *crtc);
  
-@@ -744,6 +769,8 @@ extern int drm_mode_gamma_get_ioctl(stru
+@@ -744,6 +769,8 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
@@ -687,10 +805,11 @@ diff -up linux-2.6.30.noarch/include/drm
  extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
  				int hdisplay, int vdisplay, int vrefresh,
  				bool reduced, bool interlaced);
-diff -up linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.da linux-2.6.30.noarch/include/drm/drm_crtc_helper.h
---- linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_crtc_helper.h	2009-09-08 16:08:09.000000000 +1000
-@@ -126,4 +126,8 @@ static inline void drm_connector_helper_
+diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
+index 4c8daca..b5bd0b8 100644
+--- a/include/drm/drm_crtc_helper.h
++++ b/include/drm/drm_crtc_helper.h
+@@ -126,4 +126,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
  }
  
  extern int drm_helper_resume_force_mode(struct drm_device *dev);
@@ -699,51 +818,10 @@ diff -up linux-2.6.30.noarch/include/drm
 +				    struct drm_framebuffer *old_fb);
 +
  #endif
-diff -up linux-2.6.30.noarch/include/drm/drm.h.da linux-2.6.30.noarch/include/drm/drm.h
---- linux-2.6.30.noarch/include/drm/drm.h.da	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm.h	2009-09-08 16:08:09.000000000 +1000
-@@ -686,6 +686,7 @@ struct drm_gem_open {
- #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
- 
- /**
-  * Device specific ioctls should only be in their respective headers
-@@ -698,6 +699,30 @@ struct drm_gem_open {
- #define DRM_COMMAND_BASE                0x40
- #define DRM_COMMAND_END			0xA0
- 
-+/**
-+ * Header for events written back to userspace on the drm fd.  The
-+ * type defines the type of event, the length specifies the total
-+ * length of the event (including the header), and user_data is
-+ * typically a 64 bit value passed with the ioctl that triggered the
-+ * event.  A read on the drm fd will always only return complete
-+ * events, that is, if for example the read buffer is 100 bytes, and
-+ * there are two 64 byte events pending, only one will be returned.
-+ */
-+struct drm_event {
-+	__u32 type;
-+	__u32 length;
-+};
-+
-+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
-+
-+struct drm_event_page_flip {
-+	struct drm_event base;
-+	__u64 user_data;
-+	__u32 tv_sec;
-+	__u32 tv_usec;
-+	__u32 frame;
-+};
-+
- /* typedef area */
- #ifndef __KERNEL__
- typedef struct drm_clip_rect drm_clip_rect_t;
-diff -up linux-2.6.30.noarch/include/drm/drm_mode.h.da linux-2.6.30.noarch/include/drm/drm_mode.h
---- linux-2.6.30.noarch/include/drm/drm_mode.h.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_mode.h	2009-09-08 16:08:09.000000000 +1000
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index 1f90841..6f08a77 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
 @@ -268,4 +268,20 @@ struct drm_mode_crtc_lut {
  	__u64 blue;
  };
@@ -765,80 +843,3 @@ diff -up linux-2.6.30.noarch/include/drm
 +};
 +
  #endif
-diff -up linux-2.6.30.noarch/include/drm/drmP.h.da linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.da	2009-09-08 16:07:49.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-09-08 16:08:09.000000000 +1000
-@@ -426,6 +426,14 @@ struct drm_buf_entry {
- 	struct drm_freelist freelist;
- };
- 
-+/* Event queued up for userspace to read */
-+struct drm_pending_event {
-+	struct drm_event *event;
-+	struct list_head link;
-+	struct drm_file *file_priv;
-+	void (*destroy) (struct drm_pending_event *event);
-+};
-+
- /** File private data */
- struct drm_file {
- 	int authenticated;
-@@ -449,6 +457,9 @@ struct drm_file {
- 	struct drm_master *master; /* master this node is currently associated with
- 				      N.B. not always minor->master */
- 	struct list_head fbs;
-+
-+	wait_queue_head_t event_wait;
-+	struct list_head event_list;
- };
- 
- /** Wait queue */
-@@ -897,6 +908,16 @@ struct drm_minor {
- 	struct drm_mode_group mode_group;
- };
- 
-+struct drm_pending_flip {
-+	struct drm_pending_event pending_event;
-+	struct drm_framebuffer *old_fb;
-+	struct drm_crtc *crtc;
-+	u32 frame;
-+	int pipe;
-+	struct list_head link;
-+	struct drm_event_page_flip event;
-+};
-+
- /**
-  * DRM device structure. This structure represent a complete card that
-  * may contain multiple heads.
-@@ -996,6 +1017,13 @@ struct drm_device {
- 
- 	u32 max_vblank_count;           /**< size of vblank counter register */
- 
-+	struct work_struct flip_work;
-+
-+	/**
-+	 * List of objects waiting on flip completion
-+	 */
-+	struct list_head flip_list;
-+
- 	/*@} */
- 	cycles_t ctx_start;
- 	cycles_t lck_start;
-@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_devi
- extern int drm_open(struct inode *inode, struct file *filp);
- extern int drm_stub_open(struct inode *inode, struct file *filp);
- extern int drm_fasync(int fd, struct file *filp, int on);
-+extern ssize_t drm_read(struct file *filp, char __user *buffer,
-+			size_t count, loff_t *offset);
- extern int drm_release(struct inode *inode, struct file *filp);
- 
- 				/* Mapping support (drm_vm.h) */
-@@ -1300,6 +1330,8 @@ extern void drm_vblank_pre_modeset(struc
- extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
- extern int drm_modeset_ctl(struct drm_device *dev, void *data,
- 			   struct drm_file *file_priv);
-+extern void drm_finish_pending_flip(struct drm_device *dev,
-+				   struct drm_pending_flip *f, u32 frame);
- 
- 				/* AGP/GART support (drm_agpsupport.h) */
- extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1780
retrieving revision 1.1781
diff -u -p -r1.1780 -r1.1781
--- kernel.spec	9 Sep 2009 06:41:34 -0000	1.1780
+++ kernel.spec	9 Sep 2009 09:09:31 -0000	1.1781
@@ -2025,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.218.rc9.git2
+- fix r600 oops with page flip patch (#520766)
+
 * Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: fix display resume on pre-G8x chips
 



From jakub at fedoraproject.org  Wed Sep  9 09:20:45 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  9 Sep 2009 09:20:45 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-vta-cselib-subreg-of-value-more-pr41276.patch, 
	1.1, 1.2
Message-ID: <20090909092045.2CF8B11C00CE@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30870

Modified Files:
	gcc44-vta-cselib-subreg-of-value-more-pr41276.patch 
Log Message:
4.4.1-11

gcc44-vta-cselib-subreg-of-value-more-pr41276.patch:
 cselib.c       |   50 +++++++++++++++++++++++++++++++-------------------
 var-tracking.c |   43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 68 insertions(+), 25 deletions(-)

Index: gcc44-vta-cselib-subreg-of-value-more-pr41276.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-vta-cselib-subreg-of-value-more-pr41276.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-vta-cselib-subreg-of-value-more-pr41276.patch	9 Sep 2009 09:06:01 -0000	1.1
+++ gcc44-vta-cselib-subreg-of-value-more-pr41276.patch	9 Sep 2009 09:20:44 -0000	1.2
@@ -86,7 +86,7 @@ Index: gcc/cselib.c
 @@ -1185,20 +1201,16 @@ cselib_expand_value_rtx_1 (rtx orig, str
  	    fputs (" into...", dump_file);
  	  }
- 
+ 	
 -	if (!evd->callback)
 -	  result = NULL;
 -	else



From xhorak at fedoraproject.org  Wed Sep  9 09:23:32 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 09:23:32 +0000 (UTC)
Subject: rpms/xulrunner/F-10 .cvsignore, 1.72, 1.73 sources, 1.75,
	1.76 xulrunner.spec, 1.149, 1.150
Message-ID: <20090909092332.62C4411C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31688

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	3 Aug 2009 21:01:14 -0000	1.72
+++ .cvsignore	9 Sep 2009 09:23:32 -0000	1.73
@@ -1,3 +1,4 @@
 xulrunner-1.9.0.11-source.tar.bz2
 xulrunner-1.9.0.12-source.tar.bz2
 xulrunner-1.9.0.13-source.tar.bz2
+xulrunner-1.9.0.14-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	3 Aug 2009 21:01:14 -0000	1.75
+++ sources	9 Sep 2009 09:23:32 -0000	1.76
@@ -1 +1 @@
-eb2e69872ef6932de0ee98b102eb1d5b  xulrunner-1.9.0.13-source.tar.bz2
+fd867be30a47c9c8a82cf3a266740727  xulrunner-1.9.0.14-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- xulrunner.spec	3 Aug 2009 21:01:14 -0000	1.149
+++ xulrunner.spec	9 Sep 2009 09:23:32 -0000	1.150
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.13
+Version:        1.9.0.14
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -423,7 +423,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Aug  3 2009 Martin Stransky <stransky at redhat.com> 1.9.0.13-1
+* Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.14-1
+- Update to 1.9.0.14
+
+* Mon Aug  3 2009 Martin Stransky <stransky at redhat.com> - 1.9.0.13-1
 - Update to 1.9.0.13
 
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.12-1



From jskala at fedoraproject.org  Wed Sep  9 09:24:01 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Wed,  9 Sep 2009 09:24:01 +0000 (UTC)
Subject: rpms/iputils/F-11 iputils-20071127-hostbyname.patch, NONE,
	1.1 iputils.spec, 1.65, 1.66
Message-ID: <20090909092401.F1FE111C00CE@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/iputils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31879

Modified Files:
	iputils.spec 
Added Files:
	iputils-20071127-hostbyname.patch 
Log Message:
* Wed Sep 09 2009 Jiri Skala <jskala at redhat.com> - 20071127-9
- fixed #516179  - gethostbyname replaced by getaddrinfo


iputils-20071127-hostbyname.patch:
 ping.c |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

--- NEW FILE iputils-20071127-hostbyname.patch ---
diff -up iputils-s20071127/ping.c.hostbyname iputils-s20071127/ping.c
--- iputils-s20071127/ping.c.hostbyname	2009-09-09 09:49:26.009173503 +0200
+++ iputils-s20071127/ping.c	2009-09-09 11:12:28.250128341 +0200
@@ -118,7 +118,7 @@ int pmtudisc = -1;
 int
 main(int argc, char **argv)
 {
-	struct hostent *hp;
+	struct addrinfo hints, *res;
 	int ch, hold, packlen;
 	int socket_errno;
 	u_char *packet;
@@ -258,25 +258,30 @@ main(int argc, char **argv)
 		} else {
 			rc = idna_to_ascii_lz (target, &idn, 0);
 			if (rc == IDNA_SUCCESS)
-				hp = gethostbyname (idn);
-			else {
+			{
+				memset(&hints, 0, sizeof(hints));
+				hints.ai_family = AF_INET;
+				hints.ai_flags = AI_CANONNAME;
+				rc = getaddrinfo(idn, NULL, &hints, &res);
+			} else {
 				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc);
 				exit(2);
 			}
 			free(idn);
-			if (!hp) {
+			if (!res || rc) {
 				fprintf(stderr, "ping: unknown host %s\n", target);
 				exit(2);
 			}
-			memcpy(&whereto.sin_addr, hp->h_addr, 4);
-			rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0);
+			whereto.sin_addr = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
+			rc = idna_to_unicode_lzlz (target, &idn, 0);
 			if (rc == IDNA_SUCCESS)
 				strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1);
 			else {
-				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc);
+				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc);
 				exit(2);
 			}
 			free(idn);
+			freeaddrinfo(res);
 			hnamebuf[sizeof(hnamebuf) - 1] = 0;
 			hostname = hnamebuf;
 		}


Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/F-11/iputils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- iputils.spec	25 Feb 2009 21:59:39 -0000	1.65
+++ iputils.spec	9 Sep 2009 09:24:01 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20071127
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@ Patch12: iputils-20070202-ia64_align.pat
 Patch13: iputils-20071127-warnings.patch
 Patch14: iputils-20071127-typing_bug.patch
 Patch15: iputils-20071127-corr_type.patch
+Patch16: iputils-20071127-hostbyname.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -61,6 +62,7 @@ the target machine is alive and receivin
 %patch13 -p1 -b .warnings
 %patch14 -p1 -b .typing_bug
 %patch15 -p1 -b .corr_type
+%patch16 -p1 -b .hostbyname
 
 %build
 %ifarch s390 s390x
@@ -150,6 +152,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Wed Sep 09 2009 Jiri Skala <jskala at redhat.com> - 20071127-9
+- fixed #516179  - gethostbyname replaced by getaddrinfo
+
 * Wed Feb 25 2009 Jiri Skala <jskala at redhat.com> - 20071127-8
 - remake type conversions to gcc4.4 requirements
 



From xhorak at fedoraproject.org  Wed Sep  9 09:28:33 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 09:28:33 +0000 (UTC)
Subject: rpms/xulrunner/devel .cvsignore, 1.70, 1.71 sources, 1.73,
	1.74 xulrunner.spec, 1.175, 1.176
Message-ID: <20090909092833.974CF11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv605

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	3 Aug 2009 20:53:34 -0000	1.70
+++ .cvsignore	9 Sep 2009 09:28:33 -0000	1.71
@@ -1,2 +1,3 @@
 xulrunner-1.9.1.1-source.tar.bz2
 xulrunner-1.9.1.2-source.tar.bz2
+xulrunner-1.9.1.3-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	3 Aug 2009 20:53:34 -0000	1.73
+++ sources	9 Sep 2009 09:28:33 -0000	1.74
@@ -1 +1 @@
-0de7173e45df009f5a2620fcceb010fb  xulrunner-1.9.1.2-source.tar.bz2
+ca167e69180ab1230aea0763da270a95  xulrunner-1.9.1.3-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- xulrunner.spec	24 Aug 2009 08:46:46 -0000	1.175
+++ xulrunner.spec	9 Sep 2009 09:28:33 -0000	1.176
@@ -11,8 +11,8 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.2
-Release:        4%{?dist}
+Version:        1.9.1.3
+Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -455,6 +455,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.3-1
+- Update to 1.9.1.3
+
 * Fri Aug 21 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.2-4
 - Added libnotify support
 



From harald at fedoraproject.org  Wed Sep  9 09:35:51 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  9 Sep 2009 09:35:51 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.9, 1.10 dracut.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <20090909093551.38CAA11C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2529

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-7
- add scsi_wait_scan to be sure everything was scanned



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Sep 2009 14:32:45 -0000	1.9
+++ .cvsignore	9 Sep 2009 09:35:50 -0000	1.10
@@ -1 +1 @@
-dracut-001-f5c4374d.tar.bz2
+dracut-001-71094bee.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dracut.spec	8 Sep 2009 14:32:45 -0000	1.23
+++ dracut.spec	9 Sep 2009 09:35:51 -0000	1.24
@@ -1,5 +1,4 @@
-%define gittag f5c4374d
-
+%define gittag 71094bee
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -15,7 +14,7 @@
 
 Name: dracut
 Version: 001
-Release: 6%{?rdist}
+Release: 7%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-7
+- add scsi_wait_scan to be sure everything was scanned
+
 * Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-6
 - fixed several problems with md raid containers
 - fixed selinux policy loading


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	8 Sep 2009 14:32:45 -0000	1.10
+++ sources	9 Sep 2009 09:35:51 -0000	1.11
@@ -1 +1 @@
-36e8fcadcbd9ee4ca37e55fac35662b5  dracut-001-f5c4374d.tar.bz2
+1ae9d33d2473b139b51cd3825603ff5b  dracut-001-71094bee.tar.bz2



From airlied at fedoraproject.org  Wed Sep  9 09:42:58 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  9 Sep 2009 09:42:58 +0000 (UTC)
Subject: rpms/kernel/devel drm-page-flip.patch, 1.7, 1.8 kernel.spec, 1.1781,
	1.1782
Message-ID: <20090909094258.C6C0211C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4280

Modified Files:
	drm-page-flip.patch kernel.spec 
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
- uggh lost nouveau bits in page flip


drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                            |  169 +++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                     |   12 +
 b/drivers/gpu/drm/drm_drv.c                             |    1 
 b/drivers/gpu/drm/drm_fops.c                            |   68 ++++++
 b/drivers/gpu/drm/drm_irq.c                             |   43 ++++
 b/drivers/gpu/drm/drm_stub.c                            |    1 
 b/drivers/gpu/drm/i915/i915_drv.c                       |    1 
 b/drivers/gpu/drm/i915/intel_display.c                  |   26 +-
 b/drivers/gpu/drm/radeon/radeon_display.c               |    3 
 b/include/drm/drm.h                                     |   25 ++
 b/include/drm/drmP.h                                    |   32 +++
 b/include/drm/drm_crtc.h                                |   27 ++
 b/include/drm/drm_crtc_helper.h                         |    4 
 b/include/drm/drm_mode.h                                |   16 +
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 16 files changed, 416 insertions(+), 16 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drm-page-flip.patch	9 Sep 2009 09:09:31 -0000	1.7
+++ drm-page-flip.patch	9 Sep 2009 09:42:58 -0000	1.8
@@ -843,3 +843,27 @@ index 1f90841..6f08a77 100644
 +};
 +
  #endif
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -993,7 +993,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->index = crtc_num;
+ 	nv_crtc->last_dpms = NV_DPMS_CLEARED;
+ 
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -777,7 +777,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->set_dither = nv50_crtc_set_dither;
+ 	crtc->set_scale = nv50_crtc_set_scale;
+ 
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1781
retrieving revision 1.1782
diff -u -p -r1.1781 -r1.1782
--- kernel.spec	9 Sep 2009 09:09:31 -0000	1.1781
+++ kernel.spec	9 Sep 2009 09:42:58 -0000	1.1782
@@ -2025,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
+- uggh lost nouveau bits in page flip
+
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.218.rc9.git2
 - fix r600 oops with page flip patch (#520766)
 



From mbarnes at fedoraproject.org  Wed Sep  9 09:51:55 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  9 Sep 2009 09:51:55 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.45,1.394.2.46
Message-ID: <20090909095155.17F2511C00CE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7279

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Enable mailing-list-actions plugin.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.45
retrieving revision 1.394.2.46
diff -u -p -r1.394.2.45 -r1.394.2.46
--- evolution.spec	9 Sep 2009 03:59:28 -0000	1.394.2.45
+++ evolution.spec	9 Sep 2009 09:51:54 -0000	1.394.2.46
@@ -566,9 +566,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-itip-formatter.eplug
 %{evo_plugin_dir}/liborg-gnome-itip-formatter.so
 
-#%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
-#%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
-#%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml
+%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
+%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
 
 %{evo_plugin_dir}/org-gnome-mail-notification.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-notification.so



From perex at fedoraproject.org  Wed Sep  9 09:52:36 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  9 Sep 2009 09:52:36 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib-1.0.21-dmix-conf.patch, NONE,
	1.1 alsa-lib-1.0.21-revert-hook.patch, NONE,
	1.1 alsa-lib-1.0.21-speaker.patch, NONE, 1.1 alsa-lib.spec, 1.85, 1.86
Message-ID: <20090909095236.F182911C00CE@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7631

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.patch 
	alsa-lib-1.0.21-speaker.patch 
Log Message:
alsa-lib: fix bug #521988

alsa-lib-1.0.21-dmix-conf.patch:
 dmix.conf |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE alsa-lib-1.0.21-dmix-conf.patch ---
>From 1f126fd7c6ef37b04ad745609bbebf0dbbf2e1fd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:38:11 +0200
Subject: [PATCH] Change dmix.conf to accept user configuration from defaults.dmix.<driver_id>.xxx

An attempt to fix problem described in reverted patch "Fix driver conf
parsing in snd_config_hook_load_for_all_cards()".

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/conf/pcm/dmix.conf |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 4108ddb..e62cb29 100644
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -63,12 +63,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.period_size"
+					".period_size"
 				]
 			}
 			default 1024
@@ -78,12 +78,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.period_time"
+					".period_time"
 				]
 			}
 			default -1
@@ -93,12 +93,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.periods"
+					".periods"
 				]
 			}
 			default 16
-- 
1.5.5.1


alsa-lib-1.0.21-revert-hook.patch:
 conf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alsa-lib-1.0.21-revert-hook.patch ---
>From 133819d420d962b6888c280352a5532da93f1a3a Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:24:11 +0200
Subject: [PATCH] Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"

This reverts commit 96da0c842d14b40ce8e37726b259229634b3aa21.

This way of fix brokes card-specific configuration loading.
See http://bugzilla.redhat.com bug#521988 for details.

Appropriate way to handle this problem is to fix the dmix configuration file.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/conf.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index 3f0dfe1..570c90f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3477,8 +3477,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
 			err = snd_determine_driver(card, &fdriver);
 			if (err < 0)
 				return err;
-			if (snd_config_search(root, fdriver, &n) >= 0 &&
-			    snd_config_get_string(n, &driver) >= 0) {
+			if (snd_config_search(root, fdriver, &n) >= 0) {
+				if (snd_config_get_string(n, &driver) < 0)
+					goto __err;
 				assert(driver);
 				while (1) {
 					char *s = strchr(driver, '.');
-- 
1.5.5.1


alsa-lib-1.0.21-speaker.patch:
 simple_none.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE alsa-lib-1.0.21-speaker.patch ---
>From ac9de424bc0a896e8e30b5ec176daf924a2cefb2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Mon, 31 Aug 2009 16:41:12 +0200
Subject: [PATCH] mixer: Add Speaker and Beep names to the weight list

Added strings "Speaker" and "Beep" to the weight list so that the entries
appear in more appropriate positions.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 src/mixer/simple_none.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 4802200..9259a08 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -134,6 +134,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
 	static const char *const names[] = {
 		"Master",
 		"Headphone",
+		"Speaker",
 		"Tone",
 		"Bass",
 		"Treble",
@@ -158,6 +159,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
 		"I2S",
 		"IEC958",
 		"PC Speaker",
+		"Beep",
 		"Aux",
 		"Mono",
 		"Playback",
-- 
1.5.5.1



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- alsa-lib.spec	2 Sep 2009 08:11:20 -0000	1.85
+++ alsa-lib.spec	9 Sep 2009 09:52:36 -0000	1.86
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 3%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -13,6 +13,9 @@ Source10: asound.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
+Patch10: alsa-lib-1.0.21-speaker.patch
+Patch11: alsa-lib-1.0.21-revert-hook.patch
+Patch12: alsa-lib-1.0.21-dmix-conf.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -44,6 +47,9 @@ against the ALSA libraries and interface
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
+%patch10 -p1 -b .speaker
+%patch11 -p1 -b .revert-hook
+%patch12 -p1 -b .dmix-conf
 
 %build
 %configure --disable-aload
@@ -93,8 +99,12 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
+- Add Speaker and Beep control names to mixer weight list
+- Fix redhat bug #521988
+
 * Wed Sep  2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
-* Updated to 1.0.21 final
+- Updated to 1.0.21 final
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pkgdb at fedoraproject.org  Wed Sep  9 10:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 10:15:55 +0000
Subject: [pkgdb] bsf: choeger has requested watchbugzilla
Message-ID: <20090909101555.38B1210F87A@bastion2.fedora.phx.redhat.com>

choeger has requested the watchbugzilla acl on bsf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 10:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 10:16:00 +0000
Subject: [pkgdb] bsf: choeger has requested watchcommits
Message-ID: <20090909101600.AB76D10F896@bastion2.fedora.phx.redhat.com>

choeger has requested the watchcommits acl on bsf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 10:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 10:15:57 +0000
Subject: [pkgdb] bsf: choeger has given up watchbugzilla
Message-ID: <20090909101557.A301310F890@bastion2.fedora.phx.redhat.com>

choeger has given up the watchbugzilla acl on bsf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 10:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 10:16:01 +0000
Subject: [pkgdb] bsf: choeger has requested commit
Message-ID: <20090909101601.9FAC410F89B@bastion2.fedora.phx.redhat.com>

choeger has requested the commit acl on bsf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 10:16:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 10:16:10 +0000
Subject: [pkgdb] bsf: choeger has requested watchcommits
Message-ID: <20090909101610.DDDBE10F89D@bastion2.fedora.phx.redhat.com>

choeger has requested the watchcommits acl on bsf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 10:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 10:16:15 +0000
Subject: [pkgdb] bsf: choeger has requested commit
Message-ID: <20090909101615.4674E10F8A1@bastion2.fedora.phx.redhat.com>

choeger has requested the commit acl on bsf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From grof at fedoraproject.org  Wed Sep  9 10:23:04 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed,  9 Sep 2009 10:23:04 +0000 (UTC)
Subject: rpms/easystroke/devel .cvsignore, 1.4, 1.5 easystroke.spec, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090909102304.ED77A11C00CE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/easystroke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17304/devel

Modified Files:
	.cvsignore easystroke.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 06:20:08 -0000	1.4
+++ .cvsignore	9 Sep 2009 10:23:04 -0000	1.5
@@ -1 +1 @@
-easystroke-0.4.6.tar.gz
+easystroke-0.4.9.tar.gz


Index: easystroke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/devel/easystroke.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- easystroke.spec	24 Jul 2009 20:45:59 -0000	1.4
+++ easystroke.spec	9 Sep 2009 10:23:04 -0000	1.5
@@ -1,14 +1,13 @@
 Name:           easystroke
-Version:        0.4.6
-Release:        2%{?dist}
+Version:        0.4.9
+Release:        1%{?dist}
 Summary:        Gesture-recognition application for X11
 
 Group:          User Interface/X Hardware Support
 License:        ISC
 URL:            http://easystroke.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/easystroke/%{name}-%{version}.tar.gz
-#Patch to compile with gcc 4.3.0
-#Patch0:         easystroke-0.4.5-gcc.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel
@@ -28,7 +27,6 @@ execute shell commands, hold down modifi
 
 %prep
 %setup -q
-#%patch0 -p1 -b .gcc
 # Resolve debuginfo
 sed -i 's|install -Ds|install -D|' Makefile
 # Preserve timestamps:
@@ -75,8 +73,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 09 2009 Zarko Pintar <zarko.pintar at gmail.com> - 0.4.9-1
+- new version
 
 * Wed Jun 29 2009 Zarko Pintar <zarko.pintar at gmail.com> - 0.4.6-1
 - new version


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jun 2009 06:20:08 -0000	1.3
+++ import.log	9 Sep 2009 10:23:04 -0000	1.4
@@ -1,3 +1,4 @@
 easystroke-0_4_4-3_fc11:HEAD:easystroke-0.4.4-3.fc11.src.rpm:1243923742
 easystroke-0_4_5-1_fc10:HEAD:easystroke-0.4.5-1.fc10.src.rpm:1244061035
 easystroke-0_4_6-1_fc11:HEAD:easystroke-0.4.6-1.fc11.src.rpm:1246256369
+easystroke-0_4_9-1_fc11:HEAD:easystroke-0.4.9-1.fc11.src.rpm:1252491935


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jun 2009 06:20:08 -0000	1.4
+++ sources	9 Sep 2009 10:23:04 -0000	1.5
@@ -1 +1 @@
-fed6248fa792ce6cfa39a4d57b135321  easystroke-0.4.6.tar.gz
+4d95a69a29a7fb57468044df4570e665  easystroke-0.4.9.tar.gz



From grof at fedoraproject.org  Wed Sep  9 10:29:12 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed,  9 Sep 2009 10:29:12 +0000 (UTC)
Subject: rpms/easystroke/F-11 .cvsignore, 1.4, 1.5 easystroke.spec, 1.3,
	1.4 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090909102912.95F6811C00CE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/easystroke/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19020/F-11

Modified Files:
	.cvsignore easystroke.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 06:23:51 -0000	1.4
+++ .cvsignore	9 Sep 2009 10:29:12 -0000	1.5
@@ -1 +1 @@
-easystroke-0.4.6.tar.gz
+easystroke-0.4.9.tar.gz


Index: easystroke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-11/easystroke.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- easystroke.spec	29 Jun 2009 06:23:52 -0000	1.3
+++ easystroke.spec	9 Sep 2009 10:29:12 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           easystroke
-Version:        0.4.6
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Gesture-recognition application for X11
 
@@ -7,8 +7,7 @@ Group:          User Interface/X Hardwar
 License:        ISC
 URL:            http://easystroke.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/easystroke/%{name}-%{version}.tar.gz
-#Patch to compile with gcc 4.3.0
-#Patch0:         easystroke-0.4.5-gcc.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel
@@ -28,7 +27,6 @@ execute shell commands, hold down modifi
 
 %prep
 %setup -q
-#%patch0 -p1 -b .gcc
 # Resolve debuginfo
 sed -i 's|install -Ds|install -D|' Makefile
 # Preserve timestamps:
@@ -75,6 +73,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Sep 09 2009 Zarko Pintar <zarko.pintar at gmail.com> - 0.4.9-1
+- new version
+
 * Wed Jun 29 2009 Zarko Pintar <zarko.pintar at gmail.com> - 0.4.6-1
 - new version
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jun 2009 06:23:52 -0000	1.3
+++ import.log	9 Sep 2009 10:29:12 -0000	1.4
@@ -1,3 +1,4 @@
 easystroke-0_4_4-3_fc11:F-11:easystroke-0.4.4-3.fc11.src.rpm:1243923850
 easystroke-0_4_5-1_fc10:F-11:easystroke-0.4.5-1.fc10.src.rpm:1244061134
 easystroke-0_4_6-1_fc11:F-11:easystroke-0.4.6-1.fc11.src.rpm:1246256769
+easystroke-0_4_9-1_fc11:F-11:easystroke-0.4.9-1.fc11.src.rpm:1252492204


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jun 2009 06:23:52 -0000	1.4
+++ sources	9 Sep 2009 10:29:12 -0000	1.5
@@ -1 +1 @@
-fed6248fa792ce6cfa39a4d57b135321  easystroke-0.4.6.tar.gz
+4d95a69a29a7fb57468044df4570e665  easystroke-0.4.9.tar.gz



From grof at fedoraproject.org  Wed Sep  9 10:34:53 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed,  9 Sep 2009 10:34:53 +0000 (UTC)
Subject: rpms/easystroke/F-10 .cvsignore, 1.4, 1.5 easystroke.spec, 1.3,
	1.4 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090909103453.46C9F11C00CE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/easystroke/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20245/F-10

Modified Files:
	.cvsignore easystroke.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 06:31:13 -0000	1.4
+++ .cvsignore	9 Sep 2009 10:34:52 -0000	1.5
@@ -1 +1 @@
-easystroke-0.4.6.tar.gz
+easystroke-0.4.9.tar.gz


Index: easystroke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-10/easystroke.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- easystroke.spec	29 Jun 2009 06:31:13 -0000	1.3
+++ easystroke.spec	9 Sep 2009 10:34:53 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           easystroke
-Version:        0.4.6
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Gesture-recognition application for X11
 
@@ -7,8 +7,7 @@ Group:          User Interface/X Hardwar
 License:        ISC
 URL:            http://easystroke.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/easystroke/%{name}-%{version}.tar.gz
-#Patch to compile with gcc 4.3.0
-#Patch0:         easystroke-0.4.5-gcc.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel
@@ -28,7 +27,6 @@ execute shell commands, hold down modifi
 
 %prep
 %setup -q
-#%patch0 -p1 -b .gcc
 # Resolve debuginfo
 sed -i 's|install -Ds|install -D|' Makefile
 # Preserve timestamps:
@@ -75,6 +73,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Sep 09 2009 Zarko Pintar <zarko.pintar at gmail.com> - 0.4.9-1
+- new version
+
 * Wed Jun 29 2009 Zarko Pintar <zarko.pintar at gmail.com> - 0.4.6-1
 - new version
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jun 2009 06:31:13 -0000	1.3
+++ import.log	9 Sep 2009 10:34:53 -0000	1.4
@@ -1,3 +1,4 @@
 easystroke-0_4_4-3_fc11:F-10:easystroke-0.4.4-3.fc11.src.rpm:1243923972
 easystroke-0_4_5-1_fc10:F-10:easystroke-0.4.5-1.fc10.src.rpm:1244061222
 easystroke-0_4_6-1_fc11:F-10:easystroke-0.4.6-1.fc11.src.rpm:1246257000
+easystroke-0_4_9-1_fc11:F-10:easystroke-0.4.9-1.fc11.src.rpm:1252492543


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/easystroke/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jun 2009 06:31:13 -0000	1.4
+++ sources	9 Sep 2009 10:34:53 -0000	1.5
@@ -1 +1 @@
-fed6248fa792ce6cfa39a4d57b135321  easystroke-0.4.6.tar.gz
+4d95a69a29a7fb57468044df4570e665  easystroke-0.4.9.tar.gz



From peter at fedoraproject.org  Wed Sep  9 10:45:20 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 10:45:20 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd-decrease_buffers_in_mod_proxy65.patch, 
	NONE, 1.1 ejabberd-fixed_delays_in_s2s.patch, NONE,
	1.1 ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff, NONE,
	1.1 ejabberd-turn_off_error_messages_in_mod_caps.patch, NONE,
	1.1 ejabberd.logrotate, 1.3, 1.4 ejabberd.spec, 1.42,
	1.43 import.log, 1.12, 1.13
Message-ID: <20090909104520.D0DE011C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23138/devel

Modified Files:
	ejabberd.logrotate ejabberd.spec import.log 
Added Files:
	ejabberd-decrease_buffers_in_mod_proxy65.patch 
	ejabberd-fixed_delays_in_s2s.patch 
	ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff 
	ejabberd-turn_off_error_messages_in_mod_caps.patch 
Log Message:
Fixed couple of possible issues and added several patches from Debian

ejabberd-decrease_buffers_in_mod_proxy65.patch:
 mod_proxy65_stream.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-decrease_buffers_in_mod_proxy65.patch ---
Patch by Evgeniy Khramtsov decreases proxy65 buffer sizes (size 65535 is known
to confuse users with tight shapers).

Index: src/mod_proxy65/mod_proxy65_stream.erl
===================================================================
--- src/mod_proxy65/mod_proxy65_stream.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_proxy65/mod_proxy65_stream.erl	2009-04-05 22:51:20.000000000 +0200
@@ -89,8 +89,8 @@
     process_flag(trap_exit, true),
     AuthType = gen_mod:get_opt(auth_type, Opts, anonymous),
     Shaper = gen_mod:get_opt(shaper, Opts, none),
-    RecvBuf = gen_mod:get_opt(recbuf, Opts, 65535),
-    SendBuf = gen_mod:get_opt(sndbuf, Opts, 65535),
+    RecvBuf = gen_mod:get_opt(recbuf, Opts, 8192),
+    SendBuf = gen_mod:get_opt(sndbuf, Opts, 8192),
     TRef = erlang:send_after(?WAIT_TIMEOUT, self(), stop),
     inet:setopts(Socket, [{active, true}, {recbuf, RecvBuf}, {sndbuf, SendBuf}]),
     {ok, wait_for_init, #state{host      = Host,

ejabberd-fixed_delays_in_s2s.patch:
 ejabberd_s2s_in.erl  |    2 +-
 ejabberd_s2s_out.erl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ejabberd-fixed_delays_in_s2s.patch ---
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
server is down it would be reasonable, but what happens much more often is a
network split when the delay is inadmissible).

Index: src/ejabberd_s2s_in.erl
===================================================================
--- src/ejabberd_s2s_in.erl	2009-04-01 17:23:52.000000000 +0200
+++ src/ejabberd_s2s_in.erl	2009-04-05 22:51:20.000000000 +0200
@@ -352,7 +352,7 @@
             case {ejabberd_s2s:allow_host(To, From),
                   lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
                 {true, true} ->
-		    ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
+		    %%ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
 		    ejabberd_s2s_out:start(To, From,
 					   {verify, self(),
 					    Key, StateData#state.streamid}),
Index: src/ejabberd_s2s_out.erl
===================================================================
--- src/ejabberd_s2s_out.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd_s2s_out.erl	2009-04-05 22:51:20.000000000 +0200
@@ -93,7 +93,7 @@
 %% Only change this value if you now what your are doing:
 -define(FSMLIMITS,[]).
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
--define(FSMTIMEOUT, 30000).
+-define(FSMTIMEOUT, 60000).
 
 %% We do not block on send anymore.
 -define(TCP_SEND_TIMEOUT, 15000).
@@ -227,8 +227,8 @@
 	{error, _Reason} ->
 	    ?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
 		      [StateData#state.myname, StateData#state.server]),
-	    wait_before_reconnect(StateData)
-	    %%{stop, normal, StateData}
+	    %%wait_before_reconnect(StateData)
+	    {stop, normal, StateData}
     end;
 open_socket(stop, StateData) ->
     ?INFO_MSG("s2s connection: ~s -> ~s (stopped in open socket)",

ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff:
 ejabberd.app |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff ---
Index: src/ejabberd.app
===================================================================
--- src/ejabberd.app	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd.app	2009-04-05 22:51:20.000000000 +0200
@@ -70,6 +70,7 @@
 	     mod_caps,
 	     mod_configure2,
 	     mod_configure,
+	     mod_ctlextra,
 	     mod_disco,
 	     mod_echo,
 	     mod_http_bind,

ejabberd-turn_off_error_messages_in_mod_caps.patch:
 mod_caps.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-turn_off_error_messages_in_mod_caps.patch ---
Patch by Sergei Golovan turns unnecessary error messages into debug messages.

Index: src/mod_caps.erl
===================================================================
--- src/mod_caps.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_caps.erl	2009-04-05 22:51:20.000000000 +0200
@@ -301,7 +301,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	{error, _} ->
 	    %% XXX: if we get error, we cache empty feature not to probe the client continuously
@@ -315,7 +315,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	    %gen_server:cast(self(), visit_feature_queries),
 	    %?DEBUG("Error IQ reponse from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ejabberd.logrotate	24 May 2008 18:16:55 -0000	1.3
+++ ejabberd.logrotate	9 Sep 2009 10:45:20 -0000	1.4
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
+    runuser -s /bin/bash - ejabberd -c "/usr/sbin/ejabberdctl reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- ejabberd.spec	27 Aug 2009 07:26:55 -0000	1.42
+++ ejabberd.spec	9 Sep 2009 10:45:20 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -34,6 +34,14 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 # CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
+# Mention mod_ctlextra as an ejabberd module
+Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
+# Turn off unnecessary error messages in mod_caps (backport from upstream)
+Patch6: ejabberd-turn_off_error_messages_in_mod_caps.patch
+# Decrease mod_proxy65 send/receive buffers (backport from upstream)
+Patch7: ejabberd-decrease_buffers_in_mod_proxy65.patch
+# fixed delays in s2s connections
+Patch8: ejabberd-fixed_delays_in_s2s.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,8 +92,8 @@ Documentation for ejabberd.
 if [ ! -f ejabberd.pem ]
 then
     echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
-    HOSTNAME=$(hostname -s)
-    DOMAINNAME=$(hostname -d)
+    HOSTNAME=$(hostname -s 2>/dev/null || echo "localhost")
+    DOMAINNAME=$(hostname -d 2>/dev/null || echo "localdomain")
     openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
                 -keyout ejabberd.pem > /dev/null 2>&1 <<+++
 .
@@ -117,6 +125,11 @@ fi
 %patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
+%patch5 -p0 -b .mod_ctlextra
+%patch6 -p0 -b .error_msg
+%patch7 -p0 -b .decrease_buffers
+%patch8 -p0 -b .s2s
+
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -218,6 +231,11 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-8
+- Fixed possible issue in the config file for logrotate
+- Fixed possible issue while creating dummy certificate
+- Added patches #5,6,7,8 from Debian
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	25 Aug 2009 19:36:29 -0000	1.12
+++ import.log	9 Sep 2009 10:45:20 -0000	1.13
@@ -10,3 +10,4 @@ ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
 ejabberd-2_0_5-3_fc10:HEAD:ejabberd-2.0.5-3.fc10.src.rpm:1240304532
 ejabberd-2_0_5-6_fc11:HEAD:ejabberd-2.0.5-6.fc11.src.rpm:1251228870
+ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.5-8.fc11.src.rpm:1252493017



From peter at fedoraproject.org  Wed Sep  9 10:47:02 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 10:47:02 +0000 (UTC)
Subject: rpms/ejabberd/F-11 ejabberd-decrease_buffers_in_mod_proxy65.patch, 
	NONE, 1.1 ejabberd-fixed_delays_in_s2s.patch, NONE,
	1.1 ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff, NONE,
	1.1 ejabberd-turn_off_error_messages_in_mod_caps.patch, NONE,
	1.1 ejabberd.logrotate, 1.3, 1.4 ejabberd.spec, 1.39,
	1.40 import.log, 1.12, 1.13
Message-ID: <20090909104702.BEAB711C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23766/F-11

Modified Files:
	ejabberd.logrotate ejabberd.spec import.log 
Added Files:
	ejabberd-decrease_buffers_in_mod_proxy65.patch 
	ejabberd-fixed_delays_in_s2s.patch 
	ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff 
	ejabberd-turn_off_error_messages_in_mod_caps.patch 
Log Message:
Fixed couple of possible issues and added several patches from Debian

ejabberd-decrease_buffers_in_mod_proxy65.patch:
 mod_proxy65_stream.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-decrease_buffers_in_mod_proxy65.patch ---
Patch by Evgeniy Khramtsov decreases proxy65 buffer sizes (size 65535 is known
to confuse users with tight shapers).

Index: src/mod_proxy65/mod_proxy65_stream.erl
===================================================================
--- src/mod_proxy65/mod_proxy65_stream.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_proxy65/mod_proxy65_stream.erl	2009-04-05 22:51:20.000000000 +0200
@@ -89,8 +89,8 @@
     process_flag(trap_exit, true),
     AuthType = gen_mod:get_opt(auth_type, Opts, anonymous),
     Shaper = gen_mod:get_opt(shaper, Opts, none),
-    RecvBuf = gen_mod:get_opt(recbuf, Opts, 65535),
-    SendBuf = gen_mod:get_opt(sndbuf, Opts, 65535),
+    RecvBuf = gen_mod:get_opt(recbuf, Opts, 8192),
+    SendBuf = gen_mod:get_opt(sndbuf, Opts, 8192),
     TRef = erlang:send_after(?WAIT_TIMEOUT, self(), stop),
     inet:setopts(Socket, [{active, true}, {recbuf, RecvBuf}, {sndbuf, SendBuf}]),
     {ok, wait_for_init, #state{host      = Host,

ejabberd-fixed_delays_in_s2s.patch:
 ejabberd_s2s_in.erl  |    2 +-
 ejabberd_s2s_out.erl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ejabberd-fixed_delays_in_s2s.patch ---
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
server is down it would be reasonable, but what happens much more often is a
network split when the delay is inadmissible).

Index: src/ejabberd_s2s_in.erl
===================================================================
--- src/ejabberd_s2s_in.erl	2009-04-01 17:23:52.000000000 +0200
+++ src/ejabberd_s2s_in.erl	2009-04-05 22:51:20.000000000 +0200
@@ -352,7 +352,7 @@
             case {ejabberd_s2s:allow_host(To, From),
                   lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
                 {true, true} ->
-		    ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
+		    %%ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
 		    ejabberd_s2s_out:start(To, From,
 					   {verify, self(),
 					    Key, StateData#state.streamid}),
Index: src/ejabberd_s2s_out.erl
===================================================================
--- src/ejabberd_s2s_out.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd_s2s_out.erl	2009-04-05 22:51:20.000000000 +0200
@@ -93,7 +93,7 @@
 %% Only change this value if you now what your are doing:
 -define(FSMLIMITS,[]).
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
--define(FSMTIMEOUT, 30000).
+-define(FSMTIMEOUT, 60000).
 
 %% We do not block on send anymore.
 -define(TCP_SEND_TIMEOUT, 15000).
@@ -227,8 +227,8 @@
 	{error, _Reason} ->
 	    ?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
 		      [StateData#state.myname, StateData#state.server]),
-	    wait_before_reconnect(StateData)
-	    %%{stop, normal, StateData}
+	    %%wait_before_reconnect(StateData)
+	    {stop, normal, StateData}
     end;
 open_socket(stop, StateData) ->
     ?INFO_MSG("s2s connection: ~s -> ~s (stopped in open socket)",

ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff:
 ejabberd.app |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff ---
Index: src/ejabberd.app
===================================================================
--- src/ejabberd.app	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd.app	2009-04-05 22:51:20.000000000 +0200
@@ -70,6 +70,7 @@
 	     mod_caps,
 	     mod_configure2,
 	     mod_configure,
+	     mod_ctlextra,
 	     mod_disco,
 	     mod_echo,
 	     mod_http_bind,

ejabberd-turn_off_error_messages_in_mod_caps.patch:
 mod_caps.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-turn_off_error_messages_in_mod_caps.patch ---
Patch by Sergei Golovan turns unnecessary error messages into debug messages.

Index: src/mod_caps.erl
===================================================================
--- src/mod_caps.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_caps.erl	2009-04-05 22:51:20.000000000 +0200
@@ -301,7 +301,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	{error, _} ->
 	    %% XXX: if we get error, we cache empty feature not to probe the client continuously
@@ -315,7 +315,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	    %gen_server:cast(self(), visit_feature_queries),
 	    %?DEBUG("Error IQ reponse from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ejabberd.logrotate	24 May 2008 18:16:55 -0000	1.3
+++ ejabberd.logrotate	9 Sep 2009 10:47:02 -0000	1.4
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
+    runuser -s /bin/bash - ejabberd -c "/usr/sbin/ejabberdctl reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ejabberd.spec	25 Aug 2009 19:38:53 -0000	1.39
+++ ejabberd.spec	9 Sep 2009 10:47:02 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -34,6 +34,14 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 # CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
+# Mention mod_ctlextra as an ejabberd module
+Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
+# Turn off unnecessary error messages in mod_caps (backport from upstream)
+Patch6: ejabberd-turn_off_error_messages_in_mod_caps.patch
+# Decrease mod_proxy65 send/receive buffers (backport from upstream)
+Patch7: ejabberd-decrease_buffers_in_mod_proxy65.patch
+# fixed delays in s2s connections
+Patch8: ejabberd-fixed_delays_in_s2s.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,8 +92,8 @@ Documentation for ejabberd.
 if [ ! -f ejabberd.pem ]
 then
     echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
-    HOSTNAME=$(hostname -s)
-    DOMAINNAME=$(hostname -d)
+    HOSTNAME=$(hostname -s 2>/dev/null || echo "localhost")
+    DOMAINNAME=$(hostname -d 2>/dev/null || echo "localdomain")
     openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
                 -keyout ejabberd.pem > /dev/null 2>&1 <<+++
 .
@@ -117,6 +125,11 @@ fi
 %patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
+%patch5 -p0 -b .mod_ctlextra
+%patch6 -p0 -b .error_msg
+%patch7 -p0 -b .decrease_buffers
+%patch8 -p0 -b .s2s
+
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -218,12 +231,17 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
-- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-8
+- Fixed possible issue in the config file for logrotate
+- Fixed possible issue while creating dummy certificate
+- Added patches #5,6,7,8 from Debian
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
 - rebuilt with new openssl
 
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	25 Aug 2009 19:38:53 -0000	1.12
+++ import.log	9 Sep 2009 10:47:02 -0000	1.13
@@ -10,3 +10,4 @@ ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
 ejabberd-2_0_5-3_fc10:F-11:ejabberd-2.0.5-3.fc10.src.rpm:1240304713
 ejabberd-2_0_5-6_fc11:F-11:ejabberd-2.0.5-6.fc11.src.rpm:1251229070
+ejabberd-2_0_5-8_fc11:F-11:ejabberd-2.0.5-8.fc11.src.rpm:1252493180



From peter at fedoraproject.org  Wed Sep  9 10:49:05 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 10:49:05 +0000 (UTC)
Subject: rpms/ejabberd/F-10 ejabberd-decrease_buffers_in_mod_proxy65.patch, 
	NONE, 1.1 ejabberd-fixed_delays_in_s2s.patch, NONE,
	1.1 ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff, NONE,
	1.1 ejabberd-turn_off_error_messages_in_mod_caps.patch, NONE,
	1.1 ejabberd.logrotate, 1.3, 1.4 ejabberd.spec, 1.37,
	1.38 import.log, 1.12, 1.13
Message-ID: <20090909104905.1AA2711C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25123/F-10

Modified Files:
	ejabberd.logrotate ejabberd.spec import.log 
Added Files:
	ejabberd-decrease_buffers_in_mod_proxy65.patch 
	ejabberd-fixed_delays_in_s2s.patch 
	ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff 
	ejabberd-turn_off_error_messages_in_mod_caps.patch 
Log Message:
Fixed couple of possible issues and added several patches from Debian

ejabberd-decrease_buffers_in_mod_proxy65.patch:
 mod_proxy65_stream.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-decrease_buffers_in_mod_proxy65.patch ---
Patch by Evgeniy Khramtsov decreases proxy65 buffer sizes (size 65535 is known
to confuse users with tight shapers).

Index: src/mod_proxy65/mod_proxy65_stream.erl
===================================================================
--- src/mod_proxy65/mod_proxy65_stream.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_proxy65/mod_proxy65_stream.erl	2009-04-05 22:51:20.000000000 +0200
@@ -89,8 +89,8 @@
     process_flag(trap_exit, true),
     AuthType = gen_mod:get_opt(auth_type, Opts, anonymous),
     Shaper = gen_mod:get_opt(shaper, Opts, none),
-    RecvBuf = gen_mod:get_opt(recbuf, Opts, 65535),
-    SendBuf = gen_mod:get_opt(sndbuf, Opts, 65535),
+    RecvBuf = gen_mod:get_opt(recbuf, Opts, 8192),
+    SendBuf = gen_mod:get_opt(sndbuf, Opts, 8192),
     TRef = erlang:send_after(?WAIT_TIMEOUT, self(), stop),
     inet:setopts(Socket, [{active, true}, {recbuf, RecvBuf}, {sndbuf, SendBuf}]),
     {ok, wait_for_init, #state{host      = Host,

ejabberd-fixed_delays_in_s2s.patch:
 ejabberd_s2s_in.erl  |    2 +-
 ejabberd_s2s_out.erl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ejabberd-fixed_delays_in_s2s.patch ---
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
server is down it would be reasonable, but what happens much more often is a
network split when the delay is inadmissible).

Index: src/ejabberd_s2s_in.erl
===================================================================
--- src/ejabberd_s2s_in.erl	2009-04-01 17:23:52.000000000 +0200
+++ src/ejabberd_s2s_in.erl	2009-04-05 22:51:20.000000000 +0200
@@ -352,7 +352,7 @@
             case {ejabberd_s2s:allow_host(To, From),
                   lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
                 {true, true} ->
-		    ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
+		    %%ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
 		    ejabberd_s2s_out:start(To, From,
 					   {verify, self(),
 					    Key, StateData#state.streamid}),
Index: src/ejabberd_s2s_out.erl
===================================================================
--- src/ejabberd_s2s_out.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd_s2s_out.erl	2009-04-05 22:51:20.000000000 +0200
@@ -93,7 +93,7 @@
 %% Only change this value if you now what your are doing:
 -define(FSMLIMITS,[]).
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
--define(FSMTIMEOUT, 30000).
+-define(FSMTIMEOUT, 60000).
 
 %% We do not block on send anymore.
 -define(TCP_SEND_TIMEOUT, 15000).
@@ -227,8 +227,8 @@
 	{error, _Reason} ->
 	    ?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
 		      [StateData#state.myname, StateData#state.server]),
-	    wait_before_reconnect(StateData)
-	    %%{stop, normal, StateData}
+	    %%wait_before_reconnect(StateData)
+	    {stop, normal, StateData}
     end;
 open_socket(stop, StateData) ->
     ?INFO_MSG("s2s connection: ~s -> ~s (stopped in open socket)",

ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff:
 ejabberd.app |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff ---
Index: src/ejabberd.app
===================================================================
--- src/ejabberd.app	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd.app	2009-04-05 22:51:20.000000000 +0200
@@ -70,6 +70,7 @@
 	     mod_caps,
 	     mod_configure2,
 	     mod_configure,
+	     mod_ctlextra,
 	     mod_disco,
 	     mod_echo,
 	     mod_http_bind,

ejabberd-turn_off_error_messages_in_mod_caps.patch:
 mod_caps.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-turn_off_error_messages_in_mod_caps.patch ---
Patch by Sergei Golovan turns unnecessary error messages into debug messages.

Index: src/mod_caps.erl
===================================================================
--- src/mod_caps.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_caps.erl	2009-04-05 22:51:20.000000000 +0200
@@ -301,7 +301,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	{error, _} ->
 	    %% XXX: if we get error, we cache empty feature not to probe the client continuously
@@ -315,7 +315,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	    %gen_server:cast(self(), visit_feature_queries),
 	    %?DEBUG("Error IQ reponse from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ejabberd.logrotate	24 May 2008 18:16:55 -0000	1.3
+++ ejabberd.logrotate	9 Sep 2009 10:49:04 -0000	1.4
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
+    runuser -s /bin/bash - ejabberd -c "/usr/sbin/ejabberdctl reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ejabberd.spec	25 Aug 2009 19:41:14 -0000	1.37
+++ ejabberd.spec	9 Sep 2009 10:49:04 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -34,6 +34,14 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 # CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
+# Mention mod_ctlextra as an ejabberd module
+Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
+# Turn off unnecessary error messages in mod_caps (backport from upstream)
+Patch6: ejabberd-turn_off_error_messages_in_mod_caps.patch
+# Decrease mod_proxy65 send/receive buffers (backport from upstream)
+Patch7: ejabberd-decrease_buffers_in_mod_proxy65.patch
+# fixed delays in s2s connections
+Patch8: ejabberd-fixed_delays_in_s2s.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,8 +92,8 @@ Documentation for ejabberd.
 if [ ! -f ejabberd.pem ]
 then
     echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
-    HOSTNAME=$(hostname -s)
-    DOMAINNAME=$(hostname -d)
+    HOSTNAME=$(hostname -s 2>/dev/null || echo "localhost")
+    DOMAINNAME=$(hostname -d 2>/dev/null || echo "localdomain")
     openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
                 -keyout ejabberd.pem > /dev/null 2>&1 <<+++
 .
@@ -117,6 +125,11 @@ fi
 %patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
+%patch5 -p0 -b .mod_ctlextra
+%patch6 -p0 -b .error_msg
+%patch7 -p0 -b .decrease_buffers
+%patch8 -p0 -b .s2s
+
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -218,12 +231,17 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
-- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-8
+- Fixed possible issue in the config file for logrotate
+- Fixed possible issue while creating dummy certificate
+- Added patches #5,6,7,8 from Debian
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
 - rebuilt with new openssl
 
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	25 Aug 2009 19:41:14 -0000	1.12
+++ import.log	9 Sep 2009 10:49:04 -0000	1.13
@@ -10,3 +10,4 @@ ejabberd-2_0_5-1_fc10:F-10:ejabberd-2.0.
 ejabberd-2_0_5-2_fc10:F-10:ejabberd-2.0.5-2.fc10.src.rpm:1238819669
 ejabberd-2_0_5-3_fc10:F-10:ejabberd-2.0.5-3.fc10.src.rpm:1240304980
 ejabberd-2_0_5-6_fc11:F-10:ejabberd-2.0.5-6.fc11.src.rpm:1251229162
+ejabberd-2_0_5-8_fc11:F-10:ejabberd-2.0.5-8.fc11.src.rpm:1252493295



From peter at fedoraproject.org  Wed Sep  9 10:50:46 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 10:50:46 +0000 (UTC)
Subject: rpms/ejabberd/EL-5 ejabberd-decrease_buffers_in_mod_proxy65.patch, 
	NONE, 1.1 ejabberd-fixed_delays_in_s2s.patch, NONE,
	1.1 ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff, NONE,
	1.1 ejabberd-turn_off_error_messages_in_mod_caps.patch, NONE,
	1.1 ejabberd.logrotate, 1.3, 1.4 ejabberd.spec, 1.28,
	1.29 import.log, 1.9, 1.10
Message-ID: <20090909105046.8950411C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25792/EL-5

Modified Files:
	ejabberd.logrotate ejabberd.spec import.log 
Added Files:
	ejabberd-decrease_buffers_in_mod_proxy65.patch 
	ejabberd-fixed_delays_in_s2s.patch 
	ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff 
	ejabberd-turn_off_error_messages_in_mod_caps.patch 
Log Message:
Fixed couple of possible issues and added several patches from Debian

ejabberd-decrease_buffers_in_mod_proxy65.patch:
 mod_proxy65_stream.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-decrease_buffers_in_mod_proxy65.patch ---
Patch by Evgeniy Khramtsov decreases proxy65 buffer sizes (size 65535 is known
to confuse users with tight shapers).

Index: src/mod_proxy65/mod_proxy65_stream.erl
===================================================================
--- src/mod_proxy65/mod_proxy65_stream.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_proxy65/mod_proxy65_stream.erl	2009-04-05 22:51:20.000000000 +0200
@@ -89,8 +89,8 @@
     process_flag(trap_exit, true),
     AuthType = gen_mod:get_opt(auth_type, Opts, anonymous),
     Shaper = gen_mod:get_opt(shaper, Opts, none),
-    RecvBuf = gen_mod:get_opt(recbuf, Opts, 65535),
-    SendBuf = gen_mod:get_opt(sndbuf, Opts, 65535),
+    RecvBuf = gen_mod:get_opt(recbuf, Opts, 8192),
+    SendBuf = gen_mod:get_opt(sndbuf, Opts, 8192),
     TRef = erlang:send_after(?WAIT_TIMEOUT, self(), stop),
     inet:setopts(Socket, [{active, true}, {recbuf, RecvBuf}, {sndbuf, SendBuf}]),
     {ok, wait_for_init, #state{host      = Host,

ejabberd-fixed_delays_in_s2s.patch:
 ejabberd_s2s_in.erl  |    2 +-
 ejabberd_s2s_out.erl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ejabberd-fixed_delays_in_s2s.patch ---
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
server is down it would be reasonable, but what happens much more often is a
network split when the delay is inadmissible).

Index: src/ejabberd_s2s_in.erl
===================================================================
--- src/ejabberd_s2s_in.erl	2009-04-01 17:23:52.000000000 +0200
+++ src/ejabberd_s2s_in.erl	2009-04-05 22:51:20.000000000 +0200
@@ -352,7 +352,7 @@
             case {ejabberd_s2s:allow_host(To, From),
                   lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
                 {true, true} ->
-		    ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
+		    %%ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
 		    ejabberd_s2s_out:start(To, From,
 					   {verify, self(),
 					    Key, StateData#state.streamid}),
Index: src/ejabberd_s2s_out.erl
===================================================================
--- src/ejabberd_s2s_out.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd_s2s_out.erl	2009-04-05 22:51:20.000000000 +0200
@@ -93,7 +93,7 @@
 %% Only change this value if you now what your are doing:
 -define(FSMLIMITS,[]).
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
--define(FSMTIMEOUT, 30000).
+-define(FSMTIMEOUT, 60000).
 
 %% We do not block on send anymore.
 -define(TCP_SEND_TIMEOUT, 15000).
@@ -227,8 +227,8 @@
 	{error, _Reason} ->
 	    ?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
 		      [StateData#state.myname, StateData#state.server]),
-	    wait_before_reconnect(StateData)
-	    %%{stop, normal, StateData}
+	    %%wait_before_reconnect(StateData)
+	    {stop, normal, StateData}
     end;
 open_socket(stop, StateData) ->
     ?INFO_MSG("s2s connection: ~s -> ~s (stopped in open socket)",

ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff:
 ejabberd.app |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff ---
Index: src/ejabberd.app
===================================================================
--- src/ejabberd.app	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd.app	2009-04-05 22:51:20.000000000 +0200
@@ -70,6 +70,7 @@
 	     mod_caps,
 	     mod_configure2,
 	     mod_configure,
+	     mod_ctlextra,
 	     mod_disco,
 	     mod_echo,
 	     mod_http_bind,

ejabberd-turn_off_error_messages_in_mod_caps.patch:
 mod_caps.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-turn_off_error_messages_in_mod_caps.patch ---
Patch by Sergei Golovan turns unnecessary error messages into debug messages.

Index: src/mod_caps.erl
===================================================================
--- src/mod_caps.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_caps.erl	2009-04-05 22:51:20.000000000 +0200
@@ -301,7 +301,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	{error, _} ->
 	    %% XXX: if we get error, we cache empty feature not to probe the client continuously
@@ -315,7 +315,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	    %gen_server:cast(self(), visit_feature_queries),
 	    %?DEBUG("Error IQ reponse from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ejabberd.logrotate	24 May 2008 17:50:18 -0000	1.3
+++ ejabberd.logrotate	9 Sep 2009 10:50:46 -0000	1.4
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
+    runuser -s /bin/bash - ejabberd -c "/usr/sbin/ejabberdctl reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ejabberd.spec	25 Aug 2009 19:46:25 -0000	1.28
+++ ejabberd.spec	9 Sep 2009 10:50:46 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -34,6 +34,14 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 # CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
+# Mention mod_ctlextra as an ejabberd module
+Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
+# Turn off unnecessary error messages in mod_caps (backport from upstream)
+Patch6: ejabberd-turn_off_error_messages_in_mod_caps.patch
+# Decrease mod_proxy65 send/receive buffers (backport from upstream)
+Patch7: ejabberd-decrease_buffers_in_mod_proxy65.patch
+# fixed delays in s2s connections
+Patch8: ejabberd-fixed_delays_in_s2s.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,8 +92,8 @@ Documentation for ejabberd.
 if [ ! -f ejabberd.pem ]
 then
     echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
-    HOSTNAME=$(hostname -s)
-    DOMAINNAME=$(hostname -d)
+    HOSTNAME=$(hostname -s 2>/dev/null || echo "localhost")
+    DOMAINNAME=$(hostname -d 2>/dev/null || echo "localdomain")
     openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
                 -keyout ejabberd.pem > /dev/null 2>&1 <<+++
 .
@@ -117,6 +125,11 @@ fi
 %patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
+%patch5 -p0 -b .mod_ctlextra
+%patch6 -p0 -b .error_msg
+%patch7 -p0 -b .decrease_buffers
+%patch8 -p0 -b .s2s
+
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -218,12 +231,17 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
-- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-8
+- Fixed possible issue in the config file for logrotate
+- Fixed possible issue while creating dummy certificate
+- Added patches #5,6,7,8 from Debian
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
 - rebuilt with new openssl
 
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	25 Aug 2009 19:46:25 -0000	1.9
+++ import.log	9 Sep 2009 10:50:46 -0000	1.10
@@ -7,3 +7,4 @@ ejabberd-2_0_4-1_fc10:EL-5:ejabberd-2.0.
 ejabberd-2_0_5-1_fc10:EL-5:ejabberd-2.0.5-1.fc10.src.rpm:1238790091
 ejabberd-2_0_5-2_fc10:EL-5:ejabberd-2.0.5-2.fc10.src.rpm:1238820305
 ejabberd-2_0_5-6_fc11:EL-5/:ejabberd-2.0.5-6.fc11.src.rpm:1251229535
+ejabberd-2_0_5-8_fc11:EL-5:ejabberd-2.0.5-8.fc11.src.rpm:1252493383



From than at fedoraproject.org  Wed Sep  9 11:01:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Sep 2009 11:01:03 +0000 (UTC)
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.50,1.51
Message-ID: <20090909110103.6E49311C00CE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28542

Modified Files:
	rp-pppoe.spec 
Log Message:
- wrong path to initscript bz#522010
- add remove services in %postun/%preun




Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- rp-pppoe.spec	7 Sep 2009 16:26:58 -0000	1.50
+++ rp-pppoe.spec	9 Sep 2009 11:01:02 -0000	1.51
@@ -64,7 +64,7 @@ install -m 0755 %{SOURCE2} %{buildroot}/
 install -m 0755 %{SOURCE3} %{buildroot}/sbin
 install -m 0755 %{SOURCE4} %{buildroot}/sbin
 install -m 0755 %{SOURCE5} %{buildroot}/sbin
-install -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/etc/rc.d/init.d/pppoe-server
+install -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/rc.d/init.d/pppoe-server
 
 pushd %{buildroot}%{_sbindir}
 ln -s ../../sbin/* .
@@ -80,6 +80,20 @@ rm -rf %{buildroot}/etc/ppp/pppoe.conf \
 %clean
 rm -rf %{buildroot}
 
+%preun
+if [ "$1" = "0" ]; then
+   /sbin/service pppoe-server stop > /dev/null 2>&1
+   /sbin/chkconfig --del pppoe-server
+fi
+exit 0
+
+%postun
+if [ "$1" -ge "1" ]; then
+   /sbin/service pppoe-server condrestart > /dev/null 2>&1
+fi
+exit 0
+
+
 %triggerpostun -- rp-pppoe < 3.2-1
 if [ -f /etc/rc.d/init.d/pppoe ]; then
    rm -f /etc/rc.d/init.d/pppoe
@@ -144,12 +158,16 @@ exit 0
 %doc configs
 %config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
 %config(noreplace) %{_sysconfdir}/ppp/firewall*
-%config(noreplace) %{_sysconfdir}/etc/rc.d/init.d/*
+%config(noreplace) %{_sysconfdir}/rc.d/init.d/*
 /sbin/*
 %{_sbindir}/*
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep 09 2009 Than Ngo <than at redhat.com> - 3.10-5
+- wrong path to initscript bz#522010
+- add remove services in %postun/%preun
+
 * Mon Sep 07 2009 Than Ngo <than at redhat.com> - 3.10-4
 - add feature, save and restore all information about default routes bz#191242
 - add startup script for pppoe-server bz#507123



From hadess at fedoraproject.org  Wed Sep  9 11:02:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Sep 2009 11:02:32 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.121,
	1.122 gnome-settings-daemon-2.26.1-fix-touchpad.patch, 1.1, NONE
Message-ID: <20090909110232.027C711C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28966

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch 
Removed Files:
	gnome-settings-daemon-2.26.1-fix-touchpad.patch 
Log Message:
* Wed Sep 09 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
- Update left-hand touchpad patch


0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch:
 gsd-mouse-manager.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch ---
>From b097ceeb19cee5f3e49311b8f03cf9463caea628 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 9 Sep 2009 11:59:21 +0100
Subject: [PATCH] =?utf-8?q?Bug=C2=A0594617=20-=20Touchpad=20left-handed=20bug=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

1) Don't swap mouse buttons for left-handers on the touchpad (otherwise
a tap would be a right-click)
2) If XInput is supported, don't switch the core pointer to left-handed,
as it would cancel our other settings
---
 plugins/mouse/gsd-mouse-manager.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index b5c96a1..e09d38c 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -84,6 +84,7 @@ static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
 static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
+static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
 
@@ -284,6 +285,14 @@ set_xinput_devices_left_handed (gboolean left_handed)
                     (!xinput_device_has_buttons (&device_info[i])))
                         continue;
 
+		/* If the device is a touchpad, don't swap buttons
+		 * around */
+		device = device_is_touchpad (device_info[i]);
+		if (device != NULL) {
+			XCloseDevice (GDK_DISPLAY (), device);
+			continue;
+		}
+
                 gdk_error_trap_push ();
 
                 device = XOpenDevice (GDK_DISPLAY (), device_info[i].id);
@@ -371,7 +380,10 @@ set_left_handed (GsdMouseManager *manager,
 
 #ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         if (supports_xinput_devices ()) {
+        	/* When XInput support is available, never set the
+        	 * button ordering on the core pointer */
                 set_xinput_devices_left_handed (left_handed);
+                return;
         }
 #endif
 
-- 
1.6.2.5



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- gnome-settings-daemon.spec	8 Sep 2009 02:26:02 -0000	1.121
+++ gnome-settings-daemon.spec	9 Sep 2009 11:02:31 -0000	1.122
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.27.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -29,11 +29,11 @@ BuildRequires:  pulseaudio-libs-devel
 BuildRequires:	libgnomekbd-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	gettext
-BuildRequires:  autoconf, automake, libtool, intltool
 BuildRequires:  fontconfig-devel
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
-#Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=594617
+Patch1:		0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -53,9 +53,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-#%patch12 -p1 -b .lefthand-touchpad
-
-autoreconf -i -f
+%patch1 -p1 -b .lefthand-touchpad
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -167,6 +165,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Sep 09 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
+- Update left-hand touchpad patch
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


--- gnome-settings-daemon-2.26.1-fix-touchpad.patch DELETED ---



From than at fedoraproject.org  Wed Sep  9 11:05:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Sep 2009 11:05:45 +0000 (UTC)
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.51,1.52
Message-ID: <20090909110545.6A27111C00CE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29842

Modified Files:
	rp-pppoe.spec 
Log Message:
rebuilt



Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- rp-pppoe.spec	9 Sep 2009 11:01:02 -0000	1.51
+++ rp-pppoe.spec	9 Sep 2009 11:05:45 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -164,6 +164,9 @@ exit 0
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep 09 2009 Than Ngo <than at redhat.com> - 3.10-6
+- rebuilt
+
 * Wed Sep 09 2009 Than Ngo <than at redhat.com> - 3.10-5
 - wrong path to initscript bz#522010
 - add remove services in %postun/%preun



From hadess at fedoraproject.org  Wed Sep  9 11:24:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Sep 2009 11:24:53 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.122, 
	1.123
Message-ID: <20090909112453.488C011C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4414

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Add missing intltool BR


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- gnome-settings-daemon.spec	9 Sep 2009 11:02:31 -0000	1.122
+++ gnome-settings-daemon.spec	9 Sep 2009 11:24:53 -0000	1.123
@@ -28,7 +28,7 @@ BuildRequires:	gstreamer-plugins-base-de
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:	libgnomekbd-devel
 BuildRequires:	libnotify-devel
-BuildRequires:	gettext
+BuildRequires:	gettext intltool
 BuildRequires:  fontconfig-devel
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639



From perex at fedoraproject.org  Wed Sep  9 11:59:19 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  9 Sep 2009 11:59:19 +0000 (UTC)
Subject: rpms/alsa-lib/F-11 alsa-lib-1.0.21-dmix-conf.patch, NONE,
	1.1 alsa-lib-1.0.21-revert-hook.patch, NONE, 1.1 alsa-lib.spec,
	1.85, 1.86
Message-ID: <20090909115919.586FD11C00CE@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-serv13238

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.patch 
Log Message:
alsa-lib: fix bug#521988

alsa-lib-1.0.21-dmix-conf.patch:
 dmix.conf |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE alsa-lib-1.0.21-dmix-conf.patch ---
>From 1f126fd7c6ef37b04ad745609bbebf0dbbf2e1fd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:38:11 +0200
Subject: [PATCH] Change dmix.conf to accept user configuration from defaults.dmix.<driver_id>.xxx

An attempt to fix problem described in reverted patch "Fix driver conf
parsing in snd_config_hook_load_for_all_cards()".

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/conf/pcm/dmix.conf |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 4108ddb..e62cb29 100644
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -63,12 +63,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.period_size"
+					".period_size"
 				]
 			}
 			default 1024
@@ -78,12 +78,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.period_time"
+					".period_time"
 				]
 			}
 			default -1
@@ -93,12 +93,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.periods"
+					".periods"
 				]
 			}
 			default 16
-- 
1.5.5.1


alsa-lib-1.0.21-revert-hook.patch:
 conf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alsa-lib-1.0.21-revert-hook.patch ---
>From 133819d420d962b6888c280352a5532da93f1a3a Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:24:11 +0200
Subject: [PATCH] Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"

This reverts commit 96da0c842d14b40ce8e37726b259229634b3aa21.

This way of fix brokes card-specific configuration loading.
See http://bugzilla.redhat.com bug#521988 for details.

Appropriate way to handle this problem is to fix the dmix configuration file.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/conf.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index 3f0dfe1..570c90f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3477,8 +3477,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
 			err = snd_determine_driver(card, &fdriver);
 			if (err < 0)
 				return err;
-			if (snd_config_search(root, fdriver, &n) >= 0 &&
-			    snd_config_get_string(n, &driver) >= 0) {
+			if (snd_config_search(root, fdriver, &n) >= 0) {
+				if (snd_config_get_string(n, &driver) < 0)
+					goto __err;
 				assert(driver);
 				while (1) {
 					char *s = strchr(driver, '.');
-- 
1.5.5.1



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- alsa-lib.spec	7 Sep 2009 10:47:15 -0000	1.85
+++ alsa-lib.spec	9 Sep 2009 11:59:19 -0000	1.86
@@ -15,6 +15,8 @@ Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
 Patch5:  alsa-lib-1.0.21-weight.patch
+Patch6:  alsa-lib-1.0.21-revert-hook.patch
+Patch7:  alsa-lib-1.0.21-dmix-conf.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -47,6 +49,8 @@ against the ALSA libraries and interface
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
 %patch5 -p1 -b .weight
+%patch6 -p1 -b .revert
+%patch7 -p1 -b .dmix
 
 %build
 %configure --disable-aload
@@ -96,6 +100,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
+- Fix redhat bug #521988
+
 * Mon Sep  7 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-2
 - Added mixer weight patch for Speaker and Beep controls
 



From perex at fedoraproject.org  Wed Sep  9 12:03:05 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  9 Sep 2009 12:03:05 +0000 (UTC)
Subject: rpms/alsa-lib/F-11 alsa-lib.spec,1.86,1.87
Message-ID: <20090909120305.469E511C00CE@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-serv14152

Modified Files:
	alsa-lib.spec 
Log Message:
alsa-lib: fix bug#521988


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- alsa-lib.spec	9 Sep 2009 11:59:19 -0000	1.86
+++ alsa-lib.spec	9 Sep 2009 12:03:04 -0000	1.87
@@ -6,7 +6,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.21
-Release: 2%{?prever_dot}%{?dist}
+Release: 3%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2



From steved at fedoraproject.org  Wed Sep  9 12:05:12 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed,  9 Sep 2009 12:05:12 +0000 (UTC)
Subject: rpms/nfs-utils/F-11 nfs-utils-1.2.0-permerrors.patch, NONE,
	1.1 nfs-utils.spec, 1.230, 1.231
Message-ID: <20090909120512.D46A511C00CE@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14629

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-permerrors.patch 
Log Message:
Fixed incorrect error given when server is down (bz 521638)


nfs-utils-1.2.0-permerrors.patch:
 stropts.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE nfs-utils-1.2.0-permerrors.patch ---
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-09 08:02:01.000000000 -0400
@@ -573,11 +573,7 @@ static int nfs_try_nfs23mount(struct nfs
 	if (nfs_sys_mount(mi, "nfs", *extra_opts))
 		return 1;
 
-	/*
-	 * The kernel returns EOPNOTSUPP if the RPC bind failed,
-	 * and EPROTONOSUPPORT if the version isn't supported.
-	 */
-	if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
+	if (nfs_is_permanent_error(errno))
 		return 0;
 
 	return nfs_retry_nfs23mount(mi);


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-11/nfs-utils.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- nfs-utils.spec	27 Jul 2009 18:14:37 -0000	1.230
+++ nfs-utils.spec	9 Sep 2009 12:05:12 -0000	1.231
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -23,6 +23,7 @@ Patch01: nfs-utils-1.1.0-smnotify-path.p
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
 Patch100: nfs-utils-1.2.0-nfsd-41vers.patch
+Patch101: nfs-utils-1.2.0-permerrors.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -73,7 +74,10 @@ This package also contains the mount.nfs
 %patch01 -p1
 %patch02 -p1
 
+# 513496 - Upgrading nfs-utils on NFSv4 server kills downstream NFSv4 clients
 %patch100 -p1
+# 521638 - Bogus error when mounting stopped server
+%patch101 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -240,6 +244,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Sep  9 2009 <steved at redhat.com> 1.2.0-5
+- Fixed incorrect error given when server is down (bz 521638)
+
 * Mon Jul 27 2009 <steved at redhat.com> 1.2.0-4
 - Fixed 4.1 versioning problem (bz 513496)
 



From perex at fedoraproject.org  Wed Sep  9 12:09:29 2009
From: perex at fedoraproject.org (perex)
Date: Wed,  9 Sep 2009 12:09:29 +0000 (UTC)
Subject: rpms/alsa-lib/F-10 alsa-lib-1.0.21-dmix-conf.patch, NONE,
	1.1 alsa-lib-1.0.21-revert-hook.patch, NONE,
	1.1 alsa-lib-1.0.21-speaker.patch, NONE, 1.1 alsa-lib.spec, 1.83, 1.84
Message-ID: <20090909120929.ACDDE11C00CE@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-serv15748

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.patch 
	alsa-lib-1.0.21-speaker.patch 
Log Message:
alsa-lib: fix bug #521988

alsa-lib-1.0.21-dmix-conf.patch:
 dmix.conf |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE alsa-lib-1.0.21-dmix-conf.patch ---
>From 1f126fd7c6ef37b04ad745609bbebf0dbbf2e1fd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:38:11 +0200
Subject: [PATCH] Change dmix.conf to accept user configuration from defaults.dmix.<driver_id>.xxx

An attempt to fix problem described in reverted patch "Fix driver conf
parsing in snd_config_hook_load_for_all_cards()".

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/conf/pcm/dmix.conf |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 4108ddb..e62cb29 100644
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -63,12 +63,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.period_size"
+					".period_size"
 				]
 			}
 			default 1024
@@ -78,12 +78,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.period_time"
+					".period_time"
 				]
 			}
 			default -1
@@ -93,12 +93,12 @@ pcm.!dmix {
 			name {
 				@func concat
 				strings [
-					"cards."
+					"defaults.dmix."
 					{
 						@func card_driver
 						card $CARD
 					}
-					".pcm.dmix.periods"
+					".periods"
 				]
 			}
 			default 16
-- 
1.5.5.1


alsa-lib-1.0.21-revert-hook.patch:
 conf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alsa-lib-1.0.21-revert-hook.patch ---
>From 133819d420d962b6888c280352a5532da93f1a3a Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:24:11 +0200
Subject: [PATCH] Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"

This reverts commit 96da0c842d14b40ce8e37726b259229634b3aa21.

This way of fix brokes card-specific configuration loading.
See http://bugzilla.redhat.com bug#521988 for details.

Appropriate way to handle this problem is to fix the dmix configuration file.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/conf.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index 3f0dfe1..570c90f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3477,8 +3477,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
 			err = snd_determine_driver(card, &fdriver);
 			if (err < 0)
 				return err;
-			if (snd_config_search(root, fdriver, &n) >= 0 &&
-			    snd_config_get_string(n, &driver) >= 0) {
+			if (snd_config_search(root, fdriver, &n) >= 0) {
+				if (snd_config_get_string(n, &driver) < 0)
+					goto __err;
 				assert(driver);
 				while (1) {
 					char *s = strchr(driver, '.');
-- 
1.5.5.1


alsa-lib-1.0.21-speaker.patch:
 simple_none.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE alsa-lib-1.0.21-speaker.patch ---
>From ac9de424bc0a896e8e30b5ec176daf924a2cefb2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Mon, 31 Aug 2009 16:41:12 +0200
Subject: [PATCH] mixer: Add Speaker and Beep names to the weight list

Added strings "Speaker" and "Beep" to the weight list so that the entries
appear in more appropriate positions.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 src/mixer/simple_none.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 4802200..9259a08 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -134,6 +134,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
 	static const char *const names[] = {
 		"Master",
 		"Headphone",
+		"Speaker",
 		"Tone",
 		"Bass",
 		"Treble",
@@ -158,6 +159,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
 		"I2S",
 		"IEC958",
 		"PC Speaker",
+		"Beep",
 		"Aux",
 		"Mono",
 		"Playback",
-- 
1.5.5.1



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/alsa-lib.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- alsa-lib.spec	2 Sep 2009 08:40:53 -0000	1.83
+++ alsa-lib.spec	9 Sep 2009 12:09:29 -0000	1.84
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -13,6 +13,9 @@ Source10: asound.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
+Patch10: alsa-lib-1.0.21-speaker.patch
+Patch11: alsa-lib-1.0.21-revert-hook.patch
+Patch12: alsa-lib-1.0.21-dmix-conf.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -44,6 +47,9 @@ against the ALSA libraries and interface
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
+%patch10 -p1 -b .speaker
+%patch11 -p1 -b .revert-hook
+%patch12 -p1 -b .dmix-conf
 
 %build
 %configure --disable-aload
@@ -93,6 +99,10 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+
+* Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-2
+- Fix redhat bug #521988
+
 * Wed Sep  2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
 - Updated to 1.0.21 final
 



From pkgdb at fedoraproject.org  Wed Sep  9 12:37:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:37:52 +0000
Subject: [pkgdb] bsf had acl change status
Message-ID: <20090909123752.4AA5A10F85E@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on bsf (Fedora devel) to Approved for choeger

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 12:37:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:37:53 +0000
Subject: [pkgdb] bsf had acl change status
Message-ID: <20090909123753.EEAFE10F87A@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on bsf (Fedora devel) to Approved for choeger

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 12:37:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:37:59 +0000
Subject: [pkgdb] bsf had acl change status
Message-ID: <20090909123759.2152410F894@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on bsf (Fedora 11) to Approved for choeger

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 12:38:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:38:01 +0000
Subject: [pkgdb] bsf had acl change status
Message-ID: <20090909123801.7284610F89A@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on bsf (Fedora 11) to Approved for choeger

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bsf



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:17 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124217.75BE410F86F@bastion2.fedora.phx.redhat.com>

pvrabec has set the watchcommits acl on sectool (Fedora devel) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:18 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124218.380F010F890@bastion2.fedora.phx.redhat.com>

pvrabec has set the watchbugzilla acl on sectool (Fedora devel) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:19 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124219.4037010F895@bastion2.fedora.phx.redhat.com>

pvrabec has set the commit acl on sectool (Fedora devel) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:24 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124224.CB81910F89B@bastion2.fedora.phx.redhat.com>

pvrabec has set the approveacls acl on sectool (Fedora devel) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:31 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124231.9C25310F89D@bastion2.fedora.phx.redhat.com>

pvrabec has set the watchbugzilla acl on sectool (Fedora 11) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:32 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124232.A43CC10F8A1@bastion2.fedora.phx.redhat.com>

pvrabec has set the watchcommits acl on sectool (Fedora 11) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:33 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124233.809F910F8A4@bastion2.fedora.phx.redhat.com>

pvrabec has set the commit acl on sectool (Fedora 11) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:42:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:42:34 +0000
Subject: [pkgdb] sectool had acl change status
Message-ID: <20090909124234.69F0D10F8A8@bastion2.fedora.phx.redhat.com>

pvrabec has set the approveacls acl on sectool (Fedora 11) to Approved for mbarabas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sectool



From pkgdb at fedoraproject.org  Wed Sep  9 12:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:47:05 +0000
Subject: [pkgdb] gnu-getopt had acl change status
Message-ID: <20090909124705.8FA1A10F86F@bastion2.fedora.phx.redhat.com>

fnasser has set the watchcommits acl on gnu-getopt (Fedora devel) to Approved for dwalluck

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Wed Sep  9 12:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:47:12 +0000
Subject: [pkgdb] gnu-getopt had acl change status
Message-ID: <20090909124713.0197310F890@bastion2.fedora.phx.redhat.com>

fnasser has set the watchbugzilla acl on gnu-getopt (Fedora devel) to Approved for dwalluck

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Wed Sep  9 12:47:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:47:14 +0000
Subject: [pkgdb] gnu-getopt had acl change status
Message-ID: <20090909124714.B7F3710F896@bastion2.fedora.phx.redhat.com>

fnasser has set the commit acl on gnu-getopt (Fedora devel) to Approved for dwalluck

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Wed Sep  9 12:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:47:16 +0000
Subject: [pkgdb] gnu-getopt had acl change status
Message-ID: <20090909124716.A7B3010F89D@bastion2.fedora.phx.redhat.com>

fnasser has set the approveacls acl on gnu-getopt (Fedora devel) to Approved for dwalluck

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnu-getopt



From pkgdb at fedoraproject.org  Wed Sep  9 12:52:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:52:00 +0000
Subject: [pkgdb] jakarta-commons-el: akurtakov has requested watchcommits
Message-ID: <20090909125200.8C8D010F86F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on jakarta-commons-el (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el



From pkgdb at fedoraproject.org  Wed Sep  9 12:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:52:01 +0000
Subject: [pkgdb] jakarta-commons-el: akurtakov has requested watchbugzilla
Message-ID: <20090909125201.225F110F88A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on jakarta-commons-el (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el



From pkgdb at fedoraproject.org  Wed Sep  9 12:52:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 12:52:03 +0000
Subject: [pkgdb] jakarta-commons-el: akurtakov has requested commit
Message-ID: <20090909125203.2C45410F895@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on jakarta-commons-el (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el



From xhorak at fedoraproject.org  Wed Sep  9 12:53:56 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 12:53:56 +0000 (UTC)
Subject: rpms/firefox/F-10 .cvsignore, 1.103, 1.104 firefox.spec, 1.328,
	1.329 sources, 1.120, 1.121
Message-ID: <20090909125356.DFA0411C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30410

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	3 Aug 2009 22:10:20 -0000	1.103
+++ .cvsignore	9 Sep 2009 12:53:56 -0000	1.104
@@ -4,3 +4,5 @@ firefox-3.0.12-source.tar.bz2
 firefox-langpacks-3.0.12-20090708.tar.bz2
 firefox-3.0.13-source.tar.bz2
 firefox-langpacks-3.0.13-20090731.tar.bz2
+firefox-3.0.14-source.tar.bz2
+firefox-langpacks-3.0.14-20090825.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- firefox.spec	4 Aug 2009 08:59:06 -0000	1.328
+++ firefox.spec	9 Sep 2009 12:53:56 -0000	1.329
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.13
+%define gecko_version 1.9.0.14
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.13
+Version:        3.0.14
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -29,7 +29,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090731.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090825.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -323,6 +323,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.0.14-1
+- Update to 3.0.14
+
 * Tue Aug 4 2009 Martin Stransky <stransky at redhat.com> - 3.0.13-1
 - Update to 3.0.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	4 Aug 2009 08:59:06 -0000	1.120
+++ sources	9 Sep 2009 12:53:56 -0000	1.121
@@ -1,2 +1,2 @@
-a83ef3e4f8807f19a04a18469ac1238a  firefox-langpacks-3.0.13-20090731.tar.bz2
-eb2e69872ef6932de0ee98b102eb1d5b  firefox-3.0.13-source.tar.bz2
+fd867be30a47c9c8a82cf3a266740727  firefox-3.0.14-source.tar.bz2
+d230a7433de4abcda53eab0199b14a95  firefox-langpacks-3.0.14-20090825.tar.bz2



From xhorak at fedoraproject.org  Wed Sep  9 12:58:56 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 12:58:56 +0000 (UTC)
Subject: rpms/firefox/F-11 .cvsignore, 1.99, 1.100 firefox.spec, 1.337,
	1.338 sources, 1.112, 1.113
Message-ID: <20090909125856.38A5511C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1664

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore	3 Aug 2009 21:58:42 -0000	1.99
+++ .cvsignore	9 Sep 2009 12:58:55 -0000	1.100
@@ -4,3 +4,5 @@ firefox-3.5.1-source.tar.bz2
 firefox-langpacks-3.5.1-20090717.tar.bz2
 firefox-3.5.2-source.tar.bz2
 firefox-langpacks-3.5.2-20090803.tar.bz2
+firefox-langpacks-3.5.3-20090907.tar.bz2
+firefox-3.5.3-source.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- firefox.spec	6 Aug 2009 13:07:38 -0000	1.337
+++ firefox.spec	9 Sep 2009 12:58:55 -0000	1.338
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.2
+%define xulrunner_version 1.9.1.3
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,8 +18,8 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.2
-Release:        3%{?dist}
+Version:        3.5.3
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -30,7 +30,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090803.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090907.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -340,6 +340,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.5.3-1
+- Updated to 3.5.3.
+
 * Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-3
 - Fix for #437596 - Firefox needs to register proper name
   for session restore.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	3 Aug 2009 21:58:42 -0000	1.112
+++ sources	9 Sep 2009 12:58:55 -0000	1.113
@@ -1,2 +1,2 @@
-0de7173e45df009f5a2620fcceb010fb  firefox-3.5.2-source.tar.bz2
-3b78b4648ef24f52b4f092dc05f79956  firefox-langpacks-3.5.2-20090803.tar.bz2
+ca167e69180ab1230aea0763da270a95  firefox-3.5.3-source.tar.bz2
+66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2
\ No newline at end of file



From than at fedoraproject.org  Wed Sep  9 13:04:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Sep 2009 13:04:25 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.2-system_ca_certificates.patch, 1.1,
	1.2 qt.spec, 1.324, 1.325
Message-ID: <20090909130425.76E7F11C00CE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3676

Modified Files:
	qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
	qt.spec 
Log Message:
add a correct system_ca_certificates patch


qt-x11-opensource-src-4.5.2-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

Index: qt-x11-opensource-src-4.5.2-system_ca_certificates.patch
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt-x11-opensource-src-4.5.2-system_ca_certificates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.2-system_ca_certificates.patch	8 Sep 2009 18:01:18 -0000	1.1
+++ qt-x11-opensource-src-4.5.2-system_ca_certificates.patch	9 Sep 2009 13:04:25 -0000	1.2
@@ -1,36 +1,42 @@
-diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.ca_bundle qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp
---- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.ca_bundle	2009-09-08 12:30:33.197347131 -0500
-+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp	2009-09-08 12:41:50.295324320 -0500
-@@ -482,11 +482,11 @@ void QSslSocketPrivate::resetDefaultCiph
+diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.me qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp
+--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.me	2009-09-09 14:28:38.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp	2009-09-09 15:00:07.000000000 +0200
+@@ -482,31 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
  
  QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
  {
 -#ifdef QQ_OS_UNIX
++    QFile caBundle;
++
 +#ifdef Q_OS_UNIX
      // Check known locations for the system's default bundle.  ### On Windows,
      // we should use CAPI to find the bundle, and not rely on default unix
      // locations.
 -    const char *standardLocations[] = {"/etc/ssl/certs/",
-+    const char *standardLocations[] = {"/etc/pki/tls/certs/",
- #if 0
-                                        // KDE uses KConfig for its SSL store,
-                                        // but it also stores the bundle at
-@@ -495,13 +495,16 @@ QList<QSslCertificate> QSslSocketPrivate
- #endif
-                                        0};
-     const char **it = standardLocations;
-+    QList<QSslCertificate> certs;
-     QStringList nameFilter;
-     nameFilter << QLatin1String("*.pem") << QLatin1String("*.crt");
-     while (*it) {
+-#if 0
+-                                       // KDE uses KConfig for its SSL store,
+-                                       // but it also stores the bundle at
+-                                       // this location
+-                                       "$HOME/.kde/share/apps/kssl/ca-bundle.crt",
+-#endif
+-                                       0};
+-    const char **it = standardLocations;
+-    QStringList nameFilter;
+-    nameFilter << QLatin1String("*.pem") << QLatin1String("*.crt");
+-    while (*it) {
 -        if (QDirIterator(QLatin1String(*it), nameFilter).hasNext())
 -            return certificatesFromPath(QLatin1String(*it));
-+        QDirIterator certfilesIt(QLatin1String(*it), nameFilter);
-+        while (certfilesIt.hasNext())
-+            certs += QSslCertificate::fromPath(certfilesIt.next());
-         ++it;
-     }
-+    return certs;
+-        ++it;
+-    }
++    caBundle.setFileName(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"));
++    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
++        return QSslCertificate::fromDevice(&caBundle);
  #endif
  
      // Qt provides a default bundle when we cannot detect the system's default
+     // bundle.
+-    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
++    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
+     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
+         return QSslCertificate::fromDevice(&caBundle);
+ 


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- qt.spec	8 Sep 2009 18:01:19 -0000	1.324
+++ qt.spec	9 Sep 2009 13:04:25 -0000	1.325
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -890,6 +890,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Wed Sep 09 2009 Than Ngo <than at redhat.com> - 4.5.2-16
+- add a correct system_ca_certificates patch
+
 * Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-15
 - use system ca-certificates (#521911)
 



From mclasen at fedoraproject.org  Wed Sep  9 13:05:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 13:05:34 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel about-this-computer.desktop, 1.6,
	1.7 gnome-system-monitor.spec, 1.147, 1.148
Message-ID: <20090909130534.7614911C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4061

Modified Files:
	about-this-computer.desktop gnome-system-monitor.spec 
Log Message:
Include new translations for 'About this computer



Index: about-this-computer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/about-this-computer.desktop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- about-this-computer.desktop	9 Oct 2008 18:06:11 -0000	1.6
+++ about-this-computer.desktop	9 Sep 2009 13:05:34 -0000	1.7
@@ -1,52 +1,75 @@
-[Desktop Entry]
-Name=About This Computer
-Name[en]=About This Computer
-Name[cs]=O tomto po??ta?i
-Name[el]=??????? ?? ??? ??????????
-Name[fi]=Tietoja t?st? tietokoneesta
-Name[de]=?ber diesen Computer
-Name[it]=Informazioni sul computer
-Name[ja]=????????????
-Name[pa]=?? ??????? ????
-Name[pl]=Informacje o komputerze
-Name[ro]=Despre acest calculator
-Name[sk]=O tomto po??ta?i
-Name[sr]=? ???? ????????
-Name[sr at latin]=O ovom ra?unaru
-Name[nl]=Over Deze Computer
-Name[sv]=Om den h?r datorn
-Name[es]=Acerca de esta Computadora
-Name[zh_CN]=??????
-Name[zh_TW]=??????
-Name[ta]= ?????? ??????? ?????
-Name[hi]=?? ???????? ?? ???? ???
-Name[mr]=?? ????? ?????
-Name[kn]=? ???? ?????
-Name[te]=? ????????? ???????
+
+[Desktop Entry] 
+Name=About this Computer
+Name[en] =About this Computer
+Name[as] =?? ?????????? ??????
+Name[cs] =O tomto po??ta?i
+Name[el] =???? ??????????
+Name[fi] =Tietoja t?st? tietokoneesta
+Name[fr] =? propos de cet ordinateur
+Name[de] =?ber diesen Computer
+Name[gu] =? ????????? ????
+Name[he] =????? ???? ??
+Name[it] =Informazioni sul computer
+Name[id] =Mengenai Komputer Ini
+Name[ja] =????????????
+Name[ko] =???? ???
+Name[pa] =?? ??????? ????
+Name[pl] =Informacje o komputerze
+Name[ro] =Despre acest calculator
+Name[sk] =O tomto po??ta?i
+Name[sr] =? ???? ????????
+Name[sr at latin] =O ovom ra?unaru
+Name[nl] =Over Deze Computer
+Name[sv] =Om den h?r datorn
+Name[es] =Acerca de esta Computadora
+Name[zh_CN] =??????
+Name[zh_TW] =??????
+Name[ta] = ?????? ??????? ?????
+Name[hi] =?? ???????? ?? ???? ???
+Name[mr] =?? ????? ?????
+Name[kn] =? ???? ?????
+Name[te] =? ????????? ???????
+Name[ml] =? ?????????????? ????????????
+Name[pt_BR] = Sobre este computador
+Name[or] = ??? ??????? ??????
+Name[ru] =?? ???? ??????????
+Name[bn_IN] =????????? ???????
 Comment=Get some basic information about this computer
-Comment[en]=Get some basic information about this computer
-Comment[cs]=Z?kladn? informace o tomto po??ta?i
-Comment[el]=????? ??????? ??????????? ??? ????? ??? ??????????
-Comment[fi]=Perustietoja t?st? tietokoneesta
-Comment[de]=Erhalten Sie Basis-Informationen ?ber dieses System
-Comment[it]=Alcune informazioni di base su questo computer
-Comment[ja]=??????????????????
-Comment[pa]=?? ??????? ???? ??? ????? ??????? ???
-Comment[pl]=Wi?cej informacji o komputerze
-Comment[ro]=Vede?i ni?te informa?ii utile despre acest calculator
-Comment[sk]=Zobrazi? z?kladn? inform?cie o tomto po??ta?i
-Comment[sr]=???????? ??????? ??????????? ? ???? ????????
-Comment[sr at latin]=Saznajte osnovne informacije o ovom ra?unaru
-Comment[nl]=Geef basis informatie weer over deze computer
-Comment[sv]=F? grundl?ggande information om den h?r datorn
-Comment[es]=Obten informaci?n b?sica sobre esta computadora
-Comment[zh_CN]=?????????????
-Comment[zh_TW]=???????????????
-Comment[ta]=?????? ??????? ?????? ??? ???????? ????????
-Comment[hi]=?? ???????? ?? ???? ??? ??? ????? ??????? ????? ????
-Comment[kn]=? ???? ?????? ????? ?????? ??????????? ???????????
-Comment[mr]=?? ????? ????? ????? ??? ?????? ??????? ???
-Comment[te]=? ????????? ??????? ???? ???????? ???????
+Comment[en] =Get some basic information about this computer
+Comment[as] =?? ?????????? ?????? ???? ??? ???? ??? ???
+Comment[cs] =Z?kladn? informace o tomto po??ta?i
+Comment[el] =????? ??????? ??????????? ??? ????? ??? ??????????
+Comment[fi] =Perustietoja t?st? tietokoneesta
+Comment[fr] =Obtenir des informations sommaires sur cet ordinateur
+Comment[de] =Erhalten Sie Basis-Informationen ?ber dieses System
+Comment[gu] =? ????????? ???? ???? ?????? ??????? ?????
+Comment[he] =???? ???? ????? ????? ???? ??
+Comment[it] =Alcune informazioni di base su questo computer
+Comment[id] =Lihat beberapa informasi umum mengenai komputer ini
+Comment[ja] =??????????????????
+Comment[ko] =???? ?? ?? ?? ??
+Comment[pa] =?? ??????? ???? ??? ????? ??????? ???
+Comment[pl] =Wi?cej informacji o komputerze
+Comment[ro] =Vede?i ni?te informa?ii utile despre acest calculator
+Comment[sk] =Zobrazi? z?kladn? inform?cie o tomto po??ta?i
+Comment[sr] =???????? ??????? ??????????? ? ???? ????????
+Comment[sr at latin] =Saznajte osnovne informacije o ovom ra?unaru
+Comment[nl] =Geef basis informatie weer over deze computer
+Comment[sv] =F? grundl?ggande information om den h?r datorn
+Comment[es] =Obten informaci?n b?sica sobre esta computadora
+Comment[zh_CN] =?????????????
+Comment[zh_TW] =???????????????
+Comment[ta] =?????? ??????? ?????? ??? ???????? ????????
+Comment[hi] =?? ???????? ?? ???? ??? ??? ????? ??????? ????? ????
+Comment[kn] =? ???? ?????? ????? ?????? ??????????? ???????????
+Comment[mr] =?? ????? ????? ????? ??? ?????? ??????? ???
+Comment[te] =? ????????? ??????? ???? ???????? ???????
+Comment[ml] = ? ?????????????? ?????????????? ??? ???????? ??????????
+Comment[pt_BR] = Obtenha informa??es b?sicas sobre este computador
+Comment[or] = ??? ??????? ?????? ???? ????? ????? ???? ??????
+Comment[ru] =???????? ???????? ?????????? ?? ???? ??????????
+Comment[bn_IN] =?? ????????? ???????? ???? ????? ???? ???? ???
 Exec=gnome-system-monitor --show-system-tab
 TryExec=gnome-system-monitor
 Icon=computer


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- gnome-system-monitor.spec	22 Aug 2009 22:53:35 -0000	1.147
+++ gnome-system-monitor.spec	9 Sep 2009 13:05:34 -0000	1.148
@@ -12,7 +12,7 @@
 Summary: Process and resource monitor
 Name: gnome-system-monitor
 Version: 2.27.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -155,6 +155,9 @@ scrollkeeper-update -q
 
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-4
+- Include new translations for 'About this computer'
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-3
 - Fix a button image
 - Add a close button to the memmaps dialog



From peter at fedoraproject.org  Wed Sep  9 13:17:30 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 13:17:30 +0000 (UTC)
Subject: rpms/superiotool/devel .cvsignore, 1.12, 1.13 import.log, 1.4,
	1.5 sources, 1.12, 1.13 superiotool-Makefile_cleanup.diff, 1.3,
	1.4 superiotool.spec, 1.17, 1.18
Message-ID: <20090909131730.9D71A11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/superiotool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7127/devel

Modified Files:
	.cvsignore import.log sources 
	superiotool-Makefile_cleanup.diff superiotool.spec 
Log Message:
svn ver. 4623


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Jun 2009 17:23:55 -0000	1.12
+++ .cvsignore	9 Sep 2009 13:17:30 -0000	1.13
@@ -1 +1 @@
-superiotool-4356.tar.bz2
+superiotool-0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Jun 2009 17:23:55 -0000	1.4
+++ import.log	9 Sep 2009 13:17:30 -0000	1.5
@@ -2,3 +2,4 @@ superiotool-0-0_12_20080815svn3511_fc8:H
 superiotool-0-0_14_20081103svn3698_fc9:HEAD:superiotool-0-0.14.20081103svn3698.fc9.src.rpm:1225707133
 superiotool-0-0_15_20090202svn3827_fc10:HEAD:superiotool-0-0.15.20090202svn3827.fc10.src.rpm:1233580062
 superiotool-0-0_17_20090619svn4356_fc11:HEAD:superiotool-0-0.17.20090619svn4356.fc11.src.rpm:1245432176
+superiotool-0-0_20_20090909svn4623_fc11:HEAD:superiotool-0-0.20.20090909svn4623.fc11.src.rpm:1252502199


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Jun 2009 17:23:55 -0000	1.12
+++ sources	9 Sep 2009 13:17:30 -0000	1.13
@@ -1 +1 @@
-fd60cef75f1dbdf0d65b967fcd926b78  superiotool-4356.tar.bz2
+486654c581e923aef13d66701e679c38  superiotool-0.tar.bz2

superiotool-Makefile_cleanup.diff:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: superiotool-Makefile_cleanup.diff
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/devel/superiotool-Makefile_cleanup.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- superiotool-Makefile_cleanup.diff	18 May 2008 08:16:39 -0000	1.3
+++ superiotool-Makefile_cleanup.diff	9 Sep 2009 13:17:30 -0000	1.4
@@ -1,5 +1,7 @@
---- Makefile.Makefile_cleanup	2008-03-17 16:43:48.000000000 +0300
-+++ Makefile	2008-05-18 12:10:51.000000000 +0400
+Index: Makefile
+===================================================================
+--- Makefile	(revision 4628)
++++ Makefile	(working copy)
 @@ -22,14 +22,14 @@
  
  CC      = gcc
@@ -17,15 +19,15 @@
           -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
  
  OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
-@@ -42,9 +42,8 @@
- 	$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
+@@ -48,9 +48,9 @@
  
  install: $(PROGRAM)
--	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
--	mkdir -p $(PREFIX)/share/man/man8
--	$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
-+	$(INSTALL) -p -D $(PROGRAM) $(PREFIX)/sbin/$(PROGRAM)
-+	$(INSTALL) -p -D -m 644 $(PROGRAM).8 $(PREFIX)/share/man/man8/$(PROGRAM).8
+ 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
+-	$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
+-	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
++	$(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
  
  clean:
  	rm -f $(PROGRAM) *.o


Index: superiotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/devel/superiotool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- superiotool.spec	27 Jul 2009 05:07:52 -0000	1.17
+++ superiotool.spec	9 Sep 2009 13:17:30 -0000	1.18
@@ -1,14 +1,14 @@
-%define svnver 4356
+%define svnver 4623
 
 Summary:	Simple program for detecting Super I/O on your mainboard
 Name:		superiotool
 Version:	0
-Release:	0.19.20090619svn%{svnver}%{?dist}
+Release:	0.20.20090909svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool superiotool
-# tar -cjvf superiotool-%{svnver}.tar.bz2 superiotool
-Source0:	superiotool-%{svnver}.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool %{name}-%{version}
+# tar -cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		superiotool-Makefile_cleanup.diff
 URL:		http://www.coreboot.org/Superiotool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ on your mainboard, and it can provide de
 contents of the Super I/O.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -b .Makefile_cleanup
 
 %build
@@ -30,7 +30,7 @@ CFLAGS="%{optflags} -D'SUPERIOTOOL_VERSI
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT/usr install
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.20.20090909svn4623
+- svn ver. 4623
+- Add IT8703F support.
+- Add dump support for SMSC LPC47N252.
+- Add register definitions for all logical devices on the SMSC LPC47U33x.
+- Add dump information for F71862FG and F71863FG.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.19.20090619svn4356
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Wed Sep  9 13:18:25 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 13:18:25 +0000 (UTC)
Subject: rpms/superiotool/F-11 .cvsignore, 1.12, 1.13 import.log, 1.4,
	1.5 sources, 1.12, 1.13 superiotool-Makefile_cleanup.diff, 1.3,
	1.4 superiotool.spec, 1.16, 1.17
Message-ID: <20090909131825.6560511C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/superiotool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7474/F-11

Modified Files:
	.cvsignore import.log sources 
	superiotool-Makefile_cleanup.diff superiotool.spec 
Log Message:
svn ver. 4623


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Jun 2009 17:28:35 -0000	1.12
+++ .cvsignore	9 Sep 2009 13:18:24 -0000	1.13
@@ -1 +1 @@
-superiotool-4356.tar.bz2
+superiotool-0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Jun 2009 17:28:35 -0000	1.4
+++ import.log	9 Sep 2009 13:18:25 -0000	1.5
@@ -2,3 +2,4 @@ superiotool-0-0_12_20080815svn3511_fc8:H
 superiotool-0-0_14_20081103svn3698_fc9:HEAD:superiotool-0-0.14.20081103svn3698.fc9.src.rpm:1225707133
 superiotool-0-0_15_20090202svn3827_fc10:HEAD:superiotool-0-0.15.20090202svn3827.fc10.src.rpm:1233580062
 superiotool-0-0_17_20090619svn4356_fc11:F-11:superiotool-0-0.17.20090619svn4356.fc11.src.rpm:1245432325
+superiotool-0-0_20_20090909svn4623_fc11:F-11:superiotool-0-0.20.20090909svn4623.fc11.src.rpm:1252502283


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Jun 2009 17:28:35 -0000	1.12
+++ sources	9 Sep 2009 13:18:25 -0000	1.13
@@ -1 +1 @@
-fd60cef75f1dbdf0d65b967fcd926b78  superiotool-4356.tar.bz2
+486654c581e923aef13d66701e679c38  superiotool-0.tar.bz2

superiotool-Makefile_cleanup.diff:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: superiotool-Makefile_cleanup.diff
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-11/superiotool-Makefile_cleanup.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- superiotool-Makefile_cleanup.diff	18 May 2008 08:16:39 -0000	1.3
+++ superiotool-Makefile_cleanup.diff	9 Sep 2009 13:18:25 -0000	1.4
@@ -1,5 +1,7 @@
---- Makefile.Makefile_cleanup	2008-03-17 16:43:48.000000000 +0300
-+++ Makefile	2008-05-18 12:10:51.000000000 +0400
+Index: Makefile
+===================================================================
+--- Makefile	(revision 4628)
++++ Makefile	(working copy)
 @@ -22,14 +22,14 @@
  
  CC      = gcc
@@ -17,15 +19,15 @@
           -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
  
  OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
-@@ -42,9 +42,8 @@
- 	$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
+@@ -48,9 +48,9 @@
  
  install: $(PROGRAM)
--	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
--	mkdir -p $(PREFIX)/share/man/man8
--	$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
-+	$(INSTALL) -p -D $(PROGRAM) $(PREFIX)/sbin/$(PROGRAM)
-+	$(INSTALL) -p -D -m 644 $(PROGRAM).8 $(PREFIX)/share/man/man8/$(PROGRAM).8
+ 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
+-	$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
+-	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
++	$(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
  
  clean:
  	rm -f $(PROGRAM) *.o


Index: superiotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-11/superiotool.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- superiotool.spec	28 Jun 2009 19:58:37 -0000	1.16
+++ superiotool.spec	9 Sep 2009 13:18:25 -0000	1.17
@@ -1,14 +1,14 @@
-%define svnver 4356
+%define svnver 4623
 
 Summary:	Simple program for detecting Super I/O on your mainboard
 Name:		superiotool
 Version:	0
-Release:	0.18.20090619svn%{svnver}%{?dist}
+Release:	0.20.20090909svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool superiotool
-# tar -cjvf superiotool-%{svnver}.tar.bz2 superiotool
-Source0:	superiotool-%{svnver}.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool %{name}-%{version}
+# tar -cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		superiotool-Makefile_cleanup.diff
 URL:		http://www.coreboot.org/Superiotool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ on your mainboard, and it can provide de
 contents of the Super I/O.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -b .Makefile_cleanup
 
 %build
@@ -30,7 +30,7 @@ CFLAGS="%{optflags} -D'SUPERIOTOOL_VERSI
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT/usr install
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.20.20090909svn4623
+- svn ver. 4623
+- Add IT8703F support.
+- Add dump support for SMSC LPC47N252.
+- Add register definitions for all logical devices on the SMSC LPC47U33x.
+- Add dump information for F71862FG and F71863FG.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.19.20090619svn4356
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jun 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090619svn4356
 - Fixed URL
 



From peter at fedoraproject.org  Wed Sep  9 13:20:18 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 13:20:18 +0000 (UTC)
Subject: rpms/superiotool/F-10 .cvsignore, 1.12, 1.13 import.log, 1.4,
	1.5 sources, 1.12, 1.13 superiotool-Makefile_cleanup.diff, 1.3,
	1.4 superiotool.spec, 1.15, 1.16
Message-ID: <20090909132019.024E811C043A@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/superiotool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7991/F-10

Modified Files:
	.cvsignore import.log sources 
	superiotool-Makefile_cleanup.diff superiotool.spec 
Log Message:
svn ver. 4623


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Jun 2009 17:30:58 -0000	1.12
+++ .cvsignore	9 Sep 2009 13:20:18 -0000	1.13
@@ -1 +1 @@
-superiotool-4356.tar.bz2
+superiotool-0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Jun 2009 17:30:58 -0000	1.4
+++ import.log	9 Sep 2009 13:20:18 -0000	1.5
@@ -2,3 +2,4 @@ superiotool-0-0_12_20080815svn3511_fc8:H
 superiotool-0-0_14_20081103svn3698_fc9:HEAD:superiotool-0-0.14.20081103svn3698.fc9.src.rpm:1225707133
 superiotool-0-0_15_20090202svn3827_fc10:F-10:superiotool-0-0.15.20090202svn3827.fc10.src.rpm:1233580192
 superiotool-0-0_17_20090619svn4356_fc11:F-10:superiotool-0-0.17.20090619svn4356.fc11.src.rpm:1245432573
+superiotool-0-0_20_20090909svn4623_fc11:F-10:superiotool-0-0.20.20090909svn4623.fc11.src.rpm:1252502372


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Jun 2009 17:30:58 -0000	1.12
+++ sources	9 Sep 2009 13:20:18 -0000	1.13
@@ -1 +1 @@
-fd60cef75f1dbdf0d65b967fcd926b78  superiotool-4356.tar.bz2
+486654c581e923aef13d66701e679c38  superiotool-0.tar.bz2

superiotool-Makefile_cleanup.diff:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: superiotool-Makefile_cleanup.diff
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-10/superiotool-Makefile_cleanup.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- superiotool-Makefile_cleanup.diff	18 May 2008 08:16:39 -0000	1.3
+++ superiotool-Makefile_cleanup.diff	9 Sep 2009 13:20:18 -0000	1.4
@@ -1,5 +1,7 @@
---- Makefile.Makefile_cleanup	2008-03-17 16:43:48.000000000 +0300
-+++ Makefile	2008-05-18 12:10:51.000000000 +0400
+Index: Makefile
+===================================================================
+--- Makefile	(revision 4628)
++++ Makefile	(working copy)
 @@ -22,14 +22,14 @@
  
  CC      = gcc
@@ -17,15 +19,15 @@
           -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
  
  OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
-@@ -42,9 +42,8 @@
- 	$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
+@@ -48,9 +48,9 @@
  
  install: $(PROGRAM)
--	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
--	mkdir -p $(PREFIX)/share/man/man8
--	$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
-+	$(INSTALL) -p -D $(PROGRAM) $(PREFIX)/sbin/$(PROGRAM)
-+	$(INSTALL) -p -D -m 644 $(PROGRAM).8 $(PREFIX)/share/man/man8/$(PROGRAM).8
+ 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
+-	$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
+-	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
++	$(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
  
  clean:
  	rm -f $(PROGRAM) *.o


Index: superiotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/F-10/superiotool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- superiotool.spec	28 Jun 2009 19:58:36 -0000	1.15
+++ superiotool.spec	9 Sep 2009 13:20:18 -0000	1.16
@@ -1,14 +1,14 @@
-%define svnver 4356
+%define svnver 4623
 
 Summary:	Simple program for detecting Super I/O on your mainboard
 Name:		superiotool
 Version:	0
-Release:	0.18.20090619svn%{svnver}%{?dist}
+Release:	0.20.20090909svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool superiotool
-# tar -cjvf superiotool-%{svnver}.tar.bz2 superiotool
-Source0:	superiotool-%{svnver}.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool %{name}-%{version}
+# tar -cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		superiotool-Makefile_cleanup.diff
 URL:		http://www.coreboot.org/Superiotool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ on your mainboard, and it can provide de
 contents of the Super I/O.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -b .Makefile_cleanup
 
 %build
@@ -30,7 +30,7 @@ CFLAGS="%{optflags} -D'SUPERIOTOOL_VERSI
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT/usr install
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.20.20090909svn4623
+- svn ver. 4623
+- Add IT8703F support.
+- Add dump support for SMSC LPC47N252.
+- Add register definitions for all logical devices on the SMSC LPC47U33x.
+- Add dump information for F71862FG and F71863FG.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.19.20090619svn4356
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jun 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090619svn4356
 - Fixed URL
 



From peter at fedoraproject.org  Wed Sep  9 13:21:30 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 13:21:30 +0000 (UTC)
Subject: rpms/superiotool/EL-5 .cvsignore, 1.12, 1.13 import.log, 1.4,
	1.5 sources, 1.12, 1.13 superiotool-Makefile_cleanup.diff, 1.3,
	1.4 superiotool.spec, 1.15, 1.16
Message-ID: <20090909132130.343F111C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/superiotool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8340/EL-5

Modified Files:
	.cvsignore import.log sources 
	superiotool-Makefile_cleanup.diff superiotool.spec 
Log Message:
svn ver. 4623


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Jun 2009 17:37:08 -0000	1.12
+++ .cvsignore	9 Sep 2009 13:21:29 -0000	1.13
@@ -1 +1 @@
-superiotool-4356.tar.bz2
+superiotool-0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Jun 2009 17:37:08 -0000	1.4
+++ import.log	9 Sep 2009 13:21:29 -0000	1.5
@@ -2,3 +2,4 @@ superiotool-0-0_12_20080815svn3511_fc8:E
 superiotool-0-0_14_20081103svn3698_fc9:EL-5:superiotool-0-0.14.20081103svn3698.fc9.src.rpm:1225708425
 superiotool-0-0_15_20090202svn3827_fc10:EL-5:superiotool-0-0.15.20090202svn3827.fc10.src.rpm:1233580453
 superiotool-0-0_17_20090619svn4356_fc11:EL-5:superiotool-0-0.17.20090619svn4356.fc11.src.rpm:1245432980
+superiotool-0-0_20_20090909svn4623_fc11:EL-5:superiotool-0-0.20.20090909svn4623.fc11.src.rpm:1252502457


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Jun 2009 17:37:08 -0000	1.12
+++ sources	9 Sep 2009 13:21:29 -0000	1.13
@@ -1 +1 @@
-fd60cef75f1dbdf0d65b967fcd926b78  superiotool-4356.tar.bz2
+486654c581e923aef13d66701e679c38  superiotool-0.tar.bz2

superiotool-Makefile_cleanup.diff:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: superiotool-Makefile_cleanup.diff
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-5/superiotool-Makefile_cleanup.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- superiotool-Makefile_cleanup.diff	18 May 2008 08:24:01 -0000	1.3
+++ superiotool-Makefile_cleanup.diff	9 Sep 2009 13:21:29 -0000	1.4
@@ -1,5 +1,7 @@
---- Makefile.Makefile_cleanup	2008-03-17 16:43:48.000000000 +0300
-+++ Makefile	2008-05-18 12:10:51.000000000 +0400
+Index: Makefile
+===================================================================
+--- Makefile	(revision 4628)
++++ Makefile	(working copy)
 @@ -22,14 +22,14 @@
  
  CC      = gcc
@@ -17,15 +19,15 @@
           -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
  
  OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
-@@ -42,9 +42,8 @@
- 	$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
+@@ -48,9 +48,9 @@
  
  install: $(PROGRAM)
--	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
--	mkdir -p $(PREFIX)/share/man/man8
--	$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
-+	$(INSTALL) -p -D $(PROGRAM) $(PREFIX)/sbin/$(PROGRAM)
-+	$(INSTALL) -p -D -m 644 $(PROGRAM).8 $(PREFIX)/share/man/man8/$(PROGRAM).8
+ 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
+-	$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
+-	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
++	$(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
  
  clean:
  	rm -f $(PROGRAM) *.o


Index: superiotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-5/superiotool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- superiotool.spec	28 Jun 2009 19:58:36 -0000	1.15
+++ superiotool.spec	9 Sep 2009 13:21:29 -0000	1.16
@@ -1,14 +1,14 @@
-%define svnver 4356
+%define svnver 4623
 
 Summary:	Simple program for detecting Super I/O on your mainboard
 Name:		superiotool
 Version:	0
-Release:	0.18.20090619svn%{svnver}%{?dist}
+Release:	0.20.20090909svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool superiotool
-# tar -cjvf superiotool-%{svnver}.tar.bz2 superiotool
-Source0:	superiotool-%{svnver}.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool %{name}-%{version}
+# tar -cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		superiotool-Makefile_cleanup.diff
 URL:		http://www.coreboot.org/Superiotool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ on your mainboard, and it can provide de
 contents of the Super I/O.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -b .Makefile_cleanup
 
 %build
@@ -30,7 +30,7 @@ CFLAGS="%{optflags} -D'SUPERIOTOOL_VERSI
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT/usr install
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.20.20090909svn4623
+- svn ver. 4623
+- Add IT8703F support.
+- Add dump support for SMSC LPC47N252.
+- Add register definitions for all logical devices on the SMSC LPC47U33x.
+- Add dump information for F71862FG and F71863FG.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.19.20090619svn4356
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jun 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090619svn4356
 - Fixed URL
 



From peter at fedoraproject.org  Wed Sep  9 13:23:11 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 13:23:11 +0000 (UTC)
Subject: rpms/superiotool/EL-4 .cvsignore, 1.12, 1.13 import.log, 1.4,
	1.5 sources, 1.12, 1.13 superiotool-Makefile_cleanup.diff, 1.3,
	1.4 superiotool.spec, 1.15, 1.16
Message-ID: <20090909132311.5340211C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/superiotool/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9496/EL-4

Modified Files:
	.cvsignore import.log sources 
	superiotool-Makefile_cleanup.diff superiotool.spec 
Log Message:
svn ver. 4623


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Jun 2009 17:39:25 -0000	1.12
+++ .cvsignore	9 Sep 2009 13:23:10 -0000	1.13
@@ -1 +1 @@
-superiotool-4356.tar.bz2
+superiotool-0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-4/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Jun 2009 17:39:25 -0000	1.4
+++ import.log	9 Sep 2009 13:23:10 -0000	1.5
@@ -2,3 +2,4 @@ superiotool-0-0_12_20080815svn3511_fc8:E
 superiotool-0-0_14_20081103svn3698_fc9:EL-4:superiotool-0-0.14.20081103svn3698.fc9.src.rpm:1225708588
 superiotool-0-0_15_20090202svn3827_fc10:EL-4:superiotool-0-0.15.20090202svn3827.fc10.src.rpm:1233580551
 superiotool-0-0_17_20090619svn4356_fc11:EL-4:superiotool-0-0.17.20090619svn4356.fc11.src.rpm:1245433088
+superiotool-0-0_20_20090909svn4623_fc11:EL-4:superiotool-0-0.20.20090909svn4623.fc11.src.rpm:1252502541


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Jun 2009 17:39:25 -0000	1.12
+++ sources	9 Sep 2009 13:23:10 -0000	1.13
@@ -1 +1 @@
-fd60cef75f1dbdf0d65b967fcd926b78  superiotool-4356.tar.bz2
+486654c581e923aef13d66701e679c38  superiotool-0.tar.bz2

superiotool-Makefile_cleanup.diff:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: superiotool-Makefile_cleanup.diff
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-4/superiotool-Makefile_cleanup.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- superiotool-Makefile_cleanup.diff	18 May 2008 08:26:18 -0000	1.3
+++ superiotool-Makefile_cleanup.diff	9 Sep 2009 13:23:10 -0000	1.4
@@ -1,5 +1,7 @@
---- Makefile.Makefile_cleanup	2008-03-17 16:43:48.000000000 +0300
-+++ Makefile	2008-05-18 12:10:51.000000000 +0400
+Index: Makefile
+===================================================================
+--- Makefile	(revision 4628)
++++ Makefile	(working copy)
 @@ -22,14 +22,14 @@
  
  CC      = gcc
@@ -17,15 +19,15 @@
           -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
  
  OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
-@@ -42,9 +42,8 @@
- 	$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
+@@ -48,9 +48,9 @@
  
  install: $(PROGRAM)
--	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
--	mkdir -p $(PREFIX)/share/man/man8
--	$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
-+	$(INSTALL) -p -D $(PROGRAM) $(PREFIX)/sbin/$(PROGRAM)
-+	$(INSTALL) -p -D -m 644 $(PROGRAM).8 $(PREFIX)/share/man/man8/$(PROGRAM).8
+ 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
+-	$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
+-	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
++	$(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
  
  clean:
  	rm -f $(PROGRAM) *.o


Index: superiotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/superiotool/EL-4/superiotool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- superiotool.spec	28 Jun 2009 19:58:35 -0000	1.15
+++ superiotool.spec	9 Sep 2009 13:23:11 -0000	1.16
@@ -1,14 +1,14 @@
-%define svnver 4356
+%define svnver 4623
 
 Summary:	Simple program for detecting Super I/O on your mainboard
 Name:		superiotool
 Version:	0
-Release:	0.18.20090619svn%{svnver}%{?dist}
+Release:	0.20.20090909svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool superiotool
-# tar -cjvf superiotool-%{svnver}.tar.bz2 superiotool
-Source0:	superiotool-%{svnver}.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/superiotool %{name}-%{version}
+# tar -cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		superiotool-Makefile_cleanup.diff
 URL:		http://www.coreboot.org/Superiotool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ on your mainboard, and it can provide de
 contents of the Super I/O.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -b .Makefile_cleanup
 
 %build
@@ -30,7 +30,7 @@ CFLAGS="%{optflags} -D'SUPERIOTOOL_VERSI
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT/usr install
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.20.20090909svn4623
+- svn ver. 4623
+- Add IT8703F support.
+- Add dump support for SMSC LPC47N252.
+- Add register definitions for all logical devices on the SMSC LPC47U33x.
+- Add dump information for F71862FG and F71863FG.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.19.20090619svn4356
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jun 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090619svn4356
 - Fixed URL
 



From linville at fedoraproject.org  Wed Sep  9 13:37:51 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  9 Sep 2009 13:37:51 +0000 (UTC)
Subject: rpms/crda/devel .cvsignore, 1.9, 1.10 crda.spec, 1.18, 1.19 sources,
	1.7, 1.8
Message-ID: <20090909133751.AEE8811C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13609

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb to version 2009.09.08 ; Start resetting release number with version updates


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 May 2009 17:43:34 -0000	1.9
+++ .cvsignore	9 Sep 2009 13:37:50 -0000	1.10
@@ -1,2 +1,2 @@
 crda-1.1.0.tar.bz2
-wireless-regdb-2009.04.17.tar.bz2
+wireless-regdb-2009.09.08.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- crda.spec	24 Jul 2009 19:38:22 -0000	1.18
+++ crda.spec	9 Sep 2009 13:37:50 -0000	1.19
@@ -1,9 +1,9 @@
 %define         crda_version    1.1.0
-%define         regdb_version   2009.04.17
+%define         regdb_version   2009.09.08
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        12%{?dist}
+Release:        1%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Wed May 13 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-1
+- Update wireless-regdb to version 2009.09.08 
+- Start resetting release number with version updates
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0_2009.04.17-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 May 2009 17:43:34 -0000	1.7
+++ sources	9 Sep 2009 13:37:50 -0000	1.8
@@ -1,2 +1,2 @@
 6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
-544e3c504026a558d34db685dd1903cb  wireless-regdb-2009.04.17.tar.bz2
+4ba6fa7f1f7d87212f2cd63a1655f702  wireless-regdb-2009.09.08.tar.bz2



From xhorak at fedoraproject.org  Wed Sep  9 13:38:38 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 13:38:38 +0000 (UTC)
Subject: rpms/firefox/F-11 .cvsignore,1.100,1.101 sources,1.113,1.114
Message-ID: <20090909133838.06C6D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13852

Modified Files:
	.cvsignore sources 
Log Message:
Rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	9 Sep 2009 12:58:55 -0000	1.100
+++ .cvsignore	9 Sep 2009 13:38:37 -0000	1.101
@@ -1,8 +1,2 @@
-firefox-3.5-source.tar.bz2
-firefox-langpacks-3.5-20090630.tar.bz2
-firefox-3.5.1-source.tar.bz2
-firefox-langpacks-3.5.1-20090717.tar.bz2
-firefox-3.5.2-source.tar.bz2
-firefox-langpacks-3.5.2-20090803.tar.bz2
 firefox-langpacks-3.5.3-20090907.tar.bz2
 firefox-3.5.3-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources	9 Sep 2009 12:58:55 -0000	1.113
+++ sources	9 Sep 2009 13:38:37 -0000	1.114
@@ -1,2 +1,2 @@
+66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2
 ca167e69180ab1230aea0763da270a95  firefox-3.5.3-source.tar.bz2
-66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2
\ No newline at end of file



From linville at fedoraproject.org  Wed Sep  9 13:39:11 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  9 Sep 2009 13:39:11 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.19,1.20
Message-ID: <20090909133911.967CA11C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14089

Modified Files:
	crda.spec 
Log Message:
correct date in changelog entry


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- crda.spec	9 Sep 2009 13:37:50 -0000	1.19
+++ crda.spec	9 Sep 2009 13:39:11 -0000	1.20
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
-* Wed May 13 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-1
+* Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-1
 - Update wireless-regdb to version 2009.09.08 
 - Start resetting release number with version updates
 



From linville at fedoraproject.org  Wed Sep  9 13:57:03 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  9 Sep 2009 13:57:03 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.20,1.21
Message-ID: <20090909135703.8898D11C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19555

Modified Files:
	crda.spec 
Log Message:
Use kernel-headers instead of kernel-devel


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- crda.spec	9 Sep 2009 13:39:11 -0000	1.20
+++ crda.spec	9 Sep 2009 13:57:03 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -11,7 +11,7 @@ License:        BSD
 URL:            http://www.linuxwireless.org/en/developers/Regulatory/CRDA
 BuildRoot:      %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kernel-devel >= 2.6.27
+BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl-devel >= 1.1
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-2
+- Use kernel-headers instead of kernel-devel
+
 * Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-1
 - Update wireless-regdb to version 2009.09.08 
 - Start resetting release number with version updates



From xhorak at fedoraproject.org  Wed Sep  9 13:58:23 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 13:58:23 +0000 (UTC)
Subject: rpms/epiphany/F-11 epiphany.spec,1.233,1.234
Message-ID: <20090909135823.1618811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20221

Modified Files:
	epiphany.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-4
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-11/epiphany.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- epiphany.spec	3 Aug 2009 23:02:30 -0000	1.233
+++ epiphany.spec	9 Sep 2009 13:58:22 -0000	1.234
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.1.2
+%define gecko_ver 1.9.1.3
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.18.0
 %define gtk2_devel_ver 2.15.1
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.26.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 %define major_version 2.26
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-4
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.3-3
 - Rebuild against newer gecko
 



From linville at fedoraproject.org  Wed Sep  9 14:00:28 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  9 Sep 2009 14:00:28 +0000 (UTC)
Subject: rpms/crda/F-11 .cvsignore, 1.9, 1.10 crda.spec, 1.18, 1.19 sources, 
	1.7, 1.8
Message-ID: <20090909140028.82DCF11C02C8@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20862

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb to version 2009.09.08 ; Start resetting release number with version updates ; Resync nvr with what is in rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 May 2009 17:47:25 -0000	1.9
+++ .cvsignore	9 Sep 2009 14:00:28 -0000	1.10
@@ -1,2 +1,2 @@
 crda-1.1.0.tar.bz2
-wireless-regdb-2009.04.17.tar.bz2
+wireless-regdb-2009.09.08.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/crda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- crda.spec	7 Jun 2009 15:55:44 -0000	1.18
+++ crda.spec	9 Sep 2009 14:00:28 -0000	1.19
@@ -1,9 +1,9 @@
 %define         crda_version    1.1.0
-%define         regdb_version   2009.04.17
+%define         regdb_version   2009.09.08
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        12%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -82,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-2
+- Update wireless-regdb to version 2009.09.08 
+- Start resetting release number with version updates
+- Resync nvr with what is in rawhide
+
 * Sun Jun 07 2009 Dennis Gilmore <dennis at ausil.us> 1.1.0_2009.04.17-12
 - br kerner-headers not kernel-devel  not all arches have kernel-devel
 - kernel-devel is for building kernel modules


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 May 2009 17:47:25 -0000	1.7
+++ sources	9 Sep 2009 14:00:28 -0000	1.8
@@ -1,2 +1,2 @@
 6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
-544e3c504026a558d34db685dd1903cb  wireless-regdb-2009.04.17.tar.bz2
+4ba6fa7f1f7d87212f2cd63a1655f702  wireless-regdb-2009.09.08.tar.bz2



From xhorak at fedoraproject.org  Wed Sep  9 14:03:17 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:03:17 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-11 pcmanx-gtk2.spec,1.14,1.15
Message-ID: <20090909140317.D7A2E11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21638

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-8
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-11/pcmanx-gtk2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pcmanx-gtk2.spec	4 Aug 2009 08:45:27 -0000	1.14
+++ pcmanx-gtk2.spec	9 Sep 2009 14:03:17 -0000	1.15
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.1.2
+%define xulver 1.9.1.3
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-8
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-7
 - Rebuild against newer gecko
 



From ajax at fedoraproject.org  Wed Sep  9 14:03:43 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 14:03:43 +0000 (UTC)
Subject: rpms/kernel/devel drm-connection-cache.patch,NONE,1.1
Message-ID: <20090909140343.EE04311C00CE@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21848

Added Files:
	drm-connection-cache.patch 
Log Message:
test patch, don't mind me

drm-connection-cache.patch:
 drivers/gpu/drm/drm_crtc_helper.c |   12 ++++++++++++
 drivers/gpu/drm/i915/intel_drv.h  |    1 +
 drivers/gpu/drm/i915/intel_lvds.c |    9 ++++++++-
 include/drm/drm_crtc.h            |    1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE drm-connection-cache.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx	2009-09-09 08:57:39.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-09 09:35:24.000000000 -0400
@@ -92,6 +92,18 @@ int drm_helper_probe_single_connector_mo
 
 	connector->status = connector->funcs->detect(connector);
 
+	/* fast path if the driver tracks disconnection */
+	if (connector->status == connector_status_cached) {
+		DRM_DEBUG_KMS("%s still connected\n",
+			      drm_get_connector_name(connector));
+		list_for_each_entry_safe(mode, t, &connector->modes, head) {
+			count++;
+			mode->status = MODE_OK;
+		}
+		connector->status = connector_status_connected;
+		return count;
+	}
+
 	if (connector->status == connector_status_disconnected) {
 		DRM_DEBUG_KMS("%s is disconnected\n",
 			  drm_get_connector_name(connector));
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_crt.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_crt.c
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_dp.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_dp.c
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx	2009-09-09 08:57:40.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-09-09 09:56:19.000000000 -0400
@@ -107,6 +107,7 @@ struct intel_output {
 	void (*hot_plug)(struct intel_output *);
 	int crtc_mask;
 	int clone_mask;
+	bool cached;
 };
 
 struct intel_crtc {
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx	2009-09-09 08:57:39.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c	2009-09-09 09:56:18.000000000 -0400
@@ -593,7 +593,14 @@ static void intel_lvds_mode_set(struct d
  */
 static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector)
 {
-	return connector_status_connected;
+	static int done;
+
+	if (!done) {
+		done = 1;
+		return connector_status_connected;
+	} else {
+		return connector_status_cached;
+	}
 }
 
 /**
diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.jx linux-2.6.30.noarch/include/drm/drm_crtc.h
--- linux-2.6.30.noarch/include/drm/drm_crtc.h.jx	2009-09-09 08:57:39.000000000 -0400
+++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-09-09 09:35:24.000000000 -0400
@@ -172,6 +172,7 @@ enum drm_connector_status {
 	connector_status_connected = 1,
 	connector_status_disconnected = 2,
 	connector_status_unknown = 3,
+	connector_status_cached = 4,
 };
 
 enum subpixel_order {



From xhorak at fedoraproject.org  Wed Sep  9 14:03:54 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:03:54 +0000 (UTC)
Subject: rpms/blam/F-11 blam.spec,1.31,1.32
Message-ID: <20090909140354.F1D4D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21923

Modified Files:
	blam.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-11/blam.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- blam.spec	3 Aug 2009 23:01:48 -0000	1.31
+++ blam.spec	9 Sep 2009 14:03:54 -0000	1.32
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.1.2
+%define	gecko_version		1.9.1.3
 
 Name:		blam
 Version:	1.8.5
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:04:48 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:04:48 +0000 (UTC)
Subject: rpms/chmsee/F-11 chmsee.spec,1.36,1.37
Message-ID: <20090909140448.CD29511C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/chmsee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22203

Modified Files:
	chmsee.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-11
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- chmsee.spec	3 Aug 2009 23:02:02 -0000	1.36
+++ chmsee.spec	9 Sep 2009 14:04:48 -0000	1.37
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary(zh_CN):	CHM ??????, ?? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-11
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-10
 - Rebuild against newer gecko
 



From peter at fedoraproject.org  Wed Sep  9 14:05:01 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:05:01 +0000 (UTC)
Subject: rpms/portaudio/EL-4 portaudio.spec,1.3,1.4
Message-ID: <20090909140501.70CA111C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/portaudio/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22330

Modified Files:
	portaudio.spec 
Log Message:
disabled jack support in portaudio for EL-4 branch


Index: portaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/portaudio/EL-4/portaudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- portaudio.spec	6 Jun 2009 06:56:44 -0000	1.3
+++ portaudio.spec	9 Sep 2009 14:05:01 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Free, cross platform, open-source, audio I/O library
 Name: portaudio
 Version: 19
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.portaudio.com/
@@ -13,7 +13,8 @@ Patch1: portaudio-doxynodate.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
 BuildRequires: alsa-lib-devel
-BuildRequires: jack-audio-connection-kit-devel
+# Disabled on EL-4
+#BuildRequires: jack-audio-connection-kit-devel
 
 %description
 PortAudio is a portable audio I/O library designed for cross-platform
@@ -44,7 +45,7 @@ portaudio library.
 
 
 %build
-%configure --disable-static --enable-cxx
+%configure --disable-static --enable-cxx --without-jack
 %{__make} %{?_smp_mflags}
 # Build html devel documentation
 doxygen



From xhorak at fedoraproject.org  Wed Sep  9 14:07:26 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:07:26 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse.spec,1.633,1.634
Message-ID: <20090909140726.2F37111C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23093

Modified Files:
	eclipse.spec 
Log Message:
Rebuild against newer gecko


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -p -r1.633 -r1.634
--- eclipse.spec	3 Aug 2009 23:02:15 -0000	1.633
+++ eclipse.spec	9 Sep 2009 14:07:25 -0000	1.634
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1491,6 +1491,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-15
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1:3.4.2-14
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:08:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:08:11 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss.spec,1.31,1.32
Message-ID: <20090909140811.D167211C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23359

Modified Files:
	evolution-rss.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-3
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- evolution-rss.spec	26 Aug 2009 12:05:20 -0000	1.31
+++ evolution-rss.spec	9 Sep 2009 14:08:11 -0000	1.32
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -81,6 +81,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-3
+- Rebuild against newer gecko
+
 * Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
 - fix source
 



From gd at fedoraproject.org  Wed Sep  9 14:08:31 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  9 Sep 2009 14:08:31 +0000 (UTC)
Subject: rpms/samba/devel .cvsignore, 1.65, 1.66 samba.spec, 1.194,
	1.195 sources, 1.69, 1.70 samba-3.4.0-bug6551.patch, 1.1,
	NONE samba-3.4.0-build.patch, 1.1,
	NONE samba-3.4.0-cliread.patch, 1.2, NONE
Message-ID: <20090909140831.EF95D11C00CE@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23426

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.4.0-bug6551.patch samba-3.4.0-build.patch 
	samba-3.4.0-cliread.patch 
Log Message:
Update to 3.4.1

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	14 Jul 2009 23:03:08 -0000	1.65
+++ .cvsignore	9 Sep 2009 14:08:31 -0000	1.66
@@ -1 +1 @@
-samba-3.4.0.tar.gz
+samba-3.4.1.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- samba.spec	20 Aug 2009 15:38:45 -0000	1.194
+++ samba.spec	9 Sep 2009 14:08:31 -0000	1.195
@@ -1,5 +1,5 @@
-%define main_release 43
-%define samba_version 3.4.0
+%define main_release 44
+%define samba_version 3.4.1
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
@@ -48,9 +48,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
-Patch201: samba-3.4.0-build.patch
-Patch202: samba-3.4.0-bug6551.patch
-Patch203: samba-3.4.0-cliread.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -261,9 +258,6 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
-%patch201 -p1 -b .build
-%patch202 -p1 -b .bug6551
-%patch203 -p1 -b .cliread
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -890,6 +884,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Sep 09 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.1-0.44
+- Update to 3.4.1
+
 * Thu Aug 20 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0-0.43
 - Fix cli_read()
 - resolves: #516165


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	14 Jul 2009 23:03:09 -0000	1.69
+++ sources	9 Sep 2009 14:08:31 -0000	1.70
@@ -1 +1 @@
-a7137736379daf9855814ae14c2c5e22  samba-3.4.0.tar.gz
+f857c534148e28b686996d232da76cec  samba-3.4.1.tar.gz


--- samba-3.4.0-bug6551.patch DELETED ---


--- samba-3.4.0-build.patch DELETED ---


--- samba-3.4.0-cliread.patch DELETED ---



From xhorak at fedoraproject.org  Wed Sep  9 14:08:52 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:08:52 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon.spec,1.65,1.66
Message-ID: <20090909140852.67B8111C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23640

Modified Files:
	galeon.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-14
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- galeon.spec	3 Aug 2009 23:03:10 -0000	1.65
+++ galeon.spec	9 Sep 2009 14:08:52 -0000	1.66
@@ -1,9 +1,9 @@
-%define gecko_ver 1.9.1.2
+%define gecko_ver 1.9.1.3
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -125,6 +125,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-14
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:09:34 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:09:34 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-11 gnome-python2-extras.spec,1.53,1.54
Message-ID: <20090909140934.DC4D411C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23926

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-7
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-11/gnome-python2-extras.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnome-python2-extras.spec	3 Aug 2009 23:03:26 -0000	1.53
+++ gnome-python2-extras.spec	9 Sep 2009 14:09:34 -0000	1.54
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 %define gtkspell_version 2.0.7
 %define libgda_version 3.99.9
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-7
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:10:13 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:10:13 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-11 gnome-web-photo.spec,1.25,1.26
Message-ID: <20090909141013.6BA7D11C043D@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24202

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.7-6
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-11/gnome-web-photo.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gnome-web-photo.spec	3 Aug 2009 23:03:40 -0000	1.25
+++ gnome-web-photo.spec	9 Sep 2009 14:10:13 -0000	1.26
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.7-6
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.7-5
 - Rebuild against newer gecko
 



From mbarabas at fedoraproject.org  Wed Sep  9 14:10:16 2009
From: mbarabas at fedoraproject.org (Maros Barabas)
Date: Wed,  9 Sep 2009 14:10:16 +0000 (UTC)
Subject: rpms/sectool/devel .cvsignore, 1.17, 1.18 sectool.spec, 1.31,
	1.32 sources, 1.17, 1.18
Message-ID: <20090909141016.50CE011C043D@cvs1.fedora.phx.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/sectool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23911

Modified Files:
	.cvsignore sectool.spec sources 
Log Message:
- upgrade with PolicyKit integration
- dbus update
- fedora test day bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Jun 2009 10:36:16 -0000	1.17
+++ .cvsignore	9 Sep 2009 14:10:16 -0000	1.18
@@ -1 +1 @@
-sectool-0.9.3.tar.bz2
+sectool-0.9.4.tar.bz2


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sectool.spec	27 Jul 2009 04:07:18 -0000	1.31
+++ sectool.spec	9 Sep 2009 14:10:16 -0000	1.32
@@ -1,21 +1,26 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 Source1: sectool.log
 Patch1: sectool-0.9.2-optflags.patch
-Patch2: sectool-0.9.3-ext4.patch
+#Patch2: sectool-0.9.3-ext4.patch
 License: GPLv2+
 Group: Applications/System
-Requires: gettext coreutils libselinux
+Requires: gettext coreutils libselinux python-slip-dbus PolicyKit dbus
 Requires: python2 rpm-python libselinux-python glibc-headers
 BuildRequires: desktop-file-utils gettext intltool asciidoc
 BuildRequires: rpm-devel >= 4.6.0
 BuildRequires: libselinux-devel glibc-headers
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Temporarily disable check-buildroot
+#%define __arch_install_post %{nil}
+# Disable debuginfo building
+%define debug_package %{nil}
+
 %package gui
 Summary: GUI for sectool - security audit system and intrusion detection system
 License: GPLv2+
@@ -37,7 +42,7 @@ sectool-gui provides a GTK-based graphic
 %prep
 %setup -q
 %patch1 -p1 -b .optflags
-%patch2 -p1 -b .ext4
+#%patch2 -p1 -b .ext4
 
 %build
 make %{?_smp_mflags}
@@ -55,7 +60,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysc
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sectool
 #adjust paths in sectool.conf
 sed -i 's,DSC_DIR=\(.*\),DSC_DIR=%{_sysconfdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
-sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
+sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_libexecdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
 sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
 #adjust icons path in guiOutput.py
 sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py
@@ -77,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/sectool
 #library with tests
 %{_datadir}/sectool/scheduler
-%{_datadir}/sectool/tests
+%{_libexecdir}/sectool/tests
 # command line tool
 %{_datadir}/sectool/actions.py*
 %{_datadir}/sectool/__init__.py*
@@ -85,13 +90,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sectool/mailoutput.py*
 %{_datadir}/sectool/sectool.py*
 %{_datadir}/sectool/tuierrors.py*
+%{_libexecdir}/sectool-mechanism.py*
+%{_datadir}/sectool/sectool-mechanism.py*
 %{_mandir}/man8/sectool.8.gz
-
+# PolicyKit
+%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.sectool.mechanism.conf
+%{_datadir}/PolicyKit/policy/org.fedoraproject.sectool.policy
+%{_datadir}/dbus-1/system-services/org.fedoraproject.sectool.mechanism.service
 
 %files gui
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/pam.d/sectool-gui
-%config(noreplace) %{_sysconfdir}/security/console.apps/sectool-gui
+#%config(noreplace) %{_sysconfdir}/security/console.apps/sectool-gui
 %{_bindir}/sectool-gui
 %{_datadir}/sectool/gui*.py*
 %{_datadir}/sectool/sectool-gui.py*
@@ -102,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Maros Barabas <mbarabas at redhat.com> - 0.9.4-2
+- upgrade with PolicyKit integration
+- dbus update
+- fedora test day bugfixes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	3 Jun 2009 10:36:18 -0000	1.17
+++ sources	9 Sep 2009 14:10:16 -0000	1.18
@@ -1 +1 @@
-c159880406a54463609f60a714db22a8  sectool-0.9.3.tar.bz2
+fbd348268a8c5a5cf3004fb96a47e393  sectool-0.9.4.tar.bz2



From xhorak at fedoraproject.org  Wed Sep  9 14:10:56 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:10:56 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets.spec,1.18,1.19
Message-ID: <20090909141056.9CB6411C043D@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24540

Modified Files:
	google-gadgets.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.11.0-5
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- google-gadgets.spec	6 Aug 2009 20:20:55 -0000	1.18
+++ google-gadgets.spec	9 Sep 2009 14:10:56 -0000	1.19
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.0
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -210,6 +210,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.11.0-5
+- Rebuild against newer gecko
+
 * Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
 - Backport Gecko version detection fix
 



From linville at fedoraproject.org  Wed Sep  9 14:10:58 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  9 Sep 2009 14:10:58 +0000 (UTC)
Subject: rpms/crda/F-10 .cvsignore, 1.3, 1.4 crda.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20090909141058.4D1DA11C043D@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24559

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
resync w/ F11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Apr 2009 18:37:41 -0000	1.3
+++ .cvsignore	9 Sep 2009 14:10:57 -0000	1.4
@@ -1,2 +1,2 @@
-crda-1.0.1.tar.bz2
-wireless-regdb-2009.04.16.tar.bz2
+crda-1.1.0.tar.bz2
+wireless-regdb-2009.09.08.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- crda.spec	17 Apr 2009 18:37:41 -0000	1.9
+++ crda.spec	9 Sep 2009 14:10:58 -0000	1.10
@@ -1,9 +1,9 @@
-%define         crda_version    1.0.1
-%define         regdb_version   2009.04.16
+%define         crda_version    1.1.0
+%define         regdb_version   2009.09.08
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        10%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -11,7 +11,7 @@ License:        BSD
 URL:            http://www.linuxwireless.org/en/developers/Regulatory/CRDA
 BuildRoot:      %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kernel-devel >= 2.6.27
+BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl-devel >= 1.1
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
@@ -82,6 +82,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-2
+- Update wireless-regdb to version 2009.09.08 
+- Start resetting release number with version updates
+- Resync nvr with what is in rawhide
+
+* Sun Jun 07 2009 Dennis Gilmore <dennis at ausil.us> 1.1.0_2009.04.17-12
+- br kerner-headers not kernel-devel  not all arches have kernel-devel
+- kernel-devel is for building kernel modules
+
+* Wed May 13 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.04.17-11
+- Update crda version to version 1.1.0
+- Update wireless-regdb to version 2009.04.17 
+
 * Fri Apr 17 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.04.16-10
 - Update wireless-regdb version to pick-up recent updates and fixes (#496392)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Apr 2009 18:37:41 -0000	1.6
+++ sources	9 Sep 2009 14:10:58 -0000	1.7
@@ -1,2 +1,2 @@
-03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
-90a1aeea3319f43c44d9d7e1f790761d  wireless-regdb-2009.04.16.tar.bz2
+6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
+4ba6fa7f1f7d87212f2cd63a1655f702  wireless-regdb-2009.09.08.tar.bz2



From xhorak at fedoraproject.org  Wed Sep  9 14:12:07 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:12:07 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-11 java-1.6.0-openjdk.spec,1.126,1.127
Message-ID: <20090909141207.151EB11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24959

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1:1.6.0.0-28.b16
- Rebuild against newer gecko



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.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- java-1.6.0-openjdk.spec	5 Aug 2009 14:11:41 -0000	1.126
+++ java-1.6.0-openjdk.spec	9 Sep 2009 14:12:06 -0000	1.127
@@ -138,7 +138,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 27.%{openjdkver}%{?dist}
+Release: 28.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -969,6 +969,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1:1.6.0.0-28.b16
+- Rebuild against newer gecko
+
 * Tue Aug  4 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-27.b16
 - Updated java-1.6.0-openjdk-netx.patch, and renamed to 
 java-1.6.0-openjdk-netxandplugin.patch.



From xhorak at fedoraproject.org  Wed Sep  9 14:12:19 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:12:19 +0000 (UTC)
Subject: rpms/hulahop/F-11 hulahop.spec,1.15,1.16
Message-ID: <20090909141219.D63BC11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/hulahop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25046

Modified Files:
	hulahop.spec 
Log Message:
Rebuild against newer gecko


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/F-11/hulahop.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hulahop.spec	3 Aug 2009 23:04:12 -0000	1.15
+++ hulahop.spec	9 Sep 2009 14:12:19 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-8
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-7
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:15:22 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:15:22 +0000 (UTC)
Subject: rpms/Miro/F-11 Miro.spec,1.59,1.60
Message-ID: <20090909141522.6A71811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26010

Modified Files:
	Miro.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- Miro.spec	19 Aug 2009 07:26:02 -0000	1.59
+++ Miro.spec	9 Sep 2009 14:15:22 -0000	1.60
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.1.2
+%define gecko_ver 1.9.1.3
 
 Name:           Miro
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
+- Rebuild against newer gecko
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-3
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:15:36 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:15:36 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase.spec,1.86,1.87
Message-ID: <20090909141536.3518D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26165

Modified Files:
	kazehakase.spec 
Log Message:
Rebuild against newer gecko


Index: kazehakase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- kazehakase.spec	29 Aug 2009 11:28:12 -0000	1.86
+++ kazehakase.spec	9 Sep 2009 14:15:36 -0000	1.87
@@ -18,7 +18,7 @@
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1.2
+%define		Geckover	1.9.1.3
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -34,7 +34,7 @@
 %define		svnver		3783_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -324,6 +324,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.5.7-2
+- Rebuild against newer gecko
+
 * Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
 - Update to 0.5.7
 



From xhorak at fedoraproject.org  Wed Sep  9 14:16:21 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:16:21 +0000 (UTC)
Subject: rpms/mozvoikko/F-11 mozvoikko.spec,1.13,1.14
Message-ID: <20090909141621.A678811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26520

Modified Files:
	mozvoikko.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.7.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-11/mozvoikko.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mozvoikko.spec	3 Aug 2009 23:05:09 -0000	1.13
+++ mozvoikko.spec	9 Sep 2009 14:16:21 -0000	1.14
@@ -5,7 +5,7 @@
 # update this package to 1.0.
 
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.2
+%define gecko_ver 1.9.1.3
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -18,7 +18,7 @@
 
 Name:           mozvoikko
 Version:        0.9.7
-Release:        0.6.rc1%{?dist}
+Release:        0.7.rc1%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.7.rc1
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.6.rc1
 - Rebuild against newer gecko
 



From remi at fedoraproject.org  Wed Sep  9 14:16:44 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 14:16:44 +0000 (UTC)
Subject: rpms/glpi/devel .cvsignore, 1.16, 1.17 glpi.spec, 1.26, 1.27 sources,
	1.18, 1.19 glpi-0.72.patch, 1.1, NONE
Message-ID: <20090909141644.7048211C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26760

Modified Files:
	.cvsignore glpi.spec sources 
Removed Files:
	glpi-0.72.patch 
Log Message:
update to 0.72.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 Aug 2009 15:36:29 -0000	1.16
+++ .cvsignore	9 Sep 2009 14:16:44 -0000	1.17
@@ -1 +1 @@
-glpi-0.72.1.tar.gz
+glpi-0.72.21.tar.gz


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- glpi.spec	18 Aug 2009 15:36:30 -0000	1.26
+++ glpi.spec	9 Sep 2009 14:16:44 -0000	1.27
@@ -1,28 +1,26 @@
 %if %{?fedora}%{?rhel} >= 5
-%define useselinux 1
+%global useselinux 1
 %else
-%define useselinux 0
+%global useselinux 0
 %endif
 
+%global tarballversion 0.72.21
+
 Name:           glpi
-Version:        0.72.1
-Release:        1.svn8743%{?dist}
+Version:        0.72.2.1
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.glpi-project.org/
-Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{version}.tar.gz
+Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{tarballversion}.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
-# Upstream Patches up to 8743
-# see tools/make_release.sh 
-Patch0:         glpi-0.72.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -61,8 +59,6 @@ techniciens gr?ce ? une maintenance pl
 %prep
 %setup -q -n glpi
 
-%patch0 -p1
-
 # Use system lib
 rm -rf lib/cache_lite
 rm -rf lib/phpmailer
@@ -222,6 +218,9 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
+- update to 0.72.21
+
 * Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.1-1.svn8743
 - update to 0.72.1 svn revision 8743
 - use system PHPMailer


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	18 Aug 2009 15:36:30 -0000	1.18
+++ sources	9 Sep 2009 14:16:44 -0000	1.19
@@ -1 +1 @@
-8508b0cb6c459a3728c53f3cb04dd4e3  glpi-0.72.1.tar.gz
+495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz


--- glpi-0.72.patch DELETED ---



From agoode at fedoraproject.org  Wed Sep  9 14:16:53 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed,  9 Sep 2009 14:16:53 +0000 (UTC)
Subject: rpms/rpc2/devel rpc2.spec,1.5,1.6
Message-ID: <20090909141653.1AD8611C00CE@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/rpc2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26839

Modified Files:
	rpc2.spec 
Log Message:
* Wed Sep  9 2009 Adam Goode <adam at spicenitz.org> - 2.8-3
- Remove unnecessary readline-devel build requires (INSTALL file seems wrong)



Index: rpc2.spec
===================================================================
RCS file: /cvs/extras/rpms/rpc2/devel/rpc2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rpc2.spec	27 Jul 2009 03:10:10 -0000	1.5
+++ rpc2.spec	9 Sep 2009 14:16:52 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           rpc2
 Version:        2.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C library for remote procedure calls over UDP
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.coda.cs.cmu.edu/
 Source0:        ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  lwp-devel lua-devel readline-devel flex bison
+BuildRequires:  lwp-devel lua-devel flex bison
 
 %description
 The RPC2 library.
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Adam Goode <adam at spicenitz.org> - 2.8-3
+- Remove unnecessary readline-devel build requires (INSTALL file seems wrong)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Wed Sep  9 14:17:03 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:17:03 +0000 (UTC)
Subject: rpms/mugshot/F-11 mugshot.spec,1.46,1.47
Message-ID: <20090909141703.E7C0C11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mugshot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26995

Modified Files:
	mugshot.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-13
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-11/mugshot.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- mugshot.spec	3 Aug 2009 23:05:22 -0000	1.46
+++ mugshot.spec	9 Sep 2009 14:17:03 -0000	1.47
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-13
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-12
 - Rebuild against newer gecko
 



From gd at fedoraproject.org  Wed Sep  9 14:17:24 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  9 Sep 2009 14:17:24 +0000 (UTC)
Subject: rpms/samba/F-11 .cvsignore, 1.63, 1.64 samba.spec, 1.189,
	1.190 sources, 1.67, 1.68 samba-3.4.0-bug6551.patch, 1.1,
	NONE samba-3.4.0-build.patch, 1.1, NONE
Message-ID: <20090909141724.C373511C00CE@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27135

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.4.0-bug6551.patch samba-3.4.0-build.patch 
Log Message:
Update to 3.4.1.

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	15 Jul 2009 10:21:14 -0000	1.63
+++ .cvsignore	9 Sep 2009 14:17:24 -0000	1.64
@@ -1 +1 @@
-samba-3.4.0.tar.gz
+samba-3.4.1.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- samba.spec	17 Jul 2009 14:30:59 -0000	1.189
+++ samba.spec	9 Sep 2009 14:17:24 -0000	1.190
@@ -1,5 +1,5 @@
-%define main_release 40
-%define samba_version 3.4.0
+%define main_release 41
+%define samba_version 3.4.1
 %define tdb_version 1.1.3
 %define talloc_version 1.2.0
 %define pre_release %nil
@@ -47,8 +47,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
-Patch201: samba-3.4.0-build.patch
-Patch202: samba-3.4.0-bug6551.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -259,8 +257,6 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
-%patch201 -p1 -b .build
-%patch202 -p1 -b .bug6551
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -887,6 +883,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Sep 09 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.1.0-41
+- Update to 3.4.1
+
 * Fri Jul 17 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0-0.40
 - Fix Bug #6551 (vuid and tid not set in sessionsetupX and tconX)
 - Specify required talloc and tdb version for BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	15 Jul 2009 10:21:15 -0000	1.67
+++ sources	9 Sep 2009 14:17:24 -0000	1.68
@@ -1 +1 @@
-a7137736379daf9855814ae14c2c5e22  samba-3.4.0.tar.gz
+f857c534148e28b686996d232da76cec  samba-3.4.1.tar.gz


--- samba-3.4.0-bug6551.patch DELETED ---


--- samba-3.4.0-build.patch DELETED ---



From dwalluck at fedoraproject.org  Wed Sep  9 14:18:11 2009
From: dwalluck at fedoraproject.org (dwalluck)
Date: Wed,  9 Sep 2009 14:18:11 +0000 (UTC)
Subject: rpms/gnu-getopt/devel gnu-getopt-1.0.13.pom, NONE, 1.1 .cvsignore,
	1.2, 1.3 gnu-getopt.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20090909141811.9CF9111C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/gnu-getopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416

Modified Files:
	.cvsignore gnu-getopt.spec sources 
Added Files:
	gnu-getopt-1.0.13.pom 
Log Message:
- sync with 1.0.13-3.jpp6


--- NEW FILE gnu-getopt-1.0.13.pom ---
<?xml version="1.0"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" 
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

  <modelVersion>4.0.0</modelVersion>
  
  <groupId>gnu-getopt</groupId>
  <artifactId>getopt</artifactId>
  <version>1.0.13</version>
  
  <name>ON Enterprise Server JAR</name>
  <description>JON enterprise server main JAR</description>
  <url>http://www.urbanophile.com/arenn/hacking/download.html</url>
  
  <licenses>
    <license>
      <name>GNU Lesser General Public License (LGPL)</name>
	   <url>http://www.gnu.org/licenses/lgpl.html</url>
    </license>
  </licenses>

</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 May 2006 18:42:39 -0000	1.2
+++ .cvsignore	9 Sep 2009 14:18:11 -0000	1.3
@@ -1 +1 @@
-java-getopt-1.0.12.tar.gz
+java-getopt-1.0.13.tar.gz


Index: gnu-getopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/gnu-getopt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnu-getopt.spec	25 Jul 2009 00:54:16 -0000	1.8
+++ gnu-getopt.spec	9 Sep 2009 14:18:11 -0000	1.9
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,35 +28,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _gcj_support 1
+%define section free
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define	section		free
-
-Name:		gnu-getopt
-Version:	1.0.12
-Release:	7%{?dist}
-Epoch:		0
+Name:           gnu-getopt
+Version:        1.0.13
+Release:        3.1%{?dist}
+Epoch:          0
 Summary:        Java getopt implementation
 License:        LGPLv2+
-Url:            http://www.urbanophile.com/arenn/hacking/download.html
-Source0:        http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.12.tar.gz
-BuildRequires:  ant
+URL:            http://www.urbanophile.com/arenn/hacking/download.html
+Source0:        http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-%{version}.tar.gz
+Source2:        gnu-getopt-%{version}.pom
 Group:          Development/Libraries/Java
-%if ! %{gcj_support}
-Buildarch:      noarch
-%endif
-BuildRequires:	jpackage-utils >= 0:1.6
-Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
-Provides:	gnu.getopt = %{epoch}:%{version}-%{release}
-Obsoletes:	gnu.getopt <= 0:1.0.9
-
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
+Provides:       gnu.getopt = %{epoch}:%{version}-%{release}
+Obsoletes:      gnu.getopt < %{epoch}:%{version}-%{release}
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+BuildRequires:  ant
+BuildRequires:  jpackage-utils
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 The GNU Java getopt classes support short and long argument parsing in
@@ -69,130 +60,118 @@ appreciate bug reports as well as hearin
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-BuildRequires:  java-javadoc
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
-Provides:	gnu.getopt-javadoc = %{epoch}:%{version}-%{release}
-Obsoletes:	gnu.getopt-javadoc <= 0:1.0.9
+Provides:       gnu.getopt-javadoc = %{epoch}:%{version}-%{release}
+Obsoletes:      gnu.getopt-javadoc < %{epoch}:%{version}-%{release}
 
 %description javadoc
 %{summary}.
 
 %prep
 %setup -q -c
-# Aaron, where did you put my build script :-) ?
-mv gnu/getopt/buildx.xml build.xml
+%{__mv} gnu/getopt/buildx.xml build.xml
 
 %build
-%ant jar javadoc
+export CLASSPATH=
+export OPT_JAR_LIST=:
+%{ant} jar javadoc
 
 %install
+%{__rm} -rf %{buildroot}
+
 # jars
-%__mkdir_p %{buildroot}%{_javadir}
-%__install -m 644 build/lib/gnu.getopt.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} ${jar/-%{version}/}; done
-%__ln_s %{name}.jar gnu.getopt.jar)
-# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a build/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__cp} -p build/lib/gnu.getopt.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/gnu.getopt-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+# javadoc
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -pr build/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/gnu.getopt-%{version}
+%{__ln_s} gnu.getopt-%{version} %{buildroot}%{_javadocdir}/gnu.getopt
+
+# poms
+%add_to_maven_depmap gnu-getopt getopt %{version} JPP %{name}
+%add_to_maven_depmap urbanophile java-getopt %{version} JPP %{name}
+%{__install} -D -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 %clean
-%__rm -rf %{buildroot}
-
-%post javadoc
-%__rm -f %{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    %__rm -f %{_javadocdir}/%{name}
-fi
+%{__rm} -rf %{buildroot}
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
 %doc gnu/getopt/COPYING.LIB gnu/getopt/README
-%{_javadir}/*
-
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/gnu-getopt-1.0.12.jar.*
-%endif
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/gnu.getopt-%{version}.jar
+%{_javadir}/gnu.getopt.jar
+%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+%{_javadocdir}/gnu.getopt-%{version}
+%{_javadocdir}/gnu.getopt
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.12-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.12-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Sep 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0.13-3.1
+- remove repolib
 
-* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0.12-5
-- drop repotag
+* Tue Sep 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0.13-3
+- fix maven depmap install
+- add compat symlinks for javadoc
+- add depmap entry for urbanophile:java-getopt
 
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.0.12-4jpp.1
-- Autorebuild for GCC 4.3
+* Thu Jul 30 2009 Yong Yang <yyang at redhat.com> 0:1.0.13-2
+- Merge changes from JPP5 1.0.12-3 to 1.0.12-6 
 
-* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-3jpp.1
-- Merge with upstream
+* Wed Jul 29 2009 Yong Yang <yyang at redhat.com> 0:1.0.13-1
+- 1.0.13
 
-* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-3jpp
-- Add requires for post and postun javadoc
+* Wed Aug 20 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-6
+- call %%update_maven_depmap
 
-* Fri Jul 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-2jpp_1fc
-- Merge with upstream
+* Wed Aug 20 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-5
+- add pom
+- fix component-info.xml
 
-* Fri Jul 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-2jpp
-- Add versions to backward compatibility Obsoletes/Provides
-- Add AOT bits
+* Wed Aug 13 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-4
+- bump release
+- don't duplicate repolib in main package
+- own repolib dirs
+- fix repolib permissions
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.9-4jpp_5fc
-- rebuild
+* Thu May 29 2008 Permaine Cheung <pcheung at redhat.com> 0:1.0.12-2
+- First JPP 5 build
 
-* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0.12-1jpp
-- 1.0.12
-- Change name to gnu-getopt, Provide/Obsolete gnu.getopt
-- Still provide gnu.getopt.jar as symlink
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0.9-4jpp_4fc
-- stop scriptlet spew
+* Tue Mar 13 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0.12-1jpp.ep1.2
+- Fix repolib location
 
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.0.9-4jpp_3fc
-- rebuilt again
+* Tue Mar 13 2007 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-1jpp.ep1.1
+- New repolib location
 
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
+* Mon Feb 19 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0.12-1jpp.el4ep1.2
+- Add -brew suffix
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Fri Feb 16 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0.12-1jpp.el4ep1.1
+- Add repolib support
 
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> 0:1.0.9-4jpp_2fc
-- Remove classes from the tarball.
+* Tue May 23 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-1jpp_1rh
+- First Red Hat build with new name
 
-* Fri Jan 21 2005 Gary Benson <gbenson at redhat.com> 0:1.0.9-4jpp_1fc
-- Build into Fedora.
+* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0.12-1jpp
+- 1.0.12
+- Change name to gnu-getopt, Provide/Obsolete gnu.getopt
+- Still provide gnu.getopt.jar as symlink
 
 * Tue Dec 07 2004 David Walluck <david at jpackage.org> 0:1.0.10-1jpp
 - 1.0.10
@@ -200,10 +179,6 @@ fi
 * Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0.9-5jpp
 - Build with ant-1.6.2
 
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.0.9-4jpp_1rh
-- RH vacuuming
-- GetoptDemo package fix
-
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:1.0.9-4jpp
 - fix groups
 
@@ -213,11 +188,11 @@ fi
 * Wed Mar 26 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.0.9-2jpp
 - For jpackage-utils 1.5
 
-* Sat Feb 16 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.9-1jpp 
+* Sat Feb 16 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.9-1jpp
 - 1.0.9
 - build script merged upstream
 
-* Sat Jan 19 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.8-2jpp 
+* Sat Jan 19 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.8-2jpp
 - versioned dir for javadoc
 - no dependencies for javadoc package
 - additional sources in individual archives


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 May 2006 18:42:39 -0000	1.2
+++ sources	9 Sep 2009 14:18:11 -0000	1.3
@@ -1 +1 @@
-a6ca4f494e1287e6b9733762583b51ca  java-getopt-1.0.12.tar.gz
+46336d9bc055900f0320e5c378d7bfb2  java-getopt-1.0.13.tar.gz



From xhorak at fedoraproject.org  Wed Sep  9 14:19:33 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:19:33 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2.spec,1.45,1.46
Message-ID: <20090909141933.DC91811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27881

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-1.2
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ruby-gnome2.spec	3 Aug 2009 23:05:37 -0000	1.45
+++ ruby-gnome2.spec	9 Sep 2009 14:19:33 -0000	1.46
@@ -4,7 +4,7 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -13,7 +13,7 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
-Release:        %{mainrel}%{?dist}.1
+Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -1076,6 +1076,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-2
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-1.1
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 14:20:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:20:12 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.6,1.7
Message-ID: <20090909142012.B422611C043A@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28104

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-11/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Gtk2-MozEmbed.spec	3 Aug 2009 23:05:51 -0000	1.6
+++ perl-Gtk2-MozEmbed.spec	9 Sep 2009 14:20:12 -0000	1.7
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 %else
 %define gecko_version 1.9.0.6
 %endif
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}.4
+Release:       %{specfilever}%{?dist}.5
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.4
 - Rebuild against newer gecko
 



From linville at fedoraproject.org  Wed Sep  9 14:20:32 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  9 Sep 2009 14:20:32 +0000 (UTC)
Subject: rpms/crda/F-10 regulatory-rules-setregdomain.patch,1.1,1.2
Message-ID: <20090909142032.DE74D11C043A@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28298

Modified Files:
	regulatory-rules-setregdomain.patch 
Log Message:
update/resync regulatory-rules-setregdomain.patch as well

regulatory-rules-setregdomain.patch:
 regulatory.rules |    2 ++
 1 file changed, 2 insertions(+)

Index: regulatory-rules-setregdomain.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/regulatory-rules-setregdomain.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- regulatory-rules-setregdomain.patch	19 Mar 2009 18:04:46 -0000	1.1
+++ regulatory-rules-setregdomain.patch	9 Sep 2009 14:20:32 -0000	1.2
@@ -1,10 +1,10 @@
-diff -up crda-1.0.1_2009.03.09/crda-1.0.1/udev/regulatory.rules.orig crda-1.0.1_2009.03.09/crda-1.0.1/udev/regulatory.rules
---- crda-1.0.1_2009.03.09/crda-1.0.1/udev/regulatory.rules.orig	2009-03-19 13:30:50.000000000 -0400
-+++ crda-1.0.1_2009.03.09/crda-1.0.1/udev/regulatory.rules	2009-03-19 13:30:58.000000000 -0400
+diff -up crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules.orig crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules
+--- crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules.orig	2009-04-17 17:49:45.000000000 -0400
++++ crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules	2009-05-13 13:34:23.000000000 -0400
 @@ -2,4 +2,6 @@
  # For more information see:
  # http://wireless.kernel.org/en/developers/Regulatory/CRDA
  
 +SUBSYSTEM=="ieee80211", ACTION=="add", RUN+="/sbin/setregdomain"
 +
- KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="/sbin/crda"
+ KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)/crda"



From xhorak at fedoraproject.org  Wed Sep  9 14:21:03 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:21:03 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 seahorse-plugins.spec,1.30,1.31
Message-ID: <20090909142103.1B00811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28595

Modified Files:
	seahorse-plugins.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.2-5
- Rebuild against newer gecko



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/F-11/seahorse-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- seahorse-plugins.spec	3 Aug 2009 23:06:04 -0000	1.30
+++ seahorse-plugins.spec	9 Sep 2009 14:21:02 -0000	1.31
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.2-5
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.2-4
 - Rebuild against newer gecko
 



From peter at fedoraproject.org  Wed Sep  9 14:21:13 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:21:13 +0000 (UTC)
Subject: rpms/python-gnutls/devel .cvsignore, 1.2, 1.3 import.log, 1.3,
	1.4 python-gnutls.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090909142113.7373D11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28753/devel

Modified Files:
	.cvsignore import.log python-gnutls.spec sources 
Log Message:
ver. 1.1.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jun 2009 06:57:57 -0000	1.2
+++ .cvsignore	9 Sep 2009 14:21:13 -0000	1.3
@@ -1 +1 @@
-python-gnutls-1.1.8.tar.gz
+python-gnutls-1.1.9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	3 Jun 2009 13:49:54 -0000	1.3
+++ import.log	9 Sep 2009 14:21:13 -0000	1.4
@@ -1,3 +1,4 @@
 python-gnutls-1_1_8-2_fc10:HEAD:python-gnutls-1.1.8-2.fc10.src.rpm:1243925841
 python-gnutls-1_1_8-2_fc10:HEAD:python-gnutls-1.1.8-2.fc10.src.rpm:1244036670
 python-gnutls-1_1_8-3_fc10:HEAD:python-gnutls-1.1.8-3.fc10.src.rpm:1244036952
+python-gnutls-1_1_9-1_fc11:HEAD:python-gnutls-1.1.9-1.fc11.src.rpm:1252506045


Index: python-gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/devel/python-gnutls.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-gnutls.spec	26 Jul 2009 20:25:44 -0000	1.4
+++ python-gnutls.spec	9 Sep 2009 14:21:13 -0000	1.5
@@ -2,8 +2,8 @@
 
 
 Name:		python-gnutls
-Version:	1.1.8
-Release:	4%{?dist}
+Version:	1.1.9
+Release:	1%{?dist}
 Summary:	Python wrapper for the GNUTLS library
 Group:		Development/Languages
 License:	LGPLv2+
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.9-1
+- Ver. 1.1.9
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jun 2009 06:57:57 -0000	1.2
+++ sources	9 Sep 2009 14:21:13 -0000	1.3
@@ -1 +1 @@
-a9032d65b338573291ef3a9be664c887  python-gnutls-1.1.8.tar.gz
+bdd81a9dd3c2f87393cd6c014bf6885b  python-gnutls-1.1.9.tar.gz



From xhorak at fedoraproject.org  Wed Sep  9 14:21:46 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 14:21:46 +0000 (UTC)
Subject: rpms/yelp/F-11 yelp.spec,1.160,1.161
Message-ID: <20090909142146.56F4211C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/yelp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28978

Modified Files:
	yelp.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-7
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-11/yelp.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- yelp.spec	3 Aug 2009 23:06:15 -0000	1.160
+++ yelp.spec	9 Sep 2009 14:21:46 -0000	1.161
@@ -11,7 +11,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -19,7 +19,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.26.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.26/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -148,6 +148,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-7
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-6
 - Rebuild against newer gecko
 



From peter at fedoraproject.org  Wed Sep  9 14:22:38 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:22:38 +0000 (UTC)
Subject: rpms/python-gnutls/F-11 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 python-gnutls.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090909142238.DB99F11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-gnutls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29298/F-11

Modified Files:
	.cvsignore import.log python-gnutls.spec sources 
Log Message:
ver. 1.1.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jun 2009 06:59:36 -0000	1.2
+++ .cvsignore	9 Sep 2009 14:22:38 -0000	1.3
@@ -1 +1 @@
-python-gnutls-1.1.8.tar.gz
+python-gnutls-1.1.9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Jun 2009 13:52:00 -0000	1.2
+++ import.log	9 Sep 2009 14:22:38 -0000	1.3
@@ -1,2 +1,3 @@
 python-gnutls-1_1_8-2_fc10:F-11:python-gnutls-1.1.8-2.fc10.src.rpm:1243925941
 python-gnutls-1_1_8-3_fc10:F-11:python-gnutls-1.1.8-3.fc10.src.rpm:1244037065
+python-gnutls-1_1_9-1_fc11:F-11:python-gnutls-1.1.9-1.fc11.src.rpm:1252506134


Index: python-gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-11/python-gnutls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-gnutls.spec	3 Jun 2009 13:52:00 -0000	1.2
+++ python-gnutls.spec	9 Sep 2009 14:22:38 -0000	1.3
@@ -2,8 +2,8 @@
 
 
 Name:		python-gnutls
-Version:	1.1.8
-Release:	3%{?dist}
+Version:	1.1.9
+Release:	1%{?dist}
 Summary:	Python wrapper for the GNUTLS library
 Group:		Development/Languages
 License:	LGPLv2+
@@ -64,6 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.9-1
+- Ver. 1.1.9
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun  3 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.8-3
 - Added patch for SRP removal
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jun 2009 06:59:36 -0000	1.2
+++ sources	9 Sep 2009 14:22:38 -0000	1.3
@@ -1 +1 @@
-a9032d65b338573291ef3a9be664c887  python-gnutls-1.1.8.tar.gz
+bdd81a9dd3c2f87393cd6c014bf6885b  python-gnutls-1.1.9.tar.gz



From peter at fedoraproject.org  Wed Sep  9 14:23:26 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:23:26 +0000 (UTC)
Subject: rpms/python-gnutls/F-10 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 python-gnutls.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090909142326.823C011C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-gnutls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29614/F-10

Modified Files:
	.cvsignore import.log python-gnutls.spec sources 
Log Message:
ver. 1.1.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jun 2009 07:01:13 -0000	1.2
+++ .cvsignore	9 Sep 2009 14:23:26 -0000	1.3
@@ -1 +1 @@
-python-gnutls-1.1.8.tar.gz
+python-gnutls-1.1.9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Jun 2009 13:53:40 -0000	1.2
+++ import.log	9 Sep 2009 14:23:26 -0000	1.3
@@ -1,2 +1,3 @@
 python-gnutls-1_1_8-2_fc10:F-10:python-gnutls-1.1.8-2.fc10.src.rpm:1243926038
 python-gnutls-1_1_8-3_fc10:F-10:python-gnutls-1.1.8-3.fc10.src.rpm:1244037173
+python-gnutls-1_1_9-1_fc11:F-10:python-gnutls-1.1.9-1.fc11.src.rpm:1252506180


Index: python-gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-10/python-gnutls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-gnutls.spec	3 Jun 2009 13:53:40 -0000	1.2
+++ python-gnutls.spec	9 Sep 2009 14:23:26 -0000	1.3
@@ -2,8 +2,8 @@
 
 
 Name:		python-gnutls
-Version:	1.1.8
-Release:	3%{?dist}
+Version:	1.1.9
+Release:	1%{?dist}
 Summary:	Python wrapper for the GNUTLS library
 Group:		Development/Languages
 License:	LGPLv2+
@@ -64,6 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.9-1
+- Ver. 1.1.9
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun  3 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.8-3
 - Added patch for SRP removal
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jun 2009 07:01:13 -0000	1.2
+++ sources	9 Sep 2009 14:23:26 -0000	1.3
@@ -1 +1 @@
-a9032d65b338573291ef3a9be664c887  python-gnutls-1.1.8.tar.gz
+bdd81a9dd3c2f87393cd6c014bf6885b  python-gnutls-1.1.9.tar.gz



From agoode at fedoraproject.org  Wed Sep  9 14:25:14 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed,  9 Sep 2009 14:25:14 +0000 (UTC)
Subject: rpms/coda/devel coda.spec,1.16,1.17
Message-ID: <20090909142514.11A9C11C00CE@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31595

Modified Files:
	coda.spec 
Log Message:
Fix tabs/spaces


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- coda.spec	24 Jul 2009 19:12:38 -0000	1.16
+++ coda.spec	9 Sep 2009 14:25:13 -0000	1.17
@@ -11,19 +11,19 @@ Source2:        codasrv.init
 Source3:        auth2.init
 Source4:        update.init
 Patch0:         coda-6.9.3-client-fhs.patch
-Patch1:		coda-6.9.4-rc2-no-default-krb.patch
-Patch2:		coda-6.9.4-rc2-kernel-alias.patch
-Patch3:		coda-6.9.4-gcc44.patch
-Patch4: 	coda-configure.patch
-Patch5:		coda-6.9.4-sname-fault.patch
+Patch1:         coda-6.9.4-rc2-no-default-krb.patch
+Patch2:         coda-6.9.4-rc2-kernel-alias.patch
+Patch3:         coda-6.9.4-gcc44.patch
+Patch4:         coda-configure.patch
+Patch5:         coda-6.9.4-sname-fault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel >= 2.5
-BuildRequires:	rpc2-devel >= 2.8
-BuildRequires:	rvm-devel
-BuildRequires:	rvm-tools compat-readline5-devel
+BuildRequires:  rpc2-devel >= 2.8
+BuildRequires:  rvm-devel
+BuildRequires:  rvm-tools compat-readline5-devel
 BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
-BuildRequires:	e2fsprogs-devel
-Requires:	krb5-libs compat-readline5
+BuildRequires:  e2fsprogs-devel
+Requires:       krb5-libs compat-readline5
 
 
 # For /etc/rc.d/init.d so that configure can detect we have RH style init



From fnasser at fedoraproject.org  Wed Sep  9 14:25:32 2009
From: fnasser at fedoraproject.org (Fernando Nasser)
Date: Wed,  9 Sep 2009 14:25:32 +0000 (UTC)
Subject: rpms/jakarta-commons-el/devel commons-el-1.0.pom, NONE,
	1.1 jakarta-commons-el-component-info.xml, NONE,
	1.1 jakarta-commons-el.spec, 1.45, 1.46
Message-ID: <20090909142532.4E36011C00CE@cvs1.fedora.phx.redhat.com>

Author: fnasser

Update of /cvs/extras/rpms/jakarta-commons-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32147

Modified Files:
	jakarta-commons-el.spec 
Added Files:
	commons-el-1.0.pom jakarta-commons-el-component-info.xml 
Log Message:
Merge with upstream for pom, maven depmap fragments and other cleanups


--- NEW FILE commons-el-1.0.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-el</groupId>
  <artifactId>commons-el</artifactId>
  <name>EL</name>
  <version>1.0</version>
  <description>JSP 2.0 Expression Language Interpreter Implementation</description>
  <url>http://jakarta.apache.org/commons/el/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <address>commons-dev at jakarta.apache.org</address>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2003</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev at jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user at jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>arista</id>
      <name>Nathan Abramson</name>
      <email>arista at alum.mit.edu</email>
      <organization>Massachusetts Institute of Technology</organization>
    </developer>
    <developer>
      <id>shawn</id>
      <name>Shawn Bayern</name>
      <email>shawn at apache.org</email>
      <organization>Apache Software Foundation</organization>
    </developer>
    <developer>
      <id>pierred</id>
      <name>Pierre Delisle</name>
      <email>pierre.delisle at sun.com</email>
      <organization>Sun Microsystems, Inc.</organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email>craigmcc at apache.org</email>
      <organization>Apache Software Foundation</organization>
    </developer>
    <developer>
      <id>luehe</id>
      <name>Jan Luehe</name>
      <email>jan.luehe at sun.com</email>
      <organization>Sun Microsystems, Inc.</organization>
    </developer>
  </developers>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</connection>
    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*Test.java</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>servletapi</groupId>
      <artifactId>servletapi</artifactId>
      <version>2.4-20040521</version>
      <scope>provided</scope> 
    </dependency>
    <dependency>
      <groupId>jspapi</groupId>
      <artifactId>jsp-api</artifactId>
      <version>2.0-20040521</version>
      <scope>provided</scope> 
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0.3</version>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/el/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/el/</url>
    </site>
  </distributionManagement>
</project>

--- NEW FILE jakarta-commons-el-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="commons-el"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="commons-el.jar"/>


    <export>
      <include input="commons-el.jar"/>

    </export>
  </component>
</project>


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- jakarta-commons-el.spec	25 Jul 2009 03:49:45 -0000	1.45
+++ jakarta-commons-el.spec	9 Sep 2009 14:25:32 -0000	1.46
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
@@ -39,38 +38,39 @@
 
 Name:           jakarta-commons-el
 Version:        1.0
-Release:        11.5%{?dist}
+Release:        18.1%{?dist}
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        ASL 1.1
 Group:          Development/Libraries/Java
 URL:            http://jakarta.apache.org/commons/el/
 Source0:        http://archive.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz
+Source1:        http://repo1.maven.org/maven2/commons-el/commons-el/1.0/commons-el-1.0.pom
 Patch0:         %{short_name}-%{version}-license.patch
 Patch1:         %{short_name}-eclipse-manifest.patch
 Patch2:         jakarta-commons-el-enum.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant
-BuildRequires:  jsp
+BuildRequires:	tomcat5-jsp-2.0-api
 BuildRequires:  servletapi5
 BuildRequires:  junit
-BuildRequires:	tomcat5-jsp-2.0-api
 
 %if %{gcj_support}
 BuildRequires:          java-gcj-compat-devel
 Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
 %endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 An implementation of standard interfaces and abstract classes for
 javax.servlet.jsp.el which is part of the JSP 2.0 specification.
 
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
@@ -78,11 +78,6 @@ BuildRequires:  java-javadoc
 # for /bin/rm and /bin/ln
 Requires(post): coreutils
 Requires(postun): coreutils
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description    javadoc
 Javadoc for %{name}.
@@ -109,7 +104,9 @@ jspapi.build.notrequired=true
 EOBP
 
 %build
-ant \
+export CLASSPATH=
+export OPT_JAR_LIST=:
+%{ant} \
   -Dfinal.name=%{short_name} \
   -Dj2se.javadoc=%{_javadocdir}/java \
   jar javadoc
@@ -124,10 +121,15 @@ cp -p dist/%{short_name}.jar $RPM_BUILD_
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+# pom                                                                                                                                                                    
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap commons-el commons-el %{version} JPP %{name}
+
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %if %{gcj_support}
@@ -137,26 +139,18 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
-%if %{gcj_support}
 %post
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -166,8 +160,12 @@ fi
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt STATUS.html
-%{_javadir}/*
-
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}-%{version}.jar
+%{_javadir}/%{short_name}.jar
+%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-el-1.0.jar.*
@@ -175,20 +173,54 @@ fi
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Sep 09 2009 Fernando Nasser <fnasser at redhat.com> - 0:1.0-18.1
+- Merge with upstream for:
+  Add pom and depmap fragment
+  Removal of ghost symlink
+  Some spec file cleanups
+- Build without AOT compilation
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-11.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0-18
+- fix scriptlets
+
+* Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0-17
+- fix pom install
+
+* Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0-16
+- add pom
+
 * Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.0-10.5
 - Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-10.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.0-15
+- fix component-info.xml
+
+* Wed Jan 21 2009 David Walluck <dwalluck at redhat.com> 0:1.0-14
+- fix jar name in repolib
+
+* Tue Jan 20 2009 David Walluck <dwalluck at redhat.com> 0:1.0-13
+- fix repolib location
+
+* Tue Jan 20 2009 David Walluck <dwalluck at redhat.com> 0:1.0-12
+- add repolib
+
+* Wed Aug 13 2008 David Walluck <dwalluck at redhat.com> 0:1.0-11
+- update header
+
+* Wed Aug 13 2008 David Walluck <dwalluck at redhat.com> 0:1.0-10
+- build for JPackage 5
+
 * Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 0:1.0-9.4
 - Update OSGi metadata for Eclipse 3.4.
 



From ajax at fedoraproject.org  Wed Sep  9 14:30:33 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 14:30:33 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 xorg-x11-drv-intel.spec, 1.29, 1.30
Message-ID: <20090909143033.C9E4211C02C8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6036

Modified Files:
	.cvsignore sources xorg-x11-drv-intel.spec 
Log Message:
* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 2.8.0-13.20090909
- Today's git snap



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	8 Sep 2009 18:38:52 -0000	1.8
+++ .cvsignore	9 Sep 2009 14:30:33 -0000	1.9
@@ -1,2 +1,3 @@
 intel-gpu-tools-20090908.tar.bz2
 xf86-video-intel-20090908.tar.bz2
+xf86-video-intel-20090909.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Sep 2009 18:38:52 -0000	1.9
+++ sources	9 Sep 2009 14:30:33 -0000	1.10
@@ -1,2 +1,2 @@
 d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2
-c400809c9288d9b973849f4f284b799c  xf86-video-intel-20090908.tar.bz2
+f225d5d72376e263366f45292813675f  xf86-video-intel-20090909.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xorg-x11-drv-intel.spec	8 Sep 2009 20:56:56 -0000	1.29
+++ xorg-x11-drv-intel.spec	9 Sep 2009 14:30:33 -0000	1.30
@@ -3,12 +3,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20090908
-%define gitdate 20090908
+%define gitdate 20090909
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   12.%{gitdate}%{?dist}
+Release:   13.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 2.8.0-13.20090909
+- Today's git snap
+
 * Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-12.20090908
 - lvds-modes.patch: Remove egregiously silly LVDS mode list construction,
   use an algorithm (ported from radeon) that actually works instead.



From peter at fedoraproject.org  Wed Sep  9 14:40:49 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:40:49 +0000 (UTC)
Subject: rpms/python-application/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 
	1.3 python-application.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090909144049.90CC411C043D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-application/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9845/devel

Modified Files:
	.cvsignore import.log python-application.spec sources 
Log Message:
ver. 1.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 11:51:40 -0000	1.3
+++ .cvsignore	9 Sep 2009 14:40:47 -0000	1.4
@@ -1 +1 @@
-python-application-1.1.2.tar.gz
+python-application-1.1.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Jul 2009 11:51:40 -0000	1.2
+++ import.log	9 Sep 2009 14:40:47 -0000	1.3
@@ -1,2 +1,3 @@
 python-application-1_1_1-2_fc10:HEAD:python-application-1.1.1-2.fc10.src.rpm:1244049211
 python-application-1_1_2-1_fc11:HEAD:python-application-1.1.2-1.fc11.src.rpm:1247226664
+python-application-1_1_5-1_fc11:HEAD:python-application-1.1.5-1.fc11.src.rpm:1252507039


Index: python-application.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/devel/python-application.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-application.spec	26 Jul 2009 20:08:26 -0000	1.3
+++ python-application.spec	9 Sep 2009 14:40:47 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-application
-Version:	1.1.2
-Release:	2%{?dist}
+Version:	1.1.5
+Release:	1%{?dist}
 Summary:	Basic building blocks for python applications
 Group:		Development/Languages
 License:	LGPLv2+
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.5-1
+- Ver. 1.1.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 11:51:40 -0000	1.3
+++ sources	9 Sep 2009 14:40:47 -0000	1.4
@@ -1 +1 @@
-86ea28bc195e38c02655c47a2e3583c7  python-application-1.1.2.tar.gz
+d43399becc6b2850a2ea80a34375781b  python-application-1.1.5.tar.gz



From nhorman at fedoraproject.org  Wed Sep  9 14:42:01 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Wed,  9 Sep 2009 14:42:01 +0000 (UTC)
Subject: rpms/kexec-tools/F-11 kexec-tools.spec, 1.136, 1.137 mkdumprd, 1.29,
	1.30
Message-ID: <20090909144201.1361411C00CE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11667

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves bz 521657


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/kexec-tools.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- kexec-tools.spec	4 Sep 2009 12:54:25 -0000	1.136
+++ kexec-tools.spec	9 Sep 2009 14:42:00 -0000	1.137
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@ done
 
 
 %changelog
+* Wed Sep 09 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-16
+- Fix stata_nv typo in mkdumprd (bz 521657)
+
 * Fri Sep 04 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-15
 - Fix inclusion of stata_nv in initramfs (bz 521186)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/mkdumprd,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mkdumprd	4 Sep 2009 12:54:25 -0000	1.29
+++ mkdumprd	9 Sep 2009 14:42:00 -0000	1.30
@@ -1085,7 +1085,7 @@ fi
 lsmod | grep -q sata_nv
 if [ $? == 0 ]
 then
-   extra_kdump_mods="$extra_kdump_mods stata_nv"
+   extra_kdump_mods="$extra_kdump_mods sata_nv"
 fi 
 
 for n in $extra_kdump_mods; do



From peter at fedoraproject.org  Wed Sep  9 14:43:04 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:43:04 +0000 (UTC)
Subject: rpms/python-application/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2, 
	1.3 python-application.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090909144304.C8EEF11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-application/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13301/F-11

Modified Files:
	.cvsignore import.log python-application.spec sources 
Log Message:
ver. 1.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 11:52:29 -0000	1.3
+++ .cvsignore	9 Sep 2009 14:43:04 -0000	1.4
@@ -1 +1 @@
-python-application-1.1.2.tar.gz
+python-application-1.1.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Jul 2009 11:52:29 -0000	1.2
+++ import.log	9 Sep 2009 14:43:04 -0000	1.3
@@ -1,2 +1,3 @@
 python-application-1_1_1-2_fc10:F-11:python-application-1.1.1-2.fc10.src.rpm:1244050594
 python-application-1_1_2-1_fc11:F-11:python-application-1.1.2-1.fc11.src.rpm:1247226722
+python-application-1_1_5-1_fc11:F-11:python-application-1.1.5-1.fc11.src.rpm:1252507355


Index: python-application.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-11/python-application.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-application.spec	10 Jul 2009 11:52:29 -0000	1.2
+++ python-application.spec	9 Sep 2009 14:43:04 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-application
-Version:	1.1.2
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	Basic building blocks for python applications
 Group:		Development/Languages
@@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.5-1
+- Ver. 1.1.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.2-1
 - Ver. 1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 11:52:29 -0000	1.3
+++ sources	9 Sep 2009 14:43:04 -0000	1.4
@@ -1 +1 @@
-86ea28bc195e38c02655c47a2e3583c7  python-application-1.1.2.tar.gz
+d43399becc6b2850a2ea80a34375781b  python-application-1.1.5.tar.gz



From peter at fedoraproject.org  Wed Sep  9 14:45:22 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:45:22 +0000 (UTC)
Subject: rpms/python-application/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2, 
	1.3 python-application.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090909144522.4B3BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-application/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16878/F-10

Modified Files:
	.cvsignore import.log python-application.spec sources 
Log Message:
ver. 1.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 11:54:00 -0000	1.3
+++ .cvsignore	9 Sep 2009 14:45:21 -0000	1.4
@@ -1 +1 @@
-python-application-1.1.2.tar.gz
+python-application-1.1.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Jul 2009 11:54:00 -0000	1.2
+++ import.log	9 Sep 2009 14:45:21 -0000	1.3
@@ -1,2 +1,3 @@
 python-application-1_1_1-2_fc10:F-10:python-application-1.1.1-2.fc10.src.rpm:1244050706
 python-application-1_1_2-1_fc11:F-10:python-application-1.1.2-1.fc11.src.rpm:1247226804
+python-application-1_1_5-1_fc11:F-10:python-application-1.1.5-1.fc11.src.rpm:1252507404


Index: python-application.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-10/python-application.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-application.spec	10 Jul 2009 11:54:00 -0000	1.2
+++ python-application.spec	9 Sep 2009 14:45:21 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-application
-Version:	1.1.2
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	Basic building blocks for python applications
 Group:		Development/Languages
@@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.5-1
+- Ver. 1.1.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.2-1
 - Ver. 1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 11:54:00 -0000	1.3
+++ sources	9 Sep 2009 14:45:21 -0000	1.4
@@ -1 +1 @@
-86ea28bc195e38c02655c47a2e3583c7  python-application-1.1.2.tar.gz
+d43399becc6b2850a2ea80a34375781b  python-application-1.1.5.tar.gz



From peter at fedoraproject.org  Wed Sep  9 14:46:27 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:46:27 +0000 (UTC)
Subject: rpms/python-application/EL-5 .cvsignore, 1.3, 1.4 import.log, 1.2, 
	1.3 python-application.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090909144627.94C0011C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-application/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18733/EL-5

Modified Files:
	.cvsignore import.log python-application.spec sources 
Log Message:
ver. 1.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 11:55:12 -0000	1.3
+++ .cvsignore	9 Sep 2009 14:46:27 -0000	1.4
@@ -1 +1 @@
-python-application-1.1.2.tar.gz
+python-application-1.1.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Jul 2009 11:55:12 -0000	1.2
+++ import.log	9 Sep 2009 14:46:27 -0000	1.3
@@ -1,2 +1,3 @@
 python-application-1_1_1-2_fc10:EL-5:python-application-1.1.1-2.fc10.src.rpm:1244051134
 python-application-1_1_2-1_fc11:EL-5:python-application-1.1.2-1.fc11.src.rpm:1247226876
+python-application-1_1_5-1_fc11:EL-5:python-application-1.1.5-1.fc11.src.rpm:1252507542


Index: python-application.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-5/python-application.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-application.spec	10 Jul 2009 11:55:12 -0000	1.2
+++ python-application.spec	9 Sep 2009 14:46:27 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-application
-Version:	1.1.2
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	Basic building blocks for python applications
 Group:		Development/Languages
@@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.5-1
+- Ver. 1.1.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.2-1
 - Ver. 1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 11:55:12 -0000	1.3
+++ sources	9 Sep 2009 14:46:27 -0000	1.4
@@ -1 +1 @@
-86ea28bc195e38c02655c47a2e3583c7  python-application-1.1.2.tar.gz
+d43399becc6b2850a2ea80a34375781b  python-application-1.1.5.tar.gz



From fnasser at fedoraproject.org  Wed Sep  9 14:47:01 2009
From: fnasser at fedoraproject.org (Fernando Nasser)
Date: Wed,  9 Sep 2009 14:47:01 +0000 (UTC)
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.46,1.47
Message-ID: <20090909144701.C57ED11C00CE@cvs1.fedora.phx.redhat.com>

Author: fnasser

Update of /cvs/extras/rpms/jakarta-commons-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19666

Modified Files:
	jakarta-commons-el.spec 
Log Message:
Disable AOT compilation


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- jakarta-commons-el.spec	9 Sep 2009 14:25:32 -0000	1.46
+++ jakarta-commons-el.spec	9 Sep 2009 14:47:01 -0000	1.47
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+# Disable AOT compilation
+%define _without_gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 



From peter at fedoraproject.org  Wed Sep  9 14:49:26 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Sep 2009 14:49:26 +0000 (UTC)
Subject: rpms/python-application/EL-4 .cvsignore, 1.3, 1.4 import.log, 1.2, 
	1.3 python-application.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090909144926.65ADD11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-application/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22427/EL-4

Modified Files:
	.cvsignore import.log python-application.spec sources 
Log Message:
ver. 1.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 12:06:11 -0000	1.3
+++ .cvsignore	9 Sep 2009 14:49:26 -0000	1.4
@@ -1 +1 @@
-python-application-1.1.2.tar.gz
+python-application-1.1.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Jul 2009 12:06:11 -0000	1.2
+++ import.log	9 Sep 2009 14:49:26 -0000	1.3
@@ -1,2 +1,3 @@
 python-application-1_1_1-2_fc10:EL-4:python-application-1.1.1-2.fc10.src.rpm:1244051800
 python-application-1_1_2-1_fc11:EL-4:python-application-1.1.2-1.fc11.src.rpm:1247227467
+python-application-1_1_5-1_fc11:EL-4:python-application-1.1.5-1.fc11.src.rpm:1252507716


Index: python-application.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-4/python-application.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-application.spec	10 Jul 2009 12:06:11 -0000	1.2
+++ python-application.spec	9 Sep 2009 14:49:26 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-application
-Version:	1.1.2
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	Basic building blocks for python applications
 Group:		Development/Languages
@@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.5-1
+- Ver. 1.1.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.2-1
 - Ver. 1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-application/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 12:06:11 -0000	1.3
+++ sources	9 Sep 2009 14:49:26 -0000	1.4
@@ -1 +1 @@
-86ea28bc195e38c02655c47a2e3583c7  python-application-1.1.2.tar.gz
+d43399becc6b2850a2ea80a34375781b  python-application-1.1.5.tar.gz



From ajax at fedoraproject.org  Wed Sep  9 14:57:53 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 14:57:53 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 .cvsignore, 1.61, 1.62 sources, 1.56,
	1.57 xorg-x11-server.spec, 1.458, 1.459
Message-ID: <20090909145753.E908A11C00CE@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-serv25930

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Log Message:
* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 1.6.4-0.1
- 1.6.4 snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	13 Aug 2009 07:04:13 -0000	1.61
+++ .cvsignore	9 Sep 2009 14:57:53 -0000	1.62
@@ -1 +1,2 @@
 xorg-server-1.6.3.tar.bz2
+xorg-server-20090909.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	13 Aug 2009 07:04:14 -0000	1.56
+++ sources	9 Sep 2009 14:57:53 -0000	1.57
@@ -1 +1 @@
-0af168abeefa6579cab20387f75c0c7a  xorg-server-1.6.3.tar.bz2
+9feb8dfe7af73bf6653bf9982c6a741b  xorg-server-20090909.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- xorg-x11-server.spec	19 Aug 2009 04:24:53 -0000	1.458
+++ xorg-x11-server.spec	9 Sep 2009 14:57:53 -0000	1.459
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-#define gitdate 20090112
+%define gitdate 20090909
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.3
-Release:   4%{?dist}
+Version:   1.6.4
+Release:   0.1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -106,17 +106,11 @@ Patch6042: xserver-1.6.1-proc-cmdline.pa
 # second part to xserver-1.6.1-synaptics.patch
 Patch6043: xserver-1.6.1-mousedrivers.patch
 
-Patch6046: xserver-1.6.1-fix-glx-drawable.patch
-
 # #510238, already upstream
 Patch6047: xserver-1.6.2-vboxvideo.patch
 
-# 501601, upstream, nominated for 1.6.4
-Patch6048: xserver-1.6.3-sync-conditions.patch
 # 501601, part 2, upstream.
 Patch6049: xserver-1.6.99-dpms.patch
-# 501601, part 3, upstream.
-Patch6050: xserver-1.6.99-eventtime.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -534,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 1.6.4-0.1
+- 1.6.4 snapshot
+
 * Tue Aug 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-4
 - xserver-1.6.99-eventtime.patch: don't reset the last event time when the
   screen saver activates.



From remi at fedoraproject.org  Wed Sep  9 15:02:45 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 15:02:45 +0000 (UTC)
Subject: rpms/glpi-data-injection/devel .cvsignore, 1.6,
	1.7 glpi-data-injection.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090909150245.26F5611C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27596

Modified Files:
	.cvsignore glpi-data-injection.spec sources 
Log Message:
update to 1.7.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Aug 2009 15:46:51 -0000	1.6
+++ .cvsignore	9 Sep 2009 15:02:44 -0000	1.7
@@ -1 +1 @@
-glpi-data_injection-1.6.0.tar.gz
+glpi-datainjection-1.7.0.tar.gz


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/glpi-data-injection.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- glpi-data-injection.spec	18 Aug 2009 15:46:51 -0000	1.7
+++ glpi-data-injection.spec	9 Sep 2009 15:02:44 -0000	1.8
@@ -1,7 +1,7 @@
-%define pluginname   data_injection
+%define pluginname   datainjection
 
 Name:           glpi-data-injection
-Version:        1.6.0
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn?es dans GLPI
@@ -17,6 +17,9 @@ BuildArch:      noarch
 
 Requires:       glpi >= 0.72
 
+# This plugin is renamed (for 0.72)
+Provides:       glpi-datainjection = %{version}-%{release}
+
 %description
 Plugin for importing data into GLPI
 
@@ -89,6 +92,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.7.0-1
+- update to 1.7.0
+
 * Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.6.0-1
 - update to 1.6.0 finale for glpi 0.72
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Aug 2009 15:46:51 -0000	1.6
+++ sources	9 Sep 2009 15:02:44 -0000	1.7
@@ -1 +1 @@
-f71b05faba6314d04da04c6ae92269b6  glpi-data_injection-1.6.0.tar.gz
+29c3c87b73546026b88a9b8928cb8d76  glpi-datainjection-1.7.0.tar.gz



From ajax at fedoraproject.org  Wed Sep  9 15:03:45 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 15:03:45 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 commitid, 1.21, 1.22 make-git-snapshot.sh,
	1.7, 1.8
Message-ID: <20090909150345.E13BC11C00CE@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-serv28004

Added Files:
	commitid make-git-snapshot.sh 
Log Message:
* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 1.6.4-0.1
- 1.6.4 snapshot



Index: commitid
===================================================================
RCS file: commitid
diff -N commitid
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ commitid	9 Sep 2009 15:03:45 -0000	1.22
@@ -0,0 +1 @@
+3044711412d0a08ba65a491bd2441c0c8980f5e2


Index: make-git-snapshot.sh
===================================================================
RCS file: make-git-snapshot.sh
diff -N make-git-snapshot.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ make-git-snapshot.sh	9 Sep 2009 15:03:45 -0000	1.8
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=xorg-server-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/xserver $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+git log | head -1 | awk '{ print $2 }' > ../commitid
+git repack -a -d
+cd ..
+tar cf - $DIRNAME | bzip2 -c9 > $DIRNAME.tar.bz2
+rm -rf $DIRNAME



From ruben at fedoraproject.org  Wed Sep  9 15:10:21 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed,  9 Sep 2009 15:10:21 +0000 (UTC)
Subject: rpms/python-foolscap/F-11 python-foolscap.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090909151021.0EF9411C043D@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29791

Modified Files:
	sources 
Added Files:
	python-foolscap.spec 
Log Message:
* Mon Sep 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-1
- Upstream released new version



--- NEW FILE python-foolscap.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define modulename foolscap

Name:           python-%{modulename}
Version:        0.4.2
Release:        2%{?dist}
Summary:        Next-generation RPC protocol, intended to replace Perspective Broker

Group:          Development/Languages
License:        MIT
URL:            http://foolscap.lothar.com
Source0:        http://foolscap.lothar.com/releases/%{modulename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python, python-devel, python-twisted-web
Requires:       python-twisted-web

%description
Foolscap (aka newpb) is a new version of Twisted's native RPC protocol, known
as 'Perspective Broker'. This allows an object in one process to be used by
code in a distant process. This module provides data marshaling, a remote
object reference system, and a capability-based security model.

%prep
%setup -q -n %{modulename}-%{version}


%build
%{__python} setup.py build
find doc/ -name \*.py | xargs chmod 0644

%check
trial foolscap

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE NEWS ChangeLog doc/*
%dir %{python_sitelib}/%{modulename}
%{python_sitelib}/%{modulename}/*
%{python_sitelib}/*egg-info

%{_bindir}/flogtool
%{_bindir}/flappclient
%{_bindir}/flappserver

%changelog
* Mon Sep 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-1
- Upstream released new version

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Mon Feb 20 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.2-1
- New version from upstream

* Sun Nov 02 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.1-3
- More cleanup according to review (#462535)

* Fri Oct 31 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.1-2
- Cleanup according to review (#462535)

* Tue Sep 16 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.1-1
- Initial import



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:51:07 -0000	1.1
+++ sources	9 Sep 2009 15:10:20 -0000	1.2
@@ -0,0 +1 @@
+90618c9e51b718dc7d4cdf8b71edaee4  foolscap-0.4.2.tar.gz



From remi at fedoraproject.org  Wed Sep  9 15:10:22 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 15:10:22 +0000 (UTC)
Subject: rpms/glpi/F-11 glpi-config_path.php, 1.2, 1.3 glpi.spec, 1.24,
	1.25 sources, 1.17, 1.18 glpi-check.patch, 1.1, NONE
Message-ID: <20090909151022.D379611C043D@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29807

Modified Files:
	glpi-config_path.php glpi.spec sources 
Removed Files:
	glpi-check.patch 
Log Message:
update to 0.72.21


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-11/glpi-config_path.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-config_path.php	12 Jul 2008 07:21:33 -0000	1.2
+++ glpi-config_path.php	9 Sep 2009 15:10:22 -0000	1.3
@@ -11,6 +11,8 @@ define("GLPI_SESSION_DIR",    "/var/lib/
 define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins");
 define("GLPI_LOCK_DIR",       "/var/lib/glpi/files/_lock/");
 
-define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_LOG_DIR",        "/var/log/glpi");
+
+define("GLPI_CACHE_LITE_DIR", "Cache");
+define("GLPI_PHPMAILER_DIR",  "PHPMailer");
 ?>


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-11/glpi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- glpi.spec	2 Jun 2009 15:31:08 -0000	1.24
+++ glpi.spec	9 Sep 2009 15:10:22 -0000	1.25
@@ -1,11 +1,13 @@
 %if %{?fedora}%{?rhel} >= 5
-%define useselinux 1
+%global useselinux 1
 %else
-%define useselinux 0
+%global useselinux 0
 %endif
 
+%global tarballversion 0.72.21
+
 Name:           glpi
-Version:        0.71.6
+Version:        0.72.2.1
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -13,26 +15,18 @@ Summary(fr):    Gestion Libre de Parc In
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.glpi-project.org/
-Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{version}.tar.gz
+Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{tarballversion}.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
-# Avoid SELinux AVC when testing write access to log file.
-# backport from 0.72 (Changeset 7208)
-Patch0:         glpi-check.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       php, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring
-%if 0%{?rhel} == 4
-Requires:       php-domxml
-%else
-Requires:       php-xml
+Requires:       php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json
 Requires:       php-pear(Cache_Lite) >= 1.7.4
-%endif
+Requires:       php-PHPMailer
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
 Requires(post): /sbin/service
@@ -65,27 +59,25 @@ techniciens gr?ce ? une maintenance pl
 %prep
 %setup -q -n glpi
 
-%patch0 -p0
-
-%if 0%{?rhel} == 4
-
-# use bundled lib
-mv lib/cache_lite/LICENSE   LICENSE.cache_lite
-grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php 
-
-%else
-
 # Use system lib
 rm -rf lib/cache_lite
-cp %{SOURCE2} config/config_path.php 
+rm -rf lib/phpmailer
 
-%endif
+cp %{SOURCE2} config/config_path.php 
 
-mv lib/phpmailer/LICENSE    LICENSE.phpmailer
 mv lib/tiny_mce/license.txt LICENSE.tiny_mce
-dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
-iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt
-iconv -f ISO-8859-15 -t UTF-8 README.txt   >a && mv a README.txt
+mv lib/extjs/license.txt    LICENSE.extjs
+rm lib/extjs/{CHANGES.html,INCLUDE_ORDER.txt}
+mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
+mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
+mv lib/phpcas/README        README.phpcas
+rm scripts/glpi_cron_curl.sh
+
+dos2unix -o LICENSE.tiny_mce
+for fic in LISEZMOI.txt README.txt
+do
+   iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic
+done
 
 cat >cron <<EOF
 # GLPI core
@@ -103,9 +95,9 @@ rm -rf %{buildroot} 
 
 # ===== application =====
 mkdir -p %{buildroot}/%{_datadir}/%{name}
-cp -a *.php *.js %{buildroot}/%{_datadir}/%{name}/
+cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/
 
-for i in ajax css front help inc install lib locales pics plugins scripts
+for i in ajax css front inc install lib locales pics plugins scripts
 do   cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i
 done
 
@@ -164,10 +156,6 @@ rm -rf %{buildroot} 
 %post
 %if %{useselinux}
 (
-# Remove Selinux policy (from previous packaging)
-semodule -s targeted -r %{name} &>/dev/null
-# Remove old httpd_sys_script_rw_t
-semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" 
 semanage fcontext -a -s system_u -t httpd_log_t           -r s0 "%{_localstatedir}/log/glpi(/.*)?"
@@ -198,7 +186,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc *.txt LICENSE.*
+%doc *.txt LICENSE.* README.*
 
 %attr(750,apache,root) %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
@@ -213,11 +201,12 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.php
 %{_datadir}/%{name}/*.js
+# License file required by installation process
+%{_datadir}/%{name}/COPYING.txt
 %{_datadir}/%{name}/ajax
 %{_datadir}/%{name}/config
 %{_datadir}/%{name}/css
 %{_datadir}/%{name}/front
-%{_datadir}/%{name}/help
 %{_datadir}/%{name}/inc
 %{_datadir}/%{name}/install
 %{_datadir}/%{name}/lib
@@ -229,6 +218,11 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
+- update to 0.72.21
+- use system PHPMailer
+- now requires php > 5
+
 * Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
 - update to 0.71.6 (Bugfix Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	2 Jun 2009 15:31:08 -0000	1.17
+++ sources	9 Sep 2009 15:10:22 -0000	1.18
@@ -1 +1 @@
-d7137027c2a9f79cadd193bbe6ebab92  glpi-0.71.6.tar.gz
+495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz


--- glpi-check.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep  9 15:12:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:12:53 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested watchbugzilla
Message-ID: <20090909151254.089A910F865@bastion2.fedora.phx.redhat.com>

jjames has requested the watchbugzilla acl on jakarta-commons-lang (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:12:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:12:56 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested watchcommits
Message-ID: <20090909151256.3302E10F87E@bastion2.fedora.phx.redhat.com>

jjames has requested the watchcommits acl on jakarta-commons-lang (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:00 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested commit
Message-ID: <20090909151300.5DE6E10F894@bastion2.fedora.phx.redhat.com>

jjames has requested the commit acl on jakarta-commons-lang (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:20 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested watchbugzilla
Message-ID: <20090909151320.D890710F86F@bastion2.fedora.phx.redhat.com>

jjames has requested the watchbugzilla acl on jakarta-commons-lang (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:21 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested watchcommits
Message-ID: <20090909151321.F15F410F895@bastion2.fedora.phx.redhat.com>

jjames has requested the watchcommits acl on jakarta-commons-lang (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:23 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested commit
Message-ID: <20090909151324.00E9F10F89A@bastion2.fedora.phx.redhat.com>

jjames has requested the commit acl on jakarta-commons-lang (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From tgl at fedoraproject.org  Wed Sep  9 15:13:29 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed,  9 Sep 2009 15:13:29 +0000 (UTC)
Subject: rpms/postgresql/devel .cvsignore, 1.47,
	1.48 postgresql-ac-version.patch, 1.8, 1.9 postgresql.spec,
	1.117, 1.118 sources, 1.48, 1.49
Message-ID: <20090909151329.D8D0311C00CE@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30699

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	18 Aug 2009 02:58:54 -0000	1.47
+++ .cvsignore	9 Sep 2009 15:13:29 -0000	1.48
@@ -1,5 +1,5 @@
-postgresql-8.4.0.tar.bz2
+postgresql-8.4.1.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.4.0-US.pdf
+postgresql-8.4.1-US.pdf

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-ac-version.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- postgresql-ac-version.patch	18 Aug 2009 02:58:54 -0000	1.8
+++ postgresql-ac-version.patch	9 Sep 2009 15:13:29 -0000	1.9
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.4.0.orig/configure.in postgresql-8.4.0/configure.in
---- postgresql-8.4.0.orig/configure.in	2009-06-26 20:14:47.000000000 -0400
-+++ postgresql-8.4.0/configure.in	2009-08-12 23:09:31.000000000 -0400
+diff -Naur postgresql-8.4.1.orig/configure.in postgresql-8.4.1/configure.in
+--- postgresql-8.4.1.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.1/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.1], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- postgresql.spec	1 Sep 2009 20:39:52 -0000	1.117
+++ postgresql.spec	9 Sep 2009 15:13:29 -0000	1.118
@@ -59,8 +59,9 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 %define majorversion 8.4
-Version: 8.4.0
-Release: 3.2%{?dist}
+Version: 8.4.1
+Release: 1%{?dist}
+# PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -74,7 +75,7 @@ Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.0-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.1-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -90,10 +91,6 @@ BuildRequires: perl(ExtUtils::Embed), pe
 # for /sbin/ldconfig
 Prereq: glibc initscripts
 
-%ifarch s390 s390x
-%define sdt 0
-%endif
-
 %if %python || %plpython
 BuildRequires: python-devel
 %endif
@@ -369,10 +366,11 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; expo
 
 # Strip out -ffast-math from CFLAGS....
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# use -O1 on sparc64, s390x  and alpha
-%ifarch sparc64 alpha s390x s390
-CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
-%endif
+# let's try removing this kluge, it may just be a workaround for bz#520916
+# # use -O1 on sparc64 and alpha
+# %ifarch sparc64 alpha
+# CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+# %endif
 
 %configure --disable-rpath \
 %if %beta
@@ -856,6 +854,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep  9 2009 Tom Lane <tgl at redhat.com> 8.4.1-1
+- Update to PostgreSQL 8.4.1, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-1.html
+  including two security issues
+Related: #522085
+Related: #522092
+
 * Tue Sep 01 2009 Karsten Hopp <karsten at redhat.com> 8.4.0-3.2
 - bump release and build again with the correct libssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	18 Aug 2009 02:58:55 -0000	1.48
+++ sources	9 Sep 2009 15:13:29 -0000	1.49
@@ -1,5 +1,5 @@
-1f172d5f60326e972837f58fa5acd130  postgresql-8.4.0.tar.bz2
+f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-bbed2a7dad711eef335701391b9f112d  postgresql-8.4.0-US.pdf
+37ebde274743cc5ed3cf3d49c3f84119  postgresql-8.4.1-US.pdf



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:34 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested watchbugzilla
Message-ID: <20090909151334.71FD410F89D@bastion2.fedora.phx.redhat.com>

jjames has requested the watchbugzilla acl on jakarta-commons-lang (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:36 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested watchcommits
Message-ID: <20090909151336.CFE4910F8A1@bastion2.fedora.phx.redhat.com>

jjames has requested the watchcommits acl on jakarta-commons-lang (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:13:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:13:39 +0000
Subject: [pkgdb] jakarta-commons-lang: jjames has requested commit
Message-ID: <20090909151339.17A9E10F8A2@bastion2.fedora.phx.redhat.com>

jjames has requested the commit acl on jakarta-commons-lang (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From xhorak at fedoraproject.org  Wed Sep  9 15:16:39 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:16:39 +0000 (UTC)
Subject: rpms/blam/F-10 blam.spec,1.36,1.37
Message-ID: <20090909151639.52A5111C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633

Modified Files:
	blam.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-10/blam.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- blam.spec	4 Aug 2009 08:21:40 -0000	1.36
+++ blam.spec	9 Sep 2009 15:16:39 -0000	1.37
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.0.13
+%define	gecko_version		1.9.0.14
 
 Name:		blam
 Version:	1.8.5
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:17:27 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:17:27 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 evolution-rss.spec,1.31,1.32
Message-ID: <20090909151727.0653311C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31934

Modified Files:
	evolution-rss.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-3
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- evolution-rss.spec	26 Aug 2009 10:03:21 -0000	1.31
+++ evolution-rss.spec	9 Sep 2009 15:17:26 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -87,6 +87,9 @@ fi
 %doc TODO
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-3
+- Rebuild against newer gecko
+
 * Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
 - fix source0
 



From ajax at fedoraproject.org  Wed Sep  9 15:18:29 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 15:18:29 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xorg-x11-server.spec,1.459,1.460
Message-ID: <20090909151829.F0A1E11C00CE@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-serv32290

Modified Files:
	xorg-x11-server.spec 
Log Message:
one more time, with feeling


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- xorg-x11-server.spec	9 Sep 2009 14:57:53 -0000	1.459
+++ xorg-x11-server.spec	9 Sep 2009 15:18:29 -0000	1.460
@@ -323,6 +323,10 @@ Xserver source code needed to build VNC 
 %if 0%{?gitdate}
 git checkout -b fedora
 sed -i 's/git/&+ssh/' .git/config
+if [ -z "$GIT_COMMITTER_NAME" ]; then
+    git config user.email "x at fedoraproject.org"
+    git config user.name "Fedora X Ninjas"
+fi
 %else
 git init-db
 if [ -z "$GIT_COMMITTER_NAME" ]; then



From pkgdb at fedoraproject.org  Wed Sep  9 15:20:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:20:51 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152052.000FD10F87A@bastion2.fedora.phx.redhat.com>

pcheung has set the watchbugzilla acl on jakarta-commons-lang (Fedora devel) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:20:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:20:51 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152052.008D410F87E@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on jakarta-commons-lang (Fedora devel) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:20:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:20:54 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152054.26E2B10F894@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on jakarta-commons-lang (Fedora devel) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:21:17 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152117.8D84910F86F@bastion2.fedora.phx.redhat.com>

pcheung has set the watchbugzilla acl on jakarta-commons-lang (Fedora 10) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:21:17 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152118.2443E10F896@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on jakarta-commons-lang (Fedora 10) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:21:18 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152119.26B8110F89B@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on jakarta-commons-lang (Fedora 10) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:21:21 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152121.8415310F89F@bastion2.fedora.phx.redhat.com>

pcheung has set the watchbugzilla acl on jakarta-commons-lang (Fedora 11) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:21:21 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152121.BB98110F8A2@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on jakarta-commons-lang (Fedora 11) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From pkgdb at fedoraproject.org  Wed Sep  9 15:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:21:23 +0000
Subject: [pkgdb] jakarta-commons-lang had acl change status
Message-ID: <20090909152123.4D24010F8A8@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on jakarta-commons-lang (Fedora 11) to Approved for jjames

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang



From xhorak at fedoraproject.org  Wed Sep  9 15:24:26 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:24:26 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-10 gecko-sharp2.spec,1.37,1.38
Message-ID: <20090909152427.02DBC11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gecko-sharp2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1815

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.13-12
- Rebuild against newer gecko



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/F-10/gecko-sharp2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gecko-sharp2.spec	4 Aug 2009 08:27:18 -0000	1.37
+++ gecko-sharp2.spec	9 Sep 2009 15:24:26 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.13-12
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.13-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:25:14 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:25:14 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.45,1.46
Message-ID: <20090909152514.E9A2F11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2771

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-34
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-10/gnome-python2-extras.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gnome-python2-extras.spec	4 Aug 2009 08:29:59 -0000	1.45
+++ gnome-python2-extras.spec	9 Sep 2009 15:25:14 -0000	1.46
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.0.13
+%define gecko_version 1.9.0.14
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-34
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-33
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:27:32 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:27:32 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-10 gnome-web-photo.spec,1.22,1.23
Message-ID: <20090909152732.3E16211C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6642

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3-22
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-10/gnome-web-photo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-web-photo.spec	4 Aug 2009 08:30:36 -0000	1.22
+++ gnome-web-photo.spec	9 Sep 2009 15:27:31 -0000	1.23
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.0.13
+%define gecko_version 1.9.0.14
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3-22
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3-21
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:27:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:27:58 +0000 (UTC)
Subject: rpms/galeon/F-10 galeon.spec,1.66,1.67
Message-ID: <20090909152758.572FE11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/galeon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6996

Modified Files:
	galeon.spec 
Log Message:
Rebuild against newer gecko


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-10/galeon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- galeon.spec	4 Aug 2009 08:26:20 -0000	1.66
+++ galeon.spec	9 Sep 2009 15:27:58 -0000	1.67
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -123,6 +123,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-14
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:28:52 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:28:52 +0000 (UTC)
Subject: rpms/google-gadgets/F-10 google-gadgets.spec,1.16,1.17
Message-ID: <20090909152852.0073711C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/google-gadgets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7333

Modified Files:
	google-gadgets.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-10
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/google-gadgets.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- google-gadgets.spec	4 Aug 2009 08:31:35 -0000	1.16
+++ google-gadgets.spec	9 Sep 2009 15:28:51 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-10
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-9
 - Rebuild against newer gecko
 



From remi at fedoraproject.org  Wed Sep  9 15:30:21 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 15:30:21 +0000 (UTC)
Subject: rpms/glpi-data-injection/F-11 glpi-data-injection.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090909153021.13D8111C02C8@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7866

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.7.0 (for glpi 0.72)


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-11/glpi-data-injection.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glpi-data-injection.spec	21 Apr 2009 16:27:44 -0000	1.5
+++ glpi-data-injection.spec	9 Sep 2009 15:30:20 -0000	1.6
@@ -1,7 +1,7 @@
-%define pluginname   data_injection
+%define pluginname   datainjection
 
 Name:           glpi-data-injection
-Version:        1.5.1
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn?es dans GLPI
@@ -15,7 +15,10 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
+Requires:       glpi >= 0.72
+
+# This plugin is renamed (for 0.72)
+Provides:       glpi-datainjection = %{version}-%{release}
 
 %description
 Plugin for importing data into GLPI
@@ -39,7 +42,7 @@ Elle pourra servir, par exemple, ? :
 %prep
 %setup -q -c
 
-mv %{pluginname}/test test
+#mv %{pluginname}/test test
 mv %{pluginname}/docs docs
 
 # dos2unix to avoid rpmlint warnings
@@ -89,6 +92,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.7.0-1
+- update to 1.7.0 finale for glpi 0.72
+
 * Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
 - update to 1.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Apr 2009 16:27:44 -0000	1.5
+++ sources	9 Sep 2009 15:30:20 -0000	1.6
@@ -1 +1 @@
-6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz
+29c3c87b73546026b88a9b8928cb8d76  glpi-datainjection-1.7.0.tar.gz



From tmraz at fedoraproject.org  Wed Sep  9 15:33:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  9 Sep 2009 15:33:07 +0000 (UTC)
Subject: rpms/opensc/devel .cvsignore, 1.23, 1.24 opensc.spec, 1.48,
	1.49 sources, 1.23, 1.24
Message-ID: <20090909153307.4680911C00CE@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8830

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Wed Sep 09 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	11 May 2009 11:07:31 -0000	1.23
+++ .cvsignore	9 Sep 2009 15:33:07 -0000	1.24
@@ -1 +1 @@
-opensc-0.11.8.tar.gz
+opensc-0.11.9.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- opensc.spec	21 Aug 2009 15:04:49 -0000	1.48
+++ opensc.spec	9 Sep 2009 15:33:07 -0000	1.49
@@ -1,8 +1,8 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.11.8
-Release:        5%{?dist}
+Version:        0.11.9
+Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -153,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-1
+- new upstream version
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.8-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	11 May 2009 11:07:32 -0000	1.23
+++ sources	9 Sep 2009 15:33:07 -0000	1.24
@@ -1 +1 @@
-a269b478b18dddb648b9bd930206b5a8  opensc-0.11.8.tar.gz
+ff9b5ee4f00693873d54d83398e20847  opensc-0.11.9.tar.gz



From xhorak at fedoraproject.org  Wed Sep  9 15:33:30 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:33:30 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.81,1.82
Message-ID: <20090909153330.E3C1011C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8986

Modified Files:
	kazehakase.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.6
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- kazehakase.spec	4 Aug 2009 08:32:47 -0000	1.81
+++ kazehakase.spec	9 Sep 2009 15:33:30 -0000	1.82
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.5
+Release:	%{_release}%{?dist}.6
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -303,6 +303,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.6
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.5
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Wed Sep  9 15:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:33:54 +0000
Subject: [pkgdb] maven-plugin-bundle was added for akurtakov
Message-ID: <20090909153354.BB6F310F86F@bastion2.fedora.phx.redhat.com>

ausil has added Package maven-plugin-bundle with summary Maven Bundle Plugin
ausil has approved Package maven-plugin-bundle
ausil has added a Fedora devel branch for maven-plugin-bundle with an owner of akurtakov
ausil has approved maven-plugin-bundle in Fedora devel
ausil has approved Package maven-plugin-bundle
ausil has set commit to Approved for 107427 on maven-plugin-bundle (Fedora devel)
ausil has set checkout to Approved for 107427 on maven-plugin-bundle (Fedora devel)
ausil has set build to Approved for 107427 on maven-plugin-bundle (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-bundle



From ausil at fedoraproject.org  Wed Sep  9 15:34:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  9 Sep 2009 15:34:02 +0000 (UTC)
Subject: rpms/maven-plugin-bundle - New directory
Message-ID: <20090909153402.1BAFD11C00CE@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-bundle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvshy9281/rpms/maven-plugin-bundle

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-bundle added to the repository




From ausil at fedoraproject.org  Wed Sep  9 15:34:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  9 Sep 2009 15:34:02 +0000 (UTC)
Subject: rpms/maven-plugin-bundle/devel - New directory
Message-ID: <20090909153402.44DE811C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-bundle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvshy9281/rpms/maven-plugin-bundle/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-bundle/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep  9 15:33:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 15:33:55 +0000
Subject: [pkgdb] maven-plugin-bundle summary updated by ausil
Message-ID: <20090909153355.D20A810F88A@bastion2.fedora.phx.redhat.com>

ausil set package maven-plugin-bundle summary to Maven Bundle Plugin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-bundle



From ausil at fedoraproject.org  Wed Sep  9 15:34:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  9 Sep 2009 15:34:08 +0000 (UTC)
Subject: rpms/maven-plugin-bundle Makefile,NONE,1.1
Message-ID: <20090909153408.AB9F611C00CE@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-bundle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvshy9281/rpms/maven-plugin-bundle

Added Files:
	Makefile 
Log Message:
Setup of module maven-plugin-bundle


--- NEW FILE Makefile ---
# Top level Makefile for module maven-plugin-bundle
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  Wed Sep  9 15:34:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  9 Sep 2009 15:34:09 +0000 (UTC)
Subject: rpms/maven-plugin-bundle/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090909153409.041C911C00CE@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-bundle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvshy9281/rpms/maven-plugin-bundle/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-plugin-bundle


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-plugin-bundle
# $Id: Makefile,v 1.1 2009/09/09 15:34:08 ausil Exp $
NAME := maven-plugin-bundle
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 xhorak at fedoraproject.org  Wed Sep  9 15:34:29 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:34:29 +0000 (UTC)
Subject: rpms/Miro/F-10 Miro.spec,1.57,1.58
Message-ID: <20090909153429.218E811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9466

Modified Files:
	Miro.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-4
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- Miro.spec	4 Aug 2009 08:33:27 -0000	1.57
+++ Miro.spec	9 Sep 2009 15:34:28 -0000	1.58
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.0.13
+%define gecko_ver 1.9.0.14
 
 Name:           Miro
 Version:        2.0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-4
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-3
 - Rebuild against newer gecko
 



From spot at fedoraproject.org  Wed Sep  9 15:34:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Sep 2009 15:34:35 +0000 (UTC)
Subject: rpms/perl-Mail-Box/EL-5 perl-Mail-Box.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090909153435.BB6D011C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-Box/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9448/EL-5

Modified Files:
	perl-Mail-Box.spec sources 
Log Message:
update to 2.091, fix missing dep


Index: perl-Mail-Box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/EL-5/perl-Mail-Box.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Mail-Box.spec	26 Aug 2007 16:24:44 -0000	1.2
+++ perl-Mail-Box.spec	9 Sep 2009 15:34:35 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Mail-Box
-Version:        2.073
+Version:        2.091
 Release:        1%{?dist}
 Summary:        Manage a mailbox, a folder with messages
 Group:          Development/Libraries
@@ -16,7 +16,10 @@ BuildRequires:  perl(HTML::FormatText), 
 BuildRequires:  perl(Errno), perl(Object::Realize::Later), perl(Mail::Address), perl(MIME::Types)
 BuildRequires:  perl(Sys::Hostname), perl(Test::More), perl(Test::Harness), perl(MIME::Base64)
 BuildRequires:  perl(URI), perl(IO::Scalar), perl(Digest::HMAC_MD5), perl(User::Identity)
-BuildRequires:  perl(Time::Zone), perl(Email::Abstract), perl(Email::Simple)
+BuildRequires:  perl(Time::Zone), perl(Email::Simple), perl(Text::Autoformat)
+BuildRequires:  perl(Email::Abstract)
+# When perl(TAP::Harness) shows up, uncomment this, and re-enable the tests.
+BuildRequires:  perl(TAP::Harness)
 BuildArch:      noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -31,6 +34,9 @@ Provides: perl(Mail::Message::Construct:
 Provides: perl(Mail::Message::Construct::Reply) = %{version}
 Provides: perl(Mail::Message::Construct::Text) = %{version}
 
+# I'm also not sure why this requirement isn't getting picked up automatically.
+Requires: perl(Object::Realize::Later)
+
 %description
 The Mail::Box folder is a modern mail-folder manager -- at least at
 the moment of this writing ;)  It is written to replace Mail::Folder,
@@ -40,7 +46,7 @@ although its interface is different.
 %setup -q -n Mail-Box-%{version}
 
 %build
-yes n |%{__perl} Makefile.PL INSTALLDIRS=vendor
+yes y |%{__perl} Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
@@ -62,8 +68,7 @@ recode()
 recode $RPM_BUILD_ROOT%{_mandir}/man3/Mail::Message::Field.3pm iso-8859-1
 
 %check
-# We can't do this, perl(Test::Harness) is too old. :/
-# make test
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +80,39 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.091-1
+- update to 2.091
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.087-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.087-1
+- update to 2.087
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.084-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Nov  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.084-1
+- update to 2.084
+
+* Thu Jun  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.082-1
+- update to 2.082
+
+* Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.073-5
+- Rebuild second pass, tests enabled
+
+* Sun Mar  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.073-4
+- Rebuild, first pass, disable tests, BR on Email::Abstract
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.073-3
+- Rebuild for perl 5.10 (again)
+
+* Sat Feb  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.073-2
+- rebuild for new perl
+
+* Mon Jan 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.073-1.1
+- first rebuild pass, break look with Email::Abstract
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 2.073-1
 - 2.073
 - license fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2007 16:24:44 -0000	1.3
+++ sources	9 Sep 2009 15:34:35 -0000	1.4
@@ -1,2 +1 @@
-f6b0da296a582e06880f93f166f57bb7  Mail-Box-2.070.tar.gz
-b8811e618cd57b0c343e0426889989c0  Mail-Box-2.073.tar.gz
+8e8b979d186037636d2111572c2fc467  Mail-Box-2.091.tar.gz



From spot at fedoraproject.org  Wed Sep  9 15:34:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Sep 2009 15:34:36 +0000 (UTC)
Subject: rpms/perl-Mail-Box/F-11 perl-Mail-Box.spec, 1.10, 1.11 sources, 1.6,
	1.7
Message-ID: <20090909153436.1E19811C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-Box/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9448/F-11

Modified Files:
	perl-Mail-Box.spec sources 
Log Message:
update to 2.091, fix missing dep


Index: perl-Mail-Box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/F-11/perl-Mail-Box.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Mail-Box.spec	13 Mar 2009 20:42:39 -0000	1.10
+++ perl-Mail-Box.spec	9 Sep 2009 15:34:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Mail-Box
-Version:        2.087
+Version:        2.091
 Release:        1%{?dist}
 Summary:        Manage a mailbox, a folder with messages
 Group:          Development/Libraries
@@ -16,7 +16,7 @@ BuildRequires:  perl(HTML::FormatText), 
 BuildRequires:  perl(Errno), perl(Object::Realize::Later), perl(Mail::Address), perl(MIME::Types)
 BuildRequires:  perl(Sys::Hostname), perl(Test::More), perl(Test::Harness), perl(MIME::Base64)
 BuildRequires:  perl(URI), perl(IO::Scalar), perl(Digest::HMAC_MD5), perl(User::Identity)
-BuildRequires:  perl(Time::Zone), perl(Email::Simple)
+BuildRequires:  perl(Time::Zone), perl(Email::Simple), perl(Text::Autoformat)
 BuildRequires:  perl(Email::Abstract)
 # When perl(TAP::Harness) shows up, uncomment this, and re-enable the tests.
 BuildRequires:  perl(TAP::Harness)
@@ -34,6 +34,9 @@ Provides: perl(Mail::Message::Construct:
 Provides: perl(Mail::Message::Construct::Reply) = %{version}
 Provides: perl(Mail::Message::Construct::Text) = %{version}
 
+# I'm also not sure why this requirement isn't getting picked up automatically.
+Requires: perl(Object::Realize::Later)
+
 %description
 The Mail::Box folder is a modern mail-folder manager -- at least at
 the moment of this writing ;)  It is written to replace Mail::Folder,
@@ -77,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.091-1
+- update to 2.091
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.087-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.087-1
 - update to 2.087
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Mar 2009 20:42:40 -0000	1.6
+++ sources	9 Sep 2009 15:34:35 -0000	1.7
@@ -1 +1 @@
-fb37d0a450130bd74fb85ee3d7794cd9  Mail-Box-2.087.tar.gz
+8e8b979d186037636d2111572c2fc467  Mail-Box-2.091.tar.gz



From spot at fedoraproject.org  Wed Sep  9 15:34:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Sep 2009 15:34:35 +0000 (UTC)
Subject: rpms/perl-Mail-Box/F-10 perl-Mail-Box.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090909153435.E7A2211C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-Box/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9448/F-10

Modified Files:
	perl-Mail-Box.spec sources 
Log Message:
update to 2.091, fix missing dep


Index: perl-Mail-Box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/F-10/perl-Mail-Box.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Mail-Box.spec	4 Nov 2008 16:21:55 -0000	1.8
+++ perl-Mail-Box.spec	9 Sep 2009 15:34:35 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Mail-Box
-Version:        2.084
+Version:        2.091
 Release:        1%{?dist}
 Summary:        Manage a mailbox, a folder with messages
 Group:          Development/Libraries
@@ -16,7 +16,7 @@ BuildRequires:  perl(HTML::FormatText), 
 BuildRequires:  perl(Errno), perl(Object::Realize::Later), perl(Mail::Address), perl(MIME::Types)
 BuildRequires:  perl(Sys::Hostname), perl(Test::More), perl(Test::Harness), perl(MIME::Base64)
 BuildRequires:  perl(URI), perl(IO::Scalar), perl(Digest::HMAC_MD5), perl(User::Identity)
-BuildRequires:  perl(Time::Zone), perl(Email::Simple)
+BuildRequires:  perl(Time::Zone), perl(Email::Simple), perl(Text::Autoformat)
 BuildRequires:  perl(Email::Abstract)
 # When perl(TAP::Harness) shows up, uncomment this, and re-enable the tests.
 BuildRequires:  perl(TAP::Harness)
@@ -34,6 +34,9 @@ Provides: perl(Mail::Message::Construct:
 Provides: perl(Mail::Message::Construct::Reply) = %{version}
 Provides: perl(Mail::Message::Construct::Text) = %{version}
 
+# I'm also not sure why this requirement isn't getting picked up automatically.
+Requires: perl(Object::Realize::Later)
+
 %description
 The Mail::Box folder is a modern mail-folder manager -- at least at
 the moment of this writing ;)  It is written to replace Mail::Folder,
@@ -77,6 +80,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.091-1
+- update to 2.091
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.087-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.087-1
+- update to 2.087
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.084-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Nov  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.084-1
 - update to 2.084
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Nov 2008 16:21:55 -0000	1.5
+++ sources	9 Sep 2009 15:34:35 -0000	1.6
@@ -1 +1 @@
-c00b6d4147b3342520c0ba474e8a4ad8  Mail-Box-2.084.tar.gz
+8e8b979d186037636d2111572c2fc467  Mail-Box-2.091.tar.gz



From spot at fedoraproject.org  Wed Sep  9 15:34:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Sep 2009 15:34:36 +0000 (UTC)
Subject: rpms/perl-Mail-Box/devel .cvsignore, 1.6, 1.7 perl-Mail-Box.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20090909153436.5753811C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Mail-Box/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9448/devel

Modified Files:
	.cvsignore perl-Mail-Box.spec sources 
Log Message:
update to 2.091, fix missing dep


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Mar 2009 20:42:37 -0000	1.6
+++ .cvsignore	9 Sep 2009 15:34:36 -0000	1.7
@@ -1 +1 @@
-Mail-Box-2.087.tar.gz
+Mail-Box-2.091.tar.gz


Index: perl-Mail-Box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/devel/perl-Mail-Box.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Mail-Box.spec	26 Jul 2009 09:06:33 -0000	1.11
+++ perl-Mail-Box.spec	9 Sep 2009 15:34:36 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Box
-Version:        2.087
-Release:        2%{?dist}
+Version:        2.091
+Release:        1%{?dist}
 Summary:        Manage a mailbox, a folder with messages
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -16,7 +16,7 @@ BuildRequires:  perl(HTML::FormatText), 
 BuildRequires:  perl(Errno), perl(Object::Realize::Later), perl(Mail::Address), perl(MIME::Types)
 BuildRequires:  perl(Sys::Hostname), perl(Test::More), perl(Test::Harness), perl(MIME::Base64)
 BuildRequires:  perl(URI), perl(IO::Scalar), perl(Digest::HMAC_MD5), perl(User::Identity)
-BuildRequires:  perl(Time::Zone), perl(Email::Simple)
+BuildRequires:  perl(Time::Zone), perl(Email::Simple), perl(Text::Autoformat)
 BuildRequires:  perl(Email::Abstract)
 # When perl(TAP::Harness) shows up, uncomment this, and re-enable the tests.
 BuildRequires:  perl(TAP::Harness)
@@ -34,6 +34,9 @@ Provides: perl(Mail::Message::Construct:
 Provides: perl(Mail::Message::Construct::Reply) = %{version}
 Provides: perl(Mail::Message::Construct::Text) = %{version}
 
+# I'm also not sure why this requirement isn't getting picked up automatically.
+Requires: perl(Object::Realize::Later)
+
 %description
 The Mail::Box folder is a modern mail-folder manager -- at least at
 the moment of this writing ;)  It is written to replace Mail::Folder,
@@ -77,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.091-1
+- update to 2.091
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.087-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Mar 2009 20:42:40 -0000	1.6
+++ sources	9 Sep 2009 15:34:36 -0000	1.7
@@ -1 +1 @@
-fb37d0a450130bd74fb85ee3d7794cd9  Mail-Box-2.087.tar.gz
+8e8b979d186037636d2111572c2fc467  Mail-Box-2.091.tar.gz



From xhorak at fedoraproject.org  Wed Sep  9 15:35:34 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:35:34 +0000 (UTC)
Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.14,1.15
Message-ID: <20090909153534.8A2B811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9899

Modified Files:
	mozvoikko.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-14
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-10/mozvoikko.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mozvoikko.spec	4 Aug 2009 08:34:16 -0000	1.14
+++ mozvoikko.spec	9 Sep 2009 15:35:34 -0000	1.15
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.13
+%define gecko_ver 1.9.0.14
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-14
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:36:32 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:36:32 +0000 (UTC)
Subject: rpms/mugshot/F-10 mugshot.spec,1.51,1.52
Message-ID: <20090909153632.B368211C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mugshot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10635

Modified Files:
	mugshot.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-13
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-10/mugshot.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- mugshot.spec	4 Aug 2009 08:35:15 -0000	1.51
+++ mugshot.spec	9 Sep 2009 15:36:32 -0000	1.52
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-13
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-12
 - Rebuild against newer gecko
 



From rstrode at fedoraproject.org  Wed Sep  9 15:37:24 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  9 Sep 2009 15:37:24 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec, 1.140,
	1.141 plymouth-generate-initrd, 1.1, NONE
Message-ID: <20090909153724.AC53811C00CE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11762

Modified Files:
	plymouth.spec 
Removed Files:
	plymouth-generate-initrd 
Log Message:
- Look for inst() in dracut as well as mkinitrd bash source file
- Drop plymouth initrd for now.



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- plymouth.spec	29 Aug 2009 02:46:38 -0000	1.140
+++ plymouth.spec	9 Sep 2009 15:37:24 -0000	1.141
@@ -1,19 +1,17 @@
 %define plymouthdaemon_execdir /sbin
 %define plymouthclient_execdir /bin
 %define plymouth_libdir /%{_lib}
-%define plymouth_initrd_file /boot/initrd-plymouth.img
 
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 Source1: boot-duration
 Source2: charge.plymouth
 Source3: plymouth-set-default-plugin
-Source4: plymouth-generate-initrd
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +25,7 @@ Obsoletes: plymouth-plugin-pulser < 0.7.
 Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
 Patch0: 0001-populate-initrd-Get-plugin-path-from-plymouth.patch
+Patch1: 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -235,6 +234,7 @@ plugin.
 %prep
 %setup -q
 %patch0 -p1 -b .plugin-path
+%patch1 -p1 -b .inst-function
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -280,19 +280,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/plymou
 cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
 chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
 
-# Copied from git until the next release or snapshot
-cp $RPM_SOURCE_DIR/plymouth-generate-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth
-chmod +x $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-generate-initrd
-
-mkdir -p $RPM_BUILD_ROOT$(dirname %{plymouth_initrd_file})
-touch $RPM_BUILD_ROOT%{plymouth_initrd_file}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
-%{_libexecdir}/plymouth/plymouth-generate-initrd
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -308,7 +300,6 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then
         %{_sbindir}/plymouth-set-default-theme text
-        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -317,7 +308,6 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
-        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -326,7 +316,6 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
-        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -337,7 +326,6 @@ if [ $1 -eq 1 ]; then
 else
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
         %{_sbindir}/plymouth-set-default-theme charge
-        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -346,7 +334,6 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
-        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -369,7 +356,6 @@ fi
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
-%ghost %{plymouth_initrd_file}
 
 %files devel
 %defattr(-, root, root)
@@ -390,7 +376,6 @@ fi
 %{_sbindir}/plymouth-set-default-plugin
 %{_libexecdir}/plymouth/plymouth-update-initrd
 %{_libexecdir}/plymouth/plymouth-populate-initrd
-%{_libexecdir}/plymouth/plymouth-generate-initrd
 
 %files utils
 %defattr(-, root, root)
@@ -465,6 +450,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Sep  9 2009 Ray Strode <rstrode at redhat.com> 0.7.1-4
+- Look for inst() in dracut as well as mkinitrd bash source file
+- Drop plymouth initrd for now.
+
 * Fri Aug 28 2009 Ray Strode <rstrode at redhat.com> 0.7.1-3
 - Create plymouth supplementary initrd in post (bug 515589)
 


--- plymouth-generate-initrd DELETED ---



From xhorak at fedoraproject.org  Wed Sep  9 15:40:06 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:40:06 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.21,1.22
Message-ID: <20090909154006.BD98A11C043D@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12599

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-13
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- pcmanx-gtk2.spec	4 Aug 2009 08:36:05 -0000	1.21
+++ pcmanx-gtk2.spec	9 Sep 2009 15:40:06 -0000	1.22
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.0.13
+%define xulver 1.9.0.14
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   12%{?dist}
+Release:   13%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-13
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-12
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:46:03 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:46:03 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.48,1.49
Message-ID: <20090909154603.623BA11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14179

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-1.2
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ruby-gnome2.spec	4 Aug 2009 08:37:11 -0000	1.48
+++ ruby-gnome2.spec	9 Sep 2009 15:46:03 -0000	1.49
@@ -4,7 +4,7 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -13,7 +13,7 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
-Release:        %{mainrel}%{?dist}.1
+Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -1076,6 +1076,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-2
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-1.1
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:46:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:46:49 +0000 (UTC)
Subject: rpms/yelp/F-10 yelp.spec,1.156,1.157
Message-ID: <20090909154649.3FF6B11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/yelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14499

Modified Files:
	yelp.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-13
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-10/yelp.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- yelp.spec	4 Aug 2009 08:37:54 -0000	1.156
+++ yelp.spec	9 Sep 2009 15:46:48 -0000	1.157
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.0.13
+%define gecko_version 1.9.0.14
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.24.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -157,6 +157,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-13
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-12
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 15:48:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 15:48:10 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.9,1.10
Message-ID: <20090909154810.53AC511C043D@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14913

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-10/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gtk2-MozEmbed.spec	4 Aug 2009 08:38:39 -0000	1.9
+++ perl-Gtk2-MozEmbed.spec	9 Sep 2009 15:48:10 -0000	1.10
@@ -3,7 +3,7 @@
 %if 0%{?fedora} >= 11
 %define gecko_version 1.9.1
 %else
-%define gecko_version 1.9.0.13
+%define gecko_version 1.9.0.14
 %endif
 
 # Using specfilever cause dumpspec to only increase 
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}.4
+Release:       %{specfilever}%{?dist}.5
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.4
 - Rebuild against newer gecko
 



From mcepl at fedoraproject.org  Wed Sep  9 15:49:30 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 15:49:30 +0000 (UTC)
Subject: rpms/nimbus/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090909154930.0DAFD11C00CE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15340

Modified Files:
	.cvsignore sources 
Log Message:
Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:14:19 -0000	1.1
+++ .cvsignore	9 Sep 2009 15:49:29 -0000	1.2
@@ -0,0 +1 @@
+nimbus-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:14:19 -0000	1.1
+++ sources	9 Sep 2009 15:49:29 -0000	1.2
@@ -0,0 +1 @@
+c338357e3918cf391193b8429cab5975  nimbus-0.0.17.tar.bz2



From mcepl at fedoraproject.org  Wed Sep  9 15:49:55 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 15:49:55 +0000 (UTC)
Subject: rpms/nimbus/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090909154955.DAA1511C00CE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15520

Modified Files:
	.cvsignore sources 
Log Message:
Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:14:19 -0000	1.1
+++ .cvsignore	9 Sep 2009 15:49:55 -0000	1.2
@@ -0,0 +1 @@
+nimbus-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:14:19 -0000	1.1
+++ sources	9 Sep 2009 15:49:55 -0000	1.2
@@ -0,0 +1 @@
+c338357e3918cf391193b8429cab5975  nimbus-0.0.17.tar.bz2



From ajax at fedoraproject.org  Wed Sep  9 15:50:28 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 15:50:28 +0000 (UTC)
Subject: rpms/system-config-display/devel .cvsignore, 1.39, 1.40 sources,
	1.47, 1.48 system-config-display.spec, 1.66, 1.67
Message-ID: <20090909155028.E186911C043A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/system-config-display/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15723

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 2.1-1
- s-c-d 2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	8 Feb 2009 21:24:52 -0000	1.39
+++ .cvsignore	9 Sep 2009 15:50:28 -0000	1.40
@@ -1 +1 @@
-system-config-display-1.1.3.tar.bz2
+system-config-display-2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	8 Feb 2009 21:24:52 -0000	1.47
+++ sources	9 Sep 2009 15:50:28 -0000	1.48
@@ -1 +1 @@
-aa1119b7a7e97ce4e03bec53c6fb2731  system-config-display-1.1.3.tar.bz2
+31233e8a1f778c64ad728288071d4b86  system-config-display-2.1.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- system-config-display.spec	27 Jul 2009 05:22:26 -0000	1.66
+++ system-config-display.spec	9 Sep 2009 15:50:28 -0000	1.67
@@ -1,13 +1,12 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.1.3
-Release: 3%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
 
 Source0: http://fedorahosted.org/releases/s/y/%{name}/%{name}-%{version}.tar.bz2
 
@@ -22,8 +21,6 @@ Requires: usermode-gtk
 Requires: hwdata >= 0.169
 Requires: dbus-python
 Requires: pyxf86config >= 0.3.16
-Requires: rhpl >= 0.170-1
-Requires: rhpxl >= 0.34-1
 Requires: /usr/bin/Xorg
 Requires: metacity
 Requires: gtk2 >= 2.6
@@ -78,6 +75,9 @@ fi
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 2.1-1
+- s-c-d 2.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Wed Sep  9 15:50:45 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 15:50:45 +0000 (UTC)
Subject: rpms/nimbus/F-11 nimbus-0.0.17-stock-icons.patch, NONE,
	1.1 nimbus.spec, NONE, 1.1
Message-ID: <20090909155045.553F511C043A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15911

Added Files:
	nimbus-0.0.17-stock-icons.patch nimbus.spec 
Log Message:
Forgot to add nimbus* files

nimbus-0.0.17-stock-icons.patch:
 gtk-engine/gtk-2.0/Makefile.am |   12 ++++++++----
 gtk-engine/gtk-2.0/gtkrc       |    2 --
 gtk-engine/gtk-2.0/iconrc      |    2 +-
 gtk-engine/gtk-2.0/iconrc.in   |    2 +-
 icons/index.theme.in           |    7 ++++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE nimbus-0.0.17-stock-icons.patch ---
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc	2008-04-08 14:20:00.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,5 +1,3 @@
-include "iconrc"
-
 style "default"
 {
   bg[NORMAL]        = "#d6d9df"
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc	2008-08-14 11:18:46.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "/usr/local/share/themes/nimbus/gtk-2.0"
+pixmap_path "/usr/local/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "@prefix@/share/themes/nimbus/gtk-2.0"
+pixmap_path "@prefix@/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am	2009-07-26 02:16:55.000000000 +0200
@@ -1,7 +1,11 @@
 themedir = $(datadir)/themes//$(PACKAGE)/gtk-2.0
-theme_DATA =	gtkrc		\
-		iconrc		\
-		dialog_authentication.png  \
+theme_DATA =	gtkrc		
+
+iconrcdir = $(datadir)/icons//$(PACKAGE)
+iconrc_DATA = 	iconrc
+
+icondir = $(datadir)/icons//$(PACKAGE)/24x24/stock
+icon_DATA = 	dialog_authentication.png  \
 		dialog_info.png  \
 		dialog_warning.png  \
 		dialog_error.png  \
@@ -99,5 +103,5 @@
 		zoom-in.png  \
 		zoom-out.png  
 
-EXTRA_DIST = $(theme_DATA)    \
+EXTRA_DIST = $(iconrc_DATA)    \
 	     iconrc.in	      
diff -dur nimbus-0.0.17.orig/icons/index.theme.in nimbus-0.0.17/icons/index.theme.in
--- nimbus-0.0.17.orig/icons/index.theme.in	2007-10-05 10:17:20.000000000 +0200
+++ nimbus-0.0.17/icons/index.theme.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=nimbus
 Inherits=Tango
-Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
+Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,24x24/stock,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
 Example=user-desktop
 
 [12x12/actions]
@@ -129,6 +129,11 @@
 Context=Status
 Type=Fixed
 
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
 [32x32/actions]
 Size=32
 Context=Actions


--- NEW FILE nimbus.spec ---
Name:      nimbus
Version:   0.0.17
Release:   6%{?dist}
Summary:   Desktop theme originally from Sun

Group:      User Interface/Desktops
License:   LGPLv2

URL:      https://nimbus.dev.java.net/
# SHA1 0b984715e0c010ce034a32b7ba69e0582be65362
Source0:   http://dlc.sun.com/osol/jds/downloads/extras/nimbus-%{version}.tar.bz2
Patch0:     nimbus-0.0.17-stock-icons.patch

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:   icon-naming-utils glib2-devel gtk2-devel
BuildRequires:   intltool automake libtool autoconf

%description
Just a virtual package to collect all Nimbus related components.

%package -n nimbus-theme-gnome
Summary: Desktop theme from Sun
Group: User Interface/Desktops
Requires:   gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
BuildArch: noarch

%description -n nimbus-theme-gnome
The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
gtk2 theme and Icon set. It originates from Opensolaris by Sun.

%package -n gtk-nimbus-engine
Summary: Gtk+ engine for %{name}
Group: User Interface/Desktops
Requires: gtk2-engines

%description -n gtk-nimbus-engine
Gtk+ engine for %{name}.

%package -n nimbus-icon-theme
Summary: Icons for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires: fedora-logos

%description -n nimbus-icon-theme
Icons for %{name}.

%package -n nimbus-metacity-theme
Summary: Metacity theme for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires:   metacity

%description -n nimbus-metacity-theme
Theme for metacity as part of %{name}.

%prep
%setup -q -n nimbus-%{version}
%patch0 -p1 -b .stok-icons

echo 'NotificationTheme=nimbus' >> index.theme
TMPFILE=$(mktemp rpmbuild-nimbus-XXXXXX)
iconv -f iso-8859-1 -t utf-8 ChangeLog >$TMPFILE
touch --reference=ChangeLog $TMPFILE
chmod --reference=ChangeLog $TMPFILE
mv $TMPFILE ChangeLog


%build
aclocal --force
libtoolize --copy --force --automake
intltoolize --automake --copy --force
autoconf --force
automake --copy --add-missing
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#no-la
find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
install -Dp -m 0644 index.theme \
   $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache

# removing OpenSolaris branding use start-here.png from Fedora
find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
     |while read FILENAME ; do
            NEWICON=$(echo $FILENAME \
            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
			  	ln -sf -v $NEWICON $FILENAME
	  done
	
%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/nimbus &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	 touch --no-create %{_datadir}/icons/nimbus &>/dev/null
	 gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :

%files -n gtk-nimbus-engine
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING gtk-engine/docs.txt
%{_libdir}/gtk-2.0/*/engines/libnimbus.so
%{_datadir}/themes/nimbus/gtk-2.0/gtkrc
%dir %{_datadir}/themes/nimbus/gtk-2.0/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-metacity-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/themes/nimbus/metacity-1/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-icon-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/icons/nimbus/
%ghost %{_datadir}/icons/nimbus/icon-theme.cache

%files -n nimbus-theme-gnome
%defattr(-,root,root,-)
%{_datadir}/themes/nimbus/index.theme

%changelog
* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-6
- remove OpenSolaris branding
- add Requires for fedora-logos to nimbus-icon-theme

* Tue Aug  4 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-5
- new version of nimbus-0.0.17-stock-icons.patch
- remove another unnecessary %%dir in %%files

* Sat May 16 2009 matej <mcepl at redhat.com> 0.0.17-4
- reogrganization of subpackages
- many changes in %%files

* Mon Apr 20 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-3
- Packaging Review fixes

* Thu Mar 12 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-2
- Fix License tag.

* Mon Mar 02 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-1
- Initial affert to package



From mcepl at fedoraproject.org  Wed Sep  9 15:51:06 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 15:51:06 +0000 (UTC)
Subject: rpms/nimbus/F-10 nimbus-0.0.17-stock-icons.patch, NONE,
	1.1 nimbus.spec, NONE, 1.1
Message-ID: <20090909155106.BF7AA11C00CE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16031

Added Files:
	nimbus-0.0.17-stock-icons.patch nimbus.spec 
Log Message:
Forgot to add nimbus* files

nimbus-0.0.17-stock-icons.patch:
 gtk-engine/gtk-2.0/Makefile.am |   12 ++++++++----
 gtk-engine/gtk-2.0/gtkrc       |    2 --
 gtk-engine/gtk-2.0/iconrc      |    2 +-
 gtk-engine/gtk-2.0/iconrc.in   |    2 +-
 icons/index.theme.in           |    7 ++++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE nimbus-0.0.17-stock-icons.patch ---
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc	2008-04-08 14:20:00.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,5 +1,3 @@
-include "iconrc"
-
 style "default"
 {
   bg[NORMAL]        = "#d6d9df"
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc	2008-08-14 11:18:46.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "/usr/local/share/themes/nimbus/gtk-2.0"
+pixmap_path "/usr/local/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "@prefix@/share/themes/nimbus/gtk-2.0"
+pixmap_path "@prefix@/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am	2009-07-26 02:16:55.000000000 +0200
@@ -1,7 +1,11 @@
 themedir = $(datadir)/themes//$(PACKAGE)/gtk-2.0
-theme_DATA =	gtkrc		\
-		iconrc		\
-		dialog_authentication.png  \
+theme_DATA =	gtkrc		
+
+iconrcdir = $(datadir)/icons//$(PACKAGE)
+iconrc_DATA = 	iconrc
+
+icondir = $(datadir)/icons//$(PACKAGE)/24x24/stock
+icon_DATA = 	dialog_authentication.png  \
 		dialog_info.png  \
 		dialog_warning.png  \
 		dialog_error.png  \
@@ -99,5 +103,5 @@
 		zoom-in.png  \
 		zoom-out.png  
 
-EXTRA_DIST = $(theme_DATA)    \
+EXTRA_DIST = $(iconrc_DATA)    \
 	     iconrc.in	      
diff -dur nimbus-0.0.17.orig/icons/index.theme.in nimbus-0.0.17/icons/index.theme.in
--- nimbus-0.0.17.orig/icons/index.theme.in	2007-10-05 10:17:20.000000000 +0200
+++ nimbus-0.0.17/icons/index.theme.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=nimbus
 Inherits=Tango
-Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
+Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,24x24/stock,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
 Example=user-desktop
 
 [12x12/actions]
@@ -129,6 +129,11 @@
 Context=Status
 Type=Fixed
 
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
 [32x32/actions]
 Size=32
 Context=Actions


--- NEW FILE nimbus.spec ---
Name:      nimbus
Version:   0.0.17
Release:   6%{?dist}
Summary:   Desktop theme originally from Sun

Group:      User Interface/Desktops
License:   LGPLv2

URL:      https://nimbus.dev.java.net/
# SHA1 0b984715e0c010ce034a32b7ba69e0582be65362
Source0:   http://dlc.sun.com/osol/jds/downloads/extras/nimbus-%{version}.tar.bz2
Patch0:     nimbus-0.0.17-stock-icons.patch

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:   icon-naming-utils glib2-devel gtk2-devel
BuildRequires:   intltool automake libtool autoconf

%description
Just a virtual package to collect all Nimbus related components.

%package -n nimbus-theme-gnome
Summary: Desktop theme from Sun
Group: User Interface/Desktops
Requires:   gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
BuildArch: noarch

%description -n nimbus-theme-gnome
The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
gtk2 theme and Icon set. It originates from Opensolaris by Sun.

%package -n gtk-nimbus-engine
Summary: Gtk+ engine for %{name}
Group: User Interface/Desktops
Requires: gtk2-engines

%description -n gtk-nimbus-engine
Gtk+ engine for %{name}.

%package -n nimbus-icon-theme
Summary: Icons for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires: fedora-logos

%description -n nimbus-icon-theme
Icons for %{name}.

%package -n nimbus-metacity-theme
Summary: Metacity theme for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires:   metacity

%description -n nimbus-metacity-theme
Theme for metacity as part of %{name}.

%prep
%setup -q -n nimbus-%{version}
%patch0 -p1 -b .stok-icons

echo 'NotificationTheme=nimbus' >> index.theme
TMPFILE=$(mktemp rpmbuild-nimbus-XXXXXX)
iconv -f iso-8859-1 -t utf-8 ChangeLog >$TMPFILE
touch --reference=ChangeLog $TMPFILE
chmod --reference=ChangeLog $TMPFILE
mv $TMPFILE ChangeLog


%build
aclocal --force
libtoolize --copy --force --automake
intltoolize --automake --copy --force
autoconf --force
automake --copy --add-missing
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#no-la
find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
install -Dp -m 0644 index.theme \
   $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache

# removing OpenSolaris branding use start-here.png from Fedora
find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
     |while read FILENAME ; do
            NEWICON=$(echo $FILENAME \
            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
			  	ln -sf -v $NEWICON $FILENAME
	  done
	
%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/nimbus &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	 touch --no-create %{_datadir}/icons/nimbus &>/dev/null
	 gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :

%files -n gtk-nimbus-engine
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING gtk-engine/docs.txt
%{_libdir}/gtk-2.0/*/engines/libnimbus.so
%{_datadir}/themes/nimbus/gtk-2.0/gtkrc
%dir %{_datadir}/themes/nimbus/gtk-2.0/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-metacity-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/themes/nimbus/metacity-1/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-icon-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/icons/nimbus/
%ghost %{_datadir}/icons/nimbus/icon-theme.cache

%files -n nimbus-theme-gnome
%defattr(-,root,root,-)
%{_datadir}/themes/nimbus/index.theme

%changelog
* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-6
- remove OpenSolaris branding
- add Requires for fedora-logos to nimbus-icon-theme

* Tue Aug  4 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-5
- new version of nimbus-0.0.17-stock-icons.patch
- remove another unnecessary %%dir in %%files

* Sat May 16 2009 matej <mcepl at redhat.com> 0.0.17-4
- reogrganization of subpackages
- many changes in %%files

* Mon Apr 20 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-3
- Packaging Review fixes

* Thu Mar 12 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-2
- Fix License tag.

* Mon Mar 02 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-1
- Initial affert to package



From remi at fedoraproject.org  Wed Sep  9 15:51:44 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 15:51:44 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/F-11 glpi-mass-ocs-import.spec, 1.6,
	1.7 sources, 1.5, 1.6 glpi-mass-ocs-import.conf, 1.1, NONE
Message-ID: <20090909155144.27D4811C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16314

Modified Files:
	glpi-mass-ocs-import.spec sources 
Removed Files:
	glpi-mass-ocs-import.conf 
Log Message:
update to 1.3.0 for glpi 0.72


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-11/glpi-mass-ocs-import.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- glpi-mass-ocs-import.spec	9 Apr 2009 15:18:45 -0000	1.6
+++ glpi-mass-ocs-import.spec	9 Sep 2009 15:51:44 -0000	1.7
@@ -1,8 +1,8 @@
-%define pluginname   mass_ocs_import
-%define lockname     mass_ocs_import.lock
+%define pluginname   massocsimport
+%define lockname     massocsimport.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.2
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -12,18 +12,13 @@ License:        GPLv2+
 URL:            http://www.glpi-project.org/
 
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
-Source1:        %{name}.conf
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
-%if 0%{?rhel} == 4
-Requires:       php
-%else
+Requires:       glpi >= 0.72
 Requires:       php-cli
-%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -55,11 +50,15 @@ for fic in docs/*; do
 done
 
 cat >README-RPM-POSTINTALL.txt <<EOF
-
 Remember to Install this extension in the Application.
-
 Cron is provided, but disabled. 
+EOF
 
+cat >%{name}.httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
+    Order Allow,Deny
+    Deny from all
+</Directory>
 EOF
 
 cat >cron <<EOF
@@ -91,7 +90,7 @@ touch %{buildroot}%{_localstatedir}/lib/
 # ===== apache =====
 rm %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/.htaccess
 mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-install --mode 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install --mode 644 %{name}.httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 
 %post
@@ -111,7 +110,7 @@ fi
 %check
 # Check the name of the lock file in sources
 grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/ocsng_fullsync.sh || exit 1
-grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/config/plugin_mass_ocs_import.config.php || exit 1
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php || exit 1
 
 
 %clean
@@ -129,6 +128,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3.0-1
+- update to 1.3.0 finale for glpi 0.72
+
 * Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
 - update to 1.2.2 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Apr 2009 15:18:45 -0000	1.5
+++ sources	9 Sep 2009 15:51:44 -0000	1.6
@@ -1 +1 @@
-abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz
+15f00aec2062ce5ca652abe89530a7cd  glpi-massocsimport-1.3.0.tar.gz


--- glpi-mass-ocs-import.conf DELETED ---



From rrakus at fedoraproject.org  Wed Sep  9 15:55:37 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed,  9 Sep 2009 15:55:37 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot.spec,1.65,1.66
Message-ID: <20090909155537.8BB6911C00CE@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18501

Modified Files:
	yaboot.spec 
Log Message:
Do not require hfsutils on RHEL 6


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- yaboot.spec	14 Aug 2009 13:55:37 -0000	1.65
+++ yaboot.spec	9 Sep 2009 15:55:37 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -34,11 +34,17 @@ Patch35: yaboot-1.3.14-returns.patch
 # ipv6 support
 Patch36: yaboot-1.3.14-ipv6.patch
 
+
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
 ExclusiveArch: ppc
+
+# hfsutils will not be in RHEL6.
+# hfsutils is needed only for non-IBM ppc machines
+%if ! 0%{?rhel} < 6
 Requires: hfsutils
+%endif
 BuildRequires: e2fsprogs-devel
 
 # yaboot is bootloader. It contains ELF object, but it is not Linux or MacOS
@@ -112,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Wed Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-18
+- Do not require hfsutils on RHEL 6
+
 * Fri Aug 14 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-17
 - ipv6 support
 - don't build debuginfo package



From tgl at fedoraproject.org  Wed Sep  9 15:57:30 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed,  9 Sep 2009 15:57:30 +0000 (UTC)
Subject: rpms/postgresql/F-11 postgresql-no-probes.patch, NONE,
	1.1 .cvsignore, 
	1.46, 1.47 postgresql-ac-version.patch, 1.7, 1.8 postgresql.spec,
	1.111, 1.112 sources, 1.47, 1.48
Message-ID: <20090909155730.54D0A11C00CE@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21604

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Added Files:
	postgresql-no-probes.patch 
Log Message:
Update to PostgreSQL 8.3.8

postgresql-no-probes.patch:
 Makefile |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE postgresql-no-probes.patch ---
Workaround for broken systemtap dtrace as of 9/2009 --- it puts the
probes.o output file in the wrong place (bz #520469).  That file is
just an empty stub anyway in the systemtap implementation, so easiest
fix is to not ask for it to be generated.


diff -Naur postgresql-8.3.7.orig/src/backend/Makefile postgresql-8.3.7/src/backend/Makefile
--- postgresql-8.3.7.orig/src/backend/Makefile	2008-01-01 14:45:45.000000000 -0500
+++ postgresql-8.3.7/src/backend/Makefile	2009-09-06 13:03:48.000000000 -0400
@@ -20,10 +20,6 @@
 
 SUBSYSOBJS = $(DIRS:%=%/SUBSYS.o)
 
-ifeq ($(enable_dtrace), yes)
-LOCALOBJS += utils/probes.o
-endif
-
 OBJS = $(SUBSYSOBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a
 
 # We put libpgport into OBJS, so remove it from LIBS; also add libldap


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	21 Mar 2009 22:43:49 -0000	1.46
+++ .cvsignore	9 Sep 2009 15:57:29 -0000	1.47
@@ -1,5 +1,5 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.3.8.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.7-US.pdf
+postgresql-8.3.8-US.pdf

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql-ac-version.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- postgresql-ac-version.patch	21 Mar 2009 22:43:49 -0000	1.7
+++ postgresql-ac-version.patch	9 Sep 2009 15:57:29 -0000	1.8
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.3.7.orig/configure.in postgresql-8.3.7/configure.in
---- postgresql-8.3.7.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.7/configure.in	2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.8.orig/configure.in postgresql-8.3.8/configure.in
+--- postgresql-8.3.8.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.8/configure.in	2008-09-25 10:26:10.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3.7], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.8], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- postgresql.spec	20 Aug 2009 19:00:06 -0000	1.111
+++ postgresql.spec	9 Sep 2009 15:57:29 -0000	1.112
@@ -83,8 +83,9 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.7
-Release: 1%{?dist}.1
+Version: 8.3.8
+Release: 1%{?dist}
+# PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -98,7 +99,7 @@ Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.7-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.8-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -109,6 +110,7 @@ Patch3: postgresql-logging.patch
 Patch4: postgresql-test.patch
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
+Patch7: postgresql-no-probes.patch
 
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -361,6 +363,7 @@ system, including regression tests and b
 %patch4 -p1
 # patch5 is applied later
 %patch6 -p1
+%patch7 -p1
 
 #call autoconf 2.53 or greater
 %aconfver
@@ -871,6 +874,14 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep  9 2009 Tom Lane <tgl at redhat.com> 8.3.8-1
+- Update to PostgreSQL 8.3.8, for various fixes described at
+  http://www.postgresql.org/docs/8.3/static/release-8-3-8.html
+  including three security issues
+Related: #522084
+Related: #522085
+Related: #522092
+
 * Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.3.7-1.1
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	21 Mar 2009 22:43:50 -0000	1.47
+++ sources	9 Sep 2009 15:57:29 -0000	1.48
@@ -1,5 +1,5 @@
-7b7e91a2221e55fe1b167e663217a96d  postgresql-8.3.7.tar.bz2
+aac683d03f765dc58a3a0e5eaa1927bf  postgresql-8.3.8.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-cf36036b0a973f793b2ba25dfdbcf879  postgresql-8.3.7-US.pdf
+721628037ec3c47e7c11bd90959578ad  postgresql-8.3.8-US.pdf



From salimma at fedoraproject.org  Wed Sep  9 15:57:46 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 15:57:46 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.31,1.32
Message-ID: <20090909155746.AE94911C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22211

Modified Files:
	llvm.spec 
Log Message:
* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.4.pre1
- Don't adjust clang include dir; files there are noarch (bz#521893)
- Enable clang unit tests
- clang and clang-analyzer renamed; no longer depend on llvm at runtime



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- llvm.spec	9 Sep 2009 05:04:12 -0000	1.31
+++ llvm.spec	9 Sep 2009 15:57:46 -0000	1.32
@@ -18,6 +18,8 @@ Patch0:         llvm-2.6-destdir.patch
 Patch1:         llvm-2.6-destdir-clang.patch
 # http://llvm.org/bugs/show_bug.cgi?id=4911
 Patch2:         llvm-2.5-tclsh_check.patch
+# Data files should be installed with timestamps preserved
+Patch3:         llvm-2.6-timestamp.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -60,46 +62,54 @@ native programs that use the LLVM infras
 
 %package doc
 Summary:        Documentation for LLVM
-Group:          Development/Languages
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description doc
 Documentation for the LLVM compiler infrastructure.
 
 
-%package clang
+%package -n clang
 Summary:        A C language family frontend for LLVM
 License:        NCSA
 Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
 
-%description clang
+%description -n clang
 clang: noun
     1. A loud, resonant, metallic sound.
     2. The strident call of a crane or goose.
     3. C-language family front-end toolkit.
 
 The goal of the Clang project is to create a new C, C++, Objective C
-and Objective C++ front-end for the LLVM compiler. Its qqqtools are built
+and Objective C++ front-end for the LLVM compiler. Its tools are built
 as libraries and designed to be loosely-coupled and extendable.
 
 
-%package clang-analyzer
+%package -n clang-analyzer
 Summary:        A source code analysis framework
 License:        NCSA
 Group:          Development/Languages
-Requires:       %{name}-clang = %{version}-%{release}
+Requires:       clang = %{version}-%{release}
 # not picked up automatically since files are currently not instaled
 # in standard Python hierarchies yet
 Requires:       python
 
-%description clang-analyzer
+%description -n clang-analyzer
 The Clang Static Analyzer consists of both a source code analysis
 framework and a standalone tool that finds bugs in C and Objective-C
 programs. The standalone tool is invoked from the command-line, and is
 intended to run in tandem with a build of a project or code base.
 
 
+%package -n clang-doc
+Summary:        Documentation for Clang
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+
+%description -n clang-doc
+Documentation for the Clang compiler front-end.
+
+
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
 %package apidoc
 Summary:        API documentation for LLVM
@@ -152,14 +162,7 @@ pushd tools/clang
 %patch1 -p0 -b .destdir-clang
 popd
 %patch2 -p1 -b .tclsh_check
-
-# Fix hard-coded libdir for clang Headers
-%ifarch x86_64
-sed -i 's|(PROJ_prefix)/lib/clang|(PROJ_prefix)/%{_lib}/clang|g' \
-     tools/clang/lib/Headers/Makefile
-sed -i 's|lib/clang/1.0|%{_lib}/clang/1.0|g' \
-     tools/clang/lib/Driver/ToolChains.cpp
-%endif
+%patch3 -p1 -b .timestamp
 
 
 %build
@@ -188,17 +191,19 @@ make %{_smp_mflags} OPTIMIZE_OPTION='%{o
 # http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
 %ifnarch ppc
 cd obj && make check
-cd tools/clang && make test
+# some clang tests still fail, preserve test results
+(cd tools/clang && make test 2>&1) | tee ../testlog.txt || true
 %endif
 
 
 %install
 rm -rf %{buildroot}
-cd obj
+pushd obj
 chmod -x examples/Makefile
 
 make install DESTDIR=%{buildroot} \
      PROJ_docsdir=/moredocs
+popd
 
 # Static analyzer not installed by default:
 # http://clang-analyzer.llvm.org/installation#OtherPlatforms
@@ -210,7 +215,7 @@ for f in scan-{build,view}; do
   ln -s %{_libdir}/clang-analyzer/$f %{buildroot}%{_bindir}/$f
 done
 
-pushd ../tools/clang/utils
+pushd tools/clang/utils
 cp -p ccc-analyzer %{buildroot}%{_libdir}/clang-analyzer/libexec/
 
 for f in scan-build scanview.css sorttable.js; do
@@ -218,15 +223,24 @@ for f in scan-build scanview.css sorttab
 done
 popd
 
-pushd ../tools/clang/tools/scan-view
+pushd tools/clang/tools/scan-view
 cp -pr * %{buildroot}%{_libdir}/clang-analyzer/
 popd
 
 # Move documentation back to build directory
 # 
-mv %{buildroot}/moredocs ../
-rm ../moredocs/*.tar.gz
-rm ../moredocs/ocamldoc/html/*.tar.gz
+mv %{buildroot}/moredocs .
+rm moredocs/*.tar.gz
+rm moredocs/ocamldoc/html/*.tar.gz
+
+# And prepare Clang documentation
+#
+mkdir clang-docs
+for f in LICENSE.TXT NOTES.txt README.txt TODO.txt; do
+  ln tools/clang/$f clang-docs/
+done
+rm -rf tools/clang/docs/{doxygen*,Makefile*,*.graffle,tools}
+
 
 find %{buildroot} -name .dir -print0 | xargs -0r rm -f
 file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
@@ -288,25 +302,28 @@ rm -rf %{buildroot}
 %{_includedir}/%{name}-c
 %{_libdir}/%{name}
 
-
-%files clang
+%files -n clang
 %defattr(-,root,root,-)
+%doc clang-docs/* testlog.txt
 %{_bindir}/clang*
 %{_bindir}/FileCheck
 %{_bindir}/FileUpdate
 %{_bindir}/tblgen
-%{_libdir}/clang
+%{_prefix}/lib/clang
 %{_libexecdir}/clang-cc
 %doc %{_mandir}/man1/clang.1.*
 %doc %{_mandir}/man1/FileCheck.1.*
 
-
-%files clang-analyzer
+%files -n clang-analyzer
 %defattr(-,root,root,-)
 %{_bindir}/scan-build
 %{_bindir}/scan-view
 %{_libdir}/clang-analyzer
 
+%files -n clang-doc
+%defattr(-,root,root,-)
+%doc tools/clang/docs/*
+
 %files doc
 %defattr(-,root,root,-)
 %doc examples moredocs/html
@@ -336,8 +353,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.4.pre1
-- Properly adjust clang include dir (bz#521893)
+- Don't adjust clang include dir; files there are noarch (bz#521893)
 - Enable clang unit tests
+- clang and clang-analyzer renamed; no longer depend on llvm at runtime
 
 * Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.3.pre1
 - Package Clang's static analyzer tools



From mcepl at fedoraproject.org  Wed Sep  9 15:58:05 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 15:58:05 +0000 (UTC)
Subject: rpms/nimbus/EL-5 nimbus-0.0.17-stock-icons.patch, NONE,
	1.1 nimbus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909155805.81E3D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857

Modified Files:
	.cvsignore sources 
Added Files:
	nimbus-0.0.17-stock-icons.patch nimbus.spec 
Log Message:
Initial build

nimbus-0.0.17-stock-icons.patch:
 gtk-engine/gtk-2.0/Makefile.am |   12 ++++++++----
 gtk-engine/gtk-2.0/gtkrc       |    2 --
 gtk-engine/gtk-2.0/iconrc      |    2 +-
 gtk-engine/gtk-2.0/iconrc.in   |    2 +-
 icons/index.theme.in           |    7 ++++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE nimbus-0.0.17-stock-icons.patch ---
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc	2008-04-08 14:20:00.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,5 +1,3 @@
-include "iconrc"
-
 style "default"
 {
   bg[NORMAL]        = "#d6d9df"
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc	2008-08-14 11:18:46.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "/usr/local/share/themes/nimbus/gtk-2.0"
+pixmap_path "/usr/local/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "@prefix@/share/themes/nimbus/gtk-2.0"
+pixmap_path "@prefix@/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am	2009-07-26 02:16:55.000000000 +0200
@@ -1,7 +1,11 @@
 themedir = $(datadir)/themes//$(PACKAGE)/gtk-2.0
-theme_DATA =	gtkrc		\
-		iconrc		\
-		dialog_authentication.png  \
+theme_DATA =	gtkrc		
+
+iconrcdir = $(datadir)/icons//$(PACKAGE)
+iconrc_DATA = 	iconrc
+
+icondir = $(datadir)/icons//$(PACKAGE)/24x24/stock
+icon_DATA = 	dialog_authentication.png  \
 		dialog_info.png  \
 		dialog_warning.png  \
 		dialog_error.png  \
@@ -99,5 +103,5 @@
 		zoom-in.png  \
 		zoom-out.png  
 
-EXTRA_DIST = $(theme_DATA)    \
+EXTRA_DIST = $(iconrc_DATA)    \
 	     iconrc.in	      
diff -dur nimbus-0.0.17.orig/icons/index.theme.in nimbus-0.0.17/icons/index.theme.in
--- nimbus-0.0.17.orig/icons/index.theme.in	2007-10-05 10:17:20.000000000 +0200
+++ nimbus-0.0.17/icons/index.theme.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=nimbus
 Inherits=Tango
-Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
+Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,24x24/stock,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
 Example=user-desktop
 
 [12x12/actions]
@@ -129,6 +129,11 @@
 Context=Status
 Type=Fixed
 
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
 [32x32/actions]
 Size=32
 Context=Actions


--- NEW FILE nimbus.spec ---
Name:      nimbus
Version:   0.0.17
Release:   7%{?dist}
Summary:   Desktop theme originally from Sun

Group:      User Interface/Desktops
License:   LGPLv2

URL:      https://nimbus.dev.java.net/
# SHA1 0b984715e0c010ce034a32b7ba69e0582be65362
Source0:   http://dlc.sun.com/osol/jds/downloads/extras/nimbus-%{version}.tar.bz2
Patch0:     nimbus-0.0.17-stock-icons.patch

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:   icon-naming-utils glib2-devel gtk2-devel
BuildRequires:   intltool automake libtool autoconf

%description
Just a virtual package to collect all Nimbus related components.

%package -n nimbus-theme-gnome
Summary: Desktop theme from Sun
Group: User Interface/Desktops
Requires:   gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
BuildArch: noarch

%description -n nimbus-theme-gnome
The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
gtk2 theme and Icon set. It originates from Opensolaris by Sun.

%package -n gtk-nimbus-engine
Summary: Gtk+ engine for %{name}
Group: User Interface/Desktops
Requires: gtk2-engines

%description -n gtk-nimbus-engine
Gtk+ engine for %{name}.

%package -n nimbus-icon-theme
Summary: Icons for %{name}
Group: User Interface/Desktops
BuildArch: noarch
#Requires: fedora-logos

%description -n nimbus-icon-theme
Icons for %{name}.

%package -n nimbus-metacity-theme
Summary: Metacity theme for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires:   metacity

%description -n nimbus-metacity-theme
Theme for metacity as part of %{name}.

%prep
%setup -q -n nimbus-%{version}
%patch0 -p1 -b .stok-icons

echo 'NotificationTheme=nimbus' >> index.theme
TMPFILE=$(mktemp rpmbuild-nimbus-XXXXXX)
iconv -f iso-8859-1 -t utf-8 ChangeLog >$TMPFILE
touch --reference=ChangeLog $TMPFILE
chmod --reference=ChangeLog $TMPFILE
mv $TMPFILE ChangeLog


%build
aclocal --force
libtoolize --copy --force --automake
intltoolize --automake --copy --force
autoconf --force
automake --copy --add-missing
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#no-la
find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
install -Dp -m 0644 index.theme \
   $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache

## removing OpenSolaris branding use start-here.png from Fedora
#find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
#     |while read FILENAME ; do
#            NEWICON=$(echo $FILENAME \
#            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
#			  	ln -sf -v $NEWICON $FILENAME
#	  done
	
%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/nimbus &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	 touch --no-create %{_datadir}/icons/nimbus &>/dev/null
	 gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :

%files -n gtk-nimbus-engine
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING gtk-engine/docs.txt
%{_libdir}/gtk-2.0/*/engines/libnimbus.so
%{_datadir}/themes/nimbus/gtk-2.0/gtkrc
%dir %{_datadir}/themes/nimbus/gtk-2.0/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-metacity-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/themes/nimbus/metacity-1/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-icon-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/icons/nimbus/
%ghost %{_datadir}/icons/nimbus/icon-theme.cache

%files -n nimbus-theme-gnome
%defattr(-,root,root,-)
%{_datadir}/themes/nimbus/index.theme

%changelog
* Wed Sep  9 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-7
- put back OpenSolaris branding before we figure how to do this platform free.

* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-6
- remove OpenSolaris branding
- add Requires for fedora-logos to nimbus-icon-theme

* Tue Aug  4 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-5
- new version of nimbus-0.0.17-stock-icons.patch
- remove another unnecessary %%dir in %%files

* Sat May 16 2009 matej <mcepl at redhat.com> 0.0.17-4
- reogrganization of subpackages
- many changes in %%files

* Mon Apr 20 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-3
- Packaging Review fixes

* Thu Mar 12 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-2
- Fix License tag.

* Mon Mar 02 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-1
- Initial affert to package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:14:19 -0000	1.1
+++ .cvsignore	9 Sep 2009 15:58:04 -0000	1.2
@@ -0,0 +1 @@
+nimbus-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:14:19 -0000	1.1
+++ sources	9 Sep 2009 15:58:05 -0000	1.2
@@ -0,0 +1 @@
+c338357e3918cf391193b8429cab5975  nimbus-0.0.17.tar.bz2



From salimma at fedoraproject.org  Wed Sep  9 15:59:45 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  9 Sep 2009 15:59:45 +0000 (UTC)
Subject: rpms/llvm/devel llvm-2.6-timestamp.patch,NONE,1.1
Message-ID: <20090909155945.5F2FA11C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25288

Added Files:
	llvm-2.6-timestamp.patch 
Log Message:
Patch for Makefile.rules to install data files with preserved timestamps


llvm-2.6-timestamp.patch:
 Makefile.rules |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE llvm-2.6-timestamp.patch ---
--- llvm-2.6/Makefile.rules.timestamp	2009-08-19 18:04:44.000000000 -0400
+++ llvm-2.6/Makefile.rules	2009-09-09 02:10:38.287389725 -0400
@@ -672,7 +672,7 @@
 
 ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755
 ScriptInstall = $(INSTALL) -m 0755
-DataInstall   = $(INSTALL) -m 0644
+DataInstall   = $(INSTALL) -p -m 0644
 
 # When compiling under Mingw/Cygwin, the tblgen tool expects Windows
 # paths. In this case, the SYSPATH function (defined in



From remi at fedoraproject.org  Wed Sep  9 16:05:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:05:54 +0000 (UTC)
Subject: rpms/glpi-pdf/F-11 glpi-pdf.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090909160554.A568F11C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-pdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28255

Modified Files:
	glpi-pdf.spec sources 
Log Message:
update to 0.6.1 for glpi 0.72


Index: glpi-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/F-11/glpi-pdf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- glpi-pdf.spec	24 Feb 2009 22:16:42 -0000	1.3
+++ glpi-pdf.spec	9 Sep 2009 16:05:54 -0000	1.4
@@ -1,10 +1,10 @@
 %define pluginname   pdf
 
 Name:           glpi-pdf
-Version:        0.5
-Release:        2%{?dist}
-Summary:        GLPI Plugin to print PDF of computers
-Summary(fr):    Extension GLPI pour cr?er des PDF des ordinateurs
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        GLPI Plugin to print PDF of equipment
+Summary(fr):    Extension GLPI pour cr?er des PDF des mat?riels
 
 Group:          Applications/Internet
 License:        GPLv2+
@@ -15,16 +15,16 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71
+Requires:       glpi >= 0.72
 
 %description
-This GLPI plugin enables you to print with format pdf all the mitres of a
-card computer or a software of the inventory. 
+This GLPI plugin enables you to print, in pdf format, the information 
+sheet of an equipment or a software of the inventory. 
 
 
 %description -l fr
 Cette extension GLPI vous permet de cr?er un PDF contenant toutes les
-informations sur un ordinateur ou un logiciel de l'inventaire.
+informations sur un ?quipement ou un logiciel de l'inventaire.
 
 
 %prep
@@ -36,6 +36,8 @@ for doc in docs/* ; do
     sed -i -e 's/\r//' $doc
 done
 
+cd %{pluginname}
+
 
 %build
 # empty build
@@ -46,18 +48,33 @@ rm -rf %{buildroot} 
 mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
 cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
 
+for i in %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/locales/*
+do
+  lang=$(basename $i)
+  echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
+done | tee %{name}.lang
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docs/*
-%{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
+%{_datadir}/glpi/plugins/%{pluginname}/*.php
+%{_datadir}/glpi/plugins/%{pluginname}/fonts
+%{_datadir}/glpi/plugins/%{pluginname}/front
+%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/pics
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.6.1-1
+- update to 0.6.1 finale for glpi 0.72
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -75,5 +92,5 @@ rm -rf %{buildroot} 
 - new SVN snapshot
 
 * Mon Aug 13 2007 Remi Collet <RPMS at FamilleCollet.com> - 0.2-0.20070813
-- Initial RPM	
+- Initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jul 2008 08:03:39 -0000	1.3
+++ sources	9 Sep 2009 16:05:54 -0000	1.4
@@ -1 +1 @@
-6b10df91a8499f7e67d7a33e3b9085fb  glpi-pdf-0.5.tar.gz
+42972203c0d50689cc246e023a7ff597  glpi-pdf-0.6.1.tar.gz



From xhorak at fedoraproject.org  Wed Sep  9 16:06:29 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 16:06:29 +0000 (UTC)
Subject: rpms/monodevelop/F-11 monodevelop-2.spec,1.18,1.19
Message-ID: <20090909160629.9F5FC11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/monodevelop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28513

Modified Files:
	monodevelop-2.spec 
Log Message:
Rebuild against newer gecko


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-11/monodevelop-2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- monodevelop-2.spec	4 Aug 2009 09:15:21 -0000	1.18
+++ monodevelop-2.spec	9 Sep 2009 16:06:29 -0000	1.19
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -158,6 +158,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Wed Sep  9 2009 Jan Horak <jhorak at redhat.com> - 2.0-5
+- Rebuild against newer gecko
+
 * Tue Aug  4 2009 Jan Horak <jhorak at redhat.com> - 2.0-4
 - Rebuild against newer gecko
 



From ruben at fedoraproject.org  Wed Sep  9 16:07:03 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed,  9 Sep 2009 16:07:03 +0000 (UTC)
Subject: rpms/python-foolscap/devel python-foolscap.spec,1.4,1.5
Message-ID: <20090909160703.66A9011C00CE@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28735

Modified Files:
	python-foolscap.spec 
Log Message:
* Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-3
- Add requirement on pyOpenSSL



Index: python-foolscap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/python-foolscap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-foolscap.spec	7 Sep 2009 23:21:41 -0000	1.4
+++ python-foolscap.spec	9 Sep 2009 16:07:03 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           python-%{modulename}
 Version:        0.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Next-generation RPC protocol, intended to replace Perspective Broker
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@ Patch0:		foolscap-disable-randomly-faili
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python, python-devel, python-twisted-web
-Requires:       python-twisted-web
+BuildRequires:  python, python-devel, python-twisted-web, python-setuptools, pyOpenSSL
+Requires:       python-twisted-web, pyOpenSSL
 
 %description
 Foolscap (aka newpb) is a new version of Twisted's native RPC protocol, known
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_bindir}/flappserver
 
 %changelog
+* Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-3
+- Add requirement on pyOpenSSL
+
 * Tue Sep 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-2
 - Disable a single test which only fails in Koji
 



From pkgdb at fedoraproject.org  Wed Sep  9 16:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:07:02 +0000
Subject: [pkgdb] libvdpau was added for kwizart
Message-ID: <20090909160702.8ADCE10F865@bastion2.fedora.phx.redhat.com>

kevin has added Package libvdpau with summary Wrapper library for the Video Decode and Presentation API
kevin has approved Package libvdpau
kevin has added a Fedora devel branch for libvdpau with an owner of kwizart
kevin has approved libvdpau in Fedora devel
kevin has approved Package libvdpau
kevin has set commit to Approved for 107427 on libvdpau (Fedora devel)
kevin has set checkout to Approved for 107427 on libvdpau (Fedora devel)
kevin has set build to Approved for 107427 on libvdpau (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvdpau



From pkgdb at fedoraproject.org  Wed Sep  9 16:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:07:04 +0000
Subject: [pkgdb] libvdpau summary updated by kevin
Message-ID: <20090909160704.2108010F88A@bastion2.fedora.phx.redhat.com>

kevin set package libvdpau summary to Wrapper library for the Video Decode and Presentation API

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvdpau



From pkgdb at fedoraproject.org  Wed Sep  9 16:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:07:04 +0000
Subject: [pkgdb] libvdpau (Fedora, 10) updated by kevin
Message-ID: <20090909160704.285F410F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libvdpau
kevin has set commit to Approved for 107427 on libvdpau (Fedora 10)
kevin has set checkout to Approved for 107427 on libvdpau (Fedora 10)
kevin has set build to Approved for 107427 on libvdpau (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvdpau



From kevin at fedoraproject.org  Wed Sep  9 16:07:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:07:11 +0000 (UTC)
Subject: rpms/libvdpau - New directory
Message-ID: <20090909160711.136CB11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvdpau
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn28779/rpms/libvdpau

Log Message:
Directory /cvs/pkgs/rpms/libvdpau added to the repository




From pkgdb at fedoraproject.org  Wed Sep  9 16:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:07:04 +0000
Subject: [pkgdb] libvdpau (Fedora, 10) updated by kevin
Message-ID: <20090909160704.36CC210F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libvdpau
kevin has set commit to Approved for 107427 on libvdpau (Fedora 11)
kevin has set checkout to Approved for 107427 on libvdpau (Fedora 11)
kevin has set build to Approved for 107427 on libvdpau (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvdpau



From kevin at fedoraproject.org  Wed Sep  9 16:07:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:07:11 +0000 (UTC)
Subject: rpms/libvdpau/devel - New directory
Message-ID: <20090909160711.3E05C11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvdpau/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn28779/rpms/libvdpau/devel

Log Message:
Directory /cvs/pkgs/rpms/libvdpau/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:07:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:07:17 +0000 (UTC)
Subject: rpms/libvdpau Makefile,NONE,1.1
Message-ID: <20090909160717.332BD11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvdpau
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn28779/rpms/libvdpau

Added Files:
	Makefile 
Log Message:
Setup of module libvdpau


--- NEW FILE Makefile ---
# Top level Makefile for module libvdpau
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 Sep  9 16:07:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:07:17 +0000 (UTC)
Subject: rpms/libvdpau/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090909160717.79E1E11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvdpau/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn28779/rpms/libvdpau/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libvdpau


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libvdpau
# $Id: Makefile,v 1.1 2009/09/09 16:07:17 kevin Exp $
NAME := libvdpau
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 Sep  9 16:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:08:31 +0000
Subject: [pkgdb] voms summary updated by kevin
Message-ID: <20090909160831.AE28410F88A@bastion2.fedora.phx.redhat.com>

kevin set package voms summary to Virtual Organization Membership Service

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms



From pkgdb at fedoraproject.org  Wed Sep  9 16:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:08:29 +0000
Subject: [pkgdb] voms was added for ellert
Message-ID: <20090909160830.0B12510F865@bastion2.fedora.phx.redhat.com>

kevin has added Package voms with summary Virtual Organization Membership Service
kevin has approved Package voms
kevin has added a Fedora devel branch for voms with an owner of ellert
kevin has approved voms in Fedora devel
kevin has approved Package voms
kevin has set commit to Approved for 107427 on voms (Fedora devel)
kevin has set checkout to Approved for 107427 on voms (Fedora devel)
kevin has set build to Approved for 107427 on voms (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms



From pkgdb at fedoraproject.org  Wed Sep  9 16:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:08:31 +0000
Subject: [pkgdb] voms (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160831.B135510F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for voms
kevin has set commit to Approved for 107427 on voms (Fedora 10)
kevin has set checkout to Approved for 107427 on voms (Fedora 10)
kevin has set build to Approved for 107427 on voms (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms



From pkgdb at fedoraproject.org  Wed Sep  9 16:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:08:31 +0000
Subject: [pkgdb] voms (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160831.BD5ED10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for voms
kevin has set commit to Approved for 107427 on voms (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on voms (Fedora EPEL 4)
kevin has set build to Approved for 107427 on voms (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms



From pkgdb at fedoraproject.org  Wed Sep  9 16:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:08:31 +0000
Subject: [pkgdb] voms (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160831.C513810F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for voms
kevin has set commit to Approved for 107427 on voms (Fedora 11)
kevin has set checkout to Approved for 107427 on voms (Fedora 11)
kevin has set build to Approved for 107427 on voms (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms



From kevin at fedoraproject.org  Wed Sep  9 16:08:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:08:42 +0000 (UTC)
Subject: rpms/voms - New directory
Message-ID: <20090909160842.1D56611C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29407/rpms/voms

Log Message:
Directory /cvs/pkgs/rpms/voms added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:08:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:08:42 +0000 (UTC)
Subject: rpms/voms/devel - New directory
Message-ID: <20090909160842.43DF311C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29407/rpms/voms/devel

Log Message:
Directory /cvs/pkgs/rpms/voms/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:08:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:08:48 +0000 (UTC)
Subject: rpms/voms Makefile,NONE,1.1
Message-ID: <20090909160848.EF73111C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29407/rpms/voms

Added Files:
	Makefile 
Log Message:
Setup of module voms


--- NEW FILE Makefile ---
# Top level Makefile for module voms
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 Sep  9 16:08:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:08:49 +0000 (UTC)
Subject: rpms/voms/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090909160849.2B11511C02C8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29407/rpms/voms/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module voms


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: voms
# $Id: Makefile,v 1.1 2009/09/09 16:08:49 kevin Exp $
NAME := voms
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 Sep  9 16:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:08:31 +0000
Subject: [pkgdb] voms (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160831.D190410F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for voms
kevin has set commit to Approved for 107427 on voms (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on voms (Fedora EPEL 5)
kevin has set build to Approved for 107427 on voms (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms



From mtasaka at fedoraproject.org  Wed Sep  9 16:08:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 16:08:55 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-10 .cvsignore, 1.22, 1.23 ruby-RMagick.spec,
	1.27, 1.28 sources, 1.22, 1.23
Message-ID: <20090909160855.57CAA11C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29476/F-10

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
- 2.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	3 Aug 2009 04:48:37 -0000	1.22
+++ .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
@@ -1 +1 @@
-RMagick-2.11.0.tar.bz2
+RMagick-2.11.1.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/ruby-RMagick.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ruby-RMagick.spec	3 Aug 2009 04:48:37 -0000	1.27
+++ ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.28
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		61208
+%define		repoid		63234
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.0
+%define		mainver		2.11.1
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -39,10 +39,9 @@ BuildRequires:	%{_bindir}/wmf2eps
 BuildRequires:	ImageMagick-devel
 Requires:	ImageMagick
 
-%setIMver 12 6.5.3.7
+%setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
 %setIMver 10 6.4.0.10
-%setIMver  9 6.3.8.1
 
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
@@ -106,6 +105,12 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
+- 2.11.1
+
+* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-2
+- F-12: Rebuid against new ImageMagick
+
 * Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
 - 2.11.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	3 Aug 2009 04:48:37 -0000	1.22
+++ sources	9 Sep 2009 16:08:55 -0000	1.23
@@ -1 +1 @@
-944636435aeffb228540f4b27371762a  RMagick-2.11.0.tar.bz2
+62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2



From mtasaka at fedoraproject.org  Wed Sep  9 16:08:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 16:08:55 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-11 .cvsignore, 1.22, 1.23 ruby-RMagick.spec,
	1.30, 1.31 sources, 1.22, 1.23
Message-ID: <20090909160855.866A511C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29476/F-11

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
- 2.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	3 Aug 2009 04:48:37 -0000	1.22
+++ .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
@@ -1 +1 @@
-RMagick-2.11.0.tar.bz2
+RMagick-2.11.1.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/ruby-RMagick.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ruby-RMagick.spec	3 Aug 2009 04:48:37 -0000	1.30
+++ ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.31
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		61208
+%define		repoid		63234
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.0
+%define		mainver		2.11.1
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -39,10 +39,9 @@ BuildRequires:	%{_bindir}/wmf2eps
 BuildRequires:	ImageMagick-devel
 Requires:	ImageMagick
 
-%setIMver 12 6.5.3.7
+%setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
 %setIMver 10 6.4.0.10
-%setIMver  9 6.3.8.1
 
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
@@ -106,6 +105,12 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
+- 2.11.1
+
+* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-2
+- F-12: Rebuid against new ImageMagick
+
 * Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
 - 2.11.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	3 Aug 2009 04:48:37 -0000	1.22
+++ sources	9 Sep 2009 16:08:55 -0000	1.23
@@ -1 +1 @@
-944636435aeffb228540f4b27371762a  RMagick-2.11.0.tar.bz2
+62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2



From mtasaka at fedoraproject.org  Wed Sep  9 16:08:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 16:08:55 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel .cvsignore, 1.22, 1.23 ruby-RMagick.spec,
	1.34, 1.35 sources, 1.22, 1.23
Message-ID: <20090909160855.BC49F11C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29476/devel

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
- 2.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	3 Aug 2009 04:48:37 -0000	1.22
+++ .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
@@ -1 +1 @@
-RMagick-2.11.0.tar.bz2
+RMagick-2.11.1.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ruby-RMagick.spec	3 Aug 2009 19:59:17 -0000	1.34
+++ ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.35
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		61208
+%define		repoid		63234
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,9 +13,9 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.0
+%define		mainver		2.11.1
 %undefine		betaver		
-%define		fedorarel	2
+%define		fedorarel	1
 
 
 Name:		ruby-%{modname}
@@ -42,7 +42,6 @@ Requires:	ImageMagick
 %setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
 %setIMver 10 6.4.0.10
-%setIMver  9 6.3.8.1
 
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
@@ -106,6 +105,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
+- 2.11.1
+
 * Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-2
 - F-12: Rebuid against new ImageMagick
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	3 Aug 2009 04:48:38 -0000	1.22
+++ sources	9 Sep 2009 16:08:55 -0000	1.23
@@ -1 +1 @@
-944636435aeffb228540f4b27371762a  RMagick-2.11.0.tar.bz2
+62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep  9 16:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:09:37 +0000
Subject: [pkgdb] voms-mysql-plugin was added for ellert
Message-ID: <20090909160937.CBB2410F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package voms-mysql-plugin with summary VOMS server plugin for MySQL
kevin has approved Package voms-mysql-plugin
kevin has added a Fedora devel branch for voms-mysql-plugin with an owner of ellert
kevin has approved voms-mysql-plugin in Fedora devel
kevin has approved Package voms-mysql-plugin
kevin has set commit to Approved for 107427 on voms-mysql-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on voms-mysql-plugin (Fedora devel)
kevin has set build to Approved for 107427 on voms-mysql-plugin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms-mysql-plugin



From pkgdb at fedoraproject.org  Wed Sep  9 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:09:39 +0000
Subject: [pkgdb] voms-mysql-plugin summary updated by kevin
Message-ID: <20090909160939.8843510F89F@bastion2.fedora.phx.redhat.com>

kevin set package voms-mysql-plugin summary to VOMS server plugin for MySQL

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms-mysql-plugin



From pkgdb at fedoraproject.org  Wed Sep  9 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:09:39 +0000
Subject: [pkgdb] voms-mysql-plugin (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160939.9971E10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for voms-mysql-plugin
kevin has set commit to Approved for 107427 on voms-mysql-plugin (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on voms-mysql-plugin (Fedora EPEL 4)
kevin has set build to Approved for 107427 on voms-mysql-plugin (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms-mysql-plugin



From pkgdb at fedoraproject.org  Wed Sep  9 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:09:39 +0000
Subject: [pkgdb] voms-mysql-plugin (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160939.A32A310F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for voms-mysql-plugin
kevin has set commit to Approved for 107427 on voms-mysql-plugin (Fedora 10)
kevin has set checkout to Approved for 107427 on voms-mysql-plugin (Fedora 10)
kevin has set build to Approved for 107427 on voms-mysql-plugin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms-mysql-plugin



From pkgdb at fedoraproject.org  Wed Sep  9 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:09:39 +0000
Subject: [pkgdb] voms-mysql-plugin (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160939.AD0D310F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for voms-mysql-plugin
kevin has set commit to Approved for 107427 on voms-mysql-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on voms-mysql-plugin (Fedora 11)
kevin has set build to Approved for 107427 on voms-mysql-plugin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms-mysql-plugin



From pkgdb at fedoraproject.org  Wed Sep  9 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:09:39 +0000
Subject: [pkgdb] voms-mysql-plugin (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909160939.B8A5310F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for voms-mysql-plugin
kevin has set commit to Approved for 107427 on voms-mysql-plugin (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on voms-mysql-plugin (Fedora EPEL 5)
kevin has set build to Approved for 107427 on voms-mysql-plugin (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/voms-mysql-plugin



From kevin at fedoraproject.org  Wed Sep  9 16:09:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:09:47 +0000 (UTC)
Subject: rpms/voms-mysql-plugin - New directory
Message-ID: <20090909160947.17A7211C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms-mysql-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw30134/rpms/voms-mysql-plugin

Log Message:
Directory /cvs/pkgs/rpms/voms-mysql-plugin added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:09:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:09:47 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/devel - New directory
Message-ID: <20090909160947.444D211C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms-mysql-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw30134/rpms/voms-mysql-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/voms-mysql-plugin/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:09:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:09:53 +0000 (UTC)
Subject: rpms/voms-mysql-plugin Makefile,NONE,1.1
Message-ID: <20090909160953.745B111C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms-mysql-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw30134/rpms/voms-mysql-plugin

Added Files:
	Makefile 
Log Message:
Setup of module voms-mysql-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module voms-mysql-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 Sep  9 16:09:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:09:53 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090909160953.B4B9811C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/voms-mysql-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw30134/rpms/voms-mysql-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module voms-mysql-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: voms-mysql-plugin
# $Id: Makefile,v 1.1 2009/09/09 16:09:53 kevin Exp $
NAME := voms-mysql-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 Sep  9 16:12:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:12:24 +0000
Subject: [pkgdb] emacs-common-pmd was added for jjames
Message-ID: <20090909161224.4FFC910F865@bastion2.fedora.phx.redhat.com>

kevin has added Package emacs-common-pmd with summary An interface to PMD for Emacs
kevin has approved Package emacs-common-pmd
kevin has added a Fedora devel branch for emacs-common-pmd with an owner of jjames
kevin has approved emacs-common-pmd in Fedora devel
kevin has approved Package emacs-common-pmd
kevin has set commit to Approved for 107427 on emacs-common-pmd (Fedora devel)
kevin has set checkout to Approved for 107427 on emacs-common-pmd (Fedora devel)
kevin has set build to Approved for 107427 on emacs-common-pmd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-pmd



From pkgdb at fedoraproject.org  Wed Sep  9 16:12:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:12:25 +0000
Subject: [pkgdb] emacs-common-pmd summary updated by kevin
Message-ID: <20090909161225.80D5610F88A@bastion2.fedora.phx.redhat.com>

kevin set package emacs-common-pmd summary to An interface to PMD for Emacs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-pmd



From kevin at fedoraproject.org  Wed Sep  9 16:12:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:12:41 +0000 (UTC)
Subject: rpms/emacs-common-pmd - New directory
Message-ID: <20090909161241.1B2E211C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-common-pmd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj30978/rpms/emacs-common-pmd

Log Message:
Directory /cvs/pkgs/rpms/emacs-common-pmd added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:12:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:12:41 +0000 (UTC)
Subject: rpms/emacs-common-pmd/devel - New directory
Message-ID: <20090909161241.4906C11C02C8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-common-pmd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj30978/rpms/emacs-common-pmd/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-common-pmd/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:12:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:12:47 +0000 (UTC)
Subject: rpms/emacs-common-pmd Makefile,NONE,1.1
Message-ID: <20090909161247.5F4BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-common-pmd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj30978/rpms/emacs-common-pmd

Added Files:
	Makefile 
Log Message:
Setup of module emacs-common-pmd


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-common-pmd
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 Sep  9 16:12:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:12:47 +0000 (UTC)
Subject: rpms/emacs-common-pmd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090909161247.9847D11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-common-pmd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj30978/rpms/emacs-common-pmd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-common-pmd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-common-pmd
# $Id: Makefile,v 1.1 2009/09/09 16:12:47 kevin Exp $
NAME := emacs-common-pmd
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 Sep  9 16:12:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:12:25 +0000
Subject: [pkgdb] emacs-common-pmd (Fedora, 11) updated by kevin
Message-ID: <20090909161225.8840D10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for emacs-common-pmd
kevin has set commit to Approved for 107427 on emacs-common-pmd (Fedora 11)
kevin has set checkout to Approved for 107427 on emacs-common-pmd (Fedora 11)
kevin has set build to Approved for 107427 on emacs-common-pmd (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-pmd



From pkgdb at fedoraproject.org  Wed Sep  9 16:13:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:13:47 +0000
Subject: [pkgdb] gfs-philostratos-fonts was added for nim
Message-ID: <20090909161347.74BEF10F865@bastion2.fedora.phx.redhat.com>

kevin has added Package gfs-philostratos-fonts with summary A revival of the ?Griechische Antiqua? Greek typeface
kevin has approved Package gfs-philostratos-fonts
kevin has added a Fedora devel branch for gfs-philostratos-fonts with an owner of nim
kevin has approved gfs-philostratos-fonts in Fedora devel
kevin has approved Package gfs-philostratos-fonts
kevin has set commit to Approved for 107427 on gfs-philostratos-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on gfs-philostratos-fonts (Fedora devel)
kevin has set build to Approved for 107427 on gfs-philostratos-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gfs-philostratos-fonts



From pkgdb at fedoraproject.org  Wed Sep  9 16:13:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:13:49 +0000
Subject: [pkgdb] gfs-philostratos-fonts summary updated by kevin
Message-ID: <20090909161349.AE5B910F87E@bastion2.fedora.phx.redhat.com>

kevin set package gfs-philostratos-fonts summary to A revival of the ?Griechische Antiqua? Greek typeface

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gfs-philostratos-fonts



From pkgdb at fedoraproject.org  Wed Sep  9 16:13:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:13:49 +0000
Subject: [pkgdb] gfs-philostratos-fonts (Fedora, 11) updated by kevin
Message-ID: <20090909161349.B798810F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gfs-philostratos-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on gfs-philostratos-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gfs-philostratos-fonts



From kevin at fedoraproject.org  Wed Sep  9 16:14:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:14:02 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts - New directory
Message-ID: <20090909161402.2867611C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-philostratos-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf31391/rpms/gfs-philostratos-fonts

Log Message:
Directory /cvs/pkgs/rpms/gfs-philostratos-fonts added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:14:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:14:02 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/devel - New directory
Message-ID: <20090909161402.4AE5011C02C6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-philostratos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf31391/rpms/gfs-philostratos-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/gfs-philostratos-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep  9 16:13:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:13:49 +0000
Subject: [pkgdb] gfs-philostratos-fonts (Fedora, 11) updated by kevin
Message-ID: <20090909161349.C8A9410F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gfs-philostratos-fonts
kevin has set commit to Approved for 107427 on gfs-philostratos-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on gfs-philostratos-fonts (Fedora 11)
kevin has set build to Approved for 107427 on gfs-philostratos-fonts (Fedora 11)
kevin approved watchbugzilla on gfs-philostratos-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on gfs-philostratos-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gfs-philostratos-fonts



From kevin at fedoraproject.org  Wed Sep  9 16:14:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:14:08 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts Makefile,NONE,1.1
Message-ID: <20090909161408.6D65911C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-philostratos-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf31391/rpms/gfs-philostratos-fonts

Added Files:
	Makefile 
Log Message:
Setup of module gfs-philostratos-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module gfs-philostratos-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Sep  9 16:14:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:14:08 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090909161408.C092011C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-philostratos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf31391/rpms/gfs-philostratos-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gfs-philostratos-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gfs-philostratos-fonts
# $Id: Makefile,v 1.1 2009/09/09 16:14:08 kevin Exp $
NAME := gfs-philostratos-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Sep  9 16:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:16:41 +0000
Subject: [pkgdb] sblim-cmpi-network (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909161641.787F810F86F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-network
kevin has set commit to Approved for 107427 on sblim-cmpi-network (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-network (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-network (Fedora EPEL 5)
kevin approved watchbugzilla on sblim-cmpi-network (Fedora EPEL 5) for praveenp
kevin approved watchcommits on sblim-cmpi-network (Fedora EPEL 5) for praveenp
kevin approved watchbugzilla on sblim-cmpi-network (Fedora EPEL 5) for mdomsch
kevin approved watchcommits on sblim-cmpi-network (Fedora EPEL 5) for mdomsch
kevin approved watchbugzilla on sblim-cmpi-network (Fedora EPEL 5) for srini
kevin approved watchcommits on sblim-cmpi-network (Fedora EPEL 5) for srini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Wed Sep  9 16:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:16:41 +0000
Subject: [pkgdb] sblim-cmpi-network (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909161641.8375510F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-network
kevin has set commit to Approved for 107427 on sblim-cmpi-network (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-network (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-network (Fedora 10)
kevin approved watchbugzilla on sblim-cmpi-network (Fedora 10) for praveenp
kevin approved watchcommits on sblim-cmpi-network (Fedora 10) for praveenp
kevin approved watchbugzilla on sblim-cmpi-network (Fedora 10) for mdomsch
kevin approved watchcommits on sblim-cmpi-network (Fedora 10) for mdomsch
kevin approved watchbugzilla on sblim-cmpi-network (Fedora 10) for srini
kevin approved watchcommits on sblim-cmpi-network (Fedora 10) for srini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Wed Sep  9 16:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:16:41 +0000
Subject: [pkgdb] sblim-cmpi-network (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909161641.8CF3310F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-network
kevin has set commit to Approved for 107427 on sblim-cmpi-network (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-network (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-network (Fedora EPEL 4)
kevin approved watchbugzilla on sblim-cmpi-network (Fedora EPEL 4) for praveenp
kevin approved watchcommits on sblim-cmpi-network (Fedora EPEL 4) for praveenp
kevin approved watchbugzilla on sblim-cmpi-network (Fedora EPEL 4) for mdomsch
kevin approved watchcommits on sblim-cmpi-network (Fedora EPEL 4) for mdomsch
kevin approved watchbugzilla on sblim-cmpi-network (Fedora EPEL 4) for srini
kevin approved watchcommits on sblim-cmpi-network (Fedora EPEL 4) for srini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Wed Sep  9 16:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:16:41 +0000
Subject: [pkgdb] sblim-cmpi-network (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909161641.9478E10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-network
kevin has set commit to Approved for 107427 on sblim-cmpi-network (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-network (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-network (Fedora 11)
kevin approved watchbugzilla on sblim-cmpi-network (Fedora 11) for praveenp
kevin approved watchcommits on sblim-cmpi-network (Fedora 11) for praveenp
kevin approved watchbugzilla on sblim-cmpi-network (Fedora 11) for mdomsch
kevin approved watchcommits on sblim-cmpi-network (Fedora 11) for mdomsch
kevin approved watchbugzilla on sblim-cmpi-network (Fedora 11) for srini
kevin approved watchcommits on sblim-cmpi-network (Fedora 11) for srini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From bressers at fedoraproject.org  Wed Sep  9 16:18:26 2009
From: bressers at fedoraproject.org (Josh Bressers)
Date: Wed,  9 Sep 2009 16:18:26 +0000 (UTC)
Subject: CVSROOT avail,1.64,1.65
Message-ID: <20090909161826.9B75111C00CE@cvs1.fedora.phx.redhat.com>

Author: bressers

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32679

Modified Files:
	avail 
Log Message:
Add vdanen to the fedora-security repo


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- avail	13 Aug 2009 23:56:36 -0000	1.64
+++ avail	9 Sep 2009 16:18:26 -0000	1.65
@@ -39,7 +39,7 @@
 unavail | | fedora-security
 # Red Hat Security Response Team
 avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security
-avail | lkundrak, thoger | fedora-security
+avail | lkundrak, thoger, vdanen | fedora-security
 # Fedora Security Response Team
 avail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security
 avail | trassl,kevin,dercorny,eteo | fedora-security



From pkgdb at fedoraproject.org  Wed Sep  9 16:20:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:20:25 +0000
Subject: [pkgdb] vmpsd was added for coec
Message-ID: <20090909162025.9B25410F865@bastion2.fedora.phx.redhat.com>

kevin has added Package vmpsd with summary A GPL implementation of Cisco Systems' VMPS
kevin has approved Package vmpsd
kevin has added a Fedora devel branch for vmpsd with an owner of coec
kevin has approved vmpsd in Fedora devel
kevin has approved Package vmpsd
kevin has set commit to Approved for 107427 on vmpsd (Fedora devel)
kevin has set checkout to Approved for 107427 on vmpsd (Fedora devel)
kevin has set build to Approved for 107427 on vmpsd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vmpsd



From pkgdb at fedoraproject.org  Wed Sep  9 16:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:20:26 +0000
Subject: [pkgdb] vmpsd summary updated by kevin
Message-ID: <20090909162026.E0B3610F88A@bastion2.fedora.phx.redhat.com>

kevin set package vmpsd summary to A GPL implementation of Cisco Systems' VMPS

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vmpsd



From pkgdb at fedoraproject.org  Wed Sep  9 16:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:20:26 +0000
Subject: [pkgdb] vmpsd (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909162026.E3B8810F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for vmpsd
kevin has set commit to Approved for 107427 on vmpsd (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on vmpsd (Fedora EPEL 5)
kevin has set build to Approved for 107427 on vmpsd (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vmpsd



From kevin at fedoraproject.org  Wed Sep  9 16:20:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:20:35 +0000 (UTC)
Subject: rpms/vmpsd - New directory
Message-ID: <20090909162035.17CF911C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vmpsd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsONo835/rpms/vmpsd

Log Message:
Directory /cvs/pkgs/rpms/vmpsd added to the repository




From pkgdb at fedoraproject.org  Wed Sep  9 16:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:20:26 +0000
Subject: [pkgdb] vmpsd (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909162026.ED91A10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vmpsd
kevin has set commit to Approved for 107427 on vmpsd (Fedora 10)
kevin has set checkout to Approved for 107427 on vmpsd (Fedora 10)
kevin has set build to Approved for 107427 on vmpsd (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vmpsd



From pkgdb at fedoraproject.org  Wed Sep  9 16:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:20:26 +0000
Subject: [pkgdb] vmpsd (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909162027.0392410F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vmpsd
kevin has set commit to Approved for 107427 on vmpsd (Fedora 11)
kevin has set checkout to Approved for 107427 on vmpsd (Fedora 11)
kevin has set build to Approved for 107427 on vmpsd (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vmpsd



From kevin at fedoraproject.org  Wed Sep  9 16:20:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:20:35 +0000 (UTC)
Subject: rpms/vmpsd/devel - New directory
Message-ID: <20090909162035.35AC111C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vmpsd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsONo835/rpms/vmpsd/devel

Log Message:
Directory /cvs/pkgs/rpms/vmpsd/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:20:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:20:41 +0000 (UTC)
Subject: rpms/vmpsd Makefile,NONE,1.1
Message-ID: <20090909162041.8926E11C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vmpsd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsONo835/rpms/vmpsd

Added Files:
	Makefile 
Log Message:
Setup of module vmpsd


--- NEW FILE Makefile ---
# Top level Makefile for module vmpsd
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 Sep  9 16:20:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:20:41 +0000 (UTC)
Subject: rpms/vmpsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090909162041.C2C1E11C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vmpsd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsONo835/rpms/vmpsd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vmpsd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vmpsd
# $Id: Makefile,v 1.1 2009/09/09 16:20:41 kevin Exp $
NAME := vmpsd
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 Sep  9 16:21:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:21:13 +0000
Subject: [pkgdb] perl-CatalystX-Component-Traits was added for cweyl
Message-ID: <20090909162113.BE09C10F89B@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-CatalystX-Component-Traits with summary Automatic Trait Loading and Resolution for Catalyst
kevin has approved Package perl-CatalystX-Component-Traits
kevin has added a Fedora devel branch for perl-CatalystX-Component-Traits with an owner of cweyl
kevin has approved perl-CatalystX-Component-Traits in Fedora devel
kevin has approved Package perl-CatalystX-Component-Traits
kevin has set commit to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora devel)
kevin has set build to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CatalystX-Component-Traits



From pkgdb at fedoraproject.org  Wed Sep  9 16:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:21:16 +0000
Subject: [pkgdb] perl-CatalystX-Component-Traits summary updated by kevin
Message-ID: <20090909162116.2D2A010F8A0@bastion2.fedora.phx.redhat.com>

kevin set package perl-CatalystX-Component-Traits summary to Automatic Trait Loading and Resolution for Catalyst

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CatalystX-Component-Traits



From pkgdb at fedoraproject.org  Wed Sep  9 16:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:21:16 +0000
Subject: [pkgdb] perl-CatalystX-Component-Traits (Fedora,
	10) updated by kevin
Message-ID: <20090909162116.3515F10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-CatalystX-Component-Traits
kevin has set commit to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora 10)
kevin has set build to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora 10)
kevin approved watchbugzilla on perl-CatalystX-Component-Traits (Fedora 10) for perl-sig
kevin approved watchcommits on perl-CatalystX-Component-Traits (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CatalystX-Component-Traits



From pkgdb at fedoraproject.org  Wed Sep  9 16:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:21:16 +0000
Subject: [pkgdb] perl-CatalystX-Component-Traits (Fedora,
	10) updated by kevin
Message-ID: <20090909162116.3F51E10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-CatalystX-Component-Traits
kevin has set commit to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora 11)
kevin has set build to Approved for 107427 on perl-CatalystX-Component-Traits (Fedora 11)
kevin approved watchbugzilla on perl-CatalystX-Component-Traits (Fedora 11) for perl-sig
kevin approved watchcommits on perl-CatalystX-Component-Traits (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CatalystX-Component-Traits



From pkgdb at fedoraproject.org  Wed Sep  9 16:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:21:16 +0000
Subject: [pkgdb] perl-CatalystX-Component-Traits (Fedora,
	10) updated by kevin
Message-ID: <20090909162116.46B8310F8B0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-CatalystX-Component-Traits (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CatalystX-Component-Traits (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-CatalystX-Component-Traits



From kevin at fedoraproject.org  Wed Sep  9 16:21:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:21:23 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits - New directory
Message-ID: <20090909162123.1D86911C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CatalystX-Component-Traits
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsse1247/rpms/perl-CatalystX-Component-Traits

Log Message:
Directory /cvs/pkgs/rpms/perl-CatalystX-Component-Traits added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:21:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:21:23 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/devel - New directory
Message-ID: <20090909162123.4D0E211C0423@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CatalystX-Component-Traits/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsse1247/rpms/perl-CatalystX-Component-Traits/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CatalystX-Component-Traits/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  9 16:21:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:21:29 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits Makefile,NONE,1.1
Message-ID: <20090909162129.D64AA11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CatalystX-Component-Traits
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsse1247/rpms/perl-CatalystX-Component-Traits

Added Files:
	Makefile 
Log Message:
Setup of module perl-CatalystX-Component-Traits


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CatalystX-Component-Traits
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 Sep  9 16:21:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Sep 2009 16:21:30 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090909162130.2AF0711C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CatalystX-Component-Traits/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsse1247/rpms/perl-CatalystX-Component-Traits/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CatalystX-Component-Traits


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CatalystX-Component-Traits
# $Id: Makefile,v 1.1 2009/09/09 16:21:29 kevin Exp $
NAME := perl-CatalystX-Component-Traits
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 remi at fedoraproject.org  Wed Sep  9 16:21:34 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:21:34 +0000 (UTC)
Subject: rpms/glpi/F-10 glpi-config_path.php, 1.2, 1.3 glpi.spec, 1.23,
	1.24 sources, 1.17, 1.18 glpi-check.patch, 1.1, NONE
Message-ID: <20090909162134.CE69711C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1348

Modified Files:
	glpi-config_path.php glpi.spec sources 
Removed Files:
	glpi-check.patch 
Log Message:
update to 0.72.21


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi-config_path.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-config_path.php	12 Jul 2008 07:21:33 -0000	1.2
+++ glpi-config_path.php	9 Sep 2009 16:21:34 -0000	1.3
@@ -11,6 +11,8 @@ define("GLPI_SESSION_DIR",    "/var/lib/
 define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins");
 define("GLPI_LOCK_DIR",       "/var/lib/glpi/files/_lock/");
 
-define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_LOG_DIR",        "/var/log/glpi");
+
+define("GLPI_CACHE_LITE_DIR", "Cache");
+define("GLPI_PHPMAILER_DIR",  "PHPMailer");
 ?>


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- glpi.spec	2 Jun 2009 15:38:57 -0000	1.23
+++ glpi.spec	9 Sep 2009 16:21:34 -0000	1.24
@@ -1,11 +1,13 @@
 %if %{?fedora}%{?rhel} >= 5
-%define useselinux 1
+%global useselinux 1
 %else
-%define useselinux 0
+%global useselinux 0
 %endif
 
+%global tarballversion 0.72.21
+
 Name:           glpi
-Version:        0.71.6
+Version:        0.72.2.1
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -13,26 +15,18 @@ Summary(fr):    Gestion Libre de Parc In
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.glpi-project.org/
-Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{version}.tar.gz
+Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{tarballversion}.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
-# Avoid SELinux AVC when testing write access to log file.
-# backport from 0.72 (Changeset 7208)
-Patch0:         glpi-check.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       php, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring
-%if 0%{?rhel} == 4
-Requires:       php-domxml
-%else
-Requires:       php-xml
+Requires:       php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json
 Requires:       php-pear(Cache_Lite) >= 1.7.4
-%endif
+Requires:       php-PHPMailer
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
 Requires(post): /sbin/service
@@ -65,27 +59,25 @@ techniciens gr?ce ? une maintenance pl
 %prep
 %setup -q -n glpi
 
-%patch0 -p0
-
-%if 0%{?rhel} == 4
-
-# use bundled lib
-mv lib/cache_lite/LICENSE   LICENSE.cache_lite
-grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php 
-
-%else
-
 # Use system lib
 rm -rf lib/cache_lite
-cp %{SOURCE2} config/config_path.php 
+rm -rf lib/phpmailer
 
-%endif
+cp %{SOURCE2} config/config_path.php 
 
-mv lib/phpmailer/LICENSE    LICENSE.phpmailer
 mv lib/tiny_mce/license.txt LICENSE.tiny_mce
-dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
-iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt
-iconv -f ISO-8859-15 -t UTF-8 README.txt   >a && mv a README.txt
+mv lib/extjs/license.txt    LICENSE.extjs
+rm lib/extjs/{CHANGES.html,INCLUDE_ORDER.txt}
+mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
+mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
+mv lib/phpcas/README        README.phpcas
+rm scripts/glpi_cron_curl.sh
+
+dos2unix -o LICENSE.tiny_mce
+for fic in LISEZMOI.txt README.txt
+do
+   iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic
+done
 
 cat >cron <<EOF
 # GLPI core
@@ -103,9 +95,9 @@ rm -rf %{buildroot} 
 
 # ===== application =====
 mkdir -p %{buildroot}/%{_datadir}/%{name}
-cp -a *.php *.js %{buildroot}/%{_datadir}/%{name}/
+cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/
 
-for i in ajax css front help inc install lib locales pics plugins scripts
+for i in ajax css front inc install lib locales pics plugins scripts
 do   cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i
 done
 
@@ -164,10 +156,6 @@ rm -rf %{buildroot} 
 %post
 %if %{useselinux}
 (
-# Remove Selinux policy (from previous packaging)
-semodule -s targeted -r %{name} &>/dev/null
-# Remove old httpd_sys_script_rw_t
-semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" 
 semanage fcontext -a -s system_u -t httpd_log_t           -r s0 "%{_localstatedir}/log/glpi(/.*)?"
@@ -198,7 +186,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc *.txt LICENSE.*
+%doc *.txt LICENSE.* README.*
 
 %attr(750,apache,root) %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
@@ -213,11 +201,12 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.php
 %{_datadir}/%{name}/*.js
+# License file required by installation process
+%{_datadir}/%{name}/COPYING.txt
 %{_datadir}/%{name}/ajax
 %{_datadir}/%{name}/config
 %{_datadir}/%{name}/css
 %{_datadir}/%{name}/front
-%{_datadir}/%{name}/help
 %{_datadir}/%{name}/inc
 %{_datadir}/%{name}/install
 %{_datadir}/%{name}/lib
@@ -229,6 +218,11 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
+- update to 0.72.21
+- use system PHPMailer
+- now requires php > 5
+
 * Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
 - update to 0.71.6 (Bugfix Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	2 Jun 2009 15:38:57 -0000	1.17
+++ sources	9 Sep 2009 16:21:34 -0000	1.18
@@ -1 +1 @@
-d7137027c2a9f79cadd193bbe6ebab92  glpi-0.71.6.tar.gz
+495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz


--- glpi-check.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep  9 16:22:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:22:20 +0000
Subject: [pkgdb] mlton (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909162221.D990310F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mlton
kevin has set commit to Approved for 107427 on mlton (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on mlton (Fedora EPEL 5)
kevin has set build to Approved for 107427 on mlton (Fedora EPEL 5)
kevin changed owner of mlton in Fedora EPEL 5 to agoode
kevin approved watchbugzilla on mlton (Fedora EPEL 5) for rjones
kevin approved watchcommits on mlton (Fedora EPEL 5) for rjones
kevin approved commit on mlton (Fedora EPEL 5) for rjones
kevin approved build on mlton (Fedora EPEL 5) for rjones
kevin approved approveacls on mlton (Fedora EPEL 5) for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mlton



From pkgdb at fedoraproject.org  Wed Sep  9 16:23:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:23:07 +0000
Subject: [pkgdb] pcb (Fedora, 12) updated by kevin
Message-ID: <20090909162307.87CDF10F87A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for pcb
kevin has set commit to Approved for 107427 on pcb (Fedora 12)
kevin has set checkout to Approved for 107427 on pcb (Fedora 12)
kevin has set build to Approved for 107427 on pcb (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pcb



From pkgdb at fedoraproject.org  Wed Sep  9 16:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:23:41 +0000
Subject: [pkgdb] lwp (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909162341.5018A10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for lwp
kevin has set commit to Approved for 107427 on lwp (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on lwp (Fedora EPEL 5)
kevin has set build to Approved for 107427 on lwp (Fedora EPEL 5)
kevin changed owner of lwp in Fedora EPEL 5 to agoode
kevin approved watchbugzilla on lwp (Fedora EPEL 5) for rjones
kevin approved watchcommits on lwp (Fedora EPEL 5) for rjones
kevin approved commit on lwp (Fedora EPEL 5) for rjones
kevin approved build on lwp (Fedora EPEL 5) for rjones
kevin approved approveacls on lwp (Fedora EPEL 5) for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Wed Sep  9 16:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:25:51 +0000
Subject: [pkgdb] sblim-sfcc (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909162551.A61B010F87A@bastion2.fedora.phx.redhat.com>

kevin changed owner of sblim-sfcc in Fedora 10 to srini
kevin approved watchbugzilla on sblim-sfcc (Fedora 10) for mdomsch
kevin approved watchcommits on sblim-sfcc (Fedora 10) for mdomsch
kevin approved watchbugzilla on sblim-sfcc (Fedora 10) for praveenp
kevin approved watchcommits on sblim-sfcc (Fedora 10) for praveenp
kevin approved commit on sblim-sfcc (Fedora 10) for praveenp
kevin approved build on sblim-sfcc (Fedora 10) for praveenp
kevin approved approveacls on sblim-sfcc (Fedora 10) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Wed Sep  9 16:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:25:51 +0000
Subject: [pkgdb] sblim-sfcc (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909162551.B759610F894@bastion2.fedora.phx.redhat.com>

kevin changed owner of sblim-sfcc in Fedora EPEL 5 to srini
kevin approved watchbugzilla on sblim-sfcc (Fedora EPEL 5) for mdomsch
kevin approved watchcommits on sblim-sfcc (Fedora EPEL 5) for mdomsch
kevin approved watchbugzilla on sblim-sfcc (Fedora EPEL 5) for praveenp
kevin approved watchcommits on sblim-sfcc (Fedora EPEL 5) for praveenp
kevin approved commit on sblim-sfcc (Fedora EPEL 5) for praveenp
kevin approved build on sblim-sfcc (Fedora EPEL 5) for praveenp
kevin approved approveacls on sblim-sfcc (Fedora EPEL 5) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Wed Sep  9 16:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:25:51 +0000
Subject: [pkgdb] sblim-sfcc (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909162551.C5F9310F89A@bastion2.fedora.phx.redhat.com>

kevin changed owner of sblim-sfcc in Fedora EPEL 4 to srini
kevin approved watchbugzilla on sblim-sfcc (Fedora EPEL 4) for mdomsch
kevin approved watchcommits on sblim-sfcc (Fedora EPEL 4) for mdomsch
kevin approved watchbugzilla on sblim-sfcc (Fedora EPEL 4) for praveenp
kevin approved watchcommits on sblim-sfcc (Fedora EPEL 4) for praveenp
kevin approved commit on sblim-sfcc (Fedora EPEL 4) for praveenp
kevin approved build on sblim-sfcc (Fedora EPEL 4) for praveenp
kevin approved approveacls on sblim-sfcc (Fedora EPEL 4) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Wed Sep  9 16:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:25:51 +0000
Subject: [pkgdb] sblim-sfcc (Fedora EPEL, 4) updated by kevin
Message-ID: <20090909162551.D78E310F89F@bastion2.fedora.phx.redhat.com>

kevin changed owner of sblim-sfcc in Fedora 11 to srini
kevin approved watchbugzilla on sblim-sfcc (Fedora 11) for mdomsch
kevin approved watchcommits on sblim-sfcc (Fedora 11) for mdomsch
kevin approved watchbugzilla on sblim-sfcc (Fedora 11) for praveenp
kevin approved watchcommits on sblim-sfcc (Fedora 11) for praveenp
kevin approved commit on sblim-sfcc (Fedora 11) for praveenp
kevin approved build on sblim-sfcc (Fedora 11) for praveenp
kevin approved approveacls on sblim-sfcc (Fedora 11) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Wed Sep  9 16:27:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:27:27 +0000
Subject: [pkgdb] rvm (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909162727.865AF10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rvm
kevin has set commit to Approved for 107427 on rvm (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rvm (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rvm (Fedora EPEL 5)
kevin changed owner of rvm in Fedora EPEL 5 to agoode
kevin approved watchbugzilla on rvm (Fedora EPEL 5) for rjones
kevin approved watchcommits on rvm (Fedora EPEL 5) for rjones
kevin approved commit on rvm (Fedora EPEL 5) for rjones
kevin approved build on rvm (Fedora EPEL 5) for rjones
kevin approved approveacls on rvm (Fedora EPEL 5) for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From remi at fedoraproject.org  Wed Sep  9 16:30:04 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:30:04 +0000 (UTC)
Subject: rpms/glpi-data-injection/F-10 glpi-data-injection.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090909163004.1139A11C043D@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4448

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.7.0 for glpi 0.72


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-10/glpi-data-injection.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glpi-data-injection.spec	21 Apr 2009 16:33:41 -0000	1.4
+++ glpi-data-injection.spec	9 Sep 2009 16:30:03 -0000	1.5
@@ -1,7 +1,7 @@
-%define pluginname   data_injection
+%define pluginname   datainjection
 
 Name:           glpi-data-injection
-Version:        1.5.1
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn?es dans GLPI
@@ -15,7 +15,10 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
+Requires:       glpi >= 0.72
+
+# This plugin is renamed (for 0.72)
+Provides:       glpi-datainjection = %{version}-%{release}
 
 %description
 Plugin for importing data into GLPI
@@ -39,7 +42,7 @@ Elle pourra servir, par exemple, ? :
 %prep
 %setup -q -c
 
-mv %{pluginname}/test test
+#mv %{pluginname}/test test
 mv %{pluginname}/docs docs
 
 # dos2unix to avoid rpmlint warnings
@@ -89,6 +92,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.7.0-1
+- update to 1.7.0 finale for glpi 0.72
+
 * Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
 - update to 1.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Apr 2009 16:33:41 -0000	1.5
+++ sources	9 Sep 2009 16:30:03 -0000	1.6
@@ -1 +1 @@
-6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz
+29c3c87b73546026b88a9b8928cb8d76  glpi-datainjection-1.7.0.tar.gz



From pkgdb at fedoraproject.org  Wed Sep  9 16:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Sep 2009 16:30:22 +0000
Subject: [pkgdb] rpc2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090909163022.1BCB710F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rpc2
kevin has set commit to Approved for 107427 on rpc2 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rpc2 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rpc2 (Fedora EPEL 5)
kevin changed owner of rpc2 in Fedora EPEL 5 to agoode
kevin approved watchbugzilla on rpc2 (Fedora EPEL 5) for nhorman
kevin approved watchcommits on rpc2 (Fedora EPEL 5) for nhorman
kevin approved commit on rpc2 (Fedora EPEL 5) for nhorman
kevin approved build on rpc2 (Fedora EPEL 5) for nhorman
kevin approved approveacls on rpc2 (Fedora EPEL 5) for nhorman

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From xhorak at fedoraproject.org  Wed Sep  9 16:32:14 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 16:32:14 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.231,1.232
Message-ID: <20090909163214.10EAB11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5204

Modified Files:
	epiphany.spec 
Log Message:
Rebuild against newer gecko


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- epiphany.spec	4 Aug 2009 08:20:25 -0000	1.231
+++ epiphany.spec	9 Sep 2009 16:32:13 -0000	1.232
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.13
+%define gecko_ver 1.9.0.14
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-10
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-9
 - Rebuild against newer gecko
 



From remi at fedoraproject.org  Wed Sep  9 16:32:37 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:32:37 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/F-10 glpi-mass-ocs-import.spec, 1.4,
	1.5 sources, 1.5, 1.6 glpi-mass-ocs-import.conf, 1.1, NONE
Message-ID: <20090909163237.7F76B11C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5389

Modified Files:
	glpi-mass-ocs-import.spec sources 
Removed Files:
	glpi-mass-ocs-import.conf 
Log Message:
update to 1.3.0 for glpi 0.72


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-10/glpi-mass-ocs-import.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glpi-mass-ocs-import.spec	9 Apr 2009 15:25:38 -0000	1.4
+++ glpi-mass-ocs-import.spec	9 Sep 2009 16:32:37 -0000	1.5
@@ -1,8 +1,8 @@
-%define pluginname   mass_ocs_import
-%define lockname     mass_ocs_import.lock
+%define pluginname   massocsimport
+%define lockname     massocsimport.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.2
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -12,18 +12,13 @@ License:        GPLv2+
 URL:            http://www.glpi-project.org/
 
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
-Source1:        %{name}.conf
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
-%if 0%{?rhel} == 4
-Requires:       php
-%else
+Requires:       glpi >= 0.72
 Requires:       php-cli
-%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -55,11 +50,15 @@ for fic in docs/*; do
 done
 
 cat >README-RPM-POSTINTALL.txt <<EOF
-
 Remember to Install this extension in the Application.
-
 Cron is provided, but disabled. 
+EOF
 
+cat >%{name}.httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
+    Order Allow,Deny
+    Deny from all
+</Directory>
 EOF
 
 cat >cron <<EOF
@@ -91,7 +90,7 @@ touch %{buildroot}%{_localstatedir}/lib/
 # ===== apache =====
 rm %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/.htaccess
 mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-install --mode 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install --mode 644 %{name}.httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 
 %post
@@ -111,7 +110,7 @@ fi
 %check
 # Check the name of the lock file in sources
 grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/ocsng_fullsync.sh || exit 1
-grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/config/plugin_mass_ocs_import.config.php || exit 1
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php || exit 1
 
 
 %clean
@@ -129,6 +128,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3.0-1
+- update to 1.3.0 finale for glpi 0.72
+
 * Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
 - update to 1.2.2 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Apr 2009 15:25:38 -0000	1.5
+++ sources	9 Sep 2009 16:32:37 -0000	1.6
@@ -1 +1 @@
-abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz
+15f00aec2062ce5ca652abe89530a7cd  glpi-massocsimport-1.3.0.tar.gz


--- glpi-mass-ocs-import.conf DELETED ---



From remi at fedoraproject.org  Wed Sep  9 16:35:38 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:35:38 +0000 (UTC)
Subject: rpms/glpi-pdf/F-10 glpi-pdf.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090909163538.C1D1311C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-pdf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7601

Modified Files:
	glpi-pdf.spec sources 
Log Message:
update to 0.6.1 for glpi 0.72


Index: glpi-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/F-10/glpi-pdf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-pdf.spec	12 Jul 2008 08:03:39 -0000	1.2
+++ glpi-pdf.spec	9 Sep 2009 16:35:38 -0000	1.3
@@ -1,10 +1,10 @@
 %define pluginname   pdf
 
 Name:           glpi-pdf
-Version:        0.5
+Version:        0.6.1
 Release:        1%{?dist}
-Summary:        GLPI Plugin to print PDF of computers
-Summary(fr):    Extension GLPI pour cr?er des PDF des ordinateurs
+Summary:        GLPI Plugin to print PDF of equipment
+Summary(fr):    Extension GLPI pour cr?er des PDF des mat?riels
 
 Group:          Applications/Internet
 License:        GPLv2+
@@ -15,16 +15,16 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71
+Requires:       glpi >= 0.72
 
 %description
-This GLPI plugin enables you to print with format pdf all the mitres of a
-card computer or a software of the inventory. 
+This GLPI plugin enables you to print, in pdf format, the information 
+sheet of an equipment or a software of the inventory. 
 
 
 %description -l fr
 Cette extension GLPI vous permet de cr?er un PDF contenant toutes les
-informations sur un ordinateur ou un logiciel de l'inventaire.
+informations sur un ?quipement ou un logiciel de l'inventaire.
 
 
 %prep
@@ -36,6 +36,8 @@ for doc in docs/* ; do
     sed -i -e 's/\r//' $doc
 done
 
+cd %{pluginname}
+
 
 %build
 # empty build
@@ -46,18 +48,33 @@ rm -rf %{buildroot} 
 mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
 cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
 
+for i in %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/locales/*
+do
+  lang=$(basename $i)
+  echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
+done | tee %{name}.lang
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docs/*
-%{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
+%{_datadir}/glpi/plugins/%{pluginname}/*.php
+%{_datadir}/glpi/plugins/%{pluginname}/fonts
+%{_datadir}/glpi/plugins/%{pluginname}/front
+%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/pics
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.6.1-1
+- update to 0.6.1 finale for glpi 0.72
+
 * Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.5-1
 - update to 0.5 finale for glpi 0.71
 
@@ -72,5 +89,5 @@ rm -rf %{buildroot} 
 - new SVN snapshot
 
 * Mon Aug 13 2007 Remi Collet <RPMS at FamilleCollet.com> - 0.2-0.20070813
-- Initial RPM	
+- Initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jul 2008 08:03:39 -0000	1.3
+++ sources	9 Sep 2009 16:35:38 -0000	1.4
@@ -1 +1 @@
-6b10df91a8499f7e67d7a33e3b9085fb  glpi-pdf-0.5.tar.gz
+42972203c0d50689cc246e023a7ff597  glpi-pdf-0.6.1.tar.gz



From agoode at fedoraproject.org  Wed Sep  9 16:37:37 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed,  9 Sep 2009 16:37:37 +0000 (UTC)
Subject: rpms/lwp/EL-5 lwp.spec,1.6,1.7
Message-ID: <20090909163737.5199B11C00CE@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/lwp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9942

Modified Files:
	lwp.spec 
Log Message:
* Wed Sep  9 2009 Adam Goode <adam at spicenitz.org> - 2.5-4
- Remove F12 longjmp patch for EL-5



Index: lwp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lwp/EL-5/lwp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lwp.spec	20 Aug 2009 17:04:42 -0000	1.6
+++ lwp.spec	9 Sep 2009 16:37:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lwp
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C library for user-mode threading
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,8 +8,6 @@ URL:            http://www.coda.cs.cmu.e
 Source0:        ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         lwp-2.5-no-longjmp_chk.patch
-
 %description
 The LWP userspace threads library. The LWP threads library is used by the Coda
 distributed filesystem, RVM (a persistent VM library), and RPC2/SFTP (remote
@@ -28,7 +26,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-longjmp_chk
 
 
 %build
@@ -68,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Adam Goode <adam at spicenitz.org> - 2.5-4
+- Remove F12 longjmp patch for EL-5
+
 * Thu Aug 20 2009 Adam Goode <adam at spicenitz.org> - 2.5-3
 - Add check to specfile
 - Patch around lwp's creative use of longjmp that fails with fortify



From agoode at fedoraproject.org  Wed Sep  9 16:37:53 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed,  9 Sep 2009 16:37:53 +0000 (UTC)
Subject: rpms/lwp/EL-5 lwp-2.5-no-longjmp_chk.patch,1.1,NONE
Message-ID: <20090909163753.1785F11C00CE@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/lwp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10058

Removed Files:
	lwp-2.5-no-longjmp_chk.patch 
Log Message:
* Wed Sep  9 2009 Adam Goode <adam at spicenitz.org> - 2.5-4
- Remove F12 longjmp patch for EL-5



--- lwp-2.5-no-longjmp_chk.patch DELETED ---



From cwickert at fedoraproject.org  Wed Sep  9 16:42:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 16:42:11 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/devel
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE,
	1.1 xfce4-netload-plugin.spec, 1.16,
	1.17 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE
Message-ID: <20090909164211.C0C3711C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12416

Modified Files:
	xfce4-netload-plugin.spec 
Added Files:
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch 
Removed Files:
	xfce4-netload-0.4.0-asneeded.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
- Fix bar colors (#505214)


xfce4-netload-plugin-0.4.0-fix-bar-colors.patch:
 netload.c |   55 +++++++++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

--- NEW FILE xfce4-netload-plugin-0.4.0-fix-bar-colors.patch ---
Index: panel-plugin/netload.c
===================================================================
--- panel-plugin/netload.c	(revision 3275)
+++ panel-plugin/netload.c	(working copy)
@@ -257,7 +257,6 @@ static void run_update (t_global_monitor
 static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, 
                                      t_global_monitor *global)
 {
-    GtkRcStyle *rc;
     gint i;
 
     if (global->timeout_id)
@@ -316,19 +315,16 @@ static void monitor_set_orientation (Xfc
 
     for (i = 0; i < SUM; i++)
     {
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        if (!rc) 
-        {
-            rc = gtk_rc_style_new();
-        }
-        else
-        {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor->options.color[i];
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
+        
         gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
 
         gtk_box_pack_start(GTK_BOX(global->monitor->box),
@@ -413,7 +409,6 @@ static t_global_monitor * monitor_new(Xf
 /* ---------------------------------------------------------------------------------------------- */
 static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
 {
-    GtkRcStyle *rc;
     gint i;
 
     gtk_widget_hide(GTK_WIDGET(global->monitor->box));
@@ -423,27 +418,15 @@ static void setup_monitor(t_global_monit
 
     for (i = 0; i < SUM; i++)
     {
-        gtk_widget_hide(GTK_WIDGET(global->monitor->status[i]));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        } else {
-            /* to free the style safely in any case */
-            gtk_rc_style_ref(rc);
-        }
-                
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->color_flags[GTK_STATE_SELECTED] |= GTK_RC_BASE;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor->options.color[i];
-            rc->base[GTK_STATE_SELECTED] = global->monitor->options.color[i];
-            
-            gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
-            gtk_rc_style_unref(rc);
-        }
-        
-        gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
         
         /* Maximum */
         if( global->monitor->options.auto_max )


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xfce4-netload-plugin.spec	27 Jul 2009 07:53:51 -0000	1.16
+++ xfce4-netload-plugin.spec	9 Sep 2009 16:42:11 -0000	1.17
@@ -1,13 +1,13 @@
 Name:		xfce4-netload-plugin
 Version:	0.4.0
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-netload-0.4.0-asneeded.patch
+Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +20,7 @@ A network-load monitor plugin for the Xf
 
 %prep
 %setup -q
-%patch0 -p1 -b .asneeded
+%patch0 -p0 -b .color
 %if 0%{?fedora} >= 11
 %patch1 -p1 -b .tooltip
 %endif
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
+- Fix bar colors (#505214)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xfce4-netload-0.4.0-asneeded.patch DELETED ---



From remi at fedoraproject.org  Wed Sep  9 16:45:38 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:45:38 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi-config_path.php, 1.2, 1.3 glpi.spec, 1.14,
	1.15 sources, 1.10, 1.11 glpi-check.patch, 1.1, NONE
Message-ID: <20090909164538.D9B1F11C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13340

Modified Files:
	glpi-config_path.php glpi.spec sources 
Removed Files:
	glpi-check.patch 
Log Message:
update to glpi 0.72.21


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi-config_path.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-config_path.php	15 Sep 2008 18:12:46 -0000	1.2
+++ glpi-config_path.php	9 Sep 2009 16:45:38 -0000	1.3
@@ -11,6 +11,8 @@ define("GLPI_SESSION_DIR",    "/var/lib/
 define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins");
 define("GLPI_LOCK_DIR",       "/var/lib/glpi/files/_lock/");
 
-define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_LOG_DIR",        "/var/log/glpi");
+
+define("GLPI_CACHE_LITE_DIR", "Cache");
+define("GLPI_PHPMAILER_DIR",  "PHPMailer");
 ?>


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- glpi.spec	2 Jun 2009 15:55:31 -0000	1.14
+++ glpi.spec	9 Sep 2009 16:45:38 -0000	1.15
@@ -1,11 +1,13 @@
 %if %{?fedora}%{?rhel} >= 5
-%define useselinux 1
+%global useselinux 1
 %else
-%define useselinux 0
+%global useselinux 0
 %endif
 
+%global tarballversion 0.72.21
+
 Name:           glpi
-Version:        0.71.6
+Version:        0.72.2.1
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -13,26 +15,18 @@ Summary(fr):    Gestion Libre de Parc In
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.glpi-project.org/
-Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{version}.tar.gz
+Source0:        http://www.glpi-project.org/IMG/gz/%{name}-%{tarballversion}.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
-# Avoid SELinux AVC when testing write access to log file.
-# backport from 0.72 (Changeset 7208)
-Patch0:         glpi-check.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       php, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring
-%if 0%{?rhel} == 4
-Requires:       php-domxml
-%else
-Requires:       php-xml
+Requires:       php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json
 Requires:       php-pear(Cache_Lite) >= 1.7.4
-%endif
+Requires:       php-PHPMailer
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
 Requires(post): /sbin/service
@@ -65,27 +59,25 @@ techniciens gr?ce ? une maintenance pl
 %prep
 %setup -q -n glpi
 
-%patch0 -p0
-
-%if 0%{?rhel} == 4
-
-# use bundled lib
-mv lib/cache_lite/LICENSE   LICENSE.cache_lite
-grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php 
-
-%else
-
 # Use system lib
 rm -rf lib/cache_lite
-cp %{SOURCE2} config/config_path.php 
+rm -rf lib/phpmailer
 
-%endif
+cp %{SOURCE2} config/config_path.php 
 
-mv lib/phpmailer/LICENSE    LICENSE.phpmailer
 mv lib/tiny_mce/license.txt LICENSE.tiny_mce
-dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
-iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt
-iconv -f ISO-8859-15 -t UTF-8 README.txt   >a && mv a README.txt
+mv lib/extjs/license.txt    LICENSE.extjs
+rm lib/extjs/{CHANGES.html,INCLUDE_ORDER.txt}
+mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
+mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
+mv lib/phpcas/README        README.phpcas
+rm scripts/glpi_cron_curl.sh
+
+dos2unix -o LICENSE.tiny_mce
+for fic in LISEZMOI.txt README.txt
+do
+   iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic
+done
 
 cat >cron <<EOF
 # GLPI core
@@ -103,9 +95,9 @@ rm -rf %{buildroot} 
 
 # ===== application =====
 mkdir -p %{buildroot}/%{_datadir}/%{name}
-cp -a *.php *.js %{buildroot}/%{_datadir}/%{name}/
+cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/
 
-for i in ajax css front help inc install lib locales pics plugins scripts
+for i in ajax css front inc install lib locales pics plugins scripts
 do   cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i
 done
 
@@ -164,10 +156,6 @@ rm -rf %{buildroot} 
 %post
 %if %{useselinux}
 (
-# Remove Selinux policy (from previous packaging)
-semodule -s targeted -r %{name} &>/dev/null
-# Remove old httpd_sys_script_rw_t
-semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" 
 semanage fcontext -a -s system_u -t httpd_log_t           -r s0 "%{_localstatedir}/log/glpi(/.*)?"
@@ -198,7 +186,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc *.txt LICENSE.*
+%doc *.txt LICENSE.* README.*
 
 %attr(750,apache,root) %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
@@ -213,11 +201,12 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.php
 %{_datadir}/%{name}/*.js
+# License file required by installation process
+%{_datadir}/%{name}/COPYING.txt
 %{_datadir}/%{name}/ajax
 %{_datadir}/%{name}/config
 %{_datadir}/%{name}/css
 %{_datadir}/%{name}/front
-%{_datadir}/%{name}/help
 %{_datadir}/%{name}/inc
 %{_datadir}/%{name}/install
 %{_datadir}/%{name}/lib
@@ -229,6 +218,11 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
+- update to 0.72.21
+- use system PHPMailer
+- now requires php > 5
+
 * Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
 - update to 0.71.6 (Bugfix Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jun 2009 15:55:31 -0000	1.10
+++ sources	9 Sep 2009 16:45:38 -0000	1.11
@@ -1 +1 @@
-d7137027c2a9f79cadd193bbe6ebab92  glpi-0.71.6.tar.gz
+495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz


--- glpi-check.patch DELETED ---



From remi at fedoraproject.org  Wed Sep  9 16:47:22 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:47:22 +0000 (UTC)
Subject: rpms/glpi-data-injection/EL-5 glpi-data-injection.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090909164722.4ED2D11C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13913

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.7.0 for glpi 0.72


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/EL-5/glpi-data-injection.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glpi-data-injection.spec	21 Apr 2009 16:51:00 -0000	1.5
+++ glpi-data-injection.spec	9 Sep 2009 16:47:21 -0000	1.6
@@ -1,7 +1,7 @@
-%define pluginname   data_injection
+%define pluginname   datainjection
 
 Name:           glpi-data-injection
-Version:        1.5.1
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn?es dans GLPI
@@ -15,7 +15,10 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
+Requires:       glpi >= 0.72
+
+# This plugin is renamed (for 0.72)
+Provides:       glpi-datainjection = %{version}-%{release}
 
 %description
 Plugin for importing data into GLPI
@@ -39,7 +42,7 @@ Elle pourra servir, par exemple, ? :
 %prep
 %setup -q -c
 
-mv %{pluginname}/test test
+#mv %{pluginname}/test test
 mv %{pluginname}/docs docs
 
 # dos2unix to avoid rpmlint warnings
@@ -89,6 +92,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.7.0-1
+- update to 1.7.0 finale for glpi 0.72
+
 * Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
 - update to 1.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Apr 2009 16:51:01 -0000	1.5
+++ sources	9 Sep 2009 16:47:22 -0000	1.6
@@ -1 +1 @@
-6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz
+29c3c87b73546026b88a9b8928cb8d76  glpi-datainjection-1.7.0.tar.gz



From tgl at fedoraproject.org  Wed Sep  9 16:48:37 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed,  9 Sep 2009 16:48:37 +0000 (UTC)
Subject: rpms/postgresql/F-10 .cvsignore, 1.46,
	1.47 postgresql-ac-version.patch, 1.7, 1.8 postgresql.spec,
	1.108, 1.109 sources, 1.47, 1.48
Message-ID: <20090909164837.AC9DC11C00CE@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14349

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	21 Mar 2009 23:12:50 -0000	1.46
+++ .cvsignore	9 Sep 2009 16:48:37 -0000	1.47
@@ -1,5 +1,5 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.3.8.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.7-US.pdf
+postgresql-8.3.8-US.pdf

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql-ac-version.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- postgresql-ac-version.patch	21 Mar 2009 23:12:50 -0000	1.7
+++ postgresql-ac-version.patch	9 Sep 2009 16:48:37 -0000	1.8
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.3.7.orig/configure.in postgresql-8.3.7/configure.in
---- postgresql-8.3.7.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.7/configure.in	2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.8.orig/configure.in postgresql-8.3.8/configure.in
+--- postgresql-8.3.8.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.8/configure.in	2008-09-25 10:26:10.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3.7], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.8], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- postgresql.spec	20 Aug 2009 19:00:06 -0000	1.108
+++ postgresql.spec	9 Sep 2009 16:48:37 -0000	1.109
@@ -83,8 +83,9 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.7
-Release: 1%{?dist}.1
+Version: 8.3.8
+Release: 1%{?dist}
+# PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -98,7 +99,7 @@ Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.7-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.8-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -871,6 +872,14 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep  9 2009 Tom Lane <tgl at redhat.com> 8.3.8-1
+- Update to PostgreSQL 8.3.8, for various fixes described at
+  http://www.postgresql.org/docs/8.3/static/release-8-3-8.html
+  including three security issues
+Related: #522084
+Related: #522085
+Related: #522092
+
 * Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.3.7-1.1
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	21 Mar 2009 23:12:50 -0000	1.47
+++ sources	9 Sep 2009 16:48:37 -0000	1.48
@@ -1,5 +1,5 @@
-7b7e91a2221e55fe1b167e663217a96d  postgresql-8.3.7.tar.bz2
+aac683d03f765dc58a3a0e5eaa1927bf  postgresql-8.3.8.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-cf36036b0a973f793b2ba25dfdbcf879  postgresql-8.3.7-US.pdf
+721628037ec3c47e7c11bd90959578ad  postgresql-8.3.8-US.pdf



From remi at fedoraproject.org  Wed Sep  9 16:49:52 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:49:52 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/EL-5 glpi-mass-ocs-import.spec, 1.4,
	1.5 sources, 1.5, 1.6 glpi-mass-ocs-import.conf, 1.1, NONE
Message-ID: <20090909164952.D8CC711C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14813

Modified Files:
	glpi-mass-ocs-import.spec sources 
Removed Files:
	glpi-mass-ocs-import.conf 
Log Message:
update to 1.3.0 for glpi 0.72


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/glpi-mass-ocs-import.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glpi-mass-ocs-import.spec	9 Apr 2009 15:38:34 -0000	1.4
+++ glpi-mass-ocs-import.spec	9 Sep 2009 16:49:52 -0000	1.5
@@ -1,8 +1,8 @@
-%define pluginname   mass_ocs_import
-%define lockname     mass_ocs_import.lock
+%define pluginname   massocsimport
+%define lockname     massocsimport.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.2
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -12,18 +12,13 @@ License:        GPLv2+
 URL:            http://www.glpi-project.org/
 
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
-Source1:        %{name}.conf
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
-%if 0%{?rhel} == 4
-Requires:       php
-%else
+Requires:       glpi >= 0.72
 Requires:       php-cli
-%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -55,11 +50,15 @@ for fic in docs/*; do
 done
 
 cat >README-RPM-POSTINTALL.txt <<EOF
-
 Remember to Install this extension in the Application.
-
 Cron is provided, but disabled. 
+EOF
 
+cat >%{name}.httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
+    Order Allow,Deny
+    Deny from all
+</Directory>
 EOF
 
 cat >cron <<EOF
@@ -91,7 +90,7 @@ touch %{buildroot}%{_localstatedir}/lib/
 # ===== apache =====
 rm %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/.htaccess
 mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-install --mode 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install --mode 644 %{name}.httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 
 %post
@@ -111,7 +110,7 @@ fi
 %check
 # Check the name of the lock file in sources
 grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/ocsng_fullsync.sh || exit 1
-grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/config/plugin_mass_ocs_import.config.php || exit 1
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php || exit 1
 
 
 %clean
@@ -129,6 +128,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3.0-1
+- update to 1.3.0 finale for glpi 0.72
+
 * Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
 - update to 1.2.2 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Apr 2009 15:38:34 -0000	1.5
+++ sources	9 Sep 2009 16:49:52 -0000	1.6
@@ -1 +1 @@
-abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz
+15f00aec2062ce5ca652abe89530a7cd  glpi-massocsimport-1.3.0.tar.gz


--- glpi-mass-ocs-import.conf DELETED ---



From remi at fedoraproject.org  Wed Sep  9 16:51:15 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed,  9 Sep 2009 16:51:15 +0000 (UTC)
Subject: rpms/glpi-pdf/EL-5 glpi-pdf.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090909165115.C223711C00CE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-pdf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15264

Modified Files:
	glpi-pdf.spec sources 
Log Message:
update to 0.6.1 for glpi 0.72


Index: glpi-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/EL-5/glpi-pdf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-pdf.spec	15 Sep 2008 18:14:24 -0000	1.2
+++ glpi-pdf.spec	9 Sep 2009 16:51:15 -0000	1.3
@@ -1,10 +1,10 @@
 %define pluginname   pdf
 
 Name:           glpi-pdf
-Version:        0.5
+Version:        0.6.1
 Release:        1%{?dist}
-Summary:        GLPI Plugin to print PDF of computers
-Summary(fr):    Extension GLPI pour cr?er des PDF des ordinateurs
+Summary:        GLPI Plugin to print PDF of equipment
+Summary(fr):    Extension GLPI pour cr?er des PDF des mat?riels
 
 Group:          Applications/Internet
 License:        GPLv2+
@@ -15,16 +15,16 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71
+Requires:       glpi >= 0.72
 
 %description
-This GLPI plugin enables you to print with format pdf all the mitres of a
-card computer or a software of the inventory. 
+This GLPI plugin enables you to print, in pdf format, the information 
+sheet of an equipment or a software of the inventory. 
 
 
 %description -l fr
 Cette extension GLPI vous permet de cr?er un PDF contenant toutes les
-informations sur un ordinateur ou un logiciel de l'inventaire.
+informations sur un ?quipement ou un logiciel de l'inventaire.
 
 
 %prep
@@ -36,6 +36,8 @@ for doc in docs/* ; do
     sed -i -e 's/\r//' $doc
 done
 
+cd %{pluginname}
+
 
 %build
 # empty build
@@ -46,18 +48,33 @@ rm -rf %{buildroot} 
 mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
 cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
 
+for i in %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/locales/*
+do
+  lang=$(basename $i)
+  echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
+done | tee %{name}.lang
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docs/*
-%{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
+%{_datadir}/glpi/plugins/%{pluginname}/*.php
+%{_datadir}/glpi/plugins/%{pluginname}/fonts
+%{_datadir}/glpi/plugins/%{pluginname}/front
+%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/pics
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.6.1-1
+- update to 0.6.1 finale for glpi 0.72
+
 * Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.5-1
 - update to 0.5 finale for glpi 0.71
 
@@ -72,5 +89,5 @@ rm -rf %{buildroot} 
 - new SVN snapshot
 
 * Mon Aug 13 2007 Remi Collet <RPMS at FamilleCollet.com> - 0.2-0.20070813
-- Initial RPM	
+- Initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Sep 2008 18:14:24 -0000	1.3
+++ sources	9 Sep 2009 16:51:15 -0000	1.4
@@ -1 +1 @@
-6b10df91a8499f7e67d7a33e3b9085fb  glpi-pdf-0.5.tar.gz
+42972203c0d50689cc246e023a7ff597  glpi-pdf-0.6.1.tar.gz



From rstrode at fedoraproject.org  Wed Sep  9 16:51:16 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  9 Sep 2009 16:51:16 +0000 (UTC)
Subject: rpms/plymouth/devel
	0001-populate-initrd-Try-to-find-inst-more-aggressively.patch,
	NONE, 1.1
Message-ID: <20090909165116.C4C7B11C00CE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15243

Added Files:
	0001-populate-initrd-Try-to-find-inst-more-aggressively.patch 
Log Message:
Add patch


0001-populate-initrd-Try-to-find-inst-more-aggressively.patch:
 plymouth-populate-initrd.in |   24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch ---
>From 736822e2f273596e0a7179f5384002903be3d3db Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 9 Sep 2009 11:26:46 -0400
Subject: [PATCH] [populate-initrd] Try to find inst more aggressively

We've been using the inst function provided by mkinitrd
to install plymouth and its dependencies into the initrd
root, but mkinitrd may not be installed in a dracut world,
and dracut has its own inst function.

This commit tries getting access to either of them, before
bailing. At some point we may want to bundle our own inst
function or get a new flag added to /usr/bin/install to do
what inst does.
---
 scripts/plymouth-populate-initrd.in |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 3857197..dd502b9 100755
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -8,10 +8,23 @@
 [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
 [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
 
-if [ -f "${LIBEXECDIR}/initrd-functions" ]; then
-    . "${LIBEXECDIR}/initrd-functions"
-else
-    echo "Couldn't import initrd functions." > /dev/stderr
+if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
+
+    if [ -f "${LIBEXECDIR}/initrd-functions" ]; then
+        PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${LIBEXECDIR}/initrd-functions"
+    fi
+
+    if [ -f "${DATADIR}/dracut/dracut-functions" ]; then
+        PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${DATADIR}/dracut/dracut-functions"
+    fi
+fi
+
+if [ -n "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
+    source $PLYMOUTH_POPULATE_SOURCE_FUNCTIONS
+fi
+
+if [ " $(type -t inst) " != " function " ]; then
+    echo "Need 'inst' function, try setting PLYMOUTH_POPULATE_SOURCE_FUNCTIONS to a file that defines it" 1>&2
     exit 1
 fi
 
@@ -48,7 +61,7 @@ while [ $# -gt 0 ]; do
     esac
     shift
 done
-set_verbose $verbose
+set_verbose $verbose || :
 
 [ -z "$INITRDDIR" ] && usage error
 
-- 
1.6.4.2




From djuran at fedoraproject.org  Wed Sep  9 17:01:11 2009
From: djuran at fedoraproject.org (David Juran)
Date: Wed,  9 Sep 2009 17:01:11 +0000 (UTC)
Subject: rpms/cpqarrayd/devel cpqarrayd-2.3-message-overrun.patch, NONE,
	1.1 cpqarrayd.spec, 1.9, 1.10
Message-ID: <20090909170111.0BEAF11C00CE@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/cpqarrayd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18612

Modified Files:
	cpqarrayd.spec 
Added Files:
	cpqarrayd-2.3-message-overrun.patch 
Log Message:
- fix message overrun (Bz 516657)


cpqarrayd-2.3-message-overrun.patch:
 cciss_functions.c |    5 -
 cciss_structs.h   |    6 -
 discover.c        |   11 +--
 status.c          |  164 +++++++++++++++++++++++++++++++++---------------------
 4 files changed, 113 insertions(+), 73 deletions(-)

--- NEW FILE cpqarrayd-2.3-message-overrun.patch ---
diff -ruN cpqarrayd-2.3-save/cciss_functions.c cpqarrayd-2.3/cciss_functions.c
--- cpqarrayd-2.3-save/cciss_functions.c	2007-12-03 17:06:22.000000000 +0000
+++ cpqarrayd-2.3/cciss_functions.c	2009-08-27 09:34:23.000000000 +0100
@@ -161,17 +161,18 @@
 	iocommand.buf = buffer;
 
 	result = ioctl (device_fd, CCISS_PASSTHRU, &iocommand);
-	if (result < 0)
-	{
+	if (result < 0) {
 		perror (" * ioctl failed");
 		return -1;
 	}
 
 	if (iocommand.error_info.CommandStatus == 1) {
 		printf (" * Command succeeded with dataoverrun (code %d)\n", iocommand.error_info.CommandStatus);
+		return 1;
 	}
 	else if (iocommand.error_info.CommandStatus == 2) {
 		printf (" * Command succeeded with dataunderrun (code %d)\n", iocommand.error_info.CommandStatus);
+		return 2;
 	}
 	else if (iocommand.error_info.CommandStatus != 0)
 	{
diff -ruN cpqarrayd-2.3-save/cciss_structs.h cpqarrayd-2.3/cciss_structs.h
--- cpqarrayd-2.3-save/cciss_structs.h	2005-12-16 11:17:44.000000000 +0000
+++ cpqarrayd-2.3/cciss_structs.h	2009-08-27 09:34:23.000000000 +0100
@@ -37,9 +37,9 @@
 #define CISS_MAX_PHYS_LUN       1024
 
 #define CompareEvent(event,par_class,par_subclass,par_detail) \
-                     ((event.class.class==par_class) && \
-					 (event.class.subclass == par_subclass) && \
-					 (event.class.detail == par_detail))
+                     ((event->class.class==par_class) && \
+					 (event->class.subclass == par_subclass) && \
+					 (event->class.detail == par_detail))
 
 #pragma pack(1) /* these structures must be byte aligned */
 typedef struct _cciss_event_physicaldrivechange {
diff -ruN cpqarrayd-2.3-save/discover.c cpqarrayd-2.3/discover.c
--- cpqarrayd-2.3-save/discover.c	2009-08-26 21:37:55.000000000 +0100
+++ cpqarrayd-2.3/discover.c	2009-08-27 09:35:03.000000000 +0100
@@ -300,7 +300,7 @@
 int cciss_interrogate_controller (struct opts opts, const char *devicefile) {
   int devicefd;
   cciss_report_logicallun_struct logicalluns;
-  cciss_event_type event;
+  cciss_event_type *event;
   int listlength = 0;
   int result;
   
@@ -328,13 +328,14 @@
   if (opts.verbose) printf("  Found a CCISS Controller (%d Logical drives)\n",
 			   ctrls_found[ctrls_found_num].num_logd_found);
 
-  result = cciss_get_event(devicefd, 1, &event);
+  event = malloc(sizeof(cciss_event_type));
+  result = cciss_get_event(devicefd, 1, event);
   while (!CompareEvent(event,0,0,0)) {
     printf ("DEBUG: Discarding old event %d/%d/%d\n",
-	    event.class.class, event.class.subclass, event.class.detail);
-    result = cciss_get_event(devicefd, 0, &event);
+	    event->class.class, event->class.subclass, event->class.detail);
+    result = cciss_get_event(devicefd, 0, event);
   }
-
+  free(event);
   close (devicefd);
 
   ctrls_found_num++;
diff -ruN cpqarrayd-2.3-save/status.c cpqarrayd-2.3/status.c
--- cpqarrayd-2.3-save/status.c	2009-08-26 21:37:55.000000000 +0100
+++ cpqarrayd-2.3/status.c	2009-08-27 09:34:23.000000000 +0100
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <errno.h>
 #include <string.h>
 #if defined(HAVE_LINUX_COMPILER_H)
   #include <linux/compiler.h>
@@ -59,7 +60,7 @@
   ida_ioctl_t io, io2;
   int status, nr_blks, blks_tr, trap_stat;
   float pvalue;
-  char statusmsg[1024];
+  char *statusmsg;
   int counter;
   
     
@@ -135,19 +136,26 @@
 		    ctrls_found[ctrl_cntr].log_disk[logd_cntr].status, status,
 		    pvalue);
 	  }
-	  sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue);
-	  if (opts.debug) {
-	      printf("DEBUG: sending traps.\n");
-	  }
-	  /* Send a trap, syslog if send_trap returns !0. */
-	  if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
-	    syslog(LOG_WARNING, 
-		   "problem sending snmp trap (sendtrap() returned %d)\n",
-		   trap_stat);
+	  if (asprintf(&statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue) > 0) {
 	    if (opts.debug) {
-	      printf("DEBUG: Problem sending snmp trap",
-		     "(sendtrap() returned %d)\n", 
+	      printf("DEBUG: sending traps.\n");
+	    }
+	    /* Send a trap, syslog if send_trap returns !0. */
+	    if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
+	      syslog(LOG_WARNING, 
+		     "problem sending snmp trap (sendtrap() returned %d)\n",
 		     trap_stat);
+	      if (opts.debug) {
+		printf("DEBUG: Problem sending snmp trap",
+		       "(sendtrap() returned %d)\n", 
+		       trap_stat);
+	      }
+	    }
+	    free(statusmsg);
+	  } else {
+	    syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	    if (opts.debug) {
+	      printf ("Cannot allocate memory for statusmsg\n");
 	    }
 	  }
 	}
@@ -164,21 +172,28 @@
 		    ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue,
 		    pvalue);
 	  }
-	  sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue);
-	  if (opts.debug) {
-	      printf("DEBUG: sending traps.\n");
-	  }
-	  if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
-	    syslog(LOG_WARNING,
-		   "problem sending snmp trap (sendtrap() returned %d)\n",
-		   trap_stat);
+	  if (asprintf(&statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue) > 0) {
 	    if (opts.debug) {
-	      printf("DEBUG: Problem sending snmp trap ",
-		     "(sendtrap() returned %d)\n",
+	      printf("DEBUG: sending traps.\n");
+	    }
+	    if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) {
+	      syslog(LOG_WARNING,
+		     "problem sending snmp trap (sendtrap() returned %d)\n",
 		     trap_stat);
+	      if (opts.debug) {
+		printf("DEBUG: Problem sending snmp trap ",
+		       "(sendtrap() returned %d)\n",
+		       trap_stat);
+	      }
+	    }
+	    free(statusmsg);
+	    ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue;
+	  } else {
+	    syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	    if (opts.debug) {
+	      printf ("Cannot allocate memory for statusmsg\n");
 	    }
 	  }
-	  ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue;
 	}
 	ctrls_found[ctrl_cntr].log_disk[logd_cntr].status = status;
     }
@@ -198,73 +213,96 @@
   int logd_cntr;
   int status, nr_blks, blks_tr, trap_stat;
   float pvalue;
-  char statusmsg[1024];
+  char *statusmsg;
   int counter;
-  cciss_event_type event;
+  cciss_event_type *event;
   
     
-  for ( ctrl_cntr=0;
-        ctrl_cntr <  ctrls_found_num;
-        ctrl_cntr++) {
+  for ( ctrl_cntr=0; ctrl_cntr <  ctrls_found_num; ctrl_cntr++) {
+
     if (ctrls_found[ctrl_cntr].ctrl_type != CTRLTYPE_CCISS) {
       break;
     }
 
-    devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY);
+    if (opts.debug) {
+      printf ("Open device %s\n", ctrls_found[ctrl_cntr].devicefile);
+    }
+
+    if ((devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY)) == -1) {
+      syslog(LOG_ERR, "Cannot open %s because %s", ctrls_found[ctrl_cntr].devicefile, strerror(errno));
+      if (opts.debug) {
+	printf ("Cannot open %s because %s", ctrls_found[ctrl_cntr].devicefile, strerror(errno));
+      }
+      continue;
+    }
     
-    result = cciss_get_event(devicefd, 0, &event);
+    event = malloc(sizeof(cciss_event_type));
+    result = cciss_get_event(devicefd, 0, event);
     while (!CompareEvent(event,0,0,0)) {
       printf ("DEBUG: Got event %d/%d/%d\n",
-	      event.class.class, event.class.subclass, event.class.detail);
+	      event->class.class, event->class.subclass, event->class.detail);
       if (CompareEvent(event,5,0,0)) {
-	snprintf(statusmsg, 2048, "CCISS controler %s logical volume %d changed state to %s.",
-		 ctrls_found[ctrl_cntr].devicefile,
-		 event.detail.logstatchange.logicaldrivenumber,
-		 logicaldrivestatusstr[event.detail.logstatchange.newlogicaldrivestate]);
-	status = event.detail.logstatchange.newlogicaldrivestate;
-	syslog(LOG_WARNING, statusmsg);
-	if (opts.debug) {
-	  printf (statusmsg);
-	}
-	if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
-	  syslog(LOG_WARNING, 
-		 "problem sending snmp trap (sendtrap() returned %d)\n",
-		 trap_stat);
+	if(asprintf(&statusmsg, "CCISS controler %s logical volume %d changed state to %s.",
+		    ctrls_found[ctrl_cntr].devicefile,
+		    event->detail.logstatchange.logicaldrivenumber,
+		    logicaldrivestatusstr[event->detail.logstatchange.newlogicaldrivestate]) > 0) {
+	  status = event->detail.logstatchange.newlogicaldrivestate;
+	  syslog(LOG_WARNING, statusmsg);
 	  if (opts.debug) {
-	    printf("DEBUG: Problem sending snmp trap",
-		   "(sendtrap() returned %d)\n", 
+	    printf ("%s\n", statusmsg);
+	  }
+	  if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
+	    syslog(LOG_WARNING, 
+		   "problem sending snmp trap (sendtrap() returned %d)\n",
 		   trap_stat);
+	    if (opts.debug) {
+	      printf("DEBUG: Problem sending snmp trap",
+		     "(sendtrap() returned %d)\n", 
+		     trap_stat);
+	    }
+	  }
+	  free(statusmsg);
+	} else {
+	  syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	  if (opts.debug) {
+	    printf ("Cannot allocate memory for statusmsg\n");
 	  }
 	}
       }
       else {
-	snprintf(statusmsg, 2048, "CCISS controler %s reported: %s.",
-		 ctrls_found[ctrl_cntr].devicefile,
-		 event.mesgstring);
-	status = 255;
-	syslog(LOG_WARNING, statusmsg);
-	if (opts.debug) {
-	  printf (statusmsg);
-	}
-	if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
-	  syslog(LOG_WARNING, 
-		 "problem sending snmp trap (sendtrap() returned %d)\n",
-		 trap_stat);
+	if(asprintf(statusmsg, "CCISS controler %s reported: %s.",
+		    ctrls_found[ctrl_cntr].devicefile,
+		    event->mesgstring) > 0) {
+	  status = 255;
+	  syslog(LOG_WARNING, statusmsg);
 	  if (opts.debug) {
-	    printf("DEBUG: Problem sending snmp trap",
-		   "(sendtrap() returned %d)\n", 
+	    printf (statusmsg);
+	  }
+	  if (trap_stat = sendtrap(opts, "public", status, statusmsg)) {
+	    syslog(LOG_WARNING, 
+		   "problem sending snmp trap (sendtrap() returned %d)\n",
 		   trap_stat);
+	    if (opts.debug) {
+	      printf("DEBUG: Problem sending snmp trap",
+		     "(sendtrap() returned %d)\n", 
+		     trap_stat);
+	    }
+	  }
+	  free(statusmsg);
+	} else {
+	  syslog(LOG_ERR, "Cannot allocate memory for statusmsg");
+	  if (opts.debug) {
+	    printf ("Cannot allocate memory for statusmsg\n");
 	  }
 	}
       }
-      result = cciss_get_event(devicefd, 0, &event);
+      result = cciss_get_event(devicefd, 0, event);
     }
-
+    free(event);
     close (devicefd);
   }
 
   return 1;
- 
 }
 
 


Index: cpqarrayd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cpqarrayd.spec	21 Aug 2009 12:53:00 -0000	1.9
+++ cpqarrayd.spec	9 Sep 2009 17:01:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           cpqarrayd
 Version:        2.3        
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Software for monitoring HP(Compaq) arraycontrollers
 Group:          System Environment/Base
 License:        GPLv2+
@@ -8,6 +8,7 @@ URL:            http://www.strocamp.net/
 Source0:        http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz
 Patch0:         cpqarrayd-2.3.no_ida.patch
 Patch1:         cpqarrayd-2.3.sysVinit.patch
+Patch2:		cpqarrayd-2.3-message-overrun.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +30,7 @@ disabled in this package due to build is
 %setup -q
 %patch0 -p1 -b .no_ida
 %patch1 -p1 -b .sysVinit
+%patch2 -p1 -b .message-overrun
 
 %build
 autoreconf -si
@@ -70,6 +72,9 @@ fi
 %doc %_mandir/man1/cpqarrayd*
 
 %changelog
+* Wed Sep  9 2009 David Juran <david at juran.se> - 2.3-12
+- fix message overrun (Bz 516657)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3-11
 - rebuilt with new openssl
 



From cwickert at fedoraproject.org  Wed Sep  9 17:02:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:02:11 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/F-10
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE,
	1.1 xfce4-netload-plugin-0.4.0-tooltip.patch, NONE,
	1.1 xfce4-netload-plugin.spec, 1.11,
	1.12 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE
Message-ID: <20090909170211.7DD7211C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18992/F-10

Modified Files:
	xfce4-netload-plugin.spec 
Added Files:
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch 
	xfce4-netload-plugin-0.4.0-tooltip.patch 
Removed Files:
	xfce4-netload-0.4.0-asneeded.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
- Fix bar colors (#505214)


xfce4-netload-plugin-0.4.0-fix-bar-colors.patch:
 netload.c |   55 +++++++++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

--- NEW FILE xfce4-netload-plugin-0.4.0-fix-bar-colors.patch ---
Index: panel-plugin/netload.c
===================================================================
--- panel-plugin/netload.c	(revision 3275)
+++ panel-plugin/netload.c	(working copy)
@@ -257,7 +257,6 @@ static void run_update (t_global_monitor
 static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, 
                                      t_global_monitor *global)
 {
-    GtkRcStyle *rc;
     gint i;
 
     if (global->timeout_id)
@@ -316,19 +315,16 @@ static void monitor_set_orientation (Xfc
 
     for (i = 0; i < SUM; i++)
     {
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        if (!rc) 
-        {
-            rc = gtk_rc_style_new();
-        }
-        else
-        {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor->options.color[i];
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
+        
         gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
 
         gtk_box_pack_start(GTK_BOX(global->monitor->box),
@@ -413,7 +409,6 @@ static t_global_monitor * monitor_new(Xf
 /* ---------------------------------------------------------------------------------------------- */
 static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
 {
-    GtkRcStyle *rc;
     gint i;
 
     gtk_widget_hide(GTK_WIDGET(global->monitor->box));
@@ -423,27 +418,15 @@ static void setup_monitor(t_global_monit
 
     for (i = 0; i < SUM; i++)
     {
-        gtk_widget_hide(GTK_WIDGET(global->monitor->status[i]));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        } else {
-            /* to free the style safely in any case */
-            gtk_rc_style_ref(rc);
-        }
-                
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->color_flags[GTK_STATE_SELECTED] |= GTK_RC_BASE;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor->options.color[i];
-            rc->base[GTK_STATE_SELECTED] = global->monitor->options.color[i];
-            
-            gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
-            gtk_rc_style_unref(rc);
-        }
-        
-        gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
         
         /* Maximum */
         if( global->monitor->options.auto_max )

xfce4-netload-plugin-0.4.0-tooltip.patch:
 netload.c |   35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE xfce4-netload-plugin-0.4.0-tooltip.patch ---
--- ./panel-plugin/netload.c.orig	2005-10-09 12:08:01.000000000 +0300
+++ ./panel-plugin/netload.c	2009-05-23 20:50:22.000000000 +0300
@@ -30,8 +30,6 @@
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 
-static GtkTooltips *tooltips = NULL;
-
 #define BORDER 8
 
 /* Defaults */
@@ -219,7 +217,7 @@
                     "Incoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"),
                     get_name(&(global->monitor->data)), ip ? ip : _("no IP address"),
                     HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
-        gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->ebox), caption, NULL);
+        gtk_widget_set_tooltip_text(GTK_WIDGET(global->ebox), caption);
     }
 
     return TRUE;
@@ -237,6 +235,14 @@
 
     if (global->monitor->options.update_interval > 0)
     {
+#if GLIB_CHECK_VERSION( 2,14,0 )
+        if (global->monitor->options.update_interval % 1000 == 0)
+        {
+            global->timeout_id = g_timeout_add_seconds(global->monitor->
+                options.update_interval / 1000, (GtkFunction)update_monitors, global);
+        }
+	else
+#endif
         global->timeout_id =  g_timeout_add( global->monitor->options.update_interval, 
             (GtkFunction)update_monitors, global);
     }
@@ -368,11 +374,6 @@
     global->plugin = plugin;
     xfce_panel_plugin_add_action_widget (plugin, global->ebox);
 
-    if (!tooltips) 
-    {
-        tooltips = gtk_tooltips_new();
-    }
-
     global->monitor = g_new(t_monitor, 1);
     global->monitor->options.label_text = g_strdup(DEFAULT_TEXT);
     global->monitor->options.network_device = g_strdup("");
@@ -819,6 +820,10 @@
     GtkWidget        *sep1, *sep2;
     GtkBox           *update_hbox;
     GtkWidget        *update_label, *update_unit_label;
+#if GLIB_CHECK_VERSION( 2,14,0 )
+    GtkBox           *update_hint_hbox;
+    GtkWidget        *update_hint_label;
+#endif
     GtkWidget        *color_label[SUM];
     GtkWidget        *align;
     GtkBox           *color_hbox[SUM];
@@ -935,7 +940,7 @@
     gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0);
     
-    global->monitor->update_spinner = gtk_spin_button_new_with_range (0.1, 10.0, 0.05);
+    global->monitor->update_spinner = gtk_spin_button_new_with_range (1.0, 10.0, 0.25);
     gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 );
     gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner), 
             global->monitor->options.update_interval / 1000.0 );
@@ -948,6 +953,18 @@
     
     gtk_widget_show_all(GTK_WIDGET(update_hbox));
     gtk_size_group_add_widget(sg, update_label);
+
+#if GLIB_CHECK_VERSION( 2,14,0 )
+    /* Update interval hint */
+    update_hint_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
+    update_hint_label = gtk_label_new(_("Note: Whole seconds are more power-efficient"));
+    gtk_label_set_line_wrap(GTK_LABEL(update_hint_label), TRUE);
+    gtk_box_pack_start(GTK_BOX(update_hint_hbox), GTK_WIDGET(update_hint_label),
+                       FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox),
+                       GTK_WIDGET(update_hint_hbox), FALSE, FALSE, 0);
+    gtk_widget_show_all(GTK_WIDGET(update_hint_hbox));
+#endif
     
     
     sep1 = gtk_hseparator_new();


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/F-10/xfce4-netload-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xfce4-netload-plugin.spec	18 Feb 2008 23:53:52 -0000	1.11
+++ xfce4-netload-plugin.spec	9 Sep 2009 17:02:11 -0000	1.12
@@ -1,13 +1,14 @@
 Name:		xfce4-netload-plugin
 Version:	0.4.0
-Release:	7%{?dist}
+Release:	12%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-netload-0.4.0-asneeded.patch
+Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
+Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -19,7 +20,10 @@ A network-load monitor plugin for the Xf
 
 %prep
 %setup -q
-%patch0 -p1 -b .asneeded
+%patch0 -p0 -b .color
+%if 0%{?fedora} >= 11
+%patch1 -p1 -b .tooltip
+%endif
 
 %build
 %configure --disable-static
@@ -40,31 +44,46 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
+- Fix bar colors (#505214)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-10
+- Bring back tooltips in GTK 2.16 with Dimitar Zhekov's patch (#508637)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-8
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-7
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-6
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-6
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-5
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-5
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-4
 - Rebuild for Xfce 4.4.
 - Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2782)
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4 on XFCE 4.3.90.2.
 - Remove bufsize-patch for now.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.3-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6


--- xfce4-netload-0.4.0-asneeded.patch DELETED ---



From cwickert at fedoraproject.org  Wed Sep  9 17:02:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:02:11 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/F-11
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE,
	1.1 xfce4-netload-plugin.spec, 1.14,
	1.15 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE
Message-ID: <20090909170211.BB3FB11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18992/F-11

Modified Files:
	xfce4-netload-plugin.spec 
Added Files:
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch 
Removed Files:
	xfce4-netload-0.4.0-asneeded.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
- Fix bar colors (#505214)


xfce4-netload-plugin-0.4.0-fix-bar-colors.patch:
 netload.c |   55 +++++++++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

--- NEW FILE xfce4-netload-plugin-0.4.0-fix-bar-colors.patch ---
Index: panel-plugin/netload.c
===================================================================
--- panel-plugin/netload.c	(revision 3275)
+++ panel-plugin/netload.c	(working copy)
@@ -257,7 +257,6 @@ static void run_update (t_global_monitor
 static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, 
                                      t_global_monitor *global)
 {
-    GtkRcStyle *rc;
     gint i;
 
     if (global->timeout_id)
@@ -316,19 +315,16 @@ static void monitor_set_orientation (Xfc
 
     for (i = 0; i < SUM; i++)
     {
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        if (!rc) 
-        {
-            rc = gtk_rc_style_new();
-        }
-        else
-        {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor->options.color[i];
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
+        
         gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
 
         gtk_box_pack_start(GTK_BOX(global->monitor->box),
@@ -413,7 +409,6 @@ static t_global_monitor * monitor_new(Xf
 /* ---------------------------------------------------------------------------------------------- */
 static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
 {
-    GtkRcStyle *rc;
     gint i;
 
     gtk_widget_hide(GTK_WIDGET(global->monitor->box));
@@ -423,27 +418,15 @@ static void setup_monitor(t_global_monit
 
     for (i = 0; i < SUM; i++)
     {
-        gtk_widget_hide(GTK_WIDGET(global->monitor->status[i]));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        } else {
-            /* to free the style safely in any case */
-            gtk_rc_style_ref(rc);
-        }
-                
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->color_flags[GTK_STATE_SELECTED] |= GTK_RC_BASE;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor->options.color[i];
-            rc->base[GTK_STATE_SELECTED] = global->monitor->options.color[i];
-            
-            gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
-            gtk_rc_style_unref(rc);
-        }
-        
-        gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
         
         /* Maximum */
         if( global->monitor->options.auto_max )


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/F-11/xfce4-netload-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-netload-plugin.spec	29 Jun 2009 17:44:42 -0000	1.14
+++ xfce4-netload-plugin.spec	9 Sep 2009 17:02:11 -0000	1.15
@@ -1,13 +1,13 @@
 Name:		xfce4-netload-plugin
 Version:	0.4.0
-Release:	10%{?dist}
+Release:	12%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-netload-0.4.0-asneeded.patch
+Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +20,7 @@ A network-load monitor plugin for the Xf
 
 %prep
 %setup -q
-%patch0 -p1 -b .asneeded
+%patch0 -p0 -b .color
 %if 0%{?fedora} >= 11
 %patch1 -p1 -b .tooltip
 %endif
@@ -44,6 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
+- Fix bar colors (#505214)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-10
 - Bring back tooltips in GTK 2.16 with Dimitar Zhekov's patch (#508637)
 


--- xfce4-netload-0.4.0-asneeded.patch DELETED ---



From dwalsh at fedoraproject.org  Wed Sep  9 17:04:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Sep 2009 17:04:52 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.438,
	1.439 policycoreutils.spec, 1.638, 1.639
Message-ID: <20090909170452.6875F11C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19745

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-2
- Fix init script to show status in usage message


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    3 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  200 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   13 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   33 +
 semanage/seobject.py                        |   15 
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   51 +-
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  646 +++-------------------------
 28 files changed, 1840 insertions(+), 953 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -p -r1.438 -r1.439
--- policycoreutils-rhat.patch	8 Sep 2009 14:15:59 -0000	1.438
+++ policycoreutils-rhat.patch	9 Sep 2009 17:04:51 -0000	1.439
@@ -658,6 +658,20 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.73/restorecond/restorecond.init
+--- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.init	2009-09-08 19:19:57.000000000 -0400
+@@ -82,9 +82,8 @@
+ 	[ -e /var/lock/subsys/restorecond ] && restart || :
+ 	;;
+   *)
+-        echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
++        echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
+         RETVAL=3
+ esac
+ 
+ exit $RETVAL
+-
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.73/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-08 09:21:08.000000000 -0400
@@ -1962,7 +1976,7 @@ diff --exclude-from=exclude --exclude=se
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.73/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-08 18:40:14.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -2558,7 +2572,7 @@ diff --exclude-from=exclude --exclude=se
 +
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-09-08 09:03:10.000000000 -0400
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-08 19:09:27.000000000 -0400
 +++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-08 09:49:37.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
@@ -3086,7 +3100,17 @@ diff --exclude-from=exclude --exclude=se
  }
  
  int canoncon(char **contextp)
-@@ -585,77 +152,6 @@
+@@ -535,7 +102,8 @@
+ 			exit(1);
+ 		}
+ 	} else if (security_canonicalize_context_raw(context, &tmpcon) == 0) {
+-		free(context);		*contextp = tmpcon;
++		free(context);
++		*contextp = tmpcon;
+ 	} else if (errno != ENOENT) {
+ 		rc = -1;
+ 		inc_err();
+@@ -584,77 +152,6 @@
  	return 0;
  }
  
@@ -3164,7 +3188,7 @@ diff --exclude-from=exclude --exclude=se
  static int process_one_realpath(char *name)
  {
  	int rc = 0;
-@@ -668,7 +164,7 @@
+@@ -667,7 +164,7 @@
  		rc = lstat(name, &sb);
  		if (rc < 0) {
  			fprintf(stderr, "%s:  lstat(%s) failed:  %s\n",
@@ -3173,7 +3197,7 @@ diff --exclude-from=exclude --exclude=se
  			return -1;
  		}
  
-@@ -802,20 +298,30 @@
+@@ -801,20 +298,30 @@
  	char *buf = NULL;
  	size_t buf_len;
  	char *base;
@@ -3212,7 +3236,7 @@ diff --exclude-from=exclude --exclude=se
  	
  	if (!strcmp(base, SETFILES)) {
  		/* 
-@@ -830,28 +336,28 @@
+@@ -829,28 +336,28 @@
  		iamrestorecon = 0;
  		recurse = 1;
  		expand_realpath = 0;
@@ -3249,7 +3273,7 @@ diff --exclude-from=exclude --exclude=se
  		ctx_validate = 0;
  
  		/* restorecon only:  silent exit if no SELinux.
-@@ -913,37 +419,37 @@
+@@ -912,37 +419,37 @@
  			input_filename = optarg;
  			break;			
  		case 'd':
@@ -3296,7 +3320,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'R':
  		case 'r':
-@@ -956,7 +462,7 @@
+@@ -955,7 +462,7 @@
  					argv[0]);
  				exit(1);
  			}
@@ -3305,7 +3329,7 @@ diff --exclude-from=exclude --exclude=se
  				fprintf(stderr,
  					"%s: only one -r can be specified\n",
  					argv[0]);
-@@ -967,23 +473,23 @@
+@@ -966,23 +473,23 @@
  		case 's':
  			use_input_file = 1;
  			input_filename = "-";
@@ -3334,7 +3358,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'W':
  			warn_no_match = 1;
-@@ -1031,18 +537,13 @@
+@@ -1030,18 +537,13 @@
  	}
  
  	/* Load the file contexts configuration and check it. */
@@ -3356,7 +3380,7 @@ diff --exclude-from=exclude --exclude=se
  	if (use_input_file) {
  		FILE *f = stdin;
  		ssize_t len;
-@@ -1059,6 +560,9 @@
+@@ -1058,6 +560,9 @@
  		delim = (null_terminated != 0) ? '\0' : '\n';
  		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
  			buf[len - 1] = 0;
@@ -3366,7 +3390,7 @@ diff --exclude-from=exclude --exclude=se
  			errors |= process_one_realpath(buf);
  		}
  		if (strcmp(input_filename, "-") != 0)
-@@ -1068,22 +572,21 @@
+@@ -1067,22 +572,21 @@
  			errors |= process_one_realpath(argv[i]);
  		}
  	}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -p -r1.638 -r1.639
--- policycoreutils.spec	8 Sep 2009 14:16:00 -0000	1.638
+++ policycoreutils.spec	9 Sep 2009 17:04:52 -0000	1.639
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.73
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -295,6 +295,9 @@ fi
 exit 0
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-2
+- Fix init script to show status in usage message
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-1
 - Update to upstream
         * Add semanage dontaudit to turn off dontaudits from Dan Walsh.



From jforbes at fedoraproject.org  Wed Sep  9 17:16:12 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Wed,  9 Sep 2009 17:16:12 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch, NONE,
	1.1 kernel.spec, 1.1782, 1.1783
Message-ID: <20090909171612.35AA711C00CE@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22658

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch 
Log Message:
Revert virio_blk to rotational mode. (#509383)

linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch:
 virtio_blk.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch ---
Subject: [for-2.6.31] virtio_blk: revert QUEUE_FLAG_VIRT addition
Date: Fri, 04 Sep 2009 20:44:42 -0000
From: Christoph Hellwig <hch at lst.de>

It seems like the addition of QUEUE_FLAG_VIRT caueses major performance
regressions for Fedora users:

	https://bugzilla.redhat.com/show_bug.cgi?id=509383
	https://bugzilla.redhat.com/show_bug.cgi?id=505695

while I can't reproduce those extreme regressions myself I think the flag
is wrong.

Rationale:

  QUEUE_FLAG_VIRT expands to QUEUE_FLAG_NONROT which casus the queue
  unplugged immediately.  This is not a good behaviour for at least
  qemu and kvm where we do have significant overhead for every
  I/O operations.  Even with all the latested speeups (native AIO,
  MSI support, zero copy) we can only get native speed for up to 128kb
  I/O requests we already are down to 66% of native performance for 4kb
  requests even on my laptop running the Intel X25-M SSD for which the
  QUEUE_FLAG_NONROT was designed.
  If we ever get virtio-blk overhead low enough that this flag makes
  sense it should only be set based on a feature flag set by the host.
	
Signed-off-by: Christoph Hellwig <hch at lst.de>
Acked-by: Jeff Moyer <jmoyer at redhat.com>

---
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Index: linux-2.6/drivers/block/virtio_blk.c
===================================================================
--- linux-2.6.orig/drivers/block/virtio_blk.c	2009-09-04 17:33:48.802523987 -0300
+++ linux-2.6/drivers/block/virtio_blk.c	2009-09-04 17:33:56.186522158 -0300
@@ -314,7 +314,6 @@ static int __devinit virtblk_probe(struc
 	}
 
 	vblk->disk->queue->queuedata = vblk;
-	queue_flag_set_unlocked(QUEUE_FLAG_VIRT, vblk->disk->queue);
 
 	if (index < 26) {
 		sprintf(vblk->disk->disk_name, "vd%c", 'a' + index % 26);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1782
retrieving revision 1.1783
diff -u -p -r1.1782 -r1.1783
--- kernel.spec	9 Sep 2009 09:42:58 -0000	1.1782
+++ kernel.spec	9 Sep 2009 17:16:11 -0000	1.1783
@@ -685,6 +685,7 @@ Patch1575: linux-2.6-kvm-vmx-check-cpl-b
 Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
 Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
+Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next.patch
@@ -1315,6 +1316,7 @@ ApplyPatch linux-2.6-kvm-vmx-check-cpl-b
 ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
 ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 ApplyPatch linux-2.6-xen-stack-protector-fix.patch
+ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -2025,6 +2027,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Justin M. Forbes <jforbes at redhat.com>
+- Revert virio_blk to rotational mode. (#509383)
+
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
 - uggh lost nouveau bits in page flip
 



From wtogami at fedoraproject.org  Wed Sep  9 17:17:22 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  9 Sep 2009 17:17:22 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/devel .cvsignore, 1.6, 1.7 perl-Mail-DKIM.spec, 
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090909171722.B480711C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23002

Modified Files:
	.cvsignore perl-Mail-DKIM.spec sources 
Log Message:
0.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Sep 2009 22:31:19 -0000	1.6
+++ .cvsignore	9 Sep 2009 17:17:22 -0000	1.7
@@ -1 +1 @@
-Mail-DKIM-0.36_6.tar.gz
+Mail-DKIM-0.37.tar.gz


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/perl-Mail-DKIM.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Mail-DKIM.spec	3 Sep 2009 22:31:19 -0000	1.10
+++ perl-Mail-DKIM.spec	9 Sep 2009 17:17:22 -0000	1.11
@@ -1,14 +1,12 @@
 Name:           perl-Mail-DKIM
-Version:        0.36
-Release:        4%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://dkimproxy.sourceforge.net/
-# FIXME: Undo this when upstream returns to normal version numbers
-#Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
-Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}_6.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,8 +24,7 @@ It is required if you wish to enable DKI
 Mail::SpamAssassin::Plugin::DKIM plugin.
 
 %prep
-# FIXME: Here too
-%setup -q -n Mail-DKIM-%{version}_6
+%setup -q -n Mail-DKIM-%{version}
 # Make the example scripts non-executable
 %{__chmod} -x scripts/*.pl
 
@@ -62,11 +59,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Sep 3 2009 Warren Togami <wtogami at redhat.com> - 0.36-4
-- 0.36_6
-
-* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-3
-- 0.36_5 ... why does upstream use strange version numbers?
+* Wed Sep 9 2009 Warren Togami <wtogami at redhat.com> - 0.37-1
+- 0.37
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Sep 2009 22:31:19 -0000	1.6
+++ sources	9 Sep 2009 17:17:22 -0000	1.7
@@ -1 +1 @@
-7f9b20007dbfba239e9d037506ad8622  Mail-DKIM-0.36_6.tar.gz
+f3e84ec6b5e42d4cbcc7c42ea2900649  Mail-DKIM-0.37.tar.gz



From ruben at fedoraproject.org  Wed Sep  9 17:19:02 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed,  9 Sep 2009 17:19:02 +0000 (UTC)
Subject: rpms/python-foolscap/F-11 python-foolscap.spec,1.1,1.2
Message-ID: <20090909171902.32EFB11C00CE@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23573

Modified Files:
	python-foolscap.spec 
Log Message:
* Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-2
- Add requirement on pyOpenSSL



Index: python-foolscap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/F-11/python-foolscap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-foolscap.spec	9 Sep 2009 15:10:20 -0000	1.1
+++ python-foolscap.spec	9 Sep 2009 17:19:01 -0000	1.2
@@ -14,8 +14,8 @@ Source0:        http://foolscap.lothar.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python, python-devel, python-twisted-web
-Requires:       python-twisted-web
+BuildRequires:  python, python-devel, python-twisted-web, python-setuptools, pyOpenSSL
+Requires:       python-twisted-web, pyOpenSSL
 
 %description
 Foolscap (aka newpb) is a new version of Twisted's native RPC protocol, known
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_bindir}/flappserver
 
 %changelog
+* Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-2
+- Add requirement on pyOpenSSL
+
 * Mon Sep 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-1
 - Upstream released new version
 



From cwickert at fedoraproject.org  Wed Sep  9 17:20:16 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:20:16 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/F-10 xfce4-netload-plugin.spec,1.12,1.13
Message-ID: <20090909172016.E166311C043A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23940/F-10

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
add comment on patch


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/F-10/xfce4-netload-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-netload-plugin.spec	9 Sep 2009 17:02:11 -0000	1.12
+++ xfce4-netload-plugin.spec	9 Sep 2009 17:20:16 -0000	1.13
@@ -7,6 +7,7 @@ Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+ # from upstream's svn rev 3275
 Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From cwickert at fedoraproject.org  Wed Sep  9 17:20:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:20:17 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/F-11 xfce4-netload-plugin.spec,1.15,1.16
Message-ID: <20090909172017.2D78911C043A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23940/F-11

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
add comment on patch


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/F-11/xfce4-netload-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xfce4-netload-plugin.spec	9 Sep 2009 17:02:11 -0000	1.15
+++ xfce4-netload-plugin.spec	9 Sep 2009 17:20:16 -0000	1.16
@@ -7,6 +7,7 @@ Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+ # from upstream's svn rev 3275
 Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From cwickert at fedoraproject.org  Wed Sep  9 17:20:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:20:17 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec, 1.17,
	1.18
Message-ID: <20090909172017.5D66C11C043A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23940/devel

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
add comment on patch


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-netload-plugin.spec	9 Sep 2009 16:42:11 -0000	1.17
+++ xfce4-netload-plugin.spec	9 Sep 2009 17:20:17 -0000	1.18
@@ -7,6 +7,7 @@ Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+ # from upstream's svn rev 3275
 Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From ruben at fedoraproject.org  Wed Sep  9 17:29:40 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed,  9 Sep 2009 17:29:40 +0000 (UTC)
Subject: rpms/python-foolscap/F-11 python-foolscap.spec,1.2,1.3
Message-ID: <20090909172940.D466F11C00CE@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26513

Modified Files:
	python-foolscap.spec 
Log Message:
* Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com 0.4.2-3
- Force rebuild



Index: python-foolscap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/F-11/python-foolscap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-foolscap.spec	9 Sep 2009 17:19:01 -0000	1.2
+++ python-foolscap.spec	9 Sep 2009 17:29:40 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           python-%{modulename}
 Version:        0.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Next-generation RPC protocol, intended to replace Perspective Broker
 
 Group:          Development/Languages
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_bindir}/flappserver
 
 %changelog
+* Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com 0.4.2-3
+- Force rebuild
+
 * Wed Sep 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.2-2
 - Add requirement on pyOpenSSL
 



From wtogami at fedoraproject.org  Wed Sep  9 17:30:07 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  9 Sep 2009 17:30:07 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/EL-5 .cvsignore, 1.6, 1.7 perl-Mail-DKIM.spec, 
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090909173007.04CC111C043D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27105

Modified Files:
	.cvsignore perl-Mail-DKIM.spec sources 
Log Message:
0.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Sep 2009 22:31:19 -0000	1.6
+++ .cvsignore	9 Sep 2009 17:30:06 -0000	1.7
@@ -1 +1 @@
-Mail-DKIM-0.36_6.tar.gz
+Mail-DKIM-0.37.tar.gz


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/EL-5/perl-Mail-DKIM.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Mail-DKIM.spec	3 Sep 2009 22:31:19 -0000	1.10
+++ perl-Mail-DKIM.spec	9 Sep 2009 17:30:06 -0000	1.11
@@ -1,14 +1,12 @@
 Name:           perl-Mail-DKIM
-Version:        0.36
-Release:        4%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://dkimproxy.sourceforge.net/
-# FIXME: Undo this when upstream returns to normal version numbers
-#Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
-Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}_6.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JA/JASLONG/Mail-DKIM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,8 +24,7 @@ It is required if you wish to enable DKI
 Mail::SpamAssassin::Plugin::DKIM plugin.
 
 %prep
-# FIXME: Here too
-%setup -q -n Mail-DKIM-%{version}_6
+%setup -q -n Mail-DKIM-%{version}
 # Make the example scripts non-executable
 %{__chmod} -x scripts/*.pl
 
@@ -62,11 +59,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Sep 3 2009 Warren Togami <wtogami at redhat.com> - 0.36-4
-- 0.36_6
-
-* Wed Sep 2 2009 Warren Togami <wtogami at redhat.com> - 0.36-3
-- 0.36_5 ... why does upstream use strange version numbers?
+* Wed Sep 9 2009 Warren Togami <wtogami at redhat.com> - 0.37-1
+- 0.37
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Sep 2009 22:31:19 -0000	1.6
+++ sources	9 Sep 2009 17:30:06 -0000	1.7
@@ -1 +1 @@
-7f9b20007dbfba239e9d037506ad8622  Mail-DKIM-0.36_6.tar.gz
+f3e84ec6b5e42d4cbcc7c42ea2900649  Mail-DKIM-0.37.tar.gz



From avesh at fedoraproject.org  Wed Sep  9 17:41:07 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Wed,  9 Sep 2009 17:41:07 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6-initscript-correction.patch, NONE, 
	1.1 openswan-2.6-selinux.patch, 1.2, 1.3 .cvsignore, 1.27,
	1.28 openswan.spec, 1.81, 1.82 sources, 1.26,
	1.27 openswan-2.6.16-examples.patch, 1.1,
	NONE openswan-2.6.16-initscript-correction.patch, 1.1,
	NONE openswan-2.6.22-nss.patch, 1.1,
	NONE openswan-2.6.22-selinux.patch, 1.1, NONE
Message-ID: <20090909174107.8274C11C00CE@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31222

Modified Files:
	.cvsignore openswan.spec sources 
Added Files:
	openswan-2.6-initscript-correction.patch 
	openswan-2.6-selinux.patch 
Removed Files:
	openswan-2.6.16-examples.patch 
	openswan-2.6.16-initscript-correction.patch 
	openswan-2.6.22-nss.patch openswan-2.6.22-selinux.patch 
Log Message:
* Wed Sep 09 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.23-1
- New upstream release
- Supports smartcards now
- Supports PSK with NSS
- Supports libcap-ng for lowering capabilities of pluto process 
- Updated README.nss


openswan-2.6-initscript-correction.patch:
 setup.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openswan-2.6-initscript-correction.patch ---
--- openswan-2.6.23.orig/programs/setup/setup.in	2009-09-08 20:42:54.000000000 -0400
+++ openswan-2.6.23/programs/setup/setup.in	2009-09-09 12:33:29.279527959 -0400
@@ -39,7 +39,7 @@
 # times of NFS filesystem startup/shutdown).  Startup is after startup of
 # syslog and pcmcia support; shutdown is just before shutdown of syslog.
 #
-# chkconfig: 2345 47 76
+# chkconfig: - 47 76
 # description: IPsec provides encrypted and authenticated communications; \
 # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
 

openswan-2.6-selinux.patch:
 verify.in |   13 -------------
 1 file changed, 13 deletions(-)

Index: openswan-2.6-selinux.patch
===================================================================
RCS file: openswan-2.6-selinux.patch
diff -N openswan-2.6-selinux.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openswan-2.6-selinux.patch	9 Sep 2009 17:41:06 -0000	1.3
@@ -0,0 +1,23 @@
+diff -urNp openswan-2.6.23.orig/programs/verify/verify.in openswan-2.6.23/programs/verify/verify.in
+--- openswan-2.6.23.orig/programs/verify/verify.in	2009-09-08 20:42:54.000000000 -0400
++++ openswan-2.6.23/programs/verify/verify.in	2009-09-09 12:22:10.392305880 -0400
+@@ -276,19 +276,6 @@ sub installstartcheck {
+ 	   } else { warnchk "","UNKNOWN"; }
+ 	}
+ 
+-        if ( -e "/selinux/enforce") {
+-        printfun "Testing against enforced SElinux mode";
+-        open("cat", "/selinux/enforce");
+-        if(<cat> == "1")
+-            {
+-                errchk "";
+-                print "\n  SElinux is running in 'enforced' mode. Since no working SElinux\n  policies exist for Openswan, SElinux should be disabled.\n";
+-		print "\n  echo \"0\" > /selinux/enforce (or edit /etc/sysconfig/selinux)\n\n";
+-	        $reterr = 1;
+-            }
+-        else { errchk "1"; }
+-        }
+-
+         if ( -c "/dev/hw_random" || -c "/dev/hwrng" ) {
+         printfun "Hardware RNG detected, testing if used properly";
+         run "pidof rngd";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	23 Jul 2009 22:01:57 -0000	1.27
+++ .cvsignore	9 Sep 2009 17:41:06 -0000	1.28
@@ -11,3 +11,4 @@ openswan-2.6.18.tar.gz
 openswan-2.6.19.tar.gz
 openswan-2.6.21.tar.gz
 openswan-2.6.22.tar.gz
+openswan-2.6.23.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- openswan.spec	25 Jul 2009 20:54:45 -0000	1.81
+++ openswan.spec	9 Sep 2009 17:41:07 -0000	1.82
@@ -1,25 +1,24 @@
 %define USE_LIBNSS 1
 %define USE_FIPSCHECK 1
+%define USE_LIBCAP_NG 1
 %define nss_version 3.12.3-2
 %define fipscheck_version 1.2.0-1
 
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.22
+Version: 2.6.23
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
 
 Source2: ipsec.conf
 
-Patch1: openswan-2.6.16-examples.patch
-Patch2: openswan-2.6-relpath.patch
-Patch3: openswan-2.6.22-selinux.patch
-Patch4: openswan-2.6.16-initscript-correction.patch
-Patch5: openswan-2.6.22-gcc44.patch
-Patch6: openswan-2.6.22-nss.patch
+Patch1: openswan-2.6-relpath.patch
+Patch2: openswan-2.6-selinux.patch
+Patch3: openswan-2.6-initscript-correction.patch
+Patch4: openswan-2.6.22-gcc44.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +36,10 @@ Requires(preun): /sbin/service
 BuildRequires: fipscheck-devel >= %{fipscheck_version}
 %endif
 
+%if %{USE_LIBCAP_NG}
+BuildRequires: libcap-ng-devel
+%endif
+
 Provides: ipsec-userland = %{version}-%{release}
 #unless kernel with NETKEY supplies this capability we cannot do this
 #Requires: ipsec-kernel
@@ -70,12 +73,10 @@ system.
 find doc/examples -type f -print0 | xargs -0 chmod a-x
 find doc -name .gitignore -print0 | xargs -0 rm -v
 
-%patch1 -p1 
-%patch2 -p1 -b .relpath
-%patch3 -p1 -b .selinux
+%patch1 -p1 -b .relpath
+%patch2 -p1 -b .selinux
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 
@@ -94,6 +95,9 @@ find doc -name .gitignore -print0 | xarg
 %if %{USE_FIPSCHECK}
   USE_FIPSCHECK=true \
 %endif
+%if %{USE_LIBCAP_NG}
+  USE_LIBCAP_NG=true \
+%endif
   programs
 FS=$(pwd)
 
@@ -188,7 +192,8 @@ rm -rf %{buildroot}
 %files doc
 %defattr(-,root,root)
 %doc doc/README.* doc/CHANGES.* doc/CREDITS.* doc/2.6.known-issues
-%doc doc/examples doc/std doc/quickstarts doc/example-configs
+%doc doc/examples doc/std doc/quickstarts
+#%doc doc/examples doc/std doc/quickstarts doc/example-configs
 
 %files 
 %defattr(-,root,root)
@@ -222,6 +227,13 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Wed Sep 09 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.23-1
+- New upstream release
+- Supports smartcards now
+- Supports PSK with NSS
+- Supports libcap-ng for lowering capabilities of pluto process 
+- Updated README.nss
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	23 Jul 2009 22:01:58 -0000	1.26
+++ sources	9 Sep 2009 17:41:07 -0000	1.27
@@ -1 +1 @@
-9a30009bade8a1b09fba27680c87cf72  openswan-2.6.22.tar.gz
+c83053471e639bf3b97e3cf7796b7e83  openswan-2.6.23.tar.gz


--- openswan-2.6.16-examples.patch DELETED ---


--- openswan-2.6.16-initscript-correction.patch DELETED ---


--- openswan-2.6.22-nss.patch DELETED ---


--- openswan-2.6.22-selinux.patch DELETED ---



From cwickert at fedoraproject.org  Wed Sep  9 17:43:53 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:43:53 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch,
	NONE, 1.1 xfce4-power-manager.spec, 1.17, 1.18
Message-ID: <20090909174353.C82F911C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31872/devel

Modified Files:
	xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
- Fix segfault in xfpm_session_set_client_id


xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch:
 xfpm-main.c    |    2 ++
 xfpm-session.c |   15 ++++++++++++---
 xfpm-session.h |    3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

--- NEW FILE xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch ---
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 9a20d45..3004567 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -82,6 +82,8 @@ xfpm_start (DBusGConnection *bus)
     
     if ( client_id != NULL )
 	xfpm_session_set_client_id (session, client_id);
+	
+    xfpm_session_real_init (session);
     
     manager = xfpm_manager_new (bus);
     
diff --git a/src/xfpm-session.c b/src/xfpm-session.c
index 38ede11..1daed15 100644
--- a/src/xfpm-session.c
+++ b/src/xfpm-session.c
@@ -59,6 +59,7 @@ struct XfpmSessionPrivate
 {
     SessionClient *client;
     gboolean       managed;
+    gboolean	   initted;
 };
 
 enum
@@ -117,6 +118,7 @@ xfpm_session_init (XfpmSession *session)
     
     session->priv->client = NULL;
     session->priv->managed = FALSE;
+    session->priv->initted = FALSE;
     
     restart_command    = g_new (gchar *, 3);
     restart_command[0] = g_strdup ("xfce4-power-manager");
@@ -140,7 +142,6 @@ xfpm_session_init (XfpmSession *session)
 	return;
     }
     
-    session->priv->managed 	   = session_init (session->priv->client);
     session->priv->client->die     = xfpm_session_die;
 }
 
@@ -219,13 +220,21 @@ xfpm_session_new (void)
     return XFPM_SESSION (xfpm_session_object);
 }
 
+void xfpm_session_real_init (XfpmSession *session)
+{
+    session->priv->managed = session_init (session->priv->client);
+    session->priv->initted = TRUE;
+}
+
 void xfpm_session_set_client_id (XfpmSession *session, const gchar *client_id)
 {
     g_return_if_fail (XFPM_IS_SESSION (session));
+    g_return_if_fail (session->priv->initted == FALSE);
     
-    if ( G_UNLIKELY (session->priv->client == NULL) )
+    if ( G_UNLIKELY (session->priv->client == NULL || session->priv->managed == FALSE) )
 	return;
     
+    TRACE ("Setting client id : %s\n", client_id);
     client_session_set_client_id (session->priv->client, client_id);
 }
 
@@ -233,7 +242,7 @@ void xfpm_session_quit (XfpmSession *session)
 {
     g_return_if_fail (XFPM_IS_SESSION (session));
     
-    if ( !session->priv->managed)
+    if ( G_UNLIKELY (session->priv->client == NULL || session->priv->managed == FALSE) )
 	return;
     
     client_session_set_restart_style (session->priv->client, SESSION_RESTART_NEVER);
diff --git a/src/xfpm-session.h b/src/xfpm-session.h
index 133d705..e40b13a 100644
--- a/src/xfpm-session.h
+++ b/src/xfpm-session.h
@@ -47,8 +47,11 @@ typedef struct
 } XfpmSessionClass;
 
 GType  		      		 xfpm_session_get_type        (void) G_GNUC_CONST;
+
 XfpmSession       		*xfpm_session_new             (void);
 
+void				 xfpm_session_real_init	      (XfpmSession *session);
+
 void			         xfpm_session_set_client_id   (XfpmSession *session,
 							       const gchar *client_id);
 							    


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-power-manager.spec	9 Aug 2009 16:07:55 -0000	1.17
+++ xfce4-power-manager.spec	9 Sep 2009 17:43:53 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           xfce4-power-manager
 Version:        0.8.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-0.8.2-dpmsconst.patch
+# from upstream's git rev 3004567
+Patch1:         %{name}-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -30,6 +32,7 @@ preferences.
 
 %prep
 %setup -q
+%patch1 -p1 -b .segfault
 %if 0%{?fedora} >= 12
 %patch0 -b .dpmsstr
 %endif
@@ -84,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
+- Fix segfault in xfpm_session_set_client_id
+
 * Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-1
 - Update to 0.8.3.1
 



From cwickert at fedoraproject.org  Wed Sep  9 17:43:54 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 17:43:54 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch,
	NONE, 1.1 xfce4-power-manager.spec, 1.12, 1.13
Message-ID: <20090909174354.0368511C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31872/F-11

Modified Files:
	xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
- Fix segfault in xfpm_session_set_client_id


xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch:
 xfpm-main.c    |    2 ++
 xfpm-session.c |   15 ++++++++++++---
 xfpm-session.h |    3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

--- NEW FILE xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch ---
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 9a20d45..3004567 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -82,6 +82,8 @@ xfpm_start (DBusGConnection *bus)
     
     if ( client_id != NULL )
 	xfpm_session_set_client_id (session, client_id);
+	
+    xfpm_session_real_init (session);
     
     manager = xfpm_manager_new (bus);
     
diff --git a/src/xfpm-session.c b/src/xfpm-session.c
index 38ede11..1daed15 100644
--- a/src/xfpm-session.c
+++ b/src/xfpm-session.c
@@ -59,6 +59,7 @@ struct XfpmSessionPrivate
 {
     SessionClient *client;
     gboolean       managed;
+    gboolean	   initted;
 };
 
 enum
@@ -117,6 +118,7 @@ xfpm_session_init (XfpmSession *session)
     
     session->priv->client = NULL;
     session->priv->managed = FALSE;
+    session->priv->initted = FALSE;
     
     restart_command    = g_new (gchar *, 3);
     restart_command[0] = g_strdup ("xfce4-power-manager");
@@ -140,7 +142,6 @@ xfpm_session_init (XfpmSession *session)
 	return;
     }
     
-    session->priv->managed 	   = session_init (session->priv->client);
     session->priv->client->die     = xfpm_session_die;
 }
 
@@ -219,13 +220,21 @@ xfpm_session_new (void)
     return XFPM_SESSION (xfpm_session_object);
 }
 
+void xfpm_session_real_init (XfpmSession *session)
+{
+    session->priv->managed = session_init (session->priv->client);
+    session->priv->initted = TRUE;
+}
+
 void xfpm_session_set_client_id (XfpmSession *session, const gchar *client_id)
 {
     g_return_if_fail (XFPM_IS_SESSION (session));
+    g_return_if_fail (session->priv->initted == FALSE);
     
-    if ( G_UNLIKELY (session->priv->client == NULL) )
+    if ( G_UNLIKELY (session->priv->client == NULL || session->priv->managed == FALSE) )
 	return;
     
+    TRACE ("Setting client id : %s\n", client_id);
     client_session_set_client_id (session->priv->client, client_id);
 }
 
@@ -233,7 +242,7 @@ void xfpm_session_quit (XfpmSession *session)
 {
     g_return_if_fail (XFPM_IS_SESSION (session));
     
-    if ( !session->priv->managed)
+    if ( G_UNLIKELY (session->priv->client == NULL || session->priv->managed == FALSE) )
 	return;
     
     client_session_set_restart_style (session->priv->client, SESSION_RESTART_NEVER);
diff --git a/src/xfpm-session.h b/src/xfpm-session.h
index 133d705..e40b13a 100644
--- a/src/xfpm-session.h
+++ b/src/xfpm-session.h
@@ -47,8 +47,11 @@ typedef struct
 } XfpmSessionClass;
 
 GType  		      		 xfpm_session_get_type        (void) G_GNUC_CONST;
+
 XfpmSession       		*xfpm_session_new             (void);
 
+void				 xfpm_session_real_init	      (XfpmSession *session);
+
 void			         xfpm_session_set_client_id   (XfpmSession *session,
 							       const gchar *client_id);
 							    


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-power-manager.spec	9 Aug 2009 16:22:00 -0000	1.12
+++ xfce4-power-manager.spec	9 Sep 2009 17:43:53 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           xfce4-power-manager
 Version:        0.8.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-0.8.2-dpmsconst.patch
+# from upstream's git rev 3004567
+Patch1:         %{name}-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -30,6 +32,7 @@ preferences.
 
 %prep
 %setup -q
+%patch1 -p1 -b .segfault
 %if 0%{?fedora} >= 12
 %patch0 -b .dpmsstr
 %endif
@@ -84,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
+- Fix segfault in xfpm_session_set_client_id
+
 * Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-1
 - Update to 0.8.3.1
 



From rrakus at fedoraproject.org  Wed Sep  9 17:45:06 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed,  9 Sep 2009 17:45:06 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot.spec,1.66,1.67
Message-ID: <20090909174506.2796F11C00CE@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32345

Modified Files:
	yaboot.spec 
Log Message:
Fixed check for RHEL6


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- yaboot.spec	9 Sep 2009 15:55:37 -0000	1.66
+++ yaboot.spec	9 Sep 2009 17:45:06 -0000	1.67
@@ -42,7 +42,7 @@ ExclusiveArch: ppc
 
 # hfsutils will not be in RHEL6.
 # hfsutils is needed only for non-IBM ppc machines
-%if ! 0%{?rhel} < 6
+%if ! 0%{?rhel} >= 6
 Requires: hfsutils
 %endif
 BuildRequires: e2fsprogs-devel



From notting at fedoraproject.org  Wed Sep  9 17:48:29 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Sep 2009 17:48:29 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-python-error.patch, NONE,
	1.1 deltarpm.spec, 1.26, 1.27
Message-ID: <20090909174829.1E9B511C00CE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv751

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-python-error.patch 
Log Message:
Fix rawhide deltarpm error (theoretically)


deltarpm-python-error.patch:
 deltarpmmodule.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE deltarpm-python-error.patch ---
diff -up deltarpm-git-20090831.1/deltarpmmodule.c.foo deltarpm-git-20090831.1/deltarpmmodule.c
--- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-09-09 13:28:37.000000000 -0400
+++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 13:29:07.000000000 -0400
@@ -66,13 +66,17 @@ static PyObject *doRead(PyObject *s, PyO
   int pid;
   int ipcpipe[2];
   
-  if (!PyArg_ParseTuple(args, "s", &filename))
+  if (!PyArg_ParseTuple(args, "s", &filename)) {
+    PyErr_SetFromErrno(PyExc_SystemError);
     return NULL;
+  }
 
   /* The delta rpm code does not expect to be used in its way. Its error handling
    * conststs of 'printf' and 'exit'. So, dirty hacks abound. */
-  if (pipe2(ipcpipe, O_NONBLOCK) == -1)
+  if (pipe2(ipcpipe, O_NONBLOCK) == -1) {
+    PyErr_SetFromErrno(PyExc_SystemError);
     return NULL;
+  }
 
   if ((pid = fork())) {
     FILE *readend = fdopen(ipcpipe[0], "r");


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- deltarpm.spec	31 Aug 2009 14:26:03 -0000	1.26
+++ deltarpm.spec	9 Sep 2009 17:48:28 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1%{?dist}
+Release: 0.git.20090831.1.1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -13,6 +13,7 @@ URL: http://gitorious.org/deltarpm/delta
 # git archive --format=tar --prefix="deltarpm-git-20090831.1/" a3c6998 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
 Source: %{name}-git-20090831.1.tar.bz2
+Patch: deltarpm-python-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
@@ -50,6 +51,7 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090831.1
+%patch -p1
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -96,6 +98,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.1
+- fix python bindings
+
 * Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1
 - Add python bindings sub-package
 - Fix build error



From limb at fedoraproject.org  Wed Sep  9 17:51:25 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  9 Sep 2009 17:51:25 +0000 (UTC)
Subject: rpms/squidGuard/devel squidGuard.spec,1.19,1.20
Message-ID: <20090909175125.E59D011C00CE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1696

Modified Files:
	squidGuard.spec 
Log Message:
Include babel files, BZ 522038



Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- squidGuard.spec	27 Jul 2009 04:45:39 -0000	1.19
+++ squidGuard.spec	9 Sep 2009 17:51:25 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -130,6 +130,8 @@ popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
+%{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -182,10 +184,14 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
+- Include babel files, BZ 522038.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Wed Sep  9 17:57:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Sep 2009 17:57:13 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.103,
	1.104 libsemanage-rhat.patch, 
	1.55, 1.56 libsemanage.spec, 1.183, 1.184 sources, 1.106, 1.107
Message-ID: <20090909175713.54C1511C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4538

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Wed Sep 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.37-1
- Update to upstream
  	* Fix persistent dontaudit support to rebuild policy if the 
        dontaudit state is changed from Chad Sellers.
- Move load_policy to /sbin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	28 Aug 2009 18:03:05 -0000	1.103
+++ .cvsignore	9 Sep 2009 17:57:12 -0000	1.104
@@ -109,3 +109,4 @@ libsemanage-2.0.32.tgz
 libsemanage-2.0.33.tgz
 libsemanage-2.0.35.tgz
 libsemanage-2.0.36.tgz
+libsemanage-2.0.37.tgz

libsemanage-rhat.patch:
 include/semanage/modules.h |    5 +
 src/conf-parse.y           |    2 
 src/direct_api.c           |  119 +++++++++++++++++++++++++++++++++++++++++++--
 src/genhomedircon.c        |   15 +++++
 src/libsemanage.map        |    3 +
 src/module_internal.h      |    1 
 src/modules.c              |   41 +++++++++++++++
 src/modules.h              |    1 
 src/policy.h               |    6 ++
 src/semanage.conf          |    2 
 src/semanage_store.c       |   60 ++++++++++++++++++----
 src/semanage_store.h       |    2 
 12 files changed, 240 insertions(+), 17 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libsemanage-rhat.patch	28 Aug 2009 18:03:05 -0000	1.55
+++ libsemanage-rhat.patch	9 Sep 2009 17:57:12 -0000	1.56
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.36/include/semanage/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.37/include/semanage/modules.h
 --- nsalibsemanage/include/semanage/modules.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.36/include/semanage/modules.h	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/include/semanage/modules.h	2009-09-09 13:55:07.000000000 -0400
 @@ -40,10 +40,12 @@
  				 char *module_data, size_t data_len);
  int semanage_module_install_base_file(semanage_handle_t *,
@@ -22,9 +22,21 @@ diff --exclude-from=exclude -N -u -r nsa
 +int semanage_module_get_enabled(semanage_module_info_t *);
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.36/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2009-08-26 15:06:22.000000000 -0400
-+++ libsemanage-2.0.36/src/direct_api.c	2009-08-28 14:00:55.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-2.0.37/src/conf-parse.y
+--- nsalibsemanage/src/conf-parse.y	2009-08-05 15:10:56.000000000 -0400
++++ libsemanage-2.0.37/src/conf-parse.y	2009-09-09 13:55:50.000000000 -0400
+@@ -263,7 +263,7 @@
+ 	     calloc(1, sizeof(*(current_conf->load_policy)))) == NULL) {
+ 		return -1;
+ 	}
+-	if ((conf->load_policy->path = strdup("/usr/sbin/load_policy")) == NULL) {
++	if ((conf->load_policy->path = strdup("/sbin/load_policy")) == NULL) {
+ 		return -1;
+ 	}
+ 	conf->load_policy->args = NULL;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.37/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2009-09-08 09:03:10.000000000 -0400
++++ libsemanage-2.0.37/src/direct_api.c	2009-09-09 13:55:07.000000000 -0400
 @@ -66,6 +66,8 @@
  static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
  					size_t data_len);
@@ -62,7 +74,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	return 0;
  }
  
-@@ -1272,6 +1283,107 @@
+@@ -1277,6 +1288,107 @@
  	return retval;
  }
  
@@ -170,7 +182,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /* Removes a module from the sandbox.  Returns 0 on success, -1 if out
   * of memory, -2 if module not found or could not be removed. */
  static int semanage_direct_remove(semanage_handle_t * sh, char *module_name)
-@@ -1292,8 +1404,7 @@
+@@ -1297,8 +1409,7 @@
  			goto cleanup;
  		}
  		base++;
@@ -180,7 +192,7 @@ diff --exclude-from=exclude -N -u -r nsa
  			if (unlink(module_filenames[i]) == -1) {
  				ERR(sh, "Could not remove module file %s.",
  				    module_filenames[i]);
-@@ -1368,6 +1479,7 @@
+@@ -1373,6 +1484,7 @@
  		}
  		ssize_t size;
  		char *data = NULL;
@@ -188,7 +200,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  		if ((size = bunzip(sh, fp, &data)) > 0) {
  			fclose(fp);
-@@ -1392,6 +1504,7 @@
+@@ -1397,6 +1509,7 @@
  		if (type == SEPOL_POLICY_MOD) {
  			(*modinfo)[*num_modules].name = name;
  			(*modinfo)[*num_modules].version = version;
@@ -196,9 +208,9 @@ diff --exclude-from=exclude -N -u -r nsa
  			(*num_modules)++;
  		} else {
  			/* file was not a module, so don't report it */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.36/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.37/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.36/src/genhomedircon.c	2009-08-26 15:07:35.000000000 -0400
++++ libsemanage-2.0.37/src/genhomedircon.c	2009-09-09 13:55:07.000000000 -0400
 @@ -304,10 +304,20 @@
  			continue;
  		if (!semanage_list_find(shells, pwbuf->pw_shell))
@@ -232,9 +244,9 @@ diff --exclude-from=exclude -N -u -r nsa
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.36/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.37/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.36/src/libsemanage.map	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/libsemanage.map	2009-09-09 13:55:07.000000000 -0400
 @@ -6,10 +6,13 @@
  	  semanage_module_install; semanage_module_install_file;
  	  semanage_module_upgrade; semanage_module_upgrade_file;
@@ -249,9 +261,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	  semanage_reload_policy; semanage_set_reload; semanage_set_rebuild;
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.36/src/module_internal.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.37/src/module_internal.h
 --- nsalibsemanage/src/module_internal.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.36/src/module_internal.h	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/module_internal.h	2009-09-09 13:55:07.000000000 -0400
 @@ -6,6 +6,7 @@
  
  hidden_proto(semanage_module_get_name)
@@ -260,9 +272,9 @@ diff --exclude-from=exclude -N -u -r nsa
      hidden_proto(semanage_module_info_datum_destroy)
      hidden_proto(semanage_module_list_nth)
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.36/src/modules.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.37/src/modules.c
 --- nsalibsemanage/src/modules.c	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.36/src/modules.c	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/modules.c	2009-09-09 13:55:07.000000000 -0400
 @@ -147,6 +147,40 @@
  	return sh->funcs->install_base_file(sh, module_name);
  }
@@ -318,9 +330,9 @@ diff --exclude-from=exclude -N -u -r nsa
  const char *semanage_module_get_version(semanage_module_info_t * modinfo)
  {
  	return modinfo->version;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.36/src/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.37/src/modules.h
 --- nsalibsemanage/src/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.36/src/modules.h	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/modules.h	2009-09-09 13:55:07.000000000 -0400
 @@ -26,6 +26,7 @@
  struct semanage_module_info {
  	char *name;		/* Key */
@@ -329,9 +341,9 @@ diff --exclude-from=exclude -N -u -r nsa
  };
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.36/src/policy.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.37/src/policy.h
 --- nsalibsemanage/src/policy.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.36/src/policy.h	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/policy.h	2009-09-09 13:55:07.000000000 -0400
 @@ -58,6 +58,12 @@
  	/* Upgrade a policy module */
  	int (*upgrade_file) (struct semanage_handle *, const char *);
@@ -345,18 +357,18 @@ diff --exclude-from=exclude -N -u -r nsa
  	/* Remove a policy module */
  	int (*remove) (struct semanage_handle *, char *);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.36/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.37/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.36/src/semanage.conf	2009-08-26 15:07:35.000000000 -0400
++++ libsemanage-2.0.37/src/semanage.conf	2009-09-09 13:55:07.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.36/src/semanage_store.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.37/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2009-08-05 15:10:56.000000000 -0400
-+++ libsemanage-2.0.36/src/semanage_store.c	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/semanage_store.c	2009-09-09 13:55:07.000000000 -0400
 @@ -57,6 +57,8 @@
  
  #include "debug.h"
@@ -459,9 +471,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	    -1 || semanage_load_module(sh, base_filename, base) == -1) {
  		goto cleanup;
  	}
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.36/src/semanage_store.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.37/src/semanage_store.h
 --- nsalibsemanage/src/semanage_store.h	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.36/src/semanage_store.h	2009-08-28 14:00:55.000000000 -0400
++++ libsemanage-2.0.37/src/semanage_store.h	2009-09-09 13:55:07.000000000 -0400
 @@ -128,4 +128,6 @@
  		     size_t buf_len,
  		     char **sorted_buf, size_t * sorted_buf_len);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- libsemanage.spec	28 Aug 2009 18:03:05 -0000	1.183
+++ libsemanage.spec	9 Sep 2009 17:57:13 -0000	1.184
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.36
-Release: 2%{?dist}
+Version: 2.0.37
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Sep 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.37-1
+- Update to upstream
+  	* Fix persistent dontaudit support to rebuild policy if the 
+        dontaudit state is changed from Chad Sellers.
+- Move load_policy to /sbin
+
 * Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.36-2
 - Add enable/disable modules
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- sources	28 Aug 2009 18:03:05 -0000	1.106
+++ sources	9 Sep 2009 17:57:13 -0000	1.107
@@ -1 +1 @@
-2d8087a2b4d47a55a34c6bb68ab32c1d  libsemanage-2.0.36.tgz
+bacf84c36e8e57a424da23eb585373ee  libsemanage-2.0.37.tgz



From harald at fedoraproject.org  Wed Sep  9 18:02:43 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  9 Sep 2009 18:02:43 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.10, 1.11 dracut.spec, 1.24,
	1.25 sources, 1.11, 1.12
Message-ID: <20090909180243.6355611C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6807

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
- plymouth: use plymouth-populate-initrd
- add add_drivers for dracut and dracut.conf
- do not mount /proc and /selinux manually in selinux-load-policy



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Sep 2009 09:35:50 -0000	1.10
+++ .cvsignore	9 Sep 2009 18:02:43 -0000	1.11
@@ -1 +1 @@
-dracut-001-71094bee.tar.bz2
+dracut-001-6f0e469d.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dracut.spec	9 Sep 2009 09:35:51 -0000	1.24
+++ dracut.spec	9 Sep 2009 18:02:43 -0000	1.25
@@ -1,4 +1,4 @@
-%define gittag 71094bee
+%define gittag 6f0e469d
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 001
-Release: 7%{?rdist}
+Release: 8%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -43,7 +43,6 @@ Requires: mdadm, elfutils-libelf, plymou
 Requires: cryptsetup-luks
 Requires: file
 Requires: bzip2
-Requires: policycoreutils
 Requires: dmraid
 Requires: kbd
 
@@ -180,6 +179,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
+- plymouth: use plymouth-populate-initrd
+- add add_drivers for dracut and dracut.conf
+- do not mount /proc and /selinux manually in selinux-load-policy
+
 * Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-7
 - add scsi_wait_scan to be sure everything was scanned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Sep 2009 09:35:51 -0000	1.11
+++ sources	9 Sep 2009 18:02:43 -0000	1.12
@@ -1 +1 @@
-1ae9d33d2473b139b51cd3825603ff5b  dracut-001-71094bee.tar.bz2
+df4e82439d12aa0d6f17154881c354ac  dracut-001-6f0e469d.tar.bz2



From limb at fedoraproject.org  Wed Sep  9 18:07:05 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  9 Sep 2009 18:07:05 +0000 (UTC)
Subject: rpms/squidGuard/F-11 squidGuard.spec,1.18,1.19
Message-ID: <20090909180705.1FA5611C00CE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10762

Modified Files:
	squidGuard.spec 
Log Message:
Include babel files, BZ 522038



Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-11/squidGuard.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- squidGuard.spec	5 Mar 2009 19:57:52 -0000	1.18
+++ squidGuard.spec	9 Sep 2009 18:07:04 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		4%{?dist}
+Release:		6%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -130,6 +130,8 @@ popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
+%{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -182,10 +184,17 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
+- Include babel files, BZ 522038.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-4
 - Initscript cleanup, BZ 247065.
 



From mtasaka at fedoraproject.org  Wed Sep  9 18:15:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 18:15:01 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase.spec,1.87,1.88
Message-ID: <20090909181501.1EB0511C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13269/F-11

Modified Files:
	kazehakase.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kazehakase.spec	9 Sep 2009 14:15:36 -0000	1.87
+++ kazehakase.spec	9 Sep 2009 18:15:00 -0000	1.88
@@ -33,7 +33,10 @@
 %define		repoid		43338
 %define		svnver		3783_trunk
 
-
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 %define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
@@ -45,6 +48,10 @@
 
 Name:		kazehakase
 Version:	0.5.7
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 



From mtasaka at fedoraproject.org  Wed Sep  9 18:15:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 18:15:00 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.82,1.83
Message-ID: <20090909181500.EAB4E11C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13269/F-10

Modified Files:
	kazehakase.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- kazehakase.spec	9 Sep 2009 15:33:30 -0000	1.82
+++ kazehakase.spec	9 Sep 2009 18:15:00 -0000	1.83
@@ -29,6 +29,10 @@
 %define		svnver		3509_trunk
 
 
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 %define		fedorarel	4
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
@@ -40,6 +44,10 @@
 
 Name:		kazehakase
 Version:	0.5.6
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 Release:	%{_release}%{?dist}.6
 Summary:	Kazehakase browser using Gecko rendering engine
 



From mtasaka at fedoraproject.org  Wed Sep  9 18:15:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 18:15:01 +0000 (UTC)
Subject: rpms/kazehakase/F-12 kazehakase.spec,1.93,1.94
Message-ID: <20090909181501.4665411C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13269/F-12

Modified Files:
	kazehakase.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-12/kazehakase.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kazehakase.spec	29 Aug 2009 06:15:48 -0000	1.93
+++ kazehakase.spec	9 Sep 2009 18:15:01 -0000	1.94
@@ -34,7 +34,11 @@
 %define		svnver		3783_trunk
 
 
-%define		fedorarel	1
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -45,6 +49,10 @@
 
 Name:		kazehakase
 Version:	0.5.7
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
@@ -317,6 +325,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- release++
+
 * Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
 - Update to 0.5.7
 



From mtasaka at fedoraproject.org  Wed Sep  9 18:18:52 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 18:18:52 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.49,1.50
Message-ID: <20090909181852.D642D11C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14350/F-10

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ruby-gnome2.spec	9 Sep 2009 15:46:03 -0000	1.49
+++ ruby-gnome2.spec	9 Sep 2009 18:18:52 -0000	1.50
@@ -4,6 +4,10 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 %define         mainrel                2
 
 # Note
@@ -13,7 +17,11 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
-Release:        %{mainrel}%{?dist}
+R#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
+elease:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries



From mtasaka at fedoraproject.org  Wed Sep  9 18:18:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 18:18:53 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2.spec,1.46,1.47
Message-ID: <20090909181853.07A6411C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14350/F-11

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ruby-gnome2.spec	9 Sep 2009 14:19:33 -0000	1.46
+++ ruby-gnome2.spec	9 Sep 2009 18:18:52 -0000	1.47
@@ -4,6 +4,10 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 %define         mainrel                2
 
 # Note
@@ -13,6 +17,10 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 



From mtasaka at fedoraproject.org  Wed Sep  9 18:18:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Sep 2009 18:18:53 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.45,1.46
Message-ID: <20090909181853.4701A11C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14350/devel

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ruby-gnome2.spec	3 Aug 2009 19:33:15 -0000	1.45
+++ ruby-gnome2.spec	9 Sep 2009 18:18:53 -0000	1.46
@@ -4,7 +4,11 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
-%define         mainrel                1
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -13,6 +17,10 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
@@ -1076,6 +1084,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- release++
+
 * Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
 - Update to 0.19.1, drop all upstreamed patches
 - Introduce many -devel subpackages containing pkgconfig file



From orion at fedoraproject.org  Wed Sep  9 18:18:52 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  9 Sep 2009 18:18:52 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.52,1.53
Message-ID: <20090909181852.C636D11C00CE@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14361

Modified Files:
	perl-PDL.spec 
Log Message:
* Wed Sep 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-3
- Don't strip out PLplot version so that plplot can detect it



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- perl-PDL.spec	26 Jul 2009 13:54:59 -0000	1.52
+++ perl-PDL.spec	9 Sep 2009 18:18:52 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:           perl-PDL
 Version:        2.4.4_05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -56,8 +56,6 @@ such commercial packages as IDL and MatL
 # Use newer plplot.pd
 cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/plplot.pd Graphics/PLplot/plplot.pd
 cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/t/plplot.t t/plplot.t
-# Strip separate version informaion
-sed -i -e '/^\$VERSION =/d' Graphics/PLplot/plplot.pd
 %patch0 -p1 -b .settings
 %patch1 -p1
 %patch2 -p1 -b .cleanup
@@ -151,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-3
+- Don't strip out PLplot version so that plplot can detect it
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4_05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bagnara at fedoraproject.org  Wed Sep  9 18:36:45 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Wed,  9 Sep 2009 18:36:45 +0000 (UTC)
Subject: rpms/ppl/F-10 ppl.spec,1.24,1.25
Message-ID: <20090909183645.504D811C00CE@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19673

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ppl.spec	21 Aug 2009 12:20:35 -0000	1.24
+++ ppl.spec	9 Sep 2009 18:36:45 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Wed Sep 09 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-6
+- Force rebuild.
+
 * Fri Aug 21 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-5
 - Force rebuild.
 



From bagnara at fedoraproject.org  Wed Sep  9 18:36:51 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Wed,  9 Sep 2009 18:36:51 +0000 (UTC)
Subject: rpms/ppl/F-11 ppl.spec,1.34,1.35
Message-ID: <20090909183651.6F54911C00CE@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19712

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ppl.spec	21 Aug 2009 12:21:45 -0000	1.34
+++ ppl.spec	9 Sep 2009 18:36:51 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Wed Sep 09 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-7
+- Force rebuild.
+
 * Fri Aug 21 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-6
 - Force rebuild.
 



From rdieter at fedoraproject.org  Wed Sep  9 18:43:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Sep 2009 18:43:29 +0000 (UTC)
Subject: rpms/poppler/devel .cvsignore, 1.41, 1.42 poppler.spec, 1.100,
	1.101 sources, 1.45, 1.46 poppler-0.11.0-pkg_config.patch, 1.1, NONE
Message-ID: <20090909184329.C65D111C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21503

Modified Files:
	.cvsignore poppler.spec sources 
Removed Files:
	poppler-0.11.0-pkg_config.patch 
Log Message:
* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.0-1
- Update to 0.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	18 Aug 2009 20:16:33 -0000	1.41
+++ .cvsignore	9 Sep 2009 18:43:29 -0000	1.42
@@ -1 +1 @@
-poppler-0.11.3.tar.gz
+poppler-0.12.0.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- poppler.spec	18 Aug 2009 20:16:33 -0000	1.100
+++ poppler.spec	9 Sep 2009 18:43:29 -0000	1.101
@@ -1,7 +1,7 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.11.3
+Version: 0.12.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
@@ -11,9 +11,6 @@ Source0: http://poppler.freedesktop.org/
 Patch0: poppler-ObjStream.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# reduce lib deps in -qt/-qt4 pkg-config support
-Patch50: poppler-0.11.0-pkg_config.patch 
-
 BuildRequires: automake libtool
 BuildRequires: cairo-devel
 BuildRequires: gtk2-devel
@@ -116,7 +113,6 @@ converting PDF files to a number of othe
 %setup -q 
 
 %patch0 -p0 -b .objstream
-%patch50 -p1 -b .pkg_config
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 
@@ -215,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.0-1
+- Update to 0.12.0
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.3-1
 - Update to 0.11.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	18 Aug 2009 20:16:33 -0000	1.45
+++ sources	9 Sep 2009 18:43:29 -0000	1.46
@@ -1 +1 @@
-28f9dbdc74e9aadbf27aff16d06f4990  poppler-0.11.3.tar.gz
+399b25d9d71ad22bc9a2a9281769c49c  poppler-0.12.0.tar.gz


--- poppler-0.11.0-pkg_config.patch DELETED ---



From akurtakov at fedoraproject.org  Wed Sep  9 18:45:59 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  9 Sep 2009 18:45:59 +0000 (UTC)
Subject: rpms/maven-plugin-bundle/devel felix-settings.xml, NONE,
	1.1 maven-plugin-bundle.spec, NONE, 1.1 felix-1.0.2.pom, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909184559.A815411C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-bundle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22548/devel

Modified Files:
	.cvsignore sources 
Added Files:
	felix-settings.xml maven-plugin-bundle.spec felix-1.0.2.pom 
Log Message:
Initial import.


--- NEW FILE felix-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>


--- NEW FILE maven-plugin-bundle.spec ---
Name:           maven-plugin-bundle
Version:        2.0.0
Release:        2%{?dist}
Summary:        Maven Bundle Plugin

Group:          Development/Tools
License:        ASL 2.0
URL:            http://felix.apache.org
Source0:        http://www.apache.org/dist/felix/maven-bundle-plugin-2.0.0-project.tar.gz
Source1:        http://repo1.maven.org/maven2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom
Source2:        felix-settings.xml
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: aqute-bndlib >= 0.0.363
BuildRequires: plexus-utils >= 1.4.5
BuildRequires: felix-osgi-obr
BuildRequires: kxml
BuildRequires: maven-shared-dependency-tree >= 1.1-3
BuildRequires: maven-wagon >= 1.0-0.2.b2
BuildRequires: maven2-plugin-compiler >= 2.0.8
BuildRequires: maven2-plugin-install >= 2.0.8
BuildRequires: maven2-plugin-jar >= 2.0.8
BuildRequires: maven2-plugin-javadoc >= 2.0.8
BuildRequires: maven2-plugin-plugin >= 2.0.8
BuildRequires: maven2-plugin-resources >= 2.0.8
BuildRequires: maven-surefire-maven-plugin >= 2.3
BuildRequires: maven-surefire-provider-junit >= 2.3
Requires: aqute-bndlib >= 0.0.363
Requires: plexus-utils >= 1.4.5
Requires: felix-osgi-obr
Requires: kxml
Requires: maven2

BuildArch: noarch


%description
Provides a maven plugin that supports creating an OSGi bundle
from the contents of the compilation classpath along with its
resources and dependencies. Plus a zillion other features.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n maven-bundle-plugin-%{version}
cp %{SOURCE2} settings.xml
mkdir -p .m2/repository/JPP/maven2/default_poms
cp %{SOURCE1} .m2/repository/JPP/maven2/default_poms/org.apache.felix-felix.pom

%build
sed -i -e \
 "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" \
 settings.xml
sed -i -e \
 "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" \
 settings.xml
sed -i -e \
 "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" \
 settings.xml
sed -i -e \
 "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" \
 settings.xml
sed -i -e \
 "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" \
 settings.xml

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/maven-bundle-plugin-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

%add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Mon Sep 7 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-2
- Fix BR/Rs.

* Thu Sep 3 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-1
- Initial import.


--- NEW FILE felix-1.0.2.pom ---
<!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership.  The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <groupId>org.apache</groupId>
    <artifactId>apache</artifactId>
    <version>4</version>
  </parent>

  <groupId>org.apache.felix</groupId>
  <artifactId>felix</artifactId>
  <packaging>pom</packaging>
  <name>Apache Felix</name>
  <version>1.0.2</version>
  <url>http://felix.apache.org/</url>
  <inceptionYear>2006</inceptionYear>
  <description>Apache felix is an OSGi implementation.</description>

  <issueManagement>
    <system>Jira</system>
    <url>http://issues.apache.org/jira/browse/FELIX</url>
  </issueManagement>

  <mailingLists>
    <mailingList>
      <name>Felix Dev</name>
      <subscribe>dev-subscribe at felix.apache.org</subscribe>
      <unsubscribe>dev-unsubscribe at felix.apache.org</unsubscribe>
      <post>-</post>
      <archive>http://www.mail-archive.com/dev%40felix.apache.org/</archive>
    </mailingList>
    <mailingList>
      <name>Felix Commits</name>
      <subscribe>commits-subscribe at felix.apache.org</subscribe>
      <unsubscribe>commits-unsubscribe at felix.apache.org</unsubscribe>
      <post>-</post>
      <archive>http://www.mail-archive.com/commits%40felix.apache.org/</archive>
    </mailingList>
  </mailingLists>

  <scm>
    <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/felix-1.0.2</connection>
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/felix-1.0.2</developerConnection>
    <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/felix-1.0.2</url>
  </scm>

  <!--
  Felix contains 3 custom maven packaging plugins. Each creates a jar file
  as an artifact.

  maven-bundle-plugin
    (bundle packaging - latest prefered plugin for generating OSGi bundles.)
  maven-osgi-plugin
    (osgi-bundle packaging - old plugin for generating OSGi bundles.)
  org.apache.felix.ipojo.plugin
    (plugin for generating iPOJO OSGi bundles.)

  But with maven bug https://issues.apache.org/jira/browse/FELIX-198 files
  are not always created with the correct extension in the repository.

  As a work around, this pom creates different profiles for building the
  different types of felix modules.

  Usage:
  mvn -Dpackaging=<type> clean install
  -->

  <profiles>

    <profile>
      <id>packaging-plugins</id>
      <activation>
        <property>
          <name>packaging</name>
          <value>plugins</value>
        </property>
      </activation>
      <modules>
        <module>../org.osgi.service.obr</module>
        <module>../maven-obr-plugin</module>
        <module>../bundleplugin</module>
        <module>../scrplugin</module>
        <module>../tools/maven2/maven-osgi-plugin</module>
      </modules>
    </profile>

    <profile>
      <id>packaging-ipojo-bundle</id>
      <activation>
        <property>
          <name>packaging</name>
          <value>ipojo-bundle</value>
        </property>
      </activation>
      <modules>
        <!--<module>ipojo/arch</module>-->
      </modules>
    </profile>

    <profile>
      <id>packaging-bundle</id>
      <activation>
        <property>
          <name>packaging</name>
          <value>bundle</value>
        </property>
      </activation>
      <modules>
        <module>../org.osgi.foundation</module>
        <module>../javax.servlet</module>
        <module>../org.osgi.core</module>
        <module>../org.osgi.compendium</module>
        <module>../framework</module>
        <module>../main</module>
        <module>../shell</module>
        <module>../shell.tui</module>
        <module>../shell.gui</module>
        <module>../shell.gui.plugin</module>
        <module>../org.osgi.service.obr</module>
        <module>../bundlerepository</module>
        <module>../log</module>
        <module>../eventadmin</module>
        <module>../http.jetty</module>
        <module>../upnp</module>
        <module>../scr</module>
        <module>../configadmin</module>
        <module>../metatype</module>
        <module>../dependencymanager</module>
        <module>../servicebinder</module>
        <module>../wireadmin</module>
        <module>../prefs</module>

        <module>../ipojo</module>

        <module>../mosgi</module>
        <module>../jmood</module>

        <module>../examples</module>
      </modules>
    </profile>

    <profile>
      <id>packaging-osgi-bundle</id>
      <activation>
        <property>
          <name>packaging</name>
          <value>osgi-bundle</value>
        </property>
      </activation>
      <modules>
        <module>../org.apache.felix.daemon</module>

        <!--    <module>tools/mangen</module> -->


      </modules>
    </profile>
    <profile>
      <id>release</id>
      <build>
        <plugins>
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-gpg-plugin</artifactId>
            <executions>
              <execution>
                <id>sign-artifacts</id>
                <phase>verify</phase>
                <goals>
                  <goal>sign</goal>
                </goals>
              </execution>
            </executions>
          </plugin>
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-assembly-plugin</artifactId>
            <configuration>
              <descriptorRefs>
                <descriptorRef>bin</descriptorRef>
                <descriptorRef>project</descriptorRef>
              </descriptorRefs>
            </configuration>
            <executions>
              <execution>
                <id>make-assembly</id>
                <phase>package</phase>
                <goals>
                  <goal>attached</goal>
                </goals>
              </execution>
            </executions>
          </plugin>
        </plugins>
      </build>
    </profile>
  </profiles>

  <distributionManagement>
    <site>
      <id>felix website</id>
      <url>file:///${user.dir}/target/site-deployed/</url>
    </site>
    <repository>
      <id>apache.releases</id>
      <name>Apache Release Distribution Repository</name>
      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
    </repository>
  </distributionManagement>

  <pluginRepositories>
    <pluginRepository>
      <id>apache.snapshots</id>
      <name>snapshot plugins</name>
      <url>
        http://people.apache.org/repo/m2-snapshot-repository
      </url>
      <releases>
        <enabled>false</enabled>
      </releases>
      <snapshots>
        <enabled>true</enabled>
      </snapshots>
    </pluginRepository>
  </pluginRepositories>

  <!-- definitions for testing -->
  <dependencies>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>easymock</groupId>
      <artifactId>easymock</artifactId>
      <version>1.2_Java1.3</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <build>
    <pluginManagement>
      <plugins>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-compiler-plugin</artifactId>
          <version>2.0.2</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-surefire-plugin</artifactId>
          <version>2.3</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-jar-plugin</artifactId>
          <version>2.1</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-plugin-plugin</artifactId>
          <version>2.3</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-install-plugin</artifactId>
          <version>2.2</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-deploy-plugin</artifactId>
          <version>2.3</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-site-plugin</artifactId>
          <version>2.0-beta-6</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-project-info-reports-plugin</artifactId>
          <version>2.0.1</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-jxr-plugin</artifactId>
          <version>2.1</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-surefire-report-plugin</artifactId>
          <version>2.3</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-javadoc-plugin</artifactId>
          <version>2.3</version>
        </plugin>
<!--     <plugin>
          <groupId>org.apache.felix</groupId>
          <artifactId>maven-bundle-plugin</artifactId>
          <version>1.1.0-SNAPSHOT</version>
        </plugin> -->
<!--        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-remote-resources-plugin</artifactId>
          <version>1.0-alpha-6</version>
        </plugin> -->
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-gpg-plugin</artifactId>
          <version>1.0-alpha-4</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-assembly-plugin</artifactId>
          <version>2.2-beta-1</version>
        </plugin>
      </plugins>
    </pluginManagement>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <target>1.3</target>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
      </plugin>
      <!-- plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-report-plugin</artifactId>
      </plugin -->
      <!-- We want to package up license resources in the JARs produced
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-remote-resources-plugin</artifactId>
        <executions>
          <execution>
            <goals>
              <goal>process</goal>
            </goals>
            <configuration>
              <resourceBundles>
                <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
              </resourceBundles>
            </configuration>
          </execution>
        </executions>
      </plugin>-->
    </plugins>
    <resources>
      <resource>
        <directory>src/main/resources</directory>
      </resource>
      <resource>
      <directory>.</directory>
      <targetPath>META-INF</targetPath>
      <includes>
        <include>LICENSE*</include>
        <include>NOTICE*</include>
      </includes>
    </resource>
  </resources>
  </build>
  <reporting>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-site-plugin</artifactId>
        <configuration>
          <templateDirectory>${user.dir}/src/site/</templateDirectory>
          <template>maven-site.vm</template>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-report-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jxr-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-project-info-reports-plugin</artifactId>
        <reportSets>
          <reportSet>
            <reports>
              <report>index</report>
              <report>dependencies</report>
              <report>project-team</report>
              <report>mailing-list</report>
              <report>issue-tracking</report>
              <report>license</report>
              <report>scm</report>
            </reports>
          </reportSet>
        </reportSets>
      </plugin>
      <!--plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
        <configuration>
          <aggregate>true</aggregate>
        </configuration>
      </plugin-->
    </plugins>
  </reporting>
</project>

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-bundle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 15:34:08 -0000	1.1
+++ .cvsignore	9 Sep 2009 18:45:59 -0000	1.2
@@ -0,0 +1 @@
+maven-bundle-plugin-2.0.0-project.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-bundle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 15:34:08 -0000	1.1
+++ sources	9 Sep 2009 18:45:59 -0000	1.2
@@ -0,0 +1 @@
+de97b6f6b92b7ebef33000f4ed31ebb1  maven-bundle-plugin-2.0.0-project.tar.gz



From nim at fedoraproject.org  Wed Sep  9 18:48:54 2009
From: nim at fedoraproject.org (nim)
Date: Wed,  9 Sep 2009 18:48:54 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/devel
	gfs-philostratos-fonts-fontconfig.conf, NONE,
	1.1 gfs-philostratos-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909184854.399FB11C00CE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-philostratos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23864/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gfs-philostratos-fonts-fontconfig.conf 
	gfs-philostratos-fonts.spec import.log 
Log Message:
initial update


--- NEW FILE gfs-philostratos-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>GFS Philostratos</family>
    </prefer>
  </alias>
  <alias>
    <family>GFS Philostratos</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gfs-philostratos-fonts.spec ---
%global fontname gfs-philostratos
%global fontconf 61-%{fontname}.conf

%global archivename GFS_PHILOSTRATOS

Name:    %{fontname}-fonts
Version: 20090902
Release: 1%{?dist}
Summary: A revival of the ?Griechische Antiqua? Greek typeface

Group:     User Interface/X
License:   OFL
URL:       http://www.greekfontsociety.gr/pages/en_typefaces19th.html
Source0:   http://www.greekfontsociety.gr/%{archivename}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
Griechische Antiqua was one of the historical Greek typefaces of the late 19th
and early 20th century. It was designed by ?aurice ?duard Pinder, a German
erudite artist and a member of the Academy of Science in Berlin. This is the
most popular version which has appeared from 1870 to 1940 in the German
speaking philological literature and in many classical and Byzantine editions
by publishers like Teubner (in Leipzig) and Weidmann (in Berlin) such as:
Anthology of Byzantine Melos by Wilhelm von Christ and Matthaios
Paranikas (Leipzig 1871), Epicurea, by Heinrich Usener (Leipzig 1887),
Mitrodorous by Alfred Koerte (Leipzig 1890), Pindar by Otto Schroeder (Leipzig
1908), ??? Aeschylus by U. von Wilamowitz-Moellendorff (Berlin 1910, 1915),
Bachylides by Bruno Snell (Leipzig, 1934),  The Vulgata by Alfred Rahlfs
(Stuttgart 1935), Suidas Lexicon by Ada Adler (Leipzig 1928-1938) etc.

E.J. Kenney lamented the abandonment of the type after the 2nd World War as a
great loss for Greek typography (?From Script to Print?, Greek Scripts: An
illustrated Introduction, Society for the Promotion of Hellenic Studies, 2001,
p. 69).

GFS Philostratos was digitized by George D. Matthiopoulos.


%prep
%setup -q -c -T
unzip -j -L -q %{SOURCE0}
chmod 0644 *.txt
for txt in *.txt ; do
   fold -s $txt > $txt.new
   sed -i 's/\r//' $txt.new
   touch -r $txt $txt.new
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.otf

%doc *.txt *.pdf


%changelog

* Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20090902-1
? initial packaging


--- NEW FILE import.log ---
gfs-philostratos-fonts-20090902-1_fc12:HEAD:gfs-philostratos-fonts-20090902-1.fc12.src.rpm:1252522096


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:14:08 -0000	1.1
+++ .cvsignore	9 Sep 2009 18:48:53 -0000	1.2
@@ -0,0 +1 @@
+GFS_PHILOSTRATOS.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:14:08 -0000	1.1
+++ sources	9 Sep 2009 18:48:54 -0000	1.2
@@ -0,0 +1 @@
+81dedf8a53a2b0404a097c9504ebe19b  GFS_PHILOSTRATOS.zip



From nim at fedoraproject.org  Wed Sep  9 18:58:43 2009
From: nim at fedoraproject.org (nim)
Date: Wed,  9 Sep 2009 18:58:43 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/devel import.log,1.1,1.2
Message-ID: <20090909185843.8535411C00CE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-philostratos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27437/devel

Modified Files:
	import.log 
Log Message:
initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Sep 2009 18:48:54 -0000	1.1
+++ import.log	9 Sep 2009 18:58:43 -0000	1.2
@@ -1 +1,2 @@
 gfs-philostratos-fonts-20090902-1_fc12:HEAD:gfs-philostratos-fonts-20090902-1.fc12.src.rpm:1252522096
+gfs-philostratos-fonts-20090902-1_fc12:HEAD:gfs-philostratos-fonts-20090902-1.fc12.src.rpm:1252522706



From nim at fedoraproject.org  Wed Sep  9 19:01:24 2009
From: nim at fedoraproject.org (nim)
Date: Wed,  9 Sep 2009 19:01:24 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.294,1.295 comps-f12.xml.in,1.110,1.111
Message-ID: <20090909190124.91A5D11C00CE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28227

Modified Files:
	comps-f11.xml.in comps-f12.xml.in 
Log Message:
sort


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- comps-f11.xml.in	8 Sep 2009 23:10:23 -0000	1.294
+++ comps-f11.xml.in	9 Sep 2009 19:01:24 -0000	1.295
@@ -4897,8 +4897,8 @@
       <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">v4l2-tool</packagereq>
       <packagereq type="optional">vdr</packagereq>
-      <packagereq type="optional">vdr-femon</packagereq>
       <packagereq type="optional">vdr-epgsearch</packagereq>
+      <packagereq type="optional">vdr-femon</packagereq>
       <packagereq type="optional">vdr-osdteletext</packagereq>
       <packagereq type="optional">vdr-remote</packagereq>
       <packagereq type="optional">vdr-skins</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- comps-f12.xml.in	8 Sep 2009 23:10:23 -0000	1.110
+++ comps-f12.xml.in	9 Sep 2009 19:01:24 -0000	1.111
@@ -353,6 +353,7 @@
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
+      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
       <packagereq type="default">bitmap-fonts</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
@@ -360,7 +361,6 @@
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
@@ -778,8 +778,8 @@
       <packagereq type="default">efibootmgr</packagereq>
       <packagereq type="default">grub</packagereq>
       <packagereq type="default">ppc64-utils</packagereq>
-      <packagereq type="default">sendmail</packagereq>
       <packagereq type="default">s390utils</packagereq>
+      <packagereq type="default">sendmail</packagereq>
       <packagereq type="default">yaboot</packagereq>
     </packagelist>
   </group>
@@ -1191,25 +1191,25 @@
     </packagelist>
   </group>
   <group>
-      <id>directory-server</id>
-      <_name>Directory Server</_name>
-      <_description>Machine and user identity servers.</_description>
-      <default>false</default>
-      <uservisible>true</uservisible>
-      <packagelist>
-        <packagereq type="optional">krb5-server</packagereq>
-        <packagereq type="optional">migrationtools</packagereq>
-        <packagereq type="optional">openldap-servers</packagereq>
-        <packagereq type="optional">samba</packagereq>
-        <packagereq type="optional">ypserv</packagereq>
-        <packagereq type="optional">389-ds-base</packagereq>
-        <packagereq type="optional">389-ds-admin</packagereq>
-        <packagereq type="optional">idm-console-framework</packagereq>
-        <packagereq type="optional">389-console</packagereq>
-        <packagereq type="optional">389-ds-console</packagereq>
-        <packagereq type="optional">389-admin-console</packagereq>
-        <packagereq type="optional">389-dsgw</packagereq>
-      </packagelist>
+    <id>directory-server</id>
+    <_name>Directory Server</_name>
+    <_description>Machine and user identity servers.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="optional">389-admin-console</packagereq>
+      <packagereq type="optional">389-console</packagereq>
+      <packagereq type="optional">389-ds-admin</packagereq>
+      <packagereq type="optional">389-ds-base</packagereq>
+      <packagereq type="optional">389-ds-console</packagereq>
+      <packagereq type="optional">389-dsgw</packagereq>
+      <packagereq type="optional">idm-console-framework</packagereq>
+      <packagereq type="optional">krb5-server</packagereq>
+      <packagereq type="optional">migrationtools</packagereq>
+      <packagereq type="optional">openldap-servers</packagereq>
+      <packagereq type="optional">samba</packagereq>
+      <packagereq type="optional">ypserv</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>dns-server</id>
@@ -1383,8 +1383,8 @@
       <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
-      <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
+      <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">electric</packagereq>
       <packagereq type="default">espresso-ab</packagereq>
       <packagereq type="default">gds2pov</packagereq>
@@ -3600,12 +3600,12 @@
       <packagereq type="default">konq-plugins</packagereq>
       <packagereq type="default">konversation</packagereq>
       <packagereq type="default">kpackagekit</packagereq>
-      <packagereq type="default">polkit-gnome</packagereq>	
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">PolicyKit-kde</packagereq>
+      <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">xsettings-kde</packagereq>
@@ -4693,12 +4693,12 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">gutenprint</packagereq>
       <packagereq type="default">gutenprint-cups</packagereq>
-      <packagereq type="default">system-config-printer-udev</packagereq>
       <packagereq type="default">hpijs</packagereq>
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
+      <packagereq type="default">system-config-printer-udev</packagereq>
       <packagereq type="optional">a2ps</packagereq>
       <packagereq type="optional">enscript</packagereq>
     </packagelist>
@@ -4811,8 +4811,8 @@
     <uservisible>true</uservisible>
     <langonly>sa</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
       <packagereq type="mandatory">m17n-db-sanskrit</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5077,8 +5077,8 @@
       <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">v4l2-tool</packagereq>
       <packagereq type="optional">vdr</packagereq>
-      <packagereq type="optional">vdr-femon</packagereq>
       <packagereq type="optional">vdr-epgsearch</packagereq>
+      <packagereq type="optional">vdr-femon</packagereq>
       <packagereq type="optional">vdr-osdteletext</packagereq>
       <packagereq type="optional">vdr-remote</packagereq>
       <packagereq type="optional">vdr-skins</packagereq>
@@ -5310,7 +5310,6 @@
       <packagereq type="optional">autofs</packagereq>
       <packagereq type="optional">avahi-tools</packagereq>
       <packagereq type="optional">bash-completion</packagereq>
-      <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">bochs</packagereq>
       <packagereq type="optional">cabextract</packagereq>
       <packagereq type="optional">catfish</packagereq>
@@ -5402,6 +5401,7 @@
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
+      <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">pam_keyring</packagereq>
       <packagereq type="optional">par2cmdline</packagereq>
       <packagereq type="optional">pbzip2</packagereq>



From nim at fedoraproject.org  Wed Sep  9 19:06:59 2009
From: nim at fedoraproject.org (nim)
Date: Wed,  9 Sep 2009 19:06:59 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.295,1.296 comps-f12.xml.in,1.111,1.112
Message-ID: <20090909190659.7101B11C00CE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30183

Modified Files:
	comps-f11.xml.in comps-f12.xml.in 
Log Message:
add  gfs-philostratos-fonts


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- comps-f11.xml.in	9 Sep 2009 19:01:24 -0000	1.295
+++ comps-f11.xml.in	9 Sep 2009 19:06:59 -0000	1.296
@@ -1738,6 +1738,7 @@
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
       <packagereq type="optional">gfs-olga-fonts</packagereq>
+      <packagereq type="optional">gfs-philostratos-fonts</packagereq>
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-pyrsos-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>
@@ -2729,6 +2730,7 @@
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
       <packagereq type="optional">gfs-olga-fonts</packagereq>
+      <packagereq type="optional">gfs-philostratos-fonts</packagereq>
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-pyrsos-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- comps-f12.xml.in	9 Sep 2009 19:01:24 -0000	1.111
+++ comps-f12.xml.in	9 Sep 2009 19:06:59 -0000	1.112
@@ -1877,6 +1877,7 @@
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
       <packagereq type="optional">gfs-olga-fonts</packagereq>
+      <packagereq type="optional">gfs-philostratos-fonts</packagereq>
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-pyrsos-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>
@@ -2873,6 +2874,7 @@
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
       <packagereq type="optional">gfs-olga-fonts</packagereq>
+      <packagereq type="optional">gfs-philostratos-fonts</packagereq>
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-pyrsos-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>



From karsten at fedoraproject.org  Wed Sep  9 19:07:15 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  9 Sep 2009 19:07:15 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins-0.6.0-s390x.patch, NONE,
	1.1 kipi-plugins.spec, 1.97, 1.98
Message-ID: <20090909190715.ED2A511C00CE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30221

Modified Files:
	kipi-plugins.spec 
Added Files:
	kipi-plugins-0.6.0-s390x.patch 
Log Message:
- add endian info for s390, s390x
- kipiplugin_acquireimages.so is not available as kdegraphics is compiled
  without sane support on s390x


kipi-plugins-0.6.0-s390x.patch:
 dng_flags.h |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE kipi-plugins-0.6.0-s390x.patch ---
diff -up kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390x kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
--- kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390x	2009-09-08 16:38:12.000000000 +0200
+++ kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h	2009-09-08 16:39:02.000000000 +0200
@@ -76,6 +76,12 @@
 #elif defined(__sparc__)
 #define qDNGBigEndian 1
 
+#elif defined(__s390x__)
+#define qDNGBigEndian 1
+
+#elif defined(__s390__)
+#define qDNGBigEndian 1
+
 #elif defined(__POWERPC__)
 #define qDNGBigEndian 1
 


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kipi-plugins.spec	29 Aug 2009 17:50:22 -0000	1.97
+++ kipi-plugins.spec	9 Sep 2009 19:07:15 -0000	1.98
@@ -3,7 +3,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 ## upstreamable patches
 Patch50: kipi-plugins-0.4.0-dt_validation.patch
+Patch51: kipi-plugins-0.6.0-s390x.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
@@ -74,6 +75,7 @@ PrintWizard        : print images in var
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
 %patch50 -p1 -b .dt_validation
+%patch51 -p1 -b .s390x
 
 
 %build
@@ -141,7 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
 %{_kde4_libdir}/libkipiplugins.so.1*
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
+%endif
 %{_kde4_libdir}/kde4/kipiplugin_advancedslideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_batchprocessimages.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
@@ -183,6 +187,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.6.0-2
+- add endian info for s390, s390x
+- kipiplugin_acquireimages.so is not available as kdegraphics is compiled
+  without sane support on s390x
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
 - kipi-plugins-0.5.0
 



From notting at fedoraproject.org  Wed Sep  9 19:08:43 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Sep 2009 19:08:43 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-python-error.patch, 1.1,
	1.2 deltarpm.spec, 1.27, 1.28
Message-ID: <20090909190843.1A4D511C00CE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30583

Modified Files:
	deltarpm-python-error.patch deltarpm.spec 
Log Message:


deltarpm-python-error.patch:
 deltarpmmodule.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Index: deltarpm-python-error.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm-python-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- deltarpm-python-error.patch	9 Sep 2009 17:48:28 -0000	1.1
+++ deltarpm-python-error.patch	9 Sep 2009 19:08:42 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up deltarpm-git-20090831.1/deltarpmmodule.c.foo deltarpm-git-20090831.1/deltarpmmodule.c
 --- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-09-09 13:28:37.000000000 -0400
-+++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 13:29:07.000000000 -0400
++++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 15:03:20.000000000 -0400
 @@ -66,13 +66,17 @@ static PyObject *doRead(PyObject *s, PyO
    int pid;
    int ipcpipe[2];
@@ -21,3 +21,12 @@ diff -up deltarpm-git-20090831.1/deltarp
  
    if ((pid = fork())) {
      FILE *readend = fdopen(ipcpipe[0], "r");
+@@ -90,7 +94,7 @@ static PyObject *doRead(PyObject *s, PyO
+ 
+     readdeltarpm(filename, &d, NULL);
+     PyMarshal_WriteObjectToFile(createDict(d), writend, Py_MARSHAL_VERSION);
+-    exit(0);
++    _exit(0);
+   }
+   return ret;
+ }


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- deltarpm.spec	9 Sep 2009 17:48:28 -0000	1.27
+++ deltarpm.spec	9 Sep 2009 19:08:42 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1.1%{?dist}
+Release: 0.git.20090831.1.2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -98,7 +98,7 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
-* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.1
+* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.2
 - fix python bindings
 
 * Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1



From akurtakov at fedoraproject.org  Wed Sep  9 19:10:21 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  9 Sep 2009 19:10:21 +0000 (UTC)
Subject: rpms/maven-plugin-bundle/devel maven-plugin-bundle.spec,1.1,1.2
Message-ID: <20090909191021.D904F11C043D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-bundle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31085/devel

Modified Files:
	maven-plugin-bundle.spec 
Log Message:
BR doxia-sitetools.


Index: maven-plugin-bundle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-bundle/devel/maven-plugin-bundle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-plugin-bundle.spec	9 Sep 2009 18:45:59 -0000	1.1
+++ maven-plugin-bundle.spec	9 Sep 2009 19:10:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           maven-plugin-bundle
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
@@ -24,6 +24,7 @@ BuildRequires: maven2-plugin-plugin >= 2
 BuildRequires: maven2-plugin-resources >= 2.0.8
 BuildRequires: maven-surefire-maven-plugin >= 2.3
 BuildRequires: maven-surefire-provider-junit >= 2.3
+BuildRequires: maven-doxia-sitetools
 Requires: aqute-bndlib >= 0.0.363
 Requires: plexus-utils >= 1.4.5
 Requires: felix-osgi-obr
@@ -119,6 +120,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 9 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-3
+- BR doxia-sitetools.
+
 * Mon Sep 7 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-2
 - Fix BR/Rs.
 



From xhorak at fedoraproject.org  Wed Sep  9 19:12:45 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 19:12:45 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.63,1.64
Message-ID: <20090909191245.F027211C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany-extensions/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31632

Modified Files:
	epiphany-extensions.spec 
Log Message:
Rebuild against newer gecko


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- epiphany-extensions.spec	5 Aug 2009 06:37:01 -0000	1.63
+++ epiphany-extensions.spec	9 Sep 2009 19:12:45 -0000	1.64
@@ -1,10 +1,10 @@
 %global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.13
+%global gecko_version       1.9.0.14
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -112,8 +112,10 @@ scrollkeeper-update -q ||:
 #%{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas
 %{_sysconfdir}/gconf/schemas/epilicious.schemas
 
-
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-5
+- Rebuild against newer gecko
+
 * Wed Aug  5 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Sep  9 19:15:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Sep 2009 19:15:10 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-11 epiphany-extensions.spec,1.63,1.64
Message-ID: <20090909191510.63E2611C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany-extensions/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32263

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-6
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-11/epiphany-extensions.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- epiphany-extensions.spec	3 Aug 2009 23:02:44 -0000	1.63
+++ epiphany-extensions.spec	9 Sep 2009 19:15:10 -0000	1.64
@@ -1,11 +1,11 @@
 %global ephy_major          2.26
 %global ephy_api_version    2.26
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.1.2
+%global gecko_version       1.9.1.3
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -111,8 +111,10 @@ scrollkeeper-update -q ||:
 %{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas
 %{_sysconfdir}/gconf/schemas/epilicious.schemas
 
-
 %changelog
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-6
+- Rebuild against newer gecko
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-5
 - Rebuild against newer gecko
 



From harald at fedoraproject.org  Wed Sep  9 19:19:18 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  9 Sep 2009 19:19:18 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.25,1.26
Message-ID: <20090909191918.9341D11C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv755

Modified Files:
	dracut.spec 
Log Message:
* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
- added Requires: plymouth-scripts



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- dracut.spec	9 Sep 2009 18:02:43 -0000	1.25
+++ dracut.spec	9 Sep 2009 19:19:17 -0000	1.26
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 001
-Release: 8%{?rdist}
+Release: 9%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -45,6 +45,7 @@ Requires: file
 Requires: bzip2
 Requires: dmraid
 Requires: kbd
+Requires: plymouth-scripts
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
@@ -180,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
+- added Requires: plymouth-scripts
+
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
 - plymouth: use plymouth-populate-initrd
 - add add_drivers for dracut and dracut.conf
 - do not mount /proc and /selinux manually in selinux-load-policy



From steved at fedoraproject.org  Wed Sep  9 19:24:27 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed,  9 Sep 2009 19:24:27 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1783,
	1.1784 linux-2.6-nfsd4-proots.patch, 1.1, 1.2
Message-ID: <20090909192427.3DA2A11C00CE@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3009

Modified Files:
	kernel.spec linux-2.6-nfsd4-proots.patch 
Log Message:
Updated the NFS4 pseudo root code to the latest release.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1783
retrieving revision 1.1784
diff -u -p -r1.1783 -r1.1784
--- kernel.spec	9 Sep 2009 17:16:11 -0000	1.1783
+++ kernel.spec	9 Sep 2009 19:24:26 -0000	1.1784
@@ -2027,6 +2027,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep  9 2009 Steve Dickson <steved at redhat.com>
+- Updated the NFS4 pseudo root code to the latest release.
+
 * Wed Sep 09 2009 Justin M. Forbes <jforbes at redhat.com>
 - Revert virio_blk to rotational mode. (#509383)
 

linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |   12 +++++-
 fs/nfsd/nfs4xdr.c           |   83 ++++++++++++++++++++++++++++++++++++--------
 fs/nfsd/nfsfh.c             |   32 ++++++++++++++++
 fs/nfsd/vfs.c               |   75 ++++++++++++++++++++++++++++++++++++++-
 include/linux/nfsd/export.h |    3 +
 include/linux/nfsd/nfsd.h   |    2 +
 6 files changed, 188 insertions(+), 19 deletions(-)

Index: linux-2.6-nfsd4-proots.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-nfsd4-proots.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-nfsd4-proots.patch	8 Jul 2009 13:27:06 -0000	1.1
+++ linux-2.6-nfsd4-proots.patch	9 Sep 2009 19:24:27 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up linux-2.6.30.noarch/fs/nfsd/export.c.save linux-2.6.30.noarch/fs/nfsd/export.c
---- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-07-02 11:35:44.000000000 -0400
+--- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-09-09 15:11:54.702436000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-09-09 15:12:44.520167000 -0400
 @@ -104,6 +104,7 @@ static int expkey_parse(struct cache_det
  	if (mesg[mlen-1] != '\n')
  		return -EINVAL;
@@ -64,9 +64,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  		return 0;
  	}
 diff -up linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c
---- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-07-02 11:35:31.000000000 -0400
-@@ -2176,28 +2176,62 @@ static inline int attributes_need_mount(
+--- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-09-09 15:11:54.707433000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-09-09 15:12:36.408695000 -0400
+@@ -2176,28 +2176,61 @@ static inline int attributes_need_mount(
  	return 0;
  }
  
@@ -136,49 +136,11 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
 +	struct svc_export *exp = cd->rd_fhp->fh_export;
 +	__be32 nfserr;
 +	int ignore_crossmnt = 0;
-+	int err, v4root = (exp->ex_flags & NFSEXP_V4ROOT);
 +
  	exp_get(exp);
  	/*
  	 * In the case of a mountpoint, the client may be asking for
-@@ -2208,18 +2242,29 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
- 	 */
- 	if (d_mountpoint(dentry) && !attributes_need_mount(cd->rd_bmval))
- 		ignore_crossmnt = 1;
--	else if (d_mountpoint(dentry)) {
--		int err;
--
-+	else if (d_mountpoint(dentry) || v4root) {
-+		/*
-+		 * Make sure the dentry is viewable on the psuedo export
-+		 */
-+		v4root = (dentry->d_inode && v4root);
-+		if (v4root) {
-+			err = nfsd_export_lookup(cd->rd_rqstp, dentry, exp);
-+			if (err) {
-+				nfserr = nfserrno(err);
-+				goto out_put;
-+			}
-+		}
- 		/*
- 		 * Why the heck aren't we just using nfsd_lookup??
- 		 * Different "."/".." handling?  Something else?
- 		 * At least, add a comment here to explain....
- 		 */
--		err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
--		if (err) {
--			nfserr = nfserrno(err);
--			goto out_put;
-+		if (d_mountpoint(dentry) || v4root) {
-+			err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
-+			if (err) {
-+				nfserr = nfserrno(err);
-+				goto out_put;
-+			}
- 		}
- 		nfserr = check_nfsd_access(exp, cd->rd_rqstp);
- 		if (nfserr)
-@@ -2258,6 +2303,7 @@ nfsd4_encode_dirent(void *ccdv, const ch
+@@ -2258,6 +2291,7 @@ nfsd4_encode_dirent(void *ccdv, const ch
  	struct readdir_cd *ccd = ccdv;
  	struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common);
  	int buflen;
@@ -186,7 +148,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	__be32 *p = cd->buffer;
  	__be32 *cookiep;
  	__be32 nfserr = nfserr_toosmall;
-@@ -2268,19 +2314,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
+@@ -2268,19 +2302,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
  		return 0;
  	}
  
@@ -230,17 +192,15 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	case nfs_ok:
  		p += buflen;
 diff -up linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save linux-2.6.30.noarch/fs/nfsd/nfsfh.c
---- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-07-02 11:35:48.000000000 -0400
-@@ -109,6 +109,34 @@ static __be32 nfsd_setuser_and_check_por
+--- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-09-09 15:11:54.711427000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-09-09 15:12:48.357903000 -0400
+@@ -109,6 +109,30 @@ static __be32 nfsd_setuser_and_check_por
  	return nfserrno(nfsd_setuser(rqstp, exp));
  }
  
 +static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,
 +	struct dentry *dentry, struct svc_export *exp)
 +{
-+	int error;
-+
 +	/*
 +	 * Only interested in pseudo roots
 +	 */
@@ -252,14 +212,12 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
 +	 */
 +	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode)))
 +		return nfserr_stale;
++
 +	/*
-+	 * Check non-root directories to make sure
-+	 * they are truly exported
++	 * Make sure the export is the parent of the dentry
 +	 */
-+	if (unlikely(dentry->d_name.len > 1)) {
-+		error = nfsd_export_lookup(rqstp, dentry, exp);
-+		return nfserrno(error);
-+	}
++	if (unlikely(dentry->d_parent != exp->ex_path.dentry))
++		return nfserr_stale;
 +
 +	return nfs_ok;
 +}
@@ -267,7 +225,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  /*
   * Use the given filehandle to look up the corresponding export and
   * dentry.  On success, the results are used to set fh_export and
-@@ -315,6 +343,14 @@ fh_verify(struct svc_rqst *rqstp, struct
+@@ -315,6 +339,14 @@ fh_verify(struct svc_rqst *rqstp, struct
  		error = nfsd_setuser_and_check_port(rqstp, exp);
  		if (error)
  			goto out;
@@ -283,8 +241,8 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  
  	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
 diff -up linux-2.6.30.noarch/fs/nfsd/vfs.c.save linux-2.6.30.noarch/fs/nfsd/vfs.c
---- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-07-02 11:35:39.000000000 -0400
+--- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-09-09 15:11:54.715423000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-09-09 15:12:39.978431000 -0400
 @@ -89,6 +89,12 @@ struct raparm_hbucket {
  #define RAPARM_HASH_MASK	(RAPARM_HASH_SIZE-1)
  static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];
@@ -314,7 +272,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  
 +/*
 + * Lookup the export the dentry is on. To be
-+ * viewable on an pseudo export, the dentry
++ * viewable on a pseudo export, the dentry
 + * has to be an exported directory. 
 + */
 +int
@@ -325,14 +283,14 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
 +	struct path path;
 +	int err = 0;
 +
-+	if ((exp->ex_flags & NFSEXP_V4ROOT) == 0)
++	if (exp->ex_flags & NFSEXP_V4ROOT) == 0)
 +		return 0;
 +
 +	/*
 +	 * Make sure the export is the parent of the dentry
 +	 */
-+	if (dentry->d_parent != exp->ex_path.dentry)
-+		return 0;
++	if (unlikely(dentry->d_parent != exp->ex_path.dentry))
++		return -ENOENT;
 +
 +	/*
 +	 * Only directories are seen on psuedo exports
@@ -405,8 +363,8 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  				dput(dentry);
  				goto out_nfserr;
 diff -up linux-2.6.30.noarch/include/linux/nfsd/export.h.save linux-2.6.30.noarch/include/linux/nfsd/export.h
---- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-07-02 11:35:22.000000000 -0400
+--- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-09-09 15:11:54.719419000 -0400
++++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-09-09 15:12:29.064157000 -0400
 @@ -39,7 +39,8 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
@@ -418,8 +376,8 @@ diff -up linux-2.6.30.noarch/include/lin
  /* The flags that may vary depending on security flavor: */
  #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
 diff -up linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save linux-2.6.30.noarch/include/linux/nfsd/nfsd.h
---- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-07-02 11:35:27.000000000 -0400
+--- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-09-09 15:11:54.723415000 -0400
++++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-09-09 15:12:33.025896000 -0400
 @@ -76,6 +76,8 @@ int		nfsd_racache_init(int);
  void		nfsd_racache_shutdown(void);
  int		nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,



From ajax at fedoraproject.org  Wed Sep  9 19:33:12 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Sep 2009 19:33:12 +0000 (UTC)
Subject: rpms/kernel/devel drm-connection-cache.patch,1.1,1.2
Message-ID: <20090909193312.46D5811C00CE@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6980

Modified Files:
	drm-connection-cache.patch 
Log Message:
more hacking

drm-connection-cache.patch:
 linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c |   12 ++++++++++++
 linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c |    9 ++++++++-
 linux-2.6.30.noarch/include/drm/drm_crtc.h            |    1 +
 linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c        |    3 ++-
 4 files changed, 23 insertions(+), 2 deletions(-)

Index: drm-connection-cache.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-connection-cache.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-connection-cache.patch	9 Sep 2009 14:03:43 -0000	1.1
+++ drm-connection-cache.patch	9 Sep 2009 19:33:12 -0000	1.2
@@ -20,19 +20,6 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (connector->status == connector_status_disconnected) {
  		DRM_DEBUG_KMS("%s is disconnected\n",
  			  drm_get_connector_name(connector));
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_crt.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_crt.c
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_dp.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_dp.c
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx	2009-09-09 08:57:40.000000000 -0400
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-09-09 09:56:19.000000000 -0400
-@@ -107,6 +107,7 @@ struct intel_output {
- 	void (*hot_plug)(struct intel_output *);
- 	int crtc_mask;
- 	int clone_mask;
-+	bool cached;
- };
- 
- struct intel_crtc {
 diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c
 --- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx	2009-09-09 08:57:39.000000000 -0400
 +++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c	2009-09-09 09:56:18.000000000 -0400
@@ -63,3 +50,16 @@ diff -up linux-2.6.30.noarch/include/drm
  };
  
  enum subpixel_order {
+diff -up linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c.jx linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c
+--- linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c.jx	2009-09-09 10:10:44.000000000 -0400
++++ linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c	2009-09-09 11:23:14.000000000 -0400
+@@ -185,7 +185,8 @@ EXPORT_SYMBOL(drm_get_connector_name);
+ 
+ char *drm_get_connector_status_name(enum drm_connector_status status)
+ {
+-	if (status == connector_status_connected)
++	if (status == connector_status_connected ||
++	    status == connector_status_cached)
+ 		return "connected";
+ 	else if (status == connector_status_disconnected)
+ 		return "disconnected";



From walters at fedoraproject.org  Wed Sep  9 19:36:53 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed,  9 Sep 2009 19:36:53 +0000 (UTC)
Subject: rpms/gir-repository/devel gir-repository.spec,1.9,1.10
Message-ID: <20090909193653.AF1D611C00CE@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8314

Modified Files:
	gir-repository.spec 
Log Message:
* Wed Sep 09 2009 Colin Walters <walters at verbum.org> 0.6.5-1
- New upstream



Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gir-repository.spec	25 Aug 2009 16:01:45 -0000	1.9
+++ gir-repository.spec	9 Sep 2009 19:36:53 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gir-repository
-Version:        0.6.4
+Version:        0.6.5
 Release:        1%{?dist}
 Summary:        Introspection for GNOME libraries
 
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Sep 09 2009 Colin Walters <walters at verbum.org> 0.6.5-1
+- New upstream
+
 * Mon Aug 26 2009 Colin Walters <walters at verbum.org> 0.6.4-5
 - New upstream
 - Drop upstreamed patch



From nim at fedoraproject.org  Wed Sep  9 19:38:56 2009
From: nim at fedoraproject.org (nim)
Date: Wed,  9 Sep 2009 19:38:56 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/F-11
	gfs-philostratos-fonts-fontconfig.conf, NONE,
	1.1 gfs-philostratos-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909193856.5F66011C00CE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-philostratos-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10823/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gfs-philostratos-fonts-fontconfig.conf 
	gfs-philostratos-fonts.spec import.log 
Log Message:
initial import


--- NEW FILE gfs-philostratos-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>GFS Philostratos</family>
    </prefer>
  </alias>
  <alias>
    <family>GFS Philostratos</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gfs-philostratos-fonts.spec ---
%global fontname gfs-philostratos
%global fontconf 61-%{fontname}.conf

%global archivename GFS_PHILOSTRATOS

Name:    %{fontname}-fonts
Version: 20090902
Release: 1%{?dist}
Summary: A revival of the ?Griechische Antiqua? Greek typeface

Group:     User Interface/X
License:   OFL
URL:       http://www.greekfontsociety.gr/pages/en_typefaces19th.html
Source0:   http://www.greekfontsociety.gr/%{archivename}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
Griechische Antiqua was one of the historical Greek typefaces of the late 19th
and early 20th century. It was designed by ?aurice ?duard Pinder, a German
erudite artist and a member of the Academy of Science in Berlin. This is the
most popular version which has appeared from 1870 to 1940 in the German
speaking philological literature and in many classical and Byzantine editions
by publishers like Teubner (in Leipzig) and Weidmann (in Berlin) such as:
Anthology of Byzantine Melos by Wilhelm von Christ and Matthaios
Paranikas (Leipzig 1871), Epicurea, by Heinrich Usener (Leipzig 1887),
Mitrodorous by Alfred Koerte (Leipzig 1890), Pindar by Otto Schroeder (Leipzig
1908), ??? Aeschylus by U. von Wilamowitz-Moellendorff (Berlin 1910, 1915),
Bachylides by Bruno Snell (Leipzig, 1934),  The Vulgata by Alfred Rahlfs
(Stuttgart 1935), Suidas Lexicon by Ada Adler (Leipzig 1928-1938) etc.

E.J. Kenney lamented the abandonment of the type after the 2nd World War as a
great loss for Greek typography (?From Script to Print?, Greek Scripts: An
illustrated Introduction, Society for the Promotion of Hellenic Studies, 2001,
p. 69).

GFS Philostratos was digitized by George D. Matthiopoulos.


%prep
%setup -q -c -T
unzip -j -L -q %{SOURCE0}
chmod 0644 *.txt
for txt in *.txt ; do
   fold -s $txt > $txt.new
   sed -i 's/\r//' $txt.new
   touch -r $txt $txt.new
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.otf

%doc *.txt *.pdf


%changelog

* Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20090902-1
? initial packaging


--- NEW FILE import.log ---
gfs-philostratos-fonts-20090902-1_fc12:F-11:gfs-philostratos-fonts-20090902-1.fc12.src.rpm:1252525093


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:14:08 -0000	1.1
+++ .cvsignore	9 Sep 2009 19:38:55 -0000	1.2
@@ -0,0 +1 @@
+GFS_PHILOSTRATOS.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:14:08 -0000	1.1
+++ sources	9 Sep 2009 19:38:56 -0000	1.2
@@ -0,0 +1 @@
+81dedf8a53a2b0404a097c9504ebe19b  GFS_PHILOSTRATOS.zip



From mclasen at fedoraproject.org  Wed Sep  9 19:42:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 19:42:13 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.248,1.249
Message-ID: <20090909194213.C2B8911C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12731

Modified Files:
	gnome-session.spec 
Log Message:
2.27.92



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- gnome-session.spec	9 Sep 2009 05:00:39 -0000	1.248
+++ gnome-session.spec	9 Sep 2009 19:42:12 -0000	1.249
@@ -61,6 +61,7 @@ BuildRequires: libX11-devel libXt-devel
 BuildRequires: libXtst-devel
 BuildRequires: xmlto
 BuildRequires: DeviceKit-power-devel
+BuildRequires: gnome-common
 
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}



From rdieter at fedoraproject.org  Wed Sep  9 19:42:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Sep 2009 19:42:42 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.98,1.99
Message-ID: <20090909194242.7106F11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13092

Modified Files:
	kipi-plugins.spec 
Log Message:
upstreamed patches



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kipi-plugins.spec	9 Sep 2009 19:07:15 -0000	1.98
+++ kipi-plugins.spec	9 Sep 2009 19:42:41 -0000	1.99
@@ -11,9 +11,9 @@ Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: kipi-plugins-0.4.0-dt_validation.patch
-Patch51: kipi-plugins-0.6.0-s390x.patch
+## upstreamed patches
+Patch100: kipi-plugins-0.4.0-dt_validation.patch
+Patch101: kipi-plugins-0.6.0-s390x.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
@@ -74,8 +74,8 @@ PrintWizard        : print images in var
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch50 -p1 -b .dt_validation
-%patch51 -p1 -b .s390x
+%patch100 -p1 -b .dt_validation
+%patch101 -p1 -b .s390x
 
 
 %build



From rcritten at fedoraproject.org  Wed Sep  9 19:48:20 2009
From: rcritten at fedoraproject.org (rcritten)
Date: Wed,  9 Sep 2009 19:48:20 +0000 (UTC)
Subject: rpms/ipa/F-11 .cvsignore, 1.6, 1.7 ipa.spec, 1.23, 1.24 sources,
	1.11, 
	1.12 freeipa-cherrypy.patch, 1.1, NONE freeipa-delegation.patch,
	1.1, NONE freeipa-selinux.patch, 1.1,
	NONE freeipa-webui-logging.patch, 1.1, NONE
Message-ID: <20090909194820.B546511C00CE@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/ipa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16648

Modified Files:
	.cvsignore ipa.spec sources 
Removed Files:
	freeipa-cherrypy.patch freeipa-delegation.patch 
	freeipa-selinux.patch freeipa-webui-logging.patch 
Log Message:
- New upstream release 1.2.2
- Own /etc/httpd/conf.d/ipa-*.conf as config files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Dec 2008 19:00:42 -0000	1.6
+++ .cvsignore	9 Sep 2009 19:48:17 -0000	1.7
@@ -1 +1 @@
-freeipa-1.2.1.tar.gz
+freeipa-1.2.2.tar.gz


Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-11/ipa.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ipa.spec	18 Jun 2009 20:25:02 -0000	1.23
+++ ipa.spec	9 Sep 2009 19:48:18 -0000	1.24
@@ -5,8 +5,8 @@
 %define POLICYCOREUTILSVER 1.33.12-1
 
 Name:           ipa
-Version:        1.2.1
-Release:        5%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -35,11 +35,6 @@ BuildRequires:  m4
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  TurboGears
 
-Patch0: freeipa-delegation.patch
-Patch1: freeipa-selinux.patch
-Patch2: freeipa-cherrypy.patch
-Patch3: freeipa-webui-logging.patch
-
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
 user, virtual machines, groups, authentication credentials), Policy
@@ -198,11 +193,6 @@ administering radius authentication sett
 %prep
 %setup -n freeipa-%{version} -q
 
-%patch0 -p1 -b .delegation
-%patch1 -p1 -b .selinux
-%patch2 -p1 -b .cherrypy
-%patch3 -p1 -b .webui-logging
-
 %build
 export CFLAGS="$CFLAGS %{optflags}"
 export CPPFLAGS="$CPPFLAGS %{optflags}"
@@ -240,6 +230,11 @@ ln -s ../../../..%{_sysconfdir}/ipa/html
 ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
     %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
 
+# So we can own our Apache configuration
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa.conf
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
+
 %clean
 rm -rf %{buildroot}
 
@@ -342,6 +337,8 @@ fi
 %dir %{_usr}/share/ipa/html
 %{_usr}/share/ipa/html/ssbrowser.html
 %{_usr}/share/ipa/html/unauthorized.html
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
@@ -475,6 +472,10 @@ fi
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Thu Sep  3 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.2-1
+- New upstream release 1.2.2
+- Own /etc/httpd/conf.d/ipa-*.conf as config files
+
 * Thu Jun 18 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.1-5
 - Resolves BZ 505686, workaround if both python-cherrypy and
   python-cherrypy2 are loaded.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Dec 2008 19:00:42 -0000	1.11
+++ sources	9 Sep 2009 19:48:18 -0000	1.12
@@ -1 +1 @@
-e934709fe92a41696ca4dd341ea9066d  freeipa-1.2.1.tar.gz
+aec42d3e5228301f7d16e2b068421ec8  freeipa-1.2.2.tar.gz


--- freeipa-cherrypy.patch DELETED ---


--- freeipa-delegation.patch DELETED ---


--- freeipa-selinux.patch DELETED ---


--- freeipa-webui-logging.patch DELETED ---



From cwickert at fedoraproject.org  Wed Sep  9 19:49:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 19:49:56 +0000 (UTC)
Subject: rpms/xfce4-quicklauncher-plugin/devel
	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin-1.9.4-save-settings.patch, NONE, 
	1.1 xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin.spec, 1.16, 1.17
Message-ID: <20090909194956.930D211C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17892

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Added Files:
	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch 
	xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch 
	xfce4-quicklauncher-plugin-1.9.4-save-settings.patch 
	xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
- Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
- Apply settings without restarting the plugin (bugzilla.xfce.org #3782)
- Add missing english translation (bugzilla.xfce.org #3783)
- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)


xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch:
 configure |    2 -
 po/en.po  |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
--- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
+++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
@@ -21181,7 +21181,7 @@
 
 
 
-    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
+    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
 
 
 for ac_header in locale.h
diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
--- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
+++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
@@ -0,0 +1,87 @@
+# English translation of xfce4-quicklauncher-plugin.
+# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
+# Jeff Bailes <thepizzaking at gmail.com>, 2007.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-quicklauncher-plugin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-17 21:37+0200\n"
+"PO-Revision-Date: 2007-03-31 10:17+1000\n"
+"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: ../panel-plugin/callbacks.c:79
+msgid "Configure Quicklauncher"
+msgstr "Configure Quicklauncher"
+
+#: ../panel-plugin/callbacks.c:93
+msgid "Lines: "
+msgstr "Lines: "
+
+#: ../panel-plugin/callbacks.c:123
+msgid "Espace entre les lanceurs :"
+msgstr "Space between launchers"
+
+#: ../panel-plugin/callbacks.c:131
+msgid "afficher les tooltips"
+msgstr "Show tooltips"
+
+#: ../panel-plugin/callbacks.c:135
+msgid "afficher les labels"
+msgstr "Show labels"
+
+#: ../panel-plugin/callbacks.c:216
+msgid "icone"
+msgstr "icon"
+
+#: ../panel-plugin/callbacks.c:222
+msgid "commande"
+msgstr "command"
+
+#: ../panel-plugin/callbacks.c:228
+msgid "nom"
+msgstr "name"
+
+#: ../panel-plugin/callbacks.c:327
+msgid "Open icon"
+msgstr "Open icon"
+
+#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
+msgid "Quicklauncher"
+msgstr "Quicklauncher"
+
+#: ../panel-plugin/main.c:166
+msgid "Allows you to add launchers easily and display them on many lines."
+msgstr "Allows you to add launchers easily and display them on many lines."
+
+#: ../panel-plugin/main.c:168
+msgid "Other plugins available here"
+msgstr "Other plugins available here"
+
+#: ../panel-plugin/main.c:320
+msgid "Lock"
+msgstr "Lock"
+
+#: ../panel-plugin/main.c:323
+msgid "Parameters"
+msgstr "Parameters"
+
+#: ../panel-plugin/main.c:326
+msgid "Applications"
+msgstr "Applications"
+
+#: ../panel-plugin/main.c:329
+msgid "Help"
+msgstr "Help"
+
+#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
+msgid "Program with several launchers"
+msgstr "Program with several launchers"
+

xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch ---
--- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
+++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
@@ -148,6 +148,7 @@
 	t_qck_launcher_opt_dlg* dlg;
 	xfce_panel_plugin_block_menu(plugin);
 	dlg = create_qck_launcher_dlg();
+        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
 	xfce_panel_plugin_unblock_menu(plugin);
@@ -160,6 +161,7 @@
 	GtkWidget *about;
 	const gchar* authors[2] = {"Bountykiller <masse_nicolas at yahoo.fr>", NULL};
 	about = gtk_about_dialog_new();
+        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
@@ -461,7 +463,7 @@
 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
 		{
 			g_return_val_if_fail(launcher->clicked_img, FALSE);
-			xfce_exec(launcher->command, FALSE, FALSE, NULL);
+			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
 		}
 		else

xfce4-quicklauncher-plugin-1.9.4-save-settings.patch:
 main.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-save-settings.patch ---
Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(r?vision 3779)
+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(r?vision 3780)
@@ -151,6 +151,7 @@
         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
+	quicklauncher_save(plugin, quicklauncher);
 	xfce_panel_plugin_unblock_menu(plugin);
 }
 

xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch ---
--- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
+++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
@@ -320,7 +320,7 @@
 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
 							NULL, quicklauncher);
 	quicklauncher_add_element(quicklauncher, launcher);
-	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
+	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
 							NULL, quicklauncher);
 	quicklauncher_add_element(quicklauncher, launcher);
 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/devel/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xfce4-quicklauncher-plugin.spec	27 Jul 2009 07:55:11 -0000	1.16
+++ xfce4-quicklauncher-plugin.spec	9 Sep 2009 19:49:55 -0000	1.17
@@ -1,18 +1,30 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	1.9.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://www.xfce.org/archive/src/panel-plugins/%{name}/1.9/%{name}-%{version}.tar.bz2
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=505165
 # reported to upstream at http://bugzilla.xfce.org/show_bug.cgi?id=5455
 Patch0:		%{name}-1.9.2-multilib.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=509294
 # upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=3540
 Patch1:		%{name}-1.9.4-desktop-file.patch
+# make new apps appear on the correct X screen
+# http://bugzilla.xfce.org/show_bug.cgi?id=4323
+Patch2:		%{name}-1.9.4-fix-multiscreen.patch
+# apply settings without restart
+# http://bugzilla.xfce.org/show_bug.cgi?id=3782
+Patch3:		%{name}-1.9.4-save-settings.patch
+# plugin speaks french if no translations are found
+# http://bugzilla.xfce.org/show_bug.cgi?id=3783
+Patch4:		%{name}-1.9.4-fix-missing-english-translation.patch
+# Xfce 4.6: xfce-setting-show instead of xfce4-settings-manager
+# http://bugzilla.xfce.org/show_bug.cgi?id=5752
+Patch5:		%{name}-1.9.4-xfce4-settings-manager.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -27,6 +39,12 @@ them on several lines.
 %setup -q
 %patch0 -b .multilib
 %patch1 -b .path
+%patch2 -b .multiscreen
+%patch3 -p1 -b .settings
+%patch4 -p1 -b .french
+%if 0%{?fedora} >= 11
+%patch5 -b .xfce46
+%endif
 
 %build
 %configure --disable-static
@@ -48,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
+- Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
+- Apply settings without restarting the plugin (bugzilla.xfce.org #3782)
+- Add missing english translation (bugzilla.xfce.org #3783)
+- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Wed Sep  9 19:51:30 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  9 Sep 2009 19:51:30 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.6, 1.7 grubby.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090909195130.D43D611C00CE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19017

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.4-1
- Add --dracut cmdline argument for %post generation of dracut initrd



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Aug 2009 11:00:30 -0000	1.6
+++ .cvsignore	9 Sep 2009 19:51:30 -0000	1.7
@@ -1 +1 @@
-grubby-7.0.3.tar.bz2
+grubby-7.0.4.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- grubby.spec	26 Aug 2009 09:53:04 -0000	1.5
+++ grubby.spec	9 Sep 2009 19:51:30 -0000	1.6
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.3
+Version: 7.0.4
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.4-1
+- Add --dracut cmdline argument for %post generation of dracut initrd
+
 * Wed Aug 26 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.3-1
 - Silence error when no /etc/sysconfig/keyboard (#517187)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Aug 2009 11:00:31 -0000	1.6
+++ sources	9 Sep 2009 19:51:30 -0000	1.7
@@ -1 +1 @@
-eea903d7d143a33d6801fbf4d393f4f9  grubby-7.0.3.tar.bz2
+39635ced8c1ebf17f67bef323e839187  grubby-7.0.4.tar.bz2



From notting at fedoraproject.org  Wed Sep  9 19:51:22 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Sep 2009 19:51:22 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-python-error.patch, 1.2,
	1.3 deltarpm.spec, 1.28, 1.29
Message-ID: <20090909195122.DA5B311C00CE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18836

Modified Files:
	deltarpm-python-error.patch deltarpm.spec 
Log Message:
Don't leak fds.


deltarpm-python-error.patch:
 deltarpmmodule.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Index: deltarpm-python-error.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm-python-error.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- deltarpm-python-error.patch	9 Sep 2009 19:08:42 -0000	1.2
+++ deltarpm-python-error.patch	9 Sep 2009 19:51:22 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up deltarpm-git-20090831.1/deltarpmmodule.c.foo deltarpm-git-20090831.1/deltarpmmodule.c
---- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-09-09 13:28:37.000000000 -0400
-+++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 15:03:20.000000000 -0400
+--- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-08-31 10:17:34.000000000 -0400
++++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 15:44:49.000000000 -0400
 @@ -66,13 +66,17 @@ static PyObject *doRead(PyObject *s, PyO
    int pid;
    int ipcpipe[2];
@@ -21,12 +21,15 @@ diff -up deltarpm-git-20090831.1/deltarp
  
    if ((pid = fork())) {
      FILE *readend = fdopen(ipcpipe[0], "r");
-@@ -90,7 +94,7 @@ static PyObject *doRead(PyObject *s, PyO
+@@ -90,8 +94,10 @@ static PyObject *doRead(PyObject *s, PyO
  
      readdeltarpm(filename, &d, NULL);
      PyMarshal_WriteObjectToFile(createDict(d), writend, Py_MARSHAL_VERSION);
 -    exit(0);
++    fclose(writend);
 +    _exit(0);
    }
++  close(ipcpipe[1]);
    return ret;
  }
+ 


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- deltarpm.spec	9 Sep 2009 19:08:42 -0000	1.28
+++ deltarpm.spec	9 Sep 2009 19:51:22 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1.2%{?dist}
+Release: 0.git.20090831.1.3%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -98,8 +98,11 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
-* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.2
-- fix python bindings
+* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.3
+- fix python bindings to:
+  - call _exit(), not exit()
+  - properly pythonize errors
+  - not leak file descriptors
 
 * Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1
 - Add python bindings sub-package



From jwrdegoede at fedoraproject.org  Wed Sep  9 20:00:41 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  9 Sep 2009 20:00:41 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1784,1.1785
Message-ID: <20090909200041.BF46111C02C8@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28084

Modified Files:
	kernel.spec 
Log Message:
* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com>
- Move to %post generation of dracut initrd, because of GPL issues surrounding
  shipping a prebuild initrd
- Require grubby >= 7.0.4-1, for %post generation



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1784
retrieving revision 1.1785
diff -u -p -r1.1784 -r1.1785
--- kernel.spec	9 Sep 2009 19:24:26 -0000	1.1784
+++ kernel.spec	9 Sep 2009 20:00:41 -0000	1.1785
@@ -100,7 +100,7 @@ Summary: The Linux kernel
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
-# dracut initrd-generic
+# Use dracut instead of mkinitrd for initrd image generation
 %define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
 
 # Build the kernel-doc package, but don't fail the build if it botches.
@@ -430,7 +430,12 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.2-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
+%if %{with_dracut}
+%define initrd_prereq  dracut-kernel >= 001-7
+%else
+%define initrd_prereq  mkinitrd >= 6.0.61-1
+%endif
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -446,6 +451,7 @@ Provides: kernel-drm-nouveau = 15\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
+Requires(pre): %{initrd_prereq}\
 Requires(post): /sbin/new-kernel-pkg\
 Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
@@ -496,14 +502,6 @@ BuildRequires: sparse >= 0.4.1
 %if %{with_perftool}
 BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel
 %endif
-%if %{with_dracut}
-BuildRequires: dracut-kernel >= 0.7
-BuildRequires: dracut-generic >= 0.7
-%endif
-# For dracut image generation, cannot go in dracut package as its arch specific
-%ifnarch s390 s390x
-BuildRequires: kbd
-%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -1785,26 +1783,6 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
 %endif
 
-%if %{with_dracut}
-%if !%{with_firmware}
-# dracut needs the firmware files
-    %{build_firmware}
-%endif
-    for i in $RPM_BUILD_ROOT/lib/modules/*; do
-	[ -d $i ] || continue
-	KernelVer=${i##$RPM_BUILD_ROOT/lib/modules/}
-        depmod -b $RPM_BUILD_ROOT $KernelVer
-    	dracut  --strip \
-	    --fwdir $RPM_BUILD_ROOT/lib/firmware:/lib/firmware \
-            -k $i $RPM_BUILD_ROOT/boot/initrd-generic-${KernelVer}.img $KernelVer
-	rm -fr $i/modules.dep
-    done
-%if !%{with_firmware}
-# remove the firmware files, if ! with_firmware
-    rm -fr $RPM_BUILD_ROOT/lib/firmware
-%endif
-%endif
-
 
 ###
 ### clean
@@ -1861,7 +1839,7 @@ if [ `uname -i` == "x86_64" -o `uname -i
 fi}\
 %{expand:\
 %if %{with_dracut}\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --depmod --add-dracut-args --initrdfile=/boot/initrd-generic-%{KVERREL}%{?-v:.%{-v*}}.img --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %else\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %endif}\
@@ -1984,9 +1962,10 @@ fi
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %if %{with_dracut}\
-/boot/initrd-generic-%{KVERREL}%{?2:.%{2}}.img\
+%ghost /boot/dracut-%{KVERREL}%{?2:.%{2}}.img\
+%else\
+%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
@@ -2027,6 +2006,11 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com>
+- Move to %%post generation of dracut initrd, because of GPL issues surrounding
+  shipping a prebuild initrd
+- Require grubby >= 7.0.4-1, for %%post generation
+
 * Wed Sep  9 2009 Steve Dickson <steved at redhat.com>
 - Updated the NFS4 pseudo root code to the latest release.
 



From orion at fedoraproject.org  Wed Sep  9 20:01:03 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  9 Sep 2009 20:01:03 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.53,1.54
Message-ID: <20090909200103.79A0C11C00CE@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28216

Modified Files:
	perl-PDL.spec 
Log Message:
* Wed Sep 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-3
- Don't strip out PLplot version so that plplot can detect it



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- perl-PDL.spec	9 Sep 2009 18:18:52 -0000	1.53
+++ perl-PDL.spec	9 Sep 2009 20:01:03 -0000	1.54
@@ -2,7 +2,7 @@
 
 Name:           perl-PDL
 Version:        2.4.4_05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -56,6 +56,8 @@ such commercial packages as IDL and MatL
 # Use newer plplot.pd
 cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/plplot.pd Graphics/PLplot/plplot.pd
 cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/t/plplot.t t/plplot.t
+# Strip separate version informaion
+sed -i -e '/^\$VERSION =/d' Graphics/PLplot/plplot.pd
 %patch0 -p1 -b .settings
 %patch1 -p1
 %patch2 -p1 -b .cleanup
@@ -149,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-4
+- No, we really need to strip out the PLplot version so it can load
+
 * Wed Sep 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-3
 - Don't strip out PLplot version so that plplot can detect it
 



From rcritten at fedoraproject.org  Wed Sep  9 20:02:47 2009
From: rcritten at fedoraproject.org (rcritten)
Date: Wed,  9 Sep 2009 20:02:47 +0000 (UTC)
Subject: rpms/ipa/F-10 .cvsignore, 1.6, 1.7 ipa.spec, 1.20, 1.21 sources,
	1.11, 
	1.12 freeipa-cherrypy.patch, 1.1, NONE freeipa-delegation.patch,
	1.1, NONE freeipa-webui-logging.patch, 1.1, NONE
Message-ID: <20090909200247.A81B911C00CE@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/ipa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28876

Modified Files:
	.cvsignore ipa.spec sources 
Removed Files:
	freeipa-cherrypy.patch freeipa-delegation.patch 
	freeipa-webui-logging.patch 
Log Message:
- New upstream release 1.2.2
- Own /etc/httpd/conf.d/ipa-*.conf as config files
- Change SELinux BuildRequires to just the Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Dec 2008 20:42:42 -0000	1.6
+++ .cvsignore	9 Sep 2009 20:02:47 -0000	1.7
@@ -1 +1 @@
-freeipa-1.2.1.tar.gz
+freeipa-1.2.2.tar.gz


Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-10/ipa.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ipa.spec	18 Jun 2009 20:46:09 -0000	1.20
+++ ipa.spec	9 Sep 2009 20:02:47 -0000	1.21
@@ -5,8 +5,8 @@
 %define POLICYCOREUTILSVER 1.33.12-1
 
 Name:           ipa
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -30,15 +30,11 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  popt-devel
-BuildRequires:  selinux-policy-devel
+BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  m4
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  TurboGears
 
-Patch0: freeipa-delegation.patch
-Patch1: freeipa-cherrypy.patch
-Patch2: freeipa-webui-logging.patch
-
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
 user, virtual machines, groups, authentication credentials), Policy
@@ -197,10 +193,6 @@ administering radius authentication sett
 %prep
 %setup -n freeipa-%{version} -q
 
-%patch0 -p1 -b .delegation
-%patch1 -p1 -b .cherrypy
-%patch2 -p1 -b .webui-logging
-
 %build
 export CFLAGS="$CFLAGS %{optflags}"
 export CPPFLAGS="$CPPFLAGS %{optflags}"
@@ -238,6 +230,11 @@ ln -s ../../../..%{_sysconfdir}/ipa/html
 ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
     %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
 
+# So we can own our Apache configuration
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa.conf
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
+
 %clean
 rm -rf %{buildroot}
 
@@ -340,6 +337,8 @@ fi
 %dir %{_usr}/share/ipa/html
 %{_usr}/share/ipa/html/ssbrowser.html
 %{_usr}/share/ipa/html/unauthorized.html
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
@@ -473,6 +472,11 @@ fi
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed Sep  9 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.2-1
+- New upstream release 1.2.2
+- Own /etc/httpd/conf.d/ipa-*.conf as config files
+- Change SELinux BuildRequires to just the Makefile
+
 * Thu Jun 18 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.1-2
 - Resolves BZ 505686, workaround if both python-cherrypy and
   python-cherrypy2 are loaded.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Dec 2008 20:42:42 -0000	1.11
+++ sources	9 Sep 2009 20:02:47 -0000	1.12
@@ -1 +1 @@
-e934709fe92a41696ca4dd341ea9066d  freeipa-1.2.1.tar.gz
+aec42d3e5228301f7d16e2b068421ec8  freeipa-1.2.2.tar.gz


--- freeipa-cherrypy.patch DELETED ---


--- freeipa-delegation.patch DELETED ---


--- freeipa-webui-logging.patch DELETED ---



From cwickert at fedoraproject.org  Wed Sep  9 20:03:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 20:03:05 +0000 (UTC)
Subject: rpms/xfce4-quicklauncher-plugin/F-11
	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin-1.9.4-save-settings.patch, NONE, 
	1.1 xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin.spec, 1.15, 1.16
Message-ID: <20090909200305.9ACBA11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29088

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Added Files:
	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch 
	xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch 
	xfce4-quicklauncher-plugin-1.9.4-save-settings.patch 
	xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
- Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
- Apply settings without restarting the plugin (bugzilla.xfce.org #3782)
- Add missing english translation (bugzilla.xfce.org #3783)
- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)


xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch:
 configure |    2 -
 po/en.po  |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
--- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
+++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
@@ -21181,7 +21181,7 @@
 
 
 
-    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
+    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
 
 
 for ac_header in locale.h
diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
--- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
+++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
@@ -0,0 +1,87 @@
+# English translation of xfce4-quicklauncher-plugin.
+# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
+# Jeff Bailes <thepizzaking at gmail.com>, 2007.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-quicklauncher-plugin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-17 21:37+0200\n"
+"PO-Revision-Date: 2007-03-31 10:17+1000\n"
+"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: ../panel-plugin/callbacks.c:79
+msgid "Configure Quicklauncher"
+msgstr "Configure Quicklauncher"
+
+#: ../panel-plugin/callbacks.c:93
+msgid "Lines: "
+msgstr "Lines: "
+
+#: ../panel-plugin/callbacks.c:123
+msgid "Espace entre les lanceurs :"
+msgstr "Space between launchers"
+
+#: ../panel-plugin/callbacks.c:131
+msgid "afficher les tooltips"
+msgstr "Show tooltips"
+
+#: ../panel-plugin/callbacks.c:135
+msgid "afficher les labels"
+msgstr "Show labels"
+
+#: ../panel-plugin/callbacks.c:216
+msgid "icone"
+msgstr "icon"
+
+#: ../panel-plugin/callbacks.c:222
+msgid "commande"
+msgstr "command"
+
+#: ../panel-plugin/callbacks.c:228
+msgid "nom"
+msgstr "name"
+
+#: ../panel-plugin/callbacks.c:327
+msgid "Open icon"
+msgstr "Open icon"
+
+#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
+msgid "Quicklauncher"
+msgstr "Quicklauncher"
+
+#: ../panel-plugin/main.c:166
+msgid "Allows you to add launchers easily and display them on many lines."
+msgstr "Allows you to add launchers easily and display them on many lines."
+
+#: ../panel-plugin/main.c:168
+msgid "Other plugins available here"
+msgstr "Other plugins available here"
+
+#: ../panel-plugin/main.c:320
+msgid "Lock"
+msgstr "Lock"
+
+#: ../panel-plugin/main.c:323
+msgid "Parameters"
+msgstr "Parameters"
+
+#: ../panel-plugin/main.c:326
+msgid "Applications"
+msgstr "Applications"
+
+#: ../panel-plugin/main.c:329
+msgid "Help"
+msgstr "Help"
+
+#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
+msgid "Program with several launchers"
+msgstr "Program with several launchers"
+

xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch ---
--- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
+++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
@@ -148,6 +148,7 @@
 	t_qck_launcher_opt_dlg* dlg;
 	xfce_panel_plugin_block_menu(plugin);
 	dlg = create_qck_launcher_dlg();
+        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
 	xfce_panel_plugin_unblock_menu(plugin);
@@ -160,6 +161,7 @@
 	GtkWidget *about;
 	const gchar* authors[2] = {"Bountykiller <masse_nicolas at yahoo.fr>", NULL};
 	about = gtk_about_dialog_new();
+        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
@@ -461,7 +463,7 @@
 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
 		{
 			g_return_val_if_fail(launcher->clicked_img, FALSE);
-			xfce_exec(launcher->command, FALSE, FALSE, NULL);
+			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
 		}
 		else

xfce4-quicklauncher-plugin-1.9.4-save-settings.patch:
 main.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-save-settings.patch ---
Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(r?vision 3779)
+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(r?vision 3780)
@@ -151,6 +151,7 @@
         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
+	quicklauncher_save(plugin, quicklauncher);
 	xfce_panel_plugin_unblock_menu(plugin);
 }
 

xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch ---
--- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
+++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
@@ -320,7 +320,7 @@
 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
 							NULL, quicklauncher);
 	quicklauncher_add_element(quicklauncher, launcher);
-	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
+	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
 							NULL, quicklauncher);
 	quicklauncher_add_element(quicklauncher, launcher);
 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/F-11/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xfce4-quicklauncher-plugin.spec	3 Jul 2009 23:07:31 -0000	1.15
+++ xfce4-quicklauncher-plugin.spec	9 Sep 2009 20:03:05 -0000	1.16
@@ -1,18 +1,30 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	1.9.4
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://www.xfce.org/archive/src/panel-plugins/%{name}/1.9/%{name}-%{version}.tar.bz2
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=505165
 # reported to upstream at http://bugzilla.xfce.org/show_bug.cgi?id=5455
 Patch0:		%{name}-1.9.2-multilib.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=509294
 # upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=3540
 Patch1:		%{name}-1.9.4-desktop-file.patch
+# make new apps appear on the correct X screen
+# http://bugzilla.xfce.org/show_bug.cgi?id=4323
+Patch2:		%{name}-1.9.4-fix-multiscreen.patch
+# apply settings without restart
+# http://bugzilla.xfce.org/show_bug.cgi?id=3782
+Patch3:		%{name}-1.9.4-save-settings.patch
+# plugin speaks french if no translations are found
+# http://bugzilla.xfce.org/show_bug.cgi?id=3783
+Patch4:		%{name}-1.9.4-fix-missing-english-translation.patch
+# Xfce 4.6: xfce-setting-show instead of xfce4-settings-manager
+# http://bugzilla.xfce.org/show_bug.cgi?id=5752
+Patch5:		%{name}-1.9.4-xfce4-settings-manager.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -27,6 +39,12 @@ them on several lines.
 %setup -q
 %patch0 -b .multilib
 %patch1 -b .path
+%patch2 -b .multiscreen
+%patch3 -p1 -b .settings
+%patch4 -p1 -b .french
+%if 0%{?fedora} >= 11
+%patch5 -b .xfce46
+%endif
 
 %build
 %configure --disable-static
@@ -48,6 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
+- Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
+- Apply settings without restarting the plugin (bugzilla.xfce.org #3782)
+- Add missing english translation (bugzilla.xfce.org #3783)
+- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-5
 - Fix path in desktop file (#509294)
 



From mclasen at fedoraproject.org  Wed Sep  9 20:07:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 20:07:40 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.249,1.250
Message-ID: <20090909200740.D96DA11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv327

Modified Files:
	gnome-session.spec 
Log Message:
fix spec



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- gnome-session.spec	9 Sep 2009 19:42:12 -0000	1.249
+++ gnome-session.spec	9 Sep 2009 20:07:40 -0000	1.250
@@ -113,9 +113,6 @@ install -m 644 %{SOURCE2} ${RPM_BUILD_RO
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 
-## remove splash screen
-rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
-
 cp AUTHORS COPYING NEWS README $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %find_lang %{po_package}



From kwizart at fedoraproject.org  Wed Sep  9 20:10:45 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed,  9 Sep 2009 20:10:45 +0000 (UTC)
Subject: rpms/libvdpau/devel import.log, NONE, 1.1 libvdpau.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909201045.9585311C043D@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv927/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libvdpau.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
libvdpau-0_1-0_6_20090902git_fc11:HEAD:libvdpau-0.1-0.6.20090902git.fc11.src.rpm:1252526863


--- NEW FILE libvdpau.spec ---
%global gitdate 20090902git
%global gitref 46e791147ac43ecd2fbfbc6bdf3bebda9030b51e

Name:           libvdpau
Version:        0.1
Release:        0.6.%{?gitdate}%{?dist}
Summary:        Wrapper library for the Video Decode and Presentation API

Group:          System Environment/Libraries
License:        MIT
URL:            http://freedesktop.org/wiki/Software/VDPAU
Source0:        http://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-%{gitref}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool

%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch:  i686 x86_64
%else %if 0%{?fedora} == 11
ExclusiveArch:  i586 x86_64
%else
ExclusiveArch:  i386 x86_64
%endif
BuildRequires:  libX11-devel


%description
VDPAU is the Video Decode and Presentation API for UNIX. 
It provides an interface to video decode acceleration and presentation
hardware present in modern GPUs.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libX11-devel
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{name}-%{gitref}


autoreconf -vif 

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/*.so.*
%{_libdir}/libvdpau_trace.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/vdpau/
%{_libdir}/libvdpau.so
%{_libdir}/pkgconfig/vdpau.pc

%changelog
* Mon Sep  7 2009 kwizart < kwizart at gmail.com > - 0.1-0.6.20090904git
- Update to gitdate 20090904git

* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 0.1-0.5git20090902
- Update to gitdate 20090902 with merged patches

* Mon Jun 15 2009 kwizart < kwizart at gmail.com > - 0.1-0.3git20090318
- Add missing -ldl at link time

* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.1-0.2git20090318
- Backport fix thread_2

* Fri Mar  6 2009 kwizart < kwizart at gmail.com > - 0.1-0.1git20090318
- Initial spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:07:17 -0000	1.1
+++ .cvsignore	9 Sep 2009 20:10:45 -0000	1.2
@@ -0,0 +1 @@
+libvdpau-46e791147ac43ecd2fbfbc6bdf3bebda9030b51e.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:07:17 -0000	1.1
+++ sources	9 Sep 2009 20:10:45 -0000	1.2
@@ -0,0 +1 @@
+a7bc00895d55b654d54220cac352c2fe  libvdpau-46e791147ac43ecd2fbfbc6bdf3bebda9030b51e.tar.bz2



From karsten at fedoraproject.org  Wed Sep  9 20:11:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  9 Sep 2009 20:11:43 +0000 (UTC)
Subject: rpms/dcbd/devel dcbd.spec,1.5,1.6
Message-ID: <20090909201143.5EAE311C00CE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3695

Modified Files:
	dcbd.spec 
Log Message:
- buildrequire libconfig-devel >= 1.3.2, it doesn't build with 1.3.1 due to
  the different config_lookup_string api



Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dcbd.spec	20 Aug 2009 12:26:41 -0000	1.5
+++ dcbd.spec	9 Sep 2009 20:11:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           dcbd
 Version:        0.9.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
@@ -14,7 +14,7 @@ Patch3:         dcbd-0.9.15-lookup-strin
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kernel >= 2.6.31
-BuildRequires:  libconfig-devel kernel-headers >= 2.6.31
+BuildRequires:  libconfig-devel >= 1.3.2 kernel-headers >= 2.6.31
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -92,6 +92,10 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.9.15-4
+- buildrequire libconfig-devel >= 1.3.2, it doesn't build with 1.3.1 due to
+  the different config_lookup_string api
+
 * Thu Aug 20 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-3
 - update of config_lookup_string() function calls
 



From nhorman at fedoraproject.org  Wed Sep  9 20:15:40 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Wed,  9 Sep 2009 20:15:40 +0000 (UTC)
Subject: rpms/irqbalance/devel irqbalance.spec,1.64,1.65
Message-ID: <20090909201540.66EE811C00CE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5578

Modified Files:
	irqbalance.spec 
Log Message:
Fixing buildrequires


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- irqbalance.spec	4 Sep 2009 15:54:13 -0000	1.64
+++ irqbalance.spec	9 Sep 2009 20:15:39 -0000	1.65
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon
 Name:           irqbalance
 Version:        0.55
-Release:	24%{?dist}
+Release:	25%{?dist}
 Epoch:		2
 Group:          System Environment/Base
 License:        GPLv2
@@ -11,14 +11,14 @@ Source1:	irqbalance.init
 Source2:	irqbalance.sysconfig
 Source3:	irqbalance.1
 Buildroot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	autoconf automake libtool
+BuildRequires:	autoconf automake libtool libcap-ng
 Requires(post):	chkconfig
 Requires(postun):chkconfig
 Requires(preun):chkconfig
 
 ExclusiveArch:	%{ix86} x86_64 ia64 ppc ppc64
 Obsoletes:	kernel-utils
-BuildRequires:	glib2-devel pkgconfig imake
+BuildRequires:	glib2-devel pkgconfig imake libcap-ng-devel
 
 Patch0: irqbalance-pie.patch
 Patch1: irqbalance-0.55-cputree-parse.patch
@@ -82,6 +82,9 @@ exit 0
 
 
 %changelog
+* Wed Sep 09 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-25
+- Fixing BuildRequires
+
 * Fri Sep 04 2009 Neil Horman <nhorman at redhat.com> - 2:0.55-24
 - Fixing irqbalance initscript (bz 521246)
 



From walters at fedoraproject.org  Wed Sep  9 20:16:27 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed,  9 Sep 2009 20:16:27 +0000 (UTC)
Subject: rpms/gir-repository/devel .cvsignore, 1.5, 1.6 gir-repository.spec, 
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090909201627.46A7811C00CE@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5893

Modified Files:
	.cvsignore gir-repository.spec sources 
Log Message:
* Wed Sep 09 2009 Colin Walters <walters at verbum.org> - 0.6.5-2
- rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:01:45 -0000	1.5
+++ .cvsignore	9 Sep 2009 20:16:27 -0000	1.6
@@ -1 +1 @@
-gir-repository-0.6.4.tar.gz
+gir-repository-0.6.5.tar.gz


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gir-repository.spec	9 Sep 2009 19:36:53 -0000	1.10
+++ gir-repository.spec	9 Sep 2009 20:16:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gir-repository
 Version:        0.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Sep 09 2009 Colin Walters <walters at verbum.org> - 0.6.5-2
+- rebuilt
+
 * Wed Sep 09 2009 Colin Walters <walters at verbum.org> 0.6.5-1
 - New upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 16:01:45 -0000	1.5
+++ sources	9 Sep 2009 20:16:27 -0000	1.6
@@ -1 +1 @@
-7a8b96cfcbeaf15250822c4e5574775c  gir-repository-0.6.4.tar.gz
+817437694ac7bd0b240a4952a648991e  gir-repository-0.6.5.tar.gz



From victorv at fedoraproject.org  Wed Sep  9 20:22:35 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed,  9 Sep 2009 20:22:35 +0000 (UTC)
Subject: rpms/netbeans-platform/devel netbeans-platform-6.7.1-launcher.patch,
	NONE, 1.1 import.log, 1.2, 1.3 netbeans-platform.spec, 1.5, 1.6
Message-ID: <20090909202235.9BD3111C00CE@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7033/devel

Modified Files:
	import.log netbeans-platform.spec 
Added Files:
	netbeans-platform-6.7.1-launcher.patch 
Log Message:
* The Patch3 for the platform launcher is added.
* Remove javadoc zip archives from the package.
* Cosmetics in the spec file.


netbeans-platform-6.7.1-launcher.patch:
 nbexec |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-platform-6.7.1-launcher.patch ---
diff -Nur netbeans-platform-6.7.1/o.n.bootstrap/launcher/unix/nbexec netbeans-platform-6.7.1.new/o.n.bootstrap/launcher/unix/nbexec
--- netbeans-platform-6.7.1/o.n.bootstrap/launcher/unix/nbexec	2009-07-23 02:39:10.000000000 +0400
+++ netbeans-platform-6.7.1.new/o.n.bootstrap/launcher/unix/nbexec	2009-08-19 04:39:38.000000000 +0400
@@ -189,7 +189,7 @@
 fi
 
 # if heap dump on OOME is supported enable it
-if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null ; then
+if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError &> /dev/null ; then
    jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
    if ! echo $jargs | grep -- "-XX:HeapDumpPath=" > /dev/null ; then
       jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	13 Aug 2009 02:29:07 -0000	1.2
+++ import.log	9 Sep 2009 20:22:35 -0000	1.3
@@ -1,2 +1,3 @@
 netbeans-platform-6_5-4_fc11:HEAD:netbeans-platform-6.5-4.fc11.src.rpm:1231938808
 netbeans-platform-6_7_1-1_fc12:HEAD:netbeans-platform-6.7.1-1.fc12.src.rpm:1250130860
+netbeans-platform-6_7_1-2_fc12:HEAD:netbeans-platform-6.7.1-2.fc12.src.rpm:1252527869


Index: netbeans-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/netbeans-platform.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netbeans-platform.spec	13 Aug 2009 02:29:07 -0000	1.5
+++ netbeans-platform.spec	9 Sep 2009 20:22:35 -0000	1.6
@@ -32,13 +32,13 @@
 %define noautoupdate()    echo > %1/.noautoupdate
 
 # Links the system JAR
-# %1 - the sys jar name
-# %2 - the symlink
-%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
+# %1 - the sys jar
+# %2 - the symlink name/path (optional)
+%global lnSysJAR() %__ln_s -f %{_javadir}/%{*} ;
 
 Name:         netbeans-platform
 Version:      %{nb_ver}
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
@@ -54,6 +54,8 @@ Patch0: %{name}-%{version}-build_bootstr
 Patch1: %{name}-%{version}-properties.patch
 # openjdk-javac-6-b12.jar is needed only if JDK 1.5 is used, but we use JDK 1.6
 Patch2: %{name}-%{version}-javac.patch
+# Avoids spam in the log if the -XX:+HeapDumpOnOutOfMemoryError option is not supported by the JVM
+Patch3: %{name}-%{version}-launcher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -118,15 +120,15 @@ build an application on top of NetBeans 
 %prep
 %setup -q -c
 
-find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %{__rm} -f
-find . -type f \( -iname "*.exe" \) | xargs -t %{__rm} -f
-find . -type f \( -iname "binaries-list" \) | xargs -t %{__rm} -f
+find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %__rm -f
+find . -type f \( -iname "*.exe" \) | xargs -t %__rm -f
+find . -type f \( -iname "binaries-list" \) | xargs -t %__rm -f
 
 # As of Java 6, JSR 223 is included in the JRE.
 # Generate the stub jar file, so there is something in jsr223 API module
-%{__mkdir_p} libs.jsr223/src/javax/script
+%__mkdir_p libs.jsr223/src/javax/script
 echo "package javax.script; class empty { }" > libs.jsr223/src/javax/script/empty.java
-%{__mkdir_p} libs.jsr223/external
+%__mkdir_p libs.jsr223/external
 jar cf libs.jsr223/external/jsr223-api.jar libs.jsr223/src/javax/script/empty.java
 
 # To build the netbeans modules the installed jars will be used instead of pre-packaged ones
@@ -135,24 +137,27 @@ jar cf libs.jsr223/external/jsr223-api.j
 %lnSysJAR jna.jar           libs.jna/external/jna-3.0.9.jar
 %lnSysJAR junit4.jar        libs.junit4/external/junit-4.5.jar
 %lnSysJAR swing-layout.jar  o.jdesktop.layout/external/swing-layout-1.0.3.jar
-%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
-%lnSysJAR cobertura.jar apisupport.harness/external/cobertura-1.9.jar
-%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-2.2.1.jar
-%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-tree-2.2.1.jar
-%lnSysJAR log4j.jar     apisupport.harness/external/log4j-1.2.9.jar
-%lnSysJAR oro.jar       apisupport.harness/external/jakarta-oro-2.0.8.jar
+pushd apisupport.harness/external
+  %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
+  %lnSysJAR cobertura.jar cobertura-1.9.jar
+  %lnSysJAR asm2-all.jar  asm-2.2.1.jar
+  %lnSysJAR asm2-all.jar  asm-tree-2.2.1.jar
+  %lnSysJAR log4j.jar     log4j-1.2.9.jar
+  %lnSysJAR oro.jar       jakarta-oro-2.0.8.jar
+popd
 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
 # build platform & harness
-%{ant_nb_opt} -f nbbuild/build.xml build-platform
+%ant_nb_opt -f nbbuild/build.xml build-platform
 
 # build platform javadoc
-%{ant_nb_opt} \
+%ant_nb_opt \
    -Dallmodules= \
    -Dcluster.config=platform \
    -Dconfig.javadoc.cluster=%{nb_platform} \
@@ -168,45 +173,51 @@ sendopts,options.api,editor.mimelookup \
    -f nbbuild/build.xml build-javadoc
 
 # clean up stub jars
-%{__rm} -f %{nbbuild_platform_dir}/modules/ext/script-api.jar
+%__rm -f %{nbbuild_platform_dir}/modules/ext/script-api.jar
 
 %install
-
-%{__rm} -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 # install platform
-%{__mkdir_p} %{buildroot}%{nb_platform_dir}
-%{__cp} -pr nbbuild/netbeans/%{nb_platform}/* %{buildroot}%{nb_platform_dir}
+%__mkdir_p %{buildroot}%{nb_platform_dir}
+%__cp -pr nbbuild/netbeans/%{nb_platform}/* %{buildroot}%{nb_platform_dir}
 %noautoupdate %{buildroot}%{nb_platform_dir}
 
-# linking the platform to the external JARs
-BR_PLATFORM_EXT=%{buildroot}%{nb_platform_dir}/modules/ext
-%lnSysJAR javahelp2.jar    ${BR_PLATFORM_EXT}/jh-2.0_05.jar
-%lnSysJAR jna.jar          ${BR_PLATFORM_EXT}/jna-3.0.9.jar
-%lnSysJAR junit4.jar       ${BR_PLATFORM_EXT}/junit-4.5.jar
-%lnSysJAR swing-layout.jar ${BR_PLATFORM_EXT}/swing-layout-1.0.3.jar
+# linking the platform to the system JARs
+pushd %{buildroot}%{nb_platform_dir}/modules/ext
+  %lnSysJAR javahelp2.jar    jh-2.0_05.jar
+  %lnSysJAR jna.jar          jna-3.0.9.jar
+  %lnSysJAR junit4.jar       junit-4.5.jar
+  %lnSysJAR swing-layout.jar swing-layout-1.0.3.jar
+popd
 
 # install harness
-%{__mkdir_p} %{buildroot}%{nb_harness_dir}
-%{__cp} -pr nbbuild/netbeans/%{nb_harness}/* %{buildroot}%{nb_harness_dir}
+%__mkdir_p %{buildroot}%{nb_harness_dir}
+%__cp -pr nbbuild/netbeans/%{nb_harness}/* %{buildroot}%{nb_harness_dir}
 %noautoupdate %{buildroot}%{nb_harness_dir}
 
-# linking the harness to the external JARs
-BR_HARNESS=%{buildroot}%{nb_harness_dir}
-%lnSysJAR javahelp2.jar ${BR_HARNESS}/antlib/jsearch-2.0_05.jar
-%lnSysJAR jemmy.jar ${BR_HARNESS}/modules/ext/jemmy-2.3.0.0.jar
-%lnSysJAR cobertura.jar ${BR_HARNESS}/testcoverage/cobertura/cobertura-1.9.jar
-%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-2.2.1.jar
-%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-tree-2.2.1.jar
-%lnSysJAR oro.jar       ${BR_HARNESS}/testcoverage/cobertura/lib/jakarta-oro-2.0.8.jar
-%lnSysJAR log4j.jar     ${BR_HARNESS}/testcoverage/cobertura/lib/log4j-1.2.9.jar
+# linking the harness to the system JARs
+pushd %{buildroot}%{nb_harness_dir}
+  %lnSysJAR javahelp2.jar antlib/jsearch-2.0_05.jar
+  %lnSysJAR jemmy.jar     modules/ext/jemmy-2.3.0.0.jar
+  pushd testcoverage/cobertura
+    %lnSysJAR cobertura.jar cobertura-1.9.jar
+    pushd lib
+      %lnSysJAR asm2-all.jar  asm-2.2.1.jar
+      %lnSysJAR asm2-all.jar  asm-tree-2.2.1.jar
+      %lnSysJAR oro.jar       jakarta-oro-2.0.8.jar
+      %lnSysJAR log4j.jar     log4j-1.2.9.jar
+    popd
+  popd
+popd
 
 # install javadoc
-%{__mkdir_p} %{buildroot}%{nb_javadoc_dir}
-%{__cp} -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}
+%__rm -rf  nbbuild/build/javadoc/*.zip
+%__mkdir_p %{buildroot}%{nb_javadoc_dir}
+%__cp -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}
 
 %clean
-%{__rm} -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -254,6 +265,9 @@ BR_HARNESS=%{buildroot}%{nb_harness_dir}
 %doc %{nb_javadoc_dir}/
 
 %changelog
+* Wed Aug 19 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-2
+- The Patch3 for the platform launcher
+- Remove javadoc zip archives
 * Thu May 21 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
 - Bootstrapping of the spec 6.5 for platform of the NetBeans 6.7.1
 - jna-3.0.2.jar -> jna-3.0.9.jar



From mclasen at fedoraproject.org  Wed Sep  9 20:24:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Sep 2009 20:24:52 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel seahorse-plugins.spec,1.28,1.29
Message-ID: <20090909202452.E103D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8182

Modified Files:
	seahorse-plugins.spec 
Log Message:
drop application dependencies



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- seahorse-plugins.spec	27 Jul 2009 04:05:56 -0000	1.28
+++ seahorse-plugins.spec	9 Sep 2009 20:24:52 -0000	1.29
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.27.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -36,8 +36,7 @@ BuildRequires:  autoconf, automake, libt
 
 Requires: seahorse >= 2.23.6
 Requires: gedit
-Requires: nautilus
-Requires: epiphany
+# Requires: epiphany
 Requires: GConf2
 Requires: shared-mime-info
 
@@ -151,11 +150,6 @@ fi
 %{_bindir}/seahorse-preferences
 %{_bindir}/seahorse-tool
 %{_libdir}/bonobo/servers/GNOME_SeahorseApplet.server
-%{_libdir}/gedit-2/plugins/libseahorse-pgp.so
-%{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
-%{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so
-#%{_libdir}/epiphany/2.27/extensions/libseahorseextension.so
-#%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 %{_libdir}/seahorse/seahorse-applet
 %{_datadir}/gnome-2.0/ui/GNOME_SeahorseApplet.xml
 %{_datadir}/applications/seahorse-pgp-encrypted.desktop
@@ -171,8 +165,27 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/seahorse-applet.png
 %{_datadir}/icons/hicolor/scalable/apps/seahorse-applet.svg
 
+# gedit plugin
+%dir %{_libdir}/gedit-2
+%dir %{_libdir}/gedit-2/plugins
+%{_libdir}/gedit-2/plugins/libseahorse-pgp.so
+%{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
+
+# nautilus extension
+%dir %{_libdir}/nautilus/extensions-2.0
+%{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so
+
+# epiphany extension
+#%dir %{_libdir}/epiphany
+#%dir %{_libdir}/epiphany/2.27
+#%dir %{_libdir}/epiphany/2.27/extensions
+#%{_libdir}/epiphany/2.27/extensions/libseahorseextension.so
+#%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.1-4
+- Drop dependencies on applications
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Wed Sep  9 20:24:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 20:24:51 +0000 (UTC)
Subject: rpms/xfce4-quicklauncher-plugin/F-10
	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch, NONE, 1.1
	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin-1.9.4-save-settings.patch, NONE, 
	1.1 xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch,
	NONE, 1.1 xfce4-quicklauncher-plugin.spec, 1.12, 1.13
Message-ID: <20090909202451.506AA11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8306

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Added Files:
	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch 
	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch 
	xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch 
	xfce4-quicklauncher-plugin-1.9.4-save-settings.patch 
	xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
- Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
- Apply settings without restarting the plugin (bugzilla.xfce.org #3782)
- Add missing english translation (bugzilla.xfce.org #3783)
- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)


xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch:
 quicklauncher.desktop.in.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch ---
--- panel-plugin/quicklauncher.desktop.in.in.orig	2009-07-04 00:46:34.000000000 +0200
+++ panel-plugin/quicklauncher.desktop.in.in	2009-07-04 00:46:51.000000000 +0200
@@ -4,4 +4,6 @@
 _Name=Quicklauncher
 _Comment=Program with several launchers
 Icon=gnome-fs-executable
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
+X-XFCE-Module=quicklauncher
+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
+X-XFCE-Unique=false

xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch:
 configure |    2 -
 po/en.po  |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
--- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
+++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
@@ -21181,7 +21181,7 @@
 
 
 
-    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
+    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
 
 
 for ac_header in locale.h
diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
--- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
+++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
@@ -0,0 +1,87 @@
+# English translation of xfce4-quicklauncher-plugin.
+# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
+# Jeff Bailes <thepizzaking at gmail.com>, 2007.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-quicklauncher-plugin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-17 21:37+0200\n"
+"PO-Revision-Date: 2007-03-31 10:17+1000\n"
+"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: ../panel-plugin/callbacks.c:79
+msgid "Configure Quicklauncher"
+msgstr "Configure Quicklauncher"
+
+#: ../panel-plugin/callbacks.c:93
+msgid "Lines: "
+msgstr "Lines: "
+
+#: ../panel-plugin/callbacks.c:123
+msgid "Espace entre les lanceurs :"
+msgstr "Space between launchers"
+
+#: ../panel-plugin/callbacks.c:131
+msgid "afficher les tooltips"
+msgstr "Show tooltips"
+
+#: ../panel-plugin/callbacks.c:135
+msgid "afficher les labels"
+msgstr "Show labels"
+
+#: ../panel-plugin/callbacks.c:216
+msgid "icone"
+msgstr "icon"
+
+#: ../panel-plugin/callbacks.c:222
+msgid "commande"
+msgstr "command"
+
+#: ../panel-plugin/callbacks.c:228
+msgid "nom"
+msgstr "name"
+
+#: ../panel-plugin/callbacks.c:327
+msgid "Open icon"
+msgstr "Open icon"
+
+#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
+msgid "Quicklauncher"
+msgstr "Quicklauncher"
+
+#: ../panel-plugin/main.c:166
+msgid "Allows you to add launchers easily and display them on many lines."
+msgstr "Allows you to add launchers easily and display them on many lines."
+
+#: ../panel-plugin/main.c:168
+msgid "Other plugins available here"
+msgstr "Other plugins available here"
+
+#: ../panel-plugin/main.c:320
+msgid "Lock"
+msgstr "Lock"
+
+#: ../panel-plugin/main.c:323
+msgid "Parameters"
+msgstr "Parameters"
+
+#: ../panel-plugin/main.c:326
+msgid "Applications"
+msgstr "Applications"
+
+#: ../panel-plugin/main.c:329
+msgid "Help"
+msgstr "Help"
+
+#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
+msgid "Program with several launchers"
+msgstr "Program with several launchers"
+

xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch ---
--- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
+++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
@@ -148,6 +148,7 @@
 	t_qck_launcher_opt_dlg* dlg;
 	xfce_panel_plugin_block_menu(plugin);
 	dlg = create_qck_launcher_dlg();
+        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
 	xfce_panel_plugin_unblock_menu(plugin);
@@ -160,6 +161,7 @@
 	GtkWidget *about;
 	const gchar* authors[2] = {"Bountykiller <masse_nicolas at yahoo.fr>", NULL};
 	about = gtk_about_dialog_new();
+        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
@@ -461,7 +463,7 @@
 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
 		{
 			g_return_val_if_fail(launcher->clicked_img, FALSE);
-			xfce_exec(launcher->command, FALSE, FALSE, NULL);
+			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
 		}
 		else

xfce4-quicklauncher-plugin-1.9.4-save-settings.patch:
 main.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-save-settings.patch ---
Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(r?vision 3779)
+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(r?vision 3780)
@@ -151,6 +151,7 @@
         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
+	quicklauncher_save(plugin, quicklauncher);
 	xfce_panel_plugin_unblock_menu(plugin);
 }
 

xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch ---
--- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
+++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
@@ -320,7 +320,7 @@
 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
 							NULL, quicklauncher);
 	quicklauncher_add_element(quicklauncher, launcher);
-	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
+	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
 							NULL, quicklauncher);
 	quicklauncher_add_element(quicklauncher, launcher);
 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/F-10/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-quicklauncher-plugin.spec	18 Feb 2008 23:56:31 -0000	1.12
+++ xfce4-quicklauncher-plugin.spec	9 Sep 2009 20:24:50 -0000	1.13
@@ -1,13 +1,30 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	1.9.4
-Release:	2%{?dist}
+Release:	7%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://www.xfce.org/archive/src/panel-plugins/%{name}/1.9/%{name}-%{version}.tar.bz2
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=505165
+# reported to upstream at http://bugzilla.xfce.org/show_bug.cgi?id=5455
 Patch0:		%{name}-1.9.2-multilib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=509294
+# upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=3540
+Patch1:		%{name}-1.9.4-desktop-file.patch
+# make new apps appear on the correct X screen
+# http://bugzilla.xfce.org/show_bug.cgi?id=4323
+Patch2:		%{name}-1.9.4-fix-multiscreen.patch
+# apply settings without restart
+# http://bugzilla.xfce.org/show_bug.cgi?id=3782
+Patch3:		%{name}-1.9.4-save-settings.patch
+# plugin speaks french if no translations are found
+# http://bugzilla.xfce.org/show_bug.cgi?id=3783
+Patch4:		%{name}-1.9.4-fix-missing-english-translation.patch
+# Xfce 4.6: xfce-setting-show instead of xfce4-settings-manager
+# http://bugzilla.xfce.org/show_bug.cgi?id=5752
+Patch5:		%{name}-1.9.4-xfce4-settings-manager.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -21,6 +38,13 @@ them on several lines.
 %prep
 %setup -q
 %patch0 -b .multilib
+%patch1 -b .path
+%patch2 -b .multiscreen
+%patch3 -p1 -b .settings
+%patch4 -p1 -b .french
+%if 0%{?fedora} >= 11
+%patch5 -b .xfce46
+%endif
 
 %build
 %configure --disable-static
@@ -28,7 +52,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 $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -42,33 +66,51 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
+- Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
+- Apply settings without restarting the plugin (bugzilla.xfce.org #3782)
+- Add missing english translation (bugzilla.xfce.org #3783)
+- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-5
+- Fix path in desktop file (#509294)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-3
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.4-2
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.4-1
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-1
 - Update to 1.9.4
 - Update license tag
 
-* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-4
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-4
 - Multilib fix for desktop file (#228168)
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-3
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-3
 - Rebuild for Xfce 4.4.1
 
-* Sun Jan 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-2
+* Sun Jan 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-2
 - Rebuild for Xfce 4.4.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-1
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-1
 - Update to 1.9.2.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.1-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.1-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.1-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.1-1
 - Update to 1.9.1 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.81-5
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.81-5
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4



From kasal at fedoraproject.org  Wed Sep  9 20:27:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  9 Sep 2009 20:27:51 +0000 (UTC)
Subject: rpms/gawk/devel .cvsignore, 1.12, 1.13 gawk.spec, 1.59, 1.60 sources,
	1.12, 1.13 gawk-stable-tree.patch, 1.2, NONE
Message-ID: <20090909202751.B4B7011C00CE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/gawk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9191

Modified Files:
	.cvsignore gawk.spec sources 
Removed Files:
	gawk-stable-tree.patch 
Log Message:
new upstream version, disable libsigsegv


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Dec 2008 14:08:10 -0000	1.12
+++ .cvsignore	9 Sep 2009 20:27:50 -0000	1.13
@@ -1,2 +1 @@
-gawk-3.1.6.tar.bz2
-libsigsegv-2.6.tar.gz
+gawk-3.1.7.tar.xz


Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gawk.spec	24 Jul 2009 23:32:59 -0000	1.59
+++ gawk.spec	9 Sep 2009 20:27:51 -0000	1.60
@@ -1,21 +1,15 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
-Version: 3.1.6
-Release: 6%{?dist}
+Version: 3.1.7
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
-Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
-Source1: http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.6.tar.gz
-Patch0: gawk-stable-tree.patch
+Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires: /bin/mktemp
-
-# patching the sources for these tools
-BuildRequires: autoconf automake gettext-devel texinfo bison
 
 %description
 The gawk package contains the GNU version of awk, a text processing
@@ -26,21 +20,14 @@ Install the gawk package if you need a t
 considered to be a standard Linux tool for processing text.
 
 %prep
-%setup -q -a 1
-mv libsigsegv-2.6 libsigsegv
-# do not install with gawk
-echo 'install:'  >>libsigsegv/Makefile.am
-%patch0 -p1
-# we have patched the sources for these:
-rm awkgram.c doc/*.info
+%setup -q
 
 %build
-autoreconf
-%configure --bindir=/bin
+%configure --bindir=/bin --disable-libsigsegv
 make %{?_smp_mflags}
 
 %check
-make check
+make check diffout
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,10 +69,14 @@ fi
 %{_datadir}/awk
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.6-6
+* Wed Sep  9 2009 Stepan Kasal <skasal at redhat.com> - 3.1.7-1
+- new upstream version
+- disable libsigsegv
+
+* Fri Jul 24 2009 Fed Rel Eng <rel-eng at lists.fedoraproject.org> - 3.1.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.6-5
+* Tue Feb 24 2009 Fed Rel Eng <rel-eng at lists.fedoraproject.org> - 3.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Fri Jan 30 2009 Stepan Kasal <skasal at redhat.com> - 3.1.6-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Dec 2008 14:08:10 -0000	1.12
+++ sources	9 Sep 2009 20:27:51 -0000	1.13
@@ -1,2 +1 @@
-c9926c0bc8c177cb9579708ce67f0d75  gawk-3.1.6.tar.bz2
-7e24993730649d13c6eabc28bd24de35  libsigsegv-2.6.tar.gz
+7f16a68357c10c385ac76066b264f39d  gawk-3.1.7.tar.xz


--- gawk-stable-tree.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep  9 20:51:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Sep 2009 20:51:40 +0000 (UTC)
Subject: rpms/taglib-extras/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 taglib-extras.spec, 1.7, 1.8
Message-ID: <20090909205140.E59EE11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17150

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
- taglib-extras-0.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Aug 2009 01:25:29 -0000	1.7
+++ .cvsignore	9 Sep 2009 20:51:40 -0000	1.8
@@ -1 +1 @@
-taglib-extras-0.1.6.tar.gz
+taglib-extras-0.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Aug 2009 01:25:29 -0000	1.7
+++ sources	9 Sep 2009 20:51:40 -0000	1.8
@@ -1 +1 @@
-706a82fe4c25606f731faf4c14b5edb0  taglib-extras-0.1.6.tar.gz
+09bf9c89d953a238b55ac74bf9db0be3  taglib-extras-0.1.7.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- taglib-extras.spec	4 Aug 2009 01:25:29 -0000	1.7
+++ taglib-extras.spec	9 Sep 2009 20:51:40 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.6
+Version:        0.1.7
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
+- taglib-extras-0.1.7
+
 * Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
 - taglib-extras-0.1.6
 



From wtogami at fedoraproject.org  Wed Sep  9 20:52:47 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  9 Sep 2009 20:52:47 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin-2.6.2-aim-buddy-status-grab.patch, NONE,
	1.1 pidgin-2.6.2-crash-validate-jid.patch, NONE,
	1.1 pidgin-2.6.2-yahoo-buddy-idle-time.patch, NONE,
	1.1 pidgin-2.6.2-yahoo-status-change-away.patch, NONE,
	1.1 pidgin.spec, 1.96, 1.97
Message-ID: <20090909205247.0CF2B11C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17626

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.2-aim-buddy-status-grab.patch 
	pidgin-2.6.2-crash-validate-jid.patch 
	pidgin-2.6.2-yahoo-buddy-idle-time.patch 
	pidgin-2.6.2-yahoo-status-change-away.patch 
Log Message:
- Upstream backports:
    97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab
    37aa00d044431100d37466517568640cb082680c yahoo-buddy-idle-time
    40005b889ee276fbcd0a4e886a68d8a8cce45698 yahoo-status-change-away
    cb46b045aa6e927a3814d9053c2b1c0f08d6fa62 crash-validate-jid


pidgin-2.6.2-aim-buddy-status-grab.patch:
 oscar.c |   28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

--- NEW FILE pidgin-2.6.2-aim-buddy-status-grab.patch ---
http://developer.pidgin.im/viewmtn/revision/info/97e003ed2bc2bafbb993693c9ae9c6d667731cc1
If an oscar buddy on our buddy list is away and we have not yet
fetched their HTML info, then fallback to using their plaintext
status message when fetching the buddies status text.
Fixes #9843

#
#
# patch "libpurple/protocols/oscar/oscar.c"
#  from [e8d20222205b810c91ebed0d7193d2004cc2777f]
#    to [c0ac247833af9a49df59ca3c58ceab5ce6263366]
#
============================================================
--- libpurple/protocols/oscar/oscar.c	e8d20222205b810c91ebed0d7193d2004cc2777f
+++ libpurple/protocols/oscar/oscar.c	c0ac247833af9a49df59ca3c58ceab5ce6263366
@@ -829,19 +829,25 @@ static void oscar_user_info_append_statu
 	   the "message" attribute of the status contains only the plaintext
 	   message. */
 	if (userinfo) {
-		if ((userinfo->flags & AIM_FLAG_AWAY)) {
-			/* Away message? */
-			if ((userinfo->flags & AIM_FLAG_AWAY) && (userinfo->away_len > 0) && (userinfo->away != NULL) && (userinfo->away_encoding != NULL)) {
-				tmp = oscar_encoding_extract(userinfo->away_encoding);
-				message = oscar_encoding_to_utf8(account, tmp, userinfo->away,
-												   userinfo->away_len);
-				g_free(tmp);
-			}
+		if ((userinfo->flags & AIM_FLAG_AWAY)
+				&& userinfo->away_len > 0
+				&& userinfo->away != NULL
+				&& userinfo->away_encoding != NULL)
+		{
+			/* Away message */
+			tmp = oscar_encoding_extract(userinfo->away_encoding);
+			message = oscar_encoding_to_utf8(account,
+					tmp, userinfo->away, userinfo->away_len);
+			g_free(tmp);
 		} else {
-			/* Available message? */
+			/*
+			 * Available message or non-HTML away message (because that's
+			 * all we have right now.
+			 */
 			if ((userinfo->status != NULL) && userinfo->status[0] != '\0') {
-				message = oscar_encoding_to_utf8(account, userinfo->status_encoding,
-											 userinfo->status, userinfo->status_len);
+				message = oscar_encoding_to_utf8(account,
+						userinfo->status_encoding, userinfo->status,
+						userinfo->status_len);
 			}
 #if defined (_WIN32) || defined (__APPLE__)
 			if (userinfo->itmsurl && (userinfo->itmsurl[0] != '\0'))

pidgin-2.6.2-crash-validate-jid.patch:
 ChangeLog                           |    4 ++++
 libpurple/protocols/jabber/jutil.c  |    7 +++----
 libpurple/tests/test_jabber_jutil.c |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE pidgin-2.6.2-crash-validate-jid.patch ---
http://developer.pidgin.im/ticket/10259
http://developer.pidgin.im/viewmtn/revision/info/cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
Fix a crash when attempting to validate a JID with an invalid resource.

#
#
# patch "ChangeLog"
#  from [959824a520d41286c4d89d8899a8e12b684e5ad8]
#    to [6e78b15060f29fe30ae1b695f61248014b305d49]
# 
# patch "libpurple/protocols/jabber/jutil.c"
#  from [9047c2dfd575de6ec516dd8377bce70df42d5063]
#    to [603120abe6629d5e8f9e79d5198134bb252b0875]
# 
# patch "libpurple/tests/test_jabber_jutil.c"
#  from [38e36ccd4fbf2682828c201fe178cd637217fc25]
#    to [42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a]
#
============================================================
--- ChangeLog	959824a520d41286c4d89d8899a8e12b684e5ad8
+++ ChangeLog	6e78b15060f29fe30ae1b695f61248014b305d49
@@ -1,5 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.3 (??/??/20??):
+	XMPP:
+	* Fix a crash when attempting to validate an invalid JID.
+
 version 2.6.2 (09/05/2009):
 	libpurple:
 	* Fix --disable-avahi to actually disable it in configure, as opposed
============================================================
--- libpurple/protocols/jabber/jutil.c	9047c2dfd575de6ec516dd8377bce70df42d5063
+++ libpurple/protocols/jabber/jutil.c	603120abe6629d5e8f9e79d5198134bb252b0875
@@ -153,10 +153,9 @@ jabber_idn_validate(const char *str, con
 		if (!jabber_resourceprep(idn_buffer, sizeof(idn_buffer))) {
 			jabber_id_free(jid);
 			jid = NULL;
-			/* goto out; */
-		}
-
-		jid->resource = g_strdup(idn_buffer);
+			goto out;
+		} else
+			jid->resource = g_strdup(idn_buffer);
 	}
 
 out:
============================================================
--- libpurple/tests/test_jabber_jutil.c	38e36ccd4fbf2682828c201fe178cd637217fc25
+++ libpurple/tests/test_jabber_jutil.c	42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a
@@ -132,6 +132,7 @@ START_TEST(test_jabber_id_new)
 	assert_invalid_jid("mark.doliner at gmail\\stuff.org");
 	assert_invalid_jid("paul@[::1]124");
 	assert_invalid_jid("paul at 2[::1]124/as");
+	assert_invalid_jid("paul@??.????/\x01");
 
 	/* Ensure that jabber_id_new is properly lowercasing node and domains */
 	assert_jid_parts("paul", "darkrain42.org", "PaUL at darkrain42.org");

pidgin-2.6.2-yahoo-buddy-idle-time.patch:
 libymsg.c |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

--- NEW FILE pidgin-2.6.2-yahoo-buddy-idle-time.patch ---
http://developer.pidgin.im/viewmtn/revision/info/40005b889ee276fbcd0a4e886a68d8a8cce45698
Better, accurate handling of idle time for a yahoo buddy. Fixes #10099

#
#
# patch "libpurple/protocols/yahoo/libymsg.c"
#  from [87ad7ef7612ac888772e8afa7bcb20743f1b3d9c]
#    to [9f4d92c3fc86e7a91514246a63ebbd3b9c5c6f05]
#
============================================================
--- libpurple/protocols/yahoo/libymsg.c	87ad7ef7612ac888772e8afa7bcb20743f1b3d9c
+++ libpurple/protocols/yahoo/libymsg.c	9f4d92c3fc86e7a91514246a63ebbd3b9c5c6f05
@@ -220,7 +220,12 @@ static void yahoo_process_status(PurpleC
 			if (f->status == YAHOO_STATUS_IDLE) {
 				/* Idle may have already been set in a more precise way in case 137 */
 				if (f->idle == 0)
-					f->idle = time(NULL);
+				{
+					if(pkt->service == YAHOO_SERVICE_STATUS_15)
+						f->idle = -1;
+					else
+						f->idle = time(NULL);
+				}
 			} else
 				f->idle = 0;
 
@@ -253,15 +258,20 @@ static void yahoo_process_status(PurpleC
 			if (f->away == 2) {
 				/* Idle may have already been set in a more precise way in case 137 */
 				if (f->idle == 0)
-					f->idle = time(NULL);
+				{
+					if(pkt->service == YAHOO_SERVICE_STATUS_15)
+						f->idle = -1;
+					else
+						f->idle = time(NULL);
+				}
 			}
 
 			break;
-		case 138: /* either we're not idle, or we are but won't say how long */
+		case 138: /* when value is 1, either we're not idle, or we are but won't say how long */
 			if (!f)
 				break;
 
-			if (f->idle)
+			if( (strtol(pair->value, NULL, 10) == 1) && (f->idle) )
 				f->idle = -1;
 			break;
 		case 137: /* usually idle time in seconds, sometimes login time */

pidgin-2.6.2-yahoo-status-change-away.patch:
 libymsg.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE pidgin-2.6.2-yahoo-status-change-away.patch ---
http://developer.pidgin.im/ticket/10224
http://developer.pidgin.im/viewmtn/revision/info/37aa00d044431100d37466517568640cb082680c

#
#
# patch "libpurple/protocols/yahoo/libymsg.c"
#  from [2e325ac513bc39fb2cb3964c664edcef344c7f14]
#    to [87ad7ef7612ac888772e8afa7bcb20743f1b3d9c]
#
============================================================
--- libpurple/protocols/yahoo/libymsg.c	2e325ac513bc39fb2cb3964c664edcef344c7f14
+++ libpurple/protocols/yahoo/libymsg.c	87ad7ef7612ac888772e8afa7bcb20743f1b3d9c
@@ -4500,6 +4500,12 @@ void yahoo_set_status(PurpleAccount *acc
 
 	if (purple_presence_is_idle(presence))
 		yahoo_packet_hash_str(pkt, 47, "2");
+	else	{
+		if (!purple_status_is_available(status))
+			yahoo_packet_hash_str(pkt, 47, "1");
+		else
+			yahoo_packet_hash_str(pkt, 47, "0");
+	}
 
 	yahoo_packet_send_and_free(pkt, yd);
 


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- pidgin.spec	6 Sep 2009 02:05:16 -0000	1.96
+++ pidgin.spec	9 Sep 2009 20:52:46 -0000	1.97
@@ -82,7 +82,7 @@
 
 Name:		pidgin
 Version:	2.6.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -116,6 +116,10 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100: pidgin-2.6.2-aim-buddy-status-grab.patch
+Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
+Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
+Patch103: pidgin-2.6.2-crash-validate-jid.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -373,6 +377,10 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0 -b .aim-buddy-status-grab
+%patch101 -p0 -b .yahoo-buddy-idle-time
+%patch102 -p0 -b .yahoo-status-change-away
+%patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -617,11 +625,19 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 2.6.2-2
+- Upstream backports:
+    97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab
+    37aa00d044431100d37466517568640cb082680c yahoo-buddy-idle-time
+    40005b889ee276fbcd0a4e886a68d8a8cce45698 yahoo-status-change-away
+    cb46b045aa6e927a3814d9053c2b1c0f08d6fa62 crash-validate-jid
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1.1
 - VV support needs to be explicitly disabled on F10
 
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
 - 2.6.2 Fixes a number of crashes
+- CVE-2009-2703, CVE-2009-3083, CVE-2009-3084, CVE-2009-3085
 
 * Wed Aug 19 2009 Warren Togami <wtogami at redhat.com> 2.6.1-1
 - 2.6.1: Fix a crash when some users send you a link in a Yahoo IM



From cwickert at fedoraproject.org  Wed Sep  9 21:00:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 21:00:14 +0000 (UTC)
Subject: rpms/xfce4-systemload-plugin/devel
	xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch, NONE,
	1.1 xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch, 
	NONE, 1.1 xfce4-systemload-plugin-0.4.2-tooltip.patch, NONE,
	1.1 xfce4-systemload-plugin.spec, 1.15, 1.16
Message-ID: <20090909210014.F1ECE11C043A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-systemload-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20699

Modified Files:
	xfce4-systemload-plugin.spec 
Added Files:
	xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch 
	xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch 
	xfce4-systemload-plugin-0.4.2-tooltip.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-8
- Bring back tooltips in GTK >= 2.16 (#508637, bugzilla.xfce.org #5175)
- Fix bar colors (#505214, bugzilla.xfce.org #1889)
- Fix wrong free memory value (bugzilla.xfce.org #4215)


xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch:
 systemload.c |   42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

--- NEW FILE xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch ---
diff -u panel-plugin/systemload.c panel-plugin/systemload.c
--- panel-plugin/systemload.c	(working copy)
+++ panel-plugin/systemload.c	(working copy)
@@ -256,17 +256,16 @@
         gtk_container_add(GTK_CONTAINER(global->monitor[count]->ebox),
                           GTK_WIDGET(global->monitor[count]->box));
 
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor[count]->status));
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        }
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor[count]->options.color;
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor[count]->status), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_SELECTED,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor[count]->status),
+                               GTK_STATE_SELECTED,
+                               &global->monitor[count]->options.color);
+                             
         gtk_widget_show(GTK_WIDGET(global->monitor[count]->status));
 
         gtk_box_pack_start(GTK_BOX(global->monitor[count]->box),
@@ -384,18 +383,15 @@
         gtk_label_set_text(GTK_LABEL(global->monitor[count]->label),
                            global->monitor[count]->options.label_text);
 
-        gtk_widget_hide(GTK_WIDGET(global->monitor[count]->status));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor[count]->status));
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        }
-
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor[count]->options.color;
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor[count]->status), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_SELECTED,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor[count]->status),
+                               GTK_STATE_SELECTED,
+                               &global->monitor[count]->options.color);
 
         if(global->monitor[count]->options.enabled)
         {

xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch:
 memswap.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-systemload-plugin-0.4.2/panel-plugin/memswap.c xfce4-systemload-plugin-0.4.2.new/panel-plugin/memswap.c
--- xfce4-systemload-plugin-0.4.2/panel-plugin/memswap.c	2007-01-17 19:01:09.000000000 +0100
+++ xfce4-systemload-plugin-0.4.2.new/panel-plugin/memswap.c	2008-03-08 12:16:34.000000000 +0100
@@ -48,6 +48,7 @@
 static unsigned long MTotal = 0;
 static unsigned long MFree = 0;
 static unsigned long MCached = 0;
+static unsigned long MBuffers = 0;
 static unsigned long MUsed = 0;
 static unsigned long STotal = 0;
 static unsigned long SFree = 0;
@@ -57,8 +58,8 @@
 {
     int fd;
     size_t n;
-    int o_MTotal, o_MFree, o_MCached, o_STotal, o_SFree;
-    char *b_MTotal, *b_MFree, *b_MCached, *b_STotal, *b_SFree;
+    int o_MTotal, o_MFree, o_MCached, o_MBuffers, o_STotal, o_SFree;
+    char *b_MTotal, *b_MFree, *b_MCached, *b_MBuffers, *b_STotal, *b_SFree;
 
     if ((fd = open("/proc/meminfo", O_RDONLY)) < 0)
     {
@@ -87,6 +88,10 @@
     if (b_MCached)
         o_MCached = sscanf(b_MCached + strlen("Cached"), ": %lu", &MCached);
 
+    b_MBuffers = strstr(MemInfoBuf, "Buffers");
+    if (b_MBuffers)
+        o_MBuffers = sscanf(b_MBuffers + strlen("Buffers"), ": %lu", &MBuffers);
+
     b_STotal = strstr(MemInfoBuf, "SwapTotal");
     if (b_STotal)
         o_STotal = sscanf(b_STotal + strlen("SwapTotal"), ": %lu", &STotal);
@@ -95,7 +100,7 @@
     if (b_SFree)
         o_SFree = sscanf(b_SFree + strlen("SwapFree"), ": %lu", &SFree);
 
-    MFree += MCached;
+    MFree = MFree + MCached + MBuffers;
     MUsed = MTotal - MFree;
     SUsed = STotal - SFree;
     *mem = MUsed * 100 / MTotal;

xfce4-systemload-plugin-0.4.2-tooltip.patch:
 systemload.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xfce4-systemload-plugin-0.4.2-tooltip.patch ---
diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
index cc96ec4..027e8fe 100644
--- a/panel-plugin/systemload.c
+++ b/panel-plugin/systemload.c
@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
 {
     int count;
     t_global_monitor *global;
+    GtkSettings *settings;
 
     tooltips = gtk_tooltips_new ();
     g_object_ref (tooltips);
     gtk_object_sink (GTK_OBJECT (tooltips));
     
+    /* reduce the default tooltip timeout to be smaller than the update
+     * interval otherwise we won't see tooltips on GTK 2.16 or newer */
+    settings = gtk_settings_get_default();
+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
+      g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
+
     global = g_new(t_global_monitor, 1);
     global->plugin = plugin;
     global->timeout_id = 0;


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-systemload-plugin/devel/xfce4-systemload-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xfce4-systemload-plugin.spec	27 Jul 2009 07:56:34 -0000	1.15
+++ xfce4-systemload-plugin.spec	9 Sep 2009 21:00:13 -0000	1.16
@@ -1,12 +1,21 @@
 Name:		xfce4-systemload-plugin
 Version:	0.4.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+# allow custom bar colors in all themes
+# http://bugzilla.xfce.org/show_bug.cgi?id=1889
+Patch0:		%{name}-0.4.2-fix-bar-colors.patch
+# memory usage in plugin is different from `free' output
+# http://bugzilla.xfce.org/show_bug.cgi?id=4215
+Patch1:		%{name}-0.4.2-fix-wrong-free-memory-value.patch
+# make tooltips work with GTK 2.16
+# http://bugzilla.xfce.org/show_bug.cgi?id=5175
+Patch2:		%{name}-0.4.2-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel
@@ -19,6 +28,11 @@ load, the memory in use, the swap space 
 
 %prep
 %setup -q
+%patch0 -p0 -b .colors
+%patch1 -p1 -b .free
+%if 0%{?fedora} >= 11
+%patch2 -p1 -b .tooltip
+%endif
 
 %build
 %configure --disable-static
@@ -39,6 +53,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-8
+- Bring back tooltips in GTK >= 2.16 (#508637, bugzilla.xfce.org #5175)
+- Fix bar colors (#505214, bugzilla.xfce.org #1889)
+- Fix wrong free memory value (bugzilla.xfce.org #4215)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nucleo at fedoraproject.org  Wed Sep  9 21:05:26 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Wed,  9 Sep 2009 21:05:26 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc.spec,1.12,1.13 sources,1.7,1.8
Message-ID: <20090909210527.067CC11C00CE@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22969

Modified Files:
	kvirc.spec sources 
Log Message:
disabled pyhton module


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- kvirc.spec	8 Sep 2009 00:12:15 -0000	1.12
+++ kvirc.spec	9 Sep 2009 21:05:26 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.16.%{pre}%{?dist}
+Release:          0.17.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -11,7 +11,7 @@ URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
-BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
+BuildRequires:    perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -28,13 +28,13 @@ many IRC addicted developers around the 
 %build
 %{cmake}  \
 %ifarch %{ix86}
--DWITH_ix86_ASM=YES \
+-DWITH_ix86_ASM=ON \
 %endif
 -DWANT_NO_EMBEDDED_CODE=OFF \
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITH_PYTHON=ON \
+-DWITHOUT_PYTHON=ON \
 -DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
 
@@ -126,6 +126,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
+- disabled pyhton module, added -DWITHOUT_PYTHON=ON
+- removed BR python-devel
+
 * Tue Sep  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.16.rc1
 - KVIrc 4.0 release candidate 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Sep 2009 00:12:16 -0000	1.7
+++ sources	9 Sep 2009 21:05:26 -0000	1.8
@@ -1 +1 @@
-092206ada148236a9e62351c98d59560  kvirc-4.0rc1.tar.bz2
+fbf84c24864b7a89922574bcfa68f292  kvirc-4.0rc1.tar.bz2



From dwalsh at fedoraproject.org  Wed Sep  9 21:07:25 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Sep 2009 21:07:25 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.90,
	1.91 policycoreutils-rhat.patch, 1.439, 1.440
Message-ID: <20090909210726.5FAB911C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24005

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-2
- Fix init script to show status in usage message


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1183 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  128 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13950 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- policycoreutils-gui.patch	26 Aug 2009 18:05:32 -0000	1.90
+++ policycoreutils-gui.patch	9 Sep 2009 21:07:24 -0000	1.91
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.71/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.73/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/booleansPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/booleansPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -249,9 +249,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.71/gui/domainsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.73/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/domainsPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/domainsPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -407,9 +407,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.71/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.73/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/fcontextPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/fcontextPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.71/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.73/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/html_util.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/html_util.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -802,9 +802,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +    doc += tail
 +    return doc
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.71/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.73/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/lockdown.glade	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/lockdown.glade	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1577,9 +1577,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.71/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.73/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/lockdown.gladep	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/lockdown.gladep	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1588,9 +1588,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.71/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.73/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/lockdown.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/lockdown.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1974,9 +1974,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.71/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.73/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/loginsPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/loginsPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2163,9 +2163,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.71/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.73/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/Makefile	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/Makefile	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -2208,9 +2208,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.71/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.73/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/mappingsPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/mappingsPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2268,9 +2268,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.71/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.73/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/modulesPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/modulesPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2462,9 +2462,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.71/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.73/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/polgen.glade	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/polgen.glade	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5771,9 +5771,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.71/gui/polgen.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.73/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/polgen.gladep	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/polgen.gladep	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5782,9 +5782,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.71/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.73/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/polgengui.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/polgengui.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,627 @@
 +#!/usr/bin/python -E
 +#
@@ -6413,9 +6413,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.71/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.73/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/polgen.py	2009-08-26 10:47:54.000000000 -0400
++++ policycoreutils-2.0.73/gui/polgen.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,1183 @@
 +#!/usr/bin/python
 +#
@@ -7600,9 +7600,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 +    print mypolicy.generate()
 +    sys.exit(0)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.71/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.73/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/portsPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/portsPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7863,9 +7863,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.71/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.73/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/selinux.tbl	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/selinux.tbl	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8101,9 +8101,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.71/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.73/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/semanagePage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/semanagePage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8273,9 +8273,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.71/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.73/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/statusPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/statusPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8467,9 +8467,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.71/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.73/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/system-config-selinux.glade	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/system-config-selinux.glade	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,3403 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -11874,9 +11874,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.71/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.73/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/system-config-selinux.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/system-config-selinux.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,189 @@
 +#!/usr/bin/python
 +#
@@ -12067,9 +12067,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.71/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.73/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/boolean.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/boolean.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12111,9 +12111,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.71/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.73/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/etc_rw.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/etc_rw.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12244,10 +12244,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.71/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.73/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/executable.py	2009-08-26 10:48:18.000000000 -0400
-@@ -0,0 +1,374 @@
++++ policycoreutils-2.0.73/gui/templates/executable.py	2009-09-09 14:55:09.000000000 -0400
+@@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12456,8 +12456,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +#
 +interface(`TEMPLATETYPE_domtrans',`
 +	gen_require(`
-+		type TEMPLATETYPE_t;
-+                type TEMPLATETYPE_exec_t;
++		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 +	')
 +
 +	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
@@ -12576,12 +12575,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +## </param>
 +## <param name="role">
 +##	<summary>
-+##	The role to be allowed to manage the TEMPLATETYPE domain.
-+##	</summary>
-+## </param>
-+## <param name="terminal">
-+##	<summary>
-+##	The type of the user terminal.
++##	Role allowed access.
 +##	</summary>
 +## </param>
 +## <rolecap/>
@@ -12622,9 +12616,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.71/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.73/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/__init__.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/__init__.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12644,9 +12638,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.71/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.73/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/network.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/network.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12728,9 +12722,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.71/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.73/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/rw.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/rw.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12860,9 +12854,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.71/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.73/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/script.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/script.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12963,9 +12957,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Adding roles to SELinux user USER
 +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.71/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.73/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/semodule.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/semodule.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13008,9 +13002,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.71/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.73/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/tmp.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/tmp.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13109,9 +13103,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.71/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.73/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/user.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/user.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13295,9 +13289,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_newrole_rules="""
 +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.71/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.73/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/var_lib.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/var_lib.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13457,9 +13451,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.71/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.73/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/var_log.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/var_log.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13571,9 +13565,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.71/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.73/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/var_run.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/var_run.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13693,9 +13687,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.71/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.73/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/templates/var_spool.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/templates/var_spool.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13826,9 +13820,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.71/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.73/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/translationsPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/translationsPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13948,9 +13942,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.71/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.73/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/gui/usersPage.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.73/gui/usersPage.py	2009-09-08 09:21:09.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    3 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  200 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   51 +-
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1833 insertions(+), 950 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -p -r1.439 -r1.440
--- policycoreutils-rhat.patch	9 Sep 2009 17:04:51 -0000	1.439
+++ policycoreutils-rhat.patch	9 Sep 2009 21:07:24 -0000	1.440
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.73/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.73/audit2allow/audit2allow	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/audit2allow/audit2allow	2009-09-09 16:27:14.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -40,7 +40,7 @@ diff --exclude-from=exclude --exclude=se
              f = sys.stdin
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.73/load_policy/Makefile
 --- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/load_policy/Makefile	2009-09-08 10:08:07.000000000 -0400
++++ policycoreutils-2.0.73/load_policy/Makefile	2009-09-09 16:27:14.000000000 -0400
 @@ -1,6 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -51,7 +51,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.73/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/Makefile	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/Makefile	2009-09-09 16:27:14.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 sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -60,7 +60,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.73/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/Makefile	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/Makefile	2009-09-09 16:27:14.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -109,14 +109,14 @@ diff --exclude-from=exclude --exclude=se
  	/sbin/restorecon $(SBINDIR)/restorecond 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service	2009-09-09 16:27:14.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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.73/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.c	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.c	2009-09-09 16:27:14.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -609,7 +609,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.73/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.conf	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.conf	2009-09-09 16:27:14.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -622,7 +622,7 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.73/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond.desktop	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.desktop	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -633,7 +633,7 @@ diff --exclude-from=exclude --exclude=se
 +StartupNotify=false
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.73/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.h	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.h	2009-09-09 16:27:14.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -660,7 +660,7 @@ diff --exclude-from=exclude --exclude=se
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.73/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.init	2009-09-08 19:19:57.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.init	2009-09-09 16:27:14.000000000 -0400
 @@ -82,9 +82,8 @@
  	[ -e /var/lock/subsys/restorecond ] && restart || :
  	;;
@@ -674,13 +674,13 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.73/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.73/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/user.c	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/user.c	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -921,7 +921,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.73/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/watch.c	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/watch.c	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1179,7 +1179,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.73/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/Makefile	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/Makefile	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1214,7 +1214,7 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,200 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1418,7 +1418,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.73/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox.8	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox.8	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1448,12 +1448,15 @@ diff --exclude-from=exclude --exclude=se
 +.PP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.73/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandboxX.sh	2009-09-08 09:21:08.000000000 -0400
-@@ -0,0 +1,13 @@
++++ policycoreutils-2.0.73/sandbox/sandboxX.sh	2009-09-09 17:01:54.000000000 -0400
+@@ -0,0 +1,16 @@
 +#!/bin/bash 
-+(Xephyr -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
++export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
++export SCREEN=`/usr/bin/xdpyinfo -display $DISPLAY | /bin/awk '/dimensions/ { print $2 }'`
++
++(/usr/bin/Xephyr -title "$TITLE" -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
 +export DISPLAY=:$D
-+matchbox-window-manager -use_titlebar no &
++/usr/bin/matchbox-window-manager -use_titlebar no &
 +WM_PID=$!
 +~/.sandboxrc &
 +CLIENT_PID=$!
@@ -1465,7 +1468,7 @@ diff --exclude-from=exclude --exclude=se
 +done
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.73/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/seunshare.c	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/seunshare.c	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,203 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -1672,7 +1675,7 @@ diff --exclude-from=exclude --exclude=se
 +}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.73/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/chcat	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/scripts/chcat	2009-09-09 16:27:14.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1684,7 +1687,7 @@ diff --exclude-from=exclude --exclude=se
      
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.73/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/Makefile	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/scripts/Makefile	2009-09-09 16:27:14.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1696,7 +1699,7 @@ diff --exclude-from=exclude --exclude=se
  	-mkdir -p $(BINDIR)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.73/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/semanage	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/semanage/semanage	2009-09-09 16:28:00.000000000 -0400
 @@ -85,6 +85,7 @@
          -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)
@@ -1705,17 +1708,15 @@ 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")
-@@ -194,6 +195,9 @@
+@@ -194,6 +195,7 @@
  		locallist = False
  		use_file = False
                  store = ""
 +                equal=""
-+			
-+                dontaudit = ""
  			
  		object = argv[0]
  		option_dict=get_options()
-@@ -203,10 +207,12 @@
+@@ -203,10 +205,11 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
@@ -1724,12 +1725,11 @@ diff --exclude-from=exclude --exclude=se
  					    ['add',
  					     'delete',
  					     'deleteall',
-+					     'dontaudit=',
 +					     'equal=',
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -250,9 +256,15 @@
+@@ -250,6 +253,9 @@
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
@@ -1739,13 +1739,7 @@ diff --exclude-from=exclude --exclude=se
  			if o == "-F"  or o == "--file":
  				use_file = True
  
-+			if o == "--dontaudit":
-+                                dontaudit = not int(a)
-+
- 			if o == "-h" or o == "--help":
-                                raise ValueError(_("%s bad option") % o)
- 
-@@ -326,6 +338,9 @@
+@@ -326,6 +332,9 @@
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
  		
@@ -1755,7 +1749,7 @@ diff --exclude-from=exclude --exclude=se
  		if object == "translation":
  			OBJECT = seobject.setransRecords()
  		
-@@ -370,11 +385,17 @@
+@@ -370,11 +379,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -1774,7 +1768,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -394,6 +415,9 @@
+@@ -394,6 +409,9 @@
  				rlist = roles.split()
  				OBJECT.modify(target, rlist, selevel, serange, prefix)
  
@@ -1784,7 +1778,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -404,7 +428,10 @@
+@@ -404,7 +422,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -1798,8 +1792,8 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.73/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/seobject.py	2009-09-08 09:21:08.000000000 -0400
-@@ -1586,18 +1586,25 @@
++++ policycoreutils-2.0.73/semanage/seobject.py	2009-09-09 16:29:52.000000000 -0400
+@@ -1586,9 +1586,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -1816,17 +1810,6 @@ diff --exclude-from=exclude --exclude=se
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
- 
--		(rc, exists) = semanage_fcontext_exists_local(self.sh, k)
-+		(rc,exists) = semanage_fcontext_exists_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if file context for %s is defined") % target)
- 		if not exists:
--			(rc, exists) = semanage_fcontext_exists(self.sh, k)
-+			(rc,exists) = semanage_fcontext_exists(self.sh, k)
- 			if rc < 0:
- 				raise ValueError(_("Could not check if file context for %s is defined") % target)
- 			if exists:
 @@ -1644,11 +1651,11 @@
  		return ddict
  			
@@ -1843,7 +1826,7 @@ diff --exclude-from=exclude --exclude=se
  				if is_mls_enabled:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.73/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-09 16:27:14.000000000 -0400
 @@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
@@ -1859,7 +1842,7 @@ diff --exclude-from=exclude --exclude=se
  .TP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.73/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-09 16:27:14.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -1976,7 +1959,7 @@ diff --exclude-from=exclude --exclude=se
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.73/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-08 18:40:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-09 16:27:14.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1997,7 +1980,7 @@ diff --exclude-from=exclude --exclude=se
  	ln -sf setfiles restorecon
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.73/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.c	2009-09-08 09:27:33.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.c	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2520,7 +2503,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.73/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.h	2009-09-08 09:21:08.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.h	2009-09-09 16:27:14.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2573,7 +2556,7 @@ diff --exclude-from=exclude --exclude=se
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-09-08 19:09:27.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-08 09:49:37.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-09 16:27:14.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE
@@ -3100,16 +3083,6 @@ diff --exclude-from=exclude --exclude=se
  }
  
  int canoncon(char **contextp)
-@@ -535,7 +102,8 @@
- 			exit(1);
- 		}
- 	} else if (security_canonicalize_context_raw(context, &tmpcon) == 0) {
--		free(context);		*contextp = tmpcon;
-+		free(context);
-+		*contextp = tmpcon;
- 	} else if (errno != ENOENT) {
- 		rc = -1;
- 		inc_err();
 @@ -584,77 +152,6 @@
  	return 0;
  }



From dwalsh at fedoraproject.org  Wed Sep  9 21:08:02 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Sep 2009 21:08:02 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.184,
	1.185 modules-minimum.conf, 1.31, 1.32 modules-targeted.conf,
	1.140, 1.141 nsadiff, 1.21, 1.22 policy-F12.patch, 1.75,
	1.76 selinux-policy.spec, 1.914, 1.915 sources, 1.203, 1.204
Message-ID: <20090909210802.A5EAC11C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24269

Modified Files:
	.cvsignore modules-minimum.conf modules-targeted.conf nsadiff 
	policy-F12.patch selinux-policy.spec sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-6
- More fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- .cvsignore	31 Aug 2009 21:27:50 -0000	1.184
+++ .cvsignore	9 Sep 2009 21:08:00 -0000	1.185
@@ -188,3 +188,4 @@ setroubleshoot-2.2.21.tar.gz
 config.tgz
 serefpolicy-3.6.29.tgz
 serefpolicy-3.6.30.tgz
+serefpolicy-3.6.31.tgz


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- modules-minimum.conf	8 Sep 2009 23:55:30 -0000	1.31
+++ modules-minimum.conf	9 Sep 2009 21:08:00 -0000	1.32
@@ -240,6 +240,13 @@ chronyd = module
 comsat = module
 
 # Layer: services
+# Module: corosync
+#
+# Corosync Cluster Engine Executive
+# 
+corosync = module
+
+# Layer: services
 # Module: clamav
 #
 # ClamAV Virus Scanner
@@ -1165,6 +1172,20 @@ razor = module
 readahead = base
 
 # Layer: services
+# Module: rgmanager
+#
+# Red Hat Resource Group Manager
+#
+rgmanager = module
+
+# Layer: services
+# Module: rhcs
+#
+# RHCS - Red Hat Cluster Suite
+#
+rhcs = module
+ 
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager
@@ -1315,7 +1336,7 @@ sendmail = base
 # 
 seunshare = module
 
-# Layer: services
+# Layer: admin
 # Module: shorewall
 #
 # Policy for shorewall


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- modules-targeted.conf	8 Sep 2009 23:55:30 -0000	1.140
+++ modules-targeted.conf	9 Sep 2009 21:08:00 -0000	1.141
@@ -240,6 +240,13 @@ chronyd = module
 comsat = module
 
 # Layer: services
+# Module: corosync
+#
+# Corosync Cluster Engine Executive
+# 
+corosync = module
+
+# Layer: services
 # Module: clamav
 #
 # ClamAV Virus Scanner
@@ -1165,6 +1172,20 @@ razor = module
 readahead = base
 
 # Layer: services
+# Module: rgmanager
+#
+# Red Hat Resource Group Manager
+#
+rgmanager = module
+
+# Layer: services
+# Module: rhcs
+#
+# RHCS - Red Hat Cluster Suite
+#
+rhcs = module
+ 
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager
@@ -1315,7 +1336,7 @@ sendmail = base
 # 
 seunshare = module
 
-# Layer: services
+# Layer: admin
 # Module: shorewall
 #
 # Policy for shorewall


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nsadiff	31 Aug 2009 21:27:50 -0000	1.21
+++ nsadiff	9 Sep 2009 21:08:01 -0000	1.22
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.30 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.31 > /tmp/diff

policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +
 policy/modules/apps/gpg.te                |   10 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  289 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    2 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  150 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   88 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  276 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   54 +
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |   36 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1397 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 309 files changed, 14749 insertions(+), 2597 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.75 -r 1.76 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- policy-F12.patch	8 Sep 2009 23:55:30 -0000	1.75
+++ policy-F12.patch	9 Sep 2009 21:08:01 -0000	1.76
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.30/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.31/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.30/Makefile	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/Makefile	2009-09-09 15:38:24.000000000 -0400
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.30/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.31/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/global_tunables	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/global_tunables	2009-09-09 15:38:24.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -48,9 +48,9 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.30/policy/mcs
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.31/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/mcs	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/mcs	2009-09-09 15:38:24.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -84,9 +84,9 @@ diff -b -B --ignore-all-space --exclude-
  
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.30/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.31/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/anaconda.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/anaconda.te	2009-09-09 15:38:24.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -104,28 +104,29 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.30/policy/modules/admin/certwatch.te
---- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/certwatch.te	2009-08-31 13:40:47.000000000 -0400
-@@ -36,6 +36,7 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.31/policy/modules/admin/certwatch.te
+--- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/certwatch.te	2009-09-09 15:38:24.000000000 -0400
+@@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
  userdom_use_user_terminals(certwatch_t)
+-userdom_dontaudit_list_user_home_dirs(certwatch_t)
 +userdom_dontaudit_list_admin_dir(certwatch_t)
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.30/policy/modules/admin/dmesg.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.31/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/dmesg.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/dmesg.fc	2009-09-09 15:38:24.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.30/policy/modules/admin/dmesg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.31/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/dmesg.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/dmesg.te	2009-09-09 15:38:24.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -160,9 +161,9 @@ diff -b -B --ignore-all-space --exclude-
  # for when /usr is not mounted:
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.30/policy/modules/admin/firstboot.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.31/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/firstboot.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/firstboot.te	2009-09-09 15:38:24.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -185,9 +186,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.30/policy/modules/admin/logrotate.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.31/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/logrotate.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/logrotate.te	2009-09-09 15:38:24.000000000 -0400
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -230,42 +231,29 @@ diff -b -B --ignore-all-space --exclude-
  	slrnpull_manage_spool(logrotate_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.30/policy/modules/admin/logwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.31/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/logwatch.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/logwatch.te	2009-09-09 15:38:24.000000000 -0400
 @@ -136,4 +136,5 @@
  
  optional_policy(`
  	samba_read_log(logwatch_t)
 +	samba_read_share_files(logwatch_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.30/policy/modules/admin/mrtg.te
---- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/mrtg.te	2009-08-31 13:40:47.000000000 -0400
-@@ -116,6 +116,9 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.31/policy/modules/admin/mrtg.te
+--- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/mrtg.te	2009-09-09 15:38:24.000000000 -0400
+@@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
  userdom_dontaudit_use_unpriv_user_fds(mrtg_t)
 +userdom_dontaudit_list_admin_dir(mrtg_t)
-+
-+netutils_domtrans_ping(mrtg_t)
- 
- ifdef(`enable_mls',`
- 	corenet_udp_sendrecv_lo_if(mrtg_t)
-@@ -139,6 +142,10 @@
- ')
  
- optional_policy(`
-+	hddtemp_domtrans(mrtg_t)
-+')
-+
-+optional_policy(`
- 	seutil_sigchld_newrole(mrtg_t)
- ')
+ netutils_domtrans_ping(mrtg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.30/policy/modules/admin/portage.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.31/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/portage.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/portage.te	2009-09-09 15:38:24.000000000 -0400
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -275,9 +263,9 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:process signal;
  allow portage_fetch_t self:unix_stream_socket create_socket_perms;
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.30/policy/modules/admin/prelink.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.31/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/prelink.if	2009-09-04 10:32:08.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/prelink.if	2009-09-09 15:38:24.000000000 -0400
 @@ -140,3 +140,22 @@
  	files_search_var_lib($1)
  	manage_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
@@ -301,9 +289,9 @@ diff -b -B --ignore-all-space --exclude-
 +	files_search_var_lib($1)
 +	relabel_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.30/policy/modules/admin/prelink.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.31/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/prelink.te	2009-09-04 11:49:19.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/prelink.te	2009-09-09 15:38:24.000000000 -0400
 @@ -89,6 +89,7 @@
  miscfiles_read_localization(prelink_t)
  
@@ -312,9 +300,9 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	amanda_manage_lib(prelink_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.30/policy/modules/admin/readahead.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.31/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/admin/readahead.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/readahead.te	2009-09-09 15:38:24.000000000 -0400
[...6384 lines suppressed...]
  dev_read_urand(ifconfig_t)
  
 -domain_use_interactive_fds(ifconfig_t)
--
--files_read_etc_files(ifconfig_t)
--
++read_files_pattern(ifconfig_t, dhcpc_state_t, dhcpc_state_t)
+ 
+ files_read_etc_files(ifconfig_t)
++files_read_etc_runtime_files(ifconfig_t)
+ 
  fs_getattr_xattr_fs(ifconfig_t)
  fs_search_auto_mountpoints(ifconfig_t)
  
@@ -26348,7 +24474,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_read_root_files(ifconfig_t)
  
-@@ -294,6 +320,8 @@
+@@ -294,6 +318,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -26357,7 +24483,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -330,8 +358,21 @@
+@@ -330,8 +356,21 @@
  ')
  
  optional_policy(`
@@ -26379,9 +24505,9 @@ diff -b -B --ignore-all-space --exclude-
 +	hal_dontaudit_rw_dgram_sockets(dhcpc_t)
 +	hal_dontaudit_rw_pipes(ifconfig_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.30/policy/modules/system/udev.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.31/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/udev.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/udev.fc	2009-09-09 15:38:24.000000000 -0400
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -26392,9 +24518,9 @@ diff -b -B --ignore-all-space --exclude-
  
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.30/policy/modules/system/udev.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.31/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/udev.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/udev.if	2009-09-09 15:38:24.000000000 -0400
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)
@@ -26421,9 +24547,9 @@ diff -b -B --ignore-all-space --exclude-
 +	files_search_var_lib($1)
 +	manage_files_pattern($1, udev_var_run_t, udev_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.30/policy/modules/system/udev.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.31/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/udev.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/udev.te	2009-09-09 15:38:24.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;
@@ -26533,9 +24659,9 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.30/policy/modules/system/unconfined.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.31/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/unconfined.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/unconfined.fc	2009-09-09 15:38:24.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -26553,9 +24679,9 @@ diff -b -B --ignore-all-space --exclude-
 -ifdef(`distro_gentoo',`
 -/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.30/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.31/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/unconfined.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/unconfined.if	2009-09-09 15:38:24.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -27061,9 +25187,9 @@ diff -b -B --ignore-all-space --exclude-
 -
 -	allow $1 unconfined_t:dbus acquire_svc;
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.30/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.31/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/unconfined.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/unconfined.te	2009-09-09 15:38:24.000000000 -0400
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -27293,9 +25419,9 @@ diff -b -B --ignore-all-space --exclude-
 -		hal_dbus_chat(unconfined_execmem_t)
 -	')
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.30/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.31/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/userdomain.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/userdomain.fc	2009-09-09 15:38:24.000000000 -0400
 @@ -1,4 +1,8 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -27306,9 +25432,9 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.30/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.31/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/userdomain.if	2009-09-07 06:34:54.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/userdomain.if	2009-09-09 15:38:24.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29283,9 +27409,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow $1 user_tmp_t:file { getattr append };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.30/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.31/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/userdomain.te	2009-08-31 15:25:54.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/userdomain.te	2009-09-09 15:38:24.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -29371,9 +27497,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.30/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.31/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/xen.fc	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/xen.fc	2009-09-09 15:38:24.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -29401,9 +27527,9 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.30/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.31/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/xen.if	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/xen.if	2009-09-09 15:38:24.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -29454,9 +27580,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.30/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.31/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.30/policy/modules/system/xen.te	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/xen.te	2009-09-09 15:38:24.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -29754,9 +27880,9 @@ diff -b -B --ignore-all-space --exclude-
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.30/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.31/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/support/obj_perm_sets.spt	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/support/obj_perm_sets.spt	2009-09-09 15:38:24.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -29789,9 +27915,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.30/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.31/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.30/policy/users	2009-08-31 13:40:47.000000000 -0400
++++ serefpolicy-3.6.31/policy/users	2009-09-09 15:38:24.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -p -r1.914 -r1.915
--- selinux-policy.spec	8 Sep 2009 23:55:31 -0000	1.914
+++ selinux-policy.spec	9 Sep 2009 21:08:02 -0000	1.915
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.30
-Release: 6%{?dist}
+Version: 3.6.31
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- sources	31 Aug 2009 21:27:50 -0000	1.203
+++ sources	9 Sep 2009 21:08:02 -0000	1.204
@@ -1,2 +1,2 @@
 3651679c4b12a31d2ba5f4305bba5540  config.tgz
-454029dae056657855a1c54b283f34ac  serefpolicy-3.6.30.tgz
+bef42231597656c5dc04374547144441  serefpolicy-3.6.31.tgz



From mcepl at fedoraproject.org  Wed Sep  9 21:12:23 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 21:12:23 +0000 (UTC)
Subject: rpms/nimbus/EL-5 nimbus.spec,1.1,1.2
Message-ID: <20090909211223.265BA11C0423@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25834

Modified Files:
	nimbus.spec 
Log Message:
Universal .spec both for RHEL and Fedora


Index: nimbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/nimbus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nimbus.spec	9 Sep 2009 15:58:05 -0000	1.1
+++ nimbus.spec	9 Sep 2009 21:12:21 -0000	1.2
@@ -1,6 +1,10 @@
+# Define Variables that must exist
+%{?!rhel:%define rhel 0}
+%{?!fedora:%define fedora 0}
+
 Name:      nimbus
 Version:   0.0.17
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Desktop theme originally from Sun
 
 Group:      User Interface/Desktops
@@ -22,7 +26,10 @@ Just a virtual package to collect all Ni
 Summary: Desktop theme from Sun
 Group: User Interface/Desktops
 Requires:   gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
+%if 0%{?fedora} >= 10
 BuildArch: noarch
+%endif
+
 
 %description -n nimbus-theme-gnome
 The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
@@ -39,8 +46,14 @@ Gtk+ engine for %{name}.
 %package -n nimbus-icon-theme
 Summary: Icons for %{name}
 Group: User Interface/Desktops
+%if 0%{?fedora} >= 10
 BuildArch: noarch
-#Requires: fedora-logos
+%endif
+%if 0%{?fedora} >= 10
+Requires: fedora-logos
+%else
+Requires: redhat-artwork
+%endif
 
 %description -n nimbus-icon-theme
 Icons for %{name}.
@@ -48,7 +61,9 @@ Icons for %{name}.
 %package -n nimbus-metacity-theme
 Summary: Metacity theme for %{name}
 Group: User Interface/Desktops
+%if 0%{?fedora} >= 10
 BuildArch: noarch
+%endif
 Requires:   metacity
 
 %description -n nimbus-metacity-theme
@@ -81,16 +96,24 @@ make install DESTDIR=$RPM_BUILD_ROOT
 #no-la
 find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
 install -Dp -m 0644 index.theme \
-   $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
+	 $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
 touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache
 
-## removing OpenSolaris branding use start-here.png from Fedora
-#find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
-#     |while read FILENAME ; do
-#            NEWICON=$(echo $FILENAME \
-#            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
-#			  	ln -sf -v $NEWICON $FILENAME
-#	  done
+# removing OpenSolaris branding use start-here.png from Fedora
+%if 0%{?fedora}
+%define theme_name Fedora
+%else
+%define theme_name Bluecurve
+%endif
+find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
+	|while read FILENAME ; do
+		NEWICON=$(echo $FILENAME \
+		|sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./%{theme_name}\1!")
+%if 0%{?rhel}
+		NEWICON=$(echo $NEWICON|sed -e 's/places/mimetypes/')
+%endif
+		ln -sf -v $NEWICON $FILENAME
+	done
 	
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,8 +155,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/themes/nimbus/index.theme
 
 %changelog
-* Wed Sep  9 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-7
-- put back OpenSolaris branding before we figure how to do this platform free.
+* Wed Sep  9 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-8
+- use %%if and build both on RHEL and Fedora.
 
 * Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-6
 - remove OpenSolaris branding



From mcepl at fedoraproject.org  Wed Sep  9 21:12:49 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  9 Sep 2009 21:12:49 +0000 (UTC)
Subject: rpms/nimbus/devel nimbus.spec,1.1,1.2
Message-ID: <20090909211249.C0C4A11C00CE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26017

Modified Files:
	nimbus.spec 
Log Message:
Universal .spec both for RHEL and Fedora


Index: nimbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/devel/nimbus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nimbus.spec	5 Aug 2009 08:00:51 -0000	1.1
+++ nimbus.spec	9 Sep 2009 21:12:49 -0000	1.2
@@ -1,6 +1,10 @@
+# Define Variables that must exist
+%{?!rhel:%define rhel 0}
+%{?!fedora:%define fedora 0}
+
 Name:      nimbus
 Version:   0.0.17
-Release:   6%{?dist}
+Release:   8%{?dist}
 Summary:   Desktop theme originally from Sun
 
 Group:      User Interface/Desktops
@@ -22,7 +26,10 @@ Just a virtual package to collect all Ni
 Summary: Desktop theme from Sun
 Group: User Interface/Desktops
 Requires:   gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
+%if 0%{?fedora} >= 10
 BuildArch: noarch
+%endif
+
 
 %description -n nimbus-theme-gnome
 The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
@@ -39,8 +46,14 @@ Gtk+ engine for %{name}.
 %package -n nimbus-icon-theme
 Summary: Icons for %{name}
 Group: User Interface/Desktops
+%if 0%{?fedora} >= 10
 BuildArch: noarch
+%endif
+%if 0%{?fedora} >= 10
 Requires: fedora-logos
+%else
+Requires: redhat-artwork
+%endif
 
 %description -n nimbus-icon-theme
 Icons for %{name}.
@@ -48,7 +61,9 @@ Icons for %{name}.
 %package -n nimbus-metacity-theme
 Summary: Metacity theme for %{name}
 Group: User Interface/Desktops
+%if 0%{?fedora} >= 10
 BuildArch: noarch
+%endif
 Requires:   metacity
 
 %description -n nimbus-metacity-theme
@@ -81,16 +96,24 @@ make install DESTDIR=$RPM_BUILD_ROOT
 #no-la
 find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
 install -Dp -m 0644 index.theme \
-   $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
+	 $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
 touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache
 
 # removing OpenSolaris branding use start-here.png from Fedora
+%if 0%{?fedora}
+%define theme_name Fedora
+%else
+%define theme_name Bluecurve
+%endif
 find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
-     |while read FILENAME ; do
-            NEWICON=$(echo $FILENAME \
-            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
-			  	ln -sf -v $NEWICON $FILENAME
-	  done
+	|while read FILENAME ; do
+		NEWICON=$(echo $FILENAME \
+		|sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./%{theme_name}\1!")
+%if 0%{?rhel}
+		NEWICON=$(echo $NEWICON|sed -e 's/places/mimetypes/')
+%endif
+		ln -sf -v $NEWICON $FILENAME
+	done
 	
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,6 +155,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/themes/nimbus/index.theme
 
 %changelog
+* Wed Sep  9 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-8
+- use %%if and build both on RHEL and Fedora.
+
 * Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-6
 - remove OpenSolaris branding
 - add Requires for fedora-logos to nimbus-icon-theme



From cebbert at fedoraproject.org  Wed Sep  9 21:15:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Sep 2009 21:15:12 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.323, 1.324 kernel.spec, 1.1785, 
	1.1786
Message-ID: <20090909211513.0A89C11C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26945

Modified Files:
	config-generic kernel.spec 
Log Message:
Enable VXpocket and PDaudioCF PCMCIA sound drivers.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- config-generic	1 Sep 2009 17:08:26 -0000	1.323
+++ config-generic	9 Sep 2009 21:15:12 -0000	1.324
@@ -2691,8 +2691,9 @@ CONFIG_SND_USB_US122L=m
 #
 # PCMCIA devices
 #
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_VXPOCKET is not set
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
 
 #
 # Open Sound System
@@ -3668,7 +3669,6 @@ CONFIG_SND_SBAWE=m
 CONFIG_SND_OPL3SA2=m
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_PDAUDIOCF is not set
 CONFIG_SND_DARLA20=m
 CONFIG_SND_GINA20=m
 CONFIG_SND_LAYLA20=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1785
retrieving revision 1.1786
diff -u -p -r1.1785 -r1.1786
--- kernel.spec	9 Sep 2009 20:00:41 -0000	1.1785
+++ kernel.spec	9 Sep 2009 21:15:12 -0000	1.1786
@@ -2006,6 +2006,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>
+- Enable VXpocket and PDaudioCF PCMCIA sound drivers.
+
 * Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com>
 - Move to %%post generation of dracut initrd, because of GPL issues surrounding
   shipping a prebuild initrd
@@ -2015,7 +2018,7 @@ fi
 - Updated the NFS4 pseudo root code to the latest release.
 
 * Wed Sep 09 2009 Justin M. Forbes <jforbes at redhat.com>
-- Revert virio_blk to rotational mode. (#509383)
+- Revert virtio_blk to rotational mode. (#509383)
 
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
 - uggh lost nouveau bits in page flip



From cwickert at fedoraproject.org  Wed Sep  9 21:17:48 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 21:17:48 +0000 (UTC)
Subject: rpms/xfce4-systemload-plugin/F-10
	xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch, NONE,
	1.1 xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch, 
	NONE, 1.1 xfce4-systemload-plugin-0.4.2-tooltip.patch, NONE,
	1.1 xfce4-systemload-plugin.spec, 1.12, 1.13
Message-ID: <20090909211748.CE9BD11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-systemload-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27833/F-10

Modified Files:
	xfce4-systemload-plugin.spec 
Added Files:
	xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch 
	xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch 
	xfce4-systemload-plugin-0.4.2-tooltip.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-8
- Bring back tooltips in GTK >= 2.16 (#508637, bugzilla.xfce.org #5175)
- Fix bar colors (#505214, bugzilla.xfce.org #1889)
- Fix wrong free memory value (bugzilla.xfce.org #4215)


xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch:
 systemload.c |   42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

--- NEW FILE xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch ---
diff -u panel-plugin/systemload.c panel-plugin/systemload.c
--- panel-plugin/systemload.c	(working copy)
+++ panel-plugin/systemload.c	(working copy)
@@ -256,17 +256,16 @@
         gtk_container_add(GTK_CONTAINER(global->monitor[count]->ebox),
                           GTK_WIDGET(global->monitor[count]->box));
 
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor[count]->status));
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        }
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor[count]->options.color;
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor[count]->status), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_SELECTED,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor[count]->status),
+                               GTK_STATE_SELECTED,
+                               &global->monitor[count]->options.color);
+                             
         gtk_widget_show(GTK_WIDGET(global->monitor[count]->status));
 
         gtk_box_pack_start(GTK_BOX(global->monitor[count]->box),
@@ -384,18 +383,15 @@
         gtk_label_set_text(GTK_LABEL(global->monitor[count]->label),
                            global->monitor[count]->options.label_text);
 
-        gtk_widget_hide(GTK_WIDGET(global->monitor[count]->status));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor[count]->status));
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        }
-
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor[count]->options.color;
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor[count]->status), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_SELECTED,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor[count]->status),
+                               GTK_STATE_SELECTED,
+                               &global->monitor[count]->options.color);
 
         if(global->monitor[count]->options.enabled)
         {

xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch:
 memswap.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-systemload-plugin-0.4.2/panel-plugin/memswap.c xfce4-systemload-plugin-0.4.2.new/panel-plugin/memswap.c
--- xfce4-systemload-plugin-0.4.2/panel-plugin/memswap.c	2007-01-17 19:01:09.000000000 +0100
+++ xfce4-systemload-plugin-0.4.2.new/panel-plugin/memswap.c	2008-03-08 12:16:34.000000000 +0100
@@ -48,6 +48,7 @@
 static unsigned long MTotal = 0;
 static unsigned long MFree = 0;
 static unsigned long MCached = 0;
+static unsigned long MBuffers = 0;
 static unsigned long MUsed = 0;
 static unsigned long STotal = 0;
 static unsigned long SFree = 0;
@@ -57,8 +58,8 @@
 {
     int fd;
     size_t n;
-    int o_MTotal, o_MFree, o_MCached, o_STotal, o_SFree;
-    char *b_MTotal, *b_MFree, *b_MCached, *b_STotal, *b_SFree;
+    int o_MTotal, o_MFree, o_MCached, o_MBuffers, o_STotal, o_SFree;
+    char *b_MTotal, *b_MFree, *b_MCached, *b_MBuffers, *b_STotal, *b_SFree;
 
     if ((fd = open("/proc/meminfo", O_RDONLY)) < 0)
     {
@@ -87,6 +88,10 @@
     if (b_MCached)
         o_MCached = sscanf(b_MCached + strlen("Cached"), ": %lu", &MCached);
 
+    b_MBuffers = strstr(MemInfoBuf, "Buffers");
+    if (b_MBuffers)
+        o_MBuffers = sscanf(b_MBuffers + strlen("Buffers"), ": %lu", &MBuffers);
+
     b_STotal = strstr(MemInfoBuf, "SwapTotal");
     if (b_STotal)
         o_STotal = sscanf(b_STotal + strlen("SwapTotal"), ": %lu", &STotal);
@@ -95,7 +100,7 @@
     if (b_SFree)
         o_SFree = sscanf(b_SFree + strlen("SwapFree"), ": %lu", &SFree);
 
-    MFree += MCached;
+    MFree = MFree + MCached + MBuffers;
     MUsed = MTotal - MFree;
     SUsed = STotal - SFree;
     *mem = MUsed * 100 / MTotal;

xfce4-systemload-plugin-0.4.2-tooltip.patch:
 systemload.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xfce4-systemload-plugin-0.4.2-tooltip.patch ---
diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
index cc96ec4..027e8fe 100644
--- a/panel-plugin/systemload.c
+++ b/panel-plugin/systemload.c
@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
 {
     int count;
     t_global_monitor *global;
+    GtkSettings *settings;
 
     tooltips = gtk_tooltips_new ();
     g_object_ref (tooltips);
     gtk_object_sink (GTK_OBJECT (tooltips));
     
+    /* reduce the default tooltip timeout to be smaller than the update
+     * interval otherwise we won't see tooltips on GTK 2.16 or newer */
+    settings = gtk_settings_get_default();
+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
+      g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
+
     global = g_new(t_global_monitor, 1);
     global->plugin = plugin;
     global->timeout_id = 0;


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-systemload-plugin/F-10/xfce4-systemload-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-systemload-plugin.spec	19 Feb 2008 00:00:33 -0000	1.12
+++ xfce4-systemload-plugin.spec	9 Sep 2009 21:17:48 -0000	1.13
@@ -1,12 +1,21 @@
 Name:		xfce4-systemload-plugin
 Version:	0.4.2
-Release:	4%{?dist}
+Release:	8%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+# allow custom bar colors in all themes
+# http://bugzilla.xfce.org/show_bug.cgi?id=1889
+Patch0:		%{name}-0.4.2-fix-bar-colors.patch
+# memory usage in plugin is different from `free' output
+# http://bugzilla.xfce.org/show_bug.cgi?id=4215
+Patch1:		%{name}-0.4.2-fix-wrong-free-memory-value.patch
+# make tooltips work with GTK 2.16
+# http://bugzilla.xfce.org/show_bug.cgi?id=5175
+Patch2:		%{name}-0.4.2-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel
@@ -19,6 +28,11 @@ load, the memory in use, the swap space 
 
 %prep
 %setup -q
+%patch0 -p0 -b .colors
+%patch1 -p1 -b .free
+%if 0%{?fedora} >= 11
+%patch2 -p1 -b .tooltip
+%endif
 
 %build
 %configure --disable-static
@@ -39,32 +53,46 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-8
+- Bring back tooltips in GTK >= 2.16 (#508637, bugzilla.xfce.org #5175)
+- Fix bar colors (#505214, bugzilla.xfce.org #1889)
+- Fix wrong free memory value (bugzilla.xfce.org #4215)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-5
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.2-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-3
 - Rebuild for BuildID feature
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2 on Xfce 4.4.
 
-* Fri Dec 22 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
+* Fri Dec 22 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-6



From cwickert at fedoraproject.org  Wed Sep  9 21:17:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 21:17:50 +0000 (UTC)
Subject: rpms/xfce4-systemload-plugin/F-11
	xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch, NONE,
	1.1 xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch, 
	NONE, 1.1 xfce4-systemload-plugin-0.4.2-tooltip.patch, NONE,
	1.1 xfce4-systemload-plugin.spec, 1.14, 1.15
Message-ID: <20090909211750.9671111C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-systemload-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27833/F-11

Modified Files:
	xfce4-systemload-plugin.spec 
Added Files:
	xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch 
	xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch 
	xfce4-systemload-plugin-0.4.2-tooltip.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-8
- Bring back tooltips in GTK >= 2.16 (#508637, bugzilla.xfce.org #5175)
- Fix bar colors (#505214, bugzilla.xfce.org #1889)
- Fix wrong free memory value (bugzilla.xfce.org #4215)


xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch:
 systemload.c |   42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

--- NEW FILE xfce4-systemload-plugin-0.4.2-fix-bar-colors.patch ---
diff -u panel-plugin/systemload.c panel-plugin/systemload.c
--- panel-plugin/systemload.c	(working copy)
+++ panel-plugin/systemload.c	(working copy)
@@ -256,17 +256,16 @@
         gtk_container_add(GTK_CONTAINER(global->monitor[count]->ebox),
                           GTK_WIDGET(global->monitor[count]->box));
 
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor[count]->status));
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        }
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor[count]->options.color;
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor[count]->status), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_SELECTED,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor[count]->status),
+                               GTK_STATE_SELECTED,
+                               &global->monitor[count]->options.color);
+                             
         gtk_widget_show(GTK_WIDGET(global->monitor[count]->status));
 
         gtk_box_pack_start(GTK_BOX(global->monitor[count]->box),
@@ -384,18 +383,15 @@
         gtk_label_set_text(GTK_LABEL(global->monitor[count]->label),
                            global->monitor[count]->options.label_text);
 
-        gtk_widget_hide(GTK_WIDGET(global->monitor[count]->status));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor[count]->status));
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        }
-
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor[count]->options.color;
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor[count]->status), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor[count]->status),
+                             GTK_STATE_SELECTED,
+                             &global->monitor[count]->options.color);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor[count]->status),
+                               GTK_STATE_SELECTED,
+                               &global->monitor[count]->options.color);
 
         if(global->monitor[count]->options.enabled)
         {

xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch:
 memswap.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE xfce4-systemload-plugin-0.4.2-fix-wrong-free-memory-value.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-systemload-plugin-0.4.2/panel-plugin/memswap.c xfce4-systemload-plugin-0.4.2.new/panel-plugin/memswap.c
--- xfce4-systemload-plugin-0.4.2/panel-plugin/memswap.c	2007-01-17 19:01:09.000000000 +0100
+++ xfce4-systemload-plugin-0.4.2.new/panel-plugin/memswap.c	2008-03-08 12:16:34.000000000 +0100
@@ -48,6 +48,7 @@
 static unsigned long MTotal = 0;
 static unsigned long MFree = 0;
 static unsigned long MCached = 0;
+static unsigned long MBuffers = 0;
 static unsigned long MUsed = 0;
 static unsigned long STotal = 0;
 static unsigned long SFree = 0;
@@ -57,8 +58,8 @@
 {
     int fd;
     size_t n;
-    int o_MTotal, o_MFree, o_MCached, o_STotal, o_SFree;
-    char *b_MTotal, *b_MFree, *b_MCached, *b_STotal, *b_SFree;
+    int o_MTotal, o_MFree, o_MCached, o_MBuffers, o_STotal, o_SFree;
+    char *b_MTotal, *b_MFree, *b_MCached, *b_MBuffers, *b_STotal, *b_SFree;
 
     if ((fd = open("/proc/meminfo", O_RDONLY)) < 0)
     {
@@ -87,6 +88,10 @@
     if (b_MCached)
         o_MCached = sscanf(b_MCached + strlen("Cached"), ": %lu", &MCached);
 
+    b_MBuffers = strstr(MemInfoBuf, "Buffers");
+    if (b_MBuffers)
+        o_MBuffers = sscanf(b_MBuffers + strlen("Buffers"), ": %lu", &MBuffers);
+
     b_STotal = strstr(MemInfoBuf, "SwapTotal");
     if (b_STotal)
         o_STotal = sscanf(b_STotal + strlen("SwapTotal"), ": %lu", &STotal);
@@ -95,7 +100,7 @@
     if (b_SFree)
         o_SFree = sscanf(b_SFree + strlen("SwapFree"), ": %lu", &SFree);
 
-    MFree += MCached;
+    MFree = MFree + MCached + MBuffers;
     MUsed = MTotal - MFree;
     SUsed = STotal - SFree;
     *mem = MUsed * 100 / MTotal;

xfce4-systemload-plugin-0.4.2-tooltip.patch:
 systemload.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xfce4-systemload-plugin-0.4.2-tooltip.patch ---
diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
index cc96ec4..027e8fe 100644
--- a/panel-plugin/systemload.c
+++ b/panel-plugin/systemload.c
@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
 {
     int count;
     t_global_monitor *global;
+    GtkSettings *settings;
 
     tooltips = gtk_tooltips_new ();
     g_object_ref (tooltips);
     gtk_object_sink (GTK_OBJECT (tooltips));
     
+    /* reduce the default tooltip timeout to be smaller than the update
+     * interval otherwise we won't see tooltips on GTK 2.16 or newer */
+    settings = gtk_settings_get_default();
+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
+      g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
+
     global = g_new(t_global_monitor, 1);
     global->plugin = plugin;
     global->timeout_id = 0;


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-systemload-plugin/F-11/xfce4-systemload-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-systemload-plugin.spec	26 Feb 2009 09:08:35 -0000	1.14
+++ xfce4-systemload-plugin.spec	9 Sep 2009 21:17:48 -0000	1.15
@@ -1,12 +1,21 @@
 Name:		xfce4-systemload-plugin
 Version:	0.4.2
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+# allow custom bar colors in all themes
+# http://bugzilla.xfce.org/show_bug.cgi?id=1889
+Patch0:		%{name}-0.4.2-fix-bar-colors.patch
+# memory usage in plugin is different from `free' output
+# http://bugzilla.xfce.org/show_bug.cgi?id=4215
+Patch1:		%{name}-0.4.2-fix-wrong-free-memory-value.patch
+# make tooltips work with GTK 2.16
+# http://bugzilla.xfce.org/show_bug.cgi?id=5175
+Patch2:		%{name}-0.4.2-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel
@@ -19,6 +28,11 @@ load, the memory in use, the swap space 
 
 %prep
 %setup -q
+%patch0 -p0 -b .colors
+%patch1 -p1 -b .free
+%if 0%{?fedora} >= 11
+%patch2 -p1 -b .tooltip
+%endif
 
 %build
 %configure --disable-static
@@ -39,6 +53,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-8
+- Bring back tooltips in GTK >= 2.16 (#508637, bugzilla.xfce.org #5175)
+- Fix bar colors (#505214, bugzilla.xfce.org #1889)
+- Fix wrong free memory value (bugzilla.xfce.org #4215)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From xavierb at fedoraproject.org  Wed Sep  9 21:18:21 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed,  9 Sep 2009 21:18:21 +0000 (UTC)
Subject: rpms/nsca/EL-5 nsca.spec,1.2,1.3
Message-ID: <20090909211821.49F5F11C00CE@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/nsca/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28131

Modified Files:
	nsca.spec 
Log Message:
Revert max plugin output length patch.


Index: nsca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsca/EL-5/nsca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nsca.spec	20 Jul 2009 20:43:18 -0000	1.2
+++ nsca.spec	9 Sep 2009 21:18:20 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:        Nagios Service Check Acceptor
 Name:           nsca
 Version:        2.7.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 URL:            http://www.nagios.org/
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Patch0:         nsca-2.7.2-initscript.patch
 Patch1:         nsca-2.7.2-confpath.patch
-Patch2:         nsca-increase_max_plugin_output_length.patch
+#Patch2:         nsca-increase_max_plugin_output_length.patch
 
 BuildRequires:  libmcrypt-devel
 Requires:       nagios
@@ -37,7 +37,7 @@ Client application for sending updates t
 %setup -q
 %patch0 -p0 -b .initscript
 %patch1 -p1 -b .confpath
-%patch2 -p0 -b .max_plugin_output_length
+#%patch2 -p0 -b .max_plugin_output_length
 # Change defaults in the config file to match the nagios package
 sed -i -e "s|^command_file=.*|command_file=%{_localstatedir}/spool/nagios/cmd/nagios.cmd|" \
        -e "s|^alternate_dump_file=.*|alternate_dump_file=%{_localstatedir}/spool/nagios/cmd/nsca.dump|" \
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 09 2009 Xavier Bachelot <xavier at bachelot.org> - 2.7.2-8
+- Revert max plugin output length patch.
+
 * Fri Jul 17 2009 Xavier Bachelot <xavier at bachelot.org> - 2.7.2-7
 - Increase max plugin output length to match nagios
   (RHBZ#497847, related to RHBZ#469198).



From jjames at fedoraproject.org  Wed Sep  9 21:28:12 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed,  9 Sep 2009 21:28:12 +0000 (UTC)
Subject: rpms/emacs-common-pmd/devel emacs-common-pmd.spec, NONE,
	1.1 import.log, NONE, 1.1 pmd-emacs-0.6.patch, NONE, 1.1 pmd.el,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909212812.5614B11C00CE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/emacs-common-pmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31911/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-common-pmd.spec import.log pmd-emacs-0.6.patch pmd.el 
Log Message:
Initial Rawhide import.



--- NEW FILE emacs-common-pmd.spec ---
%global pkg pmd
%global pkgname pmd-emacs

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version  22.1
%global emacs_lispdir  %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version  %(pkg-config emacs --modversion)
%global emacs_lispdir  %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

%if %($(pkg-config xemacs) ; echo $?)
%global xemacs_version  21.5
%global xemacs_lispdir  %{_datadir}/xemacs/site-packages/lisp
%global xemacs_startdir %{_datadir}/xemacs/site-packages/lisp/site-start.d
%else
%global xemacs_version  %(pkg-config xemacs --modversion)
%global xemacs_lispdir  %(pkg-config xemacs --variable sitepkglispdir)
%global xemacs_startdir %(pkg-config xemacs --variable sitestartdir)
%endif

Name:           emacs-common-%{pkg}
Version:        0.6
Release:        2%{?dist}
Summary:        An interface to PMD for Emacs

Group:          Development/Tools
License:        GPLv2+
URL:            http://pmd.sourceforge.net/
Source0:        http://downloads.sourceforge.net/pmd/pmd-emacs-%{version}.zip
Source1:        pmd.el
# This patch has not been sent upstream, since it is (mostly) Fedora specific.
# It does the following:
# - Adds (require 'compile) so that compile-mode related functions and
#   variables are defined.
# - Changes the default path to the Java binary to /usr/bin/java.
# - Removes the pmd-home variable, since it is used by code that assumes a
#   directory structure that does not exist in the Fedora PMD package.
# - Replaces the pmd-xemacsp variables with (featurep 'xemacs).  The latter
#   form is recognized by the Emacs byte compiler, and results in fewer
#   warnings and more efficient code than the former.
# - Changes the definitions of pmd-classpath and pmd-jar to match the locations
#   of PMD-related JAR files on Fedora.
# - On Emacs, uses compilation-start instead of the obsolete compile-internal.
Patch0:         pmd-emacs-0.6.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  emacs emacs-el xemacs xemacs-devel xemacs-packages-extra

%description
%{pkgname} supports the invocation of PMD from within (X)Emacs.  Specifically,
it supplies functions pmd-current-buffer and pmd-current-dir, and enables
parsing of the resulting list of PMD complaints so that, for example,
next-error will walk through the list correctly.

This package contains the files common to both the GNU Emacs and XEmacs
%{pkgname} packages.


%package -n emacs-%{pkg}
Summary:        Compiled elisp files to run %{pkgname} under GNU Emacs
Group:          Development/Tools
Requires:       emacs(bin) >= %{emacs_version}
Requires:       emacs-common-%{pkg} = %{version}-%{release}
Requires:       pmd

%description -n emacs-%{pkg}
This package contains the byte compiled elisp packages to run %{pkgname} with
GNU Emacs.

%package -n emacs-%{pkg}-el
Summary:        Elisp source files for %{pkgname} under GNU Emacs
Group:          Development/Tools
Requires:       emacs-%{pkg} = %{version}-%{release}

%description -n emacs-%{pkg}-el
This package contains the elisp source files for %{pkgname} under GNU Emacs.
You do not need to install this package to run %{pkgname}.  Install the
emacs-%{pkg} package to use %{pkgname} with GNU Emacs.


%package -n xemacs-%{pkg}
Summary:        Compiled elisp files to run %{pkgname} under XEmacs
Group:          Development/Tools
Requires:       xemacs(bin) >= %{xemacs_version}
Requires:       xemacs-packages-extra
Requires:       emacs-common-%{pkg} = %{version}-%{release}
Requires:       pmd

%description -n xemacs-%{pkg}
This package contains the byte compiled elisp packages to run %{pkgname} with
XEmacs.

%package -n xemacs-%{pkg}-el
Summary:        Elisp source files for %{pkgname} under XEmacs
Group:          Development/Tools
Requires:       xemacs-%{pkg} = %{version}-%{release}

%description -n xemacs-%{pkg}-el
This package contains the elisp source files for %{pkgname} under XEmacs.
You do not need to install this package to run %{pkgname}.  Install the
xemacs-%{pkg} package to use %{pkgname} with XEmacs.


%prep
%setup -q -n %{pkgname}-%{version}
%patch0 -p1
chmod a-x pmd.el


%build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
emacs -batch -no-site-file -f batch-byte-compile pmd.el
cp -p pmd.el* $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}

mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{xemacs_startdir}
rm -f pmd.elc
xemacs -batch -no-site-file -f batch-byte-compile pmd.el
cp -p pmd.el* $RPM_BUILD_ROOT%{xemacs_lispdir}/%{pkg}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG INSTALL LICENSE.txt

%files -n emacs-%{pkg}
%defattr(-,root,root,-)
%dir %{emacs_lispdir}/%{pkg}
%{emacs_lispdir}/%{pkg}/%{pkg}.elc
%{emacs_startdir}/%{pkg}.el

%files -n emacs-%{pkg}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/%{pkg}.el

%files -n xemacs-%{pkg}
%defattr(-,root,root,-)
%dir %{xemacs_lispdir}/%{pkg}
%{xemacs_lispdir}/%{pkg}/%{pkg}.elc
%{xemacs_startdir}/%{pkg}.el

%files -n xemacs-%{pkg}-el
%defattr(-,root,root,-)
%{xemacs_lispdir}/%{pkg}/%{pkg}.el


%changelog
* Fri Aug 21 2009 Jerry James <loganjerry at gmail.com> - 0.6-2
- Package structure and naming cleanups to adhere to Fedora guidelines

* Wed Jan 21 2009 Jerry James <loganjerry at gmail.com> - 0.6-1
- Initial package


--- NEW FILE import.log ---
emacs-common-pmd-0_6-2_fc11:HEAD:emacs-common-pmd-0.6-2.fc11.src.rpm:1252531609

pmd-emacs-0.6.patch:
 pmd.el |   43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

--- NEW FILE pmd-emacs-0.6.patch ---
diff -dur pmd-emacs-0.6.ORIG/pmd.el pmd-emacs-0.6/pmd.el
--- pmd-emacs-0.6.ORIG/pmd.el	2005-10-24 13:21:45.000000000 -0600
+++ pmd-emacs-0.6/pmd.el	2009-01-21 12:42:49.000000000 -0700
@@ -85,20 +85,16 @@
 ;; to *PMD*. Output format is in XML.  I will work in trying to 
 ;; get a better, easier to read format for everyone.
 
+(require 'compile)
 
 (defgroup pmd nil "PMD"
   :group 'emacs)
 
-(defcustom pmd-java-home "/usr/local/bin/java"
+(defcustom pmd-java-home "/usr/bin/java"
   "Java binary to run PMD with."
   :type 'file
   :group 'pmd )
 
-(defcustom pmd-home "~/pmd"
-  "Directory where PMD is installed."
-  :type 'directory
-  :group 'pmd)
-
 (defcustom pmd-ruleset-list (list "basic" "braces" "clone" "codesize" "controversial" "coupling" 
                                   "design" "finalizers" "imports" "javabeans" "junit" "logging-java" 
                                   "naming" "optimizations" "strictexception" "strings" "sunsecure" 
@@ -112,8 +108,6 @@
 ;;Inner workings
 ;;-------------------------
 
-(defconst pmd-xemacsp (string-match "XEmacs" (emacs-version)))
-
 (defun pmd-help ()
   "Help for `pmd-mode'."
   (interactive)
@@ -144,27 +138,16 @@
   (pmd-file-or-dir (file-name-directory (buffer-file-name))))
 
 (defun pmd-classpath ()
-  (let* ((path-separator (if (eq system-type 'windows-nt) ";" ":"))
-         (path-slash     (if (eq system-type 'windows-nt) "\\" "/"))
-         (pmd-etc     (concat pmd-home "etc"))
-         (pmd-lib     (concat pmd-home path-slash "lib" path-slash)))
-    (concat "\'" 
-            pmd-etc path-separator
-            (mapconcat
-             (lambda (path)
-               path) 
-             (directory-files pmd-lib t "\\.jar$")
-             path-separator)
-            "\'")))
+  (let* ((path-separator (if (eq system-type 'windows-nt) ";" ":")))
+    (concat "\'"
+	    "/usr/share/java/jakarta-oro.jar" path-separator
+	    "/usr/share/java/jaxen.jar"       path-separator
+	    "/usr/share/java/xerces-j2.jar"   path-separator
+	    "/usr/share/java/xml-commons-apis.jar"
+	    "\'")))
 
 (defun pmd-jar ()
-  (let* ((path-separator (if (eq system-type 'windows-nt) ";" ":"))
-         (path-slash     (if (eq system-type 'windows-nt) "\\" "/"))
-         (pmd-etc     (concat pmd-home "etc"))
-         (pmd-lib     (concat pmd-home path-slash "lib" path-slash)))
-    (concat "\'" 
-            (car (directory-files pmd-lib t ".*pmd-.*\\.jar$"))
-            "\'")))
+  "/usr/share/java/pmd.jar")
 
 ;; (defun pmd-file-or-dir (target)
 ;;   "Run PMD on the given target (file or dir)"
@@ -199,7 +182,7 @@
     ;; Force save-some-buffers to use the minibuffer
     ;; to query user about whether to save modified buffers.
     (if (and (eq system-type 'windows-nt)
-             (not pmd-xemacsp)) 
+             (not (featurep 'xemacs))) 
         (let ((temp last-nonmenu-event))
           ;; The next line makes emacs think that jde-jalopy
           ;; was invoked from the minibuffer, even when it
@@ -208,7 +191,9 @@
           (save-some-buffers (not compilation-ask-about-save) nil)
           (setq last-nonmenu-event temp))
       (save-some-buffers (not compilation-ask-about-save) nil))
-    (compile-internal pmd-command "No more errors" "PMD")))
+    (if (featurep 'xemacs)
+	(compile-internal pmd-command "No more errors" "PMD")
+      (compilation-start pmd-command))))
 
 (provide 'pmd)
 


--- NEW FILE pmd.el ---
(add-to-list 'load-path "/usr/share/xemacs/site-packages/lisp/pmd")
(autoload 'pmd-current-buffer "pmd" "PMD Mode" t)
(autoload 'pmd-current-dir "pmd" "PMD Mode" t)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-pmd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:12:47 -0000	1.1
+++ .cvsignore	9 Sep 2009 21:28:09 -0000	1.2
@@ -0,0 +1 @@
+pmd-emacs-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-pmd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:12:47 -0000	1.1
+++ sources	9 Sep 2009 21:28:10 -0000	1.2
@@ -0,0 +1 @@
+35296ccef798e21cf3b6815a713c1147  pmd-emacs-0.6.zip



From jjames at fedoraproject.org  Wed Sep  9 21:29:36 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed,  9 Sep 2009 21:29:36 +0000 (UTC)
Subject: rpms/emacs-common-pmd/F-11 emacs-common-pmd.spec, NONE,
	1.1 pmd-emacs-0.6.patch, NONE, 1.1 pmd.el, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090909212936.AF96F11C00CE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/emacs-common-pmd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv860/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-common-pmd.spec pmd-emacs-0.6.patch pmd.el 
Log Message:
Initial F-11 import.



--- NEW FILE emacs-common-pmd.spec ---
%global pkg pmd
%global pkgname pmd-emacs

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version  22.1
%global emacs_lispdir  %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version  %(pkg-config emacs --modversion)
%global emacs_lispdir  %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

%if %($(pkg-config xemacs) ; echo $?)
%global xemacs_version  21.5
%global xemacs_lispdir  %{_datadir}/xemacs/site-packages/lisp
%global xemacs_startdir %{_datadir}/xemacs/site-packages/lisp/site-start.d
%else
%global xemacs_version  %(pkg-config xemacs --modversion)
%global xemacs_lispdir  %(pkg-config xemacs --variable sitepkglispdir)
%global xemacs_startdir %(pkg-config xemacs --variable sitestartdir)
%endif

Name:           emacs-common-%{pkg}
Version:        0.6
Release:        2%{?dist}
Summary:        An interface to PMD for Emacs

Group:          Development/Tools
License:        GPLv2+
URL:            http://pmd.sourceforge.net/
Source0:        http://downloads.sourceforge.net/pmd/pmd-emacs-%{version}.zip
Source1:        pmd.el
# This patch has not been sent upstream, since it is (mostly) Fedora specific.
# It does the following:
# - Adds (require 'compile) so that compile-mode related functions and
#   variables are defined.
# - Changes the default path to the Java binary to /usr/bin/java.
# - Removes the pmd-home variable, since it is used by code that assumes a
#   directory structure that does not exist in the Fedora PMD package.
# - Replaces the pmd-xemacsp variables with (featurep 'xemacs).  The latter
#   form is recognized by the Emacs byte compiler, and results in fewer
#   warnings and more efficient code than the former.
# - Changes the definitions of pmd-classpath and pmd-jar to match the locations
#   of PMD-related JAR files on Fedora.
# - On Emacs, uses compilation-start instead of the obsolete compile-internal.
Patch0:         pmd-emacs-0.6.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  emacs emacs-el xemacs xemacs-devel xemacs-packages-extra

%description
%{pkgname} supports the invocation of PMD from within (X)Emacs.  Specifically,
it supplies functions pmd-current-buffer and pmd-current-dir, and enables
parsing of the resulting list of PMD complaints so that, for example,
next-error will walk through the list correctly.

This package contains the files common to both the GNU Emacs and XEmacs
%{pkgname} packages.


%package -n emacs-%{pkg}
Summary:        Compiled elisp files to run %{pkgname} under GNU Emacs
Group:          Development/Tools
Requires:       emacs(bin) >= %{emacs_version}
Requires:       emacs-common-%{pkg} = %{version}-%{release}
Requires:       pmd

%description -n emacs-%{pkg}
This package contains the byte compiled elisp packages to run %{pkgname} with
GNU Emacs.

%package -n emacs-%{pkg}-el
Summary:        Elisp source files for %{pkgname} under GNU Emacs
Group:          Development/Tools
Requires:       emacs-%{pkg} = %{version}-%{release}

%description -n emacs-%{pkg}-el
This package contains the elisp source files for %{pkgname} under GNU Emacs.
You do not need to install this package to run %{pkgname}.  Install the
emacs-%{pkg} package to use %{pkgname} with GNU Emacs.


%package -n xemacs-%{pkg}
Summary:        Compiled elisp files to run %{pkgname} under XEmacs
Group:          Development/Tools
Requires:       xemacs(bin) >= %{xemacs_version}
Requires:       xemacs-packages-extra
Requires:       emacs-common-%{pkg} = %{version}-%{release}
Requires:       pmd

%description -n xemacs-%{pkg}
This package contains the byte compiled elisp packages to run %{pkgname} with
XEmacs.

%package -n xemacs-%{pkg}-el
Summary:        Elisp source files for %{pkgname} under XEmacs
Group:          Development/Tools
Requires:       xemacs-%{pkg} = %{version}-%{release}

%description -n xemacs-%{pkg}-el
This package contains the elisp source files for %{pkgname} under XEmacs.
You do not need to install this package to run %{pkgname}.  Install the
xemacs-%{pkg} package to use %{pkgname} with XEmacs.


%prep
%setup -q -n %{pkgname}-%{version}
%patch0 -p1
chmod a-x pmd.el


%build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
emacs -batch -no-site-file -f batch-byte-compile pmd.el
cp -p pmd.el* $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}

mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{xemacs_startdir}
rm -f pmd.elc
xemacs -batch -no-site-file -f batch-byte-compile pmd.el
cp -p pmd.el* $RPM_BUILD_ROOT%{xemacs_lispdir}/%{pkg}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG INSTALL LICENSE.txt

%files -n emacs-%{pkg}
%defattr(-,root,root,-)
%dir %{emacs_lispdir}/%{pkg}
%{emacs_lispdir}/%{pkg}/%{pkg}.elc
%{emacs_startdir}/%{pkg}.el

%files -n emacs-%{pkg}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/%{pkg}.el

%files -n xemacs-%{pkg}
%defattr(-,root,root,-)
%dir %{xemacs_lispdir}/%{pkg}
%{xemacs_lispdir}/%{pkg}/%{pkg}.elc
%{xemacs_startdir}/%{pkg}.el

%files -n xemacs-%{pkg}-el
%defattr(-,root,root,-)
%{xemacs_lispdir}/%{pkg}/%{pkg}.el


%changelog
* Fri Aug 21 2009 Jerry James <loganjerry at gmail.com> - 0.6-2
- Package structure and naming cleanups to adhere to Fedora guidelines

* Wed Jan 21 2009 Jerry James <loganjerry at gmail.com> - 0.6-1
- Initial package

pmd-emacs-0.6.patch:
 pmd.el |   43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

--- NEW FILE pmd-emacs-0.6.patch ---
diff -dur pmd-emacs-0.6.ORIG/pmd.el pmd-emacs-0.6/pmd.el
--- pmd-emacs-0.6.ORIG/pmd.el	2005-10-24 13:21:45.000000000 -0600
+++ pmd-emacs-0.6/pmd.el	2009-01-21 12:42:49.000000000 -0700
@@ -85,20 +85,16 @@
 ;; to *PMD*. Output format is in XML.  I will work in trying to 
 ;; get a better, easier to read format for everyone.
 
+(require 'compile)
 
 (defgroup pmd nil "PMD"
   :group 'emacs)
 
-(defcustom pmd-java-home "/usr/local/bin/java"
+(defcustom pmd-java-home "/usr/bin/java"
   "Java binary to run PMD with."
   :type 'file
   :group 'pmd )
 
-(defcustom pmd-home "~/pmd"
-  "Directory where PMD is installed."
-  :type 'directory
-  :group 'pmd)
-
 (defcustom pmd-ruleset-list (list "basic" "braces" "clone" "codesize" "controversial" "coupling" 
                                   "design" "finalizers" "imports" "javabeans" "junit" "logging-java" 
                                   "naming" "optimizations" "strictexception" "strings" "sunsecure" 
@@ -112,8 +108,6 @@
 ;;Inner workings
 ;;-------------------------
 
-(defconst pmd-xemacsp (string-match "XEmacs" (emacs-version)))
-
 (defun pmd-help ()
   "Help for `pmd-mode'."
   (interactive)
@@ -144,27 +138,16 @@
   (pmd-file-or-dir (file-name-directory (buffer-file-name))))
 
 (defun pmd-classpath ()
-  (let* ((path-separator (if (eq system-type 'windows-nt) ";" ":"))
-         (path-slash     (if (eq system-type 'windows-nt) "\\" "/"))
-         (pmd-etc     (concat pmd-home "etc"))
-         (pmd-lib     (concat pmd-home path-slash "lib" path-slash)))
-    (concat "\'" 
-            pmd-etc path-separator
-            (mapconcat
-             (lambda (path)
-               path) 
-             (directory-files pmd-lib t "\\.jar$")
-             path-separator)
-            "\'")))
+  (let* ((path-separator (if (eq system-type 'windows-nt) ";" ":")))
+    (concat "\'"
+	    "/usr/share/java/jakarta-oro.jar" path-separator
+	    "/usr/share/java/jaxen.jar"       path-separator
+	    "/usr/share/java/xerces-j2.jar"   path-separator
+	    "/usr/share/java/xml-commons-apis.jar"
+	    "\'")))
 
 (defun pmd-jar ()
-  (let* ((path-separator (if (eq system-type 'windows-nt) ";" ":"))
-         (path-slash     (if (eq system-type 'windows-nt) "\\" "/"))
-         (pmd-etc     (concat pmd-home "etc"))
-         (pmd-lib     (concat pmd-home path-slash "lib" path-slash)))
-    (concat "\'" 
-            (car (directory-files pmd-lib t ".*pmd-.*\\.jar$"))
-            "\'")))
+  "/usr/share/java/pmd.jar")
 
 ;; (defun pmd-file-or-dir (target)
 ;;   "Run PMD on the given target (file or dir)"
@@ -199,7 +182,7 @@
     ;; Force save-some-buffers to use the minibuffer
     ;; to query user about whether to save modified buffers.
     (if (and (eq system-type 'windows-nt)
-             (not pmd-xemacsp)) 
+             (not (featurep 'xemacs))) 
         (let ((temp last-nonmenu-event))
           ;; The next line makes emacs think that jde-jalopy
           ;; was invoked from the minibuffer, even when it
@@ -208,7 +191,9 @@
           (save-some-buffers (not compilation-ask-about-save) nil)
           (setq last-nonmenu-event temp))
       (save-some-buffers (not compilation-ask-about-save) nil))
-    (compile-internal pmd-command "No more errors" "PMD")))
+    (if (featurep 'xemacs)
+	(compile-internal pmd-command "No more errors" "PMD")
+      (compilation-start pmd-command))))
 
 (provide 'pmd)
 


--- NEW FILE pmd.el ---
(add-to-list 'load-path "/usr/share/xemacs/site-packages/lisp/pmd")
(autoload 'pmd-current-buffer "pmd" "PMD Mode" t)
(autoload 'pmd-current-dir "pmd" "PMD Mode" t)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-pmd/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:12:47 -0000	1.1
+++ .cvsignore	9 Sep 2009 21:29:36 -0000	1.2
@@ -0,0 +1 @@
+pmd-emacs-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-pmd/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:12:47 -0000	1.1
+++ sources	9 Sep 2009 21:29:36 -0000	1.2
@@ -0,0 +1 @@
+35296ccef798e21cf3b6815a713c1147  pmd-emacs-0.6.zip



From xavierb at fedoraproject.org  Wed Sep  9 21:34:32 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed,  9 Sep 2009 21:34:32 +0000 (UTC)
Subject: rpms/nsca/EL-4 nsca.spec,1.2,1.3
Message-ID: <20090909213432.941CF11C00CE@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/nsca/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3406

Modified Files:
	nsca.spec 
Log Message:
Revert max plugin output length patch.


Index: nsca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsca/EL-4/nsca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nsca.spec	20 Jul 2009 20:42:27 -0000	1.2
+++ nsca.spec	9 Sep 2009 21:34:31 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:        Nagios Service Check Acceptor
 Name:           nsca
 Version:        2.7.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 URL:            http://www.nagios.org/
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Patch0:         nsca-2.7.2-initscript.patch
 Patch1:         nsca-2.7.2-confpath.patch
-Patch2:         nsca-increase_max_plugin_output_length.patch
+#Patch2:         nsca-increase_max_plugin_output_length.patch
 
 BuildRequires:  libmcrypt-devel
 Requires:       nagios
@@ -37,7 +37,7 @@ Client application for sending updates t
 %setup -q
 %patch0 -p0 -b .initscript
 %patch1 -p1 -b .confpath
-%patch2 -p0 -b .max_plugin_output_length
+#%patch2 -p0 -b .max_plugin_output_length
 # Change defaults in the config file to match the nagios package
 sed -i -e "s|^command_file=.*|command_file=%{_localstatedir}/spool/nagios/cmd/nagios.cmd|" \
        -e "s|^alternate_dump_file=.*|alternate_dump_file=%{_localstatedir}/spool/nagios/cmd/nsca.dump|" \
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 09 2009 Xavier Bachelot <xavier at bachelot.org> - 2.7.2-8
+- Revert max plugin output length patch.
+
 * Fri Jul 17 2009 Xavier Bachelot <xavier at bachelot.org> - 2.7.2-7
 - Increase max plugin output length to match nagios
   (RHBZ#497847, related to RHBZ#469198).



From cwickert at fedoraproject.org  Wed Sep  9 21:39:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 21:39:43 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec, 1.18,
	1.19
Message-ID: <20090909213943.6F07211C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7971

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
add upstream bug links


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfce4-netload-plugin.spec	9 Sep 2009 17:20:17 -0000	1.18
+++ xfce4-netload-plugin.spec	9 Sep 2009 21:39:42 -0000	1.19
@@ -7,8 +7,11 @@ Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
- # from upstream's svn rev 3275
+# allow custom bar colors
+# http://bugzilla.xfce.org/show_bug.cgi?id=1889
 Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
+# make tooltips work with GTK 2.16
+# http://bugzilla.xfce.org/show_bug.cgi?id=5177
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From emaldonado at fedoraproject.org  Wed Sep  9 21:49:24 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed,  9 Sep 2009 21:49:24 +0000 (UTC)
Subject: rpms/nss/devel newargs.patch,NONE,1.1 sysinit.patch,NONE,1.1
Message-ID: <20090909214924.EE16611C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17968

Added Files:
	newargs.patch sysinit.patch 
Log Message:
Patches to enable the nss sysinit module

newargs.patch:
 pk11pars.c |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 pk11util.c |    5 +++
 secmod.h   |    4 +++
 3 files changed, 85 insertions(+), 4 deletions(-)

--- NEW FILE newargs.patch ---
Index: mozilla/security/nss/lib/pk11wrap/pk11pars.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11pars.c,v
retrieving revision 1.21
diff -u -p -r1.21 pk11pars.c
--- ./mozilla/security/nss/lib/pk11wrap/pk11pars.c	12 Nov 2005 00:14:25 -0000	1.21
+++ ./mozilla/security/nss/lib/pk11wrap/pk11pars.c	1 Sep 2009 21:55:18 -0000
@@ -107,6 +107,41 @@ secmod_NewModule(void)
     
 }
 
+/* private flags. */
+/* The meaing of these flags is as follows:
+ *
+ * SECMOD_FLAG_IS_MODULE_DB - This is a module that accesses the database of
+ *   other modules to load. Module DBs are loadable modules that tells
+ *   NSS which PKCS #11 modules to load and when. These module DBs are 
+ *   chainable. That is, one module DB can load another one. NSS system init 
+ *   design takes advantage of this feature. In system NSS, a fixed system 
+ *   module DB loads the system defined libraries, then chains out to the 
+ *   traditional module DBs to load any system or user configured modules 
+ *   (like smart cards). This bit is the same as the already existing meaning 
+ *   of  isModuleDB = PR_TRUE. None of the other flags should be set if this
+ *   flag isn't on.
+ *
+ * SECMOD_FLAG_SKIP_FIRST - This flag tells NSS to skip the first 
+ *   PKCS #11 module presented by a module DB. This allows the OS to load a 
+ *   softoken from the system module, then ask the existing module DB code to 
+ *   load the other PKCS #11 modules in that module DB (skipping it's request 
+ *   to load softoken). This gives the system init finer control over the 
+ *   configuration of that softoken module.
+ *
+ * SECMOD_FLAG_DEFAULT_MODDB - This flag allows system init to mark a 
+ *   different module DB as the 'default' module DB (the one in which 
+ *   'Add module' changes will go). Without this flag NSS takes the first 
+ *   module as the default Module DB, but in system NSS, that first module 
+ *   is the system module, which is likely read only (at least to the user).
+ *   This  allows system NSS to delegate those changes to the user's module DB, 
+ *   preserving the user's ability to load new PKCS #11 modules (which only 
+ *   affect him), from existing applications like Firefox.
+ */
+#define SECMOD_FLAG_IS_MODULE_DB  0x01 /* must be set if any of the other flags
+                                        * are set */
+#define SECMOD_FLAG_SKIP_FIRST    0x02
+#define SECMOD_FLAG_DEFAULT_MODDB 0x04
+
 /*
  * for 3.4 we continue to use the old SECMODModule structure
  */
@@ -137,15 +172,33 @@ SECMOD_CreateModule(const char *library,
     if (slotParams) PORT_Free(slotParams);
     /* new field */
     mod->trustOrder  = secmod_argReadLong("trustOrder",nssc,
-						SECMOD_DEFAULT_TRUST_ORDER,NULL);
+					SECMOD_DEFAULT_TRUST_ORDER,NULL);
     /* new field */
     mod->cipherOrder = secmod_argReadLong("cipherOrder",nssc,
-						SECMOD_DEFAULT_CIPHER_ORDER,NULL);
+					SECMOD_DEFAULT_CIPHER_ORDER,NULL);
     /* new field */
     mod->isModuleDB   = secmod_argHasFlag("flags","moduleDB",nssc);
     mod->moduleDBOnly = secmod_argHasFlag("flags","moduleDBOnly",nssc);
     if (mod->moduleDBOnly) mod->isModuleDB = PR_TRUE;
 
+    /* we need more bits, but we also want to preserve binary compatibility 
+     * so we overload the isModuleDB PRBool with additional flags. 
+     * These flags are only valid if mod->isModuleDB is already set.
+     * NOTE: this depends on the fact that PRBool is at least a char on 
+     * all platforms. These flags are only valid if moduleDB is set, so 
+     * code checking if (mod->isModuleDB) will continue to work correctly. */
+    if (mod->isModuleDB) {
+	char flags = SECMOD_FLAG_IS_MODULE_DB;
+	if (secmod_argHasFlag("flags","skipFirst",nssc)) {
+	    flags |= SECMOD_FLAG_SKIP_FIRST;
+	}
+	if (secmod_argHasFlag("flags","defaultModDB",nssc)) {
+	    flags |= SECMOD_FLAG_DEFAULT_MODDB;
+	}
+	/* additional moduleDB flags could be added here in the future */
+	mod->isModuleDB = (PRBool) flags;
+    }
+
     ciphers = secmod_argGetParamValue("ciphers",nssc);
     secmod_argSetNewCipherFlags(&mod->ssl[0],ciphers);
     if (ciphers) PORT_Free(ciphers);
@@ -155,6 +208,22 @@ SECMOD_CreateModule(const char *library,
     return mod;
 }
 
+PRBool
+SECMOD_GetSkipFirstFlag(SECMODModule *mod)
+{
+   char flags = (char) mod->isModuleDB;
+
+   return (flags & SECMOD_FLAG_SKIP_FIRST) ? PR_TRUE : PR_FALSE;
+}
+
+PRBool
+SECMOD_GetDefaultModDBFlag(SECMODModule *mod)
+{
+   char flags = (char) mod->isModuleDB;
+
+   return (flags & SECMOD_FLAG_DEFAULT_MODDB) ? PR_TRUE : PR_FALSE;
+}
+
 static char *
 secmod_mkModuleSpec(SECMODModule * module)
 {
@@ -333,7 +402,12 @@ SECMOD_LoadModule(char *modulespec,SECMO
 	if (moduleSpecList) {
 	    char **index;
 
-	    for (index = moduleSpecList; *index; index++) {
+	    index = moduleSpecList;
+	    if (*index && SECMOD_GetSkipFirstFlag(module)) {
+		index++;
+	    }
+
+	    for (; *index; index++) {
 		SECMODModule *child;
 		child = SECMOD_LoadModule(*index,module,PR_TRUE);
 		if (!child) break;
Index: mozilla/security/nss/lib/pk11wrap/pk11util.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11util.c,v
retrieving revision 1.55
diff -u -p -r1.55 pk11util.c
--- ./mozilla/security/nss/lib/pk11wrap/pk11util.c	30 Jul 2009 00:29:35 -0000	1.55
+++ ./mozilla/security/nss/lib/pk11wrap/pk11util.c	1 Sep 2009 21:55:18 -0000
@@ -179,7 +179,10 @@ SECMOD_AddModuleToList(SECMODModule *new
 SECStatus
 SECMOD_AddModuleToDBOnlyList(SECMODModule *newModule)
 {
-    if (defaultDBModule == NULL) {
+    if (defaultDBModule && SECMOD_GetDefaultModDBFlag(newModule)) {
+	SECMOD_DestroyModule(defaultDBModule);
+	defaultDBModule = SECMOD_ReferenceModule(newModule);
+    } else if (defaultDBModule == NULL) {
 	defaultDBModule = SECMOD_ReferenceModule(newModule);
     }
     return secmod_AddModuleToList(&modulesDB,newModule);
Index: mozilla/security/nss/lib/pk11wrap/secmod.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/secmod.h,v
retrieving revision 1.26
diff -u -p -r1.26 secmod.h
--- ./mozilla/security/nss/lib/pk11wrap/secmod.h	17 Dec 2008 06:09:16 -0000	1.26
+++ ./mozilla/security/nss/lib/pk11wrap/secmod.h	1 Sep 2009 21:55:18 -0000
@@ -151,6 +151,10 @@ extern PK11SlotInfo *SECMOD_FindSlot(SEC
 /* of modType has been installed */
 PRBool SECMOD_IsModulePresent( unsigned long int pubCipherEnableFlags );
 
+/* accessors */
+PRBool SECMOD_GetSkipFirstFlag(SECMODModule *mod);
+PRBool SECMOD_GetDefaultModDBFlag(SECMODModule *mod);
+
 /* Functions used to convert between internal & public representation
  * of Mechanism Flags and Cipher Enable Flags */
 extern unsigned long SECMOD_PubMechFlagstoInternal(unsigned long publicFlags);

sysinit.patch:
 cmd/manifest.mn          |    1 
 cmd/sysinit/Makefile     |   80 +++++++++
 cmd/sysinit/config.mk    |  121 ++++++++++++++
 cmd/sysinit/manifest.mn  |   50 +++++
 cmd/sysinit/nsssysinit.c |  329 +++++++++++++++++++++++++++++++++++++++
 lib/pk11wrap/pk11load.c  |  133 +++++++++++++--
 lib/pk11wrap/pk11pars.c  |  394 ++++++++++++++++++++++++++++++++++++++++++++++-
 lib/pk11wrap/pk11util.c  |   82 +++------
 lib/pk11wrap/secmodi.h   |   21 ++
 lib/pki/pki3hack.c       |   10 +
 10 files changed, 1142 insertions(+), 79 deletions(-)

--- NEW FILE sysinit.patch ---
Index: ./mozilla/security/nss/cmd/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/cmd/manifest.mn,v
retrieving revision 1.27
diff -u -p -r1.27 manifest.mn
--- ./mozilla/security/nss/cmd/manifest.mn	4 Sep 2008 22:15:21 -0000	1.27
+++ ./mozilla/security/nss/cmd/manifest.mn	9 Sep 2009 03:40:50 -0000
@@ -75,6 +75,7 @@ DIRS = lib  \
  ssltap  \
  strsclnt \
  symkeyutil \
+ sysinit \
  tests \
  tstclnt  \
  vfychain \
Index: mozilla/security/nss/cmd/sysinit/Makefile
===================================================================
RCS file: security/nss/cmd/sysinit/Makefile
diff -N security/nss/cmd/sysinit/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/Makefile	1 Sep 2009 22:47:51 -0000
@@ -0,0 +1,80 @@
+#! gmake
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+#include ../platlibs.mk
+include config.mk
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+
+#include ../platrules.mk
+
Index: mozilla/security/nss/cmd/sysinit/config.mk
===================================================================
RCS file: security/nss/cmd/sysinit/config.mk
diff -N security/nss/cmd/sysinit/config.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/config.mk	1 Sep 2009 22:47:51 -0000
@@ -0,0 +1,121 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+# can't do this in manifest.mn because OS_TARGET isn't defined there.
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+
+# don't want the 32 in the shared library name
+SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
+
+RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RESNAME = $(LIBRARY_NAME).rc
+
+ifdef NS_USE_GCC
+EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib \
+	-L$(NSSUTIL_LIB_DIR) \
+	-lnssutil3 \
+	-L$(NSPR_LIB_DIR) \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4\
+	$(NULL)
+else # ! NS_USE_GCC
+EXTRA_SHARED_LIBS += \
+	$(DIST)/lib/nssutil3.lib \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
+	$(NULL)
+endif # NS_USE_GCC
+
+else
+
+# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib \
+	-L$(NSSUTIL_LIB_DIR) \
+	-lnssutil3 \
+	-L$(NSPR_LIB_DIR) \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	$(NULL)
+
+endif
+
+
+# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+
+ifeq ($(OS_TARGET),SunOS)
+ifeq ($(BUILD_SUN_PKG), 1)
+# The -R '$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+ifeq ($(USE_64), 1)
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
+else
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+endif
+else
+MKSHLIB += -R '$$ORIGIN'
+endif
+endif
+
+ifeq ($(OS_ARCH), HP-UX) 
+ifneq ($(OS_TEST), ia64)
+# pa-risc
+ifeq ($(USE_64), 1)
+MKSHLIB += +b '$$ORIGIN'
+endif
+endif
+endif
+
+ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
+ifndef NS_USE_GCC
+# Export 'mktemp' to be backward compatible with NSS 3.2.x and 3.3.x
+# but do not put it in the import library.  See bug 142575.
+DEFINES += -DWIN32_NSS3_DLL_COMPAT
+DLLFLAGS += -EXPORT:mktemp=nss_mktemp,PRIVATE
+endif
+endif
Index: mozilla/security/nss/cmd/sysinit/manifest.mn
===================================================================
RCS file: security/nss/cmd/sysinit/manifest.mn
diff -N security/nss/cmd/sysinit/manifest.mn
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/manifest.mn	1 Sep 2009 22:47:51 -0000
@@ -0,0 +1,50 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+CORE_DEPTH	= ../../..
+
+# MODULE public and private header  directories are implicitly REQUIRED.
+MODULE = nss 
+
+DEFINES = -DNSPR20
+
+CSRCS = nsssysinit.c
+
+LIBRARY = nsssysinit
+LIBRARY_NAME = nsssysinit
+#LIBRARY_VERSION = 3
+
Index: mozilla/security/nss/cmd/sysinit/nsssysinit.c
===================================================================
RCS file: security/nss/cmd/sysinit/nsssysinit.c
diff -N security/nss/cmd/sysinit/nsssysinit.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/nsssysinit.c	1 Sep 2009 22:47:51 -0000
@@ -0,0 +1,329 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "seccomon.h"
+#include "prio.h"
+#include "prprf.h"
+
+
+
+/*
+ * The following provides a default example for operating systems to set up
+ * and manage applications loading NSS on their OS globally.
+ *
+ * This code hooks in to the system pkcs11.txt, which controls all the loading
+ * of pkcs11 modules common to all applications.
+ */
+
+/*
+ * OS Specific function to get where the NSS user database should reside.
+ */
+
+#ifdef XP_UNIX
+#include <sys/stat.h>
+#include <sys/types.h>
+
+int testdir(char *dir)
+{
+   struct stat buf;
+   memset(&buf, 0, sizeof(buf));
+
+   if (stat(dir,&buf) < 0) {
+	return 0;
+   }
+
+   return S_ISDIR(buf.st_mode);
+}
+
+#define NSS_USER_PATH1 "/.pki"
+#define NSS_USER_PATH2 "/nssdb"
+char *getUserDB(void)
+{
+   char *userdir = getenv("HOME");
+   char *nssdir = NULL;
+
+   if (userdir == NULL) {
+	return NULL;
+   }
+
+   nssdir = PORT_Alloc(strlen(userdir)
+		+sizeof(NSS_USER_PATH1)+sizeof(NSS_USER_PATH2));
+   if (nssdir == NULL) {
+	return NULL;
+   }
+   PORT_Memcpy(nssdir, userdir, strlen(userdir)+1);
+   /* verify it exists */
+   if (!testdir(nssdir)) {
+	PORT_Free(nssdir);
+	return NULL;
+   }
+   PORT_Strcat(nssdir, NSS_USER_PATH1);
+   if (!testdir(nssdir) && mkdir(nssdir, 0760)) {
+	PORT_Free(nssdir);
+	return NULL;
+   }
+   PORT_Strcat(nssdir, NSS_USER_PATH2);
+   if (!testdir(nssdir) && mkdir(nssdir, 0760)) {
+	PORT_Free(nssdir);
+	return NULL;
+   }
+   return nssdir;
+}
+
+#define NSS_DEFAULT_SYSTEM "/etc/pki/nssdb"
+char *getSystemDB(void) {
+   return PORT_Strdup(NSS_DEFAULT_SYSTEM);
+}
+
+#else
+#ifdef XP_WIN
+char *getUserDB(void)
+{
+   /* use the registry to find the user's NSS_DIR. if no entry exists, creaate
+    * one in the users Appdir location */
+}
+
+char *getSystemDB(void)
+{
+   /* use the registry to find the system's NSS_DIR. if no entry exists, creaate
+    * one based on the windows system data area */
+}
+
+#else
+#error "Need to write getUserDB and get SystemDB functions"
+#endif
+#endif
+
+#ifdef XP_LINUX
+PRBool getFIPSMode()
+{
+}
+
+#else
+PRBool getFIPSMode()
+{
+    char *fipsEnv = getenv("NSS_FIPS");
+    if (!fipsEnv) {
+	return 0;
+    }
+    if ((strcasecmp(fipsEnv,"fips") == 0) ||
+	(strcasecmp(fipsEnv,"true") == 0) ||
+	(strcasecmp(fipsEnv,"on") == 0) ||
+	(strcasecmp(fipsEnv,"1") == 0)) {
+	 return 1;
+    }
+    return 0;
+}
+#endif
+
+
+#define NSS_DEFAULT_FLAGS "flags=readonly"
+
+/*
+ * This function builds the list of databases and modules to load, and sets
+ * their configuration. For the sample we have a fixed set.
+ *  1. We load the user's home nss database.
+ *  2. We load the user's custom PKCS #11 modules.
+ *  3. We load the system nss database readonly.
+ *
+ * Any space allocated in get_list must be freed in release_list.
+ * This function can use whatever information is available to the application.
+ * it is running in the process of the application for which it is making 
+ * decisions, so it's possible to acquire the application name as part of
+ * the decision making process.
+ */
+static char **
+get_list(char *filename, char *stripped_parameters)
+{
+    char **module_list = PORT_ZNewArray(char *, 4);
+    char *userdb;
+    int next = 0;
+
+    /* can't get any space */
+    if (module_list == NULL) {
+	return NULL;
+    }
+
+    userdb  = getUserDB();
+    if (userdb != NULL) {
+	/* return a list of databases to open. First the user Database */
+	module_list[next++] = PR_smprintf(
+	    "library= "
+	    "module=\"NSS User database\" "
+	    "parameters=\"configdir='sql:%s' %s\" "
+	    "NSS=\"flags=internal%s\"", 
+		userdb, stripped_parameters, getFIPSMode() ? ",FIPS" : "");
+
+	/* now open the user's defined PKCS #11 modules */
+	/* skip the local user DB entry */
+	module_list[next++] = PR_smprintf(
+	    "library= "
+	    "module=\"NSS User database\" "
+	    "parameters=\"configdir='sql:%s' %s\" "
+	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
+		userdb, stripped_parameters);
+   }
+
+    /* now the system database (always read only) */
+    module_list[next++] = PR_smprintf(
+	"library= "
+	"module=\"NSS system database\" "
+	"parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
+	"NSS=\"flags=internal,critical\"",filename);
+
+    /* that was the last module */
+    module_list[next] = 0;
+
+    PORT_Free(userdb);
+
+    return module_list;
+}
+
+static char **
+release_list(char **arg)
+{
+    static char *success = "Success";
+    int next;
+
+    for (next = 0; arg[next]; next++) {
+	free(arg[next]);
+    }
+    PORT_Free(arg);
+    return &success;
+}
+
+
+#include "pk11pars.h"
+
+#define TARGET_SPEC_COPY(new, start, end)    \
+  if (end > start) {                         \
+        int _cnt = end - start;              \
+        PORT_Memcpy(new, start, _cnt);       \
+        new += _cnt;                         \
+  }
+
+static void
+safestrcpy(char *target, char *src)
+{
+    while (*src) {
+	*target++ = *src++;
+    }
+    *target = 0;
+}
+
+static SECStatus
+parse_paramters(char *parameters, char **filename, char **stripped)
+{
+    char *sourcePrev;
+    char *sourceCurr;
+    char *targetCurr;
+    char *newStripped;
+    *filename = NULL;
+    *stripped = NULL;
+
+    newStripped = PORT_Alloc(PORT_Strlen(parameters)+2);
+    targetCurr = newStripped;
+    sourcePrev = parameters;
+    sourceCurr = secmod_argStrip(parameters);
+    TARGET_SPEC_COPY(targetCurr, sourcePrev, sourceCurr);
+
+    while (*sourceCurr) {
+	int next;
+	sourcePrev = sourceCurr;
+	SECMOD_HANDLE_STRING_ARG(sourceCurr, *filename, "configdir=",
+		sourcePrev = sourceCurr; )
+	SECMOD_HANDLE_FINAL_ARG(sourceCurr);
+	TARGET_SPEC_COPY(targetCurr, sourcePrev, sourceCurr);
+    }
+    *targetCurr = 0;
+    if (*filename == NULL) {
+	PORT_Free(newStripped);
+	return SECFailure;
+    }
+    if (strncmp("sql:", *filename, 4) == 0) {
+	safestrcpy(*filename, (*filename)+4);
+    } else if (strncmp("dbm:", *filename, 4) == 0) {
+	safestrcpy(*filename, (*filename)+4);
+    } else if (strncmp("extern:", *filename, 7) == 0) {
+	safestrcpy(*filename, (*filename)+7);
+    }
+    *stripped = newStripped;
+    return SECSuccess;
+}
+
+/* entry point */
+char **
+NSS_ReturnModuleSpecData(unsigned long function, char *parameters, void *args)
+{
+    static char *chain = "Chain";
+    char *filename = NULL;
+    char *stripped = NULL;
+    char **retString = NULL;
+    SECStatus rv;
+
+    rv = parse_paramters(parameters, &filename, &stripped);
+    if (rv != SECSuccess) {
+	/* use defaults */
+	filename = getSystemDB();
+	if (!filename) {
+	    return NULL;
+	}
+	stripped = PORT_Strdup(NSS_DEFAULT_FLAGS);
+	if (!stripped) {
+	    free(filename);
+	    return NULL;
+	}
+    }
+    switch (function) {
+    case SECMOD_MODULE_DB_FUNCTION_FIND:
+	retString = get_list(filename, stripped);
+	break;
+    case SECMOD_MODULE_DB_FUNCTION_RELEASE:
+	retString = release_list((char **)args);
+	break;
+    /* forward add/del to child */
+    case SECMOD_MODULE_DB_FUNCTION_ADD:
+    case SECMOD_MODULE_DB_FUNCTION_DEL:
+	retString = &chain;
+	break;
+    default:
+	retString = NULL;
+	break;
+    }
+
+    if (filename) PORT_Free(filename);
+    if (stripped) PORT_Free(stripped);
+    return retString;
+}
Index: mozilla/security/nss/lib/pk11wrap/pk11load.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11load.c,v
retrieving revision 1.25
diff -u -p -r1.25 pk11load.c
--- ./mozilla/security/nss/lib/pk11wrap/pk11load.c	2 Oct 2008 00:56:15 -0000	1.25
+++ ./mozilla/security/nss/lib/pk11wrap/pk11load.c	1 Sep 2009 22:47:51 -0000
@@ -120,15 +120,83 @@ PRBool pk11_getFinalizeModulesOption(voi
 }
 
 /*
+ * Allow specification loading the same module more than once at init time.
+ * This enables 2 things.
+ *
+ *    1) we can load additional databases by manipulating secmod.db/pkcs11.txt.
+ *    2) we can handle the case where some library has already initialized NSS
+ *    before the main application.
+ *
+ * oldModule is the module we have already initialized.
+ * char *modulespec is the full module spec for the library we want to
+ * initialize.
+ */
+static SECStatus
+secmod_HandleReload(SECMODModule *oldModule, char *modulespec)
+{
+    PK11SlotInfo *slot;
+    char *newModuleSpec;
+    char **children;
+    CK_SLOT_ID *ids;
+    SECStatus rv;
+
+    /* first look for token= key words from the module spec */
+    newModuleSpec = secmod_ParseModuleSpecForTokens(modulespec,&children,&ids);
+    if (!newModuleSpec) {
+	return SECFailure;
+    }
+    slot = SECMOD_OpenNewSlot(oldModule, newModuleSpec);
+    if (slot) {
+	int newID;
+	char **thisChild;
+	CK_SLOT_ID *thisID;
+	char *oldModuleSpec;
+
+	newID = slot->slotID;
+	PK11_FreeSlot(slot);
+	for (thisChild=children, thisID=ids; thisChild && *thisChild; 
+						thisChild++,thisID++) {
+	    slot = SECMOD_OpenNewSlot(oldModule, *thisChild);
+	    if (slot) {
+		*thisID = slot->slotID;
+		PK11_FreeSlot(slot);
+	    } else {
+		*thisID = (CK_SLOT_ID) -1;
+	    }
+	}
+
+	/* update the old module initialization string in case we need to
+	 * shutdown and reinit the whole mess (this is rare, but can happen
+	 * when trying to stop smart card insertion/removal threads)... */
+	oldModuleSpec = secmod_mkAppendTokensList(oldModule->arena, 
+		oldModule->libraryParams, newModuleSpec, newID, 
+		children, ids);
+	if (oldModuleSpec) {
+	    oldModule->libraryParams = oldModuleSpec;
+	}
+	
+	rv = SECSuccess;
+    }
+    secmod_FreeChildren(children, ids);
+    PORT_Free(newModuleSpec);
+    return rv;
+}
+
+/*
  * collect the steps we need to initialize a module in a single function
  */
 SECStatus
-secmod_ModuleInit(SECMODModule *mod, PRBool* alreadyLoaded)
+secmod_ModuleInit(SECMODModule *mod, SECMODModule **reload, 
+		  PRBool* alreadyLoaded)
 {
     CK_C_INITIALIZE_ARGS moduleArgs;
     CK_VOID_PTR pInitArgs;
     CK_RV crv;
 
+    if (reload) {
+	*reload = NULL;
+    }
+
     if (!mod || !alreadyLoaded) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
@@ -144,10 +212,36 @@ secmod_ModuleInit(SECMODModule *mod, PRB
 	pInitArgs = &moduleArgs;
     }
     crv = PK11_GETTAB(mod)->C_Initialize(pInitArgs);
-    if ((CKR_CRYPTOKI_ALREADY_INITIALIZED == crv) &&
-        (!enforceAlreadyInitializedError)) {
-        *alreadyLoaded = PR_TRUE;
-        return SECSuccess;
+    if (CKR_CRYPTOKI_ALREADY_INITIALIZED == crv) {
+	SECMODModule *oldModule = NULL;
+
+	/* Library has already been loaded once, if caller expects it, and it
+	 * has additional configuration, try reloading it as well. */
+	if (reload != NULL && mod->libraryParams) {
+	    oldModule = secmod_findModuleByFuncPtr(mod->functionList);
+	}
+	/* Library has been loaded by NSS. It means it may be capable of
+	 * reloading */
+	if (oldModule) {
+	    SECStatus rv;
+	    rv = secmod_HandleReload(oldModule, mod->libraryParams);
+	    if (rv == SECSuccess) {
+		/* This module should go away soon, since we've
+		 * simply expanded the slots on the old module.
+		 * When it goes away, it should not Finalize since
+		 * that will close our old module as well. Setting
+		 * the function list to NULL will prevent that close */
+		mod->functionList = NULL;
+		*reload = oldModule;
+		return SECSuccess;
+	    }
+	    SECMOD_DestroyModule(oldModule);
+	}
+	/* reload not possible, fall back to old semantics */
+	if (!enforceAlreadyInitializedError) {
+       	    *alreadyLoaded = PR_TRUE;
+            return SECSuccess;
+	}
     }
     if (crv != CKR_OK) {
 	if (pInitArgs == NULL ||
@@ -258,7 +352,7 @@ softoken_LoadDSO( void ) 
  * load a new module into our address space and initialize it.
  */
 SECStatus
-SECMOD_LoadPKCS11Module(SECMODModule *mod) {
+secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
     PRLibrary *library = NULL;
     CK_C_GetFunctionList entry = NULL;
     char * full_name;
@@ -271,7 +365,7 @@ SECMOD_LoadPKCS11Module(SECMODModule *mo
     if (mod->loaded) return SECSuccess;
 
     /* intenal modules get loaded from their internal list */
-    if (mod->internal) {
+    if (mod->internal && (mod->dllName == NULL)) {
     /*
      * Loads softoken as a dynamic library,
      * even though the rest of NSS assumes this as the "internal" module.
@@ -308,26 +402,14 @@ SECMOD_LoadPKCS11Module(SECMODModule *mo
 	    return SECFailure;
 	}
 
-#ifdef notdef
-	/* look up the library name */
-	full_name = PR_GetLibraryName(PR_GetLibraryPath(),mod->dllName);
-	if (full_name == NULL) {
-	    return SECFailure;
-	}
-#else
 	full_name = PORT_Strdup(mod->dllName);
-#endif
 
 	/* load the library. If this succeeds, then we have to remember to
 	 * unload the library if anything goes wrong from here on out...
 	 */
 	library = PR_LoadLibrary(full_name);
 	mod->library = (void *)library;
-#ifdef notdef
-	PR_FreeLibraryName(full_name);
-#else
 	PORT_Free(full_name);
-#endif
 
 	if (library == NULL) {
 	    return SECFailure;
@@ -375,11 +457,18 @@ SECMOD_LoadPKCS11Module(SECMODModule *mo
     mod->isThreadSafe = PR_TRUE;
 
     /* Now we initialize the module */
-    rv = secmod_ModuleInit(mod, &alreadyLoaded);
+    rv = secmod_ModuleInit(mod, oldModule, &alreadyLoaded);
     if (rv != SECSuccess) {
 	goto fail;
     }
 
+    /* module has been reloaded, this module itself is done, 
+     * return to the caller */
+    if (mod->functionList == NULL) {
+	mod->loaded = PR_TRUE; /* technically the module is loaded.. */
+	return SECSuccess;
+    }
+
     /* check the version number */
     if (PK11_GETTAB(mod)->C_GetInfo(&info) != CKR_OK) goto fail2;
     if (info.cryptokiVersion.major != 2) goto fail2;
@@ -460,7 +549,9 @@ SECMOD_UnloadModule(SECMODModule *mod) {
 	return SECFailure;
     }
     if (finalizeModules) {
-        if (!mod->moduleDBOnly) PK11_GETTAB(mod)->C_Finalize(NULL);
+        if (mod->functionList &&!mod->moduleDBOnly) {
+	    PK11_GETTAB(mod)->C_Finalize(NULL);
+	}
     }
     mod->moduleID = 0;
     mod->loaded = PR_FALSE;
Index: mozilla/security/nss/lib/pk11wrap/pk11pars.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11pars.c,v
retrieving revision 1.22
diff -u -p -r1.22 pk11pars.c
--- ./mozilla/security/nss/lib/pk11wrap/pk11pars.c	1 Sep 2009 21:56:26 -0000	1.22
+++ ./mozilla/security/nss/lib/pk11wrap/pk11pars.c	1 Sep 2009 22:47:51 -0000
@@ -224,6 +224,389 @@ SECMOD_GetDefaultModDBFlag(SECMODModule 
    return (flags & SECMOD_FLAG_DEFAULT_MODDB) ? PR_TRUE : PR_FALSE;
 }
 
+/*
+ * Find any token= values in the module spec. 
+ * Always return a new spec which does not have any token= arguments.
+ * If token= arguments are found, Split the the various tokens defined into
+ * an array of child specs to return.
+ *
+ * Caller is responsible for freeing the child spec and the new token
+ * spec.
+ */
+
+#define SECMOD_SPEC_COPY(new, start, end)    \
+  if (end > start) {                         \
+	int _cnt = end - start;	             \
+	PORT_Memcpy(new, start, _cnt);       \
+	new += _cnt;                         \
+  }
+
+char *
+secmod_ParseModuleSpecForTokens(char *moduleSpec, char ***children, 
+				CK_SLOT_ID **ids)
+{
+    char       *newSpec     = PORT_Alloc(PORT_Strlen(moduleSpec)+2);
+    char       *newSpecPtr  = newSpec;
+    char       *modulePrev  = moduleSpec;
+    char       *target      = NULL;
+    char       **childArray = NULL;
+    char       *tokenIndex;
+    CK_SLOT_ID *idArray     = NULL;
+    int        tokenCount = 0;
+    int        i;
+
+    if (newSpec == NULL) {
+	return NULL;
+    }
+
+    *children = NULL;
+    if (ids) {
+	*ids = NULL;
+    }
+    moduleSpec = secmod_argStrip(moduleSpec);
+    SECMOD_SPEC_COPY(newSpecPtr, modulePrev, moduleSpec);
+
+    /*
+     * walk down the list. if we find a tokens= argument, save it,
+     * otherise copy the argument.
+     */
+    while (*moduleSpec) {
+	int next;
+	modulePrev = moduleSpec;
+	SECMOD_HANDLE_STRING_ARG(moduleSpec, target, "tokens=",
+			modulePrev = moduleSpec; /* skip copying */ )
+	SECMOD_HANDLE_FINAL_ARG(moduleSpec)
+	SECMOD_SPEC_COPY(newSpecPtr, modulePrev, moduleSpec);
+    }
+    *newSpecPtr = 0;
+
+    /* no target found, return the newSpec */
+    if (target == NULL) {
+	return newSpec;
+    }
+
+    /* now build the child array from target */
+    /*first count them */
+    for (tokenIndex = secmod_argStrip(target); *tokenIndex;
+	tokenIndex = secmod_argStrip(secmod_argSkipParameter(tokenIndex))) {
+	tokenCount++;
+    }
+
+    childArray = PORT_NewArray(char *, tokenCount+1);
+    if (childArray == NULL) {
+	/* just return the spec as is then */
+	PORT_Free(target);
+	return newSpec;
+    }
+    if (ids) {
+	idArray = PORT_NewArray(CK_SLOT_ID, tokenCount+1);
+	if (idArray == NULL) {
+	    PORT_Free(childArray);
+	    PORT_Free(target);
+	    return newSpec;
+	}
+    }
+
+    /* now fill them in */
+    for (tokenIndex = secmod_argStrip(target), i=0 ; 
+			*tokenIndex && (i < tokenCount); 
+			tokenIndex=secmod_argStrip(tokenIndex)) {
+	int next;
+	char *name = secmod_argGetName(tokenIndex, &next);
+	tokenIndex += next;
+
+ 	if (idArray) {
+	   idArray[i] = secmod_argDecodeNumber(name);
+	}
+
+	PORT_Free(name); /* drop the explicit number */
+
+	/* if anything is left, copy the args to the child array */
+	if (!secmod_argIsBlank(*tokenIndex)) {
+	    childArray[i++] = secmod_argFetchValue(tokenIndex, &next);
+	    tokenIndex += next;
+	}
+    }
+
+    PORT_Free(target);
+    childArray[i] = 0;
+    if (idArray) {
+	idArray[i] = 0;
+    }
+
+    /* return it */
+    *children = childArray;
+    if (ids) {
+	*ids = idArray;
+    }
+    return newSpec;
+}
+
+void
+secmod_FreeChildren(char **children, CK_SLOT_ID *ids)
+{
+    char **thisChild = children;
+
+    if (!children) {
+	return;
+    }
+
+    for (thisChild = children; thisChild && *thisChild; thisChild++ ) {
+	PORT_Free(*thisChild);
+    }
+    PORT_Free(children);
+    if (ids) {
+	PORT_Free(ids);
+    }
+    return;
+}
+
+
+static int
+secmod_escapeSize(const char *string, char quote)
+{
+    int escapes = 0, size = 0;
+    const char *src;
+    for (src=string; *src ; src++) {
+        if ((*src == quote) || (*src == '\\')) escapes++;
+        size++;
+    }
+
+    return escapes+size+1;
+}
+
+
+/*
+ * add escapes to protect quote characters...
+ */
+static char *
+secmod_addEscape(const char *string, char quote)
+{
+    char *newString = 0;
+    int size = 0;
+    const char *src;
+    char *dest;
+
+
+    size = secmod_escapeSize(string,quote);
+    newString = PORT_ZAlloc(size);
+    if (newString == NULL) {
+        return NULL;
+    }
+
+    for (src=string, dest=newString; *src; src++,dest++) {
+        if ((*src == '\\') || (*src == quote)) {
+            *dest++ = '\\';
+        }
+        *dest = *src;
+    }
+
+    return newString;
+}
+
+static int
+secmod_doubleEscapeSize(const char *string, char quote1, char quote2)
+{
+    int escapes = 0, size = 0;
+    const char *src;
+    for (src=string; *src ; src++) {
+        if (*src == '\\')   escapes+=3; /* \\\\ */
+        if (*src == quote1) escapes+=2; /* \\quote1 */
+        if (*src == quote2) escapes++;   /* \quote2 */
+        size++;
+    }
+
+    return escapes+size+1;
+}
+
+char *
+secmod_doubleEscape(const char *string, char quote1, char quote2)
+{
+    char *round1 = NULL;
+    char *retValue = NULL;
+    if (string == NULL) {
+        goto done;
+    }
+    round1 = secmod_addEscape(string,quote1);
+    if (round1) {
+        retValue = secmod_addEscape(round1,quote2);
+        PORT_Free(round1);
+    }
+
+done:
+    if (retValue == NULL) {
+        retValue = PORT_Strdup("");
+    }
+    return retValue;
+}
+
+
+/*
+ * caclulate the length of each child record:
+ * " 0x{id}=<{escaped_child}>"
+ */
+static int
+secmod_getChildLength(char *child, CK_SLOT_ID id)
+{
+    int length = secmod_doubleEscapeSize(child, '>', ']');
+    if (id == 0) {
+	length++;
+    }
+    while (id) {
+	length++;
+	id = id >> 4;
+    }
+    length += 6; /* {sp}0x[id]=<{child}> */
+    return length;
+}
+
+/*
+ * Build a child record:
+ * " 0x{id}=<{escaped_child}>"
+ */
+SECStatus
+secmod_mkTokenChild(char **next, int *length, char *child, CK_SLOT_ID id)
+{
+    int len;
+    char *escSpec;
+
+    len = PR_snprintf(*next, *length, " 0x%x=<",id);
+    if (len < 0) {
+	return SECFailure;
+    }
+    *next += len;
+    *length -= len;
+    escSpec = secmod_doubleEscape(child, '>', ']');
+    if (escSpec == NULL) {
+	return SECFailure;
+    }
+    if (*child && (*escSpec == 0)) {
+	PORT_Free(escSpec);
+	return SECFailure;
+    }
+    len = strlen(escSpec);
+    if (len+1 > *length) {
+	PORT_Free(escSpec);
+	return SECFailure;
+    }
+    PORT_Memcpy(*next,escSpec, len);
+    *next += len;
+    *length -= len;
+    PORT_Free(escSpec);
+    **next = '>';
+    (*next)++;
+    (*length)--;
+    return SECSuccess;
+}
+
+#define TOKEN_STRING " tokens=["
+
+char *
+secmod_mkAppendTokensList(PRArenaPool *arena, char *oldParam, char *newToken, 
+			CK_SLOT_ID newID, char **children, CK_SLOT_ID *ids)
+{
+    char *rawParam = NULL;	/* oldParam with tokens stripped off */
+    char *newParam = NULL;	/* space for the return parameter */
+    char *nextParam = NULL;	/* current end of the new parameter */
+    char **oldChildren = NULL;
+    CK_SLOT_ID *oldIds = NULL;
+    void *mark = NULL;         /* mark the arena pool in case we need 
+				* to release it */
+    int length, i, tmpLen;
+    SECStatus rv;
+
+    /* first strip out and save the old tokenlist */
+    rawParam = secmod_ParseModuleSpecForTokens(oldParam,&oldChildren,&oldIds);
+    if (!rawParam) {
+	goto loser;
+    }
+
+    /* now calculate the total length of the new buffer */
+    /* First the 'fixed stuff', length of rawparam (does not include a NULL),
+     * length of the token string (does include the NULL), closing bracket */
+    length = strlen(rawParam) + sizeof(TOKEN_STRING) + 1;
+    /* now add then length of all the old children */
+    for (i=0; oldChildren && oldChildren[i]; i++) {
+	length += secmod_getChildLength(oldChildren[i], oldIds[i]);
+    }
+
+    /* add the new token */
+    length += secmod_getChildLength(newToken, newID);
+
+    /* and it's new children */
+    for (i=0; children && children[i]; i++) {
+	if (ids[i] == -1) {
+	    continue;
+	}
+	length += secmod_getChildLength(children[i], ids[i]);
+    }
+
+    /* now allocate and build the string */
+    mark = PORT_ArenaMark(arena);
+    if (!mark) {
+	goto loser;
+    }
+    newParam =  PORT_ArenaAlloc(arena,length);
+    if (!newParam) {
+	goto loser;
+    }
+
+    PORT_Strcpy(newParam, oldParam);
+    tmpLen = strlen(oldParam);
+    nextParam = newParam + tmpLen;
+    length -= tmpLen;
+    PORT_Memcpy(nextParam, TOKEN_STRING, sizeof(TOKEN_STRING)-1);
+    nextParam += sizeof(TOKEN_STRING)-1;
+    length -= sizeof(TOKEN_STRING)-1;
+
+    for (i=0; oldChildren && oldChildren[i]; i++) {
+	rv = secmod_mkTokenChild(&nextParam,&length,oldChildren[i],oldIds[i]);
+	if (rv != SECSuccess) {
+	    goto loser;
+	}
+    }
+
+    rv = secmod_mkTokenChild(&nextParam, &length, newToken, newID);
+    if (rv != SECSuccess) {
+	goto loser;
+    }
+
+    for (i=0; children && children[i]; i++) {
+	if (ids[i] == -1) {
+	    continue;
+	}
+	rv = secmod_mkTokenChild(&nextParam, &length, children[i], ids[i]);
+	if (rv != SECSuccess) {
+	    goto loser;
+	}
+    }
+
+    if (length < 2) {
+	goto loser;
+    }
+
+    *nextParam++ = ']';
+    *nextParam++ = 0;
+
+    /* we are going to return newParam now, don't release the mark */
+    PORT_ArenaUnmark(arena, mark);
+    mark = NULL;
+
+loser:
+    if (mark) {
+	PORT_ArenaRelease(arena, mark);
+	newParam = NULL; /* if the mark is still active, 
+			  * don't return the param */
+    }
+    if (rawParam) {
+	PORT_Free(rawParam);
+    }
+    if (oldChildren) {
+	secmod_FreeChildren(oldChildren, oldIds);
+    }
+    return newParam;
+}
+    
 static char *
 secmod_mkModuleSpec(SECMODModule * module)
 {
@@ -365,6 +748,7 @@ SECMOD_LoadModule(char *modulespec,SECMO
     char *library = NULL, *moduleName = NULL, *parameters = NULL, *nss= NULL;
     SECStatus status;
     SECMODModule *module = NULL;
+    SECMODModule *oldModule = NULL;
     SECStatus rv;
 
     /* initialize the underlying module structures */
@@ -389,11 +773,19 @@ SECMOD_LoadModule(char *modulespec,SECMO
     }
 
     /* load it */
-    rv = SECMOD_LoadPKCS11Module(module);
+    rv = secmod_LoadPKCS11Module(module, &oldModule);
     if (rv != SECSuccess) {
 	goto loser;
     }
 
+    /* if we just reload an old module, no need to add it to any lists.
+     * we simple release all our references */
+    if (oldModule) {
+	SECMOD_DestroyModule(module);
+	SECMOD_DestroyModule(oldModule);
+	return SECSuccess;
+    }
+
     if (recurse && module->isModuleDB) {
 	char ** moduleSpecList;
 	PORT_SetError(0);
Index: mozilla/security/nss/lib/pk11wrap/pk11util.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11util.c,v
retrieving revision 1.56
diff -u -p -r1.56 pk11util.c
--- ./mozilla/security/nss/lib/pk11wrap/pk11util.c	1 Sep 2009 21:56:26 -0000	1.56
+++ ./mozilla/security/nss/lib/pk11wrap/pk11util.c	1 Sep 2009 22:47:51 -0000
@@ -285,6 +285,30 @@ SECMOD_FindModuleByID(SECMODModuleID id)
 }
 
 /*
+ * find the function pointer.
+ */
+SECMODModule *
+secmod_findModuleByFuncPtr(void *funcPtr) 
+{
+    SECMODModuleList *mlp;
+    SECMODModule *module = NULL;
+
+    SECMOD_GetReadLock(moduleLock);
+    for(mlp = modules; mlp != NULL; mlp = mlp->next) {
+	if (funcPtr == mlp->module->functionList) {
+	    module = mlp->module;
+	    SECMOD_ReferenceModule(module);
+	    break;
+	}
+    }
+    SECMOD_ReleaseReadLock(moduleLock);
+    if (module == NULL) {
+	PORT_SetError(SEC_ERROR_NO_MODULE);
+    }
+    return module;
+}
+
+/*
  * Find the Slot based on ID and the module.
  */
 PK11SlotInfo *
@@ -508,7 +532,7 @@ SECMOD_AddModule(SECMODModule *newModule
         /* module already exists. */
     }
 
-    rv = SECMOD_LoadPKCS11Module(newModule);
+    rv = secmod_LoadPKCS11Module(newModule, NULL);
     if (rv != SECSuccess) {
 	return rv;
     }
@@ -1202,7 +1226,7 @@ SECMOD_CancelWait(SECMODModule *mod)
 	 * we intend to use it again */
 	if (CKR_OK == crv) {
             PRBool alreadyLoaded;
-	    secmod_ModuleInit(mod, &alreadyLoaded);
+	    secmod_ModuleInit(mod, NULL, &alreadyLoaded);
 	} else {
 	    /* Finalized failed for some reason,  notify the application
 	     * so maybe it has a prayer of recovering... */
@@ -1279,58 +1303,6 @@ secmod_UserDBOp(PK11SlotInfo *slot, CK_O
 }
 
 /*
- * add escapes to protect quote characters...
- */
-static char *
-nss_addEscape(const char *string, char quote)
-{
-    char *newString = 0;
-    int escapes = 0, size = 0;
-    const char *src;
-    char *dest;
-
-    for (src=string; *src ; src++) {
-        if ((*src == quote) || (*src == '\\')) escapes++;
-        size++;
-    }
-
-    newString = PORT_ZAlloc(escapes+size+1);
-    if (newString == NULL) {
-        return NULL;
-    }
-
-    for (src=string, dest=newString; *src; src++,dest++) {
-        if ((*src == '\\') || (*src == quote)) {
-            *dest++ = '\\';
-        }
-        *dest = *src;
-    }
-
-    return newString;
-}
-
-static char *
-nss_doubleEscape(const char *string)
-{
-    char *round1 = NULL;
-    char *retValue = NULL;
-    if (string == NULL) {
-        goto done;
-    }
-    round1 = nss_addEscape(string,'>');
-    if (round1) {
-        retValue = nss_addEscape(round1,']');
-        PORT_Free(round1);
-    }
-
-done:
-    if (retValue == NULL) {
-        retValue = PORT_Strdup("");
-    }
-    return retValue;
-}
-
-/*
  * return true if the selected slot ID is not present or doesn't exist
  */
 static PRBool
@@ -1412,7 +1384,7 @@ SECMOD_OpenNewSlot(SECMODModule *mod, co
     }
 
     /* we've found the slot, now build the moduleSpec */
-    escSpec = nss_doubleEscape(moduleSpec);
+    escSpec = secmod_doubleEscape(moduleSpec, '>', ']');
     if (escSpec == NULL) {
 	PK11_FreeSlot(slot);
 	return NULL;
Index: mozilla/security/nss/lib/pk11wrap/secmodi.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/secmodi.h,v
retrieving revision 1.31
diff -u -p -r1.31 secmodi.h
--- ./mozilla/security/nss/lib/pk11wrap/secmodi.h	2 Dec 2008 23:24:50 -0000	1.31
+++ ./mozilla/security/nss/lib/pk11wrap/secmodi.h	1 Sep 2009 22:47:51 -0000
@@ -58,7 +58,8 @@ void nss_DumpModuleLog(void);
 extern int secmod_PrivateModuleCount;
 
 extern void SECMOD_Init(void);
-SECStatus secmod_ModuleInit(SECMODModule *mod, PRBool* alreadyLoaded);
+SECStatus secmod_ModuleInit(SECMODModule *mod, SECMODModule **oldModule,
+			    PRBool* alreadyLoaded);
 
 /* list managment */
 extern SECStatus SECMOD_AddModuleToList(SECMODModule *newModule);
@@ -73,6 +74,7 @@ extern void SECMOD_ReleaseWriteLock(SECM
 
 /* Operate on modules by name */
 extern SECMODModule *SECMOD_FindModuleByID(SECMODModuleID);
+extern SECMODModule *secmod_findModuleByFuncPtr(void *funcPtr);
 
 /* database/memory management */
 extern SECMODModuleList *SECMOD_NewModuleListElement(void);
@@ -84,10 +86,25 @@ extern unsigned long SECMOD_InternaltoPu
 extern unsigned long SECMOD_InternaltoPubCipherFlags(unsigned long internalFlags);
 
 /* Library functions */
-SECStatus SECMOD_LoadPKCS11Module(SECMODModule *);
+SECStatus secmod_LoadPKCS11Module(SECMODModule *, SECMODModule **oldModule);
 SECStatus SECMOD_UnloadModule(SECMODModule *);
 void SECMOD_SetInternalModule(SECMODModule *);
 
+/* parsing parameters */
+/* returned char * must be freed by caller with PORT_Free */
+/* children and ids are null terminated arrays which must be freed with
+ * secmod_FreeChildren */
+char *secmod_ParseModuleSpecForTokens(char *moduleSpec,
+				      char ***children, 
+				      CK_SLOT_ID **ids);
+void secmod_FreeChildren(char **children, CK_SLOT_ID *ids);
+char *secmod_mkAppendTokensList(PRArenaPool *arena, char *origModuleSpec, 
+				char *newModuleSpec, CK_SLOT_ID newID,
+				char **children, CK_SLOT_ID *ids);
+char *secmod_doubleEscape(const char *string, char quote1, char quote2);
+
+
+
 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot);
 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event,
                                                          CK_VOID_PTR pdata);
Index: mozilla/security/nss/lib/pki/pki3hack.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pki/pki3hack.c,v
retrieving revision 1.97
diff -u -p -r1.97 pki3hack.c
--- ./mozilla/security/nss/lib/pki/pki3hack.c	30 Jul 2009 22:43:32 -0000	1.97
+++ ./mozilla/security/nss/lib/pki/pki3hack.c	1 Sep 2009 22:47:51 -0000
@@ -101,6 +101,11 @@ STAN_InitTokenForSlotInfo(NSSTrustDomain
     NSSToken *token;
     if (!td) {
 	td = g_default_trust_domain;
+	if (!td) {
+	    /* we're called while still initting. slot will get added
+	     * appropriately through normal init processes */
+	    return PR_SUCCESS;
+	}
     }
     token = nssToken_CreateFromPK11SlotInfo(td, slot);
     PK11Slot_SetNSSToken(slot, token);
@@ -118,6 +123,11 @@ STAN_ResetTokenInterator(NSSTrustDomain 
 {
     if (!td) {
 	td = g_default_trust_domain;
+	if (!td) {
+	    /* we're called while still initting. slot will get added
+	     * appropriately through normal init processes */
+	    return PR_SUCCESS;
+	}
     }
     NSSRWLock_LockWrite(td->tokensLock);
     nssListIterator_Destroy(td->tokens);



From nucleo at fedoraproject.org  Wed Sep  9 21:49:47 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Wed,  9 Sep 2009 21:49:47 +0000 (UTC)
Subject: rpms/kvirc/F-11 kvirc.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20090909214947.2452711C00CE@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18532

Modified Files:
	kvirc.spec sources 
Log Message:
disabled pyhton module


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kvirc.spec	8 Sep 2009 00:33:15 -0000	1.6
+++ kvirc.spec	9 Sep 2009 21:49:46 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.16.%{pre}%{?dist}
+Release:          0.17.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -11,7 +11,7 @@ URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
-BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
+BuildRequires:    perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -28,13 +28,13 @@ many IRC addicted developers around the 
 %build
 %{cmake}  \
 %ifarch %{ix86}
--DWITH_ix86_ASM=YES \
+-DWITH_ix86_ASM=ON \
 %endif
 -DWANT_NO_EMBEDDED_CODE=OFF \
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITH_PYTHON=ON \
+-DWITHOUT_PYTHON=ON \
 -DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
 
@@ -126,6 +126,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
+- disabled pyhton module, added -DWITHOUT_PYTHON=ON
+- removed BR python-devel
+
 * Tue Sep  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.16.rc1
 - KVIrc 4.0 release candidate 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Sep 2009 00:33:15 -0000	1.7
+++ sources	9 Sep 2009 21:49:46 -0000	1.8
@@ -1 +1 @@
-092206ada148236a9e62351c98d59560  kvirc-4.0rc1.tar.bz2
+fbf84c24864b7a89922574bcfa68f292  kvirc-4.0rc1.tar.bz2



From nucleo at fedoraproject.org  Wed Sep  9 21:52:59 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Wed,  9 Sep 2009 21:52:59 +0000 (UTC)
Subject: rpms/kvirc/F-10 kvirc.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20090909215259.E7FDB11C00CE@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21525

Modified Files:
	kvirc.spec sources 
Log Message:
disabled pyhton module


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/kvirc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kvirc.spec	8 Sep 2009 00:35:23 -0000	1.6
+++ kvirc.spec	9 Sep 2009 21:52:58 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.16.%{pre}%{?dist}
+Release:          0.17.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -11,7 +11,7 @@ URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
-BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
+BuildRequires:    perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -28,13 +28,13 @@ many IRC addicted developers around the 
 %build
 %{cmake}  \
 %ifarch %{ix86}
--DWITH_ix86_ASM=YES \
+-DWITH_ix86_ASM=ON \
 %endif
 -DWANT_NO_EMBEDDED_CODE=OFF \
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITH_PYTHON=ON \
+-DWITHOUT_PYTHON=ON \
 -DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
 
@@ -126,6 +126,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
+- disabled pyhton module, added -DWITHOUT_PYTHON=ON
+- removed BR python-devel
+
 * Tue Sep  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.16.rc1
 - KVIrc 4.0 release candidate 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Sep 2009 00:35:23 -0000	1.7
+++ sources	9 Sep 2009 21:52:58 -0000	1.8
@@ -1 +1 @@
-092206ada148236a9e62351c98d59560  kvirc-4.0rc1.tar.bz2
+fbf84c24864b7a89922574bcfa68f292  kvirc-4.0rc1.tar.bz2



From whot at fedoraproject.org  Wed Sep  9 21:59:02 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  9 Sep 2009 21:59:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.34,1.35
Message-ID: <20090909215902.76A3511C00CE@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27594

Modified Files:
	xorg-x11-drv-mouse.spec 
Log Message:
* Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.1-2
- Fix spec file, Release was busted.



Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-mouse.spec	9 Sep 2009 02:10:00 -0000	1.34
+++ xorg-x11-drv-mouse.spec	9 Sep 2009 21:58:59 -0000	1.35
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
 Version:   1.4.99.1
-Release:   1.{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.1-2
+- Fix spec file, Release was busted.
+
 * Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.1-1
 - mouse 1.4.99.1
 



From pfj at fedoraproject.org  Wed Sep  9 22:24:14 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed,  9 Sep 2009 22:24:14 +0000 (UTC)
Subject: rpms/monodevelop/devel monodevelop-210-nunitmakes.patch, NONE,
	1.1 monodevelop-210-usececil.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 import.log, 1.23, 1.24 monodevelop-192-nunit.patch, 1.1,
	1.2 monodevelop-2.spec, 1.19, 1.20 sources, 1.24,
	1.25 md-192-desktop.patch, 1.1,
	NONE monodevelop-1.9.1-use-mono-cecil.patch, 1.1,
	NONE monodevelop-191-usemonocecil.patch, 1.2, NONE
Message-ID: <20090909222414.EF2D611C00CE@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24535/devel

Modified Files:
	.cvsignore import.log monodevelop-192-nunit.patch 
	monodevelop-2.spec sources 
Added Files:
	monodevelop-210-nunitmakes.patch 
	monodevelop-210-usececil.patch 
Removed Files:
	md-192-desktop.patch monodevelop-1.9.1-use-mono-cecil.patch 
	monodevelop-191-usemonocecil.patch 
Log Message:

Bump to 2.2 beta 1
Patch tidy up
Dropped desktop patch 


monodevelop-210-nunitmakes.patch:
 Makefile-new.in |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

--- NEW FILE monodevelop-210-nunitmakes.patch ---
--- monodevelop-2.1.0/src/addins/NUnit/Makefile.in	2009-09-07 16:36:22.000000000 +0100
+++ monodevelop-2.1.0/src/addins/NUnit/Makefile-new.in	2009-09-09 22:16:00.000000000 +0100
@@ -200,10 +200,10 @@
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
+	-r:$(libdir)/mono/nunit22/nunit.core.dll \
+	-r:$(libdir)/mono/nunit22/nunit.core.interfaces.dll \
+	-r:$(libdir)/mono/nunit22/nunit.framework.dll \
+	-r:$(libdir)/mono/nunit22/nunit.util.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
@@ -269,18 +269,10 @@
 	templates/NUnitProject.xpt.xml \
 	templates/NUnitTestClass.xft.xml
 
-NUNIT_FILES = \
-nunit.core.dll \
-nunit.framework.dll \
-nunit.core.interfaces.dll \
-nunit.util.dll
-
-SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
-BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
 assemblydir = $(MD_ADDIN_DIR)/NUnit
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+EXTRA_DIST = $(FILES) $(RES)
 build_deps = $(addprefix -r:, $(DEPS))
 build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
 build_resources = $(addprefix $(srcdir)/, $(RES))

monodevelop-210-usececil.patch:
 monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.am |    2 +-
 monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.in |    2 +-
 monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.am      |    2 +-
 monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in      |    2 +-
 monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.am               |    3 +--
 monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.in               |    3 +--
 6 files changed, 6 insertions(+), 8 deletions(-)

--- NEW FILE monodevelop-210-usececil.patch ---
--- monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am	2009-08-07 15:39:34.000000000 +0100
+++ monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.am	2009-09-09 18:50:01.000000000 +0100
@@ -40,7 +40,7 @@
 
 DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
+	$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
--- monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in	2009-09-07 16:36:20.000000000 +0100
+++ monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in	2009-09-09 18:50:58.000000000 +0100
@@ -213,7 +213,7 @@
 
 DEPS = \
 	$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
+	$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
--- monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.in	2008-12-17 00:22:07.000000000 +0000
+++ monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.in	2008-12-17 14:57:31.000000000 +0000
@@ -248,7 +248,7 @@
 
 DEPS = \
 	../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-	../../../../build/bin/Mono.Cecil.dll
+	$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll
 
 REFS = \
 	$(GLADE_SHARP_LIBS) \
--- monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.am	2008-12-17 14:55:48.000000000 +0000
+++ monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.am	2008-12-17 14:56:47.000000000 +0000
@@ -75,7 +75,7 @@
 
 DEPS =  \
 	../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-	../../../../build/bin/Mono.Cecil.dll
+	$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
--- monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile.am	2009-08-24 16:22:54.000000000 +0100
+++ monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.am	2009-09-09 22:31:48.000000000 +0100
@@ -3,8 +3,7 @@
 CONFIG = MonoDevelop.Projects.dll.config
   
 DEPS =  \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+	$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Projects.Formats.MSBuild.exe
 
--- monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile.in	2009-09-07 16:36:23.000000000 +0100
+++ monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.in	2009-09-09 22:33:06.000000000 +0100
@@ -175,8 +175,7 @@
 ASSEMBLY = $(top_builddir)/build/bin/MonoDevelop.Projects.dll
 CONFIG = MonoDevelop.Projects.dll.config
 DEPS = \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+	$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Projects.Formats.MSBuild.exe
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	26 Mar 2009 23:24:43 -0000	1.24
+++ .cvsignore	9 Sep 2009 22:24:12 -0000	1.25
@@ -1 +1 @@
-monodevelop-2.0.tar.bz2
+monodevelop-2.1.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- import.log	23 Jun 2009 20:16:27 -0000	1.23
+++ import.log	9 Sep 2009 22:24:13 -0000	1.24
@@ -21,3 +21,4 @@ monodevelop-1_9_2-2_beta1_20092202svn127
 monodevelop-1_9_3-1_beta2_fc11:HEAD:monodevelop-1.9.3-1.beta2.fc11.src.rpm:1237126492
 monodevelop-2_0-1_fc11:HEAD:monodevelop-2.0-1.fc11.src.rpm:1238109849
 monodevelop-2_0-3_fc12:HEAD:monodevelop-2.0-3.fc12.src.rpm:1245788128
+monodevelop-2_1_0-1_fc12:HEAD:monodevelop-2.1.0-1.fc12.src.rpm:1252535001

monodevelop-192-nunit.patch:
 MonoDevelopNUnit.addin-new.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: monodevelop-192-nunit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-192-nunit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monodevelop-192-nunit.patch	17 Jan 2009 00:21:23 -0000	1.1
+++ monodevelop-192-nunit.patch	9 Sep 2009 22:24:13 -0000	1.2
@@ -1,51 +1,3 @@
---- monodevelop-123651/src/addins/NUnit/Makefile.in	2009-01-16 22:57:53.000000000 +0000
-+++ monodevelop-123651/src/addins/NUnit/Makefile-new.in	2009-01-16 23:20:46.000000000 +0000
-@@ -200,10 +200,10 @@
- 	$(GLIB_SHARP_LIBS) \
- 	$(GTK_SHARP_LIBS) \
- 	$(MONO_ADDINS_LIBS) \
--	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
--	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
--	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
--	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
-+	-r:$(libdir)/mono/nunit22/nunit.core.dll \
-+	-r:$(libdir)/mono/nunit22/nunit.core.interfaces.dll \
-+	-r:$(libdir)/mono/nunit22/nunit.framework.dll \
-+	-r:$(libdir)/mono/nunit22/nunit.util.dll \
- 	-r:Mono.Posix \
- 	-r:System \
- 	-r:System.Xml
-@@ -267,18 +267,10 @@
- 	templates/NUnitProject.xpt.xml \
- 	templates/NUnitTestClass.xft.xml
- 
--NUNIT_FILES = \
--nunit.core.dll \
--nunit.framework.dll \
--nunit.core.interfaces.dll \
--nunit.util.dll
--
--SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
--BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
- assemblydir = $(MD_ADDIN_DIR)/NUnit
--assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
--CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
--EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
-+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
-+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-+EXTRA_DIST = $(FILES) $(RES)
- build_deps = $(addprefix -r:, $(DEPS))
- build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
- build_resources = $(addprefix $(srcdir)/, $(RES))
-@@ -618,7 +610,7 @@
- 	uninstall-assemblyDATA
- 
- 
--all: $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-+all: $(ASSEMBLY) $(ASSEMBLY).mdb 
- 
- $(ADDIN_BUILD)/%: $(srcdir)/lib/%
- 	mkdir -p $(ADDIN_BUILD)
 --- monodevelop-123651/src/addins/NUnit/MonoDevelopNUnit.addin.xml	2009-01-16 22:57:53.000000000 +0000
 +++ monodevelop-123651/src/addins/NUnit/MonoDevelopNUnit.addin-new.xml	2009-01-16 23:16:11.000000000 +0000
 @@ -10,10 +10,10 @@


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- monodevelop-2.spec	4 Aug 2009 09:09:54 -0000	1.19
+++ monodevelop-2.spec	9 Sep 2009 22:24:13 -0000	1.20
@@ -9,19 +9,18 @@
 %define nunitver 2.2.10.0
 
 Name:           monodevelop
-Version:        2.0
-Release:        5%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://monodevelop.com/
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:         monodevelop-1.9.1-use-mono-cecil.patch
+Patch0:         monodevelop-210-usececil.patch
 Patch1:		monodevelop-1.9.2-removed-contrib.patch
 Patch2:		monodevelop-192-nunit.patch
-Patch3:		monodevelop-191-usemonocecil.patch
-Patch4:		md-192-desktop.patch
+Patch3:		monodevelop-210-nunitmakes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel >= 2.4 mono-addins-devel >= 0.4 gtk-sharp2-devel
@@ -61,10 +60,10 @@ Development files for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-mono-cecil
-%patch1 -p1 -b .use-system-cecil
+%patch0 -p1 -b .monocecil
+%patch1 -p1 -b .remove-contrib
 %patch2 -p1 -b .use-system-nunit
-%patch3 -p1 -b .monocecil
+%patch3 -p1 -b .nunit
 
 sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' configure
 sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' monodevelop.in
@@ -159,11 +158,10 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
-* Tue Aug  4 2009 Jan Horak <jhorak at redhat.com> - 2.0-5
-- Rebuild against newer gecko
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> -2.1.0-1
+- Bump to 2.2 beta 1
+- Fixed cecil patch
+- Drop desktop patch
 
 * Tue Jun 23 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> -2.0-3
 - Fix mdtool libdir issue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	26 Mar 2009 23:24:43 -0000	1.24
+++ sources	9 Sep 2009 22:24:13 -0000	1.25
@@ -1 +1 @@
-0f527204ffd4785284d9556a75524c3e  monodevelop-2.0.tar.bz2
+f4b6b45fa28f18f4253ece7461e6f6f2  monodevelop-2.1.0.tar.bz2


--- md-192-desktop.patch DELETED ---


--- monodevelop-1.9.1-use-mono-cecil.patch DELETED ---


--- monodevelop-191-usemonocecil.patch DELETED ---



From pfj at fedoraproject.org  Wed Sep  9 22:27:17 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed,  9 Sep 2009 22:27:17 +0000 (UTC)
Subject: rpms/gtk-sharp2/devel gtksharp-2129-docfix.patch, NONE,
	1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.15, 1.16 gtk-sharp2.spec, 1.45,
	1.46 sources, 1.15, 1.16 gtk-sharp-2.10.0-libdir.patch, 1.1,
	NONE gtk-sharp-2.8.2-docfix.patch, 1.1,
	NONE gtk-sharp-2.9.0-libdir.patch, 1.1,
	NONE gtk-sharp-2.9.0-monodir.patch, 1.1,
	NONE gtk-sharp2-2.10.3-assemblydir.patch, 1.1,
	NONE gtk-sharp2-2.12.0-monodoc.patch, 1.1,
	NONE gtk-sharp2-vtelibs.patch, 1.1, NONE
Message-ID: <20090909222717.0AA1F11C00CE@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/gtk-sharp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29458/devel

Modified Files:
	.cvsignore gtk-sharp2.spec sources 
Added Files:
	gtksharp-2129-docfix.patch import.log 
Removed Files:
	gtk-sharp-2.10.0-libdir.patch gtk-sharp-2.8.2-docfix.patch 
	gtk-sharp-2.9.0-libdir.patch gtk-sharp-2.9.0-monodir.patch 
	gtk-sharp2-2.10.3-assemblydir.patch 
	gtk-sharp2-2.12.0-monodoc.patch gtk-sharp2-vtelibs.patch 
Log Message:

Spec file clean up
Bump to newer version 


gtksharp-2129-docfix.patch:
 en/index-new.xml          |    6 ------
 gtk-sharp-docs-new.source |    2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE gtksharp-2129-docfix.patch ---
--- gtk-sharp-2.12.9/doc/gtk-sharp-docs.source	2009-01-07 20:49:44.000000000 +0000
+++ gtk-sharp-2.12.9/doc/gtk-sharp-docs-new.source	2009-09-09 23:08:49.000000000 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <monodoc>
   <node label="Gnome Libraries" name="classlib-gnome" parent="libraries" />
-  <source provider="ecma" basefile="gtk-sharp-docs" path="classlib-gnome"/>
+  <source provider="ecma-uncompiled" basefile="gtk-sharp-docs" path="classlib-gnome"/>
 </monodoc>
--- gtk-sharp-2.12.9/doc/en/index.xml	2009-05-26 19:13:15.000000000 +0100
+++ gtk-sharp-2.12.9/doc/en/index-new.xml	2009-09-09 23:07:47.000000000 +0100
@@ -1238,9 +1238,6 @@
       <Type Name="MimeEquivalence" />
       <Type Name="ModuleCallbackFullAuthenticationOutFlags" />
     </Namespace>
-    <Namespace Name="GtkSharp.GnomeVfsSharp">
-      <Type Name="ObjectManager" />
-    </Namespace>
     <Namespace Name="Art">
       <Type Name="Affine" />
       <Type Name="AlphaGamma" />
@@ -1470,9 +1467,6 @@
       <Type Name="Authentication" />
       <Type Name="PrintSvg" />
     </Namespace>
-    <Namespace Name="GtkSharp.GnomeSharp">
-      <Type Name="ObjectManager" />
-    </Namespace>
     <Namespace Name="GConf">
       <Type Name="ClientBase" />
       <Type Name="Client" />


--- NEW FILE import.log ---
gtk-sharp2-2_12_9-1_fc12:HEAD:gtk-sharp2-2.12.9-1.fc12.src.rpm:1252535194


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Dec 2008 11:38:25 -0000	1.15
+++ .cvsignore	9 Sep 2009 22:27:14 -0000	1.16
@@ -1 +1 @@
-gtk-sharp-2.12.7.tar.bz2
+gtk-sharp-2.12.9.tar.bz2


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gtk-sharp2.spec	25 Jul 2009 01:42:17 -0000	1.45
+++ gtk-sharp2.spec	9 Sep 2009 22:27:16 -0000	1.46
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
-Version:        2.12.7
-Release:        6%{?dist}
+Version:        2.12.9
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -9,11 +9,8 @@ URL:            http://gtk-sharp.sf.net
 Source0:        http://go-mono.com/sources/gtk-sharp2/gtk-sharp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Patch1: gtk-sharp-2.9.0-monodir.patch
-Patch2: gtk-sharp2-2.10.3-libdir.patch
-Patch3: gtk-sharp-2.8.2-docfix.patch
-#Patch4: gtk-sharp2-2.10.3-assemblydir.patch
-#Patch5: gtk-sharp2-2.12.0-monodoc.patch
+Patch0: gtk-sharp2-2.10.3-libdir.patch
+Patch1: gtksharp-2129-docfix.patch
 
 BuildRequires:  mono-devel gtk2-devel libglade2-devel
 BuildRequires:  automake, libtool
@@ -58,12 +55,9 @@ Requires: %{name} = %{version}-%{release
 This package provides the Gtk# documentation for monodoc.
 
 %prep
-%setup -n gtk-sharp-%{version}
-#%patch1 -p1 -b .monodir
-%patch2 -p1 -b .libdir
-%patch3 -p1 -b .docfix
-#%patch4 -p1 -b .assemblydir
-#%patch5 -p1 -b .monodoc
+%setup -q -n gtk-sharp-%{version}
+%patch0 -p1 -b .libdir
+%patch1 -p1 -b .docfix
 
 # Fix assembly libdir
 sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.in \
@@ -127,6 +121,11 @@ cp -R doc/en $RPM_BUILD_ROOT%{_libdir}/m
 %{_libdir}/monodoc
 
 %changelog
+* Wed Sep 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.12.9-1
+- Bump to newer version
+- Fixed doc patch
+- Spec file cleanup
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Dec 2008 11:38:25 -0000	1.15
+++ sources	9 Sep 2009 22:27:16 -0000	1.16
@@ -1 +1 @@
-e3f2ac276832829d7089352f014c4c6f  gtk-sharp-2.12.7.tar.bz2
+2619f6cbba514f10582f8961ed84063b  gtk-sharp-2.12.9.tar.bz2


--- gtk-sharp-2.10.0-libdir.patch DELETED ---


--- gtk-sharp-2.8.2-docfix.patch DELETED ---


--- gtk-sharp-2.9.0-libdir.patch DELETED ---


--- gtk-sharp-2.9.0-monodir.patch DELETED ---


--- gtk-sharp2-2.10.3-assemblydir.patch DELETED ---


--- gtk-sharp2-2.12.0-monodoc.patch DELETED ---


--- gtk-sharp2-vtelibs.patch DELETED ---



From emaldonado at fedoraproject.org  Wed Sep  9 22:38:10 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed,  9 Sep 2009 22:38:10 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.115,1.116
Message-ID: <20090909223810.704A911C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14425

Modified Files:
	nss.spec 
Log Message:
Add the nss-sysinit subpackage, add NSS_INCLUDE_DIR and NSS_LIB_DIR to the path


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- nss.spec	8 Sep 2009 18:32:10 -0000	1.115
+++ nss.spec	9 Sep 2009 22:38:09 -0000	1.116
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          6%{?dist}
+Release:          7%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -35,6 +35,8 @@ Source12:         %{name}-pem-20090907.t
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
+Patch7:           newargs.patch
+Patch8:           sysinit.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -59,6 +61,17 @@ v3 certificates, and other security stan
 Install the nss-tools package if you need command-line tools to
 manipulate the NSS certificate and key database.
 
+%package sysinit
+Summary:          System NSS Initilization
+Group:            System Environment/Base
+Provides:         nss-sysinit = %{version}-%{release}
+Requires:         nss = %{version}-%{release}
+
+%description sysinit
+Default Operating System module that manages applications loading
+NSS globally on the system. This module loads the system defined
+PKCS #11 modules for NSS and chains with other NSS modules to load
+any system or user configured modules.
 
 %package devel
 Summary:          Development libraries for Network Security Services
@@ -89,6 +102,8 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
+%patch7 -p0 -b .newargs
+%patch8 -p0 -b .sysinit
 
 %build
 
@@ -115,6 +130,12 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
+NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
+NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
+
+export NSS_INCLUDE_DIR
+export NSS_LIB_DIR
+
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
 export USE_64
@@ -228,7 +249,7 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
+for file in libnss3.so libnssckbi.so libnsspem.so libnsssysinit.so libsmime3.so libssl3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
@@ -329,6 +350,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
 
+%files sysinit
+%defattr(-,root,root)
+%{_libdir}/libnsssysinit.so
+
 %files tools
 %defattr(-,root,root)
 %{_bindir}/certutil
@@ -422,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com - 3.12.4-7
+- Add the nss-sysinit subpackage
+
 * Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-6
 - Installing shared libraries to %%{_libdir}
 



From steved at fedoraproject.org  Wed Sep  9 22:43:52 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed,  9 Sep 2009 22:43:52 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-nfsd4-proots.patch,1.2,1.3
Message-ID: <20090909224352.F1CA311C00CE@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23820

Modified Files:
	linux-2.6-nfsd4-proots.patch 
Log Message:
Fixed typo in the linux-2.6-nfsd4-proots.patch patch


linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |   12 +++++-
 fs/nfsd/nfs4xdr.c           |   83 ++++++++++++++++++++++++++++++++++++--------
 fs/nfsd/nfsfh.c             |   32 ++++++++++++++++
 fs/nfsd/vfs.c               |   75 ++++++++++++++++++++++++++++++++++++++-
 include/linux/nfsd/export.h |    3 +
 include/linux/nfsd/nfsd.h   |    2 +
 6 files changed, 188 insertions(+), 19 deletions(-)

Index: linux-2.6-nfsd4-proots.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-nfsd4-proots.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-nfsd4-proots.patch	9 Sep 2009 19:24:27 -0000	1.2
+++ linux-2.6-nfsd4-proots.patch	9 Sep 2009 22:43:52 -0000	1.3
@@ -283,7 +283,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
 +	struct path path;
 +	int err = 0;
 +
-+	if (exp->ex_flags & NFSEXP_V4ROOT) == 0)
++	if ((exp->ex_flags & NFSEXP_V4ROOT) == 0)
 +		return 0;
 +
 +	/*



From whot at fedoraproject.org  Wed Sep  9 23:04:19 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  9 Sep 2009 23:04:19 +0000 (UTC)
Subject: rpms/xorg-x11-util-macros/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 xorg-x11-util-macros.spec, 1.30, 1.31
Message-ID: <20090909230419.C61B811C00CE@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-util-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11102

Modified Files:
	.cvsignore sources xorg-x11-util-macros.spec 
Log Message:
* Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
- util-macros 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Jul 2009 02:29:30 -0000	1.14
+++ .cvsignore	9 Sep 2009 23:04:09 -0000	1.15
@@ -1 +1 @@
-util-macros-1.2.2.tar.bz2
+util-macros-1.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 Jul 2009 02:29:30 -0000	1.14
+++ sources	9 Sep 2009 23:04:09 -0000	1.15
@@ -1 +1 @@
-0f9d0c659f269e905bcb9f706bc561ba  util-macros-1.2.2.tar.bz2
+0837fe88af7d692308b25815457a3288  util-macros-1.3.0.tar.bz2


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xorg-x11-util-macros.spec	27 Jul 2009 08:37:41 -0000	1.30
+++ xorg-x11-util-macros.spec	9 Sep 2009 23:04:09 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
-Version: 1.2.2
-Release: 2%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
+- util-macros 1.3.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tuxbrewr at fedoraproject.org  Wed Sep  9 23:07:41 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed,  9 Sep 2009 23:07:41 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec, 1.43, 1.44 sources, 1.20,
	1.21
Message-ID: <20090909230741.AE93E11C00CE@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13029

Modified Files:
	kpackagekit.spec sources 
Log Message:
New git snapshot


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- kpackagekit.spec	3 Sep 2009 09:48:18 -0000	1.43
+++ kpackagekit.spec	9 Sep 2009 23:07:41 -0000	1.44
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.5.0
-Release:	0.1.20090902svn%{?dist}
+Release:	0.1.20090908svn%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 08 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090908svn
+- New git snapshot, disable history
+
 * Wed Sep 02 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090902svn
 - New git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	3 Sep 2009 09:48:18 -0000	1.20
+++ sources	9 Sep 2009 23:07:41 -0000	1.21
@@ -1 +1 @@
-763708cf93f5fe23e90860ee298b5159  kpackagekit-0.5.0.tar.bz2
+0f78e8e6be17c4cf33df3984d0b7e1e7  kpackagekit-0.5.0.tar.bz2



From cwickert at fedoraproject.org  Wed Sep  9 23:35:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 23:35:50 +0000 (UTC)
Subject: rpms/xfce4-session/devel xfce4-session-4.6.1-correct-shadows.patch, 
	NONE, 1.1 xfce4-session-4.6.1-fix-german-logut.patch, NONE,
	1.1 xfce4-session.spec, 1.29, 1.30
Message-ID: <20090909233551.0FB8A11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23652

Modified Files:
	xfce4-session.spec 
Added Files:
	xfce4-session-4.6.1-correct-shadows.patch 
	xfce4-session-4.6.1-fix-german-logut.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
- Fix German text in logout dialog
- Fix shadows in 'simple' splash engine
- Don't ship static lib in -devel package
- configure with --disable-static instead of removing *.a files


xfce4-session-4.6.1-correct-shadows.patch:
 simple.c |   10 ----------
 1 file changed, 10 deletions(-)

--- NEW FILE xfce4-session-4.6.1-correct-shadows.patch ---
--- xfce4-session/engines/simple/simple.c.orig	2006-09-02 19:27:37.000000000 +0200
+++ xfce4-session/engines/simple/simple.c	2006-10-06 15:19:59.000000000 +0200
@@ -202,7 +202,6 @@
 simple_next (XfsmSplashEngine *engine, const gchar *text)
 {
   Simple *simple = (Simple *) engine->user_data;
-  GdkColor shcolor;
   gint tw, th, tx, ty;
 
   pango_layout_set_text (simple->layout, text, -1);
@@ -220,15 +219,6 @@
 
   gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
 
-  /* draw shadow */
-  shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
-  shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
-  shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
-  shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
-  shcolor.green = shcolor.red;
-  shcolor.blue = shcolor.red;
-
-  gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
   gdk_draw_layout (simple->pixmap, simple->gc,
                    tx + 2, ty + 2, simple->layout);
 

xfce4-session-4.6.1-fix-german-logut.patch:
 de.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-session-4.6.1-fix-german-logut.patch ---
--- po/de.po	2009-04-15 10:14:23.000000000 +0200
+++ po/de.po.fixed	2009-09-10 01:02:19.000000000 +0200
@@ -332,7 +332,7 @@
 #: ../xfce4-session/shutdown.c:360
 #, c-format
 msgid "<span size='large'><b>Log out %s</b></span>"
-msgstr "<span?size='large'><b>%s abmelden</b></span>"
+msgstr "<span size='large'><b>%s abmelden</b></span>"
 
 #: ../xfce4-session/shutdown.c:401
 msgid "Log Out"


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xfce4-session.spec	27 Jul 2009 07:55:52 -0000	1.29
+++ xfce4-session.spec	9 Sep 2009 23:35:48 -0000	1.30
@@ -1,11 +1,15 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2
 Patch0: xfce4-session-4.5.92-hide-tips.patch
+# http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
+Patch1: xfce4-session-4.6.1-correct-shadows.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=5745
+Patch2: xfce4-session-4.6.1-fix-german-logut.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -46,9 +50,11 @@ Additional splash screen engines for the
 %prep
 %setup -q
 %patch0 -p1 -b .disable-tips
+%patch1 -p1 -b .correct-shadows
+%patch2 -p0 -b .german-fixed
 
 %build
-%configure --enable-gnome --enable-final
+%configure --enable-gnome --enable-final --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -56,10 +62,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %find_lang %{name}
 
 %clean
@@ -80,20 +83,8 @@ touch --no-create %{_datadir}/icons/hico
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/icons/hicolor/128x128/apps/xfce4-session.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-session.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-splash.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-logout.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-reboot.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-shutdown.png
-%{_datadir}/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
-%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
-%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-normal.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-session.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-hibernate.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-suspend.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/xfce4/doc/*/images/*
 %{_datadir}/xfce4/doc/*/*.html
 %dir %{_datadir}/xfce4/tips/
@@ -112,7 +103,6 @@ touch --no-create %{_datadir}/icons/hico
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/xfce4-session-4.6
 
@@ -124,6 +114,12 @@ touch --no-create %{_datadir}/icons/hico
 %{_libexecdir}/balou-*
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Fix German text in logout dialog
+- Fix shadows in 'simple' splash engine
+- Don't ship static lib in -devel package
+- configure with --disable-static instead of removing *.a files
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Wed Sep  9 23:42:12 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 23:42:12 +0000 (UTC)
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.30,1.31
Message-ID: <20090909234212.CEEA611C0423@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24938

Modified Files:
	xfce4-session.spec 
Log Message:
new icon cache scriptlet


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xfce4-session.spec	9 Sep 2009 23:35:48 -0000	1.30
+++ xfce4-session.spec	9 Sep 2009 23:42:12 -0000	1.31
@@ -69,15 +69,19 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/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
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO



From cwickert at fedoraproject.org  Wed Sep  9 23:46:09 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 23:46:09 +0000 (UTC)
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.31,1.32
Message-ID: <20090909234609.9E09211C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25910

Modified Files:
	xfce4-session.spec 
Log Message:
fix directory ownership issue


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xfce4-session.spec	9 Sep 2009 23:42:12 -0000	1.31
+++ xfce4-session.spec	9 Sep 2009 23:46:09 -0000	1.32
@@ -100,7 +100,6 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%dir %{_sysconfdir}/xdg/autostart/
 %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
@@ -123,6 +122,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 - Fix shadows in 'simple' splash engine
 - Don't ship static lib in -devel package
 - configure with --disable-static instead of removing *.a files
+- Fix directory ownership issue
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From cwickert at fedoraproject.org  Wed Sep  9 23:48:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Sep 2009 23:48:55 +0000 (UTC)
Subject: rpms/xfce4-session/F-11 xfce4-session-4.6.1-correct-shadows.patch, 
	NONE, 1.1 xfce4-session-4.6.1-fix-german-logut.patch, NONE,
	1.1 xfce4-session.spec, 1.28, 1.29
Message-ID: <20090909234855.DAE9C11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27254

Modified Files:
	xfce4-session.spec 
Added Files:
	xfce4-session-4.6.1-correct-shadows.patch 
	xfce4-session-4.6.1-fix-german-logut.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
- Fix German text in logout dialog
- Fix shadows in 'simple' splash engine
- Don't ship static lib in -devel package
- configure with --disable-static instead of removing *.a files


xfce4-session-4.6.1-correct-shadows.patch:
 simple.c |   10 ----------
 1 file changed, 10 deletions(-)

--- NEW FILE xfce4-session-4.6.1-correct-shadows.patch ---
--- xfce4-session/engines/simple/simple.c.orig	2006-09-02 19:27:37.000000000 +0200
+++ xfce4-session/engines/simple/simple.c	2006-10-06 15:19:59.000000000 +0200
@@ -202,7 +202,6 @@
 simple_next (XfsmSplashEngine *engine, const gchar *text)
 {
   Simple *simple = (Simple *) engine->user_data;
-  GdkColor shcolor;
   gint tw, th, tx, ty;
 
   pango_layout_set_text (simple->layout, text, -1);
@@ -220,15 +219,6 @@
 
   gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
 
-  /* draw shadow */
-  shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
-  shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
-  shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
-  shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
-  shcolor.green = shcolor.red;
-  shcolor.blue = shcolor.red;
-
-  gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
   gdk_draw_layout (simple->pixmap, simple->gc,
                    tx + 2, ty + 2, simple->layout);
 

xfce4-session-4.6.1-fix-german-logut.patch:
 de.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-session-4.6.1-fix-german-logut.patch ---
--- po/de.po	2009-04-15 10:14:23.000000000 +0200
+++ po/de.po.fixed	2009-09-10 01:02:19.000000000 +0200
@@ -332,7 +332,7 @@
 #: ../xfce4-session/shutdown.c:360
 #, c-format
 msgid "<span size='large'><b>Log out %s</b></span>"
-msgstr "<span?size='large'><b>%s abmelden</b></span>"
+msgstr "<span size='large'><b>%s abmelden</b></span>"
 
 #: ../xfce4-session/shutdown.c:401
 msgid "Log Out"


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/F-11/xfce4-session.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xfce4-session.spec	21 Apr 2009 02:29:25 -0000	1.28
+++ xfce4-session.spec	9 Sep 2009 23:48:55 -0000	1.29
@@ -1,11 +1,15 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.6.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2
 Patch0: xfce4-session-4.5.92-hide-tips.patch
+# http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
+Patch1: xfce4-session-4.6.1-correct-shadows.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=5745
+Patch2: xfce4-session-4.6.1-fix-german-logut.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -46,9 +50,11 @@ Additional splash screen engines for the
 %prep
 %setup -q
 %patch0 -p1 -b .disable-tips
+%patch1 -p1 -b .correct-shadows
+%patch2 -p0 -b .german-fixed
 
 %build
-%configure --enable-gnome --enable-final
+%configure --enable-gnome --enable-final --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -56,44 +62,33 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/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
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/icons/hicolor/128x128/apps/xfce4-session.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-session.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-splash.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-logout.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-reboot.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-shutdown.png
-%{_datadir}/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
-%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
-%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-normal.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-session.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-hibernate.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-suspend.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/xfce4/doc/*/images/*
 %{_datadir}/xfce4/doc/*/*.html
 %dir %{_datadir}/xfce4/tips/
@@ -105,14 +100,12 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%dir %{_sysconfdir}/xdg/autostart/
 %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/xfce4-session-4.6
 
@@ -124,6 +117,16 @@ touch --no-create %{_datadir}/icons/hico
 %{_libexecdir}/balou-*
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Fix German text in logout dialog
+- Fix shadows in 'simple' splash engine
+- Don't ship static lib in -devel package
+- configure with --disable-static instead of removing *.a files
+- Fix directory ownership issue
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
 - Update to 4.6.1
 



From mclasen at fedoraproject.org  Thu Sep 10 00:07:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Sep 2009 00:07:30 +0000 (UTC)
Subject: rpms/control-center/devel shell-common-tasks.patch, NONE,
	1.1 control-center.spec, 1.484,
	1.485 0001-Port-about-me-to-PolicyKit-1.0.patch, 1.1,
	NONE 0001-Remove-old-code-poking-directly-into-the-pwent.patch,
	1.1, NONE default-apps-custom.patch, 1.1,
	NONE display-capplet-mnemonics.patch, 1.1,
	NONE display-no-help.patch, 1.2, NONE font-viewer-icon.patch,
	1.1, NONE gcc-new-fingerprint-icons.patch, 1.1,
	NONE gnome-control-center-2.26.0-support-touchpads.patch, 1.2,
	NONE gnomekbd.patch, 1.1, NONE rotate.patch, 1.1,
	NONE unique-ids.patch, 1.1, NONE
Message-ID: <20090910000731.630BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32385

Modified Files:
	control-center.spec 
Added Files:
	shell-common-tasks.patch 
Removed Files:
	0001-Port-about-me-to-PolicyKit-1.0.patch 
	0001-Remove-old-code-poking-directly-into-the-pwent.patch 
	default-apps-custom.patch display-capplet-mnemonics.patch 
	display-no-help.patch font-viewer-icon.patch 
	gcc-new-fingerprint-icons.patch 
	gnome-control-center-2.26.0-support-touchpads.patch 
	gnomekbd.patch rotate.patch unique-ids.patch 
Log Message:
fix the control-center shell a bit


shell-common-tasks.patch:
 control-center.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE shell-common-tasks.patch ---
diff -up gnome-control-center-2.27.91/shell/control-center.schemas.in.common-tasks gnome-control-center-2.27.91/shell/control-center.schemas.in
--- gnome-control-center-2.27.91/shell/control-center.schemas.in.common-tasks	2009-09-09 20:01:18.076653434 -0400
+++ gnome-control-center-2.27.91/shell/control-center.schemas.in	2009-09-09 20:02:12.237908583 -0400
@@ -7,7 +7,7 @@
 			<type>list</type>
 			<list_type>string</list_type>
 			<locale name="C">
-				<default><!-- Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a "," -->[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-applications.desktop,Add Printer;gnome-cups-manager.desktop]</default>
+				<default><!-- Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a "," -->[Change Theme;gnome-appearance-properties.desktop,Set Preferred Applications;gnome-default-applications.desktop,Add Printer;system-config-printer.desktop]</default>
 				<short>Task names and associated .desktop files</short>
 				<long>The task name to be displayed in the control-center followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</long>
 			</locale>


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -p -r1.484 -r1.485
--- control-center.spec	7 Sep 2009 13:02:27 -0000	1.484
+++ control-center.spec	10 Sep 2009 00:07:26 -0000	1.485
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -65,6 +65,9 @@ Patch96: gnome-control-center-2.25.2-gec
 # change default preferred apps to programs we ship
 Patch99: default-applications.patch
 
+# update the shell common tasks to desktop files we ship
+Patch100: shell-common-tasks.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 
@@ -197,6 +200,7 @@ for the GNOME desktop.
 %patch95 -p1 -b .passwd
 #%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
+%patch100 -p1 -b .common-tasks
 
 %patch7 -p1 -b .make-default
 


--- 0001-Port-about-me-to-PolicyKit-1.0.patch DELETED ---


--- 0001-Remove-old-code-poking-directly-into-the-pwent.patch DELETED ---


--- default-apps-custom.patch DELETED ---


--- display-capplet-mnemonics.patch DELETED ---


--- display-no-help.patch DELETED ---


--- font-viewer-icon.patch DELETED ---


--- gcc-new-fingerprint-icons.patch DELETED ---


--- gnome-control-center-2.26.0-support-touchpads.patch DELETED ---


--- gnomekbd.patch DELETED ---


--- rotate.patch DELETED ---


--- unique-ids.patch DELETED ---



From dcantrel at fedoraproject.org  Thu Sep 10 00:26:42 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 10 Sep 2009 00:26:42 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.664, 1.665 anaconda.spec, 1.814, 
	1.815 sources, 1.798, 1.799
Message-ID: <20090910002642.E462B11C00CE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4718

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep 09 2009 David Cantrell <dcantrell at redhat.com> - 12.22-1
- No longer require xfsdump, since anaconda doesn't use it anywhere
  (#522180). (clumens)
- The zonetab module has moved (#521986). (clumens)
- No longer copy over the CD/DVD repodata or repo config file (#521358).
  (clumens)
- language dracut kernel cmdline should be space seperated (#521113)
  (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -p -r1.664 -r1.665
--- .cvsignore	8 Sep 2009 04:17:58 -0000	1.664
+++ .cvsignore	10 Sep 2009 00:26:41 -0000	1.665
@@ -1 +1 @@
-anaconda-12.21.tar.bz2
+anaconda-12.22.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -p -r1.814 -r1.815
--- anaconda.spec	8 Sep 2009 04:17:58 -0000	1.814
+++ anaconda.spec	10 Sep 2009 00:26:41 -0000	1.815
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.21
+Version: 12.22
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -214,6 +214,15 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Sep 09 2009 David Cantrell <dcantrell at redhat.com> - 12.22-1
+- No longer require xfsdump, since anaconda doesn't use it anywhere
+  (#522180). (clumens)
+- The zonetab module has moved (#521986). (clumens)
+- No longer copy over the CD/DVD repodata or repo config file (#521358).
+  (clumens)
+- language dracut kernel cmdline should be space seperated (#521113)
+  (hdegoede)
+
 * Mon Sep 07 2009 David Cantrell <dcantrell at redhat.com> - 12.21-1
 - Require python-meh (#521661) (dcantrell)
 - Handle UnknownSwapError when turning on existing swap volumes. (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -p -r1.798 -r1.799
--- sources	8 Sep 2009 04:17:58 -0000	1.798
+++ sources	10 Sep 2009 00:26:42 -0000	1.799
@@ -1 +1 @@
-7820416851e1cdc9cddbcbccc3735a73  anaconda-12.21.tar.bz2
+c28fce23b6106477031c8f6afd6562c1  anaconda-12.22.tar.bz2



From cebbert at fedoraproject.org  Thu Sep 10 00:43:50 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 10 Sep 2009 00:43:50 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.31.tar.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1125, 1.1126 kernel.spec, 1.1786, 1.1787 sources, 1.1083,
	1.1084 upstream, 1.997, 1.998 linux-2.6.30.tar.bz2.sign, 1.1,
	NONE patch-2.6.31-rc9-git2.bz2.sign, 1.1,
	NONE patch-2.6.31-rc9.bz2.sign, 1.1, NONE
Message-ID: <20090910004350.2BE7A11C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10413

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	linux-2.6.31.tar.bz2.sign 
Removed Files:
	linux-2.6.30.tar.bz2.sign patch-2.6.31-rc9-git2.bz2.sign 
	patch-2.6.31-rc9.bz2.sign 
Log Message:
Linux 2.6.31


--- NEW FILE linux-2.6.31.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKqC7vyGugalF9Dw4RAldvAJwMreaHtICM+aRVeTOvxGkRdNNndACbBWCz
bLUy6e5yBTf6QYYnvkzVr5M=
=/QSU
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1125
retrieving revision 1.1126
diff -u -p -r1.1125 -r1.1126
--- .cvsignore	9 Sep 2009 03:27:29 -0000	1.1125
+++ .cvsignore	10 Sep 2009 00:43:48 -0000	1.1126
@@ -3,7 +3,5 @@ clog
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.30
-linux-2.6.30.tar.bz2
-patch-2.6.31-rc9.bz2
-patch-2.6.31-rc9-git2.bz2
+kernel-2.6.31
+linux-2.6.31.tar.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1786
retrieving revision 1.1787
diff -u -p -r1.1786 -r1.1787
--- kernel.spec	9 Sep 2009 21:15:12 -0000	1.1786
+++ kernel.spec	10 Sep 2009 00:43:49 -0000	1.1787
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
+%global released_kernel 1
 
 # Versions of various parts
 
@@ -27,14 +27,14 @@ Summary: The Linux kernel
 # 1.1205.1.1.  In this case we drop the initial 1, subtract fedora_cvs_origin
 # from the second number, and then append the rest of the RCS string as is.
 # Don't stare at the awk too long, you'll go blind.
-%define fedora_cvs_origin   1563
+%define fedora_cvs_origin   1786
 %define fedora_cvs_revision() %2
 %global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 30
+%define base_sublevel 31
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -2006,6 +2006,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-1
+- Linux 2.6.31
+
 * Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>
 - Enable VXpocket and PDaudioCF PCMCIA sound drivers.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1083
retrieving revision 1.1084
diff -u -p -r1.1083 -r1.1084
--- sources	9 Sep 2009 03:27:29 -0000	1.1083
+++ sources	10 Sep 2009 00:43:49 -0000	1.1084
@@ -1,3 +1 @@
-7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-6bb612cbd006be9bdfaa6ff29ce090ea  patch-2.6.31-rc9.bz2
-157f889cd37ef9daec64cd65d8e64b3d  patch-2.6.31-rc9-git2.bz2
+84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.997
retrieving revision 1.998
diff -u -p -r1.997 -r1.998
--- upstream	9 Sep 2009 03:27:29 -0000	1.997
+++ upstream	10 Sep 2009 00:43:49 -0000	1.998
@@ -1,3 +1 @@
-linux-2.6.30.tar.bz2
-patch-2.6.31-rc9.bz2
-patch-2.6.31-rc9-git2.bz2
+linux-2.6.31.tar.bz2


--- linux-2.6.30.tar.bz2.sign DELETED ---


--- patch-2.6.31-rc9-git2.bz2.sign DELETED ---


--- patch-2.6.31-rc9.bz2.sign DELETED ---



From transif at fedoraproject.org  Thu Sep 10 00:57:25 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 10 Sep 2009 00:57:25 +0000 (UTC)
Subject: comps/po ru.po,1.25,1.26
Message-ID: <20090910005725.4E1E611C00CE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18167/po

Modified Files:
	ru.po 
Log Message:
Sending translation for Russian


Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ru.po	31 Aug 2009 00:44:43 -0000	1.25
+++ ru.po	10 Sep 2009 00:57:24 -0000	1.26
@@ -1,4 +1,3 @@
-# translation of ru.po to Russian
 # translation of ru.po to
 # translation of comps.HEAD.ru.po to
 # This file is distributed under the same license as the comps package.
@@ -17,10 +16,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 19:35+0000\n"
-"PO-Revision-Date: 2009-08-31 10:43+1000\n"
-"Last-Translator: Yulia Poyarkova <yulia.poyarkova at gmail.com>\n"
-"Language-Team: Russian <fedora-trans-ru at redhat.com>\n"
+"POT-Creation-Date: 2009-09-09 19:36+0000\n"
+"PO-Revision-Date: 2009-09-10 10:56+1000\n"
+"Last-Translator: Yulia Poyarkova <yulia.poyarkova at redhat.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1544,14 +1543,17 @@ msgstr "????????? ????????? ?????"
 msgid ""
 "A set of packages that provide the Critical Path functionality for the GNOME "
 "desktop"
-msgstr "????? ???????, ??????????????? ???????????????? Critical Path ??? ??????????? ????? GNOME"
+msgstr ""
+"????? ???????, ??????????????? ???????????????? Critical Path ??? "
+"??????????? ????? GNOME"
 
 #: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
-#, fuzzy
 msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
-msgstr "????? ???????, ??????????????? ????? ????????? ??? ???????????????? Critical Path ??? ???? ????????? Fedora"
+msgstr ""
+"????? ???????, ??????????????? ????? ????????? ??? ???????????????? Critical "
+"Path ??? ???? ?????? Fedora"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1581,10 +1583,12 @@ msgstr "Haskell"
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ???????????? ????? ??????????? ??????? ??????????? ????? X11, ??????? ?????????? ???????? ??? ??????????? ? ?????? ????????????? ????????????: ?????????, ????????? ????????? ? ?????? ???????????."
+msgstr ""
+"LXDE ???????????? ????? ??????????? ??????? ??????????? ????? X11, ??????? "
+"?????????? ???????? ??? ??????????? ? ?????? ????????????? ????????????: "
+"?????????, ????????? ????????? ? ?????? ???????????."
 
 #: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
-#, fuzzy
 msgid "Machine and user identity servers."
 msgstr "??????? ????????????? ??????????? ? ?????????????"
 
@@ -1594,7 +1598,9 @@ msgstr "??????????? ????? Moblin"
 
 #: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
-msgstr "Moblin ???????????? ????? ????????? ???????? ????? ??? ????????? NetBook/NetTop/MID."
+msgstr ""
+"Moblin ???????????? ????? ????????? ???????? ????? ??? ????????? NetBook/"
+"NetTop/MID."
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From airlied at fedoraproject.org  Thu Sep 10 01:05:41 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 10 Sep 2009 01:05:41 +0000 (UTC)
Subject: rpms/xorg-x11-drv-geode/devel .cvsignore, 1.6, 1.7 sources, 1.9,
	1.10 xorg-x11-drv-geode.spec, 1.14, 1.15 abi.patch, 1.1,
	NONE geode-dpms-rac-api.patch, 1.1, NONE
Message-ID: <20090910010541.D0BE811C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-geode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23505

Modified Files:
	.cvsignore sources xorg-x11-drv-geode.spec 
Removed Files:
	abi.patch geode-dpms-rac-api.patch 
Log Message:
* Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 2.11.4.1-1
- geode 2.11.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Aug 2009 00:53:52 -0000	1.6
+++ .cvsignore	10 Sep 2009 01:05:40 -0000	1.7
@@ -1 +1 @@
-xf86-video-geode-2.11.3.tar.bz2
+xf86-video-geode-2.11.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Aug 2009 00:53:52 -0000	1.9
+++ sources	10 Sep 2009 01:05:41 -0000	1.10
@@ -1 +1 @@
-de1d3fe56ae50168d56ea727c4455f2d  xf86-video-geode-2.11.3.tar.bz2
+05f85d897ef41d13de354ac0252bf923  xf86-video-geode-2.11.4.1.tar.bz2


Index: xorg-x11-drv-geode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/xorg-x11-drv-geode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xorg-x11-drv-geode.spec	5 Aug 2009 00:53:52 -0000	1.14
+++ xorg-x11-drv-geode.spec	10 Sep 2009 01:05:41 -0000	1.15
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-geode
-Version:   2.11.3
+Version:   2.11.4.1
 Release:   1%{?dist}
 URL:       http://www.x.org/wiki/AMDGeodeDriver
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
@@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Provides:  xorg-x11-drv-amd = %{version}-%{release}
 Obsoletes: xorg-x11-drv-amd <= 2.7.7.7
 
-Patch0: geode-dpms-rac-api.patch
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -33,7 +32,6 @@ X.Org X11 AMD Geode video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
 
 %build
 autoreconf -v --install
@@ -63,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 2.11.4.1-1
+- geode 2.11.4.1
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.11.3-1
 - geode 2.11.3 
 - add abi/api patches + autoreconf


--- abi.patch DELETED ---


--- geode-dpms-rac-api.patch DELETED ---



From dcantrel at fedoraproject.org  Thu Sep 10 01:09:15 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 10 Sep 2009 01:09:15 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.665, 1.666 anaconda.spec, 1.815, 
	1.816 sources, 1.799, 1.800
Message-ID: <20090910010915.1253B11C00CE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26029

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep 09 2009 David Cantrell <dcantrell at redhat.com> - 12.23-1
- initrd-generic.img -> initramfs.img (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -p -r1.665 -r1.666
--- .cvsignore	10 Sep 2009 00:26:41 -0000	1.665
+++ .cvsignore	10 Sep 2009 01:09:14 -0000	1.666
@@ -1 +1 @@
-anaconda-12.22.tar.bz2
+anaconda-12.23.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -p -r1.815 -r1.816
--- anaconda.spec	10 Sep 2009 00:26:41 -0000	1.815
+++ anaconda.spec	10 Sep 2009 01:09:14 -0000	1.816
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.22
+Version: 12.23
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -214,6 +214,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Sep 09 2009 David Cantrell <dcantrell at redhat.com> - 12.23-1
+- initrd-generic.img -> initramfs.img (hdegoede)
+
 * Wed Sep 09 2009 David Cantrell <dcantrell at redhat.com> - 12.22-1
 - No longer require xfsdump, since anaconda doesn't use it anywhere
   (#522180). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -p -r1.799 -r1.800
--- sources	10 Sep 2009 00:26:42 -0000	1.799
+++ sources	10 Sep 2009 01:09:14 -0000	1.800
@@ -1 +1 @@
-c28fce23b6106477031c8f6afd6562c1  anaconda-12.22.tar.bz2
+ec5552061550e3084ee1aca40fd1cfa7  anaconda-12.23.tar.bz2



From lennart at fedoraproject.org  Thu Sep 10 01:15:19 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 10 Sep 2009 01:15:19 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.41, 1.42 pulseaudio.spec, 1.98, 
	1.99 sources, 1.45, 1.46
Message-ID: <20090910011519.B0CC711C00CE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29557

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
Final release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	2 Sep 2009 23:24:18 -0000	1.41
+++ .cvsignore	10 Sep 2009 01:15:19 -0000	1.42
@@ -1 +1 @@
-pulseaudio-0.9.16-test7.tar.gz
+pulseaudio-0.9.16.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- pulseaudio.spec	2 Sep 2009 23:53:01 -0000	1.98
+++ pulseaudio.spec	10 Sep 2009 01:15:19 -0000	1.99
@@ -1,10 +1,10 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        13.test7%{?dist}
+Release:        14%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
-Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
 Source1:        default.pa-for-gdm
 URL:            http://pulseaudio.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -198,7 +198,7 @@ Requires(pre):  gdm
 This package contains GDM integration hooks for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.16-test7
+%setup -q -T -b0
 
 %build
 %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access --disable-hal
@@ -434,6 +434,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-14
+- Final release
+
 * Thu Sep 3 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-13.test7
 - Fix build for ppc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	2 Sep 2009 23:53:01 -0000	1.45
+++ sources	10 Sep 2009 01:15:19 -0000	1.46
@@ -1 +1 @@
-56080993180c89d7f2e3c3358cc09b90  pulseaudio-0.9.16-test7.tar.gz
+ed640790249af56b5f022ad37588fa97  pulseaudio-0.9.16.tar.gz



From airlied at fedoraproject.org  Thu Sep 10 01:57:38 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 10 Sep 2009 01:57:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel r600-enable-mixed.patch, NONE,
	1.1 r600-fix-exa-crash.patch, NONE, 1.1 xorg-x11-drv-ati.spec,
	1.185, 1.186
Message-ID: <20090910015738.0EA1411C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10812

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	r600-enable-mixed.patch r600-fix-exa-crash.patch 
Log Message:
* Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.4.20090908git651fe5a47
- fix EXA server crasher + use mixed pixmaps for speed ups


r600-enable-mixed.patch:
 r600_exa.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE r600-enable-mixed.patch ---
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 86da68c..4e42509 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2330,9 +2330,9 @@ R600DrawInit(ScreenPtr pScreen)
 #ifdef EXA_HANDLES_PIXMAPS
     if (info->cs) {
 	info->accel_state->exa->flags |= EXA_HANDLES_PIXMAPS;
-//#ifdef EXA_MIXED_PIXMAPS
-//	info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS;
-//#endif
+#ifdef EXA_MIXED_PIXMAPS
+	info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS;
+#endif
     }
 #endif
 #endif

r600-fix-exa-crash.patch:
 r6xx_accel.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE r600-fix-exa-crash.patch ---
>From 0bb0ff0e55aaf8e64017d204e376a14f0a7384a3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Thu, 10 Sep 2009 11:48:00 +1000
Subject: [PATCH] r6xx: fix EXA crash with gtkperf -a

unmapping was getting unbalanced.
---
 src/r6xx_accel.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index 985595e..3202d51 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -48,7 +48,7 @@ void r600_cs_flush_indirect(ScrnInfoPtr pScrn)
     if (!info->cs->cdw)
 	return;
 
-    if (info->accel_state->vb_bo) {
+    if (info->accel_state->vb_ptr) {
 	radeon_bo_unmap(info->accel_state->vb_bo);
 	info->accel_state->vb_ptr = NULL;
     }
@@ -106,9 +106,10 @@ void R600IBDiscard(ScrnInfoPtr pScrn, drmBufPtr ib)
     int ret;
     RADEONInfoPtr info = RADEONPTR(pScrn);
     if (info->cs) {
-	if (info->accel_state->vb_bo)
+	if (info->accel_state->vb_ptr) {
 	    radeon_bo_unmap(info->accel_state->vb_bo);
-	info->accel_state->vb_bo = NULL;
+	    info->accel_state->vb_ptr = NULL;
+        }
 	if (CS_FULL(info->cs)) {
 	    r600_cs_flush_indirect(pScrn);
 	    return;
-- 
1.6.4.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- xorg-x11-drv-ati.spec	8 Sep 2009 03:38:52 -0000	1.185
+++ xorg-x11-drv-ati.spec	10 Sep 2009 01:57:37 -0000	1.186
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.3.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.4.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,6 +21,8 @@ Source1:    mkxinf
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
+Patch14:    r600-enable-mixed.patch
+Patch15:    r600-fix-exa-crash.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +49,8 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
+%patch14 -p1 -b .mix
+%patch15 -p1 -b .fixexa
 
 %build
 autoreconf -iv
@@ -80,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.4.20090908git651fe5a47
+- fix EXA server crasher + use mixed pixmaps for speed ups
+
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.3.20090908git651fe5a47
 - New snapshot with r600 kms support
 



From lennart at fedoraproject.org  Thu Sep 10 01:58:47 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 10 Sep 2009 01:58:47 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec,1.17,1.18 sources,1.7,1.8
Message-ID: <20090910015847.50E4411C00CE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11212

Modified Files:
	paprefs.spec sources 
Log Message:
0.9.9 release


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- paprefs.spec	25 Aug 2009 00:39:31 -0000	1.17
+++ paprefs.spec	10 Sep 2009 01:58:47 -0000	1.18
@@ -1,11 +1,11 @@
 Name:           paprefs
 Version:        0.9.9
-Release:        1.git20090825%{?dist}
+Release:        2%{?dist}
 Summary:        Management tool for PulseAudio
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/paprefs
-Source0:        http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.git20090825.tar.gz
+Source0:        http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       pulseaudio-module-gconf
 Requires:	gnome-packagekit
@@ -22,7 +22,7 @@ PulseAudio Preferences (paprefs) is a si
 for the PulseAudio sound server.
 
 %prep
-%setup -q -n paprefs-0.9.9
+%setup -q
 
 %build
 %configure
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-2
+- Final 0.9.9 release
+
 * Tue Aug 25 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-1.git20090825
 - Add dbus-glib to deps
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Aug 2009 00:30:12 -0000	1.7
+++ sources	10 Sep 2009 01:58:47 -0000	1.8
@@ -1 +1 @@
-9b713eebbb930c2d959ea4114c334390  paprefs-0.9.9.git20090825.tar.gz
+0592ccb28c8f601a8fe3607b64e9f5bc  paprefs-0.9.9.tar.gz



From cwickert at fedoraproject.org  Thu Sep 10 02:10:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 02:10:24 +0000 (UTC)
Subject: rpms/xfce4-settings/devel
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch, NONE,
	1.1 xfce4-settings-4.6.1-fix-timeout-startup.patch, NONE,
	1.1 xfce4-settings.spec, 1.15, 1.16
Message-ID: <20090910021024.A4C3611C043D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13678

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch 
	xfce4-settings-4.6.1-fix-timeout-startup.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Fix xfconf channel for keyboard repeat rate setting
- Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)
- Make sure xfce4-settings-helper only gets started in Xfce
- Fix directory ownership issue


xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch:
 xfce-keyboard-settings.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch ---
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index d372ee9..d1cb69c 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -322,7 +322,7 @@ xfce_keyboard_settings_constructed (GObject *object)
   xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Rate", G_TYPE_INT, G_OBJECT (xkb_key_repeat_rate_scale), "value");
 
   xkb_key_repeat_delay_scale = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (settings->priv->glade_xml, "xkb_key_repeat_delay_scale")));
-  xfconf_g_property_bind (settings->priv->keyboards_channel, "/DefaultKeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
+  xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
 
   /* XSETTINGS */
   net_cursor_blink_check = glade_xml_get_widget (settings->priv->glade_xml, "net_cursor_blink_check");

xfce4-settings-4.6.1-fix-timeout-startup.patch:
 main.c |  101 +++++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 31 deletions(-)

--- NEW FILE xfce4-settings-4.6.1-fix-timeout-startup.patch ---
commit fa550da4a52172b4074922a2962c44613e96e3f0
Author: kelnos <kelnos at a0aa69c2-05f4-0310-b83c-d5d913b14636>
Date:   Thu Jun 4 09:19:51 2009 +0000

    avoid timing out xfce4-session on startup (bug 5040)
    
    xfce4-settings-helper was trying to be clever to migrate itself from
    autostart to the actual session.  it was doing a poor job.  this should
    keep the cleverness, but make sure it always connects to the session
    manager and makes sure the SM can continue.  it also allows the copy of
    x-s-h that was started via the session (and not autostart) to force
    itself to start, even if it's already running.  the other instance will
    lose its hold on the selection, notice, and quit.
    
    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636

diff --git a/xfce4-settings-helper/main.c b/xfce4-settings-helper/main.c
index c0e7712..1553c58 100644
--- a/xfce4-settings-helper/main.c
+++ b/xfce4-settings-helper/main.c
@@ -60,7 +60,14 @@
 #include "displays.h"
 #endif
 
+#define SELECTION_NAME  "_XFCE_SETTINGS_HELPER"
 
+static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+                                                               GdkEvent *evt,
+                                                               gpointer user_data);
+
+
+static SessionClient *sm_client = NULL;
 
 static gboolean opt_version = FALSE;
 static gboolean opt_debug = FALSE;
@@ -124,15 +131,14 @@ xfce_settings_helper_set_autostart_enabled (gboolean enabled)
 }
 
 
-/* returns TRUE if we're now connected to the SM, FALSE otherwise */
+/* returns TRUE if we got started by the SM and our client ID was
+ * valid, FALSE otherwise */
 static gboolean
 xfce_settings_helper_connect_session (int argc,
                                       char **argv,
                                       const gchar *sm_client_id,
                                       gboolean debug_mode)
 {
-    SessionClient *sm_client;
-
     /* we can't be sure that the SM will save the session later, so we only
      * disable the autostart item if we're launching because we got *resumed*
      * from a previous session. */
@@ -148,69 +154,96 @@ xfce_settings_helper_connect_session (int argc,
     {
         g_warning ("Failed to connect to session manager");
         client_session_free (sm_client);
-        xfce_settings_helper_set_autostart_enabled (TRUE);
+        sm_client = NULL;
         return FALSE;
     }
 
     if (sm_client_id && !g_ascii_strcasecmp (sm_client_id, sm_client->given_client_id))
     {
         /* we passed a client id, and got the same one back, which means
-         * we were definitely restarted as a part of the session.  so
-         * it's safe to disable the autostart item. */
-        xfce_settings_helper_set_autostart_enabled (FALSE);
+         * we were definitely restarted as a part of the session. */
         return TRUE;
     }
 
-    /* otherwise, let's just ensure the autostart item is enabled. */
-    xfce_settings_helper_set_autostart_enabled (TRUE);
-
-    return TRUE;
+    return FALSE;
 }
 
 
+#ifdef GDK_WINDOWING_X11
+static GdkFilterReturn
+xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+                                        GdkEvent *evt,
+                                        gpointer user_data)
+{
+    Window xwin = GPOINTER_TO_UINT(user_data);
+    XEvent *xe = (XEvent *)xevt;
+
+    if (xe->type == SelectionClear && xe->xclient.window == xwin)
+    {
+        if (sm_client)
+            client_session_set_restart_style (sm_client, SESSION_RESTART_IF_RUNNING);
+        signal_handler (SIGINT, NULL);
+    }
+
+    return GDK_FILTER_CONTINUE;
+}
+#endif
+
 static gboolean
-xfce_settings_helper_acquire_selection ()
+xfce_settings_helper_acquire_selection (gboolean force)
 {
 #ifdef GDK_WINDOWING_X11
     GdkDisplay *gdpy = gdk_display_get_default ();
+    GtkWidget *invisible;
     Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
     GdkWindow *rootwin = gdk_screen_get_root_window (gdk_display_get_screen (gdpy, 0));
     Window xroot = GDK_WINDOW_XID (rootwin);
-    Window xwin;
-    Atom selection_atom, manager_atom;
+    GdkAtom selection_atom;
+    Atom selection_atom_x11;
     XClientMessageEvent xev;
 
-    xwin = XCreateSimpleWindow (dpy, xroot, -100, -100, 1, 1, 0, 0,
-                                XBlackPixel (GDK_DISPLAY (), 0));
-    XSelectInput (dpy, xwin, PropertyChangeMask | StructureNotifyMask);
+    selection_atom = gdk_atom_intern (SELECTION_NAME, FALSE);
+    selection_atom_x11 = gdk_x11_atom_to_xatom_for_display (gdpy, selection_atom);
+
+    /* can't use gdk for the selection owner here because it returns NULL
+     * if the selection owner is in another process */
+    if (!force && XGetSelectionOwner (dpy, selection_atom_x11) != None)
+        return FALSE;
 
-    selection_atom = XInternAtom (dpy, "_XFCE_SETTINGS_HELPER", False);
-    manager_atom = XInternAtom (dpy, "MANAGER", False);
+    invisible = gtk_invisible_new ();
+    gtk_widget_realize (invisible);
+    gtk_widget_add_events (invisible, GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK);
 
-    if (XGetSelectionOwner (dpy, selection_atom) != None)
+    if (!gdk_selection_owner_set_for_display (gdpy, invisible->window,
+                                              selection_atom, GDK_CURRENT_TIME,
+                                              TRUE))
     {
-        XDestroyWindow (dpy, xwin);
+        g_critical ("Unable to get selection " SELECTION_NAME);
+        gtk_widget_destroy (invisible);
         return FALSE;
     }
 
-    XSetSelectionOwner (dpy, selection_atom, xwin, CurrentTime);
-
-    if (XGetSelectionOwner (dpy, selection_atom) != xwin)
+    /* but we can use gdk here since we only care if it's our window */
+    if (gdk_selection_owner_get_for_display (gdpy, selection_atom) != invisible->window)
     {
-        XDestroyWindow (dpy, xwin);
+        gtk_widget_destroy (invisible);
         return FALSE;
     }
 
     xev.type = ClientMessage;
     xev.window = xroot;
-    xev.message_type = manager_atom;
+    xev.message_type = gdk_x11_get_xatom_by_name_for_display (gdpy, "MANAGER");
     xev.format = 32;
     xev.data.l[0] = CurrentTime;
-    xev.data.l[1] = selection_atom;
-    xev.data.l[2] = xwin;
+    xev.data.l[1] = selection_atom_x11;
+    xev.data.l[2] = GDK_WINDOW_XID (invisible->window);
     xev.data.l[3] = xev.data.l[4] = 0;
 
     XSendEvent (dpy, xroot, False, StructureNotifyMask, (XEvent *)&xev);
+
+    gdk_window_add_filter (invisible->window,
+                           xfce_settings_helper_selection_watcher,
+                           GUINT_TO_POINTER (GDK_WINDOW_XID (invisible->window)));
 #endif
 
     return TRUE;
@@ -221,6 +254,7 @@ gint
 main (gint argc, gchar **argv)
 {
     GError     *error = NULL;
+    gboolean    in_session;
     GObject    *pointer_helper;
     GObject    *keyboards_helper;
     GObject    *accessibility_helper;
@@ -284,12 +318,19 @@ main (gint argc, gchar **argv)
         return EXIT_FAILURE;
     }
 
-    if (!xfce_settings_helper_acquire_selection ())
+    /* connect to session always, even if we quit below.  this way the
+     * session manager won't wait for us to time out. */
+    in_session = xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
+
+    if (!xfce_settings_helper_acquire_selection (in_session))
     {
         g_printerr ("%s is already running\n", G_LOG_DOMAIN);
         return EXIT_FAILURE;
     }
 
+    /* if we were restarted as part of the session, remove us from autostart */
+    xfce_settings_helper_set_autostart_enabled (!in_session);
+
     /* daemonize the process when not running in debug mode */
     if (!opt_debug)
     {
@@ -308,8 +349,6 @@ main (gint argc, gchar **argv)
         }
     }
 
-    xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
-
     /* create the sub daemons */
     pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL);
     keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL);


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xfce4-settings.spec	27 Jul 2009 07:56:04 -0000	1.15
+++ xfce4-settings.spec	10 Sep 2009 02:10:24 -0000	1.16
@@ -8,7 +8,12 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
+# mew libxklavier 4 API in Fedora 12
 Patch1:         xfce4-settings-4.6.1-xkl.patch
+# http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
+Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
+# Fix typo in xfce-keyboard-settings
+Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,8 +43,12 @@ This package includes the settings manag
 
 %prep
 %setup -q
-%patch10 -p1 -b .vendor
+%if 0%{?fedora} >= 12
 %patch1 -p1 -b .xkl
+%endif
+%patch2 -p1 -b .timeout
+%patch3 -p1 -b .keyrepeat
+%patch10 -p1 -b .vendor
 
 %build
 %configure --enable-sound-settings
@@ -50,41 +59,48 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-display-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-keyboard-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-mouse-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-ui-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-accessibility-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
+desktop-file-install                                            \
+        --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/    \
+        --delete-original                                       \
+        --add-only-show-in=XFCE                                 \
+        --remove-key=Terminal                                   \
+        ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
+
 %find_lang %{name}
 
 %clean
@@ -95,9 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS TODO COPYING
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
-%dir %{_sysconfdir}/xdg/xfce4
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 %{_bindir}/xfce4-accessibility-settings
 %{_bindir}/xfce4-appearance-settings
@@ -111,6 +124,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Fix xfconf channel for keyboard repeat rate setting
+- Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)
+- Make sure xfce4-settings-helper only gets started in Xfce
+- Fix directory ownership issue
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Thu Sep 10 02:18:06 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 02:18:06 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings.spec,1.16,1.17
Message-ID: <20090910021806.6F1DE11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14889

Modified Files:
	xfce4-settings.spec 
Log Message:
fix release


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xfce4-settings.spec	10 Sep 2009 02:10:24 -0000	1.16
+++ xfce4-settings.spec	10 Sep 2009 02:18:06 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops



From lennart at fedoraproject.org  Thu Sep 10 02:25:18 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 10 Sep 2009 02:25:18 +0000 (UTC)
Subject: rpms/pavucontrol/devel .cvsignore, 1.13, 1.14 pavucontrol.spec, 1.20,
	1.21 sources, 1.13, 1.14
Message-ID: <20090910022518.5860011C00CE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17313

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
final 0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Jul 2009 01:13:56 -0000	1.13
+++ .cvsignore	10 Sep 2009 02:25:18 -0000	1.14
@@ -1 +1 @@
-pavucontrol-0.9.9-test1.tar.gz
+pavucontrol-0.9.9.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pavucontrol.spec	25 Jul 2009 23:18:46 -0000	1.20
+++ pavucontrol.spec	10 Sep 2009 02:25:18 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           pavucontrol
 Version:        0.9.9
-Release:        0.test1%{?dist}.1
+Release:        1%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}-test1.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pulseaudio-libs-devel >= 0.9.15-3.test4
@@ -24,7 +24,7 @@ tools this one allows you to control bot
 of each playback stream separately.
 
 %prep
-%setup -q -n pavucontrol-0.9.9-test1
+%setup -q
 
 %build
 %configure
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/pavucontrol.desktop
 
 %changelog
+* Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-1
+- Final 0.9.9
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-0.test1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Jul 2009 01:13:56 -0000	1.13
+++ sources	10 Sep 2009 02:25:18 -0000	1.14
@@ -1 +1 @@
-5b4b00eaafa264e91d54a946aa27677b  pavucontrol-0.9.9-test1.tar.gz
+df7c2dd3dc938ccda68868c61f4be462  pavucontrol-0.9.9.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:31:49 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:31:49 +0000 (UTC)
Subject: rpms/voms/devel import.log, NONE, 1.1 voms-distribution-globus.patch,
	NONE, 1.1 voms-extra-vomses-java.patch, NONE,
	1.1 voms-fix-enable-glite.patch, NONE, 1.1 voms-gcj.patch, NONE,
	1.1 voms-initscript.patch, NONE, 1.1 voms-install-db.patch, NONE,
	1.1 voms-jar-perms.patch, NONE, 1.1 voms-java-clone-cast.patch,
	NONE, 1.1 voms-javadoc.patch, NONE, 1.1 voms-nolib64.patch, NONE,
	1.1 voms-notknown-msg.patch, NONE, 1.1 voms-openssl.patch, NONE,
	1.1 voms-pipe-buf.patch, NONE, 1.1 voms-portability.patch, NONE,
	1.1 voms-shell-syntax.patch, NONE, 1.1 voms.INSTALL, NONE,
	1.1 voms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910023149.925F711C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18333/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-distribution-globus.patch 
	voms-extra-vomses-java.patch voms-fix-enable-glite.patch 
	voms-gcj.patch voms-initscript.patch voms-install-db.patch 
	voms-jar-perms.patch voms-java-clone-cast.patch 
	voms-javadoc.patch voms-nolib64.patch voms-notknown-msg.patch 
	voms-openssl.patch voms-pipe-buf.patch voms-portability.patch 
	voms-shell-syntax.patch voms.INSTALL voms.spec 
Log Message:
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0



--- NEW FILE import.log ---
voms-1_9_11-4_fc11:HEAD:voms-1.9.11-4.fc11.src.rpm:1252549706

voms-distribution-globus.patch:
 acinclude.m4 |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE voms-distribution-globus.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
@@ -66,11 +66,6 @@
 # ---------------------------------------------
 AC_DEFUN([AC_OPENSSL],
 [
-  AC_ARG_WITH(openssl_prefix,
-              [ --with-openssl-prefix=PFX    prefix where OpenSSL (non-globus) is installed. (/usr)],
-              [with_openssl_prefix="$withval"],
-              [with_openssl_prefix=/usr])
-
   AC_ARG_WITH(openssl_libs,
               [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
               [ with_openssl_libs="$withval"],
@@ -80,16 +75,11 @@
      AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
   fi  
 
-  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
-
-  AC_LANG_PUSH(C)
-  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
-  AC_LANG_POP(C) 
+  PKG_CHECK_MODULES(OPENSSL, [openssl], [
+  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+  found=yes], [found=no])
 
   if test "x$found" = "xyes"; then
-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
     AC_SUBST(NO_GLOBUS_FLAGS)
     AC_SUBST(OPENSSL_LIBS)
     AC_MSG_CHECKING([for system OpenSSL version])
@@ -105,11 +95,10 @@
 #include <openssl/opensslv.h>
 OPENSSL_VERSION_TEXT
 HERE
-    openssl_version=`$CPP -I$NO_GLOBUS_FLAGS -o - -P conftest.h`
+    openssl_version=`$CPP $NO_GLOBUS_FLAGS -o - -P conftest.h`
     AC_MSG_RESULT($openssl_version)
     rm -f conftest.h
   fi
-  LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 ])
 
 # AC_GLOBUS checks globus prefix, looks for globus 
@@ -119,6 +108,11 @@
 # -------------------------------------------------------
 AC_DEFUN([AC_GLOBUS],
 [
+    PKG_CHECK_MODULES(GLOBUS_GSS, [globus-gssapi-gsi globus-gss-assist], [
+    GLOBUS_CFLAGS=$GLOBUS_GSS_CFLAGS
+    PKG_CHECK_MODULES(GLOBUS_GSS_API, [openssl])
+    ], [
+
     AC_ARG_WITH(globus_prefix,
 	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
 	[with_globus_prefix="$withval"],
@@ -165,6 +159,8 @@
 
     AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
 
+    ])
+
     if test "x$with_globus_flavor" = "x" ; then
       if test "x$USE_OLDGAA_LIB" = "x"; then
         USE_OLDGAA_LIB="liboldgaa.la"

voms-extra-vomses-java.patch:
 VOMSESFileParser.java |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE voms-extra-vomses-java.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2009-07-01 15:06:24.328378870 +0200
@@ -62,6 +62,12 @@
 
         List list = new ArrayList();
 
+        File defaultLocFile = new File( File.separator + "etc"
+                + File.separator + "vomses" );
+
+        if ( defaultLocFile.exists() )
+            list.add( defaultLocFile );
+
         if ( gliteLoc != null ) {
             File gliteLocFile = new File( gliteLoc + File.separator + "etc"
                     + File.separator + "vomses" );
@@ -97,6 +103,12 @@
         if ( gliteVomses.exists() )
             list.add( gliteVomses );
 
+        File vomsVomses = new File( System.getProperty( "user.home" )
+                + File.separator + ".voms" + File.separator + "vomses" );
+
+        if ( vomsVomses.exists() )
+            list.add( vomsVomses );
+
         vomsesPaths = list;
 
     }

voms-fix-enable-glite.patch:
 acinclude.m4 |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE voms-fix-enable-glite.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-07-01 13:03:05.768376649 +0200
@@ -587,12 +587,18 @@
 [
     AC_ARG_ENABLE(glite,
         [  --enable-glite     enable gLite  ],
-        [ac_enable_glite="yes"],
-        [ac_enable_glite="no"])
+        [
+          case "$enableval" in
+          yes) glite="yes" ;;
+          no) glite="no" ;;
+          *) AC_MSG_ERROR(bad value $(enableval) for --enable-glite) ;;
+          esac
+        ],
+        [glite="yes"])
 
-    AM_CONDITIONAL(ENABLE_GLITE, test x$ac_enable_glite = xyes)
+    AM_CONDITIONAL(ENABLE_GLITE, test x$glite = xyes)
 
-    if test "x$ac_enable_glite" = "xno"; then
+    if test "x$glite" = "xno"; then
     	DISTTAR=$WORKDIR
     	AC_SUBST(DISTTAR)
 #	EDG_SET_RPM_TOPDIR
@@ -601,7 +607,7 @@
     	AC_SUBST(VAR_LOCATION_ENV, "VOMS_LOCATION_VAR")
     	AC_DEFINE(LOCATION_ENV, "VOMS_LOCATION", [Environment variable name])
     	AC_DEFINE_UNQUOTED(LOCATION_DIR, "$prefix", [Location of system directory])
-    	AC_DEFINE(USER_DIR, ".edg", [Location of user directory])
+    	AC_DEFINE(USER_DIR, ".voms", [Location of user directory])
     else
     	AC_MSG_RESULT([Preparing for gLite environment])
     	AC_GLITE

voms-gcj.patch:
 BasicVOMSTrustStore.java |  682 -----------------------------------------------
 DirectoryList.java       |  142 +++++++++
 FileCertReader.java      |  492 +++++++++++++++++++++++++++++++++
 FileEndingIterator.java  |  137 +++++++++
 4 files changed, 771 insertions(+), 682 deletions(-)

--- NEW FILE voms-gcj.patch ---
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-08-29 07:52:08.000000000 +0200
@@ -13,69 +13,11 @@
  * follows.
  *
  *********************************************************************/
-/*
- * Copyright (c) Members of the EGEE Collaboration. 2004.
- * See http://eu-egee.org/partners/ for details on the copyright holders.
- * For license conditions see the license file or http://eu-egee.org/license.html
- */
-
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * DirectoryList.java
- *
- * @author  Joni Hahkala
- * Created on December 10, 2001, 6:50 PM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileEndingIterator.java
- *
- * @author  Joni Hahkala
- * Created on December 3, 2001, 9:16 AM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileCertReader.java
- *
- * @author  Joni Hahkala
- * Created on March 27, 2002, 8:24 PM
- */
 
 package org.glite.voms;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.PrivateKey;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -86,632 +28,8 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ASN1InputStream;
 import org.glite.voms.ac.ACTrustStore;
 
-/** Lists all the files in the given directory that end with
- * a certain ending.
- */
-class FileEndingIterator {
-    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
-
-    /** The file ending.
-     */
-    protected String ending;
-
-    /** A flag to show that there are more files that match.
-     */
-    protected boolean nextFound = false;
-
-    /** The list of files in the directory.
-     */
-    protected File[] fileList;
-
-    /** The index of the next match in the fileList.
-     */
-    protected int index = 0;
-
-    /** Creates new FileIterator and searches the first match.
-     * @param path The directory used for the file search.
-     * @param ending The file ending to search for.
-     */
-    public FileEndingIterator(String path, String ending) {
-        this.ending = ending;
-
-        try {
-            // open the directory
-            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
-
-            // list the files and dirs inside
-            fileList = directory.listFiles();
-
-            // find the first match for the ending
-            nextFound = findNext();
-        } catch (Exception e) {
-            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
-
-            //            e.printStackTrace();
-            return;
-        }
-    }
-
-    /** Used to get the next matching file.
-     * @return Returns the next matching file.
-     */
-    public File next() {
-        if (nextFound == false) {
-            return null;
-        }
-
-        File current = fileList[index++];
-
-        nextFound = findNext();
-
-        return current;
-    }
-
-    /** Used to check that there are more matching files to get
-     * using next().
-     * @return Returns true if there are more matching files.
-     */
-    public boolean hasNext() {
-        return nextFound;
-    }
-
-    /** Finds the next matching file in the list of files.
-     * @return Returns true if a matching file was found.
-     */
-    protected boolean findNext() {
-        try {
-            // search the next file with proper ending
-            while ((index < fileList.length) &&
-                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
-                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
-                index++;
-            }
-        } catch (Exception e) {
-            logger.error("Error while reading directory " + e.getMessage());
-
-            //            e.printStackTrace(System.out);
-            return false;
-        }
-
-        // check if the loop ended because of a match or because running out of choices.
-        if (index < fileList.length) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-/** Reads all certificates from given files, accepts binary form of DER encoded certs and
- * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
- * the actual certificate that has to begin with "-----BEGIN".
- * Should accept multiple certs in one file, not tested!
- */
-class FileCertReader {
-    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
-    static final int BUF_LEN = 1000;
-    static final byte CARR = '\r';
-    static final byte NL = '\n';
-
-    /** The type for TrustAnchor
-     */
-    static final int TYPE_ANCHOR = 100;
-
-    /** The type for certificate revocation list
-     */
-    static final int TYPE_CRL = 101;
-
-    /** the type for X509 certificate
-     */
-    static final int TYPE_CERT = 102;
-
-    static {
-        if (Security.getProvider("BC") == null) {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    CertificateFactory certFactory;
-
-    /** Creates a new instance of CertReader. */
-    public FileCertReader() throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", "BC");
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider.
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(Provider provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(String provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument. See DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if certificate reading from the files
-     * fails.
-     * @return Returns the Vector of certificates read.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCerts(String files) throws IOException, CertificateException {
-        Vector certs = readFiles(files, TYPE_CERT);
-
-        Iterator certIter = certs.iterator();
-
-        logger.debug("read certs: ");
-
-        while (certIter.hasNext()) {
-            X509Certificate cert = (X509Certificate) certIter.next();
-            logger.debug("Read cert: " + cert.getSubjectDN().toString());
-        }
-
-        return certs;
-    }
-
-    public PrivateKey readPrivateKey(String file) throws IOException {
-        File keyfile = new File(file);
-
-        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
-        skipToKeyBeginning(fis);
-
-        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument and makes TrustAnchors from them. See
-     * DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the certificate reading fails.
-     * @return Returns a Vector of TrustAnchors read from the
-     * files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readAnchors(String files) throws IOException, CertificateException {
-        Vector anchors = readFiles(files, TYPE_ANCHOR);
-
-        Iterator anchorIter = anchors.iterator();
-
-        logger.debug("read TrustAnchors: ");
-
-        while (anchorIter.hasNext()) {
-            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
-            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
-        }
-
-        return anchors;
-    }
-
-    /** Reads the certificate revocation lists (CRLs) from the
-     * files defined in the argument. See DirectoryList for
-     * file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the CRL reading failed.
-     * @return Returns a vector of CRLs read from the files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCRLs(String files) throws IOException, CertificateException {
-        Vector crls = readFiles(files, TYPE_CRL);
-
-        Iterator crlIter = crls.iterator();
-
-        logger.debug("read CRLs: ");
-
-        while (crlIter.hasNext()) {
-            X509CRL crl = (X509CRL) crlIter.next();
-            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
-        }
-
-        return crls;
-    }
-
-    /** Reads the certificates or CRLs from the files defined by
-     * the first argument, see DirectoryList for file definition
-     * format.
-     * @param files The file definition.
-     * @param type The type of things to read from the files.
-     * Currently supported are TYPE_ANCHOR,
-     * TYPE_CRL and TYPE_CERT defined in this class.
-     * @throws CertificateException Thrown if the reading of files fails.
-     * @return Returns a Vector of objects of type given that
-     * were read from the files given.
-     * @see org.glite.security.util.DirectoryList
-     */
-    private Vector readFiles(String files, int type) throws CertificateException {
-        Vector storeVector = new Vector();
-
-        try {
-            // load CA certificates
-            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
-
-            Iterator CAFileIter = dir.getListing().iterator();
-
-            // go through the files
-            while (CAFileIter.hasNext()) { // go through the files reading the certificates
-
-                File nextFile = (File) CAFileIter.next();
-
-                storeVector.addAll(readFile(nextFile, type));
-            }
-        } catch (IOException e) {
-            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
-
-            throw new CertificateException("Error while reading certificates or CRLs: " +
-                e.getMessage());
-        }
-
-        return storeVector;
-    }
-
-    /** Reads the objects of given type from the File.
-     * @param certFile The file to read.
-     * @param type The type of objects to read form the file.
-     * @throws IOException Thrown if the reading of objects of given type
-     * fails.
-     * @return Returns the Vector of objects read form the file.
-     */
-    public Vector readFile(File certFile, int type) throws IOException {
-        BufferedInputStream binStream = null;
-        Vector objects = new Vector();
-
-        try {
-            // get the buffered stream to facilitate marking
-            binStream = new BufferedInputStream(new FileInputStream(certFile));
-
-            while (binStream.available() > 0) {
-                Object obj = objectReader(binStream, type);
-
-                if (obj != null) {
-                    objects.add(obj);
-                }
-
-                skipEmptyLines(binStream);
-            }
-        } catch (Exception e) {
-            logger.fatal("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-
-            throw new IOException("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-        } finally {
-            if (binStream != null) {
-                binStream.close();
-            }
-        }
-
-        return objects;
-    }
-
-    /** Reads a certificate or a CRL from the stream, doing some
-     * error correction.
-     * @param binStream The stream to read the object from.
-     * @param type The type of object to read from the stream.
-     * @throws CertificateException Thrown if an error occurs while reading the object.
-     * @throws IOException Thrown if an error occurs while reading the object.
-     * @return Returns the object read.
-     */
-    public Object objectReader(BufferedInputStream binStream, int type)
-        throws CertificateException, IOException {
-        Object object = null;
-        int errors = 0; // no errors in the beginning
-        binStream.mark(10000);
-
-        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
-             // second with skipping possible garbage in the beginning.
-
-            try {
-                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
-                    // before the actual base64 encoded certificate
-                    errors = 2; // if this try fails, don't try anymore
-
-                    skipToCertBeginning(binStream); // skip the garbage
-                }
-
-                binStream.mark(100000);
-
-                binStream.reset();
-
-                object = readObject(binStream, type);
-            } catch (Exception e) {
-                if (errors != 0) { // if the error persists after first pass, fail
-                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
-                    throw new CertificateException("Certificate or CRL reading failed: " +
-                        e.getMessage());
-                }
-
-                errors = 1; // first try failed, try again with skipping
-                binStream.reset(); // rewind the file to the beginning of this try
-            }
-        } while (errors == 1); // try again after first try
-
-        return object;
-    }
-
-    /** Does the actual reading of the object.
-     * @param binStream The stream to read the object from.
-     * @param type The type of the object.
-     * @throws CertificateException Thrown if there is a problem reading the object.
-     * @return Returns the object read or null if no object was found.
-     */
-    public Object readObject(BufferedInputStream binStream, int type)
-        throws CertificateException {
-        Object obj;
-
-        if (type == TYPE_CRL) { // reading certificate revocation lists
-
-            try {
-                obj = certFactory.generateCRL(binStream);
-            } catch (CRLException e) {
-                logger.error("CRL loading failed: " + e.getMessage());
-                throw new CertificateException(e.getMessage());
-            }
-        } else { // reading certs or trust anchors
-
-            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
-
-            if (cert == null) {
-                return null;
-            }
-
-            if (type == TYPE_ANCHOR) {
-                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
-                obj = new TrustAnchor(cert, null);
-            } else {
-                if (type == TYPE_CERT) {
-                    obj = cert;
-                } else {
-                    logger.fatal("Internal error: Invalid data type " + type +
-                        " when trying to read certificate");
-                    throw new CertificateParsingException("Internal error: Invalid data type " +
-                        type + " when trying to read certificate");
-                }
-            }
-        }
-
-        return obj;
-    }
-
-    /** Skips everything in front of "-----BEGIN" in the stream.
-     * @param stream The stream to read and skip.
-     * @throws IOException Thrown if there is a problem skipping.
-     */
-    static public void skipToCertBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    static public void skipToKeyBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1)
-                index = buffer.indexOf("----BEGIN ENCRYPTED");
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    /** Skips empty lines in the stream.
-     * @param stream The stream possibly containing empty lines.
-     * @throws IOException Thrown if a problem occurs.
-     */
-    static public void skipEmptyLines(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-
-            int i = 0;
-
-            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
-                i++;
-            }
-
-            stream.reset();
-            stream.skip(i);
-
-            if (i < num) {
-                stream.mark(10000);
-
-                return;
-            } else {
-                stream.mark(BUF_LEN);
-            }
-        }
-    }
-}
-
-/** This class lists all the files defined in the constructor.
- * The definitions can be in three forms.
- * 1. absolute file (/tmp/test.txt)
- * 2. absolute path (/tmp)
- * 3. a wildcard file (/tmp/*.txt)
- *
- * In case 1. only the file is returned.
- * In case 2. all files in the directory are returned
- * In case 3. all the files in the directory tmp having
- * the .txt ending are returned.
- *
- * The returning means the return of the getListing method.
- */
-class DirectoryList {
-    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
-    List files = null;
-
-    /** Creates a new instance of DirectoryList
-     * @param path The file definition, see class description above.
-     * @throws Exception Thrown if the path was invalid
-     */
-    public DirectoryList(String path) throws IOException {
-        // splits the absolute? filename from the wildcard
-        String[] parts = path.split("\\*");
-
-        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
-        if ((parts.length < 1) || (parts.length > 2)) {
-            return;
-        }
-
-        // check whether the first and only part is a file or directory
-        if (parts.length == 1) {
-            // open the directory or file
-            File fileOrDir = new File(parts[0]);
-
-            // if the path given was fully specified filename
-            if (fileOrDir.isFile()) {
-                // set the file as the only member in the vector and finish
-                files = new Vector();
-                files.add(fileOrDir);
-
-                return;
-            }
-
-            // the path defined a directory, so get all files
-            File[] fileDirArray;
-
-            // list the files and dirs inside
-            fileDirArray = fileOrDir.listFiles();
-
-            if (fileDirArray == null) {
-                logger.error("No files found matching " + path);
-                throw new IOException("No files found matching " + path);
-            }
-
-            // get the array containing all the files and directories
-            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
-
-            files = new Vector();
-
-            // add all the files to the files list and finish
-            while (filesAndDirs.hasNext()) {
-                File nextFile = (File) filesAndDirs.next();
-
-                if (nextFile.isFile()) {
-                    files.add(nextFile);
-                }
-            }
-
-            return;
-        } else {
-            // this is a directory+ending combination
-            files = new Vector();
-
-            // get all the files matching the definition.
-            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
-
-            while (iterator.hasNext()) {
-                files.add(iterator.next());
-            }
-
-            return;
-        }
-    }
-
-    /** Used to get the file listing, the list of files matching
-     * the definition in constructor.
-     * @return Returns the list of files matching the definition
-     * given in the constructor.
-     */
-    public List getListing() {
-        return files;
-    }
-}
 
 /**
  * @deprecated  This class does not expose the necessary information. Use
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java	2009-08-29 07:22:01.000000000 +0200
@@ -0,0 +1,142 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * DirectoryList.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 10, 2001, 6:50 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+
+/** This class lists all the files defined in the constructor.
+ * The definitions can be in three forms.
+ * 1. absolute file (/tmp/test.txt)
+ * 2. absolute path (/tmp)
+ * 3. a wildcard file (/tmp/*.txt)
+ *
+ * In case 1. only the file is returned.
+ * In case 2. all files in the directory are returned
+ * In case 3. all the files in the directory tmp having
+ * the .txt ending are returned.
+ *
+ * The returning means the return of the getListing method.
+ */
+class DirectoryList {
+    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
+    List files = null;
+
+    /** Creates a new instance of DirectoryList
+     * @param path The file definition, see class description above.
+     * @throws Exception Thrown if the path was invalid
+     */
+    public DirectoryList(String path) throws IOException {
+        // splits the absolute? filename from the wildcard
+        String[] parts = path.split("\\*");
+
+        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
+        if ((parts.length < 1) || (parts.length > 2)) {
+            return;
+        }
+
+        // check whether the first and only part is a file or directory
+        if (parts.length == 1) {
+            // open the directory or file
+            File fileOrDir = new File(parts[0]);
+
+            // if the path given was fully specified filename
+            if (fileOrDir.isFile()) {
+                // set the file as the only member in the vector and finish
+                files = new Vector();
+                files.add(fileOrDir);
+
+                return;
+            }
+
+            // the path defined a directory, so get all files
+            File[] fileDirArray;
+
+            // list the files and dirs inside
+            fileDirArray = fileOrDir.listFiles();
+
+            if (fileDirArray == null) {
+                logger.error("No files found matching " + path);
+                throw new IOException("No files found matching " + path);
+            }
+
+            // get the array containing all the files and directories
+            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
+
+            files = new Vector();
+
+            // add all the files to the files list and finish
+            while (filesAndDirs.hasNext()) {
+                File nextFile = (File) filesAndDirs.next();
+
+                if (nextFile.isFile()) {
+                    files.add(nextFile);
+                }
+            }
+
+            return;
+        } else {
+            // this is a directory+ending combination
+            files = new Vector();
+
+            // get all the files matching the definition.
+            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
+
+            while (iterator.hasNext()) {
+                files.add(iterator.next());
+            }
+
+            return;
+        }
+    }
+
+    /** Used to get the file listing, the list of files matching
+     * the definition in constructor.
+     * @return Returns the list of files matching the definition
+     * given in the constructor.
+     */
+    public List getListing() {
+        return files;
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java	2009-08-29 07:55:09.000000000 +0200
@@ -0,0 +1,492 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileCertReader.java
+ *
+ * @author  Joni Hahkala
+ * Created on March 27, 2002, 8:24 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.cert.CRLException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.asn1.ASN1InputStream;
+
+/** Reads all certificates from given files, accepts binary form of DER encoded certs and
+ * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
+ * the actual certificate that has to begin with "-----BEGIN".
+ * Should accept multiple certs in one file, not tested!
+ */
+class FileCertReader {
+    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
+    static final int BUF_LEN = 1000;
+    static final byte CARR = '\r';
+    static final byte NL = '\n';
+
+    /** The type for TrustAnchor
+     */
+    static final int TYPE_ANCHOR = 100;
+
+    /** The type for certificate revocation list
+     */
+    static final int TYPE_CRL = 101;
+
+    /** the type for X509 certificate
+     */
+    static final int TYPE_CERT = 102;
+
+    static {
+        if (Security.getProvider("BC") == null) {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+    }
+
+    CertificateFactory certFactory;
+
+    /** Creates a new instance of CertReader. */
+    public FileCertReader() throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", "BC");
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider.
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(Provider provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(String provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument. See DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if certificate reading from the files
+     * fails.
+     * @return Returns the Vector of certificates read.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCerts(String files) throws IOException, CertificateException {
+        Vector certs = readFiles(files, TYPE_CERT);
+
+        Iterator certIter = certs.iterator();
+
+        logger.debug("read certs: ");
+
+        while (certIter.hasNext()) {
+            X509Certificate cert = (X509Certificate) certIter.next();
+            logger.debug("Read cert: " + cert.getSubjectDN().toString());
+        }
+
+        return certs;
+    }
+
+    public PrivateKey readPrivateKey(String file) throws IOException {
+        File keyfile = new File(file);
+
+        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
+        skipToKeyBeginning(fis);
+
+        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument and makes TrustAnchors from them. See
+     * DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the certificate reading fails.
+     * @return Returns a Vector of TrustAnchors read from the
+     * files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readAnchors(String files) throws IOException, CertificateException {
+        Vector anchors = readFiles(files, TYPE_ANCHOR);
+
+        Iterator anchorIter = anchors.iterator();
+
+        logger.debug("read TrustAnchors: ");
+
+        while (anchorIter.hasNext()) {
+            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
+            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
+        }
+
+        return anchors;
+    }
+
+    /** Reads the certificate revocation lists (CRLs) from the
+     * files defined in the argument. See DirectoryList for
+     * file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the CRL reading failed.
+     * @return Returns a vector of CRLs read from the files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCRLs(String files) throws IOException, CertificateException {
+        Vector crls = readFiles(files, TYPE_CRL);
+
+        Iterator crlIter = crls.iterator();
+
+        logger.debug("read CRLs: ");
+
+        while (crlIter.hasNext()) {
+            X509CRL crl = (X509CRL) crlIter.next();
+            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
+        }
+
+        return crls;
+    }
+
+    /** Reads the certificates or CRLs from the files defined by
+     * the first argument, see DirectoryList for file definition
+     * format.
+     * @param files The file definition.
+     * @param type The type of things to read from the files.
+     * Currently supported are TYPE_ANCHOR,
+     * TYPE_CRL and TYPE_CERT defined in this class.
+     * @throws CertificateException Thrown if the reading of files fails.
+     * @return Returns a Vector of objects of type given that
+     * were read from the files given.
+     * @see org.glite.voms.DirectoryList
+     */
+    private Vector readFiles(String files, int type) throws CertificateException {
+        Vector storeVector = new Vector();
+
+        try {
+            // load CA certificates
+            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
+
+            Iterator CAFileIter = dir.getListing().iterator();
+
+            // go through the files
+            while (CAFileIter.hasNext()) { // go through the files reading the certificates
+
+                File nextFile = (File) CAFileIter.next();
+
+                storeVector.addAll(readFile(nextFile, type));
+            }
+        } catch (IOException e) {
+            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
+
+            throw new CertificateException("Error while reading certificates or CRLs: " +
+                e.getMessage());
+        }
+
+        return storeVector;
+    }
+
+    /** Reads the objects of given type from the File.
+     * @param certFile The file to read.
+     * @param type The type of objects to read form the file.
+     * @throws IOException Thrown if the reading of objects of given type
+     * fails.
+     * @return Returns the Vector of objects read form the file.
+     */
+    public Vector readFile(File certFile, int type) throws IOException {
+        BufferedInputStream binStream = null;
+        Vector objects = new Vector();
+
+        try {
+            // get the buffered stream to facilitate marking
+            binStream = new BufferedInputStream(new FileInputStream(certFile));
+
+            while (binStream.available() > 0) {
+                Object obj = objectReader(binStream, type);
+
+                if (obj != null) {
+                    objects.add(obj);
+                }
+
+                skipEmptyLines(binStream);
+            }
+        } catch (Exception e) {
+            logger.fatal("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+
+            throw new IOException("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+        } finally {
+            if (binStream != null) {
+                binStream.close();
+            }
+        }
+
+        return objects;
+    }
+
+    /** Reads a certificate or a CRL from the stream, doing some
+     * error correction.
+     * @param binStream The stream to read the object from.
+     * @param type The type of object to read from the stream.
+     * @throws CertificateException Thrown if an error occurs while reading the object.
+     * @throws IOException Thrown if an error occurs while reading the object.
+     * @return Returns the object read.
+     */
+    public Object objectReader(BufferedInputStream binStream, int type)
+        throws CertificateException, IOException {
+        Object object = null;
+        int errors = 0; // no errors in the beginning
+        binStream.mark(10000);
+
+        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
+             // second with skipping possible garbage in the beginning.
+
+            try {
+                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
+                    // before the actual base64 encoded certificate
+                    errors = 2; // if this try fails, don't try anymore
+
+                    skipToCertBeginning(binStream); // skip the garbage
+                }
+
+                binStream.mark(100000);
+
+                binStream.reset();
+
+                object = readObject(binStream, type);
+            } catch (Exception e) {
+                if (errors != 0) { // if the error persists after first pass, fail
+                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
+                    throw new CertificateException("Certificate or CRL reading failed: " +
+                        e.getMessage());
+                }
+
+                errors = 1; // first try failed, try again with skipping
+                binStream.reset(); // rewind the file to the beginning of this try
+            }
+        } while (errors == 1); // try again after first try
+
+        return object;
+    }
+
+    /** Does the actual reading of the object.
+     * @param binStream The stream to read the object from.
+     * @param type The type of the object.
+     * @throws CertificateException Thrown if there is a problem reading the object.
+     * @return Returns the object read or null if no object was found.
+     */
+    public Object readObject(BufferedInputStream binStream, int type)
+        throws CertificateException {
+        Object obj;
+
+        if (type == TYPE_CRL) { // reading certificate revocation lists
+
+            try {
+                obj = certFactory.generateCRL(binStream);
+            } catch (CRLException e) {
+                logger.error("CRL loading failed: " + e.getMessage());
+                throw new CertificateException(e.getMessage());
+            }
+        } else { // reading certs or trust anchors
+
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
+
+            if (cert == null) {
+                return null;
+            }
+
+            if (type == TYPE_ANCHOR) {
+                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
+                obj = new TrustAnchor(cert, null);
+            } else {
+                if (type == TYPE_CERT) {
+                    obj = cert;
+                } else {
+                    logger.fatal("Internal error: Invalid data type " + type +
+                        " when trying to read certificate");
+                    throw new CertificateParsingException("Internal error: Invalid data type " +
+                        type + " when trying to read certificate");
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    /** Skips everything in front of "-----BEGIN" in the stream.
+     * @param stream The stream to read and skip.
+     * @throws IOException Thrown if there is a problem skipping.
+     */
+    static public void skipToCertBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    static public void skipToKeyBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1)
+                index = buffer.indexOf("----BEGIN ENCRYPTED");
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    /** Skips empty lines in the stream.
+     * @param stream The stream possibly containing empty lines.
+     * @throws IOException Thrown if a problem occurs.
+     */
+    static public void skipEmptyLines(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+
+            int i = 0;
+
+            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
+                i++;
+            }
+
+            stream.reset();
+            stream.skip(i);
+
+            if (i < num) {
+                stream.mark(10000);
+
+                return;
+            } else {
+                stream.mark(BUF_LEN);
+            }
+        }
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java	2009-08-29 07:24:52.000000000 +0200
@@ -0,0 +1,137 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileEndingIterator.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 3, 2001, 9:16 AM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+
+/** Lists all the files in the given directory that end with
+ * a certain ending.
+ */
+class FileEndingIterator {
+    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
+
+    /** The file ending.
+     */
+    protected String ending;
+
+    /** A flag to show that there are more files that match.
+     */
+    protected boolean nextFound = false;
+
+    /** The list of files in the directory.
+     */
+    protected File[] fileList;
+
+    /** The index of the next match in the fileList.
+     */
+    protected int index = 0;
+
+    /** Creates new FileIterator and searches the first match.
+     * @param path The directory used for the file search.
+     * @param ending The file ending to search for.
+     */
+    public FileEndingIterator(String path, String ending) {
+        this.ending = ending;
+
+        try {
+            // open the directory
+            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
+
+            // list the files and dirs inside
+            fileList = directory.listFiles();
+
+            // find the first match for the ending
+            nextFound = findNext();
+        } catch (Exception e) {
+            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
+
+            //            e.printStackTrace();
+            return;
+        }
+    }
+
+    /** Used to get the next matching file.
+     * @return Returns the next matching file.
+     */
+    public File next() {
+        if (nextFound == false) {
+            return null;
+        }
+
+        File current = fileList[index++];
+
+        nextFound = findNext();
+
+        return current;
+    }
+
+    /** Used to check that there are more matching files to get
+     * using next().
+     * @return Returns true if there are more matching files.
+     */
+    public boolean hasNext() {
+        return nextFound;
+    }
+
+    /** Finds the next matching file in the list of files.
+     * @return Returns true if a matching file was found.
+     */
+    protected boolean findNext() {
+        try {
+            // search the next file with proper ending
+            while ((index < fileList.length) &&
+                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
+                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
+                index++;
+            }
+        } catch (Exception e) {
+            logger.error("Error while reading directory " + e.getMessage());
+
+            //            e.printStackTrace(System.out);
+            return false;
+        }
+
+        // check if the loop ended because of a match or because running out of choices.
+        if (index < fileList.length) {
+            return true;
+        }
+
+        return false;
+    }
+}

voms-initscript.patch:
 voms.start.in |  186 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 64 deletions(-)

--- NEW FILE voms-initscript.patch ---
diff -ur voms-1.9.11.orig/src/install/voms.start.in voms-1.9.11/src/install/voms.start.in
--- voms-1.9.11.orig/src/install/voms.start.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms.start.in	2009-09-03 10:10:17.574074641 +0200
@@ -19,9 +19,19 @@
 #	voms servers.
 #
 # chkconfig: 2345 95 05
-# description: VOMS stands for Virtual Organization Membership System.
+# description: Virtual Organization Membership Service
 # processname: voms
 # pidfile: /var/run/voms.pid
+#
+### BEGIN INIT INFO
+# Provides:          voms
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Virtual Organization Membership Service
+# Description:       Virtual Organization Membership Service
+### END INIT INFO
 
 # Source networking configuration and check that networking is up.
 if [ -r /etc/sysconfig/network ] ; then
@@ -31,9 +41,16 @@
 
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
- at VAR_LOCATION_ENV@=${@VAR_LOCATION_ENV@:-$@LOCATION_ENV@/var}
 
-# check whether $@VAR_LOCATION_ENV@/var/lock/subsys exists
+if [ -z "$@VAR_LOCATION_ENV@" ] ; then
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
+fi
+
+# check whether $@VAR_LOCATION_ENV@/lock/subsys exists
 if ! test -d $@VAR_LOCATION_ENV@/lock/subsys ; then
     mkdir -p $@VAR_LOCATION_ENV@/lock/subsys
 fi
@@ -41,19 +58,38 @@
 # Default path
 basepath=$@LOCATION_ENV@
 binpath=${basepath}/sbin
-etcpath=${basepath}/etc
 
-# Source an auxiliary profile file if we have one, and pick up VOMS_OPTIONS and VOMS_USER
-if [ -r ${etcpath}/profile.d/voms.sh ] ; then
-    . ${etcpath}/profile.d/voms.sh
+if [ "$basepath" = "/usr" ] ; then
+    etcpath=/etc
+else
+    etcpath=${basepath}/etc
+fi
+
+RUN=yes
+
+# Source an auxiliary profile file if we have one and pick up VOMS_USER and RUN
+if [ -r ${etcpath}/default/voms ] ; then
+    . ${etcpath}/default/voms
+fi
+if [ -r ${etcpath}/sysconfig/voms ] ; then
+    . ${etcpath}/sysconfig/voms
+fi
+
+# Don't run until configuration is done
+if [ "x$RUN" != "xyes" ] ; then
+    echo "voms disabled, please adjust the configuration to your needs "
+    echo "and then set RUN to 'yes' in /etc/default/voms to enable it."
+    exit 0
 fi
 
 # add lib directory to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+fi
 
-voms=${binpath}/edg-voms
+voms=${binpath}/voms
 if !(test -x ${voms}) ; then
-    echo "Cannot find edg-voms." 
+    echo "Cannot find voms."
     exit 0
 fi
 
@@ -64,18 +100,22 @@
     # Start daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
 
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Starting $prog($vo): "
 
-            if test -f $@LOCATION_ENV@/etc/voms/$vo/tnsnames.ora ; then
-                tnsvalue=$@LOCATION_ENV@/etc/voms/$vo
+            if test -f ${etcpath}/voms/$vo/tnsnames.ora ; then
+                tnsvalue=${etcpath}/voms/$vo
             else
                 tnsvalue="$TNS_ADMIN"
             fi
@@ -84,21 +124,21 @@
                 read pid < $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
                 if test "x$pid" != "x"; then
                     if checkpid $pid; then
-                        echo "VOMS ($pid) is already running" && failure
+                        echo "VOMS ($pid) is already running"
                         continue;
                     fi
                 fi
             fi
 
             if [ -n "$VOMS_USER" ]; then
-                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
+                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf ${etcpath}/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
             else
-                TNS_ADMIN="$tnsvalue" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf
+                TNS_ADMIN="$tnsvalue" ${voms} --conf ${etcpath}/voms/$vo/voms.conf
             fi
 
-	          # get process id
-            pid=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            # get process id
+            pid=$(ps axo pid,args | grep "${voms} --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             NUM=$(($pid))
             if test $NUM -eq 0; then
                 RETVAL=1
@@ -110,12 +150,17 @@
                 RETGLOB=$(($RETGLOB + 1 ))
             fi
             [ "$RETVAL" -eq 0 ] && success || failure 
+            echo
         fi
     done
     
     return $RETGLOB
 }
 
+if [ -r /etc/init.d/functions ] ; then
+    . /etc/init.d/functions
+else
+
 success()
 {
     echo $1
@@ -151,6 +196,8 @@
     return $rc
 }
 
+fi
+
 checkpid() 
 {
     ps --pid $1 >> /dev/null
@@ -164,14 +211,14 @@
 # A function to stop a program.
 killprocs() {
     RC=0
-	# Test syntax.
+    # Test syntax.
     if [ "$#" -eq 0 ]; then
         echo $"Usage: killproc {pids} [signal]"
         return 1
     fi
     
     notset=0
-	# check for second arg to be kill level
+    # check for second arg to be kill level
     if [ "$2" != "" ] ; then
         killlevel=$2
     else
@@ -179,15 +226,15 @@
         killlevel="-9"
     fi
 
-        # Find pid.
+    # Find pid.
     pid=$1
 
-        # Kill it.
+    # Kill it.
     if [ -n "${pid:-}" ] ; then
         [ "$BOOTUP" = "verbose" -a -z "$LSB" ] && echo -n "$base "
         if [ "$notset" -eq "1" ] ; then
             if checkpid $pid 2>&1; then
-			   # TERM first, then KILL if not dead
+                # TERM first, then KILL if not dead
                 kill -TERM $pid
                 sleep 0.1
                 if checkpid $pid && sleep 1 &&
@@ -196,14 +243,14 @@
                     kill -KILL $pid
                     sleep 0.1
                 fi
-		        fi
+            fi
             checkpid $pid
             RC=$?
             [ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
             RC=$((! $RC))
-		# use specified level only
-		else
-		        if checkpid $pid >/dev/null 2>&1; then
+        else
+            # use specified level only
+            if checkpid $pid >/dev/null 2>&1; then
                 kill $killlevel $pid
                 RC=$?
                 [ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
@@ -214,7 +261,7 @@
         RC=1
     fi
     
-        # Remove pid file if any.
+    # Remove pid file if any.
     if [ "$notset" = "1" ]; then
         rm -f /var/run/$base.pid
     fi
@@ -226,18 +273,21 @@
     # Stop daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Stopping $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep|awk '{ print $2; }'|tr '\n' ' '`
-            dbname=`grep dbname $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
-            username=`grep username $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            dbname=`grep dbname ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            username=`grep username ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
             if test "x$username" = "x"; then
                 pids="";
                 pids2="";
@@ -255,16 +305,15 @@
                 fi
             fi
             if test -z "$pids"; then
-                failure; echo
-                RETVAL=1
+                echo "(already stopped)"
                 continue
             fi
             for pid in $pids; do
-                killprocs ${pid} ;
+                killprocs ${pid}
             done
             RETVAL=$?
             echo
-            [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/voms.$vo
+            [ $RETVAL -eq 0 ] && rm -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
             RETGLOB=$((RETGLOB + RETVAL))
         fi
     done
@@ -273,47 +322,53 @@
 }
 
 function condrestart() {
-    # Stop daemons.
+    RETGLOB=0
+    # Conditionally restart daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
     
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
-            echo -n "Condrestart $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
-            if test -z "$pids"; then
-                echo; start $vo
-            else
-                failure; echo
-                RETVAL=1
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            if test -n "$pids"; then
+                $0 restart $vo
+                RETVAL=$?
+                RETGLOB=$((RETGLOB + RETVAL))
             fi
         fi
     done
 
     return $RETGLOB
-
 }
 
 function getstatus() {
-    # Stop daemons.
-    prog=`basename ${voms}`
-
-    # get vos
-    vos=${1:-`find $@LOCATION_ENV@/etc/voms/ -type d -printf "%f "`}
-
     value=0
+    # Get status.
+    prog=`basename ${voms}`
+    if test -z $1; then
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
+    else
+        vos=$1
+    fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Status $prog($vo): "
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             if test -z "$pids"; then
-                if [ -f /var/lock/subsys/voms.$vo ]; then
+                if [ -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo ]; then
                     echo "dead but subsys locked"
                     value=$[$value < 2 ? 2 : $value]
                     continue
@@ -322,7 +377,8 @@
                 value=$[$value < 3 ? 3 : $value]
                 continue
             else
-                echo "(pid $pids) is running..."
+                echo -n "(pid $pids) is running..." | tr '\n' ' '
+                echo
                 value=$[$value < 0 ? 0 : $value]
                 continue
             fi
@@ -346,12 +402,14 @@
         getstatus $2
         RETVAL=$?
         ;;
-    restart)
+    restart | force-reload)
         stop $2
         start $2
         RETVAL=$?
         ;;
-    condrestart)
+    reload)
+        ;;
+    condrestart | try-restart)
         condrestart $2
         RETVAL=$?
         ;;

voms-install-db.patch:
 voms_install_db.in |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE voms-install-db.patch ---
diff -ur voms-1.9.11.orig/src/install/voms_install_db.in voms-1.9.11/src/install/voms_install_db.in
--- voms-1.9.11.orig/src/install/voms_install_db.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms_install_db.in	2009-08-26 17:45:39.608077295 +0200
@@ -4,7 +4,11 @@
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
 if test -z $@VAR_LOCATION_ENV@ ; then
-    @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
 fi
 
 # CERTDIR
@@ -37,7 +41,9 @@
 
 # Default path
 basepath=$@LOCATION_ENV@
-datapath=$@LOCATION_ENV@
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    datapath=$@LOCATION_ENV@
+fi
 
 # Default Suffix
 code=0
@@ -49,7 +55,7 @@
 logformat=""
 sqlloc=""
 help=""
-oldformat="no"
+newformat="yes"
 
 if test "x at with_mysqlconf@" != "x" ; then
     MYSQLCONF=" --defaults-file=@with_mysqlconf@ "
@@ -58,7 +64,7 @@
 fi
 
 
-TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,compat -n 'voms_install_db' -- "$@"`
+TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,oldformat,compat -n 'voms_install_db' -- "$@"`
 
 if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi
 
@@ -84,7 +90,7 @@
   --logtype)                logtype=$2                 ; shift 2 ;;
   --logformat)              logformat=$2               ; shift 2 ;;
   --logdateformat)          logdateformat=$2           ; shift 2 ;;
-  --newformat)              oldformat="yes"            ; shift 1 ;;
+  --oldformat)              newformat="no"             ; shift 1 ;;
   -h)                       help="yes"                 ; shift 1 ;;
 	--)                       shift                      ; break   ;;
 	*)                        $ECHO "$1: Internal Error!" >&2 ; exit 1  ;;
@@ -133,7 +139,7 @@
     $ECHO "    --logtype type          Specifies what to log. See the vomsd(8) man page for details."
     $ECHO "    --logformat format      See the vomsd(8) man page for details."
     $ECHO "    --logdateformat format  See the vomsd(8) man page for details."
-    $ECHO "    --newformat             Creates AC according to the old format."
+    $ECHO "    --oldformat             Creates AC according to the old format."
     $ECHO "    --help                  This output."
     exit 0;
 fi
@@ -261,8 +267,8 @@
 
 # Setting ownership and permission for voms_password_query file
 mkdir -p $datapath/etc/voms/$voms_vo
-mkdir -p $@LOCATION_ENV at _VAR/log
-#$datapath/log
+mkdir -p $@VAR_LOCATION_ENV@/log/voms
+
 $ECHO $voms_password_query > $datapath/etc/voms/$voms_vo/voms.pass
 chown root.voms $datapath/etc/voms/$voms_vo/voms.pass
 chmod 640 $datapath/etc/voms/$voms_vo/voms.pass
@@ -270,10 +276,10 @@
 if test -z $voms_vo ; then
     logname=voms
 else
-    logname=voms.$voms_vo
+    logname=$voms_vo
 fi
  
-$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@LOCATION_ENV at _VAR/log/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
+$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/voms/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
 $ECHO -en "--socktimeout=$timeout\n--loglevel=$loglevel\n--logtype=$logtype\n" >>$datapath/etc/voms/$voms_vo/voms.conf
 
 if test "x$compat_mode" = "x-compat"; then

voms-jar-perms.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-jar-perms.patch ---
diff -ur voms-1.9.11.orig/src/api/java/Makefile.am voms-1.9.11/src/api/java/Makefile.am
--- voms-1.9.11.orig/src/api/java/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/Makefile.am	2009-08-14 20:54:18.599023487 +0200
@@ -70,7 +70,7 @@
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/java
-	$(INSTALL) $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
+	$(INSTALL) -m644 $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
 
 clean:
 	rm -f $(top_builddir)/src/api/java/vomsjapi.jar

voms-java-clone-cast.patch:
 VOMSValidator.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE voms-java-clone-cast.patch ---
diff -ur voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java	2009-08-15 20:12:49.855022959 +0200
@@ -159,7 +159,7 @@
         if (validatedChain == null)
             myValidatedChain = null; // allow null
         else
-            myValidatedChain = validatedChain.clone(); // allow null
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
 
         if (acValidator == null) {
             if (theTrustStore == null) {
@@ -292,7 +292,7 @@
         if (validatedChain == null) 
             myValidatedChain = null;
         else
-            myValidatedChain = validatedChain.clone();
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
         myVomsAttributes = new Vector();
         myFQANTree = null;
         isParsed = false;

voms-javadoc.patch:
 PathNamingScheme.java   |   14 +++++++-------
 UserCredentials.java    |   14 +++++++-------
 VOMSParser.java         |    2 +-
 VOMSProtocol.java       |    6 +++---
 VOMSProxyBuilder.java   |   16 ++++++++--------
 VOMSRequestOptions.java |   17 ++++-------------
 6 files changed, 30 insertions(+), 39 deletions(-)

--- NEW FILE voms-javadoc.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2009-07-01 19:02:29.448373448 +0200
@@ -61,7 +61,7 @@
     /**
      * This methods checks that the string passed as argument complies with the voms FQAN syntax.
      *  
-     * @param containerName, the string that must be checked for compatibility with FQAN syntax. 
+     * @param containerName the string that must be checked for compatibility with FQAN syntax. 
      * @throws VOMSSyntaxException
      *         If there's an error in the FQAN syntax.
      */
@@ -81,7 +81,7 @@
      * This methods checks that the string passed as argument complies with the syntax used
      * by voms to identify groups.
      * 
-     * @param groupName, the string that has to be checked.
+     * @param groupName the string that has to be checked.
      * @throws VOMSSyntaxException
      *          If the string passed as argument doens not comply with the voms sytax.
      */
@@ -116,7 +116,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms group.
      * 
-     * @param groupName, the string to check.
+     * @param groupName the string to check.
      * @return  <ul><li>true, if the string passed as argument identifies a voms group.
      *          <li>false, otherwise.
      *          </ul>
@@ -131,7 +131,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms role.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -147,7 +147,7 @@
      * This methods checks that the FQAN passed as argument identifies a qualified voms role, i.e.,
      * a role defined in the context of a voms group.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a qualified voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -163,7 +163,7 @@
     /**
      * This method extracts the role name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN
+     * @param containerName the FQAN
      * @return <ul><li>A string containing the role name, if found</li>
      *              <li>null, if no role information is contained in the FQAN passed as argument
      *         </ul>
@@ -190,7 +190,7 @@
     /**
      * This method extracts group name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN 
+     * @param containerName the FQAN 
      * @return <ul><li>A string containing the group name, if found</li>
      *              <li>null, if no group information is contained in the FQAN passed as argument
      *         </ul>
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-07-01 19:02:29.456372709 +0200
@@ -377,7 +377,7 @@
      * Static instance constructor for a {@link UserCredentials}.
      * For more info on the user credentials load procedure, see {@link #instance()}.
      *
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -396,9 +396,9 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -416,8 +416,8 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -435,7 +435,7 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param credentials, the GlobusCredentials object containing the user's own proxy
+     * @param credentials the GlobusCredentials object containing the user's own proxy
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java	2009-07-01 19:02:29.465377247 +0200
@@ -61,7 +61,7 @@
     /**
      * 
      * Parses a voms response reading from a given input stream.
-     * @param is, the input stream.
+     * @param is the input stream.
      * @return a {@link VOMSResponse} object that represents the parsed response.
      */
     public VOMSResponse parseResponse(InputStream is){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2009-07-01 19:02:29.468373182 +0200
@@ -97,8 +97,8 @@
      * 
      * This method is used to send a request to a VOMS server.
      *  
-     * @param requestOptions, the request options. See {@link VOMSRequestOptions}. 
-     * @param stream, an output stream.
+     * @param requestOptions the request options. See {@link VOMSRequestOptions}. 
+     * @param stream an output stream.
      */
     public void sendRequest(VOMSRequestOptions requestOptions, OutputStream stream){
         
@@ -154,7 +154,7 @@
     /**
      * This method is used to parse a VOMS response from an input stream.
      * 
-     * @param stream, the input stream from which the response will be parsed.
+     * @param stream the input stream from which the response will be parsed.
      * @return a {@link VOMSResponse} object.
      */
     public VOMSResponse getResponse(InputStream stream){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 19:36:38.729376985 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 20:58:25.590377728 +0200
@@ -130,9 +130,9 @@
      *
      * This methods builds an {@link AttributeCertificate} (AC) object starting from an array of bytes.
      *
-     * @param acBytes, the byte array containing the attribute certificate.
+     * @param acBytes the byte array containing the attribute certificate.
      * @return the {@link AttributeCertificate} object
-     * @throws VOMSException, in case of parsing errors.
+     * @throws VOMSException in case of parsing errors.
      */
     public static AttributeCertificate buildAC(byte[] acBytes){
 
@@ -161,12 +161,12 @@
      * passed as arguments and including a list of {@link AttributeCertificate} objects that
      * will be included in the proxy.
      *
-     * @param cred, the {@link UserCredentials} from which the proxy must be created.
-     * @param ACs, the list of {@link AttributeCertificate} objects.
-     * @param lifetime, the lifetime in seconds of the generated proxy.
-     * @param version, the version of globus to which the proxy conforms
-     * @return a {@link GlobusCredential} object that represents the proxy.
-     * @throws {@link VOMSException}, if something goes wrong.
+     * @param cred the {@link UserCredentials} from which the proxy must be created.
+     * @param ACs the list of {@link AttributeCertificate} objects.
+     * @param lifetime the lifetime in seconds of the generated proxy.
+     * @param gtVersion the version of globus to which the proxy conforms
+     * @return a {@link UserCredentials} object that represents the proxy.
+     * @throws VOMSException if something goes wrong.
      *
      * @author Vincenzo Ciaschini
      * @author Andrea Ceccanti
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2009-07-01 19:08:10.252380084 +0200
@@ -75,9 +75,7 @@
 
     
     /**
-     * 
-     * Returns the ordering string of this {@link VOMSRequestOptions} object.
-     * @return
+     * @return the ordering string of this {@link VOMSRequestOptions} object.
      */
     public String getOrdering() {
 
@@ -99,10 +97,7 @@
 
     
     /**
-     * 
-     * Returs the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
-     * 
-     * @return
+     * @return the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
      */
     public List getRequestedFQANs() {
 
@@ -123,10 +118,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object.
-     * 
-     * @return
      */
     public List getTargets() {
 
@@ -135,10 +128,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object as a string containing a a comma-separated list of host names.
-     * 
-     * @return
      */
     public String getTargetsAsString() {
 

voms-nolib64.patch:
 configure.ac |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE voms-nolib64.patch ---
diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
--- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
@@ -37,10 +37,6 @@
 
 AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
 
-if test "x$host_cpu" = "xx86_64"; then
-    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
-fi
-
 AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
 AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
 AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-notknown-msg.patch:
 vomsclient.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE voms-notknown-msg.patch ---
diff -ur voms-1.9.11.orig/src/client/vomsclient.cc voms-1.9.11/src/client/vomsclient.cc
--- voms-1.9.11.orig/src/client/vomsclient.cc	2009-07-27 10:14:04.000000000 +0200
+++ voms-1.9.11/src/client/vomsclient.cc	2009-08-31 17:51:15.952071123 +0200
@@ -575,7 +575,9 @@
       std::vector<contactdata> servers;
       servers = v.FindByAlias(contact.vo().empty() ? contact.nick() : contact.vo());
       if (servers.empty()) {
-        std::cerr << "VOMS Server for " << contact.vo() << " not known!" << std::endl;
+        std::cerr << "VOMS Server for "
+		  << (contact.vo().empty() ? contact.nick() : contact.vo())
+		  << " not known!" << std::endl;
         exit(1);
       }
     

voms-openssl.patch:
 ac/Makefile.am        |    1 +
 api/ccapi/api_util.cc |    4 ++--
 include/acstack.h     |    2 +-
 socklib/Client.cpp    |    4 ++++
 utils/vomsfake.cc     |    1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE voms-openssl.patch ---
diff -ur voms-1.9.11.orig/src/ac/Makefile.am voms-1.9.11/src/ac/Makefile.am
--- voms-1.9.11.orig/src/ac/Makefile.am	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/src/ac/Makefile.am	2009-09-07 11:06:49.079471423 +0200
@@ -27,6 +27,7 @@
 	-DNOGLOBUS \
 	-I $(top_srcdir)/src/include \
 	-I $(top_builddir)/src/sslutils
+libattributes_nog_la_CXXFLAGS = $(libattributes_nog_la_CFLAGS)
 
 libattributes_nog_la_LIBADD = \
 	$(OPENSSL_LIBS)
diff -ur voms-1.9.11.orig/src/api/ccapi/api_util.cc voms-1.9.11/src/api/ccapi/api_util.cc
--- voms-1.9.11.orig/src/api/ccapi/api_util.cc	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/api_util.cc	2009-09-07 11:06:49.080471703 +0200
@@ -415,9 +415,9 @@
   /* extract vo name from AC */
   
   AC * ac = (AC *)data;
-  STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
+  const STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
   int nid = OBJ_txt2nid("idatcap");
-  int pos = X509at_get_attr_by_NID(atts, nid, -1);
+  int pos = X509at_get_attr_by_NID((const STACK_OF(X509_ATTRIBUTE)*)atts, nid, -1);
 
   int nidc = OBJ_txt2nid("certseq");
   STACK_OF(X509_EXTENSION) *exts = ac->acinfo->exts;
diff -ur voms-1.9.11.orig/src/include/acstack.h voms-1.9.11/src/include/acstack.h
--- voms-1.9.11.orig/src/include/acstack.h	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/include/acstack.h	2009-09-07 11:06:49.081472345 +0200
@@ -79,7 +79,7 @@
 #endif
 
 #define DECL_STACK(type) \
-   DECLARE_STACK_OF(type) \
+   PREDECLARE_STACK_OF(type) \
    extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \
    extern STACK_OF(type) *sk_##type##_new_null (); \
    extern void   sk_##type##_free (STACK_OF(type) *); \
diff -ur voms-1.9.11.orig/src/socklib/Client.cpp voms-1.9.11/src/socklib/Client.cpp
--- voms-1.9.11.orig/src/socklib/Client.cpp	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Client.cpp	2009-09-07 11:28:07.210471657 +0200
@@ -336,7 +336,11 @@
 bool 
 GSISocketClient::Open()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int ret = -1, ret2 = -1;
   time_t starttime, curtime;
   long errorcode = 0;
diff -ur voms-1.9.11.orig/src/utils/vomsfake.cc voms-1.9.11/src/utils/vomsfake.cc
--- voms-1.9.11.orig/src/utils/vomsfake.cc	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/utils/vomsfake.cc	2009-09-07 10:21:52.935470664 +0200
@@ -40,6 +40,7 @@
 #include "listfunc.h"
 #include "credentials.h"
 #include "parsertypes.h"
+#define YYTOKENTYPE
 #include "vomsparser.h"
 
 VOLIST *volist = NULL;

voms-pipe-buf.patch:
 log.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE voms-pipe-buf.patch ---
diff -ur voms-1.9.11.orig/src/log/log.c voms-1.9.11/src/log/log.c
--- voms-1.9.11.orig/src/log/log.c	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/log/log.c	2009-09-07 16:02:18.597470396 +0200
@@ -175,7 +175,11 @@
   if (*buffer) {
     while (offset < slen) {
       do {
+#ifdef PIPE_BUF
         readbytes = read(fd, *buffer + offset, (slen - offset > PIPE_BUF ? PIPE_BUF : slen - offset));
+#else
+        readbytes = read(fd, *buffer + offset, (slen - offset > fpathconf(fd, _PC_PIPE_BUF) ? fpathconf(fd, _PC_PIPE_BUF) : slen - offset));
+#endif
       } while (readbytes < 0 && (errno == EINTR
 #ifdef ERESTART
                                    || errno == ERESTART

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

--- NEW FILE voms-portability.patch ---
diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
--- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
@@ -1,6 +1,6 @@
 
 AC_INIT([GLite Security VOMS], [1.9.11])
-AC_PREREQ(2.59)
+AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/utils/voms_proxy_destroy.cc])
diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4
--- voms-1.9.11.orig/project/acinclude.m4	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/project/acinclude.m4	2009-09-08 14:13:33.246338019 +0200
@@ -904,12 +904,16 @@
 
 AC_DEFUN([PUT_PRIVATES],
 [
-        AH_BOTTOM([#ifdef __GNUC__
+        AH_BOTTOM([#if defined(__GNUC__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #define UNUSED(z)  z __attribute__ ((unused))
+#else
+#define UNUSED(z)  z
+#endif
 #define PRIVATE    __attribute__ ((visibility ("hidden")))
 #define PUBLIC     __attribute__ ((visibility ("default")))
 #else
-#define UNUSED
+#define UNUSED(z)  z
 #define PRIVATE
 #define PUBLIC
 #endif])])
diff -ur voms-1.9.11.orig/src/api/ccapi/Makefile.am voms-1.9.11/src/api/ccapi/Makefile.am
--- voms-1.9.11.orig/src/api/ccapi/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/Makefile.am	2009-09-08 14:13:33.247337541 +0200
@@ -16,7 +16,7 @@
 libvomsapi_nog_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_nog_la_CPPFLAGS = \
+libvomsapi_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -41,7 +41,7 @@
 libvomsapi_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_la_CPPFLAGS = \
+libvomsapi_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -70,7 +70,7 @@
 libvomsc_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_la_CPPFLAGS = \
+libvomsc_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_CFLAGS)
@@ -94,10 +94,10 @@
 #noinst_PROGRAMS = test ctest
 #test_SOURCES = test.cc
 #test_LDADD = libvomsapi.la
-#test_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#test_CXXFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 #ctest_SOURCES = ctest.c
 #ctest_LDADD = libvomsc.la
-#ctest_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#ctest_CFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 
 EXTRA_LTLIBRARIES = \
 	libvomsapi_gcc32.la \
@@ -123,7 +123,7 @@
 libvomsapi_gcc32_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32_la_CPPFLAGS = \
+libvomsapi_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -139,7 +139,7 @@
 libvomsapi_gcc32dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbg_la_CPPFLAGS = \
+libvomsapi_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(GLOBUS_GCC32DBG_CFLAGS) \
 	$(API_INCLUDES)
@@ -155,7 +155,7 @@
 libvomsapi_gcc32pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32pthr_la_CPPFLAGS = \
+libvomsapi_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -171,7 +171,7 @@
 libvomsapi_gcc32dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -187,7 +187,7 @@
 libvomsc_gcc32_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32_la_CPPFLAGS = \
+libvomsc_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -203,7 +203,7 @@
 libvomsc_gcc32dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbg_la_CPPFLAGS = \
+libvomsc_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -219,7 +219,7 @@
 libvomsc_gcc32pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32pthr_la_CPPFLAGS = \
+libvomsc_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -235,7 +235,7 @@
 libvomsc_gcc32dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -254,7 +254,7 @@
 libvomsapi_gcc64_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64_la_CPPFLAGS = \
+libvomsapi_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -270,7 +270,7 @@
 libvomsapi_gcc64dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbg_la_CPPFLAGS = \
+libvomsapi_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -286,7 +286,7 @@
 libvomsapi_gcc64pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64pthr_la_CPPFLAGS = \
+libvomsapi_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -302,7 +302,7 @@
 libvomsapi_gcc64dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
@@ -318,7 +318,7 @@
 libvomsc_gcc64_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64_la_CPPFLAGS = \
+libvomsc_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -334,7 +334,7 @@
 libvomsc_gcc64dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbg_la_CPPFLAGS = \
+libvomsc_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -350,7 +350,7 @@
 libvomsc_gcc64pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64pthr_la_CPPFLAGS = \
+libvomsc_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -367,7 +367,7 @@
 libvomsc_gcc64dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
diff -ur voms-1.9.11.orig/src/socklib/Makefile.am voms-1.9.11/src/socklib/Makefile.am
--- voms-1.9.11.orig/src/socklib/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Makefile.am	2009-09-08 14:16:29.063338874 +0200
@@ -12,7 +12,7 @@
 libsock_server_la_SOURCES = Server.cpp tokens.c globuswrap.c
 libsock_nog_la_SOURCES = Client.cpp
 
-libsock_nog_la_CPPFLAGS = \
+libsock_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
@@ -21,17 +21,18 @@
 libsock_nog_la_LIBADD = \
 	-lcrypto -lssl
 
-libsock_server_la_CPPFLAGS = \
+libsock_server_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
+libsock_server_la_CFLAGS = $(libsock_server_la_CXXFLAGS)
 
 libsock_server_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils.la \
 	$(top_builddir)/src/common/libutilc.la \
 	$(GLOBUS_GSS_LIBS)
 
-libsock_la_CPPFLAGS = \
+libsock_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
@@ -68,10 +69,11 @@
 
 libsock_server_gcc32_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32_la_CPPFLAGS = \
+libsock_server_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
+libsock_server_gcc32_la_CFLAGS = $(libsock_server_gcc32_la_CXXFLAGS)
 
 libsock_server_gcc32_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32.la \
@@ -80,10 +82,11 @@
 
 libsock_server_gcc32dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbg_la_CPPFLAGS = \
+libsock_server_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbg_la_CFLAGS = $(libsock_server_gcc32dbg_la_CXXFLAGS)
 
 libsock_server_gcc32dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbg.la \
@@ -92,10 +95,11 @@
 
 libsock_server_gcc32pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32pthr_la_CPPFLAGS = \
+libsock_server_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
+libsock_server_gcc32pthr_la_CFLAGS = $(libsock_server_gcc32pthr_la_CXXFLAGS)
 
 libsock_server_gcc32pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32pthr.la \
@@ -104,10 +108,11 @@
 
 libsock_server_gcc32dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbgpthr_la_CFLAGS = $(libsock_server_gcc32dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc32dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbgpthr.la \
@@ -116,10 +121,11 @@
 
 libsock_server_gcc64_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64_la_CPPFLAGS = \
+libsock_server_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
+libsock_server_gcc64_la_CFLAGS = $(libsock_server_gcc64_la_CXXFLAGS)
 
 libsock_server_gcc64_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64.la \
@@ -128,10 +134,11 @@
 
 libsock_server_gcc64dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbg_la_CPPFLAGS = \
+libsock_server_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbg_la_CFLAGS = $(libsock_server_gcc64dbg_la_CXXFLAGS)
 
 libsock_server_gcc64dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbg.la \
@@ -140,10 +147,11 @@
 
 libsock_server_gcc64pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64pthr_la_CPPFLAGS = \
+libsock_server_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
+libsock_server_gcc64pthr_la_CFLAGS = $(libsock_server_gcc64pthr_la_CXXFLAGS)
 
 libsock_server_gcc64pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64pthr.la \
@@ -152,10 +160,11 @@
 
 libsock_server_gcc64dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbgpthr_la_CFLAGS = $(libsock_server_gcc64dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc64dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbgpthr.la \
@@ -188,7 +197,7 @@
 libsock_gcc32_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32_la_CPPFLAGS = \
+libsock_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -201,7 +210,7 @@
 libsock_gcc32dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbg_la_CPPFLAGS = \
+libsock_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -214,7 +223,7 @@
 libsock_gcc32pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32pthr_la_CPPFLAGS = \
+libsock_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -227,7 +236,7 @@
 libsock_gcc32dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -240,7 +249,7 @@
 libsock_gcc64_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64_la_CPPFLAGS = \
+libsock_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -253,7 +262,7 @@
 libsock_gcc64dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbg_la_CPPFLAGS = \
+libsock_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -266,7 +275,7 @@
 libsock_gcc64pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64pthr_la_CPPFLAGS = \
+libsock_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -279,7 +288,7 @@
 libsock_gcc64dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)

voms-shell-syntax.patch:
 mysql2oracle.in |    2 +-
 voms-ping       |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE voms-shell-syntax.patch ---
diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
--- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
@@ -2,7 +2,7 @@
 #!/bin/sh
 #set -x
 
-function usage()
+function usage
 {
     echo
     echo "usage : mysql2oracle [OPTIONS]"
diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
--- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
@@ -25,7 +25,8 @@
   echo "  ]"
 }
 
-function test_vo {
+function test_vo
+{
    local voname="$1"
    local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
    local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
@@ -41,7 +42,7 @@
 "$voname" "localhost" "$port" "$dn" "$voname"
 EOF
    rm -f /tmp/oo
-   /opt/glite/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
+   ${GLITE_LOCATION:-/usr}/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
    res=$?
    if test $res -ne 0; then
       grep "User unknown to this VO" /tmp/oo >/dev/null


--- NEW FILE voms.INSTALL ---
VOMS server configuration
-------------------------

In addition to the voms-server package a voms database plugin is needed.

Plugins exists for mysql and oracle. Since the oracle client libraries
are not open source software, only the mysql plugin is available in
Fedora. To install the voms-mysql-plugin issue the following command
as root:

	yum install voms-mysql-plugin

Before starting the server, you must create the databases used by
VOMS. It is possible to run more than one VOMS server on a single host
as long as they are configured to use different ports.

You should have the grid CA certificates installed in
/etc/grid-security/certificates before running the VOMS database
creation script.

To create the databases run the following command as root for each
VOMS server you want to run:

	/usr/share/voms/voms_install_db \
		--voms-vo=<voname> \
		--port=<portnumber> \
		--db-type=mysql \
		--db-admin=<mysqladminuser> \
		--db-pwd=<mysqladminpwd> \
		--sqlloc=/usr/lib/voms/libvomsmysql.so

If you are running on a 64 bit host use instead:
		--sqlloc=/usr/lib64/voms/libvomsmysql.so

The voms server is configured to run as a special voms user. This user
needs a copy of the host certificate and key:

	cp -p /etc/grid-security/hostcert.pem /etc/grid-security/voms
	cp -p /etc/grid-security/hostkey.pem /etc/grid-security/voms
	chown voms:voms /etc/grid-security/voms/host*.pem

After creating the databases, start the server by running the command:

	service voms start

If you want the server to be started automatically after each reboot run
the command:

	chkconfig voms on

To check that the server is running and is configured correctly, run
the following command:

	/usr/share/voms/voms-ping <voname>


--- NEW FILE voms.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:		voms
Version:	1.9.11
Release:	4%{?dist}
Summary:	Virtual Organization Membership Service

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms_R_1_9_11 \
#		  -d voms-1.9.11 org.glite.security.voms
#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
Source:		%{name}-%{version}.tar.gz
#		Post-install setup instructions:
Source1:	%{name}.INSTALL
#		Build using Globus from Fedora/EPEL
#		https://savannah.cern.ch/bugs/?54427
Patch0:		%{name}-distribution-globus.patch
#		Fix the start-up script
#		https://savannah.cern.ch/bugs/?54428
Patch1:		%{name}-initscript.patch
#		Fix the --disable-glite configure option
#		https://savannah.cern.ch/bugs/?54429
Patch2:		%{name}-fix-enable-glite.patch
#		Remove lib64 hardcoding
#		https://savannah.cern.ch/bugs/?54430
Patch3:		%{name}-nolib64.patch
#		Make the Java API more compatible with the C API
#		https://savannah.cern.ch/bugs/?54432
Patch4:		%{name}-extra-vomses-java.patch
#		Missing casts after Java cloning
#		https://savannah.cern.ch/bugs/?54433
Patch5:		%{name}-java-clone-cast.patch
#		Fix permissions of installed jar
#		https://savannah.cern.ch/bugs/?54434
Patch6:		%{name}-jar-perms.patch
#		Fix javadoc warnings
#		https://savannah.cern.ch/bugs/?54435
Patch7:		%{name}-javadoc.patch
#		Fix syntax errors in shell scripts
#		https://savannah.cern.ch/bugs/?54436
Patch8:		%{name}-shell-syntax.patch
#		Fix the database install script
#		https://savannah.cern.ch/bugs/?54880
Patch9:		%{name}-install-db.patch
#		Error message glitch
#		https://savannah.cern.ch/bugs/?55113
Patch10:	%{name}-notknown-msg.patch
#		Make the Java API build with gcj
#		https://savannah.cern.ch/bugs/?55115
Patch11:	%{name}-gcj.patch
#		Support older autotools and older gcc
#		https://savannah.cern.ch/bugs/?55116
Patch12:	%{name}-portability.patch
#		Support openssl 1.0
#		https://savannah.cern.ch/bugs/?55390
Patch13:	%{name}-openssl.patch
#		Unconditional use of PIPE_BUF
#		https://savannah.cern.ch/bugs/?55405
Patch14:	%{name}-pipe-buf.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	openssl-devel%{?_isa}
BuildRequires:	expat-devel
BuildRequires:	libtool
BuildRequires:	pkgconfig
BuildRequires:	libxslt
BuildRequires:	docbook-style-xsl
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

BuildRequires:	java-devel
BuildRequires:	jpackage-utils
BuildRequires:	bouncycastle >= 1.39
BuildRequires:	jakarta-commons-cli
BuildRequires:	jakarta-commons-lang
BuildRequires:	log4j
%if %{with_gcj}
BuildRequires:	java-gcj-compat-devel
%endif

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers libraries that applications using the VOMS functionality
will bind to.

%package devel
Summary:	Virtual Organization Membership Service Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	openssl-devel%{?_isa}
Requires:	automake

%description devel
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers header files for programming with the VOMS libraries.

%package doc
Summary:	Virtual Organization Membership Service Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif

%description doc
Documentation for the Virtual Organization Membership Service.

%package clients
Summary:	Virtual Organization Membership Service Clients
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%description clients
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package provides command line applications to access the VOMS
services.

%package server
Summary:	Virtual Organization Membership Service Server
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

Requires(pre):		shadow-utils
Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts

%description server
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

The service can be understood as an account database, which serves the
information in a special format (VOMS credential). The VO manager can
administrate it remotely using command line tools or a web interface.

%package -n vomsjapi
Summary:	Virtual Organization Membership Service Java API
Group:		Development/Libraries
Requires:	java
Requires:	jpackage-utils
Requires:	bouncycastle >= 1.39
Requires:	jakarta-commons-cli
Requires:	jakarta-commons-lang
Requires:	log4j
%if %{with_gcj}
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
%else
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
%endif

%description -n vomsjapi
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers a java client API for VOMS.

%package -n vomsjapi-javadoc
Summary:	Virtual Organization Membership Service Java API Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	jpackage-utils
Requires:	vomsjapi = %{version}-%{release}

%description -n vomsjapi-javadoc
Virtual Organization Membership Service (VOMS) Java API Documentation.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
	   -name '*.cc' -o -name '*.java' ')' -exec chmod a-x {} ';'

# Fix location dir
sed -e 's/\(LOCATION_DIR.*\)"\$prefix"/\1""/g' -i project/acinclude.m4

# Fix default Globus location
sed -e 's!\(GLOBUS_LOCATION\)!{\1:-/usr}!' -i project/voms.m4

# Fix default vomses file location
sed -e 's!/opt/glite/etc/vomses!/etc/vomses!' -i src/api/ccapi/voms_api.cc

# Use pdflatex
sed -e 's!^\(USE_PDFLATEX *= *\)NO!\1YES!' -i src/api/ccapi/Makefile.am

# Touch to avoid rerunning bison and flex
touch -r src/utils/vomsfake.y src/utils/vomsparser.h
touch -r src/utils/vomsfake.y src/utils/lex.yy.c

# rebootstrap
./autogen.sh

install -m 644 %{SOURCE1} INSTALL.Fedora

%build
%configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
	   --with-java-home=/usr --with-bc=/usr/share/java/bcprov.jar \
	   --with-log4j=/usr/share/java/log4j.jar \
	   --with-commons-cli=/usr/share/java/commons-cli.jar \
	   --with-commons-lang=/usr/share/java/commons-lang.jar

make %{?_smp_mflags}

( cd doc/apidoc/api/VOMS_C_API/latex ; make )
( cd doc/apidoc/api/VOMS_CC_API/latex ; make )

mkdir javadoc
cd javadoc
CLASSPATH=../src/api/java:$(build-classpath \
			    bcprov log4j commons-cli commons-lang) \
javadoc ../src/api/java/org/glite/voms/*.java \
	../src/api/java/org/glite/voms/ac/*.java \
	../src/api/java/org/glite/voms/contact/*.java
cd ..

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_bindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_sbindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/edg-voms*
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

mv $RPM_BUILD_ROOT%{_includedir}/glite/security/%{name} \
   $RPM_BUILD_ROOT%{_includedir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_includedir}/glite

rm $RPM_BUILD_ROOT%{_includedir}/%{name}/voms_apic_nog.h
rm $RPM_BUILD_ROOT%{_mandir}/man1/testvoms.1*
rm $RPM_BUILD_ROOT%{_mandir}/man8/voms-install-replica.8*

mv $RPM_BUILD_ROOT%{_datadir}/vomses.template \
   $RPM_BUILD_ROOT%{_datadir}/%{name}

mv $RPM_BUILD_ROOT%{_datadir}/m4 $RPM_BUILD_ROOT%{_datadir}/aclocal

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/vomsdir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

touch $RPM_BUILD_ROOT%{_sysconfdir}/vomses

sed -e 's!${datapath}/etc/voms/voms!${basepath}/share/voms/voms!' \
    -e 's/useradd/\#&/' -e 's/groupadd/\#&/' \
    -e 's/vomsd(8)/voms(8)/' \
    -i $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db

cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db << EOF
\$ECHO -en "--x509_user_cert=/etc/grid-security/voms/hostcert.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
\$ECHO -en "--x509_user_key=/etc/grid-security/voms/hostkey.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
EOF

# Turn off default enabling of the service
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
sed -e 's/\(chkconfig: \)\w*/\1-/' \
    -e '/Default-Start/d' \
    -e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
   $RPM_BUILD_ROOT%{_datadir}/init.d/%{name} > \
   $RPM_BUILD_ROOT%{_initrddir}/%{name}
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

mkdir -p VOMS_C_API
cp -pr doc/apidoc/api/VOMS_C_API/html VOMS_C_API
install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf VOMS_C_API

mkdir -p VOMS_CC_API
cp -pr doc/apidoc/api/VOMS_CC_API/html VOMS_CC_API
install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf VOMS_CC_API

mv $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar \
   $RPM_BUILD_ROOT%{_javadir}/vomsjapi-%{version}.jar
ln -s vomsjapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -pr javadoc $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi-%{version}
ln -s vomsjapi-%{version} $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre server
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || useradd -r -g %{name} \
    -d %{_sysconfdir}/%{name} -s /sbin/nologin -c "VOMS Server Account" %{name}
exit 0

%post server
if [ $1 = 1 ]; then
    /sbin/chkconfig --add %{name}
fi

%preun server
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del %{name}
fi

%postun server
if [ $1 -ge 1 ]; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%post -n vomsjapi
%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif

%postun -n vomsjapi
%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so.*
%{_libdir}/libvomsapi_nog.so.*
%{_libdir}/libvomsc.so.*
%config(noreplace) %{_sysconfdir}/vomses
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/vomsdir
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/vomses.template
%doc AUTHORS LICENSE

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so
%{_libdir}/libvomsapi_nog.so
%{_libdir}/libvomsc.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/acstack.h
%{_includedir}/%{name}/newformat.h
%{_includedir}/%{name}/vomsssl.h
%{_includedir}/%{name}/voms_api.h
%{_includedir}/%{name}/voms_api_nog.h
%{_includedir}/%{name}/voms_apic.h
%{_datadir}/aclocal/%{name}.m4

%files doc
%defattr(-,root,root,-)
%doc VOMS_C_API
%doc VOMS_CC_API

%files clients
%defattr(-,root,root,-)
%{_bindir}/voms-proxy-destroy
%{_bindir}/voms-proxy-info
%{_bindir}/voms-proxy-init
%{_bindir}/voms-proxy-fake
%{_bindir}/voms-proxy-list
%{_mandir}/man1/voms-proxy-destroy.1*
%{_mandir}/man1/voms-proxy-info.1*
%{_mandir}/man1/voms-proxy-init.1*
%{_mandir}/man1/voms-proxy-fake.1*
%{_mandir}/man1/voms-proxy-list.1*

%files server
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/grid-security/%{name}
%attr(-,voms,voms) %dir %{_localstatedir}/log/%{name}
%{_datadir}/%{name}/mysql2oracle
%{_datadir}/%{name}/upgrade1to2
%{_datadir}/%{name}/voms.data
%{_datadir}/%{name}/voms_install_db
%{_datadir}/%{name}/voms-ping
%{_datadir}/%{name}/voms_replica_master_setup.sh
%{_datadir}/%{name}/voms_replica_slave_setup.sh
%{_mandir}/man8/voms.8*
%doc INSTALL.Fedora

%files -n vomsjapi
%defattr(-,root,root,-)
%{_javadir}/vomsjapi.jar
%{_javadir}/vomsjapi-%{version}.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif
%doc AUTHORS LICENSE

%files -n vomsjapi-javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/vomsjapi
%doc %{_javadocdir}/vomsjapi-%{version}

%changelog
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0

* Thu Sep 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-3
- Add an empty /etc/vomses file to the main package to avoid error messages
- Let the voms user own only necessary directories
- Additional fixes for the server start-up script

* Tue Aug 25 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-2
- Add the /etc/voms directory to the server package
- Add setup instructions to the server package
- Run the server as non-root

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-1
- Upstream 1.9.11 (CVS tag glite-security-voms_R_1_9_11)
- Enable Java AOT bits

* Mon Jun 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.8.1-1
- Upstream 1.9.8.1 (CVS tag glite-security-voms_R_1_9_8_1)
- Build Java API

* Thu Feb 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.2-1
- Upstream 1.9.2 (CVS tag glite-security-voms_R_1_9_2)

* Fri Feb 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.1-1
- Upstream 1.9.1 (CVS tag glite-security-voms_R_1_9_1)

* Tue Jan 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.10-1
- Upstream 1.8.10 (CVS tag glite-security-voms_R_1_8_10)
- Rebuild against distribution Globus
- Add clear SSL error patch needed for openssl > 0.9.8b
- Add missing return value patch

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.9-1ng
- Upstream 1.8.9 (CVS tag glite-security-voms_R_1_8_9)
- Rebuild against Globus 4.0.8-0.11

* Thu May 15 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-4ng
- Add missing include patch

* Sat Apr 26 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-3ng
- Rebuild against Globus 4.0.7-0.10

* Sun Nov 25 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-2ng
- Fix GPT_LOCATION and GLOBUS_LOCATION detection in spec file

* Mon Oct 29 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-1ng
- Upstream 1.7.24 (CVS tag glite-security-voms_R_1_7_24_1)

* Mon Oct 15 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.23-1ng
- Upstream 1.7.23 (CVS tag glite-security-voms_R_1_7_23_1)

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-3ng
- Move /etc/voms/vomses back to /etc/vomses
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-2ng
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Mon Sep 10 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-1ng
- Try to link against system crypto library when Globus library is not
  available
- Make /etc/grid-security/vomsdir part of the voms sub-package
- Drop RPM prefix /etc
- Move the vomses.template to /etc/voms
- Use dashes instead of underscore in voms-install-replica.1 man page
- Do not try to link against system crypt library. Voms now
  does this internally.
- Upstream 1.7.22 (CVS tag glite-security-voms_R_1_7_22_1)

* Mon Jul 16 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-5ng
- Drop voms-struct_change.patch - problem is with libxml2

* Sat Jul 14 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-4ng
- Add missing openssl-devel dependency in voms-devel

* Thu Jul 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-3ng
- Add patch:
  - voms-struct_change.patch
    - Change API slightly - but now works with libxml2

* Thu Jul 08 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-2ng
- Make conditinal dependency on expat-devel (OpenSuSE 10.20 has only expat)

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-1ng
- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1) 

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-2ng
- Added patches:
  - voms-openssl_portability.patch
    - Support for newer OpenSSL-0.9.8
  - voms-isoc90_portability.patch
    - Support for older compilers
- Added openssl-devel build dependency

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-1ng
- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2) 
- Remove patches (use shell substitutions instead)
- Disable Java API build

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-3ng
- Added Globus dependencies to voms-devel

* Mon Jul 24 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-2ng
- Fix dependency typo: Requires -> BuildRequires

* Sat May 06 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-1ng
- Many changes since upstream changed quite a lot.
- Added README.NorduGrid with packaging information
- Patches:
  - voms_openssl-0.9.8.patch
    - Support for OpenSSL 0.9.8
  - voms_noglobusopenssl-1.6.20.patch
    - Use system openssl rather than the one from Globus
    - Patch reworked for voms 1.6.20
  - Dont use project based (gLite) include paths
- Pseudo patches (fixes made at runtime and not from static patch files)
  - Fix broken --libexecdir support for configure
    (some systems do not have libexecdir = <prefix>/libexec)
  - Drop all documents except man pages which are pre-generated
    (section 3 man pages are skipped as well)
  - Do not use edg- prefix
    (can be turned on/off through macro)
  - Install flavored libraries in addition to non-flavored
    (can be turned on/off through macro)
  - Put start-up script in /etc/init.d
  - Move configuration files from <prefix>/etc to /etc

* Mon Dec 19 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-2
- Add patch voms_doc.patch to disable html and ps documentation
  and add man-mages and pdf files to distribution (make dist)
- Use rpm switch: --define "_autotools_bootstrap 1" to rebuild
  documentation and create "make dist" target
- Add patch voms_nohardcodelibexecdir.patch which use the libexecdir
  from configure rather than the hardcoded prefix/libexec

* Sun Nov 27 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-1
- Add patch voms_ssl_include.patch to add external openssl includes.
  Would be better to query globus_openssl about this

* Tue Oct 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.7-1
- Modfiy voms_noglobusopenssl.patch to match upstream
- Add patch voms_nops.patch to disable postscript versions of
  reference manual

* Fri Jun 17 2005 Anders W??n?nen <waananen at nbi.dk> - 1.5.4-1
- Remove the following patches:
  - voms_namespace.patch - Fixed in upstream
  - voms_external_mysql++-1.4.1.patch - Obsolete since mysql++ is no
    longer needed
  - voms-no_libs.path - Fixed in upstream
- Add Globus dependencies

* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-3
- Do not hardcode Globus flavor but try to guess
- Remove explicit globus rpm Requirement
- Use external openssl - not globus_openssl

* Mon May 02 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-2
- Remove automake cache
- Add explicit dependency on mysql++-devel

* Sat Apr 30 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-1
- New upstream
- autogen.sh -> autobuild.sh

* Mon Apr 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.3.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:08:49 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:31:49 -0000	1.2
@@ -0,0 +1 @@
+voms-1.9.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:08:49 -0000	1.1
+++ sources	10 Sep 2009 02:31:49 -0000	1.2
@@ -0,0 +1 @@
+86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:34:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:34:27 +0000 (UTC)
Subject: rpms/voms/F-11 import.log, NONE, 1.1 voms-distribution-globus.patch,
	NONE, 1.1 voms-extra-vomses-java.patch, NONE,
	1.1 voms-fix-enable-glite.patch, NONE, 1.1 voms-gcj.patch, NONE,
	1.1 voms-initscript.patch, NONE, 1.1 voms-install-db.patch, NONE,
	1.1 voms-jar-perms.patch, NONE, 1.1 voms-java-clone-cast.patch,
	NONE, 1.1 voms-javadoc.patch, NONE, 1.1 voms-nolib64.patch, NONE,
	1.1 voms-notknown-msg.patch, NONE, 1.1 voms-openssl.patch, NONE,
	1.1 voms-pipe-buf.patch, NONE, 1.1 voms-portability.patch, NONE,
	1.1 voms-shell-syntax.patch, NONE, 1.1 voms.INSTALL, NONE,
	1.1 voms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910023427.EEEE011C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19526/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-distribution-globus.patch 
	voms-extra-vomses-java.patch voms-fix-enable-glite.patch 
	voms-gcj.patch voms-initscript.patch voms-install-db.patch 
	voms-jar-perms.patch voms-java-clone-cast.patch 
	voms-javadoc.patch voms-nolib64.patch voms-notknown-msg.patch 
	voms-openssl.patch voms-pipe-buf.patch voms-portability.patch 
	voms-shell-syntax.patch voms.INSTALL voms.spec 
Log Message:
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0



--- NEW FILE import.log ---
voms-1_9_11-4_fc11:F-11:voms-1.9.11-4.fc11.src.rpm:1252550034

voms-distribution-globus.patch:
 acinclude.m4 |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE voms-distribution-globus.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
@@ -66,11 +66,6 @@
 # ---------------------------------------------
 AC_DEFUN([AC_OPENSSL],
 [
-  AC_ARG_WITH(openssl_prefix,
-              [ --with-openssl-prefix=PFX    prefix where OpenSSL (non-globus) is installed. (/usr)],
-              [with_openssl_prefix="$withval"],
-              [with_openssl_prefix=/usr])
-
   AC_ARG_WITH(openssl_libs,
               [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
               [ with_openssl_libs="$withval"],
@@ -80,16 +75,11 @@
      AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
   fi  
 
-  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
-
-  AC_LANG_PUSH(C)
-  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
-  AC_LANG_POP(C) 
+  PKG_CHECK_MODULES(OPENSSL, [openssl], [
+  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+  found=yes], [found=no])
 
   if test "x$found" = "xyes"; then
-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
     AC_SUBST(NO_GLOBUS_FLAGS)
     AC_SUBST(OPENSSL_LIBS)
     AC_MSG_CHECKING([for system OpenSSL version])
@@ -105,11 +95,10 @@
 #include <openssl/opensslv.h>
 OPENSSL_VERSION_TEXT
 HERE
-    openssl_version=`$CPP -I$NO_GLOBUS_FLAGS -o - -P conftest.h`
+    openssl_version=`$CPP $NO_GLOBUS_FLAGS -o - -P conftest.h`
     AC_MSG_RESULT($openssl_version)
     rm -f conftest.h
   fi
-  LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 ])
 
 # AC_GLOBUS checks globus prefix, looks for globus 
@@ -119,6 +108,11 @@
 # -------------------------------------------------------
 AC_DEFUN([AC_GLOBUS],
 [
+    PKG_CHECK_MODULES(GLOBUS_GSS, [globus-gssapi-gsi globus-gss-assist], [
+    GLOBUS_CFLAGS=$GLOBUS_GSS_CFLAGS
+    PKG_CHECK_MODULES(GLOBUS_GSS_API, [openssl])
+    ], [
+
     AC_ARG_WITH(globus_prefix,
 	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
 	[with_globus_prefix="$withval"],
@@ -165,6 +159,8 @@
 
     AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
 
+    ])
+
     if test "x$with_globus_flavor" = "x" ; then
       if test "x$USE_OLDGAA_LIB" = "x"; then
         USE_OLDGAA_LIB="liboldgaa.la"

voms-extra-vomses-java.patch:
 VOMSESFileParser.java |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE voms-extra-vomses-java.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2009-07-01 15:06:24.328378870 +0200
@@ -62,6 +62,12 @@
 
         List list = new ArrayList();
 
+        File defaultLocFile = new File( File.separator + "etc"
+                + File.separator + "vomses" );
+
+        if ( defaultLocFile.exists() )
+            list.add( defaultLocFile );
+
         if ( gliteLoc != null ) {
             File gliteLocFile = new File( gliteLoc + File.separator + "etc"
                     + File.separator + "vomses" );
@@ -97,6 +103,12 @@
         if ( gliteVomses.exists() )
             list.add( gliteVomses );
 
+        File vomsVomses = new File( System.getProperty( "user.home" )
+                + File.separator + ".voms" + File.separator + "vomses" );
+
+        if ( vomsVomses.exists() )
+            list.add( vomsVomses );
+
         vomsesPaths = list;
 
     }

voms-fix-enable-glite.patch:
 acinclude.m4 |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE voms-fix-enable-glite.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-07-01 13:03:05.768376649 +0200
@@ -587,12 +587,18 @@
 [
     AC_ARG_ENABLE(glite,
         [  --enable-glite     enable gLite  ],
-        [ac_enable_glite="yes"],
-        [ac_enable_glite="no"])
+        [
+          case "$enableval" in
+          yes) glite="yes" ;;
+          no) glite="no" ;;
+          *) AC_MSG_ERROR(bad value $(enableval) for --enable-glite) ;;
+          esac
+        ],
+        [glite="yes"])
 
-    AM_CONDITIONAL(ENABLE_GLITE, test x$ac_enable_glite = xyes)
+    AM_CONDITIONAL(ENABLE_GLITE, test x$glite = xyes)
 
-    if test "x$ac_enable_glite" = "xno"; then
+    if test "x$glite" = "xno"; then
     	DISTTAR=$WORKDIR
     	AC_SUBST(DISTTAR)
 #	EDG_SET_RPM_TOPDIR
@@ -601,7 +607,7 @@
     	AC_SUBST(VAR_LOCATION_ENV, "VOMS_LOCATION_VAR")
     	AC_DEFINE(LOCATION_ENV, "VOMS_LOCATION", [Environment variable name])
     	AC_DEFINE_UNQUOTED(LOCATION_DIR, "$prefix", [Location of system directory])
-    	AC_DEFINE(USER_DIR, ".edg", [Location of user directory])
+    	AC_DEFINE(USER_DIR, ".voms", [Location of user directory])
     else
     	AC_MSG_RESULT([Preparing for gLite environment])
     	AC_GLITE

voms-gcj.patch:
 BasicVOMSTrustStore.java |  682 -----------------------------------------------
 DirectoryList.java       |  142 +++++++++
 FileCertReader.java      |  492 +++++++++++++++++++++++++++++++++
 FileEndingIterator.java  |  137 +++++++++
 4 files changed, 771 insertions(+), 682 deletions(-)

--- NEW FILE voms-gcj.patch ---
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-08-29 07:52:08.000000000 +0200
@@ -13,69 +13,11 @@
  * follows.
  *
  *********************************************************************/
-/*
- * Copyright (c) Members of the EGEE Collaboration. 2004.
- * See http://eu-egee.org/partners/ for details on the copyright holders.
- * For license conditions see the license file or http://eu-egee.org/license.html
- */
-
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * DirectoryList.java
- *
- * @author  Joni Hahkala
- * Created on December 10, 2001, 6:50 PM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileEndingIterator.java
- *
- * @author  Joni Hahkala
- * Created on December 3, 2001, 9:16 AM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileCertReader.java
- *
- * @author  Joni Hahkala
- * Created on March 27, 2002, 8:24 PM
- */
 
 package org.glite.voms;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.PrivateKey;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -86,632 +28,8 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ASN1InputStream;
 import org.glite.voms.ac.ACTrustStore;
 
-/** Lists all the files in the given directory that end with
- * a certain ending.
- */
-class FileEndingIterator {
-    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
-
-    /** The file ending.
-     */
-    protected String ending;
-
-    /** A flag to show that there are more files that match.
-     */
-    protected boolean nextFound = false;
-
-    /** The list of files in the directory.
-     */
-    protected File[] fileList;
-
-    /** The index of the next match in the fileList.
-     */
-    protected int index = 0;
-
-    /** Creates new FileIterator and searches the first match.
-     * @param path The directory used for the file search.
-     * @param ending The file ending to search for.
-     */
-    public FileEndingIterator(String path, String ending) {
-        this.ending = ending;
-
-        try {
-            // open the directory
-            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
-
-            // list the files and dirs inside
-            fileList = directory.listFiles();
-
-            // find the first match for the ending
-            nextFound = findNext();
-        } catch (Exception e) {
-            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
-
-            //            e.printStackTrace();
-            return;
-        }
-    }
-
-    /** Used to get the next matching file.
-     * @return Returns the next matching file.
-     */
-    public File next() {
-        if (nextFound == false) {
-            return null;
-        }
-
-        File current = fileList[index++];
-
-        nextFound = findNext();
-
-        return current;
-    }
-
-    /** Used to check that there are more matching files to get
-     * using next().
-     * @return Returns true if there are more matching files.
-     */
-    public boolean hasNext() {
-        return nextFound;
-    }
-
-    /** Finds the next matching file in the list of files.
-     * @return Returns true if a matching file was found.
-     */
-    protected boolean findNext() {
-        try {
-            // search the next file with proper ending
-            while ((index < fileList.length) &&
-                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
-                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
-                index++;
-            }
-        } catch (Exception e) {
-            logger.error("Error while reading directory " + e.getMessage());
-
-            //            e.printStackTrace(System.out);
-            return false;
-        }
-
-        // check if the loop ended because of a match or because running out of choices.
-        if (index < fileList.length) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-/** Reads all certificates from given files, accepts binary form of DER encoded certs and
- * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
- * the actual certificate that has to begin with "-----BEGIN".
- * Should accept multiple certs in one file, not tested!
- */
-class FileCertReader {
-    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
-    static final int BUF_LEN = 1000;
-    static final byte CARR = '\r';
-    static final byte NL = '\n';
-
-    /** The type for TrustAnchor
-     */
-    static final int TYPE_ANCHOR = 100;
-
-    /** The type for certificate revocation list
-     */
-    static final int TYPE_CRL = 101;
-
-    /** the type for X509 certificate
-     */
-    static final int TYPE_CERT = 102;
-
-    static {
-        if (Security.getProvider("BC") == null) {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    CertificateFactory certFactory;
-
-    /** Creates a new instance of CertReader. */
-    public FileCertReader() throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", "BC");
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider.
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(Provider provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(String provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument. See DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if certificate reading from the files
-     * fails.
-     * @return Returns the Vector of certificates read.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCerts(String files) throws IOException, CertificateException {
-        Vector certs = readFiles(files, TYPE_CERT);
-
-        Iterator certIter = certs.iterator();
-
-        logger.debug("read certs: ");
-
-        while (certIter.hasNext()) {
-            X509Certificate cert = (X509Certificate) certIter.next();
-            logger.debug("Read cert: " + cert.getSubjectDN().toString());
-        }
-
-        return certs;
-    }
-
-    public PrivateKey readPrivateKey(String file) throws IOException {
-        File keyfile = new File(file);
-
-        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
-        skipToKeyBeginning(fis);
-
-        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument and makes TrustAnchors from them. See
-     * DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the certificate reading fails.
-     * @return Returns a Vector of TrustAnchors read from the
-     * files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readAnchors(String files) throws IOException, CertificateException {
-        Vector anchors = readFiles(files, TYPE_ANCHOR);
-
-        Iterator anchorIter = anchors.iterator();
-
-        logger.debug("read TrustAnchors: ");
-
-        while (anchorIter.hasNext()) {
-            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
-            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
-        }
-
-        return anchors;
-    }
-
-    /** Reads the certificate revocation lists (CRLs) from the
-     * files defined in the argument. See DirectoryList for
-     * file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the CRL reading failed.
-     * @return Returns a vector of CRLs read from the files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCRLs(String files) throws IOException, CertificateException {
-        Vector crls = readFiles(files, TYPE_CRL);
-
-        Iterator crlIter = crls.iterator();
-
-        logger.debug("read CRLs: ");
-
-        while (crlIter.hasNext()) {
-            X509CRL crl = (X509CRL) crlIter.next();
-            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
-        }
-
-        return crls;
-    }
-
-    /** Reads the certificates or CRLs from the files defined by
-     * the first argument, see DirectoryList for file definition
-     * format.
-     * @param files The file definition.
-     * @param type The type of things to read from the files.
-     * Currently supported are TYPE_ANCHOR,
-     * TYPE_CRL and TYPE_CERT defined in this class.
-     * @throws CertificateException Thrown if the reading of files fails.
-     * @return Returns a Vector of objects of type given that
-     * were read from the files given.
-     * @see org.glite.security.util.DirectoryList
-     */
-    private Vector readFiles(String files, int type) throws CertificateException {
-        Vector storeVector = new Vector();
-
-        try {
-            // load CA certificates
-            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
-
-            Iterator CAFileIter = dir.getListing().iterator();
-
-            // go through the files
-            while (CAFileIter.hasNext()) { // go through the files reading the certificates
-
-                File nextFile = (File) CAFileIter.next();
-
-                storeVector.addAll(readFile(nextFile, type));
-            }
-        } catch (IOException e) {
-            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
-
-            throw new CertificateException("Error while reading certificates or CRLs: " +
-                e.getMessage());
-        }
-
-        return storeVector;
-    }
-
-    /** Reads the objects of given type from the File.
-     * @param certFile The file to read.
-     * @param type The type of objects to read form the file.
-     * @throws IOException Thrown if the reading of objects of given type
-     * fails.
-     * @return Returns the Vector of objects read form the file.
-     */
-    public Vector readFile(File certFile, int type) throws IOException {
-        BufferedInputStream binStream = null;
-        Vector objects = new Vector();
-
-        try {
-            // get the buffered stream to facilitate marking
-            binStream = new BufferedInputStream(new FileInputStream(certFile));
-
-            while (binStream.available() > 0) {
-                Object obj = objectReader(binStream, type);
-
-                if (obj != null) {
-                    objects.add(obj);
-                }
-
-                skipEmptyLines(binStream);
-            }
-        } catch (Exception e) {
-            logger.fatal("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-
-            throw new IOException("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-        } finally {
-            if (binStream != null) {
-                binStream.close();
-            }
-        }
-
-        return objects;
-    }
-
-    /** Reads a certificate or a CRL from the stream, doing some
-     * error correction.
-     * @param binStream The stream to read the object from.
-     * @param type The type of object to read from the stream.
-     * @throws CertificateException Thrown if an error occurs while reading the object.
-     * @throws IOException Thrown if an error occurs while reading the object.
-     * @return Returns the object read.
-     */
-    public Object objectReader(BufferedInputStream binStream, int type)
-        throws CertificateException, IOException {
-        Object object = null;
-        int errors = 0; // no errors in the beginning
-        binStream.mark(10000);
-
-        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
-             // second with skipping possible garbage in the beginning.
-
-            try {
-                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
-                    // before the actual base64 encoded certificate
-                    errors = 2; // if this try fails, don't try anymore
-
-                    skipToCertBeginning(binStream); // skip the garbage
-                }
-
-                binStream.mark(100000);
-
-                binStream.reset();
-
-                object = readObject(binStream, type);
-            } catch (Exception e) {
-                if (errors != 0) { // if the error persists after first pass, fail
-                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
-                    throw new CertificateException("Certificate or CRL reading failed: " +
-                        e.getMessage());
-                }
-
-                errors = 1; // first try failed, try again with skipping
-                binStream.reset(); // rewind the file to the beginning of this try
-            }
-        } while (errors == 1); // try again after first try
-
-        return object;
-    }
-
-    /** Does the actual reading of the object.
-     * @param binStream The stream to read the object from.
-     * @param type The type of the object.
-     * @throws CertificateException Thrown if there is a problem reading the object.
-     * @return Returns the object read or null if no object was found.
-     */
-    public Object readObject(BufferedInputStream binStream, int type)
-        throws CertificateException {
-        Object obj;
-
-        if (type == TYPE_CRL) { // reading certificate revocation lists
-
-            try {
-                obj = certFactory.generateCRL(binStream);
-            } catch (CRLException e) {
-                logger.error("CRL loading failed: " + e.getMessage());
-                throw new CertificateException(e.getMessage());
-            }
-        } else { // reading certs or trust anchors
-
-            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
-
-            if (cert == null) {
-                return null;
-            }
-
-            if (type == TYPE_ANCHOR) {
-                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
-                obj = new TrustAnchor(cert, null);
-            } else {
-                if (type == TYPE_CERT) {
-                    obj = cert;
-                } else {
-                    logger.fatal("Internal error: Invalid data type " + type +
-                        " when trying to read certificate");
-                    throw new CertificateParsingException("Internal error: Invalid data type " +
-                        type + " when trying to read certificate");
-                }
-            }
-        }
-
-        return obj;
-    }
-
-    /** Skips everything in front of "-----BEGIN" in the stream.
-     * @param stream The stream to read and skip.
-     * @throws IOException Thrown if there is a problem skipping.
-     */
-    static public void skipToCertBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    static public void skipToKeyBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1)
-                index = buffer.indexOf("----BEGIN ENCRYPTED");
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    /** Skips empty lines in the stream.
-     * @param stream The stream possibly containing empty lines.
-     * @throws IOException Thrown if a problem occurs.
-     */
-    static public void skipEmptyLines(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-
-            int i = 0;
-
-            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
-                i++;
-            }
-
-            stream.reset();
-            stream.skip(i);
-
-            if (i < num) {
-                stream.mark(10000);
-
-                return;
-            } else {
-                stream.mark(BUF_LEN);
-            }
-        }
-    }
-}
-
-/** This class lists all the files defined in the constructor.
- * The definitions can be in three forms.
- * 1. absolute file (/tmp/test.txt)
- * 2. absolute path (/tmp)
- * 3. a wildcard file (/tmp/*.txt)
- *
- * In case 1. only the file is returned.
- * In case 2. all files in the directory are returned
- * In case 3. all the files in the directory tmp having
- * the .txt ending are returned.
- *
- * The returning means the return of the getListing method.
- */
-class DirectoryList {
-    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
-    List files = null;
-
-    /** Creates a new instance of DirectoryList
-     * @param path The file definition, see class description above.
-     * @throws Exception Thrown if the path was invalid
-     */
-    public DirectoryList(String path) throws IOException {
-        // splits the absolute? filename from the wildcard
-        String[] parts = path.split("\\*");
-
-        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
-        if ((parts.length < 1) || (parts.length > 2)) {
-            return;
-        }
-
-        // check whether the first and only part is a file or directory
-        if (parts.length == 1) {
-            // open the directory or file
-            File fileOrDir = new File(parts[0]);
-
-            // if the path given was fully specified filename
-            if (fileOrDir.isFile()) {
-                // set the file as the only member in the vector and finish
-                files = new Vector();
-                files.add(fileOrDir);
-
-                return;
-            }
-
-            // the path defined a directory, so get all files
-            File[] fileDirArray;
-
-            // list the files and dirs inside
-            fileDirArray = fileOrDir.listFiles();
-
-            if (fileDirArray == null) {
-                logger.error("No files found matching " + path);
-                throw new IOException("No files found matching " + path);
-            }
-
-            // get the array containing all the files and directories
-            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
-
-            files = new Vector();
-
-            // add all the files to the files list and finish
-            while (filesAndDirs.hasNext()) {
-                File nextFile = (File) filesAndDirs.next();
-
-                if (nextFile.isFile()) {
-                    files.add(nextFile);
-                }
-            }
-
-            return;
-        } else {
-            // this is a directory+ending combination
-            files = new Vector();
-
-            // get all the files matching the definition.
-            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
-
-            while (iterator.hasNext()) {
-                files.add(iterator.next());
-            }
-
-            return;
-        }
-    }
-
-    /** Used to get the file listing, the list of files matching
-     * the definition in constructor.
-     * @return Returns the list of files matching the definition
-     * given in the constructor.
-     */
-    public List getListing() {
-        return files;
-    }
-}
 
 /**
  * @deprecated  This class does not expose the necessary information. Use
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java	2009-08-29 07:22:01.000000000 +0200
@@ -0,0 +1,142 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * DirectoryList.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 10, 2001, 6:50 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+
+/** This class lists all the files defined in the constructor.
+ * The definitions can be in three forms.
+ * 1. absolute file (/tmp/test.txt)
+ * 2. absolute path (/tmp)
+ * 3. a wildcard file (/tmp/*.txt)
+ *
+ * In case 1. only the file is returned.
+ * In case 2. all files in the directory are returned
+ * In case 3. all the files in the directory tmp having
+ * the .txt ending are returned.
+ *
+ * The returning means the return of the getListing method.
+ */
+class DirectoryList {
+    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
+    List files = null;
+
+    /** Creates a new instance of DirectoryList
+     * @param path The file definition, see class description above.
+     * @throws Exception Thrown if the path was invalid
+     */
+    public DirectoryList(String path) throws IOException {
+        // splits the absolute? filename from the wildcard
+        String[] parts = path.split("\\*");
+
+        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
+        if ((parts.length < 1) || (parts.length > 2)) {
+            return;
+        }
+
+        // check whether the first and only part is a file or directory
+        if (parts.length == 1) {
+            // open the directory or file
+            File fileOrDir = new File(parts[0]);
+
+            // if the path given was fully specified filename
+            if (fileOrDir.isFile()) {
+                // set the file as the only member in the vector and finish
+                files = new Vector();
+                files.add(fileOrDir);
+
+                return;
+            }
+
+            // the path defined a directory, so get all files
+            File[] fileDirArray;
+
+            // list the files and dirs inside
+            fileDirArray = fileOrDir.listFiles();
+
+            if (fileDirArray == null) {
+                logger.error("No files found matching " + path);
+                throw new IOException("No files found matching " + path);
+            }
+
+            // get the array containing all the files and directories
+            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
+
+            files = new Vector();
+
+            // add all the files to the files list and finish
+            while (filesAndDirs.hasNext()) {
+                File nextFile = (File) filesAndDirs.next();
+
+                if (nextFile.isFile()) {
+                    files.add(nextFile);
+                }
+            }
+
+            return;
+        } else {
+            // this is a directory+ending combination
+            files = new Vector();
+
+            // get all the files matching the definition.
+            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
+
+            while (iterator.hasNext()) {
+                files.add(iterator.next());
+            }
+
+            return;
+        }
+    }
+
+    /** Used to get the file listing, the list of files matching
+     * the definition in constructor.
+     * @return Returns the list of files matching the definition
+     * given in the constructor.
+     */
+    public List getListing() {
+        return files;
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java	2009-08-29 07:55:09.000000000 +0200
@@ -0,0 +1,492 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileCertReader.java
+ *
+ * @author  Joni Hahkala
+ * Created on March 27, 2002, 8:24 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.cert.CRLException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.asn1.ASN1InputStream;
+
+/** Reads all certificates from given files, accepts binary form of DER encoded certs and
+ * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
+ * the actual certificate that has to begin with "-----BEGIN".
+ * Should accept multiple certs in one file, not tested!
+ */
+class FileCertReader {
+    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
+    static final int BUF_LEN = 1000;
+    static final byte CARR = '\r';
+    static final byte NL = '\n';
+
+    /** The type for TrustAnchor
+     */
+    static final int TYPE_ANCHOR = 100;
+
+    /** The type for certificate revocation list
+     */
+    static final int TYPE_CRL = 101;
+
+    /** the type for X509 certificate
+     */
+    static final int TYPE_CERT = 102;
+
+    static {
+        if (Security.getProvider("BC") == null) {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+    }
+
+    CertificateFactory certFactory;
+
+    /** Creates a new instance of CertReader. */
+    public FileCertReader() throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", "BC");
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider.
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(Provider provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(String provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument. See DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if certificate reading from the files
+     * fails.
+     * @return Returns the Vector of certificates read.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCerts(String files) throws IOException, CertificateException {
+        Vector certs = readFiles(files, TYPE_CERT);
+
+        Iterator certIter = certs.iterator();
+
+        logger.debug("read certs: ");
+
+        while (certIter.hasNext()) {
+            X509Certificate cert = (X509Certificate) certIter.next();
+            logger.debug("Read cert: " + cert.getSubjectDN().toString());
+        }
+
+        return certs;
+    }
+
+    public PrivateKey readPrivateKey(String file) throws IOException {
+        File keyfile = new File(file);
+
+        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
+        skipToKeyBeginning(fis);
+
+        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument and makes TrustAnchors from them. See
+     * DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the certificate reading fails.
+     * @return Returns a Vector of TrustAnchors read from the
+     * files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readAnchors(String files) throws IOException, CertificateException {
+        Vector anchors = readFiles(files, TYPE_ANCHOR);
+
+        Iterator anchorIter = anchors.iterator();
+
+        logger.debug("read TrustAnchors: ");
+
+        while (anchorIter.hasNext()) {
+            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
+            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
+        }
+
+        return anchors;
+    }
+
+    /** Reads the certificate revocation lists (CRLs) from the
+     * files defined in the argument. See DirectoryList for
+     * file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the CRL reading failed.
+     * @return Returns a vector of CRLs read from the files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCRLs(String files) throws IOException, CertificateException {
+        Vector crls = readFiles(files, TYPE_CRL);
+
+        Iterator crlIter = crls.iterator();
+
+        logger.debug("read CRLs: ");
+
+        while (crlIter.hasNext()) {
+            X509CRL crl = (X509CRL) crlIter.next();
+            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
+        }
+
+        return crls;
+    }
+
+    /** Reads the certificates or CRLs from the files defined by
+     * the first argument, see DirectoryList for file definition
+     * format.
+     * @param files The file definition.
+     * @param type The type of things to read from the files.
+     * Currently supported are TYPE_ANCHOR,
+     * TYPE_CRL and TYPE_CERT defined in this class.
+     * @throws CertificateException Thrown if the reading of files fails.
+     * @return Returns a Vector of objects of type given that
+     * were read from the files given.
+     * @see org.glite.voms.DirectoryList
+     */
+    private Vector readFiles(String files, int type) throws CertificateException {
+        Vector storeVector = new Vector();
+
+        try {
+            // load CA certificates
+            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
+
+            Iterator CAFileIter = dir.getListing().iterator();
+
+            // go through the files
+            while (CAFileIter.hasNext()) { // go through the files reading the certificates
+
+                File nextFile = (File) CAFileIter.next();
+
+                storeVector.addAll(readFile(nextFile, type));
+            }
+        } catch (IOException e) {
+            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
+
+            throw new CertificateException("Error while reading certificates or CRLs: " +
+                e.getMessage());
+        }
+
+        return storeVector;
+    }
+
+    /** Reads the objects of given type from the File.
+     * @param certFile The file to read.
+     * @param type The type of objects to read form the file.
+     * @throws IOException Thrown if the reading of objects of given type
+     * fails.
+     * @return Returns the Vector of objects read form the file.
+     */
+    public Vector readFile(File certFile, int type) throws IOException {
+        BufferedInputStream binStream = null;
+        Vector objects = new Vector();
+
+        try {
+            // get the buffered stream to facilitate marking
+            binStream = new BufferedInputStream(new FileInputStream(certFile));
+
+            while (binStream.available() > 0) {
+                Object obj = objectReader(binStream, type);
+
+                if (obj != null) {
+                    objects.add(obj);
+                }
+
+                skipEmptyLines(binStream);
+            }
+        } catch (Exception e) {
+            logger.fatal("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+
+            throw new IOException("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+        } finally {
+            if (binStream != null) {
+                binStream.close();
+            }
+        }
+
+        return objects;
+    }
+
+    /** Reads a certificate or a CRL from the stream, doing some
+     * error correction.
+     * @param binStream The stream to read the object from.
+     * @param type The type of object to read from the stream.
+     * @throws CertificateException Thrown if an error occurs while reading the object.
+     * @throws IOException Thrown if an error occurs while reading the object.
+     * @return Returns the object read.
+     */
+    public Object objectReader(BufferedInputStream binStream, int type)
+        throws CertificateException, IOException {
+        Object object = null;
+        int errors = 0; // no errors in the beginning
+        binStream.mark(10000);
+
+        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
+             // second with skipping possible garbage in the beginning.
+
+            try {
+                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
+                    // before the actual base64 encoded certificate
+                    errors = 2; // if this try fails, don't try anymore
+
+                    skipToCertBeginning(binStream); // skip the garbage
+                }
+
+                binStream.mark(100000);
+
+                binStream.reset();
+
+                object = readObject(binStream, type);
+            } catch (Exception e) {
+                if (errors != 0) { // if the error persists after first pass, fail
+                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
+                    throw new CertificateException("Certificate or CRL reading failed: " +
+                        e.getMessage());
+                }
+
+                errors = 1; // first try failed, try again with skipping
+                binStream.reset(); // rewind the file to the beginning of this try
+            }
+        } while (errors == 1); // try again after first try
+
+        return object;
+    }
+
+    /** Does the actual reading of the object.
+     * @param binStream The stream to read the object from.
+     * @param type The type of the object.
+     * @throws CertificateException Thrown if there is a problem reading the object.
+     * @return Returns the object read or null if no object was found.
+     */
+    public Object readObject(BufferedInputStream binStream, int type)
+        throws CertificateException {
+        Object obj;
+
+        if (type == TYPE_CRL) { // reading certificate revocation lists
+
+            try {
+                obj = certFactory.generateCRL(binStream);
+            } catch (CRLException e) {
+                logger.error("CRL loading failed: " + e.getMessage());
+                throw new CertificateException(e.getMessage());
+            }
+        } else { // reading certs or trust anchors
+
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
+
+            if (cert == null) {
+                return null;
+            }
+
+            if (type == TYPE_ANCHOR) {
+                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
+                obj = new TrustAnchor(cert, null);
+            } else {
+                if (type == TYPE_CERT) {
+                    obj = cert;
+                } else {
+                    logger.fatal("Internal error: Invalid data type " + type +
+                        " when trying to read certificate");
+                    throw new CertificateParsingException("Internal error: Invalid data type " +
+                        type + " when trying to read certificate");
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    /** Skips everything in front of "-----BEGIN" in the stream.
+     * @param stream The stream to read and skip.
+     * @throws IOException Thrown if there is a problem skipping.
+     */
+    static public void skipToCertBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    static public void skipToKeyBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1)
+                index = buffer.indexOf("----BEGIN ENCRYPTED");
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    /** Skips empty lines in the stream.
+     * @param stream The stream possibly containing empty lines.
+     * @throws IOException Thrown if a problem occurs.
+     */
+    static public void skipEmptyLines(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+
+            int i = 0;
+
+            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
+                i++;
+            }
+
+            stream.reset();
+            stream.skip(i);
+
+            if (i < num) {
+                stream.mark(10000);
+
+                return;
+            } else {
+                stream.mark(BUF_LEN);
+            }
+        }
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java	2009-08-29 07:24:52.000000000 +0200
@@ -0,0 +1,137 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileEndingIterator.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 3, 2001, 9:16 AM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+
+/** Lists all the files in the given directory that end with
+ * a certain ending.
+ */
+class FileEndingIterator {
+    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
+
+    /** The file ending.
+     */
+    protected String ending;
+
+    /** A flag to show that there are more files that match.
+     */
+    protected boolean nextFound = false;
+
+    /** The list of files in the directory.
+     */
+    protected File[] fileList;
+
+    /** The index of the next match in the fileList.
+     */
+    protected int index = 0;
+
+    /** Creates new FileIterator and searches the first match.
+     * @param path The directory used for the file search.
+     * @param ending The file ending to search for.
+     */
+    public FileEndingIterator(String path, String ending) {
+        this.ending = ending;
+
+        try {
+            // open the directory
+            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
+
+            // list the files and dirs inside
+            fileList = directory.listFiles();
+
+            // find the first match for the ending
+            nextFound = findNext();
+        } catch (Exception e) {
+            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
+
+            //            e.printStackTrace();
+            return;
+        }
+    }
+
+    /** Used to get the next matching file.
+     * @return Returns the next matching file.
+     */
+    public File next() {
+        if (nextFound == false) {
+            return null;
+        }
+
+        File current = fileList[index++];
+
+        nextFound = findNext();
+
+        return current;
+    }
+
+    /** Used to check that there are more matching files to get
+     * using next().
+     * @return Returns true if there are more matching files.
+     */
+    public boolean hasNext() {
+        return nextFound;
+    }
+
+    /** Finds the next matching file in the list of files.
+     * @return Returns true if a matching file was found.
+     */
+    protected boolean findNext() {
+        try {
+            // search the next file with proper ending
+            while ((index < fileList.length) &&
+                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
+                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
+                index++;
+            }
+        } catch (Exception e) {
+            logger.error("Error while reading directory " + e.getMessage());
+
+            //            e.printStackTrace(System.out);
+            return false;
+        }
+
+        // check if the loop ended because of a match or because running out of choices.
+        if (index < fileList.length) {
+            return true;
+        }
+
+        return false;
+    }
+}

voms-initscript.patch:
 voms.start.in |  186 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 64 deletions(-)

--- NEW FILE voms-initscript.patch ---
diff -ur voms-1.9.11.orig/src/install/voms.start.in voms-1.9.11/src/install/voms.start.in
--- voms-1.9.11.orig/src/install/voms.start.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms.start.in	2009-09-03 10:10:17.574074641 +0200
@@ -19,9 +19,19 @@
 #	voms servers.
 #
 # chkconfig: 2345 95 05
-# description: VOMS stands for Virtual Organization Membership System.
+# description: Virtual Organization Membership Service
 # processname: voms
 # pidfile: /var/run/voms.pid
+#
+### BEGIN INIT INFO
+# Provides:          voms
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Virtual Organization Membership Service
+# Description:       Virtual Organization Membership Service
+### END INIT INFO
 
 # Source networking configuration and check that networking is up.
 if [ -r /etc/sysconfig/network ] ; then
@@ -31,9 +41,16 @@
 
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
- at VAR_LOCATION_ENV@=${@VAR_LOCATION_ENV@:-$@LOCATION_ENV@/var}
 
-# check whether $@VAR_LOCATION_ENV@/var/lock/subsys exists
+if [ -z "$@VAR_LOCATION_ENV@" ] ; then
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
+fi
+
+# check whether $@VAR_LOCATION_ENV@/lock/subsys exists
 if ! test -d $@VAR_LOCATION_ENV@/lock/subsys ; then
     mkdir -p $@VAR_LOCATION_ENV@/lock/subsys
 fi
@@ -41,19 +58,38 @@
 # Default path
 basepath=$@LOCATION_ENV@
 binpath=${basepath}/sbin
-etcpath=${basepath}/etc
 
-# Source an auxiliary profile file if we have one, and pick up VOMS_OPTIONS and VOMS_USER
-if [ -r ${etcpath}/profile.d/voms.sh ] ; then
-    . ${etcpath}/profile.d/voms.sh
+if [ "$basepath" = "/usr" ] ; then
+    etcpath=/etc
+else
+    etcpath=${basepath}/etc
+fi
+
+RUN=yes
+
+# Source an auxiliary profile file if we have one and pick up VOMS_USER and RUN
+if [ -r ${etcpath}/default/voms ] ; then
+    . ${etcpath}/default/voms
+fi
+if [ -r ${etcpath}/sysconfig/voms ] ; then
+    . ${etcpath}/sysconfig/voms
+fi
+
+# Don't run until configuration is done
+if [ "x$RUN" != "xyes" ] ; then
+    echo "voms disabled, please adjust the configuration to your needs "
+    echo "and then set RUN to 'yes' in /etc/default/voms to enable it."
+    exit 0
 fi
 
 # add lib directory to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+fi
 
-voms=${binpath}/edg-voms
+voms=${binpath}/voms
 if !(test -x ${voms}) ; then
-    echo "Cannot find edg-voms." 
+    echo "Cannot find voms."
     exit 0
 fi
 
@@ -64,18 +100,22 @@
     # Start daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
 
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Starting $prog($vo): "
 
-            if test -f $@LOCATION_ENV@/etc/voms/$vo/tnsnames.ora ; then
-                tnsvalue=$@LOCATION_ENV@/etc/voms/$vo
+            if test -f ${etcpath}/voms/$vo/tnsnames.ora ; then
+                tnsvalue=${etcpath}/voms/$vo
             else
                 tnsvalue="$TNS_ADMIN"
             fi
@@ -84,21 +124,21 @@
                 read pid < $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
                 if test "x$pid" != "x"; then
                     if checkpid $pid; then
-                        echo "VOMS ($pid) is already running" && failure
+                        echo "VOMS ($pid) is already running"
                         continue;
                     fi
                 fi
             fi
 
             if [ -n "$VOMS_USER" ]; then
-                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
+                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf ${etcpath}/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
             else
-                TNS_ADMIN="$tnsvalue" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf
+                TNS_ADMIN="$tnsvalue" ${voms} --conf ${etcpath}/voms/$vo/voms.conf
             fi
 
-	          # get process id
-            pid=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            # get process id
+            pid=$(ps axo pid,args | grep "${voms} --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             NUM=$(($pid))
             if test $NUM -eq 0; then
                 RETVAL=1
@@ -110,12 +150,17 @@
                 RETGLOB=$(($RETGLOB + 1 ))
             fi
             [ "$RETVAL" -eq 0 ] && success || failure 
+            echo
         fi
     done
     
     return $RETGLOB
 }
 
+if [ -r /etc/init.d/functions ] ; then
+    . /etc/init.d/functions
+else
+
 success()
 {
     echo $1
@@ -151,6 +196,8 @@
     return $rc
 }
 
+fi
+
 checkpid() 
 {
     ps --pid $1 >> /dev/null
@@ -164,14 +211,14 @@
 # A function to stop a program.
 killprocs() {
     RC=0
-	# Test syntax.
+    # Test syntax.
     if [ "$#" -eq 0 ]; then
         echo $"Usage: killproc {pids} [signal]"
         return 1
     fi
     
     notset=0
-	# check for second arg to be kill level
+    # check for second arg to be kill level
     if [ "$2" != "" ] ; then
         killlevel=$2
     else
@@ -179,15 +226,15 @@
         killlevel="-9"
     fi
 
-        # Find pid.
+    # Find pid.
     pid=$1
 
-        # Kill it.
+    # Kill it.
     if [ -n "${pid:-}" ] ; then
         [ "$BOOTUP" = "verbose" -a -z "$LSB" ] && echo -n "$base "
         if [ "$notset" -eq "1" ] ; then
             if checkpid $pid 2>&1; then
-			   # TERM first, then KILL if not dead
+                # TERM first, then KILL if not dead
                 kill -TERM $pid
                 sleep 0.1
                 if checkpid $pid && sleep 1 &&
@@ -196,14 +243,14 @@
                     kill -KILL $pid
                     sleep 0.1
                 fi
-		        fi
+            fi
             checkpid $pid
             RC=$?
             [ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
             RC=$((! $RC))
-		# use specified level only
-		else
-		        if checkpid $pid >/dev/null 2>&1; then
+        else
+            # use specified level only
+            if checkpid $pid >/dev/null 2>&1; then
                 kill $killlevel $pid
                 RC=$?
                 [ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
@@ -214,7 +261,7 @@
         RC=1
     fi
     
-        # Remove pid file if any.
+    # Remove pid file if any.
     if [ "$notset" = "1" ]; then
         rm -f /var/run/$base.pid
     fi
@@ -226,18 +273,21 @@
     # Stop daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Stopping $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep|awk '{ print $2; }'|tr '\n' ' '`
-            dbname=`grep dbname $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
-            username=`grep username $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            dbname=`grep dbname ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            username=`grep username ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
             if test "x$username" = "x"; then
                 pids="";
                 pids2="";
@@ -255,16 +305,15 @@
                 fi
             fi
             if test -z "$pids"; then
-                failure; echo
-                RETVAL=1
+                echo "(already stopped)"
                 continue
             fi
             for pid in $pids; do
-                killprocs ${pid} ;
+                killprocs ${pid}
             done
             RETVAL=$?
             echo
-            [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/voms.$vo
+            [ $RETVAL -eq 0 ] && rm -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
             RETGLOB=$((RETGLOB + RETVAL))
         fi
     done
@@ -273,47 +322,53 @@
 }
 
 function condrestart() {
-    # Stop daemons.
+    RETGLOB=0
+    # Conditionally restart daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
     
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
-            echo -n "Condrestart $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
-            if test -z "$pids"; then
-                echo; start $vo
-            else
-                failure; echo
-                RETVAL=1
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            if test -n "$pids"; then
+                $0 restart $vo
+                RETVAL=$?
+                RETGLOB=$((RETGLOB + RETVAL))
             fi
         fi
     done
 
     return $RETGLOB
-
 }
 
 function getstatus() {
-    # Stop daemons.
-    prog=`basename ${voms}`
-
-    # get vos
-    vos=${1:-`find $@LOCATION_ENV@/etc/voms/ -type d -printf "%f "`}
-
     value=0
+    # Get status.
+    prog=`basename ${voms}`
+    if test -z $1; then
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
+    else
+        vos=$1
+    fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Status $prog($vo): "
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             if test -z "$pids"; then
-                if [ -f /var/lock/subsys/voms.$vo ]; then
+                if [ -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo ]; then
                     echo "dead but subsys locked"
                     value=$[$value < 2 ? 2 : $value]
                     continue
@@ -322,7 +377,8 @@
                 value=$[$value < 3 ? 3 : $value]
                 continue
             else
-                echo "(pid $pids) is running..."
+                echo -n "(pid $pids) is running..." | tr '\n' ' '
+                echo
                 value=$[$value < 0 ? 0 : $value]
                 continue
             fi
@@ -346,12 +402,14 @@
         getstatus $2
         RETVAL=$?
         ;;
-    restart)
+    restart | force-reload)
         stop $2
         start $2
         RETVAL=$?
         ;;
-    condrestart)
+    reload)
+        ;;
+    condrestart | try-restart)
         condrestart $2
         RETVAL=$?
         ;;

voms-install-db.patch:
 voms_install_db.in |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE voms-install-db.patch ---
diff -ur voms-1.9.11.orig/src/install/voms_install_db.in voms-1.9.11/src/install/voms_install_db.in
--- voms-1.9.11.orig/src/install/voms_install_db.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms_install_db.in	2009-08-26 17:45:39.608077295 +0200
@@ -4,7 +4,11 @@
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
 if test -z $@VAR_LOCATION_ENV@ ; then
-    @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
 fi
 
 # CERTDIR
@@ -37,7 +41,9 @@
 
 # Default path
 basepath=$@LOCATION_ENV@
-datapath=$@LOCATION_ENV@
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    datapath=$@LOCATION_ENV@
+fi
 
 # Default Suffix
 code=0
@@ -49,7 +55,7 @@
 logformat=""
 sqlloc=""
 help=""
-oldformat="no"
+newformat="yes"
 
 if test "x at with_mysqlconf@" != "x" ; then
     MYSQLCONF=" --defaults-file=@with_mysqlconf@ "
@@ -58,7 +64,7 @@
 fi
 
 
-TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,compat -n 'voms_install_db' -- "$@"`
+TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,oldformat,compat -n 'voms_install_db' -- "$@"`
 
 if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi
 
@@ -84,7 +90,7 @@
   --logtype)                logtype=$2                 ; shift 2 ;;
   --logformat)              logformat=$2               ; shift 2 ;;
   --logdateformat)          logdateformat=$2           ; shift 2 ;;
-  --newformat)              oldformat="yes"            ; shift 1 ;;
+  --oldformat)              newformat="no"             ; shift 1 ;;
   -h)                       help="yes"                 ; shift 1 ;;
 	--)                       shift                      ; break   ;;
 	*)                        $ECHO "$1: Internal Error!" >&2 ; exit 1  ;;
@@ -133,7 +139,7 @@
     $ECHO "    --logtype type          Specifies what to log. See the vomsd(8) man page for details."
     $ECHO "    --logformat format      See the vomsd(8) man page for details."
     $ECHO "    --logdateformat format  See the vomsd(8) man page for details."
-    $ECHO "    --newformat             Creates AC according to the old format."
+    $ECHO "    --oldformat             Creates AC according to the old format."
     $ECHO "    --help                  This output."
     exit 0;
 fi
@@ -261,8 +267,8 @@
 
 # Setting ownership and permission for voms_password_query file
 mkdir -p $datapath/etc/voms/$voms_vo
-mkdir -p $@LOCATION_ENV at _VAR/log
-#$datapath/log
+mkdir -p $@VAR_LOCATION_ENV@/log/voms
+
 $ECHO $voms_password_query > $datapath/etc/voms/$voms_vo/voms.pass
 chown root.voms $datapath/etc/voms/$voms_vo/voms.pass
 chmod 640 $datapath/etc/voms/$voms_vo/voms.pass
@@ -270,10 +276,10 @@
 if test -z $voms_vo ; then
     logname=voms
 else
-    logname=voms.$voms_vo
+    logname=$voms_vo
 fi
  
-$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@LOCATION_ENV at _VAR/log/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
+$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/voms/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
 $ECHO -en "--socktimeout=$timeout\n--loglevel=$loglevel\n--logtype=$logtype\n" >>$datapath/etc/voms/$voms_vo/voms.conf
 
 if test "x$compat_mode" = "x-compat"; then

voms-jar-perms.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-jar-perms.patch ---
diff -ur voms-1.9.11.orig/src/api/java/Makefile.am voms-1.9.11/src/api/java/Makefile.am
--- voms-1.9.11.orig/src/api/java/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/Makefile.am	2009-08-14 20:54:18.599023487 +0200
@@ -70,7 +70,7 @@
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/java
-	$(INSTALL) $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
+	$(INSTALL) -m644 $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
 
 clean:
 	rm -f $(top_builddir)/src/api/java/vomsjapi.jar

voms-java-clone-cast.patch:
 VOMSValidator.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE voms-java-clone-cast.patch ---
diff -ur voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java	2009-08-15 20:12:49.855022959 +0200
@@ -159,7 +159,7 @@
         if (validatedChain == null)
             myValidatedChain = null; // allow null
         else
-            myValidatedChain = validatedChain.clone(); // allow null
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
 
         if (acValidator == null) {
             if (theTrustStore == null) {
@@ -292,7 +292,7 @@
         if (validatedChain == null) 
             myValidatedChain = null;
         else
-            myValidatedChain = validatedChain.clone();
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
         myVomsAttributes = new Vector();
         myFQANTree = null;
         isParsed = false;

voms-javadoc.patch:
 PathNamingScheme.java   |   14 +++++++-------
 UserCredentials.java    |   14 +++++++-------
 VOMSParser.java         |    2 +-
 VOMSProtocol.java       |    6 +++---
 VOMSProxyBuilder.java   |   16 ++++++++--------
 VOMSRequestOptions.java |   17 ++++-------------
 6 files changed, 30 insertions(+), 39 deletions(-)

--- NEW FILE voms-javadoc.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2009-07-01 19:02:29.448373448 +0200
@@ -61,7 +61,7 @@
     /**
      * This methods checks that the string passed as argument complies with the voms FQAN syntax.
      *  
-     * @param containerName, the string that must be checked for compatibility with FQAN syntax. 
+     * @param containerName the string that must be checked for compatibility with FQAN syntax. 
      * @throws VOMSSyntaxException
      *         If there's an error in the FQAN syntax.
      */
@@ -81,7 +81,7 @@
      * This methods checks that the string passed as argument complies with the syntax used
      * by voms to identify groups.
      * 
-     * @param groupName, the string that has to be checked.
+     * @param groupName the string that has to be checked.
      * @throws VOMSSyntaxException
      *          If the string passed as argument doens not comply with the voms sytax.
      */
@@ -116,7 +116,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms group.
      * 
-     * @param groupName, the string to check.
+     * @param groupName the string to check.
      * @return  <ul><li>true, if the string passed as argument identifies a voms group.
      *          <li>false, otherwise.
      *          </ul>
@@ -131,7 +131,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms role.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -147,7 +147,7 @@
      * This methods checks that the FQAN passed as argument identifies a qualified voms role, i.e.,
      * a role defined in the context of a voms group.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a qualified voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -163,7 +163,7 @@
     /**
      * This method extracts the role name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN
+     * @param containerName the FQAN
      * @return <ul><li>A string containing the role name, if found</li>
      *              <li>null, if no role information is contained in the FQAN passed as argument
      *         </ul>
@@ -190,7 +190,7 @@
     /**
      * This method extracts group name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN 
+     * @param containerName the FQAN 
      * @return <ul><li>A string containing the group name, if found</li>
      *              <li>null, if no group information is contained in the FQAN passed as argument
      *         </ul>
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-07-01 19:02:29.456372709 +0200
@@ -377,7 +377,7 @@
      * Static instance constructor for a {@link UserCredentials}.
      * For more info on the user credentials load procedure, see {@link #instance()}.
      *
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -396,9 +396,9 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -416,8 +416,8 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -435,7 +435,7 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param credentials, the GlobusCredentials object containing the user's own proxy
+     * @param credentials the GlobusCredentials object containing the user's own proxy
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java	2009-07-01 19:02:29.465377247 +0200
@@ -61,7 +61,7 @@
     /**
      * 
      * Parses a voms response reading from a given input stream.
-     * @param is, the input stream.
+     * @param is the input stream.
      * @return a {@link VOMSResponse} object that represents the parsed response.
      */
     public VOMSResponse parseResponse(InputStream is){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2009-07-01 19:02:29.468373182 +0200
@@ -97,8 +97,8 @@
      * 
      * This method is used to send a request to a VOMS server.
      *  
-     * @param requestOptions, the request options. See {@link VOMSRequestOptions}. 
-     * @param stream, an output stream.
+     * @param requestOptions the request options. See {@link VOMSRequestOptions}. 
+     * @param stream an output stream.
      */
     public void sendRequest(VOMSRequestOptions requestOptions, OutputStream stream){
         
@@ -154,7 +154,7 @@
     /**
      * This method is used to parse a VOMS response from an input stream.
      * 
-     * @param stream, the input stream from which the response will be parsed.
+     * @param stream the input stream from which the response will be parsed.
      * @return a {@link VOMSResponse} object.
      */
     public VOMSResponse getResponse(InputStream stream){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 19:36:38.729376985 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 20:58:25.590377728 +0200
@@ -130,9 +130,9 @@
      *
      * This methods builds an {@link AttributeCertificate} (AC) object starting from an array of bytes.
      *
-     * @param acBytes, the byte array containing the attribute certificate.
+     * @param acBytes the byte array containing the attribute certificate.
      * @return the {@link AttributeCertificate} object
-     * @throws VOMSException, in case of parsing errors.
+     * @throws VOMSException in case of parsing errors.
      */
     public static AttributeCertificate buildAC(byte[] acBytes){
 
@@ -161,12 +161,12 @@
      * passed as arguments and including a list of {@link AttributeCertificate} objects that
      * will be included in the proxy.
      *
-     * @param cred, the {@link UserCredentials} from which the proxy must be created.
-     * @param ACs, the list of {@link AttributeCertificate} objects.
-     * @param lifetime, the lifetime in seconds of the generated proxy.
-     * @param version, the version of globus to which the proxy conforms
-     * @return a {@link GlobusCredential} object that represents the proxy.
-     * @throws {@link VOMSException}, if something goes wrong.
+     * @param cred the {@link UserCredentials} from which the proxy must be created.
+     * @param ACs the list of {@link AttributeCertificate} objects.
+     * @param lifetime the lifetime in seconds of the generated proxy.
+     * @param gtVersion the version of globus to which the proxy conforms
+     * @return a {@link UserCredentials} object that represents the proxy.
+     * @throws VOMSException if something goes wrong.
      *
      * @author Vincenzo Ciaschini
      * @author Andrea Ceccanti
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2009-07-01 19:08:10.252380084 +0200
@@ -75,9 +75,7 @@
 
     
     /**
-     * 
-     * Returns the ordering string of this {@link VOMSRequestOptions} object.
-     * @return
+     * @return the ordering string of this {@link VOMSRequestOptions} object.
      */
     public String getOrdering() {
 
@@ -99,10 +97,7 @@
 
     
     /**
-     * 
-     * Returs the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
-     * 
-     * @return
+     * @return the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
      */
     public List getRequestedFQANs() {
 
@@ -123,10 +118,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object.
-     * 
-     * @return
      */
     public List getTargets() {
 
@@ -135,10 +128,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object as a string containing a a comma-separated list of host names.
-     * 
-     * @return
      */
     public String getTargetsAsString() {
 

voms-nolib64.patch:
 configure.ac |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE voms-nolib64.patch ---
diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
--- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
@@ -37,10 +37,6 @@
 
 AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
 
-if test "x$host_cpu" = "xx86_64"; then
-    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
-fi
-
 AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
 AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
 AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-notknown-msg.patch:
 vomsclient.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE voms-notknown-msg.patch ---
diff -ur voms-1.9.11.orig/src/client/vomsclient.cc voms-1.9.11/src/client/vomsclient.cc
--- voms-1.9.11.orig/src/client/vomsclient.cc	2009-07-27 10:14:04.000000000 +0200
+++ voms-1.9.11/src/client/vomsclient.cc	2009-08-31 17:51:15.952071123 +0200
@@ -575,7 +575,9 @@
       std::vector<contactdata> servers;
       servers = v.FindByAlias(contact.vo().empty() ? contact.nick() : contact.vo());
       if (servers.empty()) {
-        std::cerr << "VOMS Server for " << contact.vo() << " not known!" << std::endl;
+        std::cerr << "VOMS Server for "
+		  << (contact.vo().empty() ? contact.nick() : contact.vo())
+		  << " not known!" << std::endl;
         exit(1);
       }
     

voms-openssl.patch:
 ac/Makefile.am        |    1 +
 api/ccapi/api_util.cc |    4 ++--
 include/acstack.h     |    2 +-
 socklib/Client.cpp    |    4 ++++
 utils/vomsfake.cc     |    1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE voms-openssl.patch ---
diff -ur voms-1.9.11.orig/src/ac/Makefile.am voms-1.9.11/src/ac/Makefile.am
--- voms-1.9.11.orig/src/ac/Makefile.am	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/src/ac/Makefile.am	2009-09-07 11:06:49.079471423 +0200
@@ -27,6 +27,7 @@
 	-DNOGLOBUS \
 	-I $(top_srcdir)/src/include \
 	-I $(top_builddir)/src/sslutils
+libattributes_nog_la_CXXFLAGS = $(libattributes_nog_la_CFLAGS)
 
 libattributes_nog_la_LIBADD = \
 	$(OPENSSL_LIBS)
diff -ur voms-1.9.11.orig/src/api/ccapi/api_util.cc voms-1.9.11/src/api/ccapi/api_util.cc
--- voms-1.9.11.orig/src/api/ccapi/api_util.cc	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/api_util.cc	2009-09-07 11:06:49.080471703 +0200
@@ -415,9 +415,9 @@
   /* extract vo name from AC */
   
   AC * ac = (AC *)data;
-  STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
+  const STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
   int nid = OBJ_txt2nid("idatcap");
-  int pos = X509at_get_attr_by_NID(atts, nid, -1);
+  int pos = X509at_get_attr_by_NID((const STACK_OF(X509_ATTRIBUTE)*)atts, nid, -1);
 
   int nidc = OBJ_txt2nid("certseq");
   STACK_OF(X509_EXTENSION) *exts = ac->acinfo->exts;
diff -ur voms-1.9.11.orig/src/include/acstack.h voms-1.9.11/src/include/acstack.h
--- voms-1.9.11.orig/src/include/acstack.h	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/include/acstack.h	2009-09-07 11:06:49.081472345 +0200
@@ -79,7 +79,7 @@
 #endif
 
 #define DECL_STACK(type) \
-   DECLARE_STACK_OF(type) \
+   PREDECLARE_STACK_OF(type) \
    extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \
    extern STACK_OF(type) *sk_##type##_new_null (); \
    extern void   sk_##type##_free (STACK_OF(type) *); \
diff -ur voms-1.9.11.orig/src/socklib/Client.cpp voms-1.9.11/src/socklib/Client.cpp
--- voms-1.9.11.orig/src/socklib/Client.cpp	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Client.cpp	2009-09-07 11:28:07.210471657 +0200
@@ -336,7 +336,11 @@
 bool 
 GSISocketClient::Open()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int ret = -1, ret2 = -1;
   time_t starttime, curtime;
   long errorcode = 0;
diff -ur voms-1.9.11.orig/src/utils/vomsfake.cc voms-1.9.11/src/utils/vomsfake.cc
--- voms-1.9.11.orig/src/utils/vomsfake.cc	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/utils/vomsfake.cc	2009-09-07 10:21:52.935470664 +0200
@@ -40,6 +40,7 @@
 #include "listfunc.h"
 #include "credentials.h"
 #include "parsertypes.h"
+#define YYTOKENTYPE
 #include "vomsparser.h"
 
 VOLIST *volist = NULL;

voms-pipe-buf.patch:
 log.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE voms-pipe-buf.patch ---
diff -ur voms-1.9.11.orig/src/log/log.c voms-1.9.11/src/log/log.c
--- voms-1.9.11.orig/src/log/log.c	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/log/log.c	2009-09-07 16:02:18.597470396 +0200
@@ -175,7 +175,11 @@
   if (*buffer) {
     while (offset < slen) {
       do {
+#ifdef PIPE_BUF
         readbytes = read(fd, *buffer + offset, (slen - offset > PIPE_BUF ? PIPE_BUF : slen - offset));
+#else
+        readbytes = read(fd, *buffer + offset, (slen - offset > fpathconf(fd, _PC_PIPE_BUF) ? fpathconf(fd, _PC_PIPE_BUF) : slen - offset));
+#endif
       } while (readbytes < 0 && (errno == EINTR
 #ifdef ERESTART
                                    || errno == ERESTART

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

--- NEW FILE voms-portability.patch ---
diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
--- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
@@ -1,6 +1,6 @@
 
 AC_INIT([GLite Security VOMS], [1.9.11])
-AC_PREREQ(2.59)
+AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/utils/voms_proxy_destroy.cc])
diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4
--- voms-1.9.11.orig/project/acinclude.m4	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/project/acinclude.m4	2009-09-08 14:13:33.246338019 +0200
@@ -904,12 +904,16 @@
 
 AC_DEFUN([PUT_PRIVATES],
 [
-        AH_BOTTOM([#ifdef __GNUC__
+        AH_BOTTOM([#if defined(__GNUC__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #define UNUSED(z)  z __attribute__ ((unused))
+#else
+#define UNUSED(z)  z
+#endif
 #define PRIVATE    __attribute__ ((visibility ("hidden")))
 #define PUBLIC     __attribute__ ((visibility ("default")))
 #else
-#define UNUSED
+#define UNUSED(z)  z
 #define PRIVATE
 #define PUBLIC
 #endif])])
diff -ur voms-1.9.11.orig/src/api/ccapi/Makefile.am voms-1.9.11/src/api/ccapi/Makefile.am
--- voms-1.9.11.orig/src/api/ccapi/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/Makefile.am	2009-09-08 14:13:33.247337541 +0200
@@ -16,7 +16,7 @@
 libvomsapi_nog_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_nog_la_CPPFLAGS = \
+libvomsapi_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -41,7 +41,7 @@
 libvomsapi_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_la_CPPFLAGS = \
+libvomsapi_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -70,7 +70,7 @@
 libvomsc_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_la_CPPFLAGS = \
+libvomsc_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_CFLAGS)
@@ -94,10 +94,10 @@
 #noinst_PROGRAMS = test ctest
 #test_SOURCES = test.cc
 #test_LDADD = libvomsapi.la
-#test_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#test_CXXFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 #ctest_SOURCES = ctest.c
 #ctest_LDADD = libvomsc.la
-#ctest_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#ctest_CFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 
 EXTRA_LTLIBRARIES = \
 	libvomsapi_gcc32.la \
@@ -123,7 +123,7 @@
 libvomsapi_gcc32_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32_la_CPPFLAGS = \
+libvomsapi_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -139,7 +139,7 @@
 libvomsapi_gcc32dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbg_la_CPPFLAGS = \
+libvomsapi_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(GLOBUS_GCC32DBG_CFLAGS) \
 	$(API_INCLUDES)
@@ -155,7 +155,7 @@
 libvomsapi_gcc32pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32pthr_la_CPPFLAGS = \
+libvomsapi_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -171,7 +171,7 @@
 libvomsapi_gcc32dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -187,7 +187,7 @@
 libvomsc_gcc32_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32_la_CPPFLAGS = \
+libvomsc_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -203,7 +203,7 @@
 libvomsc_gcc32dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbg_la_CPPFLAGS = \
+libvomsc_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -219,7 +219,7 @@
 libvomsc_gcc32pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32pthr_la_CPPFLAGS = \
+libvomsc_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -235,7 +235,7 @@
 libvomsc_gcc32dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -254,7 +254,7 @@
 libvomsapi_gcc64_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64_la_CPPFLAGS = \
+libvomsapi_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -270,7 +270,7 @@
 libvomsapi_gcc64dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbg_la_CPPFLAGS = \
+libvomsapi_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -286,7 +286,7 @@
 libvomsapi_gcc64pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64pthr_la_CPPFLAGS = \
+libvomsapi_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -302,7 +302,7 @@
 libvomsapi_gcc64dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
@@ -318,7 +318,7 @@
 libvomsc_gcc64_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64_la_CPPFLAGS = \
+libvomsc_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -334,7 +334,7 @@
 libvomsc_gcc64dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbg_la_CPPFLAGS = \
+libvomsc_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -350,7 +350,7 @@
 libvomsc_gcc64pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64pthr_la_CPPFLAGS = \
+libvomsc_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -367,7 +367,7 @@
 libvomsc_gcc64dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
diff -ur voms-1.9.11.orig/src/socklib/Makefile.am voms-1.9.11/src/socklib/Makefile.am
--- voms-1.9.11.orig/src/socklib/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Makefile.am	2009-09-08 14:16:29.063338874 +0200
@@ -12,7 +12,7 @@
 libsock_server_la_SOURCES = Server.cpp tokens.c globuswrap.c
 libsock_nog_la_SOURCES = Client.cpp
 
-libsock_nog_la_CPPFLAGS = \
+libsock_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
@@ -21,17 +21,18 @@
 libsock_nog_la_LIBADD = \
 	-lcrypto -lssl
 
-libsock_server_la_CPPFLAGS = \
+libsock_server_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
+libsock_server_la_CFLAGS = $(libsock_server_la_CXXFLAGS)
 
 libsock_server_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils.la \
 	$(top_builddir)/src/common/libutilc.la \
 	$(GLOBUS_GSS_LIBS)
 
-libsock_la_CPPFLAGS = \
+libsock_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
@@ -68,10 +69,11 @@
 
 libsock_server_gcc32_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32_la_CPPFLAGS = \
+libsock_server_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
+libsock_server_gcc32_la_CFLAGS = $(libsock_server_gcc32_la_CXXFLAGS)
 
 libsock_server_gcc32_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32.la \
@@ -80,10 +82,11 @@
 
 libsock_server_gcc32dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbg_la_CPPFLAGS = \
+libsock_server_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbg_la_CFLAGS = $(libsock_server_gcc32dbg_la_CXXFLAGS)
 
 libsock_server_gcc32dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbg.la \
@@ -92,10 +95,11 @@
 
 libsock_server_gcc32pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32pthr_la_CPPFLAGS = \
+libsock_server_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
+libsock_server_gcc32pthr_la_CFLAGS = $(libsock_server_gcc32pthr_la_CXXFLAGS)
 
 libsock_server_gcc32pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32pthr.la \
@@ -104,10 +108,11 @@
 
 libsock_server_gcc32dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbgpthr_la_CFLAGS = $(libsock_server_gcc32dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc32dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbgpthr.la \
@@ -116,10 +121,11 @@
 
 libsock_server_gcc64_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64_la_CPPFLAGS = \
+libsock_server_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
+libsock_server_gcc64_la_CFLAGS = $(libsock_server_gcc64_la_CXXFLAGS)
 
 libsock_server_gcc64_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64.la \
@@ -128,10 +134,11 @@
 
 libsock_server_gcc64dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbg_la_CPPFLAGS = \
+libsock_server_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbg_la_CFLAGS = $(libsock_server_gcc64dbg_la_CXXFLAGS)
 
 libsock_server_gcc64dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbg.la \
@@ -140,10 +147,11 @@
 
 libsock_server_gcc64pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64pthr_la_CPPFLAGS = \
+libsock_server_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
+libsock_server_gcc64pthr_la_CFLAGS = $(libsock_server_gcc64pthr_la_CXXFLAGS)
 
 libsock_server_gcc64pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64pthr.la \
@@ -152,10 +160,11 @@
 
 libsock_server_gcc64dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbgpthr_la_CFLAGS = $(libsock_server_gcc64dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc64dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbgpthr.la \
@@ -188,7 +197,7 @@
 libsock_gcc32_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32_la_CPPFLAGS = \
+libsock_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -201,7 +210,7 @@
 libsock_gcc32dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbg_la_CPPFLAGS = \
+libsock_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -214,7 +223,7 @@
 libsock_gcc32pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32pthr_la_CPPFLAGS = \
+libsock_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -227,7 +236,7 @@
 libsock_gcc32dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -240,7 +249,7 @@
 libsock_gcc64_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64_la_CPPFLAGS = \
+libsock_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -253,7 +262,7 @@
 libsock_gcc64dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbg_la_CPPFLAGS = \
+libsock_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -266,7 +275,7 @@
 libsock_gcc64pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64pthr_la_CPPFLAGS = \
+libsock_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -279,7 +288,7 @@
 libsock_gcc64dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)

voms-shell-syntax.patch:
 mysql2oracle.in |    2 +-
 voms-ping       |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE voms-shell-syntax.patch ---
diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
--- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
@@ -2,7 +2,7 @@
 #!/bin/sh
 #set -x
 
-function usage()
+function usage
 {
     echo
     echo "usage : mysql2oracle [OPTIONS]"
diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
--- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
@@ -25,7 +25,8 @@
   echo "  ]"
 }
 
-function test_vo {
+function test_vo
+{
    local voname="$1"
    local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
    local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
@@ -41,7 +42,7 @@
 "$voname" "localhost" "$port" "$dn" "$voname"
 EOF
    rm -f /tmp/oo
-   /opt/glite/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
+   ${GLITE_LOCATION:-/usr}/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
    res=$?
    if test $res -ne 0; then
       grep "User unknown to this VO" /tmp/oo >/dev/null


--- NEW FILE voms.INSTALL ---
VOMS server configuration
-------------------------

In addition to the voms-server package a voms database plugin is needed.

Plugins exists for mysql and oracle. Since the oracle client libraries
are not open source software, only the mysql plugin is available in
Fedora. To install the voms-mysql-plugin issue the following command
as root:

	yum install voms-mysql-plugin

Before starting the server, you must create the databases used by
VOMS. It is possible to run more than one VOMS server on a single host
as long as they are configured to use different ports.

You should have the grid CA certificates installed in
/etc/grid-security/certificates before running the VOMS database
creation script.

To create the databases run the following command as root for each
VOMS server you want to run:

	/usr/share/voms/voms_install_db \
		--voms-vo=<voname> \
		--port=<portnumber> \
		--db-type=mysql \
		--db-admin=<mysqladminuser> \
		--db-pwd=<mysqladminpwd> \
		--sqlloc=/usr/lib/voms/libvomsmysql.so

If you are running on a 64 bit host use instead:
		--sqlloc=/usr/lib64/voms/libvomsmysql.so

The voms server is configured to run as a special voms user. This user
needs a copy of the host certificate and key:

	cp -p /etc/grid-security/hostcert.pem /etc/grid-security/voms
	cp -p /etc/grid-security/hostkey.pem /etc/grid-security/voms
	chown voms:voms /etc/grid-security/voms/host*.pem

After creating the databases, start the server by running the command:

	service voms start

If you want the server to be started automatically after each reboot run
the command:

	chkconfig voms on

To check that the server is running and is configured correctly, run
the following command:

	/usr/share/voms/voms-ping <voname>


--- NEW FILE voms.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:		voms
Version:	1.9.11
Release:	4%{?dist}
Summary:	Virtual Organization Membership Service

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms_R_1_9_11 \
#		  -d voms-1.9.11 org.glite.security.voms
#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
Source:		%{name}-%{version}.tar.gz
#		Post-install setup instructions:
Source1:	%{name}.INSTALL
#		Build using Globus from Fedora/EPEL
#		https://savannah.cern.ch/bugs/?54427
Patch0:		%{name}-distribution-globus.patch
#		Fix the start-up script
#		https://savannah.cern.ch/bugs/?54428
Patch1:		%{name}-initscript.patch
#		Fix the --disable-glite configure option
#		https://savannah.cern.ch/bugs/?54429
Patch2:		%{name}-fix-enable-glite.patch
#		Remove lib64 hardcoding
#		https://savannah.cern.ch/bugs/?54430
Patch3:		%{name}-nolib64.patch
#		Make the Java API more compatible with the C API
#		https://savannah.cern.ch/bugs/?54432
Patch4:		%{name}-extra-vomses-java.patch
#		Missing casts after Java cloning
#		https://savannah.cern.ch/bugs/?54433
Patch5:		%{name}-java-clone-cast.patch
#		Fix permissions of installed jar
#		https://savannah.cern.ch/bugs/?54434
Patch6:		%{name}-jar-perms.patch
#		Fix javadoc warnings
#		https://savannah.cern.ch/bugs/?54435
Patch7:		%{name}-javadoc.patch
#		Fix syntax errors in shell scripts
#		https://savannah.cern.ch/bugs/?54436
Patch8:		%{name}-shell-syntax.patch
#		Fix the database install script
#		https://savannah.cern.ch/bugs/?54880
Patch9:		%{name}-install-db.patch
#		Error message glitch
#		https://savannah.cern.ch/bugs/?55113
Patch10:	%{name}-notknown-msg.patch
#		Make the Java API build with gcj
#		https://savannah.cern.ch/bugs/?55115
Patch11:	%{name}-gcj.patch
#		Support older autotools and older gcc
#		https://savannah.cern.ch/bugs/?55116
Patch12:	%{name}-portability.patch
#		Support openssl 1.0
#		https://savannah.cern.ch/bugs/?55390
Patch13:	%{name}-openssl.patch
#		Unconditional use of PIPE_BUF
#		https://savannah.cern.ch/bugs/?55405
Patch14:	%{name}-pipe-buf.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	openssl-devel%{?_isa}
BuildRequires:	expat-devel
BuildRequires:	libtool
BuildRequires:	pkgconfig
BuildRequires:	libxslt
BuildRequires:	docbook-style-xsl
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

BuildRequires:	java-devel
BuildRequires:	jpackage-utils
BuildRequires:	bouncycastle >= 1.39
BuildRequires:	jakarta-commons-cli
BuildRequires:	jakarta-commons-lang
BuildRequires:	log4j
%if %{with_gcj}
BuildRequires:	java-gcj-compat-devel
%endif

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers libraries that applications using the VOMS functionality
will bind to.

%package devel
Summary:	Virtual Organization Membership Service Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	openssl-devel%{?_isa}
Requires:	automake

%description devel
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers header files for programming with the VOMS libraries.

%package doc
Summary:	Virtual Organization Membership Service Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif

%description doc
Documentation for the Virtual Organization Membership Service.

%package clients
Summary:	Virtual Organization Membership Service Clients
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%description clients
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package provides command line applications to access the VOMS
services.

%package server
Summary:	Virtual Organization Membership Service Server
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

Requires(pre):		shadow-utils
Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts

%description server
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

The service can be understood as an account database, which serves the
information in a special format (VOMS credential). The VO manager can
administrate it remotely using command line tools or a web interface.

%package -n vomsjapi
Summary:	Virtual Organization Membership Service Java API
Group:		Development/Libraries
Requires:	java
Requires:	jpackage-utils
Requires:	bouncycastle >= 1.39
Requires:	jakarta-commons-cli
Requires:	jakarta-commons-lang
Requires:	log4j
%if %{with_gcj}
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
%else
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
%endif

%description -n vomsjapi
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers a java client API for VOMS.

%package -n vomsjapi-javadoc
Summary:	Virtual Organization Membership Service Java API Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	jpackage-utils
Requires:	vomsjapi = %{version}-%{release}

%description -n vomsjapi-javadoc
Virtual Organization Membership Service (VOMS) Java API Documentation.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
	   -name '*.cc' -o -name '*.java' ')' -exec chmod a-x {} ';'

# Fix location dir
sed -e 's/\(LOCATION_DIR.*\)"\$prefix"/\1""/g' -i project/acinclude.m4

# Fix default Globus location
sed -e 's!\(GLOBUS_LOCATION\)!{\1:-/usr}!' -i project/voms.m4

# Fix default vomses file location
sed -e 's!/opt/glite/etc/vomses!/etc/vomses!' -i src/api/ccapi/voms_api.cc

# Use pdflatex
sed -e 's!^\(USE_PDFLATEX *= *\)NO!\1YES!' -i src/api/ccapi/Makefile.am

# Touch to avoid rerunning bison and flex
touch -r src/utils/vomsfake.y src/utils/vomsparser.h
touch -r src/utils/vomsfake.y src/utils/lex.yy.c

# rebootstrap
./autogen.sh

install -m 644 %{SOURCE1} INSTALL.Fedora

%build
%configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
	   --with-java-home=/usr --with-bc=/usr/share/java/bcprov.jar \
	   --with-log4j=/usr/share/java/log4j.jar \
	   --with-commons-cli=/usr/share/java/commons-cli.jar \
	   --with-commons-lang=/usr/share/java/commons-lang.jar

make %{?_smp_mflags}

( cd doc/apidoc/api/VOMS_C_API/latex ; make )
( cd doc/apidoc/api/VOMS_CC_API/latex ; make )

mkdir javadoc
cd javadoc
CLASSPATH=../src/api/java:$(build-classpath \
			    bcprov log4j commons-cli commons-lang) \
javadoc ../src/api/java/org/glite/voms/*.java \
	../src/api/java/org/glite/voms/ac/*.java \
	../src/api/java/org/glite/voms/contact/*.java
cd ..

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_bindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_sbindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/edg-voms*
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

mv $RPM_BUILD_ROOT%{_includedir}/glite/security/%{name} \
   $RPM_BUILD_ROOT%{_includedir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_includedir}/glite

rm $RPM_BUILD_ROOT%{_includedir}/%{name}/voms_apic_nog.h
rm $RPM_BUILD_ROOT%{_mandir}/man1/testvoms.1*
rm $RPM_BUILD_ROOT%{_mandir}/man8/voms-install-replica.8*

mv $RPM_BUILD_ROOT%{_datadir}/vomses.template \
   $RPM_BUILD_ROOT%{_datadir}/%{name}

mv $RPM_BUILD_ROOT%{_datadir}/m4 $RPM_BUILD_ROOT%{_datadir}/aclocal

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/vomsdir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

touch $RPM_BUILD_ROOT%{_sysconfdir}/vomses

sed -e 's!${datapath}/etc/voms/voms!${basepath}/share/voms/voms!' \
    -e 's/useradd/\#&/' -e 's/groupadd/\#&/' \
    -e 's/vomsd(8)/voms(8)/' \
    -i $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db

cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db << EOF
\$ECHO -en "--x509_user_cert=/etc/grid-security/voms/hostcert.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
\$ECHO -en "--x509_user_key=/etc/grid-security/voms/hostkey.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
EOF

# Turn off default enabling of the service
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
sed -e 's/\(chkconfig: \)\w*/\1-/' \
    -e '/Default-Start/d' \
    -e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
   $RPM_BUILD_ROOT%{_datadir}/init.d/%{name} > \
   $RPM_BUILD_ROOT%{_initrddir}/%{name}
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

mkdir -p VOMS_C_API
cp -pr doc/apidoc/api/VOMS_C_API/html VOMS_C_API
install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf VOMS_C_API

mkdir -p VOMS_CC_API
cp -pr doc/apidoc/api/VOMS_CC_API/html VOMS_CC_API
install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf VOMS_CC_API

mv $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar \
   $RPM_BUILD_ROOT%{_javadir}/vomsjapi-%{version}.jar
ln -s vomsjapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -pr javadoc $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi-%{version}
ln -s vomsjapi-%{version} $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre server
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || useradd -r -g %{name} \
    -d %{_sysconfdir}/%{name} -s /sbin/nologin -c "VOMS Server Account" %{name}
exit 0

%post server
if [ $1 = 1 ]; then
    /sbin/chkconfig --add %{name}
fi

%preun server
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del %{name}
fi

%postun server
if [ $1 -ge 1 ]; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%post -n vomsjapi
%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif

%postun -n vomsjapi
%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so.*
%{_libdir}/libvomsapi_nog.so.*
%{_libdir}/libvomsc.so.*
%config(noreplace) %{_sysconfdir}/vomses
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/vomsdir
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/vomses.template
%doc AUTHORS LICENSE

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so
%{_libdir}/libvomsapi_nog.so
%{_libdir}/libvomsc.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/acstack.h
%{_includedir}/%{name}/newformat.h
%{_includedir}/%{name}/vomsssl.h
%{_includedir}/%{name}/voms_api.h
%{_includedir}/%{name}/voms_api_nog.h
%{_includedir}/%{name}/voms_apic.h
%{_datadir}/aclocal/%{name}.m4

%files doc
%defattr(-,root,root,-)
%doc VOMS_C_API
%doc VOMS_CC_API

%files clients
%defattr(-,root,root,-)
%{_bindir}/voms-proxy-destroy
%{_bindir}/voms-proxy-info
%{_bindir}/voms-proxy-init
%{_bindir}/voms-proxy-fake
%{_bindir}/voms-proxy-list
%{_mandir}/man1/voms-proxy-destroy.1*
%{_mandir}/man1/voms-proxy-info.1*
%{_mandir}/man1/voms-proxy-init.1*
%{_mandir}/man1/voms-proxy-fake.1*
%{_mandir}/man1/voms-proxy-list.1*

%files server
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/grid-security/%{name}
%attr(-,voms,voms) %dir %{_localstatedir}/log/%{name}
%{_datadir}/%{name}/mysql2oracle
%{_datadir}/%{name}/upgrade1to2
%{_datadir}/%{name}/voms.data
%{_datadir}/%{name}/voms_install_db
%{_datadir}/%{name}/voms-ping
%{_datadir}/%{name}/voms_replica_master_setup.sh
%{_datadir}/%{name}/voms_replica_slave_setup.sh
%{_mandir}/man8/voms.8*
%doc INSTALL.Fedora

%files -n vomsjapi
%defattr(-,root,root,-)
%{_javadir}/vomsjapi.jar
%{_javadir}/vomsjapi-%{version}.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif
%doc AUTHORS LICENSE

%files -n vomsjapi-javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/vomsjapi
%doc %{_javadocdir}/vomsjapi-%{version}

%changelog
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0

* Thu Sep 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-3
- Add an empty /etc/vomses file to the main package to avoid error messages
- Let the voms user own only necessary directories
- Additional fixes for the server start-up script

* Tue Aug 25 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-2
- Add the /etc/voms directory to the server package
- Add setup instructions to the server package
- Run the server as non-root

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-1
- Upstream 1.9.11 (CVS tag glite-security-voms_R_1_9_11)
- Enable Java AOT bits

* Mon Jun 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.8.1-1
- Upstream 1.9.8.1 (CVS tag glite-security-voms_R_1_9_8_1)
- Build Java API

* Thu Feb 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.2-1
- Upstream 1.9.2 (CVS tag glite-security-voms_R_1_9_2)

* Fri Feb 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.1-1
- Upstream 1.9.1 (CVS tag glite-security-voms_R_1_9_1)

* Tue Jan 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.10-1
- Upstream 1.8.10 (CVS tag glite-security-voms_R_1_8_10)
- Rebuild against distribution Globus
- Add clear SSL error patch needed for openssl > 0.9.8b
- Add missing return value patch

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.9-1ng
- Upstream 1.8.9 (CVS tag glite-security-voms_R_1_8_9)
- Rebuild against Globus 4.0.8-0.11

* Thu May 15 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-4ng
- Add missing include patch

* Sat Apr 26 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-3ng
- Rebuild against Globus 4.0.7-0.10

* Sun Nov 25 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-2ng
- Fix GPT_LOCATION and GLOBUS_LOCATION detection in spec file

* Mon Oct 29 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-1ng
- Upstream 1.7.24 (CVS tag glite-security-voms_R_1_7_24_1)

* Mon Oct 15 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.23-1ng
- Upstream 1.7.23 (CVS tag glite-security-voms_R_1_7_23_1)

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-3ng
- Move /etc/voms/vomses back to /etc/vomses
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-2ng
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Mon Sep 10 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-1ng
- Try to link against system crypto library when Globus library is not
  available
- Make /etc/grid-security/vomsdir part of the voms sub-package
- Drop RPM prefix /etc
- Move the vomses.template to /etc/voms
- Use dashes instead of underscore in voms-install-replica.1 man page
- Do not try to link against system crypt library. Voms now
  does this internally.
- Upstream 1.7.22 (CVS tag glite-security-voms_R_1_7_22_1)

* Mon Jul 16 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-5ng
- Drop voms-struct_change.patch - problem is with libxml2

* Sat Jul 14 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-4ng
- Add missing openssl-devel dependency in voms-devel

* Thu Jul 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-3ng
- Add patch:
  - voms-struct_change.patch
    - Change API slightly - but now works with libxml2

* Thu Jul 08 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-2ng
- Make conditinal dependency on expat-devel (OpenSuSE 10.20 has only expat)

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-1ng
- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1) 

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-2ng
- Added patches:
  - voms-openssl_portability.patch
    - Support for newer OpenSSL-0.9.8
  - voms-isoc90_portability.patch
    - Support for older compilers
- Added openssl-devel build dependency

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-1ng
- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2) 
- Remove patches (use shell substitutions instead)
- Disable Java API build

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-3ng
- Added Globus dependencies to voms-devel

* Mon Jul 24 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-2ng
- Fix dependency typo: Requires -> BuildRequires

* Sat May 06 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-1ng
- Many changes since upstream changed quite a lot.
- Added README.NorduGrid with packaging information
- Patches:
  - voms_openssl-0.9.8.patch
    - Support for OpenSSL 0.9.8
  - voms_noglobusopenssl-1.6.20.patch
    - Use system openssl rather than the one from Globus
    - Patch reworked for voms 1.6.20
  - Dont use project based (gLite) include paths
- Pseudo patches (fixes made at runtime and not from static patch files)
  - Fix broken --libexecdir support for configure
    (some systems do not have libexecdir = <prefix>/libexec)
  - Drop all documents except man pages which are pre-generated
    (section 3 man pages are skipped as well)
  - Do not use edg- prefix
    (can be turned on/off through macro)
  - Install flavored libraries in addition to non-flavored
    (can be turned on/off through macro)
  - Put start-up script in /etc/init.d
  - Move configuration files from <prefix>/etc to /etc

* Mon Dec 19 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-2
- Add patch voms_doc.patch to disable html and ps documentation
  and add man-mages and pdf files to distribution (make dist)
- Use rpm switch: --define "_autotools_bootstrap 1" to rebuild
  documentation and create "make dist" target
- Add patch voms_nohardcodelibexecdir.patch which use the libexecdir
  from configure rather than the hardcoded prefix/libexec

* Sun Nov 27 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-1
- Add patch voms_ssl_include.patch to add external openssl includes.
  Would be better to query globus_openssl about this

* Tue Oct 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.7-1
- Modfiy voms_noglobusopenssl.patch to match upstream
- Add patch voms_nops.patch to disable postscript versions of
  reference manual

* Fri Jun 17 2005 Anders W??n?nen <waananen at nbi.dk> - 1.5.4-1
- Remove the following patches:
  - voms_namespace.patch - Fixed in upstream
  - voms_external_mysql++-1.4.1.patch - Obsolete since mysql++ is no
    longer needed
  - voms-no_libs.path - Fixed in upstream
- Add Globus dependencies

* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-3
- Do not hardcode Globus flavor but try to guess
- Remove explicit globus rpm Requirement
- Use external openssl - not globus_openssl

* Mon May 02 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-2
- Remove automake cache
- Add explicit dependency on mysql++-devel

* Sat Apr 30 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-1
- New upstream
- autogen.sh -> autobuild.sh

* Mon Apr 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.3.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:08:49 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:34:27 -0000	1.2
@@ -0,0 +1 @@
+voms-1.9.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:08:49 -0000	1.1
+++ sources	10 Sep 2009 02:34:27 -0000	1.2
@@ -0,0 +1 @@
+86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz



From cwickert at fedoraproject.org  Thu Sep 10 02:35:09 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 02:35:09 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11 xfce4-settings.spec,1.12,1.13
Message-ID: <20090910023509.1BDF711C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19827

Modified Files:
	xfce4-settings.spec 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Fix xfconf channel for keyboard repeat rate setting
- Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)
- Make sure xfce4-settings-helper only gets started in Xfce
- Fix directory ownership issue



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-settings.spec	21 Apr 2009 02:26:52 -0000	1.12
+++ xfce4-settings.spec	10 Sep 2009 02:35:08 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,6 +8,12 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
+# mew libxklavier 4 API in Fedora 12
+Patch1:         xfce4-settings-4.6.1-xkl.patch
+# http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
+Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
+# Fix typo in xfce-keyboard-settings
+Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +43,11 @@ This package includes the settings manag
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 12
+%patch1 -p1 -b .xkl
+%endif
+%patch2 -p1 -b .timeout
+%patch3 -p1 -b .keyrepeat
 %patch10 -p1 -b .vendor
 
 %build
@@ -48,41 +59,48 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-display-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-keyboard-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-mouse-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-ui-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-accessibility-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
+desktop-file-install                                            \
+        --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/    \
+        --delete-original                                       \
+        --add-only-show-in=XFCE                                 \
+        --remove-key=Terminal                                   \
+        ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
+
 %find_lang %{name}
 
 %clean
@@ -93,9 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS TODO COPYING
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
-%dir %{_sysconfdir}/xdg/xfce4
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 %{_bindir}/xfce4-accessibility-settings
 %{_bindir}/xfce4-appearance-settings
@@ -109,6 +124,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Fix xfconf channel for keyboard repeat rate setting
+- Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)
+- Make sure xfce4-settings-helper only gets started in Xfce
+- Fix directory ownership issue
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
+- Update for new libxklavier
+
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
 - Update to 4.6.1
 



From ellert at fedoraproject.org  Thu Sep 10 02:36:47 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:36:47 +0000 (UTC)
Subject: rpms/voms/F-10 import.log, NONE, 1.1 voms-distribution-globus.patch,
	NONE, 1.1 voms-extra-vomses-java.patch, NONE,
	1.1 voms-fix-enable-glite.patch, NONE, 1.1 voms-gcj.patch, NONE,
	1.1 voms-initscript.patch, NONE, 1.1 voms-install-db.patch, NONE,
	1.1 voms-jar-perms.patch, NONE, 1.1 voms-java-clone-cast.patch,
	NONE, 1.1 voms-javadoc.patch, NONE, 1.1 voms-nolib64.patch, NONE,
	1.1 voms-notknown-msg.patch, NONE, 1.1 voms-openssl.patch, NONE,
	1.1 voms-pipe-buf.patch, NONE, 1.1 voms-portability.patch, NONE,
	1.1 voms-shell-syntax.patch, NONE, 1.1 voms.INSTALL, NONE,
	1.1 voms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910023647.2906911C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20400/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-distribution-globus.patch 
	voms-extra-vomses-java.patch voms-fix-enable-glite.patch 
	voms-gcj.patch voms-initscript.patch voms-install-db.patch 
	voms-jar-perms.patch voms-java-clone-cast.patch 
	voms-javadoc.patch voms-nolib64.patch voms-notknown-msg.patch 
	voms-openssl.patch voms-pipe-buf.patch voms-portability.patch 
	voms-shell-syntax.patch voms.INSTALL voms.spec 
Log Message:
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0



--- NEW FILE import.log ---
voms-1_9_11-4_fc11:F-10:voms-1.9.11-4.fc11.src.rpm:1252550169

voms-distribution-globus.patch:
 acinclude.m4 |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE voms-distribution-globus.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
@@ -66,11 +66,6 @@
 # ---------------------------------------------
 AC_DEFUN([AC_OPENSSL],
 [
-  AC_ARG_WITH(openssl_prefix,
-              [ --with-openssl-prefix=PFX    prefix where OpenSSL (non-globus) is installed. (/usr)],
-              [with_openssl_prefix="$withval"],
-              [with_openssl_prefix=/usr])
-
   AC_ARG_WITH(openssl_libs,
               [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
               [ with_openssl_libs="$withval"],
@@ -80,16 +75,11 @@
      AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
   fi  
 
-  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
-
-  AC_LANG_PUSH(C)
-  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
-  AC_LANG_POP(C) 
+  PKG_CHECK_MODULES(OPENSSL, [openssl], [
+  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+  found=yes], [found=no])
 
   if test "x$found" = "xyes"; then
-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
     AC_SUBST(NO_GLOBUS_FLAGS)
     AC_SUBST(OPENSSL_LIBS)
     AC_MSG_CHECKING([for system OpenSSL version])
@@ -105,11 +95,10 @@
 #include <openssl/opensslv.h>
 OPENSSL_VERSION_TEXT
 HERE
-    openssl_version=`$CPP -I$NO_GLOBUS_FLAGS -o - -P conftest.h`
+    openssl_version=`$CPP $NO_GLOBUS_FLAGS -o - -P conftest.h`
     AC_MSG_RESULT($openssl_version)
     rm -f conftest.h
   fi
-  LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 ])
 
 # AC_GLOBUS checks globus prefix, looks for globus 
@@ -119,6 +108,11 @@
 # -------------------------------------------------------
 AC_DEFUN([AC_GLOBUS],
 [
+    PKG_CHECK_MODULES(GLOBUS_GSS, [globus-gssapi-gsi globus-gss-assist], [
+    GLOBUS_CFLAGS=$GLOBUS_GSS_CFLAGS
+    PKG_CHECK_MODULES(GLOBUS_GSS_API, [openssl])
+    ], [
+
     AC_ARG_WITH(globus_prefix,
 	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
 	[with_globus_prefix="$withval"],
@@ -165,6 +159,8 @@
 
     AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
 
+    ])
+
     if test "x$with_globus_flavor" = "x" ; then
       if test "x$USE_OLDGAA_LIB" = "x"; then
         USE_OLDGAA_LIB="liboldgaa.la"

voms-extra-vomses-java.patch:
 VOMSESFileParser.java |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE voms-extra-vomses-java.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2009-07-01 15:06:24.328378870 +0200
@@ -62,6 +62,12 @@
 
         List list = new ArrayList();
 
+        File defaultLocFile = new File( File.separator + "etc"
+                + File.separator + "vomses" );
+
+        if ( defaultLocFile.exists() )
+            list.add( defaultLocFile );
+
         if ( gliteLoc != null ) {
             File gliteLocFile = new File( gliteLoc + File.separator + "etc"
                     + File.separator + "vomses" );
@@ -97,6 +103,12 @@
         if ( gliteVomses.exists() )
             list.add( gliteVomses );
 
+        File vomsVomses = new File( System.getProperty( "user.home" )
+                + File.separator + ".voms" + File.separator + "vomses" );
+
+        if ( vomsVomses.exists() )
+            list.add( vomsVomses );
+
         vomsesPaths = list;
 
     }

voms-fix-enable-glite.patch:
 acinclude.m4 |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE voms-fix-enable-glite.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-07-01 13:03:05.768376649 +0200
@@ -587,12 +587,18 @@
 [
     AC_ARG_ENABLE(glite,
         [  --enable-glite     enable gLite  ],
-        [ac_enable_glite="yes"],
-        [ac_enable_glite="no"])
+        [
+          case "$enableval" in
+          yes) glite="yes" ;;
+          no) glite="no" ;;
+          *) AC_MSG_ERROR(bad value $(enableval) for --enable-glite) ;;
+          esac
+        ],
+        [glite="yes"])
 
-    AM_CONDITIONAL(ENABLE_GLITE, test x$ac_enable_glite = xyes)
+    AM_CONDITIONAL(ENABLE_GLITE, test x$glite = xyes)
 
-    if test "x$ac_enable_glite" = "xno"; then
+    if test "x$glite" = "xno"; then
     	DISTTAR=$WORKDIR
     	AC_SUBST(DISTTAR)
 #	EDG_SET_RPM_TOPDIR
@@ -601,7 +607,7 @@
     	AC_SUBST(VAR_LOCATION_ENV, "VOMS_LOCATION_VAR")
     	AC_DEFINE(LOCATION_ENV, "VOMS_LOCATION", [Environment variable name])
     	AC_DEFINE_UNQUOTED(LOCATION_DIR, "$prefix", [Location of system directory])
-    	AC_DEFINE(USER_DIR, ".edg", [Location of user directory])
+    	AC_DEFINE(USER_DIR, ".voms", [Location of user directory])
     else
     	AC_MSG_RESULT([Preparing for gLite environment])
     	AC_GLITE

voms-gcj.patch:
 BasicVOMSTrustStore.java |  682 -----------------------------------------------
 DirectoryList.java       |  142 +++++++++
 FileCertReader.java      |  492 +++++++++++++++++++++++++++++++++
 FileEndingIterator.java  |  137 +++++++++
 4 files changed, 771 insertions(+), 682 deletions(-)

--- NEW FILE voms-gcj.patch ---
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-08-29 07:52:08.000000000 +0200
@@ -13,69 +13,11 @@
  * follows.
  *
  *********************************************************************/
-/*
- * Copyright (c) Members of the EGEE Collaboration. 2004.
- * See http://eu-egee.org/partners/ for details on the copyright holders.
- * For license conditions see the license file or http://eu-egee.org/license.html
- */
-
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * DirectoryList.java
- *
- * @author  Joni Hahkala
- * Created on December 10, 2001, 6:50 PM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileEndingIterator.java
- *
- * @author  Joni Hahkala
- * Created on December 3, 2001, 9:16 AM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileCertReader.java
- *
- * @author  Joni Hahkala
- * Created on March 27, 2002, 8:24 PM
- */
 
 package org.glite.voms;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.PrivateKey;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -86,632 +28,8 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ASN1InputStream;
 import org.glite.voms.ac.ACTrustStore;
 
-/** Lists all the files in the given directory that end with
- * a certain ending.
- */
-class FileEndingIterator {
-    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
-
-    /** The file ending.
-     */
-    protected String ending;
-
-    /** A flag to show that there are more files that match.
-     */
-    protected boolean nextFound = false;
-
-    /** The list of files in the directory.
-     */
-    protected File[] fileList;
-
-    /** The index of the next match in the fileList.
-     */
-    protected int index = 0;
-
-    /** Creates new FileIterator and searches the first match.
-     * @param path The directory used for the file search.
-     * @param ending The file ending to search for.
-     */
-    public FileEndingIterator(String path, String ending) {
-        this.ending = ending;
-
-        try {
-            // open the directory
-            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
-
-            // list the files and dirs inside
-            fileList = directory.listFiles();
-
-            // find the first match for the ending
-            nextFound = findNext();
-        } catch (Exception e) {
-            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
-
-            //            e.printStackTrace();
-            return;
-        }
-    }
-
-    /** Used to get the next matching file.
-     * @return Returns the next matching file.
-     */
-    public File next() {
-        if (nextFound == false) {
-            return null;
-        }
-
-        File current = fileList[index++];
-
-        nextFound = findNext();
-
-        return current;
-    }
-
-    /** Used to check that there are more matching files to get
-     * using next().
-     * @return Returns true if there are more matching files.
-     */
-    public boolean hasNext() {
-        return nextFound;
-    }
-
-    /** Finds the next matching file in the list of files.
-     * @return Returns true if a matching file was found.
-     */
-    protected boolean findNext() {
-        try {
-            // search the next file with proper ending
-            while ((index < fileList.length) &&
-                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
-                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
-                index++;
-            }
-        } catch (Exception e) {
-            logger.error("Error while reading directory " + e.getMessage());
-
-            //            e.printStackTrace(System.out);
-            return false;
-        }
-
-        // check if the loop ended because of a match or because running out of choices.
-        if (index < fileList.length) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-/** Reads all certificates from given files, accepts binary form of DER encoded certs and
- * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
- * the actual certificate that has to begin with "-----BEGIN".
- * Should accept multiple certs in one file, not tested!
- */
-class FileCertReader {
-    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
-    static final int BUF_LEN = 1000;
-    static final byte CARR = '\r';
-    static final byte NL = '\n';
-
-    /** The type for TrustAnchor
-     */
-    static final int TYPE_ANCHOR = 100;
-
-    /** The type for certificate revocation list
-     */
-    static final int TYPE_CRL = 101;
-
-    /** the type for X509 certificate
-     */
-    static final int TYPE_CERT = 102;
-
-    static {
-        if (Security.getProvider("BC") == null) {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    CertificateFactory certFactory;
-
-    /** Creates a new instance of CertReader. */
-    public FileCertReader() throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", "BC");
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider.
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(Provider provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(String provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument. See DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if certificate reading from the files
-     * fails.
-     * @return Returns the Vector of certificates read.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCerts(String files) throws IOException, CertificateException {
-        Vector certs = readFiles(files, TYPE_CERT);
-
-        Iterator certIter = certs.iterator();
-
-        logger.debug("read certs: ");
-
-        while (certIter.hasNext()) {
-            X509Certificate cert = (X509Certificate) certIter.next();
-            logger.debug("Read cert: " + cert.getSubjectDN().toString());
-        }
-
-        return certs;
-    }
-
-    public PrivateKey readPrivateKey(String file) throws IOException {
-        File keyfile = new File(file);
-
-        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
-        skipToKeyBeginning(fis);
-
-        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument and makes TrustAnchors from them. See
-     * DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the certificate reading fails.
-     * @return Returns a Vector of TrustAnchors read from the
-     * files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readAnchors(String files) throws IOException, CertificateException {
-        Vector anchors = readFiles(files, TYPE_ANCHOR);
-
-        Iterator anchorIter = anchors.iterator();
-
-        logger.debug("read TrustAnchors: ");
-
-        while (anchorIter.hasNext()) {
-            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
-            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
-        }
-
-        return anchors;
-    }
-
-    /** Reads the certificate revocation lists (CRLs) from the
-     * files defined in the argument. See DirectoryList for
-     * file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the CRL reading failed.
-     * @return Returns a vector of CRLs read from the files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCRLs(String files) throws IOException, CertificateException {
-        Vector crls = readFiles(files, TYPE_CRL);
-
-        Iterator crlIter = crls.iterator();
-
-        logger.debug("read CRLs: ");
-
-        while (crlIter.hasNext()) {
-            X509CRL crl = (X509CRL) crlIter.next();
-            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
-        }
-
-        return crls;
-    }
-
-    /** Reads the certificates or CRLs from the files defined by
-     * the first argument, see DirectoryList for file definition
-     * format.
-     * @param files The file definition.
-     * @param type The type of things to read from the files.
-     * Currently supported are TYPE_ANCHOR,
-     * TYPE_CRL and TYPE_CERT defined in this class.
-     * @throws CertificateException Thrown if the reading of files fails.
-     * @return Returns a Vector of objects of type given that
-     * were read from the files given.
-     * @see org.glite.security.util.DirectoryList
-     */
-    private Vector readFiles(String files, int type) throws CertificateException {
-        Vector storeVector = new Vector();
-
-        try {
-            // load CA certificates
-            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
-
-            Iterator CAFileIter = dir.getListing().iterator();
-
-            // go through the files
-            while (CAFileIter.hasNext()) { // go through the files reading the certificates
-
-                File nextFile = (File) CAFileIter.next();
-
-                storeVector.addAll(readFile(nextFile, type));
-            }
-        } catch (IOException e) {
-            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
-
-            throw new CertificateException("Error while reading certificates or CRLs: " +
-                e.getMessage());
-        }
-
-        return storeVector;
-    }
-
-    /** Reads the objects of given type from the File.
-     * @param certFile The file to read.
-     * @param type The type of objects to read form the file.
-     * @throws IOException Thrown if the reading of objects of given type
-     * fails.
-     * @return Returns the Vector of objects read form the file.
-     */
-    public Vector readFile(File certFile, int type) throws IOException {
-        BufferedInputStream binStream = null;
-        Vector objects = new Vector();
-
-        try {
-            // get the buffered stream to facilitate marking
-            binStream = new BufferedInputStream(new FileInputStream(certFile));
-
-            while (binStream.available() > 0) {
-                Object obj = objectReader(binStream, type);
-
-                if (obj != null) {
-                    objects.add(obj);
-                }
-
-                skipEmptyLines(binStream);
-            }
-        } catch (Exception e) {
-            logger.fatal("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-
-            throw new IOException("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-        } finally {
-            if (binStream != null) {
-                binStream.close();
-            }
-        }
-
-        return objects;
-    }
-
-    /** Reads a certificate or a CRL from the stream, doing some
-     * error correction.
-     * @param binStream The stream to read the object from.
-     * @param type The type of object to read from the stream.
-     * @throws CertificateException Thrown if an error occurs while reading the object.
-     * @throws IOException Thrown if an error occurs while reading the object.
-     * @return Returns the object read.
-     */
-    public Object objectReader(BufferedInputStream binStream, int type)
-        throws CertificateException, IOException {
-        Object object = null;
-        int errors = 0; // no errors in the beginning
-        binStream.mark(10000);
-
-        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
-             // second with skipping possible garbage in the beginning.
-
-            try {
-                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
-                    // before the actual base64 encoded certificate
-                    errors = 2; // if this try fails, don't try anymore
-
-                    skipToCertBeginning(binStream); // skip the garbage
-                }
-
-                binStream.mark(100000);
-
-                binStream.reset();
-
-                object = readObject(binStream, type);
-            } catch (Exception e) {
-                if (errors != 0) { // if the error persists after first pass, fail
-                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
-                    throw new CertificateException("Certificate or CRL reading failed: " +
-                        e.getMessage());
-                }
-
-                errors = 1; // first try failed, try again with skipping
-                binStream.reset(); // rewind the file to the beginning of this try
-            }
-        } while (errors == 1); // try again after first try
-
-        return object;
-    }
-
-    /** Does the actual reading of the object.
-     * @param binStream The stream to read the object from.
-     * @param type The type of the object.
-     * @throws CertificateException Thrown if there is a problem reading the object.
-     * @return Returns the object read or null if no object was found.
-     */
-    public Object readObject(BufferedInputStream binStream, int type)
-        throws CertificateException {
-        Object obj;
-
-        if (type == TYPE_CRL) { // reading certificate revocation lists
-
-            try {
-                obj = certFactory.generateCRL(binStream);
-            } catch (CRLException e) {
-                logger.error("CRL loading failed: " + e.getMessage());
-                throw new CertificateException(e.getMessage());
-            }
-        } else { // reading certs or trust anchors
-
-            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
-
-            if (cert == null) {
-                return null;
-            }
-
-            if (type == TYPE_ANCHOR) {
-                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
-                obj = new TrustAnchor(cert, null);
-            } else {
-                if (type == TYPE_CERT) {
-                    obj = cert;
-                } else {
-                    logger.fatal("Internal error: Invalid data type " + type +
-                        " when trying to read certificate");
-                    throw new CertificateParsingException("Internal error: Invalid data type " +
-                        type + " when trying to read certificate");
-                }
-            }
-        }
-
-        return obj;
-    }
-
-    /** Skips everything in front of "-----BEGIN" in the stream.
-     * @param stream The stream to read and skip.
-     * @throws IOException Thrown if there is a problem skipping.
-     */
-    static public void skipToCertBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    static public void skipToKeyBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1)
-                index = buffer.indexOf("----BEGIN ENCRYPTED");
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    /** Skips empty lines in the stream.
-     * @param stream The stream possibly containing empty lines.
-     * @throws IOException Thrown if a problem occurs.
-     */
-    static public void skipEmptyLines(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-
-            int i = 0;
-
-            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
-                i++;
-            }
-
-            stream.reset();
-            stream.skip(i);
-
-            if (i < num) {
-                stream.mark(10000);
-
-                return;
-            } else {
-                stream.mark(BUF_LEN);
-            }
-        }
-    }
-}
-
-/** This class lists all the files defined in the constructor.
- * The definitions can be in three forms.
- * 1. absolute file (/tmp/test.txt)
- * 2. absolute path (/tmp)
- * 3. a wildcard file (/tmp/*.txt)
- *
- * In case 1. only the file is returned.
- * In case 2. all files in the directory are returned
- * In case 3. all the files in the directory tmp having
- * the .txt ending are returned.
- *
- * The returning means the return of the getListing method.
- */
-class DirectoryList {
-    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
-    List files = null;
-
-    /** Creates a new instance of DirectoryList
-     * @param path The file definition, see class description above.
-     * @throws Exception Thrown if the path was invalid
-     */
-    public DirectoryList(String path) throws IOException {
-        // splits the absolute? filename from the wildcard
-        String[] parts = path.split("\\*");
-
-        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
-        if ((parts.length < 1) || (parts.length > 2)) {
-            return;
-        }
-
-        // check whether the first and only part is a file or directory
-        if (parts.length == 1) {
-            // open the directory or file
-            File fileOrDir = new File(parts[0]);
-
-            // if the path given was fully specified filename
-            if (fileOrDir.isFile()) {
-                // set the file as the only member in the vector and finish
-                files = new Vector();
-                files.add(fileOrDir);
-
-                return;
-            }
-
-            // the path defined a directory, so get all files
-            File[] fileDirArray;
-
-            // list the files and dirs inside
-            fileDirArray = fileOrDir.listFiles();
-
-            if (fileDirArray == null) {
-                logger.error("No files found matching " + path);
-                throw new IOException("No files found matching " + path);
-            }
-
-            // get the array containing all the files and directories
-            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
-
-            files = new Vector();
-
-            // add all the files to the files list and finish
-            while (filesAndDirs.hasNext()) {
-                File nextFile = (File) filesAndDirs.next();
-
-                if (nextFile.isFile()) {
-                    files.add(nextFile);
-                }
-            }
-
-            return;
-        } else {
-            // this is a directory+ending combination
-            files = new Vector();
-
-            // get all the files matching the definition.
-            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
-
-            while (iterator.hasNext()) {
-                files.add(iterator.next());
-            }
-
-            return;
-        }
-    }
-
-    /** Used to get the file listing, the list of files matching
-     * the definition in constructor.
-     * @return Returns the list of files matching the definition
-     * given in the constructor.
-     */
-    public List getListing() {
-        return files;
-    }
-}
 
 /**
  * @deprecated  This class does not expose the necessary information. Use
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java	2009-08-29 07:22:01.000000000 +0200
@@ -0,0 +1,142 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * DirectoryList.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 10, 2001, 6:50 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+
+/** This class lists all the files defined in the constructor.
+ * The definitions can be in three forms.
+ * 1. absolute file (/tmp/test.txt)
+ * 2. absolute path (/tmp)
+ * 3. a wildcard file (/tmp/*.txt)
+ *
+ * In case 1. only the file is returned.
+ * In case 2. all files in the directory are returned
+ * In case 3. all the files in the directory tmp having
+ * the .txt ending are returned.
+ *
+ * The returning means the return of the getListing method.
+ */
+class DirectoryList {
+    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
+    List files = null;
+
+    /** Creates a new instance of DirectoryList
+     * @param path The file definition, see class description above.
+     * @throws Exception Thrown if the path was invalid
+     */
+    public DirectoryList(String path) throws IOException {
+        // splits the absolute? filename from the wildcard
+        String[] parts = path.split("\\*");
+
+        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
+        if ((parts.length < 1) || (parts.length > 2)) {
+            return;
+        }
+
+        // check whether the first and only part is a file or directory
+        if (parts.length == 1) {
+            // open the directory or file
+            File fileOrDir = new File(parts[0]);
+
+            // if the path given was fully specified filename
+            if (fileOrDir.isFile()) {
+                // set the file as the only member in the vector and finish
+                files = new Vector();
+                files.add(fileOrDir);
+
+                return;
+            }
+
+            // the path defined a directory, so get all files
+            File[] fileDirArray;
+
+            // list the files and dirs inside
+            fileDirArray = fileOrDir.listFiles();
+
+            if (fileDirArray == null) {
+                logger.error("No files found matching " + path);
+                throw new IOException("No files found matching " + path);
+            }
+
+            // get the array containing all the files and directories
+            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
+
+            files = new Vector();
+
+            // add all the files to the files list and finish
+            while (filesAndDirs.hasNext()) {
+                File nextFile = (File) filesAndDirs.next();
+
+                if (nextFile.isFile()) {
+                    files.add(nextFile);
+                }
+            }
+
+            return;
+        } else {
+            // this is a directory+ending combination
+            files = new Vector();
+
+            // get all the files matching the definition.
+            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
+
+            while (iterator.hasNext()) {
+                files.add(iterator.next());
+            }
+
+            return;
+        }
+    }
+
+    /** Used to get the file listing, the list of files matching
+     * the definition in constructor.
+     * @return Returns the list of files matching the definition
+     * given in the constructor.
+     */
+    public List getListing() {
+        return files;
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java	2009-08-29 07:55:09.000000000 +0200
@@ -0,0 +1,492 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileCertReader.java
+ *
+ * @author  Joni Hahkala
+ * Created on March 27, 2002, 8:24 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.cert.CRLException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.asn1.ASN1InputStream;
+
+/** Reads all certificates from given files, accepts binary form of DER encoded certs and
+ * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
+ * the actual certificate that has to begin with "-----BEGIN".
+ * Should accept multiple certs in one file, not tested!
+ */
+class FileCertReader {
+    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
+    static final int BUF_LEN = 1000;
+    static final byte CARR = '\r';
+    static final byte NL = '\n';
+
+    /** The type for TrustAnchor
+     */
+    static final int TYPE_ANCHOR = 100;
+
+    /** The type for certificate revocation list
+     */
+    static final int TYPE_CRL = 101;
+
+    /** the type for X509 certificate
+     */
+    static final int TYPE_CERT = 102;
+
+    static {
+        if (Security.getProvider("BC") == null) {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+    }
+
+    CertificateFactory certFactory;
+
+    /** Creates a new instance of CertReader. */
+    public FileCertReader() throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", "BC");
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider.
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(Provider provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(String provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument. See DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if certificate reading from the files
+     * fails.
+     * @return Returns the Vector of certificates read.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCerts(String files) throws IOException, CertificateException {
+        Vector certs = readFiles(files, TYPE_CERT);
+
+        Iterator certIter = certs.iterator();
+
+        logger.debug("read certs: ");
+
+        while (certIter.hasNext()) {
+            X509Certificate cert = (X509Certificate) certIter.next();
+            logger.debug("Read cert: " + cert.getSubjectDN().toString());
+        }
+
+        return certs;
+    }
+
+    public PrivateKey readPrivateKey(String file) throws IOException {
+        File keyfile = new File(file);
+
+        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
+        skipToKeyBeginning(fis);
+
+        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument and makes TrustAnchors from them. See
+     * DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the certificate reading fails.
+     * @return Returns a Vector of TrustAnchors read from the
+     * files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readAnchors(String files) throws IOException, CertificateException {
+        Vector anchors = readFiles(files, TYPE_ANCHOR);
+
+        Iterator anchorIter = anchors.iterator();
+
+        logger.debug("read TrustAnchors: ");
+
+        while (anchorIter.hasNext()) {
+            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
+            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
+        }
+
+        return anchors;
+    }
+
+    /** Reads the certificate revocation lists (CRLs) from the
+     * files defined in the argument. See DirectoryList for
+     * file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the CRL reading failed.
+     * @return Returns a vector of CRLs read from the files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCRLs(String files) throws IOException, CertificateException {
+        Vector crls = readFiles(files, TYPE_CRL);
+
+        Iterator crlIter = crls.iterator();
+
+        logger.debug("read CRLs: ");
+
+        while (crlIter.hasNext()) {
+            X509CRL crl = (X509CRL) crlIter.next();
+            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
+        }
+
+        return crls;
+    }
+
+    /** Reads the certificates or CRLs from the files defined by
+     * the first argument, see DirectoryList for file definition
+     * format.
+     * @param files The file definition.
+     * @param type The type of things to read from the files.
+     * Currently supported are TYPE_ANCHOR,
+     * TYPE_CRL and TYPE_CERT defined in this class.
+     * @throws CertificateException Thrown if the reading of files fails.
+     * @return Returns a Vector of objects of type given that
+     * were read from the files given.
+     * @see org.glite.voms.DirectoryList
+     */
+    private Vector readFiles(String files, int type) throws CertificateException {
+        Vector storeVector = new Vector();
+
+        try {
+            // load CA certificates
+            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
+
+            Iterator CAFileIter = dir.getListing().iterator();
+
+            // go through the files
+            while (CAFileIter.hasNext()) { // go through the files reading the certificates
+
+                File nextFile = (File) CAFileIter.next();
+
+                storeVector.addAll(readFile(nextFile, type));
+            }
+        } catch (IOException e) {
+            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
+
+            throw new CertificateException("Error while reading certificates or CRLs: " +
+                e.getMessage());
+        }
+
+        return storeVector;
+    }
+
+    /** Reads the objects of given type from the File.
+     * @param certFile The file to read.
+     * @param type The type of objects to read form the file.
+     * @throws IOException Thrown if the reading of objects of given type
+     * fails.
+     * @return Returns the Vector of objects read form the file.
+     */
+    public Vector readFile(File certFile, int type) throws IOException {
+        BufferedInputStream binStream = null;
+        Vector objects = new Vector();
+
+        try {
+            // get the buffered stream to facilitate marking
+            binStream = new BufferedInputStream(new FileInputStream(certFile));
+
+            while (binStream.available() > 0) {
+                Object obj = objectReader(binStream, type);
+
+                if (obj != null) {
+                    objects.add(obj);
+                }
+
+                skipEmptyLines(binStream);
+            }
+        } catch (Exception e) {
+            logger.fatal("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+
+            throw new IOException("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+        } finally {
+            if (binStream != null) {
+                binStream.close();
+            }
+        }
+
+        return objects;
+    }
+
+    /** Reads a certificate or a CRL from the stream, doing some
+     * error correction.
+     * @param binStream The stream to read the object from.
+     * @param type The type of object to read from the stream.
+     * @throws CertificateException Thrown if an error occurs while reading the object.
+     * @throws IOException Thrown if an error occurs while reading the object.
+     * @return Returns the object read.
+     */
+    public Object objectReader(BufferedInputStream binStream, int type)
+        throws CertificateException, IOException {
+        Object object = null;
+        int errors = 0; // no errors in the beginning
+        binStream.mark(10000);
+
+        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
+             // second with skipping possible garbage in the beginning.
+
+            try {
+                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
+                    // before the actual base64 encoded certificate
+                    errors = 2; // if this try fails, don't try anymore
+
+                    skipToCertBeginning(binStream); // skip the garbage
+                }
+
+                binStream.mark(100000);
+
+                binStream.reset();
+
+                object = readObject(binStream, type);
+            } catch (Exception e) {
+                if (errors != 0) { // if the error persists after first pass, fail
+                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
+                    throw new CertificateException("Certificate or CRL reading failed: " +
+                        e.getMessage());
+                }
+
+                errors = 1; // first try failed, try again with skipping
+                binStream.reset(); // rewind the file to the beginning of this try
+            }
+        } while (errors == 1); // try again after first try
+
+        return object;
+    }
+
+    /** Does the actual reading of the object.
+     * @param binStream The stream to read the object from.
+     * @param type The type of the object.
+     * @throws CertificateException Thrown if there is a problem reading the object.
+     * @return Returns the object read or null if no object was found.
+     */
+    public Object readObject(BufferedInputStream binStream, int type)
+        throws CertificateException {
+        Object obj;
+
+        if (type == TYPE_CRL) { // reading certificate revocation lists
+
+            try {
+                obj = certFactory.generateCRL(binStream);
+            } catch (CRLException e) {
+                logger.error("CRL loading failed: " + e.getMessage());
+                throw new CertificateException(e.getMessage());
+            }
+        } else { // reading certs or trust anchors
+
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
+
+            if (cert == null) {
+                return null;
+            }
+
+            if (type == TYPE_ANCHOR) {
+                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
+                obj = new TrustAnchor(cert, null);
+            } else {
+                if (type == TYPE_CERT) {
+                    obj = cert;
+                } else {
+                    logger.fatal("Internal error: Invalid data type " + type +
+                        " when trying to read certificate");
+                    throw new CertificateParsingException("Internal error: Invalid data type " +
+                        type + " when trying to read certificate");
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    /** Skips everything in front of "-----BEGIN" in the stream.
+     * @param stream The stream to read and skip.
+     * @throws IOException Thrown if there is a problem skipping.
+     */
+    static public void skipToCertBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    static public void skipToKeyBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1)
+                index = buffer.indexOf("----BEGIN ENCRYPTED");
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    /** Skips empty lines in the stream.
+     * @param stream The stream possibly containing empty lines.
+     * @throws IOException Thrown if a problem occurs.
+     */
+    static public void skipEmptyLines(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+
+            int i = 0;
+
+            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
+                i++;
+            }
+
+            stream.reset();
+            stream.skip(i);
+
+            if (i < num) {
+                stream.mark(10000);
+
+                return;
+            } else {
+                stream.mark(BUF_LEN);
+            }
+        }
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java	2009-08-29 07:24:52.000000000 +0200
@@ -0,0 +1,137 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileEndingIterator.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 3, 2001, 9:16 AM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+
+/** Lists all the files in the given directory that end with
+ * a certain ending.
+ */
+class FileEndingIterator {
+    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
+
+    /** The file ending.
+     */
+    protected String ending;
+
+    /** A flag to show that there are more files that match.
+     */
+    protected boolean nextFound = false;
+
+    /** The list of files in the directory.
+     */
+    protected File[] fileList;
+
+    /** The index of the next match in the fileList.
+     */
+    protected int index = 0;
+
+    /** Creates new FileIterator and searches the first match.
+     * @param path The directory used for the file search.
+     * @param ending The file ending to search for.
+     */
+    public FileEndingIterator(String path, String ending) {
+        this.ending = ending;
+
+        try {
+            // open the directory
+            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
+
+            // list the files and dirs inside
+            fileList = directory.listFiles();
+
+            // find the first match for the ending
+            nextFound = findNext();
+        } catch (Exception e) {
+            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
+
+            //            e.printStackTrace();
+            return;
+        }
+    }
+
+    /** Used to get the next matching file.
+     * @return Returns the next matching file.
+     */
+    public File next() {
+        if (nextFound == false) {
+            return null;
+        }
+
+        File current = fileList[index++];
+
+        nextFound = findNext();
+
+        return current;
+    }
+
+    /** Used to check that there are more matching files to get
+     * using next().
+     * @return Returns true if there are more matching files.
+     */
+    public boolean hasNext() {
+        return nextFound;
+    }
+
+    /** Finds the next matching file in the list of files.
+     * @return Returns true if a matching file was found.
+     */
+    protected boolean findNext() {
+        try {
+            // search the next file with proper ending
+            while ((index < fileList.length) &&
+                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
+                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
+                index++;
+            }
+        } catch (Exception e) {
+            logger.error("Error while reading directory " + e.getMessage());
+
+            //            e.printStackTrace(System.out);
+            return false;
+        }
+
+        // check if the loop ended because of a match or because running out of choices.
+        if (index < fileList.length) {
+            return true;
+        }
+
+        return false;
+    }
+}

voms-initscript.patch:
 voms.start.in |  186 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 64 deletions(-)

--- NEW FILE voms-initscript.patch ---
diff -ur voms-1.9.11.orig/src/install/voms.start.in voms-1.9.11/src/install/voms.start.in
--- voms-1.9.11.orig/src/install/voms.start.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms.start.in	2009-09-03 10:10:17.574074641 +0200
@@ -19,9 +19,19 @@
 #	voms servers.
 #
 # chkconfig: 2345 95 05
-# description: VOMS stands for Virtual Organization Membership System.
+# description: Virtual Organization Membership Service
 # processname: voms
 # pidfile: /var/run/voms.pid
+#
+### BEGIN INIT INFO
+# Provides:          voms
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Virtual Organization Membership Service
+# Description:       Virtual Organization Membership Service
+### END INIT INFO
 
 # Source networking configuration and check that networking is up.
 if [ -r /etc/sysconfig/network ] ; then
@@ -31,9 +41,16 @@
 
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
- at VAR_LOCATION_ENV@=${@VAR_LOCATION_ENV@:-$@LOCATION_ENV@/var}
 
-# check whether $@VAR_LOCATION_ENV@/var/lock/subsys exists
+if [ -z "$@VAR_LOCATION_ENV@" ] ; then
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
+fi
+
+# check whether $@VAR_LOCATION_ENV@/lock/subsys exists
 if ! test -d $@VAR_LOCATION_ENV@/lock/subsys ; then
     mkdir -p $@VAR_LOCATION_ENV@/lock/subsys
 fi
@@ -41,19 +58,38 @@
 # Default path
 basepath=$@LOCATION_ENV@
 binpath=${basepath}/sbin
-etcpath=${basepath}/etc
 
-# Source an auxiliary profile file if we have one, and pick up VOMS_OPTIONS and VOMS_USER
-if [ -r ${etcpath}/profile.d/voms.sh ] ; then
-    . ${etcpath}/profile.d/voms.sh
+if [ "$basepath" = "/usr" ] ; then
+    etcpath=/etc
+else
+    etcpath=${basepath}/etc
+fi
+
+RUN=yes
+
+# Source an auxiliary profile file if we have one and pick up VOMS_USER and RUN
+if [ -r ${etcpath}/default/voms ] ; then
+    . ${etcpath}/default/voms
+fi
+if [ -r ${etcpath}/sysconfig/voms ] ; then
+    . ${etcpath}/sysconfig/voms
+fi
+
+# Don't run until configuration is done
+if [ "x$RUN" != "xyes" ] ; then
+    echo "voms disabled, please adjust the configuration to your needs "
+    echo "and then set RUN to 'yes' in /etc/default/voms to enable it."
+    exit 0
 fi
 
 # add lib directory to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+fi
 
-voms=${binpath}/edg-voms
+voms=${binpath}/voms
 if !(test -x ${voms}) ; then
-    echo "Cannot find edg-voms." 
+    echo "Cannot find voms."
     exit 0
 fi
 
@@ -64,18 +100,22 @@
     # Start daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
 
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Starting $prog($vo): "
 
-            if test -f $@LOCATION_ENV@/etc/voms/$vo/tnsnames.ora ; then
-                tnsvalue=$@LOCATION_ENV@/etc/voms/$vo
+            if test -f ${etcpath}/voms/$vo/tnsnames.ora ; then
+                tnsvalue=${etcpath}/voms/$vo
             else
                 tnsvalue="$TNS_ADMIN"
             fi
@@ -84,21 +124,21 @@
                 read pid < $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
                 if test "x$pid" != "x"; then
                     if checkpid $pid; then
-                        echo "VOMS ($pid) is already running" && failure
+                        echo "VOMS ($pid) is already running"
                         continue;
                     fi
                 fi
             fi
 
             if [ -n "$VOMS_USER" ]; then
-                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
+                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf ${etcpath}/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
             else
-                TNS_ADMIN="$tnsvalue" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf
+                TNS_ADMIN="$tnsvalue" ${voms} --conf ${etcpath}/voms/$vo/voms.conf
             fi
 
-	          # get process id
-            pid=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            # get process id
+            pid=$(ps axo pid,args | grep "${voms} --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             NUM=$(($pid))
             if test $NUM -eq 0; then
                 RETVAL=1
@@ -110,12 +150,17 @@
                 RETGLOB=$(($RETGLOB + 1 ))
             fi
             [ "$RETVAL" -eq 0 ] && success || failure 
+            echo
         fi
     done
     
     return $RETGLOB
 }
 
+if [ -r /etc/init.d/functions ] ; then
+    . /etc/init.d/functions
+else
+
 success()
 {
     echo $1
@@ -151,6 +196,8 @@
     return $rc
 }
 
+fi
+
 checkpid() 
 {
     ps --pid $1 >> /dev/null
@@ -164,14 +211,14 @@
 # A function to stop a program.
 killprocs() {
     RC=0
-	# Test syntax.
+    # Test syntax.
     if [ "$#" -eq 0 ]; then
         echo $"Usage: killproc {pids} [signal]"
         return 1
     fi
     
     notset=0
-	# check for second arg to be kill level
+    # check for second arg to be kill level
     if [ "$2" != "" ] ; then
         killlevel=$2
     else
@@ -179,15 +226,15 @@
         killlevel="-9"
     fi
 
-        # Find pid.
+    # Find pid.
     pid=$1
 
-        # Kill it.
+    # Kill it.
     if [ -n "${pid:-}" ] ; then
         [ "$BOOTUP" = "verbose" -a -z "$LSB" ] && echo -n "$base "
         if [ "$notset" -eq "1" ] ; then
             if checkpid $pid 2>&1; then
-			   # TERM first, then KILL if not dead
+                # TERM first, then KILL if not dead
                 kill -TERM $pid
                 sleep 0.1
                 if checkpid $pid && sleep 1 &&
@@ -196,14 +243,14 @@
                     kill -KILL $pid
                     sleep 0.1
                 fi
-		        fi
+            fi
             checkpid $pid
             RC=$?
             [ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
             RC=$((! $RC))
-		# use specified level only
-		else
-		        if checkpid $pid >/dev/null 2>&1; then
+        else
+            # use specified level only
+            if checkpid $pid >/dev/null 2>&1; then
                 kill $killlevel $pid
                 RC=$?
                 [ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
@@ -214,7 +261,7 @@
         RC=1
     fi
     
-        # Remove pid file if any.
+    # Remove pid file if any.
     if [ "$notset" = "1" ]; then
         rm -f /var/run/$base.pid
     fi
@@ -226,18 +273,21 @@
     # Stop daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Stopping $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep|awk '{ print $2; }'|tr '\n' ' '`
-            dbname=`grep dbname $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
-            username=`grep username $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            dbname=`grep dbname ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            username=`grep username ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
             if test "x$username" = "x"; then
                 pids="";
                 pids2="";
@@ -255,16 +305,15 @@
                 fi
             fi
             if test -z "$pids"; then
-                failure; echo
-                RETVAL=1
+                echo "(already stopped)"
                 continue
             fi
             for pid in $pids; do
-                killprocs ${pid} ;
+                killprocs ${pid}
             done
             RETVAL=$?
             echo
-            [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/voms.$vo
+            [ $RETVAL -eq 0 ] && rm -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
             RETGLOB=$((RETGLOB + RETVAL))
         fi
     done
@@ -273,47 +322,53 @@
 }
 
 function condrestart() {
-    # Stop daemons.
+    RETGLOB=0
+    # Conditionally restart daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
     
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
-            echo -n "Condrestart $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
-            if test -z "$pids"; then
-                echo; start $vo
-            else
-                failure; echo
-                RETVAL=1
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            if test -n "$pids"; then
+                $0 restart $vo
+                RETVAL=$?
+                RETGLOB=$((RETGLOB + RETVAL))
             fi
         fi
     done
 
     return $RETGLOB
-
 }
 
 function getstatus() {
-    # Stop daemons.
-    prog=`basename ${voms}`
-
-    # get vos
-    vos=${1:-`find $@LOCATION_ENV@/etc/voms/ -type d -printf "%f "`}
-
     value=0
+    # Get status.
+    prog=`basename ${voms}`
+    if test -z $1; then
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
+    else
+        vos=$1
+    fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Status $prog($vo): "
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             if test -z "$pids"; then
-                if [ -f /var/lock/subsys/voms.$vo ]; then
+                if [ -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo ]; then
                     echo "dead but subsys locked"
                     value=$[$value < 2 ? 2 : $value]
                     continue
@@ -322,7 +377,8 @@
                 value=$[$value < 3 ? 3 : $value]
                 continue
             else
-                echo "(pid $pids) is running..."
+                echo -n "(pid $pids) is running..." | tr '\n' ' '
+                echo
                 value=$[$value < 0 ? 0 : $value]
                 continue
             fi
@@ -346,12 +402,14 @@
         getstatus $2
         RETVAL=$?
         ;;
-    restart)
+    restart | force-reload)
         stop $2
         start $2
         RETVAL=$?
         ;;
-    condrestart)
+    reload)
+        ;;
+    condrestart | try-restart)
         condrestart $2
         RETVAL=$?
         ;;

voms-install-db.patch:
 voms_install_db.in |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE voms-install-db.patch ---
diff -ur voms-1.9.11.orig/src/install/voms_install_db.in voms-1.9.11/src/install/voms_install_db.in
--- voms-1.9.11.orig/src/install/voms_install_db.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms_install_db.in	2009-08-26 17:45:39.608077295 +0200
@@ -4,7 +4,11 @@
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
 if test -z $@VAR_LOCATION_ENV@ ; then
-    @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
 fi
 
 # CERTDIR
@@ -37,7 +41,9 @@
 
 # Default path
 basepath=$@LOCATION_ENV@
-datapath=$@LOCATION_ENV@
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    datapath=$@LOCATION_ENV@
+fi
 
 # Default Suffix
 code=0
@@ -49,7 +55,7 @@
 logformat=""
 sqlloc=""
 help=""
-oldformat="no"
+newformat="yes"
 
 if test "x at with_mysqlconf@" != "x" ; then
     MYSQLCONF=" --defaults-file=@with_mysqlconf@ "
@@ -58,7 +64,7 @@
 fi
 
 
-TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,compat -n 'voms_install_db' -- "$@"`
+TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,oldformat,compat -n 'voms_install_db' -- "$@"`
 
 if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi
 
@@ -84,7 +90,7 @@
   --logtype)                logtype=$2                 ; shift 2 ;;
   --logformat)              logformat=$2               ; shift 2 ;;
   --logdateformat)          logdateformat=$2           ; shift 2 ;;
-  --newformat)              oldformat="yes"            ; shift 1 ;;
+  --oldformat)              newformat="no"             ; shift 1 ;;
   -h)                       help="yes"                 ; shift 1 ;;
 	--)                       shift                      ; break   ;;
 	*)                        $ECHO "$1: Internal Error!" >&2 ; exit 1  ;;
@@ -133,7 +139,7 @@
     $ECHO "    --logtype type          Specifies what to log. See the vomsd(8) man page for details."
     $ECHO "    --logformat format      See the vomsd(8) man page for details."
     $ECHO "    --logdateformat format  See the vomsd(8) man page for details."
-    $ECHO "    --newformat             Creates AC according to the old format."
+    $ECHO "    --oldformat             Creates AC according to the old format."
     $ECHO "    --help                  This output."
     exit 0;
 fi
@@ -261,8 +267,8 @@
 
 # Setting ownership and permission for voms_password_query file
 mkdir -p $datapath/etc/voms/$voms_vo
-mkdir -p $@LOCATION_ENV at _VAR/log
-#$datapath/log
+mkdir -p $@VAR_LOCATION_ENV@/log/voms
+
 $ECHO $voms_password_query > $datapath/etc/voms/$voms_vo/voms.pass
 chown root.voms $datapath/etc/voms/$voms_vo/voms.pass
 chmod 640 $datapath/etc/voms/$voms_vo/voms.pass
@@ -270,10 +276,10 @@
 if test -z $voms_vo ; then
     logname=voms
 else
-    logname=voms.$voms_vo
+    logname=$voms_vo
 fi
  
-$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@LOCATION_ENV at _VAR/log/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
+$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/voms/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
 $ECHO -en "--socktimeout=$timeout\n--loglevel=$loglevel\n--logtype=$logtype\n" >>$datapath/etc/voms/$voms_vo/voms.conf
 
 if test "x$compat_mode" = "x-compat"; then

voms-jar-perms.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-jar-perms.patch ---
diff -ur voms-1.9.11.orig/src/api/java/Makefile.am voms-1.9.11/src/api/java/Makefile.am
--- voms-1.9.11.orig/src/api/java/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/Makefile.am	2009-08-14 20:54:18.599023487 +0200
@@ -70,7 +70,7 @@
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/java
-	$(INSTALL) $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
+	$(INSTALL) -m644 $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
 
 clean:
 	rm -f $(top_builddir)/src/api/java/vomsjapi.jar

voms-java-clone-cast.patch:
 VOMSValidator.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE voms-java-clone-cast.patch ---
diff -ur voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java	2009-08-15 20:12:49.855022959 +0200
@@ -159,7 +159,7 @@
         if (validatedChain == null)
             myValidatedChain = null; // allow null
         else
-            myValidatedChain = validatedChain.clone(); // allow null
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
 
         if (acValidator == null) {
             if (theTrustStore == null) {
@@ -292,7 +292,7 @@
         if (validatedChain == null) 
             myValidatedChain = null;
         else
-            myValidatedChain = validatedChain.clone();
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
         myVomsAttributes = new Vector();
         myFQANTree = null;
         isParsed = false;

voms-javadoc.patch:
 PathNamingScheme.java   |   14 +++++++-------
 UserCredentials.java    |   14 +++++++-------
 VOMSParser.java         |    2 +-
 VOMSProtocol.java       |    6 +++---
 VOMSProxyBuilder.java   |   16 ++++++++--------
 VOMSRequestOptions.java |   17 ++++-------------
 6 files changed, 30 insertions(+), 39 deletions(-)

--- NEW FILE voms-javadoc.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2009-07-01 19:02:29.448373448 +0200
@@ -61,7 +61,7 @@
     /**
      * This methods checks that the string passed as argument complies with the voms FQAN syntax.
      *  
-     * @param containerName, the string that must be checked for compatibility with FQAN syntax. 
+     * @param containerName the string that must be checked for compatibility with FQAN syntax. 
      * @throws VOMSSyntaxException
      *         If there's an error in the FQAN syntax.
      */
@@ -81,7 +81,7 @@
      * This methods checks that the string passed as argument complies with the syntax used
      * by voms to identify groups.
      * 
-     * @param groupName, the string that has to be checked.
+     * @param groupName the string that has to be checked.
      * @throws VOMSSyntaxException
      *          If the string passed as argument doens not comply with the voms sytax.
      */
@@ -116,7 +116,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms group.
      * 
-     * @param groupName, the string to check.
+     * @param groupName the string to check.
      * @return  <ul><li>true, if the string passed as argument identifies a voms group.
      *          <li>false, otherwise.
      *          </ul>
@@ -131,7 +131,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms role.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -147,7 +147,7 @@
      * This methods checks that the FQAN passed as argument identifies a qualified voms role, i.e.,
      * a role defined in the context of a voms group.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a qualified voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -163,7 +163,7 @@
     /**
      * This method extracts the role name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN
+     * @param containerName the FQAN
      * @return <ul><li>A string containing the role name, if found</li>
      *              <li>null, if no role information is contained in the FQAN passed as argument
      *         </ul>
@@ -190,7 +190,7 @@
     /**
      * This method extracts group name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN 
+     * @param containerName the FQAN 
      * @return <ul><li>A string containing the group name, if found</li>
      *              <li>null, if no group information is contained in the FQAN passed as argument
      *         </ul>
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-07-01 19:02:29.456372709 +0200
@@ -377,7 +377,7 @@
      * Static instance constructor for a {@link UserCredentials}.
      * For more info on the user credentials load procedure, see {@link #instance()}.
      *
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -396,9 +396,9 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -416,8 +416,8 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -435,7 +435,7 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param credentials, the GlobusCredentials object containing the user's own proxy
+     * @param credentials the GlobusCredentials object containing the user's own proxy
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java	2009-07-01 19:02:29.465377247 +0200
@@ -61,7 +61,7 @@
     /**
      * 
      * Parses a voms response reading from a given input stream.
-     * @param is, the input stream.
+     * @param is the input stream.
      * @return a {@link VOMSResponse} object that represents the parsed response.
      */
     public VOMSResponse parseResponse(InputStream is){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2009-07-01 19:02:29.468373182 +0200
@@ -97,8 +97,8 @@
      * 
      * This method is used to send a request to a VOMS server.
      *  
-     * @param requestOptions, the request options. See {@link VOMSRequestOptions}. 
-     * @param stream, an output stream.
+     * @param requestOptions the request options. See {@link VOMSRequestOptions}. 
+     * @param stream an output stream.
      */
     public void sendRequest(VOMSRequestOptions requestOptions, OutputStream stream){
         
@@ -154,7 +154,7 @@
     /**
      * This method is used to parse a VOMS response from an input stream.
      * 
-     * @param stream, the input stream from which the response will be parsed.
+     * @param stream the input stream from which the response will be parsed.
      * @return a {@link VOMSResponse} object.
      */
     public VOMSResponse getResponse(InputStream stream){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 19:36:38.729376985 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 20:58:25.590377728 +0200
@@ -130,9 +130,9 @@
      *
      * This methods builds an {@link AttributeCertificate} (AC) object starting from an array of bytes.
      *
-     * @param acBytes, the byte array containing the attribute certificate.
+     * @param acBytes the byte array containing the attribute certificate.
      * @return the {@link AttributeCertificate} object
-     * @throws VOMSException, in case of parsing errors.
+     * @throws VOMSException in case of parsing errors.
      */
     public static AttributeCertificate buildAC(byte[] acBytes){
 
@@ -161,12 +161,12 @@
      * passed as arguments and including a list of {@link AttributeCertificate} objects that
      * will be included in the proxy.
      *
-     * @param cred, the {@link UserCredentials} from which the proxy must be created.
-     * @param ACs, the list of {@link AttributeCertificate} objects.
-     * @param lifetime, the lifetime in seconds of the generated proxy.
-     * @param version, the version of globus to which the proxy conforms
-     * @return a {@link GlobusCredential} object that represents the proxy.
-     * @throws {@link VOMSException}, if something goes wrong.
+     * @param cred the {@link UserCredentials} from which the proxy must be created.
+     * @param ACs the list of {@link AttributeCertificate} objects.
+     * @param lifetime the lifetime in seconds of the generated proxy.
+     * @param gtVersion the version of globus to which the proxy conforms
+     * @return a {@link UserCredentials} object that represents the proxy.
+     * @throws VOMSException if something goes wrong.
      *
      * @author Vincenzo Ciaschini
      * @author Andrea Ceccanti
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2009-07-01 19:08:10.252380084 +0200
@@ -75,9 +75,7 @@
 
     
     /**
-     * 
-     * Returns the ordering string of this {@link VOMSRequestOptions} object.
-     * @return
+     * @return the ordering string of this {@link VOMSRequestOptions} object.
      */
     public String getOrdering() {
 
@@ -99,10 +97,7 @@
 
     
     /**
-     * 
-     * Returs the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
-     * 
-     * @return
+     * @return the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
      */
     public List getRequestedFQANs() {
 
@@ -123,10 +118,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object.
-     * 
-     * @return
      */
     public List getTargets() {
 
@@ -135,10 +128,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object as a string containing a a comma-separated list of host names.
-     * 
-     * @return
      */
     public String getTargetsAsString() {
 

voms-nolib64.patch:
 configure.ac |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE voms-nolib64.patch ---
diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
--- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
@@ -37,10 +37,6 @@
 
 AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
 
-if test "x$host_cpu" = "xx86_64"; then
-    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
-fi
-
 AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
 AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
 AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-notknown-msg.patch:
 vomsclient.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE voms-notknown-msg.patch ---
diff -ur voms-1.9.11.orig/src/client/vomsclient.cc voms-1.9.11/src/client/vomsclient.cc
--- voms-1.9.11.orig/src/client/vomsclient.cc	2009-07-27 10:14:04.000000000 +0200
+++ voms-1.9.11/src/client/vomsclient.cc	2009-08-31 17:51:15.952071123 +0200
@@ -575,7 +575,9 @@
       std::vector<contactdata> servers;
       servers = v.FindByAlias(contact.vo().empty() ? contact.nick() : contact.vo());
       if (servers.empty()) {
-        std::cerr << "VOMS Server for " << contact.vo() << " not known!" << std::endl;
+        std::cerr << "VOMS Server for "
+		  << (contact.vo().empty() ? contact.nick() : contact.vo())
+		  << " not known!" << std::endl;
         exit(1);
       }
     

voms-openssl.patch:
 ac/Makefile.am        |    1 +
 api/ccapi/api_util.cc |    4 ++--
 include/acstack.h     |    2 +-
 socklib/Client.cpp    |    4 ++++
 utils/vomsfake.cc     |    1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE voms-openssl.patch ---
diff -ur voms-1.9.11.orig/src/ac/Makefile.am voms-1.9.11/src/ac/Makefile.am
--- voms-1.9.11.orig/src/ac/Makefile.am	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/src/ac/Makefile.am	2009-09-07 11:06:49.079471423 +0200
@@ -27,6 +27,7 @@
 	-DNOGLOBUS \
 	-I $(top_srcdir)/src/include \
 	-I $(top_builddir)/src/sslutils
+libattributes_nog_la_CXXFLAGS = $(libattributes_nog_la_CFLAGS)
 
 libattributes_nog_la_LIBADD = \
 	$(OPENSSL_LIBS)
diff -ur voms-1.9.11.orig/src/api/ccapi/api_util.cc voms-1.9.11/src/api/ccapi/api_util.cc
--- voms-1.9.11.orig/src/api/ccapi/api_util.cc	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/api_util.cc	2009-09-07 11:06:49.080471703 +0200
@@ -415,9 +415,9 @@
   /* extract vo name from AC */
   
   AC * ac = (AC *)data;
-  STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
+  const STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
   int nid = OBJ_txt2nid("idatcap");
-  int pos = X509at_get_attr_by_NID(atts, nid, -1);
+  int pos = X509at_get_attr_by_NID((const STACK_OF(X509_ATTRIBUTE)*)atts, nid, -1);
 
   int nidc = OBJ_txt2nid("certseq");
   STACK_OF(X509_EXTENSION) *exts = ac->acinfo->exts;
diff -ur voms-1.9.11.orig/src/include/acstack.h voms-1.9.11/src/include/acstack.h
--- voms-1.9.11.orig/src/include/acstack.h	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/include/acstack.h	2009-09-07 11:06:49.081472345 +0200
@@ -79,7 +79,7 @@
 #endif
 
 #define DECL_STACK(type) \
-   DECLARE_STACK_OF(type) \
+   PREDECLARE_STACK_OF(type) \
    extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \
    extern STACK_OF(type) *sk_##type##_new_null (); \
    extern void   sk_##type##_free (STACK_OF(type) *); \
diff -ur voms-1.9.11.orig/src/socklib/Client.cpp voms-1.9.11/src/socklib/Client.cpp
--- voms-1.9.11.orig/src/socklib/Client.cpp	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Client.cpp	2009-09-07 11:28:07.210471657 +0200
@@ -336,7 +336,11 @@
 bool 
 GSISocketClient::Open()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int ret = -1, ret2 = -1;
   time_t starttime, curtime;
   long errorcode = 0;
diff -ur voms-1.9.11.orig/src/utils/vomsfake.cc voms-1.9.11/src/utils/vomsfake.cc
--- voms-1.9.11.orig/src/utils/vomsfake.cc	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/utils/vomsfake.cc	2009-09-07 10:21:52.935470664 +0200
@@ -40,6 +40,7 @@
 #include "listfunc.h"
 #include "credentials.h"
 #include "parsertypes.h"
+#define YYTOKENTYPE
 #include "vomsparser.h"
 
 VOLIST *volist = NULL;

voms-pipe-buf.patch:
 log.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE voms-pipe-buf.patch ---
diff -ur voms-1.9.11.orig/src/log/log.c voms-1.9.11/src/log/log.c
--- voms-1.9.11.orig/src/log/log.c	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/log/log.c	2009-09-07 16:02:18.597470396 +0200
@@ -175,7 +175,11 @@
   if (*buffer) {
     while (offset < slen) {
       do {
+#ifdef PIPE_BUF
         readbytes = read(fd, *buffer + offset, (slen - offset > PIPE_BUF ? PIPE_BUF : slen - offset));
+#else
+        readbytes = read(fd, *buffer + offset, (slen - offset > fpathconf(fd, _PC_PIPE_BUF) ? fpathconf(fd, _PC_PIPE_BUF) : slen - offset));
+#endif
       } while (readbytes < 0 && (errno == EINTR
 #ifdef ERESTART
                                    || errno == ERESTART

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

--- NEW FILE voms-portability.patch ---
diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
--- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
@@ -1,6 +1,6 @@
 
 AC_INIT([GLite Security VOMS], [1.9.11])
-AC_PREREQ(2.59)
+AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/utils/voms_proxy_destroy.cc])
diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4
--- voms-1.9.11.orig/project/acinclude.m4	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/project/acinclude.m4	2009-09-08 14:13:33.246338019 +0200
@@ -904,12 +904,16 @@
 
 AC_DEFUN([PUT_PRIVATES],
 [
-        AH_BOTTOM([#ifdef __GNUC__
+        AH_BOTTOM([#if defined(__GNUC__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #define UNUSED(z)  z __attribute__ ((unused))
+#else
+#define UNUSED(z)  z
+#endif
 #define PRIVATE    __attribute__ ((visibility ("hidden")))
 #define PUBLIC     __attribute__ ((visibility ("default")))
 #else
-#define UNUSED
+#define UNUSED(z)  z
 #define PRIVATE
 #define PUBLIC
 #endif])])
diff -ur voms-1.9.11.orig/src/api/ccapi/Makefile.am voms-1.9.11/src/api/ccapi/Makefile.am
--- voms-1.9.11.orig/src/api/ccapi/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/Makefile.am	2009-09-08 14:13:33.247337541 +0200
@@ -16,7 +16,7 @@
 libvomsapi_nog_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_nog_la_CPPFLAGS = \
+libvomsapi_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -41,7 +41,7 @@
 libvomsapi_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_la_CPPFLAGS = \
+libvomsapi_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -70,7 +70,7 @@
 libvomsc_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_la_CPPFLAGS = \
+libvomsc_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_CFLAGS)
@@ -94,10 +94,10 @@
 #noinst_PROGRAMS = test ctest
 #test_SOURCES = test.cc
 #test_LDADD = libvomsapi.la
-#test_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#test_CXXFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 #ctest_SOURCES = ctest.c
 #ctest_LDADD = libvomsc.la
-#ctest_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#ctest_CFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 
 EXTRA_LTLIBRARIES = \
 	libvomsapi_gcc32.la \
@@ -123,7 +123,7 @@
 libvomsapi_gcc32_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32_la_CPPFLAGS = \
+libvomsapi_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -139,7 +139,7 @@
 libvomsapi_gcc32dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbg_la_CPPFLAGS = \
+libvomsapi_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(GLOBUS_GCC32DBG_CFLAGS) \
 	$(API_INCLUDES)
@@ -155,7 +155,7 @@
 libvomsapi_gcc32pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32pthr_la_CPPFLAGS = \
+libvomsapi_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -171,7 +171,7 @@
 libvomsapi_gcc32dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -187,7 +187,7 @@
 libvomsc_gcc32_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32_la_CPPFLAGS = \
+libvomsc_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -203,7 +203,7 @@
 libvomsc_gcc32dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbg_la_CPPFLAGS = \
+libvomsc_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -219,7 +219,7 @@
 libvomsc_gcc32pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32pthr_la_CPPFLAGS = \
+libvomsc_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -235,7 +235,7 @@
 libvomsc_gcc32dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -254,7 +254,7 @@
 libvomsapi_gcc64_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64_la_CPPFLAGS = \
+libvomsapi_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -270,7 +270,7 @@
 libvomsapi_gcc64dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbg_la_CPPFLAGS = \
+libvomsapi_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -286,7 +286,7 @@
 libvomsapi_gcc64pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64pthr_la_CPPFLAGS = \
+libvomsapi_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -302,7 +302,7 @@
 libvomsapi_gcc64dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
@@ -318,7 +318,7 @@
 libvomsc_gcc64_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64_la_CPPFLAGS = \
+libvomsc_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -334,7 +334,7 @@
 libvomsc_gcc64dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbg_la_CPPFLAGS = \
+libvomsc_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -350,7 +350,7 @@
 libvomsc_gcc64pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64pthr_la_CPPFLAGS = \
+libvomsc_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -367,7 +367,7 @@
 libvomsc_gcc64dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
diff -ur voms-1.9.11.orig/src/socklib/Makefile.am voms-1.9.11/src/socklib/Makefile.am
--- voms-1.9.11.orig/src/socklib/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Makefile.am	2009-09-08 14:16:29.063338874 +0200
@@ -12,7 +12,7 @@
 libsock_server_la_SOURCES = Server.cpp tokens.c globuswrap.c
 libsock_nog_la_SOURCES = Client.cpp
 
-libsock_nog_la_CPPFLAGS = \
+libsock_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
@@ -21,17 +21,18 @@
 libsock_nog_la_LIBADD = \
 	-lcrypto -lssl
 
-libsock_server_la_CPPFLAGS = \
+libsock_server_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
+libsock_server_la_CFLAGS = $(libsock_server_la_CXXFLAGS)
 
 libsock_server_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils.la \
 	$(top_builddir)/src/common/libutilc.la \
 	$(GLOBUS_GSS_LIBS)
 
-libsock_la_CPPFLAGS = \
+libsock_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
@@ -68,10 +69,11 @@
 
 libsock_server_gcc32_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32_la_CPPFLAGS = \
+libsock_server_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
+libsock_server_gcc32_la_CFLAGS = $(libsock_server_gcc32_la_CXXFLAGS)
 
 libsock_server_gcc32_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32.la \
@@ -80,10 +82,11 @@
 
 libsock_server_gcc32dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbg_la_CPPFLAGS = \
+libsock_server_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbg_la_CFLAGS = $(libsock_server_gcc32dbg_la_CXXFLAGS)
 
 libsock_server_gcc32dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbg.la \
@@ -92,10 +95,11 @@
 
 libsock_server_gcc32pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32pthr_la_CPPFLAGS = \
+libsock_server_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
+libsock_server_gcc32pthr_la_CFLAGS = $(libsock_server_gcc32pthr_la_CXXFLAGS)
 
 libsock_server_gcc32pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32pthr.la \
@@ -104,10 +108,11 @@
 
 libsock_server_gcc32dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbgpthr_la_CFLAGS = $(libsock_server_gcc32dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc32dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbgpthr.la \
@@ -116,10 +121,11 @@
 
 libsock_server_gcc64_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64_la_CPPFLAGS = \
+libsock_server_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
+libsock_server_gcc64_la_CFLAGS = $(libsock_server_gcc64_la_CXXFLAGS)
 
 libsock_server_gcc64_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64.la \
@@ -128,10 +134,11 @@
 
 libsock_server_gcc64dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbg_la_CPPFLAGS = \
+libsock_server_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbg_la_CFLAGS = $(libsock_server_gcc64dbg_la_CXXFLAGS)
 
 libsock_server_gcc64dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbg.la \
@@ -140,10 +147,11 @@
 
 libsock_server_gcc64pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64pthr_la_CPPFLAGS = \
+libsock_server_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
+libsock_server_gcc64pthr_la_CFLAGS = $(libsock_server_gcc64pthr_la_CXXFLAGS)
 
 libsock_server_gcc64pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64pthr.la \
@@ -152,10 +160,11 @@
 
 libsock_server_gcc64dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbgpthr_la_CFLAGS = $(libsock_server_gcc64dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc64dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbgpthr.la \
@@ -188,7 +197,7 @@
 libsock_gcc32_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32_la_CPPFLAGS = \
+libsock_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -201,7 +210,7 @@
 libsock_gcc32dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbg_la_CPPFLAGS = \
+libsock_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -214,7 +223,7 @@
 libsock_gcc32pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32pthr_la_CPPFLAGS = \
+libsock_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -227,7 +236,7 @@
 libsock_gcc32dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -240,7 +249,7 @@
 libsock_gcc64_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64_la_CPPFLAGS = \
+libsock_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -253,7 +262,7 @@
 libsock_gcc64dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbg_la_CPPFLAGS = \
+libsock_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -266,7 +275,7 @@
 libsock_gcc64pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64pthr_la_CPPFLAGS = \
+libsock_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -279,7 +288,7 @@
 libsock_gcc64dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)

voms-shell-syntax.patch:
 mysql2oracle.in |    2 +-
 voms-ping       |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE voms-shell-syntax.patch ---
diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
--- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
@@ -2,7 +2,7 @@
 #!/bin/sh
 #set -x
 
-function usage()
+function usage
 {
     echo
     echo "usage : mysql2oracle [OPTIONS]"
diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
--- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
@@ -25,7 +25,8 @@
   echo "  ]"
 }
 
-function test_vo {
+function test_vo
+{
    local voname="$1"
    local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
    local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
@@ -41,7 +42,7 @@
 "$voname" "localhost" "$port" "$dn" "$voname"
 EOF
    rm -f /tmp/oo
-   /opt/glite/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
+   ${GLITE_LOCATION:-/usr}/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
    res=$?
    if test $res -ne 0; then
       grep "User unknown to this VO" /tmp/oo >/dev/null


--- NEW FILE voms.INSTALL ---
VOMS server configuration
-------------------------

In addition to the voms-server package a voms database plugin is needed.

Plugins exists for mysql and oracle. Since the oracle client libraries
are not open source software, only the mysql plugin is available in
Fedora. To install the voms-mysql-plugin issue the following command
as root:

	yum install voms-mysql-plugin

Before starting the server, you must create the databases used by
VOMS. It is possible to run more than one VOMS server on a single host
as long as they are configured to use different ports.

You should have the grid CA certificates installed in
/etc/grid-security/certificates before running the VOMS database
creation script.

To create the databases run the following command as root for each
VOMS server you want to run:

	/usr/share/voms/voms_install_db \
		--voms-vo=<voname> \
		--port=<portnumber> \
		--db-type=mysql \
		--db-admin=<mysqladminuser> \
		--db-pwd=<mysqladminpwd> \
		--sqlloc=/usr/lib/voms/libvomsmysql.so

If you are running on a 64 bit host use instead:
		--sqlloc=/usr/lib64/voms/libvomsmysql.so

The voms server is configured to run as a special voms user. This user
needs a copy of the host certificate and key:

	cp -p /etc/grid-security/hostcert.pem /etc/grid-security/voms
	cp -p /etc/grid-security/hostkey.pem /etc/grid-security/voms
	chown voms:voms /etc/grid-security/voms/host*.pem

After creating the databases, start the server by running the command:

	service voms start

If you want the server to be started automatically after each reboot run
the command:

	chkconfig voms on

To check that the server is running and is configured correctly, run
the following command:

	/usr/share/voms/voms-ping <voname>


--- NEW FILE voms.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:		voms
Version:	1.9.11
Release:	4%{?dist}
Summary:	Virtual Organization Membership Service

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms_R_1_9_11 \
#		  -d voms-1.9.11 org.glite.security.voms
#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
Source:		%{name}-%{version}.tar.gz
#		Post-install setup instructions:
Source1:	%{name}.INSTALL
#		Build using Globus from Fedora/EPEL
#		https://savannah.cern.ch/bugs/?54427
Patch0:		%{name}-distribution-globus.patch
#		Fix the start-up script
#		https://savannah.cern.ch/bugs/?54428
Patch1:		%{name}-initscript.patch
#		Fix the --disable-glite configure option
#		https://savannah.cern.ch/bugs/?54429
Patch2:		%{name}-fix-enable-glite.patch
#		Remove lib64 hardcoding
#		https://savannah.cern.ch/bugs/?54430
Patch3:		%{name}-nolib64.patch
#		Make the Java API more compatible with the C API
#		https://savannah.cern.ch/bugs/?54432
Patch4:		%{name}-extra-vomses-java.patch
#		Missing casts after Java cloning
#		https://savannah.cern.ch/bugs/?54433
Patch5:		%{name}-java-clone-cast.patch
#		Fix permissions of installed jar
#		https://savannah.cern.ch/bugs/?54434
Patch6:		%{name}-jar-perms.patch
#		Fix javadoc warnings
#		https://savannah.cern.ch/bugs/?54435
Patch7:		%{name}-javadoc.patch
#		Fix syntax errors in shell scripts
#		https://savannah.cern.ch/bugs/?54436
Patch8:		%{name}-shell-syntax.patch
#		Fix the database install script
#		https://savannah.cern.ch/bugs/?54880
Patch9:		%{name}-install-db.patch
#		Error message glitch
#		https://savannah.cern.ch/bugs/?55113
Patch10:	%{name}-notknown-msg.patch
#		Make the Java API build with gcj
#		https://savannah.cern.ch/bugs/?55115
Patch11:	%{name}-gcj.patch
#		Support older autotools and older gcc
#		https://savannah.cern.ch/bugs/?55116
Patch12:	%{name}-portability.patch
#		Support openssl 1.0
#		https://savannah.cern.ch/bugs/?55390
Patch13:	%{name}-openssl.patch
#		Unconditional use of PIPE_BUF
#		https://savannah.cern.ch/bugs/?55405
Patch14:	%{name}-pipe-buf.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	openssl-devel%{?_isa}
BuildRequires:	expat-devel
BuildRequires:	libtool
BuildRequires:	pkgconfig
BuildRequires:	libxslt
BuildRequires:	docbook-style-xsl
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

BuildRequires:	java-devel
BuildRequires:	jpackage-utils
BuildRequires:	bouncycastle >= 1.39
BuildRequires:	jakarta-commons-cli
BuildRequires:	jakarta-commons-lang
BuildRequires:	log4j
%if %{with_gcj}
BuildRequires:	java-gcj-compat-devel
%endif

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers libraries that applications using the VOMS functionality
will bind to.

%package devel
Summary:	Virtual Organization Membership Service Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	openssl-devel%{?_isa}
Requires:	automake

%description devel
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers header files for programming with the VOMS libraries.

%package doc
Summary:	Virtual Organization Membership Service Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif

%description doc
Documentation for the Virtual Organization Membership Service.

%package clients
Summary:	Virtual Organization Membership Service Clients
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%description clients
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package provides command line applications to access the VOMS
services.

%package server
Summary:	Virtual Organization Membership Service Server
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

Requires(pre):		shadow-utils
Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts

%description server
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

The service can be understood as an account database, which serves the
information in a special format (VOMS credential). The VO manager can
administrate it remotely using command line tools or a web interface.

%package -n vomsjapi
Summary:	Virtual Organization Membership Service Java API
Group:		Development/Libraries
Requires:	java
Requires:	jpackage-utils
Requires:	bouncycastle >= 1.39
Requires:	jakarta-commons-cli
Requires:	jakarta-commons-lang
Requires:	log4j
%if %{with_gcj}
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
%else
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
%endif

%description -n vomsjapi
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers a java client API for VOMS.

%package -n vomsjapi-javadoc
Summary:	Virtual Organization Membership Service Java API Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	jpackage-utils
Requires:	vomsjapi = %{version}-%{release}

%description -n vomsjapi-javadoc
Virtual Organization Membership Service (VOMS) Java API Documentation.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
	   -name '*.cc' -o -name '*.java' ')' -exec chmod a-x {} ';'

# Fix location dir
sed -e 's/\(LOCATION_DIR.*\)"\$prefix"/\1""/g' -i project/acinclude.m4

# Fix default Globus location
sed -e 's!\(GLOBUS_LOCATION\)!{\1:-/usr}!' -i project/voms.m4

# Fix default vomses file location
sed -e 's!/opt/glite/etc/vomses!/etc/vomses!' -i src/api/ccapi/voms_api.cc

# Use pdflatex
sed -e 's!^\(USE_PDFLATEX *= *\)NO!\1YES!' -i src/api/ccapi/Makefile.am

# Touch to avoid rerunning bison and flex
touch -r src/utils/vomsfake.y src/utils/vomsparser.h
touch -r src/utils/vomsfake.y src/utils/lex.yy.c

# rebootstrap
./autogen.sh

install -m 644 %{SOURCE1} INSTALL.Fedora

%build
%configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
	   --with-java-home=/usr --with-bc=/usr/share/java/bcprov.jar \
	   --with-log4j=/usr/share/java/log4j.jar \
	   --with-commons-cli=/usr/share/java/commons-cli.jar \
	   --with-commons-lang=/usr/share/java/commons-lang.jar

make %{?_smp_mflags}

( cd doc/apidoc/api/VOMS_C_API/latex ; make )
( cd doc/apidoc/api/VOMS_CC_API/latex ; make )

mkdir javadoc
cd javadoc
CLASSPATH=../src/api/java:$(build-classpath \
			    bcprov log4j commons-cli commons-lang) \
javadoc ../src/api/java/org/glite/voms/*.java \
	../src/api/java/org/glite/voms/ac/*.java \
	../src/api/java/org/glite/voms/contact/*.java
cd ..

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_bindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_sbindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/edg-voms*
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

mv $RPM_BUILD_ROOT%{_includedir}/glite/security/%{name} \
   $RPM_BUILD_ROOT%{_includedir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_includedir}/glite

rm $RPM_BUILD_ROOT%{_includedir}/%{name}/voms_apic_nog.h
rm $RPM_BUILD_ROOT%{_mandir}/man1/testvoms.1*
rm $RPM_BUILD_ROOT%{_mandir}/man8/voms-install-replica.8*

mv $RPM_BUILD_ROOT%{_datadir}/vomses.template \
   $RPM_BUILD_ROOT%{_datadir}/%{name}

mv $RPM_BUILD_ROOT%{_datadir}/m4 $RPM_BUILD_ROOT%{_datadir}/aclocal

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/vomsdir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

touch $RPM_BUILD_ROOT%{_sysconfdir}/vomses

sed -e 's!${datapath}/etc/voms/voms!${basepath}/share/voms/voms!' \
    -e 's/useradd/\#&/' -e 's/groupadd/\#&/' \
    -e 's/vomsd(8)/voms(8)/' \
    -i $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db

cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db << EOF
\$ECHO -en "--x509_user_cert=/etc/grid-security/voms/hostcert.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
\$ECHO -en "--x509_user_key=/etc/grid-security/voms/hostkey.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
EOF

# Turn off default enabling of the service
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
sed -e 's/\(chkconfig: \)\w*/\1-/' \
    -e '/Default-Start/d' \
    -e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
   $RPM_BUILD_ROOT%{_datadir}/init.d/%{name} > \
   $RPM_BUILD_ROOT%{_initrddir}/%{name}
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

mkdir -p VOMS_C_API
cp -pr doc/apidoc/api/VOMS_C_API/html VOMS_C_API
install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf VOMS_C_API

mkdir -p VOMS_CC_API
cp -pr doc/apidoc/api/VOMS_CC_API/html VOMS_CC_API
install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf VOMS_CC_API

mv $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar \
   $RPM_BUILD_ROOT%{_javadir}/vomsjapi-%{version}.jar
ln -s vomsjapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -pr javadoc $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi-%{version}
ln -s vomsjapi-%{version} $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre server
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || useradd -r -g %{name} \
    -d %{_sysconfdir}/%{name} -s /sbin/nologin -c "VOMS Server Account" %{name}
exit 0

%post server
if [ $1 = 1 ]; then
    /sbin/chkconfig --add %{name}
fi

%preun server
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del %{name}
fi

%postun server
if [ $1 -ge 1 ]; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%post -n vomsjapi
%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif

%postun -n vomsjapi
%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so.*
%{_libdir}/libvomsapi_nog.so.*
%{_libdir}/libvomsc.so.*
%config(noreplace) %{_sysconfdir}/vomses
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/vomsdir
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/vomses.template
%doc AUTHORS LICENSE

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so
%{_libdir}/libvomsapi_nog.so
%{_libdir}/libvomsc.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/acstack.h
%{_includedir}/%{name}/newformat.h
%{_includedir}/%{name}/vomsssl.h
%{_includedir}/%{name}/voms_api.h
%{_includedir}/%{name}/voms_api_nog.h
%{_includedir}/%{name}/voms_apic.h
%{_datadir}/aclocal/%{name}.m4

%files doc
%defattr(-,root,root,-)
%doc VOMS_C_API
%doc VOMS_CC_API

%files clients
%defattr(-,root,root,-)
%{_bindir}/voms-proxy-destroy
%{_bindir}/voms-proxy-info
%{_bindir}/voms-proxy-init
%{_bindir}/voms-proxy-fake
%{_bindir}/voms-proxy-list
%{_mandir}/man1/voms-proxy-destroy.1*
%{_mandir}/man1/voms-proxy-info.1*
%{_mandir}/man1/voms-proxy-init.1*
%{_mandir}/man1/voms-proxy-fake.1*
%{_mandir}/man1/voms-proxy-list.1*

%files server
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/grid-security/%{name}
%attr(-,voms,voms) %dir %{_localstatedir}/log/%{name}
%{_datadir}/%{name}/mysql2oracle
%{_datadir}/%{name}/upgrade1to2
%{_datadir}/%{name}/voms.data
%{_datadir}/%{name}/voms_install_db
%{_datadir}/%{name}/voms-ping
%{_datadir}/%{name}/voms_replica_master_setup.sh
%{_datadir}/%{name}/voms_replica_slave_setup.sh
%{_mandir}/man8/voms.8*
%doc INSTALL.Fedora

%files -n vomsjapi
%defattr(-,root,root,-)
%{_javadir}/vomsjapi.jar
%{_javadir}/vomsjapi-%{version}.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif
%doc AUTHORS LICENSE

%files -n vomsjapi-javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/vomsjapi
%doc %{_javadocdir}/vomsjapi-%{version}

%changelog
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0

* Thu Sep 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-3
- Add an empty /etc/vomses file to the main package to avoid error messages
- Let the voms user own only necessary directories
- Additional fixes for the server start-up script

* Tue Aug 25 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-2
- Add the /etc/voms directory to the server package
- Add setup instructions to the server package
- Run the server as non-root

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-1
- Upstream 1.9.11 (CVS tag glite-security-voms_R_1_9_11)
- Enable Java AOT bits

* Mon Jun 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.8.1-1
- Upstream 1.9.8.1 (CVS tag glite-security-voms_R_1_9_8_1)
- Build Java API

* Thu Feb 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.2-1
- Upstream 1.9.2 (CVS tag glite-security-voms_R_1_9_2)

* Fri Feb 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.1-1
- Upstream 1.9.1 (CVS tag glite-security-voms_R_1_9_1)

* Tue Jan 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.10-1
- Upstream 1.8.10 (CVS tag glite-security-voms_R_1_8_10)
- Rebuild against distribution Globus
- Add clear SSL error patch needed for openssl > 0.9.8b
- Add missing return value patch

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.9-1ng
- Upstream 1.8.9 (CVS tag glite-security-voms_R_1_8_9)
- Rebuild against Globus 4.0.8-0.11

* Thu May 15 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-4ng
- Add missing include patch

* Sat Apr 26 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-3ng
- Rebuild against Globus 4.0.7-0.10

* Sun Nov 25 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-2ng
- Fix GPT_LOCATION and GLOBUS_LOCATION detection in spec file

* Mon Oct 29 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-1ng
- Upstream 1.7.24 (CVS tag glite-security-voms_R_1_7_24_1)

* Mon Oct 15 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.23-1ng
- Upstream 1.7.23 (CVS tag glite-security-voms_R_1_7_23_1)

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-3ng
- Move /etc/voms/vomses back to /etc/vomses
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-2ng
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Mon Sep 10 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-1ng
- Try to link against system crypto library when Globus library is not
  available
- Make /etc/grid-security/vomsdir part of the voms sub-package
- Drop RPM prefix /etc
- Move the vomses.template to /etc/voms
- Use dashes instead of underscore in voms-install-replica.1 man page
- Do not try to link against system crypt library. Voms now
  does this internally.
- Upstream 1.7.22 (CVS tag glite-security-voms_R_1_7_22_1)

* Mon Jul 16 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-5ng
- Drop voms-struct_change.patch - problem is with libxml2

* Sat Jul 14 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-4ng
- Add missing openssl-devel dependency in voms-devel

* Thu Jul 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-3ng
- Add patch:
  - voms-struct_change.patch
    - Change API slightly - but now works with libxml2

* Thu Jul 08 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-2ng
- Make conditinal dependency on expat-devel (OpenSuSE 10.20 has only expat)

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-1ng
- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1) 

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-2ng
- Added patches:
  - voms-openssl_portability.patch
    - Support for newer OpenSSL-0.9.8
  - voms-isoc90_portability.patch
    - Support for older compilers
- Added openssl-devel build dependency

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-1ng
- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2) 
- Remove patches (use shell substitutions instead)
- Disable Java API build

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-3ng
- Added Globus dependencies to voms-devel

* Mon Jul 24 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-2ng
- Fix dependency typo: Requires -> BuildRequires

* Sat May 06 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-1ng
- Many changes since upstream changed quite a lot.
- Added README.NorduGrid with packaging information
- Patches:
  - voms_openssl-0.9.8.patch
    - Support for OpenSSL 0.9.8
  - voms_noglobusopenssl-1.6.20.patch
    - Use system openssl rather than the one from Globus
    - Patch reworked for voms 1.6.20
  - Dont use project based (gLite) include paths
- Pseudo patches (fixes made at runtime and not from static patch files)
  - Fix broken --libexecdir support for configure
    (some systems do not have libexecdir = <prefix>/libexec)
  - Drop all documents except man pages which are pre-generated
    (section 3 man pages are skipped as well)
  - Do not use edg- prefix
    (can be turned on/off through macro)
  - Install flavored libraries in addition to non-flavored
    (can be turned on/off through macro)
  - Put start-up script in /etc/init.d
  - Move configuration files from <prefix>/etc to /etc

* Mon Dec 19 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-2
- Add patch voms_doc.patch to disable html and ps documentation
  and add man-mages and pdf files to distribution (make dist)
- Use rpm switch: --define "_autotools_bootstrap 1" to rebuild
  documentation and create "make dist" target
- Add patch voms_nohardcodelibexecdir.patch which use the libexecdir
  from configure rather than the hardcoded prefix/libexec

* Sun Nov 27 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-1
- Add patch voms_ssl_include.patch to add external openssl includes.
  Would be better to query globus_openssl about this

* Tue Oct 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.7-1
- Modfiy voms_noglobusopenssl.patch to match upstream
- Add patch voms_nops.patch to disable postscript versions of
  reference manual

* Fri Jun 17 2005 Anders W??n?nen <waananen at nbi.dk> - 1.5.4-1
- Remove the following patches:
  - voms_namespace.patch - Fixed in upstream
  - voms_external_mysql++-1.4.1.patch - Obsolete since mysql++ is no
    longer needed
  - voms-no_libs.path - Fixed in upstream
- Add Globus dependencies

* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-3
- Do not hardcode Globus flavor but try to guess
- Remove explicit globus rpm Requirement
- Use external openssl - not globus_openssl

* Mon May 02 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-2
- Remove automake cache
- Add explicit dependency on mysql++-devel

* Sat Apr 30 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-1
- New upstream
- autogen.sh -> autobuild.sh

* Mon Apr 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.3.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:08:49 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:36:46 -0000	1.2
@@ -0,0 +1 @@
+voms-1.9.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:08:49 -0000	1.1
+++ sources	10 Sep 2009 02:36:46 -0000	1.2
@@ -0,0 +1 @@
+86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:39:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:39:26 +0000 (UTC)
Subject: rpms/voms/EL-5 import.log, NONE, 1.1 voms-distribution-globus.patch,
	NONE, 1.1 voms-extra-vomses-java.patch, NONE,
	1.1 voms-fix-enable-glite.patch, NONE, 1.1 voms-gcj.patch, NONE,
	1.1 voms-initscript.patch, NONE, 1.1 voms-install-db.patch, NONE,
	1.1 voms-jar-perms.patch, NONE, 1.1 voms-java-clone-cast.patch,
	NONE, 1.1 voms-javadoc.patch, NONE, 1.1 voms-nolib64.patch, NONE,
	1.1 voms-notknown-msg.patch, NONE, 1.1 voms-openssl.patch, NONE,
	1.1 voms-pipe-buf.patch, NONE, 1.1 voms-portability.patch, NONE,
	1.1 voms-shell-syntax.patch, NONE, 1.1 voms.INSTALL, NONE,
	1.1 voms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910023926.2CE8611C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21246/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-distribution-globus.patch 
	voms-extra-vomses-java.patch voms-fix-enable-glite.patch 
	voms-gcj.patch voms-initscript.patch voms-install-db.patch 
	voms-jar-perms.patch voms-java-clone-cast.patch 
	voms-javadoc.patch voms-nolib64.patch voms-notknown-msg.patch 
	voms-openssl.patch voms-pipe-buf.patch voms-portability.patch 
	voms-shell-syntax.patch voms.INSTALL voms.spec 
Log Message:
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0



--- NEW FILE import.log ---
voms-1_9_11-4_el5:EL-5:voms-1.9.11-4.el5.src.rpm:1252550329

voms-distribution-globus.patch:
 acinclude.m4 |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE voms-distribution-globus.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
@@ -66,11 +66,6 @@
 # ---------------------------------------------
 AC_DEFUN([AC_OPENSSL],
 [
-  AC_ARG_WITH(openssl_prefix,
-              [ --with-openssl-prefix=PFX    prefix where OpenSSL (non-globus) is installed. (/usr)],
-              [with_openssl_prefix="$withval"],
-              [with_openssl_prefix=/usr])
-
   AC_ARG_WITH(openssl_libs,
               [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
               [ with_openssl_libs="$withval"],
@@ -80,16 +75,11 @@
      AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
   fi  
 
-  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
-
-  AC_LANG_PUSH(C)
-  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
-  AC_LANG_POP(C) 
+  PKG_CHECK_MODULES(OPENSSL, [openssl], [
+  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+  found=yes], [found=no])
 
   if test "x$found" = "xyes"; then
-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
     AC_SUBST(NO_GLOBUS_FLAGS)
     AC_SUBST(OPENSSL_LIBS)
     AC_MSG_CHECKING([for system OpenSSL version])
@@ -105,11 +95,10 @@
 #include <openssl/opensslv.h>
 OPENSSL_VERSION_TEXT
 HERE
-    openssl_version=`$CPP -I$NO_GLOBUS_FLAGS -o - -P conftest.h`
+    openssl_version=`$CPP $NO_GLOBUS_FLAGS -o - -P conftest.h`
     AC_MSG_RESULT($openssl_version)
     rm -f conftest.h
   fi
-  LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 ])
 
 # AC_GLOBUS checks globus prefix, looks for globus 
@@ -119,6 +108,11 @@
 # -------------------------------------------------------
 AC_DEFUN([AC_GLOBUS],
 [
+    PKG_CHECK_MODULES(GLOBUS_GSS, [globus-gssapi-gsi globus-gss-assist], [
+    GLOBUS_CFLAGS=$GLOBUS_GSS_CFLAGS
+    PKG_CHECK_MODULES(GLOBUS_GSS_API, [openssl])
+    ], [
+
     AC_ARG_WITH(globus_prefix,
 	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
 	[with_globus_prefix="$withval"],
@@ -165,6 +159,8 @@
 
     AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
 
+    ])
+
     if test "x$with_globus_flavor" = "x" ; then
       if test "x$USE_OLDGAA_LIB" = "x"; then
         USE_OLDGAA_LIB="liboldgaa.la"

voms-extra-vomses-java.patch:
 VOMSESFileParser.java |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE voms-extra-vomses-java.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2009-07-01 15:06:24.328378870 +0200
@@ -62,6 +62,12 @@
 
         List list = new ArrayList();
 
+        File defaultLocFile = new File( File.separator + "etc"
+                + File.separator + "vomses" );
+
+        if ( defaultLocFile.exists() )
+            list.add( defaultLocFile );
+
         if ( gliteLoc != null ) {
             File gliteLocFile = new File( gliteLoc + File.separator + "etc"
                     + File.separator + "vomses" );
@@ -97,6 +103,12 @@
         if ( gliteVomses.exists() )
             list.add( gliteVomses );
 
+        File vomsVomses = new File( System.getProperty( "user.home" )
+                + File.separator + ".voms" + File.separator + "vomses" );
+
+        if ( vomsVomses.exists() )
+            list.add( vomsVomses );
+
         vomsesPaths = list;
 
     }

voms-fix-enable-glite.patch:
 acinclude.m4 |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE voms-fix-enable-glite.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-07-01 13:03:05.768376649 +0200
@@ -587,12 +587,18 @@
 [
     AC_ARG_ENABLE(glite,
         [  --enable-glite     enable gLite  ],
-        [ac_enable_glite="yes"],
-        [ac_enable_glite="no"])
+        [
+          case "$enableval" in
+          yes) glite="yes" ;;
+          no) glite="no" ;;
+          *) AC_MSG_ERROR(bad value $(enableval) for --enable-glite) ;;
+          esac
+        ],
+        [glite="yes"])
 
-    AM_CONDITIONAL(ENABLE_GLITE, test x$ac_enable_glite = xyes)
+    AM_CONDITIONAL(ENABLE_GLITE, test x$glite = xyes)
 
-    if test "x$ac_enable_glite" = "xno"; then
+    if test "x$glite" = "xno"; then
     	DISTTAR=$WORKDIR
     	AC_SUBST(DISTTAR)
 #	EDG_SET_RPM_TOPDIR
@@ -601,7 +607,7 @@
     	AC_SUBST(VAR_LOCATION_ENV, "VOMS_LOCATION_VAR")
     	AC_DEFINE(LOCATION_ENV, "VOMS_LOCATION", [Environment variable name])
     	AC_DEFINE_UNQUOTED(LOCATION_DIR, "$prefix", [Location of system directory])
-    	AC_DEFINE(USER_DIR, ".edg", [Location of user directory])
+    	AC_DEFINE(USER_DIR, ".voms", [Location of user directory])
     else
     	AC_MSG_RESULT([Preparing for gLite environment])
     	AC_GLITE

voms-gcj.patch:
 BasicVOMSTrustStore.java |  682 -----------------------------------------------
 DirectoryList.java       |  142 +++++++++
 FileCertReader.java      |  492 +++++++++++++++++++++++++++++++++
 FileEndingIterator.java  |  137 +++++++++
 4 files changed, 771 insertions(+), 682 deletions(-)

--- NEW FILE voms-gcj.patch ---
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-08-29 07:52:08.000000000 +0200
@@ -13,69 +13,11 @@
  * follows.
  *
  *********************************************************************/
-/*
- * Copyright (c) Members of the EGEE Collaboration. 2004.
- * See http://eu-egee.org/partners/ for details on the copyright holders.
- * For license conditions see the license file or http://eu-egee.org/license.html
- */
-
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * DirectoryList.java
- *
- * @author  Joni Hahkala
- * Created on December 10, 2001, 6:50 PM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileEndingIterator.java
- *
- * @author  Joni Hahkala
- * Created on December 3, 2001, 9:16 AM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileCertReader.java
- *
- * @author  Joni Hahkala
- * Created on March 27, 2002, 8:24 PM
- */
 
 package org.glite.voms;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.PrivateKey;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -86,632 +28,8 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ASN1InputStream;
 import org.glite.voms.ac.ACTrustStore;
 
-/** Lists all the files in the given directory that end with
- * a certain ending.
- */
-class FileEndingIterator {
-    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
-
-    /** The file ending.
-     */
-    protected String ending;
-
-    /** A flag to show that there are more files that match.
-     */
-    protected boolean nextFound = false;
-
-    /** The list of files in the directory.
-     */
-    protected File[] fileList;
-
-    /** The index of the next match in the fileList.
-     */
-    protected int index = 0;
-
-    /** Creates new FileIterator and searches the first match.
-     * @param path The directory used for the file search.
-     * @param ending The file ending to search for.
-     */
-    public FileEndingIterator(String path, String ending) {
-        this.ending = ending;
-
-        try {
-            // open the directory
-            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
-
-            // list the files and dirs inside
-            fileList = directory.listFiles();
-
-            // find the first match for the ending
-            nextFound = findNext();
-        } catch (Exception e) {
-            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
-
-            //            e.printStackTrace();
-            return;
-        }
-    }
-
-    /** Used to get the next matching file.
-     * @return Returns the next matching file.
-     */
-    public File next() {
-        if (nextFound == false) {
-            return null;
-        }
-
-        File current = fileList[index++];
-
-        nextFound = findNext();
-
-        return current;
-    }
-
-    /** Used to check that there are more matching files to get
-     * using next().
-     * @return Returns true if there are more matching files.
-     */
-    public boolean hasNext() {
-        return nextFound;
-    }
-
-    /** Finds the next matching file in the list of files.
-     * @return Returns true if a matching file was found.
-     */
-    protected boolean findNext() {
-        try {
-            // search the next file with proper ending
-            while ((index < fileList.length) &&
-                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
-                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
-                index++;
-            }
-        } catch (Exception e) {
-            logger.error("Error while reading directory " + e.getMessage());
-
-            //            e.printStackTrace(System.out);
-            return false;
-        }
-
-        // check if the loop ended because of a match or because running out of choices.
-        if (index < fileList.length) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-/** Reads all certificates from given files, accepts binary form of DER encoded certs and
- * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
- * the actual certificate that has to begin with "-----BEGIN".
- * Should accept multiple certs in one file, not tested!
- */
-class FileCertReader {
-    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
-    static final int BUF_LEN = 1000;
-    static final byte CARR = '\r';
-    static final byte NL = '\n';
-
-    /** The type for TrustAnchor
-     */
-    static final int TYPE_ANCHOR = 100;
-
-    /** The type for certificate revocation list
-     */
-    static final int TYPE_CRL = 101;
-
-    /** the type for X509 certificate
-     */
-    static final int TYPE_CERT = 102;
-
-    static {
-        if (Security.getProvider("BC") == null) {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    CertificateFactory certFactory;
-
-    /** Creates a new instance of CertReader. */
-    public FileCertReader() throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", "BC");
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider.
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(Provider provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(String provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument. See DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if certificate reading from the files
-     * fails.
-     * @return Returns the Vector of certificates read.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCerts(String files) throws IOException, CertificateException {
-        Vector certs = readFiles(files, TYPE_CERT);
-
-        Iterator certIter = certs.iterator();
-
-        logger.debug("read certs: ");
-
-        while (certIter.hasNext()) {
-            X509Certificate cert = (X509Certificate) certIter.next();
-            logger.debug("Read cert: " + cert.getSubjectDN().toString());
-        }
-
-        return certs;
-    }
-
-    public PrivateKey readPrivateKey(String file) throws IOException {
-        File keyfile = new File(file);
-
-        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
-        skipToKeyBeginning(fis);
-
-        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument and makes TrustAnchors from them. See
-     * DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the certificate reading fails.
-     * @return Returns a Vector of TrustAnchors read from the
-     * files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readAnchors(String files) throws IOException, CertificateException {
-        Vector anchors = readFiles(files, TYPE_ANCHOR);
-
-        Iterator anchorIter = anchors.iterator();
-
-        logger.debug("read TrustAnchors: ");
-
-        while (anchorIter.hasNext()) {
-            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
-            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
-        }
-
-        return anchors;
-    }
-
-    /** Reads the certificate revocation lists (CRLs) from the
-     * files defined in the argument. See DirectoryList for
-     * file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the CRL reading failed.
-     * @return Returns a vector of CRLs read from the files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCRLs(String files) throws IOException, CertificateException {
-        Vector crls = readFiles(files, TYPE_CRL);
-
-        Iterator crlIter = crls.iterator();
-
-        logger.debug("read CRLs: ");
-
-        while (crlIter.hasNext()) {
-            X509CRL crl = (X509CRL) crlIter.next();
-            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
-        }
-
-        return crls;
-    }
-
-    /** Reads the certificates or CRLs from the files defined by
-     * the first argument, see DirectoryList for file definition
-     * format.
-     * @param files The file definition.
-     * @param type The type of things to read from the files.
-     * Currently supported are TYPE_ANCHOR,
-     * TYPE_CRL and TYPE_CERT defined in this class.
-     * @throws CertificateException Thrown if the reading of files fails.
-     * @return Returns a Vector of objects of type given that
-     * were read from the files given.
-     * @see org.glite.security.util.DirectoryList
-     */
-    private Vector readFiles(String files, int type) throws CertificateException {
-        Vector storeVector = new Vector();
-
-        try {
-            // load CA certificates
-            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
-
-            Iterator CAFileIter = dir.getListing().iterator();
-
-            // go through the files
-            while (CAFileIter.hasNext()) { // go through the files reading the certificates
-
-                File nextFile = (File) CAFileIter.next();
-
-                storeVector.addAll(readFile(nextFile, type));
-            }
-        } catch (IOException e) {
-            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
-
-            throw new CertificateException("Error while reading certificates or CRLs: " +
-                e.getMessage());
-        }
-
-        return storeVector;
-    }
-
-    /** Reads the objects of given type from the File.
-     * @param certFile The file to read.
-     * @param type The type of objects to read form the file.
-     * @throws IOException Thrown if the reading of objects of given type
-     * fails.
-     * @return Returns the Vector of objects read form the file.
-     */
-    public Vector readFile(File certFile, int type) throws IOException {
-        BufferedInputStream binStream = null;
-        Vector objects = new Vector();
-
-        try {
-            // get the buffered stream to facilitate marking
-            binStream = new BufferedInputStream(new FileInputStream(certFile));
-
-            while (binStream.available() > 0) {
-                Object obj = objectReader(binStream, type);
-
-                if (obj != null) {
-                    objects.add(obj);
-                }
-
-                skipEmptyLines(binStream);
-            }
-        } catch (Exception e) {
-            logger.fatal("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-
-            throw new IOException("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-        } finally {
-            if (binStream != null) {
-                binStream.close();
-            }
-        }
-
-        return objects;
-    }
-
-    /** Reads a certificate or a CRL from the stream, doing some
-     * error correction.
-     * @param binStream The stream to read the object from.
-     * @param type The type of object to read from the stream.
-     * @throws CertificateException Thrown if an error occurs while reading the object.
-     * @throws IOException Thrown if an error occurs while reading the object.
-     * @return Returns the object read.
-     */
-    public Object objectReader(BufferedInputStream binStream, int type)
-        throws CertificateException, IOException {
-        Object object = null;
-        int errors = 0; // no errors in the beginning
-        binStream.mark(10000);
-
-        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
-             // second with skipping possible garbage in the beginning.
-
-            try {
-                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
-                    // before the actual base64 encoded certificate
-                    errors = 2; // if this try fails, don't try anymore
-
-                    skipToCertBeginning(binStream); // skip the garbage
-                }
-
-                binStream.mark(100000);
-
-                binStream.reset();
-
-                object = readObject(binStream, type);
-            } catch (Exception e) {
-                if (errors != 0) { // if the error persists after first pass, fail
-                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
-                    throw new CertificateException("Certificate or CRL reading failed: " +
-                        e.getMessage());
-                }
-
-                errors = 1; // first try failed, try again with skipping
-                binStream.reset(); // rewind the file to the beginning of this try
-            }
-        } while (errors == 1); // try again after first try
-
-        return object;
-    }
-
-    /** Does the actual reading of the object.
-     * @param binStream The stream to read the object from.
-     * @param type The type of the object.
-     * @throws CertificateException Thrown if there is a problem reading the object.
-     * @return Returns the object read or null if no object was found.
-     */
-    public Object readObject(BufferedInputStream binStream, int type)
-        throws CertificateException {
-        Object obj;
-
-        if (type == TYPE_CRL) { // reading certificate revocation lists
-
-            try {
-                obj = certFactory.generateCRL(binStream);
-            } catch (CRLException e) {
-                logger.error("CRL loading failed: " + e.getMessage());
-                throw new CertificateException(e.getMessage());
-            }
-        } else { // reading certs or trust anchors
-
-            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
-
-            if (cert == null) {
-                return null;
-            }
-
-            if (type == TYPE_ANCHOR) {
-                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
-                obj = new TrustAnchor(cert, null);
-            } else {
-                if (type == TYPE_CERT) {
-                    obj = cert;
-                } else {
-                    logger.fatal("Internal error: Invalid data type " + type +
-                        " when trying to read certificate");
-                    throw new CertificateParsingException("Internal error: Invalid data type " +
-                        type + " when trying to read certificate");
-                }
-            }
-        }
-
-        return obj;
-    }
-
-    /** Skips everything in front of "-----BEGIN" in the stream.
-     * @param stream The stream to read and skip.
-     * @throws IOException Thrown if there is a problem skipping.
-     */
-    static public void skipToCertBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    static public void skipToKeyBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1)
-                index = buffer.indexOf("----BEGIN ENCRYPTED");
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    /** Skips empty lines in the stream.
-     * @param stream The stream possibly containing empty lines.
-     * @throws IOException Thrown if a problem occurs.
-     */
-    static public void skipEmptyLines(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-
-            int i = 0;
-
-            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
-                i++;
-            }
-
-            stream.reset();
-            stream.skip(i);
-
-            if (i < num) {
-                stream.mark(10000);
-
-                return;
-            } else {
-                stream.mark(BUF_LEN);
-            }
-        }
-    }
-}
-
-/** This class lists all the files defined in the constructor.
- * The definitions can be in three forms.
- * 1. absolute file (/tmp/test.txt)
- * 2. absolute path (/tmp)
- * 3. a wildcard file (/tmp/*.txt)
- *
- * In case 1. only the file is returned.
- * In case 2. all files in the directory are returned
- * In case 3. all the files in the directory tmp having
- * the .txt ending are returned.
- *
- * The returning means the return of the getListing method.
- */
-class DirectoryList {
-    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
-    List files = null;
-
-    /** Creates a new instance of DirectoryList
-     * @param path The file definition, see class description above.
-     * @throws Exception Thrown if the path was invalid
-     */
-    public DirectoryList(String path) throws IOException {
-        // splits the absolute? filename from the wildcard
-        String[] parts = path.split("\\*");
-
-        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
-        if ((parts.length < 1) || (parts.length > 2)) {
-            return;
-        }
-
-        // check whether the first and only part is a file or directory
-        if (parts.length == 1) {
-            // open the directory or file
-            File fileOrDir = new File(parts[0]);
-
-            // if the path given was fully specified filename
-            if (fileOrDir.isFile()) {
-                // set the file as the only member in the vector and finish
-                files = new Vector();
-                files.add(fileOrDir);
-
-                return;
-            }
-
-            // the path defined a directory, so get all files
-            File[] fileDirArray;
-
-            // list the files and dirs inside
-            fileDirArray = fileOrDir.listFiles();
-
-            if (fileDirArray == null) {
-                logger.error("No files found matching " + path);
-                throw new IOException("No files found matching " + path);
-            }
-
-            // get the array containing all the files and directories
-            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
-
-            files = new Vector();
-
-            // add all the files to the files list and finish
-            while (filesAndDirs.hasNext()) {
-                File nextFile = (File) filesAndDirs.next();
-
-                if (nextFile.isFile()) {
-                    files.add(nextFile);
-                }
-            }
-
-            return;
-        } else {
-            // this is a directory+ending combination
-            files = new Vector();
-
-            // get all the files matching the definition.
-            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
-
-            while (iterator.hasNext()) {
-                files.add(iterator.next());
-            }
-
-            return;
-        }
-    }
-
-    /** Used to get the file listing, the list of files matching
-     * the definition in constructor.
-     * @return Returns the list of files matching the definition
-     * given in the constructor.
-     */
-    public List getListing() {
-        return files;
-    }
-}
 
 /**
  * @deprecated  This class does not expose the necessary information. Use
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java	2009-08-29 07:22:01.000000000 +0200
@@ -0,0 +1,142 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * DirectoryList.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 10, 2001, 6:50 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+
+/** This class lists all the files defined in the constructor.
+ * The definitions can be in three forms.
+ * 1. absolute file (/tmp/test.txt)
+ * 2. absolute path (/tmp)
+ * 3. a wildcard file (/tmp/*.txt)
+ *
+ * In case 1. only the file is returned.
+ * In case 2. all files in the directory are returned
+ * In case 3. all the files in the directory tmp having
+ * the .txt ending are returned.
+ *
+ * The returning means the return of the getListing method.
+ */
+class DirectoryList {
+    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
+    List files = null;
+
+    /** Creates a new instance of DirectoryList
+     * @param path The file definition, see class description above.
+     * @throws Exception Thrown if the path was invalid
+     */
+    public DirectoryList(String path) throws IOException {
+        // splits the absolute? filename from the wildcard
+        String[] parts = path.split("\\*");
+
+        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
+        if ((parts.length < 1) || (parts.length > 2)) {
+            return;
+        }
+
+        // check whether the first and only part is a file or directory
+        if (parts.length == 1) {
+            // open the directory or file
+            File fileOrDir = new File(parts[0]);
+
+            // if the path given was fully specified filename
+            if (fileOrDir.isFile()) {
+                // set the file as the only member in the vector and finish
+                files = new Vector();
+                files.add(fileOrDir);
+
+                return;
+            }
+
+            // the path defined a directory, so get all files
+            File[] fileDirArray;
+
+            // list the files and dirs inside
+            fileDirArray = fileOrDir.listFiles();
+
+            if (fileDirArray == null) {
+                logger.error("No files found matching " + path);
+                throw new IOException("No files found matching " + path);
+            }
+
+            // get the array containing all the files and directories
+            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
+
+            files = new Vector();
+
+            // add all the files to the files list and finish
+            while (filesAndDirs.hasNext()) {
+                File nextFile = (File) filesAndDirs.next();
+
+                if (nextFile.isFile()) {
+                    files.add(nextFile);
+                }
+            }
+
+            return;
+        } else {
+            // this is a directory+ending combination
+            files = new Vector();
+
+            // get all the files matching the definition.
+            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
+
+            while (iterator.hasNext()) {
+                files.add(iterator.next());
+            }
+
+            return;
+        }
+    }
+
+    /** Used to get the file listing, the list of files matching
+     * the definition in constructor.
+     * @return Returns the list of files matching the definition
+     * given in the constructor.
+     */
+    public List getListing() {
+        return files;
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java	2009-08-29 07:55:09.000000000 +0200
@@ -0,0 +1,492 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileCertReader.java
+ *
+ * @author  Joni Hahkala
+ * Created on March 27, 2002, 8:24 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.cert.CRLException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.asn1.ASN1InputStream;
+
+/** Reads all certificates from given files, accepts binary form of DER encoded certs and
+ * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
+ * the actual certificate that has to begin with "-----BEGIN".
+ * Should accept multiple certs in one file, not tested!
+ */
+class FileCertReader {
+    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
+    static final int BUF_LEN = 1000;
+    static final byte CARR = '\r';
+    static final byte NL = '\n';
+
+    /** The type for TrustAnchor
+     */
+    static final int TYPE_ANCHOR = 100;
+
+    /** The type for certificate revocation list
+     */
+    static final int TYPE_CRL = 101;
+
+    /** the type for X509 certificate
+     */
+    static final int TYPE_CERT = 102;
+
+    static {
+        if (Security.getProvider("BC") == null) {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+    }
+
+    CertificateFactory certFactory;
+
+    /** Creates a new instance of CertReader. */
+    public FileCertReader() throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", "BC");
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider.
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(Provider provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(String provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument. See DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if certificate reading from the files
+     * fails.
+     * @return Returns the Vector of certificates read.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCerts(String files) throws IOException, CertificateException {
+        Vector certs = readFiles(files, TYPE_CERT);
+
+        Iterator certIter = certs.iterator();
+
+        logger.debug("read certs: ");
+
+        while (certIter.hasNext()) {
+            X509Certificate cert = (X509Certificate) certIter.next();
+            logger.debug("Read cert: " + cert.getSubjectDN().toString());
+        }
+
+        return certs;
+    }
+
+    public PrivateKey readPrivateKey(String file) throws IOException {
+        File keyfile = new File(file);
+
+        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
+        skipToKeyBeginning(fis);
+
+        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument and makes TrustAnchors from them. See
+     * DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the certificate reading fails.
+     * @return Returns a Vector of TrustAnchors read from the
+     * files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readAnchors(String files) throws IOException, CertificateException {
+        Vector anchors = readFiles(files, TYPE_ANCHOR);
+
+        Iterator anchorIter = anchors.iterator();
+
+        logger.debug("read TrustAnchors: ");
+
+        while (anchorIter.hasNext()) {
+            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
+            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
+        }
+
+        return anchors;
+    }
+
+    /** Reads the certificate revocation lists (CRLs) from the
+     * files defined in the argument. See DirectoryList for
+     * file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the CRL reading failed.
+     * @return Returns a vector of CRLs read from the files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCRLs(String files) throws IOException, CertificateException {
+        Vector crls = readFiles(files, TYPE_CRL);
+
+        Iterator crlIter = crls.iterator();
+
+        logger.debug("read CRLs: ");
+
+        while (crlIter.hasNext()) {
+            X509CRL crl = (X509CRL) crlIter.next();
+            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
+        }
+
+        return crls;
+    }
+
+    /** Reads the certificates or CRLs from the files defined by
+     * the first argument, see DirectoryList for file definition
+     * format.
+     * @param files The file definition.
+     * @param type The type of things to read from the files.
+     * Currently supported are TYPE_ANCHOR,
+     * TYPE_CRL and TYPE_CERT defined in this class.
+     * @throws CertificateException Thrown if the reading of files fails.
+     * @return Returns a Vector of objects of type given that
+     * were read from the files given.
+     * @see org.glite.voms.DirectoryList
+     */
+    private Vector readFiles(String files, int type) throws CertificateException {
+        Vector storeVector = new Vector();
+
+        try {
+            // load CA certificates
+            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
+
+            Iterator CAFileIter = dir.getListing().iterator();
+
+            // go through the files
+            while (CAFileIter.hasNext()) { // go through the files reading the certificates
+
+                File nextFile = (File) CAFileIter.next();
+
+                storeVector.addAll(readFile(nextFile, type));
+            }
+        } catch (IOException e) {
+            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
+
+            throw new CertificateException("Error while reading certificates or CRLs: " +
+                e.getMessage());
+        }
+
+        return storeVector;
+    }
+
+    /** Reads the objects of given type from the File.
+     * @param certFile The file to read.
+     * @param type The type of objects to read form the file.
+     * @throws IOException Thrown if the reading of objects of given type
+     * fails.
+     * @return Returns the Vector of objects read form the file.
+     */
+    public Vector readFile(File certFile, int type) throws IOException {
+        BufferedInputStream binStream = null;
+        Vector objects = new Vector();
+
+        try {
+            // get the buffered stream to facilitate marking
+            binStream = new BufferedInputStream(new FileInputStream(certFile));
+
+            while (binStream.available() > 0) {
+                Object obj = objectReader(binStream, type);
+
+                if (obj != null) {
+                    objects.add(obj);
+                }
+
+                skipEmptyLines(binStream);
+            }
+        } catch (Exception e) {
+            logger.fatal("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+
+            throw new IOException("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+        } finally {
+            if (binStream != null) {
+                binStream.close();
+            }
+        }
+
+        return objects;
+    }
+
+    /** Reads a certificate or a CRL from the stream, doing some
+     * error correction.
+     * @param binStream The stream to read the object from.
+     * @param type The type of object to read from the stream.
+     * @throws CertificateException Thrown if an error occurs while reading the object.
+     * @throws IOException Thrown if an error occurs while reading the object.
+     * @return Returns the object read.
+     */
+    public Object objectReader(BufferedInputStream binStream, int type)
+        throws CertificateException, IOException {
+        Object object = null;
+        int errors = 0; // no errors in the beginning
+        binStream.mark(10000);
+
+        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
+             // second with skipping possible garbage in the beginning.
+
+            try {
+                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
+                    // before the actual base64 encoded certificate
+                    errors = 2; // if this try fails, don't try anymore
+
+                    skipToCertBeginning(binStream); // skip the garbage
+                }
+
+                binStream.mark(100000);
+
+                binStream.reset();
+
+                object = readObject(binStream, type);
+            } catch (Exception e) {
+                if (errors != 0) { // if the error persists after first pass, fail
+                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
+                    throw new CertificateException("Certificate or CRL reading failed: " +
+                        e.getMessage());
+                }
+
+                errors = 1; // first try failed, try again with skipping
+                binStream.reset(); // rewind the file to the beginning of this try
+            }
+        } while (errors == 1); // try again after first try
+
+        return object;
+    }
+
+    /** Does the actual reading of the object.
+     * @param binStream The stream to read the object from.
+     * @param type The type of the object.
+     * @throws CertificateException Thrown if there is a problem reading the object.
+     * @return Returns the object read or null if no object was found.
+     */
+    public Object readObject(BufferedInputStream binStream, int type)
+        throws CertificateException {
+        Object obj;
+
+        if (type == TYPE_CRL) { // reading certificate revocation lists
+
+            try {
+                obj = certFactory.generateCRL(binStream);
+            } catch (CRLException e) {
+                logger.error("CRL loading failed: " + e.getMessage());
+                throw new CertificateException(e.getMessage());
+            }
+        } else { // reading certs or trust anchors
+
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
+
+            if (cert == null) {
+                return null;
+            }
+
+            if (type == TYPE_ANCHOR) {
+                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
+                obj = new TrustAnchor(cert, null);
+            } else {
+                if (type == TYPE_CERT) {
+                    obj = cert;
+                } else {
+                    logger.fatal("Internal error: Invalid data type " + type +
+                        " when trying to read certificate");
+                    throw new CertificateParsingException("Internal error: Invalid data type " +
+                        type + " when trying to read certificate");
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    /** Skips everything in front of "-----BEGIN" in the stream.
+     * @param stream The stream to read and skip.
+     * @throws IOException Thrown if there is a problem skipping.
+     */
+    static public void skipToCertBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    static public void skipToKeyBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1)
+                index = buffer.indexOf("----BEGIN ENCRYPTED");
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    /** Skips empty lines in the stream.
+     * @param stream The stream possibly containing empty lines.
+     * @throws IOException Thrown if a problem occurs.
+     */
+    static public void skipEmptyLines(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+
+            int i = 0;
+
+            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
+                i++;
+            }
+
+            stream.reset();
+            stream.skip(i);
+
+            if (i < num) {
+                stream.mark(10000);
+
+                return;
+            } else {
+                stream.mark(BUF_LEN);
+            }
+        }
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java	2009-08-29 07:24:52.000000000 +0200
@@ -0,0 +1,137 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileEndingIterator.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 3, 2001, 9:16 AM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+
+/** Lists all the files in the given directory that end with
+ * a certain ending.
+ */
+class FileEndingIterator {
+    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
+
+    /** The file ending.
+     */
+    protected String ending;
+
+    /** A flag to show that there are more files that match.
+     */
+    protected boolean nextFound = false;
+
+    /** The list of files in the directory.
+     */
+    protected File[] fileList;
+
+    /** The index of the next match in the fileList.
+     */
+    protected int index = 0;
+
+    /** Creates new FileIterator and searches the first match.
+     * @param path The directory used for the file search.
+     * @param ending The file ending to search for.
+     */
+    public FileEndingIterator(String path, String ending) {
+        this.ending = ending;
+
+        try {
+            // open the directory
+            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
+
+            // list the files and dirs inside
+            fileList = directory.listFiles();
+
+            // find the first match for the ending
+            nextFound = findNext();
+        } catch (Exception e) {
+            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
+
+            //            e.printStackTrace();
+            return;
+        }
+    }
+
+    /** Used to get the next matching file.
+     * @return Returns the next matching file.
+     */
+    public File next() {
+        if (nextFound == false) {
+            return null;
+        }
+
+        File current = fileList[index++];
+
+        nextFound = findNext();
+
+        return current;
+    }
+
+    /** Used to check that there are more matching files to get
+     * using next().
+     * @return Returns true if there are more matching files.
+     */
+    public boolean hasNext() {
+        return nextFound;
+    }
+
+    /** Finds the next matching file in the list of files.
+     * @return Returns true if a matching file was found.
+     */
+    protected boolean findNext() {
+        try {
+            // search the next file with proper ending
+            while ((index < fileList.length) &&
+                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
+                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
+                index++;
+            }
+        } catch (Exception e) {
+            logger.error("Error while reading directory " + e.getMessage());
+
+            //            e.printStackTrace(System.out);
+            return false;
+        }
+
+        // check if the loop ended because of a match or because running out of choices.
+        if (index < fileList.length) {
+            return true;
+        }
+
+        return false;
+    }
+}

voms-initscript.patch:
 voms.start.in |  186 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 64 deletions(-)

--- NEW FILE voms-initscript.patch ---
diff -ur voms-1.9.11.orig/src/install/voms.start.in voms-1.9.11/src/install/voms.start.in
--- voms-1.9.11.orig/src/install/voms.start.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms.start.in	2009-09-03 10:10:17.574074641 +0200
@@ -19,9 +19,19 @@
 #	voms servers.
 #
 # chkconfig: 2345 95 05
-# description: VOMS stands for Virtual Organization Membership System.
+# description: Virtual Organization Membership Service
 # processname: voms
 # pidfile: /var/run/voms.pid
+#
+### BEGIN INIT INFO
+# Provides:          voms
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Virtual Organization Membership Service
+# Description:       Virtual Organization Membership Service
+### END INIT INFO
 
 # Source networking configuration and check that networking is up.
 if [ -r /etc/sysconfig/network ] ; then
@@ -31,9 +41,16 @@
 
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
- at VAR_LOCATION_ENV@=${@VAR_LOCATION_ENV@:-$@LOCATION_ENV@/var}
 
-# check whether $@VAR_LOCATION_ENV@/var/lock/subsys exists
+if [ -z "$@VAR_LOCATION_ENV@" ] ; then
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
+fi
+
+# check whether $@VAR_LOCATION_ENV@/lock/subsys exists
 if ! test -d $@VAR_LOCATION_ENV@/lock/subsys ; then
     mkdir -p $@VAR_LOCATION_ENV@/lock/subsys
 fi
@@ -41,19 +58,38 @@
 # Default path
 basepath=$@LOCATION_ENV@
 binpath=${basepath}/sbin
-etcpath=${basepath}/etc
 
-# Source an auxiliary profile file if we have one, and pick up VOMS_OPTIONS and VOMS_USER
-if [ -r ${etcpath}/profile.d/voms.sh ] ; then
-    . ${etcpath}/profile.d/voms.sh
+if [ "$basepath" = "/usr" ] ; then
+    etcpath=/etc
+else
+    etcpath=${basepath}/etc
+fi
+
+RUN=yes
+
+# Source an auxiliary profile file if we have one and pick up VOMS_USER and RUN
+if [ -r ${etcpath}/default/voms ] ; then
+    . ${etcpath}/default/voms
+fi
+if [ -r ${etcpath}/sysconfig/voms ] ; then
+    . ${etcpath}/sysconfig/voms
+fi
+
+# Don't run until configuration is done
+if [ "x$RUN" != "xyes" ] ; then
+    echo "voms disabled, please adjust the configuration to your needs "
+    echo "and then set RUN to 'yes' in /etc/default/voms to enable it."
+    exit 0
 fi
 
 # add lib directory to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+fi
 
-voms=${binpath}/edg-voms
+voms=${binpath}/voms
 if !(test -x ${voms}) ; then
-    echo "Cannot find edg-voms." 
+    echo "Cannot find voms."
     exit 0
 fi
 
@@ -64,18 +100,22 @@
     # Start daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
 
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Starting $prog($vo): "
 
-            if test -f $@LOCATION_ENV@/etc/voms/$vo/tnsnames.ora ; then
-                tnsvalue=$@LOCATION_ENV@/etc/voms/$vo
+            if test -f ${etcpath}/voms/$vo/tnsnames.ora ; then
+                tnsvalue=${etcpath}/voms/$vo
             else
                 tnsvalue="$TNS_ADMIN"
             fi
@@ -84,21 +124,21 @@
                 read pid < $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
                 if test "x$pid" != "x"; then
                     if checkpid $pid; then
-                        echo "VOMS ($pid) is already running" && failure
+                        echo "VOMS ($pid) is already running"
                         continue;
                     fi
                 fi
             fi
 
             if [ -n "$VOMS_USER" ]; then
-                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
+                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf ${etcpath}/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
             else
-                TNS_ADMIN="$tnsvalue" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf
+                TNS_ADMIN="$tnsvalue" ${voms} --conf ${etcpath}/voms/$vo/voms.conf
             fi
 
-	          # get process id
-            pid=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            # get process id
+            pid=$(ps axo pid,args | grep "${voms} --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             NUM=$(($pid))
             if test $NUM -eq 0; then
                 RETVAL=1
@@ -110,12 +150,17 @@
                 RETGLOB=$(($RETGLOB + 1 ))
             fi
             [ "$RETVAL" -eq 0 ] && success || failure 
+            echo
         fi
     done
     
     return $RETGLOB
 }
 
+if [ -r /etc/init.d/functions ] ; then
+    . /etc/init.d/functions
+else
+
 success()
 {
     echo $1
@@ -151,6 +196,8 @@
     return $rc
 }
 
+fi
+
 checkpid() 
 {
     ps --pid $1 >> /dev/null
@@ -164,14 +211,14 @@
 # A function to stop a program.
 killprocs() {
     RC=0
-	# Test syntax.
+    # Test syntax.
     if [ "$#" -eq 0 ]; then
         echo $"Usage: killproc {pids} [signal]"
         return 1
     fi
     
     notset=0
-	# check for second arg to be kill level
+    # check for second arg to be kill level
     if [ "$2" != "" ] ; then
         killlevel=$2
     else
@@ -179,15 +226,15 @@
         killlevel="-9"
     fi
 
-        # Find pid.
+    # Find pid.
     pid=$1
 
-        # Kill it.
+    # Kill it.
     if [ -n "${pid:-}" ] ; then
         [ "$BOOTUP" = "verbose" -a -z "$LSB" ] && echo -n "$base "
         if [ "$notset" -eq "1" ] ; then
             if checkpid $pid 2>&1; then
-			   # TERM first, then KILL if not dead
+                # TERM first, then KILL if not dead
                 kill -TERM $pid
                 sleep 0.1
                 if checkpid $pid && sleep 1 &&
@@ -196,14 +243,14 @@
                     kill -KILL $pid
                     sleep 0.1
                 fi
-		        fi
+            fi
             checkpid $pid
             RC=$?
             [ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
             RC=$((! $RC))
-		# use specified level only
-		else
-		        if checkpid $pid >/dev/null 2>&1; then
+        else
+            # use specified level only
+            if checkpid $pid >/dev/null 2>&1; then
                 kill $killlevel $pid
                 RC=$?
                 [ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
@@ -214,7 +261,7 @@
         RC=1
     fi
     
-        # Remove pid file if any.
+    # Remove pid file if any.
     if [ "$notset" = "1" ]; then
         rm -f /var/run/$base.pid
     fi
@@ -226,18 +273,21 @@
     # Stop daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Stopping $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep|awk '{ print $2; }'|tr '\n' ' '`
-            dbname=`grep dbname $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
-            username=`grep username $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            dbname=`grep dbname ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            username=`grep username ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
             if test "x$username" = "x"; then
                 pids="";
                 pids2="";
@@ -255,16 +305,15 @@
                 fi
             fi
             if test -z "$pids"; then
-                failure; echo
-                RETVAL=1
+                echo "(already stopped)"
                 continue
             fi
             for pid in $pids; do
-                killprocs ${pid} ;
+                killprocs ${pid}
             done
             RETVAL=$?
             echo
-            [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/voms.$vo
+            [ $RETVAL -eq 0 ] && rm -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
             RETGLOB=$((RETGLOB + RETVAL))
         fi
     done
@@ -273,47 +322,53 @@
 }
 
 function condrestart() {
-    # Stop daemons.
+    RETGLOB=0
+    # Conditionally restart daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
     
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
-            echo -n "Condrestart $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
-            if test -z "$pids"; then
-                echo; start $vo
-            else
-                failure; echo
-                RETVAL=1
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            if test -n "$pids"; then
+                $0 restart $vo
+                RETVAL=$?
+                RETGLOB=$((RETGLOB + RETVAL))
             fi
         fi
     done
 
     return $RETGLOB
-
 }
 
 function getstatus() {
-    # Stop daemons.
-    prog=`basename ${voms}`
-
-    # get vos
-    vos=${1:-`find $@LOCATION_ENV@/etc/voms/ -type d -printf "%f "`}
-
     value=0
+    # Get status.
+    prog=`basename ${voms}`
+    if test -z $1; then
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
+    else
+        vos=$1
+    fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Status $prog($vo): "
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             if test -z "$pids"; then
-                if [ -f /var/lock/subsys/voms.$vo ]; then
+                if [ -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo ]; then
                     echo "dead but subsys locked"
                     value=$[$value < 2 ? 2 : $value]
                     continue
@@ -322,7 +377,8 @@
                 value=$[$value < 3 ? 3 : $value]
                 continue
             else
-                echo "(pid $pids) is running..."
+                echo -n "(pid $pids) is running..." | tr '\n' ' '
+                echo
                 value=$[$value < 0 ? 0 : $value]
                 continue
             fi
@@ -346,12 +402,14 @@
         getstatus $2
         RETVAL=$?
         ;;
-    restart)
+    restart | force-reload)
         stop $2
         start $2
         RETVAL=$?
         ;;
-    condrestart)
+    reload)
+        ;;
+    condrestart | try-restart)
         condrestart $2
         RETVAL=$?
         ;;

voms-install-db.patch:
 voms_install_db.in |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE voms-install-db.patch ---
diff -ur voms-1.9.11.orig/src/install/voms_install_db.in voms-1.9.11/src/install/voms_install_db.in
--- voms-1.9.11.orig/src/install/voms_install_db.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms_install_db.in	2009-08-26 17:45:39.608077295 +0200
@@ -4,7 +4,11 @@
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
 if test -z $@VAR_LOCATION_ENV@ ; then
-    @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
 fi
 
 # CERTDIR
@@ -37,7 +41,9 @@
 
 # Default path
 basepath=$@LOCATION_ENV@
-datapath=$@LOCATION_ENV@
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    datapath=$@LOCATION_ENV@
+fi
 
 # Default Suffix
 code=0
@@ -49,7 +55,7 @@
 logformat=""
 sqlloc=""
 help=""
-oldformat="no"
+newformat="yes"
 
 if test "x at with_mysqlconf@" != "x" ; then
     MYSQLCONF=" --defaults-file=@with_mysqlconf@ "
@@ -58,7 +64,7 @@
 fi
 
 
-TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,compat -n 'voms_install_db' -- "$@"`
+TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,oldformat,compat -n 'voms_install_db' -- "$@"`
 
 if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi
 
@@ -84,7 +90,7 @@
   --logtype)                logtype=$2                 ; shift 2 ;;
   --logformat)              logformat=$2               ; shift 2 ;;
   --logdateformat)          logdateformat=$2           ; shift 2 ;;
-  --newformat)              oldformat="yes"            ; shift 1 ;;
+  --oldformat)              newformat="no"             ; shift 1 ;;
   -h)                       help="yes"                 ; shift 1 ;;
 	--)                       shift                      ; break   ;;
 	*)                        $ECHO "$1: Internal Error!" >&2 ; exit 1  ;;
@@ -133,7 +139,7 @@
     $ECHO "    --logtype type          Specifies what to log. See the vomsd(8) man page for details."
     $ECHO "    --logformat format      See the vomsd(8) man page for details."
     $ECHO "    --logdateformat format  See the vomsd(8) man page for details."
-    $ECHO "    --newformat             Creates AC according to the old format."
+    $ECHO "    --oldformat             Creates AC according to the old format."
     $ECHO "    --help                  This output."
     exit 0;
 fi
@@ -261,8 +267,8 @@
 
 # Setting ownership and permission for voms_password_query file
 mkdir -p $datapath/etc/voms/$voms_vo
-mkdir -p $@LOCATION_ENV at _VAR/log
-#$datapath/log
+mkdir -p $@VAR_LOCATION_ENV@/log/voms
+
 $ECHO $voms_password_query > $datapath/etc/voms/$voms_vo/voms.pass
 chown root.voms $datapath/etc/voms/$voms_vo/voms.pass
 chmod 640 $datapath/etc/voms/$voms_vo/voms.pass
@@ -270,10 +276,10 @@
 if test -z $voms_vo ; then
     logname=voms
 else
-    logname=voms.$voms_vo
+    logname=$voms_vo
 fi
  
-$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@LOCATION_ENV at _VAR/log/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
+$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/voms/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
 $ECHO -en "--socktimeout=$timeout\n--loglevel=$loglevel\n--logtype=$logtype\n" >>$datapath/etc/voms/$voms_vo/voms.conf
 
 if test "x$compat_mode" = "x-compat"; then

voms-jar-perms.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-jar-perms.patch ---
diff -ur voms-1.9.11.orig/src/api/java/Makefile.am voms-1.9.11/src/api/java/Makefile.am
--- voms-1.9.11.orig/src/api/java/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/Makefile.am	2009-08-14 20:54:18.599023487 +0200
@@ -70,7 +70,7 @@
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/java
-	$(INSTALL) $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
+	$(INSTALL) -m644 $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
 
 clean:
 	rm -f $(top_builddir)/src/api/java/vomsjapi.jar

voms-java-clone-cast.patch:
 VOMSValidator.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE voms-java-clone-cast.patch ---
diff -ur voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java	2009-08-15 20:12:49.855022959 +0200
@@ -159,7 +159,7 @@
         if (validatedChain == null)
             myValidatedChain = null; // allow null
         else
-            myValidatedChain = validatedChain.clone(); // allow null
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
 
         if (acValidator == null) {
             if (theTrustStore == null) {
@@ -292,7 +292,7 @@
         if (validatedChain == null) 
             myValidatedChain = null;
         else
-            myValidatedChain = validatedChain.clone();
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
         myVomsAttributes = new Vector();
         myFQANTree = null;
         isParsed = false;

voms-javadoc.patch:
 PathNamingScheme.java   |   14 +++++++-------
 UserCredentials.java    |   14 +++++++-------
 VOMSParser.java         |    2 +-
 VOMSProtocol.java       |    6 +++---
 VOMSProxyBuilder.java   |   16 ++++++++--------
 VOMSRequestOptions.java |   17 ++++-------------
 6 files changed, 30 insertions(+), 39 deletions(-)

--- NEW FILE voms-javadoc.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2009-07-01 19:02:29.448373448 +0200
@@ -61,7 +61,7 @@
     /**
      * This methods checks that the string passed as argument complies with the voms FQAN syntax.
      *  
-     * @param containerName, the string that must be checked for compatibility with FQAN syntax. 
+     * @param containerName the string that must be checked for compatibility with FQAN syntax. 
      * @throws VOMSSyntaxException
      *         If there's an error in the FQAN syntax.
      */
@@ -81,7 +81,7 @@
      * This methods checks that the string passed as argument complies with the syntax used
      * by voms to identify groups.
      * 
-     * @param groupName, the string that has to be checked.
+     * @param groupName the string that has to be checked.
      * @throws VOMSSyntaxException
      *          If the string passed as argument doens not comply with the voms sytax.
      */
@@ -116,7 +116,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms group.
      * 
-     * @param groupName, the string to check.
+     * @param groupName the string to check.
      * @return  <ul><li>true, if the string passed as argument identifies a voms group.
      *          <li>false, otherwise.
      *          </ul>
@@ -131,7 +131,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms role.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -147,7 +147,7 @@
      * This methods checks that the FQAN passed as argument identifies a qualified voms role, i.e.,
      * a role defined in the context of a voms group.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a qualified voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -163,7 +163,7 @@
     /**
      * This method extracts the role name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN
+     * @param containerName the FQAN
      * @return <ul><li>A string containing the role name, if found</li>
      *              <li>null, if no role information is contained in the FQAN passed as argument
      *         </ul>
@@ -190,7 +190,7 @@
     /**
      * This method extracts group name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN 
+     * @param containerName the FQAN 
      * @return <ul><li>A string containing the group name, if found</li>
      *              <li>null, if no group information is contained in the FQAN passed as argument
      *         </ul>
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-07-01 19:02:29.456372709 +0200
@@ -377,7 +377,7 @@
      * Static instance constructor for a {@link UserCredentials}.
      * For more info on the user credentials load procedure, see {@link #instance()}.
      *
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -396,9 +396,9 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -416,8 +416,8 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -435,7 +435,7 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param credentials, the GlobusCredentials object containing the user's own proxy
+     * @param credentials the GlobusCredentials object containing the user's own proxy
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java	2009-07-01 19:02:29.465377247 +0200
@@ -61,7 +61,7 @@
     /**
      * 
      * Parses a voms response reading from a given input stream.
-     * @param is, the input stream.
+     * @param is the input stream.
      * @return a {@link VOMSResponse} object that represents the parsed response.
      */
     public VOMSResponse parseResponse(InputStream is){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2009-07-01 19:02:29.468373182 +0200
@@ -97,8 +97,8 @@
      * 
      * This method is used to send a request to a VOMS server.
      *  
-     * @param requestOptions, the request options. See {@link VOMSRequestOptions}. 
-     * @param stream, an output stream.
+     * @param requestOptions the request options. See {@link VOMSRequestOptions}. 
+     * @param stream an output stream.
      */
     public void sendRequest(VOMSRequestOptions requestOptions, OutputStream stream){
         
@@ -154,7 +154,7 @@
     /**
      * This method is used to parse a VOMS response from an input stream.
      * 
-     * @param stream, the input stream from which the response will be parsed.
+     * @param stream the input stream from which the response will be parsed.
      * @return a {@link VOMSResponse} object.
      */
     public VOMSResponse getResponse(InputStream stream){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 19:36:38.729376985 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 20:58:25.590377728 +0200
@@ -130,9 +130,9 @@
      *
      * This methods builds an {@link AttributeCertificate} (AC) object starting from an array of bytes.
      *
-     * @param acBytes, the byte array containing the attribute certificate.
+     * @param acBytes the byte array containing the attribute certificate.
      * @return the {@link AttributeCertificate} object
-     * @throws VOMSException, in case of parsing errors.
+     * @throws VOMSException in case of parsing errors.
      */
     public static AttributeCertificate buildAC(byte[] acBytes){
 
@@ -161,12 +161,12 @@
      * passed as arguments and including a list of {@link AttributeCertificate} objects that
      * will be included in the proxy.
      *
-     * @param cred, the {@link UserCredentials} from which the proxy must be created.
-     * @param ACs, the list of {@link AttributeCertificate} objects.
-     * @param lifetime, the lifetime in seconds of the generated proxy.
-     * @param version, the version of globus to which the proxy conforms
-     * @return a {@link GlobusCredential} object that represents the proxy.
-     * @throws {@link VOMSException}, if something goes wrong.
+     * @param cred the {@link UserCredentials} from which the proxy must be created.
+     * @param ACs the list of {@link AttributeCertificate} objects.
+     * @param lifetime the lifetime in seconds of the generated proxy.
+     * @param gtVersion the version of globus to which the proxy conforms
+     * @return a {@link UserCredentials} object that represents the proxy.
+     * @throws VOMSException if something goes wrong.
      *
      * @author Vincenzo Ciaschini
      * @author Andrea Ceccanti
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2009-07-01 19:08:10.252380084 +0200
@@ -75,9 +75,7 @@
 
     
     /**
-     * 
-     * Returns the ordering string of this {@link VOMSRequestOptions} object.
-     * @return
+     * @return the ordering string of this {@link VOMSRequestOptions} object.
      */
     public String getOrdering() {
 
@@ -99,10 +97,7 @@
 
     
     /**
-     * 
-     * Returs the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
-     * 
-     * @return
+     * @return the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
      */
     public List getRequestedFQANs() {
 
@@ -123,10 +118,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object.
-     * 
-     * @return
      */
     public List getTargets() {
 
@@ -135,10 +128,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object as a string containing a a comma-separated list of host names.
-     * 
-     * @return
      */
     public String getTargetsAsString() {
 

voms-nolib64.patch:
 configure.ac |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE voms-nolib64.patch ---
diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
--- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
@@ -37,10 +37,6 @@
 
 AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
 
-if test "x$host_cpu" = "xx86_64"; then
-    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
-fi
-
 AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
 AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
 AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-notknown-msg.patch:
 vomsclient.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE voms-notknown-msg.patch ---
diff -ur voms-1.9.11.orig/src/client/vomsclient.cc voms-1.9.11/src/client/vomsclient.cc
--- voms-1.9.11.orig/src/client/vomsclient.cc	2009-07-27 10:14:04.000000000 +0200
+++ voms-1.9.11/src/client/vomsclient.cc	2009-08-31 17:51:15.952071123 +0200
@@ -575,7 +575,9 @@
       std::vector<contactdata> servers;
       servers = v.FindByAlias(contact.vo().empty() ? contact.nick() : contact.vo());
       if (servers.empty()) {
-        std::cerr << "VOMS Server for " << contact.vo() << " not known!" << std::endl;
+        std::cerr << "VOMS Server for "
+		  << (contact.vo().empty() ? contact.nick() : contact.vo())
+		  << " not known!" << std::endl;
         exit(1);
       }
     

voms-openssl.patch:
 ac/Makefile.am        |    1 +
 api/ccapi/api_util.cc |    4 ++--
 include/acstack.h     |    2 +-
 socklib/Client.cpp    |    4 ++++
 utils/vomsfake.cc     |    1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE voms-openssl.patch ---
diff -ur voms-1.9.11.orig/src/ac/Makefile.am voms-1.9.11/src/ac/Makefile.am
--- voms-1.9.11.orig/src/ac/Makefile.am	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/src/ac/Makefile.am	2009-09-07 11:06:49.079471423 +0200
@@ -27,6 +27,7 @@
 	-DNOGLOBUS \
 	-I $(top_srcdir)/src/include \
 	-I $(top_builddir)/src/sslutils
+libattributes_nog_la_CXXFLAGS = $(libattributes_nog_la_CFLAGS)
 
 libattributes_nog_la_LIBADD = \
 	$(OPENSSL_LIBS)
diff -ur voms-1.9.11.orig/src/api/ccapi/api_util.cc voms-1.9.11/src/api/ccapi/api_util.cc
--- voms-1.9.11.orig/src/api/ccapi/api_util.cc	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/api_util.cc	2009-09-07 11:06:49.080471703 +0200
@@ -415,9 +415,9 @@
   /* extract vo name from AC */
   
   AC * ac = (AC *)data;
-  STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
+  const STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
   int nid = OBJ_txt2nid("idatcap");
-  int pos = X509at_get_attr_by_NID(atts, nid, -1);
+  int pos = X509at_get_attr_by_NID((const STACK_OF(X509_ATTRIBUTE)*)atts, nid, -1);
 
   int nidc = OBJ_txt2nid("certseq");
   STACK_OF(X509_EXTENSION) *exts = ac->acinfo->exts;
diff -ur voms-1.9.11.orig/src/include/acstack.h voms-1.9.11/src/include/acstack.h
--- voms-1.9.11.orig/src/include/acstack.h	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/include/acstack.h	2009-09-07 11:06:49.081472345 +0200
@@ -79,7 +79,7 @@
 #endif
 
 #define DECL_STACK(type) \
-   DECLARE_STACK_OF(type) \
+   PREDECLARE_STACK_OF(type) \
    extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \
    extern STACK_OF(type) *sk_##type##_new_null (); \
    extern void   sk_##type##_free (STACK_OF(type) *); \
diff -ur voms-1.9.11.orig/src/socklib/Client.cpp voms-1.9.11/src/socklib/Client.cpp
--- voms-1.9.11.orig/src/socklib/Client.cpp	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Client.cpp	2009-09-07 11:28:07.210471657 +0200
@@ -336,7 +336,11 @@
 bool 
 GSISocketClient::Open()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int ret = -1, ret2 = -1;
   time_t starttime, curtime;
   long errorcode = 0;
diff -ur voms-1.9.11.orig/src/utils/vomsfake.cc voms-1.9.11/src/utils/vomsfake.cc
--- voms-1.9.11.orig/src/utils/vomsfake.cc	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/utils/vomsfake.cc	2009-09-07 10:21:52.935470664 +0200
@@ -40,6 +40,7 @@
 #include "listfunc.h"
 #include "credentials.h"
 #include "parsertypes.h"
+#define YYTOKENTYPE
 #include "vomsparser.h"
 
 VOLIST *volist = NULL;

voms-pipe-buf.patch:
 log.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE voms-pipe-buf.patch ---
diff -ur voms-1.9.11.orig/src/log/log.c voms-1.9.11/src/log/log.c
--- voms-1.9.11.orig/src/log/log.c	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/log/log.c	2009-09-07 16:02:18.597470396 +0200
@@ -175,7 +175,11 @@
   if (*buffer) {
     while (offset < slen) {
       do {
+#ifdef PIPE_BUF
         readbytes = read(fd, *buffer + offset, (slen - offset > PIPE_BUF ? PIPE_BUF : slen - offset));
+#else
+        readbytes = read(fd, *buffer + offset, (slen - offset > fpathconf(fd, _PC_PIPE_BUF) ? fpathconf(fd, _PC_PIPE_BUF) : slen - offset));
+#endif
       } while (readbytes < 0 && (errno == EINTR
 #ifdef ERESTART
                                    || errno == ERESTART

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

--- NEW FILE voms-portability.patch ---
diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
--- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
@@ -1,6 +1,6 @@
 
 AC_INIT([GLite Security VOMS], [1.9.11])
-AC_PREREQ(2.59)
+AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/utils/voms_proxy_destroy.cc])
diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4
--- voms-1.9.11.orig/project/acinclude.m4	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/project/acinclude.m4	2009-09-08 14:13:33.246338019 +0200
@@ -904,12 +904,16 @@
 
 AC_DEFUN([PUT_PRIVATES],
 [
-        AH_BOTTOM([#ifdef __GNUC__
+        AH_BOTTOM([#if defined(__GNUC__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #define UNUSED(z)  z __attribute__ ((unused))
+#else
+#define UNUSED(z)  z
+#endif
 #define PRIVATE    __attribute__ ((visibility ("hidden")))
 #define PUBLIC     __attribute__ ((visibility ("default")))
 #else
-#define UNUSED
+#define UNUSED(z)  z
 #define PRIVATE
 #define PUBLIC
 #endif])])
diff -ur voms-1.9.11.orig/src/api/ccapi/Makefile.am voms-1.9.11/src/api/ccapi/Makefile.am
--- voms-1.9.11.orig/src/api/ccapi/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/Makefile.am	2009-09-08 14:13:33.247337541 +0200
@@ -16,7 +16,7 @@
 libvomsapi_nog_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_nog_la_CPPFLAGS = \
+libvomsapi_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -41,7 +41,7 @@
 libvomsapi_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_la_CPPFLAGS = \
+libvomsapi_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -70,7 +70,7 @@
 libvomsc_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_la_CPPFLAGS = \
+libvomsc_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_CFLAGS)
@@ -94,10 +94,10 @@
 #noinst_PROGRAMS = test ctest
 #test_SOURCES = test.cc
 #test_LDADD = libvomsapi.la
-#test_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#test_CXXFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 #ctest_SOURCES = ctest.c
 #ctest_LDADD = libvomsc.la
-#ctest_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#ctest_CFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 
 EXTRA_LTLIBRARIES = \
 	libvomsapi_gcc32.la \
@@ -123,7 +123,7 @@
 libvomsapi_gcc32_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32_la_CPPFLAGS = \
+libvomsapi_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -139,7 +139,7 @@
 libvomsapi_gcc32dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbg_la_CPPFLAGS = \
+libvomsapi_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(GLOBUS_GCC32DBG_CFLAGS) \
 	$(API_INCLUDES)
@@ -155,7 +155,7 @@
 libvomsapi_gcc32pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32pthr_la_CPPFLAGS = \
+libvomsapi_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -171,7 +171,7 @@
 libvomsapi_gcc32dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -187,7 +187,7 @@
 libvomsc_gcc32_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32_la_CPPFLAGS = \
+libvomsc_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -203,7 +203,7 @@
 libvomsc_gcc32dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbg_la_CPPFLAGS = \
+libvomsc_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -219,7 +219,7 @@
 libvomsc_gcc32pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32pthr_la_CPPFLAGS = \
+libvomsc_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -235,7 +235,7 @@
 libvomsc_gcc32dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -254,7 +254,7 @@
 libvomsapi_gcc64_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64_la_CPPFLAGS = \
+libvomsapi_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -270,7 +270,7 @@
 libvomsapi_gcc64dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbg_la_CPPFLAGS = \
+libvomsapi_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -286,7 +286,7 @@
 libvomsapi_gcc64pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64pthr_la_CPPFLAGS = \
+libvomsapi_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -302,7 +302,7 @@
 libvomsapi_gcc64dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
@@ -318,7 +318,7 @@
 libvomsc_gcc64_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64_la_CPPFLAGS = \
+libvomsc_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -334,7 +334,7 @@
 libvomsc_gcc64dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbg_la_CPPFLAGS = \
+libvomsc_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -350,7 +350,7 @@
 libvomsc_gcc64pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64pthr_la_CPPFLAGS = \
+libvomsc_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -367,7 +367,7 @@
 libvomsc_gcc64dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
diff -ur voms-1.9.11.orig/src/socklib/Makefile.am voms-1.9.11/src/socklib/Makefile.am
--- voms-1.9.11.orig/src/socklib/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Makefile.am	2009-09-08 14:16:29.063338874 +0200
@@ -12,7 +12,7 @@
 libsock_server_la_SOURCES = Server.cpp tokens.c globuswrap.c
 libsock_nog_la_SOURCES = Client.cpp
 
-libsock_nog_la_CPPFLAGS = \
+libsock_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
@@ -21,17 +21,18 @@
 libsock_nog_la_LIBADD = \
 	-lcrypto -lssl
 
-libsock_server_la_CPPFLAGS = \
+libsock_server_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
+libsock_server_la_CFLAGS = $(libsock_server_la_CXXFLAGS)
 
 libsock_server_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils.la \
 	$(top_builddir)/src/common/libutilc.la \
 	$(GLOBUS_GSS_LIBS)
 
-libsock_la_CPPFLAGS = \
+libsock_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
@@ -68,10 +69,11 @@
 
 libsock_server_gcc32_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32_la_CPPFLAGS = \
+libsock_server_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
+libsock_server_gcc32_la_CFLAGS = $(libsock_server_gcc32_la_CXXFLAGS)
 
 libsock_server_gcc32_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32.la \
@@ -80,10 +82,11 @@
 
 libsock_server_gcc32dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbg_la_CPPFLAGS = \
+libsock_server_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbg_la_CFLAGS = $(libsock_server_gcc32dbg_la_CXXFLAGS)
 
 libsock_server_gcc32dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbg.la \
@@ -92,10 +95,11 @@
 
 libsock_server_gcc32pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32pthr_la_CPPFLAGS = \
+libsock_server_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
+libsock_server_gcc32pthr_la_CFLAGS = $(libsock_server_gcc32pthr_la_CXXFLAGS)
 
 libsock_server_gcc32pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32pthr.la \
@@ -104,10 +108,11 @@
 
 libsock_server_gcc32dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbgpthr_la_CFLAGS = $(libsock_server_gcc32dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc32dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbgpthr.la \
@@ -116,10 +121,11 @@
 
 libsock_server_gcc64_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64_la_CPPFLAGS = \
+libsock_server_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
+libsock_server_gcc64_la_CFLAGS = $(libsock_server_gcc64_la_CXXFLAGS)
 
 libsock_server_gcc64_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64.la \
@@ -128,10 +134,11 @@
 
 libsock_server_gcc64dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbg_la_CPPFLAGS = \
+libsock_server_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbg_la_CFLAGS = $(libsock_server_gcc64dbg_la_CXXFLAGS)
 
 libsock_server_gcc64dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbg.la \
@@ -140,10 +147,11 @@
 
 libsock_server_gcc64pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64pthr_la_CPPFLAGS = \
+libsock_server_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
+libsock_server_gcc64pthr_la_CFLAGS = $(libsock_server_gcc64pthr_la_CXXFLAGS)
 
 libsock_server_gcc64pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64pthr.la \
@@ -152,10 +160,11 @@
 
 libsock_server_gcc64dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbgpthr_la_CFLAGS = $(libsock_server_gcc64dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc64dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbgpthr.la \
@@ -188,7 +197,7 @@
 libsock_gcc32_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32_la_CPPFLAGS = \
+libsock_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -201,7 +210,7 @@
 libsock_gcc32dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbg_la_CPPFLAGS = \
+libsock_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -214,7 +223,7 @@
 libsock_gcc32pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32pthr_la_CPPFLAGS = \
+libsock_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -227,7 +236,7 @@
 libsock_gcc32dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -240,7 +249,7 @@
 libsock_gcc64_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64_la_CPPFLAGS = \
+libsock_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -253,7 +262,7 @@
 libsock_gcc64dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbg_la_CPPFLAGS = \
+libsock_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -266,7 +275,7 @@
 libsock_gcc64pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64pthr_la_CPPFLAGS = \
+libsock_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -279,7 +288,7 @@
 libsock_gcc64dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)

voms-shell-syntax.patch:
 mysql2oracle.in |    2 +-
 voms-ping       |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE voms-shell-syntax.patch ---
diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
--- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
@@ -2,7 +2,7 @@
 #!/bin/sh
 #set -x
 
-function usage()
+function usage
 {
     echo
     echo "usage : mysql2oracle [OPTIONS]"
diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
--- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
@@ -25,7 +25,8 @@
   echo "  ]"
 }
 
-function test_vo {
+function test_vo
+{
    local voname="$1"
    local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
    local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
@@ -41,7 +42,7 @@
 "$voname" "localhost" "$port" "$dn" "$voname"
 EOF
    rm -f /tmp/oo
-   /opt/glite/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
+   ${GLITE_LOCATION:-/usr}/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
    res=$?
    if test $res -ne 0; then
       grep "User unknown to this VO" /tmp/oo >/dev/null


--- NEW FILE voms.INSTALL ---
VOMS server configuration
-------------------------

In addition to the voms-server package a voms database plugin is needed.

Plugins exists for mysql and oracle. Since the oracle client libraries
are not open source software, only the mysql plugin is available in
Fedora. To install the voms-mysql-plugin issue the following command
as root:

	yum install voms-mysql-plugin

Before starting the server, you must create the databases used by
VOMS. It is possible to run more than one VOMS server on a single host
as long as they are configured to use different ports.

You should have the grid CA certificates installed in
/etc/grid-security/certificates before running the VOMS database
creation script.

To create the databases run the following command as root for each
VOMS server you want to run:

	/usr/share/voms/voms_install_db \
		--voms-vo=<voname> \
		--port=<portnumber> \
		--db-type=mysql \
		--db-admin=<mysqladminuser> \
		--db-pwd=<mysqladminpwd> \
		--sqlloc=/usr/lib/voms/libvomsmysql.so

If you are running on a 64 bit host use instead:
		--sqlloc=/usr/lib64/voms/libvomsmysql.so

The voms server is configured to run as a special voms user. This user
needs a copy of the host certificate and key:

	cp -p /etc/grid-security/hostcert.pem /etc/grid-security/voms
	cp -p /etc/grid-security/hostkey.pem /etc/grid-security/voms
	chown voms:voms /etc/grid-security/voms/host*.pem

After creating the databases, start the server by running the command:

	service voms start

If you want the server to be started automatically after each reboot run
the command:

	chkconfig voms on

To check that the server is running and is configured correctly, run
the following command:

	/usr/share/voms/voms-ping <voname>


--- NEW FILE voms.spec ---
Name:		voms
Version:	1.9.11
Release:	4%{?dist}
Summary:	Virtual Organization Membership Service

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms_R_1_9_11 \
#		  -d voms-1.9.11 org.glite.security.voms
#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
Source:		%{name}-%{version}.tar.gz
#		Post-install setup instructions:
Source1:	%{name}.INSTALL
#		Build using Globus from Fedora/EPEL
#		https://savannah.cern.ch/bugs/?54427
Patch0:		%{name}-distribution-globus.patch
#		Fix the start-up script
#		https://savannah.cern.ch/bugs/?54428
Patch1:		%{name}-initscript.patch
#		Fix the --disable-glite configure option
#		https://savannah.cern.ch/bugs/?54429
Patch2:		%{name}-fix-enable-glite.patch
#		Remove lib64 hardcoding
#		https://savannah.cern.ch/bugs/?54430
Patch3:		%{name}-nolib64.patch
#		Make the Java API more compatible with the C API
#		https://savannah.cern.ch/bugs/?54432
Patch4:		%{name}-extra-vomses-java.patch
#		Missing casts after Java cloning
#		https://savannah.cern.ch/bugs/?54433
Patch5:		%{name}-java-clone-cast.patch
#		Fix permissions of installed jar
#		https://savannah.cern.ch/bugs/?54434
Patch6:		%{name}-jar-perms.patch
#		Fix javadoc warnings
#		https://savannah.cern.ch/bugs/?54435
Patch7:		%{name}-javadoc.patch
#		Fix syntax errors in shell scripts
#		https://savannah.cern.ch/bugs/?54436
Patch8:		%{name}-shell-syntax.patch
#		Fix the database install script
#		https://savannah.cern.ch/bugs/?54880
Patch9:		%{name}-install-db.patch
#		Error message glitch
#		https://savannah.cern.ch/bugs/?55113
Patch10:	%{name}-notknown-msg.patch
#		Make the Java API build with gcj
#		https://savannah.cern.ch/bugs/?55115
Patch11:	%{name}-gcj.patch
#		Support older autotools and older gcc
#		https://savannah.cern.ch/bugs/?55116
Patch12:	%{name}-portability.patch
#		Support openssl 1.0
#		https://savannah.cern.ch/bugs/?55390
Patch13:	%{name}-openssl.patch
#		Unconditional use of PIPE_BUF
#		https://savannah.cern.ch/bugs/?55405
Patch14:	%{name}-pipe-buf.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	openssl-devel%{?_isa}
BuildRequires:	expat-devel
BuildRequires:	libtool
BuildRequires:	pkgconfig
BuildRequires:	libxslt
BuildRequires:	docbook-style-xsl
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers libraries that applications using the VOMS functionality
will bind to.

%package devel
Summary:	Virtual Organization Membership Service Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	openssl-devel%{?_isa}
Requires:	automake

%description devel
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers header files for programming with the VOMS libraries.

%package doc
Summary:	Virtual Organization Membership Service Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif

%description doc
Documentation for the Virtual Organization Membership Service.

%package clients
Summary:	Virtual Organization Membership Service Clients
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%description clients
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package provides command line applications to access the VOMS
services.

%package server
Summary:	Virtual Organization Membership Service Server
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

Requires(pre):		shadow-utils
Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts

%description server
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

The service can be understood as an account database, which serves the
information in a special format (VOMS credential). The VO manager can
administrate it remotely using command line tools or a web interface.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
	   -name '*.cc' -o -name '*.java' ')' -exec chmod a-x {} ';'

# Fix location dir
sed -e 's/\(LOCATION_DIR.*\)"\$prefix"/\1""/g' -i project/acinclude.m4

# Fix default Globus location
sed -e 's!\(GLOBUS_LOCATION\)!{\1:-/usr}!' -i project/voms.m4

# Fix default vomses file location
sed -e 's!/opt/glite/etc/vomses!/etc/vomses!' -i src/api/ccapi/voms_api.cc

# Use pdflatex
sed -e 's!^\(USE_PDFLATEX *= *\)NO!\1YES!' -i src/api/ccapi/Makefile.am

# Touch to avoid rerunning bison and flex
touch -r src/utils/vomsfake.y src/utils/vomsparser.h
touch -r src/utils/vomsfake.y src/utils/lex.yy.c

# rebootstrap
./autogen.sh

install -m 644 %{SOURCE1} INSTALL.Fedora

%build
%configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
	   --disable-java

make %{?_smp_mflags}

( cd doc/apidoc/api/VOMS_C_API/latex ; make )
( cd doc/apidoc/api/VOMS_CC_API/latex ; make )

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_bindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_sbindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/edg-voms*
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

mv $RPM_BUILD_ROOT%{_includedir}/glite/security/%{name} \
   $RPM_BUILD_ROOT%{_includedir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_includedir}/glite

rm $RPM_BUILD_ROOT%{_includedir}/%{name}/voms_apic_nog.h
rm $RPM_BUILD_ROOT%{_mandir}/man1/testvoms.1*
rm $RPM_BUILD_ROOT%{_mandir}/man8/voms-install-replica.8*

mv $RPM_BUILD_ROOT%{_datadir}/vomses.template \
   $RPM_BUILD_ROOT%{_datadir}/%{name}

mv $RPM_BUILD_ROOT%{_datadir}/m4 $RPM_BUILD_ROOT%{_datadir}/aclocal

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/vomsdir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

touch $RPM_BUILD_ROOT%{_sysconfdir}/vomses

sed -e 's!${datapath}/etc/voms/voms!${basepath}/share/voms/voms!' \
    -e 's/useradd/\#&/' -e 's/groupadd/\#&/' \
    -e 's/vomsd(8)/voms(8)/' \
    -i $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db

cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db << EOF
\$ECHO -en "--x509_user_cert=/etc/grid-security/voms/hostcert.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
\$ECHO -en "--x509_user_key=/etc/grid-security/voms/hostkey.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
EOF

# Turn off default enabling of the service
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
sed -e 's/\(chkconfig: \)\w*/\1-/' \
    -e '/Default-Start/d' \
    -e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
   $RPM_BUILD_ROOT%{_datadir}/init.d/%{name} > \
   $RPM_BUILD_ROOT%{_initrddir}/%{name}
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

mkdir -p VOMS_C_API
cp -pr doc/apidoc/api/VOMS_C_API/html VOMS_C_API
install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf VOMS_C_API

mkdir -p VOMS_CC_API
cp -pr doc/apidoc/api/VOMS_CC_API/html VOMS_CC_API
install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf VOMS_CC_API

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre server
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || useradd -r -g %{name} \
    -d %{_sysconfdir}/%{name} -s /sbin/nologin -c "VOMS Server Account" %{name}
exit 0

%post server
if [ $1 = 1 ]; then
    /sbin/chkconfig --add %{name}
fi

%preun server
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del %{name}
fi

%postun server
if [ $1 -ge 1 ]; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so.*
%{_libdir}/libvomsapi_nog.so.*
%{_libdir}/libvomsc.so.*
%config(noreplace) %{_sysconfdir}/vomses
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/vomsdir
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/vomses.template
%doc AUTHORS LICENSE

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so
%{_libdir}/libvomsapi_nog.so
%{_libdir}/libvomsc.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/acstack.h
%{_includedir}/%{name}/newformat.h
%{_includedir}/%{name}/vomsssl.h
%{_includedir}/%{name}/voms_api.h
%{_includedir}/%{name}/voms_api_nog.h
%{_includedir}/%{name}/voms_apic.h
%{_datadir}/aclocal/%{name}.m4

%files doc
%defattr(-,root,root,-)
%doc VOMS_C_API
%doc VOMS_CC_API

%files clients
%defattr(-,root,root,-)
%{_bindir}/voms-proxy-destroy
%{_bindir}/voms-proxy-info
%{_bindir}/voms-proxy-init
%{_bindir}/voms-proxy-fake
%{_bindir}/voms-proxy-list
%{_mandir}/man1/voms-proxy-destroy.1*
%{_mandir}/man1/voms-proxy-info.1*
%{_mandir}/man1/voms-proxy-init.1*
%{_mandir}/man1/voms-proxy-fake.1*
%{_mandir}/man1/voms-proxy-list.1*

%files server
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/grid-security/%{name}
%attr(-,voms,voms) %dir %{_localstatedir}/log/%{name}
%{_datadir}/%{name}/mysql2oracle
%{_datadir}/%{name}/upgrade1to2
%{_datadir}/%{name}/voms.data
%{_datadir}/%{name}/voms_install_db
%{_datadir}/%{name}/voms-ping
%{_datadir}/%{name}/voms_replica_master_setup.sh
%{_datadir}/%{name}/voms_replica_slave_setup.sh
%{_mandir}/man8/voms.8*
%doc INSTALL.Fedora

%changelog
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0

* Thu Sep 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-3
- Add an empty /etc/vomses file to the main package to avoid error messages
- Let the voms user own only necessary directories
- Additional fixes for the server start-up script

* Tue Aug 25 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-2
- Add the /etc/voms directory to the server package
- Add setup instructions to the server package
- Run the server as non-root

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-1
- Upstream 1.9.11 (CVS tag glite-security-voms_R_1_9_11)

* Mon Jun 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.8.1-1
- Upstream 1.9.8.1 (CVS tag glite-security-voms_R_1_9_8_1)

* Thu Feb 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.2-1
- Upstream 1.9.2 (CVS tag glite-security-voms_R_1_9_2)

* Fri Feb 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.1-1
- Upstream 1.9.1 (CVS tag glite-security-voms_R_1_9_1)

* Tue Jan 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.10-1
- Upstream 1.8.10 (CVS tag glite-security-voms_R_1_8_10)
- Rebuild against distribution Globus
- Add clear SSL error patch needed for openssl > 0.9.8b
- Add missing return value patch

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.9-1ng
- Upstream 1.8.9 (CVS tag glite-security-voms_R_1_8_9)
- Rebuild against Globus 4.0.8-0.11

* Thu May 15 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-4ng
- Add missing include patch

* Sat Apr 26 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-3ng
- Rebuild against Globus 4.0.7-0.10

* Sun Nov 25 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-2ng
- Fix GPT_LOCATION and GLOBUS_LOCATION detection in spec file

* Mon Oct 29 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-1ng
- Upstream 1.7.24 (CVS tag glite-security-voms_R_1_7_24_1)

* Mon Oct 15 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.23-1ng
- Upstream 1.7.23 (CVS tag glite-security-voms_R_1_7_23_1)

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-3ng
- Move /etc/voms/vomses back to /etc/vomses
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-2ng
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Mon Sep 10 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-1ng
- Try to link against system crypto library when Globus library is not
  available
- Make /etc/grid-security/vomsdir part of the voms sub-package
- Drop RPM prefix /etc
- Move the vomses.template to /etc/voms
- Use dashes instead of underscore in voms-install-replica.1 man page
- Do not try to link against system crypt library. Voms now
  does this internally.
- Upstream 1.7.22 (CVS tag glite-security-voms_R_1_7_22_1)

* Mon Jul 16 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-5ng
- Drop voms-struct_change.patch - problem is with libxml2

* Sat Jul 14 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-4ng
- Add missing openssl-devel dependency in voms-devel

* Thu Jul 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-3ng
- Add patch:
  - voms-struct_change.patch
    - Change API slightly - but now works with libxml2

* Thu Jul 08 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-2ng
- Make conditinal dependency on expat-devel (OpenSuSE 10.20 has only expat)

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-1ng
- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1) 

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-2ng
- Added patches:
  - voms-openssl_portability.patch
    - Support for newer OpenSSL-0.9.8
  - voms-isoc90_portability.patch
    - Support for older compilers
- Added openssl-devel build dependency

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-1ng
- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2) 
- Remove patches (use shell substitutions instead)
- Disable Java API build

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-3ng
- Added Globus dependencies to voms-devel

* Mon Jul 24 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-2ng
- Fix dependency typo: Requires -> BuildRequires

* Sat May 06 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-1ng
- Many changes since upstream changed quite a lot.
- Added README.NorduGrid with packaging information
- Patches:
  - voms_openssl-0.9.8.patch
    - Support for OpenSSL 0.9.8
  - voms_noglobusopenssl-1.6.20.patch
    - Use system openssl rather than the one from Globus
    - Patch reworked for voms 1.6.20
  - Dont use project based (gLite) include paths
- Pseudo patches (fixes made at runtime and not from static patch files)
  - Fix broken --libexecdir support for configure
    (some systems do not have libexecdir = <prefix>/libexec)
  - Drop all documents except man pages which are pre-generated
    (section 3 man pages are skipped as well)
  - Do not use edg- prefix
    (can be turned on/off through macro)
  - Install flavored libraries in addition to non-flavored
    (can be turned on/off through macro)
  - Put start-up script in /etc/init.d
  - Move configuration files from <prefix>/etc to /etc

* Mon Dec 19 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-2
- Add patch voms_doc.patch to disable html and ps documentation
  and add man-mages and pdf files to distribution (make dist)
- Use rpm switch: --define "_autotools_bootstrap 1" to rebuild
  documentation and create "make dist" target
- Add patch voms_nohardcodelibexecdir.patch which use the libexecdir
  from configure rather than the hardcoded prefix/libexec

* Sun Nov 27 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-1
- Add patch voms_ssl_include.patch to add external openssl includes.
  Would be better to query globus_openssl about this

* Tue Oct 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.7-1
- Modfiy voms_noglobusopenssl.patch to match upstream
- Add patch voms_nops.patch to disable postscript versions of
  reference manual

* Fri Jun 17 2005 Anders W??n?nen <waananen at nbi.dk> - 1.5.4-1
- Remove the following patches:
  - voms_namespace.patch - Fixed in upstream
  - voms_external_mysql++-1.4.1.patch - Obsolete since mysql++ is no
    longer needed
  - voms-no_libs.path - Fixed in upstream
- Add Globus dependencies

* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-3
- Do not hardcode Globus flavor but try to guess
- Remove explicit globus rpm Requirement
- Use external openssl - not globus_openssl

* Mon May 02 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-2
- Remove automake cache
- Add explicit dependency on mysql++-devel

* Sat Apr 30 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-1
- New upstream
- autogen.sh -> autobuild.sh

* Mon Apr 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.3.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:08:49 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:39:25 -0000	1.2
@@ -0,0 +1 @@
+voms-1.9.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:08:49 -0000	1.1
+++ sources	10 Sep 2009 02:39:25 -0000	1.2
@@ -0,0 +1 @@
+86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 10 02:40:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 02:40:47 +0000
Subject: [pkgdb] gnash: jrsteinh has requested watchcommits
Message-ID: <20090910024050.417A510F88A@bastion2.fedora.phx.redhat.com>

jrsteinh has requested the watchcommits acl on gnash (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnash



From ellert at fedoraproject.org  Thu Sep 10 02:41:43 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:41:43 +0000 (UTC)
Subject: rpms/voms/EL-4 import.log, NONE, 1.1 voms-distribution-globus.patch,
	NONE, 1.1 voms-extra-vomses-java.patch, NONE,
	1.1 voms-fix-enable-glite.patch, NONE, 1.1 voms-gcj.patch, NONE,
	1.1 voms-initscript.patch, NONE, 1.1 voms-install-db.patch, NONE,
	1.1 voms-jar-perms.patch, NONE, 1.1 voms-java-clone-cast.patch,
	NONE, 1.1 voms-javadoc.patch, NONE, 1.1 voms-nolib64.patch, NONE,
	1.1 voms-notknown-msg.patch, NONE, 1.1 voms-openssl.patch, NONE,
	1.1 voms-pipe-buf.patch, NONE, 1.1 voms-portability.patch, NONE,
	1.1 voms-shell-syntax.patch, NONE, 1.1 voms.INSTALL, NONE,
	1.1 voms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910024143.7569111C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22007/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-distribution-globus.patch 
	voms-extra-vomses-java.patch voms-fix-enable-glite.patch 
	voms-gcj.patch voms-initscript.patch voms-install-db.patch 
	voms-jar-perms.patch voms-java-clone-cast.patch 
	voms-javadoc.patch voms-nolib64.patch voms-notknown-msg.patch 
	voms-openssl.patch voms-pipe-buf.patch voms-portability.patch 
	voms-shell-syntax.patch voms.INSTALL voms.spec 
Log Message:
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0



--- NEW FILE import.log ---
voms-1_9_11-4_el5:EL-4:voms-1.9.11-4.el5.src.rpm:1252550473

voms-distribution-globus.patch:
 acinclude.m4 |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE voms-distribution-globus.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
@@ -66,11 +66,6 @@
 # ---------------------------------------------
 AC_DEFUN([AC_OPENSSL],
 [
-  AC_ARG_WITH(openssl_prefix,
-              [ --with-openssl-prefix=PFX    prefix where OpenSSL (non-globus) is installed. (/usr)],
-              [with_openssl_prefix="$withval"],
-              [with_openssl_prefix=/usr])
-
   AC_ARG_WITH(openssl_libs,
               [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
               [ with_openssl_libs="$withval"],
@@ -80,16 +75,11 @@
      AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
   fi  
 
-  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
-
-  AC_LANG_PUSH(C)
-  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
-  AC_LANG_POP(C) 
+  PKG_CHECK_MODULES(OPENSSL, [openssl], [
+  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+  found=yes], [found=no])
 
   if test "x$found" = "xyes"; then
-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
     AC_SUBST(NO_GLOBUS_FLAGS)
     AC_SUBST(OPENSSL_LIBS)
     AC_MSG_CHECKING([for system OpenSSL version])
@@ -105,11 +95,10 @@
 #include <openssl/opensslv.h>
 OPENSSL_VERSION_TEXT
 HERE
-    openssl_version=`$CPP -I$NO_GLOBUS_FLAGS -o - -P conftest.h`
+    openssl_version=`$CPP $NO_GLOBUS_FLAGS -o - -P conftest.h`
     AC_MSG_RESULT($openssl_version)
     rm -f conftest.h
   fi
-  LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 ])
 
 # AC_GLOBUS checks globus prefix, looks for globus 
@@ -119,6 +108,11 @@
 # -------------------------------------------------------
 AC_DEFUN([AC_GLOBUS],
 [
+    PKG_CHECK_MODULES(GLOBUS_GSS, [globus-gssapi-gsi globus-gss-assist], [
+    GLOBUS_CFLAGS=$GLOBUS_GSS_CFLAGS
+    PKG_CHECK_MODULES(GLOBUS_GSS_API, [openssl])
+    ], [
+
     AC_ARG_WITH(globus_prefix,
 	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
 	[with_globus_prefix="$withval"],
@@ -165,6 +159,8 @@
 
     AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
 
+    ])
+
     if test "x$with_globus_flavor" = "x" ; then
       if test "x$USE_OLDGAA_LIB" = "x"; then
         USE_OLDGAA_LIB="liboldgaa.la"

voms-extra-vomses-java.patch:
 VOMSESFileParser.java |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE voms-extra-vomses-java.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSESFileParser.java	2009-07-01 15:06:24.328378870 +0200
@@ -62,6 +62,12 @@
 
         List list = new ArrayList();
 
+        File defaultLocFile = new File( File.separator + "etc"
+                + File.separator + "vomses" );
+
+        if ( defaultLocFile.exists() )
+            list.add( defaultLocFile );
+
         if ( gliteLoc != null ) {
             File gliteLocFile = new File( gliteLoc + File.separator + "etc"
                     + File.separator + "vomses" );
@@ -97,6 +103,12 @@
         if ( gliteVomses.exists() )
             list.add( gliteVomses );
 
+        File vomsVomses = new File( System.getProperty( "user.home" )
+                + File.separator + ".voms" + File.separator + "vomses" );
+
+        if ( vomsVomses.exists() )
+            list.add( vomsVomses );
+
         vomsesPaths = list;
 
     }

voms-fix-enable-glite.patch:
 acinclude.m4 |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE voms-fix-enable-glite.patch ---
diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-07-01 13:03:05.768376649 +0200
@@ -587,12 +587,18 @@
 [
     AC_ARG_ENABLE(glite,
         [  --enable-glite     enable gLite  ],
-        [ac_enable_glite="yes"],
-        [ac_enable_glite="no"])
+        [
+          case "$enableval" in
+          yes) glite="yes" ;;
+          no) glite="no" ;;
+          *) AC_MSG_ERROR(bad value $(enableval) for --enable-glite) ;;
+          esac
+        ],
+        [glite="yes"])
 
-    AM_CONDITIONAL(ENABLE_GLITE, test x$ac_enable_glite = xyes)
+    AM_CONDITIONAL(ENABLE_GLITE, test x$glite = xyes)
 
-    if test "x$ac_enable_glite" = "xno"; then
+    if test "x$glite" = "xno"; then
     	DISTTAR=$WORKDIR
     	AC_SUBST(DISTTAR)
 #	EDG_SET_RPM_TOPDIR
@@ -601,7 +607,7 @@
     	AC_SUBST(VAR_LOCATION_ENV, "VOMS_LOCATION_VAR")
     	AC_DEFINE(LOCATION_ENV, "VOMS_LOCATION", [Environment variable name])
     	AC_DEFINE_UNQUOTED(LOCATION_DIR, "$prefix", [Location of system directory])
-    	AC_DEFINE(USER_DIR, ".edg", [Location of user directory])
+    	AC_DEFINE(USER_DIR, ".voms", [Location of user directory])
     else
     	AC_MSG_RESULT([Preparing for gLite environment])
     	AC_GLITE

voms-gcj.patch:
 BasicVOMSTrustStore.java |  682 -----------------------------------------------
 DirectoryList.java       |  142 +++++++++
 FileCertReader.java      |  492 +++++++++++++++++++++++++++++++++
 FileEndingIterator.java  |  137 +++++++++
 4 files changed, 771 insertions(+), 682 deletions(-)

--- NEW FILE voms-gcj.patch ---
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/BasicVOMSTrustStore.java	2009-08-29 07:52:08.000000000 +0200
@@ -13,69 +13,11 @@
  * follows.
  *
  *********************************************************************/
-/*
- * Copyright (c) Members of the EGEE Collaboration. 2004.
- * See http://eu-egee.org/partners/ for details on the copyright holders.
- * For license conditions see the license file or http://eu-egee.org/license.html
- */
-
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * DirectoryList.java
- *
- * @author  Joni Hahkala
- * Created on December 10, 2001, 6:50 PM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileEndingIterator.java
- *
- * @author  Joni Hahkala
- * Created on December 3, 2001, 9:16 AM
- */
-/*
- * Copyright (c) 2002 on behalf of the EU DataGrid Project:
- * The European Organization for Nuclear Research (CERN),
- * the Particle Physics and Astronomy Research Council (PPARC),
- * the Helsinki Institute of Physics and
- * the Swedish Research Council (SRC). All rights reserved.
- * see LICENSE file for details
- *
- * FileCertReader.java
- *
- * @author  Joni Hahkala
- * Created on March 27, 2002, 8:24 PM
- */
 
 package org.glite.voms;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.PrivateKey;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -86,632 +28,8 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ASN1InputStream;
 import org.glite.voms.ac.ACTrustStore;
 
-/** Lists all the files in the given directory that end with
- * a certain ending.
- */
-class FileEndingIterator {
-    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
-
-    /** The file ending.
-     */
-    protected String ending;
-
-    /** A flag to show that there are more files that match.
-     */
-    protected boolean nextFound = false;
-
-    /** The list of files in the directory.
-     */
-    protected File[] fileList;
-
-    /** The index of the next match in the fileList.
-     */
-    protected int index = 0;
-
-    /** Creates new FileIterator and searches the first match.
-     * @param path The directory used for the file search.
-     * @param ending The file ending to search for.
-     */
-    public FileEndingIterator(String path, String ending) {
-        this.ending = ending;
-
-        try {
-            // open the directory
-            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
-
-            // list the files and dirs inside
-            fileList = directory.listFiles();
-
-            // find the first match for the ending
-            nextFound = findNext();
-        } catch (Exception e) {
-            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
-
-            //            e.printStackTrace();
-            return;
-        }
-    }
-
-    /** Used to get the next matching file.
-     * @return Returns the next matching file.
-     */
-    public File next() {
-        if (nextFound == false) {
-            return null;
-        }
-
-        File current = fileList[index++];
-
-        nextFound = findNext();
-
-        return current;
-    }
-
-    /** Used to check that there are more matching files to get
-     * using next().
-     * @return Returns true if there are more matching files.
-     */
-    public boolean hasNext() {
-        return nextFound;
-    }
-
-    /** Finds the next matching file in the list of files.
-     * @return Returns true if a matching file was found.
-     */
-    protected boolean findNext() {
-        try {
-            // search the next file with proper ending
-            while ((index < fileList.length) &&
-                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
-                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
-                index++;
-            }
-        } catch (Exception e) {
-            logger.error("Error while reading directory " + e.getMessage());
-
-            //            e.printStackTrace(System.out);
-            return false;
-        }
-
-        // check if the loop ended because of a match or because running out of choices.
-        if (index < fileList.length) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-/** Reads all certificates from given files, accepts binary form of DER encoded certs and
- * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
- * the actual certificate that has to begin with "-----BEGIN".
- * Should accept multiple certs in one file, not tested!
- */
-class FileCertReader {
-    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
-    static final int BUF_LEN = 1000;
-    static final byte CARR = '\r';
-    static final byte NL = '\n';
-
-    /** The type for TrustAnchor
-     */
-    static final int TYPE_ANCHOR = 100;
-
-    /** The type for certificate revocation list
-     */
-    static final int TYPE_CRL = 101;
-
-    /** the type for X509 certificate
-     */
-    static final int TYPE_CERT = 102;
-
-    static {
-        if (Security.getProvider("BC") == null) {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    CertificateFactory certFactory;
-
-    /** Creates a new instance of CertReader. */
-    public FileCertReader() throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", "BC");
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider.
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(Provider provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /**
-     * Creates a new instance of CertReader with the
-     * specified provider
-     *
-     * @param provider   the provider to be used in creating the
-     *                   certificates etc.
-     */
-    public FileCertReader(String provider) throws CertificateException {
-        try {
-            certFactory = CertificateFactory.getInstance("X.509", provider);
-        } catch (Exception e) {
-            logger.error("Error while creating a FileCertReader: " + e.getMessage());
-            throw new CertificateException("Error while creating a FileCertReader: " +
-                e.getMessage());
-        }
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument. See DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if certificate reading from the files
-     * fails.
-     * @return Returns the Vector of certificates read.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCerts(String files) throws IOException, CertificateException {
-        Vector certs = readFiles(files, TYPE_CERT);
-
-        Iterator certIter = certs.iterator();
-
-        logger.debug("read certs: ");
-
-        while (certIter.hasNext()) {
-            X509Certificate cert = (X509Certificate) certIter.next();
-            logger.debug("Read cert: " + cert.getSubjectDN().toString());
-        }
-
-        return certs;
-    }
-
-    public PrivateKey readPrivateKey(String file) throws IOException {
-        File keyfile = new File(file);
-
-        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
-        skipToKeyBeginning(fis);
-
-        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
-    }
-
-    /** Reads the certificates from the files defined in the
-     * argument and makes TrustAnchors from them. See
-     * DirectoryList for file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the certificate reading fails.
-     * @return Returns a Vector of TrustAnchors read from the
-     * files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readAnchors(String files) throws IOException, CertificateException {
-        Vector anchors = readFiles(files, TYPE_ANCHOR);
-
-        Iterator anchorIter = anchors.iterator();
-
-        logger.debug("read TrustAnchors: ");
-
-        while (anchorIter.hasNext()) {
-            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
-            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
-        }
-
-        return anchors;
-    }
-
-    /** Reads the certificate revocation lists (CRLs) from the
-     * files defined in the argument. See DirectoryList for
-     * file definition format.
-     * @param files The file definition.
-     * @throws Exception Thrown if the CRL reading failed.
-     * @return Returns a vector of CRLs read from the files.
-     * @see org.glite.security.util.DirectoryList
-     */
-    public Vector readCRLs(String files) throws IOException, CertificateException {
-        Vector crls = readFiles(files, TYPE_CRL);
-
-        Iterator crlIter = crls.iterator();
-
-        logger.debug("read CRLs: ");
-
-        while (crlIter.hasNext()) {
-            X509CRL crl = (X509CRL) crlIter.next();
-            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
-        }
-
-        return crls;
-    }
-
-    /** Reads the certificates or CRLs from the files defined by
-     * the first argument, see DirectoryList for file definition
-     * format.
-     * @param files The file definition.
-     * @param type The type of things to read from the files.
-     * Currently supported are TYPE_ANCHOR,
-     * TYPE_CRL and TYPE_CERT defined in this class.
-     * @throws CertificateException Thrown if the reading of files fails.
-     * @return Returns a Vector of objects of type given that
-     * were read from the files given.
-     * @see org.glite.security.util.DirectoryList
-     */
-    private Vector readFiles(String files, int type) throws CertificateException {
-        Vector storeVector = new Vector();
-
-        try {
-            // load CA certificates
-            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
-
-            Iterator CAFileIter = dir.getListing().iterator();
-
-            // go through the files
-            while (CAFileIter.hasNext()) { // go through the files reading the certificates
-
-                File nextFile = (File) CAFileIter.next();
-
-                storeVector.addAll(readFile(nextFile, type));
-            }
-        } catch (IOException e) {
-            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
-
-            throw new CertificateException("Error while reading certificates or CRLs: " +
-                e.getMessage());
-        }
-
-        return storeVector;
-    }
-
-    /** Reads the objects of given type from the File.
-     * @param certFile The file to read.
-     * @param type The type of objects to read form the file.
-     * @throws IOException Thrown if the reading of objects of given type
-     * fails.
-     * @return Returns the Vector of objects read form the file.
-     */
-    public Vector readFile(File certFile, int type) throws IOException {
-        BufferedInputStream binStream = null;
-        Vector objects = new Vector();
-
-        try {
-            // get the buffered stream to facilitate marking
-            binStream = new BufferedInputStream(new FileInputStream(certFile));
-
-            while (binStream.available() > 0) {
-                Object obj = objectReader(binStream, type);
-
-                if (obj != null) {
-                    objects.add(obj);
-                }
-
-                skipEmptyLines(binStream);
-            }
-        } catch (Exception e) {
-            logger.fatal("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-
-            throw new IOException("Error while reading certificates or crls from file " +
-                certFile.toString() + "error was: " + e.getMessage());
-        } finally {
-            if (binStream != null) {
-                binStream.close();
-            }
-        }
-
-        return objects;
-    }
-
-    /** Reads a certificate or a CRL from the stream, doing some
-     * error correction.
-     * @param binStream The stream to read the object from.
-     * @param type The type of object to read from the stream.
-     * @throws CertificateException Thrown if an error occurs while reading the object.
-     * @throws IOException Thrown if an error occurs while reading the object.
-     * @return Returns the object read.
-     */
-    public Object objectReader(BufferedInputStream binStream, int type)
-        throws CertificateException, IOException {
-        Object object = null;
-        int errors = 0; // no errors in the beginning
-        binStream.mark(10000);
-
-        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
-             // second with skipping possible garbage in the beginning.
-
-            try {
-                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
-                    // before the actual base64 encoded certificate
-                    errors = 2; // if this try fails, don't try anymore
-
-                    skipToCertBeginning(binStream); // skip the garbage
-                }
-
-                binStream.mark(100000);
-
-                binStream.reset();
-
-                object = readObject(binStream, type);
-            } catch (Exception e) {
-                if (errors != 0) { // if the error persists after first pass, fail
-                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
-                    throw new CertificateException("Certificate or CRL reading failed: " +
-                        e.getMessage());
-                }
-
-                errors = 1; // first try failed, try again with skipping
-                binStream.reset(); // rewind the file to the beginning of this try
-            }
-        } while (errors == 1); // try again after first try
-
-        return object;
-    }
-
-    /** Does the actual reading of the object.
-     * @param binStream The stream to read the object from.
-     * @param type The type of the object.
-     * @throws CertificateException Thrown if there is a problem reading the object.
-     * @return Returns the object read or null if no object was found.
-     */
-    public Object readObject(BufferedInputStream binStream, int type)
-        throws CertificateException {
-        Object obj;
-
-        if (type == TYPE_CRL) { // reading certificate revocation lists
-
-            try {
-                obj = certFactory.generateCRL(binStream);
-            } catch (CRLException e) {
-                logger.error("CRL loading failed: " + e.getMessage());
-                throw new CertificateException(e.getMessage());
-            }
-        } else { // reading certs or trust anchors
-
-            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
-
-            if (cert == null) {
-                return null;
-            }
-
-            if (type == TYPE_ANCHOR) {
-                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
-                obj = new TrustAnchor(cert, null);
-            } else {
-                if (type == TYPE_CERT) {
-                    obj = cert;
-                } else {
-                    logger.fatal("Internal error: Invalid data type " + type +
-                        " when trying to read certificate");
-                    throw new CertificateParsingException("Internal error: Invalid data type " +
-                        type + " when trying to read certificate");
-                }
-            }
-        }
-
-        return obj;
-    }
-
-    /** Skips everything in front of "-----BEGIN" in the stream.
-     * @param stream The stream to read and skip.
-     * @throws IOException Thrown if there is a problem skipping.
-     */
-    static public void skipToCertBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    static public void skipToKeyBeginning(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-            String buffer = new String(b, 0, num); // generate a string from the byte buffer
-            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
-
-            if (index == -1)
-                index = buffer.indexOf("----BEGIN ENCRYPTED");
-
-            if (index == -1) { // not found
-                stream.reset(); // rewind the file to the beginning of the last read
-                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
-                stream.mark(BUF_LEN + 2); // mark the new position
-            } else { // found
-
-                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
-                    index--;
-
-                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
-
-                        break;
-                    }
-                }
-
-                stream.reset(); // rewind to the beginning of the last read
-                stream.skip(index); // skip to the beginning of the tag
-                stream.mark(10000); // mark the position
-
-                return;
-            }
-        }
-    }
-
-    /** Skips empty lines in the stream.
-     * @param stream The stream possibly containing empty lines.
-     * @throws IOException Thrown if a problem occurs.
-     */
-    static public void skipEmptyLines(BufferedInputStream stream)
-        throws IOException {
-        byte[] b = new byte[BUF_LEN]; // the byte buffer
-        stream.mark(BUF_LEN + 2); // mark the beginning
-
-        while (stream.available() > 0) { // check that there are still something to read
-
-            int num = stream.read(b); // read bytes from the file to the byte buffer
-
-            int i = 0;
-
-            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
-                i++;
-            }
-
-            stream.reset();
-            stream.skip(i);
-
-            if (i < num) {
-                stream.mark(10000);
-
-                return;
-            } else {
-                stream.mark(BUF_LEN);
-            }
-        }
-    }
-}
-
-/** This class lists all the files defined in the constructor.
- * The definitions can be in three forms.
- * 1. absolute file (/tmp/test.txt)
- * 2. absolute path (/tmp)
- * 3. a wildcard file (/tmp/*.txt)
- *
- * In case 1. only the file is returned.
- * In case 2. all files in the directory are returned
- * In case 3. all the files in the directory tmp having
- * the .txt ending are returned.
- *
- * The returning means the return of the getListing method.
- */
-class DirectoryList {
-    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
-    List files = null;
-
-    /** Creates a new instance of DirectoryList
-     * @param path The file definition, see class description above.
-     * @throws Exception Thrown if the path was invalid
-     */
-    public DirectoryList(String path) throws IOException {
-        // splits the absolute? filename from the wildcard
-        String[] parts = path.split("\\*");
-
-        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
-        if ((parts.length < 1) || (parts.length > 2)) {
-            return;
-        }
-
-        // check whether the first and only part is a file or directory
-        if (parts.length == 1) {
-            // open the directory or file
-            File fileOrDir = new File(parts[0]);
-
-            // if the path given was fully specified filename
-            if (fileOrDir.isFile()) {
-                // set the file as the only member in the vector and finish
-                files = new Vector();
-                files.add(fileOrDir);
-
-                return;
-            }
-
-            // the path defined a directory, so get all files
-            File[] fileDirArray;
-
-            // list the files and dirs inside
-            fileDirArray = fileOrDir.listFiles();
-
-            if (fileDirArray == null) {
-                logger.error("No files found matching " + path);
-                throw new IOException("No files found matching " + path);
-            }
-
-            // get the array containing all the files and directories
-            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
-
-            files = new Vector();
-
-            // add all the files to the files list and finish
-            while (filesAndDirs.hasNext()) {
-                File nextFile = (File) filesAndDirs.next();
-
-                if (nextFile.isFile()) {
-                    files.add(nextFile);
-                }
-            }
-
-            return;
-        } else {
-            // this is a directory+ending combination
-            files = new Vector();
-
-            // get all the files matching the definition.
-            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
-
-            while (iterator.hasNext()) {
-                files.add(iterator.next());
-            }
-
-            return;
-        }
-    }
-
-    /** Used to get the file listing, the list of files matching
-     * the definition in constructor.
-     * @return Returns the list of files matching the definition
-     * given in the constructor.
-     */
-    public List getListing() {
-        return files;
-    }
-}
 
 /**
  * @deprecated  This class does not expose the necessary information. Use
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/DirectoryList.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/DirectoryList.java	2009-08-29 07:22:01.000000000 +0200
@@ -0,0 +1,142 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * DirectoryList.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 10, 2001, 6:50 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+
+/** This class lists all the files defined in the constructor.
+ * The definitions can be in three forms.
+ * 1. absolute file (/tmp/test.txt)
+ * 2. absolute path (/tmp)
+ * 3. a wildcard file (/tmp/*.txt)
+ *
+ * In case 1. only the file is returned.
+ * In case 2. all files in the directory are returned
+ * In case 3. all the files in the directory tmp having
+ * the .txt ending are returned.
+ *
+ * The returning means the return of the getListing method.
+ */
+class DirectoryList {
+    static Logger logger = Logger.getLogger(DirectoryList.class.getName());
+    List files = null;
+
+    /** Creates a new instance of DirectoryList
+     * @param path The file definition, see class description above.
+     * @throws Exception Thrown if the path was invalid
+     */
+    public DirectoryList(String path) throws IOException {
+        // splits the absolute? filename from the wildcard
+        String[] parts = path.split("\\*");
+
+        // accept only one wildcard, so file is of the form /tmp/*.x or /tmp/a.x
+        if ((parts.length < 1) || (parts.length > 2)) {
+            return;
+        }
+
+        // check whether the first and only part is a file or directory
+        if (parts.length == 1) {
+            // open the directory or file
+            File fileOrDir = new File(parts[0]);
+
+            // if the path given was fully specified filename
+            if (fileOrDir.isFile()) {
+                // set the file as the only member in the vector and finish
+                files = new Vector();
+                files.add(fileOrDir);
+
+                return;
+            }
+
+            // the path defined a directory, so get all files
+            File[] fileDirArray;
+
+            // list the files and dirs inside
+            fileDirArray = fileOrDir.listFiles();
+
+            if (fileDirArray == null) {
+                logger.error("No files found matching " + path);
+                throw new IOException("No files found matching " + path);
+            }
+
+            // get the array containing all the files and directories
+            Iterator filesAndDirs = Arrays.asList(fileDirArray).iterator();
+
+            files = new Vector();
+
+            // add all the files to the files list and finish
+            while (filesAndDirs.hasNext()) {
+                File nextFile = (File) filesAndDirs.next();
+
+                if (nextFile.isFile()) {
+                    files.add(nextFile);
+                }
+            }
+
+            return;
+        } else {
+            // this is a directory+ending combination
+            files = new Vector();
+
+            // get all the files matching the definition.
+            FileEndingIterator iterator = new FileEndingIterator(parts[0], parts[1]);
+
+            while (iterator.hasNext()) {
+                files.add(iterator.next());
+            }
+
+            return;
+        }
+    }
+
+    /** Used to get the file listing, the list of files matching
+     * the definition in constructor.
+     * @return Returns the list of files matching the definition
+     * given in the constructor.
+     */
+    public List getListing() {
+        return files;
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileCertReader.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileCertReader.java	2009-08-29 07:55:09.000000000 +0200
@@ -0,0 +1,492 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileCertReader.java
+ *
+ * @author  Joni Hahkala
+ * Created on March 27, 2002, 8:24 PM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.cert.CRLException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.asn1.ASN1InputStream;
+
+/** Reads all certificates from given files, accepts binary form of DER encoded certs and
+ * the Base64 form of the DER encoded certs (PEM). The base64 certs can contain garbage in front of
+ * the actual certificate that has to begin with "-----BEGIN".
+ * Should accept multiple certs in one file, not tested!
+ */
+class FileCertReader {
+    static Logger logger = Logger.getLogger(FileCertReader.class.getName());
+    static final int BUF_LEN = 1000;
+    static final byte CARR = '\r';
+    static final byte NL = '\n';
+
+    /** The type for TrustAnchor
+     */
+    static final int TYPE_ANCHOR = 100;
+
+    /** The type for certificate revocation list
+     */
+    static final int TYPE_CRL = 101;
+
+    /** the type for X509 certificate
+     */
+    static final int TYPE_CERT = 102;
+
+    static {
+        if (Security.getProvider("BC") == null) {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+    }
+
+    CertificateFactory certFactory;
+
+    /** Creates a new instance of CertReader. */
+    public FileCertReader() throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", "BC");
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider.
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(Provider provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /**
+     * Creates a new instance of CertReader with the
+     * specified provider
+     *
+     * @param provider   the provider to be used in creating the
+     *                   certificates etc.
+     */
+    public FileCertReader(String provider) throws CertificateException {
+        try {
+            certFactory = CertificateFactory.getInstance("X.509", provider);
+        } catch (Exception e) {
+            logger.error("Error while creating a FileCertReader: " + e.getMessage());
+            throw new CertificateException("Error while creating a FileCertReader: " +
+                e.getMessage());
+        }
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument. See DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if certificate reading from the files
+     * fails.
+     * @return Returns the Vector of certificates read.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCerts(String files) throws IOException, CertificateException {
+        Vector certs = readFiles(files, TYPE_CERT);
+
+        Iterator certIter = certs.iterator();
+
+        logger.debug("read certs: ");
+
+        while (certIter.hasNext()) {
+            X509Certificate cert = (X509Certificate) certIter.next();
+            logger.debug("Read cert: " + cert.getSubjectDN().toString());
+        }
+
+        return certs;
+    }
+
+    public PrivateKey readPrivateKey(String file) throws IOException {
+        File keyfile = new File(file);
+
+        BufferedInputStream fis = new BufferedInputStream(new FileInputStream(keyfile));
+        skipToKeyBeginning(fis);
+
+        return (PrivateKey) PrivateKeyInfo.getInstance(new ASN1InputStream(fis).readObject()).getPrivateKey();
+    }
+
+    /** Reads the certificates from the files defined in the
+     * argument and makes TrustAnchors from them. See
+     * DirectoryList for file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the certificate reading fails.
+     * @return Returns a Vector of TrustAnchors read from the
+     * files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readAnchors(String files) throws IOException, CertificateException {
+        Vector anchors = readFiles(files, TYPE_ANCHOR);
+
+        Iterator anchorIter = anchors.iterator();
+
+        logger.debug("read TrustAnchors: ");
+
+        while (anchorIter.hasNext()) {
+            TrustAnchor anchor = (TrustAnchor) anchorIter.next();
+            logger.debug("Read TrustAnchor: " + anchor.getTrustedCert().getSubjectDN().toString());
+        }
+
+        return anchors;
+    }
+
+    /** Reads the certificate revocation lists (CRLs) from the
+     * files defined in the argument. See DirectoryList for
+     * file definition format.
+     * @param files The file definition.
+     * @throws Exception Thrown if the CRL reading failed.
+     * @return Returns a vector of CRLs read from the files.
+     * @see org.glite.voms.DirectoryList
+     */
+    public Vector readCRLs(String files) throws IOException, CertificateException {
+        Vector crls = readFiles(files, TYPE_CRL);
+
+        Iterator crlIter = crls.iterator();
+
+        logger.debug("read CRLs: ");
+
+        while (crlIter.hasNext()) {
+            X509CRL crl = (X509CRL) crlIter.next();
+            logger.debug("Read CRL: " + crl.getIssuerDN().toString());
+        }
+
+        return crls;
+    }
+
+    /** Reads the certificates or CRLs from the files defined by
+     * the first argument, see DirectoryList for file definition
+     * format.
+     * @param files The file definition.
+     * @param type The type of things to read from the files.
+     * Currently supported are TYPE_ANCHOR,
+     * TYPE_CRL and TYPE_CERT defined in this class.
+     * @throws CertificateException Thrown if the reading of files fails.
+     * @return Returns a Vector of objects of type given that
+     * were read from the files given.
+     * @see org.glite.voms.DirectoryList
+     */
+    private Vector readFiles(String files, int type) throws CertificateException {
+        Vector storeVector = new Vector();
+
+        try {
+            // load CA certificates
+            DirectoryList dir = new DirectoryList(files); // get the list of files matching CAFiles
+
+            Iterator CAFileIter = dir.getListing().iterator();
+
+            // go through the files
+            while (CAFileIter.hasNext()) { // go through the files reading the certificates
+
+                File nextFile = (File) CAFileIter.next();
+
+                storeVector.addAll(readFile(nextFile, type));
+            }
+        } catch (IOException e) {
+            logger.fatal("Error while reading certificates or CRLs: " + e.getMessage());
+
+            throw new CertificateException("Error while reading certificates or CRLs: " +
+                e.getMessage());
+        }
+
+        return storeVector;
+    }
+
+    /** Reads the objects of given type from the File.
+     * @param certFile The file to read.
+     * @param type The type of objects to read form the file.
+     * @throws IOException Thrown if the reading of objects of given type
+     * fails.
+     * @return Returns the Vector of objects read form the file.
+     */
+    public Vector readFile(File certFile, int type) throws IOException {
+        BufferedInputStream binStream = null;
+        Vector objects = new Vector();
+
+        try {
+            // get the buffered stream to facilitate marking
+            binStream = new BufferedInputStream(new FileInputStream(certFile));
+
+            while (binStream.available() > 0) {
+                Object obj = objectReader(binStream, type);
+
+                if (obj != null) {
+                    objects.add(obj);
+                }
+
+                skipEmptyLines(binStream);
+            }
+        } catch (Exception e) {
+            logger.fatal("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+
+            throw new IOException("Error while reading certificates or crls from file " +
+                certFile.toString() + "error was: " + e.getMessage());
+        } finally {
+            if (binStream != null) {
+                binStream.close();
+            }
+        }
+
+        return objects;
+    }
+
+    /** Reads a certificate or a CRL from the stream, doing some
+     * error correction.
+     * @param binStream The stream to read the object from.
+     * @param type The type of object to read from the stream.
+     * @throws CertificateException Thrown if an error occurs while reading the object.
+     * @throws IOException Thrown if an error occurs while reading the object.
+     * @return Returns the object read.
+     */
+    public Object objectReader(BufferedInputStream binStream, int type)
+        throws CertificateException, IOException {
+        Object object = null;
+        int errors = 0; // no errors in the beginning
+        binStream.mark(10000);
+
+        do { // try twice, first with plain file (reads binary and plain Base64 certificates,
+             // second with skipping possible garbage in the beginning.
+
+            try {
+                if (errors == 1) { // if the first try failed, try if it was because of garbage in the beginning
+                    // before the actual base64 encoded certificate
+                    errors = 2; // if this try fails, don't try anymore
+
+                    skipToCertBeginning(binStream); // skip the garbage
+                }
+
+                binStream.mark(100000);
+
+                binStream.reset();
+
+                object = readObject(binStream, type);
+            } catch (Exception e) {
+                if (errors != 0) { // if the error persists after first pass, fail
+                    logger.error("Certificate or CRL reading failed: " + e.getMessage());
+                    throw new CertificateException("Certificate or CRL reading failed: " +
+                        e.getMessage());
+                }
+
+                errors = 1; // first try failed, try again with skipping
+                binStream.reset(); // rewind the file to the beginning of this try
+            }
+        } while (errors == 1); // try again after first try
+
+        return object;
+    }
+
+    /** Does the actual reading of the object.
+     * @param binStream The stream to read the object from.
+     * @param type The type of the object.
+     * @throws CertificateException Thrown if there is a problem reading the object.
+     * @return Returns the object read or null if no object was found.
+     */
+    public Object readObject(BufferedInputStream binStream, int type)
+        throws CertificateException {
+        Object obj;
+
+        if (type == TYPE_CRL) { // reading certificate revocation lists
+
+            try {
+                obj = certFactory.generateCRL(binStream);
+            } catch (CRLException e) {
+                logger.error("CRL loading failed: " + e.getMessage());
+                throw new CertificateException(e.getMessage());
+            }
+        } else { // reading certs or trust anchors
+
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(binStream); // try to read the certificate
+
+            if (cert == null) {
+                return null;
+            }
+
+            if (type == TYPE_ANCHOR) {
+                // add the certificate to trustanchors, no name contstraints (should add the nameconstraints!)
+                obj = new TrustAnchor(cert, null);
+            } else {
+                if (type == TYPE_CERT) {
+                    obj = cert;
+                } else {
+                    logger.fatal("Internal error: Invalid data type " + type +
+                        " when trying to read certificate");
+                    throw new CertificateParsingException("Internal error: Invalid data type " +
+                        type + " when trying to read certificate");
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    /** Skips everything in front of "-----BEGIN" in the stream.
+     * @param stream The stream to read and skip.
+     * @throws IOException Thrown if there is a problem skipping.
+     */
+    static public void skipToCertBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    static public void skipToKeyBeginning(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+            String buffer = new String(b, 0, num); // generate a string from the byte buffer
+            int index = buffer.indexOf("----BEGIN PRIVATE"); // check if the certificate beginning is in the chars read this time
+
+            if (index == -1)
+                index = buffer.indexOf("----BEGIN ENCRYPTED");
+
+            if (index == -1) { // not found
+                stream.reset(); // rewind the file to the beginning of the last read
+                stream.skip(BUF_LEN - 100); // skip only part of the way as the "----BEGIN" can be in the transition of two 1000 char block
+                stream.mark(BUF_LEN + 2); // mark the new position
+            } else { // found
+
+                while ((buffer.charAt(index - 1) == '-') && (index > 0)) { // search the beginnig of the ----BEGIN tag
+                    index--;
+
+                    if (index == 0) { // prevent charAt test when reaching the beginning of buffer
+
+                        break;
+                    }
+                }
+
+                stream.reset(); // rewind to the beginning of the last read
+                stream.skip(index); // skip to the beginning of the tag
+                stream.mark(10000); // mark the position
+
+                return;
+            }
+        }
+    }
+
+    /** Skips empty lines in the stream.
+     * @param stream The stream possibly containing empty lines.
+     * @throws IOException Thrown if a problem occurs.
+     */
+    static public void skipEmptyLines(BufferedInputStream stream)
+        throws IOException {
+        byte[] b = new byte[BUF_LEN]; // the byte buffer
+        stream.mark(BUF_LEN + 2); // mark the beginning
+
+        while (stream.available() > 0) { // check that there are still something to read
+
+            int num = stream.read(b); // read bytes from the file to the byte buffer
+
+            int i = 0;
+
+            while ((i < num) && ((b[i] == CARR) || (b[i] == NL))) {
+                i++;
+            }
+
+            stream.reset();
+            stream.skip(i);
+
+            if (i < num) {
+                stream.mark(10000);
+
+                return;
+            } else {
+                stream.mark(BUF_LEN);
+            }
+        }
+    }
+}
diff -Nur voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/FileEndingIterator.java	1970-01-01 01:00:00.000000000 +0100
+++ voms-1.9.11/src/api/java/org/glite/voms/FileEndingIterator.java	2009-08-29 07:24:52.000000000 +0200
@@ -0,0 +1,137 @@
+/*********************************************************************
+ *
+ * Authors: Vincenzo Ciaschini - Vincenzo.Ciaschini at cnaf.infn.it 
+ *          Valerio Venturi    - Valerio.Venturi at cnaf.infn.it
+ *
+ * Copyright (c) 2002-2009 INFN-CNAF on behalf of the EU DataGrid
+ * and EGEE I, II and III
+ * For license conditions see LICENSE file or
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Parts of this code may be based upon or even include verbatim pieces,
+ * originally written by other people, in which case the original header
+ * follows.
+ *
+ *********************************************************************/
+/*
+ * Copyright (c) Members of the EGEE Collaboration. 2004.
+ * See http://eu-egee.org/partners/ for details on the copyright holders.
+ * For license conditions see the license file or http://eu-egee.org/license.html
+ */
+
+/*
+ * Copyright (c) 2002 on behalf of the EU DataGrid Project:
+ * The European Organization for Nuclear Research (CERN),
+ * the Particle Physics and Astronomy Research Council (PPARC),
+ * the Helsinki Institute of Physics and
+ * the Swedish Research Council (SRC). All rights reserved.
+ * see LICENSE file for details
+ *
+ * FileEndingIterator.java
+ *
+ * @author  Joni Hahkala
+ * Created on December 3, 2001, 9:16 AM
+ */
+
+package org.glite.voms;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+
+/** Lists all the files in the given directory that end with
+ * a certain ending.
+ */
+class FileEndingIterator {
+    static Logger logger = Logger.getLogger(FileEndingIterator.class.getName());
+
+    /** The file ending.
+     */
+    protected String ending;
+
+    /** A flag to show that there are more files that match.
+     */
+    protected boolean nextFound = false;
+
+    /** The list of files in the directory.
+     */
+    protected File[] fileList;
+
+    /** The index of the next match in the fileList.
+     */
+    protected int index = 0;
+
+    /** Creates new FileIterator and searches the first match.
+     * @param path The directory used for the file search.
+     * @param ending The file ending to search for.
+     */
+    public FileEndingIterator(String path, String ending) {
+        this.ending = ending;
+
+        try {
+            // open the directory
+            File directory = (path.length() != 0) ? new File(path) : new File(".").getAbsoluteFile();
+
+            // list the files and dirs inside
+            fileList = directory.listFiles();
+
+            // find the first match for the ending
+            nextFound = findNext();
+        } catch (Exception e) {
+            logger.error("no files found from \"" + path + "\" error: " + e.getMessage());
+
+            //            e.printStackTrace();
+            return;
+        }
+    }
+
+    /** Used to get the next matching file.
+     * @return Returns the next matching file.
+     */
+    public File next() {
+        if (nextFound == false) {
+            return null;
+        }
+
+        File current = fileList[index++];
+
+        nextFound = findNext();
+
+        return current;
+    }
+
+    /** Used to check that there are more matching files to get
+     * using next().
+     * @return Returns true if there are more matching files.
+     */
+    public boolean hasNext() {
+        return nextFound;
+    }
+
+    /** Finds the next matching file in the list of files.
+     * @return Returns true if a matching file was found.
+     */
+    protected boolean findNext() {
+        try {
+            // search the next file with proper ending
+            while ((index < fileList.length) &&
+                    (fileList[index].isDirectory() || !fileList[index].getName().endsWith(ending))) {
+                //               System.out.println("FileIterator::next: Skipping file " + fileList[index].getName());
+                index++;
+            }
+        } catch (Exception e) {
+            logger.error("Error while reading directory " + e.getMessage());
+
+            //            e.printStackTrace(System.out);
+            return false;
+        }
+
+        // check if the loop ended because of a match or because running out of choices.
+        if (index < fileList.length) {
+            return true;
+        }
+
+        return false;
+    }
+}

voms-initscript.patch:
 voms.start.in |  186 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 64 deletions(-)

--- NEW FILE voms-initscript.patch ---
diff -ur voms-1.9.11.orig/src/install/voms.start.in voms-1.9.11/src/install/voms.start.in
--- voms-1.9.11.orig/src/install/voms.start.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms.start.in	2009-09-03 10:10:17.574074641 +0200
@@ -19,9 +19,19 @@
 #	voms servers.
 #
 # chkconfig: 2345 95 05
-# description: VOMS stands for Virtual Organization Membership System.
+# description: Virtual Organization Membership Service
 # processname: voms
 # pidfile: /var/run/voms.pid
+#
+### BEGIN INIT INFO
+# Provides:          voms
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Virtual Organization Membership Service
+# Description:       Virtual Organization Membership Service
+### END INIT INFO
 
 # Source networking configuration and check that networking is up.
 if [ -r /etc/sysconfig/network ] ; then
@@ -31,9 +41,16 @@
 
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
- at VAR_LOCATION_ENV@=${@VAR_LOCATION_ENV@:-$@LOCATION_ENV@/var}
 
-# check whether $@VAR_LOCATION_ENV@/var/lock/subsys exists
+if [ -z "$@VAR_LOCATION_ENV@" ] ; then
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
+fi
+
+# check whether $@VAR_LOCATION_ENV@/lock/subsys exists
 if ! test -d $@VAR_LOCATION_ENV@/lock/subsys ; then
     mkdir -p $@VAR_LOCATION_ENV@/lock/subsys
 fi
@@ -41,19 +58,38 @@
 # Default path
 basepath=$@LOCATION_ENV@
 binpath=${basepath}/sbin
-etcpath=${basepath}/etc
 
-# Source an auxiliary profile file if we have one, and pick up VOMS_OPTIONS and VOMS_USER
-if [ -r ${etcpath}/profile.d/voms.sh ] ; then
-    . ${etcpath}/profile.d/voms.sh
+if [ "$basepath" = "/usr" ] ; then
+    etcpath=/etc
+else
+    etcpath=${basepath}/etc
+fi
+
+RUN=yes
+
+# Source an auxiliary profile file if we have one and pick up VOMS_USER and RUN
+if [ -r ${etcpath}/default/voms ] ; then
+    . ${etcpath}/default/voms
+fi
+if [ -r ${etcpath}/sysconfig/voms ] ; then
+    . ${etcpath}/sysconfig/voms
+fi
+
+# Don't run until configuration is done
+if [ "x$RUN" != "xyes" ] ; then
+    echo "voms disabled, please adjust the configuration to your needs "
+    echo "and then set RUN to 'yes' in /etc/default/voms to enable it."
+    exit 0
 fi
 
 # add lib directory to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    export LD_LIBRARY_PATH="$@LOCATION_ENV@/lib:$LD_LIBRARY_PATH"
+fi
 
-voms=${binpath}/edg-voms
+voms=${binpath}/voms
 if !(test -x ${voms}) ; then
-    echo "Cannot find edg-voms." 
+    echo "Cannot find voms."
     exit 0
 fi
 
@@ -64,18 +100,22 @@
     # Start daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
 
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Starting $prog($vo): "
 
-            if test -f $@LOCATION_ENV@/etc/voms/$vo/tnsnames.ora ; then
-                tnsvalue=$@LOCATION_ENV@/etc/voms/$vo
+            if test -f ${etcpath}/voms/$vo/tnsnames.ora ; then
+                tnsvalue=${etcpath}/voms/$vo
             else
                 tnsvalue="$TNS_ADMIN"
             fi
@@ -84,21 +124,21 @@
                 read pid < $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
                 if test "x$pid" != "x"; then
                     if checkpid $pid; then
-                        echo "VOMS ($pid) is already running" && failure
+                        echo "VOMS ($pid) is already running"
                         continue;
                     fi
                 fi
             fi
 
             if [ -n "$VOMS_USER" ]; then
-                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
+                su -c "TNS_ADMIN=\"$tnsvalue\" ${voms} --conf ${etcpath}/voms/$vo/voms.conf" -s /bin/bash $VOMS_USER
             else
-                TNS_ADMIN="$tnsvalue" ${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf
+                TNS_ADMIN="$tnsvalue" ${voms} --conf ${etcpath}/voms/$vo/voms.conf
             fi
 
-	          # get process id
-            pid=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            # get process id
+            pid=$(ps axo pid,args | grep "${voms} --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/'|head -1)
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             NUM=$(($pid))
             if test $NUM -eq 0; then
                 RETVAL=1
@@ -110,12 +150,17 @@
                 RETGLOB=$(($RETGLOB + 1 ))
             fi
             [ "$RETVAL" -eq 0 ] && success || failure 
+            echo
         fi
     done
     
     return $RETGLOB
 }
 
+if [ -r /etc/init.d/functions ] ; then
+    . /etc/init.d/functions
+else
+
 success()
 {
     echo $1
@@ -151,6 +196,8 @@
     return $rc
 }
 
+fi
+
 checkpid() 
 {
     ps --pid $1 >> /dev/null
@@ -164,14 +211,14 @@
 # A function to stop a program.
 killprocs() {
     RC=0
-	# Test syntax.
+    # Test syntax.
     if [ "$#" -eq 0 ]; then
         echo $"Usage: killproc {pids} [signal]"
         return 1
     fi
     
     notset=0
-	# check for second arg to be kill level
+    # check for second arg to be kill level
     if [ "$2" != "" ] ; then
         killlevel=$2
     else
@@ -179,15 +226,15 @@
         killlevel="-9"
     fi
 
-        # Find pid.
+    # Find pid.
     pid=$1
 
-        # Kill it.
+    # Kill it.
     if [ -n "${pid:-}" ] ; then
         [ "$BOOTUP" = "verbose" -a -z "$LSB" ] && echo -n "$base "
         if [ "$notset" -eq "1" ] ; then
             if checkpid $pid 2>&1; then
-			   # TERM first, then KILL if not dead
+                # TERM first, then KILL if not dead
                 kill -TERM $pid
                 sleep 0.1
                 if checkpid $pid && sleep 1 &&
@@ -196,14 +243,14 @@
                     kill -KILL $pid
                     sleep 0.1
                 fi
-		        fi
+            fi
             checkpid $pid
             RC=$?
             [ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
             RC=$((! $RC))
-		# use specified level only
-		else
-		        if checkpid $pid >/dev/null 2>&1; then
+        else
+            # use specified level only
+            if checkpid $pid >/dev/null 2>&1; then
                 kill $killlevel $pid
                 RC=$?
                 [ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
@@ -214,7 +261,7 @@
         RC=1
     fi
     
-        # Remove pid file if any.
+    # Remove pid file if any.
     if [ "$notset" = "1" ]; then
         rm -f /var/run/$base.pid
     fi
@@ -226,18 +273,21 @@
     # Stop daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Stopping $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep|awk '{ print $2; }'|tr '\n' ' '`
-            dbname=`grep dbname $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
-            username=`grep username $@LOCATION_ENV@/etc/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            dbname=`grep dbname ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
+            username=`grep username ${etcpath}/voms/$vo/voms.conf | awk -F"=" '{ print $2; }'`
             if test "x$username" = "x"; then
                 pids="";
                 pids2="";
@@ -255,16 +305,15 @@
                 fi
             fi
             if test -z "$pids"; then
-                failure; echo
-                RETVAL=1
+                echo "(already stopped)"
                 continue
             fi
             for pid in $pids; do
-                killprocs ${pid} ;
+                killprocs ${pid}
             done
             RETVAL=$?
             echo
-            [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/voms.$vo
+            [ $RETVAL -eq 0 ] && rm -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo
             RETGLOB=$((RETGLOB + RETVAL))
         fi
     done
@@ -273,47 +322,53 @@
 }
 
 function condrestart() {
-    # Stop daemons.
+    RETGLOB=0
+    # Conditionally restart daemons.
     prog=`basename ${voms}`
     if test -z $1; then
-        vos=`ls $@LOCATION_ENV@/etc/voms`
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
     else
         vos=$1
     fi
     
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
-            echo -n "Condrestart $prog($vo): "
-#	    pids=$(ps axo pid,args | grep "${voms} --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | cut -f 1 -d '/')
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
-            if test -z "$pids"; then
-                echo; start $vo
-            else
-                failure; echo
-                RETVAL=1
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            if test -n "$pids"; then
+                $0 restart $vo
+                RETVAL=$?
+                RETGLOB=$((RETGLOB + RETVAL))
             fi
         fi
     done
 
     return $RETGLOB
-
 }
 
 function getstatus() {
-    # Stop daemons.
-    prog=`basename ${voms}`
-
-    # get vos
-    vos=${1:-`find $@LOCATION_ENV@/etc/voms/ -type d -printf "%f "`}
-
     value=0
+    # Get status.
+    prog=`basename ${voms}`
+    if test -z $1; then
+        vos=`ls ${etcpath}/voms`
+        if test -z "$vos" ; then
+            echo "No VOMS servers configured."
+            return 0
+        fi
+    else
+        vos=$1
+    fi
 
     for vo in $vos ; do
-        if test -f $@LOCATION_ENV@/etc/voms/$vo/voms.conf ; then
+        if test -f ${etcpath}/voms/$vo/voms.conf ; then
             echo -n "Status $prog($vo): "
-            pids=`ps -efww | grep "$@LOCATION_ENV@/sbin/edg-voms --conf $@LOCATION_ENV@/etc/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
+            pids=`ps -efww | grep "${binpath}/voms --conf ${etcpath}/voms/$vo/voms.conf" | grep -v grep | awk '{ print $2; }'`
             if test -z "$pids"; then
-                if [ -f /var/lock/subsys/voms.$vo ]; then
+                if [ -f $@VAR_LOCATION_ENV@/lock/subsys/voms.$vo ]; then
                     echo "dead but subsys locked"
                     value=$[$value < 2 ? 2 : $value]
                     continue
@@ -322,7 +377,8 @@
                 value=$[$value < 3 ? 3 : $value]
                 continue
             else
-                echo "(pid $pids) is running..."
+                echo -n "(pid $pids) is running..." | tr '\n' ' '
+                echo
                 value=$[$value < 0 ? 0 : $value]
                 continue
             fi
@@ -346,12 +402,14 @@
         getstatus $2
         RETVAL=$?
         ;;
-    restart)
+    restart | force-reload)
         stop $2
         start $2
         RETVAL=$?
         ;;
-    condrestart)
+    reload)
+        ;;
+    condrestart | try-restart)
         condrestart $2
         RETVAL=$?
         ;;

voms-install-db.patch:
 voms_install_db.in |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE voms-install-db.patch ---
diff -ur voms-1.9.11.orig/src/install/voms_install_db.in voms-1.9.11/src/install/voms_install_db.in
--- voms-1.9.11.orig/src/install/voms_install_db.in	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/install/voms_install_db.in	2009-08-26 17:45:39.608077295 +0200
@@ -4,7 +4,11 @@
 # Default prefix
 @LOCATION_ENV@=${@LOCATION_ENV@:- at LOCATION_DIR@}
 if test -z $@VAR_LOCATION_ENV@ ; then
-    @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    if [ "$@LOCATION_ENV@" = "/usr" ] ; then
+        @VAR_LOCATION_ENV@=/var
+    else
+        @VAR_LOCATION_ENV@=$@LOCATION_ENV@/var
+    fi
 fi
 
 # CERTDIR
@@ -37,7 +41,9 @@
 
 # Default path
 basepath=$@LOCATION_ENV@
-datapath=$@LOCATION_ENV@
+if [ "$@LOCATION_ENV@" != "/usr" ] ; then
+    datapath=$@LOCATION_ENV@
+fi
 
 # Default Suffix
 code=0
@@ -49,7 +55,7 @@
 logformat=""
 sqlloc=""
 help=""
-oldformat="no"
+newformat="yes"
 
 if test "x at with_mysqlconf@" != "x" ; then
     MYSQLCONF=" --defaults-file=@with_mysqlconf@ "
@@ -58,7 +64,7 @@
 fi
 
 
-TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,compat -n 'voms_install_db' -- "$@"`
+TEMP=`getopt -o h --long mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,oldformat,compat -n 'voms_install_db' -- "$@"`
 
 if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi
 
@@ -84,7 +90,7 @@
   --logtype)                logtype=$2                 ; shift 2 ;;
   --logformat)              logformat=$2               ; shift 2 ;;
   --logdateformat)          logdateformat=$2           ; shift 2 ;;
-  --newformat)              oldformat="yes"            ; shift 1 ;;
+  --oldformat)              newformat="no"             ; shift 1 ;;
   -h)                       help="yes"                 ; shift 1 ;;
 	--)                       shift                      ; break   ;;
 	*)                        $ECHO "$1: Internal Error!" >&2 ; exit 1  ;;
@@ -133,7 +139,7 @@
     $ECHO "    --logtype type          Specifies what to log. See the vomsd(8) man page for details."
     $ECHO "    --logformat format      See the vomsd(8) man page for details."
     $ECHO "    --logdateformat format  See the vomsd(8) man page for details."
-    $ECHO "    --newformat             Creates AC according to the old format."
+    $ECHO "    --oldformat             Creates AC according to the old format."
     $ECHO "    --help                  This output."
     exit 0;
 fi
@@ -261,8 +267,8 @@
 
 # Setting ownership and permission for voms_password_query file
 mkdir -p $datapath/etc/voms/$voms_vo
-mkdir -p $@LOCATION_ENV at _VAR/log
-#$datapath/log
+mkdir -p $@VAR_LOCATION_ENV@/log/voms
+
 $ECHO $voms_password_query > $datapath/etc/voms/$voms_vo/voms.pass
 chown root.voms $datapath/etc/voms/$voms_vo/voms.pass
 chmod 640 $datapath/etc/voms/$voms_vo/voms.pass
@@ -270,10 +276,10 @@
 if test -z $voms_vo ; then
     logname=voms
 else
-    logname=voms.$voms_vo
+    logname=$voms_vo
 fi
  
-$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@LOCATION_ENV at _VAR/log/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
+$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/voms/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
 $ECHO -en "--socktimeout=$timeout\n--loglevel=$loglevel\n--logtype=$logtype\n" >>$datapath/etc/voms/$voms_vo/voms.conf
 
 if test "x$compat_mode" = "x-compat"; then

voms-jar-perms.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-jar-perms.patch ---
diff -ur voms-1.9.11.orig/src/api/java/Makefile.am voms-1.9.11/src/api/java/Makefile.am
--- voms-1.9.11.orig/src/api/java/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/Makefile.am	2009-08-14 20:54:18.599023487 +0200
@@ -70,7 +70,7 @@
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/java
-	$(INSTALL) $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
+	$(INSTALL) -m644 $(top_builddir)/src/api/java/vomsjapi.jar $(DESTDIR)/$(datadir)/java
 
 clean:
 	rm -f $(top_builddir)/src/api/java/vomsjapi.jar

voms-java-clone-cast.patch:
 VOMSValidator.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE voms-java-clone-cast.patch ---
diff -ur voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java
--- voms-1.9.11.orig/src/api/java/org/glite/voms/VOMSValidator.java	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/java/org/glite/voms/VOMSValidator.java	2009-08-15 20:12:49.855022959 +0200
@@ -159,7 +159,7 @@
         if (validatedChain == null)
             myValidatedChain = null; // allow null
         else
-            myValidatedChain = validatedChain.clone(); // allow null
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
 
         if (acValidator == null) {
             if (theTrustStore == null) {
@@ -292,7 +292,7 @@
         if (validatedChain == null) 
             myValidatedChain = null;
         else
-            myValidatedChain = validatedChain.clone();
+            myValidatedChain = (X509Certificate[])validatedChain.clone();
         myVomsAttributes = new Vector();
         myFQANTree = null;
         isParsed = false;

voms-javadoc.patch:
 PathNamingScheme.java   |   14 +++++++-------
 UserCredentials.java    |   14 +++++++-------
 VOMSParser.java         |    2 +-
 VOMSProtocol.java       |    6 +++---
 VOMSProxyBuilder.java   |   16 ++++++++--------
 VOMSRequestOptions.java |   17 ++++-------------
 6 files changed, 30 insertions(+), 39 deletions(-)

--- NEW FILE voms-javadoc.patch ---
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/PathNamingScheme.java	2009-07-01 19:02:29.448373448 +0200
@@ -61,7 +61,7 @@
     /**
      * This methods checks that the string passed as argument complies with the voms FQAN syntax.
      *  
-     * @param containerName, the string that must be checked for compatibility with FQAN syntax. 
+     * @param containerName the string that must be checked for compatibility with FQAN syntax. 
      * @throws VOMSSyntaxException
      *         If there's an error in the FQAN syntax.
      */
@@ -81,7 +81,7 @@
      * This methods checks that the string passed as argument complies with the syntax used
      * by voms to identify groups.
      * 
-     * @param groupName, the string that has to be checked.
+     * @param groupName the string that has to be checked.
      * @throws VOMSSyntaxException
      *          If the string passed as argument doens not comply with the voms sytax.
      */
@@ -116,7 +116,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms group.
      * 
-     * @param groupName, the string to check.
+     * @param groupName the string to check.
      * @return  <ul><li>true, if the string passed as argument identifies a voms group.
      *          <li>false, otherwise.
      *          </ul>
@@ -131,7 +131,7 @@
     /**
      * This methods checks that the FQAN passed as argument identifies a voms role.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -147,7 +147,7 @@
      * This methods checks that the FQAN passed as argument identifies a qualified voms role, i.e.,
      * a role defined in the context of a voms group.
      * 
-     * @param roleName, the string to check.
+     * @param roleName the string to check.
      * @return <ul><li>true, if the string passed as argument identifies a qualified voms role.
      *          <li>false, otherwise.
      *          </ul>
@@ -163,7 +163,7 @@
     /**
      * This method extracts the role name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN
+     * @param containerName the FQAN
      * @return <ul><li>A string containing the role name, if found</li>
      *              <li>null, if no role information is contained in the FQAN passed as argument
      *         </ul>
@@ -190,7 +190,7 @@
     /**
      * This method extracts group name information from the FQAN passed as argument.
      * 
-     * @param containerName, the FQAN 
+     * @param containerName the FQAN 
      * @return <ul><li>A string containing the group name, if found</li>
      *              <li>null, if no group information is contained in the FQAN passed as argument
      *         </ul>
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/UserCredentials.java	2009-07-01 19:02:29.456372709 +0200
@@ -377,7 +377,7 @@
      * Static instance constructor for a {@link UserCredentials}.
      * For more info on the user credentials load procedure, see {@link #instance()}.
      *
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -396,9 +396,9 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
-     * @param keyPassword, the password that is to be used to decrypt the user private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
+     * @param keyPassword the password that is to be used to decrypt the user private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -416,8 +416,8 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param userCertFile, the path to the PEM X509 user certificate.
-     * @param userKeyFile, the path to the PEM X509 private key.
+     * @param userCertFile the path to the PEM X509 user certificate.
+     * @param userKeyFile the path to the PEM X509 private key.
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
@@ -435,7 +435,7 @@
      * This methods allows a user to bypass the default credentials search procedure (highlighted {@link #instance() here}),
      * by specifying the path to a PEM X509 user cert and private key.
      *
-     * @param credentials, the GlobusCredentials object containing the user's own proxy
+     * @param credentials the GlobusCredentials object containing the user's own proxy
      * @return the loaded user credentials.
      *
      * @throws  VOMSException
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSParser.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSParser.java	2009-07-01 19:02:29.465377247 +0200
@@ -61,7 +61,7 @@
     /**
      * 
      * Parses a voms response reading from a given input stream.
-     * @param is, the input stream.
+     * @param is the input stream.
      * @return a {@link VOMSResponse} object that represents the parsed response.
      */
     public VOMSResponse parseResponse(InputStream is){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProtocol.java	2009-07-01 19:02:29.468373182 +0200
@@ -97,8 +97,8 @@
      * 
      * This method is used to send a request to a VOMS server.
      *  
-     * @param requestOptions, the request options. See {@link VOMSRequestOptions}. 
-     * @param stream, an output stream.
+     * @param requestOptions the request options. See {@link VOMSRequestOptions}. 
+     * @param stream an output stream.
      */
     public void sendRequest(VOMSRequestOptions requestOptions, OutputStream stream){
         
@@ -154,7 +154,7 @@
     /**
      * This method is used to parse a VOMS response from an input stream.
      * 
-     * @param stream, the input stream from which the response will be parsed.
+     * @param stream the input stream from which the response will be parsed.
      * @return a {@link VOMSResponse} object.
      */
     public VOMSResponse getResponse(InputStream stream){
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 19:36:38.729376985 +0200
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSProxyBuilder.java	2009-07-01 20:58:25.590377728 +0200
@@ -130,9 +130,9 @@
      *
      * This methods builds an {@link AttributeCertificate} (AC) object starting from an array of bytes.
      *
-     * @param acBytes, the byte array containing the attribute certificate.
+     * @param acBytes the byte array containing the attribute certificate.
      * @return the {@link AttributeCertificate} object
-     * @throws VOMSException, in case of parsing errors.
+     * @throws VOMSException in case of parsing errors.
      */
     public static AttributeCertificate buildAC(byte[] acBytes){
 
@@ -161,12 +161,12 @@
      * passed as arguments and including a list of {@link AttributeCertificate} objects that
      * will be included in the proxy.
      *
-     * @param cred, the {@link UserCredentials} from which the proxy must be created.
-     * @param ACs, the list of {@link AttributeCertificate} objects.
-     * @param lifetime, the lifetime in seconds of the generated proxy.
-     * @param version, the version of globus to which the proxy conforms
-     * @return a {@link GlobusCredential} object that represents the proxy.
-     * @throws {@link VOMSException}, if something goes wrong.
+     * @param cred the {@link UserCredentials} from which the proxy must be created.
+     * @param ACs the list of {@link AttributeCertificate} objects.
+     * @param lifetime the lifetime in seconds of the generated proxy.
+     * @param gtVersion the version of globus to which the proxy conforms
+     * @return a {@link UserCredentials} object that represents the proxy.
+     * @throws VOMSException if something goes wrong.
      *
      * @author Vincenzo Ciaschini
      * @author Andrea Ceccanti
diff -ur voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java
--- voms-1.9.8.1.orig/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2007-11-19 16:05:23.000000000 +0100
+++ voms-1.9.8.1/src/api/java/org/glite/voms/contact/VOMSRequestOptions.java	2009-07-01 19:08:10.252380084 +0200
@@ -75,9 +75,7 @@
 
     
     /**
-     * 
-     * Returns the ordering string of this {@link VOMSRequestOptions} object.
-     * @return
+     * @return the ordering string of this {@link VOMSRequestOptions} object.
      */
     public String getOrdering() {
 
@@ -99,10 +97,7 @@
 
     
     /**
-     * 
-     * Returs the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
-     * 
-     * @return
+     * @return the list of the requested FQANs specified in this {@link VOMSRequestOptions} object.
      */
     public List getRequestedFQANs() {
 
@@ -123,10 +118,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object.
-     * 
-     * @return
      */
     public List getTargets() {
 
@@ -135,10 +128,8 @@
 
     
     /**
-     * Returns the list of targets (i.e., host where the requested ACs will be valid) for this
+     * @return the list of targets (i.e., host where the requested ACs will be valid) for this
      * {@link VOMSRequestOptions} object as a string containing a a comma-separated list of host names.
-     * 
-     * @return
      */
     public String getTargetsAsString() {
 

voms-nolib64.patch:
 configure.ac |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE voms-nolib64.patch ---
diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
--- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
@@ -37,10 +37,6 @@
 
 AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
 
-if test "x$host_cpu" = "xx86_64"; then
-    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
-fi
-
 AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
 AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
 AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-notknown-msg.patch:
 vomsclient.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE voms-notknown-msg.patch ---
diff -ur voms-1.9.11.orig/src/client/vomsclient.cc voms-1.9.11/src/client/vomsclient.cc
--- voms-1.9.11.orig/src/client/vomsclient.cc	2009-07-27 10:14:04.000000000 +0200
+++ voms-1.9.11/src/client/vomsclient.cc	2009-08-31 17:51:15.952071123 +0200
@@ -575,7 +575,9 @@
       std::vector<contactdata> servers;
       servers = v.FindByAlias(contact.vo().empty() ? contact.nick() : contact.vo());
       if (servers.empty()) {
-        std::cerr << "VOMS Server for " << contact.vo() << " not known!" << std::endl;
+        std::cerr << "VOMS Server for "
+		  << (contact.vo().empty() ? contact.nick() : contact.vo())
+		  << " not known!" << std::endl;
         exit(1);
       }
     

voms-openssl.patch:
 ac/Makefile.am        |    1 +
 api/ccapi/api_util.cc |    4 ++--
 include/acstack.h     |    2 +-
 socklib/Client.cpp    |    4 ++++
 utils/vomsfake.cc     |    1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE voms-openssl.patch ---
diff -ur voms-1.9.11.orig/src/ac/Makefile.am voms-1.9.11/src/ac/Makefile.am
--- voms-1.9.11.orig/src/ac/Makefile.am	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/src/ac/Makefile.am	2009-09-07 11:06:49.079471423 +0200
@@ -27,6 +27,7 @@
 	-DNOGLOBUS \
 	-I $(top_srcdir)/src/include \
 	-I $(top_builddir)/src/sslutils
+libattributes_nog_la_CXXFLAGS = $(libattributes_nog_la_CFLAGS)
 
 libattributes_nog_la_LIBADD = \
 	$(OPENSSL_LIBS)
diff -ur voms-1.9.11.orig/src/api/ccapi/api_util.cc voms-1.9.11/src/api/ccapi/api_util.cc
--- voms-1.9.11.orig/src/api/ccapi/api_util.cc	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/api_util.cc	2009-09-07 11:06:49.080471703 +0200
@@ -415,9 +415,9 @@
   /* extract vo name from AC */
   
   AC * ac = (AC *)data;
-  STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
+  const STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
   int nid = OBJ_txt2nid("idatcap");
-  int pos = X509at_get_attr_by_NID(atts, nid, -1);
+  int pos = X509at_get_attr_by_NID((const STACK_OF(X509_ATTRIBUTE)*)atts, nid, -1);
 
   int nidc = OBJ_txt2nid("certseq");
   STACK_OF(X509_EXTENSION) *exts = ac->acinfo->exts;
diff -ur voms-1.9.11.orig/src/include/acstack.h voms-1.9.11/src/include/acstack.h
--- voms-1.9.11.orig/src/include/acstack.h	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/include/acstack.h	2009-09-07 11:06:49.081472345 +0200
@@ -79,7 +79,7 @@
 #endif
 
 #define DECL_STACK(type) \
-   DECLARE_STACK_OF(type) \
+   PREDECLARE_STACK_OF(type) \
    extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \
    extern STACK_OF(type) *sk_##type##_new_null (); \
    extern void   sk_##type##_free (STACK_OF(type) *); \
diff -ur voms-1.9.11.orig/src/socklib/Client.cpp voms-1.9.11/src/socklib/Client.cpp
--- voms-1.9.11.orig/src/socklib/Client.cpp	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Client.cpp	2009-09-07 11:28:07.210471657 +0200
@@ -336,7 +336,11 @@
 bool 
 GSISocketClient::Open()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int ret = -1, ret2 = -1;
   time_t starttime, curtime;
   long errorcode = 0;
diff -ur voms-1.9.11.orig/src/utils/vomsfake.cc voms-1.9.11/src/utils/vomsfake.cc
--- voms-1.9.11.orig/src/utils/vomsfake.cc	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/utils/vomsfake.cc	2009-09-07 10:21:52.935470664 +0200
@@ -40,6 +40,7 @@
 #include "listfunc.h"
 #include "credentials.h"
 #include "parsertypes.h"
+#define YYTOKENTYPE
 #include "vomsparser.h"
 
 VOLIST *volist = NULL;

voms-pipe-buf.patch:
 log.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE voms-pipe-buf.patch ---
diff -ur voms-1.9.11.orig/src/log/log.c voms-1.9.11/src/log/log.c
--- voms-1.9.11.orig/src/log/log.c	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/log/log.c	2009-09-07 16:02:18.597470396 +0200
@@ -175,7 +175,11 @@
   if (*buffer) {
     while (offset < slen) {
       do {
+#ifdef PIPE_BUF
         readbytes = read(fd, *buffer + offset, (slen - offset > PIPE_BUF ? PIPE_BUF : slen - offset));
+#else
+        readbytes = read(fd, *buffer + offset, (slen - offset > fpathconf(fd, _PC_PIPE_BUF) ? fpathconf(fd, _PC_PIPE_BUF) : slen - offset));
+#endif
       } while (readbytes < 0 && (errno == EINTR
 #ifdef ERESTART
                                    || errno == ERESTART

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

--- NEW FILE voms-portability.patch ---
diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
--- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
@@ -1,6 +1,6 @@
 
 AC_INIT([GLite Security VOMS], [1.9.11])
-AC_PREREQ(2.59)
+AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/utils/voms_proxy_destroy.cc])
diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4
--- voms-1.9.11.orig/project/acinclude.m4	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/project/acinclude.m4	2009-09-08 14:13:33.246338019 +0200
@@ -904,12 +904,16 @@
 
 AC_DEFUN([PUT_PRIVATES],
 [
-        AH_BOTTOM([#ifdef __GNUC__
+        AH_BOTTOM([#if defined(__GNUC__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #define UNUSED(z)  z __attribute__ ((unused))
+#else
+#define UNUSED(z)  z
+#endif
 #define PRIVATE    __attribute__ ((visibility ("hidden")))
 #define PUBLIC     __attribute__ ((visibility ("default")))
 #else
-#define UNUSED
+#define UNUSED(z)  z
 #define PRIVATE
 #define PUBLIC
 #endif])])
diff -ur voms-1.9.11.orig/src/api/ccapi/Makefile.am voms-1.9.11/src/api/ccapi/Makefile.am
--- voms-1.9.11.orig/src/api/ccapi/Makefile.am	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/Makefile.am	2009-09-08 14:13:33.247337541 +0200
@@ -16,7 +16,7 @@
 libvomsapi_nog_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_nog_la_CPPFLAGS = \
+libvomsapi_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -41,7 +41,7 @@
 libvomsapi_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_la_CPPFLAGS = \
+libvomsapi_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-DNOGLOBUS \
 	$(API_INCLUDES)
@@ -70,7 +70,7 @@
 libvomsc_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_la_CPPFLAGS = \
+libvomsc_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_CFLAGS)
@@ -94,10 +94,10 @@
 #noinst_PROGRAMS = test ctest
 #test_SOURCES = test.cc
 #test_LDADD = libvomsapi.la
-#test_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#test_CXXFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 #ctest_SOURCES = ctest.c
 #ctest_LDADD = libvomsc.la
-#ctest_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
+#ctest_CFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS)
 
 EXTRA_LTLIBRARIES = \
 	libvomsapi_gcc32.la \
@@ -123,7 +123,7 @@
 libvomsapi_gcc32_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32_la_CPPFLAGS = \
+libvomsapi_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -139,7 +139,7 @@
 libvomsapi_gcc32dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbg_la_CPPFLAGS = \
+libvomsapi_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(GLOBUS_GCC32DBG_CFLAGS) \
 	$(API_INCLUDES)
@@ -155,7 +155,7 @@
 libvomsapi_gcc32pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32pthr_la_CPPFLAGS = \
+libvomsapi_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -171,7 +171,7 @@
 libvomsapi_gcc32dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -187,7 +187,7 @@
 libvomsc_gcc32_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32_la_CPPFLAGS = \
+libvomsc_gcc32_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -203,7 +203,7 @@
 libvomsc_gcc32dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbg_la_CPPFLAGS = \
+libvomsc_gcc32dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -219,7 +219,7 @@
 libvomsc_gcc32pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32pthr_la_CPPFLAGS = \
+libvomsc_gcc32pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -235,7 +235,7 @@
 libvomsc_gcc32dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc32dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc32dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC32DBGPTHR_CFLAGS)
@@ -254,7 +254,7 @@
 libvomsapi_gcc64_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64_la_CPPFLAGS = \
+libvomsapi_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -270,7 +270,7 @@
 libvomsapi_gcc64dbg_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbg_la_CPPFLAGS = \
+libvomsapi_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -286,7 +286,7 @@
 libvomsapi_gcc64pthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64pthr_la_CPPFLAGS = \
+libvomsapi_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -302,7 +302,7 @@
 libvomsapi_gcc64dbgpthr_la_SOURCES = \
 	$(CCSOURCES)
 
-libvomsapi_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsapi_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
@@ -318,7 +318,7 @@
 libvomsc_gcc64_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64_la_CPPFLAGS = \
+libvomsc_gcc64_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -334,7 +334,7 @@
 libvomsc_gcc64dbg_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbg_la_CPPFLAGS = \
+libvomsc_gcc64dbg_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -350,7 +350,7 @@
 libvomsc_gcc64pthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64pthr_la_CPPFLAGS = \
+libvomsc_gcc64pthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -367,7 +367,7 @@
 libvomsc_gcc64dbgpthr_la_SOURCES = \
 	$(CSOURCES)
 
-libvomsc_gcc64dbgpthr_la_CPPFLAGS = \
+libvomsc_gcc64dbgpthr_la_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	$(API_INCLUDES) \
 	$(GLOBUS_GCC64DBGPTHR_CFLAGS)
diff -ur voms-1.9.11.orig/src/socklib/Makefile.am voms-1.9.11/src/socklib/Makefile.am
--- voms-1.9.11.orig/src/socklib/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Makefile.am	2009-09-08 14:16:29.063338874 +0200
@@ -12,7 +12,7 @@
 libsock_server_la_SOURCES = Server.cpp tokens.c globuswrap.c
 libsock_nog_la_SOURCES = Client.cpp
 
-libsock_nog_la_CPPFLAGS = \
+libsock_nog_la_CXXFLAGS = \
 	$(NO_GLOBUS_FLAGS) \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
@@ -21,17 +21,18 @@
 libsock_nog_la_LIBADD = \
 	-lcrypto -lssl
 
-libsock_server_la_CPPFLAGS = \
+libsock_server_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
+libsock_server_la_CFLAGS = $(libsock_server_la_CXXFLAGS)
 
 libsock_server_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils.la \
 	$(top_builddir)/src/common/libutilc.la \
 	$(GLOBUS_GSS_LIBS)
 
-libsock_la_CPPFLAGS = \
+libsock_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_CFLAGS)
@@ -68,10 +69,11 @@
 
 libsock_server_gcc32_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32_la_CPPFLAGS = \
+libsock_server_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
+libsock_server_gcc32_la_CFLAGS = $(libsock_server_gcc32_la_CXXFLAGS)
 
 libsock_server_gcc32_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32.la \
@@ -80,10 +82,11 @@
 
 libsock_server_gcc32dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbg_la_CPPFLAGS = \
+libsock_server_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbg_la_CFLAGS = $(libsock_server_gcc32dbg_la_CXXFLAGS)
 
 libsock_server_gcc32dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbg.la \
@@ -92,10 +95,11 @@
 
 libsock_server_gcc32pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32pthr_la_CPPFLAGS = \
+libsock_server_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
+libsock_server_gcc32pthr_la_CFLAGS = $(libsock_server_gcc32pthr_la_CXXFLAGS)
 
 libsock_server_gcc32pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32pthr.la \
@@ -104,10 +108,11 @@
 
 libsock_server_gcc32dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
+libsock_server_gcc32dbgpthr_la_CFLAGS = $(libsock_server_gcc32dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc32dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc32dbgpthr.la \
@@ -116,10 +121,11 @@
 
 libsock_server_gcc64_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64_la_CPPFLAGS = \
+libsock_server_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
+libsock_server_gcc64_la_CFLAGS = $(libsock_server_gcc64_la_CXXFLAGS)
 
 libsock_server_gcc64_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64.la \
@@ -128,10 +134,11 @@
 
 libsock_server_gcc64dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbg_la_CPPFLAGS = \
+libsock_server_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbg_la_CFLAGS = $(libsock_server_gcc64dbg_la_CXXFLAGS)
 
 libsock_server_gcc64dbg_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbg.la \
@@ -140,10 +147,11 @@
 
 libsock_server_gcc64pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64pthr_la_CPPFLAGS = \
+libsock_server_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
+libsock_server_gcc64pthr_la_CFLAGS = $(libsock_server_gcc64pthr_la_CXXFLAGS)
 
 libsock_server_gcc64pthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64pthr.la \
@@ -152,10 +160,11 @@
 
 libsock_server_gcc64dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c
 
-libsock_server_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_server_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
+libsock_server_gcc64dbgpthr_la_CFLAGS = $(libsock_server_gcc64dbgpthr_la_CXXFLAGS)
 
 libsock_server_gcc64dbgpthr_la_LIBADD = \
 	$(top_builddir)/src/sslutils/libssl_utils_gcc64dbgpthr.la \
@@ -188,7 +197,7 @@
 libsock_gcc32_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32_la_CPPFLAGS = \
+libsock_gcc32_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32_CFLAGS)
@@ -201,7 +210,7 @@
 libsock_gcc32dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbg_la_CPPFLAGS = \
+libsock_gcc32dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -214,7 +223,7 @@
 libsock_gcc32pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32pthr_la_CPPFLAGS = \
+libsock_gcc32pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32PTHR_CFLAGS)
@@ -227,7 +236,7 @@
 libsock_gcc32dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc32dbgpthr_la_CPPFLAGS = \
+libsock_gcc32dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC32DBG_CFLAGS)
@@ -240,7 +249,7 @@
 libsock_gcc64_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64_la_CPPFLAGS = \
+libsock_gcc64_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64_CFLAGS)
@@ -253,7 +262,7 @@
 libsock_gcc64dbg_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbg_la_CPPFLAGS = \
+libsock_gcc64dbg_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)
@@ -266,7 +275,7 @@
 libsock_gcc64pthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64pthr_la_CPPFLAGS = \
+libsock_gcc64pthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64PTHR_CFLAGS)
@@ -279,7 +288,7 @@
 libsock_gcc64dbgpthr_la_SOURCES = \
 	$(SOURCES)
 
-libsock_gcc64dbgpthr_la_CPPFLAGS = \
+libsock_gcc64dbgpthr_la_CXXFLAGS = \
 	-I $(top_srcdir)/src/include \
 	-I $(top_srcdir)/src/sslutils \
 	$(GLOBUS_GCC64DBG_CFLAGS)

voms-shell-syntax.patch:
 mysql2oracle.in |    2 +-
 voms-ping       |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE voms-shell-syntax.patch ---
diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
--- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
@@ -2,7 +2,7 @@
 #!/bin/sh
 #set -x
 
-function usage()
+function usage
 {
     echo
     echo "usage : mysql2oracle [OPTIONS]"
diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
--- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
@@ -25,7 +25,8 @@
   echo "  ]"
 }
 
-function test_vo {
+function test_vo
+{
    local voname="$1"
    local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
    local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
@@ -41,7 +42,7 @@
 "$voname" "localhost" "$port" "$dn" "$voname"
 EOF
    rm -f /tmp/oo
-   /opt/glite/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
+   ${GLITE_LOCATION:-/usr}/bin/voms-proxy-init --voms $vo --out /tmp/proxy --userconf=/tmp/vomses 2>/tmp/oo >/dev/null
    res=$?
    if test $res -ne 0; then
       grep "User unknown to this VO" /tmp/oo >/dev/null


--- NEW FILE voms.INSTALL ---
VOMS server configuration
-------------------------

In addition to the voms-server package a voms database plugin is needed.

Plugins exists for mysql and oracle. Since the oracle client libraries
are not open source software, only the mysql plugin is available in
Fedora. To install the voms-mysql-plugin issue the following command
as root:

	yum install voms-mysql-plugin

Before starting the server, you must create the databases used by
VOMS. It is possible to run more than one VOMS server on a single host
as long as they are configured to use different ports.

You should have the grid CA certificates installed in
/etc/grid-security/certificates before running the VOMS database
creation script.

To create the databases run the following command as root for each
VOMS server you want to run:

	/usr/share/voms/voms_install_db \
		--voms-vo=<voname> \
		--port=<portnumber> \
		--db-type=mysql \
		--db-admin=<mysqladminuser> \
		--db-pwd=<mysqladminpwd> \
		--sqlloc=/usr/lib/voms/libvomsmysql.so

If you are running on a 64 bit host use instead:
		--sqlloc=/usr/lib64/voms/libvomsmysql.so

The voms server is configured to run as a special voms user. This user
needs a copy of the host certificate and key:

	cp -p /etc/grid-security/hostcert.pem /etc/grid-security/voms
	cp -p /etc/grid-security/hostkey.pem /etc/grid-security/voms
	chown voms:voms /etc/grid-security/voms/host*.pem

After creating the databases, start the server by running the command:

	service voms start

If you want the server to be started automatically after each reboot run
the command:

	chkconfig voms on

To check that the server is running and is configured correctly, run
the following command:

	/usr/share/voms/voms-ping <voname>


--- NEW FILE voms.spec ---
Name:		voms
Version:	1.9.11
Release:	4%{?dist}
Summary:	Virtual Organization Membership Service

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms_R_1_9_11 \
#		  -d voms-1.9.11 org.glite.security.voms
#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
Source:		%{name}-%{version}.tar.gz
#		Post-install setup instructions:
Source1:	%{name}.INSTALL
#		Build using Globus from Fedora/EPEL
#		https://savannah.cern.ch/bugs/?54427
Patch0:		%{name}-distribution-globus.patch
#		Fix the start-up script
#		https://savannah.cern.ch/bugs/?54428
Patch1:		%{name}-initscript.patch
#		Fix the --disable-glite configure option
#		https://savannah.cern.ch/bugs/?54429
Patch2:		%{name}-fix-enable-glite.patch
#		Remove lib64 hardcoding
#		https://savannah.cern.ch/bugs/?54430
Patch3:		%{name}-nolib64.patch
#		Make the Java API more compatible with the C API
#		https://savannah.cern.ch/bugs/?54432
Patch4:		%{name}-extra-vomses-java.patch
#		Missing casts after Java cloning
#		https://savannah.cern.ch/bugs/?54433
Patch5:		%{name}-java-clone-cast.patch
#		Fix permissions of installed jar
#		https://savannah.cern.ch/bugs/?54434
Patch6:		%{name}-jar-perms.patch
#		Fix javadoc warnings
#		https://savannah.cern.ch/bugs/?54435
Patch7:		%{name}-javadoc.patch
#		Fix syntax errors in shell scripts
#		https://savannah.cern.ch/bugs/?54436
Patch8:		%{name}-shell-syntax.patch
#		Fix the database install script
#		https://savannah.cern.ch/bugs/?54880
Patch9:		%{name}-install-db.patch
#		Error message glitch
#		https://savannah.cern.ch/bugs/?55113
Patch10:	%{name}-notknown-msg.patch
#		Make the Java API build with gcj
#		https://savannah.cern.ch/bugs/?55115
Patch11:	%{name}-gcj.patch
#		Support older autotools and older gcc
#		https://savannah.cern.ch/bugs/?55116
Patch12:	%{name}-portability.patch
#		Support openssl 1.0
#		https://savannah.cern.ch/bugs/?55390
Patch13:	%{name}-openssl.patch
#		Unconditional use of PIPE_BUF
#		https://savannah.cern.ch/bugs/?55405
Patch14:	%{name}-pipe-buf.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	openssl-devel%{?_isa}
BuildRequires:	expat-devel
BuildRequires:	libtool
BuildRequires:	pkgconfig
BuildRequires:	libxslt
BuildRequires:	docbook-style-xsl
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers libraries that applications using the VOMS functionality
will bind to.

%package devel
Summary:	Virtual Organization Membership Service Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	openssl-devel%{?_isa}
Requires:	automake

%description devel
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers header files for programming with the VOMS libraries.

%package doc
Summary:	Virtual Organization Membership Service Documentation
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif

%description doc
Documentation for the Virtual Organization Membership Service.

%package clients
Summary:	Virtual Organization Membership Service Clients
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%description clients
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package provides command line applications to access the VOMS
services.

%package server
Summary:	Virtual Organization Membership Service Server
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

Requires(pre):		shadow-utils
Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts

%description server
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

The service can be understood as an account database, which serves the
information in a special format (VOMS credential). The VO manager can
administrate it remotely using command line tools or a web interface.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
	   -name '*.cc' -o -name '*.java' ')' -exec chmod a-x {} ';'

# Fix location dir
sed -e 's/\(LOCATION_DIR.*\)"\$prefix"/\1""/g' -i project/acinclude.m4

# Fix default Globus location
sed -e 's!\(GLOBUS_LOCATION\)!{\1:-/usr}!' -i project/voms.m4

# Fix default vomses file location
sed -e 's!/opt/glite/etc/vomses!/etc/vomses!' -i src/api/ccapi/voms_api.cc

# Use pdflatex
sed -e 's!^\(USE_PDFLATEX *= *\)NO!\1YES!' -i src/api/ccapi/Makefile.am

# Touch to avoid rerunning bison and flex
touch -r src/utils/vomsfake.y src/utils/vomsparser.h
touch -r src/utils/vomsfake.y src/utils/lex.yy.c

# rebootstrap
./autogen.sh

install -m 644 %{SOURCE1} INSTALL.Fedora

%build
%configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
	   --disable-java

make %{?_smp_mflags}

( cd doc/apidoc/api/VOMS_C_API/latex ; make )
( cd doc/apidoc/api/VOMS_CC_API/latex ; make )

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_bindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_sbindir}/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/edg-voms*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/edg-voms*
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

mv $RPM_BUILD_ROOT%{_includedir}/glite/security/%{name} \
   $RPM_BUILD_ROOT%{_includedir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_includedir}/glite

rm $RPM_BUILD_ROOT%{_includedir}/%{name}/voms_apic_nog.h
rm $RPM_BUILD_ROOT%{_mandir}/man1/testvoms.1*
rm $RPM_BUILD_ROOT%{_mandir}/man8/voms-install-replica.8*

mv $RPM_BUILD_ROOT%{_datadir}/vomses.template \
   $RPM_BUILD_ROOT%{_datadir}/%{name}

mv $RPM_BUILD_ROOT%{_datadir}/m4 $RPM_BUILD_ROOT%{_datadir}/aclocal

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/vomsdir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

touch $RPM_BUILD_ROOT%{_sysconfdir}/vomses

sed -e 's!${datapath}/etc/voms/voms!${basepath}/share/voms/voms!' \
    -e 's/useradd/\#&/' -e 's/groupadd/\#&/' \
    -e 's/vomsd(8)/voms(8)/' \
    -i $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db

cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/voms_install_db << EOF
\$ECHO -en "--x509_user_cert=/etc/grid-security/voms/hostcert.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
\$ECHO -en "--x509_user_key=/etc/grid-security/voms/hostkey.pem\n" >> \$datapath/etc/voms/\$voms_vo/voms.conf
EOF

# Turn off default enabling of the service
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
sed -e 's/\(chkconfig: \)\w*/\1-/' \
    -e '/Default-Start/d' \
    -e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
   $RPM_BUILD_ROOT%{_datadir}/init.d/%{name} > \
   $RPM_BUILD_ROOT%{_initrddir}/%{name}
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

mkdir -p VOMS_C_API
cp -pr doc/apidoc/api/VOMS_C_API/html VOMS_C_API
install -m 644 doc/apidoc/api/VOMS_C_API/latex/refman.pdf VOMS_C_API

mkdir -p VOMS_CC_API
cp -pr doc/apidoc/api/VOMS_CC_API/html VOMS_CC_API
install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf VOMS_CC_API

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre server
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || useradd -r -g %{name} \
    -d %{_sysconfdir}/%{name} -s /sbin/nologin -c "VOMS Server Account" %{name}
exit 0

%post server
if [ $1 = 1 ]; then
    /sbin/chkconfig --add %{name}
fi

%preun server
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del %{name}
fi

%postun server
if [ $1 -ge 1 ]; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so.*
%{_libdir}/libvomsapi_nog.so.*
%{_libdir}/libvomsc.so.*
%config(noreplace) %{_sysconfdir}/vomses
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/vomsdir
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/vomses.template
%doc AUTHORS LICENSE

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so
%{_libdir}/libvomsapi_nog.so
%{_libdir}/libvomsc.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/acstack.h
%{_includedir}/%{name}/newformat.h
%{_includedir}/%{name}/vomsssl.h
%{_includedir}/%{name}/voms_api.h
%{_includedir}/%{name}/voms_api_nog.h
%{_includedir}/%{name}/voms_apic.h
%{_datadir}/aclocal/%{name}.m4

%files doc
%defattr(-,root,root,-)
%doc VOMS_C_API
%doc VOMS_CC_API

%files clients
%defattr(-,root,root,-)
%{_bindir}/voms-proxy-destroy
%{_bindir}/voms-proxy-info
%{_bindir}/voms-proxy-init
%{_bindir}/voms-proxy-fake
%{_bindir}/voms-proxy-list
%{_mandir}/man1/voms-proxy-destroy.1*
%{_mandir}/man1/voms-proxy-info.1*
%{_mandir}/man1/voms-proxy-init.1*
%{_mandir}/man1/voms-proxy-fake.1*
%{_mandir}/man1/voms-proxy-list.1*

%files server
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/grid-security/%{name}
%attr(-,voms,voms) %dir %{_localstatedir}/log/%{name}
%{_datadir}/%{name}/mysql2oracle
%{_datadir}/%{name}/upgrade1to2
%{_datadir}/%{name}/voms.data
%{_datadir}/%{name}/voms_install_db
%{_datadir}/%{name}/voms-ping
%{_datadir}/%{name}/voms_replica_master_setup.sh
%{_datadir}/%{name}/voms_replica_slave_setup.sh
%{_mandir}/man8/voms.8*
%doc INSTALL.Fedora

%changelog
* Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
- Fix building with openssl 1.0

* Thu Sep 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-3
- Add an empty /etc/vomses file to the main package to avoid error messages
- Let the voms user own only necessary directories
- Additional fixes for the server start-up script

* Tue Aug 25 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-2
- Add the /etc/voms directory to the server package
- Add setup instructions to the server package
- Run the server as non-root

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-1
- Upstream 1.9.11 (CVS tag glite-security-voms_R_1_9_11)

* Mon Jun 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.8.1-1
- Upstream 1.9.8.1 (CVS tag glite-security-voms_R_1_9_8_1)

* Thu Feb 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.2-1
- Upstream 1.9.2 (CVS tag glite-security-voms_R_1_9_2)

* Fri Feb 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.1-1
- Upstream 1.9.1 (CVS tag glite-security-voms_R_1_9_1)

* Tue Jan 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.10-1
- Upstream 1.8.10 (CVS tag glite-security-voms_R_1_8_10)
- Rebuild against distribution Globus
- Add clear SSL error patch needed for openssl > 0.9.8b
- Add missing return value patch

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.9-1ng
- Upstream 1.8.9 (CVS tag glite-security-voms_R_1_8_9)
- Rebuild against Globus 4.0.8-0.11

* Thu May 15 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-4ng
- Add missing include patch

* Sat Apr 26 2008 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-3ng
- Rebuild against Globus 4.0.7-0.10

* Sun Nov 25 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-2ng
- Fix GPT_LOCATION and GLOBUS_LOCATION detection in spec file

* Mon Oct 29 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.24-1ng
- Upstream 1.7.24 (CVS tag glite-security-voms_R_1_7_24_1)

* Mon Oct 15 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.23-1ng
- Upstream 1.7.23 (CVS tag glite-security-voms_R_1_7_23_1)

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-3ng
- Move /etc/voms/vomses back to /etc/vomses
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Wed Sep 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-2ng
- Added more openssl portability patches with input
  from Aake Sandgren <ake.sandgren at hpc2n.umu.se>

* Mon Sep 10 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.22-1ng
- Try to link against system crypto library when Globus library is not
  available
- Make /etc/grid-security/vomsdir part of the voms sub-package
- Drop RPM prefix /etc
- Move the vomses.template to /etc/voms
- Use dashes instead of underscore in voms-install-replica.1 man page
- Do not try to link against system crypt library. Voms now
  does this internally.
- Upstream 1.7.22 (CVS tag glite-security-voms_R_1_7_22_1)

* Mon Jul 16 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-5ng
- Drop voms-struct_change.patch - problem is with libxml2

* Sat Jul 14 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-4ng
- Add missing openssl-devel dependency in voms-devel

* Thu Jul 12 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-3ng
- Add patch:
  - voms-struct_change.patch
    - Change API slightly - but now works with libxml2

* Thu Jul 08 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-2ng
- Make conditinal dependency on expat-devel (OpenSuSE 10.20 has only expat)

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.20-1ng
- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1) 

* Thu Jul 05 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-2ng
- Added patches:
  - voms-openssl_portability.patch
    - Support for newer OpenSSL-0.9.8
  - voms-isoc90_portability.patch
    - Support for older compilers
- Added openssl-devel build dependency

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.7.19-1ng
- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2) 
- Remove patches (use shell substitutions instead)
- Disable Java API build

* Fri Jun 22 2007 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-3ng
- Added Globus dependencies to voms-devel

* Mon Jul 24 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-2ng
- Fix dependency typo: Requires -> BuildRequires

* Sat May 06 2006 Anders W??n?nen <waananen at nbi.dk> - 1.6.20-1ng
- Many changes since upstream changed quite a lot.
- Added README.NorduGrid with packaging information
- Patches:
  - voms_openssl-0.9.8.patch
    - Support for OpenSSL 0.9.8
  - voms_noglobusopenssl-1.6.20.patch
    - Use system openssl rather than the one from Globus
    - Patch reworked for voms 1.6.20
  - Dont use project based (gLite) include paths
- Pseudo patches (fixes made at runtime and not from static patch files)
  - Fix broken --libexecdir support for configure
    (some systems do not have libexecdir = <prefix>/libexec)
  - Drop all documents except man pages which are pre-generated
    (section 3 man pages are skipped as well)
  - Do not use edg- prefix
    (can be turned on/off through macro)
  - Install flavored libraries in addition to non-flavored
    (can be turned on/off through macro)
  - Put start-up script in /etc/init.d
  - Move configuration files from <prefix>/etc to /etc

* Mon Dec 19 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-2
- Add patch voms_doc.patch to disable html and ps documentation
  and add man-mages and pdf files to distribution (make dist)
- Use rpm switch: --define "_autotools_bootstrap 1" to rebuild
  documentation and create "make dist" target
- Add patch voms_nohardcodelibexecdir.patch which use the libexecdir
  from configure rather than the hardcoded prefix/libexec

* Sun Nov 27 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.9-1
- Add patch voms_ssl_include.patch to add external openssl includes.
  Would be better to query globus_openssl about this

* Tue Oct 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.6.7-1
- Modfiy voms_noglobusopenssl.patch to match upstream
- Add patch voms_nops.patch to disable postscript versions of
  reference manual

* Fri Jun 17 2005 Anders W??n?nen <waananen at nbi.dk> - 1.5.4-1
- Remove the following patches:
  - voms_namespace.patch - Fixed in upstream
  - voms_external_mysql++-1.4.1.patch - Obsolete since mysql++ is no
    longer needed
  - voms-no_libs.path - Fixed in upstream
- Add Globus dependencies

* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-3
- Do not hardcode Globus flavor but try to guess
- Remove explicit globus rpm Requirement
- Use external openssl - not globus_openssl

* Mon May 02 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-2
- Remove automake cache
- Add explicit dependency on mysql++-devel

* Sat Apr 30 2005 Anders W??n?nen <waananen at nbi.dk> - 1.4.1-1
- New upstream
- autogen.sh -> autobuild.sh

* Mon Apr 18 2005 Anders W??n?nen <waananen at nbi.dk> - 1.3.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:08:49 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:41:42 -0000	1.2
@@ -0,0 +1 @@
+voms-1.9.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:08:49 -0000	1.1
+++ sources	10 Sep 2009 02:41:42 -0000	1.2
@@ -0,0 +1 @@
+86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:49:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:49:23 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/devel import.log, NONE,
	1.1 voms-mysql-plugin-crypto.patch, NONE,
	1.1 voms-mysql-plugin-module.patch, NONE,
	1.1 voms-mysql-plugin-mysqllib.patch, NONE,
	1.1 voms-mysql-plugin-underquote.patch, NONE,
	1.1 voms-mysql-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910024923.2CCB911C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23540/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-mysql-plugin-crypto.patch 
	voms-mysql-plugin-module.patch 
	voms-mysql-plugin-mysqllib.patch 
	voms-mysql-plugin-underquote.patch voms-mysql-plugin.spec 
Log Message:
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.



--- NEW FILE import.log ---
voms-mysql-plugin-3_1_1-1_fc11:HEAD:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252550902

voms-mysql-plugin-crypto.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-crypto.patch ---
diff -ur voms-mysql-plugin-3.1.1.orig/src/Makefile.am voms-mysql-plugin-3.1.1/src/Makefile.am
--- voms-mysql-plugin-3.1.1.orig/src/Makefile.am	2009-08-16 06:31:47.000000000 +0200
+++ voms-mysql-plugin-3.1.1/src/Makefile.am	2009-08-16 06:32:38.000000000 +0200
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
-libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LIBADD = $(MYSQL_LIBS) -lcrypto
 libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)

voms-mysql-plugin-module.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE voms-mysql-plugin-module.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/src/Makefile.am voms-mysql-plugin-3.1.0/src/Makefile.am
--- voms-mysql-plugin-3.1.0.orig/src/Makefile.am	2007-11-20 19:07:57.000000000 +0100
+++ voms-mysql-plugin-3.1.0/src/Makefile.am	2009-06-30 12:49:42.316374480 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
 libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)
 

voms-mysql-plugin-mysqllib.patch:
 mysql.m4 |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

--- NEW FILE voms-mysql-plugin-mysqllib.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/project/mysql.m4 voms-mysql-plugin-3.1.0/project/mysql.m4
--- voms-mysql-plugin-3.1.0.orig/project/mysql.m4	2007-11-20 16:15:32.000000000 +0100
+++ voms-mysql-plugin-3.1.0/project/mysql.m4	2009-07-01 07:08:58.782378737 +0200
@@ -37,10 +37,10 @@
     result=no
     ac_cv_mysql_valid=no
 
-    AC_PATH_PROG(PMYSQL,mysql,no,$MYSQL_BIN_PATH)
+    AC_PATH_PROG(PMYSQL,mysql_config,no,$MYSQL_BIN_PATH)
 
     if test "$PMYSQL" != "no" ; then
-        MYSQL_VERSION=`$PMYSQL --version | cut -d' ' -f6 | tr -cd '0-9.'`
+        MYSQL_VERSION=`$PMYSQL --version | tr -cd '0-9.'`
 
         mysql_version_between(3.0.0,$MYSQL_VERSION,3.999.999,
             mysql_greater_than_3=no,mysql_greater_than_3=yes)
@@ -53,20 +53,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
 
-    if test -n "$with_mysql_prefix" -a "$with_mysql_prefix" != "/usr" -a "x$result" = "xyes" ; then
-		MYSQL_CFLAGS="-I$with_mysql_prefix/include -I$with_mysql_prefix/include/mysql"
-		MYSQL_LIBS="-L$with_mysql_prefix/lib -L$with_mysql_prefix/lib/mysql"
-    else
-        MYSQL_CFLAGS=""
-	MYSQL_LIBS=""
-    fi
-
     if test "x$result" = "xyes" ; then
       if test "x$mysql_greater_than_3" = "xyes" ; then
-        MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient -lz"
+        MYSQL_CFLAGS=`$PMYSQL --include`
       else
-	MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient"
+        MYSQL_CFLAGS=`$PMYSQL --cflags`
       fi
+      MYSQL_LIBS=`$PMYSQL --libs`
         
       CFLAGS="$MYSQL_CFLAGS $CFLAGS"
       LIBS="$MYSQL_LIBS $LIBS"
@@ -94,8 +87,8 @@
         MYSQL_INSTALL_PATH=$with_mysql_prefix
 	ifelse([$3], , :, [$3])
     else
-	MYSQL_CFLAGS="-I/usr/include/mysql"
-	MYSQL_LIBS="-l/usr/lib/mysql"
+	MYSQL_CFLAGS=
+	MYSQL_LIBS=
 	ifelse([$4], , :, [$4])
     fi
 

voms-mysql-plugin-underquote.patch:
 glite.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-underquote.patch ---
--- voms-mysql-plugin-3.1.0.orig/project/glite.m4	2005-09-26 09:36:56.000000000 +0200
+++ voms-mysql-plugin-3.1.0/project/glite.m4	2009-07-01 07:19:47.816378148 +0200
@@ -4,7 +4,7 @@
 dnl - GLITE_CFLAGS
 dnl - DISTTAR
 
-AC_DEFUN(AC_GLITE,
+AC_DEFUN([AC_GLITE],
 [
     AC_ARG_WITH(glite_location,
         [  --with-glite-location=PFX     prefix where GLITE is installed. (/opt/glite)],


--- NEW FILE voms-mysql-plugin.spec ---
Name:		voms-mysql-plugin
Version:	3.1.1
Release:	1%{?dist}
Summary:	VOMS server plugin for MySQL

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms-mysql_R_3_1_1 \
#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
#		  voms-mysql-plugin-3.1.1
Source:		%{name}-%{version}.tar.gz
#		Make the mysql library detection portable
#		https://savannah.cern.ch/bugs/?54438
Patch0:		%{name}-mysqllib.patch
#		Add proper LDFLAGS
#		https://savannah.cern.ch/bugs/?54439
Patch1:		%{name}-module.patch
#		Fix underquoted macro
#		https://savannah.cern.ch/bugs/?54440
Patch2:		%{name}-underquote.patch
#		Add missing library to avoid undefined symbols
#		https://savannah.cern.ch/bugs/?54441
Patch3:		%{name}-crypto.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	voms-server%{?_isa}
BuildRequires:	libtool
BuildRequires:	mysql-devel%{?_isa}
BuildRequires:	openssl%{?_isa}

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers the MySQL implementation for the VOMS server.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Fix directory hardwiring
for f in `find . -name Makefile.am`; do
    sed	-e 's!\(^sysconfdir *= *\)\$(prefix)/etc!\1 at sysconfdir@!' -i $f
done

./bootstrap

%build
%configure --libdir=%{_libdir}/voms --sysconfdir=%{_datadir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.a
rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/voms/voms-mysql.data
%{_datadir}/voms/voms-mysql-compat.data
%dir %{_libdir}/voms
%{_libdir}/voms/libvomsmysql.so

%changelog
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.

* Tue Jun 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:09:53 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:49:22 -0000	1.2
@@ -0,0 +1 @@
+voms-mysql-plugin-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:09:53 -0000	1.1
+++ sources	10 Sep 2009 02:49:22 -0000	1.2
@@ -0,0 +1 @@
+b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:50:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:50:53 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/F-11 import.log, NONE,
	1.1 voms-mysql-plugin-crypto.patch, NONE,
	1.1 voms-mysql-plugin-module.patch, NONE,
	1.1 voms-mysql-plugin-mysqllib.patch, NONE,
	1.1 voms-mysql-plugin-underquote.patch, NONE,
	1.1 voms-mysql-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910025053.D172311C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24116/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-mysql-plugin-crypto.patch 
	voms-mysql-plugin-module.patch 
	voms-mysql-plugin-mysqllib.patch 
	voms-mysql-plugin-underquote.patch voms-mysql-plugin.spec 
Log Message:
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.



--- NEW FILE import.log ---
voms-mysql-plugin-3_1_1-1_fc11:F-11:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551019

voms-mysql-plugin-crypto.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-crypto.patch ---
diff -ur voms-mysql-plugin-3.1.1.orig/src/Makefile.am voms-mysql-plugin-3.1.1/src/Makefile.am
--- voms-mysql-plugin-3.1.1.orig/src/Makefile.am	2009-08-16 06:31:47.000000000 +0200
+++ voms-mysql-plugin-3.1.1/src/Makefile.am	2009-08-16 06:32:38.000000000 +0200
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
-libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LIBADD = $(MYSQL_LIBS) -lcrypto
 libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)

voms-mysql-plugin-module.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE voms-mysql-plugin-module.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/src/Makefile.am voms-mysql-plugin-3.1.0/src/Makefile.am
--- voms-mysql-plugin-3.1.0.orig/src/Makefile.am	2007-11-20 19:07:57.000000000 +0100
+++ voms-mysql-plugin-3.1.0/src/Makefile.am	2009-06-30 12:49:42.316374480 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
 libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)
 

voms-mysql-plugin-mysqllib.patch:
 mysql.m4 |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

--- NEW FILE voms-mysql-plugin-mysqllib.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/project/mysql.m4 voms-mysql-plugin-3.1.0/project/mysql.m4
--- voms-mysql-plugin-3.1.0.orig/project/mysql.m4	2007-11-20 16:15:32.000000000 +0100
+++ voms-mysql-plugin-3.1.0/project/mysql.m4	2009-07-01 07:08:58.782378737 +0200
@@ -37,10 +37,10 @@
     result=no
     ac_cv_mysql_valid=no
 
-    AC_PATH_PROG(PMYSQL,mysql,no,$MYSQL_BIN_PATH)
+    AC_PATH_PROG(PMYSQL,mysql_config,no,$MYSQL_BIN_PATH)
 
     if test "$PMYSQL" != "no" ; then
-        MYSQL_VERSION=`$PMYSQL --version | cut -d' ' -f6 | tr -cd '0-9.'`
+        MYSQL_VERSION=`$PMYSQL --version | tr -cd '0-9.'`
 
         mysql_version_between(3.0.0,$MYSQL_VERSION,3.999.999,
             mysql_greater_than_3=no,mysql_greater_than_3=yes)
@@ -53,20 +53,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
 
-    if test -n "$with_mysql_prefix" -a "$with_mysql_prefix" != "/usr" -a "x$result" = "xyes" ; then
-		MYSQL_CFLAGS="-I$with_mysql_prefix/include -I$with_mysql_prefix/include/mysql"
-		MYSQL_LIBS="-L$with_mysql_prefix/lib -L$with_mysql_prefix/lib/mysql"
-    else
-        MYSQL_CFLAGS=""
-	MYSQL_LIBS=""
-    fi
-
     if test "x$result" = "xyes" ; then
       if test "x$mysql_greater_than_3" = "xyes" ; then
-        MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient -lz"
+        MYSQL_CFLAGS=`$PMYSQL --include`
       else
-	MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient"
+        MYSQL_CFLAGS=`$PMYSQL --cflags`
       fi
+      MYSQL_LIBS=`$PMYSQL --libs`
         
       CFLAGS="$MYSQL_CFLAGS $CFLAGS"
       LIBS="$MYSQL_LIBS $LIBS"
@@ -94,8 +87,8 @@
         MYSQL_INSTALL_PATH=$with_mysql_prefix
 	ifelse([$3], , :, [$3])
     else
-	MYSQL_CFLAGS="-I/usr/include/mysql"
-	MYSQL_LIBS="-l/usr/lib/mysql"
+	MYSQL_CFLAGS=
+	MYSQL_LIBS=
 	ifelse([$4], , :, [$4])
     fi
 

voms-mysql-plugin-underquote.patch:
 glite.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-underquote.patch ---
--- voms-mysql-plugin-3.1.0.orig/project/glite.m4	2005-09-26 09:36:56.000000000 +0200
+++ voms-mysql-plugin-3.1.0/project/glite.m4	2009-07-01 07:19:47.816378148 +0200
@@ -4,7 +4,7 @@
 dnl - GLITE_CFLAGS
 dnl - DISTTAR
 
-AC_DEFUN(AC_GLITE,
+AC_DEFUN([AC_GLITE],
 [
     AC_ARG_WITH(glite_location,
         [  --with-glite-location=PFX     prefix where GLITE is installed. (/opt/glite)],


--- NEW FILE voms-mysql-plugin.spec ---
Name:		voms-mysql-plugin
Version:	3.1.1
Release:	1%{?dist}
Summary:	VOMS server plugin for MySQL

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms-mysql_R_3_1_1 \
#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
#		  voms-mysql-plugin-3.1.1
Source:		%{name}-%{version}.tar.gz
#		Make the mysql library detection portable
#		https://savannah.cern.ch/bugs/?54438
Patch0:		%{name}-mysqllib.patch
#		Add proper LDFLAGS
#		https://savannah.cern.ch/bugs/?54439
Patch1:		%{name}-module.patch
#		Fix underquoted macro
#		https://savannah.cern.ch/bugs/?54440
Patch2:		%{name}-underquote.patch
#		Add missing library to avoid undefined symbols
#		https://savannah.cern.ch/bugs/?54441
Patch3:		%{name}-crypto.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	voms-server%{?_isa}
BuildRequires:	libtool
BuildRequires:	mysql-devel%{?_isa}
BuildRequires:	openssl%{?_isa}

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers the MySQL implementation for the VOMS server.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Fix directory hardwiring
for f in `find . -name Makefile.am`; do
    sed	-e 's!\(^sysconfdir *= *\)\$(prefix)/etc!\1 at sysconfdir@!' -i $f
done

./bootstrap

%build
%configure --libdir=%{_libdir}/voms --sysconfdir=%{_datadir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.a
rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/voms/voms-mysql.data
%{_datadir}/voms/voms-mysql-compat.data
%dir %{_libdir}/voms
%{_libdir}/voms/libvomsmysql.so

%changelog
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.

* Tue Jun 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:09:53 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:50:53 -0000	1.2
@@ -0,0 +1 @@
+voms-mysql-plugin-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:09:53 -0000	1.1
+++ sources	10 Sep 2009 02:50:53 -0000	1.2
@@ -0,0 +1 @@
+b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:52:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:52:09 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/F-10 import.log, NONE,
	1.1 voms-mysql-plugin-crypto.patch, NONE,
	1.1 voms-mysql-plugin-module.patch, NONE,
	1.1 voms-mysql-plugin-mysqllib.patch, NONE,
	1.1 voms-mysql-plugin-underquote.patch, NONE,
	1.1 voms-mysql-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910025209.6739C11C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24581/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-mysql-plugin-crypto.patch 
	voms-mysql-plugin-module.patch 
	voms-mysql-plugin-mysqllib.patch 
	voms-mysql-plugin-underquote.patch voms-mysql-plugin.spec 
Log Message:
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.



--- NEW FILE import.log ---
voms-mysql-plugin-3_1_1-1_fc11:F-10:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551105

voms-mysql-plugin-crypto.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-crypto.patch ---
diff -ur voms-mysql-plugin-3.1.1.orig/src/Makefile.am voms-mysql-plugin-3.1.1/src/Makefile.am
--- voms-mysql-plugin-3.1.1.orig/src/Makefile.am	2009-08-16 06:31:47.000000000 +0200
+++ voms-mysql-plugin-3.1.1/src/Makefile.am	2009-08-16 06:32:38.000000000 +0200
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
-libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LIBADD = $(MYSQL_LIBS) -lcrypto
 libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)

voms-mysql-plugin-module.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE voms-mysql-plugin-module.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/src/Makefile.am voms-mysql-plugin-3.1.0/src/Makefile.am
--- voms-mysql-plugin-3.1.0.orig/src/Makefile.am	2007-11-20 19:07:57.000000000 +0100
+++ voms-mysql-plugin-3.1.0/src/Makefile.am	2009-06-30 12:49:42.316374480 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
 libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)
 

voms-mysql-plugin-mysqllib.patch:
 mysql.m4 |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

--- NEW FILE voms-mysql-plugin-mysqllib.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/project/mysql.m4 voms-mysql-plugin-3.1.0/project/mysql.m4
--- voms-mysql-plugin-3.1.0.orig/project/mysql.m4	2007-11-20 16:15:32.000000000 +0100
+++ voms-mysql-plugin-3.1.0/project/mysql.m4	2009-07-01 07:08:58.782378737 +0200
@@ -37,10 +37,10 @@
     result=no
     ac_cv_mysql_valid=no
 
-    AC_PATH_PROG(PMYSQL,mysql,no,$MYSQL_BIN_PATH)
+    AC_PATH_PROG(PMYSQL,mysql_config,no,$MYSQL_BIN_PATH)
 
     if test "$PMYSQL" != "no" ; then
-        MYSQL_VERSION=`$PMYSQL --version | cut -d' ' -f6 | tr -cd '0-9.'`
+        MYSQL_VERSION=`$PMYSQL --version | tr -cd '0-9.'`
 
         mysql_version_between(3.0.0,$MYSQL_VERSION,3.999.999,
             mysql_greater_than_3=no,mysql_greater_than_3=yes)
@@ -53,20 +53,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
 
-    if test -n "$with_mysql_prefix" -a "$with_mysql_prefix" != "/usr" -a "x$result" = "xyes" ; then
-		MYSQL_CFLAGS="-I$with_mysql_prefix/include -I$with_mysql_prefix/include/mysql"
-		MYSQL_LIBS="-L$with_mysql_prefix/lib -L$with_mysql_prefix/lib/mysql"
-    else
-        MYSQL_CFLAGS=""
-	MYSQL_LIBS=""
-    fi
-
     if test "x$result" = "xyes" ; then
       if test "x$mysql_greater_than_3" = "xyes" ; then
-        MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient -lz"
+        MYSQL_CFLAGS=`$PMYSQL --include`
       else
-	MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient"
+        MYSQL_CFLAGS=`$PMYSQL --cflags`
       fi
+      MYSQL_LIBS=`$PMYSQL --libs`
         
       CFLAGS="$MYSQL_CFLAGS $CFLAGS"
       LIBS="$MYSQL_LIBS $LIBS"
@@ -94,8 +87,8 @@
         MYSQL_INSTALL_PATH=$with_mysql_prefix
 	ifelse([$3], , :, [$3])
     else
-	MYSQL_CFLAGS="-I/usr/include/mysql"
-	MYSQL_LIBS="-l/usr/lib/mysql"
+	MYSQL_CFLAGS=
+	MYSQL_LIBS=
 	ifelse([$4], , :, [$4])
     fi
 

voms-mysql-plugin-underquote.patch:
 glite.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-underquote.patch ---
--- voms-mysql-plugin-3.1.0.orig/project/glite.m4	2005-09-26 09:36:56.000000000 +0200
+++ voms-mysql-plugin-3.1.0/project/glite.m4	2009-07-01 07:19:47.816378148 +0200
@@ -4,7 +4,7 @@
 dnl - GLITE_CFLAGS
 dnl - DISTTAR
 
-AC_DEFUN(AC_GLITE,
+AC_DEFUN([AC_GLITE],
 [
     AC_ARG_WITH(glite_location,
         [  --with-glite-location=PFX     prefix where GLITE is installed. (/opt/glite)],


--- NEW FILE voms-mysql-plugin.spec ---
Name:		voms-mysql-plugin
Version:	3.1.1
Release:	1%{?dist}
Summary:	VOMS server plugin for MySQL

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms-mysql_R_3_1_1 \
#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
#		  voms-mysql-plugin-3.1.1
Source:		%{name}-%{version}.tar.gz
#		Make the mysql library detection portable
#		https://savannah.cern.ch/bugs/?54438
Patch0:		%{name}-mysqllib.patch
#		Add proper LDFLAGS
#		https://savannah.cern.ch/bugs/?54439
Patch1:		%{name}-module.patch
#		Fix underquoted macro
#		https://savannah.cern.ch/bugs/?54440
Patch2:		%{name}-underquote.patch
#		Add missing library to avoid undefined symbols
#		https://savannah.cern.ch/bugs/?54441
Patch3:		%{name}-crypto.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	voms-server%{?_isa}
BuildRequires:	libtool
BuildRequires:	mysql-devel%{?_isa}
BuildRequires:	openssl%{?_isa}

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers the MySQL implementation for the VOMS server.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Fix directory hardwiring
for f in `find . -name Makefile.am`; do
    sed	-e 's!\(^sysconfdir *= *\)\$(prefix)/etc!\1 at sysconfdir@!' -i $f
done

./bootstrap

%build
%configure --libdir=%{_libdir}/voms --sysconfdir=%{_datadir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.a
rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/voms/voms-mysql.data
%{_datadir}/voms/voms-mysql-compat.data
%dir %{_libdir}/voms
%{_libdir}/voms/libvomsmysql.so

%changelog
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.

* Tue Jun 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:09:53 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:52:09 -0000	1.2
@@ -0,0 +1 @@
+voms-mysql-plugin-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:09:53 -0000	1.1
+++ sources	10 Sep 2009 02:52:09 -0000	1.2
@@ -0,0 +1 @@
+b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:53:41 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:53:41 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/EL-5 import.log, NONE,
	1.1 voms-mysql-plugin-crypto.patch, NONE,
	1.1 voms-mysql-plugin-module.patch, NONE,
	1.1 voms-mysql-plugin-mysqllib.patch, NONE,
	1.1 voms-mysql-plugin-underquote.patch, NONE,
	1.1 voms-mysql-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910025341.C60EB11C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25075/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-mysql-plugin-crypto.patch 
	voms-mysql-plugin-module.patch 
	voms-mysql-plugin-mysqllib.patch 
	voms-mysql-plugin-underquote.patch voms-mysql-plugin.spec 
Log Message:
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.



--- NEW FILE import.log ---
voms-mysql-plugin-3_1_1-1_fc11:EL-5:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551193

voms-mysql-plugin-crypto.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-crypto.patch ---
diff -ur voms-mysql-plugin-3.1.1.orig/src/Makefile.am voms-mysql-plugin-3.1.1/src/Makefile.am
--- voms-mysql-plugin-3.1.1.orig/src/Makefile.am	2009-08-16 06:31:47.000000000 +0200
+++ voms-mysql-plugin-3.1.1/src/Makefile.am	2009-08-16 06:32:38.000000000 +0200
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
-libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LIBADD = $(MYSQL_LIBS) -lcrypto
 libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)

voms-mysql-plugin-module.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE voms-mysql-plugin-module.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/src/Makefile.am voms-mysql-plugin-3.1.0/src/Makefile.am
--- voms-mysql-plugin-3.1.0.orig/src/Makefile.am	2007-11-20 19:07:57.000000000 +0100
+++ voms-mysql-plugin-3.1.0/src/Makefile.am	2009-06-30 12:49:42.316374480 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
 libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)
 

voms-mysql-plugin-mysqllib.patch:
 mysql.m4 |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

--- NEW FILE voms-mysql-plugin-mysqllib.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/project/mysql.m4 voms-mysql-plugin-3.1.0/project/mysql.m4
--- voms-mysql-plugin-3.1.0.orig/project/mysql.m4	2007-11-20 16:15:32.000000000 +0100
+++ voms-mysql-plugin-3.1.0/project/mysql.m4	2009-07-01 07:08:58.782378737 +0200
@@ -37,10 +37,10 @@
     result=no
     ac_cv_mysql_valid=no
 
-    AC_PATH_PROG(PMYSQL,mysql,no,$MYSQL_BIN_PATH)
+    AC_PATH_PROG(PMYSQL,mysql_config,no,$MYSQL_BIN_PATH)
 
     if test "$PMYSQL" != "no" ; then
-        MYSQL_VERSION=`$PMYSQL --version | cut -d' ' -f6 | tr -cd '0-9.'`
+        MYSQL_VERSION=`$PMYSQL --version | tr -cd '0-9.'`
 
         mysql_version_between(3.0.0,$MYSQL_VERSION,3.999.999,
             mysql_greater_than_3=no,mysql_greater_than_3=yes)
@@ -53,20 +53,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
 
-    if test -n "$with_mysql_prefix" -a "$with_mysql_prefix" != "/usr" -a "x$result" = "xyes" ; then
-		MYSQL_CFLAGS="-I$with_mysql_prefix/include -I$with_mysql_prefix/include/mysql"
-		MYSQL_LIBS="-L$with_mysql_prefix/lib -L$with_mysql_prefix/lib/mysql"
-    else
-        MYSQL_CFLAGS=""
-	MYSQL_LIBS=""
-    fi
-
     if test "x$result" = "xyes" ; then
       if test "x$mysql_greater_than_3" = "xyes" ; then
-        MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient -lz"
+        MYSQL_CFLAGS=`$PMYSQL --include`
       else
-	MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient"
+        MYSQL_CFLAGS=`$PMYSQL --cflags`
       fi
+      MYSQL_LIBS=`$PMYSQL --libs`
         
       CFLAGS="$MYSQL_CFLAGS $CFLAGS"
       LIBS="$MYSQL_LIBS $LIBS"
@@ -94,8 +87,8 @@
         MYSQL_INSTALL_PATH=$with_mysql_prefix
 	ifelse([$3], , :, [$3])
     else
-	MYSQL_CFLAGS="-I/usr/include/mysql"
-	MYSQL_LIBS="-l/usr/lib/mysql"
+	MYSQL_CFLAGS=
+	MYSQL_LIBS=
 	ifelse([$4], , :, [$4])
     fi
 

voms-mysql-plugin-underquote.patch:
 glite.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-underquote.patch ---
--- voms-mysql-plugin-3.1.0.orig/project/glite.m4	2005-09-26 09:36:56.000000000 +0200
+++ voms-mysql-plugin-3.1.0/project/glite.m4	2009-07-01 07:19:47.816378148 +0200
@@ -4,7 +4,7 @@
 dnl - GLITE_CFLAGS
 dnl - DISTTAR
 
-AC_DEFUN(AC_GLITE,
+AC_DEFUN([AC_GLITE],
 [
     AC_ARG_WITH(glite_location,
         [  --with-glite-location=PFX     prefix where GLITE is installed. (/opt/glite)],


--- NEW FILE voms-mysql-plugin.spec ---
Name:		voms-mysql-plugin
Version:	3.1.1
Release:	1%{?dist}
Summary:	VOMS server plugin for MySQL

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms-mysql_R_3_1_1 \
#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
#		  voms-mysql-plugin-3.1.1
Source:		%{name}-%{version}.tar.gz
#		Make the mysql library detection portable
#		https://savannah.cern.ch/bugs/?54438
Patch0:		%{name}-mysqllib.patch
#		Add proper LDFLAGS
#		https://savannah.cern.ch/bugs/?54439
Patch1:		%{name}-module.patch
#		Fix underquoted macro
#		https://savannah.cern.ch/bugs/?54440
Patch2:		%{name}-underquote.patch
#		Add missing library to avoid undefined symbols
#		https://savannah.cern.ch/bugs/?54441
Patch3:		%{name}-crypto.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	voms-server%{?_isa}
BuildRequires:	libtool
BuildRequires:	mysql-devel%{?_isa}
BuildRequires:	openssl%{?_isa}

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers the MySQL implementation for the VOMS server.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Fix directory hardwiring
for f in `find . -name Makefile.am`; do
    sed	-e 's!\(^sysconfdir *= *\)\$(prefix)/etc!\1 at sysconfdir@!' -i $f
done

./bootstrap

%build
%configure --libdir=%{_libdir}/voms --sysconfdir=%{_datadir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.a
rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/voms/voms-mysql.data
%{_datadir}/voms/voms-mysql-compat.data
%dir %{_libdir}/voms
%{_libdir}/voms/libvomsmysql.so

%changelog
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.

* Tue Jun 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:09:53 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:53:41 -0000	1.2
@@ -0,0 +1 @@
+voms-mysql-plugin-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:09:53 -0000	1.1
+++ sources	10 Sep 2009 02:53:41 -0000	1.2
@@ -0,0 +1 @@
+b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz



From ellert at fedoraproject.org  Thu Sep 10 02:55:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 10 Sep 2009 02:55:05 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/EL-4 import.log, NONE,
	1.1 voms-mysql-plugin-crypto.patch, NONE,
	1.1 voms-mysql-plugin-module.patch, NONE,
	1.1 voms-mysql-plugin-mysqllib.patch, NONE,
	1.1 voms-mysql-plugin-underquote.patch, NONE,
	1.1 voms-mysql-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910025505.C241B11C00CE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26250/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-mysql-plugin-crypto.patch 
	voms-mysql-plugin-module.patch 
	voms-mysql-plugin-mysqllib.patch 
	voms-mysql-plugin-underquote.patch voms-mysql-plugin.spec 
Log Message:
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.



--- NEW FILE import.log ---
voms-mysql-plugin-3_1_1-1_fc11:EL-4:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551275

voms-mysql-plugin-crypto.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-crypto.patch ---
diff -ur voms-mysql-plugin-3.1.1.orig/src/Makefile.am voms-mysql-plugin-3.1.1/src/Makefile.am
--- voms-mysql-plugin-3.1.1.orig/src/Makefile.am	2009-08-16 06:31:47.000000000 +0200
+++ voms-mysql-plugin-3.1.1/src/Makefile.am	2009-08-16 06:32:38.000000000 +0200
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
-libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LIBADD = $(MYSQL_LIBS) -lcrypto
 libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)

voms-mysql-plugin-module.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE voms-mysql-plugin-module.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/src/Makefile.am voms-mysql-plugin-3.1.0/src/Makefile.am
--- voms-mysql-plugin-3.1.0.orig/src/Makefile.am	2007-11-20 19:07:57.000000000 +0100
+++ voms-mysql-plugin-3.1.0/src/Makefile.am	2009-06-30 12:49:42.316374480 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
 libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)
 

voms-mysql-plugin-mysqllib.patch:
 mysql.m4 |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

--- NEW FILE voms-mysql-plugin-mysqllib.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/project/mysql.m4 voms-mysql-plugin-3.1.0/project/mysql.m4
--- voms-mysql-plugin-3.1.0.orig/project/mysql.m4	2007-11-20 16:15:32.000000000 +0100
+++ voms-mysql-plugin-3.1.0/project/mysql.m4	2009-07-01 07:08:58.782378737 +0200
@@ -37,10 +37,10 @@
     result=no
     ac_cv_mysql_valid=no
 
-    AC_PATH_PROG(PMYSQL,mysql,no,$MYSQL_BIN_PATH)
+    AC_PATH_PROG(PMYSQL,mysql_config,no,$MYSQL_BIN_PATH)
 
     if test "$PMYSQL" != "no" ; then
-        MYSQL_VERSION=`$PMYSQL --version | cut -d' ' -f6 | tr -cd '0-9.'`
+        MYSQL_VERSION=`$PMYSQL --version | tr -cd '0-9.'`
 
         mysql_version_between(3.0.0,$MYSQL_VERSION,3.999.999,
             mysql_greater_than_3=no,mysql_greater_than_3=yes)
@@ -53,20 +53,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
 
-    if test -n "$with_mysql_prefix" -a "$with_mysql_prefix" != "/usr" -a "x$result" = "xyes" ; then
-		MYSQL_CFLAGS="-I$with_mysql_prefix/include -I$with_mysql_prefix/include/mysql"
-		MYSQL_LIBS="-L$with_mysql_prefix/lib -L$with_mysql_prefix/lib/mysql"
-    else
-        MYSQL_CFLAGS=""
-	MYSQL_LIBS=""
-    fi
-
     if test "x$result" = "xyes" ; then
       if test "x$mysql_greater_than_3" = "xyes" ; then
-        MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient -lz"
+        MYSQL_CFLAGS=`$PMYSQL --include`
       else
-	MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient"
+        MYSQL_CFLAGS=`$PMYSQL --cflags`
       fi
+      MYSQL_LIBS=`$PMYSQL --libs`
         
       CFLAGS="$MYSQL_CFLAGS $CFLAGS"
       LIBS="$MYSQL_LIBS $LIBS"
@@ -94,8 +87,8 @@
         MYSQL_INSTALL_PATH=$with_mysql_prefix
 	ifelse([$3], , :, [$3])
     else
-	MYSQL_CFLAGS="-I/usr/include/mysql"
-	MYSQL_LIBS="-l/usr/lib/mysql"
+	MYSQL_CFLAGS=
+	MYSQL_LIBS=
 	ifelse([$4], , :, [$4])
     fi
 

voms-mysql-plugin-underquote.patch:
 glite.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-underquote.patch ---
--- voms-mysql-plugin-3.1.0.orig/project/glite.m4	2005-09-26 09:36:56.000000000 +0200
+++ voms-mysql-plugin-3.1.0/project/glite.m4	2009-07-01 07:19:47.816378148 +0200
@@ -4,7 +4,7 @@
 dnl - GLITE_CFLAGS
 dnl - DISTTAR
 
-AC_DEFUN(AC_GLITE,
+AC_DEFUN([AC_GLITE],
 [
     AC_ARG_WITH(glite_location,
         [  --with-glite-location=PFX     prefix where GLITE is installed. (/opt/glite)],


--- NEW FILE voms-mysql-plugin.spec ---
Name:		voms-mysql-plugin
Version:	3.1.1
Release:	1%{?dist}
Summary:	VOMS server plugin for MySQL

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is created from a CVS checkout:
#		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
#		  -r glite-security-voms-mysql_R_3_1_1 \
#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
#		  voms-mysql-plugin-3.1.1
Source:		%{name}-%{version}.tar.gz
#		Make the mysql library detection portable
#		https://savannah.cern.ch/bugs/?54438
Patch0:		%{name}-mysqllib.patch
#		Add proper LDFLAGS
#		https://savannah.cern.ch/bugs/?54439
Patch1:		%{name}-module.patch
#		Fix underquoted macro
#		https://savannah.cern.ch/bugs/?54440
Patch2:		%{name}-underquote.patch
#		Add missing library to avoid undefined symbols
#		https://savannah.cern.ch/bugs/?54441
Patch3:		%{name}-crypto.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	voms-server%{?_isa}
BuildRequires:	libtool
BuildRequires:	mysql-devel%{?_isa}
BuildRequires:	openssl%{?_isa}

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers the MySQL implementation for the VOMS server.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Fix directory hardwiring
for f in `find . -name Makefile.am`; do
    sed	-e 's!\(^sysconfdir *= *\)\$(prefix)/etc!\1 at sysconfdir@!' -i $f
done

./bootstrap

%build
%configure --libdir=%{_libdir}/voms --sysconfdir=%{_datadir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.a
rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/voms/voms-mysql.data
%{_datadir}/voms/voms-mysql-compat.data
%dir %{_libdir}/voms
%{_libdir}/voms/libvomsmysql.so

%changelog
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.

* Tue Jun 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:09:53 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:55:05 -0000	1.2
@@ -0,0 +1 @@
+voms-mysql-plugin-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:09:53 -0000	1.1
+++ sources	10 Sep 2009 02:55:05 -0000	1.2
@@ -0,0 +1 @@
+b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz



From wtogami at fedoraproject.org  Thu Sep 10 02:57:38 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 02:57:38 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.46, 1.47 sources, 1.45,
	1.46 spamassassin.spec, 1.118, 1.119
Message-ID: <20090910025738.7D37511C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26956

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
- numerous bugs fixed
- this snapshot is used during masscheck underway until
  September 17th in order to determine the base scores for spamassassin-3.3.0.
  Your participation is needed!  Please read  http://wiki.apache.org/spamassassin/RescoreDetails



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	10 Aug 2009 04:26:00 -0000	1.46
+++ .cvsignore	10 Sep 2009 02:57:38 -0000	1.47
@@ -1,2 +1 @@
-Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
-Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+mcsnapshot.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	10 Aug 2009 04:26:00 -0000	1.45
+++ sources	10 Sep 2009 02:57:38 -0000	1.46
@@ -1,2 +1 @@
-1b396a9df1faa22185263c7526fe6042  Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
-daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+57a321c63b1a97ee43d33a3bddced6d1  mcsnapshot.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- spamassassin.spec	21 Aug 2009 15:55:48 -0000	1.118
+++ spamassassin.spec	10 Sep 2009 02:57:38 -0000	1.119
@@ -35,12 +35,14 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename alpha2
-Release: 0.6.alpha2%{?dist}
+%define prename mcsnapshot
+Release: 0.7.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
+#Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
+# Temporary tarball before alpha3
+Source0: mcsnapshot.tgz
 Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
@@ -110,7 +112,9 @@ To filter spam for all users, add that l
 (creating if necessary).
 
 %prep
-%setup -q -n Mail-SpamAssassin-%{version}
+#%setup -q -n Mail-SpamAssassin-%{version}
+# Temporary before alpha3
+%setup -q -n mcsnapshot
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
@@ -222,6 +226,12 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.7.mcsnapshot
+- numerous bugs fixed
+- this snapshot is used during masscheck underway until
+  September 17th in order to determine the base scores for spamassassin-3.3.0.
+  Your participation is needed!  Please read  http://wiki.apache.org/spamassassin/RescoreDetails
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-0.6.alpha2
 - rebuilt with new openssl
 



From cwickert at fedoraproject.org  Thu Sep 10 03:01:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 03:01:34 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch, NONE,
	1.1 xfce4-settings-4.6.1-fix-timeout-startup.patch, NONE,
	1.1 xfce4-settings-4.6.1-xkl.patch, NONE, 1.1
Message-ID: <20090910030134.6665F11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27940

Added Files:
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch 
	xfce4-settings-4.6.1-fix-timeout-startup.patch 
	xfce4-settings-4.6.1-xkl.patch 
Log Message:
add patches

xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch:
 xfce-keyboard-settings.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch ---
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index d372ee9..d1cb69c 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -322,7 +322,7 @@ xfce_keyboard_settings_constructed (GObject *object)
   xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Rate", G_TYPE_INT, G_OBJECT (xkb_key_repeat_rate_scale), "value");
 
   xkb_key_repeat_delay_scale = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (settings->priv->glade_xml, "xkb_key_repeat_delay_scale")));
-  xfconf_g_property_bind (settings->priv->keyboards_channel, "/DefaultKeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
+  xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
 
   /* XSETTINGS */
   net_cursor_blink_check = glade_xml_get_widget (settings->priv->glade_xml, "net_cursor_blink_check");

xfce4-settings-4.6.1-fix-timeout-startup.patch:
 main.c |  101 +++++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 31 deletions(-)

--- NEW FILE xfce4-settings-4.6.1-fix-timeout-startup.patch ---
commit fa550da4a52172b4074922a2962c44613e96e3f0
Author: kelnos <kelnos at a0aa69c2-05f4-0310-b83c-d5d913b14636>
Date:   Thu Jun 4 09:19:51 2009 +0000

    avoid timing out xfce4-session on startup (bug 5040)
    
    xfce4-settings-helper was trying to be clever to migrate itself from
    autostart to the actual session.  it was doing a poor job.  this should
    keep the cleverness, but make sure it always connects to the session
    manager and makes sure the SM can continue.  it also allows the copy of
    x-s-h that was started via the session (and not autostart) to force
    itself to start, even if it's already running.  the other instance will
    lose its hold on the selection, notice, and quit.
    
    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636

diff --git a/xfce4-settings-helper/main.c b/xfce4-settings-helper/main.c
index c0e7712..1553c58 100644
--- a/xfce4-settings-helper/main.c
+++ b/xfce4-settings-helper/main.c
@@ -60,7 +60,14 @@
 #include "displays.h"
 #endif
 
+#define SELECTION_NAME  "_XFCE_SETTINGS_HELPER"
 
+static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+                                                               GdkEvent *evt,
+                                                               gpointer user_data);
+
+
+static SessionClient *sm_client = NULL;
 
 static gboolean opt_version = FALSE;
 static gboolean opt_debug = FALSE;
@@ -124,15 +131,14 @@ xfce_settings_helper_set_autostart_enabled (gboolean enabled)
 }
 
 
-/* returns TRUE if we're now connected to the SM, FALSE otherwise */
+/* returns TRUE if we got started by the SM and our client ID was
+ * valid, FALSE otherwise */
 static gboolean
 xfce_settings_helper_connect_session (int argc,
                                       char **argv,
                                       const gchar *sm_client_id,
                                       gboolean debug_mode)
 {
-    SessionClient *sm_client;
-
     /* we can't be sure that the SM will save the session later, so we only
      * disable the autostart item if we're launching because we got *resumed*
      * from a previous session. */
@@ -148,69 +154,96 @@ xfce_settings_helper_connect_session (int argc,
     {
         g_warning ("Failed to connect to session manager");
         client_session_free (sm_client);
-        xfce_settings_helper_set_autostart_enabled (TRUE);
+        sm_client = NULL;
         return FALSE;
     }
 
     if (sm_client_id && !g_ascii_strcasecmp (sm_client_id, sm_client->given_client_id))
     {
         /* we passed a client id, and got the same one back, which means
-         * we were definitely restarted as a part of the session.  so
-         * it's safe to disable the autostart item. */
-        xfce_settings_helper_set_autostart_enabled (FALSE);
+         * we were definitely restarted as a part of the session. */
         return TRUE;
     }
 
-    /* otherwise, let's just ensure the autostart item is enabled. */
-    xfce_settings_helper_set_autostart_enabled (TRUE);
-
-    return TRUE;
+    return FALSE;
 }
 
 
+#ifdef GDK_WINDOWING_X11
+static GdkFilterReturn
+xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+                                        GdkEvent *evt,
+                                        gpointer user_data)
+{
+    Window xwin = GPOINTER_TO_UINT(user_data);
+    XEvent *xe = (XEvent *)xevt;
+
+    if (xe->type == SelectionClear && xe->xclient.window == xwin)
+    {
+        if (sm_client)
+            client_session_set_restart_style (sm_client, SESSION_RESTART_IF_RUNNING);
+        signal_handler (SIGINT, NULL);
+    }
+
+    return GDK_FILTER_CONTINUE;
+}
+#endif
+
 static gboolean
-xfce_settings_helper_acquire_selection ()
+xfce_settings_helper_acquire_selection (gboolean force)
 {
 #ifdef GDK_WINDOWING_X11
     GdkDisplay *gdpy = gdk_display_get_default ();
+    GtkWidget *invisible;
     Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
     GdkWindow *rootwin = gdk_screen_get_root_window (gdk_display_get_screen (gdpy, 0));
     Window xroot = GDK_WINDOW_XID (rootwin);
-    Window xwin;
-    Atom selection_atom, manager_atom;
+    GdkAtom selection_atom;
+    Atom selection_atom_x11;
     XClientMessageEvent xev;
 
-    xwin = XCreateSimpleWindow (dpy, xroot, -100, -100, 1, 1, 0, 0,
-                                XBlackPixel (GDK_DISPLAY (), 0));
-    XSelectInput (dpy, xwin, PropertyChangeMask | StructureNotifyMask);
+    selection_atom = gdk_atom_intern (SELECTION_NAME, FALSE);
+    selection_atom_x11 = gdk_x11_atom_to_xatom_for_display (gdpy, selection_atom);
+
+    /* can't use gdk for the selection owner here because it returns NULL
+     * if the selection owner is in another process */
+    if (!force && XGetSelectionOwner (dpy, selection_atom_x11) != None)
+        return FALSE;
 
-    selection_atom = XInternAtom (dpy, "_XFCE_SETTINGS_HELPER", False);
-    manager_atom = XInternAtom (dpy, "MANAGER", False);
+    invisible = gtk_invisible_new ();
+    gtk_widget_realize (invisible);
+    gtk_widget_add_events (invisible, GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK);
 
-    if (XGetSelectionOwner (dpy, selection_atom) != None)
+    if (!gdk_selection_owner_set_for_display (gdpy, invisible->window,
+                                              selection_atom, GDK_CURRENT_TIME,
+                                              TRUE))
     {
-        XDestroyWindow (dpy, xwin);
+        g_critical ("Unable to get selection " SELECTION_NAME);
+        gtk_widget_destroy (invisible);
         return FALSE;
     }
 
-    XSetSelectionOwner (dpy, selection_atom, xwin, CurrentTime);
-
-    if (XGetSelectionOwner (dpy, selection_atom) != xwin)
+    /* but we can use gdk here since we only care if it's our window */
+    if (gdk_selection_owner_get_for_display (gdpy, selection_atom) != invisible->window)
     {
-        XDestroyWindow (dpy, xwin);
+        gtk_widget_destroy (invisible);
         return FALSE;
     }
 
     xev.type = ClientMessage;
     xev.window = xroot;
-    xev.message_type = manager_atom;
+    xev.message_type = gdk_x11_get_xatom_by_name_for_display (gdpy, "MANAGER");
     xev.format = 32;
     xev.data.l[0] = CurrentTime;
-    xev.data.l[1] = selection_atom;
-    xev.data.l[2] = xwin;
+    xev.data.l[1] = selection_atom_x11;
+    xev.data.l[2] = GDK_WINDOW_XID (invisible->window);
     xev.data.l[3] = xev.data.l[4] = 0;
 
     XSendEvent (dpy, xroot, False, StructureNotifyMask, (XEvent *)&xev);
+
+    gdk_window_add_filter (invisible->window,
+                           xfce_settings_helper_selection_watcher,
+                           GUINT_TO_POINTER (GDK_WINDOW_XID (invisible->window)));
 #endif
 
     return TRUE;
@@ -221,6 +254,7 @@ gint
 main (gint argc, gchar **argv)
 {
     GError     *error = NULL;
+    gboolean    in_session;
     GObject    *pointer_helper;
     GObject    *keyboards_helper;
     GObject    *accessibility_helper;
@@ -284,12 +318,19 @@ main (gint argc, gchar **argv)
         return EXIT_FAILURE;
     }
 
-    if (!xfce_settings_helper_acquire_selection ())
+    /* connect to session always, even if we quit below.  this way the
+     * session manager won't wait for us to time out. */
+    in_session = xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
+
+    if (!xfce_settings_helper_acquire_selection (in_session))
     {
         g_printerr ("%s is already running\n", G_LOG_DOMAIN);
         return EXIT_FAILURE;
     }
 
+    /* if we were restarted as part of the session, remove us from autostart */
+    xfce_settings_helper_set_autostart_enabled (!in_session);
+
     /* daemonize the process when not running in debug mode */
     if (!opt_debug)
     {
@@ -308,8 +349,6 @@ main (gint argc, gchar **argv)
         }
     }
 
-    xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
-
     /* create the sub daemons */
     pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL);
     keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL);

xfce4-settings-4.6.1-xkl.patch:
 xfce-keyboard-settings.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-settings-4.6.1-xkl.patch ---
diff -Nur xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-03-02 10:48:00.000000000 -0700
+++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-07-03 13:24:25.000000000 -0600
@@ -378,7 +378,7 @@
   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
 
   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
-  xkl_config_registry_load (settings->priv->xkl_registry);
+  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
 
   /* Tab */
   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");



From salimma at fedoraproject.org  Thu Sep 10 03:04:02 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 10 Sep 2009 03:04:02 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.32,1.33
Message-ID: <20090910030402.F15B011C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28387

Modified Files:
	llvm.spec 
Log Message:
* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.5.pre1
- Disable var tracking assignments on PPC



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- llvm.spec	9 Sep 2009 15:57:46 -0000	1.32
+++ llvm.spec	10 Sep 2009 03:04:02 -0000	1.33
@@ -5,7 +5,7 @@
 
 Name:           llvm
 Version:        2.6
-Release:        0.4.pre1%{?dist}
+Release:        0.5.pre1%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -169,6 +169,11 @@ popd
 # Disabling assertions now, rec. by pure and needed for OpenGTL
 # no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
 mkdir obj && cd obj
+%ifarch ppc
+CXXFLAGS="%{optflags} -fno-var-tracking-assignments" \
+%else
+CXXFLAGS="%{optflags}" \
+%endif
 ../configure \
   --prefix=%{_prefix} \
   --libdir=%{_libdir}/%{name} \
@@ -352,6 +357,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.5.pre1
+- Disable var tracking assignments on PPC
+
 * Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.4.pre1
 - Don't adjust clang include dir; files there are noarch (bz#521893)
 - Enable clang unit tests



From salimma at fedoraproject.org  Thu Sep 10 03:09:22 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 10 Sep 2009 03:09:22 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.33,1.34
Message-ID: <20090910030922.201A711C0427@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29323

Modified Files:
	llvm.spec 
Log Message:
Disable var tracking assignment in the correct place



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- llvm.spec	10 Sep 2009 03:04:02 -0000	1.33
+++ llvm.spec	10 Sep 2009 03:09:21 -0000	1.34
@@ -169,11 +169,6 @@ popd
 # Disabling assertions now, rec. by pure and needed for OpenGTL
 # no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
 mkdir obj && cd obj
-%ifarch ppc
-CXXFLAGS="%{optflags} -fno-var-tracking-assignments" \
-%else
-CXXFLAGS="%{optflags}" \
-%endif
 ../configure \
   --prefix=%{_prefix} \
   --libdir=%{_libdir}/%{name} \
@@ -188,7 +183,12 @@ CXXFLAGS="%{optflags}" \
 # configure does not properly specify libdir
 sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
 
-make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
+make %{_smp_mflags} \
+%ifarch ppc
+  OPTIMIZE_OPTION="%{optflags} -fno-var-tracking-assignments"
+%else
+  OPTIMIZE_OPTION="%{optflags}"
+%endif
 
 
 %check



From cwickert at fedoraproject.org  Thu Sep 10 03:10:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 03:10:05 +0000 (UTC)
Subject: rpms/xfce4-diskperf-plugin/devel
	xfce4-diskperf-plugin-2.2.0-colors-at-startup.patch, NONE,
	1.1 xfce4-diskperf-plugin.spec, 1.19, 1.20
Message-ID: <20090910031005.3F06A11C043D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30353

Modified Files:
	xfce4-diskperf-plugin.spec 
Added Files:
	xfce4-diskperf-plugin-2.2.0-colors-at-startup.patch 
Log Message:
* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-5
- Fix custom bar colors at startup (bugzilla.xfce.org #3185)


xfce4-diskperf-plugin-2.2.0-colors-at-startup.patch:
 main.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xfce4-diskperf-plugin-2.2.0-colors-at-startup.patch ---
diff -Nur -x '*.orig' -x '*~' xfce4-diskperf-plugin-2.2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.2.0.new/panel-plugin/main.c
--- xfce4-diskperf-plugin-2.2.0/panel-plugin/main.c	2008-04-17 09:11:23.000000000 +0200
+++ xfce4-diskperf-plugin-2.2.0.new/panel-plugin/main.c	2008-06-14 12:52:45.000000000 +0200
@@ -553,6 +553,7 @@
     if ((value = xfce_rc_read_entry (rc, (CONF_READ_WRITE_COLOR), NULL))) {
         gdk_color_parse (value, poConf->aoColor + RW_DATA);
     }
+    SetMonitorBarColor (poPlugin);
 
     xfce_rc_close (rc);
 }				/* diskperf_read_config() */


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-diskperf-plugin.spec	27 Jul 2009 07:51:23 -0000	1.19
+++ xfce4-diskperf-plugin.spec	10 Sep 2009 03:10:05 -0000	1.20
@@ -1,12 +1,14 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.2.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/panel-plugins/{%name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+# http://bugzilla.xfce.org/show_bug.cgi?id=3185
+Patch0:		%{name}-2.2.0-colors-at-startup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90, libxfcegui4-devel >= 4.3.90, libxml2-devel
@@ -19,6 +21,7 @@ second) based on data provided by the ke
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 %build
 %configure --disable-static
@@ -39,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-5
+- Fix custom bar colors at startup (bugzilla.xfce.org #3185)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Thu Sep 10 03:18:28 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 03:18:28 +0000 (UTC)
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, 1.20, 
	1.21
Message-ID: <20090910031828.3D9E011C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv933

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
fix bugzilla #


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xfce4-diskperf-plugin.spec	10 Sep 2009 03:10:05 -0000	1.20
+++ xfce4-diskperf-plugin.spec	10 Sep 2009 03:18:27 -0000	1.21
@@ -7,7 +7,7 @@ Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/panel-plugins/{%name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-# http://bugzilla.xfce.org/show_bug.cgi?id=3185
+# http://bugzilla.xfce.org/show_bug.cgi?id=3074
 Patch0:		%{name}-2.2.0-colors-at-startup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-5
-- Fix custom bar colors at startup (bugzilla.xfce.org #3185)
+- Fix custom bar colors at startup (bugzilla.xfce.org #3074)
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From xulchris at fedoraproject.org  Thu Sep 10 03:22:06 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 03:22:06 +0000 (UTC)
Subject: rpms/php-pear-Numbers-Words/EL-5 .cvsignore, 1.2,
	1.3 php-pear-Numbers-Words.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090910032206.DF4AA11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Numbers-Words/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472/EL-5

Modified Files:
	.cvsignore php-pear-Numbers-Words.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jan 2007 07:40:51 -0000	1.2
+++ .cvsignore	10 Sep 2009 03:22:06 -0000	1.3
@@ -1 +1 @@
-Numbers_Words-0.15.0.tgz
+Numbers_Words-0.16.1.tgz


Index: php-pear-Numbers-Words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/EL-5/php-pear-Numbers-Words.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Numbers-Words.spec	23 Oct 2008 19:58:53 -0000	1.3
+++ php-pear-Numbers-Words.spec	10 Sep 2009 03:22:06 -0000	1.4
@@ -2,8 +2,8 @@
 %define pear_name Numbers_Words
 
 Name:           php-pear-Numbers-Words
-Version:        0.15.0
-Release:        4%{?dist}
+Version:        0.16.1
+Release:        1%{?dist}
 Summary:        Methods for spelling numerals in words
 
 Group:          Development/Languages
@@ -48,6 +48,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+sed -i 's/\r//' docdir/%{pear_name}/README
+sed -i 's/\r//' docdir/%{pear_name}/ChangeLog
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -81,6 +83,15 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 0.16.1-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 0.15.0-4
 - Update LICENSE file to version 3.01
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jan 2007 07:40:51 -0000	1.2
+++ sources	10 Sep 2009 03:22:06 -0000	1.3
@@ -1 +1 @@
-cd65db3d32d781b1a28a1d83b0ff1530  Numbers_Words-0.15.0.tgz
+ae1ccb8bed8f8716216be7eba891df7d  Numbers_Words-0.16.1.tgz



From xulchris at fedoraproject.org  Thu Sep 10 03:22:07 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 03:22:07 +0000 (UTC)
Subject: rpms/php-pear-Numbers-Words/F-10 .cvsignore, 1.2,
	1.3 php-pear-Numbers-Words.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090910032207.5A58D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Numbers-Words/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472/F-10

Modified Files:
	.cvsignore php-pear-Numbers-Words.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jan 2007 07:40:51 -0000	1.2
+++ .cvsignore	10 Sep 2009 03:22:06 -0000	1.3
@@ -1 +1 @@
-Numbers_Words-0.15.0.tgz
+Numbers_Words-0.16.1.tgz


Index: php-pear-Numbers-Words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/F-10/php-pear-Numbers-Words.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Numbers-Words.spec	23 Oct 2008 19:58:53 -0000	1.4
+++ php-pear-Numbers-Words.spec	10 Sep 2009 03:22:06 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name Numbers_Words
 
 Name:           php-pear-Numbers-Words
-Version:        0.15.0
-Release:        4%{?dist}
+Version:        0.16.1
+Release:        1%{?dist}
 Summary:        Methods for spelling numerals in words
 
 Group:          Development/Languages
@@ -48,6 +48,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+sed -i 's/\r//' docdir/%{pear_name}/README
+sed -i 's/\r//' docdir/%{pear_name}/ChangeLog
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -81,6 +83,15 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 0.16.1-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 0.15.0-4
 - Update LICENSE file to version 3.01
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jan 2007 07:40:51 -0000	1.2
+++ sources	10 Sep 2009 03:22:07 -0000	1.3
@@ -1 +1 @@
-cd65db3d32d781b1a28a1d83b0ff1530  Numbers_Words-0.15.0.tgz
+ae1ccb8bed8f8716216be7eba891df7d  Numbers_Words-0.16.1.tgz



From xulchris at fedoraproject.org  Thu Sep 10 03:22:07 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 03:22:07 +0000 (UTC)
Subject: rpms/php-pear-Numbers-Words/F-11 .cvsignore, 1.2,
	1.3 php-pear-Numbers-Words.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090910032207.887DE11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Numbers-Words/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472/F-11

Modified Files:
	.cvsignore php-pear-Numbers-Words.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jan 2007 07:40:51 -0000	1.2
+++ .cvsignore	10 Sep 2009 03:22:07 -0000	1.3
@@ -1 +1 @@
-Numbers_Words-0.15.0.tgz
+Numbers_Words-0.16.1.tgz


Index: php-pear-Numbers-Words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/F-11/php-pear-Numbers-Words.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Numbers-Words.spec	26 Feb 2009 21:59:21 -0000	1.5
+++ php-pear-Numbers-Words.spec	10 Sep 2009 03:22:07 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name Numbers_Words
 
 Name:           php-pear-Numbers-Words
-Version:        0.15.0
-Release:        5%{?dist}
+Version:        0.16.1
+Release:        1%{?dist}
 Summary:        Methods for spelling numerals in words
 
 Group:          Development/Languages
@@ -48,6 +48,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+sed -i 's/\r//' docdir/%{pear_name}/README
+sed -i 's/\r//' docdir/%{pear_name}/ChangeLog
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -81,6 +83,12 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 0.16.1-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jan 2007 07:40:51 -0000	1.2
+++ sources	10 Sep 2009 03:22:07 -0000	1.3
@@ -1 +1 @@
-cd65db3d32d781b1a28a1d83b0ff1530  Numbers_Words-0.15.0.tgz
+ae1ccb8bed8f8716216be7eba891df7d  Numbers_Words-0.16.1.tgz



From xulchris at fedoraproject.org  Thu Sep 10 03:22:07 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 03:22:07 +0000 (UTC)
Subject: rpms/php-pear-Numbers-Words/devel .cvsignore, 1.2,
	1.3 php-pear-Numbers-Words.spec, 1.6, 1.7 sources, 1.2, 1.3
Message-ID: <20090910032207.B24EE11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Numbers-Words/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472/devel

Modified Files:
	.cvsignore php-pear-Numbers-Words.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jan 2007 07:40:51 -0000	1.2
+++ .cvsignore	10 Sep 2009 03:22:07 -0000	1.3
@@ -1 +1 @@
-Numbers_Words-0.15.0.tgz
+Numbers_Words-0.16.1.tgz


Index: php-pear-Numbers-Words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/devel/php-pear-Numbers-Words.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-Numbers-Words.spec	26 Jul 2009 18:25:25 -0000	1.6
+++ php-pear-Numbers-Words.spec	10 Sep 2009 03:22:07 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name Numbers_Words
 
 Name:           php-pear-Numbers-Words
-Version:        0.15.0
-Release:        6%{?dist}
+Version:        0.16.1
+Release:        1%{?dist}
 Summary:        Methods for spelling numerals in words
 
 Group:          Development/Languages
@@ -48,6 +48,8 @@ rm -rf $RPM_BUILD_ROOT docdir
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+sed -i 's/\r//' docdir/%{pear_name}/README
+sed -i 's/\r//' docdir/%{pear_name}/ChangeLog
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -81,6 +83,9 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 0.16.1-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Numbers-Words/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jan 2007 07:40:51 -0000	1.2
+++ sources	10 Sep 2009 03:22:07 -0000	1.3
@@ -1 +1 @@
-cd65db3d32d781b1a28a1d83b0ff1530  Numbers_Words-0.15.0.tgz
+ae1ccb8bed8f8716216be7eba891df7d  Numbers_Words-0.16.1.tgz



From mclasen at fedoraproject.org  Thu Sep 10 03:32:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Sep 2009 03:32:51 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.285,1.286
Message-ID: <20090910033251.97CE711C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3225

Modified Files:
	nautilus.spec 
Log Message:
fix desktop files



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- nautilus.spec	7 Sep 2009 09:51:34 -0000	1.285
+++ nautilus.spec	10 Sep 2009 03:32:51 -0000	1.286
@@ -14,7 +14,7 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.27.92
+Version: 	2.27.93
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -164,16 +164,11 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 ## (uncomment when we patch the source to look in the right place)
 ## /bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/nautilus/patterns
 
-# desktop-file-install can't handle empty OnlyShowIn correctly
-perl -pi -e 's/OnlyShowIn=;/OnlyShowIn=GNOME;/' $RPM_BUILD_ROOT%{_datadir}/applications/nautilus-folder-default-handler.desktop
-
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-perl -pi -e 's/OnlyShowIn=GNOME;/OnlyShowIn=;/' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-nautilus-folder-handler.desktop
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=571417
 cat >>$RPM_BUILD_ROOT%{_datadir}/applications/gnome-nautilus.desktop <<EOF
 AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
@@ -261,6 +256,9 @@ fi
 
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-2
+- Fix desktop files to be valid
+
 * Mon Sep  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 



From salimma at fedoraproject.org  Thu Sep 10 03:41:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 10 Sep 2009 03:41:15 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.34,1.35
Message-ID: <20090910034115.0FE3B11C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4908

Modified Files:
	llvm.spec 
Log Message:
Since clang tests are still failing even on x86, enable them unconditionally
on all platforms (but don't terminate build on error)



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- llvm.spec	10 Sep 2009 03:09:21 -0000	1.34
+++ llvm.spec	10 Sep 2009 03:41:14 -0000	1.35
@@ -196,9 +196,9 @@ make %{_smp_mflags} \
 # http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
 %ifnarch ppc
 cd obj && make check
+%endif
 # some clang tests still fail, preserve test results
 (cd tools/clang && make test 2>&1) | tee ../testlog.txt || true
-%endif
 
 
 %install



From mclasen at fedoraproject.org  Thu Sep 10 03:44:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Sep 2009 03:44:16 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.286,1.287
Message-ID: <20090910034416.2AD8811C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5515

Modified Files:
	nautilus.spec 
Log Message:
fix typo



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- nautilus.spec	10 Sep 2009 03:32:51 -0000	1.286
+++ nautilus.spec	10 Sep 2009 03:44:15 -0000	1.287
@@ -14,8 +14,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.27.93
-Release:	1%{?dist}
+Version: 	2.27.92
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2



From transif at fedoraproject.org  Thu Sep 10 03:56:22 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 10 Sep 2009 03:56:22 +0000 (UTC)
Subject: comps/po as.po,1.21,1.22
Message-ID: <20090910035622.BC0DF11C00CE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7850/po

Modified Files:
	as.po 
Log Message:
Sending translation for Assamese


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 as.poIndex: as.po
===================================================================
RCS file: /cvs/pkgs/comps/po/as.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- as.po	27 May 2009 08:46:48 -0000	1.21
+++ as.po	10 Sep 2009 03:56:22 -0000	1.22
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.po to Assamese
+# translation of comps.HEAD.as.po to Assamese
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -7,312 +7,333 @@
 # Amitakhya Phukan <aphukan at fedoraproject.org>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD\n"
+"Project-Id-Version: comps.HEAD.as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 08:22+0000\n"
-"PO-Revision-Date: 2009-05-27 08:45+0530\n"
+"POT-Creation-Date: 2009-09-06 08:20+0000\n"
+"PO-Revision-Date: 2009-09-07 21:21+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
-"Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
+"Language-Team: Assamese\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"
+"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
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "??? ??????? ??????'? ?????? ?? ????? ???????? ??????? ????? ??? ??? ?"
+msgstr "??? ??????? ??????'? ?????? ?? ????? ???????? ??????? ????? ??? ??? ?"
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "?????????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "??????? ???????? ???? ?????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ????? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "?????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???? ??? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "??? ???????????????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ???'??????? ????? ????? ?????? ?"
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "?????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "????????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "???????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ????????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Buildsystem ???????? ??????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "???????? ????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
[...1871 lines suppressed...]
-#: ../comps-f11.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ??????? ??????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1376,7 +1485,8 @@ msgstr ""
 "?? ??? Windows ??????? ????? ???????????? cross-compiling ? ??????, ?????? ??????? "
 "???, ??? ???????? ?????? ???, ???? Fedora ? ?????? ?"
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1384,95 +1494,156 @@ msgstr ""
 "Objective CAML ??????????? ???? ??? ????????? ??????? ??? ?????????? ????? ???? "
 "?????? ?"
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ????? ??????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ????? ??????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "?? ??? ?'???? ????????, ???????, ?????????, ??? ??? ????? ???????? ?????? ?"
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ????? ??????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "???? ?'??????? ????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "GNOME ??????'?? ???????? Critical Path-? ????????? ??????????? ???????? ????? ?"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "Fedora-? ???? ?????? ???????? Critical Path-? ????????? ??????????? ???????? ????? ?"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "????? ??? ???????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ???????????? ??? ??????? ???? ??????? ????? ??? ???????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (Base)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????????? ????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ????, ????? ????????????? ?????? ???? ??????, ?????? ?????? ?? ????? "
+"?????????? ???? ??????? ???? ??? ?????????? X11 ??????'? ?????? ?"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "?????? ??? ????????????? ???????????? ???? ?"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ??????'? ??????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "NetBook/NetTop/MID ??????? ???? ???????????? ??????'? ?????? Moblin ?"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????? ???????? ???? ????????? ?"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "????? ??? ?????????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
 "GNOME ??? ?????????, ?????????? ????????????? ????? ?????? ?'? ??????????? ??? ??? "
 "?????, ???????, ???????????????? ??????? ????????? ??? ??? ?????????? ????????? ??????? "
-"?"
+" ?"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
 "KDE ??? ?????????, ?????????? ????????????? ????? ?????? ?'? ??????????? ??? ??? "
 "?????, ???????, ???????????????? ??????? ????????? ??? ??? ?????????? ????????? ??????? "
-"?"
+" ?"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr ""
 "???????? ??? ??????? ?????? ???, ?? ?????????????? ?????? ??????? ?????? ??? ??????? "
-"????'?? ????? ??? ? ???? ??????????? ?? ??? Emacs ??? Vi ?"
+"????'?? ????? ??? ? ???? ??????????? ?? ??? Emacs ??? Vi ?"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "X?????? ??? ???????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
 "?? ?????? ????? ?????? DocBook ?????? ???? ?????? ??? HTML, PDF, Postscript ??? "
-"????? ???? ?????????? ????'?? ????? ??? ?"
+"????? ???? ?????????? ????'?? ????? ??? ?"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "???? ??????????? ????? ???? ??'????? ????? ???? ??? ?????? ?? ?"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?? ??? ??????? ??????? ???? ??????? ??? ?????? ??? ?????? ?"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?? ??? ??? ??????? ???? ??????? ??? ?????? ??? ?????? ?"
 



From mclasen at fedoraproject.org  Thu Sep 10 03:57:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Sep 2009 03:57:35 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.485,1.486
Message-ID: <20090910035735.BA55011C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7995

Modified Files:
	control-center.spec 
Log Message:
fix desktop files to be valid and fix a nonexisting icon



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -p -r1.485 -r1.486
--- control-center.spec	10 Sep 2009 00:07:26 -0000	1.485
+++ control-center.spec	10 Sep 2009 03:57:35 -0000	1.486
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -225,7 +225,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-nee
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+r -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -238,22 +238,19 @@ for i in apps_gnome_settings_daemon_defa
 	    rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/$i ;	\
 done
 
-# Add a "valid" OnlyShowIn entry, otherwise desktop-file-install complains
-sed -i -e "s/OnlyShowIn=;/OnlyShowIn=GNOME;/"  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-theme-installer.desktop
-
 desktop-file-install --vendor gnome --delete-original			\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications				\
   --add-only-show-in GNOME						\
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
-sed -i -e "s/OnlyShowIn=GNOME;/OnlyShowIn=;/"  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-theme-installer.desktop
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=161489
 sed -i -e "s/OnlyShowIn=GNOME;//"  \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-default-applications.desktop
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=594710
+sed -i -e "s/Icon=gnome-settings-theme/Icon=preferences-desktop-theme/" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-theme-installer.desktop
+
 # we do want this
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
 
@@ -387,6 +384,9 @@ fi
 
 
 %changelog
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-6
+- Fix desktop files to be valid, and fix nonexisting icon
+
 * Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-5
 - Update "gecos" about-me patch to apply
 



From xulchris at fedoraproject.org  Thu Sep 10 04:02:59 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 04:02:59 +0000 (UTC)
Subject: rpms/php-pear-Pager/EL-5 .cvsignore, 1.6, 1.7 php-pear-Pager.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090910040259.2B5DD11C00E6@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9638/EL-5

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Sep 2008 00:46:38 -0000	1.6
+++ .cvsignore	10 Sep 2009 04:02:58 -0000	1.7
@@ -1 +1 @@
-Pager-2.4.7.tgz
+Pager-2.4.8.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/EL-5/php-pear-Pager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Pager.spec	13 Sep 2008 00:46:38 -0000	1.5
+++ php-pear-Pager.spec	10 Sep 2009 04:02:58 -0000	1.6
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.7
+Version:        2.4.8
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -82,6 +82,15 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 2.4.8-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 2.4.7-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Sep 2008 00:46:38 -0000	1.6
+++ sources	10 Sep 2009 04:02:58 -0000	1.7
@@ -1 +1 @@
-412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz
+c8b03ee32ef9fdda4d2f8ffc54556fad  Pager-2.4.8.tgz



From xulchris at fedoraproject.org  Thu Sep 10 04:02:59 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 04:02:59 +0000 (UTC)
Subject: rpms/php-pear-Pager/F-10 .cvsignore, 1.6, 1.7 php-pear-Pager.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090910040259.70C0011C00E6@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9638/F-10

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Sep 2008 00:46:39 -0000	1.6
+++ .cvsignore	10 Sep 2009 04:02:59 -0000	1.7
@@ -1 +1 @@
-Pager-2.4.7.tgz
+Pager-2.4.8.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-10/php-pear-Pager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Pager.spec	13 Sep 2008 00:46:39 -0000	1.5
+++ php-pear-Pager.spec	10 Sep 2009 04:02:59 -0000	1.6
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.7
+Version:        2.4.8
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -82,6 +82,15 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 2.4.8-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 2.4.7-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Sep 2008 00:46:39 -0000	1.6
+++ sources	10 Sep 2009 04:02:59 -0000	1.7
@@ -1 +1 @@
-412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz
+c8b03ee32ef9fdda4d2f8ffc54556fad  Pager-2.4.8.tgz



From xulchris at fedoraproject.org  Thu Sep 10 04:02:59 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 04:02:59 +0000 (UTC)
Subject: rpms/php-pear-Pager/F-11 .cvsignore, 1.6, 1.7 php-pear-Pager.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090910040259.C3FD711C00E6@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9638/F-11

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Sep 2008 00:46:39 -0000	1.6
+++ .cvsignore	10 Sep 2009 04:02:59 -0000	1.7
@@ -1 +1 @@
-Pager-2.4.7.tgz
+Pager-2.4.8.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-11/php-pear-Pager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-Pager.spec	26 Feb 2009 22:06:04 -0000	1.6
+++ php-pear-Pager.spec	10 Sep 2009 04:02:59 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.7
-Release:        2%{?dist}
+Version:        2.4.8
+Release:        1%{?dist}
 Summary:        Data paging class
 
 Group:          Development/Libraries
@@ -82,6 +82,12 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 2.4.8-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Sep 2008 00:46:39 -0000	1.6
+++ sources	10 Sep 2009 04:02:59 -0000	1.7
@@ -1 +1 @@
-412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz
+c8b03ee32ef9fdda4d2f8ffc54556fad  Pager-2.4.8.tgz



From xulchris at fedoraproject.org  Thu Sep 10 04:03:00 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Thu, 10 Sep 2009 04:03:00 +0000 (UTC)
Subject: rpms/php-pear-Pager/devel .cvsignore, 1.6, 1.7 php-pear-Pager.spec, 
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090910040300.300E311C00E6@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9638/devel

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Sep 2008 00:46:39 -0000	1.6
+++ .cvsignore	10 Sep 2009 04:02:59 -0000	1.7
@@ -1 +1 @@
-Pager-2.4.7.tgz
+Pager-2.4.8.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/devel/php-pear-Pager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-Pager.spec	26 Jul 2009 18:26:59 -0000	1.7
+++ php-pear-Pager.spec	10 Sep 2009 04:02:59 -0000	1.8
@@ -2,8 +2,8 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.7
-Release:        3%{?dist}
+Version:        2.4.8
+Release:        1%{?dist}
 Summary:        Data paging class
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@ fi
 
 
 %changelog
+* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 2.4.8-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Sep 2008 00:46:39 -0000	1.6
+++ sources	10 Sep 2009 04:02:59 -0000	1.7
@@ -1 +1 @@
-412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz
+c8b03ee32ef9fdda4d2f8ffc54556fad  Pager-2.4.8.tgz



From salimma at fedoraproject.org  Thu Sep 10 04:08:51 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 10 Sep 2009 04:08:51 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.35,1.36
Message-ID: <20090910040851.3B33D11C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32583

Modified Files:
	llvm.spec 
Log Message:
Run clang test from correct directory



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- llvm.spec	10 Sep 2009 03:41:14 -0000	1.35
+++ llvm.spec	10 Sep 2009 04:08:51 -0000	1.36
@@ -194,8 +194,9 @@ make %{_smp_mflags} \
 %check
 # some tests fail on PPC
 # http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
+cd obj
 %ifnarch ppc
-cd obj && make check
+make check
 %endif
 # some clang tests still fail, preserve test results
 (cd tools/clang && make test 2>&1) | tee ../testlog.txt || true



From mdomsch at fedoraproject.org  Thu Sep 10 04:13:54 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 10 Sep 2009 04:13:54 +0000 (UTC)
Subject: rpms/dkms/EL-5 .cvsignore, 1.11, 1.12 dkms.spec, 1.15, 1.16 sources,
	1.11, 1.12
Message-ID: <20090910041354.2A04411C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1134

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.1.0.1, fixes mkrpm command


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Aug 2009 17:30:54 -0000	1.11
+++ .cvsignore	10 Sep 2009 04:13:53 -0000	1.12
@@ -1 +1 @@
-dkms_2.1.0.0.orig.tar.gz
+dkms_2.1.0.1.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-5/dkms.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dkms.spec	22 Aug 2009 17:30:54 -0000	1.15
+++ dkms.spec	10 Sep 2009 04:13:53 -0000	1.16
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.1.0.0
+Version: 2.1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Sep  9 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.1-1
+- fix mkrpm command, with thanks to Thomas Chenault.
+
 * Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
 - update to latest upstream
 - drop Requires: lsb.  avoid calling rpm (recursively) if possible.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Aug 2009 17:30:54 -0000	1.11
+++ sources	10 Sep 2009 04:13:53 -0000	1.12
@@ -1 +1 @@
-16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz
+efeb0f9537ccc5de9c12b66dd0ede880  dkms_2.1.0.1.orig.tar.gz



From iankent at fedoraproject.org  Thu Sep 10 04:14:59 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 10 Sep 2009 04:14:59 +0000 (UTC)
Subject: rpms/autofs/F-11 autofs-5.0.4-special-case-cifs-escapes.patch, NONE,
	1.1 autofs.spec, 1.288, 1.289
Message-ID: <20090910041459.69F6511C00DB@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1412

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-special-case-cifs-escapes.patch 
Log Message:
* Wed Sep 10 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-39
- special case cifs mount location escaping (bz522109).


autofs-5.0.4-special-case-cifs-escapes.patch:
 CHANGELOG               |    1 +
 modules/mount_generic.c |   36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

--- NEW FILE autofs-5.0.4-special-case-cifs-escapes.patch ---
autofs-5.0.4 - special case cifs escapes

From: Ian Kent <raven at themaw.net>

Since "\" is a valid seperator for cifs shares it can't be used to escape
characters in the share name passed to mount.cifs. So we have no choice
but to require that the seperator we use is "/" and de-quote the string
before sending it to mount.cifs.
---

 CHANGELOG               |    1 +
 modules/mount_generic.c |   36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)


--- autofs-5.0.4.orig/modules/mount_generic.c
+++ autofs-5.0.4/modules/mount_generic.c
@@ -39,6 +39,7 @@ int mount_mount(struct autofs_point *ap,
 {
 	char fullpath[PATH_MAX];
 	char buf[MAX_ERR_BUF];
+	char *loc;
 	int err;
 	int len, status, existed = 1;
 
@@ -74,22 +75,44 @@ int mount_mount(struct autofs_point *ap,
 	if (!status)
 		existed = 0;
 
+	/*
+	 * Special case quoting for cifs share names.
+	 *
+	 * Since "\" is a valid seperator for cifs shares it can't be
+	 * used to escape characters in the share name passed to
+	 * mount.cifs. So we have no choice but to require that the
+	 * seperator we use is "/" and de-quote the string before
+	 * sending it to mount.cifs.
+	 */
+	loc = NULL;
+	if (strcmp(fstype, "cifs"))
+		loc = strdup(what);
+	else
+		loc = dequote(what, strlen(what), ap->logopt);
+	if (!loc) {
+		error(ap->logopt,
+		      MODPREFIX "failed to alloc buffer for mount location");
+		return 1;
+	}
+
 	if (options && options[0]) {
 		debug(ap->logopt,
 		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
-		      fstype, options, what, fullpath);
+		      fstype, options, loc, fullpath);
 
 		err = spawn_mount(ap->logopt, "-t", fstype,
-			     SLOPPYOPT "-o", options, what, fullpath, NULL);
+			     SLOPPYOPT "-o", options, loc, fullpath, NULL);
 	} else {
 		debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s",
-		      fstype, what, fullpath);
-		err = spawn_mount(ap->logopt, "-t", fstype, what, fullpath, NULL);
+		      fstype, loc, fullpath);
+		err = spawn_mount(ap->logopt, "-t", fstype, loc, fullpath, NULL);
 	}
 
 	if (err) {
 		info(ap->logopt, MODPREFIX "failed to mount %s (type %s) on %s",
-		     what, fstype, fullpath);
+		     loc, fstype, fullpath);
+
+		free(loc);
 
 		if (ap->type != LKP_INDIRECT)
 			return 1;
@@ -100,7 +123,8 @@ int mount_mount(struct autofs_point *ap,
 		return 1;
 	} else {
 		info(ap->logopt, MODPREFIX "mounted %s type %s on %s",
-		    what, fstype, fullpath);
+		     loc, fstype, fullpath);
+		free(loc);
 		return 0;
 	}
 }
--- autofs-5.0.4.orig/CHANGELOG
+++ autofs-5.0.4/CHANGELOG
@@ -62,6 +62,7 @@
 - fix libxml2 non-thread-safe calls.
 - fix direct map cache locking.
 - fix dont umount existing direct mount on reread.
+- special case cifs escapes.
 
 4/11/2008 autofs-5.0.4
 -----------------------


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- autofs.spec	3 Sep 2009 08:32:46 -0000	1.288
+++ autofs.spec	10 Sep 2009 04:14:59 -0000	1.289
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 38
+Release: 39
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -75,6 +75,7 @@ Patch62: autofs-5.0.4-fix-pthread-push-o
 Patch63: autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch
 Patch64: autofs-5.0.4-fix-direct-map-cache-locking.patch
 Patch65: autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch
+Patch66: autofs-5.0.4-special-case-cifs-escapes.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
@@ -181,6 +182,7 @@ echo %{version}-%{release} > .version
 %patch63 -p1
 %patch64 -p1
 %patch65 -p1
+%patch66 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -233,6 +235,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Wed Sep 10 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-39
+- special case cifs mount location escaping (bz522109).
+
 * Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-38
 - fix libxml2 non-thread-safe calls.
 - fix direct map cache locking.



From ausil at fedoraproject.org  Thu Sep 10 04:15:19 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 10 Sep 2009 04:15:19 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1787,1.1788
Message-ID: <20090910041519.838FB11C00DB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1449

Modified Files:
	kernel.spec 
Log Message:
touch the dracut initrd file when using with_dracut



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1787
retrieving revision 1.1788
diff -u -p -r1.1787 -r1.1788
--- kernel.spec	10 Sep 2009 00:43:49 -0000	1.1787
+++ kernel.spec	10 Sep 2009 04:15:19 -0000	1.1788
@@ -1486,7 +1486,11 @@ EOF
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
+%if %{with_dracut}
+    touch $RPM_BUILD_ROOT/boot/dracut-$KernelVer.img
+%else
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+%endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
@@ -2006,6 +2010,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-2
+- touch the dracut initrd file when using %%{with_dracut}
+
 * Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-1
 - Linux 2.6.31
 



From iankent at fedoraproject.org  Thu Sep 10 04:17:53 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 10 Sep 2009 04:17:53 +0000 (UTC)
Subject: rpms/autofs/F-11 autofs.spec,1.289,1.290
Message-ID: <20090910041753.2503B11C00DB@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1996

Modified Files:
	autofs.spec 
Log Message:
* Wed Sep 10 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-40
- special case cifs mount location escaping (bz522109).
- fix revision number.



Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- autofs.spec	10 Sep 2009 04:14:59 -0000	1.289
+++ autofs.spec	10 Sep 2009 04:17:52 -0000	1.290
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 39
+Release: 40
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -235,7 +235,7 @@ fi
 %{_libdir}/autofs/
 
 %changelog
-* Wed Sep 10 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-39
+* Wed Sep 10 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-40
 - special case cifs mount location escaping (bz522109).
 
 * Thu Sep 3 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-38



From mdomsch at fedoraproject.org  Thu Sep 10 04:23:30 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 10 Sep 2009 04:23:30 +0000 (UTC)
Subject: rpms/dkms/EL-4 .cvsignore, 1.9, 1.10 dkms.spec, 1.12, 1.13 sources, 
	1.10, 1.11
Message-ID: <20090910042330.9ADD311C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2964

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.1.0.1, fixes mkrpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Aug 2009 17:32:25 -0000	1.9
+++ .cvsignore	10 Sep 2009 04:23:30 -0000	1.10
@@ -1 +1 @@
-dkms_2.1.0.0.orig.tar.gz
+dkms_2.1.0.1.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-4/dkms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dkms.spec	22 Aug 2009 17:32:25 -0000	1.12
+++ dkms.spec	10 Sep 2009 04:23:30 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.1.0.0
+Version: 2.1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Sep  9 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.1-1
+- fix mkrpm command, with thanks to Thomas Chenault.
+
 * Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
 - update to latest upstream
 - drop Requires: lsb.  avoid calling rpm (recursively) if possible.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	22 Aug 2009 17:32:25 -0000	1.10
+++ sources	10 Sep 2009 04:23:30 -0000	1.11
@@ -1 +1 @@
-16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz
+efeb0f9537ccc5de9c12b66dd0ede880  dkms_2.1.0.1.orig.tar.gz



From mdomsch at fedoraproject.org  Thu Sep 10 04:25:23 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 10 Sep 2009 04:25:23 +0000 (UTC)
Subject: rpms/dkms/devel .cvsignore, 1.16, 1.17 dkms.spec, 1.23, 1.24 sources,
	1.16, 1.17
Message-ID: <20090910042523.8E73911C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3465

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.1.0.1, fixes mkrpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Aug 2009 16:00:16 -0000	1.16
+++ .cvsignore	10 Sep 2009 04:25:23 -0000	1.17
@@ -1 +1 @@
-dkms_2.1.0.0.orig.tar.gz
+dkms_2.1.0.1.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dkms.spec	22 Aug 2009 16:00:16 -0000	1.23
+++ dkms.spec	10 Sep 2009 04:25:23 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.1.0.0
+Version: 2.1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Sep  9 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.1-1
+- fix mkrpm command, with thanks to Thomas Chenault.
+
 * Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
 - update to latest upstream
 - drop Requires: lsb.  avoid calling rpm (recursively) if possible.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	22 Aug 2009 16:00:16 -0000	1.16
+++ sources	10 Sep 2009 04:25:23 -0000	1.17
@@ -1 +1 @@
-16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz
+efeb0f9537ccc5de9c12b66dd0ede880  dkms_2.1.0.1.orig.tar.gz



From mdomsch at fedoraproject.org  Thu Sep 10 04:25:41 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 10 Sep 2009 04:25:41 +0000 (UTC)
Subject: rpms/dkms/F-11 .cvsignore, 1.16, 1.17 dkms.spec, 1.22, 1.23 sources,
	1.16, 1.17
Message-ID: <20090910042541.CC77F11C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3564

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.1.0.1, fixes mkrpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Aug 2009 18:05:23 -0000	1.16
+++ .cvsignore	10 Sep 2009 04:25:41 -0000	1.17
@@ -1 +1 @@
-dkms_2.1.0.0.orig.tar.gz
+dkms_2.1.0.1.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/dkms.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dkms.spec	22 Aug 2009 18:05:23 -0000	1.22
+++ dkms.spec	10 Sep 2009 04:25:41 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.1.0.0
+Version: 2.1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Sep  9 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.1-1
+- fix mkrpm command, with thanks to Thomas Chenault.
+
 * Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
 - update to latest upstream
 - drop Requires: lsb.  avoid calling rpm (recursively) if possible.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	22 Aug 2009 18:05:23 -0000	1.16
+++ sources	10 Sep 2009 04:25:41 -0000	1.17
@@ -1 +1 @@
-16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz
+efeb0f9537ccc5de9c12b66dd0ede880  dkms_2.1.0.1.orig.tar.gz



From jcollie at fedoraproject.org  Thu Sep 10 04:38:52 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 10 Sep 2009 04:38:52 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.55,1.56
Message-ID: <20090910043852.C7B6C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6068

Modified Files:
	asterisk.spec 
Log Message:
* Wed Sep  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-2
- Enable building of API docs.
- Depend on version 1.2 or newer of speex



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- asterisk.spec	7 Sep 2009 05:43:14 -0000	1.55
+++ asterisk.spec	10 Sep 2009 04:38:52 -0000	1.56
@@ -1,9 +1,8 @@
-%define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
 #define _rc 1
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1.6
-Release: 1%{?_rc:.rc%{_rc}}%{?dist}
+Release: 2%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -67,15 +66,13 @@ BuildRequires: gtk2-devel
 # for res_http_post
 BuildRequires: gmime-devel
 
-%if %{with_apidoc}
 # for building docs
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: graphviz-gd
-%endif
 
 # for codec_speex
-BuildRequires: speex-devel
+BuildRequires: speex-devel >= 1.2
 
 # for format_ogg_vorbis
 BuildRequires: libogg-devel
@@ -122,7 +119,6 @@ BuildRequires: alsa-lib-devel
 %description alsa
 Modules for Asterisk that use Alsa sound drivers.
 
-%if %{with_apidoc}
 %package apidoc
 Summary: API documentation for Asterisk
 Group: Applications/Internet
@@ -130,7 +126,6 @@ Requires: asterisk = %{version}-%{releas
 
 %description apidoc
 API documentation for Asterisk.
-%endif
 
 %package curl
 Summary: Modules for Asterisk that use cURL
@@ -486,12 +481,10 @@ mv apps/app_directory.so apps/app_direct
 touch apps/app_voicemail.o apps/app_directory.o
 touch apps/app_voicemail.so apps/app_directory.so
 
-%if %{with_apidoc}
 ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
 
 # fix dates so that we don't get multilib conflicts
 find doc/api/html -type f -print0 | xargs --null touch -r ChangeLog
-%endif
 
 %install
 rm -rf %{buildroot}
@@ -538,9 +531,7 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
 rm -rf %{buildroot}%{_sbindir}/hashtest
 rm -rf %{buildroot}%{_sbindir}/hashtest2
 
-%if %{with_apidoc}
 find doc/api/html -name \*.map -size 0 -delete
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -846,11 +837,9 @@ fi
 %config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
 %{_libdir}/asterisk/modules/chan_alsa.so
 
-%if %{with_apidoc}
 %files apidoc
 %defattr(-,root,root,-)
 %doc doc/api/html/*
-%endif
 
 %files curl
 %defattr(-,root,root,-)
@@ -1037,6 +1026,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Sep  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-2
+- Enable building of API docs.
+- Depend on version 1.2 or newer of speex
+
 * Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
 - Update to 1.6.1.6
 - Drop patches that are too troublesome to maintain anymore or have been integrated upstream.



From mdomsch at fedoraproject.org  Thu Sep 10 04:39:51 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 10 Sep 2009 04:39:51 +0000 (UTC)
Subject: rpms/dkms/F-10 .cvsignore, 1.15, 1.16 dkms.spec, 1.20, 1.21 sources,
	1.15, 1.16
Message-ID: <20090910043951.BEE8711C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6332

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	15 Apr 2009 04:57:10 -0000	1.15
+++ .cvsignore	10 Sep 2009 04:39:51 -0000	1.16
@@ -1 +1 @@
-dkms-2.0.21.1.tar.gz
+dkms_2.1.0.1.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-10/dkms.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- dkms.spec	15 Apr 2009 12:33:50 -0000	1.20
+++ dkms.spec	10 Sep 2009 04:39:51 -0000	1.21
@@ -1,17 +1,16 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.21.1
-Release: 2%{?dist}
+Version: 2.1.0.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99, lsb
+Requires: bash > 1.99
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
-Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
-Patch0: dkms-modprobe.d.patch
+Source0: http://linux.dell.com/dkms/permalink/dkms_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora}
@@ -26,8 +25,6 @@ module RPMS as originally developed by D
 %prep
 
 %setup -q
-%patch0 -p1
-
 %build
 
 %triggerpostun -- %{name} < 1.90.00-1
@@ -125,6 +122,18 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Sep  9 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.1-1
+- fix mkrpm command, with thanks to Thomas Chenault.
+
+* Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
+- update to latest upstream
+- drop Requires: lsb.  avoid calling rpm (recursively) if possible.
+- add recognition for Oracle Enterprise Linux, Oracle VM, Scientific
+  Linux, and VMware 3.x
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.21.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
 - add Requires: lsb
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 Apr 2009 04:57:10 -0000	1.15
+++ sources	10 Sep 2009 04:39:51 -0000	1.16
@@ -1 +1 @@
-539113eabf49356b9659c85512927519  dkms-2.0.21.1.tar.gz
+efeb0f9537ccc5de9c12b66dd0ede880  dkms_2.1.0.1.orig.tar.gz



From cwickert at fedoraproject.org  Thu Sep 10 04:51:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 04:51:51 +0000 (UTC)
Subject: rpms/orage/F-11 .cvsignore, 1.10, 1.11 orage.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20090910045151.598AD11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/orage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8131/F-11

Modified Files:
	.cvsignore orage.spec sources 
Log Message:
* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-1
- Update to 4.6.1
- Update package deskription
- Require dbus



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orage/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	27 Feb 2009 20:38:38 -0000	1.10
+++ .cvsignore	10 Sep 2009 04:51:51 -0000	1.11
@@ -1 +1 @@
-orage-4.6.0.tar.bz2
+orage-4.6.1.tar.bz2


Index: orage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orage/F-11/orage.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- orage.spec	27 Feb 2009 20:38:38 -0000	1.17
+++ orage.spec	10 Sep 2009 04:51:51 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -15,12 +15,17 @@ BuildRequires: gettext intltool
 BuildRequires: desktop-file-utils
 BuildRequires: db4-devel
 BuildRequires: libnotify-devel
+Requires: dbus
 
 Provides: xfcalendar = %{version}-%{release}
 Obsoletes: xfcalendar <= 4.2.3-3.fc6
 
 %description
-Time-managing application for Xfce4.
+Orage provides a calendar which integrates nicely into the Xfce Desktop 
+Environment. It is highly configurable and supports alerts based on dates. 
+It warns you with popup or audio alarm. As it is an application for every 
+day use it launches itself in the background as a daemon and can be accessed 
+using the Orage Clock plugin for the panel. 
 
 %prep
 %setup -q
@@ -32,7 +37,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}
 
 desktop-file-install --vendor fedora                            \
@@ -71,6 +76,14 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/orage.1.gz
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-1
+- Update to 4.6.1
+- Update package deskription
+- Require dbus
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orage/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Feb 2009 20:38:37 -0000	1.10
+++ sources	10 Sep 2009 04:51:51 -0000	1.11
@@ -1 +1 @@
-c3f71a922f9032119dbb1b37a09adf93  orage-4.6.0.tar.bz2
+24fa43dd86ec5af5a4766620fd972cf2  orage-4.6.1.tar.bz2



From cwickert at fedoraproject.org  Thu Sep 10 04:51:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 04:51:51 +0000 (UTC)
Subject: rpms/orage/devel .cvsignore, 1.10, 1.11 orage.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20090910045151.27C4911C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/orage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8131/d

Modified Files:
	.cvsignore orage.spec sources 
Log Message:
* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-1
- Update to 4.6.1
- Update package deskription
- Require dbus



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orage/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	27 Feb 2009 20:38:38 -0000	1.10
+++ .cvsignore	10 Sep 2009 04:51:50 -0000	1.11
@@ -1 +1 @@
-orage-4.6.0.tar.bz2
+orage-4.6.1.tar.bz2


Index: orage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orage/devel/orage.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- orage.spec	25 Jul 2009 20:58:29 -0000	1.18
+++ orage.spec	10 Sep 2009 04:51:50 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/orage-%{version}.tar.bz2
@@ -15,12 +15,17 @@ BuildRequires: gettext intltool
 BuildRequires: desktop-file-utils
 BuildRequires: db4-devel
 BuildRequires: libnotify-devel
+Requires: dbus
 
 Provides: xfcalendar = %{version}-%{release}
 Obsoletes: xfcalendar <= 4.2.3-3.fc6
 
 %description
-Time-managing application for Xfce4.
+Orage provides a calendar which integrates nicely into the Xfce Desktop 
+Environment. It is highly configurable and supports alerts based on dates. 
+It warns you with popup or audio alarm. As it is an application for every 
+day use it launches itself in the background as a daemon and can be accessed 
+using the Orage Clock plugin for the panel. 
 
 %prep
 %setup -q
@@ -32,7 +37,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}
 
 desktop-file-install --vendor fedora                            \
@@ -71,6 +76,11 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/orage.1.gz
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-1
+- Update to 4.6.1
+- Update package deskription
+- Require dbus
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orage/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Feb 2009 20:38:37 -0000	1.10
+++ sources	10 Sep 2009 04:51:50 -0000	1.11
@@ -1 +1 @@
-c3f71a922f9032119dbb1b37a09adf93  orage-4.6.0.tar.bz2
+24fa43dd86ec5af5a4766620fd972cf2  orage-4.6.1.tar.bz2



From cwickert at fedoraproject.org  Thu Sep 10 05:00:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 05:00:00 +0000 (UTC)
Subject: rpms/exo/devel exo.spec,1.37,1.38
Message-ID: <20090910050000.9EE7711C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10465

Modified Files:
	exo.spec 
Log Message:
* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
- Mount vfat and ntfs volumes with UTF-8 (#508823)
- Mount ntfs with ntfs-3g



Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- exo.spec	24 Jul 2009 22:25:58 -0000	1.37
+++ exo.spec	10 Sep 2009 05:00:00 -0000	1.38
@@ -3,14 +3,17 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 3%{?dist}
+Release: 4%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=5461
 Patch1: exo-0.3.101-url-quoting.patch
+# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
+Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -55,6 +58,7 @@ Python libraries and header files for th
 
 %patch0 -p1 -b .x86_64-build
 %patch1 -p1 -b .url-quoting
+%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -63,7 +67,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'
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
@@ -85,19 +89,19 @@ desktop-file-install                    
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/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
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
@@ -136,6 +140,10 @@ fi
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
+- Mount vfat and ntfs volumes with UTF-8 (#508823)
+- Mount ntfs with ntfs-3g
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.101-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Thu Sep 10 05:01:48 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 10 Sep 2009 05:01:48 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel .cvsignore, 1.5, 1.6 mingw32-libsoup.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090910050148.ECE2311C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10902

Modified Files:
	.cvsignore mingw32-libsoup.spec sources 
Log Message:
- Update to 2.27.92
- Dropped the workaround for GNOME BZ #593845



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Sep 2009 19:43:01 -0000	1.5
+++ .cvsignore	10 Sep 2009 05:01:48 -0000	1.6
@@ -1 +1 @@
-libsoup-2.27.91.tar.bz2
+libsoup-2.27.92.tar.bz2


Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-libsoup.spec	1 Sep 2009 21:39:21 -0000	1.7
+++ mingw32-libsoup.spec	10 Sep 2009 05:01:48 -0000	1.8
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:		mingw32-libsoup
-Version:	2.27.91
+Version:	2.27.92
 Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
@@ -18,9 +18,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildArch:	noarch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=593845
-Patch0:         libsoup-disable-get-testcase.patch
-
 BuildRequires:	mingw32-filesystem
 BuildRequires:	mingw32-gcc
 BuildRequires:	mingw32-binutils
@@ -58,7 +55,7 @@ Static version of the MinGW Windows Libs
 
 %prep
 %setup -q -n libsoup-%{version}
-%patch0 -p0
+
 
 %build
 # Libsoup can't build static and shared libraries in one go, so we build the package twice here
@@ -123,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.92-1
+- Update to 2.27.92
+- Dropped the workaround for GNOME BZ #593845
+
 * Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 19:43:01 -0000	1.5
+++ sources	10 Sep 2009 05:01:48 -0000	1.6
@@ -1 +1 @@
-58e5518a483fbef0b72f142e63f43e9f  libsoup-2.27.91.tar.bz2
+2e80693a4af29d4d82266b3327c5461a  libsoup-2.27.92.tar.bz2



From cwickert at fedoraproject.org  Thu Sep 10 05:03:46 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 05:03:46 +0000 (UTC)
Subject: rpms/exo/devel exo-0.3.101-default-mount-options.patch,NONE,1.1
Message-ID: <20090910050346.4567F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11397

Added Files:
	exo-0.3.101-default-mount-options.patch 
Log Message:
add patch

exo-0.3.101-default-mount-options.patch:
 exo-mount-hal.c |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

--- NEW FILE exo-0.3.101-default-mount-options.patch ---
diff -Nur -x '*.orig' -x '*~' exo-0.3.4/exo-mount/exo-mount-hal.c exo-0.3.4.new/exo-mount/exo-mount-hal.c
--- exo-0.3.4/exo-mount/exo-mount-hal.c	2008-03-04 19:25:43.000000000 +0100
+++ exo-0.3.4.new/exo-mount/exo-mount-hal.c	2008-03-04 19:26:14.000000000 +0100
@@ -676,6 +676,18 @@
   /* check if we know any valid mount options */
   if (G_LIKELY (device->fsoptions != NULL))
     {
+      /* use utf8 on ubuntu by default */
+      if (strcmp (device->fstype, "vfat") == 0
+       || strcmp (device->fstype, "iso9660") == 0)
+        {
+          options[n++] = g_strdup_printf ("utf8");
+        }
+      /* pass the correct locale to ntfs-3g on ubuntu */
+      if (strcmp (device->fstype, "ntfs") == 0)
+        {
+          options[n++] = g_strdup_printf ("locale=%s", setlocale (LC_ALL, ""));
+        }
+
       /* process all valid mount options */
       for (m = 0; device->fsoptions[m] != NULL; ++m)
         {
@@ -725,8 +737,16 @@
               ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_") 
               : g_strdup ("");
 
-  /* let HAL guess the fstype */
-  fstype = g_strdup ("");
+  if (strcmp (device->fstype, "ntfs") == 0)
+    {
+      /* override ntfs with ntfs-3g on ubuntu */
+      fstype = g_strdup ("ntfs-3g");
+    }
+  else
+    {
+      /* let HAL guess the fstype */
+      fstype = g_strdup ("");
+    }
 
   /* setup the D-Bus error */
   dbus_error_init (&derror);



From cwickert at fedoraproject.org  Thu Sep 10 05:27:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Sep 2009 05:27:08 +0000 (UTC)
Subject: rpms/exo/F-11 exo-0.3.101-default-mount-options.patch, NONE,
	1.1 exo.spec, 1.36, 1.37
Message-ID: <20090910052708.856DF11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14210

Modified Files:
	exo.spec 
Added Files:
	exo-0.3.101-default-mount-options.patch 
Log Message:
* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
- Mount vfat and ntfs volumes with UTF-8 (#508823)
- Mount ntfs with ntfs-3g


exo-0.3.101-default-mount-options.patch:
 exo-mount-hal.c |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

--- NEW FILE exo-0.3.101-default-mount-options.patch ---
diff -Nur -x '*.orig' -x '*~' exo-0.3.4/exo-mount/exo-mount-hal.c exo-0.3.4.new/exo-mount/exo-mount-hal.c
--- exo-0.3.4/exo-mount/exo-mount-hal.c	2008-03-04 19:25:43.000000000 +0100
+++ exo-0.3.4.new/exo-mount/exo-mount-hal.c	2008-03-04 19:26:14.000000000 +0100
@@ -676,6 +676,18 @@
   /* check if we know any valid mount options */
   if (G_LIKELY (device->fsoptions != NULL))
     {
+      /* use utf8 on ubuntu by default */
+      if (strcmp (device->fstype, "vfat") == 0
+       || strcmp (device->fstype, "iso9660") == 0)
+        {
+          options[n++] = g_strdup_printf ("utf8");
+        }
+      /* pass the correct locale to ntfs-3g on ubuntu */
+      if (strcmp (device->fstype, "ntfs") == 0)
+        {
+          options[n++] = g_strdup_printf ("locale=%s", setlocale (LC_ALL, ""));
+        }
+
       /* process all valid mount options */
       for (m = 0; device->fsoptions[m] != NULL; ++m)
         {
@@ -725,8 +737,16 @@
               ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_") 
               : g_strdup ("");
 
-  /* let HAL guess the fstype */
-  fstype = g_strdup ("");
+  if (strcmp (device->fstype, "ntfs") == 0)
+    {
+      /* override ntfs with ntfs-3g on ubuntu */
+      fstype = g_strdup ("ntfs-3g");
+    }
+  else
+    {
+      /* let HAL guess the fstype */
+      fstype = g_strdup ("");
+    }
 
   /* setup the D-Bus error */
   dbus_error_init (&derror);


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/exo.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- exo.spec	19 Jul 2009 07:54:49 -0000	1.36
+++ exo.spec	10 Sep 2009 05:27:08 -0000	1.37
@@ -3,14 +3,17 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 2%{?dist}
+Release: 4%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=5461
 Patch1: exo-0.3.101-url-quoting.patch
+# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
+Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -55,6 +58,7 @@ Python libraries and header files for th
 
 %patch0 -p1 -b .x86_64-build
 %patch1 -p1 -b .url-quoting
+%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -63,7 +67,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'
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
@@ -85,19 +89,19 @@ desktop-file-install                    
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/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
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
@@ -136,6 +140,13 @@ fi
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
+- Mount vfat and ntfs volumes with UTF-8 (#508823)
+- Mount ntfs with ntfs-3g
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.101-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-2
 - Add patch to fix url quoting (bug #509730)
 



From bskeggs at fedoraproject.org  Thu Sep 10 05:35:19 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 10 Sep 2009 05:35:19 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.50, 1.51 kernel.spec, 1.1788,
	1.1789
Message-ID: <20090910053519.B214411C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15611

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: add some scaler-only modes for LVDS, GEM/TTM fixes



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  747 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1202 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  829 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57829 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- drm-nouveau.patch	9 Sep 2009 06:41:33 -0000	1.50
+++ drm-nouveau.patch	10 Sep 2009 05:35:18 -0000	1.51
@@ -8930,10 +8930,10 @@ index 0000000..7761425
 +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
 diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
 new file mode 100644
-index 0000000..6bb5528
+index 0000000..7f799f6
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,689 @@
+@@ -0,0 +1,747 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -9323,6 +9323,61 @@ index 0000000..6bb5528
 +	return NULL;
 +}
 +
++struct moderec {
++	int hdisplay;
++	int vdisplay;
++};
++
++static struct moderec scaler_modes[] = {
++	{ 1920, 1440 },
++	{ 1920, 1280 },
++	{ 1600, 1200 },
++	{ 1400, 1050 },
++	{ 1280, 1024 },
++	{ 1280, 960 },
++	{ 1152, 864 },
++	{ 1024, 768 },
++	{ 800, 600 },
++	{ 720, 400 },
++	{ 640, 480 },
++	{ 640, 400 },
++	{ 640, 350 },
++	{}
++};
++
++static int
++nouveau_connector_scaler_modes_add(struct drm_connector *connector)
++{
++	struct nouveau_connector *nv_connector = nouveau_connector(connector);
++	struct drm_display_mode *native = nv_connector->native_mode, *m;
++	struct drm_device *dev = connector->dev;
++	struct moderec *mode = &scaler_modes[0];
++	int modes = 0;
++
++	if (!native)
++		return 0;
++
++	while (mode->hdisplay) {
++		if (mode->hdisplay <= native->hdisplay &&
++		    mode->vdisplay <= native->vdisplay) {
++			m = drm_cvt_mode(dev, mode->hdisplay, mode->vdisplay,
++					 drm_mode_vrefresh(native), false,
++					 false);
++			if (!m)
++				continue;
++
++			m->type |= DRM_MODE_TYPE_DRIVER;
++
++			drm_mode_probed_add(connector, m);
++			modes++;
++		}
++
++		mode++;
++	}
++
++	return modes;
++}
++
 +static int
 +nouveau_connector_get_modes(struct drm_connector *connector)
 +{
@@ -9362,6 +9417,9 @@ index 0000000..6bb5528
 +		ret = get_slave_funcs(nv_encoder)->
 +			get_modes(to_drm_encoder(nv_encoder), connector);
 +
++	if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
++		ret += nouveau_connector_scaler_modes_add(connector);
++
 +	return ret;
 +}
 +
@@ -10713,10 +10771,10 @@ index 0000000..f2b8b17
 +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..abf7f8e
+index 0000000..57e8db3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1201 @@
+@@ -0,0 +1,1202 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -10787,6 +10845,7 @@ index 0000000..abf7f8e
 +	struct ttm_bo_kmap_obj kmap;
 +	struct list_head head;
 +
++	struct drm_file *reserved_by;
 +	struct list_head entry;
 +
 +	struct nouveau_channel *channel;
@@ -10877,8 +10936,7 @@ index 0000000..abf7f8e
 +	int handle;
 +};
 +
-+struct nouveau_channel
-+{
++struct nouveau_channel {
 +	struct drm_device *dev;
 +	int id;
 +
@@ -11203,6 +11261,7 @@ index 0000000..abf7f8e
 +		struct ttm_bo_device bdev;
 +		spinlock_t bo_list_lock;
 +		struct list_head bo_list;
++		atomic_t validate_sequence;
 +	} ttm;
 +
 +	struct fb_info *fbdev_info;
@@ -12727,10 +12786,10 @@ index 0000000..230a99b
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
 new file mode 100644
-index 0000000..226eca2
+index 0000000..0b2c044
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -0,0 +1,942 @@
+@@ -0,0 +1,954 @@
 +/*
 + * Copyright (C) 2008 Ben Skeggs.
 + * All Rights Reserved.
@@ -12971,9 +13030,10 @@ index 0000000..226eca2
 +	list_for_each_safe(entry, tmp, list) {
 +		nvbo = list_entry(entry, struct nouveau_bo, entry);
 +
-+		drm_gem_object_unreference(nvbo->gem);
-+		ttm_bo_unreserve(&nvbo->bo);
 +		list_del(&nvbo->entry);
++		nvbo->reserved_by = NULL;
++		ttm_bo_unreserve(&nvbo->bo);
++		drm_gem_object_unreference(nvbo->gem);
 +	}
 +}
 +
@@ -12992,9 +13052,10 @@ index 0000000..226eca2
 +		nvbo->bo.sync_obj = nouveau_fence_ref(fence);
 +		spin_unlock(&nvbo->bo.lock);
 +
-+		drm_gem_object_unreference(nvbo->gem);
-+		ttm_bo_unreserve(&nvbo->bo);
 +		list_del(&nvbo->entry);
++		nvbo->reserved_by = NULL;
++		ttm_bo_unreserve(&nvbo->bo);
++		drm_gem_object_unreference(nvbo->gem);
 +
 +		nouveau_fence_unref((void *)&prev_fence);
 +	}
@@ -13007,6 +13068,7 @@ index 0000000..226eca2
 +			     uint64_t user_buffers, int nr_buffers,
 +			     struct list_head *list, int *apply_relocs)
 +{
++	struct drm_nouveau_private *dev_priv = chan->dev->dev_private;
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_gem_pushbuf_bo *b;
 +	struct drm_nouveau_gem_pushbuf_bo __user *user_pbbos =
@@ -13014,6 +13076,7 @@ index 0000000..226eca2
 +	struct nouveau_fence *prev_fence;
 +	struct nouveau_bo *nvbo;
 +	struct list_head *entry, *tmp;
++	uint32_t sequence;
 +	int ret = -EINVAL;
 +	int i;
 +	int trycnt = 0;
@@ -13021,6 +13084,7 @@ index 0000000..226eca2
 +	if (nr_buffers == 0)
 +		return 0;
 +
++	sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
 +retry:
 +	if (++trycnt > 100000) {
 +		ret = -EINVAL;
@@ -13039,8 +13103,14 @@ index 0000000..226eca2
 +		}
 +		nvbo = gem->driver_private;
 +
-+		ret = ttm_bo_reserve(&nvbo->bo, false, false, true,
-+				     chan->fence.sequence);
++		if (nvbo->reserved_by && nvbo->reserved_by == file_priv) {
++			NV_INFO(dev, "multiple instances of buffer %d on "
++				     "validation list\n", b->handle);
++			ret = -EINVAL;
++			goto out_unref;
++		}
++
++		ret = ttm_bo_reserve(&nvbo->bo, false, false, true, sequence);
 +		if (ret) {
 +			nouveau_gem_pushbuf_backoff(list);
 +			if (ret == -EAGAIN)
@@ -13051,6 +13121,7 @@ index 0000000..226eca2
 +			goto retry;
 +		}
 +
++		nvbo->reserved_by = file_priv;
 +		list_add_tail(&nvbo->entry, list);
 +
 +		if (unlikely(atomic_read(&nvbo->bo.cpu_writers) > 0)) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1788
retrieving revision 1.1789
diff -u -p -r1.1788 -r1.1789
--- kernel.spec	10 Sep 2009 04:15:19 -0000	1.1788
+++ kernel.spec	10 Sep 2009 05:35:19 -0000	1.1789
@@ -2010,6 +2010,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: add some scaler-only modes for LVDS, GEM/TTM fixes
+
 * Wed Sep 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-2
 - touch the dracut initrd file when using %%{with_dracut}
 



From bskeggs at fedoraproject.org  Thu Sep 10 05:37:03 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 10 Sep 2009 05:37:03 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.43,
	1.44 nouveau-bicubic-2x.patch, 1.11,
	1.12 nouveau-multiple-xserver.patch, 1.13,
	1.14 nouveau-tile7000.patch, 1.1, 1.2 sources, 1.44,
	1.45 xorg-x11-drv-nouveau.spec, 1.56, 1.57
Message-ID: <20090910053703.6CCB411C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15813

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-9.20090910git806eaf6
- fix a hang/crash issue that could occur during a modeset
- nouveau-transition-hack.patch: drop, supported with driver pixmaps anyway




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	4 Sep 2009 00:44:52 -0000	1.43
+++ .cvsignore	10 Sep 2009 05:37:03 -0000	1.44
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2
+xf86-video-nouveau-0.0.15-20090910git806eaf6.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nouveau-bicubic-2x.patch	9 Sep 2009 06:38:38 -0000	1.11
+++ nouveau-bicubic-2x.patch	10 Sep 2009 05:37:03 -0000	1.12
@@ -1,7 +1,7 @@
-From 669fc0a22b4c2b6b8c9572187e151e426f039227 Mon Sep 17 00:00:00 2001
+From 4c5b7cde89e9411aa5b107be48ce164837b05881 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
-Subject: [PATCH 3/4] xv: only use bicubic filtering when scaling >=2x
+Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x
 
 ---
  src/nv30_xv_tex.c |    2 +-

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nouveau-multiple-xserver.patch	9 Sep 2009 06:38:38 -0000	1.13
+++ nouveau-multiple-xserver.patch	10 Sep 2009 05:37:03 -0000	1.14
@@ -1,14 +1,14 @@
-From bc70e6309b35633b76c48126bb967d4d85bce4df Mon Sep 17 00:00:00 2001
+From 2c643c98ae006460c0a3fdb5f9660bd3ea9a4fce Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
-Subject: [PATCH 1/4] f12: hack to support multiple xserver instances
+Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
 
 ---
  src/nv_driver.c |   84 +++++++++++++++++++++++++++++++++++++-----------------
  1 files changed, 57 insertions(+), 27 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index b8de860..5838ce7 100644
+index 9317b5e..37a8da7 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nouveau-tile7000.patch	9 Sep 2009 06:38:38 -0000	1.1
+++ nouveau-tile7000.patch	10 Sep 2009 05:37:03 -0000	1.2
@@ -1,7 +1,7 @@
-From 3d2f2ba56b85fde22de2244cb9122708b461b5a7 Mon Sep 17 00:00:00 2001
+From 2b030e60ff009bf8ee80c4d91d9d92081a711e3d Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
-Subject: [PATCH 4/4] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
+Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
 
 ---
  src/drmmode_display.c |    4 ++--
@@ -10,10 +10,10 @@ Subject: [PATCH 4/4] f12: use 0x7000 fla
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 266d3a6..6cbced7 100644
+index 3010396..a9962ec 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -604,7 +604,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -436,7 +436,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50) {
  		tile_mode = 4;
@@ -22,7 +22,7 @@ index 266d3a6..6cbced7 100644
  		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
  		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
  	} else {
-@@ -1225,7 +1225,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1057,7 +1057,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;
@@ -32,7 +32,7 @@ index 266d3a6..6cbced7 100644
  		pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
  	} else {
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 5838ce7..a70dee2 100644
+index 37a8da7..b2a24d7 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	4 Sep 2009 00:44:52 -0000	1.44
+++ sources	10 Sep 2009 05:37:03 -0000	1.45
@@ -1 +1 @@
-50b387dd790cf70326dc3f60fd92310e  xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2
+51ba1ce895c4e2b5ce34fe88034b676f  xf86-video-nouveau-0.0.15-20090910git806eaf6.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- xorg-x11-drv-nouveau.spec	9 Sep 2009 06:38:38 -0000	1.56
+++ xorg-x11-drv-nouveau.spec	10 Sep 2009 05:37:03 -0000	1.57
@@ -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 20090904
-%define git_version 2b5ec6a
+%define gitdate 20090910
+%define git_version 806eaf6
 
 %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:   8.%{snapshot}%{?dist}
+Release:   9.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -44,7 +44,6 @@ Requires:  kernel-drm-nouveau = 15
 Patch0: nouveau-store-vbios.patch
 Patch1: dcbconf_7_4_ignore.diff
 Patch2: nouveau-multiple-xserver.patch
-Patch3: nouveau-transition-hack.patch
 Patch6: nouveau-bicubic-2x.patch
 Patch7: nouveau-bgnr.patch
 Patch8: nouveau-tile7000.patch
@@ -58,7 +57,6 @@ X.Org X11 nouveau video driver.
 %patch0 -p1 -b .vbios
 %patch1 -p1 -b .dcbconf
 %patch2 -p1 -b .multix
-%patch3 -p1 -b .transition
 %patch6 -p1 -b .bicubic
 %patch7 -p1 -b .bgnr
 %patch8 -p1 -b .tile7000
@@ -85,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-9.20090910git806eaf6
+- fix a hang/crash issue that could occur during a modeset
+- nouveau-transition-hack.patch: drop, supported with driver pixmaps anyway
+
 * Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-8.20090904git2b5ec6a
 - nouveau-tile7000.patch: workaround some display corruption on G8x
 



From bskeggs at fedoraproject.org  Thu Sep 10 05:41:41 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 10 Sep 2009 05:41:41 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel nouveau-transition-hack.patch, 1.14,
	NONE
Message-ID: <20090910054141.F0B0811C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16371

Removed Files:
	nouveau-transition-hack.patch 
Log Message:
remove transition hack patch


--- nouveau-transition-hack.patch DELETED ---



From mtasaka at fedoraproject.org  Thu Sep 10 06:09:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Sep 2009 06:09:15 +0000 (UTC)
Subject: rpms/alexandria/F-10
	alexandria-0.6.5-search-result-sanity-check.patch, 1.1,
	1.2 alexandria.spec, 1.33, 1.34
Message-ID: <20090910060915.9361611C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19677

Modified Files:
	alexandria-0.6.5-search-result-sanity-check.patch 
	alexandria.spec 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Fix sanity check patch again...


alexandria-0.6.5-search-result-sanity-check.patch:
 book_providers.rb |    3 +++
 1 file changed, 3 insertions(+)

Index: alexandria-0.6.5-search-result-sanity-check.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria-0.6.5-search-result-sanity-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-search-result-sanity-check.patch	19 Aug 2009 22:13:58 -0000	1.1
+++ alexandria-0.6.5-search-result-sanity-check.patch	10 Sep 2009 06:09:12 -0000	1.2
@@ -1,13 +1,13 @@
 Index: lib/alexandria/book_providers.rb
 ===================================================================
---- lib/alexandria/book_providers.rb	(revision 1085)
-+++ lib/alexandria/book_providers.rb	(working copy)
+--- lib/alexandria/book_providers.rb	(revision 1086)
++++ lib/alexandria/book_providers.rb	(revision 1087)
 @@ -46,6 +46,9 @@
          self.instance.notify_observers(:searching, factory.fullname) # new
          results = factory.search(criterion, type)
  
 +        # sanity check if at least one valid result is actually found
-+        results.delete_if { |book, cover| ((!book) || (!cover)) }
++        results.delete_if { |book, cover| book.nil? }
 +
          if results.length == 0
            self.instance.changed


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- alexandria.spec	8 Sep 2009 03:33:30 -0000	1.33
+++ alexandria.spec	10 Sep 2009 06:09:13 -0000	1.34
@@ -12,7 +12,7 @@
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}.1
+Release:	%{rel}%{?dist}.2
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
@@ -219,6 +219,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Fix sanity check patch again...
+
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Wrong patch of sanity check patch applied on F-10/11, fixing...
 



From pravins at fedoraproject.org  Thu Sep 10 07:16:24 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 10 Sep 2009 07:16:24 +0000 (UTC)
Subject: rpms/lohit-fonts/F-11 .cvsignore, 1.10, 1.11 lohit-fonts.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <20090910071624.B7D5411C00DB@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31197

Modified Files:
	.cvsignore lohit-fonts.spec sources 
Log Message:
* Thu Sep 10 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-1
- Added Unicode 5.1 support in All Lohit fonts
- updated summary for Hindi font package bug 514443
- updated source url



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Mar 2009 14:12:48 -0000	1.10
+++ .cvsignore	10 Sep 2009 07:16:22 -0000	1.11
@@ -1 +1,2 @@
 lohit-fonts-2.3.8.tar.gz
+lohit-fonts-2.4.0.tar.gz


Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/F-11/lohit-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- lohit-fonts.spec	5 Mar 2009 14:12:48 -0000	1.12
+++ lohit-fonts.spec	10 Sep 2009 07:16:22 -0000	1.13
@@ -7,14 +7,14 @@ Languages.
 
 
 Name:           %{fontname}-fonts
-Version:        2.3.8
+Version:        2.4.0
 Release:        1%{?dist}
 Summary:        Free Indian truetype/opentype fonts
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source:        http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-%{version}.tar.gz
+Source:        http://pravins.fedorapeople.org/lohit/lohit-fonts-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -84,7 +84,7 @@ This package provides a free Hindi truet
 %_font_pkg -n hindi lohit_hi.ttf
 
 %package -n %{fontname}-kannada-fonts
-Summary:        Free Kannada font
+Summary:        Free Hindi font
 Group:          User Interface/X
 Requires:       %{name}-common = %{version}-%{release}
 Provides: lohit-fonts-kannada = %{version}-%{release}
@@ -267,6 +267,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-1
+- Added Unicode 5.1 support in All Lohit fonts
+- updated summary for Hindi font package bug 514443
+- updated source url
 
 * Thu Mar 05 2009 Rahul Bhalerao <rbhalera at redhat.com> - 2.3.8-1.fc11
 - Bug 428427 - [kn_IN][fonts-indic] - 0CB5+0CCA is wrongly rendering 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Mar 2009 14:12:48 -0000	1.10
+++ sources	10 Sep 2009 07:16:23 -0000	1.11
@@ -1 +1 @@
-f3b5c3cd8e370f1669d44cec3eab1f2b  lohit-fonts-2.3.8.tar.gz
+a729f805c323308ab2c728c8e6fa72c0  lohit-fonts-2.4.0.tar.gz



From peter at fedoraproject.org  Thu Sep 10 07:18:31 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 10 Sep 2009 07:18:31 +0000 (UTC)
Subject: rpms/pdfresurrect/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 pdfresurrect.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090910071831.84B8711C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31634/devel

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
ver. 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jun 2009 08:07:58 -0000	1.3
+++ .cvsignore	10 Sep 2009 07:18:30 -0000	1.4
@@ -1 +1 @@
-pdfresurrect-v0_6.tar.bz2
+pdfresurrect-v0_7.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Jun 2009 08:07:59 -0000	1.2
+++ import.log	10 Sep 2009 07:18:31 -0000	1.3
@@ -1,2 +1,3 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:HEAD:pdfresurrect-0.6-1.fc10.src.rpm:1243843648
+pdfresurrect-0_7-1_fc11:HEAD:pdfresurrect-0.7-1.fc11.src.rpm:1252567068


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/pdfresurrect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pdfresurrect.spec	25 Jul 2009 23:26:21 -0000	1.4
+++ pdfresurrect.spec	10 Sep 2009 07:18:31 -0000	1.5
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.6
-Release:	2%{?dist}
+Version:	0.7
+Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_6.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_6
+%setup -q -n pdfresurrect-v0_7
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
+- Ver. 0.7
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2009 08:07:59 -0000	1.3
+++ sources	10 Sep 2009 07:18:31 -0000	1.4
@@ -1 +1 @@
-308b2945894f0fc961dde6592b9f1b0d  pdfresurrect-v0_6.tar.bz2
+aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2



From peter at fedoraproject.org  Thu Sep 10 07:37:42 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 10 Sep 2009 07:37:42 +0000 (UTC)
Subject: rpms/pdfresurrect/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 pdfresurrect.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090910073742.C000511C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1607/F-11

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
ver. 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jun 2009 08:09:24 -0000	1.3
+++ .cvsignore	10 Sep 2009 07:37:41 -0000	1.4
@@ -1 +1 @@
-pdfresurrect-v0_6.tar.bz2
+pdfresurrect-v0_7.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Jun 2009 08:09:25 -0000	1.2
+++ import.log	10 Sep 2009 07:37:41 -0000	1.3
@@ -1,2 +1,3 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:F-11:pdfresurrect-0.6-1.fc10.src.rpm:1243843742
+pdfresurrect-0_7-1_fc11:F-11:pdfresurrect-0.7-1.fc11.src.rpm:1252567151


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/pdfresurrect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pdfresurrect.spec	1 Jun 2009 08:09:25 -0000	1.3
+++ pdfresurrect.spec	10 Sep 2009 07:37:41 -0000	1.4
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.6
+Version:	0.7
 Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_6.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_6
+%setup -q -n pdfresurrect-v0_7
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
+- Ver. 0.7
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0.6-1
 - Ver. 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2009 08:09:25 -0000	1.3
+++ sources	10 Sep 2009 07:37:41 -0000	1.4
@@ -1 +1 @@
-308b2945894f0fc961dde6592b9f1b0d  pdfresurrect-v0_6.tar.bz2
+aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2



From peter at fedoraproject.org  Thu Sep 10 07:38:44 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 10 Sep 2009 07:38:44 +0000 (UTC)
Subject: rpms/pdfresurrect/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 pdfresurrect.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090910073844.A797811C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1841/F-10

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
ver. 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jun 2009 08:11:28 -0000	1.3
+++ .cvsignore	10 Sep 2009 07:38:44 -0000	1.4
@@ -1 +1 @@
-pdfresurrect-v0_6.tar.bz2
+pdfresurrect-v0_7.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Jun 2009 08:11:28 -0000	1.2
+++ import.log	10 Sep 2009 07:38:44 -0000	1.3
@@ -1,2 +1,3 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:F-10:pdfresurrect-0.6-1.fc10.src.rpm:1243843819
+pdfresurrect-0_7-1_fc11:F-10:pdfresurrect-0.7-1.fc11.src.rpm:1252568295


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/pdfresurrect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pdfresurrect.spec	1 Jun 2009 08:11:28 -0000	1.2
+++ pdfresurrect.spec	10 Sep 2009 07:38:44 -0000	1.3
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.6
+Version:	0.7
 Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_6.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_6
+%setup -q -n pdfresurrect-v0_7
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
+- Ver. 0.7
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0.6-1
 - Ver. 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2009 08:11:28 -0000	1.3
+++ sources	10 Sep 2009 07:38:44 -0000	1.4
@@ -1 +1 @@
-308b2945894f0fc961dde6592b9f1b0d  pdfresurrect-v0_6.tar.bz2
+aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2



From akurtakov at fedoraproject.org  Thu Sep 10 08:53:12 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Sep 2009 08:53:12 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel maven2-common-poms.spec, 1.9,
	1.10 sources, 1.5, 1.6 maven2-common-poms-jpp-depmap.xml, 1.5, 1.6
Message-ID: <20090910085313.0095411C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10960/devel

Modified Files:
	maven2-common-poms.spec sources 
	maven2-common-poms-jpp-depmap.xml 
Log Message:
Add jetty and plexus parent poms.


Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- maven2-common-poms.spec	1 Sep 2009 23:33:07 -0000	1.9
+++ maven2-common-poms.spec	10 Sep 2009 08:53:10 -0000	1.10
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           9%{?dist}
+Release:           10%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2
 
 %changelog
+* Thu Sep 10 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-10
+- Add jetty and plexus parent poms.
+
 * Tue Sep  1 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.0-9
 - Added JPP.codehaus-mojo-parent.pom
 - Fix cobertura's jar name in the depmap, should be maven2-plugin-cobertura


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 23:39:26 -0000	1.5
+++ sources	10 Sep 2009 08:53:11 -0000	1.6
@@ -1,2 +1,2 @@
 e1a697356772cf0dc7badade59aa922b  maven2-common-poms-docs.tar.gz
-7868675a900fce52e93f3f3ddf78030e  maven2-common-poms-src.tar.gz
+d36c495ac5869ec89aa9679b3e0aefbe  maven2-common-poms-src.tar.gz


Index: maven2-common-poms-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms-jpp-depmap.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- maven2-common-poms-jpp-depmap.xml	1 Sep 2009 23:33:07 -0000	1.5
+++ maven2-common-poms-jpp-depmap.xml	10 Sep 2009 08:53:11 -0000	1.6
@@ -4135,4 +4135,40 @@
             <version>1.0-beta-1</version>
         </jpp>
     </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-parent</artifactId>
+            <version>8</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>mortbay-jetty-parent</artifactId>
+            <version>8</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-parent</artifactId>
+            <version>11</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>eclipse-jetty-parent</artifactId>
+            <version>11</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>felix</artifactId>
+            <version>1.0.2</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>felix</artifactId>
+            <version>1.0.2</version>
+        </jpp>
+    </dependency>
 </dependencies>



From than at fedoraproject.org  Thu Sep 10 09:48:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 10 Sep 2009 09:48:07 +0000 (UTC)
Subject: rpms/PyQt/devel PyQt.spec,1.53,1.54
Message-ID: <20090910094807.463AC11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PyQt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22051

Modified Files:
	PyQt.spec 
Log Message:
drop support fedora < 10




Index: PyQt.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- PyQt.spec	24 Jul 2009 16:02:10 -0000	1.53
+++ PyQt.spec	10 Sep 2009 09:48:06 -0000	1.54
@@ -1,24 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%if 0%{?fedora} > 8 
 %define qt3 qt3
 %define qt3version 3.3.8
-%else
-%define qt3 qt
-%define qt3version 1:3.3.8
-%define qscintilla 1
-%endif
 
 Summary: Python bindings for Qt3
 Name: PyQt
 Version: 3.18.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Development/Languages
 Url: http://www.riverbankcomputing.com/pyqt/
 Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-%{version}.tar.gz
-#Source0: http://www.riverbankcomputing.co.uk/static/Downloads/PyQt3/PyQt-x11-gpl-%{version}-snapshot-%{snap}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libXmu-devel
@@ -145,6 +138,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 3.18.1-3
+- drop support fedora < 10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.18.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tomeu at fedoraproject.org  Thu Sep 10 09:57:43 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Thu, 10 Sep 2009 09:57:43 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore, 1.14, 1.15 gnash.spec, 1.61,
	1.62 sources, 1.14, 1.15
Message-ID: <20090910095743.75A4011C00DB@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23239

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.7.20090910bzr11505
- update to HEAD



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	9 Aug 2009 13:36:21 -0000	1.14
+++ .cvsignore	10 Sep 2009 09:57:43 -0000	1.15
@@ -1,2 +1,2 @@
-gnash-0.9.0.20090809bzr11401.tar.gz
+gnash-0.9.0.20090910bzr11505.tar.gz
 gnash-splash.swf


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- gnash.spec	10 Aug 2009 11:27:20 -0000	1.61
+++ gnash.spec	10 Sep 2009 09:57:43 -0000	1.62
@@ -1,11 +1,11 @@
-%define commitid 11401
-%define alphatag 20090809bzr%{commitid}
+%define commitid 11505
+%define alphatag 20090910bzr%{commitid}
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnash
 Version:        0.9.0
-Release:        0.6.%{alphatag}%{?dist}
+Release:        0.7.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -313,6 +313,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.7.20090910bzr11505
+- update to HEAD
+
 * Mon Aug 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.6.20090809bzr11401
 - don't package headers in -widget, only in -devel (no duplicate files)
 - own %%{_includedir}/gnash/ in -devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Aug 2009 13:36:21 -0000	1.14
+++ sources	10 Sep 2009 09:57:43 -0000	1.15
@@ -1,2 +1,2 @@
-3f22f0fa19b63f6445ce16d9b8a53135  gnash-0.9.0.20090809bzr11401.tar.gz
+e897c7aa152f07e809c560cb54a10857  gnash-0.9.0.20090910bzr11505.tar.gz
 3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf



From ovasik at fedoraproject.org  Thu Sep 10 10:36:58 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Sep 2009 10:36:58 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-i18n.patch, 1.37, 1.38 coreutils.spec,
	1.272, 1.273
Message-ID: <20090910103658.C713C11C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31495

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
fix double free error in fold for singlebyte locales (caused by multibyte patch)

coreutils-i18n.patch:
 coreutils-6.11/src/join.c               |  105 +++-
 coreutils-6.12-orig/src/join.c          |    5 
 coreutils-6.12/tests/Makefile.am        |    5 
 coreutils-6.12/tests/misc/cut           |    6 
 coreutils-6.8+/lib/linebuffer.h         |    8 
 coreutils-6.8+/src/cut.c                |  420 ++++++++++++++++++-
 coreutils-6.8+/src/expand.c             |  161 +++++++
 coreutils-6.8+/src/fold.c               |  309 +++++++++++++-
 coreutils-6.8+/src/join.c               |  237 ++++++++++-
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  673 ++++++++++++++++++++++++++++++--
 coreutils-6.8+/src/unexpand.c           |  226 ++++++++++
 coreutils-6.8+/src/uniq.c               |  259 +++++++++++-
 coreutils-6.8+/tests/misc/mb1.I         |    4 
 coreutils-6.8+/tests/misc/mb1.X         |    4 
 coreutils-6.8+/tests/misc/mb2.I         |    4 
 coreutils-6.8+/tests/misc/mb2.X         |    4 
 coreutils-6.8+/tests/misc/sort-mb-tests |   58 ++
 18 files changed, 2739 insertions(+), 180 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- coreutils-i18n.patch	8 Sep 2009 14:34:31 -0000	1.37
+++ coreutils-i18n.patch	10 Sep 2009 10:36:58 -0000	1.38
@@ -1348,7 +1348,7 @@ diff -urNp coreutils-6.11-orig/src/join.
  	      /* Look for the last blank. */
  	      while (logical_end)
  		{
-@@ -218,11 +255,225 @@
+@@ -218,11 +255,222 @@
        line_out[offset_out++] = c;
      }
  
@@ -1358,7 +1358,6 @@ diff -urNp coreutils-6.11-orig/src/join.
 +  if (offset_out)
 +    fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
 +
-+  free(line_out);
 +}
 +
 +#if HAVE_MBRTOWC
@@ -1367,16 +1366,16 @@ diff -urNp coreutils-6.11-orig/src/join.
 +{
 +  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
 +  size_t buflen = 0;	/* The length of the byte sequence in buf. */
-+  char *bufpos;         /* Next read position of BUF. */
++  char *bufpos = NULL;         /* Next read position of BUF. */
 +  wint_t wc;		/* A gotten wide character. */
 +  size_t mblength;	/* The byte size of a multibyte character which shows
 +			   as same character as WC. */
 +  mbstate_t state, state_bak;	/* State of the stream. */
 +  int convfail;		/* 1, when conversion is failed. Otherwise 0. */
 +
-+  char *line_out = NULL;
++  static char *line_out = NULL;
 +  size_t offset_out = 0;	/* Index in `line_out' for next char. */
-+  size_t allocated_out = 0;
++  static size_t allocated_out = 0;
 +
 +  int increment;
 +  size_t column = 0;
@@ -1384,7 +1383,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 +  size_t last_blank_pos;
 +  size_t last_blank_column;
 +  int is_blank_seen;
-+  int last_blank_increment;
++  int last_blank_increment = 0;
 +  int is_bs_following_last_blank;
 +  size_t bs_following_last_blank_num;
 +  int is_cr_after_last_blank;
@@ -1503,8 +1502,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 +
 +      if (allocated_out < offset_out + mblength)
 +	{
-+	  allocated_out += 1024;
-+	  line_out = xrealloc (line_out, allocated_out);
++	  line_out = X2REALLOC (line_out, &allocated_out);
 +	}
 +
 +      memcpy (line_out + offset_out, bufpos, mblength);
@@ -1536,7 +1534,6 @@ diff -urNp coreutils-6.11-orig/src/join.
    if (offset_out)
      fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
  
-+  free(line_out);
 +}
 +#endif
 +


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- coreutils.spec	8 Sep 2009 14:34:31 -0000	1.272
+++ coreutils.spec	10 Sep 2009 10:36:58 -0000	1.273
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -333,6 +333,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Thu Sep 10 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-6
+- fix double free error in fold for singlebyte locales
+  (caused by multibyte patch)
+
 * Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-5
 - fix sort -h for multibyte locales (reported via
   http://bugs.archlinux.org/task/16022)



From belegdol at fedoraproject.org  Thu Sep 10 10:59:12 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 10 Sep 2009 10:59:12 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.21,
	1.22 gnome-chemistry-utils.spec, 1.38, 1.39 sources, 1.22, 1.23
Message-ID: <20090910105912.6E5F011C00DB@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3875

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
- Updated to 0.10.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	27 Jun 2009 17:16:28 -0000	1.21
+++ .cvsignore	10 Sep 2009 10:59:11 -0000	1.22
@@ -1 +1 @@
-gnome-chemistry-utils-0.10.5.tar.bz2
+gnome-chemistry-utils-0.10.8.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gnome-chemistry-utils.spec	25 Jul 2009 00:35:40 -0000	1.38
+++ gnome-chemistry-utils.spec	10 Sep 2009 10:59:11 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
-Version:        0.10.5
-Release:        2%{?dist}
+Version:        0.10.8
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -234,6 +234,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
+- Updated to 0.10.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	27 Jun 2009 17:16:28 -0000	1.22
+++ sources	10 Sep 2009 10:59:11 -0000	1.23
@@ -1 +1 @@
-cf72cba3ebe99ae52292a93f01189252  gnome-chemistry-utils-0.10.5.tar.bz2
+f533fa18335892b4e8340b343ce0bc55  gnome-chemistry-utils-0.10.8.tar.bz2



From belegdol at fedoraproject.org  Thu Sep 10 11:04:23 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 10 Sep 2009 11:04:23 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/F-11 .cvsignore, 1.20,
	1.21 gnome-chemistry-utils.spec, 1.36, 1.37 sources, 1.21, 1.22
Message-ID: <20090910110423.A81A711C00DB@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4819

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
- Updated to 0.10.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Mar 2009 12:45:24 -0000	1.20
+++ .cvsignore	10 Sep 2009 11:04:23 -0000	1.21
@@ -1 +1 @@
-gnome-chemistry-utils-0.10.4.tar.bz2
+gnome-chemistry-utils-0.10.8.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-11/gnome-chemistry-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gnome-chemistry-utils.spec	19 Mar 2009 12:45:25 -0000	1.36
+++ gnome-chemistry-utils.spec	10 Sep 2009 11:04:23 -0000	1.37
@@ -1,5 +1,5 @@
 Name:           gnome-chemistry-utils
-Version:        0.10.4
+Version:        0.10.8
 Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
@@ -119,6 +119,11 @@ chrpath --delete  $RPM_BUILD_ROOT%{_libd
 #kill KDE MIME .desktop files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mimelnk
 
+#kill the unnecessary .so symlinks
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas-0.10.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcu-0.10.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -189,9 +194,9 @@ scrollkeeper-update -q || :
 %{_bindir}/gspectrum-0.10
 %{_libdir}/gchemutils
 %{_libdir}/goffice/0.6.6/plugins/gchemutils
-%{_libdir}/libgchempaint-0.10.so*
-%{_libdir}/libgcpcanvas-0.10.so*
-%{_libdir}/libgcu-0.10.so*
+%{_libdir}/libgchempaint-0.10.so.*
+%{_libdir}/libgcpcanvas-0.10.so.*
+%{_libdir}/libgcu-0.10.so.*
 %{_libexecdir}/chem-viewer
 %{_datadir}/applications/fedora-gchem3d-0.10.desktop
 %{_datadir}/applications/fedora-gchemcalc-0.10.desktop
@@ -229,6 +234,16 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
+- Updated to 0.10.8
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.5-1
+- Updated to 0.10.5
+- Killed the .so symlinks, they were unnecessary
+
 * Wed Mar 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.4-1
 - Updated to 0.10.4
 - Dropped upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Mar 2009 12:45:25 -0000	1.21
+++ sources	10 Sep 2009 11:04:23 -0000	1.22
@@ -1 +1 @@
-24e2dc7e1c53bf493656f5155c7d7024  gnome-chemistry-utils-0.10.4.tar.bz2
+f533fa18335892b4e8340b343ce0bc55  gnome-chemistry-utils-0.10.8.tar.bz2



From than at fedoraproject.org  Thu Sep 10 11:14:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 10 Sep 2009 11:14:32 +0000 (UTC)
Subject: rpms/qt3/devel qt3.spec,1.19,1.20
Message-ID: <20090910111432.D697311C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6967

Modified Files:
	qt3.spec 
Log Message:
drop support fedora < 10




Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- qt3.spec	27 Jul 2009 02:36:48 -0000	1.19
+++ qt3.spec	10 Sep 2009 11:14:32 -0000	1.20
@@ -2,17 +2,10 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 27%{?dist}
-%if 0%{?fedora} > 8
+Release: 28%{?dist}
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
 Provides: qt = 1:%{version}-%{release}
-%else
-Name: qt
-Epoch: 1
-Obsoletes: qt3 < %{version}-%{release}
-Provides: qt3 = %{version}-%{release}
-%endif
 License: QPL or GPLv2 or GPLv3
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -141,14 +134,8 @@ BuildRequires: sqlite-devel
 Summary: Graphical configuration tool for programs using Qt 3
 Group: User Interface/Desktops
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if "%{name}" == "qt"
-Obsoletes: qt3-config < %{version}-%{release}
-Provides:  qt3-config = %{version}-%{release}
-%else
 Obsoletes: qt-config < 1:%{version}-%{release}
 Provides:  qt-config = 1:%{version}-%{release}
-%endif
 
 
 %package devel
@@ -174,13 +161,8 @@ Requires: libmng-devel
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-devel < %{version}-%{release}
-Provides:  qt3-devel = %{version}-%{release}
-%else
 Obsoletes: qt-devel < 1:%{version}-%{release}
 Provides:  qt-devel = 1:%{version}-%{release}
-%endif
 
 
 %package devel-docs
@@ -188,13 +170,8 @@ Summary: Documentation for the Qt 3 GUI 
 Group: Development/Libraries
 Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-devel-docs < %{version}-%{release}
-Provides:  qt3-devel-docs = %{version}-%{release}
-%else
 Obsoletes: qt-devel-docs < 1:%{version}-%{release}
 Provides:  qt-devel-docs = 1:%{version}-%{release}
-%endif
 
 
 %package ODBC
@@ -202,13 +179,8 @@ Summary: ODBC drivers for Qt 3's SQL cla
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-ODBC < %{version}-%{release}
-Provides:  qt3-ODBC = %{version}-%{release}
-%else
 Obsoletes: qt-ODBC < 1:%{version}-%{release}
 Provides:  qt-ODBC = 1:%{version}-%{release}
-%endif
 
 
 %package MySQL
@@ -216,13 +188,8 @@ Summary: MySQL drivers for Qt 3's SQL cl
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-MySQL < %{version}-%{release}
-Provides:  qt3-MySQL = %{version}-%{release}
-%else
 Obsoletes: qt-MySQL < 1:%{version}-%{release}
 Provides:  qt-MySQL = 1:%{version}-%{release}
-%endif
 
 
 %package PostgreSQL
@@ -230,13 +197,8 @@ Summary: PostgreSQL drivers for Qt 3's S
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-PostgreSQL < %{version}-%{release}
-Provides:  qt3-PostgreSQL = %{version}-%{release}
-%else
 Obsoletes: qt-PostgreSQL < 1:%{version}-%{release}
 Provides:  qt-PostgreSQL = 1:%{version}-%{release}
-%endif
 
 
 %package sqlite
@@ -244,13 +206,8 @@ Summary: sqlite drivers for Qt 3's SQL c
 Group: System Environment/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-sqlite < %{version}-%{release}
-Provides:  qt3-sqlite = %{version}-%{release}
-%else
 Obsoletes: qt-sqlite < 1:%{version}-%{release}
 Provides:  qt-sqlite = 1:%{version}-%{release}
-%endif
 
 
 %package designer
@@ -258,13 +215,8 @@ Summary: Interface designer (IDE) for th
 Group: Development/Tools
 Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if "%{name}" == "qt"
-Obsoletes: qt3-designer < %{version}-%{release}
-Provides:  qt3-designer = %{version}-%{release}
-%else
 Obsoletes: qt-designer < 1:%{version}-%{release}
 Provides:  qt-designer = 1:%{version}-%{release}
-%endif
 
 
 %description
@@ -648,6 +600,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 3.3.8b-28
+- drop support fedora < 10
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.8b-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From belegdol at fedoraproject.org  Thu Sep 10 11:19:03 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 10 Sep 2009 11:19:03 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/F-10 .cvsignore, 1.20,
	1.21 gnome-chemistry-utils.spec, 1.33, 1.34 sources, 1.21, 1.22
Message-ID: <20090910111903.6490811C00DB@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7865

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
- Updated to 0.10.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Mar 2009 12:47:21 -0000	1.20
+++ .cvsignore	10 Sep 2009 11:19:03 -0000	1.21
@@ -1 +1 @@
-gnome-chemistry-utils-0.10.4.tar.bz2
+gnome-chemistry-utils-0.10.8.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/gnome-chemistry-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gnome-chemistry-utils.spec	19 Mar 2009 12:47:21 -0000	1.33
+++ gnome-chemistry-utils.spec	10 Sep 2009 11:19:03 -0000	1.34
@@ -1,5 +1,5 @@
 Name:           gnome-chemistry-utils
-Version:        0.10.4
+Version:        0.10.8
 Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
@@ -101,7 +101,7 @@ chrpath --delete  $RPM_BUILD_ROOT%{_bind
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.10
-chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.5/plugins/gchemutils/gchemutils.so
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.6/plugins/gchemutils/gchemutils.so
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so.%{version}
 chrpath --delete  $RPM_BUILD_ROOT%{_libexecdir}/chem-viewer
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.10/plugins/cdx/cdx.so
@@ -119,6 +119,11 @@ chrpath --delete  $RPM_BUILD_ROOT%{_libd
 #kill KDE MIME .desktop files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mimelnk
 
+#kill the unnecessary .so symlinks
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas-0.10.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcu-0.10.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -188,10 +193,10 @@ scrollkeeper-update -q || :
 %{_bindir}/gspectrum
 %{_bindir}/gspectrum-0.10
 %{_libdir}/gchemutils
-%{_libdir}/goffice/0.6.5/plugins/gchemutils
-%{_libdir}/libgchempaint-0.10.so*
-%{_libdir}/libgcpcanvas-0.10.so*
-%{_libdir}/libgcu-0.10.so*
+%{_libdir}/goffice/0.6.6/plugins/gchemutils
+%{_libdir}/libgchempaint-0.10.so.*
+%{_libdir}/libgcpcanvas-0.10.so.*
+%{_libdir}/libgcu-0.10.so.*
 %{_libexecdir}/chem-viewer
 %{_datadir}/applications/fedora-gchem3d-0.10.desktop
 %{_datadir}/applications/fedora-gchemcalc-0.10.desktop
@@ -229,6 +234,16 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
+- Updated to 0.10.8
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.5-1
+- Updated to 0.10.5
+- Killed the .so symlinks, they were unnecessary
+
 * Wed Mar 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.4-1
 - Updated to 0.10.4
 - Dropped upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Mar 2009 12:47:21 -0000	1.21
+++ sources	10 Sep 2009 11:19:03 -0000	1.22
@@ -1 +1 @@
-24e2dc7e1c53bf493656f5155c7d7024  gnome-chemistry-utils-0.10.4.tar.bz2
+f533fa18335892b4e8340b343ce0bc55  gnome-chemistry-utils-0.10.8.tar.bz2



From belegdol at fedoraproject.org  Thu Sep 10 11:34:32 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 10 Sep 2009 11:34:32 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/F-10 gnome-chemistry-utils.spec, 1.34,
	1.35
Message-ID: <20090910113432.42B9611C00DB@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12004

Modified Files:
	gnome-chemistry-utils.spec 
Log Message:
Fixed the goffice plugins path


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/gnome-chemistry-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gnome-chemistry-utils.spec	10 Sep 2009 11:19:03 -0000	1.34
+++ gnome-chemistry-utils.spec	10 Sep 2009 11:34:32 -0000	1.35
@@ -101,7 +101,7 @@ chrpath --delete  $RPM_BUILD_ROOT%{_bind
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.10
-chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.6/plugins/gchemutils/gchemutils.so
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.5/plugins/gchemutils/gchemutils.so
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so.%{version}
 chrpath --delete  $RPM_BUILD_ROOT%{_libexecdir}/chem-viewer
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.10/plugins/cdx/cdx.so
@@ -193,7 +193,7 @@ scrollkeeper-update -q || :
 %{_bindir}/gspectrum
 %{_bindir}/gspectrum-0.10
 %{_libdir}/gchemutils
-%{_libdir}/goffice/0.6.6/plugins/gchemutils
+%{_libdir}/goffice/0.6.5/plugins/gchemutils
 %{_libdir}/libgchempaint-0.10.so.*
 %{_libdir}/libgcpcanvas-0.10.so.*
 %{_libdir}/libgcu-0.10.so.*



From pbrobinson at fedoraproject.org  Thu Sep 10 12:10:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Sep 2009 12:10:27 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.5, 1.6 mutter-moblin.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090910121027.DF99711C043D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20331

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.35.5 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Aug 2009 13:07:58 -0000	1.5
+++ .cvsignore	10 Sep 2009 12:10:27 -0000	1.6
@@ -1 +1 @@
-mutter-moblin-0.35.4.tar.bz2
+mutter-moblin-0.35.5.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mutter-moblin.spec	31 Aug 2009 13:07:58 -0000	1.6
+++ mutter-moblin.spec	10 Sep 2009 12:10:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.35.4
+Version:        0.35.5
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Thu Sep  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.35.5-1
+- New 0.35.5 upstream release
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.35.4-1
 - New 0.35.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Aug 2009 13:07:58 -0000	1.5
+++ sources	10 Sep 2009 12:10:27 -0000	1.6
@@ -1 +1 @@
-09b09b24b55c5a8233c24f21be7dd28c  mutter-moblin-0.35.4.tar.bz2
+05e1a68c2c37d156aa1458fb15c2c611  mutter-moblin-0.35.5.tar.bz2



From coec at fedoraproject.org  Thu Sep 10 12:19:35 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 10 Sep 2009 12:19:35 +0000 (UTC)
Subject: rpms/vmpsd/devel import.log, NONE, 1.1 vmpsd.init, NONE,
	1.1 vmpsd.spec, NONE, 1.1 vmpsd.sysconfig, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910121935.E0FD911C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/vmpsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vmpsd.init vmpsd.spec vmpsd.sysconfig 
Log Message:
Initial commit of vmpsd



--- NEW FILE import.log ---
vmpsd-1_4_01-6:HEAD:vmpsd-1.4.01-6.src.rpm:1252585116


--- NEW FILE vmpsd.init ---
#!/bin/bash
#
# chkconfig: - 92 8
# description: vmpsd is a GPL implementation of Cisco's VMPS
# processname: vmpsd
# pidfile: /var/run/vmpsd.pid
# config: /etc/sysconfig/vmpsd

# source function library
. /etc/init.d/functions

if test -e /etc/sysconfig/vmpsd ; then
    . /etc/sysconfig/vmpsd
fi

RETVAL=0

start() {
        echo -n $"Starting vmpsd: "

        daemon --user nobody vmpsd $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/vmpsd
}

stop() {
        echo -n $"Shutting down vmpsd: "
        killproc vmpsd
        RETVAL=$?

        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/vmpsd
}

case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  restart|reload)
        stop
        start
        ;;
  condrestart)
        if [ -f /var/lock/subsys/vmpsd ]; then
            stop
            start
        fi
        ;;
  status)
        status vmpsd
        RETVAL=$?
        ;;
  *)
        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE vmpsd.spec ---
Name:		vmpsd 
Version:	1.4.01
Release:	6%{?dist}
Summary:	A GPL implementation of Cisco Systems' VMPS

Group:	System Environment/Daemons
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:	GPL+
URL:	http://vmps.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vmps/%{name}-%{version}.tar.gz
Source1:	vmpsd.sysconfig
Source2:	vmpsd.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post):	chkconfig
Requires(preun):	chkconfig
# This is for /sbin/service
Requires(preun):	initscripts
Requires(postun):	initscripts

%description
VMPS (VLAN Management Policy Server) is a way of assigning switch ports to 
specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL 
implementation of VMPS.

%prep
%setup -qn %{name}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_mandir}

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
install %{S:2} -p $RPM_BUILD_ROOT%{_initrddir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 -eq 0 ] ; then
   /sbin/service %{name} stop > /dev/null 2>&1
   /sbin/chkconfig --del %{name}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/vlan.db
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0755,root,root) %{_bindir}/%{name}
%doc doc/NetregExtension.txt
%doc doc/VQP-spec.txt
%doc doc/vlan.db.example
%doc COPYING.GPL ChangeLog AUTHORS
%{_mandir}/man1/%{name}.1.gz

%changelog
* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-6%{?dist}
- Remove condrestart from post section as it's now in the postun section
- Stop packaging the INSTALL file

* Sun Sep 6 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-5
- Add condrestart in postun
- Add ChangeLog and COPYING.GPL to files section

* Sat Sep 5 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-4
- Add condrestart into post section
- Use macros in files section
- Remove '$DESTDIR=$RPM_BUILD_ROOT' from make in build section
- Do parallel make
- Don't start service by default
- Add Requires for post and preun
- Correct the Source0 URL
- Move clean to after install

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-3
- Split /etc/sysconfig/vmpsd and /etc/rc.d/init.d/vmpsd out of the spec file
- Corrected license from GPLv2 to GPL+
- Ensured that the make is done in the build section

* Thu Aug 20 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-2
- Tidied spec file and silenced rpmlint output

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-1
- Initial Packaging 


--- NEW FILE vmpsd.sysconfig ---
OPTIONS="-f /etc/vmps.db -l 0x700"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:20:41 -0000	1.1
+++ .cvsignore	10 Sep 2009 12:19:35 -0000	1.2
@@ -0,0 +1 @@
+vmpsd-1.4.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:20:41 -0000	1.1
+++ sources	10 Sep 2009 12:19:35 -0000	1.2
@@ -0,0 +1 @@
+b95f6390f0a340f4f99d4e8f72201cb4  vmpsd-1.4.01.tar.gz



From kaigai at fedoraproject.org  Thu Sep 10 12:19:48 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Thu, 10 Sep 2009 12:19:48 +0000 (UTC)
Subject: rpms/sepostgresql/F-10 sepostgresql-pg_dump-8.3.8-2.patch, NONE,
	1.1 sepostgresql-policy-8.3.8-2.patch, NONE,
	1.1 sepostgresql-sepgsql-8.3.8-2.patch, NONE, 1.1 .cvsignore,
	1.14, 1.15 sepostgresql.init, 1.31, 1.32 sepostgresql.spec, 1.32,
	1.33 sources, 1.11, 1.12 sepostgresql-pg_dump-8.3.7-2.patch, 1.1,
	NONE sepostgresql-policy-8.3.7-2.patch, 1.1,
	NONE sepostgresql-sepgsql-8.3.7-2.patch, 1.1, NONE
Message-ID: <20090910121948.D9FA911C00DB@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22674

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sources 
Added Files:
	sepostgresql-pg_dump-8.3.8-2.patch 
	sepostgresql-policy-8.3.8-2.patch 
	sepostgresql-sepgsql-8.3.8-2.patch 
Removed Files:
	sepostgresql-pg_dump-8.3.7-2.patch 
	sepostgresql-policy-8.3.7-2.patch 
	sepostgresql-sepgsql-8.3.7-2.patch 
Log Message:
upgrade base PostgreSQL v8.3.7->8.3.8


sepostgresql-pg_dump-8.3.8-2.patch:
 initdb/initdb.c       |   11 +
 pg_dump/pg_ace_dump.h |  284 ++++++++++++++++++++++++++++++++++++++++++++++++++
 pg_dump/pg_dump.c     |   37 ++++++
 pg_dump/pg_dump.h     |    2 
 pg_dump/pg_dumpall.c  |   29 ++++-
 5 files changed, 355 insertions(+), 8 deletions(-)

--- NEW FILE sepostgresql-pg_dump-8.3.8-2.patch ---
diff -rpNU3 base/src/bin/initdb/initdb.c sepgsql/src/bin/initdb/initdb.c
--- base/src/bin/initdb/initdb.c	2009-09-10 20:11:35.000000000 +0900
+++ sepgsql/src/bin/initdb/initdb.c	2009-09-10 20:54:22.000000000 +0900
@@ -94,6 +94,7 @@ static bool debug = false;
 static bool noclean = false;
 static bool show_setting = false;
 static char *xlog_dir = "";
+static char *pgace_feature = "none";
 
 
 /* internal vars */
@@ -1224,6 +1225,11 @@ setup_config(void)
 						 "#default_text_search_config = 'pg_catalog.simple'",
 							  repltok);
 
+	snprintf(repltok, sizeof(repltok),
+			 "pgace_feature = '%s'", pgace_feature);
+	conflines = replace_token(conflines,
+							  "#pgace_feature = 'none'", repltok);
+
 	snprintf(path, sizeof(path), "%s/postgresql.conf", pg_data);
 
 	writefile(path, conflines);
@@ -2395,6 +2401,7 @@ usage(const char *progname)
 	printf(_("  -U, --username=NAME       database superuser name\n"));
 	printf(_("  -W, --pwprompt            prompt for a password for the new superuser\n"));
 	printf(_("  --pwfile=FILE             read password for the new superuser from file\n"));
+	printf(_("  --pgace-feature=FEATURE   specify an enhanced security feature\n"));
 	printf(_("  -?, --help                show this help, then exit\n"));
 	printf(_("  -V, --version             output version information, then exit\n"));
 	printf(_("\nLess commonly used options:\n"));
@@ -2429,6 +2436,7 @@ main(int argc, char *argv[])
 		{"auth", required_argument, NULL, 'A'},
 		{"pwprompt", no_argument, NULL, 'W'},
 		{"pwfile", required_argument, NULL, 9},
+		{"pgace-feature", required_argument, NULL, 10},
 		{"username", required_argument, NULL, 'U'},
 		{"help", no_argument, NULL, '?'},
 		{"version", no_argument, NULL, 'V'},
@@ -2543,6 +2551,9 @@ main(int argc, char *argv[])
 			case 9:
 				pwfilename = xstrdup(optarg);
 				break;
+			case 10:
+				pgace_feature = xstrdup(optarg);
+				break;
 			case 's':
 				show_setting = true;
 				break;
diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_dump.h
--- base/src/bin/pg_dump/pg_ace_dump.h	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_ace_dump.h	2008-10-14 15:38:18.000000000 +0900
@@ -0,0 +1,284 @@
+#ifndef PG_ACE_DUMP_H
+#define PG_ACE_DUMP_H
+
+#include "pg_backup.h"
+#include "pg_dump.h"
+
+#define PG_ACE_FEATURE_NOTHING		0
+#define PG_ACE_FEATURE_SELINUX		1
+
+#define SELINUX_SYSATTR_NAME		"security_context"
+
+/*
+ * pg_ace_dumpCheckServerFeature
+ *
+ * This hook checks whether the server has required feature, or not.
+ */
+static inline void
+pg_ace_dumpCheckServerFeature(int feature, PGconn *conn)
+{
+	const char *serv_feature;
+
+	if (feature == PG_ACE_FEATURE_NOTHING)
+		return;
+
+	serv_feature = PQparameterStatus(conn, "pgace_security_feature");
+	if (!serv_feature)
+	{
+		fprintf(stderr, "could not get pgace_feature parameter.\n");
+		exit(1);
+	}
+
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		if (strcmp(serv_feature, "selinux") != 0)
+		{
+			fprintf(stderr, "server does not have SELinux feature\n");
+			exit(1);
+		}
+	}
+}
+
+/*
+ * pg_ace_dumpDatabaseXXXX
+ *
+ * These hooks gives a chance to inject a security system column
+ * on dumping pg_database system catalog.
+ * A modified part must have ",d.<security column>" style, and
+ * its result should be printed to buf.
+ */
+static inline const char *
+pg_ace_dumpDatabaseQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",d." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline void
+pg_ace_dumpDatabasePrint(int feature, PQExpBuffer buf,
+						 PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int i_security = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char *dbsecurity = PQgetvalue(res, index, i_security);
+
+		if (dbsecurity && dbsecurity[0] != '\0')
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", dbsecurity);
+	}
+}
+
+/*
+ * pg_ace_dumpClassXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_class system catalog. The modified part has to
+ * be formalized to ",c.<security column>" style. The result
+ * should be preserved at TableInfo->relsecurity to print later,
+ * if exist.
+ */
+static inline const char *
+pg_ace_dumpClassQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",c." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline char *
+pg_ace_dumpClassPreserve(int feature, PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		attno = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *relcontext;
+
+		if (attno < 0)
+			return NULL;
+
+		relcontext = PQgetvalue(res, index, attno);
+
+		if (!relcontext || relcontext[0] == '\0')
+			return NULL;
+
+		return strdup(relcontext);
+	}
+
+	return NULL;
+}
+
+static inline void
+pg_ace_dumpClassPrint(int feature, PQExpBuffer buf, TableInfo *tbinfo)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		char   *relcontext = tbinfo->relsecurity;
+
+		if (relcontext)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", relcontext);
+
+		return;
+	}
+}
+
+/*
+ * pg_ace_dumpAttributeXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_attribute system catalog. The modified part has
+ * to be formalized to ",a.<security conlumn>" style. The result
+ * should be preserved at TableInfo->attsecurity[index] to print
+ * later, if exist.
+ */
+static inline const char *
+pg_ace_dumpAttributeQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",a." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline char *
+pg_ace_dumpAttributePreserve(int feature, PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		attno = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *attcontext;
+
+		if (attno < 0)
+			return NULL;
+
+		attcontext = PQgetvalue(res, index, attno);
+		if (!attcontext || attcontext[0] == '\0')
+			return NULL;
+
+		return strdup(attcontext);
+	}
+
+	return NULL;
+}
+
+static inline void
+pg_ace_dumpAttributePrint(int feature, PQExpBuffer buf,
+						  TableInfo *tbinfo, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		char   *relcontext = tbinfo->relsecurity;
+		char   *attcontext = tbinfo->attsecurity[index];
+
+		if (attcontext)
+		{
+			if (relcontext && strcmp(relcontext, attcontext) == 0)
+				return;
+
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", attcontext);
+		}
+		return;
+	}
+}
+
+/*
+ * pg_ace_dumpProcXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_proc system catalog. The modified part has to be
+ * formalized to "<security conlumn>" style. The result should be
+ * printed later, if exist.
+ */
+static inline const char *
+pg_ace_dumpProcQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return ("," SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline void
+pg_ace_dumpProcPrint(int feature, PQExpBuffer buf,
+					 PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *prosecurity;
+
+		if (i_selinux < 0)
+			return;
+
+		prosecurity = PQgetvalue(res, index, i_selinux);
+		if (prosecurity && prosecurity[0] != '\0')
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", prosecurity);
+	}
+}
+
+/*
+ * pg_ace_dumpTableDataQuery
+ *
+ * This hook gives a chance to inject a security attribute system column
+ * on dumping of user's table.
+ * It must have ",<security column>" style.
+ */
+static inline const char *
+pg_ace_dumpTableDataQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return ("," SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+/*
+ * pg_ace_dumpCopyColumnList
+ *
+ * This hook gives a chance to inject a security attribute column within
+ * COPY statement. When a column is added, you have to return true. It
+ * enables to set needComma 'true', otherwise 'false'.
+ */
+static inline bool
+pg_ace_dumpCopyColumnList(int feature, PQExpBuffer buf)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		appendPQExpBuffer(buf, SELINUX_SYSATTR_NAME);
+		return true;
+	}
+
+	return false;
+}
+
+/*
+ * pg_ace_dumpBlobComments
+ *
+ * This hook gives a chance to inject a query to restore a security
+ * attribute of binary large object.
+ */
+static inline void
+pg_ace_dumpBlobComments(int feature, Archive *AH, PGconn *conn, Oid blobOid)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		PGresult   *res;
+		char		query[256];
+
+		snprintf(query, sizeof(query),
+				 "SELECT lo_get_security(%u)", blobOid);
+		res = PQexec(conn, query);
+		if (!res)
+			return;
+
+		if (PQresultStatus(res) == PGRES_TUPLES_OK && PQntuples(res) == 1)
+			archprintf(AH, "SELECT lo_set_security(%u, '%s');\n",
+					   blobOid, PQgetvalue(res, 0, 0));
+
+		PQclear(res);
+	}
+}
+
+#endif
diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
--- base/src/bin/pg_dump/pg_dump.c	2009-09-10 20:11:35.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.c	2009-09-10 20:54:22.000000000 +0900
@@ -50,6 +50,7 @@ int			optreset;
 
 #include "pg_backup_archiver.h"
 #include "dumputils.h"
+#include "pg_ace_dump.h"
 
 extern char *optarg;
 extern int	optind,
@@ -118,6 +119,8 @@ static int	g_numNamespaces;
 /* flag to turn on/off dollar quoting */
 static int	disable_dollar_quoting = 0;
 
+/* flag to turn on/off security attribute support */
+static int pg_ace_feature = PG_ACE_FEATURE_NOTHING;
 
 static void help(const char *progname);
 static void expand_schema_name_patterns(SimpleStringList *patterns,
@@ -267,6 +270,7 @@ main(int argc, char **argv)
 		{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
 		{"disable-triggers", no_argument, &disable_triggers, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -419,6 +423,8 @@ main(int argc, char **argv)
 					disable_triggers = 1;
 				else if (strcmp(optarg, "use-set-session-authorization") == 0)
 					use_setsessauth = 1;
+				else if (strcmp(optarg, "security-context") == 0)
+					pg_ace_feature = PG_ACE_FEATURE_SELINUX;
 				else
 				{
 					fprintf(stderr,
@@ -549,6 +555,8 @@ main(int argc, char **argv)
 	std_strings = PQparameterStatus(g_conn, "standard_conforming_strings");
 	g_fout->std_strings = (std_strings && strcmp(std_strings, "on") == 0);
 
+	pg_ace_dumpCheckServerFeature(pg_ace_feature, g_conn);
+
 	/* Set the datestyle to ISO to ensure the dump's portability */
 	do_sql_command(g_conn, "SET DATESTYLE = ISO");
 
@@ -771,6 +779,7 @@ help(const char *progname)
 	printf(_("  --use-set-session-authorization\n"
 			 "                              use SESSION AUTHORIZATION commands instead of\n"
 	"                              ALTER OWNER commands to set ownership\n"));
+	printf(_("  --security-context          enable to dump security context of SE-PostgreSQL\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -1171,7 +1180,8 @@ dumpTableData_insert(Archive *fout, void
 	if (fout->remoteVersion >= 70100)
 	{
 		appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR "
-						  "SELECT * FROM ONLY %s",
+						  "SELECT * %s FROM ONLY %s",
+						  pg_ace_dumpTableDataQuery(pg_ace_feature),
 						  fmtQualifiedId(tbinfo->dobj.namespace->dobj.name,
 										 classname));
 	}
@@ -1791,11 +1801,14 @@ dumpBlobComments(Archive *AH, void *arg)
 			Oid			blobOid;
 			char	   *comment;
 
+			blobOid = atooid(PQgetvalue(res, i, 0));
+
+			pg_ace_dumpBlobComments(pg_ace_feature, AH, g_conn, blobOid);
+
 			/* ignore blobs without comments */
 			if (PQgetisnull(res, i, 1))
 				continue;
 
-			blobOid = atooid(PQgetvalue(res, i, 0));
 			comment = PQgetvalue(res, i, 1);
 
 			printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ",
@@ -2933,6 +2946,7 @@ getTables(int *numTables)
 						  "d.refobjsubid as owning_col, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
 						  "array_to_string(c.reloptions, ', ') as reloptions "
+						  "%s "
 						  "from pg_class c "
 						  "left join pg_depend d on "
 						  "(c.relkind = '%c' and "
@@ -2942,6 +2956,7 @@ getTables(int *numTables)
 						  "where relkind in ('%c', '%c', '%c', '%c') "
 						  "order by c.oid",
 						  username_subquery,
+						  pg_ace_dumpClassQuery(pg_ace_feature),
 						  RELKIND_SEQUENCE,
 						  RELKIND_RELATION, RELKIND_SEQUENCE,
 						  RELKIND_VIEW, RELKIND_COMPOSITE_TYPE);
@@ -3138,6 +3153,7 @@ getTables(int *numTables)
 		}
 		tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace));
 		tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions));
+		tblinfo[i].relsecurity = pg_ace_dumpClassPreserve(pg_ace_feature, res, i);
 
 		/* other fields were zeroed above */
 
@@ -4369,11 +4385,13 @@ getTableAttrs(TableInfo *tblinfo, int nu
 			appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, "
 				  "a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, "
 				   "pg_catalog.format_type(t.oid,a.atttypmod) as atttypname "
+							  "%s "		/* security context, if required */
 			 "from pg_catalog.pg_attribute a left join pg_catalog.pg_type t "
 							  "on a.atttypid = t.oid "
 							  "where a.attrelid = '%u'::pg_catalog.oid "
 							  "and a.attnum > 0::pg_catalog.int2 "
 							  "order by a.attrelid, a.attnum",
+							  pg_ace_dumpAttributeQuery(pg_ace_feature),
 							  tbinfo->dobj.catId.oid);
 		}
 		else if (g_fout->remoteVersion >= 70100)
@@ -4432,6 +4450,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
 		tbinfo->typstorage = (char *) malloc(ntups * sizeof(char));
 		tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
+		tbinfo->attsecurity = (char **) malloc(ntups * sizeof(char *));
 		tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
 		tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
@@ -4463,6 +4482,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
 			tbinfo->inhAttrs[j] = false;
 			tbinfo->inhAttrDef[j] = false;
 			tbinfo->inhNotNull[j] = false;
+
+			tbinfo->attsecurity[j] = pg_ace_dumpAttributePreserve(pg_ace_feature, res, j);
 		}
 
 		PQclear(res);
@@ -6466,8 +6487,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 						  "provolatile, proisstrict, prosecdef, "
 						  "proconfig, procost, prorows, "
 						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
+						  "%s "		/* security context, if required */
 						  "FROM pg_catalog.pg_proc "
 						  "WHERE oid = '%u'::pg_catalog.oid",
+						  pg_ace_dumpProcQuery(pg_ace_feature),
 						  finfo->dobj.catId.oid);
 	}
 	else if (g_fout->remoteVersion >= 80100)
@@ -6705,6 +6728,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	if (prosecdef[0] == 't')
 		appendPQExpBuffer(q, " SECURITY DEFINER");
 
+	pg_ace_dumpProcPrint(pg_ace_feature, q, res, 0);
+
 	/*
 	 * COST and ROWS are emitted only if present and not default, so as not to
 	 * break backwards-compatibility of the dump without need.	Keep this code
@@ -8786,6 +8811,8 @@ dumpTableSchema(Archive *fout, TableInfo
 				if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
 					appendPQExpBuffer(q, " NOT NULL");
 
+				pg_ace_dumpAttributePrint(pg_ace_feature, q, tbinfo, j);
+
 				actual_atts++;
 			}
 		}
@@ -8833,6 +8860,8 @@ dumpTableSchema(Archive *fout, TableInfo
 		if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0)
 			appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions);
 
+		pg_ace_dumpClassPrint(pg_ace_feature, q, tbinfo);
+
 		appendPQExpBuffer(q, ";\n");
 
 		/* Loop dumping statistics and storage statements */
@@ -10250,6 +10279,10 @@ fmtCopyColumnList(const TableInfo *ti)
 
 	appendPQExpBuffer(q, "(");
 	needComma = false;
+
+	if (pg_ace_dumpCopyColumnList(pg_ace_feature, q))
+		needComma = true;
+
 	for (i = 0; i < numatts; i++)
 	{
 		if (attisdropped[i])
diff -rpNU3 base/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h
--- base/src/bin/pg_dump/pg_dump.h	2009-02-02 11:47:17.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.h	2009-02-02 11:58:34.000000000 +0900
@@ -238,6 +238,7 @@ typedef struct _tableInfo
 	char		relkind;
 	char	   *reltablespace;	/* relation tablespace */
 	char	   *reloptions;		/* options specified by WITH (...) */
+	char	   *relsecurity;	/* security attribute of the relation */
 	bool		hasindex;		/* does it have any indexes? */
 	bool		hasrules;		/* does it have any rules? */
 	bool		hasoids;		/* does it have OIDs? */
@@ -262,6 +263,7 @@ typedef struct _tableInfo
 	char	   *typstorage;		/* type storage scheme */
 	bool	   *attisdropped;	/* true if attr is dropped; don't dump it */
 	bool	   *attislocal;		/* true if attr has local definition */
+	char	  **attsecurity;	/* security attribute of attribute (column) */
 
 	/*
 	 * Note: we need to store per-attribute notnull, default, and constraint
diff -rpNU3 base/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c
--- base/src/bin/pg_dump/pg_dumpall.c	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dumpall.c	2008-07-11 14:10:51.000000000 +0900
@@ -27,6 +27,7 @@ int			optreset;
 #endif
 
 #include "dumputils.h"
+#include "pg_ace_dump.h"
 
 
 /* version string we expect back from pg_dump */
@@ -67,6 +68,9 @@ static int	disable_triggers = 0;
 static int	use_setsessauth = 0;
 static int	server_version;
 
+/* flag to turn on/off security attribute support */
+static int	pg_ace_feature = PG_ACE_FEATURE_NOTHING;
+
 static FILE *OPF;
 static char *filename = NULL;
 
@@ -119,6 +123,7 @@ main(int argc, char *argv[])
 		{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
 		{"disable-triggers", no_argument, &disable_triggers, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -290,6 +295,8 @@ main(int argc, char *argv[])
 					appendPQExpBuffer(pgdumpopts, " --disable-triggers");
 				else if (strcmp(optarg, "use-set-session-authorization") == 0)
 					 /* no-op, still allowed for compatibility */ ;
+				else if (strcmp(optarg, "security-context") == 0)
+					pg_ace_feature = PG_ACE_FEATURE_SELINUX;
 				else
 				{
 					fprintf(stderr,
@@ -316,6 +323,8 @@ main(int argc, char *argv[])
 		appendPQExpBuffer(pgdumpopts, " --disable-triggers");
 	if (use_setsessauth)
 		appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
+	if (pg_ace_feature == PG_ACE_FEATURE_SELINUX)
+		appendPQExpBuffer(pgdumpopts, " --security-context");
 
 	if (optind < argc)
 	{
@@ -391,6 +400,8 @@ main(int argc, char *argv[])
 		}
 	}
 
+	pg_ace_dumpCheckServerFeature(pg_ace_feature, conn);
+
 	/*
 	 * Open the output file if required, otherwise use stdout
 	 */
@@ -505,6 +516,7 @@ help(void)
 	printf(_("  --use-set-session-authorization\n"
 			 "                           use SESSION AUTHORIZATION commands instead of\n"
 			 "                           OWNER TO commands\n"));
+	printf(_("  --security-context       enables to dump security context of SE-PostgreSQL\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -915,16 +927,18 @@ dumpCreateDB(PGconn *conn)
 	fprintf(OPF, "--\n-- Database creation\n--\n\n");
 
 	if (server_version >= 80100)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(rolname, (select rolname from pg_authid where oid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
 						   "datistemplate, datacl, datconnlimit, "
 						   "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
+						   "%s "
 			  "FROM pg_database d LEFT JOIN pg_authid u ON (datdba = u.oid) "
-						   "WHERE datallowconn ORDER BY 1");
+						   "WHERE datallowconn ORDER BY 1",
+						   pg_ace_dumpDatabaseQuery(pg_ace_feature));
 	else if (server_version >= 80000)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -933,7 +947,7 @@ dumpCreateDB(PGconn *conn)
 		   "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
 						   "WHERE datallowconn ORDER BY 1");
 	else if (server_version >= 70300)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -942,7 +956,7 @@ dumpCreateDB(PGconn *conn)
 		   "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
 						   "WHERE datallowconn ORDER BY 1");
 	else if (server_version >= 70100)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce("
 					"(select usename from pg_shadow where usesysid=datdba), "
@@ -958,7 +972,7 @@ dumpCreateDB(PGconn *conn)
 		 * Note: 7.0 fails to cope with sub-select in COALESCE, so just deal
 		 * with getting a NULL by not printing any OWNER clause.
 		 */
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 					"(select usename from pg_shadow where usesysid=datdba), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -968,6 +982,7 @@ dumpCreateDB(PGconn *conn)
 						   "FROM pg_database d "
 						   "ORDER BY 1");
 	}
+	res = executeQuery(conn, buf->data);
 
 	for (i = 0; i < PQntuples(res); i++)
 	{
@@ -1021,6 +1036,8 @@ dumpCreateDB(PGconn *conn)
 				appendPQExpBuffer(buf, " CONNECTION LIMIT = %s",
 								  dbconnlimit);
 
+			pg_ace_dumpDatabasePrint(pg_ace_feature, buf, res, i);
+
 			appendPQExpBuffer(buf, ";\n");
 
 			if (strcmp(dbistemplate, "t") == 0)

sepostgresql-policy-8.3.8-2.patch:
 Makefile                 |   41 ++++++
 README                   |   49 +++++++
 sepostgresql-devel.if    |    1 
 sepostgresql-devel.te    |  120 ++++++++++++++++++
 sepostgresql.fc.template |   15 ++
 sepostgresql.if          |  259 +++++++++++++++++++++++++++++++++++++++
 sepostgresql.te          |  308 +++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 793 insertions(+)

--- NEW FILE sepostgresql-policy-8.3.8-2.patch ---
diff -rpNU3 base/src/backend/security/sepgsql/policy/Makefile sepgsql/src/backend/security/sepgsql/policy/Makefile
--- base/src/backend/security/sepgsql/policy/Makefile	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/Makefile	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,41 @@
+#
+# contrib/sepgsql_policy/Makefile
+#   Makefile of security policy module for SE-PostgreSQL
+#
+top_builddir = ../../../../..
+include $(top_builddir)/src/Makefile.global
+
+policy_basedir	:= /usr/share/selinux
+policy_makefile	:= $(policy_basedir)/devel/Makefile
+policy_types	:= targeted mls
+policy		:= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
+package_names	:= sepostgresql sepostgresql-devel
+prefix_ptn	:= "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g"
+bindir_ptn	:= "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g"
+libdir_ptn	:= "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g"
+
+all:
+	$(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;))
+	$(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;)
+
+.install-policy:
+	test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy)
+	$(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;)
+
+install: all
+	$(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;)
+
+%.pp: %.te %.if %.fc
+	rm -f $@
+	$(MAKE) NAME=$(policy) -f $(policy_makefile) $@
+	mv $@ $@.$(policy)
+
+sepostgresql-devel.fc: sepostgresql.fc.template
+	cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@
+
+sepostgresql.fc: sepostgresql.fc.template
+	cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@
+
+clean:
+	$(MAKE) -f $(policy_makefile) clean
+	rm -f *.pp.* *.fc
diff -rpNU3 base/src/backend/security/sepgsql/policy/README sepgsql/src/backend/security/sepgsql/policy/README
--- base/src/backend/security/sepgsql/policy/README	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/README	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,49 @@
+The security policy module of SE-PostgreSQL
+-------------------------------------------
+
+o Introduction
+
+  We provide two kind of security policy modules.
+
+  One is "sepostgresql.pp" which contains full-set of security policy
+  and suitable for legacy base policy (selinux-policy-3.4.1, or prior).
+
+  The other is "sepostgresql-devel.pp" which provides several booleans
+  for developers, and suitable for newer base policy (selinux-policy-3.4.2,
+  or later).
+
+  In the selinux-policy-3.4.2, most part of the policy got upstreamed.
+  So, we don't need to install "sepostgresql.pp" explicitly on the newer
+  base security policy.
+
+  If you need to run regression test, or (don't) want to generate access
+  logs, install "sepostgresql-devel.pp" and turn on/off booleans.
+
+o Build & Installation
+
+  $ cd src/backend/security/sepgsql/policy
+  $ make
+  $ su
+  # /usr/sbin/semodule -i sepostgresql-devel.pp
+      or
+  #  /usr/sbin/semodule -i sepostgresql.pp
+
+o Booleans
+
+- sepgsql_enable_users_ddl (default: on)
+  This boolean enables to control to execute DDL statement come from
+  confined users.
+
+- sepgsql_enable_auditallow (default: off)
+  This boolean enables to generate access allow logs except for tuple
+  level.
+
+- sepgsql_enable_auditdeny (default: on)
+  This boolean enables to generata access denied logs except for tuple
+  level.
+
+- sepgsql_regression_test_mode (default: off)
+  This boolean provides several permission to run regression test on
+  your home directory. It enables to load shared library files deployed
+  on home directory.
+  However, we don't recommend it to turn on in the operation phase.
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.if	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1 @@
+## There are no interface declaration
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te	2009-02-26 21:30:17.000000000 +0900
@@ -0,0 +1,120 @@
+policy_module(sepostgresql-devel, 3.23)
+
+gen_require(`
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
+
+	attribute sepgsql_client_type;
+	attribute sepgsql_unconfined_type;
+
+	attribute sepgsql_database_type;
+	attribute sepgsql_table_type;
+	attribute sepgsql_sysobj_table_type;
+	attribute sepgsql_procedure_type;
+	attribute sepgsql_blob_type;
+	attribute sepgsql_module_type;
+
+	# for regression test
+	type bin_t;
+	type user_home_t;
+	type sepgsql_trusted_proc_t;
+
+	attribute tmpfile;
+	attribute user_ptynode;
+')
+
+#################################
+#
+# Domain for Testcases
+#
+
+role sepgsql_test_r;
+
+userdom_unpriv_user_template(sepgsql_test)
+
+ifdef(`postgresql_role', `
+	postgresql_role(sepgsql_test_r, sepgsql_test_t)
+',`
+	postgresql_userdom_template(sepgsql_test, sepgsql_test_t, sepgsql_test_r)
+')
+
+allow sepgsql_test_t tmpfile : dir search_dir_perms;
+allow sepgsql_test_t tmpfile : file rw_file_perms;
+allow sepgsql_test_t user_ptynode : chr_file rw_file_perms;
+
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+		role unconfined_r;
+	')
+	allow unconfined_t sepgsql_test_t : process transition;
+	role unconfined_r types sepgsql_test_t;
+	role unconfined_r types sepgsql_trusted_proc_t;
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
+#
+
+## <desc>
+## <p>
+## Allow to generate auditallow logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditallow, false)
+
+## <desc>
+## <p>
+## Allow to generate auditdeny logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditdeny,  true)
+
+## <desc>
+## <p>
+## Allow widespread permissions for regression test
+## Don't set TRUE on operation phase
+## </p>
+## </desc>
+gen_tunable(sepgsql_regression_test_mode, false)
+
+########################################
+#
+# SE-PostgreSQL audit switch for debugging
+#
+tunable_policy(`sepgsql_enable_auditallow',`
+	auditallow domain sepgsql_database_type  : db_database *;
+	auditallow domain sepgsql_table_type     : db_table *;
+	auditallow domain sepgsql_table_type     : db_column *;
+	auditallow domain sepgsql_table_type     : db_tuple { relabelfrom relabelto };
+	auditallow domain sepgsql_procedure_type : db_procedure *;
+	auditallow domain sepgsql_blob_type      : db_blob *;
+	auditallow domain sepgsql_module_type    : db_database { install_module };
+	auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+tunable_policy(`! sepgsql_enable_auditdeny',`
+	dontaudit domain sepgsql_database_type   : db_database *;
+	dontaudit domain sepgsql_table_type      : db_table *;
+	dontaudit domain sepgsql_table_type      : db_column *;
+	dontaudit domain sepgsql_table_type      : db_tuple { relabelfrom relabelto };
+	dontaudit domain sepgsql_procedure_type  : db_procedure *;
+	dontaudit domain sepgsql_blob_type       : db_blob *;
+	dontaudit domain sepgsql_module_type     : db_database { install_module };
+	dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+########################################
+#
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+	allow sepgsql_client_type       user_home_t : db_database { install_module };
+	allow sepgsql_unconfined_type   user_home_t : db_database { install_module };
+	allow sepgsql_database_type     user_home_t : db_database { load_module };
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.fc.template sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template
--- base/src/backend/security/sepgsql/policy/sepostgresql.fc.template	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,15 @@
+#
+# SE-PostgreSQL install path
+#
+%%__prefix__%%(/.*)?			--	gen_context(system_u:object_r:usr_t,s0)
+
+%%__bindir__%%/(se)?postgres		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+%%__bindir__%%/(se)?pg_ctl		--	gen_context(system_u:object_r:initrc_exec_t,s0)
+%%__bindir__%%/initdb(\.sepgsql)?	--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+%%__bindir__%%(/.*)?			--	gen_context(system_u:object_r:bin_t,s0)
+
+%%__libdir__%%(/.*)?			--	gen_context(system_u:object_r:lib_t,s0)
+
+/var/lib/sepgsql(/.*)?				gen_context(system_u:object_r:postgresql_db_t,s0)
+/var/lib/sepgsql/pgstartup\.log			gen_context(system_u:object_r:postgresql_log_t,s0)
+/var/log/sepostgresql\.log.*		--	gen_context(system_u:object_r:postgresql_log_t,s0)
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if
--- base/src/backend/security/sepgsql/policy/sepostgresql.if	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if	2008-07-11 17:12:06.000000000 +0900
@@ -0,0 +1,259 @@
+#######################################
+## <summary>
+##      The userdomain template for the SE-PostgreSQL.
+## </summary>
+## <desc>
+##      This template creates a delivered types which are used
+##     for given userdomains.
+## </desc>
+## <param name="userdomain_prefix">
+##      <summary>
+##      The prefix of the user domain (e.g., user
+##      is the prefix for user_t).
+##      </summary>
+## </param>
+## <param name="user_domain">
+##     <summary>
+##      The type of the user domain.
+##      </summary>
+## </param>
+## <param name="user_role">
+##      <summary>
+##      The role associated with the user domain.
+##      </summary>
+## </param>
+#
+template(`sepgsql_userdom_template',`
+	gen_require(`
+		class db_database all_db_database_perms;
+		class db_table all_db_table_perms;
+		class db_procedure all_db_procedure_perms;
+		class db_column all_db_column_perms;
+		class db_tuple all_db_tuple_perms;
+		class db_blob all_db_blob_perms;
+
+		attribute sepgsql_client_type;
+		attribute sepgsql_database_type;
+		attribute sepgsql_sysobj_table_type;
+
+		type sepgsql_trusted_proc_t;
+		type sepgsql_trusted_proc_exec_t;
+	')
+
+	########################################
+	#
+	# Declarations
+	#
+
+	typeattribute $2 sepgsql_client_type;
+
+	type $1_sepgsql_blob_t;
+	sepgsql_blob_object($1_sepgsql_blob_t)
+
+	type $1_sepgsql_proc_exec_t;
+	sepgsql_procedure_object($1_sepgsql_proc_exec_t)
+
+	type $1_sepgsql_sysobj_t;
+	sepgsql_system_table_object($1_sepgsql_sysobj_t)
+
+	type $1_sepgsql_table_t;
+	sepgsql_table_object($1_sepgsql_table_t)
+
+	role $3 types sepgsql_trusted_proc_t;
+
+	##############################
+	#
+	# Client local policy
+	#
+
+	tunable_policy(`sepgsql_enable_users_ddl',`
+		allow $2 $1_sepgsql_table_t  : db_table { create drop };
+		type_transition $2 sepgsql_database_type:db_table $1_sepgsql_table_t;
+
+		allow $2 $1_sepgsql_table_t  : db_column { create drop };
+
+		allow $2 $1_sepgsql_sysobj_t : db_tuple { update insert delete };
+		type_transition $2 sepgsql_sysobj_table_type:db_tuple $1_sepgsql_sysobj_t;
+	')
+
+	allow $2 $1_sepgsql_table_t  : db_table  { getattr setattr use select update insert delete };
+	allow $2 $1_sepgsql_table_t  : db_column { getattr setattr use select update insert };
+	allow $2 $1_sepgsql_table_t  : db_tuple  { use select update insert delete };
+	allow $2 $1_sepgsql_sysobj_t : db_tuple  { use select };
+
+	allow $2 $1_sepgsql_proc_exec_t : db_procedure { create drop getattr setattr execute };
+	type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_exec_t;
+
+	allow $2 $1_sepgsql_blob_t : db_blob { create drop getattr setattr read write };
+	type_transition $2 sepgsql_database_type:db_blob $1_sepgsql_blob_t;
+
+	allow $2 sepgsql_trusted_proc_t:process transition;
+	type_transition $2 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL loadable shared library module
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_loadable_module',`
+	gen_require(`
+		attribute sepgsql_module_type;
+	')
+
+	typeattribute $1 sepgsql_module_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL database object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_database_object',`
+	gen_require(`
+		attribute sepgsql_database_type;
+	')
+
+	typeattribute $1 sepgsql_database_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL table/column/tuple object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a table/column/tuple object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_table_object',`
+	gen_require(`
+		attribute sepgsql_table_type;
+	')
+
+	typeattribute $1 sepgsql_table_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL system table/column/tuple object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a table/column/tuple object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_system_table_object',`
+	gen_require(`
+		attribute sepgsql_table_type;
+		attribute sepgsql_sysobj_table_type;
+	')
+
+	typeattribute $1 sepgsql_table_type;
+	typeattribute $1 sepgsql_sysobj_table_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL procedure object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_procedure_object',`
+	gen_require(`
+		attribute sepgsql_procedure_type;
+	')
+
+	typeattribute $1 sepgsql_procedure_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL binary large object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database binary large object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_blob_object',`
+	gen_require(`
+		attribute sepgsql_blob_type;
+	')
+
+	typeattribute $1 sepgsql_blob_type;
+')
+
+########################################
+## <summary>
+##      Allow the specified domain unprivileged accesses to unifined database objects
+##     managed by SE-PostgreSQL,
+## </summary>
+## <param name="domain">
+##      <summary>
+##      Domain allowed access.
+##      </summary>
+## </param>
+#
+interface(`sepgsql_unpriv_client',`
+	gen_require(`
+		class db_table all_db_table_perms;
+		class db_procedure all_db_procedure_perms;
+		class db_blob all_db_blob_perms;
+
+		attribute sepgsql_client_type;
+		attribute sepgsql_database_type;
+
+		type sepgsql_table_t;
+		type sepgsql_proc_t;
+		type sepgsql_blob_t;
+
+		type sepgsql_trusted_proc_t;
+		type sepgsql_trusted_proc_exec_t;
+	')
+
+	typeattribute $1 sepgsql_client_type;
+
+	type_transition $1 sepgsql_database_type:db_table sepgsql_table_t;
+	type_transition $1 sepgsql_database_type:db_procedure sepgsql_proc_t;
+	type_transition $1 sepgsql_database_type:db_blob sepgsql_blob_t;
+
+	type_transition $1 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+	allow $1 sepgsql_trusted_proc_t:process transition;
+')
+
+########################################
+## <summary>
+##      Allow the specified domain unconfined accesses to any database objects
+##     managed by SE-PostgreSQL,
+## </summary>
+## <param name="domain">
+##      <summary>
+##      Domain allowed access.
+##      </summary>
+## </param>
+#
+interface(`sepgsql_unconfined',`
+	gen_require(`
+		attribute sepgsql_unconfined_type;
+	')
+
+	typeattribute $1 sepgsql_unconfined_type;
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te
--- base/src/backend/security/sepgsql/policy/sepostgresql.te	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te	2008-07-11 17:12:06.000000000 +0900
@@ -0,0 +1,308 @@
+policy_module(sepostgresql, 3.11)
+
+gen_require(`
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
+
+	attribute domain, home_type;
+	type postgresql_t, unlabeled_t;
+
+	role system_r;
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
+#
+
+## <desc>
+## <p>
+## Allow to generate auditallow logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditallow, false)
+
+## <desc>
+## <p>
+## Allow to generate auditdeny logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditdeny,  true)
+
+## <desc>
+## <p>
+## Allow unprivileged users to execute DDL statement
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_users_ddl,  true)
+
+## <desc>
+## <p>
+## Allow widespread permissions for regression test
+## Don't set TRUE on operation phase
+## </p>
+## </desc>
+gen_tunable(sepgsql_regression_test_mode, false)
+
+# database clients attribute
+attribute sepgsql_client_type;
+attribute sepgsql_unconfined_type;
+
+# database objects attribute
+attribute sepgsql_database_type;
+attribute sepgsql_table_type;
+attribute sepgsql_sysobj_table_type;
+attribute sepgsql_procedure_type;
+attribute sepgsql_blob_type;
+attribute sepgsql_module_type;
+
+# database object types
+type sepgsql_blob_t;
+sepgsql_blob_object(sepgsql_blob_t)
+
+type sepgsql_db_t;
+sepgsql_database_object(sepgsql_db_t)
+
+type sepgsql_fixed_table_t;
+sepgsql_table_object(sepgsql_fixed_table_t)
+
+type sepgsql_proc_t;
+sepgsql_procedure_object(sepgsql_proc_t)
+
+type sepgsql_ro_blob_t;
+sepgsql_blob_object(sepgsql_ro_blob_t)
+
+type sepgsql_ro_table_t;
+sepgsql_table_object(sepgsql_ro_table_t)
+
+type sepgsql_secret_blob_t;
+sepgsql_blob_object(sepgsql_secret_blob_t)
+
+type sepgsql_secret_table_t;
+sepgsql_table_object(sepgsql_secret_table_t)
+
+type sepgsql_sysobj_t;
+sepgsql_system_table_object(sepgsql_sysobj_t)
+
+type sepgsql_table_t;
+sepgsql_table_object(sepgsql_table_t)
+
+type sepgsql_trusted_proc_exec_t;
+sepgsql_procedure_object(sepgsql_trusted_proc_exec_t)
+
+# Trusted Procedure Domain
+type sepgsql_trusted_proc_t;
+domain_type(sepgsql_trusted_proc_t)
+sepgsql_unconfined(sepgsql_trusted_proc_t)
+role system_r types sepgsql_trusted_proc_t;
+
+########################################
+#
+# SE-PostgreSQL Local Policy
+#
+allow postgresql_t self:netlink_selinux_socket create_socket_perms;
+selinux_get_enforce_mode(postgresql_t)
+selinux_validate_context(postgresql_t)
+selinux_compute_access_vector(postgresql_t)
+selinux_compute_create_context(postgresql_t)
+selinux_compute_relabel_context(postgresql_t)
+seutil_libselinux_linked(postgresql_t)
+
+allow postgresql_t sepgsql_database_type:db_database *;
+type_transition postgresql_t postgresql_t:db_database sepgsql_db_t;
+
+allow postgresql_t sepgsql_module_type:db_database install_module;
+allow postgresql_t sepgsql_table_type:{ db_table db_column db_tuple } *;
+allow postgresql_t sepgsql_procedure_type:db_procedure *;
+allow postgresql_t sepgsql_blob_type:db_blob *;
+
+# server specific type transitions
+type_transition postgresql_t sepgsql_database_type:db_table sepgsql_sysobj_t;
+type_transition postgresql_t sepgsql_database_type:db_procedure sepgsql_proc_t;
+type_transition postgresql_t sepgsql_database_type:db_blob sepgsql_blob_t;
+
+# Database/Loadable module
+allow sepgsql_database_type sepgsql_module_type:db_database load_module;
+
+########################################
+#
+# Rules common to all clients
+#
+
+# Client domain constraint
+allow sepgsql_client_type sepgsql_db_t:db_database { getattr access get_param set_param };
+type_transition sepgsql_client_type sepgsql_client_type:db_database sepgsql_db_t;
+
+allow sepgsql_client_type sepgsql_fixed_table_t:db_table { getattr use select insert };
+allow sepgsql_client_type sepgsql_fixed_table_t:db_column { getattr use select insert };
+allow sepgsql_client_type sepgsql_fixed_table_t:db_tuple { use select insert };
+
+allow sepgsql_client_type sepgsql_table_t:db_table { getattr use select update insert delete };
+allow sepgsql_client_type sepgsql_table_t:db_column { getattr use select update insert };
+allow sepgsql_client_type sepgsql_table_t:db_tuple { use select update insert delete };
+
+allow sepgsql_client_type sepgsql_ro_table_t:db_table { getattr use select };
+allow sepgsql_client_type sepgsql_ro_table_t:db_column { getattr use select };
+allow sepgsql_client_type sepgsql_ro_table_t:db_tuple { use select };
+
+allow sepgsql_client_type sepgsql_secret_table_t:db_table getattr;
+allow sepgsql_client_type sepgsql_secret_table_t:db_column getattr;
+
+allow sepgsql_client_type sepgsql_sysobj_t:db_table { getattr use select };
+allow sepgsql_client_type sepgsql_sysobj_t:db_column { getattr use select };
+allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select };
+
+allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute };
+allow sepgsql_client_type sepgsql_trusted_proc_t:db_procedure { getattr execute entrypoint };
+
+allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write };
+allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read };
+allow sepgsql_client_type sepgsql_secret_blob_t:db_blob getattr;
+
+tunable_policy(`sepgsql_enable_users_ddl',`
+	allow sepgsql_client_type sepgsql_table_t:db_table { create drop setattr };
+	allow sepgsql_client_type sepgsql_table_t:db_column { create drop setattr };
+	allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { update insert delete };
+')
+
+########################################
+#
+# Unconfined access to this module
+#
+
+allow sepgsql_unconfined_type sepgsql_database_type:db_database *;
+allow sepgsql_unconfined_type sepgsql_table_type:{ db_table db_column db_tuple } *;
+allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *;
+allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_t }:db_procedure *;
+allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto };
+allow sepgsql_unconfined_type sepgsql_module_type:db_database install_module;
+
+type_transition sepgsql_unconfined_type sepgsql_unconfined_type:db_database sepgsql_db_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_table sepgsql_table_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_procedure sepgsql_proc_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_blob sepgsql_blob_t;
+
+
+########################################
+#
+# Allow permission to external domains
+#
+
+# relabelfrom for invalid security context
+allow sepgsql_unconfined_type unlabeled_t:db_database { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_table { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_procedure { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_column { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_tuple { update relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_blob { setattr relabelfrom };
+
+# administrative client domain
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+	')
+	sepgsql_unconfined(unconfined_t)
+')
+
+optional_policy(`
+	gen_require(`
+		type sysadm_t;
+	')
+	sepgsql_unconfined(sysadm_t)
+')
+
+# unprivilleged client domain
+optional_policy(`
+	gen_require(`
+		type user_t;
+		role user_r;
+	')
+	sepgsql_userdom_template(user,user_t,user_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type staff_t;
+		role staff_r;
+	')
+	sepgsql_userdom_template(staff,staff_t,staff_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type guest_t;
+		role guest_r;
+	')
+	sepgsql_userdom_template(guest,guest_t,guest_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type xguest_t;
+		role xguest_r;
+	')
+	sepgsql_userdom_template(xguest,xguest_t,xguest_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type httpd_t;
+	')
+	sepgsql_unpriv_client(httpd_t)
+')
+
+optional_policy(`
+	gen_require(`
+		type httpd_sys_script_t;
+	')
+	sepgsql_unpriv_client(httpd_sys_script_t)
+')
+
+# SE-PostgreSQL loadable modules
+optional_policy(`
+	gen_require(`
+		type lib_t, textrel_shlib_t;
+	')
+	sepgsql_loadable_module(lib_t)
+	sepgsql_loadable_module(textrel_shlib_t)
+')
+
+########################################
+#
+# SE-PostgreSQL audit switch for debugging
+#
+tunable_policy(`sepgsql_enable_auditallow',`
+	auditallow domain sepgsql_database_type  : db_database *;
+	auditallow domain sepgsql_table_type     : db_table *;
+	auditallow domain sepgsql_table_type     : db_column *;
+	auditallow domain sepgsql_procedure_type : db_procedure *;
+	auditallow domain sepgsql_blob_type      : db_blob *;
+	auditallow domain sepgsql_module_type    : db_database { install_module };
+	auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+tunable_policy(`! sepgsql_enable_auditdeny',`
+	dontaudit domain sepgsql_database_type   : db_database *;
+	dontaudit domain sepgsql_table_type      : db_table *;
+	dontaudit domain sepgsql_table_type      : db_column *;
+	dontaudit domain sepgsql_procedure_type  : db_procedure *;
+	dontaudit domain sepgsql_blob_type       : db_blob *;
+	dontaudit domain sepgsql_module_type     : db_database { install_module };
+	dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+dontaudit domain { sepgsql_table_type - sepgsql_sysobj_table_type } : db_tuple { use select update insert delete };
+
+########################################
+#
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+	allow sepgsql_client_type       home_type : db_database { install_module };
+	allow sepgsql_unconfined_type   home_type : db_database { install_module };
+	allow sepgsql_database_type     home_type : db_database { load_module };
+')

sepostgresql-sepgsql-8.3.8-2.patch:
 configure                                       |  113 +
 configure.in                                    |   13 
 contrib/sepgsql_policy/Makefile                 |   40 
 contrib/sepgsql_policy/README                   |   50 
 contrib/sepgsql_policy/sepostgresql-devel.if    |    1 
 contrib/sepgsql_policy/sepostgresql-devel.te    |   82 +
 contrib/sepgsql_policy/sepostgresql.fc.template |   15 
 contrib/sepgsql_policy/sepostgresql.if          |  259 ++++
 contrib/sepgsql_policy/sepostgresql.te          |  308 +++++
 src/Makefile.global.in                          |    1 
 src/backend/Makefile                            |    7 
 src/backend/access/common/heaptuple.c           |   35 
 src/backend/access/common/tupdesc.c             |    6 
 src/backend/access/heap/heapam.c                |   19 
 src/backend/access/heap/tuptoaster.c            |   13 
 src/backend/bootstrap/bootparse.y               |   11 
 src/backend/bootstrap/bootstrap.c               |    4 
 src/backend/catalog/Makefile                    |    1 
 src/backend/catalog/catalog.c                   |    4 
 src/backend/catalog/heap.c                      |   56 
 src/backend/catalog/index.c                     |   10 
 src/backend/catalog/pg_aggregate.c              |    5 
 src/backend/catalog/pg_largeobject.c            |    5 
 src/backend/catalog/pg_proc.c                   |    6 
 src/backend/catalog/toasting.c                  |    3 
 src/backend/commands/cluster.c                  |    7 
 src/backend/commands/copy.c                     |  229 +++
 src/backend/commands/dbcommands.c               |   19 
 src/backend/commands/functioncmds.c             |   29 
 src/backend/commands/lockcmds.c                 |    3 
 src/backend/commands/proclang.c                 |    6 
 src/backend/commands/tablecmds.c                |   17 
 src/backend/commands/trigger.c                  |   22 
 src/backend/executor/execJunk.c                 |    5 
 src/backend/executor/execMain.c                 |  147 ++
 src/backend/executor/execQual.c                 |    4 
 src/backend/executor/execScan.c                 |   20 
 src/backend/executor/execTuples.c               |   14 
 src/backend/executor/execUtils.c                |    6 
 src/backend/executor/functions.c                |    2 
 src/backend/executor/nodeAgg.c                  |    5 
 src/backend/executor/nodeMergejoin.c            |    2 
 src/backend/executor/nodeSubplan.c              |    4 
 src/backend/executor/spi.c                      |    2 
 src/backend/libpq/be-fsstubs.c                  |   16 
 src/backend/nodes/copyfuncs.c                   |   29 
 src/backend/nodes/equalfuncs.c                  |   22 
 src/backend/nodes/outfuncs.c                    |   34 
 src/backend/nodes/readfuncs.c                   |   43 
 src/backend/optimizer/plan/createplan.c         |    6 
 src/backend/optimizer/plan/planner.c            |    1 
 src/backend/optimizer/util/clauses.c            |    4 
 src/backend/optimizer/util/relnode.c            |    1 
 src/backend/parser/analyze.c                    |   48 
 src/backend/parser/gram.y                       |   64 +
 src/backend/parser/parse_target.c               |   64 -
 src/backend/postmaster/postmaster.c             |   43 
 src/backend/rewrite/rewriteHandler.c            |    3 
 src/backend/security/Makefile                   |   32 
 src/backend/security/pgaceCommon.c              |  814 +++++++++++++
 src/backend/security/pgaceHooks.c               | 1462 ++++++++++++++++++++++++
 src/backend/security/sepgsql/avc.c              | 1202 +++++++++++++++++++
 src/backend/security/sepgsql/core.c             |  672 +++++++++++
 src/backend/security/sepgsql/hooks.c            | 1160 +++++++++++++++++++
 src/backend/security/sepgsql/permissions.c      |  636 ++++++++++
 src/backend/security/sepgsql/proxy.c            | 1076 +++++++++++++++++
 src/backend/storage/file/fd.c                   |    7 
 src/backend/storage/ipc/ipci.c                  |    2 
 src/backend/tcop/fastpath.c                     |    2 
 src/backend/tcop/pquery.c                       |    2 
 src/backend/tcop/utility.c                      |    3 
 src/backend/utils/adt/ri_triggers.c             |   23 
 src/backend/utils/cache/catcache.c              |   32 
 src/backend/utils/cache/plancache.c             |   12 
 src/backend/utils/cache/relcache.c              |   32 
 src/backend/utils/cache/syscache.c              |   42 
 src/backend/utils/fmgr/dfmgr.c                  |   10 
 src/backend/utils/init/postinit.c               |    4 
 src/backend/utils/misc/guc.c                    |   29 
 src/backend/utils/misc/postgresql.conf.sample   |    6 
 src/include/access/heapam.h                     |    2 
 src/include/access/htup.h                       |   40 
 src/include/access/tupdesc.h                    |    1 
 src/include/catalog/heap.h                      |    8 
 src/include/catalog/indexing.h                  |    5 
 src/include/catalog/pg_attribute.h              |    4 
 src/include/catalog/pg_proc.h                   |   19 
 src/include/catalog/pg_security.h               |   31 
 src/include/executor/executor.h                 |    7 
 src/include/executor/tuptable.h                 |    3 
 src/include/fmgr.h                              |    3 
 src/include/libpq/be-fsstubs.h                  |    3 
 src/include/nodes/nodes.h                       |    4 
 src/include/nodes/parsenodes.h                  |   15 
 src/include/nodes/plannodes.h                   |   10 
 src/include/nodes/relation.h                    |    2 
 src/include/nodes/security.h                    |   40 
 src/include/pg_config.h.in                      |    3 
 src/include/security/pgace.h                    |  192 +++
 src/include/security/sepgsql.h                  |  242 +++
 src/include/storage/fd.h                        |    1 
 src/include/storage/lwlock.h                    |    1 
 src/include/utils/catcache.h                    |    1 
 src/include/utils/errcodes.h                    |    6 
 src/include/utils/syscache.h                    |    4 
 src/test/regress/expected/sanity_check.out      |    3 
 106 files changed, 9786 insertions(+), 112 deletions(-)

--- NEW FILE sepostgresql-sepgsql-8.3.8-2.patch ---
diff -rpNU3 base/configure sepgsql/configure
--- base/configure	2009-09-10 20:11:35.000000000 +0900
+++ sepgsql/configure	2009-09-10 20:54:22.000000000 +0900
@@ -314,7 +314,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_gssapi with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_ossp_uuid XML2_CONFIG with_libxml with_libxslt with_system_tzdata with_zlib EGREP ELF_SYS LDFLAGS_SL LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED
 _LIB TAR LN_S AWK YACC YFLAGS FLEX FLEXFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs OSSP_UUID_LIBS HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_gssapi with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_ossp_uuid XML2_CONFIG with_libxml with_libxslt with_system_tzdata with_zlib enable_selinux EGREP ELF_SYS LDFLAGS_SL LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP STRIP_STATIC_L
 IB STRIP_SHARED_LIB TAR LN_S AWK YACC YFLAGS FLEX FLEXFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs OSSP_UUID_LIBS HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -871,6 +871,7 @@ Optional Features:
   --enable-cassert        enable assertion checks (for debugging)
   --enable-thread-safety  make client libraries thread-safe
   --enable-thread-safety-force  force thread-safety despite thread test failure
+  --enable-selinux        build with SELinux support
   --disable-largefile     omit support for large files
 
 Optional Packages:
@@ -4619,6 +4620,115 @@ fi;
 
 
 #
+# SELinux support
+#
+
+pgac_args="$pgac_args enable_selinux"
+
+# Check whether --enable-selinux or --disable-selinux was given.
+if test "${enable_selinux+set}" = set; then
+  enableval="$enable_selinux"
+
+  case $enableval in
+    yes)
+      :
+      ;;
+    no)
+      :
+      ;;
+    *)
+      { { echo "$as_me:$LINENO: error: no argument expected for --enable-selinux option" >&5
+echo "$as_me: error: no argument expected for --enable-selinux option" >&2;}
+   { (exit 1); exit 1; }; }
+      ;;
+  esac
+
+else
+  enable_selinux=no
+
+fi;
+
+if test "$enable_selinux" = yes; then
+    echo "$as_me:$LINENO: checking for getpeercon in -lselinux" >&5
+echo $ECHO_N "checking for getpeercon in -lselinux... $ECHO_C" >&6
+if test "${ac_cv_lib_selinux_getpeercon+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lselinux  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getpeercon ();
+int
+main ()
+{
+getpeercon ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_selinux_getpeercon=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_selinux_getpeercon=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5
+echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6
+if test $ac_cv_lib_selinux_getpeercon = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SELINUX 1
+_ACEOF
+
+
+else
+  { { echo "$as_me:$LINENO: error: \"--enable-selinux requires libselinux.\"" >&5
+echo "$as_me: error: \"--enable-selinux requires libselinux.\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+
+#
 # Elf
 #
 
@@ -26019,6 +26129,7 @@ s, at with_libxml@,$with_libxml,;t t
 s, at with_libxslt@,$with_libxslt,;t t
 s, at with_system_tzdata@,$with_system_tzdata,;t t
 s, at with_zlib@,$with_zlib,;t t
+s, at enable_selinux@,$enable_selinux,;t t
 s, at EGREP@,$EGREP,;t t
 s, at ELF_SYS@,$ELF_SYS,;t t
 s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t
diff -rpNU3 base/configure.in sepgsql/configure.in
--- base/configure.in	2009-09-10 20:11:35.000000000 +0900
+++ sepgsql/configure.in	2009-09-10 20:54:22.000000000 +0900
@@ -626,6 +626,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1,
+                                    [SE-PostgreSQL feature is enabled])
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("--enable-selinux requires libselinux."))
+fi
+
+#
 # Elf
 #
 
diff -rpNU3 base/contrib/sepgsql_policy/Makefile sepgsql/contrib/sepgsql_policy/Makefile
--- base/contrib/sepgsql_policy/Makefile	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/contrib/sepgsql_policy/Makefile	2008-06-26 11:44:44.000000000 +0900
@@ -0,0 +1,40 @@
+#
+# contrib/sepgsql_policy/Makefile
+#   Makefile of security policy module for SE-PostgreSQL
+#
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+
+policy_basedir	:= /usr/share/selinux
+policy_makefile	:= $(policy_basedir)/devel/Makefile
+policy_types	:= targeted mls
+policy		:= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
+package_names	:= sepostgresql sepostgresql-devel
+prefix_ptn	:= "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g"
+bindir_ptn	:= "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g"
+libdir_ptn	:= "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g"
+
+all:
+	$(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;))
+	$(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;)
+
+.install-policy:
+	test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy)
+	$(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;)
+
+install: all
+	$(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;)
+
+%.pp: %.te %.if %.fc
[...12251 lines suppressed...]
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple, void **pgaceItem);
+
+extern void sepgsqlLargeObjectRead(LargeObjectDesc *lodesc, int length);
+
+extern void sepgsqlLargeObjectWrite(LargeObjectDesc *lodesc, int length);
+
+extern void sepgsqlLargeObjectTruncate(LargeObjectDesc *lodesc, int offset);
+
+extern void sepgsqlLargeObjectImport(Oid loid, int fdesc, const char *filename);
+
+extern void sepgsqlLargeObjectExport(Oid loid, int fdesc, const char *filename);
+
+extern void sepgsqlLargeObjectGetSecurity(Relation rel, HeapTuple tuple);
+
+extern void sepgsqlLargeObjectSetSecurity(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* Security Label hooks */
+extern bool  sepgsqlTupleDescHasSecLabel(Relation rel, List *relopts);
+
+extern char *sepgsqlTranslateSecurityLabelIn(const char *context);
+
+extern char *sepgsqlTranslateSecurityLabelOut(const char *context);
+
+extern bool  sepgsqlCheckValidSecurityLabel(char *context);
+
+extern char *sepgsqlUnlabeledSecurityLabel(void);
+
+extern char *sepgsqlSecurityLabelOfLabel(void);
+
+/*
+ * SE-PostgreSQL core functions
+ *	 src/backend/security/sepgsql/core.c
+ */
+extern bool sepgsqlIsEnabled(void);
+
+extern const security_context_t sepgsqlGetServerContext(void);
+
+extern const security_context_t sepgsqlGetClientContext(void);
+
+extern const security_context_t sepgsqlGetDatabaseContext(void);
+
+extern const security_context_t sepgsqlGetUnlabeledContext(void);
+
+extern const security_context_t sepgsqlSwitchClientContext(security_context_t newcon);
+
+extern Oid sepgsqlGetDatabaseSecurityId(void);
+
+/*
+ * SE-PostgreSQL userspace avc functions
+ *   src/backend/security/sepgsql/avc.c
+ */
+extern void sepgsqlAvcInit(void);
+
+extern void sepgsqlAvcSwitchClientContext(security_context_t context);
+
+extern void sepgsqlClientHasPermission(Oid target_security_id,
+									   security_class_t tclass,
+									   access_vector_t perms,
+									   const char *objname);
+
+extern bool sepgsqlClientHasPermissionNoAbort(Oid target_security_id,
+											  security_class_t tclass,
+											  access_vector_t perms,
+											  const char *objname);
+
+extern Oid sepgsqlClientCreateSid(Oid target_security_id,
+								  security_class_t tclass);
+
+extern security_context_t
+sepgsqlClientCreateContext(Oid target_security_id,
+						   security_class_t tclass);
+
+extern bool sepgsqlComputePermission(const security_context_t scontext,
+									 const security_context_t tcontext,
+									 security_class_t tclass,
+									 access_vector_t perms,
+									 const char *objname);
+
+extern security_context_t
+sepgsqlComputeCreateContext(const security_context_t scontext,
+							const security_context_t tcontext,
+							security_class_t tclass);
+
+/*
+ * SE-PostgreSQL permission evaluation related
+ *	 src/backend/security/sepgsql/permission.c
+ */
+extern const char *sepgsqlTupleName(Oid relid, HeapTuple tuple);
+
+extern security_class_t sepgsqlFileObjectClass(int fdesc, const char *filename);
+
+extern security_class_t sepgsqlTupleObjectClass(Oid relid, HeapTuple tuple);
+
+extern void sepgsqlSetDefaultContext(Relation rel, HeapTuple tuple);
+
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple newtup,
+								   uint32 perms, bool abort);
+
+extern void sepgsqlCheckModuleInstallPerms(const char *filename);
+
+/*
+ * workaround for older libselinux
+ */
+#ifndef DB_PROCEDURE__INSTALL
+#define DB_PROCEDURE__INSTALL		0x00000100UL
+#endif
+
+#endif   /* SEPGSQL_H */
diff -rpNU3 base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h
--- base/src/include/storage/fd.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/storage/fd.h	2008-06-14 02:36:58.000000000 +0900
@@ -67,6 +67,7 @@ extern int	FileWrite(File file, char *bu
 extern int	FileSync(File file);
 extern long FileSeek(File file, long offset, int whence);
 extern int	FileTruncate(File file, long offset);
+extern int  FileRawDescriptor(File file);
 
 /* Operations that allow use of regular stdio --- USE WITH CAUTION */
 extern FILE *AllocateFile(const char *name, const char *mode);
diff -rpNU3 base/src/include/storage/lwlock.h sepgsql/src/include/storage/lwlock.h
--- base/src/include/storage/lwlock.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/storage/lwlock.h	2008-06-14 02:36:58.000000000 +0900
@@ -63,6 +63,7 @@ typedef enum LWLockId
 	AutovacuumLock,
 	AutovacuumScheduleLock,
 	SyncScanLock,
+	SepgsqlAvcLock,
 	/* Individual lock IDs end here */
 	FirstBufMappingLock,
 	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
diff -rpNU3 base/src/include/utils/catcache.h sepgsql/src/include/utils/catcache.h
--- base/src/include/utils/catcache.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/catcache.h	2008-06-14 02:36:58.000000000 +0900
@@ -172,6 +172,7 @@ extern HeapTuple SearchCatCache(CatCache
 			   Datum v1, Datum v2,
 			   Datum v3, Datum v4);
 extern void ReleaseCatCache(HeapTuple tuple);
+extern void InsertCatCache(CatCache *cache, HeapTuple tuple);
 
 extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys,
 				   Datum v1, Datum v2,
diff -rpNU3 base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
--- base/src/include/utils/errcodes.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/errcodes.h	2008-12-02 11:39:45.000000000 +0900
@@ -339,6 +339,12 @@
 #define ERRCODE_NO_DATA_FOUND				MAKE_SQLSTATE('P','0', '0','0','2')
 #define ERRCODE_TOO_MANY_ROWS				MAKE_SQLSTATE('P','0', '0','0','3')
 
+/* Class SE - Security Error (PGACE/SE-PostgreSQL error class) */
+#define ERRCODE_PGACE_ERROR					MAKE_SQLSTATE('S','E', '0','0','0')
+#define ERRCODE_SELINUX_ERROR				MAKE_SQLSTATE('S','E', '0','1','1')
+#define ERRCODE_SELINUX_AUDIT				MAKE_SQLSTATE('S','E', '0','1','2')
+#define ERRCODE_SELINUX_INFO				MAKE_SQLSTATE('S','E', '0','1','3')
+
 /* Class XX - Internal Error (PostgreSQL-specific error class) */
 /* (this is for "can't-happen" conditions and software bugs) */
 #define ERRCODE_INTERNAL_ERROR				MAKE_SQLSTATE('X','X', '0','0','0')
diff -rpNU3 base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h
--- base/src/include/utils/syscache.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/syscache.h	2008-06-14 02:36:58.000000000 +0900
@@ -76,6 +76,8 @@
 #define TSTEMPLATEOID		45
 #define TYPENAMENSP			46
 #define TYPEOID				47
+#define SECURITYOID			48
+#define SECURITYLABEL		49
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);
@@ -84,6 +86,8 @@ extern HeapTuple SearchSysCache(int cach
 			   Datum key1, Datum key2, Datum key3, Datum key4);
 extern void ReleaseSysCache(HeapTuple tuple);
 
+extern void InsertSysCache(Oid relid, HeapTuple tuple);
+
 /* convenience routines */
 extern HeapTuple SearchSysCacheCopy(int cacheId,
 				   Datum key1, Datum key2, Datum key3, Datum key4);
diff -rpNU3 base/src/test/regress/expected/sanity_check.out sepgsql/src/test/regress/expected/sanity_check.out
--- base/src/test/regress/expected/sanity_check.out	2007-11-25 12:49:12.000000000 +0900
+++ sepgsql/src/test/regress/expected/sanity_check.out	2008-11-24 19:46:15.000000000 +0900
@@ -111,6 +111,7 @@ SELECT relname, relhasindex
  pg_pltemplate           | t
  pg_proc                 | t
  pg_rewrite              | t
+ pg_security             | t
  pg_shdepend             | t
  pg_shdescription        | t
  pg_statistic            | t
@@ -149,7 +150,7 @@ SELECT relname, relhasindex
  timetz_tbl              | f
  tinterval_tbl           | f
  varchar_tbl             | f
-(138 rows)
+(139 rows)
 
 --
 -- another sanity check: every system catalog that has OIDs should have


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Mar 2009 03:48:13 -0000	1.14
+++ .cvsignore	10 Sep 2009 12:19:48 -0000	1.15
@@ -1 +1 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.3.8.tar.bz2


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-10/sepostgresql.init,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sepostgresql.init	27 Mar 2009 03:48:13 -0000	1.31
+++ sepostgresql.init	10 Sep 2009 12:19:48 -0000	1.32
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.3.7"
+PGVERSION="8.3.8"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.1770"
+SEPGVERSION="2.2300"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-10/sepostgresql.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sepostgresql.spec	27 Mar 2009 03:48:13 -0000	1.32
+++ sepostgresql.spec	10 Sep 2009 12:19:48 -0000	1.33
@@ -7,22 +7,14 @@
 # SE-PostgreSQL status extension
 %define selinux_policy_stores targeted mls
 
-# Check required policy version
-%define fedora9 %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$')
-%if %{fedora9}
-%define required_policy_version    3.3.1
-%else
-%define required_policy_version    3.4.2
-%endif
-
 
 
 %{!?ssl:%define ssl 1}
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.3.7
-Release: 2.1770%{?sepgsql_extension}%{?dist}
+Version: 8.3.8
+Release: 2.2300%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -31,16 +23,13 @@ Source0: ftp://ftp.postgresql.org/pub/so
 Source1: sepostgresql.init
 Source2: sepostgresql.8
 Source3: sepostgresql.logrotate
-Patch0: sepostgresql-sepgsql-8.3.7-2.patch
-Patch1: sepostgresql-policy-8.3.7-2.patch
-Patch2: sepostgresql-pg_dump-8.3.7-2.patch
+Patch0: sepostgresql-sepgsql-8.3.8-2.patch
+Patch1: sepostgresql-policy-8.3.8-2.patch
+Patch2: sepostgresql-pg_dump-8.3.8-2.patch
 Patch3: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4
 BuildRequires: checkpolicy libselinux-devel >= 2.0.43
-BuildRequires: selinux-policy >= %{required_policy_version}
-%if %{fedora9}
-BuildRequires: selinux-policy-devel
-%endif
+BuildRequires: selinux-policy >= 3.4.2
 %if %{ssl}
 BuildRequires: openssl-devel
 %endif
@@ -50,7 +39,7 @@ Requires(preun): /sbin/chkconfig /sbin/s
 Requires(postun): policycoreutils
 Requires: postgresql-server = %{version}
 Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43
-Requires: selinux-policy >= %{required_policy_version}
+Requires: selinux-policy >= 3.4.2
 Requires: tzdata logrotate
 
 %description
@@ -88,24 +77,20 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; expo
 
 # parallel build, if possible
 make %{?_smp_mflags}
-%if !%{fedora9}
 touch src/backend/security/sepgsql/policy/sepostgresql-devel.fc
 make -C src/backend/security/sepgsql/policy
-%endif
 
 %install
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
 
-%if !%{fedora9}
 for store in %{selinux_policy_stores}
 do
     install -d %{buildroot}%{_datadir}/selinux/${store}
     install -p -m 644 src/backend/security/sepgsql/policy/sepostgresql-devel.pp.${store} \
                %{buildroot}%{_datadir}/selinux/${store}/sepostgresql-devel.pp
 done
-%endif
 
 # avoid to conflict with native postgresql package
 mv %{buildroot}%{_bindir}  %{buildroot}%{_bindir}.orig
@@ -155,7 +140,6 @@ exit 0
 /sbin/chkconfig --add %{name}
 /sbin/ldconfig
 
-%if !%{fedora9}
 for store in %{selinux_policy_stores}
 do
     # clean up legacy policy module (now it is unnecessary)
@@ -165,7 +149,6 @@ do
             -i %{_datadir}/selinux/${store}/sepostgresql-devel.pp >& /dev/null || :
     fi
 done
-%endif
 
 # Fix up non-standard file contexts
 /sbin/fixfiles -R %{name} restore || :
@@ -214,14 +197,18 @@ fi
 %{_datadir}/sepgsql/conversion_create.sql
 %{_datadir}/sepgsql/information_schema.sql
 %{_datadir}/sepgsql/sql_features.txt
-%if !%{fedora9}
 %attr(644,root,root) %{_datadir}/selinux/*/sepostgresql-devel.pp
-%endif
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Thu Sep 10 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.8-2300
+- upgrade base PostgreSQL v8.3.7->8.3.8
+
+* Fri Apr 17 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-1772
+- bugfix: /etc/init.d/sepostgresql initdb didn't work correctly
+
 * Fri Mar 27 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-2.1770
 - upgrade base PostgreSQL version 8.3.6->8.3.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Mar 2009 03:48:13 -0000	1.11
+++ sources	10 Sep 2009 12:19:48 -0000	1.12
@@ -1 +1 @@
-7b7e91a2221e55fe1b167e663217a96d  postgresql-8.3.7.tar.bz2
+aac683d03f765dc58a3a0e5eaa1927bf  postgresql-8.3.8.tar.bz2


--- sepostgresql-pg_dump-8.3.7-2.patch DELETED ---


--- sepostgresql-policy-8.3.7-2.patch DELETED ---


--- sepostgresql-sepgsql-8.3.7-2.patch DELETED ---



From coec at fedoraproject.org  Thu Sep 10 12:22:25 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 10 Sep 2009 12:22:25 +0000 (UTC)
Subject: rpms/vmpsd/F-10 import.log, NONE, 1.1 vmpsd.init, NONE,
	1.1 vmpsd.spec, 
	NONE, 1.1 vmpsd.sysconfig, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910122225.B33CC11C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/vmpsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23420/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vmpsd.init vmpsd.spec vmpsd.sysconfig 
Log Message:
Initial commit of vmpsd



--- NEW FILE import.log ---
vmpsd-1_4_01-6:F-10:vmpsd-1.4.01-6.src.rpm:1252585253


--- NEW FILE vmpsd.init ---
#!/bin/bash
#
# chkconfig: - 92 8
# description: vmpsd is a GPL implementation of Cisco's VMPS
# processname: vmpsd
# pidfile: /var/run/vmpsd.pid
# config: /etc/sysconfig/vmpsd

# source function library
. /etc/init.d/functions

if test -e /etc/sysconfig/vmpsd ; then
    . /etc/sysconfig/vmpsd
fi

RETVAL=0

start() {
        echo -n $"Starting vmpsd: "

        daemon --user nobody vmpsd $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/vmpsd
}

stop() {
        echo -n $"Shutting down vmpsd: "
        killproc vmpsd
        RETVAL=$?

        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/vmpsd
}

case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  restart|reload)
        stop
        start
        ;;
  condrestart)
        if [ -f /var/lock/subsys/vmpsd ]; then
            stop
            start
        fi
        ;;
  status)
        status vmpsd
        RETVAL=$?
        ;;
  *)
        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE vmpsd.spec ---
Name:		vmpsd 
Version:	1.4.01
Release:	6%{?dist}
Summary:	A GPL implementation of Cisco Systems' VMPS

Group:	System Environment/Daemons
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:	GPL+
URL:	http://vmps.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vmps/%{name}-%{version}.tar.gz
Source1:	vmpsd.sysconfig
Source2:	vmpsd.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post):	chkconfig
Requires(preun):	chkconfig
# This is for /sbin/service
Requires(preun):	initscripts
Requires(postun):	initscripts

%description
VMPS (VLAN Management Policy Server) is a way of assigning switch ports to 
specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL 
implementation of VMPS.

%prep
%setup -qn %{name}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_mandir}

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
install %{S:2} -p $RPM_BUILD_ROOT%{_initrddir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 -eq 0 ] ; then
   /sbin/service %{name} stop > /dev/null 2>&1
   /sbin/chkconfig --del %{name}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/vlan.db
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0755,root,root) %{_bindir}/%{name}
%doc doc/NetregExtension.txt
%doc doc/VQP-spec.txt
%doc doc/vlan.db.example
%doc COPYING.GPL ChangeLog AUTHORS
%{_mandir}/man1/%{name}.1.gz

%changelog
* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-6%{?dist}
- Remove condrestart from post section as it's now in the postun section
- Stop packaging the INSTALL file

* Sun Sep 6 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-5
- Add condrestart in postun
- Add ChangeLog and COPYING.GPL to files section

* Sat Sep 5 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-4
- Add condrestart into post section
- Use macros in files section
- Remove '$DESTDIR=$RPM_BUILD_ROOT' from make in build section
- Do parallel make
- Don't start service by default
- Add Requires for post and preun
- Correct the Source0 URL
- Move clean to after install

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-3
- Split /etc/sysconfig/vmpsd and /etc/rc.d/init.d/vmpsd out of the spec file
- Corrected license from GPLv2 to GPL+
- Ensured that the make is done in the build section

* Thu Aug 20 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-2
- Tidied spec file and silenced rpmlint output

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-1
- Initial Packaging 


--- NEW FILE vmpsd.sysconfig ---
OPTIONS="-f /etc/vmps.db -l 0x700"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:20:41 -0000	1.1
+++ .cvsignore	10 Sep 2009 12:22:25 -0000	1.2
@@ -0,0 +1 @@
+vmpsd-1.4.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:20:41 -0000	1.1
+++ sources	10 Sep 2009 12:22:25 -0000	1.2
@@ -0,0 +1 @@
+b95f6390f0a340f4f99d4e8f72201cb4  vmpsd-1.4.01.tar.gz



From coec at fedoraproject.org  Thu Sep 10 12:23:59 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 10 Sep 2009 12:23:59 +0000 (UTC)
Subject: rpms/vmpsd/F-11 import.log, NONE, 1.1 vmpsd.init, NONE,
	1.1 vmpsd.spec, 
	NONE, 1.1 vmpsd.sysconfig, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910122359.17BD111C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/vmpsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24069/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vmpsd.init vmpsd.spec vmpsd.sysconfig 
Log Message:
Initial commit of vmpsd



--- NEW FILE import.log ---
vmpsd-1_4_01-6:F-11:vmpsd-1.4.01-6.src.rpm:1252585413


--- NEW FILE vmpsd.init ---
#!/bin/bash
#
# chkconfig: - 92 8
# description: vmpsd is a GPL implementation of Cisco's VMPS
# processname: vmpsd
# pidfile: /var/run/vmpsd.pid
# config: /etc/sysconfig/vmpsd

# source function library
. /etc/init.d/functions

if test -e /etc/sysconfig/vmpsd ; then
    . /etc/sysconfig/vmpsd
fi

RETVAL=0

start() {
        echo -n $"Starting vmpsd: "

        daemon --user nobody vmpsd $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/vmpsd
}

stop() {
        echo -n $"Shutting down vmpsd: "
        killproc vmpsd
        RETVAL=$?

        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/vmpsd
}

case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  restart|reload)
        stop
        start
        ;;
  condrestart)
        if [ -f /var/lock/subsys/vmpsd ]; then
            stop
            start
        fi
        ;;
  status)
        status vmpsd
        RETVAL=$?
        ;;
  *)
        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE vmpsd.spec ---
Name:		vmpsd 
Version:	1.4.01
Release:	6%{?dist}
Summary:	A GPL implementation of Cisco Systems' VMPS

Group:	System Environment/Daemons
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:	GPL+
URL:	http://vmps.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vmps/%{name}-%{version}.tar.gz
Source1:	vmpsd.sysconfig
Source2:	vmpsd.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post):	chkconfig
Requires(preun):	chkconfig
# This is for /sbin/service
Requires(preun):	initscripts
Requires(postun):	initscripts

%description
VMPS (VLAN Management Policy Server) is a way of assigning switch ports to 
specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL 
implementation of VMPS.

%prep
%setup -qn %{name}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_mandir}

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
install %{S:2} -p $RPM_BUILD_ROOT%{_initrddir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 -eq 0 ] ; then
   /sbin/service %{name} stop > /dev/null 2>&1
   /sbin/chkconfig --del %{name}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/vlan.db
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0755,root,root) %{_bindir}/%{name}
%doc doc/NetregExtension.txt
%doc doc/VQP-spec.txt
%doc doc/vlan.db.example
%doc COPYING.GPL ChangeLog AUTHORS
%{_mandir}/man1/%{name}.1.gz

%changelog
* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-6%{?dist}
- Remove condrestart from post section as it's now in the postun section
- Stop packaging the INSTALL file

* Sun Sep 6 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-5
- Add condrestart in postun
- Add ChangeLog and COPYING.GPL to files section

* Sat Sep 5 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-4
- Add condrestart into post section
- Use macros in files section
- Remove '$DESTDIR=$RPM_BUILD_ROOT' from make in build section
- Do parallel make
- Don't start service by default
- Add Requires for post and preun
- Correct the Source0 URL
- Move clean to after install

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-3
- Split /etc/sysconfig/vmpsd and /etc/rc.d/init.d/vmpsd out of the spec file
- Corrected license from GPLv2 to GPL+
- Ensured that the make is done in the build section

* Thu Aug 20 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-2
- Tidied spec file and silenced rpmlint output

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-1
- Initial Packaging 


--- NEW FILE vmpsd.sysconfig ---
OPTIONS="-f /etc/vmps.db -l 0x700"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:20:41 -0000	1.1
+++ .cvsignore	10 Sep 2009 12:23:58 -0000	1.2
@@ -0,0 +1 @@
+vmpsd-1.4.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:20:41 -0000	1.1
+++ sources	10 Sep 2009 12:23:58 -0000	1.2
@@ -0,0 +1 @@
+b95f6390f0a340f4f99d4e8f72201cb4  vmpsd-1.4.01.tar.gz



From coec at fedoraproject.org  Thu Sep 10 12:25:47 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 10 Sep 2009 12:25:47 +0000 (UTC)
Subject: rpms/vmpsd/EL-5 import.log, NONE, 1.1 vmpsd.init, NONE,
	1.1 vmpsd.spec, 
	NONE, 1.1 vmpsd.sysconfig, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090910122547.1824211C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/vmpsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24651/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vmpsd.init vmpsd.spec vmpsd.sysconfig 
Log Message:
Initial commit of vmpsd



--- NEW FILE import.log ---
vmpsd-1_4_01-6:EL-5:vmpsd-1.4.01-6.src.rpm:1252585515


--- NEW FILE vmpsd.init ---
#!/bin/bash
#
# chkconfig: - 92 8
# description: vmpsd is a GPL implementation of Cisco's VMPS
# processname: vmpsd
# pidfile: /var/run/vmpsd.pid
# config: /etc/sysconfig/vmpsd

# source function library
. /etc/init.d/functions

if test -e /etc/sysconfig/vmpsd ; then
    . /etc/sysconfig/vmpsd
fi

RETVAL=0

start() {
        echo -n $"Starting vmpsd: "

        daemon --user nobody vmpsd $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/vmpsd
}

stop() {
        echo -n $"Shutting down vmpsd: "
        killproc vmpsd
        RETVAL=$?

        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/vmpsd
}

case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  restart|reload)
        stop
        start
        ;;
  condrestart)
        if [ -f /var/lock/subsys/vmpsd ]; then
            stop
            start
        fi
        ;;
  status)
        status vmpsd
        RETVAL=$?
        ;;
  *)
        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE vmpsd.spec ---
Name:		vmpsd 
Version:	1.4.01
Release:	6%{?dist}
Summary:	A GPL implementation of Cisco Systems' VMPS

Group:	System Environment/Daemons
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:	GPL+
URL:	http://vmps.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vmps/%{name}-%{version}.tar.gz
Source1:	vmpsd.sysconfig
Source2:	vmpsd.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post):	chkconfig
Requires(preun):	chkconfig
# This is for /sbin/service
Requires(preun):	initscripts
Requires(postun):	initscripts

%description
VMPS (VLAN Management Policy Server) is a way of assigning switch ports to 
specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL 
implementation of VMPS.

%prep
%setup -qn %{name}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_mandir}

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
install %{S:2} -p $RPM_BUILD_ROOT%{_initrddir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 -eq 0 ] ; then
   /sbin/service %{name} stop > /dev/null 2>&1
   /sbin/chkconfig --del %{name}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/vlan.db
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0755,root,root) %{_bindir}/%{name}
%doc doc/NetregExtension.txt
%doc doc/VQP-spec.txt
%doc doc/vlan.db.example
%doc COPYING.GPL ChangeLog AUTHORS
%{_mandir}/man1/%{name}.1.gz

%changelog
* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-6%{?dist}
- Remove condrestart from post section as it's now in the postun section
- Stop packaging the INSTALL file

* Sun Sep 6 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-5
- Add condrestart in postun
- Add ChangeLog and COPYING.GPL to files section

* Sat Sep 5 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-4
- Add condrestart into post section
- Use macros in files section
- Remove '$DESTDIR=$RPM_BUILD_ROOT' from make in build section
- Do parallel make
- Don't start service by default
- Add Requires for post and preun
- Correct the Source0 URL
- Move clean to after install

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-3
- Split /etc/sysconfig/vmpsd and /etc/rc.d/init.d/vmpsd out of the spec file
- Corrected license from GPLv2 to GPL+
- Ensured that the make is done in the build section

* Thu Aug 20 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-2
- Tidied spec file and silenced rpmlint output

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 1.4.01-1
- Initial Packaging 


--- NEW FILE vmpsd.sysconfig ---
OPTIONS="-f /etc/vmps.db -l 0x700"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:20:41 -0000	1.1
+++ .cvsignore	10 Sep 2009 12:25:46 -0000	1.2
@@ -0,0 +1 @@
+vmpsd-1.4.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vmpsd/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:20:41 -0000	1.1
+++ sources	10 Sep 2009 12:25:46 -0000	1.2
@@ -0,0 +1 @@
+b95f6390f0a340f4f99d4e8f72201cb4  vmpsd-1.4.01.tar.gz



From kaigai at fedoraproject.org  Thu Sep 10 12:27:20 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Thu, 10 Sep 2009 12:27:20 +0000 (UTC)
Subject: rpms/sepostgresql/F-11 .cvsignore, 1.14,
	1.15 sepostgresql-core-8.3.patch, 1.3,
	1.4 sepostgresql-test-8.3.patch, 1.2,
	1.3 sepostgresql-utils-8.3.patch, 1.1, 1.2 sepostgresql.init,
	1.34, 1.35 sepostgresql.spec, 1.37, 1.38 sources, 1.11, 1.12
Message-ID: <20090910122720.F32EA11C00DB@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25040

Modified Files:
	.cvsignore sepostgresql-core-8.3.patch 
	sepostgresql-test-8.3.patch sepostgresql-utils-8.3.patch 
	sepostgresql.init sepostgresql.spec sources 
Log Message:
upgrade base PostgreSQL v8.3.7->8.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Mar 2009 03:54:13 -0000	1.14
+++ .cvsignore	10 Sep 2009 12:27:20 -0000	1.15
@@ -1 +1 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.3.8.tar.bz2

sepostgresql-core-8.3.patch:
 configure                                                          |  113 +
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   26 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |    7 
 src/backend/access/heap/tuptoaster.c                               |    9 
 src/backend/access/transam/xact.c                                  |   15 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |    8 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   19 
 src/backend/catalog/catalog.c                                      |    4 
 src/backend/catalog/heap.c                                         |  104 +
 src/backend/catalog/index.c                                        |   10 
 src/backend/catalog/namespace.c                                    |   27 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_proc.c                                      |   18 
 src/backend/catalog/pg_security.c                                  |  299 +++
 src/backend/catalog/toasting.c                                     |    3 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |    7 
 src/backend/commands/copy.c                                        |  258 ++
 src/backend/commands/dbcommands.c                                  |   73 
 src/backend/commands/functioncmds.c                                |   74 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/proclang.c                                    |    6 
 src/backend/commands/schemacmds.c                                  |   62 
 src/backend/commands/sequence.c                                    |   14 
 src/backend/commands/tablecmds.c                                   |  150 +
 src/backend/executor/execJunk.c                                    |    4 
 src/backend/executor/execMain.c                                    |  143 +
 src/backend/executor/execScan.c                                    |   23 
 src/backend/executor/execTuples.c                                  |   13 
 src/backend/executor/execUtils.c                                   |    7 
 src/backend/executor/functions.c                                   |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   77 
 src/backend/nodes/copyfuncs.c                                      |   23 
 src/backend/nodes/equalfuncs.c                                     |   20 
 src/backend/nodes/outfuncs.c                                       |    6 
 src/backend/nodes/readfuncs.c                                      |   46 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/prep/prepunion.c                             |   71 
 src/backend/optimizer/util/clauses.c                               |    2 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   60 
 src/backend/parser/gram.y                                          |  110 +
 src/backend/parser/parse_clause.c                                  |   18 
 src/backend/parser/parse_expr.c                                    |    3 
 src/backend/parser/parse_relation.c                                |  146 +
 src/backend/parser/parse_target.c                                  |   79 
 src/backend/postmaster/postmaster.c                                |   43 
 src/backend/rewrite/rewriteHandler.c                               |    4 
 src/backend/security/Makefile                                      |   34 
 src/backend/security/rowlevel.c                                    |  177 +
 src/backend/security/sepgsql/avc.c                                 |  859 +++++++++
 src/backend/security/sepgsql/checker.c                             |  577 ++++++
 src/backend/security/sepgsql/core.c                                |  326 +++
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  905 ++++++++++
 src/backend/security/sepgsql/label.c                               |  560 ++++++
 src/backend/security/sepgsql/perms.c                               |  469 +++++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  128 +
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  116 +
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    4 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/varlena.c                                    |   97 +
 src/backend/utils/cache/catcache.c                                 |   32 
 src/backend/utils/cache/plancache.c                                |   12 
 src/backend/utils/cache/relcache.c                                 |   32 
 src/backend/utils/cache/syscache.c                                 |   40 
 src/backend/utils/fmgr/dfmgr.c                                     |   10 
 src/backend/utils/fmgr/fmgr.c                                      |    8 
 src/backend/utils/init/postinit.c                                  |   11 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/include/access/heapam.h                                        |    2 
 src/include/access/htup.h                                          |   43 
 src/include/access/tupdesc.h                                       |    1 
 src/include/catalog/heap.h                                         |    8 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   19 
 src/include/catalog/pg_security.h                                  |   58 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/fmgr.h                                                 |   10 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   21 
 src/include/nodes/plannodes.h                                      |    9 
 src/include/nodes/relation.h                                       |    9 
 src/include/parser/parse_node.h                                    |    1 
 src/include/parser/parse_relation.h                                |    2 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   47 
 src/include/security/sepgsql.h                                     |  466 +++++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/utils/builtins.h                                       |    8 
 src/include/utils/catcache.h                                       |    1 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |   28 
 121 files changed, 7527 insertions(+), 167 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 sepostgresql-core-8.3.patchIndex: sepostgresql-core-8.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql-core-8.3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sepostgresql-core-8.3.patch	9 Jun 2009 07:30:54 -0000	1.3
+++ sepostgresql-core-8.3.patch	10 Sep 2009 12:27:20 -0000	1.4
@@ -1,6 +1,6 @@
 diff -rpNU3 base/configure sepgsql-new/configure
---- base/configure	2009-05-20 17:08:02.000000000 +0900
-+++ sepgsql-new/configure	2009-05-20 17:08:02.000000000 +0900
+--- base/configure	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/configure	2009-09-10 20:24:37.000000000 +0900
 @@ -314,7 +314,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
@@ -143,8 +143,8 @@ diff -rpNU3 base/configure sepgsql-new/c
  s, at ELF_SYS@,$ELF_SYS,;t t
  s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t
 diff -rpNU3 base/configure.in sepgsql-new/configure.in
---- base/configure.in	2009-03-15 17:47:25.000000000 +0900
-+++ sepgsql-new/configure.in	2009-03-15 17:58:10.000000000 +0900
+--- base/configure.in	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/configure.in	2009-09-10 20:24:37.000000000 +0900
 @@ -626,6 +626,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
  AC_SUBST(with_zlib)
  
@@ -201,8 +201,8 @@ diff -rpNU3 base/src/backend/Makefile se
  
  all: submake-libpgport postgres $(POSTGRES_IMP)
 diff -rpNU3 base/src/backend/access/common/heaptuple.c sepgsql-new/src/backend/access/common/heaptuple.c
---- base/src/backend/access/common/heaptuple.c	2008-01-07 23:51:33.000000000 +0900
-+++ sepgsql-new/src/backend/access/common/heaptuple.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/backend/access/common/heaptuple.c	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/src/backend/access/common/heaptuple.c	2009-09-10 20:24:37.000000000 +0900
 @@ -66,6 +66,7 @@
  
  #include "access/heapam.h"
@@ -372,8 +372,8 @@ diff -rpNU3 base/src/backend/access/comm
  	for (i = 0; i < tupdesc1->natts; i++)
  	{
 diff -rpNU3 base/src/backend/access/heap/heapam.c sepgsql-new/src/backend/access/heap/heapam.c
---- base/src/backend/access/heap/heapam.c	2009-02-02 11:47:17.000000000 +0900
-+++ sepgsql-new/src/backend/access/heap/heapam.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/backend/access/heap/heapam.c	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/src/backend/access/heap/heapam.c	2009-09-10 20:24:37.000000000 +0900
 @@ -50,6 +50,7 @@
  #include "catalog/namespace.h"
  #include "miscadmin.h"
@@ -382,7 +382,7 @@ diff -rpNU3 base/src/backend/access/heap
  #include "storage/procarray.h"
  #include "storage/smgr.h"
  #include "utils/datum.h"
-@@ -1949,6 +1950,8 @@ heap_insert(Relation relation, HeapTuple
+@@ -1958,6 +1959,8 @@ heap_insert(Relation relation, HeapTuple
  Oid
  simple_heap_insert(Relation relation, HeapTuple tup)
  {
@@ -391,7 +391,7 @@ diff -rpNU3 base/src/backend/access/heap
  	return heap_insert(relation, tup, GetCurrentCommandId(true), true, true);
  }
  
-@@ -2230,6 +2233,8 @@ simple_heap_delete(Relation relation, It
+@@ -2239,6 +2242,8 @@ simple_heap_delete(Relation relation, It
  	ItemPointerData update_ctid;
  	TransactionId update_xmax;
  
@@ -400,7 +400,7 @@ diff -rpNU3 base/src/backend/access/heap
  	result = heap_delete(relation, tid,
  						 &update_ctid, &update_xmax,
  						 GetCurrentCommandId(true), InvalidSnapshot,
-@@ -2874,6 +2879,8 @@ simple_heap_update(Relation relation, It
+@@ -2883,6 +2888,8 @@ simple_heap_update(Relation relation, It
  	ItemPointerData update_ctid;
  	TransactionId update_xmax;
  
@@ -701,7 +701,7 @@ diff -rpNU3 base/src/backend/catalog/cat
  		relationId == SharedDependReferenceIndexId ||
 diff -rpNU3 base/src/backend/catalog/heap.c sepgsql-new/src/backend/catalog/heap.c
 --- base/src/backend/catalog/heap.c	2009-03-15 17:47:25.000000000 +0900
-+++ sepgsql-new/src/backend/catalog/heap.c	2009-03-15 17:58:10.000000000 +0900
++++ sepgsql-new/src/backend/catalog/heap.c	2009-06-19 15:02:12.000000000 +0900
 @@ -42,6 +42,7 @@
  #include "catalog/pg_constraint.h"
  #include "catalog/pg_inherits.h"
@@ -710,15 +710,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  #include "catalog/pg_statistic.h"
  #include "catalog/pg_tablespace.h"
  #include "catalog/pg_type.h"
-@@ -53,6 +54,7 @@
- #include "parser/parse_coerce.h"
- #include "parser/parse_expr.h"
- #include "parser/parse_relation.h"
-+#include "security/sepgsql.h"
- #include "storage/smgr.h"
- #include "utils/builtins.h"
- #include "utils/fmgroids.h"
-@@ -67,7 +69,8 @@ static void AddNewRelationTuple(Relation
+@@ -67,7 +68,8 @@ static void AddNewRelationTuple(Relation
  					Oid new_rel_oid, Oid new_type_oid,
  					Oid relowner,
  					char relkind,
@@ -728,7 +720,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  static Oid AddNewRelationType(const char *typeName,
  				   Oid typeNamespace,
  				   Oid new_rel_oid,
-@@ -145,7 +148,16 @@ static FormData_pg_attribute a7 = {
+@@ -145,7 +147,16 @@ static FormData_pg_attribute a7 = {
  	true, 'p', 'i', true, false, false, true, 0
  };
  
@@ -746,7 +738,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  
  /*
   * This function returns a Form_pg_attribute pointer for a system attribute.
-@@ -185,6 +197,18 @@ SystemAttributeByName(const char *attnam
+@@ -185,6 +196,18 @@ SystemAttributeByName(const char *attnam
  	return NULL;
  }
  
@@ -765,7 +757,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  
  /* ----------------------------------------------------------------
   *				XXX END OF UGLY HARD CODED BADNESS XXX
-@@ -468,7 +492,8 @@ AddNewAttributeTuples(Oid new_rel_oid,
+@@ -468,7 +491,8 @@ AddNewAttributeTuples(Oid new_rel_oid,
  					  TupleDesc tupdesc,
  					  char relkind,
  					  bool oidislocal,
@@ -775,12 +767,12 @@ diff -rpNU3 base/src/backend/catalog/hea
  {
  	const Form_pg_attribute *dpp;
  	int			i;
-@@ -493,16 +518,40 @@ AddNewAttributeTuples(Oid new_rel_oid,
+@@ -493,16 +517,40 @@ AddNewAttributeTuples(Oid new_rel_oid,
  	dpp = tupdesc->attrs;
  	for (i = 0; i < natts; i++)
  	{
 +		ListCell *l;
-+		Oid attselabel = InvalidOid;
++		Oid	attselabel = InvalidOid;
 +
  		/* Fill in the correct relation OID */
  		(*dpp)->attrelid = new_rel_oid;
@@ -796,7 +788,7 @@ diff -rpNU3 base/src/backend/catalog/hea
 +			if (defel->defname &&
 +				strcmp(defel->defname, NameStr((*dpp)->attname)) == 0)
 +			{
-+				attselabel = sepgsqlInputGivenSecLabel(defel);
++				attselabel = intVal(defel->arg);
 +				break;
 +			}
 +		}
@@ -816,7 +808,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  
  		simple_heap_insert(rel, tup);
  
-@@ -538,6 +587,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
+@@ -538,6 +586,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
  
  				tup = heap_addheader(Natts_pg_attribute,
  									 false,
@@ -824,7 +816,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  									 ATTRIBUTE_TUPLE_SIZE,
  									 (void *) *dpp);
  				attStruct = (Form_pg_attribute) GETSTRUCT(tup);
-@@ -593,7 +643,8 @@ void
+@@ -593,7 +642,8 @@ void
  InsertPgClassTuple(Relation pg_class_desc,
  				   Relation new_rel_desc,
  				   Oid new_rel_oid,
@@ -834,7 +826,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  {
  	Form_pg_class rd_rel = new_rel_desc->rd_rel;
  	Datum		values[Natts_pg_class];
-@@ -644,11 +695,23 @@ InsertPgClassTuple(Relation pg_class_des
+@@ -644,11 +694,23 @@ InsertPgClassTuple(Relation pg_class_des
  	 */
  	HeapTupleSetOid(tup, new_rel_oid);
  
@@ -858,7 +850,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  	heap_freetuple(tup);
  }
  
-@@ -666,9 +729,12 @@ AddNewRelationTuple(Relation pg_class_de
+@@ -666,9 +728,12 @@ AddNewRelationTuple(Relation pg_class_de
  					Oid new_type_oid,
  					Oid relowner,
  					char relkind,
@@ -872,7 +864,7 @@ diff -rpNU3 base/src/backend/catalog/hea
  
  	/*
  	 * first we update some of the information in our uncataloged relation's
-@@ -725,8 +791,21 @@ AddNewRelationTuple(Relation pg_class_de
+@@ -725,8 +790,21 @@ AddNewRelationTuple(Relation pg_class_de
  
  	new_rel_desc->rd_att->tdtypeid = new_type_oid;
  
@@ -883,7 +875,7 @@ diff -rpNU3 base/src/backend/catalog/hea
[...4529 lines suppressed...]
+ 	char	   *schemaname;		/* the name of the schema to create */
+ 	char	   *authid;			/* the owner of the created schema */
++	Node	   *secLabel;		/* explicitly specified security label */
+ 	List	   *schemaElts;		/* schema components (list of parsenodes) */
+ } CreateSchemaStmt;
  
- typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 @@ -1108,6 +1113,7 @@ typedef struct CreateStmt
  	List	   *options;		/* options from WITH clause */
  	OnCommitAction oncommit;	/* what do we do at COMMIT? */
@@ -9802,6 +10263,35 @@ diff -rpNU3 base/src/include/nodes/parse
  } CreateStmt;
  
  /* ----------
+@@ -1320,6 +1326,7 @@ typedef struct CreateSeqStmt
+ 	NodeTag		type;
+ 	RangeVar   *sequence;		/* the sequence to create */
+ 	List	   *options;
++	Node	   *secLabel;
+ } CreateSeqStmt;
+ 
+ typedef struct AlterSeqStmt
+@@ -1671,6 +1678,20 @@ typedef struct AlterOwnerStmt
+ 	char	   *newowner;		/* the new owner */
+ } AlterOwnerStmt;
+ 
++/* ----------------------
++ *		Alter Object Security Label Statement
++ * ----------------------
++ */
++typedef struct AlterSecLabelStmt
++{
++	NodeTag		type;
++	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_COLUMN, etc */
++	RangeVar   *relation;		/* in case it's a table */
++	List	   *object;			/* in case it's some other object */
++	List	   *objarg;			/* argument types, if applicable */
++	char	   *subname;		/* column name, if needed */
++	Node	   *secLabel;		/* the new security label */
++} AlterSecLabelStmt;
+ 
+ /* ----------------------
+  *		Create Rule Statement
 diff -rpNU3 base/src/include/nodes/plannodes.h sepgsql-new/src/include/nodes/plannodes.h
 --- base/src/include/nodes/plannodes.h	2008-01-07 23:51:33.000000000 +0900
 +++ sepgsql-new/src/include/nodes/plannodes.h	2009-05-20 17:08:02.000000000 +0900
@@ -9836,8 +10326,8 @@ diff -rpNU3 base/src/include/nodes/plann
  
  /* ----------------
 diff -rpNU3 base/src/include/nodes/relation.h sepgsql-new/src/include/nodes/relation.h
---- base/src/include/nodes/relation.h	2009-02-02 11:47:17.000000000 +0900
-+++ sepgsql-new/src/include/nodes/relation.h	2009-05-20 17:08:02.000000000 +0900
+--- base/src/include/nodes/relation.h	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/src/include/nodes/relation.h	2009-09-10 20:24:37.000000000 +0900
 @@ -366,6 +366,15 @@ typedef struct RelOptInfo
  	 * list just to avoid recomputing the best inner indexscan repeatedly for
  	 * similar outer relations.  See comments for InnerIndexscanInfo.
@@ -9943,8 +10433,8 @@ diff -rpNU3 base/src/include/security/ro
 +#endif   /* PG_SELINUX_H */
 diff -rpNU3 base/src/include/security/sepgsql.h sepgsql-new/src/include/security/sepgsql.h
 --- base/src/include/security/sepgsql.h	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/include/security/sepgsql.h	2009-05-29 11:12:01.000000000 +0900
-@@ -0,0 +1,457 @@
++++ sepgsql-new/src/include/security/sepgsql.h	2009-06-19 15:02:12.000000000 +0900
+@@ -0,0 +1,466 @@
 +/*
 + * src/include/utils/sepgsql.h
 + *    Headers of SE-PostgreSQL
@@ -10130,15 +10620,21 @@ diff -rpNU3 base/src/include/security/se
 +extern void sepgsqlAvcSwitchClient(void);
 +
 +extern bool
-+sepgsqlClientHasPerms(Oid tsecid,
-+					  security_class_t tclass,
-+					  access_vector_t required,
-+					  const char *audit_name, bool abort);
++sepgsqlClientHasPermsTup(Oid relid, HeapTuple tuple,
++						 security_class_t tclass,
++						 access_vector_t required, bool abort);
++extern bool
++sepgsqlClientHasPermsSid(Oid relid, Oid secid,
++						 security_class_t tclass,
++						 access_vector_t required,
++						 const char *audit_name, bool abort);
 +extern Oid
-+sepgsqlClientCreate(Oid tsecid, security_class_t tclass);
++sepgsqlClientCreateSecid(Oid trelid, Oid tsecid,
++						 security_class_t tclass, Oid nrelid);
 +
 +extern security_context_t
-+sepgsqlClientCreateLabel(Oid tsecid, security_class_t tclass);
++sepgsqlClientCreateLabel(Oid trelid, Oid tsecid,
++						 security_class_t tclass);
 +
 +extern bool
 +sepgsqlComputePerms(security_context_t scontext,
@@ -10189,9 +10685,6 @@ diff -rpNU3 base/src/include/security/se
 +sepgsqlGetClientLabel(void);
 +
 +extern security_context_t
-+sepgsqlGetUnlabeledLabel(void);
-+
-+extern security_context_t
 +sepgsqlSwitchClient(security_context_t new_client);
 +
 +extern bool
@@ -10209,17 +10702,17 @@ diff -rpNU3 base/src/include/security/se
 +extern bool
 +sepgsqlCheckDatabaseSuperuser(void);
 +
-+extern bool
-+sepgsqlCheckSchemaSearch(Oid nsid);
-+
 +extern void
-+sepgsqlCheckSchemaAddRemove(Relation rel, HeapTuple newtup, HeapTuple oldtup);
++sepgsqlCheckDatabaseInstallModule(void);
 +
 +extern void
-+sepgsqlCheckDatabaseInstallModule(const char *filename);
++sepgsqlCheckDatabaseLoadModule(const char *filename);
++
++extern bool
++sepgsqlCheckSchemaSearch(Oid nsid);
 +
 +extern void
-+sepgsqlCheckDatabaseLoadModule(const char *filename);
++sepgsqlCheckSchemaAddRemove(Relation rel, HeapTuple newtup, HeapTuple oldtup);
 +
 +extern void
 +sepgsqlCheckTableLock(Oid table_oid);
@@ -10295,19 +10788,25 @@ diff -rpNU3 base/src/include/security/se
 +sepgsqlSetDefaultSecLabel(Relation rel, HeapTuple tuple);
 +
 +extern security_context_t
-+sepgsqlMetaSecurityLabel(void);
++sepgsqlMetaSecurityLabel(bool shared);
 +
 +extern Oid
-+sepgsqlInputGivenSecLabel(DefElem *defel);
++sepgsqlGivenSecLabelIn(Oid relid, DefElem *defel);
 +
 +extern List *
-+sepgsqlInputGivenSecLabelRelation(CreateStmt *stmt);
++sepgsqlParseCreateStmtSecLabelIn(CreateStmt *stmt);
++
++extern security_context_t
++sepgsqlTransSecLabelIn(security_context_t seclabel);
 +
 +extern security_context_t
-+sepgsqlSecurityLabelTransIn(security_context_t label);
++sepgsqlTransSecLabelOut(security_context_t seclabel);
 +
 +extern security_context_t
-+sepgsqlSecurityLabelTransOut(security_context_t label);
++sepgsqlRawSecLabelIn(security_context_t seclabel);
++
++extern security_context_t
++sepgsqlRawSecLabelOut(security_context_t seclabel);
 +
 +/*
 + * perms.c : SELinux permission related stuff
@@ -10333,10 +10832,6 @@ diff -rpNU3 base/src/include/security/se
 +extern const char *
 +sepgsqlGetPermissionString(security_class_t tclass, access_vector_t av);
 +
-+extern bool
-+sepgsqlCheckObjectPerms(Relation rel, HeapTuple tuple,
-+						access_vector_t required, bool abort);
-+
 +#else	/* HAVE_SELINUX */
 +
 +/* avc.c */
@@ -10359,6 +10854,8 @@ diff -rpNU3 base/src/include/security/se
 +/* hooks.c */
 +#define sepgsqlCheckDatabaseAccess(a)			(true)
 +#define sepgsqlCheckDatabaseSuperuser()			(true)
++#define sepgsqlCheckDatabaseInstallModule()		do {} while(0)
++#define sepgsqlCheckDatabaseLoadModule(a)		do {} while(0)
 +#define sepgsqlCheckSchemaSearch(a)				(true)
 +#define sepgsqlCheckTableLock(a)				do {} while(0)
 +#define sepgsqlCheckTableTruncate(a)			do {} while(0)
@@ -10382,11 +10879,13 @@ diff -rpNU3 base/src/include/security/se
 +#define sepgsqlAllowFunctionInlined(a)			(true)
 +/* label.c */
 +#define sepgsqlTupleDescHasSecLabel(a)			(false)
-+#define sepgsqlMetaSecurityLabel()				(NULL)
-+#define sepgsqlInputGivenSecLabel(a)			(InvalidOid)
-+#define sepgsqlInputGivenSecLabelRelation(a)	(NIL)
-+#define sepgsqlSecurityLabelTransIn(a)			(a)
-+#define sepgsqlSecurityLabelTransOut(a)			(a)
++#define sepgsqlMetaSecurityLabel(a)				(NULL)
++#define sepgsqlGivenSecLabelIn(a,b)				(InvalidOid)
++#define sepgsqlParseCreateStmtSecLabelIn(a)		(NIL)
++#define sepgsqlTransSecLabelIn(a)				(a)
++#define sepgsqlTransSecLabelOut(a)				(a)
++#define sepgsqlRawSecLabelIn(a)					(a)
++#define sepgsqlRawSecLabelOut(a)				(a)
 +
 +#endif	/* HAVE_SELINUX */
 +

sepostgresql-test-8.3.patch:
 regress/expected/sanity_check.out      |    3 
 sepgsql/Makefile                       |   62 ++++++
 sepgsql/expected/basic.out             |  114 ++++++++++++
 sepgsql/expected/copy_stmt.out         |   94 ++++++++++
 sepgsql/expected/enhanced_ddl_stmt.out |  182 ++++++++++++++++++++
 sepgsql/expected/join_query.out        |   89 +++++++++
 sepgsql/expected/large_object.out      |  299 +++++++++++++++++++++++++++++++++
 sepgsql/expected/row_level.out         |  136 +++++++++++++++
 sepgsql/expected/security_label.out    |  129 ++++++++++++++
 sepgsql/launch_psql.c                  |   91 ++++++++++
 sepgsql/sql/basic.sql                  |   59 ++++++
 sepgsql/sql/copy_stmt.sql              |   58 ++++++
 sepgsql/sql/enhanced_ddl_stmt.sql      |   89 +++++++++
 sepgsql/sql/join_query.sql             |   50 +++++
 sepgsql/sql/large_object.sql           |  103 +++++++++++
 sepgsql/sql/row_level.sql              |   61 ++++++
 sepgsql/sql/security_label.sql         |   60 ++++++
 17 files changed, 1678 insertions(+), 1 deletion(-)

Index: sepostgresql-test-8.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql-test-8.3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sepostgresql-test-8.3.patch	9 Jun 2009 07:30:54 -0000	1.2
+++ sepostgresql-test-8.3.patch	10 Sep 2009 12:27:20 -0000	1.3
@@ -20,8 +20,8 @@ diff -rpNU3 base/src/test/regress/expect
  -- another sanity check: every system catalog that has OIDs should have
 diff -rpNU3 base/src/test/sepgsql/Makefile sepgsql-new/src/test/sepgsql/Makefile
 --- base/src/test/sepgsql/Makefile	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/Makefile	2009-03-03 18:21:14.000000000 +0900
-@@ -0,0 +1,65 @@
++++ sepgsql-new/src/test/sepgsql/Makefile	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,62 @@
 +# ----------------------------------------------------
 +# Makefile for SE-PostgreSQL testcases
 +# ----------------------------------------------------
@@ -46,7 +46,7 @@ diff -rpNU3 base/src/test/sepgsql/Makefi
 +
 +results.diff: $(TESTCASES:sql/%.sql=results/%.diff)
 +	@for x in $^; do cat $$x >> $@; done
-+	@test -s $@ && echo "HINT: See $@ to confirm errors" || :
++	@test -s $@ && echo "HINT: See $(shell pwd)/$@ to confirm errors" || :
 +
 +results/%.diff: sql/%.sql
 +	@./launch_psql $(PSQL) -a $(DBNAME) < $< >& $(@:%.diff=%.out)
@@ -73,9 +73,9 @@ diff -rpNU3 base/src/test/sepgsql/Makefi
 +	@$(PSQL) -qt -c 'SHOW sepostgresql' -d $(DBNAME) 2>/dev/null | grep -q on || \
 +		(echo "HINT: database \"$(DBNAME)\" is not available"; \
 +		 echo "HINT: SE-PostgreSQL may not be available on server"; exit 1)
-+	@$(GETSEBOOL) allow_user_postgresql_connect | grep -q on || \
++	@$(GETSEBOOL) allow_user_postgresql_connect | grep -q 'on$$' || \
 +		(echo "HINT: check allow_user_postgresql_connect boolean"; exit 1)
-+	@$(GETSEBOOL) sepgsql_regression_test_mode | grep -q on || \
++	@$(GETSEBOOL) sepgsql_regression_test_mode | grep -q 'on$$' || \
 +		(echo "HINT: check sepgsql_regression_test_mode boolean"; \
 +		 echo "HINT: check sepostgresql-devel.pp installed"; exit 1)
 +	@$(RUNCON) -t sepgsql_test_t -l s0-s0:c0.c15 \
@@ -83,15 +83,14 @@ diff -rpNU3 base/src/test/sepgsql/Makefi
 +		(echo "HINT: /sbin/restorecon -R <prefix> and restart"; \
 +		 echo "HINT: user shell should have 's0-s0:c0.c15' range, at least"; \
 +		 echo "      semanage enables to set up it"; exit 1)
-+	@test -x /etc/init.d/mcstrans && /etc/init.d/mcstrans status >& /dev/null && \
-+		(echo "HINT: stop mcstrans daemon"; exit 1) || \
-+		(test $$? -eq 3 && exit 0 || exit 1)
 +	@echo "PASS: check runtime environment"
 diff -rpNU3 base/src/test/sepgsql/expected/basic.out sepgsql-new/src/test/sepgsql/expected/basic.out
 --- base/src/test/sepgsql/expected/basic.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/basic.out	2009-03-15 17:38:39.000000000 +0900
-@@ -0,0 +1,108 @@
++++ sepgsql-new/src/test/sepgsql/expected/basic.out	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,114 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -141,6 +140,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +) inherits(t2);
 +CREATE TABLE
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                  sepgsql_getcon                   
 +---------------------------------------------------
@@ -148,7 +149,7 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(1 row)
 +
 +SELECT * FROM t1;			-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t1.c
++ERROR:  SELinux: security policy violation
 +SELECT a, b FROM t1;
 + a |  b  
 +---+-----
@@ -157,13 +158,13 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(2 rows)
 +
 +SELECT COUNT(*) FROM t1 WHERE c;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t1.c
++ERROR:  SELinux: security policy violation
 +UPDATE t1 SET b = 'ccc';		-- to be denied
-+ERROR:  SELinux: denied { update } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_ro_table_t:s0 tclass=db_column name=t1.b
++ERROR:  SELinux: security policy violation
 +UPDATE t1 SET a = a + 2;
 +UPDATE 2
 +INSERT INTO t1 VALUES (5, 'eee', true);	-- to be denied
-+ERROR:  SELinux: denied { insert } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_ro_table_t:s0 tclass=db_column name=t1.b
++ERROR:  SELinux: security policy violation
 +INSERT INTO t1 VALUES (5);
 +INSERT 0 1
 +SELECT * FROM t2;
@@ -177,13 +178,15 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(0 rows)
 +
 +SELECT t3 FROM t3;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0:c1 tclass=db_column name=t3.x
++ERROR:  SELinux: security policy violation
 +SELECT 1 FROM t3;
 + ?column? 
 +----------
 +(0 rows)
 +
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c1
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                  sepgsql_getcon                   
 +---------------------------------------------------
@@ -191,9 +194,9 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(1 row)
 +
 +SELECT * FROM t2;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c1 tcontext=unconfined_u:object_r:sepgsql_table_t:s0:c0 tclass=db_table name=t2
++ERROR:  SELinux: security policy violation
 +SELECT t2 FROM t2;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c1 tcontext=unconfined_u:object_r:sepgsql_table_t:s0:c0 tclass=db_table name=t2
++ERROR:  SELinux: security policy violation
 +SELECT t3 FROM t3;
 + t3 
 +----
@@ -201,9 +204,11 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +
 diff -rpNU3 base/src/test/sepgsql/expected/copy_stmt.out sepgsql-new/src/test/sepgsql/expected/copy_stmt.out
 --- base/src/test/sepgsql/expected/copy_stmt.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/copy_stmt.out	2009-03-02 00:24:34.000000000 +0900
-@@ -0,0 +1,90 @@
++++ sepgsql-new/src/test/sepgsql/expected/copy_stmt.out	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,94 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -256,6 +261,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +INSERT INTO t2 VALUES (1, 'sss'), (2, 'ttt');
 +INSERT 0 2
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                  sepgsql_getcon                   
 +---------------------------------------------------
@@ -269,11 +276,11 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +COPY t1 TO '/tmp/sepgsql_test_copy_1';
 +COPY 4
 +COPY t1 TO '/tmp/sepgsql_test_copy_2';	-- to be denied
-+ERROR:  SELinux: denied { write } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:postgresql_db_t:s0 tclass=file name=/tmp/sepgsql_test_copy_2
++ERROR:  SELinux: security policy violation
 +COPY t2 TO stdout;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t2.y
++ERROR:  SELinux: security policy violation
 +COPY t2 FROM stdin;	-- to be denied
-+ERROR:  SELinux: denied { insert } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t2.y
++ERROR:  SELinux: security policy violation
 +COPY t2 (x) TO stdout;
 +1
 +2
@@ -281,7 +288,7 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +2
 +COPY t3 TO stdout;
 +COPY t3 FROM '/tmp/sepgsql_test_copy_1';	-- to be denied
-+ERROR:  SELinux: denied { insert } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_ro_table_t:s0 tclass=db_table name=t3
++ERROR:  SELinux: security policy violation
 +COPY t1 FROM '/tmp/sepgsql_test_copy_1';
 +COPY 4
 +COPY t1 TO stdout;
@@ -295,9 +302,11 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +4	ddd
 diff -rpNU3 base/src/test/sepgsql/expected/enhanced_ddl_stmt.out sepgsql-new/src/test/sepgsql/expected/enhanced_ddl_stmt.out
 --- base/src/test/sepgsql/expected/enhanced_ddl_stmt.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/enhanced_ddl_stmt.out	2009-03-15 17:38:39.000000000 +0900
-@@ -0,0 +1,180 @@
++++ sepgsql-new/src/test/sepgsql/expected/enhanced_ddl_stmt.out	2009-06-19 15:02:12.000000000 +0900
+@@ -0,0 +1,182 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -384,12 +393,12 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +       a int,
 +       b text
 +) SECURITY_CONTEXT = 'unconfined_u:object_r:invalid_label_t:s0';	-- to be failed
-+ERROR:  invalid security label: unconfined_u:object_r:invalid_label_t:s0
++ERROR:  Invalid security context: "unconfined_u:object_r:invalid_label_t:s0"
 +CREATE TABLE t4 (
 +       a int,
 +       b text
 +) SECURITY_CONTEXT = 'unconfined_u:object_r:sepgsql_proc_t:s0';	-- to be denied
-+ERROR:  SELinux: denied { create } scontext=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15 tcontext=unconfined_u:object_r:sepgsql_proc_t:s0 tclass=db_table name=t4
++ERROR:  SELinux: security policy violation
 +-- ALTER TABLE with SECURITY_CONTEXT clause
 +ALTER TABLE t2 SECURITY_CONTEXT = 'unconfined_u:object_r:sepgsql_secret_table_t:s0';
 +ALTER TABLE
@@ -442,20 +451,20 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +       LANGUAGE 'sql'
 +       SECURITY_CONTEXT = 'unconfined_u:object_r:invalid_label_t:s0'
 +       AS 'SELECT $1 + $1';	 -- to be failed
-+ERROR:  invalid security label: unconfined_u:object_r:invalid_label_t:s0
++ERROR:  Invalid security context: "unconfined_u:object_r:invalid_label_t:s0"
 +CREATE FUNCTION f2 (int) RETURNS int
 +       LANGUAGE 'sql'
 +       SECURITY_CONTEXT = 'unconfined_u:object_r:sepgsql_proc_t:s0:c16'
 +       AS 'SELECT $1 + $1';	 -- to be denied
-+ERROR:  SELinux: denied { create } scontext=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15 tcontext=unconfined_u:object_r:sepgsql_proc_t:s0:c16 tclass=db_procedure name=f2
++ERROR:  SELinux: security policy violation
 +CREATE FUNCTION f2 (int) RETURNS int
 +       LANGUAGE 'sql'
 +       AS 'SELECT $1 + $1';
 +CREATE FUNCTION
 +SELECT proname, security_context FROM pg_proc WHERE oid = 'f2'::regproc;
-+ proname |            security_context             
-+---------+-----------------------------------------
-+ f2      | unconfined_u:object_r:sepgsql_proc_t:s0
++ proname |               security_context               
++---------+----------------------------------------------
++ f2      | unconfined_u:object_r:sepgsql_proc_exec_t:s0
 +(1 row)
 +
 +-- ALTER FUNCTION with SECURITY_CONTEXT clause
@@ -470,18 +479,20 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +
 +ALTER FUNCTION f2(int)
 +      SECURITY_CONTEXT = 'unconfined_u:object_r:sepgsql_proc_t:s0:c16';	-- to be denied
-+ERROR:  SELinux: denied { relabelto } scontext=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15 tcontext=unconfined_u:object_r:sepgsql_proc_t:s0:c16 tclass=db_procedure name=f2
++ERROR:  SELinux: security policy violation
 +SELECT proname, security_context FROM pg_proc WHERE oid = 'f2'::regproc;
-+ proname |            security_context             
-+---------+-----------------------------------------
-+ f2      | unconfined_u:object_r:sepgsql_proc_t:s0
++ proname |               security_context               
++---------+----------------------------------------------
++ f2      | unconfined_u:object_r:sepgsql_proc_exec_t:s0
 +(1 row)
 +
 diff -rpNU3 base/src/test/sepgsql/expected/join_query.out sepgsql-new/src/test/sepgsql/expected/join_query.out
 --- base/src/test/sepgsql/expected/join_query.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/join_query.out	2009-03-15 17:38:39.000000000 +0900
-@@ -0,0 +1,85 @@
++++ sepgsql-new/src/test/sepgsql/expected/join_query.out	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,89 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -538,6 +549,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +INSERT INTO t2 VALUES (1, 'sss'), (5, 'ttt');
 +INSERT 0 2
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                  sepgsql_getcon                   
 +---------------------------------------------------
@@ -545,7 +558,7 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(1 row)
 +
 +SELECT * FROM t1 JOIN t2 ON a = x;		-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t1.c
++ERROR:  SELinux: security policy violation
 +SELECT a, b, y FROM t1 JOIN t2 ON a = x;
 + a |  b  |  y  
 +---+-----+-----
@@ -557,7 +570,7 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(5 rows)
 +
 +SELECT a, b, y FROM t1 JOIN t2 ON c = x;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t1.c
++ERROR:  SELinux: security policy violation
 +SELECT COUNT(*) FROM t1 JOIN t2 ON a = x;
 + count 
 +-------
@@ -565,12 +578,14 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(1 row)
 +
 +SELECT j FROM (t1 JOIN t2 ON a = x) AS j;	-- to be denied
-+ERROR:  SELinux: denied { select } scontext=unconfined_u:unconfined_r:sepgsql_test_t:s0-s0:c0 tcontext=unconfined_u:object_r:sepgsql_secret_table_t:s0 tclass=db_column name=t1.c
++ERROR:  SELinux: security policy violation
 diff -rpNU3 base/src/test/sepgsql/expected/large_object.out sepgsql-new/src/test/sepgsql/expected/large_object.out
 --- base/src/test/sepgsql/expected/large_object.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/large_object.out	2009-03-03 14:31:40.000000000 +0900
-@@ -0,0 +1,293 @@
++++ sepgsql-new/src/test/sepgsql/expected/large_object.out	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,299 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -623,6 +638,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(1 row)
 +
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:sepgsql_test_t:s0:c0
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                 sepgsql_getcon                 
 +------------------------------------------------
@@ -805,6 +822,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +COMMIT;
 +COMMIT
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -832,23 +851,23 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(2 rows)
 +
 +SELECT lo_get_security(loid) FROM lolabel;
-+                     lo_get_security                     
-+---------------------------------------------------------
++                 lo_get_security                 
++-------------------------------------------------
 + system_u:object_r:sepgsql_blob_t:s0:c4
 + system_u:object_r:sepgsql_blob_t:s0:c4
 + system_u:object_r:sepgsql_secret_blob_t:s0
-+ unconfined_u:object_r:sepgsql_test_sepgsql_blob_t:s0:c0
++ unconfined_u:object_r:user_sepgsql_blob_t:s0:c0
 +(4 rows)
 +
 +SELECT security_context, lo_label(loid) AS label, count(*)
 +	FROM pg_largeobject WHERE loid in (SELECT loid FROM lolabel)
 +	GROUP BY security_context, loid ORDER BY label;
-+                    security_context                     |  label   | count 
-+---------------------------------------------------------+----------+-------
-+ unconfined_u:object_r:sepgsql_test_sepgsql_blob_t:s0:c0 | local    |     1
-+ system_u:object_r:sepgsql_blob_t:s0:c4                  | normal   |    10
-+ system_u:object_r:sepgsql_blob_t:s0:c4                  | readonly |    10
-+ system_u:object_r:sepgsql_secret_blob_t:s0              | secret   |    10
++                security_context                 |  label   | count 
++-------------------------------------------------+----------+-------
++ unconfined_u:object_r:user_sepgsql_blob_t:s0:c0 | local    |     1
++ system_u:object_r:sepgsql_blob_t:s0:c4          | normal   |    10
++ system_u:object_r:sepgsql_blob_t:s0:c4          | readonly |    10
++ system_u:object_r:sepgsql_secret_blob_t:s0      | secret   |    10
 +(4 rows)
 +
 +ROLLBACK;
@@ -865,9 +884,11 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +
 diff -rpNU3 base/src/test/sepgsql/expected/row_level.out sepgsql-new/src/test/sepgsql/expected/row_level.out
 --- base/src/test/sepgsql/expected/row_level.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/row_level.out	2009-03-02 00:24:34.000000000 +0900
-@@ -0,0 +1,131 @@
++++ sepgsql-new/src/test/sepgsql/expected/row_level.out	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,136 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -936,6 +957,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +(3 rows)
 +
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:sepgsql_test_t:s0:c0
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                 sepgsql_getcon                 
 +------------------------------------------------
@@ -996,13 +1019,16 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +CONTEXT:  SQL statement "SELECT 1 FROM ONLY "public"."t2" x WHERE $1 OPERATOR(pg_catalog.=) "x" FOR SHARE OF x"
 +DELETE FROM t1 WHERE a not in (SELECT x FROM t2);	-- to be failed
 +ERROR:  SELinux: security policy violation
++CONTEXT:  SQL statement "SELECT 1 FROM ONLY "public"."t2" x WHERE $1 OPERATOR(pg_catalog.=) "x" FOR SHARE OF x"
 +DELETE FROM t1 WHERE a = 7;
 +DELETE 1
 diff -rpNU3 base/src/test/sepgsql/expected/security_label.out sepgsql-new/src/test/sepgsql/expected/security_label.out
 --- base/src/test/sepgsql/expected/security_label.out	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/expected/security_label.out	2009-03-02 00:24:34.000000000 +0900
-@@ -0,0 +1,127 @@
++++ sepgsql-new/src/test/sepgsql/expected/security_label.out	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,129 @@
 +-- at SECURITY_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c15
++SET sepostgresql_mcstrans TO off;
++SET
 +SELECT sepgsql_getcon();
 +                   sepgsql_getcon                    
 +-----------------------------------------------------
@@ -1051,7 +1077,7 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +INSERT INTO t1 VALUES (4, 'ddd'), (5, 'eee');
 +INSERT 0 2
 +INSERT INTO t1 (security_context, a, b) VALUES ('invalid security context', 6, 'fff');	-- to be failed
-+ERROR:  invalid security label: invalid security context
++ERROR:  Invalid security context: "invalid security context"
 +INSERT INTO t1 (security_context, a, b) VALUES ('system_u:object_r:sepgsql_table_t:s0:c20', 6, 'fff');	-- to be denied
 +INSERT 0 0
 +SELECT security_context, * FROM t1;
@@ -1131,8 +1157,8 @@ diff -rpNU3 base/src/test/sepgsql/expect
 +system_u:object_r:sepgsql_table_t:s0:c4	13	nnn
 diff -rpNU3 base/src/test/sepgsql/launch_psql.c sepgsql-new/src/test/sepgsql/launch_psql.c
 --- base/src/test/sepgsql/launch_psql.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql-new/src/test/sepgsql/launch_psql.c	2009-03-02 00:24:34.000000000 +0900
-@@ -0,0 +1,87 @@
++++ sepgsql-new/src/test/sepgsql/launch_psql.c	2009-06-10 21:37:54.000000000 +0900
+@@ -0,0 +1,91 @@
 +/*
 + * launch_psql.c
 + *
@@ -1189,6 +1215,10 @@ diff -rpNU3 base/src/test/sepgsql/launch
 +				pclose(filp);
 +				filp = NULL;
 +			}
++			/* Inject SET sepostgresql_mcstrans TO off */
++			ofs = strlen(buffer);
++			snprintf(buffer + ofs, sizeof(buffer) - ofs,
++					 "\nSET sepostgresql_mcstrans TO off;\n");
 +
 +			/* Inject a pseudo sepgsql_getcon() to confirm new context */
 +			ofs = strlen(buffer);

sepostgresql-utils-8.3.patch:
 initdb/initdb.c      |   13 +++++
 pg_dump/pg_dump.c    |  121 +++++++++++++++++++++++++++++++++++++++++++--------
 pg_dump/pg_dump.h    |    2 
 pg_dump/pg_dumpall.c |   60 ++++++++++++++++++++-----
 4 files changed, 168 insertions(+), 28 deletions(-)

Index: sepostgresql-utils-8.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql-utils-8.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sepostgresql-utils-8.3.patch	27 Mar 2009 03:54:13 -0000	1.1
+++ sepostgresql-utils-8.3.patch	10 Sep 2009 12:27:20 -0000	1.2
@@ -1,6 +1,6 @@
 diff -rpNU3 base/src/bin/initdb/initdb.c sepgsql-new/src/bin/initdb/initdb.c
---- base/src/bin/initdb/initdb.c	2008-11-05 09:57:00.000000000 +0900
-+++ sepgsql-new/src/bin/initdb/initdb.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/bin/initdb/initdb.c	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/src/bin/initdb/initdb.c	2009-09-10 20:24:37.000000000 +0900
 @@ -94,6 +94,7 @@ static bool debug = false;
  static bool noclean = false;
  static bool show_setting = false;
@@ -9,7 +9,7 @@ diff -rpNU3 base/src/bin/initdb/initdb.c
  
  
  /* internal vars */
-@@ -1212,6 +1213,13 @@ setup_config(void)
+@@ -1224,6 +1225,13 @@ setup_config(void)
  						 "#default_text_search_config = 'pg_catalog.simple'",
  							  repltok);
  
@@ -23,7 +23,7 @@ diff -rpNU3 base/src/bin/initdb/initdb.c
  	snprintf(path, sizeof(path), "%s/postgresql.conf", pg_data);
  
  	writefile(path, conflines);
-@@ -2383,6 +2391,7 @@ usage(const char *progname)
+@@ -2395,6 +2403,7 @@ usage(const char *progname)
  	printf(_("  -U, --username=NAME       database superuser name\n"));
  	printf(_("  -W, --pwprompt            prompt for a password for the new superuser\n"));
  	printf(_("  --pwfile=FILE             read password for the new superuser from file\n"));
@@ -31,7 +31,7 @@ diff -rpNU3 base/src/bin/initdb/initdb.c
  	printf(_("  -?, --help                show this help, then exit\n"));
  	printf(_("  -V, --version             output version information, then exit\n"));
  	printf(_("\nLess commonly used options:\n"));
-@@ -2417,6 +2426,7 @@ main(int argc, char *argv[])
+@@ -2429,6 +2438,7 @@ main(int argc, char *argv[])
  		{"auth", required_argument, NULL, 'A'},
  		{"pwprompt", no_argument, NULL, 'W'},
  		{"pwfile", required_argument, NULL, 9},
@@ -39,7 +39,7 @@ diff -rpNU3 base/src/bin/initdb/initdb.c
  		{"username", required_argument, NULL, 'U'},
  		{"help", no_argument, NULL, '?'},
  		{"version", no_argument, NULL, 'V'},
-@@ -2531,6 +2541,9 @@ main(int argc, char *argv[])
+@@ -2543,6 +2553,9 @@ main(int argc, char *argv[])
  			case 9:
  				pwfilename = xstrdup(optarg);
  				break;
@@ -50,8 +50,8 @@ diff -rpNU3 base/src/bin/initdb/initdb.c
  				show_setting = true;
  				break;
 diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql-new/src/bin/pg_dump/pg_dump.c
---- base/src/bin/pg_dump/pg_dump.c	2009-02-02 11:47:17.000000000 +0900
-+++ sepgsql-new/src/bin/pg_dump/pg_dump.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/bin/pg_dump/pg_dump.c	2009-09-10 20:11:35.000000000 +0900
++++ sepgsql-new/src/bin/pg_dump/pg_dump.c	2009-09-10 20:24:37.000000000 +0900
 @@ -118,6 +118,8 @@ static int	g_numNamespaces;
  /* flag to turn on/off dollar quoting */
  static int	disable_dollar_quoting = 0;
@@ -121,7 +121,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  fmtQualifiedId(tbinfo->dobj.namespace->dobj.name,
  										 classname));
  	}
-@@ -1785,11 +1810,29 @@ dumpBlobComments(Archive *AH, void *arg)
+@@ -1791,11 +1816,29 @@ dumpBlobComments(Archive *AH, void *arg)
  			Oid			blobOid;
  			char	   *comment;
  
@@ -152,7 +152,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  			comment = PQgetvalue(res, i, 1);
  
  			printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ",
-@@ -2887,6 +2930,7 @@ getTables(int *numTables)
+@@ -2893,6 +2936,7 @@ getTables(int *numTables)
  	int			i_owning_col;
  	int			i_reltablespace;
  	int			i_reloptions;
@@ -160,7 +160,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  
  	/* Make sure we are in proper schema */
  	selectSourceSchema("pg_catalog");
-@@ -2926,7 +2970,8 @@ getTables(int *numTables)
+@@ -2932,7 +2976,8 @@ getTables(int *numTables)
  						  "d.refobjid as owning_tab, "
  						  "d.refobjsubid as owning_col, "
  						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
@@ -170,7 +170,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "from pg_class c "
  						  "left join pg_depend d on "
  						  "(c.relkind = '%c' and "
-@@ -2936,6 +2981,7 @@ getTables(int *numTables)
+@@ -2942,6 +2987,7 @@ getTables(int *numTables)
  						  "where relkind in ('%c', '%c', '%c', '%c') "
  						  "order by c.oid",
  						  username_subquery,
@@ -178,7 +178,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  RELKIND_SEQUENCE,
  						  RELKIND_RELATION, RELKIND_SEQUENCE,
  						  RELKIND_VIEW, RELKIND_COMPOSITE_TYPE);
-@@ -2955,7 +3001,8 @@ getTables(int *numTables)
+@@ -2961,7 +3007,8 @@ getTables(int *numTables)
  						  "d.refobjid as owning_tab, "
  						  "d.refobjsubid as owning_col, "
  						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
@@ -188,7 +188,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "from pg_class c "
  						  "left join pg_depend d on "
  						  "(c.relkind = '%c' and "
-@@ -2984,7 +3031,8 @@ getTables(int *numTables)
+@@ -2990,7 +3037,8 @@ getTables(int *numTables)
  						  "d.refobjid as owning_tab, "
  						  "d.refobjsubid as owning_col, "
  						  "NULL as reltablespace, "
@@ -198,7 +198,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "from pg_class c "
  						  "left join pg_depend d on "
  						  "(c.relkind = '%c' and "
-@@ -3009,7 +3057,8 @@ getTables(int *numTables)
+@@ -3015,7 +3063,8 @@ getTables(int *numTables)
  						  "NULL::oid as owning_tab, "
  						  "NULL::int4 as owning_col, "
  						  "NULL as reltablespace, "
@@ -208,7 +208,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "from pg_class "
  						  "where relkind in ('%c', '%c', '%c') "
  						  "order by oid",
-@@ -3029,7 +3078,8 @@ getTables(int *numTables)
+@@ -3035,7 +3084,8 @@ getTables(int *numTables)
  						  "NULL::oid as owning_tab, "
  						  "NULL::int4 as owning_col, "
  						  "NULL as reltablespace, "
@@ -218,7 +218,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "from pg_class "
  						  "where relkind in ('%c', '%c', '%c') "
  						  "order by oid",
-@@ -3059,7 +3109,8 @@ getTables(int *numTables)
+@@ -3065,7 +3115,8 @@ getTables(int *numTables)
  						  "NULL::oid as owning_tab, "
  						  "NULL::int4 as owning_col, "
  						  "NULL as reltablespace, "
@@ -228,7 +228,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "from pg_class c "
  						  "where relkind in ('%c', '%c') "
  						  "order by oid",
-@@ -3102,6 +3153,7 @@ getTables(int *numTables)
+@@ -3108,6 +3159,7 @@ getTables(int *numTables)
  	i_owning_col = PQfnumber(res, "owning_col");
  	i_reltablespace = PQfnumber(res, "reltablespace");
  	i_reloptions = PQfnumber(res, "reloptions");
@@ -236,7 +236,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  
  	for (i = 0; i < ntups; i++)
  	{
-@@ -3132,6 +3184,7 @@ getTables(int *numTables)
+@@ -3138,6 +3190,7 @@ getTables(int *numTables)
  		}
  		tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace));
  		tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions));
@@ -244,7 +244,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  
  		/* other fields were zeroed above */
  
-@@ -4320,6 +4373,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4326,6 +4379,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
  	int			i_atthasdef;
  	int			i_attisdropped;
  	int			i_attislocal;
@@ -252,7 +252,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  	PGresult   *res;
  	int			ntups;
  	bool		hasdefaults;
-@@ -4362,12 +4416,14 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4368,12 +4422,14 @@ getTableAttrs(TableInfo *tblinfo, int nu
  			/* need left join here to not fail on dropped columns ... */
  			appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, "
  				  "a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, "
@@ -268,7 +268,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  							  tbinfo->dobj.catId.oid);
  		}
  		else if (g_fout->remoteVersion >= 70100)
-@@ -4379,7 +4435,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4385,7 +4441,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
  			 */
  			appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, -1 as attstattarget, a.attstorage, t.typstorage, "
  							  "a.attnotnull, a.atthasdef, false as attisdropped, false as attislocal, "
@@ -278,7 +278,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  							  "from pg_attribute a left join pg_type t "
  							  "on a.atttypid = t.oid "
  							  "where a.attrelid = '%u'::oid "
-@@ -4392,7 +4449,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4398,7 +4455,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
  			/* format_type not available before 7.1 */
  			appendPQExpBuffer(q, "SELECT attnum, attname, atttypmod, -1 as attstattarget, attstorage, attstorage as typstorage, "
  							  "attnotnull, atthasdef, false as attisdropped, false as attislocal, "
@@ -288,7 +288,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  							  "from pg_attribute a "
  							  "where attrelid = '%u'::oid "
  							  "and attnum > 0::int2 "
-@@ -4416,6 +4474,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4422,6 +4480,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
  		i_atthasdef = PQfnumber(res, "atthasdef");
  		i_attisdropped = PQfnumber(res, "attisdropped");
  		i_attislocal = PQfnumber(res, "attislocal");
@@ -296,7 +296,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  
  		tbinfo->numatts = ntups;
  		tbinfo->attnames = (char **) malloc(ntups * sizeof(char *));
-@@ -4426,6 +4485,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4432,6 +4491,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
  		tbinfo->typstorage = (char *) malloc(ntups * sizeof(char));
  		tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
  		tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
@@ -304,7 +304,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  		tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
  		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
  		tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
-@@ -4449,6 +4509,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
+@@ -4455,6 +4515,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
  			tbinfo->typstorage[j] = *(PQgetvalue(res, j, i_typstorage));
  			tbinfo->attisdropped[j] = (PQgetvalue(res, j, i_attisdropped)[0] == 't');
  			tbinfo->attislocal[j] = (PQgetvalue(res, j, i_attislocal)[0] == 't');
@@ -312,7 +312,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  			tbinfo->notnull[j] = (PQgetvalue(res, j, i_attnotnull)[0] == 't');
  			tbinfo->attrdefs[j] = NULL; /* fix below */
  			if (PQgetvalue(res, j, i_atthasdef)[0] == 't')
-@@ -6430,6 +6491,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6436,6 +6497,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  	char	   *procost;
  	char	   *prorows;
  	char	   *lanname;
@@ -320,7 +320,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  	char	   *rettypename;
  	int			nallargs;
  	char	  **allargtypes = NULL;
-@@ -6459,9 +6521,11 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6465,9 +6527,11 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  						  "proallargtypes, proargmodes, proargnames, "
  						  "provolatile, proisstrict, prosecdef, "
  						  "proconfig, procost, prorows, "
@@ -333,7 +333,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  finfo->dobj.catId.oid);
  	}
  	else if (g_fout->remoteVersion >= 80100)
-@@ -6471,7 +6535,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6477,7 +6541,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  						  "proallargtypes, proargmodes, proargnames, "
  						  "provolatile, proisstrict, prosecdef, "
  						  "null as proconfig, 0 as procost, 0 as prorows, "
@@ -343,7 +343,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "FROM pg_catalog.pg_proc "
  						  "WHERE oid = '%u'::pg_catalog.oid",
  						  finfo->dobj.catId.oid);
-@@ -6485,7 +6550,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6491,7 +6556,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  						  "proargnames, "
  						  "provolatile, proisstrict, prosecdef, "
  						  "null as proconfig, 0 as procost, 0 as prorows, "
@@ -353,7 +353,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "FROM pg_catalog.pg_proc "
  						  "WHERE oid = '%u'::pg_catalog.oid",
  						  finfo->dobj.catId.oid);
-@@ -6499,7 +6565,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6505,7 +6571,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  						  "null as proargnames, "
  						  "provolatile, proisstrict, prosecdef, "
  						  "null as proconfig, 0 as procost, 0 as prorows, "
@@ -363,7 +363,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "FROM pg_catalog.pg_proc "
  						  "WHERE oid = '%u'::pg_catalog.oid",
  						  finfo->dobj.catId.oid);
-@@ -6515,7 +6582,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6521,7 +6588,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  						  "proisstrict, "
  						  "'f'::boolean as prosecdef, "
  						  "null as proconfig, 0 as procost, 0 as prorows, "
@@ -373,7 +373,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "FROM pg_proc "
  						  "WHERE oid = '%u'::oid",
  						  finfo->dobj.catId.oid);
-@@ -6531,7 +6599,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6537,7 +6605,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  						  "'f'::boolean as proisstrict, "
  						  "'f'::boolean as prosecdef, "
  						  "null as proconfig, 0 as procost, 0 as prorows, "
@@ -383,7 +383,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  						  "FROM pg_proc "
  						  "WHERE oid = '%u'::oid",
  						  finfo->dobj.catId.oid);
-@@ -6562,6 +6631,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6568,6 +6637,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  	procost = PQgetvalue(res, 0, PQfnumber(res, "procost"));
  	prorows = PQgetvalue(res, 0, PQfnumber(res, "prorows"));
  	lanname = PQgetvalue(res, 0, PQfnumber(res, "lanname"));
@@ -391,7 +391,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  
  	/*
  	 * See backend/commands/define.c for details of how the 'AS' clause is
-@@ -6699,6 +6769,9 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
+@@ -6705,6 +6775,9 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
  	if (prosecdef[0] == 't')
  		appendPQExpBuffer(q, " SECURITY DEFINER");
  
@@ -401,7 +401,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  	/*
  	 * COST and ROWS are emitted only if present and not default, so as not to
  	 * break backwards-compatibility of the dump without need.	Keep this code
-@@ -8780,6 +8853,10 @@ dumpTableSchema(Archive *fout, TableInfo
+@@ -8786,6 +8859,10 @@ dumpTableSchema(Archive *fout, TableInfo
  				if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
  					appendPQExpBuffer(q, " NOT NULL");
  
@@ -412,7 +412,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  				actual_atts++;
  			}
  		}
-@@ -8827,6 +8904,9 @@ dumpTableSchema(Archive *fout, TableInfo
+@@ -8833,6 +8910,9 @@ dumpTableSchema(Archive *fout, TableInfo
  		if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0)
  			appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions);
  
@@ -422,7 +422,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump
  		appendPQExpBuffer(q, ";\n");
  
  		/* Loop dumping statistics and storage statements */
-@@ -10244,6 +10324,13 @@ fmtCopyColumnList(const TableInfo *ti)
+@@ -10250,6 +10330,13 @@ fmtCopyColumnList(const TableInfo *ti)
  
  	appendPQExpBuffer(q, "(");
  	needComma = false;


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql.init,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sepostgresql.init	9 Jun 2009 07:30:55 -0000	1.34
+++ sepostgresql.init	10 Sep 2009 12:27:20 -0000	1.35
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.3.7"
+PGVERSION="8.3.8"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="1990"
+SEPGVERSION="2300"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sepostgresql.spec	9 Jun 2009 07:30:55 -0000	1.37
+++ sepostgresql.spec	10 Sep 2009 12:27:20 -0000	1.38
@@ -11,8 +11,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.3.7
-Release: 1990%{?dist}
+Version: 8.3.8
+Release: 2300%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -36,7 +36,7 @@ Requires(post): policycoreutils /sbin/ch
 Requires(preun): /sbin/chkconfig /sbin/service
 Requires(postun): policycoreutils
 Requires: postgresql-server = %{version}
-Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43
+Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.80
 Requires: selinux-policy >= 3.4.2
 Requires: tzdata logrotate
 
@@ -199,6 +199,9 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Thu Sep 10 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.8-2300
+- upgrade base PostgreSQL v8.3.7->8.3.8
+
 * Tue Jun  9 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-1990
 - backport features from v8.4devel, it also needs libselinux-2.0.80
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Mar 2009 03:54:13 -0000	1.11
+++ sources	10 Sep 2009 12:27:20 -0000	1.12
@@ -1 +1 @@
-7b7e91a2221e55fe1b167e663217a96d  postgresql-8.3.7.tar.bz2
+aac683d03f765dc58a3a0e5eaa1927bf  postgresql-8.3.8.tar.bz2



From karsten at fedoraproject.org  Thu Sep 10 12:32:22 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 12:32:22 +0000 (UTC)
Subject: rpms/opencv/devel opencv.spec,1.36,1.37
Message-ID: <20090910123222.630FD11C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26173

Modified Files:
	opencv.spec 
Log Message:
- fix build on s390x where we don't have libraw1394 and devel




Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- opencv.spec	30 Jul 2009 13:14:06 -0000	1.36
+++ opencv.spec	10 Sep 2009 12:32:22 -0000	1.37
@@ -3,7 +3,7 @@
 
 Name:           opencv
 Version:        1.1.0
-Release:        0.6.pre1%{?dist}
+Release:        0.7.pre1%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -26,8 +26,10 @@ BuildRequires:  gtk2-devel
 BuildRequires:  unicap-devel
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
+%ifnarch s390 s390x
 BuildRequires:  libraw1394-devel
 BuildRequires:  libdc1394-devel
+%endif
 BuildRequires:  jasper-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -162,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 1.1.0-0.7.pre1
+- fix build on s390x where we don't have libraw1394 and devel
+
 * Fri Jul 30 2009 Ha?kel Gu?mar <karlthered at gmail.com> 1.1.0.0.6.pre1
 - Fix typo I introduced that prevented build on i386/i586
 



From dwalsh at fedoraproject.org  Thu Sep 10 13:23:49 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Sep 2009 13:23:49 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.121,
	1.122 setroubleshoot.spec, 1.161, 1.162 sources, 1.134, 1.135
Message-ID: <20090910132350.1C2B011C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12409

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.26-1
- Fix setroubleshoot error dialog and hash to catch more dups on reportbug



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- .cvsignore	31 Aug 2009 21:27:32 -0000	1.121
+++ .cvsignore	10 Sep 2009 13:23:48 -0000	1.122
@@ -38,3 +38,4 @@ setroubleshoot-2.2.21.tar.gz
 setroubleshoot-2.2.22.tar.gz
 setroubleshoot-2.2.23.tar.gz
 setroubleshoot-2.2.24.tar.gz
+setroubleshoot-2.2.26.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- setroubleshoot.spec	31 Aug 2009 21:27:32 -0000	1.161
+++ setroubleshoot.spec	10 Sep 2009 13:23:48 -0000	1.162
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.24
+Version: 2.2.26
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,12 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.26-1
+- Fix setroubleshoot error dialog and hash to catch more dups on reportbug
+
+* Tue Sep 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.25-1
+- Fix pipe and socket plugins to return tclass as path
+
 * Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.24-1
 - Fix permissive fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- sources	31 Aug 2009 21:27:32 -0000	1.134
+++ sources	10 Sep 2009 13:23:48 -0000	1.135
@@ -1 +1 @@
-bc82288215e2321901aac5da32caa587  setroubleshoot-2.2.24.tar.gz
+973162d70754613baee809da731e2d3c  setroubleshoot-2.2.26.tar.gz



From jwilson at fedoraproject.org  Thu Sep 10 13:23:49 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 10 Sep 2009 13:23:49 +0000 (UTC)
Subject: rpms/lcdproc/devel lcdproc.spec,1.18,1.19
Message-ID: <20090910132350.1690311C00DB@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12420

Modified Files:
	lcdproc.spec 
Log Message:
* Thu Sep 10 2009 Jarod Wilson <jarod at redhat.com> - 0.5.3-4
- Add BR: libftdi-devel to build lis driver (#522270)



Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- lcdproc.spec	25 Jul 2009 05:01:07 -0000	1.18
+++ lcdproc.spec	10 Sep 2009 13:23:48 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
 Name:           lcdproc
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries
@@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT __doc
 
 
 %changelog
+* Thu Sep 10 2009 Jarod Wilson <jarod at redhat.com> - 0.5.3-4
+- Add BR: libftdi-devel to build lis driver (#522270)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Sep 10 13:24:49 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 13:24:49 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.175,1.175.2.1
Message-ID: <20090910132449.35B2B11C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12339

Modified Files:
      Tag: pango-1_25_4-2_fc12_branch
	pango.spec 
Log Message:
- drop s390x autoconf fixes as autoconf now just works as expected
  tagged into a branch as this is just for the rhel6 rebuild where
  we have slightly older packages and cannot update to latest atm.



Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.175
retrieving revision 1.175.2.1
diff -u -p -r1.175 -r1.175.2.1
--- pango.spec	20 Aug 2009 11:31:48 -0000	1.175
+++ pango.spec	10 Sep 2009 13:24:48 -0000	1.175.2.1
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.4
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -95,8 +95,6 @@ esac
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
-# autoconf uses ibm-linux not redhat-linux on s390x
-host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 # Make sure that the host value that is passed to the compile
 # is the same as the host that we're using in the spec file
@@ -190,8 +188,6 @@ esac
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
-# autoconf uses ibm-linux not redhat-linux (s390x)
-host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 case "$host" in
   alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*)
@@ -228,6 +224,9 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2.1
+- drop s390x autoconf fixes as autoconf now just works as expected
+
 * Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2
 - fix autoconf host on s390x
 



From jwilson at fedoraproject.org  Thu Sep 10 13:26:01 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 10 Sep 2009 13:26:01 +0000 (UTC)
Subject: rpms/lcdproc/devel lcdproc.spec,1.19,1.20
Message-ID: <20090910132601.4FE7C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13185

Modified Files:
	lcdproc.spec 
Log Message:
dammit, I hate cvs


Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- lcdproc.spec	10 Sep 2009 13:23:48 -0000	1.19
+++ lcdproc.spec	10 Sep 2009 13:26:01 -0000	1.20
@@ -26,6 +26,7 @@ BuildRequires:  docbook-dtds
 BuildRequires:  xosd-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
+BuildRequires:  libftdi-devel
 
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel



From bpepple at fedoraproject.org  Thu Sep 10 13:28:08 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 10 Sep 2009 13:28:08 +0000 (UTC)
Subject: rpms/telepathy-salut/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 telepathy-salut.spec, 1.29, 1.30
Message-ID: <20090910132808.C37C311C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-salut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13940

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
- Update to 0.3.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	2 Apr 2009 18:37:48 -0000	1.19
+++ .cvsignore	10 Sep 2009 13:28:08 -0000	1.20
@@ -1 +1 @@
-telepathy-salut-0.3.9.tar.gz
+telepathy-salut-0.3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	2 Apr 2009 18:37:48 -0000	1.19
+++ sources	10 Sep 2009 13:28:08 -0000	1.20
@@ -1 +1 @@
-b61b6f8a86b07a10315c4cca9d78b4fa  telepathy-salut-0.3.9.tar.gz
+145580837ba7727f7c97bcfbd1b4a71f  telepathy-salut-0.3.10.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/telepathy-salut.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- telepathy-salut.spec	21 Aug 2009 16:07:16 -0000	1.29
+++ telepathy-salut.spec	10 Sep 2009 13:28:08 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
-Version:        0.3.9
-Release:        3%{?dist}
+Version:        0.3.10
+Release:        1%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -17,7 +17,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	libxslt
 BuildRequires:	libasyncns-devel >= 0.3
-BuildRequires:	telepathy-glib-devel >= 0.7.23
+BuildRequires:	telepathy-glib-devel >= 0.7.26
 BuildRequires:	libsoup-devel
 BuildRequires:	check-devel >= 0.9.4
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
+- Update to 0.3.10.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.9-3
 - rebuilt with new openssl
 



From karsten at fedoraproject.org  Thu Sep 10 13:31:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 13:31:44 +0000 (UTC)
Subject: rpms/libdc1394/devel libdc1394.spec,1.7,1.8
Message-ID: <20090910133144.6ABB811C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libdc1394/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14900

Modified Files:
	libdc1394.spec 
Log Message:
- excludearch s390 s390x where we don't have libraw1394




Index: libdc1394.spec
===================================================================
RCS file: /cvs/extras/rpms/libdc1394/devel/libdc1394.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libdc1394.spec	25 Jul 2009 05:30:07 -0000	1.7
+++ libdc1394.spec	10 Sep 2009 13:31:44 -0000	1.8
@@ -8,12 +8,13 @@
 Summary: 1394-based digital camera control library
 Name: libdc1394
 Version: 2.1.2
-Release: 2%{?svn_snapshot}%{?dist}
+Release: 3%{?svn_snapshot}%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/libdc1394/
 Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+ExcludeArch: s390 s390x
 
 BuildRequires: kernel-headers
 BuildRequires: libraw1394-devel libusb1-devel
@@ -115,6 +116,9 @@ done
 %{_mandir}/man1/dc1394_*.1.gz
 
 %changelog
+* Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 2.1.2-3
+- excludearch s390 s390x where we don't have libraw1394
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tomeu at fedoraproject.org  Thu Sep 10 13:36:28 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Thu, 10 Sep 2009 13:36:28 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore, 1.15, 1.16 gnash.spec, 1.62,
	1.63 sources, 1.15, 1.16
Message-ID: <20090910133628.4DF9211C00DB@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16325

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.8.20090910bzr11506
- update to HEAD



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	10 Sep 2009 09:57:43 -0000	1.15
+++ .cvsignore	10 Sep 2009 13:36:28 -0000	1.16
@@ -1,2 +1,2 @@
-gnash-0.9.0.20090910bzr11505.tar.gz
+gnash-0.9.0.20090910bzr11506.tar.gz
 gnash-splash.swf


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gnash.spec	10 Sep 2009 09:57:43 -0000	1.62
+++ gnash.spec	10 Sep 2009 13:36:28 -0000	1.63
@@ -1,11 +1,11 @@
-%define commitid 11505
+%define commitid 11506
 %define alphatag 20090910bzr%{commitid}
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnash
 Version:        0.9.0
-Release:        0.7.%{alphatag}%{?dist}
+Release:        0.8.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -313,6 +313,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.8.20090910bzr11506
+- update to HEAD
+
 * Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.7.20090910bzr11505
 - update to HEAD
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	10 Sep 2009 09:57:43 -0000	1.15
+++ sources	10 Sep 2009 13:36:28 -0000	1.16
@@ -1,2 +1,2 @@
-e897c7aa152f07e809c560cb54a10857  gnash-0.9.0.20090910bzr11505.tar.gz
+0ea3593402c65fe303f73bade585b241  gnash-0.9.0.20090910bzr11506.tar.gz
 3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf



From wtogami at fedoraproject.org  Thu Sep 10 13:43:04 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 13:43:04 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore,1.47,1.48 sources,1.46,1.47
Message-ID: <20090910134304.AE7D411C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18801

Modified Files:
	.cvsignore sources 
Log Message:
oops



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	10 Sep 2009 02:57:38 -0000	1.47
+++ .cvsignore	10 Sep 2009 13:43:04 -0000	1.48
@@ -1 +1,2 @@
 mcsnapshot.tgz
+Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	10 Sep 2009 02:57:38 -0000	1.46
+++ sources	10 Sep 2009 13:43:04 -0000	1.47
@@ -1 +1,2 @@
 57a321c63b1a97ee43d33a3bddced6d1  mcsnapshot.tgz
+daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz



From wtogami at fedoraproject.org  Thu Sep 10 13:45:10 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 13:45:10 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.48, 1.49 sources, 1.47,
	1.48 spamassassin.spec, 1.119, 1.120
Message-ID: <20090910134510.2BC3A11C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19362

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
mcsnapshot has rules, add separate rules back in the next package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	10 Sep 2009 13:43:04 -0000	1.48
+++ .cvsignore	10 Sep 2009 13:45:09 -0000	1.49
@@ -1,2 +1 @@
 mcsnapshot.tgz
-Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	10 Sep 2009 13:43:04 -0000	1.47
+++ sources	10 Sep 2009 13:45:09 -0000	1.48
@@ -1,2 +1 @@
 57a321c63b1a97ee43d33a3bddced6d1  mcsnapshot.tgz
-daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- spamassassin.spec	10 Sep 2009 02:57:38 -0000	1.119
+++ spamassassin.spec	10 Sep 2009 13:45:09 -0000	1.120
@@ -43,7 +43,7 @@ URL: http://spamassassin.apache.org/
 #Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
 # Temporary tarball before alpha3
 Source0: mcsnapshot.tgz
-Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+#Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -158,9 +158,9 @@ find $RPM_BUILD_ROOT \( -name perllocal.
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 # Default rules from separate tarball
-cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
-tar xfvz %{SOURCE1}
-cd -
+#cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+#tar xfvz %{SOURCE1}
+#cd -
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -226,7 +226,7 @@ fi
 exit 0
 
 %changelog
-* Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.7.mcsnapshot
+* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.8.mcsnapshot
 - numerous bugs fixed
 - this snapshot is used during masscheck underway until
   September 17th in order to determine the base scores for spamassassin-3.3.0.



From wtogami at fedoraproject.org  Thu Sep 10 13:45:40 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 13:45:40 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.120,1.121
Message-ID: <20090910134540.DC9F211C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19618

Modified Files:
	spamassassin.spec 
Log Message:
bump



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- spamassassin.spec	10 Sep 2009 13:45:09 -0000	1.120
+++ spamassassin.spec	10 Sep 2009 13:45:40 -0000	1.121
@@ -36,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename mcsnapshot
-Release: 0.7.%{prename}%{?dist}
+Release: 0.8.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/



From bpepple at fedoraproject.org  Thu Sep 10 13:50:00 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 10 Sep 2009 13:50:00 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.13, 1.14 sources,
	1.13, 1.14 telepathy-mission-control.spec, 1.21, 1.22
Message-ID: <20090910135000.9B71411C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20876

Modified Files:
	.cvsignore sources telepathy-mission-control.spec 
Log Message:
* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.3-1
- Update to 5.2.3.
- Drop mission-control directory since it's no longer needed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Aug 2009 14:51:31 -0000	1.13
+++ .cvsignore	10 Sep 2009 13:50:00 -0000	1.14
@@ -1 +1 @@
-telepathy-mission-control-5.2.1.tar.gz
+telepathy-mission-control-5.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Aug 2009 14:51:31 -0000	1.13
+++ sources	10 Sep 2009 13:50:00 -0000	1.14
@@ -1 +1 @@
-a27780ecced46c87132fb96d6d604355  telepathy-mission-control-5.2.1.tar.gz
+ce241d3d28d9381afd4c0ffd03bd7093  telepathy-mission-control-5.2.3.tar.gz


Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- telepathy-mission-control.spec	29 Aug 2009 00:38:23 -0000	1.21
+++ telepathy-mission-control.spec	10 Sep 2009 13:50:00 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           telepathy-mission-control
-Version:        5.2.1
-Release:        2%{?dist}
+Version:        5.2.3
+Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
 Group:          System Environment/Libraries
@@ -49,9 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-#need to own this dir
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mission-control/profiles
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -65,8 +62,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_bindir}/*
-%dir %{_datadir}/mission-control
-%dir %{_datadir}/mission-control/profiles
 %{_datadir}/dbus-1/services/*.service
 %{_libdir}/*.so
 %{_libexecdir}/mission-control-5
@@ -81,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.3-1
+- Update to 5.2.3.
+- Drop mission-control directory since it's no longer needed.
+
 * Fri Aug 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.1-2
 - Let's not pull have the main package depend on the devel sub.
 



From rdieter at fedoraproject.org  Thu Sep 10 13:56:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Sep 2009 13:56:08 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.1-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.144, 1.145 kdegames-4.3.0-trademarks.patch,
	1.1, NONE
Message-ID: <20090910135608.CF2AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22576

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.1-trademarks.patch 
Removed Files:
	kdegames-4.3.0-trademarks.patch 
Log Message:
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- adjust trademarks patch to include ktron.desktop


kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   12 ++++----
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 76 insertions(+), 71 deletions(-)

--- NEW FILE kdegames-4.3.1-trademarks.patch ---
diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kbattleship;">
+  <!ENTITY kappname "<application>KSinkShips</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,16 +57,17 @@
 
 <abstract>
 <para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for &kde;.</para>
+&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
 <keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</keyword>
 </keywordset>
 
 </bookinfo>
@@ -76,7 +77,7 @@
 <note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.-->
 <note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It can be: One, Two,..., Multiplayer-->
 <para>
-&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
+&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
 ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
 </para>
 </chapter>
@@ -85,14 +86,14 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -61,7 +61,7 @@
 
 <abstract>
 <para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -69,11 +69,12 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
 Name[be]=???????????? ??????
 Name[bn]=??????-??????????????????????????????
 Name[cs]=Lod??
@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
 Name[ro]=B??t??lie naval??
 Name[sr]=?????????????????????????
 Name[sr at latin]=K???podmornice
-Name[sv]=Kbattleship
 Name[ta]=??????????????????????????????????????????
 Name[tg]=K?????????? ??????????????
 Name[uk]=???????????????? ??????
-Name[x-test]=xxKBattleshipxx
-Name[zh_TW]=KBattleship ??????
+Name[x-test]=xxKSinkShipsxx
+Name[zh_TW]=KSinkShips ??????
 Exec=kbattleship -caption "%c"
 Icon=kbattleship
 Type=Application
 X-DocPath=kbattleship/index.html
-GenericName=Battleship Game
+GenericName=Ship Sinking Game
 GenericName[be]=???????????? ?? ???????????? ??????
 GenericName[bn]=?????????????????????????????? ????????????
 GenericName[ca]=Joc d'enfonsar la flota
@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
 GenericName[cy]=G??m Longau Rhyfel
 GenericName[da]=S??nke slagskibe-spil
 GenericName[de]=Schiffe versenken
-GenericName[el]=???????????????? Battleship
 GenericName[eo]=Batal??ipa ludo
 GenericName[es]=Juego de la batalla de naves
 GenericName[et]=Laevade pommitamise m??ng
@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
 GenericName[fa]=???????? ?????? ???????????????
 GenericName[fi]=Meritaistelupeli
 GenericName[fr]=Jeu de bataille navale
-GenericName[ga]=Cluiche cos??il le "Battleship"
 GenericName[gl]=Xogo de batalla naval
 GenericName[he]=???????? ????????????
 GenericName[hne]=????????????????????? ?????????
@@ -74,7 +70,7 @@ GenericName[ta]=????????????????????????
 GenericName[tr]=Amiral Batt?? Oyunu
 GenericName[uk]=?????? ?? ???????????????? ??????
 GenericName[wa]=Djeu di batreye di bateas
-GenericName[x-test]=xxBattleship Gamexx
+GenericName[x-test]=xxShip Sinking Gamexx
 GenericName[zh_CN]=??????????????????
 GenericName[zh_TW]=????????????
 Terminal=false
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
@@ -5,34 +5,34 @@ input=none
 output=none
 
 Icon=kbattleship
-Description=A protocol for the game KBattleship
-Description[ca]=Un protocol pel joc KBattleship
-Description[da]=En protokol for spillet KBattleship
-Description[de]=Ein Protokoll f??r das KBattleship-Spiel.
-Description[el]=?????? ???????????????????? ?????? ???? ???????????????? KBattleship
-Description[es]=Un protocolo para el juego KBattleship
-Description[et]=KBattleshipi protokoll
-Description[eu]=KBattleship jokoaren protokoloa
-Description[fr]=Un protocole pour le jeu KBattleship
-Description[ga]=Pr??tacal le haghaidh an chluiche KBattleship
-Description[gl]=Un protocolo para o xogo KBattleship
-Description[it]=Un protocollo per KBattleship
-Description[km]=??????????????????????????????????????????????????????????????? KBattleship
-Description[lv]=Protokols sp??lei KBattleship
-Description[nds]=En Protokoll f??r dat Speel "KBattleship"
-Description[nl]=Een protocol voor het spel KBattleship
-Description[nn]=Protokoll for KBattleship
-Description[pt]=Um protocolo para o jogo KBattleship
-Description[pt_BR]=Um protocolo para o jogo KBattleship
-Description[ru]=???????????????? ?????? ???????? KBattleship
-Description[sl]=Protokol za igro KBattleship
+Description=A protocol for the game KSinkShips
+Description[ca]=Un protocol pel joc KSinkShips
+Description[da]=En protokol for spillet KSinkShips
+Description[de]=Ein Protokoll f??r das KSinkShips-Spiel.
+Description[el]=?????? ???????????????????? ?????? ???? ???????????????? KSinkShips
+Description[es]=Un protocolo para el juego KSinkShips
+Description[et]=KSinkShipsi protokoll
+Description[eu]=KSinkShips jokoaren protokoloa
+Description[fr]=Un protocole pour le jeu KSinkShips
+Description[ga]=Pr??tacal le haghaidh an chluiche KSinkShips
+Description[gl]=Un protocolo para o xogo KSinkShips
+Description[it]=Un protocollo per KSinkShips
+Description[km]=??????????????????????????????????????????????????????????????? KSinkShips
+Description[lv]=Protokols sp??lei KSinkShips
+Description[nds]=En Protokoll f??r dat Speel "KSinkShips"
+Description[nl]=Een protocol voor het spel KSinkShips
+Description[nn]=Protokoll for KSinkShips
+Description[pt]=Um protocolo para o jogo KSinkShips
+Description[pt_BR]=Um protocolo para o jogo KSinkShips
+Description[ru]=???????????????? ?????? ???????? KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=???????????????? ???? ?????????????????????????
 Description[sr at latin]=Protokol za K???podmornice
 Description[sv]=Ett protokoll f??r spelet S??nka fartyg
-Description[uk]=???????????????? ?????? ?????? KBattleship
-Description[x-test]=xxA protocol for the game KBattleshipxx
-Description[zh_CN]=KBattleship ??????????????????
-Description[zh_TW]=KBattleship ?????????????????????
+Description[uk]=???????????????? ?????? ?????? KSinkShips
+Description[x-test]=xxA protocol for the game KSinkShipsxx
+Description[zh_CN]=KSinkShips ??????????????????
+Description[zh_TW]=KSinkShips ?????????????????????
 #exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
         ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
               "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     KGlobal::locale()->insertCatalog("libkdegames");
diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
--- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
@@ -3,7 +3,7 @@ Type=Application
 Exec=ktron -caption "%c" %i
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
+GenericName=Snake Duel Game
 GenericName[ca]=Joc similar al Tron
 GenericName[cs]=Hra typu Tron
 GenericName[da]=Tron-lignende spil
@@ -29,20 +29,20 @@ GenericName[sr]=???????? ?????????? ????
 GenericName[sr at latin]=Igra nalik na tron
 GenericName[sv]=Tron-liknande spel
 GenericName[uk]=??????, ?????????? ???? Tron
-GenericName[x-test]=xxTron-like Gamexx
+GenericName[x-test]=xxSnake Duel Gamexx
 GenericName[zh_CN]=?????? Tron ?????????
 GenericName[zh_TW]=?????? Tron ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
 Name[bn]=??????-????????????
 Name[ru]=????????
 Name[sr]=?????????????
 Name[sr at latin]=K???tron
-Name[sv]=Ktron
+Name[sv]=KsnakeDuel
 Name[ta]=K??????????????????
 Name[tg]=K????????
-Name[x-test]=xxKTronxx
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
--- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- kdegames.spec	2 Sep 2009 16:01:00 -0000	1.144
+++ kdegames.spec	10 Sep 2009 13:56:08 -0000	1.145
@@ -1,15 +1,15 @@
-%define _default_patch_fuzz 2
+
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
-Patch0:  kdegames-4.3.0-trademarks.patch
+Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,8 +98,8 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -208,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- adjust trademarks patch to include ktron.desktop
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


--- kdegames-4.3.0-trademarks.patch DELETED ---



From rstrode at fedoraproject.org  Thu Sep 10 13:58:09 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 10 Sep 2009 13:58:09 +0000 (UTC)
Subject: rpms/plymouth/devel
	0001-populate-initrd-Try-to-find-inst-more-aggressively.patch,
	1.1, 1.2 plymouth.spec, 1.141, 1.142
Message-ID: <20090910135809.A29DD11C00DB@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23124

Modified Files:
	0001-populate-initrd-Try-to-find-inst-more-aggressively.patch 
	plymouth.spec 
Log Message:
- Fix set_verbose error reported by yaneti.


0001-populate-initrd-Try-to-find-inst-more-aggressively.patch:
 b/scripts/plymouth-populate-initrd.in |   24 ++++++++++++++++++------
 scripts/plymouth-populate-initrd.in   |    5 ++++-
 2 files changed, 22 insertions(+), 7 deletions(-)

Index: 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/0001-populate-initrd-Try-to-find-inst-more-aggressively.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch	9 Sep 2009 16:51:16 -0000	1.1
+++ 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch	10 Sep 2009 13:58:09 -0000	1.2
@@ -60,3 +60,31 @@ index 3857197..dd502b9 100755
 -- 
 1.6.4.2
 
+From 3c2e1453d9652bbe6a29d89edd80664b87ab7271 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 10 Sep 2009 09:54:44 -0400
+Subject: [PATCH] [populate-initrd] Don't require set_verbose function
+
+If it's not around, define it, so we can use it without error
+---
+ scripts/plymouth-populate-initrd.in |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
+index dd502b9..dcf2b42 100755
+--- a/scripts/plymouth-populate-initrd.in
++++ b/scripts/plymouth-populate-initrd.in
+@@ -28,6 +28,10 @@ if [ " $(type -t inst) " != " function " ]; then
+     exit 1
+ fi
+ 
++if [ " $(type -t set_verbose) " != " function " ]; then
++    function set_verbose { true; }
++fi
++
+ function usage() {
+     local output="/dev/stdout"
+     local rc=0
+-- 
+1.6.4.2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- plymouth.spec	9 Sep 2009 15:37:24 -0000	1.141
+++ plymouth.spec	10 Sep 2009 13:58:09 -0000	1.142
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -450,6 +450,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Sep 10 2009 Ray Strode <rstrode at redhat.com> 0.7.1-5
+- Fix set_verbose error reported by yaneti.
+
 * Wed Sep  9 2009 Ray Strode <rstrode at redhat.com> 0.7.1-4
 - Look for inst() in dracut as well as mkinitrd bash source file
 - Drop plymouth initrd for now.



From myoung at fedoraproject.org  Thu Sep 10 14:00:35 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 10 Sep 2009 14:00:35 +0000 (UTC)
Subject: rpms/kernel/devel/scripts combine.sh,NONE,1.1.2.2
Message-ID: <20090910140035.3CA6011C02C8@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23154/scripts

Added Files:
      Tag: private-myoung-dom0-branch
	combine.sh 
Log Message:
Update pvops and get to 2.6.31



--- NEW FILE combine.sh ---
#! /bin/sh

# combine a set of quilt patches

# $1 : base dir (source tree)
# $2 : quilt dir (patches to apply)
# $3 : pre-patch to apply first (optional)

# e.g.:
# combine.sh /home/user/fedora/trunk/kernel/F-11/kernel-2.6.30/vanilla-2.6.30 \
#            /home/user/git/stable-queue/queue-2.6.30 \
#            /home/user/fedora/trunk/kernel/F-11/patch-2.6.30.5.bz2

if [ $# -lt 2 ] ; then
  exit 1
fi

TD="combine_temp.d"

cd $1 || exit 1
cd ..
[ -d $TD ] && rm -Rf $TD
mkdir $TD || exit 1
cd $TD

cp -al ../$(basename $1) work.d
cd work.d
[ "$3" ] && bzcat $3 | patch -p1 -s
ln -s $2 patches
[ -h patches ] || exit 1
quilt snapshot
quilt upgrade
quilt push -a -q
quilt diff --snapshot >../combined.patch



From myoung at fedoraproject.org  Thu Sep 10 14:00:54 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 10 Sep 2009 14:00:54 +0000 (UTC)
Subject: rpms/kernel/devel drm-connection-cache.patch, NONE,
	1.2.2.2 linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch,
	NONE, 1.1.2.2 linux-2.6.31.tar.bz2.sign, NONE,
	1.1.2.2 .cvsignore, 1.1014.2.29, 1.1014.2.30 config-generic,
	1.238.6.38, 1.238.6.39 config-s390x, 1.11.6.4,
	1.11.6.5 drm-next.patch, 1.6.6.9, 1.6.6.10 drm-nouveau.patch,
	1.8.6.16, 1.8.6.17 drm-page-flip.patch, 1.2.6.4,
	1.2.6.5 drm-vga-arb.patch, 1.5.2.3, 1.5.2.4 kernel.spec,
	1.1294.2.64, 1.1294.2.65 linux-2.6-nfsd4-proots.patch, 1.1.2.2,
	1.1.2.3 sources, 1.976.2.30, 1.976.2.31 upstream, 1.888.2.29,
	1.888.2.30 xen.pvops.patch, 1.1.2.40,
	1.1.2.41 drm-ddc-caching-bug.patch, 1.1.2.2,
	NONE drm-god-shut-up-about-edid-already.patch, 1.1.2.2,
	NONE drm-r600-kms.patch, 1.1.2.4, NONE drm-rv710-ucode-fix.patch,
	1.1.2.2, NONE linux-2.6.30.tar.bz2.sign, 1.1.2.2,
	NONE patch-2.6.31-rc8-git2.bz2.sign, 1.1.2.2,
	NONE patch-2.6.31-rc8.bz2.sign, 1.1.2.2, NONE
Message-ID: <20090910140054.77CB211C02C8@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23154

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic config-s390x drm-next.patch 
	drm-nouveau.patch drm-page-flip.patch drm-vga-arb.patch 
	kernel.spec linux-2.6-nfsd4-proots.patch sources upstream 
	xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-connection-cache.patch 
	linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch 
	linux-2.6.31.tar.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	drm-ddc-caching-bug.patch 
	drm-god-shut-up-about-edid-already.patch drm-r600-kms.patch 
	drm-rv710-ucode-fix.patch linux-2.6.30.tar.bz2.sign 
	patch-2.6.31-rc8-git2.bz2.sign patch-2.6.31-rc8.bz2.sign 
Log Message:
Update pvops and get to 2.6.31


drm-connection-cache.patch:
 linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c |   12 ++++++++++++
 linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c |    9 ++++++++-
 linux-2.6.30.noarch/include/drm/drm_crtc.h            |    1 +
 linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c        |    3 ++-
 4 files changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE drm-connection-cache.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx	2009-09-09 08:57:39.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-09 09:35:24.000000000 -0400
@@ -92,6 +92,18 @@ int drm_helper_probe_single_connector_mo
 
 	connector->status = connector->funcs->detect(connector);
 
+	/* fast path if the driver tracks disconnection */
+	if (connector->status == connector_status_cached) {
+		DRM_DEBUG_KMS("%s still connected\n",
+			      drm_get_connector_name(connector));
+		list_for_each_entry_safe(mode, t, &connector->modes, head) {
+			count++;
+			mode->status = MODE_OK;
+		}
+		connector->status = connector_status_connected;
+		return count;
+	}
+
 	if (connector->status == connector_status_disconnected) {
 		DRM_DEBUG_KMS("%s is disconnected\n",
 			  drm_get_connector_name(connector));
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx	2009-09-09 08:57:39.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c	2009-09-09 09:56:18.000000000 -0400
@@ -593,7 +593,14 @@ static void intel_lvds_mode_set(struct d
  */
 static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector)
 {
-	return connector_status_connected;
+	static int done;
+
+	if (!done) {
+		done = 1;
+		return connector_status_connected;
+	} else {
+		return connector_status_cached;
+	}
 }
 
 /**
diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.jx linux-2.6.30.noarch/include/drm/drm_crtc.h
--- linux-2.6.30.noarch/include/drm/drm_crtc.h.jx	2009-09-09 08:57:39.000000000 -0400
+++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-09-09 09:35:24.000000000 -0400
@@ -172,6 +172,7 @@ enum drm_connector_status {
 	connector_status_connected = 1,
 	connector_status_disconnected = 2,
 	connector_status_unknown = 3,
+	connector_status_cached = 4,
 };
 
 enum subpixel_order {
diff -up linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c.jx linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c
--- linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c.jx	2009-09-09 10:10:44.000000000 -0400
+++ linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c	2009-09-09 11:23:14.000000000 -0400
@@ -185,7 +185,8 @@ EXPORT_SYMBOL(drm_get_connector_name);
 
 char *drm_get_connector_status_name(enum drm_connector_status status)
 {
-	if (status == connector_status_connected)
+	if (status == connector_status_connected ||
+	    status == connector_status_cached)
 		return "connected";
 	else if (status == connector_status_disconnected)
 		return "disconnected";

linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch:
 virtio_blk.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch ---
Subject: [for-2.6.31] virtio_blk: revert QUEUE_FLAG_VIRT addition
Date: Fri, 04 Sep 2009 20:44:42 -0000
From: Christoph Hellwig <hch at lst.de>

It seems like the addition of QUEUE_FLAG_VIRT caueses major performance
regressions for Fedora users:

	https://bugzilla.redhat.com/show_bug.cgi?id=509383
	https://bugzilla.redhat.com/show_bug.cgi?id=505695

while I can't reproduce those extreme regressions myself I think the flag
is wrong.

Rationale:

  QUEUE_FLAG_VIRT expands to QUEUE_FLAG_NONROT which casus the queue
  unplugged immediately.  This is not a good behaviour for at least
  qemu and kvm where we do have significant overhead for every
  I/O operations.  Even with all the latested speeups (native AIO,
  MSI support, zero copy) we can only get native speed for up to 128kb
  I/O requests we already are down to 66% of native performance for 4kb
  requests even on my laptop running the Intel X25-M SSD for which the
  QUEUE_FLAG_NONROT was designed.
  If we ever get virtio-blk overhead low enough that this flag makes
  sense it should only be set based on a feature flag set by the host.
	
Signed-off-by: Christoph Hellwig <hch at lst.de>
Acked-by: Jeff Moyer <jmoyer at redhat.com>

---
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Index: linux-2.6/drivers/block/virtio_blk.c
===================================================================
--- linux-2.6.orig/drivers/block/virtio_blk.c	2009-09-04 17:33:48.802523987 -0300
+++ linux-2.6/drivers/block/virtio_blk.c	2009-09-04 17:33:56.186522158 -0300
@@ -314,7 +314,6 @@ static int __devinit virtblk_probe(struc
 	}
 
 	vblk->disk->queue->queuedata = vblk;
-	queue_flag_set_unlocked(QUEUE_FLAG_VIRT, vblk->disk->queue);
 
 	if (index < 26) {
 		sprintf(vblk->disk->disk_name, "vd%c", 'a' + index % 26);


--- NEW FILE linux-2.6.31.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKqC7vyGugalF9Dw4RAldvAJwMreaHtICM+aRVeTOvxGkRdNNndACbBWCz
bLUy6e5yBTf6QYYnvkzVr5M=
=/QSU
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.29
retrieving revision 1.1014.2.30
diff -u -p -r1.1014.2.29 -r1.1014.2.30
--- .cvsignore	3 Sep 2009 20:02:36 -0000	1.1014.2.29
+++ .cvsignore	10 Sep 2009 14:00:22 -0000	1.1014.2.30
@@ -3,7 +3,5 @@ clog
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.30
-linux-2.6.30.tar.bz2
-patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git2.bz2
+kernel-2.6.31
+linux-2.6.31.tar.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.38
retrieving revision 1.238.6.39
diff -u -p -r1.238.6.38 -r1.238.6.39
--- config-generic	5 Sep 2009 19:02:23 -0000	1.238.6.38
+++ config-generic	10 Sep 2009 14:00:23 -0000	1.238.6.39
@@ -2691,8 +2691,9 @@ CONFIG_SND_USB_US122L=m
 #
 # PCMCIA devices
 #
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_VXPOCKET is not set
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
 
 #
 # Open Sound System
@@ -3668,7 +3669,6 @@ CONFIG_SND_SBAWE=m
 CONFIG_SND_OPL3SA2=m
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_PDAUDIOCF is not set
 CONFIG_SND_DARLA20=m
 CONFIG_SND_GINA20=m
 CONFIG_SND_LAYLA20=m


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.11.6.4
retrieving revision 1.11.6.5
diff -u -p -r1.11.6.4 -r1.11.6.5
--- config-s390x	5 Aug 2009 23:00:09 -0000	1.11.6.4
+++ config-s390x	10 Sep 2009 14:00:23 -0000	1.11.6.5
@@ -1,7 +1,9 @@
 CONFIG_64BIT=y
 # CONFIG_MARCH_G5 is not set
-CONFIG_MARCH_Z900=y
+# CONFIG_MARCH_Z900 is not set
+CONFIG_MARCH_Z9_109=y
 # CONFIG_MARCH_Z990 is not set
+
 CONFIG_NR_CPUS=64
 CONFIG_COMPAT=y
 

drm-next.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   77 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  220 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  504 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  701 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  435 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  737 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  100 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1047 
 b/drivers/gpu/drm/radeon/r100_track.h             |  124 
 b/drivers/gpu/drm/radeon/r100d.h                  |   76 
 b/drivers/gpu/drm/radeon/r200.c                   |  456 
 b/drivers/gpu/drm/radeon/r300.c                   |  411 
 b/drivers/gpu/drm/radeon/r300d.h                  |   76 
 b/drivers/gpu/drm/radeon/r600.c                   | 1714 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  855 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  777 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  658 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  126 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  159 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |   79 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  215 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  128 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  340 
 b/drivers/gpu/drm/radeon/radeon_display.c         |   18 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   21 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  146 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  125 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  670 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   44 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  339 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   52 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  119 
 b/drivers/gpu/drm/radeon/radeon_share.h           |   77 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   18 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |    2 
 b/drivers/gpu/drm/radeon/rs600.c                  |   60 
 b/drivers/gpu/drm/radeon/rs690.c                  |    1 
 b/drivers/gpu/drm/radeon/rv515.c                  |  518 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  |  987 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   16 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |   82 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 154 files changed, 33674 insertions(+), 41500 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.6.6.9 -r 1.6.6.10 drm-next.patchIndex: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.6.6.9
retrieving revision 1.6.6.10
diff -u -p -r1.6.6.9 -r1.6.6.10
--- drm-next.patch	26 Aug 2009 19:58:46 -0000	1.6.6.9
+++ drm-next.patch	10 Sep 2009 14:00:23 -0000	1.6.6.10
@@ -1,393 +1,154 @@
-commit 50f153036c9d9e4ae1768d5ca9c2ad4184f7a0b7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 21 13:21:01 2009 +1000
-
-    drm/radeon/kms: generate the safe register tables.
-    
-    Previously we just made these offline and included them,
-    but no reason we can't generate them at build time.
-    
-    TODO: add rs690 + r100/r200 when done.
-    should we do rs480/rs690 no tcl version?
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 759e4f83f418f4001e724042b4c0e408d615d9ec
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Thu Aug 20 10:29:09 2009 +0200
-
-    drm/ttm: Fixes for "Memory accounting rework."
-    
-    ttm:
-    Fix error paths when kobject_add returns an error.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Thu Aug 20 10:29:08 2009 +0200
-
-    drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
-    
-    ttm:
-    Remove a stray debug printout.
-    Remove a re-init of the lru spinlock at device init.
-    
-    radeon:
-    Fix the size of the bo_global allocation.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 51c8b4071d84d46cc100baa5931ad06b2a823c95
-Merge: a987fca... 6c30c53...
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 20 13:38:04 2009 +1000
-
-    Merge Linus master to drm-next
-    
-    linux-next conflict reported needed resolution.
-    
-    Conflicts:
-    	drivers/gpu/drm/drm_crtc.c
-    	drivers/gpu/drm/drm_edid.c
-    	drivers/gpu/drm/i915/intel_sdvo.c
-    	drivers/gpu/drm/radeon/radeon_ttm.c
-    	drivers/gpu/drm/ttm/ttm_bo.c
-
-commit a987fcaa805fcb24ba885c2e29fd4fdb6816f08f
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Tue Aug 18 16:51:56 2009 +0200
-
-    ttm: Make parts of a struct ttm_bo_device global.
-    
-    Common resources, like memory accounting and swap lists should be
-    global and not per device. Introduce a struct ttm_bo_global to
-    accomodate this, and register it with sysfs. Add a small sysfs interface
-    to return the number of active buffer objects.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit 5fd9cbad3a4ae82c83c55b9c621d156c326724ef
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Mon Aug 17 16:28:39 2009 +0200
-
-    drm/ttm: Memory accounting rework.
-    
-    Use inclusive zones to simplify accounting and its sysfs representation.
-    Use DMA32 accounting where applicable.
-    
-    Add a sysfs interface to make the heuristically determined limits
-    readable and configurable.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit e9840be8c23601285a70520b4898818f28ce8c2b
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Tue Aug 18 10:27:57 2009 +0200
-
-    drm/ttm: Add a virtual ttm sysfs device.
-    
-    The device directory will be the base directory of the
-    sysfs representation of other ttm subsystems.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit 327c225bd548bf7871f116a0baa5ebdac884e452
-Author: Thomas Hellstrom <thellstrom at vmware.com>
-Date:   Mon Aug 17 16:28:37 2009 +0200
-
-    drm: Enable drm drivers to add drm sysfs devices.
-    
-    Export utility functions for drivers to add specialized devices in the
-    sysfs drm class subdirectory.
-    
-    Initially this will be needed form TTM to add a virtual device that
-    handles power management.
-    
-    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit a0724fcf829e5afb66159ef68cb16a805ea11b42
-Author: Pekka Paalanen <pq at iki.fi>
-Date:   Mon Aug 17 01:18:38 2009 +0300
-
-    drm/ttm: optimize bo_kmap_type values
-    
-    A micro-optimization on the function ttm_kmap_obj_virtual().
-    
-    By defining the values of enum ttm_bo_kmap_obj::bo_kmap_type to have a
-    bit indicating iomem, size of the function ttm_kmap_obj_virtual() will be
-    reduced by 16 bytes on x86_64 (gcc 4.1.2).
-    
-    ttm_kmap_obj_virtual() may be heavily used, when buffer objects are
-    accessed via wrappers, that work for both kinds of memory addresses:
-    iomem cookies and kernel virtual.
-    
-    Signed-off-by: Pekka Paalanen <pq at iki.fi>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 949ef70e2d1a5c12178875f513df34fc85d91a38
-Author: Pekka Paalanen <pq at iki.fi>
-Date:   Mon Aug 17 19:49:19 2009 +0300
-
-    drm/kms: no need to return void value (encoder)
-    
-    Cc: Francisco Jerez <currojerez at riseup.net>
-    Signed-off-by: Pekka Paalanen <pq at iki.fi>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 53bd83899f5ba6b0da8f5ef976129273854a72d4
-Author: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date:   Wed Jul 1 10:04:40 2009 -0700
-
-    drm: clarify scaling property names
-    
-    Now that we're using the scaling property in the Intel driver I noticed
-    that the names were a bit confusing.  I've corrected them according to
-    our discussion on IRC and the mailing list, though I've left out
-    potential new additions for a new scaling property with an integer (or
-    two) for the scaling factor.  None of the drivers implement that today,
-    but if someone wants to do it, I think it could be done with the
-    addition of a single new type and a new property to describe the
-    scaling factor in the X and Y directions.
-    
-    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-    Acked-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 776f3360de6ed246e973577828f725681120fd7a
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Wed Aug 19 15:56:37 2009 +1000
-
-    drm: fixup includes in encoder slave header files.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 453a7d46dca88704ed88b364c445ff55680a8557
-Author: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date:   Wed Aug 19 15:51:55 2009 +1000
-
-    drm: remove root requirement from DRM_IOCTL_SET_VERSION (+ DRM_IOCTL_AUTH_MAGIC)
-    
-    Just a DRM_MASTER flag is sufficient here, though maybe this call is
-    totally deprecated anyway (xf86-video-intel still calls it though).
-    
-    (airlied: drop ioctl auth_magic as discussed on mailing list also)
-    
-    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit cfcf4738cd6b5d7bed1473acad76d6430cf1fb0a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 13 13:31:54 2009 +1000
-
-    drm: fixup include file in drm_encoder_slave
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
[...78321 lines suppressed...]
++ * of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
++ * USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ *
++ **************************************************************************/
++/*
++ * Authors:
++ * Dave Airlie <airlied at redhat.com>
++ */
++
++#ifndef _DRM_CACHE_H_
++#define _DRM_CACHE_H_
++
++void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
++
++#endif
 diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
-index 7300fb8..db92a83 100644
+index 7300fb8..ae1e9e1 100644
 --- a/include/drm/drm_crtc.h
 +++ b/include/drm/drm_crtc.h
-@@ -572,6 +572,12 @@ struct drm_mode_config {
+@@ -259,6 +259,8 @@ struct drm_framebuffer {
+ 	void *fbdev;
+ 	u32 pseudo_palette[17];
+ 	struct list_head filp_head;
++	/* if you are using the helper */
++	void *helper_private;
+ };
+ 
+ struct drm_property_blob {
+@@ -572,6 +574,12 @@ struct drm_mode_config {
  	struct drm_property *tv_right_margin_property;
  	struct drm_property *tv_top_margin_property;
  	struct drm_property *tv_bottom_margin_property;
@@ -5844,7 +80615,7 @@ index 7300fb8..db92a83 100644
  
  	/* Optional properties */
  	struct drm_property *scaling_mode_property;
-@@ -736,4 +742,10 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+@@ -736,4 +744,12 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
@@ -5854,7 +80625,30 @@ index 7300fb8..db92a83 100644
 +extern struct drm_display_mode *drm_gtf_mode(struct drm_device *dev,
 +				int hdisplay, int vdisplay, int vrefresh,
 +				bool interlaced, int margins);
++extern int drm_add_modes_noedid(struct drm_connector *connector,
++				int hdisplay, int vdisplay);
  #endif /* __DRM_CRTC_H__ */
+diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
+index 6769ff6..4c8daca 100644
+--- a/include/drm/drm_crtc_helper.h
++++ b/include/drm/drm_crtc_helper.h
+@@ -79,6 +79,8 @@ struct drm_encoder_helper_funcs {
+ 	/* detect for DAC style encoders */
+ 	enum drm_connector_status (*detect)(struct drm_encoder *encoder,
+ 					    struct drm_connector *connector);
++	/* disable encoder when not in use - more explicit than dpms off */
++	void (*disable)(struct drm_encoder *encoder);
+ };
+ 
+ struct drm_connector_helper_funcs {
+@@ -98,6 +100,7 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+ 				     int x, int y,
+ 				     struct drm_framebuffer *old_fb);
+ extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
++extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
+ 
+ extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode);
+ 
 diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h
 new file mode 100644
 index 0000000..2f65633
@@ -6023,6 +80817,117 @@ index 0000000..2f65633
 +void drm_i2c_encoder_destroy(struct drm_encoder *encoder);
 +
 +#endif
+diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
+new file mode 100644
+index 0000000..88fffbd
+--- /dev/null
++++ b/include/drm/drm_fb_helper.h
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2006-2009 Red Hat Inc.
++ * Copyright (c) 2006-2008 Intel Corporation
++ * Copyright (c) 2007 Dave Airlie <airlied at linux.ie>
++ *
++ * DRM framebuffer helper functions
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that copyright
++ * notice and this permission notice appear in supporting documentation, and
++ * that the name of the copyright holders not be used in advertising or
++ * publicity pertaining to distribution of the software without specific,
++ * written prior permission.  The copyright holders make no representations
++ * about the suitability of this software for any purpose.  It is provided "as
++ * is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++ * OF THIS SOFTWARE.
++ *
++ * Authors:
++ *      Dave Airlie <airlied at linux.ie>
++ *      Jesse Barnes <jesse.barnes at intel.com>
++ */
++#ifndef DRM_FB_HELPER_H
++#define DRM_FB_HELPER_H
++
++struct drm_fb_helper_crtc {
++	uint32_t crtc_id;
++	struct drm_mode_set mode_set;
++};
++
++struct drm_fb_helper_funcs {
++	void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
++			  u16 blue, int regno);
++};
++
++struct drm_fb_helper {
++	struct drm_framebuffer *fb;
++	struct drm_device *dev;
++	struct drm_display_mode *mode;
++	int crtc_count;
++	struct drm_fb_helper_crtc *crtc_info;
++	struct drm_fb_helper_funcs *funcs;
++	int conn_limit;
++	struct list_head kernel_fb_list;
++};
++
++int drm_fb_helper_single_fb_probe(struct drm_device *dev,
++				  int (*fb_create)(struct drm_device *dev,
++						   uint32_t fb_width,
++						   uint32_t fb_height,
++						   uint32_t surface_width,
++						   uint32_t surface_height,
++						   struct drm_framebuffer **fb_ptr));
++int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count,
++				  int max_conn);
++void drm_fb_helper_free(struct drm_fb_helper *helper);
++int drm_fb_helper_blank(int blank, struct fb_info *info);
++int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
++			      struct fb_info *info);
++int drm_fb_helper_set_par(struct fb_info *info);
++int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
++			    struct fb_info *info);
++int drm_fb_helper_setcolreg(unsigned regno,
++			    unsigned red,
++			    unsigned green,
++			    unsigned blue,
++			    unsigned transp,
++			    struct fb_info *info);
++
++void drm_fb_helper_restore(void);
++void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
++			    uint32_t fb_width, uint32_t fb_height);
++void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch);
++
++#endif
+diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
+index f833207..62329f9 100644
+--- a/include/drm/drm_mm.h
++++ b/include/drm/drm_mm.h
+@@ -37,6 +37,9 @@
+  * Generic range manager structs
+  */
+ #include <linux/list.h>
++#ifdef CONFIG_DEBUG_FS
++#include <linux/seq_file.h>
++#endif
+ 
+ struct drm_mm_node {
+ 	struct list_head fl_entry;
+@@ -96,4 +99,8 @@ static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block)
+ 	return block->mm;
+ }
+ 
++#ifdef CONFIG_DEBUG_FS
++int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm);
++#endif
++
+ #endif
 diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
 index ae304cc..1f90841 100644
 --- a/include/drm/drm_mode.h

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  747 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1202 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  829 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  439 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57829 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.16 -r 1.8.6.17 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.16
retrieving revision 1.8.6.17
diff -u -p -r1.8.6.16 -r1.8.6.17
--- drm-nouveau.patch	26 Aug 2009 19:58:47 -0000	1.8.6.16
+++ drm-nouveau.patch	10 Sep 2009 14:00:26 -0000	1.8.6.17
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..49b21cc 100644
+index e4d971c..7fe8a4c 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -143,3 +143,47 @@ config DRM_SAVAGE
+@@ -153,3 +153,48 @@ config DRM_SAVAGE
  	help
  	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
  	  chipset. If M is selected the module will be called savage.
@@ -10,6 +10,7 @@ index 39b393d..49b21cc 100644
 +config DRM_NOUVEAU
 +	tristate "Nouveau (nVidia) cards"
 +	depends on DRM
++	select DRM_KMS_HELPER
 +	select DRM_TTM
 +	select FB_CFB_FILLRECT
 +	select FB_CFB_COPYAREA
@@ -51,10 +52,10 @@ index 39b393d..49b21cc 100644
 +
 +endmenu
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 5f0aec4..f0ef455 100644
+index 3c8827a..d22e64b 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -27,3 +27,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -31,3 +31,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
  obj-$(CONFIG_DRM_SIS)   += sis/
  obj-$(CONFIG_DRM_SAVAGE)+= savage/
  obj-$(CONFIG_DRM_VIA)	+=via/
@@ -130,10 +131,10 @@ index 0000000..6d2abaf
 +obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
 new file mode 100644
-index 0000000..47421ba
+index 0000000..0a3f7a0
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,529 @@
+@@ -0,0 +1,532 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -600,13 +601,11 @@ index 0000000..47421ba
 +				   ch7006_tv_norm);
 +	}
 +
-+	if (ch7006_scale) {
-+		if (ch7006_scale >= 0 && ch7006_scale <= 2)
-+			priv->scale = ch7006_scale;
-+		else
-+			ch7006_err(client, "Invalid scale setting \"%d\".\n",
-+				   ch7006_scale);
-+	}
++	if (ch7006_scale >= 0 && ch7006_scale <= 2)
++		priv->scale = ch7006_scale;
++	else
++		ch7006_err(client, "Invalid scale setting \"%d\".\n",
++			   ch7006_scale);
 +
 +	return 0;
 +}
@@ -651,11 +650,16 @@ index 0000000..47421ba
 +
 +char *ch7006_tv_norm = NULL;
 +module_param_named(tv_norm, ch7006_tv_norm, charp, 0600);
-+MODULE_PARM_DESC(tv_norm, "Default TV norm.");
++MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
++		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, PAL-60, NTSC-M, NTSC-J.\n"
++		 "\t\tDefault: PAL");
 +
-+int ch7006_scale = 0;
++int ch7006_scale = 1;
 +module_param_named(scale, ch7006_scale, int, 0600);
-+MODULE_PARM_DESC(scale, "Default scale.");
++MODULE_PARM_DESC(scale, "Default scale.\n"
++		 "\t\tSupported: 0 -> Select video modes with a higher blanking ratio.\n"
++		 "\t\t\t1 -> Select default video modes.\n"
++		 "\t\t\t2 -> Select video modes with a lower blanking ratio.");
 +
 +MODULE_AUTHOR("Francisco Jerez <currojerez at riseup.net>");
 +MODULE_DESCRIPTION("Chrontel ch7006 TV encoder driver");
@@ -1684,10 +1688,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..1500eed
+index 0000000..b37ad94
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5190 @@
+@@ -0,0 +1,5209 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -5001,7 +5005,7 @@ index 0000000..1500eed
 +
 +int
 +nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent,
-+			       int pxclk)
++			       uint32_t sub, int pxclk)
 +{
 +	/* The display script table is located by the BIT 'U' table.
 +	 *
@@ -5031,7 +5035,7 @@ index 0000000..1500eed
 +	uint8_t *table = &bios->data[bios->display.script_table_ptr];
 +	uint8_t *entry, *otable = NULL;
 +	uint16_t script;
-+	int i, sub;
++	int i;
 +
 +	if (!bios->display.script_table_ptr) {
 +		NV_ERROR(dev, "No pointer to output script table\n");
@@ -5102,39 +5106,19 @@ index 0000000..1500eed
 +		return 1;
 +	}
 +
-+	/* Anyone have an idea to know which to use for certain? */
-+	switch (dcbent->type) {
-+	case OUTPUT_LVDS:
-+		if (nouveau_uscript_lvds >= 0)
-+			sub = nouveau_uscript_lvds;
-+		else {
-+			/* 0x0000 0x0100 0x0200 0x0300 */
-+			if (pxclk > bios->fp.duallink_transition_clk)
-+				sub = 0x0100;
-+			else
-+				sub = 0x0000;
++	if (pxclk < -2 || pxclk > 0) {
++		/* Try to find matching script table entry */
++		for (i = 0; i < otable[5]; i++) {
++			if (ROM16(otable[table[4] + i*6]) == sub)
++				break;
 +		}
-+		break;
-+	case OUTPUT_TMDS:
-+		if (nouveau_uscript_tmds >= 0)
-+			sub = nouveau_uscript_tmds;
-+		else
-+			sub = 0x0001; /* 0x0001 0x0002 0x0105 */
-+		break;
-+	default:
-+		sub = 0x00ff; /* 0x00ff */
-+		break;
-+	}
 +
-+	for (i = 0; i < otable[5]; i++) {
-+		if (ROM16(otable[table[4] + i*6]) == sub)
-+			break;
-+	}
-+
-+	if (i == otable[5]) {
-+		NV_ERROR(dev, "Table 0x%04x not found for %d/%d, using first\n",
-+			 sub, dcbent->type, dcbent->or);
-+		i = 0;
++		if (i == otable[5]) {
++			NV_ERROR(dev, "Table 0x%04x not found for %d/%d, "
++				      "using first\n",
++				 sub, dcbent->type, dcbent->or);
++			i = 0;
++		}
 +	}
 +
 +	bios->display.head = ffs(dcbent->or) - 1;
@@ -6263,10 +6247,8 @@ index 0000000..1500eed
 +	entry->type = conn & 0xf;
 +	entry->i2c_index = (conn >> 4) & 0xf;
 +	entry->heads = (conn >> 8) & 0xf;
-+	if (bdcb->version >= 0x30)
++	if (bdcb->version >= 0x40)
 +		entry->connector = (conn >> 12) & 0xf;
-+	else
-+		entry->connector = entry->i2c_index; /* sorta */
 +	entry->bus = (conn >> 16) & 0xf;
 +	entry->location = (conn >> 20) & 0x3;
 +	entry->or = (conn >> 24) & 0xf;
@@ -6613,7 +6595,45 @@ index 0000000..1500eed
 +	return (dcb->entries ? 0 : -ENXIO);
 +}
 +
-+static void fixup_legacy_i2c(struct nvbios *bios)
++static void
++fixup_legacy_connector(struct nvbios *bios)
++{
++	struct bios_parsed_dcb *bdcb = &bios->bdcb;
++	struct parsed_dcb *dcb = &bdcb->dcb;
++	int high = 0, i;
++
++	/* DCB 3.0 also has the table in most cases, but there are some cards
++	 * where the table is filled with stub entries, and the DCB entriy
[...2860 lines suppressed...]
++		if (pxclk >= 165000)
++			script |= 0x0100;
++
++		if (nouveau_uscript_tmds >= 0) {
++			NV_INFO(dev, "override script 0x%04x with 0x%04x"
++				     "for output TMDS-%d\n", script,
++				     nouveau_uscript_tmds, or);
++			script = nouveau_uscript_tmds;
++		}
++		break;
++	case OUTPUT_ANALOG:
++		script = 0xff;
++		break;
++	default:
++		NV_ERROR(dev, "modeset on unsupported output type!\n");
++		break;
++	}
++
++	return script;
++}
++
 +static void
 +nv50_display_vblank_crtc_handler(struct drm_device *dev, int crtc)
 +{
@@ -33162,7 +32889,7 @@ index 0000000..7ddb760
 +
 +	nv_wr32(dev, 0x619494, nv_rd32(dev, 0x619494) & ~8);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, -1);
++	nouveau_bios_run_display_table(dev, dcbent, 0, -1);
 +
 +ack:
 +	nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK10);
@@ -33172,10 +32899,8 @@ index 0000000..7ddb760
 +static void
 +nv50_display_unk20_handler(struct drm_device *dev)
 +{
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+	struct nvbios *bios = &dev_priv->VBIOS;
 +	struct dcb_entry *dcbent;
-+	uint32_t tmp, pclk;
++	uint32_t tmp, pclk, script;
 +	int head, or, ret;
 +
 +	ret = nv50_display_irq_head(dev, &head, &dcbent);
@@ -33183,30 +32908,24 @@ index 0000000..7ddb760
 +		goto ack;
 +	or = ffs(dcbent->or) - 1;
 +	pclk = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(head, CLOCK)) & 0x3fffff;
++	script = nv50_display_script_select(dev, dcbent, pclk);
 +
 +	NV_DEBUG(dev, "head %d pxclk: %dKHz\n", head, pclk);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, -2);
++	nouveau_bios_run_display_table(dev, dcbent, 0, -2);
 +
 +	nv50_crtc_set_clock(dev, head, pclk);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, pclk);
++	nouveau_bios_run_display_table(dev, dcbent, script, pclk);
 +
 +	tmp = nv_rd32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(head));
 +	tmp &= ~0x000000f;
 +	nv_wr32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(head), tmp);
 +
 +	if (dcbent->type != OUTPUT_ANALOG) {
-+		int tclk;
-+
-+		if (dcbent->type == OUTPUT_LVDS)
-+			tclk = bios->fp.duallink_transition_clk;
-+		else
-+			tclk = 165000;
-+
 +		tmp = nv_rd32(dev, NV50_PDISPLAY_SOR_CLK_CTRL2(or));
 +		tmp &= ~0x00000f0f;
-+		if (pclk > tclk)
++		if (script & 0x0100)
 +			tmp |= 0x00000101;
 +		nv_wr32(dev, NV50_PDISPLAY_SOR_CLK_CTRL2(or), tmp);
 +	} else {
@@ -33222,14 +32941,15 @@ index 0000000..7ddb760
 +nv50_display_unk40_handler(struct drm_device *dev)
 +{
 +	struct dcb_entry *dcbent;
-+	int head, pclk, ret;
++	int head, pclk, script, ret;
 +
 +	ret = nv50_display_irq_head(dev, &head, &dcbent);
 +	if (ret)
 +		goto ack;
 +	pclk = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(head, CLOCK)) & 0x3fffff;
++	script = nv50_display_script_select(dev, dcbent, pclk);
 +
-+	nouveau_bios_run_display_table(dev, dcbent, -pclk);
++	nouveau_bios_run_display_table(dev, dcbent, script, -pclk);
 +
 +ack:
 +	nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK40);
@@ -34246,10 +33966,10 @@ index 0000000..3d12e12
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..72db3cf
+index 0000000..108f672
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,437 @@
+@@ -0,0 +1,439 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34434,8 +34154,10 @@ index 0000000..72db3cf
 +	struct nouveau_gpuobj *ramin = chan->ramin->gpuobj;
 +	struct nouveau_gpuobj *ctx;
 +	uint32_t *ctxvals = NULL;
-+	int grctx_size = 0x70000, hdr;
-+	int ret, pos;
++	uint32_t grctx_size = 0x70000;
++	int hdr;
++	int ret;
++	int pos;
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
@@ -57530,10 +57252,10 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..9ae8ec3
+index 0000000..45b0ff7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,253 @@
+@@ -0,0 +1,250 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -57592,17 +57314,11 @@ index 0000000..9ae8ec3
 +static void nv50_sor_dpms(struct drm_encoder *drm_encoder, int mode)
 +{
 +	struct drm_device *dev = drm_encoder->dev;
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_encoder *encoder = nouveau_encoder(drm_encoder);
 +	uint32_t val;
 +	int or = encoder->or;
 +
-+	NV_DEBUG(dev, "or %d\n", encoder->or);
-+
-+	if (dev_priv->in_modeset) {
-+		nv50_sor_disconnect(encoder);
-+		return;
-+	}
++	NV_DEBUG(dev, "or %d mode %d\n", or, mode);
 +
 +	/* wait for it to be done */
 +	if (!nv_wait(NV50_PDISPLAY_SOR_DPMS_CTRL(or),
@@ -57646,9 +57362,13 @@ index 0000000..9ae8ec3
 +	struct nouveau_encoder *encoder = nouveau_encoder(drm_encoder);
 +	struct nouveau_connector *connector;
 +
++	NV_DEBUG(drm_encoder->dev, "or %d\n", encoder->or);
++
 +	connector = nouveau_encoder_connector_get(encoder);
-+	if (!connector)
++	if (!connector) {
++		NV_ERROR(drm_encoder->dev, "Encoder has no connector\n");
 +		return false;
++	}
 +
 +	if (connector->scaling_mode != DRM_MODE_SCALE_NONE &&
 +	     connector->native_mode) {
@@ -57682,10 +57402,7 @@ index 0000000..9ae8ec3
 +
 +	NV_DEBUG(dev, "or %d\n", encoder->or);
 +
-+	ret = dev_priv->in_modeset;
-+	dev_priv->in_modeset = false;
 +	nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_ON);
-+	dev_priv->in_modeset = ret;
 +
 +	if (to_drm_encoder(encoder)->encoder_type != DRM_MODE_ENCODER_LVDS) {
 +		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_TMDS;
@@ -57779,6 +57496,8 @@ index 0000000..9ae8ec3
 +	encoder->dcb = entry;
 +	encoder->or = ffs(entry->or) - 1;
 +
++	encoder->disconnect = nv50_sor_disconnect;
++
 +	drm_encoder_init(dev, to_drm_encoder(encoder), &nv50_sor_encoder_funcs, type);
 +	drm_encoder_helper_add(to_drm_encoder(encoder), &nv50_sor_helper_funcs);
 +
@@ -58373,7 +58092,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 e0f1c1f..84e2fa6 100644
+index eeefb63..1345c39 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);

drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                            |  169 +++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                     |   12 +
 b/drivers/gpu/drm/drm_drv.c                             |    1 
 b/drivers/gpu/drm/drm_fops.c                            |   68 ++++++
 b/drivers/gpu/drm/drm_irq.c                             |   43 ++++
 b/drivers/gpu/drm/drm_stub.c                            |    1 
 b/drivers/gpu/drm/i915/i915_drv.c                       |    1 
 b/drivers/gpu/drm/i915/intel_display.c                  |   26 +-
 b/drivers/gpu/drm/radeon/radeon_display.c               |    3 
 b/include/drm/drm.h                                     |   25 ++
 b/include/drm/drmP.h                                    |   32 +++
 b/include/drm/drm_crtc.h                                |   27 ++
 b/include/drm/drm_crtc_helper.h                         |    4 
 b/include/drm/drm_mode.h                                |   16 +
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 16 files changed, 416 insertions(+), 16 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.2.6.4
retrieving revision 1.2.6.5
diff -u -p -r1.2.6.4 -r1.2.6.5
--- drm-page-flip.patch	26 Aug 2009 19:58:48 -0000	1.2.6.4
+++ drm-page-flip.patch	10 Sep 2009 14:00:29 -0000	1.2.6.5
@@ -1,6 +1,7 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c	2009-08-25 09:52:41.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index ba728ad..4b7e748 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
 @@ -34,6 +34,8 @@
  #include "drmP.h"
  #include "drm_crtc.h"
@@ -10,7 +11,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  struct drm_prop_enum_list {
  	int type;
  	char *name;
-@@ -329,6 +331,34 @@ void drm_framebuffer_cleanup(struct drm_
+@@ -330,6 +332,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
  EXPORT_SYMBOL(drm_framebuffer_cleanup);
  
  /**
@@ -45,7 +46,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
   * drm_crtc_init - Initialise a new CRTC object
   * @dev: DRM device
   * @crtc: CRTC object to init
-@@ -339,17 +369,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
+@@ -340,17 +370,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
   *
   * Inits a new object created as base part of an driver crtc object.
   */
@@ -66,7 +67,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_crtc_init);
-@@ -368,6 +400,9 @@ void drm_crtc_cleanup(struct drm_crtc *c
+@@ -369,6 +401,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
  {
  	struct drm_device *dev = crtc->dev;
  
@@ -76,7 +77,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (crtc->gamma_store) {
  		kfree(crtc->gamma_store);
  		crtc->gamma_store = NULL;
-@@ -375,6 +410,7 @@ void drm_crtc_cleanup(struct drm_crtc *c
+@@ -376,6 +411,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
  
  	drm_mode_object_put(dev, &crtc->base);
  	list_del(&crtc->head);
@@ -84,7 +85,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->mode_config.num_crtc--;
  }
  EXPORT_SYMBOL(drm_crtc_cleanup);
-@@ -2478,3 +2514,134 @@ out:
+@@ -2479,3 +2515,134 @@ out:
  	mutex_unlock(&dev->mode_config.mutex);
  	return ret;
  }
@@ -219,10 +220,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +
 +	return ret;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-08-25 09:52:41.000000000 +1000
-@@ -874,8 +874,10 @@ int drm_crtc_helper_set_config(struct dr
+diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
+index ff447f1..fec66f9 100644
+--- a/drivers/gpu/drm/drm_crtc_helper.c
++++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -872,8 +872,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
  		old_fb = set->crtc->fb;
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
@@ -231,9 +233,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  						set->x, set->y, old_fb);
 +		mutex_unlock(&dev->struct_mutex);
  		if (ret != 0)
- 		    goto fail_set_mode;
+ 			goto fail;
  	}
-@@ -1101,3 +1103,13 @@ int drm_helper_resume_force_mode(struct 
+@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -247,10 +249,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 +}
 +EXPORT_SYMBOL(drm_crtc_helper_set_base);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c	2009-08-25 09:52:41.000000000 +1000
-@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[
+diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
+index a75ca63..672f473 100644
+--- a/drivers/gpu/drm/drm_drv.c
++++ b/drivers/gpu/drm/drm_drv.c
+@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
@@ -258,10 +261,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c	2009-08-25 09:52:41.000000000 +1000
-@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode 
+diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
+index 251bc0e..dcd9c66 100644
+--- a/drivers/gpu/drm/drm_fops.c
++++ b/drivers/gpu/drm/drm_fops.c
+@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
  
  	INIT_LIST_HEAD(&priv->lhead);
  	INIT_LIST_HEAD(&priv->fbs);
@@ -270,7 +274,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
-@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, str
+@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
  {
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev = file_priv->minor->dev;
@@ -280,7 +284,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	int retcode = 0;
  
  	lock_kernel();
-@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, str
+@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
  	if (file_priv->minor->master)
  		drm_master_release(dev, filp);
  
@@ -300,7 +304,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_release(dev, file_priv);
  
-@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, str
+@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
  }
  EXPORT_SYMBOL(drm_release);
  
@@ -358,9 +362,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	return mask;
  }
  EXPORT_SYMBOL(drm_poll);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:52:41.000000000 +1000
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index f85aaf2..102d19d 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
 @@ -34,6 +34,7 @@
   */
  
@@ -369,7 +374,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  #include <linux/interrupt.h>	/* For task queue support */
  
-@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *
+@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
  	return 0;
  }
  
@@ -414,16 +419,16 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static void vblank_disable_fn(unsigned long arg)
  {
  	struct drm_device *dev = (struct drm_device *)arg;
-@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *d
+@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
  		atomic_set(&dev->vblank_refcount[i], 0);
  	}
  
-+	INIT_LIST_HEAD(&dev->flip_list);
 +	INIT_WORK(&dev->flip_work, drm_flip_work_func);
++
  	dev->vblank_disable_allowed = 0;
  
  	return 0;
-@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device
+@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
  {
  	atomic_inc(&dev->_vblank_count[crtc]);
  	DRM_WAKEUP(&dev->vbl_queue[crtc]);
@@ -431,10 +436,23 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  }
  EXPORT_SYMBOL(drm_handle_vblank);
 +
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-08-25 09:52:41.000000000 +1000
-@@ -203,6 +203,7 @@ static struct drm_driver driver = {
+diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
+index 55bb8a8..65c8662 100644
+--- a/drivers/gpu/drm/drm_stub.c
++++ b/drivers/gpu/drm/drm_stub.c
+@@ -220,6 +220,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+ 	INIT_LIST_HEAD(&dev->ctxlist);
+ 	INIT_LIST_HEAD(&dev->vmalist);
+ 	INIT_LIST_HEAD(&dev->maplist);
++	INIT_LIST_HEAD(&dev->flip_list);
+ 
+ 	spin_lock_init(&dev->count_lock);
+ 	spin_lock_init(&dev->drw_lock);
+diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
+index dbe568c..b81305e 100644
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -206,6 +206,7 @@ static struct drm_driver driver = {
  		 .mmap = drm_gem_mmap,
  		 .poll = drm_poll,
  		 .fasync = drm_fasync,
@@ -442,10 +460,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #ifdef CONFIG_COMPAT
  		 .compat_ioctl = i915_compat_ioctl,
  #endif
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf	2009-08-25 09:35:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:52:41.000000000 +1000
-@@ -917,6 +917,8 @@ intel_pipe_set_base(struct drm_crtc *crt
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 155719f..0d6e677 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -973,6 +973,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	u32 dspcntr, alignment;
  	int ret;
  
@@ -454,7 +473,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	/* no fb bound */
  	if (!crtc->fb) {
  		DRM_DEBUG("No FB bound\n");
-@@ -952,17 +954,14 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1008,17 +1010,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		BUG();
  	}
  
@@ -472,7 +491,15 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		return ret;
  	}
  
-@@ -998,7 +997,6 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1029,7 +1028,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+ 		ret = i915_gem_object_get_fence_reg(obj);
+ 		if (ret != 0) {
+ 			i915_gem_object_unpin(obj);
+-			mutex_unlock(&dev->struct_mutex);
+ 			return ret;
+ 		}
+ 	}
+@@ -1054,7 +1052,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	default:
  		DRM_ERROR("Unknown color depth\n");
  		i915_gem_object_unpin(obj);
@@ -480,7 +507,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		return -EINVAL;
  	}
  	if (IS_I965G(dev)) {
-@@ -1026,13 +1024,11 @@ intel_pipe_set_base(struct drm_crtc *crt
+@@ -1086,17 +1083,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  		I915_READ(dspbase);
  	}
  
@@ -488,14 +515,18 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 -
  	if (old_fb) {
  		intel_fb = to_intel_framebuffer(old_fb);
+ 		obj_priv = intel_fb->obj->driver_private;
 +		intel_wait_for_vblank(dev);
  		i915_gem_object_unpin(intel_fb->obj);
  	}
--	mutex_unlock(&dev->struct_mutex);
+ 	intel_increase_pllclock(crtc, true);
  
+-	mutex_unlock(&dev->struct_mutex);
+-
  	if (!dev->primary->master)
  		return 0;
-@@ -2605,7 +2601,9 @@ static int intel_crtc_mode_set(struct dr
+ 
+@@ -2732,7 +2726,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  	I915_WRITE(dspcntr_reg, dspcntr);
  
  	/* Flush the plane changes */
@@ -505,7 +536,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	intel_update_watermarks(dev);
  
-@@ -3081,6 +3079,7 @@ static const struct drm_crtc_funcs intel
+@@ -3521,6 +3517,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
  	.gamma_set = intel_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = intel_crtc_destroy,
@@ -513,7 +544,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  
-@@ -3093,7 +3092,7 @@ static void intel_crtc_init(struct drm_d
+@@ -3533,7 +3530,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
  	if (intel_crtc == NULL)
  		return;
  
@@ -522,7 +553,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
  	intel_crtc->pipe = pipe;
-@@ -3327,9 +3326,18 @@ static int intel_user_framebuffer_create
+@@ -3717,9 +3714,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
  	return drm_gem_handle_create(file_priv, object, handle);
  }
  
@@ -541,34 +572,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-08-25 09:52:41.000000000 +1000
-@@ -1122,7 +1122,7 @@ nv04_crtc_create(struct drm_device *dev,
- 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
- 	nv_crtc->mode_set.num_connectors = 0;
- 
--	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
-+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
- 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
- 
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
---- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-08-25 09:52:41.000000000 +1000
-@@ -810,7 +810,7 @@ nv50_crtc_create(struct drm_device *dev,
- 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
- 	crtc->mode_set.num_connectors = 0;
- 
--	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
-+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
- 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
- 
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf	2009-08-25 09:35:49.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c	2009-08-25 09:52:41.000000000 +1000
-@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeo
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index f5739e2..0ec45bc 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -168,6 +168,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
@@ -576,7 +584,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
-@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_
+@@ -180,7 +181,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
  	if (radeon_crtc == NULL)
  		return;
  
@@ -585,21 +593,131 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
  	radeon_crtc->crtc_id = index;
-diff -up linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf linux-2.6.30.noarch/include/drm/drm_crtc_helper.h
---- linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_crtc_helper.h	2009-08-25 09:52:41.000000000 +1000
-@@ -123,4 +123,8 @@ static inline void drm_connector_helper_
- }
+diff --git a/include/drm/drm.h b/include/drm/drm.h
+index 7cb50bd..1920323 100644
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -686,6 +686,7 @@ struct drm_gem_open {
+ #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
++#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
  
- extern int drm_helper_resume_force_mode(struct drm_device *dev);
+ /**
+  * Device specific ioctls should only be in their respective headers
+@@ -698,6 +699,30 @@ struct drm_gem_open {
+ #define DRM_COMMAND_BASE                0x40
+ #define DRM_COMMAND_END			0xA0
+ 
++/**
++ * Header for events written back to userspace on the drm fd.  The
++ * type defines the type of event, the length specifies the total
++ * length of the event (including the header), and user_data is
++ * typically a 64 bit value passed with the ioctl that triggered the
++ * event.  A read on the drm fd will always only return complete
++ * events, that is, if for example the read buffer is 100 bytes, and
++ * there are two 64 byte events pending, only one will be returned.
++ */
++struct drm_event {
++	__u32 type;
++	__u32 length;
++};
 +
-+extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
-+				    struct drm_framebuffer *old_fb);
++#define DRM_EVENT_MODE_PAGE_FLIP 0x01
 +
- #endif
-diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.pf linux-2.6.30.noarch/include/drm/drm_crtc.h
---- linux-2.6.30.noarch/include/drm/drm_crtc.h.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-08-25 09:52:41.000000000 +1000
++struct drm_event_page_flip {
++	struct drm_event base;
++	__u64 user_data;
++	__u32 tv_sec;
++	__u32 tv_usec;
++	__u32 frame;
++};
++
+ /* typedef area */
+ #ifndef __KERNEL__
+ typedef struct drm_clip_rect drm_clip_rect_t;
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index eeefb63..5431888 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -426,6 +426,14 @@ struct drm_buf_entry {
+ 	struct drm_freelist freelist;
+ };
+ 
++/* Event queued up for userspace to read */
++struct drm_pending_event {
++	struct drm_event *event;
++	struct list_head link;
++	struct drm_file *file_priv;
++	void (*destroy) (struct drm_pending_event *event);
++};
++
+ /** File private data */
+ struct drm_file {
+ 	int authenticated;
+@@ -449,6 +457,9 @@ struct drm_file {
+ 	struct drm_master *master; /* master this node is currently associated with
+ 				      N.B. not always minor->master */
+ 	struct list_head fbs;
++
++	wait_queue_head_t event_wait;
++	struct list_head event_list;
+ };
+ 
+ /** Wait queue */
+@@ -897,6 +908,16 @@ struct drm_minor {
+ 	struct drm_mode_group mode_group;
+ };
+ 
++struct drm_pending_flip {
++	struct drm_pending_event pending_event;
++	struct drm_framebuffer *old_fb;
++	struct drm_crtc *crtc;
++	u32 frame;
++	int pipe;
++	struct list_head link;
++	struct drm_event_page_flip event;
++};
++
+ /**
+  * DRM device structure. This structure represent a complete card that
+  * may contain multiple heads.
+@@ -996,6 +1017,13 @@ struct drm_device {
+ 
+ 	u32 max_vblank_count;           /**< size of vblank counter register */
+ 
++	struct work_struct flip_work;
++
++	/**
++	 * List of objects waiting on flip completion
++	 */
++	struct list_head flip_list;
++
+ 	/*@} */
+ 	cycles_t ctx_start;
+ 	cycles_t lck_start;
+@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_device *dev);
+ extern int drm_open(struct inode *inode, struct file *filp);
+ extern int drm_stub_open(struct inode *inode, struct file *filp);
+ extern int drm_fasync(int fd, struct file *filp, int on);
++extern ssize_t drm_read(struct file *filp, char __user *buffer,
++			size_t count, loff_t *offset);
+ extern int drm_release(struct inode *inode, struct file *filp);
+ 
+ 				/* Mapping support (drm_vm.h) */
+@@ -1298,6 +1328,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
+ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+ extern int drm_modeset_ctl(struct drm_device *dev, void *data,
+ 			   struct drm_file *file_priv);
++extern void drm_finish_pending_flip(struct drm_device *dev,
++				   struct drm_pending_flip *f, u32 frame);
+ 
+ 				/* AGP/GART support (drm_agpsupport.h) */
+ extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
+diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
+index ae1e9e1..525f770 100644
+--- a/include/drm/drm_crtc.h
++++ b/include/drm/drm_crtc.h
 @@ -238,6 +238,12 @@ struct drm_display_info {
  };
  
@@ -613,7 +731,7 @@ diff -up linux-2.6.30.noarch/include/drm
  	void (*destroy)(struct drm_framebuffer *framebuffer);
  	int (*create_handle)(struct drm_framebuffer *fb,
  			     struct drm_file *file_priv,
-@@ -288,6 +294,7 @@ struct drm_property {
+@@ -290,6 +296,7 @@ struct drm_property {
  struct drm_crtc;
  struct drm_connector;
  struct drm_encoder;
@@ -621,7 +739,7 @@ diff -up linux-2.6.30.noarch/include/drm
  
  /**
   * drm_crtc_funcs - control CRTCs for a given device
-@@ -331,17 +338,29 @@ struct drm_crtc_funcs {
+@@ -333,17 +340,29 @@ struct drm_crtc_funcs {
  	void (*destroy)(struct drm_crtc *crtc);
  
  	int (*set_config)(struct drm_mode_set *set);
@@ -651,7 +769,7 @@ diff -up linux-2.6.30.noarch/include/drm
   *
   * Each CRTC may have one or more connectors associated with it.  This structure
   * allows the CRTC to be controlled.
-@@ -359,6 +378,7 @@ struct drm_crtc {
+@@ -361,6 +380,7 @@ struct drm_crtc {
  
  	struct drm_display_mode mode;
  
@@ -659,7 +777,7 @@ diff -up linux-2.6.30.noarch/include/drm
  	int x, y;
  	struct drm_display_mode *desired_mode;
  	int desired_x, desired_y;
-@@ -368,6 +388,10 @@ struct drm_crtc {
+@@ -370,6 +390,10 @@ struct drm_crtc {
  	uint32_t gamma_size;
  	uint16_t *gamma_store;
  
@@ -670,7 +788,7 @@ diff -up linux-2.6.30.noarch/include/drm
  	/* if you are using the helper */
  	void *helper_private;
  };
-@@ -595,6 +619,7 @@ struct drm_mode_config {
+@@ -597,6 +621,7 @@ struct drm_mode_config {
  
  extern void drm_crtc_init(struct drm_device *dev,
  			  struct drm_crtc *crtc,
@@ -678,7 +796,7 @@ diff -up linux-2.6.30.noarch/include/drm
  			  const struct drm_crtc_funcs *funcs);
  extern void drm_crtc_cleanup(struct drm_crtc *crtc);
  
-@@ -742,6 +767,8 @@ extern int drm_mode_gamma_get_ioctl(stru
+@@ -744,6 +769,8 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
@@ -687,51 +805,23 @@ diff -up linux-2.6.30.noarch/include/drm
  extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
  				int hdisplay, int vdisplay, int vrefresh,
  				bool reduced, bool interlaced);
-diff -up linux-2.6.30.noarch/include/drm/drm.h.pf linux-2.6.30.noarch/include/drm/drm.h
---- linux-2.6.30.noarch/include/drm/drm.h.pf	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm.h	2009-08-25 09:52:41.000000000 +1000
-@@ -686,6 +686,7 @@ struct drm_gem_open {
- #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
- 
- /**
-  * Device specific ioctls should only be in their respective headers
-@@ -698,6 +699,30 @@ struct drm_gem_open {
- #define DRM_COMMAND_BASE                0x40
- #define DRM_COMMAND_END			0xA0
+diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
+index 4c8daca..b5bd0b8 100644
+--- a/include/drm/drm_crtc_helper.h
++++ b/include/drm/drm_crtc_helper.h
+@@ -126,4 +126,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
+ }
  
-+/**
-+ * Header for events written back to userspace on the drm fd.  The
-+ * type defines the type of event, the length specifies the total
-+ * length of the event (including the header), and user_data is
-+ * typically a 64 bit value passed with the ioctl that triggered the
-+ * event.  A read on the drm fd will always only return complete
-+ * events, that is, if for example the read buffer is 100 bytes, and
-+ * there are two 64 byte events pending, only one will be returned.
-+ */
-+struct drm_event {
-+	__u32 type;
-+	__u32 length;
-+};
-+
-+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
+ extern int drm_helper_resume_force_mode(struct drm_device *dev);
 +
-+struct drm_event_page_flip {
-+	struct drm_event base;
-+	__u64 user_data;
-+	__u32 tv_sec;
-+	__u32 tv_usec;
-+	__u32 frame;
-+};
++extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
++				    struct drm_framebuffer *old_fb);
 +
- /* typedef area */
- #ifndef __KERNEL__
- typedef struct drm_clip_rect drm_clip_rect_t;
-diff -up linux-2.6.30.noarch/include/drm/drm_mode.h.pf linux-2.6.30.noarch/include/drm/drm_mode.h
---- linux-2.6.30.noarch/include/drm/drm_mode.h.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drm_mode.h	2009-08-25 09:52:41.000000000 +1000
+ #endif
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index 1f90841..6f08a77 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
 @@ -268,4 +268,20 @@ struct drm_mode_crtc_lut {
  	__u64 blue;
  };
@@ -753,80 +843,27 @@ diff -up linux-2.6.30.noarch/include/drm
 +};
 +
  #endif
-diff -up linux-2.6.30.noarch/include/drm/drmP.h.pf linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.pf	2009-08-25 09:52:20.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:52:41.000000000 +1000
-@@ -426,6 +426,14 @@ struct drm_buf_entry {
- 	struct drm_freelist freelist;
- };
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -993,7 +993,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->index = crtc_num;
+ 	nv_crtc->last_dpms = NV_DPMS_CLEARED;
  
-+/* Event queued up for userspace to read */
-+struct drm_pending_event {
-+	struct drm_event *event;
-+	struct list_head link;
-+	struct drm_file *file_priv;
-+	void (*destroy) (struct drm_pending_event *event);
-+};
-+
- /** File private data */
- struct drm_file {
- 	int authenticated;
-@@ -449,6 +457,9 @@ struct drm_file {
- 	struct drm_master *master; /* master this node is currently associated with
- 				      N.B. not always minor->master */
- 	struct list_head fbs;
-+
-+	wait_queue_head_t event_wait;
-+	struct list_head event_list;
- };
- 
- /** Wait queue */
-@@ -897,6 +908,16 @@ struct drm_minor {
- 	struct drm_mode_group mode_group;
- };
- 
-+struct drm_pending_flip {
-+	struct drm_pending_event pending_event;
-+	struct drm_framebuffer *old_fb;
-+	struct drm_crtc *crtc;
-+	u32 frame;
-+	int pipe;
-+	struct list_head link;
-+	struct drm_event_page_flip event;
-+};
-+
- /**
-  * DRM device structure. This structure represent a complete card that
-  * may contain multiple heads.
-@@ -996,6 +1017,13 @@ struct drm_device {
- 
- 	u32 max_vblank_count;           /**< size of vblank counter register */
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
  
-+	struct work_struct flip_work;
-+
-+	/**
-+	 * List of objects waiting on flip completion
-+	 */
-+	struct list_head flip_list;
-+
- 	/*@} */
- 	cycles_t ctx_start;
- 	cycles_t lck_start;
-@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_devi
- extern int drm_open(struct inode *inode, struct file *filp);
- extern int drm_stub_open(struct inode *inode, struct file *filp);
- extern int drm_fasync(int fd, struct file *filp, int on);
-+extern ssize_t drm_read(struct file *filp, char __user *buffer,
-+			size_t count, loff_t *offset);
- extern int drm_release(struct inode *inode, struct file *filp);
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -777,7 +777,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->set_dither = nv50_crtc_set_dither;
+ 	crtc->set_scale = nv50_crtc_set_scale;
  
- 				/* Mapping support (drm_vm.h) */
-@@ -1300,6 +1330,8 @@ extern void drm_vblank_pre_modeset(struc
- extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
- extern int drm_modeset_ctl(struct drm_device *dev, void *data,
- 			   struct drm_file *file_priv);
-+extern void drm_finish_pending_flip(struct drm_device *dev,
-+				   struct drm_pending_flip *f, u32 frame);
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
  
- 				/* AGP/GART support (drm_agpsupport.h) */
- extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);

drm-vga-arb.patch:
 drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h        |    1 +
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600d.h         |    1 +
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    4 +++-
 13 files changed, 132 insertions(+), 1 deletion(-)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -p -r1.5.2.3 -r1.5.2.4
--- drm-vga-arb.patch	26 Aug 2009 19:58:48 -0000	1.5.2.3
+++ drm-vga-arb.patch	10 Sep 2009 14:00:29 -0000	1.5.2.4
@@ -1,7 +1,29 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:57:03.000000000 +1000
-@@ -38,6 +38,7 @@
+From ba0d10c754ca30de35063a5e14c92bb7328a9f32 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 8 Sep 2009 13:54:31 +1000
+Subject: [PATCH] drm-vga-arb.patch
+
+---
+ drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
+ drivers/gpu/drm/i915/i915_drv.h        |    1 +
+ drivers/gpu/drm/i915/i915_reg.h        |    1 +
+ drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
+ drivers/gpu/drm/i915/intel_drv.h       |    1 +
+ drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
+ drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
+ drivers/gpu/drm/radeon/r600d.h         |    1 +
+ drivers/gpu/drm/radeon/radeon.h        |    2 ++
+ drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
+ drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
+ include/drm/drmP.h                     |    3 +++
+ 13 files changed, 132 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index f85aaf2..0a6f0b3 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
+@@ -37,6 +37,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
  
@@ -9,7 +31,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /**
   * Get interrupt from bus id.
   *
-@@ -212,6 +213,26 @@ err:
+@@ -171,6 +172,26 @@ err:
  }
  EXPORT_SYMBOL(drm_vblank_init);
  
@@ -36,7 +58,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /**
   * Install IRQ handler.
   *
-@@ -272,6 +293,9 @@ int drm_irq_install(struct drm_device *d
+@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *dev)
  		return ret;
  	}
  
@@ -46,7 +68,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	/* After installing handler */
  	ret = dev->driver->irq_postinstall(dev);
  	if (ret < 0) {
-@@ -320,6 +344,9 @@ int drm_irq_uninstall(struct drm_device 
+@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device * dev)
  
  	DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
@@ -56,10 +78,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->driver->irq_uninstall(dev);
  
  	free_irq(dev->pdev->irq, dev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-25 09:57:03.000000000 +1000
-@@ -32,6 +32,7 @@
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 9909505..5a49a18 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -33,6 +33,7 @@
  #include "intel_drv.h"
  #include "i915_drm.h"
  #include "i915_drv.h"
@@ -67,7 +90,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  /* Really want an OS-independent resettable timer.  Would like to have
   * this loop run for (eg) 3 sec, but have the timer reset every time
-@@ -979,6 +980,19 @@ static int i915_probe_agp(struct drm_dev
+@@ -1012,6 +1013,19 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
  	return 0;
  }
  
@@ -87,7 +110,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1024,6 +1038,11 @@ static int i915_load_modeset_init(struct
+@@ -1057,6 +1071,11 @@ static int i915_load_modeset_init(struct drm_device *dev,
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -99,7 +122,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1284,6 +1303,7 @@ int i915_driver_unload(struct drm_device
+@@ -1324,6 +1343,7 @@ int i915_driver_unload(struct drm_device *dev)
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -107,10 +130,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	}
  
  	if (dev->pdev->msi_enabled)
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-25 09:57:03.000000000 +1000
-@@ -761,6 +761,7 @@ static inline void opregion_enable_asle(
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index 77ed060..a0632f8 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -766,6 +766,7 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
  /* modesetting */
  extern void intel_modeset_init(struct drm_device *dev);
  extern void intel_modeset_cleanup(struct drm_device *dev);
@@ -118,9 +142,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  /**
   * Lock test for when it's just for synchronization of ring access.
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-25 09:57:03.000000000 +1000
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index e38cd21..3f79635 100644
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -129,10 +154,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #define INTEL_GMCH_ENABLED	0x4
  #define INTEL_GMCH_MEM_MASK	0x1
  #define INTEL_GMCH_MEM_64M	0x1
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:57:03.000000000 +1000
-@@ -3871,3 +3871,26 @@ struct drm_encoder *intel_best_encoder(s
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 155719f..0227b16 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -3917,3 +3917,20 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
  
  	return &intel_output->enc;
  }
@@ -142,36 +168,32 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 + */
 +int intel_modeset_vga_set_state(struct drm_device *dev, bool state)
 +{
-+	struct pci_dev *bridge_dev;
++	struct drm_i915_private *dev_priv = dev->dev_private;
 +	u16 gmch_ctrl;
 +
-+	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
-+	if (!bridge_dev) {
-+		DRM_ERROR("Can't disable VGA, no bridge\n");
-+		return -1;
-+	}
-+
-+	pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
++	pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
 +	if (state)
 +		gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE;
 +	else
 +		gmch_ctrl |= INTEL_GMCH_VGA_DISABLE;
-+	pci_write_config_word(bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
++	pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
 +	return 0;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-25 09:57:03.000000000 +1000
-@@ -161,4 +161,5 @@ extern int intel_framebuffer_create(stru
+diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
+index b9e47f1..3a0004f 100644
+--- a/drivers/gpu/drm/i915/intel_drv.h
++++ b/drivers/gpu/drm/i915/intel_drv.h
+@@ -178,4 +178,5 @@ extern int intel_framebuffer_create(struct drm_device *dev,
  				    struct drm_mode_fb_cmd *mode_cmd,
  				    struct drm_framebuffer **fb,
  				    struct drm_gem_object *obj);
 +
  #endif /* __INTEL_DRV_H__ */
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-25 09:57:03.000000000 +1000
-@@ -1574,6 +1574,20 @@ void r100_vram_init_sizes(struct radeon_
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index 5708c07..386ddbc 100644
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -1916,6 +1916,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -192,10 +214,68 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-25 09:57:03.000000000 +1000
-@@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_devi
+diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
+index d8fcef4..3417dff 100644
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -1444,6 +1444,20 @@ bool r600_card_posted(struct radeon_device *rdev)
+ 	return false;
+ }
+ 
++void r600_vga_set_state(struct radeon_device *rdev, bool state)
++{
++	uint32_t temp;
++
++	temp = RREG32(CONFIG_CNTL);
++	if (state == false) {
++		temp &= ~(1<<0);
++		temp |= (1<<1);
++	} else {
++		temp &= ~(1<<1);
++	}
++	WREG32(CONFIG_CNTL, temp);
++}
++
+ int r600_resume(struct radeon_device *rdev)
+ {
+ 	int r;
+diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
+index 723295f..4a9028a 100644
+--- a/drivers/gpu/drm/radeon/r600d.h
++++ b/drivers/gpu/drm/radeon/r600d.h
+@@ -78,6 +78,7 @@
+ #define CB_COLOR0_MASK                                  0x28100
+ 
+ #define	CONFIG_MEMSIZE					0x5428
++#define CONFIG_CNTL					0x5424
+ #define	CP_STAT						0x8680
+ #define	CP_COHER_BASE					0x85F8
+ #define	CP_DEBUG					0xC1FC
+diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
+index 3299733..98a0c7f 100644
+--- a/drivers/gpu/drm/radeon/radeon.h
++++ b/drivers/gpu/drm/radeon/radeon.h
+@@ -592,6 +592,7 @@ struct radeon_asic {
+ 	int (*suspend)(struct radeon_device *rdev);
+ 	void (*errata)(struct radeon_device *rdev);
+ 	void (*vram_info)(struct radeon_device *rdev);
++	void (*vga_set_state)(struct radeon_device *rdev, bool state);
+ 	int (*gpu_reset)(struct radeon_device *rdev);
+ 	int (*mc_init)(struct radeon_device *rdev);
+ 	void (*mc_fini)(struct radeon_device *rdev);
+@@ -901,6 +902,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
+ #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
+ #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
+ #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
++#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
+ #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
+ #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
+ #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
+diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
+index e87bb91..fd18cd6 100644
+--- a/drivers/gpu/drm/radeon/radeon_asic.h
++++ b/drivers/gpu/drm/radeon/radeon_asic.h
+@@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
  void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
  void r100_errata(struct radeon_device *rdev);
  void r100_vram_info(struct radeon_device *rdev);
@@ -203,7 +283,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -85,6 +86,7 @@ static struct radeon_asic r100_asic = {
+@@ -87,6 +88,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -211,7 +291,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -149,6 +151,7 @@ static struct radeon_asic r300_asic = {
+@@ -152,6 +154,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -219,7 +299,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -193,6 +196,7 @@ static struct radeon_asic r420_asic = {
+@@ -197,6 +200,7 @@ static struct radeon_asic r420_asic = {
  	.init = &r300_init,
  	.errata = &r420_errata,
  	.vram_info = &r420_vram_info,
@@ -227,7 +307,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r420_mc_init,
  	.mc_fini = &r420_mc_fini,
-@@ -244,6 +248,7 @@ static struct radeon_asic rs400_asic = {
+@@ -249,6 +253,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -235,23 +315,23 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -299,6 +304,7 @@ static struct radeon_asic rs600_asic = {
- 	.init = &r300_init,
+@@ -306,6 +311,7 @@ static struct radeon_asic rs600_asic = {
+ 	.init = &rs600_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -346,6 +352,7 @@ static struct radeon_asic rs690_asic = {
- 	.init = &rs690_init,
+@@ -353,6 +359,7 @@ static struct radeon_asic rs690_asic = {
+ 	.init = &rs600_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -399,6 +406,7 @@ static struct radeon_asic rv515_asic = {
+@@ -407,6 +414,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -259,7 +339,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -445,6 +453,7 @@ static struct radeon_asic r520_asic = {
+@@ -454,6 +462,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -267,9 +347,34 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-25 09:57:03.000000000 +1000
+@@ -495,6 +504,7 @@ int r600_init(struct radeon_device *rdev);
+ void r600_fini(struct radeon_device *rdev);
+ int r600_suspend(struct radeon_device *rdev);
+ int r600_resume(struct radeon_device *rdev);
++void r600_vga_set_state(struct radeon_device *rdev, bool state);
+ int r600_wb_init(struct radeon_device *rdev);
+ void r600_wb_fini(struct radeon_device *rdev);
+ void r600_cp_commit(struct radeon_device *rdev);
+@@ -531,6 +541,7 @@ static struct radeon_asic r600_asic = {
+ 	.resume = &r600_resume,
+ 	.cp_commit = &r600_cp_commit,
+ 	.vram_info = NULL,
++	.vga_set_state = &r600_vga_set_state,
+ 	.gpu_reset = &r600_gpu_reset,
+ 	.mc_init = NULL,
+ 	.mc_fini = NULL,
+@@ -581,6 +592,7 @@ static struct radeon_asic rv770_asic = {
+ 	.cp_commit = &r600_cp_commit,
+ 	.vram_info = NULL,
+ 	.gpu_reset = &rv770_gpu_reset,
++	.vga_set_state = &r600_vga_set_state,
+ 	.mc_init = NULL,
+ 	.mc_fini = NULL,
+ 	.wb_init = &r600_wb_init,
+diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
+index f2469c5..764d2f8 100644
+--- a/drivers/gpu/drm/radeon/radeon_device.c
++++ b/drivers/gpu/drm/radeon/radeon_device.c
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -278,7 +383,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_d
+@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
  int radeon_modeset_init(struct radeon_device *rdev);
  void radeon_modeset_fini(struct radeon_device *rdev);
  
@@ -297,7 +402,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /*
   * Radeon device.
   */
-@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_dev
+@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_device *rdev,
  		/* Initialize surface registers */
  		radeon_surface_init(rdev);
  
@@ -310,7 +415,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		/* TODO: disable VGA need to use VGA request */
  		/* BIOS*/
  		if (!radeon_get_bios(rdev)) {
-@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_de
+@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_device *rdev)
  		radeon_agp_fini(rdev);
  #endif
  		radeon_irq_kms_fini(rdev);
@@ -318,29 +423,11 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		radeon_fence_driver_fini(rdev);
  		radeon_clocks_fini(rdev);
  		radeon_object_fini(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-25 09:57:03.000000000 +1000
-@@ -580,6 +580,7 @@ struct radeon_asic {
- 	int (*suspend)(struct radeon_device *rdev);
- 	void (*errata)(struct radeon_device *rdev);
- 	void (*vram_info)(struct radeon_device *rdev);
-+	void (*vga_set_state)(struct radeon_device *rdev, bool state);
- 	int (*gpu_reset)(struct radeon_device *rdev);
- 	int (*mc_init)(struct radeon_device *rdev);
- 	void (*mc_fini)(struct radeon_device *rdev);
-@@ -917,6 +918,7 @@ static inline void radeon_ring_write(str
- #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
- #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
- #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
-+#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
- #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
- #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
- #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
-diff -up linux-2.6.30.noarch/include/drm/drmP.h.da linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.da	2009-08-25 09:56:33.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:57:03.000000000 +1000
-@@ -821,6 +821,9 @@ struct drm_driver {
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index eeefb63..c8e64bb 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -810,6 +810,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
  
@@ -350,3 +437,6 @@ diff -up linux-2.6.30.noarch/include/drm
  	/* Driver private ops for this object */
  	struct vm_operations_struct *gem_vm_ops;
  
+-- 
+1.6.0.6
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.64
retrieving revision 1.1294.2.65
diff -u -p -r1.1294.2.64 -r1.1294.2.65
--- kernel.spec	5 Sep 2009 19:02:24 -0000	1.1294.2.64
+++ kernel.spec	10 Sep 2009 14:00:29 -0000	1.1294.2.65
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
+%global released_kernel 1
 
 # Versions of various parts
 
@@ -35,7 +35,7 @@ Summary: The Linux kernel
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 30
+%define base_sublevel 31
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -60,7 +60,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 8
+%define rcrev 9
 # The git snapshot level
 %define gitrev 2
 # Set rpm version accordingly
@@ -101,7 +101,7 @@ Summary: The Linux kernel
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
-# dracut initrd-generic
+# Use dracut instead of mkinitrd for initrd image generation
 %define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
 %define with_dracut 0
 
@@ -433,7 +433,12 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}
+%if %{with_dracut}
+%define initrd_prereq  dracut-kernel >= 001-7
+%else
+%define initrd_prereq  mkinitrd >= 6.0.61-1
+%endif
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -449,6 +454,7 @@ Provides: kernel-drm-nouveau = 15\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
+Requires(pre): %{initrd_prereq}\
 Requires(post): /sbin/new-kernel-pkg\
 Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
@@ -499,14 +505,6 @@ BuildRequires: sparse >= 0.4.1
 %if %{with_perftool}
 BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel
 %endif
-%if %{with_dracut}
-BuildRequires: dracut-kernel >= 0.7
-BuildRequires: dracut-generic >= 0.7
-%endif
-# For dracut image generation, cannot go in dracut package as its arch specific
-%ifnarch s390 s390x
-BuildRequires: kbd
-%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -688,6 +686,7 @@ Patch1575: linux-2.6-kvm-vmx-check-cpl-b
 Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
 Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
+Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next.patch
@@ -699,10 +698,6 @@ Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
-Patch1826: drm-r600-kms.patch
-Patch1827: drm-rv710-ucode-fix.patch
-Patch1828: drm-god-shut-up-about-edid-already.patch
-Patch1829: drm-ddc-caching-bug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1172,7 +1167,7 @@ ApplyPatch linux-2.6-dell-laptop-rfkill-
 #
 # Quiesce USB host controllers before setting up the IOMMU
 ApplyPatch linux-2.6-die-closed-source-bios-muppets-die.patch
-# Some performance fixes, unify hardware/software passthrough support, and 
+# Some performance fixes, unify hardware/software passthrough support, and
 # most importantly: notice when the BIOS points us to a region that returns
 # all 0xFF, and claims that there's an IOMMU there.
 ApplyPatch linux-2.6-intel-iommu-updates.patch
@@ -1325,6 +1320,7 @@ ApplyPatch linux-2.6-kvm-vmx-check-cpl-b
 ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
 ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 #ApplyPatch linux-2.6-xen-stack-protector-fix.patch
+ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1333,10 +1329,6 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
-ApplyPatch drm-r600-kms.patch
-ApplyPatch drm-rv710-ucode-fix.patch
-ApplyPatch drm-god-shut-up-about-edid-already.patch
-ApplyPatch drm-ddc-caching-bug.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1345,7 +1337,8 @@ ApplyPatch drm-i915-resume-force-mode.pa
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-intel-pm.patch
+#this appears to be upstream - mjg59?
+#ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -1460,6 +1453,11 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
+    cat >> Makefile <<\EOF
+# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
+KBUILD_CFLAGS += -fno-var-tracking-assignments
+EOF
+
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -1497,7 +1495,11 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
+%if %{with_dracut}
+    touch $RPM_BUILD_ROOT/boot/dracut-$KernelVer.img
+%else
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+%endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
@@ -1794,26 +1796,6 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
 %endif
 
-%if %{with_dracut}
-%if !%{with_firmware}
-# dracut needs the firmware files
-    %{build_firmware}
-%endif
-    for i in $RPM_BUILD_ROOT/lib/modules/*; do
-	[ -d $i ] || continue
-	KernelVer=${i##$RPM_BUILD_ROOT/lib/modules/}
-        depmod -b $RPM_BUILD_ROOT $KernelVer
-    	dracut  --strip \
-	    --fwdir $RPM_BUILD_ROOT/lib/firmware:/lib/firmware \
-            -k $i $RPM_BUILD_ROOT/boot/initrd-generic-${KernelVer}.img $KernelVer
-	rm -fr $i/modules.dep
-    done
-%if !%{with_firmware}
-# remove the firmware files, if ! with_firmware
-    rm -fr $RPM_BUILD_ROOT/lib/firmware 
-%endif
-%endif
-
 
 ###
 ### clean
@@ -1870,7 +1852,7 @@ if [ `uname -i` == "x86_64" -o `uname -i
 fi}\
 %{expand:\
 %if %{with_dracut}\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --depmod --add-dracut-args --initrdfile=/boot/initrd-generic-%{KVERREL}%{?-v:.%{-v*}}.img --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %else\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %endif}\
@@ -1993,9 +1975,10 @@ fi
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %if %{with_dracut}\
-/boot/initrd-generic-%{KVERREL}%{?2:.%{2}}.img\
+%ghost /boot/dracut-%{KVERREL}%{?2:.%{2}}.img\
+%else\
+%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
@@ -2036,6 +2019,82 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 10 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops and get to 2.6.31
+
+* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: add some scaler-only modes for LVDS, GEM/TTM fixes
+
+* Wed Sep 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-2
+- touch the dracut initrd file when using %%{with_dracut}
+
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-1
+- Linux 2.6.31
+
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>
+- Enable VXpocket and PDaudioCF PCMCIA sound drivers.
+
+* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com>
+- Move to %%post generation of dracut initrd, because of GPL issues surrounding
+  shipping a prebuild initrd
+- Require grubby >= 7.0.4-1, for %%post generation
+
+* Wed Sep  9 2009 Steve Dickson <steved at redhat.com>
+- Updated the NFS4 pseudo root code to the latest release.
+
+* Wed Sep 09 2009 Justin M. Forbes <jforbes at redhat.com>
+- Revert virtio_blk to rotational mode. (#509383)
+
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
+- uggh lost nouveau bits in page flip
+
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.218.rc9.git2
+- fix r600 oops with page flip patch (#520766)
+
+* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: fix display resume on pre-G8x chips
+
+* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: add getparam to know using tile_flags is ok for scanout
+
+* Wed Sep 09 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc9-git2
+
+* Wed Sep  9 2009 Roland McGrath <roland at redhat.com> 2.6.31-0.214.rc9.git1
+- compile with -fno-var-tracking-assignments, work around gcc bug #521991
+
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.213.rc9.git1
+- fix two bugs in r600 kms, fencing + mobile lvds
+
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.212.rc9.git1
+- drm-nouveau.patch: fix ppc build
+
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.211.rc9.git1
+- drm-nouveau.patch: more misc fixes
+
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.210.rc9.git1
+- drm-page-flip.patch: rebase again
+
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.209.rc9.git1
+- drm-next.patch: fix r600 signal interruption return value
+
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.208.rc9.git1
+- drm-nouveau.patch: latest upstream + rebase onto drm-next
+
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.207.rc9.git1
+- drm-vga-arb.patch: update to avoid lockdep + add r600 support
+
+* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.206.rc9.git1
+- drm: rebase to drm-next - r600 accel + kms should start working now
+
+* Mon Sep 07 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.205.rc9.git1
+- 2.6.31-rc9-git1
+- Temporarily hack the drm-next patch so it still applies; the result
+  should still be safe to build.
+
+* Sat Sep 05 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.204.rc9
+- 2.6.31-rc9
+
 * Sat Sep 04 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops which includes swiotlb updates and a network fix
 - try a drm build fix
@@ -3293,4 +3352,3 @@ fi
 # rpm-change-log-uses-utc: t
 # End:
 ###
-

linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |   12 +++++-
 fs/nfsd/nfs4xdr.c           |   83 ++++++++++++++++++++++++++++++++++++--------
 fs/nfsd/nfsfh.c             |   32 ++++++++++++++++
 fs/nfsd/vfs.c               |   75 ++++++++++++++++++++++++++++++++++++++-
 include/linux/nfsd/export.h |    3 +
 include/linux/nfsd/nfsd.h   |    2 +
 6 files changed, 188 insertions(+), 19 deletions(-)

Index: linux-2.6-nfsd4-proots.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-nfsd4-proots.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.2 -r1.1.2.3
--- linux-2.6-nfsd4-proots.patch	9 Jul 2009 22:53:01 -0000	1.1.2.2
+++ linux-2.6-nfsd4-proots.patch	10 Sep 2009 14:00:29 -0000	1.1.2.3
@@ -1,6 +1,6 @@
 diff -up linux-2.6.30.noarch/fs/nfsd/export.c.save linux-2.6.30.noarch/fs/nfsd/export.c
---- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-07-02 11:35:44.000000000 -0400
+--- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-09-09 15:11:54.702436000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-09-09 15:12:44.520167000 -0400
 @@ -104,6 +104,7 @@ static int expkey_parse(struct cache_det
  	if (mesg[mlen-1] != '\n')
  		return -EINVAL;
@@ -64,9 +64,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  		return 0;
  	}
 diff -up linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c
---- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-07-02 11:35:31.000000000 -0400
-@@ -2176,28 +2176,62 @@ static inline int attributes_need_mount(
+--- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-09-09 15:11:54.707433000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-09-09 15:12:36.408695000 -0400
+@@ -2176,28 +2176,61 @@ static inline int attributes_need_mount(
  	return 0;
  }
  
@@ -136,49 +136,11 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
 +	struct svc_export *exp = cd->rd_fhp->fh_export;
 +	__be32 nfserr;
 +	int ignore_crossmnt = 0;
-+	int err, v4root = (exp->ex_flags & NFSEXP_V4ROOT);
 +
  	exp_get(exp);
  	/*
  	 * In the case of a mountpoint, the client may be asking for
-@@ -2208,18 +2242,29 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
- 	 */
- 	if (d_mountpoint(dentry) && !attributes_need_mount(cd->rd_bmval))
- 		ignore_crossmnt = 1;
--	else if (d_mountpoint(dentry)) {
--		int err;
--
-+	else if (d_mountpoint(dentry) || v4root) {
-+		/*
-+		 * Make sure the dentry is viewable on the psuedo export
-+		 */
-+		v4root = (dentry->d_inode && v4root);
-+		if (v4root) {
-+			err = nfsd_export_lookup(cd->rd_rqstp, dentry, exp);
-+			if (err) {
-+				nfserr = nfserrno(err);
-+				goto out_put;
-+			}
-+		}
- 		/*
- 		 * Why the heck aren't we just using nfsd_lookup??
- 		 * Different "."/".." handling?  Something else?
- 		 * At least, add a comment here to explain....
- 		 */
--		err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
--		if (err) {
--			nfserr = nfserrno(err);
--			goto out_put;
-+		if (d_mountpoint(dentry) || v4root) {
-+			err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
-+			if (err) {
-+				nfserr = nfserrno(err);
-+				goto out_put;
-+			}
- 		}
- 		nfserr = check_nfsd_access(exp, cd->rd_rqstp);
- 		if (nfserr)
-@@ -2258,6 +2303,7 @@ nfsd4_encode_dirent(void *ccdv, const ch
+@@ -2258,6 +2291,7 @@ nfsd4_encode_dirent(void *ccdv, const ch
  	struct readdir_cd *ccd = ccdv;
  	struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common);
  	int buflen;
@@ -186,7 +148,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	__be32 *p = cd->buffer;
  	__be32 *cookiep;
  	__be32 nfserr = nfserr_toosmall;
-@@ -2268,19 +2314,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
+@@ -2268,19 +2302,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
  		return 0;
  	}
  
@@ -230,17 +192,15 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	case nfs_ok:
  		p += buflen;
 diff -up linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save linux-2.6.30.noarch/fs/nfsd/nfsfh.c
---- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-07-02 11:35:48.000000000 -0400
-@@ -109,6 +109,34 @@ static __be32 nfsd_setuser_and_check_por
+--- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-09-09 15:11:54.711427000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-09-09 15:12:48.357903000 -0400
+@@ -109,6 +109,30 @@ static __be32 nfsd_setuser_and_check_por
  	return nfserrno(nfsd_setuser(rqstp, exp));
  }
  
 +static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,
 +	struct dentry *dentry, struct svc_export *exp)
 +{
-+	int error;
-+
 +	/*
 +	 * Only interested in pseudo roots
 +	 */
@@ -252,14 +212,12 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
 +	 */
 +	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode)))
 +		return nfserr_stale;
++
 +	/*
-+	 * Check non-root directories to make sure
-+	 * they are truly exported
++	 * Make sure the export is the parent of the dentry
 +	 */
-+	if (unlikely(dentry->d_name.len > 1)) {
-+		error = nfsd_export_lookup(rqstp, dentry, exp);
-+		return nfserrno(error);
-+	}
++	if (unlikely(dentry->d_parent != exp->ex_path.dentry))
++		return nfserr_stale;
 +
 +	return nfs_ok;
 +}
@@ -267,7 +225,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  /*
   * Use the given filehandle to look up the corresponding export and
   * dentry.  On success, the results are used to set fh_export and
-@@ -315,6 +343,14 @@ fh_verify(struct svc_rqst *rqstp, struct
+@@ -315,6 +339,14 @@ fh_verify(struct svc_rqst *rqstp, struct
  		error = nfsd_setuser_and_check_port(rqstp, exp);
  		if (error)
  			goto out;
@@ -283,8 +241,8 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  
  	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
 diff -up linux-2.6.30.noarch/fs/nfsd/vfs.c.save linux-2.6.30.noarch/fs/nfsd/vfs.c
---- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-07-02 11:35:39.000000000 -0400
+--- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-09-09 15:11:54.715423000 -0400
++++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-09-09 15:12:39.978431000 -0400
 @@ -89,6 +89,12 @@ struct raparm_hbucket {
  #define RAPARM_HASH_MASK	(RAPARM_HASH_SIZE-1)
  static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];
@@ -314,7 +272,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  
 +/*
 + * Lookup the export the dentry is on. To be
-+ * viewable on an pseudo export, the dentry
++ * viewable on a pseudo export, the dentry
 + * has to be an exported directory. 
 + */
 +int
@@ -331,8 +289,8 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
 +	/*
 +	 * Make sure the export is the parent of the dentry
 +	 */
-+	if (dentry->d_parent != exp->ex_path.dentry)
-+		return 0;
++	if (unlikely(dentry->d_parent != exp->ex_path.dentry))
++		return -ENOENT;
 +
 +	/*
 +	 * Only directories are seen on psuedo exports
@@ -405,8 +363,8 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  				dput(dentry);
  				goto out_nfserr;
 diff -up linux-2.6.30.noarch/include/linux/nfsd/export.h.save linux-2.6.30.noarch/include/linux/nfsd/export.h
---- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-07-02 11:35:22.000000000 -0400
+--- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-09-09 15:11:54.719419000 -0400
++++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-09-09 15:12:29.064157000 -0400
 @@ -39,7 +39,8 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
@@ -418,8 +376,8 @@ diff -up linux-2.6.30.noarch/include/lin
  /* The flags that may vary depending on security flavor: */
  #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
 diff -up linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save linux-2.6.30.noarch/include/linux/nfsd/nfsd.h
---- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-07-02 11:34:38.000000000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-07-02 11:35:27.000000000 -0400
+--- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-09-09 15:11:54.723415000 -0400
++++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-09-09 15:12:33.025896000 -0400
 @@ -76,6 +76,8 @@ int		nfsd_racache_init(int);
  void		nfsd_racache_shutdown(void);
  int		nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.30
retrieving revision 1.976.2.31
diff -u -p -r1.976.2.30 -r1.976.2.31
--- sources	3 Sep 2009 20:02:38 -0000	1.976.2.30
+++ sources	10 Sep 2009 14:00:31 -0000	1.976.2.31
@@ -1,3 +1 @@
-7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2
-81cac9f7aa9cfa526ce4cfedb4e0f739  patch-2.6.31-rc8-git2.bz2
+84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.29
retrieving revision 1.888.2.30
diff -u -p -r1.888.2.29 -r1.888.2.30
--- upstream	3 Sep 2009 20:02:38 -0000	1.888.2.29
+++ upstream	10 Sep 2009 14:00:31 -0000	1.888.2.30
@@ -1,3 +1 @@
-linux-2.6.30.tar.bz2
-patch-2.6.31-rc8.bz2
-patch-2.6.31-rc8-git2.bz2
+linux-2.6.31.tar.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 ------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/include/asm/xen/swiotlb.h         |   12 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   49 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    8 
 arch/x86/kernel/pci-swiotlb.c              |   25 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    4 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  202 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |  988 +++++++++++++++++
 arch/x86/xen/pci.c                         |  111 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/spinlock.c                    |   28 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  271 ++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  657 +++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 +++++++++
 drivers/xen/events.c                       |  422 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 +++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1602 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +-----
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 +++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |  102 +
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 140 files changed, 12634 insertions(+), 1349 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -p -r1.1.2.40 -r1.1.2.41
--- xen.pvops.patch	5 Sep 2009 19:00:23 -0000	1.1.2.40
+++ xen.pvops.patch	10 Sep 2009 14:00:31 -0000	1.1.2.41
@@ -5886,6 +5886,83 @@ index 429834e..58078da 100644
  	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
  
  	/* make sure interrupts start blocked */
+diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
+index 5601506..36a5141 100644
+--- a/arch/x86/xen/spinlock.c
++++ b/arch/x86/xen/spinlock.c
+@@ -187,7 +187,6 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
+ 	struct xen_spinlock *prev;
+ 	int irq = __get_cpu_var(lock_kicker_irq);
+ 	int ret;
+-	unsigned long flags;
+ 	u64 start;
+ 
+ 	/* If kicker interrupts not initialized yet, just spin */
+@@ -199,16 +198,12 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
+ 	/* announce we're spinning */
+ 	prev = spinning_lock(xl);
+ 
+-	flags = __raw_local_save_flags();
+-	if (irq_enable) {
+-		ADD_STATS(taken_slow_irqenable, 1);
+-		raw_local_irq_enable();
+-	}
+-
+ 	ADD_STATS(taken_slow, 1);
+ 	ADD_STATS(taken_slow_nested, prev != NULL);
+ 
+ 	do {
++		unsigned long flags;
++
+ 		/* clear pending */
+ 		xen_clear_irq_pending(irq);
+ 
+@@ -228,6 +223,12 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
+ 			goto out;
+ 		}
+ 
++		flags = __raw_local_save_flags();
++		if (irq_enable) {
++			ADD_STATS(taken_slow_irqenable, 1);
++			raw_local_irq_enable();
++		}
++
+ 		/*
+ 		 * Block until irq becomes pending.  If we're
+ 		 * interrupted at this point (after the trylock but
+@@ -238,13 +239,15 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
+ 		 * pending.
+ 		 */
+ 		xen_poll_irq(irq);
++
++		raw_local_irq_restore(flags);
++
+ 		ADD_STATS(taken_slow_spurious, !xen_test_irq_pending(irq));
+ 	} while (!xen_test_irq_pending(irq)); /* check for spurious wakeups */
+ 
+ 	kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
+ 
+ out:
+-	raw_local_irq_restore(flags);
+ 	unspinning_lock(xl, prev);
+ 	spin_time_accum_blocked(start);
+ 
+@@ -323,8 +326,13 @@ static void xen_spin_unlock(struct raw_spinlock *lock)
+ 	smp_wmb();		/* make sure no writes get moved after unlock */
+ 	xl->lock = 0;		/* release lock */
+ 
+-	/* make sure unlock happens before kick */
+-	barrier();
++	/*
++	 * Make sure unlock happens before checking for waiting
++	 * spinners.  We need a strong barrier to enforce the
++	 * write-read ordering to different memory locations, as the
++	 * CPU makes no implied guarantees about their ordering.
++	 */
++	mb();
+ 
+ 	if (unlikely(xl->spinners))
+ 		xen_spin_unlock_slow(xl);
 diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
 index 0a5aa44..d4e9a97 100644
 --- a/arch/x86/xen/time.c
@@ -6326,10 +6403,10 @@ index 1d886e0..f4a2b10 100644
  	  This driver implements the front-end of the Xen virtual
  	  block device driver.  It communicates with a back-end driver
 diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
-index 8c9d50d..5a8d914 100644
+index c585577..b45e7cd 100644
 --- a/drivers/char/agp/intel-agp.c
 +++ b/drivers/char/agp/intel-agp.c
-@@ -259,15 +259,19 @@ static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode)
+@@ -261,15 +261,19 @@ static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode)
  /* Exists to support ARGB cursors */
  static struct page *i8xx_alloc_pages(void)
  {
@@ -6352,7 +6429,7 @@ index 8c9d50d..5a8d914 100644
  		return NULL;
  	}
  	get_page(page);
-@@ -277,12 +281,17 @@ static struct page *i8xx_alloc_pages(void)
+@@ -279,12 +283,17 @@ static struct page *i8xx_alloc_pages(void)
  
  static void i8xx_destroy_pages(struct page *page)
  {
@@ -7765,10 +7842,10 @@ index 0000000..8bab63d
 +blkbk-y	:= blkback.o xenbus.o interface.o vbd.o
 diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
 new file mode 100644
-index 0000000..ac5af91
+index 0000000..31458bd
 --- /dev/null
 +++ b/drivers/xen/blkback/blkback.c
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,657 @@
 +/******************************************************************************
 + * arch/xen/drivers/blkif/backend/main.c
 + *
@@ -8386,7 +8463,6 @@ index 0000000..ac5af91
 +{
 +	int i, mmap_pages;
 +
-+	printk(KERN_CRIT "***blkif_init\n");
 +	if (!xen_pv_domain())
 +		return -ENODEV;
 +
@@ -10988,10 +11064,10 @@ index 0000000..21c1f95
 +}
 diff --git a/drivers/xen/netback/netback.c b/drivers/xen/netback/netback.c
 new file mode 100644
-index 0000000..7c0f05b
+index 0000000..d7d738e
 --- /dev/null
 +++ b/drivers/xen/netback/netback.c
-@@ -0,0 +1,1604 @@
+@@ -0,0 +1,1602 @@
 +/******************************************************************************
 + * drivers/xen/netback/netback.c
 + *
@@ -12531,8 +12607,6 @@ index 0000000..7c0f05b
 +	int i;
 +	struct page *page;
 +
-+	printk(KERN_CRIT "*** netif_init\n");
-+
 +	if (!xen_domain())
 +		return -ENODEV;
 +
@@ -16860,7 +16934,7 @@ index bffe6d7..cec5f62 100644
  		panic("Cannot allocate SWIOTLB overflow buffer!\n");
  
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 5cc986e..c7b76b2 100644
+index a0de15f..5e84a5c 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -566,6 +566,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
@@ -16877,7 +16951,7 @@ index 5cc986e..c7b76b2 100644
  	if (!PageHighMem(page)) {
  		debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
  		debug_check_no_obj_freed(page_address(page),
-@@ -1028,6 +1035,13 @@ static void free_hot_cold_page(struct page *page, int cold)
+@@ -1030,6 +1037,13 @@ static void free_hot_cold_page(struct page *page, int cold)
  
  	kmemcheck_free_shadow(page, 0);
  


--- drm-ddc-caching-bug.patch DELETED ---


--- drm-god-shut-up-about-edid-already.patch DELETED ---


--- drm-r600-kms.patch DELETED ---


--- drm-rv710-ucode-fix.patch DELETED ---


--- linux-2.6.30.tar.bz2.sign DELETED ---


--- patch-2.6.31-rc8-git2.bz2.sign DELETED ---


--- patch-2.6.31-rc8.bz2.sign DELETED ---



From wtogami at fedoraproject.org  Thu Sep 10 14:04:28 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 14:04:28 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.121,1.122
Message-ID: <20090910140428.4B4D311C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24956

Modified Files:
	spamassassin.spec 
Log Message:
rules need to be manually copied



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- spamassassin.spec	10 Sep 2009 13:45:40 -0000	1.121
+++ spamassassin.spec	10 Sep 2009 14:04:28 -0000	1.122
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-#%%define rhel 4
+#%%define rhel 5
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -36,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename mcsnapshot
-Release: 0.8.%{prename}%{?dist}
+Release: 0.9.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -161,6 +161,7 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 #cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
 #tar xfvz %{SOURCE1}
 #cd -
+cp rules/*.cf $RPM_BUILD_ROOT%{_datadir}/spamassassin/
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -226,7 +227,7 @@ fi
 exit 0
 
 %changelog
-* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.8.mcsnapshot
+* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.9.mcsnapshot
 - numerous bugs fixed
 - this snapshot is used during masscheck underway until
   September 17th in order to determine the base scores for spamassassin-3.3.0.



From dwalsh at fedoraproject.org  Thu Sep 10 14:07:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Sep 2009 14:07:16 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.33,
	1.34 setroubleshoot-plugins.spec, 1.38, 1.39 sources, 1.34, 1.35
Message-ID: <20090910140716.4F1F211C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25824

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Sep 10 2009  <dwalsh at redhat.com> - 2.1.18-1
- Update po
- Fix "compromized plugins" to report more data in summary



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	22 Aug 2009 11:40:17 -0000	1.33
+++ .cvsignore	10 Sep 2009 14:07:16 -0000	1.34
@@ -23,3 +23,4 @@ setroubleshoot-plugins-2.1.13.tar.gz
 setroubleshoot-plugins-2.1.14.tar.gz
 setroubleshoot-plugins-2.1.15.tar.gz
 setroubleshoot-plugins-2.1.16.tar.gz
+setroubleshoot-plugins-2.1.18.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- setroubleshoot-plugins.spec	22 Aug 2009 11:40:17 -0000	1.38
+++ setroubleshoot-plugins.spec	10 Sep 2009 14:07:16 -0000	1.39
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.16
+Version: 2.1.18
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,13 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Sep 10 2009  <dwalsh at redhat.com> - 2.1.18-1
+- Update po
+- Fix "compromized plugins" to report more data in summary
+
+* Tue Sep 1 2009  <dwalsh at redhat.com> - 2.1.17-1
+- Plugin cleanup
+
 * Sat Aug 22 2009  <dwalsh at redhat.com> - 2.1.16-1
 - Fix subject to not include types
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	22 Aug 2009 11:40:17 -0000	1.34
+++ sources	10 Sep 2009 14:07:16 -0000	1.35
@@ -1 +1 @@
-86f7d1e7260fd423f5940f5892e4a39c  setroubleshoot-plugins-2.1.16.tar.gz
+dffed2c8ee50c861fc9d1e1fa990c352  setroubleshoot-plugins-2.1.18.tar.gz



From overholt at fedoraproject.org  Thu Sep 10 14:11:54 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 10 Sep 2009 14:11:54 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-target-platform-template.patch, NONE,
	1.1 eclipse.spec, 1.662, 1.663
Message-ID: <20090910141154.D752B11C00DB@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27106

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-target-platform-template.patch 
Log Message:
* Wed Sep 09 2009 Mat Booth <fedora at matbooth.co.uk> 1:3.5.0-0.10
- Patch the target platform templates so they find all the required
  source bundles (see RHBZ # 521969).

eclipse-target-platform-template.patch:
 rcpWithSource.target |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE eclipse-target-platform-template.patch ---
--- plugins/org.eclipse.pde.core/targets/rcpWithSource.target.old	2009-09-09 20:58:19.915548076 +0100
+++ plugins/org.eclipse.pde.core/targets/rcpWithSource.target	2009-09-09 21:03:43.845541597 +0100
@@ -3,15 +3,9 @@
 
 <target name="Base RCP with Source">
 
-   <location useDefault="true"/>
-
-   <content>
-      <plugins>
-      </plugins>
-      <features>
-         <feature id="org.eclipse.rcp"/>
-         <feature id="org.eclipse.rcp.source"/>
-      </features>
-   </content>
+   <locations>
+      <location id="org.eclipse.rcp" path="${eclipse_home}" type="Feature"/>
+      <location id="org.eclipse.rcp.source" path="${eclipse_home}/dropins/sdk" type="Feature"/>
+   </locations>
 
 </target>


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -p -r1.662 -r1.663
--- eclipse.spec	31 Aug 2009 10:43:32 -0000	1.662
+++ eclipse.spec	10 Sep 2009 14:11:54 -0000	1.663
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.9%{?dist}
+Release:        0.10%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -127,6 +127,11 @@ Patch48:        %{name}-swt-buildagainst
 
 Patch49:        %{name}-add-ppc64-filesystem.patch
 
+# Make sure the shipped target platform templates are looking in the
+# correct location for source bundles (see RHBZ # 521969). This does not
+# need to go upstream.
+Patch50:        %{name}-target-platform-template.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -637,6 +642,9 @@ fi
 #%patch48 -p3
 #popd
 
+# target platform template patch
+%patch50 -p0
+
 sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \
 	-e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \
 	plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
@@ -1405,6 +1413,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Sep 09 2009 Mat Booth <fedora at matbooth.co.uk> 1:3.5.0-0.10
+- Patch the target platform templates so they find all the required
+  source bundles (see RHBZ # 521969).
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.9
 - Remove all testframework sources, patches, build and etc.
 



From jakub at fedoraproject.org  Thu Sep 10 14:24:09 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 10 Sep 2009 14:24:09 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-powerpc-libgcc_s_so.patch, NONE,
	1.1 gcc44-pr41175.patch, NONE, 1.1 .cvsignore, 1.289,
	1.290 gcc.spec, 1.67, 1.68 sources, 1.293, 1.294
Message-ID: <20090910142409.3FA4A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31050

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-powerpc-libgcc_s_so.patch gcc44-pr41175.patch 
Log Message:
4.4.1-12

gcc44-powerpc-libgcc_s_so.patch:
 config.gcc               |   16 ++++++++--------
 config/t-slibgcc-elf-ver |    8 +++++---
 config/t-slibgcc-libgcc  |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 11 deletions(-)

--- NEW FILE gcc44-powerpc-libgcc_s_so.patch ---
svn diff -r151567:151568 svn+ssh://gcc.gnu.org/svn/gcc/trunk

2009-09-09  Jakub Jelinek  <jakub at redhat.com>

	* config/t-slibgcc-elf-ver (SHLIB_MAKE_SOLINK, SHLIB_INSTALL_SOLINK):
	New variables.
	(SHLIB_LINK, SHLIB_INSTALL): Use them.
	* config/t-slibgcc-libgcc: New file.
	* config.gcc (powerpc*-*-linux*, powerpc*-*-gnu*): Use it.

--- gcc/config.gcc	(revision 151567)
+++ gcc/config.gcc	(revision 151568)
@@ -1738,12 +1738,12 @@ powerpc64-*-linux*)
 		tm_file="rs6000/secureplt.h ${tm_file}"
 	fi
 	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-	tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
+	tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} t-slibgcc-libgcc rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
 	;;
 powerpc64-*-gnu*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
 	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
+	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
 	;;
 powerpc-*-darwin*)
 	extra_options="${extra_options} rs6000/darwin.opt"
@@ -1820,22 +1820,22 @@ powerpc-*-rtems*)
 powerpc-*-linux*altivec*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
 	extra_options="${extra_options} rs6000/sysv4.opt"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} t-slibgcc-libgcc rs6000/t-ppccomm"
 	;;
 powerpc-*-linux*spe*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h"
 	extra_options="${extra_options} rs6000/sysv4.opt"
-	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} t-slibgcc-libgcc rs6000/t-ppccomm"
 	;;
 powerpc-*-linux*paired*)
         tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h"
         extra_options="${extra_options} rs6000/sysv4.opt"
-        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} t-slibgcc-libgcc rs6000/t-ppccomm"
         ;;
 powerpc-*-linux*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
 	extra_options="${extra_options} rs6000/sysv4.opt"
-	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} t-slibgcc-libgcc rs6000/t-ppccomm"
 	case ${enable_targets}:${cpu_is_64bit} in
 	    *powerpc64* | all:* | *:yes)
 		if test x$cpu_is_64bit = xyes; then
@@ -1857,14 +1857,14 @@ powerpc-*-linux*)
 powerpc-*-gnu-gnualtivec*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
 	extra_options="${extra_options} rs6000/sysv4.opt"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
 	fi
 	;;
 powerpc-*-gnu*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
 	extra_options="${extra_options} rs6000/sysv4.opt"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
--- gcc/config/t-slibgcc-libgcc	(revision 0)
+++ gcc/config/t-slibgcc-libgcc	(revision 151568)
@@ -0,0 +1,32 @@
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file is part of GCC.
+#
+# GCC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GCC 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 GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Instead of creating $(SHLIB_SOLINK) symlink create a GNU ld
+# linker script which sources in both $(SHLIB_SONAME) and libgcc.a.
+# This is needed on targets where libgcc.a contains routines that aren't in
+# $(SHLIB_SONAME) and are needed for shared libraries.
+
+SHLIB_MAKE_SOLINK = \
+	(echo "/* GNU ld script"; \
+	 echo "   Use the shared library, but some functions are only in"; \
+	 echo "   the static library.  */"; \
+	 echo "GROUP ( $(SHLIB_SONAME) libgcc.a )" \
+	) > $(SHLIB_DIR)/$(SHLIB_SOLINK)
+SHLIB_INSTALL_SOLINK = \
+	$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SOLINK) \
+	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
--- gcc/config/t-slibgcc-elf-ver	(revision 151567)
+++ gcc/config/t-slibgcc-elf-ver	(revision 151568)
@@ -28,6 +28,9 @@ SHLIB_OBJS = @shlib_objs@
 SHLIB_DIR = @multilib_dir@
 SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
 SHLIB_LC = -lc
+SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
+	$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
 
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 	-Wl,--soname=$(SHLIB_SONAME) \
@@ -40,7 +43,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
 		$(SHLIB_DIR)/$(SHLIB_SONAME).backup; \
 	else true; fi && \
 	mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \
-	$(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+	$(SHLIB_MAKE_SOLINK)
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \
@@ -48,7 +51,6 @@ SHLIB_INSTALL = \
 	$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SONAME) \
 	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
 	rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
-	$(LN_S) $(SHLIB_SONAME) \
-	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+	$(SHLIB_INSTALL_SOLINK)
 SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver

gcc44-pr41175.patch:
 rs6000.c  |   33 ++++++++++++++++++++++++---------
 rs6000.md |   38 +++++++++++++++++++-------------------
 spe.md    |   18 +++++++++---------
 3 files changed, 52 insertions(+), 37 deletions(-)

--- NEW FILE gcc44-pr41175.patch ---
2009-09-10  Nathan Froyd  <froydnj at codesourcery.com>

	PR target/40677
	PR target/41175
	* config/rs6000/rs6000.c (no_global_regs_above): Fix precedence
	problem.
	(rs6000_savres_routine_sym): Fix computation for cache selector.
	Mark the generated symbol as a function.
	(rs6000_emit_prologue): Correct use of call_used_regs.
	(rs6000_emit_epilogue): Adjust computation of restore_lr.
	Duplicate restoration of LR and execute the appropriate one
	depending on whether GPRs are being restored inline.
	* config/rs6000/rs6000.md (*save_gpregs_<mode>): Use explicit
	match for register 11.
	(*save_fpregs_<mode>): Likewise.
	(*restore_gpregs_<mode>): Likewise.
	(*return_and_restore_gpregs_<mode>): Likewise.
	(*return_and_restore_fpregs_<mode>): Likewise.
	* config/rs6000/spe.md (*save_gpregs_spe): Use explicit match for
	register 11.
	(*restore_gpregs_spe): Likewise.
	(*return_and_restore_gpregs_spe): Likewise.

--- gcc/config/rs6000/spe.md.jj	2009-08-31 23:30:14.352526952 +0200
+++ gcc/config/rs6000/spe.md	2009-09-09 20:46:08.391404851 +0200
@@ -3156,9 +3156,9 @@
   [(match_parallel 0 "any_parallel_operand"
 		   [(clobber (reg:P 65))
 		    (use (match_operand:P 1 "symbol_ref_operand" "s"))
-		    (use (match_operand:P 2 "gpc_reg_operand" "r"))
-		    (set (match_operand:V2SI 3 "memory_operand" "=m")
-			 (match_operand:V2SI 4 "gpc_reg_operand" "r"))])]
+		    (use (reg:P 11))
+		    (set (match_operand:V2SI 2 "memory_operand" "=m")
+			 (match_operand:V2SI 3 "gpc_reg_operand" "r"))])]
   "TARGET_SPE_ABI"
   "bl %z1"
   [(set_attr "type" "branch")
@@ -3168,9 +3168,9 @@
  [(match_parallel 0 "any_parallel_operand"
 		  [(clobber (reg:P 65))
 		   (use (match_operand:P 1 "symbol_ref_operand" "s"))
-		   (use (match_operand:P 2 "gpc_reg_operand" "r"))
-		   (set (match_operand:V2SI 3 "gpc_reg_operand" "=r")
-			(match_operand:V2SI 4 "memory_operand" "m"))])]
+		   (use (reg:P 11))
+		   (set (match_operand:V2SI 2 "gpc_reg_operand" "=r")
+			(match_operand:V2SI 3 "memory_operand" "m"))])]
  "TARGET_SPE_ABI"
  "bl %z1"
  [(set_attr "type" "branch")
@@ -3181,9 +3181,9 @@
 		  [(return)
 		   (clobber (reg:P 65))
 		   (use (match_operand:P 1 "symbol_ref_operand" "s"))
-		   (use (match_operand:P 2 "gpc_reg_operand" "r"))
-		   (set (match_operand:V2SI 3 "gpc_reg_operand" "=r")
-			(match_operand:V2SI 4 "memory_operand" "m"))])]
+		   (use (reg:P 11))
+		   (set (match_operand:V2SI 2 "gpc_reg_operand" "=r")
+			(match_operand:V2SI 3 "memory_operand" "m"))])]
  "TARGET_SPE_ABI"
  "b %z1"
  [(set_attr "type" "branch")
--- gcc/config/rs6000/rs6000.c.jj	2009-09-09 20:45:10.794535794 +0200
+++ gcc/config/rs6000/rs6000.c	2009-09-09 20:46:57.195401830 +0200
@@ -18011,7 +18011,8 @@ static bool
 no_global_regs_above (int first, bool gpr)
 {
   int i;
-  for (i = first; i < gpr ? 32 : 64 ; i++)
+  int last = gpr ? 32 : 64;
+  for (i = first; i < last; i++)
     if (global_regs[i])
       return false;
   return true;
@@ -18037,11 +18038,11 @@ rs6000_savres_routine_sym (rs6000_stack_
   int regno = gpr ? info->first_gp_reg_save : (info->first_fp_reg_save - 32);
   rtx sym;
   int select = ((savep ? 1 : 0) << 2
-		| (gpr
+		| (TARGET_SPE_ABI
 		   /* On the SPE, we never have any FPRs, but we do have
 		      32/64-bit versions of the routines.  */
-		   ? (TARGET_SPE_ABI && info->spe_64bit_regs_used ? 1 : 0)
-		   : 0) << 1
+		   ? (info->spe_64bit_regs_used ? 1 : 0)
+		   : (gpr ? 1 : 0)) << 1
 		| (exitp ? 1: 0));
 
   /* Don't generate bogus routine names.  */
@@ -18076,6 +18077,7 @@ rs6000_savres_routine_sym (rs6000_stack_
 
       sym = savres_routine_syms[regno-FIRST_SAVRES_REGISTER][select]
 	= gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (name));
+      SYMBOL_REF_FLAGS (sym) |= SYMBOL_FLAG_FUNCTION;
     }
 
   return sym;
@@ -18289,7 +18291,7 @@ rs6000_emit_prologue (void)
   int using_store_multiple;
   int using_static_chain_p = (cfun->static_chain_decl != NULL_TREE
                               && df_regs_ever_live_p (STATIC_CHAIN_REGNUM)
-                              && !call_used_regs[STATIC_CHAIN_REGNUM]);
+                              && call_used_regs[STATIC_CHAIN_REGNUM]);
   HOST_WIDE_INT sp_offset = 0;
 
   if (TARGET_FIX_AND_CONTINUE)
@@ -19095,8 +19097,9 @@ rs6000_emit_epilogue (int sibcall)
 				 || (cfun->calls_alloca
 				     && !frame_pointer_needed));
   restore_lr = (info->lr_save_p
-		&& restoring_GPRs_inline
-		&& restoring_FPRs_inline);
+		&& (restoring_GPRs_inline
+		    || (restoring_FPRs_inline
+			&& info->first_fp_reg_save < 64)));
 
   if (WORLD_SAVE_P (info))
     {
@@ -19383,7 +19386,7 @@ rs6000_emit_epilogue (int sibcall)
 
   /* Get the old lr if we saved it.  If we are restoring registers
      out-of-line, then the out-of-line routines can do this for us.  */
-  if (restore_lr)
+  if (restore_lr && restoring_GPRs_inline)
     {
       rtx mem = gen_frame_mem_offset (Pmode, frame_reg_rtx,
 				      info->lr_save_offset + sp_offset);
@@ -19403,7 +19406,7 @@ rs6000_emit_epilogue (int sibcall)
 
   /* Set LR here to try to overlap restores below.  LR is always saved
      above incoming stack, so it never needs REG_CFA_RESTORE.  */
-  if (restore_lr)
+  if (restore_lr && restoring_GPRs_inline)
     emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
 		    gen_rtx_REG (Pmode, 0));
 
@@ -19639,6 +19642,18 @@ rs6000_emit_epilogue (int sibcall)
           }
     }
 
+  if (restore_lr && !restoring_GPRs_inline)
+    {
+      rtx mem = gen_frame_mem_offset (Pmode, frame_reg_rtx,
+				      info->lr_save_offset + sp_offset);
+
+      emit_move_insn (gen_rtx_REG (Pmode, 0), mem);
+    }
+
+  if (restore_lr && !restoring_GPRs_inline)
+    emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
+		    gen_rtx_REG (Pmode, 0));
+
   /* Restore fpr's if we need to do it without calling a function.  */
   if (restoring_FPRs_inline)
     for (i = 0; i < 64 - info->first_fp_reg_save; i++)
--- gcc/config/rs6000/rs6000.md.jj	2009-08-31 23:30:14.383526862 +0200
+++ gcc/config/rs6000/rs6000.md	2009-09-09 21:03:19.667779689 +0200
@@ -15289,9 +15289,9 @@
   [(match_parallel 0 "any_parallel_operand"
 		   [(clobber (reg:P 65))
 		    (use (match_operand:P 1 "symbol_ref_operand" "s"))
-                    (use (match_operand:P 2 "gpc_reg_operand" "r"))
-		    (set (match_operand:P 3 "memory_operand" "=m")
-			 (match_operand:P 4 "gpc_reg_operand" "r"))])]
+		    (use (reg:P 11))
+		    (set (match_operand:P 2 "memory_operand" "=m")
+			 (match_operand:P 3 "gpc_reg_operand" "r"))])]
   ""
   "bl %z1"
   [(set_attr "type" "branch")
@@ -15301,9 +15301,9 @@
   [(match_parallel 0 "any_parallel_operand"
 		   [(clobber (reg:P 65))
 		    (use (match_operand:P 1 "symbol_ref_operand" "s"))
-                    (use (match_operand:P 2 "gpc_reg_operand" "r"))
-		    (set (match_operand:DF 3 "memory_operand" "=m")
-			 (match_operand:DF 4 "gpc_reg_operand" "f"))])]
+		    (use (reg:P 11))
+		    (set (match_operand:DF 2 "memory_operand" "=m")
+			 (match_operand:DF 3 "gpc_reg_operand" "f"))])]
   ""
   "bl %z1"
   [(set_attr "type" "branch")
@@ -15394,11 +15394,11 @@
 
 (define_insn "*restore_gpregs_<mode>"
  [(match_parallel 0 "any_parallel_operand"
-                  [(clobber (match_operand:P 1 "register_operand" "=l"))
-                   (use (match_operand:P 2 "symbol_ref_operand" "s"))
-                   (use (match_operand:P 3 "gpc_reg_operand" "r"))
-		   (set (match_operand:P 4 "gpc_reg_operand" "=r")
-			(match_operand:P 5 "memory_operand" "m"))])]
+		  [(clobber (match_operand:P 1 "register_operand" "=l"))
+		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
+		   (use (reg:P 11))
+		   (set (match_operand:P 3 "gpc_reg_operand" "=r")
+			(match_operand:P 4 "memory_operand" "m"))])]
  ""
  "bl %z2"
  [(set_attr "type" "branch")
@@ -15406,12 +15406,12 @@
 
 (define_insn "*return_and_restore_gpregs_<mode>"
  [(match_parallel 0 "any_parallel_operand"
-                  [(return)
+		  [(return)
 		   (clobber (match_operand:P 1 "register_operand" "=l"))
 		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
-                   (use (match_operand:P 3 "gpc_reg_operand" "r"))
-		   (set (match_operand:P 4 "gpc_reg_operand" "=r")
-			(match_operand:P 5 "memory_operand" "m"))])]
+		   (use (reg:P 11))
+		   (set (match_operand:P 3 "gpc_reg_operand" "=r")
+			(match_operand:P 4 "memory_operand" "m"))])]
  ""
  "b %z2"
  [(set_attr "type" "branch")
@@ -15419,12 +15419,12 @@
 
 (define_insn "*return_and_restore_fpregs_<mode>"
  [(match_parallel 0 "any_parallel_operand"
-                  [(return)
+		  [(return)
 		   (clobber (match_operand:P 1 "register_operand" "=l"))
 		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
-                   (use (match_operand:P 3 "gpc_reg_operand" "r"))
-		   (set (match_operand:DF 4 "gpc_reg_operand" "=f")
-			(match_operand:DF 5 "memory_operand" "m"))])]
+		   (use (reg:P 11))
+		   (set (match_operand:DF 3 "gpc_reg_operand" "=f")
+			(match_operand:DF 4 "memory_operand" "m"))])]
  ""
  "b %z2"
  [(set_attr "type" "branch")


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- .cvsignore	9 Sep 2009 09:06:00 -0000	1.289
+++ .cvsignore	10 Sep 2009 14:24:08 -0000	1.290
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090909.tar.bz2
+gcc-4.4.1-20090910.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gcc.spec	9 Sep 2009 09:06:01 -0000	1.67
+++ gcc.spec	10 Sep 2009 14:24:08 -0000	1.68
@@ -1,9 +1,9 @@
-%global DATE 20090909
-%global SVNREV 151553
+%global DATE 20090910
+%global SVNREV 151593
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 11
+%global gcc_release 12
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,6 +161,8 @@ Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
 Patch20: gcc44-vta-cselib-subreg-of-value-more-pr41276.patch
+Patch21: gcc44-powerpc-libgcc_s_so.patch
+Patch22: gcc44-pr41175.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -468,6 +470,8 @@ which are required to compile with the G
 %endif
 %patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
 %patch20 -p0 -b .gcc44-vta-cselib-subreg-of-value-more-pr41276~
+%patch21 -p0 -b .powerpc-libgcc_s_so~
+%patch22 -p0 -b .pr41175~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -870,6 +874,22 @@ ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64
 %ifarch %{multilib_64_archs}
 ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so
 %endif
+%ifarch ppc
+rm -f $FULLPATH/libgcc_s.so
+echo '/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-powerpc)
+GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so
+%endif
+%ifarch ppc64
+rm -f $FULLPATH/32/libgcc_s.so
+echo '/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-powerpc)
+GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so
+%endif
 
 mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/
 
@@ -1807,6 +1827,14 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Sep 10 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-12
+- update from gcc-4_4-branch
+  - PRs bootstrap/41180, target/41315
+- fix ICE in tree-ssa-phiprop.c (#522277, PR tree-optimization/39827)
+- ppc64 bswap fix
+- fix ppc/ppc64 -mmultiple and out of line gpr/fpr saving bugs
+  (#519409, PR target/40677, PR target/41175)
+
 * Wed Sep  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-11
 - fix ICE in tls_mem_loc_descriptor (#521991)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- sources	9 Sep 2009 09:06:01 -0000	1.293
+++ sources	10 Sep 2009 14:24:09 -0000	1.294
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-de6d4c15a234466f656b6fcb84d8c3ec  gcc-4.4.1-20090909.tar.bz2
+e928ff85387b4b7c8f1f065a15f0a4f9  gcc-4.4.1-20090910.tar.bz2



From mmcgrath at fedoraproject.org  Thu Sep 10 14:26:25 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Thu, 10 Sep 2009 14:26:25 +0000 (UTC)
Subject: rpms/smolt/devel smolt.spec,1.73,1.74
Message-ID: <20090910142625.DCEB711C00DB@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31760

Modified Files:
	smolt.spec 
Log Message:
Adding dependency on PyQt4


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- smolt.spec	3 Sep 2009 16:41:00 -0000	1.73
+++ smolt.spec	10 Sep 2009 14:26:25 -0000	1.74
@@ -2,7 +2,7 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -60,6 +60,7 @@ separate package so firstboot isn't a re
 Summary: Fedora hardware profiler gui
 Group: Applications/Internet
 Requires: smolt = %{version}-%{release}
+Requires: PyQt4
 
 %description gui
 Provides smolt's gui functionality.  Not included in the default package to
@@ -206,6 +207,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep 10 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-2
+- Added requires for PyQt4 on smolt gui
+
 * Thu Sep 03 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-1
 - Upstream released new version
 - Changed some link and copy info



From rdieter at fedoraproject.org  Thu Sep 10 14:29:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Sep 2009 14:29:00 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames-4.3.1-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.132, 1.133 kdegames-4.3.0-trademarks.patch,
	1.1, NONE
Message-ID: <20090910142900.C241411C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32694

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.1-trademarks.patch 
Removed Files:
	kdegames-4.3.0-trademarks.patch 
Log Message:
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- adjust trademarks patch to include ktron.desktop


kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   12 ++++----
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 76 insertions(+), 71 deletions(-)

--- NEW FILE kdegames-4.3.1-trademarks.patch ---
diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kbattleship;">
+  <!ENTITY kappname "<application>KSinkShips</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,16 +57,17 @@
 
 <abstract>
 <para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for &kde;.</para>
+&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
 <keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</keyword>
 </keywordset>
 
 </bookinfo>
@@ -76,7 +77,7 @@
 <note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.-->
 <note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It can be: One, Two,..., Multiplayer-->
 <para>
-&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
+&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
 ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
 </para>
 </chapter>
@@ -85,14 +86,14 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -61,7 +61,7 @@
 
 <abstract>
 <para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -69,11 +69,12 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
 Name[be]=???????????? ??????
 Name[bn]=??????-??????????????????????????????
 Name[cs]=Lod??
@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
 Name[ro]=B??t??lie naval??
 Name[sr]=?????????????????????????
 Name[sr at latin]=K???podmornice
-Name[sv]=Kbattleship
 Name[ta]=??????????????????????????????????????????
 Name[tg]=K?????????? ??????????????
 Name[uk]=???????????????? ??????
-Name[x-test]=xxKBattleshipxx
-Name[zh_TW]=KBattleship ??????
+Name[x-test]=xxKSinkShipsxx
+Name[zh_TW]=KSinkShips ??????
 Exec=kbattleship -caption "%c"
 Icon=kbattleship
 Type=Application
 X-DocPath=kbattleship/index.html
-GenericName=Battleship Game
+GenericName=Ship Sinking Game
 GenericName[be]=???????????? ?? ???????????? ??????
 GenericName[bn]=?????????????????????????????? ????????????
 GenericName[ca]=Joc d'enfonsar la flota
@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
 GenericName[cy]=G??m Longau Rhyfel
 GenericName[da]=S??nke slagskibe-spil
 GenericName[de]=Schiffe versenken
-GenericName[el]=???????????????? Battleship
 GenericName[eo]=Batal??ipa ludo
 GenericName[es]=Juego de la batalla de naves
 GenericName[et]=Laevade pommitamise m??ng
@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
 GenericName[fa]=???????? ?????? ???????????????
 GenericName[fi]=Meritaistelupeli
 GenericName[fr]=Jeu de bataille navale
-GenericName[ga]=Cluiche cos??il le "Battleship"
 GenericName[gl]=Xogo de batalla naval
 GenericName[he]=???????? ????????????
 GenericName[hne]=????????????????????? ?????????
@@ -74,7 +70,7 @@ GenericName[ta]=????????????????????????
 GenericName[tr]=Amiral Batt?? Oyunu
 GenericName[uk]=?????? ?? ???????????????? ??????
 GenericName[wa]=Djeu di batreye di bateas
-GenericName[x-test]=xxBattleship Gamexx
+GenericName[x-test]=xxShip Sinking Gamexx
 GenericName[zh_CN]=??????????????????
 GenericName[zh_TW]=????????????
 Terminal=false
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
@@ -5,34 +5,34 @@ input=none
 output=none
 
 Icon=kbattleship
-Description=A protocol for the game KBattleship
-Description[ca]=Un protocol pel joc KBattleship
-Description[da]=En protokol for spillet KBattleship
-Description[de]=Ein Protokoll f??r das KBattleship-Spiel.
-Description[el]=?????? ???????????????????? ?????? ???? ???????????????? KBattleship
-Description[es]=Un protocolo para el juego KBattleship
-Description[et]=KBattleshipi protokoll
-Description[eu]=KBattleship jokoaren protokoloa
-Description[fr]=Un protocole pour le jeu KBattleship
-Description[ga]=Pr??tacal le haghaidh an chluiche KBattleship
-Description[gl]=Un protocolo para o xogo KBattleship
-Description[it]=Un protocollo per KBattleship
-Description[km]=??????????????????????????????????????????????????????????????? KBattleship
-Description[lv]=Protokols sp??lei KBattleship
-Description[nds]=En Protokoll f??r dat Speel "KBattleship"
-Description[nl]=Een protocol voor het spel KBattleship
-Description[nn]=Protokoll for KBattleship
-Description[pt]=Um protocolo para o jogo KBattleship
-Description[pt_BR]=Um protocolo para o jogo KBattleship
-Description[ru]=???????????????? ?????? ???????? KBattleship
-Description[sl]=Protokol za igro KBattleship
+Description=A protocol for the game KSinkShips
+Description[ca]=Un protocol pel joc KSinkShips
+Description[da]=En protokol for spillet KSinkShips
+Description[de]=Ein Protokoll f??r das KSinkShips-Spiel.
+Description[el]=?????? ???????????????????? ?????? ???? ???????????????? KSinkShips
+Description[es]=Un protocolo para el juego KSinkShips
+Description[et]=KSinkShipsi protokoll
+Description[eu]=KSinkShips jokoaren protokoloa
+Description[fr]=Un protocole pour le jeu KSinkShips
+Description[ga]=Pr??tacal le haghaidh an chluiche KSinkShips
+Description[gl]=Un protocolo para o xogo KSinkShips
+Description[it]=Un protocollo per KSinkShips
+Description[km]=??????????????????????????????????????????????????????????????? KSinkShips
+Description[lv]=Protokols sp??lei KSinkShips
+Description[nds]=En Protokoll f??r dat Speel "KSinkShips"
+Description[nl]=Een protocol voor het spel KSinkShips
+Description[nn]=Protokoll for KSinkShips
+Description[pt]=Um protocolo para o jogo KSinkShips
+Description[pt_BR]=Um protocolo para o jogo KSinkShips
+Description[ru]=???????????????? ?????? ???????? KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=???????????????? ???? ?????????????????????????
 Description[sr at latin]=Protokol za K???podmornice
 Description[sv]=Ett protokoll f??r spelet S??nka fartyg
-Description[uk]=???????????????? ?????? ?????? KBattleship
-Description[x-test]=xxA protocol for the game KBattleshipxx
-Description[zh_CN]=KBattleship ??????????????????
-Description[zh_TW]=KBattleship ?????????????????????
+Description[uk]=???????????????? ?????? ?????? KSinkShips
+Description[x-test]=xxA protocol for the game KSinkShipsxx
+Description[zh_CN]=KSinkShips ??????????????????
+Description[zh_TW]=KSinkShips ?????????????????????
 #exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
         ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
               "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     KGlobal::locale()->insertCatalog("libkdegames");
diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
--- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
@@ -3,7 +3,7 @@ Type=Application
 Exec=ktron -caption "%c" %i
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
+GenericName=Snake Duel Game
 GenericName[ca]=Joc similar al Tron
 GenericName[cs]=Hra typu Tron
 GenericName[da]=Tron-lignende spil
@@ -29,20 +29,20 @@ GenericName[sr]=???????? ?????????? ????
 GenericName[sr at latin]=Igra nalik na tron
 GenericName[sv]=Tron-liknande spel
 GenericName[uk]=??????, ?????????? ???? Tron
-GenericName[x-test]=xxTron-like Gamexx
+GenericName[x-test]=xxSnake Duel Gamexx
 GenericName[zh_CN]=?????? Tron ?????????
 GenericName[zh_TW]=?????? Tron ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
 Name[bn]=??????-????????????
 Name[ru]=????????
 Name[sr]=?????????????
 Name[sr at latin]=K???tron
-Name[sv]=Ktron
+Name[sv]=KsnakeDuel
 Name[ta]=K??????????????????
 Name[tg]=K????????
-Name[x-test]=xxKTronxx
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
--- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- kdegames.spec	4 Sep 2009 17:03:20 -0000	1.132
+++ kdegames.spec	10 Sep 2009 14:29:00 -0000	1.133
@@ -1,15 +1,15 @@
-%define _default_patch_fuzz 2
+
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
-Patch0:  kdegames-4.3.0-trademarks.patch
+Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,8 +98,8 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -208,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- adjust trademarks patch to include ktron.desktop
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


--- kdegames-4.3.0-trademarks.patch DELETED ---



From sergiopr at fedoraproject.org  Thu Sep 10 14:30:08 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Thu, 10 Sep 2009 14:30:08 +0000 (UTC)
Subject: rpms/CCfits/devel CCfits-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 CCfits-1.6-removerpath.patch, 1.1, 1.2 CCfits.spec, 1.18,
	1.19 sources, 1.8, 1.9 CCfits-includecfitsiopath.patch, 1.3, NONE
Message-ID: <20090910143008.8AB6E11C043D@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/CCfits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1696

Modified Files:
	.cvsignore CCfits-1.6-removerpath.patch CCfits.spec sources 
Added Files:
	CCfits-pkgconfig.patch 
Removed Files:
	CCfits-includecfitsiopath.patch 
Log Message:
* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
- New upstream version, includes pkgconfig file


CCfits-pkgconfig.patch:
 CCfits.pc.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE CCfits-pkgconfig.patch ---
diff -ur CCfits/CCfits.pc.in CCfits.pkg/CCfits.pc.in
--- CCfits/CCfits.pc.in	2009-09-02 16:34:32.000000000 +0200
+++ CCfits.pkg/CCfits.pc.in	2009-09-10 16:24:41.000000000 +0200
@@ -5,8 +5,8 @@
 
 Name: CCfits
 Description: Object Oriented C++ Interface to CFITSIO Library
-Requires: cfitsio
+Requires.private: cfitsio > 3.08
 Version: 2.2
-Libs: -L${libdir} -lCCfits @LIBS@
+Libs: -L${libdir} -lCCfits
 Cflags: -I${includedir}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Dec 2008 15:01:43 -0000	1.8
+++ .cvsignore	10 Sep 2009 14:30:07 -0000	1.9
@@ -1,2 +1 @@
-CCfits-2.0.tar.gz
-CCfits-2.1.tar.gz
+CCfits-2.2.tar.gz

CCfits-1.6-removerpath.patch:
 Makefile.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: CCfits-1.6-removerpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits-1.6-removerpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- CCfits-1.6-removerpath.patch	11 Dec 2006 17:37:11 -0000	1.1
+++ CCfits-1.6-removerpath.patch	10 Sep 2009 14:30:07 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur CCfits.old/Makefile.in CCfits/Makefile.in
---- CCfits.old/Makefile.in	2006-12-11 18:33:17.000000000 +0100
-+++ CCfits/Makefile.in	2006-12-11 18:32:32.000000000 +0100
-@@ -241,12 +241,12 @@
+diff -ur CCfits/Makefile.in CCfits.rpath/Makefile.in
+--- CCfits/Makefile.in	2009-09-09 17:48:28.000000000 +0200
++++ CCfits.rpath/Makefile.in	2009-09-10 14:28:27.000000000 +0200
+@@ -244,12 +244,12 @@
  # generation like gcc does
  AUTOMAKE_OPTIONS = foreign # no-dependencies
  SUBDIRS = vs.net
@@ -13,14 +13,16 @@ diff -ur CCfits.old/Makefile.in CCfits/M
  cookbook_LDADD = libCCfits.la
 -cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
 +cookbook_LDFLAGS = 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = CCfits.pc
  INCLUDES = -I$(top_srcdir)/..
- lib_LTLIBRARIES = libCCfits.la
- libCCfits_la_SOURCES = \
-@@ -273,7 +273,7 @@
+@@ -277,8 +277,8 @@
+ 
  # This will tell shared library which STD C++ library to use without
  # needing the user to use LD_LIBRARY_PATH environment variable
- libCCfits_la_LIBADD = $(LIBSTDCPP)
+-libCCfits_la_LIBADD = $(LIBSTDCPP)
 -libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
++libCCfits_la_LIBADD = 
 +libCCfits_la_LDFLAGS = 
  libCCfits_ladir = $(pkgincludedir)
  libCCfits_la_HEADERS = \


Index: CCfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- CCfits.spec	24 Jul 2009 15:01:47 -0000	1.18
+++ CCfits.spec	10 Sep 2009 14:30:08 -0000	1.19
@@ -1,6 +1,6 @@
 Name: CCfits
-Version: 2.1
-Release: 5%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
@@ -8,10 +8,11 @@ License: BSD
 URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits
 Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz
 Patch0: CCfits-1.6-removerpath.patch
-Patch1: CCfits-includecfitsiopath.patch
+Patch1: CCfits-pkgconfig.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel >= 3.130
+Requires: pkgconfig
 
 %description
 CCfits is an object oriented interface to the cfitsio library. It is designed 
@@ -40,21 +41,18 @@ This package contains the full API docum
 %setup -q -n CCfits
 %patch0 -p1
 %patch1 -p1
-#%{__sed} -e 's|#include "fitsio.h"|#include <cfitsio/fitsio.h>|g' -i CCfits.h FITSBase.h
-#%{__sed} -e 's|#include "longnam.h"|#include <cfitsio/longnam.h>|g' -i CCfits.h FITSBase.h
-# Remove perl files in html docs
-%{__rm} -rf %{_builddir}/%{name}/html/*.pl
+rm -rf %{_builddir}/%{name}/html/*.pl
 
 %build
 %configure --disable-static --with-cfitsio=%{_prefix} --with-cfitsio-include=%{_includedir}/cfitsio
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} %{?_smp_mflags}  install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make %{?_smp_mflags}  install DESTDIR=%{buildroot}
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -70,6 +68,7 @@ This package contains the full API docum
 %doc CHANGES 
 %exclude %{_bindir}/cookbook
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 %exclude %{_libdir}/*.la
 %{_includedir}/*
 
@@ -78,6 +77,9 @@ This package contains the full API docum
 %doc html
 
 %changelog
+* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
+- New upstream version, includes pkgconfig file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Dec 2008 15:01:43 -0000	1.8
+++ sources	10 Sep 2009 14:30:08 -0000	1.9
@@ -1,2 +1 @@
-bb049a22f9ff50ef983633dd270f5dbd  CCfits-2.0.tar.gz
-5ce1135efe2bfcbf7b94e10d1d483c71  CCfits-2.1.tar.gz
+68e07adea9ecfb6aba0ac082111053cf  CCfits-2.2.tar.gz


--- CCfits-includecfitsiopath.patch DELETED ---



From rdieter at fedoraproject.org  Thu Sep 10 14:30:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Sep 2009 14:30:31 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.3.1-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.120, 1.121 kdegames-4.3.0-trademarks.patch,
	1.1, NONE
Message-ID: <20090910143031.9428711C02C8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.1-trademarks.patch 
Removed Files:
	kdegames-4.3.0-trademarks.patch 
Log Message:
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- adjust trademarks patch to include ktron.desktop


kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   12 ++++----
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 76 insertions(+), 71 deletions(-)

--- NEW FILE kdegames-4.3.1-trademarks.patch ---
diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kbattleship;">
+  <!ENTITY kappname "<application>KSinkShips</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,16 +57,17 @@
 
 <abstract>
 <para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for &kde;.</para>
+&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
 <keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</keyword>
 </keywordset>
 
 </bookinfo>
@@ -76,7 +77,7 @@
 <note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.-->
 <note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It can be: One, Two,..., Multiplayer-->
 <para>
-&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
+&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
 ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
 </para>
 </chapter>
@@ -85,14 +86,14 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -61,7 +61,7 @@
 
 <abstract>
 <para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -69,11 +69,12 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
 Name[be]=???????????? ??????
 Name[bn]=??????-??????????????????????????????
 Name[cs]=Lod??
@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
 Name[ro]=B??t??lie naval??
 Name[sr]=?????????????????????????
 Name[sr at latin]=K???podmornice
-Name[sv]=Kbattleship
 Name[ta]=??????????????????????????????????????????
 Name[tg]=K?????????? ??????????????
 Name[uk]=???????????????? ??????
-Name[x-test]=xxKBattleshipxx
-Name[zh_TW]=KBattleship ??????
+Name[x-test]=xxKSinkShipsxx
+Name[zh_TW]=KSinkShips ??????
 Exec=kbattleship -caption "%c"
 Icon=kbattleship
 Type=Application
 X-DocPath=kbattleship/index.html
-GenericName=Battleship Game
+GenericName=Ship Sinking Game
 GenericName[be]=???????????? ?? ???????????? ??????
 GenericName[bn]=?????????????????????????????? ????????????
 GenericName[ca]=Joc d'enfonsar la flota
@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
 GenericName[cy]=G??m Longau Rhyfel
 GenericName[da]=S??nke slagskibe-spil
 GenericName[de]=Schiffe versenken
-GenericName[el]=???????????????? Battleship
 GenericName[eo]=Batal??ipa ludo
 GenericName[es]=Juego de la batalla de naves
 GenericName[et]=Laevade pommitamise m??ng
@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
 GenericName[fa]=???????? ?????? ???????????????
 GenericName[fi]=Meritaistelupeli
 GenericName[fr]=Jeu de bataille navale
-GenericName[ga]=Cluiche cos??il le "Battleship"
 GenericName[gl]=Xogo de batalla naval
 GenericName[he]=???????? ????????????
 GenericName[hne]=????????????????????? ?????????
@@ -74,7 +70,7 @@ GenericName[ta]=????????????????????????
 GenericName[tr]=Amiral Batt?? Oyunu
 GenericName[uk]=?????? ?? ???????????????? ??????
 GenericName[wa]=Djeu di batreye di bateas
-GenericName[x-test]=xxBattleship Gamexx
+GenericName[x-test]=xxShip Sinking Gamexx
 GenericName[zh_CN]=??????????????????
 GenericName[zh_TW]=????????????
 Terminal=false
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
@@ -5,34 +5,34 @@ input=none
 output=none
 
 Icon=kbattleship
-Description=A protocol for the game KBattleship
-Description[ca]=Un protocol pel joc KBattleship
-Description[da]=En protokol for spillet KBattleship
-Description[de]=Ein Protokoll f??r das KBattleship-Spiel.
-Description[el]=?????? ???????????????????? ?????? ???? ???????????????? KBattleship
-Description[es]=Un protocolo para el juego KBattleship
-Description[et]=KBattleshipi protokoll
-Description[eu]=KBattleship jokoaren protokoloa
-Description[fr]=Un protocole pour le jeu KBattleship
-Description[ga]=Pr??tacal le haghaidh an chluiche KBattleship
-Description[gl]=Un protocolo para o xogo KBattleship
-Description[it]=Un protocollo per KBattleship
-Description[km]=??????????????????????????????????????????????????????????????? KBattleship
-Description[lv]=Protokols sp??lei KBattleship
-Description[nds]=En Protokoll f??r dat Speel "KBattleship"
-Description[nl]=Een protocol voor het spel KBattleship
-Description[nn]=Protokoll for KBattleship
-Description[pt]=Um protocolo para o jogo KBattleship
-Description[pt_BR]=Um protocolo para o jogo KBattleship
-Description[ru]=???????????????? ?????? ???????? KBattleship
-Description[sl]=Protokol za igro KBattleship
+Description=A protocol for the game KSinkShips
+Description[ca]=Un protocol pel joc KSinkShips
+Description[da]=En protokol for spillet KSinkShips
+Description[de]=Ein Protokoll f??r das KSinkShips-Spiel.
+Description[el]=?????? ???????????????????? ?????? ???? ???????????????? KSinkShips
+Description[es]=Un protocolo para el juego KSinkShips
+Description[et]=KSinkShipsi protokoll
+Description[eu]=KSinkShips jokoaren protokoloa
+Description[fr]=Un protocole pour le jeu KSinkShips
+Description[ga]=Pr??tacal le haghaidh an chluiche KSinkShips
+Description[gl]=Un protocolo para o xogo KSinkShips
+Description[it]=Un protocollo per KSinkShips
+Description[km]=??????????????????????????????????????????????????????????????? KSinkShips
+Description[lv]=Protokols sp??lei KSinkShips
+Description[nds]=En Protokoll f??r dat Speel "KSinkShips"
+Description[nl]=Een protocol voor het spel KSinkShips
+Description[nn]=Protokoll for KSinkShips
+Description[pt]=Um protocolo para o jogo KSinkShips
+Description[pt_BR]=Um protocolo para o jogo KSinkShips
+Description[ru]=???????????????? ?????? ???????? KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=???????????????? ???? ?????????????????????????
 Description[sr at latin]=Protokol za K???podmornice
 Description[sv]=Ett protokoll f??r spelet S??nka fartyg
-Description[uk]=???????????????? ?????? ?????? KBattleship
-Description[x-test]=xxA protocol for the game KBattleshipxx
-Description[zh_CN]=KBattleship ??????????????????
-Description[zh_TW]=KBattleship ?????????????????????
+Description[uk]=???????????????? ?????? ?????? KSinkShips
+Description[x-test]=xxA protocol for the game KSinkShipsxx
+Description[zh_CN]=KSinkShips ??????????????????
+Description[zh_TW]=KSinkShips ?????????????????????
 #exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
         ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
               "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     KGlobal::locale()->insertCatalog("libkdegames");
diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
--- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
@@ -3,7 +3,7 @@ Type=Application
 Exec=ktron -caption "%c" %i
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
+GenericName=Snake Duel Game
 GenericName[ca]=Joc similar al Tron
 GenericName[cs]=Hra typu Tron
 GenericName[da]=Tron-lignende spil
@@ -29,20 +29,20 @@ GenericName[sr]=???????? ?????????? ????
 GenericName[sr at latin]=Igra nalik na tron
 GenericName[sv]=Tron-liknande spel
 GenericName[uk]=??????, ?????????? ???? Tron
-GenericName[x-test]=xxTron-like Gamexx
+GenericName[x-test]=xxSnake Duel Gamexx
 GenericName[zh_CN]=?????? Tron ?????????
 GenericName[zh_TW]=?????? Tron ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
 Name[bn]=??????-????????????
 Name[ru]=????????
 Name[sr]=?????????????
 Name[sr at latin]=K???tron
-Name[sv]=Ktron
+Name[sv]=KsnakeDuel
 Name[ta]=K??????????????????
 Name[tg]=K????????
-Name[x-test]=xxKTronxx
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
--- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- kdegames.spec	4 Sep 2009 17:00:37 -0000	1.120
+++ kdegames.spec	10 Sep 2009 14:30:31 -0000	1.121
@@ -1,15 +1,15 @@
-%define _default_patch_fuzz 2
+
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
-Patch0:  kdegames-4.3.0-trademarks.patch
+Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,8 +98,8 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -208,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- adjust trademarks patch to include ktron.desktop
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


--- kdegames-4.3.0-trademarks.patch DELETED ---



From clumens at fedoraproject.org  Thu Sep 10 14:33:03 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 10 Sep 2009 14:33:03 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.114, 1.115 pykickstart.spec,
	1.125, 1.126 sources, 1.124, 1.125
Message-ID: <20090910143303.8E99411C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6038

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- .cvsignore	27 Aug 2009 19:47:02 -0000	1.114
+++ .cvsignore	10 Sep 2009 14:33:03 -0000	1.115
@@ -48,3 +48,4 @@ pykickstart-1.58.tar.gz
 pykickstart-1.59.tar.gz
 pykickstart-1.60.tar.gz
 pykickstart-1.61.tar.gz
+pykickstart-1.62.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- pykickstart.spec	27 Aug 2009 19:47:03 -0000	1.125
+++ pykickstart.spec	10 Sep 2009 14:33:03 -0000	1.126
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.61
+Version: 1.62
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> - 1.62-1
+- Support translated help text in optparse (#479519).
+- If the input kickstart file cannot be read, raise IOError (#519477).
+
 * Thu Aug 27 2009 Chris Lumens <clumens at redhat.com> - 1.61-1
 - Include the error messages from URLGrabError in the exception (#518443).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- sources	27 Aug 2009 19:47:03 -0000	1.124
+++ sources	10 Sep 2009 14:33:03 -0000	1.125
@@ -1 +1 @@
-0e5f85da22ecda5a8ab588264a0b21c8  pykickstart-1.61.tar.gz
+46d0a1496433bdf05503bc47542c5bb0  pykickstart-1.62.tar.gz



From nhorman at fedoraproject.org  Thu Sep 10 14:36:34 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Thu, 10 Sep 2009 14:36:34 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.150, 1.151 sources, 1.22,
	1.23
Message-ID: <20090910143634.7F8F011C00DB@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8969

Modified Files:
	kexec-tools.spec sources 
Log Message:
Resolves: bz522486


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kexec-tools.spec	14 Aug 2009 13:30:27 -0000	1.150
+++ kexec-tools.spec	10 Sep 2009 14:36:34 -0000	1.151
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -261,6 +261,9 @@ done
 
 
 %changelog
+* Thu Sep 10 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-25
+- Fix dracut module check file (bz 522486)
+
 * Thu Aug 13 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-24
 - update kdump adv conf init script & dracut module
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	14 Aug 2009 13:30:27 -0000	1.22
+++ sources	10 Sep 2009 14:36:34 -0000	1.23
@@ -1,4 +1,4 @@
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 190f8878aa7e7b63a96fde5d59538eec  makedumpfile-1.3.3.tar.gz
-827939e16fc1af25ecddb0d4ef9e2bb2  dracut-files.tbz2
+1c240b7c727d44c5a3e1ef2d59a4f80d  dracut-files.tbz2



From nhorman at fedoraproject.org  Thu Sep 10 14:36:34 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Thu, 10 Sep 2009 14:36:34 +0000 (UTC)
Subject: rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase check, 1.2, 
	1.3
Message-ID: <20090910143634.AE3AB11C00DB@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8969/kdump_dracut_modules/99kdumpbase

Added Files:
	check 
Log Message:
Resolves: bz522486


Index: check
===================================================================
RCS file: check
diff -N check
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ check	10 Sep 2009 14:36:34 -0000	1.3
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+#do not add this module by default
+exit 1
+



From wtogami at fedoraproject.org  Thu Sep 10 14:37:27 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 14:37:27 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.122,1.123
Message-ID: <20090910143727.5ECFC11C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9368

Modified Files:
	spamassassin.spec 
Log Message:
we don't want sandbox



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- spamassassin.spec	10 Sep 2009 14:04:28 -0000	1.122
+++ spamassassin.spec	10 Sep 2009 14:37:27 -0000	1.123
@@ -36,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename mcsnapshot
-Release: 0.9.%{prename}%{?dist}
+Release: 0.10.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -162,6 +162,7 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 #tar xfvz %{SOURCE1}
 #cd -
 cp rules/*.cf $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/70_sandbox.cf
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -227,7 +228,7 @@ fi
 exit 0
 
 %changelog
-* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.9.mcsnapshot
+* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.10.mcsnapshot
 - numerous bugs fixed
 - this snapshot is used during masscheck underway until
   September 17th in order to determine the base scores for spamassassin-3.3.0.



From than at fedoraproject.org  Thu Sep 10 14:38:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 10 Sep 2009 14:38:49 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.145,1.146
Message-ID: <20090910143849.0FDA911C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9812

Modified Files:
	kdegames.spec 
Log Message:
- drop ktron/kbattleship in RHEL



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- kdegames.spec	10 Sep 2009 13:56:08 -0000	1.145
+++ kdegames.spec	10 Sep 2009 14:38:48 -0000	1.146
@@ -3,7 +3,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -66,9 +66,11 @@ Games for the K Desktop Environment 4, i
 * kreversi
 * ksame
 * kshisen
-* ksinkships
 * ksirk
+%if 0%{?fedora}
 * ksnakeduel / ksnake
+* ksinkships
+%endif
 * kspaceduel
 * ksquares
 * ksudoku
@@ -98,8 +100,15 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-
 %build
+# trademarks issue in RHEL
+%if 0%{?fedora} == 0
+sed -i -e "s,macro_optional_add_subdirectory(kbattleship),,g" CMakeLists.txt
+sed -i -e "s,macro_optional_add_subdirectory(ktron),,g" CMakeLists.txt
+sed -i -e "s,add_subdirectory(kbattleship),,g" doc/CMakeLists.txt
+sed -i -e "s,add_subdirectory(ktron),,g" doc/CMakeLists.txt
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -114,7 +123,9 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
+%endif
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
 %endif
@@ -128,7 +139,9 @@ done
 
 %post
 %if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%endif
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 %endif
@@ -156,7 +169,9 @@ fi
 %if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
+%if 0%{?fedora}
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%endif
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
@@ -182,15 +197,15 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/sounds/kapman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
+%if 0%{?fedora}
 %{_kde4_datadir}/kde4/services/kbattleship.protocol
+%endif
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %if 0%{?_skip_ggzconfig:1}
-%{_ggz_datadir}/kbattleship.dsc
-%{_ggz_datadir}/kreversi.dsc
-%{_ggz_datadir}/ksquares.dsc
+%{_ggz_datadir}/*.dsc
 %else
 %{_ggz_configdir}/ggz.modules.d/kdegames
 %endif
@@ -208,6 +223,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- drop ktron/kbattleship in RHEL
+
 * Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - adjust trademarks patch to include ktron.desktop
 



From clumens at fedoraproject.org  Thu Sep 10 14:41:19 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 10 Sep 2009 14:41:19 +0000 (UTC)
Subject: rpms/python-meh/devel .cvsignore, 1.3, 1.4 python-meh.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090910144119.C772B11C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10686

Modified Files:
	.cvsignore python-meh.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Aug 2009 17:01:51 -0000	1.3
+++ .cvsignore	10 Sep 2009 14:41:19 -0000	1.4
@@ -1,2 +1,3 @@
 python-meh-0.1.tar.gz
 python-meh-0.2.tar.gz
+python-meh-0.3.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/python-meh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-meh.spec	19 Aug 2009 17:01:51 -0000	1.2
+++ python-meh.spec	10 Sep 2009 14:41:19 -0000	1.3
@@ -3,7 +3,7 @@
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: http://git.fedoraproject.org/git/?p=python-meh.git
-Version: 0.2
+Version: 0.3
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_datadir}/python-meh
 
 %changelog
+* Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> - 0.3-1
+- Pull in lots of new translations (#522410).
+
 * Wed Aug 19 2009 Chris Lumens <clumens at redhat.com> - 0.2-1
 - Add a title to the main exception dialog so it looks right in anaconda.
 - Don't include an extra '/' in the displayed bug URL (#517515).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Aug 2009 17:01:51 -0000	1.3
+++ sources	10 Sep 2009 14:41:19 -0000	1.4
@@ -1 +1 @@
-dbc5bc5e15f79913d079a6f80be38717  python-meh-0.2.tar.gz
+b42add54722627bb9225a3461a6bd2e7  python-meh-0.3.tar.gz



From awjb at fedoraproject.org  Thu Sep 10 14:46:02 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu, 10 Sep 2009 14:46:02 +0000 (UTC)
Subject: rpms/wine/devel wine.spec,1.112,1.113
Message-ID: <20090910144602.7F5A211C00DB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14026

Modified Files:
	wine.spec 
Log Message:
- fix #505862



Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- wine.spec	2 Sep 2009 20:36:03 -0000	1.112
+++ wine.spec	10 Sep 2009 14:46:01 -0000	1.113
@@ -1,7 +1,7 @@
 %define no64bit 0
 Name:		wine
 Version:	1.1.29
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -1025,6 +1025,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Thu Sep 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-2
+- rebuild for new gcc (#505862)
+
 * Wed Sep 02 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.29-1
 - version upgrade



From karsten at fedoraproject.org  Thu Sep 10 14:49:01 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 14:49:01 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.175.2.1,1.175.2.2
Message-ID: <20090910144901.780CC11C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18771

Modified Files:
      Tag: pango-1_25_4-2_fc12_branch
	pango.spec 
Log Message:
- false alarm,  another fix was required to fix %post


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.175.2.1
retrieving revision 1.175.2.2
diff -u -p -r1.175.2.1 -r1.175.2.2
--- pango.spec	10 Sep 2009 13:24:48 -0000	1.175.2.1
+++ pango.spec	10 Sep 2009 14:49:01 -0000	1.175.2.2
@@ -95,6 +95,8 @@ esac
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux on s390x
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 # Make sure that the host value that is passed to the compile
 # is the same as the host that we're using in the spec file
@@ -160,7 +162,8 @@ esac
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
-
+# autoconf uses ibm-linux not redhat-linux on s390x
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 case "$host" in
   alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*)
    %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules
@@ -188,6 +191,8 @@ esac
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux (s390x)
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 case "$host" in
   alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*)



From karsten at fedoraproject.org  Thu Sep 10 14:50:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 14:50:35 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.175.2.2,1.175.2.3
Message-ID: <20090910145035.244BA11C043A@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20893

Modified Files:
      Tag: pango-1_25_4-2_fc12_branch
	pango.spec 
Log Message:
- fix changelog


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.175.2.2
retrieving revision 1.175.2.3
diff -u -p -r1.175.2.2 -r1.175.2.3
--- pango.spec	10 Sep 2009 14:49:01 -0000	1.175.2.2
+++ pango.spec	10 Sep 2009 14:50:34 -0000	1.175.2.3
@@ -230,7 +230,7 @@ fi
 
 %changelog
 * Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2.1
-- drop s390x autoconf fixes as autoconf now just works as expected
+- another s390x autoconf fix for %post
 
 * Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2
 - fix autoconf host on s390x



From wtogami at fedoraproject.org  Thu Sep 10 14:57:31 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 14:57:31 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.123,1.124
Message-ID: <20090910145731.B6EF311C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26442

Modified Files:
	spamassassin.spec 
Log Message:
remove plugins that were adding deps, but the plugins were not being used



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- spamassassin.spec	10 Sep 2009 14:37:27 -0000	1.123
+++ spamassassin.spec	10 Sep 2009 14:57:31 -0000	1.124
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-#%%define rhel 5
+%define rhel 5
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -36,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename mcsnapshot
-Release: 0.10.%{prename}%{?dist}
+Release: 0.11.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -163,6 +163,8 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 #cd -
 cp rules/*.cf $RPM_BUILD_ROOT%{_datadir}/spamassassin/
 rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/70_sandbox.cf
+rm -f /usr/lib/perl5/vendor_perl/5.10.0/Mail/SpamAssassin/Util/MemoryDump.pm
+rm -f /usr/lib/perl5/vendor_perl/5.10.0/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -228,7 +230,7 @@ fi
 exit 0
 
 %changelog
-* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.10.mcsnapshot
+* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.11.mcsnapshot
 - numerous bugs fixed
 - this snapshot is used during masscheck underway until
   September 17th in order to determine the base scores for spamassassin-3.3.0.



From pkgdb at fedoraproject.org  Thu Sep 10 14:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 14:58:01 +0000
Subject: [pkgdb] elfutils: mjw has requested watchcommits
Message-ID: <20090910145801.71D8110F87E@bastion2.fedora.phx.redhat.com>

mjw has requested the watchcommits acl on elfutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/elfutils



From pkgdb at fedoraproject.org  Thu Sep 10 14:58:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 14:58:09 +0000
Subject: [pkgdb] elfutils: mjw has requested commit
Message-ID: <20090910145809.8003010F895@bastion2.fedora.phx.redhat.com>

mjw has requested the commit acl on elfutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/elfutils



From pkgdb at fedoraproject.org  Thu Sep 10 14:58:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 14:58:13 +0000
Subject: [pkgdb] elfutils: mjw has requested watchbugzilla
Message-ID: <20090910145813.757DF10F898@bastion2.fedora.phx.redhat.com>

mjw has requested the watchbugzilla acl on elfutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/elfutils



From clumens at fedoraproject.org  Thu Sep 10 15:21:25 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 10 Sep 2009 15:21:25 +0000 (UTC)
Subject: rpms/firstboot/devel .cvsignore, 1.100, 1.101 firstboot.spec, 1.136,
	1.137 sources, 1.130, 1.131
Message-ID: <20090910152126.09B0E11C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1190

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	11 Aug 2009 18:27:49 -0000	1.100
+++ .cvsignore	10 Sep 2009 15:21:24 -0000	1.101
@@ -72,3 +72,4 @@ firstboot-1.104.tar.bz2
 firstboot-1.105.tar.bz2
 firstboot-1.107.tar.bz2
 firstboot-1.108.tar.bz2
+firstboot-1.109.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- firstboot.spec	11 Aug 2009 18:27:49 -0000	1.136
+++ firstboot.spec	10 Sep 2009 15:21:24 -0000	1.137
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 1.108
+Version: 1.109
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -73,6 +73,12 @@ fi
 %{_datadir}/firstboot/themes/default/*
 
 %changelog
+* Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> 1.109-1
+- Change the init script return value for LSB purposes (atodorov, #521828).
+- We don't really need an X log file anymore (#521387).
+- Pull in updated translations.
+- Improve logging when modules cannot be loaded (jlaska).
+
 * Tue Aug 11 2009 Chris Lumens <clumens at redhat.com> 1.108-1
 - Move python-meh initialization to after we have gtk imported (#515419).
 - Do @VERSION@ substitution on progs/firstboot.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- sources	11 Aug 2009 18:27:49 -0000	1.130
+++ sources	10 Sep 2009 15:21:24 -0000	1.131
@@ -1 +1,2 @@
 335f9855f49de44300f64f8482dc0e9a  firstboot-1.108.tar.bz2
+9b70cb90b6801a13fc573a22665b80a0  firstboot-1.109.tar.bz2



From s4504kr at fedoraproject.org  Thu Sep 10 15:25:20 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 10 Sep 2009 15:25:20 +0000 (UTC)
Subject: rpms/ksplice/devel .cvsignore, 1.9, 1.10 ksplice.spec, 1.17,
	1.18 sources, 1.9, 1.10 ksplice-0.9.4-config.patch, 1.1, NONE
Message-ID: <20090910152520.0A22511C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2366

Modified Files:
	.cvsignore ksplice.spec sources 
Removed Files:
	ksplice-0.9.4-config.patch 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Mar 2009 18:01:30 -0000	1.9
+++ .cvsignore	10 Sep 2009 15:25:19 -0000	1.10
@@ -1 +1 @@
-ksplice-0.9.7-src.tar.gz
+ksplice-0.9.9-src.tar.gz


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ksplice.spec	25 Jul 2009 04:49:39 -0000	1.17
+++ ksplice.spec	10 Sep 2009 15:25:19 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		ksplice
-Version:	0.9.7
-Release:	4%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
 Group:		System Environment/Kernel
@@ -8,9 +8,6 @@ License:	GPLv2
 URL:		http://ksplice.com
 Source0:	http://ksplice.com/dist/ksplice-%{version}-src.tar.gz
 
-# Sent to upstream via email
-Patch0:		ksplice-0.9.4-config.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:	%{ix86} x86_64
@@ -39,7 +36,6 @@ any way.
 
 %prep
 %setup -q
-%patch0 -p1 -b .auto
 
 # Filter ksplce as a provide
 
@@ -63,7 +59,7 @@ chmod +x %{__perl_requires}
 
 %build
 autoconf
-%configure  --with-libz --with-libbfd --with-libiberty
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -84,7 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-4
+* Wed Sep  9 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.9-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.9.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.7-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Mar 2009 18:01:30 -0000	1.9
+++ sources	10 Sep 2009 15:25:19 -0000	1.10
@@ -1 +1 @@
-79bc8aa5275c026e3bd4092da93cb996  ksplice-0.9.7-src.tar.gz
+ceb4301c51d9b075731050b57d9ecd80  ksplice-0.9.9-src.tar.gz


--- ksplice-0.9.4-config.patch DELETED ---



From dwalsh at fedoraproject.org  Thu Sep 10 15:31:02 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Sep 2009 15:31:02 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.76,
	1.77 selinux-policy.spec, 1.915, 1.916
Message-ID: <20090910153102.9F9BB11C02C8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6068

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-2
- Update to upstream
- Fixes for devicekit_disk


policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   10 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  290 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    2 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  390 +++++---
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  151 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   51 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    2 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   88 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  276 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |   36 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1399 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 311 files changed, 14803 insertions(+), 2601 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- policy-F12.patch	9 Sep 2009 21:08:01 -0000	1.76
+++ policy-F12.patch	10 Sep 2009 15:31:01 -0000	1.77
@@ -1055,8 +1055,16 @@ diff -b -B --ignore-all-space --exclude-
  	')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.31/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/usermanage.te	2009-09-09 15:38:24.000000000 -0400
-@@ -209,6 +209,7 @@
++++ serefpolicy-3.6.31/policy/modules/admin/usermanage.te	2009-09-09 17:19:45.000000000 -0400
+@@ -197,6 +197,7 @@
+ selinux_compute_relabel_context(groupadd_t)
+ selinux_compute_user_contexts(groupadd_t)
+ 
++term_use_console(groupadd_t)
+ term_use_all_user_ttys(groupadd_t)
+ term_use_all_user_ptys(groupadd_t)
+ 
+@@ -209,6 +210,7 @@
  files_manage_etc_files(groupadd_t)
  files_relabel_etc_files(groupadd_t)
  files_read_etc_runtime_files(groupadd_t)
@@ -1064,7 +1072,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Execute /usr/bin/{passwd, chfn, chsh} and /usr/sbin/{useradd, vipw}.
  corecmd_exec_bin(groupadd_t)
-@@ -218,14 +219,11 @@
+@@ -218,14 +220,11 @@
  
  miscfiles_read_localization(groupadd_t)
  
@@ -1081,7 +1089,7 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(groupadd_t)
  
-@@ -329,6 +327,7 @@
+@@ -329,6 +328,7 @@
  # user generally runs this from their home directory, so do not audit a search
  # on user home dir
  userdom_dontaudit_search_user_home_content(passwd_t)
@@ -1089,7 +1097,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	nscd_domtrans(passwd_t)
-@@ -446,6 +445,7 @@
+@@ -446,6 +446,7 @@
  corecmd_exec_bin(useradd_t)
  
  domain_use_interactive_fds(useradd_t)
@@ -1097,7 +1105,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_manage_etc_files(useradd_t)
  files_search_var_lib(useradd_t)
-@@ -465,18 +465,16 @@
+@@ -465,18 +466,16 @@
  selinux_compute_relabel_context(useradd_t)
  selinux_compute_user_contexts(useradd_t)
  
@@ -1120,7 +1128,7 @@ diff -b -B --ignore-all-space --exclude-
  
  init_use_fds(useradd_t)
  init_rw_utmp(useradd_t)
-@@ -494,10 +492,8 @@
+@@ -494,10 +493,8 @@
  
  userdom_use_unpriv_users_fds(useradd_t)
  # Add/remove user home directories
@@ -1132,7 +1140,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mta_manage_spool(useradd_t)
  
-@@ -521,6 +517,12 @@
+@@ -521,6 +518,12 @@
  ')
  
  optional_policy(`
@@ -1474,7 +1482,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.31/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/apps/gnome.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/apps/gnome.te	2009-09-09 18:25:28.000000000 -0400
 @@ -9,16 +9,18 @@
  attribute gnomedomain;
  
@@ -1513,7 +1521,7 @@ diff -b -B --ignore-all-space --exclude-
  ##############################
  #
  # Local Policy
-@@ -73,3 +84,83 @@
+@@ -73,3 +84,79 @@
  	xserver_use_xdm_fds(gconfd_t)
  	xserver_rw_xdm_pipes(gconfd_t)
  ')
@@ -1557,8 +1565,6 @@ diff -b -B --ignore-all-space --exclude-
 +        policykit_read_reload(gconfdefaultsm_t)
 +')
 +
-+permissive gconfdefaultsm_t;
-+
 +#######################################
 +#
 +# gnome-system-monitor-mechanisms local policy
@@ -1595,8 +1601,6 @@ diff -b -B --ignore-all-space --exclude-
 +        policykit_read_lib(gnomesystemmm_t)
 +        policykit_read_reload(gnomesystemmm_t)
 +')
-+
-+permissive gnomesystemmm_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.6.31/policy/modules/apps/gpg.te
 --- nsaserefpolicy/policy/modules/apps/gpg.te	2009-09-09 09:23:16.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/apps/gpg.te	2009-09-09 15:38:24.000000000 -0400
@@ -2611,8 +2615,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.31/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/apps/nsplugin.te	2009-09-09 15:38:24.000000000 -0400
-@@ -0,0 +1,289 @@
++++ serefpolicy-3.6.31/policy/modules/apps/nsplugin.te	2009-09-09 17:29:48.000000000 -0400
+@@ -0,0 +1,290 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -2888,6 +2892,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	mozilla_read_user_home_files(nsplugin_config_t)
++	mozilla_write_user_home_files(nsplugin_config_t)
 +')
 +
 +application_signull(nsplugin_t)
@@ -4029,7 +4034,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.6.31/policy/modules/apps/seunshare.te
 --- nsaserefpolicy/policy/modules/apps/seunshare.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/apps/seunshare.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/apps/seunshare.te	2009-09-10 11:29:57.000000000 -0400
 @@ -0,0 +1,37 @@
 +policy_module(seunshare,1.0.0)
 +
@@ -4051,7 +4056,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +allow seunshare_t self:process { fork setexec signal };
-+allow seunshare_t self:capability setpcap;
++allow seunshare_t self:capability { dac_override setpcap sys_admin };
 +allow seunshare_t self:process { getcap setcap };
 +
 +allow seunshare_t self:fifo_file rw_file_perms;
@@ -4700,7 +4705,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.31/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/domain.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/domain.if	2009-09-10 10:26:38.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -4761,10 +4766,29 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to get the
  ##	session ID of all domains.
  ## </summary>
-@@ -1039,6 +1029,35 @@
+@@ -1039,6 +1029,54 @@
  
  ########################################
  ## <summary>
++##	Get the attributes
++##	of all domains unix datagram sockets.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`domain_getattr_all_stream_sockets',`
++	gen_require(`
++		attribute domain;
++	')
++
++	allow $1 domain:unix_stream_socket getattr;
++')
++
++########################################
++## <summary>
 +##	Get the attributes of all domains
 +##	unnamed pipes.
 +## </summary>
@@ -4797,7 +4821,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to get the attributes
  ##	of all domains unnamed pipes.
  ## </summary>
-@@ -1248,18 +1267,34 @@
+@@ -1248,18 +1286,34 @@
  ##	</summary>
  ## </param>
  #
@@ -4835,7 +4859,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Allow specified type to receive labeled
  ##	networking packets from all domains, over
  ##	all protocols (TCP, UDP, etc)
-@@ -1280,6 +1315,24 @@
+@@ -1280,6 +1334,24 @@
  
  ########################################
  ## <summary>
@@ -4860,7 +4884,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Unconfined access to domains.
  ## </summary>
  ## <param name="domain">
-@@ -1304,3 +1357,20 @@
+@@ -1304,3 +1376,20 @@
  	typeattribute $1 process_uncond_exempt;
  ')
  
@@ -8271,7 +8295,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn/conf(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.31/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/apache.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/apache.if	2009-09-10 10:32:22.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8568,10 +8592,30 @@ diff -b -B --ignore-all-space --exclude-
  
  	manage_dirs_pattern($2, httpd_user_script_exec_t, httpd_user_script_exec_t)
  	manage_files_pattern($2, httpd_user_script_exec_t, httpd_user_script_exec_t)
-@@ -504,6 +444,47 @@
+@@ -503,6 +443,66 @@
+ 
  ########################################
  ## <summary>
- ##	Allow the specified domain to read
++##	Allow the specified domain to delete
++##	Apache cache files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`apache_delete_cache_files',`
++	gen_require(`
++		type httpd_cache_t;
++	')
++
++	delete_files_pattern($1, httpd_cache_t, httpd_cache_t)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to read
 +##	apache tmp files.
 +## </summary>
 +## <param name="domain">
@@ -8612,11 +8656,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
-+##	Allow the specified domain to read
+ ##	Allow the specified domain to read
  ##	apache configuration files.
  ## </summary>
- ## <param name="domain">
-@@ -579,7 +560,7 @@
+@@ -579,7 +579,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -8625,7 +8668,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -715,6 +696,7 @@
+@@ -715,6 +715,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -8633,7 +8676,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -782,6 +764,32 @@
+@@ -782,6 +783,32 @@
  
  ########################################
  ## <summary>
@@ -8666,7 +8709,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute all web scripts in the system
  ##	script domain.
  ## </summary>
-@@ -791,16 +799,18 @@
+@@ -791,16 +818,18 @@
  ##	</summary>
  ## </param>
  #
@@ -8689,7 +8732,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -859,6 +869,8 @@
+@@ -859,6 +888,8 @@
  ##	</summary>
  ## </param>
  #
@@ -8698,7 +8741,7 @@ diff -b -B --ignore-all-space --exclude-
  interface(`apache_run_all_scripts',`
  	gen_require(`
  		attribute httpd_exec_scripts, httpd_script_domains;
-@@ -884,7 +896,7 @@
+@@ -884,7 +915,7 @@
  		type httpd_squirrelmail_t;
  	')
  
@@ -8707,7 +8750,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1043,6 +1055,44 @@
+@@ -1043,6 +1074,44 @@
  
  ########################################
  ## <summary>
@@ -8752,7 +8795,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate an apache environment
  ## </summary>
  ## <param name="prefix">
-@@ -1072,11 +1122,17 @@
+@@ -1072,11 +1141,17 @@
  		type httpd_modules_t, httpd_lock_t;
  		type httpd_var_run_t, httpd_php_tmp_t;
  		type httpd_suexec_tmp_t, httpd_tmp_t;
@@ -8770,7 +8813,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_manage_all_content($1)
  	miscfiles_manage_public_files($1)
  
-@@ -1096,12 +1152,57 @@
+@@ -1096,12 +1171,57 @@
  
  	kernel_search_proc($1)
  	allow $1 httpd_t:dir list_dir_perms;
@@ -9936,7 +9979,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive chronyd_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.6.31/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/clamav.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/clamav.te	2009-09-09 18:21:13.000000000 -0400
 @@ -117,9 +117,9 @@
  
  logging_send_syslog_msg(clamd_t)
@@ -9949,7 +9992,7 @@ diff -b -B --ignore-all-space --exclude-
  
  cron_use_fds(clamd_t)
  cron_use_system_job_fds(clamd_t)
-@@ -187,9 +187,9 @@
+@@ -187,15 +187,13 @@
  files_read_etc_files(freshclam_t)
  files_read_etc_runtime_files(freshclam_t)
  
@@ -9961,7 +10004,14 @@ diff -b -B --ignore-all-space --exclude-
  
  clamav_stream_connect(freshclam_t)
  
-@@ -247,5 +247,9 @@
+-cron_use_fds(freshclam_t)
+-cron_use_system_job_fds(freshclam_t)
+-cron_rw_pipes(freshclam_t)
++cron_system_entry(freshclam_t, freshclam_exec_t)
+ 
+ ########################################
+ #
+@@ -247,5 +245,9 @@
  mta_send_mail(clamscan_t)
  
  optional_policy(`
@@ -10699,7 +10749,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.31/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/cron.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/cron.te	2009-09-09 18:02:56.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10974,7 +11024,15 @@ diff -b -B --ignore-all-space --exclude-
  	# via redirection of standard out.
  	optional_policy(`
  		rpm_manage_log(system_cronjob_t)
-@@ -419,6 +490,14 @@
+@@ -412,6 +483,7 @@
+ 	apache_read_config(system_cronjob_t)
+ 	apache_read_log(system_cronjob_t)
+ 	apache_read_sys_content(system_cronjob_t)
++	apache_delete_cache_files(system_cronjob_t)
+ ')
+ 
+ optional_policy(`
+@@ -419,6 +491,14 @@
  ')
  
  optional_policy(`
@@ -10989,7 +11047,7 @@ diff -b -B --ignore-all-space --exclude-
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -429,11 +508,20 @@
+@@ -429,11 +509,20 @@
  ')
  
  optional_policy(`
@@ -11010,7 +11068,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -445,9 +533,11 @@
+@@ -445,9 +534,11 @@
  ')	
  
  optional_policy(`
@@ -11024,7 +11082,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -461,8 +551,8 @@
+@@ -461,8 +552,8 @@
  ')
  
  optional_policy(`
@@ -11035,7 +11093,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -470,24 +560,17 @@
+@@ -470,24 +561,17 @@
  ')
  
  optional_policy(`
@@ -11063,7 +11121,7 @@ diff -b -B --ignore-all-space --exclude-
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -571,6 +654,9 @@
+@@ -571,6 +655,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -11073,7 +11131,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`fcron_crond', `
  	allow crond_t user_cron_spool_t:file manage_file_perms;
  ')
-@@ -590,13 +676,5 @@
+@@ -590,13 +677,5 @@
  #
  
  optional_policy(`
@@ -11533,7 +11591,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 devicekit_t:process { ptrace signal_perms getattr };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.31/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/devicekit.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/devicekit.te	2009-09-10 10:27:07.000000000 -0400
 @@ -36,12 +36,15 @@
  manage_dirs_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
  manage_files_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
@@ -11573,13 +11631,14 @@ diff -b -B --ignore-all-space --exclude-
  kernel_setsched(devicekit_disk_t)
  
  corecmd_exec_bin(devicekit_disk_t)
-@@ -79,21 +87,30 @@
+@@ -79,21 +87,31 @@
  dev_rw_sysfs(devicekit_disk_t)
  dev_read_urand(devicekit_disk_t)
  dev_getattr_usbfs_dirs(devicekit_disk_t)
 +dev_manage_generic_files(devicekit_disk_t)
 +
 +domain_read_all_domains_state(devicekit_disk_t)
++domain_getattr_all_stream_sockets(devicekit_disk_t)
  
 +files_getattr_all_mountpoints(devicekit_disk_t)
 +files_getattr_all_files(devicekit_disk_t)
@@ -11605,7 +11664,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(devicekit_disk_t)
  
  miscfiles_read_localization(devicekit_disk_t)
-@@ -110,6 +127,7 @@
+@@ -110,6 +128,7 @@
  ')
  
  optional_policy(`
@@ -11613,7 +11672,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(devicekit_disk_t)
  	policykit_read_lib(devicekit_disk_t)
  	policykit_read_reload(devicekit_disk_t)
-@@ -134,14 +152,22 @@
+@@ -134,14 +153,22 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
@@ -11637,7 +11696,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
  manage_files_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
-@@ -151,6 +177,7 @@
+@@ -151,6 +178,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -11645,7 +11704,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +186,7 @@
+@@ -159,6 +187,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -11653,7 +11712,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_rw_generic_usb_dev(devicekit_power_t)
  dev_rw_netcontrol(devicekit_power_t)
  dev_rw_sysfs(devicekit_power_t)
-@@ -167,12 +195,17 @@
+@@ -167,12 +196,17 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -11671,7 +11730,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_all_users_state(devicekit_power_t)
  
  optional_policy(`
-@@ -180,8 +213,11 @@
+@@ -180,8 +214,11 @@
  ')
  
  optional_policy(`
@@ -11684,7 +11743,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +239,23 @@
+@@ -203,17 +240,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -12370,6 +12429,18 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(inetd_t)
  
  miscfiles_read_localization(inetd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-3.6.31/policy/modules/services/irqbalance.te
+--- nsaserefpolicy/policy/modules/services/irqbalance.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/irqbalance.te	2009-09-10 11:10:00.000000000 -0400
+@@ -22,7 +22,7 @@
+ allow irqbalance_t self:udp_socket create_socket_perms;
+ 
+ dontaudit irqbalance_t self:capability sys_tty_config;
+-allow irqbalance_t self:process signal_perms;
++allow irqbalance_t self:process { getcap setcap signal_perms };
+ 
+ manage_files_pattern(irqbalance_t, irqbalance_var_run_t, irqbalance_var_run_t)
+ files_pid_filetrans(irqbalance_t, irqbalance_var_run_t, file)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.6.31/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/services/kerberos.te	2009-09-09 15:38:24.000000000 -0400
@@ -16022,7 +16093,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.31/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/rpc.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/rpc.if	2009-09-09 17:49:26.000000000 -0400
 @@ -54,7 +54,7 @@
  	allow $1_t self:unix_dgram_socket create_socket_perms;
  	allow $1_t self:unix_stream_socket create_stream_socket_perms;
@@ -21132,7 +21203,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.31/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/init.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/init.if	2009-09-10 10:24:51.000000000 -0400
 @@ -174,6 +174,7 @@
  	role system_r types $1;
  
@@ -21292,6 +21363,15 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Execute all init scripts in the caller domain.
+@@ -1123,7 +1194,7 @@
+ 		type initrc_t;
+ 	')
+ 
+-	allow $1 initrc_t:unix_stream_socket { read write };
++	allow $1 initrc_t:unix_stream_socket rw_socket_perms;
+ ')
+ 
+ ########################################
 @@ -1291,6 +1362,25 @@
  
  ########################################
@@ -21937,9 +22017,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.fc serefpolicy-3.6.31/policy/modules/system/ipsec.fc
 --- nsaserefpolicy/policy/modules/system/ipsec.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/ipsec.fc	2009-09-09 15:38:24.000000000 -0400
-@@ -1,3 +1,5 @@
++++ serefpolicy-3.6.31/policy/modules/system/ipsec.fc	2009-09-10 10:30:53.000000000 -0400
+@@ -1,3 +1,6 @@
 +/etc/rc\.d/init\.d/ipsec	--	gen_context(system_u:object_r:ipsec_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/racoon	--	gen_context(system_u:object_r:ipsec_initrc_exec_t,s0)
 +
  /etc/ipsec\.secrets		--	gen_context(system_u:object_r:ipsec_key_file_t,s0)
  /etc/ipsec\.conf		--	gen_context(system_u:object_r:ipsec_conf_file_t,s0)
@@ -21978,7 +22059,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.31/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/ipsec.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/ipsec.te	2009-09-10 10:33:12.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -22074,7 +22155,15 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ipsec_mgmt_t ipsec_mgmt_lock_t:file manage_file_perms;
  files_lock_filetrans(ipsec_mgmt_t, ipsec_mgmt_lock_t, file)
-@@ -280,6 +297,13 @@
+@@ -241,6 +258,7 @@
+ init_use_script_ptys(ipsec_mgmt_t)
+ init_exec_script_files(ipsec_mgmt_t)
+ init_use_fds(ipsec_mgmt_t)
++init_labeled_script_domtrans(ipsec_mgmt_t, ipsec_initrc_exec_t)
+ 
+ logging_send_syslog_msg(ipsec_mgmt_t)
+ 
+@@ -280,6 +298,13 @@
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
  allow racoon_t self:key_socket create_socket_perms;
@@ -22088,7 +22177,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # manage pid file
  manage_files_pattern(racoon_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -297,6 +321,13 @@
+@@ -297,6 +322,13 @@
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
  
@@ -22102,7 +22191,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(racoon_t)
  corenet_tcp_sendrecv_all_if(racoon_t)
  corenet_udp_sendrecv_all_if(racoon_t)
-@@ -314,6 +345,8 @@
+@@ -314,6 +346,8 @@
  
  files_read_etc_files(racoon_t)
  
@@ -22111,7 +22200,7 @@ diff -b -B --ignore-all-space --exclude-
  # allow racoon to use avc_has_perm to check context on proposed SA
  selinux_compute_access_vector(racoon_t)
  
-@@ -328,6 +361,14 @@
+@@ -328,6 +362,14 @@
  
  miscfiles_read_localization(racoon_t)
  
@@ -22126,7 +22215,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -347,6 +388,7 @@
+@@ -347,6 +389,7 @@
  files_read_etc_files(setkey_t)
  
  init_dontaudit_use_fds(setkey_t)
@@ -23309,14 +23398,36 @@ diff -b -B --ignore-all-space --exclude-
 +	rpc_domtrans_rpcd(unconfined_mount_t)
  ')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.fc serefpolicy-3.6.31/policy/modules/system/raid.fc
+--- nsaserefpolicy/policy/modules/system/raid.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/raid.fc	2009-09-09 17:43:41.000000000 -0400
+@@ -3,3 +3,5 @@
+ /sbin/mdmpd		--	gen_context(system_u:object_r:mdadm_exec_t,s0)
+ 
+ /var/run/mdadm(/.*)?		gen_context(system_u:object_r:mdadm_var_run_t,s0)
++
++/dev/.mdadm.map		--	gen_context(system_u:object_r:mdadm_map_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.6.31/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/raid.te	2009-09-09 15:38:24.000000000 -0400
-@@ -44,11 +44,13 @@
++++ serefpolicy-3.6.31/policy/modules/system/raid.te	2009-09-10 11:15:15.000000000 -0400
+@@ -14,6 +14,9 @@
+ type mdadm_var_run_t;
+ files_pid_file(mdadm_var_run_t)
+ 
++type mdadm_map_t;
++files_type(mdadm_map_t)
++
+ ########################################
+ #
+ # Local policy
+@@ -44,11 +47,16 @@
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
  dev_dontaudit_getattr_generic_blk_files(mdadm_t)
  dev_read_realtime_clock(mdadm_t)
 +dev_read_raw_memory(mdadm_t)
++# create .mdadm files in /dev
++allow mdadm_t mdadm_map_t:file manage_file_perms;
++dev_filetrans(mdadm_t, mdadm_map_t, file)
  
  domain_use_interactive_fds(mdadm_t)
  
@@ -24549,7 +24660,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.31/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/udev.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/udev.te	2009-09-09 17:40:55.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;
@@ -25434,7 +25545,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.31/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/userdomain.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/userdomain.if	2009-09-09 17:50:51.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -25885,7 +25996,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +525,203 @@
+@@ -508,182 +525,207 @@
  	# evolution and gnome-session try to create a netlink socket
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
@@ -26129,14 +26240,17 @@ diff -b -B --ignore-all-space --exclude-
 -		tunable_policy(`allow_user_postgresql_connect',`
 -			postgresql_stream_connect($1_t)
 -			postgresql_tcp_connect($1_t)
--		')
 +		resmgr_stream_connect($1_usertype)
+ 		')
++
++	optional_policy(`
++		rpc_dontaudit_getattr_exports($1_usertype)
++		rpc_manage_nfs_rw_content($1_usertype)
  	')
  
  	optional_policy(`
 -		resmgr_stream_connect($1_t)
-+		rpc_dontaudit_getattr_exports($1_usertype)
-+		rpc_manage_nfs_rw_content($1_usertype)
++		rpcbind_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
@@ -26163,23 +26277,23 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +749,26 @@
+@@ -711,13 +753,26 @@
  
  	userdom_base_user_template($1)
  
 -	userdom_manage_home_role($1_r, $1_t)
 +	userdom_manage_home_role($1_r, $1_usertype)
-+
-+	userdom_manage_tmp_role($1_r, $1_usertype)
-+	userdom_manage_tmpfs_role($1_r, $1_usertype)
  
 -	userdom_manage_tmp_role($1_r, $1_t)
 -	userdom_manage_tmpfs_role($1_r, $1_t)
-+	ifelse(`$1',`unconfined',`',`
-+		gen_tunable(allow_$1_exec_content, true)
++	userdom_manage_tmp_role($1_r, $1_usertype)
++	userdom_manage_tmpfs_role($1_r, $1_usertype)
  
 -	userdom_exec_user_tmp_files($1_t)
 -	userdom_exec_user_home_content_files($1_t)
++	ifelse(`$1',`unconfined',`',`
++		gen_tunable(allow_$1_exec_content, true)
++
 +		tunable_policy(`allow_$1_exec_content',`
 +			userdom_exec_user_tmp_files($1_usertype)
 +			userdom_exec_user_home_content_files($1_usertype)
@@ -26195,7 +26309,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +786,71 @@
+@@ -735,70 +790,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26300,7 +26414,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +887,28 @@
+@@ -835,6 +891,28 @@
  	# Local policy
  	#
  
@@ -26329,7 +26443,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +939,81 @@
+@@ -865,51 +943,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26346,12 +26460,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
++
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
-+
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -26424,7 +26538,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1047,8 @@
+@@ -943,8 +1051,8 @@
  	# Declarations
  	#
  
@@ -26434,7 +26548,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1057,12 @@
+@@ -953,11 +1061,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26449,7 +26563,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1080,53 @@
+@@ -975,36 +1084,53 @@
  		')
  	')
  
@@ -26517,7 +26631,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1162,7 @@
+@@ -1040,7 +1166,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -26526,7 +26640,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1171,7 @@
+@@ -1049,8 +1175,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26536,7 +26650,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1196,9 @@
+@@ -1075,6 +1200,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26546,7 +26660,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1213,7 @@
+@@ -1089,6 +1217,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -26554,7 +26668,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1221,6 @@
+@@ -1096,8 +1225,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26563,7 +26677,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1247,8 @@
+@@ -1124,6 +1251,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -26572,7 +26686,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1277,6 @@
+@@ -1152,20 +1281,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26593,7 +26707,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1322,7 @@
+@@ -1211,6 +1326,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26601,7 +26715,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1388,15 @@
+@@ -1276,11 +1392,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26617,7 +26731,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1507,13 @@
+@@ -1391,12 +1511,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26632,7 +26746,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1546,14 @@
+@@ -1429,6 +1550,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26647,7 +26761,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1569,11 @@
+@@ -1444,9 +1573,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26659,7 +26773,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1630,25 @@
+@@ -1503,6 +1634,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26685,7 +26799,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1723,8 @@
+@@ -1577,6 +1727,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26694,7 +26808,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1818,7 @@
+@@ -1670,6 +1822,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26702,7 +26816,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1946,32 @@
+@@ -1797,19 +1950,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26742,7 +26856,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2006,7 @@
+@@ -1844,6 +2010,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26750,7 +26864,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2554,7 @@
+@@ -2391,27 +2558,7 @@
  
  ########################################
  ## <summary>
@@ -26779,7 +26893,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2908,32 @@
+@@ -2765,11 +2912,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -26814,7 +26928,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3061,25 @@
+@@ -2897,7 +3065,25 @@
  		type user_tmp_t;
  	')
  
@@ -26841,7 +26955,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3116,7 @@
+@@ -2934,6 +3120,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -26849,7 +26963,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3247,559 @@
+@@ -3064,3 +3251,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -p -r1.915 -r1.916
--- selinux-policy.spec	9 Sep 2009 21:08:02 -0000	1.915
+++ selinux-policy.spec	10 Sep 2009 15:31:01 -0000	1.916
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.31
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-2
+- Update to upstream
+- Fixes for devicekit_disk
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-6
 - More fixes
 



From s4504kr at fedoraproject.org  Thu Sep 10 15:35:04 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 10 Sep 2009 15:35:04 +0000 (UTC)
Subject: rpms/ksplice/F-11 ksplice.spec, 1.16, 1.17 sources, 1.9,
	1.10 ksplice-0.9.4-config.patch, 1.1, NONE
Message-ID: <20090910153504.6673111C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8924

Modified Files:
	ksplice.spec sources 
Removed Files:
	ksplice-0.9.4-config.patch 
Log Message:
New upstream release


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-11/ksplice.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ksplice.spec	1 Apr 2009 14:50:20 -0000	1.16
+++ ksplice.spec	10 Sep 2009 15:35:04 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		ksplice
-Version:	0.9.7
-Release:	3%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
 Group:		System Environment/Kernel
@@ -8,9 +8,6 @@ License:	GPLv2
 URL:		http://ksplice.com
 Source0:	http://ksplice.com/dist/ksplice-%{version}-src.tar.gz
 
-# Sent to upstream via email
-Patch0:		ksplice-0.9.4-config.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:	%{ix86} x86_64
@@ -39,7 +36,6 @@ any way.
 
 %prep
 %setup -q
-%patch0 -p1 -b .auto
 
 # Filter ksplce as a provide
 
@@ -63,7 +59,7 @@ chmod +x %{__perl_requires}
 
 %build
 autoconf
-%configure  --with-libz --with-libbfd --with-libiberty
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README
 
 %changelog
+* Wed Sep  9 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.9-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.9.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.7-3
 - Change from ExcludeArch to ExclusiveArch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Mar 2009 18:01:30 -0000	1.9
+++ sources	10 Sep 2009 15:35:04 -0000	1.10
@@ -1 +1 @@
-79bc8aa5275c026e3bd4092da93cb996  ksplice-0.9.7-src.tar.gz
+ceb4301c51d9b075731050b57d9ecd80  ksplice-0.9.9-src.tar.gz


--- ksplice-0.9.4-config.patch DELETED ---



From s4504kr at fedoraproject.org  Thu Sep 10 15:36:28 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 10 Sep 2009 15:36:28 +0000 (UTC)
Subject: rpms/ksplice/F-10 ksplice.spec, 1.12, 1.13 sources, 1.9,
	1.10 ksplice-0.9.4-config.patch, 1.1, NONE
Message-ID: <20090910153628.9935B11C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9498

Modified Files:
	ksplice.spec sources 
Removed Files:
	ksplice-0.9.4-config.patch 
Log Message:
New upstream release


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-10/ksplice.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ksplice.spec	12 Mar 2009 16:34:50 -0000	1.12
+++ ksplice.spec	10 Sep 2009 15:36:28 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		ksplice
-Version:	0.9.7
-Release:	2%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
 Group:		System Environment/Kernel
@@ -8,12 +8,9 @@ License:	GPLv2
 URL:		http://ksplice.com
 Source0:	http://ksplice.com/dist/ksplice-%{version}-src.tar.gz
 
-# Sent to upstream via email
-Patch0:		ksplice-0.9.4-config.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch:	ppc64, ppc
+ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	autoconf
 BuildRequires:	binutils-devel, perl
@@ -39,7 +36,6 @@ any way.
 
 %prep
 %setup -q
-%patch0 -p1 -b .auto
 
 # Filter ksplce as a provide
 
@@ -63,7 +59,7 @@ chmod +x %{__perl_requires}
 
 %build
 autoconf
-%configure  --with-libz --with-libbfd --with-libiberty
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README
 
 %changelog
+* Wed Sep  9 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.9-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.9.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.7-3
+- Change from ExcludeArch to ExclusiveArch
+
 * Wed Mar 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.7-2
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	12 Mar 2009 16:34:50 -0000	1.9
+++ sources	10 Sep 2009 15:36:28 -0000	1.10
@@ -1 +1 @@
-79bc8aa5275c026e3bd4092da93cb996  ksplice-0.9.7-src.tar.gz
+ceb4301c51d9b075731050b57d9ecd80  ksplice-0.9.9-src.tar.gz


--- ksplice-0.9.4-config.patch DELETED ---



From rdieter at fedoraproject.org  Thu Sep 10 15:37:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Sep 2009 15:37:01 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.325,1.326
Message-ID: <20090910153701.2DAD011C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9722

Modified Files:
	qt.spec 
Log Message:
try building with -fno-var-tracking-assignments



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- qt.spec	9 Sep 2009 13:04:25 -0000	1.325
+++ qt.spec	10 Sep 2009 15:37:00 -0000	1.326
@@ -372,6 +372,10 @@ Qt libraries used for drawing widgets an
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
+# hack around (hopefully temporary) gcc borkage
+%if 0%{?fedora} > 11
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
+%endif
 
 %define platform linux-g++
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  



From dwalsh at fedoraproject.org  Thu Sep 10 15:38:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Sep 2009 15:38:44 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.77,1.78
Message-ID: <20090910153844.9B24811C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10361

Modified Files:
	policy-F12.patch 
Log Message:
* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-2
- Update to upstream
- Fixes for devicekit_disk


policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   10 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  290 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  304 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    2 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  120 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  390 +++++---
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  151 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   51 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    2 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   88 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  276 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |   36 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1399 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 311 files changed, 14803 insertions(+), 2601 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- policy-F12.patch	10 Sep 2009 15:31:01 -0000	1.77
+++ policy-F12.patch	10 Sep 2009 15:38:44 -0000	1.78
@@ -18808,7 +18808,7 @@ 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.31/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-10 11:38:03.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -18895,8 +18895,8 @@ 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)
  
-+manage_dirs_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
-+manage_files_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
++manage_dirs_pattern(virtd_t, svirt_cache_t, svirt_cache_t)
++manage_files_pattern(virtd_t, svirt_cache_t, svirt_cache_t)
 +
  manage_dirs_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
  manage_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)



From wtogami at fedoraproject.org  Thu Sep 10 15:40:42 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 15:40:42 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.124,1.125
Message-ID: <20090910154042.616D311C043D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11020

Modified Files:
	spamassassin.spec 
Log Message:
argh



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- spamassassin.spec	10 Sep 2009 14:57:31 -0000	1.124
+++ spamassassin.spec	10 Sep 2009 15:40:42 -0000	1.125
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-%define rhel 5
+#%%define rhel 5
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}



From wtogami at fedoraproject.org  Thu Sep 10 15:50:43 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 15:50:43 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.125,1.126
Message-ID: <20090910155043.2476411C043A@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15809

Modified Files:
	spamassassin.spec 
Log Message:
argh



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- spamassassin.spec	10 Sep 2009 15:40:42 -0000	1.125
+++ spamassassin.spec	10 Sep 2009 15:50:42 -0000	1.126
@@ -163,8 +163,8 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 #cd -
 cp rules/*.cf $RPM_BUILD_ROOT%{_datadir}/spamassassin/
 rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/70_sandbox.cf
-rm -f /usr/lib/perl5/vendor_perl/5.10.0/Mail/SpamAssassin/Util/MemoryDump.pm
-rm -f /usr/lib/perl5/vendor_perl/5.10.0/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
+rm -f /usr/lib/perl5/vendor_perl/*/Mail/SpamAssassin/Util/MemoryDump.pm
+rm -f /usr/lib/perl5/vendor_perl/*/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |



From langel at fedoraproject.org  Thu Sep 10 15:51:45 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 15:51:45 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 .cvsignore, 1.50,
	1.51 java-1.6.0-openjdk-java-access-bridge-security.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.113, 1.114 sources, 1.56,
	1.57 java-1.6.0-openjdk-makefile.patch, 1.12,
	NONE java-1.6.0-openjdk-netxandplugin.patch, 1.1,
	NONE java-1.6.0-openjdk-securitypatches.patch, 1.3, NONE
Message-ID: <20090910155145.215B211C00DB@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16094

Modified Files:
	.cvsignore 
	java-1.6.0-openjdk-java-access-bridge-security.patch 
	java-1.6.0-openjdk.spec sources 
Removed Files:
	java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Log Message:

ep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
- Removed unneeded patches.
- Updated icedteaver to 1.6
- Resolves: rhbz#484858
- Resolves: rhbz#497408
- Resolves: rhbz#489414




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	29 May 2009 13:57:35 -0000	1.50
+++ .cvsignore	10 Sep 2009 15:51:40 -0000	1.51
@@ -3,4 +3,4 @@ java-access-bridge-1.23.0.tar.gz
 mauve-2008-10-22.tar.gz
 hotspot.tar.gz
 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
-icedtea6-1.5.tar.gz
+icedtea6-1.6.tar.gz

java-1.6.0-openjdk-java-access-bridge-security.patch:
 java.security |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: java-1.6.0-openjdk-java-access-bridge-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk-java-access-bridge-security.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- java-1.6.0-openjdk-java-access-bridge-security.patch	23 Jan 2009 17:22:55 -0000	1.2
+++ java-1.6.0-openjdk-java-access-bridge-security.patch	10 Sep 2009 15:51:41 -0000	1.3
@@ -4,8 +4,8 @@
  # passed to checkPackageAccess unless the
  # corresponding RuntimePermission ("accessClassInPackage."+package) has
  # been granted.
--package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- java-1.6.0-openjdk.spec	5 Aug 2009 14:10:45 -0000	1.113
+++ java-1.6.0-openjdk.spec	10 Sep 2009 15:51:44 -0000	1.114
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.5
+%define icedteaver 1.6
 %define icedteasnapshot %{nil}
 %define openjdkver b16
 %define openjdkdate 24_apr_2009
@@ -135,7 +135,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 20.%{openjdkver}%{?dist}
+Release: 21.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -164,14 +164,11 @@ Source7: %{hotspoturl}/hotspot.tar.gz
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
-Patch2:   java-1.6.0-openjdk-makefile.patch
-Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
-Patch4:   java-1.6.0-openjdk-java-access-bridge-security.patch
-Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
-Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
-Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:	  java-1.6.0-openjdk-netxandplugin.patch
-Patch9:	  java-1.6.0-openjdk-securitypatches.patch
+Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
+Patch3:   java-1.6.0-openjdk-java-access-bridge-security.patch
+Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
+Patch5:   java-1.6.0-openjdk-sparc-fixes.patch
+Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -382,8 +379,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch2
-%patch6 -p1
+%patch5 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -406,11 +402,9 @@ export CFLAGS="$CFLAGS -mieee"
 make stamps/patch-ecj.stamp
 %endif
 make patch
+patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH5}
-patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH6}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -418,7 +412,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir
 # Build Java Access Bridge for GNOME.
 pushd java-access-bridge-%{accessver}
   patch -l -p1 < %{PATCH1}
-  patch -l -p1 < %{PATCH3}
+  patch -l -p1 < %{PATCH2}
   OLD_PATH=$PATH
   export PATH=$JAVA_HOME/bin:$OLD_PATH
   ./configure
@@ -954,6 +948,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
+- Removed unneeded patches.
+- Updated icedteaver to 1.6
+- Resolves: rhbz#484858
+- Resolves: rhbz#497408
+- Resolves: rhbz#489414
+
 * Wed Aug  5 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-20.b16
 - Updated java-1.6.0-openjdk-netx.patch, and renamed to 
 java-1.6.0-openjdk-netxandplugin.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	29 May 2009 13:57:35 -0000	1.56
+++ sources	10 Sep 2009 15:51:44 -0000	1.57
@@ -1,6 +1,5 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-dbd7aca5544d1aeebf0eadd45d29d08e  hotspot.tar.gz
-547db20e170c2a2566a56455b196aef7  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
-a67303675a53781c4e42bdb02ec78e40  icedtea6-1.5.tar.gz
+de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz
+a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz


--- java-1.6.0-openjdk-makefile.patch DELETED ---


--- java-1.6.0-openjdk-netxandplugin.patch DELETED ---


--- java-1.6.0-openjdk-securitypatches.patch DELETED ---



From sandeen at fedoraproject.org  Thu Sep 10 15:53:39 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Thu, 10 Sep 2009 15:53:39 +0000 (UTC)
Subject: rpms/fio/devel .cvsignore, 1.11, 1.12 fio.spec, 1.12, 1.13 sources, 
	1.11, 1.12
Message-ID: <20090910155339.D01CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/fio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16739

Modified Files:
	.cvsignore fio.spec sources 
Log Message:
* Thu Sep 10 2009 Eric Sandeen <sandeen at redhat.com> 1.33.1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	8 Sep 2009 18:49:03 -0000	1.11
+++ .cvsignore	10 Sep 2009 15:53:39 -0000	1.12
@@ -1 +1 @@
-fio-1.33.tar.bz2
+fio-1.33.1.tar.bz2


Index: fio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/fio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fio.spec	8 Sep 2009 18:46:41 -0000	1.12
+++ fio.spec	10 Sep 2009 15:53:39 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		fio
-Version:	1.33
+Version:	1.33.1
 Release:	1%{?dist}
 Summary:	Multithreaded IO generation tool
 
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 10 2009 Eric Sandeen <sandeen at redhat.com> 1.33.1-1
+- New upstream version
+
 * Tue Sep 08 2009 Eric Sandeen <sandeen at redhat.com> 1.33-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	8 Sep 2009 18:49:03 -0000	1.11
+++ sources	10 Sep 2009 15:53:39 -0000	1.12
@@ -1 +1 @@
-6bf08836712a5de0dcd2815e45dd4b77  fio-1.33.tar.bz2
+d345b60d28d57a077dc95c81121f18d1  fio-1.33.1.tar.bz2



From langel at fedoraproject.org  Thu Sep 10 15:54:21 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 15:54:21 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 sources,1.57,1.58
Message-ID: <20090910155421.AF3FB11C00DB@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17038

Modified Files:
	sources 
Log Message:
updated sources




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	10 Sep 2009 15:51:44 -0000	1.57
+++ sources	10 Sep 2009 15:54:21 -0000	1.58
@@ -3,3 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz
 a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+600284e870609a7531163bf2972c573b  hotspot.tar.gz



From langel at fedoraproject.org  Thu Sep 10 16:01:32 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 16:01:32 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-11 .cvsignore, 1.57,
	1.58 java-1.6.0-openjdk-java-access-bridge-security.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.127, 1.128 sources, 1.64,
	1.65 java-1.6.0-openjdk-makefile.patch, 1.13,
	NONE java-1.6.0-openjdk-netxandplugin.patch, 1.1,
	NONE java-1.6.0-openjdk-securitypatches.patch, 1.3, NONE
Message-ID: <20090910160132.C1CE311C00DB@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-serv20818

Modified Files:
	.cvsignore 
	java-1.6.0-openjdk-java-access-bridge-security.patch 
	java-1.6.0-openjdk.spec sources 
Removed Files:
	java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Log Message:
* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-29.b16
- Removed unneeded patches.
- Updated icedteaver to 1.6
- Resolves: rhbz#484858
- Resolves: rhbz#497408
- Resolves: rhbz#489414




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	29 May 2009 14:05:20 -0000	1.57
+++ .cvsignore	10 Sep 2009 16:01:24 -0000	1.58
@@ -1,8 +1,8 @@
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
 mauve-2008-10-22.tar.gz
-icedtea6-1.5.tar.gz
-hotspot.tar.gz
 netbeans-profiler-visualvm_release65_mod.tar.gz
 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 visualvm-111-src.tar.gz
+icedtea6-1.6.tar.gz
+hotspot.tar.gz

java-1.6.0-openjdk-java-access-bridge-security.patch:
 java.security |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: java-1.6.0-openjdk-java-access-bridge-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk-java-access-bridge-security.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- java-1.6.0-openjdk-java-access-bridge-security.patch	23 Jan 2009 17:24:44 -0000	1.2
+++ java-1.6.0-openjdk-java-access-bridge-security.patch	10 Sep 2009 16:01:24 -0000	1.3
@@ -4,8 +4,8 @@
  # passed to checkPackageAccess unless the
  # corresponding RuntimePermission ("accessClassInPackage."+package) has
  # been granted.
--package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string


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.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- java-1.6.0-openjdk.spec	9 Sep 2009 14:12:06 -0000	1.127
+++ java-1.6.0-openjdk.spec	10 Sep 2009 16:01:29 -0000	1.128
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.5
+%define icedteaver 1.6
 %define icedteasnapshot %{nil}
 %define openjdkver b16
 %define openjdkdate 24_apr_2009
@@ -138,7 +138,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 28.%{openjdkver}%{?dist}
+Release: 29.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -169,14 +169,11 @@ Source9: %{visualvmurl}/visualvm-111-src
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
-Patch2:   java-1.6.0-openjdk-makefile.patch
-Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
-Patch4:	  java-1.6.0-openjdk-java-access-bridge-security.patch
-Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
-Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
-Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:   java-1.6.0-openjdk-netxandplugin.patch
-Patch9:   java-1.6.0-openjdk-securitypatches.patch
+Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
+Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
+Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
+Patch5:   java-1.6.0-openjdk-sparc-fixes.patch
+Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -392,8 +389,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch2
-%patch6 -p1
+%patch5 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -417,11 +413,9 @@ export CFLAGS="$CFLAGS -mieee"
 make stamps/patch-ecj.stamp
 %endif
 make patch
+patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH5}
-patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH6}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -429,7 +423,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir
 # Build Java Access Bridge for GNOME.
 pushd java-access-bridge-%{accessver}
   patch -l -p1 < %{PATCH1}
-  patch -l -p1 < %{PATCH3}
+  patch -l -p1 < %{PATCH2}
   OLD_PATH=$PATH
   export PATH=$JAVA_HOME/bin:$OLD_PATH
   ./configure
@@ -969,6 +963,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-29.b16
+- Removed unneeded patches.
+- Updated icedteaver to 1.6
+- Resolves: rhbz#484858
+- Resolves: rhbz#497408
+- Resolves: rhbz#489414
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1:1.6.0.0-28.b16
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	29 May 2009 14:05:20 -0000	1.64
+++ sources	10 Sep 2009 16:01:30 -0000	1.65
@@ -1,8 +1,8 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-a67303675a53781c4e42bdb02ec78e40  icedtea6-1.5.tar.gz
-dbd7aca5544d1aeebf0eadd45d29d08e  hotspot.tar.gz
 a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
-547db20e170c2a2566a56455b196aef7  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
+a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz
+600284e870609a7531163bf2972c573b  hotspot.tar.gz


--- java-1.6.0-openjdk-makefile.patch DELETED ---


--- java-1.6.0-openjdk-netxandplugin.patch DELETED ---


--- java-1.6.0-openjdk-securitypatches.patch DELETED ---



From sergiopr at fedoraproject.org  Thu Sep 10 16:02:21 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Thu, 10 Sep 2009 16:02:21 +0000 (UTC)
Subject: rpms/xpa/devel xpa-makefile.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5 xpa.spec, 1.26,
	1.27 xpa-2.1.6-makefile.patch, 1.3, NONE
Message-ID: <20090910160221.522AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/xpa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22008

Modified Files:
	.cvsignore sources xpa.spec 
Added Files:
	xpa-makefile.patch 
Removed Files:
	xpa-2.1.6-makefile.patch 
Log Message:
* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.10-1
- New upstream source


xpa-makefile.patch:
 Makefile.in |   71 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 23 deletions(-)

--- NEW FILE xpa-makefile.patch ---
diff -ur xpa-2.1.10/Makefile.in xpa.am/Makefile.in
--- xpa-2.1.10/Makefile.in	2009-08-22 23:12:11.000000000 +0200
+++ xpa.am/Makefile.in	2009-09-10 17:52:59.000000000 +0200
@@ -37,19 +37,19 @@
 INSTALL_ROOT =
 
 # Directory in which to install the .a or .so binary for the XPA library:
-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(libdir)
 
 # Directory in which to install the program wish:
-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(bindir)
 
 # Directory in which to install the include file xpa.h:
-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)
 
 # Top-level directory for manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
 
 # Top-level directory for share entries:
-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
+MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)
 
 # Platform-specific X compiler flags (include file specifications)
 X_CFLAGS = 		@X_CFLAGS@
@@ -102,6 +102,31 @@
 INSTALL_PROGRAM =	${INSTALL}
 INSTALL_DATA =		${INSTALL} -m 644
 
+# Added by fedora rpm patch
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+# end
+
+
+
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
 # Makefile is generated from Makefile.in.  You shouldn't normally
@@ -147,7 +172,7 @@
 
 # used in link line
 # LLIB=	$(LIB)
-LLIB=	@LLIB@
+LLIB= -L. -lxpa
 
 PROGS =		xpaset xpaget xpainfo xpaaccess xpans xpamb
 
@@ -175,7 +200,7 @@
 		$(RANLIB) $(LIB)
 
 shlib:		$(LIB)
-		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
+		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
 		rm -f lib$(PACKAGE).tmp/xt*.o; \
 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
@@ -184,7 +209,7 @@
 		rm -rf lib$(PACKAGE).tmp)
 
 tclxpa:		$(LIB)
-		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
 		rm -f libtclxpa.tmp/xt*.o; \
 		CC='$(CC)' CXX=$(CXX) \
@@ -204,34 +229,34 @@
 		echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh)
 
 xpaset:		$(LIB) xpaset.o
-		$(CC) $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS)
 
 xpaget:		$(LIB) xpaget.o
-		$(CC) $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS)
 
 xpainfo:	$(LIB) xpainfo.o
-		$(CC) $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS)
 
 xpaaccess:	$(LIB) xpaaccess.o
-		$(CC) $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS)
 
 xpans:		$(LIB) xpans.o
-		$(CC) $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB)
 
 xpamb:		$(LIB) xpamb.o
-		$(CC) $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS)
 
 ctest:		$(LIB) ctest.o
-		$(CC) $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS)
 
 stest:		$(LIB) stest.o
-		$(CC) $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS)
 
 rtest:		$(LIB) rtest.o
-		$(CC) $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS)
 
 stestx:		$(LIB) stest.o
-		$(CC) $(LDFLAGS) stest.o -o stest $(LIB) \
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) \
 		$(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS)
 
 # Smoke test: allows end-users to quickly discern basic usability
@@ -257,7 +282,7 @@
 	   else \
 		echo "Installing $$i" ; \
 		$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
-		chmod 555 $(LIB_INSTALL_DIR)/$$i; \
+		chmod 755 $(LIB_INSTALL_DIR)/$$i; \
 	   fi; \
 	   done;)
 
@@ -266,7 +291,7 @@
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -274,7 +299,7 @@
 	@echo "Installing $(LIB)";
 	@$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB);
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB));
-	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB);
+	@chmod 755 $(LIB_INSTALL_DIR)/$(LIB);
 	@echo "Installing xpa.h"
 	@$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h
 	@echo "Installing prsetup.h"
@@ -288,7 +313,7 @@
 install-man:
 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
-	    mkdir $(MAN_INSTALL_DIR); \
+	    mkdir -p $(MAN_INSTALL_DIR); \
 	    chmod 755 $(MAN_INSTALL_DIR); \
 	    else true; \
 	fi;
@@ -299,7 +324,7 @@
 		M="$(MAN_INSTALL_DIR)/man$$E"; \
 		if [ ! -d $$M ] ; then \
 		    echo "Making directory $$M"; \
-		    mkdir $$M; \
+		    mkdir -p $$M; \
 		    chmod 755 $$M; \
 		    else true; \
 		fi; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Nov 2007 11:01:53 -0000	1.4
+++ .cvsignore	10 Sep 2009 16:02:20 -0000	1.5
@@ -1 +1 @@
-xpa-2.1.8.tar.gz
+xpa-2.1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Nov 2007 11:01:53 -0000	1.4
+++ sources	10 Sep 2009 16:02:20 -0000	1.5
@@ -1 +1 @@
-d5ca64ab2b6a487bfa2f3277d4768656  xpa-2.1.8.tar.gz
+af8c65ed96e672f7d4abd3492bdaa93c  xpa-2.1.10.tar.gz


Index: xpa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/xpa.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xpa.spec	27 Jul 2009 08:41:04 -0000	1.26
+++ xpa.spec	10 Sep 2009 16:02:21 -0000	1.27
@@ -2,18 +2,15 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: xpa
-Version: 2.1.8
-Release: 10%{?dist}
+Version: 2.1.10
+Release: 1%{?dist}
 Summary: The X Public Access messaging system
 
-# Upstream version
-%define upversion 2.1.8
-
 Group: Applications/Engineering
 License: LGPLv2+
 URL: http://hea-www.harvard.edu/RD/xpa/
-Source0: http://hea-www.harvard.edu/saord/download/xpa/%{name}-%{upversion}.tar.gz
-Patch0: xpa-2.1.6-makefile.patch
+Source0: http://hea-www.harvard.edu/saord/download/xpa/%{name}-%{version}.tar.gz
+Patch0: xpa-makefile.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: %{name}-libs = %{version}-%{release}
@@ -61,27 +58,27 @@ of Unix programs, including X programs a
 This package contains the %{name} TCL interface
 
 %prep
-%setup -q -n %{name}-%{upversion}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 # Remove ps files in html docs
-%{__rm} -rf %{_builddir}/%{name}-%{version}/doc/*.ps
+rm -rf %{_builddir}/%{name}-%{version}/doc/*.ps
 
 %build
 %configure --includedir=%{_includedir}/xpa --datadir=%{_datadir}/xpa \
 	--enable-shared --with-tcl=%{_libdir} \
 	--with-x --enable-threaded-xpans
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} tclxpa
+make %{?_smp_mflags}
+make %{?_smp_mflags} tclxpa
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} INSTALL_ROOT=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{tcl_sitearch}/tclxpa
-%{__cp} -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclxpa
-%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclxpa
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} install
+mkdir -p %{buildroot}%{tcl_sitearch}/tclxpa
+cp -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclxpa
+mv %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclxpa
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -115,6 +112,9 @@ This package contains the %{name} TCL in
 %exclude %{_libdir}/*.a
 
 %changelog
+* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.10-1
+- New upstream source
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xpa-2.1.6-makefile.patch DELETED ---



From karsten at fedoraproject.org  Thu Sep 10 16:05:01 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 16:05:01 +0000 (UTC)
Subject: rpms/gnuchess/devel gnuchess-5.07-getline.patch, NONE,
	1.1 gnuchess.spec, 1.8, 1.9
Message-ID: <20090910160501.6B6B811C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/gnuchess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25457

Modified Files:
	gnuchess.spec 
Added Files:
	gnuchess-5.07-getline.patch 
Log Message:
- fix name collision of getline function



gnuchess-5.07-getline.patch:
 common.h |    2 +-
 input.c  |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE gnuchess-5.07-getline.patch ---
--- gnuchess-5.07/src/common.h	2009-09-10 18:01:34.000000000 +0200
+++ gnuchess-5.07_getline/src/common.h	2009-09-10 17:57:40.000000000 +0200
@@ -745,7 +745,7 @@
  * Input routine, initialized to one of the specific
  * input routines. The given argument is the prompt.
  */
-void (*getline) (char *);
+void (*getline_chess) (char *);
 
 #define MAXSTR 128
 extern char inputstr[MAXSTR];
--- gnuchess-5.07/src/input.c	2003-07-01 19:06:43.000000000 +0200
+++ gnuchess-5.07_getline/src/input.c	2009-09-10 18:00:53.000000000 +0200
@@ -127,7 +127,7 @@
 	      (RealGameCnt+1)/2 + 1 );
     }
     pthread_mutex_lock(&input_mutex);
-    getline(prompt);
+    getline_chess(prompt);
     input_status = INPUT_AVAILABLE;
     pthread_cond_signal(&input_cond);
     pthread_mutex_unlock(&input_mutex);
@@ -173,13 +173,13 @@
 {
 #ifdef HAVE_LIBREADLINE
   if (isatty(STDIN_FILENO)) {
-    getline = getline_readline;
+    getline_chess = getline_readline;
     using_history();
   } else {
-    getline = getline_standard;
+    getline_chess = getline_standard;
   }
 #else
-  getline = getline_standard;
+  getline_chess = getline_standard;
 #endif
   /* Start input thread */
   pthread_create(&input_thread, NULL, input_func, NULL);


Index: gnuchess.spec
===================================================================
RCS file: /cvs/extras/rpms/gnuchess/devel/gnuchess.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnuchess.spec	25 Jul 2009 00:57:03 -0000	1.8
+++ gnuchess.spec	10 Sep 2009 16:05:00 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The GNU chess program
 Name: gnuchess
 Version: 5.07
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: ftp://ftp.gnu.org/pub/gnu/chess/
@@ -11,6 +11,7 @@ Source: ftp://ftp.gnu.org/pub/gnu/chess/
 Source1: book_1.01.dat.gz
 Patch0: gnuchess-5.07-gcc4.patch
 Patch1: gnuchess-5.06-bookpath.patch
+Patch2: gnuchess-5.07-getline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: chessprogram
 BuildRequires: flex
@@ -29,6 +30,7 @@ you'll also need to install the xboard p
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .gcc
 %patch1 -p1 -b .bp
+%patch2 -p1 -b .getline
 gzip -dc %{SOURCE1} > book/book.dat
 
 %build
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/* COPYING AUTHORS NEWS TODO 
 
 %changelog
+* Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 5.07-14
+- fix name collision of getline function
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.07-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From leigh123linux at fedoraproject.org  Thu Sep 10 16:08:09 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 10 Sep 2009 16:08:09 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.13, 1.14 qbittorrent.spec, 1.32,
	1.33 sources, 1.13, 1.14 icons_qrc.patch, 1.1, NONE
Message-ID: <20090910160809.8591211C00DB@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28203

Modified Files:
	.cvsignore qbittorrent.spec sources 
Removed Files:
	icons_qrc.patch 
Log Message:
* Thu Sep 10 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.1-1
- update to 1.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	29 Aug 2009 18:34:48 -0000	1.13
+++ .cvsignore	10 Sep 2009 16:08:08 -0000	1.14
@@ -1 +1 @@
-qbittorrent-2578svn.tar.gz
+qbittorrent-1.5.1.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- qbittorrent.spec	29 Aug 2009 19:03:00 -0000	1.32
+++ qbittorrent.spec	10 Sep 2009 16:08:09 -0000	1.33
@@ -1,18 +1,17 @@
-%define svn_rev 2578
+#define svn_rev 2578
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.0
-Release: 0.2.20090829svn%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
-Source0:  %{name}-%{svn_rev}svn.tar.gz
-#Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+#Source0:  %{name}-%{svn_rev}svn.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
-Patch1:  icons_qrc.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -33,7 +32,6 @@ It aims to be as fast as possible and to
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .qbittorrent_flag
-%patch1 -p1 -b .icons_qrc
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -76,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Thu Sep 10 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.1-1
+- update to 1.5.1
+
 * Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.2.20090829svn
 - add icons_qrc.patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	29 Aug 2009 18:34:48 -0000	1.13
+++ sources	10 Sep 2009 16:08:09 -0000	1.14
@@ -1 +1 @@
-5d03592acff791ceed397bf0fb33a489  qbittorrent-2578svn.tar.gz
+dd7f31dbfc397efee111a908bad31e6e  qbittorrent-1.5.1.tar.gz


--- icons_qrc.patch DELETED ---



From mjg59 at fedoraproject.org  Thu Sep 10 16:11:32 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Thu, 10 Sep 2009 16:11:32 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ahci-export-capabilities.patch, NONE,
	1.1 kernel.spec, 1.1789, 1.1790
Message-ID: <20090910161132.774A811C00DB@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29280

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ahci-export-capabilities.patch 
Log Message:
* Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-ahci-export-capabilities.patch: Backport from upstream


linux-2.6-ahci-export-capabilities.patch:
 ahci.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

--- NEW FILE linux-2.6-ahci-export-capabilities.patch ---
commit 489b070aa53cb6a70494f53d9d8bd4c8570439e4
Author: Matthew Garrett <mjg at redhat.com>
Date:   Fri Jul 17 20:06:06 2009 +0100

    libata: Export AHCI capabilities
    
    AHCI exports various capability bits that may be of interest to userspace
    such as whether the BIOS claims a port is hotpluggable or eSATA. Providing
    these via sysfs along with the version of the AHCI spec implemented by
    the host allows userspace to make policy decisions for things like ALPM.
    
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 336eb1e..5a5c160 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -327,10 +327,24 @@ static ssize_t ahci_activity_store(struct ata_device *dev,
 				   enum sw_activity val);
 static void ahci_init_sw_activity(struct ata_link *link);
 
+static ssize_t ahci_show_host_caps(struct device *dev,
+				   struct device_attribute *attr, char *buf);
+static ssize_t ahci_show_host_version(struct device *dev,
+				      struct device_attribute *attr, char *buf);
+static ssize_t ahci_show_port_cmd(struct device *dev,
+				  struct device_attribute *attr, char *buf);
+
+DEVICE_ATTR(ahci_host_caps, S_IRUGO, ahci_show_host_caps, NULL);
+DEVICE_ATTR(ahci_host_version, S_IRUGO, ahci_show_host_version, NULL);
+DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL);
+
 static struct device_attribute *ahci_shost_attrs[] = {
 	&dev_attr_link_power_management_policy,
 	&dev_attr_em_message_type,
 	&dev_attr_em_message,
+	&dev_attr_ahci_host_caps,
+	&dev_attr_ahci_host_version,
+	&dev_attr_ahci_port_cmd,
 	NULL
 };
 
@@ -696,6 +710,36 @@ static void ahci_enable_ahci(void __iomem *mmio)
 	WARN_ON(1);
 }
 
+static ssize_t ahci_show_host_caps(struct device *dev,
+				   struct device_attribute *attr, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(dev);
+	struct ata_port *ap = ata_shost_to_port(shost);
+	struct ahci_host_priv *hpriv = ap->host->private_data;
+
+	return sprintf(buf, "%x\n", hpriv->cap);
+}
+
+static ssize_t ahci_show_host_version(struct device *dev,
+				   struct device_attribute *attr, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(dev);
+	struct ata_port *ap = ata_shost_to_port(shost);
+	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];
+
+	return sprintf(buf, "%x\n", readl(mmio + HOST_VERSION));
+}
+
+static ssize_t ahci_show_port_cmd(struct device *dev,
+				  struct device_attribute *attr, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(dev);
+	struct ata_port *ap = ata_shost_to_port(shost);
+	void __iomem *port_mmio = ahci_port_base(ap);
+
+	return sprintf(buf, "%x\n", readl(port_mmio + PORT_CMD));
+}
+
 /**
  *	ahci_save_initial_config - Save and fixup initial config values
  *	@pdev: target PCI device


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1789
retrieving revision 1.1790
diff -u -p -r1.1789 -r1.1790
--- kernel.spec	10 Sep 2009 05:35:19 -0000	1.1789
+++ kernel.spec	10 Sep 2009 16:11:31 -0000	1.1790
@@ -662,6 +662,7 @@ Patch610: hda_intel-prealloc-4mb-dmabuff
 Patch611: alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 Patch670: linux-2.6-ata-quirk.patch
+Patch671: linux-2.6-ahci-export-capabilities.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
@@ -1283,6 +1284,9 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
+# Make it possible to identify non-hotplug SATA ports
+ApplyPatch linux-2.6-ahci-export-capabilities.patch
+
 # rt2x00: back-port activity LED init patches
 #ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
@@ -2010,6 +2014,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-ahci-export-capabilities.patch: Backport from upstream
+
 * Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: add some scaler-only modes for LVDS, GEM/TTM fixes
 



From langel at fedoraproject.org  Thu Sep 10 16:12:08 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 16:12:08 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.60,
	1.61 java-1.6.0-openjdk.spec, 1.133, 1.134 sources, 1.67,
	1.68 java-1.6.0-openjdk-execvpe.patch, 1.1,
	NONE java-1.6.0-openjdk-makefile.patch, 1.13,
	NONE java-1.6.0-openjdk-netxandplugin.patch, 1.1,
	NONE java-1.6.0-openjdk-securitypatches.patch, 1.3, NONE
Message-ID: <20090910161208.7683B11C00DB@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-serv29453

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Removed Files:
	java-1.6.0-openjdk-execvpe.patch 
	java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Log Message:
* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
- Removed unneeded patches.
- Updated icedteaver to 1.6
- Resolves: rhbz#484858
- Resolves: rhbz#497408
- Resolves: rhbz#489414




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	10 Aug 2009 11:18:41 -0000	1.60
+++ .cvsignore	10 Sep 2009 16:12:06 -0000	1.61
@@ -4,5 +4,5 @@ netbeans-profiler-visualvm_release65_mod
 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 visualvm-111-src.tar.gz
 hotspot.tar.gz
-icedtea6-1.5.tar.gz
 java-access-bridge-1.23.0.tar.bz2
+icedtea6-1.6.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- java-1.6.0-openjdk.spec	10 Aug 2009 11:18:41 -0000	1.133
+++ java-1.6.0-openjdk.spec	10 Sep 2009 16:12:08 -0000	1.134
@@ -137,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 29.%{openjdkver}%{?dist}
+Release: 30.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -168,16 +168,12 @@ Source9: %{visualvmurl}/visualvm-111-src
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
-Patch2:   java-1.6.0-openjdk-makefile.patch
-Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
-Patch4:	  java-1.6.0-openjdk-java-access-bridge-security.patch
-Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
-Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
-Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:	  java-1.6.0-openjdk-netxandplugin.patch
-Patch9:   java-1.6.0-openjdk-execvpe.patch
-Patch10:  java-1.6.0-openjdk-x11.patch
-Patch11:  java-1.6.0-openjdk-securitypatches.patch
+Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
+Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
+Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
+Patch5:   java-1.6.0-openjdk-sparc-fixes.patch
+Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
+Patch7:   java-1.6.0-openjdk-x11.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -393,8 +389,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch2
-%patch6 -p1
+%patch5 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -418,13 +413,11 @@ export CFLAGS="$CFLAGS -mieee"
 make stamps/patch-ecj.stamp
 %endif
 make patch
+patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH5}
-patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH6}
 patch -l -p0 < %{PATCH10}
-patch -l -p0 < %{PATCH11}
+patch -l -p0 < %{PATCH7}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -432,7 +425,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir
 # Build Java Access Bridge for GNOME.
 pushd java-access-bridge-%{accessver}
   patch -l -p1 < %{PATCH1}
-  patch -l -p1 < %{PATCH3}
+  patch -l -p1 < %{PATCH2}
   OLD_PATH=$PATH
   export PATH=$JAVA_HOME/bin:$OLD_PATH
   ./configure
@@ -972,6 +965,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
+- Removed unneeded patches.
+- Updated icedteaver to 1.6
+- Resolves: rhbz#484858
+- Resolves: rhbz#497408
+- Resolves: rhbz#489414
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.6.0-29.b16
 - Use bzipped java-access-bridge tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	10 Aug 2009 11:18:41 -0000	1.67
+++ sources	10 Sep 2009 16:12:08 -0000	1.68
@@ -1,8 +1,8 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
-547db20e170c2a2566a56455b196aef7  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
-dbd7aca5544d1aeebf0eadd45d29d08e  hotspot.tar.gz
-a67303675a53781c4e42bdb02ec78e40  icedtea6-1.5.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
+600284e870609a7531163bf2972c573b  hotspot.tar.gz
+a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz


--- java-1.6.0-openjdk-execvpe.patch DELETED ---


--- java-1.6.0-openjdk-makefile.patch DELETED ---


--- java-1.6.0-openjdk-netxandplugin.patch DELETED ---


--- java-1.6.0-openjdk-securitypatches.patch DELETED ---



From langel at fedoraproject.org  Thu Sep 10 16:17:40 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 16:17:40 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel
	java-1.6.0-openjdk-java-access-bridge-security.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.134, 1.135
Message-ID: <20090910161740.DDB4711C00DB@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-serv31090

Modified Files:
	java-1.6.0-openjdk-java-access-bridge-security.patch 
	java-1.6.0-openjdk.spec 
Log Message:
updated version and patch.



java-1.6.0-openjdk-java-access-bridge-security.patch:
 java.security |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: java-1.6.0-openjdk-java-access-bridge-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-java-access-bridge-security.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- java-1.6.0-openjdk-java-access-bridge-security.patch	23 Jan 2009 17:24:44 -0000	1.2
+++ java-1.6.0-openjdk-java-access-bridge-security.patch	10 Sep 2009 16:17:40 -0000	1.3
@@ -4,8 +4,8 @@
  # passed to checkPackageAccess unless the
  # corresponding RuntimePermission ("accessClassInPackage."+package) has
  # been granted.
--package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string


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.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- java-1.6.0-openjdk.spec	10 Sep 2009 16:12:08 -0000	1.134
+++ java-1.6.0-openjdk.spec	10 Sep 2009 16:17:40 -0000	1.135
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.5
+%define icedteaver 1.6
 %define icedteasnapshot %{nil}
 %define openjdkver b16
 %define openjdkdate 24_apr_2009
@@ -416,7 +416,6 @@ make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
 patch -l -p0 < %{PATCH6}
-patch -l -p0 < %{PATCH10}
 patch -l -p0 < %{PATCH7}
 make
 



From leigh123linux at fedoraproject.org  Thu Sep 10 16:18:51 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 10 Sep 2009 16:18:51 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.33,1.34
Message-ID: <20090910161851.1640811C00DB@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32042

Modified Files:
	qbittorrent.spec 
Log Message:
* Thu Sep 10 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.1-2
- correct prep section package name



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- qbittorrent.spec	10 Sep 2009 16:08:09 -0000	1.33
+++ qbittorrent.spec	10 Sep 2009 16:18:50 -0000	1.34
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -30,7 +30,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .qbittorrent_flag
 
 %build
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Thu Sep 10 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.1-2
+- correct prep section package name
+
 * Thu Sep 10 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.1-1
 - update to 1.5.1
 



From transif at fedoraproject.org  Thu Sep 10 16:29:07 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 10 Sep 2009 16:29:07 +0000 (UTC)
Subject: comps/po mai.po,1.5,1.6
Message-ID: <20090910162907.E1E1F11C00DB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2558/po

Modified Files:
	mai.po 
Log Message:
Sending translation for Maithili


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.5 -r 1.6 mai.poIndex: mai.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mai.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mai.po	29 Apr 2009 20:00:21 -0000	1.5
+++ mai.po	10 Sep 2009 16:29:07 -0000	1.6
@@ -1,298 +1,320 @@
-# translation of comps.HEAD.mai.po to Maithili
+# translation of comps.HEAD.mai.po to Hindi
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Sangeeta Kumari <sangeeta09 at gmail.com>, 2008, 2009.
+# Rajesh Ranjan <rajesh672 at gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.mai\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-04-05 14:37+0530\n"
-"Last-Translator: Sangeeta Kumari <sangeeta09 at gmail.com>\n"
-"Language-Team: Maithili <maithili.sf.net>\n"
+"POT-Creation-Date: 2009-09-10 08:24+0000\n"
+"PO-Revision-Date: 2009-09-10 22:00+0530\n"
+"Last-Translator: Rajesh Ranjan <rajesh672 at gmail.com>\n"
+"Language-Team: Hindi <hindi.sf.net>\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"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "???? ???????? ??????? ?? ???????? ???? ?? ??? ??? ???? ???."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "??????? ?????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????? ??????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ??????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????? ??????? ?????? ???? ?' ??? ?????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???? ??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???? ??? ???????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "??? ??????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ???????????? ???? ?' ??? ??????? ??????"
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????? ??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????? ??????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "?????????? ???????? ??????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "?????? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????????? ???????? ????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????????? ??????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
[...1917 lines suppressed...]
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1392,63 +1475,123 @@ msgstr ""
 "32 ??? ?????? ?????? ?? ????? ????????? ?????????? ??? ??????, ???? ???????, ??? ???????? "
 "?? ???????, ???? ???? ?????? ????."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?????????? CAML ???????????? ???? ? ?????????? ???????? ????????? ?????? ??? ??????."
 
-#: ../comps-f11.xml.in.h:188
-#, fuzzy
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
-msgstr "?????? ??????"
+msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:196
-#, fuzzy
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
-msgstr "?????? ??????"
+msgstr "????? ??????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr ""
-"? ???? ?????? ?????? ??? ?? ????? ?? ???????, ????????, ????-???? ?? ?????? ??? ???????? ???? "
+"? ???? ?????? ?????? ??? ?? ????? ?? ???????, ????????, ????-???? ??? ?????? ??? ???????? ???? "
 "??."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????? ??????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "??????? ??????? ??????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "?????? ???? ??? ?? ???? ????????? ??? ????? ?? ?????????? ???"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "?????? ???? ??? ????? ?? ??????????????? ???? ?????? ?????? ??? ???? ?????????? ?? ???"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????? ??? ????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "?????? ????????? ??? ??????????? ??? ?????? ??? ????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????? ?? (Base)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "????? ?? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????????? ?????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "??????"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ???? ???? X11 ???????? ??????? ??? ?? ???? ????????? ??? ?????? ??? ??? ??? ?? "
+"??????, ?????? ?????? ???? ????? ???????? ???."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "???? ??? ????????? ????? ?????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "??????? ???????? ???????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "??????? ???? ???????? ??????? ??? NetBook/NetTop/MID ??????? ???."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????? ??????? ?' ??? ?????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????? ?????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"GNOME ???? ?????????, ?????? ???????? ??????? ??? ?????? ????, ????????, ?????? "
+"GNOME ???? ?????????, ?????? ????????? ??????? ??? ?????? ????, ????????, ?????? "
 "??????, ??? ?????? ???? ??????? ???."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"KDE ???? ?????????, ?????? ???????? ??????? ??? ?????? ????, ????????, ?????? ??????, "
+"KDE ???? ?????????, ?????? ????????? ??????? ??? ?????? ????, ????????, ?????? ??????, "
 "??? ?????? ???? ??????? ???."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1456,11 +1599,11 @@ msgstr ""
 "???? ???????? ?????? ?? ??? ?? ???? ?????? ? ????????? ???????? ???? ????? ??? ??????? "
 "??????????? ???? ???. ????? ?????? ??? ???? ???."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "X?????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1468,30 +1611,27 @@ msgstr ""
 "? ??????? ?? DocBook ??????? ?? ????????? ????? ??? ?????? HTML, PDF, Postscript, ??? "
 "???????? ?? ???? ???? ???."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "? ???? ??????? ???????? ?' ??? ????? ????? ? ???? ???."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+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."
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+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."
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ??????? ?' ??? ? ???? ??????? ? ????????? ???? ???."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ??????? ?' ??? ? ???? ??????? ? ????????? ???? ???."
+



From avesh at fedoraproject.org  Thu Sep 10 16:35:41 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Thu, 10 Sep 2009 16:35:41 +0000 (UTC)
Subject: rpms/openswan/F-11 openswan-2.6-initscript-correction.patch, NONE, 
	1.1 openswan-2.6.22-CVE-2009-2185.patch, NONE,
	1.1 openswan-2.6.22-gcc44.patch, NONE,
	1.1 openswan-2.6.22-nss.patch, NONE,
	1.1 openswan-2.6.22-selinux.patch, NONE, 1.1 .cvsignore, 1.26,
	1.27 openswan.spec, 1.79, 1.80 sources, 1.25,
	1.26 openswan-2.6-selinux.patch, 1.1,
	NONE openswan-2.6.16-initscript-correction.patch, 1.1,
	NONE openswan-2.6.21-CVE-2009-2185.patch, 1.1,
	NONE openswan-2.6.21-gcc44.patch, 1.6,
	NONE openswan-2.6.21-nss-fedora-diff-modified.patch, 1.1,
	NONE openswan-2.6.21-nss.patch, 1.3, NONE
Message-ID: <20090910163541.63B0A11C00DB@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4537

Modified Files:
	.cvsignore openswan.spec sources 
Added Files:
	openswan-2.6-initscript-correction.patch 
	openswan-2.6.22-CVE-2009-2185.patch 
	openswan-2.6.22-gcc44.patch openswan-2.6.22-nss.patch 
	openswan-2.6.22-selinux.patch 
Removed Files:
	openswan-2.6-selinux.patch 
	openswan-2.6.16-initscript-correction.patch 
	openswan-2.6.21-CVE-2009-2185.patch 
	openswan-2.6.21-gcc44.patch 
	openswan-2.6.21-nss-fedora-diff-modified.patch 
	openswan-2.6.21-nss.patch 
Log Message:
* Thu Sep 10 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.22-1
- New upstream release
- Added support for using PSK with NSS
- Fixed several warnings and undid unnecessary debug messages
- Updated README.nss with an example configuration
- Moved README.nss to openswan/doc/
- Improved FIPS integrity check functionality
- Patch for Openswan ASN.1 parser vulnerability (CVE-2009-2185)


openswan-2.6-initscript-correction.patch:
 setup.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openswan-2.6-initscript-correction.patch ---
--- openswan-2.6.22-orig/programs/setup/setup.in	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/setup/setup.in	2009-09-10 11:48:23.395338383 -0400
@@ -39,7 +39,7 @@
 # times of NFS filesystem startup/shutdown).  Startup is after startup of
 # syslog and pcmcia support; shutdown is just before shutdown of syslog.
 #
-# chkconfig: 2345 47 76
+# chkconfig: - 47 76
 # description: IPsec provides encrypted and authenticated communications; \
 # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
 

openswan-2.6.22-CVE-2009-2185.patch:
 asn1.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE openswan-2.6.22-CVE-2009-2185.patch ---
--- openswan-2.6.22/lib/libopenswan/asn1.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2/lib/libopenswan/asn1.c	2009-08-17 14:07:00.153981683 -0400
@@ -76,8 +76,15 @@ asn1_length(chunk_t *blob)
     n = *blob->ptr++;
     blob->len--;
 
-    if ((n & 0x80) == 0) /* single length octet */
+    if ((n & 0x80) == 0) { /* single length octet */
+	if (n > blob->len) {
+	    DBG(DBG_PARSING,
+		DBG_log("number of length octets is larger than ASN.1 object")
+	    )
+	    return ASN1_INVALID_LENGTH;
+	}
 	return n;
+    }
 
     /* composite length, determine number of length octets */
     n &= 0x7f;
@@ -243,7 +250,6 @@ asn1totime(const chunk_t *utctime, asn1_
     {
 	int tz_hour, tz_min;
 
-	sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min);
 	if (sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min) != 2)
 	{
 	    return 0; /* error in positive timezone offset format */
@@ -411,7 +417,7 @@ extract_object(asn1Object_t const *objec
 
     blob1->len = asn1_length(blob);
 
-    if (blob1->len == ASN1_INVALID_LENGTH || blob->len < blob1->len)
+    if (blob1->len == ASN1_INVALID_LENGTH)
     {
 	DBG(DBG_PARSING,
 	    DBG_log("L%d - %s:  length of ASN1 object invalid or too large",

openswan-2.6.22-gcc44.patch:
 tncfg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openswan-2.6.22-gcc44.patch ---
--- openswan-2.6.22-orig/programs/tncfg/tncfg.c	2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/programs/tncfg/tncfg.c	2009-07-09 23:58:03.000000000 +0200
@@ -176,7 +176,7 @@ int
 main(int argc, char *argv[])
 {
 	struct ifreq ifr;
-	struct ipsectunnelconf *shc=(struct ipsectunnelconf *)&ifr.ifr_data;
+	struct ipsectunnelconf *shc=(struct ipsectunnelconf *)ifr.ifr_data;
 	int s;
 	int c, previous = -1;
 	int argcount = argc;

openswan-2.6.22-nss.patch:
 doc/README.nss                 |  123 ++++++++++++++++++--
 lib/libcrypto/libmd5/md5.c     |   10 +
 lib/libcrypto/libsha1/sha1.c   |    4 
 lib/libipsecconf/Makefile      |    7 +
 lib/libipsecconf/confread.c    |   17 ++
 lib/libipsecconf/keywords.c    |    3 
 lib/libopenswan/alg_info.c     |   11 +
 lib/libopenswan/pem.c          |    8 +
 lib/libopenswan/secrets.c      |    2 
 lib/libopenswan/x509dn.c       |    1 
 programs/pluto/crypt_dh.c      |  246 +++++++++++++++++++++++++++--------------
 programs/pluto/crypto.h        |    3 
 programs/pluto/hmac.c          |   88 ++++++++++----
 programs/pluto/ike_alg_aes.c   |    2 
 programs/pluto/ikev1.h         |    9 +
 programs/pluto/ikev1_main.c    |   27 ++--
 programs/pluto/ikev2_psk.c     |   63 ++++++++++
 programs/pluto/ikev2_rsa.c     |    4 
 programs/pluto/keys.c          |   42 ++++---
 programs/pluto/keys.h          |    2 
 programs/pluto/pluto_crypt.c   |   27 ----
 programs/pluto/plutomain.c     |   59 ++++++++-
 programs/pluto/state.c         |    6 +
 programs/rsasigkey/rsasigkey.c |    8 -
 24 files changed, 578 insertions(+), 194 deletions(-)

--- NEW FILE openswan-2.6.22-nss.patch ---
diff -urNp openswan-2.6.22-orig/doc/README.nss openswan-2.6.22/doc/README.nss
--- openswan-2.6.22-orig/doc/README.nss	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/doc/README.nss	2009-07-23 16:36:01.690589655 -0400
@@ -2,12 +2,11 @@ Title: Using NSS crypto library with Plu
 Author: Avesh Agarwal email: avagarwa at redhat.com
 Version:0.0
 
-
 About NSS crypto library
 --------------------------
 Please visit http://www.mozilla.org/projects/security/pki/nss/
  
-NSS crypto library is user space library. It is only used with Pluto (user space IKE daemon) for cryptographic operations. When using NSS, it does not impact the way IPSEC kernel (KLIPS or NETKEY) works. The usefulness of using NSS lies in the fact that the secret information (like private keys or anything else) never comes out of NSS database.
+NSS crypto library is user space library. It is only used with Pluto (user space IKE daemon) for cryptographic operations. When using NSS, it does not impact the way IPSEC kernel (KLIPS or NETKEY) works. The usefulness of using NSS lies in the fact that the secret information (like private keys or anything else) never comes out of NSS database. Openswan with NSS supports IKEV1, IKEv2, authentication using PSK, Raw RSA Sig key, and Digital Certs.
 
 
 How to enable NSS crypto library with Openswan
@@ -49,9 +48,9 @@ About the password file "nsspassword"
 If you create the database with a password, and want to run NSS in FIPS mode, you must create a password file with the name "nsspassword" in the /etc/ipsec.d before running pluto with NSS. The "nsspassword" file must contain the password you provided when creating NSS database. 
 
 Important thing to note: 
-i) You only need the "nsspassword" file if you run pluto in FIPS. In other way, if you run pluto in normal or NonFIPS mode and even if you create the NSS database with a password, you need not create a "nsspassword" file. 
+i) You only need the "nsspassword" file if you run pluto in FIPS. In other way, if you run pluto in normal or NonFIPS mode, then you can create the NSS database without password, and you need not create a "nsspassword" file. However, if the NSS db is created with a password, the "nsspassword" file must also be provided.
 
-ii) If you create he "nsspassword" file, it must contain only the password nothing else.  
+ii) If you create the "nsspassword" file, it must contain only the password nothing else.  
 
 
 Generating RSA keys when using NSS
@@ -60,7 +59,7 @@ You can still use ipsec newhostkey and i
 
 ipsec newhostkey --configdir /etc/ipsec.d [--password password] --output /etc/ipsec.d/ipsec.secrets 
 
-A password is only required if NSS database is used in FIPS mode. If you use NSS and create RSA keys (private/public), you will notice that the contents of the ipsec.secrets are different than what used to be before. 
+A password is only required if NSS database created with password. If you use NSS and create RSA keys (private/public), you will notice that the contents of the ipsec.secrets are different than what used to be before. 
 
 Public key information in ipsec.secrets is stored in the same way as before. However, all the fields of the Private key information contain just a similar ID. This ID is called CKA ID, which is used to locate private keys inside NSS database during the IKE negotiation.
 
@@ -90,9 +89,9 @@ It creates a user cert with nick name "u
 Important thing to note: You must provided a nick name when creating a user cert, because Pluto reads the user cert from the NSS database nased on the user cert's nickname. 
 
 
-Changes in the certitificates usage with Pluto
+Changes in the certificates usage with Pluto
 ------------------------------------------------
-1) ipsec.comf changes
+1) ipsec.conf changes
 
 The only change is "leftcert" field must contain the nick name of the user cert. For example if the nickname of the user cert is "xyz", then it can be  "leftid=xyz".
 
@@ -109,9 +108,111 @@ There is no need to provide private key 
 3) changes in the directories in /etc/ipsec.d/ (cacerts, certs, private)  
 i)You need not have "private" or "certs" directory.
 
-ii) If you obtain a CA certificate from outside, and it is not inside NSS database, then you need to put the certificate inside "cacerts" directory, so that Pluto can read it. If the CA certificate is created in the NSS database, or imported from outside inside the NSS database, you need not have "cacerts" directory,as Pluto can read the CA cert from the database.
+ii) If you obtain a CA certificate from outside, and it is not inside NSS database, then you need to put the certificate inside "cacerts" directory, so that Pluto can read it. If the CA certificate is created in the NSS database, or imported from outside inside the NSS database, you need not have "cacerts" directory, as Pluto can read the CA cert from the database.
+
+
+An example Scenario: To setup ipsec with certs in tunnel mode using NSS
+------------------------------------------------------------
+
+GW Machine 1: w1.x1.y1.z1 
+GW Machine 2: w2.x2.y2.z2 
+
+w1.x1.y1.z1 <---> w2.x2.y2.z2
+
+Note: In this example setup, both machines are using NSS. If you want to use 
+NSS only at one machine, say machine 1, you can use the following procedure 
+only at machine 1, and you can use traditional ipsec setup at machine 2.
+
+1. Create a new (if not already) nss db on both machines as follows:
+
+certutil -N -d <path-to-ipsec.d dir>/ipsec.d
+
+2. Creating CA certs at both machines:
+
+On machine 1:
+certutil -S -k rsa -n cacert1 -s "CN=cacert1" -v 12 -d . -t "C,C,C" -x -d 
+<path-to-ipsec.d dir>/ipsec.d
+
+As we want to use the same certificate  "cacert1" at machine 2, it needs to be
+exported first. To export the cacert1, do the following at machine 1: 
+
+pk12util -o cacert1.p12 -n cacert1 -d /etc/ipsec.d
+
+Copy the file "cacert1.p12" to the machine2 in "/etc/ipsec.d" directory.
+
+On machine 2:
+Import the "cacert1" as follows:
+
+cd /etc/ipsec.d
+pk12util -i cacert1.p12 -d /etc/ipsec.d
+certutil -M -n cacert1 -t "C, C, C" -d /etc/ipsec.d 
+
+Now machine 2 also has the CA certificates "cacert1" in its NSS database.
+
+3. Creating user certs at both machines:
+
+On machine 1:
+certutil -S -k rsa -c cacert1 -n usercert1 -s "CN=usercert1" -v 12 -t "u,u,u" 
+-d /etc/ipsec.d
+(Note this cert is signed by "cacert1")
+
+On machine 2:
+certutil -S -k rsa -c cacert1 -n usercert2 -s "CN=usercert2" -v 12 -t "u,u,u" 
+-d /etc/ipsec.d
+(Note this cert is signed by "cacert1" too)
+
+4. Preparing ipsec.conf at both machines 
+
+ipsec.conf at machine 1:
+
+
+conn    pluto-1-2
+        left=w1.x1.y1.z1
+        leftid="CN=usercert1"
+        leftsourceip=w1.x1.y1.z1
+        leftrsasigkey=%cert
+        leftcert=usercert1
+        leftnexthop=w2.x2.y2.z2
+        right=w2.x2.y2.z2
+        rightid="CN=usercert2"
+        rightsourceip=w2.x2.y2.z2
+        rightrsasigkey=%cert
+        rightnexthop=w1.x1.y1.z1
+        rekey=no
+        esp="aes-sha1"
+        ike="aes-sha1"
+        auto=add
+
+
+ipsec.conf at machine 2:
+
+
+conn    pluto-1-2
+        left=w2.x2.y2.z2
+        leftid="CN=usercert2"
+        leftsourceip=w2.x2.y2.z2
+        leftrsasigkey=%cert
+        leftcert=usercert2
+        leftnexthop=w1.x1.y1.z1
+        right=w1.x1.y1.z1
+        rightid="CN=usercert1"
+        rightsourceip=w1.x1.y1.z1
+        rightrsasigkey=%cert
+        rightnexthop=w2.x2.y2.z2
+        rekey=no
+        esp="aes-sha1"
+        ike="aes-sha1"
+        auto=add
+
+5. Preparing ipsec.secrets at both machines 
+
+ipsec.secrets at machine 1:
+
+ : RSA usercert1
+
+
+ipsec.secrets at machine 1:
+
+ : RSA usercert2
 
 
-Things not supported
----------------------
-PSK: It is not supported when using NSS, because it required both pluto peers to have a mutual keys created outside the NSS database. So It should not be configured with NSS. 
diff -urNp openswan-2.6.22-orig/lib/libcrypto/libmd5/md5.c openswan-2.6.22/lib/libcrypto/libmd5/md5.c
--- openswan-2.6.22-orig/lib/libcrypto/libmd5/md5.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libcrypto/libmd5/md5.c	2009-07-23 16:36:01.691592011 -0400
@@ -75,7 +75,9 @@ documentation and/or software.
 
 #define MD5Transform _MD5Transform
 
+#ifndef HAVE_LIBNSS
 static void MD5Transform PROTO_LIST ((UINT4 [4], const unsigned char [64]));
+#endif
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define Encode MD5_memcpy
@@ -100,11 +102,13 @@ static void MD5_memcpy PROTO_LIST ((POIN
 static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
 #endif
 #endif
+#ifndef HAVE_LIBNSS
 static unsigned char PADDING[64] = {
   0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
+#endif
 
 /* F, G, H and I are basic MD5 functions.
  */
@@ -147,14 +151,12 @@ void osMD5Init (context)
 MD5_CTX *context;                                        /* context */
 {
 #ifdef HAVE_LIBNSS
-  DBG(DBG_CRYPT, DBG_log("NSS: md5 init start"));
   SECStatus status;
   context->ctx_nss=NULL;
   context->ctx_nss = PK11_CreateDigestContext(SEC_OID_MD5);
   PR_ASSERT(context->ctx_nss!=NULL);
   status=PK11_DigestBegin(context->ctx_nss);
   PR_ASSERT(status==SECSuccess);
-  DBG(DBG_CRYPT, DBG_log("NSS: md5 init end"));
 #else
   context->count[0] = context->count[1] = 0;
   /* Load magic initialization constants.
@@ -178,7 +180,6 @@ UINT4 inputLen;                         
 #ifdef HAVE_LIBNSS
   SECStatus status=PK11_DigestOp(context->ctx_nss, input, inputLen);
   PR_ASSERT(status==SECSuccess);
-  DBG(DBG_CRYPT, DBG_log("NSS: md5 update end")); 
 #else
   UINT4 i;
   unsigned int myindex, partLen;
@@ -225,7 +226,6 @@ MD5_CTX *context;                       
   PR_ASSERT(length==MD5_DIGEST_SIZE);
   PR_ASSERT(status==SECSuccess);
   PK11_DestroyContext(context->ctx_nss, PR_TRUE);
-  DBG(DBG_CRYPT, DBG_log("NSS: md5 final end"));
 #else
   unsigned char bits[8];
   unsigned int myindex, padLen;
@@ -256,6 +256,7 @@ MD5_CTX *context;                       
 
 /* MD5 basic transformation. Transforms state based on block.
  */
+#ifndef HAVE_LIBNSS
 static void MD5Transform (state, block)
 UINT4 state[4];
 const unsigned char block[64];
@@ -345,6 +346,7 @@ const unsigned char block[64];
 */
   MD5_memset ((POINTER)x, 0, sizeof (x));
 }
+#endif
 
 #if BYTE_ORDER != LITTLE_ENDIAN
 
diff -urNp openswan-2.6.22-orig/lib/libcrypto/libsha1/sha1.c openswan-2.6.22/lib/libcrypto/libsha1/sha1.c
--- openswan-2.6.22-orig/lib/libcrypto/libsha1/sha1.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libcrypto/libsha1/sha1.c	2009-07-23 16:36:01.692591026 -0400
@@ -118,14 +118,12 @@ CHAR64LONG16* block = (const CHAR64LONG1
 void SHA1Init(SHA1_CTX* context)
 {
 #ifdef HAVE_LIBNSS
-    DBG(DBG_CRYPT, DBG_log("NSS: sha1 init start"));
     SECStatus status;
     context->ctx_nss=NULL;
     context->ctx_nss = PK11_CreateDigestContext(SEC_OID_SHA1);
     PR_ASSERT(context->ctx_nss!=NULL);
     status=PK11_DigestBegin(context->ctx_nss);
     PR_ASSERT(status==SECSuccess);
-    DBG(DBG_CRYPT, DBG_log("NSS: sha1 init end"));
 #else
     /* SHA1 initialization constants */
     context->state[0] = 0x67452301;
@@ -145,7 +143,6 @@ void SHA1Update(SHA1_CTX* context, const
 #ifdef HAVE_LIBNSS
 	SECStatus status=PK11_DigestOp(context->ctx_nss, data, len);
 	PR_ASSERT(status==SECSuccess);
-	DBG(DBG_CRYPT, DBG_log("NSS: sha1 update end"));
         /*loglog(RC_LOG_SERIOUS, "enter sha1 ctx update end");*/
 #else
 u_int32_t i;
@@ -181,7 +178,6 @@ void SHA1Final(unsigned char digest[20],
 	PR_ASSERT(length==SHA1_DIGEST_SIZE);
 	PR_ASSERT(status==SECSuccess);
 	PK11_DestroyContext(context->ctx_nss, PR_TRUE);
-	DBG(DBG_CRYPT, DBG_log("NSS: sha1 final end"));
 #else
 unsigned i;
 unsigned char finalcount[8];
diff -urNp openswan-2.6.22-orig/lib/libipsecconf/confread.c openswan-2.6.22/lib/libipsecconf/confread.c
--- openswan-2.6.22-orig/lib/libipsecconf/confread.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libipsecconf/confread.c	2009-07-23 16:36:01.693590073 -0400
@@ -32,6 +32,11 @@
 #include "ipsecconf/starterlog.h"
 #include "ipsecconf/oeconns.h"
 
+#ifdef HAVE_LIBNSS
+//#ifdef FIPS_CHECK
+#include "oswconf.h"
+#endif
+
 static char _tmp_err[512];
 
 /** 
@@ -969,6 +974,18 @@ static int load_conn (struct starter_con
     /* reset authby flags */
     if(conn->options_set[KBF_AUTHBY]) {
 	conn->policy &= ~(POLICY_ID_AUTH_MASK);
+
+#ifdef HAVE_LIBNSS
+//#ifdef FIPS_CHECK
+        if(Pluto_IsFIPS()) {
+		if((conn->options[KBF_AUTHBY] & POLICY_PSK) == POLICY_PSK){
+		starter_log(LOG_LEVEL_INFO
+                        ,"while loading conn '%s', PSK not allowed in FIPS mode with NSS", conn->name);
+		return 1;
+		}      
+	}
+#endif
+
 	conn->policy |= conn->options[KBF_AUTHBY];
 
 #if STARTER_POLICY_DEBUG
diff -urNp openswan-2.6.22-orig/lib/libipsecconf/keywords.c openswan-2.6.22/lib/libipsecconf/keywords.c
--- openswan-2.6.22-orig/lib/libipsecconf/keywords.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libipsecconf/keywords.c	2009-07-23 16:36:01.694590809 -0400
@@ -79,10 +79,7 @@ struct keyword_enum_values kw_fourvalued
 struct keyword_enum_value kw_authby_values[]={
     { "never",     0},
     { "rsasig",    POLICY_RSASIG},
-/* You cannot have a PSK in an nss database */
-#ifndef HAVE_LIBNSS
     { "secret",    POLICY_PSK},
-#endif
 };
 
 struct keyword_enum_values kw_authby_list=
diff -urNp openswan-2.6.22-orig/lib/libipsecconf/Makefile openswan-2.6.22/lib/libipsecconf/Makefile
--- openswan-2.6.22-orig/lib/libipsecconf/Makefile	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libipsecconf/Makefile	2009-07-23 16:36:01.695600060 -0400
@@ -32,6 +32,13 @@ SRCS+=interfaces.c
 #enable to get lots more debugging about semantics.
 #CFLAGS+=-DPARSER_TYPE_DEBUG
 
+#ifeq ($(USE_FIPSCHECK),true)
+#CFLAGS+=-DFIPS_CHECK
+ifeq ($(USE_LIBNSS),true)
+CFLAGS+=-DHAVE_LIBNSS
+CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+endif
+
 ifeq ($(USE_KLIPS),true)
 SRCS+=virtif.c
 endif
diff -urNp openswan-2.6.22-orig/lib/libopenswan/alg_info.c openswan-2.6.22/lib/libopenswan/alg_info.c
--- openswan-2.6.22-orig/lib/libopenswan/alg_info.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libopenswan/alg_info.c	2009-07-23 16:36:01.696590101 -0400
@@ -36,6 +36,10 @@
 #include "oswlog.h"
 #include "oswalloc.h"
 
+#ifdef HAVE_LIBNSS
+#include "oswconf.h"
+#endif
+
 /* abstract reference */
 struct oakley_group_desc;
 
@@ -625,6 +629,13 @@ parser_alg_info_add(struct parser_contex
 		p_ctx->err="hash_alg not found";
 		goto out;
 	    }
+
+#ifdef HAVE_LIBNSS
+            if ( Pluto_IsFIPS() && ((aalg_id == OAKLEY_SHA2_256 ) ||(aalg_id == OAKLEY_SHA2_384 ) || (aalg_id == OAKLEY_SHA2_512 ))  ) {
+                p_ctx->err="SHA2 Not supported in FIPS mode with NSS";
+                goto out;
+            }
+#endif
 	    DBG(DBG_CRYPT, DBG_log("parser_alg_info_add() "
 				   "aalg_getbyname(\"%s\")=%d",
 				   p_ctx->aalg_buf,
diff -urNp openswan-2.6.22-orig/lib/libopenswan/pem.c openswan-2.6.22/lib/libopenswan/pem.c
--- openswan-2.6.22-orig/lib/libopenswan/pem.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libopenswan/pem.c	2009-07-23 16:36:01.768617374 -0400
@@ -195,10 +195,13 @@ pem_decrypt_3des(chunk_t *blob, chunk_t 
 {
     MD5_CTX context;
     u_char digest[MD5_DIGEST_SIZE];
-    u_char des_iv[DES_CBC_BLOCK_SIZE];
     u_char key[24];
+
+#ifndef HAVE_LIBNSS
+    u_char des_iv[DES_CBC_BLOCK_SIZE];
     des_cblock *deskey = (des_cblock *)key;
     des_key_schedule ks[3];
+#endif
     u_char padding, *last_padding_pos, *first_padding_pos;
 
     /* Convert passphrase to 3des key */
@@ -217,7 +220,8 @@ pem_decrypt_3des(chunk_t *blob, chunk_t 
     memcpy(key + MD5_DIGEST_SIZE, digest, 24 - MD5_DIGEST_SIZE);
 
 #ifdef HAVE_LIBNSS
-   do_3des_nss(blob->ptr, blob->len, key, DES_CBC_BLOCK_SIZE * 3 , iv, FALSE);
+   do_3des_nss(blob->ptr, blob->len, 
+        key, DES_CBC_BLOCK_SIZE * 3 , (u_int8_t*)iv, FALSE);
 #else
     (void) oswcrypto.des_set_key(&deskey[0], ks[0]);
     (void) oswcrypto.des_set_key(&deskey[1], ks[1]);
diff -urNp openswan-2.6.22-orig/lib/libopenswan/secrets.c openswan-2.6.22/lib/libopenswan/secrets.c
--- openswan-2.6.22-orig/lib/libopenswan/secrets.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libopenswan/secrets.c	2009-07-23 16:36:01.770594010 -0400
@@ -121,11 +121,13 @@ RSA_show_key_fields(struct RSA_private_k
 }
 
 /* debugging info that compromises security! */
+#ifndef HAVE_LIBNSS
 static void
 RSA_show_private_key(struct RSA_private_key *k)
 {
     RSA_show_key_fields(k, elemsof(RSA_private_field));
 }
+#endif
 
 static void
 RSA_show_public_key(struct RSA_public_key *k)
diff -urNp openswan-2.6.22-orig/lib/libopenswan/x509dn.c openswan-2.6.22/lib/libopenswan/x509dn.c
--- openswan-2.6.22-orig/lib/libopenswan/x509dn.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/lib/libopenswan/x509dn.c	2009-07-23 16:36:01.772589393 -0400
@@ -56,6 +56,7 @@
 #ifdef HAVE_LIBNSS
 # include <nss.h>
 # include <pk11pub.h>
+# include <keyhi.h>
 # include <secerr.h>
 # include "oswconf.h"
 #endif
diff -urNp openswan-2.6.22-orig/programs/pluto/crypt_dh.c openswan-2.6.22/programs/pluto/crypt_dh.c
--- openswan-2.6.22-orig/programs/pluto/crypt_dh.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/crypt_dh.c	2009-07-23 16:36:01.775588265 -0400
@@ -58,6 +58,9 @@
 # include <keyhi.h>
 # include "oswconf.h"
 
+#define PK11_Derive(base, mechanism, param, target, operation, keysize)  \
+	PK11_Derive_osw(base, mechanism, param, target, operation, keysize)
+
 static PK11SymKey *pk11_extract_derive_wrapper_osw(PK11SymKey *base, CK_EXTRACT_PARAMS bs
 		, CK_MECHANISM_TYPE target , CK_ATTRIBUTE_TYPE operation, int keySize)
 {
@@ -67,7 +70,7 @@ static PK11SymKey *pk11_extract_derive_w
 
     return PK11_Derive(base, CKM_EXTRACT_KEY_FROM_KEY, &param, target, operation, keySize);
 }
-
+/*
 static CK_MECHANISM_TYPE nss_hmac_mech(const struct hash_desc *hasher)
 {
     CK_MECHANISM_TYPE mechanism;
@@ -78,21 +81,22 @@ static CK_MECHANISM_TYPE nss_hmac_mech(c
 	case OAKLEY_SHA2_256:  mechanism = CKM_SHA256_HMAC; break;
 	case OAKLEY_SHA2_384:  mechanism = CKM_SHA384_HMAC; break;
 	case OAKLEY_SHA2_512:  mechanism = CKM_SHA512_HMAC; break;
-	default: loglog(RC_LOG_SERIOUS,"NSS: undefined hmac mechanism"); break; /*should not reach here*/
+	default: loglog(RC_LOG_SERIOUS,"NSS: undefined hmac mechanism"); break;
     }
     return mechanism;
 }
+*/
 
 static CK_MECHANISM_TYPE nss_encryption_mech(const struct encrypt_desc *encrypter)
 {
-    CK_MECHANISM_TYPE mechanism;
+CK_MECHANISM_TYPE mechanism=0x80000000;
 
-    switch(encrypter->common.algo_id) {
-	case OAKLEY_3DES_CBC:   mechanism = CKM_DES3_CBC; break;
-	case OAKLEY_AES_CBC:  mechanism = CKM_AES_CBC; break;
-	default: loglog(RC_LOG_SERIOUS,"NSS: Unsupported encryption mechanism"); break; /*should not reach here*/
+    switch(encrypter->common.algo_id){
+    case OAKLEY_3DES_CBC:   mechanism = CKM_DES3_CBC; break;
+    case OAKLEY_AES_CBC:  mechanism = CKM_AES_CBC; break;
+    default: loglog(RC_LOG_SERIOUS,"NSS: Unsupported encryption mechanism"); break; /*should not reach here*/
     }
-    return mechanism;
+return mechanism;
 }
 #endif
 
@@ -111,14 +115,11 @@ calc_dh_shared(chunk_t *shared, const ch
     unsigned long tv_diff;
     SECKEYPublicKey   *remote_pubk, *local_pubk;
     SECKEYPrivateKey *privk;
-    SECItem nss_g,param1;
+    SECItem nss_g;
     PK11SymKey *dhshared;
     PRArenaPool *arena;
     SECStatus status;
 
-    DBG_cond_dump_chunk(DBG_CRYPT, "NSS: DH pubk pointer:\n", pubk);
-    DBG_cond_dump_chunk(DBG_CRYPT, "NSS: DH priv key pointer:\n", secret);
-
     memcpy(&local_pubk,pubk.ptr,pubk.len);
     memcpy(&privk,secret.ptr,secret.len);
 
@@ -129,12 +130,9 @@ calc_dh_shared(chunk_t *shared, const ch
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     PR_ASSERT(arena!=NULL);
 
-    DBG(DBG_CRYPT, DBG_log("Started DH shared-secret computation in NSS:created arena\n"));
 
     remote_pubk = (SECKEYPublicKey *) PORT_ArenaZAlloc (arena, sizeof (SECKEYPublicKey));
 
-    DBG(DBG_CRYPT, DBG_log("Started DH shared-secret computation in NSS:created remote pubk\n"));
-
     remote_pubk->arena = arena;
     remote_pubk->keyType = dhKey;
     remote_pubk->pkcs11Slot = NULL;
@@ -153,7 +151,6 @@ calc_dh_shared(chunk_t *shared, const ch
     status = SECITEM_CopyItem(remote_pubk->arena, &remote_pubk->u.dh.publicValue, &nss_g);
     PR_ASSERT(status==SECSuccess);
 
-    DBG(DBG_CRYPT, DBG_log("Started DH shared-secret computation in NSS:created remote pubk data\n"));
 
     dhshared=PK11_PubDerive(privk,remote_pubk,PR_FALSE, NULL, NULL
                          , CKM_DH_PKCS_DERIVE, CKM_CONCATENATE_DATA_AND_BASE
@@ -161,10 +158,6 @@ calc_dh_shared(chunk_t *shared, const ch
                          , osw_return_nss_password_file_info());
     PR_ASSERT(dhshared!=NULL);
 
-    nss_symkey_log(dhshared,"DH Shared Secret");
-
-    DBG(DBG_CRYPT, DBG_log("Started DH shared-secret computation in NSS:created dh shared secret\n"));
-
     shared->len=sizeof(PK11SymKey *);
     shared->ptr = alloc_bytes(shared->len, "calculated shared secret");
     memcpy(shared->ptr, &dhshared,shared->len);
@@ -247,17 +240,115 @@ calc_dh_shared(chunk_t *shared, const ch
 /* SKEYID for preshared keys.
  * See draft-ietf-ipsec-ike-01.txt 4.1
  */
+
+#ifdef HAVE_LIBNSS
+static void
+skeyid_preshared(const chunk_t pss
+                 , const chunk_t ni
+                 , const chunk_t nr
+                 , const chunk_t shared_chunk
+                 , const struct hash_desc *hasher
+                 , chunk_t *skeyid_chunk)
+#else
 static void
 skeyid_preshared(const chunk_t pss
 		 , const chunk_t ni
 		 , const chunk_t nr
 		 , const struct hash_desc *hasher
 		 , chunk_t *skeyid)
+#endif
 {
     struct hmac_ctx ctx;
 
     passert(hasher != NULL);
 
+#ifdef HAVE_LIBNSS
+    chunk_t nir;
+    int k;
+    CK_MECHANISM_TYPE mechanism;
+    u_char buf1[HMAC_BUFSIZE], buf2[HMAC_BUFSIZE];
+    chunk_t buf1_chunk, buf2_chunk;
+    PK11SymKey *shared, *skeyid;
+
+    DBG(DBG_CRYPT,
+        DBG_log("NSS: skeyid inputs (pss+NI+NR+shared) hasher: %s", hasher->common.name);
+        DBG_dump_chunk("shared-secret: ", shared_chunk);
+        DBG_dump_chunk("ni: ", ni);
+        DBG_dump_chunk("nr: ", nr));
+
+     memcpy(&shared, shared_chunk.ptr, shared_chunk.len);
+
+    /* We need to hmac_init with the concatenation of Ni_b and Nr_b,
+     * so we have to build a temporary concatentation.
+     */
+
+    nir.len = ni.len + nr.len;
+    nir.ptr = alloc_bytes(nir.len, "Ni + Nr in skeyid_preshared");
+    memcpy(nir.ptr, ni.ptr, ni.len);
+    memcpy(nir.ptr+ ni.len, nr.ptr, nr.len);
+
+    memset(buf1, '\0', HMAC_BUFSIZE);
+
+    if (pss.len <= HMAC_BUFSIZE)
+    {
+        memcpy(buf1, pss.ptr, pss.len);
+    }
+    else
+    {
+        hasher->hash_init(&ctx.hash_ctx);
+        hasher->hash_update(&ctx.hash_ctx, pss.ptr, pss.len);
+        hasher->hash_final(buf1, &ctx.hash_ctx);
+    }
+
+    memcpy(buf2, buf1, HMAC_BUFSIZE);
+
+    for (k = 0; k < HMAC_BUFSIZE; k++)
+    {
+        buf1[k] ^= HMAC_IPAD;
+        buf2[k] ^= HMAC_OPAD;
+    }
+
+    //pfree(nir.ptr);
+
+    mechanism=nss_key_derivation_mech(hasher);
+    buf1_chunk.ptr=buf1;
+    buf1_chunk.len=HMAC_BUFSIZE;
+
+    buf2_chunk.ptr=buf2;
+    buf2_chunk.len=HMAC_BUFSIZE;
+
+    PK11SymKey *tkey4 = pk11_derive_wrapper_osw(shared, CKM_CONCATENATE_DATA_AND_BASE, buf1_chunk, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);
+    //nss_symkey_log(tkey4, "pss+ipad+shared");
+
+    CK_EXTRACT_PARAMS bs=0;
+    PK11SymKey *tkey5 = pk11_extract_derive_wrapper_osw(tkey4, bs, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, HMAC_BUFSIZE);
+    //nss_symkey_log(tkey5, "pss+ipad");
+
+    PK11SymKey *tkey6 = pk11_derive_wrapper_osw(tkey5, CKM_CONCATENATE_BASE_AND_DATA, nir, mechanism, CKA_DERIVE, 0);
+    pfree(nir.ptr);
+    //nss_symkey_log(tkey6, "pss+ipad+nir");
+
+    //PK11SymKey *tkey1 = pk11_derive_wrapper_osw(shared, CKM_CONCATENATE_DATA_AND_BASE, buf1_chunk, mechanism, CKA_DERIVE, 0);
+    PK11SymKey *tkey2 = PK11_Derive(tkey6, mechanism, NULL, CKM_CONCATENATE_DATA_AND_BASE, CKA_DERIVE, 0);
+    //nss_symkey_log(tkey2, "pss : tkey2");
+
+    PK11SymKey *tkey3 = pk11_derive_wrapper_osw(tkey2, CKM_CONCATENATE_DATA_AND_BASE, buf2_chunk, mechanism, CKA_DERIVE, 0);
+    skeyid = PK11_Derive(tkey3, mechanism, NULL, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
+    //nss_symkey_log(tkey2, "pss : tkey3");
+
+    skeyid_chunk->len = sizeof(PK11SymKey *);
+    skeyid_chunk->ptr = alloc_bytes(skeyid_chunk->len, "calculated skeyid(pss)");
+    memcpy(skeyid_chunk->ptr, &skeyid, skeyid_chunk->len);
+
+    PK11_FreeSymKey(tkey4);
+    PK11_FreeSymKey(tkey5);
+    PK11_FreeSymKey(tkey6);
+    PK11_FreeSymKey(tkey2);
+    PK11_FreeSymKey(tkey3);
+
+    DBG(DBG_CRYPT,
+        DBG_dump_chunk("NSS: st_skeyid in skeyid_preshared(): ", *skeyid_chunk));
+#else
     DBG(DBG_CRYPT,
 	DBG_log("Skey inputs (PSK+NI+NR)");
 	DBG_dump_chunk("ni: ", ni);
@@ -269,6 +360,7 @@ skeyid_preshared(const chunk_t pss
     hmac_final_chunk(*skeyid, "st_skeyid in skeyid_preshared()", &ctx);
     DBG(DBG_CRYPT,
 	DBG_dump_chunk("keyid: ", *skeyid));
+#endif
 }
 
 static void
@@ -406,8 +498,8 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
     {
 	case OAKLEY_PRESHARED_KEY:
 #ifdef HAVE_LIBNSS
-	    loglog(RC_LOG_SERIOUS,"OAKLEY_PRESHARED_KEY: Not Supported with NSS");
-	    bad_case(auth);
+	    setchunk_fromwire(pss,    &skq->pss, skq);
+	    skeyid_preshared(pss, ni, nr, shared_chunk, hasher, skeyid_chunk);
 #else
 	    setchunk_fromwire(pss,    &skq->pss, skq);
 	    skeyid_preshared(pss, ni, nr, hasher, skeyid_chunk);
@@ -465,7 +557,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
     PR_ASSERT(tkey2!=NULL);
 
     keyhandle=PK11_GetSymKeyHandle(shared);
-    param.data=&keyhandle;
+    param.data=(unsigned char *) &keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey3 = PK11_Derive(tkey2, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
@@ -494,7 +586,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
 
 
     keyhandle=PK11_GetSymKeyHandle(tkey7);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey9 = PK11_Derive(tkey8, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
@@ -508,14 +600,14 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
 
     /*Deriving SKEYID_a = hmac_xxx(SKEYID, SKEYID_d | g^xy | CKY-I | CKY-R | 1)*/
     keyhandle=PK11_GetSymKeyHandle(skeyid_d);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey10 = PK11_Derive(tkey2, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
     PR_ASSERT(tkey10!=NULL);
 
     keyhandle=PK11_GetSymKeyHandle(shared);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey11 = PK11_Derive(tkey10, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
@@ -537,7 +629,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
     PR_ASSERT(tkey15!=NULL);
 
     keyhandle=PK11_GetSymKeyHandle(tkey15);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey16 = PK11_Derive(tkey8, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
@@ -551,14 +643,14 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
 
     /*Deriving SKEYID_e = prf(SKEYID, SKEYID_a | g^xy | CKY-I | CKY-R | 2)*/
     keyhandle=PK11_GetSymKeyHandle(skeyid_a);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey17 = PK11_Derive(tkey2, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
     PR_ASSERT(tkey17!=NULL);
 
     keyhandle=PK11_GetSymKeyHandle(shared);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey18 = PK11_Derive(tkey17, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
@@ -580,28 +672,27 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
     PR_ASSERT(tkey22!=NULL);
 
     keyhandle=PK11_GetSymKeyHandle(tkey22);
-    param.data=&keyhandle;
+    param.data=(unsigned char*)&keyhandle;
     param.len=sizeof(keyhandle);
 
     PK11SymKey *tkey23 = PK11_Derive(tkey8, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
     PR_ASSERT(tkey23!=NULL);
 
-    DBG(DBG_CRYPT, DBG_log("NSS: enc keysize=%d\n",keysize));
+    DBG(DBG_CRYPT, DBG_log("NSS: enc keysize=%d\n",(int)keysize));
     /*Deriving encryption key from SKEYID_e*/
     /* Oakley Keying Material
      * Derived from Skeyid_e: if it is not big enough, generate more
      * using the PRF.
      * See RFC 2409 "IKE" Appendix B*/
 
-      CK_EXTRACT_PARAMS bitstart = 0;
-      param1.data = &bitstart;
+      CK_EXTRACT_PARAMS bitstart = 0; 
+      param1.data = (unsigned char*)&bitstart;
       param1.len = sizeof (bitstart);
 
        if(keysize <= hasher->hash_digest_len){
        skeyid_e = PK11_Derive(tkey23, nss_key_derivation_mech(hasher), NULL, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);
        PR_ASSERT(skeyid_e!=NULL);
 
-       nss_symkey_log(skeyid_e, "skeyid_e");
 
        enc_key = PK11_DeriveWithFlags(skeyid_e, CKM_EXTRACT_KEY_FROM_KEY, &param1
                                       , nss_encryption_mech(encrypter), CKA_FLAGS_ONLY, keysize, CKF_ENCRYPT|CKF_DECRYPT);
@@ -617,7 +708,6 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
 
         skeyid_e = PK11_Derive(tkey23, nss_key_derivation_mech(hasher), NULL, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
         PR_ASSERT(skeyid_e!=NULL);
-       nss_symkey_log(skeyid_e, "skeyid_e");
 
         PK11SymKey *tkey25 = pk11_derive_wrapper_osw(skeyid_e, CKM_CONCATENATE_BASE_AND_DATA
                                                 , hmac_pad,CKM_XOR_BASE_AND_DATA, CKA_DERIVE, HMAC_BUFSIZE);
@@ -640,7 +730,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
         PR_ASSERT(tkey29!=NULL);
 
         keyhandle=PK11_GetSymKeyHandle(tkey28);
-        param.data=&keyhandle;
+        param.data=(unsigned char*)&keyhandle;
         param.len=sizeof(keyhandle);
 
         PK11SymKey *tkey30 = PK11_Derive(tkey29, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
@@ -668,7 +758,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
                for(;;){
 
                keyhandle=PK11_GetSymKeyHandle(tkey31);
-               param.data=&keyhandle;
+               param.data=(unsigned char*)&keyhandle;
                param.len=sizeof(keyhandle);
 
                PK11SymKey *tkey34 = PK11_Derive(tkey33, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
@@ -679,7 +769,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
                PR_ASSERT(tkey35!=NULL);
 
                keyhandle=PK11_GetSymKeyHandle(tkey35);
-               param.data=&keyhandle;
+               param.data=(unsigned char*)&keyhandle;
                param.len=sizeof(keyhandle);
 
                PK11SymKey *tkey37 = PK11_Derive(tkey36, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
@@ -694,14 +784,12 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
 
                        /*concatenating K1 and K2 */
                        keyhandle=PK11_GetSymKeyHandle(tkey38);
-                       param.data=&keyhandle;
+                       param.data=(unsigned char*)&keyhandle;
                        param.len=sizeof(keyhandle);
 
                        PK11SymKey *tkey39 = PK11_Derive(keymat, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);
                        PR_ASSERT(tkey39!=NULL);
 
-                        DBG(DBG_CRYPT, DBG_log("NSS: encrypter= %d, keysize =%d\n", nss_encryption_mech(encrypter), keysize));
-
                        enc_key = PK11_DeriveWithFlags(tkey39, CKM_EXTRACT_KEY_FROM_KEY, &param1
                                               , nss_encryption_mech(encrypter), CKA_FLAGS_ONLY, /*0*/ keysize, CKF_ENCRYPT|CKF_DECRYPT);
 
@@ -731,7 +819,7 @@ calc_skeyids_iv(struct pcr_skeyid_q *skq
                        else{
 
                        keyhandle=PK11_GetSymKeyHandle(tkey38);
-                       param.data=&keyhandle;
+                       param.data=(unsigned char*)&keyhandle;
                        param.len=sizeof(keyhandle);
 
                        PK11SymKey *tkey39=PK11_Derive(keymat,CKM_CONCATENATE_BASE_AND_KEY, &param,CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
@@ -1119,18 +1207,16 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 #ifdef HAVE_LIBNSS
     const struct hash_desc *hasher = crypto_get_hasher(skq->prf_hash);
     passert(hasher);
-    DBG(DBG_CRYPT, DBG_log("NSS ikev2: found hasher\n"));
+
 
     const struct encrypt_desc *encrypter = skq->encrypter; 
     passert(encrypter);
-    DBG(DBG_CRYPT, DBG_log("NSS ikev2: found encrypter\n"));
+
 
     hmac_opad = hmac_pads(HMAC_OPAD,HMAC_BUFSIZE);
     hmac_ipad = hmac_pads(HMAC_IPAD,HMAC_BUFSIZE);
     hmac_pad_prf  = hmac_pads(0x00,HMAC_BUFSIZE-hasher->hash_digest_len);
 
-    DBG(DBG_CRYPT, DBG_log("NSS ikev2: computed required pads\n"));
-    DBG(DBG_CRYPT, DBG_log("NSS ikev2: Started computing SKEYSEED\n"));
 
     /* generate SKEYSEED from key=(Ni|Nr), hash of shared */
     {
@@ -1138,8 +1224,6 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
         memcpy(&skeyseed_k, skeyseed->ptr, skeyseed->len);
     }
     passert(skeyseed_k);
-    nss_symkey_log(skeyseed_k, "skeyseed");
-    DBG(DBG_CRYPT, DBG_log("NSS ikev2: Computed SKEYSEED\n"));
 
 #else
     vpss.prf_hasher = crypto_get_hasher(skq->prf_hash);
@@ -1202,19 +1286,18 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 	    DBG_dump_chunk("Nr", vpss.nr);
 	    DBG_dump_chunk("SPIi", vpss.spii);
 	    DBG_dump_chunk("SPIr", vpss.spir);
-	    DBG_log("Total keysize needed %ld", total_keysize);
+	    DBG_log("Total keysize needed %d", (int)total_keysize);
 	}
 #ifdef HAVE_LIBNSS
 	counter.ptr = &vpss.counter[0];
 	counter.len =1;
 
-	DBG(DBG_CRYPT, DBG_log("NSS ikev2: Started computing key material for IKEv2 SA\n"));
 
 	PK11SymKey *finalkey;
 	PK11SymKey *tkey1 = pk11_derive_wrapper_osw(skeyseed_k, CKM_CONCATENATE_BASE_AND_DATA
 		, hmac_pad_prf,CKM_XOR_BASE_AND_DATA, CKA_DERIVE, HMAC_BUFSIZE);
 	PR_ASSERT(tkey1!=NULL);
-	nss_symkey_log(tkey1, "1");
+
 
 	for(;;)
 	{
@@ -1224,7 +1307,6 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 		PK11SymKey *tkey2 = pk11_derive_wrapper_osw(tkey1, CKM_XOR_BASE_AND_DATA
 			, hmac_ipad, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
 		PR_ASSERT(tkey2!=NULL);
-		nss_symkey_log(tkey2, "2");
 
 		tkey3 = pk11_derive_wrapper_osw(tkey2, CKM_CONCATENATE_BASE_AND_DATA
 			, vpss.ni, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
@@ -1233,16 +1315,15 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 		PK11SymKey *tkey2 = pk11_derive_wrapper_osw(tkey1, CKM_XOR_BASE_AND_DATA
 			, hmac_ipad, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
 		PR_ASSERT(tkey2!=NULL);
-		nss_symkey_log(tkey2, "2");
+	
 
 		keyhandle=PK11_GetSymKeyHandle(tkey11);
-		param.data=&keyhandle;
+		param.data=(unsigned char*)&keyhandle;
 		param.len=sizeof(keyhandle);
 
 		PK11SymKey *tkey12 = PK11_Derive(tkey2, CKM_CONCATENATE_BASE_AND_KEY
 			, &param, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
 		PR_ASSERT(tkey12!=NULL);
-		nss_symkey_log(tkey12, "tkey12");
 
 		tkey3 = pk11_derive_wrapper_osw(tkey12, CKM_CONCATENATE_BASE_AND_DATA
 			, vpss.ni, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
@@ -1252,70 +1333,67 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 	   }       
 
 	   PR_ASSERT(tkey3!=NULL);
-	   nss_symkey_log(tkey3, "3");
+
        
 	   PK11SymKey *tkey4 = pk11_derive_wrapper_osw(tkey3, CKM_CONCATENATE_BASE_AND_DATA
 			, vpss.nr, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
 	   PR_ASSERT(tkey4!=NULL);
-	   nss_symkey_log(tkey4, "4");
+
 
 	   PK11SymKey *tkey5 = pk11_derive_wrapper_osw(tkey4, CKM_CONCATENATE_BASE_AND_DATA
 			, vpss.spii, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
 	   PR_ASSERT(tkey5!=NULL);
-	   nss_symkey_log(tkey5, "5");
+
 
 	   PK11SymKey *tkey6 = pk11_derive_wrapper_osw(tkey5, CKM_CONCATENATE_BASE_AND_DATA
 			, vpss.spir, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
 	   PR_ASSERT(tkey6!=NULL);
-	   nss_symkey_log(tkey6, "6");
+
 
 	   PK11SymKey *tkey7 = pk11_derive_wrapper_osw(tkey6, CKM_CONCATENATE_BASE_AND_DATA
 			, counter, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
 	   PR_ASSERT(tkey7!=NULL);
-	   nss_symkey_log(tkey7, "7");
+
 
 	   PK11SymKey *tkey8 = PK11_Derive(tkey7, nss_key_derivation_mech(hasher), NULL, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
 	   PR_ASSERT(tkey8!=NULL);
-	   nss_symkey_log(tkey8, "8");
+
 
 	   PK11SymKey *tkey9 = pk11_derive_wrapper_osw(tkey1, CKM_XOR_BASE_AND_DATA
 			, hmac_opad, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
 	   PR_ASSERT(tkey9!=NULL);
-	   nss_symkey_log(tkey9, "9");
+
 
 	   keyhandle=PK11_GetSymKeyHandle(tkey8);
-	   param.data=&keyhandle;
+	   param.data=(unsigned char*)&keyhandle;
 	   param.len=sizeof(keyhandle);
 
 	   PK11SymKey *tkey10 = PK11_Derive(tkey9, CKM_CONCATENATE_BASE_AND_KEY, &param, nss_key_derivation_mech(hasher), CKA_DERIVE, 0);
 	   PR_ASSERT(tkey10!=NULL);
-	   nss_symkey_log(tkey10, "10");
+
 
 	   if(vpss.counter[0]== 0x01) {
 		finalkey = PK11_Derive(tkey10, nss_key_derivation_mech(hasher), NULL, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
 		PR_ASSERT(finalkey!=NULL);
-		nss_symkey_log(finalkey, "finalkey");
+
 
 		tkey11 = PK11_Derive(tkey10, nss_key_derivation_mech(hasher), NULL, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
 		PR_ASSERT(tkey11!=NULL);
-		nss_symkey_log(tkey11, "tkey11");
 	   } else {
 		tkey11 = PK11_Derive(tkey10, nss_key_derivation_mech(hasher), NULL, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);
 		PR_ASSERT(tkey11!=NULL);
-		nss_symkey_log(tkey11, "tkey11");
+
 
 		keyhandle=PK11_GetSymKeyHandle(tkey11);
-		param.data=&keyhandle;
+		param.data=(unsigned char*)&keyhandle;
 		param.len=sizeof(keyhandle);
 
 		if( total_keysize <= (PK11_GetKeyLength(finalkey)+PK11_GetKeyLength(tkey11)) ) {
 		   finalkey = PK11_Derive(finalkey, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);
 		   PR_ASSERT(finalkey!=NULL);
-		   nss_symkey_log(finalkey, "finalkey");
 		} else {
 		   finalkey = PK11_Derive(finalkey, CKM_CONCATENATE_BASE_AND_KEY, &param, CKM_CONCATENATE_BASE_AND_KEY, CKA_DERIVE, 0);
 		   PR_ASSERT(finalkey!=NULL);
-		   nss_symkey_log(finalkey, "finalkey");
 		}
 	   }
 
@@ -1340,37 +1418,37 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 	DBG(DBG_CRYPT, DBG_log("NSS ikev2: finished computing key material for IKEv2 SA\n"));
 	CK_EXTRACT_PARAMS bs=0;
 	SK_d_k = pk11_extract_derive_wrapper_osw(finalkey, bs, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, skd_bytes);
-	nss_symkey_log(SK_d_k, "SK_d_k");
+
 
 	bs= skd_bytes*BITS_PER_BYTE;
 	SK_ai_k = pk11_extract_derive_wrapper_osw(finalkey, bs, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, ska_bytes);
-	nss_symkey_log(SK_ai_k, "SK_ai_k");
+
 
 	bs= (skd_bytes + ska_bytes)*BITS_PER_BYTE;
 	SK_ar_k = pk11_extract_derive_wrapper_osw(finalkey, bs, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, ska_bytes);
-	nss_symkey_log(SK_ar_k, "SK_ar_k");
+
 
 	bs= (skd_bytes + (2*ska_bytes))*BITS_PER_BYTE;
 	param1.data =(unsigned char*)&bs;
 	param1.len = sizeof(bs);
 	SK_ei_k = PK11_DeriveWithFlags(finalkey, CKM_EXTRACT_KEY_FROM_KEY, &param1
 		, nss_encryption_mech(encrypter), CKA_FLAGS_ONLY, ske_bytes, CKF_ENCRYPT|CKF_DECRYPT);
-	nss_symkey_log(SK_ei_k, "SK_ei_k");
+
 
 	bs= (skd_bytes + (2*ska_bytes) + ske_bytes)*BITS_PER_BYTE;
 	param1.data =(unsigned char*)&bs;
 	param1.len = sizeof(bs);
 	SK_er_k = PK11_DeriveWithFlags(finalkey, CKM_EXTRACT_KEY_FROM_KEY, &param1
 		, nss_encryption_mech(encrypter), CKA_FLAGS_ONLY, ske_bytes, CKF_ENCRYPT|CKF_DECRYPT);
-	nss_symkey_log(SK_er_k, "SK_er_k");
+
 
 	bs= (skd_bytes + (2*ska_bytes) + (2*ske_bytes))*BITS_PER_BYTE;
 	SK_pi_k = pk11_extract_derive_wrapper_osw(finalkey, bs, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, skp_bytes);
-	nss_symkey_log(SK_pi_k, "SK_pi_k");
+
 
 	bs= (skd_bytes + (2*ska_bytes) + (2*ske_bytes)+skp_bytes)*BITS_PER_BYTE;
 	SK_pr_k = pk11_extract_derive_wrapper_osw(finalkey, bs, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, skp_bytes);
-	nss_symkey_log(SK_pr_k, "SK_pr_k");
+
 
 
 	DBG(DBG_CRYPT, DBG_log("NSS ikev2: finished computing individual keys for IKEv2 SA\n"));
@@ -1380,37 +1458,37 @@ calc_skeyseed_v2(struct pcr_skeyid_q *sk
 	SK_d->len = sizeof(PK11SymKey *);
 	SK_d->ptr = alloc_bytes(SK_d->len, "SK_d");
 	memcpy(SK_d->ptr, &SK_d_k, SK_d->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_d\n"));
+
 
 	SK_ai->len = sizeof(PK11SymKey *);
 	SK_ai->ptr = alloc_bytes(SK_ai->len, "SK_ai");
 	memcpy(SK_ai->ptr, &SK_ai_k, SK_ai->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_ai\n"));
+
 
 	SK_ar->len = sizeof(PK11SymKey *);
 	SK_ar->ptr = alloc_bytes(SK_ar->len, "SK_ar");
 	memcpy(SK_ar->ptr, &SK_ar_k, SK_ar->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_ar\n"));
+
 
 	SK_ei->len = sizeof(PK11SymKey *);
 	SK_ei->ptr = alloc_bytes(SK_ei->len, "SK_ei");
 	memcpy(SK_ei->ptr, &SK_ei_k, SK_ei->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_ei\n"));
+
 
 	SK_er->len = sizeof(PK11SymKey *);
 	SK_er->ptr = alloc_bytes(SK_er->len, "SK_er");
 	memcpy(SK_er->ptr, &SK_er_k, SK_er->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_er\n"));
+
 
 	SK_pi->len = sizeof(PK11SymKey *);
 	SK_pi->ptr = alloc_bytes(SK_pi->len, "SK_pi");
 	memcpy(SK_pi->ptr, &SK_pi_k, SK_pi->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_pi\n"));
+
 
 	SK_pr->len = sizeof(PK11SymKey *);
 	SK_pr->ptr = alloc_bytes(SK_pr->len, "SK_pr");
 	memcpy(SK_pr->ptr, &SK_pr_k, SK_pr->len);   
-	DBG(DBG_CRYPT, DBG_log("NSS: copied SK_pr\n"));
+
 
 	freeanychunk(hmac_opad);
 	freeanychunk(hmac_ipad);
diff -urNp openswan-2.6.22-orig/programs/pluto/crypto.h openswan-2.6.22/programs/pluto/crypto.h
--- openswan-2.6.22-orig/programs/pluto/crypto.h	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/crypto.h	2009-07-23 16:36:01.776589745 -0400
@@ -148,6 +148,9 @@ extern chunk_t hmac_pads(u_char val, uns
 extern PK11SymKey *pk11_derive_wrapper_osw(PK11SymKey *base, CK_MECHANISM_TYPE mechanism
                                            , chunk_t data, CK_MECHANISM_TYPE target
                                            , CK_ATTRIBUTE_TYPE operation, int keySize);
+extern PK11SymKey *PK11_Derive_osw(PK11SymKey *base, CK_MECHANISM_TYPE mechanism
+                                           , SECItem *param, CK_MECHANISM_TYPE target
+                                           , CK_ATTRIBUTE_TYPE operation, int keySize);
 #endif
 
 #endif /* _CRYPTO_H */
diff -urNp openswan-2.6.22-orig/programs/pluto/hmac.c openswan-2.6.22/programs/pluto/hmac.c
--- openswan-2.6.22-orig/programs/pluto/hmac.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/hmac.c	2009-07-23 16:36:01.779603531 -0400
@@ -26,7 +26,6 @@
 #include "crypto.h" /* requires sha1.h and md5.h */
 #include "alg_info.h"
 #include "ike_alg.h"
-#include "oswlog.h"
 
 #ifdef HAVE_LIBNSS
 # include <nss.h>
@@ -69,23 +68,20 @@ hmac_init(struct hmac_ctx *ctx,
     unsigned int klen;
     chunk_t hmac_opad, hmac_ipad, hmac_pad;
     /* empty parameters for the cryptographic context */
-    SECItem noparams = { siBuffer, NULL, 0 };
 
     memcpy(&symkey, key, key_len);
-    nss_symkey_log(symkey, "hmac symkey");
 
     klen =  PK11_GetKeyLength(symkey);
 
     hmac_opad = hmac_pads(HMAC_OPAD,HMAC_BUFSIZE);
     hmac_ipad = hmac_pads(HMAC_IPAD,HMAC_BUFSIZE);
-    hmac_pad  = hmac_pads(0x00,HMAC_BUFSIZE-h->hash_digest_len);
+    //hmac_pad  = hmac_pads(0x00,HMAC_BUFSIZE-h->hash_digest_len);
+    hmac_pad  = hmac_pads(0x00,HMAC_BUFSIZE-klen);
 
     if(klen > HMAC_BUFSIZE) 
     {
-	DBG(DBG_CRYPT, DBG_log("NSS: key len is greater than block size"));
-	tkey1 = PK11_Derive(symkey, nss_key_derivation_mech(h), NULL, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
-	DBG(DBG_CRYPT, DBG_log("NSS: created digest of key"));
-	nss_symkey_log(tkey1, "hmac symkey digested");
+	//tkey1 = PK11_Derive(symkey, nss_key_derivation_mech(h), NULL, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
+	tkey1 = PK11_Derive_osw(symkey, nss_key_derivation_mech(h), NULL, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, 0);
     }
     else
     {
@@ -102,13 +98,11 @@ hmac_init(struct hmac_ctx *ctx,
 					, hmac_ipad,nss_hash_mech(h), CKA_DIGEST, 0);
 
     PR_ASSERT(ctx->ikey !=NULL);
-    nss_symkey_log(ctx->ikey, "ctx ikey");
 
     ctx->okey = pk11_derive_wrapper_osw(tkey2, CKM_XOR_BASE_AND_DATA
 					, hmac_opad,nss_hash_mech(h), CKA_DIGEST, 0);
 
     PR_ASSERT(ctx->okey !=NULL);
-    nss_symkey_log(ctx->okey, "ctx okey");
 
     if(tkey1!=symkey) {
 	PK11_FreeSymKey(tkey1);
@@ -120,17 +114,13 @@ hmac_init(struct hmac_ctx *ctx,
     freeanychunk(hmac_pad);
     ctx->ctx_nss = PK11_CreateDigestContext(nss_hash_oid(h));
     PR_ASSERT(ctx->ctx_nss!=NULL);
-    DBG(DBG_CRYPT, DBG_log("NSS: context created for hmac (doing it the hash way)"));
 
     status=PK11_DigestBegin(ctx->ctx_nss);
     PR_ASSERT(status==SECSuccess);
-    DBG(DBG_CRYPT, DBG_log("NSS: Digest begin succeeded"));
 
     status=PK11_DigestKey(ctx->ctx_nss, ctx->ikey);
     PR_ASSERT(status==SECSuccess);
 
-    DBG(DBG_CRYPT, DBG_log("NSS: digested inner key"));
-
 #else
 
     /* Prepare the two pads for the HMAC */
@@ -174,12 +164,10 @@ hmac_update(struct hmac_ctx *ctx,
     const u_char *data, size_t data_len)
 {
 #ifdef HAVE_LIBNSS
-    DBG(DBG_CRYPT, DBG_log("NSS: hmac update start"));
     if(data_len > 0) {
 	SECStatus status = PK11_DigestOp(ctx->ctx_nss, data, data_len);
 	PR_ASSERT(status == SECSuccess);
     }
-	DBG(DBG_CRYPT, DBG_log("NSS: hmac update end"));
 #else
     ctx->h->hash_update(&ctx->hash_ctx, data, data_len);
 #endif
@@ -198,7 +186,6 @@ hmac_final(u_char *output, struct hmac_c
     h->hash_update(&ctx->hash_ctx, output, h->hash_digest_len);
     h->hash_final(output, &ctx->hash_ctx);
 #else
-    DBG(DBG_CRYPT, DBG_log("NSS: hmac final start"));
     unsigned int outlen = 0;
     SECStatus status = PK11_DigestFinal(ctx->ctx_nss, output, &outlen, ctx->hmac_digest_len);
     PR_ASSERT(status == SECSuccess);
@@ -208,20 +195,16 @@ hmac_final(u_char *output, struct hmac_c
 
     ctx->ctx_nss = PK11_CreateDigestContext(nss_hash_oid(ctx->h));
     PR_ASSERT(ctx->ctx_nss!=NULL);
-    DBG(DBG_CRYPT, DBG_log("NSS: hmac final context creation"));
 
     status=PK11_DigestBegin(ctx->ctx_nss);
     PR_ASSERT(status==SECSuccess);
-    DBG(DBG_CRYPT, DBG_log("NSS: hmac second final digest begin"));
 
     status=PK11_DigestKey(ctx->ctx_nss, ctx->okey);
     PR_ASSERT(status==SECSuccess);
 
-    DBG(DBG_CRYPT, DBG_log("NSS: digested outer key"));
     status = PK11_DigestOp(ctx->ctx_nss, output, outlen);
     PR_ASSERT(status == SECSuccess);
 
-    DBG(DBG_CRYPT, DBG_log("NSS: digested inner data"));
     status = PK11_DigestFinal(ctx->ctx_nss, output, &outlen, ctx->hmac_digest_len);
     PR_ASSERT(status == SECSuccess);
     PR_ASSERT(outlen == ctx->hmac_digest_len);
@@ -236,7 +219,7 @@ hmac_final(u_char *output, struct hmac_c
 #ifdef HAVE_LIBNSS
 static SECOidTag nss_hash_oid(const struct hash_desc *hasher)
 {
-    SECOidTag mechanism;
+    SECOidTag mechanism=0;
 
     switch(hasher->common.algo_id) {
 	case OAKLEY_MD5:   mechanism = SEC_OID_MD5; break;
@@ -251,7 +234,7 @@ static SECOidTag nss_hash_oid(const stru
 
 static CK_MECHANISM_TYPE nss_hash_mech(const struct hash_desc *hasher)
 {
-    CK_MECHANISM_TYPE mechanism;
+    CK_MECHANISM_TYPE mechanism=0x80000000;
 
     switch(hasher->common.algo_id) {
 	case OAKLEY_MD5:   mechanism = CKM_MD5; break;
@@ -279,9 +262,66 @@ PK11SymKey *pk11_derive_wrapper_osw(PK11
     return PK11_Derive(base, mechanism, &param, target, operation, keySize);
 }
 
+PK11SymKey * PK11_Derive_osw(PK11SymKey *base, CK_MECHANISM_TYPE mechanism
+				    , SECItem *param, CK_MECHANISM_TYPE target
+				    , CK_ATTRIBUTE_TYPE  operation, int keysize)
+{
+	SECOidTag oid;
+	PK11Context *ctx;
+	unsigned char dkey[HMAC_BUFSIZE];
+	SECItem dkey_param;
+	SECStatus status;
+	unsigned int len=0;
+	CK_EXTRACT_PARAMS bs;
+        chunk_t dkey_chunk;
+
+	if( ((mechanism == CKM_SHA256_KEY_DERIVATION) || 
+	     (mechanism == CKM_SHA384_KEY_DERIVATION)||
+	      (mechanism == CKM_SHA512_KEY_DERIVATION)) && (param == NULL) && (keysize ==0)) {
+
+	switch (mechanism) {
+	case CKM_SHA256_KEY_DERIVATION: oid = SEC_OID_SHA256; break;
+        case CKM_SHA384_KEY_DERIVATION: oid = SEC_OID_SHA384; break;
+        case CKM_SHA512_KEY_DERIVATION: oid = SEC_OID_SHA512; break;
+	default: DBG(DBG_CRYPT, DBG_log("PK11_Derive_osw: Invalid NSS mechanism ")); break; /*should not reach here*/
+	}
+
+	ctx = PK11_CreateDigestContext(oid);
+	PR_ASSERT(ctx!=NULL);
+	status=PK11_DigestBegin(ctx);
+        PR_ASSERT(status == SECSuccess);
+	status=PK11_DigestKey(ctx, base);
+        PR_ASSERT(status == SECSuccess);
+	PK11_DigestFinal(ctx, dkey, &len, sizeof dkey);
+	PK11_DestroyContext(ctx, PR_TRUE);	
+
+	dkey_chunk.ptr = dkey;
+	dkey_chunk.len = len;
+
+        PK11SymKey *tkey1 = pk11_derive_wrapper_osw(base, CKM_CONCATENATE_DATA_AND_BASE, dkey_chunk, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);
+        PR_ASSERT(tkey1!=NULL);
+
+        bs=0;
+        dkey_param.data = (unsigned char*)&bs;
+        dkey_param.len = sizeof (bs);
+        PK11SymKey *tkey2 = PK11_Derive(tkey1, CKM_EXTRACT_KEY_FROM_KEY, &dkey_param, target, operation, len);
+        PR_ASSERT(tkey2!=NULL);
+
+        PK11_FreeSymKey(tkey1);
+	
+	return tkey2;
+
+	}
+	else {
+	return PK11_Derive(base, mechanism, param, target, operation, keysize);
+	}
+
+}
+
+
 CK_MECHANISM_TYPE nss_key_derivation_mech(const struct hash_desc *hasher)
 {
-    CK_MECHANISM_TYPE mechanism;
+    CK_MECHANISM_TYPE mechanism=0x80000000;
 
     switch(hasher->common.algo_id) {
 	case OAKLEY_MD5:   mechanism = CKM_MD5_KEY_DERIVATION; break;
diff -urNp openswan-2.6.22-orig/programs/pluto/ike_alg_aes.c openswan-2.6.22/programs/pluto/ike_alg_aes.c
--- openswan-2.6.22-orig/programs/pluto/ike_alg_aes.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/ike_alg_aes.c	2009-07-23 16:36:01.780592711 -0400
@@ -78,7 +78,7 @@ do_aes(u_int8_t *buf, size_t buf_len, u_
     memcpy(buf,tmp_buf,buf_len);  
 
     if(enc){
-    new_iv = (char*) buf + buf_len-AES_CBC_BLOCK_SIZE;
+    new_iv = (u_int8_t*) buf + buf_len-AES_CBC_BLOCK_SIZE;
     }
 
     memcpy(iv, new_iv, AES_CBC_BLOCK_SIZE);
diff -urNp openswan-2.6.22-orig/programs/pluto/ikev1.h openswan-2.6.22/programs/pluto/ikev1.h
--- openswan-2.6.22-orig/programs/pluto/ikev1.h	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/ikev1.h	2009-07-23 16:36:01.780592711 -0400
@@ -68,12 +68,21 @@ extern void ikev1_delete_out(struct stat
 extern bool
 decode_peer_id(struct msg_digest *md, bool initiator, bool aggrmode);
 
+#ifdef HAVE_LIBNSS
+extern void
+main_mode_hash_body(struct state *st
+                    , bool hashi        /* Initiator? */
+                    , const pb_stream *idpl     /* ID payload, as PBS */
+                    , struct hmac_ctx *ctx
+                    , hash_update_t hash_update_void);
+#else
 extern void
 main_mode_hash_body(struct state *st
 		    , bool hashi	/* Initiator? */
 		    , const pb_stream *idpl	/* ID payload, as PBS */
 		    , union hash_ctx *ctx
 		    , hash_update_t hash_update_void);
+#endif
 
 extern size_t
 RSA_sign_hash(struct connection *c
diff -urNp openswan-2.6.22-orig/programs/pluto/ikev1_main.c openswan-2.6.22/programs/pluto/ikev1_main.c
--- openswan-2.6.22-orig/programs/pluto/ikev1_main.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/ikev1_main.c	2009-07-23 16:36:01.782590767 -0400
@@ -286,13 +286,23 @@ main_outI1(int whack_sock
  * See draft-ietf-ipsec-ike-01.txt 4.1 and 6.1.1.2
  */
 
+#ifdef HAVE_LIBNSS
+void
+main_mode_hash_body(struct state *st
+                    , bool hashi        /* Initiator? */
+                    , const pb_stream *idpl     /* ID payload, as PBS */
+                    , struct hmac_ctx *ctx 
+                    , hash_update_t hash_update_void)
+#else
 void
 main_mode_hash_body(struct state *st
 		    , bool hashi	/* Initiator? */
 		    , const pb_stream *idpl	/* ID payload, as PBS */
 		    , union hash_ctx *ctx
 		    , hash_update_t hash_update_void)
+#endif
 {
+#ifndef HAVE_LIBNSS
 #define HASH_UPDATE_T (union hash_ctx *, const u_char *input, unsigned int len)
     hash_update_t hash_update=(hash_update_t)  hash_update_void;
 #if 0	/* if desperate to debug hashing */
@@ -303,6 +313,9 @@ main_mode_hash_body(struct state *st
 #endif
 
 #   define hash_update_chunk(ctx, ch) hash_update((ctx), (ch).ptr, (ch).len)
+#else
+ hash_update_void = NULL;
+#endif
 
     if (hashi)
     {
@@ -492,8 +505,10 @@ try_RSA_signature_v1(const u_char hash_v
 {
     const u_char *sig_val = sig_pbs->cur;
     size_t sig_len = pbs_left(sig_pbs);
+#ifndef HAVE_LIBNSS
     u_char s[RSA_MAX_OCTETS];	/* for decrypted sig_val */
     u_char *hash_in_s = &s[sig_len - hash_len];
+#endif
     const struct RSA_public_key *k = &kr->u.rsa;
 
     /* decrypt the signature -- reversing RSA_sign_hash */
@@ -742,18 +757,6 @@ main_inI1_outR1(struct msg_digest *md)
     }
 #endif
 
-#ifdef HAVE_LIBNSS
-       if(PK11_IsFIPS())
-       {
-#define SEND_PLUTO_VID 0
-	}
-	else
-	{
-#define SEND_PLUTO_VID 1
-	}
-
-#endif
-
 #if SEND_PLUTO_VID || defined(openpgp_peer)
     numvidtosend++;
 #endif
diff -urNp openswan-2.6.22-orig/programs/pluto/ikev2_psk.c openswan-2.6.22/programs/pluto/ikev2_psk.c
--- openswan-2.6.22-orig/programs/pluto/ikev2_psk.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/ikev2_psk.c	2009-07-23 16:36:01.784590529 -0400
@@ -58,6 +58,11 @@
 #include "dpd.h"
 #include "keys.h"
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
 static u_char psk_key_pad_str[] = "Key Pad for IKEv2"; /* 4306  2:15 */
 static int psk_key_pad_str_len = 17; /* sizeof( psk_key_pad_str); -1 */
 
@@ -80,6 +85,14 @@ static bool ikev2_calculate_psk_sighash(
 	return FALSE;	/* failure: no PSK to use */
     }
 
+#ifdef HAVE_LIBNSS
+        PK11SymKey *shared;
+        CK_EXTRACT_PARAMS bs;
+        SECItem param;
+
+        memcpy(&shared, st->st_shared.ptr, st->st_shared.len);
+#endif
+
     /*	RFC 4306  2:15
 	AUTH = prf(prf(Shared Secret,"Key Pad for IKEv2"), <msg octets>)
     */
@@ -87,7 +100,30 @@ static bool ikev2_calculate_psk_sighash(
     /* calculate inner prf */
     {
 	struct hmac_ctx id_ctx;
+#ifdef HAVE_LIBNSS
+	chunk_t pss_chunk;
+
+	PK11SymKey *tkey1 = pk11_derive_wrapper_osw(shared, CKM_CONCATENATE_DATA_AND_BASE, *pss, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);	
+	PR_ASSERT(tkey1!=NULL);
+
+	bs=0;
+	param.data = (unsigned char*)&bs;
+	param.len = sizeof (bs);
+	PK11SymKey *tkey2 = PK11_Derive(tkey1, CKM_EXTRACT_KEY_FROM_KEY, &param, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, pss->len);
+	PR_ASSERT(tkey2!=NULL);
+
+	pss_chunk.len = sizeof(PK11SymKey *);
+	pss_chunk.ptr = alloc_bytes(pss_chunk.len, "ikev2_calculate_psk_sighash: calculated pss_chunk");
+	memcpy(pss_chunk.ptr, &tkey2, pss_chunk.len);
+
+	hmac_init_chunk(&id_ctx, st->st_oakley.prf_hasher, pss_chunk);
+	
+	PK11_FreeSymKey(tkey1);
+	PK11_FreeSymKey(tkey2);
+	pfree(pss_chunk.ptr);
+#else
 	hmac_init_chunk(&id_ctx, st->st_oakley.prf_hasher, *pss);	
+#endif
 	hmac_update(&id_ctx, psk_key_pad_str, psk_key_pad_str_len);
 	hmac_final(prf_psk, &id_ctx);
     }
@@ -117,8 +153,33 @@ static bool ikev2_calculate_psk_sighash(
     /* calculate outer prf */
     {
 	struct hmac_ctx id_ctx;
+#ifdef HAVE_LIBNSS
+        chunk_t pp_chunk, pps_chunk;
 	
-	hmac_init(&id_ctx, st->st_oakley.prf_hasher, prf_psk, hash_len); 
+	pp_chunk.ptr = prf_psk;
+	pp_chunk.len = hash_len;
+
+        PK11SymKey *tkey1 = pk11_derive_wrapper_osw(shared, CKM_CONCATENATE_DATA_AND_BASE, pp_chunk, CKM_EXTRACT_KEY_FROM_KEY, CKA_DERIVE, 0);      
+        PR_ASSERT(tkey1!=NULL);
+
+        bs=0;
+        param.data = (unsigned char*)&bs;
+        param.len = sizeof (bs);
+        PK11SymKey *tkey2 = PK11_Derive(tkey1, CKM_EXTRACT_KEY_FROM_KEY, &param, CKM_CONCATENATE_BASE_AND_DATA, CKA_DERIVE, hash_len);
+        PR_ASSERT(tkey2!=NULL);
+
+        pps_chunk.len = sizeof(PK11SymKey *);
+        pps_chunk.ptr = alloc_bytes(pps_chunk.len, "ikev2_calculate_psk_sighash: calculated pss_chunk");
+        memcpy(pps_chunk.ptr, &tkey2, pps_chunk.len);
+
+        hmac_init_chunk(&id_ctx, st->st_oakley.prf_hasher, pps_chunk);
+
+        PK11_FreeSymKey(tkey1);
+        PK11_FreeSymKey(tkey2);
+        pfree(pps_chunk.ptr);
+#else
+        hmac_init(&id_ctx, st->st_oakley.prf_hasher, prf_psk, hash_len);
+#endif
 	
 /*
  *  For the responder, the octets to
diff -urNp openswan-2.6.22-orig/programs/pluto/ikev2_rsa.c openswan-2.6.22/programs/pluto/ikev2_rsa.c
--- openswan-2.6.22-orig/programs/pluto/ikev2_rsa.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/ikev2_rsa.c	2009-07-23 16:36:01.784590529 -0400
@@ -152,10 +152,12 @@ try_RSA_signature_v2(const u_char hash_v
 {
     const u_char *sig_val = sig_pbs->cur;
     size_t sig_len = pbs_left(sig_pbs);
+#ifndef HAVE_LIBNSS
     u_char s[RSA_MAX_OCTETS];	/* for decrypted sig_val */
     u_char *sig;
-    const struct RSA_public_key *k = &kr->u.rsa;
     unsigned int padlen;
+#endif
+    const struct RSA_public_key *k = &kr->u.rsa;
     
     if (k == NULL)
 	return "1""no key available";	/* failure: no key to use */
diff -urNp openswan-2.6.22-orig/programs/pluto/keys.c openswan-2.6.22/programs/pluto/keys.c
--- openswan-2.6.22-orig/programs/pluto/keys.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/keys.c	2009-07-23 16:36:01.785593513 -0400
@@ -213,7 +213,7 @@ sign_hash(const struct RSA_private_key *
 }
 
 #ifdef HAVE_LIBNSS
-void sign_hash_nss(const struct RSA_private_key *k
+int sign_hash_nss(const struct RSA_private_key *k
 	, const u_char *hash_val, size_t hash_len
 	, u_char *sig_val, size_t sig_len)
 {
@@ -229,14 +229,19 @@ void sign_hash_nss(const struct RSA_priv
     ckaId.len=k->ckaid_len;
     ckaId.data=k->ckaid;
 
-    DBG(DBG_CRYPT, DBG_dump("RSA_sign_hash NSS CKA_ID:\n", ckaId.data, ckaId.len));
-
     slot = PK11_GetInternalKeySlot();
     if (slot == NULL) {
 	loglog(RC_LOG_SERIOUS, "RSA_sign_hash: Unable to find (slot security) device (err %d)\n", PR_GetError());
 	return 0;
     }
 
+	if( PK11_Authenticate(slot, PR_FALSE,osw_return_nss_password_file_info()) == SECSuccess ) {
+	DBG(DBG_CRYPT, DBG_log("NSS: Authentication to NSS successful\n"));	
+	} 
+	else {
+	DBG(DBG_CRYPT, DBG_log("NSS: Authentication to NSS either failed or not required,if NSS DB without password\n"));
+	}
+
     privateKey = PK11_FindKeyByKeyID(slot, &ckaId, osw_return_nss_password_file_info());
     if(privateKey==NULL) {
 	if(k->pub.nssCert != NULL) {
@@ -269,10 +274,8 @@ void sign_hash_nss(const struct RSA_priv
 	return 0;
    }
 
-   DBG(DBG_CRYPT, DBG_log("RSA_sign_hash: input_sig_len=%d, output_signature-len=%d", sig_len, signature.len));
-   DBG(DBG_CRYPT, DBG_dump("RSA_sign_hash signature:\n", signature.data, signature.len));
    DBG(DBG_CRYPT, DBG_log("RSA_sign_hash: Ended using NSS"));
-   /*return signature.len;*/
+   return signature.len;
 }
 
 err_t RSA_signature_verify_nss(const struct RSA_public_key *k
@@ -334,20 +337,31 @@ err_t RSA_signature_verify_nss(const str
     signature.data = sig_val;
     signature.len  = (unsigned int)sig_len;
 
+    data.len = (unsigned int)sig_len;
+    data.data = alloc_bytes(data.len, "NSS decrypted signature");
     data.type = siBuffer;
-    data.data = hash_val;
-    data.len  = (unsigned int)hash_len;
-       
-    /*Verifying RSA signature*/
-     retVal = PK11_Verify(publicKey,&signature,&data,osw_return_nss_password_file_info());
 
+    if(PK11_VerifyRecover(publicKey, &signature, &data, osw_return_nss_password_file_info()) == SECSuccess ) {
+	DBG(DBG_CRYPT,DBG_dump("NSS RSA verify: decrypted sig: ", data.data, data.len));
+    }
+    else {
+        DBG(DBG_CRYPT,DBG_log("NSS RSA verify: decrypting signature is failed"));
+        return "13" "NSS error: Not able to decrypt";
+    }
+
+    if(memcmp(data.data+data.len-hash_len, hash_val, hash_len)!=0) {
+	pfree(data.data);
+	loglog(RC_LOG_SERIOUS, "RSA Signature NOT verified");
+	return "14" "NSS error: Not able to verify";
+    }
+
+    DBG(DBG_CRYPT,DBG_dump("NSS RSA verify: hash value: ", hash_val, hash_len));
+
+    pfree(data.data);
     pfree(n.ptr);
     pfree(e.ptr);
     SECKEY_DestroyPublicKey (publicKey);
 
-    if(retVal != SECSuccess) {
-	loglog(RC_LOG_SERIOUS, "RSA Signature NOT verified");
-    }
     DBG(DBG_CRYPT, DBG_log("RSA Signature verified"));
 
     return NULL;
diff -urNp openswan-2.6.22-orig/programs/pluto/keys.h openswan-2.6.22/programs/pluto/keys.h
--- openswan-2.6.22-orig/programs/pluto/keys.h	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/keys.h	2009-07-23 16:36:01.786598958 -0400
@@ -31,7 +31,7 @@ extern void sign_hash(const struct RSA_p
 		      , size_t hash_len, u_char *sig_val, size_t sig_len);
 
 #ifdef HAVE_LIBNSS
-extern void sign_hash_nss(const struct RSA_private_key *k, const u_char *hash_val
+extern int sign_hash_nss(const struct RSA_private_key *k, const u_char *hash_val
 				, size_t hash_len, u_char *sig_val, size_t sig_len);
 extern err_t RSA_signature_verify_nss(const struct RSA_public_key *k
 					, const u_char *hash_val, size_t hash_len
diff -urNp openswan-2.6.22-orig/programs/pluto/pluto_crypt.c openswan-2.6.22/programs/pluto/pluto_crypt.c
--- openswan-2.6.22-orig/programs/pluto/pluto_crypt.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/pluto_crypt.c	2009-07-23 16:36:01.787591260 -0400
@@ -71,7 +71,8 @@ TAILQ_HEAD(req_queue, pluto_crypto_req_c
 struct pluto_crypto_worker {
     int   pcw_helpernum;
 #ifdef HAVE_LIBNSS
-    pthread_t pcw_pid;
+   //pthread_t pcw_pid;
+   long int pcw_pid;
 #else
     pid_t pcw_pid;
 #endif
@@ -168,6 +169,7 @@ void pluto_do_crypto_op(struct pluto_cry
     }
 }
 
+#ifndef HAVE_LIBNSS
 static void catchhup(int signo UNUSED)
 {
     /* socket closed die */
@@ -178,6 +180,7 @@ static void catchusr1(int signo UNUSED)
 {
     return;
 }
+#endif
 
 static void
 helper_passert_fail(const char *pred_str
@@ -885,7 +888,7 @@ static void init_crypto_helper(struct pl
 	return;  
     }
     else{
-	openswan_log("started helper (thread) pid=%d (fd:%d)", w->pcw_pid,  w->pcw_pipe);
+	openswan_log("started helper (thread) pid=%ld (fd:%d)", w->pcw_pid,  w->pcw_pipe);
     }
 #else
     w->pcw_pid = fork();
@@ -934,22 +937,6 @@ static void init_crypto_helper(struct pl
 	
 	pluto_init_log();
 
-/* XXX Paul: this is never reaches anymore? */
-#ifdef HAVE_LIBNSS 
-	NSS_Shutdown();
-	const struct osw_conf_options *oco;
-	char buf[100];
-	oco=osw_init_options();
-	snprintf(buf, sizeof(buf), "sql:%s",oco->confddir);  
-	loglog(RC_LOG_SERIOUS,"nss directory crypt helper: %s",buf);
-	SECStatus nss_init_status=NSS_InitReadWrite(buf);
-	if(nss_init_status != SECSuccess) {
-	   loglog(RC_LOG_SERIOUS, "NSS initialization failed in crypto helper(err %d)\n", PR_GetError());
-	} else{
-		loglog(RC_LOG_SERIOUS, "NSS initialized in crypto helper\n");
-		PK11_SetPasswordFunc(getNSSPassword);
-       }
-#endif
 
 	init_rnd_pool();
 	load_oswcrypto();
@@ -959,10 +946,6 @@ static void init_crypto_helper(struct pl
 
 	pluto_crypto_helper(fds[1], n);
 
-#if defined(HAVE_LIBNSS)
-	NSS_Shutdown();
-	loglog(RC_LOG_SERIOUS, "init_crypto_helper: helper (%d) is exiting\n",n);
-#endif
 	exit(0);
 	/* NOTREACHED */
     }
diff -urNp openswan-2.6.22-orig/programs/pluto/plutomain.c openswan-2.6.22/programs/pluto/plutomain.c
--- openswan-2.6.22-orig/programs/pluto/plutomain.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/plutomain.c	2009-07-23 17:17:50.010576404 -0400
@@ -99,7 +99,9 @@
 # include <nss.h>
 # include <nspr.h>
 # ifdef FIPS_CHECK
-#  include <fipscheck.h>
+# include <fipscheck.h>
+#define IPSECLIBDIR "/usr/libexec/ipsec"
+#define IPSECSBINDIR "/usr/sbin"
 # endif
 #endif
 
@@ -771,12 +773,57 @@ main(int argc, char **argv)
 	} else {
 	    loglog(RC_LOG_SERIOUS, "NSS Initialized");
 	    PK11_SetPasswordFunc(getNSSPassword);
+
 #ifdef FIPS_CHECK
-	    if (Pluto_IsFIPS() && !FIPSCHECK_verify(NULL, NULL)) {
-		loglog(RC_LOG_SERIOUS, "FIPS integrity verification test failed");
-		exit_pluto(10);
-	    }
+	const char *package_files[]= { IPSECLIBDIR"/setup",
+				        IPSECLIBDIR"/addconn",
+				        IPSECLIBDIR"/auto",
+				        IPSECLIBDIR"/barf",
+				        IPSECLIBDIR"/_copyright",
+				        IPSECLIBDIR"/eroute",
+  				        IPSECLIBDIR"/ikeping",
+				        IPSECLIBDIR"/_include",
+					IPSECLIBDIR"/_keycensor",
+					IPSECLIBDIR"/klipsdebug",
+					IPSECLIBDIR"/look",
+					IPSECLIBDIR"/newhostkey",
+					IPSECLIBDIR"/pf_key",
+					IPSECLIBDIR"/_pluto_adns",
+					IPSECLIBDIR"/_plutoload",
+					IPSECLIBDIR"/_plutorun",
+					IPSECLIBDIR"/ranbits",
+					IPSECLIBDIR"/_realsetup",
+					IPSECLIBDIR"/rsasigkey",
+					IPSECLIBDIR"/pluto",
+					IPSECLIBDIR"/_secretcensor",
+					IPSECLIBDIR"/secrets",
+					IPSECLIBDIR"/showdefaults",
+					IPSECLIBDIR"/showhostkey",
+					IPSECLIBDIR"/showpolicy",
+					IPSECLIBDIR"/spi",
+					IPSECLIBDIR"/spigrp",
+					IPSECLIBDIR"/_startklips",
+					IPSECLIBDIR"/_startklips.old",
+					IPSECLIBDIR"/_startnetkey",
+					IPSECLIBDIR"/tncfg",
+					IPSECLIBDIR"/_updown",
+					IPSECLIBDIR"/_updown.klips",
+					IPSECLIBDIR"/_updown.klips.old",
+					IPSECLIBDIR"/_updown.mast",
+					IPSECLIBDIR"/_updown.mast.old",
+					IPSECLIBDIR"/_updown.netkey", 
+					IPSECLIBDIR"/verify",
+					IPSECLIBDIR"/whack",
+					IPSECSBINDIR"/ipsec",
+					NULL
+					};
+
+       if (Pluto_IsFIPS() && !FIPSCHECK_verify_files(package_files)) {
+             loglog(RC_LOG_SERIOUS, "FIPS integrity verification test failed");
+             exit_pluto(10);
+        }
 #endif
+
       }
 #endif
 
@@ -786,7 +833,7 @@ main(int argc, char **argv)
     {
 #ifdef PLUTO_SENDS_VENDORID
 # ifdef HAVE_LIBNSS
-	if(PK11_IsFIPS()) {
+	if(Pluto_IsFIPS()) {
 	openswan_log("Starting Pluto (Openswan Version %s%s) pid:%u"
 		, ipsec_version_code() , compile_time_interop_options, getpid());
 	} else {
diff -urNp openswan-2.6.22-orig/programs/pluto/state.c openswan-2.6.22/programs/pluto/state.c
--- openswan-2.6.22-orig/programs/pluto/state.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/pluto/state.c	2009-07-23 16:36:01.832590240 -0400
@@ -60,6 +60,12 @@
 #include "crypto.h" /* requires sha1.h and md5.h */
 #include "spdb.h"
 
+#ifdef HAVE_LIBNSS
+# include <nss.h>
+# include <pk11pub.h>
+# include <keyhi.h>
+#endif
+
 /*
  * Global variables: had to go somewhere, might as well be this file.
  */
diff -urNp openswan-2.6.22-orig/programs/rsasigkey/rsasigkey.c openswan-2.6.22/programs/rsasigkey/rsasigkey.c
--- openswan-2.6.22-orig/programs/rsasigkey/rsasigkey.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/rsasigkey/rsasigkey.c	2009-07-23 16:36:01.836589243 -0400
@@ -588,10 +588,10 @@ rsasigkey(int nbits, char *configdir, ch
 	PK11_SetPasswordFunc(GetModulePassword);
 	nss_initialized = PR_TRUE;
 
-	/* Good for now but someone may want to use a hardware token
-	 *slot = PK11_GetInternalKeySlot();
-	 * In which case this may be better */
-	slot = PK11_GetBestSlot(CKM_RSA_PKCS_KEY_PAIR_GEN, password ? &pwdata : NULL);
+	/* Good for now but someone may want to use a hardware token*/
+	 slot = PK11_GetInternalKeySlot();
+	 /* In which case this may be better */
+	//slot = PK11_GetBestSlot(CKM_RSA_PKCS_KEY_PAIR_GEN, password ? &pwdata : NULL);
 	/*or the user may specify the name of a token.*/
 
 	/*if (PK11_IsFIPS() || !PK11_IsInternal(slot)) {

openswan-2.6.22-selinux.patch:
 verify.in |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE openswan-2.6.22-selinux.patch ---
--- openswan-2.6.22-orig/programs/verify/verify.in	2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/programs/verify/verify.in	2009-07-09 23:50:15.000000000 +0200
@@ -262,18 +262,6 @@ sub installstartcheck {
 	   } else { warnchk "","UNKNOWN"; }
 	}
 
-        if ( -e "/selinux/enforce") {
-        printfun "Testing against enforced SElinux mode";
-        open("cat", "/selinux/enforce");
-        if(<cat> == "1")
-            {
-                errchk "";
-                print "\n  SElinux is running in 'enforced' mode. Since no working SElinux\n  policies exist for Openswan, SElinux should be disabled.\n";
-		print "\n  echo \"0\" > /selinux/enforce (or edit /etc/sysconfig/selinux)\n\n";
-            }
-        else { errchk "1"; }
-        }
-
         if ( -c "/dev/hw_random" || -c "/dev/hwrng" ) {
         printfun "Hardware RNG detected, testing if used properly";
         run "pidof rngd";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	30 Mar 2009 15:32:53 -0000	1.26
+++ .cvsignore	10 Sep 2009 16:35:40 -0000	1.27
@@ -10,3 +10,4 @@ openswan-2.6.16.tar.gz
 openswan-2.6.18.tar.gz
 openswan-2.6.19.tar.gz
 openswan-2.6.21.tar.gz
+openswan-2.6.22.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-11/openswan.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- openswan.spec	6 Jul 2009 14:52:23 -0000	1.79
+++ openswan.spec	10 Sep 2009 16:35:41 -0000	1.80
@@ -1,10 +1,13 @@
+%define USE_LIBNSS 1
 %define USE_FIPSCHECK 1
+%define nss_version 3.12.3-2
+%define fipscheck_version 1.2.0-1
 
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.21
+Version: 2.6.22
 
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -13,16 +16,19 @@ Source2: ipsec.conf
 
 Patch1: openswan-2.6.16-examples.patch
 Patch2: openswan-2.6-relpath.patch
-Patch3: openswan-2.6-selinux.patch
-Patch4: openswan-2.6.16-initscript-correction.patch
-Patch5: openswan-2.6.21-gcc44.patch
-Patch6: openswan-2.6.21-nss.patch
-Patch7: openswan-2.6.21-nss-fedora-diff-modified.patch
-Patch8: openswan-2.6.21-CVE-2009-2185.patch
+Patch3: openswan-2.6.22-selinux.patch
+Patch4: openswan-2.6-initscript-correction.patch
+Patch5: openswan-2.6.22-gcc44.patch
+Patch6: openswan-2.6.22-nss.patch
+Patch7: openswan-2.6.22-CVE-2009-2185.patch
+
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gmp-devel bison flex man xmlto bind-devel nss-devel
+BuildRequires: gmp-devel bison flex man xmlto bind-devel
+%if %{USE_LIBNSS}
+BuildRequires: nss-devel >= %{nss_version}
+%endif
 Requires(post): coreutils bash
 Requires(preun): initscripts chkconfig
 Requires(post): /sbin/chkconfig
@@ -30,7 +36,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
 %if %{USE_FIPSCHECK}
-BuildRequires: fipscheck-devel
+BuildRequires: fipscheck-devel >= %{fipscheck_version}
 %endif
 
 Provides: ipsec-userland = %{version}-%{release}
@@ -73,7 +79,6 @@ find doc -name .gitignore -print0 | xarg
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 
@@ -86,6 +91,12 @@ find doc -name .gitignore -print0 | xarg
   IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
+%if %{USE_LIBNSS}
+  USE_LIBNSS=true \
+%endif
+%if %{USE_FIPSCHECK}
+  USE_FIPSCHECK=true \
+%endif
   programs
 FS=$(pwd)
 
@@ -95,8 +106,46 @@ FS=$(pwd)
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/rsasigkey \
-    fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/pluto \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/setup \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/addconn \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/auto \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/barf \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_copyright \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/eroute \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/ikeping \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_include \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_keycensor \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/klipsdebug \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/look \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/newhostkey \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/pf_key \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_pluto_adns \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_plutoload \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_plutorun \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/ranbits \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_realsetup \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/rsasigkey \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/pluto \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_secretcensor \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/secrets \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/showdefaults \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/showhostkey \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/showpolicy \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/spi \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/spigrp \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_startklips \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_startklips.old \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_startnetkey \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/tncfg \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.klips \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.klips.old \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.mast \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.mast.old \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.netkey \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/verify \
+  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/whack \
+  fipshmac $RPM_BUILD_ROOT%{_sbindir}/ipsec \
 %{nil}
 %endif
 
@@ -154,6 +203,9 @@ rm -rf %{buildroot}
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d
 %{_initrddir}/ipsec
 %{_sbindir}/ipsec
+%if %{USE_FIPSCHECK}
+%{_sbindir}/.ipsec.hmac
+%endif
 %{_libexecdir}/ipsec
 %{_mandir}/*/*.gz
 %{_localstatedir}/run/pluto
@@ -173,6 +225,15 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Thu Sep 10 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.22-1
+- New upstream release
+- Added support for using PSK with NSS
+- Fixed several warnings and undid unnecessary debug messages
+- Updated README.nss with an example configuration
+- Moved README.nss to openswan/doc/
+- Improved FIPS integrity check functionality
+- Patch for Openswan ASN.1 parser vulnerability (CVE-2009-2185)
+
 * Mon Jul 06 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-5
 - Added support for using PSK with NSS
 - Fixed several warnings and undid unnecessary comments


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Mar 2009 15:32:53 -0000	1.25
+++ sources	10 Sep 2009 16:35:41 -0000	1.26
@@ -1 +1 @@
-ba9da6c90e0f5fe856767d7510ce371f  openswan-2.6.21.tar.gz
+9a30009bade8a1b09fba27680c87cf72  openswan-2.6.22.tar.gz


--- openswan-2.6-selinux.patch DELETED ---


--- openswan-2.6.16-initscript-correction.patch DELETED ---


--- openswan-2.6.21-CVE-2009-2185.patch DELETED ---


--- openswan-2.6.21-gcc44.patch DELETED ---


--- openswan-2.6.21-nss-fedora-diff-modified.patch DELETED ---


--- openswan-2.6.21-nss.patch DELETED ---



From wtogami at fedoraproject.org  Thu Sep 10 16:44:31 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 16:44:31 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.49, 1.50 sources, 1.48,
	1.49 spamassassin.spec, 1.126, 1.127
Message-ID: <20090910164431.CA79411C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9974

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
that didn't work... just revert



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	10 Sep 2009 13:45:09 -0000	1.49
+++ .cvsignore	10 Sep 2009 16:44:31 -0000	1.50
@@ -1 +1,2 @@
-mcsnapshot.tgz
+Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	10 Sep 2009 13:45:09 -0000	1.48
+++ sources	10 Sep 2009 16:44:31 -0000	1.49
@@ -1 +1,2 @@
-57a321c63b1a97ee43d33a3bddced6d1  mcsnapshot.tgz
+1b396a9df1faa22185263c7526fe6042  Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
+daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- spamassassin.spec	10 Sep 2009 15:50:42 -0000	1.126
+++ spamassassin.spec	10 Sep 2009 16:44:31 -0000	1.127
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-#%%define rhel 5
+#%%define rhel 4
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -35,15 +35,13 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename mcsnapshot
-Release: 0.11.%{prename}%{?dist}
+%define prename alpha2
+Release: 0.6.alpha2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-#Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-# Temporary tarball before alpha3
-Source0: mcsnapshot.tgz
-#Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -112,9 +110,7 @@ To filter spam for all users, add that l
 (creating if necessary).
 
 %prep
-#%setup -q -n Mail-SpamAssassin-%{version}
-# Temporary before alpha3
-%setup -q -n mcsnapshot
+%setup -q -n Mail-SpamAssassin-%{version}
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
@@ -158,13 +154,9 @@ find $RPM_BUILD_ROOT \( -name perllocal.
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 # Default rules from separate tarball
-#cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
-#tar xfvz %{SOURCE1}
-#cd -
-cp rules/*.cf $RPM_BUILD_ROOT%{_datadir}/spamassassin/
-rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/70_sandbox.cf
-rm -f /usr/lib/perl5/vendor_perl/*/Mail/SpamAssassin/Util/MemoryDump.pm
-rm -f /usr/lib/perl5/vendor_perl/*/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
+cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+tar xfvz %{SOURCE1}
+cd -
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -230,12 +222,6 @@ fi
 exit 0
 
 %changelog
-* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> 3.3.3-0.11.mcsnapshot
-- numerous bugs fixed
-- this snapshot is used during masscheck underway until
-  September 17th in order to determine the base scores for spamassassin-3.3.0.
-  Your participation is needed!  Please read  http://wiki.apache.org/spamassassin/RescoreDetails
-
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-0.6.alpha2
 - rebuilt with new openssl
 



From mjg59 at fedoraproject.org  Thu Sep 10 16:49:21 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Thu, 10 Sep 2009 16:49:21 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-rtc-show-hctosys.patch, NONE,
	1.1 kernel.spec, 1.1790, 1.1791
Message-ID: <20090910164921.791C911C00DB@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12967

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-rtc-show-hctosys.patch 
Log Message:
* Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-ahci-export-capabilities.patch: Backport from upstream
- linux-2.6-rtc-show-hctosys.patch: Export the hctosys state of an rtc


linux-2.6-rtc-show-hctosys.patch:
 Documentation/rtc.txt     |    2 ++
 b/Documentation/rtc.txt   |   22 ++++++++++++++++++++++
 b/drivers/rtc/rtc-sysfs.c |   14 ++++++++++++++
 3 files changed, 38 insertions(+)

--- NEW FILE linux-2.6-rtc-show-hctosys.patch ---
diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt
index 8deffcd..216bb8c 100644
--- a/Documentation/rtc.txt
+++ b/Documentation/rtc.txt
@@ -135,6 +135,28 @@ a high functionality RTC is integrated into the SOC.  That system might read
 the system clock from the discrete RTC, but use the integrated one for all
 other tasks, because of its greater functionality.
 
+SYSFS INTERFACE
+---------------
+
+The sysfs interface under /sys/class/rtc/rtcN provides access to various
+rtc attributes without requiring the use of ioctls. All dates and times
+are in the RTC's timezone, rather than in system time.
+
+date:  	   	 RTC-provided date
+max_user_freq:	 The maximum interrupt rate an unprivileged user may request
+		 from this RTC.
+name:		 The name of the RTC corresponding to this sysfs directory
+since_epoch:	 The number of seconds since the epoch according to the RTC
+time:		 RTC-provided time
+wakealarm:	 The time at which the clock will generate a system wakeup
+		 event. This is a one shot wakeup event, so must be reset
+		 after wake if a daily wakeup is required. Format is either
+		 seconds since the epoch or, if there's a leading +, seconds
+		 in the future.
+
+IOCTL INTERFACE
+---------------
+
 The ioctl() calls supported by /dev/rtc are also supported by the RTC class
 framework.  However, because the chips and systems are not standardized,
 some PC/AT functionality might not be provided.  And in the same way, some

diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt
index 216bb8c..baac51f 100644
--- a/Documentation/rtc.txt
+++ b/Documentation/rtc.txt
@@ -143,6 +143,8 @@ rtc attributes without requiring the use of ioctls. All dates and times
 are in the RTC's timezone, rather than in system time.
 
 date:  	   	 RTC-provided date
+hctosys:   	 1 if the RTC provided the system time at boot via the
+		 CONFIG_RTC_HCTOSYS kernel option, 0 otherwise
 max_user_freq:	 The maximum interrupt rate an unprivileged user may request
 		 from this RTC.
 name:		 The name of the RTC corresponding to this sysfs directory
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 2531ce4..7dd23a6 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -102,6 +102,19 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
 	return n;
 }
 
+static ssize_t
+rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
+		char *buf)
+{
+#ifdef CONFIG_RTC_HCTOSYS_DEVICE
+	if (strcmp(dev_name(&to_rtc_device(dev)->dev),
+		   CONFIG_RTC_HCTOSYS_DEVICE) == 0)
+		return sprintf(buf, "1\n");
+	else
+#endif
+		return sprintf(buf, "0\n");
+}
+
 static struct device_attribute rtc_attrs[] = {
 	__ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL),
 	__ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL),
@@ -109,6 +122,7 @@ static struct device_attribute rtc_attrs[] = {
 	__ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL),
 	__ATTR(max_user_freq, S_IRUGO | S_IWUSR, rtc_sysfs_show_max_user_freq,
 			rtc_sysfs_set_max_user_freq),
+	__ATTR(hctosys, S_IRUGO, rtc_sysfs_show_hctosys, NULL),
 	{ },
 };
 



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1790
retrieving revision 1.1791
diff -u -p -r1.1790 -r1.1791
--- kernel.spec	10 Sep 2009 16:11:31 -0000	1.1790
+++ kernel.spec	10 Sep 2009 16:49:20 -0000	1.1791
@@ -729,6 +729,7 @@ Patch11010: via-hwmon-temp-sensor.patch
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
+Patch12012: linux-2.6-rtc-show-hctosys.patch
 
 %endif
 
@@ -1357,6 +1358,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 ApplyPatch v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # Patches headed upstream
+ApplyPatch linux-2.6-rtc-show-hctosys.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2016,6 +2018,7 @@ fi
 %changelog
 * Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-ahci-export-capabilities.patch: Backport from upstream
+- linux-2.6-rtc-show-hctosys.patch: Export the hctosys state of an rtc
 
 * Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: add some scaler-only modes for LVDS, GEM/TTM fixes



From langel at fedoraproject.org  Thu Sep 10 16:50:35 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 16:50:35 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.135,1.136
Message-ID: <20090910165035.3097411C043A@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-serv13336

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
- Temporarily removed building of visualvm. 




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.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- java-1.6.0-openjdk.spec	10 Sep 2009 16:17:40 -0000	1.135
+++ java-1.6.0-openjdk.spec	10 Sep 2009 16:50:34 -0000	1.136
@@ -407,7 +407,7 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --enable-visualvm --with-hotspot-src-zip=%{SOURCE7} \
+  --with-hotspot-src-zip=%{SOURCE7} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
@@ -574,8 +574,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-desktop-file-install --vendor ''\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
+#desktop-file-install --vendor ''\
+#  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -721,7 +721,7 @@ alternatives \
   --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
-  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
+#  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
   --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
   --slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
@@ -936,7 +936,7 @@ exit 0
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
-%{_datadir}/applications/visualvm.desktop
+#%{_datadir}/applications/visualvm.desktop
 %ifarch %{jit_arches}
 %{tapsetdir}/*.stp
 %endif
@@ -965,6 +965,9 @@ exit 0
 
 %changelog
 * Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
+- Temporarily removed building of visualvm.
+
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
 - Removed unneeded patches.
 - Updated icedteaver to 1.6
 - Resolves: rhbz#484858



From veillard at fedoraproject.org  Thu Sep 10 16:54:26 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 10 Sep 2009 16:54:26 +0000 (UTC)
Subject: rpms/libxml2/devel .cvsignore, 1.44, 1.45 libxml2.spec, 1.74,
	1.75 sources, 1.46, 1.47
Message-ID: <20090910165426.16A1D11C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14400

Modified Files:
	.cvsignore libxml2.spec sources 
Log Message:
Upstream release of 2.7.4, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	18 Jan 2009 22:00:22 -0000	1.44
+++ .cvsignore	10 Sep 2009 16:54:25 -0000	1.45
@@ -22,3 +22,4 @@ libxml2-2.7.0.tar.gz
 libxml2-2.7.1.tar.gz
 libxml2-2.7.2.tar.gz
 libxml2-2.7.3.tar.gz
+libxml2-2.7.4.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- libxml2.spec	10 Aug 2009 14:24:11 -0000	1.74
+++ libxml2.spec	10 Sep 2009 16:54:25 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.3
-Release: 4%{?dist}%{?extra_release}
+Version: 2.7.4
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.3-ficora-parse.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -68,7 +67,6 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-1
+- upstream release 2.7.4
+- symbol versioning of libxml2 shared libs
+- very large number of bug fixes
+
 * Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-4
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	18 Jan 2009 22:00:22 -0000	1.46
+++ sources	10 Sep 2009 16:54:25 -0000	1.47
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz



From wtogami at fedoraproject.org  Thu Sep 10 16:57:49 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 16:57:49 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin-2.5.8-nss-md2.patch,1.1,NONE
Message-ID: <20090910165749.1E05A11C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405

Removed Files:
	pidgin-2.5.8-nss-md2.patch 
Log Message:
remove unused patch



--- pidgin-2.5.8-nss-md2.patch DELETED ---



From avesh at fedoraproject.org  Thu Sep 10 17:01:38 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Thu, 10 Sep 2009 17:01:38 +0000 (UTC)
Subject: rpms/openswan/F-10 openswan-2.6-initscript-correction.patch, NONE, 
	1.1 openswan-2.6.22-CVE-2009-2185.patch, NONE,
	1.1 openswan-2.6.22-selinux.patch, NONE, 1.1 .cvsignore, 1.26,
	1.27 openswan.spec, 1.73, 1.74 sources, 1.25,
	1.26 openswan-2.6-noxmlto.patch, 1.1,
	NONE openswan-2.6-selinux.patch, 1.1,
	NONE openswan-2.6.16-initscript-correction.patch, 1.1,
	NONE openswan-2.6.21-CVE-2009-2185.patch, 1.1, NONE
Message-ID: <20090910170138.E71AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16702

Modified Files:
	.cvsignore openswan.spec sources 
Added Files:
	openswan-2.6-initscript-correction.patch 
	openswan-2.6.22-CVE-2009-2185.patch 
	openswan-2.6.22-selinux.patch 
Removed Files:
	openswan-2.6-noxmlto.patch openswan-2.6-selinux.patch 
	openswan-2.6.16-initscript-correction.patch 
	openswan-2.6.21-CVE-2009-2185.patch 
Log Message:
* Thu Sep 10 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.22-1
- New upstream release
- Openswan ASN.1 parser vulnerability (CVE-2009-2185)


openswan-2.6-initscript-correction.patch:
 setup.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openswan-2.6-initscript-correction.patch ---
--- openswan-2.6.22-orig/programs/setup/setup.in	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2.6.22/programs/setup/setup.in	2009-09-10 11:48:23.395338383 -0400
@@ -39,7 +39,7 @@
 # times of NFS filesystem startup/shutdown).  Startup is after startup of
 # syslog and pcmcia support; shutdown is just before shutdown of syslog.
 #
-# chkconfig: 2345 47 76
+# chkconfig: - 47 76
 # description: IPsec provides encrypted and authenticated communications; \
 # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
 

openswan-2.6.22-CVE-2009-2185.patch:
 asn1.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE openswan-2.6.22-CVE-2009-2185.patch ---
--- openswan-2.6.22/lib/libopenswan/asn1.c	2009-06-22 22:53:08.000000000 -0400
+++ openswan-2/lib/libopenswan/asn1.c	2009-08-17 14:07:00.153981683 -0400
@@ -76,8 +76,15 @@ asn1_length(chunk_t *blob)
     n = *blob->ptr++;
     blob->len--;
 
-    if ((n & 0x80) == 0) /* single length octet */
+    if ((n & 0x80) == 0) { /* single length octet */
+	if (n > blob->len) {
+	    DBG(DBG_PARSING,
+		DBG_log("number of length octets is larger than ASN.1 object")
+	    )
+	    return ASN1_INVALID_LENGTH;
+	}
 	return n;
+    }
 
     /* composite length, determine number of length octets */
     n &= 0x7f;
@@ -243,7 +250,6 @@ asn1totime(const chunk_t *utctime, asn1_
     {
 	int tz_hour, tz_min;
 
-	sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min);
 	if (sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min) != 2)
 	{
 	    return 0; /* error in positive timezone offset format */
@@ -411,7 +417,7 @@ extract_object(asn1Object_t const *objec
 
     blob1->len = asn1_length(blob);
 
-    if (blob1->len == ASN1_INVALID_LENGTH || blob->len < blob1->len)
+    if (blob1->len == ASN1_INVALID_LENGTH)
     {
 	DBG(DBG_PARSING,
 	    DBG_log("L%d - %s:  length of ASN1 object invalid or too large",

openswan-2.6.22-selinux.patch:
 verify.in |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE openswan-2.6.22-selinux.patch ---
--- openswan-2.6.22-orig/programs/verify/verify.in	2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/programs/verify/verify.in	2009-07-09 23:50:15.000000000 +0200
@@ -262,18 +262,6 @@ sub installstartcheck {
 	   } else { warnchk "","UNKNOWN"; }
 	}
 
-        if ( -e "/selinux/enforce") {
-        printfun "Testing against enforced SElinux mode";
-        open("cat", "/selinux/enforce");
-        if(<cat> == "1")
-            {
-                errchk "";
-                print "\n  SElinux is running in 'enforced' mode. Since no working SElinux\n  policies exist for Openswan, SElinux should be disabled.\n";
-		print "\n  echo \"0\" > /selinux/enforce (or edit /etc/sysconfig/selinux)\n\n";
-            }
-        else { errchk "1"; }
-        }
-
         if ( -c "/dev/hw_random" || -c "/dev/hwrng" ) {
         printfun "Hardware RNG detected, testing if used properly";
         run "pidof rngd";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	30 Mar 2009 16:28:43 -0000	1.26
+++ .cvsignore	10 Sep 2009 17:01:36 -0000	1.27
@@ -10,3 +10,4 @@ openswan-2.6.16.tar.gz
 openswan-2.6.18.tar.gz
 openswan-2.6.19.tar.gz
 openswan-2.6.21.tar.gz
+openswan-2.6.22.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-10/openswan.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- openswan.spec	6 Jul 2009 15:14:57 -0000	1.73
+++ openswan.spec	10 Sep 2009 17:01:37 -0000	1.74
@@ -1,8 +1,8 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.21
+Version: 2.6.22
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -11,9 +11,9 @@ Source2: ipsec.conf
 
 Patch1: openswan-2.6.16-examples.patch
 Patch2: openswan-2.6-relpath.patch
-Patch3: openswan-2.6-selinux.patch
-Patch4: openswan-2.6.16-initscript-correction.patch
-Patch5: openswan-2.6.21-CVE-2009-2185.patch
+Patch3: openswan-2.6.22-selinux.patch
+Patch4: openswan-2.6-initscript-correction.patch
+Patch5: openswan-2.6.22-CVE-2009-2185.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -151,6 +151,10 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Thu Sep 10 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.22-1
+- New upstream release
+- Openswan ASN.1 parser vulnerability (CVE-2009-2185)
+
 * Mon Jul 06 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-2
 - Openswan ASN.1 parser vulnerability (CVE-2009-2185)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Mar 2009 16:28:43 -0000	1.25
+++ sources	10 Sep 2009 17:01:37 -0000	1.26
@@ -1 +1 @@
-ba9da6c90e0f5fe856767d7510ce371f  openswan-2.6.21.tar.gz
+9a30009bade8a1b09fba27680c87cf72  openswan-2.6.22.tar.gz


--- openswan-2.6-noxmlto.patch DELETED ---


--- openswan-2.6-selinux.patch DELETED ---


--- openswan-2.6.16-initscript-correction.patch DELETED ---


--- openswan-2.6.21-CVE-2009-2185.patch DELETED ---



From michich at fedoraproject.org  Thu Sep 10 17:21:53 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Thu, 10 Sep 2009 17:21:53 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim-0.5-fix-message-loss.diff, NONE,
	1.1 jabbim.spec, 1.34, 1.35
Message-ID: <20090910172153.86BC311C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23040

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.5-fix-message-loss.diff 
Log Message:
* Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
- Fix message loss because of a change in PyQt4 4.5.x.
  (jabbim-0.5-fix-message-loss.diff, committed upstream)


jabbim-0.5-fix-message-loss.diff:
 jabbim.py |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE jabbim-0.5-fix-message-loss.diff ---
commit 5959b46fc6ace41885092f0dda6cbbeb34685fd8
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Thu Sep 10 17:12:14 2009 +0000

    fix message loss with PyQt4 4.5.x
    
    In PyQt4 4.5 concatenating QString with unicode no longer works.
    This manifests itself by a traceback when receiving an initial message
    from a contact with non-ASCII name in roster. The message is thus lost.
    
    The traceback occurs in computing the value of a variable that is not
    even used.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk at 4225 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/jabbim.py b/jabbim.py
index 1c7e80e..9bf50bc 100644
--- a/jabbim.py
+++ b/jabbim.py
@@ -1793,14 +1793,6 @@ class clientClass(pyxl.client.Client):
 						traytext=body[:40]+" ..."
 				else:
 						traytext=body
-				text='<table><tr>'
-				#if len(self.main.ui.roster.getUserItems(frm.userhost()))>0 and os.path.isfile(self.main.homeDir+'/avatars/'+unicode(frm.userhost())):
-					#item=self.main.ui.roster.getUserItems(frm.userhost())[0]
-					#pixmap=item.avatar.pixmap(64,64)
-					#text+='<td><img src="'+self.main.homeDir+'/avatars/'+unicode(item.jid)+'" width="'+str(pixmap.width())+'" height="'+str(pixmap.height())+'"/></td>'
-				text+='<td><b>'+mainWindow.tr("New message from ")+unicode(user)+'</b><br/>'
-				text+='<font size="-1">'+traytext+'<br/>'
-				text+="</td></tr></table>"
 				if self.groupchats.has_key(frm.userhost()):
 					self.main.chat.addChatTab(frm.full(),unicode(user),icon,True,full=True)
 					tab,tabIndex=self.main.chat.findTab(frm.full(),True)


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- jabbim.spec	8 Sep 2009 07:32:52 -0000	1.34
+++ jabbim.spec	10 Sep 2009 17:21:52 -0000	1.35
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.8.svn%{svndate}%{?dist}
+Release:	0.9.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -14,6 +14,7 @@ URL:		http://dev.jabbim.cz/jabbim
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
+Patch2:		jabbim-0.5-fix-message-loss.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@ with the advanced functionality provided
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -98,6 +100,10 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
+- Fix message loss because of a change in PyQt4 4.5.x.
+  (jabbim-0.5-fix-message-loss.diff, committed upstream)
+
 * Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
 - Fix compact-style roster drawing bug.
   (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)



From pkgdb at fedoraproject.org  Thu Sep 10 17:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:28:54 +0000
Subject: [pkgdb] openjpeg: agoode has requested watchcommits
Message-ID: <20090910172854.479B010F88A@bastion2.fedora.phx.redhat.com>

agoode has requested the watchcommits acl on openjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:28:54 +0000
Subject: [pkgdb] openjpeg: agoode has requested watchbugzilla
Message-ID: <20090910172854.97F7610F896@bastion2.fedora.phx.redhat.com>

agoode has requested the watchbugzilla acl on openjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:28:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:28:55 +0000
Subject: [pkgdb] openjpeg: agoode has requested approveacls
Message-ID: <20090910172856.1D0FF10F89D@bastion2.fedora.phx.redhat.com>

agoode has requested the approveacls acl on openjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:28:59 +0000
Subject: [pkgdb] openjpeg: agoode has requested commit
Message-ID: <20090910172859.B471310F8A1@bastion2.fedora.phx.redhat.com>

agoode has requested the commit acl on openjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:08 +0000
Subject: [pkgdb] openjpeg: agoode has requested watchbugzilla
Message-ID: <20090910172909.07E9F10F8A5@bastion2.fedora.phx.redhat.com>

agoode has requested the watchbugzilla acl on openjpeg (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:09 +0000
Subject: [pkgdb] openjpeg: agoode has requested watchcommits
Message-ID: <20090910172909.4107B10F8A9@bastion2.fedora.phx.redhat.com>

agoode has requested the watchcommits acl on openjpeg (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:10 +0000
Subject: [pkgdb] openjpeg: agoode has requested commit
Message-ID: <20090910172910.BBC2610F8AC@bastion2.fedora.phx.redhat.com>

agoode has requested the commit acl on openjpeg (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:11 +0000
Subject: [pkgdb] openjpeg: agoode has requested approveacls
Message-ID: <20090910172911.A2F4110F8B0@bastion2.fedora.phx.redhat.com>

agoode has requested the approveacls acl on openjpeg (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:14 +0000
Subject: [pkgdb] openjpeg: agoode has requested watchcommits
Message-ID: <20090910172914.B2B1910F8B1@bastion2.fedora.phx.redhat.com>

agoode has requested the watchcommits acl on openjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:17 +0000
Subject: [pkgdb] openjpeg: agoode has requested commit
Message-ID: <20090910172917.F1F2A10F8B5@bastion2.fedora.phx.redhat.com>

agoode has requested the commit acl on openjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:19 +0000
Subject: [pkgdb] openjpeg: agoode has requested approveacls
Message-ID: <20090910172919.8217210F893@bastion2.fedora.phx.redhat.com>

agoode has requested the approveacls acl on openjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 10 17:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 17:29:22 +0000
Subject: [pkgdb] openjpeg: agoode has requested watchbugzilla
Message-ID: <20090910172922.0697910F8B8@bastion2.fedora.phx.redhat.com>

agoode has requested the watchbugzilla acl on openjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From mjg59 at fedoraproject.org  Thu Sep 10 17:29:34 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Thu, 10 Sep 2009 17:29:34 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-rfkill-all.patch, NONE, 1.1 kernel.spec,
	1.1791, 1.1792
Message-ID: <20090910172934.0EDE011C00DB@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25181

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-rfkill-all.patch 
Log Message:
* Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-ahci-export-capabilities.patch: Backport from upstream
- linux-2.6-rtc-show-hctosys.patch: Export the hctosys state of an rtc
- linux-2.6-rfkill-all.patch: Support for keys that toggle all rfkill state


linux-2.6-rfkill-all.patch:
 include/linux/input.h  |    2 ++
 include/linux/rfkill.h |    2 +-
 net/rfkill/input.c     |    8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-rfkill-all.patch ---
diff --git a/include/linux/input.h b/include/linux/input.h
index 8b3bc3e..20a622e 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -595,6 +595,8 @@ struct input_absinfo {
 #define KEY_NUMERIC_STAR	0x20a
 #define KEY_NUMERIC_POUND	0x20b
 
+#define KEY_RFKILL		0x20c /* Key that controls all radios */
+
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING	KEY_MUTE
 #define KEY_MAX			0x2ff
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 278777f..4c39f7e 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -32,7 +32,7 @@
 /**
  * enum rfkill_type - type of rfkill switch.
  *
- * @RFKILL_TYPE_ALL: toggles all switches (userspace only)
+ * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
  * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
  * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
  * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
diff --git a/net/rfkill/input.c b/net/rfkill/input.c
index a7295ad..3713d7e 100644
--- a/net/rfkill/input.c
+++ b/net/rfkill/input.c
@@ -212,6 +212,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
 		case KEY_WIMAX:
 			rfkill_schedule_toggle(RFKILL_TYPE_WIMAX);
 			break;
+		case KEY_RFKILL:
+			rfkill_schedule_toggle(RFKILL_TYPE_ALL);
+			break;
 		}
 	} else if (type == EV_SW && code == SW_RFKILL_ALL)
 		rfkill_schedule_evsw_rfkillall(data);
@@ -295,6 +298,11 @@ static const struct input_device_id rfkill_ids[] = {
 		.keybit = { [BIT_WORD(KEY_WIMAX)] = BIT_MASK(KEY_WIMAX) },
 	},
 	{
+		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
+		.evbit = { BIT_MASK(EV_KEY) },
+		.keybit = { [BIT_WORD(KEY_RFKILL)] = BIT_MASK(KEY_RFKILL) },
+	},
+	{
 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT,
 		.evbit = { BIT(EV_SW) },
 		.swbit = { [BIT_WORD(SW_RFKILL_ALL)] = BIT_MASK(SW_RFKILL_ALL) },


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1791
retrieving revision 1.1792
diff -u -p -r1.1791 -r1.1792
--- kernel.spec	10 Sep 2009 16:49:20 -0000	1.1791
+++ kernel.spec	10 Sep 2009 17:29:33 -0000	1.1792
@@ -730,6 +730,7 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12012: linux-2.6-rtc-show-hctosys.patch
+Patch12013: linux-2.6-rfkill-all.patch
 
 %endif
 
@@ -1359,6 +1360,7 @@ ApplyPatch v4l-dvb-fix-cx25840-firmware-
 
 # Patches headed upstream
 ApplyPatch linux-2.6-rtc-show-hctosys.patch
+ApplyPatch linux-2.6-rfkill-all.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2019,6 +2021,7 @@ fi
 * Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-ahci-export-capabilities.patch: Backport from upstream
 - linux-2.6-rtc-show-hctosys.patch: Export the hctosys state of an rtc
+- linux-2.6-rfkill-all.patch: Support for keys that toggle all rfkill state
 
 * Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: add some scaler-only modes for LVDS, GEM/TTM fixes



From hno at fedoraproject.org  Thu Sep 10 17:34:17 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 10 Sep 2009 17:34:17 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.32, 1.33 bzrtools.spec, 1.51,
	1.52 sources, 1.33, 1.34
Message-ID: <20090910173417.8834711C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26390

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	20 Aug 2009 08:26:55 -0000	1.32
+++ .cvsignore	10 Sep 2009 17:34:17 -0000	1.33
@@ -1,2 +1,2 @@
-bzrtools-1.18.0.tar.gz
-bzrtools-1.18.0.tar.gz.sig
+bzrtools-2.0.0.tar.gz
+bzrtools-2.0.0.tar.gz.sig


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- bzrtools.spec	20 Aug 2009 08:26:55 -0000	1.51
+++ bzrtools.spec	10 Sep 2009 17:34:17 -0000	1.52
@@ -5,19 +5,19 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.18
-%define bzrnextver 1.19
+%define bzrver 2.0
+%define bzrnextver 2.1
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
-Source0:        https://launchpad.net/bzrtools/stable/%{bzrver}/+download/%{name}-%{version}.tar.gz
-Source1:        https://launchpad.net/bzrtools/stable/%{bzrver}/+download/%{name}-%{version}.tar.gz.sig
+Source0:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz
+Source1:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 2.0.0-1
+- Update to 2.0.0 for bzr 2.0
+
 * Thu Aug 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18.0-2
 - Update to 1.18.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	20 Aug 2009 08:26:55 -0000	1.33
+++ sources	10 Sep 2009 17:34:17 -0000	1.34
@@ -1,2 +1,2 @@
-c442eacab5173b0ddc4094c6daf32c17  bzrtools-1.18.0.tar.gz
-4a673cae1e1d4e0b11cac9a5f07d8848  bzrtools-1.18.0.tar.gz.sig
+a44eec17b85abc54886ab5d762e17b66  bzrtools-2.0.0.tar.gz
+a1e62666524f4b5e03e437d1d7adf0f9  bzrtools-2.0.0.tar.gz.sig



From hno at fedoraproject.org  Thu Sep 10 17:34:59 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 10 Sep 2009 17:34:59 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.52, 1.53 bzr.spec, 1.72, 1.73 sources, 
	1.52, 1.53
Message-ID: <20090910173459.924AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26583

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
bzr 2.0rc2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	26 Aug 2009 16:12:36 -0000	1.52
+++ .cvsignore	10 Sep 2009 17:34:59 -0000	1.53
@@ -1,2 +1,2 @@
-bzr-1.18.tar.gz
-bzr-1.18.tar.gz.sig
+bzr-2.0rc2.tar.gz
+bzr-2.0rc2.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- bzr.spec	26 Aug 2009 16:12:36 -0000	1.72
+++ bzr.spec	10 Sep 2009 17:34:59 -0000	1.73
@@ -6,9 +6,9 @@
 #   Version: 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 bzrmajor 1.18
-#define bzrrc rc1
-%define release 1
+%define bzrmajor 2.0
+%define bzrrc rc2
+%define release 0.1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 2.0-0.1rc2
+- Update to 2.0rc2 with new default repository format 2a
+
 * Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-1
 - Update to 1.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	26 Aug 2009 16:12:36 -0000	1.52
+++ sources	10 Sep 2009 17:34:59 -0000	1.53
@@ -1,2 +1,2 @@
-efc91bada508089fbeb2d92973ecfe0a  bzr-1.18.tar.gz
-a6b09b5e95ab4ce2f4dcd56f0c85c3a9  bzr-1.18.tar.gz.sig
+e92a66979192720c07c754bae1fb74a1  bzr-2.0rc2.tar.gz
+6f4ef7a9b1632e6ea479c632ef2050cf  bzr-2.0rc2.tar.gz.sig



From karsten at fedoraproject.org  Thu Sep 10 17:40:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 17:40:35 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server.spec,1.22,1.23
Message-ID: <20090910174035.60C8911C043D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28255

Modified Files:
	obex-data-server.spec 
Log Message:
- ExcludeArch s390 s390x where we don't have openobex




Index: obex-data-server.spec
===================================================================
RCS file: /cvs/extras/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- obex-data-server.spec	25 Jul 2009 19:46:48 -0000	1.22
+++ obex-data-server.spec	10 Sep 2009 17:40:35 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -9,6 +9,7 @@ License:	GPLv2+
 Source0:	http://tadas.dailyda.com/software/%{name}-%{version}.tar.gz
 Url:		http://tadas.dailyda.com/blog
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: s390 s390x
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	bluez-libs-devel
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 0.4.3-4
+- ExcludeArch s390 s390x where we don't have openobex
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.4.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hno at fedoraproject.org  Thu Sep 10 17:42:52 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 10 Sep 2009 17:42:52 +0000 (UTC)
Subject: rpms/bzr/F-11 .cvsignore, 1.44, 1.45 bzr.spec, 1.62, 1.63 sources, 
	1.44, 1.45
Message-ID: <20090910174252.EFFBD11C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28864

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
Update to 1.18.1 correcting an issue when pushing to older bzr servers



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	26 Aug 2009 15:53:19 -0000	1.44
+++ .cvsignore	10 Sep 2009 17:42:52 -0000	1.45
@@ -1 +1 @@
-bzr-1.18.tar.gz
+bzr-1.18.1.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/bzr.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- bzr.spec	26 Aug 2009 15:53:19 -0000	1.62
+++ bzr.spec	10 Sep 2009 17:42:52 -0000	1.63
@@ -4,7 +4,7 @@
 %define bzrver 1.18
 
 Name:           bzr
-Version:        %{bzrver}
+Version:        %{bzrver}.1
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18.1-1
+- Update to 1.18.1 correcting an issue when pushing to older bzr servers
+
 * Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-1
 - Update to 1.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	26 Aug 2009 15:53:19 -0000	1.44
+++ sources	10 Sep 2009 17:42:52 -0000	1.45
@@ -1 +1 @@
-efc91bada508089fbeb2d92973ecfe0a  bzr-1.18.tar.gz
+b708fc1eabae64ceaaa499a5b27aea06  bzr-1.18.1.tar.gz



From karsten at fedoraproject.org  Thu Sep 10 17:45:14 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Sep 2009 17:45:14 +0000 (UTC)
Subject: rpms/obexd/devel obexd.spec,1.16,1.17
Message-ID: <20090910174514.7BF5F11C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30811

Modified Files:
	obexd.spec 
Log Message:
- ExcludeArch s390 s390x where we don't have openobex




Index: obexd.spec
===================================================================
RCS file: /cvs/extras/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- obexd.spec	1 Sep 2009 14:59:24 -0000	1.16
+++ obexd.spec	10 Sep 2009 17:45:14 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		obexd
 Version:	0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
@@ -8,6 +8,7 @@ License:	GPLv2+
 Source0:	http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.gz
 Url:		http://www.bluez.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:  s390 s390x
 
 BuildRequires:	glib2-devel
 BuildRequires:	dbus-devel
@@ -43,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 0.17-2
+- ExcludeArch s390 s390x where we don't have openobex
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.17-1
 - Update to 0.17
 



From veillard at fedoraproject.org  Thu Sep 10 17:48:16 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 10 Sep 2009 17:48:16 +0000 (UTC)
Subject: rpms/libxml2/F-11 libxml2.spec, 1.71, 1.72 sources, 1.46,
	1.47 libxml2-2.7.3-ficora-parse.patch, 1.1, NONE
Message-ID: <20090910174816.CCBB511C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31586

Modified Files:
	libxml2.spec sources 
Removed Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
Upstream release of 2.7.4, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/libxml2.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- libxml2.spec	10 Aug 2009 14:26:28 -0000	1.71
+++ libxml2.spec	10 Sep 2009 17:48:16 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.3
-Release: 3%{?dist}%{?extra_release}
+Version: 2.7.4
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.3-ficora-parse.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -68,7 +67,6 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-1
+- upstream release 2.7.4
+- symbol versioning of libxml2 shared libs
+- very large number of bug fixes
+
 * Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-3
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	18 Jan 2009 22:00:22 -0000	1.46
+++ sources	10 Sep 2009 17:48:16 -0000	1.47
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz


--- libxml2-2.7.3-ficora-parse.patch DELETED ---



From mtasaka at fedoraproject.org  Thu Sep 10 17:49:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Sep 2009 17:49:07 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.390, 1.391 jd.spec, 1.453, 1.454 sources,
	1.391, 1.392
Message-ID: <20090910174907.71ABC11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31949

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3060



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- .cvsignore	1 Sep 2009 16:57:10 -0000	1.390
+++ .cvsignore	10 Sep 2009 17:49:07 -0000	1.391
@@ -1 +1 @@
-jd-2.4.2-svn3055_trunk.tgz
+jd-2.4.2-svn3060_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- jd.spec	1 Sep 2009 16:57:10 -0000	1.453
+++ jd.spec	10 Sep 2009 17:49:07 -0000	1.454
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3055_trunk
+%define         strtag        svn3060_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3055
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3060
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- sources	1 Sep 2009 16:57:10 -0000	1.391
+++ sources	10 Sep 2009 17:49:07 -0000	1.392
@@ -1 +1 @@
-1ee4aa47b29ee812bfc712c2ea890bb6  jd-2.4.2-svn3055_trunk.tgz
+13a987c329366bbf000308bbdc97caf9  jd-2.4.2-svn3060_trunk.tgz



From veillard at fedoraproject.org  Thu Sep 10 17:52:09 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 10 Sep 2009 17:52:09 +0000 (UTC)
Subject: rpms/libxml2/F-10 libxml2.spec, 1.64, 1.65 sources, 1.46,
	1.47 libxml2-2.7.3-ficora-parse.patch, 1.1, NONE
Message-ID: <20090910175209.5798611C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv893

Modified Files:
	libxml2.spec sources 
Removed Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
Upstream release 2.7.4, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/libxml2.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- libxml2.spec	10 Aug 2009 14:31:30 -0000	1.64
+++ libxml2.spec	10 Sep 2009 17:52:09 -0000	1.65
@@ -1,15 +1,14 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.3
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.4
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
-Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
+Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: python python-devel zlib-devel
+BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.3-ficora-parse.patch
 
 %description
 This library allows to manipulate XML files. It includes support
@@ -68,7 +67,6 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-1
+- upstream release 2.7.4
+- symbol versioning of libxml2 shared libs
+- very large number of bug fixes
+
 * Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-2
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	19 Jan 2009 08:40:05 -0000	1.46
+++ sources	10 Sep 2009 17:52:09 -0000	1.47
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz


--- libxml2-2.7.3-ficora-parse.patch DELETED ---



From krh at fedoraproject.org  Thu Sep 10 18:02:21 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 10 Sep 2009 18:02:21 +0000 (UTC)
Subject: rpms/libdrm/devel intel-busy.patch,NONE,1.1 libdrm.spec,1.85,1.86
Message-ID: <20090910180221.0F95411C00DB@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4974

Modified Files:
	libdrm.spec 
Added Files:
	intel-busy.patch 
Log Message:
* Thu Sep 10 2009 Kristian H?gsberg <krh at redhat.com> - 2.4.12-0.10
- Pull in intel bo busy.


intel-busy.patch:
 intel_bufmgr.c      |    7 +++++++
 intel_bufmgr.h      |    1 +
 intel_bufmgr_gem.c  |   28 +++++++++++++++++++---------
 intel_bufmgr_priv.h |    9 +++++++--
 4 files changed, 34 insertions(+), 11 deletions(-)

--- NEW FILE intel-busy.patch ---
>From 8214a65ad1f4ccd4966e0def0d43f0c4289e4bc6 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric at anholt.net>
Date: Thu, 27 Aug 2009 18:32:07 -0700
Subject: [PATCH] Add drm_intel_bo_busy to query whether mapping a BO would block.

---
 libdrm/intel/intel_bufmgr.c      |    7 +++++++
 libdrm/intel/intel_bufmgr.h      |    1 +
 libdrm/intel/intel_bufmgr_gem.c  |   28 +++++++++++++++++++---------
 libdrm/intel/intel_bufmgr_priv.h |    8 +++++++-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/libdrm/intel/intel_bufmgr.c b/libdrm/intel/intel_bufmgr.c
index f170e7f..219c761 100644
--- a/libdrm/intel/intel_bufmgr.c
+++ b/libdrm/intel/intel_bufmgr.c
@@ -220,6 +220,13 @@ int drm_intel_bo_disable_reuse(drm_intel_bo *bo)
 	return 0;
 }
 
+int drm_intel_bo_busy(drm_intel_bo *bo)
+{
+	if (bo->bufmgr->bo_busy)
+		return bo->bufmgr->bo_busy(bo);
+	return 0;
+}
+
 int
 drm_intel_get_pipe_from_crtc_id (drm_intel_bufmgr *bufmgr, int crtc_id)
 {
diff --git a/libdrm/intel/intel_bufmgr.h b/libdrm/intel/intel_bufmgr.h
index 758558d..218b759 100644
--- a/libdrm/intel/intel_bufmgr.h
+++ b/libdrm/intel/intel_bufmgr.h
@@ -107,6 +107,7 @@ int drm_intel_bo_set_tiling(drm_intel_bo *bo, uint32_t *tiling_mode,
 int drm_intel_bo_get_tiling(drm_intel_bo *bo, uint32_t *tiling_mode,
 			uint32_t *swizzle_mode);
 int drm_intel_bo_flink(drm_intel_bo *bo, uint32_t *name);
+int drm_intel_bo_busy(drm_intel_bo *bo);
 
 int drm_intel_bo_disable_reuse(drm_intel_bo *bo);
 
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
index 737ceae..baa0ee6 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@@ -314,6 +314,22 @@ drm_intel_setup_reloc_list(drm_intel_bo *bo)
     return 0;
 }
 
+static int
+drm_intel_gem_bo_busy(drm_intel_bo *bo)
+{
+    drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bo->bufmgr;
+    drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *)bo;
+    struct drm_i915_gem_busy busy;
+    int ret;
+
+    memset(&busy, 0, sizeof(busy));
+    busy.handle = bo_gem->gem_handle;
+
+    ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
+
+    return (ret == 0 && busy.busy);
+}
+
 static drm_intel_bo *
 drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr, const char *name,
 				unsigned long size, unsigned int alignment,
@@ -344,8 +360,6 @@ drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr, const char *name,
     pthread_mutex_lock(&bufmgr_gem->lock);
     /* Get a buffer out of the cache if available */
     if (bucket != NULL && bucket->num_entries > 0) {
-	struct drm_i915_gem_busy busy;
-
 	if (for_render) {
 	    /* Allocate new render-target BOs from the tail (MRU)
 	     * of the list, as it will likely be hot in the GPU cache
@@ -364,13 +378,8 @@ drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr, const char *name,
 	     */
 	    bo_gem = DRMLISTENTRY(drm_intel_bo_gem, bucket->head.next, head);
 
-	    memset(&busy, 0, sizeof(busy));
-	    busy.handle = bo_gem->gem_handle;
-
-	    ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
-	    alloc_from_cache = (ret == 0 && busy.busy == 0);
-
-	    if (alloc_from_cache) {
+	    if (!drm_intel_gem_bo_busy(&bo_gem->bo)) {
+		alloc_from_cache = 1;
 		DRMLISTDEL(&bo_gem->head);
 		bucket->num_entries--;
 	    }
@@ -1491,6 +1500,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
     bufmgr_gem->bufmgr.bo_set_tiling = drm_intel_gem_bo_set_tiling;
     bufmgr_gem->bufmgr.bo_flink = drm_intel_gem_bo_flink;
     bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec;
+    bufmgr_gem->bufmgr.bo_busy = drm_intel_gem_bo_busy;
     bufmgr_gem->bufmgr.destroy = drm_intel_bufmgr_gem_destroy;
     bufmgr_gem->bufmgr.debug = 0;
     bufmgr_gem->bufmgr.check_aperture_space = drm_intel_gem_check_aperture_space;
diff --git a/libdrm/intel/intel_bufmgr_priv.h b/libdrm/intel/intel_bufmgr_priv.h
index 0098076..af17c12 100644
--- a/libdrm/intel/intel_bufmgr_priv.h
+++ b/libdrm/intel/intel_bufmgr_priv.h
@@ -177,6 +177,12 @@ struct _drm_intel_bufmgr {
      */
     int (*bo_flink)(drm_intel_bo *bo, uint32_t *name);
 
+    /**
+     * Returns 1 if mapping the buffer for write could cause the process
+     * to block, due to the object being active in the GPU.
+     */
+    int (*bo_busy)(drm_intel_bo *bo);
+
     int (*check_aperture_space)(drm_intel_bo **bo_array, int count);
 
     /**
@@ -200,7 +206,7 @@ struct _drm_intel_bufmgr {
      * \param crtc_id the crtc identifier
      */
     int (*get_pipe_from_crtc_id)(drm_intel_bufmgr *bufmgr, int crtc_id);
-    
+
     int debug; /**< Enables verbose debugging printouts */
 };
 
-- 
1.6.4



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- libdrm.spec	26 Aug 2009 02:01:26 -0000	1.85
+++ libdrm.spec	10 Sep 2009 18:02:20 -0000	1.86
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.12
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -29,6 +29,7 @@ Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
 
 Patch5: libdrm-page-flip.patch
+Patch6: intel-busy.patch
 
 
 %description
@@ -50,6 +51,7 @@ Direct Rendering Manager development pac
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .page-flip
+%patch6 -p1 -b .intel-busy
 
 %build
 autoreconf -v --install || exit 1
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Thu Sep 10 2009 Kristian H?gsberg <krh at redhat.com> - 2.4.12-0.10
+- Pull in intel bo busy.
+
 * Wed Aug 26 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.9
 - pull in radeon bo busy
 



From michich at fedoraproject.org  Thu Sep 10 18:05:11 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Thu, 10 Sep 2009 18:05:11 +0000 (UTC)
Subject: rpms/jabbim/F-11 jabbim-0.5-fix-message-loss.diff, NONE,
	1.1 jabbim.spec, 1.33, 1.34
Message-ID: <20090910180511.3E76A11C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5742

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.5-fix-message-loss.diff 
Log Message:
* Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
- Fix message loss because of a change in PyQt4 4.5.x.
  (jabbim-0.5-fix-message-loss.diff, committed upstream)


jabbim-0.5-fix-message-loss.diff:
 jabbim.py |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE jabbim-0.5-fix-message-loss.diff ---
commit 5959b46fc6ace41885092f0dda6cbbeb34685fd8
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Thu Sep 10 17:12:14 2009 +0000

    fix message loss with PyQt4 4.5.x
    
    In PyQt4 4.5 concatenating QString with unicode no longer works.
    This manifests itself by a traceback when receiving an initial message
    from a contact with non-ASCII name in roster. The message is thus lost.
    
    The traceback occurs in computing the value of a variable that is not
    even used.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk at 4225 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/jabbim.py b/jabbim.py
index 1c7e80e..9bf50bc 100644
--- a/jabbim.py
+++ b/jabbim.py
@@ -1793,14 +1793,6 @@ class clientClass(pyxl.client.Client):
 						traytext=body[:40]+" ..."
 				else:
 						traytext=body
-				text='<table><tr>'
-				#if len(self.main.ui.roster.getUserItems(frm.userhost()))>0 and os.path.isfile(self.main.homeDir+'/avatars/'+unicode(frm.userhost())):
-					#item=self.main.ui.roster.getUserItems(frm.userhost())[0]
-					#pixmap=item.avatar.pixmap(64,64)
-					#text+='<td><img src="'+self.main.homeDir+'/avatars/'+unicode(item.jid)+'" width="'+str(pixmap.width())+'" height="'+str(pixmap.height())+'"/></td>'
-				text+='<td><b>'+mainWindow.tr("New message from ")+unicode(user)+'</b><br/>'
-				text+='<font size="-1">'+traytext+'<br/>'
-				text+="</td></tr></table>"
 				if self.groupchats.has_key(frm.userhost()):
 					self.main.chat.addChatTab(frm.full(),unicode(user),icon,True,full=True)
 					tab,tabIndex=self.main.chat.findTab(frm.full(),True)


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/jabbim.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- jabbim.spec	8 Sep 2009 07:41:51 -0000	1.33
+++ jabbim.spec	10 Sep 2009 18:05:11 -0000	1.34
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.8.svn%{svndate}%{?dist}
+Release:	0.9.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -14,6 +14,7 @@ URL:		http://dev.jabbim.cz/jabbim
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
+Patch2:		jabbim-0.5-fix-message-loss.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@ with the advanced functionality provided
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -98,6 +100,10 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
+- Fix message loss because of a change in PyQt4 4.5.x.
+  (jabbim-0.5-fix-message-loss.diff, committed upstream)
+
 * Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
 - Fix compact-style roster drawing bug.
   (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)



From sandeen at fedoraproject.org  Thu Sep 10 18:10:31 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Thu, 10 Sep 2009 18:10:31 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-xfs-radix-tree-fix.patch, NONE,
	1.1 kernel.spec, 1.1406, 1.1407
Message-ID: <20090910181031.9416C11C043D@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8998

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xfs-radix-tree-fix.patch 
Log Message:
* Thu Sep 10 2009 Eric Sandeen <sandeen at redhat.com>
- Fix NFS vs. XFS oops (#502236)


linux-2.6-xfs-radix-tree-fix.patch:
 fs/inode.c         |   38 ++++++++------
 fs/xfs/xfs_iget.c  |  140 +++++++++++++++++++++++++++--------------------------
 fs/xfs/xfs_inode.h |   17 ------
 fs/xfs/xfs_log.c   |    2 
 include/linux/fs.h |    3 -
 5 files changed, 99 insertions(+), 101 deletions(-)

--- NEW FILE linux-2.6-xfs-radix-tree-fix.patch ---
commit 54e346215e4fe2ca8c94c54e546cc61902060510
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri Aug 7 14:38:25 2009 -0300

    vfs: fix inode_init_always calling convention

    Currently inode_init_always calls into ->destroy_inode if the additional
    initialization fails.  That's not only counter-intuitive because
    inode_init_always did not allocate the inode structure, but in case of
    XFS it's actively harmful as ->destroy_inode might delete the inode from
    a radix-tree that has never been added.  This in turn might end up
    deleting the inode for the same inum that has been instanciated by
    another process and cause lots of cause subtile problems.

    Also in the case of re-initializing a reclaimable inode in XFS it would
    free an inode we still want to keep alive.

    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net>

commit 2e00c97e2c1d2ffc9e26252ca26b237678b0b772
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri Aug 7 14:38:29 2009 -0300

    vfs: add __destroy_inode

    When we want to tear down an inode that lost the add to the cache race
    in XFS we must not call into ->destroy_inode because that would delete
    the inode that won the race from the inode cache radix tree.
    
    This patch provides the __destroy_inode helper needed to fix this,
    the actual fix will be in th next patch.  As XFS was the only reason
    destroy_inode was exported we shift the export to the new __destroy_inode.

    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net>

commit b36ec0428a06fcbdb67d61e9e664154e5dd9a8c7
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri Aug 7 14:38:34 2009 -0300

    xfs: fix freeing of inodes not yet added to the inode cache

    When freeing an inode that lost race getting added to the inode cache we
    must not call into ->destroy_inode, because that would delete the inode
    that won the race from the inode cache radix tree.
    
    This patch uses splits a new xfs_inode_free helper out of xfs_ireclaim
    and uses that plus __destroy_inode to make sure we really only free
    the memory allocted for the inode that lost the race, and not mess with
    the inode cache state.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net>
    Reported-by: Alex Samad <alex at samad.com.au>
    Reported-by: Andrew Randrianasulu <randrik at mail.ru>
    Reported-by: Stephane <sharnois at max-t.com>
    Reported-by: Tommy <tommy at news-service.com>
    Reported-by: Miah Gregory <mace at darksilence.net>
    Reported-by: Gabriel Barazer <gabriel at oxeva.fr>
    Reported-by: Leandro Lucarella <llucax at gmail.com>
    Reported-by: Daniel Burr <dburr at fami.com.au>
    Reported-by: Nickolay <newmail at spaces.ru>
    Reported-by: Michael Guntsche <mike at it-loops.com>
    Reported-by: Dan Carley <dan.carley+linuxkern-bugs at gmail.com>
    Reported-by: Michael Ole Olsen <gnu at gmx.net>
    Reported-by: Michael Weissenbacher <mw at dermichi.com>
    Reported-by: Martin Spott <Martin.Spott at mgras.net>
    Reported-by: Christian Kujau <lists at nerdbynature.de>
    Tested-by: Michael Guntsche <mike at it-loops.com>
    Tested-by: Dan Carley <dan.carley+linuxkern-bugs at gmail.com>
    Tested-by: Christian Kujau <lists at nerdbynature.de>

commit a8914f3a6d72c97328597a556a99daaf5cc288ae
Author: Christoph Hellwig <hch at lst.de>
Date:   Mon Aug 10 11:32:44 2009 -0300

    xfs: fix spin_is_locked assert on uni-processor builds

    Without SMP or preemption spin_is_locked always returns false,
    so we can't do an assert with it.  Instead use assert_spin_locked,
    which does the right thing on all builds.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Reviewed-by: Eric Sandeen <sandeen at sandeen.net> 
    Reported-by: Johannes Engel <jcnengel at googlemail.com> 
    Tested-by: Johannes Engel <jcnengel at googlemail.com>
    Signed-off-by: Felix Blyakher <felixb at sgi.com>

Index: linux-2.6.29.noarch/fs/inode.c
===================================================================
--- linux-2.6.29.noarch.orig/fs/inode.c
+++ linux-2.6.29.noarch/fs/inode.c
@@ -117,7 +117,7 @@ static void wake_up_inode(struct inode *
  * These are initializations that need to be done on every inode
  * allocation as the fields are not initialised by slab allocation.
  */
-struct inode *inode_init_always(struct super_block *sb, struct inode *inode)
+int inode_init_always(struct super_block *sb, struct inode *inode)
 {
 	static const struct address_space_operations empty_aops;
 	static struct inode_operations empty_iops;
@@ -147,13 +147,8 @@ struct inode *inode_init_always(struct s
 	inode->i_cdev = NULL;
 	inode->i_rdev = 0;
 	inode->dirtied_when = 0;
-	if (security_inode_alloc(inode)) {
-		if (inode->i_sb->s_op->destroy_inode)
-			inode->i_sb->s_op->destroy_inode(inode);
-		else
-			kmem_cache_free(inode_cachep, (inode));
-		return NULL;
-	}
+	if (security_inode_alloc(inode))
+		return -ENOMEM;
 
 	spin_lock_init(&inode->i_lock);
 	lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
@@ -188,7 +183,7 @@ struct inode *inode_init_always(struct s
 	inode->i_private = NULL;
 	inode->i_mapping = mapping;
 
-	return inode;
+	return 0;
 }
 EXPORT_SYMBOL(inode_init_always);
 
@@ -201,22 +196,35 @@ static struct inode *alloc_inode(struct 
 	else
 		inode = kmem_cache_alloc(inode_cachep, GFP_KERNEL);
 
-	if (inode)
-		return inode_init_always(sb, inode);
-	return NULL;
+	if (!inode)
+		return NULL;
+
+	if (unlikely(inode_init_always(sb, inode))) {
+		if (inode->i_sb->s_op->destroy_inode)
+			inode->i_sb->s_op->destroy_inode(inode);
+		else
+			kmem_cache_free(inode_cachep, inode);
+		return NULL;
+	}
+
+	return inode;
 }
 
-void destroy_inode(struct inode *inode) 
+void __destroy_inode(struct inode *inode)
 {
 	BUG_ON(inode_has_buffers(inode));
 	security_inode_free(inode);
+}
+EXPORT_SYMBOL(__destroy_inode);
+
+void destroy_inode(struct inode *inode)
+{
+	__destroy_inode(inode);
 	if (inode->i_sb->s_op->destroy_inode)
 		inode->i_sb->s_op->destroy_inode(inode);
 	else
 		kmem_cache_free(inode_cachep, (inode));
 }
-EXPORT_SYMBOL(destroy_inode);
-
 
 /*
  * These are initializations that only need to be done
Index: linux-2.6.29.noarch/fs/xfs/xfs_iget.c
===================================================================
--- linux-2.6.29.noarch.orig/fs/xfs/xfs_iget.c
+++ linux-2.6.29.noarch/fs/xfs/xfs_iget.c
@@ -63,21 +63,16 @@ xfs_inode_alloc(
 	ip = kmem_zone_alloc(xfs_inode_zone, KM_SLEEP);
 	if (!ip)
 		return NULL;
+	if (inode_init_always(mp->m_super, VFS_I(ip))) {
+		kmem_zone_free(xfs_inode_zone, ip);
+		return NULL;
+	}
 
 	ASSERT(atomic_read(&ip->i_iocount) == 0);
 	ASSERT(atomic_read(&ip->i_pincount) == 0);
 	ASSERT(!spin_is_locked(&ip->i_flags_lock));
 	ASSERT(completion_done(&ip->i_flush));
 
-	/*
-	 * initialise the VFS inode here to get failures
-	 * out of the way early.
-	 */
-	if (!inode_init_always(mp->m_super, VFS_I(ip))) {
-		kmem_zone_free(xfs_inode_zone, ip);
-		return NULL;
-	}
-
 	/* initialise the xfs inode */
 	ip->i_ino = ino;
 	ip->i_mount = mp;
@@ -117,6 +112,71 @@ xfs_inode_alloc(
 	return ip;
 }
 
+STATIC void
+xfs_inode_free(
+	struct xfs_inode	*ip)
+{
+	switch (ip->i_d.di_mode & S_IFMT) {
+	case S_IFREG:
+	case S_IFDIR:
+	case S_IFLNK:
+		xfs_idestroy_fork(ip, XFS_DATA_FORK);
+		break;
+	}
+
+	if (ip->i_afp)
+		xfs_idestroy_fork(ip, XFS_ATTR_FORK);
+
+#ifdef XFS_INODE_TRACE
+	ktrace_free(ip->i_trace);
+#endif
+#ifdef XFS_BMAP_TRACE
+	ktrace_free(ip->i_xtrace);
+#endif
+#ifdef XFS_BTREE_TRACE
+	ktrace_free(ip->i_btrace);
+#endif
+#ifdef XFS_RW_TRACE
+	ktrace_free(ip->i_rwtrace);
+#endif
+#ifdef XFS_ILOCK_TRACE
+	ktrace_free(ip->i_lock_trace);
+#endif
+#ifdef XFS_DIR2_TRACE
+	ktrace_free(ip->i_dir_trace);
+#endif
+
+	if (ip->i_itemp) {
+		/*
+		 * Only if we are shutting down the fs will we see an
+		 * inode still in the AIL. If it is there, we should remove
+		 * it to prevent a use-after-free from occurring.
+		 */
+		xfs_log_item_t	*lip = &ip->i_itemp->ili_item;
+		struct xfs_ail	*ailp = lip->li_ailp;
+
+		ASSERT(((lip->li_flags & XFS_LI_IN_AIL) == 0) ||
+				       XFS_FORCED_SHUTDOWN(ip->i_mount));
+		if (lip->li_flags & XFS_LI_IN_AIL) {
+			spin_lock(&ailp->xa_lock);
+			if (lip->li_flags & XFS_LI_IN_AIL)
+				xfs_trans_ail_delete(ailp, lip);
+			else
+				spin_unlock(&ailp->xa_lock);
+		}
+		xfs_inode_item_destroy(ip);
+		ip->i_itemp = NULL;
+	}
+
+	/* asserts to verify all state is correct here */
+	ASSERT(atomic_read(&ip->i_iocount) == 0);
+	ASSERT(atomic_read(&ip->i_pincount) == 0);
+	ASSERT(!spin_is_locked(&ip->i_flags_lock));
+	ASSERT(completion_done(&ip->i_flush));
+
+	kmem_zone_free(xfs_inode_zone, ip);
+}
+
 /*
  * Check the validity of the inode we just found it the cache
  */
@@ -161,7 +221,7 @@ xfs_iget_cache_hit(
 		 * errors cleanly, then tag it so it can be set up correctly
 		 * later.
 		 */
-		if (!inode_init_always(mp->m_super, VFS_I(ip))) {
+		if (inode_init_always(mp->m_super, VFS_I(ip))) {
 			error = ENOMEM;
 			goto out_error;
 		}
@@ -293,7 +353,8 @@ out_preload_end:
 	if (lock_flags)
 		xfs_iunlock(ip, lock_flags);
 out_destroy:
-	xfs_destroy_inode(ip);
+	__destroy_inode(VFS_I(ip));
+	xfs_inode_free(ip);
 	return error;
 }
 
@@ -501,62 +562,7 @@ xfs_ireclaim(
 	XFS_QM_DQDETACH(ip->i_mount, ip);
 	xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
 
-	switch (ip->i_d.di_mode & S_IFMT) {
-	case S_IFREG:
-	case S_IFDIR:
-	case S_IFLNK:
-		xfs_idestroy_fork(ip, XFS_DATA_FORK);
-		break;
-	}
-
-	if (ip->i_afp)
-		xfs_idestroy_fork(ip, XFS_ATTR_FORK);
-
-#ifdef XFS_INODE_TRACE
-	ktrace_free(ip->i_trace);
-#endif
-#ifdef XFS_BMAP_TRACE
-	ktrace_free(ip->i_xtrace);
-#endif
-#ifdef XFS_BTREE_TRACE
-	ktrace_free(ip->i_btrace);
-#endif
-#ifdef XFS_RW_TRACE
-	ktrace_free(ip->i_rwtrace);
-#endif
-#ifdef XFS_ILOCK_TRACE
-	ktrace_free(ip->i_lock_trace);
-#endif
-#ifdef XFS_DIR2_TRACE
-	ktrace_free(ip->i_dir_trace);
-#endif
-	if (ip->i_itemp) {
-		/*
-		 * Only if we are shutting down the fs will we see an
-		 * inode still in the AIL. If it is there, we should remove
-		 * it to prevent a use-after-free from occurring.
-		 */
-		xfs_log_item_t	*lip = &ip->i_itemp->ili_item;
-		struct xfs_ail	*ailp = lip->li_ailp;
-
-		ASSERT(((lip->li_flags & XFS_LI_IN_AIL) == 0) ||
-				       XFS_FORCED_SHUTDOWN(ip->i_mount));
-		if (lip->li_flags & XFS_LI_IN_AIL) {
-			spin_lock(&ailp->xa_lock);
-			if (lip->li_flags & XFS_LI_IN_AIL)
-				xfs_trans_ail_delete(ailp, lip);
-			else
-				spin_unlock(&ailp->xa_lock);
-		}
-		xfs_inode_item_destroy(ip);
-		ip->i_itemp = NULL;
-	}
-	/* asserts to verify all state is correct here */
-	ASSERT(atomic_read(&ip->i_iocount) == 0);
-	ASSERT(atomic_read(&ip->i_pincount) == 0);
-	ASSERT(!spin_is_locked(&ip->i_flags_lock));
-	ASSERT(completion_done(&ip->i_flush));
-	kmem_zone_free(xfs_inode_zone, ip);
+	xfs_inode_free(ip);
 }
 
 /*
Index: linux-2.6.29.noarch/include/linux/fs.h
===================================================================
--- linux-2.6.29.noarch.orig/include/linux/fs.h
+++ linux-2.6.29.noarch/include/linux/fs.h
@@ -1906,7 +1906,7 @@ extern loff_t default_llseek(struct file
 
 extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin);
 
-extern struct inode * inode_init_always(struct super_block *, struct inode *);
+extern int inode_init_always(struct super_block *, struct inode *);
 extern void inode_init_once(struct inode *);
 extern void inode_add_to_lists(struct super_block *, struct inode *);
 extern void iput(struct inode *);
@@ -1933,6 +1933,7 @@ extern void __iget(struct inode * inode)
 extern void iget_failed(struct inode *);
 extern void clear_inode(struct inode *);
 extern void destroy_inode(struct inode *);
+extern void __destroy_inode(struct inode *);
 extern struct inode *new_inode(struct super_block *);
 extern int should_remove_suid(struct dentry *);
 extern int file_remove_suid(struct file *);
Index: linux-2.6.29.noarch/fs/xfs/xfs_inode.h
===================================================================
--- linux-2.6.29.noarch.orig/fs/xfs/xfs_inode.h
+++ linux-2.6.29.noarch/fs/xfs/xfs_inode.h
@@ -309,23 +309,6 @@ static inline struct inode *VFS_I(struct
 }
 
 /*
- * Get rid of a partially initialized inode.
- *
- * We have to go through destroy_inode to make sure allocations
- * from init_inode_always like the security data are undone.
- *
- * We mark the inode bad so that it takes the short cut in
- * the reclaim path instead of going through the flush path
- * which doesn't make sense for an inode that has never seen the
- * light of day.
- */
-static inline void xfs_destroy_inode(struct xfs_inode *ip)
-{
-	make_bad_inode(VFS_I(ip));
-	return destroy_inode(VFS_I(ip));
-}
-
-/*
  * i_flags helper functions
  */
 static inline void
Index: linux-2.6.29.noarch/fs/xfs/xfs_log.c
===================================================================
--- linux-2.6.29.noarch.orig/fs/xfs/xfs_log.c
+++ linux-2.6.29.noarch/fs/xfs/xfs_log.c
@@ -3195,7 +3195,7 @@ try_again:
 STATIC void
 xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog)
 {
-	ASSERT(spin_is_locked(&log->l_icloglock));
+	assert_spin_locked(&log->l_icloglock);
 
 	if (iclog->ic_state == XLOG_STATE_ACTIVE) {
 		xlog_state_switch_iclogs(log, iclog, 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1406
retrieving revision 1.1407
diff -u -p -r1.1406 -r1.1407
--- kernel.spec	21 Aug 2009 20:37:42 -0000	1.1406
+++ kernel.spec	10 Sep 2009 18:10:30 -0000	1.1407
@@ -729,6 +729,7 @@ Patch2950: linux-2.6-kjournald-use-rt-io
 
 Patch3000: linux-2.6-btrfs-unstable-update.patch
 Patch3001: linux-2.6-ecryptfs-overflow-fixes.patch
+Patch3002: linux-2.6-xfs-radix-tree-fix.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -1240,6 +1241,7 @@ ApplyPatch linux-2.6-kjournald-use-rt-io
 # ext4
 
 # xfs
+ApplyPatch linux-2.6-xfs-radix-tree-fix.patch
 
 # btrfs
 ApplyPatch linux-2.6-btrfs-unstable-update.patch
@@ -2034,6 +2036,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 10 2009 Eric Sandeen <sandeen at redhat.com>
+- Fix NFS vs. XFS oops (#502236)
+
 * Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Fix b43 on iMac G5 (#514787)
 



From pbrobinson at fedoraproject.org  Thu Sep 10 18:22:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Sep 2009 18:22:49 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.2,
	1.3 moblin-panel-myzone.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090910182249.64A1911C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14663

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Aug 2009 21:20:11 -0000	1.2
+++ .cvsignore	10 Sep 2009 18:22:47 -0000	1.3
@@ -1 +1 @@
-moblin-panel-myzone-0.0.1.tar.bz2
+moblin-panel-myzone-0.0.4.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-myzone.spec	24 Aug 2009 22:00:01 -0000	1.2
+++ moblin-panel-myzone.spec	10 Sep 2009 18:22:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-panel-myzone
-Version:        0.0.1
-Release:        3%{?dist}
+Version:        0.0.4
+Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
+- New upstream 0.0.4 release
+
 * Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
 - Bump release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Aug 2009 21:20:11 -0000	1.2
+++ sources	10 Sep 2009 18:22:47 -0000	1.3
@@ -1 +1 @@
-4f7bfb14fa11d183c5cd0e150ed51806  moblin-panel-myzone-0.0.1.tar.bz2
+f2e6abf58c1815291ef5a180c32ddd05  moblin-panel-myzone-0.0.4.tar.bz2



From pbrobinson at fedoraproject.org  Thu Sep 10 18:23:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Sep 2009 18:23:13 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/devel .cvsignore, 1.5,
	1.6 moblin-gtk-engine.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090910182313.99D8711C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-gtk-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14883

Modified Files:
	.cvsignore moblin-gtk-engine.spec sources 
Log Message:
- New upstream 1.0.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Sep 2009 15:32:08 -0000	1.5
+++ .cvsignore	10 Sep 2009 18:23:13 -0000	1.6
@@ -1 +1 @@
-moblin-gtk-engine-1.0.0.tar.bz2
+moblin-gtk-engine-1.0.1.tar.bz2


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/moblin-gtk-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-gtk-engine.spec	6 Sep 2009 15:32:08 -0000	1.5
+++ moblin-gtk-engine.spec	10 Sep 2009 18:23:13 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           moblin-gtk-engine
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        GTK engine for Moblin
 
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Moblin-Netbook/metacity-1
 
 %changelog
+* Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.1-1
+- New upstream 1.0.1 release
+
 * Sun Sep  6 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-1
 - New upstream 1.0.0 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Sep 2009 15:32:08 -0000	1.5
+++ sources	10 Sep 2009 18:23:13 -0000	1.6
@@ -1 +1 @@
-ed20c17d5c896ebafc937afb4e3bdad0  moblin-gtk-engine-1.0.0.tar.bz2
+88f34246efe5f17a57b33d84d4726e43  moblin-gtk-engine-1.0.1.tar.bz2



From pbrobinson at fedoraproject.org  Thu Sep 10 18:28:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Sep 2009 18:28:42 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel import.log,1.1,NONE
Message-ID: <20090910182842.A89A211C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16438

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 10 18:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 18:33:08 +0000
Subject: [pkgdb] maven-plugin-cobertura was added for akurtakov
Message-ID: <20090910183309.2229D10F87C@bastion2.fedora.phx.redhat.com>

ausil has added Package maven-plugin-cobertura with summary Plugin providing the features of Cobertura within Maven
ausil has approved Package maven-plugin-cobertura
ausil has added a Fedora devel branch for maven-plugin-cobertura with an owner of akurtakov
ausil has approved maven-plugin-cobertura in Fedora devel
ausil has approved Package maven-plugin-cobertura
ausil has set commit to Approved for 107427 on maven-plugin-cobertura (Fedora devel)
ausil has set checkout to Approved for 107427 on maven-plugin-cobertura (Fedora devel)
ausil has set build to Approved for 107427 on maven-plugin-cobertura (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-cobertura



From ausil at fedoraproject.org  Thu Sep 10 18:33:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 10 Sep 2009 18:33:16 +0000 (UTC)
Subject: rpms/maven-plugin-cobertura/devel - New directory
Message-ID: <20090910183316.457AF11C00E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk17738/rpms/maven-plugin-cobertura/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-cobertura/devel added to the repository




From ausil at fedoraproject.org  Thu Sep 10 18:33:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 10 Sep 2009 18:33:16 +0000 (UTC)
Subject: rpms/maven-plugin-cobertura - New directory
Message-ID: <20090910183316.1A07C11C00DB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-cobertura
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk17738/rpms/maven-plugin-cobertura

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-cobertura added to the repository




From pkgdb at fedoraproject.org  Thu Sep 10 18:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 18:33:10 +0000
Subject: [pkgdb] maven-plugin-cobertura summary updated by ausil
Message-ID: <20090910183310.3AE2C10F890@bastion2.fedora.phx.redhat.com>

ausil set package maven-plugin-cobertura summary to Plugin providing the features of Cobertura within Maven

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-cobertura



From ausil at fedoraproject.org  Thu Sep 10 18:33:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 10 Sep 2009 18:33:22 +0000 (UTC)
Subject: rpms/maven-plugin-cobertura Makefile,NONE,1.1
Message-ID: <20090910183322.EFBE011C00DB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-cobertura
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk17738/rpms/maven-plugin-cobertura

Added Files:
	Makefile 
Log Message:
Setup of module maven-plugin-cobertura


--- NEW FILE Makefile ---
# Top level Makefile for module maven-plugin-cobertura
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  Thu Sep 10 18:33:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 10 Sep 2009 18:33:23 +0000 (UTC)
Subject: rpms/maven-plugin-cobertura/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090910183323.4D52C11C00DB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maven-plugin-cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk17738/rpms/maven-plugin-cobertura/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-plugin-cobertura


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-plugin-cobertura
# $Id: Makefile,v 1.1 2009/09/10 18:33:23 ausil Exp $
NAME := maven-plugin-cobertura
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  Thu Sep 10 18:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 18:43:29 +0000
Subject: [pkgdb] elfutils had acl change status
Message-ID: <20090910184329.196FC10F855@bastion2.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on elfutils (Fedora devel) to Approved for mjw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/elfutils



From pkgdb at fedoraproject.org  Thu Sep 10 18:43:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 18:43:30 +0000
Subject: [pkgdb] elfutils had acl change status
Message-ID: <20090910184330.ECA0F10F87E@bastion2.fedora.phx.redhat.com>

roland has set the watchcommits acl on elfutils (Fedora devel) to Approved for mjw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/elfutils



From pkgdb at fedoraproject.org  Thu Sep 10 18:43:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 18:43:33 +0000
Subject: [pkgdb] elfutils had acl change status
Message-ID: <20090910184333.4871110F893@bastion2.fedora.phx.redhat.com>

roland has set the commit acl on elfutils (Fedora devel) to Approved for mjw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/elfutils



From kevin at fedoraproject.org  Thu Sep 10 19:04:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 10 Sep 2009 19:04:07 +0000 (UTC)
Subject: rpms/Thunar/devel Thunar.spec,1.25,1.26
Message-ID: <20090910190407.443A011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27534

Modified Files:
	Thunar.spec 
Log Message:
Require dbus-x11 (#505499)



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- Thunar.spec	24 Jul 2009 16:25:32 -0000	1.25
+++ Thunar.spec	10 Sep 2009 19:04:06 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
@@ -28,6 +28,7 @@ BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
 BuildRequires: chrpath
 Requires: shared-mime-info
+Requires: dbus-x11
 
 # obsolete xffm to allow for smooth upgrades
 Provides: xffm = 4.2.4
@@ -198,6 +199,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 10 2009 Kevin Fenzi <kevin at tummy.com> - 1.0.1-3
+- Require dbus-x11 (#505499)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Thu Sep 10 19:10:40 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Sep 2009 19:10:40 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-python-error.patch, 1.3,
	1.4 deltarpm.spec, 1.29, 1.30
Message-ID: <20090910191040.E7CD211C043D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29445

Modified Files:
	deltarpm-python-error.patch deltarpm.spec 
Log Message:
Don't use new functions that aren't on old kernels.


deltarpm-python-error.patch:
 deltarpmmodule.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Index: deltarpm-python-error.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm-python-error.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- deltarpm-python-error.patch	9 Sep 2009 19:51:22 -0000	1.3
+++ deltarpm-python-error.patch	10 Sep 2009 19:10:40 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up deltarpm-git-20090831.1/deltarpmmodule.c.foo deltarpm-git-20090831.1/deltarpmmodule.c
 --- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-08-31 10:17:34.000000000 -0400
-+++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 15:44:49.000000000 -0400
++++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-10 15:04:01.000000000 -0400
 @@ -66,13 +66,17 @@ static PyObject *doRead(PyObject *s, PyO
    int pid;
    int ipcpipe[2];
@@ -14,14 +14,14 @@ diff -up deltarpm-git-20090831.1/deltarp
    /* The delta rpm code does not expect to be used in its way. Its error handling
     * conststs of 'printf' and 'exit'. So, dirty hacks abound. */
 -  if (pipe2(ipcpipe, O_NONBLOCK) == -1)
-+  if (pipe2(ipcpipe, O_NONBLOCK) == -1) {
++  if (pipe(ipcpipe) == -1) {
 +    PyErr_SetFromErrno(PyExc_SystemError);
      return NULL;
 +  }
  
    if ((pid = fork())) {
      FILE *readend = fdopen(ipcpipe[0], "r");
-@@ -90,8 +94,10 @@ static PyObject *doRead(PyObject *s, PyO
+@@ -90,8 +96,10 @@ static PyObject *doRead(PyObject *s, PyO
  
      readdeltarpm(filename, &d, NULL);
      PyMarshal_WriteObjectToFile(createDict(d), writend, Py_MARSHAL_VERSION);


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- deltarpm.spec	9 Sep 2009 19:51:22 -0000	1.29
+++ deltarpm.spec	10 Sep 2009 19:10:40 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1.3%{?dist}
+Release: 0.git.20090831.1.4%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -51,7 +51,7 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090831.1
-%patch -p1
+%patch -p1 -b .foo
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -98,6 +98,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 10 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.4
+- fix python bindings to not require kernel >= 2.6.27
+
 * Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.3
 - fix python bindings to:
   - call _exit(), not exit()



From jorton at fedoraproject.org  Thu Sep 10 19:21:04 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu, 10 Sep 2009 19:21:04 +0000 (UTC)
Subject: rpms/subversion/F-10 subversion-1.6.2-kwallet.patch, NONE,
	1.1 subversion.spec, 1.131, 1.132
Message-ID: <20090910192104.98C0311C00DB@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32348

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.6.2-kwallet.patch 
Log Message:
* Thu Sep 10 2009 Joe Orton <jorton at redhat.com> 1.6.5-1.1
- add -gnome, -kde subpackages (#522592)


subversion-1.6.2-kwallet.patch:
 kwallet.m4 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE subversion-1.6.2-kwallet.patch ---

The first half of this is certainly upstream-worthy, but the second half is presumably
some Fedora-specific KDE packaging thing.  It's not obvious how to get
kde4-config to report the directory which contains the .so files.

--- subversion-1.6.2/build/ac-macros/kwallet.m4.kwallet
+++ subversion-1.6.2/build/ac-macros/kwallet.m4
@@ -45,14 +45,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
                     CPPFLAGS="$CPPFLAGS $d"
                   done
                   qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-                  kde_dir="`$kde4_config --prefix`"
-                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
+                  kde_include_dirs="-I`$kde4_config --path include`"
+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs"
                   qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
                   SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
                   CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
                   LIBS="$LIBS $SVN_KWALLET_LIBS"
                   qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
+                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L/usr/lib`$kde4_config --libsuffix`/kde4/devel"
                   AC_LANG(C++)
                   AC_LINK_IFELSE([
 #include <kwallet.h>


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/subversion.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- subversion.spec	23 Aug 2009 09:02:14 -0000	1.131
+++ subversion.spec	10 Sep 2009 19:21:04 -0000	1.132
@@ -15,7 +15,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -28,11 +28,13 @@ Patch2: subversion-1.6.0-deplibs.patch
 Patch3: subversion-1.6.1-rpath.patch
 Patch6: subversion-1.6.0-pie.patch
 Patch7: subversion-1.1.3-java.patch
+Patch8: subversion-1.6.2-kwallet.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
 BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRequires: sqlite-devel >= 3.4.0
+BuildRequires: gnome-keyring-devel, dbus-devel, kdelibs-devel >= 4.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
 Requires: apr >= 1.3.0
@@ -60,6 +62,24 @@ The subversion-devel package includes th
 include files for developers interacting with the subversion
 package.
 
+%package gnome
+Group: Development/Tools
+Summary: GNOME Keyring support for Subversion
+Requires: subversion = %{version}-%{release}
+
+%description gnome
+The subversion-gnome package adds support for storing Subversion
+passwords in the GNOME Keyring.
+
+%package kde
+Group: Development/Tools
+Summary: KDE Wallet support for Subversion
+Requires: subversion = %{version}-%{release}
+
+%description kde
+The subversion-kde package adds support for storing Subversion
+passwords in the KDE Wallet.
+
 %package -n mod_dav_svn
 Group: System Environment/Daemons
 Summary: Apache httpd module for Subversion server
@@ -114,6 +134,7 @@ This package includes the Ruby bindings 
 %ifarch sparc64
 sed -i -e 's|-fpie|-fPIE|g' Makefile.in
 %endif
+%patch8 -p1 -b .kwallet
 
 %build
 # Regenerate the buildsystem, so that:
@@ -135,7 +156,9 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_pa
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
         --disable-static --with-sasl=%{_prefix} \
-        --disable-neon-version-check
+        --disable-neon-version-check \
+        --with-gnome-keyring \
+        --with-kwallet
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -165,6 +188,13 @@ install -m 644 $RPM_SOURCE_DIR/subversio
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
        ${RPM_BUILD_ROOT}%{python_sitearch}/*/*.{a,la}
 
+# The SVN build system is broken w.r.t. DSO support; it treats
+# normal libraries as DSOs and puts them in $libdir, whereas they
+# should go in some subdir somewhere, and be linked using -module,
+# etc.  So, forcibly nuke the .so's for libsvn_auth_{gnome,kde},
+# since nothing should ever link against them directly.
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_auth_*.so
+
 # remove stuff produced with Perl modules
 find $RPM_BUILD_ROOT -type f \
     -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \
@@ -206,6 +236,7 @@ sed -i "/^dependency_libs/{
 %if %{make_check}
 %check
 export LANG=C LC_ALL=C
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 make check check-swig-pl check-swig-py CLEANUP=yes
 # check-swig-rb omitted: it runs svnserve
 %endif
@@ -248,8 +279,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/subversion
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
+%exclude %{_libdir}/libsvn_auth_kwallet*
+%exclude %{_libdir}/libsvn_auth_gnome*
 %exclude %{_mandir}/man*/*::*
 
+%files gnome
+%{_libdir}/libsvn_auth_gnome_keyring-*.so.*
+
+%files kde
+%{_libdir}/libsvn_auth_kwallet-*.so.*
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/subversion-1
@@ -286,6 +325,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Sep 10 2009 Joe Orton <jorton at redhat.com> 1.6.5-1.1
+- add -gnome, -kde subpackages (#522592)
+
 * Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
 - update to 1.6.5
 



From dwalsh at fedoraproject.org  Thu Sep 10 19:35:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Sep 2009 19:35:31 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.122,
	1.123 setroubleshoot.spec, 1.162, 1.163 sources, 1.135, 1.136
Message-ID: <20090910193531.5112611C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6961

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.27-1
- Close open file descriptors on exec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- .cvsignore	10 Sep 2009 13:23:48 -0000	1.122
+++ .cvsignore	10 Sep 2009 19:35:31 -0000	1.123
@@ -39,3 +39,4 @@ setroubleshoot-2.2.22.tar.gz
 setroubleshoot-2.2.23.tar.gz
 setroubleshoot-2.2.24.tar.gz
 setroubleshoot-2.2.26.tar.gz
+setroubleshoot-2.2.27.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- setroubleshoot.spec	10 Sep 2009 13:23:48 -0000	1.162
+++ setroubleshoot.spec	10 Sep 2009 19:35:31 -0000	1.163
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.26
+Version: 2.2.27
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.27-1
+- Close open file descriptors on exec
+
 * Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.26-1
 - Fix setroubleshoot error dialog and hash to catch more dups on reportbug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- sources	10 Sep 2009 13:23:48 -0000	1.135
+++ sources	10 Sep 2009 19:35:31 -0000	1.136
@@ -1 +1 @@
-973162d70754613baee809da731e2d3c  setroubleshoot-2.2.26.tar.gz
+e6ee1f4df60f61ed745962fe690a1431  setroubleshoot-2.2.27.tar.gz



From dwalsh at fedoraproject.org  Thu Sep 10 19:37:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Sep 2009 19:37:00 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.34,
	1.35 setroubleshoot-plugins.spec, 1.39, 1.40 sources, 1.35, 1.36
Message-ID: <20090910193700.CC3D111C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7466

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Sep 10 2009  <dwalsh at redhat.com> - 2.1.19-1
- Change summary to use full path for source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	10 Sep 2009 14:07:16 -0000	1.34
+++ .cvsignore	10 Sep 2009 19:37:00 -0000	1.35
@@ -24,3 +24,4 @@ setroubleshoot-plugins-2.1.14.tar.gz
 setroubleshoot-plugins-2.1.15.tar.gz
 setroubleshoot-plugins-2.1.16.tar.gz
 setroubleshoot-plugins-2.1.18.tar.gz
+setroubleshoot-plugins-2.1.19.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- setroubleshoot-plugins.spec	10 Sep 2009 14:07:16 -0000	1.39
+++ setroubleshoot-plugins.spec	10 Sep 2009 19:37:00 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.18
+Version: 2.1.19
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Sep 10 2009  <dwalsh at redhat.com> - 2.1.19-1
+- Change summary to use full path for source
+
 * Thu Sep 10 2009  <dwalsh at redhat.com> - 2.1.18-1
 - Update po
 - Fix "compromized plugins" to report more data in summary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	10 Sep 2009 14:07:16 -0000	1.35
+++ sources	10 Sep 2009 19:37:00 -0000	1.36
@@ -1 +1 @@
-dffed2c8ee50c861fc9d1e1fa990c352  setroubleshoot-plugins-2.1.18.tar.gz
+4b104bfc194b489f65ecfe5c12330e30  setroubleshoot-plugins-2.1.19.tar.gz



From pbrobinson at fedoraproject.org  Thu Sep 10 19:45:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Sep 2009 19:45:28 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/devel moblin-gtk-engine.spec, 1.6,
	1.7 moblin-gtk-engine-fixtheme.patch, 1.1, NONE
Message-ID: <20090910194528.CC4CE11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-gtk-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12828

Modified Files:
	moblin-gtk-engine.spec 
Removed Files:
	moblin-gtk-engine-fixtheme.patch 
Log Message:
- Drop upstreamed patch


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/moblin-gtk-engine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-gtk-engine.spec	10 Sep 2009 18:23:13 -0000	1.6
+++ moblin-gtk-engine.spec	10 Sep 2009 19:45:28 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           moblin-gtk-engine
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK engine for Moblin
 
 Group:          User Interface/Desktops
 License:        LGPLv2
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:         moblin-gtk-engine-fixtheme.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -21,7 +20,6 @@ GTK engine for Moblin
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixtheme
 
 %build
 ./autogen.sh
@@ -35,9 +33,6 @@ make install DESTDIR=%{buildroot} INSTAL
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-rm -rf %{buildroot}/%{_libdir}/*.la
-rm -rf %{buildroot}/%{_libdir}/gtk-2.0/2.10.0/engines/*.la
-
 # Convert to utf-8
 for file in README COPYING.LIB AUTHORS NEWS; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
@@ -62,6 +57,9 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Moblin-Netbook/metacity-1
 
 %changelog
+* Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.1-2
+- Drop upstreamed patch
+
 * Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.1-1
 - New upstream 1.0.1 release
 


--- moblin-gtk-engine-fixtheme.patch DELETED ---



From hadess at fedoraproject.org  Thu Sep 10 19:50:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 10 Sep 2009 19:50:15 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.46, 1.47 bluez.spec, 1.95,
	1.96 sources, 1.46, 1.47
Message-ID: <20090910195015.5171D11C043A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15684

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Thu Sep 10 2009 Bastien Nocera <bnocera at redhat.com> 4.53-1
- Update to 4.53



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	4 Sep 2009 16:37:45 -0000	1.46
+++ .cvsignore	10 Sep 2009 19:50:14 -0000	1.47
@@ -1 +1 @@
-bluez-4.52.tar.gz
+bluez-4.53.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- bluez.spec	4 Sep 2009 16:37:45 -0000	1.95
+++ bluez.spec	10 Sep 2009 19:50:14 -0000	1.96
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.52
+Version: 4.53
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -271,6 +271,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Thu Sep 10 2009 Bastien Nocera <bnocera at redhat.com> 4.53-1
+- Update to 4.53
+
 * Fri Sep 04 2009 Bastien Nocera <bnocera at redhat.com> 4.52-1
 - Update to 4.52
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	4 Sep 2009 16:37:45 -0000	1.46
+++ sources	10 Sep 2009 19:50:14 -0000	1.47
@@ -1 +1 @@
-a5da4cdb7135dc55afa28447a186bd2a  bluez-4.52.tar.gz
+432509193ea508da5ce23fe056625d0f  bluez-4.53.tar.gz



From caillon at fedoraproject.org  Thu Sep 10 19:52:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu, 10 Sep 2009 19:52:20 +0000 (UTC)
Subject: rpms/xchat/devel xchat.spec, 1.106, 1.107 xchat-2.0.2-freenode.patch,
	1.1, NONE
Message-ID: <20090910195220.CA9A911C00DB@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17117

Modified Files:
	xchat.spec 
Removed Files:
	xchat-2.0.2-freenode.patch 
Log Message:
* Thu Sep 10 2009 Christopher Aillon <caillon at redhat.com> - 1:2.8.6-13
- Drop the antiquated OPN reference



Index: xchat.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- xchat.spec	21 Aug 2009 16:31:28 -0000	1.106
+++ xchat.spec	10 Sep 2009 19:52:20 -0000	1.107
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   12%{?dist}
+Release:   13%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -17,7 +17,6 @@ Patch0: xc286-smallfixes.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
-Patch19: xchat-2.0.2-freenode.patch
 # see #241923
 Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
 Patch40: xchat-2.8.4-shm-pixmaps.patch
@@ -73,7 +72,6 @@ This package contains the X-Chat plugin 
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
-%patch19 -p0 -b .freenode
 %patch35 -p1 -b .tray-icon
 %patch40 -p1 -b .shm-pixmaps
 %patch41 -p1 -b .default-utf8
@@ -167,6 +165,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Thu Sep 10 2009 Christopher Aillon <caillon at redhat.com> - 1:2.8.6-13
+- Drop the antiquated OPN reference
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:2.8.6-12
 - rebuilt with new openssl
 


--- xchat-2.0.2-freenode.patch DELETED ---



From limb at fedoraproject.org  Thu Sep 10 20:02:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 10 Sep 2009 20:02:44 +0000 (UTC)
Subject: rpms/supertuxkart/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 supertuxkart.spec, 1.16, 1.17
Message-ID: <20090910200244.B7D2A11C00DB@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/supertuxkart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24850

Modified Files:
	.cvsignore sources supertuxkart.spec 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supertuxkart/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Jul 2009 19:00:22 -0000	1.8
+++ .cvsignore	10 Sep 2009 20:02:44 -0000	1.9
@@ -1 +1 @@
-supertuxkart-0.6.1a.tar.bz2
+supertuxkart-0.6.2-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supertuxkart/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Jul 2009 19:00:22 -0000	1.8
+++ sources	10 Sep 2009 20:02:44 -0000	1.9
@@ -1 +1 @@
-2617a0de97f604ca692fcbd685e742ef  supertuxkart-0.6.1a.tar.bz2
+bfee9844acc2d4e168d903f6aae6d591  supertuxkart-0.6.2-src.tar.bz2


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- supertuxkart.spec	17 Aug 2009 18:07:19 -0000	1.16
+++ supertuxkart.spec	10 Sep 2009 20:02:44 -0000	1.17
@@ -1,11 +1,11 @@
 Name:           supertuxkart
-Version:        0.6.1a
-Release:        3%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://supertuxkart.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 Source1:        %{name}.6
 Patch0:         supertuxkart-fhs.patch
 Patch1:         supertuxkart-0.3-desktop.patch
@@ -119,6 +119,9 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Jon Ciesla <limb at jcomserv.net> - 0.6.2-1
+- Bugfix release.
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> - 0.6.1a-3
 - Switch to openal-soft
 



From cweyl at fedoraproject.org  Thu Sep 10 20:06:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 10 Sep 2009 20:06:09 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/devel import.log, NONE,
	1.1 perl-CatalystX-Component-Traits.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910200609.0CCB911C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29982/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CatalystX-Component-Traits.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-CatalystX-Component-Traits-0_10-1_fc11:HEAD:perl-CatalystX-Component-Traits-0.10-1.fc11.src.rpm:1252613163


--- NEW FILE perl-CatalystX-Component-Traits.spec ---
Name:       perl-CatalystX-Component-Traits
Version:    0.10
Release:    1%{?dist}
# lib/CatalystX/Component/Traits.pm -> GPL+ or Artistic
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Automatic Trait Loading and Resolution for
Source:     http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-%{version}.tar.gz
Url:        http://search.cpan.org/dist/CatalystX-Component-Traits
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Catalyst::Runtime) >= 5.80005
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Module::Pluggable) >= 3.9
BuildRequires: perl(Moose::Autobox)
BuildRequires: perl(MooseX::Traits::Pluggable) >= 0.08
BuildRequires: perl(namespace::autoclean)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::More)
BuildRequires: perl(CPAN)
# optional tests
BuildRequires: perl(Test::Pod)

# autoreq really doesn't have a clue when it comes to Moosey bits 
Requires:       perl(Catalyst::Runtime) >= 5.80005
Requires:       perl(Moose::Autobox)
Requires:       perl(MooseX::Traits::Pluggable) >= 0.08

%{?perl_default_filter}

%description
Adds a "COMPONENT" method to your Catalyst component base class that
reads the optional 'traits' parameter from app and component config
and instantiates the component subclass with those traits using 
MooseX::Traits/new_with_traits from MooseX::Traits::Pluggable.


%prep
%setup -q -n CatalystX-Component-Traits-%{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
* Fri Sep 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- submission
- add standard req/prov filter
- auto-update to 0.10 (by cpan-spec-update 0.01)
- altered br on perl(MooseX::Traits::Pluggable) (0.06 => 0.08)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Catalyst::Runtime) (version 5.80005)
- added a new req on perl(Moose::Autobox) (version 0)
- added a new req on perl(MooseX::Traits::Pluggable) (version 0.08)


* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- submission

* Fri Aug 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:21:29 -0000	1.1
+++ .cvsignore	10 Sep 2009 20:06:08 -0000	1.2
@@ -0,0 +1 @@
+CatalystX-Component-Traits-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:21:30 -0000	1.1
+++ sources	10 Sep 2009 20:06:08 -0000	1.2
@@ -0,0 +1 @@
+bf83abe598cae65a2efdf17e38cbced5  CatalystX-Component-Traits-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Sep 10 20:06:19 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 10 Sep 2009 20:06:19 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/F-11 import.log, NONE,
	1.1 perl-CatalystX-Component-Traits.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910200619.C258E11C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30324/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CatalystX-Component-Traits.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-CatalystX-Component-Traits-0_10-1_fc11:F-11:perl-CatalystX-Component-Traits-0.10-1.fc11.src.rpm:1252613175


--- NEW FILE perl-CatalystX-Component-Traits.spec ---
Name:       perl-CatalystX-Component-Traits
Version:    0.10
Release:    1%{?dist}
# lib/CatalystX/Component/Traits.pm -> GPL+ or Artistic
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Automatic Trait Loading and Resolution for
Source:     http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-%{version}.tar.gz
Url:        http://search.cpan.org/dist/CatalystX-Component-Traits
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Catalyst::Runtime) >= 5.80005
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Module::Pluggable) >= 3.9
BuildRequires: perl(Moose::Autobox)
BuildRequires: perl(MooseX::Traits::Pluggable) >= 0.08
BuildRequires: perl(namespace::autoclean)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::More)
BuildRequires: perl(CPAN)
# optional tests
BuildRequires: perl(Test::Pod)

# autoreq really doesn't have a clue when it comes to Moosey bits 
Requires:       perl(Catalyst::Runtime) >= 5.80005
Requires:       perl(Moose::Autobox)
Requires:       perl(MooseX::Traits::Pluggable) >= 0.08

%{?perl_default_filter}

%description
Adds a "COMPONENT" method to your Catalyst component base class that
reads the optional 'traits' parameter from app and component config
and instantiates the component subclass with those traits using 
MooseX::Traits/new_with_traits from MooseX::Traits::Pluggable.


%prep
%setup -q -n CatalystX-Component-Traits-%{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
* Fri Sep 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- submission
- add standard req/prov filter
- auto-update to 0.10 (by cpan-spec-update 0.01)
- altered br on perl(MooseX::Traits::Pluggable) (0.06 => 0.08)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Catalyst::Runtime) (version 5.80005)
- added a new req on perl(Moose::Autobox) (version 0)
- added a new req on perl(MooseX::Traits::Pluggable) (version 0.08)


* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- submission

* Fri Aug 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:21:29 -0000	1.1
+++ .cvsignore	10 Sep 2009 20:06:19 -0000	1.2
@@ -0,0 +1 @@
+CatalystX-Component-Traits-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:21:30 -0000	1.1
+++ sources	10 Sep 2009 20:06:19 -0000	1.2
@@ -0,0 +1 @@
+bf83abe598cae65a2efdf17e38cbced5  CatalystX-Component-Traits-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Sep 10 20:06:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 10 Sep 2009 20:06:30 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/F-10 import.log, NONE,
	1.1 perl-CatalystX-Component-Traits.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090910200630.821B111C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30512/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CatalystX-Component-Traits.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-CatalystX-Component-Traits-0_10-1_fc11:F-10:perl-CatalystX-Component-Traits-0.10-1.fc11.src.rpm:1252613186


--- NEW FILE perl-CatalystX-Component-Traits.spec ---
Name:       perl-CatalystX-Component-Traits
Version:    0.10
Release:    1%{?dist}
# lib/CatalystX/Component/Traits.pm -> GPL+ or Artistic
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Automatic Trait Loading and Resolution for
Source:     http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-%{version}.tar.gz
Url:        http://search.cpan.org/dist/CatalystX-Component-Traits
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Catalyst::Runtime) >= 5.80005
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Module::Pluggable) >= 3.9
BuildRequires: perl(Moose::Autobox)
BuildRequires: perl(MooseX::Traits::Pluggable) >= 0.08
BuildRequires: perl(namespace::autoclean)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::More)
BuildRequires: perl(CPAN)
# optional tests
BuildRequires: perl(Test::Pod)

# autoreq really doesn't have a clue when it comes to Moosey bits 
Requires:       perl(Catalyst::Runtime) >= 5.80005
Requires:       perl(Moose::Autobox)
Requires:       perl(MooseX::Traits::Pluggable) >= 0.08

%{?perl_default_filter}

%description
Adds a "COMPONENT" method to your Catalyst component base class that
reads the optional 'traits' parameter from app and component config
and instantiates the component subclass with those traits using 
MooseX::Traits/new_with_traits from MooseX::Traits::Pluggable.


%prep
%setup -q -n CatalystX-Component-Traits-%{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
* Fri Sep 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- submission
- add standard req/prov filter
- auto-update to 0.10 (by cpan-spec-update 0.01)
- altered br on perl(MooseX::Traits::Pluggable) (0.06 => 0.08)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Catalyst::Runtime) (version 5.80005)
- added a new req on perl(Moose::Autobox) (version 0)
- added a new req on perl(MooseX::Traits::Pluggable) (version 0.08)


* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- submission

* Fri Aug 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:21:29 -0000	1.1
+++ .cvsignore	10 Sep 2009 20:06:30 -0000	1.2
@@ -0,0 +1 @@
+CatalystX-Component-Traits-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:21:30 -0000	1.1
+++ sources	10 Sep 2009 20:06:30 -0000	1.2
@@ -0,0 +1 @@
+bf83abe598cae65a2efdf17e38cbced5  CatalystX-Component-Traits-0.10.tar.gz



From akurtakov at fedoraproject.org  Thu Sep 10 20:07:18 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Sep 2009 20:07:18 +0000 (UTC)
Subject: rpms/maven-plugin-cobertura/devel maven-plugin-cobertura.spec, NONE,
	1.1 maven-plugin-cobertura-2.3-SiteRenderer.patch, NONE,
	1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090910200718.5AFF011C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31033/devel

Modified Files:
	sources .cvsignore 
Added Files:
	maven-plugin-cobertura.spec 
	maven-plugin-cobertura-2.3-SiteRenderer.patch 
Log Message:
Initial import.


--- NEW FILE maven-plugin-cobertura.spec ---
Name:       maven-plugin-cobertura
Version:    2.3
Release:    3%{?dist}
Summary:    Plugin providing the features of Cobertura within Maven

Group:      Development/Libraries
License:    ASL 2.0 and GPLv2 and GPLv2+
URL:        http://mojo.codehaus.org/cobertura-maven-plugin/
# The source tarball has been generated from upstream VCS:
# svn export https://svn.codehaus.org/mojo/tags/cobertura-maven-plugin-%{version} 
#            %{name}-%{version}
# tar cjvf %{name}-%{version}.tar.bz2} %{name}-%{version}
# (exported revision 10628)
Source0:    %{name}-%{version}.tar.bz2
# Fix compile with our doxia.
Patch0:     maven-plugin-cobertura-2.3-SiteRenderer.patch
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

BuildRequires:  maven2
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven-shared-plugin-testing-harness
BuildRequires:  gnu-getopt >= 0:1.0.13
BuildRequires:  tomcat5
BuildRequires:  cobertura

Requires:       maven2
Requires:       cobertura
Requires(post): jpackage-utils
Requires(postun):  jpackage-utils

%description
This plugin provides the features of Cobertura within the Maven 2 environment.
The report generated by this plugin is the result of executing the Cobertura
tool against your compiled classes to help you determine how well the unit
testing efforts have been, and can then be used to identify which parts
of your Java program are lacking test coverage.

%package	javadoc
Summary:    Javadoc for %{name}
Group:      Documentation
Requires:   %{name} = %{version}-%{release}
Requires:   jpackage-utils

%description	javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q
%patch0 -p1

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 target/cobertura-maven-plugin-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/maven-plugin-cobertura-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
ln -s maven-plugin-cobertura-%{version}.jar maven-plugin-cobertura.jar
popd

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -p -m 644 pom.xml \
  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-cobertura.pom
%add_to_maven_depmap org.codehaus.mojo cobertura-maven-plugin %{version} JPP maven-plugin-cobertura

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap


%files
%defattr(-,root,root,-)
%{_mavenpomdir}/JPP-%{name}*.pom
%config(noreplace) %{_mavendepmapfragdir}
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Thu Sep 10 2009 Alexander Kurtakov <akurtako at redhat.com> 2.3-3
- Fix license and changelog.
- Add comment for patch.

* Thu Sep 10 2009 Alexander Kurtakov <akurtako at redhat.com> 2.3-2
- Fix Summary.
- Drop maven2-common-poms BR and add versioned BR to gnu-getopt

* Mon Sep  7 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.3-1
- Initial release

maven-plugin-cobertura-2.3-SiteRenderer.patch:
 CoberturaReportMojo.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE maven-plugin-cobertura-2.3-SiteRenderer.patch ---
--- maven-plugin-cobertura-2.3/src/main/java/org/codehaus/mojo/cobertura/CoberturaReportMojo.java.orig	2009-09-08 00:20:27.000000000 +0200
+++ maven-plugin-cobertura-2.3/src/main/java/org/codehaus/mojo/cobertura/CoberturaReportMojo.java	2009-09-08 00:21:05.000000000 +0200
@@ -29,7 +29,7 @@
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.MavenReportException;
 import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.siterenderer.Renderer;
 import org.codehaus.mojo.cobertura.tasks.ReportTask;
 
 /**
@@ -106,7 +106,7 @@
      * 
      * @component
      */
-    private SiteRenderer siteRenderer;
+    private Renderer siteRenderer;
 
     /**
      * <i>Maven Internal</i>: Project to interact with.
@@ -152,7 +152,7 @@
     /**
      * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
      */
-    protected SiteRenderer getSiteRenderer()
+    protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-cobertura/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Sep 2009 18:33:23 -0000	1.1
+++ sources	10 Sep 2009 20:07:18 -0000	1.2
@@ -0,0 +1 @@
+e7d10ff9e251f8c618be65cdfc52cca3  maven-plugin-cobertura-2.3.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-cobertura/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Sep 2009 18:33:23 -0000	1.1
+++ .cvsignore	10 Sep 2009 20:07:18 -0000	1.2
@@ -0,0 +1 @@
+maven-plugin-cobertura-2.3.tar.bz2



From wtogami at fedoraproject.org  Thu Sep 10 20:10:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Sep 2009 20:10:00 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.22, 1.23 livecd-tools.spec,
	1.29, 1.30 sources, 1.23, 1.24
Message-ID: <20090910201000.3D90E11C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31773

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
- Support new dracut output filename /boot/initramfs-*
- Fix cleanup of fake /selinux directory during teardown Bug #522224
So I didn't fully test that this successfully creates a livecd image since it requires tomorrow's rawhide dracut.
But without it, tomorrow's rawhide livecd will be guaranteed to fail...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	24 Aug 2009 20:43:19 -0000	1.22
+++ .cvsignore	10 Sep 2009 20:09:59 -0000	1.23
@@ -1 +1 @@
-livecd-tools-026.tar.bz2
+livecd-tools-027.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- livecd-tools.spec	24 Aug 2009 20:43:19 -0000	1.29
+++ livecd-tools.spec	10 Sep 2009 20:09:59 -0000	1.30
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 026
+Version: 027
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -81,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> - 027-1
+- Support new dracut output filename /boot/initramfs-*
+- Fix cleanup of fake /selinux directory during teardown Bug #522224
+
 * Mon Aug 24 2009 Jeremy Katz <katzj at redhat.com> - 026-1
 - More resize2fs -M usage
 - Work with dracut-based initramfs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	24 Aug 2009 20:43:19 -0000	1.23
+++ sources	10 Sep 2009 20:09:59 -0000	1.24
@@ -1 +1 @@
-1318d7c6e255b6825a262a662d5d6f22  livecd-tools-026.tar.bz2
+34fcb9fdaf359a31afd78055bcba807b  livecd-tools-027.tar.bz2



From transif at fedoraproject.org  Thu Sep 10 20:12:49 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 10 Sep 2009 20:12:49 +0000 (UTC)
Subject: comps/po uk.po,1.16,1.17
Message-ID: <20090910201250.0847811C00DB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2276/po

Modified Files:
	uk.po 
Log Message:
Sending translation for Ukrainian


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.16 -r 1.17 uk.poIndex: uk.po
===================================================================
RCS file: /cvs/pkgs/comps/po/uk.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- uk.po	29 Apr 2009 20:00:24 -0000	1.16
+++ uk.po	10 Sep 2009 20:12:49 -0000	1.17
@@ -7,289 +7,309 @@ 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: 2007-11-06 10:05+0200\n"
+"POT-Creation-Date: 2009-09-10 08:24+0000\n"
+"PO-Revision-Date: 2009-09-10 10:05+0200\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko at gmail.com>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "???????????? ?? ???????? ??????? ????, ?? ????? ?????? ?? ??????? ???????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?????? ???????????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "????????? ????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????? ??????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "???????? ??? ????????? ?????? ???????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "????????? ????????? ????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "????????? ??????????? ????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????????? ?????????? ????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????????? ??????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????? ???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "?????? ????????? ???? ????????????? Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????????? ????????? ????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "????????? ???????????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "????????? ???????????? ????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "????????? ??????????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ???????????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "????????? ???????????? ?????????????? ????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "????????? ???? ??????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "????? ??????? ????????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????????? ??????????? ????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "????????? ???????????? ????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "????????? ?????????? ????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1999 lines suppressed...]
+"????? ????? ????? ????? ?????? ??? ????????, ?????, "
+"??????????? ?? ???????? ???????."
 
-#: ../comps-f11.xml.in.h:235
-#, fuzzy
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
-msgstr "????????? ????????? ????"
+msgstr "????????? ???????????? ????"
 
-#: ../comps-f11.xml.in.h:237
-#, fuzzy
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "????????? ????????? ????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+"????? ???????, ?? ??????? ???????????????? Critical Path ??? "
+"?????????? GNOME"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"????? ???????, ?? ??????? ???????? ????????? ??? ???????????????? Critical "
+"Path ??? ???? ?????? Fedora"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "????? ?? ?????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "????? ?? ????????? ??? ??????????? ?? ???????????? Fedora"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (??????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????? ?????????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ? ?????????? ????????? ?????????? X11, ???? "
+"?????????? ????????? ??? ????'?????? ? ??????? ????????????? ??????????: "
+"?????????, ????????? ????????? ?? ?????? ????'??????."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "??????? ????????????? ????'?????? ?? ????????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "???????? ?????????? Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr ""
+"Moblin ? ????????? ??????????? ??? ????????? NetBook/NetTop/MID."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????? ??? ????????? ?????? ???????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "?????????? ?????? ?? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1474,7 +1615,7 @@ msgstr ""
 "GNOME - ??????? ???????? ??????????, ?? ???? ?????? ??????? ??????, ?????? "
 "?????????, ???????? ?????? ?? ????????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1482,7 +1623,7 @@ msgstr ""
 "KDE - ??????? ???????? ??????????, ?? ???? ?????? ??????? ??????, ?????? "
 "?????????, ???????? ?????? ?? ????????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1490,11 +1631,11 @@ msgstr ""
 "?? ????????, ?? ????? ??????????? ?????????? ???????????, ?????????? "
 "?????????? ??????. ?? ?????? ??????? Emacs ?? Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "????????? ???????? XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1502,64 +1643,31 @@ msgstr ""
 "?? ?????? ?????????? ?????????? ???????????? ? ??????? DocBook ?? "
 "????????????? ?? ? HTML, PDF, Postscript ?? ?????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?? ????? ??????? ????? ???????? ???????? ??? ?????? ??????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "?? ????? ??????? ????? ?????? ?? ???????? ??? ????????? ???????????."
+msgstr "?? ????? ??????? ????? ?????? ?? ???????? ??? ????????? ???????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "?? ????? ??????? ????? ?????? ?? ???????? ??? ????????? ???????????."
+msgstr "?? ????? ??????? ????? ?????? ?? ???????? ??? ????????? ???????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "?? ????? ??????? ????? ?????? ?? ???????? ??? ??????? ???????????."
+msgstr "?? ????? ??????? ????? ?????? ?? ???????? ??? ??????? ???????????."
 
-#, fuzzy
-#~ msgid "British Support"
-#~ msgstr "????????? ??????????? ????"
-
-#, fuzzy
-#~ msgid "Cluster Storage"
-#~ msgstr "????????? ?????????"
-
-#, fuzzy
-#~ msgid "Clustering Support."
-#~ msgstr "????????? ?????????"
-
-#, fuzzy
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????? ?????????? ????"
-
-#, fuzzy
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?? ?????? ???????????? ?????????? ? ??????????? ?????????."
-
-#, fuzzy
-#~ msgid "Multimedia applications"
-#~ msgstr "????????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "??????, ?? ??????? ?????????? ?????????? ?? ??????? ????????."
-
-#, fuzzy
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????"



From thm at fedoraproject.org  Thu Sep 10 20:28:11 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 10 Sep 2009 20:28:11 +0000 (UTC)
Subject: rpms/botan/devel .cvsignore, 1.6, 1.7 botan.spec, 1.11,
	1.12 import.log, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090910202811.C17FA11C00DB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9346/devel

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.7. This is mainly a bugfix release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Aug 2009 15:45:25 -0000	1.6
+++ .cvsignore	10 Sep 2009 20:28:11 -0000	1.7
@@ -1 +1 @@
-Botan-1.8.6.tbz
+Botan-1.8.7.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- botan.spec	21 Aug 2009 12:39:50 -0000	1.11
+++ botan.spec	10 Sep 2009 20:28:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.6
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,6 +110,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Thu Sep 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.7-1
+- Update to 1.8.7. This is mainly a bugfix release.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6-2
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	13 Aug 2009 15:45:25 -0000	1.7
+++ import.log	10 Sep 2009 20:28:11 -0000	1.8
@@ -5,3 +5,4 @@ botan-1_8_2-1_fc10:HEAD:botan-1.8.2-1.fc
 botan-1_8_5-1_fc11:HEAD:botan-1.8.5-1.fc11.src.rpm:1250098169
 botan-1_8_5-2_fc11:HEAD:botan-1.8.5-2.fc11.src.rpm:1250099364
 botan-1_8_6-1_fc11:HEAD:botan-1.8.6-1.fc11.src.rpm:1250178270
+botan-1_8_7-1_fc11:HEAD:botan-1.8.7-1.fc11.src.rpm:1252614441


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Aug 2009 15:45:25 -0000	1.6
+++ sources	10 Sep 2009 20:28:11 -0000	1.7
@@ -1 +1 @@
-827f71f450eb1b7bc9e173c402bc48dc  Botan-1.8.6.tbz
+c607e31b012d9839fd0a1da24ff85e3d  Botan-1.8.7.tbz



From langel at fedoraproject.org  Thu Sep 10 20:36:59 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 10 Sep 2009 20:36:59 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-netbeans.patch,
	NONE, 1.1 java-1.6.0-openjdk.spec, 1.136, 1.137
Message-ID: <20090910203659.8141011C00DB@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-serv11635

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-netbeans.patch 
Log Message:
* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-31.b16
- Added java-1.6.0-openjdk-netbeans.patch.
- Reenabled visualvm.



java-1.6.0-openjdk-netbeans.patch:
 Makefile.am |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE java-1.6.0-openjdk-netbeans.patch ---
--- aMakefile.am	Wed Sep 09 16:44:12 2009 +0100
+++ Makefile.am	Thu Sep 10 16:31:56 2009 -0400
@@ -28,6 +28,14 @@ LIVECONNECT_DIR =
 LIVECONNECT_DIR =
 NPPLUGIN_DIR =
 endif
+endif
+
+if WITH_VISUALVM
+NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1)
+NB_APISUPPORT=$(shell ls /usr/share/netbeans | grep apisupport | tail -n1)
+else
+NB_PLATFORM=
+NB_APISUPPORT=
 endif
 
 if ENABLE_PULSE_JAVA
@@ -1190,7 +1198,7 @@ if WITH_VISUALVM
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
 	cp -r visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
+	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm	
@@ -1275,7 +1283,7 @@ if WITH_VISUALVM
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
 	cp -r visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
+	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
@@ -2033,8 +2041,8 @@ if WITH_VISUALVM
 	cd netbeans ; \
         rm nbbuild/external/binaries-list ; \
 	mkdir -p ./nbbuild/netbeans_visualvm/ ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_APISUPPORT)/ ./nbbuild/netbeans_visualvm/$(NB_APISUPPORT) ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
 	if ! (uname -a | grep x86_64) ; then \
 	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \


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.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- java-1.6.0-openjdk.spec	10 Sep 2009 16:50:34 -0000	1.136
+++ java-1.6.0-openjdk.spec	10 Sep 2009 20:36:59 -0000	1.137
@@ -137,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 30.%{openjdkver}%{?dist}
+Release: 31.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -174,6 +174,7 @@ Patch4:   java-1.6.0-openjdk-accessible-
 Patch5:   java-1.6.0-openjdk-sparc-fixes.patch
 Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
 Patch7:   java-1.6.0-openjdk-x11.patch
+Patch8:	  java-1.6.0-openjdk-netbeans.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -389,6 +390,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
+%patch8
 %patch5 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
@@ -407,7 +409,7 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --with-hotspot-src-zip=%{SOURCE7} \
+  --enable-visualvm -with-hotspot-src-zip=%{SOURCE7} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
@@ -574,8 +576,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-#desktop-file-install --vendor ''\
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
+desktop-file-install --vendor ''\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -721,7 +723,7 @@ alternatives \
   --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
-#  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
+  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
   --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
   --slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
@@ -936,7 +938,7 @@ exit 0
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
-#%{_datadir}/applications/visualvm.desktop
+%{_datadir}/applications/visualvm.desktop
 %ifarch %{jit_arches}
 %{tapsetdir}/*.stp
 %endif
@@ -964,6 +966,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-31.b16
+- Added java-1.6.0-openjdk-netbeans.patch.
+- Reenabled visualvm.
+
 * Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
 - Temporarily removed building of visualvm.
 



From lennart at fedoraproject.org  Thu Sep 10 20:39:27 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 10 Sep 2009 20:39:27 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel .cvsignore, 1.7,
	1.8 sound-theme-freedesktop.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090910203927.D703311C00DB@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/sound-theme-freedesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382

Modified Files:
	.cvsignore sound-theme-freedesktop.spec sources 
Log Message:
Snapshot from Lennart's git tree


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Aug 2009 00:52:17 -0000	1.7
+++ .cvsignore	10 Sep 2009 20:39:27 -0000	1.8
@@ -1 +1 @@
-sound-theme-freedesktop-0.6.tar.bz2
+sound-theme-freedesktop-0.6.99.lennart.tar.bz2


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sound-theme-freedesktop.spec	28 Aug 2009 00:52:18 -0000	1.13
+++ sound-theme-freedesktop.spec	10 Sep 2009 20:39:27 -0000	1.14
@@ -1,5 +1,5 @@
 Name: sound-theme-freedesktop
-Version: 0.6
+Version: 0.6.99.lennart
 Release: 1%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
@@ -39,13 +39,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README
+%doc README licenses/ARTISTIC licenses/CC-BY-3 licenses/CC-BY-SA-2 licenses/CC-BY-SA-3 licenses/GPL2 licenses/LGPL21
 %dir %{_datadir}/sounds/freedesktop
 %dir %{_datadir}/sounds/freedesktop/stereo
 %{_datadir}/sounds/freedesktop/index.theme
-%{_datadir}/sounds/freedesktop/stereo/*.ogg
+%{_datadir}/sounds/freedesktop/stereo/*.oga
 
 %changelog
+* Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.6.99-1
+- Snapshot from Lennart's git tree
+
 * Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> 0.6-1
 - New upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Aug 2009 00:52:18 -0000	1.7
+++ sources	10 Sep 2009 20:39:27 -0000	1.8
@@ -1 +1 @@
-9c00b21b13dceb947b4a37f6280ca1a3  sound-theme-freedesktop-0.6.tar.bz2
+04f955252dcf11c3dfabbe9f4945efde  sound-theme-freedesktop-0.6.99.lennart.tar.bz2



From jwrdegoede at fedoraproject.org  Thu Sep 10 20:40:20 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 10 Sep 2009 20:40:20 +0000 (UTC)
Subject: rpms/alleggl/devel alleggl-0.4.3-fullscreen-viewport.patch, NONE,
	1.1 alleggl.spec, 1.14, 1.15
Message-ID: <20090910204020.030AB11C043D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alleggl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12664

Modified Files:
	alleggl.spec 
Added Files:
	alleggl-0.4.3-fullscreen-viewport.patch 
Log Message:
* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 0.4.3-6
- Fix (workaround) viewport issues in fullscreen mode (#522116)


alleggl-0.4.3-fullscreen-viewport.patch:
 x.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE alleggl-0.4.3-fullscreen-viewport.patch ---
diff -up alleggl/src/x.c~ alleggl/src/x.c
--- alleggl/src/x.c~	2007-09-18 22:36:28.000000000 +0200
+++ alleggl/src/x.c	2009-09-10 22:09:01.000000000 +0200
@@ -1005,6 +1005,14 @@ old_choose_visual:
 #ifdef ALLEGROGL_HAVE_XF86VIDMODE
 	if (fullscreen) {
 		setattr.override_redirect = True;
+
+		/* Warp the pointer to the upper left corner, this is
+		   necessary as the: XF86VidModeSetViewPort() call below does
+		   not seem to do anything on newer Xorg servers, instead the
+		   viewport is always be centered at the last mouse position */
+		XWarpPointer(_xwin.display, None,
+			     XDefaultRootWindow(_xwin.display),
+			     0, 0, 0, 0, 0, 0);
 		if (!XF86VidModeSwitchToMode(_xwin.display, _xwin.screen,
 		                             _xwin.modesinfo[bestmode])) {
 


Index: alleggl.spec
===================================================================
RCS file: /cvs/extras/rpms/alleggl/devel/alleggl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- alleggl.spec	24 Jul 2009 16:43:58 -0000	1.14
+++ alleggl.spec	10 Sep 2009 20:40:19 -0000	1.15
@@ -1,12 +1,13 @@
 Name:           alleggl
 Version:        0.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        OpenGL support library for Allegro
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://allegrogl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2
 Patch0:         alleggl-0.4.2-gcc43.patch
+Patch1:         alleggl-0.4.3-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel libGLU-devel libX11-devel libXext-devel
 BuildRequires:  libXpm-devel libXxf86vm-devel
@@ -37,6 +38,7 @@ developing applications that use %{name}
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 0.4.3-6
+- Fix (workaround) viewport issues in fullscreen mode (#522116)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Thu Sep 10 20:46:01 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 10 Sep 2009 20:46:01 +0000 (UTC)
Subject: rpms/allegro/devel allegro-4.2.2-fullscreen-viewport.patch, NONE,
	1.1 allegro.spec, 1.55, 1.56
Message-ID: <20090910204601.A695D11C00DB@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14636

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.2.2-fullscreen-viewport.patch 
Log Message:
* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 4.2.2-14
- Fix (workaround) viewport issues in fullscreen mode (#522116)


allegro-4.2.2-fullscreen-viewport.patch:
 xwin.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE allegro-4.2.2-fullscreen-viewport.patch ---
--- allegro-4.2.2/src/x/xwin.c	2009-09-10 22:29:53.000000000 +0200
+++ allegro-4.2.2.new/src/x/xwin.c	2009-09-10 21:48:21.000000000 +0200
@@ -2853,6 +2853,13 @@
       }
    }
       
+   /* Warp the pointer to the upper left corner (where our fs_window is),
+      this is necessary as the: XF86VidModeSetViewPort() call below does
+      not seem to do anything on newer Xorg servers, instead the viewport
+      seems to always be centered at the last mouse cursor position. */
+   XWarpPointer(_xwin.display, None, XDefaultRootWindow(_xwin.display),
+                0, 0, 0, 0, 0, 0);
+
    /* Switch video mode.  */
    if ((_xwin.modesinfo[i] == _xwin.orig_modeinfo) ||
        !XF86VidModeSwitchToMode(_xwin.display, _xwin.screen,


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- allegro.spec	24 Jul 2009 16:44:13 -0000	1.55
+++ allegro.spec	10 Sep 2009 20:45:59 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -21,6 +21,7 @@ Patch6:         allegro-4.0.3-libdir.pat
 Patch7:         allegro-4.2.2-pulseaudio.patch
 Patch8:         allegro-4.2.2-gcc43.patch
 Patch9:         allegro-4.2.2-gcc43-asm.patch
+Patch10:        allegro-4.2.2-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -166,6 +167,7 @@ sound through JACK (Jack Audio Connectio
 %patch7 -p1 -z .pulse
 %patch8 -p1 -z .gcc43
 %patch9 -p1 -z .gcc43-asm
+%patch10 -p1 -z .fs-viewport
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
 
@@ -294,6 +296,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 4.2.2-14
+- Fix (workaround) viewport issues in fullscreen mode (#522116)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From s4504kr at fedoraproject.org  Thu Sep 10 20:56:15 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 10 Sep 2009 20:56:15 +0000 (UTC)
Subject: rpms/highlight/devel .cvsignore, 1.26, 1.27 highlight.spec, 1.47,
	1.48 sources, 1.27, 1.28
Message-ID: <20090910205615.F1AAA11C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18587

Modified Files:
	.cvsignore highlight.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	11 Aug 2009 12:02:45 -0000	1.26
+++ .cvsignore	10 Sep 2009 20:56:14 -0000	1.27
@@ -1 +1 @@
-highlight-2.10.tar.bz2
+highlight-2.12.tar.bz2


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- highlight.spec	11 Aug 2009 12:02:45 -0000	1.47
+++ highlight.spec	10 Sep 2009 20:56:15 -0000	1.48
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.10
-Release:	4%{?dist}
+Version:	2.12
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
@@ -93,7 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
-* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.10-4
+* Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
+- New upstream release
+
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> 2.10-4
 - Use bzipped upstream tarball.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	11 Aug 2009 12:02:45 -0000	1.27
+++ sources	10 Sep 2009 20:56:15 -0000	1.28
@@ -1 +1 @@
-cdb28be381d99ab24d11174082c0a4fa  highlight-2.10.tar.bz2
+0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2



From s4504kr at fedoraproject.org  Thu Sep 10 20:57:49 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 10 Sep 2009 20:57:49 +0000 (UTC)
Subject: rpms/highlight/F-11 highlight.spec,1.45,1.46 sources,1.26,1.27
Message-ID: <20090910205749.3E2F911C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19829

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/highlight.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- highlight.spec	30 Jun 2009 17:25:11 -0000	1.45
+++ highlight.spec	10 Sep 2009 20:57:48 -0000	1.46
@@ -1,13 +1,13 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.10
-Release:	2%{?dist}
+Version:	2.12
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
 BuildRequires:	qt-devel >= 4.4
 BuildRequires:	desktop-file-utils
@@ -93,6 +93,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
+- New upstream release
+
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> 2.10-4
+- Use bzipped upstream tarball.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.10-2
 - License was changed go GPLv3 from upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	30 Jun 2009 17:25:11 -0000	1.26
+++ sources	10 Sep 2009 20:57:48 -0000	1.27
@@ -1 +1 @@
-34d2b41df0974f871215ad0343f63efe  highlight-2.10.tar.gz
+0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2



From s4504kr at fedoraproject.org  Thu Sep 10 20:59:04 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 10 Sep 2009 20:59:04 +0000 (UTC)
Subject: rpms/highlight/F-10 highlight.spec,1.38,1.39 sources,1.23,1.24
Message-ID: <20090910205904.C924D11C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20477

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-10/highlight.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- highlight.spec	30 Jun 2009 17:42:41 -0000	1.38
+++ highlight.spec	10 Sep 2009 20:59:04 -0000	1.39
@@ -1,13 +1,13 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.10
-Release:	2%{?dist}
+Version:	2.12
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
 BuildRequires:	qt-devel >= 4.4
 BuildRequires:	desktop-file-utils
@@ -93,6 +93,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
+- New upstream release
+
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> 2.10-4
+- Use bzipped upstream tarball.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.10-2
 - License was changed go GPLv3 from upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	30 Jun 2009 17:42:41 -0000	1.23
+++ sources	10 Sep 2009 20:59:04 -0000	1.24
@@ -1 +1 @@
-34d2b41df0974f871215ad0343f63efe  highlight-2.10.tar.gz
+0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 10 21:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:07:45 +0000
Subject: [pkgdb] openmpi: dajt has requested watchbugzilla
Message-ID: <20090910210745.56DCD10F87C@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on openmpi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pbrobinson at fedoraproject.org  Thu Sep 10 21:07:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Sep 2009 21:07:48 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/devel moblin-gtk-engine.spec,1.7,1.8
Message-ID: <20090910210748.7F6EA11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-gtk-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23360

Modified Files:
	moblin-gtk-engine.spec 
Log Message:
- enable verbose compile


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/moblin-gtk-engine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-gtk-engine.spec	10 Sep 2009 19:45:28 -0000	1.7
+++ moblin-gtk-engine.spec	10 Sep 2009 21:07:44 -0000	1.8
@@ -24,7 +24,7 @@ GTK engine for Moblin
 %build
 ./autogen.sh
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}



From pkgdb at fedoraproject.org  Thu Sep 10 21:07:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:07:54 +0000
Subject: [pkgdb] openmpi: dajt has requested watchcommits
Message-ID: <20090910210754.12EB510F895@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on openmpi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:07:57 +0000
Subject: [pkgdb] openmpi: dajt has requested commit
Message-ID: <20090910210757.AD21210F898@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on openmpi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:13 +0000
Subject: [pkgdb] openmpi: dajt has requested watchcommits
Message-ID: <20090910210913.B100A10F88A@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on openmpi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:15 +0000
Subject: [pkgdb] openmpi: dajt has requested watchbugzilla
Message-ID: <20090910210915.71B7010F895@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on openmpi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:23 +0000
Subject: [pkgdb] openmpi: dajt has requested commit
Message-ID: <20090910210923.F20CE10F8A0@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on openmpi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:31 +0000
Subject: [pkgdb] openmpi: dajt has requested watchbugzilla
Message-ID: <20090910210931.C267510F88A@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on openmpi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:33 +0000
Subject: [pkgdb] openmpi: dajt has requested watchcommits
Message-ID: <20090910210933.E5CA910F8A3@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on openmpi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:36 +0000
Subject: [pkgdb] openmpi: dajt has requested commit
Message-ID: <20090910210936.8525910F8A8@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on openmpi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:09:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:09:58 +0000
Subject: [pkgdb] openmpi: dajt has requested approveacls
Message-ID: <20090910210959.0374010F89C@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on openmpi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:10:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:10:06 +0000
Subject: [pkgdb] openmpi: dajt has requested approveacls
Message-ID: <20090910211006.E544210F8AA@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on openmpi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Thu Sep 10 21:10:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:10:11 +0000
Subject: [pkgdb] openmpi: dajt has requested approveacls
Message-ID: <20090910211011.5D77010F890@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on openmpi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From jwrdegoede at fedoraproject.org  Thu Sep 10 21:10:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 10 Sep 2009 21:10:50 +0000 (UTC)
Subject: rpms/ClanLib/devel ClanLib-1.0.0-fullscreen-viewport.patch, NONE,
	1.1 ClanLib.spec, 1.21, 1.22
Message-ID: <20090910211050.B538211C043D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24189

Modified Files:
	ClanLib.spec 
Added Files:
	ClanLib-1.0.0-fullscreen-viewport.patch 
Log Message:
* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-3
- Fix (workaround) viewport issues in fullscreen mode (#522116)


ClanLib-1.0.0-fullscreen-viewport.patch:
 display_window_opengl.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ClanLib-1.0.0-fullscreen-viewport.patch ---
diff -up ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp~ ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp
--- ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp~	2008-11-13 17:09:02.000000000 +0100
+++ ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp	2009-09-10 22:58:10.000000000 +0200
@@ -612,6 +612,13 @@ void CL_DisplayWindow_OpenGL::set_resolu
 				XF86VidModeGetViewPort(disp, vi->screen,
 					&old_x, &old_y);
 			}
+			/* Warp the pointer to the upper left corner, this is
+			   necessary as the: XF86VidModeSetViewPort() call
+			   below does not seem to do anything on newer Xorg
+			   servers, instead the viewport appears to be always
+			   centered at the last mouse position */
+			XWarpPointer(disp, None, XDefaultRootWindow(disp),
+				     0, 0, 0, 0, 0, 0);
 			XF86VidModeSwitchToMode(disp, vi->screen,
 				modes[i]);
 		}


Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ClanLib.spec	24 Jul 2009 15:04:07 -0000	1.21
+++ ClanLib.spec	10 Sep 2009 21:10:49 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
@@ -12,6 +12,7 @@ Source0:        http://www.clanlib.org/d
 # tar cvfz ClanLib-%{version}-generated-docs.tar.gz html
 Source1:        ClanLib-%{version}-generated-docs.tar.gz
 Patch0:         ClanLib-0.8.0-gcc43.patch
+Patch1:         ClanLib-1.0.0-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -37,6 +38,7 @@ ClanLib development headers and librarie
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 iconv -f iso8859-1 -t utf8 NEWS -o NEWS.utf8
 touch -r NEWS.utf8 NEWS
 mv NEWS.utf8 NEWS
@@ -96,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-3
+- Fix (workaround) viewport issues in fullscreen mode (#522116)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Thu Sep 10 21:15:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 10 Sep 2009 21:15:38 +0000 (UTC)
Subject: rpms/kernel/F-11 config-sparc64-generic, 1.27,
	1.28 config-sparc64-smp, 1.4, 1.5 kernel.spec, 1.1731, 1.1732
Message-ID: <20090910211539.0A1F911C00DB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25797

Modified Files:
	config-sparc64-generic config-sparc64-smp kernel.spec 
Log Message:
KGDB on sparc64 smp kernel only up doesnt support it. 
256 cpus supported on smp



Index: config-sparc64-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/config-sparc64-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- config-sparc64-generic	25 Jul 2009 04:09:17 -0000	1.27
+++ config-sparc64-generic	10 Sep 2009 21:15:37 -0000	1.28
@@ -31,7 +31,7 @@ CONFIG_64BIT=y
 CONFIG_HUGETLB_PAGE_SIZE_4MB=y
 # CONFIG_HUGETLB_PAGE_SIZE_512K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64K is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_US3_FREQ=m
 CONFIG_US2E_FREQ=m
 CONFIG_SUN_OPENPROMFS=m
@@ -199,3 +199,4 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_KGDB is not set


Index: config-sparc64-smp
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/config-sparc64-smp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- config-sparc64-smp	25 Jul 2009 03:16:38 -0000	1.4
+++ config-sparc64-smp	10 Sep 2009 21:15:37 -0000	1.5
@@ -1 +1,2 @@
 CONFIG_SMP=y
+CONFIG_KGDB=y


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1731
retrieving revision 1.1732
diff -u -p -r1.1731 -r1.1732
--- kernel.spec	9 Sep 2009 04:54:10 -0000	1.1731
+++ kernel.spec	10 Sep 2009 21:15:37 -0000	1.1732
@@ -1959,6 +1959,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 10 2009 Dennis Gilmore <dennis at ausil.us> 2.6.30.6-53
+- kgdb only works on sparc64 smp kernels so disable on the up one and enable on the smp one
+- update to 256 cpus supported on sparc64 smp
+
 * Wed Sep 09 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.6-52
 - Add linux-2.6-slub-fix-destroy-by-rcu.patch (fixes bug in 2.6.30.4)
 



From clumens at fedoraproject.org  Thu Sep 10 21:19:57 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 10 Sep 2009 21:19:57 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.666, 1.667 anaconda.spec, 1.816, 
	1.817 sources, 1.800, 1.801
Message-ID: <20090910211957.C85B111C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27591

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -p -r1.666 -r1.667
--- .cvsignore	10 Sep 2009 01:09:14 -0000	1.666
+++ .cvsignore	10 Sep 2009 21:19:55 -0000	1.667
@@ -1 +1,2 @@
 anaconda-12.23.tar.bz2
+anaconda-12.24.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -p -r1.816 -r1.817
--- anaconda.spec	10 Sep 2009 01:09:14 -0000	1.816
+++ anaconda.spec	10 Sep 2009 21:19:55 -0000	1.817
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.23
+Version: 12.24
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -214,6 +214,16 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> - 12.24-1
+- dmidecode is in /usr/sbin, not /usr/bin. (clumens)
+- Add cmsfscat to the initrd on s390 as well (#522535). (clumens)
+- Fix the gawk/awk symlink mess in the initrd (#522535). (clumens)
+- No longer use /usr/bin/env (#521337). (clumens)
+- It's controlunits, not controlunits.sh. (clumens)
+- Get DMRaidArrayDevice's a DiskLabel format when they are added to the tree
+  (hdegoede)
+- Fix askmethod + stage2= (#516973, #519288, #518194) (rvykydal)
+
 * Wed Sep 09 2009 David Cantrell <dcantrell at redhat.com> - 12.23-1
 - initrd-generic.img -> initramfs.img (hdegoede)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -p -r1.800 -r1.801
--- sources	10 Sep 2009 01:09:14 -0000	1.800
+++ sources	10 Sep 2009 21:19:55 -0000	1.801
@@ -1 +1 @@
-ec5552061550e3084ee1aca40fd1cfa7  anaconda-12.23.tar.bz2
+4cdda8aeb360ee8d30faa747d77a0533  anaconda-12.24.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 10 21:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:20:47 +0000
Subject: [pkgdb] e2fsprogs: josef has requested commit
Message-ID: <20090910212047.1C7C210F855@bastion2.fedora.phx.redhat.com>

josef has requested the commit acl on e2fsprogs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From pkgdb at fedoraproject.org  Thu Sep 10 21:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:20:50 +0000
Subject: [pkgdb] e2fsprogs: josef has requested watchcommits
Message-ID: <20090910212050.D3A7010F87E@bastion2.fedora.phx.redhat.com>

josef has requested the watchcommits acl on e2fsprogs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From pkgdb at fedoraproject.org  Thu Sep 10 21:20:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:20:56 +0000
Subject: [pkgdb] e2fsprogs: josef has requested watchbugzilla
Message-ID: <20090910212056.D411A10F893@bastion2.fedora.phx.redhat.com>

josef has requested the watchbugzilla acl on e2fsprogs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From pkgdb at fedoraproject.org  Thu Sep 10 21:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:24:33 +0000
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <20090910212433.3A5A410F87A@bastion2.fedora.phx.redhat.com>

sandeen has set the watchbugzilla acl on e2fsprogs (Fedora devel) to Approved for josef

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From pkgdb at fedoraproject.org  Thu Sep 10 21:24:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:24:34 +0000
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <20090910212434.41BB610F88A@bastion2.fedora.phx.redhat.com>

sandeen has set the watchcommits acl on e2fsprogs (Fedora devel) to Approved for josef

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From pkgdb at fedoraproject.org  Thu Sep 10 21:24:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Sep 2009 21:24:35 +0000
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <20090910212435.619FB10F894@bastion2.fedora.phx.redhat.com>

sandeen has set the commit acl on e2fsprogs (Fedora devel) to Approved for josef

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From rcritten at fedoraproject.org  Thu Sep 10 21:25:13 2009
From: rcritten at fedoraproject.org (rcritten)
Date: Thu, 10 Sep 2009 21:25:13 +0000 (UTC)
Subject: rpms/ipa/devel .cvsignore, 1.6, 1.7 ipa.spec, 1.24, 1.25 sources,
	1.11, 
	1.12 freeipa-delegation.patch, 1.1, NONE freeipa-selinux.patch,
	1.1, NONE
Message-ID: <20090910212513.C66DA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/ipa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29640

Modified Files:
	.cvsignore ipa.spec sources 
Removed Files:
	freeipa-delegation.patch freeipa-selinux.patch 
Log Message:
- New upstream release 1.2.2
- Own /etc/httpd/conf.d/ipa-*.conf as config files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Dec 2008 19:00:42 -0000	1.6
+++ .cvsignore	10 Sep 2009 21:25:13 -0000	1.7
@@ -1 +1 @@
-freeipa-1.2.1.tar.gz
+freeipa-1.2.2.tar.gz


Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/ipa.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ipa.spec	21 Aug 2009 13:57:47 -0000	1.24
+++ ipa.spec	10 Sep 2009 21:25:13 -0000	1.25
@@ -5,8 +5,8 @@
 %define POLICYCOREUTILSVER 1.33.12-1
 
 Name:           ipa
-Version:        1.2.1
-Release:        6%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -35,9 +35,6 @@ BuildRequires:  m4
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  TurboGears
 
-Patch0: freeipa-delegation.patch
-Patch1: freeipa-selinux.patch
-
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
 user, virtual machines, groups, authentication credentials), Policy
@@ -196,9 +193,6 @@ administering radius authentication sett
 %prep
 %setup -n freeipa-%{version} -q
 
-%patch0 -p1 -b .delegation
-%patch1 -p1 -b .selinux
-
 %build
 export CFLAGS="$CFLAGS %{optflags}"
 export CPPFLAGS="$CPPFLAGS %{optflags}"
@@ -236,6 +230,11 @@ ln -s ../../../..%{_sysconfdir}/ipa/html
 ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
     %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
 
+# So we can own our Apache configuration
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa.conf
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
+
 %clean
 rm -rf %{buildroot}
 
@@ -338,6 +337,8 @@ fi
 %dir %{_usr}/share/ipa/html
 %{_usr}/share/ipa/html/ssbrowser.html
 %{_usr}/share/ipa/html/unauthorized.html
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
@@ -471,6 +472,10 @@ fi
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed Sep  9 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.2-1
+- New upstream release 1.2.2
+- Own /etc/httpd/conf.d/ipa-*.conf as config files
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-6
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Dec 2008 19:00:42 -0000	1.11
+++ sources	10 Sep 2009 21:25:13 -0000	1.12
@@ -1 +1 @@
-e934709fe92a41696ca4dd341ea9066d  freeipa-1.2.1.tar.gz
+aec42d3e5228301f7d16e2b068421ec8  freeipa-1.2.2.tar.gz


--- freeipa-delegation.patch DELETED ---


--- freeipa-selinux.patch DELETED ---



From overholt at fedoraproject.org  Thu Sep 10 21:29:43 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 10 Sep 2009 21:29:43 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr-2.1-build.xml, NONE,
	1.1 maven-jxr-2.1-mavenbuild.xml, NONE, 1.1 .cvsignore, 1.2,
	1.3 maven-jxr.spec, 1.11, 1.12 sources, 1.2,
	1.3 maven-jxr-build.xml, 1.1, NONE
Message-ID: <20090910212943.90C5F11C00DB@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31863

Modified Files:
	.cvsignore maven-jxr.spec sources 
Added Files:
	maven-jxr-2.1-build.xml maven-jxr-2.1-mavenbuild.xml 
Removed Files:
	maven-jxr-build.xml 
Log Message:
* Thu Sep 10 2009 Andrew Overholt <overholt at redhat.com> 2.1-1
- 2.1
- Add maven-plugin-jxr.


--- NEW FILE maven-jxr-2.1-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<project name="maven-jxr" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Import maven-build.xml into the current project                        -->
  <!-- ====================================================================== -->

  <import file="maven-build.xml"/>
  
  <!-- ====================================================================== -->
  <!-- Help target                                                            -->
  <!-- ====================================================================== -->

  <target name="help">
    <echo message="Please run: $ant -projecthelp"/>
  </target>

</project>


--- NEW FILE maven-jxr-2.1-mavenbuild.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!--                                                                        -->
<!-- Any modifications will be overwritten.                                 -->
<!--                                                                        -->
<!-- Generated by Maven Ant Plugin on 9/10/09 2:08 PM                       -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
<!--                                                                        -->
<!-- ====================================================================== -->

<project name="maven-jxr-from-maven" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Build environment properties                                           -->
  <!-- ====================================================================== -->

  <property file="${user.home}/.m2/maven.properties"/>
  <property file="maven-build.properties"/>

  <property name="maven.build.finalName" value="maven-jxr-2.1"/>
  <property name="maven.build.dir" value="target"/>
  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
  <property name="maven.build.srcDir.0" value="src/main/java"/>
  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
  <property name="maven.build.testDir.0" value="src/test/java"/>
  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>

  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="maven.settings.offline" value="false"/>
  <property name="maven.settings.interactiveMode" value="true"/>

  <!-- ====================================================================== -->
  <!-- Defining classpaths                                                    -->
  <!-- ====================================================================== -->

  <path id="build.classpath">
    <fileset dir="lib">
      <include name="oro.jar"/>
      <include name="plexus_utils.jar"/>
      <include name="velocity.jar"/>
    </fileset>
  </path>
  <path id="build.test.classpath">
    <fileset dir="lib">
      <include name="commons-collections.jar"/>
      <include name="junit.jar"/>
      <include name="oro.jar"/>
      <include name="plexus_utils.jar"/>
      <include name="velocity.jar"/>
    </fileset>
  </path>

  <!-- ====================================================================== -->
  <!-- Cleaning up target                                                     -->
  <!-- ====================================================================== -->

  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.dir}"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Compilation target                                                     -->
  <!-- ====================================================================== -->

  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.outputDir}"/>
    <javac destdir="${maven.build.outputDir}" 
           nowarn="false" 
           debug="true" 
           optimize="false" 
           deprecation="true" 
           target="1.1" 
           verbose="false" 
           fork="false" 
           source="1.3">
      <src>
        <pathelement location="${maven.build.srcDir.0}"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
    <copy todir="${maven.build.outputDir}">
      <fileset dir="${maven.build.resourceDir.0}"/>
    </copy>
  </target>

  <!-- ====================================================================== -->
  <!-- Test-compilation target                                                -->
  <!-- ====================================================================== -->

  <target name="compile-tests" 
          depends="compile" 
          description="Compile the test code" 
          unless="maven.test.skip">
    <mkdir dir="${maven.build.testOutputDir}"/>
    <javac destdir="${maven.build.testOutputDir}" 
           nowarn="false" 
           debug="true" 
           optimize="false" 
           deprecation="true" 
           target="1.1" 
           verbose="false" 
           fork="false" 
           source="1.3">
      <src>
        <pathelement location="${maven.build.testDir.0}"/>
      </src>
      <classpath>
        <path refid="build.test.classpath"/>
        <pathelement location="${maven.build.outputDir}"/>
      </classpath>
    </javac>
    <copy todir="${maven.build.testOutputDir}">
      <fileset dir="${maven.build.testResourceDir.0}"/>
    </copy>
  </target>

  <!-- ====================================================================== -->
  <!-- Run all tests                                                          -->
  <!-- ====================================================================== -->

  <target name="test" 
          depends="compile-tests, junit-missing" 
          unless="junit.skipped" 
          description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.test.classpath"/>
        <pathelement location="${maven.build.outputDir}"/>
        <pathelement location="${maven.build.testOutputDir}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}" unless="test">
        <fileset dir="${maven.build.testDir.0}">
          <include name="**/Test*.java"/>
          <include name="**/*Test.java"/>
          <include name="**/*TestCase.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
      <batchtest todir="${maven.test.reports}" if="test">
        <fileset dir="${maven.build.testDir.0}">
          <include name="**/${test}.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>

  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>

  <target name="test-junit-status" 
          depends="test-junit-present">
    <condition property="junit.missing">
      <and>
        <isfalse value="${junit.present}"/>
        <isfalse value="${maven.test.skip}"/>
      </and>
    </condition>
    <condition property="junit.skipped">
      <or>
        <isfalse value="${junit.present}"/>
        <istrue value="${maven.test.skip}"/>
      </or>
    </condition>
  </target>

  <target name="junit-missing" 
          depends="test-junit-status" 
          if="junit.missing">
    <echo>=================================== WARNING ===================================</echo>
    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
    <echo>===============================================================================</echo>
  </target>

  <!-- ====================================================================== -->
  <!-- Javadoc target                                                         -->
  <!-- ====================================================================== -->

  <target name="javadoc" description="Generates the Javadoc of the application">
    <javadoc sourcepath="${maven.build.srcDir.0}" 
             packagenames="*" 
             destdir="${maven.reporting.outputDirectory}/apidocs" 
             access="protected" 
             old="false" 
             verbose="false" 
             version="true" 
             use="true" 
             author="true" 
             splitindex="false" 
             nodeprecated="false" 
             nodeprecatedlist="false" 
             notree="false" 
             noindex="false" 
             nohelp="false" 
             nonavbar="false" 
             serialwarn="false" 
             charset="ISO-8859-1" 
             linksource="false" 
             breakiterator="false"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Package target                                                         -->
  <!-- ====================================================================== -->

  <target name="package" depends="compile,test" description="Package the application">
    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
         compress="true" 
         index="false" 
         basedir="${maven.build.outputDir}" 
         excludes="**/package.html"/>
  </target>

  <!-- ====================================================================== -->
  <!-- A dummy target for the package named after the type it creates         -->
  <!-- ====================================================================== -->

  <target name="jar" depends="package" description="Builds the jar for the application"/>

  <!-- ====================================================================== -->
  <!-- Download dependencies target                                           -->
  <!-- ====================================================================== -->

  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${maven.settings.offline}" arg2="true"/>
    </condition>
  </target>

  <target name="get-deps" 
          depends="test-offline" 
          description="Download all dependencies" 
          unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
    <get src="http://people.apache.org/repo/m2-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" 
         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/junit/junit/3.8.1/junit-3.8.1.jar" 
         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/commons-collections/commons-collections/3.1"/>
    <get src="http://people.apache.org/repo/m2-snapshot-repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
         dest="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
         dest="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
         dest="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/oro/oro/2.0.7"/>
    <get src="http://people.apache.org/repo/m2-snapshot-repository/oro/oro/2.0.7/oro-2.0.7.jar" 
         dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/oro/oro/2.0.7/oro-2.0.7.jar" 
         dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/oro/oro/2.0.7/oro-2.0.7.jar" 
         dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/plexus/plexus-utils/1.0.3"/>
    <get src="http://people.apache.org/repo/m2-snapshot-repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" 
         dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" 
         dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" 
         dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/velocity/velocity/1.4"/>
    <get src="http://people.apache.org/repo/m2-snapshot-repository/velocity/velocity/1.4/velocity-1.4.jar" 
         dest="${maven.repo.local}/velocity/velocity/1.4/velocity-1.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/velocity/velocity/1.4/velocity-1.4.jar" 
         dest="${maven.repo.local}/velocity/velocity/1.4/velocity-1.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/velocity/velocity/1.4/velocity-1.4.jar" 
         dest="${maven.repo.local}/velocity/velocity/1.4/velocity-1.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <mkdir dir="${maven.repo.local}/velocity/velocity-dep/1.4"/>
    <get src="http://people.apache.org/repo/m2-snapshot-repository/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" 
         dest="${maven.repo.local}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" 
         dest="${maven.repo.local}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" 
         dest="${maven.repo.local}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" 
         usetimestamp="false" 
         ignoreerrors="true"/>
  </target>

</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 22:47:15 -0000	1.2
+++ .cvsignore	10 Sep 2009 21:29:38 -0000	1.3
@@ -1 +1 @@
-maven-jxr-1.0.tar.gz
+maven-jxr-2.1.tar.bz2


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- maven-jxr.spec	25 Jul 2009 11:50:50 -0000	1.11
+++ maven-jxr.spec	10 Sep 2009 21:29:42 -0000	1.12
@@ -28,39 +28,30 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define _without_maven 1
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+%define with_maven 1
 
 Name:           maven-jxr
-Version:        1.0
-Release:        4.8%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
-Group:          Development/Java
+Group:          Development/Tools
 URL:            http://maven.apache.org/doxia/
 
-Source0:        %{name}-%{version}.tar.gz
-# svn export http://svn.apache.org/repos/asf/maven/jxr/tags/maven-jxr-1.0/
-#    maven-jxr/
-# tar czf maven-jxr.tar.gz maven-jxr/
+# svn export http://svn.apache.org/repos/asf/maven/jxr/tags/jxr-2.1
+#   maven-jxr-%{version}
+# tar cjf maven-jxr-%{version}.tar.gz maven-jxr-%{version}
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-jpp-depmap.xml
-Source2:        %{name}-build.xml
+# Generated with mvn ant:ant and edited to match our JAR
+# names/locations
+Source2:        %{name}-%{version}-build.xml
+Source3:        %{name}-%{version}-mavenbuild.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 %if %{with_maven}
@@ -91,52 +82,61 @@ Requires:       velocity >= 1.4
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 Maven JXR is a source cross referencing tool.
 
 %if %{with_maven}
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
+
+%package -n maven-plugin-jxr
+Summary:        Maven plugin for JXR
+Group:          Development/Tools
+
+%description -n maven-plugin-jxr
+Maven plugin for JXR.
 %endif
 
 %prep
-%setup -q -n %{name}
-cp -p %{SOURCE2} build.xml
+%setup -q
+%if ! %{with_maven}
+cp -p %{SOURCE2} maven-jxr/build.xml
+cp -p %{SOURCE3} maven-jxr/maven-build.xml
+%endif
 
 %build
 
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
+# The test failures seem to have something to do with:
+# http://jira.codehaus.org/browse/MCHANGES-88
+# We can investigate when we upgrade to 2.2.x to see if they still occur.
 %if %{with_maven}
-
     mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven2-jpp.depmap.file=%{SOURCE1} \
+        -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
-
 %else
 
+# Only build maven-jxr and not the plugin so we can bootstrap maven
+# itself using maven-jxr
+cd maven-jxr
 mkdir lib
 build-jar-repository -s -p lib/ \
                         commons-collections \
+                        junit \
                         oro \
                         plexus/utils \
                         velocity
 
 ant -Dmaven.mode.offline=true
-
 %endif
 
 %install
@@ -145,28 +145,29 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
 
-install -pm 644 target/%{name}-%{version}.jar \
+install -pm 644 maven-jxr/target/%{name}-%{version}.jar \
                 $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 %add_to_maven_depmap org.apache.maven maven-jxr %{version} JPP %{name}
 
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}.pom
 
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; \
-  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-
 %if %{with_maven}
+# maven-jxr plugin
+%add_to_maven_depmap org.apache.maven maven-plugin-jxr %{version} JPP maven-plugin-jxr
+install -pm 644 maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \
+                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr.jar
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-cp -pr target/site/apidocs/* \
+cp -pr maven-jxr/target/site/apidocs/* \
                 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; \
+  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -174,41 +175,38 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %postun
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
+%if %{with_maven}
+%post -n maven-plugin-jxr
+%update_maven_depmap
+
+%postun -n maven-plugin-jxr
+%update_maven_depmap
 %endif
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}
+%{_javadir}/%{name}*.jar
 %{_datadir}/maven2
-%{_mavendepmapfragdir}
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-jxr-1.0.jar.*
-%endif
+%{_mavendepmapfragdir}/%{name}
 
 %if %{with_maven}
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/*
+
+%files -n maven-plugin-jxr
+%defattr(-,root,root,-)
+%{_javadir}/maven-plugin-jxr*.jar
 %endif
 
 %changelog
+* Thu Sep 10 2009 Andrew Overholt <overholt at redhat.com> 2.1-1
+- 2.1
+- Add maven-plugin-jxr.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-4.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 22:47:15 -0000	1.2
+++ sources	10 Sep 2009 21:29:42 -0000	1.3
@@ -1 +1 @@
-e66d250450bf5669da0d190f93871744  maven-jxr-1.0.tar.gz
+56f77df1a455724857f6b85e1d4283cb  maven-jxr-2.1.tar.bz2


--- maven-jxr-build.xml DELETED ---



From jkratoch at fedoraproject.org  Thu Sep 10 21:37:46 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 10 Sep 2009 21:37:46 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.36,
	1.37 gdb-6.3-large-core-20051206.patch, 1.9,
	1.10 gdb-6.3-pie-20050110.patch, 1.21,
	1.22 gdb-6.3-test-pie-20050107.patch, 1.10,
	1.11 gdb-6.6-buildid-locate-rpm.patch, 1.5,
	1.6 gdb-6.6-buildid-locate.patch, 1.25,
	1.26 gdb-6.8-bz254229-gcore-prpsinfo.patch, 1.3,
	1.4 gdb-6.8-bz457187-largefile.patch, 1.2,
	1.3 gdb-6.8-bz466901-backtrace-full-prelinked.patch, 1.5,
	1.6 gdb-6.8-inlining-addon.patch, 1.7, 1.8 gdb-archer.patch,
	1.28, 1.29 gdb-readline-6.0.patch, 1.1, 1.2 gdb.spec, 1.382,
	1.383 sources, 1.35, 1.36 gdb-6.8.50.20090818-upstream.patch,
	1.1, NONE gdb-bz520129-drow-bitfields.patch, 1.1, NONE
Message-ID: <20090910213746.4963911C00DB@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3636

Modified Files:
	.cvsignore gdb-6.3-large-core-20051206.patch 
	gdb-6.3-pie-20050110.patch gdb-6.3-test-pie-20050107.patch 
	gdb-6.6-buildid-locate-rpm.patch gdb-6.6-buildid-locate.patch 
	gdb-6.8-bz254229-gcore-prpsinfo.patch 
	gdb-6.8-bz457187-largefile.patch 
	gdb-6.8-bz466901-backtrace-full-prelinked.patch 
	gdb-6.8-inlining-addon.patch gdb-archer.patch 
	gdb-readline-6.0.patch gdb.spec sources 
Removed Files:
	gdb-6.8.50.20090818-upstream.patch 
	gdb-bz520129-drow-bitfields.patch 
Log Message:
* Thu Sep 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090910-1
- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090910
- archer-jankratochvil-fedora12 commit: 941eb487a42933e442cb4d11344cda96ecb8a04d
  - [next-over-throw] Fix exceptions thrown during next (Tom Tromey).
  - [bp_location-accel] Do not (much) slow down on 500+ breakpoints (me).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	18 Aug 2009 18:51:17 -0000	1.36
+++ .cvsignore	10 Sep 2009 21:37:38 -0000	1.37
@@ -1 +1 @@
-gdb-6.8.50.20090818.tar.bz2
+gdb-6.8.50.20090910.tar.bz2

gdb-6.3-large-core-20051206.patch:
 dcache.c      |    4 ++--
 dcache.h      |    4 ++--
 exec.c        |    2 +-
 exec.h        |    2 +-
 linux-nat.c   |    2 +-
 remote-sim.c  |    7 +++++--
 remote.c      |   14 +++++++++++---
 symfile-mem.c |   10 +++++++++-
 target.c      |   20 ++++++++++----------
 target.h      |   14 +++++++-------
 10 files changed, 49 insertions(+), 30 deletions(-)

Index: gdb-6.3-large-core-20051206.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-large-core-20051206.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gdb-6.3-large-core-20051206.patch	4 Aug 2009 05:37:27 -0000	1.9
+++ gdb-6.3-large-core-20051206.patch	10 Sep 2009 21:37:38 -0000	1.10
@@ -25,10 +25,10 @@
 
 	Port to GDB-6.7.
 
-Index: gdb-6.8.50.20090803/gdb/symfile-mem.c
+Index: gdb-6.8.50.20090909/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile-mem.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile-mem.c	2009-08-03 16:03:17.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/symfile-mem.c	2009-07-02 19:21:06.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile-mem.c	2009-09-09 19:06:57.000000000 +0200
 @@ -56,6 +56,14 @@
  #include "elf/common.h"
  
@@ -53,10 +53,10 @@ Index: gdb-6.8.50.20090803/gdb/symfile-m
    if (nbfd == NULL)
      error (_("Failed to read a valid object file image from memory."));
  
-Index: gdb-6.8.50.20090803/gdb/target.c
+Index: gdb-6.8.50.20090909/gdb/target.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/target.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/target.c	2009-08-03 16:03:17.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/target.c	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/target.c	2009-09-09 19:08:11.000000000 +0200
 @@ -59,7 +59,7 @@ static int nosymbol (char *, CORE_ADDR *
  
  static void tcomplain (void) ATTR_NORETURN;
@@ -66,7 +66,7 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  
  static int return_zero (void);
  
-@@ -452,7 +452,7 @@ target_terminal_inferior (void)
+@@ -492,7 +492,7 @@ target_terminal_inferior (void)
    (*current_target.to_terminal_inferior) ();
  }
  
@@ -75,7 +75,7 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write,
  	  struct target_ops *t)
  {
-@@ -670,7 +670,7 @@ update_current_target (void)
+@@ -711,7 +711,7 @@ update_current_target (void)
  	    (void (*) (struct regcache *))
  	    noprocess);
    de_fault (deprecated_xfer_memory,
@@ -84,7 +84,7 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  	    nomemory);
    de_fault (to_files_info,
  	    (void (*) (struct target_ops *))
-@@ -1381,7 +1381,7 @@ target_xfer_partial (struct target_ops *
+@@ -1443,7 +1443,7 @@ target_xfer_partial (struct target_ops *
     it makes no progress, and then return how much was transferred). */
  
  int
@@ -93,7 +93,16 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  {
    /* Dispatch to the topmost target, not the flattened current_target.
       Memory accesses check target->to_has_(all_)memory, and the
-@@ -1394,7 +1394,7 @@ target_read_memory (CORE_ADDR memaddr, g
+@@ -1459,7 +1459,7 @@ target_read_memory (CORE_ADDR memaddr, g
+    the target's stack.  This may trigger different cache behavior.  */
+ 
+ int
+-target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
++target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len)
+ {
+   /* Dispatch to the topmost target, not the flattened current_target.
+      Memory accesses check target->to_has_(all_)memory, and the
+@@ -1473,7 +1473,7 @@ target_read_stack (CORE_ADDR memaddr, gd
  }
  
  int
@@ -102,7 +111,7 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  {
    /* Dispatch to the topmost target, not the flattened current_target.
       Memory accesses check target->to_has_(all_)memory, and the
-@@ -2861,8 +2861,8 @@ debug_to_prepare_to_store (struct regcac
+@@ -2964,8 +2964,8 @@ debug_to_prepare_to_store (struct regcac
    fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
  }
  
@@ -113,7 +122,7 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  			      int write, struct mem_attrib *attrib,
  			      struct target_ops *target)
  {
-@@ -2872,8 +2872,8 @@ deprecated_debug_xfer_memory (CORE_ADDR 
+@@ -2975,8 +2975,8 @@ deprecated_debug_xfer_memory (CORE_ADDR 
  						attrib, target);
  
    fprintf_unfiltered (gdb_stdlog,
@@ -124,11 +133,11 @@ Index: gdb-6.8.50.20090803/gdb/target.c
  		      write ? "write" : "read", retval);
  
    if (retval > 0)
-Index: gdb-6.8.50.20090803/gdb/target.h
+Index: gdb-6.8.50.20090909/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/target.h	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/target.h	2009-08-03 16:03:17.000000000 +0200
-@@ -363,10 +363,10 @@ struct target_ops
+--- gdb-6.8.50.20090909.orig/gdb/target.h	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/target.h	2009-09-09 19:07:36.000000000 +0200
+@@ -366,10 +366,10 @@ struct target_ops
         NOTE: cagney/2004-10-01: This has been entirely superseeded by
         to_xfer_partial and inferior inheritance.  */
  
@@ -143,53 +152,58 @@ Index: gdb-6.8.50.20090803/gdb/target.h
  
      void (*to_files_info) (struct target_ops *);
      int (*to_insert_breakpoint) (struct gdbarch *, struct bp_target_info *);
-@@ -675,10 +675,10 @@ extern DCACHE *target_dcache;
+@@ -680,12 +680,12 @@ extern void target_dcache_invalidate (vo
  
  extern int target_read_string (CORE_ADDR, char **, int, int *);
  
 -extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
 +extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len);
  
+-extern int target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
++extern int target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len);
+ 
  extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
 -				int len);
 +				LONGEST len);
  
  /* Fetches the target's memory map.  If one is found it is sorted
     and returned, after some consistency checking.  Otherwise, NULL
-Index: gdb-6.8.50.20090803/gdb/dcache.c
+Index: gdb-6.8.50.20090909/gdb/dcache.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/dcache.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/dcache.c	2009-08-03 16:03:17.000000000 +0200
-@@ -524,9 +524,9 @@ dcache_free (DCACHE *dcache)
+--- gdb-6.8.50.20090909.orig/gdb/dcache.c	2009-08-31 22:18:45.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/dcache.c	2009-09-09 19:09:21.000000000 +0200
+@@ -390,10 +390,10 @@ dcache_free (DCACHE *dcache)
  
-    This routine is indended to be called by remote_xfer_ functions. */
+    The meaning of the result is the same as for target_write.  */
  
 -int
 +LONGEST
- dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, gdb_byte *myaddr,
+ dcache_xfer_memory (struct target_ops *ops, DCACHE *dcache,
+ 		    CORE_ADDR memaddr, gdb_byte *myaddr,
 -		    int len, int should_write)
 +		    LONGEST len, int should_write)
  {
    int i;
-   int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr);
-Index: gdb-6.8.50.20090803/gdb/dcache.h
+   int res;
+Index: gdb-6.8.50.20090909/gdb/dcache.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/dcache.h	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/dcache.h	2009-08-03 16:03:17.000000000 +0200
-@@ -35,7 +35,7 @@ void dcache_free (DCACHE *);
+--- gdb-6.8.50.20090909.orig/gdb/dcache.h	2009-08-31 22:18:45.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/dcache.h	2009-09-09 19:08:54.000000000 +0200
+@@ -35,8 +35,8 @@ void dcache_free (DCACHE *);
  
  /* Simple to call from <remote>_xfer_memory */
  
--int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my,
--			int len, int should_write);
-+LONGEST dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my,
-+			    LONGEST len, int should_write);
- 
- #endif /* DCACHE_H */
-Index: gdb-6.8.50.20090803/gdb/exec.c
+-int dcache_xfer_memory (struct target_ops *ops, DCACHE *cache, CORE_ADDR mem,
+-			gdb_byte *my, int len, int should_write);
++LONGEST dcache_xfer_memory (struct target_ops *ops, DCACHE *cache, CORE_ADDR mem,
++			gdb_byte *my, LONGEST len, int should_write);
+ 
+ void dcache_update (DCACHE *dcache, CORE_ADDR memaddr, gdb_byte *myaddr,
+ 		    int len);
+Index: gdb-6.8.50.20090909/gdb/exec.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/exec.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/exec.c	2009-08-03 16:03:17.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/exec.c	2009-07-02 19:21:06.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/exec.c	2009-09-09 19:06:57.000000000 +0200
 @@ -560,7 +560,7 @@ map_vmap (bfd *abfd, bfd *arch)
  }
  

@@ -199,11 +213,11 @@ Index: gdb-6.8.50.20090803/gdb/exec.c
  section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf,
  				   ULONGEST offset, LONGEST len,
  				   struct target_section *sections,
-Index: gdb-6.8.50.20090803/gdb/linux-nat.c
+Index: gdb-6.8.50.20090909/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-03 16:03:17.000000000 +0200
-@@ -4516,7 +4516,7 @@ linux_xfer_partial (struct target_ops *o
+--- gdb-6.8.50.20090909.orig/gdb/linux-nat.c	2009-09-09 19:06:46.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/linux-nat.c	2009-09-09 19:06:57.000000000 +0200
+@@ -4622,7 +4622,7 @@ linux_xfer_partial (struct target_ops *o
  #endif
        if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL)
  	{ /* This region contains ia64 rse registers, we have to re-read.  */
@@ -212,10 +226,10 @@ Index: gdb-6.8.50.20090803/gdb/linux-nat
  
  	  /* Re-read register stack area.  */
  	  xxfer = super_xfer_partial (ops, object, annex,
-Index: gdb-6.8.50.20090803/gdb/remote.c
+Index: gdb-6.8.50.20090909/gdb/remote.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/remote.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/remote.c	2009-08-03 16:03:17.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/remote.c	2009-08-18 18:17:16.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/remote.c	2009-09-09 19:06:57.000000000 +0200
 @@ -25,6 +25,7 @@
  #include "gdb_string.h"
  #include <ctype.h>
@@ -224,7 +238,7 @@ Index: gdb-6.8.50.20090803/gdb/remote.c
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
-@@ -5785,12 +5786,19 @@ handle_notification (char *buf, size_t l
+@@ -5764,12 +5765,19 @@ handle_notification (char *buf, size_t l
     if SHOULD_WRITE is nonzero.  Returns length of data written or
     read; 0 for error.  TARGET is unused.  */
  
@@ -246,7 +260,7 @@ Index: gdb-6.8.50.20090803/gdb/remote.c
  
    set_general_thread (inferior_ptid);
  
-@@ -5799,7 +5807,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
+@@ -5778,7 +5786,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
    else
      res = remote_read_bytes (mem_addr, buffer, mem_len);
  
@@ -255,10 +269,10 @@ Index: gdb-6.8.50.20090803/gdb/remote.c
  }
  
  /* Sends a packet with content determined by the printf format string
-Index: gdb-6.8.50.20090803/gdb/remote-sim.c
+Index: gdb-6.8.50.20090909/gdb/remote-sim.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/remote-sim.c	2009-08-03 16:03:00.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/remote-sim.c	2009-08-03 16:03:17.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/remote-sim.c	2009-07-02 19:21:06.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/remote-sim.c	2009-09-09 19:06:57.000000000 +0200
 @@ -752,11 +752,14 @@ gdbsim_prepare_to_store (struct regcache
  
     Returns the number of bytes transferred. */
@@ -276,10 +290,10 @@ Index: gdb-6.8.50.20090803/gdb/remote-si
    /* If no program is running yet, then ignore the simulator for
       memory.  Pass the request down to the next target, hopefully
       an exec file.  */
-Index: gdb-6.8.50.20090803/gdb/exec.h
+Index: gdb-6.8.50.20090909/gdb/exec.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/exec.h	2009-06-12 20:38:36.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/exec.h	2009-08-03 16:03:57.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/exec.h	2009-06-12 20:38:36.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/exec.h	2009-09-09 19:06:57.000000000 +0200
 @@ -56,7 +56,7 @@ extern int resize_section_table (struct 
  
     One, and only one, of readbuf or writebuf must be non-NULL.  */

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infcmd.c      |    3 
 infrun.c      |    4 
 linux-tdep.c  |    2 
 objfiles.c    |   14 +
 solib-svr4.c  |  475 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 16 files changed, 616 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gdb-6.3-pie-20050110.patch	12 Aug 2009 14:36:09 -0000	1.21
+++ gdb-6.3-pie-20050110.patch	10 Sep 2009 21:37:38 -0000	1.22
@@ -26,10 +26,10 @@
 
 	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
 
-Index: gdb-6.8.50.20090811/gdb/amd64-tdep.c
+Index: gdb-6.8.50.20090909/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/amd64-tdep.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/amd64-tdep.c	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/amd64-tdep.c	2009-09-09 19:09:31.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/amd64-tdep.c	2009-09-09 19:24:13.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -138,10 +138,10 @@ Index: gdb-6.8.50.20090811/gdb/amd64-tde
    return pc;
  }
  
-Index: gdb-6.8.50.20090811/gdb/auxv.c
+Index: gdb-6.8.50.20090909/gdb/auxv.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/auxv.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/auxv.c	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/auxv.c	2009-09-09 19:24:13.000000000 +0200
 @@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
@@ -230,10 +230,10 @@ Index: gdb-6.8.50.20090811/gdb/auxv.c
  	break;
      }
  
-Index: gdb-6.8.50.20090811/gdb/auxv.h
+Index: gdb-6.8.50.20090909/gdb/auxv.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/auxv.h	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/auxv.h	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/auxv.h	2009-09-09 19:24:13.000000000 +0200
 @@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -251,11 +251,11 @@ Index: gdb-6.8.50.20090811/gdb/auxv.h
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
-Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090909/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-12 06:18:15.000000000 +0200
-@@ -1653,7 +1653,7 @@ dwarf2_build_psymtabs (struct objfile *o
+--- gdb-6.8.50.20090909.orig/gdb/dwarf2read.c	2009-09-09 19:21:23.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/dwarf2read.c	2009-09-09 19:24:13.000000000 +0200
+@@ -1719,7 +1719,7 @@ dwarf2_build_psymtabs (struct objfile *o
    dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
    dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
  
@@ -264,10 +264,10 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2rea
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
-Index: gdb-6.8.50.20090811/gdb/elfread.c
+Index: gdb-6.8.50.20090909/gdb/elfread.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/elfread.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/elfread.c	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/elfread.c	2009-09-09 19:05:55.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/elfread.c	2009-09-09 19:24:13.000000000 +0200
 @@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
@@ -277,11 +277,11 @@ Index: gdb-6.8.50.20090811/gdb/elfread.c
      {
        init_psymbol_list (objfile, 0);
        mainline = 0;
-Index: gdb-6.8.50.20090811/gdb/infrun.c
+Index: gdb-6.8.50.20090909/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/infrun.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/infrun.c	2009-08-12 06:18:15.000000000 +0200
-@@ -3531,6 +3531,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
+--- gdb-6.8.50.20090909.orig/gdb/infrun.c	2009-09-09 19:09:31.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/infrun.c	2009-09-09 19:24:13.000000000 +0200
+@@ -3602,6 +3602,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
  
@@ -292,10 +292,10 @@ Index: gdb-6.8.50.20090811/gdb/infrun.c
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-Index: gdb-6.8.50.20090811/gdb/objfiles.c
+Index: gdb-6.8.50.20090909/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/objfiles.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/objfiles.c	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/objfiles.c	2009-09-09 19:23:05.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/objfiles.c	2009-09-09 19:24:13.000000000 +0200
 @@ -51,6 +51,9 @@
  #include "arch-utils.h"
  #include "exec.h"
@@ -334,10 +334,10 @@ Index: gdb-6.8.50.20090811/gdb/objfiles.
    /* Before the symbol table code was redone to make it easier to
       selectively load and remove information particular to a specific
       linkage unit, gdb used to do these things whenever the monolithic
-Index: gdb-6.8.50.20090811/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090909/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/solib-svr4.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/solib-svr4.c	2009-08-12 06:36:58.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/solib-svr4.c	2009-09-09 19:09:35.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/solib-svr4.c	2009-09-09 19:24:13.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
@@ -1000,11 +1000,11 @@ Index: gdb-6.8.50.20090811/gdb/solib-svr
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8.50.20090811/gdb/solib.c
+Index: gdb-6.8.50.20090909/gdb/solib.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/solib.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/solib.c	2009-08-12 06:18:15.000000000 +0200
-@@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
+--- gdb-6.8.50.20090909.orig/gdb/solib.c	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/solib.c	2009-09-09 19:25:18.000000000 +0200
+@@ -82,6 +82,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
  
@@ -1013,7 +1013,7 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
  /* FIXME: gdbarch needs to control this variable, or else every
     configuration needs to call set_solib_ops.  */
  struct target_so_ops *current_target_so_ops;
-@@ -104,6 +106,8 @@ The search path for loading non-absolute
+@@ -105,6 +107,8 @@ The search path for loading non-absolute
  		    value);
  }
  
@@ -1060,10 +1060,10 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
 +  else
 +    so->objfile = symbol_file_add_from_bfd (so->abfd, flags, sap, OBJF_SHARED);
 +
-   p_refcount = xmalloc (sizeof (*p_refcount));
-   *p_refcount = 2;  /* Both solib and objfile refer to this abfd.  */
-   bfd_usrdata (so->abfd) = p_refcount;
-@@ -600,6 +628,10 @@ update_solib_list (int from_tty, struct 
+   free_section_addr_info (sap);
+ 
+   return;
+@@ -596,6 +624,10 @@ update_solib_list (int from_tty, struct 
  	    }
  	  else
  	    {
@@ -1074,7 +1074,7 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
  	      if (! strcmp (gdb->so_original_name, i->so_original_name))
  		break;	      
  	    }
-@@ -654,18 +686,7 @@ update_solib_list (int from_tty, struct 
+@@ -650,18 +682,7 @@ update_solib_list (int from_tty, struct 
        /* Fill in the rest of each of the `struct so_list' nodes.  */
        for (i = inferior; i; i = i->next)
  	{
@@ -1094,7 +1094,7 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
  
  	  /* Notify any observer that the shared object has been
               loaded now that we've added it to GDB's tables.  */
-@@ -775,6 +796,32 @@ solib_add (char *pattern, int from_tty, 
+@@ -771,6 +792,32 @@ solib_add (char *pattern, int from_tty, 
    }
  }
  
@@ -1127,7 +1127,7 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
  
  /*
  
-@@ -1128,4 +1175,12 @@ This takes precedence over the environme
+@@ -1189,4 +1236,12 @@ This takes precedence over the environme
  				     reload_shared_libraries,
  				     show_solib_search_path,
  				     &setlist, &showlist);
@@ -1140,10 +1140,10 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8.50.20090811/gdb/solist.h
+Index: gdb-6.8.50.20090909/gdb/solist.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/solist.h	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/solist.h	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/solist.h	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/solist.h	2009-09-09 19:24:13.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1164,10 +1164,10 @@ Index: gdb-6.8.50.20090811/gdb/solist.h
 +extern int debug_solib;
 +
  #endif
-Index: gdb-6.8.50.20090811/gdb/symfile-mem.c
+Index: gdb-6.8.50.20090909/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/symfile-mem.c	2009-08-12 06:13:20.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/symfile-mem.c	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/symfile-mem.c	2009-09-09 19:06:57.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile-mem.c	2009-09-09 19:24:13.000000000 +0200
 @@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
  	++i;
        }
@@ -1177,10 +1177,10 @@ Index: gdb-6.8.50.20090811/gdb/symfile-m
                                     sai, OBJF_SHARED);
  
    /* This might change our ideas about frames already looked at.  */
-Index: gdb-6.8.50.20090811/gdb/symfile.c
+Index: gdb-6.8.50.20090909/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/symfile.c	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/symfile.c	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/symfile.c	2009-09-09 19:15:43.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile.c	2009-09-09 19:24:13.000000000 +0200
 @@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
@@ -1189,7 +1189,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
  #include "observer.h"
  #include "exec.h"
  #include "parser-defs.h"
-@@ -786,7 +787,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -779,7 +780,7 @@ syms_from_objfile (struct objfile *objfi
  
    /* Now either addrs or offsets is non-zero.  */
  
@@ -1198,7 +1198,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
      {
        /* We will modify the main symbol table, make sure that all its users
           will be cleaned up if an error occurs during symbol reading.  */
-@@ -814,7 +815,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -807,7 +808,7 @@ syms_from_objfile (struct objfile *objfi
  
       We no longer warn if the lowest section is not a text segment (as
       happens for the PA64 port.  */
@@ -1207,7 +1207,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
      {
        asection *lower_sect;
        asection *sect;
-@@ -897,7 +898,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -890,7 +891,7 @@ syms_from_objfile (struct objfile *objfi
        init_objfile_sect_indices (objfile);
      }
  
@@ -1216,7 +1216,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
  
    /* Discard cleanups as symbol reading was successful.  */
  
-@@ -916,17 +917,22 @@ new_symfile_objfile (struct objfile *obj
+@@ -909,17 +910,22 @@ new_symfile_objfile (struct objfile *obj
    /* If this is the main symbol file we have to clean up all users of the
       old main symbol file. Otherwise it is sufficient to fixup all the
       breakpoints that may have been redefined by this symbol file.  */
@@ -1241,7 +1241,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
  
    /* We're done reading the symbol file; finish off complaints.  */
    clear_complaints (&symfile_complaints, 0, add_flags & SYMFILE_VERBOSE);
-@@ -980,7 +986,7 @@ symbol_file_add_with_addrs_or_offsets (b
+@@ -973,7 +979,7 @@ symbol_file_add_with_addrs_or_offsets (b
    /* Give user a chance to burp if we'd be
       interactively wiping out any existing symbols.  */
  
@@ -1250,7 +1250,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
        && (have_full_symbols () || have_partial_symbols ())
        && from_tty
        && (have_full_symbols () || have_partial_symbols ())
-@@ -1181,6 +1187,9 @@ symbol_file_clear (int from_tty)
+@@ -1162,6 +1168,9 @@ symbol_file_clear (int from_tty)
  		    symfile_objfile->name)
  	  : !query (_("Discard symbol table? "))))
      error (_("Not confirmed."));
@@ -1260,7 +1260,7 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
  
    free_all_objfiles ();
  
-@@ -3385,6 +3394,8 @@ reread_symbols (void)
+@@ -3369,6 +3378,8 @@ reread_symbols (void)
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
@@ -1269,11 +1269,11 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-Index: gdb-6.8.50.20090811/gdb/target.h
+Index: gdb-6.8.50.20090909/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/target.h	2009-08-12 06:18:03.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/target.h	2009-08-12 06:18:15.000000000 +0200
-@@ -524,7 +524,7 @@ struct target_ops
+--- gdb-6.8.50.20090909.orig/gdb/target.h	2009-09-09 19:07:36.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/target.h	2009-09-09 19:24:13.000000000 +0200
+@@ -528,7 +528,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
      int (*to_auxv_parse) (struct target_ops *ops, gdb_byte **readptr,
@@ -1282,10 +1282,10 @@ Index: gdb-6.8.50.20090811/gdb/target.h
  
      /* Search SEARCH_SPACE_LEN bytes beginning at START_ADDR for the
         sequence of bytes in PATTERN with length PATTERN_LEN.
-Index: gdb-6.8.50.20090811/gdb/symfile.h
+Index: gdb-6.8.50.20090909/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/symfile.h	2009-08-12 06:13:20.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/symfile.h	2009-08-12 06:18:15.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/symfile.h	2009-09-09 19:15:43.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile.h	2009-09-09 19:24:13.000000000 +0200
 @@ -229,7 +229,13 @@ enum symfile_add_flags
      SYMFILE_MAINLINE = 1 << 2,
  
@@ -1301,11 +1301,11 @@ Index: gdb-6.8.50.20090811/gdb/symfile.h
    };
  
  extern void syms_from_objfile (struct objfile *,
-Index: gdb-6.8.50.20090811/gdb/infcmd.c
+Index: gdb-6.8.50.20090909/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/infcmd.c	2009-08-12 06:09:14.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/infcmd.c	2009-08-12 06:47:58.000000000 +0200
-@@ -2276,6 +2276,9 @@ attach_command_post_wait (char *args, in
+--- gdb-6.8.50.20090909.orig/gdb/infcmd.c	2009-09-09 19:20:33.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/infcmd.c	2009-09-09 19:24:13.000000000 +0200
+@@ -2308,6 +2308,9 @@ attach_command_post_wait (char *args, in
  
    post_create_inferior (&current_target, from_tty);
  
@@ -1315,10 +1315,10 @@ Index: gdb-6.8.50.20090811/gdb/infcmd.c
    /* Install inferior's terminal modes.  */
    target_terminal_inferior ();
  
-Index: gdb-6.8.50.20090811/gdb/linux-tdep.c
+Index: gdb-6.8.50.20090909/gdb/linux-tdep.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/linux-tdep.c	2009-08-12 06:43:27.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/linux-tdep.c	2009-09-09 19:24:13.000000000 +0200
 @@ -163,5 +163,7 @@ in this session.\n"));
  void
  _initialize_linux_tdep (void)

gdb-6.3-test-pie-20050107.patch:
 configure            |    3 
 configure.ac         |    2 
 gdb.pie/Makefile.in  |   19 
 gdb.pie/attach.c     |   20 +
 gdb.pie/attach.exp   |  432 ++++++++++++++++++++++
 gdb.pie/attach2.c    |   24 +
 gdb.pie/break.c      |  146 +++++++
 gdb.pie/break.exp    |  977 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gdb.pie/break1.c     |   44 ++
 gdb.pie/corefile.exp |  243 ++++++++++++
 gdb.pie/coremaker.c  |  142 +++++++
 11 files changed, 2050 insertions(+), 2 deletions(-)

Index: gdb-6.3-test-pie-20050107.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-pie-20050107.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gdb-6.3-test-pie-20050107.patch	4 Aug 2009 05:37:28 -0000	1.10
+++ gdb-6.3-test-pie-20050107.patch	10 Sep 2009 21:37:39 -0000	1.11
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090802/gdb/testsuite/configure.ac
+Index: gdb-6.8.50.20090909/gdb/testsuite/configure.ac
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/testsuite/configure.ac	2009-07-31 17:38:16.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/testsuite/configure.ac	2009-08-03 11:10:45.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/configure.ac	2009-07-31 17:38:16.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/configure.ac	2009-09-09 19:06:01.000000000 +0200
 @@ -144,6 +144,6 @@ AC_OUTPUT([Makefile \
    gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
    gdb.fortran/Makefile gdb.server/Makefile \
@@ -10,31 +10,31 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +  gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.pie/Makefile \
    gdb.python/Makefile gdb.reverse/Makefile \
    gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile])
-Index: gdb-6.8.50.20090802/gdb/testsuite/configure
+Index: gdb-6.8.50.20090909/gdb/testsuite/configure
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/testsuite/configure	2009-07-31 17:38:16.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/testsuite/configure	2009-08-03 11:11:27.000000000 +0200
-@@ -3239,7 +3239,7 @@ done
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/configure	2009-08-22 18:56:43.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/configure	2009-09-09 19:06:27.000000000 +0200
+@@ -3515,7 +3515,7 @@ done
  
  
  
--                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
-+                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.pie/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
+-ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
++ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.pie/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
+ 
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -3813,6 +3813,7 @@ do
-   "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;;
-   "gdb.opt/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.opt/Makefile" ;;
-   "gdb.pascal/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.pascal/Makefile" ;;
-+  "gdb.pie/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.pie/Makefile" ;;
-   "gdb.python/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.python/Makefile" ;;
-   "gdb.reverse/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.reverse/Makefile" ;;
-   "gdb.threads/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.threads/Makefile" ;;
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.c
+@@ -4231,6 +4231,7 @@ do
+     "gdb.objc/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;;
+     "gdb.opt/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.opt/Makefile" ;;
+     "gdb.pascal/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.pascal/Makefile" ;;
++    "gdb.pie/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.pie/Makefile" ;;
+     "gdb.python/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.python/Makefile" ;;
+     "gdb.reverse/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.reverse/Makefile" ;;
+     "gdb.threads/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.threads/Makefile" ;;
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.c	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach.c	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,20 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -56,10 +56,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +    }
 +  return 0;
 +}
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach2.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach2.c	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach2.c	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,24 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -85,10 +85,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +    }
 +  return (0);
 +}
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/break.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.c	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/break.c	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,146 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -236,10 +236,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +    }
 +  return 0;
 +}
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break1.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/break1.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break1.c	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/break1.c	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,44 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -285,10 +285,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +void marker3 (a, b) char *a, *b; {}	/* set breakpoint 18 here */
 +void marker4 (d) long d; {}		/* set breakpoint 13 here */
 +#endif
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/coremaker.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/coremaker.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/coremaker.c	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/coremaker.c	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,142 @@
 +/* Copyright 1992, 1993, 1994, 1995, 1996, 1999
 +   Free Software Foundation, Inc.
@@ -432,10 +432,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +  return 0;
 +}
 +
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.exp	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach.exp	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,432 @@
 +#   Copyright 1997, 1999, 2002 Free Software Foundation, Inc.
 +
@@ -869,10 +869,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +do_call_attach_tests
 +
 +return 0
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/break.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.exp	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/break.exp	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,977 @@
 +#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2002, 2003, 2004
@@ -1851,10 +1851,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +    send_gdb "set args main\n"
 +    gdb_expect -re ".*$gdb_prompt $" {}
 +}
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/corefile.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/corefile.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/corefile.exp	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/corefile.exp	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,243 @@
 +# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 +# Free Software Foundation, Inc.
@@ -2099,10 +2099,10 @@ Index: gdb-6.8.50.20090802/gdb/testsuite
 +gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(\\).*" "up in corefile.exp (reinit)"
 +
 +gdb_test "core" "No core file now."
-Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/Makefile.in
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/Makefile.in	2009-08-03 11:10:12.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/Makefile.in	2009-09-09 19:06:01.000000000 +0200
 @@ -0,0 +1,19 @@
 +VPATH = @srcdir@
 +srcdir = @srcdir@

gdb-6.6-buildid-locate-rpm.patch:
 acinclude.m4                 |    4 
 aclocal.m4                   |  156 ++++++++
 config.in                    |    6 
 configure                    |  752 ++++++++++++++++++++++++++++---------------
 configure.ac                 |  193 +++++++++++
 event-top.c                  |    5 
 symfile.c                    |  387 +++++++++++++++++++++-
 symfile.h                    |    1 
 testsuite/lib/gdb.exp        |    2 
 testsuite/lib/mi-support.exp |    2 
 tui/tui-interp.c             |    3 
 11 files changed, 1249 insertions(+), 262 deletions(-)

Index: gdb-6.6-buildid-locate-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate-rpm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.6-buildid-locate-rpm.patch	4 Aug 2009 05:37:28 -0000	1.5
+++ gdb-6.6-buildid-locate-rpm.patch	10 Sep 2009 21:37:39 -0000	1.6
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090803/gdb/event-top.c
+Index: gdb-6.8.50.20090909/gdb/event-top.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/event-top.c	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/event-top.c	2009-08-03 16:17:59.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/event-top.c	2009-09-09 20:05:48.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/event-top.c	2009-09-09 20:08:04.000000000 +0200
 @@ -33,6 +33,7 @@
  #include "cli/cli-script.h"     /* for reset_command_nest_depth */
  #include "main.h"
@@ -28,11 +28,11 @@ Index: gdb-6.8.50.20090803/gdb/event-top
    /* Each interpreter has its own rules on displaying the command
       prompt.  */
    if (!current_interp_display_prompt_p ())
-Index: gdb-6.8.50.20090803/gdb/symfile.c
+Index: gdb-6.8.50.20090909/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile.c	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile.c	2009-08-03 16:17:59.000000000 +0200
-@@ -56,6 +56,7 @@
+--- gdb-6.8.50.20090909.orig/gdb/symfile.c	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile.c	2009-09-09 20:08:04.000000000 +0200
+@@ -57,6 +57,7 @@
  #include "solib.h"
  #include "remote.h"
  #include "libbfd.h"
@@ -40,7 +40,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -64,6 +65,7 @@
+@@ -65,6 +66,7 @@
  #include <ctype.h>
  #include <time.h>
  #include <sys/time.h>
@@ -48,7 +48,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
  
  int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num);
-@@ -1692,8 +1694,352 @@ build_id_to_filename (struct build_id *b
+@@ -1673,8 +1675,352 @@ build_id_to_filename (struct build_id *b
    return retval;
  }
  
@@ -402,7 +402,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
     avoidance.  */
  
  struct missing_filepair
-@@ -1747,11 +2093,17 @@ missing_filepair_change (void)
+@@ -1728,11 +2074,17 @@ missing_filepair_change (void)
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -420,7 +420,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
    missing_filepair_change ();
  }
  
-@@ -1818,14 +2170,33 @@ debug_print_missing (const char *binary,
+@@ -1799,14 +2151,33 @@ debug_print_missing (const char *binary,
  
    *slot = missing_filepair;
  
@@ -461,11 +461,11 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  }
  
  static char *
-Index: gdb-6.8.50.20090803/gdb/symfile.h
+Index: gdb-6.8.50.20090909/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile.h	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile.h	2009-08-03 16:17:59.000000000 +0200
-@@ -394,6 +394,7 @@ extern struct build_id *build_id_addr_ge
+--- gdb-6.8.50.20090909.orig/gdb/symfile.h	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile.h	2009-09-09 20:08:04.000000000 +0200
+@@ -387,6 +387,7 @@ extern struct build_id *build_id_addr_ge
  extern char *build_id_to_filename (struct build_id *build_id,
  				   char **link_return, int add_debug_suffix);
  extern void debug_print_missing (const char *binary, const char *debug);
@@ -473,10 +473,10 @@ Index: gdb-6.8.50.20090803/gdb/symfile.h
  
  /* From dwarf2read.c */
  
-Index: gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/gdb.exp	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp	2009-08-03 16:17:59.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/lib/gdb.exp	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/lib/gdb.exp	2009-09-09 20:08:04.000000000 +0200
 @@ -1248,7 +1248,7 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
@@ -486,10 +486,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
      send_gdb "set build-id-verbose 0\n"
      gdb_expect 10 {
  	-re "$gdb_prompt $" {
-Index: gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/mi-support.exp	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp	2009-08-03 16:17:59.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/lib/mi-support.exp	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/lib/mi-support.exp	2009-09-09 20:08:04.000000000 +0200
 @@ -221,7 +221,7 @@ proc default_mi_gdb_start { args } {
  	    }
      	}
@@ -499,10 +499,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
      send_gdb "190-gdb-set build-id-verbose 0\n"
      gdb_expect 10 {
  	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
-Index: gdb-6.8.50.20090803/gdb/tui/tui-interp.c
+Index: gdb-6.8.50.20090909/gdb/tui/tui-interp.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/tui/tui-interp.c	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/tui/tui-interp.c	2009-08-03 16:17:59.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/tui/tui-interp.c	2009-09-09 20:05:48.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/tui/tui-interp.c	2009-09-09 20:08:04.000000000 +0200
 @@ -30,6 +30,7 @@
  #include "tui/tui.h"
  #include "tui/tui-io.h"
@@ -520,13 +520,13 @@ Index: gdb-6.8.50.20090803/gdb/tui/tui-i
        /* Tell readline what the prompt to display is and what function
           it will need to call after a whole line is read. This also
           displays the first prompt.  */
-Index: gdb-6.8.50.20090803/gdb/aclocal.m4
+Index: gdb-6.8.50.20090909/gdb/aclocal.m4
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/aclocal.m4	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/aclocal.m4	2009-08-03 16:19:22.000000000 +0200
-@@ -11,6 +11,162 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
+--- gdb-6.8.50.20090909.orig/gdb/aclocal.m4	2009-09-09 20:05:48.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/aclocal.m4	2009-09-09 20:09:32.000000000 +0200
+@@ -19,6 +19,162 @@ You have another version of autoconf.  I
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
  
 +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 +# 
@@ -684,14 +684,14 @@ Index: gdb-6.8.50.20090803/gdb/aclocal.m
 +fi[]dnl
 +])# PKG_CHECK_MODULES
 +
- # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+ # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
-Index: gdb-6.8.50.20090803/gdb/config.in
+Index: gdb-6.8.50.20090909/gdb/config.in
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/config.in	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/config.in	2009-08-03 16:17:59.000000000 +0200
-@@ -39,6 +39,9 @@
+--- gdb-6.8.50.20090909.orig/gdb/config.in	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/config.in	2009-09-09 20:08:04.000000000 +0200
+@@ -42,6 +42,9 @@
  /* Define to BFD's default target vector. */
  #undef DEFAULT_BFD_VEC
  
@@ -701,7 +701,7 @@ Index: gdb-6.8.50.20090803/gdb/config.in
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
  #undef ENABLE_NLS
-@@ -218,6 +221,9 @@
+@@ -221,6 +224,9 @@
  /* Define if Python 2.6 is being used. */
  #undef HAVE_LIBPYTHON2_6
  
@@ -711,58 +711,58 @@ Index: gdb-6.8.50.20090803/gdb/config.in
  /* Define if libunwind library is being used. */
  #undef HAVE_LIBUNWIND
  
-Index: gdb-6.8.50.20090803/gdb/configure
+Index: gdb-6.8.50.20090909/gdb/configure
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/configure	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/configure	2009-08-03 16:20:09.000000000 +0200
-@@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all doc test
- ac_subdirs_all="$ac_subdirs_all gdbtk"
- ac_subdirs_all="$ac_subdirs_all multi-ice"
- ac_subdirs_all="$ac_subdirs_all gdbserver"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_
 STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI
 ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE DEBUGDIR GDB_DATADIR GDB_DATADIR_PATH pythondir subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE SYSTEM_GDBINIT WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR T
 CL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags GDB_NM_FILE datarootdir docdir htmldir pdfdir LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_
 STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI
 ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE DEBUGDIR GDB_DATADIR GDB_DATADIR_PATH pythondir PKG_CONFIG ac_pt_PKG_CONFIG RPM_CFLAGS RPM_LIBS subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE SYSTEM_GDBINIT WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_V
 ERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags GDB_NM_FILE datarootdir docdir htmldir pdfdir LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS'
- ac_subst_files='host_makefile_frag'
- ac_pwd=`pwd`
- 
-@@ -776,6 +776,18 @@ ac_env_CPP_set=${CPP+set}
- ac_env_CPP_value=$CPP
- ac_cv_env_CPP_set=${CPP+set}
- ac_cv_env_CPP_value=$CPP
-+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+ac_env_PKG_CONFIG_value=$PKG_CONFIG
-+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-+ac_env_RPM_CFLAGS_set=${RPM_CFLAGS+set}
-+ac_env_RPM_CFLAGS_value=$RPM_CFLAGS
-+ac_cv_env_RPM_CFLAGS_set=${RPM_CFLAGS+set}
-+ac_cv_env_RPM_CFLAGS_value=$RPM_CFLAGS
-+ac_env_RPM_LIBS_set=${RPM_LIBS+set}
-+ac_env_RPM_LIBS_value=$RPM_LIBS
-+ac_cv_env_RPM_LIBS_set=${RPM_LIBS+set}
-+ac_cv_env_RPM_LIBS_value=$RPM_LIBS
- 
- #
- # Report the --help message.
-@@ -895,6 +907,8 @@ Optional Packages:
+--- gdb-6.8.50.20090909.orig/gdb/configure	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/configure	2009-09-09 20:09:35.000000000 +0200
+@@ -676,6 +676,9 @@ REPORT_BUGS_TO
+ PKGVERSION
+ TARGET_OBS
+ subdirs
++RPM_LIBS
++RPM_CFLAGS
++PKG_CONFIG
+ pythondir
+ GDB_DATADIR_PATH
+ GDB_DATADIR
+@@ -886,6 +889,7 @@ with_separate_debug_dir
+ with_gdb_datadir
+ with_relocated_sources
+ with_pythondir
++with_rpm
+ enable_targets
+ enable_64_bit_bfd
+ enable_gdbcli
+@@ -925,6 +929,9 @@ LDFLAGS
+ LIBS
+ CPPFLAGS
+ CPP
++PKG_CONFIG
++RPM_CFLAGS
++RPM_LIBS
+ YACC
+ YFLAGS
+ XMKMF'
+@@ -1588,6 +1595,8 @@ Optional Packages:
                            [DATADIR/gdb]
    --with-pythondir        install Python data files in this path
                            [DATADIR/gdb/python]
-+  --with-rpm              query rpm database for missing debuginfos
-+                          [yes/no,], [def.], [auto=librpm.so]
++  --with-rpm              query rpm database for missing debuginfos (yes/no,
++                          def. auto=librpm.so)
    --with-libunwind        use libunwind frame unwinding support
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -932,6 +946,9 @@ Some influential environment variables:
-   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-               headers in a nonstandard directory <include dir>
+@@ -1621,6 +1630,9 @@ Some influential environment variables:
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
 +  PKG_CONFIG  path to pkg-config utility
 +  RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
 +  RPM_LIBS    linker flags for RPM, overriding pkg-config
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -7290,6 +7307,559 @@ _ACEOF
+   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+               the first program found out of: `bison -y', `byacc', `yacc'.
+   YFLAGS      The list of arguments that will be passed by default to $YACC.
+@@ -6675,6 +6687,486 @@ _ACEOF
  fi
  
  
@@ -783,13 +783,13 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +#   cannot find librpm use to the rpmless compilation (like `--without-rpm').
 +
 +
-+# Check whether --with-rpm or --without-rpm was given.
-+if test "${with_rpm+set}" = set; then
-+  withval="$with_rpm"
-+
++# Check whether --with-rpm was given.
++if test "${with_rpm+set}" = set; then :
++  withval=$with_rpm;
 +else
 +  with_rpm="auto"
-+fi;
++fi
++
 +
 +
 +
@@ -809,25 +809,18 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  fi
 +  LIBRPM_STRING='"'"$LIBRPM"'"'
 +
-+  echo "$as_me:$LINENO: checking specific librpm version" >&5
-+echo $ECHO_N "checking specific librpm version... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking specific librpm version" >&5
++$as_echo_n "checking specific librpm version... " >&6; }
 +  HAVE_DLOPEN_LIBRPM=false
 +  save_LIBS="$LIBS"
 +  LIBS="$LIBS -ldl"
-+  if test "$cross_compiling" = yes; then
-+  { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }; }
++  if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
 +else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +#include <rpm/rpmlib.h>
@@ -910,49 +903,32 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
 +
 +    DLOPEN_LIBRPM="`cat conftest.out`"
 +    if test "x$DLOPEN_LIBRPM" != "x"; then
 +      HAVE_DLOPEN_LIBRPM=true
-+      echo "$as_me:$LINENO: result: $DLOPEN_LIBRPM" >&5
-+echo "${ECHO_T}$DLOPEN_LIBRPM" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLOPEN_LIBRPM" >&5
++$as_echo "$DLOPEN_LIBRPM" >&6; }
 +    fi
 +
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
++
 +  rm -f conftest.out
 +
 +
 +
 +  if $HAVE_DLOPEN_LIBRPM; then
 +
-+    echo "$as_me:$LINENO: checking rpm library API compatibility" >&5
-+echo $ECHO_N "checking rpm library API compatibility... $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking rpm library API compatibility" >&5
++$as_echo_n "checking rpm library API compatibility... " >&6; }
 +    # The compilation requires -Werror to verify anything.
 +    save_CFLAGS="$CFLAGS"
 +    CFLAGS="$CFLAGS -Werror"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Duplicate here the declarations to verify they match "symfile.c".  */
@@ -977,44 +953,20 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
 +
 +      LIBRPM_COMPAT=true
-+      echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
 +
 +else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +
 +      LIBRPM_COMPAT=false
-+      echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +
 +fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +    CFLAGS="$save_CFLAGS"
 +
 +    if ! $LIBRPM_COMPAT; then
@@ -1030,18 +982,14 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +_ACEOF
 +
 +
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBRPM 1
-+_ACEOF
++$as_echo "#define HAVE_LIBRPM 1" >>confdefs.h
 +
 +  else
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +    LIBS="$save_LIBS"
 +    if $DLOPEN_REQUIRE; then
-+      { { echo "$as_me:$LINENO: error: Specific name $LIBRPM was requested but it could not be opened." >&5
-+echo "$as_me: error: Specific name $LIBRPM was requested but it could not be opened." >&2;}
-+   { (exit 1); exit 1; }; }
++      as_fn_error "Specific name $LIBRPM was requested but it could not be opened." "$LINENO" 5
 +    fi
 +
 +
@@ -1049,10 +997,10 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +	if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  case $PKG_CONFIG in
 +  [\\/]* | ?:[\\/]*)
@@ -1064,37 +1012,38 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
-+done
++  done
++IFS=$as_save_IFS
 +
 +  ;;
 +esac
 +fi
 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
 +if test -n "$PKG_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
 +else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +fi
 +
++
 +fi
 +if test -z "$ac_cv_path_PKG_CONFIG"; then
 +  ac_pt_PKG_CONFIG=$PKG_CONFIG
 +  # Extract the first word of "pkg-config", so it can be a program name with args.
 +set dummy pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  case $ac_pt_PKG_CONFIG in
 +  [\\/]* | ?:[\\/]*)
@@ -1106,29 +1055,39 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
-+done
++  done
++IFS=$as_save_IFS
 +
 +  ;;
 +esac
 +fi
 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+
 +if test -n "$ac_pt_PKG_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 +else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +fi
 +
-+  PKG_CONFIG=$ac_pt_PKG_CONFIG
++  if test "x$ac_pt_PKG_CONFIG" = x; then
++    PKG_CONFIG=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    PKG_CONFIG=$ac_pt_PKG_CONFIG
++  fi
 +else
 +  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 +fi
@@ -1136,32 +1095,32 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +fi
 +if test -n "$PKG_CONFIG"; then
 +	_pkg_min_version=0.9.0
-+	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 +	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
 +	else
-+		echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +		PKG_CONFIG=""
 +	fi
 +
 +fi
 +
 +pkg_failed=no
-+echo "$as_me:$LINENO: checking for RPM" >&5
-+echo $ECHO_N "checking for RPM... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RPM" >&5
++$as_echo_n "checking for RPM... " >&6; }
 +
 +if test -n "$RPM_CFLAGS"; then
 +    pkg_cv_RPM_CFLAGS="$RPM_CFLAGS"
 + elif test -n "$PKG_CONFIG"; then
 +    if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rpm\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rpm\""; } >&5
 +  ($PKG_CONFIG --exists --print-errors "rpm") 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
 +  pkg_cv_RPM_CFLAGS=`$PKG_CONFIG --cflags "rpm" 2>/dev/null`
 +else
 +  pkg_failed=yes
@@ -1173,11 +1132,11 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +    pkg_cv_RPM_LIBS="$RPM_LIBS"
 + elif test -n "$PKG_CONFIG"; then
 +    if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rpm\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rpm\""; } >&5
 +  ($PKG_CONFIG --exists --print-errors "rpm") 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
 +  pkg_cv_RPM_LIBS=`$PKG_CONFIG --libs "rpm" 2>/dev/null`
 +else
 +  pkg_failed=yes
@@ -1203,31 +1162,27 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +	# Put the nasty error message in config.log where it belongs
 +	echo "$RPM_PKG_ERRORS" >&5
 +
-+	echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +                HAVE_LIBRPM=false
 +elif test $pkg_failed = untried; then
 +	HAVE_LIBRPM=false
 +else
 +	RPM_CFLAGS=$pkg_cv_RPM_CFLAGS
 +	RPM_LIBS=$pkg_cv_RPM_LIBS
-+        echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
 +	HAVE_LIBRPM=true
 +fi
 +
 +    if $HAVE_LIBRPM; then
 +
-+    echo "$as_me:$LINENO: checking rpm library API compatibility" >&5
-+echo $ECHO_N "checking rpm library API compatibility... $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking rpm library API compatibility" >&5
++$as_echo_n "checking rpm library API compatibility... " >&6; }
 +    # The compilation requires -Werror to verify anything.
 +    save_CFLAGS="$CFLAGS"
 +    CFLAGS="$CFLAGS -Werror"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Duplicate here the declarations to verify they match "symfile.c".  */
@@ -1252,44 +1207,20 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
 +
 +      LIBRPM_COMPAT=true
-+      echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
 +
 +else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +
 +      LIBRPM_COMPAT=false
-+      echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +
 +fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +    CFLAGS="$save_CFLAGS"
 +
 +      if ! $LIBRPM_COMPAT; then
@@ -1300,20 +1231,16 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +
 +    if $HAVE_LIBRPM; then
 +
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBRPM 1
-+_ACEOF
++$as_echo "#define HAVE_LIBRPM 1" >>confdefs.h
 +
 +      CFLAGS="$CFLAGS $RPM_CFLAGS"
 +      LIBS="$LIBS $RPM_LIBS"
 +    else
 +      if $RPM_REQUIRE; then
-+	{ { echo "$as_me:$LINENO: error: $RPM_PKG_ERRORS" >&5
-+echo "$as_me: error: $RPM_PKG_ERRORS" >&2;}
-+   { (exit 1); exit 1; }; }
++	as_fn_error "$RPM_PKG_ERRORS" "$LINENO" 5
 +      else
-+	{ echo "$as_me:$LINENO: WARNING: $RPM_PKG_ERRORS" >&5
-+echo "$as_me: WARNING: $RPM_PKG_ERRORS" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $RPM_PKG_ERRORS" >&5
++$as_echo "$as_me: WARNING: $RPM_PKG_ERRORS" >&2;}
 +      fi
 +    fi
 +  fi
@@ -1322,22 +1249,287 @@ Index: gdb-6.8.50.20090803/gdb/configure
  
  
  
-@@ -22513,6 +23083,10 @@ s, at DEBUGDIR@,$DEBUGDIR,;t t
- s, at GDB_DATADIR@,$GDB_DATADIR,;t t
- s, at GDB_DATADIR_PATH@,$GDB_DATADIR_PATH,;t t
- s, at pythondir@,$pythondir,;t t
-+s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-+s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-+s, at RPM_CFLAGS@,$RPM_CFLAGS,;t t
-+s, at RPM_LIBS@,$RPM_LIBS,;t t
- s, at subdirs@,$subdirs,;t t
- s, at TARGET_OBS@,$TARGET_OBS,;t t
- s, at PKGVERSION@,$PKGVERSION,;t t
-Index: gdb-6.8.50.20090803/gdb/configure.ac
+@@ -9721,265 +10213,25 @@ $as_echo "#define STDC_HEADERS 1" >>conf
+ 
+ fi
+ 
+-
+-
+ for ac_header in sys/user32.h sys/procfs32.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for struct elf_prstatus32.pr_reg" >&5
+-echo $ECHO_N "checking for struct elf_prstatus32.pr_reg... $ECHO_C" >&6
+-if test "${ac_cv_member_struct_elf_prstatus32_pr_reg+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/procfs.h>
+-
+-int
+-main ()
+-{
+-static struct elf_prstatus32 ac_aggr;
+-if (ac_aggr.pr_reg)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_member_struct_elf_prstatus32_pr_reg=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/procfs.h>
+-
+-int
+-main ()
+-{
+-static struct elf_prstatus32 ac_aggr;
+-if (sizeof ac_aggr.pr_reg)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_member_struct_elf_prstatus32_pr_reg=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_member_struct_elf_prstatus32_pr_reg=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_elf_prstatus32_pr_reg" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_elf_prstatus32_pr_reg" >&6
+-if test $ac_cv_member_struct_elf_prstatus32_pr_reg = yes; then
++ac_fn_c_check_member "$LINENO" "struct elf_prstatus32" "pr_reg" "ac_cv_member_struct_elf_prstatus32_pr_reg" "#include <sys/procfs.h>
++"
++if test "x$ac_cv_member_struct_elf_prstatus32_pr_reg" = x""yes; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ELF_PRSTATUS32 1
+-_ACEOF
++$as_echo "#define HAVE_ELF_PRSTATUS32 1" >>confdefs.h
+ 
+ fi
+ 
+Index: gdb-6.8.50.20090909/gdb/configure.ac
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/configure.ac	2009-08-03 16:17:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/configure.ac	2009-08-03 16:17:59.000000000 +0200
-@@ -153,6 +153,199 @@ else
+--- gdb-6.8.50.20090909.orig/gdb/configure.ac	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/configure.ac	2009-09-09 20:08:04.000000000 +0200
+@@ -151,6 +151,199 @@ else
  fi
  AC_SUBST(pythondir)
  
@@ -1359,7 +1551,7 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +
 +AC_ARG_WITH([rpm],
 +  [AS_HELP_STRING([--with-rpm],
-+                  [query rpm database for missing debuginfos [yes/no, def. auto=librpm.so]])], [], [with_rpm="auto"])
++                  [query rpm database for missing debuginfos (yes/no, def. auto=librpm.so)])], [], [with_rpm="auto"])
 +
 +m4_pattern_allow([^AC_MSG_ERROR$])
 +m4_pattern_allow([^AC_MSG_WARN$])
@@ -1537,3 +1729,22 @@ Index: gdb-6.8.50.20090803/gdb/configure
  
  AC_CONFIG_SUBDIRS(doc testsuite)
  
+Index: gdb-6.8.50.20090909/gdb/acinclude.m4
+===================================================================
+--- gdb-6.8.50.20090909.orig/gdb/acinclude.m4	2009-09-09 20:05:48.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/acinclude.m4	2009-09-09 20:08:04.000000000 +0200
+@@ -1,3 +1,5 @@
++# serial 1
++
+ dnl written by Rob Savoye <rob at cygnus.com> for Cygnus Support
+ dnl major rewriting for Tcl 7.5 by Don Libes <libes at nist.gov>
+ 
+@@ -79,8 +81,6 @@ AC_MSG_RESULT(yes)
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
+ 
+-# serial 1
+-
+ # @defmac AC_PROG_CC_STDC
+ # @maindex PROG_CC_STDC
+ # @ovindex CC

gdb-6.6-buildid-locate.patch:
 corelow.c                    |   61 ++++
 doc/gdb.texinfo              |   21 +
 solib-svr4.c                 |   30 +-
 symfile.c                    |  637 +++++++++++++++++++++++++++++++++++++++----
 symfile.h                    |    7 
 testsuite/lib/gdb.exp        |   10 
 testsuite/lib/mi-support.exp |   10 
 7 files changed, 723 insertions(+), 53 deletions(-)

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gdb-6.6-buildid-locate.patch	18 Aug 2009 19:10:33 -0000	1.25
+++ gdb-6.6-buildid-locate.patch	10 Sep 2009 21:37:39 -0000	1.26
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090818/gdb/corelow.c
+Index: gdb-6.8.50.20090909/gdb/corelow.c
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/corelow.c	2009-08-18 21:07:23.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/corelow.c	2009-09-09 19:09:35.000000000 +0200
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -89,11 +89,11 @@ Index: gdb-6.8.50.20090818/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-6.8.50.20090818/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090909/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/doc/gdb.texinfo	2009-08-18 21:07:05.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/doc/gdb.texinfo	2009-08-18 21:07:23.000000000 +0200
-@@ -13733,6 +13733,27 @@ information files.
+--- gdb-6.8.50.20090909.orig/gdb/doc/gdb.texinfo	2009-09-09 19:09:31.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/doc/gdb.texinfo	2009-09-09 19:09:35.000000000 +0200
+@@ -13764,6 +13764,27 @@ information files.
  
  @end table
  
@@ -121,10 +121,10 @@ Index: gdb-6.8.50.20090818/gdb/doc/gdb.t
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-Index: gdb-6.8.50.20090818/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090909/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/solib-svr4.c	2009-08-18 21:07:04.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/solib-svr4.c	2009-08-18 21:07:23.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/solib-svr4.c	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/solib-svr4.c	2009-09-09 19:09:35.000000000 +0200
 @@ -1101,9 +1101,33 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
@@ -162,10 +162,10 @@ Index: gdb-6.8.50.20090818/gdb/solib-svr
  	    }
  	  xfree (buffer);
  
-Index: gdb-6.8.50.20090818/gdb/symfile.c
+Index: gdb-6.8.50.20090909/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/symfile.c	2009-08-18 21:07:05.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/symfile.c	2009-08-18 21:08:31.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/symfile.c	2009-09-09 19:09:31.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile.c	2009-09-09 19:09:55.000000000 +0200
 @@ -56,6 +56,7 @@
  #include "elf-bfd.h"
  #include "solib.h"
@@ -174,7 +174,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -1193,16 +1194,65 @@ symbol_file_clear (int from_tty)
+@@ -1174,16 +1175,65 @@ symbol_file_clear (int from_tty)
      printf_unfiltered (_("No symbol file now.\n"));
  }
  
@@ -242,7 +242,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  {
    struct build_id *retval;
  
-@@ -1218,6 +1268,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -1199,6 +1249,348 @@ build_id_bfd_get (bfd *abfd)
    return retval;
  }
  
@@ -591,7 +591,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value.  */
  
  static int
-@@ -1235,7 +1627,7 @@ build_id_verify (const char *filename, s
+@@ -1216,7 +1608,7 @@ build_id_verify (const char *filename, s
    if (abfd == NULL)
      return 0;
  
@@ -600,7 +600,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1254,8 +1646,9 @@ build_id_verify (const char *filename, s
+@@ -1235,8 +1627,9 @@ build_id_verify (const char *filename, s
    return retval;
  }
  
@@ -612,7 +612,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  {
    char *link, *s, *retval = NULL;
    gdb_byte *data = build_id->data;
-@@ -1263,7 +1656,9 @@ build_id_to_debug_filename (struct build
+@@ -1244,7 +1637,9 @@ build_id_to_debug_filename (struct build
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
    link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
@@ -623,7 +623,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
    s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
    if (size > 0)
      {
-@@ -1274,12 +1669,14 @@ build_id_to_debug_filename (struct build
+@@ -1255,12 +1650,14 @@ build_id_to_debug_filename (struct build
      *s++ = '/';
    while (size-- > 0)
      s += sprintf (s, "%02x", (unsigned) *data++);
@@ -640,7 +640,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1287,9 +1684,150 @@ build_id_to_debug_filename (struct build
+@@ -1268,9 +1665,150 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -791,7 +791,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1372,32 +1910,36 @@ static char *
+@@ -1353,32 +1891,36 @@ static char *
  find_separate_debug_file (struct objfile *objfile)
  {
    asection *sect;
@@ -836,7 +836,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1405,7 +1947,7 @@ find_separate_debug_file (struct objfile
+@@ -1386,7 +1928,7 @@ find_separate_debug_file (struct objfile
    if (basename == NULL)
      /* There's no separate debug info, hence there's no way we could
         load it => no warning.  */
@@ -845,7 +845,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
    dir = xstrdup (objfile->name);
  
-@@ -1427,24 +1969,19 @@ find_separate_debug_file (struct objfile
+@@ -1408,24 +1950,19 @@ find_separate_debug_file (struct objfile
    if (canon_name && strlen (canon_name) > i)
      i = strlen (canon_name);
  
@@ -877,7 +877,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
    /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
    strcpy (debugfile, dir);
-@@ -1453,12 +1990,7 @@ find_separate_debug_file (struct objfile
+@@ -1434,12 +1971,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -891,7 +891,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
-@@ -1467,12 +1999,7 @@ find_separate_debug_file (struct objfile
+@@ -1448,12 +1980,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -905,7 +905,7 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  
    /* If the file is in the sysroot, try using its base path in the
       global debugfile directory.  */
-@@ -1486,20 +2013,18 @@ find_separate_debug_file (struct objfile
+@@ -1467,20 +1994,18 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, basename);
  
        if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -933,28 +933,28 @@ Index: gdb-6.8.50.20090818/gdb/symfile.c
  }
  
  
-@@ -4255,4 +4780,16 @@ Show printing of symbol loading messages
-                            NULL,
-                            NULL,
-                            &setprintlist, &showprintlist);
-+
-+  add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose,
-+			    _("\
-+Set debugging level of the build-id locator."), _("\
-+Show debugging level of the build-id locator."), _("\
-+Level 1 (default) enables printing the missing debug filenames,\n\
-+level 2 also prints the parsing of binaries to find the identificators."),
-+			    NULL,
-+			    show_build_id_verbose,
-+			    &setlist, &showlist);
-+
-+  observer_attach_executable_changed (debug_print_executable_changed);
+@@ -4231,4 +4756,16 @@ the global debug-file directory prepende
+ 				     NULL,
+ 				     show_debug_file_directory,
+ 				     &setlist, &showlist);
++ 
++   add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose,
++ 			    _("\
++ Set debugging level of the build-id locator."), _("\
++ Show debugging level of the build-id locator."), _("\
++ Level 1 (default) enables printing the missing debug filenames,\n\
++ level 2 also prints the parsing of binaries to find the identificators."),
++ 			    NULL,
++ 			    show_build_id_verbose,
++ 			    &setlist, &showlist);
++ 
++   observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-6.8.50.20090818/gdb/symfile.h
+Index: gdb-6.8.50.20090909/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/symfile.h	2009-08-18 21:07:04.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/symfile.h	2009-08-18 21:07:23.000000000 +0200
-@@ -388,6 +388,13 @@ extern int symfile_map_offsets_to_segmen
+--- gdb-6.8.50.20090909.orig/gdb/symfile.h	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/symfile.h	2009-09-09 19:09:35.000000000 +0200
+@@ -381,6 +381,13 @@ extern int symfile_map_offsets_to_segmen
  struct symfile_segment_data *get_symfile_segment_data (bfd *abfd);
  void free_symfile_segment_data (struct symfile_segment_data *data);
  
@@ -968,10 +968,10 @@ Index: gdb-6.8.50.20090818/gdb/symfile.h
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
-Index: gdb-6.8.50.20090818/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/testsuite/lib/gdb.exp	2009-08-18 21:07:04.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/testsuite/lib/gdb.exp	2009-08-18 21:07:23.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/lib/gdb.exp	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/lib/gdb.exp	2009-09-09 19:09:35.000000000 +0200
 @@ -1248,6 +1248,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
@@ -989,10 +989,10 @@ Index: gdb-6.8.50.20090818/gdb/testsuite
      return 0;
  }
  
-Index: gdb-6.8.50.20090818/gdb/testsuite/lib/mi-support.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-6.8.50.20090818.orig/gdb/testsuite/lib/mi-support.exp	2009-08-18 21:07:04.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/testsuite/lib/mi-support.exp	2009-08-18 21:07:23.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/lib/mi-support.exp	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/lib/mi-support.exp	2009-09-09 19:09:35.000000000 +0200
 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } {
  	    }
      	}

gdb-6.8-bz254229-gcore-prpsinfo.patch:
 bfd/elf-bfd.h         |    2 
 bfd/elf.c             |   25 +++++--
 gdb/amd64-linux-nat.c |   15 +++-
 gdb/fbsd-nat.c        |    1 
 gdb/linux-nat.c       |  172 +++++++++++++++++++++++++++++++++++++++++++++++++-
 gdb/linux-nat.h       |    2 
 gdb/procfs.c          |    1 
 7 files changed, 203 insertions(+), 15 deletions(-)

Index: gdb-6.8-bz254229-gcore-prpsinfo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz254229-gcore-prpsinfo.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdb-6.8-bz254229-gcore-prpsinfo.patch	4 Aug 2009 05:37:28 -0000	1.3
+++ gdb-6.8-bz254229-gcore-prpsinfo.patch	10 Sep 2009 21:37:39 -0000	1.4
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20090803/bfd/elf-bfd.h
+Index: gdb-6.8.50.20090910/bfd/elf-bfd.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/bfd/elf-bfd.h	2009-07-23 15:00:20.000000000 +0200
-+++ gdb-6.8.50.20090803/bfd/elf-bfd.h	2009-08-03 17:21:25.000000000 +0200
-@@ -2115,7 +2115,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find
+--- gdb-6.8.50.20090910.orig/bfd/elf-bfd.h	2009-09-09 23:38:57.000000000 +0200
++++ gdb-6.8.50.20090910/bfd/elf-bfd.h	2009-09-10 23:01:15.000000000 +0200
+@@ -2121,7 +2121,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find
  extern char *elfcore_write_note
    (bfd *, char *, int *, const char *, int, const void *, int);
  extern char *elfcore_write_prpsinfo
@@ -11,11 +11,11 @@ Index: gdb-6.8.50.20090803/bfd/elf-bfd.h
  extern char *elfcore_write_prstatus
    (bfd *, char *, int *, long, int, const void *);
  extern char * elfcore_write_pstatus
-Index: gdb-6.8.50.20090803/bfd/elf.c
+Index: gdb-6.8.50.20090910/bfd/elf.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/bfd/elf.c	2009-07-23 15:00:20.000000000 +0200
-+++ gdb-6.8.50.20090803/bfd/elf.c	2009-08-03 17:23:13.000000000 +0200
-@@ -8381,6 +8381,7 @@ char *
+--- gdb-6.8.50.20090910.orig/bfd/elf.c	2009-09-09 23:38:57.000000000 +0200
++++ gdb-6.8.50.20090910/bfd/elf.c	2009-09-10 23:04:17.000000000 +0200
+@@ -8398,6 +8398,7 @@ char *
  elfcore_write_prpsinfo (bfd  *abfd,
  			char *buf,
  			int  *bufsiz,
@@ -23,7 +23,7 @@ Index: gdb-6.8.50.20090803/bfd/elf.c
  			const char *fname,
  			const char *psargs)
  {
-@@ -8407,9 +8408,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
+@@ -8424,9 +8425,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
        int note_type = NT_PRPSINFO;
  #endif
  
@@ -42,7 +42,7 @@ Index: gdb-6.8.50.20090803/bfd/elf.c
        return elfcore_write_note (abfd, buf, bufsiz,
  				 note_name, note_type, &data, sizeof (data));
      }
-@@ -8424,9 +8431,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
+@@ -8441,9 +8448,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
        int note_type = NT_PRPSINFO;
  #endif
  
@@ -61,10 +61,10 @@ Index: gdb-6.8.50.20090803/bfd/elf.c
        return elfcore_write_note (abfd, buf, bufsiz,
  				 note_name, note_type, &data, sizeof (data));
      }
-Index: gdb-6.8.50.20090803/gdb/amd64-linux-nat.c
+Index: gdb-6.8.50.20090910/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/amd64-linux-nat.c	2009-08-03 17:19:57.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/amd64-linux-nat.c	2009-08-03 17:21:25.000000000 +0200
+--- gdb-6.8.50.20090910.orig/gdb/amd64-linux-nat.c	2009-09-10 23:01:07.000000000 +0200
++++ gdb-6.8.50.20090910/gdb/amd64-linux-nat.c	2009-09-10 23:01:15.000000000 +0200
 @@ -140,6 +140,7 @@ static int amd64_linux_gregset32_reg_off
  
  static char *
@@ -98,10 +98,10 @@ Index: gdb-6.8.50.20090803/gdb/amd64-lin
  }
  
  static void
-Index: gdb-6.8.50.20090803/gdb/fbsd-nat.c
+Index: gdb-6.8.50.20090910/gdb/fbsd-nat.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/fbsd-nat.c	2009-07-02 19:21:06.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/fbsd-nat.c	2009-08-03 17:21:25.000000000 +0200
+--- gdb-6.8.50.20090910.orig/gdb/fbsd-nat.c	2009-07-02 19:21:06.000000000 +0200
++++ gdb-6.8.50.20090910/gdb/fbsd-nat.c	2009-09-10 23:01:15.000000000 +0200
 @@ -211,6 +211,7 @@ fbsd_make_corefile_notes (bfd *obfd, int
  	psargs = reconcat (psargs, psargs, " ", get_inferior_args (), NULL);
  
@@ -110,10 +110,10 @@ Index: gdb-6.8.50.20090803/gdb/fbsd-nat.
  					  fname, psargs);
      }
  
-Index: gdb-6.8.50.20090803/gdb/linux-nat.c
+Index: gdb-6.8.50.20090910/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-03 17:19:56.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-03 17:24:03.000000000 +0200
+--- gdb-6.8.50.20090910.orig/gdb/linux-nat.c	2009-09-10 23:01:06.000000000 +0200
++++ gdb-6.8.50.20090910/gdb/linux-nat.c	2009-09-10 23:01:15.000000000 +0200
 @@ -55,6 +55,7 @@
  #include "xml-support.h"
  #include "terminal.h"
@@ -131,7 +131,7 @@ Index: gdb-6.8.50.20090803/gdb/linux-nat
  char *(*linux_elfcore_write_prstatus)
    (bfd *, char *, int *, long, int, const void *) = elfcore_write_prstatus;
  static char *
-@@ -3840,6 +3841,159 @@ linux_spu_make_corefile_notes (bfd *obfd
+@@ -3946,6 +3947,159 @@ linux_spu_make_corefile_notes (bfd *obfd
    return args.note_data;
  }
  
@@ -291,7 +291,7 @@ Index: gdb-6.8.50.20090803/gdb/linux-nat
  /* Fills the "to_make_corefile_note" target vector.  Builds the note
     section for a corefile, and returns it in a malloc buffer.  */
  
-@@ -3860,8 +4014,14 @@ linux_nat_make_corefile_notes (bfd *obfd
+@@ -3966,8 +4120,14 @@ linux_nat_make_corefile_notes (bfd *obfd
  
    if (get_exec_file (0))
      {
@@ -306,7 +306,7 @@ Index: gdb-6.8.50.20090803/gdb/linux-nat
        if (get_inferior_args ())
  	{
  	  char *string_end;
-@@ -3877,9 +4037,15 @@ linux_nat_make_corefile_notes (bfd *obfd
+@@ -3983,9 +4143,15 @@ linux_nat_make_corefile_notes (bfd *obfd
  		       psargs_end - string_end);
  	    }
  	}
@@ -324,11 +324,11 @@ Index: gdb-6.8.50.20090803/gdb/linux-nat
      }
  
    /* Dump information for threads.  */
-Index: gdb-6.8.50.20090803/gdb/linux-nat.h
+Index: gdb-6.8.50.20090910/gdb/linux-nat.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/linux-nat.h	2009-08-03 17:19:56.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/linux-nat.h	2009-08-03 17:21:25.000000000 +0200
-@@ -148,7 +148,7 @@ struct siginfo *linux_nat_get_siginfo (p
+--- gdb-6.8.50.20090910.orig/gdb/linux-nat.h	2009-09-10 23:01:06.000000000 +0200
++++ gdb-6.8.50.20090910/gdb/linux-nat.h	2009-09-10 23:01:15.000000000 +0200
+@@ -154,7 +154,7 @@ struct siginfo *linux_nat_get_siginfo (p
  /* These functions make elfcore note sections.
     They may get overriden by code adjusting data for multi-target builds.  */
  extern char *(*linux_elfcore_write_prpsinfo)
@@ -337,10 +337,10 @@ Index: gdb-6.8.50.20090803/gdb/linux-nat
  extern char *(*linux_elfcore_write_prstatus)
    (bfd *, char *, int *, long, int, const void *);
  extern char *(*linux_elfcore_write_prfpreg)
-Index: gdb-6.8.50.20090803/gdb/procfs.c
+Index: gdb-6.8.50.20090910/gdb/procfs.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/procfs.c	2009-08-01 02:02:04.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/procfs.c	2009-08-03 17:21:25.000000000 +0200
+--- gdb-6.8.50.20090910.orig/gdb/procfs.c	2009-08-01 02:02:04.000000000 +0200
++++ gdb-6.8.50.20090910/gdb/procfs.c	2009-09-10 23:01:15.000000000 +0200
 @@ -6147,6 +6147,7 @@ procfs_make_note_section (bfd *obfd, int
    note_data = (char *) elfcore_write_prpsinfo (obfd,
  					       note_data,

gdb-6.8-bz457187-largefile.patch:
 config.in    |    6 +
 configure    |  200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |    1 
 3 files changed, 207 insertions(+)

Index: gdb-6.8-bz457187-largefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz457187-largefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-6.8-bz457187-largefile.patch	4 Aug 2009 05:37:28 -0000	1.2
+++ gdb-6.8-bz457187-largefile.patch	10 Sep 2009 21:37:39 -0000	1.3
@@ -5,33 +5,30 @@ gdb/
 	* config.in: Regenerate.
 	* configure: Regenerate.
 
-Index: gdb-6.8.50.20090803/gdb/configure.ac
+Index: gdb-6.8.50.20090909/gdb/configure.ac
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/configure.ac	2009-08-04 06:32:39.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/configure.ac	2009-08-04 06:33:51.000000000 +0200
-@@ -30,6 +30,7 @@ AC_GNU_SOURCE
- AC_AIX
- AC_ISC_POSIX
+--- gdb-6.8.50.20090909.orig/gdb/configure.ac	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/configure.ac	2009-09-09 20:11:04.000000000 +0200
+@@ -28,6 +28,7 @@ AM_MAINTAINER_MODE
+ AC_PROG_CC
+ AC_USE_SYSTEM_EXTENSIONS
  gl_EARLY
 +AC_SYS_LARGEFILE
  AM_PROG_CC_STDC
  
  AC_CONFIG_AUX_DIR(..)
-Index: gdb-6.8.50.20090803/gdb/config.in
+Index: gdb-6.8.50.20090909/gdb/config.in
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/config.in	2009-08-04 06:32:39.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/config.in	2009-08-04 06:33:51.000000000 +0200
-@@ -744,6 +744,9 @@
- # undef _ALL_SOURCE
+--- gdb-6.8.50.20090909.orig/gdb/config.in	2009-09-09 20:08:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/config.in	2009-09-09 20:11:33.000000000 +0200
+@@ -751,10 +751,16 @@
+ # endif
  #endif
  
 +/* Number of bits in a file offset, on hosts where this is settable. */
 +#undef _FILE_OFFSET_BITS
 +
- /* Enable GNU extensions on systems that have them.  */
- #ifndef _GNU_SOURCE
- # undef _GNU_SOURCE
-@@ -753,6 +756,9 @@
+ /* Define to 1 so <sys/proc.h> gets a definition of anon_hdl. Works around a
     <sys/proc.h> problem on IRIX 5. */
  #undef _KMEMUSER
  
@@ -41,11 +38,19 @@ Index: gdb-6.8.50.20090803/gdb/config.in
  /* Define to 1 if on MINIX. */
  #undef _MINIX
  
-Index: gdb-6.8.50.20090803/gdb/configure
+Index: gdb-6.8.50.20090909/gdb/configure
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/configure	2009-08-04 06:32:39.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/configure	2009-08-04 06:33:51.000000000 +0200
-@@ -874,6 +874,7 @@ Optional Features:
+--- gdb-6.8.50.20090909.orig/gdb/configure	2009-09-09 20:10:45.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/configure	2009-09-09 20:11:07.000000000 +0200
+@@ -884,6 +884,7 @@ ac_subst_files='host_makefile_frag'
+ ac_user_opts='
+ enable_option_checking
+ enable_maintainer_mode
++enable_largefile
+ enable_dependency_tracking
+ with_separate_debug_dir
+ with_gdb_datadir
+@@ -1562,6 +1563,7 @@ Optional Features:
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-maintainer-mode  enable make rules and dependencies not useful
  			  (and sometimes confusing) to the casual installer
@@ -53,33 +58,29 @@ Index: gdb-6.8.50.20090803/gdb/configure
    --disable-dependency-tracking  speeds up one-time build
    --enable-dependency-tracking   do not reject slow dependency extractors
    --enable-targets=TARGETS
-@@ -3347,6 +3348,370 @@ _ACEOF
+@@ -4100,6 +4102,204 @@ fi
  
  
  
-+# Check whether --enable-largefile or --disable-largefile was given.
-+if test "${enable_largefile+set}" = set; then
-+  enableval="$enable_largefile"
++# Check whether --enable-largefile was given.
++if test "${enable_largefile+set}" = set; then :
++  enableval=$enable_largefile;
++fi
 +
-+fi;
 +if test "$enable_largefile" != no; then
 +
-+  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_largefile_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
++$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
++if test "${ac_cv_sys_largefile_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  ac_cv_sys_largefile_CC=no
 +     if test "$GCC" != yes; then
 +       ac_save_CC=$CC
 +       while :; do
-+     	 # IRIX 6.2 and later do not support large files by default,
-+     	 # so use the C compiler's -n32 option if that helps.
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++	 # IRIX 6.2 and later do not support large files by default,
++	 # so use the C compiler's -n32 option if that helps.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/types.h>
 + /* Check that off_t can represent 2**63 - 1 correctly.
@@ -98,89 +99,34 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+     	 rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++	 if ac_fn_c_try_compile "$LINENO"; then :
 +  break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +fi
-+rm -f conftest.err conftest.$ac_objext
-+     	 CC="$CC -n32"
-+     	 rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++rm -f core conftest.err conftest.$ac_objext
++	 CC="$CC -n32"
++	 if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_sys_largefile_CC=' -n32'; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +fi
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
 +	 break
 +       done
 +       CC=$ac_save_CC
 +       rm -f conftest.$ac_ext
 +    fi
 +fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
++$as_echo "$ac_cv_sys_largefile_CC" >&6; }
 +  if test "$ac_cv_sys_largefile_CC" != no; then
 +    CC=$CC$ac_cv_sys_largefile_CC
 +  fi
 +
-+  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
++if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  while :; do
-+  ac_cv_sys_file_offset_bits=no
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/types.h>
 + /* Check that off_t can represent 2**63 - 1 correctly.
@@ -199,40 +145,11 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_file_offset_bits=no; break
 +fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#define _FILE_OFFSET_BITS 64
 +#include <sys/types.h>
@@ -252,60 +169,33 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_sys_file_offset_bits=64; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_file_offset_bits=unknown
 +  break
 +done
 +fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
++$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
++case $ac_cv_sys_file_offset_bits in #(
++  no | unknown) ;;
++  *)
 +cat >>confdefs.h <<_ACEOF
 +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 +_ACEOF
-+
-+fi
-+rm -f conftest*
-+  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_large_files+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++;;
++esac
++rm -rf conftest*
++  if test $ac_cv_sys_file_offset_bits = unknown; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
++$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
++if test "${ac_cv_sys_large_files+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  while :; do
-+  ac_cv_sys_large_files=no
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/types.h>
 + /* Check that off_t can represent 2**63 - 1 correctly.
@@ -324,40 +214,11 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_large_files=no; break
 +fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#define _LARGE_FILES 1
 +#include <sys/types.h>
@@ -377,48 +238,26 @@ Index: gdb-6.8.50.20090803/gdb/configure
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_sys_large_files=1; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
 +fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_large_files=unknown
 +  break
 +done
 +fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-+if test "$ac_cv_sys_large_files" != no; then
-+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
++$as_echo "$ac_cv_sys_large_files" >&6; }
++case $ac_cv_sys_large_files in #(
++  no | unknown) ;;
++  *)
 +cat >>confdefs.h <<_ACEOF
 +#define _LARGE_FILES $ac_cv_sys_large_files
 +_ACEOF
-+
-+fi
-+rm -f conftest*
++;;
++esac
++rm -rf conftest*
++  fi
 +fi
 +
  

gdb-6.8-bz466901-backtrace-full-prelinked.patch:
 dwarf2loc.c                                       |    4 
 testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S |  328 ++++++++++++++++++++++
 testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c |   26 +
 testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp    |  102 ++++++
 4 files changed, 459 insertions(+), 1 deletion(-)

Index: gdb-6.8-bz466901-backtrace-full-prelinked.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz466901-backtrace-full-prelinked.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.8-bz466901-backtrace-full-prelinked.patch	4 Aug 2009 05:37:28 -0000	1.5
+++ gdb-6.8-bz466901-backtrace-full-prelinked.patch	10 Sep 2009 21:37:39 -0000	1.6
@@ -1,9 +1,9 @@
 Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 
-Index: gdb-6.8.50.20090803/gdb/dwarf2loc.c
+Index: gdb-6.8.50.20090909/gdb/dwarf2loc.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/dwarf2loc.c	2009-08-04 06:29:47.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/dwarf2loc.c	2009-08-04 06:33:35.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/dwarf2loc.c	2009-09-09 20:08:03.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/dwarf2loc.c	2009-09-09 20:10:35.000000000 +0200
 @@ -56,7 +56,9 @@ find_location_expression (struct dwarf2_
    CORE_ADDR low, high;
    gdb_byte *loc_ptr, *buf_end;
@@ -15,10 +15,10 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2loc
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
    enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
    unsigned int addr_size = dwarf2_per_cu_addr_size (baton->per_cu);
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp	2009-08-04 06:33:35.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp	2009-09-09 20:10:35.000000000 +0200
 @@ -0,0 +1,102 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -122,10 +122,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
 +
 +# `abort' can get expressed as `*__GI_abort'.
 +gdb_test "bt full" "in \[^ \]*abort \\(.*in func \\(.*\r\n\[\t \]+i = -?\[0-9\].*in main \\(.*" "Backtrace after abort()"
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c	2009-08-04 06:33:35.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c	2009-09-09 20:10:35.000000000 +0200
 @@ -0,0 +1,26 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -153,10 +153,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
 +  func ();
 +  return 0;
 +}
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S	2009-08-04 06:33:35.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S	2009-09-09 20:10:35.000000000 +0200
 @@ -0,0 +1,328 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

gdb-6.8-inlining-addon.patch:
 breakpoint.c                        |   35 +++++++++++++---
 dwarf2read.c                        |    6 ++
 frame.c                             |    8 ++-
 gdbthread.h                         |    6 ++
 infcmd.c                            |   76 ++++++++++++++++++++++++++----------
 inline-frame.c                      |   34 +++++++++++++---
 inline-frame.h                      |    4 +
 target.c                            |    1 
 testsuite/gdb.opt/inline-bt.c       |   10 +++-
 testsuite/gdb.opt/inline-cmds.c     |   10 +++-
 testsuite/gdb.opt/inline-cmds.exp   |   28 ++++++-------
 testsuite/gdb.opt/inline-locals.c   |    9 +++-
 testsuite/gdb.opt/inline-locals.exp |    6 ++
 testsuite/gdb.opt/inline-markers.c  |    5 --
 14 files changed, 176 insertions(+), 62 deletions(-)

Index: gdb-6.8-inlining-addon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining-addon.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gdb-6.8-inlining-addon.patch	4 Aug 2009 05:37:28 -0000	1.7
+++ gdb-6.8-inlining-addon.patch	10 Sep 2009 21:37:39 -0000	1.8
@@ -5,10 +5,10 @@ causing: FAIL: gdb.base/unwindonsignal.e
 resume() -> target_resume() move of clear_inline_frame_state() is for:
 gdb.mi/mi-nsmoribund.exp
 
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-bt.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-bt.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-bt.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-bt.c	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-bt.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-bt.c	2009-09-09 19:20:00.000000000 +0200
 @@ -13,10 +13,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -28,10 +28,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
  
  inline int func1(void)
  {
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-cmds.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.c	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-cmds.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.c	2009-09-09 19:20:00.000000000 +0200
 @@ -13,13 +13,19 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -54,10 +54,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
  inline int func1(void)
  {
    bar ();
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.exp
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-09-09 19:20:00.000000000 +0200
 @@ -230,7 +230,7 @@ set line3 [gdb_get_line_number "set brea
  gdb_breakpoint $line3
  gdb_continue_to_breakpoint "consecutive func1"
@@ -110,10 +110,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
 +gdb_test "info frame" "inlined into frame.*" "outer_inline2 inlined"
 +gdb_test "fini" "" "up from outer_inline2"
 +gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined"
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-locals.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.c	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-locals.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.c	2009-09-09 19:20:00.000000000 +0200
 @@ -13,11 +13,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -133,10 +133,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
  
  inline int func1(int arg1)
  {
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.exp
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.exp
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-locals.exp	2009-06-30 17:50:27.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.exp	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-locals.exp	2009-06-30 17:50:27.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.exp	2009-09-09 19:20:00.000000000 +0200
 @@ -77,6 +77,9 @@ if { ! $no_frames } {
  
  # Make sure that locals on the stack are found.  This is an array to
@@ -155,10 +155,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
 +    setup_kfail *-*-* "gcc/debug.optimization"
 +}
  gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)"
-Index: gdb-6.8.50.20090803/gdb/frame.c
+Index: gdb-6.8.50.20090909/gdb/frame.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/frame.c	2009-08-03 15:56:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/frame.c	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/frame.c	2009-09-09 19:06:46.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/frame.c	2009-09-09 19:20:00.000000000 +0200
 @@ -276,7 +276,7 @@ fprint_frame (struct ui_file *file, stru
  static struct frame_info *
  skip_inlined_frames (struct frame_info *frame)
@@ -195,19 +195,19 @@ Index: gdb-6.8.50.20090803/gdb/frame.c
  	{
  	  sal->symtab = SYMBOL_SYMTAB (sym);
  	  sal->line = SYMBOL_LINE (sym);
-Index: gdb-6.8.50.20090803/gdb/breakpoint.c
+Index: gdb-6.8.50.20090909/gdb/breakpoint.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/breakpoint.c	2009-08-03 16:56:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/breakpoint.c	2009-08-03 17:19:24.000000000 +0200
-@@ -60,6 +60,7 @@
- #include "wrapper.h"
+--- gdb-6.8.50.20090909.orig/gdb/breakpoint.c	2009-09-09 19:19:46.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/breakpoint.c	2009-09-09 19:21:14.000000000 +0200
+@@ -61,6 +61,7 @@
  #include "valprint.h"
+ #include "jit.h"
  #include "parser-defs.h"
 +#include "inline-frame.h"
  
  /* readline include files */
  #include "readline/readline.h"
-@@ -3065,10 +3066,24 @@ bpstat_check_breakpoint_conditions (bpst
+@@ -3217,10 +3218,24 @@ bpstat_check_breakpoint_conditions (bpst
    const struct bp_location *bl = bs->breakpoint_at;
    struct breakpoint *b = bl->owner;
  
@@ -236,7 +236,7 @@ Index: gdb-6.8.50.20090803/gdb/breakpoin
      {
        int value_is_zero = 0;
        
-@@ -3215,6 +3230,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -3380,6 +3395,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  	    bs->print = 0;
  	  }
  	bs->commands = copy_command_lines (bs->commands);
@@ -249,7 +249,7 @@ Index: gdb-6.8.50.20090803/gdb/breakpoin
        }
  
      /* Print nothing for this entry if we dont stop or if we dont print.  */
-@@ -5164,9 +5185,9 @@ set_momentary_breakpoint (struct gdbarch
+@@ -5278,9 +5299,9 @@ set_momentary_breakpoint (struct gdbarch
  {
    struct breakpoint *b;
  
@@ -262,10 +262,10 @@ Index: gdb-6.8.50.20090803/gdb/breakpoin
  
    b = set_raw_breakpoint (gdbarch, sal, type);
    b->enable_state = bp_enabled;
-Index: gdb-6.8.50.20090803/gdb/inline-frame.c
+Index: gdb-6.8.50.20090909/gdb/inline-frame.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/inline-frame.c	2009-06-28 02:20:22.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/inline-frame.c	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/inline-frame.c	2009-06-28 02:20:22.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/inline-frame.c	2009-09-09 19:20:00.000000000 +0200
 @@ -195,6 +195,12 @@ inline_frame_sniffer (const struct frame
    if (frame_block == NULL)
      return 0;
@@ -342,10 +342,10 @@ Index: gdb-6.8.50.20090803/gdb/inline-fr
  /* Return the number of hidden functions inlined into the current
     frame.  */
  
-Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-markers.c
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-markers.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-markers.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-markers.c	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-markers.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-markers.c	2009-09-09 19:20:00.000000000 +0200
 @@ -15,11 +15,6 @@
  
  extern int x, y;
@@ -358,11 +358,11 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
  void marker(void)
  {
    x += y; /* set breakpoint 2 here */
-Index: gdb-6.8.50.20090803/gdb/gdbthread.h
+Index: gdb-6.8.50.20090909/gdb/gdbthread.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/gdbthread.h	2009-08-03 15:55:53.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/gdbthread.h	2009-08-03 16:57:40.000000000 +0200
-@@ -187,6 +187,12 @@ struct thread_info
+--- gdb-6.8.50.20090909.orig/gdb/gdbthread.h	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/gdbthread.h	2009-09-09 19:20:00.000000000 +0200
+@@ -191,6 +191,12 @@ struct thread_info
  
    /* Private data used by the target vector implementation.  */
    struct private_thread_info *private;
@@ -375,11 +375,11 @@ Index: gdb-6.8.50.20090803/gdb/gdbthread
  };
  
  /* Create an empty thread list, or empty the existing one.  */
-Index: gdb-6.8.50.20090803/gdb/infcmd.c
+Index: gdb-6.8.50.20090909/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/infcmd.c	2009-07-02 23:57:27.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/infcmd.c	2009-08-03 17:17:24.000000000 +0200
-@@ -1408,11 +1408,11 @@ finish_command_continuation (void *arg)
+--- gdb-6.8.50.20090909.orig/gdb/infcmd.c	2009-09-09 19:05:56.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/infcmd.c	2009-09-09 19:20:33.000000000 +0200
+@@ -1434,11 +1434,11 @@ finish_command_continuation (void *arg)
        struct type *value_type;
  
        value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (a->function));
@@ -393,9 +393,9 @@ Index: gdb-6.8.50.20090803/gdb/infcmd.c
  	print_return_value (SYMBOL_TYPE (a->function), value_type);
      }
  
-@@ -1514,6 +1514,16 @@ finish_forward (struct symbol *function,
- 
-   old_chain = make_cleanup_delete_breakpoint (breakpoint);
+@@ -1546,6 +1546,16 @@ finish_forward (struct symbol *function,
+   tp->initiating_frame = get_frame_id (frame);
+   make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
  
 +  /* We should _always_ set CURRENT_PC_IS_NOTCURRENT here to always see the
 +     calling line with the message `Value returned is ...'.  Currently it is
@@ -410,7 +410,7 @@ Index: gdb-6.8.50.20090803/gdb/infcmd.c
    tp->proceed_to_finish = 1;    /* We want stop_registers, please...  */
    proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
  
-@@ -1535,7 +1545,9 @@ finish_forward (struct symbol *function,
+@@ -1567,7 +1577,9 @@ finish_forward (struct symbol *function,
  static void
  finish_command (char *arg, int from_tty)
  {
@@ -421,7 +421,7 @@ Index: gdb-6.8.50.20090803/gdb/infcmd.c
    struct symbol *function;
  
    int async_exec = 0;
-@@ -1566,45 +1578,63 @@ finish_command (char *arg, int from_tty)
+@@ -1598,45 +1610,63 @@ finish_command (char *arg, int from_tty)
    if (!target_has_execution)
      error (_("The program is not running."));
  
@@ -502,7 +502,7 @@ Index: gdb-6.8.50.20090803/gdb/infcmd.c
  
    /* Print info on the selected frame, including level number but not
       source.  */
-@@ -1618,10 +1648,14 @@ finish_command (char *arg, int from_tty)
+@@ -1650,10 +1680,14 @@ finish_command (char *arg, int from_tty)
        print_stack_frame (get_selected_frame (NULL), 1, LOCATION);
      }
  
@@ -518,22 +518,22 @@ Index: gdb-6.8.50.20090803/gdb/infcmd.c
  }
  

  
-Index: gdb-6.8.50.20090803/gdb/target.c
+Index: gdb-6.8.50.20090909/gdb/target.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/target.c	2009-08-03 16:04:15.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/target.c	2009-08-03 16:57:40.000000000 +0200
-@@ -2079,6 +2079,7 @@ target_resume (ptid_t ptid, int step, en
+--- gdb-6.8.50.20090909.orig/gdb/target.c	2009-09-09 19:09:31.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/target.c	2009-09-09 19:21:00.000000000 +0200
+@@ -2182,6 +2182,7 @@ target_resume (ptid_t ptid, int step, en
  {
    struct target_ops *t;
  
 +  clear_inline_frame_state (ptid);
-   dcache_invalidate (target_dcache);
+   target_dcache_invalidate ();
  
    for (t = current_target.beneath; t != NULL; t = t->beneath)
-Index: gdb-6.8.50.20090803/gdb/inline-frame.h
+Index: gdb-6.8.50.20090909/gdb/inline-frame.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/inline-frame.h	2009-06-28 02:20:22.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/inline-frame.h	2009-08-03 16:57:40.000000000 +0200
+--- gdb-6.8.50.20090909.orig/gdb/inline-frame.h	2009-06-28 02:20:22.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/inline-frame.h	2009-09-09 19:20:00.000000000 +0200
 @@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt
  
  void step_into_inline_frame (ptid_t ptid);
@@ -545,11 +545,11 @@ Index: gdb-6.8.50.20090803/gdb/inline-fr
  /* Return the number of hidden functions inlined into the current
     frame.  */
  
-Index: gdb-6.8.50.20090803/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090909/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/dwarf2read.c	2009-08-03 16:56:10.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/dwarf2read.c	2009-08-03 16:57:40.000000000 +0200
-@@ -4107,6 +4107,7 @@ read_func_scope (struct die_info *die, s
+--- gdb-6.8.50.20090909.orig/gdb/dwarf2read.c	2009-09-09 19:19:46.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/dwarf2read.c	2009-09-09 19:20:00.000000000 +0200
+@@ -4130,6 +4130,7 @@ read_func_scope (struct die_info *die, s
    struct block *block;
    unsigned die_children = 0;
    int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
@@ -557,7 +557,7 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
  
    if (inlined_func)
      {
-@@ -4148,7 +4149,10 @@ read_func_scope (struct die_info *die, s
+@@ -4171,7 +4172,10 @@ read_func_scope (struct die_info *die, s
    add_to_cu_func_list (name, lowpc, highpc, cu);
  
    new = push_context (0, lowpc);

gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  763 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  275 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  642 +++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   18 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   65 
 dwarf2loc.c                                              |  314 ++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1740 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  596 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  185 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  176 +
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 -
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   41 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   72 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-break.exp                            |    2 
 testsuite/gdb.mi/mi-var-block.exp                        |    2 
 testsuite/gdb.mi/mi-var-child.exp                        |   30 
 testsuite/gdb.mi/mi-var-cmd.exp                          |   38 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi-var-invalidate.exp                   |    6 
 testsuite/gdb.mi/mi2-var-block.exp                       |    2 
 testsuite/gdb.mi/mi2-var-child.exp                       |   30 
 testsuite/gdb.mi/mi2-var-cmd.exp                         |   28 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-mi.exp                           |  150 +
 testsuite/gdb.python/py-prettyprint.c                    |   44 
 testsuite/gdb.python/py-prettyprint.exp                  |   11 
 testsuite/gdb.python/py-prettyprint.py                   |   29 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |  100 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |  769 ++++--
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 256 files changed, 19669 insertions(+), 2857 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.28 -r 1.29 gdb-archer.patchIndex: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gdb-archer.patch	3 Sep 2009 19:45:38 -0000	1.28
+++ gdb-archer.patch	10 Sep 2009 21:37:39 -0000	1.29
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit a081d2f12945e9468edd5f4341d3e945bd0fefe9
+commit 941eb487a42933e442cb4d11344cda96ecb8a04d
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -14,10 +14,12 @@ archer-keiths-expr-cumulative
 archer-tromey-python
 archer-jankratochvil-fortran-module
 archer-jankratochvil-watchpoint
+archer-jankratochvil-bp_location-accel
+archer-pmuldoon-next-over-throw
 
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 9c2b9c7..032b0cf 100644
+index 7f2fe58..ac3a4a0 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
 @@ -166,6 +166,13 @@ INTL_CFLAGS = @INCINTL@
@@ -38,50 +40,50 @@ index 9c2b9c7..032b0cf 100644
  #
  SUBDIR_PYTHON_OBS = \
  	python.o \
-+	python-block.o \
-+	python-breakpoint.o \
- 	python-cmd.o \
- 	python-frame.o \
- 	python-function.o \
-+	python-hooks.o \
-+	python-inferior.o \
-+	python-infthread.o \
- 	python-objfile.o \
-+	python-param.o \
- 	python-prettyprint.o \
-+	python-symbol.o \
-+	python-symtab.o \
- 	python-type.o \
- 	python-utils.o \
- 	python-value.o
++	py-block.o \
++	py-breakpoint.o \
+ 	py-cmd.o \
+ 	py-frame.o \
+ 	py-function.o \
++	py-hooks.o \
++	py-inferior.o \
++	py-infthread.o \
+ 	py-objfile.o \
++	py-param.o \
+ 	py-prettyprint.o \
++	py-symbol.o \
++	py-symtab.o \
+ 	py-type.o \
+ 	py-utils.o \
+ 	py-value.o
  SUBDIR_PYTHON_SRCS = \
  	python/python.c \
-+	python/python-block.c \
-+	python/python-breakpoint.c \
- 	python/python-cmd.c \
- 	python/python-frame.c \
- 	python/python-function.c \
-+	python/python-hooks.c \
-+	python/python-inferior.c \
-+	python/python-infthread.c \
- 	python/python-objfile.c \
-+	python/python-param.c \
- 	python/python-prettyprint.c \
-+	python/python-symbol.c \
-+	python/python-symtab.c \
- 	python/python-type.c \
- 	python/python-utils.c \
- 	python/python-value.c
-@@ -745,7 +768,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
++	python/py-block.c \
++	python/py-breakpoint.c \
+ 	python/py-cmd.c \
+ 	python/py-frame.c \
+ 	python/py-function.c \
++	python/py-hooks.c \
++	python/py-inferior.c \
++	python/py-infthread.c \
+ 	python/py-objfile.c \
++	python/py-param.c \
+ 	python/py-prettyprint.c \
++	python/py-symbol.c \
++	python/py-symtab.c \
+ 	python/py-type.c \
+ 	python/py-utils.c \
+ 	python/py-value.c
+@@ -746,7 +769,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
  annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h	\
  remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
  sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
--gdb_usleep.h
-+gdb_usleep.h python/python.h python/python-internal.h
+-gdb_usleep.h jit.h
++gdb_usleep.h jit.h python/python.h python/python-internal.h
  
  # Header files that already have srcdir in them, or which are in objdir.
  
-@@ -862,7 +885,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c \
+@@ -864,7 +887,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c \
  	$(COMPILE) $<
  	$(POSTCOMPILE)
  
@@ -90,7 +92,7 @@ index 9c2b9c7..032b0cf 100644
  	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
  .PHONY: all-tui
  all-tui: $(TUI)$(EXEEXT)
-@@ -1218,6 +1241,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -1221,6 +1244,12 @@ stamp-h: $(srcdir)/config.in config.status
  	  CONFIG_LINKS= \
  	  $(SHELL) config.status
  
@@ -103,62 +105,62 @@ index 9c2b9c7..032b0cf 100644
  config.status: $(srcdir)/configure configure.tgt configure.host
  	$(SHELL) config.status --recheck
  
-@@ -1917,6 +1946,14 @@ python.o: $(srcdir)/python/python.c
+@@ -1920,6 +1949,14 @@ python.o: $(srcdir)/python/python.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c
  	$(POSTCOMPILE)
  
-+python-block.o: $(srcdir)/python/python-block.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-block.c
++py-block.o: $(srcdir)/python/py-block.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-block.c
 +	$(POSTCOMPILE)
 +
-+python-breakpoint.o: $(srcdir)/python/python-breakpoint.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-breakpoint.c
++py-breakpoint.o: $(srcdir)/python/py-breakpoint.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-breakpoint.c
 +	$(POSTCOMPILE)
 +
- python-cmd.o: $(srcdir)/python/python-cmd.c
- 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-cmd.c
+ py-cmd.o: $(srcdir)/python/py-cmd.c
+ 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-cmd.c
  	$(POSTCOMPILE)
-@@ -1929,14 +1966,38 @@ python-function.o: $(srcdir)/python/python-function.c
- 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-function.c
+@@ -1932,14 +1969,38 @@ py-function.o: $(srcdir)/python/py-function.c
+ 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-function.c
  	$(POSTCOMPILE)
  
-+python-hooks.o: $(srcdir)/python/python-hooks.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-hooks.c
++py-hooks.o: $(srcdir)/python/py-hooks.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-hooks.c
 +	$(POSTCOMPILE)
 +
-+python-inferior.o: $(srcdir)/python/python-inferior.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-inferior.c
++py-inferior.o: $(srcdir)/python/py-inferior.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-inferior.c
 +	$(POSTCOMPILE)
 +
-+python-infthread.o: $(srcdir)/python/python-infthread.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-infthread.c
++py-infthread.o: $(srcdir)/python/py-infthread.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-infthread.c
 +	$(POSTCOMPILE)
 +
- python-objfile.o: $(srcdir)/python/python-objfile.c
- 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-objfile.c
+ py-objfile.o: $(srcdir)/python/py-objfile.c
+ 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-objfile.c
  	$(POSTCOMPILE)
  
-+python-param.o: $(srcdir)/python/python-param.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-param.c
++py-param.o: $(srcdir)/python/py-param.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-param.c
 +	$(POSTCOMPILE)
 +
- python-prettyprint.o: $(srcdir)/python/python-prettyprint.c
- 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-prettyprint.c
+ py-prettyprint.o: $(srcdir)/python/py-prettyprint.c
+ 	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-prettyprint.c
  	$(POSTCOMPILE)
  
-+python-symbol.o: $(srcdir)/python/python-symbol.c
-+	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-symbol.c
++py-symbol.o: $(srcdir)/python/py-symbol.c
++	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-symbol.c
 +	$(POSTCOMPILE)
[...8159 lines suppressed...]
  
-@@ -1082,6 +1220,12 @@ varobj_get_attributes (struct varobj *var)
+@@ -1089,6 +1231,12 @@ varobj_get_attributes (struct varobj *var)
    return attributes;
  }
  
@@ -29821,7 +31086,7 @@ index fbe8ff8..490ca33 100644
  char *
  varobj_get_formatted_value (struct varobj *var,
  			    enum varobj_display_formats format)
-@@ -1159,6 +1303,116 @@ varobj_set_value (struct varobj *var, char *expression)
+@@ -1166,6 +1314,116 @@ varobj_set_value (struct varobj *var, char *expression)
    return 1;
  }
  
@@ -29938,7 +31203,7 @@ index fbe8ff8..490ca33 100644
  /* Assign a new value to a variable object.  If INITIAL is non-zero,
     this is the first assignement after the variable object was just
     created, or changed type.  In that case, just assign the value 
-@@ -1199,10 +1453,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1206,10 +1464,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
       that in C++ a reference is not rebindable, it cannot
       meaningfully change.  So, get hold of the real value.  */
    if (value)
@@ -29950,7 +31215,7 @@ index fbe8ff8..490ca33 100644
  
    if (var->type && TYPE_CODE (var->type) == TYPE_CODE_UNION)
      /* For unions, we need to fetch the value implicitly because
-@@ -1249,7 +1500,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1256,7 +1511,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
       values.  Don't get string rendering if the value is
       lazy -- if it is, the code above has decided that the value
       should not be fetched.  */
@@ -29959,7 +31224,7 @@ index fbe8ff8..490ca33 100644
      print_value = value_get_print_value (value, var->format, var);
  
    /* If the type is changeable, compare the old and the new values.
-@@ -1265,7 +1516,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1272,7 +1527,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
  	{
  	  changed = 1;
  	}
@@ -29968,7 +31233,7 @@ index fbe8ff8..490ca33 100644
  	{
  	  /* Try to compare the values.  That requires that both
  	     values are non-lazy.  */
-@@ -1310,74 +1561,53 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1317,74 +1572,53 @@ install_new_value (struct varobj *var, struct value *value, int initial)
    if (var->value != NULL && var->value != value)
      value_free (var->value);
    var->value = value;
@@ -30075,7 +31340,7 @@ index fbe8ff8..490ca33 100644
  }
  
  void 
-@@ -1395,31 +1625,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
+@@ -1402,31 +1636,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
    make_cleanup_py_decref (globals);
  
    constructor = PyRun_String (visualizer, Py_eval_input, globals, globals);
@@ -30113,7 +31378,7 @@ index fbe8ff8..490ca33 100644
  
    do_cleanups (back_to);
  #else
-@@ -1530,44 +1748,63 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+@@ -1537,44 +1759,74 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
  
        /* We probably should not get children of a varobj that has a
  	 pretty-printer, but for which -var-list-children was never
@@ -30123,7 +31388,7 @@ index fbe8ff8..490ca33 100644
        if (v->pretty_printer)
  	{
 -	  VEC (varobj_p) *changed = 0, *new_and_unchanged = 0;
-+	  VEC (varobj_p) *changed = 0, *new = 0;
++	  VEC (varobj_p) *changed = 0, *new = 0, *unchanged = 0;
  	  int i, children_changed;
  	  varobj_p tmp;
  
@@ -30145,7 +31410,8 @@ index fbe8ff8..490ca33 100644
 +		 it.  */
 +	      if (!varobj_has_more (v, 0))
 +		{
-+		  update_dynamic_varobj_children (v, NULL, NULL, &dummy, 0, 0);
++		  update_dynamic_varobj_children (v, NULL, NULL, NULL,
++						  &dummy, 0, 0);
 +		  if (varobj_has_more (v, 0))
 +		    r.changed = 1;
 +		}
@@ -30160,7 +31426,7 @@ index fbe8ff8..490ca33 100644
  	     a non-conforming pretty-printer, so we skip it.  */
 -	  if (update_dynamic_varobj_children (v, &changed, &new_and_unchanged,
 -					      &children_changed))
-+	  if (update_dynamic_varobj_children (v, &changed, &new,
++	  if (update_dynamic_varobj_children (v, &changed, &new, &unchanged,
 +					      &children_changed, 1, v->to))
  	    {
 -	      if (children_changed)
@@ -30185,17 +31451,27 @@ index fbe8ff8..490ca33 100644
  		  r.value_installed = 1;
  		  VEC_safe_push (varobj_update_result, stack, &r);
  		}
++	      for (i = 0; VEC_iterate (varobj_p, unchanged, i, tmp); ++i)
++	      	{
++	      	  if (!tmp->frozen)
++	      	    {
++	      	      varobj_update_result r = {tmp};
++	      	      r.value_installed = 1;
++	      	      VEC_safe_push (varobj_update_result, stack, &r);
++	      	    }
++	      	}
  	      if (r.changed || r.children_changed)
  		VEC_safe_push (varobj_update_result, result, &r);
 +
-+	      /* Free CHANGED, but not NEW, because NEW has been put
-+		 into the result vector.  */
++	      /* Free CHANGED and UNCHANGED, but not NEW, because NEW
++		 has been put into the result vector.  */
 +	      VEC_free (varobj_p, changed);
++	      VEC_free (varobj_p, unchanged);
 +
  	      continue;
  	    }
  	}
-@@ -1855,7 +2092,12 @@ new_variable (void)
+@@ -1862,7 +2114,12 @@ new_variable (void)
    var->frozen = 0;
    var->not_fetched = 0;
    var->children_requested = 0;
@@ -30208,7 +31484,7 @@ index fbe8ff8..490ca33 100644
  
    return var;
  }
-@@ -1885,7 +2127,10 @@ free_variable (struct varobj *var)
+@@ -1892,7 +2149,10 @@ free_variable (struct varobj *var)
    if (var->pretty_printer)
      {
        struct cleanup *cleanup = varobj_ensure_python_env (var);
@@ -30220,7 +31496,7 @@ index fbe8ff8..490ca33 100644
        do_cleanups (cleanup);
      }
  #endif
-@@ -1918,6 +2163,18 @@ make_cleanup_free_variable (struct varobj *var)
+@@ -1925,6 +2185,18 @@ make_cleanup_free_variable (struct varobj *var)
    return make_cleanup (do_free_variable_cleanup, var);
  }
  
@@ -30239,7 +31515,7 @@ index fbe8ff8..490ca33 100644
  /* This returns the type of the variable. It also skips past typedefs
     to return the real type of the variable.
  
-@@ -2132,6 +2389,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
+@@ -2139,6 +2411,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
        else
  	{
  	  tmp_var->obj_name = xstrdup (var->obj_name);
@@ -30248,7 +31524,7 @@ index fbe8ff8..490ca33 100644
  	  varobj_delete (var, NULL, 0);
  
  	  install_variable (tmp_var);
-@@ -2166,7 +2425,11 @@ static char *
+@@ -2173,7 +2447,11 @@ static char *
  my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
  {
    if (var->root->is_valid)
@@ -30261,7 +31537,7 @@ index fbe8ff8..490ca33 100644
    else
      return NULL;
  }
-@@ -2189,43 +2452,51 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
+@@ -2196,43 +2474,51 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
      struct cleanup *back_to = varobj_ensure_python_env (var);
      PyObject *value_formatter = var->pretty_printer;
  
@@ -30344,7 +31620,7 @@ index fbe8ff8..490ca33 100644
        }
      do_cleanups (back_to);
    }
-@@ -2954,10 +3225,7 @@ cplus_describe_child (struct varobj *parent, int index,
+@@ -2961,10 +3247,7 @@ cplus_describe_child (struct varobj *parent, int index,
  	    *cname = xstrdup (TYPE_FIELD_NAME (type, index));
  
  	  if (cvalue && value)
@@ -30356,7 +31632,7 @@ index fbe8ff8..490ca33 100644
  
  	  if (ctype)
  	    {
-@@ -3163,6 +3431,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+@@ -3170,6 +3453,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -30376,7 +31652,7 @@ index fbe8ff8..490ca33 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3180,6 +3461,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3187,6 +3483,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }

gdb-readline-6.0.patch:
 config.in    |    3 ++
 configure    |   63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |   15 ++++++++++++++
 3 files changed, 81 insertions(+)

Index: gdb-readline-6.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-readline-6.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-readline-6.0.patch	31 Jul 2009 08:36:06 -0000	1.1
+++ gdb-readline-6.0.patch	10 Sep 2009 21:37:40 -0000	1.2
@@ -7,9 +7,11 @@ gdb/
 	* config.in: Regenerate.
 	* configure: Regenerate.
 
---- a/gdb/configure.ac
-+++ b/gdb/configure.ac
-@@ -536,6 +536,21 @@ if test "$with_system_readline" = yes; then
+Index: gdb-6.8.50.20090909/gdb/configure.ac
+===================================================================
+--- gdb-6.8.50.20090909.orig/gdb/configure.ac	2009-09-09 20:11:04.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/configure.ac	2009-09-09 20:11:54.000000000 +0200
+@@ -773,6 +773,21 @@ if test "$with_system_readline" = yes; t
    READLINE=-lreadline
    READLINE_DEPS=
    READLINE_CFLAGS=
@@ -31,9 +33,11 @@ gdb/
  else
    READLINE='$(READLINE_DIR)/libreadline.a'
    READLINE_DEPS='$(READLINE)'
---- a/gdb/config.in
-+++ b/gdb/config.in
-@@ -790,6 +790,9 @@
+Index: gdb-6.8.50.20090909/gdb/config.in
+===================================================================
+--- gdb-6.8.50.20090909.orig/gdb/config.in	2009-09-09 20:11:33.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/config.in	2009-09-09 20:12:00.000000000 +0200
+@@ -815,6 +815,9 @@
  /* Define to `int' if <sys/types.h> does not define. */
  #undef pid_t
  
@@ -43,9 +47,11 @@ gdb/
  /* Define to the equivalent of the C99 'restrict' keyword, or to
     nothing if this is not supported.  Do not define if restrict is
     supported directly.  */
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -10763,6 +10763,69 @@ if test "$with_system_readline" = yes; then
+Index: gdb-6.8.50.20090909/gdb/configure
+===================================================================
+--- gdb-6.8.50.20090909.orig/gdb/configure	2009-09-09 20:11:07.000000000 +0200
++++ gdb-6.8.50.20090909/gdb/configure	2009-09-09 20:11:54.000000000 +0200
+@@ -9197,6 +9197,69 @@ if test "$with_system_readline" = yes; t
    READLINE=-lreadline
    READLINE_DEPS=
    READLINE_CFLAGS=


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- gdb.spec	3 Sep 2009 19:45:38 -0000	1.382
+++ gdb.spec	10 Sep 2009 21:37:40 -0000	1.383
@@ -10,11 +10,11 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.50.20090818
+Version: 6.8.50.20090910
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 8%{?_with_upstream:.upstream}%{?dist}
+Release: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -218,8 +218,8 @@ Patch229: gdb-6.3-bz140532-ppc-unwinding
 # Testcase for exec() from threaded program (BZ 202689).
 Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
-# Backported post gdb-6.8.50.20090818 snapshot fixups.
-Patch232: gdb-6.8.50.20090818-upstream.patch
+# Backported post gdb-6.8.50.20090910 snapshot fixups.
+#Patch232: gdb-6.8.50.20090910-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -363,9 +363,6 @@ Patch375: gdb-readline-6.0.patch
 # Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).
 Patch378: gdb-bz515434-qsort_cmp.patch
 
-# Revert bitfields regression (BZ 520129).
-Patch380: gdb-bz520129-drow-bitfields.patch
-
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -450,7 +447,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-%patch232 -p1
+#patch232 -p1
 %patch349 -p1
 %patch1 -p1
 %patch3 -p1
@@ -555,7 +552,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch360 -p1
 %patch375 -p1
 %patch378 -p1
-%patch380 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -829,6 +825,12 @@ fi
 %endif
 
 %changelog
+* Thu Sep 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090910-1
+- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090910
+- archer-jankratochvil-fedora12 commit: 941eb487a42933e442cb4d11344cda96ecb8a04d
+  - [next-over-throw] Fix exceptions thrown during next (Tom Tromey).
+  - [bp_location-accel] Do not (much) slow down on 500+ breakpoints (me).
+
 * Thu Sep  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-8
 - archer-jankratochvil-fedora12 commit: a081d2f12945e9468edd5f4341d3e945bd0fefe9
   - [expr] Fix too slow lookups in large C++ programs (Sami Wagiaalla).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	18 Aug 2009 18:51:17 -0000	1.35
+++ sources	10 Sep 2009 21:37:41 -0000	1.36
@@ -1 +1 @@
-63d848cfdd9a43a9b2b412a220d00366  gdb-6.8.50.20090818.tar.bz2
+476e005b8bb33c5c3b3f0b7bd93988bc  gdb-6.8.50.20090910.tar.bz2


--- gdb-6.8.50.20090818-upstream.patch DELETED ---


--- gdb-bz520129-drow-bitfields.patch DELETED ---



From josef at fedoraproject.org  Thu Sep 10 21:51:52 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Thu, 10 Sep 2009 21:51:52 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-resize-minimum-fix.patch, NONE,
	1.1 e2fsprogs.spec, 1.149, 1.150
Message-ID: <20090910215152.14CF311C0423@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15305

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-resize-minimum-fix.patch 
Log Message:
- fixing resize -m bug (#519131)


e2fsprogs-resize-minimum-fix.patch:
 resize2fs.c |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

--- NEW FILE e2fsprogs-resize-minimum-fix.patch ---
---
 resize/resize2fs.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index c0b00b6..648e1f9 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -1900,6 +1900,8 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
 	blk_t inode_count, blks_needed, groups, data_blocks;
 	blk_t grp, data_needed, last_start;
 	int overhead = 0, num_of_superblocks = 0;
+	int extra_groups = 0;
+	int flexbg_size = 1 << fs->super->s_log_groups_per_flex;
 
 	/*
 	 * first figure out how many group descriptors we need to
@@ -1934,11 +1936,9 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
 		 * of inode tables of slack space so the resize
 		 * operation can be guaranteed to finish.
 		 */
-		int flexbg_size = 1 << fs->super->s_log_groups_per_flex;
-		int extra_groups;
-
 		extra_groups = flexbg_size - (groups & (flexbg_size - 1));
 		data_needed += META_OVERHEAD(fs) * extra_groups;
+		extra_groups = groups % flexbg_size;
 	}
 
 	/*
@@ -2002,6 +2002,20 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
 		}
 
 		groups += extra_grps;
+		extra_groups += extra_grps;
+		if (fs->super->s_feature_incompat
+			& EXT4_FEATURE_INCOMPAT_FLEX_BG
+		    && extra_groups > flexbg_size) {
+			/*
+			 * For ext4 we need to allow for up to a flex_bg worth
+			 * of inode tables of slack space so the resize
+			 * operation can be guaranteed to finish.
+			 */
+			extra_groups = flexbg_size -
+						(groups & (flexbg_size - 1));
+			data_needed += META_OVERHEAD(fs) * extra_groups;
+			extra_groups = groups % flexbg_size;
+		}
 	}
 
 	/* now for the fun voodoo */


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- e2fsprogs.spec	24 Aug 2009 04:53:38 -0000	1.149
+++ e2fsprogs.spec	10 Sep 2009 21:51:50 -0000	1.150
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -14,6 +14,7 @@ Source1: ext2_types-wrapper.h
 
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch3: e2fsprogs-1.41.9-defrag.patch
+Patch4: e2fsprogs-resize-minimum-fix.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -141,6 +142,7 @@ It was originally inspired by the Multic
 %patch2 -p1 -b .featurecheck
 # defrag command for testing, from non-release branch
 %patch3 -p1 -b .defrag
+%patch4 -p1 -b .resize
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -301,6 +303,9 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Thu Sep 10 2009 Josef Bacik <josef at toxicpanda.com> 1.41.9-2
+- Fix resize -m bug with flexbg (#519131)
+
 * Sun Aug 23 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-1
 - New upstream release
 



From bpepple at fedoraproject.org  Thu Sep 10 22:01:07 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 10 Sep 2009 22:01:07 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.53, 1.54 sources, 1.53,
	1.54 telepathy-gabble.spec, 1.65, 1.66
Message-ID: <20090910220107.2A2ED11C0423@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24026

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.3-1
- Update to 0.8.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	3 Sep 2009 19:29:09 -0000	1.53
+++ .cvsignore	10 Sep 2009 22:01:05 -0000	1.54
@@ -1 +1 @@
-telepathy-gabble-0.8.2.tar.gz
+telepathy-gabble-0.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	3 Sep 2009 19:29:09 -0000	1.53
+++ sources	10 Sep 2009 22:01:06 -0000	1.54
@@ -1 +1 @@
-512a264e022b9786b0d8ed49e1be2ab2  telepathy-gabble-0.8.2.tar.gz
+224a2ba110b401354dc71be009fd0e63  telepathy-gabble-0.8.3.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- telepathy-gabble.spec	3 Sep 2009 19:29:09 -0000	1.65
+++ telepathy-gabble.spec	10 Sep 2009 22:01:06 -0000	1.66
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.2
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.3-1
+- Update to 0.8.3.
+
 * Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.2-1
 - Update to 0.8.2.
 



From hno at fedoraproject.org  Thu Sep 10 22:15:32 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 10 Sep 2009 22:15:32 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.45, 1.46 sources, 1.48,
	1.49 squid.spec, 1.126, 1.127
Message-ID: <20090910221532.A9BFC11C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5184

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	4 Aug 2009 19:58:16 -0000	1.45
+++ .cvsignore	10 Sep 2009 22:15:30 -0000	1.46
@@ -1 +1,2 @@
-squid-3.0.STABLE18.tar.bz2
+squid-3.0.STABLE19.tar.bz2
+squid-3.0.STABLE19.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	4 Aug 2009 19:58:16 -0000	1.48
+++ sources	10 Sep 2009 22:15:31 -0000	1.49
@@ -1 +1,2 @@
-ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2
+edf0f2baf06d342652f06d131f8a6082  squid-3.0.STABLE19.tar.bz2
+5b514327921dec32896353eeb222b509  squid-3.0.STABLE19.tar.bz2.asc


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- squid.spec	1 Sep 2009 18:32:21 -0000	1.126
+++ squid.spec	10 Sep 2009 22:15:31 -0000	1.127
@@ -3,14 +3,15 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE18
-Release:  3%{?dist}
+Version:  3.0.STABLE19
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
 Source:   http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2
+Source10:   http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2.asc
 Source1:  FAQ.sgml
 Source2:  squid.init
 Source3:  squid.logrotate
@@ -341,6 +342,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE19-1
+- Update to 3.0.STABLE19
+
 * Tue Sep  1 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-3
 - Bug #520445 silence logrotate when Squid is not running
 



From hno at fedoraproject.org  Thu Sep 10 22:19:00 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 10 Sep 2009 22:19:00 +0000 (UTC)
Subject: rpms/squid/F-10 .cvsignore, 1.43, 1.44 sources, 1.47,
	1.48 squid.logrotate, 1.2, 1.3 squid.spec, 1.120, 1.121
Message-ID: <20090910221901.027FD11C00DB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8793

Modified Files:
	.cvsignore sources squid.logrotate squid.spec 
Log Message:
3.0.STABLE19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	4 Aug 2009 19:59:26 -0000	1.43
+++ .cvsignore	10 Sep 2009 22:18:59 -0000	1.44
@@ -1 +1 @@
-squid-3.0.STABLE18.tar.bz2
+squid-3.0.STABLE19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	4 Aug 2009 19:59:26 -0000	1.47
+++ sources	10 Sep 2009 22:19:00 -0000	1.48
@@ -1 +1 @@
-ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2
+edf0f2baf06d342652f06d131f8a6082  squid-3.0.STABLE19.tar.bz2


Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.logrotate	9 Oct 2008 11:47:06 -0000	1.2
+++ squid.logrotate	10 Sep 2009 22:19:00 -0000	1.3
@@ -7,7 +7,8 @@
     sharedscripts
     postrotate
       # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
-      /usr/sbin/squid -k rotate
+      # errors redirected to make it silent if squid is not running
+      /usr/sbin/squid -k rotate 2>/dev/null
       # Wait a little to allow Squid to catch up before the logs is compressed
       sleep 1
     endscript


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- squid.spec	4 Aug 2009 19:59:26 -0000	1.120
+++ squid.spec	10 Sep 2009 22:19:00 -0000	1.121
@@ -3,7 +3,7 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE18
+Version:  3.0.STABLE19
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -341,6 +341,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE19-1
+- Update to 3.0.STABLE19
+- Bug #520445 silence logrotate when Squid is not running
+
 * Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
 - Update to 3.0.STABLE18
 



From bpepple at fedoraproject.org  Thu Sep 10 22:54:47 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 10 Sep 2009 22:54:47 +0000 (UTC)
Subject: rpms/telepathy-farsight/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 telepathy-farsight.spec, 1.9, 1.10
Message-ID: <20090910225448.B863B11C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15965

Modified Files:
	.cvsignore sources telepathy-farsight.spec 
Log Message:
* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.11-1
- Update to 0.0.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2009 02:51:13 -0000	1.7
+++ .cvsignore	10 Sep 2009 22:54:43 -0000	1.8
@@ -1 +1 @@
-telepathy-farsight-0.0.10.tar.gz
+telepathy-farsight-0.0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2009 02:51:13 -0000	1.7
+++ sources	10 Sep 2009 22:54:44 -0000	1.8
@@ -1 +1 @@
-cab33f249d7c1dcf449a0da6ab1cb7ef  telepathy-farsight-0.0.10.tar.gz
+e9b73829e4211d970732db5ba0c83a45  telepathy-farsight-0.0.11.tar.gz


Index: telepathy-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/telepathy-farsight.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- telepathy-farsight.spec	9 Sep 2009 02:51:13 -0000	1.9
+++ telepathy-farsight.spec	10 Sep 2009 22:54:44 -0000	1.10
@@ -5,7 +5,7 @@
 %define farsight2_ver   0.0.14
 
 Name:           telepathy-farsight
-Version:        0.0.10
+Version:        0.0.11
 Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming channels
 
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.11-1
+- Update to 0.0.11.
+
 * Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-1
 - Update to 0.0.10.
 



From stingray at fedoraproject.org  Thu Sep 10 22:55:21 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Thu, 10 Sep 2009 22:55:21 +0000 (UTC)
Subject: rpms/weechat/devel weechat-0.3.0-cmake-paths.patch, NONE,
	1.1 weechat-0.3.0-cmake-pie.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.8, 1.9 weechat.spec, 1.13, 1.14
Message-ID: <20090910225521.BCA4D11C00DB@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/weechat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17041

Modified Files:
	.cvsignore sources weechat.spec 
Added Files:
	weechat-0.3.0-cmake-paths.patch weechat-0.3.0-cmake-pie.patch 
Log Message:
weechat-0.3.0-1

weechat-0.3.0-cmake-paths.patch:
 CMakeLists.txt                            |    6 +++---
 src/plugins/CMakeLists.txt                |    2 ++
 src/plugins/alias/CMakeLists.txt          |    2 +-
 src/plugins/aspell/CMakeLists.txt         |    2 +-
 src/plugins/charset/CMakeLists.txt        |    2 +-
 src/plugins/demo/CMakeLists.txt           |    2 +-
 src/plugins/fifo/CMakeLists.txt           |    2 +-
 src/plugins/irc/CMakeLists.txt            |    2 +-
 src/plugins/logger/CMakeLists.txt         |    2 +-
 src/plugins/relay/CMakeLists.txt          |    2 +-
 src/plugins/scripts/lua/CMakeLists.txt    |    2 +-
 src/plugins/scripts/perl/CMakeLists.txt   |    2 +-
 src/plugins/scripts/python/CMakeLists.txt |    2 +-
 src/plugins/scripts/ruby/CMakeLists.txt   |    2 +-
 src/plugins/scripts/tcl/CMakeLists.txt    |    2 +-
 src/plugins/xfer/CMakeLists.txt           |    2 +-
 16 files changed, 19 insertions(+), 17 deletions(-)

--- NEW FILE weechat-0.3.0-cmake-paths.patch ---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f381d97..aae28ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(VERSION_MINOR "3")
 SET(VERSION_PATCH "1-dev")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PROJECT_NAME})
 SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
 SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
@@ -90,10 +90,10 @@ ADD_CUSTOM_TARGET(dist
 SET(PACKAGE "${PROJECT_NAME}")
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib")
+SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
 SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 278374a..7f2d397 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,8 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
+
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckLibraryExists)
diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt
index e863cf7..4d17e86 100644
--- a/src/plugins/alias/CMakeLists.txt
+++ b/src/plugins/alias/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(alias)
 
-INSTALL(TARGETS alias LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS alias LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt
index 1141ccd..775b1cc 100644
--- a/src/plugins/aspell/CMakeLists.txt
+++ b/src/plugins/aspell/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(ASPELL_FOUND)
   TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY})
 ENDIF(ASPELL_FOUND)
 
-INSTALL(TARGETS aspell LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS aspell LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt
index fdfd2e9..a3ef39c 100644
--- a/src/plugins/charset/CMakeLists.txt
+++ b/src/plugins/charset/CMakeLists.txt
@@ -26,4 +26,4 @@ IF(ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)
 ENDIF(ICONV_FOUND)
 
-INSTALL(TARGETS charset LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS charset LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/demo/CMakeLists.txt b/src/plugins/demo/CMakeLists.txt
index 0e3a268..3765190 100644
--- a/src/plugins/demo/CMakeLists.txt
+++ b/src/plugins/demo/CMakeLists.txt
@@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(demo)
 
-INSTALL(TARGETS demo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS demo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt
index 5f8e831..6b4e9ed 100644
--- a/src/plugins/fifo/CMakeLists.txt
+++ b/src/plugins/fifo/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(fifo)
 
-INSTALL(TARGETS fifo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS fifo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt
index a56c5e8..85d0610 100644
--- a/src/plugins/irc/CMakeLists.txt
+++ b/src/plugins/irc/CMakeLists.txt
@@ -46,4 +46,4 @@ ELSE(GNUTLS_FOUND)
   TARGET_LINK_LIBRARIES(irc)
 ENDIF(GNUTLS_FOUND)
 
-INSTALL(TARGETS irc LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS irc LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt
index 16d3e80..66b1087 100644
--- a/src/plugins/logger/CMakeLists.txt
+++ b/src/plugins/logger/CMakeLists.txt
@@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(logger)
 
-INSTALL(TARGETS logger LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS logger LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt
index 6622239..acaa6c6 100644
--- a/src/plugins/relay/CMakeLists.txt
+++ b/src/plugins/relay/CMakeLists.txt
@@ -27,4 +27,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(relay)
 
-INSTALL(TARGETS relay LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS relay LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/lua/CMakeLists.txt b/src/plugins/scripts/lua/CMakeLists.txt
index cde09e6..e02016b 100644
--- a/src/plugins/scripts/lua/CMakeLists.txt
+++ b/src/plugins/scripts/lua/CMakeLists.txt
@@ -28,4 +28,4 @@ IF(LUA_FOUND)
   ENDIF(LUA_LIBRARY AND LUALIB_LIBRARY)
 ENDIF(LUA_FOUND)
 
-INSTALL(TARGETS lua LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS lua LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt
index 52950cf..bd70883 100644
--- a/src/plugins/scripts/perl/CMakeLists.txt
+++ b/src/plugins/scripts/perl/CMakeLists.txt
@@ -35,4 +35,4 @@ IF(PERL_FOUND)
   ENDIF(PERL_DYNALOADER)
 ENDIF(PERL_FOUND)
 
-INSTALL(TARGETS perl LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS perl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/python/CMakeLists.txt b/src/plugins/scripts/python/CMakeLists.txt
index 8495c32..8d02c6e 100644
--- a/src/plugins/scripts/python/CMakeLists.txt
+++ b/src/plugins/scripts/python/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(PYTHON_FOUND)
   TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts)
 ENDIF(PYTHON_FOUND)
 
-INSTALL(TARGETS python LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS python LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/ruby/CMakeLists.txt b/src/plugins/scripts/ruby/CMakeLists.txt
index 452e479..f8024bd 100644
--- a/src/plugins/scripts/ruby/CMakeLists.txt
+++ b/src/plugins/scripts/ruby/CMakeLists.txt
@@ -24,4 +24,4 @@ IF(RUBY_FOUND)
   TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts)
 ENDIF(RUBY_FOUND)
 
-INSTALL(TARGETS ruby LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS ruby LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/tcl/CMakeLists.txt b/src/plugins/scripts/tcl/CMakeLists.txt
index 58cbaa2..6fa86f1 100644
--- a/src/plugins/scripts/tcl/CMakeLists.txt
+++ b/src/plugins/scripts/tcl/CMakeLists.txt
@@ -29,4 +29,4 @@ IF(TCL_FOUND)
 
 ENDIF(TCL_FOUND)
 
-INSTALL(TARGETS tcl LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS tcl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt
index 4d8e8f5..d9dcb92 100644
--- a/src/plugins/xfer/CMakeLists.txt
+++ b/src/plugins/xfer/CMakeLists.txt
@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(xfer)
 
-INSTALL(TARGETS xfer LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS xfer LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})

weechat-0.3.0-cmake-pie.patch:
 CMakeLists.txt         |    8 ++++++++
 core/CMakeLists.txt    |    2 ++
 gui/CMakeLists.txt     |    5 +++++
 plugins/CMakeLists.txt |    3 +++
 4 files changed, 18 insertions(+)

--- NEW FILE weechat-0.3.0-cmake-pie.patch ---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50d2f01..6ea66f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
+INCLUDE(CheckCCompilerFlag)
 
 CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
@@ -57,6 +58,13 @@ CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
 CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
 
+CHECK_C_COMPILER_FLAG(-fPIE HAVE_FPIE_SUPPORT)
+if (HAVE_FPIE_SUPPORT)
+  set (WEECHAT_PIE_CFLAGS "-fPIE")
+  set (WEECHAT_PIE_LDFLAGS "-pie")
+else(HAVE_FPIE_SUPPORT)
+  message(STATUS "Your compiler doesn't support PIE flag")
+endif(HAVE_FPIE_SUPPORT)
 
 #needs to be splitted in subdirectories
 # FIXME: weechat_gui_common MUST be the first lib in the list
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ae4b7b2..7dd537e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -34,6 +34,8 @@ wee-upgrade-file.c wee-upgrade-file.h
 wee-utf8.c wee-utf8.h
 wee-util.c wee-util.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+
 # Check for flock support
 INCLUDE(CheckSymbolExists)
 CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a3c7342..be0341b 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -33,6 +33,11 @@ gui-main.h
 gui-nicklist.c gui-nicklist.h
 gui-window.c gui-window.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} ${WEECHAT_PIE_LDFLAGS}")
+
+
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 7f2d397..293edb5 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,9 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET_TARGET_PROPERTIES(weechat_plugins
+  PROPERTIES COMPILE_FLAGS "${WEECHAT_PIE_CFLAGS}")
+
 SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
 
 INCLUDE(CheckIncludeFiles)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/weechat/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 Jun 2009 17:28:23 -0000	1.8
+++ .cvsignore	10 Sep 2009 22:55:20 -0000	1.9
@@ -1,2 +1 @@
-weechat-0.2.6.3.tar.bz2
-weechat-0.2.6.3-pie-rollup.patch.bz2
+weechat-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/weechat/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Jun 2009 17:28:23 -0000	1.8
+++ sources	10 Sep 2009 22:55:20 -0000	1.9
@@ -1,2 +1 @@
-ebc2874ae82c29b7ab005f5812b61598  weechat-0.2.6.3.tar.bz2
-0035108eeb2f9e9906521835f9e64680  weechat-0.2.6.3-pie-rollup.patch.bz2
+c31cfc229e964ff9257cc9c7f9e6c9bc  weechat-0.3.0.tar.bz2


Index: weechat.spec
===================================================================
RCS file: /cvs/extras/rpms/weechat/devel/weechat.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- weechat.spec	27 Jul 2009 07:09:41 -0000	1.13
+++ weechat.spec	10 Sep 2009 22:55:20 -0000	1.14
@@ -1,60 +1,77 @@
 Name:      weechat
 Summary:   Portable, fast, light and extensible IRC client
-Version:   0.2.6.3
-Release:   2%{?dist}
-Source:    http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2
-Patch0:    %{name}-%{version}-pie-rollup.patch.bz2
-URL:       http://weechat.flashtux.org
+Version:   0.3.0
+Release:   1%{?dist}
+Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
+Patch0:    weechat-0.3.0-cmake-paths.patch
+Patch1:    weechat-0.3.0-cmake-pie.patch
+URL:       http://weechat.org
 Group:     Applications/Communications
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License:   GPLv3
-BuildRequires: ncurses-devel python-devel perl ruby-devel 
+BuildRequires: ncurses-devel python-devel perl-devel ruby-devel 
 BuildRequires: gnutls-devel lua-devel aspell-devel
 BuildRequires: docbook-style-xsl gettext ruby
+BuildRequires: cmake perl-ExtUtils-Embed tcl-devel
 
 %description
 WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
 extensible IRC client. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.
 
+%package devel
+Summary: Development files for weechat
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
+extensible IRC client. Everything can be done with a keyboard.
+It is customizable and extensible with scripts.
+
+This package contains include files and pc file for weechat.
+
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -F 2
+%patch1 -p1
 
 %build
-%configure \
-  --disable-rpath \
-  --enable-static=no \
-  --with-doc-xsl-prefix=/usr/share/sgml/docbook/xsl-stylesheets
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%cmake .
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
-# This hardcoded docdir=... in Makefile.am is crap
-
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html .
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/weechat_quickstart* .
-
 %find_lang %name
 
+%check
+ctest
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755) 
-%doc AUTHORS BUGS ChangeLog COPYING FAQ FAQ.fr NEWS README TODO html weechat_quickstart*
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc doc/en/weechat_faq.en.txt doc/en/weechat_quickstart.en.txt doc/en/weechat_scripting.en.txt
+%doc doc/en/weechat_user.en.txt
 %{_mandir}/man1/%{name}-curses.1*
 %{_bindir}/%{name}-curses
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/*
 
+%files devel
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/*
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
+* Thu Sep 10 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.3.0-1
+- new, shiny version
+- new cmake-based build
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stingray at fedoraproject.org  Thu Sep 10 23:06:42 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Thu, 10 Sep 2009 23:06:42 +0000 (UTC)
Subject: rpms/weechat/F-11 weechat-0.3.0-cmake-paths.patch, NONE,
	1.1 weechat-0.3.0-cmake-pie.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.7, 1.8 weechat.spec, 1.11, 1.12
Message-ID: <20090910230642.E7F2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/weechat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31329/F-11

Modified Files:
	.cvsignore sources weechat.spec 
Added Files:
	weechat-0.3.0-cmake-paths.patch weechat-0.3.0-cmake-pie.patch 
Log Message:
weechat-0.3.0-1

weechat-0.3.0-cmake-paths.patch:
 CMakeLists.txt                            |    6 +++---
 src/plugins/CMakeLists.txt                |    2 ++
 src/plugins/alias/CMakeLists.txt          |    2 +-
 src/plugins/aspell/CMakeLists.txt         |    2 +-
 src/plugins/charset/CMakeLists.txt        |    2 +-
 src/plugins/demo/CMakeLists.txt           |    2 +-
 src/plugins/fifo/CMakeLists.txt           |    2 +-
 src/plugins/irc/CMakeLists.txt            |    2 +-
 src/plugins/logger/CMakeLists.txt         |    2 +-
 src/plugins/relay/CMakeLists.txt          |    2 +-
 src/plugins/scripts/lua/CMakeLists.txt    |    2 +-
 src/plugins/scripts/perl/CMakeLists.txt   |    2 +-
 src/plugins/scripts/python/CMakeLists.txt |    2 +-
 src/plugins/scripts/ruby/CMakeLists.txt   |    2 +-
 src/plugins/scripts/tcl/CMakeLists.txt    |    2 +-
 src/plugins/xfer/CMakeLists.txt           |    2 +-
 16 files changed, 19 insertions(+), 17 deletions(-)

--- NEW FILE weechat-0.3.0-cmake-paths.patch ---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f381d97..aae28ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(VERSION_MINOR "3")
 SET(VERSION_PATCH "1-dev")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PROJECT_NAME})
 SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
 SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
@@ -90,10 +90,10 @@ ADD_CUSTOM_TARGET(dist
 SET(PACKAGE "${PROJECT_NAME}")
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib")
+SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
 SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 278374a..7f2d397 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,8 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
+
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckLibraryExists)
diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt
index e863cf7..4d17e86 100644
--- a/src/plugins/alias/CMakeLists.txt
+++ b/src/plugins/alias/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(alias)
 
-INSTALL(TARGETS alias LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS alias LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt
index 1141ccd..775b1cc 100644
--- a/src/plugins/aspell/CMakeLists.txt
+++ b/src/plugins/aspell/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(ASPELL_FOUND)
   TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY})
 ENDIF(ASPELL_FOUND)
 
-INSTALL(TARGETS aspell LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS aspell LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt
index fdfd2e9..a3ef39c 100644
--- a/src/plugins/charset/CMakeLists.txt
+++ b/src/plugins/charset/CMakeLists.txt
@@ -26,4 +26,4 @@ IF(ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)
 ENDIF(ICONV_FOUND)
 
-INSTALL(TARGETS charset LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS charset LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/demo/CMakeLists.txt b/src/plugins/demo/CMakeLists.txt
index 0e3a268..3765190 100644
--- a/src/plugins/demo/CMakeLists.txt
+++ b/src/plugins/demo/CMakeLists.txt
@@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(demo)
 
-INSTALL(TARGETS demo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS demo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt
index 5f8e831..6b4e9ed 100644
--- a/src/plugins/fifo/CMakeLists.txt
+++ b/src/plugins/fifo/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(fifo)
 
-INSTALL(TARGETS fifo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS fifo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt
index a56c5e8..85d0610 100644
--- a/src/plugins/irc/CMakeLists.txt
+++ b/src/plugins/irc/CMakeLists.txt
@@ -46,4 +46,4 @@ ELSE(GNUTLS_FOUND)
   TARGET_LINK_LIBRARIES(irc)
 ENDIF(GNUTLS_FOUND)
 
-INSTALL(TARGETS irc LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS irc LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt
index 16d3e80..66b1087 100644
--- a/src/plugins/logger/CMakeLists.txt
+++ b/src/plugins/logger/CMakeLists.txt
@@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(logger)
 
-INSTALL(TARGETS logger LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS logger LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt
index 6622239..acaa6c6 100644
--- a/src/plugins/relay/CMakeLists.txt
+++ b/src/plugins/relay/CMakeLists.txt
@@ -27,4 +27,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(relay)
 
-INSTALL(TARGETS relay LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS relay LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/lua/CMakeLists.txt b/src/plugins/scripts/lua/CMakeLists.txt
index cde09e6..e02016b 100644
--- a/src/plugins/scripts/lua/CMakeLists.txt
+++ b/src/plugins/scripts/lua/CMakeLists.txt
@@ -28,4 +28,4 @@ IF(LUA_FOUND)
   ENDIF(LUA_LIBRARY AND LUALIB_LIBRARY)
 ENDIF(LUA_FOUND)
 
-INSTALL(TARGETS lua LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS lua LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt
index 52950cf..bd70883 100644
--- a/src/plugins/scripts/perl/CMakeLists.txt
+++ b/src/plugins/scripts/perl/CMakeLists.txt
@@ -35,4 +35,4 @@ IF(PERL_FOUND)
   ENDIF(PERL_DYNALOADER)
 ENDIF(PERL_FOUND)
 
-INSTALL(TARGETS perl LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS perl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/python/CMakeLists.txt b/src/plugins/scripts/python/CMakeLists.txt
index 8495c32..8d02c6e 100644
--- a/src/plugins/scripts/python/CMakeLists.txt
+++ b/src/plugins/scripts/python/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(PYTHON_FOUND)
   TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts)
 ENDIF(PYTHON_FOUND)
 
-INSTALL(TARGETS python LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS python LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/ruby/CMakeLists.txt b/src/plugins/scripts/ruby/CMakeLists.txt
index 452e479..f8024bd 100644
--- a/src/plugins/scripts/ruby/CMakeLists.txt
+++ b/src/plugins/scripts/ruby/CMakeLists.txt
@@ -24,4 +24,4 @@ IF(RUBY_FOUND)
   TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts)
 ENDIF(RUBY_FOUND)
 
-INSTALL(TARGETS ruby LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS ruby LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/tcl/CMakeLists.txt b/src/plugins/scripts/tcl/CMakeLists.txt
index 58cbaa2..6fa86f1 100644
--- a/src/plugins/scripts/tcl/CMakeLists.txt
+++ b/src/plugins/scripts/tcl/CMakeLists.txt
@@ -29,4 +29,4 @@ IF(TCL_FOUND)
 
 ENDIF(TCL_FOUND)
 
-INSTALL(TARGETS tcl LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS tcl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt
index 4d8e8f5..d9dcb92 100644
--- a/src/plugins/xfer/CMakeLists.txt
+++ b/src/plugins/xfer/CMakeLists.txt
@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(xfer)
 
-INSTALL(TARGETS xfer LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS xfer LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})

weechat-0.3.0-cmake-pie.patch:
 CMakeLists.txt         |    8 ++++++++
 core/CMakeLists.txt    |    2 ++
 gui/CMakeLists.txt     |    5 +++++
 plugins/CMakeLists.txt |    3 +++
 4 files changed, 18 insertions(+)

--- NEW FILE weechat-0.3.0-cmake-pie.patch ---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50d2f01..6ea66f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
+INCLUDE(CheckCCompilerFlag)
 
 CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
@@ -57,6 +58,13 @@ CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
 CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
 
+CHECK_C_COMPILER_FLAG(-fPIE HAVE_FPIE_SUPPORT)
+if (HAVE_FPIE_SUPPORT)
+  set (WEECHAT_PIE_CFLAGS "-fPIE")
+  set (WEECHAT_PIE_LDFLAGS "-pie")
+else(HAVE_FPIE_SUPPORT)
+  message(STATUS "Your compiler doesn't support PIE flag")
+endif(HAVE_FPIE_SUPPORT)
 
 #needs to be splitted in subdirectories
 # FIXME: weechat_gui_common MUST be the first lib in the list
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ae4b7b2..7dd537e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -34,6 +34,8 @@ wee-upgrade-file.c wee-upgrade-file.h
 wee-utf8.c wee-utf8.h
 wee-util.c wee-util.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+
 # Check for flock support
 INCLUDE(CheckSymbolExists)
 CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a3c7342..be0341b 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -33,6 +33,11 @@ gui-main.h
 gui-nicklist.c gui-nicklist.h
 gui-window.c gui-window.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} ${WEECHAT_PIE_LDFLAGS}")
+
+
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 7f2d397..293edb5 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,9 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET_TARGET_PROPERTIES(weechat_plugins
+  PROPERTIES COMPILE_FLAGS "${WEECHAT_PIE_CFLAGS}")
+
 SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
 
 INCLUDE(CheckIncludeFiles)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 May 2009 13:39:24 -0000	1.7
+++ .cvsignore	10 Sep 2009 23:06:41 -0000	1.8
@@ -1,2 +1 @@
-weechat-0.2.6.2.tar.bz2
-weechat-0.2.6.2-pie-rollup.patch.bz2
+weechat-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 May 2009 13:39:24 -0000	1.7
+++ sources	10 Sep 2009 23:06:41 -0000	1.8
@@ -1,2 +1 @@
-b3e71366b2b9d73341eb2695103fbfc9  weechat-0.2.6.2.tar.bz2
-c2b9d2feb9ac09bd3042b3af38e686f6  weechat-0.2.6.2-pie-rollup.patch.bz2
+c31cfc229e964ff9257cc9c7f9e6c9bc  weechat-0.3.0.tar.bz2


Index: weechat.spec
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-11/weechat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- weechat.spec	1 May 2009 13:39:24 -0000	1.11
+++ weechat.spec	10 Sep 2009 23:06:42 -0000	1.12
@@ -1,60 +1,83 @@
 Name:      weechat
 Summary:   Portable, fast, light and extensible IRC client
-Version:   0.2.6.2
+Version:   0.3.0
 Release:   1%{?dist}
-Source:    http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2
-Patch0:    %{name}-%{version}-pie-rollup.patch.bz2
-URL:       http://weechat.flashtux.org
+Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
+Patch0:    weechat-0.3.0-cmake-paths.patch
+Patch1:    weechat-0.3.0-cmake-pie.patch
+URL:       http://weechat.org
 Group:     Applications/Communications
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License:   GPLv3
-BuildRequires: ncurses-devel python-devel perl ruby-devel 
+BuildRequires: ncurses-devel python-devel perl-devel ruby-devel 
 BuildRequires: gnutls-devel lua-devel aspell-devel
 BuildRequires: docbook-style-xsl gettext ruby
+BuildRequires: cmake perl-ExtUtils-Embed tcl-devel
 
 %description
 WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
 extensible IRC client. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.
 
+%package devel
+Summary: Development files for weechat
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
+extensible IRC client. Everything can be done with a keyboard.
+It is customizable and extensible with scripts.
+
+This package contains include files and pc file for weechat.
+
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -F 2
+%patch1 -p1
 
 %build
-%configure \
-  --disable-rpath \
-  --enable-static=no \
-  --with-doc-xsl-prefix=/usr/share/sgml/docbook/xsl-stylesheets
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%cmake .
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
-# This hardcoded docdir=... in Makefile.am is crap
-
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html .
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/weechat_quickstart* .
-
 %find_lang %name
 
+%check
+ctest
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755) 
-%doc AUTHORS BUGS ChangeLog COPYING FAQ FAQ.fr NEWS README TODO html weechat_quickstart*
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc doc/en/weechat_faq.en.txt doc/en/weechat_quickstart.en.txt doc/en/weechat_scripting.en.txt
+%doc doc/en/weechat_user.en.txt
 %{_mandir}/man1/%{name}-curses.1*
 %{_bindir}/%{name}-curses
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/*
 
+%files devel
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/*
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
+* Thu Sep 10 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.3.0-1
+- new, shiny version
+- new cmake-based build
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 25 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.2.6.3-1
+- gnutls detection bugfix
+
 * Fri May  1 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.2.6.2-1
 - fix some charset decoding problems.
 



From stingray at fedoraproject.org  Thu Sep 10 23:06:42 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Thu, 10 Sep 2009 23:06:42 +0000 (UTC)
Subject: rpms/weechat/F-10 weechat-0.3.0-cmake-paths.patch, NONE,
	1.1 weechat-0.3.0-cmake-pie.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.7, 1.8 weechat.spec, 1.9, 1.10
Message-ID: <20090910230642.DD17211C00DB@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/weechat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31329/F-10

Modified Files:
	.cvsignore sources weechat.spec 
Added Files:
	weechat-0.3.0-cmake-paths.patch weechat-0.3.0-cmake-pie.patch 
Log Message:
weechat-0.3.0-1

weechat-0.3.0-cmake-paths.patch:
 CMakeLists.txt                            |    6 +++---
 src/plugins/CMakeLists.txt                |    2 ++
 src/plugins/alias/CMakeLists.txt          |    2 +-
 src/plugins/aspell/CMakeLists.txt         |    2 +-
 src/plugins/charset/CMakeLists.txt        |    2 +-
 src/plugins/demo/CMakeLists.txt           |    2 +-
 src/plugins/fifo/CMakeLists.txt           |    2 +-
 src/plugins/irc/CMakeLists.txt            |    2 +-
 src/plugins/logger/CMakeLists.txt         |    2 +-
 src/plugins/relay/CMakeLists.txt          |    2 +-
 src/plugins/scripts/lua/CMakeLists.txt    |    2 +-
 src/plugins/scripts/perl/CMakeLists.txt   |    2 +-
 src/plugins/scripts/python/CMakeLists.txt |    2 +-
 src/plugins/scripts/ruby/CMakeLists.txt   |    2 +-
 src/plugins/scripts/tcl/CMakeLists.txt    |    2 +-
 src/plugins/xfer/CMakeLists.txt           |    2 +-
 16 files changed, 19 insertions(+), 17 deletions(-)

--- NEW FILE weechat-0.3.0-cmake-paths.patch ---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f381d97..aae28ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(VERSION_MINOR "3")
 SET(VERSION_PATCH "1-dev")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PROJECT_NAME})
 SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
 SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
@@ -90,10 +90,10 @@ ADD_CUSTOM_TARGET(dist
 SET(PACKAGE "${PROJECT_NAME}")
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib")
+SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
 SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 278374a..7f2d397 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,8 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
+
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckLibraryExists)
diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt
index e863cf7..4d17e86 100644
--- a/src/plugins/alias/CMakeLists.txt
+++ b/src/plugins/alias/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(alias)
 
-INSTALL(TARGETS alias LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS alias LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt
index 1141ccd..775b1cc 100644
--- a/src/plugins/aspell/CMakeLists.txt
+++ b/src/plugins/aspell/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(ASPELL_FOUND)
   TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY})
 ENDIF(ASPELL_FOUND)
 
-INSTALL(TARGETS aspell LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS aspell LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt
index fdfd2e9..a3ef39c 100644
--- a/src/plugins/charset/CMakeLists.txt
+++ b/src/plugins/charset/CMakeLists.txt
@@ -26,4 +26,4 @@ IF(ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)
 ENDIF(ICONV_FOUND)
 
-INSTALL(TARGETS charset LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS charset LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/demo/CMakeLists.txt b/src/plugins/demo/CMakeLists.txt
index 0e3a268..3765190 100644
--- a/src/plugins/demo/CMakeLists.txt
+++ b/src/plugins/demo/CMakeLists.txt
@@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(demo)
 
-INSTALL(TARGETS demo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS demo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt
index 5f8e831..6b4e9ed 100644
--- a/src/plugins/fifo/CMakeLists.txt
+++ b/src/plugins/fifo/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(fifo)
 
-INSTALL(TARGETS fifo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS fifo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt
index a56c5e8..85d0610 100644
--- a/src/plugins/irc/CMakeLists.txt
+++ b/src/plugins/irc/CMakeLists.txt
@@ -46,4 +46,4 @@ ELSE(GNUTLS_FOUND)
   TARGET_LINK_LIBRARIES(irc)
 ENDIF(GNUTLS_FOUND)
 
-INSTALL(TARGETS irc LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS irc LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt
index 16d3e80..66b1087 100644
--- a/src/plugins/logger/CMakeLists.txt
+++ b/src/plugins/logger/CMakeLists.txt
@@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(logger)
 
-INSTALL(TARGETS logger LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS logger LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt
index 6622239..acaa6c6 100644
--- a/src/plugins/relay/CMakeLists.txt
+++ b/src/plugins/relay/CMakeLists.txt
@@ -27,4 +27,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(relay)
 
-INSTALL(TARGETS relay LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS relay LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/lua/CMakeLists.txt b/src/plugins/scripts/lua/CMakeLists.txt
index cde09e6..e02016b 100644
--- a/src/plugins/scripts/lua/CMakeLists.txt
+++ b/src/plugins/scripts/lua/CMakeLists.txt
@@ -28,4 +28,4 @@ IF(LUA_FOUND)
   ENDIF(LUA_LIBRARY AND LUALIB_LIBRARY)
 ENDIF(LUA_FOUND)
 
-INSTALL(TARGETS lua LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS lua LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt
index 52950cf..bd70883 100644
--- a/src/plugins/scripts/perl/CMakeLists.txt
+++ b/src/plugins/scripts/perl/CMakeLists.txt
@@ -35,4 +35,4 @@ IF(PERL_FOUND)
   ENDIF(PERL_DYNALOADER)
 ENDIF(PERL_FOUND)
 
-INSTALL(TARGETS perl LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS perl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/python/CMakeLists.txt b/src/plugins/scripts/python/CMakeLists.txt
index 8495c32..8d02c6e 100644
--- a/src/plugins/scripts/python/CMakeLists.txt
+++ b/src/plugins/scripts/python/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(PYTHON_FOUND)
   TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts)
 ENDIF(PYTHON_FOUND)
 
-INSTALL(TARGETS python LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS python LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/ruby/CMakeLists.txt b/src/plugins/scripts/ruby/CMakeLists.txt
index 452e479..f8024bd 100644
--- a/src/plugins/scripts/ruby/CMakeLists.txt
+++ b/src/plugins/scripts/ruby/CMakeLists.txt
@@ -24,4 +24,4 @@ IF(RUBY_FOUND)
   TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts)
 ENDIF(RUBY_FOUND)
 
-INSTALL(TARGETS ruby LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS ruby LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/tcl/CMakeLists.txt b/src/plugins/scripts/tcl/CMakeLists.txt
index 58cbaa2..6fa86f1 100644
--- a/src/plugins/scripts/tcl/CMakeLists.txt
+++ b/src/plugins/scripts/tcl/CMakeLists.txt
@@ -29,4 +29,4 @@ IF(TCL_FOUND)
 
 ENDIF(TCL_FOUND)
 
-INSTALL(TARGETS tcl LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS tcl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt
index 4d8e8f5..d9dcb92 100644
--- a/src/plugins/xfer/CMakeLists.txt
+++ b/src/plugins/xfer/CMakeLists.txt
@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(xfer)
 
-INSTALL(TARGETS xfer LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS xfer LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})

weechat-0.3.0-cmake-pie.patch:
 CMakeLists.txt         |    8 ++++++++
 core/CMakeLists.txt    |    2 ++
 gui/CMakeLists.txt     |    5 +++++
 plugins/CMakeLists.txt |    3 +++
 4 files changed, 18 insertions(+)

--- NEW FILE weechat-0.3.0-cmake-pie.patch ---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50d2f01..6ea66f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
+INCLUDE(CheckCCompilerFlag)
 
 CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
@@ -57,6 +58,13 @@ CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
 CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
 
+CHECK_C_COMPILER_FLAG(-fPIE HAVE_FPIE_SUPPORT)
+if (HAVE_FPIE_SUPPORT)
+  set (WEECHAT_PIE_CFLAGS "-fPIE")
+  set (WEECHAT_PIE_LDFLAGS "-pie")
+else(HAVE_FPIE_SUPPORT)
+  message(STATUS "Your compiler doesn't support PIE flag")
+endif(HAVE_FPIE_SUPPORT)
 
 #needs to be splitted in subdirectories
 # FIXME: weechat_gui_common MUST be the first lib in the list
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ae4b7b2..7dd537e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -34,6 +34,8 @@ wee-upgrade-file.c wee-upgrade-file.h
 wee-utf8.c wee-utf8.h
 wee-util.c wee-util.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+
 # Check for flock support
 INCLUDE(CheckSymbolExists)
 CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a3c7342..be0341b 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -33,6 +33,11 @@ gui-main.h
 gui-nicklist.c gui-nicklist.h
 gui-window.c gui-window.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} ${WEECHAT_PIE_LDFLAGS}")
+
+
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 7f2d397..293edb5 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,9 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET_TARGET_PROPERTIES(weechat_plugins
+  PROPERTIES COMPILE_FLAGS "${WEECHAT_PIE_CFLAGS}")
+
 SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
 
 INCLUDE(CheckIncludeFiles)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 May 2009 13:39:24 -0000	1.7
+++ .cvsignore	10 Sep 2009 23:06:40 -0000	1.8
@@ -1,2 +1 @@
-weechat-0.2.6.2.tar.bz2
-weechat-0.2.6.2-pie-rollup.patch.bz2
+weechat-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 May 2009 13:39:24 -0000	1.7
+++ sources	10 Sep 2009 23:06:40 -0000	1.8
@@ -1,2 +1 @@
-b3e71366b2b9d73341eb2695103fbfc9  weechat-0.2.6.2.tar.bz2
-c2b9d2feb9ac09bd3042b3af38e686f6  weechat-0.2.6.2-pie-rollup.patch.bz2
+c31cfc229e964ff9257cc9c7f9e6c9bc  weechat-0.3.0.tar.bz2


Index: weechat.spec
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-10/weechat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- weechat.spec	1 May 2009 13:39:24 -0000	1.9
+++ weechat.spec	10 Sep 2009 23:06:41 -0000	1.10
@@ -1,60 +1,83 @@
 Name:      weechat
 Summary:   Portable, fast, light and extensible IRC client
-Version:   0.2.6.2
+Version:   0.3.0
 Release:   1%{?dist}
-Source:    http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2
-Patch0:    %{name}-%{version}-pie-rollup.patch.bz2
-URL:       http://weechat.flashtux.org
+Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
+Patch0:    weechat-0.3.0-cmake-paths.patch
+Patch1:    weechat-0.3.0-cmake-pie.patch
+URL:       http://weechat.org
 Group:     Applications/Communications
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License:   GPLv3
-BuildRequires: ncurses-devel python-devel perl ruby-devel 
+BuildRequires: ncurses-devel python-devel perl-devel ruby-devel 
 BuildRequires: gnutls-devel lua-devel aspell-devel
 BuildRequires: docbook-style-xsl gettext ruby
+BuildRequires: cmake perl-ExtUtils-Embed tcl-devel
 
 %description
 WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
 extensible IRC client. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.
 
+%package devel
+Summary: Development files for weechat
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
+extensible IRC client. Everything can be done with a keyboard.
+It is customizable and extensible with scripts.
+
+This package contains include files and pc file for weechat.
+
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -F 2
+%patch1 -p1
 
 %build
-%configure \
-  --disable-rpath \
-  --enable-static=no \
-  --with-doc-xsl-prefix=/usr/share/sgml/docbook/xsl-stylesheets
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%cmake .
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
-# This hardcoded docdir=... in Makefile.am is crap
-
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html .
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/weechat_quickstart* .
-
 %find_lang %name
 
+%check
+ctest
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755) 
-%doc AUTHORS BUGS ChangeLog COPYING FAQ FAQ.fr NEWS README TODO html weechat_quickstart*
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc doc/en/weechat_faq.en.txt doc/en/weechat_quickstart.en.txt doc/en/weechat_scripting.en.txt
+%doc doc/en/weechat_user.en.txt
 %{_mandir}/man1/%{name}-curses.1*
 %{_bindir}/%{name}-curses
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/*
 
+%files devel
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/*
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
+* Thu Sep 10 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.3.0-1
+- new, shiny version
+- new cmake-based build
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 25 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.2.6.3-1
+- gnutls detection bugfix
+
 * Fri May  1 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.2.6.2-1
 - fix some charset decoding problems.
 



From stingray at fedoraproject.org  Thu Sep 10 23:06:44 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Thu, 10 Sep 2009 23:06:44 +0000 (UTC)
Subject: rpms/weechat/F-9 weechat-0.3.0-cmake-paths.patch, NONE,
	1.1 weechat-0.3.0-cmake-pie.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.7, 1.8 weechat.spec, 1.7, 1.8
Message-ID: <20090910230644.0B65C11C00DB@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/weechat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31329/F-9

Modified Files:
	.cvsignore sources weechat.spec 
Added Files:
	weechat-0.3.0-cmake-paths.patch weechat-0.3.0-cmake-pie.patch 
Log Message:
weechat-0.3.0-1

weechat-0.3.0-cmake-paths.patch:
 CMakeLists.txt                            |    6 +++---
 src/plugins/CMakeLists.txt                |    2 ++
 src/plugins/alias/CMakeLists.txt          |    2 +-
 src/plugins/aspell/CMakeLists.txt         |    2 +-
 src/plugins/charset/CMakeLists.txt        |    2 +-
 src/plugins/demo/CMakeLists.txt           |    2 +-
 src/plugins/fifo/CMakeLists.txt           |    2 +-
 src/plugins/irc/CMakeLists.txt            |    2 +-
 src/plugins/logger/CMakeLists.txt         |    2 +-
 src/plugins/relay/CMakeLists.txt          |    2 +-
 src/plugins/scripts/lua/CMakeLists.txt    |    2 +-
 src/plugins/scripts/perl/CMakeLists.txt   |    2 +-
 src/plugins/scripts/python/CMakeLists.txt |    2 +-
 src/plugins/scripts/ruby/CMakeLists.txt   |    2 +-
 src/plugins/scripts/tcl/CMakeLists.txt    |    2 +-
 src/plugins/xfer/CMakeLists.txt           |    2 +-
 16 files changed, 19 insertions(+), 17 deletions(-)

--- NEW FILE weechat-0.3.0-cmake-paths.patch ---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f381d97..aae28ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(VERSION_MINOR "3")
 SET(VERSION_PATCH "1-dev")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PROJECT_NAME})
 SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
 SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
@@ -90,10 +90,10 @@ ADD_CUSTOM_TARGET(dist
 SET(PACKAGE "${PROJECT_NAME}")
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib")
+SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
 SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 278374a..7f2d397 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,8 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
+
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckLibraryExists)
diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt
index e863cf7..4d17e86 100644
--- a/src/plugins/alias/CMakeLists.txt
+++ b/src/plugins/alias/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(alias)
 
-INSTALL(TARGETS alias LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS alias LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt
index 1141ccd..775b1cc 100644
--- a/src/plugins/aspell/CMakeLists.txt
+++ b/src/plugins/aspell/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(ASPELL_FOUND)
   TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY})
 ENDIF(ASPELL_FOUND)
 
-INSTALL(TARGETS aspell LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS aspell LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt
index fdfd2e9..a3ef39c 100644
--- a/src/plugins/charset/CMakeLists.txt
+++ b/src/plugins/charset/CMakeLists.txt
@@ -26,4 +26,4 @@ IF(ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)
 ENDIF(ICONV_FOUND)
 
-INSTALL(TARGETS charset LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS charset LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/demo/CMakeLists.txt b/src/plugins/demo/CMakeLists.txt
index 0e3a268..3765190 100644
--- a/src/plugins/demo/CMakeLists.txt
+++ b/src/plugins/demo/CMakeLists.txt
@@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(demo)
 
-INSTALL(TARGETS demo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS demo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt
index 5f8e831..6b4e9ed 100644
--- a/src/plugins/fifo/CMakeLists.txt
+++ b/src/plugins/fifo/CMakeLists.txt
@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(fifo)
 
-INSTALL(TARGETS fifo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS fifo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt
index a56c5e8..85d0610 100644
--- a/src/plugins/irc/CMakeLists.txt
+++ b/src/plugins/irc/CMakeLists.txt
@@ -46,4 +46,4 @@ ELSE(GNUTLS_FOUND)
   TARGET_LINK_LIBRARIES(irc)
 ENDIF(GNUTLS_FOUND)
 
-INSTALL(TARGETS irc LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS irc LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt
index 16d3e80..66b1087 100644
--- a/src/plugins/logger/CMakeLists.txt
+++ b/src/plugins/logger/CMakeLists.txt
@@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(logger)
 
-INSTALL(TARGETS logger LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS logger LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt
index 6622239..acaa6c6 100644
--- a/src/plugins/relay/CMakeLists.txt
+++ b/src/plugins/relay/CMakeLists.txt
@@ -27,4 +27,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(relay)
 
-INSTALL(TARGETS relay LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS relay LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/lua/CMakeLists.txt b/src/plugins/scripts/lua/CMakeLists.txt
index cde09e6..e02016b 100644
--- a/src/plugins/scripts/lua/CMakeLists.txt
+++ b/src/plugins/scripts/lua/CMakeLists.txt
@@ -28,4 +28,4 @@ IF(LUA_FOUND)
   ENDIF(LUA_LIBRARY AND LUALIB_LIBRARY)
 ENDIF(LUA_FOUND)
 
-INSTALL(TARGETS lua LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS lua LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt
index 52950cf..bd70883 100644
--- a/src/plugins/scripts/perl/CMakeLists.txt
+++ b/src/plugins/scripts/perl/CMakeLists.txt
@@ -35,4 +35,4 @@ IF(PERL_FOUND)
   ENDIF(PERL_DYNALOADER)
 ENDIF(PERL_FOUND)
 
-INSTALL(TARGETS perl LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS perl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/python/CMakeLists.txt b/src/plugins/scripts/python/CMakeLists.txt
index 8495c32..8d02c6e 100644
--- a/src/plugins/scripts/python/CMakeLists.txt
+++ b/src/plugins/scripts/python/CMakeLists.txt
@@ -25,4 +25,4 @@ IF(PYTHON_FOUND)
   TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts)
 ENDIF(PYTHON_FOUND)
 
-INSTALL(TARGETS python LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS python LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/ruby/CMakeLists.txt b/src/plugins/scripts/ruby/CMakeLists.txt
index 452e479..f8024bd 100644
--- a/src/plugins/scripts/ruby/CMakeLists.txt
+++ b/src/plugins/scripts/ruby/CMakeLists.txt
@@ -24,4 +24,4 @@ IF(RUBY_FOUND)
   TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts)
 ENDIF(RUBY_FOUND)
 
-INSTALL(TARGETS ruby LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS ruby LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/tcl/CMakeLists.txt b/src/plugins/scripts/tcl/CMakeLists.txt
index 58cbaa2..6fa86f1 100644
--- a/src/plugins/scripts/tcl/CMakeLists.txt
+++ b/src/plugins/scripts/tcl/CMakeLists.txt
@@ -29,4 +29,4 @@ IF(TCL_FOUND)
 
 ENDIF(TCL_FOUND)
 
-INSTALL(TARGETS tcl LIBRARY DESTINATION lib/weechat/plugins)
+INSTALL(TARGETS tcl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt
index 4d8e8f5..d9dcb92 100644
--- a/src/plugins/xfer/CMakeLists.txt
+++ b/src/plugins/xfer/CMakeLists.txt
@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
 
 TARGET_LINK_LIBRARIES(xfer)
 
-INSTALL(TARGETS xfer LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
+INSTALL(TARGETS xfer LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})

weechat-0.3.0-cmake-pie.patch:
 CMakeLists.txt         |    8 ++++++++
 core/CMakeLists.txt    |    2 ++
 gui/CMakeLists.txt     |    5 +++++
 plugins/CMakeLists.txt |    3 +++
 4 files changed, 18 insertions(+)

--- NEW FILE weechat-0.3.0-cmake-pie.patch ---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50d2f01..6ea66f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
+INCLUDE(CheckCCompilerFlag)
 
 CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
@@ -57,6 +58,13 @@ CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
 CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
 
+CHECK_C_COMPILER_FLAG(-fPIE HAVE_FPIE_SUPPORT)
+if (HAVE_FPIE_SUPPORT)
+  set (WEECHAT_PIE_CFLAGS "-fPIE")
+  set (WEECHAT_PIE_LDFLAGS "-pie")
+else(HAVE_FPIE_SUPPORT)
+  message(STATUS "Your compiler doesn't support PIE flag")
+endif(HAVE_FPIE_SUPPORT)
 
 #needs to be splitted in subdirectories
 # FIXME: weechat_gui_common MUST be the first lib in the list
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ae4b7b2..7dd537e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -34,6 +34,8 @@ wee-upgrade-file.c wee-upgrade-file.h
 wee-utf8.c wee-utf8.h
 wee-util.c wee-util.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+
 # Check for flock support
 INCLUDE(CheckSymbolExists)
 CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a3c7342..be0341b 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -33,6 +33,11 @@ gui-main.h
 gui-nicklist.c gui-nicklist.h
 gui-window.c gui-window.h)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WEECHAT_PIE_CFLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} ${WEECHAT_PIE_LDFLAGS}")
+
+
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 7f2d397..293edb5 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -23,6 +23,9 @@ plugin-config.h plugin-config.c)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
 
+SET_TARGET_PROPERTIES(weechat_plugins
+  PROPERTIES COMPILE_FLAGS "${WEECHAT_PIE_CFLAGS}")
+
 SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins)
 
 INCLUDE(CheckIncludeFiles)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 May 2009 13:39:24 -0000	1.7
+++ .cvsignore	10 Sep 2009 23:06:42 -0000	1.8
@@ -1,2 +1 @@
-weechat-0.2.6.2.tar.bz2
-weechat-0.2.6.2-pie-rollup.patch.bz2
+weechat-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 May 2009 13:39:24 -0000	1.7
+++ sources	10 Sep 2009 23:06:42 -0000	1.8
@@ -1,2 +1 @@
-b3e71366b2b9d73341eb2695103fbfc9  weechat-0.2.6.2.tar.bz2
-c2b9d2feb9ac09bd3042b3af38e686f6  weechat-0.2.6.2-pie-rollup.patch.bz2
+c31cfc229e964ff9257cc9c7f9e6c9bc  weechat-0.3.0.tar.bz2


Index: weechat.spec
===================================================================
RCS file: /cvs/extras/rpms/weechat/F-9/weechat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- weechat.spec	1 May 2009 13:39:24 -0000	1.7
+++ weechat.spec	10 Sep 2009 23:06:43 -0000	1.8
@@ -1,60 +1,83 @@
 Name:      weechat
 Summary:   Portable, fast, light and extensible IRC client
-Version:   0.2.6.2
+Version:   0.3.0
 Release:   1%{?dist}
-Source:    http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2
-Patch0:    %{name}-%{version}-pie-rollup.patch.bz2
-URL:       http://weechat.flashtux.org
+Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
+Patch0:    weechat-0.3.0-cmake-paths.patch
+Patch1:    weechat-0.3.0-cmake-pie.patch
+URL:       http://weechat.org
 Group:     Applications/Communications
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License:   GPLv3
-BuildRequires: ncurses-devel python-devel perl ruby-devel 
+BuildRequires: ncurses-devel python-devel perl-devel ruby-devel 
 BuildRequires: gnutls-devel lua-devel aspell-devel
 BuildRequires: docbook-style-xsl gettext ruby
+BuildRequires: cmake perl-ExtUtils-Embed tcl-devel
 
 %description
 WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
 extensible IRC client. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.
 
+%package devel
+Summary: Development files for weechat
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
+extensible IRC client. Everything can be done with a keyboard.
+It is customizable and extensible with scripts.
+
+This package contains include files and pc file for weechat.
+
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -F 2
+%patch1 -p1
 
 %build
-%configure \
-  --disable-rpath \
-  --enable-static=no \
-  --with-doc-xsl-prefix=/usr/share/sgml/docbook/xsl-stylesheets
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%cmake .
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
-# This hardcoded docdir=... in Makefile.am is crap
-
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html .
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/weechat_quickstart* .
-
 %find_lang %name
 
+%check
+ctest
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755) 
-%doc AUTHORS BUGS ChangeLog COPYING FAQ FAQ.fr NEWS README TODO html weechat_quickstart*
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc doc/en/weechat_faq.en.txt doc/en/weechat_quickstart.en.txt doc/en/weechat_scripting.en.txt
+%doc doc/en/weechat_user.en.txt
 %{_mandir}/man1/%{name}-curses.1*
 %{_bindir}/%{name}-curses
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/*
 
+%files devel
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/*
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
+* Thu Sep 10 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.3.0-1
+- new, shiny version
+- new cmake-based build
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 25 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.2.6.3-1
+- gnutls detection bugfix
+
 * Fri May  1 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.2.6.2-1
 - fix some charset decoding problems.
 



From thm at fedoraproject.org  Thu Sep 10 23:18:31 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 10 Sep 2009 23:18:31 +0000 (UTC)
Subject: rpms/botan/F-11 .cvsignore, 1.6, 1.7 botan.spec, 1.8, 1.9 import.log,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090910231831.5754511C00DB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6704/F-11

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.7. This is mainly a bugfix release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Aug 2009 16:03:09 -0000	1.6
+++ .cvsignore	10 Sep 2009 23:18:30 -0000	1.7
@@ -1 +1 @@
-Botan-1.8.6.tbz
+Botan-1.8.7.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/botan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- botan.spec	13 Aug 2009 16:03:09 -0000	1.8
+++ botan.spec	10 Sep 2009 23:18:30 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           botan
-Version:        1.8.6
+Version:        1.8.7
 Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
@@ -110,6 +110,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Thu Sep 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.7-1
+- Update to 1.8.7. This is mainly a bugfix release.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6-2
+- rebuilt with new openssl
+
 * Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.6-1
 - Update to 1.8.6, which contains new features as well as bugfixes,
   e.g. concerning the /proc-walking entropy source.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	13 Aug 2009 16:03:09 -0000	1.6
+++ import.log	10 Sep 2009 23:18:30 -0000	1.7
@@ -4,3 +4,4 @@ botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc
 botan-1_8_2-1_fc12:F-11:botan-1.8.2-1.fc12.src.rpm:1242458388
 botan-1_8_5-2_fc11:F-11:botan-1.8.5-2.fc11.src.rpm:1250100575
 botan-1_8_6-1_fc11:F-11:botan-1.8.6-1.fc11.src.rpm:1250179358
+botan-1_8_7-1_fc11:F-11:botan-1.8.7-1.fc11.src.rpm:1252624676


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Aug 2009 16:03:09 -0000	1.6
+++ sources	10 Sep 2009 23:18:30 -0000	1.7
@@ -1 +1 @@
-827f71f450eb1b7bc9e173c402bc48dc  Botan-1.8.6.tbz
+c607e31b012d9839fd0a1da24ff85e3d  Botan-1.8.7.tbz



From emaldonado at fedoraproject.org  Thu Sep 10 23:20:36 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 10 Sep 2009 23:20:36 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-config.in,1.5,1.6
Message-ID: <20090910232036.E158011C043A@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8440

Modified Files:
	nss-util-config.in 
Log Message:
Restoring -rpath-link


Index: nss-util-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util-config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss-util-config.in	5 Sep 2009 21:19:59 -0000	1.5
+++ nss-util-config.in	10 Sep 2009 23:20:35 -0000	1.6
@@ -112,7 +112,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,$libdir -L$libdir"
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
       if test -n "$lib_nssutil"; then
 	libdirs="$libdirs -lnssutil${major_version}"
       fi



From emaldonado at fedoraproject.org  Thu Sep 10 23:21:30 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 10 Sep 2009 23:21:30 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.16,1.17
Message-ID: <20090910232130.5A5F511C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9275

Modified Files:
	nss-util.spec 
Log Message:
Restoring -rpath-link to nss-util-config


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nss-util.spec	8 Sep 2009 18:00:15 -0000	1.16
+++ nss-util.spec	10 Sep 2009 23:21:30 -0000	1.17
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -200,6 +200,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
+- Restoring -rpath-link to nss-util-config
+
 * Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
 - Installing shared libraries to %%{_libdir}
 



From thm at fedoraproject.org  Thu Sep 10 23:22:14 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 10 Sep 2009 23:22:14 +0000 (UTC)
Subject: rpms/botan/F-10 .cvsignore, 1.6, 1.7 botan.spec, 1.6, 1.7 import.log,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090910232214.2106E11C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9869/F-10

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.7. This is mainly a bugfix release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Aug 2009 16:05:04 -0000	1.6
+++ .cvsignore	10 Sep 2009 23:22:13 -0000	1.7
@@ -1 +1 @@
-Botan-1.8.6.tbz
+Botan-1.8.7.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/botan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- botan.spec	13 Aug 2009 16:05:04 -0000	1.6
+++ botan.spec	10 Sep 2009 23:22:13 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           botan
-Version:        1.8.6
+Version:        1.8.7
 Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
@@ -110,6 +110,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Thu Sep 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.7-1
+- Update to 1.8.7. This is mainly a bugfix release.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6-2
+- rebuilt with new openssl
+
 * Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.6-1
 - Update to 1.8.6, which contains new features as well as bugfixes,
   e.g. concerning the /proc-walking entropy source.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	13 Aug 2009 16:05:04 -0000	1.6
+++ import.log	10 Sep 2009 23:22:13 -0000	1.7
@@ -4,3 +4,4 @@ botan-1_8_1-4_fc10:F-10:botan-1.8.1-4.fc
 botan-1_8_2-1_fc12:F-10:botan-1.8.2-1.fc12.src.rpm:1242459647
 botan-1_8_5-2_fc11:F-10:botan-1.8.5-2.fc11.src.rpm:1250101840
 botan-1_8_6-1_fc11:F-10:botan-1.8.6-1.fc11.src.rpm:1250179466
+botan-1_8_7-1_fc11:F-10:botan-1.8.7-1.fc11.src.rpm:1252624897


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Aug 2009 16:05:05 -0000	1.6
+++ sources	10 Sep 2009 23:22:13 -0000	1.7
@@ -1 +1 @@
-827f71f450eb1b7bc9e173c402bc48dc  Botan-1.8.6.tbz
+c607e31b012d9839fd0a1da24ff85e3d  Botan-1.8.7.tbz



From rdieter at fedoraproject.org  Thu Sep 10 23:28:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Sep 2009 23:28:13 +0000 (UTC)
Subject: rpms/kmymoney2/EL-5 .cvsignore, 1.11, 1.12 kmymoney2.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <20090910232813.23E5811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12980

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- kmymoney2-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Sep 2009 19:52:33 -0000	1.11
+++ .cvsignore	10 Sep 2009 23:28:12 -0000	1.12
@@ -1 +1 @@
-kmymoney2-1.0.0.tar.bz2
+kmymoney2-1.0.1.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kmymoney2.spec	3 Sep 2009 19:52:33 -0000	1.21
+++ kmymoney2.spec	10 Sep 2009 23:28:12 -0000	1.22
@@ -13,9 +13,11 @@
 BuildRequires: libutempter-devel
 %endif
 
+%define _with_check 1 
+
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -75,7 +77,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %setup -q -n kmymoney2-%{version}
 
 %if 0%{?rhel}
-%patch1 -p1 -b .no_it_locale
+#patch1 -p1 -b .no_it_locale
 %endif
 
 
@@ -86,7 +88,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --disable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -210,6 +212,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- kmymoney2-1.0.1
+
 * Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
 - kmymoney2-1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Sep 2009 19:52:33 -0000	1.10
+++ sources	10 Sep 2009 23:28:12 -0000	1.11
@@ -1 +1 @@
-f702ea77ff5bf6aec727768da34d98ec  kmymoney2-1.0.0.tar.bz2
+7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2



From emaldonado at fedoraproject.org  Thu Sep 10 23:43:32 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 10 Sep 2009 23:43:32 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-config.in, 1.3,
	1.4 nss-softokn.spec, 1.23, 1.24
Message-ID: <20090910234332.E380F11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24756

Modified Files:
	nss-softokn-config.in nss-softokn.spec 
Log Message:
Delist libraries from nss-softoken-config


Index: nss-softokn-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-softokn-config.in	5 Sep 2009 21:21:21 -0000	1.3
+++ nss-softokn-config.in	10 Sep 2009 23:43:31 -0000	1.4
@@ -19,9 +19,10 @@ Options:
 	[--libs]
 	[--cflags]
 Dynamic Libraries:
-	freebl3
-	nssdbm3
-	softokn3
+	softokn3 - Requires full dynamic linking
+	freebl3  - for internal use only (and glibc for self-integrity check)
+	nssdbm3  - for internal use only
+Dymamically linked
 EOF
 	exit $1
 }
@@ -30,10 +31,6 @@ if test $# -eq 0; then
 	usage 1 1>&2
 fi
 
-lib_freebl=yes
-lib_nssdbm=yes
-lib_softokn=yes
-
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -74,15 +71,6 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
-    freebl)
-      lib_freebl=yes
-      ;;
-    nssdbm)
-      lib_nssdbm=yes
-      ;;
-    softokn)
-      lib_softokn=no
-      ;;
     *)
       usage 1 1>&2
       ;;
@@ -122,19 +110,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_freebl"; then
-	libdirs="$libdirs -lfreebl${major_version}"
-      fi
-      if test -n "$lib_nssdbm"; then
-	libdirs="$libdirs -lnssdbm${major_version}"
-      fi
-      if test -n "$lib_softokn"; then
-	libdirs="$libdirs -lnsoftokn${major_version}"
-      fi
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
       echo $libdirs
 fi      
 


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nss-softokn.spec	8 Sep 2009 18:10:38 -0000	1.23
+++ nss-softokn.spec	10 Sep 2009 23:43:31 -0000	1.24
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -290,6 +290,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-6
+- Don't list libraries in nss-softokn-config, dynamic linking required
+
 * Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
 - Installing shared libraries to %%{_libdir}
 



From rdieter at fedoraproject.org  Thu Sep 10 23:47:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Sep 2009 23:47:38 +0000 (UTC)
Subject: rpms/kmymoney2/EL-5 kmymoney2.spec,1.22,1.23
Message-ID: <20090910234738.AEE2B11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27648

Modified Files:
	kmymoney2.spec 
Log Message:
still need patch



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- kmymoney2.spec	10 Sep 2009 23:28:12 -0000	1.22
+++ kmymoney2.spec	10 Sep 2009 23:47:37 -0000	1.23
@@ -77,7 +77,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %setup -q -n kmymoney2-%{version}
 
 %if 0%{?rhel}
-#patch1 -p1 -b .no_it_locale
+%patch1 -p1 -b .no_it_locale
 %endif
 
 



From emaldonado at fedoraproject.org  Thu Sep 10 23:55:12 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 10 Sep 2009 23:55:12 +0000 (UTC)
Subject: rpms/nss/devel nss-config.in,1.5,1.6 nss.spec,1.116,1.117
Message-ID: <20090910235512.D887A11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32001

Modified Files:
	nss-config.in nss.spec 
Log Message:
Reverting to having nssutil and -rpath-link in nss-config not to break other's builds - 522477


Index: nss-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss-config.in	5 Sep 2009 21:22:05 -0000	1.5
+++ nss-config.in	10 Sep 2009 23:55:12 -0000	1.6
@@ -20,6 +20,7 @@ Options:
 	[--cflags]
 Dynamic Libraries:
 	nss
+	nssutil
 	ssl
 	smime
 EOF
@@ -33,6 +34,7 @@ fi
 lib_ssl=yes
 lib_smime=yes
 lib_nss=yes
+lib_nssutil=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -83,6 +85,9 @@ while test $# -gt 0; do
     nss)
       lib_nss=yes
       ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -122,7 +127,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,$libdir -L$libdir"
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
       if test -n "$lib_ssl"; then
 	libdirs="$libdirs -lssl${major_version}"
       fi
@@ -132,6 +137,9 @@ if test "$echo_libs" = "yes"; then
       if test -n "$lib_nss"; then
 	libdirs="$libdirs -lnss${major_version}"
       fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
       echo $libdirs
 fi      
 


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- nss.spec	9 Sep 2009 22:38:09 -0000	1.116
+++ nss.spec	10 Sep 2009 23:55:12 -0000	1.117
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -447,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
+- Restoring nssutil and -rpath-link to nss-config for now - 522477
+
 * Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com - 3.12.4-7
 - Add the nss-sysinit subpackage
 



From emaldonado at fedoraproject.org  Fri Sep 11 00:04:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 11 Sep 2009 00:04:16 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-config.in,1.6,1.7
Message-ID: <20090911000416.6E77F11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1950

Modified Files:
	nss-util-config.in 
Log Message:
Cleanup


Index: nss-util-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util-config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nss-util-config.in	10 Sep 2009 23:20:35 -0000	1.6
+++ nss-util-config.in	11 Sep 2009 00:04:16 -0000	1.7
@@ -70,9 +70,6 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
     *)
       usage 1 1>&2
       ;;



From emaldonado at fedoraproject.org  Fri Sep 11 00:05:55 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 11 Sep 2009 00:05:55 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.17,1.18
Message-ID: <20090911000555.9788411C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2356

Modified Files:
	nss-util.spec 
Log Message:
Retagging for a chained build


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nss-util.spec	10 Sep 2009 23:21:30 -0000	1.17
+++ nss-util.spec	11 Sep 2009 00:05:55 -0000	1.18
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.4
-Release:          5%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -200,6 +200,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
+- Retagging for a chained build with nss-softokn and nss
+
 * Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
 - Restoring -rpath-link to nss-util-config
 



From emaldonado at fedoraproject.org  Fri Sep 11 00:08:26 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 11 Sep 2009 00:08:26 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.24,1.25
Message-ID: <20090911000826.482EC11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3221

Modified Files:
	nss-softokn.spec 
Log Message:
Retagging for a chained build with nss


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nss-softokn.spec	10 Sep 2009 23:43:31 -0000	1.24
+++ nss-softokn.spec	11 Sep 2009 00:08:25 -0000	1.25
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          6%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -290,6 +290,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
+- Retagging for a chained build
+
 * Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-6
 - Don't list libraries in nss-softokn-config, dynamic linking required
 



From rdieter at fedoraproject.org  Fri Sep 11 00:31:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 00:31:07 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.112,1.113 comps-f13.xml.in,1.4,1.5
Message-ID: <20090911003107.9DC5211C02BB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10572

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
add poppler-data conditional to cjk, cyrillic locales



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- comps-f12.xml.in	9 Sep 2009 19:06:59 -0000	1.112
+++ comps-f12.xml.in	11 Sep 2009 00:31:01 -0000	1.113
@@ -675,6 +675,7 @@
       <packagereq type="conditional" requires="moodle">moodle-zh_tw</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
@@ -4782,6 +4783,7 @@
       <packagereq type="conditional" requires="moodle">moodle-ru</packagereq>
       <packagereq type="conditional" requires="mythes-en">mythes-ru</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
@@ -5723,6 +5725,7 @@
       <packagereq type="conditional" requires="moodle">moodle-uk</packagereq>
       <packagereq type="conditional" requires="mythes-en">mythes-uk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-uk</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- comps-f13.xml.in	7 Sep 2009 19:42:11 -0000	1.4
+++ comps-f13.xml.in	11 Sep 2009 00:31:01 -0000	1.5
@@ -675,6 +675,7 @@
       <packagereq type="conditional" requires="moodle">moodle-zh_tw</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
@@ -4778,6 +4779,7 @@
       <packagereq type="conditional" requires="moodle">moodle-ru</packagereq>
       <packagereq type="conditional" requires="mythes-en">mythes-ru</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
@@ -5705,6 +5707,7 @@
       <packagereq type="conditional" requires="moodle">moodle-uk</packagereq>
       <packagereq type="conditional" requires="mythes-en">mythes-uk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-uk</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>



From rdieter at fedoraproject.org  Fri Sep 11 00:38:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 00:38:37 +0000 (UTC)
Subject: rpms/kmymoney2/EL-5 kmymoney2-1.0.1-no_it_locale.patch, NONE,
	1.1 kmymoney2.spec, 1.23,
	1.24 kmymoney2-1.0.0-no_it_locale.patch, 1.1, NONE
Message-ID: <20090911003837.A49A811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12968

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Removed Files:
	kmymoney2-1.0.0-no_it_locale.patch 
Log Message:
respin patch


kmymoney2-1.0.1-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.1-no_it_locale.patch ---
diff -up kmymoney2-1.0.1/po/Makefile.in.no_it_locale kmymoney2-1.0.1/po/Makefile.in
--- kmymoney2-1.0.1/po/Makefile.in.no_it_locale	2009-09-05 07:54:58.000000000 -0500
+++ kmymoney2-1.0.1/po/Makefile.in	2009-09-10 19:36:25.414373555 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kmymoney2.spec	10 Sep 2009 23:47:37 -0000	1.23
+++ kmymoney2.spec	11 Sep 2009 00:38:36 -0000	1.24
@@ -27,7 +27,7 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # RHEL5's gettext doesn't grok it.po
-Patch1: kmymoney2-1.0.0-no_it_locale.patch
+Patch1: kmymoney2-1.0.1-no_it_locale.patch
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}


--- kmymoney2-1.0.0-no_it_locale.patch DELETED ---



From rdieter at fedoraproject.org  Fri Sep 11 01:09:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 01:09:55 +0000 (UTC)
Subject: rpms/kmymoney2/devel kmymoney2-1.0.1-no_it_locale.patch, NONE,
	1.1 kmymoney2.spec, 1.44,
	1.45 kmymoney2-1.0.0-no_it_locale.patch, 1.1, NONE
Message-ID: <20090911010955.D875911C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27981

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Removed Files:
	kmymoney2-1.0.0-no_it_locale.patch 
Log Message:
sync mods from EL-5 branch


kmymoney2-1.0.1-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.1-no_it_locale.patch ---
diff -up kmymoney2-1.0.1/po/Makefile.in.no_it_locale kmymoney2-1.0.1/po/Makefile.in
--- kmymoney2-1.0.1/po/Makefile.in.no_it_locale	2009-09-05 07:54:58.000000000 -0500
+++ kmymoney2-1.0.1/po/Makefile.in	2009-09-10 19:36:25.414373555 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- kmymoney2.spec	7 Sep 2009 03:25:30 -0000	1.44
+++ kmymoney2.spec	11 Sep 2009 01:09:52 -0000	1.45
@@ -27,7 +27,7 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # RHEL5's gettext doesn't grok it.po
-Patch1: kmymoney2-1.0.0-no_it_locale.patch
+Patch1: kmymoney2-1.0.1-no_it_locale.patch
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}


--- kmymoney2-1.0.0-no_it_locale.patch DELETED ---



From dwheeler at fedoraproject.org  Fri Sep 11 01:24:11 2009
From: dwheeler at fedoraproject.org (David A. Wheeler)
Date: Fri, 11 Sep 2009 01:24:11 +0000 (UTC)
Subject: rpms/auto-destdir/devel .cvsignore, 1.2, 1.3 auto-destdir.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090911012411.9D15811C00DB@cvs1.fedora.phx.redhat.com>

Author: dwheeler

Update of /cvs/pkgs/rpms/auto-destdir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3897

Modified Files:
	.cvsignore auto-destdir.spec sources 
Log Message:

* Wed Sep 09 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.11-1
- Added wrapper for "touch"
- Auto-create DESTDIR directory if it doesn't exist and something is redirected.
- Simplified implementation.
- Documentation: Fixed make-redir(1) so it describes how to use in RPM spec
  files, more override info, note that it's useful with GNU stow, etc.
- make-redir now overrides MKDIR_P and mkdir_p by default




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Sep 2009 21:54:27 -0000	1.2
+++ .cvsignore	11 Sep 2009 01:24:10 -0000	1.3
@@ -1 +1 @@
-auto-destdir-1.10.tgz
+auto-destdir-1.11.tgz


Index: auto-destdir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/devel/auto-destdir.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- auto-destdir.spec	2 Sep 2009 21:54:27 -0000	1.1
+++ auto-destdir.spec	11 Sep 2009 01:24:10 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		auto-destdir
-Version:	1.10
+Version:	1.11
 Release:	1%{?dist}
 Summary:	Automate DESTDIR support for "make install"
 
@@ -20,6 +20,8 @@ from source code to be managed by tools 
 The Auto-DESTDIR tools (run-redir and make-redir) redirect file installations
 so that the installed files are placed inside the the $DESTDIR directory,
 even if the provided makefile doesn't support the DESTDIR convention.
+In most cases you can simply replace "make install" with
+"make-redir DESTDIR=... install".
 
 %prep
 %setup -q
@@ -47,7 +49,15 @@ rm -rf %{buildroot}
 %doc README COPYING
 
 %changelog
-* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
+* Wed Sep 09 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.11-1
+- Added wrapper for "touch"
+- Auto-create DESTDIR directory if it doesn't exist and something is redirected.
+- Simplified implementation.
+- Documentation: Fixed make-redir(1) so it describes how to use in RPM spec
+  files, more override info, note that it's useful with GNU stow, etc.
+- make-redir now overrides MKDIR_P and mkdir_p by default
+
+* Wed Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
 - Test suite improvements: More tests, runs on Cygwin.
 - Simplified .spec file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Sep 2009 21:54:27 -0000	1.2
+++ sources	11 Sep 2009 01:24:10 -0000	1.3
@@ -1 +1 @@
-e78d909dd0dcc5a594726f5efd3dee7e  auto-destdir-1.10.tgz
+ea9e719fba20898c07d1a765ce483f3e  auto-destdir-1.11.tgz



From bskeggs at fedoraproject.org  Fri Sep 11 01:34:13 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 11 Sep 2009 01:34:13 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.51, 1.52 kernel.spec, 1.1792,
	1.1793
Message-ID: <20090911013413.58C8511C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9687

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: fixed use of strap-based panel mode when required (rh#522649)
- nouveau: temporarily block accel on NVAC chipsets (rh#522361, rh#522575)



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  748 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1202 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  829 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  443 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 57834 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- drm-nouveau.patch	10 Sep 2009 05:35:18 -0000	1.51
+++ drm-nouveau.patch	11 Sep 2009 01:34:12 -0000	1.52
@@ -8930,10 +8930,10 @@ index 0000000..7761425
 +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
 diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
 new file mode 100644
-index 0000000..7f799f6
+index 0000000..ddecec4
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,747 @@
+@@ -0,0 +1,748 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -9546,7 +9546,8 @@ index 0000000..7f799f6
 +	/* Still nothing, some VBIOS images have a hardcoded EDID block
 +	 * stored for the panel stored in them.
 +	 */
-+	if (!nv_connector->edid && !dev_priv->VBIOS.pub.fp_no_ddc) {
++	if (!nv_connector->edid && !nv_connector->native_mode &&
++	    !dev_priv->VBIOS.pub.fp_no_ddc) {
 +		nv_connector->edid =
 +			(struct edid *)nouveau_bios_embedded_edid(dev);
 +	}
@@ -12519,7 +12520,7 @@ index 0000000..0f40414
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
 new file mode 100644
-index 0000000..230a99b
+index 0000000..32b4bb9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
 @@ -0,0 +1,261 @@
@@ -12729,7 +12730,7 @@ index 0000000..230a99b
 +			schedule_timeout(1);
 +
 +		if (intr && signal_pending(current)) {
-+			ret = -ERESTARTSYS;
++			ret = -ERESTART;
 +			break;
 +		}
 +	}
@@ -33966,10 +33967,10 @@ index 0000000..3d12e12
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..108f672
+index 0000000..9a88a1a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,439 @@
+@@ -0,0 +1,443 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34086,9 +34087,11 @@ index 0000000..108f672
 +	case 0xaa:
 +		voodoo = nvaa_ctxprog;
 +		break;
++#if 0 /* block accel for now, it won't work */
 +	case 0xac:
 +		voodoo = nvac_ctxprog;
 +		break;
++#endif
 +	default:
 +		NV_ERROR(dev, "no ctxprog for chipset NV%02x\n", dev_priv->chipset);
 +		dev_priv->engine.graph.accel_blocked = true;
@@ -34207,9 +34210,11 @@ index 0000000..108f672
 +	case 0xaa:
 +		ctxvals = nvaa_ctxvals;
 +		break;
++#if 0 /* block accel for now, it won't work */
 +	case 0xac:
 +		ctxvals = nvac_ctxvals;
 +		break;
++#endif
 +	default:
 +		break;
 +	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1792
retrieving revision 1.1793
diff -u -p -r1.1792 -r1.1793
--- kernel.spec	10 Sep 2009 17:29:33 -0000	1.1792
+++ kernel.spec	11 Sep 2009 01:34:12 -0000	1.1793
@@ -2018,6 +2018,10 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: fixed use of strap-based panel mode when required (rh#522649)
+- nouveau: temporarily block accel on NVAC chipsets (rh#522361, rh#522575)
+
 * Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-ahci-export-capabilities.patch: Backport from upstream
 - linux-2.6-rtc-show-hctosys.patch: Export the hctosys state of an rtc



From dwheeler at fedoraproject.org  Fri Sep 11 01:35:28 2009
From: dwheeler at fedoraproject.org (David A. Wheeler)
Date: Fri, 11 Sep 2009 01:35:28 +0000 (UTC)
Subject: rpms/auto-destdir/F-11 .cvsignore, 1.2, 1.3 auto-destdir.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090911013528.3FE7B11C00DB@cvs1.fedora.phx.redhat.com>

Author: dwheeler

Update of /cvs/pkgs/rpms/auto-destdir/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10025

Modified Files:
	.cvsignore auto-destdir.spec sources 
Log Message:


* Wed Sep 09 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.11-1
- Added wrapper for "touch"
- Auto-create DESTDIR directory if it doesn't exist and something is redirected.
- Simplified implementation.
- Documentation: Fixed make-redir(1) so it describes how to use in RPM spec
  files, more override info, note that it's useful with GNU stow, etc.
- make-redir now overrides MKDIR_P and mkdir_p by default




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Sep 2009 21:56:18 -0000	1.2
+++ .cvsignore	11 Sep 2009 01:35:27 -0000	1.3
@@ -1 +1 @@
-auto-destdir-1.10.tgz
+auto-destdir-1.11.tgz


Index: auto-destdir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-11/auto-destdir.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- auto-destdir.spec	2 Sep 2009 21:56:18 -0000	1.1
+++ auto-destdir.spec	11 Sep 2009 01:35:28 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		auto-destdir
-Version:	1.10
+Version:	1.11
 Release:	1%{?dist}
 Summary:	Automate DESTDIR support for "make install"
 
@@ -20,6 +20,8 @@ from source code to be managed by tools 
 The Auto-DESTDIR tools (run-redir and make-redir) redirect file installations
 so that the installed files are placed inside the the $DESTDIR directory,
 even if the provided makefile doesn't support the DESTDIR convention.
+In most cases you can simply replace "make install" with
+"make-redir DESTDIR=... install".
 
 %prep
 %setup -q
@@ -47,7 +49,15 @@ rm -rf %{buildroot}
 %doc README COPYING
 
 %changelog
-* Mon Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
+* Wed Sep 09 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.11-1
+- Added wrapper for "touch"
+- Auto-create DESTDIR directory if it doesn't exist and something is redirected.
+- Simplified implementation.
+- Documentation: Fixed make-redir(1) so it describes how to use in RPM spec
+  files, more override info, note that it's useful with GNU stow, etc.
+- make-redir now overrides MKDIR_P and mkdir_p by default
+
+* Wed Sep 02 2009 David A. Wheeler <dwheeler , at, dwheeler dot com> 1.10-1
 - Test suite improvements: More tests, runs on Cygwin.
 - Simplified .spec file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-destdir/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Sep 2009 21:56:18 -0000	1.2
+++ sources	11 Sep 2009 01:35:28 -0000	1.3
@@ -1 +1 @@
-e78d909dd0dcc5a594726f5efd3dee7e  auto-destdir-1.10.tgz
+ea9e719fba20898c07d1a765ce483f3e  auto-destdir-1.11.tgz



From lennart at fedoraproject.org  Fri Sep 11 01:56:51 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 11 Sep 2009 01:56:51 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.42, 1.43 pulseaudio.spec, 1.99, 
	1.100 sources, 1.46, 1.47
Message-ID: <20090911015651.60B5611C00DB@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19070

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
Final release 0.9.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	10 Sep 2009 01:15:19 -0000	1.42
+++ .cvsignore	11 Sep 2009 01:56:51 -0000	1.43
@@ -1 +1 @@
-pulseaudio-0.9.16.tar.gz
+pulseaudio-0.9.17.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- pulseaudio.spec	10 Sep 2009 01:15:19 -0000	1.99
+++ pulseaudio.spec	11 Sep 2009 01:56:51 -0000	1.100
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
-Version:        0.9.16
-Release:        14%{?dist}
+Version:        0.9.17
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -434,6 +434,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Fri Sep 11 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.17-1
+- Final release
+
 * Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-14
 - Final release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	10 Sep 2009 01:15:19 -0000	1.46
+++ sources	11 Sep 2009 01:56:51 -0000	1.47
@@ -1 +1 @@
-ed640790249af56b5f022ad37588fa97  pulseaudio-0.9.16.tar.gz
+cba8f14b8213f47e1d35da3a0a3cb076  pulseaudio-0.9.17.tar.gz



From whot at fedoraproject.org  Fri Sep 11 02:05:54 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 11 Sep 2009 02:05:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-void/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-void.spec, 1.25,
	1.26 void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch, 1.1, NONE
Message-ID: <20090911020554.E306D11C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-void/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21872

Modified Files:
	.cvsignore sources xorg-x11-drv-void.spec 
Removed Files:
	void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch 
Log Message:
* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
- void 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Feb 2009 22:58:09 -0000	1.9
+++ .cvsignore	11 Sep 2009 02:05:54 -0000	1.10
@@ -1 +1 @@
-xf86-input-void-1.2.0.tar.bz2
+xf86-input-void-1.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Feb 2009 22:58:09 -0000	1.9
+++ sources	11 Sep 2009 02:05:54 -0000	1.10
@@ -1 +1 @@
-c81fbd9368abbe1488b423ddef477e88  xf86-input-void-1.2.0.tar.bz2
+53bdac9ca56418f4675810ed8a78b3e8  xf86-input-void-1.3.0.tar.bz2


Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-void.spec	27 Jul 2009 08:35:25 -0000	1.25
+++ xorg-x11-drv-void.spec	11 Sep 2009 02:05:54 -0000	1.26
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
-Version:   1.2.0
-Release:   3%{?dist}.1
+Version:   1.3.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,8 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch1:    void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
@@ -27,8 +25,6 @@ X.Org X11 void input driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch1 -p1
-
 %build
 %configure --disable-static
 make
@@ -52,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/void.4*
 
 %changelog
+* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
+- void 1.3.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch DELETED ---



From whot at fedoraproject.org  Fri Sep 11 02:18:11 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 11 Sep 2009 02:18:11 +0000 (UTC)
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.26,1.27
Message-ID: <20090911021812.012AE11C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-void/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24809

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-2
- Require xorg-x11-util-macros 1.3.0



Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xorg-x11-drv-void.spec	11 Sep 2009 02:05:54 -0000	1.26
+++ xorg-x11-drv-void.spec	11 Sep 2009 02:18:11 -0000	1.27
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
 Version:   1.3.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@ Source0:   ftp://ftp.x.org/pub/individua
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
+BuildRequires: xorg-x11-util-macros >= 1.3.0
 
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 
@@ -48,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/void.4*
 
 %changelog
+* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-2
+- Require xorg-x11-util-macros 1.3.0
+
 * Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
 - void 1.3.0
 



From whot at fedoraproject.org  Fri Sep 11 02:19:04 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 11 Sep 2009 02:19:04 +0000 (UTC)
Subject: rpms/xorg-x11-drv-acecad/devel .cvsignore, 1.9, 1.10 sources, 1.9, 
	1.10 xorg-x11-drv-acecad.spec, 1.21, 1.22 acecad-1.3.0-abi.patch,
	1.1, NONE
Message-ID: <20090911021904.23BA911C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-acecad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25118

Modified Files:
	.cvsignore sources xorg-x11-drv-acecad.spec 
Removed Files:
	acecad-1.3.0-abi.patch 
Log Message:
* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
- acecad 1.4.0
- acecad-1.3.0-abi.patch: Drop.
- Require xorg-x11-util-macros 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-acecad/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Feb 2009 03:33:22 -0000	1.9
+++ .cvsignore	11 Sep 2009 02:19:03 -0000	1.10
@@ -1 +1 @@
-xf86-input-acecad-1.3.0.tar.bz2
+xf86-input-acecad-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-acecad/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Feb 2009 03:33:22 -0000	1.9
+++ sources	11 Sep 2009 02:19:04 -0000	1.10
@@ -1 +1 @@
-dd8821ea9239d86d67a84912f4702adf  xf86-input-acecad-1.3.0.tar.bz2
+51247dc0d73185e35bec326283bc49a5  xf86-input-acecad-1.4.0.tar.bz2


Index: xorg-x11-drv-acecad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-acecad/devel/xorg-x11-drv-acecad.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xorg-x11-drv-acecad.spec	27 Jul 2009 08:22:35 -0000	1.21
+++ xorg-x11-drv-acecad.spec	11 Sep 2009 02:19:04 -0000	1.22
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 acecad input driver
 Name:      xorg-x11-drv-acecad
-Version: 1.3.0
-Release: 3%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,11 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch1: acecad-1.3.0-abi.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-util-macros >= 1.3.0
 
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 %description 
@@ -25,7 +24,6 @@ X.Org X11 acecad input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p1
 
 %build
 %configure --disable-static
@@ -48,6 +46,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/acecad.4*
 
 %changelog
+* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
+- acecad 1.4.0
+- acecad-1.3.0-abi.patch: Drop.
+- Require xorg-x11-util-macros 1.3.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- acecad-1.3.0-abi.patch DELETED ---



From whot at fedoraproject.org  Fri Sep 11 02:19:22 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 11 Sep 2009 02:19:22 +0000 (UTC)
Subject: rpms/xorg-x11-drv-aiptek/devel .cvsignore, 1.9, 1.10 sources, 1.9, 
	1.10 xorg-x11-drv-aiptek.spec, 1.21, 1.22
Message-ID: <20090911021922.7AFCA11C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-aiptek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25187

Modified Files:
	.cvsignore sources xorg-x11-drv-aiptek.spec 
Log Message:
* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
- aiptek 1.3.0
- aiptek-1.2.0-abi.patch: Drop
- Require xorg-x11-util-macros 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-aiptek/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Feb 2009 03:52:43 -0000	1.9
+++ .cvsignore	11 Sep 2009 02:19:22 -0000	1.10
@@ -1 +1 @@
-xf86-input-aiptek-1.2.0.tar.bz2
+xf86-input-aiptek-1.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-aiptek/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Feb 2009 03:52:43 -0000	1.9
+++ sources	11 Sep 2009 02:19:22 -0000	1.10
@@ -1 +1 @@
-ae6702ead7b4040d0761809ee471c934  xf86-input-aiptek-1.2.0.tar.bz2
+ae3ec07aff6c156cf5307f53feb6b293  xf86-input-aiptek-1.3.0.tar.bz2


Index: xorg-x11-drv-aiptek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-aiptek/devel/xorg-x11-drv-aiptek.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xorg-x11-drv-aiptek.spec	27 Jul 2009 08:22:49 -0000	1.21
+++ xorg-x11-drv-aiptek.spec	11 Sep 2009 02:19:22 -0000	1.22
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,11 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch1:    aiptek-1.2.0-abi.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-util-macros >= 1.3.0
 
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
@@ -26,7 +25,6 @@ X.Org X11 aiptek input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p1
 
 %build
 %configure --disable-static
@@ -50,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/aiptek.4*
 
 %changelog
+* Fri Sep 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
+- aiptek 1.3.0
+- aiptek-1.2.0-abi.patch: Drop
+- Require xorg-x11-util-macros 1.3.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Sep 11 02:30:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 02:30:44 +0000
Subject: [pkgdb] nazghul (Fedora, 12) updated by tibbs
Message-ID: <20090911023044.5579C10F87A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for nazghul
tibbs has set commit to Approved for 107427 on nazghul (Fedora 12)
tibbs has set checkout to Approved for 107427 on nazghul (Fedora 12)
tibbs has set build to Approved for 107427 on nazghul (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nazghul



From transif at fedoraproject.org  Fri Sep 11 02:32:40 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 11 Sep 2009 02:32:40 +0000 (UTC)
Subject: comps/po ru.po,1.26,1.27
Message-ID: <20090911023240.4D45F11C00DB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29533/po

Modified Files:
	ru.po 
Log Message:
Sending translation for Russian


Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ru.po	10 Sep 2009 00:57:24 -0000	1.26
+++ ru.po	11 Sep 2009 02:32:39 -0000	1.27
@@ -1,3 +1,4 @@
+# translation of ru.po to Russian
 # translation of ru.po to
 # translation of comps.HEAD.ru.po to
 # This file is distributed under the same license as the comps package.
@@ -16,10 +17,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-09 19:36+0000\n"
-"PO-Revision-Date: 2009-09-10 10:56+1000\n"
-"Last-Translator: Yulia Poyarkova <yulia.poyarkova at redhat.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-09-11 02:24+0000\n"
+"PO-Revision-Date: 2009-09-11 12:31+1000\n"
+"Last-Translator: Yulia Poyarkova <yulia.poyarkova at gmail.com>\n"
+"Language-Team: Russian <fedora-trans-ru at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -296,7 +297,7 @@ msgstr "????????? Fedora"
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
 #: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
 msgid "Filipino Support"
-msgstr "????????? ???????????? ?????"
+msgstr "????????? ????????????? ?????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
 #: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
@@ -797,7 +798,7 @@ msgstr "???????"
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
 #: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
 msgid "Simple window managers that aren't part of a larger desktop environment."
-msgstr "??????? ??????? ?????????, ?? ?????????? ?????? ??????-???? ???????? ?????."
+msgstr "??????? ??????? ?????????, ?? ?????????? ?????? ??????-???? ???????? ?????."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182



From xulchris at fedoraproject.org  Fri Sep 11 03:33:38 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Fri, 11 Sep 2009 03:33:38 +0000 (UTC)
Subject: rpms/php-pear-PHPUnit/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 dead.package, 1.1, NONE
Message-ID: <20090911033339.3104811C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-PHPUnit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14338

Modified Files:
	.cvsignore sources 
Removed Files:
	dead.package 
Log Message:
make package undead bz#510521


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Feb 2008 21:31:52 -0000	1.3
+++ .cvsignore	11 Sep 2009 03:33:37 -0000	1.4
@@ -1 +1 @@
-PHPUnit-3.2.13.tgz
+PHPUnit-3.3.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Feb 2008 21:31:52 -0000	1.3
+++ sources	11 Sep 2009 03:33:37 -0000	1.4
@@ -1 +1 @@
-4bce4b6e2e9bee3ba599c21e17d73f1b  PHPUnit-3.2.13.tgz
+24fa07b8b3b4e93edfce881ef02e5c4d  PHPUnit-3.3.5.tgz


--- dead.package DELETED ---



From xulchris at fedoraproject.org  Fri Sep 11 03:34:05 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Fri, 11 Sep 2009 03:34:05 +0000 (UTC)
Subject: rpms/php-pear-PHPUnit/EL-5 php-pear-PHPUnit.spec,1.4,1.5
Message-ID: <20090911033405.C0B5011C00DB@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-PHPUnit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14487

Added Files:
	php-pear-PHPUnit.spec 
Log Message:
forgot to cvs add spec file before previous commit


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: php-pear-PHPUnit.spec
diff -N php-pear-PHPUnit.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ php-pear-PHPUnit.spec	11 Sep 2009 03:34:05 -0000	1.5
@@ -0,0 +1,174 @@
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%global pear_name PHPUnit
+%global channel pear.phpunit.de
+
+Name:           php-pear-PHPUnit
+Version:        3.3.5
+Release:        2%{?dist}
+Summary:        Regression testing framework for unit tests
+
+Group:          Development/Libraries
+License:        BSD
+URL:            http://www.phpunit.de
+Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  php-pear(PEAR) >= 1.4.1
+BuildRequires:  php-channel(pear.phpunit.de)
+
+Requires:       php-common >= 5.1.4 php-xml
+Requires:       php-pear(PEAR) >= 1.4.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-pecl-json php-pdo
+Requires:       php-pecl(Xdebug) >= 2.0.0
+
+Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
+
+%description
+PHPUnit is a family of PEAR packages that supports the development of
+object-oriented PHP applications using the concepts and methods of Agile
+Software Development, Extreme Programming, Test-Driven Development and
+Design-by-Contract Development by providing an elegant and robust framework
+for the creation, execution and analysis of Unit Tests.
+
+
+%prep
+%setup -qc
+# package.xml is V2
+mv package.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 $RPM_BUILD_ROOT docdir
+
+# Install Package
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
+# Clean up unnecessary files
+rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+
+# Install XML package description
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+# Unregister pear.php.net/PHPUnit, new PHPUnit is in another channel
+if [ $1 -gt  1 ] ; then
+%{__pear} uninstall --nodeps --ignore-errors --register-only \
+    %{pear_name} >/dev/null || :
+fi
+
+%{__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_name}/%{pear_name}/*
+%{pear_xmldir}/%{name}.xml
+%{pear_testdir}/%{pear_name}
+%{pear_phpdir}/%{pear_name}
+%{_bindir}/phpunit
+
+
+%changelog
+* Thu Sep 10 2009 Christopher Stone <chris.stone at gmail.com> 3.3.5-2
+- Make package undead for EL-5 (bz #510521)
+- Change Requires for php-json to php-pecl-json
+
+* Fri Jul 03 2009 Xavier Bachelot <xavier at bachelot.org> - 3.3.5-1
+- Adapt for EL5 (Include fixes from 3.3.16-1 by Remi Collet).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov  8 2008 Christopher Stone <chris.stone at gmail.com> 3.3.4-1
+- Upstream sync
+
+* Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 3.3.2-1
+- Upstream sync
+- Remove no longer needed Obsolete/Provides
+
+* Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 3.3.1-1
+- Upstream sync
+
+* Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 3.2.21-1
+- Upstream sync
+- Add php-xml to Requires (bz #464758)
+
+* Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 3.2.19-1
+- Upstream sync
+
+* Thu Feb 21 2008 Christopher Stone <chris.stone at gmail.com> 3.2.15-1
+- Upstream sync
+
+* Wed Feb 13 2008 Christopher Stone <chris.stone at gmail.com> 3.2.13-1
+- Upstream sync
+
+* Sun Nov 25 2007 Christopher Stone <chris.stone at gmail.com> 3.2.1-1
+- Upstream sync
+
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 3.1.8-1
+- Upstream sync
+
+* Sun May 06 2007 Christopher Stone <chris.stone at gmail.com> 3.0.6-1
+- Upstream sync
+
+* Thu Mar 08 2007 Christopher Stone <chris.stone at gmail.com> 3.0.5-3
+- Fix testdir
+- Fix Provides version
+
+* Wed Mar 07 2007 Christopher Stone <chris.stone at gmail.com> 3.0.5-2
+- Add Obsoletes/Provides for php-pear(PHPUnit2)
+- Requires php-pear(PEAR) >= 1.5.0
+- Own %%{pear_testdir}/%%{pear_name}
+- Remove no longer needed manual channel install
+- Simplify %%doc
+- Only unregister old phpunit on upgrade
+
+* Mon Feb 26 2007 Christopher Stone <chris.stone at gmail.com> 3.0.5-1
+- Upstream sync
+
+* Wed Feb 21 2007 Christohper Stone <chris.stone at gmail.com> 3.0.4-1
+- Upstream sync
+
+* Mon Jan 29 2007 Christopher Stone <chris.stone at gmail.com> 3.0.3-1
+- Upstream sync
+
+* Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 3.0.2-1
+- Upstream sync
+
+* Fri Jan 05 2007 Christopher Stone <chris.stone at gmail.com> 3.0.1-1
+- Upstream sync
+
+* Wed Dec 27 2006 Christopher Stone <chris.stone at gmail.com> 3.0.0-1
+- Initial Release



From lucilanga at fedoraproject.org  Fri Sep 11 05:43:44 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 11 Sep 2009 05:43:44 +0000 (UTC)
Subject: rpms/aprsd/devel aprsd.spec,1.7,1.8
Message-ID: <20090911054344.EF79211C0099@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/aprsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5174

Modified Files:
	aprsd.spec 
Log Message:
* Fri Sep 11 2009 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.6
 - fix wrong version bumps
 - add patch from Alan Crosswell fix 'AX.25 sockets are not supported by this
 executable'


Index: aprsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- aprsd.spec	24 Jul 2009 17:00:17 -0000	1.7
+++ aprsd.spec	11 Sep 2009 05:43:44 -0000	1.8
@@ -2,7 +2,7 @@
 Name: aprsd
 Summary: Internet gateway and client access to amateur radio APRS packet data
 Version: 2.2.5
-Release: %{uprel}.5%{?dist}.2
+Release: %{uprel}.6%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz
@@ -18,6 +18,7 @@ Patch1: aprsd-2.2.5-15-gcc43-port.patch
 Patch2: aprsd-2.2.5-15-sysconfdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://sourceforge.net/projects/aprsd/
+BuildRequires: libax25-devel
 Requires (preun): /sbin/chkconfig
 Requires (preun): /sbin/service
 Requires (post): /sbin/chkconfig
@@ -85,6 +86,11 @@ fi
 %doc doc/qalgorithm.html
 
 %changelog
+* Fri Sep 11 2009 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.6
+ - fix wrong version bumps
+ - add patch from Alan Crosswell fix 'AX.25 sockets are not supported by this
+ executable'
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.5-15.5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bskeggs at fedoraproject.org  Fri Sep 11 05:58:48 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 11 Sep 2009 05:58:48 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.34, 1.35 sources, 1.36,
	1.37 xorg-x11-drv-nv.spec, 1.92, 1.93 nv-update-git.patch, 1.1, NONE
Message-ID: <20090911055849.1587511C0099@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9567

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Removed Files:
	nv-update-git.patch 
Log Message:
* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.15-1
- nv 2.1.15




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	7 Jul 2009 17:57:19 -0000	1.34
+++ .cvsignore	11 Sep 2009 05:58:46 -0000	1.35
@@ -1 +1 @@
-xf86-video-nv-2.1.14.tar.bz2
+xf86-video-nv-2.1.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	7 Jul 2009 17:57:19 -0000	1.36
+++ sources	11 Sep 2009 05:58:47 -0000	1.37
@@ -1 +1 @@
-118637515155624f8846c481a637c8c2  xf86-video-nv-2.1.14.tar.bz2
+1b22188bd9012a148206940708b52ea6  xf86-video-nv-2.1.15.tar.bz2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- xorg-x11-drv-nv.spec	27 Aug 2009 23:50:13 -0000	1.92
+++ xorg-x11-drv-nv.spec	11 Sep 2009 05:58:47 -0000	1.93
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   2.1.14
-Release:   5%{?dist}
+Version:   2.1.15
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -22,7 +22,6 @@ BuildRequires: libdrm-devel >= 2.3.0-7
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.6.0
 
-Patch3:     nv-update-git.patch
 Patch4:     nv-reserve-fbarea.patch
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
@@ -37,7 +36,6 @@ X.Org X11 nv video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch3 -p1 -b .git
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
@@ -72,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.15-1
+- nv 2.1.15
+
 * Fri Aug 28 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.14-5
 - refuse to load if KMS driver already using the hw
 


--- nv-update-git.patch DELETED ---



From cweyl at fedoraproject.org  Fri Sep 11 06:05:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 11 Sep 2009 06:05:48 +0000 (UTC)
Subject: rpms/perl-DBIx-Class/devel .cvsignore, 1.6, 1.7 perl-DBIx-Class.spec,
	1.17, 1.18 sources, 1.6, 1.7
Message-ID: <20090911060548.57F7611C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11526

Modified Files:
	.cvsignore perl-DBIx-Class.spec sources 
Log Message:
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08111-1
- update filtering
- auto-update to 0.08111 (by cpan-spec-update 0.01)
- altered br on perl(Carp::Clan) (6 => 6.0)
- altered br on perl(Class::Accessor::Grouped) (0.08003 => 0.09000)
- altered br on perl(Data::Page) (2 => 2.00)
- altered br on perl(File::Temp) (0 => 0.22)
- altered br on perl(SQL::Abstract) (1.56 => 1.58)
- altered br on perl(Test::More) (0 => 0.92)
- altered br on perl(Test::Warn) (0.11 => 0.21)
- altered req on perl(Carp::Clan) (6 => 6.0)
- altered req on perl(Class::Accessor::Grouped) (0.08003 => 0.09000)
- altered req on perl(Data::Page) (2 => 2.00)
- altered req on perl(SQL::Abstract) (1.56 => 1.58)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Jul 2009 07:24:12 -0000	1.6
+++ .cvsignore	11 Sep 2009 06:05:47 -0000	1.7
@@ -1 +1 @@
-DBIx-Class-0.08108.tar.gz
+DBIx-Class-0.08111.tar.gz


Index: perl-DBIx-Class.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/devel/perl-DBIx-Class.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-DBIx-Class.spec	31 Jul 2009 07:24:49 -0000	1.17
+++ perl-DBIx-Class.spec	11 Sep 2009 06:05:47 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-Class
-Version:        0.08108
+Version:        0.08111
 Release:        1%{?dist}
 Summary:        Extensible and flexible object <-> relational mapper
 License:        GPL+ or Artistic
@@ -22,15 +22,15 @@ BuildRequires:  perl(Test::Deep)
 BuildRequires:  perl(CPAN)
 
 ## Dependencies
-BuildRequires:  perl(Carp::Clan) >= 6
-BuildRequires:  perl(Class::Accessor::Grouped) >= 0.08003
+BuildRequires:  perl(Carp::Clan) >= 6.0
+BuildRequires:  perl(Class::Accessor::Grouped) >= 0.09000
 BuildRequires:  perl(Class::C3) >= 0.2
 BuildRequires:  perl(Class::C3::Componentised) >= 1.0005
 # for CDBI-compat bits...
 BuildRequires:  perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Inspector) >= 1.24
 BuildRequires:  perl(Class::Trigger)
-BuildRequires:  perl(Data::Page) >= 2
+BuildRequires:  perl(Data::Page) >= 2.00
 BuildRequires:  perl(DBD::SQLite) >= 1.25
 BuildRequires:  perl(DBI) >= 1.605
 BuildRequires:  perl(DBIx::ContextualFetch)
@@ -38,7 +38,7 @@ BuildRequires:  perl(JSON::Any) >= 1.18
 BuildRequires:  perl(List::Util) >= 1.19
 BuildRequires:  perl(Module::Find) >= 0.06
 BuildRequires:  perl(Scope::Guard) >= 0.03
-BuildRequires:  perl(SQL::Abstract) >= 1.56
+BuildRequires:  perl(SQL::Abstract) >= 1.58
 BuildRequires:  perl(SQL::Abstract::Limit) >= 0.13
 BuildRequires:  perl(Test::Exception)
 # optional tests
@@ -61,9 +61,9 @@ BuildRequires:  perl(Class::MOP) >= 0.63
 BuildRequires:  perl(Moose) >= 0.54
 BuildRequires:  perl(Moose::Util::TypeConstraints) >= 0.54
 
-BuildRequires:  perl(Test::More) >= 0.82
+BuildRequires:  perl(Test::More) >= 0.92
 BuildRequires:  perl(MRO::Compat) >= 0.09
-BuildRequires:  perl(Test::Warn) >= 0.11
+BuildRequires:  perl(Test::Warn) >= 0.21
 BuildRequires:  perl(Sub::Name) >= 0.04
 BuildRequires:  perl(Path::Class) >= 0.16
 
@@ -73,16 +73,16 @@ Provides:       perl(DBIx::Class::CDBICo
 Provides:       perl(DBIx::Class::Storage::DBI::Replicated::Types) = 0
 
 # not picked up...
-Requires:       perl(Class::Accessor::Grouped) >= 0.08003
+Requires:       perl(Class::Accessor::Grouped) >= 0.09000
 Requires:       perl(Class::C3::Componentised) >= 1.0005
-Requires:       perl(SQL::Abstract) >= 1.56
+Requires:       perl(SQL::Abstract) >= 1.58
 
 ### auto-added reqs!
-Requires:  perl(Carp::Clan) >= 6
+Requires:  perl(Carp::Clan) >= 6.0
 Requires:  perl(Class::Inspector) >= 1.24
 Requires:  perl(DBD::SQLite) >= 1.25
 Requires:  perl(DBI) >= 1.605
-Requires:  perl(Data::Page) >= 2
+Requires:  perl(Data::Page) >= 2.00
 Requires:  perl(JSON::Any) >= 1.18
 Requires:  perl(List::Util)
 Requires:  perl(MRO::Compat) >= 0.09
@@ -94,12 +94,13 @@ Requires:  perl(Scope::Guard) >= 0.03
 Requires:  perl(Storable)
 Requires:  perl(Sub::Name) >= 0.04
 
-# don't "provide" rpm-metadata for things we shouldn't
-%global _use_internal_dependency_generator 0
-%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} | %{__sed} -e '/perl(DBD::Pg)/d; /perl(DBD::Oracle)/d'"
+%{?perl_default_filter:
+%filter_from_requires /^perl(DBD::Pg)/d
+%perl_default_filter
+}
 
+### auto-added brs!
+BuildRequires:  perl(File::Temp) >= 0.22
 
 %description
 This is an SQL to OO mapper with an object API inspired by Class::DBI
@@ -114,7 +115,7 @@ DISTINCT, GROUP BY and HAVING support.
 %prep
 %setup -q -n DBIx-Class-%{version}
 
-find t/ -type f -exec perl -pi -e 's|\r||; s|^#!perl|#!/usr/bin/perl|' {} +
+find t/ -type f -exec perl -pi -e 's|\r||; s|^#!perl|#!%{__perl}|' {} +
 find .  -type f -exec chmod -c -x {} +
 find t/ -type f -name '*.orig' -exec rm -v {} +
 
@@ -158,6 +159,26 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08111-1
+- update filtering
+- auto-update to 0.08111 (by cpan-spec-update 0.01)
+- altered br on perl(Carp::Clan) (6 => 6.0)
+- altered br on perl(Class::Accessor::Grouped) (0.08003 => 0.09000)
+- altered br on perl(Data::Page) (2 => 2.00)
+- altered br on perl(File::Temp) (0 => 0.22)
+- altered br on perl(SQL::Abstract) (1.56 => 1.58)
+- altered br on perl(Test::More) (0 => 0.92)
+- altered br on perl(Test::Warn) (0.11 => 0.21)
+- altered req on perl(Carp::Clan) (6 => 6.0)
+- altered req on perl(Class::Accessor::Grouped) (0.08003 => 0.09000)
+- altered req on perl(Data::Page) (2 => 2.00)
+- altered req on perl(SQL::Abstract) (1.56 => 1.58)
+
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08109-1
+- auto-update to 0.08109 (by cpan-spec-update 0.01)
+- added a new br on perl(File::Temp) (version 0.22)
+- altered br on perl(Test::More) (0.82 => 0.92)
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08108-1
 - auto-update to 0.08108 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	31 Jul 2009 07:24:12 -0000	1.6
+++ sources	11 Sep 2009 06:05:47 -0000	1.7
@@ -1 +1 @@
-ed377d6968192fcf874ee5b92d212382  DBIx-Class-0.08108.tar.gz
+cdca0d2d974d9c583a266375ee4ab941  DBIx-Class-0.08111.tar.gz



From pghmcfc at fedoraproject.org  Fri Sep 11 06:26:01 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 11 Sep 2009 06:26:01 +0000 (UTC)
Subject: rpms/libpng10/devel libpng-1.0.49-garbage.patch, NONE,
	1.1 .cvsignore, 
	1.23, 1.24 libpng10.spec, 1.33, 1.34 sources, 1.23, 1.24
Message-ID: <20090911062601.3C32311C0099@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16755

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.49-garbage.patch 
Log Message:
update to 1.0.49 (minor bugfixes)
patch out garbage in source files left over from edit gone wrong


libpng-1.0.49-garbage.patch:
 pngset.c   |   10 +++++-----
 pngwutil.c |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE libpng-1.0.49-garbage.patch ---
diff -ur libpng-1.0.49.orig/pngset.c libpng-1.0.49/pngset.c
--- libpng-1.0.49.orig/pngset.c	2009-09-10 12:38:26.000000000 +0100
+++ libpng-1.0.49/pngset.c	2009-09-10 23:06:25.000000000 +0100
@@ -901,17 +901,17 @@
 #if defined(PNG_tRNS_SUPPORTED)
 void PNGAPI
 png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
-   png_bytep %TA%, int num_trans, png_color_16p trans_values)
+   png_bytep trans, int num_trans, png_color_16p trans_values)
 {
    png_debug1(1, "in %s storage function", "tRNS");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   if (%TA% != NULL)
+   if (trans != NULL)
    {
        /*
-        * It may not actually be necessary to set png_ptr->%TA% here;
+        * It may not actually be necessary to set png_ptr->trans here;
         * we do it for backward compatibility with the way the png_handle_tRNS
         * function used to do the allocation.
         */
@@ -921,10 +921,10 @@
 #endif
 
        /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-       png_ptr->%TA% = info_ptr->%TA% = (png_bytep)png_malloc(png_ptr,
+       png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
            (png_uint_32)PNG_MAX_PALETTE_LENGTH);
        if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-          png_memcpy(info_ptr->%TA%, %TA%, (png_size_t)num_trans);
+          png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);
    }
 
    if (trans_values != NULL)
diff -ur libpng-1.0.49.orig/pngwutil.c libpng-1.0.49/pngwutil.c
--- libpng-1.0.49.orig/pngwutil.c	2009-09-10 12:38:26.000000000 +0100
+++ libpng-1.0.49/pngwutil.c	2009-09-10 23:06:25.000000000 +0100
@@ -1068,7 +1068,7 @@
 #if defined(PNG_WRITE_tRNS_SUPPORTED)
 /* Write the tRNS chunk */
 void /* PRIVATE */
-png_write_tRNS(png_structp png_ptr, png_bytep %TA%, png_color_16p tran,
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
    int num_trans, int color_type)
 {
 #ifdef PNG_USE_LOCAL_ARRAYS
@@ -1086,7 +1086,7 @@
          return;
       }
       /* Write the chunk out as it is */
-      png_write_chunk(png_ptr, (png_bytep)png_tRNS, %TA%,
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, trans,
         (png_size_t)num_trans);
    }
    else if (color_type == PNG_COLOR_TYPE_GRAY)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	13 Aug 2009 15:45:11 -0000	1.23
+++ .cvsignore	11 Sep 2009 06:25:59 -0000	1.24
@@ -1 +1 @@
-libpng-1.0.48.tar.bz2
+libpng-1.0.49.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libpng10.spec	13 Aug 2009 15:45:12 -0000	1.33
+++ libpng10.spec	11 Sep 2009 06:25:59 -0000	1.34
@@ -1,12 +1,13 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.48
+Version:	1.0.49
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
 Patch0:		libpng-1.0.48-soname.patch
+Patch1:		libpng-1.0.49-garbage.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -38,6 +39,9 @@ libpng10-devel.
 # We want an soname of 2.%{version}
 %patch0 -p1 -b .soname
 
+# Apply edit upstream forgot to do
+%patch1 -p1 -b .garbage
+
 %build
 %configure \
 	--disable-static \
@@ -111,6 +115,10 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Thu Sep 10 2009 Paul Howarth <paul at city-fan.org> 1.0.49-1
+- update to 1.0.49 (minor bugfixes)
+- patch out garbage in source files left over from edit gone wrong
+
 * Thu Aug 13 2009 Paul Howarth <paul at city-fan.org> 1.0.48-1
 - update to 1.0.48
   - avoid a possible NULL dereference in debug build, in png_set_text_2()


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	13 Aug 2009 15:45:12 -0000	1.23
+++ sources	11 Sep 2009 06:25:59 -0000	1.24
@@ -1 +1 @@
-e440d8789d8ce5563d4ada7e57a8b0ac  libpng-1.0.48.tar.bz2
+77fd98589f10710c1413fcbf5605372f  libpng-1.0.49.tar.bz2



From dtardon at fedoraproject.org  Fri Sep 11 06:51:29 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 11 Sep 2009 06:51:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2001,1.2002
Message-ID: <20090911065129.6FD0F11C0099@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26764

Modified Files:
	openoffice.org.spec 
Log Message:
make oo.o buildable without langpacks again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -p -r1.2001 -r1.2002
--- openoffice.org.spec	8 Sep 2009 11:51:04 -0000	1.2001
+++ openoffice.org.spec	11 Sep 2009 06:51:26 -0000	1.2002
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -1778,9 +1778,11 @@ if ! build --dlv_switch -link --all $BUI
     build --dlv_switch -link --all
 fi
 deliver -link
+%if %{langpacks}
 # i99658
 cp %{SOURCE10} .
 localize -m -x -l or-IN -f or-IN_DEV300_m40.sdf
+%endif
 cd ../..
 
 pushd solver/%{OFFICEUPD}/unxlng*/bin
@@ -2072,6 +2074,7 @@ en_ZA_aliases="en-NA en-ZW"
 for lang in $en_ZA_aliases; do
         ln -sf acor_en-ZA.dat acor_$lang.dat
 done
+%if %{langpacks}
 af_ZA_aliases="af-NA"
 for lang in $af_ZA_aliases; do
         ln -sf acor_af-ZA.dat acor_$lang.dat
@@ -2100,10 +2103,15 @@ sv_SE_aliases="sv-FI"
 for lang in $sv_SE_aliases; do
         ln -s acor_sv-SE.dat acor_$lang.dat
 done
+%else
+rm -f acor_[a-df-z]*.dat acor_e[su]*.dat
+%endif
 popd
 #rhbz#484055 make these shared across multiple applications
 mv -f $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr $RPM_BUILD_ROOT/%{_datadir}/autocorr
 
+%if %{langpacks}
+
 #auto generate the langpack file lists, format is...
 #langpack id, has help or not, autocorrection glob, script classification
 langpackdetails=\
@@ -2164,7 +2172,7 @@ while [ $i -lt ${#langpackdetails[@]} ];
      sed -e "s/LANG/$lang/g" langpacks/openoffice.org.langpack-ctl.template >> $lang.filelist
    fi
    if [ "$type" = "ctl" ]; then
-     rm $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
+     rm -f $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
    fi
    i=$[i+1]
 done
@@ -2172,6 +2180,8 @@ done
 #rhbz#452379 clump serbian translations together
 cat sh.filelist >> sr.filelist
 
+%endif
+
 #add in some templates
 tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
 tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
@@ -2286,10 +2296,12 @@ sed -i -e "s/LAUNCHER/soffice/g" $RPM_BU
 sed -i -e "s/BRAND/openoffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 
+%if %{langpacks}
 cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
 sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
 sed -i -e "s/BRAND/broffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+%endif
 
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
@@ -2356,10 +2368,12 @@ sed -i -e s/openofficeorg$PRODUCTVERSION
   ./mime-info/openoffice.org.keys
 sed -i -e s/openoffice.org$PRODUCTVERSIONSHORT/openoffice.org/g \
   ./mime-info/openoffice.org.keys
+%if %{langpacks}
 sed -i -e s/brofficeorg$PRODUCTVERSIONSHORT/brofficeorg/g \
   ./mime-info/broffice.org.keys
 sed -i -e s/broffice.org$PRODUCTVERSIONSHORT/broffice.org/g \
   ./mime-info/broffice.org.keys
+%endif
 #relocate the rest of them
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -3168,6 +3182,7 @@ update-desktop-database %{_datadir}/appl
 %postun brand
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-brand
 %dir %{brinstdir}
 %doc %{brinstdir}/LICENSE
@@ -3227,6 +3242,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/icons/*/*/*/broffice*
 #launchers
 %{_bindir}/broffice.org
+%endif
 
 %post -n broffice.org-brand
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3310,6 +3326,7 @@ update-desktop-database %{_datadir}/appl
 %postun base
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-base
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3317,6 +3334,7 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/sbase
 %{_datadir}/applications/broffice.org-base.desktop
 %{_datadir}/mimelnk/application/broffice.org-*database*
+%endif
 
 %post -n broffice.org-base
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3598,6 +3616,7 @@ update-desktop-database %{_datadir}/appl
 %postun calc
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-calc
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3607,6 +3626,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/applications/broffice.org-calc.desktop
 %{_datadir}/mimelnk/application/broffice.org-ms-excel*
 %{_datadir}/mimelnk/application/broffice.org-*spreadsheet*
+%endif
 
 %post -n broffice.org-calc
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3663,6 +3683,7 @@ update-desktop-database %{_datadir}/appl
 %postun draw
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-draw
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3671,6 +3692,7 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/sdraw.bin
 %{_datadir}/applications/broffice.org-draw.desktop
 %{_datadir}/mimelnk/application/broffice.org-*drawing*
+%endif
 
 %post -n broffice.org-draw
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3776,6 +3798,7 @@ update-desktop-database %{_datadir}/appl
 %postun writer
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-writer
 %defattr(-,root,root,-)
 %{brinstdir}/program/swriter
@@ -3786,6 +3809,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/mimelnk/application/broffice.org-*master*
 %{_datadir}/mimelnk/application/broffice.org-*text*
 %{_datadir}/mimelnk/application/broffice.org-*web*
+%endif
 
 %post -n broffice.org-writer
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3853,6 +3877,7 @@ update-desktop-database %{_datadir}/appl
 %postun impress
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-impress
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3862,6 +3887,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/applications/broffice.org-impress.desktop
 %{_datadir}/mimelnk/application/broffice.org-*presentation*
 %{_datadir}/mimelnk/application/broffice.org-ms-powerpoint-template*.desktop
+%endif
 
 %post -n broffice.org-impress
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3927,6 +3953,7 @@ update-desktop-database %{_datadir}/appl
 %postun math
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-math
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3934,6 +3961,7 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/smath
 %{_datadir}/applications/broffice.org-math.desktop
 %{_datadir}/mimelnk/application/broffice.org-*formula*
+%endif
 
 %post -n broffice.org-math
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -4087,6 +4115,8 @@ update-desktop-database %{_datadir}/appl
 %dir %{_datadir}/autocorr
 %{_datadir}/autocorr/acor_en-*
 
+%if %{langpacks}
+
 %files -n autocorr-af
 %dir %{_datadir}/autocorr
 %{_datadir}/autocorr/acor_af-*
@@ -4191,6 +4221,8 @@ update-desktop-database %{_datadir}/appl
 %dir %{_datadir}/autocorr
 %{_datadir}/autocorr/acor_zh-*
 
+%endif
+
 %pre pyuno
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
@@ -4212,6 +4244,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 11 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7-UNBUILT
+- make oo.o buildable without langpacks again
+
 * Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch
 - Resolves: rhbz#521460 - wrong page size for A3/A5



From vda at fedoraproject.org  Fri Sep 11 06:52:16 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Fri, 11 Sep 2009 06:52:16 +0000 (UTC)
Subject: rpms/busybox/devel busybox.spec,1.99,1.100
Message-ID: <20090911065216.42C1C11C0099@cvs1.fedora.phx.redhat.com>

Author: vda

Update of /cvs/extras/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26917

Modified Files:
	busybox.spec 
Log Message:
fix build on s390, ia64




Index: busybox.spec
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- busybox.spec	2 Sep 2009 18:55:09 -0000	1.99
+++ busybox.spec	11 Sep 2009 06:52:15 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.14.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -19,7 +19,7 @@ Patch22: uClibc-0.9.30.1-getline.patch
 Patch23: busybox-1.14.1-readlink.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.27.7-2
 BuildRequires: libsepol-devel
 BuildRequires: libselinux-static
@@ -32,7 +32,7 @@ BuildRequires: glibc-static
 Group: System Environment/Shells
 Summary: Version of busybox configured for use with petitboot
 
-%description 
+%description
 Busybox is a single binary which includes versions of a large number
 of system commands, including a shell.  This package can be very
 useful for recovering from certain types of system failures,
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/busybox.petitboot
 
 %changelog
+* Fri Sep 11 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.14.1-5
+- fix build on s390, ia64
+
 * Wed Sep 02 2009 Chris Lumens <clumens at redhat.com> 1.14.1-4
 - Remove busybox-anaconda (#514319).
 



From jwrdegoede at fedoraproject.org  Fri Sep 11 06:56:39 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 11 Sep 2009 06:56:39 +0000 (UTC)
Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen-viewport.patch, NONE, 
	1.1 xgalaxy.spec, 1.12, 1.13
Message-ID: <20090911065639.0B1A111C0099@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xgalaxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28227

Modified Files:
	xgalaxy.spec 
Added Files:
	xgalaxy-2.0.34-fullscreen-viewport.patch 
Log Message:
* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 2.0.34-13
- Fix (workaround) viewport issues in fullscreen mode (#522116)


xgalaxy-2.0.34-fullscreen-viewport.patch:
 makewindow.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xgalaxy-2.0.34-fullscreen-viewport.patch ---
diff -up xgalaga-2.0.34/libsprite/makewindow.c~ xgalaga-2.0.34/libsprite/makewindow.c
--- xgalaga-2.0.34/libsprite/makewindow.c~	2009-09-11 08:48:44.000000000 +0200
+++ xgalaga-2.0.34/libsprite/makewindow.c	2009-09-11 08:50:50.000000000 +0200
@@ -642,6 +642,13 @@ void W_ToggleFullscreen(_win)
       }
     }
         
+    /* Warp the pointer to the upper left corner (where our fs_window is),
+       this is necessary as the: XF86VidModeSetViewPort() call below does
+       not seem to do anything on newer Xorg servers, instead the viewport
+       seems to always be centered at the last mouse cursor position. */
+    XWarpPointer(W_Display, None, XDefaultRootWindow(W_Display),
+                 0, 0, 0, 0, 0, 0);
+
     /* Switch video mode.  */
     if ((i >= 0) &&
         ((modes[i]->hdisplay != mode.hdisplay) ||


Index: xgalaxy.spec
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xgalaxy.spec	27 Jul 2009 08:02:52 -0000	1.12
+++ xgalaxy.spec	11 Sep 2009 06:56:38 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           xgalaxy
 Version:        2.0.34
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Arcade game: shoot down the space ships attacking the planet
 Group:          Amusements/Games
 License:        GPL+
@@ -12,6 +12,7 @@ Patch0:         http://ftp.debian.org/de
 Patch1:         %{name}-2.0.34-fullscreen.patch
 Patch2:         %{name}-2.0.34-%{name}.patch
 Patch3:         %{name}-2.0.34-joy.patch
+Patch4:         %{name}-2.0.34-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel
 BuildRequires:  desktop-file-utils ImageMagick 
@@ -31,6 +32,7 @@ ships attacking the planet.
 %patch1 -p1 -z .fs
 %patch2 -p1 -z .%{name}
 %patch3 -p1 -z .joy
+%patch4 -p1 -z .viewport
 sed -e 's/Debian/Fedora/g' debian/README.Debian > README.fedora
 cat >> README.fedora << EOF
 
@@ -110,6 +112,9 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 2.0.34-13
+- Fix (workaround) viewport issues in fullscreen mode (#522116)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.34-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Fri Sep 11 07:02:25 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 11 Sep 2009 07:02:25 +0000 (UTC)
Subject: rpms/xgalaxy/devel xgalaxy.spec,1.13,1.14
Message-ID: <20090911070225.9CCCF11C0099@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xgalaxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30534

Modified Files:
	xgalaxy.spec 
Log Message:
* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 2.0.34-13
- Fix (workaround) viewport issues in fullscreen mode (#522116)



Index: xgalaxy.spec
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xgalaxy.spec	11 Sep 2009 06:56:38 -0000	1.13
+++ xgalaxy.spec	11 Sep 2009 07:02:25 -0000	1.14
@@ -15,7 +15,7 @@ Patch3:         %{name}-2.0.34-joy.patch
 Patch4:         %{name}-2.0.34-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel
-BuildRequires:  desktop-file-utils ImageMagick 
+BuildRequires:  libXxf86dga-devel desktop-file-utils ImageMagick 
 Requires:       hicolor-icon-theme
 Obsoletes:      xgalaga <= %{version}
 Provides:       xgalaga = %{version}-%{release}



From bskeggs at fedoraproject.org  Fri Sep 11 07:05:09 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 11 Sep 2009 07:05:09 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.52, 1.53 kernel.spec, 1.1793,
	1.1794
Message-ID: <20090911070509.8F88F11C0099@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31146

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: bring in Matthew Garret's initial switchable graphics support



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  748 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  675 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  443 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 57983 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- drm-nouveau.patch	11 Sep 2009 01:34:12 -0000	1.52
+++ drm-nouveau.patch	11 Sep 2009 07:05:05 -0000	1.53
@@ -1494,10 +1494,10 @@ index 0000000..576bbea
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..5a46cdd
+index 0000000..a4e8223
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,28 @@
 +#
 +# Makefile for the drm device driver.  This driver provides support for the
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
@@ -1523,8 +1523,142 @@ index 0000000..5a46cdd
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
++nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
+diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
+new file mode 100644
+index 0000000..49514c6
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
+@@ -0,0 +1,127 @@
++#include <linux/pci.h>
++#include <linux/acpi.h>
++#include <acpi/acpi_drivers.h>
++#include <acpi/acpi_bus.h>
++
++#include "drmP.h"
++#include "drm.h"
++#include "drm_sarea.h"
++#include "drm_crtc_helper.h"
++#include "nouveau_drv.h"
++#include "nouveau_drm.h"
++#include "nv50_display.h"
++
++#define NOUVEAU_DSM_SUPPORTED 0x00
++#define NOUVEAU_DSM_SUPPORTED_FUNCTIONS 0x00
++
++#define NOUVEAU_DSM_ACTIVE 0x01
++#define NOUVEAU_DSM_ACTIVE_QUERY 0x00
++
++#define NOUVEAU_DSM_LED 0x02
++#define NOUVEAU_DSM_LED_STATE 0x00
++#define NOUVEAU_DSM_LED_OFF 0x10
++#define NOUVEAU_DSM_LED_STAMINA 0x11
++#define NOUVEAU_DSM_LED_SPEED 0x12
++
++#define NOUVEAU_DSM_POWER 0x03
++#define NOUVEAU_DSM_POWER_STATE 0x00
++#define NOUVEAU_DSM_POWER_SPEED 0x01
++#define NOUVEAU_DSM_POWER_STAMINA 0x02
++
++static int nvidia_dsm(struct pci_dev *dev, int func, int arg, int *result)
++{
++	static char muid[] = {
++		0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
++		0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
++	};
++
++	struct acpi_handle *handle;
++	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
++	struct acpi_object_list input;
++	union acpi_object params[4];
++	union acpi_object *obj;
++	int err;
++
++	handle = DEVICE_ACPI_HANDLE(&dev->dev);
++
++	if (!handle)
++		return -ENODEV;
++
++	input.count = 4;
++	input.pointer = params;
++	params[0].type = ACPI_TYPE_BUFFER;
++	params[0].buffer.length = sizeof(muid);
++	params[0].buffer.pointer = (char *)muid;
++	params[1].type = ACPI_TYPE_INTEGER;
++	params[1].integer.value = 0x00000102;
++	params[2].type = ACPI_TYPE_INTEGER;
++	params[2].integer.value = func;
++	params[3].type = ACPI_TYPE_INTEGER;
++	params[3].integer.value = arg;
++
++	err = acpi_evaluate_object(handle, "_DSM", &input, &output);
++	if (err) {
++		printk(KERN_ERR "nvidia-control: failed to evaluate _DSM: %d\n",
++		       err);
++		return err;
++	}
++
++	obj = (union acpi_object *)output.pointer;
++
++	if (obj->type == ACPI_TYPE_INTEGER)
++		if (obj->integer.value == 0x80000002)
++			return -ENODEV;
++
++	if (obj->type == ACPI_TYPE_BUFFER) {
++		if (obj->buffer.length == 4 && result) {
++			*result = 0;
++			*result |= obj->buffer.pointer[0];
++			*result |= (obj->buffer.pointer[1] << 8);
++			*result |= (obj->buffer.pointer[2] << 16);
++			*result |= (obj->buffer.pointer[3] << 24);
++		}
++	}
++
++	kfree(output.pointer);
++	return 0;
++}
++
++int nouveau_hybrid_setup(struct drm_device *dev)
++{
++	struct pci_dev *pdev = dev->pdev;
++	int result;
++
++	if (nvidia_dsm(pdev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
++		       &result))
++		return -ENODEV;
++
++	printk(KERN_INFO "nouveau: _DSM hardware status gave 0x%x\n", result);
++
++	if (result &= 0x1) {	/* Stamina mode - disable the external GPU */
++		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
++			   NULL);
++		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
++			   NULL);
++	} else {		/* Ensure that the external GPU is enabled */
++		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
++		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
++			   NULL);
++	}
++
++	return 0;
++}
++
++bool nouveau_dsm_probe(struct drm_device *dev)
++{
++	struct pci_dev *pdev = dev->pdev;
++	int support = 0;
++
++	if (nvidia_dsm(pdev, NOUVEAU_DSM_SUPPORTED,
++		       NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &support))
++		return false;
++
++	if (!support)
++		return false;
++
++	return true;
++}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
 index 0000000..20564f8
@@ -10772,10 +10906,10 @@ index 0000000..f2b8b17
 +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..57e8db3
+index 0000000..6c9158e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1202 @@
+@@ -0,0 +1,1218 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -11344,6 +11478,7 @@ index 0000000..57e8db3
 +	} susres;
 +
 +	struct backlight_device *backlight;
++	bool acpi_dsm;
 +
 +	struct nouveau_channel *evo;
 +
@@ -11531,6 +11666,21 @@ index 0000000..57e8db3
 +extern int  nouveau_dma_init(struct nouveau_channel *);
 +extern int  nouveau_dma_wait(struct nouveau_channel *, int size);
 +
++/* nouveau_acpi.c */
++#ifdef CONFIG_ACPI
++extern int nouveau_hybrid_setup(struct drm_device *dev);
++extern bool nouveau_dsm_probe(struct drm_device *dev);
++#else
++static inline int nouveau_hybrid_setup(struct drm_device *dev)
++{
++	return 0;
++}
++static inline bool nouveau_dsm_probe(struct drm_device *dev)
++{
++	return false;
++}
++#endif
++
 +/* nouveau_backlight.c */
 +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
 +extern int nouveau_backlight_init(struct drm_device *);
@@ -19573,10 +19723,10 @@ index 0000000..d30c988
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..b39f11e
+index 0000000..2d62bdc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,829 @@
+@@ -0,0 +1,834 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -20120,6 +20270,11 @@ index 0000000..b39f11e
 +	NV_DEBUG(dev, "vendor: 0x%X device: 0x%X class: 0x%X\n",
 +		 dev->pci_vendor, dev->pci_device, dev->pdev->class);
 +
++	dev_priv->acpi_dsm = nouveau_dsm_probe(dev);
++
++	if (dev_priv->acpi_dsm)
++		nouveau_hybrid_setup(dev);
++
 +	/* resource 0 is mmio regs */
 +	/* resource 1 is linear FB */
 +	/* resource 2 is RAMIN (mmio regs + 0x1000000) */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1793
retrieving revision 1.1794
diff -u -p -r1.1793 -r1.1794
--- kernel.spec	11 Sep 2009 01:34:12 -0000	1.1793
+++ kernel.spec	11 Sep 2009 07:05:08 -0000	1.1794
@@ -2019,6 +2019,9 @@ fi
 
 %changelog
 * Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: bring in Matthew Garret's initial switchable graphics support
+
+* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: fixed use of strap-based panel mode when required (rh#522649)
 - nouveau: temporarily block accel on NVAC chipsets (rh#522361, rh#522575)
 



From xhorak at fedoraproject.org  Fri Sep 11 07:07:46 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:07:46 +0000 (UTC)
Subject: rpms/firefox/devel .cvsignore, 1.99, 1.100 firefox-mozconfig, 1.16, 
	1.17 firefox.spec, 1.337, 1.338 sources, 1.112, 1.113
Message-ID: <20090911070746.9A19011C0099@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31994

Modified Files:
	.cvsignore firefox-mozconfig firefox.spec sources 
Log Message:
Update to 3.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore	3 Aug 2009 22:47:02 -0000	1.99
+++ .cvsignore	11 Sep 2009 07:07:42 -0000	1.100
@@ -4,3 +4,5 @@ firefox-3.5.1-source.tar.bz2
 firefox-langpacks-3.5.1-20090717.tar.bz2
 firefox-3.5.2-source.tar.bz2
 firefox-langpacks-3.5.2-20090803.tar.bz2
+firefox-3.5.3-source.tar.bz2
+firefox-langpacks-3.5.3-20090907.tar.bz2


Index: firefox-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- firefox-mozconfig	18 Jun 2008 00:52:47 -0000	1.16
+++ firefox-mozconfig	11 Sep 2009 07:07:44 -0000	1.17
@@ -26,6 +26,7 @@ ac_add_options --enable-startup-notifica
 ac_add_options --enable-libxul
 ac_add_options --disable-crashreporter
 ac_add_options --enable-safe-browsing
+ac_add_options --enable-libnotify
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- firefox.spec	6 Aug 2009 15:24:40 -0000	1.337
+++ firefox.spec	11 Sep 2009 07:07:44 -0000	1.338
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.2-2
+%define xulrunner_version 1.9.1.3-1
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,8 +18,8 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.2
-Release:        3%{?dist}
+Version:        3.5.3
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -30,7 +30,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090803.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090907.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -329,6 +329,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.5.3-1
+- Update to 3.5.3
+
 * Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-3
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	3 Aug 2009 22:47:03 -0000	1.112
+++ sources	11 Sep 2009 07:07:45 -0000	1.113
@@ -1,2 +1,2 @@
-0de7173e45df009f5a2620fcceb010fb  firefox-3.5.2-source.tar.bz2
-3b78b4648ef24f52b4f092dc05f79956  firefox-langpacks-3.5.2-20090803.tar.bz2
+ca167e69180ab1230aea0763da270a95  firefox-3.5.3-source.tar.bz2
+66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 11 07:11:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 07:11:48 +0000
Subject: [pkgdb] lohit-assamese-fonts was added for pravins
Message-ID: <20090911071148.A791A10F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-assamese-fonts with summary Free Assamese Open Type Font
petersen has approved Package lohit-assamese-fonts
petersen has added a Fedora devel branch for lohit-assamese-fonts with an owner of pravins
petersen has approved lohit-assamese-fonts in Fedora devel
petersen has approved Package lohit-assamese-fonts
petersen has set commit to Approved for 107427 on lohit-assamese-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-assamese-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-assamese-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-assamese-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 07:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 07:11:49 +0000
Subject: [pkgdb] lohit-assamese-fonts summary updated by petersen
Message-ID: <20090911071150.1B50610F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-assamese-fonts summary to Free Assamese Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-assamese-fonts



From petersen at fedoraproject.org  Fri Sep 11 07:11:56 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 07:11:56 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts/devel - New directory
Message-ID: <20090911071156.6407111C02BB@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-assamese-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsGaA639/rpms/lohit-assamese-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-assamese-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 07:11:56 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 07:11:56 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts - New directory
Message-ID: <20090911071156.3972F11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-assamese-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsGaA639/rpms/lohit-assamese-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-assamese-fonts added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 07:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 07:11:49 +0000
Subject: [pkgdb] lohit-assamese-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911071150.29A7C10F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-assamese-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-assamese-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-assamese-fonts



From petersen at fedoraproject.org  Fri Sep 11 07:12:03 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 07:12:03 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts Makefile,NONE,1.1
Message-ID: <20090911071203.F120811C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-assamese-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsGaA639/rpms/lohit-assamese-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-assamese-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-assamese-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 07:12:04 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 07:12:04 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911071204.835A711C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-assamese-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsGaA639/rpms/lohit-assamese-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-assamese-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-assamese-fonts
# $Id: Makefile,v 1.1 2009/09/11 07:12:04 petersen Exp $
NAME := lohit-assamese-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From vda at fedoraproject.org  Fri Sep 11 07:19:07 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Fri, 11 Sep 2009 07:19:07 +0000 (UTC)
Subject: rpms/busybox/devel busybox.spec,1.100,1.101
Message-ID: <20090911071907.E37E311C0099@cvs1.fedora.phx.redhat.com>

Author: vda

Update of /cvs/extras/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2593

Modified Files:
	busybox.spec 
Log Message:
REALLY fix build on s390, ia64




Index: busybox.spec
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- busybox.spec	11 Sep 2009 06:52:15 -0000	1.100
+++ busybox.spec	11 Sep 2009 07:19:07 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.14.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -67,8 +67,8 @@ mkdir kernel-include
 cp -a /usr/include/asm kernel-include
 cp -a /usr/include/asm-generic kernel-include
 cp -a /usr/include/linux kernel-include
-# uclibc can't be built on ppc64, we set $arch to "" in this case
-arch=`uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/' -e 's/ppc64//' -e 's/powerpc64//'`
+# uclibc can't be built on ppc64,s390,ia64, we set $arch to "" in this case
+arch=`uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/' -e 's/ppc64//' -e 's/powerpc64//' -e 's/ia64//' -e 's/s390.*//'`
 echo "TARGET_$arch=y" >.config
 echo "TARGET_ARCH=\"$arch\"" >>.config
 cat .config1 >>.config
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/busybox.petitboot
 
 %changelog
+* Fri Sep 11 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.14.1-6
+- REALLY fix build on s390, ia64
+
 * Fri Sep 11 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.14.1-5
 - fix build on s390, ia64
 



From tagoh at fedoraproject.org  Fri Sep 11 07:23:39 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 11 Sep 2009 07:23:39 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-unref-later.patch, NONE,
	1.1 imsettings.spec, 1.39, 1.40
Message-ID: <20090911072339.8722011C0099@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3897

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-unref-later.patch 
Log Message:
* Fri Sep 11 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-3
- Fix keeping IM process running as the defunct process. (#522689)

imsettings-unref-later.patch:
 factory.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 4 deletions(-)

--- NEW FILE imsettings-unref-later.patch ---
2009-09-11  Akira TAGOH  <tagoh at redhat.com>
 
	* src/factory.c (_get_process_info_by_pid): new.
	(_watch_im_status_cb): unref'd the instance here to not keep
	the process running as zombie. (rhbz#522689)
	(_stop_process): don't remove the instance from the hash table yet.

Index: src/factory.c
===================================================================
--- src/factory.c	(????? 340)
+++ src/factory.c	(????? 341)
@@ -214,6 +214,25 @@
 	return NULL;
 }
 
+static struct ProcessInformation *
+_get_process_info_by_pid(GHashTable *table,
+			 GPid        pid)
+{
+	GHashTableIter iter;
+	gpointer key, val;
+
+	g_hash_table_iter_init(&iter, table);
+	while (g_hash_table_iter_next(&iter, &key, &val)) {
+		struct ProcessInformation *info = val;
+
+		if (pid == info->pid) {
+			return info;
+		}
+	}
+
+	return NULL;
+}
+
 static GPid
 _get_pid_from_name(IMSettingsManagerPrivate *priv,
 		   gboolean                  is_body,
@@ -462,8 +481,25 @@
 			}
 		}
 	} else {
-		g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
-		      "pid %d is successfully stopped with %s.", pid, status_message->str);
+		info = _get_process_info_by_pid(priv->body2info, pid);
+		if (info == NULL) {
+			is_body = FALSE;
+			info = _get_process_info_by_pid(priv->aux2info, pid);
+		}
+		if (info == NULL) {
+			g_warning("No consistency in the internal process management database: pid: %d", pid);
+			g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+			      "pid %d is successfully stopped with %s.", pid, status_message->str);
+		} else {
+			gchar *module = g_strdup(info->module);
+
+			g_hash_table_remove(is_body ? priv->body2info : priv->aux2info,
+					    info->module);
+			g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+			      "Stopped %s process for %s with %s: pid %d",
+			      is_body ? "Main" : "AUX", module, status_message->str, pid);
+			g_free(module);
+		}
 	}
 	if (status_message)
 		g_string_free(status_message, TRUE);
@@ -635,7 +671,7 @@
 		}
 	} else {
 		tmp = _process_info_ref(info);
-		g_hash_table_remove(hash, identity);
+		/* info will be deleted from *2info Hash table at _watch_im_status_cb when the process is really died. */
 		g_hash_table_remove(priv->pid2id, GINT_TO_POINTER (info->pid));
 		if (kill(-info->pid, SIGTERM) == -1) {
 			gchar *module = g_strdup(identity);
@@ -647,8 +683,15 @@
 			g_hash_table_insert(hash, module, tmp);
 			g_hash_table_insert(priv->pid2id, GINT_TO_POINTER (info->pid), GUINT_TO_POINTER (info->id));
 		} else {
+			GTimeVal time;
+			gchar *s;
+
+			g_get_current_time(&time);
+			s = g_time_val_to_iso8601(&time);
+			g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Sent a signal to stop %s: pid: %d, time: %s", identity, info->pid, s);
 			retval = TRUE;
-			_process_info_unref(tmp);
+			g_free(s);
+			/* info will be unref'd in _watch_im_status_cb when the process is really died. */
 		}
 	}
 


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- imsettings.spec	8 Sep 2009 04:28:35 -0000	1.39
+++ imsettings.spec	11 Sep 2009 07:23:39 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,7 @@ Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-unref-notify.patch
+Patch3:		imsettings-unref-later.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -88,6 +89,7 @@ This package contains a plugin to get th
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p0 -b .2-unref
+%patch3 -p0 -b .3-zombie
 
 %build
 %configure	\
@@ -213,6 +215,9 @@ fi
 
 
 %changelog
+* Fri Sep 11 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-3
+- Fix keeping IM process running as the defunct process. (#522689)
+
 * Tue Sep  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-2
 - Fix aborting after dbus session closed. (#520976)
 



From xhorak at fedoraproject.org  Fri Sep 11 07:50:09 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:50:09 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.33,1.34
Message-ID: <20090911075010.1160F11C0425@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11125

Modified Files:
	blam.spec 
Log Message:
* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-17
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- blam.spec	6 Aug 2009 16:30:53 -0000	1.33
+++ blam.spec	11 Sep 2009 07:50:08 -0000	1.34
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.1.2
+%define	gecko_version		1.9.1.3
 
 Name:		blam
 Version:	1.8.5
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-17
+- Rebuild against newer gecko
+
 * Thu Aug  6 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-16
 - Rebuild
 



From xhorak at fedoraproject.org  Fri Sep 11 07:53:02 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:53:02 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.16,1.17
Message-ID: <20090911075302.800A111C0099@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11958

Modified Files:
	mozvoikko.spec 
Log Message:
* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.0-3
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mozvoikko.spec	6 Sep 2009 17:31:26 -0000	1.16
+++ mozvoikko.spec	11 Sep 2009 07:53:02 -0000	1.17
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.2
+%define gecko_ver 1.9.1.3
 # These come from install.rdf
 %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %global firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.0-3
+- Rebuild against newer gecko
+
 * Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-2
 - Use global instead of define, except in gecko_ver as that might be used
   in the xulrunner rebuild scripts.



From xhorak at fedoraproject.org  Fri Sep 11 07:54:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:54:04 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.27,1.28
Message-ID: <20090911075404.A690711C0099@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12321

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.8-6
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gnome-web-photo.spec	6 Aug 2009 16:32:49 -0000	1.27
+++ gnome-web-photo.spec	11 Sep 2009 07:54:04 -0000	1.28
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.8-6
+- Rebuild against newer gecko
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 0.8-5
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Fri Sep 11 07:54:53 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:54:53 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed.spec,1.8,1.9
Message-ID: <20090911075453.7A83E11C0099@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12650

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.7
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/devel/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Gtk2-MozEmbed.spec	6 Aug 2009 16:31:02 -0000	1.8
+++ perl-Gtk2-MozEmbed.spec	11 Sep 2009 07:54:53 -0000	1.9
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 %else
 %define gecko_version 1.9.0.6
 %endif
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}.6
+Release:       %{specfilever}%{?dist}.7
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.7
+- Rebuild against newer gecko
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Fri Sep 11 07:56:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:56:12 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.58,
	1.59
Message-ID: <20090911075612.D231711C0099@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13066

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-11
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- gnome-python2-extras.spec	6 Aug 2009 16:32:06 -0000	1.58
+++ gnome-python2-extras.spec	11 Sep 2009 07:56:12 -0000	1.59
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.1.2
+%define gecko_version 1.9.1.3
 %define gtkspell_version 2.0.7
 %define libgda_version 3.99.9
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: Additional PyGNOME Python extension modules
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-11
+- Rebuild against newer gecko
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-10
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Fri Sep 11 07:57:29 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 11 Sep 2009 07:57:29 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.62,1.63
Message-ID: <20090911075729.C326011C0099@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13509

Modified Files:
	Miro.spec 
Log Message:
* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- Miro.spec	6 Aug 2009 16:32:56 -0000	1.62
+++ Miro.spec	11 Sep 2009 07:57:29 -0000	1.63
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.1.2
+%define gecko_ver 1.9.1.3
 
 Name:           Miro
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
+- Rebuild against newer gecko
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-3
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Fri Sep 11 08:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:04:22 +0000
Subject: [pkgdb] lohit-bengali-fonts was added for pravins
Message-ID: <20090911080422.6899910F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-bengali-fonts with summary Free Bengali Open Type Font
petersen has approved Package lohit-bengali-fonts
petersen has added a Fedora devel branch for lohit-bengali-fonts with an owner of pravins
petersen has approved lohit-bengali-fonts in Fedora devel
petersen has approved Package lohit-bengali-fonts
petersen has set commit to Approved for 107427 on lohit-bengali-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-bengali-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-bengali-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-bengali-fonts



From jfch2222 at fedoraproject.org  Fri Sep 11 08:04:23 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 11 Sep 2009 08:04:23 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec, 1.164,
	1.165 openssh-5.2p1-homechroot.patch, 1.6, NONE
Message-ID: <20090911080423.33CB811C0099@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15751

Modified Files:
	openssh.spec 
Removed Files:
	openssh-5.2p1-homechroot.patch 
Log Message:
Dropped homechrot patch



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- openssh.spec	7 Sep 2009 10:20:22 -0000	1.164
+++ openssh.spec	11 Sep 2009 08:04:22 -0000	1.165
@@ -96,7 +96,6 @@ Patch51: openssh-5.2p1-nss-keys.patch
 Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
 Patch65: openssh-5.2p1-fips.patch
-Patch66: openssh-5.2p1-homechroot.patch
 Patch68: openssh-5.2p1-pathmax.patch
 Patch69: openssh-5.2p1-selabel.patch
 Patch71: openssh-5.2p1-edns.patch
@@ -230,7 +229,6 @@ an X11 passphrase dialog for OpenSSH.
 %patch55 -p1 -b .cloexec
 %patch62 -p1 -b .manpage
 %patch65 -p1 -b .fips
-%patch66 -p1 -b .homechroot
 %patch68 -p1 -b .pathmax
 %patch69 -p1 -b .selabel
 %patch71 -p1 -b .edns
@@ -468,6 +466,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 11 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-25
+- Dropped homechroot patch
+
 * Mon Sep  7 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-24
 - Add check for nosuid, nodev in homechroot
 


--- openssh-5.2p1-homechroot.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:04:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:04:23 +0000
Subject: [pkgdb] lohit-bengali-fonts summary updated by petersen
Message-ID: <20090911080423.B477610F88A@bastion2.fedora.phx.redhat.com>

petersen set package lohit-bengali-fonts summary to Free Bengali Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-bengali-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:04:30 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:04:30 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts/devel - New directory
Message-ID: <20090911080430.6B8C311C02BB@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-bengali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL16050/rpms/lohit-bengali-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-bengali-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:04:30 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:04:30 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts - New directory
Message-ID: <20090911080430.4610B11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-bengali-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL16050/rpms/lohit-bengali-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-bengali-fonts added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:04:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:04:23 +0000
Subject: [pkgdb] lohit-bengali-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911080423.CD82810F894@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-bengali-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-bengali-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-bengali-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:04:36 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:04:36 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts Makefile,NONE,1.1
Message-ID: <20090911080436.AD08A11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-bengali-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL16050/rpms/lohit-bengali-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-bengali-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-bengali-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:04:37 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:04:37 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911080437.087AF11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-bengali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL16050/rpms/lohit-bengali-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-bengali-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-bengali-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:04:36 petersen Exp $
NAME := lohit-bengali-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:10:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:10:08 +0000
Subject: [pkgdb] lohit-gujarati-fonts was added for pravins
Message-ID: <20090911081008.D0C4A10F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-gujarati-fonts with summary Free Gujarati Open Type Font
petersen has approved Package lohit-gujarati-fonts
petersen has added a Fedora devel branch for lohit-gujarati-fonts with an owner of pravins
petersen has approved lohit-gujarati-fonts in Fedora devel
petersen has approved Package lohit-gujarati-fonts
petersen has set commit to Approved for 107427 on lohit-gujarati-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-gujarati-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-gujarati-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-gujarati-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:10:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:10:10 +0000
Subject: [pkgdb] lohit-gujarati-fonts summary updated by petersen
Message-ID: <20090911081010.8ADD110F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-gujarati-fonts summary to Free Gujarati Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-gujarati-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:10:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:10:16 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts - New directory
Message-ID: <20090911081016.1293111C043A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsw17690/rpms/lohit-gujarati-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-gujarati-fonts added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:10:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:10:10 +0000
Subject: [pkgdb] lohit-gujarati-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911081010.92D2810F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-gujarati-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-gujarati-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-gujarati-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-gujarati-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-gujarati-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:10:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:10:16 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/devel - New directory
Message-ID: <20090911081016.30C8D11C04BA@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsw17690/rpms/lohit-gujarati-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-gujarati-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:10:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:10:23 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts Makefile,NONE,1.1
Message-ID: <20090911081023.79D1E11C043A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsw17690/rpms/lohit-gujarati-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-gujarati-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-gujarati-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From jfch2222 at fedoraproject.org  Fri Sep 11 08:10:13 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 11 Sep 2009 08:10:13 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.165,1.166
Message-ID: <20090911081013.EA7CC11C043A@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17602

Modified Files:
	openssh.spec 
Log Message:
Dropped homechroot path



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- openssh.spec	11 Sep 2009 08:04:22 -0000	1.165
+++ openssh.spec	11 Sep 2009 08:10:13 -0000	1.166
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 24%{?dist}%{?rescue_rel}
+Release: 25%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc



From petersen at fedoraproject.org  Fri Sep 11 08:10:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:10:23 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911081023.C4CFE11C043A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsw17690/rpms/lohit-gujarati-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-gujarati-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-gujarati-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:10:23 petersen Exp $
NAME := lohit-gujarati-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pghmcfc at fedoraproject.org  Fri Sep 11 08:14:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 11 Sep 2009 08:14:55 +0000 (UTC)
Subject: rpms/libpng10/devel .cvsignore, 1.24, 1.25 libpng10.spec, 1.34,
	1.35 sources, 1.24, 1.25 libpng-1.0.49-garbage.patch, 1.1, NONE
Message-ID: <20090911081455.7016411C0099@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19188

Modified Files:
	.cvsignore libpng10.spec sources 
Removed Files:
	libpng-1.0.49-garbage.patch 
Log Message:
update to 1.0.50 (garbage removal patch upstreamed)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	11 Sep 2009 06:25:59 -0000	1.24
+++ .cvsignore	11 Sep 2009 08:14:54 -0000	1.25
@@ -1 +1 @@
-libpng-1.0.49.tar.bz2
+libpng-1.0.50.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libpng10.spec	11 Sep 2009 06:25:59 -0000	1.34
+++ libpng10.spec	11 Sep 2009 08:14:55 -0000	1.35
@@ -1,13 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.49
+Version:	1.0.50
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
 Patch0:		libpng-1.0.48-soname.patch
-Patch1:		libpng-1.0.49-garbage.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -39,9 +38,6 @@ libpng10-devel.
 # We want an soname of 2.%{version}
 %patch0 -p1 -b .soname
 
-# Apply edit upstream forgot to do
-%patch1 -p1 -b .garbage
-
 %build
 %configure \
 	--disable-static \
@@ -115,6 +111,9 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Fri Sep 11 2009 Paul Howarth <paul at city-fan.org> 1.0.50-1
+- update to 1.0.50 (garbage removal patch upstreamed)
+
 * Thu Sep 10 2009 Paul Howarth <paul at city-fan.org> 1.0.49-1
 - update to 1.0.49 (minor bugfixes)
 - patch out garbage in source files left over from edit gone wrong


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	11 Sep 2009 06:25:59 -0000	1.24
+++ sources	11 Sep 2009 08:14:55 -0000	1.25
@@ -1 +1 @@
-77fd98589f10710c1413fcbf5605372f  libpng-1.0.49.tar.bz2
+39152389df9b58ecc02c23850f88308b  libpng-1.0.50.tar.bz2


--- libpng-1.0.49-garbage.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:18:14 +0000
Subject: [pkgdb] lohit-assamese-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911081814.6787A10F86F@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-assamese-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-assamese-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-assamese-fonts



From pingou at fedoraproject.org  Fri Sep 11 08:19:04 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri, 11 Sep 2009 08:19:04 +0000 (UTC)
Subject: rpms/rkward/devel .cvsignore, 1.10, 1.11 rkward.spec, 1.35,
	1.36 sources, 1.10, 1.11
Message-ID: <20090911081904.51FD211C0099@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20580

Modified Files:
	.cvsignore rkward.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 May 2009 06:55:12 -0000	1.10
+++ .cvsignore	11 Sep 2009 08:19:03 -0000	1.11
@@ -1 +1 @@
-rkward-0.5.0d.tar.gz
+rkward-0.5.1.tar.gz


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/rkward.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- rkward.spec	27 Jul 2009 03:04:12 -0000	1.35
+++ rkward.spec	11 Sep 2009 08:19:04 -0000	1.36
@@ -1,8 +1,8 @@
 %global  Rversion 2.9.0
 
 Name:           rkward
-Version:        0.5.0d
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -117,6 +117,9 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+* Mon Aug 03 2009 pingou <pingou at pingoured.fr> - 0.5.1-1
+- Update to 0.5.1 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0d-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 May 2009 06:55:12 -0000	1.10
+++ sources	11 Sep 2009 08:19:04 -0000	1.11
@@ -1 +1 @@
-ecc6bd1f3066b2a3b5f6020daaf5c1ad  rkward-0.5.0d.tar.gz
+9c959465fecfa823b526f2e18813ee40  rkward-0.5.1.tar.gz



From pingou at fedoraproject.org  Fri Sep 11 08:19:26 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri, 11 Sep 2009 08:19:26 +0000 (UTC)
Subject: rpms/rkward/F-11 rkward.spec,1.32,1.33 sources,1.10,1.11
Message-ID: <20090911081926.BAED811C0099@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20714/F-11

Modified Files:
	rkward.spec sources 
Log Message:
Update to 0.5.1


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-11/rkward.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- rkward.spec	20 May 2009 07:02:23 -0000	1.32
+++ rkward.spec	11 Sep 2009 08:19:26 -0000	1.33
@@ -1,7 +1,7 @@
 %global  Rversion 2.9.0
 
 Name:           rkward
-Version:        0.5.0d
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
@@ -117,6 +117,12 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+* Mon Aug 03 2009 pingou <pingou at pingoured.fr> - 0.5.1-1
+- Update to 0.5.1 
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0d-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 20 2009 pingou <pingou at pingoured.fr> - 0.5.0d-1
 - Update to release 0.5.0d
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 May 2009 07:02:23 -0000	1.10
+++ sources	11 Sep 2009 08:19:26 -0000	1.11
@@ -1 +1 @@
-ecc6bd1f3066b2a3b5f6020daaf5c1ad  rkward-0.5.0d.tar.gz
+9c959465fecfa823b526f2e18813ee40  rkward-0.5.1.tar.gz



From pingou at fedoraproject.org  Fri Sep 11 08:19:26 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri, 11 Sep 2009 08:19:26 +0000 (UTC)
Subject: rpms/rkward/F-10 rkward.spec,1.30,1.31 sources,1.10,1.11
Message-ID: <20090911081926.622FB11C0099@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20714/F-10

Modified Files:
	rkward.spec sources 
Log Message:
Update to 0.5.1


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-10/rkward.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- rkward.spec	20 May 2009 07:02:23 -0000	1.30
+++ rkward.spec	11 Sep 2009 08:19:26 -0000	1.31
@@ -1,7 +1,7 @@
 %global  Rversion 2.9.0
 
 Name:           rkward
-Version:        0.5.0d
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
@@ -117,6 +117,12 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+* Mon Aug 03 2009 pingou <pingou at pingoured.fr> - 0.5.1-1
+- Update to 0.5.1 
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0d-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 20 2009 pingou <pingou at pingoured.fr> - 0.5.0d-1
 - Update to release 0.5.0d
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 May 2009 07:02:23 -0000	1.10
+++ sources	11 Sep 2009 08:19:26 -0000	1.11
@@ -1 +1 @@
-ecc6bd1f3066b2a3b5f6020daaf5c1ad  rkward-0.5.0d.tar.gz
+9c959465fecfa823b526f2e18813ee40  rkward-0.5.1.tar.gz



From tomeu at fedoraproject.org  Fri Sep 11 08:19:49 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 11 Sep 2009 08:19:49 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 sugar-artwork.spec, 1.27, 1.28
Message-ID: <20090911081949.235FB11C0099@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20884

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	31 Jul 2009 20:55:06 -0000	1.19
+++ .cvsignore	11 Sep 2009 08:19:48 -0000	1.20
@@ -1 +1 @@
-sugar-artwork-0.85.2.tar.bz2
+sugar-artwork-0.85.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 Jul 2009 20:55:06 -0000	1.19
+++ sources	11 Sep 2009 08:19:48 -0000	1.20
@@ -1 +1 @@
-02c2a00fcaca92311fdf8ef66d662477  sugar-artwork-0.85.2.tar.bz2
+a4c676e16d90e9e54e0351f0592f5077  sugar-artwork-0.85.3.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sugar-artwork.spec	31 Jul 2009 20:55:06 -0000	1.27
+++ sugar-artwork.spec	11 Sep 2009 08:19:48 -0000	1.28
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.85.2
+Version: 0.85.3
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
@@ -63,6 +63,9 @@ touch --no-create %{_datadir}/icons/suga
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
+- New upstream release
+
 * Fri Jul 31 2009 Mathieu Bridon (bochecha) <bochecha at fedoraproject.org> - 0.85.2-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Fri Sep 11 08:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:19:50 +0000
Subject: [pkgdb] lohit-bengali-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911081950.62E1310F881@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-bengali-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-bengali-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-bengali-fonts



From tomeu at fedoraproject.org  Fri Sep 11 08:19:56 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 11 Sep 2009 08:19:56 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 sugar-base.spec, 1.21, 1.22
Message-ID: <20090911081956.03EB211C0099@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20942

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 Sep 2009 08:55:21 -0000	1.15
+++ .cvsignore	11 Sep 2009 08:19:55 -0000	1.16
@@ -1 +1 @@
-sugar-base-0.85.4.tar.bz2
+sugar-base-0.85.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	2 Sep 2009 08:55:21 -0000	1.15
+++ sources	11 Sep 2009 08:19:55 -0000	1.16
@@ -1 +1 @@
-6ed1e197b923daf776886d80c286cb96  sugar-base-0.85.4.tar.bz2
+d75d714bfdc0e9a1f60160ea5a83c23d  sugar-base-0.85.5.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sugar-base.spec	2 Sep 2009 08:55:21 -0000	1.21
+++ sugar-base.spec	11 Sep 2009 08:19:55 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.85.4
+Version: 0.85.5
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
+- New upstream release
+
 * Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Fri Sep 11 08:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:21:01 +0000
Subject: [pkgdb] lohit-hindi-fonts was added for pravins
Message-ID: <20090911082101.DA58110F87A@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-hindi-fonts with summary Free Hindi Open Type Font
petersen has approved Package lohit-hindi-fonts
petersen has added a Fedora devel branch for lohit-hindi-fonts with an owner of pravins
petersen has approved lohit-hindi-fonts in Fedora devel
petersen has approved Package lohit-hindi-fonts
petersen has set commit to Approved for 107427 on lohit-hindi-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-hindi-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-hindi-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-hindi-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:21:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:21:02 +0000
Subject: [pkgdb] lohit-hindi-fonts summary updated by petersen
Message-ID: <20090911082102.93C3310F88A@bastion2.fedora.phx.redhat.com>

petersen set package lohit-hindi-fonts summary to Free Hindi Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-hindi-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:21:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:21:02 +0000
Subject: [pkgdb] lohit-hindi-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911082102.9CAC010F894@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-hindi-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-hindi-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-hindi-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-hindi-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-hindi-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:21:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:21:08 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts - New directory
Message-ID: <20090911082108.15B4511C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-hindi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL21668/rpms/lohit-hindi-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-hindi-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:21:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:21:08 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts/devel - New directory
Message-ID: <20090911082108.49A5C11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-hindi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL21668/rpms/lohit-hindi-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-hindi-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:21:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:21:16 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts Makefile,NONE,1.1
Message-ID: <20090911082116.9CE5C11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-hindi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL21668/rpms/lohit-hindi-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-hindi-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-hindi-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:21:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:21:17 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911082117.502FC11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-hindi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL21668/rpms/lohit-hindi-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-hindi-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-hindi-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:21:16 petersen Exp $
NAME := lohit-hindi-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tomeu at fedoraproject.org  Fri Sep 11 08:22:32 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 11 Sep 2009 08:22:32 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.37, 1.38 sources, 1.41,
	1.42 sugar-toolkit.spec, 1.53, 1.54
Message-ID: <20090911082232.ACB0C11C0099@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22293

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	2 Sep 2009 08:59:27 -0000	1.37
+++ .cvsignore	11 Sep 2009 08:22:32 -0000	1.38
@@ -1 +1 @@
-sugar-toolkit-0.85.6.tar.bz2
+sugar-toolkit-0.85.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	2 Sep 2009 08:59:27 -0000	1.41
+++ sources	11 Sep 2009 08:22:32 -0000	1.42
@@ -1 +1 @@
-e1024fa58092a7848fe9f7f668a904e3  sugar-toolkit-0.85.6.tar.bz2
+04dd90d0a37c0e34f8a5783bc850bd29  sugar-toolkit-0.85.7.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sugar-toolkit.spec	5 Sep 2009 13:38:30 -0000	1.53
+++ sugar-toolkit.spec	11 Sep 2009 08:22:32 -0000	1.54
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.85.6
-Release: 2%{?dist}
+Version: 0.85.7
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
+- New upstream release
+
 * Wed Sep 05 2009 Peter Robinson <pbrobinson at gmail.com> - 0.85.6-2
 - Drop Requires: gettext, it should be just a BuildReq
 



From tomeu at fedoraproject.org  Fri Sep 11 08:26:02 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 11 Sep 2009 08:26:02 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel .cvsignore, 1.14, 1.15 sources,
	1.14, 1.15 sugar-presence-service.spec, 1.21, 1.22
Message-ID: <20090911082602.A8F7511C0099@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-presence-service/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23322

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 13:53:15 -0000	1.14
+++ .cvsignore	11 Sep 2009 08:26:02 -0000	1.15
@@ -1 +1 @@
-sugar-presence-service-0.85.1.tar.bz2
+sugar-presence-service-0.85.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 13:53:15 -0000	1.14
+++ sources	11 Sep 2009 08:26:02 -0000	1.15
@@ -1 +1 @@
-aee749446558b88b8aef6b90d0985eb1  sugar-presence-service-0.85.1.tar.bz2
+c842bc8777c01a445afd34ded8dbe949  sugar-presence-service-0.85.2.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sugar-presence-service.spec	2 Aug 2009 13:53:15 -0000	1.21
+++ sugar-presence-service.spec	11 Sep 2009 08:26:02 -0000	1.22
@@ -1,5 +1,5 @@
 Name: sugar-presence-service
-Version: 0.85.1
+Version: 0.85.2
 Release: 1%{?dist}
 Summary: The Sugar presence service
 
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
+- New upstream release
+
 * Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.1-1
 - New upstream release.
 



From pkgdb at fedoraproject.org  Fri Sep 11 08:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:29:27 +0000
Subject: [pkgdb] lohit-kannada-fonts was added for pravins
Message-ID: <20090911082927.D8DA610F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-kannada-fonts with summary Free Kannada Open Type Font
petersen has approved Package lohit-kannada-fonts
petersen has added a Fedora devel branch for lohit-kannada-fonts with an owner of pravins
petersen has approved lohit-kannada-fonts in Fedora devel
petersen has approved Package lohit-kannada-fonts
petersen has set commit to Approved for 107427 on lohit-kannada-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-kannada-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-kannada-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-kannada-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:29:29 +0000
Subject: [pkgdb] lohit-kannada-fonts summary updated by petersen
Message-ID: <20090911082929.1819C10F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-kannada-fonts summary to Free Kannada Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-kannada-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:29:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:29:35 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts - New directory
Message-ID: <20090911082935.2AB6611C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kannada-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL24410/rpms/lohit-kannada-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-kannada-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:29:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:29:35 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts/devel - New directory
Message-ID: <20090911082935.5818011C0418@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kannada-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL24410/rpms/lohit-kannada-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-kannada-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:29:29 +0000
Subject: [pkgdb] lohit-kannada-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911082929.2F75810F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-kannada-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-kannada-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-kannada-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-kannada-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-kannada-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:29:41 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:29:41 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts Makefile,NONE,1.1
Message-ID: <20090911082941.C5C1C11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kannada-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL24410/rpms/lohit-kannada-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-kannada-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-kannada-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:29:42 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:29:42 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911082942.2BCCB11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kannada-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL24410/rpms/lohit-kannada-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-kannada-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-kannada-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:29:41 petersen Exp $
NAME := lohit-kannada-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tomeu at fedoraproject.org  Fri Sep 11 08:29:35 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 11 Sep 2009 08:29:35 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.43, 1.44 sources, 1.45,
	1.46 sugar.spec, 1.69, 1.70
Message-ID: <20090911082935.E0FA711C0099@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24418

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	2 Sep 2009 09:05:31 -0000	1.43
+++ .cvsignore	11 Sep 2009 08:29:35 -0000	1.44
@@ -1 +1 @@
-sugar-0.85.5.tar.bz2
+sugar-0.85.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	2 Sep 2009 09:05:31 -0000	1.45
+++ sources	11 Sep 2009 08:29:35 -0000	1.46
@@ -1 +1 @@
-fd3e1dff6f4f9b903846aab2446ec843  sugar-0.85.5.tar.bz2
+ef6728360fcd0b83e376cc0523de2418  sugar-0.85.7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sugar.spec	2 Sep 2009 09:07:39 -0000	1.69
+++ sugar.spec	11 Sep 2009 08:29:35 -0000	1.70
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.85.5
+Version: 0.85.7
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -141,6 +141,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
+- New upstream release
+
 * Wed Sep 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Fri Sep 11 08:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:42:42 +0000
Subject: [pkgdb] lohit-kashmiri-fonts was added for pravins
Message-ID: <20090911084242.80B8810F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-kashmiri-fonts with summary Free Kashmiri Open Type Font
petersen has approved Package lohit-kashmiri-fonts
petersen has added a Fedora devel branch for lohit-kashmiri-fonts with an owner of pravins
petersen has approved lohit-kashmiri-fonts in Fedora devel
petersen has approved Package lohit-kashmiri-fonts
petersen has set commit to Approved for 107427 on lohit-kashmiri-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-kashmiri-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-kashmiri-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-kashmiri-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:42:43 +0000
Subject: [pkgdb] lohit-kashmiri-fonts summary updated by petersen
Message-ID: <20090911084243.EE8F910F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-kashmiri-fonts summary to Free Kashmiri Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-kashmiri-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:42:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:42:50 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts/devel - New directory
Message-ID: <20090911084250.6352C11C02BB@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsX28481/rpms/lohit-kashmiri-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:42:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:42:50 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts - New directory
Message-ID: <20090911084250.3914F11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsX28481/rpms/lohit-kashmiri-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-kashmiri-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:42:56 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:42:56 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts Makefile,NONE,1.1
Message-ID: <20090911084256.7CDB011C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsX28481/rpms/lohit-kashmiri-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-kashmiri-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-kashmiri-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Sep 11 08:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:42:43 +0000
Subject: [pkgdb] lohit-kashmiri-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084244.0CE9E10F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-kashmiri-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-kashmiri-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-kashmiri-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-kashmiri-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-kashmiri-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:42:56 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:42:56 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911084256.C363211C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsX28481/rpms/lohit-kashmiri-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-kashmiri-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-kashmiri-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:42:56 petersen Exp $
NAME := lohit-kashmiri-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From caolanm at fedoraproject.org  Fri Sep 11 08:43:14 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Sep 2009 08:43:14 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.37,1.38
Message-ID: <20090911084314.A42BF11C0099@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28620

Modified Files:
	ppl.spec 
Log Message:
Resolves: rhbz#521588 stick pl include before Yap include


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ppl.spec	19 Aug 2009 08:32:24 -0000	1.37
+++ ppl.spec	11 Sep 2009 08:43:14 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -210,6 +210,7 @@ CPPFLAGS="-I%{_includedir}/glpk"
 CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
 %endif
 %ifnarch sparc64 sparcv9
+CPPFLAGS="$CPPFLAGS -I`pl -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="\(.*\)";/\1/'`/include"
 CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
 %endif
 %configure --docdir=%{_datadir}/doc/%{name}-%{version} --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
@@ -416,6 +417,10 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 11 2009 Caol?n McNamara <caolanm at redhat.com> - 0.10.2-10
+- Resolves: rhbz#521588 stick pl include before Yap include to stop 
+  configure-time misdetection to resolve FTBFS
+
 * Wed Aug 19 2009 Roberto Bagnara <bagnara at cs.unipr.it> - 0.10.2-9
 - Force rebuild.
 



From pkgdb at fedoraproject.org  Fri Sep 11 08:44:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:44:42 +0000
Subject: [pkgdb] lohit-konkani-fonts was added for pravins
Message-ID: <20090911084442.5791010F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-konkani-fonts with summary Free Konkani Open Type Font
petersen has approved Package lohit-konkani-fonts
petersen has added a Fedora devel branch for lohit-konkani-fonts with an owner of pravins
petersen has approved lohit-konkani-fonts in Fedora devel
petersen has approved Package lohit-konkani-fonts
petersen has set commit to Approved for 107427 on lohit-konkani-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-konkani-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-konkani-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-konkani-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:44:43 +0000
Subject: [pkgdb] lohit-konkani-fonts summary updated by petersen
Message-ID: <20090911084443.D490510F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-konkani-fonts summary to Free Konkani Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-konkani-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:44:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:44:50 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts - New directory
Message-ID: <20090911084450.17C5911C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-konkani-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsP29244/rpms/lohit-konkani-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-konkani-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:44:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:44:50 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts/devel - New directory
Message-ID: <20090911084450.5F7D811C02BB@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-konkani-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsP29244/rpms/lohit-konkani-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-konkani-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:44:57 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:44:57 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts Makefile,NONE,1.1
Message-ID: <20090911084457.3070111C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-konkani-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsP29244/rpms/lohit-konkani-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-konkani-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-konkani-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:44:57 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:44:57 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911084457.9ABF511C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-konkani-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsP29244/rpms/lohit-konkani-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-konkani-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-konkani-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:44:57 petersen Exp $
NAME := lohit-konkani-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:44:43 +0000
Subject: [pkgdb] lohit-konkani-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084443.E735D10F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-konkani-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-konkani-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-konkani-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-konkani-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-konkani-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:45:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:45:51 +0000
Subject: [pkgdb] lohit-maithili-fonts was added for pravins
Message-ID: <20090911084551.CD1AB10F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-maithili-fonts with summary Free Maithili Open Type Font
petersen has approved Package lohit-maithili-fonts
petersen has added a Fedora devel branch for lohit-maithili-fonts with an owner of pravins
petersen has approved lohit-maithili-fonts in Fedora devel
petersen has approved Package lohit-maithili-fonts
petersen has set commit to Approved for 107427 on lohit-maithili-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-maithili-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-maithili-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-maithili-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:45:52 +0000
Subject: [pkgdb] lohit-maithili-fonts summary updated by petersen
Message-ID: <20090911084553.1353A10F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-maithili-fonts summary to Free Maithili Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-maithili-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:45:59 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:45:59 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts - New directory
Message-ID: <20090911084559.1B57811C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-maithili-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsK29588/rpms/lohit-maithili-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-maithili-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:45:59 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:45:59 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts/devel - New directory
Message-ID: <20090911084559.46ED611C0418@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-maithili-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsK29588/rpms/lohit-maithili-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-maithili-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:45:52 +0000
Subject: [pkgdb] lohit-maithili-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084553.210C010F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-maithili-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-maithili-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-maithili-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-maithili-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-maithili-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:46:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:46:05 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts Makefile,NONE,1.1
Message-ID: <20090911084605.A503711C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-maithili-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsK29588/rpms/lohit-maithili-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-maithili-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-maithili-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:46:06 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:46:06 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911084606.058FF11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-maithili-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsK29588/rpms/lohit-maithili-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-maithili-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-maithili-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:46:05 petersen Exp $
NAME := lohit-maithili-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:47:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:47:03 +0000
Subject: [pkgdb] lohit-malayalam-fonts was added for pravins
Message-ID: <20090911084703.32C8010F85E@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-malayalam-fonts with summary Free Malayalam Open Type Font
petersen has approved Package lohit-malayalam-fonts
petersen has added a Fedora devel branch for lohit-malayalam-fonts with an owner of pravins
petersen has approved lohit-malayalam-fonts in Fedora devel
petersen has approved Package lohit-malayalam-fonts
petersen has set commit to Approved for 107427 on lohit-malayalam-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-malayalam-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-malayalam-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-malayalam-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:47:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:47:04 +0000
Subject: [pkgdb] lohit-malayalam-fonts summary updated by petersen
Message-ID: <20090911084704.640BC10F881@bastion2.fedora.phx.redhat.com>

petersen set package lohit-malayalam-fonts summary to Free Malayalam Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-malayalam-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:47:10 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:47:10 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts - New directory
Message-ID: <20090911084710.2A1B211C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsM29930/rpms/lohit-malayalam-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-malayalam-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:47:10 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:47:10 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel - New directory
Message-ID: <20090911084710.429D211C0418@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsM29930/rpms/lohit-malayalam-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-malayalam-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:47:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:47:04 +0000
Subject: [pkgdb] lohit-malayalam-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084704.6D30B10F890@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-malayalam-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-malayalam-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-malayalam-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-malayalam-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-malayalam-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:47:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:47:16 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts Makefile,NONE,1.1
Message-ID: <20090911084716.3F96911C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsM29930/rpms/lohit-malayalam-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-malayalam-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-malayalam-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:47:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:47:16 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090911084716.9976411C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsM29930/rpms/lohit-malayalam-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-malayalam-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-malayalam-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:47:16 petersen Exp $
NAME := lohit-malayalam-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:48:07 +0000
Subject: [pkgdb] lohit-marathi-fonts was added for pravins
Message-ID: <20090911084807.E808C10F87A@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-marathi-fonts with summary Free Marathi Open Type Font
petersen has approved Package lohit-marathi-fonts
petersen has added a Fedora devel branch for lohit-marathi-fonts with an owner of pravins
petersen has approved lohit-marathi-fonts in Fedora devel
petersen has approved Package lohit-marathi-fonts
petersen has set commit to Approved for 107427 on lohit-marathi-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-marathi-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-marathi-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-marathi-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:48:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:48:09 +0000
Subject: [pkgdb] lohit-marathi-fonts summary updated by petersen
Message-ID: <20090911084809.ED6FF10F890@bastion2.fedora.phx.redhat.com>

petersen set package lohit-marathi-fonts summary to Free Marathi Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-marathi-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:48:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:48:09 +0000
Subject: [pkgdb] lohit-marathi-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084810.0464910F895@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-marathi-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-marathi-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-marathi-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-marathi-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-marathi-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:48:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:48:16 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts - New directory
Message-ID: <20090911084816.1571711C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-marathi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsj30288/rpms/lohit-marathi-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-marathi-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:48:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:48:16 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts/devel - New directory
Message-ID: <20090911084816.4000E11C0419@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-marathi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsj30288/rpms/lohit-marathi-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-marathi-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:48:22 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:48:22 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts Makefile,NONE,1.1
Message-ID: <20090911084822.ECC6A11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-marathi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsj30288/rpms/lohit-marathi-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-marathi-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-marathi-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:48:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:48:23 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911084823.43A5D11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-marathi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsj30288/rpms/lohit-marathi-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-marathi-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-marathi-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:48:23 petersen Exp $
NAME := lohit-marathi-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:49:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:49:02 +0000
Subject: [pkgdb] lohit-nepali-fonts summary updated by petersen
Message-ID: <20090911084902.36C7F10F894@bastion2.fedora.phx.redhat.com>

petersen set package lohit-nepali-fonts summary to Free Nepali Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-nepali-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:49:01 +0000
Subject: [pkgdb] lohit-nepali-fonts was added for pravins
Message-ID: <20090911084901.91FA210F87A@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-nepali-fonts with summary Free Nepali Open Type Font
petersen has approved Package lohit-nepali-fonts
petersen has added a Fedora devel branch for lohit-nepali-fonts with an owner of pravins
petersen has approved lohit-nepali-fonts in Fedora devel
petersen has approved Package lohit-nepali-fonts
petersen has set commit to Approved for 107427 on lohit-nepali-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-nepali-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-nepali-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-nepali-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:49:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:49:02 +0000
Subject: [pkgdb] lohit-nepali-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084902.4780E10F898@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-nepali-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-nepali-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-nepali-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-nepali-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-nepali-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:49:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:49:08 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts - New directory
Message-ID: <20090911084908.1B96011C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-nepali-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsS30563/rpms/lohit-nepali-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-nepali-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:49:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:49:08 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts/devel - New directory
Message-ID: <20090911084908.5AED911C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-nepali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsS30563/rpms/lohit-nepali-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-nepali-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:49:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:49:14 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts Makefile,NONE,1.1
Message-ID: <20090911084914.C9B9611C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-nepali-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsS30563/rpms/lohit-nepali-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-nepali-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-nepali-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:49:15 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:49:15 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911084915.2E0A111C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-nepali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsS30563/rpms/lohit-nepali-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-nepali-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-nepali-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:49:14 petersen Exp $
NAME := lohit-nepali-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:49:56 +0000
Subject: [pkgdb] lohit-oriya-fonts was added for pravins
Message-ID: <20090911084956.B60C510F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-oriya-fonts with summary Free Oriya Open Type Font
petersen has approved Package lohit-oriya-fonts
petersen has added a Fedora devel branch for lohit-oriya-fonts with an owner of pravins
petersen has approved lohit-oriya-fonts in Fedora devel
petersen has approved Package lohit-oriya-fonts
petersen has set commit to Approved for 107427 on lohit-oriya-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-oriya-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-oriya-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-oriya-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:49:58 +0000
Subject: [pkgdb] lohit-oriya-fonts summary updated by petersen
Message-ID: <20090911084958.919A510F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-oriya-fonts summary to Free Oriya Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-oriya-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:50:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:50:05 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts - New directory
Message-ID: <20090911085005.1FBB811C043B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-oriya-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsO30815/rpms/lohit-oriya-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-oriya-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:50:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:50:05 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts/devel - New directory
Message-ID: <20090911085005.46D7E11C043B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-oriya-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsO30815/rpms/lohit-oriya-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-oriya-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:49:58 +0000
Subject: [pkgdb] lohit-oriya-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911084958.A633A10F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-oriya-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-oriya-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-oriya-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-oriya-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-oriya-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:50:11 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:50:11 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts Makefile,NONE,1.1
Message-ID: <20090911085011.B2AA211C043B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-oriya-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsO30815/rpms/lohit-oriya-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-oriya-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-oriya-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:50:12 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:50:12 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911085012.0398811C043B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-oriya-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsO30815/rpms/lohit-oriya-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-oriya-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-oriya-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:50:11 petersen Exp $
NAME := lohit-oriya-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:51:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:51:05 +0000
Subject: [pkgdb] lohit-punjabi-fonts was added for pravins
Message-ID: <20090911085105.953D710F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-punjabi-fonts with summary Free Punjabi Open Type Font
petersen has approved Package lohit-punjabi-fonts
petersen has added a Fedora devel branch for lohit-punjabi-fonts with an owner of pravins
petersen has approved lohit-punjabi-fonts in Fedora devel
petersen has approved Package lohit-punjabi-fonts
petersen has set commit to Approved for 107427 on lohit-punjabi-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-punjabi-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-punjabi-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-punjabi-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:51:06 +0000
Subject: [pkgdb] lohit-punjabi-fonts summary updated by petersen
Message-ID: <20090911085106.D258F10F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-punjabi-fonts summary to Free Punjabi Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-punjabi-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:51:13 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:51:13 +0000 (UTC)
Subject: rpms/lohit-punjabi-fonts - New directory
Message-ID: <20090911085113.193B611C0425@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-punjabi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsH31147/rpms/lohit-punjabi-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-punjabi-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:51:13 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:51:13 +0000 (UTC)
Subject: rpms/lohit-punjabi-fonts/devel - New directory
Message-ID: <20090911085113.3F7CC11C04E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-punjabi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsH31147/rpms/lohit-punjabi-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-punjabi-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:51:06 +0000
Subject: [pkgdb] lohit-punjabi-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911085106.DB5FF10F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-punjabi-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-punjabi-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-punjabi-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-punjabi-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-punjabi-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:51:20 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:51:20 +0000 (UTC)
Subject: rpms/lohit-punjabi-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911085120.035FE11C04E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-punjabi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsH31147/rpms/lohit-punjabi-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-punjabi-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-punjabi-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:51:19 petersen Exp $
NAME := lohit-punjabi-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:54:23 +0000
Subject: [pkgdb] lohit-tamil-fonts was added for pravins
Message-ID: <20090911085423.4901E10F87A@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-tamil-fonts with summary Free Tamil Open Type Font
petersen has approved Package lohit-tamil-fonts
petersen has added a Fedora devel branch for lohit-tamil-fonts with an owner of pravins
petersen has approved lohit-tamil-fonts in Fedora devel
petersen has approved Package lohit-tamil-fonts
petersen has set commit to Approved for 107427 on lohit-tamil-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-tamil-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-tamil-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-tamil-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:54:23 +0000
Subject: [pkgdb] lohit-tamil-fonts summary updated by petersen
Message-ID: <20090911085423.D39FA10F88A@bastion2.fedora.phx.redhat.com>

petersen set package lohit-tamil-fonts summary to Free Tamil Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-tamil-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:54:23 +0000
Subject: [pkgdb] lohit-tamil-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911085423.DD85510F894@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-tamil-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-tamil-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-tamil-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-tamil-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-tamil-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:54:30 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:54:30 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts - New directory
Message-ID: <20090911085430.2CB9811C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-tamil-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsD31895/rpms/lohit-tamil-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-tamil-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:54:30 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:54:30 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel - New directory
Message-ID: <20090911085430.625EF11C02C8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsD31895/rpms/lohit-tamil-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-tamil-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:54:37 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:54:37 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts Makefile,NONE,1.1
Message-ID: <20090911085437.3C73511C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-tamil-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsD31895/rpms/lohit-tamil-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-tamil-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-tamil-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:54:37 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:54:37 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911085437.AA16411C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsD31895/rpms/lohit-tamil-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-tamil-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-tamil-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:54:37 petersen Exp $
NAME := lohit-tamil-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:57:06 +0000
Subject: [pkgdb] lohit-telugu-fonts was added for pravins
Message-ID: <20090911085706.96B2710F88A@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-telugu-fonts with summary Free Telugu Open Type Font
petersen has approved Package lohit-telugu-fonts
petersen has added a Fedora devel branch for lohit-telugu-fonts with an owner of pravins
petersen has approved lohit-telugu-fonts in Fedora devel
petersen has approved Package lohit-telugu-fonts
petersen has set commit to Approved for 107427 on lohit-telugu-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-telugu-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-telugu-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-telugu-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:57:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:57:08 +0000
Subject: [pkgdb] lohit-telugu-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911085708.49F4610F898@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-telugu-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-telugu-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-telugu-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-telugu-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-telugu-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:57:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:57:08 +0000
Subject: [pkgdb] lohit-telugu-fonts summary updated by petersen
Message-ID: <20090911085708.4121A10F894@bastion2.fedora.phx.redhat.com>

petersen set package lohit-telugu-fonts summary to Free Telugu Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-telugu-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:57:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:57:14 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts - New directory
Message-ID: <20090911085714.1C2F511C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-telugu-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL32570/rpms/lohit-telugu-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-telugu-fonts added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:57:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:57:14 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel - New directory
Message-ID: <20090911085714.42F8111C0418@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL32570/rpms/lohit-telugu-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-telugu-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:57:20 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:57:20 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts Makefile,NONE,1.1
Message-ID: <20090911085720.D6E5611C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-telugu-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL32570/rpms/lohit-telugu-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-telugu-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-telugu-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:57:21 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:57:21 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911085721.4B01A11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsL32570/rpms/lohit-telugu-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-telugu-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-telugu-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:57:21 petersen Exp $
NAME := lohit-telugu-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Sep 11 08:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:59:24 +0000
Subject: [pkgdb] lohit-sindhi-fonts was added for pravins
Message-ID: <20090911085924.B00BF10F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package lohit-sindhi-fonts with summary Free Sindhi Open Type Font
petersen has approved Package lohit-sindhi-fonts
petersen has added a Fedora devel branch for lohit-sindhi-fonts with an owner of pravins
petersen has approved lohit-sindhi-fonts in Fedora devel
petersen has approved Package lohit-sindhi-fonts
petersen has set commit to Approved for 107427 on lohit-sindhi-fonts (Fedora devel)
petersen has set checkout to Approved for 107427 on lohit-sindhi-fonts (Fedora devel)
petersen has set build to Approved for 107427 on lohit-sindhi-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-sindhi-fonts



From pkgdb at fedoraproject.org  Fri Sep 11 08:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:59:25 +0000
Subject: [pkgdb] lohit-sindhi-fonts summary updated by petersen
Message-ID: <20090911085925.37E5F10F884@bastion2.fedora.phx.redhat.com>

petersen set package lohit-sindhi-fonts summary to Free Sindhi Open Type Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-sindhi-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:59:31 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:59:31 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts - New directory
Message-ID: <20090911085931.1E4A711C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvspOg662/rpms/lohit-sindhi-fonts

Log Message:
Directory /cvs/pkgs/rpms/lohit-sindhi-fonts added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 08:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 08:59:25 +0000
Subject: [pkgdb] lohit-sindhi-fonts (Fedora, devel) updated by petersen
Message-ID: <20090911085925.40E9B10F893@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on lohit-sindhi-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on lohit-sindhi-fonts (Fedora devel) for fonts-sig
petersen approved watchbugzilla on lohit-sindhi-fonts (Fedora devel) for i18n-team
petersen approved watchcommits on lohit-sindhi-fonts (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lohit-sindhi-fonts



From petersen at fedoraproject.org  Fri Sep 11 08:59:31 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:59:31 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts/devel - New directory
Message-ID: <20090911085931.4AEB411C0418@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvspOg662/rpms/lohit-sindhi-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/lohit-sindhi-fonts/devel added to the repository




From petersen at fedoraproject.org  Fri Sep 11 08:59:38 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:59:38 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts Makefile,NONE,1.1
Message-ID: <20090911085938.3712D11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvspOg662/rpms/lohit-sindhi-fonts

Added Files:
	Makefile 
Log Message:
Setup of module lohit-sindhi-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-sindhi-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Fri Sep 11 08:59:38 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Sep 2009 08:59:38 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911085938.902BF11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvspOg662/rpms/lohit-sindhi-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-sindhi-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-sindhi-fonts
# $Id: Makefile,v 1.1 2009/09/11 08:59:38 petersen Exp $
NAME := lohit-sindhi-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pravins at fedoraproject.org  Fri Sep 11 09:13:50 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 09:13:50 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts/devel import.log, NONE,
	1.1 lohit-assamese-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911091350.D228A11C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-assamese-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-assamese-fonts.spec 
Log Message:
* Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-assamese-fonts-2_4_3-1_fc11:HEAD:lohit-assamese-fonts-2.4.3-1.fc11.src.rpm:1252660518


--- NEW FILE lohit-assamese-fonts.spec ---
%global fontname lohit-assamese
%global fontconf 66-%{fontname}.conf

#global archivename %{name}-%{version} ?

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Assamese font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/assamese/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Assamese truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-assamese-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 07:12:04 -0000	1.1
+++ .cvsignore	11 Sep 2009 09:13:50 -0000	1.2
@@ -0,0 +1 @@
+lohit-assamese-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-assamese-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 07:12:04 -0000	1.1
+++ sources	11 Sep 2009 09:13:50 -0000	1.2
@@ -0,0 +1 @@
+95852a4abd82d4e14a83e3272d33f29e  lohit-assamese-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 09:21:05 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 09:21:05 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts/devel import.log, NONE,
	1.1 lohit-bengali-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911092105.BF4DC11C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-bengali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9595/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-bengali-fonts.spec 
Log Message:
* Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-bengali-fonts-2_4_3-1_fc11:HEAD:lohit-bengali-fonts-2.4.3-1.fc11.src.rpm:1252661088


--- NEW FILE lohit-bengali-fonts.spec ---
%global fontname lohit-bengali
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Bengali font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/bengali/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Bengali truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-bengali-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:04:36 -0000	1.1
+++ .cvsignore	11 Sep 2009 09:21:05 -0000	1.2
@@ -0,0 +1 @@
+lohit-bengali-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-bengali-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:04:36 -0000	1.1
+++ sources	11 Sep 2009 09:21:05 -0000	1.2
@@ -0,0 +1 @@
+e696acd2baad147430062303b4794d53  lohit-bengali-2.4.3.tar.gz



From jakub at fedoraproject.org  Fri Sep 11 09:52:13 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 11 Sep 2009 09:52:13 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-pr41175-2.patch, NONE, 1.1 gcc44-rh518303.patch,
	NONE, 1.1 gcc44-rh522577.patch, NONE, 1.1 .cvsignore, 1.290,
	1.291 gcc.spec, 1.68, 1.69 sources, 1.294,
	1.295 gcc44-vta-cselib-subreg-of-value-more-pr41276.patch, 1.2, NONE
Message-ID: <20090911095213.71D1C11C0099@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18307

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr41175-2.patch gcc44-rh518303.patch 
	gcc44-rh522577.patch 
Removed Files:
	gcc44-vta-cselib-subreg-of-value-more-pr41276.patch 
Log Message:
4.4.1-13

gcc44-pr41175-2.patch:
 config/rs6000/rs6000.c                 |   24 +
 testsuite/gcc.target/powerpc/pr41175.c |  451 +++++++++++++++++++++++++++++++++
 2 files changed, 466 insertions(+), 9 deletions(-)

--- NEW FILE gcc44-pr41175-2.patch ---
2009-09-11  Jakub Jelinek  <jakub at redhat.com>

	PR target/41175
	* config/rs6000/rs6000.c (rs6000_emit_stack_reset): Handle savres
	if sp_offset != 0 and frame_reg_rtx != sp_reg_rtx.  Use gen_add3_insn
	instead of gen_addsi3.
	(rs6000_emit_epilogue): Set r11 from offsetted frame_reg_rtx instead
	sp_reg_rtx, if frame_reg_rtx is r11, adjust sp_offset.  Use
	gen_add3_insn instead of gen_addsi3.  Merge two adjacent ifs with the
	same condition.

	* gcc.target/powerpc/pr41175.c: New test.

--- gcc/config/rs6000/rs6000.c.jj	2009-09-09 20:46:57.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2009-09-11 10:29:01.101406443 +0200
@@ -18104,8 +18104,12 @@ rs6000_emit_stack_reset (rs6000_stack_t 
   if (frame_reg_rtx != sp_reg_rtx)
     {
       if (sp_offset != 0)
-	return emit_insn (gen_addsi3 (sp_reg_rtx, frame_reg_rtx,
-				      GEN_INT (sp_offset)));
+	{
+	  rtx dest_reg = savres ? gen_rtx_REG (Pmode, 11) : sp_reg_rtx;
+
+	  return emit_insn (gen_add3_insn (dest_reg, frame_reg_rtx,
+					   GEN_INT (sp_offset)));
+	}
       else if (!savres)
 	return emit_move_insn (sp_reg_rtx, frame_reg_rtx);
     }
@@ -19541,9 +19545,13 @@ rs6000_emit_epilogue (int sibcall)
 	rs6000_emit_stack_reset (info, sp_reg_rtx, frame_reg_rtx,
 				 sp_offset, can_use_exit);
       else
-	emit_insn (gen_addsi3 (gen_rtx_REG (Pmode, 11),
-			       sp_reg_rtx,
-			       GEN_INT (sp_offset - info->fp_size)));
+	{
+	  emit_insn (gen_add3_insn (gen_rtx_REG (Pmode, 11),
+				    frame_reg_rtx,
+				    GEN_INT (sp_offset - info->fp_size)));
+	  if (REGNO (frame_reg_rtx) == 11)
+	    sp_offset += info->fp_size;
+	}
 
       par = rs6000_make_savres_rtx (info, frame_reg_rtx,
 				    info->gp_save_offset, reg_mode,
@@ -19648,12 +19656,10 @@ rs6000_emit_epilogue (int sibcall)
 				      info->lr_save_offset + sp_offset);
 
       emit_move_insn (gen_rtx_REG (Pmode, 0), mem);
+      emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
+		      gen_rtx_REG (Pmode, 0));
     }
 
-  if (restore_lr && !restoring_GPRs_inline)
-    emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
-		    gen_rtx_REG (Pmode, 0));
-
   /* Restore fpr's if we need to do it without calling a function.  */
   if (restoring_FPRs_inline)
     for (i = 0; i < 64 - info->first_fp_reg_save; i++)
--- gcc/testsuite/gcc.target/powerpc/pr41175.c.jj	2009-09-11 10:28:50.529527601 +0200
+++ gcc/testsuite/gcc.target/powerpc/pr41175.c	2009-09-11 10:18:59.000000000 +0200
@@ -0,0 +1,451 @@
+/* PR target/41175 */
+/* { dg-do run } */
+/* { dg-options "-Os" } */
+
+#define X2(n) X1(n##0) X1(n##1)
+#define X4(n) X2(n##0) X2(n##1)
+#define X8(n) X4(n##0) X4(n##1)
+
+volatile int ll;
+
+__attribute__((noinline)) void
+foo (void)
+{
+  asm volatile ("" : : : "memory");
+}
+
+__attribute__((noinline)) void
+bar (char *p)
+{
+  asm volatile ("" : : "r" (p) : "memory");
+}
+
+__attribute__((noinline)) void
+f1 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+  foo ();
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f2 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+  char *pp = __builtin_alloca (ll);
+  bar (pp);
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f3 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f4 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X4(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X4(d) "=m" (mem) : : "memory");
+  foo ();
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X4(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f5 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X4(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X4(d) "=m" (mem) : : "memory");
+  char *pp = __builtin_alloca (ll);
+  bar (pp);
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X4(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f6 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X4(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X4(d) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X4(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f7 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X2(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X2(d) "=m" (mem) : : "memory");
+  foo ();
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X2(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f8 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X2(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X2(d) "=m" (mem) : : "memory");
+  char *pp = __builtin_alloca (ll);
+  bar (pp);
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X2(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f9 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X8(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X2(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X2(d) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X8(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X2(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f10 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X4(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X1(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X4(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X1(d) "=m" (mem) : : "memory");
+  foo ();
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X4(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X1(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f11 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X4(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X1(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X4(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X1(d) "=m" (mem) : : "memory");
+  char *pp = __builtin_alloca (ll);
+  bar (pp);
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X4(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X1(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f12 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X4(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X1(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X4(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X1(d) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X4(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X1(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f13 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X2(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X8(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X2(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X8(d) "=m" (mem) : : "memory");
+  foo ();
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X2(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X8(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f14 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X2(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X8(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X2(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X8(d) "=m" (mem) : : "memory");
+  char *pp = __builtin_alloca (ll);
+  bar (pp);
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X2(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X8(d) "m" (mem) : "memory");
+}
+
+__attribute__((noinline)) void
+f15 (void)
+{
+  int mem;
+#undef X1
+#define X1(n) int gpr##n = 0;
+  X8(a) X8(b) X2(c)
+#undef X1
+#define X1(n) double fpr##n = 0.0;
+  X8(d)
+#undef X1
+#define X1(n) "+r" (gpr##n),
+  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
+  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
+  asm volatile ("" : X2(c) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "+f" (fpr##n),
+  asm volatile ("" : X8(d) "=m" (mem) : : "memory");
+#undef X1
+#define X1(n) "r" (gpr##n),
+  asm volatile ("" : : X8(a) "m" (mem) : "memory");
+  asm volatile ("" : : X8(b) "m" (mem) : "memory");
+  asm volatile ("" : : X2(c) "m" (mem) : "memory");
+#undef X1
+#define X1(n) "f" (fpr##n),
+  asm volatile ("" : : X8(d) "m" (mem) : "memory");
+}
+
+int
+main ()
+{
+  ll = 60;
+  f1 ();
+  f2 ();
+  f3 ();
+  f4 ();
+  f5 ();
+  f6 ();
+  f7 ();
+  f8 ();
+  f9 ();
+  f10 ();
+  f11 ();
+  f12 ();
+  f13 ();
+  f14 ();
+  f15 ();
+  return 0;
+}

gcc44-rh518303.patch:
 integrate.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE gcc44-rh518303.patch ---
2009-09-09  Jakub Jelinek  <jakub at redhat.com>

	* integrate.c (set_block_abstract_flags): Call
	set_decl_abstract_flags also on BLOCK_NONLOCALIZED_VARs.

--- gcc/integrate.c.jj	2009-03-04 12:12:03.000000000 +0100
+++ gcc/integrate.c	2009-09-09 18:07:07.000000000 +0200
@@ -167,6 +167,7 @@ set_block_abstract_flags (tree stmt, int
 {
   tree local_decl;
   tree subblock;
+  unsigned int i;
 
   BLOCK_ABSTRACT (stmt) = setting;
 
@@ -175,6 +176,14 @@ set_block_abstract_flags (tree stmt, int
        local_decl = TREE_CHAIN (local_decl))
     set_decl_abstract_flags (local_decl, setting);
 
+  for (i = 0; i < BLOCK_NUM_NONLOCALIZED_VARS (stmt); i++)
+    {
+      local_decl = BLOCK_NONLOCALIZED_VAR (stmt, i);
+      if ((TREE_CODE (local_decl) == VAR_DECL && !TREE_STATIC (local_decl))
+	  || TREE_CODE (local_decl) == PARM_DECL)
+	set_decl_abstract_flags (local_decl, setting);
+    }
+
   for (subblock = BLOCK_SUBBLOCKS (stmt);
        subblock != NULL_TREE;
        subblock = BLOCK_CHAIN (subblock))

gcc44-rh522577.patch:
 combine.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcc44-rh522577.patch ---
2009-09-11  Jakub Jelinek  <jakub at redhat.com>

	* combine.c (propagate_for_debug_subst): Call wrap_constant on top.

--- gcc/combine.c.jj	2009-09-08 12:32:31.000000000 +0200
+++ gcc/combine.c	2009-09-11 11:01:32.000000000 +0200
@@ -2311,7 +2311,7 @@ propagate_for_debug_subst (rtx *loc, voi
 	  to = simplify_gen_subreg (GET_MODE (x), to,
 				    GET_MODE (from), SUBREG_BYTE (x));
 	}
-      *loc = to;
+      *loc = wrap_constant (GET_MODE (x), to);
       pair->changed = true;
       return -1;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- .cvsignore	10 Sep 2009 14:24:08 -0000	1.290
+++ .cvsignore	11 Sep 2009 09:52:12 -0000	1.291
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090910.tar.bz2
+gcc-4.4.1-20090911.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- gcc.spec	10 Sep 2009 14:24:08 -0000	1.68
+++ gcc.spec	11 Sep 2009 09:52:12 -0000	1.69
@@ -1,9 +1,9 @@
-%global DATE 20090910
-%global SVNREV 151593
+%global DATE 20090911
+%global SVNREV 151630
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 12
+%global gcc_release 13
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -160,9 +160,11 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
-Patch20: gcc44-vta-cselib-subreg-of-value-more-pr41276.patch
-Patch21: gcc44-powerpc-libgcc_s_so.patch
-Patch22: gcc44-pr41175.patch
+Patch20: gcc44-powerpc-libgcc_s_so.patch
+Patch21: gcc44-pr41175.patch
+Patch22: gcc44-pr41175-2.patch
+Patch23: gcc44-rh518303.patch
+Patch24: gcc44-rh522577.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -469,9 +471,11 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
-%patch20 -p0 -b .gcc44-vta-cselib-subreg-of-value-more-pr41276~
-%patch21 -p0 -b .powerpc-libgcc_s_so~
-%patch22 -p0 -b .pr41175~
+%patch20 -p0 -b .powerpc-libgcc_s_so~
+%patch21 -p0 -b .pr41175~
+%patch22 -p0 -b .pr41175-2~
+%patch23 -p0 -b .rh518303~
+%patch24 -p0 -b .rh522577~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1827,6 +1831,11 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 11 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-13
+- fix ICE in debuginfo output with BLOCK_NONLOCALIZED_VARS (#518303)
+- wrap_constant when propagating for subst in debug in the combiner (#522577)
+- further fix for ppc -m32 -Os out of line gpr/fpr restoring (PR target/41175)
+
 * Thu Sep 10 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-12
 - update from gcc-4_4-branch
   - PRs bootstrap/41180, target/41315


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- sources	10 Sep 2009 14:24:09 -0000	1.294
+++ sources	11 Sep 2009 09:52:13 -0000	1.295
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-e928ff85387b4b7c8f1f065a15f0a4f9  gcc-4.4.1-20090910.tar.bz2
+36739b78d9654be37ccf6019e72db459  gcc-4.4.1-20090911.tar.bz2


--- gcc44-vta-cselib-subreg-of-value-more-pr41276.patch DELETED ---



From pravins at fedoraproject.org  Fri Sep 11 10:04:37 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:04:37 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/devel import.log, NONE,
	1.1 lohit-gujarati-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911100437.134DA11C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21854/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-gujarati-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-gujarati-fonts-2_4_3-1_fc11:HEAD:lohit-gujarati-fonts-2.4.3-1.fc11.src.rpm:1252663708


--- NEW FILE lohit-gujarati-fonts.spec ---
%global fontname lohit-gujarati
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Gujarati font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Gujarati truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:10:23 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:04:36 -0000	1.2
@@ -0,0 +1 @@
+lohit-gujarati-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:10:23 -0000	1.1
+++ sources	11 Sep 2009 10:04:36 -0000	1.2
@@ -0,0 +1 @@
+92dacc86836abbf69bfcc47c3e9ae669  lohit-gujarati-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:06:35 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:06:35 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts/devel import.log, NONE,
	1.1 lohit-hindi-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911100635.7E1D511C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-hindi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23109/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-hindi-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-hindi-fonts-2_4_3-1_fc11:HEAD:lohit-hindi-fonts-2.4.3-1.fc11.src.rpm:1252663836


--- NEW FILE lohit-hindi-fonts.spec ---
%global fontname lohit-hindi
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Hindi font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Hindi truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old

%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-hindi-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:21:16 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:06:35 -0000	1.2
@@ -0,0 +1 @@
+lohit-hindi-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-hindi-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:21:17 -0000	1.1
+++ sources	11 Sep 2009 10:06:35 -0000	1.2
@@ -0,0 +1 @@
+4612dc350a1364745c42935d5d67ba04  lohit-hindi-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:09:54 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:09:54 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts/devel import.log, NONE,
	1.1 lohit-kannada-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911100954.E82E611C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kannada-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24471/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-kannada-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-kannada-fonts-2_4_3-1_fc11:HEAD:lohit-kannada-fonts-2.4.3-1.fc11.src.rpm:1252664020


--- NEW FILE lohit-kannada-fonts.spec ---
%global fontname lohit-kannada
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Kannada font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/kannada/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Kannada truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:29:41 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:09:54 -0000	1.2
@@ -0,0 +1 @@
+lohit-kannada-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:29:41 -0000	1.1
+++ sources	11 Sep 2009 10:09:54 -0000	1.2
@@ -0,0 +1 @@
+a5a3d4367ebf8f68388bd9c75f82e8a0  lohit-kannada-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:13:56 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:13:56 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts/devel import.log, NONE,
	1.1 lohit-kashmiri-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911101356.995B211C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25708/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-kashmiri-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-kashmiri-fonts-2_4_3-1_fc11:HEAD:lohit-kashmiri-fonts-2.4.3-1.fc11.src.rpm:1252664215


--- NEW FILE lohit-kashmiri-fonts.spec ---
%global fontname lohit-kashmiri
%global fontconf 66-%{fontname}@devanagari.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Kashmiri Devanagari Script Font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Kashmiri devanagari script truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:42:56 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:13:56 -0000	1.2
@@ -0,0 +1 @@
+lohit-kashmiri-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:42:56 -0000	1.1
+++ sources	11 Sep 2009 10:13:56 -0000	1.2
@@ -0,0 +1 @@
+d93ad45a8834d963d4d315719000c65d  lohit-kashmiri-2.4.3.tar.gz



From jakub at fedoraproject.org  Fri Sep 11 10:19:55 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 11 Sep 2009 10:19:55 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-pr41175-2.patch,1.1,1.2
Message-ID: <20090911101955.7C3C711C0099@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27510

Modified Files:
	gcc44-pr41175-2.patch 
Log Message:
4.4.1-13

gcc44-pr41175-2.patch:
 config/rs6000/rs6000.c                 |   24 +
 testsuite/gcc.target/powerpc/pr41175.c |  451 +++++++++++++++++++++++++++++++++
 2 files changed, 466 insertions(+), 9 deletions(-)

Index: gcc44-pr41175-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr41175-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-pr41175-2.patch	11 Sep 2009 09:52:12 -0000	1.1
+++ gcc44-pr41175-2.patch	11 Sep 2009 10:19:55 -0000	1.2
@@ -13,9 +13,9 @@
 
 --- gcc/config/rs6000/rs6000.c.jj	2009-09-09 20:46:57.000000000 +0200
 +++ gcc/config/rs6000/rs6000.c	2009-09-11 10:29:01.101406443 +0200
-@@ -18104,8 +18104,12 @@ rs6000_emit_stack_reset (rs6000_stack_t 
-   if (frame_reg_rtx != sp_reg_rtx)
+@@ -18083,8 +18083,12 @@ rs6000_emit_stack_reset (rs6000_stack_t 
      {
+       rs6000_emit_stack_tie ();
        if (sp_offset != 0)
 -	return emit_insn (gen_addsi3 (sp_reg_rtx, frame_reg_rtx,
 -				      GEN_INT (sp_offset)));
@@ -28,7 +28,7 @@
        else if (!savres)
  	return emit_move_insn (sp_reg_rtx, frame_reg_rtx);
      }
-@@ -19541,9 +19545,13 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19525,9 +19529,13 @@ rs6000_emit_epilogue (int sibcall)
  	rs6000_emit_stack_reset (info, sp_reg_rtx, frame_reg_rtx,
  				 sp_offset, can_use_exit);
        else
@@ -45,7 +45,7 @@
  
        par = rs6000_make_savres_rtx (info, frame_reg_rtx,
  				    info->gp_save_offset, reg_mode,
-@@ -19648,12 +19656,10 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19632,12 +19640,10 @@ rs6000_emit_epilogue (int sibcall)
  				      info->lr_save_offset + sp_offset);
  
        emit_move_insn (gen_rtx_REG (Pmode, 0), mem);



From pravins at fedoraproject.org  Fri Sep 11 10:21:08 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:21:08 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts/devel import.log, NONE,
	1.1 lohit-konkani-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911102108.2314D11C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-konkani-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27971/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-konkani-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-konkani-fonts-2_4_3-1_fc11:HEAD:lohit-konkani-fonts-2.4.3-1.fc11.src.rpm:1252664687


--- NEW FILE lohit-konkani-fonts.spec ---
%global fontname lohit-konkani
%global fontconf 66-%{fontname}.conf


Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Konkani Font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/konkani/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Konkani truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-konkani-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:44:57 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:21:07 -0000	1.2
@@ -0,0 +1 @@
+lohit-konkani-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-konkani-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:44:57 -0000	1.1
+++ sources	11 Sep 2009 10:21:08 -0000	1.2
@@ -0,0 +1 @@
+4e207253134e0c487da1f5bb22de4bf0  lohit-konkani-2.4.3.tar.gz



From paragn at fedoraproject.org  Fri Sep 11 10:29:13 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri, 11 Sep 2009 10:29:13 +0000 (UTC)
Subject: rpms/iok/devel .cvsignore, 1.12, 1.13 iok.spec, 1.14, 1.15 sources, 
	1.12, 1.13
Message-ID: <20090911102913.93DBD11C0099@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30379

Modified Files:
	.cvsignore iok.spec sources 
Log Message:
* Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
- Update to Next release 1.3.7





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Jul 2009 10:54:45 -0000	1.12
+++ .cvsignore	11 Sep 2009 10:29:13 -0000	1.13
@@ -1 +1 @@
-iok-1.3.6.tar.gz
+iok-1.3.7.tar.gz


Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- iok.spec	25 Jul 2009 03:28:19 -0000	1.14
+++ iok.spec	11 Sep 2009 10:29:13 -0000	1.15
@@ -1,11 +1,11 @@
 Name:           iok
-Version:        1.3.6
-Release:        2%{?dist}
+Version:        1.3.7
+Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://iok.sourceforge.net
-Source0:        http://downloads.sourceforge.net/iok/%{name}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libXtst-devel
 BuildRequires:  gtk2-devel gettext libxml2-devel
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
+- Update to Next release 1.3.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Jul 2009 10:54:45 -0000	1.12
+++ sources	11 Sep 2009 10:29:13 -0000	1.13
@@ -1 +1 @@
-5fff52cf98fa25dbb170d6138d7a553f  iok-1.3.6.tar.gz
+ec37ab7dc2a22b7ddc93dba0077f43cc  iok-1.3.7.tar.gz



From athimm at fedoraproject.org  Fri Sep 11 10:33:46 2009
From: athimm at fedoraproject.org (athimm)
Date: Fri, 11 Sep 2009 10:33:46 +0000 (UTC)
Subject: rpms/fail2ban/F-10 .cvsignore, 1.7, 1.8 fail2ban.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20090911103346.4307911C0099@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32743/F-10

Modified Files:
	.cvsignore fail2ban.spec sources 
Log Message:
Update to 0.8.4.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Aug 2008 09:20:30 -0000	1.7
+++ .cvsignore	11 Sep 2009 10:33:45 -0000	1.8
@@ -1 +1,2 @@
-fail2ban-0.8.3.tar.bz2
+fail2ban-FAIL2BAN-0_8.tar.bz2
+fail2ban-0.8.4.tar.bz2


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-10/fail2ban.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fail2ban.spec	27 Aug 2009 20:01:13 -0000	1.16
+++ fail2ban.spec	11 Sep 2009 10:33:45 -0000	1.17
@@ -3,19 +3,16 @@
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
-Version: 0.8.3
-Release: 21%{?dist}
+Version: 0.8.4
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 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
-Patch5: fail2ban-0.8.3-inodecheck.patch
 Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
@@ -34,10 +31,7 @@ failures. It updates firewall rules to r
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
-#patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
-%patch4 -p1 -b .CVE-2009-0362
-%patch5 -p1 -b .inodecheck
 %patch6 -p1 -b .log2syslog
 
 %build
@@ -88,6 +82,12 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Fri Sep 11 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.4-23
+- update to 0.8.4.
+
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
+- Update to a newer svn snapshot to fix python 2.6 issue.
+
 * Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
 - Log to syslog (RH bug #491983). Also deals with RH bug #515116.
 - Check inodes of log files (RH bug #503852).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Aug 2009 20:01:13 -0000	1.10
+++ sources	11 Sep 2009 10:33:46 -0000	1.11
@@ -1 +1,2 @@
-b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2
+76b4d0e69ad808950b8353c6fcf93615  fail2ban-FAIL2BAN-0_8.tar.bz2
+df94335a5d12b4750869e5fe350073fa  fail2ban-0.8.4.tar.bz2



From athimm at fedoraproject.org  Fri Sep 11 10:33:46 2009
From: athimm at fedoraproject.org (athimm)
Date: Fri, 11 Sep 2009 10:33:46 +0000 (UTC)
Subject: rpms/fail2ban/F-11 .cvsignore, 1.8, 1.9 fail2ban.spec, 1.19,
	1.20 sources, 1.11, 1.12
Message-ID: <20090911103346.6D10111C0099@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32743/F-11

Modified Files:
	.cvsignore fail2ban.spec sources 
Log Message:
Update to 0.8.4.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Sep 2009 19:00:43 -0000	1.8
+++ .cvsignore	11 Sep 2009 10:33:46 -0000	1.9
@@ -1 +1,2 @@
 fail2ban-FAIL2BAN-0_8.tar.bz2
+fail2ban-0.8.4.tar.bz2


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/fail2ban.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fail2ban.spec	2 Sep 2009 19:00:43 -0000	1.19
+++ fail2ban.spec	11 Sep 2009 10:33:46 -0000	1.20
@@ -3,13 +3,12 @@
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
-Version: 0.8.3
-Release: 22%{?dist}
+Version: 0.8.4
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-#Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source0: http://www.fail2ban.org/nightly/fail2ban-FAIL2BAN-0_8.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1: fail2ban-logrotate
 Patch0: fail2ban-0.8.3-init.patch
 Patch1: fail2ban-0.8.1-sshd.patch
@@ -29,7 +28,7 @@ Fail2ban scans log files like /var/log/p
 failures. It updates firewall rules to reject the IP address.
 
 %prep
-%setup -q -n %{name}-%{version}-SVN
+%setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
 %patch3 -p1 -b .fd_cloexec
@@ -83,6 +82,9 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Fri Sep 11 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.4-23
+- update to 0.8.4.
+
 * Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
 - Update to a newer svn snapshot to fix python 2.6 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Sep 2009 19:00:43 -0000	1.11
+++ sources	11 Sep 2009 10:33:46 -0000	1.12
@@ -1 +1,2 @@
 76b4d0e69ad808950b8353c6fcf93615  fail2ban-FAIL2BAN-0_8.tar.bz2
+df94335a5d12b4750869e5fe350073fa  fail2ban-0.8.4.tar.bz2



From athimm at fedoraproject.org  Fri Sep 11 10:33:46 2009
From: athimm at fedoraproject.org (athimm)
Date: Fri, 11 Sep 2009 10:33:46 +0000 (UTC)
Subject: rpms/fail2ban/devel .cvsignore, 1.8, 1.9 fail2ban.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20090911103346.A30CA11C0099@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32743/devel

Modified Files:
	.cvsignore fail2ban.spec sources 
Log Message:
Update to 0.8.4.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Sep 2009 19:00:43 -0000	1.8
+++ .cvsignore	11 Sep 2009 10:33:46 -0000	1.9
@@ -1 +1,2 @@
 fail2ban-FAIL2BAN-0_8.tar.bz2
+fail2ban-0.8.4.tar.bz2


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/fail2ban.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fail2ban.spec	2 Sep 2009 19:00:43 -0000	1.20
+++ fail2ban.spec	11 Sep 2009 10:33:46 -0000	1.21
@@ -3,13 +3,12 @@
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
-Version: 0.8.3
-Release: 22%{?dist}
+Version: 0.8.4
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-#Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source0: http://www.fail2ban.org/nightly/fail2ban-FAIL2BAN-0_8.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1: fail2ban-logrotate
 Patch0: fail2ban-0.8.3-init.patch
 Patch1: fail2ban-0.8.1-sshd.patch
@@ -29,7 +28,7 @@ Fail2ban scans log files like /var/log/p
 failures. It updates firewall rules to reject the IP address.
 
 %prep
-%setup -q -n %{name}-%{version}-SVN
+%setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
 %patch3 -p1 -b .fd_cloexec
@@ -83,6 +82,9 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Fri Sep 11 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.4-23
+- update to 0.8.4.
+
 * Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
 - Update to a newer svn snapshot to fix python 2.6 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Sep 2009 19:00:43 -0000	1.11
+++ sources	11 Sep 2009 10:33:46 -0000	1.12
@@ -1 +1,2 @@
 76b4d0e69ad808950b8353c6fcf93615  fail2ban-FAIL2BAN-0_8.tar.bz2
+df94335a5d12b4750869e5fe350073fa  fail2ban-0.8.4.tar.bz2



From kaigai at fedoraproject.org  Fri Sep 11 10:40:20 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Fri, 11 Sep 2009 10:40:20 +0000 (UTC)
Subject: rpms/sepostgresql/devel .cvsignore, 1.15,
	1.16 sepostgresql-8.4.patch, 
	1.1, 1.2 sepostgresql.init, 1.35, 1.36 sepostgresql.spec, 1.41,
	1.42 sources, 1.12, 1.13
Message-ID: <20090911104020.E362811C043A@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3177

Modified Files:
	.cvsignore sepostgresql-8.4.patch sepostgresql.init 
	sepostgresql.spec sources 
Log Message:
upgrade base PostgreSQL v8.4.0->8.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Aug 2009 12:00:29 -0000	1.15
+++ .cvsignore	11 Sep 2009 10:40:19 -0000	1.16
@@ -1 +1 @@
-postgresql-8.4.0.tar.bz2
+postgresql-8.4.1.tar.bz2

sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   26 
 src/backend/bootstrap/bootparse.y                                  |    9 
 src/backend/bootstrap/bootstrap.c                                  |    8 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   13 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   89 
 src/backend/catalog/index.c                                        |   26 
 src/backend/catalog/namespace.c                                    |   33 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_proc.c                                      |   19 
 src/backend/catalog/pg_security.c                                  |  637 +++++
 src/backend/catalog/pg_shdepend.c                                  |   16 
 src/backend/catalog/pg_type.c                                      |   24 
 src/backend/catalog/toasting.c                                     |    9 
 src/backend/commands/aggregatecmds.c                               |    6 
 src/backend/commands/alter.c                                       |   33 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |    4 
 src/backend/commands/copy.c                                        |  255 !!
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |    7 
 src/backend/commands/functioncmds.c                                |   91 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/proclang.c                                    |   15 
 src/backend/commands/schemacmds.c                                  |   62 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  192 +
 src/backend/commands/trigger.c                                     |    4 
 src/backend/commands/tsearchcmds.c                                 |    7 
 src/backend/commands/typecmds.c                                    |   31 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  141 !
 src/backend/executor/execQual.c                                    |    3 
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeAgg.c                                     |    4 
 src/backend/executor/nodeMergejoin.c                               |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/nodeWindowAgg.c                               |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   67 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  106 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   43 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  894 +++++++
 src/backend/security/sepgsql/checker.c                             |  443 +++
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               | 1273 ++++++++++
 src/backend/security/sepgsql/label.c                               | 1151 +++++++++
 src/backend/security/sepgsql/misc.c                                |  304 ++
 src/backend/security/sepgsql/perms.c                               |  464 +++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  121 
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 
 src/backend/tcop/fastpath.c                                        |    3 
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    4 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   26 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |    9 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    5 
 src/backend/utils/misc/superuser.c                                 |   15 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  150 !
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  101 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  534 ++++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/expected/sanity_check.out                         |    3 
 134 files changed, 8287 insertions(+), 2 deletions(-), 607 modifications(!)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 sepostgresql-8.4.patchIndex: sepostgresql-8.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-8.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sepostgresql-8.4.patch	19 Aug 2009 12:00:30 -0000	1.1
+++ sepostgresql-8.4.patch	11 Sep 2009 10:40:20 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nrpc base/configure sepgsql/configure
-*** base/configure	Tue Jun 30 01:26:47 2009
---- sepgsql/configure	Wed Jul 15 21:17:18 2009
+*** base/configure	Sun Sep  6 19:40:49 2009
+--- sepgsql/configure	Sun Sep  6 19:53:10 2009
 *************** with_libxml
 *** 710,715 ****
 --- 710,716 ----
@@ -189,8 +189,8 @@ diff -Nrpc base/configure sepgsql/config
     elif $ac_last_try; then
       { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff -Nrpc base/configure.in sepgsql/configure.in
-*** base/configure.in	Tue Jun 30 01:26:47 2009
---- sepgsql/configure.in	Wed Jul 15 19:35:52 2009
+*** base/configure.in	Sun Sep  6 19:40:49 2009
+--- sepgsql/configure.in	Sun Sep  6 19:53:10 2009
 *************** PGAC_ARG_BOOL(with, zlib, yes,
 *** 764,769 ****
 --- 764,782 ----
@@ -262,7 +262,7 @@ diff -Nrpc base/src/backend/Makefile sep
   all: submake-libpgport postgres $(POSTGRES_IMP)
 diff -Nrpc base/src/backend/access/common/heaptuple.c sepgsql/src/backend/access/common/heaptuple.c
 *** base/src/backend/access/common/heaptuple.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/access/common/heaptuple.c	Wed Jul 15 19:48:58 2009
+--- sepgsql/src/backend/access/common/heaptuple.c	Thu Sep 10 15:18:03 2009
 ***************
 *** 60,65 ****
 --- 60,66 ----
@@ -279,7 +279,7 @@ diff -Nrpc base/src/backend/access/commo
   		case MinCommandIdAttributeNumber:
   		case MaxTransactionIdAttributeNumber:
   		case MaxCommandIdAttributeNumber:
-+ 		case SecurityLabelAttributeNumber:
++ 		case SecurityAttributeNumber:
   			/* these are never null */
   			break;
   
@@ -289,8 +289,8 @@ diff -Nrpc base/src/backend/access/commo
   		case TableOidAttributeNumber:
   			result = ObjectIdGetDatum(tup->t_tableOid);
   			break;
-+ 		case SecurityLabelAttributeNumber:
-+ 			result = securityHeapGetSecLabelSysattr(tup);
++ 		case SecurityAttributeNumber:
++ 			result = securitySysattSecLabelOut(tup->t_tableOid, tup);
 + 			break;
   		default:
   			elog(ERROR, "invalid attnum: %d", attnum);
@@ -301,7 +301,7 @@ diff -Nrpc base/src/backend/access/commo
   
   	if (tupleDescriptor->tdhasoid)
   		len += sizeof(Oid);
-+ 	if (tupleDescriptor->tdhasseclabel)
++ 	if (tupleDescriptor->tdhassecid)
 + 		len += sizeof(Oid);
   
   	hoff = len = MAXALIGN(len); /* align user data safely */
@@ -312,8 +312,8 @@ diff -Nrpc base/src/backend/access/commo
   
   	if (tupleDescriptor->tdhasoid)		/* else leave infomask = 0 */
   		td->t_infomask = HEAP_HASOID;
-+ 	if (tupleDescriptor->tdhasseclabel)
-+ 		td->t_infomask |= HEAP_HAS_SECLABEL;
++ 	if (tupleDescriptor->tdhassecid)
++ 		td->t_infomask |= HEAP_HASSECID;
   
   	heap_fill_tuple(tupleDescriptor,
   					values,
@@ -323,8 +323,8 @@ diff -Nrpc base/src/backend/access/commo
   	newTuple->t_tableOid = tuple->t_tableOid;
   	if (tupleDesc->tdhasoid)
   		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
-+ 	if (HeapTupleHasSecLabel(newTuple))
-+ 		HeapTupleSetSecLabel(newTuple, HeapTupleGetSecLabel(tuple));
++ 	if (HeapTupleHasSecid(newTuple))
++ 		HeapTupleSetSecid(newTuple, HeapTupleGetSecid(tuple));
   
   	return newTuple;
   }
@@ -334,7 +334,7 @@ diff -Nrpc base/src/backend/access/commo
   
   	if (tupleDescriptor->tdhasoid)
   		len += sizeof(Oid);
-+ 	if (tupleDescriptor->tdhasseclabel)
++ 	if (tupleDescriptor->tdhassecid)
 + 		len += sizeof(Oid);
   
   	hoff = len = MAXALIGN(len); /* align user data safely */
@@ -345,21 +345,21 @@ diff -Nrpc base/src/backend/access/commo
   
   	if (tupleDescriptor->tdhasoid)		/* else leave infomask = 0 */
   		tuple->t_infomask = HEAP_HASOID;
-+ 	if (tupleDescriptor->tdhasseclabel)
-+ 		tuple->t_infomask |= HEAP_HAS_SECLABEL;
++ 	if (tupleDescriptor->tdhassecid)
++ 		tuple->t_infomask |= HEAP_HASSECID;
   
   	heap_fill_tuple(tupleDescriptor,
   					values,
 diff -Nrpc base/src/backend/access/common/tupdesc.c sepgsql/src/backend/access/common/tupdesc.c
 *** base/src/backend/access/common/tupdesc.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/access/common/tupdesc.c	Wed Jul 15 19:30:50 2009
+--- sepgsql/src/backend/access/common/tupdesc.c	Wed Sep  9 13:14:37 2009
 *************** CreateTemplateTupleDesc(int natts, bool 
 *** 88,93 ****
 --- 88,94 ----
   	desc->tdtypeid = RECORDOID;
   	desc->tdtypmod = -1;
   	desc->tdhasoid = hasoid;
-+ 	desc->tdhasseclabel = false;
++ 	desc->tdhassecid = false;
   	desc->tdrefcount = -1;		/* assume not reference-counted */
   
   	return desc;
@@ -369,7 +369,7 @@ diff -Nrpc base/src/backend/access/commo
   	desc->tdtypeid = RECORDOID;
   	desc->tdtypmod = -1;
   	desc->tdhasoid = hasoid;
-+ 	desc->tdhasseclabel = false;
++ 	desc->tdhassecid = false;
   	desc->tdrefcount = -1;		/* assume not reference-counted */
   
   	return desc;
@@ -379,7 +379,7 @@ diff -Nrpc base/src/backend/access/commo
   
   	desc->tdtypeid = tupdesc->tdtypeid;
   	desc->tdtypmod = tupdesc->tdtypmod;
-+ 	desc->tdhasseclabel = tupdesc->tdhasseclabel;
++ 	desc->tdhassecid = tupdesc->tdhassecid;
   
   	return desc;
   }
@@ -389,7 +389,7 @@ diff -Nrpc base/src/backend/access/commo
   
   	desc->tdtypeid = tupdesc->tdtypeid;
   	desc->tdtypmod = tupdesc->tdtypmod;
-+ 	desc->tdhasseclabel = tupdesc->tdhasseclabel;
++ 	desc->tdhassecid = tupdesc->tdhassecid;
   
   	return desc;
   }
@@ -399,14 +399,14 @@ diff -Nrpc base/src/backend/access/commo
   		return false;
   	if (tupdesc1->tdhasoid != tupdesc2->tdhasoid)
   		return false;
-+ 	if (tupdesc1->tdhasseclabel != tupdesc2->tdhasseclabel)
++ 	if (tupdesc1->tdhassecid != tupdesc2->tdhassecid)
 + 		return false;
   
   	for (i = 0; i < tupdesc1->natts; i++)
   	{
 diff -Nrpc base/src/backend/access/heap/heapam.c sepgsql/src/backend/access/heap/heapam.c
-*** base/src/backend/access/heap/heapam.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/access/heap/heapam.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/access/heap/heapam.c	Sun Sep  6 19:40:49 2009
+--- sepgsql/src/backend/access/heap/heapam.c	Tue Sep  8 23:55:48 2009
 ***************
 *** 54,59 ****
 --- 54,60 ----
@@ -418,8 +418,8 @@ diff -Nrpc base/src/backend/access/heap/
   #include "storage/freespace.h"
   #include "storage/lmgr.h"
 *************** heap_insert(Relation relation, HeapTuple
-*** 2015,2020 ****
---- 2016,2027 ----
+*** 2016,2021 ****
+--- 2017,2028 ----
   Oid
   simple_heap_insert(Relation relation, HeapTuple tup)
   {
@@ -433,29 +433,29 @@ diff -Nrpc base/src/backend/access/heap/
   }
   
 *************** l2:
-*** 2557,2562 ****
---- 2564,2574 ----
+*** 2558,2563 ****
+--- 2565,2575 ----
   		Assert(!(newtup->t_data->t_infomask & HEAP_HASOID));
   	}
   
-+ 	/* Preserve SecLabel, if not changed */
-+ 	if (HeapTupleHasSecLabel(newtup) &&
-+ 		!OidIsValid(HeapTupleGetSecLabel(newtup)))
-+ 		HeapTupleSetSecLabel(newtup, HeapTupleGetSecLabel(&oldtup));
++ 	/* Preserve SecurityId, if not changed */
++ 	if (HeapTupleHasSecid(newtup) &&
++ 		!OidIsValid(HeapTupleGetSecid(newtup)))
++ 		HeapTupleSetSecid(newtup, HeapTupleGetSecid(&oldtup));
 + 
   	newtup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
[...7609 lines suppressed...]
++ sepgsqlCheckSchemaCreate(const char *nspName, DefElem *new_label, bool isTemp);
 + extern void
-+ sepgsqlCheckSchemaDrop(Oid namespace_oid);
++ sepgsqlCheckSchemaDrop(Oid nspOid);
 + extern void
-+ sepgsqlCheckSchemaSetattr(Oid namespace_oid);
++ sepgsqlCheckSchemaSetattr(Oid nspOid);
 + extern Oid
-+ sepgsqlCheckSchemaRelabel(Oid namespace_oid, DefElem *new_label);
++ sepgsqlCheckSchemaRelabel(Oid nspOid, DefElem *new_label);
++ extern void
++ sepgsqlCheckSchemaAddName(Oid nspOid);
++ extern void
++ sepgsqlCheckSchemaRemoveName(Oid nspOid);
 + extern bool
-+ sepgsqlCheckSchemaUsage(Oid nsid);
++ sepgsqlCheckSchemaSearch(Oid nspOid, bool abort);
 + 
 + extern void
 + sepgsqlCheckTableDrop(Oid table_oid);
@@ -14056,35 +15151,38 @@ diff -Nrpc base/src/include/security/sep
 + sepgsqlCheckTableReference(Relation rel, int16 *attnums, int natts);
 + 
 + extern void
-+ sepgsqlCheckSequenceGetValue(Oid seqid);
++ sepgsqlCheckSequenceGetValue(Oid seqOid);
 + extern void
-+ sepgsqlCheckSequenceNextValue(Oid seqid);
++ sepgsqlCheckSequenceNextValue(Oid seqOid);
 + extern void
-+ sepgsqlCheckSequenceSetValue(Oid seqid);
++ sepgsqlCheckSequenceSetValue(Oid seqOid);
 + 
 + extern Oid
-+ sepgsqlCheckColumnCreate(Oid table_oid, const char *attname, DefElem *new_label);
++ sepgsqlCheckColumnCreate(Oid relOid, const char *attname, DefElem *newLabel);
 + extern void
-+ sepgsqlCheckColumnDrop(Oid table_oid, AttrNumber attno);
++ sepgsqlCheckColumnDrop(Oid relOid, AttrNumber attno);
 + extern void
-+ sepgsqlCheckColumnSetattr(Oid table_oid, AttrNumber attno);
++ sepgsqlCheckColumnSetattr(Oid relOid, AttrNumber attno);
 + extern Oid
-+ sepgsqlCheckColumnRelabel(Oid table_oid, AttrNumber attno, DefElem *new_label);
++ sepgsqlCheckColumnRelabel(Oid relOid, AttrNumber attno, DefElem *newLabel);
 + 
 + extern Oid
-+ sepgsqlCheckProcedureCreate(const char *proname, Oid namespace_oid, DefElem *new_label);
++ sepgsqlCheckProcedureCreate(const char *procName, Oid procOid,
++                             Oid procNsp, Oid procLang, DefElem *newLabel);
 + extern void
-+ sepgsqlCheckProcedureDrop(Oid proc_oid);
++ sepgsqlCheckProcedureDrop(Oid procOid);
 + extern void
-+ sepgsqlCheckProcedureSetattr(Oid proc_oid);
++ sepgsqlCheckProcedureSetattr(Oid procOid);
 + extern Oid
-+ sepgsqlCheckProcedureRelabel(Oid proc_oid, DefElem *new_label);
-+ extern bool
-+ sepgsqlCheckProcedureExecute(Oid proc_oid);
++ sepgsqlCheckProcedureRelabel(Oid procOid, DefElem *newLabel);
++ extern void
++ sepgsqlCheckProcedureExecute(Oid procOid);
 + extern void
-+ sepgsqlCheckProcedureEntrypoint(FmgrInfo *finfo, HeapTuple protup);
++ sepgsqlCheckProcedureInstall(Oid procOid);
++ extern bool
++ sepgsqlHintProcedureInlined(HeapTuple protup);
 + extern void
-+ sepgsqlCheckProcedureInstall(Oid proc_oid);
++ sepgsqlCheckProcedureEntrypoint(FmgrInfo *flinfo, HeapTuple protup);
 + 
 + extern void
 + sepgsqlCheckBlobCreate(Relation rel, HeapTuple lotup);
@@ -14112,42 +15210,47 @@ diff -Nrpc base/src/include/security/sep
 + extern void
 + sepgsqlCheckFileWrite(int fdesc, const char *filename);
 + 
-+ void
-+ sepgsqlCheckObjectDrop(const ObjectAddress *object);
-+ 
-+ /* optimizar hints */
-+ extern bool
-+ sepgsqlAllowFunctionInlined(HeapTuple protup);
++ extern Oid
++ sepgsqlCheckSysobjCreate(Oid relid, const char *auditName);
++ extern void
++ sepgsqlCheckSysobjGetattr(Oid relid, Oid secid, const char *auditName);
++ extern void
++ sepgsqlCheckSysobjSetattr(Oid relid, Oid secid, const char *auditName);
++ extern void
++ sepgsqlCheckSysobjDrop(const ObjectAddress *object);
 + 
 + /*
 +  * label.c : security label management
 +  */
 + extern bool
-+ sepgsqlTupleDescHasSecLabel(Oid relid, char relkind);
-+ extern security_context_t
-+ sepgsqlMetaSecurityLabel(void);
-+ extern void
-+ sepgsqlSetDefaultSecLabel(Relation rel, HeapTuple tuple);
++ sepgsqlTupleDescHasSecid(Oid relid, char relkind);
 + 
-+ extern Oid sepgsqlGetDefaultDatabaseSecLabel(void);
-+ extern Oid sepgsqlGetDefaultSchemaSecLabel(Oid database_oid);
-+ extern Oid sepgsqlGetDefaultSchemaTempSecLabel(Oid database_oid);
-+ extern Oid sepgsqlGetDefaultTableSecLabel(Oid namespace_oid);
-+ extern Oid sepgsqlGetDefaultSequenceSecLabel(Oid namespace_oid);
-+ extern Oid sepgsqlGetDefaultProcedureSecLabel(Oid namespace_oid);
-+ extern Oid sepgsqlGetDefaultColumnSecLabel(Oid table_oid);
-+ extern Oid sepgsqlGetDefaultTupleSecLabel(Oid table_oid);
-+ extern Oid sepgsqlGetDefaultBlobSecLabel(Oid database_oid);
++ extern void sepgsqlSetDefaultSecid(Relation rel, HeapTuple tuple);
++ extern sepgsql_sid_t sepgsqlGetDefaultDatabaseSecid(void);
++ extern sepgsql_sid_t sepgsqlGetDefaultSchemaSecid(Oid database_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultSchemaTempSecid(Oid database_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultTableSecid(Oid namespace_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultSequenceSecid(Oid namespace_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultProcedureSecid(Oid namespace_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultColumnSecid(Oid table_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultTupleSecid(Oid table_oid);
++ extern sepgsql_sid_t sepgsqlGetDefaultBlobSecid(Oid database_oid);
 + 
 + extern Oid *sepgsqlCreateTableColumns(CreateStmt *stmt,
 + 									  const char *relname, Oid namespace_oid,
 + 									  TupleDesc tupdesc, char relkind);
 + extern Oid *sepgsqlCopyTableColumns(Relation source);
 + 
++ extern sepgsql_sid_t
++ sepgsqlGetTupleContext(Oid tableOid, HeapTuple tuple, uint16 *tclass);
++ extern sepgsql_sid_t
++ sepgsqlGetSysobjContext(Oid tableOid, Oid objectId, int32 objsubId, uint16 *tclass);
++ 
 + extern char *sepgsqlTransSecLabelIn(char *seclabel);
 + extern char *sepgsqlTransSecLabelOut(char *seclabel);
 + extern char *sepgsqlRawSecLabelIn(char *seclabel);
 + extern char *sepgsqlRawSecLabelOut(char *seclabel);
++ extern char *sepgsqlSysattSecLabelOut(Oid relid, HeapTuple tuple);
 + 
 + /*
 +  * perms.c : SELinux permission related stuff
@@ -14191,14 +15294,15 @@ diff -Nrpc base/src/include/security/sep
 + #define sepgsqlCheckDatabaseRelabel(a,b)		(InvalidOid)
 + #define sepgsqlCheckDatabaseAccess(a)			(true)
 + #define sepgsqlCheckDatabaseSuperuser()			(true)
-+ #define sepgsqlCheckDatabaseInstallModule(a,b)	do {} while(0)
 + #define sepgsqlCheckDatabaseLoadModule(a)		do {} while(0)
 + 
 + #define sepgsqlCheckSchemaCreate(a,b,c)			(InvalidOid)
 + #define sepgsqlCheckSchemaDrop(a)				do {} while(0)
 + #define sepgsqlCheckSchemaSetattr(a)			do {} while(0)
 + #define sepgsqlCheckSchemaRelabel(a,b)			(InvalidOid)
-+ #define sepgsqlCheckSchemaUsage(a)				(true)
++ #define sepgsqlCheckSchemaAddName(a)			do {} while(0)
++ #define sepgsqlCheckSchemaRemoveName(a)			do {} while(0)
++ #define sepgsqlCheckSchemaSearch(a,b)			(true)
 + 
 + #define sepgsqlCheckTableDrop(a)				do {} while(0)
 + #define sepgsqlCheckTableSetattr(a)				do {} while(0)
@@ -14216,13 +15320,14 @@ diff -Nrpc base/src/include/security/sep
 + #define sepgsqlCheckColumnSetattr(a,b)			do {} while(0)
 + #define sepgsqlCheckColumnRelabel(a,b,c)		(InvalidOid)
 + 
-+ #define sepgsqlCheckProcedureCreate(a,b,c)		(InvalidOid)
++ #define sepgsqlCheckProcedureCreate(a,b,c,d)	(InvalidOid)
 + #define sepgsqlCheckProcedureDrop(a)			do {} while(0)
 + #define sepgsqlCheckProcedureSetattr(a)			do {} while(0)
 + #define sepgsqlCheckProcedureRelabel(a,b)		(InvalidOid)
 + #define sepgsqlCheckProcedureExecute(a)			(true)
-+ #define sepgsqlCheckProcedureEntrypoint(a,b)	do {} while(0)
 + #define sepgsqlCheckProcedureInstall(a)			do {} while(0)
++ #define sepgsqlHintProcedureInlined(a)			(true)
++ #define sepgsqlCheckProcedureEntrypoint(a,b)	do {} while(0)
 + 
 + #define sepgsqlCheckBlobCreate(a,b)				do {} while(0)
 + #define sepgsqlCheckBlobDrop(a,b)				do {} while(0)
@@ -14236,9 +15341,10 @@ diff -Nrpc base/src/include/security/sep
 + #define sepgsqlCheckFileRead(a,b)				do {} while(0)
 + #define sepgsqlCheckFileWrite(a,b)				do {} while(0)
 + 
-+ #define sepgsqlCheckObjectDrop(a)				do {} while(0)
-+ 
-+ #define sepgsqlAllowFunctionInlined(a)			(true)
++ #define sepgsqlCheckSysobjCreate(a,b)			(InvalidOid)
++ #define sepgsqlCheckSysobjGetattr(a,b,c)		do {} while(0)
++ #define sepgsqlCheckSysobjSetattr(a,b,c)		do {} while(0)
++ #define sepgsqlCheckSysobjDrop(a)				do {} while(0)
 + 
 + /* label.c */
 + #define sepgsqlTupleDescHasSecLabel(a,b)		(false)
@@ -14333,7 +15439,7 @@ diff -Nrpc base/src/include/utils/errcod
   #define ERRCODE_INTERNAL_ERROR				MAKE_SQLSTATE('X','X', '0','0','0')
 diff -Nrpc base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h
 *** base/src/include/utils/syscache.h	Sat Jan  3 12:25:21 2009
---- sepgsql/src/include/utils/syscache.h	Thu Jul 16 23:18:11 2009
+--- sepgsql/src/include/utils/syscache.h	Wed Sep  9 21:29:33 2009
 *************** enum SysCacheIdentifier
 *** 69,74 ****
 --- 69,76 ----


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sepostgresql.init	19 Aug 2009 12:00:30 -0000	1.35
+++ sepostgresql.init	11 Sep 2009 10:40:20 -0000	1.36
@@ -7,9 +7,8 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.3.7"
+PGVERSION="8.4.1"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="1990"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sepostgresql.spec	21 Aug 2009 15:50:34 -0000	1.41
+++ sepostgresql.spec	11 Sep 2009 10:40:20 -0000	1.42
@@ -11,8 +11,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.4.0
-Release: 2238%{?dist}
+Version: 8.4.1
+Release: 2305%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,10 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Sep 11 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2305
+- Upgrade base SE-PostgreSQL v8.4.0->v8.4.1
+- rework: backport features from v8.5devel tree
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.0-2238
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Aug 2009 12:00:30 -0000	1.12
+++ sources	11 Sep 2009 10:40:20 -0000	1.13
@@ -1 +1 @@
-1f172d5f60326e972837f58fa5acd130  postgresql-8.4.0.tar.bz2
+f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2



From pravins at fedoraproject.org  Fri Sep 11 10:40:25 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:40:25 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts/devel import.log, NONE,
	1.1 lohit-maithili-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911104025.DCC7E11C043A@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-maithili-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3237/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-maithili-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-maithili-fonts-2_4_3-1_fc11:HEAD:lohit-maithili-fonts-2.4.3-1.fc11.src.rpm:1252665853


--- NEW FILE lohit-maithili-fonts.spec ---
%global fontname lohit-maithili
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Maithili font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Maithili truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-maithili-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:46:05 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:40:25 -0000	1.2
@@ -0,0 +1 @@
+lohit-maithili-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-maithili-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:46:05 -0000	1.1
+++ sources	11 Sep 2009 10:40:25 -0000	1.2
@@ -0,0 +1 @@
+5d4e24bad60471282243f66d427480df  lohit-maithili-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:41:05 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:41:05 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel import.log, NONE,
	1.1 lohit-malayalam-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911104105.6592111C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3743/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-malayalam-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-malayalam-fonts-2_4_3-1_fc11:HEAD:lohit-malayalam-fonts-2.4.3-1.fc11.src.rpm:1252665903


--- NEW FILE lohit-malayalam-fonts.spec ---
%global fontname lohit-malayalam
#%global fontconf 67-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Malayalam font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/malayalam/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Malayalam truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
#                   %{buildroot}%{_fontconfig_confdir}

#install -m 0644 -p %{fontconf} \
#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
#ln -s %{_fontconfig_templatedir}/%{fontconf} \
#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:47:16 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:41:05 -0000	1.2
@@ -0,0 +1 @@
+lohit-malayalam-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:47:16 -0000	1.1
+++ sources	11 Sep 2009 10:41:05 -0000	1.2
@@ -0,0 +1 @@
+3dca42cc0169ce2146d4c5ea74054bb3  lohit-malayalam-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:44:09 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:44:09 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts/devel import.log, NONE,
	1.1 lohit-marathi-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911104409.A85B311C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-marathi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4911/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-marathi-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-marathi-fonts-2_4_3-1_fc11:HEAD:lohit-marathi-fonts-2.4.3-1.fc11.src.rpm:1252666091


--- NEW FILE lohit-marathi-fonts.spec ---
%global fontname lohit-marathi
%global fontconf 66-%{fontname}.conf

#global archivename %{name}-%{version} ?

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Marathi font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/marathi/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Marathi truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old

%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-marathi-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:48:23 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:44:09 -0000	1.2
@@ -0,0 +1 @@
+lohit-marathi-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-marathi-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:48:23 -0000	1.1
+++ sources	11 Sep 2009 10:44:09 -0000	1.2
@@ -0,0 +1 @@
+5eec5a8ae1653ac578fa8a48a59394bf  lohit-marathi-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:44:25 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:44:25 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts/devel import.log, NONE,
	1.1 lohit-nepali-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911104425.6D53311C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-nepali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5068/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-nepali-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-nepali-fonts-2_4_3-1_fc11:HEAD:lohit-nepali-fonts-2.4.3-1.fc11.src.rpm:1252666106


--- NEW FILE lohit-nepali-fonts.spec ---
%global fontname lohit-nepali
%global fontconf 67-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Nepali font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/nepali/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Nepali truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-nepali-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:49:14 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:44:25 -0000	1.2
@@ -0,0 +1 @@
+lohit-nepali-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-nepali-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:49:15 -0000	1.1
+++ sources	11 Sep 2009 10:44:25 -0000	1.2
@@ -0,0 +1 @@
+7aba74371161a105eb3462fccee8e6a7  lohit-nepali-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:47:25 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:47:25 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts/devel import.log, NONE,
	1.1 lohit-oriya-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911104725.C87B811C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-oriya-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-oriya-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-oriya-fonts-2_4_3-1_fc11:HEAD:lohit-oriya-fonts-2.4.3-1.fc11.src.rpm:1252666284


--- NEW FILE lohit-oriya-fonts.spec ---
%global fontname lohit-oriya
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Oriya Font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/Oriya/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Oriya truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-oriya-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:50:11 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:47:25 -0000	1.2
@@ -0,0 +1 @@
+lohit-oriya-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-oriya-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:50:11 -0000	1.1
+++ sources	11 Sep 2009 10:47:25 -0000	1.2
@@ -0,0 +1 @@
+3b8118576e8ca848ec6b6f13555d6832  lohit-oriya-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:48:11 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:48:11 +0000 (UTC)
Subject: rpms/lohit-punjabi-fonts/devel import.log, NONE,
	1.1 lohit-punjabi-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911104811.BA90C11C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-punjabi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-punjabi-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-punjabi-fonts-2_4_3-1_fc11:HEAD:lohit-punjabi-fonts-2.4.3-1.fc11.src.rpm:1252666332


--- NEW FILE lohit-punjabi-fonts.spec ---
%global fontname lohit-punjabi
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Punjabi font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/punjabi/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Punjabi truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-punjabi-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:51:19 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:48:11 -0000	1.2
@@ -0,0 +1 @@
+lohit-punjabi-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-punjabi-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:51:19 -0000	1.1
+++ sources	11 Sep 2009 10:48:11 -0000	1.2
@@ -0,0 +1 @@
+8a7ad188b9d5fcff01e3620a515b10e0  lohit-punjabi-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:54:11 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:54:11 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts/devel import.log, NONE,
	1.1 lohit-sindhi-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911105411.56E2911C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8571/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-sindhi-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-sindhi-fonts-2_4_3-1_fc11:HEAD:lohit-sindhi-fonts-2.4.3-1.fc11.src.rpm:1252666643


--- NEW FILE lohit-sindhi-fonts.spec ---
%global fontname lohit-sindhi
%global fontconf 66-%{fontname}@devanagari.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Sindhi font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/sindhi/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Sindhi truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-sindhi-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:59:38 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:54:10 -0000	1.2
@@ -0,0 +1 @@
+lohit-sindhi-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-sindhi-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:59:38 -0000	1.1
+++ sources	11 Sep 2009 10:54:11 -0000	1.2
@@ -0,0 +1 @@
+5a38290af209c3caec4468f155d60b58  lohit-sindhi-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:54:14 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:54:14 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel import.log, NONE,
	1.1 lohit-tamil-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911105414.6F0E511C0418@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8542/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-tamil-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-tamil-fonts-2_4_3-1_fc11:HEAD:lohit-tamil-fonts-2.4.3-1.fc11.src.rpm:1252666663


--- NEW FILE lohit-tamil-fonts.spec ---
%global fontname lohit-tamil
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Tamil font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/tamil/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Tamil truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:54:37 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:54:14 -0000	1.2
@@ -0,0 +1 @@
+lohit-tamil-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:54:37 -0000	1.1
+++ sources	11 Sep 2009 10:54:14 -0000	1.2
@@ -0,0 +1 @@
+7d0ba57a033024c6336e773968da41fb  lohit-tamil-2.4.3.tar.gz



From pravins at fedoraproject.org  Fri Sep 11 10:56:36 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Sep 2009 10:56:36 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel import.log, NONE,
	1.1 lohit-telugu-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090911105636.BAA2C11C0099@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9623/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lohit-telugu-fonts.spec 
Log Message:
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball



--- NEW FILE import.log ---
lohit-telugu-fonts-2_4_3-1_fc11:HEAD:lohit-telugu-fonts-2.4.3-1.fc11.src.rpm:1252666815


--- NEW FILE lohit-telugu-fonts.spec ---
%global fontname lohit-telugu
%global fontconf 66-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.4.3
Release:        1%{?dist}
Summary:        Free Telugu font

Group:          User Interface/X
License:        GPLv2
URL:            https://fedorahosted.org/lohit/
Source0:        http://pravins.fedorapeople.org/lohit/telugu/%{fontname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires: fontforge >= 20080429
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem
Obsoletes: %{fontname}-fonts < %{version}-%{release}
Obsoletes: lohit-fonts-common < %{version}-%{release}

%description
This package provides a free Telugu truetype/opentype font.


%prep
%setup -q -n %{fontname}-%{version} 


%build
./generate.pe *.sfd

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontconf} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old


%changelog
* Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
- first release after lohit-fonts split in new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 08:57:20 -0000	1.1
+++ .cvsignore	11 Sep 2009 10:56:36 -0000	1.2
@@ -0,0 +1 @@
+lohit-telugu-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 08:57:21 -0000	1.1
+++ sources	11 Sep 2009 10:56:36 -0000	1.2
@@ -0,0 +1 @@
+848f59611b73a92aaa6de3e2e0311883  lohit-telugu-2.4.3.tar.gz



From markmc at fedoraproject.org  Fri Sep 11 11:13:09 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 11 Sep 2009 11:13:09 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-fix-vnc-copyrect-screen-corruption.patch, NONE, 
	1.1 qemu-fix-vnc-disconnect-segfault.patch, NONE,
	1.1 01-tls-handshake-fix.patch, 1.4,
	1.5 02-vnc-monitor-info.patch, 1.4, 1.5 03-display-keymaps.patch,
	1.4, 1.5 04-vnc-struct.patch, 1.4, 1.5 05-vnc-tls-vencrypt.patch,
	1.4, 1.5 06-vnc-sasl.patch, 1.4,
	1.5 07-vnc-monitor-authinfo.patch, 1.4, 1.5 qemu.spec, 1.102, 1.103
Message-ID: <20090911111309.4BB0011C0099@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14905

Modified Files:
	01-tls-handshake-fix.patch 02-vnc-monitor-info.patch 
	03-display-keymaps.patch 04-vnc-struct.patch 
	05-vnc-tls-vencrypt.patch 06-vnc-sasl.patch 
	07-vnc-monitor-authinfo.patch qemu.spec 
Added Files:
	qemu-fix-vnc-copyrect-screen-corruption.patch 
	qemu-fix-vnc-disconnect-segfault.patch 
Log Message:
* Fri Sep 11 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-4
- Fix vnc segfault on disconnect (#501131)
- Fix vnc screen corruption with e.g. xterm (#503156)
- Rebase vnc sasl patches on top of these two vnc fixes


qemu-fix-vnc-copyrect-screen-corruption.patch:
 vnc.c |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE qemu-fix-vnc-copyrect-screen-corruption.patch ---
>From 30157150182db6907cde111d8c3d76224b0841df Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel at redhat.com>
Date: Mon, 27 Jul 2009 17:10:48 +0200
Subject: [PATCH] BACKPORT: vnc: fix copyrect screen corruption

When sending a copyrect command to the vnc client, we must also update
the local server surface.  Otherwise the server's and the client's idea
of the screen content run out of sync and screen updates don't work
correctly.

[ backport: uses ds_get_data() instead of direct dereference ]

(cherry picked from commit 74ccfe8b7e9c351b3196f68795126e76060903b3)

Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-vnc-copyrect-screen-corruption.patch
---
 vnc.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/vnc.c b/vnc.c
index 1d8ebe7..c0700c0 100644
--- a/vnc.c
+++ b/vnc.c
@@ -633,8 +633,14 @@ static void send_framebuffer_update(VncState *vs, int x, int y, int w, int h)
 
 static void vnc_copy(VncState *vs, int src_x, int src_y, int dst_x, int dst_y, int w, int h)
 {
+
+    uint8_t *src_row;
+    uint8_t *dst_row;
+    int y,pitch,depth;
+
     vnc_update_client(vs);
 
+    /* send bitblit op to the vnc client */
     vnc_write_u8(vs, 0);  /* msg id */
     vnc_write_u8(vs, 0);
     vnc_write_u16(vs, 1); /* number of rects */
@@ -642,6 +648,23 @@ static void vnc_copy(VncState *vs, int src_x, int src_y, int dst_x, int dst_y, i
     vnc_write_u16(vs, src_x);
     vnc_write_u16(vs, src_y);
     vnc_flush(vs);
+
+    /* do bitblit op on the local surface too */
+    pitch = ds_get_linesize(vs->ds);
+    depth = ds_get_bytes_per_pixel(vs->ds);
+    src_row = ds_get_data(vs->ds) + pitch * src_y + depth * src_x;
+    dst_row = ds_get_data(vs->ds) + pitch * dst_y + depth * dst_x;
+    if (dst_y > src_y) {
+        /* copy backwards */
+        src_row += pitch * (h-1);
+        dst_row += pitch * (h-1);
+        pitch = -pitch;
+    }
+    for (y = 0; y < h; y++) {
+        memmove(dst_row, src_row, w * depth);
+        src_row += pitch;
+        dst_row += pitch;
+    }
 }
 
 static void vnc_dpy_copy(DisplayState *ds, int src_x, int src_y, int dst_x, int dst_y, int w, int h)
-- 
1.6.2.5


qemu-fix-vnc-disconnect-segfault.patch:
 vnc.c |  111 ++++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 71 insertions(+), 40 deletions(-)

--- NEW FILE qemu-fix-vnc-disconnect-segfault.patch ---
>From 977b3b69b2e06f0aab0c48ff08a236bff8763f2e Mon Sep 17 00:00:00 2001
From: Chris Webb <chris at arachsys.com>
Date: Wed, 26 Aug 2009 22:52:43 +0000
Subject: [PATCH] vnc: rework VncState release workflow

Split socket closing and releasing of VncState into two steps. First close
the socket and set the variable to -1 to indicate shutdown in progress. Do
the actual release in a few places where we can be sure it doesn't cause
trouble in form of use-after-free. Add some checks for a valid socket handle
to make sure we don't try to use the closed socket.

Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>

Backported to 0.10-stable, removing references to vs->force_update and
changing vnc_disconnect_finish() to match the code in the 0.10 version of
vnc_client_io_error() in place of the master branch version.

(cherry picked from commit c2723a9606dae5af5c614a55296ee37e2ed7801a)

Signed-off-by: Chris Webb <chris at arachsys.com>
Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-vnc-disconnect-segfault.patch
---
 vnc.c |  110 ++++++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/vnc.c b/vnc.c
index c0700c0..28e8362 100644
--- a/vnc.c
+++ b/vnc.c
@@ -200,6 +200,8 @@ static void vnc_write_u16(VncState *vs, uint16_t value);
 static void vnc_write_u8(VncState *vs, uint8_t value);
 static void vnc_flush(VncState *vs);
 static void vnc_update_client(void *opaque);
+static void vnc_disconnect_start(VncState *vs);
+static void vnc_disconnect_finish(VncState *vs);
 static void vnc_client_read(void *opaque);
 
 static void vnc_colordepth(VncState *vs);
@@ -670,13 +672,21 @@ static void vnc_copy(VncState *vs, int src_x, int src_y, int dst_x, int dst_y, i
 static void vnc_dpy_copy(DisplayState *ds, int src_x, int src_y, int dst_x, int dst_y, int w, int h)
 {
     VncDisplay *vd = ds->opaque;
-    VncState *vs = vd->clients;
-    while (vs != NULL) {
+    VncState *vs, *vn;
+
+    for (vs = vd->clients; vs != NULL; vs = vn) {
+        vn = vs->next;
+        if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) {
+            vnc_update_client(vs);
+            /* vs might be free()ed here */
+        }
+    }
+
+    for (vs = vd->clients; vs != NULL; vs = vs->next) {
         if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT))
             vnc_copy(vs, src_x, src_y, dst_x, dst_y, w, h);
         else /* TODO */
             vnc_update(vs, dst_x, dst_y, w, h);
-        vs = vs->next;
     }
 }
 
@@ -786,6 +796,8 @@ static void vnc_update_client(void *opaque)
 
     if (vs->csock != -1) {
         qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock) + VNC_REFRESH_INTERVAL);
+    } else {
+        vnc_disconnect_finish(vs);
     }
 
 }
@@ -855,6 +867,47 @@ static void audio_del(VncState *vs)
     }
 }
 
+static void vnc_disconnect_start(VncState *vs)
+{
+    if (vs->csock == -1)
+        return;
+    qemu_set_fd_handler2(vs->csock, NULL, NULL, NULL, NULL);
+    closesocket(vs->csock);
+    vs->csock = -1;
+}
+
+static void vnc_disconnect_finish(VncState *vs)
+{
+    qemu_del_timer(vs->timer);
+    qemu_free_timer(vs->timer);
+    if (vs->input.buffer) qemu_free(vs->input.buffer);
+    if (vs->output.buffer) qemu_free(vs->output.buffer);
+#ifdef CONFIG_VNC_TLS
+    if (vs->tls_session) {
+        gnutls_deinit(vs->tls_session);
+        vs->tls_session = NULL;
+    }
+#endif /* CONFIG_VNC_TLS */
+    audio_del(vs);
+
+    VncState *p, *parent = NULL;
+    for (p = vs->vd->clients; p != NULL; p = p->next) {
+        if (p == vs) {
+            if (parent)
+                parent->next = p->next;
+            else
+                vs->vd->clients = p->next;
+            break;
+        }
+        parent = p;
+    }
+    if (!vs->vd->clients)
+        dcl->idle = 1;
+
+    qemu_free(vs->old_data);
+    qemu_free(vs);
+}
+
 static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
 {
     if (ret == 0 || ret == -1) {
@@ -872,36 +925,7 @@ static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
         }
 
 	VNC_DEBUG("Closing down client sock %d %d\n", ret, ret < 0 ? last_errno : 0);
-	qemu_set_fd_handler2(vs->csock, NULL, NULL, NULL, NULL);
-	closesocket(vs->csock);
-        qemu_del_timer(vs->timer);
-        qemu_free_timer(vs->timer);
-        if (vs->input.buffer) qemu_free(vs->input.buffer);
-        if (vs->output.buffer) qemu_free(vs->output.buffer);
-#ifdef CONFIG_VNC_TLS
-	if (vs->tls_session) {
-	    gnutls_deinit(vs->tls_session);
-	    vs->tls_session = NULL;
-	}
-#endif /* CONFIG_VNC_TLS */
-        audio_del(vs);
-
-        VncState *p, *parent = NULL;
-        for (p = vs->vd->clients; p != NULL; p = p->next) {
-            if (p == vs) {
-                if (parent)
-                    parent->next = p->next;
-                else
-                    vs->vd->clients = p->next;
-                break;
-            }
-            parent = p;
-        }
-        if (!vs->vd->clients)
-            dcl->idle = 1;
-
-        qemu_free(vs->old_data);
-        qemu_free(vs);
+        vnc_disconnect_start(vs);
   
 	return 0;
     }
@@ -910,7 +934,8 @@ static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
 
 static void vnc_client_error(VncState *vs)
 {
-    vnc_client_io_error(vs, -1, EINVAL);
+    VNC_DEBUG("Closing down client sock: protocol error\n");
+    vnc_disconnect_start(vs);
 }
 
 static void vnc_client_write(void *opaque)
@@ -970,8 +995,11 @@ static void vnc_client_read(void *opaque)
 #endif /* CONFIG_VNC_TLS */
 	ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0);
     ret = vnc_client_io_error(vs, ret, socket_error());
-    if (!ret)
+    if (!ret) {
+        if (vs->csock == -1)
+            vnc_disconnect_finish(vs);
 	return;
+    }
 
     vs->input.offset += ret;
 
@@ -980,8 +1008,10 @@ static void vnc_client_read(void *opaque)
 	int ret;
 
 	ret = vs->read_handler(vs, vs->input.buffer, len);
-	if (vs->csock == -1)
+	if (vs->csock == -1) {
+            vnc_disconnect_finish(vs);
 	    return;
+        }
 
 	if (!ret) {
 	    memmove(vs->input.buffer, vs->input.buffer + len, (vs->input.offset - len));
@@ -996,7 +1026,7 @@ static void vnc_write(VncState *vs, const void *data, size_t len)
 {
     buffer_reserve(&vs->output, len);
 
-    if (buffer_empty(&vs->output)) {
+    if (vs->csock != -1 && buffer_empty(&vs->output)) {
 	qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs);
     }
 
@@ -1037,7 +1067,7 @@ static void vnc_write_u8(VncState *vs, uint8_t value)
 
 static void vnc_flush(VncState *vs)
 {
-    if (vs->output.offset)
+    if (vs->csock != -1 && vs->output.offset)
 	vnc_client_write(vs);
 }
 
@@ -2305,11 +2335,13 @@ static void vnc_connect(VncDisplay *vd, int csock)
     vnc_read_when(vs, protocol_version, 12);
     memset(vs->old_data, 0, ds_get_linesize(vs->ds) * ds_get_height(vs->ds));
     memset(vs->dirty_row, 0xFF, sizeof(vs->dirty_row));
-    vnc_update_client(vs);
     reset_keys(vs);
 
     vs->next = vd->clients;
     vd->clients = vs;
+
+    vnc_update_client(vs);
+    /* vs might be free()ed here */
 }
 
 static void vnc_listen_read(void *opaque)
-- 
1.6.2.5


01-tls-handshake-fix.patch:
 vnc.c |    9 ---------
 1 file changed, 9 deletions(-)

Index: 01-tls-handshake-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/01-tls-handshake-fix.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 01-tls-handshake-fix.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 01-tls-handshake-fix.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From 6b55d3e74400c9f7e71739abd0dac362a5db1dc6 Mon Sep 17 00:00:00 2001
+From 9883355cd27949061b396a42bb724853b75ce7f9 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:02 +0000
 Subject: [PATCH] Fix bug in TLS authentication ("Daniel P. Berrange")
@@ -32,10 +32,10 @@ Fedora-patch: 01-tls-handshake-fix.patch
  1 files changed, 0 insertions(+), 8 deletions(-)
 
 diff --git a/vnc.c b/vnc.c
-index 1d8ebe7..d6a7225 100644
+index 28e8362..9fa0f82 100644
 --- a/vnc.c
 +++ b/vnc.c
-@@ -2105,14 +2105,6 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len
+@@ -2158,14 +2158,6 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len
  	    VNC_DEBUG("Failed to complete TLS\n");
  	    return 0;
  	}

02-vnc-monitor-info.patch:
 vnc.c |  140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 128 insertions(+), 12 deletions(-)

Index: 02-vnc-monitor-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/02-vnc-monitor-info.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 02-vnc-monitor-info.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 02-vnc-monitor-info.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From b4b2ff2fbd7e6458fbfa8f2e6af7d1b668a06a1a Mon Sep 17 00:00:00 2001
+From 37beb4aa5dd10764a492d76822f2d7ec04b33fd0 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:05 +0000
 Subject: [PATCH] Enhance 'info vnc' monitor output ("Daniel P. Berrange")
@@ -48,7 +48,7 @@ Fedora-patch: 02-vnc-monitor-info.patch
  1 files changed, 128 insertions(+), 11 deletions(-)
 
 diff --git a/vnc.c b/vnc.c
-index d6a7225..d7d9b91 100644
+index 9fa0f82..7853635 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -166,19 +166,136 @@ struct VncState

03-display-keymaps.patch:
 Makefile      |    9 +++++---
 curses.c      |    3 --
 curses_keys.h |    9 +++-----
 keymaps.c     |   45 ++++++++++++++++---------------------------
 keymaps.h     |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sdl.c         |    3 --
 sdl_keysym.h  |    7 ++----
 vnc.c         |    5 +---
 vnc_keysym.h  |    8 ++-----
 9 files changed, 97 insertions(+), 52 deletions(-)

Index: 03-display-keymaps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/03-display-keymaps.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 03-display-keymaps.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 03-display-keymaps.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From 202790c357fcff7f1222f4e7777e0cf561b516d5 Mon Sep 17 00:00:00 2001
+From 15a868dc4e7a982f9d684a0231938602757c0c25 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:10 +0000
 Subject: [PATCH] Refactor keymap code to avoid duplication ("Daniel P. Berrange")
@@ -323,7 +323,7 @@ index c9087d7..c213ef8 100644
  /* ascii */
      { "space",                0x020},
 diff --git a/vnc.c b/vnc.c
-index d7d9b91..969d5b0 100644
+index 7853635..239a9ce 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -35,7 +35,6 @@
@@ -334,7 +334,7 @@ index d7d9b91..969d5b0 100644
  #include "d3des.h"
  
  #ifdef CONFIG_VNC_TLS
-@@ -2428,9 +2427,9 @@ void vnc_display_init(DisplayState *ds)
+@@ -2483,9 +2482,9 @@ void vnc_display_init(DisplayState *ds)
      vs->ds = ds;
  
      if (keyboard_layout)

04-vnc-struct.patch:
 vnc.c |  109 -----------------------------------------------
 vnc.h |  150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 148 insertions(+), 111 deletions(-)

Index: 04-vnc-struct.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/04-vnc-struct.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 04-vnc-struct.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 04-vnc-struct.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From 35b87b5d1543c563c09361086519ebdc960d4934 Mon Sep 17 00:00:00 2001
+From f710ba3ae8fdfa1206d22a3d77884487f9e52477 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:13 +0000
 Subject: [PATCH] Move VNC structs into header file ("Daniel P. Berrange")
@@ -19,7 +19,7 @@ Fedora-patch: 04-vnc-struct.patch
  2 files changed, 148 insertions(+), 110 deletions(-)
 
 diff --git a/vnc.c b/vnc.c
-index 969d5b0..7fb31b6 100644
+index 239a9ce..4d793ab 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -3,6 +3,7 @@

05-vnc-tls-vencrypt.patch:
 Makefile            |   11 
 vnc-auth-vencrypt.c |  167 ++++++++++++++
 vnc-auth-vencrypt.h |   33 ++
 vnc-tls.c           |  414 +++++++++++++++++++++++++++++++++++++
 vnc-tls.h           |   70 ++++++
 vnc.c               |  581 +++-------------------------------------------------
 vnc.h               |   77 ++++--
 7 files changed, 780 insertions(+), 573 deletions(-)

Index: 05-vnc-tls-vencrypt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/05-vnc-tls-vencrypt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 05-vnc-tls-vencrypt.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 05-vnc-tls-vencrypt.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From af17025ce83b924f666617294606ec5ad1a9e833 Mon Sep 17 00:00:00 2001
+From a2f48883d67b606218c98dc4996cbb41d3dc0990 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:23 +0000
 Subject: [PATCH] Move TLS auth into separate file ("Daniel P. Berrange")
@@ -789,7 +789,7 @@ index 0000000..cda95b9
 +#endif /* __QEMU_VNC_TLS_H__ */
 +
 diff --git a/vnc.c b/vnc.c
-index 7fb31b6..f980d68 100644
+index 4d793ab..4da5fbb 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -34,21 +34,6 @@
@@ -814,7 +814,7 @@ index 7fb31b6..f980d68 100644
  #define count_bits(c, v) { \
      for (c = 0; v; v >>= 1) \
      { \
-@@ -204,14 +189,7 @@ static inline uint32_t vnc_has_feature(VncState *vs, int feature) {
+@@ -204,16 +189,9 @@ static inline uint32_t vnc_has_feature(VncState *vs, int feature) {
     3) resolutions > 1024
  */
  
@@ -825,23 +825,25 @@ index 7fb31b6..f980d68 100644
 -static void vnc_write_u8(VncState *vs, uint8_t value);
 -static void vnc_flush(VncState *vs);
  static void vnc_update_client(void *opaque);
+ static void vnc_disconnect_start(VncState *vs);
+ static void vnc_disconnect_finish(VncState *vs);
 -static void vnc_client_read(void *opaque);
  
  static void vnc_colordepth(VncState *vs);
  
-@@ -867,10 +845,7 @@ static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-         if (vs->input.buffer) qemu_free(vs->input.buffer);
-         if (vs->output.buffer) qemu_free(vs->output.buffer);
+@@ -894,10 +872,7 @@ static void vnc_disconnect_finish(VncState *vs)
+     if (vs->input.buffer) qemu_free(vs->input.buffer);
+     if (vs->output.buffer) qemu_free(vs->output.buffer);
  #ifdef CONFIG_VNC_TLS
--	if (vs->tls_session) {
--	    gnutls_deinit(vs->tls_session);
--	    vs->tls_session = NULL;
--	}
-+	vnc_tls_client_cleanup(vs);
+-    if (vs->tls_session) {
+-        gnutls_deinit(vs->tls_session);
+-        vs->tls_session = NULL;
+-    }
++    vnc_tls_client_cleanup(vs);
  #endif /* CONFIG_VNC_TLS */
-         audio_del(vs);
+     audio_del(vs);
  
-@@ -896,19 +871,20 @@ static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
+@@ -943,20 +918,21 @@ static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
      return ret;
  }
  
@@ -849,7 +851,8 @@ index 7fb31b6..f980d68 100644
 +
 +void vnc_client_error(VncState *vs)
  {
-     vnc_client_io_error(vs, -1, EINVAL);
+     VNC_DEBUG("Closing down client sock: protocol error\n");
+     vnc_disconnect_start(vs);
  }
  
 -static void vnc_client_write(void *opaque)
@@ -866,7 +869,7 @@ index 7fb31b6..f980d68 100644
  	if (ret < 0) {
  	    if (ret == GNUTLS_E_AGAIN)
  		errno = EAGAIN;
-@@ -931,13 +907,13 @@ static void vnc_client_write(void *opaque)
+@@ -979,13 +955,13 @@ static void vnc_client_write(void *opaque)
      }
  }
  
@@ -882,7 +885,7 @@ index 7fb31b6..f980d68 100644
  {
      VncState *vs = opaque;
      long ret;
-@@ -945,8 +921,8 @@ static void vnc_client_read(void *opaque)
+@@ -993,8 +969,8 @@ static void vnc_client_read(void *opaque)
      buffer_reserve(&vs->input, 4096);
  
  #ifdef CONFIG_VNC_TLS
@@ -893,7 +896,7 @@ index 7fb31b6..f980d68 100644
  	if (ret < 0) {
  	    if (ret == GNUTLS_E_AGAIN)
  		errno = EAGAIN;
-@@ -980,7 +956,7 @@ static void vnc_client_read(void *opaque)
+@@ -1033,7 +1009,7 @@ static void vnc_client_read(void *opaque)
      }
  }
  
@@ -902,7 +905,7 @@ index 7fb31b6..f980d68 100644
  {
      buffer_reserve(&vs->output, len);
  
-@@ -991,12 +967,12 @@ static void vnc_write(VncState *vs, const void *data, size_t len)
+@@ -1044,12 +1020,12 @@ static void vnc_write(VncState *vs, const void *data, size_t len)
      buffer_append(&vs->output, data, len);
  }
  
@@ -917,7 +920,7 @@ index 7fb31b6..f980d68 100644
  {
      uint8_t buf[4];
  
-@@ -1008,7 +984,7 @@ static void vnc_write_u32(VncState *vs, uint32_t value)
+@@ -1061,7 +1037,7 @@ static void vnc_write_u32(VncState *vs, uint32_t value)
      vnc_write(vs, buf, 4);
  }
  
@@ -926,7 +929,7 @@ index 7fb31b6..f980d68 100644
  {
      uint8_t buf[2];
  
-@@ -1018,74 +994,39 @@ static void vnc_write_u16(VncState *vs, uint16_t value)
+@@ -1071,74 +1047,39 @@ static void vnc_write_u16(VncState *vs, uint16_t value)
      vnc_write(vs, buf, 2);
  }
  
@@ -939,7 +942,7 @@ index 7fb31b6..f980d68 100644
 -static void vnc_flush(VncState *vs)
 +void vnc_flush(VncState *vs)
  {
-     if (vs->output.offset)
+     if (vs->csock != -1 && vs->output.offset)
  	vnc_client_write(vs);
  }
  
@@ -1007,7 +1010,7 @@ index 7fb31b6..f980d68 100644
  static void client_cut_text(VncState *vs, size_t len, uint8_t *text)
  {
  }
-@@ -1677,6 +1618,11 @@ static int protocol_client_init(VncState *vs, uint8_t *data, size_t len)
+@@ -1730,6 +1671,11 @@ static int protocol_client_init(VncState *vs, uint8_t *data, size_t len)
      return 0;
  }
  
@@ -1019,7 +1022,7 @@ index 7fb31b6..f980d68 100644
  static void make_challenge(VncState *vs)
  {
      int i;
-@@ -1732,12 +1678,12 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len)
+@@ -1785,12 +1731,12 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len)
  	vnc_write_u32(vs, 0); /* Accept auth */
  	vnc_flush(vs);
  
@@ -1034,7 +1037,7 @@ index 7fb31b6..f980d68 100644
  {
      make_challenge(vs);
      /* Send client a 'random' challenge */
-@@ -1745,410 +1691,8 @@ static int start_auth_vnc(VncState *vs)
+@@ -1798,410 +1744,8 @@ static int start_auth_vnc(VncState *vs)
      vnc_flush(vs);
  
      vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge));
@@ -1445,7 +1448,7 @@ index 7fb31b6..f980d68 100644
  
  static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
  {
-@@ -2172,17 +1716,19 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
+@@ -2225,17 +1769,19 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
                 vnc_write_u32(vs, 0); /* Accept auth completion */
                 vnc_flush(vs);
             }
@@ -1468,7 +1471,7 @@ index 7fb31b6..f980d68 100644
  #endif /* CONFIG_VNC_TLS */
  
         default: /* Should not be possible, but just in case */
-@@ -2235,7 +1781,7 @@ static int protocol_version(VncState *vs, uint8_t *version, size_t len)
+@@ -2288,7 +1834,7 @@ static int protocol_version(VncState *vs, uint8_t *version, size_t len)
              VNC_DEBUG("Tell client auth none\n");
              vnc_write_u32(vs, vs->vd->auth);
              vnc_flush(vs);
@@ -1477,7 +1480,7 @@ index 7fb31b6..f980d68 100644
         } else if (vs->vd->auth == VNC_AUTH_VNC) {
              VNC_DEBUG("Tell client VNC auth\n");
              vnc_write_u32(vs, vs->vd->auth);
-@@ -2336,61 +1882,6 @@ void vnc_display_init(DisplayState *ds)
+@@ -2391,61 +1937,6 @@ void vnc_display_init(DisplayState *ds)
      register_displaychangelistener(ds, dcl);
  }
  
@@ -1539,7 +1542,7 @@ index 7fb31b6..f980d68 100644
  
  void vnc_display_close(DisplayState *ds)
  {
-@@ -2410,7 +1901,7 @@ void vnc_display_close(DisplayState *ds)
+@@ -2465,7 +1956,7 @@ void vnc_display_close(DisplayState *ds)
      vs->auth = VNC_AUTH_INVALID;
  #ifdef CONFIG_VNC_TLS
      vs->subauth = VNC_AUTH_INVALID;
@@ -1548,7 +1551,7 @@ index 7fb31b6..f980d68 100644
  #endif
  }
  
-@@ -2466,7 +1957,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2521,7 +2012,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
  	    char *start, *end;
  	    x509 = 1; /* Require x509 certificates */
  	    if (strncmp(options, "x509verify", 10) == 0)
@@ -1557,7 +1560,7 @@ index 7fb31b6..f980d68 100644
  
  	    /* Now check for 'x509=/some/path' postfix
  	     * and use that to setup x509 certificate/key paths */
-@@ -2477,7 +1968,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2532,7 +2023,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
  		char *path = qemu_strndup(start + 1, len);
  
  		VNC_DEBUG("Trying certificate path '%s'\n", path);

06-vnc-sasl.patch:
 Makefile            |    7 
 Makefile.target     |    5 
 configure           |   34 ++
 qemu-doc.texi       |   97 ++++++++
 qemu.sasl           |   34 ++
 vnc-auth-sasl.c     |  626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 vnc-auth-sasl.h     |   67 +++++
 vnc-auth-vencrypt.c |   12 
 vnc.c               |  248 ++++++++++++++++++--
 vnc.h               |   32 ++
 10 files changed, 1128 insertions(+), 34 deletions(-)

Index: 06-vnc-sasl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/06-vnc-sasl.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 06-vnc-sasl.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 06-vnc-sasl.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From 1b4f956f40315ecc756e34cdeb923424c7095684 Mon Sep 17 00:00:00 2001
+From 655a2c8e445a6992bf483de3ba326306b8bf951f Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:28 +0000
 Subject: [PATCH] Add SASL authentication support ("Daniel P. Berrange")
@@ -79,9 +79,9 @@ Fedora-patch: 06-vnc-sasl.patch
  vnc-auth-sasl.c     |  626 +++++++++++++++++++++++++++++++++++++++++++++++++++
  vnc-auth-sasl.h     |   67 ++++++
  vnc-auth-vencrypt.c |   12 +-
- vnc.c               |  249 ++++++++++++++++++---
+ vnc.c               |  248 ++++++++++++++++++---
  vnc.h               |   31 +++-
- 10 files changed, 1129 insertions(+), 33 deletions(-)
+ 10 files changed, 1128 insertions(+), 33 deletions(-)
  create mode 100644 qemu.sasl
  create mode 100644 vnc-auth-sasl.c
  create mode 100644 vnc-auth-sasl.h
@@ -1121,7 +1121,7 @@ index 1f113a7..9ed642c 100644
  
  static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len)
 diff --git a/vnc.c b/vnc.c
-index f980d68..3c315d6 100644
+index 4da5fbb..0b62000 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -68,7 +68,8 @@ static char *addr_to_string(const char *format,
@@ -1163,7 +1163,7 @@ index f980d68..3c315d6 100644
      }
      return "unknown";
  }
-@@ -278,7 +286,7 @@ static void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h,
+@@ -280,7 +288,7 @@ static void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h,
      vnc_write_s32(vs, encoding);
  }
  
@@ -1172,7 +1172,7 @@ index f980d68..3c315d6 100644
  {
      if ((buffer->capacity - buffer->offset) < len) {
  	buffer->capacity += (len + 1024);
-@@ -290,22 +298,22 @@ static void buffer_reserve(Buffer *buffer, size_t len)
+@@ -292,22 +300,22 @@ static void buffer_reserve(Buffer *buffer, size_t len)
      }
  }
  
@@ -1199,28 +1199,27 @@ index f980d68..3c315d6 100644
  {
      memcpy(buffer->buffer + buffer->offset, data, len);
      buffer->offset += len;
-@@ -821,7 +829,8 @@ static void audio_del(VncState *vs)
-     }
+@@ -874,6 +882,9 @@ static void vnc_disconnect_finish(VncState *vs)
+ #ifdef CONFIG_VNC_TLS
+     vnc_tls_client_cleanup(vs);
+ #endif /* CONFIG_VNC_TLS */
++#ifdef CONFIG_VNC_SASL
++    vnc_sasl_client_cleanup(vs);
++#endif /* CONFIG_VNC_SASL */
+     audio_del(vs);
+ 
+     VncState *p, *parent = NULL;
+@@ -894,7 +905,7 @@ static void vnc_disconnect_finish(VncState *vs)
+     qemu_free(vs);
  }
  
 -static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-+
 +int vnc_client_io_error(VncState *vs, int ret, int last_errno)
  {
      if (ret == 0 || ret == -1) {
          if (ret == -1) {
-@@ -847,6 +856,9 @@ static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
- #ifdef CONFIG_VNC_TLS
- 	vnc_tls_client_cleanup(vs);
- #endif /* CONFIG_VNC_TLS */
-+#ifdef CONFIG_VNC_SASL
-+        vnc_sasl_client_cleanup(vs);
-+#endif /* CONFIG_VNC_SASL */
-         audio_del(vs);
- 
-         VncState *p, *parent = NULL;
-@@ -877,14 +889,28 @@ void vnc_client_error(VncState *vs)
-     vnc_client_io_error(vs, -1, EINVAL);
+@@ -925,14 +936,28 @@ void vnc_client_error(VncState *vs)
+     vnc_disconnect_start(vs);
  }
  
 -void vnc_client_write(void *opaque)
@@ -1252,7 +1251,7 @@ index f980d68..3c315d6 100644
  	if (ret < 0) {
  	    if (ret == GNUTLS_E_AGAIN)
  		errno = EAGAIN;
-@@ -894,10 +920,42 @@ void vnc_client_write(void *opaque)
+@@ -942,10 +967,42 @@ void vnc_client_write(void *opaque)
  	}
      } else
  #endif /* CONFIG_VNC_TLS */
@@ -1298,7 +1297,7 @@ index f980d68..3c315d6 100644
  
      memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret));
      vs->output.offset -= ret;
-@@ -905,6 +963,29 @@ void vnc_client_write(void *opaque)
+@@ -953,6 +1010,29 @@ void vnc_client_write(void *opaque)
      if (vs->output.offset == 0) {
  	qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
      }
@@ -1328,7 +1327,7 @@ index f980d68..3c315d6 100644
  }
  
  void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
-@@ -913,16 +994,28 @@ void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
+@@ -961,16 +1041,28 @@ void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
      vs->read_handler_expect = expecting;
  }
  
@@ -1363,19 +1362,17 @@ index f980d68..3c315d6 100644
  	if (ret < 0) {
  	    if (ret == GNUTLS_E_AGAIN)
  		errno = EAGAIN;
-@@ -932,12 +1025,52 @@ void vnc_client_read(void *opaque)
+@@ -980,16 +1072,56 @@ void vnc_client_read(void *opaque)
  	}
      } else
  #endif /* CONFIG_VNC_TLS */
 -	ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0);
 -    ret = vnc_client_io_error(vs, ret, socket_error());
--    if (!ret)
--	return;
 +	ret = recv(vs->csock, data, datalen, 0);
 +    VNC_DEBUG("Read wire %p %d -> %ld\n", data, datalen, ret);
 +    return vnc_client_io_error(vs, ret, socket_error());
 +}
- 
++
 +
 +/*
 + * Called to read data from the client socket to the input buffer,
@@ -1394,7 +1391,7 @@ index f980d68..3c315d6 100644
 +    ret = vnc_client_read_buf(vs, buffer_end(&vs->input), 4096);
 +    if (!ret)
 +        return 0;
-     vs->input.offset += ret;
++    vs->input.offset += ret;
 +    return ret;
 +}
 +
@@ -1415,12 +1412,18 @@ index f980d68..3c315d6 100644
 +    else
 +#endif /* CONFIG_VNC_SASL */
 +        ret = vnc_client_read_plain(vs);
-+    if (!ret)
-+	return;
+     if (!ret) {
+         if (vs->csock == -1)
+             vnc_disconnect_finish(vs);
+ 	return;
+     }
  
+-    vs->input.offset += ret;
+-
      while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) {
  	size_t len = vs->read_handler_expect;
-@@ -1731,6 +1864,13 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
+ 	int ret;
+@@ -1784,6 +1916,13 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
             break;
  #endif /* CONFIG_VNC_TLS */
  
@@ -1434,7 +1437,7 @@ index f980d68..3c315d6 100644
         default: /* Should not be possible, but just in case */
             VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
             vnc_write_u8(vs, 1);
-@@ -1931,6 +2071,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -1986,6 +2125,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
  #ifdef CONFIG_VNC_TLS
      int tls = 0, x509 = 0;
  #endif
@@ -1445,7 +1448,7 @@ index f980d68..3c315d6 100644
  
      if (!vnc_display)
          return -1;
-@@ -1950,6 +2094,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2005,6 +2148,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
  	    reverse = 1;
  	} else if (strncmp(options, "to=", 3) == 0) {
              to_port = atoi(options+3) + 5900;
@@ -1456,7 +1459,7 @@ index f980d68..3c315d6 100644
  #ifdef CONFIG_VNC_TLS
  	} else if (strncmp(options, "tls", 3) == 0) {
  	    tls = 1; /* Require TLS */
-@@ -1986,6 +2134,22 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2041,6 +2188,22 @@ int vnc_display_open(DisplayState *ds, const char *display)
  	}
      }
  
@@ -1479,7 +1482,7 @@ index f980d68..3c315d6 100644
      if (password) {
  #ifdef CONFIG_VNC_TLS
  	if (tls) {
-@@ -1998,13 +2162,34 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2053,13 +2216,34 @@ int vnc_display_open(DisplayState *ds, const char *display)
  		vs->subauth = VNC_AUTH_VENCRYPT_TLSVNC;
  	    }
  	} else {
@@ -1516,7 +1519,7 @@ index f980d68..3c315d6 100644
      } else {
  #ifdef CONFIG_VNC_TLS
  	if (tls) {
-@@ -2026,6 +2211,16 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2081,6 +2265,16 @@ int vnc_display_open(DisplayState *ds, const char *display)
  #endif
      }
  

07-vnc-monitor-authinfo.patch:
 vnc-tls.c |   17 +++++++++++++++++
 vnc-tls.h |    3 +++
 vnc.c     |   20 +++++++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)

Index: 07-vnc-monitor-authinfo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/07-vnc-monitor-authinfo.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 07-vnc-monitor-authinfo.patch	4 Aug 2009 15:35:42 -0000	1.4
+++ 07-vnc-monitor-authinfo.patch	11 Sep 2009 11:13:08 -0000	1.5
@@ -1,4 +1,4 @@
-From e61c19737387273e305a2da5c9b28fe42e2eef67 Mon Sep 17 00:00:00 2001
+From 54d323707c4e1603795259fc3078f3e4ef9487d2 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:32 +0000
 Subject: [PATCH] Include auth credentials in 'info vnc' ("Daniel P. Berrange")
@@ -87,7 +87,7 @@ index cda95b9..fd0a2d9 100644
  
  int vnc_tls_client_setup(VncState *vs, int x509Creds);
 diff --git a/vnc.c b/vnc.c
-index 3c315d6..9f0e16b 100644
+index 0b62000..de7b3b4 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState *client)
@@ -112,7 +112,7 @@ index 3c315d6..9f0e16b 100644
  }
  
  void do_info_vnc(void)
-@@ -1832,7 +1847,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
+@@ -1884,7 +1899,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
      /* We only advertise 1 auth scheme at a time, so client
       * must pick the one we sent. Verify this */
      if (data[0] != vs->vd->auth) { /* Reject auth */
@@ -121,7 +121,7 @@ index 3c315d6..9f0e16b 100644
         vnc_write_u32(vs, 1);
         if (vs->minor >= 8) {
             static const char err[] = "Authentication failed";
-@@ -1872,7 +1887,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
+@@ -1924,7 +1939,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
  #endif /* CONFIG_VNC_SASL */
  
         default: /* Should not be possible, but just in case */


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- qemu.spec	4 Sep 2009 10:38:39 -0000	1.102
+++ qemu.spec	11 Sep 2009 11:13:08 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -12,6 +12,11 @@ Source0: http://downloads.sourceforge.ne
 Source1: qemu.init
 Source2: kvm.modules
 
+# Patches for bug #503156 and bug #501131
+# Both will be include in qemu-kvm-0.10.7
+Patch100: qemu-fix-vnc-copyrect-screen-corruption.patch
+Patch101: qemu-fix-vnc-disconnect-segfault.patch
+
 Patch1: 01-tls-handshake-fix.patch
 Patch2: 02-vnc-monitor-info.patch
 Patch3: 03-display-keymaps.patch
@@ -211,6 +216,9 @@ such as kvmtrace and kvm_stat.
 %prep
 %setup -q -n qemu-kvm-%{version}
 
+%patch100 -p1
+%patch101 -p1
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -471,6 +479,11 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Sep 11 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-4
+- Fix vnc segfault on disconnect (#501131)
+- Fix vnc screen corruption with e.g. xterm (#503156)
+- Rebase vnc sasl patches on top of these two vnc fixes
+
 * Fri Sep  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-4
 - Make pulseaudio the default audio backend (#519540, #495964, #496627)
 



From markmc at fedoraproject.org  Fri Sep 11 11:16:05 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 11 Sep 2009 11:16:05 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.103,1.104
Message-ID: <20090911111605.60F6D11C0099@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15765

Modified Files:
	qemu.spec 
Log Message:
Fix changelog



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- qemu.spec	11 Sep 2009 11:13:08 -0000	1.103
+++ qemu.spec	11 Sep 2009 11:16:05 -0000	1.104
@@ -479,7 +479,7 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
-* Fri Sep 11 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-4
+* Fri Sep 11 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-5
 - Fix vnc segfault on disconnect (#501131)
 - Fix vnc screen corruption with e.g. xterm (#503156)
 - Rebase vnc sasl patches on top of these two vnc fixes



From mbroz at fedoraproject.org  Fri Sep 11 11:46:38 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Fri, 11 Sep 2009 11:46:38 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.13,
	1.14 cryptsetup-luks.spec, 1.70, 1.71 sources, 1.13, 1.14
Message-ID: <20090911114638.A4A4E11C0099@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26348

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
Update to new upstream testing version with new API interface.
Add luksSuspend and luksResume commands.
Introduce pkgconfig.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Jul 2009 11:36:06 -0000	1.13
+++ .cvsignore	11 Sep 2009 11:46:38 -0000	1.14
@@ -1 +1 @@
-cryptsetup-1.0.7.tar.bz2
+cryptsetup-1.1.0-test0.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- cryptsetup-luks.spec	24 Jul 2009 19:42:08 -0000	1.70
+++ cryptsetup-luks.spec	11 Sep 2009 11:46:38 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
-Version: 1.0.7
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 0.1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
@@ -14,7 +14,7 @@ Obsoletes: cryptsetup <= 0.1
 Requires: cryptsetup-luks-libs = %{version}-%{release}
 
 %define _root_sbindir /sbin
-%define upstream_version %{version}
+%define upstream_version %{version}-test0
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
@@ -25,6 +25,7 @@ encrypted filesystems using Device Mappe
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel
+Requires: pkgconfig
 Summary: Headers and libraries for using encrypted filesystems
 
 %description devel
@@ -60,6 +61,7 @@ pushd $RPM_BUILD_ROOT/%{_lib}
 rm libcryptsetup.so
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
 ln -s ../../%{_lib}/$(ls libcryptsetup.so.?.?.?) $RPM_BUILD_ROOT/%{_libdir}/libcryptsetup.so
+mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}
 popd 
 %find_lang cryptsetup
 
@@ -77,6 +79,7 @@ popd 
 %defattr(-,root,root,-)
 %{_includedir}/libcryptsetup.h
 %{_libdir}/libcryptsetup.so
+%{_libdir}/pkgconfig/libcryptsetup.pc
 
 %files libs
 %defattr(-,root,root,-)
@@ -86,6 +89,11 @@ popd 
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 11 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.1
+- Update to new upstream testing version with new API interface.
+- Add luksSuspend and luksResume commands.
+- Introduce pkgconfig.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 Jul 2009 11:36:06 -0000	1.13
+++ sources	11 Sep 2009 11:46:38 -0000	1.14
@@ -1 +1 @@
-5eea2a77391a8a1a651b31cbaef59e22  cryptsetup-1.0.7.tar.bz2
+61f0ba826ae2d69d20e9db4e471f8e78  cryptsetup-1.1.0-test0.tar.bz2



From than at fedoraproject.org  Fri Sep 11 11:56:00 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Sep 2009 11:56:00 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.326,1.327
Message-ID: <20090911115601.033E511C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29123

Modified Files:
	qt.spec 
Log Message:
- drop useless check for ossl patch, the patch works fine with old ossl




Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- qt.spec	10 Sep 2009 15:37:00 -0000	1.326
+++ qt.spec	11 Sep 2009 11:56:00 -0000	1.327
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -356,9 +356,7 @@ Qt libraries used for drawing widgets an
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
-%if 0%{?fedora} > 11
 %patch56 -p1 -b .ossl10
-%endif
 
 # security fixes
 %patch100 -p1 -b .CVE-2009-1725
@@ -894,6 +892,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.5.2-17
+- drop useless check for ossl patch, the patch works fine with old ossl
+
 * Wed Sep 09 2009 Than Ngo <than at redhat.com> - 4.5.2-16
 - add a correct system_ca_certificates patch
 



From kzak at fedoraproject.org  Fri Sep 11 12:27:09 2009
From: kzak at fedoraproject.org (kzak)
Date: Fri, 11 Sep 2009 12:27:09 +0000 (UTC)
Subject: rpms/util-linux-ng/F-11 util-linux-ng-2.14-sfdisk-dump.patch, NONE, 
	1.1 util-linux-ng.spec, 1.46, 1.47
Message-ID: <20090911122709.2B0B311C0099@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5870

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.14-sfdisk-dump.patch 
Log Message:
* Fri Sep 11 2009 Karel Zak <kzak at redhat.com> 2.14.2-10
- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set 


util-linux-ng-2.14-sfdisk-dump.patch:
 sfdisk.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE util-linux-ng-2.14-sfdisk-dump.patch ---
>From 1f1614f6a89de4b06e1843d0fadbca3f8a5521fe Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Fri, 11 Sep 2009 14:00:50 +0200
Subject: [PATCH 1/2] sfdisk: dump has to be $LANG insensitive

This stupid bug has been introduced by:

	commit add5133f4ad5136aac3ce7627e615d14893d0aeb
	Author: Pedro Ribeiro <p.m42.ribeiro at gmail.com>
	Date:   Fri Oct 3 08:52:35 2008 +0200
	fdisk: several strings without gettext calls

... so it shows that we need to improve our review process... :-(

Address-Red-Hat-Bug: #522718
Signed-off-by: Karel Zak <kzak at redhat.com>
---
 fdisk/sfdisk.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 8fae5bb..427cb40 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -930,8 +930,8 @@ get_disksize(int format) {
 static void
 out_partition_header(char *dev, int format, struct geometry G) {
     if (dump) {
-	printf(_("# partition table of %s\n"), dev);
-	printf(_("unit: sectors\n\n"));
+	printf("# partition table of %s\n", dev);
+	printf("unit: sectors\n\n");
 	return;
     }
 
@@ -1059,12 +1059,12 @@ out_partition(char *dev, int format, struct part_desc *p,
     size = p->size;
 
     if (dump) {
-	printf(_(" start=%9lu"), start);
-	printf(_(", size=%9lu"), size);
+	printf(" start=%9lu", start);
+	printf(", size=%9lu", size);
 	if (p->ptype == DOS_TYPE) {
 	    printf(", Id=%2x", p->p.sys_type);
 	    if (p->p.bootable == 0x80)
-		printf(_(", bootable"));
+		printf(", bootable");
 	}
 	printf("\n");
 	return;
-- 
1.6.2.5



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-11/util-linux-ng.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- util-linux-ng.spec	1 Jun 2009 12:27:12 -0000	1.46
+++ util-linux-ng.spec	11 Sep 2009 12:27:08 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -120,6 +120,8 @@ Patch13: util-linux-ng-2.14-flock-segfau
 Patch14: util-linux-ng-2.14-renice-n.patch
 # 498984 - should man page for "mount" mention ext4?
 Patch15: util-linux-ng-2.14-mount-man-ext4.patch
+# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
+Patch16: util-linux-ng-2.14-sfdisk-dump.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -146,6 +148,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 unset LINGUAS || :
@@ -547,8 +550,11 @@ exit 0
 /sbin/losetup
 
 %changelog
+* Fri Sep 11 2009 Karel Zak <kzak at redhat.com> 2.14.2-10
+- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set 
+
 * Mon Jun  1 2009 Karel Zak <kzak at redhat.com> 2.14.2-9
-- #498984 - should man page for "mount" mention ext4?
+- fix #498984 - should man page for "mount" mention ext4?
 
 * Thu Apr  2 2009 Karel Zak <kzak at redhat.com> 2.14.2-8
 - fix #490769 - %post scriptlet failed (thanks to Dan Horak)



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:04 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20090911124004.DE80410F881@bastion2.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on lwp (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:07 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20090911124007.B53D710F894@bastion2.fedora.phx.redhat.com>

agoode has set the watchcommits acl on lwp (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:13 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20090911124013.A870C10F89C@bastion2.fedora.phx.redhat.com>

agoode has set the approveacls acl on lwp (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:10 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20090911124010.5B60D10F89A@bastion2.fedora.phx.redhat.com>

agoode has set the commit acl on lwp (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:29 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20090911124029.1F3BE10F88A@bastion2.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rvm (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:31 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20090911124031.7ECE310F8A0@bastion2.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rvm (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:33 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20090911124033.52E6510F8A3@bastion2.fedora.phx.redhat.com>

agoode has set the commit acl on rvm (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Fri Sep 11 12:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 12:40:35 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20090911124036.00CF610F893@bastion2.fedora.phx.redhat.com>

agoode has set the approveacls acl on rvm (Fedora EPEL 5) to Obsolete for rjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From erikos at fedoraproject.org  Fri Sep 11 13:18:26 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 13:18:26 +0000 (UTC)
Subject: rpms/sugar-browse/devel .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 sugar-browse.spec, 1.18, 1.19
Message-ID: <20090911131826.6010E11C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26267

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 112-1
- Able to download Data URIs #1029 (Lucian Branescu)
- Don't choke on Lang=C #979
- Object chooser remains shown after activity has been closed #1192
- Refine image and link right click palette #815 
- Toolbar redesign




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Apr 2009 17:44:40 -0000	1.8
+++ .cvsignore	11 Sep 2009 13:18:24 -0000	1.9
@@ -1 +1 @@
-Browse-108.tar.bz2
+Browse-112.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Apr 2009 17:44:40 -0000	1.9
+++ sources	11 Sep 2009 13:18:24 -0000	1.10
@@ -1 +1 @@
-148b5bfbe7f51749b51515a6009ded28  Browse-108.tar.bz2
+0a8ff60a9b0fb5efcc650cc4be77500e  Browse-112.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sugar-browse.spec	27 Jul 2009 04:59:16 -0000	1.18
+++ sugar-browse.spec	11 Sep 2009 13:18:25 -0000	1.19
@@ -1,6 +1,6 @@
 Name: sugar-browse
-Version: 108
-Release: 2%{?dist}
+Version: 112
+Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -40,6 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 112-1
+- Able to download Data URIs #1029 (Lucian Branescu)
+- Don't choke on Lang=C #979
+- Object chooser remains shown after activity has been closed #1192
+- Refine image and link right click palette #815 
+- Toolbar redesign
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 108-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rayvd at fedoraproject.org  Fri Sep 11 13:23:54 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Fri, 11 Sep 2009 13:23:54 +0000 (UTC)
Subject: rpms/syslog-ng/EL-4 sources, 1.7, 1.8 syslog-ng.init.d, 1.1,
	1.2 syslog-ng.spec, 1.10, 1.11
Message-ID: <20090911132354.8E0A211C0099@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27330

Modified Files:
	sources syslog-ng.init.d syslog-ng.spec 
Log Message:
Fix for bz #517339 and bz#518582


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Mar 2009 16:55:44 -0000	1.7
+++ sources	11 Sep 2009 13:23:54 -0000	1.8
@@ -1 +1,2 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.init.d
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- syslog-ng.init.d	24 Mar 2009 16:55:44 -0000	1.1
+++ syslog-ng.init.d	11 Sep 2009 13:23:54 -0000	1.2
@@ -67,8 +67,10 @@ stop()
 {
 	echo -n $"Stopping syslog-ng: "
 	REMOVE_COMPAT_PID=0
-	if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
-		REMOVE_COMPAT_PID=1
+	if [ -e $SYSLOGNG_PID ]; then
+		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
+			REMOVE_COMPAT_PID=1
+		fi
 	fi
 	killproc syslog-ng
 	RETVAL=$?


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- syslog-ng.spec	24 Mar 2009 16:55:44 -0000	1.10
+++ syslog-ng.spec	11 Sep 2009 13:23:54 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -22,6 +22,9 @@ Source20: rsyslog-syslog-ng.sysconfig
 Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
 Source30: rsyslog-syslog-ng-fc10.sysconfig
 Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log
+
+Patch0: syslog-ng-2.1.4-libnet.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: eventlog-devel >= %{evtlog_ver}
@@ -33,6 +36,7 @@ BuildRequires: glib2-static
 %if 0%{?rhel}
 BuildRequires: tcp_wrappers
 BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
 %else
 BuildRequires: tcp_wrappers-devel
 %endif
@@ -64,6 +68,9 @@ ideal for firewalled environments.
 
 %prep
 %setup -q
+%if 0%{?rhel}
+%patch0 -p1 -b .libnet
+%endif
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -219,6 +226,12 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Init script fix (bug#517339)
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically



From erikos at fedoraproject.org  Fri Sep 11 13:23:56 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 13:23:56 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.70,1.71
Message-ID: <20090911132356.1027611C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27309

Modified Files:
	sugar.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 0.85.7-2
- add python-xklavier dependency




Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sugar.spec	11 Sep 2009 08:29:35 -0000	1.70
+++ sugar.spec	11 Sep 2009 13:23:55 -0000	1.71
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.85.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -35,6 +35,7 @@ Requires: metacity
 Requires: python-telepathy
 Requires: gstreamer-python
 Requires: pygtksourceview
+Requires: python-xklavier
 
 # for dbus-launch
 Requires: dbus-x11
@@ -141,6 +142,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 0.85.7-2
+- add python-xklavier dependency
+
 * Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
 - New upstream release
 



From dwalsh at fedoraproject.org  Fri Sep 11 13:24:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 11 Sep 2009 13:24:16 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.35,
	1.36 setroubleshoot-plugins.spec, 1.40, 1.41 sources, 1.36, 1.37
Message-ID: <20090911132416.C508E11C0099@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27529

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Sep 11 2009  <dwalsh at redhat.com> - 2.1.20-1
- Fix priority on allow_execmod
- Update po



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	10 Sep 2009 19:37:00 -0000	1.35
+++ .cvsignore	11 Sep 2009 13:24:16 -0000	1.36
@@ -25,3 +25,4 @@ setroubleshoot-plugins-2.1.15.tar.gz
 setroubleshoot-plugins-2.1.16.tar.gz
 setroubleshoot-plugins-2.1.18.tar.gz
 setroubleshoot-plugins-2.1.19.tar.gz
+setroubleshoot-plugins-2.1.20.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- setroubleshoot-plugins.spec	10 Sep 2009 19:37:00 -0000	1.40
+++ setroubleshoot-plugins.spec	11 Sep 2009 13:24:16 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.19
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,10 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Sep 11 2009  <dwalsh at redhat.com> - 2.1.20-1
+- Fix priority on allow_execmod
+- Update po
+
 * Thu Sep 10 2009  <dwalsh at redhat.com> - 2.1.19-1
 - Change summary to use full path for source
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	10 Sep 2009 19:37:00 -0000	1.36
+++ sources	11 Sep 2009 13:24:16 -0000	1.37
@@ -1 +1 @@
-4b104bfc194b489f65ecfe5c12330e30  setroubleshoot-plugins-2.1.19.tar.gz
+2aefb12d640b08268ebfea12c862f296  setroubleshoot-plugins-2.1.20.tar.gz



From mnowak at fedoraproject.org  Fri Sep 11 13:35:49 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 11 Sep 2009 13:35:49 +0000 (UTC)
Subject: rpms/ncmpcpp/devel .cvsignore, 1.8, 1.9 import.log, 1.7,
	1.8 ncmpcpp.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090911133549.2D17411C0099@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30225/devel

Modified Files:
	.cvsignore import.log ncmpcpp.spec sources 
Log Message:
0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Jun 2009 14:16:37 -0000	1.8
+++ .cvsignore	11 Sep 2009 13:35:48 -0000	1.9
@@ -1 +1 @@
-ncmpcpp-0.3.5.tar.bz2
+ncmpcpp-0.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	24 Jun 2009 14:16:37 -0000	1.7
+++ import.log	11 Sep 2009 13:35:48 -0000	1.8
@@ -5,3 +5,4 @@ ncmpcpp-0_3_2-1_fc11:HEAD:ncmpcpp-0.3.2-
 ncmpcpp-0_3_3-1_fc11:HEAD:ncmpcpp-0.3.3-1.fc11.src.rpm:1239008066
 ncmpcpp-0_3_4-1_fc11:HEAD:ncmpcpp-0.3.4-1.fc11.src.rpm:1244851674
 ncmpcpp-0_3_5-1_fc11:HEAD:ncmpcpp-0.3.5-1.fc11.src.rpm:1245852823
+ncmpcpp-0_4-1_fc12:HEAD:ncmpcpp-0.4-1.fc12.src.rpm:1252676085


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/ncmpcpp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ncmpcpp.spec	25 Jul 2009 15:51:54 -0000	1.9
+++ ncmpcpp.spec	11 Sep 2009 13:35:48 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ncmpcpp
-Version:        0.3.5
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Michal Nowak <mnowak at redhat.com> - 0.4-1
+- 0.4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Jun 2009 14:16:37 -0000	1.8
+++ sources	11 Sep 2009 13:35:48 -0000	1.9
@@ -1 +1 @@
-7e30bacf83be88b6931e3d70a16e33e4  ncmpcpp-0.3.5.tar.bz2
+7c06f7591fd3785e4a61c40e0e8e440f  ncmpcpp-0.4.tar.bz2



From erikos at fedoraproject.org  Fri Sep 11 13:43:54 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 13:43:54 +0000 (UTC)
Subject: rpms/sugar-log/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-log.spec, 1.9, 1.10
Message-ID: <20090911134354.DA08611C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv512

Modified Files:
	.cvsignore sources sugar-log.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 22-1
- Toolbar redesign




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Aug 2009 20:30:36 -0000	1.5
+++ .cvsignore	11 Sep 2009 13:43:54 -0000	1.6
@@ -1 +1 @@
-Log-19.tar.bz2
+Log-22.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Aug 2009 20:30:36 -0000	1.5
+++ sources	11 Sep 2009 13:43:54 -0000	1.6
@@ -1 +1 @@
-a817c61b7d2090e363e944bcc3383d7b  Log-19.tar.bz2
+e477382431e609e6f0f75b868490f614  Log-22.tar.bz2


Index: sugar-log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sugar-log.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sugar-log.spec	4 Aug 2009 20:42:34 -0000	1.9
+++ sugar-log.spec	11 Sep 2009 13:43:54 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           sugar-log
-Version:        19
-Release:        2%{?dist}
+Version:        22
+Release:        1%{?dist}
 Summary:        Log activity for Sugar
 
 Group:          Sugar/Activities
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 22-1
+- Toolbar redesign
+
 * Tue Aug 04 2009 Fabian Affolter <fabian at bernewireless.net> - 19-2
 - Added missing requirement
 



From erikos at fedoraproject.org  Fri Sep 11 13:48:45 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 13:48:45 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 sugar-datastore.spec, 1.18, 1.19
Message-ID: <20090911134846.07F8211C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1913

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 0.85.3-1
* Fix memory leaks after many get_properties() ds calls #1240




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	26 Aug 2009 09:20:42 -0000	1.14
+++ .cvsignore	11 Sep 2009 13:48:45 -0000	1.15
@@ -1 +1 @@
-sugar-datastore-0.85.2.tar.bz2
+sugar-datastore-0.85.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	26 Aug 2009 09:20:42 -0000	1.14
+++ sources	11 Sep 2009 13:48:45 -0000	1.15
@@ -1 +1 @@
-d31d493d0231cfa7e1931ce4368e9aa4  sugar-datastore-0.85.2.tar.bz2
+de88ed8eddc4ce04ef8591626754ffdd  sugar-datastore-0.85.3.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sugar-datastore.spec	26 Aug 2009 09:20:42 -0000	1.18
+++ sugar-datastore.spec	11 Sep 2009 13:48:45 -0000	1.19
@@ -4,7 +4,7 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.85.2
+Version: 0.85.3
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 0.85.3-1
+* Fix memory leaks after many get_properties() ds calls #1240
+
 * Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
 - Update to new upstream release
 



From mnowak at fedoraproject.org  Fri Sep 11 13:58:17 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 11 Sep 2009 13:58:17 +0000 (UTC)
Subject: rpms/ncmpcpp/F-11 .cvsignore, 1.7, 1.8 import.log, 1.6,
	1.7 ncmpcpp.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090911135817.56B4F11C0099@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4267/F-11

Modified Files:
	.cvsignore import.log ncmpcpp.spec sources 
Log Message:
0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Jun 2009 00:24:51 -0000	1.7
+++ .cvsignore	11 Sep 2009 13:58:17 -0000	1.8
@@ -1 +1 @@
-ncmpcpp-0.3.4.tar.bz2
+ncmpcpp-0.3.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	13 Jun 2009 00:24:51 -0000	1.6
+++ import.log	11 Sep 2009 13:58:17 -0000	1.7
@@ -4,3 +4,4 @@ ncmpcpp-0_3_1-1_fc10:HEAD:ncmpcpp-0.3.1-
 ncmpcpp-0_3_2-1_fc11:HEAD:ncmpcpp-0.3.2-1.fc11.src.rpm:1237365482
 ncmpcpp-0_3_3-1_fc11:HEAD:ncmpcpp-0.3.3-1.fc11.src.rpm:1239008066
 ncmpcpp-0_3_4-1_fc11:F-11:ncmpcpp-0.3.4-1.fc11.src.rpm:1244852661
+ncmpcpp-0_3_5-1_fc12:F-11:ncmpcpp-0.3.5-1.fc12.src.rpm:1252677462


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/ncmpcpp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ncmpcpp.spec	13 Jun 2009 00:24:51 -0000	1.7
+++ ncmpcpp.spec	11 Sep 2009 13:58:17 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           ncmpcpp
-Version:        0.3.4
+Version:        0.3.5
 Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
@@ -48,6 +48,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul  4 2009 Michal Nowak <mnowak at redhat.com> - 0.3.5-1
+- 0.3.5
+- new feature: custom command execution on song change
+- new feature: allow for physical files and directories deletion
+- new feature: add local directories recursively
+- new feature: add random songs to playlist
+- new feature: mouse support
+- new screen: outputs
+- text scrolling in header was made optional
+- some bugfixes
+
 * Sat Jun 13 2009 Michal Nowak <mnowak at redhat.com> - 0.3.4-1
 - 0.3.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Jun 2009 00:24:51 -0000	1.7
+++ sources	11 Sep 2009 13:58:17 -0000	1.8
@@ -1 +1 @@
-8500b8afb551bb299639246b959f8ac7  ncmpcpp-0.3.4.tar.bz2
+7e30bacf83be88b6931e3d70a16e33e4  ncmpcpp-0.3.5.tar.bz2



From mnowak at fedoraproject.org  Fri Sep 11 14:00:33 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 11 Sep 2009 14:00:33 +0000 (UTC)
Subject: rpms/ncmpcpp/F-10 .cvsignore, 1.5, 1.6 import.log, 1.5,
	1.6 ncmpcpp.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090911140034.0138911C02C8@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5045/F-10

Modified Files:
	.cvsignore import.log ncmpcpp.spec sources 
Log Message:
0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Jun 2009 00:26:47 -0000	1.5
+++ .cvsignore	11 Sep 2009 14:00:33 -0000	1.6
@@ -1 +1 @@
-ncmpcpp-0.3.4.tar.bz2
+ncmpcpp-0.3.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	13 Jun 2009 00:32:02 -0000	1.5
+++ import.log	11 Sep 2009 14:00:33 -0000	1.6
@@ -3,3 +3,4 @@ ncmpcpp-0_3_1-1_fc10:F-10:ncmpcpp-0.3.1-
 ncmpcpp-0_3_2-1_fc11:F-10:ncmpcpp-0.3.2-1.fc11.src.rpm:1237814058
 ncmpcpp-0_3_4-1_fc11:F-10:ncmpcpp-0.3.4-1.fc11.src.rpm:1244852756
 ncmpcpp-0_3_4-2_fc11:F-10:ncmpcpp-0.3.4-2.fc11.src.rpm:1244853091
+ncmpcpp-0_3_5-1_fc12:F-10:ncmpcpp-0.3.5-1.fc12.src.rpm:1252677595


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-10/ncmpcpp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ncmpcpp.spec	13 Jun 2009 00:32:02 -0000	1.5
+++ ncmpcpp.spec	11 Sep 2009 14:00:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncmpcpp
-Version:        0.3.4
-Release:        2%{?dist}
+Version:        0.3.5
+Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -48,6 +48,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul  4 2009 Michal Nowak <mnowak at redhat.com> - 0.3.5-1
+- 0.3.5
+- new feature: custom command execution on song change
+- new feature: allow for physical files and directories deletion
+- new feature: add local directories recursively
+- new feature: add random songs to playlist
+- new feature: mouse support
+- new screen: outputs
+- text scrolling in header was made optional
+- some bugfixes
+
 * Sat Jun 13 2009 Michal Nowak <mnowak at redhat.com> - 0.3.4-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Jun 2009 00:26:47 -0000	1.5
+++ sources	11 Sep 2009 14:00:33 -0000	1.6
@@ -1 +1 @@
-8500b8afb551bb299639246b959f8ac7  ncmpcpp-0.3.4.tar.bz2
+7e30bacf83be88b6931e3d70a16e33e4  ncmpcpp-0.3.5.tar.bz2



From hadess at fedoraproject.org  Fri Sep 11 14:03:00 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Sep 2009 14:03:00 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel
	0001-Fix-pairing-with-devices-that-require-PIN-entry.patch, NONE,
	1.1 gnome-bluetooth.spec, 1.90, 1.91
Message-ID: <20090911140300.3B16511C0099@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5791

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	0001-Fix-pairing-with-devices-that-require-PIN-entry.patch 
Log Message:
* Fri Sep 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-3
- Fix possible pairing failure


0001-Fix-pairing-with-devices-that-require-PIN-entry.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0001-Fix-pairing-with-devices-that-require-PIN-entry.patch ---
>From 33524bf400bfbf3c5fc5bdf23dc086f0d7d0875b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 11 Sep 2009 14:58:25 +0100
Subject: [PATCH] Fix pairing with devices that require PIN entry

If a device that has a fixed PIN was selected before a device that
doesn't have one (for example, select a printer or audio headset,
before selecting a phone), then the automatic_pincode would have
been TRUE.

We need to reset the automatic_pincode every time we change devices.
---
 wizard/main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/wizard/main.c b/wizard/main.c
index ac28573..5bf719d 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -775,6 +775,7 @@ select_device_changed (BluetoothChooser *selector,
 
 	target_type = type;
 	target_ssp = !legacypairing;
+	automatic_pincode = FALSE;
 
 	g_free (pincode);
 	pincode = NULL;
-- 
1.6.2.5



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- gnome-bluetooth.spec	3 Sep 2009 17:31:32 -0000	1.90
+++ gnome-bluetooth.spec	11 Sep 2009 14:02:59 -0000	1.91
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.90
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -36,6 +36,7 @@ Requires(postun):	desktop-file-utils
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=594055
 Patch0:		0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch
+Patch1:		0001-Fix-pairing-with-devices-that-require-PIN-entry.patch
 
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
@@ -199,6 +200,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Fri Sep 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-3
+- Fix possible pairing failure
+
 * Thu Sep 03 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-2
 - Fix connecting to audio devices not working when disconnected
   at start



From transif at fedoraproject.org  Fri Sep 11 14:04:14 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 11 Sep 2009 14:04:14 +0000 (UTC)
Subject: comps/po de.po,1.39,1.40
Message-ID: <20090911140414.B9C1511C0099@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6262/po

Modified Files:
	de.po 
Log Message:
Sending translation for German


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.39 -r 1.40 de.poIndex: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- de.po	15 Jun 2009 13:07:11 -0000	1.39
+++ de.po	11 Sep 2009 14:04:14 -0000	1.40
@@ -9,16 +9,16 @@
 # Marcus Gl?ckner <mgloeckner at gmail.com>, 2005.
 # Timo Trinks <ttrinks at redhat.com>, 2006, 2007,2008.
 # Severin Heiniger <severinheiniger at gmail.com>, 2007.
-# Fabian Affolter <fab at fedoraproject.org>, 2007-2009.
 # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
 # Dominik Sandjaja <dominiksandjaja at fedoraproject.org>, 2008.
 #
+# Fabian Affolter <fab at fedoraproject.org>, 2007-2009, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 08:07+0000\n"
-"PO-Revision-Date: 2009-06-15 15:04+0100\n"
+"POT-Creation-Date: 2009-09-11 08:21+0000\n"
+"PO-Revision-Date: 2009-09-11 16:03+0200\n"
 "Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -29,1937 +29,1704 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1
-#: ../comps-f11.xml.in.h:1
-#: ../comps-f12.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "Eine schlanke Desktop-Umgebung, die gut auf ?lteren Systemen funktioniert."
+msgstr ""
+"Eine schlanke Desktop-Umgebung, die gut auf ?lteren Systemen funktioniert."
 
-#: ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3
-#: ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:3
-#: ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4
-#: ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Unterst?tzung f?r Afrikaans"
 
-#: ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5
-#: ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Unterst?tzung f?r Albanisch"
 
-#: ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6
-#: ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:7
-#: ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7
-#: ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zum Durchf?hren einer Vielzahl von Aufgaben"
 
-#: ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8
-#: ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:9
-#: ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst?tzung f?r Arabisch"
 
-#: ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9
-#: ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:10
-#: ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst?tzung f?r Armenisch"
 
-#: ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10
-#: ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Unterst?tzung f?r Assamesisch"
 
-#: ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11
-#: ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:12
-#: ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12
-#: ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Basis"
 
-#: ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13
-#: ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:15
-#: ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
-#: ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14
-#: ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst?tzung f?r die Programmiersprache Ruby."
 
-#: ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15
-#: ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Unterst?tzung f?r Baskisch (Spanien)"
 
-#: ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16
-#: ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Unterst?tzung f?r Wei?russisch"
 
-#: ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17
-#: ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Unterst?tzung f?r Bengali"
 
-#: ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18
-#: ../comps-f11.xml.in.h:20
-#: ../comps-f12.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Unterst?tzung f?r Bhutanisch"
 
-#: ../comps-f9.xml.in.h:18
[...2532 lines suppressed...]
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Unterst?tzung f?r Turkmenisch"
 
-#: ../comps-f11.xml.in.h:238
-#: ../comps-f12.xml.in.h:238
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Unterst?tzung f?r Sorbisch"
 
-#: ../comps-el4.xml.in.h:3
-#: ../comps-el5.xml.in.h:3
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "B?cher und Anleitungen"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "B?cher und Anleitungen f?r Fedorabenutzer und Entwickler"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#, fuzzy
+msgid "Directory Server"
+msgstr "Netzwerk-Server"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin Desktopumgebung"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ist eine Desktopumgebung f?r NetBook/NetTop/MID Ger?te."
+
+#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Anwendungen f?r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12
-#: ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Unterst?tzung f?r DF?-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22
-#: ../comps-el5.xml.in.h:24
-msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl?che mit Men?leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:35
-#: ../comps-el5.xml.in.h:36
-msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl?che mit Men?leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44
-#: ../comps-el5.xml.in.h:45
-msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
-msgstr "Diese auch als Text-Editoren bezeichneten Programme erm?glichen das Anlegen und Bearbeiten von Dateien. Dazu geh?ren Emacs und Vi."
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+msgid ""
+"GNOME is a powerful, graphical user interface which includes a panel, "
+"desktop, system icons, and a graphical file manager."
+msgstr ""
+"GNOME ist eine leistungsstarke grafische Benutzeroberfl?che mit Men?leiste, "
+"Desktop, Systemsymbolen und grafischem Dateimanager."
 
-#: ../comps-el4.xml.in.h:50
-#: ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+msgid ""
+"KDE is a powerful, graphical user interface which includes a panel, desktop, "
+"system icons, and a graphical file manager."
+msgstr ""
+"KDE ist eine leistungsstarke, grafische Benutzeroberfl?che mit Men?leiste, "
+"Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+msgid ""
+"Sometimes called text editors, these are programs that allow you to create "
+"and edit files. These include Emacs and Vi."
+msgstr ""
+"Diese auch als Text-Editoren bezeichneten Programme erm?glichen das Anlegen "
+"und Bearbeiten von Dateien. Dazu geh?ren Emacs und Vi."
+
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54
-#: ../comps-el5.xml.in.h:53
-msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
-msgstr "Mit diesen Programmen k?nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+msgid ""
+"These tools allow you to create documentation in the DocBook format and "
+"convert them to HTML, PDF, Postscript, and text."
+msgstr ""
+"Mit diesen Programmen k?nnen Sie Dokumentationen im DocBook-Format anlegen "
+"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64
-#: ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f?r verschiedene Zwecke."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f?r verschiedene "
+"Zwecke."
 
-#: ../comps-el4.xml.in.h:65
-#: ../comps-el5.xml.in.h:64
-msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
-
-#: ../comps-el4.xml.in.h:67
-#: ../comps-el5.xml.in.h:67
-msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr?ische Umgebungen."
-
-#: ../comps-el4.xml.in.h:68
-#: ../comps-el5.xml.in.h:68
-msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+msgid ""
+"This group is a collection of tools and resources of Arabic environments."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"arabische Umgebungen."
 
-#: ../comps-el4.xml.in.h:77
-#: ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+msgid ""
+"This group is a collection of tools and resources of Hebrew environments."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"hebr?ische Umgebungen."
+
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+msgid ""
+"This group is a collection of tools and resources of Japanese environments."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"japanische Umgebungen."
+
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:66
-msgid "This group is a collection of tools and resources of Czech environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
+msgid ""
+"This group is a collection of tools and resources of Czech environments."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"tschechischen Umgebungen."
 
 #~ msgid "Eclipse"
 #~ msgstr "Eclipse"
+
 #~ msgid "The Eclipse Integrated Development Environment."
 #~ msgstr "Eclipse - Die integrierte Entwicklungsumgebung."
-



From konradm at fedoraproject.org  Fri Sep 11 14:17:35 2009
From: konradm at fedoraproject.org (konradm)
Date: Fri, 11 Sep 2009 14:17:35 +0000 (UTC)
Subject: rpms/sdcc/devel sdcc-2.9.0-r5508-fix-bug2805333.diff, NONE,
	1.1 sdcc.spec, 1.18, 1.19
Message-ID: <20090911141735.35E1111C0099@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10257

Modified Files:
	sdcc.spec 
Added Files:
	sdcc-2.9.0-r5508-fix-bug2805333.diff 
Log Message:
* Fri Sep 11 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-5
- Fix a bug with single-bit types, logical NOT, and casting to char
  (I'm fuzzy on the details) that was reported by a Fedora user with the
  r5508 patch from upstream.


sdcc-2.9.0-r5508-fix-bug2805333.diff:
 ChangeLog                             |    6 ++++++
 src/mcs51/gen.c                       |    7 +++----
 support/regression/tests/bug2805333.c |   22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

--- NEW FILE sdcc-2.9.0-r5508-fix-bug2805333.diff ---
Index: sdcc/src/mcs51/gen.c
===================================================================
--- sdcc/src/mcs51/gen.c	(revision 5507)
+++ sdcc/src/mcs51/gen.c	(working copy)
@@ -1413,7 +1413,8 @@
         return aop->aopu.aop_reg[offset]->name;
 
     case AOP_CRY:
-      emitcode ("mov", "c,%s", aop->aopu.aop_dir);
+      if (!IS_OP_RUONLY (oper))
+        emitcode ("mov", "c,%s", aop->aopu.aop_dir);
       emitcode ("clr", "a");
       emitcode ("rlc", "a");
       return (dname ? "acc" : "a");
@@ -10052,7 +10053,7 @@
     ifxCond = genUnpackBits (result, rname, POINTER, ifx);
   else
     {
-      /* we have can just get the values */
+      /* we can just get the values */
       int size = AOP_SIZE (result);
       int offset = 0;
 
@@ -10060,7 +10061,6 @@
         {
           if (ifx || IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK)
             {
-
               emitcode ("mov", "a,@%s", rname);
               if (!ifx)
                 aopPut (result, "a", offset);
@@ -10483,7 +10483,6 @@
      the pointer values */
   switch (p_type)
     {
-
     case POINTER:
     case IPOINTER:
       genNearPointerGet (left, result, ic, pi, ifx);
Index: sdcc/ChangeLog
===================================================================
--- sdcc/ChangeLog	(revision 5507)
+++ sdcc/ChangeLog	(working copy)
@@ -1,5 +1,11 @@
 2009-08-29 Maarten Brock <sourceforge.brock AT dse.nl>
 
+	* src/mcs51/gen.c (aopGet): applied patch 2837100 to fix bug 2805333
+	* support/regression/tests/bug2805333.c: new, added,
+	  thanks Ruud van Silfhout
+
+2009-08-29 Maarten Brock <sourceforge.brock AT dse.nl>
+
 	* device/include/ctype.h: removed _REENTRANT as they are already with
 	  --stack-auto, optimized _tolower and _toupper with char casts
 	* device/include/string.h,
Index: sdcc/support/regression/tests/bug2805333.c
===================================================================
--- sdcc/support/regression/tests/bug2805333.c	(revision 0)
+++ sdcc/support/regression/tests/bug2805333.c	(revision 5508)
@@ -0,0 +1,22 @@
+/*
+   bug2805333.c
+*/
+
+#include <testfwk.h>
+#include <stdbool.h>
+
+#ifndef BOOL
+#define BOOL bool
+#endif
+
+void g(char c)
+{
+  c;
+}
+
+BOOL b;
+
+void test_bug(void)
+{
+  g(!b); /* Causes SDCC 2.9.0 to segfault.. */
+}

Property changes on: sdcc/support/regression/tests/bug2805333.c
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native



Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sdcc.spec	27 Jul 2009 04:04:33 -0000	1.18
+++ sdcc.spec	11 Sep 2009 14:17:35 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        2.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -10,6 +10,7 @@ Source1:        README.fedora
 Patch0:         sdcc-2.9.0-patch-out-getline.diff
 Patch1:         sdcc-2.9.0-configure.diff
 Patch2:         sdcc-2.9.0-r5476-fix-doublefree.diff
+Patch3:         sdcc-2.9.0-r5508-fix-bug2805333.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
@@ -56,6 +57,7 @@ Emacs extensions for SDCC.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
 # Extract %%__os_install_post into os_install_post~
@@ -135,6 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-5
+- Fix a bug with single-bit types, logical NOT, and casting to char
+  (I'm fuzzy on the details) that was reported by a Fedora user with the
+  r5508 patch from upstream.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Fri Sep 11 14:20:31 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 11 Sep 2009 14:20:31 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.12,1.13
Message-ID: <20090911142031.AFE4B11C0425@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11110

Modified Files:
	maven-jxr.spec 
Log Message:
Use versioned jar for plugin


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- maven-jxr.spec	10 Sep 2009 21:29:42 -0000	1.12
+++ maven-jxr.spec	11 Sep 2009 14:20:31 -0000	1.13
@@ -155,7 +155,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/
 # maven-jxr plugin
 %add_to_maven_depmap org.apache.maven maven-plugin-jxr %{version} JPP maven-plugin-jxr
 install -pm 644 maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \
-                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr.jar
+                $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr-%{version}.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}



From erikos at fedoraproject.org  Fri Sep 11 14:22:06 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 14:22:06 +0000 (UTC)
Subject: rpms/sugar-log/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-log.spec, 1.10, 1.11
Message-ID: <20090911142206.6552F11C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11516

Modified Files:
	.cvsignore sources sugar-log.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 23-1
- Fix Tamil translation




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Sep 2009 13:43:54 -0000	1.6
+++ .cvsignore	11 Sep 2009 14:22:06 -0000	1.7
@@ -1 +1 @@
-Log-22.tar.bz2
+Log-23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Sep 2009 13:43:54 -0000	1.6
+++ sources	11 Sep 2009 14:22:06 -0000	1.7
@@ -1 +1 @@
-e477382431e609e6f0f75b868490f614  Log-22.tar.bz2
+03d02403316024b0c96769c8c32d745c  Log-23.tar.bz2


Index: sugar-log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sugar-log.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sugar-log.spec	11 Sep 2009 13:43:54 -0000	1.10
+++ sugar-log.spec	11 Sep 2009 14:22:06 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           sugar-log
-Version:        22
+Version:        23
 Release:        1%{?dist}
 Summary:        Log activity for Sugar
 
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 23-1
+- Fix Tamil translation
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 22-1
 - Toolbar redesign
 



From mtasaka at fedoraproject.org  Fri Sep 11 14:22:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 11 Sep 2009 14:22:48 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.397, 1.398 jd.spec, 1.457, 1.458 sources,
	1.398, 1.399
Message-ID: <20090911142248.2A8B111C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11858/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3060



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- .cvsignore	4 Sep 2009 07:29:40 -0000	1.397
+++ .cvsignore	11 Sep 2009 14:22:47 -0000	1.398
@@ -1 +1 @@
-jd-2.4.2-svn3055_trunk.tgz
+jd-2.4.2-svn3060_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- jd.spec	4 Sep 2009 07:29:40 -0000	1.457
+++ jd.spec	11 Sep 2009 14:22:47 -0000	1.458
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3055_trunk
+%define         strtag        svn3060_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3055
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3060
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- sources	4 Sep 2009 07:29:40 -0000	1.398
+++ sources	11 Sep 2009 14:22:48 -0000	1.399
@@ -1 +1 @@
-1ee4aa47b29ee812bfc712c2ea890bb6  jd-2.4.2-svn3055_trunk.tgz
+13a987c329366bbf000308bbdc97caf9  jd-2.4.2-svn3060_trunk.tgz



From mjakubicek at fedoraproject.org  Fri Sep 11 14:22:42 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 11 Sep 2009 14:22:42 +0000 (UTC)
Subject: rpms/multiget/devel multiget.spec,1.6,1.7
Message-ID: <20090911142242.5C7FF11C0099@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/multiget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11753

Modified Files:
	multiget.spec 
Log Message:
- Fix FTBFS: build with automake 1.11




Index: multiget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multiget/devel/multiget.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- multiget.spec	25 Jul 2009 15:23:25 -0000	1.6
+++ multiget.spec	11 Sep 2009 14:22:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           multiget
 Version:        1.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        An easy-to-use GUI file downloader
 
 Group:          Applications/Internet
@@ -35,13 +35,13 @@ chmod 644 icons/*.xpm
 
 # fix dead symbolic links
 rm -f INSTALL
-ln -s %{_datadir}/automake-1.10/INSTALL INSTALL
+ln -s %{_datadir}/automake-1.11/INSTALL INSTALL
 rm -f install-sh 
-ln -s %{_datadir}/automake-1.10/install-sh install-sh 
+ln -s %{_datadir}/automake-1.11/install-sh install-sh 
 rm -f depcomp
-ln -s %{_datadir}/automake-1.10/depcomp depcomp
+ln -s %{_datadir}/automake-1.11/depcomp depcomp
 rm -f missing
-ln -s %{_datadir}/automake-1.10/missing missing
+ln -s %{_datadir}/automake-1.11/missing missing
 rm -f %{_builddir}/%{name}/COPYING
 cp -p %{SOURCE2} %{_builddir}/%{name}/
 
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/MultiGet.png
 
 %changelog
+* Fri Sep 11 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.2.0-7
+- Fix FTBFS: build with automake 1.11
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Fri Sep 11 14:22:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 11 Sep 2009 14:22:48 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.391, 1.392 jd.spec, 1.453, 1.454 sources,
	1.392, 1.393
Message-ID: <20090911142248.6ABFA11C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11858/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3060



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- .cvsignore	4 Sep 2009 07:29:40 -0000	1.391
+++ .cvsignore	11 Sep 2009 14:22:48 -0000	1.392
@@ -1 +1 @@
-jd-2.4.2-svn3055_trunk.tgz
+jd-2.4.2-svn3060_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- jd.spec	4 Sep 2009 07:29:41 -0000	1.453
+++ jd.spec	11 Sep 2009 14:22:48 -0000	1.454
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3055_trunk
+%define         strtag        svn3060_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3055
+* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3060
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- sources	4 Sep 2009 07:29:41 -0000	1.392
+++ sources	11 Sep 2009 14:22:48 -0000	1.393
@@ -1 +1 @@
-1ee4aa47b29ee812bfc712c2ea890bb6  jd-2.4.2-svn3055_trunk.tgz
+13a987c329366bbf000308bbdc97caf9  jd-2.4.2-svn3060_trunk.tgz



From akurtakov at fedoraproject.org  Fri Sep 11 14:32:28 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 14:32:28 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.13,1.14
Message-ID: <20090911143228.426E311C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14842/devel

Modified Files:
	maven-jxr.spec 
Log Message:
Fix plugin depmap.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- maven-jxr.spec	11 Sep 2009 14:20:31 -0000	1.13
+++ maven-jxr.spec	11 Sep 2009 14:32:28 -0000	1.14
@@ -32,7 +32,7 @@
 
 Name:           maven-jxr
 Version:        2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
@@ -153,9 +153,12 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/
 
 %if %{with_maven}
 # maven-jxr plugin
-%add_to_maven_depmap org.apache.maven maven-plugin-jxr %{version} JPP maven-plugin-jxr
+%add_to_maven_depmap org.apache.maven.plugins maven-jxr-plugin %{version} JPP maven-plugin-jxr
 install -pm 644 maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \
                 $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr-%{version}.jar
+                
+install -pm 644 maven-jxr-plugin/pom.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-jxr-plugin.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -203,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-2
+- Fix depmap for the plugin.
+
 * Thu Sep 10 2009 Andrew Overholt <overholt at redhat.com> 2.1-1
 - 2.1
 - Add maven-plugin-jxr.



From than at fedoraproject.org  Fri Sep 11 14:35:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Sep 2009 14:35:11 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.280,1.281
Message-ID: <20090911143511.0911511C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17042

Modified Files:
	kdebase-workspace.spec 
Log Message:
- drop  BR: lm_sensors-devel on s390(x)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- kdebase-workspace.spec	2 Sep 2009 08:00:40 -0000	1.280
+++ kdebase-workspace.spec	11 Sep 2009 14:35:10 -0000	1.281
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-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
@@ -62,7 +62,9 @@ BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
+%ifnarch s390 s390x
 BuildRequires: lm_sensors-devel
+%endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
 BuildRequires: polkit-qt-devel
@@ -554,6 +556,9 @@ fi
 
 
 %changelog
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- drop  BR: lm_sensors-devel on s390(x)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - drop Requires: kde-plasma-folderview, rely on comps instead



From crash at fedoraproject.org  Fri Sep 11 14:35:30 2009
From: crash at fedoraproject.org (David Anderson)
Date: Fri, 11 Sep 2009 14:35:30 +0000 (UTC)
Subject: rpms/crash/devel crash.spec,1.34,1.35 sources,1.6,1.7
Message-ID: <20090911143530.C178611C0099@cvs1.fedora.phx.redhat.com>

Author: crash

Update of /cvs/pkgs/rpms/crash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17460

Modified Files:
	crash.spec sources 
Log Message:
Update to upstream release, which allows the removal of the 
Revision tag workaround, the crash-4.0-8.11-dwarf3.patch and 
the crash-4.0-8.11-optflags.patch



Index: crash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/crash.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- crash.spec	9 Aug 2009 12:26:35 -0000	1.34
+++ crash.spec	11 Sep 2009 14:35:30 -0000	1.35
@@ -1,18 +1,13 @@
-%global major_version 4.0
-%global minor_version 8.11
-
 #
 # crash core analysis suite
 #
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
-Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Version: 4.0.9
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Debuggers
-Source: http://people.redhat.com/anderson/crash-%{major_version}-%{minor_version}.tar.gz
-Source1: crash-4.0-8.11-dwarf3.patch
-Patch0: crash-4.0-8.11-optflags.patch
+Source: http://people.redhat.com/anderson/crash-%{version}.tar.gz
 URL: http://people.redhat.com/anderson
 ExclusiveOS: Linux
 ExclusiveArch: %{ix86} ia64 x86_64 ppc64 s390 s390x
@@ -38,9 +33,7 @@ netdump, diskdump and kdump packages fro
 offered by Mission Critical Linux, or the LKCD kernel patch.
 
 %prep
-%setup -n %{name}-%{major_version}-%{minor_version} -q
-%patch0 -p1 -b .optflags
-cat %{SOURCE1} >> gdb-6.1.patch
+%setup -n %{name}-%{version} -q
 
 %build
 make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}"
@@ -69,6 +62,11 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Fri Sep 11 2009 Dave Anderson <anderson at redhat.com> - 4.0.9-1
+- Update to upstream release, which allows the removal of the 
+  Revision tag workaround, the crash-4.0-8.11-dwarf3.patch and 
+  the crash-4.0-8.11-optflags.patch
+
 * Sun Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 4.0.8.11-2
 - Fix reading of dwarf 3 DW_AT_data_member_location
 - Use proper compiler flags


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 22:54:50 -0000	1.6
+++ sources	11 Sep 2009 14:35:30 -0000	1.7
@@ -1 +1 @@
-a25175fcd6a87bb6eb7b654d2b6cf0bf  crash-4.0-8.11.tar.gz
+542645e4f5b5d08ba064068a7602ff18  crash-4.0.9.tar.gz



From crash at fedoraproject.org  Fri Sep 11 14:38:37 2009
From: crash at fedoraproject.org (David Anderson)
Date: Fri, 11 Sep 2009 14:38:37 +0000 (UTC)
Subject: rpms/crash/devel .cvsignore,1.6,1.7
Message-ID: <20090911143837.DFF1611C0099@cvs1.fedora.phx.redhat.com>

Author: crash

Update of /cvs/pkgs/rpms/crash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21909

Modified Files:
	.cvsignore 
Log Message:
Update to upstream release, which allows the removal of the
Revision tag workaround, the crash-4.0-8.11-dwarf3.patch and
the crash-4.0-8.11-optflags.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 22:54:49 -0000	1.6
+++ .cvsignore	11 Sep 2009 14:38:37 -0000	1.7
@@ -1 +1,2 @@
 crash-4.0-8.11.tar.gz
+crash-4.0.9.tar.gz



From akurtakov at fedoraproject.org  Fri Sep 11 14:42:43 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 14:42:43 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.14,1.15
Message-ID: <20090911144243.30FCB11C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23463/devel

Modified Files:
	maven-jxr.spec 
Log Message:
Add BR for doxia-sitetools.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- maven-jxr.spec	11 Sep 2009 14:32:28 -0000	1.14
+++ maven-jxr.spec	11 Sep 2009 14:42:42 -0000	1.15
@@ -32,7 +32,7 @@
 
 Name:           maven-jxr
 Version:        2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
@@ -64,6 +64,7 @@ BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven-doxia-sitetools
 %else
 BuildRequires:  ant, ant-nodeps
 %endif
@@ -206,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
+- Add BR for doxia-sitetools.
+
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-2
 - Fix depmap for the plugin.
 



From than at fedoraproject.org  Fri Sep 11 14:45:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Sep 2009 14:45:04 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.281,1.282
Message-ID: <20090911144504.AB92A11C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24719

Modified Files:
	kdebase-workspace.spec 
Log Message:
rhel fix



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- kdebase-workspace.spec	11 Sep 2009 14:35:10 -0000	1.281
+++ kdebase-workspace.spec	11 Sep 2009 14:45:04 -0000	1.282
@@ -84,7 +84,7 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 || %if 0%{?rhel} < 5
 Requires: kdm = %{version}-%{release}
 %endif
 Requires: ksysguardd = %{version}-%{release}
@@ -108,7 +108,7 @@ Requires: leonidas-kde-theme
 %endif
 %endif
 
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || %if 0%{?rhel} > 5
 Requires: system-backgrounds-kde
 %endif
 



From than at fedoraproject.org  Fri Sep 11 14:45:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Sep 2009 14:45:39 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.282,1.283
Message-ID: <20090911144539.F318111C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24955

Modified Files:
	kdebase-workspace.spec 
Log Message:
typo



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- kdebase-workspace.spec	11 Sep 2009 14:45:04 -0000	1.282
+++ kdebase-workspace.spec	11 Sep 2009 14:45:39 -0000	1.283
@@ -84,7 +84,7 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
-%if 0%{?fedora} < 12 || %if 0%{?rhel} < 5
+%if 0%{?fedora} < 12 || %if 0%{?rhel} < 6
 Requires: kdm = %{version}-%{release}
 %endif
 Requires: ksysguardd = %{version}-%{release}



From crash at fedoraproject.org  Fri Sep 11 14:51:14 2009
From: crash at fedoraproject.org (David Anderson)
Date: Fri, 11 Sep 2009 14:51:14 +0000 (UTC)
Subject: rpms/crash/devel crash.spec,1.35,1.36
Message-ID: <20090911145114.CF4F911C0099@cvs1.fedora.phx.redhat.com>

Author: crash

Update of /cvs/pkgs/rpms/crash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28730

Modified Files:
	crash.spec 
Log Message:
bump version



Index: crash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/crash.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- crash.spec	11 Sep 2009 14:35:30 -0000	1.35
+++ crash.spec	11 Sep 2009 14:51:14 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 4.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Debuggers
 Source: http://people.redhat.com/anderson/crash-%{version}.tar.gz
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Fri Sep 11 2009 Dave Anderson <anderson at redhat.com> - 4.0.9-2
+  Bump version.
+
 * Fri Sep 11 2009 Dave Anderson <anderson at redhat.com> - 4.0.9-1
 - Update to upstream release, which allows the removal of the 
   Revision tag workaround, the crash-4.0-8.11-dwarf3.patch and 



From than at fedoraproject.org  Fri Sep 11 14:55:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Sep 2009 14:55:32 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.283,1.284
Message-ID: <20090911145532.18DF911C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2166

Modified Files:
	kdebase-workspace.spec 
Log Message:
typo



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- kdebase-workspace.spec	11 Sep 2009 14:45:39 -0000	1.283
+++ kdebase-workspace.spec	11 Sep 2009 14:55:31 -0000	1.284
@@ -84,7 +84,7 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
-%if 0%{?fedora} < 12 || %if 0%{?rhel} < 6
+%if 0%{?fedora} < 12 || 0%{?rhel} < 6
 Requires: kdm = %{version}-%{release}
 %endif
 Requires: ksysguardd = %{version}-%{release}
@@ -108,7 +108,7 @@ Requires: leonidas-kde-theme
 %endif
 %endif
 
-%if 0%{?fedora} > 11 || %if 0%{?rhel} > 5
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
 Requires: system-backgrounds-kde
 %endif
 



From twoerner at fedoraproject.org  Fri Sep 11 14:57:11 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Fri, 11 Sep 2009 14:57:11 +0000 (UTC)
Subject: rpms/system-config-firewall/devel .cvsignore, 1.29, 1.30 sources,
	1.32, 1.33 system-config-firewall.spec, 1.44, 1.45
Message-ID: <20090911145711.52BE411C0099@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4741

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- added support for PolicyKit
- removed unused inconsistent flag from CellRendererToggle in serviceView (rhbz#521144)
- made "Port/Protocol" cell resizable in "Trusted Services"-view
- fixed hidden one line label after resize caused by fix for bgo#315462
- fixed startup busy loops if assistive technologies is enabled (rhbz#515048)
  by moving set_model after adding the columns to a TreeView
- fixed tui to create valid empty self.config object (rhbz#518210)
- failing to load the icon in fw_gui.setupScreen should not be fatal
  (rhbz#508186)
- made description column in settings dialog resizable
- removed rhpl usage (rhbz#508991)
- fixed not reappearing TreeViewTooltips if mouse moved in the tooltip popup
- hide TreeViewTooltips while scrolling
- code cleanup
- sort ports in fw_services by protocol, id
- updated translations: as, bn_IN, ca, da, de, es, fi, fr, gu, hi, kn, hu, it, 
                        ja, ko, ml, mr, nl, or, pa, pl, pt, pt_BR, ru, sk, sr,
			sr at latin, ta, te, uk, zh_CN, zh_TW




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	27 Jul 2009 16:12:30 -0000	1.29
+++ .cvsignore	11 Sep 2009 14:57:10 -0000	1.30
@@ -2,3 +2,4 @@ system-config-firewall-1.2.14.tar.bz2
 system-config-firewall-1.2.15.tar.bz2
 system-config-firewall-1.2.16.tar.bz2
 system-config-firewall-1.2.17.tar.bz2
+system-config-firewall-1.2.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Jul 2009 16:12:30 -0000	1.32
+++ sources	11 Sep 2009 14:57:11 -0000	1.33
@@ -1 +1 @@
-07ba9d7855ebc06a9145ae9d4ed2dcaa  system-config-firewall-1.2.17.tar.bz2
+c264e0d2a6938881f49eab3f017f9ab3  system-config-firewall-1.2.18.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- system-config-firewall.spec	27 Jul 2009 16:12:30 -0000	1.44
+++ system-config-firewall.spec	11 Sep 2009 14:57:11 -0000	1.45
@@ -1,6 +1,6 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.17
+Version: 1.2.18
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -21,6 +21,7 @@ Requires: system-config-firewall-tui = %
 Requires: hicolor-icon-theme
 Requires: pygtk2-libglade
 Requires: gtk2 >= 2.6
+Requires: python-slip >= 0.2.3
 
 %description
 system-config-firewall is a graphical user interface for basic firewall setup.
@@ -35,7 +36,6 @@ Provides: system-config-securitylevel-tu
 Requires: iptables >= 1.2.8
 Requires: iptables-ipv6
 Requires: system-config-network-tui
-Requires: rhpl
 Requires: newt
 Requires: libselinux >= 1.19.1
 
@@ -84,17 +84,22 @@ fi
 %files
 %defattr(-,root,root)
 %{_bindir}/system-config-firewall
-%{_datadir}/system-config-firewall/system-config-firewall.py*
+#%{_datadir}/system-config-firewall/system-config-firewall.py*
 %defattr(0644,root,root)
+%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Firewall.conf
+%{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Firewall.service
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.firewall.policy
 %{_datadir}/system-config-firewall/fw_gui.*
+%{_datadir}/system-config-firewall/fw_dbus.*
 %{_datadir}/system-config-firewall/gtk_*
 %{_datadir}/system-config-firewall/*.glade
+%attr(0755,root,root) %{_datadir}/system-config-firewall/system-config-firewall-mechanism.*
 %{_datadir}/system-config-firewall/wizard_*.png
 %{_datadir}/system-config-firewall/wizard.svg
 %{_datadir}/applications/system-config-firewall.desktop
 %{_datadir}/icons/hicolor/*/apps/preferences-system-firewall.*
-%config /etc/security/console.apps/system-config-firewall
-%config /etc/pam.d/system-config-firewall
+#%config /etc/security/console.apps/system-config-firewall
+#%config /etc/pam.d/system-config-firewall
 
 %files -f %{name}.lang tui
 %defattr(-,root,root)
@@ -110,6 +115,7 @@ fi
 %{_datadir}/system-config-firewall/fw_functions.*
 %{_datadir}/system-config-firewall/fw_icmp.*
 %{_datadir}/system-config-firewall/fw_iptables.*
+%{_datadir}/system-config-firewall/fw_lokkit.*
 %{_datadir}/system-config-firewall/fw_parser.*
 %{_datadir}/system-config-firewall/fw_selinux.*
 %{_datadir}/system-config-firewall/fw_services.*
@@ -119,6 +125,26 @@ fi
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Fri Sep 11 2009 Thomas Woerner <twoerner at redhat.com> 1.2.18-1
+- added support for PolicyKit
+- removed unused inconsistent flag from CellRendererToggle in serviceView (rhbz#521144)
+- made "Port/Protocol" cell resizable in "Trusted Services"-view
+- fixed hidden one line label after resize caused by fix for bgo#315462
+- fixed startup busy loops if assistive technologies is enabled (rhbz#515048)
+  by moving set_model after adding the columns to a TreeView
+- fixed tui to create valid empty self.config object (rhbz#518210)
+- failing to load the icon in fw_gui.setupScreen should not be fatal
+  (rhbz#508186)
+- made description column in settings dialog resizable
+- removed rhpl usage (rhbz#508991)
+- fixed not reappearing TreeViewTooltips if mouse moved in the tooltip popup
+- hide TreeViewTooltips while scrolling
+- code cleanup
+- sort ports in fw_services by protocol, id
+- updated translations: as, bn_IN, ca, da, de, es, fi, fr, gu, hi, kn, hu, it, 
+                        ja, ko, ml, mr, nl, or, pa, pl, pt, pt_BR, ru, sk, sr,
+			sr at latin, ta, te, uk, zh_CN, zh_TW
+
 * Mon Jul 27 2009 Thomas Woerner <twoerner at redhat.com> 1.2.17-1
 - Added Red Hat Cluster Suite to trusted services (rhbz#493668)
 - Fixed wrong patch for system-config-firewall-tui (rhbz#461046)



From akurtakov at fedoraproject.org  Fri Sep 11 14:57:53 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 14:57:53 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.15,1.16
Message-ID: <20090911145753.B38F511C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5945/devel

Modified Files:
	maven-jxr.spec 
Log Message:
Add BR for maven2-plugin.site.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- maven-jxr.spec	11 Sep 2009 14:42:42 -0000	1.15
+++ maven-jxr.spec	11 Sep 2009 14:57:53 -0000	1.16
@@ -32,7 +32,7 @@
 
 Name:           maven-jxr
 Version:        2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
@@ -64,6 +64,7 @@ BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-site
 BuildRequires:  maven-doxia-sitetools
 %else
 BuildRequires:  ant, ant-nodeps
@@ -207,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-4
+- Add BR for maven2-plugin.site.
+
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
 - Add BR for doxia-sitetools.
 



From konradm at fedoraproject.org  Fri Sep 11 14:58:48 2009
From: konradm at fedoraproject.org (konradm)
Date: Fri, 11 Sep 2009 14:58:48 +0000 (UTC)
Subject: rpms/sdcc/devel sdcc-2.9.0-r5508-fix-bug2805333.diff,1.1,1.2
Message-ID: <20090911145848.7D2CD11C0099@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6523

Modified Files:
	sdcc-2.9.0-r5508-fix-bug2805333.diff 
Log Message:
Remove unneccesary portions from r5508 patch so it applies.

sdcc-2.9.0-r5508-fix-bug2805333.diff:
 gen.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: sdcc-2.9.0-r5508-fix-bug2805333.diff
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc-2.9.0-r5508-fix-bug2805333.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sdcc-2.9.0-r5508-fix-bug2805333.diff	11 Sep 2009 14:17:34 -0000	1.1
+++ sdcc-2.9.0-r5508-fix-bug2805333.diff	11 Sep 2009 14:58:48 -0000	1.2
@@ -37,54 +37,3 @@ Index: sdcc/src/mcs51/gen.c
      case POINTER:
      case IPOINTER:
        genNearPointerGet (left, result, ic, pi, ifx);
-Index: sdcc/ChangeLog
-===================================================================
---- sdcc/ChangeLog	(revision 5507)
-+++ sdcc/ChangeLog	(working copy)
-@@ -1,5 +1,11 @@
- 2009-08-29 Maarten Brock <sourceforge.brock AT dse.nl>
- 
-+	* src/mcs51/gen.c (aopGet): applied patch 2837100 to fix bug 2805333
-+	* support/regression/tests/bug2805333.c: new, added,
-+	  thanks Ruud van Silfhout
-+
-+2009-08-29 Maarten Brock <sourceforge.brock AT dse.nl>
-+
- 	* device/include/ctype.h: removed _REENTRANT as they are already with
- 	  --stack-auto, optimized _tolower and _toupper with char casts
- 	* device/include/string.h,
-Index: sdcc/support/regression/tests/bug2805333.c
-===================================================================
---- sdcc/support/regression/tests/bug2805333.c	(revision 0)
-+++ sdcc/support/regression/tests/bug2805333.c	(revision 5508)
-@@ -0,0 +1,22 @@
-+/*
-+   bug2805333.c
-+*/
-+
-+#include <testfwk.h>
-+#include <stdbool.h>
-+
-+#ifndef BOOL
-+#define BOOL bool
-+#endif
-+
-+void g(char c)
-+{
-+  c;
-+}
-+
-+BOOL b;
-+
-+void test_bug(void)
-+{
-+  g(!b); /* Causes SDCC 2.9.0 to segfault.. */
-+}
-
-Property changes on: sdcc/support/regression/tests/bug2805333.c
-___________________________________________________________________
-Added: svn:keywords
-   + Author Date Id Revision
-Added: svn:eol-style
-   + native
-



From akurtakov at fedoraproject.org  Fri Sep 11 15:08:58 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 15:08:58 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.16,1.17
Message-ID: <20090911150858.2269311C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8695/devel

Modified Files:
	maven-jxr.spec 
Log Message:
BR tomcat5-servlet-api.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- maven-jxr.spec	11 Sep 2009 14:57:53 -0000	1.16
+++ maven-jxr.spec	11 Sep 2009 15:08:57 -0000	1.17
@@ -66,6 +66,7 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven-doxia-sitetools
+BuildRequires:  tomcat5-servlet-2.4-api
 %else
 BuildRequires:  ant, ant-nodeps
 %endif
@@ -210,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-4
 - Add BR for maven2-plugin.site.
+- BR tomcat5-servlet-api.
 
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
 - Add BR for doxia-sitetools.



From harald at fedoraproject.org  Fri Sep 11 15:17:27 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 11 Sep 2009 15:17:27 +0000 (UTC)
Subject: rpms/system-config-boot/devel .cvsignore, 1.19, 1.20 sources, 1.19, 
	1.20 system-config-boot.spec, 1.33, 1.34
Message-ID: <20090911151727.8A74B11C0099@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11170

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Fri Sep 11 2009 Harald Hoyer <harald at redhat.com> 0.4.0
- add tui version
- removed rhpl dependency



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	28 Oct 2008 14:50:20 -0000	1.19
+++ .cvsignore	11 Sep 2009 15:17:27 -0000	1.20
@@ -1 +1 @@
-system-config-boot-0.3.0.tar.bz2
+system-config-boot-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	28 Oct 2008 14:50:20 -0000	1.19
+++ sources	11 Sep 2009 15:17:27 -0000	1.20
@@ -1 +1 @@
-91bfb1c55aba4c90c5c5711adc5cc015  system-config-boot-0.3.0.tar.bz2
+81d2e80d69b8b964d783cb1fa4b92be4  system-config-boot-0.4.0.tar.bz2


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- system-config-boot.spec	27 Jul 2009 05:21:28 -0000	1.33
+++ system-config-boot.spec	11 Sep 2009 15:17:27 -0000	1.34
@@ -3,8 +3,8 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.3.0
-Release: 5%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPLv2
 ExclusiveOS: Linux
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.bz2
-Requires: pygtk2 python2 usermode >= 1.36 rhpl >= 0.6 
+Requires: pygtk2 python2 usermode >= 1.36  
 Requires: usermode-gtk
 ExclusiveArch: %{ix86} x86_64
 Obsoletes: redhat-config-boot < 0.2
@@ -66,14 +66,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Sep 11 2009 Harald Hoyer <harald at redhat.com> 0.4.0
+- add tui version
+- removed rhpl dependency
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.0-3
-- Rebuild for Python 2.6
+* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 0.3.1
+- translation updates
+- removed kudzu import (bug #473798)
 
 * Tue Oct 28 2008 Harald Hoyer <harald at redhat.com> 0.3.0-2
 - reapplied changes by spot



From akurtakov at fedoraproject.org  Fri Sep 11 15:25:01 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 15:25:01 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.17,1.18
Message-ID: <20090911152501.EF63611C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12561/devel

Modified Files:
	maven-jxr.spec 
Log Message:
- BR tomcat5.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- maven-jxr.spec	11 Sep 2009 15:08:57 -0000	1.17
+++ maven-jxr.spec	11 Sep 2009 15:25:01 -0000	1.18
@@ -66,6 +66,7 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven-doxia-sitetools
+BuildRequires:  tomcat5
 BuildRequires:  tomcat5-servlet-2.4-api
 %else
 BuildRequires:  ant, ant-nodeps
@@ -212,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-4
 - Add BR for maven2-plugin.site.
 - BR tomcat5-servlet-api.
+- BR tomcat5.
 
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
 - Add BR for doxia-sitetools.



From davej at fedoraproject.org  Fri Sep 11 15:31:53 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 11 Sep 2009 15:31:53 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.31-nx-data.patch, NONE, 1.1 kernel.spec,
	1.1794, 1.1795
Message-ID: <20090911153153.3F25811C0099@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13951

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.31-nx-data.patch 
Log Message:
Mark kernel data section as NX

linux-2.6.31-nx-data.patch:
 kernel/vmlinux.lds.S |    6 +++++-
 mm/init.c            |   22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.31-nx-data.patch ---
Date: 	Thu, 10 Sep 2009 21:10:51 -0400
Message-ID: <817ecb6f0909101810u7774ca93u40a0a4b99f9fb6ba at mail.gmail.com>
Subject: [PATCH V4] x86: NX protection for kernel data
From: Siarhei Liakh <sliakh.lkml at gmail.com>
To: linux-kernel at vger.kernel.org, linux-security-module at vger.kernel.org
Cc: Arjan van de Ven <arjan at infradead.org>, James Morris <jmorris at namei.org>,
        Andrew Morton <akpm at linux-foundation.org>, Andi Kleen <ak at muc.de>,
        Rusty Russell <rusty at rustcorp.com.au>,
        Thomas Gleixner <tglx at linutronix.de>, "H. Peter Anvin" <hpa at zytor.com>,
        Ingo Molnar <mingo at elte.hu>

This patch expands functionality of CONFIG_DEBUG_RODATA to set main
(static) kernel data area as NX.
The following steps are taken to achieve this:
1. Linker script is adjusted so .text always starts and ends on a page boundary
2. Linker script is adjusted so .rodata and .data always start and
end on a page boundary
3. void mark_nxdata_nx(void) added to arch/x86/mm/init.c with actual
functionality: NX is set for all pages from _etext through _end.
4. mark_nxdata_nx() called from free_initmem() (after init has been released)
5. free_init_pages() sets released memory NX in arch/x86/mm/init.c

The patch have been developed for Linux 2.6.31-rc7 x86 by Siarhei Liakh
<sliakh.lkml at gmail.com> and Xuxian Jiang <jiang at cs.ncsu.edu>.

V1:  initial patch for 2.6.30
V2:  patch for 2.6.31-rc7
V3:  moved all code into arch/x86, adjusted credits
V4:  fixed ifdef, removed credits from CREDITS

---

Signed-off-by: Siarhei Liakh <sliakh.lkml at gmail.com>
Signed-off-by: Xuxian Jiang <jiang at cs.ncsu.edu>

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 9fc1782..b6b2bbf 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -43,7 +43,7 @@ jiffies_64 = jiffies;
 
 PHDRS {
 	text PT_LOAD FLAGS(5);          /* R_E */
-	data PT_LOAD FLAGS(7);          /* RWE */
+	data PT_LOAD FLAGS(6);          /* RW_ */
 #ifdef CONFIG_X86_64
 	user PT_LOAD FLAGS(7);          /* RWE */
 #ifdef CONFIG_SMP
@@ -88,6 +88,8 @@ SECTIONS
 		IRQENTRY_TEXT
 		*(.fixup)
 		*(.gnu.warning)
+		/* .text should occupy whole number of pages */
+		. = ALIGN(PAGE_SIZE);
 		/* End of text section */
 		_etext = .;
 	} :text = 0x9090
@@ -128,6 +130,8 @@ SECTIONS
 		/* rarely changed data like cpu maps */
 		READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES)
 
+		/* .data should occupy whole number of pages */
+		. = ALIGN(PAGE_SIZE);
 		/* End of data section */
 		_edata = .;
 	} :data
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 0607119..522e81b 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -423,9 +423,10 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 	/*
 	 * We just marked the kernel text read only above, now that
 	 * we are going to free part of that, we need to make that
-	 * writeable first.
+	 * writeable and non-executable first.
 	 */
 	set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
+	set_memory_nx(begin, (end - begin) >> PAGE_SHIFT);

 	printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);

@@ -440,11 +441,29 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 #endif
 }

+void mark_nxdata_nx(void)
+{
+#ifdef CONFIG_DEBUG_RODATA
+	/*
+	 * When this called, init has already been executed and released,
+	 * so everything past _etext sould be NX.
+	 */
+	unsigned long start = PFN_ALIGN(_etext);
+	unsigned long size = PFN_ALIGN(_end) - start;
+
+	printk(KERN_INFO "NX-protecting the kernel data: %lx, %lu pages\n",
+		start, size >> PAGE_SHIFT);
+	set_pages_nx(virt_to_page(start), size >> PAGE_SHIFT);
+#endif
+}
+
 void free_initmem(void)
 {
 	free_init_pages("unused kernel memory",
 			(unsigned long)(&__init_begin),
 			(unsigned long)(&__init_end));
+	/* Set kernel's data as NX */
+	mark_nxdata_nx();
 }

 #ifdef CONFIG_BLK_DEV_INITRD
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1794
retrieving revision 1.1795
diff -u -p -r1.1794 -r1.1795
--- kernel.spec	11 Sep 2009 07:05:08 -0000	1.1794
+++ kernel.spec	11 Sep 2009 15:31:52 -0000	1.1795
@@ -667,6 +667,8 @@ Patch671: linux-2.6-ahci-export-capabili
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 
+Patch700: linux-2.6.31-nx-data.patch
+
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
@@ -1295,6 +1297,9 @@ ApplyPatch linux-2.6-ahci-export-capabil
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
+# Mark kernel data as NX
+ApplyPatch linux-2.6.31-nx-data.patch
+
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -2018,6 +2023,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 11 2009 Dave Jones <davej at redhat.com>
+- Mark kernel data section as NX
+
 * Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: bring in Matthew Garret's initial switchable graphics support
 



From than at fedoraproject.org  Fri Sep 11 15:32:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Sep 2009 15:32:34 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.284,1.285
Message-ID: <20090911153234.F3F8611C0099@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14086

Modified Files:
	kdebase-workspace.spec 
Log Message:
cleanup



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- kdebase-workspace.spec	11 Sep 2009 14:55:31 -0000	1.284
+++ kdebase-workspace.spec	11 Sep 2009 15:32:34 -0000	1.285
@@ -96,16 +96,25 @@ Requires: xorg-x11-apps
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
+%define default_face_icon default1.png
+
 %if 0%{?fedora} == 10
 %define default_face_icon default_solar.png
 Requires: solar-kde-theme
-%else
+%endif
+
 %if 0%{?fedora} == 11
 %define default_face_icon default_leonidas.png
 Requires: leonidas-kde-theme
-%else
-%define default_face_icon default1.png
 %endif
+
+%if 0%{?fedora} == 12
+Requires: constantine-kde-theme
+%endif
+
+# will be changed later for rhel
+%if 0%{?rhel} == 6
+Requires: constantine-kde-theme
 %endif
 
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5



From caolanm at fedoraproject.org  Fri Sep 11 15:33:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Sep 2009 15:33:20 +0000 (UTC)
Subject: rpms/hunspell-fr/devel .cvsignore, 1.8, 1.9 hunspell-fr.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <20090911153320.9FF1411C0099@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14353

Modified Files:
	.cvsignore hunspell-fr.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 May 2009 13:38:02 -0000	1.8
+++ .cvsignore	11 Sep 2009 15:33:20 -0000	1.9
@@ -1 +1 @@
-hunspell_fr_3-2.zip
+hunspell_fr_3-4.zip


Index: hunspell-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/hunspell-fr.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hunspell-fr.spec	25 Jul 2009 02:26:03 -0000	1.11
+++ hunspell-fr.spec	11 Sep 2009 15:33:20 -0000	1.12
@@ -1,10 +1,10 @@
 Name: hunspell-fr
 Summary: French hunspell dictionaries
-Version: 3.2
-Release: 2%{?dist}
-Source: http://download.tuxfamily.org/dicollecte2/hunspell_fr_3-2.zip
+Version: 3.4
+Release: 1%{?dist}
+Source: http://www.dicollecte.org/download/fr/hunspell_fr_3-4.zip
 Group: Applications/Text
-URL: http://dicollecte.tuxfamily.org/home.php?prj=fr
+URL: http://www.dicollecte.org/home.php?prj=fr
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2 or LGPLv2 or MPLv1.1
 BuildArch: noarch
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Sep 11 2009 Caolan McNamara <caolanm at redhat.com> - 3.4-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 May 2009 13:38:02 -0000	1.8
+++ sources	11 Sep 2009 15:33:20 -0000	1.9
@@ -1 +1 @@
-fadc941c0cd3fd5b65306d1bf66eb693  hunspell_fr_3-2.zip
+a6002a9ff88b01706da0ed754daa51bd  hunspell_fr_3-4.zip



From caolanm at fedoraproject.org  Fri Sep 11 15:35:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Sep 2009 15:35:15 +0000 (UTC)
Subject: rpms/hunspell-ti/devel hunspell-ti.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090911153515.488E511C0099@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16896

Modified Files:
	hunspell-ti.spec sources 
Log Message:
latest version


Index: hunspell-ti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ti/devel/hunspell-ti.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hunspell-ti.spec	25 Jul 2009 02:43:36 -0000	1.2
+++ hunspell-ti.spec	11 Sep 2009 15:35:14 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hunspell-ti
 Summary: Tigrigna hunspell dictionaries
-%define upstreamid 20090704
+%define upstreamid 20090911
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://www.cs.ru.nl/~biniam/geez/dict/ti_ER.zip
 Group: Applications/Text
 URL: http://www.cs.ru.nl/~biniam/geez/index.php
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Sep 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090911-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090704-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ti/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Jul 2009 08:31:56 -0000	1.2
+++ sources	11 Sep 2009 15:35:15 -0000	1.3
@@ -1 +1 @@
-49c38651aa02a5fa88a644dff378aef9  ti_ER.zip
+e498ab803245fd94c1648d447c5f016a  ti_ER.zip



From pjones at fedoraproject.org  Fri Sep 11 15:37:38 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 11 Sep 2009 15:37:38 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.7, 1.8 grubby.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20090911153738.1A97711C0099@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18909

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Fri Sep 11 2009 Peter Jones <pjones at redhat.com> - 7.0.5-1
- Add support for plymouth as a second initrd.
  Resolves: rhbz#520515



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2009 19:51:30 -0000	1.7
+++ .cvsignore	11 Sep 2009 15:37:37 -0000	1.8
@@ -1 +1 @@
-grubby-7.0.4.tar.bz2
+grubby-7.0.5.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- grubby.spec	9 Sep 2009 19:51:30 -0000	1.6
+++ grubby.spec	11 Sep 2009 15:37:37 -0000	1.7
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.4
+Version: 7.0.5
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Peter Jones <pjones at redhat.com> - 7.0.5-1
+- Add support for plymouth as a second initrd.
+  Resolves: rhbz#520515
+
 * Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.4-1
 - Add --dracut cmdline argument for %post generation of dracut initrd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2009 19:51:30 -0000	1.7
+++ sources	11 Sep 2009 15:37:37 -0000	1.8
@@ -1 +1 @@
-39635ced8c1ebf17f67bef323e839187  grubby-7.0.4.tar.bz2
+29697999934b603425d072f0ac3c5c9b  grubby-7.0.5.tar.bz2



From davej at fedoraproject.org  Fri Sep 11 15:40:08 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 11 Sep 2009 15:40:08 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.31-modules-ro-nx.patch, NONE,
	1.1 kernel.spec, 1.1795, 1.1796
Message-ID: <20090911154008.4766011C043A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19549

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.31-modules-ro-nx.patch 
Log Message:
Apply NX/RO to modules

linux-2.6.31-modules-ro-nx.patch:
 include/linux/module.h |    3 +
 kernel/module.c        |  126 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 126 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.31-modules-ro-nx.patch ---
>From davej  Fri Sep 11 11:06:50 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.5 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,SARE_MSGID_LONG40,UNPARSEABLE_RELAY autolearn=ham
	version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.51]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Fri, 11 Sep 2009 11:06:50 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
 zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
 mail04.corp.redhat.com with LMTP; Thu, 10 Sep 2009 22:51:21 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E57644F1AB;
	Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id PqMpQop0Dbp5; Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A56F64F1AA;
	Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.12])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8B2pDoM001214;
	Thu, 10 Sep 2009 22:51:13 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8B2jC2e031184;
	Thu, 10 Sep 2009 22:51:01 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753321AbZIKCur (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Thu, 10 Sep 2009 22:50:47 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752432AbZIKCuq
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 10 Sep 2009 22:50:46 -0400
Received: from mail-yw0-f174.google.com ([209.85.211.174]:34234 "EHLO
	mail-yw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752401AbZIKCup (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Thu, 10 Sep 2009 22:50:45 -0400
Received: by ywh4 with SMTP id 4so897627ywh.5
        for <multiple recipients>; Thu, 10 Sep 2009 19:50:47 -0700 (PDT)
DKIM-Signature: 	v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:mime-version:received:date:message-id:subject
         :from:to:cc:content-type;
        bh=p3+H2ZvljQZotPAF9Gb+FxecqVT3MH9YeBjUUKwwvY0=;
        b=JTV6NmVCgyrG6SVi/FbmJR4FeIQuc44rC3EV0D1A8qPb+xMwNYK5QlD8do+3+FKgbc
         CH/kgCjakj8e5v4ipROLQjPEiN/TETq15ITPKToCOHKve4jS1GMgkZYyYScpBfOj7N9R
         VaWi9sbsNBvUtf1wS83Uqy4GBjZ88MEoBetrs=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:date:message-id:subject:from:to:cc:content-type;
        b=Ksz1JD3HRA+cyDH560RvcyHLpdr4+4Tost2JUGQV5a1m/XC/zwqLdXWNlkWTsuNVvJ
         n+vlXd8VrHE+9h54vf+BMqmK+3LB6Q1iV3nLFpRoU7qaEdnPrWdRcCi8Ot6vIzLrHLf2
         Xu6y7fJWaLQ+cbIGNY2LGR5UlkBul7kaj1API=
MIME-Version: 1.0
Received: by 10.150.17.5 with SMTP id 5mr3930758ybq.195.1252637447825; Thu, 10 
	Sep 2009 19:50:47 -0700 (PDT)
Date: 	Thu, 10 Sep 2009 22:50:47 -0400
Message-ID: <817ecb6f0909101950v2fc6dc6u5cbc40cd9a9dde77 at mail.gmail.com>
Subject: [PATCH v6] RO/NX protection for loadable kernel modules
From: Siarhei Liakh <sliakh.lkml at gmail.com>
To: linux-kernel at vger.kernel.org, linux-security-module at vger.kernel.org,
        linux-next at vger.kernel.org
Cc: Arjan van de Ven <arjan at infradead.org>, James Morris <jmorris at namei.org>,
        Andrew Morton <akpm at linux-foundation.org>, Andi Kleen <ak at muc.de>,
        Thomas Gleixner <tglx at linutronix.de>, "H. Peter Anvin" <hpa at zytor.com>,
        Ingo Molnar <mingo at elte.hu>, Rusty Russell <rusty at rustcorp.com.au>,
        Stephen Rothwell <sfr at canb.auug.org.au>
Content-Type: text/plain; charset=ISO-8859-1
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.12
Status: RO
Content-Length: 8042
Lines: 260

This patch is a logical extension of the protection provided by
CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting
module_core and module_init into three logical parts each and setting
appropriate page access permissions for each individual section:

 1. Code: RO+X
 2. RO data: RO+NX
 3. RW data: RW+NX

In order to achieve proper protection, layout_sections() have been
modified to align each of the three parts mentioned above onto page
boundary. Next, the corresponding page access permissions are set
right before successful exit from load_module(). Further, free_module()
and sys_init_module have been modified to set module_core and
module_init as RW+NX right before calling module_free().

By default, the original section layout is preserved and RO/NX is
enforced only for whole pages of same content.
However, when compiled with CONFIG_DEBUG_RODATA=y, the patch
will page-align each group of sections to ensure that each page contains
only one type of content.
RO/NX enforcement is active on x86 only.

v1: Initial proof-of-concept patch.

v2: The patch have been re-written to reduce the number of #ifdefs and
to make it architecture-agnostic. Code formatting have been corrected also.

v3: Opportunistic RO/NX protectiuon is now unconditional. Section
page-alignment is enabled when CONFIG_DEBUG_RODATA=y.

v4: Removed most macros and improved coding style.

v5: Changed page-alignment and RO/NX section size calculation

v6: Fixed comments. Restricted RO/NX enforcement to x86 only

The patch have been developed for Linux 2.6.30 by Siarhei Liakh
<sliakh.lkml at gmail.com> and Xuxian Jiang <jiang at cs.ncsu.edu>.

---

Signed-off-by: Siarhei Liakh <sliakh.lkml at gmail.com>
Signed-off-by: Xuxian Jiang <jiang at cs.ncsu.edu>
Acked-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/include/linux/module.h b/include/linux/module.h
index 627ac08..5ba770e 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -293,6 +293,9 @@ struct module
 	/* The size of the executable code in each section.  */
 	unsigned int init_text_size, core_text_size;

+	/* Size of RO sections of the module (text+rodata) */
+	unsigned int init_ro_size, core_ro_size;
+
 	/* Arch-specific module values */
 	struct mod_arch_specific arch;

diff --git a/kernel/module.c b/kernel/module.c
index e797812..660278a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -54,6 +54,7 @@
 #include <linux/async.h>
 #include <linux/percpu.h>
 #include <linux/kmemleak.h>
+#include <linux/pfn.h>
 
 #if 0
 #define DEBUGP printk
@@ -63,6 +64,26 @@
 #define ARCH_SHF_SMALL 0
 #endif

+/*
+ * Modules' sections will be aligned on page boundaries
+ * to ensure complete separation of code and data, but
+ * only when CONFIG_DEBUG_RODATA=y
+ */
+#ifdef CONFIG_DEBUG_RODATA
+#define debug_align(X) ALIGN(X, PAGE_SIZE)
+#else
+#define debug_align(X) (X)
+#endif
+
+/*
+ * Given BASE and SIZE this macro calculates the number of pages the
+ * memory regions occupies
+ */
+#define NUMBER_OF_PAGES(BASE, SIZE) ((SIZE > 0) ?		\
+		(PFN_DOWN((unsigned long)BASE + SIZE - 1) -	\
+			 PFN_DOWN((unsigned long)BASE) + 1)	\
+		: (0UL))
+
 /* If this is set, the section belongs in the init part of the module */
 #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))

@@ -1471,6 +1492,69 @@ static int __unlink_module(void *_mod)
 	return 0;
 }

+/*
+ * LKM RO/NX protection: protect module's text/ro-data
+ * from modification and any data from execution.
+ */
+static void set_section_ro_nx(void *base,
+			unsigned long text_size,
+			unsigned long ro_size,
+			unsigned long total_size)
+{
+#ifdef CONFIG_X86
+	/* begin and end PFNs of the current subsection */
+	unsigned long begin_pfn;
+	unsigned long end_pfn;
+
+	/*
+	 * Set RO for module text and RO-data:
+	 * - Always protect first page.
+	 * - Do not protect last partial page.
+	 */
+	if (ro_size > 0) {
+		begin_pfn = PFN_DOWN((unsigned long)base);
+		end_pfn = PFN_DOWN((unsigned long)base + ro_size);
+		if (end_pfn > begin_pfn)
+			set_memory_ro(begin_pfn << PAGE_SHIFT,
+						end_pfn - begin_pfn);
+	}
+
+	/*
+	 * Set NX permissions for module data:
+	 * - Do not protect first partial page.
+	 * - Always protect last page.
+	 */
+	if (total_size > text_size) {
+		begin_pfn = PFN_UP((unsigned long)base + text_size);
+		end_pfn = PFN_UP((unsigned long)base + total_size);
+		if (end_pfn > begin_pfn)
+			set_memory_nx(begin_pfn << PAGE_SHIFT,
+						end_pfn - begin_pfn);
+	}
+#endif
+}
+
+/* Setting memory back to RW+NX before releasing it */
+void unset_section_ro_nx(struct module *mod, void *module_region)
+{
+#ifdef CONFIG_X86
+	unsigned long total_pages;
+
+	if (mod->module_core == module_region) {
+		/* Set core as NX+RW */
+		total_pages = NUMBER_OF_PAGES(mod->module_core, mod->core_size);
+		set_memory_nx((unsigned long)mod->module_core, total_pages);
+		set_memory_rw((unsigned long)mod->module_core, total_pages);
+
+	} else if (mod->module_init == module_region) {
+		/* Set init as NX+RW */
+		total_pages = NUMBER_OF_PAGES(mod->module_init, mod->init_size);
+		set_memory_nx((unsigned long)mod->module_init, total_pages);
+		set_memory_rw((unsigned long)mod->module_init, total_pages);
+	}
+#endif
+}
+
 /* Free a module, remove from lists, etc (must hold module_mutex). */
 static void free_module(struct module *mod)
 {
@@ -1493,6 +1577,7 @@ static void free_module(struct module *mod)
 	ftrace_release(mod->module_core, mod->core_size);

 	/* This may be NULL, but that's OK */
+	unset_section_ro_nx(mod, mod->module_init);
 	module_free(mod, mod->module_init);
 	kfree(mod->args);
 	if (mod->percpu)
@@ -1505,6 +1590,7 @@ static void free_module(struct module *mod)
 	lockdep_free_key_range(mod->module_core, mod->core_size);

 	/* Finally, free the core (containing the module structure) */
+	unset_section_ro_nx(mod, mod->module_core);
 	module_free(mod, mod->module_core);
 }

@@ -1678,8 +1764,19 @@ static void layout_sections(struct module *mod,
 			s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
 			DEBUGP("\t%s\n", secstrings + s->sh_name);
 		}
-		if (m == 0)
+		switch (m) {
+		case 0: /* executable */
+			mod->core_size = debug_align(mod->core_size);
 			mod->core_text_size = mod->core_size;
+			break;
+		case 1: /* RO: text and ro-data */
+			mod->core_size = debug_align(mod->core_size);
+			mod->core_ro_size = mod->core_size;
+			break;
+		case 3: /* whole core */
+			mod->core_size = debug_align(mod->core_size);
+			break;
+		}
 	}

 	DEBUGP("Init section allocation order:\n");
@@ -1696,8 +1793,19 @@ static void layout_sections(struct module *mod,
 					 | INIT_OFFSET_MASK);
 			DEBUGP("\t%s\n", secstrings + s->sh_name);
 		}
-		if (m == 0)
+		switch (m) {
+		case 0: /* executable */
+			mod->init_size = debug_align(mod->init_size);
 			mod->init_text_size = mod->init_size;
+			break;
+		case 1: /* RO: text and ro-data */
+			mod->init_size = debug_align(mod->init_size);
+			mod->init_ro_size = mod->init_size;
+			break;
+		case 3: /* whole init */
+			mod->init_size = debug_align(mod->init_size);
+			break;
+		}
 	}
 }

@@ -2291,6 +2399,18 @@ static noinline struct module *load_module(void __user *umod,
 	/* Get rid of temporary copy */
 	vfree(hdr);

+	/* Set RO and NX regions for core */
+	set_section_ro_nx(mod->module_core,
+				mod->core_text_size,
+				mod->core_ro_size,
+				mod->core_size);
+
+	/* Set RO and NX regions for init */
+	set_section_ro_nx(mod->module_init,
+				mod->init_text_size,
+				mod->init_ro_size,
+				mod->init_size);
+
 	/* Done! */
 	return mod;

@@ -2598,6 +2598,7 @@ SYSCALL_DEFINE3(init_module, void __user
 	mutex_lock(&module_mutex);
 	/* Drop initial reference. */
 	module_put(mod);
+	unset_section_ro_nx(mod, mod->module_init);
 	trim_init_extable(mod);
 	module_free(mod, mod->module_init);
 	mod->module_init = NULL;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1795
retrieving revision 1.1796
diff -u -p -r1.1795 -r1.1796
--- kernel.spec	11 Sep 2009 15:31:52 -0000	1.1795
+++ kernel.spec	11 Sep 2009 15:40:07 -0000	1.1796
@@ -668,6 +668,7 @@ Patch680: linux-2.6-rt2x00-asus-leds.pat
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 
 Patch700: linux-2.6.31-nx-data.patch
+Patch701: linux-2.6.31-modules-ro-nx.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -1299,6 +1300,8 @@ ApplyPatch linux-2.6-ahci-export-capabil
 
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
+# Apply NX/RO to modules
+ApplyPatch linux-2.6.31-modules-ro-nx.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -2024,6 +2027,9 @@ fi
 
 %changelog
 * Fri Sep 11 2009 Dave Jones <davej at redhat.com>
+- Apply NX/RO to modules
+
+* Fri Sep 11 2009 Dave Jones <davej at redhat.com>
 - Mark kernel data section as NX
 
 * Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>



From akurtakov at fedoraproject.org  Fri Sep 11 15:49:29 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 15:49:29 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.18,1.19
Message-ID: <20090911154929.CBBE911C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22787/devel

Modified Files:
	maven-jxr.spec 
Log Message:
BR maven-surefire-provider-junit.



Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- maven-jxr.spec	11 Sep 2009 15:25:01 -0000	1.18
+++ maven-jxr.spec	11 Sep 2009 15:49:29 -0000	1.19
@@ -68,6 +68,7 @@ BuildRequires:  maven2-plugin-site
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  tomcat5
 BuildRequires:  tomcat5-servlet-2.4-api
+BuildRequires:  maven-surefire-provider-junit
 %else
 BuildRequires:  ant, ant-nodeps
 %endif
@@ -214,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add BR for maven2-plugin.site.
 - BR tomcat5-servlet-api.
 - BR tomcat5.
+- BR maven-surefire-provider-junit.
 
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
 - Add BR for doxia-sitetools.



From rdieter at fedoraproject.org  Fri Sep 11 15:56:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 15:56:41 +0000 (UTC)
Subject: rpms/wv2/devel wv2-0.4.0-LIB_SUFFIX.patch, NONE,
	1.1 wv2-0.4.0-defines.patch, NONE,
	1.1 wv2-0.4.0-extra_libs.patch, NONE,
	1.1 wv2-0.4.0-multilib.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 wv2.spec, 1.16,
	1.17 wv2-0.2.2-no-extra-libs.patch, 1.1,
	NONE wv2-0.2.2-no-undefined.patch, 1.1,
	NONE wv2-fixmultilib.patch, 1.1, NONE wv2-gcc43.patch, 1.1, NONE
Message-ID: <20090911155641.D2D1B11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24302

Modified Files:
	.cvsignore sources wv2.spec 
Added Files:
	wv2-0.4.0-LIB_SUFFIX.patch wv2-0.4.0-defines.patch 
	wv2-0.4.0-extra_libs.patch wv2-0.4.0-multilib.patch 
Removed Files:
	wv2-0.2.2-no-extra-libs.patch wv2-0.2.2-no-undefined.patch 
	wv2-fixmultilib.patch wv2-gcc43.patch 
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
- wv2-0.4.0


wv2-0.4.0-LIB_SUFFIX.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE wv2-0.4.0-LIB_SUFFIX.patch ---
diff -up wv2-0.4.0/src/CMakeLists.txt.LIB_SUFFIX wv2-0.4.0/src/CMakeLists.txt
--- wv2-0.4.0/src/CMakeLists.txt.LIB_SUFFIX	2009-08-26 16:46:40.000000000 -0500
+++ wv2-0.4.0/src/CMakeLists.txt	2009-09-11 09:26:27.942622901 -0500
@@ -90,11 +90,11 @@ ENDIF( WIN32 )
 INSTALL( TARGETS wv2
     EXPORT wvWare
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/static
 )
 
-INSTALL( EXPORT wvWare DESTINATION lib/wvWare FILE wv2.cmake )
+INSTALL( EXPORT wvWare DESTINATION lib${LIB_SUFFIX}/wvWare FILE wv2.cmake )
 
 INSTALL( FILES ${wv2_HEADERS}
   DESTINATION include/wv2
@@ -103,5 +103,5 @@ INSTALL( FILES ${wv2_HEADERS}
 # libtool files are useless for Visual C++ and Borland C++
 IF( NOT MSVC AND NOT BORLAND )
   INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake )
-  CREATE_LIBTOOL_FILE( wv2 /lib )
+  CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} )
 ENDIF( NOT MSVC AND NOT BORLAND )

wv2-0.4.0-defines.patch:
 ustring.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE wv2-0.4.0-defines.patch ---
diff -up wv2-0.4.0/src/ustring.cpp.defines wv2-0.4.0/src/ustring.cpp
--- wv2-0.4.0/src/ustring.cpp.defines	2009-08-26 16:46:40.000000000 -0500
+++ wv2-0.4.0/src/ustring.cpp	2009-09-11 09:18:40.596622813 -0500
@@ -78,9 +78,9 @@ bool wvWare::isPosInf(double d)
 {
 #if defined(HAVE_FUNC_ISINF)
   return (isinf(d) == 1);
-#elif HAVE_FUNC_FINITE
+#elif defined(HAVE_FUNC_FINITE)
   return finite(d) == 0 && d == d; // ### can we distinguish between + and - ?
-#elif HAVE_FUNC__FINITE
+#elif defined(HAVE_FUNC__FINITE)
   return _finite(d) == 0 && d == d; // ###
 #else
   return false;
@@ -91,9 +91,9 @@ bool wvWare::isNegInf(double d)
 {
 #if defined(HAVE_FUNC_ISINF)
   return (isinf(d) == -1);
-#elif HAVE_FUNC_FINITE
+#elif defined(HAVE_FUNC_FINITE)
   return finite(d) == 0 && d == d; // ###
-#elif HAVE_FUNC__FINITE
+#elif defined(HAVE_FUNC__FINITE)
   return _finite(d) == 0 && d == d; // ###
 #else
   return false;

wv2-0.4.0-extra_libs.patch:
 wv2-config.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE wv2-0.4.0-extra_libs.patch ---
diff -up wv2-0.4.0/wv2-config.cmake.extra_libs wv2-0.4.0/wv2-config.cmake
--- wv2-0.4.0/wv2-config.cmake.extra_libs	2009-08-26 16:46:40.000000000 -0500
+++ wv2-0.4.0/wv2-config.cmake	2009-09-11 09:36:48.155394840 -0500
@@ -76,7 +76,7 @@ if test "$echo_exec_prefix" = "yes"; the
 	echo $exec_prefix
 fi
 
-wv2_libs="@WV2_LDFLAGS@ -lwv2 @WV2_LIBS@"
+wv2_libs="-lwv2"
 
 if test "$echo_cflags" = "yes"; then
 	includes="@WV2_CFLAGS@"

wv2-0.4.0-multilib.patch:
 wv2-config.cmake |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE wv2-0.4.0-multilib.patch ---
diff -up wv2-0.4.0/wv2-config.cmake.multilib wv2-0.4.0/wv2-config.cmake
--- wv2-0.4.0/wv2-config.cmake.multilib	2009-09-11 09:38:24.415620835 -0500
+++ wv2-0.4.0/wv2-config.cmake	2009-09-11 09:43:19.806622445 -0500
@@ -87,7 +87,6 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-	libdirs=-L${exec_prefix}/lib
 	my_wv2_libs=
 	for i in $wv2_libs ; do
 		if test "x$i" != "x-L${exec_prefix}/lib" ; then
@@ -99,5 +98,5 @@ if test "$echo_libs" = "yes"; then
 		fi
 	done
 
-	echo $libdirs $my_wv2_libs
+	echo $my_wv2_libs
 fi      


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jun 2006 08:30:45 -0000	1.3
+++ .cvsignore	11 Sep 2009 15:56:41 -0000	1.4
@@ -1 +1 @@
-wv2-0.2.3.tar.bz2
+wv2-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jun 2006 08:30:45 -0000	1.3
+++ sources	11 Sep 2009 15:56:41 -0000	1.4
@@ -1 +1 @@
-ea7e3331fbe597185070c0784411a3f7  wv2-0.2.3.tar.bz2
+e0acd7a551c898aab3fb6afafc606bb4  wv2-0.4.0.tar.bz2


Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- wv2.spec	27 Jul 2009 07:29:59 -0000	1.16
+++ wv2.spec	11 Sep 2009 15:56:41 -0000	1.17
@@ -1,30 +1,28 @@
 Name:           wv2
-Version:        0.2.3
-Release:        9%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A library which allows access to Microsoft? Word files
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://wvware.sourceforge.net
-Source0:        http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2
-# see bug #182293
-Patch1:         wv2-0.2.2-no-undefined.patch
-# see bug #192291
-Patch2:         wv2-0.2.2-no-extra-libs.patch
-# see bug #343451 
-Patch3:         wv2-fixmultilib.patch
-# fix gcc43 build
-Patch4:         wv2-gcc43.patch
-
+Source0:        http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake
-BuildRequires:  libgsf-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  glib2-devel
-BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig
-BuildRequires:  libtool
+# see bug #192291
+Patch2: wv2-0.4.0-extra_libs.patch
+# see bug #343451
+Patch3: wv2-0.4.0-multilib.patch
+## upstreamable patches
+Patch50: wv2-0.4.0-defines.patch
+Patch51: wv2-0.4.0-LIB_SUFFIX.patch
+
+BuildRequires: cmake
+BuildRequires: libgsf-devel
+BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
+BuildRequires: glib2-devel
+BuildRequires: zlib-devel
 
 %description
 wv is a library which allows access to Microsoft? Word files. It can load and
@@ -39,21 +37,22 @@ Requires:       %{name} = %{version}-%{r
 Requires:       libgsf-devel
 Requires:       glib2-devel
 Requires:       libxml2-devel
-
 %description devel 
 The wv2-devel package includes the header files necessary for developing.
 
+
 %prep
 %setup -q
 
-%patch1 -p1 -b .no-undefined
 %patch2 -p1 -b .extra_libs
-%patch3
-./autogen.sh
-%patch4
+%patch3 -p1 -b .multilib
+%patch50 -p1 -b .defines
+%patch51 -p1 -b .LIB_SUFFIX
+
 
 %build
-%configure --disable-warnings --disable-dependency-tracking
+%cmake .
+
 make %{?_smp_mflags}
 
 
@@ -61,30 +60,43 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+
+%check
+make test %{?_smp_mflags}
 
-touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/wv2-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig 
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO
-%{_libdir}/*.so.*
+%{_libdir}/libwv2.so.3*
+%dir %{_libdir}/wvWare/
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/wv2-config
-%{_libdir}/*.so
-%{_includedir}/wv2
+%{_libdir}/libwv2.so
+%{_libdir}/wvWare/wv2-noconfig.cmake
+%{_libdir}/wvWare/wv2.cmake
+%{_includedir}/wv2/
+
 
 %changelog
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
+- wv2-0.4.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- wv2-0.2.2-no-extra-libs.patch DELETED ---


--- wv2-0.2.2-no-undefined.patch DELETED ---


--- wv2-fixmultilib.patch DELETED ---


--- wv2-gcc43.patch DELETED ---



From cweyl at fedoraproject.org  Fri Sep 11 15:56:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 11 Sep 2009 15:56:46 +0000 (UTC)
Subject: rpms/perl-parent/devel .cvsignore, 1.2, 1.3 perl-parent.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <20090911155646.3B70811C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-parent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24375

Modified Files:
	.cvsignore perl-parent.spec sources 
Log Message:
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.223-1
- update filtering
- auto-update to 0.223 (by cpan-spec-update 0.01)
- altered br on perl(Test::More) (0 => 0.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-parent/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jun 2008 16:28:21 -0000	1.2
+++ .cvsignore	11 Sep 2009 15:56:46 -0000	1.3
@@ -1 +1 @@
-parent-0.221.tar.gz
+parent-0.223.tar.gz


Index: perl-parent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-parent/devel/perl-parent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-parent.spec	26 Jul 2009 17:49:16 -0000	1.4
+++ perl-parent.spec	11 Sep 2009 15:56:46 -0000	1.5
@@ -1,29 +1,31 @@
 Name:           perl-parent
-Version:        0.221
-Release:        4%{?dist}
+Version:        0.223
+Release:        1%{?dist}
 Summary:        Establish an ISA relationship with base classes at compile time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/parent/
-Source0:        http://www.cpan.org/authors/id/C/CO/CORION/parent-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CO/CORION/parent-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More) >= 0.4
+
+%{?perl_default_filter}
 
 %description
 Allows you to both load one or more modules, while setting up inheritance
 from those modules at the same time. Mostly similar in effect to:
 
     package Baz;
-    
+
     BEGIN {
-        require Foo; 
-        require Bar; 
-        
-        push @ISA, qw(Foo Bar); 
+        require Foo;
+        require Bar;
+
+        push @ISA, qw(Foo Bar);
     }
 
 %prep
@@ -31,14 +33,7 @@ from those modules at the same time. Mos
 
 find . -type f -exec chmod -c -x {} +
 
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl([DFR].*)/d'
-EOF
-
-%define __perl_provides %{_builddir}/parent-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
+# sed -e '/perl([DFR].*)/d'
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -67,6 +62,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.223-1
+- update filtering
+- auto-update to 0.223 (by cpan-spec-update 0.01)
+- altered br on perl(Test::More) (0 => 0.4)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.221-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-parent/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jun 2008 16:28:21 -0000	1.2
+++ sources	11 Sep 2009 15:56:46 -0000	1.3
@@ -1 +1 @@
-4bacb68147a063ec475fd1a63c949d74  parent-0.221.tar.gz
+e89c37813e8497f1d8bbf223ab18a02d  parent-0.223.tar.gz



From cweyl at fedoraproject.org  Fri Sep 11 15:56:58 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 11 Sep 2009 15:56:58 +0000 (UTC)
Subject: rpms/perl-parent/F-11 perl-parent.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090911155658.E91A911C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-parent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24597

Modified Files:
	perl-parent.spec sources 
Log Message:
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.223-1
- update filtering
- auto-update to 0.223 (by cpan-spec-update 0.01)
- altered br on perl(Test::More) (0 => 0.4)



Index: perl-parent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-parent/F-11/perl-parent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-parent.spec	27 Feb 2009 05:15:40 -0000	1.3
+++ perl-parent.spec	11 Sep 2009 15:56:58 -0000	1.4
@@ -1,29 +1,31 @@
 Name:           perl-parent
-Version:        0.221
-Release:        3%{?dist}
+Version:        0.223
+Release:        1%{?dist}
 Summary:        Establish an ISA relationship with base classes at compile time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/parent/
-Source0:        http://www.cpan.org/authors/id/C/CO/CORION/parent-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CO/CORION/parent-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More) >= 0.4
+
+%{?perl_default_filter}
 
 %description
 Allows you to both load one or more modules, while setting up inheritance
 from those modules at the same time. Mostly similar in effect to:
 
     package Baz;
-    
+
     BEGIN {
-        require Foo; 
-        require Bar; 
-        
-        push @ISA, qw(Foo Bar); 
+        require Foo;
+        require Bar;
+
+        push @ISA, qw(Foo Bar);
     }
 
 %prep
@@ -31,14 +33,7 @@ from those modules at the same time. Mos
 
 find . -type f -exec chmod -c -x {} +
 
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl([DFR].*)/d'
-EOF
-
-%define __perl_provides %{_builddir}/parent-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
+# sed -e '/perl([DFR].*)/d'
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -67,6 +62,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.223-1
+- update filtering
+- auto-update to 0.223 (by cpan-spec-update 0.01)
+- altered br on perl(Test::More) (0 => 0.4)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.221-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.221-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-parent/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jun 2008 16:28:21 -0000	1.2
+++ sources	11 Sep 2009 15:56:58 -0000	1.3
@@ -1 +1 @@
-4bacb68147a063ec475fd1a63c949d74  parent-0.221.tar.gz
+e89c37813e8497f1d8bbf223ab18a02d  parent-0.223.tar.gz



From rdieter at fedoraproject.org  Fri Sep 11 15:57:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 15:57:23 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.32, 1.33 koffice.spec, 1.119,
	1.120 sources, 1.32, 1.33
Message-ID: <20090911155723.4D80811C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24752

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
- koffice-2.0.82 (2.1beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	26 Aug 2009 20:59:21 -0000	1.32
+++ .cvsignore	11 Sep 2009 15:57:23 -0000	1.33
@@ -1 +1,2 @@
 koffice-2.0.81.tar.bz2
+koffice-2.0.82.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- koffice.spec	27 Aug 2009 17:21:44 -0000	1.119
+++ koffice.spec	11 Sep 2009 15:57:23 -0000	1.120
@@ -1,7 +1,7 @@
 
 #define kchart 1
 #define kexi 1
-%define kformula 1
+#define kformula 1
 #define kivio 1
 #define kugar 1
 
@@ -11,8 +11,8 @@
 
 Name:           koffice
 Epoch:          2 
-Version:        2.0.81
-Release:        3%{?dist}
+Version:        2.0.82
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -63,12 +63,10 @@ BuildRequires: OpenEXR-devel
 BuildRequires: perl
 BuildRequires: poppler-qt4-devel
 BuildRequires: pstoedit
-BuildRequires: python-devel
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: readline-devel
-BuildRequires: ruby-devel ruby
-BuildRequires: wv2-devel
+BuildRequires: wv2-devel >= 0.4.0
 
 %description
 KOffice is an integrated office suite.
@@ -511,32 +509,33 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkdchart.so.*
 %{_kde4_libdir}/libkoaction.so.*
-%{_kde4_libdir}/libkoaspectbutton.so.*
+#{_kde4_libdir}/libkoaspectbutton.so.*
 %{_kde4_libdir}/libkobase.so.*
-%{_kde4_libdir}/libkocharacterselectiondialog.so.*
+#{_kde4_libdir}/libkocharacterselectiondialog.so.*
 %{_kde4_libdir}/libkochart.so.*
 %{_kde4_libdir}/libkocolorwidgets.so.*
-%{_kde4_libdir}/libkocvsimport.so.*
-%{_kde4_libdir}/libkodocumentsectionbox.so.*
+#{_kde4_libdir}/libkocvsimport.so.*
+#{_kde4_libdir}/libkodocumentsectionbox.so.*
 %{_kde4_libdir}/libkoffice_graya_u16.so.*
 %{_kde4_libdir}/libkofficegrayau8colorspace.so.*
-%{_kde4_libdir}/libkoinput.so.*
+#{_kde4_libdir}/libkoinput.so.*
 %{_kde4_libdir}/libkokross.so.*
-%{_kde4_libdir}/libkolinestyleselector.so.*
+#{_kde4_libdir}/libkolinestyleselector.so.*
 %{_kde4_libdir}/libkomain.so.*
 %{_kde4_libdir}/libkoodf.so.*
-%{_kde4_libdir}/libkoopenpane.so.*
+#{_kde4_libdir}/libkoopenpane.so.*
 %{_kde4_libdir}/libkopageapp.so.*
-%{_kde4_libdir}/libkopagelayout.so.*
-%{_kde4_libdir}/libkopicture.so.*
+#{_kde4_libdir}/libkopagelayout.so.*
+#{_kde4_libdir}/libkopicture.so.*
 %{_kde4_libdir}/libkoplugin.so.*
-%{_kde4_libdir}/libkoprogress.so.*
+#{_kde4_libdir}/libkoprogress.so.*
 %{_kde4_libdir}/libkoresources.so.*
-%{_kde4_libdir}/libkoresourcewidget.so.*
+#{_kde4_libdir}/libkoresourcewidget.so.*
 %{_kde4_libdir}/libkostore.so.*
 %{_kde4_libdir}/libkotext.so.*
+%{_kde4_libdir}/libkowidgets.so.*
 %{_kde4_libdir}/libkowmf.so.*
-%{_kde4_libdir}/libkozoomaction.so.*
+#{_kde4_libdir}/libkozoomaction.so.*
 %{_kde4_libdir}/libkspreadcommon.so.*
 %{_kde4_libdir}/libkwmf.so.*
 %if 0%{?kformula}
@@ -743,6 +742,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libhtmlimport.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
+%{_kde4_libdir}/kde4/libmswordodf_import.*
 %{_kde4_libdir}/kde4/libmswriteexport.*
 %{_kde4_libdir}/kde4/libmswriteimport.*
 %{_kde4_libdir}/kde4/liboowriterexport.*
@@ -808,6 +808,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
+- koffice-2.0.82 (2.1beta2)
+
 * Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-3
 - fixup some cross dependencies between -filters -kplato -krita
 
@@ -815,7 +818,7 @@ update-desktop-database -q &> /dev/null 
 - fix %%files
 
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
-- koffice-2.0.81
+- koffice-2.0.81 (2.1beta1)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.1-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	26 Aug 2009 20:59:21 -0000	1.32
+++ sources	11 Sep 2009 15:57:23 -0000	1.33
@@ -1 +1,2 @@
 d880b2d479c465d3d2cde7146007afbd  koffice-2.0.81.tar.bz2
+25080954dd83b0d7d480b66bd89d1374  koffice-2.0.82.tar.bz2



From akurtakov at fedoraproject.org  Fri Sep 11 16:07:49 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 16:07:49 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.19,1.20
Message-ID: <20090911160749.B5EF311C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31081/devel

Modified Files:
	maven-jxr.spec 
Log Message:
BR maven-plugin-plugin.



Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- maven-jxr.spec	11 Sep 2009 15:49:29 -0000	1.19
+++ maven-jxr.spec	11 Sep 2009 16:07:49 -0000	1.20
@@ -65,6 +65,7 @@ BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-site
+BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  tomcat5
 BuildRequires:  tomcat5-servlet-2.4-api
@@ -216,6 +217,7 @@ rm -rf $RPM_BUILD_ROOT
 - BR tomcat5-servlet-api.
 - BR tomcat5.
 - BR maven-surefire-provider-junit.
+- BR maven-plugin-plugin.
 
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
 - Add BR for doxia-sitetools.



From erikos at fedoraproject.org  Fri Sep 11 16:09:32 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 16:09:32 +0000 (UTC)
Subject: rpms/sugar-write/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-write.spec, 1.8, 1.9
Message-ID: <20090911160932.480F911C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32386

Modified Files:
	.cvsignore sources sugar-write.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-1
- Toolbar redesign




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Aug 2009 13:14:33 -0000	1.6
+++ .cvsignore	11 Sep 2009 16:09:31 -0000	1.7
@@ -1 +1 @@
-Write-66.tar.bz2
+Write-67.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Aug 2009 13:14:33 -0000	1.6
+++ sources	11 Sep 2009 16:09:31 -0000	1.7
@@ -1 +1 @@
-6315e47fa04736e8ba6e29ee89eedc30  Write-66.tar.bz2
+db712c5aca62ffd3aa4fc4cd50e367ec  Write-67.tar.bz2


Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sugar-write.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sugar-write.spec	26 Aug 2009 13:14:33 -0000	1.8
+++ sugar-write.spec	11 Sep 2009 16:09:31 -0000	1.9
@@ -1,5 +1,5 @@
 Name: sugar-write
-Version: 66
+Version: 67
 Release: 1%{?dist}
 Summary: Word processor for Sugar
 Group: Sugar/Activities
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-1
+- Toolbar redesign
+
 * Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 66-1
 - New release 
 



From cweyl at fedoraproject.org  Fri Sep 11 16:15:16 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 11 Sep 2009 16:15:16 +0000 (UTC)
Subject: rpms/perl-SQL-Abstract/devel .cvsignore, 1.9,
	1.10 perl-SQL-Abstract.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <20090911161516.DA76311C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Abstract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3492

Modified Files:
	.cvsignore perl-SQL-Abstract.spec sources 
Log Message:
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.58-1
- add default filtering (pro forma)
- auto-update to 1.58 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 Jun 2009 19:33:10 -0000	1.9
+++ .cvsignore	11 Sep 2009 16:15:16 -0000	1.10
@@ -1 +1 @@
-SQL-Abstract-1.56.tar.gz
+SQL-Abstract-1.58.tar.gz


Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-SQL-Abstract.spec	26 Jul 2009 16:23:49 -0000	1.15
+++ perl-SQL-Abstract.spec	11 Sep 2009 16:15:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.56
-Release:        2%{?dist}
+Version:        1.58
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -20,6 +20,8 @@ BuildRequires:  perl(List::Util)
 BuildRequires:  perl(Test::Builder)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 %{summary}.
 
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.58-1
+- add default filtering (pro forma)
+- auto-update to 1.58 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.56-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	13 Jun 2009 19:33:10 -0000	1.9
+++ sources	11 Sep 2009 16:15:16 -0000	1.10
@@ -1 +1 @@
-ab649305d42c30bc3ab87475bd2e07d9  SQL-Abstract-1.56.tar.gz
+4ab50f21c4795a7ec988efa7b21e6270  SQL-Abstract-1.58.tar.gz



From akurtakov at fedoraproject.org  Fri Sep 11 16:17:10 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 11 Sep 2009 16:17:10 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.20,1.21
Message-ID: <20090911161710.AD80411C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4748/devel

Modified Files:
	maven-jxr.spec 
Log Message:
BR maven-shared-plugin-testing-harness.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- maven-jxr.spec	11 Sep 2009 16:07:49 -0000	1.20
+++ maven-jxr.spec	11 Sep 2009 16:17:10 -0000	1.21
@@ -70,6 +70,7 @@ BuildRequires:  maven-doxia-sitetools
 BuildRequires:  tomcat5
 BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven-shared-plugin-testing-harness
 %else
 BuildRequires:  ant, ant-nodeps
 %endif
@@ -218,6 +219,7 @@ rm -rf $RPM_BUILD_ROOT
 - BR tomcat5.
 - BR maven-surefire-provider-junit.
 - BR maven-plugin-plugin.
+- BR maven-shared-plugin-testing-harness.
 
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-3
 - Add BR for doxia-sitetools.



From cweyl at fedoraproject.org  Fri Sep 11 16:23:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 11 Sep 2009 16:23:18 +0000 (UTC)
Subject: rpms/perl-Test-Warn/devel .cvsignore, 1.5, 1.6 perl-Test-Warn.spec, 
	1.11, 1.12 sources, 1.5, 1.6
Message-ID: <20090911162318.17DFD11C0099@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Test-Warn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5998

Modified Files:
	.cvsignore perl-Test-Warn.spec sources 
Log Message:
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- add perl default filter (pro forma)
- use _fixperms incantation
- auto-update to 0.21 (by cpan-spec-update 0.01)
- altered br on perl(Test::Builder::Tester) (0 => 1.02)
- altered req on perl(Test::Builder::Tester) (0 => 1.02)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Warn/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Dec 2008 21:10:04 -0000	1.5
+++ .cvsignore	11 Sep 2009 16:23:17 -0000	1.6
@@ -1 +1 @@
-Test-Warn-0.11.tar.gz
+Test-Warn-0.21.zip


Index: perl-Test-Warn.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Warn/devel/perl-Test-Warn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Test-Warn.spec	26 Jul 2009 17:00:21 -0000	1.11
+++ perl-Test-Warn.spec	11 Sep 2009 16:23:17 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           perl-Test-Warn
-Version:        0.11
-Release:        3%{?dist}
+Version:        0.21
+Release:        1%{?dist}
 Summary:        Perl extension to test methods for warnings
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Test-Warn/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHORNY/Test-Warn-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/Test-Warn-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -15,16 +15,17 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Sub::Uplevel) >= 0.12
 BuildRequires:  perl(Test::Builder) >= 0.13
-BuildRequires:  perl(Test::Builder::Tester)
+BuildRequires:  perl(Test::Builder::Tester) >= 1.02
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Tree::DAG_Node)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Test::Builder) >= 0.13
-Requires:       perl(Test::Builder::Tester)
+Requires:       perl(Test::Builder::Tester) >= 1.02
 Requires:       perl(Tree::DAG_Node)
 
+%{?perl_default_filter}
 
 %description
 This module provides a few convenience methods for testing warning
@@ -45,7 +46,7 @@ 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 ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
 %check
@@ -64,6 +65,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- add perl default filter (pro forma)
+- use _fixperms incantation
+- auto-update to 0.21 (by cpan-spec-update 0.01)
+- altered br on perl(Test::Builder::Tester) (0 => 1.02)
+- altered req on perl(Test::Builder::Tester) (0 => 1.02)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Warn/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Dec 2008 21:10:04 -0000	1.5
+++ sources	11 Sep 2009 16:23:17 -0000	1.6
@@ -1 +1 @@
-1000ef6d94b54ca9eb75fb994a7e8bec  Test-Warn-0.11.tar.gz
+d33c38d18d2bedac52bfdbaf94c8744d  Test-Warn-0.21.zip



From erikos at fedoraproject.org  Fri Sep 11 16:33:42 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 16:33:42 +0000 (UTC)
Subject: rpms/sugar-write/devel sugar-write.spec,1.9,1.10
Message-ID: <20090911163342.9FC5F11C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8214

Modified Files:
	sugar-write.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-2
- add build requirement gettext




Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sugar-write.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sugar-write.spec	11 Sep 2009 16:09:31 -0000	1.9
+++ sugar-write.spec	11 Sep 2009 16:33:42 -0000	1.10
@@ -1,15 +1,20 @@
 Name: sugar-write
 Version: 67
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Word processor for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.sugarlabs.org/go/Activities/Write
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  python sugar-toolkit
+BuildRequires:  sugar-toolkit
+BuildRequires:  gettext
+
 Requires: sugar python-telepathy
 Requires: pyabiword
+
 BuildArch: noarch
 
 %description
@@ -39,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-2
+- add build requirement gettext
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-1
 - Toolbar redesign
 



From epienbro at fedoraproject.org  Fri Sep 11 16:37:18 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 11 Sep 2009 16:37:18 +0000 (UTC)
Subject: rpms/mingw32-libxml2/F-11
	mingw32-libxml2-win32-pthreads-compatibility.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 mingw32-libxml2.spec, 1.6, 1.7 sources,
	1.3, 1.4 libxml2-2.7.3-ficora-parse.patch, 1.1,
	NONE mingw32-libxml2-static-build-compile-fix.patch, 1.1, NONE
Message-ID: <20090911163719.0755611C0099@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-serv8947/F-11

Modified Files:
	.cvsignore mingw32-libxml2.spec sources 
Added Files:
	mingw32-libxml2-win32-pthreads-compatibility.patch 
Removed Files:
	libxml2-2.7.3-ficora-parse.patch 
	mingw32-libxml2-static-build-compile-fix.patch 
Log Message:
* Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
- Update to 2.7.4
- Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
- Added a new patch to fix compatibility with the w32 port of pthreads
- Use %global instead of %define
- Automatically generate debuginfo subpackage (F12 only)


mingw32-libxml2-win32-pthreads-compatibility.patch:
 testThreads.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mingw32-libxml2-win32-pthreads-compatibility.patch ---
--- testThreads.c.orig	2009-09-11 18:09:00.268640135 +0200
+++ testThreads.c	2009-09-11 18:12:43.412653512 +0200
@@ -107,7 +107,7 @@
 
 	for (i = 0; i < num_threads; i++) {
 	    results[i] = NULL;
-	    tid[i] = (pthread_t) -1;
+	    memset(&tid[i], 0, sizeof(pthread_t));
 	}
 
 	for (i = 0; i < num_threads; i++) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 May 2009 14:52:50 -0000	1.3
+++ .cvsignore	11 Sep 2009 16:37:18 -0000	1.4
@@ -1 +1 @@
-libxml2-2.7.3.tar.gz
+libxml2-2.7.4.tar.gz


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/mingw32-libxml2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-libxml2.spec	10 Aug 2009 16:32:42 -0000	1.6
+++ mingw32-libxml2.spec	11 Sep 2009 16:37:18 -0000	1.7
@@ -1,12 +1,12 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libxml2
-Version:        2.7.3
-Release:        2%{?dist}
+Version:        2.7.4
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,11 +17,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
-Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
-Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+Patch1001:      mingw32-libxml2-win32-pthreads-compatibility.patch
 
 BuildArch:      noarch
 
@@ -55,8 +54,6 @@ Static version of the MinGW Windows XML 
 %prep
 %setup -q -n libxml2-%{version}
 
-%patch1 -p1
-
 %patch1000 -p1
 %patch1001 -p0
 
@@ -128,7 +125,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libxml2.a
 
+
 %changelog
+* Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
+- Update to 2.7.4
+- Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
+- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
+- Added a new patch to fix compatibility with the w32 port of pthreads
+- Use %%global instead of %%define
+
 * Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-2
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 May 2009 14:52:52 -0000	1.3
+++ sources	11 Sep 2009 16:37:18 -0000	1.4
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz


--- libxml2-2.7.3-ficora-parse.patch DELETED ---


--- mingw32-libxml2-static-build-compile-fix.patch DELETED ---



From epienbro at fedoraproject.org  Fri Sep 11 16:37:19 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 11 Sep 2009 16:37:19 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel
	mingw32-libxml2-win32-pthreads-compatibility.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 mingw32-libxml2.spec, 1.8, 1.9 sources,
	1.3, 1.4 libxml2-2.7.3-ficora-parse.patch, 1.1,
	NONE mingw32-libxml2-static-build-compile-fix.patch, 1.1, NONE
Message-ID: <20090911163719.A01A711C0099@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8947/devel

Modified Files:
	.cvsignore mingw32-libxml2.spec sources 
Added Files:
	mingw32-libxml2-win32-pthreads-compatibility.patch 
Removed Files:
	libxml2-2.7.3-ficora-parse.patch 
	mingw32-libxml2-static-build-compile-fix.patch 
Log Message:
* Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
- Update to 2.7.4
- Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
- Added a new patch to fix compatibility with the w32 port of pthreads
- Use %global instead of %define
- Automatically generate debuginfo subpackage (F12 only)


mingw32-libxml2-win32-pthreads-compatibility.patch:
 testThreads.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mingw32-libxml2-win32-pthreads-compatibility.patch ---
--- testThreads.c.orig	2009-09-11 18:09:00.268640135 +0200
+++ testThreads.c	2009-09-11 18:12:43.412653512 +0200
@@ -107,7 +107,7 @@
 
 	for (i = 0; i < num_threads; i++) {
 	    results[i] = NULL;
-	    tid[i] = (pthread_t) -1;
+	    memset(&tid[i], 0, sizeof(pthread_t));
 	}
 
 	for (i = 0; i < num_threads; i++) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 May 2009 14:52:53 -0000	1.3
+++ .cvsignore	11 Sep 2009 16:37:18 -0000	1.4
@@ -1 +1 @@
-libxml2-2.7.3.tar.gz
+libxml2-2.7.4.tar.gz


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-libxml2.spec	10 Aug 2009 16:17:22 -0000	1.8
+++ mingw32-libxml2.spec	11 Sep 2009 16:37:19 -0000	1.9
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libxml2
-Version:        2.7.3
-Release:        3%{?dist}
+Version:        2.7.4
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,15 +18,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
-Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
-Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+Patch1001:      mingw32-libxml2-win32-pthreads-compatibility.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -52,11 +52,12 @@ Group:          Development/Libraries
 Static version of the MinGW Windows XML processing library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libxml2-%{version}
 
-%patch1 -p1
-
 %patch1000 -p1
 %patch1001 -p0
 
@@ -128,7 +129,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libxml2.a
 
+
 %changelog
+* Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
+- Update to 2.7.4
+- Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
+- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
+- Added a new patch to fix compatibility with the w32 port of pthreads
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-3
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 May 2009 14:52:53 -0000	1.3
+++ sources	11 Sep 2009 16:37:19 -0000	1.4
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz


--- libxml2-2.7.3-ficora-parse.patch DELETED ---


--- mingw32-libxml2-static-build-compile-fix.patch DELETED ---



From erikos at fedoraproject.org  Fri Sep 11 16:44:34 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 16:44:34 +0000 (UTC)
Subject: rpms/sugar-browse/devel sugar-browse.spec,1.19,1.20
Message-ID: <20090911164434.2961311C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11506

Modified Files:
	sugar-browse.spec 
Log Message:
* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 112-2
- add gettext build requirement




Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sugar-browse.spec	11 Sep 2009 13:18:25 -0000	1.19
+++ sugar-browse.spec	11 Sep 2009 16:44:33 -0000	1.20
@@ -1,6 +1,6 @@
 Name: sugar-browse
 Version: 112
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -8,7 +8,10 @@ URL: http://wiki.laptop.org/go/Browse
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Browse/Browse-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: python sugar-toolkit
+BuildRequires: python
+BuildRequires: sugar-toolkit
+BuildRequires: gettext
+
 Requires: hulahop
 
 BuildArch: noarch
@@ -40,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 112-2
+- add gettext build requirement
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 112-1
 - Able to download Data URIs #1029 (Lucian Branescu)
 - Don't choke on Lang=C #979



From rdieter at fedoraproject.org  Fri Sep 11 16:47:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 16:47:38 +0000 (UTC)
Subject: rpms/wv2/devel wv2.spec,1.17,1.18
Message-ID: <20090911164738.1326211C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14936

Modified Files:
	wv2.spec 
Log Message:
workaround ppc64 bogosity for now



Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- wv2.spec	11 Sep 2009 15:56:41 -0000	1.17
+++ wv2.spec	11 Sep 2009 16:47:37 -0000	1.18
@@ -51,6 +51,7 @@ The wv2-devel package includes the heade
 
 
 %build
+
 %cmake .
 
 make %{?_smp_mflags}
@@ -65,7 +66,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %check
-make test %{?_smp_mflags}
+# checks currently fail on ppc64, appears to be a toolchain prob
+%ifarch ppc64
+make -k test ||: 
+%else
+make -k test
+%endif
 
 
 %clean



From rdieter at fedoraproject.org  Fri Sep 11 16:49:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 16:49:00 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.18,
	1.19 koffice-langpack.spec, 1.24, 1.25 sources, 1.19, 1.20
Message-ID: <20090911164900.910AC11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15245

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.82-1
- koffice-l10n-2.0.82



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	27 Aug 2009 02:36:22 -0000	1.18
+++ .cvsignore	11 Sep 2009 16:49:00 -0000	1.19
@@ -1,26 +1,27 @@
-koffice-l10n-ca-2.0.81.tar.bz2
-koffice-l10n-da-2.0.81.tar.bz2
-koffice-l10n-de-2.0.81.tar.bz2
-koffice-l10n-el-2.0.81.tar.bz2
-koffice-l10n-en_GB-2.0.81.tar.bz2
-koffice-l10n-es-2.0.81.tar.bz2
-koffice-l10n-et-2.0.81.tar.bz2
-koffice-l10n-fr-2.0.81.tar.bz2
-koffice-l10n-fy-2.0.81.tar.bz2
-koffice-l10n-gl-2.0.81.tar.bz2
-koffice-l10n-hi-2.0.81.tar.bz2
-koffice-l10n-it-2.0.81.tar.bz2
-koffice-l10n-ja-2.0.81.tar.bz2
-koffice-l10n-kk-2.0.81.tar.bz2
-koffice-l10n-nb-2.0.81.tar.bz2
-koffice-l10n-nds-2.0.81.tar.bz2
-koffice-l10n-nl-2.0.81.tar.bz2
-koffice-l10n-pl-2.0.81.tar.bz2
-koffice-l10n-pt-2.0.81.tar.bz2
-koffice-l10n-pt_BR-2.0.81.tar.bz2
-koffice-l10n-sv-2.0.81.tar.bz2
-koffice-l10n-tr-2.0.81.tar.bz2
-koffice-l10n-uk-2.0.81.tar.bz2
-koffice-l10n-wa-2.0.81.tar.bz2
-koffice-l10n-zh_CN-2.0.81.tar.bz2
-koffice-l10n-zh_TW-2.0.81.tar.bz2
+koffice-l10n-ca-2.0.82.tar.bz2
+koffice-l10n-cs-2.0.82.tar.bz2
+koffice-l10n-da-2.0.82.tar.bz2
+koffice-l10n-de-2.0.82.tar.bz2
+koffice-l10n-el-2.0.82.tar.bz2
+koffice-l10n-en_GB-2.0.82.tar.bz2
+koffice-l10n-es-2.0.82.tar.bz2
+koffice-l10n-et-2.0.82.tar.bz2
+koffice-l10n-fr-2.0.82.tar.bz2
+koffice-l10n-fy-2.0.82.tar.bz2
+koffice-l10n-gl-2.0.82.tar.bz2
+koffice-l10n-hi-2.0.82.tar.bz2
+koffice-l10n-it-2.0.82.tar.bz2
+koffice-l10n-ja-2.0.82.tar.bz2
+koffice-l10n-kk-2.0.82.tar.bz2
+koffice-l10n-nb-2.0.82.tar.bz2
+koffice-l10n-nds-2.0.82.tar.bz2
+koffice-l10n-nl-2.0.82.tar.bz2
+koffice-l10n-pl-2.0.82.tar.bz2
+koffice-l10n-pt-2.0.82.tar.bz2
+koffice-l10n-pt_BR-2.0.82.tar.bz2
+koffice-l10n-sv-2.0.82.tar.bz2
+koffice-l10n-tr-2.0.82.tar.bz2
+koffice-l10n-uk-2.0.82.tar.bz2
+koffice-l10n-wa-2.0.82.tar.bz2
+koffice-l10n-zh_CN-2.0.82.tar.bz2
+koffice-l10n-zh_TW-2.0.82.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- koffice-langpack.spec	27 Aug 2009 02:36:22 -0000	1.24
+++ koffice-langpack.spec	11 Sep 2009 16:49:00 -0000	1.25
@@ -1,9 +1,9 @@
 
-%define koffice_core_version 2:2.0.81
+%define koffice_core_version 2:2.0
 
 Name:           koffice-langpack
 Epoch:          1
-Version:        2.0.81
+Version:        2.0.82
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
@@ -18,7 +18,7 @@ Source0: teamnames
 #Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
 #Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
-#Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
 #Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
 Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
@@ -239,6 +239,13 @@ Requires:       koffice-core >= %{koffic
 %description hi
 Provides additional Hindi translations for koffice
 
+%package hne
+Summary:        Chhattisgarhi language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description hne
+Provides additional Chhattisgarhi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -479,7 +486,7 @@ Provides additional traditional Chinese 
 
 
 %prep
-%setup -T -c -q -n %{name} -a 4 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 -a 46
+%setup -T -c -q -n %{name} -a 4 -a 5 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 -a 46
 
 
 %build
@@ -542,10 +549,10 @@ rm -rf %{buildroot}
 %lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
 %lang(ca) %{_kde4_docdir}/HTML/ca/*
 
-#files cs
-#defattr(-,root,root,-)
-#lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-#lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
+%files cs
+%defattr(-,root,root,-)
+%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
 
 #files cy
 #defattr(-,root,root,-)
@@ -753,6 +760,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.82-1
+- koffice-l10n-2.0.82
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.81-1
 - koffice-l10n-2.0.81
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	27 Aug 2009 02:36:22 -0000	1.19
+++ sources	11 Sep 2009 16:49:00 -0000	1.20
@@ -1,26 +1,27 @@
-db9baa264391d866725da109723d89b4  koffice-l10n-ca-2.0.81.tar.bz2
-1998b9e900c2de9034959a1dd8c98f5d  koffice-l10n-da-2.0.81.tar.bz2
-30a568c728ad4f797723de6ebca87e06  koffice-l10n-de-2.0.81.tar.bz2
-5ab5cda56fdc1f67178918b305623c4c  koffice-l10n-el-2.0.81.tar.bz2
-eff3234347f61218d3de0ab8b160cd7d  koffice-l10n-en_GB-2.0.81.tar.bz2
-83a7349cbdfa2ff12a8bbf8b43f5eae1  koffice-l10n-es-2.0.81.tar.bz2
-92de9995d889d59750f042dc1504d38d  koffice-l10n-et-2.0.81.tar.bz2
-52c7f04e1563c8b178999404d4b7e9cf  koffice-l10n-fr-2.0.81.tar.bz2
-77343801b21a3e14b1b4ee53be689deb  koffice-l10n-fy-2.0.81.tar.bz2
-6e5604fcb3265752bf10ff580777e221  koffice-l10n-gl-2.0.81.tar.bz2
-236c53e26745977f467b8d6058cab3ad  koffice-l10n-hi-2.0.81.tar.bz2
-6501bfc47e9e6a9a115975d13a5f649d  koffice-l10n-it-2.0.81.tar.bz2
-56454c98e0589ddc0ceb091a5a169915  koffice-l10n-ja-2.0.81.tar.bz2
-a7d4ed8906c65e88ff4e38df49a73231  koffice-l10n-kk-2.0.81.tar.bz2
-634aec6798c24a985796a40c475f9282  koffice-l10n-nb-2.0.81.tar.bz2
-1fe7fe871a8012b212c267e478224366  koffice-l10n-nds-2.0.81.tar.bz2
-04b952cc7450521747c047bdbe76a0fa  koffice-l10n-nl-2.0.81.tar.bz2
-9fe45a42ba8eb5963a764aa49fda3ce1  koffice-l10n-pl-2.0.81.tar.bz2
-8bb7a72c2eabca106542b16259cb034a  koffice-l10n-pt-2.0.81.tar.bz2
-c8ce97df4335edc57dca805f5ec9f737  koffice-l10n-pt_BR-2.0.81.tar.bz2
-9e3e2c67589956901866974c1d9a5e8c  koffice-l10n-sv-2.0.81.tar.bz2
-1e162ffbd40f83445e4d3d81cca5d531  koffice-l10n-tr-2.0.81.tar.bz2
-ecf805a6d20ef12e87cc4b6703821d9b  koffice-l10n-uk-2.0.81.tar.bz2
-cce0ec7edb8b2ed9f2f7fe6c6012cafe  koffice-l10n-wa-2.0.81.tar.bz2
-d4a826a498699bc286119b30d88de5d2  koffice-l10n-zh_CN-2.0.81.tar.bz2
-a95b6256e50cf4a3ca9e522fbd529bc0  koffice-l10n-zh_TW-2.0.81.tar.bz2
+a489da403b2306846cab2650961057b2  koffice-l10n-ca-2.0.82.tar.bz2
+060b87a69478cbd8d87f3c253c4480d7  koffice-l10n-cs-2.0.82.tar.bz2
+3632169afc6d704bd5e76c62bcf45a19  koffice-l10n-da-2.0.82.tar.bz2
+b7cbb66193a64717bdbfbb3d3c9d7203  koffice-l10n-de-2.0.82.tar.bz2
+4b99c7c2c329c8a51dc7065ad5fa8f85  koffice-l10n-el-2.0.82.tar.bz2
+23786ccad766f23a1c5138123d074218  koffice-l10n-en_GB-2.0.82.tar.bz2
+c0728cad572b4085fa383d7b5180a3dd  koffice-l10n-es-2.0.82.tar.bz2
+feebd286f5ab1635f610789d3249a197  koffice-l10n-et-2.0.82.tar.bz2
+081c93ab407a88a69be4c2aa5d5f40c1  koffice-l10n-fr-2.0.82.tar.bz2
+8df7c56c831d4372fdc5dddd89899cff  koffice-l10n-fy-2.0.82.tar.bz2
+4e4a11bb33a68ecf743f5e207c049f72  koffice-l10n-gl-2.0.82.tar.bz2
+0d34cacccdd4515f36d1267de2ed7d0a  koffice-l10n-hi-2.0.82.tar.bz2
+f22d04e383da3865a1f6d316306e9c44  koffice-l10n-it-2.0.82.tar.bz2
+765192519046200c874bf94abb2beb55  koffice-l10n-ja-2.0.82.tar.bz2
+4de456734b51f20dba6ea7c73e033847  koffice-l10n-kk-2.0.82.tar.bz2
+344324029f2c8c334242c2baa7180352  koffice-l10n-nb-2.0.82.tar.bz2
+c36a9a0f800be7af524e20bf014245bf  koffice-l10n-nds-2.0.82.tar.bz2
+fa1c11cad5e209578e724267ede76a33  koffice-l10n-nl-2.0.82.tar.bz2
+2b1ef56854f8968e9ad18a0ecc360730  koffice-l10n-pl-2.0.82.tar.bz2
+750e610587d1b1eb1892fbd0bbe8049c  koffice-l10n-pt-2.0.82.tar.bz2
+9be672574f4a33af0ddd88ea2f8e2199  koffice-l10n-pt_BR-2.0.82.tar.bz2
+2ced61b1eab5600a3f419b7e71bf2d8d  koffice-l10n-sv-2.0.82.tar.bz2
+ee989ed1918474cd587184934ede22d8  koffice-l10n-tr-2.0.82.tar.bz2
+e06154decc45b9f29be3918bfb86b322  koffice-l10n-uk-2.0.82.tar.bz2
+14b76f545364f4e07d045070e7ed18be  koffice-l10n-wa-2.0.82.tar.bz2
+35cf6ff2923b540043a449f995effd4c  koffice-l10n-zh_CN-2.0.82.tar.bz2
+d649d535b4c34581623a9eb1475d0fdc  koffice-l10n-zh_TW-2.0.82.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:09 +0000
Subject: [pkgdb] youtube-dl: till has requested watchcommits
Message-ID: <20090911165409.A7B3610F87A@bastion2.fedora.phx.redhat.com>

till has requested the watchcommits acl on youtube-dl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:10 +0000
Subject: [pkgdb] youtube-dl: till has requested commit
Message-ID: <20090911165410.171DC10F890@bastion2.fedora.phx.redhat.com>

till has requested the commit acl on youtube-dl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:22 +0000
Subject: [pkgdb] youtube-dl: till has requested approveacls
Message-ID: <20090911165422.BAA5710F86F@bastion2.fedora.phx.redhat.com>

till has requested the approveacls acl on youtube-dl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:25 +0000
Subject: [pkgdb] youtube-dl: till has requested watchbugzilla
Message-ID: <20090911165425.CD4C310F895@bastion2.fedora.phx.redhat.com>

till has requested the watchbugzilla acl on youtube-dl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:38 +0000
Subject: [pkgdb] youtube-dl: till has requested watchbugzilla
Message-ID: <20090911165438.6A2F210F881@bastion2.fedora.phx.redhat.com>

till has requested the watchbugzilla acl on youtube-dl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:39 +0000
Subject: [pkgdb] youtube-dl: till has requested watchcommits
Message-ID: <20090911165439.20A6110F893@bastion2.fedora.phx.redhat.com>

till has requested the watchcommits acl on youtube-dl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:41 +0000
Subject: [pkgdb] youtube-dl: till has requested commit
Message-ID: <20090911165441.26E7410F89D@bastion2.fedora.phx.redhat.com>

till has requested the commit acl on youtube-dl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:42 +0000
Subject: [pkgdb] youtube-dl: till has requested approveacls
Message-ID: <20090911165442.4106910F8A1@bastion2.fedora.phx.redhat.com>

till has requested the approveacls acl on youtube-dl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:48 +0000
Subject: [pkgdb] youtube-dl: till has requested watchbugzilla
Message-ID: <20090911165448.AD39E10F8A3@bastion2.fedora.phx.redhat.com>

till has requested the watchbugzilla acl on youtube-dl (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:49 +0000
Subject: [pkgdb] youtube-dl: till has requested watchcommits
Message-ID: <20090911165449.8329A10F8A6@bastion2.fedora.phx.redhat.com>

till has requested the watchcommits acl on youtube-dl (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:50 +0000
Subject: [pkgdb] youtube-dl: till has requested commit
Message-ID: <20090911165450.D59CE10F8A9@bastion2.fedora.phx.redhat.com>

till has requested the commit acl on youtube-dl (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 11 16:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 16:54:52 +0000
Subject: [pkgdb] youtube-dl: till has requested approveacls
Message-ID: <20090911165452.EFB8410F8AC@bastion2.fedora.phx.redhat.com>

till has requested the approveacls acl on youtube-dl (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/youtube-dl



From erikos at fedoraproject.org  Fri Sep 11 16:57:04 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 16:57:04 +0000 (UTC)
Subject: rpms/sugar-log/devel sugar-log.spec,1.11,1.12
Message-ID: <20090911165704.BC77D11C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17703

Modified Files:
	sugar-log.spec 
Log Message:
* Fri Sep 11 2009 Schampijer <simon at schampijer.de> - 23-2
* add gettext build requirement




Index: sugar-log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sugar-log.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sugar-log.spec	11 Sep 2009 14:22:06 -0000	1.11
+++ sugar-log.spec	11 Sep 2009 16:57:04 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           sugar-log
 Version:        23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log activity for Sugar
 
 Group:          Sugar/Activities
@@ -12,6 +12,7 @@ BuildArch:      noarch
 
 BuildRequires:  python 
 BuildRequires:  sugar-toolkit
+BuildRequires:  gettext
 
 Requires:       sugar
 
@@ -45,6 +46,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Schampijer <simon at schampijer.de> - 23-2
+* add gettext build requirement
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 23-1
 - Fix Tamil translation
 



From bpepple at fedoraproject.org  Fri Sep 11 17:05:18 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 11 Sep 2009 17:05:18 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-11 telepathy-gabble-rejoin-dbus-tube.patch, 
	NONE, 1.1 telepathy-gabble.spec, 1.55, 1.56
Message-ID: <20090911170518.6FFF911C0099@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19338

Modified Files:
	telepathy-gabble.spec 
Added Files:
	telepathy-gabble-rejoin-dbus-tube.patch 
Log Message:
* Wed Sep  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-3
- Backport patch to allow rejoining of dbus tubes.


telepathy-gabble-rejoin-dbus-tube.patch:
 tube-dbus.c      |   20 +++++++++++++++-----
 tube-dbus.c.orig |only
 tube-dbus.h      |    3 ++-
 tubes-channel.c  |   19 +++++++++++--------
 4 files changed, 28 insertions(+), 14 deletions(-)

--- NEW FILE telepathy-gabble-rejoin-dbus-tube.patch ---
diff -urp telepathy-gabble-0.7.26.OLD/src/tube-dbus.c telepathy-gabble-0.7.26/src/tube-dbus.c
--- telepathy-gabble-0.7.26.OLD/src/tube-dbus.c	2009-04-02 14:03:31.000000000 -0400
+++ telepathy-gabble-0.7.26/src/tube-dbus.c	2009-09-09 09:31:45.106270421 -0400
@@ -157,6 +157,7 @@ struct _GabbleTubeDBusPrivate
    * incoming tubes, always TRUE.
    */
   gboolean offered;
+  gboolean requested;
 
   /* our unique D-Bus name on the virtual tube bus (NULL for 1-1 D-Bus tubes)*/
   gchar *dbus_local_name;
@@ -733,8 +734,7 @@ gabble_tube_dbus_get_property (GObject *
         }
         break;
       case PROP_REQUESTED:
-        g_value_set_boolean (value,
-            (priv->initiator == priv->self_handle));
+        g_value_set_boolean (value, priv->requested);
         break;
       case PROP_INITIATOR_ID:
           {
@@ -838,6 +838,9 @@ gabble_tube_dbus_set_property (GObject *
       case PROP_MUC:
         priv->muc = g_value_get_object (value);
         break;
+      case PROP_REQUESTED:
+        priv->requested = g_value_get_boolean (value);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -927,7 +930,12 @@ gabble_tube_dbus_constructor (GType type
       g_assert (priv->muc == NULL);
     }
 
-  if (priv->initiator == priv->self_handle)
+  /* Tube needs to be offered if we initiated AND requested it. Being
+   * the initiator is not enough as we could re-join a muc containing and old
+   * tube we created when we were in this room some time ago. In that case, we
+   * have to accept it if we want to re-join the tube. */
+  if (priv->initiator == priv->self_handle &&
+      priv->requested)
     {
       priv->offered = FALSE;
     }
@@ -1098,7 +1106,7 @@ gabble_tube_dbus_class_init (GabbleTubeD
   param_spec = g_param_spec_boolean ("requested", "Requested?",
       "True if this channel was requested by the local user",
       FALSE,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_REQUESTED, param_spec);
 
   param_spec = g_param_spec_object ("muc", "GabbleMucChannel object",
@@ -1484,7 +1492,8 @@ gabble_tube_dbus_new (GabbleConnection *
                       const gchar *stream_id,
                       guint id,
                       GabbleBytestreamIface *bytestream,
-                      GabbleMucChannel *muc)
+                      GabbleMucChannel *muc,
+                      gboolean requested)
 {
   GabbleTubeDBus *tube;
   gchar *object_path;
@@ -1504,6 +1513,7 @@ gabble_tube_dbus_new (GabbleConnection *
       "stream-id", stream_id,
       "id", id,
       "muc", muc,
+      "requested", requested,
       NULL);
 
   if (bytestream != NULL)
Only in telepathy-gabble-0.7.26/src: tube-dbus.c.orig
diff -urp telepathy-gabble-0.7.26.OLD/src/tube-dbus.h telepathy-gabble-0.7.26/src/tube-dbus.h
--- telepathy-gabble-0.7.26.OLD/src/tube-dbus.h	2009-04-02 11:45:38.000000000 -0400
+++ telepathy-gabble-0.7.26/src/tube-dbus.h	2009-09-09 09:31:37.877270412 -0400
@@ -72,7 +72,8 @@ GType gabble_tube_dbus_get_type (void);
 GabbleTubeDBus *gabble_tube_dbus_new (GabbleConnection *conn, TpHandle handle,
     TpHandleType handle_type, TpHandle self_handle, TpHandle initiator,
     const gchar *service, GHashTable *parameters, const gchar *stream_id,
-    guint id, GabbleBytestreamIface *bytestream, GabbleMucChannel *muc);
+    guint id, GabbleBytestreamIface *bytestream, GabbleMucChannel *muc,
+    gboolean requested);
 
 gboolean gabble_tube_dbus_add_name (GabbleTubeDBus *tube, TpHandle handle,
     const gchar *name);
diff -urp telepathy-gabble-0.7.26.OLD/src/tubes-channel.c telepathy-gabble-0.7.26/src/tubes-channel.c
--- telepathy-gabble-0.7.26.OLD/src/tubes-channel.c	2009-04-02 11:45:38.000000000 -0400
+++ telepathy-gabble-0.7.26/src/tubes-channel.c	2009-09-09 09:31:37.879268142 -0400
@@ -539,7 +539,8 @@ create_new_tube (GabbleTubesChannel *sel
                  GHashTable *parameters,
                  const gchar *stream_id,
                  guint tube_id,
-                 GabbleBytestreamIface *bytestream)
+                 GabbleBytestreamIface *bytestream,
+                 gboolean requested)
 {
   GabbleTubesChannelPrivate *priv = GABBLE_TUBES_CHANNEL_GET_PRIVATE (self);
   GabbleTubeIface *tube;
@@ -550,7 +551,8 @@ create_new_tube (GabbleTubesChannel *sel
     case TP_TUBE_TYPE_DBUS:
       tube = GABBLE_TUBE_IFACE (gabble_tube_dbus_new (priv->conn,
           priv->handle, priv->handle_type, priv->self_handle, initiator,
-          service, parameters, stream_id, tube_id, bytestream, self->muc));
+          service, parameters, stream_id, tube_id, bytestream, self->muc,
+          requested));
       break;
     case TP_TUBE_TYPE_STREAM:
       tube = GABBLE_TUBE_IFACE (gabble_tube_stream_new (priv->conn,
@@ -901,7 +903,7 @@ gabble_tubes_channel_presence_updated (G
                 }
 
               tube = create_new_tube (self, type, initiator_handle,
-                  service, parameters, stream_id, tube_id, NULL);
+                  service, parameters, stream_id, tube_id, NULL, FALSE);
 
               tp_channel_manager_emit_new_channel (priv->conn->muc_factory,
                   TP_EXPORTABLE_CHANNEL (tube), NULL);
@@ -1223,7 +1225,8 @@ gabble_tubes_channel_tube_si_offered (Ga
     }
 
   tube = create_new_tube (self, type, priv->handle, service,
-      parameters, stream_id, tube_id, (GabbleBytestreamIface *) bytestream);
+      parameters, stream_id, tube_id, (GabbleBytestreamIface *) bytestream,
+      FALSE);
 
   tp_channel_manager_emit_new_channel (priv->conn->private_tubes_factory,
       TP_EXPORTABLE_CHANNEL (tube), NULL);
@@ -1401,7 +1404,7 @@ tube_msg_offered (GabbleTubesChannel *se
     }
 
   tube = create_new_tube (self, type, priv->handle, service,
-      parameters, NULL, tube_id, NULL);
+      parameters, NULL, tube_id, NULL, FALSE);
 
   tp_channel_manager_emit_new_channel (priv->conn->private_tubes_factory,
       TP_EXPORTABLE_CHANNEL (tube), NULL);
@@ -1539,7 +1542,7 @@ GabbleTubeIface *gabble_tubes_channel_tu
 
   stream_id = gabble_bytestream_factory_generate_stream_id ();
   tube = create_new_tube (self, type, priv->self_handle, service,
-      parameters, stream_id, tube_id, NULL);
+      parameters, stream_id, tube_id, NULL, TRUE);
   g_free (stream_id);
   g_hash_table_destroy (parameters);
 
@@ -1575,7 +1578,7 @@ gabble_tubes_channel_offer_d_bus_tube (T
   tube_id = generate_tube_id ();
 
   tube = create_new_tube (self, TP_TUBE_TYPE_DBUS, priv->self_handle,
-      service, parameters, (const gchar *) stream_id, tube_id, NULL);
+      service, parameters, (const gchar *) stream_id, tube_id, NULL, TRUE);
 
   if (!gabble_tube_dbus_offer (GABBLE_TUBE_DBUS (tube), &error))
     {
@@ -1653,7 +1656,7 @@ gabble_tubes_channel_offer_stream_tube (
   tube_id = generate_tube_id ();
 
   tube = create_new_tube (self, TP_TUBE_TYPE_STREAM, priv->self_handle,
-      service, parameters, (const gchar *) stream_id, tube_id, NULL);
+      service, parameters, (const gchar *) stream_id, tube_id, NULL, TRUE);
 
   g_object_set (tube,
       "address-type", address_type,


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-11/telepathy-gabble.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- telepathy-gabble.spec	23 Aug 2009 22:12:56 -0000	1.55
+++ telepathy-gabble.spec	11 Sep 2009 17:05:18 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.7.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -11,6 +11,7 @@ Source0:        http://telepathy.freedes
 # Patch to add missing pkgconfig check for gthread-2.0
 # https://bugs.freedesktop.org/show_bug.cgi?id=20937 
 Patch0:		%{name}-0.7.24-gthread.patch
+Patch1:		%{name}-rejoin-dbus-tube.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -36,7 +37,7 @@ chats and voice calls.
 %prep
 %setup -q
 %patch0 -p1 -b .gthread
-
+%patch1 -p1 -b .dbus
 
 %build
 autoreconf
@@ -66,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-3
+- Backport patch to allow rejoining of dbus tubes.
+
 * Sun Aug 23 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-2
 - Enable uuid support. 
 



From nhorman at fedoraproject.org  Fri Sep 11 17:09:52 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri, 11 Sep 2009 17:09:52 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.151,1.152
Message-ID: <20090911170952.0EA3311C0099@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20270

Modified Files:
	kexec-tools.spec 
Log Message:
Resolves: bz 522415


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kexec-tools.spec	10 Sep 2009 14:36:34 -0000	1.151
+++ kexec-tools.spec	11 Sep 2009 17:09:51 -0000	1.152
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -261,6 +261,9 @@ done
 
 
 %changelog
+* Fri Sep 11 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-26
+- Rebuild for translation team (bz 522415)
+
 * Thu Sep 10 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-25
 - Fix dracut module check file (bz 522486)
 



From epienbro at fedoraproject.org  Fri Sep 11 17:15:00 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 11 Sep 2009 17:15:00 +0000 (UTC)
Subject: rpms/mingw32-libxml2/F-11
	mingw32-libxml2-static-build-compile-fix.patch, 1.2,
	1.3 mingw32-libxml2.spec, 1.7, 1.8
Message-ID: <20090911171500.69B9611C0099@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-serv21253/F-11

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	mingw32-libxml2-static-build-compile-fix.patch 
Log Message:
Re-added mingw32-libxml2-static-build-compile-fix.patch
Looks like it's still needed after all


mingw32-libxml2-static-build-compile-fix.patch:
 threads.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mingw32-libxml2-static-build-compile-fix.patch
===================================================================
RCS file: mingw32-libxml2-static-build-compile-fix.patch
diff -N mingw32-libxml2-static-build-compile-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mingw32-libxml2-static-build-compile-fix.patch	11 Sep 2009 17:15:00 -0000	1.3
@@ -0,0 +1,11 @@
+--- threads.c.orig	2009-09-10 17:03:39.000000000 +0200
++++ threads.c	2009-09-11 19:00:59.660192916 +0200
+@@ -993,7 +993,7 @@
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+ #if defined(LIBXML_STATIC_FOR_DLL)
+ BOOL XMLCALL
+-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
++xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved)
+ #else
+ BOOL WINAPI
+ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/mingw32-libxml2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-libxml2.spec	11 Sep 2009 16:37:18 -0000	1.7
+++ mingw32-libxml2.spec	11 Sep 2009 17:15:00 -0000	1.8
@@ -20,7 +20,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
-Patch1001:      mingw32-libxml2-win32-pthreads-compatibility.patch
+Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+Patch1002:      mingw32-libxml2-win32-pthreads-compatibility.patch
 
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@ Static version of the MinGW Windows XML 
 
 %patch1000 -p1
 %patch1001 -p0
+%patch1002 -p0
 
 # Patched configure.in, so rebuild configure.
 libtoolize --force --copy
@@ -130,7 +132,6 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
 - Update to 2.7.4
 - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
-- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
 - Added a new patch to fix compatibility with the w32 port of pthreads
 - Use %%global instead of %%define
 



From epienbro at fedoraproject.org  Fri Sep 11 17:15:00 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 11 Sep 2009 17:15:00 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel
	mingw32-libxml2-static-build-compile-fix.patch, 1.2,
	1.3 mingw32-libxml2.spec, 1.9, 1.10
Message-ID: <20090911171500.92A4811C0099@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21253/devel

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	mingw32-libxml2-static-build-compile-fix.patch 
Log Message:
Re-added mingw32-libxml2-static-build-compile-fix.patch
Looks like it's still needed after all


mingw32-libxml2-static-build-compile-fix.patch:
 threads.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mingw32-libxml2-static-build-compile-fix.patch
===================================================================
RCS file: mingw32-libxml2-static-build-compile-fix.patch
diff -N mingw32-libxml2-static-build-compile-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mingw32-libxml2-static-build-compile-fix.patch	11 Sep 2009 17:15:00 -0000	1.3
@@ -0,0 +1,11 @@
+--- threads.c.orig	2009-09-10 17:03:39.000000000 +0200
++++ threads.c	2009-09-11 19:00:59.660192916 +0200
+@@ -993,7 +993,7 @@
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+ #if defined(LIBXML_STATIC_FOR_DLL)
+ BOOL XMLCALL
+-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
++xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved)
+ #else
+ BOOL WINAPI
+ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-libxml2.spec	11 Sep 2009 16:37:19 -0000	1.9
+++ mingw32-libxml2.spec	11 Sep 2009 17:15:00 -0000	1.10
@@ -21,7 +21,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
-Patch1001:      mingw32-libxml2-win32-pthreads-compatibility.patch
+Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+Patch1002:      mingw32-libxml2-win32-pthreads-compatibility.patch
 
 BuildArch:      noarch
 
@@ -60,6 +61,7 @@ Static version of the MinGW Windows XML 
 
 %patch1000 -p1
 %patch1001 -p0
+%patch1002 -p0
 
 # Patched configure.in, so rebuild configure.
 libtoolize --force --copy
@@ -134,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
 - Update to 2.7.4
 - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
-- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
 - Added a new patch to fix compatibility with the w32 port of pthreads
 - Use %%global instead of %%define
 - Automatically generate debuginfo subpackage



From pkgdb at fedoraproject.org  Fri Sep 11 17:15:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:15:24 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171524.BB44210F89A@bastion2.fedora.phx.redhat.com>

dledford has set the watchbugzilla acl on openmpi (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:15:27 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171527.9F1AA10F881@bastion2.fedora.phx.redhat.com>

dledford has set the watchcommits acl on openmpi (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:15:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:15:30 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171531.0E63F10F89B@bastion2.fedora.phx.redhat.com>

dledford has set the commit acl on openmpi (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:15:34 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171534.40FF410F89D@bastion2.fedora.phx.redhat.com>

dledford has set the approveacls acl on openmpi (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:15:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:15:56 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171556.7F46710F893@bastion2.fedora.phx.redhat.com>

dledford has set the watchbugzilla acl on openmpi (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:15:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:15:58 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171558.BA47210F89A@bastion2.fedora.phx.redhat.com>

dledford has set the watchcommits acl on openmpi (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:16:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:16:02 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171602.B8EC610F86F@bastion2.fedora.phx.redhat.com>

dledford has set the commit acl on openmpi (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:16:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:16:05 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171605.6941710F8A1@bastion2.fedora.phx.redhat.com>

dledford has set the approveacls acl on openmpi (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:16:15 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171615.35F7510F8A4@bastion2.fedora.phx.redhat.com>

dledford has set the watchbugzilla acl on openmpi (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:16:18 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171618.11DDE10F8AA@bastion2.fedora.phx.redhat.com>

dledford has set the watchcommits acl on openmpi (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:16:20 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171621.073F010F8B0@bastion2.fedora.phx.redhat.com>

dledford has set the commit acl on openmpi (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From pkgdb at fedoraproject.org  Fri Sep 11 17:16:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 17:16:23 +0000
Subject: [pkgdb] openmpi had acl change status
Message-ID: <20090911171623.83B1210F8B4@bastion2.fedora.phx.redhat.com>

dledford has set the approveacls acl on openmpi (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openmpi



From ausil at fedoraproject.org  Fri Sep 11 17:17:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 11 Sep 2009 17:17:18 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.296, 1.297 comps-f12.xml.in, 1.113,
	1.114 comps-f13.xml.in, 1.5, 1.6
Message-ID: <20090911171718.E0E9311C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21982

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
add silo to the core list



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- comps-f11.xml.in	9 Sep 2009 19:06:59 -0000	1.296
+++ comps-f11.xml.in	11 Sep 2009 17:17:18 -0000	1.297
@@ -747,6 +747,7 @@
       <packagereq type="default">ppc64-utils</packagereq>
       <packagereq type="default">s390utils</packagereq>
       <packagereq type="default">yaboot</packagereq>
+      <packagereq type="default">silo</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- comps-f12.xml.in	11 Sep 2009 00:31:01 -0000	1.113
+++ comps-f12.xml.in	11 Sep 2009 17:17:18 -0000	1.114
@@ -782,6 +782,7 @@
       <packagereq type="default">s390utils</packagereq>
       <packagereq type="default">sendmail</packagereq>
       <packagereq type="default">yaboot</packagereq>
+      <packagereq type="default">silo</packagereq>
     </packagelist>
   </group>
   <!-- 


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- comps-f13.xml.in	11 Sep 2009 00:31:01 -0000	1.5
+++ comps-f13.xml.in	11 Sep 2009 17:17:18 -0000	1.6
@@ -782,6 +782,7 @@
       <packagereq type="default">sendmail</packagereq>
       <packagereq type="default">s390utils</packagereq>
       <packagereq type="default">yaboot</packagereq>
+      <packagereq type="default">silo</packagereq>
     </packagelist>
   </group>
   <!-- 



From erikos at fedoraproject.org  Fri Sep 11 17:27:55 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 17:27:55 +0000 (UTC)
Subject: rpms/sugar-imageviewer/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sugar-imageviewer.spec, 1.8, 1.9
Message-ID: <20090911172755.C3B3A11C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-imageviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25288

Modified Files:
	.cvsignore sources sugar-imageviewer.spec 
Log Message:
* Fri Sep 09 2009 Simon Schampijer <simon at schampijer.de> - 11-1
- Switch to new toolbar system
- Show transfer progress
- Updated translations for Arabic, Dutch, French, Italian, Japanese
- New languages
- Do not keep on (re)loading the file continuously
- Misc. cleanups 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Mar 2009 20:04:33 -0000	1.4
+++ .cvsignore	11 Sep 2009 17:27:55 -0000	1.5
@@ -1 +1 @@
-ImageViewer-7.tar.bz2
+ImageViewer-11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Mar 2009 20:04:33 -0000	1.4
+++ sources	11 Sep 2009 17:27:55 -0000	1.5
@@ -1 +1 @@
-c7873f0cbb623a75783d3d17198c5d71  ImageViewer-7.tar.bz2
+0e453a701ff4658a03906540d3b50818  ImageViewer-11.tar.bz2


Index: sugar-imageviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/sugar-imageviewer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sugar-imageviewer.spec	1 Aug 2009 09:10:07 -0000	1.8
+++ sugar-imageviewer.spec	11 Sep 2009 17:27:55 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           sugar-imageviewer
-Version:        7
-Release:        3%{?dist}
+Version:        11
+Release:        1%{?dist}
 Summary:        Simple Image viewer for Sugar
 
 Group:          Sugar/Activities
@@ -12,6 +12,7 @@ BuildArch:      noarch
 
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
+BuildRequires: 	gettext
 
 Requires:       sugar
 
@@ -44,6 +45,14 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Fri Sep 09 2009 Simon Schampijer <simon at schampijer.de> - 11-1
+- Switch to new toolbar system
+- Show transfer progress
+- Updated translations for Arabic, Dutch, French, Italian, Japanese
+- New languages
+- Do not keep on (re)loading the file continuously
+- Misc. cleanups 
+
 * Sat Aug 01 2009 Fabian Affolter <fabian at bernewireless.net> - 7-3
 - Minor changes
 



From erikos at fedoraproject.org  Fri Sep 11 17:29:10 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 11 Sep 2009 17:29:10 +0000 (UTC)
Subject: rpms/sugar-terminal/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-terminal.spec, 1.8, 1.9
Message-ID: <20090911172910.0904C11C0099@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25613

Modified Files:
	.cvsignore sources sugar-terminal.spec 
Log Message:
* Fri Sep 09 2009 Simon Schampijer <simon at schampijer.de> - 26-1
- New toolbar design




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Mar 2009 03:51:17 -0000	1.5
+++ .cvsignore	11 Sep 2009 17:29:09 -0000	1.6
@@ -1 +1 @@
-Terminal-25.tar.bz2
+Terminal-26.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Mar 2009 03:51:17 -0000	1.5
+++ sources	11 Sep 2009 17:29:09 -0000	1.6
@@ -1 +1 @@
-4704fd55ede9d3dd75c33a5db5f8c0c4  Terminal-25.tar.bz2
+6cb98c57ed234f014a87ab04cefb0628  Terminal-26.tar.bz2


Index: sugar-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sugar-terminal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sugar-terminal.spec	27 Jul 2009 05:05:10 -0000	1.8
+++ sugar-terminal.spec	11 Sep 2009 17:29:09 -0000	1.9
@@ -1,15 +1,20 @@
 Name: sugar-terminal
-Version: 25
-Release: 2%{?dist}
+Version: 26
+Release: 1%{?dist}
 Summary: Terminal for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.laptop.org/go/Terminal
 Source0: http://dev.laptop.org/pub/sugar/sources/terminal-activity/Terminal-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  python sugar-toolkit
+
+BuildRequires:  python 
+BuildRequires: sugar-toolkit
 BuildRequires: gettext
-Requires: sugar vte
+
+Requires: sugar
+Requires: vte
+
 BuildArch: noarch
 
 %description
@@ -42,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 09 2009 Simon Schampijer <simon at schampijer.de> - 26-1
+- New toolbar design
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Fri Sep 11 17:48:10 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 11 Sep 2009 17:48:10 +0000 (UTC)
Subject: rpms/amtu/devel amtu-1.0.8-doc.patch, NONE,
	1.1 amtu-1.0.8-init.patch, 1.1, 1.2 amtu.spec, 1.32, 1.33
Message-ID: <20090911174810.7302411C0099@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/amtu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29983

Modified Files:
	amtu-1.0.8-init.patch amtu.spec 
Added Files:
	amtu-1.0.8-doc.patch 
Log Message:
* Fri Sep 11 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-5
- Corrected config file test (#522708)
- Made init script more LSB compatible (#522789)


amtu-1.0.8-doc.patch:
 AMTUHowTo.txt |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am   |    2 -
 2 files changed, 106 insertions(+), 1 deletion(-)

--- NEW FILE amtu-1.0.8-doc.patch ---
diff -urN amtu-1.0.8.orig/doc/AMTUHowTo.txt amtu-1.0.8/doc/AMTUHowTo.txt
--- amtu-1.0.8.orig/doc/AMTUHowTo.txt	1969-12-31 19:00:00.000000000 -0500
+++ amtu-1.0.8/doc/AMTUHowTo.txt	2009-07-06 10:20:42.000000000 -0400
@@ -0,0 +1,105 @@
+ABSTRACT MACHINE TEST UTILITY HOWTO
+
+
+OVERVIEW
+
+Abstract Machine Test Utility (AMTU) is an administrative utility to check 
+whether the underlying protection mechanism of the hardware are still being 
+enforced. This is a requirement of the Controlled Access Protection Profile 
+(CAPP) FTP_AMT.1, see http://www.radium.ncsc.mil/tpep/library/protection_profiles/CAPP-1.d.pdf.
+AMTU executes the following tests:
+
+* Memory 
+
+Randomly writes to areas of memory and then reading the memory back to 
+ensure the values written remain unchanged. 
+
+* Memory Separation
+
+Ensures that user space programs cannot read and write to areas of memory
+utilized by the likes of Video RAM, kernel code, etc.
+
+* I/O Controller - Network
+
+Verifies random data transmitted is also the data received for each configured
+network device. Only ethernet and token ring devices that are configured and
+up are checked. Async devices are not checked.
+
+* I/O Controller - Disk
+
+Verifies that information written to disks remains unchanged. Only SCSI and IDE
+controllers associated with mounted filesystems are checked.
+
+* Supervisor Mode Instructions
+
+Ensures that the enforcement of the property that privileged instructions
+should only be in supervisor mode is still in effect. The set privileged
+instructions tested to confirm this is architecture dependant.
+
+
+
+TESTED VERSIONS
+
+AMTU has been tested on the following:
+
+* RHEL4 and 5
+* SuSE SLES 8
+* pSeries (32-bit and 64-bit)
+* iSeries (64-bit)
+* zSeries (31-bit)
+* xSeries (32-bit)
+
+
+
+INSTALLING AMTU
+
+VERIFYING SYSTEM REQUIREMENTS AND PREREQUISITES
+
+Before installing AMTU, verify that your system meets the following
+requirements and prerequisites:
+
+* The system is running in the Common Criteria evaluated configuration.
+
+
+COMPILING AND INSTALLING AMTU
+
+Untar the AMTU source tarball.  Then issue the following commands:
+	./bootstrap
+	./configure
+	make
+	make install
+
+Only the last step must be run as root. During the ./configure stage
+you may opt to change various options including default install directory.
+
+When compiling AMTU as a 64-bit application on a PPC64 architecture (with the
+exception of Squadron pSeries), specify
+ 
+	./configure CC=/opt/cross/bin/powerpc64-linux-gcc
+
+where /opt/cross/bin/powerpc64-linux-gcc is the 64-bit gcc compiler.
+
+To compile as a 64-bit application on X86_64 architecture or Squadron pSeries, 
+
+	./configure CC="gcc -m64" 
+
+
+
+RUNNING AMTU
+
+AMTU installs to /usr/bin/amtu by default. You can add optional command line 
+arguments (see the AMTU man page (amtu.8) for more details).
+
+
+
+INTERPRETING RESULTS
+
+AMTU issues the following return codes when executed:
+
+	* -1 - Program abort error
+	*  0 - Successful program completion
+
+If the error is repeatable, you can re-run amtu with the -d option to get 
+more information about the failure. The success or failure of AMTU is logged
+in the audit log files (see auditd.8).
+
diff -urN amtu-1.0.8.orig/doc/Makefile.am amtu-1.0.8/doc/Makefile.am
--- amtu-1.0.8.orig/doc/Makefile.am	2009-07-06 09:39:44.000000000 -0400
+++ amtu-1.0.8/doc/Makefile.am	2009-07-06 09:40:49.000000000 -0400
@@ -1,3 +1,3 @@
 CONFIG_CLEAN_FILES = *.rej *.orig
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) AbstractMachineTestingDesign.doc AMTUHowTo.txt
 man_MANS = amtu.8

amtu-1.0.8-init.patch:
 Makefile.am         |    2 -
 configure.in        |    2 -
 init/Makefile.am    |   16 +++++++++
 init/amtu.init      |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 init/amtu.sysconfig |   11 ++++++
 5 files changed, 115 insertions(+), 2 deletions(-)

Index: amtu-1.0.8-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/devel/amtu-1.0.8-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amtu-1.0.8-init.patch	26 Jul 2009 13:27:12 -0000	1.1
+++ amtu-1.0.8-init.patch	11 Sep 2009 17:48:10 -0000	1.2
@@ -1,6 +1,6 @@
 diff -urN amtu-1.0.8.orig/configure.in amtu-1.0.8/configure.in
---- amtu-1.0.8.orig/configure.in	2009-07-06 09:39:44.000000000 -0400
-+++ amtu-1.0.8/configure.in	2009-07-06 10:11:15.000000000 -0400
+--- amtu-1.0.8.orig/configure.in	2009-09-11 09:43:44.000000000 -0400
++++ amtu-1.0.8/configure.in	2009-09-11 09:44:10.000000000 -0400
 @@ -19,7 +19,7 @@
  esac
  AC_CHECK_LIB(laus, laus_open)
@@ -10,127 +10,10 @@ diff -urN amtu-1.0.8.orig/configure.in a
  
  echo .
  echo "
-diff -urN amtu-1.0.8.orig/doc/AMTUHowTo.txt amtu-1.0.8/doc/AMTUHowTo.txt
---- amtu-1.0.8.orig/doc/AMTUHowTo.txt	1969-12-31 19:00:00.000000000 -0500
-+++ amtu-1.0.8/doc/AMTUHowTo.txt	2009-07-06 10:20:42.000000000 -0400
-@@ -0,0 +1,105 @@
-+ABSTRACT MACHINE TEST UTILITY HOWTO
-+
-+
-+OVERVIEW
-+
-+Abstract Machine Test Utility (AMTU) is an administrative utility to check 
-+whether the underlying protection mechanism of the hardware are still being 
-+enforced. This is a requirement of the Controlled Access Protection Profile 
-+(CAPP) FTP_AMT.1, see http://www.radium.ncsc.mil/tpep/library/protection_profiles/CAPP-1.d.pdf.
-+AMTU executes the following tests:
-+
-+* Memory 
-+
-+Randomly writes to areas of memory and then reading the memory back to 
-+ensure the values written remain unchanged. 
-+
-+* Memory Separation
-+
-+Ensures that user space programs cannot read and write to areas of memory
-+utilized by the likes of Video RAM, kernel code, etc.
-+
-+* I/O Controller - Network
-+
-+Verifies random data transmitted is also the data received for each configured
-+network device. Only ethernet and token ring devices that are configured and
-+up are checked. Async devices are not checked.
-+
-+* I/O Controller - Disk
-+
-+Verifies that information written to disks remains unchanged. Only SCSI and IDE
-+controllers associated with mounted filesystems are checked.
-+
-+* Supervisor Mode Instructions
-+
-+Ensures that the enforcement of the property that privileged instructions
-+should only be in supervisor mode is still in effect. The set privileged
-+instructions tested to confirm this is architecture dependant.
-+
-+
-+
-+TESTED VERSIONS
-+
-+AMTU has been tested on the following:
-+
-+* RHEL4 and 5
-+* SuSE SLES 8
-+* pSeries (32-bit and 64-bit)
-+* iSeries (64-bit)
-+* zSeries (31-bit)
-+* xSeries (32-bit)
-+
-+
-+
-+INSTALLING AMTU
-+
-+VERIFYING SYSTEM REQUIREMENTS AND PREREQUISITES
-+
-+Before installing AMTU, verify that your system meets the following
-+requirements and prerequisites:
-+
-+* The system is running in the Common Criteria evaluated configuration.
-+
-+
-+COMPILING AND INSTALLING AMTU
-+
-+Untar the AMTU source tarball.  Then issue the following commands:
-+	./bootstrap
-+	./configure
-+	make
-+	make install
-+
-+Only the last step must be run as root. During the ./configure stage
-+you may opt to change various options including default install directory.
-+
-+When compiling AMTU as a 64-bit application on a PPC64 architecture (with the
-+exception of Squadron pSeries), specify
-+ 
-+	./configure CC=/opt/cross/bin/powerpc64-linux-gcc
-+
-+where /opt/cross/bin/powerpc64-linux-gcc is the 64-bit gcc compiler.
-+
-+To compile as a 64-bit application on X86_64 architecture or Squadron pSeries, 
-+
-+	./configure CC="gcc -m64" 
-+
-+
-+
-+RUNNING AMTU
-+
-+AMTU installs to /usr/bin/amtu by default. You can add optional command line 
-+arguments (see the AMTU man page (amtu.8) for more details).
-+
-+
-+
-+INTERPRETING RESULTS
-+
-+AMTU issues the following return codes when executed:
-+
-+	* -1 - Program abort error
-+	*  0 - Successful program completion
-+
-+If the error is repeatable, you can re-run amtu with the -d option to get 
-+more information about the failure. The success or failure of AMTU is logged
-+in the audit log files (see auditd.8).
-+
-diff -urN amtu-1.0.8.orig/doc/Makefile.am amtu-1.0.8/doc/Makefile.am
---- amtu-1.0.8.orig/doc/Makefile.am	2009-07-06 09:39:44.000000000 -0400
-+++ amtu-1.0.8/doc/Makefile.am	2009-07-06 09:40:49.000000000 -0400
-@@ -1,3 +1,3 @@
- CONFIG_CLEAN_FILES = *.rej *.orig
--EXTRA_DIST = $(man_MANS)
-+EXTRA_DIST = $(man_MANS) AbstractMachineTestingDesign.doc AMTUHowTo.txt
- man_MANS = amtu.8
 diff -urN amtu-1.0.8.orig/init/amtu.init amtu-1.0.8/init/amtu.init
 --- amtu-1.0.8.orig/init/amtu.init	1969-12-31 19:00:00.000000000 -0500
-+++ amtu-1.0.8/init/amtu.init	2009-07-06 10:17:43.000000000 -0400
-@@ -0,0 +1,90 @@
++++ amtu-1.0.8/init/amtu.init	2009-09-11 13:35:53.000000000 -0400
+@@ -0,0 +1,86 @@
 +#!/bin/sh
 +#
 +# amtu:		Abstract Machine Tests
@@ -178,11 +61,12 @@ diff -urN amtu-1.0.8.orig/init/amtu.init
 +	# Now check that the syconfig is found and has important things
 +	# configured
 +	test -f /etc/sysconfig/amtu || exit 6
-+	test x"$AMTU_HALT_ON_FAILURE" = "x" || exit 6
-+	test x"$HALT_COMMAND" = "x" || exit 6
++	test x"$AMTU_HALT_ON_FAILURE" != "x" || exit 6
++	test x"$HALT_COMMAND" != "x" || exit 6
 +	echo -n $"Starting $prog: "
-+	daemon $prog "$EXTRAOPTIONS"
++	daemon $prog "$EXTRAOPTIONS" >/dev/null 2>&1
 +	RETVAL=$?
++	echo
 +	if [ $RETVAL -ne 0 ] ; then
 +		if [ "$AMTU_HALT_ON_FAILURE" = "yes" ] ; then
 +			# Give audit daemon chance to write to disk
@@ -206,24 +90,19 @@ diff -urN amtu-1.0.8.orig/init/amtu.init
 +    stop)
 +	stop
 +	;;
-+    status)
-+        ;;
 +    restart)
 +	stop
 +	start
 +	;;
-+    condrestart)
-+	;;
-+    reload)
-+        ;;
 +    *)
-+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
++	echo $"Usage: $0 {start|stop|restart}"
++	RETVAL=3
 +	;;
 +esac
 +exit $RETVAL
 diff -urN amtu-1.0.8.orig/init/amtu.sysconfig amtu-1.0.8/init/amtu.sysconfig
 --- amtu-1.0.8.orig/init/amtu.sysconfig	1969-12-31 19:00:00.000000000 -0500
-+++ amtu-1.0.8/init/amtu.sysconfig	2009-07-06 10:06:07.000000000 -0400
++++ amtu-1.0.8/init/amtu.sysconfig	2009-09-11 09:44:10.000000000 -0400
 @@ -0,0 +1,11 @@
 +# Add extra options here:
 +EXTRAOPTIONS=""
@@ -238,7 +117,7 @@ diff -urN amtu-1.0.8.orig/init/amtu.sysc
 +HALT_COMMAND="poweroff"
 diff -urN amtu-1.0.8.orig/init/Makefile.am amtu-1.0.8/init/Makefile.am
 --- amtu-1.0.8.orig/init/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ amtu-1.0.8/init/Makefile.am	2009-07-06 10:14:22.000000000 -0400
++++ amtu-1.0.8/init/Makefile.am	2009-09-11 09:44:10.000000000 -0400
 @@ -0,0 +1,16 @@
 +
 +CONFIG_CLEAN_FILES = *.rej *.orig
@@ -257,8 +136,8 @@ diff -urN amtu-1.0.8.orig/init/Makefile.
 +	rm ${DESTDIR}${initdir}/amtu
 +
 diff -urN amtu-1.0.8.orig/Makefile.am amtu-1.0.8/Makefile.am
---- amtu-1.0.8.orig/Makefile.am	2009-07-06 09:39:44.000000000 -0400
-+++ amtu-1.0.8/Makefile.am	2009-07-06 10:10:55.000000000 -0400
+--- amtu-1.0.8.orig/Makefile.am	2009-09-11 09:43:44.000000000 -0400
++++ amtu-1.0.8/Makefile.am	2009-09-11 09:44:10.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = src doc
 +SUBDIRS = src init doc


Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- amtu.spec	28 Aug 2009 20:05:10 -0000	1.32
+++ amtu.spec	11 Sep 2009 17:48:10 -0000	1.33
@@ -1,12 +1,13 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
 Source0: %{name}-%{version}.tar.gz
-Patch1: amtu-1.0.8-init.patch
+Patch1: amtu-1.0.8-doc.patch
+Patch2: amtu-1.0.8-init.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audit-libs-devel >= 1.1.2
 BuildRequires: automake
@@ -23,6 +24,7 @@ http://www.radium.ncsc.mil/tpep/library/
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 touch ChangeLog
@@ -57,6 +59,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Sep 11 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-5
+- Corrected config file test (#522708)
+- Made init script more LSB compatible (#522789)
+
 * Fri Aug 28 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-4
 - Add ExclusiveArch for platforms having memory separation tests
 



From dajt at fedoraproject.org  Fri Sep 11 18:04:05 2009
From: dajt at fedoraproject.org (Jay Fenlason)
Date: Fri, 11 Sep 2009 18:04:05 +0000 (UTC)
Subject: rpms/openmpi/devel macros.openmpi, NONE, 1.1 openmpi-bz515567.patch,
	NONE, 1.1 openmpi.module.in, 1.7, 1.8 openmpi.spec, 1.40, 1.41
Message-ID: <20090911180405.05DF611C0099@cvs1.fedora.phx.redhat.com>

Author: dajt

Update of /cvs/pkgs/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3887

Modified Files:
	openmpi.module.in openmpi.spec 
Added Files:
	macros.openmpi openmpi-bz515567.patch 
Log Message:
As described in changelog.



--- NEW FILE macros.openmpi ---
%_openmpi_load \
 . /etc/profile.d/modules.sh; \
 module load openmpi-%{_arch}; \
 export CFLAGS="$CFLAGS %{optflags}";
%_openmpi_unload \
 . /etc/profile.d/modules.sh; \
 module unload openmpi-%{_arch};

openmpi-bz515567.patch:
 mca-btl-openib-device-params.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openmpi-bz515567.patch ---
Index: ompi/mca/btl/openib/mca-btl-openib-device-params.ini
===================================================================
--- ompi/mca/btl/openib/mca-btl-openib-device-params.ini	(revision 21744)
+++ ompi/mca/btl/openib/mca-btl-openib-device-params.ini	(working copy)
@@ -212,7 +212,7 @@
 
 [Chelsio T3]
 vendor_id = 0x1425
-vendor_part_id = 0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0030,0x0031,0x0032
+vendor_part_id = 0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0030,0x0031,0x0032,0x0035,0x0036
 use_eager_rdma = 1
 mtu = 2048
 receive_queues = P,65536,256,192,128


Index: openmpi.module.in
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.module.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openmpi.module.in	21 Jul 2009 16:36:29 -0000	1.7
+++ openmpi.module.in	11 Sep 2009 18:04:04 -0000	1.8
@@ -2,10 +2,15 @@
 #
 #  OpenMPI module for use with 'environment-modules' package:
 # 
-prepend-path 		PATH 		@LIBDIR@/@MPIDIR@/bin
-prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@/lib
-setenv			CFLAGS		"-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@"
-setenv			LDFLAGS		"-L at LIBDIR@/@MPIDIR@/lib -lmpi"
-setenv 			MPI_BIN		@LIBDIR@/@MPIDIR@/bin
-setenv	 		MPI_LIB		@LIBDIR@/@MPIDIR@/lib
-setenv	 		MPI_HOME	@LIBDIR@/@MPIDIR@
+prepend-path 		PATH 		@LIBDIR@/bin
+prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
+setenv 			MPI_BIN		@LIBDIR@/bin
+setenv			MPI_SYSCONFIG	@ETCDIR@
+setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@
+setenv			MPI_INCLUDE	@INCDIR@
+setenv	 		MPI_LIB		@LIBDIR@/lib
+setenv			MPI_MAN		@MANDIR@
+setenv			MPI_PYTHON_SITEARCH	@PYSITEARCH@
+setenv			MPI_COMPILER	@COMPILER@
+setenv			MPI_SUFFIX	@SUFFIX@
+setenv	 		MPI_HOME	@LIBDIR@@


Index: openmpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- openmpi.spec	25 Jul 2009 20:49:36 -0000	1.40
+++ openmpi.spec	11 Sep 2009 18:04:04 -0000	1.41
@@ -11,31 +11,42 @@
 %define opt_fc gfortran
 #define opt_fcflags
 
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # Optional name suffix to use...we leave it off when compiling with gcc, but
 # for other compiled versions to install side by side, it will need a
 # suffix in order to keep the names from conflicting.
-#define cc_name_suffix -gcc
+#define _cc_name_suffix -gcc
 
-Name:			openmpi%{?cc_name_suffix}
+Name:			openmpi%{?_cc_name_suffix}
 Version:		1.3.3
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
 URL:			http://www.open-mpi.org/
-Source0:		http://www.open-mpi.org/software/ompi/v1.3/downloads/%{name}-%{version}.tar.bz2
+# We can't use %{name} here because of _cc_name_suffix
+Source0:		http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-%{version}.tar.bz2
 Source1:		openmpi.pc.in
 Source2:		openmpi.module.in
+Source3:		macros.openmpi
+Patch0:			openmpi-bz515567.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		gcc-gfortran, libtool, numactl-devel, valgrind-devel
 BuildRequires:		libibverbs-devel, opensm-devel > 3.3.0
+BuildRequires:		librdmacm librdmacm-devel
 #%ifnarch ppc
 #BuildRequires:		compat-dapl-devel
 #%endif
 Provides:		mpi
 Requires:		environment-modules
+# Requires: openmpi-common = %{version}-%{release}
 Obsoletes:		openmpi-libs
 
+# s390 is unlikely to have the hardware we want, and some of the -devel
+# packages we require aren't available there.
+ExcludeArch: s390 s390x
+
+
 %description
 Open MPI is an open source, freely available implementation of both the 
 MPI-1 and MPI-2 standards, combining technologies and resources from
@@ -45,6 +56,14 @@ compliant implementation, Open MPI offer
 software vendors, application developers, and computer science
 researchers. For more information, see http://www.open-mpi.org/ .
 
+#%package	common
+#Summary:	Common files for openmpi
+#Group:		Development/Libraries
+#BuildArch:	noarch
+
+#%description common
+#contains files that are common across installations of op
+
 %package devel
 Summary:        Development files for openmpi
 Group:          Development/Libraries
@@ -83,18 +102,22 @@ Contains development headers and librari
 
 # We set this to for convenience, since this is the unique dir we use for this
 # particular package, version, compiler
-%define mpidir %{name}/%{version}-%{opt_cc}
+%define namearch openmpi-%{_arch}%{?_cc_name_suffix}
 
 %prep
-%setup -q
+%setup -q -n openmpi-%{version}
+%patch0 -p0 -b .bz515567
 %ifarch x86_64
 XFLAGS="-fPIC"
 %endif
 
-./configure --prefix=%{_libdir}/%{mpidir} --with-libnuma=/usr \
+./configure --prefix=%{_libdir}/%{name} --with-libnuma=/usr \
 	--with-openib=/usr --enable-mpirun-prefix-by-default \
-	--mandir=%{_libdir}/%{mpidir}/man --enable-mpi-threads \
-	--with-ft=cr --with-valgrind \
+	--mandir=%{_mandir}/%{namearch} \
+	--includedir=%{_includedir}/%{namearch} \
+	--sysconfdir=%{_sysconfdir}/%{namearch} \
+	--enable-mpi-threads \
+	--with-valgrind \
 	--with-wrapper-cflags="%{?opt_cflags} %{?modeflag}" \
 	--with-wrapper-cxxflags="%{?opt_cxxflags} %{?modeflag}" \
 	--with-wrapper-fflags="%{?opt_fflags} %{?modeflag}" \
@@ -112,77 +135,96 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-find %{buildroot}%{_libdir}/%{mpidir}/lib -name \*.la | xargs rm
-find %{buildroot}%{_libdir}/%{mpidir}/man -type f | xargs gzip -9
-ln -s mpicc.1.gz %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1.gz
-rm -f %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1
-rm -f %{buildroot}%{_libdir}/%{mpidir}/share/vampirtrace/doc/opari/lacsi01.ps.gz
+find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm
+find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9
+ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz
+rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1
+rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz
 
 # Make the pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}%{?cc_name_suffix}.pc
+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{name}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
 # Make the environment-modules file
 mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
-sed 's#@LIBDIR@#'%{_libdir}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > %{buildroot}/%{_datadir}/Modules/modulefiles/%{name}-%{_arch}%{?cc_name_suffix}
-
+# Since we're doing our own substitution here, use our own definitions.
+sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}/%{_datadir}/Modules/modulefiles/%{namearch}
+# make the rpm config file
+mkdir -p %{buildroot}/%{_sysconfdir}/rpm
+cp %SOURCE3 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
+mkdir -p %{buildroot}/%{_fmoddir}/%{namearch}
+mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix}
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{mpidir}
-%dir %{_libdir}/%{mpidir}/etc
-%dir %{_libdir}/%{mpidir}/bin
-%dir %{_libdir}/%{mpidir}/lib
-%dir %{_libdir}/%{mpidir}/lib/openmpi
-%dir %{_libdir}/%{mpidir}/man
-%dir %{_libdir}/%{mpidir}/man/man1
-%dir %{_libdir}/%{mpidir}/man/man7
-%dir %{_libdir}/%{mpidir}/share
-%dir %{_libdir}/%{mpidir}/share/openmpi
-%config(noreplace) %{_libdir}/%{mpidir}/etc/*
-%{_libdir}/%{mpidir}/bin/mpi[er]*
-%{_libdir}/%{mpidir}/bin/ompi*
-%{_libdir}/%{mpidir}/bin/opal-*
-%{_libdir}/%{mpidir}/bin/opari
-%{_libdir}/%{mpidir}/bin/orte*
-%{_libdir}/%{mpidir}/bin/otf*
-%{_libdir}/%{mpidir}/lib/openmpi/*
-%{_libdir}/%{mpidir}/lib/*.so.*
-%{_libdir}/%{mpidir}/man/man1/mpi[er]*
-%{_libdir}/%{mpidir}/man/man1/ompi*
-%{_libdir}/%{mpidir}/man/man1/opal-*
-%{_libdir}/%{mpidir}/man/man1/orte*
-%{_libdir}/%{mpidir}/man/man7/ompi*
-%{_libdir}/%{mpidir}/man/man7/orte*
-%{_libdir}/%{mpidir}/share/openmpi/doc
-%{_libdir}/%{mpidir}/share/openmpi/amca-param-sets
-%{_libdir}/%{mpidir}/share/openmpi/help*
-%{_libdir}/%{mpidir}/share/openmpi/mca*
-%{_datadir}/Modules/modulefiles/*
+%dir %{_sysconfdir}/%{namearch}
+%dir %{_libdir}/%{name}/bin
+%dir %{_libdir}/%{name}/lib
+%dir %{_libdir}/%{name}/lib/openmpi
+%dir %{_mandir}/%{namearch}
+%dir %{_mandir}/%{namearch}/man1
+%dir %{_mandir}/%{namearch}/man7
+%dir %{_fmoddir}/%{namearch}
+%dir %{python_sitearch}/%{name}
+%config(noreplace) %{_sysconfdir}/%{namearch}/*
+%{_libdir}/%{name}/bin/mpi[er]*
+%{_libdir}/%{name}/bin/ompi*
+#%{_libdir}/%{name}/bin/opal-*
+%{_libdir}/%{name}/bin/opari
+%{_libdir}/%{name}/bin/orte*
+%{_libdir}/%{name}/bin/otf*
+%{_libdir}/%{name}/lib/*.so.*
+%{_mandir}/%{namearch}/man1/mpi[er]*
+%{_mandir}/%{namearch}/man1/ompi*
+#%{_mandir}/%{namearch}/man1/opal-*
+%{_mandir}/%{namearch}/man1/orte*
+%{_mandir}/%{namearch}/man7/ompi*
+%{_mandir}/%{namearch}/man7/orte*
+%{_libdir}/%{name}/lib/openmpi/*
+%{_datadir}/Modules/modulefiles/%{namearch}
+#%files common
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/openmpi
+%{_libdir}/%{name}/share/openmpi/doc
+%{_libdir}/%{name}/share/openmpi/amca-param-sets
+%{_libdir}/%{name}/share/openmpi/help*
+%{_libdir}/%{name}/share/openmpi/mca*
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_libdir}/%{mpidir}/include
-%dir %{_libdir}/%{mpidir}/man/man3
-%dir %{_libdir}/%{mpidir}/share/vampirtrace
-%{_libdir}/pkgconfig/%{name}%{?cc_name_suffix}.pc
-%{_libdir}/%{mpidir}/bin/mpi[cCf]*
-%{_libdir}/%{mpidir}/bin/vt*
-%{_libdir}/%{mpidir}/bin/opal_*
-%{_libdir}/%{mpidir}/include/*
-%{_libdir}/%{mpidir}/lib/*.so
-%{_libdir}/%{mpidir}/lib/lib*.a
-%{_libdir}/%{mpidir}/lib/mpi.mod
-%{_libdir}/%{mpidir}/man/man1/mpi[cCf]*
-%{_libdir}/%{mpidir}/man/man1/opal_*
-%{_libdir}/%{mpidir}/man/man3/*
-%{_libdir}/%{mpidir}/man/man7/opal*
-%{_libdir}/%{mpidir}/share/openmpi/mpi*
-%{_libdir}/%{mpidir}/share/vampirtrace/*
+%dir %{_includedir}/%{namearch}
+%dir %{_mandir}/%{namearch}/man3
+%dir %{_libdir}/%{name}/share/vampirtrace
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/%{name}/bin/mpi[cCf]*
+%{_libdir}/%{name}/bin/vt*
+%{_libdir}/%{name}/bin/opal_*
+%{_includedir}/%{namearch}/*
+%{_libdir}/%{name}/lib/*.so
+%{_libdir}/%{name}/lib/lib*.a
+%{_libdir}/%{name}/lib/mpi.mod
+%{_mandir}/%{namearch}/man1/mpi[cCf]*
+%{_mandir}/%{namearch}/man1/opal_*
+%{_mandir}/%{namearch}/man3/*
+%{_mandir}/%{namearch}/man7/opal*
+%{_libdir}/%{name}/share/openmpi/mpi*
+%{_libdir}/%{name}/share/vampirtrace/*
+%{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Wed Sep 9 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-4
+- Modify packaging to conform to
+  https://fedoraproject.org/wiki/PackagingDrafts/MPI (bz521334).
+- remove --with-ft=cr from configure, as it was apparently causing problems
+  for some people.
+- Add librdmacm-devel and librdmacm to BuildRequires (related bz515565).
+- Add openmpi-bz515567.patch to add support for the latest Chelsio device IDs
+  (related bz515567).
+- Add exclude-arch (s390 s390x) because we don't have required -devel packages
+  there.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Sep 11 18:05:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 18:05:09 +0000 (UTC)
Subject: rpms/poppler/devel poppler.spec,1.101,1.102
Message-ID: <20090911180509.EE52B11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5138

Modified Files:
	poppler.spec 
Log Message:
use versioned BR: cairo-devel, bug #522621



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- poppler.spec	9 Sep 2009 18:43:29 -0000	1.101
+++ poppler.spec	11 Sep 2009 18:05:09 -0000	1.102
@@ -12,7 +12,7 @@ Patch0: poppler-ObjStream.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: automake libtool
-BuildRequires: cairo-devel
+BuildRequires: cairo-devel >= 1.8.4
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: libjpeg-devel



From pjones at fedoraproject.org  Fri Sep 11 18:34:41 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 11 Sep 2009 18:34:41 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.8, 1.9 grubby.spec, 1.7, 1.8 sources,
	1.8, 1.9
Message-ID: <20090911183441.6AE5B11C0099@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16939

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Fri Sep 11 2009 Peter Jones <pjones at redhat.com> - 7.0.6-1
- Fix test case breakage from 7.0.5 (rstrode)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	11 Sep 2009 15:37:37 -0000	1.8
+++ .cvsignore	11 Sep 2009 18:34:41 -0000	1.9
@@ -1 +1,2 @@
-grubby-7.0.5.tar.bz2
+clog
+grubby-7.0.6.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- grubby.spec	11 Sep 2009 15:37:37 -0000	1.7
+++ grubby.spec	11 Sep 2009 18:34:41 -0000	1.8
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.5
+Version: 7.0.6
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,8 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Peter Jones <pjones at redhat.com> - 7.0.6-1
+- Fix test case breakage from 7.0.5 (rstrode)
+
 * Fri Sep 11 2009 Peter Jones <pjones at redhat.com> - 7.0.5-1
-- Add support for plymouth as a second initrd.
+- Add support for plymouth as a second initrd. (rstrode)
   Resolves: rhbz#520515
 
 * Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.4-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Sep 2009 15:37:37 -0000	1.8
+++ sources	11 Sep 2009 18:34:41 -0000	1.9
@@ -1 +1 @@
-29697999934b603425d072f0ac3c5c9b  grubby-7.0.5.tar.bz2
+5b62e5856613bde1b218e905f4c4a4b6  grubby-7.0.6.tar.bz2



From davej at fedoraproject.org  Fri Sep 11 18:36:23 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 11 Sep 2009 18:36:23 +0000 (UTC)
Subject: rpms/microcode_ctl/devel microcode_ctl.init, 1.14,
	1.15 microcode_ctl.spec, 1.53, 1.54
Message-ID: <20090911183623.9CA9C11C0099@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/microcode_ctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17507

Modified Files:
	microcode_ctl.init microcode_ctl.spec 
Log Message:
Remove some unnecessary code from the init script.


Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- microcode_ctl.init	25 Jun 2009 23:35:01 -0000	1.14
+++ microcode_ctl.init	11 Sep 2009 18:36:22 -0000	1.15
@@ -2,20 +2,9 @@
 # chkconfig: 2345 0 99
 # description: script to apply cpu microcode
 
-# vars:
-#
-# START			distribution specific way of kicking programs
-# END			distribution specific way of checking return status
-# PROGRAM		the executable to run
-# ARGUMENTS		the argument we're going to call PROGRAM with
-
 # Check that we're a priviledged user
 [ `id -u` = 0 ] || exit 0
 
-DEVICE=/dev/cpu/microcode
-ARGUMENTS=-Qu
-RETVAL=0
-PROGRAM=/sbin/microcode_ctl
 DATAFILE=/lib/firmware/microcode.dat
 
 . /etc/init.d/functions
@@ -44,38 +33,22 @@ function start ()
 	/sbin/modprobe microcode
 
 	lt=0
-	while [ ! -c $DEVICE ]; do
+	while [ ! -c /dev/cpu/microcode ]; do
 		lt=$[lt+1];
 		[ $lt -gt 5 ] && break;
 		sleep 0.1;
 	done
 
-	# Lets just be sure we have a device file...
-	if [ ! -e $DEVICE ]; then
-		echo $"$0: microcode device $DEVICE doesn't exist?"
-		exit 1
-	elif [ ! -c $DEVICE ]; then
-		echo $"$0: $DEVICE not a character device?"
-		exit 1
-	fi
-
-	daemon $PROGRAM $ARGUMENTS
+	/sbin/microcode_ctl -Qu
 	RETVAL=$?
 
-	# trap the most common case, errno 19 = no device
-	if [ $RETVAL -eq 19 ]; then
-		echo $"$0: kernel does not have CPU microcode device support"
-	fi
 	/sbin/rmmod microcode
-	echo
 
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/microcode_ctl
 	return $RETVAL
 }
 
 stop()
 {
-	rm -f /var/lock/subsys/microcode_ctl
 }
 
 case "$1" in
@@ -87,7 +60,7 @@ case "$1" in
 	stop
 	;;
   restart|reload|force-reload)
-    stop
+	stop
 	start
 	;;
   status)


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- microcode_ctl.spec	25 Jul 2009 12:10:29 -0000	1.53
+++ microcode_ctl.spec	11 Sep 2009 18:36:23 -0000	1.54
@@ -1,7 +1,7 @@
 Summary:        Tool to update x86/x86-64 CPU microcode.
 Name:           microcode_ctl
 Version:        1.17
-Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.1
+Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -78,6 +78,9 @@ family=`cat /proc/cpuinfo | grep "^cpu f
 exit 0
 
 %changelog
+* Fri Sep 11 2009 Dave Jones <davej at redhat.com>
+- Remove some unnecessary code from the init script.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.17-1.52.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From karsten at fedoraproject.org  Fri Sep 11 19:14:05 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 11 Sep 2009 19:14:05 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.62,1.63
Message-ID: <20090911191405.F3D2E11C0099@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29094

Modified Files:
	brasero.spec 
Log Message:
- fix requirements on s390, s390x where we don't have cdrdao




Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- brasero.spec	8 Sep 2009 00:07:32 -0000	1.62
+++ brasero.spec	11 Sep 2009 19:14:05 -0000	1.63
@@ -1,6 +1,6 @@
 Name:      brasero
 Version:   2.27.92
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -35,7 +35,9 @@ Requires:  dvd+rw-tools
 Requires:  cdrecord
 Requires:  mkisofs
 Requires:  cdda2wav
+%ifnarch s390 s390x
 Requires:  cdrdao
+%endif
 
 Requires(post):    shared-mime-info
 Requires(postun):  shared-mime-info
@@ -203,6 +205,9 @@ fi
 
 
 %changelog
+* Fri Sep 11 2009 Karsten Hopp <karsten at redhat.com> 2.27.92-2
+- fix requirements on s390, s390x where we don't have cdrdao
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 



From pkgdb at fedoraproject.org  Fri Sep 11 19:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 19:14:58 +0000
Subject: [pkgdb] kernel (Fedora, 12) updated by tibbs
Message-ID: <20090911191458.848FB10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for kernel
tibbs has set commit to Approved for 107427 on kernel (Fedora 12)
tibbs has set checkout to Approved for 107427 on kernel (Fedora 12)
tibbs has set build to Approved for 107427 on kernel (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From silas at fedoraproject.org  Fri Sep 11 19:20:05 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Fri, 11 Sep 2009 19:20:05 +0000 (UTC)
Subject: rpms/fabric/devel .cvsignore, 1.2, 1.3 fabric.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090911192005.AE90B11C0425@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/fabric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30883/devel

Modified Files:
	.cvsignore fabric.spec import.log sources 
Log Message:
* Thu Aug 27 2009 Silas Sewell <silas at sewell.ch> - 0.9-0.1.b1
- Update to latest snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Apr 2009 18:24:01 -0000	1.2
+++ .cvsignore	11 Sep 2009 19:20:05 -0000	1.3
@@ -1 +1 @@
-fab-0.1.1.tar.gz
+fabric-0.9b1.tar.gz


Index: fabric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/fabric.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fabric.spec	24 Jul 2009 22:29:02 -0000	1.3
+++ fabric.spec	11 Sep 2009 19:20:05 -0000	1.4
@@ -1,14 +1,16 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define pre_release b1
+
 Name:           fabric
-Version:        0.1.1
-Release:        3%{?dist}
-Summary:        A simple pythonic remote deployment tool
+Version:        0.9
+Release:        0.1.%{pre_release}%{?dist}
+Summary:        A simple Pythonic remote deployment tool
 
 Group:          Applications/System
 License:        GPLv2+
-URL:            http://www.nongnu.org/fab/
-Source0:        http://download.savannah.gnu.org/releases/fab/fab-%{version}.tar.gz
+URL:            http://www.nongnu.org/fab
+Source0:        http://git.fabfile.org/cgit.cgi/fabric/snapshot/%{name}-%{version}%{pre_release}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,60 +20,63 @@ Requires:       python-paramiko >= 1.7
 Requires:       python-setuptools
 
 %description
-Fabric is a simple pythonic remote deployment tool which is designed to upload
+Fabric is a simple Pythonic remote deployment tool which is designed to upload
 files to, and run shell commands on, a number of servers in parallel or
 serially.
 
 %prep
-%setup -q -n fab-%{version}
-sed -i '/^#!\/usr\/bin\/env\ python -i/,+1 d' fabric.py
+%setup -q -n %{name}-%{version}%{pre_release}
 
 %build
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README TODO
-%{python_sitelib}/*
 %{_bindir}/fab
+%{python_sitelib}/fabric
+%{python_sitelib}/Fabric-*.egg-info
 
 %changelog
+* Thu Aug 27 2009 Silas Sewell <silas at sewell.ch> - 0.9-0.1.b1
+- Update to latest snapshot
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun Apr 12 2009 Silas Sewell <silas at sewell ch> - 0.1.1-2
+* Sun Apr 12 2009 Silas Sewell <silas at sewell.ch> - 0.1.1-2
 - Add runtime setuptools requirements
 - Re-import source package
 
-* Thu Apr 09 2009 Silas Sewell <silas at sewell ch> - 0.1.1-1
+* Thu Apr 09 2009 Silas Sewell <silas at sewell.ch> - 0.1.1-1
 - Update to 0.1.1
 - Up Paramiko version dependency to 1.7
 - Remove Python version dependency
 - Make sed safer
 
-* Sat Mar 28 2009 Silas Sewell <silas at sewell ch> - 0.1.0-3
+* Sat Mar 28 2009 Silas Sewell <silas at sewell.ch> - 0.1.0-3
 - Fix dependencies
 - Fix non-executable-script error
 
-* Thu Mar 26 2009 Silas Sewell <silas at sewell ch> - 0.1.0-2
-- Changed define to global
+* Thu Mar 26 2009 Silas Sewell <silas at sewell.ch> - 0.1.0-2
+- Change define to global
 
-* Sun Feb 22 2009 Silas Sewell <silas at sewell ch> - 0.1.0-1
-- Updated to 0.1.0
-- Upped Python requirement to 2.5 per recommendation on official site
+* Sun Feb 22 2009 Silas Sewell <silas at sewell.ch> - 0.1.0-1
+- Update to 0.1.0
+- Up Python requirement to 2.5 per recommendation on official site
 
-* Thu Nov 20 2008 Silas Sewell <silas at sewell ch> - 0.0.9-3
-- Fixed changelog syntax issue
+* Thu Nov 20 2008 Silas Sewell <silas at sewell.ch> - 0.0.9-3
+- Fix changelog syntax issue
 
-* Thu Nov 20 2008 Silas Sewell <silas at sewell ch> - 0.0.9-2
-- Fixed various issues with the SPEC file
+* Thu Nov 20 2008 Silas Sewell <silas at sewell.ch> - 0.0.9-2
+- Fix various issues with the spec file
 
-* Wed Nov 19 2008 Silas Sewell <silas at sewell ch> - 0.0.9-1
+* Wed Nov 19 2008 Silas Sewell <silas at sewell.ch> - 0.0.9-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 18:49:43 -0000	1.2
+++ import.log	11 Sep 2009 19:20:05 -0000	1.3
@@ -1,2 +1,3 @@
 fabric-0_1_1-1_fc10:HEAD:fabric-0.1.1-1.fc10.src.rpm:1239560592
 fabric-0_1_1-2_fc10:HEAD:fabric-0.1.1-2.fc10.src.rpm:1239562092
+fabric-0_9-0_1_b1_fc12:HEAD:fabric-0.9-0.1.b1.fc12.src.rpm:1252696119


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 18:49:43 -0000	1.3
+++ sources	11 Sep 2009 19:20:05 -0000	1.4
@@ -1 +1 @@
-63a5301c584825f0b7c5e7274e1c00df  fab-0.1.1.tar.gz
+077d6543436e51697aad0e238b7b9b84  fabric-0.9b1.tar.gz



From cebbert at fedoraproject.org  Fri Sep 11 19:24:24 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 11 Sep 2009 19:24:24 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1796,1.1797
Message-ID: <20090911192424.C691811C0099@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv499

Modified Files:
	kernel.spec 
Log Message:
add warning about updating the devel branch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1796
retrieving revision 1.1797
diff -u -p -r1.1796 -r1.1797
--- kernel.spec	11 Sep 2009 15:40:07 -0000	1.1796
+++ kernel.spec	11 Sep 2009 19:24:24 -0000	1.1797
@@ -2025,6 +2025,12 @@ fi
 # plz don't put in a version string unless you're going to tag
 # and build.
 
+# ##############################################################
+#
+# STOP! The devel branch is for F-13. Update F-12 for Fedora 12.
+#
+# ##############################################################
+
 %changelog
 * Fri Sep 11 2009 Dave Jones <davej at redhat.com>
 - Apply NX/RO to modules



From bos at fedoraproject.org  Fri Sep 11 19:25:08 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Fri, 11 Sep 2009 19:25:08 +0000 (UTC)
Subject: rpms/ghc-GLUT/F-11 ghc-GLUT.spec,1.1,1.2
Message-ID: <20090911192508.358AB11C0099@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-GLUT/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv771

Modified Files:
	ghc-GLUT.spec 
Log Message:
Backport Jens's build fix from rawhide


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/F-11/ghc-GLUT.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-GLUT.spec	28 Aug 2009 16:43:08 -0000	1.1
+++ ghc-GLUT.spec	11 Sep 2009 19:25:08 -0000	1.2
@@ -7,8 +7,9 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform
 Version:        2.1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -18,12 +19,16 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc-OpenGL-devel
+BuildRequires:  freeglut-devel
 BuildRequires:  ghc, ghc-rpm-macros
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-OpenGL-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-OpenGL-prof
 %endif
 
 %description
@@ -34,10 +39,11 @@ This is a set of bindings to the C %{pkg
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-BuildRequires:  ghc-OpenGL-devel, freeglut-devel
-Requires:       ghc = %{ghc_version}, ghc-OpenGL-devel, freeglut-devel
+Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-OpenGL-devel
+Requires:       freeglut-devel
 
 %description devel
 This package contains the development files for %{name}
@@ -48,10 +54,10 @@ built for ghc-%{ghc_version}.
 %package doc
 Summary:        Documentation for %{name}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}, ghc-OpenGL-doc
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
-BuildRequires:  ghc-OpenGL-doc
+Requires:       ghc-OpenGL-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -63,8 +69,8 @@ This package contains development docume
 Summary:        Profiling libraries for %{name}
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}, ghc-OpenGL-prof
-BuildRequires:  ghc-OpenGL-prof
+Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-OpenGL-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -138,5 +144,8 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
+- move BRs to source (base) package
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.1.1.2-1
 - initial packaging for Fedora created by cabal2spec



From davidz at fedoraproject.org  Fri Sep 11 19:50:48 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Fri, 11 Sep 2009 19:50:48 +0000 (UTC)
Subject: rpms/polkit/devel 0001-Sort-by-action-id-in-pkaction-1-output.patch,
	NONE, 1.1 0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch,
	NONE, 1.1 polkit.spec, 1.9, 1.10
Message-ID: <20090911195048.2769811C0099@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16509

Modified Files:
	polkit.spec 
Added Files:
	0001-Sort-by-action-id-in-pkaction-1-output.patch 
	0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch 
Log Message:
* Fri Sep 11 2009 David Zeuthen <davidz at redhat.com> - 0.94-4
- Add some patches from git master
- Sort pkaction(1) output
- Bug 23867 ? UnixProcess vs. SystemBusName aliasing



0001-Sort-by-action-id-in-pkaction-1-output.patch:
 pkaction.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Sort-by-action-id-in-pkaction-1-output.patch ---
>From f8f132f066a930e296aa327d4c35c6d644774b9c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Fri, 11 Sep 2009 11:35:58 -0400
Subject: [PATCH 1/2] Sort by action id in pkaction(1) output

---
 src/programs/pkaction.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/programs/pkaction.c b/src/programs/pkaction.c
index 3493bc0..7d8f645 100644
--- a/src/programs/pkaction.c
+++ b/src/programs/pkaction.c
@@ -93,6 +93,14 @@ print_action (PolkitActionDescription *action,
     }
 }
 
+static gint
+action_desc_compare_by_action_id_func (PolkitActionDescription *a,
+                                       PolkitActionDescription *b)
+{
+  return g_strcmp0 (polkit_action_description_get_action_id (a),
+                    polkit_action_description_get_action_id (b));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -196,6 +204,9 @@ main (int argc, char *argv[])
     }
   else
     {
+      actions = g_list_sort (actions,
+                             (GCompareFunc) action_desc_compare_by_action_id_func);
+
       for (l = actions; l != NULL; l = l->next)
         {
           PolkitActionDescription *action = POLKIT_ACTION_DESCRIPTION (l->data);
-- 
1.6.4.2


0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch:
 docs/polkit/polkit-1-sections.txt                     |    1 
 src/polkit/polkitsystembusname.c                      |   44 ++++++++++++++
 src/polkit/polkitsystembusname.h                      |   14 +++-
 src/polkitbackend/polkitbackendinteractiveauthority.c |   54 +++++++++++++++++-
 4 files changed, 105 insertions(+), 8 deletions(-)

--- NEW FILE 0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch ---
>From 2a932ebb20c93d9a81eb89eab25a9cea7b8b388a Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Fri, 11 Sep 2009 15:35:10 -0400
Subject: [PATCH 2/2] =?UTF-8?q?Bug=2023867=20=E2=80=93=20UnixProcess=20vs.=20SystemBusName=20aliasing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For now, convert SystemBusName to UnixProcess when storing/checking
temporary authorizations. See

http://git.gnome.org/cgit/PolicyKit-gnome/commit/?id=ad5fe38a1f7a7a670c3d8e9384b9cd0d037c9222

for a test-case for this.
---
 docs/polkit/polkit-1-sections.txt                  |    1 +
 src/polkit/polkitsystembusname.c                   |   44 ++++++++++++++++
 src/polkit/polkitsystembusname.h                   |   14 +++--
 .../polkitbackendinteractiveauthority.c            |   53 +++++++++++++++++++-
 4 files changed, 105 insertions(+), 7 deletions(-)

diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
index 9219fb8..333e2c8 100644
--- a/docs/polkit/polkit-1-sections.txt
+++ b/docs/polkit/polkit-1-sections.txt
@@ -82,6 +82,7 @@ PolkitSystemBusName
 polkit_system_bus_name_new
 polkit_system_bus_name_get_name
 polkit_system_bus_name_set_name
+polkit_system_bus_name_get_process_sync
 <SUBSECTION Standard>
 PolkitSystemBusNameClass
 POLKIT_SYSTEM_BUS_NAME
diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
index 180b6b6..4c9b812 100644
--- a/src/polkit/polkitsystembusname.c
+++ b/src/polkit/polkitsystembusname.c
@@ -28,6 +28,8 @@
 #include "polkitsubject.h"
 #include "polkitprivate.h"
 
+#include "polkitunixprocess.h"
+
 /**
  * SECTION:polkitsystembusname
  * @title: PolkitSystemBusName
@@ -379,3 +381,45 @@ subject_iface_init (PolkitSubjectIface *subject_iface)
   subject_iface->exists_finish = polkit_system_bus_name_exists_finish;
   subject_iface->exists_sync   = polkit_system_bus_name_exists_sync;
 }
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+/**
+ * polkit_system_bus_name_get_process_sync:
+ * @system_bus_name: A #PolkitSystemBusName.
+ * @cancellable: A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously gets a #PolkitUnixProcess object for @system_bus_name.
+ *
+ * Returns: A #PolkitUnixProcess object or %NULL if @error is set.
+ **/
+PolkitSubject *
+polkit_system_bus_name_get_process_sync (PolkitSystemBusName  *system_bus_name,
+                                         GCancellable         *cancellable,
+                                         GError              **error)
+{
+  EggDBusConnection *connection;
+  PolkitSubject *ret;
+  pid_t pid;
+
+  ret = NULL;
+
+  connection = egg_dbus_connection_get_for_bus (EGG_DBUS_BUS_TYPE_SYSTEM);
+  if (!egg_dbus_bus_get_connection_unix_process_id_sync (egg_dbus_connection_get_bus (connection),
+                                                         EGG_DBUS_CALL_FLAGS_NONE,
+                                                         system_bus_name->name,
+                                                         &pid,
+                                                         cancellable,
+                                                         error))
+    {
+      goto out;
+    }
+
+  ret = polkit_unix_process_new (pid);
+
+ out:
+  g_object_unref (connection);
+  return ret;
+}
+
diff --git a/src/polkit/polkitsystembusname.h b/src/polkit/polkitsystembusname.h
index 4c91ee6..1fc464f 100644
--- a/src/polkit/polkitsystembusname.h
+++ b/src/polkit/polkitsystembusname.h
@@ -46,11 +46,15 @@ typedef struct _PolkitSystemBusName PolkitSystemBusName;
 #endif
 typedef struct _PolkitSystemBusNameClass PolkitSystemBusNameClass;
 
-GType           polkit_system_bus_name_get_type (void) G_GNUC_CONST;
-PolkitSubject  *polkit_system_bus_name_new      (const gchar         *name);
-const gchar    *polkit_system_bus_name_get_name (PolkitSystemBusName *system_bus_name);
-void            polkit_system_bus_name_set_name (PolkitSystemBusName *system_bus_name,
-                                                 const gchar         *name);
+GType           polkit_system_bus_name_get_type           (void) G_GNUC_CONST;
+PolkitSubject  *polkit_system_bus_name_new                (const gchar          *name);
+const gchar    *polkit_system_bus_name_get_name           (PolkitSystemBusName  *system_bus_name);
+void            polkit_system_bus_name_set_name           (PolkitSystemBusName  *system_bus_name,
+                                                           const gchar          *name);
+/* TODO: add async version of get_process() method */
+PolkitSubject  *polkit_system_bus_name_get_process_sync   (PolkitSystemBusName  *system_bus_name,
+                                                           GCancellable         *cancellable,
+                                                           GError              **error);
 
 G_END_DECLS
 
diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
index 811d169..bf88c2b 100644
--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
@@ -1959,18 +1959,41 @@ temporary_authorization_store_has_authorization (TemporaryAuthorizationStore *st
 {
   GList *l;
   gboolean ret;
+  PolkitSubject *subject_to_use;
 
   g_return_val_if_fail (store != NULL, FALSE);
   g_return_val_if_fail (POLKIT_IS_SUBJECT (subject), FALSE);
   g_return_val_if_fail (action_id != NULL, FALSE);
 
+  /* XXX: for now, prefer to store the process */
+  if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+    {
+      GError *error;
+      error = NULL;
+      subject_to_use = polkit_system_bus_name_get_process_sync (POLKIT_SYSTEM_BUS_NAME (subject),
+                                                                NULL,
+                                                                &error);
+      if (subject_to_use == NULL)
+        {
+          g_warning ("Error getting process for system bus name `%s': %s",
+                     polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject)),
+                     error->message);
+          g_error_free (error);
+          subject_to_use = g_object_ref (subject);
+        }
+    }
+  else
+    {
+      subject_to_use = g_object_ref (subject);
+    }
+
   ret = FALSE;
 
   for (l = store->authorizations; l != NULL; l = l->next) {
     TemporaryAuthorization *authorization = l->data;
 
     if (strcmp (action_id, authorization->action_id) == 0 &&
-        polkit_subject_equal (subject, authorization->subject))
+        polkit_subject_equal (subject_to_use, authorization->subject))
       {
         ret = TRUE;
         if (out_tmp_authz_id != NULL)
@@ -1980,6 +2003,7 @@ temporary_authorization_store_has_authorization (TemporaryAuthorizationStore *st
   }
 
  out:
+  g_object_unref (subject_to_use);
   return ret;
 }
 
@@ -2095,12 +2119,35 @@ temporary_authorization_store_add_authorization (TemporaryAuthorizationStore *st
 {
   TemporaryAuthorization *authorization;
   guint expiration_seconds;
+  PolkitSubject *subject_to_use;
 
   g_return_val_if_fail (store != NULL, NULL);
   g_return_val_if_fail (POLKIT_IS_SUBJECT (subject), NULL);
   g_return_val_if_fail (action_id != NULL, NULL);
   g_return_val_if_fail (!temporary_authorization_store_has_authorization (store, subject, action_id, NULL), NULL);
 
+  /* XXX: for now, prefer to store the process */
+  if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+    {
+      GError *error;
+      error = NULL;
+      subject_to_use = polkit_system_bus_name_get_process_sync (POLKIT_SYSTEM_BUS_NAME (subject),
+                                                                NULL,
+                                                                &error);
+      if (subject_to_use == NULL)
+        {
+          g_warning ("Error getting process for system bus name `%s': %s",
+                     polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject)),
+                     error->message);
+          g_error_free (error);
+          subject_to_use = g_object_ref (subject);
+        }
+    }
+  else
+    {
+      subject_to_use = g_object_ref (subject);
+    }
+
   /* TODO: right now the time the temporary authorization is kept is hard-coded - we
    *       could make it a propery on the PolkitBackendInteractiveAuthority class (so
    *       the local authority could read it from a config file) or a vfunc
@@ -2111,7 +2158,7 @@ temporary_authorization_store_add_authorization (TemporaryAuthorizationStore *st
   authorization = g_new0 (TemporaryAuthorization, 1);
   authorization->id = g_strdup_printf ("tmpauthz%" G_GUINT64_FORMAT, store->serial++);
   authorization->store = store;
-  authorization->subject = g_object_ref (subject);
+  authorization->subject = g_object_ref (subject_to_use);
   authorization->session = g_object_ref (session);
   authorization->action_id = g_strdup (action_id);
   authorization->time_granted = time (NULL);
@@ -2152,6 +2199,8 @@ temporary_authorization_store_add_authorization (TemporaryAuthorizationStore *st
 
   store->authorizations = g_list_prepend (store->authorizations, authorization);
 
+  g_object_unref (subject_to_use);
+
   return authorization->id;
 }
 
-- 
1.6.4.2



Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- polkit.spec	13 Aug 2009 17:56:44 -0000	1.9
+++ polkit.spec	11 Sep 2009 19:50:47 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.94
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -18,6 +18,9 @@ BuildRequires: gobject-introspection-dev
 Requires: ConsoleKit
 Requires: dbus
 
+Patch0: 0001-Sort-by-action-id-in-pkaction-1-output.patch
+Patch1: 0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch
+
 %description
 PolicyKit is a toolkit for defining and handling authorizations.
 It is used for allowing unprivileged processes to speak to privileged
@@ -56,6 +59,8 @@ Roles and default policy for desktop usa
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --disable-introspection
@@ -182,6 +187,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 11 2009 David Zeuthen <davidz at redhat.com> - 0.94-4
+- Add some patches from git master
+- Sort pkaction(1) output
+- Bug 23867 ? UnixProcess vs. SystemBusName aliasing
+
 * Thu Aug 13 2009 David Zeuthen <davidz at redhat.com> - 0.94-3
 - Add desktop_admin_r and desktop_user_r groups along with a first cut
   of default authorizations for users in these groups.



From cebbert at fedoraproject.org  Fri Sep 11 19:51:37 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 11 Sep 2009 19:51:37 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1797,1.1798
Message-ID: <20090911195137.19CD111C0099@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16834

Modified Files:
	kernel.spec 
Log Message:
switch back to non-released kernel


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1797
retrieving revision 1.1798
diff -u -p -r1.1797 -r1.1798
--- kernel.spec	11 Sep 2009 19:24:24 -0000	1.1797
+++ kernel.spec	11 Sep 2009 19:51:36 -0000	1.1798
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 # Versions of various parts
 
@@ -59,9 +59,9 @@ 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 9
+%define rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1003,6 +1003,8 @@ ApplyOptionalPatch()
 # pre-{base_sublevel+1}-rc1 case
 %if 0%{?gitrev}
 %define vanillaversion 2.6.%{base_sublevel}-git%{gitrev}
+%else
+%define vanillaversion 2.6.%{base_sublevel}
 %endif
 %endif
 %endif



From silas at fedoraproject.org  Fri Sep 11 19:59:04 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Fri, 11 Sep 2009 19:59:04 +0000 (UTC)
Subject: rpms/fabric/F-11 .cvsignore, 1.2, 1.3 fabric.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090911195904.91E3411C0099@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/fabric/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22276/F-11

Modified Files:
	.cvsignore fabric.spec import.log sources 
Log Message:
* Thu Aug 27 2009 Silas Sewell <silas at sewell.ch> - 0.9-0.1.b1
- Update to latest snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Apr 2009 18:24:01 -0000	1.2
+++ .cvsignore	11 Sep 2009 19:59:03 -0000	1.3
@@ -1 +1 @@
-fab-0.1.1.tar.gz
+fabric-0.9b1.tar.gz


Index: fabric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/F-11/fabric.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fabric.spec	12 Apr 2009 18:49:43 -0000	1.2
+++ fabric.spec	11 Sep 2009 19:59:03 -0000	1.3
@@ -1,14 +1,16 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define pre_release b1
+
 Name:           fabric
-Version:        0.1.1
-Release:        2%{?dist}
-Summary:        A simple pythonic remote deployment tool
+Version:        0.9
+Release:        0.1.%{pre_release}%{?dist}
+Summary:        A simple Pythonic remote deployment tool
 
 Group:          Applications/System
 License:        GPLv2+
-URL:            http://www.nongnu.org/fab/
-Source0:        http://download.savannah.gnu.org/releases/fab/fab-%{version}.tar.gz
+URL:            http://www.nongnu.org/fab
+Source0:        http://git.fabfile.org/cgit.cgi/fabric/snapshot/%{name}-%{version}%{pre_release}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,57 +20,60 @@ Requires:       python-paramiko >= 1.7
 Requires:       python-setuptools
 
 %description
-Fabric is a simple pythonic remote deployment tool which is designed to upload
+Fabric is a simple Pythonic remote deployment tool which is designed to upload
 files to, and run shell commands on, a number of servers in parallel or
 serially.
 
 %prep
-%setup -q -n fab-%{version}
-sed -i '/^#!\/usr\/bin\/env\ python -i/,+1 d' fabric.py
+%setup -q -n %{name}-%{version}%{pre_release}
 
 %build
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README TODO
-%{python_sitelib}/*
 %{_bindir}/fab
+%{python_sitelib}/fabric
+%{python_sitelib}/Fabric-*.egg-info
 
 %changelog
-* Sun Apr 12 2009 Silas Sewell <silas at sewell ch> - 0.1.1-2
+* Thu Aug 27 2009 Silas Sewell <silas at sewell.ch> - 0.9-0.1.b1
+- Update to latest snapshot
+
+* Sun Apr 12 2009 Silas Sewell <silas at sewell.ch> - 0.1.1-2
 - Add runtime setuptools requirements
 - Re-import source package
 
-* Thu Apr 09 2009 Silas Sewell <silas at sewell ch> - 0.1.1-1
+* Thu Apr 09 2009 Silas Sewell <silas at sewell.ch> - 0.1.1-1
 - Update to 0.1.1
 - Up Paramiko version dependency to 1.7
 - Remove Python version dependency
 - Make sed safer
 
-* Sat Mar 28 2009 Silas Sewell <silas at sewell ch> - 0.1.0-3
+* Sat Mar 28 2009 Silas Sewell <silas at sewell.ch> - 0.1.0-3
 - Fix dependencies
 - Fix non-executable-script error
 
-* Thu Mar 26 2009 Silas Sewell <silas at sewell ch> - 0.1.0-2
-- Changed define to global
+* Thu Mar 26 2009 Silas Sewell <silas at sewell.ch> - 0.1.0-2
+- Change define to global
 
-* Sun Feb 22 2009 Silas Sewell <silas at sewell ch> - 0.1.0-1
-- Updated to 0.1.0
-- Upped Python requirement to 2.5 per recommendation on official site
+* Sun Feb 22 2009 Silas Sewell <silas at sewell.ch> - 0.1.0-1
+- Update to 0.1.0
+- Up Python requirement to 2.5 per recommendation on official site
 
-* Thu Nov 20 2008 Silas Sewell <silas at sewell ch> - 0.0.9-3
-- Fixed changelog syntax issue
+* Thu Nov 20 2008 Silas Sewell <silas at sewell.ch> - 0.0.9-3
+- Fix changelog syntax issue
 
-* Thu Nov 20 2008 Silas Sewell <silas at sewell ch> - 0.0.9-2
-- Fixed various issues with the SPEC file
+* Thu Nov 20 2008 Silas Sewell <silas at sewell.ch> - 0.0.9-2
+- Fix various issues with the spec file
 
-* Wed Nov 19 2008 Silas Sewell <silas at sewell ch> - 0.0.9-1
+* Wed Nov 19 2008 Silas Sewell <silas at sewell.ch> - 0.0.9-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 18:49:43 -0000	1.2
+++ import.log	11 Sep 2009 19:59:03 -0000	1.3
@@ -1,2 +1,3 @@
 fabric-0_1_1-1_fc10:HEAD:fabric-0.1.1-1.fc10.src.rpm:1239560592
 fabric-0_1_1-2_fc10:HEAD:fabric-0.1.1-2.fc10.src.rpm:1239562092
+fabric-0_9-0_1_b1_fc11:F-11:fabric-0.9-0.1.b1.fc11.src.rpm:1252698461


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 18:49:43 -0000	1.3
+++ sources	11 Sep 2009 19:59:03 -0000	1.4
@@ -1 +1 @@
-63a5301c584825f0b7c5e7274e1c00df  fab-0.1.1.tar.gz
+077d6543436e51697aad0e238b7b9b84  fabric-0.9b1.tar.gz



From cebbert at fedoraproject.org  Fri Sep 11 20:04:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 11 Sep 2009 20:04:57 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1798,1.1799
Message-ID: <20090911200457.7342611C0099@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26056

Modified Files:
	kernel.spec 
Log Message:
reset origin, make versioning work with rcrev and gitrev both 0


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1798
retrieving revision 1.1799
diff -u -p -r1.1798 -r1.1799
--- kernel.spec	11 Sep 2009 19:51:36 -0000	1.1798
+++ kernel.spec	11 Sep 2009 20:04:56 -0000	1.1799
@@ -27,7 +27,7 @@ Summary: The Linux kernel
 # 1.1205.1.1.  In this case we drop the initial 1, subtract fedora_cvs_origin
 # from the second number, and then append the rest of the RCS string as is.
 # Don't stare at the awk too long, you'll go blind.
-%define fedora_cvs_origin   1786
+%define fedora_cvs_origin   1798
 %define fedora_cvs_revision() %2
 %global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
 
@@ -148,12 +148,13 @@ Summary: The Linux kernel
 # non-released_kernel
 %if 0%{?rcrev}
 %define rctag .rc%rcrev
+%else
+%define rctag .rc0
 %endif
 %if 0%{?gitrev}
 %define gittag .git%gitrev
-%if !0%{?rcrev}
-%define rctag .rc0
-%endif
+%else
+%define gittag .git0
 %endif
 %define pkg_release 0.%{fedora_build}%{?rctag}%{?gittag}%{?buildid}%{?dist}
 



From jwrdegoede at fedoraproject.org  Fri Sep 11 20:12:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 11 Sep 2009 20:12:49 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.9, 1.10 grubby.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20090911201249.9214011C0099@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1098

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Fri Sep 11 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.7-1
- Remove writing rd_plytheme=$theme to kernel args in dracut mode (hansg)
- Add a couple of test cases for extra initrds (rstrode)
- Allow tmplLine to be NULL in getInitrdVal (rstrode)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Sep 2009 18:34:41 -0000	1.9
+++ .cvsignore	11 Sep 2009 20:12:49 -0000	1.10
@@ -1,2 +1,2 @@
 clog
-grubby-7.0.6.tar.bz2
+grubby-7.0.7.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- grubby.spec	11 Sep 2009 18:34:41 -0000	1.8
+++ grubby.spec	11 Sep 2009 20:12:49 -0000	1.9
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.6
+Version: 7.0.7
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.7-1
+- Remove writing rd_plytheme=$theme to kernel args in dracut mode (hansg)
+- Add a couple of test cases for extra initrds (rstrode)
+- Allow tmplLine to be NULL in getInitrdVal (rstrode)
+
 * Fri Sep 11 2009 Peter Jones <pjones at redhat.com> - 7.0.6-1
 - Fix test case breakage from 7.0.5 (rstrode)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Sep 2009 18:34:41 -0000	1.9
+++ sources	11 Sep 2009 20:12:49 -0000	1.10
@@ -1 +1 @@
-5b62e5856613bde1b218e905f4c4a4b6  grubby-7.0.6.tar.bz2
+59bbe10b0843a43fe7762cb7e6e9bae7  grubby-7.0.7.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 11 20:14:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:14:05 +0000
Subject: [pkgdb] dkim-milter (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201405.CE25010F884@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for dkim-milter
tibbs has set commit to Approved for 107427 on dkim-milter (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on dkim-milter (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on dkim-milter (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dkim-milter



From pkgdb at fedoraproject.org  Fri Sep 11 20:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:17:22 +0000
Subject: [pkgdb] maven-plugin-build-helper was added for akurtakov
Message-ID: <20090911201722.343A210F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package maven-plugin-build-helper with summary Build Helper Maven Plugin
tibbs has approved Package maven-plugin-build-helper
tibbs has added a Fedora devel branch for maven-plugin-build-helper with an owner of akurtakov
tibbs has approved maven-plugin-build-helper in Fedora devel
tibbs has approved Package maven-plugin-build-helper
tibbs has set commit to Approved for 107427 on maven-plugin-build-helper (Fedora devel)
tibbs has set checkout to Approved for 107427 on maven-plugin-build-helper (Fedora devel)
tibbs has set build to Approved for 107427 on maven-plugin-build-helper (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-build-helper



From pkgdb at fedoraproject.org  Fri Sep 11 20:17:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:17:23 +0000
Subject: [pkgdb] maven-plugin-build-helper summary updated by tibbs
Message-ID: <20090911201723.2148C10F890@bastion2.fedora.phx.redhat.com>

tibbs set package maven-plugin-build-helper summary to Build Helper Maven Plugin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-build-helper



From tibbs at fedoraproject.org  Fri Sep 11 20:17:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:17:29 +0000 (UTC)
Subject: rpms/maven-plugin-build-helper - New directory
Message-ID: <20090911201729.1C6E911C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-build-helper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbG5797/rpms/maven-plugin-build-helper

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-build-helper added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:17:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:17:29 +0000 (UTC)
Subject: rpms/maven-plugin-build-helper/devel - New directory
Message-ID: <20090911201729.4524811C02BB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-build-helper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbG5797/rpms/maven-plugin-build-helper/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-build-helper/devel added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:17:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:17:36 +0000 (UTC)
Subject: rpms/maven-plugin-build-helper/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090911201736.0C61011C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-build-helper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbG5797/rpms/maven-plugin-build-helper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-plugin-build-helper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-plugin-build-helper
# $Id: Makefile,v 1.1 2009/09/11 20:17:35 tibbs Exp $
NAME := maven-plugin-build-helper
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 tibbs at fedoraproject.org  Fri Sep 11 20:17:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:17:35 +0000 (UTC)
Subject: rpms/maven-plugin-build-helper Makefile,NONE,1.1
Message-ID: <20090911201735.C52BE11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-build-helper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbG5797/rpms/maven-plugin-build-helper

Added Files:
	Makefile 
Log Message:
Setup of module maven-plugin-build-helper


--- NEW FILE Makefile ---
# Top level Makefile for module maven-plugin-build-helper
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 Sep 11 20:18:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:07 +0000
Subject: [pkgdb] maven-plugin-exec was added for akurtakov
Message-ID: <20090911201807.C499310F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package maven-plugin-exec with summary Exec Maven Plugin
tibbs has approved Package maven-plugin-exec
tibbs has added a Fedora devel branch for maven-plugin-exec with an owner of akurtakov
tibbs has approved maven-plugin-exec in Fedora devel
tibbs has approved Package maven-plugin-exec
tibbs has set commit to Approved for 107427 on maven-plugin-exec (Fedora devel)
tibbs has set checkout to Approved for 107427 on maven-plugin-exec (Fedora devel)
tibbs has set build to Approved for 107427 on maven-plugin-exec (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-exec



From tibbs at fedoraproject.org  Fri Sep 11 20:18:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:15 +0000 (UTC)
Subject: rpms/maven-plugin-exec - New directory
Message-ID: <20090911201815.1C98811C0418@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-exec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjj6058/rpms/maven-plugin-exec

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-exec added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:18:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:15 +0000 (UTC)
Subject: rpms/maven-plugin-exec/devel - New directory
Message-ID: <20090911201815.4642C11C0418@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-exec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjj6058/rpms/maven-plugin-exec/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-exec/devel added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:18:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:21 +0000 (UTC)
Subject: rpms/maven-plugin-exec Makefile,NONE,1.1
Message-ID: <20090911201821.E472211C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-exec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjj6058/rpms/maven-plugin-exec

Added Files:
	Makefile 
Log Message:
Setup of module maven-plugin-exec


--- NEW FILE Makefile ---
# Top level Makefile for module maven-plugin-exec
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 tibbs at fedoraproject.org  Fri Sep 11 20:18:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:22 +0000 (UTC)
Subject: rpms/maven-plugin-exec/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090911201822.4243911C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-exec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjj6058/rpms/maven-plugin-exec/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-plugin-exec


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-plugin-exec
# $Id: Makefile,v 1.1 2009/09/11 20:18:22 tibbs Exp $
NAME := maven-plugin-exec
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 Sep 11 20:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:08 +0000
Subject: [pkgdb] maven-plugin-exec summary updated by tibbs
Message-ID: <20090911201808.BB0DD10F893@bastion2.fedora.phx.redhat.com>

tibbs set package maven-plugin-exec summary to Exec Maven Plugin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-exec



From pkgdb at fedoraproject.org  Fri Sep 11 20:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:42 +0000
Subject: [pkgdb] php-pecl-sphinx summary updated by tibbs
Message-ID: <20090911201842.042F310F88A@bastion2.fedora.phx.redhat.com>

tibbs set package php-pecl-sphinx summary to PECL extension for Sphinx SQL full-text search engine

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-sphinx



From pkgdb at fedoraproject.org  Fri Sep 11 20:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:40 +0000
Subject: [pkgdb] php-pecl-sphinx was added for topdog
Message-ID: <20090911201840.3B28310F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package php-pecl-sphinx with summary PECL extension for Sphinx SQL full-text search engine
tibbs has approved Package php-pecl-sphinx
tibbs has added a Fedora devel branch for php-pecl-sphinx with an owner of topdog
tibbs has approved php-pecl-sphinx in Fedora devel
tibbs has approved Package php-pecl-sphinx
tibbs has set commit to Approved for 107427 on php-pecl-sphinx (Fedora devel)
tibbs has set checkout to Approved for 107427 on php-pecl-sphinx (Fedora devel)
tibbs has set build to Approved for 107427 on php-pecl-sphinx (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-sphinx



From pkgdb at fedoraproject.org  Fri Sep 11 20:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:42 +0000
Subject: [pkgdb] php-pecl-sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201842.138F610F895@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for php-pecl-sphinx
tibbs has set commit to Approved for 107427 on php-pecl-sphinx (Fedora 11)
tibbs has set checkout to Approved for 107427 on php-pecl-sphinx (Fedora 11)
tibbs has set build to Approved for 107427 on php-pecl-sphinx (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-sphinx



From pkgdb at fedoraproject.org  Fri Sep 11 20:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:42 +0000
Subject: [pkgdb] php-pecl-sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201842.1D20E10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for php-pecl-sphinx
tibbs has set commit to Approved for 107427 on php-pecl-sphinx (Fedora 10)
tibbs has set checkout to Approved for 107427 on php-pecl-sphinx (Fedora 10)
tibbs has set build to Approved for 107427 on php-pecl-sphinx (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-sphinx



From pkgdb at fedoraproject.org  Fri Sep 11 20:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:42 +0000
Subject: [pkgdb] php-pecl-sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201842.3AAD410F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for php-pecl-sphinx
tibbs has set commit to Approved for 107427 on php-pecl-sphinx (Fedora 12)
tibbs has set checkout to Approved for 107427 on php-pecl-sphinx (Fedora 12)
tibbs has set build to Approved for 107427 on php-pecl-sphinx (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-sphinx



From tibbs at fedoraproject.org  Fri Sep 11 20:18:48 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:48 +0000 (UTC)
Subject: rpms/php-pecl-sphinx - New directory
Message-ID: <20090911201848.2325D11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-pecl-sphinx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfk6390/rpms/php-pecl-sphinx

Log Message:
Directory /cvs/pkgs/rpms/php-pecl-sphinx added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 20:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:18:42 +0000
Subject: [pkgdb] php-pecl-sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201842.4651A10F8A1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for php-pecl-sphinx
tibbs has set commit to Approved for 107427 on php-pecl-sphinx (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on php-pecl-sphinx (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on php-pecl-sphinx (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-sphinx



From tibbs at fedoraproject.org  Fri Sep 11 20:18:48 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:48 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/devel - New directory
Message-ID: <20090911201848.4BB3E11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-pecl-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfk6390/rpms/php-pecl-sphinx/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pecl-sphinx/devel added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:18:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:56 +0000 (UTC)
Subject: rpms/php-pecl-sphinx Makefile,NONE,1.1
Message-ID: <20090911201856.4BD2711C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-pecl-sphinx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfk6390/rpms/php-pecl-sphinx

Added Files:
	Makefile 
Log Message:
Setup of module php-pecl-sphinx


--- NEW FILE Makefile ---
# Top level Makefile for module php-pecl-sphinx
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 tibbs at fedoraproject.org  Fri Sep 11 20:18:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:18:56 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911201856.DF2B311C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-pecl-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfk6390/rpms/php-pecl-sphinx/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pecl-sphinx


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pecl-sphinx
# $Id: Makefile,v 1.1 2009/09/11 20:18:56 tibbs Exp $
NAME := php-pecl-sphinx
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 Sep 11 20:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:19:22 +0000
Subject: [pkgdb] virt-v2v was added for mdbooth
Message-ID: <20090911201922.5660C10F894@bastion2.fedora.phx.redhat.com>

tibbs has added Package virt-v2v with summary Convert a virtual machine to run on KVM
tibbs has approved Package virt-v2v
tibbs has added a Fedora devel branch for virt-v2v with an owner of mdbooth
tibbs has approved virt-v2v in Fedora devel
tibbs has approved Package virt-v2v
tibbs has set commit to Approved for 107427 on virt-v2v (Fedora devel)
tibbs has set checkout to Approved for 107427 on virt-v2v (Fedora devel)
tibbs has set build to Approved for 107427 on virt-v2v (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From pkgdb at fedoraproject.org  Fri Sep 11 20:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:19:23 +0000
Subject: [pkgdb] virt-v2v summary updated by tibbs
Message-ID: <20090911201923.98EF510F896@bastion2.fedora.phx.redhat.com>

tibbs set package virt-v2v summary to Convert a virtual machine to run on KVM

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From pkgdb at fedoraproject.org  Fri Sep 11 20:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:19:23 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201923.A0FF210F89C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for virt-v2v
tibbs has set commit to Approved for 107427 on virt-v2v (Fedora 12)
tibbs has set checkout to Approved for 107427 on virt-v2v (Fedora 12)
tibbs has set build to Approved for 107427 on virt-v2v (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From tibbs at fedoraproject.org  Fri Sep 11 20:19:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:19:30 +0000 (UTC)
Subject: rpms/virt-v2v - New directory
Message-ID: <20090911201930.16ED711C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/virt-v2v
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBL7383/rpms/virt-v2v

Log Message:
Directory /cvs/pkgs/rpms/virt-v2v added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 20:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:19:23 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201923.AF7F210F8B8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for virt-v2v
tibbs has set commit to Approved for 107427 on virt-v2v (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on virt-v2v (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on virt-v2v (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From pkgdb at fedoraproject.org  Fri Sep 11 20:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:19:23 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911201923.B31E310F8BA@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for virt-v2v
tibbs has set commit to Approved for 107427 on virt-v2v (Fedora 11)
tibbs has set checkout to Approved for 107427 on virt-v2v (Fedora 11)
tibbs has set build to Approved for 107427 on virt-v2v (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From tibbs at fedoraproject.org  Fri Sep 11 20:19:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:19:30 +0000 (UTC)
Subject: rpms/virt-v2v/devel - New directory
Message-ID: <20090911201930.368D211C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/virt-v2v/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBL7383/rpms/virt-v2v/devel

Log Message:
Directory /cvs/pkgs/rpms/virt-v2v/devel added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:19:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:19:36 +0000 (UTC)
Subject: rpms/virt-v2v Makefile,NONE,1.1
Message-ID: <20090911201936.DD7F811C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/virt-v2v
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBL7383/rpms/virt-v2v

Added Files:
	Makefile 
Log Message:
Setup of module virt-v2v


--- NEW FILE Makefile ---
# Top level Makefile for module virt-v2v
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 tibbs at fedoraproject.org  Fri Sep 11 20:19:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:19:37 +0000 (UTC)
Subject: rpms/virt-v2v/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911201937.2571C11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/virt-v2v/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBL7383/rpms/virt-v2v/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module virt-v2v


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: virt-v2v
# $Id: Makefile,v 1.1 2009/09/11 20:19:36 tibbs Exp $
NAME := virt-v2v
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 Sep 11 20:23:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:23:27 +0000
Subject: [pkgdb] pyhunspell was added for till
Message-ID: <20090911202327.47DF110F86F@bastion2.fedora.phx.redhat.com>

tibbs has added Package pyhunspell with summary Python bindings for hunspell
tibbs has approved Package pyhunspell
tibbs has added a Fedora devel branch for pyhunspell with an owner of till
tibbs has approved pyhunspell in Fedora devel
tibbs has approved Package pyhunspell
tibbs has set commit to Approved for 107427 on pyhunspell (Fedora devel)
tibbs has set checkout to Approved for 107427 on pyhunspell (Fedora devel)
tibbs has set build to Approved for 107427 on pyhunspell (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyhunspell



From pkgdb at fedoraproject.org  Fri Sep 11 20:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:23:28 +0000
Subject: [pkgdb] pyhunspell summary updated by tibbs
Message-ID: <20090911202328.8EC4210F88A@bastion2.fedora.phx.redhat.com>

tibbs set package pyhunspell summary to Python bindings for hunspell

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyhunspell



From pkgdb at fedoraproject.org  Fri Sep 11 20:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:23:28 +0000
Subject: [pkgdb] pyhunspell (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911202328.A019410F895@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for pyhunspell
tibbs has set commit to Approved for 107427 on pyhunspell (Fedora 11)
tibbs has set checkout to Approved for 107427 on pyhunspell (Fedora 11)
tibbs has set build to Approved for 107427 on pyhunspell (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyhunspell



From pkgdb at fedoraproject.org  Fri Sep 11 20:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:23:28 +0000
Subject: [pkgdb] pyhunspell (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911202328.A7F5B10F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for pyhunspell
tibbs has set commit to Approved for 107427 on pyhunspell (Fedora 10)
tibbs has set checkout to Approved for 107427 on pyhunspell (Fedora 10)
tibbs has set build to Approved for 107427 on pyhunspell (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyhunspell



From tibbs at fedoraproject.org  Fri Sep 11 20:23:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:23:35 +0000 (UTC)
Subject: rpms/pyhunspell - New directory
Message-ID: <20090911202335.2871F11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pyhunspell
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszB8903/rpms/pyhunspell

Log Message:
Directory /cvs/pkgs/rpms/pyhunspell added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:23:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:23:35 +0000 (UTC)
Subject: rpms/pyhunspell/devel - New directory
Message-ID: <20090911202335.5063311C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pyhunspell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszB8903/rpms/pyhunspell/devel

Log Message:
Directory /cvs/pkgs/rpms/pyhunspell/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 11 20:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:23:28 +0000
Subject: [pkgdb] pyhunspell (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090911202328.B589510F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for pyhunspell
tibbs has set commit to Approved for 107427 on pyhunspell (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on pyhunspell (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on pyhunspell (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyhunspell



From tibbs at fedoraproject.org  Fri Sep 11 20:23:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:23:44 +0000 (UTC)
Subject: rpms/pyhunspell Makefile,NONE,1.1
Message-ID: <20090911202344.DDAA111C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pyhunspell
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszB8903/rpms/pyhunspell

Added Files:
	Makefile 
Log Message:
Setup of module pyhunspell


--- NEW FILE Makefile ---
# Top level Makefile for module pyhunspell
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 tibbs at fedoraproject.org  Fri Sep 11 20:23:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:23:45 +0000 (UTC)
Subject: rpms/pyhunspell/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090911202345.7A97311C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pyhunspell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszB8903/rpms/pyhunspell/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyhunspell


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pyhunspell
# $Id: Makefile,v 1.1 2009/09/11 20:23:45 tibbs Exp $
NAME := pyhunspell
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 Sep 11 20:24:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:24:15 +0000
Subject: [pkgdb] graphem was added for dmaphy
Message-ID: <20090911202415.9CC7810F85E@bastion2.fedora.phx.redhat.com>

tibbs has added Package graphem with summary Mouse Gesture based Authentication Program and Screen Locker
tibbs has approved Package graphem
tibbs has added a Fedora devel branch for graphem with an owner of dmaphy
tibbs has approved graphem in Fedora devel
tibbs has approved Package graphem
tibbs has set commit to Approved for 107427 on graphem (Fedora devel)
tibbs has set checkout to Approved for 107427 on graphem (Fedora devel)
tibbs has set build to Approved for 107427 on graphem (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/graphem



From pkgdb at fedoraproject.org  Fri Sep 11 20:24:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:24:16 +0000
Subject: [pkgdb] graphem summary updated by tibbs
Message-ID: <20090911202416.C54B210F89B@bastion2.fedora.phx.redhat.com>

tibbs set package graphem summary to Mouse Gesture based Authentication Program and Screen Locker

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/graphem



From pkgdb at fedoraproject.org  Fri Sep 11 20:24:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 20:24:16 +0000
Subject: [pkgdb] graphem (Fedora, 11) updated by tibbs
Message-ID: <20090911202416.D158910F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for graphem
tibbs has set commit to Approved for 107427 on graphem (Fedora 11)
tibbs has set checkout to Approved for 107427 on graphem (Fedora 11)
tibbs has set build to Approved for 107427 on graphem (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/graphem



From tibbs at fedoraproject.org  Fri Sep 11 20:24:23 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:24:23 +0000 (UTC)
Subject: rpms/graphem - New directory
Message-ID: <20090911202423.1B93211C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/graphem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU10271/rpms/graphem

Log Message:
Directory /cvs/pkgs/rpms/graphem added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:24:23 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:24:23 +0000 (UTC)
Subject: rpms/graphem/devel - New directory
Message-ID: <20090911202423.4719E11C02BB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/graphem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU10271/rpms/graphem/devel

Log Message:
Directory /cvs/pkgs/rpms/graphem/devel added to the repository




From tibbs at fedoraproject.org  Fri Sep 11 20:24:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:24:30 +0000 (UTC)
Subject: rpms/graphem Makefile,NONE,1.1
Message-ID: <20090911202430.1209F11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/graphem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU10271/rpms/graphem

Added Files:
	Makefile 
Log Message:
Setup of module graphem


--- NEW FILE Makefile ---
# Top level Makefile for module graphem
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 tibbs at fedoraproject.org  Fri Sep 11 20:24:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 11 Sep 2009 20:24:30 +0000 (UTC)
Subject: rpms/graphem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090911202430.7825A11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/graphem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU10271/rpms/graphem/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module graphem


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: graphem
# $Id: Makefile,v 1.1 2009/09/11 20:24:30 tibbs Exp $
NAME := graphem
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 rstrode at fedoraproject.org  Fri Sep 11 20:25:54 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 11 Sep 2009 20:25:54 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.142,1.143
Message-ID: <20090911202554.98B3911C0099@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10733

Modified Files:
	plymouth.spec 
Log Message:
- Remove duplicate Provides: plymouth(system-theme)



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- plymouth.spec	10 Sep 2009 13:58:09 -0000	1.142
+++ plymouth.spec	11 Sep 2009 20:25:54 -0000	1.143
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -224,7 +224,6 @@ Summary: Plymouth "Script" plugin
 Group: System Environment/Base
 Requires: %{name}-plugin-script = %{version}-%{release}
 Requires(post): %{_sbindir}/plymouth-set-default-theme
-Provides: plymouth(system-theme) = %{version}-%{release}
 
 %description theme-script
 This package contains the "script" boot splash theme for
@@ -450,6 +449,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Sep 11 2009 Ray Strode <rstrode at redhat.com> 0.7.1-6
+- Remove duplicate Provides: plymouth(system-theme)
+
 * Thu Sep 10 2009 Ray Strode <rstrode at redhat.com> 0.7.1-5
 - Fix set_verbose error reported by yaneti.
 



From rstrode at fedoraproject.org  Fri Sep 11 20:35:43 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 11 Sep 2009 20:35:43 +0000 (UTC)
Subject: rpms/plymouth/devel charge.plymouth, 1.4, 1.5 plymouth.spec, 1.143, 
	1.144
Message-ID: <20090911203543.DF43511C0099@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13198

Modified Files:
	charge.plymouth plymouth.spec 
Log Message:
- Go back to blue charge background (bug 522460)



Index: charge.plymouth
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/charge.plymouth,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- charge.plymouth	24 Aug 2009 21:01:51 -0000	1.4
+++ charge.plymouth	11 Sep 2009 20:35:43 -0000	1.5
@@ -9,5 +9,5 @@ HorizontalAlignment=.5
 VerticalAlignment=.5
 Transition=none
 TransitionDuration=0.0
-BackgroundStartColor=0x000000
-BackgroundEndColor=0x000000
+BackgroundStartColor=0x416fa7
+BackgroundEndColor=0x4b83c1


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- plymouth.spec	11 Sep 2009 20:25:54 -0000	1.143
+++ plymouth.spec	11 Sep 2009 20:35:43 -0000	1.144
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -449,6 +449,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Sep 11 2009 Ray Strode <rstrode at redhat.com> 0.7.1-7
+- Go back to blue charge background (bug 522460)
+
 * Fri Sep 11 2009 Ray Strode <rstrode at redhat.com> 0.7.1-6
 - Remove duplicate Provides: plymouth(system-theme)
 



From lmacken at fedoraproject.org  Fri Sep 11 20:44:02 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 11 Sep 2009 20:44:02 +0000 (UTC)
Subject: rpms/python-genshi/devel python-genshi-0.5.1-length_hint.patch, NONE,
	1.1 python-genshi.spec, 1.13, 1.14
Message-ID: <20090911204402.773C911C0099@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-genshi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15483

Modified Files:
	python-genshi.spec 
Added Files:
	python-genshi-0.5.1-length_hint.patch 
Log Message:
Add a patch to work around some recent Python2.6.2 behavior


python-genshi-0.5.1-length_hint.patch:
 eval.py |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE python-genshi-0.5.1-length_hint.patch ---
--- genshi/template/eval.py.orig	2009-09-11 16:21:30.104413211 -0400
+++ genshi/template/eval.py	2009-09-11 16:25:03.309414651 -0400
@@ -279,6 +279,11 @@
         raise UndefinedError(self._name, self._owner)
     __call__ = __getattr__ = __getitem__ = _die
 
+    # Hack around some behavior introduced after Python2.6.
+    # http://bugs.python.org/issue1242657
+    # http://svn.python.org/view/python/trunk/Lib/test/test_iterlen.py?r1=69227&r2=69226&pathrev=69227
+    __length_hint__ = lambda: 0
+
 
 class LookupBase(object):
     """Abstract base class for variable lookup implementations."""


Index: python-genshi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-genshi/devel/python-genshi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-genshi.spec	26 Jul 2009 20:25:22 -0000	1.13
+++ python-genshi.spec	11 Sep 2009 20:44:02 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           python-genshi
 Version:        0.5.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Toolkit for stream-based generation of output for the web
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://genshi.edgewall.org/
 
 Source0:        http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.bz2
+Patch0:         %{name}-%{version}-length_hint.patch
 Patch1:		0001-Ported-913-927-and-928-to-the-0.5.x-branch.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +28,7 @@ a template language, which is heavily in
 
 %prep
 %setup0 -q -n Genshi-%{version}
+%patch0 -p0 -b .length_hint
 %patch1 -p1
 
 find examples -type f | xargs chmod a-x
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/*
 
 %changelog
+* Fri Sep 11 2009 Luke Macken <lmacken at redhat.com> - 0.5.1-7
+- Add a patch to work around some recent Python2.6.2 behavior
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From eseyman at fedoraproject.org  Fri Sep 11 20:59:19 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 11 Sep 2009 20:59:19 +0000 (UTC)
Subject: rpms/bugzilla/devel .cvsignore, 1.14, 1.15 bugzilla.spec, 1.30,
	1.31 sources, 1.14, 1.15
Message-ID: <20090911205919.2008611C0099@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21510

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
Update to 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 13:16:05 -0000	1.14
+++ .cvsignore	11 Sep 2009 20:59:18 -0000	1.15
@@ -1 +1 @@
-bugzilla-3.4.1.tar.gz
+bugzilla-3.4.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- bugzilla.spec	4 Aug 2009 04:30:48 -0000	1.30
+++ bugzilla.spec	11 Sep 2009 20:59:18 -0000	1.31
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.4.1
+Version: 3.4.2
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -155,6 +155,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Fri Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.4.2-1
+- Update to 3.4.2 (CVE-2009-3125, CVE-2009-3165 and CVE-2009-3166)
+
 * Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.4.1-2
 - fix EL-5 perl dependencies bz#515158
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 13:16:05 -0000	1.14
+++ sources	11 Sep 2009 20:59:18 -0000	1.15
@@ -1 +1 @@
-43e978463799a75e54c628d7e4c326b3  bugzilla-3.4.1.tar.gz
+db35a67b7470f46f208b9ecb1abc561b  bugzilla-3.4.2.tar.gz



From lmacken at fedoraproject.org  Fri Sep 11 21:07:36 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 11 Sep 2009 21:07:36 +0000 (UTC)
Subject: rpms/python-genshi/devel python-genshi-0.5.1-length_hint.patch, 1.1,
	1.2
Message-ID: <20090911210736.64D4111C0099@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-genshi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24625

Modified Files:
	python-genshi-0.5.1-length_hint.patch 
Log Message:
Simplify our patch, and make it closer to the old behavior of the object

python-genshi-0.5.1-length_hint.patch:
 eval.py |    5 +++++
 1 file changed, 5 insertions(+)

Index: python-genshi-0.5.1-length_hint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-genshi/devel/python-genshi-0.5.1-length_hint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-genshi-0.5.1-length_hint.patch	11 Sep 2009 20:44:02 -0000	1.1
+++ python-genshi-0.5.1-length_hint.patch	11 Sep 2009 21:07:34 -0000	1.2
@@ -7,7 +7,7 @@
 +    # Hack around some behavior introduced after Python2.6.
 +    # http://bugs.python.org/issue1242657
 +    # http://svn.python.org/view/python/trunk/Lib/test/test_iterlen.py?r1=69227&r2=69226&pathrev=69227
-+    __length_hint__ = lambda: 0
++    __length_hint__ = None
 +
  
  class LookupBase(object):



From dwalsh at fedoraproject.org  Fri Sep 11 21:15:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 11 Sep 2009 21:15:36 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.78,
	1.79 selinux-policy.spec, 1.916, 1.917
Message-ID: <20090911211536.8063811C0099@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27246

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-3
- Add wordpress/wp-content/uploads label
- Fixes for sandbox when run from staff_t


policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   10 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  290 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  171 +++
 policy/modules/apps/sandbox.te            |  315 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  121 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  390 +++++---
 policy/modules/services/apache.te         |  437 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  151 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   51 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    2 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   79 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   88 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  276 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  276 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   27 
 policy/modules/system/modutils.te         |   36 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1399 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 313 files changed, 14879 insertions(+), 2605 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- policy-F12.patch	10 Sep 2009 15:38:44 -0000	1.78
+++ policy-F12.patch	11 Sep 2009 21:15:35 -0000	1.79
@@ -3454,8 +3454,8 @@ diff -b -B --ignore-all-space --exclude-
 +# No types are sandbox_exec_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.6.31/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/apps/sandbox.if	2009-09-09 15:38:24.000000000 -0400
-@@ -0,0 +1,167 @@
++++ serefpolicy-3.6.31/policy/modules/apps/sandbox.if	2009-09-10 11:44:49.000000000 -0400
+@@ -0,0 +1,171 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -3603,6 +3603,10 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_lnk_files_pattern($1_client_t, $1_file_t, $1_file_t)
 +	manage_fifo_files_pattern($1_client_t, $1_file_t, $1_file_t)
 +	manage_sock_files_pattern($1_client_t, $1_file_t, $1_file_t)
++
++	optional_policy(`
++		xserver_common_app($1_t)
++	')
 +')
 +
 +########################################
@@ -3625,8 +3629,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.31/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/apps/sandbox.te	2009-09-09 15:38:24.000000000 -0400
-@@ -0,0 +1,304 @@
++++ serefpolicy-3.6.31/policy/modules/apps/sandbox.te	2009-09-10 11:48:11.000000000 -0400
+@@ -0,0 +1,315 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -3696,8 +3700,15 @@ diff -b -B --ignore-all-space --exclude-
 +
 +kernel_read_system_state(sandbox_xserver_t)
 +
++selinux_validate_context(sandbox_xserver_t)
++selinux_compute_access_vector(sandbox_xserver_t)
++selinux_compute_create_context(sandbox_xserver_t)
++
 +auth_use_nsswitch(sandbox_xserver_t)
 +
++logging_send_syslog_msg(sandbox_xserver_t)
++logging_send_audit_msgs(sandbox_xserver_t)
++
 +userdom_use_user_terminals(sandbox_xserver_t)
 +
 +xserver_entry_type(sandbox_xserver_t)
@@ -3710,6 +3721,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +')
 +
++optional_policy(`
++	xserver_common_app(sandbox_xserver_t)
++')
++
 +########################################
 +#
 +# sandbox local policy
@@ -4308,7 +4323,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/gimp/.*/plug-ins(/.*)?  gen_context(system_u:object_r:bin_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.31/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/corecommands.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/corecommands.if	2009-09-11 16:04:06.000000000 -0400
 @@ -893,6 +893,7 @@
  
  	read_lnk_files_pattern($1, bin_t, bin_t)
@@ -4317,7 +4332,33 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -973,6 +974,7 @@
+@@ -918,6 +919,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Read all executable files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`corecmd_read_all_executables',`
++	gen_require(`
++		attribute exec_type;
++	')
++
++	read_files_pattern($1, exec_type, exec_type)
++')
++
++########################################
++## <summary>
+ ##	Execute all executable files.
+ ## </summary>
+ ## <param name="domain">
+@@ -973,6 +993,7 @@
  		type bin_t;
  	')
  
@@ -8040,8 +8081,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.31/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/services/abrt.te	2009-09-09 15:38:24.000000000 -0400
-@@ -0,0 +1,120 @@
++++ serefpolicy-3.6.31/policy/modules/services/abrt.te	2009-09-11 16:04:15.000000000 -0400
+@@ -0,0 +1,121 @@
 +
 +policy_module(abrt,1.0.0)
 +
@@ -8117,6 +8158,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +corecmd_exec_bin(abrt_t)
 +corecmd_exec_shell(abrt_t)
++corecmd_read_all_executables(abrt_t)
 +
 +kernel_read_ring_buffer(abrt_t)
 +kernel_read_system_state(abrt_t)
@@ -8198,7 +8240,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.fc serefpolicy-3.6.31/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/apache.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/apache.fc	2009-09-10 12:01:23.000000000 -0400
 @@ -1,12 +1,13 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -8234,7 +8276,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/selinux-policy[^/]*/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
 +/usr/share/wordpress-mu/wp-config\.php   -- gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/usr/share/wordpress-mu/wp-content(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
-+
++/usr/share/wordpress/wp-content/uploads(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
  
  /var/cache/httpd(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/mason(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -8874,7 +8916,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.31/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/apache.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/apache.te	2009-09-11 09:48:03.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -8932,7 +8974,21 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow HTTPD to run SSI executables in the same domain as system CGI scripts.
  ## </p>
  ## </desc>
-@@ -108,6 +131,29 @@
+@@ -94,6 +117,13 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow Apache to execute tmp content.
++## </p>
++## </desc>
++gen_tunable(httpd_tmp_exec, false)
++
++## <desc>
++## <p>
+ ## Unify HTTPD to communicate with the terminal.
+ ## Needed for entering the passphrase for certificates at
+ ## the terminal.
+@@ -108,6 +138,29 @@
  ## </desc>
  gen_tunable(httpd_unified, false)
  
@@ -8962,7 +9018,7 @@ diff -b -B --ignore-all-space --exclude-
  attribute httpdcontent;
  attribute httpd_user_content_type;
  
-@@ -140,6 +186,9 @@
+@@ -140,6 +193,9 @@
  domain_entry_file(httpd_helper_t, httpd_helper_exec_t)
  role system_r types httpd_helper_t;
  
@@ -8972,7 +9028,7 @@ diff -b -B --ignore-all-space --exclude-
  type httpd_lock_t;
  files_lock_file(httpd_lock_t)
  
-@@ -180,6 +229,10 @@
+@@ -180,6 +236,10 @@
  # setup the system domain for system CGI scripts
  apache_content_template(sys)
  
@@ -8983,7 +9039,7 @@ diff -b -B --ignore-all-space --exclude-
  type httpd_tmp_t;
  files_tmp_file(httpd_tmp_t)
  
-@@ -187,28 +240,28 @@
+@@ -187,28 +247,28 @@
  files_tmpfs_file(httpd_tmpfs_t)
  
  apache_content_template(user)
@@ -9025,7 +9081,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # for apache2 memory mapped files
  type httpd_var_lib_t;
-@@ -230,7 +283,7 @@
+@@ -230,7 +290,7 @@
  # Apache server local policy
  #
  
@@ -9034,7 +9090,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit httpd_t self:capability { net_admin sys_tty_config };
  allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow httpd_t self:fd use;
-@@ -272,6 +325,7 @@
+@@ -272,6 +332,7 @@
  allow httpd_t httpd_modules_t:dir list_dir_perms;
  mmap_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
  read_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
@@ -9042,7 +9098,7 @@ diff -b -B --ignore-all-space --exclude-
  
  apache_domtrans_rotatelogs(httpd_t)
  # Apache-httpd needs to be able to send signals to the log rotate procs.
-@@ -283,9 +337,9 @@
+@@ -283,9 +344,9 @@
  
  allow httpd_t httpd_suexec_exec_t:file read_file_perms;
  
@@ -9055,7 +9111,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
  manage_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
-@@ -301,6 +355,7 @@
+@@ -301,6 +362,7 @@
  manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
  files_var_lib_filetrans(httpd_t, httpd_var_lib_t, file)
  
@@ -9063,7 +9119,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-@@ -312,16 +367,18 @@
+@@ -312,16 +374,18 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -9087,7 +9143,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_http_port(httpd_t)
  corenet_tcp_bind_http_cache_port(httpd_t)
  corenet_sendrecv_http_server_packets(httpd_t)
-@@ -335,12 +392,11 @@
+@@ -335,12 +399,11 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -9102,7 +9158,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -358,6 +414,10 @@
+@@ -358,6 +421,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -9113,7 +9169,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_read_lib_files(httpd_t)
  
-@@ -372,18 +432,33 @@
+@@ -372,18 +439,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -9134,8 +9190,7 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(allow_httpd_mod_auth_pam, false)
 +
- tunable_policy(`allow_httpd_mod_auth_pam',`
--	auth_domtrans_chk_passwd(httpd_t)
++tunable_policy(`allow_httpd_mod_auth_pam',`
 +	auth_domtrans_chkpwd(httpd_t)
 +')
 +
@@ -9146,12 +9201,13 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(allow_httpd_mod_auth_ntlm_winbind, false)
 +optional_policy(`
-+tunable_policy(`allow_httpd_mod_auth_pam',`
+ tunable_policy(`allow_httpd_mod_auth_pam',`
+-	auth_domtrans_chk_passwd(httpd_t)
 +		samba_domtrans_winbind_helper(httpd_t)
  ')
  ')
  
-@@ -391,20 +466,54 @@
+@@ -391,32 +473,70 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -9207,16 +9263,27 @@ diff -b -B --ignore-all-space --exclude-
  
  	manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
  	manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
-@@ -415,20 +524,28 @@
- 	corenet_tcp_bind_ftp_port(httpd_t)
+ 	manage_lnk_files_pattern(httpd_t, httpdcontent, httpdcontent)
+ ')
+ 
+-tunable_policy(`httpd_enable_ftp_server',`
+-	corenet_tcp_bind_ftp_port(httpd_t)
++tunable_policy(`httpd_tmp_exec && httpd_builtin_scripting',`
++        can_exec(httpd_t, httpd_tmp_t)
  ')
  
 -tunable_policy(`httpd_enable_homedirs',`
 -	userdom_read_user_home_content_files(httpd_t)
--')
--
++tunable_policy(`httpd_tmp_exec && httpd_enable_cgi',`
++        can_exec(httpd_sys_script_t, httpd_tmp_t)
++')
++
++tunable_policy(`httpd_enable_ftp_server',`
++	corenet_tcp_bind_ftp_port(httpd_t)
+ ')
+ 
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
- 	fs_read_nfs_files(httpd_t)
+@@ -424,11 +544,23 @@
  	fs_read_nfs_symlinks(httpd_t)
  ')
  
@@ -9240,7 +9307,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t, httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -451,6 +568,10 @@
+@@ -451,6 +583,10 @@
  ')
  
  optional_policy(`
@@ -9251,7 +9318,7 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(httpd_t, httpd_exec_t)
  ')
  
-@@ -459,8 +580,13 @@
+@@ -459,8 +595,13 @@
  ')
  
  optional_policy(`
@@ -9267,7 +9334,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -468,22 +594,18 @@
+@@ -468,22 +609,18 @@
  	mailman_domtrans_cgi(httpd_t)
  	# should have separate types for public and private archives
  	mailman_search_data(httpd_t)
@@ -9292,7 +9359,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -494,12 +616,23 @@
+@@ -494,12 +631,23 @@
  ')
  
  optional_policy(`
@@ -9316,7 +9383,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -508,6 +641,7 @@
+@@ -508,6 +656,7 @@
  ')
  
  optional_policy(`
@@ -9324,7 +9391,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 +669,22 @@
+@@ -535,6 +684,22 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -9347,7 +9414,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +714,25 @@
+@@ -564,20 +729,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -9379,7 +9446,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -595,23 +750,24 @@
+@@ -595,23 +765,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)
  
@@ -9408,7 +9475,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +780,7 @@
+@@ -624,6 +795,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -9416,7 +9483,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;
-@@ -631,22 +788,30 @@
+@@ -631,22 +803,30 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -9454,7 +9521,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +837,14 @@
+@@ -672,15 +852,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -9473,7 +9540,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 +863,24 @@
+@@ -699,12 +878,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -9500,7 +9567,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +888,35 @@
+@@ -712,6 +903,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -9536,7 +9603,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 +929,10 @@
+@@ -724,6 +944,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -9547,7 +9614,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -735,6 +944,8 @@
+@@ -735,6 +959,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -9556,7 +9623,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 +965,12 @@
+@@ -754,6 +980,12 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -9569,7 +9636,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +979,74 @@
+@@ -762,3 +994,74 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')
@@ -18808,7 +18875,7 @@ 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.31/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-10 11:38:03.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-11 10:18:49.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -18923,7 +18990,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,30 +156,52 @@
+@@ -97,30 +156,54 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -18967,6 +19034,8 @@ diff -b -B --ignore-all-space --exclude-
 +fs_rw_anon_inodefs_files(virtd_t)
 +fs_list_inotifyfs(virtd_t)
  
++modutils_manage_module_config(virtd_t)
++
 +storage_manage_fixed_disk(virtd_t)
 +storage_relabel_fixed_disk(virtd_t)
  storage_raw_write_removable_device(virtd_t)
@@ -18979,7 +19048,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -130,7 +211,14 @@
+@@ -130,7 +213,14 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -18994,7 +19063,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +256,35 @@
+@@ -168,22 +258,35 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -19035,7 +19104,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +297,159 @@
+@@ -196,8 +299,159 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -19979,7 +20048,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.31/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/xserver.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/xserver.te	2009-09-10 11:49:20.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23047,6 +23116,68 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write fonts.
  ## </summary>
  ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-3.6.31/policy/modules/system/modutils.fc
+--- nsaserefpolicy/policy/modules/system/modutils.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/modutils.fc	2009-09-11 10:15:04.000000000 -0400
+@@ -1,6 +1,7 @@
+ 
+ /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
+ /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
++/etc/modprobe\.d(/.*)?		gen_context(system_u:object_r:modules_conf_t,s0)
+ 
+ ifdef(`distro_gentoo',`
+ # gentoo init scripts still manage this file
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.6.31/policy/modules/system/modutils.if
+--- nsaserefpolicy/policy/modules/system/modutils.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/modutils.if	2009-09-11 10:18:38.000000000 -0400
+@@ -41,8 +41,8 @@
+ 	files_search_etc($1)
+ 	files_search_boot($1)
+ 
+-	allow $1 modules_conf_t:file read_file_perms;
+-	allow $1 modules_conf_t:lnk_file read_lnk_file_perms;
++	read_files_pattern($1, modules_conf_t, modules_conf_t)
++	read_lnk_files_pattern($1, modules_conf_t, modules_conf_t)
+ ')
+ 
+ ########################################
+@@ -61,7 +61,7 @@
+ 		type modules_conf_t;
+ 	')
+ 
+-	allow $1 modules_conf_t:file rename_file_perms;
++	rename_files_pattern($1, modules_conf_t,  modules_conf_t)
+ ')
+ 
+ ########################################
+@@ -80,7 +80,26 @@
+ 		type modules_conf_t;
+ 	')
+ 
+-	allow $1 modules_conf_t:file unlink;
++	delete_files_pattern($1, modules_conf_t, modules_conf_t)
++')
++
++########################################
++## <summary>
++##	Manage files with the configuration options used when
++##	loading modules.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`modutils_manage_module_config',`
++	gen_require(`
++		type modules_conf_t;
++	')
++
++	manage_files_pattern($1, modules_conf_t, modules_conf_t)
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.31/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/system/modutils.te	2009-09-09 15:47:14.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -p -r1.916 -r1.917
--- selinux-policy.spec	10 Sep 2009 15:31:01 -0000	1.916
+++ selinux-policy.spec	11 Sep 2009 21:15:35 -0000	1.917
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.31
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-3
+- Add wordpress/wp-content/uploads label
+- Fixes for sandbox when run from staff_t
+
 * Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-2
 - Update to upstream
 - Fixes for devicekit_disk



From eseyman at fedoraproject.org  Fri Sep 11 21:21:29 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 11 Sep 2009 21:21:29 +0000 (UTC)
Subject: rpms/bugzilla/F-11 .cvsignore, 1.12, 1.13 bugzilla.spec, 1.26,
	1.27 sources, 1.12, 1.13
Message-ID: <20090911212129.85E6411C0418@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/bugzilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29015

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
Update to 3.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Jul 2009 19:20:52 -0000	1.12
+++ .cvsignore	11 Sep 2009 21:21:29 -0000	1.13
@@ -1 +1 @@
-bugzilla-3.2.4.tar.gz
+bugzilla-3.2.5.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-11/bugzilla.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- bugzilla.spec	8 Jul 2009 19:20:52 -0000	1.26
+++ bugzilla.spec	11 Sep 2009 21:21:29 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.2.4
+Version: 3.2.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -88,7 +88,7 @@ cd %{bzinstallprefix}/bugzilla
 ./collectstats.pl
 EOM
 echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
-rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
+rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/README
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
 cp %{SOURCE2} ./README.fedora
 mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
@@ -126,9 +126,6 @@ popd > /dev/null)
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
 %defattr(-,root,root,-)
 %doc README
-%doc QUICKSTART
-%doc UPGRADING
-%doc UPGRADING-pre-2.8
 %doc README.fedora
 %dir %{bzdatadir}
 %defattr(0750,root,apache,-)
@@ -143,6 +140,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Fri Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.2.5-1
+- Update to 3.2.5 (CVE-2009-3125, CVE-2009-3165 and CVE-2009-3166)
+
 * Wed Jul 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-1
 - fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Jul 2009 19:20:52 -0000	1.12
+++ sources	11 Sep 2009 21:21:29 -0000	1.13
@@ -1 +1 @@
-845c94c8a498340b244a2c36db7abd76  bugzilla-3.2.4.tar.gz
+4e6a9c872bc1420a3702e244500ce964  bugzilla-3.2.5.tar.gz



From dmaphy at fedoraproject.org  Fri Sep 11 21:29:23 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Fri, 11 Sep 2009 21:29:23 +0000 (UTC)
Subject: rpms/graphem/devel graphem-0.3.add-icon-to-desktopfile-00.patch,
	NONE, 1.1 graphem.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090911212923.2D62D11C0099@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/graphem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31453/devel

Modified Files:
	.cvsignore sources 
Added Files:
	graphem-0.3.add-icon-to-desktopfile-00.patch graphem.spec 
	import.log 
Log Message:
initial import of graphem into Fedora


graphem-0.3.add-icon-to-desktopfile-00.patch:
 graphem_dmaphy.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE graphem-0.3.add-icon-to-desktopfile-00.patch ---
--- graphem.desktop	2009-07-24 17:11:48.000000000 +0200
+++ graphem_dmaphy.desktop	2009-08-15 19:55:39.000000000 +0200
@@ -2,6 +2,6 @@
 Name=Configure Graphem
 Comment=Set up the mouse gestures Graphem should use for authentication.
 Exec=graphem
-#Icon=
+Icon=graphem
 Type=Application
 Categories=Utility;Security;


--- NEW FILE graphem.spec ---
Name:           graphem
Version:        0.3
Release:        3%{?dist}
Summary:        Mouse Gesture based Authentication Program and Screen Locker
Group:          Applications/System
License:        GPLv2+
URL:            http://graphem.berlios.de/
Source0:        http://download.berlios.de/graphem/graphem-%{version}.tar.gz
Patch0:         graphem-0.3.add-icon-to-desktopfile-00.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       qca2
BuildRequires:  qt4-devel >= 4.3 qca2-devel desktop-file-utils

%description
Graphem is a small mouse gesture based authentication program and screen
locker. Features: Key patterns are stored in hashed form; Can lock the display
until the correct pattern is entered; Can control login via scripting, e.g.
with GDM using auto-login and a PostLogin script; Touchpad mode: Accept input
without clicking; Keeps track of recognition rate

%prep
%setup -q
# patch adds icon to desktopfile
%patch0


%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 graphem $RPM_BUILD_ROOT%{_bindir}/graphem
install -Dpm 755 icon.png \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
#install -Dpm 644 graphem.desktop \
#    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.png
desktop-file-install --delete-original                  \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
        --mode 0644                                     \
        graphem.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING TODO Changelog README
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop


%changelog
* Sun Sep 6 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.3-3
- remove the vendor-tag 'fedora' from the desktop-file-install routine

* Sat Aug 15 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.3-2
- add patch which adds the graphem icon to the .desktop-file

* Sat Aug 15 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.3-1
- new upstream release
- brings Changelog, a README-file written in ReST and a .desktop-file

* Wed Jul 22 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.2-2
- update License to GPLv2+ (sorry)

* Sat Jul 18 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.2-1
- first RPM for Fedora


--- NEW FILE import.log ---
graphem-0_3-3_fc11:HEAD:graphem-0.3-3.fc11.src.rpm:1252704351


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/graphem/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:24:30 -0000	1.1
+++ .cvsignore	11 Sep 2009 21:29:22 -0000	1.2
@@ -0,0 +1 @@
+graphem-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/graphem/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:24:30 -0000	1.1
+++ sources	11 Sep 2009 21:29:22 -0000	1.2
@@ -0,0 +1 @@
+12c57e1e681cfd357c56a066c6392bfd  graphem-0.3.tar.gz



From rdieter at fedoraproject.org  Fri Sep 11 21:36:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Sep 2009 21:36:55 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.327,1.328
Message-ID: <20090911213655.3DDCD11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3035

Modified Files:
	qt.spec 
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-18
- drop gcc -fno-var-tracking-assignments hack (#522576)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- qt.spec	11 Sep 2009 11:56:00 -0000	1.327
+++ qt.spec	11 Sep 2009 21:36:54 -0000	1.328
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -370,10 +370,10 @@ Qt libraries used for drawing widgets an
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# hack around (hopefully temporary) gcc borkage
-%if 0%{?fedora} > 11
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
-%endif
+# hack around (hopefully temporary) gcc borkage (#522576)
+#if 0%{?fedora} > 11
+#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
+#endif
 
 %define platform linux-g++
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  
@@ -892,6 +892,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-18
+- drop gcc -fno-var-tracking-assignments hack (#522576)
+
 * Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.5.2-17
 - drop useless check for ossl patch, the patch works fine with old ossl
 



From dmaphy at fedoraproject.org  Fri Sep 11 21:39:34 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Fri, 11 Sep 2009 21:39:34 +0000 (UTC)
Subject: rpms/graphem/F-11 graphem-0.3.add-icon-to-desktopfile-00.patch, NONE,
	1.1 graphem.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090911213934.A9F9D11C0099@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/graphem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4877/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	graphem-0.3.add-icon-to-desktopfile-00.patch graphem.spec 
	import.log 
Log Message:
initial package import into Fedora


graphem-0.3.add-icon-to-desktopfile-00.patch:
 graphem_dmaphy.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE graphem-0.3.add-icon-to-desktopfile-00.patch ---
--- graphem.desktop	2009-07-24 17:11:48.000000000 +0200
+++ graphem_dmaphy.desktop	2009-08-15 19:55:39.000000000 +0200
@@ -2,6 +2,6 @@
 Name=Configure Graphem
 Comment=Set up the mouse gestures Graphem should use for authentication.
 Exec=graphem
-#Icon=
+Icon=graphem
 Type=Application
 Categories=Utility;Security;


--- NEW FILE graphem.spec ---
Name:           graphem
Version:        0.3
Release:        3%{?dist}
Summary:        Mouse Gesture based Authentication Program and Screen Locker
Group:          Applications/System
License:        GPLv2+
URL:            http://graphem.berlios.de/
Source0:        http://download.berlios.de/graphem/graphem-%{version}.tar.gz
Patch0:         graphem-0.3.add-icon-to-desktopfile-00.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       qca2
BuildRequires:  qt4-devel >= 4.3 qca2-devel desktop-file-utils

%description
Graphem is a small mouse gesture based authentication program and screen
locker. Features: Key patterns are stored in hashed form; Can lock the display
until the correct pattern is entered; Can control login via scripting, e.g.
with GDM using auto-login and a PostLogin script; Touchpad mode: Accept input
without clicking; Keeps track of recognition rate

%prep
%setup -q
# patch adds icon to desktopfile
%patch0


%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 graphem $RPM_BUILD_ROOT%{_bindir}/graphem
install -Dpm 755 icon.png \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
#install -Dpm 644 graphem.desktop \
#    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.png
desktop-file-install --delete-original                  \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
        --mode 0644                                     \
        graphem.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING TODO Changelog README
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop


%changelog
* Sun Sep 6 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.3-3
- remove the vendor-tag 'fedora' from the desktop-file-install routine

* Sat Aug 15 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.3-2
- add patch which adds the graphem icon to the .desktop-file

* Sat Aug 15 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.3-1
- new upstream release
- brings Changelog, a README-file written in ReST and a .desktop-file

* Wed Jul 22 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.2-2
- update License to GPLv2+ (sorry)

* Sat Jul 18 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.2-1
- first RPM for Fedora


--- NEW FILE import.log ---
graphem-0_3-3_fc11:F-11:graphem-0.3-3.fc11.src.rpm:1252704895


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/graphem/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:24:30 -0000	1.1
+++ .cvsignore	11 Sep 2009 21:39:34 -0000	1.2
@@ -0,0 +1 @@
+graphem-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/graphem/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:24:30 -0000	1.1
+++ sources	11 Sep 2009 21:39:34 -0000	1.2
@@ -0,0 +1 @@
+12c57e1e681cfd357c56a066c6392bfd  graphem-0.3.tar.gz



From eseyman at fedoraproject.org  Fri Sep 11 21:40:35 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 11 Sep 2009 21:40:35 +0000 (UTC)
Subject: rpms/bugzilla/F-10 .cvsignore, 1.12, 1.13 bugzilla.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20090911214035.BC80811C043A@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/bugzilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5327

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
Update to 3.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Jul 2009 19:22:40 -0000	1.12
+++ .cvsignore	11 Sep 2009 21:40:35 -0000	1.13
@@ -1 +1 @@
-bugzilla-3.2.4.tar.gz
+bugzilla-3.2.5.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/bugzilla.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- bugzilla.spec	8 Jul 2009 19:22:40 -0000	1.24
+++ bugzilla.spec	11 Sep 2009 21:40:35 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.2.4
+Version: 3.2.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -88,7 +88,7 @@ cd %{bzinstallprefix}/bugzilla
 ./collectstats.pl
 EOM
 echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
-rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
+rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/README
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
 cp %{SOURCE2} ./README.fedora
 mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
@@ -126,9 +126,6 @@ popd > /dev/null)
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
 %defattr(-,root,root,-)
 %doc README
-%doc QUICKSTART
-%doc UPGRADING
-%doc UPGRADING-pre-2.8
 %doc README.fedora
 %dir %{bzdatadir}
 %defattr(0750,root,apache,-)
@@ -143,6 +140,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Fri Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.2.5-1
+- Update to 3.2.5 (CVE-2009-3125, CVE-2009-3165 and CVE-2009-3166)
+
 * Wed Jul 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-1
 - fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Jul 2009 19:22:40 -0000	1.12
+++ sources	11 Sep 2009 21:40:35 -0000	1.13
@@ -1 +1 @@
-845c94c8a498340b244a2c36db7abd76  bugzilla-3.2.4.tar.gz
+4e6a9c872bc1420a3702e244500ce964  bugzilla-3.2.5.tar.gz



From lennart at fedoraproject.org  Fri Sep 11 22:24:01 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 11 Sep 2009 22:24:01 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.15, 1.16 libcanberra.spec, 1.33,
	1.34 sources, 1.17, 1.18
Message-ID: <20090911222401.D707611C0099@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12221

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Aug 2009 02:27:20 -0000	1.15
+++ .cvsignore	11 Sep 2009 22:23:59 -0000	1.16
@@ -1 +1 @@
-libcanberra-0.16.tar.gz
+libcanberra-0.17.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libcanberra.spec	27 Aug 2009 02:27:20 -0000	1.33
+++ libcanberra.spec	11 Sep 2009 22:23:59 -0000	1.34
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.16
+Version: 0.17
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -31,6 +31,7 @@ Requires: %{name} = %{version}-%{release
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
+Requires: gdm
 
 %description gtk2
 Gtk+ bindings for libcanberra
@@ -42,6 +43,7 @@ Requires: %{name} = %{version}-%{release
 Requires: pkgconfig
 Requires: gtk-doc
 Requires: gtk2-devel
+Requires: vala
 
 %description devel
 Development Files for libcanberra Client Development
@@ -104,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/canberra-gtk-play
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
+%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 %{_sysconfdir}/gconf/schemas/libcanberra.schemas
 
 %files devel
@@ -115,8 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
 %{_libdir}/pkgconfig/libcanberra.pc
+%{_datadir}/vala/vapi/libcanberra-gtk.vapi
+%{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Sep 12 2009 Lennart Poettering <lpoetter at redhat.com> 0.17-1
+- New version 0.17
+
 * Thu Aug 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.16-1
 - New version 0.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	27 Aug 2009 02:27:20 -0000	1.17
+++ sources	11 Sep 2009 22:23:59 -0000	1.18
@@ -1 +1 @@
-f93e49442e336e3e99cd6f33a7373b8b  libcanberra-0.16.tar.gz
+d1f5c5956d65d289566197e620be1a2e  libcanberra-0.17.tar.gz



From mjakubicek at fedoraproject.org  Fri Sep 11 23:14:53 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 11 Sep 2009 23:14:53 +0000 (UTC)
Subject: rpms/qtparted/devel qtparted-0.4.5-qp_libparted.patch, NONE,
	1.1 qtparted.spec, 1.33, 1.34
Message-ID: <20090911231454.1A4A611C0099@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/qtparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4802

Modified Files:
	qtparted.spec 
Added Files:
	qtparted-0.4.5-qp_libparted.patch 
Log Message:
- Fix FTBFS: added Debians qtparted-0.4.5-qp_libparted.patch



qtparted-0.4.5-qp_libparted.patch:
 qp_libparted.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qtparted-0.4.5-qp_libparted.patch ---
--- qtparted-0.4.5.orig/src/qp_libparted.cpp
+++ qtparted-0.4.5/src/qp_libparted.cpp
@@ -1748,11 +1748,11 @@
 								label.latin1(),
 								path) != PED_EXCEPTION_IGNORE) goto error_free_path;
 	}
-	ped_free(path);
+	free(path);
 	return true;
 
 error_free_path:
-	ped_free(path);
+	free(path);
 
 //error:
 	return false;


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- qtparted.spec	26 Aug 2009 07:19:08 -0000	1.33
+++ qtparted.spec	11 Sep 2009 23:14:51 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 Group:          Applications/System
 License:        GPLv2
@@ -13,6 +13,10 @@ Source2:        %{name}.consoleapp
 Source3:        %{name}.qtpartedrc
 Patch0:         %{name}-desktop.patch
 Patch1:         qtparted-0.4.5-PED_SECTOR_SIZE.patch
+# From http://patch-tracker.debian.org/patch/misc/view/qtparted/0.4.5-5/src/qp_libparted.cpp
+# Filed into upstreams bugtracker at:
+# http://sourceforge.net/tracker/?func=detail&aid=2857251&group_id=72497&atid=534714
+Patch2:			qtparted-0.4.5-qp_libparted.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -45,6 +49,7 @@ QTParted is a Partition Magic clone writ
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 . %{_sysconfdir}/profile.d/qt.sh
@@ -120,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/qtparted.1*
 
 %changelog
+* Fri Sep 12 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.5-22
+- Fix FTBFS: added Debians qtparted-0.4.5-qp_libparted.patch
+
 * Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.5-21
 - Add explicit requirement on libuuid-devel to fix broken deps in rawhide
 



From elanthis at fedoraproject.org  Fri Sep 11 23:48:24 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Fri, 11 Sep 2009 23:48:24 +0000 (UTC)
Subject: rpms/gnome-mud/devel gnome-mud.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090911234824.8EEE611C0099@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/gnome-mud/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26871/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-mud.spec import.log 
Log Message:
* Wed Sep 11 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-3
- Initial commit to Fedora CVS.



--- NEW FILE gnome-mud.spec ---
Name:		gnome-mud
Version:	0.11.2
Release:	3%{?dist}
Summary:	A MUD client for GNOME

Group:		Amusements/Games
License:	GPLv2+
URL:		http://live.gnome.org/GnomeMud
Source:		http://ftp.gnome.org/pub/gnome/sources/%{name}/0.11/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: pcre-devel
BuildRequires: gstreamer-devel
BuildRequires: gnet2-devel
BuildRequires: vte-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
BuildRequires: libglade2-devel
BuildRequires: GConf2-devel

Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description
GNOME-MUD is a simple MUD client for GNOME. It supports scripting in
Python and C, and tabbed mudding.

%prep
%setup -q
iconv -f iso-8859-1 -t utf8 ./AUTHORS > ./AUTHORS.utf8
mv ./AUTHORS.utf8 ./AUTHORS

%build
%configure --enable-mccp --enable-gstreamer
make %{?_smp_mflags}

%install
rm -fr $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%pre
if [ "$1" -gt 1 ] ; then
	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
	gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null

%preun
if [ "$1" -eq 0 ] ; then
	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
	gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%postun 
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man6/%{name}.6.gz

%changelog
* Wed Jun 18 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-3
- Rebuild against upstream's 0.11.2 tarball.
- Apply UTF8 conversion to AUTHORS file.
- Mark gconf schema file as config(noreplace).

* Wed Jun 05 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-2
- Cleaned up spec file compliance.
- Removed use of scrollkeeper until upstream fixes documentation.

* Wed Apr 13 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-1
- Initial Fedora package.


--- NEW FILE import.log ---
gnome-mud-0_11_2-3_fc11:HEAD:gnome-mud-0.11.2-3.fc11.src.rpm:1252712831


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mud/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:08:33 -0000	1.1
+++ .cvsignore	11 Sep 2009 23:48:21 -0000	1.2
@@ -0,0 +1 @@
+gnome-mud-0.11.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mud/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:08:33 -0000	1.1
+++ sources	11 Sep 2009 23:48:22 -0000	1.2
@@ -0,0 +1 @@
+aa41b2afb55158e7a9d2e14831223949  gnome-mud-0.11.2.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 11 23:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 23:50:53 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090911235053.CB5A110F881@bastion2.fedora.phx.redhat.com>

mfleming has set the watchbugzilla acl on pyicq-t (Fedora devel) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 11 23:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 23:50:56 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090911235056.4808410F890@bastion2.fedora.phx.redhat.com>

mfleming has set the watchcommits acl on pyicq-t (Fedora devel) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 11 23:51:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 23:51:15 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090911235115.3355810F895@bastion2.fedora.phx.redhat.com>

mfleming has set the watchbugzilla acl on pyicq-t (Fedora EPEL 5) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 11 23:51:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Sep 2009 23:51:15 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090911235115.B145610F884@bastion2.fedora.phx.redhat.com>

mfleming has set the watchcommits acl on pyicq-t (Fedora EPEL 5) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From elanthis at fedoraproject.org  Fri Sep 11 23:54:50 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Fri, 11 Sep 2009 23:54:50 +0000 (UTC)
Subject: rpms/gnome-mud/F-12 gnome-mud.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090911235450.1370911C0099@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/gnome-mud/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32101/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-mud.spec import.log 
Log Message:
* Wed Sep 11 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-3
- Commit for F-12.



--- NEW FILE gnome-mud.spec ---
Name:		gnome-mud
Version:	0.11.2
Release:	3%{?dist}
Summary:	A MUD client for GNOME

Group:		Amusements/Games
License:	GPLv2+
URL:		http://live.gnome.org/GnomeMud
Source:		http://ftp.gnome.org/pub/gnome/sources/%{name}/0.11/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: pcre-devel
BuildRequires: gstreamer-devel
BuildRequires: gnet2-devel
BuildRequires: vte-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
BuildRequires: libglade2-devel
BuildRequires: GConf2-devel

Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description
GNOME-MUD is a simple MUD client for GNOME. It supports scripting in
Python and C, and tabbed mudding.

%prep
%setup -q
iconv -f iso-8859-1 -t utf8 ./AUTHORS > ./AUTHORS.utf8
mv ./AUTHORS.utf8 ./AUTHORS

%build
%configure --enable-mccp --enable-gstreamer
make %{?_smp_mflags}

%install
rm -fr $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%pre
if [ "$1" -gt 1 ] ; then
	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
	gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null

%preun
if [ "$1" -eq 0 ] ; then
	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
	gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%postun 
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man6/%{name}.6.gz

%changelog
* Wed Jun 18 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-3
- Rebuild against upstream's 0.11.2 tarball.
- Apply UTF8 conversion to AUTHORS file.
- Mark gconf schema file as config(noreplace).

* Wed Jun 05 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-2
- Cleaned up spec file compliance.
- Removed use of scrollkeeper until upstream fixes documentation.

* Wed Apr 13 2009 Sean Middleditch <sean at middleditch.us> - 0.11.2-1
- Initial Fedora package.


--- NEW FILE import.log ---
gnome-mud-0_11_2-3_fc11:F-12:gnome-mud-0.11.2-3.fc11.src.rpm:1252713239


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mud/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:08:33 -0000	1.1
+++ .cvsignore	11 Sep 2009 23:54:49 -0000	1.2
@@ -0,0 +1 @@
+gnome-mud-0.11.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mud/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:08:33 -0000	1.1
+++ sources	11 Sep 2009 23:54:49 -0000	1.2
@@ -0,0 +1 @@
+aa41b2afb55158e7a9d2e14831223949  gnome-mud-0.11.2.tar.gz



From kevin at fedoraproject.org  Sat Sep 12 00:10:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 12 Sep 2009 00:10:40 +0000 (UTC)
Subject: rpms/supybot-meetbot/devel supybot-meetbot.spec, 1.6, 1.7 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <20090912001040.F0A4511C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4737

Modified Files:
	supybot-meetbot.spec sources .cvsignore 
Log Message:
Update to 0.1.4 release



Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/supybot-meetbot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- supybot-meetbot.spec	23 Aug 2009 18:15:11 -0000	1.6
+++ supybot-meetbot.spec	12 Sep 2009 00:10:39 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-meetbot
-Version:        0.1.3
+Version:        0.1.4
 Release:        1%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://wiki.debian.org/MeatBot
-Source0:        http://rkd.zgib.net/http/code/MeetBot-%{version}.tar.gz
+Source0:        http://code.zgib.net/tar//MeetBot-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       supybot
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-1
+- Update to 0.1.4 release. 
+
 * Sun Aug 23 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.3-1
 - Update to 0.1.3 release. 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 18:15:11 -0000	1.4
+++ sources	12 Sep 2009 00:10:39 -0000	1.5
@@ -1 +1 @@
-113a9c5ec0f8607e35821365c59d833d  MeetBot-0.1.3.tar.gz
+6d3997a46a9ce383ef6e09fc12ce9a06  MeetBot-0.1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 18:15:11 -0000	1.4
+++ .cvsignore	12 Sep 2009 00:10:39 -0000	1.5
@@ -1 +1 @@
-MeetBot-0.1.3.tar.gz
+MeetBot-0.1.4.tar.gz



From spot at fedoraproject.org  Sat Sep 12 00:17:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 00:17:17 +0000 (UTC)
Subject: rpms/collectd/devel .cvsignore, 1.9,
	1.10 collectd-4.6.2-configure-OpenIPMI.patch, 1.1,
	1.2 collectd-4.6.2-include-collectd.d.patch, 1.1,
	1.2 collectd.spec, 1.24, 1.25 sources, 1.9, 1.10
Message-ID: <20090912001717.96ADF11C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7117

Modified Files:
	.cvsignore collectd-4.6.2-configure-OpenIPMI.patch 
	collectd-4.6.2-include-collectd.d.patch collectd.spec sources 
Log Message:
4.6.5, excludearch ppc to get it building again


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Sep 2009 13:45:01 -0000	1.9
+++ .cvsignore	12 Sep 2009 00:17:15 -0000	1.10
@@ -1 +1 @@
-collectd-4.6.4.tar.bz2
+collectd-4.6.5.tar.bz2

collectd-4.6.2-configure-OpenIPMI.patch:
 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: collectd-4.6.2-configure-OpenIPMI.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.6.2-configure-OpenIPMI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- collectd-4.6.2-configure-OpenIPMI.patch	20 May 2009 10:40:50 -0000	1.1
+++ collectd-4.6.2-configure-OpenIPMI.patch	12 Sep 2009 00:17:15 -0000	1.2
@@ -1,29 +1,30 @@
---- configure.orig	2009-03-18 11:56:42.000000000 +0100
-+++ configure	2009-05-20 11:05:33.000000000 +0200
-@@ -40327,7 +40327,7 @@
+diff -up ./configure.orig ./configure
+--- ./configure.orig	2009-09-10 14:22:48.000000000 -0400
++++ ./configure	2009-09-11 19:39:02.408651561 -0400
+@@ -27913,7 +27913,7 @@ if test "x$with_libopenipmipthread" = "x
  then
- 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread" >&5
  $as_echo_n "checking for libOpenIPMIpthread... " >&6; }
 -	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
 +	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
  	if test "$?" != "0"
  	then
  		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
-@@ -40340,7 +40340,7 @@
+@@ -27926,7 +27926,7 @@ if test "x$with_libopenipmipthread" = "x
  then
- 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread CFLAGS" >&5
  $as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; }
 -	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
-+	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
++	temp_result="`$PKG_CONFIG --cflags OpenIPMI`"
  	if test "$?" = "0"
  	then
  		with_libopenipmipthread_cflags="$temp_result"
-@@ -40356,7 +40356,7 @@
+@@ -27942,7 +27942,7 @@ if test "x$with_libopenipmipthread" = "x
  then
- 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread LDFLAGS" >&5
  $as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; }
 -	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
-+ 	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
++	temp_result="`$PKG_CONFIG --libs OpenIPMI`"
  	if test "$?" = "0"
  	then
  		with_libopenipmipthread_ldflags="$temp_result"

collectd-4.6.2-include-collectd.d.patch:
 collectd.conf.in |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

Index: collectd-4.6.2-include-collectd.d.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.6.2-include-collectd.d.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- collectd-4.6.2-include-collectd.d.patch	20 May 2009 10:40:50 -0000	1.1
+++ collectd-4.6.2-include-collectd.d.patch	12 Sep 2009 00:17:15 -0000	1.2
@@ -1,6 +1,7 @@
---- collectd-4.6.2/src/collectd.conf.in.orig	2009-03-18 11:55:39.000000000 +0100
-+++ collectd-4.6.2/src/collectd.conf.in	2009-05-20 10:59:34.000000000 +0200
-@@ -26,7 +26,6 @@
+diff -up collectd-4.6.5/src/collectd.conf.in.orig collectd-4.6.5/src/collectd.conf.in
+--- collectd-4.6.5/src/collectd.conf.in.orig	2009-09-10 14:16:52.000000000 -0400
++++ collectd-4.6.5/src/collectd.conf.in	2009-09-11 19:34:18.865782426 -0400
+@@ -26,7 +26,6 @@ FQDNLookup   true
  #	LogLevel info
  #</Plugin>
  
@@ -8,7 +9,7 @@
  @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
  @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
  @BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
-@@ -39,45 +38,33 @@
+@@ -39,45 +38,33 @@ FQDNLookup   true
  @BUILD_PLUGIN_DBI_TRUE at LoadPlugin dbi
  @BUILD_PLUGIN_DF_TRUE at LoadPlugin df
  @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
@@ -54,8 +55,8 @@
  @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
  @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
  @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
-@@ -551,3 +538,5 @@
- #<Chain "Main">
+@@ -560,3 +547,5 @@ FQDNLookup   true
+ #<Chain "PostCache">
  #  Target "write"
  #</Chain>
 +


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- collectd.spec	2 Sep 2009 13:45:01 -0000	1.24
+++ collectd.spec	12 Sep 2009 00:17:15 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.6.4
+Version: 4.6.5
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
@@ -10,10 +10,6 @@ Source: http://collectd.org/files/%{name
 Patch0: %{name}-4.6.2-include-collectd.d.patch
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
 Patch1: %{name}-4.6.2-configure-OpenIPMI.patch
-# bug 516273 on upgrade collectd is not restarted
-Patch2: %{name}-4.5.4-fix-condrestart.patch
-# bug 480997 collectd does not re-connect to libvirtd
-Patch3: %{name}-4.5.4-libvirt-reconnect.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -35,6 +31,16 @@ BuildRequires: OpenIPMI-devel
 BuildRequires: postgresql-devel
 BuildRequires: nut-devel
 
+# In function 'strncpy',
+#    inlined from 'ping_send_one_ipv6' at liboping.c:626:
+# /usr/include/bits/string3.h:122: error: call to __builtin___strncpy_chk will always overflow destination buffer
+# In function 'strncpy',
+#    inlined from 'ping_send_one_ipv4' at liboping.c:579:
+# /usr/include/bits/string3.h:122: error: call to __builtin___strncpy_chk will always overflow destination buffer
+
+# PPC/PPC64 disabled due to above error.
+ExcludeArch: ppc ppc64
+
 %description
 collectd is a small daemon written in C for performance.  It reads various
 system  statistics  and updates  RRD files,  creating  them if necessary.
@@ -155,8 +161,6 @@ This plugin collects information from vi
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
-%patch3 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -431,6 +435,10 @@ fi
 
 
 %changelog
+* Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.6.5-1
+- update to 4.6.5
+- disable ppc/ppc64 due to compile error
+
 * Wed Sep 02 2009 Alan Pevec <apevec at redhat.com> 4.6.4-1
 - fix condrestart: on upgrade collectd is not restarted, bz# 516273
 - collectd does not re-connect to libvirtd, bz# 480997


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Sep 2009 13:45:01 -0000	1.9
+++ sources	12 Sep 2009 00:17:15 -0000	1.10
@@ -1 +1 @@
-f4a1b16c57ba946d24c0db910febb950  collectd-4.6.4.tar.bz2
+131e6fbb55f0cf6a069a98eedd21d293  collectd-4.6.5.tar.bz2



From kevin at fedoraproject.org  Sat Sep 12 00:19:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 12 Sep 2009 00:19:35 +0000 (UTC)
Subject: rpms/supybot-meetbot/devel supybot-meetbot.spec,1.7,1.8
Message-ID: <20090912001935.1244B11C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7890

Modified Files:
	supybot-meetbot.spec 
Log Message:
Fix url



Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/supybot-meetbot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- supybot-meetbot.spec	12 Sep 2009 00:10:39 -0000	1.7
+++ supybot-meetbot.spec	12 Sep 2009 00:19:34 -0000	1.8
@@ -2,12 +2,12 @@
 
 Name:           supybot-meetbot
 Version:        0.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
 License:        BSD
-URL:            http://wiki.debian.org/MeatBot
+URL:            http://wiki.debian.org/MeetBot
 Source0:        http://code.zgib.net/tar//MeetBot-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-2
+- Fix url
+
 * Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-1
 - Update to 0.1.4 release. 
 



From kevin at fedoraproject.org  Sat Sep 12 00:24:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 12 Sep 2009 00:24:48 +0000 (UTC)
Subject: rpms/supybot-meetbot/F-11 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5 supybot-meetbot.spec, 1.4, 1.5
Message-ID: <20090912002448.6FA4211C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9364

Modified Files:
	sources .cvsignore supybot-meetbot.spec 
Log Message:
Update to 0.1.4 release
Fix URL



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 18:27:26 -0000	1.4
+++ sources	12 Sep 2009 00:24:47 -0000	1.5
@@ -1 +1 @@
-113a9c5ec0f8607e35821365c59d833d  MeetBot-0.1.3.tar.gz
+6d3997a46a9ce383ef6e09fc12ce9a06  MeetBot-0.1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 18:27:26 -0000	1.4
+++ .cvsignore	12 Sep 2009 00:24:47 -0000	1.5
@@ -1 +1 @@
-MeetBot-0.1.3.tar.gz
+MeetBot-0.1.4.tar.gz


Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/supybot-meetbot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- supybot-meetbot.spec	23 Aug 2009 18:27:26 -0000	1.4
+++ supybot-meetbot.spec	12 Sep 2009 00:24:47 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-meetbot
-Version:        0.1.3
-Release:        1%{?dist}
+Version:        0.1.4
+Release:        2%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
 License:        BSD
-URL:            http://wiki.debian.org/MeatBot
-Source0:        http://rkd.zgib.net/http/code/MeetBot-%{version}.tar.gz
+URL:            http://wiki.debian.org/MeetBot
+Source0:        http://code.zgib.net/tar//MeetBot-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       supybot
@@ -43,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-2
+- Fix url
+
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-1
+- Update to 0.1.4 release. 
+
 * Sun Aug 23 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.3-1
 - Update to 0.1.3 release. 
 



From kevin at fedoraproject.org  Sat Sep 12 00:37:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 12 Sep 2009 00:37:09 +0000 (UTC)
Subject: rpms/supybot-meetbot/devel supybot-meetbot.spec,1.8,1.9
Message-ID: <20090912003709.BE72211C0099@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13246

Modified Files:
	supybot-meetbot.spec 
Log Message:
Add default css files



Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/supybot-meetbot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- supybot-meetbot.spec	12 Sep 2009 00:19:34 -0000	1.8
+++ supybot-meetbot.spec	12 Sep 2009 00:37:06 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           supybot-meetbot
 Version:        0.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
@@ -33,6 +33,7 @@ easy to port to other bots. It is under 
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
 install -pm 644 *.py $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
+install -pm 644 *.css $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-3
+- Add default css files. 
+
 * Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-2
 - Fix url
 



From kevin at fedoraproject.org  Sat Sep 12 00:50:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 12 Sep 2009 00:50:55 +0000 (UTC)
Subject: rpms/supybot-meetbot/F-11 supybot-meetbot.spec,1.5,1.6
Message-ID: <20090912005055.36C1911C0425@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18817

Modified Files:
	supybot-meetbot.spec 
Log Message:
Add default css files



Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/supybot-meetbot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- supybot-meetbot.spec	12 Sep 2009 00:24:47 -0000	1.5
+++ supybot-meetbot.spec	12 Sep 2009 00:50:54 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           supybot-meetbot
 Version:        0.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
@@ -33,6 +33,7 @@ easy to port to other bots. It is under 
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
 install -pm 644 *.py $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
+install -pm 644 *.css $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-3
+- Add default css files. 
+
 * Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-2
 - Fix url
 



From spot at fedoraproject.org  Sat Sep 12 00:56:43 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 00:56:43 +0000 (UTC)
Subject: rpms/cpptasks/F-11 cpptasks.spec,1.3,1.4
Message-ID: <20090912005643.2DD5911C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/cpptasks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21751/F-11

Modified Files:
	cpptasks.spec 
Log Message:
IMPORTANT: Packages must be upgradable, F-10 was newer than F-11 and devel


Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-11/cpptasks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpptasks.spec	6 Sep 2009 12:57:49 -0000	1.3
+++ cpptasks.spec	12 Sep 2009 00:56:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -129,8 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
-* Sun Sep 06 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
-- Add whitespace to Req
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-5
+- Req needs whitespace
+
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
+- tag bump
 
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove excess BR



From spot at fedoraproject.org  Sat Sep 12 00:56:43 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 00:56:43 +0000 (UTC)
Subject: rpms/cpptasks/devel cpptasks.spec,1.3,1.4
Message-ID: <20090912005643.47C6C11C02C6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/cpptasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21751/devel

Modified Files:
	cpptasks.spec 
Log Message:
IMPORTANT: Packages must be upgradable, F-10 was newer than F-11 and devel


Index: cpptasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/devel/cpptasks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpptasks.spec	6 Sep 2009 12:54:22 -0000	1.3
+++ cpptasks.spec	12 Sep 2009 00:56:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Compile and link task for ant
 
 Group:		Development/Libraries
@@ -129,8 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
-* Sun Sep 06 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
-- Insert space needed for subdep 
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-5
+- Req needs whitespace
+
+* Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-4
+- tag bump
 
 * Thu Sep 03 2009 D Haley <mycae at yahoo.com> - 1.0b5-3
 - Remove excess BR



From ausil at fedoraproject.org  Sat Sep 12 02:25:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 12 Sep 2009 02:25:08 +0000 (UTC)
Subject: rpms/grub2/devel grub2.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <20090912022508.85D8911C0099@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/grub2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26636

Modified Files:
	grub2.spec sources 
Log Message:
update svn snapshot
add sparc support



Index: grub2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/devel/grub2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- grub2.spec	25 Jul 2009 01:31:50 -0000	1.7
+++ grub2.spec	12 Sep 2009 02:25:07 -0000	1.8
@@ -1,80 +1,52 @@
 # Modules always contain just 32-bit code
 %define _libdir %{_exec_prefix}/lib
 
-# 64bit machines use 32bit boot loader
+# 64bit intel machines use 32bit boot loader
 # (We cannot just redefine _target_cpu, as we'd get i386.rpm packages then)
 %ifarch x86_64
 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
 %endif
-
-# Hack to include debuginfo for files, that find-debuginfo.sh wouldn't
-# have spot, because they're either no longer ELF images, such as
-# boot images, or are brutally and insensitively stripped, such as
-# modules. See %%install.
-# It's certainly not the nicest thing you've ever seen.
-# THAT IS NOT MY FAULT.
-# We do not use find-debuginfo.sh -o here, as it's not supported in RHEL5
-%define __debug_install_post                                            \
-                                                                        \
-        # Gather debuginfo as usual                                     \
-        /usr/lib/rpm/find-debuginfo.sh                                \\\
-                %{_builddir}/%{?buildsubdir}                            \
-                mv debugfiles.list debug1.list                          \
-                                                                        \
-        # Gather debuginfo of modules from shadow build root            \
-        RPM_BUILD_ROOT=%{_builddir}/%{?buildsubdir}/.debugroot        \\\
-                /usr/lib/rpm/find-debuginfo.sh                        \\\
-                %{_builddir}/%{?buildsubdir}                            \
-                mv debugfiles.list debug2.list                          \
-                                                                        \
-        # Merge debuginfos                                              \
-        cp -a %{_builddir}/%{?buildsubdir}/.debugroot/usr/lib/debug   \\\
-                $RPM_BUILD_ROOT/usr/lib                                 \
-        cp -a %{_builddir}/%{?buildsubdir}/.debugroot/usr/src/debug   \\\
-                $RPM_BUILD_ROOT/usr/src                                 \
-        sort debug1.list debug2.list |uniq >debugfiles.list             \
-                                                                        \
-        %{nil}
+#sparc is always compile 64 bit
+%ifarch %{sparc}
+%define _target_platform sparc64-%{_vendor}-%{_target_os}%{?_gnu}
+%endif
 
 Name:           grub2
 Version:        1.98
-Release:        0.6.20080827svn%{?dist}
+Release:        0.6.20090911svn%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
 License:        GPLv3+
 URL:            http://www.gnu.org/software/grub/
 #Source0:        http://alpha.gnu.org/pub/gnu/grub/grub-%{version}.tar.gz
-# svn -r1829 co svn://svn.sv.gnu.org/grub/trunk/grub2
+# svn -r2587 co svn://svn.sv.gnu.org/grub/trunk/grub2
 # tar czf grub2.tar.gz --exclude .svn grub2
 Source0:        grub2.tar.gz
 Source1:        90_persistent
 Source2:        grub.default
 Source3:        README.Fedora
-Patch1:         grub-1.98-prototypes.patch
-Patch2:         grub-1.98-transform.patch
-Patch4:         grub-1.95-grubdir.patch
-Patch5:         grub-1.98-os.patch
-Patch6:         grub-1.97-cfgmode.patch
-Patch7:         grub-1.96-garbage.patch
-Patch8:         grub-1.98-persistent.patch
-Patch9:         grub-1.98-linuxsort.patch
-Patch10:        http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
-#Patch13:        http://fedorapeople.org/~lkundrak/grub2/grub2-preserve-symbols-v4.patch
-Patch13:        grub2-preserve-symbols-v4.1.patch
+Patch0:         grub-1.95-grubdir.patch
+Patch1:        http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex bison ruby binutils
 BuildRequires:  ncurses-devel lzo-devel
+BuildRequires:  freetype2-devel libusb-devel
+%ifarch %{sparc}
+BuildRequires:  /usr/lib64/crt1.o glibc-static
+%else
 BuildRequires:  /usr/lib/crt1.o glibc-static
+%endif
+BuildRequires:  autoconf automake
 
 # grubby
 Requires(pre):  mkinitrd
 Requires(post): mkinitrd
 
 # TODO: ppc and sparc
-ExclusiveArch:  %{ix86} x86_64
+ExclusiveArch:  %{ix86} x86_64 %{sparc}
 
 %description
 This is the second version of the GRUB (Grand Unified Bootloader),
@@ -92,26 +64,23 @@ file that is part of this package's docu
 %prep
 %setup -q -n grub2
 
-%patch1 -p0 -b .prototypes
-%patch2 -p1 -b .transform
-%patch4 -p1 -b .grubdir
-%patch5 -p1 -b .os
-%patch6 -p1 -b .cfgmode
-%patch7 -p1 -b .garbage
-%patch8 -p1 -b .persistent
-%patch9 -p0 -b .linuxsort
-%patch10 -p1 -b .dlsym
-%patch13 -p1 -b .preserve-symbols
+%patch0 -p1 -b .grubdir
+%patch1 -p1 -b .dlsym
 
 # README.Fedora
 cp %{SOURCE3} .
 
 
 %build
+sh autogen.sh
 # -static is needed so that autoconf script is able to link
 # test that looks for _start symbol on 64 bit platforms
 %configure TARGET_LDFLAGS=-static       \
+%ifarch %{sparc}
+        --with-platform=ieee1275        \
+%else
         --with-platform=pc              \
+%endif
         --enable-grub-emu               \
         --program-transform-name=s,grub,%{name},
 # TODO: Other platforms. Use alternatives system?
@@ -120,11 +89,11 @@ cp %{SOURCE3} .
 #       --with-platform=i386-pc         \
 
 
-#make %{?_smp_mflags}
+make %{?_smp_mflags}
 #gcc -Inormal -I./normal -I. -Iinclude -I./include -Wall -W -DGRUB_LIBDIR=\"/usr/lib/`echo grub/i386-pc | sed 's&^&&;s,grub,grub2,'`\" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -DGRUB_UTIL=1  -MD -c -o grub_emu-normal_lexer.o normal/lexer.c
 #In file included from normal/lexer.c:23:
 #include/grub/script.h:26:29: error: grub_script.tab.h: No such file or directory
-make
+#make
 
 
 %install
@@ -151,7 +120,7 @@ do
         # have both boot.img and boot.mod ...
         EXT=$(echo $MODULE |grep -q '.mod' && echo '.elf' || echo '.exec')
         TGT=$(echo $MODULE |sed "s,$RPM_BUILD_ROOT,.debugroot,")
-        install -m 755 -D $BASE$EXT $TGT
+#        install -m 755 -D $BASE$EXT $TGT
 done
 
 # Defaults
@@ -190,28 +159,31 @@ rm -f /boot/%{name}/device.map
 %triggerin -- kernel, kernel-PAE
 exec >/dev/null 2>&1
 # Generate grub.cfg
-update-%{name}
+%{name}-mkconfig
 
 
 %triggerun -- kernel, kernel-PAE
 exec >/dev/null 2>&1
 # Generate grub.cfg
-update-%{name}
+%{name}-mkconfig
 
 
 %files
 %defattr(-,root,root,-)
 %{_libdir}/%{name}
+%{_libdir}/grub/
 %{_sbindir}/%{name}-mkdevicemap
 %{_sbindir}/%{name}-install
 %{_sbindir}/%{name}-emu
 %{_sbindir}/%{name}-probe
 %{_sbindir}/%{name}-setup
-%{_sbindir}/update-%{name}
+%{_sbindir}/%{name}-dumpbios
+%{_sbindir}/%{name}-mkconfig
+%{_sbindir}/%{name}-ofpathname
 %{_bindir}/%{name}-mkimage
 %{_bindir}/%{name}-mkelfimage
-%{_bindir}/%{name}-mkrescue
 %{_bindir}/%{name}-editenv
+%{_bindir}/%{name}-fstest                     
 %dir %{_sysconfdir}/grub.d
 %config %{_sysconfdir}/grub.d/??_*
 %{_sysconfdir}/grub.d/README
@@ -224,8 +196,15 @@ update-%{name}
 %doc COPYING INSTALL NEWS README THANKS TODO ChangeLog README.Fedora
 %exclude %{_mandir}
 
+%{_includedir}/grub/
+%{_includedir}/multiboot*.h
+
 
 %changelog
+* Fri Sep 11 2009 Dennis Gilmore <dennis at ausil.us - 1.9-0.6.20090911svn
+- update to new svn snapshot
+- add sparc support
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.98-0.6.20080827svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 09:06:33 -0000	1.3
+++ sources	12 Sep 2009 02:25:07 -0000	1.4
@@ -1 +1 @@
-27ca6fe1350ec41ed79e31a404c055fb  grub2.tar.gz
+2f22e7c338fffbf44bc58cdc980eefd8  grub2.tar.gz



From alexlan at fedoraproject.org  Sat Sep 12 03:26:01 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sat, 12 Sep 2009 03:26:01 +0000 (UTC)
Subject: rpms/tellico/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 tellico.spec, 1.36, 1.37
Message-ID: <20090912032601.D27BA11C0099@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12020

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Fri Sep 11 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-0.1.pre2
- Update to upstream version 2.0 pre-release 2
- Drop gcc4 patch, now upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	5 Mar 2009 11:08:38 -0000	1.17
+++ .cvsignore	12 Sep 2009 03:26:00 -0000	1.18
@@ -1 +1 @@
-tellico-1.3.5.tar.gz
+tellico-2.0pre2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	5 Mar 2009 11:08:38 -0000	1.17
+++ sources	12 Sep 2009 03:26:00 -0000	1.18
@@ -1 +1 @@
-ca5d9db11fa1dd33dfe317ffe095435c  tellico-1.3.5.tar.gz
+d4905872c16fa7e120b936ac0c1c7c3e  tellico-2.0pre2.tar.bz2


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- tellico.spec	27 Jul 2009 05:45:48 -0000	1.36
+++ tellico.spec	12 Sep 2009 03:26:00 -0000	1.37
@@ -1,15 +1,15 @@
 Name:           tellico
-Version:        1.3.5
-Release:        2%{?dist}
+Version:        2.0
+Release:        0.1.pre2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.periapsis.org/tellico/
-Source0:        http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz
-Patch0:         %{name}-1.3.5-gcc44.patch
+Source0:        http://www.periapsis.org/tellico/download/%{name}-%{version}pre2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake >= 2.6.2-3
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -22,7 +22,12 @@ BuildRequires:  taglib-devel
 BuildRequires:  libyaz-devel
 BuildRequires:  exempi-devel
 BuildRequires:  poppler-qt-devel
-BuildRequires:  kdelibs3-devel
+BuildRequires:  kdelibs4-devel
+BuildRequires:  qimageblitz-devel
+BuildRequires:  poppler-qt4-devel
+BuildRequires:  kdepimlibs-devel
+BuildRequires:  kdemultimedia-devel
+BuildRequires:  kdegraphics-devel
 
 %if 0%{?fedora} < 10
 BuildRequires:  kdepim3-devel
@@ -52,17 +57,21 @@ directly from Amazon.com.
 
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}pre2
 
 %build
-%configure --disable-rpath --enable-webcam
-make %{?_smp_mflags}
 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
+popd
+
+#configure --disable-rpath --enable-webcam
+make %{?_smp_mflags}  -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT  -C %{_target_platform}
 %find_lang %{name}
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
@@ -74,9 +83,9 @@ done
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
   --add-category X-Fedora                           \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*
 
 
 %post
@@ -100,19 +109,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
+%doc AUTHORS ChangeLog COPYING
 %{_bindir}/*
-%{_datadir}/applications/kde/tellico.desktop
-%{_datadir}/apps/kconf_update/
+%{_datadir}/applications/kde4/tellico.desktop
+%{_datadir}/kde4/apps/kconf_update/
 %{_datadir}/config.kcfg/tellico_config.kcfg
 %{_datadir}/config/tellicorc
-%{_datadir}/apps/tellico/
+%{_datadir}/config/tellico-script.knsrc
+%{_datadir}/config/tellico-template.knsrc
+%{_datadir}/kde4/apps/tellico/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/application/x-tellico.desktop
 %{_datadir}/mime/packages/tellico.xml
 
 
 %changelog
+* Fri Sep 11 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-0.1.pre2
+- Update to upstream version 2.0 pre-release 2
+- Drop gcc4 patch, now upstream
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Sat Sep 12 03:37:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 12 Sep 2009 03:37:01 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.123,
	1.124 setroubleshoot.spec, 1.163, 1.164 sources, 1.136, 1.137
Message-ID: <20090912033701.F254711C0099@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14585

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Fri Sep 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.28-1
	-  Fix permissive domain check



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- .cvsignore	10 Sep 2009 19:35:31 -0000	1.123
+++ .cvsignore	12 Sep 2009 03:37:01 -0000	1.124
@@ -40,3 +40,4 @@ setroubleshoot-2.2.23.tar.gz
 setroubleshoot-2.2.24.tar.gz
 setroubleshoot-2.2.26.tar.gz
 setroubleshoot-2.2.27.tar.gz
+setroubleshoot-2.2.28.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- setroubleshoot.spec	10 Sep 2009 19:35:31 -0000	1.163
+++ setroubleshoot.spec	12 Sep 2009 03:37:01 -0000	1.164
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.27
+Version: 2.2.28
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Fri Sep 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.28-1
+	-  Fix permissive domain check
+
 * Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.27-1
 - Close open file descriptors on exec
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- sources	10 Sep 2009 19:35:31 -0000	1.136
+++ sources	12 Sep 2009 03:37:01 -0000	1.137
@@ -1 +1 @@
-e6ee1f4df60f61ed745962fe690a1431  setroubleshoot-2.2.27.tar.gz
+069167f0519fe2f3b9da2658d17b82e8  setroubleshoot-2.2.28.tar.gz



From mclasen at fedoraproject.org  Sat Sep 12 03:56:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 12 Sep 2009 03:56:02 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.250,1.251
Message-ID: <20090912035602.977BA11C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19992

Modified Files:
	gnome-session.spec 
Log Message:
Fix file list



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- gnome-session.spec	9 Sep 2009 20:07:40 -0000	1.250
+++ gnome-session.spec	12 Sep 2009 03:56:02 -0000	1.251
@@ -165,7 +165,6 @@ fi
 %dir %{_libdir}/gnome-session
 %dir %{_libdir}/gnome-session/helpers
 %{_libdir}/gnome-session/helpers/*
-%{_sysconfdir}/xdg/autostart/at-spi-registryd-wrapper.desktop
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop
 
 



From cweyl at fedoraproject.org  Sat Sep 12 04:19:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 12 Sep 2009 04:19:03 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.30,1.31
Message-ID: <20090912041903.B1EC411C00CE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16957

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> - 1.25-4
- Filtering errant private provides



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- perl-DBD-SQLite.spec	26 Jul 2009 05:21:28 -0000	1.30
+++ perl-DBD-SQLite.spec	12 Sep 2009 04:19:03 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
 Version:        1.25
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -22,6 +22,8 @@ BuildRequires:  perl(DBI) >= 1.607
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 SQLite is a public domain RDBMS database engine that you can find at
 http://www.hwaci.com/sw/sqlite/.
@@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> - 1.25-4
+- Filtering errant private provides
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Sat Sep 12 05:36:21 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 12 Sep 2009 05:36:21 +0000 (UTC)
Subject: rpms/qt-creator/devel .cvsignore, 1.6, 1.7 import.log, 1.6,
	1.7 qt-creator.spec, 1.8, 1.9 sources, 1.6,
	1.7 qt-creator-1.2.0-qtcreatorwidgets_pro.patch, 1.1,
	NONE qtdoc3_location.patch, 1.1, NONE
Message-ID: <20090912053621.7828411C00CE@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4241/devel

Modified Files:
	.cvsignore import.log qt-creator.spec sources 
Removed Files:
	qt-creator-1.2.0-qtcreatorwidgets_pro.patch 
	qtdoc3_location.patch 
Log Message:
- snapshot version 1.2.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Aug 2009 17:02:14 -0000	1.6
+++ .cvsignore	12 Sep 2009 05:36:21 -0000	1.7
@@ -1 +1 @@
-qt-creator-1.2.1-src.tar.gz
+qt-creator-1.2.90-src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	14 Jul 2009 14:26:43 -0000	1.6
+++ import.log	12 Sep 2009 05:36:21 -0000	1.7
@@ -4,3 +4,4 @@ qt-creator-1_1_0-2_fc11:HEAD:qt-creator-
 qt-creator-1_2_0-1_fc11:HEAD:qt-creator-1.2.0-1.fc11.src.rpm:1246231788
 qt-creator-1_2_0-2_fc11:HEAD:qt-creator-1.2.0-2.fc11.src.rpm:1247501081
 qt-creator-1_2_1-1_fc11:HEAD:qt-creator-1.2.1-1.fc11.src.rpm:1247581546
+qt-creator-1_2_90-1_fc12:HEAD:qt-creator-1.2.90-1.fc12.src.rpm:1252733747


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- qt-creator.spec	12 Aug 2009 17:02:15 -0000	1.8
+++ qt-creator.spec	12 Sep 2009 05:36:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           qt-creator
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.2.90
+Release:        1%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -11,11 +11,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Source1:       qtcreator.desktop
 
-# make it install into lib/lib64
-Patch0:         qt-creator-1.2.0-qtcreatorwidgets_pro.patch
-#fix qdoc3 executable location in fedora
-Patch1:         qtdoc3_location.patch
-
 Requires:       hicolor-icon-theme
 BuildRequires:  qt4-devel >= 4.5.0
 BuildRequires:  desktop-file-utils
@@ -28,14 +23,6 @@ even faster and easier.
 
 %prep
 %setup -q -n %name-%version-src
-%patch0 -p1
-%patch1 -p0
-
-#make it install into lib64
-#%if "%{_lib}" == "lib64"
-#%patch0 -p2
-#%endif
-
 
 %build
 QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
@@ -96,6 +83,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
+* Sat Sep 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.90-1
+- new version 1.2.90 (Qt Creator Technology Snapshot 1.2.90)
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2.1-3
 - Use upstream gzipped tarball instead of zip.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Aug 2009 17:02:15 -0000	1.6
+++ sources	12 Sep 2009 05:36:21 -0000	1.7
@@ -1 +1 @@
-4025308096e49dd76946fa4fd8d1b95e  qt-creator-1.2.1-src.tar.gz
+ef8d7e5a7e52c282dc369a0935a68d2f  qt-creator-1.2.90-src.tar.gz


--- qt-creator-1.2.0-qtcreatorwidgets_pro.patch DELETED ---


--- qtdoc3_location.patch DELETED ---



From cebbert at fedoraproject.org  Sat Sep 12 05:46:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 12 Sep 2009 05:46:31 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.7-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1054, 1.1055 kernel.spec, 1.1732, 1.1733 sources, 1.1016,
	1.1017 upstream, 1.927,
	1.928 linux-2.6-slub-fix-destroy-by-rcu.patch, 1.1, NONE
Message-ID: <20090912054631.4142011C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7097

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.7-rc1.bz2.sign 
Removed Files:
	linux-2.6-slub-fix-destroy-by-rcu.patch 
Log Message:
2.6.30.7-rc1
Drop patches merged in -stable:
   linux-2.6-slub-fix-destroy-by-rcu.patch


--- NEW FILE patch-2.6.30.7-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKqeF9yGugalF9Dw4RAiX3AJ4vRvUhAHlXHxeKdae+u8c10dvb/gCdHyZK
kzW0xqhc9yMThWqd821VL/Y=
=TtpE
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1054
retrieving revision 1.1055
diff -u -p -r1.1054 -r1.1055
--- .cvsignore	9 Sep 2009 04:43:29 -0000	1.1054
+++ .cvsignore	12 Sep 2009 05:46:30 -0000	1.1055
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.30.6.bz2
+patch-2.6.30.7-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1732
retrieving revision 1.1733
diff -u -p -r1.1732 -r1.1733
--- kernel.spec	10 Sep 2009 21:15:37 -0000	1.1732
+++ kernel.spec	12 Sep 2009 05:46:30 -0000	1.1733
@@ -40,9 +40,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -731,9 +731,6 @@ Patch14000: make-mmap_min_addr-suck-less
 Patch14050: hda-check-strcpy-length.patch
 Patch14060: linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
 
-# fix bug introduced in 2.6.30.4
-Patch14070: linux-2.6-slub-fix-destroy-by-rcu.patch
-
 # fix stack protector problems with xen on x86_64
 Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
@@ -1368,9 +1365,6 @@ ApplyPatch linux-2.6-v4l-dvb-af9015-fix-
 ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
-# fix 2.6.30.4 bug
-ApplyPatch linux-2.6-slub-fix-destroy-by-rcu.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1959,6 +1953,11 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-54.rc1
+- 2.6.30.7-rc1
+- Drop patches merged in -stable:
+   linux-2.6-slub-fix-destroy-by-rcu.patch
+
 * Thu Sep 10 2009 Dennis Gilmore <dennis at ausil.us> 2.6.30.6-53
 - kgdb only works on sparc64 smp kernels so disable on the up one and enable on the smp one
 - update to 256 cpus supported on sparc64 smp


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1016
retrieving revision 1.1017
diff -u -p -r1.1016 -r1.1017
--- sources	9 Sep 2009 04:43:29 -0000	1.1016
+++ sources	12 Sep 2009 05:46:30 -0000	1.1017
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 f89295707f68c2b349534b490c9d5f2d  patch-2.6.30.6.bz2
+240ff5b047ddbb6adb7b08dca99b4a4a  patch-2.6.30.7-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -p -r1.927 -r1.928
--- upstream	9 Sep 2009 04:43:29 -0000	1.927
+++ upstream	12 Sep 2009 05:46:30 -0000	1.928
@@ -1,3 +1,4 @@
 linux-2.6.30.tar.bz2
 patch-2.6.30.6.bz2
+patch-2.6.30.7-rc1.bz2
 


--- linux-2.6-slub-fix-destroy-by-rcu.patch DELETED ---



From iarnell at fedoraproject.org  Sat Sep 12 05:21:33 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 12 Sep 2009 05:21:33 +0000 (UTC)
Subject: rpms/perl-Net-Amazon/devel .cvsignore, 1.6, 1.7 perl-Net-Amazon.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090912052133.F107D11C00CE@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Net-Amazon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv605

Modified Files:
	.cvsignore perl-Net-Amazon.spec sources 
Log Message:
* Sat Sep 12 2009 Iain Arnell <iarnell at gmail.com> 0.57-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Aug 2009 15:12:28 -0000	1.6
+++ .cvsignore	12 Sep 2009 05:21:33 -0000	1.7
@@ -1 +1 @@
-Net-Amazon-0.55.tar.gz
+Net-Amazon-0.57.tar.gz


Index: perl-Net-Amazon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/perl-Net-Amazon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Net-Amazon.spec	5 Aug 2009 15:12:29 -0000	1.6
+++ perl-Net-Amazon.spec	12 Sep 2009 05:21:33 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Net-Amazon
-Version:        0.55
+Version:        0.57
 Release:        1%{?dist}
 Summary:        Framework for accessing amazon.com via REST
 License:        GPL+ or Artistic
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 12 2009 Iain Arnell <iarnell at gmail.com> 0.57-1
+- update to latest upstream
+
 * Wed Aug 05 2009 Iain Arnell <iarnell at gmail.com> 0.55-1
 - update to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Aug 2009 15:12:29 -0000	1.6
+++ sources	12 Sep 2009 05:21:33 -0000	1.7
@@ -1 +1 @@
-cd2eec3cedd46060faf3b47dbf9b147a  Net-Amazon-0.55.tar.gz
+4102b885555e5acfcc6caae42422f82e  Net-Amazon-0.57.tar.gz



From akurtakov at fedoraproject.org  Sat Sep 12 06:41:13 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 06:41:13 +0000 (UTC)
Subject: rpms/maven-plugin-exec/devel maven-plugin-exec.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090912064114.1A43811C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-exec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23343/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maven-plugin-exec.spec 
Log Message:
Initial import.


--- NEW FILE maven-plugin-exec.spec ---
Name:           maven-plugin-exec
Version:        1.1
Release:        1%{?dist}
Summary:        Exec Maven Plugin

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://mojo.codehaus.org/exec-maven-plugin
# The source tarball has been generated from upstream VCS:
# svn export https://svn.codehaus.org/mojo/tags/exec-maven-plugin-%{version} 
#            %{name}-%{version}
# tar cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: maven2
BuildRequires: maven2-common-poms >= 1.0-10
BuildRequires: plexus-utils
BuildRequires: plexus-container-default
BuildRequires: maven-shared-plugin-testing-harness
BuildRequires: maven2-plugin-remote-resources
BuildRequires: maven2-plugin-plugin
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-enforcer
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-doxia-sitetools
Requires: maven2
Requires: plexus-utils
Requires: plexus-container-default
Requires: maven-shared-plugin-testing-harness
Requires(post): jpackage-utils
Requires(postun): jpackage-utils

%description
A plugin to allow execution of system and Java programs

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.


%prep
%setup -q 

#there is nothing under MIT license
rm -f LICENSE.txt

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.skip=true \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 target/exec-maven-plugin-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.codehaus.mojo exec-maven-plugin %{version} JPP maven-plugin-exec

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_datadir}/maven2/poms/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Fri Sep 11 2009 Alexander Kurtakov <akurtako at gmail.com> 1.1-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-exec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:18:22 -0000	1.1
+++ .cvsignore	12 Sep 2009 06:41:11 -0000	1.2
@@ -0,0 +1 @@
+maven-plugin-exec-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-exec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:18:22 -0000	1.1
+++ sources	12 Sep 2009 06:41:12 -0000	1.2
@@ -0,0 +1 @@
+15b15a06479e8a3d821c2ca0e811e128  maven-plugin-exec-1.1.tar.bz2



From akurtakov at fedoraproject.org  Sat Sep 12 06:42:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 06:42:06 +0000 (UTC)
Subject: rpms/maven-plugin-build-helper/devel maven-plugin-build-helper.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090912064206.0279311C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-build-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23904/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maven-plugin-build-helper.spec 
Log Message:
Initial import.


--- NEW FILE maven-plugin-build-helper.spec ---
Name:           maven-plugin-build-helper
Version:        1.4
Release:        1%{?dist}
Summary:        Build Helper Maven Plugin

Group:          Development/Libraries
License:        MIT and ASL 2.0
URL:            http://mojo.codehaus.org/build-helper-maven-plugin/
# The source tarball has been generated from upstream VCS:
# svn export https://svn.codehaus.org/mojo/tags/build-helper-maven-plugin-%{version} 
#            %{name}-%{version}
# tar cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
Source0:        maven-plugin-build-helper-1.4.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: plexus-utils
BuildRequires: maven-plugin-cobertura
BuildRequires: maven2-plugin-plugin
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-enforcer
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
Requires: plexus-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils

%description
This plugin contains various small independent goals to assist with
Maven build lifecycle.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q 

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        package javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/build-helper-maven-plugin-%{version}.jar \
  %{buildroot}%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.codehaus.mojo build-helper-maven-plugin %{version} JPP maven-plugin-build-helper

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%clean
%{__rm} -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_datadir}/maven2/poms/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Thu Sep 10 2009 Alexander Kurtakov <akurtako at gmail.com> 1.4-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-build-helper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:17:35 -0000	1.1
+++ .cvsignore	12 Sep 2009 06:42:05 -0000	1.2
@@ -0,0 +1 @@
+maven-plugin-build-helper-1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-build-helper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:17:35 -0000	1.1
+++ sources	12 Sep 2009 06:42:05 -0000	1.2
@@ -0,0 +1 @@
+61c11643828eb9027168e2b55534bed6  maven-plugin-build-helper-1.4.tar.bz2



From akurtakov at fedoraproject.org  Sat Sep 12 08:25:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 08:25:34 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.21,1.22
Message-ID: <20090912082534.8F89511C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27889/devel

Modified Files:
	maven-jxr.spec 
Log Message:
Fix jxr plugin pom name.


Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- maven-jxr.spec	11 Sep 2009 16:17:10 -0000	1.21
+++ maven-jxr.spec	12 Sep 2009 08:25:33 -0000	1.22
@@ -32,7 +32,7 @@
 
 Name:           maven-jxr
 Version:        2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
@@ -165,7 +165,7 @@ install -pm 644 maven-jxr-plugin/target/
                 $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr-%{version}.jar
                 
 install -pm 644 maven-jxr-plugin/pom.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-jxr-plugin.pom
+        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-jxr.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -213,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-5
+- Fix jxr plugin pom name.
+
 * Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-4
 - Add BR for maven2-plugin.site.
 - BR tomcat5-servlet-api.



From mschwendt at fedoraproject.org  Sat Sep 12 08:56:16 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 12 Sep 2009 08:56:16 +0000 (UTC)
Subject: rpms/audacious/devel audacious.spec,1.51,1.52
Message-ID: <20090912085617.12C0911C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3964

Modified Files:
	audacious.spec 
Log Message:
* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
- Build with --enable-samplerate (off by default), BR libsamplerate-devel



Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- audacious.spec	24 Aug 2009 09:21:24 -0000	1.51
+++ audacious.spec	12 Sep 2009 08:56:15 -0000	1.52
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -30,7 +30,7 @@ BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils
 
 # disabled by default
-#BuildRequires: libsamplerate-devel
+BuildRequires: libsamplerate-devel
 
 # The automatic SONAME dependency is not enough
 # during version upgrades.
@@ -75,6 +75,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
 %configure  \
+    --enable-samplerate \
     --disable-sse2  \
     --disable-rpath \
     --disable-dependency-tracking
@@ -152,6 +153,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
+- Build with --enable-samplerate (off by default), BR libsamplerate-devel
+
 * Mon Aug 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-3
 - Default to PulseAudio output plugin: Fix pluginenum.c indentation
   to make output plugin default/priority init work. Actually, when I



From akurtakov at fedoraproject.org  Sat Sep 12 08:56:23 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 08:56:23 +0000 (UTC)
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.22,1.23
Message-ID: <20090912085623.37F0E11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-jxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4022/devel

Modified Files:
	maven-jxr.spec 
Log Message:
Install maven-jxr parent pom.



Index: maven-jxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- maven-jxr.spec	12 Sep 2009 08:25:33 -0000	1.22
+++ maven-jxr.spec	12 Sep 2009 08:56:23 -0000	1.23
@@ -32,7 +32,7 @@
 
 Name:           maven-jxr
 Version:        2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
@@ -154,9 +154,11 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_dat
 
 install -pm 644 maven-jxr/target/%{name}-%{version}.jar \
                 $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%add_to_maven_depmap org.apache.maven.jxr jxr %{version} JPP %{name}-parent
 %add_to_maven_depmap org.apache.maven maven-jxr %{version} JPP %{name}
 
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
+install -pm 644 maven-jxr/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 %if %{with_maven}
 # maven-jxr plugin
@@ -213,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-6
+- Install maven-jxr parent pom.
+
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-5
 - Fix jxr plugin pom name.
 



From mschwendt at fedoraproject.org  Sat Sep 12 08:57:44 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 12 Sep 2009 08:57:44 +0000 (UTC)
Subject: rpms/audacious/F-11 audacious.spec,1.46,1.47
Message-ID: <20090912085744.5EC0F11C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4514

Modified Files:
	audacious.spec 
Log Message:
* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
- Build with --enable-samplerate (off by default), BR libsamplerate-devel



Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-11/audacious.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- audacious.spec	5 Jun 2009 11:12:56 -0000	1.46
+++ audacious.spec	12 Sep 2009 08:57:44 -0000	1.47
@@ -4,7 +4,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        GTK2 based media player similar to XMMS
 
 Group:          Applications/Multimedia
@@ -36,6 +36,9 @@ BuildRequires:  mcs-devel >= 0.7
 BuildRequires:  libmowgli-devel >= 0.4
 BuildRequires:  dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 
+# disabled by default
+BuildRequires: libsamplerate-devel
+
 Requires:       audacious-plugins >= %{aud_ver}
 
 # last tagged f8-final
@@ -121,6 +124,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
 %configure \
+    --enable-samplerate \
     --disable-rpath \
     --enable-chardet \
     --enable-dbus \
@@ -203,6 +207,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
+- Build with --enable-samplerate (off by default), BR libsamplerate-devel
+
 * Fri Jun  5 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-9
 - update post/postun/posttrans scriptlets to match guidelines
 - drop BR GConf2-devel



From mschwendt at fedoraproject.org  Sat Sep 12 08:58:09 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 12 Sep 2009 08:58:09 +0000 (UTC)
Subject: rpms/audacious/F-10 audacious.spec,1.43,1.44
Message-ID: <20090912085809.E24D411C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4659

Modified Files:
	audacious.spec 
Log Message:
* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
- Build with --enable-samplerate (off by default), BR libsamplerate-devel



Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-10/audacious.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- audacious.spec	5 Jun 2009 11:14:45 -0000	1.43
+++ audacious.spec	12 Sep 2009 08:58:09 -0000	1.44
@@ -4,7 +4,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        GTK2 based media player similar to XMMS
 
 Group:          Applications/Multimedia
@@ -36,6 +36,9 @@ BuildRequires:  mcs-devel >= 0.7
 BuildRequires:  libmowgli-devel >= 0.4
 BuildRequires:  dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 
+# disabled by default
+BuildRequires: libsamplerate-devel
+
 Requires:       audacious-plugins >= %{aud_ver}
 
 # last tagged f8-final
@@ -121,6 +124,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
 %configure \
+    --enable-samplerate \
     --disable-rpath \
     --enable-chardet \
     --enable-dbus \
@@ -203,6 +207,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
+- Build with --enable-samplerate (off by default), BR libsamplerate-devel
+
 * Fri Jun  5 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-9
 - update post/postun/posttrans scriptlets to match guidelines
 - drop BR GConf2-devel



From ovasik at fedoraproject.org  Sat Sep 12 09:28:51 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Sat, 12 Sep 2009 09:28:51 +0000 (UTC)
Subject: rpms/coreutils/devel .cvsignore, 1.22,
	1.23 coreutils-4.5.3-langinfo.patch, 1.2,
	1.3 coreutils-4.5.3-sysinfo.patch, 1.6,
	1.7 coreutils-5.2.1-runuser.patch, 1.26,
	1.27 coreutils-6.10-configuration.patch, 1.22,
	1.23 coreutils-6.10-manpages.patch, 1.5,
	1.6 coreutils-7.4-sttytcsadrain.patch, 1.1,
	1.2 coreutils-i18n.patch, 1.38, 1.39 coreutils-pam.patch, 1.16,
	1.17 coreutils-selinux.patch, 1.58, 1.59 coreutils-setsid.patch,
	1.3, 1.4 coreutils.spec, 1.273, 1.274 sources, 1.24,
	1.25 coreutils-7.5-df-localdevice.patch, 1.1,
	NONE coreutils-7.5-kojiutimensatskip.patch, 1.3,
	NONE coreutils-7.5-ls-inode.patch, 1.3, NONE
Message-ID: <20090912092851.9121211C00CE@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16031

Modified Files:
	.cvsignore coreutils-4.5.3-langinfo.patch 
	coreutils-4.5.3-sysinfo.patch coreutils-5.2.1-runuser.patch 
	coreutils-6.10-configuration.patch 
	coreutils-6.10-manpages.patch 
	coreutils-7.4-sttytcsadrain.patch coreutils-i18n.patch 
	coreutils-pam.patch coreutils-selinux.patch 
	coreutils-setsid.patch coreutils.spec sources 
Removed Files:
	coreutils-7.5-df-localdevice.patch 
	coreutils-7.5-kojiutimensatskip.patch 
	coreutils-7.5-ls-inode.patch 
Log Message:
new upstream bugfix release 7.6, removed applied patches,defuzzed the rest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	21 Aug 2009 07:00:58 -0000	1.22
+++ .cvsignore	12 Sep 2009 09:28:48 -0000	1.23
@@ -1 +1 @@
-coreutils-7.5.tar.xz
+coreutils-7.6.tar.xz

coreutils-4.5.3-langinfo.patch:
 date.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Index: coreutils-4.5.3-langinfo.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-4.5.3-langinfo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- coreutils-4.5.3-langinfo.patch	27 Oct 2005 15:05:07 -0000	1.2
+++ coreutils-4.5.3-langinfo.patch	12 Sep 2009 09:28:48 -0000	1.3
@@ -3,16 +3,16 @@
 @@ -451,14 +451,7 @@
        format = DATE_FMT_LANGINFO ();
        if (! *format)
- 	{
--	  /* Do not wrap the following literal format string with _(...).
--	     For example, suppose LC_ALL is unset, LC_TIME="POSIX",
--	     and LANG="ko_KR".  In that case, POSIX says that LC_TIME
--	     determines the format and contents of date and time strings
--	     written by date, which means "date" must generate output
--	     using the POSIX locale; but adding _() would cause "date"
--	     to use a Korean translation of the format.  */
--	  format = "%a %b %e %H:%M:%S %Z %Y";
-+	  format = dcgettext(NULL, N_("%a %b %e %H:%M:%S %Z %Y"), LC_TIME);
- 	}
+         {
+-          /* Do not wrap the following literal format string with _(...).
+-             For example, suppose LC_ALL is unset, LC_TIME="POSIX",
+-             and LANG="ko_KR".  In that case, POSIX says that LC_TIME
+-             determines the format and contents of date and time strings
+-             written by date, which means "date" must generate output
+-             using the POSIX locale; but adding _() would cause "date"
+-             to use a Korean translation of the format.  */
+-          format = "%a %b %e %H:%M:%S %Z %Y";
++          format = dcgettext(NULL, N_("%a %b %e %H:%M:%S %Z %Y"), LC_TIME);
+         }
      }
  

coreutils-4.5.3-sysinfo.patch:
 uname.c |   36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

Index: coreutils-4.5.3-sysinfo.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-4.5.3-sysinfo.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coreutils-4.5.3-sysinfo.patch	25 Jan 2008 17:48:11 -0000	1.6
+++ coreutils-4.5.3-sysinfo.patch	12 Sep 2009 09:28:48 -0000	1.7
@@ -17,9 +17,9 @@
 +      char *element = unknown;
  #if HAVE_SYSINFO && defined SI_ARCHITECTURE
        {
- 	static char processor[257];
- 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
- 	  element = processor;
+         static char processor[257];
+         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
+           element = processor;
        }
 +#else
 +      {
@@ -54,10 +54,10 @@
 +      char *element = unknown;
  #if HAVE_SYSINFO && defined SI_PLATFORM
        {
- 	static char hardware_platform[257];
+         static char hardware_platform[257];
 @@ -356,6 +378,14 @@
- 			  hardware_platform, sizeof hardware_platform))
- 	  element = hardware_platform;
+                           hardware_platform, sizeof hardware_platform))
+           element = hardware_platform;
        }
 +#else
 +      {

coreutils-5.2.1-runuser.patch:
 coreutils-7.0/AUTHORS                 |    1 
 coreutils-7.0/README                  |    8 -
 coreutils-7.0/man/Makefile.am         |    1 
 coreutils-7.0/man/runuser.x           |   12 ++
 coreutils-7.0/src/Makefile.am         |    8 +
 coreutils-7.0/src/su.c                |  137 +++++++++++++++++++++++++++++++---
 coreutils-7.5/tests/misc/help-version |    1 
 7 files changed, 153 insertions(+), 15 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- coreutils-5.2.1-runuser.patch	21 Aug 2009 07:00:58 -0000	1.26
+++ coreutils-5.2.1-runuser.patch	12 Sep 2009 09:28:48 -0000	1.27
@@ -121,11 +121,11 @@ diff -urNp coreutils-7.0.orig/src/su.c c
  
  static void run_shell (char const *, char const *, char **, size_t,
 -	const struct passwd *)
-+	const struct passwd *
++        const struct passwd *
 +#ifdef RUNUSER
-+		       , gid_t *groups, int num_groups
++                       , gid_t *groups, int num_groups
 +#endif
-+	)
++        )
  #ifdef USE_PAM
  	;
  #else
@@ -180,9 +180,9 @@ diff -urNp coreutils-7.0.orig/src/su.c c
 -change_identity (const struct passwd *pw)
 +change_identity (const struct passwd *pw
 +#ifdef RUNUSER
-+		 , gid_t *groups, int num_groups
++                 , gid_t *groups, int num_groups
 +#endif
-+	)
++        )
  {
  #ifdef HAVE_INITGROUPS
 +  int rc = 0;
@@ -202,12 +202,12 @@ diff -urNp coreutils-7.0.orig/src/su.c c
  
  static void
  run_shell (char const *shell, char const *command, char **additional_args,
--	   size_t n_additional_args, const struct passwd *pw)
-+	   size_t n_additional_args, const struct passwd *pw
+-           size_t n_additional_args, const struct passwd *pw)
++           size_t n_additional_args, const struct passwd *pw
 +#ifdef RUNUSER
-+	   , gid_t *groups, int num_groups
++           , gid_t *groups, int num_groups
 +#endif
-+	)
++        )
  {
    size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
    char const **args = xnmalloc (n_args, sizeof *args);
@@ -218,9 +218,9 @@ diff -urNp coreutils-7.0.orig/src/su.c c
 -  change_identity (pw);
 +  change_identity (pw
 +#ifdef RUNUSER
-+		   , groups, num_groups
++                   , groups, num_groups
 +#endif
-+	  );
++          );
    pam_end(pamh, 0);
    if (!same_session)
      setsid ();
@@ -279,43 +279,43 @@ diff -urNp coreutils-7.0.orig/src/su.c c
 -  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
 +  while ((optc = getopt_long (argc, argv, "c:flmps:"
 +#ifdef RUNUSER
-+			      "g:G:"
++                              "g:G:"
 +#endif
-+			      , longopts, NULL)) != -1)
++                              , longopts, NULL)) != -1)
      {
        switch (optc)
- 	{
+         {
 @@ -697,6 +773,28 @@ main (int argc, char **argv)
- 	  shell = optarg;
- 	  break;
+           shell = optarg;
+           break;
  
 +#ifdef RUNUSER
-+	case 'g':
-+	  gr = getgrnam(optarg);
-+	  if (!gr)
-+	    error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
-+	  use_gid = 1;
-+	  groups[0] = gr->gr_gid;
-+	  break;
++        case 'g':
++          gr = getgrnam(optarg);
++          if (!gr)
++            error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
++          use_gid = 1;
++          groups[0] = gr->gr_gid;
++          break;
 +
-+	case 'G':
-+	  num_supp_groups++;
-+	  if (num_supp_groups >= NGROUPS_MAX)
-+	    error (EXIT_FAILURE, 0,
-+		   _("Can't specify more than %d supplemental groups"),
-+		   NGROUPS_MAX - 1);
-+	  gr = getgrnam(optarg);
-+	  if (!gr)
-+	    error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
-+	  groups[num_supp_groups] = gr->gr_gid;
-+	  break;
++        case 'G':
++          num_supp_groups++;
++          if (num_supp_groups >= NGROUPS_MAX)
++            error (EXIT_FAILURE, 0,
++                   _("Can't specify more than %d supplemental groups"),
++                   NGROUPS_MAX - 1);
++          gr = getgrnam(optarg);
++          if (!gr)
++            error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
++          groups[num_supp_groups] = gr->gr_gid;
++          break;
 +#endif
 +
- 	case_GETOPT_HELP_CHAR;
+         case_GETOPT_HELP_CHAR;
  
- 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 @@ -735,7 +833,20 @@ main (int argc, char **argv)
- 			  : DEFAULT_SHELL);
+                           : DEFAULT_SHELL);
    endpwent ();
  
 -  if (!correct_password (pw))
@@ -343,17 +343,17 @@ diff -urNp coreutils-7.0.orig/src/su.c c
 -  change_identity (pw);
 +  change_identity (pw
 +#ifdef RUNUSER
-+		   , groups, num_supp_groups
++                   , groups, num_supp_groups
 +#endif
-+		   );
++                   );
  #endif
  
 -  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
 +  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw
 +#ifdef RUNUSER
-+	     , groups, num_supp_groups
++             , groups, num_supp_groups
 +#endif
-+	     );
++             );
  }
 diff -urNp coreutils-7.5.orig/tests/misc/help-version coreutils-7.5/tests/misc/help-version
 --- coreutils-7.5.orig/tests/misc/help-version

coreutils-6.10-configuration.patch:
 coreutils-6.11/tests/test-lib.sh     |    4 ++--
 coreutils-7.1/src/ls.c               |    8 ++++----
 coreutils-7.2/gnulib-tests/gnulib.mk |   12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- coreutils-6.10-configuration.patch	21 Aug 2009 07:00:58 -0000	1.22
+++ coreutils-6.10-configuration.patch	12 Sep 2009 09:28:48 -0000	1.23
@@ -27,17 +27,6 @@ diff -urNp coreutils-7.2-orig/gnulib-tes
  
  ## end   gnulib module strverscmp-tests
  
-diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
---- coreutils-6.11-orig/tests/mkdir/selinux	2008-04-19 23:34:23.000000000 +0200
-+++ coreutils-6.11/tests/mkdir/selinux	2008-04-22 13:23:50.000000000 +0200
-@@ -38,6 +28,7 @@
- # successfully, in spite of the invalid context string.
- 
- . $srcdir/test-lib.sh
-+require_selinux_
- 
- c=invalid-selinux-context
- msg="failed to set default file creation context to \`$c':"
 diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
 --- coreutils-6.11-orig/tests/test-lib.sh	2008-04-19 23:34:23.000000000 +0200
 +++ coreutils-6.11/tests/test-lib.sh	2008-04-24 14:18:59.000000000 +0200

coreutils-6.10-manpages.patch:
 md5sum.c |    3 +++
 1 file changed, 3 insertions(+)

Index: coreutils-6.10-manpages.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-manpages.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- coreutils-6.10-manpages.patch	24 Feb 2009 11:53:36 -0000	1.5
+++ coreutils-6.10-manpages.patch	12 Sep 2009 09:28:48 -0000	1.6
@@ -2,7 +2,7 @@ diff -urNp coreutils-6.12-orig/src/md5su
 --- coreutils-6.12-orig/src/md5sum.c	2008-05-26 08:40:33.000000000 +0200
 +++ coreutils-6.12/src/md5sum.c	2008-10-21 16:07:28.000000000 +0200
 @@ -175,6 +175,9 @@ With no FILE, or when FILE is -, read st
- 	fputs (_("\
+         fputs (_("\
    -t, --text              read in text mode (default)\n\
  "), stdout);
 +  fputs (_("\

coreutils-7.4-sttytcsadrain.patch:
 stty.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: coreutils-7.4-sttytcsadrain.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.4-sttytcsadrain.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-7.4-sttytcsadrain.patch	11 Jun 2009 08:26:29 -0000	1.1
+++ coreutils-7.4-sttytcsadrain.patch	12 Sep 2009 09:28:49 -0000	1.2
@@ -2,11 +2,11 @@ diff -urNp coreutils-7.4-orig/src/stty.c
 --- coreutils-7.4-orig/src/stty.c	2009-04-24 14:41:19.000000000 +0200
 +++ coreutils-7.4/src/stty.c	2009-06-11 10:15:41.000000000 +0200
 @@ -1001,7 +1001,7 @@ main (int argc, char **argv)
- 	 spurious difference in an uninitialized portion of the structure.  */
+          spurious difference in an uninitialized portion of the structure.  */
        DECLARE_ZEROED_AGGREGATE (struct termios, new_mode);
  
 -      if (tcsetattr (STDIN_FILENO, TCSADRAIN, &mode))
 +      if (tcsetattr (STDIN_FILENO, TCSANOW, &mode))
- 	error (EXIT_FAILURE, errno, "%s", device_name);
+         error (EXIT_FAILURE, errno, "%s", device_name);
  
        /* POSIX (according to Zlotnick's book) tcsetattr returns zero if

coreutils-i18n.patch:
 coreutils-6.11/src/join.c               |  105 +++-
 coreutils-6.12-orig/src/join.c          |    5 
 coreutils-6.12/tests/Makefile.am        |    5 
 coreutils-6.12/tests/misc/cut           |    6 
 coreutils-6.8+/lib/linebuffer.h         |    8 
 coreutils-6.8+/src/cut.c                |  420 ++++++++++++++++++-
 coreutils-6.8+/src/expand.c             |  160 +++++++
 coreutils-6.8+/src/fold.c               |  309 +++++++++++++-
 coreutils-6.8+/src/join.c               |  233 +++++++++--
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  673 ++++++++++++++++++++++++++++++--
 coreutils-6.8+/src/unexpand.c           |  226 ++++++++++
 coreutils-6.8+/src/uniq.c               |  259 +++++++++++-
 coreutils-6.8+/tests/misc/mb1.I         |    4 
 coreutils-6.8+/tests/misc/mb1.X         |    4 
 coreutils-6.8+/tests/misc/mb2.I         |    4 
 coreutils-6.8+/tests/misc/mb2.X         |    4 
 coreutils-6.8+/tests/misc/sort-mb-tests |   58 ++
 18 files changed, 2736 insertions(+), 178 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.38 -r 1.39 coreutils-i18n.patchIndex: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- coreutils-i18n.patch	10 Sep 2009 10:36:58 -0000	1.38
+++ coreutils-i18n.patch	12 Sep 2009 09:28:49 -0000	1.39
@@ -187,14 +187,6 @@ diff -urN coreutils-6.12-orig/tests/Make
  /* The official name of this program (e.g., no `g' prefix).  */
  #define PROGRAM_NAME "expand"
  
-@@ -183,6 +200,7 @@
- 	      stops = num_start + len - 1;
- 	    }
- 	}
-+
-       else
- 	{
- 	  error (0, 0, _("tab size contains invalid character(s): %s"),
 @@ -365,6 +383,142 @@
      }
  }
@@ -414,7 +406,7 @@ diff -urN coreutils-6.12-orig/tests/Make
        char *sep;
 -      for (; (sep = memchr (ptr, tab, lim - ptr)) != NULL; ptr = sep + 1)
 +      for (; (sep = memchr (ptr, t, lim - ptr)) != NULL; ptr = sep + 1)
- 	extract_field (line, ptr, sep - ptr);
+         extract_field (line, ptr, sep - ptr);
      }
    else
 @@ -229,6 +248,148 @@
@@ -586,115 +578,100 @@ diff -urN coreutils-6.12-orig/tests/Make
  
    outlist = outlist_head.next;
    if (outlist)
-@@ -397,12 +628,12 @@
- 	  if (o->file == 0)
- 	    {
- 	      if (line1 == &uni_blank)
--	        {
-+		{
- 		  line = line2;
- 		  field = join_field_2;
- 		}
- 	      else
--	        {
-+		{
- 		  line = line1;
- 		  field = join_field_1;
- 		}
 @@ -416,7 +647,7 @@
- 	  o = o->next;
- 	  if (o == NULL)
- 	    break;
--	  putchar (output_separator);
-+	  PUT_TAB_CHAR;
- 	}
+           o = o->next;
+           if (o == NULL)
+             break;
+-          putchar (output_separator);
++          PUT_TAB_CHAR;
+         }
        putchar ('\n');
      }
 @@ -434,23 +665,23 @@
        prfield (join_field_1, line1);
        for (i = 0; i < join_field_1 && i < line1->nfields; ++i)
- 	{
--	  putchar (output_separator);
-+	  PUT_TAB_CHAR;
- 	  prfield (i, line1);
- 	}
+         {
+-          putchar (output_separator);
++          PUT_TAB_CHAR;
+           prfield (i, line1);
+         }
        for (i = join_field_1 + 1; i < line1->nfields; ++i)
- 	{
--	  putchar (output_separator);
-+	  PUT_TAB_CHAR;
- 	  prfield (i, line1);
- 	}
+         {
+-          putchar (output_separator);
++          PUT_TAB_CHAR;
+           prfield (i, line1);
+         }
  
        for (i = 0; i < join_field_2 && i < line2->nfields; ++i)
- 	{
--	  putchar (output_separator);
-+	  PUT_TAB_CHAR;
- 	  prfield (i, line2);
- 	}
+         {
+-          putchar (output_separator);
++          PUT_TAB_CHAR;
+           prfield (i, line2);
+         }
        for (i = join_field_2 + 1; i < line2->nfields; ++i)
- 	{
--	  putchar (output_separator);
-+	  PUT_TAB_CHAR;
- 	  prfield (i, line2);
- 	}
+         {
+-          putchar (output_separator);
++          PUT_TAB_CHAR;
+           prfield (i, line2);
+         }
        putchar ('\n');
 @@ -859,20 +1090,41 @@
  
- 	case 't':
- 	  {
--	    unsigned char newtab = optarg[0];
--	    if (! newtab)
-+	    char *newtab;
-+	    size_t newtablen;
-+	    if (! optarg[0])
- 	      error (EXIT_FAILURE, 0, _("empty tab"));
--	    if (optarg[1])
-+	    newtab = xstrdup (optarg);
-+#if HAVE_MBRTOWC
-+	    if (MB_CUR_MAX > 1)
-+	      {
-+		mbstate_t state;
-+
-+		memset (&state, 0, sizeof (mbstate_t));
-+		newtablen = mbrtowc (NULL, newtab,
-+				     strnlen (newtab, MB_LEN_MAX),
-+				     &state);
-+		if (newtablen == (size_t) 0
-+		    || newtablen == (size_t) -1
-+		    || newtablen == (size_t) -2)
-+		  newtablen = 1;
-+	      }
-+	    else
-+#endif
-+	      newtablen = 1;
-+		
-+	    if (newtablen == 1 && newtab[1])
-+	      {
-+		if (STREQ (newtab, "\\0"))
-+		  newtab[0] = '\0';
-+	      }
-+	    if (tab != NULL && strcmp (tab, newtab))
- 	      {
--		if (STREQ (optarg, "\\0"))
--		  newtab = '\0';
--		else
--		  error (EXIT_FAILURE, 0, _("multi-character tab %s"),
--			 quote (optarg));
-+		free (newtab);
-+		error (EXIT_FAILURE, 0, _("incompatible tabs"));
- 	      }
--	    if (0 <= tab && tab != newtab)
--	      error (EXIT_FAILURE, 0, _("incompatible tabs"));
- 	    tab = newtab;
-+	    tablen = newtablen;
- 	  }
- 	  break;
-
+         case 't':
+           {
+-            unsigned char newtab = optarg[0];
+-            if (! newtab)
++            char *newtab;
++            size_t newtablen;
++            if (! optarg[0])
+               error (EXIT_FAILURE, 0, _("empty tab"));
+-            if (optarg[1])
++            newtab = xstrdup (optarg);
++#if HAVE_MBRTOWC
++            if (MB_CUR_MAX > 1)
++              {
++                mbstate_t state;
++
++                memset (&state, 0, sizeof (mbstate_t));
++                newtablen = mbrtowc (NULL, newtab,
++                                     strnlen (newtab, MB_LEN_MAX),
++                                     &state);
++                if (newtablen == (size_t) 0
++                    || newtablen == (size_t) -1
++                    || newtablen == (size_t) -2)
++                  newtablen = 1;
++              }
++            else
++#endif
++              newtablen = 1;
++                
++            if (newtablen == 1 && newtab[1])
++              {
++                if (STREQ (newtab, "\\0"))
++                  newtab[0] = '\0';
++              }
++            if (tab != NULL && strcmp (tab, newtab))
[...2648 lines suppressed...]
-+	  break;
++        case character_mode:
++          cut_characters_or_cut_bytes_no_split (stream);
++          break;
 +
-+	case field_mode:
-+	  cut_fields_mb (stream);
-+	  break;
++        case field_mode:
++          cut_fields_mb (stream);
++          break;
 +
-+	default:
-+	  abort ();
-+	}
++        default:
++          abort ();
++        }
 +    }
    else
 -    cut_fields (stream);
 +#endif
 +    {
 +      if (operating_mode == field_mode)
-+	cut_fields (stream);
++        cut_fields (stream);
 +      else
-+	cut_bytes (stream);
++        cut_bytes (stream);
 +    }
  }
  
@@ -3925,75 +3902,75 @@ diff -urNp coreutils-6.11-orig/src/join.
    set_program_name (argv[0]);
 @@ -770,7 +1090,6 @@
        switch (optc)
- 	{
- 	case 'b':
--	case 'c':
- 	  /* Build the byte list. */
- 	  if (operating_mode != undefined_mode)
- 	    FATAL_ERROR (_("only one type of list may be specified"));
+         {
+         case 'b':
+-        case 'c':
+           /* Build the byte list. */
+           if (operating_mode != undefined_mode)
+             FATAL_ERROR (_("only one type of list may be specified"));
 @@ -778,6 +1097,14 @@
- 	  spec_list_string = optarg;
- 	  break;
+           spec_list_string = optarg;
+           break;
  
-+	case 'c':
-+	  /* Build the character list. */
-+	  if (operating_mode != undefined_mode)
-+	    FATAL_ERROR (_("only one type of list may be specified"));
-+	  operating_mode = character_mode;
-+	  spec_list_string = optarg;
-+	  break;
++        case 'c':
++          /* Build the character list. */
++          if (operating_mode != undefined_mode)
++            FATAL_ERROR (_("only one type of list may be specified"));
++          operating_mode = character_mode;
++          spec_list_string = optarg;
++          break;
 +
- 	case 'f':
- 	  /* Build the field list. */
- 	  if (operating_mode != undefined_mode)
+         case 'f':
+           /* Build the field list. */
+           if (operating_mode != undefined_mode)
 @@ -789,10 +1116,35 @@
- 	case 'd':
- 	  /* New delimiter. */
- 	  /* Interpret -d '' to mean `use the NUL byte as the delimiter.'  */
--	  if (optarg[0] != '\0' && optarg[1] != '\0')
--	    FATAL_ERROR (_("the delimiter must be a single character"));
--	  delim = optarg[0];
--	  delim_specified = true;
-+	    {
+         case 'd':
+           /* New delimiter. */
+           /* Interpret -d '' to mean `use the NUL byte as the delimiter.'  */
+-          if (optarg[0] != '\0' && optarg[1] != '\0')
+-            FATAL_ERROR (_("the delimiter must be a single character"));
+-          delim = optarg[0];
+-          delim_specified = true;
++            {
 +#if HAVE_MBRTOWC
-+	      if(MB_CUR_MAX > 1)
-+		{
-+		  mbstate_t state;
-+
-+		  memset (&state, '\0', sizeof(mbstate_t));
-+		  delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state);
-+
-+		  if (delimlen == (size_t)-1 || delimlen == (size_t)-2)
-+		    ++force_singlebyte_mode;
-+		  else
-+		    {
-+		      delimlen = (delimlen < 1) ? 1 : delimlen;
-+		      if (wcdelim != L'\0' && *(optarg + delimlen) != '\0')
-+			FATAL_ERROR (_("the delimiter must be a single character"));
-+		      memcpy (mbdelim, optarg, delimlen);
-+		    }
-+		}
-+
-+	      if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
-+#endif
-+		{
-+		  if (optarg[0] != '\0' && optarg[1] != '\0')
-+		    FATAL_ERROR (_("the delimiter must be a single character"));
-+		  delim = (unsigned char) optarg[0];
-+		}
-+	    delim_specified = true;
-+	  }
- 	  break;
++              if(MB_CUR_MAX > 1)
++                {
++                  mbstate_t state;
++
++                  memset (&state, '\0', sizeof(mbstate_t));
++                  delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state);
++
++                  if (delimlen == (size_t)-1 || delimlen == (size_t)-2)
++                    ++force_singlebyte_mode;
++                  else
++                    {
++                      delimlen = (delimlen < 1) ? 1 : delimlen;
++                      if (wcdelim != L'\0' && *(optarg + delimlen) != '\0')
++                        FATAL_ERROR (_("the delimiter must be a single character"));
++                      memcpy (mbdelim, optarg, delimlen);
++                    }
++                }
++
++              if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
++#endif
++                {
++                  if (optarg[0] != '\0' && optarg[1] != '\0')
++                    FATAL_ERROR (_("the delimiter must be a single character"));
++                  delim = (unsigned char) optarg[0];
++                }
++            delim_specified = true;
++          }
+           break;
  
- 	case OUTPUT_DELIMITER_OPTION:
+         case OUTPUT_DELIMITER_OPTION:
 @@ -805,6 +1157,7 @@
- 	  break;
+           break;
  
- 	case 'n':
-+	  byte_mode_character_aware = 1;
- 	  break;
+         case 'n':
++          byte_mode_character_aware = 1;
+           break;
  
- 	case 's':
+         case 's':
 @@ -827,7 +1180,7 @@
    if (operating_mode == undefined_mode)
      FATAL_ERROR (_("you must specify a list of bytes, characters, or fields"));
@@ -4027,20 +4004,20 @@ diff -urNp coreutils-6.11-orig/src/join.
 -      output_delimiter_length = 1;
 +#ifdef HAVE_MBRTOWC
 +      if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
-+	{
-+	  output_delimiter_string = xstrdup(mbdelim);
-+	  output_delimiter_length = delimlen;
-+	}
++        {
++          output_delimiter_string = xstrdup(mbdelim);
++          output_delimiter_length = delimlen;
++        }
 +
 +      if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
 +#endif
-+	{
-+	  static char dummy[2]; 
-+	  dummy[0] = delim;
-+	  dummy[1] = '\0';
-+	  output_delimiter_string = dummy;
-+	  output_delimiter_length = 1;
-+	}
++        {
++          static char dummy[2]; 
++          dummy[0] = delim;
++          dummy[1] = '\0';
++          output_delimiter_string = dummy;
++          output_delimiter_length = 1;
++        }
      }
  
    if (optind == argc)

coreutils-pam.patch:
 coreutils-6.7/doc/coreutils.texi |   36 +-----
 coreutils-6.7/src/Makefile.am    |    2 
 coreutils-6.7/src/su.c           |  224 +++++++++++++++++++++++++++++++++++++--
 coreutils-7.1/configure.ac       |    7 +
 4 files changed, 233 insertions(+), 36 deletions(-)

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- coreutils-pam.patch	1 Apr 2009 11:14:30 -0000	1.16
+++ coreutils-pam.patch	12 Sep 2009 09:28:49 -0000	1.17
@@ -155,15 +155,15 @@
 +      char const *display = getenv ("DISPLAY");
 +      char const *xauthority = getenv ("XAUTHORITY");
        if (term)
- 	term = xstrdup (term);
+         term = xstrdup (term);
        environ = xmalloc ((6 + !!term) * sizeof (char *));
        environ[0] = NULL;
        if (term)
- 	xsetenv ("TERM", term);
+         xsetenv ("TERM", term);
 +      if (display)
-+	xsetenv ("DISPLAY", display);
++        xsetenv ("DISPLAY", display);
 +      if (xauthority)
-+	xsetenv ("XAUTHORITY", xauthority);
++        xsetenv ("XAUTHORITY", xauthority);
        xsetenv ("HOME", pw->pw_dir);
        xsetenv ("SHELL", shell);
        xsetenv ("USER", pw->pw_name);
@@ -218,8 +218,8 @@
  
  static void
  run_shell (char const *shell, char const *command, char **additional_args,
--	   size_t n_additional_args)
-+	   size_t n_additional_args, const struct passwd *pw)
+-           size_t n_additional_args)
++           size_t n_additional_args, const struct passwd *pw)
  {
    size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
    char const **args = xnmalloc (n_args, sizeof *args);

coreutils-selinux.patch:
 configure.ac       |    7 ++
 man/chcon.x        |    2 
 man/runcon.x       |    2 
 src/chcon.c        |    2 
 src/copy.c         |    2 
 src/copy.h         |    3 
 src/cp.c           |   39 ++++++++++++
 src/id.c           |    2 
 src/install.c      |   13 +++-
 src/ls.c           |  161 +++++++++++++++++++++++++++++++++++++++++++----------
 src/mkdir.c        |    1 
 src/mknod.c        |    2 
 src/mv.c           |    1 
 src/runcon.c       |    2 
 src/stat.c         |   85 +++++++++++++++++++--------
 tests/misc/selinux |    2 
 16 files changed, 259 insertions(+), 67 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- coreutils-selinux.patch	25 May 2009 12:11:34 -0000	1.58
+++ coreutils-selinux.patch	12 Sep 2009 09:28:49 -0000	1.59
@@ -38,14 +38,14 @@ diff -urNp coreutils-7.1-orig/src/copy.c
 --- coreutils-7.1-orig/src/copy.c	2009-02-18 15:32:52.000000000 +0100
 +++ coreutils-7.1/src/copy.c	2009-02-24 13:47:15.000000000 +0100
 @@ -1830,6 +1830,8 @@ copy_internal (char const *src_name, cha
- 	{
- 	  /* Here, we are crossing a file system boundary and cp's -x option
- 	     is in effect: so don't copy the contents of this directory. */
+         {
+           /* Here, we are crossing a file system boundary and cp's -x option
+              is in effect: so don't copy the contents of this directory. */
 +        if (x->preserve_security_context)
-+      	    restore_default_fscreatecon_or_die ();
- 	}
++           restore_default_fscreatecon_or_die ();
+         }
        else
- 	{
+         {
 diff -urNp coreutils-7.1-orig/src/copy.h coreutils-7.1/src/copy.h
 --- coreutils-7.1-orig/src/copy.h	2009-02-18 15:32:52.000000000 +0100
 +++ coreutils-7.1/src/copy.h	2009-02-24 13:47:15.000000000 +0100
@@ -102,60 +102,60 @@ diff -urNp coreutils-7.1-orig/src/cp.c c
  
 -  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
 +  while ((c = getopt_long (argc, argv, "abcdfHilLnprst:uvxPRS:TZ:",
- 			   long_opts, NULL))
- 	 != -1)
+                            long_opts, NULL))
+          != -1)
      {
 @@ -945,6 +951,16 @@ main (int argc, char **argv)
- 	  copy_contents = true;
- 	  break;
+           copy_contents = true;
+           break;
  
-+  case 'c':
-+	  if ( x.set_security_context ) { 
-+	      (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);
-+	    exit( 1 );
-+	  }
-+	  else if (selinux_enabled) {
-+	    x.preserve_security_context = true;
-+      x.require_preserve_context = true;
-+    }
-+	  break;
- 	case 'd':
- 	  x.preserve_links = true;
- 	  x.dereference = DEREF_NEVER;
++        case 'c':
++          if ( x.set_security_context ) { 
++              (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);
++             exit( 1 );
++           }
++           else if (selinux_enabled) {
++              x.preserve_security_context = true;
++              x.require_preserve_context = true;
++           }
++          break;
+         case 'd':
+           x.preserve_links = true;
+           x.dereference = DEREF_NEVER;
 @@ -1054,6 +1070,27 @@ main (int argc, char **argv)
- 	  x.one_file_system = true;
- 	  break;
+           x.one_file_system = true;
+           break;
  
 +
-+  case 'Z':
-+	  /* politely decline if we're not on a selinux-enabled kernel. */
-+	  if( !selinux_enabled ) {
-+	    fprintf( stderr, "Warning:  ignoring --context (-Z). "
-+		             "It requires a SELinux enabled kernel.\n" );
-+	    break;
-+	  }
-+	  if ( x.preserve_security_context ) {
-+	    (void) fprintf(stderr, "%s: cannot force target context to '%s' and preserve it\n", argv[0], optarg);
-+	    exit( 1 );
-+	  }
-+	  x.set_security_context = true;
-+	  /* if there's a security_context given set new path 
-+	     components to that context, too */
-+	  if ( setfscreatecon(optarg) < 0 ) {
-+	    (void) fprintf(stderr, _("cannot set default security context %s\n"), optarg);
-+	    exit( 1 );
-+	  }
-+	  break;
-+
- 	case 'S':
- 	  make_backups = true;
- 	  backup_suffix_string = optarg;
++        case 'Z':
++          /* politely decline if we're not on a selinux-enabled kernel. */
++          if( !selinux_enabled ) {
++             fprintf( stderr, "Warning:  ignoring --context (-Z). "
++                              "It requires a SELinux enabled kernel.\n" );
++             break;
++         }
++         if ( x.preserve_security_context ) {
++            (void) fprintf(stderr, "%s: cannot force target context to '%s' and preserve it\n", argv[0], optarg);
++            exit( 1 );
++         }
++         x.set_security_context = true;
++         /* if there's a security_context given set new path 
++            components to that context, too */
++         if ( setfscreatecon(optarg) < 0 ) {
++            (void) fprintf(stderr, _("cannot set default security context %s\n"), optarg);
++            exit( 1 );
++         }
++         break;
++
+         case 'S':
+           make_backups = true;
+           backup_suffix_string = optarg;
 diff -urNp coreutils-7.1-orig/src/chcon.c coreutils-7.1/src/chcon.c
 --- coreutils-7.1-orig/src/chcon.c	2008-10-12 16:12:56.000000000 +0200
 +++ coreutils-7.1/src/chcon.c	2009-02-24 13:47:15.000000000 +0100
 @@ -346,7 +346,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
  "),
- 	program_name, program_name, program_name);
+         program_name, program_name, program_name);
        fputs (_("\
 -Change the security context of each FILE to CONTEXT.\n\
 +Change the SELinux security context of each FILE to CONTEXT.\n\
@@ -191,36 +191,36 @@ diff -urNp coreutils-7.1-orig/src/instal
  
 -  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pt:TvS:Z:", long_options,
 +  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pPt:TvS:Z:", long_options,
- 			      NULL)) != -1)
+                               NULL)) != -1)
      {
        switch (optc)
 @@ -539,6 +540,7 @@ main (int argc, char **argv)
- 	  error (0, 0, _("WARNING: --preserve_context is deprecated; "
- 			 "use --preserve-context instead"));
- 	  /* fall through */
-+  case 'P':
- 	case PRESERVE_CONTEXT_OPTION:
- 	  if ( ! selinux_enabled)
- 	    {
+           error (0, 0, _("WARNING: --preserve_context is deprecated; "
+                          "use --preserve-context instead"));
+           /* fall through */
++        case 'P':
+         case PRESERVE_CONTEXT_OPTION:
+           if ( ! selinux_enabled)
+             {
 @@ -546,6 +548,10 @@ main (int argc, char **argv)
- 			     "this kernel is not SELinux-enabled"));
- 	      break;
- 	    }
-+    if ( x.set_security_context ) {
-+		  (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);
-+ 	    exit( 1 );
-+ 	  }
- 	  x.preserve_security_context = true;
- 	  use_default_selinux_context = false;
- 	  break;
+                              "this kernel is not SELinux-enabled"));
+               break;
+             }
++          if ( x.set_security_context ) {
++             (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);
++             exit( 1 );
++          }
+           x.preserve_security_context = true;
+           use_default_selinux_context = false;
+           break;
 @@ -557,6 +563,7 @@ main (int argc, char **argv)
- 	      break;
- 	    }
- 	  scontext = optarg;
-+	  x.set_security_context = true;
- 	  use_default_selinux_context = false;
- 	  break;
- 	case_GETOPT_HELP_CHAR;
+               break;
+             }
+           scontext = optarg;
++          x.set_security_context = true;
+           use_default_selinux_context = false;
+           break;
+         case_GETOPT_HELP_CHAR;
 @@ -990,8 +997,8 @@ Mandatory arguments to long options are 
    -v, --verbose       print the name of each directory as it is created\n\
  "), stdout);
@@ -312,21 +312,21 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
 @@ -1194,7 +1203,8 @@ main (int argc, char **argv)
        /* Avoid following symbolic links when possible.  */
        if (is_colored (C_ORPHAN)
- 	  || (is_colored (C_EXEC) && color_symlink_as_referent)
--	  || (is_colored (C_MISSING) && format == long_format))
-+	  || (is_colored (C_MISSING) && (format == long_format
-+	      || format == security_format)))
- 	check_symlink_color = true;
+           || (is_colored (C_EXEC) && color_symlink_as_referent)
+-          || (is_colored (C_MISSING) && format == long_format))
++          || (is_colored (C_MISSING) && (format == long_format
++              || format == security_format)))
+         check_symlink_color = true;
  
        /* If the standard output is a controlling terminal, watch out
 @@ -1241,7 +1251,7 @@ main (int argc, char **argv)
    if (dereference == DEREF_UNDEFINED)
      dereference = ((immediate_dirs
- 		    || indicator_style == classify
--		    || format == long_format)
-+		    || format == long_format || format == security_format)
- 		   ? DEREF_NEVER
- 		   : DEREF_COMMAND_LINE_SYMLINK_TO_DIR);
+                     || indicator_style == classify
+-                    || format == long_format)
++                    || format == long_format || format == security_format)
+                    ? DEREF_NEVER
+                    : DEREF_COMMAND_LINE_SYMLINK_TO_DIR);
  
 @@ -1261,7 +1271,7 @@ main (int argc, char **argv)
  
@@ -336,7 +336,7 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
 +    || format == security_format || print_scontext
      || print_block_size;
    format_needs_type = (! format_needs_stat
- 		       && (recursive
+                        && (recursive
 @@ -1292,7 +1302,7 @@ main (int argc, char **argv)
      }
    else
@@ -356,42 +356,42 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
    /* FIXME: put this in a function.  */
    {
 @@ -1837,13 +1847,27 @@ decode_switches (int argc, char **argv)
- 	  break;
+           break;
  
- 	case 'Z':
--	  print_scontext = true;
-+	  print_scontext = 1;
+         case 'Z':
+-          print_scontext = true;
++          print_scontext = 1;
 +    format = security_format;
- 	  break;
+           break;
  
- 	case_GETOPT_HELP_CHAR;
+         case_GETOPT_HELP_CHAR;
  
- 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  
 +  case CONTEXT_OPTION: /* default security context format */
-+		print_scontext = 1;
-+		format = security_format;
-+		break;
-+	case LCONTEXT_OPTION: /* long format plus security context */
-+		print_scontext = 1;
-+		format = long_format;
-+		break;
-+	case SCONTEXT_OPTION: /* short form of new security format */
-+		print_scontext = 0;
-+		format = security_format;
-+		break;
-+
- 	default:
- 	  usage (LS_FAILURE);
- 	}
++                print_scontext = 1;
++                format = security_format;
++                break;
++        case LCONTEXT_OPTION: /* long format plus security context */
++                print_scontext = 1;
++                format = long_format;
++                break;
++        case SCONTEXT_OPTION: /* short form of new security format */
++                print_scontext = 0;
++                format = security_format;
++                break;
++
+         default:
+           usage (LS_FAILURE);
+         }
 @@ -2557,8 +2581,10 @@ clear_files (void)
        struct fileinfo *f = sorted_file[i];
        free (f->name);
        free (f->linkname);
 -      if (f->scontext != UNKNOWN_SECURITY_CONTEXT)
--	freecon (f->scontext);
+-        freecon (f->scontext);
 +      if (f->scontext != UNKNOWN_SECURITY_CONTEXT) {
-+       	freecon (f->scontext);
++               freecon (f->scontext);
 +        f->scontext = NULL;
 +      }
      }
@@ -411,49 +411,49 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
  
 -      if (format == long_format || print_scontext)
 +      if (format == long_format || format == security_format || print_scontext)
- 	{
- 	  bool have_selinux = false;
- 	  bool have_acl = false;
+         {
+           bool have_selinux = false;
+           bool have_acl = false;
 @@ -2732,7 +2760,7 @@ gobble_file (char const *name, enum file
- 		err = 0;
- 	    }
+                 err = 0;
+             }
  
--	  if (err == 0 && format == long_format)
-+	  if (err == 0 && (format == long_format || format == security_format))
- 	    {
- 	      int n = file_has_acl (absolute_name, &f->stat);
- 	      err = (n < 0);
+-          if (err == 0 && format == long_format)
++          if (err == 0 && (format == long_format || format == security_format))
+             {
+               int n = file_has_acl (absolute_name, &f->stat);
+               err = (n < 0);
 @@ -2751,7 +2779,8 @@ gobble_file (char const *name, enum file
- 	}
+         }
  
        if (S_ISLNK (f->stat.st_mode)
--	  && (format == long_format || check_symlink_color))
-+	  && (format == long_format || format == security_format
-+	      || check_symlink_color))
- 	{
- 	  char *linkname;
- 	  struct stat linkstats;
+-          && (format == long_format || check_symlink_color))
++          && (format == long_format || format == security_format
++              || check_symlink_color))
+         {
+           char *linkname;
+           struct stat linkstats;
 @@ -2771,6 +2800,7 @@ gobble_file (char const *name, enum file
- 		 command line are automatically traced if not being
- 		 listed as files.  */
- 	      if (!command_line_arg || format == long_format
-+		  || format == security_format
- 		  || !S_ISDIR (linkstats.st_mode))
- 		{
- 		  /* Get the linked-to file's mode for the filetype indicator
+                  command line are automatically traced if not being
+                  listed as files.  */
+               if (!command_line_arg || format == long_format
++                  || format == security_format
+                   || !S_ISDIR (linkstats.st_mode))
+                 {
+                   /* Get the linked-to file's mode for the filetype indicator
 @@ -2810,7 +2840,7 @@ gobble_file (char const *name, enum file
- 	    block_size_width = len;
- 	}
+             block_size_width = len;
+         }
  
 -      if (format == long_format)
 +      if (format == long_format || format == security_format)
- 	{
- 	  if (print_owner)
- 	    {
+         {
+           if (print_owner)
+             {
 @@ -3312,6 +3341,13 @@ print_current_files (void)
- 	  print_long_format (sorted_file[i]);
- 	  DIRED_PUTCHAR ('\n');
- 	}
+           print_long_format (sorted_file[i]);
+           DIRED_PUTCHAR ('\n');
+         }
 +     break;
 +    case security_format:
 +      for (i = 0; i < cwd_n_used; i++)
@@ -514,15 +514,15 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
 +  DIRED_INDENT ();
 +  DIRED_FPUTS (buf, stdout, p - buf);
 +  size_t w = print_name_with_quoting (f->name, FILE_OR_LINK_MODE(f), f->linkok,
-+			   f->stat_ok, f->filetype, &dired_obstack, f->stat.st_nlink, p - buf);
++                           f->stat_ok, f->filetype, &dired_obstack, f->stat.st_nlink, p - buf);
 +
 +  if (f->filetype == symbolic_link) {
 +      if (f->linkname) {
-+	  DIRED_FPUTS_LITERAL (" -> ", stdout);
-+	  print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1,
-+				   f->stat_ok, f->filetype, NULL, f->stat.st_nlink, (p-buf) + w + 4 );
-+	  if (indicator_style != none)
-+	    print_type_indicator (f->stat_ok, f->linkmode, f->filetype);
++          DIRED_FPUTS_LITERAL (" -> ", stdout);
++          print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1,
++                                   f->stat_ok, f->filetype, NULL, f->stat.st_nlink, (p-buf) + w + 4 );
++          if (indicator_style != none)
++            print_type_indicator (f->stat_ok, f->linkmode, f->filetype);
 +      }
 +  }
 +  else {
@@ -553,27 +553,27 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
  
 @@ -3543,9 +3648,6 @@ print_long_format (const struct fileinfo
        if (print_author)
- 	format_user (f->stat.st_author, author_width, f->stat_ok);
+         format_user (f->stat.st_author, author_width, f->stat_ok);
  
 -      if (print_scontext)
--	format_user_or_group (f->scontext, 0, scontext_width);
+-        format_user_or_group (f->scontext, 0, scontext_width);
 -
        p = buf;
      }
  
 @@ -3888,9 +3990,6 @@ print_file_name_and_frills (const struct
- 	    human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
- 			    ST_NBLOCKSIZE, output_block_size));
+             human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
+                             ST_NBLOCKSIZE, output_block_size));
  
 -  if (print_scontext)
 -    printf ("%*s ", format == with_commas ? 0 : scontext_width, f->scontext);
 -
    size_t width = print_name_with_quoting (f->name, FILE_OR_LINK_MODE (f),
- 					  f->linkok, f->stat_ok, f->filetype,
- 					  NULL, f->stat.st_nlink, start_col);
+                                           f->linkok, f->stat_ok, f->filetype,
+                                           NULL, f->stat.st_nlink, start_col);
 @@ -4105,9 +4204,6 @@ length_of_file_name_and_frills (const st
- 					  output_block_size))
- 		: block_size_width);
+                                           output_block_size))
+                 : block_size_width);
  
 -  if (print_scontext)
 -    len += 1 + (format == with_commas ? strlen (f->scontext) : scontext_width);
@@ -598,7 +598,7 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
 +"), stdout);
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
-       fputs (_("\n\
+       emit_size_note ();
 diff -urNp coreutils-7.1-orig/src/mkdir.c coreutils-7.1/src/mkdir.c
 --- coreutils-7.1-orig/src/mkdir.c	2008-10-19 21:47:57.000000000 +0200
 +++ coreutils-7.1/src/mkdir.c	2009-02-24 13:47:15.000000000 +0100
@@ -665,32 +665,32 @@ diff -urNp coreutils-7.1-orig/src/stat.c
 +    if (terse)
      {
 -      format = (terse
--		? "%n %i %l %t %s %S %b %f %a %c %d\n"
--		: "  File: \"%n\"\n"
--		"    ID: %-8i Namelen: %-7l Type: %T\n"
--		"Block size: %-10s Fundamental block size: %S\n"
--		"Blocks: Total: %-10b Free: %-10f Available: %a\n"
--		"Inodes: Total: %-10c Free: %d\n");
+-                ? "%n %i %l %t %s %S %b %f %a %c %d\n"
+-                : "  File: \"%n\"\n"
+-                "    ID: %-8i Namelen: %-7l Type: %T\n"
+-                "Block size: %-10s Fundamental block size: %S\n"
+-                "Blocks: Total: %-10b Free: %-10f Available: %a\n"
+-                "Inodes: Total: %-10c Free: %d\n");
 +      if (secure)
 +        format = "%n %i %l %t %s %S %b %f %a %c %d %C\n";
-+   	  else
-+	      format = "%n %i %l %t %s %S %b %f %a %c %d\n";
++             else
++              format = "%n %i %l %t %s %S %b %f %a %c %d\n";
      }
 +    else
-+  	{
-+	    if (secure)
-+	      format = "  File: \"%n\"\n"
-+	        "    ID: %-8i Namelen: %-7l Type: %T\n"
-+  	      "Block size: %-10s Fundamental block size: %S\n"
-+	        "Blocks: Total: %-10b Free: %-10f Available: %a\n"
-+	        "Inodes: Total: %-10c Free: %d\n"
-+	        "   S_Context: %C\n";
-+  	  else
-+	      format = "  File: \"%n\"\n"
-+	        "    ID: %-8i Namelen: %-7l Type: %T\n"
-+	        "Block size: %-10s Fundamental block size: %S\n"
-+	        "Blocks: Total: %-10b Free: %-10f Available: %a\n"
-+  	      "Inodes: Total: %-10c Free: %d\n";
++          {
++            if (secure)
++              format = "  File: \"%n\"\n"
++                "    ID: %-8i Namelen: %-7l Type: %T\n"
++                "Block size: %-10s Fundamental block size: %S\n"
++                "Blocks: Total: %-10b Free: %-10f Available: %a\n"
++                "Inodes: Total: %-10c Free: %d\n"
++                "   S_Context: %C\n";
++            else
++              format = "  File: \"%n\"\n"
++                "    ID: %-8i Namelen: %-7l Type: %T\n"
++                "Block size: %-10s Fundamental block size: %S\n"
++                "Blocks: Total: %-10b Free: %-10f Available: %a\n"
++                "Inodes: Total: %-10c Free: %d\n";
 +     }
 +  }
  
@@ -709,46 +709,46 @@ diff -urNp coreutils-7.1-orig/src/stat.c
    if (format == NULL)
      {
        if (terse)
--	{
--	  format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
--	}
+-        {
+-          format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
+-        }
 +      {
 +        if (secure)
-+  	     format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n";
-+  	   else
-+	       format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
++               format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n";
++             else
++               format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
 +      }
        else
- 	{
- 	  /* Temporary hack to match original output until conditional
+         {
+           /* Temporary hack to match original output until conditional
 @@ -885,12 +904,22 @@ do_stat (char const *filename, bool ters
- 	    }
- 	  else
- 	    {
--	      format =
--		"  File: %N\n"
--		"  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
--		"Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
--		"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
--		"Access: %x\n" "Modify: %y\n" "Change: %z\n";
+             }
+           else
+             {
+-              format =
+-                "  File: %N\n"
+-                "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+-                "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
+-                "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+-                "Access: %x\n" "Modify: %y\n" "Change: %z\n";
 +        if (secure)
 +           format =
-+  		  "  File: %N\n"
-+	  	  "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
-+  		  "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
-+	  	  " Device type: %t,%T\n"
-+ 		    "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-+  		  "   S_Context: %C\n"
-+	  	  "Access: %x\n" "Modify: %y\n" "Change: %z\n";
++                    "  File: %N\n"
++                    "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
++                    "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
++                    " Device type: %t,%T\n"
++                     "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
++                    "   S_Context: %C\n"
++                    "Access: %x\n" "Modify: %y\n" "Change: %z\n";
 +        else 
-+	        format =
-+    		"  File: %N\n"
-+	    	"  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
-+  	  	"Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
-+  	  	"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-+    		"Access: %x\n" "Modify: %y\n" "Change: %z\n";
- 	    }
- 	}
++                format =
++                    "  File: %N\n"
++                    "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
++                    "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
++                    "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
++                    "Access: %x\n" "Modify: %y\n" "Change: %z\n";
+             }
+         }
      }
 @@ -911,6 +940,7 @@ usage (int status)
  Display file or file system status.\n\
@@ -767,34 +767,34 @@ diff -urNp coreutils-7.1-orig/src/stat.c
    bool ok = true;
  
 @@ -1034,13 +1065,13 @@ main (int argc, char *argv[])
- 	  terse = true;
- 	  break;
+           terse = true;
+           break;
  
--	case 'Z':  /* FIXME: remove in 2010 */
--	  /* Ignore, for compatibility with distributions
--	     that implemented this before upstream.
--	     But warn of impending removal.  */
--	  error (0, 0,
--		 _("the --context (-Z) option is obsolete and will be removed\n"
--		   "in a future release"));
-+	case 'Z':
+-        case 'Z':  /* FIXME: remove in 2010 */
+-          /* Ignore, for compatibility with distributions
+-             that implemented this before upstream.
+-             But warn of impending removal.  */
+-          error (0, 0,
+-                 _("the --context (-Z) option is obsolete and will be removed\n"
+-                   "in a future release"));
++        case 'Z':
 +    if((is_selinux_enabled()>0))
-+	    secure = 1;
-+	  else {
-+	    error (0, 0, _("Kernel is not SELinux enabled"));
-+	    usage (EXIT_FAILURE);
-+	  }
- 	  break;
++            secure = 1;
++          else {
++            error (0, 0, _("Kernel is not SELinux enabled"));
++            usage (EXIT_FAILURE);
++          }
+           break;
  
- 	case_GETOPT_HELP_CHAR;
+         case_GETOPT_HELP_CHAR;
 @@ -1060,8 +1091,8 @@ main (int argc, char *argv[])
  
    for (i = optind; i < argc; i++)
      ok &= (fs
--	   ? do_statfs (argv[i], terse, format)
--	   : do_stat (argv[i], terse, format));
-+	   ? do_statfs (argv[i], terse, secure, format)
-+	   : do_stat (argv[i], terse, secure, format));
+-           ? do_statfs (argv[i], terse, format)
+-           : do_stat (argv[i], terse, format));
++           ? do_statfs (argv[i], terse, secure, format)
++           : do_stat (argv[i], terse, secure, format));
  
    exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
  }

coreutils-setsid.patch:
 su.c |   39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

Index: coreutils-setsid.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-setsid.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- coreutils-setsid.patch	9 Jan 2007 19:29:30 -0000	1.3
+++ coreutils-setsid.patch	12 Sep 2009 09:28:49 -0000	1.4
@@ -33,24 +33,24 @@
 -        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
 +    if (!same_session)
 +      {
-+	if (sigaddset(&ourset, SIGINT) || sigaddset(&ourset, SIGQUIT))
-+	  {
-+	    fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+	    caught = 1;
-+	  }
++        if (sigaddset(&ourset, SIGINT) || sigaddset(&ourset, SIGQUIT))
++          {
++            fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
++            caught = 1;
++          }
 +      }
 +    if (!caught && (sigaddset(&ourset, SIGTERM)
-+		    || sigaddset(&ourset, SIGALRM)
-+		    || sigaction(SIGTERM, &action, NULL)
-+		    || sigprocmask(SIG_UNBLOCK, &ourset, NULL))) {
++                    || sigaddset(&ourset, SIGALRM)
++                    || sigaction(SIGTERM, &action, NULL)
++                    || sigprocmask(SIG_UNBLOCK, &ourset, NULL))) {
        fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
        caught = 1;
      }
 +    if (!caught && !same_session && (sigaction(SIGINT, &action, NULL)
-+				     || sigaction(SIGQUIT, &action, NULL)))
++                                     || sigaction(SIGQUIT, &action, NULL)))
 +      {
-+	fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+	caught = 1;
++        fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
++        caught = 1;
 +      }
    }
    if (!caught) {
@@ -73,17 +73,17 @@
    struct passwd *pw;
    struct passwd pw_copy;
 @@ -656,6 +679,11 @@
- 	  command = optarg;
- 	  break;
+           command = optarg;
+           break;
  
-+	case 'C':
-+	  command = optarg;
-+	  request_same_session = 1;
-+	  break;
++        case 'C':
++          command = optarg;
++          request_same_session = 1;
++          break;
 +
- 	case 'f':
- 	  fast_startup = true;
- 	  break;
+         case 'f':
+           fast_startup = true;
+           break;
 @@ -725,6 +753,9 @@
      }
  #endif


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- coreutils.spec	10 Sep 2009 10:36:58 -0000	1.273
+++ coreutils.spec	12 Sep 2009 09:28:49 -0000	1.274
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 7.5
-Release: 6%{?dist}
+Version: 7.6
+Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,14 +18,11 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
-Patch1: coreutils-7.5-kojiutimensatskip.patch
-Patch2: coreutils-7.5-ls-inode.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
 Patch101: coreutils-6.10-manpages.patch
 Patch102: coreutils-7.4-sttytcsadrain.patch
-Patch103: coreutils-7.5-df-localdevice.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -110,14 +107,11 @@ Libraries for coreutils package.
 %setup -q
 
 # From upstream
-%patch1 -p1 -b .kojiutimensat
-%patch2 -p1 -b .inode
 
 # Our patches
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 %patch102 -p1 -b .tcsadrain
-%patch103 -p1 -b .localdevice
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -333,6 +327,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Sat Sep 12 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-1
+- new upstream bugfix release 7.6, removed applied patches,
+  defuzzed the rest
+
 * Thu Sep 10 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-6
 - fix double free error in fold for singlebyte locales
   (caused by multibyte patch)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	21 Aug 2009 07:00:59 -0000	1.24
+++ sources	12 Sep 2009 09:28:49 -0000	1.25
@@ -1 +1 @@
-ca9219c5b7efa533d552f61a3880f458  coreutils-7.5.tar.xz
+a9fb9368e40205d70fc37b9fe441e8ec  coreutils-7.6.tar.xz


--- coreutils-7.5-df-localdevice.patch DELETED ---


--- coreutils-7.5-kojiutimensatskip.patch DELETED ---


--- coreutils-7.5-ls-inode.patch DELETED ---



From erikos at fedoraproject.org  Sat Sep 12 10:00:31 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sat, 12 Sep 2009 10:00:31 +0000 (UTC)
Subject: rpms/sugar-read/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sugar-read.spec, 1.3, 1.4
Message-ID: <20090912100031.88B8F11C02CA@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-read/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25156

Modified Files:
	.cvsignore sources sugar-read.spec 
Log Message:
* Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 73-1
- New toolbars
- Support for Epub files
- Support for notes associated with bookmarks
- Show a information bar in fullscreen mode, with pagecount and battery information




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Apr 2009 17:32:25 -0000	1.3
+++ .cvsignore	12 Sep 2009 10:00:31 -0000	1.4
@@ -1 +1 @@
-Read-66.tar.bz2
+Read-73.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Apr 2009 17:32:25 -0000	1.3
+++ sources	12 Sep 2009 10:00:31 -0000	1.4
@@ -1 +1 @@
-92f10686798df2196a8f45922b2b9278  Read-66.tar.bz2
+a0373f4ceb16a25632fe1441ad1700bd  Read-73.tar.bz2


Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sugar-read.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sugar-read.spec	27 Jul 2009 05:04:18 -0000	1.3
+++ sugar-read.spec	12 Sep 2009 10:00:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name: sugar-read
-Version: 66
-Release: 2%{?dist}
+Version: 73
+Release: 1%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -10,7 +10,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: python
 BuildRequires: sugar-toolkit
+BuildRequires: gettext
+
 Requires: gnome-python2-evince
+Requires: pywebkitgtk
+Requires: python-lxml
+Requires: python-BeautifulSoup
 
 BuildArch: noarch
 
@@ -45,6 +50,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 73-1
+- New toolbars
+- Support for Epub files
+- Support for notes associated with bookmarks
+- Show a information bar in fullscreen mode, with pagecount and battery information
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 66-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Sat Sep 12 10:24:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 12 Sep 2009 10:24:38 +0000 (UTC)
Subject: rpms/hunspell-ti/devel hunspell-ti.spec,1.3,1.4
Message-ID: <20090912102438.E80D911C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31461

Modified Files:
	hunspell-ti.spec 
Log Message:
fix


Index: hunspell-ti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ti/devel/hunspell-ti.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-ti.spec	11 Sep 2009 15:35:14 -0000	1.3
+++ hunspell-ti.spec	12 Sep 2009 10:24:38 -0000	1.4
@@ -16,7 +16,7 @@ Requires: hunspell
 Tigrigna hunspell dictionaries.
 
 %prep
-%setup -q -n ti_ER
+%setup -q -c
 
 %build
 tr -d '\r' < README.txt > README.txt.new



From snirkel at fedoraproject.org  Sat Sep 12 10:57:05 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Sat, 12 Sep 2009 10:57:05 +0000 (UTC)
Subject: rpms/libmtp/devel .cvsignore, 1.24, 1.25 libmtp.spec, 1.35,
	1.36 sources, 1.24, 1.25
Message-ID: <20090912105705.CE8A811C00CE@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9976

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream version, many bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	4 Aug 2009 00:38:28 -0000	1.24
+++ .cvsignore	12 Sep 2009 10:57:05 -0000	1.25
@@ -1 +1 @@
-libmtp-1.0.0.tar.gz
+libmtp-1.0.1.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libmtp.spec	4 Aug 2009 00:38:28 -0000	1.35
+++ libmtp.spec	12 Sep 2009 10:57:05 -0000	1.36
@@ -2,7 +2,7 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Linus Walleij <triad at df.lth.se> 1.0.1-1
+- New upstream release. No interface changes!
+
 * Tue Aug 4 2009 Linus Walleij <triad at df.lth.se> 1.0.0-1
 - New upstream release. Dependent packages need to be rebuilt against this.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	4 Aug 2009 00:38:28 -0000	1.24
+++ sources	12 Sep 2009 10:57:05 -0000	1.25
@@ -1 +1 @@
-f105c534dd4f9b6cfdc0ebfb5681266d  libmtp-1.0.0.tar.gz
+d540a0ef033483bd10b7f83f7a84e4a7  libmtp-1.0.1.tar.gz



From ensc at fedoraproject.org  Sat Sep 12 10:58:13 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat, 12 Sep 2009 10:58:13 +0000 (UTC)
Subject: rpms/tor/devel tor.spec,1.36,1.37
Message-ID: <20090912105813.5983111C00CE@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10432

Modified Files:
	tor.spec 
Log Message:
workaround bug in redhat-lsb (#522053)



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- tor.spec	21 Aug 2009 16:12:23 -0000	1.36
+++ tor.spec	12 Sep 2009 10:58:13 -0000	1.37
@@ -13,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.1.19
-Release:	%release_func 1
+Release:	%release_func 2
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -66,7 +66,7 @@ Source20:		%name.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -162,7 +162,14 @@ ln -s %_datadir/tor/geoip $RPM_BUILD_ROO
 
 
 %post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor
+/usr/lib/lsb/install_initd %_initrddir/tor || {
+	cat <<EOF >&2
+oouch... redhat-lsb is still broken. See the report
+https://bugzilla.redhat.com/show_bug.cgi?id=522053
+for details.
+EOF
+	/sbin/chkconfig --add tor
+}
 
 %preun lsb
 test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
@@ -234,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.19-2
+- workaround bug in redhat-lsb (#522053)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.1.19-1
 - rebuilt with new openssl
 



From olea at fedoraproject.org  Sat Sep 12 11:22:25 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 11:22:25 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel .cvsignore, 1.10, 1.11 import.log,
	1.4, 1.5 purple-facebookchat.spec, 1.17, 1.18 sources, 1.12, 1.13
Message-ID: <20090912112225.B863C11C00CE@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17175/devel

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Jul 2009 00:36:46 -0000	1.10
+++ .cvsignore	12 Sep 2009 11:22:25 -0000	1.11
@@ -1 +1 @@
-pidgin-facebookchat-source-1.60.tar.bz2
+pidgin-facebookchat-source-1.61.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	24 Jul 2009 00:36:46 -0000	1.4
+++ import.log	12 Sep 2009 11:22:25 -0000	1.5
@@ -2,3 +2,4 @@ purple-facebookchat-1_50-1olea:HEAD:purp
 purple-facebookchat-1_51-1olea:HEAD:purple-facebookchat-1.51-1olea.src.rpm:1244921772
 purple-facebookchat-1_52-1olea:HEAD:purple-facebookchat-1.52-1olea.src.rpm:1246116000
 purple-facebookchat-1_60-1olea:HEAD:purple-facebookchat-1.60-1olea.src.rpm:1248395737
+purple-facebookchat-1_61-1_olea:HEAD:purple-facebookchat-1.61-1.olea.src.rpm:1252754436


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- purple-facebookchat.spec	26 Jul 2009 19:41:04 -0000	1.17
+++ purple-facebookchat.spec	12 Sep 2009 11:22:25 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
-Version:        1.60
-Release:        2%{?dist}
+Version:        1.61
+Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -51,9 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1
+- updating to 1.61
+%changelog
 * Tue Jul 23 2009 Ismael Olea <ismael at olea.org> 1.60-1
 - updating to 1.60
 - adding new sourcecode files to makefile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Jul 2009 00:36:46 -0000	1.12
+++ sources	12 Sep 2009 11:22:25 -0000	1.13
@@ -1 +1 @@
-c4a4715e55858c5146b24135c153a1a8  pidgin-facebookchat-source-1.60.tar.bz2
+9e78f200710d2dc8134d4e9e5f237618  pidgin-facebookchat-source-1.61.tar.bz2



From olea at fedoraproject.org  Sat Sep 12 11:25:32 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 11:25:32 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-11 .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 purple-facebookchat.spec, 1.17, 1.18 sources, 1.12, 1.13
Message-ID: <20090912112532.95E7611C00CE@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18336/F-11

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
new update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Jul 2009 00:38:14 -0000	1.10
+++ .cvsignore	12 Sep 2009 11:25:32 -0000	1.11
@@ -1 +1 @@
-pidgin-facebookchat-source-1.60.tar.bz2
+pidgin-facebookchat-source-1.61.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	24 Jul 2009 00:38:14 -0000	1.4
+++ import.log	12 Sep 2009 11:25:32 -0000	1.5
@@ -2,3 +2,4 @@ purple-facebookchat-1_50-1olea:HEAD:purp
 purple-facebookchat-1_51-1olea:F-11:purple-facebookchat-1.51-1olea.src.rpm:1244922084
 purple-facebookchat-1_52-1olea:F-11:purple-facebookchat-1.52-1olea.src.rpm:1246115997
 purple-facebookchat-1_60-1olea:F-11:purple-facebookchat-1.60-1olea.src.rpm:1248395849
+purple-facebookchat-1_61-1_olea:F-11:purple-facebookchat-1.61-1.olea.src.rpm:1252754707


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/purple-facebookchat.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- purple-facebookchat.spec	24 Jul 2009 00:38:14 -0000	1.17
+++ purple-facebookchat.spec	12 Sep 2009 11:25:32 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.60
+Version:        1.61
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1
+- updating to 1.61
+%changelog
 * Tue Jul 23 2009 Ismael Olea <ismael at olea.org> 1.60-1
 - updating to 1.60
 - adding new sourcecode files to makefile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Jul 2009 00:38:14 -0000	1.12
+++ sources	12 Sep 2009 11:25:32 -0000	1.13
@@ -1 +1 @@
-c4a4715e55858c5146b24135c153a1a8  pidgin-facebookchat-source-1.60.tar.bz2
+9e78f200710d2dc8134d4e9e5f237618  pidgin-facebookchat-source-1.61.tar.bz2



From olea at fedoraproject.org  Sat Sep 12 11:27:35 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 11:27:35 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-10 .cvsignore, 1.11, 1.12 import.log, 1.4,
	1.5 purple-facebookchat.spec, 1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20090912112735.CA05211C00CE@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19059/F-10

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Jul 2009 00:40:19 -0000	1.11
+++ .cvsignore	12 Sep 2009 11:27:35 -0000	1.12
@@ -1 +1 @@
-pidgin-facebookchat-source-1.60.tar.bz2
+pidgin-facebookchat-source-1.61.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	24 Jul 2009 00:40:20 -0000	1.4
+++ import.log	12 Sep 2009 11:27:35 -0000	1.5
@@ -2,3 +2,4 @@ purple-facebookchat-1_50-1olea:F-10:purp
 purple-facebookchat-1_51-1olea:F-10:purple-facebookchat-1.51-1olea.src.rpm:1244922266
 purple-facebookchat-1_52-1olea:F-10:purple-facebookchat-1.52-1olea.src.rpm:1246115999
 purple-facebookchat-1_60-1olea:F-10:purple-facebookchat-1.60-1olea.src.rpm:1248395949
+purple-facebookchat-1_61-1_olea:F-10:purple-facebookchat-1.61-1.olea.src.rpm:1252754831


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/purple-facebookchat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- purple-facebookchat.spec	24 Jul 2009 00:40:20 -0000	1.16
+++ purple-facebookchat.spec	12 Sep 2009 11:27:35 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.60
+Version:        1.61
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1
+- updating to 1.61
+%changelog
 * Tue Jul 23 2009 Ismael Olea <ismael at olea.org> 1.60-1
 - updating to 1.60
 - adding new sourcecode files to makefile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Jul 2009 00:40:20 -0000	1.12
+++ sources	12 Sep 2009 11:27:35 -0000	1.13
@@ -1 +1 @@
-c4a4715e55858c5146b24135c153a1a8  pidgin-facebookchat-source-1.60.tar.bz2
+9e78f200710d2dc8134d4e9e5f237618  pidgin-facebookchat-source-1.61.tar.bz2



From olea at fedoraproject.org  Sat Sep 12 11:30:15 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 11:30:15 +0000 (UTC)
Subject: rpms/purple-microblog/devel .cvsignore, 1.6, 1.7 import.log, 1.2,
	1.3 purple-microblog.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090912113015.C817011C043A@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20590/devel

Modified Files:
	.cvsignore import.log purple-microblog.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Jun 2009 21:35:59 -0000	1.6
+++ .cvsignore	12 Sep 2009 11:30:15 -0000	1.7
@@ -1 +1 @@
-mbpurple-0.2.2.tar.gz
+mbpurple-0.2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Jun 2009 21:35:59 -0000	1.2
+++ import.log	12 Sep 2009 11:30:15 -0000	1.3
@@ -1,2 +1,3 @@
 purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448
 purple-microblog-0_2_2-1olea:HEAD:purple-microblog-0.2.2-1olea.src.rpm:1245015253
+purple-microblog-0_2_3-1_olea:HEAD:purple-microblog-0.2.3-1.olea.src.rpm:1252754970


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/purple-microblog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- purple-microblog.spec	26 Jul 2009 19:41:19 -0000	1.11
+++ purple-microblog.spec	12 Sep 2009 11:30:15 -0000	1.12
@@ -1,8 +1,8 @@
 %define upstream_name mbpurple
 
 Name:           purple-microblog
-Version:        0.2.2
-Release:        2%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -45,10 +45,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/twitter.png
 %{_datadir}/pixmaps/pidgin/protocols/*/identica.png
 %{_datadir}/pixmaps/pidgin/protocols/*/laconica.png
+%{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-1
+- New upstream release 
 
 * Sun Jun 14 2009 Ismael Olea <ismael at olea.org> - 0.2.2-1
 - New upstream release fixing #505707 twitpocalypse bug


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Jun 2009 21:35:59 -0000	1.7
+++ sources	12 Sep 2009 11:30:15 -0000	1.8
@@ -1 +1 @@
-e27e2695306e31a6ce0d8c8d182ceb24  mbpurple-0.2.2.tar.gz
+f7d208e67b9cec9088f25aac658b72e5  mbpurple-0.2.3.tar.gz



From akurtakov at fedoraproject.org  Sat Sep 12 11:32:42 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 11:32:42 +0000 (UTC)
Subject: rpms/maven-scm/devel .cvsignore, NONE, 1.1 maven-scm-jpp-depmap.xml,
	1.1, 1.2 sources, 1.2, 1.3 maven-scm.spec, 1.14, 1.15
Message-ID: <20090912113242.7DA1511C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22569/devel

Modified Files:
	maven-scm-jpp-depmap.xml sources maven-scm.spec 
Added Files:
	.cvsignore 
Log Message:
Update to upstream 1.2.


--- NEW FILE .cvsignore ---
maven-scm-1.2.tar.gz


Index: maven-scm-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-scm-jpp-depmap.xml	20 Mar 2007 05:10:02 -0000	1.1
+++ maven-scm-jpp-depmap.xml	12 Sep 2009 11:32:42 -0000	1.2
@@ -1,343 +1,4 @@
 <dependencies>
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>scm</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-api</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>api</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-client</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>client</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-manager-plexus</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>manager-plexus</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-managers</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>managers</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-plugin</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>plugin</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-providers</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>providers</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-bazaar</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-bazaar</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-clearcase</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-clearcase</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-providers-cvs</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>providers-cvs</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-cvsjava</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-cvsjava</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-cvs-commons</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-cvs-commons</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-cvsexe</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-cvsexe</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-cvstest</artifactId>
-	  <version>1.0-beta-3</version>
-	  <scope>test</scope>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-cvstest</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-local</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-local</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-perforce</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-perforce</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-starteam</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-starteam</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-providers-svn</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>providers-svn</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-svnjava</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-svnjava</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-svn-commons</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-svn-commons</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-svnexe</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-svnexe</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-svntest</artifactId>
-	  <version>1.0-beta-3</version>
-	  <scope>test</scope>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-svntest</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-provider-vss</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>provider-vss</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-site</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>site</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.scm</groupId>
-	  <artifactId>maven-scm-test</artifactId>
-	  <version>1.0-beta-3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-scm</groupId>
-	  <artifactId>test</artifactId>
-	  <version>1.0-beta-3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.codehaus.plexus</groupId>
-	  <artifactId>plexus-container-default</artifactId>
-	  <version>1.0-alpha-9</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/plexus</groupId>
-	  <artifactId>container-default</artifactId>
-	  <version>1.0-alpha-9</version>
-	</jpp>
-  </dependency>
 
   <dependency>
 	<maven>
@@ -354,84 +15,6 @@
 
   <dependency>
 	<maven>
-	  <groupId>org.apache.maven</groupId>
-	  <artifactId>maven-parent</artifactId>
-	  <version>2.0</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven2</groupId>
-	  <artifactId>parent</artifactId>
-	  <version>2.0</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven</groupId>
-	  <artifactId>maven-project</artifactId>
-	  <version>2.0</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven2</groupId>
-	  <artifactId>project</artifactId>
-	  <version>2.0</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven</groupId>
-	  <artifactId>maven-settings</artifactId>
-	  <version>2.0</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven2</groupId>
-	  <artifactId>settings</artifactId>
-	  <version>2.0</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven</groupId>
-	  <artifactId>maven-plugin-api</artifactId>
-	  <version>2.0</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven2</groupId>
-	  <artifactId>plugin-api</artifactId>
-	  <version>2.0</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.codehaus.modello</groupId>
-	  <artifactId>modello-maven-plugin</artifactId>
-	  <version>1.0-alpha-6</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/modello</groupId>
-	  <artifactId>maven-plugin</artifactId>
-	  <version>1.0-alpha-6</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>3.8.1</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>3.8.1</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
 	  <groupId>org.tmate</groupId>
 	  <artifactId>javasvn</artifactId>
 	  <version>1.0.3</version>
@@ -443,22 +26,16 @@
 	</jpp>
   </dependency>
 
-  <!-- needed for cvsjava; disabled for now since we don't have this -->
   <dependency>
 	<maven>
-	  <groupId>org.netbeans.lib</groupId>
-	  <artifactId>cvsclient</artifactId>
-	  <version>20051129</version>
-	</maven>
-  </dependency>
-
-  <!-- needed for svnjava; disabled for now since we don't have this -->
-  <dependency>
-	<maven>
-	  <groupId>org.codehaus.plexus</groupId>
-	  <artifactId>plexus-utils</artifactId>
-	  <version>1.1</version>
-	</maven>
+	  <groupId>org.apache.maven.plugin-testing</groupId>
+	  <artifactId>maven-plugin-testing-harness</artifactId>
+	  <version>1.2</version>
+	</maven>
+	<jpp>                                                    
+        <groupId>JPP/maven-shared</groupId>                  
+        <artifactId>plugin-testing-harness</artifactId>      
+        <version>1.2</version>                               
+    </jpp>     
   </dependency>
 </dependencies>
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2009 19:03:52 -0000	1.2
+++ sources	12 Sep 2009 11:32:42 -0000	1.3
@@ -1 +1,2 @@
 0c5a74ab3350d80fb2a2072eb3c7a096  maven-scm-1.0-rc1.tar.gz
+c4a4502e9cd656ffa8701d411584a3de  maven-scm-1.2.tar.gz


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- maven-scm.spec	1 Sep 2009 15:43:26 -0000	1.14
+++ maven-scm.spec	12 Sep 2009 11:32:42 -0000	1.15
@@ -29,11 +29,11 @@
 #
 
 %define maven_settings_file %{_builddir}/%{name}/settings.xml
-%define namedversion 1.0-rc1
+%define namedversion 1.2
 
 Name:           maven-scm
-Version:        1.0
-Release:        0.5.rc1.2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -41,8 +41,8 @@ Group:          Development/Libraries
 URL:            http://maven.apache.org/scm
 
 # svn export 
-#   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.0-rc1/ maven-scm/
-# tar czf maven-scm-1.0-rc1.tar.gz maven-scm/
+#   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.2/ maven-scm-1.2/
+# tar czf maven-scm-1.2.tar.gz maven-scm-1.2/
 Source0:        %{name}-%{namedversion}.tar.gz
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-mapdeps.xsl
@@ -74,6 +74,7 @@ BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  tomcat5
 BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  bzr
 
 Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
@@ -107,18 +108,10 @@ Group:          Documentation
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
-#FIXME: Bazaar tests fail since the executable is no available. Disable 
-#       the tests.
-rm -rf maven-scm-providers/maven-scm-provider-bazaar/src/test
-
-%build
-
-(cd maven-scm-api
-cp -p pom.xml pom.xml.noplexusutils.xml
-saxon -o pom.xml pom.xml.noplexusutils.xml %{SOURCE2} map=%{SOURCE3}
-)
+# We don't have svm synergy classes, so disable those tests for now
+rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
 
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
@@ -129,13 +122,13 @@ cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/org/n
 ln -s %{_datadir}/netbeans/ide11/modules/org-netbeans-lib-cvsclient.jar \
   $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar
 
-# We don't have svm synergy classes, so disable those tests for now
-rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
-
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.failure.ignore=true \
+        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
         install javadoc:javadoc
 
 %install
@@ -203,21 +196,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}/client*
 %{_javadir}/%{name}/manager-plexus*
 %{_javadir}/%{name}/plugin*
-%{_javadir}/%{name}/provider-bazaar*
-%{_javadir}/%{name}/provider-clearcase*
-%{_javadir}/%{name}/provider-local*
-%{_javadir}/%{name}/provider-hg*
-%{_javadir}/%{name}/provider-perforce*
-%{_javadir}/%{name}/provider-cvs-commons*
-%{_javadir}/%{name}/provider-cvsexe*
-%{_javadir}/%{name}/provider-cvsjava*
-%{_javadir}/%{name}/provider-svn-commons*
-%{_javadir}/%{name}/provider-svnexe*
-%{_javadir}/%{name}/provider-starteam*
-%{_javadir}/%{name}/provider-synergy*
-%{_javadir}/%{name}/provider-vss*
+%{_javadir}/%{name}/provider-*
 %{_mavendepmapfragdir}
-%doc LICENSE.txt NOTICE.txt
 
 %files test
 %defattr(-,root,root,-)
@@ -230,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-1
+- Update to upstream 1.2.
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.2
 - Bump release
 



From erikos at fedoraproject.org  Sat Sep 12 11:33:21 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sat, 12 Sep 2009 11:33:21 +0000 (UTC)
Subject: rpms/sugar-chat/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-chat.spec, 1.7, 1.8
Message-ID: <20090912113321.9DDCC11C00CE@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22887

Modified Files:
	.cvsignore sources sugar-chat.spec 
Log Message:
* Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 66-1
- New toolbar design




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Apr 2009 11:04:43 -0000	1.5
+++ .cvsignore	12 Sep 2009 11:33:21 -0000	1.6
@@ -1 +1 @@
-Chat-65.tar.bz2
+Chat-66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Apr 2009 11:04:43 -0000	1.5
+++ sources	12 Sep 2009 11:33:21 -0000	1.6
@@ -1 +1 @@
-8926e848ff40e178a47de49ac6049b1f  Chat-65.tar.bz2
+cfdc3ffd2c2ad38a7cb663c59176d18e  Chat-66.tar.bz2


Index: sugar-chat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sugar-chat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sugar-chat.spec	27 Jul 2009 04:59:39 -0000	1.7
+++ sugar-chat.spec	12 Sep 2009 11:33:21 -0000	1.8
@@ -1,14 +1,20 @@
 Name: sugar-chat
-Version: 65
-Release: 2%{?dist}
+Version: 66
+Release: 1%{?dist}
 Summary: Chat client for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.laptop.org/go/Chat
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Chat/Chat-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  python sugar-toolkit
-Requires: sugar python-telepathy
+ 
+BuildRequires: python 
+BuildRequires: sugar-toolkit
+BuildRequires: gettext
+
+Requires: sugar 
+Requires: python-telepathy
+
 BuildArch: noarch
 
 %description
@@ -38,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 66-1
+- New toolbar design
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 65-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From olea at fedoraproject.org  Sat Sep 12 11:35:45 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 11:35:45 +0000 (UTC)
Subject: rpms/purple-microblog/F-11 .cvsignore, 1.6, 1.7 import.log, 1.2,
	1.3 purple-microblog.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090912113545.72D3111C00CE@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23705/F-11

Modified Files:
	.cvsignore import.log purple-microblog.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Jun 2009 21:35:59 -0000	1.6
+++ .cvsignore	12 Sep 2009 11:35:45 -0000	1.7
@@ -1 +1 @@
-mbpurple-0.2.2.tar.gz
+mbpurple-0.2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Jun 2009 21:36:00 -0000	1.2
+++ import.log	12 Sep 2009 11:35:45 -0000	1.3
@@ -1,2 +1,3 @@
 purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448
 purple-microblog-0_2_2-1olea:F-11:purple-microblog-0.2.2-1olea.src.rpm:1245015255
+purple-microblog-0_2_3-1_olea:F-11:purple-microblog-0.2.3-1.olea.src.rpm:1252755184


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/purple-microblog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- purple-microblog.spec	14 Jun 2009 21:36:00 -0000	1.10
+++ purple-microblog.spec	12 Sep 2009 11:35:45 -0000	1.11
@@ -1,7 +1,7 @@
 %define upstream_name mbpurple
 
 Name:           purple-microblog
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
@@ -45,8 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/twitter.png
 %{_datadir}/pixmaps/pidgin/protocols/*/identica.png
 %{_datadir}/pixmaps/pidgin/protocols/*/laconica.png
+%{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-1
+- New upstream release 
+
 * Sun Jun 14 2009 Ismael Olea <ismael at olea.org> - 0.2.2-1
 - New upstream release fixing #505707 twitpocalypse bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Jun 2009 21:36:00 -0000	1.7
+++ sources	12 Sep 2009 11:35:45 -0000	1.8
@@ -1 +1 @@
-e27e2695306e31a6ce0d8c8d182ceb24  mbpurple-0.2.2.tar.gz
+f7d208e67b9cec9088f25aac658b72e5  mbpurple-0.2.3.tar.gz



From olea at fedoraproject.org  Sat Sep 12 11:38:43 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 11:38:43 +0000 (UTC)
Subject: rpms/purple-microblog/F-10 .cvsignore, 1.5, 1.6 import.log, 1.2,
	1.3 purple-microblog.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090912113843.0ACC111C00CE@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24676/F-10

Modified Files:
	.cvsignore import.log purple-microblog.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Jun 2009 21:36:05 -0000	1.5
+++ .cvsignore	12 Sep 2009 11:38:42 -0000	1.6
@@ -1 +1 @@
-mbpurple-0.2.2.tar.gz
+mbpurple-0.2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Jun 2009 21:36:05 -0000	1.2
+++ import.log	12 Sep 2009 11:38:42 -0000	1.3
@@ -1,2 +1,3 @@
 purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448
 purple-microblog-0_2_2-1olea:F-10:purple-microblog-0.2.2-1olea.src.rpm:1245015253
+purple-microblog-0_2_3-1_olea:F-10:purple-microblog-0.2.3-1.olea.src.rpm:1252755464


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/purple-microblog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- purple-microblog.spec	14 Jun 2009 21:36:05 -0000	1.9
+++ purple-microblog.spec	12 Sep 2009 11:38:42 -0000	1.10
@@ -1,7 +1,7 @@
 %define upstream_name mbpurple
 
 Name:           purple-microblog
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
@@ -45,8 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/twitter.png
 %{_datadir}/pixmaps/pidgin/protocols/*/identica.png
 %{_datadir}/pixmaps/pidgin/protocols/*/laconica.png
+%{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-1
+- New upstream release 
+
 * Sun Jun 14 2009 Ismael Olea <ismael at olea.org> - 0.2.2-1
 - New upstream release fixing #505707 twitpocalypse bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Jun 2009 21:36:05 -0000	1.7
+++ sources	12 Sep 2009 11:38:42 -0000	1.8
@@ -1 +1 @@
-e27e2695306e31a6ce0d8c8d182ceb24  mbpurple-0.2.2.tar.gz
+f7d208e67b9cec9088f25aac658b72e5  mbpurple-0.2.3.tar.gz



From pkgdb at fedoraproject.org  Sat Sep 12 11:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 11:38:45 +0000
Subject: [pkgdb] sugar-turtleart: erikos has requested watchcommits
Message-ID: <20090912113845.EA10A10F87A@bastion2.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-turtleart (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Sat Sep 12 11:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 11:38:46 +0000
Subject: [pkgdb] sugar-turtleart: erikos has requested watchbugzilla
Message-ID: <20090912113846.766F610F88A@bastion2.fedora.phx.redhat.com>

erikos has requested the watchbugzilla acl on sugar-turtleart (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Sat Sep 12 11:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 11:38:47 +0000
Subject: [pkgdb] sugar-turtleart: erikos has requested commit
Message-ID: <20090912113847.2D2D810F893@bastion2.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-turtleart (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Sat Sep 12 11:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 11:38:53 +0000
Subject: [pkgdb] sugar-turtleart: erikos has requested watchcommits
Message-ID: <20090912113853.D975E10F896@bastion2.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-turtleart (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Sat Sep 12 11:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 11:38:54 +0000
Subject: [pkgdb] sugar-turtleart: erikos has requested commit
Message-ID: <20090912113854.DE61C10F89B@bastion2.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-turtleart (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Sat Sep 12 11:38:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 11:38:59 +0000
Subject: [pkgdb] sugar-turtleart: erikos has requested watchbugzilla
Message-ID: <20090912113859.A559310F881@bastion2.fedora.phx.redhat.com>

erikos has requested the watchbugzilla acl on sugar-turtleart (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From akurtakov at fedoraproject.org  Sat Sep 12 11:51:18 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 11:51:18 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.15,1.16
Message-ID: <20090912115118.3C35411C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27778/devel

Modified Files:
	maven-scm.spec 
Log Message:
Add doxia-sitetools BR.


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- maven-scm.spec	12 Sep 2009 11:32:42 -0000	1.15
+++ maven-scm.spec	12 Sep 2009 11:51:17 -0000	1.16
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -74,6 +74,7 @@ BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  tomcat5
 BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  maven-doxia-sitetools
 BuildRequires:  bzr
 
 Requires:       junit >= 3.8.2
@@ -210,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-2
+- Add doxia-sitetools BR.
+
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-1
 - Update to upstream 1.2.
 



From spot at fedoraproject.org  Sat Sep 12 12:35:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 12:35:38 +0000 (UTC)
Subject: rpms/gambas2/devel .cvsignore, 1.14, 1.15 gambas2.spec, 1.21,
	1.22 sources, 1.15, 1.16
Message-ID: <20090912123538.E7EEE11C0418@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7747/devel

Modified Files:
	.cvsignore gambas2.spec sources 
Log Message:
2.16.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	17 Aug 2009 19:35:59 -0000	1.14
+++ .cvsignore	12 Sep 2009 12:35:38 -0000	1.15
@@ -1 +1 @@
-gambas2-2.15.2.tar.bz2
+gambas2-2.16.0.tar.bz2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gambas2.spec	17 Aug 2009 19:35:59 -0000	1.21
+++ gambas2.spec	12 Sep 2009 12:35:38 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.15.2
+Version:	2.16.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -19,7 +19,6 @@ BuildRequires:	libXcursor-devel, libXft-
 BuildRequires:	xdg-utils, glibc-devel, libffi-devel, firebird-devel
 # Code is not endian clean.
 ExcludeArch:	ppc ppc64
-Patch0:		%{name}-2.0.0-use-system-ltdl.patch
 Patch1:		%{name}-2.0.0-nolintl.patch
 Patch2:		%{name}-2.0.0-noliconv.patch
 
@@ -465,7 +464,6 @@ Requires:	%{name}-runtime = %{version}-%
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
 # We used to patch these out, but this is simpler.
@@ -1574,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
+- update to 2.16.0
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.15.2-1
 - update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	17 Aug 2009 19:35:59 -0000	1.15
+++ sources	12 Sep 2009 12:35:38 -0000	1.16
@@ -1 +1 @@
-8231eaca85c32746a2d64a04a454a95f  gambas2-2.15.2.tar.bz2
+7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2



From spot at fedoraproject.org  Sat Sep 12 12:35:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 12:35:38 +0000 (UTC)
Subject: rpms/gambas2/F-10 gambas2.spec,1.14,1.15 sources,1.14,1.15
Message-ID: <20090912123538.E4E2211C02C8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7747/F-10

Modified Files:
	gambas2.spec sources 
Log Message:
2.16.0


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/gambas2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gambas2.spec	17 Aug 2009 19:35:58 -0000	1.14
+++ gambas2.spec	12 Sep 2009 12:35:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.15.2
+Version:	2.16.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -19,7 +19,6 @@ BuildRequires:	libXcursor-devel, libXft-
 BuildRequires:	xdg-utils, glibc-devel, libffi-devel, firebird-devel
 # Code is not endian clean.
 ExcludeArch:	ppc ppc64
-Patch0:		%{name}-2.0.0-use-system-ltdl.patch
 Patch1:		%{name}-2.0.0-nolintl.patch
 Patch2:		%{name}-2.0.0-noliconv.patch
 
@@ -465,7 +464,6 @@ Requires:	%{name}-runtime = %{version}-%
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
 # We used to patch these out, but this is simpler.
@@ -1574,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
+- update to 2.16.0
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.15.2-1
 - update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	17 Aug 2009 19:35:58 -0000	1.14
+++ sources	12 Sep 2009 12:35:37 -0000	1.15
@@ -1 +1 @@
-8231eaca85c32746a2d64a04a454a95f  gambas2-2.15.2.tar.bz2
+7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2



From spot at fedoraproject.org  Sat Sep 12 12:35:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 12:35:38 +0000 (UTC)
Subject: rpms/gambas2/F-11 gambas2.spec,1.20,1.21 sources,1.15,1.16
Message-ID: <20090912123538.E19C311C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7747/F-11

Modified Files:
	gambas2.spec sources 
Log Message:
2.16.0


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-11/gambas2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gambas2.spec	17 Aug 2009 19:35:59 -0000	1.20
+++ gambas2.spec	12 Sep 2009 12:35:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.15.2
+Version:	2.16.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -19,7 +19,6 @@ BuildRequires:	libXcursor-devel, libXft-
 BuildRequires:	xdg-utils, glibc-devel, libffi-devel, firebird-devel
 # Code is not endian clean.
 ExcludeArch:	ppc ppc64
-Patch0:		%{name}-2.0.0-use-system-ltdl.patch
 Patch1:		%{name}-2.0.0-nolintl.patch
 Patch2:		%{name}-2.0.0-noliconv.patch
 
@@ -465,7 +464,6 @@ Requires:	%{name}-runtime = %{version}-%
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
 # We used to patch these out, but this is simpler.
@@ -1574,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
+- update to 2.16.0
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.15.2-1
 - update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	17 Aug 2009 19:35:59 -0000	1.15
+++ sources	12 Sep 2009 12:35:38 -0000	1.16
@@ -1 +1 @@
-8231eaca85c32746a2d64a04a454a95f  gambas2-2.15.2.tar.bz2
+7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2



From musuruan at fedoraproject.org  Sat Sep 12 12:38:04 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 12 Sep 2009 12:38:04 +0000 (UTC)
Subject: rpms/hatari/devel .cvsignore, 1.8, 1.9 hatari.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <20090912123804.80BCD11C00CE@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8420

Modified Files:
	.cvsignore hatari.spec sources 
Log Message:
* Sat Sep 12 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.1-1
- updated to upstream 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Aug 2009 12:26:58 -0000	1.8
+++ .cvsignore	12 Sep 2009 12:38:04 -0000	1.9
@@ -1 +1 @@
-hatari-1.3.0.tar.bz2
+hatari-1.3.1.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/hatari.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hatari.spec	23 Aug 2009 12:26:58 -0000	1.15
+++ hatari.spec	12 Sep 2009 12:38:04 -0000	1.16
@@ -1,6 +1,6 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.3.0
+Version: 1.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
@@ -113,6 +113,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Sep 12 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.1-1
+- updated to upstream 1.3.1
+
 * Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
 - updated to upstream 1.3.0
 - disabled new upstream python UI


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Aug 2009 12:26:58 -0000	1.8
+++ sources	12 Sep 2009 12:38:04 -0000	1.9
@@ -1 +1 @@
-1440230be3dd38098f4e0ef36b0a90df  hatari-1.3.0.tar.bz2
+112b544ec4affb7c04e931088e62a115  hatari-1.3.1.tar.bz2



From musuruan at fedoraproject.org  Sat Sep 12 12:51:29 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 12 Sep 2009 12:51:29 +0000 (UTC)
Subject: rpms/hatari/F-11 .cvsignore, 1.8, 1.9 hatari.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <20090912125129.5235911C00CE@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12268

Modified Files:
	.cvsignore hatari.spec sources 
Log Message:
* Sat Sep 12 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.1-1
- updated to upstream 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Aug 2009 12:40:32 -0000	1.8
+++ .cvsignore	12 Sep 2009 12:51:29 -0000	1.9
@@ -1 +1 @@
-hatari-1.3.0.tar.bz2
+hatari-1.3.1.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/hatari.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hatari.spec	23 Aug 2009 12:40:32 -0000	1.14
+++ hatari.spec	12 Sep 2009 12:51:29 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.3.0
+Version: 1.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
@@ -113,6 +113,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Sep 12 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.1-1
+- updated to upstream 1.3.1
+
 * Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
 - updated to upstream 1.3.0
 - disabled new upstream python UI


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Aug 2009 12:40:32 -0000	1.8
+++ sources	12 Sep 2009 12:51:29 -0000	1.9
@@ -1 +1 @@
-1440230be3dd38098f4e0ef36b0a90df  hatari-1.3.0.tar.bz2
+112b544ec4affb7c04e931088e62a115  hatari-1.3.1.tar.bz2



From musuruan at fedoraproject.org  Sat Sep 12 12:52:48 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 12 Sep 2009 12:52:48 +0000 (UTC)
Subject: rpms/hatari/F-10 .cvsignore, 1.8, 1.9 hatari.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090912125248.7A32C11C00CE@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12675

Modified Files:
	.cvsignore hatari.spec sources 
Log Message:
* Sat Sep 12 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.1-1
- updated to upstream 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Aug 2009 12:53:52 -0000	1.8
+++ .cvsignore	12 Sep 2009 12:52:48 -0000	1.9
@@ -1 +1 @@
-hatari-1.3.0.tar.bz2
+hatari-1.3.1.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/hatari.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- hatari.spec	23 Aug 2009 12:53:52 -0000	1.13
+++ hatari.spec	12 Sep 2009 12:52:48 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.3.0
+Version: 1.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
@@ -113,6 +113,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Sep 12 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.1-1
+- updated to upstream 1.3.1
+
 * Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
 - updated to upstream 1.3.0
 - disabled new upstream python UI


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Aug 2009 12:53:52 -0000	1.8
+++ sources	12 Sep 2009 12:52:48 -0000	1.9
@@ -1 +1 @@
-1440230be3dd38098f4e0ef36b0a90df  hatari-1.3.0.tar.bz2
+112b544ec4affb7c04e931088e62a115  hatari-1.3.1.tar.bz2



From spot at fedoraproject.org  Sat Sep 12 13:44:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 13:44:09 +0000 (UTC)
Subject: rpms/google-perftools/F-11 google-perftools.spec, 1.19, 1.20 sources,
	1.10, 1.11
Message-ID: <20090912134410.0D71F11C02C8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv590/F-11

Modified Files:
	google-perftools.spec sources 
Log Message:
1.4


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-11/google-perftools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- google-perftools.spec	2 Jul 2009 17:38:47 -0000	1.19
+++ google-perftools.spec	12 Sep 2009 13:44:09 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		google-perftools
-Version:	1.3
-Release:	2%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
@@ -72,6 +72,12 @@ LD_LIBRARY_PATH=./.libs make check
 %{_libdir}/*.so
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-1
+- update to 1.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-2
 - disable tests for ppc, upstream ticket #153
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 14:55:48 -0000	1.10
+++ sources	12 Sep 2009 13:44:09 -0000	1.11
@@ -1 +1 @@
-eaa485163a55f2f64284d27627778a2f  google-perftools-1.3.tar.gz
+e9383c158dcb3f4a789564498ec3f046  google-perftools-1.4.tar.gz



From spot at fedoraproject.org  Sat Sep 12 13:44:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 13:44:09 +0000 (UTC)
Subject: rpms/google-perftools/devel .cvsignore, 1.10,
	1.11 google-perftools.spec, 1.20, 1.21 sources, 1.10, 1.11
Message-ID: <20090912134410.1090D11C02CA@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv590/devel

Modified Files:
	.cvsignore google-perftools.spec sources 
Log Message:
1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 14:55:48 -0000	1.10
+++ .cvsignore	12 Sep 2009 13:44:09 -0000	1.11
@@ -1 +1 @@
-google-perftools-1.3.tar.gz
+google-perftools-1.4.tar.gz


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/devel/google-perftools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- google-perftools.spec	25 Jul 2009 01:04:21 -0000	1.20
+++ google-perftools.spec	12 Sep 2009 13:44:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		google-perftools
-Version:	1.3
-Release:	3%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
@@ -72,6 +72,9 @@ LD_LIBRARY_PATH=./.libs make check
 %{_libdir}/*.so
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-1
+- update to 1.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 14:55:48 -0000	1.10
+++ sources	12 Sep 2009 13:44:09 -0000	1.11
@@ -1 +1 @@
-eaa485163a55f2f64284d27627778a2f  google-perftools-1.3.tar.gz
+e9383c158dcb3f4a789564498ec3f046  google-perftools-1.4.tar.gz



From tuxbrewr at fedoraproject.org  Sat Sep 12 13:44:24 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 12 Sep 2009 13:44:24 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.7, 1.8 etoys.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20090912134424.F0F1A11C00CE@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv746

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Sep 2009 19:14:26 -0000	1.7
+++ .cvsignore	12 Sep 2009 13:44:24 -0000	1.8
@@ -1 +1 @@
-etoys-4.0.2258.tar.gz
+etoys-4.0.2279.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- etoys.spec	4 Sep 2009 19:14:26 -0000	1.8
+++ etoys.spec	12 Sep 2009 13:44:24 -0000	1.9
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2258
+%define version 4.0.2279
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1
+- lastest upstream release 4.0.2279	
+
 * Fri Sep  4 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2258-1
 - pulled in latest upstream release 4.0.2258
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Sep 2009 19:14:26 -0000	1.7
+++ sources	12 Sep 2009 13:44:24 -0000	1.8
@@ -1 +1 @@
-3500170671ddad33cdf8c79a5967aa28  etoys-4.0.2258.tar.gz
+77701b44a106f1316bed3b2c09319a50  etoys-4.0.2279.tar.gz



From spot at fedoraproject.org  Sat Sep 12 13:44:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 13:44:09 +0000 (UTC)
Subject: rpms/google-perftools/F-10 google-perftools.spec, 1.17, 1.18 sources,
	1.10, 1.11
Message-ID: <20090912134410.0A87011C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv590/F-10

Modified Files:
	google-perftools.spec sources 
Log Message:
1.4


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-10/google-perftools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- google-perftools.spec	2 Jul 2009 14:55:47 -0000	1.17
+++ google-perftools.spec	12 Sep 2009 13:44:08 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		google-perftools
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -50,7 +50,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %check
+# http://code.google.com/p/google-perftools/issues/detail?id=153
+%ifnarch ppc
 LD_LIBRARY_PATH=./.libs make check
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -69,6 +72,15 @@ LD_LIBRARY_PATH=./.libs make check
 %{_libdir}/*.so
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-1
+- update to 1.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-2
+- disable tests for ppc, upstream ticket #153
+
 * Thu Jul  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-1
 - update to 1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 14:55:47 -0000	1.10
+++ sources	12 Sep 2009 13:44:08 -0000	1.11
@@ -1 +1 @@
-eaa485163a55f2f64284d27627778a2f  google-perftools-1.3.tar.gz
+e9383c158dcb3f4a789564498ec3f046  google-perftools-1.4.tar.gz



From tuxbrewr at fedoraproject.org  Sat Sep 12 13:58:44 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 12 Sep 2009 13:58:44 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.7, 1.8 etoys.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <20090912135844.1194911C00CE@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/etoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4900

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Sep 2009 19:30:43 -0000	1.7
+++ .cvsignore	12 Sep 2009 13:58:43 -0000	1.8
@@ -1 +1 @@
-etoys-4.0.2258.tar.gz
+etoys-4.0.2279.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- etoys.spec	4 Sep 2009 19:30:43 -0000	1.7
+++ etoys.spec	12 Sep 2009 13:58:43 -0000	1.8
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2258
+%define version 4.0.2279
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1
+- lastest upstream release 4.0.2279	
+
 * Fri Sep  4 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2258-1
 - pulled in latest upstream release 4.0.2258
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Sep 2009 19:30:43 -0000	1.7
+++ sources	12 Sep 2009 13:58:43 -0000	1.8
@@ -1 +1 @@
-3500170671ddad33cdf8c79a5967aa28  etoys-4.0.2258.tar.gz
+77701b44a106f1316bed3b2c09319a50  etoys-4.0.2279.tar.gz



From caolanm at fedoraproject.org  Sat Sep 12 14:02:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 12 Sep 2009 14:02:22 +0000 (UTC)
Subject: rpms/lpsolve/devel .cvsignore, 1.5, 1.6 lpsolve.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090912140222.377D811C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/lpsolve/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5934

Modified Files:
	.cvsignore lpsolve.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Feb 2009 23:27:28 -0000	1.5
+++ .cvsignore	12 Sep 2009 14:02:21 -0000	1.6
@@ -1 +1 @@
-lp_solve_5.5.0.14_source.tar.gz
+lp_solve_5.5.0.15_source.tar.gz


Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/devel/lpsolve.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lpsolve.spec	25 Jul 2009 11:19:49 -0000	1.9
+++ lpsolve.spec	12 Sep 2009 14:02:22 -0000	1.10
@@ -1,7 +1,7 @@
 Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
-Version:   5.5.0.14
-Release:   4%{?dist}
+Version:   5.5.0.15
+Release:   1%{?dist}
 Source:    http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
 Group:     System Environment/Libraries
 URL:       http://sourceforge.net/projects/lpsolve
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/lpsolve
 
 %changelog
+* Sat Sep 12 2009 Caol?n McNamara <caolanm at redhat.com> - 5.5.0.15-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5.0.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Feb 2009 23:27:28 -0000	1.6
+++ sources	12 Sep 2009 14:02:22 -0000	1.7
@@ -1 +1 @@
-38a09a457f06a2e809e756b17730ca7b  lp_solve_5.5.0.14_source.tar.gz
+4f1e4e9e7693e05ff48a245de7852cc6  lp_solve_5.5.0.15_source.tar.gz



From mschwendt at fedoraproject.org  Sat Sep 12 14:08:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 12 Sep 2009 14:08:26 +0000 (UTC)
Subject: rpms/audacity/devel audacity-1.3.9-labeltrack-crash.patch, NONE,
	1.1 audacity.spec, 1.82, 1.83
Message-ID: <20090912140826.B56CF11C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8312

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.9-labeltrack-crash.patch 
Log Message:
* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.2.beta
- add wxGTK work-around patches to fix LabelTrack crash
  (shall fix #520917 and similar race-conditions)


audacity-1.3.9-labeltrack-crash.patch:
 LabelTrack.cpp |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 LabelTrack.h   |    2 -
 Menus.cpp      |   17 +-------
 Project.cpp    |   18 +--------
 Project.h      |    4 --
 5 files changed, 112 insertions(+), 39 deletions(-)

--- NEW FILE audacity-1.3.9-labeltrack-crash.patch ---
diff -Nur audacity-src-1.3.9-orig/src/LabelTrack.cpp audacity-src-1.3.9/src/LabelTrack.cpp
--- audacity-src-1.3.9-orig/src/LabelTrack.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/LabelTrack.cpp	2009-09-12 14:59:27.000000000 +0200
@@ -57,6 +57,97 @@
 #include "Project.h"
 #include "commands/CommandManager.h"
 
+#if defined(__WXGTK__)
+// As of wxGTK 2.8.9, there is a problem in the wxClipboard class that
+// allows recursive event processing.  This problem has been corrected
+// by wxWidgets 2.9+.  However, this han't made it into a release yet,
+// so we have to work around it.
+//
+// This is done by pulling/merging in some code from wx29 and creating
+// the following class to capture events while accessing the clipboard
+// to prevent the asynchronous clipboard access from causing recursive
+// event processing.
+
+#include <wx/app.h>
+#include <wx/dynarray.h>
+
+#include <gtk/gtk.h>
+
+extern GtkWidget *wxGetRootWindow();
+
+static void main_do_event(GdkEvent *event, wxArrayPtrVoid *queue)
+{
+   switch (event->type)
+   {
+      case GDK_NOTHING:
+         // Ignore it
+      break;
+
+      case GDK_SELECTION_REQUEST:
+      case GDK_SELECTION_NOTIFY:
+      case GDK_SELECTION_CLEAR:
+#if GTK_CHECK_VERSION(2,6,0)
+      case GDK_OWNER_CHANGE:
+#endif
+         // process it now
+         gtk_main_do_event(event);
+      break;
+
+      default:
+         // process it later (but make a copy; the caller will free the event pointer)
+         queue->Add(gdk_event_copy(event));
+      break;
+   }
+
+   // don't allow idle callbacks while we're active
+   wxTheApp->SuspendIdleCallback();
+
+   return;
+}
+
+class CaptureEvents
+{
+ public:
+   CaptureEvents()
+   {
+#if wxUSE_LOG
+      // disable log flushing from here because a call to wxYield() shouldn't
+      // normally result in message boxes popping up &c
+      wxLog::Suspend();
+#endif
+
+      // temporarily replace the global GDK event handler with our function
+      gdk_event_handler_set((GdkEventFunc)main_do_event, &queue, NULL);
+
+      // temporarily suspend idle callbacks
+      wxTheApp->SuspendIdleCallback();
+   }
+
+   virtual ~CaptureEvents()
+   {
+      gdk_event_handler_set((GdkEventFunc)gtk_main_do_event, NULL, NULL);
+   
+      // put all unprocessed GDK events back in the queue
+      GdkDisplay* disp = gtk_widget_get_display(wxGetRootWindow());
+      size_t cnt = queue.GetCount();
+      for (size_t i = 0; i < cnt; i++) {
+         GdkEvent* event = (GdkEvent*)queue[i];
+         // NOTE: gdk_display_put_event makes a copy of the event passed to it
+         gdk_display_put_event(disp, event);
+         gdk_event_free(event);
+      }
+
+#if wxUSE_LOG
+      // let the logs be flashed again
+      wxLog::Resume();
+#endif
+   }
+
+ private:
+   wxArrayPtrVoid queue;
+};
+#endif
+
 wxFont LabelTrack::msFont;
 
 // static member variables.
@@ -74,13 +165,11 @@
 
 int LabelTrack::mFontHeight=-1;
 
-
 LabelTrack *TrackFactory::NewLabelTrack()
 {
    return new LabelTrack(mDirManager);
 }
 
-
 LabelTrack::LabelTrack(DirManager * projDirManager):
    Track(projDirManager),
    mbHitCenter(false),
@@ -969,6 +1058,9 @@
    
    // copy data onto clipboard
    if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+      CaptureEvents capture;
+#endif
       wxTheClipboard->SetData(new wxTextDataObject(data));
       wxTheClipboard->Close();
    }
@@ -1001,6 +1093,9 @@
 
    // copy the data on clipboard
    if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+      CaptureEvents capture;
+#endif
       wxTheClipboard->SetData(new wxTextDataObject(data));
       wxTheClipboard->Close();
    }
@@ -1021,10 +1116,13 @@
    wxString right=wxT("");
    
    // if text data is available
-   if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
+   if (IsTextClipSupported()) {
       if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+         CaptureEvents capture;
+#endif
          wxTextDataObject data;
-         wxTheClipboard->GetData( data );
+         wxTheClipboard->GetData(data);
          wxTheClipboard->Close();
          text = data.GetText();
       }
@@ -1077,6 +1175,10 @@
 /// @return true if the text data is available in the clipboard, false otherwise
 bool LabelTrack::IsTextClipSupported()
 {
+#if defined(__WXGTK__)
+   CaptureEvents capture;
+#endif
+
    return wxTheClipboard->IsSupported(wxDF_TEXT);
 }
 
diff -Nur audacity-src-1.3.9-orig/src/LabelTrack.h audacity-src-1.3.9/src/LabelTrack.h
--- audacity-src-1.3.9-orig/src/LabelTrack.h	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/LabelTrack.h	2009-09-12 14:59:27.000000000 +0200
@@ -129,7 +129,7 @@
    bool CutSelectedText();
    bool CopySelectedText();
    bool PasteSelectedText(double sel0, double sel1);
-   bool IsTextClipSupported();
+   static bool IsTextClipSupported();
    
    // methods to set flags
    void SetDragXPos(const int d) { mDragXPos = d; };
diff -Nur audacity-src-1.3.9-orig/src/Menus.cpp audacity-src-1.3.9/src/Menus.cpp
--- audacity-src-1.3.9-orig/src/Menus.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Menus.cpp	2009-09-12 15:18:22.150741538 +0200
@@ -1359,20 +1359,6 @@
          if (lt->IsTextSelected()) {
             flags |= CutCopyAvailableFlag;
          }
-
-         // See AudacityProject::OnUpdateUI() for an explanation
-         if (mInIdle) {
-            if (lt->IsTextClipSupported()) {
-               flags |= TextClipFlag;
-               mTextClipFlag = TextClipFlag;
-            }
-            else {
-               mTextClipFlag = 0;
-            }
-         }
-         else {
-            flags |= mTextClipFlag;
-         }
       }
       else if (t->GetKind() == Track::Wave) {
          flags |= WaveTracksExistFlag;
@@ -1422,6 +1408,9 @@
    if (GetZoom() > gMinZoom && (flags & TracksExistFlag))
       flags |= ZoomOutAvailableFlag;
 
+   if ((flags & LabelTracksExistFlag) && LabelTrack::IsTextClipSupported())
+      flags |= TextClipFlag;
+
    flags |= GetFocusedFrame();
 
    if (IsPlayRegionLocked())
diff -Nur audacity-src-1.3.9-orig/src/Project.cpp audacity-src-1.3.9/src/Project.cpp
--- audacity-src-1.3.9-orig/src/Project.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Project.cpp	2009-09-12 15:18:29.746745064 +0200
@@ -653,13 +653,12 @@
                                  const wxSize & size)
    : wxFrame(parent, id, wxT("Audacity"), pos, size),
      mLastPlayMode(normalPlay),
+     mFreqWindow(NULL),
      mRate((double) gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), AudioIO::GetOptimalSupportedSampleRate())),
      mDefaultFormat((sampleFormat) gPrefs->
            Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample)),
      mSnapTo(0), 
      mDirty(false),
-     mInIdle(false),
-     mTextClipFlag(0),
      mTrackPanel(NULL),
      mTrackFactory(NULL),
      mAutoScrolling(false),
@@ -689,8 +688,7 @@
      mWantSaveCompressed(false),
      mLastEffect(NULL),
      mLastEffectType(0),
-     mLastEffectDesc(_("Repeat Last Effect")),
-     mFreqWindow(NULL)
+     mLastEffectDesc(_("Repeat Last Effect"))
 {
    int widths[] = {-1, 130};
    mStatusBar = CreateStatusBar(2);
@@ -1644,19 +1642,7 @@
 
 void AudacityProject::OnUpdateUI(wxUpdateUIEvent & event)
 {
-   // As of wxGTK 2.8.9, there is a problem in the wxClipboard class that
-   // allows recursive event processing.  This problem has been corrected
-   // by wxWidgets changeset #45180.  However, this han't made it into a
-   // release yet, so we have to work around it.
-   //
-   // This is done by only checking the wxClipboard contents during an idle
-   // event, thus preventing possible recursion during other event processing.
-   //
-   mInIdle = true;
-
    UpdateMenus();
-
-   mInIdle = false;
 }
 
 void AudacityProject::OnActivate(wxActivateEvent & event)
diff -Nur audacity-src-1.3.9-orig/src/Project.h audacity-src-1.3.9/src/Project.h
--- audacity-src-1.3.9-orig/src/Project.h	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Project.h	2009-09-12 15:18:26.812745135 +0200
@@ -431,10 +431,6 @@
 
    wxUint32 mLastFlags;
 
-   // see AudacityProject::OnUpdateUI() for explanation of next two
-   bool mInIdle;
-   wxUint32 mTextClipFlag;
-
    // Window elements
 
    wxTimer *mTimer;


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- audacity.spec	5 Sep 2009 08:56:55 -0000	1.82
+++ audacity.spec	12 Sep 2009 14:08:26 -0000	1.83
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.9
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -18,6 +18,7 @@ Source2: audacity.desktop
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
 Patch3: audacity-1.3.8-gsocket-conflict.patch
+Patch4: audacity-1.3.9-labeltrack-crash.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +69,7 @@ done
 grep -q -s __RPM_LIB * -R && exit 1
 
 %patch3 -p1 -b .gsocket-conflict
+%patch4 -p1 -b .labeltrack-crash
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -146,6 +148,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.2.beta
+- add wxGTK work-around patches to fix LabelTrack crash
+  (shall fix #520917 and similar race-conditions)
+
 * Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
 - upgrade to 1.3.9-beta
 - upstream's changes in the device prefs code make the audiodevdefaults



From xulchris at fedoraproject.org  Sat Sep 12 14:22:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat, 12 Sep 2009 14:22:52 +0000 (UTC)
Subject: rpms/php-pear-PHPUnit/F-11 .cvsignore, 1.12,
	1.13 php-pear-PHPUnit.spec, 1.16, 1.17 sources, 1.13, 1.14
Message-ID: <20090912142252.9202111C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-PHPUnit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12327/F-11

Modified Files:
	.cvsignore php-pear-PHPUnit.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/F-11/.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	12 Sep 2009 14:22:52 -0000	1.13
@@ -1 +1 @@
-PHPUnit-3.3.4.tgz
+PHPUnit-3.3.17.tgz


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/F-11/php-pear-PHPUnit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- php-pear-PHPUnit.spec	3 May 2009 16:36:38 -0000	1.16
+++ php-pear-PHPUnit.spec	12 Sep 2009 14:22:52 -0000	1.17
@@ -3,7 +3,7 @@
 %global channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        3.3.16
+Version:        3.3.17
 Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
@@ -101,6 +101,12 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Christopher Stone <chris.stone at gmail.com> 3.3.17-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 02 2009 Remi Collet <Fedora at famillecollet.com> - 3.3.16-1
 - Upstream sync
 - Fix requires (remove hint) and raise PEAR version to 1.7.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 May 2009 16:36:38 -0000	1.13
+++ sources	12 Sep 2009 14:22:52 -0000	1.14
@@ -1 +1 @@
-1bafa52c00d773c84931d43e37532729  PHPUnit-3.3.16.tgz
+ba59823607c9f4f54af560dfca2988df  PHPUnit-3.3.17.tgz



From xulchris at fedoraproject.org  Sat Sep 12 14:22:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat, 12 Sep 2009 14:22:52 +0000 (UTC)
Subject: rpms/php-pear-PHPUnit/F-10 .cvsignore, 1.12,
	1.13 php-pear-PHPUnit.spec, 1.15, 1.16 sources, 1.13, 1.14
Message-ID: <20090912142252.6D53D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-PHPUnit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12327/F-10

Modified Files:
	.cvsignore php-pear-PHPUnit.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/F-10/.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	12 Sep 2009 14:22:51 -0000	1.13
@@ -1 +1 @@
-PHPUnit-3.3.4.tgz
+PHPUnit-3.3.17.tgz


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/F-10/php-pear-PHPUnit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- php-pear-PHPUnit.spec	3 May 2009 16:45:14 -0000	1.15
+++ php-pear-PHPUnit.spec	12 Sep 2009 14:22:52 -0000	1.16
@@ -3,7 +3,7 @@
 %global channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        3.3.16
+Version:        3.3.17
 Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
@@ -101,6 +101,12 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Christopher Stone <chris.stone at gmail.com> 3.3.17-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 02 2009 Remi Collet <Fedora at famillecollet.com> - 3.3.16-1
 - Upstream sync
 - Fix requires (remove hint) and raise PEAR version to 1.7.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 May 2009 16:45:14 -0000	1.13
+++ sources	12 Sep 2009 14:22:52 -0000	1.14
@@ -1 +1 @@
-1bafa52c00d773c84931d43e37532729  PHPUnit-3.3.16.tgz
+ba59823607c9f4f54af560dfca2988df  PHPUnit-3.3.17.tgz



From xulchris at fedoraproject.org  Sat Sep 12 14:22:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sat, 12 Sep 2009 14:22:52 +0000 (UTC)
Subject: rpms/php-pear-PHPUnit/devel .cvsignore, 1.13,
	1.14 php-pear-PHPUnit.spec, 1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20090912142252.D43DB11C00CE@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-PHPUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12327/devel

Modified Files:
	.cvsignore php-pear-PHPUnit.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 May 2009 07:31:59 -0000	1.13
+++ .cvsignore	12 Sep 2009 14:22:52 -0000	1.14
@@ -1 +1 @@
-PHPUnit-3.3.16.tgz
+PHPUnit-3.3.17.tgz


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/devel/php-pear-PHPUnit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- php-pear-PHPUnit.spec	26 Jul 2009 18:26:44 -0000	1.17
+++ php-pear-PHPUnit.spec	12 Sep 2009 14:22:52 -0000	1.18
@@ -3,8 +3,8 @@
 %global channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        3.3.16
-Release:        2%{?dist}
+Version:        3.3.17
+Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
 Group:          Development/Libraries
@@ -101,6 +101,9 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Christopher Stone <chris.stone at gmail.com> 3.3.17-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHPUnit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 May 2009 07:31:59 -0000	1.13
+++ sources	12 Sep 2009 14:22:52 -0000	1.14
@@ -1 +1 @@
-1bafa52c00d773c84931d43e37532729  PHPUnit-3.3.16.tgz
+ba59823607c9f4f54af560dfca2988df  PHPUnit-3.3.17.tgz



From kkofler at fedoraproject.org  Sat Sep 12 14:30:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Sep 2009 14:30:00 +0000 (UTC)
Subject: rpms/tellico/devel tellico.spec,1.37,1.38
Message-ID: <20090912143000.10BF711C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14586/devel

Modified Files:
	tellico.spec 
Log Message:
RM conditional BRs for KDE 3 compat libs, as this version is for KDE 4.


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- tellico.spec	12 Sep 2009 03:26:00 -0000	1.37
+++ tellico.spec	12 Sep 2009 14:29:59 -0000	1.38
@@ -29,14 +29,6 @@ BuildRequires:  kdepimlibs-devel
 BuildRequires:  kdemultimedia-devel
 BuildRequires:  kdegraphics-devel
 
-%if 0%{?fedora} < 10
-BuildRequires:  kdepim3-devel
-%endif
-
-%if 0%{?fedora} < 9
-BuildRequires:  kdemultimedia3-devel
-%endif
-
 %if 0%{?fedora} < 7
 BuildRequires: tcp_wrappers
 %else



From spot at fedoraproject.org  Sat Sep 12 14:32:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 14:32:59 +0000 (UTC)
Subject: rpms/anjuta/devel anjuta-2.27.92.0-libxml.patch, NONE,
	1.1 .cvsignore, 
	1.22, 1.23 anjuta.spec, 1.83, 1.84 sources, 1.22, 1.23
Message-ID: <20090912143259.D1C3911C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15266

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-2.27.92.0-libxml.patch 
Log Message:
2.27.92, build fixes, rebuild for broken deps

anjuta-2.27.92.0-libxml.patch:
 document-manager/Makefile.am |    2 ++
 document-manager/Makefile.in |    2 ++
 gbf-am/Makefile.am           |    2 ++
 gbf-am/Makefile.in           |    2 ++
 gbf-mkfile/Makefile.am       |    2 ++
 gbf-mkfile/Makefile.in       |    2 ++
 language-manager/Makefile.am |    2 ++
 language-manager/Makefile.in |    2 ++
 macro/Makefile.am            |    2 ++
 macro/Makefile.in            |    2 ++
 10 files changed, 20 insertions(+)

--- NEW FILE anjuta-2.27.92.0-libxml.patch ---
diff -up anjuta-2.27.92.0/plugins/document-manager/Makefile.am.libxml anjuta-2.27.92.0/plugins/document-manager/Makefile.am
--- anjuta-2.27.92.0/plugins/document-manager/Makefile.am.libxml	2009-09-04 04:47:09.000000000 -0400
+++ anjuta-2.27.92.0/plugins/document-manager/Makefile.am	2009-09-12 09:55:19.496677705 -0400
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
 	$(DEPRECATED_FLAGS) \
 	$(GDL_CFLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-document-manager\"
 
@@ -31,6 +32,7 @@ libanjuta_document_manager_la_LDFLAGS = 
 libanjuta_document_manager_la_LIBADD = \
 	$(GDL_LIBS) \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_document_manager_la_SOURCES= \
diff -up anjuta-2.27.92.0/plugins/document-manager/Makefile.in.libxml anjuta-2.27.92.0/plugins/document-manager/Makefile.in
--- anjuta-2.27.92.0/plugins/document-manager/Makefile.in.libxml	2009-09-07 17:00:51.000000000 -0400
+++ anjuta-2.27.92.0/plugins/document-manager/Makefile.in	2009-09-12 09:55:19.498651979 -0400
@@ -391,6 +391,7 @@ AM_CPPFLAGS = \
 	$(DEPRECATED_FLAGS) \
 	$(GDL_CFLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-document-manager\"
 
@@ -398,6 +399,7 @@ libanjuta_document_manager_la_LDFLAGS = 
 libanjuta_document_manager_la_LIBADD = \
 	$(GDL_LIBS) \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_document_manager_la_SOURCES = \
diff -up anjuta-2.27.92.0/plugins/gbf-am/Makefile.am.libxml anjuta-2.27.92.0/plugins/gbf-am/Makefile.am
--- anjuta-2.27.92.0/plugins/gbf-am/Makefile.am.libxml	2009-09-04 04:47:10.000000000 -0400
+++ anjuta-2.27.92.0/plugins/gbf-am/Makefile.am	2009-09-12 09:55:19.498651979 -0400
@@ -25,6 +25,7 @@ AM_CPPFLAGS = 					\
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 	-DG_LOG_DOMAIN=\"libgbf-am\"
@@ -46,6 +47,7 @@ libgbf_am_la_LDFLAGS = $(ANJUTA_PLUGIN_L
 
 libgbf_am_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) \
   $(LIBXML_LIBS)
 
diff -up anjuta-2.27.92.0/plugins/gbf-am/Makefile.in.libxml anjuta-2.27.92.0/plugins/gbf-am/Makefile.in
--- anjuta-2.27.92.0/plugins/gbf-am/Makefile.in.libxml	2009-09-07 17:00:54.000000000 -0400
+++ anjuta-2.27.92.0/plugins/gbf-am/Makefile.in	2009-09-12 09:55:19.500651884 -0400
@@ -400,6 +400,7 @@ AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 
@@ -419,6 +420,7 @@ libgbf_am_la_SOURCES = \
 libgbf_am_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libgbf_am_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) \
   $(LIBXML_LIBS)
 
diff -up anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am.libxml anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am
--- anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am.libxml	2009-09-12 09:58:15.600783689 -0400
+++ anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am	2009-09-12 09:58:28.596783346 -0400
@@ -25,6 +25,7 @@ AM_CPPFLAGS = 					\
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 
@@ -45,6 +46,7 @@ libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUG
 
 libgbf_mkfile_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 EXTRA_DIST = \
diff -up anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in.libxml anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in
--- anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in.libxml	2009-09-12 09:57:40.800782771 -0400
+++ anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in	2009-09-12 09:58:06.395782832 -0400
@@ -389,6 +389,7 @@ AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 
@@ -408,6 +409,7 @@ libgbf_mkfile_la_SOURCES = \
 libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libgbf_mkfile_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 EXTRA_DIST = \
diff -up anjuta-2.27.92.0/plugins/language-manager/Makefile.am.libxml anjuta-2.27.92.0/plugins/language-manager/Makefile.am
--- anjuta-2.27.92.0/plugins/language-manager/Makefile.am.libxml	2009-09-04 04:47:10.000000000 -0400
+++ anjuta-2.27.92.0/plugins/language-manager/Makefile.am	2009-09-12 09:55:19.500651884 -0400
@@ -24,6 +24,7 @@ language_manager_plugin_DATA = $(plugin_
 
 # Include paths
 AM_CPPFLAGS = \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) 
 
 # Where to install the plugin
@@ -37,6 +38,7 @@ liblanguage_manager_la_SOURCES = plugin.
 
 # Plugin dependencies
 liblanguage_manager_la_LIBADD = \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) 
 
 liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff -up anjuta-2.27.92.0/plugins/language-manager/Makefile.in.libxml anjuta-2.27.92.0/plugins/language-manager/Makefile.in
--- anjuta-2.27.92.0/plugins/language-manager/Makefile.in.libxml	2009-09-07 17:00:58.000000000 -0400
+++ anjuta-2.27.92.0/plugins/language-manager/Makefile.in	2009-09-12 09:55:19.501651453 -0400
@@ -348,6 +348,7 @@ language_manager_plugin_DATA = $(plugin_
 
 # Include paths
 AM_CPPFLAGS = \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) 
 
 
@@ -362,6 +363,7 @@ liblanguage_manager_la_SOURCES = plugin.
 
 # Plugin dependencies
 liblanguage_manager_la_LIBADD = \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) 
 
 liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff -up anjuta-2.27.92.0/plugins/macro/Makefile.am.libxml anjuta-2.27.92.0/plugins/macro/Makefile.am
--- anjuta-2.27.92.0/plugins/macro/Makefile.am.libxml	2009-09-04 04:47:10.000000000 -0400
+++ anjuta-2.27.92.0/plugins/macro/Makefile.am	2009-09-12 09:55:19.502651860 -0400
@@ -21,6 +21,7 @@ macro_plugin_DATA = $(plugin_in_files:.p
 AM_CPPFLAGS= \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
 plugindir = $(anjuta_plugin_dir)
@@ -30,6 +31,7 @@ libanjuta_macro_la_LDFLAGS = $(ANJUTA_PL
 
 libanjuta_macro_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_macro_la_SOURCES = \
diff -up anjuta-2.27.92.0/plugins/macro/Makefile.in.libxml anjuta-2.27.92.0/plugins/macro/Makefile.in
--- anjuta-2.27.92.0/plugins/macro/Makefile.in.libxml	2009-09-07 17:00:59.000000000 -0400
+++ anjuta-2.27.92.0/plugins/macro/Makefile.in	2009-09-12 09:55:19.503651847 -0400
@@ -342,6 +342,7 @@ macro_plugin_DATA = $(plugin_in_files:.p
 AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
 plugindir = $(anjuta_plugin_dir)
@@ -349,6 +350,7 @@ plugin_LTLIBRARIES = libanjuta-macro.la
 libanjuta_macro_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libanjuta_macro_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_macro_la_SOURCES = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	10 Aug 2009 11:23:26 -0000	1.22
+++ .cvsignore	12 Sep 2009 14:32:59 -0000	1.23
@@ -1 +1 @@
-anjuta-2.27.3.0.tar.bz2
+anjuta-2.27.92.0.tar.bz2


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- anjuta.spec	10 Aug 2009 11:23:26 -0000	1.83
+++ anjuta.spec	12 Sep 2009 14:32:59 -0000	1.84
@@ -1,20 +1,17 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.27.3.0
-Release:	3%{?dist}
+Version:	2.27.92.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.27/%{name}-%{version}.tar.bz2
-
-# http://bugzilla.gnome.org/575147
-Patch0:		%{name}-%{version}-class-gen-templates.patch
-# http://bugzilla.gnome.org/588506
-Patch1:		%{name}-%{version}-docdir.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# Lots of places where libxml cflags/libs are not being used (but are needed)
+Patch0:		anjuta-2.27.92.0-libxml.patch
+
 Obsoletes:	gnome-build <= 2.24.1-1.fc10
 Provides:	perl(GBF::Make) = %{version}-%{release}
 
@@ -94,8 +91,8 @@ Documentation for Anjuta DevStudio provi
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+
+%patch0 -p1 -b .libxml
 
 # Filter unwanted Provides.
 cat << \EOF > %{name}-prov
@@ -272,11 +269,12 @@ scrollkeeper-update -q || :
 %doc ROADMAP
 %doc THANKS
 %doc %{_mandir}/man1/%{name}.1*
-%doc %{_mandir}/man1/%{name}_launcher.1*
+%doc %{_mandir}/man1/%{name}-launcher.1*
 %{_bindir}/%{name}
 %{_bindir}/gbf-am-parse
 %{_bindir}/gbf-mkfile-parse
-%{_bindir}/%{name}_launcher
+%{_bindir}/%{name}-launcher
+%{_bindir}/%{name}-tags
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/glade3/catalogs/anjuta-glade.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-%{name}.png
@@ -330,6 +328,10 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.27.92.0-1
+- bump to 2.27.92.0, rebuild for broken deps
+- fix compile (missing libxml cflags/libs)
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:2.27.3.0-3
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	10 Aug 2009 11:23:26 -0000	1.22
+++ sources	12 Sep 2009 14:32:59 -0000	1.23
@@ -1 +1 @@
-cd2c1e1cc6ad44d55c6fd6e76a6fd5f9  anjuta-2.27.3.0.tar.bz2
+302691ed64826292fea61dac31212d1d  anjuta-2.27.92.0.tar.bz2



From sdz at fedoraproject.org  Sat Sep 12 14:35:33 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 14:35:33 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zyx-liveinstaller.spec, 1.2, 1.3
Message-ID: <20090912143533.1C74211C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16568

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Aug 2009 19:41:04 -0000	1.2
+++ .cvsignore	12 Sep 2009 14:35:32 -0000	1.3
@@ -1 +1 @@
-zyx-liveinstaller-0.1.10.tar.bz2
+zyx-liveinstaller-0.1.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Aug 2009 19:41:04 -0000	1.2
+++ sources	12 Sep 2009 14:35:32 -0000	1.3
@@ -1 +1 @@
-5a49ad7ccfe4711a1720e17a785e0a76  zyx-liveinstaller-0.1.10.tar.bz2
+d6ed919c23b4fdb8cf616413aa65962a  zyx-liveinstaller-0.1.11.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/zyx-liveinstaller.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zyx-liveinstaller.spec	21 Aug 2009 20:55:50 -0000	1.2
+++ zyx-liveinstaller.spec	12 Sep 2009 14:35:32 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.10
-Release:        2%{?dist}
+Version:        0.1.11
+Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
 Group:          Applications/System
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.11-1
+- update to new upstream release
+
 * Fri Aug 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-2
 - adjust buildroot according to guidelines
 



From sdz at fedoraproject.org  Sat Sep 12 14:36:01 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 14:36:01 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zyx-liveinstaller.spec, 1.2, 1.3
Message-ID: <20090912143601.4851311C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16678

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Aug 2009 19:43:00 -0000	1.2
+++ .cvsignore	12 Sep 2009 14:36:01 -0000	1.3
@@ -1 +1 @@
-zyx-liveinstaller-0.1.10.tar.bz2
+zyx-liveinstaller-0.1.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Aug 2009 19:43:00 -0000	1.2
+++ sources	12 Sep 2009 14:36:01 -0000	1.3
@@ -1 +1 @@
-5a49ad7ccfe4711a1720e17a785e0a76  zyx-liveinstaller-0.1.10.tar.bz2
+d6ed919c23b4fdb8cf616413aa65962a  zyx-liveinstaller-0.1.11.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zyx-liveinstaller.spec	21 Aug 2009 20:56:22 -0000	1.2
+++ zyx-liveinstaller.spec	12 Sep 2009 14:36:01 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.10
-Release:        2%{?dist}
+Version:        0.1.11
+Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
 Group:          Applications/System
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.11-1
+- update to new upstream release
+
 * Fri Aug 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-2
 - adjust buildroot according to guidelines
 



From sdz at fedoraproject.org  Sat Sep 12 14:38:42 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 14:38:42 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 zyx-liveinstaller.spec,1.3,1.4
Message-ID: <20090912143842.85A4F11C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17638

Modified Files:
	zyx-liveinstaller.spec 
Log Message:
fix type in spec file's changelog



Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zyx-liveinstaller.spec	12 Sep 2009 14:36:01 -0000	1.3
+++ zyx-liveinstaller.spec	12 Sep 2009 14:38:41 -0000	1.4
@@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.11-1
+* Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.11-1
 - update to new upstream release
 
 * Fri Aug 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-2



From spot at fedoraproject.org  Sat Sep 12 14:48:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 14:48:03 +0000 (UTC)
Subject: rpms/gpsdrive/devel gpsdrive-2.10pre7-agg.patch, NONE,
	1.1 gpsdrive.spec, 1.8, 1.9
Message-ID: <20090912144803.CD64611C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gpsdrive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25360

Modified Files:
	gpsdrive.spec 
Added Files:
	gpsdrive-2.10pre7-agg.patch 
Log Message:
fix compile, mapnik needs libagg

gpsdrive-2.10pre7-agg.patch:
 FindMapnik.cmake |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE gpsdrive-2.10pre7-agg.patch ---
diff -up gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake.BAD gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake
--- gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake.BAD	2009-09-12 10:43:35.540799139 -0400
+++ gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake	2009-09-12 10:44:58.433782755 -0400
@@ -38,6 +38,16 @@ else (MAPNIK_LIBRARIES AND MAPNIK_INCLUD
       /sw/lib
   )
 
+  find_library(AGG_LIBRARY
+    NAMES
+      agg
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
   if (MAPNIK_LIBRARY)
     set(MAPNIK_FOUND TRUE)
   endif (MAPNIK_LIBRARY)
@@ -50,6 +60,7 @@ else (MAPNIK_LIBRARIES AND MAPNIK_INCLUD
     set(MAPNIK_LIBRARIES
       ${MAPNIK_LIBRARIES}
       ${MAPNIK_LIBRARY}
+      ${AGG_LIBRARY}
     )
   endif (MAPNIK_FOUND)
 


Index: gpsdrive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/devel/gpsdrive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gpsdrive.spec	25 Jul 2009 01:20:57 -0000	1.8
+++ gpsdrive.spec	12 Sep 2009 14:48:02 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.10
-Release: 0.2.pre7%{?dist}
+Release: 0.3.pre7%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
@@ -12,6 +12,7 @@ URL: http://www.gpsdrive.de/index.shtml
 Source0: http://www.gpsdrive.de/packages/gpsdrive-2.10pre7.tar.gz
 Source1: http://download.sourceforge.net/sourceforge/gpsdrive/openstreetmap-map-icons-minimal.tar.gz
 Patch1: gpsdrive-2.10pre7-fedora.patch
+Patch2: gpsdrive-2.10pre7-agg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.0.6
@@ -56,6 +57,7 @@ Speech output is also available. MySQL i
 %setup -q -a 1 -T -D -n gpsdrive-2.10pre7
 
 %patch1 -p1
+%patch2 -p1 -b .agg
 
 %build
 mkdir build
@@ -111,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-0.3.pre7
+- mapnik needs libagg to work
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-0.2.pre7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thias at fedoraproject.org  Sat Sep 12 14:59:50 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 14:59:50 +0000 (UTC)
Subject: rpms/easytag/devel easytag-2.1.6-cddb_manual_search_fix.patch, NONE,
	1.1 easytag-2.1.6-id3lib.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 easytag.spec, 1.26, 1.27 sources, 1.9,
	1.10 easytag-2.0.1-id3lib.patch, 1.1,
	NONE easytag-2.1-ru-hint.asp.patch, 1.1, NONE
Message-ID: <20090912145950.9349311C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1655

Modified Files:
	.cvsignore easytag.spec sources 
Added Files:
	easytag-2.1.6-cddb_manual_search_fix.patch 
	easytag-2.1.6-id3lib.patch 
Removed Files:
	easytag-2.0.1-id3lib.patch easytag-2.1-ru-hint.asp.patch 
Log Message:
Update to 2.1.6.


easytag-2.1.6-cddb_manual_search_fix.patch:
 cddb.c |  117 ++++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 80 insertions(+), 37 deletions(-)

--- NEW FILE easytag-2.1.6-cddb_manual_search_fix.patch ---
diff -ruN easytag-2.1.6.orig/src/cddb.c easytag-2.1.6/src/cddb.c
--- easytag-2.1.6.orig/src/cddb.c	2008-03-22 22:57:29.000000000 +0100
+++ easytag-2.1.6/src/cddb.c	2009-08-25 23:16:35.000000000 +0200
@@ -2158,10 +2158,12 @@
  */
 gboolean Cddb_Search_Album_List_From_String (void)
 {
-    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"freedb") != NULL )
-        return Cddb_Search_Album_List_From_String_Freedb();
-    else
+    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"gnudb") != NULL )
+		// Use of gnudb
         return Cddb_Search_Album_List_From_String_Gnudb();
+    else
+		// Use of freedb
+        return Cddb_Search_Album_List_From_String_Freedb();
 }
 
 
@@ -2255,7 +2257,7 @@
     g_free(string);
     g_free(tmp);
     g_free(proxy_auth);
-    //g_print("Request : '%s'\n", cddb_in);
+    //g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 
     // Send the request
     gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -2574,7 +2576,7 @@
                                   );
         next_page_found = FALSE;
         g_free(proxy_auth);
-        //g_print("Request : '%s'\n", cddb_in);
+        //g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 
         // Send the request
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -3130,7 +3132,7 @@
                                       (proxy_auth=Cddb_Format_Proxy_Authentification())
                                       );
             g_free(proxy_auth);
-            //g_print("Request : '%s'\n", cddb_in);
+            //g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
 
             msg = g_strdup_printf(_("Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."),
                                 cddb_discid,num_tracks,disc_length);
@@ -3394,24 +3396,47 @@
                                              CDDB_USE_PROXY?CDDB_PROXY_PORT:cddb_server_port)) <= 0 )
             return FALSE;
 
-        // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
-        // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
-        // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
-        cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
-                                  "%s+%s"
-                                  "&hello=noname+localhost+%s+%s"
-                                  "&proto=6 HTTP/1.1\r\n"
-                                  "Host: %s:%d\r\n"
-                                  "%s"
-                                  "Connection: close\r\n\r\n",
-                                  CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
-                                  cddbalbum->category,cddbalbum->id,
-                                  APPNAME,VERSION,
-                                  cddb_server_name,cddb_server_port,
-                                  (proxy_auth=Cddb_Format_Proxy_Authentification())
-                                  );
-        g_free(proxy_auth);
-        //g_print("Request : '%s'\n", cddb_in);
+		if ( strstr(cddb_server_name,"gnudb") != NULL )
+		{
+			// For gnudb
+			// New version of gnudb doesn't use a cddb request, but a http request
+		    cddb_in = g_strdup_printf("GET %s%s/gnudb/"
+		                              "%s/%s"
+		                              " HTTP/1.1\r\n"
+		                              "Host: %s:%d\r\n"
+		                              "User-Agent: %s %s\r\n"
+		                              "%s"
+		                              "Connection: close\r\n"
+		                              "\r\n",
+		                              CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"",  // Needed when using proxy
+		                              cddbalbum->category,cddbalbum->id,
+		                              cddb_server_name,cddb_server_port,
+		                              APPNAME,VERSION,
+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
+		                              );
+		}else
+		{
+		    // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
+		    // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
+		    // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
+		    cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
+		                              "%s+%s"
+		                              "&hello=noname+localhost+%s+%s"
+		                              "&proto=6 HTTP/1.1\r\n"
+		                              "Host: %s:%d\r\n"
+		                              "%s"
+		                              "Connection: close\r\n\r\n",
+		                              CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
+		                              cddbalbum->category,cddbalbum->id,
+		                              APPNAME,VERSION,
+		                              cddb_server_name,cddb_server_port,
+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
+		                              );
+		}
+
+		
+		g_free(proxy_auth);
+        //g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 
         // Send the request
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -3444,20 +3469,38 @@
         }
 
 
-        // Parse server answer : Check HTTP Header and CDDB Header
+        // Parse server answer : Check HTTP Header (freedb or gnudb) and CDDB Header (freedb only)
         file = NULL;
-        if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
-          || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
-        {
-            gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
-            gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print(LOG_ERROR,"%s",msg);
-            g_free(msg);
-            g_free(cddb_out);
-            if (file)
-                fclose(file);
-            return FALSE;
-        }
+		if ( strstr(cddb_server_name,"gnudb") != NULL )
+		{
+			// For gnudb (don't check CDDB header)
+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0 )
+		    {
+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+		        Log_Print(LOG_ERROR,"%s",msg);
+		        g_free(msg);
+		        g_free(cddb_out);
+		        if (file)
+		            fclose(file);
+		        return FALSE;
+		    }
+		}else
+		{
+			// For freedb
+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
+		      || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
+		    {
+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+		        Log_Print(LOG_ERROR,"%s",msg);
+		        g_free(msg);
+		        g_free(cddb_out);
+		        if (file)
+		            fclose(file);
+		        return FALSE;
+		    }
+		}
         g_free(cddb_out);
 
     }

easytag-2.1.6-id3lib.patch:
 configure         |    3 +--
 configure.in      |    1 -
 src/Makefile.in   |    6 +++---
 src/mpeg_header.c |    2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE easytag-2.1.6-id3lib.patch ---
diff -Naupr easytag-2.1.6.orig/configure easytag-2.1.6/configure
--- easytag-2.1.6.orig/configure	2008-07-12 16:57:44.000000000 +0200
+++ easytag-2.1.6/configure	2009-09-12 16:47:34.117176630 +0200
@@ -26034,7 +26034,7 @@ ac_config_headers="$ac_config_headers co
 
 
 
-ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile src/libmpg123/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -26637,7 +26637,6 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/id3lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/id3lib/Makefile" ;;
     "src/libapetag/Makefile") CONFIG_FILES="$CONFIG_FILES src/libapetag/Makefile" ;;
-    "src/libmpg123/Makefile") CONFIG_FILES="$CONFIG_FILES src/libmpg123/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff -Naupr easytag-2.1.6.orig/configure.in easytag-2.1.6/configure.in
--- easytag-2.1.6.orig/configure.in	2008-05-07 22:45:32.000000000 +0200
+++ easytag-2.1.6/configure.in	2009-09-12 16:47:42.421053700 +0200
@@ -473,7 +473,6 @@ AC_OUTPUT([ Makefile
             src/Makefile
             src/id3lib/Makefile
             src/libapetag/Makefile
-            src/libmpg123/Makefile
             po/Makefile.in
          ])
 
diff -Naupr easytag-2.1.6.orig/src/Makefile.in easytag-2.1.6/src/Makefile.in
--- easytag-2.1.6.orig/src/Makefile.in	2008-07-12 16:57:43.000000000 +0200
+++ easytag-2.1.6/src/Makefile.in	2009-09-12 16:48:30.102176910 +0200
@@ -59,7 +59,7 @@ am_easytag_OBJECTS = about.$(OBJEXT) ape
 	wavpack_tag.$(OBJEXT)
 easytag_OBJECTS = $(am_easytag_OBJECTS)
 am__DEPENDENCIES_1 =
-easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) libmpg123/libmpg123.a \
+easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	libapetag/libapetag.a id3lib/libid3bugfix.a
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -226,7 +226,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libmpg123 libapetag id3lib
+SUBDIRS = libapetag id3lib
 easytag_SOURCES = \
  about.c \
  about.h \
@@ -308,7 +308,7 @@ EXTRA_DIST = \
  win32/nsis/easytag-install.ico \
  win32/nsis/easytag-uninstall.bmp 
 
-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
+easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a  id3lib/libid3bugfix.a
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
            -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
diff -Naupr easytag-2.1.6.orig/src/mpeg_header.c easytag-2.1.6/src/mpeg_header.c
--- easytag-2.1.6.orig/src/mpeg_header.c	2007-11-28 09:54:27.000000000 +0100
+++ easytag-2.1.6/src/mpeg_header.c	2009-09-12 16:48:50.266129581 +0200
@@ -36,7 +36,7 @@
 // Set to :
 // - 1 to use ID3lib for reading headers
 // - 0 to use mpeg123 for reading headers
-#define USE_ID3LIB_4_HEADER 0
+#define USE_ID3LIB_4_HEADER 1
 
 #if USE_ID3LIB_4_HEADER
 #   include <id3.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Jun 2007 16:37:24 -0000	1.9
+++ .cvsignore	12 Sep 2009 14:59:47 -0000	1.10
@@ -1 +1 @@
-easytag-2.1-patched.tar.bz2
+easytag-2.1.6-patched.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- easytag.spec	24 Jul 2009 20:46:33 -0000	1.26
+++ easytag.spec	12 Sep 2009 14:59:47 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.1.6
+Release: 1%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -12,8 +12,8 @@ URL: http://easytag.sourceforge.net/
 # rm -rf easytag-$VERSION/src/libmpg123/
 # tar --numeric-owner -cjvf easytag-$VERSION-patched.tar.bz2 easytag-$VERSION
 Source: easytag-%{version}-patched.tar.bz2
-Patch0: easytag-2.0.1-id3lib.patch
-Patch1: easytag-2.1-ru-hint.asp.patch
+Patch0: easytag-2.1.6-id3lib.patch
+Patch1: easytag-2.1.6-cddb_manual_search_fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12
 BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, wavpack-devel
@@ -27,6 +27,7 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monk
 %prep
 %setup -q
 %patch0 -p1 -b .id3lib
+%patch1 -p1 -b .cddb_manual_search_fix
 # With 2.0, the upstream tarball set *LOTS* of files +x :-(
 find . -type f -exec %{__chmod} -x {} \;
 %{__chmod} +x *.sh configure depcomp install-sh missing mkinstalldirs
@@ -58,6 +59,10 @@ find . -type f -exec %{__chmod} -x {} \;
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.1.6-1
+- Update to 2.1.6 : Development, but the latest for over a year now.
+- Include upstream cddb_manual_search_fix patch.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Jun 2007 16:37:24 -0000	1.9
+++ sources	12 Sep 2009 14:59:47 -0000	1.10
@@ -1 +1 @@
-2fe02aacaf58537d0a9ac7288b21edea  easytag-2.1-patched.tar.bz2
+7a79e256449a0641a0a3a4f1b61ed3e0  easytag-2.1.6-patched.tar.bz2


--- easytag-2.0.1-id3lib.patch DELETED ---


--- easytag-2.1-ru-hint.asp.patch DELETED ---



From sdz at fedoraproject.org  Sat Sep 12 15:06:42 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 15:06:42 +0000 (UTC)
Subject: rpms/python-gasp/devel .cvsignore, 1.3, 1.4 python-gasp.spec, 1.5, 
	1.6 sources, 1.3, 1.4
Message-ID: <20090912150642.9DE6911C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-gasp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7835

Modified Files:
	.cvsignore python-gasp.spec sources 
Log Message:
update to new upstream release series



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gasp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Jun 2008 14:29:01 -0000	1.3
+++ .cvsignore	12 Sep 2009 15:06:41 -0000	1.4
@@ -1 +1 @@
-python-gasp-0.2.0beta1.tar.bz2
+python-gasp-0.3.2.tar.gz


Index: python-gasp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gasp/devel/python-gasp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-gasp.spec	26 Jul 2009 20:24:53 -0000	1.5
+++ python-gasp.spec	12 Sep 2009 15:06:42 -0000	1.6
@@ -3,13 +3,13 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           python-gasp
-Version:        0.2.0beta1
-Release:        4%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        API wrapper on top of pygame
 Group:          Development/Libraries
 License:        GPLv3+
-URL:            http://wiki.laptop.org/go/GASP
-Source0:        http://dev.laptop.org/pub/gasp/releases/SOURCES/python-gasp-%{version}.tar.bz2
+URL:            http://launchpad.net/gasp-core
+Source0:        http://launchpad.net/gasp-core/0.3.x/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +37,7 @@ It is a wrapper around pygame.
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
+chmod 0755 $RPM_BUILD_ROOT/%{python_sitelib}/gasp/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,13 +45,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYRIGHT TODO CONTRIBUTORS
+%doc AUTHORS COPYING NEWS README
 %dir %{python_sitelib}/gasp
 %{python_sitelib}/gasp/*
 %dir %{python_sitelib}/gasp-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/gasp-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.2-1
+- update to new upstream release series
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0beta1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gasp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Jun 2008 14:29:01 -0000	1.3
+++ sources	12 Sep 2009 15:06:42 -0000	1.4
@@ -1 +1 @@
-e327b23ba0bd688abf55a5aa2c311f05  python-gasp-0.2.0beta1.tar.bz2
+c8a357aeaa84939ba882d6f4a1e204c5  python-gasp-0.3.2.tar.gz



From spot at fedoraproject.org  Sat Sep 12 15:09:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 15:09:09 +0000 (UTC)
Subject: rpms/python-repoze-what-quickstart/F-11
	python-repoze-what-quickstart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090912150909.EB15511C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-repoze-what-quickstart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8406/F-11

Modified Files:
	python-repoze-what-quickstart.spec sources 
Log Message:
update to 1.0.1, fix typo causing broken dep


Index: python-repoze-what-quickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/F-11/python-repoze-what-quickstart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-what-quickstart.spec	29 Jul 2009 15:11:33 -0000	1.1
+++ python-repoze-what-quickstart.spec	12 Sep 2009 15:09:09 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-repoze-what-quickstart
-Version:	1.0
-Release:	2%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 Summary:	A plugin for a simple authentication system with repoze.who/what
 Group:		Development/Languages
 License:	BSD
@@ -14,7 +14,7 @@ BuildRequires:	python-devel, python-setu
 BuildRequires:	python-repoze-what >= 1.0.3, python-repoze-who, python-repoze-who-plugins-sa
 BuildRequires:	python-repoze-what-plugins-sql, python-nose, python-coverage
 Requires:	python-repoze-what >= 1.0.3
-Requires:	python-repoze-who, python-repoze-who-plugins-sa, python-repoze-who-plugins-sql
+Requires:	python-repoze-who, python-repoze-who-plugins-sa, python-repoze-what-plugins-sql
 Requires:	python-repoze-who-friendlyform
 
 %description
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/repoze.what_quickstart*
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-1
+- update to 1.0.1, fix typo causing broken deps
+
 * Wed Jul 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-2
 - fix summary, file ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 15:11:33 -0000	1.2
+++ sources	12 Sep 2009 15:09:09 -0000	1.3
@@ -1 +1 @@
-6499da654b0ca70b5c089ba4e65118b3  repoze.what-quickstart-1.0.tar.gz
+81c25b7d2987109036ec64fcf6967939  repoze.what-quickstart-1.0.1.tar.gz



From spot at fedoraproject.org  Sat Sep 12 15:09:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 15:09:09 +0000 (UTC)
Subject: rpms/python-repoze-what-quickstart/EL-5
	python-repoze-what-quickstart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090912150909.9E06B11C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-repoze-what-quickstart/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8406/EL-5

Modified Files:
	python-repoze-what-quickstart.spec sources 
Log Message:
update to 1.0.1, fix typo causing broken dep


Index: python-repoze-what-quickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/EL-5/python-repoze-what-quickstart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-what-quickstart.spec	29 Jul 2009 15:11:32 -0000	1.1
+++ python-repoze-what-quickstart.spec	12 Sep 2009 15:09:09 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-repoze-what-quickstart
-Version:	1.0
-Release:	2%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 Summary:	A plugin for a simple authentication system with repoze.who/what
 Group:		Development/Languages
 License:	BSD
@@ -14,7 +14,7 @@ BuildRequires:	python-devel, python-setu
 BuildRequires:	python-repoze-what >= 1.0.3, python-repoze-who, python-repoze-who-plugins-sa
 BuildRequires:	python-repoze-what-plugins-sql, python-nose, python-coverage
 Requires:	python-repoze-what >= 1.0.3
-Requires:	python-repoze-who, python-repoze-who-plugins-sa, python-repoze-who-plugins-sql
+Requires:	python-repoze-who, python-repoze-who-plugins-sa, python-repoze-what-plugins-sql
 Requires:	python-repoze-who-friendlyform
 
 %description
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/repoze.what_quickstart*
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-1
+- update to 1.0.1, fix typo causing broken deps
+
 * Wed Jul 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-2
 - fix summary, file ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 15:11:32 -0000	1.2
+++ sources	12 Sep 2009 15:09:09 -0000	1.3
@@ -1 +1 @@
-6499da654b0ca70b5c089ba4e65118b3  repoze.what-quickstart-1.0.tar.gz
+81c25b7d2987109036ec64fcf6967939  repoze.what-quickstart-1.0.1.tar.gz



From spot at fedoraproject.org  Sat Sep 12 15:09:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 15:09:10 +0000 (UTC)
Subject: rpms/python-repoze-what-quickstart/devel .cvsignore, 1.2,
	1.3 python-repoze-what-quickstart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090912150910.4F53511C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-repoze-what-quickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8406/devel

Modified Files:
	.cvsignore python-repoze-what-quickstart.spec sources 
Log Message:
update to 1.0.1, fix typo causing broken dep


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 15:01:21 -0000	1.2
+++ .cvsignore	12 Sep 2009 15:09:09 -0000	1.3
@@ -1 +1 @@
-repoze.what-quickstart-1.0.tar.gz
+repoze.what-quickstart-1.0.1.tar.gz


Index: python-repoze-what-quickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/devel/python-repoze-what-quickstart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-what-quickstart.spec	29 Jul 2009 15:01:21 -0000	1.1
+++ python-repoze-what-quickstart.spec	12 Sep 2009 15:09:10 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-repoze-what-quickstart
-Version:	1.0
-Release:	2%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 Summary:	A plugin for a simple authentication system with repoze.who/what
 Group:		Development/Languages
 License:	BSD
@@ -14,7 +14,7 @@ BuildRequires:	python-devel, python-setu
 BuildRequires:	python-repoze-what >= 1.0.3, python-repoze-who, python-repoze-who-plugins-sa
 BuildRequires:	python-repoze-what-plugins-sql, python-nose, python-coverage
 Requires:	python-repoze-what >= 1.0.3
-Requires:	python-repoze-who, python-repoze-who-plugins-sa, python-repoze-who-plugins-sql
+Requires:	python-repoze-who, python-repoze-who-plugins-sa, python-repoze-what-plugins-sql
 Requires:	python-repoze-who-friendlyform
 
 %description
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/repoze.what_quickstart*
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-1
+- update to 1.0.1, fix typo causing broken deps
+
 * Wed Jul 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-2
 - fix summary, file ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-quickstart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 15:01:21 -0000	1.2
+++ sources	12 Sep 2009 15:09:10 -0000	1.3
@@ -1 +1 @@
-6499da654b0ca70b5c089ba4e65118b3  repoze.what-quickstart-1.0.tar.gz
+81c25b7d2987109036ec64fcf6967939  repoze.what-quickstart-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Sep 12 15:26:22 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 15:26:22 +0000 (UTC)
Subject: rpms/blazeblogger/devel .cvsignore, 1.2, 1.3 blazeblogger.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090912152622.DF5BC11C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12393

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2009 05:16:36 -0000	1.2
+++ .cvsignore	12 Sep 2009 15:26:20 -0000	1.3
@@ -1 +1 @@
-blazeblogger-0.9.0.tar.gz
+blazeblogger-0.9.1.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/blazeblogger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blazeblogger.spec	13 Aug 2009 05:16:36 -0000	1.1
+++ blazeblogger.spec	12 Sep 2009 15:26:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,5 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
+- update to new upstream release
+
 * Sun Aug 09 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:16:36 -0000	1.2
+++ sources	12 Sep 2009 15:26:20 -0000	1.3
@@ -1 +1 @@
-79b240e196cdb2f2a765e4ef10546163  blazeblogger-0.9.0.tar.gz
+380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz



From sdz at fedoraproject.org  Sat Sep 12 15:26:43 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 15:26:43 +0000 (UTC)
Subject: rpms/blazeblogger/F-11 .cvsignore, 1.2, 1.3 blazeblogger.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090912152643.32C8511C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12486

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2009 05:17:58 -0000	1.2
+++ .cvsignore	12 Sep 2009 15:26:42 -0000	1.3
@@ -1 +1 @@
-blazeblogger-0.9.0.tar.gz
+blazeblogger-0.9.1.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/blazeblogger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blazeblogger.spec	13 Aug 2009 05:17:58 -0000	1.1
+++ blazeblogger.spec	12 Sep 2009 15:26:42 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,5 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
+- update to new upstream release
+
 * Sun Aug 09 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:17:58 -0000	1.2
+++ sources	12 Sep 2009 15:26:43 -0000	1.3
@@ -1 +1 @@
-79b240e196cdb2f2a765e4ef10546163  blazeblogger-0.9.0.tar.gz
+380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz



From thias at fedoraproject.org  Sat Sep 12 15:26:36 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 15:26:36 +0000 (UTC)
Subject: rpms/kannel/EL-5 gateway-1.4.1-typesh.patch, NONE,
	1.1 gateway-1.4.3-ssldetect.patch, NONE, 1.1 gw-config, NONE,
	1.1 .cvsignore, 1.4, 1.5 kannel.init, 1.2, 1.3 kannel.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <20090912152636.4067211C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12373

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Added Files:
	gateway-1.4.1-typesh.patch gateway-1.4.3-ssldetect.patch 
	gw-config 
Log Message:
Backport the devel 1.4.3 update, since it includes some security fixes.


gateway-1.4.1-typesh.patch:
 gw_uuid_types.h.in |   46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

--- NEW FILE gateway-1.4.1-typesh.patch ---
diff -Naupr gateway-1.4.1.orig/gwlib/gw_uuid_types.h.in gateway-1.4.1/gwlib/gw_uuid_types.h.in
--- gateway-1.4.1.orig/gwlib/gw_uuid_types.h.in	2003-12-08 12:25:44.000000000 +0100
+++ gateway-1.4.1/gwlib/gw_uuid_types.h.in	2008-12-22 15:16:18.678371529 +0100
@@ -3,49 +3,7 @@
  * everything we need.  (cross fingers)  Other header files may have 
  * also defined the types that we need.
  */
-#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_UUID_TYPES) && !defined(_EXT2_TYPES_H))
-#define _UUID_TYPES_H
-
-typedef unsigned char __u8;
-typedef signed char __s8;
-
-#if (@SIZEOF_INT@ == 8)
-typedef int		__s64;
-typedef unsigned int	__u64;
-#elif (@SIZEOF_LONG@ == 8)
-typedef long		__s64;
-typedef unsigned long	__u64;
-#elif (@SIZEOF_LONG_LONG@ == 8)
-#if defined(__GNUC__)
-typedef __signed__ long long 	__s64;
-#else
-typedef signed long long 	__s64;
-#endif
-typedef unsigned long long	__u64;
-#endif
-
-#if (@SIZEOF_INT@ == 2)
-typedef	int		__s16;
-typedef	unsigned int	__u16;
-#elif (@SIZEOF_SHORT@ == 2)
-typedef	short		__s16;
-typedef	unsigned short	__u16;
-#else
-  ?==error: undefined 16 bit type
-#endif
-
-#if (@SIZEOF_INT@ == 4)
-typedef	int		__s32;
-typedef	unsigned int	__u32;
-#elif (@SIZEOF_LONG@ == 4)
-typedef	long		__s32;
-typedef	unsigned long	__u32;
-#elif (@SIZEOF_SHORT@ == 4)
-typedef	short		__s32;
-typedef	unsigned short	__u32;
-#else
- ?== error: undefined 32 bit type
+#if (!defined(_LINUX_TYPES_H))
+#include <linux/types.h>
 #endif
 
-#endif /* _*_TYPES_H */

gateway-1.4.3-ssldetect.patch:
 configure |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

--- NEW FILE gateway-1.4.3-ssldetect.patch ---
diff -up gateway-1.4.3/configure~ gateway-1.4.3/configure
--- gateway-1.4.3/configure~	2008-08-06 17:22:43.000000000 +0300
+++ gateway-1.4.3/configure	2009-06-25 21:10:01.000000000 +0300
@@ -10957,28 +10957,8 @@ fi
 
 
 if test "$ssl" = "yes" ; then
-    if test "x$ssllib" = "x" && test "x$sslinc" = "x"; then
-    for loc in /usr/lib /usr/lib64 /usr/local/ssl/lib /usr/local/openssl/lib; do
-      if test -f "$loc/libssl.a" -o -f "$loc/libssl.dylib" ; then
-        ssllib="$loc"
-      fi
-    done
-    for loc in /usr/include/ssl /usr/include/openssl /usr/local/ssl/include \
-               /usr/local/openssl/include; do
-      if test -d "$loc"; then
-        sslinc="$loc"
-      fi
-    done
-  fi
-  { $as_echo "$as_me:$LINENO: result: trying $ssllib $sslinc" >&5
-$as_echo "trying $ssllib $sslinc" >&6; }
-fi
-
-
-
-if test "x$ssllib" != "x" && test "x$sslinc" != "x"; then
-  CFLAGS="$CFLAGS -I$sslinc"
-  LIBS="$LIBS -L$ssllib"
+  CFLAGS="$CFLAGS ${sslinc:+-I$sslinc}${sslinc:-`pkg-config openssl --cflags`}"
+  LIBS="$LIBS ${ssllib:+-L$ssllib}${ssllib:-`pkg-config openssl --libs`}"
 
   # Extract the first word of "openssl", so it can be a program name with args.
 set dummy openssl; ac_word=$2


--- NEW FILE gw-config ---
#!/bin/sh
#
# Fedora specific hack in order to have an identical script across all archs
# which won't create multilib conflicts.

# Always prefer 64bit over 32bit, hardcode the multilib archs here
for ARCH in x86_64 ia64 s390; do
    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
done

# No multilib, execute the first one found (there should be only one anyway)
CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)

if [ -x "${CONFIGSCRIPT}" ]; then
    exec ${CONFIGSCRIPT}
else
    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
    exit 1
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 15:25:40 -0000	1.4
+++ .cvsignore	12 Sep 2009 15:26:34 -0000	1.5
@@ -1 +1 @@
-gateway-1.4.1.tar.bz2
+gateway-1.4.3.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/kannel.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kannel.init	2 Oct 2006 15:25:40 -0000	1.2
+++ kannel.init	12 Sep 2009 15:26:35 -0000	1.3
@@ -6,6 +6,14 @@
 # description:  The Kannel WAP and SMS gateway services
 # config: /etc/kannel.conf
 
+### BEGIN INIT INFO
+# Provides: kannel
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop Kannel WAP gateway services
+# Description: Kannel is a set of daemons implementing WAP gateway services.
+### END INIT INFO
+
 # Use start-stop-kannel
 prog="/usr/sbin/start-stop-kannel"
 args="--start --background --chuid kannel:kannel --exec "


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/kannel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kannel.spec	16 Oct 2006 14:38:52 -0000	1.13
+++ kannel.spec	12 Sep 2009 15:26:35 -0000	1.14
@@ -1,23 +1,22 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.1
-Release: 2%{?dist}
-License: Kannel
+Version: 1.4.3
+Release: 3%{?dist}
+License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
 Source0: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
+Source4: gw-config
+# TODO: a corresponding configure.in patch could be upstreamable?
+Patch0: gateway-1.4.3-ssldetect.patch
+Patch1: gateway-1.4.1-typesh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex
+BuildRequires: bison, byacc, flex, ghostscript
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
-# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: sqlite-devel
-%else
-BuildRequires: sqlite2-devel
-%endif
 %{?_with_mysql:Buildrequires: mysql-devel}
 %{?_with_pgsql:Buildrequires: postgresql-devel}
 # For the docs...
@@ -34,9 +33,10 @@ forms. Only the data call bearer (UDP) i
 
 
 %package devel
-Summary: Development files for the kannel WAP and SMS gateway
+Summary: Development files for the Kannel WAP and SMS gateway
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 
 %description devel
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,32 +47,48 @@ files via HTTP works, including compilat
 forms. Only the data call bearer (UDP) is supported, not SMS.
 
 Install this package if you need to develop or recompile applications that
-use the kannel WAP and SMS gateway.
+use the Kannel WAP and SMS gateway.
+
+
+%package docs
+Summary: Documentation for the Kannel WAP and SMS gateway
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description docs
+The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
+implementing keyword based services via GSM text messages, and a WAP gateway,
+via UDP. The SMS part is fairly mature, the WAP part is early in its
+development. In this release, the GET request for WML pages and WMLScript
+files via HTTP works, including compilation for WML and WMLScript to binary
+forms. Only the data call bearer (UDP) is supported, not SMS.
+
+This package contains documentation for the Kannel WAP and SMS gateway.
 
 
 %prep
-%setup -n gateway-%{version}
+%setup -q -n gateway-%{version}
+%patch0 -p1 -b .ssldetect
+%patch1 -p1 -b .typesh
+%{__chmod} -c -x gwlib/html-entities.def # for -debuginfo, as of 1.4.3
 
 
 %build
 %configure \
     --enable-pcre \
-    --enable-docs \
     --enable-start-stop-daemon \
-%if %{!?fedora:6}%{?fedora} >= 6
     --with-sqlite3 \
-%else
-    --with-sqlite \
-%endif
     %{?_with_mysql} \
     %{?_with_pgsql}
-# Remove %{?_smp_mflags} since the docs fail to build with it
+# Remove %{?_smp_mflags} since the docs fail to build with it as of 1.4.3
 %{__make}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 # Install fakesmsc and fakewap, useful for monitoring
 %{__install} -m 0755 test/{fakesmsc,fakewap} %{buildroot}%{_bindir}/
 # Logrotate entry
@@ -86,6 +102,12 @@ use the kannel WAP and SMS gateway.
 # Rename start-stop-daemon to start-stop-kannel
 %{__mv} %{buildroot}%{_sbindir}/start-stop-daemon \
         %{buildroot}%{_sbindir}/start-stop-kannel
+# Remove executable bit from man pages (as of 1.4.3)
+%{__chmod} -c -x %{buildroot}%{_mandir}/man?/*
+# Multilib fix : Replace the gw-config with our wrapper script
+%{__mv} %{buildroot}%{_bindir}/gw-config \
+        %{buildroot}%{_bindir}/gw-config.%{_arch}
+%{__install} -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/gw-config
 
 
 %clean
@@ -114,25 +136,77 @@ fi
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
-%attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%attr(0640,kannel,kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
-%config %{_sysconfdir}/rc.d/init.d/kannel
-%{_bindir}/*
+%{_sysconfdir}/rc.d/init.d/kannel
+%{_bindir}/fakesmsc
+%{_bindir}/fakewap
+%{_bindir}/mtbatch
+%{_bindir}/seewbmp
+%{_bindir}/wmlsc
+%{_bindir}/wmlsdasm
 %{_sbindir}/*
 %{_mandir}/man?/*
-%attr(0750, kannel, kannel) %dir %{_var}/log/kannel/
-
+%attr(0750,kannel,kannel) %dir %{_var}/log/kannel/
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
+%{_bindir}/gw-config*
 %{_includedir}/kannel/
 %dir %{_libdir}/kannel/
 %{_libdir}/kannel/*.a
 
+%files docs
+%defattr(-,root,root,-)
+%doc doc/*/*.pdf
+
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.4.3-1
+- Update to 1.4.3 (#495891).
+- Provide -static in -devel.
+- Split PDFs into -docs, noarch where applicable.
+- Patch to use pkg-config at build time for SSL detection.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.1-10
+- rebuild with new openssl
+
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.1-9
+- Include patch to fix openssl detection on 64bit.
+- Include gw-config wrapper script to fix multilib conflicts (#341701).
+- Include patch to remove definitions of types which never happen on Linux.
+- Added "INIT INFO" block to the init script (#246964).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org>
+- Rebuild for deps
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.1-5
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.4.1-4
+- Update License field.
+- Switch to using the DESTDIR install method.
+- No longer mark init script as config file.
+- Remove executable bit from man pages.
+- Move gw-config to devel sub-package.
+
+* Thu Dec 14 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-3
+- Add ghostscript build requirement, needed (at least on) RHEL4.
+
 * Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
 - Make sure we keep sqlite2 support for FC5 and below.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Oct 2006 15:25:40 -0000	1.4
+++ sources	12 Sep 2009 15:26:35 -0000	1.5
@@ -1 +1 @@
-ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2
+c52febb1a58884778bc5f2aa9f10b642  gateway-1.4.3.tar.bz2



From sdz at fedoraproject.org  Sat Sep 12 15:26:58 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 12 Sep 2009 15:26:58 +0000 (UTC)
Subject: rpms/blazeblogger/F-10 .cvsignore, 1.2, 1.3 blazeblogger.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090912152658.E515C11C00CE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12605

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2009 05:19:06 -0000	1.2
+++ .cvsignore	12 Sep 2009 15:26:58 -0000	1.3
@@ -1 +1 @@
-blazeblogger-0.9.0.tar.gz
+blazeblogger-0.9.1.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/blazeblogger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blazeblogger.spec	13 Aug 2009 05:19:06 -0000	1.1
+++ blazeblogger.spec	12 Sep 2009 15:26:58 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,5 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
+- update to new upstream release
+
 * Sun Aug 09 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:19:06 -0000	1.2
+++ sources	12 Sep 2009 15:26:58 -0000	1.3
@@ -1 +1 @@
-79b240e196cdb2f2a765e4ef10546163  blazeblogger-0.9.0.tar.gz
+380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz



From petersen at fedoraproject.org  Sat Sep 12 16:09:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 12 Sep 2009 16:09:14 +0000 (UTC)
Subject: rpms/darcs/devel darcs.spec,1.50,1.51
Message-ID: <20090912160914.E877B11C00CE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/darcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25858

Modified Files:
	darcs.spec 
Log Message:
- rebuild against ghc-6.10.4 which should fix --help hangs
- improve doc summary (#522899)




Index: darcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- darcs.spec	24 Jul 2009 19:57:33 -0000	1.50
+++ darcs.spec	12 Sep 2009 16:09:12 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        2.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -29,7 +29,7 @@ fully functional branch, and 2) underlyi
 consistent and powerful theory of patches.
 
 %package doc
-Summary: David's advanced revision control system Server
+Summary: Documentation for David's advanced revision control system
 Group: Documentation
 
 %description doc
@@ -118,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 Jens Petersen <petersen at redhat.com> - 2.2.1-5
+- rebuild against ghc-6.10.4 which should fix --help hangs
+- improve doc summary (#522899)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Sat Sep 12 16:56:58 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 16:56:58 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.16,1.17
Message-ID: <20090912165658.ECB7C11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7481/devel

Modified Files:
	maven-scm.spec 
Log Message:
BR maven-surefire-provider-junit.


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- maven-scm.spec	12 Sep 2009 11:51:17 -0000	1.16
+++ maven-scm.spec	12 Sep 2009 16:56:56 -0000	1.17
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -64,6 +64,7 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven2-common-poms >= 1.0-3
 BuildRequires:  modello >= 1.0-0.a8
 BuildRequires:  modello-maven-plugin >= 1.0-0.a8
@@ -211,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-3
+- BR maven-surefire-provider-junit.
+
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-2
 - Add doxia-sitetools BR.
 



From lucilanga at fedoraproject.org  Sat Sep 12 17:30:06 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 12 Sep 2009 17:30:06 +0000 (UTC)
Subject: rpms/aprsd/F-11 aprsd.spec,1.6,1.7
Message-ID: <20090912173006.D961511C043A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/aprsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17575

Modified Files:
	aprsd.spec 
Log Message:
* Sat Sep 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.6
- correctly increment version
- add fix from Alan Crosswell (AX.25 sockets are not supported by this executable)


Index: aprsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/F-11/aprsd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- aprsd.spec	24 Feb 2009 01:32:36 -0000	1.6
+++ aprsd.spec	12 Sep 2009 17:30:05 -0000	1.7
@@ -2,7 +2,7 @@
 Name: aprsd
 Summary: Internet gateway and client access to amateur radio APRS packet data
 Version: 2.2.5
-Release: %{uprel}.5%{?dist}.1
+Release: %{uprel}.6%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz
@@ -18,6 +18,7 @@ Patch1: aprsd-2.2.5-15-gcc43-port.patch
 Patch2: aprsd-2.2.5-15-sysconfdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://sourceforge.net/projects/aprsd/
+BuildRequires: libax25-devel
 Requires (preun): /sbin/chkconfig
 Requires (preun): /sbin/service
 Requires (post): /sbin/chkconfig
@@ -85,6 +86,10 @@ fi
 %doc doc/qalgorithm.html
 
 %changelog
+* Sat Sep 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.6
+- correctly increment version
+- add fix from Alan Crosswell (AX.25 sockets are not supported by this executable)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.5-15.5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From olea at fedoraproject.org  Sat Sep 12 17:36:17 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 12 Sep 2009 17:36:17 +0000 (UTC)
Subject: rpms/purple-microblog/F-10 import.log, 1.3,
	1.4 purple-microblog.spec, 1.10, 1.11
Message-ID: <20090912173617.296BD11C00CE@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19389/F-10

Modified Files:
	import.log purple-microblog.spec 
Log Message:
new release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Sep 2009 11:38:42 -0000	1.3
+++ import.log	12 Sep 2009 17:36:15 -0000	1.4
@@ -1,3 +1,4 @@
 purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448
 purple-microblog-0_2_2-1olea:F-10:purple-microblog-0.2.2-1olea.src.rpm:1245015253
 purple-microblog-0_2_3-1_olea:F-10:purple-microblog-0.2.3-1.olea.src.rpm:1252755464
+purple-microblog-0_2_3-2_olea:F-10:purple-microblog-0.2.3-2.olea.src.rpm:1252776946


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/purple-microblog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- purple-microblog.spec	12 Sep 2009 11:38:42 -0000	1.10
+++ purple-microblog.spec	12 Sep 2009 17:36:16 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           purple-microblog
 Version:        0.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -11,7 +11,7 @@ URL:            http://code.google.com/p
 Source0: http://microblog-purple.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pidgin-devel >= 2.5, ElectricFence
+BuildRequires:  pidgin-devel >= 2.5, ElectricFence, subversion
 ExcludeArch:    s390x
 
 %description
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-2
+- adding svn building requirement
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-1
 - New upstream release 
 



From thias at fedoraproject.org  Sat Sep 12 17:38:59 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 17:38:59 +0000 (UTC)
Subject: rpms/glusterfs/devel .cvsignore, 1.9, 1.10 glusterfs.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090912173859.DF99E11C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20183/devel

Modified Files:
	.cvsignore glusterfs.spec sources 
Log Message:
Update to 2.0.6 and no longer default to disable the client on RHEL5 (#522192).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 09:01:10 -0000	1.9
+++ .cvsignore	12 Sep 2009 17:38:59 -0000	1.10
@@ -1 +1 @@
-glusterfs-2.0.4.tar.gz
+glusterfs-2.0.6.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/glusterfs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- glusterfs.spec	30 Jul 2009 09:01:10 -0000	1.13
+++ glusterfs.spec	12 Sep 2009 17:38:59 -0000	1.14
@@ -5,9 +5,6 @@
 %{?_without_client:%define _without_client --disable-fuse-client}
 %{?_without_python:%define _without_python --disable-python}
 
-# Default to disabling client on RHEL, but allow forcing --with client too
-%{?rhel:%{!?_with_client:%define _without_client --disable-fuse-client}}
-
 # Disable the python bindings if we have < 2.4, since 2.4+ is required
 %if "%(%{__python} -c "import sys ; print sys.version[:3]")" < "2.4"
 %define _without_python --disable-python
@@ -15,12 +12,12 @@
 
 Summary: Cluster File System
 Name: glusterfs
-Version: 2.0.4
+Version: 2.0.6
 Release: 1%{?pre:.%{pre}}%{?dist}
 License: GPLv3+
 Group: System Environment/Base
-URL: http://www.gluster.org/docs/index.php/GlusterFS
-Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
+URL: http://www.gluster.org/
+Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
 Source1: glusterfsd.init
 Source2: glusterfsd.sysconfig
 Source3: umount.glusterfs
@@ -235,6 +232,11 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.6-1
+- Update to 2.0.6.
+- No longer default to disable the client on RHEL5 (#522192).
+- Update spec file URLs.
+
 * Mon Jul 27 2009 Matthias Saou <http://freshrpms.net/> 2.0.4-1
 - Update to 2.0.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Jul 2009 09:01:10 -0000	1.9
+++ sources	12 Sep 2009 17:38:59 -0000	1.10
@@ -1 +1 @@
-231784a826781c72bac1479768912194  glusterfs-2.0.4.tar.gz
+dfa42bfc34d799888a1e3032f9143c72  glusterfs-2.0.6.tar.gz



From thias at fedoraproject.org  Sat Sep 12 17:38:59 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 17:38:59 +0000 (UTC)
Subject: rpms/glusterfs/EL-5 .cvsignore, 1.3, 1.4 glusterfs.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090912173859.7DC5D11C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20183/EL-5

Modified Files:
	.cvsignore glusterfs.spec sources 
Log Message:
Update to 2.0.6 and no longer default to disable the client on RHEL5 (#522192).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Feb 2009 12:24:47 -0000	1.3
+++ .cvsignore	12 Sep 2009 17:38:58 -0000	1.4
@@ -1 +1 @@
-glusterfs-1.3.12.tar.gz
+glusterfs-2.0.6.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-5/glusterfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glusterfs.spec	12 Apr 2009 11:01:35 -0000	1.5
+++ glusterfs.spec	12 Sep 2009 17:38:58 -0000	1.6
@@ -1,11 +1,10 @@
+#define pre rc8
+
 # Possible rpmbuild options
 %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
 %{?_without_client:%define _without_client --disable-fuse-client}
 %{?_without_python:%define _without_python --disable-python}
 
-# Default to disabling client on RHEL, but allow forcing --with client too
-%{?rhel:%{!?_with_client:%define _without_client --disable-fuse-client}}
-
 # Disable the python bindings if we have < 2.4, since 2.4+ is required
 %if "%(%{__python} -c "import sys ; print sys.version[:3]")" < "2.4"
 %define _without_python --disable-python
@@ -13,15 +12,17 @@
 
 Summary: Cluster File System
 Name: glusterfs
-Version: 1.3.12
-Release: 2%{?dist}
+Version: 2.0.6
+Release: 1%{?pre:.%{pre}}%{?dist}
 License: GPLv3+
 Group: System Environment/Base
-URL: http://www.gluster.org/docs/index.php/GlusterFS
-Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}.tar.gz
+URL: http://www.gluster.org/
+Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
 Source1: glusterfsd.init
 Source2: glusterfsd.sysconfig
 Source3: umount.glusterfs
+Source4: glusterfs.logrotate
+Source5: glusterfsd.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -41,12 +42,13 @@ called Translators from GNU Hurd kernel.
 is in userspace and easily manageable.
 
 
-%package libs
-Summary: GlusterFS Library and Translators
+%package common
+Summary: GlusterFS common files for both the client and the server
 Group: System Environment/Libraries
-Obsoletes: glusterfs-common <= 1.3.7-2
+Obsoletes: glusterfs-libs < 2.0.0
+Provides: glusterfs-libs = %{version}-%{release}
 
-%description libs
+%description common
 GlusterFS is a clustered file-system capable of scaling to several
 peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
@@ -55,15 +57,15 @@ terms of features and extensibility.  It
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
 is in userspace and easily manageable.
 
-This package includes libglusterfs and glusterfs translator modules
-common to both GlusterFS server and client framework.
+This package includes the glusterfs binary, libglusterfs and glusterfs
+translator modules common to both GlusterFS server and client framework.
 
 
 %package client
 Summary: GlusterFS Client
 Group: Applications/File
 Requires: fuse
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description client
 GlusterFS is a clustered file-system capable of scaling to several
@@ -80,7 +82,7 @@ This package provides the FUSE based Glu
 %package server
 Summary: GlusterFS Server
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -97,7 +99,7 @@ This package provides the glusterfs serv
 %package devel
 Summary: GlusterFS Development Libraries
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -112,11 +114,18 @@ This package provides the development li
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?pre}
+# Remove file, it gets re-generated by bison (was causing koji build failures)
+rm -f libglusterfs/src/y.tab.c
+# Don't get executable sources in the debuginfo package (as of 2.0.0rc7)
+chmod -x libglusterfsclient/src/*.{c,h}
 
 
 %build
 %configure %{?_without_ibverbs} %{?_without_client} %{?_without_python}
+# Remove 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
 %{__make} %{?_smp_mflags}
 
 
@@ -128,6 +137,9 @@ This package provides the development li
 %{__install} -p -m 0644 libglusterfs/src/*.h \
     %{buildroot}%{_includedir}/glusterfs/
 
+# Remove unwanted files from all of the shared libraries
+find %{buildroot}%{_libdir}/glusterfs -name '*.a' -o -name '*.la' | xargs rm -f
+
 # Remove installed docs, we include them ourselves as %%doc
 %{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
 
@@ -150,16 +162,23 @@ done
 # Install wrapper umount script
 %{__install} -D -p -m 0755 %{SOURCE3} \
     %{buildroot}/sbin/umount.glusterfs
+# Client logrotate entry
+%{__install} -D -p -m 0644 %{SOURCE4} \
+    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
 %endif
 
+# Server logrotate entry
+%{__install} -D -p -m 0644 %{SOURCE5} \
+    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%post libs -p /sbin/ldconfig
+%post common -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun common -p /sbin/ldconfig
 
 
 %post server
@@ -171,51 +190,87 @@ if [ $1 -eq 0 ]; then
     /sbin/chkconfig --del glusterfsd
 fi
 
-%postun
+%postun server
 if [ $1 -ge 1 ]; then
     /sbin/service glusterfsd condrestart &>/dev/null || :
 fi
 
 
-%files libs
+%files common
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/glusterfs/
 %{_libdir}/*.so.*
+%{_sbindir}/glusterfs
+%{_sbindir}/glusterfsd
+%{_mandir}/man8/glusterfs.8*
+%dir /var/log/glusterfs/
 
 
 %if 0%{!?_without_client:1}
 %files client
-%{_sbindir}/glusterfs
+%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
 /sbin/mount.glusterfs
 /sbin/umount.glusterfs
-%dir /var/log/glusterfs/
-%{_mandir}/man8/glusterfs.8*
 %endif
 
 
 %files server
-%doc examples/ doc/glusterfs-*.vol.sample
+%doc examples/ doc/glusterfs*.vol.sample
 %dir %{_sysconfdir}/glusterfs/
 %config(noreplace) %{_sysconfdir}/glusterfs/*.vol
+%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 %{_sysconfdir}/init.d/glusterfsd
-%{_sbindir}/glusterfs
-%{_sbindir}/glusterfsd
-%dir /var/log/glusterfs/
-%{_mandir}/man8/glusterfs.8*
 
 
 %files devel
 %{_includedir}/glusterfs/
+%{_includedir}/libglusterfsclient.h
 %exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 
 %changelog
-* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-2
-- Fix the common sub-package's obsoletes of libs. A simple typo which might
-  cause major problems...
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.6-1
+- Update to 2.0.6.
+- No longer default to disable the client on RHEL5 (#522192).
+- Update spec file URLs.
+
+* Mon Jul 27 2009 Matthias Saou <http://freshrpms.net/> 2.0.4-1
+- Update to 2.0.4.
+
+* Thu Jun 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.1-2
+- Remove libglusterfs/src/y.tab.c to fix koji F11/devel builds.
+
+* Sat May 16 2009 Matthias Saou <http://freshrpms.net/> 2.0.1-1
+- Update to 2.0.1.
+
+* Thu May  7 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-1
+- Update to 2.0.0 final.
+
+* Wed Apr 29 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.3.rc8
+- Move glusterfsd to common, since the client has a symlink to it.
+
+* Fri Apr 24 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.2.rc8
+- Update to 2.0.0rc8.
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.2.rc7
+- Update glusterfsd init script to the new style init.
+- Update files to match the new default vol file names.
+- Include logrotate for glusterfsd, use a pid file by default.
+- Include logrotate for glusterfs, using killall for lack of anything better.
+
+* Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc7
+- Update to 2.0.0rc7.
+- Rename "libs" to "common" and move the binary, man page and log dir there.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc1
+- Update to 2.0.0rc1.
+- Include new libglusterfsclient.h.
 
 * Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
 - Update to 1.3.12.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Feb 2009 12:24:47 -0000	1.3
+++ sources	12 Sep 2009 17:38:59 -0000	1.4
@@ -1 +1 @@
-db11e3d9d227f5b10b2a93c0d8929123  glusterfs-1.3.12.tar.gz
+dfa42bfc34d799888a1e3032f9143c72  glusterfs-2.0.6.tar.gz



From rdieter at fedoraproject.org  Sat Sep 12 17:42:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 17:42:24 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.99,1.100
Message-ID: <20090912174224.36EDB11C02CA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21452

Modified Files:
	kipi-plugins.spec 
Log Message:
add awol changelog entry



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- kipi-plugins.spec	9 Sep 2009 19:42:41 -0000	1.99
+++ kipi-plugins.spec	12 Sep 2009 17:42:23 -0000	1.100
@@ -192,6 +192,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 - kipiplugin_acquireimages.so is not available as kdegraphics is compiled
   without sane support on s390x
 
+* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> 0.6.0-1
+- kipi-plugins-0.6.0
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
 - kipi-plugins-0.5.0
 



From thias at fedoraproject.org  Sat Sep 12 17:46:32 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 17:46:32 +0000 (UTC)
Subject: rpms/glusterfs/EL-5 glusterfs.logrotate, NONE,
	1.1 glusterfsd.logrotate, NONE, 1.1 glusterfsd.init, 1.2,
	1.3 glusterfsd.sysconfig, 1.2, 1.3
Message-ID: <20090912174632.CAE2C11C02C8@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22964

Modified Files:
	glusterfsd.init glusterfsd.sysconfig 
Added Files:
	glusterfs.logrotate glusterfsd.logrotate 
Log Message:
Add and update files required by the previous change.



--- NEW FILE glusterfs.logrotate ---
/var/log/glusterfs/glusterfs.log {
    missingok
    postrotate
        /usr/bin/killall -HUP glusterfs 2>/dev/null || true
    endscript
}


--- NEW FILE glusterfsd.logrotate ---
/var/log/glusterfs/glusterfsd.log {
    missingok
    postrotate
        /bin/kill -HUP `cat /var/run/glusterfsd.pid 2>/dev/null` 2>/dev/null || true
    endscript
}


Index: glusterfsd.init
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-5/glusterfsd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glusterfsd.init	16 Feb 2009 12:24:47 -0000	1.2
+++ glusterfsd.init	12 Sep 2009 17:46:32 -0000	1.3
@@ -2,70 +2,106 @@
 #
 # glusterfsd   Startup script for the glusterfs server
 #
-# chkconfig: - 20 80
+# chkconfig:   - 20 80
 # description: Clustered file-system server
-#
-# processname: glusterfsd
-# config: /etc/glusterfs/glusterfs-server.vol
-# pidfile: /var/run/glusterfsd.pid
 
-# Source function library
+### BEGIN INIT INFO
+# Provides: glusterfsd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: glusterfs server
+# Description:       Clustered file-system server
+### END INIT INFO
+
+# Source function library.
 . /etc/rc.d/init.d/functions
 
+exec="/usr/sbin/glusterfsd"
 prog="glusterfsd"
-glusterfsd="/usr/sbin/glusterfsd"
-RETVAL=0
 
 # Set defaults, then source config for eventual overrides
-GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfs-server.vol"
-GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfsd.log"
-GLUSTERFSD_LOGLEVEL="WARNING"
 GLUSTERFSD_NOFILE="65536"
-[ -f /etc/sysconfig/glusterfsd ] && source /etc/sysconfig/glusterfsd
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	echo -n $"Starting $prog: "
-	ulimit -n ${GLUSTERFSD_NOFILE}
-	daemon $glusterfsd -f ${GLUSTERFSD_CONFIG} -l ${GLUSTERFSD_LOGFILE} -L ${GLUSTERFSD_LOGLEVEL}
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	return $RETVAL
+    [ -x $exec ] || exit 5
+    [ -f $GLUSTERFSD_CONFIG ] || exit 6
+    ulimit -n $GLUSTERFSD_NOFILE
+    echo -n $"Starting $prog: "
+    daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterfsd.pid
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	echo -n $"Stopping $prog: "
-	killproc $glusterfsd
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-	return $RETVAL
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
 }
 
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart|reload)
-		stop
-		start
-		;;
-	condrestart)
-		if [ -f /var/lock/subsys/$prog ]; then
-			stop
-			start
-		fi
-		;;
-	status)
-		status $glusterfsd
-		RETVAL=$?
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-		RETVAL=1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
+exit $?
 
-exit $RETVAL


Index: glusterfsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-5/glusterfsd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glusterfsd.sysconfig	16 Feb 2009 12:24:47 -0000	1.2
+++ glusterfsd.sysconfig	12 Sep 2009 17:46:32 -0000	1.3
@@ -1,8 +1,8 @@
 # Change the glusterfsd service defaults here.
-# LOGLEVEL is one of DEBUG WARNING ERROR (default) CRITICAL or NONE
+# See "glusterfsd --help" outpout for defaults and possible values.
 
-#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfs-server.vol"
-#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfsd.log"
-#GLUSTERFSD_LOGLEVEL="ERROR"
+#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfsd.vol"
+#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfs.log"
+#GLUSTERFSD_LOGLEVEL="NORMAL"
 #GLUSTERFSD_NOFILE="65536"
 



From kkofler at fedoraproject.org  Sat Sep 12 17:46:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Sep 2009 17:46:32 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.1-trademarks.patch, 1.1,
	1.2 kdegames.spec, 1.146, 1.147
Message-ID: <20090912174632.BA02E11C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23271/devel

Modified Files:
	kdegames-4.3.1-trademarks.patch kdegames.spec 
Log Message:
* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- also fix ktron.desktop rebranding for non-US locales

kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   46 ++++----------------------------
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 77 insertions(+), 104 deletions(-)

Index: kdegames-4.3.1-trademarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames-4.3.1-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.3.1-trademarks.patch	10 Sep 2009 13:56:08 -0000	1.1
+++ kdegames-4.3.1-trademarks.patch	12 Sep 2009 17:46:31 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
---- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
-+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
+diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
+--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" ?>
  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
@@ -49,7 +49,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
  </para>
  </chapter>
-@@ -85,14 +86,14 @@ ships in turns without knowing where the
+@@ -85,14 +86,14 @@
  <title>How to Play</title>
  <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
  <para>
@@ -66,7 +66,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  you want. The predefined port should be ok. However, if you encounter
  problems, you can choose any other free port above 1024.
  </para>
-@@ -186,10 +187,10 @@ The first player to destroy all their op
+@@ -186,10 +187,10 @@
  <title>Multiplayer support</title>
  
  <para>
@@ -80,7 +80,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  game client. If a GGZ core client is installed, you can try
  out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
  </para>
-@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
+@@ -197,7 +198,7 @@
  <para>
  Remember that when playing online, the opponent might be either a
  human player or a computer player. The latter one might behave
@@ -89,7 +89,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  
  </sect1>
-@@ -314,7 +315,7 @@ differently from the computer player inc
+@@ -314,7 +315,7 @@
  </term>
  <listitem>
  <para>
@@ -98,7 +98,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -394,7 +395,7 @@ default is on.
+@@ -394,7 +395,7 @@
  </term>
  <listitem>
  <para>
@@ -107,7 +107,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -408,7 +409,7 @@ default is on.
+@@ -408,7 +409,7 @@
  </term>
  <listitem>
  <para>
@@ -116,7 +116,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
+@@ -437,7 +438,7 @@
  </question>
  <answer>
  <para>
@@ -125,7 +125,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </answer>
  </qandaentry>
-@@ -474,7 +475,7 @@ No, the theme is not changeable.
+@@ -474,7 +475,7 @@
  <chapter id="credits">
  <title>Credits and Licenses</title>
  
@@ -134,9 +134,9 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  
  <itemizedlist>
  <title>Authors</title>
-diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
---- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
-+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
+diff -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
+--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" ?>
  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
@@ -154,7 +154,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  play alone or against a friend.
  </para>
  </abstract>
-@@ -69,11 +69,12 @@ play alone or against a friend.
+@@ -69,11 +69,12 @@
  <keywordset>
  <keyword>KDE</keyword>
  <keyword>kdegames</keyword>
@@ -169,7 +169,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  </keywordset>
  </bookinfo>
  
-@@ -81,7 +82,7 @@ play alone or against a friend.
+@@ -81,7 +82,7 @@
  <title>Introduction</title>
  
  <para>
@@ -178,9 +178,9 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
  &kappname; against the computer or a friend.
  The aim of the game is to live longer than your opponent. To do that,
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
---- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.desktop kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop
+--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-07-21 17:20:37.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,5 @@
  [Desktop Entry]
 -Name=KBattleship
@@ -189,7 +189,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  Name[be]=???????????? ??????
  Name[bn]=??????-??????????????????????????????
  Name[cs]=Lod??
-@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
+@@ -14,17 +13,16 @@
  Name[ro]=B??t??lie naval??
  Name[sr]=?????????????????????????
  Name[sr at latin]=K???podmornice
@@ -210,7 +210,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[be]=???????????? ?? ???????????? ??????
  GenericName[bn]=?????????????????????????????? ????????????
  GenericName[ca]=Joc d'enfonsar la flota
-@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
+@@ -32,7 +30,6 @@
  GenericName[cy]=G??m Longau Rhyfel
  GenericName[da]=S??nke slagskibe-spil
  GenericName[de]=Schiffe versenken
@@ -218,7 +218,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[eo]=Batal??ipa ludo
  GenericName[es]=Juego de la batalla de naves
  GenericName[et]=Laevade pommitamise m??ng
-@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
+@@ -40,7 +37,6 @@
  GenericName[fa]=???????? ?????? ???????????????
  GenericName[fi]=Meritaistelupeli
  GenericName[fr]=Jeu de bataille navale
@@ -226,7 +226,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[gl]=Xogo de batalla naval
  GenericName[he]=???????? ????????????
  GenericName[hne]=????????????????????? ?????????
-@@ -74,7 +70,7 @@ GenericName[ta]=????????????????????????
+@@ -74,7 +70,7 @@
  GenericName[tr]=Amiral Batt?? Oyunu
  GenericName[uk]=?????? ?? ???????????????? ??????
  GenericName[wa]=Djeu di batreye di bateas
@@ -235,10 +235,10 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[zh_CN]=??????????????????
  GenericName[zh_TW]=????????????
  Terminal=false
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
---- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
-@@ -5,34 +5,34 @@ input=none
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.protocol kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol
+--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-07-29 13:11:24.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol	2009-09-12 19:38:42.000000000 +0200
+@@ -5,34 +5,34 @@
  output=none
  
  Icon=kbattleship
@@ -298,9 +298,9 @@ diff -up kdegames-4.3.1/kbattleship/src/
  #exec=kbattleship %u
  
  helper=true
-diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
---- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
+--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
 @@ -21,7 +21,7 @@
  
  int main(int argc, char** argv)
@@ -310,7 +310,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
          ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
          ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
                "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
-@@ -48,7 +48,7 @@ int main(int argc, char** argv)
+@@ -48,7 +48,7 @@
      KCmdLineArgs::init(argc, argv, &aboutData);
  
      KCmdLineOptions options;
@@ -319,48 +319,67 @@ diff -up kdegames-4.3.1/kbattleship/src/
      KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
      KApplication app;
      KGlobal::locale()->insertCatalog("libkdegames");
-diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
---- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
-+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
-@@ -3,7 +3,7 @@ Type=Application
+diff -ur kdegames-4.3.1/ktron/ktron.desktop kdegames-4.3.1-trademarks/ktron/ktron.desktop
+--- kdegames-4.3.1/ktron/ktron.desktop	2009-07-29 13:11:19.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/ktron.desktop	2009-09-12 19:41:54.000000000 +0200
+@@ -3,46 +3,14 @@
  Exec=ktron -caption "%c" %i
  Icon=ktron
  DocPath=ktron/index.html
 -GenericName=Tron-like Game
-+GenericName=Snake Duel Game
- GenericName[ca]=Joc similar al Tron
- GenericName[cs]=Hra typu Tron
- GenericName[da]=Tron-lignende spil
-@@ -29,20 +29,20 @@ GenericName[sr]=???????? ?????????? ????
- GenericName[sr at latin]=Igra nalik na tron
- GenericName[sv]=Tron-liknande spel
- GenericName[uk]=??????, ?????????? ???? Tron
+-GenericName[ca]=Joc similar al Tron
+-GenericName[cs]=Hra typu Tron
+-GenericName[da]=Tron-lignende spil
+-GenericName[de]=???Tron???-Spiel
+-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
+-GenericName[es]=Juego similar a Tron
+-GenericName[et]=Troni moodi m??ng
+-GenericName[eu]=Tron-en antzeko jokoa
+-GenericName[fr]=Jeu dans le style de Tron
+-GenericName[ga]=Cluiche Cos??il le Tron
+-GenericName[it]=Un gioco simile a Tron
+-GenericName[ja]=Tron ?????????????????????
+-GenericName[km]=??????????????????????????????????????? Tron
+-GenericName[lv]=Tron l??dz??ga sp??le
+-GenericName[nds]=Tron-liek Speel
+-GenericName[nl]=Tron-achtig spel
+-GenericName[nn]=Tron-liknande spel
+-GenericName[pt]=Jogo Semelhante ao Tron
+-GenericName[pt_BR]=Jogo semelhante ao Tron
+-GenericName[ru]=???????? ?? ?????????? ????????????
+-GenericName[sl]=Igra podobna Tronu
+-GenericName[sr]=???????? ?????????? ???? ????????
+-GenericName[sr at latin]=Igra nalik na tron
+-GenericName[sv]=Tron-liknande spel
+-GenericName[uk]=??????, ?????????? ???? Tron
 -GenericName[x-test]=xxTron-like Gamexx
+-GenericName[zh_CN]=?????? Tron ?????????
+-GenericName[zh_TW]=?????? Tron ??????
++GenericName=Snake Duel Game
++GenericName[de]=Schlangenduell-Spiel
++GenericName[fr]=Jeu de duel de serpents
++GenericName[it]=Gioco di duello di serpenti
 +GenericName[x-test]=xxSnake Duel Gamexx
- GenericName[zh_CN]=?????? Tron ?????????
- GenericName[zh_TW]=?????? Tron ??????
  Terminal=false
 -Name=KTron
 -Name[af]=Ktron
-+Name=KSnakeDuel
-+Name[af]=KSnakeDuel
- Name[bn]=??????-????????????
- Name[ru]=????????
- Name[sr]=?????????????
- Name[sr at latin]=K???tron
+-Name[bn]=??????-????????????
+-Name[ru]=????????
+-Name[sr]=?????????????
+-Name[sr at latin]=K???tron
 -Name[sv]=Ktron
-+Name[sv]=KsnakeDuel
- Name[ta]=K??????????????????
- Name[tg]=K????????
+-Name[ta]=K??????????????????
+-Name[tg]=K????????
 -Name[x-test]=xxKTronxx
++Name=KSnakeDuel
 +Name[x-test]=xxKSnakeDuelxx
  X-KDE-StartupNotify=true
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Game;ArcadeGame;
-diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
---- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
-+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
-@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
+diff -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
+--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
++++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
+@@ -41,7 +41,7 @@
  
  int main(int argc, char* argv[])
  {
@@ -369,7 +388,7 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
      KTRON_VERSION, description, KAboutData::License_GPL, notice);
    aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
    aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
-@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
+@@ -50,7 +50,8 @@
    KCmdLineArgs::init( argc, argv, &aboutData );
  
    KCmdLineOptions options;
@@ -379,10 +398,10 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
    options.add("snake", ki18n("Start in KSnake mode"));
    KCmdLineArgs::addCmdLineOptions(options);
  
-diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
---- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
-+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
-@@ -92,7 +92,7 @@ QString Player::getName()
+diff -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
+--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
+@@ -92,7 +92,7 @@
  {
  	if (isComputer())
  	{
@@ -391,10 +410,10 @@ diff -up kdegames-4.3.1/ktron/player.cpp
  	}
  	else
  	{
-diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
---- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
-+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
-@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
+diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
+--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
++++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
+@@ -25,9 +25,6 @@
      Play backgammon against a local human player, via a game server or
      against GNU Backgammon (not included)
  
@@ -404,7 +423,7 @@ diff -up kdegames-4.3.1/README.trademark
  * kblackbox
      Find the balls hidden in the black box by shooting laser beams!
  
-@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
+@@ -70,6 +67,15 @@
  * kshisen
      Patience game where you take away all pieces.
  


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- kdegames.spec	10 Sep 2009 14:38:48 -0000	1.146
+++ kdegames.spec	12 Sep 2009 17:46:32 -0000	1.147
@@ -3,12 +3,19 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Please be careful when rebasing this one! If you accidentally drop parts of
+# it, Legal is going to kick our ass. ;-)
+# In kbattleship.desktop, s/KBattleship/KSinkShips/ in all translations of
+# Description. (The other strings don't contain "battleship".)
+# In ktron.desktop, just remove all the translations containing "Tron" or
+# "KTron". Use my translations of GenericName for de, fr, it, feel free to add
+# more, but don't use "Tron" in them! -- Kevin
 Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -223,6 +230,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- also fix ktron.desktop rebranding for non-US locales
+
 * Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
 - drop ktron/kbattleship in RHEL
 



From kkofler at fedoraproject.org  Sat Sep 12 17:47:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Sep 2009 17:47:20 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.3.1-trademarks.patch, 1.1,
	1.2 kdegames.spec, 1.121, 1.122
Message-ID: <20090912174720.D349D11C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23658/F-10

Modified Files:
	kdegames-4.3.1-trademarks.patch kdegames.spec 
Log Message:
Sync from devel:

* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- also fix ktron.desktop rebranding for non-US locales

* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
- drop ktron/kbattleship in RHEL

kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   46 ++++----------------------------
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 77 insertions(+), 104 deletions(-)

Index: kdegames-4.3.1-trademarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames-4.3.1-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.3.1-trademarks.patch	10 Sep 2009 14:30:31 -0000	1.1
+++ kdegames-4.3.1-trademarks.patch	12 Sep 2009 17:47:20 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
---- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
-+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
+diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
+--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" ?>
  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
@@ -49,7 +49,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
  </para>
  </chapter>
-@@ -85,14 +86,14 @@ ships in turns without knowing where the
+@@ -85,14 +86,14 @@
  <title>How to Play</title>
  <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
  <para>
@@ -66,7 +66,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  you want. The predefined port should be ok. However, if you encounter
  problems, you can choose any other free port above 1024.
  </para>
-@@ -186,10 +187,10 @@ The first player to destroy all their op
+@@ -186,10 +187,10 @@
  <title>Multiplayer support</title>
  
  <para>
@@ -80,7 +80,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  game client. If a GGZ core client is installed, you can try
  out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
  </para>
-@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
+@@ -197,7 +198,7 @@
  <para>
  Remember that when playing online, the opponent might be either a
  human player or a computer player. The latter one might behave
@@ -89,7 +89,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  
  </sect1>
-@@ -314,7 +315,7 @@ differently from the computer player inc
+@@ -314,7 +315,7 @@
  </term>
  <listitem>
  <para>
@@ -98,7 +98,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -394,7 +395,7 @@ default is on.
+@@ -394,7 +395,7 @@
  </term>
  <listitem>
  <para>
@@ -107,7 +107,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -408,7 +409,7 @@ default is on.
+@@ -408,7 +409,7 @@
  </term>
  <listitem>
  <para>
@@ -116,7 +116,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
+@@ -437,7 +438,7 @@
  </question>
  <answer>
  <para>
@@ -125,7 +125,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </answer>
  </qandaentry>
-@@ -474,7 +475,7 @@ No, the theme is not changeable.
+@@ -474,7 +475,7 @@
  <chapter id="credits">
  <title>Credits and Licenses</title>
  
@@ -134,9 +134,9 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  
  <itemizedlist>
  <title>Authors</title>
-diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
---- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
-+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
+diff -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
+--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" ?>
  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
@@ -154,7 +154,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  play alone or against a friend.
  </para>
  </abstract>
-@@ -69,11 +69,12 @@ play alone or against a friend.
+@@ -69,11 +69,12 @@
  <keywordset>
  <keyword>KDE</keyword>
  <keyword>kdegames</keyword>
@@ -169,7 +169,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  </keywordset>
  </bookinfo>
  
-@@ -81,7 +82,7 @@ play alone or against a friend.
+@@ -81,7 +82,7 @@
  <title>Introduction</title>
  
  <para>
@@ -178,9 +178,9 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
  &kappname; against the computer or a friend.
  The aim of the game is to live longer than your opponent. To do that,
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
---- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.desktop kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop
+--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-07-21 17:20:37.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,5 @@
  [Desktop Entry]
 -Name=KBattleship
@@ -189,7 +189,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  Name[be]=???????????? ??????
  Name[bn]=??????-??????????????????????????????
  Name[cs]=Lod??
-@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
+@@ -14,17 +13,16 @@
  Name[ro]=B??t??lie naval??
  Name[sr]=?????????????????????????
  Name[sr at latin]=K???podmornice
@@ -210,7 +210,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[be]=???????????? ?? ???????????? ??????
  GenericName[bn]=?????????????????????????????? ????????????
  GenericName[ca]=Joc d'enfonsar la flota
-@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
+@@ -32,7 +30,6 @@
  GenericName[cy]=G??m Longau Rhyfel
  GenericName[da]=S??nke slagskibe-spil
  GenericName[de]=Schiffe versenken
@@ -218,7 +218,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[eo]=Batal??ipa ludo
  GenericName[es]=Juego de la batalla de naves
  GenericName[et]=Laevade pommitamise m??ng
-@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
+@@ -40,7 +37,6 @@
  GenericName[fa]=???????? ?????? ???????????????
  GenericName[fi]=Meritaistelupeli
  GenericName[fr]=Jeu de bataille navale
@@ -226,7 +226,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[gl]=Xogo de batalla naval
  GenericName[he]=???????? ????????????
  GenericName[hne]=????????????????????? ?????????
-@@ -74,7 +70,7 @@ GenericName[ta]=????????????????????????
+@@ -74,7 +70,7 @@
  GenericName[tr]=Amiral Batt?? Oyunu
  GenericName[uk]=?????? ?? ???????????????? ??????
  GenericName[wa]=Djeu di batreye di bateas
@@ -235,10 +235,10 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[zh_CN]=??????????????????
  GenericName[zh_TW]=????????????
  Terminal=false
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
---- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
-@@ -5,34 +5,34 @@ input=none
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.protocol kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol
+--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-07-29 13:11:24.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol	2009-09-12 19:38:42.000000000 +0200
+@@ -5,34 +5,34 @@
  output=none
  
  Icon=kbattleship
@@ -298,9 +298,9 @@ diff -up kdegames-4.3.1/kbattleship/src/
  #exec=kbattleship %u
  
  helper=true
-diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
---- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
+--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
 @@ -21,7 +21,7 @@
  
  int main(int argc, char** argv)
@@ -310,7 +310,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
          ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
          ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
                "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
-@@ -48,7 +48,7 @@ int main(int argc, char** argv)
+@@ -48,7 +48,7 @@
      KCmdLineArgs::init(argc, argv, &aboutData);
  
      KCmdLineOptions options;
@@ -319,48 +319,67 @@ diff -up kdegames-4.3.1/kbattleship/src/
      KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
      KApplication app;
      KGlobal::locale()->insertCatalog("libkdegames");
-diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
---- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
-+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
-@@ -3,7 +3,7 @@ Type=Application
+diff -ur kdegames-4.3.1/ktron/ktron.desktop kdegames-4.3.1-trademarks/ktron/ktron.desktop
+--- kdegames-4.3.1/ktron/ktron.desktop	2009-07-29 13:11:19.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/ktron.desktop	2009-09-12 19:41:54.000000000 +0200
+@@ -3,46 +3,14 @@
  Exec=ktron -caption "%c" %i
  Icon=ktron
  DocPath=ktron/index.html
 -GenericName=Tron-like Game
-+GenericName=Snake Duel Game
- GenericName[ca]=Joc similar al Tron
- GenericName[cs]=Hra typu Tron
- GenericName[da]=Tron-lignende spil
-@@ -29,20 +29,20 @@ GenericName[sr]=???????? ?????????? ????
- GenericName[sr at latin]=Igra nalik na tron
- GenericName[sv]=Tron-liknande spel
- GenericName[uk]=??????, ?????????? ???? Tron
+-GenericName[ca]=Joc similar al Tron
+-GenericName[cs]=Hra typu Tron
+-GenericName[da]=Tron-lignende spil
+-GenericName[de]=???Tron???-Spiel
+-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
+-GenericName[es]=Juego similar a Tron
+-GenericName[et]=Troni moodi m??ng
+-GenericName[eu]=Tron-en antzeko jokoa
+-GenericName[fr]=Jeu dans le style de Tron
+-GenericName[ga]=Cluiche Cos??il le Tron
+-GenericName[it]=Un gioco simile a Tron
+-GenericName[ja]=Tron ?????????????????????
+-GenericName[km]=??????????????????????????????????????? Tron
+-GenericName[lv]=Tron l??dz??ga sp??le
+-GenericName[nds]=Tron-liek Speel
+-GenericName[nl]=Tron-achtig spel
+-GenericName[nn]=Tron-liknande spel
+-GenericName[pt]=Jogo Semelhante ao Tron
+-GenericName[pt_BR]=Jogo semelhante ao Tron
+-GenericName[ru]=???????? ?? ?????????? ????????????
+-GenericName[sl]=Igra podobna Tronu
+-GenericName[sr]=???????? ?????????? ???? ????????
+-GenericName[sr at latin]=Igra nalik na tron
+-GenericName[sv]=Tron-liknande spel
+-GenericName[uk]=??????, ?????????? ???? Tron
 -GenericName[x-test]=xxTron-like Gamexx
+-GenericName[zh_CN]=?????? Tron ?????????
+-GenericName[zh_TW]=?????? Tron ??????
++GenericName=Snake Duel Game
++GenericName[de]=Schlangenduell-Spiel
++GenericName[fr]=Jeu de duel de serpents
++GenericName[it]=Gioco di duello di serpenti
 +GenericName[x-test]=xxSnake Duel Gamexx
- GenericName[zh_CN]=?????? Tron ?????????
- GenericName[zh_TW]=?????? Tron ??????
  Terminal=false
 -Name=KTron
 -Name[af]=Ktron
-+Name=KSnakeDuel
-+Name[af]=KSnakeDuel
- Name[bn]=??????-????????????
- Name[ru]=????????
- Name[sr]=?????????????
- Name[sr at latin]=K???tron
+-Name[bn]=??????-????????????
+-Name[ru]=????????
+-Name[sr]=?????????????
+-Name[sr at latin]=K???tron
 -Name[sv]=Ktron
-+Name[sv]=KsnakeDuel
- Name[ta]=K??????????????????
- Name[tg]=K????????
+-Name[ta]=K??????????????????
+-Name[tg]=K????????
 -Name[x-test]=xxKTronxx
++Name=KSnakeDuel
 +Name[x-test]=xxKSnakeDuelxx
  X-KDE-StartupNotify=true
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Game;ArcadeGame;
-diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
---- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
-+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
-@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
+diff -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
+--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
++++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
+@@ -41,7 +41,7 @@
  
  int main(int argc, char* argv[])
  {
@@ -369,7 +388,7 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
      KTRON_VERSION, description, KAboutData::License_GPL, notice);
    aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
    aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
-@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
+@@ -50,7 +50,8 @@
    KCmdLineArgs::init( argc, argv, &aboutData );
  
    KCmdLineOptions options;
@@ -379,10 +398,10 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
    options.add("snake", ki18n("Start in KSnake mode"));
    KCmdLineArgs::addCmdLineOptions(options);
  
-diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
---- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
-+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
-@@ -92,7 +92,7 @@ QString Player::getName()
+diff -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
+--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
+@@ -92,7 +92,7 @@
  {
  	if (isComputer())
  	{
@@ -391,10 +410,10 @@ diff -up kdegames-4.3.1/ktron/player.cpp
  	}
  	else
  	{
-diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
---- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
-+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
-@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
+diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
+--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
++++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
+@@ -25,9 +25,6 @@
      Play backgammon against a local human player, via a game server or
      against GNU Backgammon (not included)
  
@@ -404,7 +423,7 @@ diff -up kdegames-4.3.1/README.trademark
  * kblackbox
      Find the balls hidden in the black box by shooting laser beams!
  
-@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
+@@ -70,6 +67,15 @@
  * kshisen
      Patience game where you take away all pieces.
  


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- kdegames.spec	10 Sep 2009 14:30:31 -0000	1.121
+++ kdegames.spec	12 Sep 2009 17:47:20 -0000	1.122
@@ -3,12 +3,19 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Please be careful when rebasing this one! If you accidentally drop parts of
+# it, Legal is going to kick our ass. ;-)
+# In kbattleship.desktop, s/KBattleship/KSinkShips/ in all translations of
+# Description. (The other strings don't contain "battleship".)
+# In ktron.desktop, just remove all the translations containing "Tron" or
+# "KTron". Use my translations of GenericName for de, fr, it, feel free to add
+# more, but don't use "Tron" in them! -- Kevin
 Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,9 +73,11 @@ Games for the K Desktop Environment 4, i
 * kreversi
 * ksame
 * kshisen
-* ksinkships
 * ksirk
+%if 0%{?fedora}
 * ksnakeduel / ksnake
+* ksinkships
+%endif
 * kspaceduel
 * ksquares
 * ksudoku
@@ -98,8 +107,15 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-
 %build
+# trademarks issue in RHEL
+%if 0%{?fedora} == 0
+sed -i -e "s,macro_optional_add_subdirectory(kbattleship),,g" CMakeLists.txt
+sed -i -e "s,macro_optional_add_subdirectory(ktron),,g" CMakeLists.txt
+sed -i -e "s,add_subdirectory(kbattleship),,g" doc/CMakeLists.txt
+sed -i -e "s,add_subdirectory(ktron),,g" doc/CMakeLists.txt
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -114,7 +130,9 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
+%endif
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
 %endif
@@ -128,7 +146,9 @@ done
 
 %post
 %if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%endif
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 %endif
@@ -156,7 +176,9 @@ fi
 %if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
+%if 0%{?fedora}
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%endif
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
@@ -182,15 +204,15 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/sounds/kapman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
+%if 0%{?fedora}
 %{_kde4_datadir}/kde4/services/kbattleship.protocol
+%endif
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %if 0%{?_skip_ggzconfig:1}
-%{_ggz_datadir}/kbattleship.dsc
-%{_ggz_datadir}/kreversi.dsc
-%{_ggz_datadir}/ksquares.dsc
+%{_ggz_datadir}/*.dsc
 %else
 %{_ggz_configdir}/ggz.modules.d/kdegames
 %endif
@@ -208,6 +230,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- also fix ktron.desktop rebranding for non-US locales
+
+* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- drop ktron/kbattleship in RHEL
+
 * Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - adjust trademarks patch to include ktron.desktop
 



From kkofler at fedoraproject.org  Sat Sep 12 17:47:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Sep 2009 17:47:21 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames-4.3.1-trademarks.patch, 1.1,
	1.2 kdegames.spec, 1.133, 1.134
Message-ID: <20090912174721.18B7711C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23658/F-11

Modified Files:
	kdegames-4.3.1-trademarks.patch kdegames.spec 
Log Message:
Sync from devel:

* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- also fix ktron.desktop rebranding for non-US locales

* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
- drop ktron/kbattleship in RHEL

kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   46 ++++----------------------------
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 77 insertions(+), 104 deletions(-)

Index: kdegames-4.3.1-trademarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames-4.3.1-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.3.1-trademarks.patch	10 Sep 2009 14:29:00 -0000	1.1
+++ kdegames-4.3.1-trademarks.patch	12 Sep 2009 17:47:20 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
---- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
-+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
+diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
+--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" ?>
  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
@@ -49,7 +49,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
  </para>
  </chapter>
-@@ -85,14 +86,14 @@ ships in turns without knowing where the
+@@ -85,14 +86,14 @@
  <title>How to Play</title>
  <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
  <para>
@@ -66,7 +66,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  you want. The predefined port should be ok. However, if you encounter
  problems, you can choose any other free port above 1024.
  </para>
-@@ -186,10 +187,10 @@ The first player to destroy all their op
+@@ -186,10 +187,10 @@
  <title>Multiplayer support</title>
  
  <para>
@@ -80,7 +80,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  game client. If a GGZ core client is installed, you can try
  out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
  </para>
-@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
+@@ -197,7 +198,7 @@
  <para>
  Remember that when playing online, the opponent might be either a
  human player or a computer player. The latter one might behave
@@ -89,7 +89,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  
  </sect1>
-@@ -314,7 +315,7 @@ differently from the computer player inc
+@@ -314,7 +315,7 @@
  </term>
  <listitem>
  <para>
@@ -98,7 +98,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -394,7 +395,7 @@ default is on.
+@@ -394,7 +395,7 @@
  </term>
  <listitem>
  <para>
@@ -107,7 +107,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -408,7 +409,7 @@ default is on.
+@@ -408,7 +409,7 @@
  </term>
  <listitem>
  <para>
@@ -116,7 +116,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </listitem>
  </varlistentry>
-@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
+@@ -437,7 +438,7 @@
  </question>
  <answer>
  <para>
@@ -125,7 +125,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  </para>
  </answer>
  </qandaentry>
-@@ -474,7 +475,7 @@ No, the theme is not changeable.
+@@ -474,7 +475,7 @@
  <chapter id="credits">
  <title>Credits and Licenses</title>
  
@@ -134,9 +134,9 @@ diff -up kdegames-4.3.1/doc/kbattleship/
  
  <itemizedlist>
  <title>Authors</title>
-diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
---- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
-+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
+diff -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
+--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" ?>
  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
@@ -154,7 +154,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  play alone or against a friend.
  </para>
  </abstract>
-@@ -69,11 +69,12 @@ play alone or against a friend.
+@@ -69,11 +69,12 @@
  <keywordset>
  <keyword>KDE</keyword>
  <keyword>kdegames</keyword>
@@ -169,7 +169,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  </keywordset>
  </bookinfo>
  
-@@ -81,7 +82,7 @@ play alone or against a friend.
+@@ -81,7 +82,7 @@
  <title>Introduction</title>
  
  <para>
@@ -178,9 +178,9 @@ diff -up kdegames-4.3.1/doc/ktron/index.
  <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
  &kappname; against the computer or a friend.
  The aim of the game is to live longer than your opponent. To do that,
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
---- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.desktop kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop
+--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-07-21 17:20:37.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop	2009-09-12 19:38:42.000000000 +0200
 @@ -1,6 +1,5 @@
  [Desktop Entry]
 -Name=KBattleship
@@ -189,7 +189,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  Name[be]=???????????? ??????
  Name[bn]=??????-??????????????????????????????
  Name[cs]=Lod??
-@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
+@@ -14,17 +13,16 @@
  Name[ro]=B??t??lie naval??
  Name[sr]=?????????????????????????
  Name[sr at latin]=K???podmornice
@@ -210,7 +210,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[be]=???????????? ?? ???????????? ??????
  GenericName[bn]=?????????????????????????????? ????????????
  GenericName[ca]=Joc d'enfonsar la flota
-@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
+@@ -32,7 +30,6 @@
  GenericName[cy]=G??m Longau Rhyfel
  GenericName[da]=S??nke slagskibe-spil
  GenericName[de]=Schiffe versenken
@@ -218,7 +218,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[eo]=Batal??ipa ludo
  GenericName[es]=Juego de la batalla de naves
  GenericName[et]=Laevade pommitamise m??ng
-@@ -40,7 +37,6 @@ GenericName[eu]=Ontzi-guda jokoa
+@@ -40,7 +37,6 @@
  GenericName[fa]=???????? ?????? ???????????????
  GenericName[fi]=Meritaistelupeli
  GenericName[fr]=Jeu de bataille navale
@@ -226,7 +226,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[gl]=Xogo de batalla naval
  GenericName[he]=???????? ????????????
  GenericName[hne]=????????????????????? ?????????
-@@ -74,7 +70,7 @@ GenericName[ta]=????????????????????????
+@@ -74,7 +70,7 @@
  GenericName[tr]=Amiral Batt?? Oyunu
  GenericName[uk]=?????? ?? ???????????????? ??????
  GenericName[wa]=Djeu di batreye di bateas
@@ -235,10 +235,10 @@ diff -up kdegames-4.3.1/kbattleship/src/
  GenericName[zh_CN]=??????????????????
  GenericName[zh_TW]=????????????
  Terminal=false
-diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
---- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
-@@ -5,34 +5,34 @@ input=none
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.protocol kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol
+--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-07-29 13:11:24.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol	2009-09-12 19:38:42.000000000 +0200
+@@ -5,34 +5,34 @@
  output=none
  
  Icon=kbattleship
@@ -298,9 +298,9 @@ diff -up kdegames-4.3.1/kbattleship/src/
  #exec=kbattleship %u
  
  helper=true
-diff -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
---- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
-+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
+diff -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
+--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
 @@ -21,7 +21,7 @@
  
  int main(int argc, char** argv)
@@ -310,7 +310,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
          ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
          ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
                "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
-@@ -48,7 +48,7 @@ int main(int argc, char** argv)
+@@ -48,7 +48,7 @@
      KCmdLineArgs::init(argc, argv, &aboutData);
  
      KCmdLineOptions options;
@@ -319,48 +319,67 @@ diff -up kdegames-4.3.1/kbattleship/src/
      KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
      KApplication app;
      KGlobal::locale()->insertCatalog("libkdegames");
-diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
---- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
-+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
-@@ -3,7 +3,7 @@ Type=Application
+diff -ur kdegames-4.3.1/ktron/ktron.desktop kdegames-4.3.1-trademarks/ktron/ktron.desktop
+--- kdegames-4.3.1/ktron/ktron.desktop	2009-07-29 13:11:19.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/ktron.desktop	2009-09-12 19:41:54.000000000 +0200
+@@ -3,46 +3,14 @@
  Exec=ktron -caption "%c" %i
  Icon=ktron
  DocPath=ktron/index.html
 -GenericName=Tron-like Game
-+GenericName=Snake Duel Game
- GenericName[ca]=Joc similar al Tron
- GenericName[cs]=Hra typu Tron
- GenericName[da]=Tron-lignende spil
-@@ -29,20 +29,20 @@ GenericName[sr]=???????? ?????????? ????
- GenericName[sr at latin]=Igra nalik na tron
- GenericName[sv]=Tron-liknande spel
- GenericName[uk]=??????, ?????????? ???? Tron
+-GenericName[ca]=Joc similar al Tron
+-GenericName[cs]=Hra typu Tron
+-GenericName[da]=Tron-lignende spil
+-GenericName[de]=???Tron???-Spiel
+-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
+-GenericName[es]=Juego similar a Tron
+-GenericName[et]=Troni moodi m??ng
+-GenericName[eu]=Tron-en antzeko jokoa
+-GenericName[fr]=Jeu dans le style de Tron
+-GenericName[ga]=Cluiche Cos??il le Tron
+-GenericName[it]=Un gioco simile a Tron
+-GenericName[ja]=Tron ?????????????????????
+-GenericName[km]=??????????????????????????????????????? Tron
+-GenericName[lv]=Tron l??dz??ga sp??le
+-GenericName[nds]=Tron-liek Speel
+-GenericName[nl]=Tron-achtig spel
+-GenericName[nn]=Tron-liknande spel
+-GenericName[pt]=Jogo Semelhante ao Tron
+-GenericName[pt_BR]=Jogo semelhante ao Tron
+-GenericName[ru]=???????? ?? ?????????? ????????????
+-GenericName[sl]=Igra podobna Tronu
+-GenericName[sr]=???????? ?????????? ???? ????????
+-GenericName[sr at latin]=Igra nalik na tron
+-GenericName[sv]=Tron-liknande spel
+-GenericName[uk]=??????, ?????????? ???? Tron
 -GenericName[x-test]=xxTron-like Gamexx
+-GenericName[zh_CN]=?????? Tron ?????????
+-GenericName[zh_TW]=?????? Tron ??????
++GenericName=Snake Duel Game
++GenericName[de]=Schlangenduell-Spiel
++GenericName[fr]=Jeu de duel de serpents
++GenericName[it]=Gioco di duello di serpenti
 +GenericName[x-test]=xxSnake Duel Gamexx
- GenericName[zh_CN]=?????? Tron ?????????
- GenericName[zh_TW]=?????? Tron ??????
  Terminal=false
 -Name=KTron
 -Name[af]=Ktron
-+Name=KSnakeDuel
-+Name[af]=KSnakeDuel
- Name[bn]=??????-????????????
- Name[ru]=????????
- Name[sr]=?????????????
- Name[sr at latin]=K???tron
+-Name[bn]=??????-????????????
+-Name[ru]=????????
+-Name[sr]=?????????????
+-Name[sr at latin]=K???tron
 -Name[sv]=Ktron
-+Name[sv]=KsnakeDuel
- Name[ta]=K??????????????????
- Name[tg]=K????????
+-Name[ta]=K??????????????????
+-Name[tg]=K????????
 -Name[x-test]=xxKTronxx
++Name=KSnakeDuel
 +Name[x-test]=xxKSnakeDuelxx
  X-KDE-StartupNotify=true
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Game;ArcadeGame;
-diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
---- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
-+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
-@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
+diff -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
+--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
++++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
+@@ -41,7 +41,7 @@
  
  int main(int argc, char* argv[])
  {
@@ -369,7 +388,7 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
      KTRON_VERSION, description, KAboutData::License_GPL, notice);
    aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
    aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
-@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
+@@ -50,7 +50,8 @@
    KCmdLineArgs::init( argc, argv, &aboutData );
  
    KCmdLineOptions options;
@@ -379,10 +398,10 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
    options.add("snake", ki18n("Start in KSnake mode"));
    KCmdLineArgs::addCmdLineOptions(options);
  
-diff -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
---- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
-+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
-@@ -92,7 +92,7 @@ QString Player::getName()
+diff -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
+--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
+@@ -92,7 +92,7 @@
  {
  	if (isComputer())
  	{
@@ -391,10 +410,10 @@ diff -up kdegames-4.3.1/ktron/player.cpp
  	}
  	else
  	{
-diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
---- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
-+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
-@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
+diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
+--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
++++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
+@@ -25,9 +25,6 @@
      Play backgammon against a local human player, via a game server or
      against GNU Backgammon (not included)
  
@@ -404,7 +423,7 @@ diff -up kdegames-4.3.1/README.trademark
  * kblackbox
      Find the balls hidden in the black box by shooting laser beams!
  
-@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
+@@ -70,6 +67,15 @@
  * kshisen
      Patience game where you take away all pieces.
  


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kdegames.spec	10 Sep 2009 14:29:00 -0000	1.133
+++ kdegames.spec	12 Sep 2009 17:47:20 -0000	1.134
@@ -3,12 +3,19 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Please be careful when rebasing this one! If you accidentally drop parts of
+# it, Legal is going to kick our ass. ;-)
+# In kbattleship.desktop, s/KBattleship/KSinkShips/ in all translations of
+# Description. (The other strings don't contain "battleship".)
+# In ktron.desktop, just remove all the translations containing "Tron" or
+# "KTron". Use my translations of GenericName for de, fr, it, feel free to add
+# more, but don't use "Tron" in them! -- Kevin
 Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,9 +73,11 @@ Games for the K Desktop Environment 4, i
 * kreversi
 * ksame
 * kshisen
-* ksinkships
 * ksirk
+%if 0%{?fedora}
 * ksnakeduel / ksnake
+* ksinkships
+%endif
 * kspaceduel
 * ksquares
 * ksudoku
@@ -98,8 +107,15 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-
 %build
+# trademarks issue in RHEL
+%if 0%{?fedora} == 0
+sed -i -e "s,macro_optional_add_subdirectory(kbattleship),,g" CMakeLists.txt
+sed -i -e "s,macro_optional_add_subdirectory(ktron),,g" CMakeLists.txt
+sed -i -e "s,add_subdirectory(kbattleship),,g" doc/CMakeLists.txt
+sed -i -e "s,add_subdirectory(ktron),,g" doc/CMakeLists.txt
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -114,7 +130,9 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
+%endif
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
 %endif
@@ -128,7 +146,9 @@ done
 
 %post
 %if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%endif
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 %endif
@@ -156,7 +176,9 @@ fi
 %if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
+%if 0%{?fedora}
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%endif
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
@@ -182,15 +204,15 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/sounds/kapman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
+%if 0%{?fedora}
 %{_kde4_datadir}/kde4/services/kbattleship.protocol
+%endif
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %if 0%{?_skip_ggzconfig:1}
-%{_ggz_datadir}/kbattleship.dsc
-%{_ggz_datadir}/kreversi.dsc
-%{_ggz_datadir}/ksquares.dsc
+%{_ggz_datadir}/*.dsc
 %else
 %{_ggz_configdir}/ggz.modules.d/kdegames
 %endif
@@ -208,6 +230,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- also fix ktron.desktop rebranding for non-US locales
+
+* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- drop ktron/kbattleship in RHEL
+
 * Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - adjust trademarks patch to include ktron.desktop
 



From thias at fedoraproject.org  Sat Sep 12 17:48:21 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 17:48:21 +0000 (UTC)
Subject: rpms/python-twill/devel python-twill.spec,1.2,1.3
Message-ID: <20090912174821.07EC411C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24091

Modified Files:
	python-twill.spec 
Log Message:
Update BR to python-setuptools-devel and add python-setuptools req (#520670).



Index: python-twill.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twill/devel/python-twill.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-twill.spec	27 Jul 2009 01:20:11 -0000	1.2
+++ python-twill.spec	12 Sep 2009 17:48:20 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Simple scripting language for Web browsing
 Name: python-twill
 Version: 0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Internet
 License: MIT
 URL: http://twill.idyll.org/
@@ -14,8 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: python-clientform
 Requires: python-mechanize
 Requires: pyparsing
+Requires: python-setuptools
 BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRequires: python-setuptools-devel
 BuildArch: noarch
 
 %description
@@ -57,6 +58,9 @@ use forms, cookies, and most standard We
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 0.9-4
+- Update BR to python-setuptools-devel and add python-setuptools req (#520670).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From salimma at fedoraproject.org  Sat Sep 12 17:53:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 12 Sep 2009 17:53:07 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 .cvsignore, 1.7, 1.8 google-gadgets.spec, 
	1.19, 1.20 sources, 1.7, 1.8
Message-ID: <20090912175307.5F37511C02C8@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-serv25473/F-11

Modified Files:
	.cvsignore google-gadgets.spec sources 
Log Message:
* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
- Update to 0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jul 2009 02:19:42 -0000	1.7
+++ .cvsignore	12 Sep 2009 17:53:05 -0000	1.8
@@ -1 +1 @@
-google-gadgets-for-linux-0.11.0.tar.bz2
+google-gadgets-for-linux-0.11.1.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- google-gadgets.spec	9 Sep 2009 14:10:56 -0000	1.19
+++ google-gadgets.spec	12 Sep 2009 17:53:05 -0000	1.20
@@ -2,19 +2,15 @@
 #define alphatag 20090430svn%{svnrev}
 
 Name:           google-gadgets
-Version:        0.11.0
+Version:        0.11.1
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        5%{?dist}
+Release:        1%{?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
-# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=311
-# patch taken from svn r1239
-Patch0:         %{name}-0.11.0-sidebar_gtk.patch
-Patch1:         %{name}-0.11.0-gecko_ver.patch
 #Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,8 +76,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
-%patch0 -p1 -b .sidebar_gtk
-%patch1 -p1 -b .gecko_ver
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
@@ -210,6 +204,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
+- Update to 0.11.1
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.11.0-5
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jul 2009 02:19:42 -0000	1.7
+++ sources	12 Sep 2009 17:53:06 -0000	1.8
@@ -1 +1 @@
-714b65738f4edeae361e2b164088c50d  google-gadgets-for-linux-0.11.0.tar.bz2
+62fec129694e83d0de481667e3c785d8  google-gadgets-for-linux-0.11.1.tar.bz2



From salimma at fedoraproject.org  Sat Sep 12 17:53:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 12 Sep 2009 17:53:07 +0000 (UTC)
Subject: rpms/google-gadgets/devel .cvsignore, 1.7, 1.8 google-gadgets.spec, 
	1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20090912175307.5F2BF11C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25473/devel

Modified Files:
	.cvsignore google-gadgets.spec sources 
Log Message:
* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
- Update to 0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jul 2009 02:19:43 -0000	1.7
+++ .cvsignore	12 Sep 2009 17:53:06 -0000	1.8
@@ -1 +1 @@
-google-gadgets-for-linux-0.11.0.tar.bz2
+google-gadgets-for-linux-0.11.1.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- google-gadgets.spec	6 Aug 2009 20:20:57 -0000	1.16
+++ google-gadgets.spec	12 Sep 2009 17:53:06 -0000	1.17
@@ -2,19 +2,15 @@
 #define alphatag 20090430svn%{svnrev}
 
 Name:           google-gadgets
-Version:        0.11.0
+Version:        0.11.1
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        4%{?dist}
+Release:        1%{?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
-# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=311
-# patch taken from svn r1239
-Patch0:         %{name}-0.11.0-sidebar_gtk.patch
-Patch1:         %{name}-0.11.0-gecko_ver.patch
 #Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,8 +76,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
-%patch0 -p1 -b .sidebar_gtk
-%patch1 -p1 -b .gecko_ver
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
@@ -210,6 +204,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
+- Update to 0.11.1
+
 * Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
 - Backport Gecko version detection fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jul 2009 02:19:43 -0000	1.7
+++ sources	12 Sep 2009 17:53:07 -0000	1.8
@@ -1 +1 @@
-714b65738f4edeae361e2b164088c50d  google-gadgets-for-linux-0.11.0.tar.bz2
+62fec129694e83d0de481667e3c785d8  google-gadgets-for-linux-0.11.1.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 12 17:56:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 17:56:46 +0000 (UTC)
Subject: rpms/kipi-plugins/F-11 kipi-plugins-0.6.0-s390x.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 kipi-plugins.spec, 1.95, 1.96 sources,
	1.29, 1.30
Message-ID: <20090912175646.4156511C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26565/F-11

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Added Files:
	kipi-plugins-0.6.0-s390x.patch 
Log Message:
kipi-plugins-0.6.0


kipi-plugins-0.6.0-s390x.patch:
 dng_flags.h |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE kipi-plugins-0.6.0-s390x.patch ---
diff -up kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390x kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
--- kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390x	2009-09-08 16:38:12.000000000 +0200
+++ kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h	2009-09-08 16:39:02.000000000 +0200
@@ -76,6 +76,12 @@
 #elif defined(__sparc__)
 #define qDNGBigEndian 1
 
+#elif defined(__s390x__)
+#define qDNGBigEndian 1
+
+#elif defined(__s390__)
+#define qDNGBigEndian 1
+
 #elif defined(__POWERPC__)
 #define qDNGBigEndian 1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	24 Jul 2009 15:43:01 -0000	1.29
+++ .cvsignore	12 Sep 2009 17:56:45 -0000	1.30
@@ -1 +1 @@
-kipi-plugins-0.5.0.tar.bz2
+kipi-plugins-0.6.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/kipi-plugins.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kipi-plugins.spec	24 Jul 2009 15:43:02 -0000	1.95
+++ kipi-plugins.spec	12 Sep 2009 17:56:45 -0000	1.96
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.5.0
-Release: 1%{?dist}
+Version: 0.6.0
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -11,8 +11,9 @@ Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: kipi-plugins-0.4.0-dt_validation.patch
+## upstreamed patches
+Patch100: kipi-plugins-0.4.0-dt_validation.patch
+Patch101: kipi-plugins-0.6.0-s390x.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
@@ -73,7 +74,8 @@ PrintWizard        : print images in var
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch50 -p1 -b .dt_validation
+%patch100 -p1 -b .dt_validation
+%patch101 -p1 -b .s390x
 
 
 %build
@@ -141,7 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
 %{_kde4_libdir}/libkipiplugins.so.1*
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
+%endif
 %{_kde4_libdir}/kde4/kipiplugin_advancedslideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_batchprocessimages.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
@@ -183,6 +187,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.6.0-2
+- add endian info for s390, s390x
+- kipiplugin_acquireimages.so is not available as kdegraphics is compiled
+  without sane support on s390x
+
+* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> 0.6.0-1
+- kipi-plugins-0.6.0
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
 - kipi-plugins-0.5.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	24 Jul 2009 15:43:02 -0000	1.29
+++ sources	12 Sep 2009 17:56:45 -0000	1.30
@@ -1 +1 @@
-f82c95b85f2b434fd03b99451ec5081e  kipi-plugins-0.5.0.tar.bz2
+105cc1f802db4b082c0ad8ee31262fd5  kipi-plugins-0.6.0.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 12 17:59:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 17:59:14 +0000 (UTC)
Subject: rpms/kipi-plugins/F-10 kipi-plugins-0.6.0-s390x.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 kipi-plugins.spec, 1.81, 1.82 sources,
	1.29, 1.30
Message-ID: <20090912175914.85F2A11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27326

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Added Files:
	kipi-plugins-0.6.0-s390x.patch 
Log Message:
kipi-plugins-0.6.0


kipi-plugins-0.6.0-s390x.patch:
 dng_flags.h |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE kipi-plugins-0.6.0-s390x.patch ---
diff -up kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390x kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
--- kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390x	2009-09-08 16:38:12.000000000 +0200
+++ kipi-plugins-0.6.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h	2009-09-08 16:39:02.000000000 +0200
@@ -76,6 +76,12 @@
 #elif defined(__sparc__)
 #define qDNGBigEndian 1
 
+#elif defined(__s390x__)
+#define qDNGBigEndian 1
+
+#elif defined(__s390__)
+#define qDNGBigEndian 1
+
 #elif defined(__POWERPC__)
 #define qDNGBigEndian 1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	24 Jul 2009 15:41:39 -0000	1.29
+++ .cvsignore	12 Sep 2009 17:59:13 -0000	1.30
@@ -1 +1 @@
-kipi-plugins-0.5.0.tar.bz2
+kipi-plugins-0.6.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/kipi-plugins.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- kipi-plugins.spec	24 Jul 2009 15:41:39 -0000	1.81
+++ kipi-plugins.spec	12 Sep 2009 17:59:14 -0000	1.82
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.5.0
-Release: 1%{?dist}
+Version: 0.6.0
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -11,8 +11,9 @@ Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: kipi-plugins-0.4.0-dt_validation.patch
+## upstreamed patches
+Patch100: kipi-plugins-0.4.0-dt_validation.patch
+Patch101: kipi-plugins-0.6.0-s390x.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
@@ -73,7 +74,8 @@ PrintWizard        : print images in var
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch50 -p1 -b .dt_validation
+%patch100 -p1 -b .dt_validation
+%patch101 -p1 -b .s390x
 
 
 %build
@@ -141,7 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
 %{_kde4_libdir}/libkipiplugins.so.1*
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
+%endif
 %{_kde4_libdir}/kde4/kipiplugin_advancedslideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_batchprocessimages.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
@@ -183,6 +187,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.6.0-2
+- add endian info for s390, s390x
+- kipiplugin_acquireimages.so is not available as kdegraphics is compiled
+  without sane support on s390x
+
+* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> 0.6.0-1
+- kipi-plugins-0.6.0
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
 - kipi-plugins-0.5.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	24 Jul 2009 15:41:39 -0000	1.29
+++ sources	12 Sep 2009 17:59:14 -0000	1.30
@@ -1 +1 @@
-f82c95b85f2b434fd03b99451ec5081e  kipi-plugins-0.5.0.tar.bz2
+105cc1f802db4b082c0ad8ee31262fd5  kipi-plugins-0.6.0.tar.bz2



From tuxbrewr at fedoraproject.org  Sat Sep 12 18:02:41 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 12 Sep 2009 18:02:41 +0000 (UTC)
Subject: rpms/sugar-write/F-11 sources,1.6,1.7 sugar-write.spec,1.7,1.8
Message-ID: <20090912180241.2FC4111C00CE@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/sugar-write/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28513

Modified Files:
	sources sugar-write.spec 
Log Message:
Add buildreq gettext, new release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Aug 2009 13:30:55 -0000	1.6
+++ sources	12 Sep 2009 18:02:40 -0000	1.7
@@ -1 +1 @@
-6315e47fa04736e8ba6e29ee89eedc30  Write-66.tar.bz2
+db712c5aca62ffd3aa4fc4cd50e367ec  Write-67.tar.bz2


Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-11/sugar-write.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sugar-write.spec	26 Aug 2009 13:30:55 -0000	1.7
+++ sugar-write.spec	12 Sep 2009 18:02:40 -0000	1.8
@@ -1,15 +1,20 @@
 Name: sugar-write
-Version: 66
-Release: 1%{?dist}
+Version: 67
+Release: 2%{?dist}
 Summary: Word processor for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.sugarlabs.org/go/Activities/Write
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  python sugar-toolkit
+BuildRequires:  sugar-toolkit
+BuildRequires:  gettext
+
 Requires: sugar python-telepathy
 Requires: pyabiword
+
 BuildArch: noarch
 
 %description
@@ -39,8 +44,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-2
+- add build requirement gettext
+
+* Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-1
+- Toolbar redesign
+
 * Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 66-1
-- New release
+- New release 
 
 * Tue Mar 03 2009 Simon Schampijer <simon at schampijer.de> - 63-1
 - Update to API change, render_page_to_image starts now with 1 #152



From ensc at fedoraproject.org  Sat Sep 12 18:13:25 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat, 12 Sep 2009 18:13:25 +0000 (UTC)
Subject: rpms/libextractor/devel .cvsignore, 1.6, 1.7 lastver, 1.4,
	1.5 sources, 1.8, 1.9
Message-ID: <20090912181325.70A5111C00CE@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712

Modified Files:
	.cvsignore lastver sources 
Log Message:
updated to 0.5.23



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Mar 2009 12:02:38 -0000	1.6
+++ .cvsignore	12 Sep 2009 18:13:24 -0000	1.7
@@ -1 +1 @@
-libextractor-0.5.22.tar.gz
+libextractor-0.5.23.tar.gz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/lastver,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lastver	7 Mar 2009 12:02:38 -0000	1.4
+++ lastver	12 Sep 2009 18:13:25 -0000	1.5
@@ -1 +1 @@
-0.5.22
+0.5.23


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Mar 2009 12:02:38 -0000	1.8
+++ sources	12 Sep 2009 18:13:25 -0000	1.9
@@ -1 +1 @@
-f6d6ea1264a471189eee99728b983c4e  libextractor-0.5.22.tar.gz
+d10fe30a595669e419f31777b2ab34ec  libextractor-0.5.23.tar.gz



From ensc at fedoraproject.org  Sat Sep 12 18:14:27 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat, 12 Sep 2009 18:14:27 +0000 (UTC)
Subject: rpms/libextractor/devel libextractor.spec,1.13,1.14
Message-ID: <20090912181427.020D411C00CE@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32671

Modified Files:
	libextractor.spec 
Log Message:
- updated to 0.5.23
- reenabled rpm plugin
- build exiv2 plugin with system library
- whitespace cleanups



Index: libextractor.spec
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/libextractor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libextractor.spec	25 Jul 2009 05:36:02 -0000	1.13
+++ libextractor.spec	12 Sep 2009 18:14:26 -0000	1.14
@@ -5,8 +5,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		libextractor
-Version:	0.5.22
-Release:	%release_func 2
+Version:	0.5.23
+Release:	%release_func 0
 Summary:	Simple library for keyword extraction
 
 Group:		System Environment/Libraries
@@ -77,11 +77,11 @@ Requires:	%name = %version-%release
 
 %{?with_mpeg:%pluginpkg mpeg -B mpeg2dec-devel}
 %pluginpkg flac -B flac-devel
-%pluginpkg exiv2
+%pluginpkg exiv2 -B exiv2-devel
 %pluginpkg ogg
 %pluginpkg ole2
 %pluginpkg pdf
-#pluginpkg rpm -B rpm-devel
+%pluginpkg rpm -B rpm-devel
 
 %pluginpkg thumbnailgtk -u -P plugin(%name)=thumbnail
 %ghost %plugindir/libextractor-thumbnail.so
@@ -135,7 +135,6 @@ sed -i 's!\(-L\(/usr\|\$with_qt\)/lib\|-
 
 %build
 %{!?with_mpeg:export ac_cv_lib_mpeg2_mpeg2_init=no}
-export ac_cv_lib_rpm_rpmReadPackageFile=no
 
 %configure --disable-static	\
 	--disable-rpath		\
@@ -144,13 +143,13 @@ export ac_cv_lib_rpm_rpmReadPackageFile=
 
 # build with --as-needed and disable rpath
 sed -i \
-	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e 's! -shared ! -Wl,--as-needed\0!g'					\
 	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
 	libtool
 
 # not SMP safe
 make # %{?_smp_mflags}
-	
+
 
 
 %install
@@ -248,6 +247,11 @@ test "$1" != 0 || \
 
 
 %changelog
+* Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.23-0
+- updated to 0.5.23
+- reenabled rpm plugin
+- build exiv2 plugin with system library
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ensc at fedoraproject.org  Sat Sep 12 18:26:11 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat, 12 Sep 2009 18:26:11 +0000 (UTC)
Subject: rpms/mimetic/devel verinfo, 1.1, 1.2 sources, 1.7, 1.8 mimetic.spec,
	1.17, 1.18 lastver, 1.2, 1.3 .cvsignore, 1.4, 1.5
Message-ID: <20090912182611.07B7311C00CE@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3593

Modified Files:
	verinfo sources mimetic.spec lastver .cvsignore 
Log Message:
updated to 0.9.6



Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- verinfo	1 Sep 2007 14:45:11 -0000	1.1
+++ verinfo	12 Sep 2009 18:26:10 -0000	1.2
@@ -1,2 +1,2 @@
 http://codesink.org/download/
-mimetic-(.*?)\.tar\.
+mimetic-([0-9.]*?)\.tar\.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Mar 2009 12:32:22 -0000	1.7
+++ sources	12 Sep 2009 18:26:10 -0000	1.8
@@ -1 +1 @@
-eb5d437ca2f88db7e8ba6e7008180d81  mimetic-0.9.5.tar.gz
+f853036fddf3a89cdd66659776d2dbea  mimetic-0.9.6.tar.gz


Index: mimetic.spec
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mimetic.spec	25 Jul 2009 12:12:56 -0000	1.17
+++ mimetic.spec	12 Sep 2009 18:26:10 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		mimetic
-Version:	0.9.5
+Version:	0.9.6
 Release:	%release_func 1
 Summary:	A full featured MIME library written in C++
 
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.9.6-1
+- updated to 0.9.6
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/lastver,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lastver	7 Mar 2009 12:32:22 -0000	1.2
+++ lastver	12 Sep 2009 18:26:10 -0000	1.3
@@ -1 +1 @@
-0.9.5
+0.9.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Mar 2009 12:32:22 -0000	1.4
+++ .cvsignore	12 Sep 2009 18:26:10 -0000	1.5
@@ -1 +1 @@
-mimetic-0.9.5.tar.gz
+mimetic-0.9.6.tar.gz



From epienbro at fedoraproject.org  Sat Sep 12 18:51:29 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 12 Sep 2009 18:51:29 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel mingw32-libxml2.spec, 1.10,
	1.11 mingw32-libxml2-win32-pthreads-compatibility.patch, 1.1, NONE
Message-ID: <20090912185129.EDB2511C00CE@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10787

Modified Files:
	mingw32-libxml2.spec 
Removed Files:
	mingw32-libxml2-win32-pthreads-compatibility.patch 
Log Message:
* Sat Sep 12 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-2
- Always use the native win32 thread API even when pthreads is available
- Dropped a patch which isn't necessary anymore



Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-libxml2.spec	11 Sep 2009 17:15:00 -0000	1.10
+++ mingw32-libxml2.spec	12 Sep 2009 18:51:28 -0000	1.11
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -22,7 +22,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
 Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
-Patch1002:      mingw32-libxml2-win32-pthreads-compatibility.patch
 
 BuildArch:      noarch
 
@@ -61,7 +60,6 @@ Static version of the MinGW Windows XML 
 
 %patch1000 -p1
 %patch1001 -p0
-%patch1002 -p0
 
 # Patched configure.in, so rebuild configure.
 libtoolize --force --copy
@@ -74,14 +72,14 @@ autoreconf
 mkdir build_static
 pushd build_static
     LDFLAGS="-no-undefined" \
-    %{_mingw32_configure} --without-python --with-modules --enable-static --disable-shared CFLAGS="$CFLAGS -DLIBXML_STATIC_FOR_DLL"
+    %{_mingw32_configure} --without-python --with-modules --enable-static --disable-shared --with-threads=yes CFLAGS="$CFLAGS -DLIBXML_STATIC_FOR_DLL"
     make %{?_smp_mflags}
 popd
 
 mkdir build_shared
 pushd build_shared
     LDFLAGS="-no-undefined" \
-    %{_mingw32_configure} --without-python --with-modules --disable-static --enable-shared
+    %{_mingw32_configure} --without-python --with-modules --disable-static --enable-shared --with-threads=yes
     make %{?_smp_mflags}
 popd
 
@@ -133,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-2
+- Always use the native win32 thread API even when pthreads is available
+- Dropped a patch which isn't necessary anymore
+
 * Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
 - Update to 2.7.4
 - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch


--- mingw32-libxml2-win32-pthreads-compatibility.patch DELETED ---



From caolanm at fedoraproject.org  Sat Sep 12 19:24:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 12 Sep 2009 19:24:28 +0000 (UTC)
Subject: rpms/xmlcopyeditor/devel xmlcopyeditor-1.2.0.2.gcc44.patch, NONE,
	1.1 xmlcopyeditor.spec, 1.4, 1.5 noautobuild, 1.2,
	NONE xmlcopyeditor-1.1.0.6-gcc43.patch, 1.1,
	NONE xmlcopyeditor-1.1.0.6-nuke.patch, 1.1, NONE
Message-ID: <20090912192428.DBDE211C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/xmlcopyeditor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19937

Modified Files:
	xmlcopyeditor.spec 
Added Files:
	xmlcopyeditor-1.2.0.2.gcc44.patch 
Removed Files:
	noautobuild xmlcopyeditor-1.1.0.6-gcc43.patch 
	xmlcopyeditor-1.1.0.6-nuke.patch 
Log Message:
Resolves: rhbz#508867 rhbz#511552 FTBFS

xmlcopyeditor-1.2.0.2.gcc44.patch:
 replace.cpp            |    1 +
 stringset.h            |    1 +
 wrapaspell.cpp         |    1 +
 wraplibxml.cpp         |    2 +-
 xmlassociatedtd.h      |    1 +
 xmlassociatexsd.h      |    1 +
 xmlassociatexsl.h      |    1 +
 xmlpromptgenerator.cpp |    3 +--
 xmlutf8reader.h        |    1 +
 xsllocator.cpp         |    4 ++--
 10 files changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE xmlcopyeditor-1.2.0.2.gcc44.patch ---
diff -ru xmlcopyeditor-1.2.0.2.orig/src/replace.cpp xmlcopyeditor-1.2.0.2/src/replace.cpp
--- xmlcopyeditor-1.2.0.2.orig/src/replace.cpp	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/replace.cpp	2009-06-30 10:43:13.000000000 +0100
@@ -18,6 +18,7 @@
  */
 
 #include <cstring>
+#include <cstdio>
 #include "replace.h"
 
 int Replace::run (
diff -ru xmlcopyeditor-1.2.0.2.orig/src/stringset.h xmlcopyeditor-1.2.0.2/src/stringset.h
--- xmlcopyeditor-1.2.0.2.orig/src/stringset.h	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/stringset.h	2009-06-30 10:40:40.000000000 +0100
@@ -28,6 +28,7 @@
 #ifdef __WXMSW__
 #include <mem.h>
 #endif
+#include <stdint.h>
 
 template<class T>
 class StringSetNode
diff -ru xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp
--- xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp	2009-06-30 11:12:37.000000000 +0100
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <stdexcept>
+#include <cstdio>
 #include "wrapaspell.h"
 #include "aspell.h"
 #include "casehandler.h"
diff -ru xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp
--- xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp	2009-06-30 11:23:19.000000000 +0100
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "wraplibxml.h"
 #include <sstream>
 #include <stdexcept>
 #include <wx/wx.h>
+#include "wraplibxml.h"
 
 WrapLibxml::WrapLibxml ( bool netAccessParameter, const std::string& catalogPathParameter )
 		: netAccess ( netAccessParameter ), catalogPath ( catalogPathParameter )
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h
--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h	2009-06-30 11:04:26.000000000 +0100
@@ -24,6 +24,7 @@
 #include <expat.h>
 #include <string>
 #include <memory>
+#include <cstdio>
 #include "wrapexpat.h"
 
 struct DtdData : public ParserData
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h
--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h	2009-06-30 11:05:29.000000000 +0100
@@ -25,6 +25,7 @@
 #include <string>
 #include <map>
 #include <memory>
+#include <cstdio>
 #include "wrapexpat.h"
 
 struct AssociateXsdData : public ParserData
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h
--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h	2009-06-30 11:05:55.000000000 +0100
@@ -24,6 +24,7 @@
 #include <expat.h>
 #include <string>
 #include <memory>
+#include <cstdio>
 #include "wrapexpat.h"
 
 struct XslData : public ParserData
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp
--- xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp	2009-06-30 11:23:56.000000000 +0100
@@ -31,7 +31,6 @@
 #include "catalogresolver.h"
 
 // Xerces-C req'd for Schema parsing
-#define XERCES_TMPLSINC
 
 #include <xercesc/util/NameIdPool.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
@@ -441,7 +440,7 @@
 	}
 
 	SchemaGrammar* grammar = ( SchemaGrammar* ) rootGrammar;
-	RefHash3KeysIdPoolEnumerator<SchemaElementDecl> elemEnum = grammar->getElemEnumerator();
+	RefHash3KeysIdPoolEnumerator<SchemaElementDecl> elemEnum (grammar->getElemEnumerator());
 
 	if ( !elemEnum.hasMoreElements() )
 	{
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h
--- xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h	2009-06-30 11:08:20.000000000 +0100
@@ -24,6 +24,7 @@
 #include <expat.h>
 #include <string>
 #include <memory>
+#include <cstdio>
 #include "wrapexpat.h"
 
 struct UtfData : public ParserData
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp xmlcopyeditor-1.2.0.2/src/xsllocator.cpp
--- xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp	2009-06-30 10:38:57.000000000 +0100
+++ xmlcopyeditor-1.2.0.2/src/xsllocator.cpp	2009-06-30 11:11:23.000000000 +0100
@@ -46,7 +46,7 @@
 		return;
 
 	char *value, *iterator;
-	value = strstr ( ( const char * ) data, "href=" );
+	value = strstr ( ( char * ) data, "href=" );
 	if ( !value || strlen ( value ) < 7 )
 		return;
 	value += 6;
@@ -55,7 +55,7 @@
 	{
 		if ( *iterator == '"' || *iterator == '\'' )
 		{
-			*iterator = '\0';
+			*iterator = '\0'; //bustage, modifying const *data
 			break;
 		}
 	}


Index: xmlcopyeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlcopyeditor/devel/xmlcopyeditor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xmlcopyeditor.spec	25 Feb 2009 09:10:08 -0000	1.4
+++ xmlcopyeditor.spec	12 Sep 2009 19:24:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xmlcopyeditor
 Version:        1.2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A fast, free, validating XML editor
 
 Group:          Applications/Editors
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://xml-copy-editor.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz
 Patch0:         xmlcopyeditor-1.1.0.6-defaultbrowser.patch
+Patch1:         xmlcopyeditor-1.2.0.2.gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel
@@ -22,6 +23,7 @@ find src -type f -print0 | xargs -0 chmo
 tr -d '\r' < src/copying/gpl.txt > COPYING
 chmod a-x AUTHORS COPYING NEWS
 %patch0 -p 1 -b .defaultbrowser
+%patch1 -p 1 -b .gcc44
 
 %build
 %configure
@@ -55,6 +57,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sat Sep 12 2009 Caol?n McNamara <caolanm at redhat.com> 1.2.0.2-2
+- Resolves: rhbz#508867 rhbz#511552 FTBFS
+
 * Thu Feb 05 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.2.0.2-1
 - Upstream update (http://sourceforge.net/news/?group_id=141776)
 


--- noautobuild DELETED ---


--- xmlcopyeditor-1.1.0.6-gcc43.patch DELETED ---


--- xmlcopyeditor-1.1.0.6-nuke.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:13 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested watchcommits
Message-ID: <20090912201113.3E89C10F87A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on arp-scan (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:13 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested watchbugzilla
Message-ID: <20090912201113.BBA6110F88A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on arp-scan (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:14 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested commit
Message-ID: <20090912201114.6AEF310F894@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on arp-scan (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:18 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested approveacls
Message-ID: <20090912201118.BB01C10F898@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on arp-scan (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:21 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested watchcommits
Message-ID: <20090912201121.F2E8B10F89C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on arp-scan (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:25 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested approveacls
Message-ID: <20090912201125.9C26E10F85E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on arp-scan (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:25 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested commit
Message-ID: <20090912201126.01A4510F8A1@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on arp-scan (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Sep 12 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 20:11:28 +0000
Subject: [pkgdb] arp-scan: itamarjp has requested watchbugzilla
Message-ID: <20090912201128.59E9A10F8A4@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on arp-scan (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan



From spot at fedoraproject.org  Sat Sep 12 20:12:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 20:12:08 +0000 (UTC)
Subject: rpms/mapnik/devel mapnik-missingaggdepend.patch, NONE,
	1.1 mapnik.spec, 1.17, 1.18
Message-ID: <20090912201208.1AC9811C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv718

Modified Files:
	mapnik.spec 
Added Files:
	mapnik-missingaggdepend.patch 
Log Message:
fix linking to libagg, pkgconfig file

mapnik-missingaggdepend.patch:
 SConscript |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mapnik-missingaggdepend.patch ---
--- src/SConscript.orig	2009-09-11 15:31:35.000000000 +0100
+++ src/SConscript	2009-09-11 15:32:07.000000000 +0100
@@ -53,8 +53,7 @@
     if env['BOOST_SYSTEM_REQUIRED']:
         libraries.append('boost_system%s' % env['BOOST_APPEND'])
     
-if env['INTERNAL_LIBAGG']:
-    libraries.insert(0, 'agg')
+libraries.insert(0, 'agg')
 
 if env['PLATFORM'] == 'Darwin':
     if env['FULL_LIB_PATH']:


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mapnik.spec	7 Aug 2009 01:34:44 -0000	1.17
+++ mapnik.spec	12 Sep 2009 20:12:07 -0000	1.18
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.6.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -10,6 +10,7 @@ Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
 Patch0:	   mapnik-build-viewer.patch
+Patch1:    mapnik-missingaggdepend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 11
@@ -102,6 +103,7 @@ spatial visualization library
 %setup -q -n %{name}-%{version}
 
 %patch0 -p0
+%patch1 -p0
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -196,8 +198,9 @@ includedir=%{_includedir}
 Name: %{name}
 Description: Free Toolkit for developing mapping applications
 Version: %{version}
+Requires: libagg
 Libs: -lmapnik
-Cflags: -I${includedir}/%{name} -I${includedir}/agg2
+Cflags: -I\${includedir}/%{name}
 EOF
 
 mkdir -p %{buildroot}%{_datadir}/pkgconfig/
@@ -264,6 +267,10 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1-3
+- fix mapnik to properly link to libagg (caolanm)
+- fix pkgconfig file (caolanm)
+
 * Fri Aug  7 2009 Christopher Brown <snecker[AT]fedoraproject.org> - 0.6.1-1
 - Update to 0.6.1
 - Add mapnik-build-viewer.patch



From spot at fedoraproject.org  Sat Sep 12 20:13:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 20:13:41 +0000 (UTC)
Subject: rpms/gpsdrive/devel gpsdrive-2.10pre7-usepc.patch, NONE,
	1.1 gpsdrive.spec, 1.9, 1.10 gpsdrive-2.10pre7-agg.patch, 1.1, NONE
Message-ID: <20090912201341.07FC811C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gpsdrive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1131

Modified Files:
	gpsdrive.spec 
Added Files:
	gpsdrive-2.10pre7-usepc.patch 
Removed Files:
	gpsdrive-2.10pre7-agg.patch 
Log Message:
properly detect/use mapnik, drop old libagg patch

gpsdrive-2.10pre7-usepc.patch:
 FindMapnik.cmake |   60 -------------------------------------------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

--- NEW FILE gpsdrive-2.10pre7-usepc.patch ---
diff -Nru gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake
--- gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake	2009-09-11 13:30:56.000000000 +0100
+++ gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake	2009-09-11 13:33:36.000000000 +0100
@@ -13,62 +13,4 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-
-if (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-  # in cache already
-  set(MAPNIK_FOUND TRUE)
-else (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-  find_path(MAPNIK_INCLUDE_DIR
-    NAMES
-      mapnik/config.hpp
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-  )
-
-  find_library(MAPNIK_LIBRARY
-    NAMES
-      mapnik
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-  )
-
-  if (MAPNIK_LIBRARY)
-    set(MAPNIK_FOUND TRUE)
-  endif (MAPNIK_LIBRARY)
-
-  set(MAPNIK_INCLUDE_DIRS
-    ${MAPNIK_INCLUDE_DIR}
-  )
-
-  if (MAPNIK_FOUND)
-    set(MAPNIK_LIBRARIES
-      ${MAPNIK_LIBRARIES}
-      ${MAPNIK_LIBRARY}
-    )
-  endif (MAPNIK_FOUND)
-
-  if (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES)
-     set(MAPNIK_FOUND TRUE)
-  endif (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES)
-
-  if (MAPNIK_FOUND)
-    if (NOT Mapnik_FIND_QUIETLY)
-      message(STATUS "Found Mapnik: ${MAPNIK_LIBRARIES}")
-    endif (NOT Mapnik_FIND_QUIETLY)
-  else (MAPNIK_FOUND)
-    if (Mapnik_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Mapnik")
-    endif (Mapnik_FIND_REQUIRED)
-  endif (MAPNIK_FOUND)
-
-  # show the MAPNIK_INCLUDE_DIRS and MAPNIK_LIBRARIES variables only in the advanced view
-  mark_as_advanced(MAPNIK_INCLUDE_DIRS MAPNIK_LIBRARIES)
-
-endif (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-
+pkg_check_modules (MAPNIK REQUIRED mapnik)


Index: gpsdrive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/devel/gpsdrive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gpsdrive.spec	12 Sep 2009 14:48:02 -0000	1.9
+++ gpsdrive.spec	12 Sep 2009 20:13:40 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.10
-Release: 0.3.pre7%{?dist}
+Release: 0.4.pre7%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
@@ -12,7 +12,7 @@ URL: http://www.gpsdrive.de/index.shtml
 Source0: http://www.gpsdrive.de/packages/gpsdrive-2.10pre7.tar.gz
 Source1: http://download.sourceforge.net/sourceforge/gpsdrive/openstreetmap-map-icons-minimal.tar.gz
 Patch1: gpsdrive-2.10pre7-fedora.patch
-Patch2: gpsdrive-2.10pre7-agg.patch
+Patch2: gpsdrive-2.10pre7-usepc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.0.6
@@ -57,7 +57,7 @@ Speech output is also available. MySQL i
 %setup -q -a 1 -T -D -n gpsdrive-2.10pre7
 
 %patch1 -p1
-%patch2 -p1 -b .agg
+%patch2 -p1 -b .usepc
 
 %build
 mkdir build
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-0.4.pre7
+- use caolanm's fix (now that mapnik is properly fixed), use pkgconfig to figure out mapnik cflags/libs
+
 * Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-0.3.pre7
 - mapnik needs libagg to work
 


--- gpsdrive-2.10pre7-agg.patch DELETED ---



From stevetraylen at fedoraproject.org  Sat Sep 12 20:16:08 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 12 Sep 2009 20:16:08 +0000 (UTC)
Subject: rpms/uberftp/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 uberftp.spec, 1.2, 1.3
Message-ID: <20090912201608.395A311C00CE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/uberftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1908

Modified Files:
	.cvsignore sources uberftp.spec 
Log Message:
Source to 2.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uberftp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jul 2009 07:13:46 -0000	1.2
+++ .cvsignore	12 Sep 2009 20:16:07 -0000	1.3
@@ -1 +1 @@
-uberftp-client-2.4.tar.gz
+uberftp-client-2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uberftp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jul 2009 07:13:46 -0000	1.2
+++ sources	12 Sep 2009 20:16:07 -0000	1.3
@@ -1 +1 @@
-14ec224f9661a0f565835e29137405f7  uberftp-client-2.4.tar.gz
+0415a8b2584ec5c47b879f503ee002b9  uberftp-client-2.5.tar.gz


Index: uberftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uberftp/devel/uberftp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- uberftp.spec	21 Aug 2009 16:17:16 -0000	1.2
+++ uberftp.spec	12 Sep 2009 20:16:07 -0000	1.3
@@ -6,7 +6,7 @@
 
 
 Name:           uberftp
-Version:        2.4
+Version:        2.5
 Release:        5%{?dist}
 Summary:        GridFTP-enabled ftp client
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog.mssftp Changelog copyright
 
 %changelog
+* Sat Sep 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.5-1
+- Update to uberftp-2.5
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4-5
 - rebuilt with new openssl
 



From jdieter at fedoraproject.org  Sat Sep 12 20:19:33 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Sat, 12 Sep 2009 20:19:33 +0000 (UTC)
Subject: rpms/yum-presto/devel .cvsignore, 1.10, 1.11 import.log, 1.1,
	1.2 sources, 1.10, 1.11 yum-presto.spec, 1.18, 1.19
Message-ID: <20090912201933.95E5411C00CE@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3714/devel

Modified Files:
	.cvsignore import.log sources yum-presto.spec 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 May 2009 11:19:33 -0000	1.10
+++ .cvsignore	12 Sep 2009 20:19:33 -0000	1.11
@@ -1 +1 @@
-yum-presto-0.5.0.tar.bz2
+yum-presto-0.6.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 May 2009 11:19:34 -0000	1.1
+++ import.log	12 Sep 2009 20:19:33 -0000	1.2
@@ -1 +1,2 @@
 yum-presto-0_5_0-1_fc10:HEAD:yum-presto-0.5.0-1.fc10.src.rpm:1241176734
+yum-presto-0_6_0-1_fc11:HEAD:yum-presto-0.6.0-1.fc11.src.rpm:1252786673


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 May 2009 11:19:34 -0000	1.10
+++ sources	12 Sep 2009 20:19:33 -0000	1.11
@@ -1 +1 @@
-1b292f04005220f0963d9efc45a03ef5  yum-presto-0.5.0.tar.bz2
+33cad733a4016ecd1b9e1b062e135909  yum-presto-0.6.0.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- yum-presto.spec	27 Jul 2009 08:57:36 -0000	1.18
+++ yum-presto.spec	12 Sep 2009 20:19:33 -0000	1.19
@@ -2,8 +2,8 @@
 
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.5.0
-Release: 2%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2
@@ -45,10 +45,15 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Sat Sep 12 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.0-1
+- Change savings sentence to be more grammatically correct (#517014)
+- Support reading deltainfo.xml files as well as prestodelta.xml
+- Cleanup delta packages on yum clean all (#504854)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Fri May  1 2009 Jonathan Dieter <jdieter at gmail.com> - 0.5.0-1
+* Fri May  1 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.5.0-1
 - Remove patches (now upstream)
 - Reduce summary to one-line sentence
 
@@ -76,87 +81,87 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.5-2
 - Rebuild for Python 2.6
 
-* Thu Apr 10 2008 Jonathan Dieter <jdieter at gmail.com> - 0.4.5-1
+* Thu Apr 10 2008 Jonathan Dieter <jdieter at lesbg.com> - 0.4.5-1
 - Fix bug in showing savings
 
-* Mon Apr  7 2008 Jonathan Dieter <jdieter at gmail.com> - 0.4.4-1
+* Mon Apr  7 2008 Jonathan Dieter <jdieter at lesbg.com> - 0.4.4-1
 - Show savings
 - Use setuptools for installation
 - Get Python Egg stuff working for F9
 
-* Sat Nov 17 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.3-1
+* Sat Nov 17 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.4.3-1
 - Fix README so it is now accurate for 0.4.x
 - Fix a small bug that caused AVC denials when SELinux is enabled
 
-* Fri Sep 28 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.2-1
+* Fri Sep 28 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.4.2-1
 - Fix a couple of typos that caused yum to hang if certain error paths were
   hit.
 
-* Sun Aug  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.1-1
+* Sun Aug  5 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.4.1-1
 - Applied small patch by Luke Macken to fix problems when not run directly
   from yum.
 - Fix for situation where repository may be removed and then added again
 
-* Wed Jul 11 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.0-1
+* Wed Jul 11 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.4.0-1
 - Complete rewrite (thanks, Jeremy)
 - Many features removed in preparation for inclusion in Fedora 8
 
-* Tue May  1 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.10-1
+* Tue May  1 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.10-1
 - Use new -a option to deltarpm to only check against a certain architecture.
   This allows us to work completely correctly on x86_64.
 - Add "*" to repository of deltarpm as it *doesn't* screw up depsolving.
 
-* Sun Apr 15 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.9-1
+* Sun Apr 15 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.9-1
 - Modifications to make yum-presto compatible with both FC6 and Rawhide
 - Many other bugfixes - see ChangeLog
 
-* Fri Apr  6 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.8-1
+* Fri Apr  6 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.8-1
 - Small bugfix
 
-* Thu Apr  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.7-1
+* Thu Apr  5 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.7-1
 - Conf file cleanup
 
-* Thu Apr  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.6-1
+* Thu Apr  5 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.6-1
 - Housecleaning in preparation for Extras
 
-* Wed Apr  4 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.5-1
+* Wed Apr  4 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.5-1
 - Fix many small bugs
 - Improve logging
 - Use full path to yum-plugins rather than macro to fix x86_64 bug
 
-* Tue Apr  3 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.4-1
+* Tue Apr  3 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.4-1
 - Build rpms in separate thread to help performance
 - Fix miscellaneous spec file errors
 
-* Fri Mar 30 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.3-1
+* Fri Mar 30 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.3-1
 - Upstream changed way the presto.xml.gz stores sequence information
 
-* Fri Mar 30 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.2-2
+* Fri Mar 30 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.2-2
 - Take ownership of %%{_datadir}/presto
 
-* Thu Mar 29 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.2-1
+* Thu Mar 29 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.2-1
 - Changes to remove rpmlint complaints
 
-* Thu Mar 29 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.1-1
+* Thu Mar 29 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.1-1
 - Fix minor bug with importing public gpg keys.
 - Update README
 
-* Wed Mar 28 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.0-1
+* Wed Mar 28 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.0-1
 - Take over downloading of deltarpms so we can fallback to
   yum if the building of the rpm fails.
 
-* Mon Mar 26 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2.9-1
+* Mon Mar 26 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2.9-1
 - Added logging to /var/log/presto.log
 - Fixed crash bug
 - Properly exit when unable to apply deltarpm
 - Do a full (slow) MD5 check when checking to see if
   delta will apply cleanly
 
-* Sat Mar 24 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2.3-1
+* Sat Mar 24 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2.3-1
 - Rebase to upstream
 
-* Fri Mar 23 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2.1-1
+* Fri Mar 23 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2.1-1
 - Rebase to upstream
 
-* Thu Mar 22 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2-1
+* Thu Mar 22 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2-1
 - Initial release



From spot at fedoraproject.org  Sat Sep 12 20:26:23 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 20:26:23 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.71,1.72
Message-ID: <20090912202623.7A41C11C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5299

Modified Files:
	openvrml.spec 
Log Message:
undo arch-specific deps on gecko-libs and java


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- openvrml.spec	26 Aug 2009 08:14:40 -0000	1.71
+++ openvrml.spec	12 Sep 2009 20:26:23 -0000	1.72
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -24,8 +24,15 @@ BuildRequires:  gtk2-devel >= 2.12
 BuildRequires:  gtkglext-devel
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-Requires:       gecko-libs%{?_isa} >= 1.9.1
-Requires:       java%{?_isa}
+# You cannot use %%{?isa} to map these requires to an architecture target
+# The only Requires which have %%{?isa} are those matching the name of the package
+# Since both "gecko-libs" and "java" are not the name of the packages that provide them
+# (they're manually defined Provides) they do not have %%{?isa}. You should ask the maintainer
+# of those packages to add explicit provides that use %%{?isa} (in addition to the normal ones).
+# Alternately, you could use a file dependency here, at least for "java", to force an architecture
+# match. -Tom Callaway <tcallawa at redhat.com>
+Requires:       gecko-libs >= 1.9.1
+Requires:       java
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -188,6 +195,10 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.18.3-3
+- undo arch-specific deps on gecko-libs and java (%%{?isa} doesn't work like you think it works)
+  for more details, see the comment in the spec file
+
 * Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.18.3-2
 - Rebuild for broken deps
 



From dodji at fedoraproject.org  Sat Sep 12 20:28:21 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat, 12 Sep 2009 20:28:21 +0000 (UTC)
Subject: rpms/nemiver/devel nemiver.spec,1.30,1.31
Message-ID: <20090912202821.AC1E611C00CE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5713

Modified Files:
	nemiver.spec 
Log Message:
Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
- Update to new upstream release (0.7.2)




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nemiver.spec	1 Aug 2009 11:10:34 -0000	1.30
+++ nemiver.spec	12 Sep 2009 20:28:21 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.1
+Version:	0.7.2
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -143,6 +143,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
+- Update to new upstream release (0.7.2)
+
 * Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
 - Update to new upstream release (0.7.1)
 



From dodji at fedoraproject.org  Sat Sep 12 20:33:20 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat, 12 Sep 2009 20:33:20 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <20090912203320.E27B211C00CE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6906

Modified Files:
	.cvsignore sources 
Log Message:
Upload Nemiver 0.7.2 tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Aug 2009 11:09:40 -0000	1.19
+++ .cvsignore	12 Sep 2009 20:33:19 -0000	1.20
@@ -1,3 +1,4 @@
 nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
+nemiver-0.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Aug 2009 11:09:40 -0000	1.19
+++ sources	12 Sep 2009 20:33:20 -0000	1.20
@@ -1,3 +1,4 @@
 eeb0f56cf70d26746f79486bd5437ac7  nemiver-0.6.7.tar.bz2
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
+a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2



From dodji at fedoraproject.org  Sat Sep 12 20:39:10 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat, 12 Sep 2009 20:39:10 +0000 (UTC)
Subject: rpms/nemiver/F-11 nemiver.spec,1.27,1.28
Message-ID: <20090912203910.365E811C00CE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8186

Modified Files:
	nemiver.spec 
Log Message:
* Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
- Update to new upstream release (0.7.2)




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/nemiver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nemiver.spec	1 Aug 2009 11:13:30 -0000	1.27
+++ nemiver.spec	12 Sep 2009 20:39:10 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.1
+Version:	0.7.2
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -143,6 +143,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
+- Update to new upstream release (0.7.2)
+
 * Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
 - Update to new upstream release (0.7.1)
 



From dodji at fedoraproject.org  Sat Sep 12 20:43:28 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat, 12 Sep 2009 20:43:28 +0000 (UTC)
Subject: rpms/nemiver/F-11 .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <20090912204328.9C40211C00CE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9112

Modified Files:
	.cvsignore sources 
Log Message:
Updated to nemiver tarball 0.7.2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Aug 2009 11:13:30 -0000	1.19
+++ .cvsignore	12 Sep 2009 20:43:28 -0000	1.20
@@ -1,3 +1,4 @@
 nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
+nemiver-0.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Aug 2009 11:13:30 -0000	1.19
+++ sources	12 Sep 2009 20:43:28 -0000	1.20
@@ -1,3 +1,4 @@
 eeb0f56cf70d26746f79486bd5437ac7  nemiver-0.6.7.tar.bz2
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
+a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2



From dodji at fedoraproject.org  Sat Sep 12 20:45:21 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat, 12 Sep 2009 20:45:21 +0000 (UTC)
Subject: rpms/nemiver/F-10 nemiver.spec,1.27,1.28
Message-ID: <20090912204521.D9EC411C0423@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9574

Modified Files:
	nemiver.spec 
Log Message:
* Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
- Update to new upstream release (0.7.2)




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nemiver.spec	1 Aug 2009 11:15:19 -0000	1.27
+++ nemiver.spec	12 Sep 2009 20:45:21 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.1
+Version:	0.7.2
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -156,6 +156,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
+- Update to new upstream release (0.7.2)
+
 * Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
 - Update to new upstream release (0.7.1)
 



From akurtakov at fedoraproject.org  Sat Sep 12 20:55:47 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 20:55:47 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.17,1.18
Message-ID: <20090912205547.D872811C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19788/devel

Modified Files:
	maven-scm.spec 
Log Message:
BR plexus-maven-plugin.


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- maven-scm.spec	12 Sep 2009 16:56:56 -0000	1.17
+++ maven-scm.spec	12 Sep 2009 20:55:47 -0000	1.18
@@ -77,6 +77,7 @@ BuildRequires:  tomcat5
 BuildRequires:  maven-shared-plugin-testing-harness
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  bzr
+BuildRequires:  plexus-maven-plugin
 
 Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
@@ -214,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-3
 - BR maven-surefire-provider-junit.
+- BR plexus-maven-plugin.
 
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-2
 - Add doxia-sitetools BR.



From dodji at fedoraproject.org  Sat Sep 12 20:58:24 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat, 12 Sep 2009 20:58:24 +0000 (UTC)
Subject: rpms/nemiver/F-10 .cvsignore,1.17,1.18 sources,1.17,1.18
Message-ID: <20090912205824.2FC3F11C00CE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21445

Modified Files:
	.cvsignore sources 
Log Message:
Upload Nemiver 0.7.2 tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	1 Aug 2009 11:15:19 -0000	1.17
+++ .cvsignore	12 Sep 2009 20:58:23 -0000	1.18
@@ -1,3 +1,4 @@
 nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
+nemiver-0.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	1 Aug 2009 11:15:19 -0000	1.17
+++ sources	12 Sep 2009 20:58:23 -0000	1.18
@@ -1,3 +1,4 @@
 eeb0f56cf70d26746f79486bd5437ac7  nemiver-0.6.7.tar.bz2
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
+a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2



From thias at fedoraproject.org  Sat Sep 12 21:02:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 21:02:03 +0000 (UTC)
Subject: rpms/fillets-ng/F-11 .cvsignore, 1.7, 1.8 fillets-ng.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <20090912210203.DA52611C0418@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22907/F-11

Modified Files:
	.cvsignore fillets-ng.spec sources 
Log Message:
Update to 0.9.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Feb 2009 20:42:10 -0000	1.7
+++ .cvsignore	12 Sep 2009 21:02:02 -0000	1.8
@@ -1 +1 @@
-fillets-ng-0.8.1.tar.gz
+fillets-ng-0.9.1.tar.gz


Index: fillets-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/F-11/fillets-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fillets-ng.spec	24 Feb 2009 17:05:14 -0000	1.18
+++ fillets-ng.spec	12 Sep 2009 21:02:02 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Fish Fillets Next Generation, a puzzle game with 70 levels
 Name: fillets-ng
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
@@ -11,7 +11,7 @@ Source2: fillets.png
 Patch0: fillets-ng-0.8.1-gcc43.patch
 Patch1: fillets-ng-0.8.0-fribidi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: fillets-ng-data >= 0.8.1
+Requires: fillets-ng-data >= 0.9.0
 BuildRequires: SDL-devel
 BuildRequires: SDL_mixer-devel
 BuildRequires: SDL_image-devel
@@ -85,6 +85,12 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 0.9.1-1
+- Update to 0.9.1.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Feb 2009 20:42:10 -0000	1.7
+++ sources	12 Sep 2009 21:02:02 -0000	1.8
@@ -1 +1 @@
-d581b18c648336cf7fd0f0551068625a  fillets-ng-0.8.1.tar.gz
+13bb4f98d73bc0b6aff39ee1c9582adb  fillets-ng-0.9.1.tar.gz



From thias at fedoraproject.org  Sat Sep 12 21:02:04 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 21:02:04 +0000 (UTC)
Subject: rpms/fillets-ng/devel .cvsignore, 1.7, 1.8 fillets-ng.spec, 1.19,
	1.20 sources, 1.7, 1.8
Message-ID: <20090912210204.AF80411C0427@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22907/devel

Modified Files:
	.cvsignore fillets-ng.spec sources 
Log Message:
Update to 0.9.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Feb 2009 20:42:10 -0000	1.7
+++ .cvsignore	12 Sep 2009 21:02:03 -0000	1.8
@@ -1 +1 @@
-fillets-ng-0.8.1.tar.gz
+fillets-ng-0.9.1.tar.gz


Index: fillets-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fillets-ng.spec	24 Jul 2009 22:45:57 -0000	1.19
+++ fillets-ng.spec	12 Sep 2009 21:02:03 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Fish Fillets Next Generation, a puzzle game with 70 levels
 Name: fillets-ng
-Version: 0.8.1
-Release: 3%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
@@ -11,7 +11,7 @@ Source2: fillets.png
 Patch0: fillets-ng-0.8.1-gcc43.patch
 Patch1: fillets-ng-0.8.0-fribidi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: fillets-ng-data >= 0.8.1
+Requires: fillets-ng-data >= 0.9.0
 BuildRequires: SDL-devel
 BuildRequires: SDL_mixer-devel
 BuildRequires: SDL_image-devel
@@ -85,6 +85,9 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 0.9.1-1
+- Update to 0.9.1.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Feb 2009 20:42:10 -0000	1.7
+++ sources	12 Sep 2009 21:02:03 -0000	1.8
@@ -1 +1 @@
-d581b18c648336cf7fd0f0551068625a  fillets-ng-0.8.1.tar.gz
+13bb4f98d73bc0b6aff39ee1c9582adb  fillets-ng-0.9.1.tar.gz



From thias at fedoraproject.org  Sat Sep 12 21:02:35 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 21:02:35 +0000 (UTC)
Subject: rpms/fillets-ng-data/F-11 .cvsignore, 1.6, 1.7 fillets-ng-data.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090912210235.653DB11C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng-data/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23208/F-11

Modified Files:
	.cvsignore fillets-ng-data.spec sources 
Log Message:
Update to 0.9.0 and don't replace fonts with symlinks (#505192).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Feb 2009 20:43:52 -0000	1.6
+++ .cvsignore	12 Sep 2009 21:02:33 -0000	1.7
@@ -1 +1 @@
-fillets-ng-data-0.8.1.tar.gz
+fillets-ng-data-0.9.0.tar.gz


Index: fillets-ng-data.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/F-11/fillets-ng-data.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fillets-ng-data.spec	31 Mar 2009 14:22:02 -0000	1.12
+++ fillets-ng-data.spec	12 Sep 2009 21:02:33 -0000	1.13
@@ -1,18 +1,16 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
-Version: 0.8.1
-Release: 3
+Version: 0.9.0
+Release: 1
 # The GPLv2 is included and nothing indicates "any later version". Exceptions :
 # - images/menu/flags/ is Public Domain
-# - font/ is GPLv2+ (taken from "freefont") but we replace them anyway
+# - font/ is GPLv2+ (taken from "freefont")
 License: GPLv2
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
 Source: http://downloads.sf.net/fillets/fillets-ng-data-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: fillets-ng >= 0.8.1
-# For the TTF file used, instead of duplicating it 3 times here
-Requires: gnu-free-sans-fonts
+Requires: fillets-ng >= 0.9.0
 Obsoletes: fillets-ng-data-cs <= 0.6.0
 BuildArch: noarch
 
@@ -40,13 +38,6 @@ This package contains the data files req
 %{__mkdir_p} %{buildroot}%{_datadir}/fillets-ng
 %{__cp} -a * %{buildroot}%{_datadir}/fillets-ng/
 
-# Replace bundled copy of the fonts with symlinks to the original one
-%{__rm} -f %{buildroot}%{_datadir}/fillets-ng/font/copyright
-for FONTFILE in %{buildroot}%{_datadir}/fillets-ng/font/*.ttf; do
-    %{__rm} -f ${FONTFILE}
-    %{__ln_s} %{_datadir}/fonts/freefont/FreeSansBold.ttf ${FONTFILE}
-done
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -60,6 +51,14 @@ done
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 0.9.0-1
+- Update to 0.9.0.
+- Don't replace fonts with symlinks, as it's fragile (see #505192) and the files
+  have changed names now.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.1-3
 - fix broken font requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Feb 2009 20:43:52 -0000	1.6
+++ sources	12 Sep 2009 21:02:34 -0000	1.7
@@ -1 +1 @@
-5919ce057626d3ee565cc7cc71a80f7b  fillets-ng-data-0.8.1.tar.gz
+5d733a990212a4b038d1ee76f700c54e  fillets-ng-data-0.9.0.tar.gz



From thias at fedoraproject.org  Sat Sep 12 21:02:35 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 21:02:35 +0000 (UTC)
Subject: rpms/fillets-ng-data/devel .cvsignore, 1.6, 1.7 fillets-ng-data.spec,
	1.13, 1.14 sources, 1.6, 1.7
Message-ID: <20090912210235.6DD7A11C02C8@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23208/devel

Modified Files:
	.cvsignore fillets-ng-data.spec sources 
Log Message:
Update to 0.9.0 and don't replace fonts with symlinks (#505192).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Feb 2009 20:43:52 -0000	1.6
+++ .cvsignore	12 Sep 2009 21:02:34 -0000	1.7
@@ -1 +1 @@
-fillets-ng-data-0.8.1.tar.gz
+fillets-ng-data-0.9.0.tar.gz


Index: fillets-ng-data.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/fillets-ng-data.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fillets-ng-data.spec	24 Jul 2009 22:46:12 -0000	1.13
+++ fillets-ng-data.spec	12 Sep 2009 21:02:34 -0000	1.14
@@ -1,18 +1,16 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
-Version: 0.8.1
-Release: 4
+Version: 0.9.0
+Release: 1
 # The GPLv2 is included and nothing indicates "any later version". Exceptions :
 # - images/menu/flags/ is Public Domain
-# - font/ is GPLv2+ (taken from "freefont") but we replace them anyway
+# - font/ is GPLv2+ (taken from "freefont")
 License: GPLv2
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
 Source: http://downloads.sf.net/fillets/fillets-ng-data-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: fillets-ng >= 0.8.1
-# For the TTF file used, instead of duplicating it 3 times here
-Requires: gnu-free-sans-fonts
+Requires: fillets-ng >= 0.9.0
 Obsoletes: fillets-ng-data-cs <= 0.6.0
 BuildArch: noarch
 
@@ -40,13 +38,6 @@ This package contains the data files req
 %{__mkdir_p} %{buildroot}%{_datadir}/fillets-ng
 %{__cp} -a * %{buildroot}%{_datadir}/fillets-ng/
 
-# Replace bundled copy of the fonts with symlinks to the original one
-%{__rm} -f %{buildroot}%{_datadir}/fillets-ng/font/copyright
-for FONTFILE in %{buildroot}%{_datadir}/fillets-ng/font/*.ttf; do
-    %{__rm} -f ${FONTFILE}
-    %{__ln_s} %{_datadir}/fonts/freefont/FreeSansBold.ttf ${FONTFILE}
-done
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -60,6 +51,11 @@ done
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 0.9.0-1
+- Update to 0.9.0.
+- Don't replace fonts with symlinks, as it's fragile (see #505192) and the files
+  have changed names now.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Feb 2009 20:43:52 -0000	1.6
+++ sources	12 Sep 2009 21:02:34 -0000	1.7
@@ -1 +1 @@
-5919ce057626d3ee565cc7cc71a80f7b  fillets-ng-data-0.8.1.tar.gz
+5d733a990212a4b038d1ee76f700c54e  fillets-ng-data-0.9.0.tar.gz



From akurtakov at fedoraproject.org  Sat Sep 12 21:10:47 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 21:10:47 +0000 (UTC)
Subject: rpms/plexus-maven-plugin/devel plexus-maven-plugin.spec,1.13,1.14
Message-ID: <20090912211047.B746B11C043D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27737/devel

Modified Files:
	plexus-maven-plugin.spec 
Log Message:
Really require plexus-cdc.


Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- plexus-maven-plugin.spec	20 Aug 2009 20:08:55 -0000	1.13
+++ plexus-maven-plugin.spec	12 Sep 2009 21:10:46 -0000	1.14
@@ -35,7 +35,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.3.5
-Release:        1.1%{?dist}
+Release:        1.2%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        MIT
@@ -72,7 +72,7 @@ BuildRequires:  plexus-runtime-builder >
 Requires:       maven2 >= 2.0.4
 Requires:       maven2-common-poms >= 1.0
 Requires:       plexus-appserver >= 1.0-0.a5.3
-BuildRequires:  plexus-cdc >= 1.0-0.5.a10
+Requires:       plexus-cdc >= 1.0-0.5.a10
 Requires:       plexus-container-default
 Requires:       plexus-runtime-builder >= 1.0-0.a9.2
 
@@ -147,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Sun Sep 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.5-1.2
+- Really require plexus-cdc.
+
 * Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.3.5-1.1
 - Update to 1.3.5 (courtesy Ralph Apel and Deepak Bhole)
 - Remove gcj support



From thias at fedoraproject.org  Sat Sep 12 21:15:10 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 21:15:10 +0000 (UTC)
Subject: rpms/xmms-crossfade/F-11 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xmms-crossfade.spec, 1.17, 1.18
Message-ID: <20090912211510.D261211C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29731/F-11

Modified Files:
	.cvsignore sources xmms-crossfade.spec 
Log Message:
Also build Audacious plugin (mschwendt, #518178).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Aug 2007 08:45:37 -0000	1.7
+++ .cvsignore	12 Sep 2009 21:15:09 -0000	1.8
@@ -1 +1 @@
-xmms-crossfade-0.3.12.tar.gz
+xmms-crossfade-0.3.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2007 08:45:37 -0000	1.7
+++ sources	12 Sep 2009 21:15:10 -0000	1.8
@@ -1 +1 @@
-fe009c43948d01347e4ecdf8e5fe39bf  xmms-crossfade-0.3.12.tar.gz
+026c52544c7f3193d384288c9f8296aa  xmms-crossfade-0.3.14.tar.gz


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-11/xmms-crossfade.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xmms-crossfade.spec	26 Feb 2009 10:17:20 -0000	1.17
+++ xmms-crossfade.spec	12 Sep 2009 21:15:10 -0000	1.18
@@ -1,9 +1,13 @@
 %define xmms_outputdir %(xmms-config --output-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Output)
 
+%define audacious_outputdir %(pkg-config audacious --variable=output_plugin_dir)
+
+%define audacious_builddir audacious-crossfade-build
+
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
-Version: 0.3.12
-Release: 4
+Version: 0.3.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
@@ -17,19 +21,40 @@ A plugin for XMMS featuring crossfading,
 a gap-killer.
 
 
+%package -n audacious-plugins-crossfade
+Summary: Audio crossfade plugin for Audacious
+Requires: audacious
+BuildRequires: audacious, audacious-devel
+
+%description -n audacious-plugins-crossfade
+A plugin for Audacious featuring crossfading, continuous output between
+songs and a gap-killer.
+
+
 %prep
-%setup -q
+%setup -q -T -b 0
+# extract tarball 2nd time for audacious plugin build
+mkdir %{audacious_builddir} ; tar xfz %{SOURCE0} -C %{audacious_builddir}
 
 
 %build
-%configure --libdir=%{xmms_outputdir}
+%configure --enable-player=xmms --libdir=%{xmms_outputdir}
 %{__make} %{?_smp_mflags}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%configure --enable-player=audacious --libdir=%{audacious_outputdir}
+%{__make} %{?_smp_mflags}
+cd -
+
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%{__make} install DESTDIR=%{buildroot}
+cd -
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -42,7 +67,17 @@ a gap-killer.
 %{xmms_outputdir}/libcrossfade.so
 
 
+%files -n audacious-plugins-crossfade
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%exclude %{audacious_outputdir}/libcrossfade.la
+%{audacious_outputdir}/libcrossfade.so
+
+
 %changelog
+* Wed Aug 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.14-1
+- Also build Audacious plugin.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From thias at fedoraproject.org  Sat Sep 12 21:15:12 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 12 Sep 2009 21:15:12 +0000 (UTC)
Subject: rpms/xmms-crossfade/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xmms-crossfade.spec, 1.18, 1.19
Message-ID: <20090912211512.867A011C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29731/devel

Modified Files:
	.cvsignore sources xmms-crossfade.spec 
Log Message:
Also build Audacious plugin (mschwendt, #518178).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Aug 2007 08:45:37 -0000	1.7
+++ .cvsignore	12 Sep 2009 21:15:11 -0000	1.8
@@ -1 +1 @@
-xmms-crossfade-0.3.12.tar.gz
+xmms-crossfade-0.3.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2007 08:45:37 -0000	1.7
+++ sources	12 Sep 2009 21:15:11 -0000	1.8
@@ -1 +1 @@
-fe009c43948d01347e4ecdf8e5fe39bf  xmms-crossfade-0.3.12.tar.gz
+026c52544c7f3193d384288c9f8296aa  xmms-crossfade-0.3.14.tar.gz


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/xmms-crossfade.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xmms-crossfade.spec	27 Jul 2009 08:16:15 -0000	1.18
+++ xmms-crossfade.spec	12 Sep 2009 21:15:11 -0000	1.19
@@ -1,9 +1,13 @@
 %define xmms_outputdir %(xmms-config --output-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Output)
 
+%define audacious_outputdir %(pkg-config audacious --variable=output_plugin_dir)
+
+%define audacious_builddir audacious-crossfade-build
+
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
-Version: 0.3.12
-Release: 5
+Version: 0.3.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
@@ -17,19 +21,40 @@ A plugin for XMMS featuring crossfading,
 a gap-killer.
 
 
+%package -n audacious-plugins-crossfade
+Summary: Audio crossfade plugin for Audacious
+Requires: audacious
+BuildRequires: audacious, audacious-devel
+
+%description -n audacious-plugins-crossfade
+A plugin for Audacious featuring crossfading, continuous output between
+songs and a gap-killer.
+
+
 %prep
-%setup -q
+%setup -q -T -b 0
+# extract tarball 2nd time for audacious plugin build
+mkdir %{audacious_builddir} ; tar xfz %{SOURCE0} -C %{audacious_builddir}
 
 
 %build
-%configure --libdir=%{xmms_outputdir}
+%configure --enable-player=xmms --libdir=%{xmms_outputdir}
+%{__make} %{?_smp_mflags}
+
+cd %{audacious_builddir}/%{name}-%{version}
+%configure --enable-player=audacious --libdir=%{audacious_outputdir}
 %{__make} %{?_smp_mflags}
+cd -
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%{__make} install DESTDIR=%{buildroot}
+cd -
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -42,9 +67,16 @@ a gap-killer.
 %{xmms_outputdir}/libcrossfade.so
 
 
+%files -n audacious-plugins-crossfade
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%exclude %{audacious_outputdir}/libcrossfade.la
+%{audacious_outputdir}/libcrossfade.so
+
+
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Aug 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.14-1
+- Also build Audacious plugin.
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From akurtakov at fedoraproject.org  Sat Sep 12 21:20:53 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 21:20:53 +0000 (UTC)
Subject: rpms/plexus-maven-plugin/devel plexus-maven-plugin.spec,1.14,1.15
Message-ID: <20090912212053.7668011C043A@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2561/devel

Modified Files:
	plexus-maven-plugin.spec 
Log Message:
BR maven-doxia-sitetools.


Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- plexus-maven-plugin.spec	12 Sep 2009 21:10:46 -0000	1.14
+++ plexus-maven-plugin.spec	12 Sep 2009 21:20:52 -0000	1.15
@@ -35,7 +35,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.3.5
-Release:        1.2%{?dist}
+Release:        1.3%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        MIT
@@ -64,6 +64,7 @@ BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-common-poms >= 1.0
+BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-appserver >= 1.0-0.a5.3
 BuildRequires:  plexus-cdc >= 1.0-0.5.a10
 BuildRequires:  plexus-container-default
@@ -147,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Sun Sep 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.5-1.3
+- BR maven-doxia-sitetools.
+
 * Sun Sep 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.5-1.2
 - Really require plexus-cdc.
 



From akurtakov at fedoraproject.org  Sat Sep 12 21:29:38 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 12 Sep 2009 21:29:38 +0000 (UTC)
Subject: rpms/plexus-maven-plugin/devel plexus-maven-plugin.spec,1.15,1.16
Message-ID: <20090912212938.E957911C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13429/devel

Modified Files:
	plexus-maven-plugin.spec 
Log Message:
 BR maven-surefire-provider-junit.


Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- plexus-maven-plugin.spec	12 Sep 2009 21:20:52 -0000	1.15
+++ plexus-maven-plugin.spec	12 Sep 2009 21:29:38 -0000	1.16
@@ -65,6 +65,7 @@ BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  maven-doxia-sitetools
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  plexus-appserver >= 1.0-0.a5.3
 BuildRequires:  plexus-cdc >= 1.0-0.5.a10
 BuildRequires:  plexus-container-default
@@ -150,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Sep 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.5-1.3
 - BR maven-doxia-sitetools.
+- BR maven-surefire-provider-junit.
 
 * Sun Sep 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.5-1.2
 - Really require plexus-cdc.



From radford at fedoraproject.org  Sat Sep 12 21:51:07 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Sat, 12 Sep 2009 21:51:07 +0000 (UTC)
Subject: rpms/dkim-milter/devel dkim-milter.spec, 1.9, 1.10 dkim-milter, 1.1,
	1.2
Message-ID: <20090912215108.1CA6A11C00CE@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8552

Modified Files:
	dkim-milter.spec dkim-milter 
Log Message:
move pid file for better selinux compatibility



Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dkim-milter.spec	21 Aug 2009 13:05:15 -0000	1.9
+++ dkim-milter.spec	12 Sep 2009 21:51:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           dkim-milter
 Version:        2.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -126,6 +126,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sat Sep 12 2009 Jim Radford <radford at blackbean.org> - 2.8.3-3
+- init script cleanup to help selinux
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.3-2
 - rebuilt with new openssl
 


Index: dkim-milter
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dkim-milter	1 Apr 2008 03:34:38 -0000	1.1
+++ dkim-milter	12 Sep 2009 21:51:05 -0000	1.2
@@ -7,7 +7,7 @@
 # processname: dkim-filter
 # config:      /etc/mail/dkim-milter/dkim-milter.conf
 # config:      /etc/sysconfig/dkim-milter
-# pidfile:     /var/run/dkim-milter.pid
+# pidfile:     /var/run/dkim-milter/dkim-milter.pid
 
 # Source function library.
 . /etc/init.d/functions
@@ -17,7 +17,7 @@ name=dkim-milter
 prog=dkim-filter
 prog_with_path=/usr/sbin/${prog}
 user=${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 config=/etc/mail/${name}/${prog}.conf
 
 SOCKET=local:/var/run/${name}/${name}.sock
@@ -26,8 +26,6 @@ EXTRA_FLAGS=""
 
 start() {
 	echo -n "Starting ${desc} (${prog}): "
-        touch ${pidfile}
-        chown ${user}:${user} ${pidfile}
         daemon --user ${user} ${prog_with_path} -x ${config} -P ${pidfile} -p ${SOCKET} ${EXTRA_FLAGS}
         RETVAL=$?
         echo



From mclasen at fedoraproject.org  Sat Sep 12 21:52:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 12 Sep 2009 21:52:01 +0000 (UTC)
Subject: rpms/alacarte/devel alacarte.spec,1.58,1.59
Message-ID: <20090912215201.D48C611C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11753/devel

Modified Files:
	alacarte.spec 
Log Message:
Bump gnome-menus requires



Index: alacarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- alacarte.spec	8 Sep 2009 21:27:09 -0000	1.58
+++ alacarte.spec	12 Sep 2009 21:52:01 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.12.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -19,7 +19,7 @@ BuildRequires:  gnome-menus-devel >= 2.2
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 Requires:       pygtk2, gnome-python2-gconf
-Requires:       gnome-menus >= 2.15.4
+Requires:       gnome-menus >= 2.27.92
 
 Patch0:		undo-delete.patch
 
@@ -79,6 +79,9 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
+* Sat Sep 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-2
+- Bump the gnome-menus requires
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-1
 - Update to 0.12.3
 



From rdieter at fedoraproject.org  Sat Sep 12 21:53:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 21:53:24 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.86,1.87
Message-ID: <20090912215324.D93DC11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14439

Modified Files:
	kde-settings.spec 
Log Message:
* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6.1
- kdm: fix up %post, s/oxygen-air/Constantine/



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- kde-settings.spec	8 Sep 2009 15:23:33 -0000	1.86
+++ kde-settings.spec	12 Sep 2009 21:53:24 -0000	1.87
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}
+Release: %{rel}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -107,7 +107,7 @@ touch --no-create %{_datadir}/kde-settin
 # kdm v3 themes don't work (#444730)
 # this hack assumes %_datadir != %_kde4_datadir
 (grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/oxygen-air|" \
+ sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/Constantine|" \
  %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
 
@@ -150,6 +150,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6.1
+- kdm: fix up %%post, s/oxygen-air/Constantine/
+
 * Thu Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6
 - konversationrc: preconfigure #fedora #fedora-kde #kde #konversation channels
 - kdmrc: Theme=.../Constantine



From rdieter at fedoraproject.org  Sat Sep 12 22:01:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 22:01:13 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.3,
	1.4
Message-ID: <20090912220113.E5DEB11C0418@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24126

Modified Files:
	constantine-kde-theme.spec 
Log Message:
* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 11.90.3-3
- Provides: system-kde-theme system-kdm-theme system-ksplash-theme (f12)
- Provides: constantine-kdm-theme constantine-ksplash-theme



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- constantine-kde-theme.spec	8 Sep 2009 16:20:58 -0000	1.3
+++ constantine-kde-theme.spec	12 Sep 2009 22:01:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
 Version:	11.90.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -18,7 +18,14 @@ Requires:	system-logos
 Requires:	constantine-backgrounds >= 11.90.2-1
 Requires:	constantine-backgrounds-kde >= 11.90.2-1
 
+Provides:	constantine-kdm-theme = %{version}-%{release}
+Provides:	constantine-ksplash-theme = %{version}-%{release}
 
+%if 0%{?fedora} == 12
+Provides:	system-kde-theme = %{version}-%{release}
+Provides:	system-kdm-theme = %{version}-%{release}
+Provides:	system-ksplash-theme = %{version}-%{release}
+%endif
 
 %description
 This is Constantine KDE Theme Artwork containing KSplash theme and KDM theme.
@@ -95,6 +102,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 11.90.3-3
+- Provides: system-kde-theme system-kdm-theme system-ksplash-theme (f12)
+- Provides: constantine-kdm-theme constantine-ksplash-theme
+
 * Tue Sep 09 2009 Jaroslav Reznik <jreznik at redhat.com> 11.90.3-1
 - fixes widescreen background
 



From bernie at fedoraproject.org  Sat Sep 12 22:01:11 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Sat, 12 Sep 2009 22:01:11 +0000 (UTC)
Subject: rpms/festival/devel festival.spec, 1.42,
	1.43 festival-1.96-speechtools-buildesdmodule.patch, 1.1, NONE
Message-ID: <20090912220111.5854411C0418@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/festival/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23873

Modified Files:
	festival.spec 
Removed Files:
	festival-1.96-speechtools-buildesdmodule.patch 
Log Message:
* Thu Sep 10 2009 Bernie Innocenti <bernie at codewiz.org> - 1.96-15
- Disable esd support (resolves: rhbz#492982)



Index: festival.spec
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/festival.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- festival.spec	30 Jul 2009 00:13:16 -0000	1.42
+++ festival.spec	12 Sep 2009 22:01:10 -0000	1.43
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -78,13 +78,10 @@ Patch2: festival_buildroot.patch
 # Use shared libraries
 Patch3: festival-1.96-speechtools-shared-build.patch
 
-# Build (but don't enable by default) the ESD module
-Patch4: festival-1.96-speechtools-buildesdmodule.patch
-
 # Fix a coding error (see bug #162137). Need to upstream.
 Patch5: festival-1.96-speechtools-rateconvtrivialbug.patch
 
-# Link libs with libm, libtermcap, and libesd (see bug #198190).
+# Link libs with libm, libtermcap (see bug #198190).
 # Need to upstream this.
 Patch6: festival-1.96-speechtools-linklibswithotherlibs.patch
 
@@ -140,7 +137,7 @@ Patch94: festival-use-pacat.patch
 Patch95: gcc44.patch
 
 BuildRequires: tetex
-BuildRequires: ncurses-devel, esound-devel
+BuildRequires: ncurses-devel
 
 # Requires: festival-voice
 # The hard dep below provides a festival-voice, no need to require it here.
@@ -491,7 +488,6 @@ chmod -x speech_tools/base_class/string/
 %patch1 -p1 -b .nitech
 %patch2 -p1 -b .buildrootrefs
 %patch3 -p1 -b .shared
-%patch4 -p1 -b .esd
 %patch5 -p1 -b .bugfix
 %patch6 -p1 -b .liblinking
 %patch7 -p1 -b .cxx
@@ -879,6 +875,9 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Bernie Innocenti <bernie at codewiz.org> - 1.96-15
+- Disable esd support (resolves: rhbz#492982)
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.96-14
 - Rebuild
 


--- festival-1.96-speechtools-buildesdmodule.patch DELETED ---



From rdieter at fedoraproject.org  Sat Sep 12 22:02:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 22:02:23 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.87,1.88
Message-ID: <20090912220223.B67C911C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25445

Modified Files:
	kde-settings.spec 
Log Message:
-kdm: Requires: system-kdm-theme



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kde-settings.spec	12 Sep 2009 21:53:24 -0000	1.87
+++ kde-settings.spec	12 Sep 2009 22:02:23 -0000	1.88
@@ -37,7 +37,7 @@ Obsoletes: kde-config < %{version}-%{rel
 Summary: Configuration files for kdm
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
-#Requires: system-kdm-theme
+Requires: system-kdm-theme
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
@@ -151,7 +151,8 @@ touch --no-create %{_datadir}/kde-settin
 
 %changelog
 * Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6.1
-- kdm: fix up %%post, s/oxygen-air/Constantine/
+- -kdm: fix up %%post, s/oxygen-air/Constantine/
+- -kdm: Requires: system-kdm-theme
 
 * Thu Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6
 - konversationrc: preconfigure #fedora #fedora-kde #kde #konversation channels



From rdieter at fedoraproject.org  Sat Sep 12 22:41:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 22:41:59 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.285,1.286
Message-ID: <20090912224200.7723911C043D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6658

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- -python-applet: Provides: plasma-scriptengine-python
- Requires: system-ksplash-theme (f12+,rhel6+)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- kdebase-workspace.spec	11 Sep 2009 15:32:34 -0000	1.285
+++ kdebase-workspace.spec	12 Sep 2009 22:41:52 -0000	1.286
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -108,17 +108,9 @@ Requires: solar-kde-theme
 Requires: leonidas-kde-theme
 %endif
 
-%if 0%{?fedora} == 12
-Requires: constantine-kde-theme
-%endif
-
-# will be changed later for rhel
-%if 0%{?rhel} == 6
-Requires: constantine-kde-theme
-%endif
-
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 Requires: system-backgrounds-kde
+Requires: system-ksplash-theme
 %endif
 
 Requires: kio_sysinfo
@@ -196,9 +188,21 @@ Group: System Environment/Libraries
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
 Provides: PolicyKit-authentication-agent
+# when -libs was born
+#Obsoletes: PolicyKit-kde < 4.3.1-4
+#Requires: PolicyKit-kde-libs%{?_isa} = %{version}-%{release}
 %description -n PolicyKit-kde
 This package provides a PolicyKit Authentication Frontend for KDE
 
+# maybe for 4.3.1-4 ? -- Rex
+%package -n PolicyKit-kde-libs
+Summary: Runtime libraries for PolicyKit-kde 
+Group:   System Environment/Libraries
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: PolicyKit-kde = %{version}-%{release}
+%description -n PolicyKit-kde-libs
+%{summary}.
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -209,6 +213,7 @@ Requires: %{name} = %{version}-%{release
 %package python-applet
 Summary: Plasma widget in Python
 Group: User Interface/Desktops
+Provides: plasma-scriptengine-python = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: PyKDE4 >= %{version}
 %description python-applet
@@ -541,13 +546,14 @@ fi
 %files -n PolicyKit-kde
 %defattr(-,root,root,-)
 %{_kde4_bindir}/polkit-kde-authorization
-%{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
 %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_docdir}/HTML/en/PolicyKit-kde/
+#files -n PolicyKit-kde-libs
+#defattr(-,root,root,-)
 %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 
 %files python-applet
@@ -565,6 +571,10 @@ fi
 
 
 %changelog
+* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- -python-applet: Provides: plasma-scriptengine-python
+- Requires: system-ksplash-theme (f12+,rhel6+)
+
 * Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - drop  BR: lm_sensors-devel on s390(x)
 



From rdieter at fedoraproject.org  Sat Sep 12 22:43:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 22:43:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.286,1.287
Message-ID: <20090912224347.55E1311C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8689

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix changelog date



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- kdebase-workspace.spec	12 Sep 2009 22:41:52 -0000	1.286
+++ kdebase-workspace.spec	12 Sep 2009 22:43:45 -0000	1.287
@@ -571,7 +571,7 @@ fi
 
 
 %changelog
-* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - -python-applet: Provides: plasma-scriptengine-python
 - Requires: system-ksplash-theme (f12+,rhel6+)
 



From radford at fedoraproject.org  Sat Sep 12 22:56:54 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Sat, 12 Sep 2009 22:56:54 +0000 (UTC)
Subject: rpms/dkim-milter/EL-5 dkim-milter, 1.1, 1.2 dkim-milter.spec, 1.9,
	1.10
Message-ID: <20090912225654.3286311C00CE@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22103

Modified Files:
	dkim-milter dkim-milter.spec 
Log Message:
move pid file for better selinux compatibility



Index: dkim-milter
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/EL-5/dkim-milter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dkim-milter	1 Apr 2008 03:34:38 -0000	1.1
+++ dkim-milter	12 Sep 2009 22:56:51 -0000	1.2
@@ -7,7 +7,7 @@
 # processname: dkim-filter
 # config:      /etc/mail/dkim-milter/dkim-milter.conf
 # config:      /etc/sysconfig/dkim-milter
-# pidfile:     /var/run/dkim-milter.pid
+# pidfile:     /var/run/dkim-milter/dkim-milter.pid
 
 # Source function library.
 . /etc/init.d/functions
@@ -17,7 +17,7 @@ name=dkim-milter
 prog=dkim-filter
 prog_with_path=/usr/sbin/${prog}
 user=${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 config=/etc/mail/${name}/${prog}.conf
 
 SOCKET=local:/var/run/${name}/${name}.sock
@@ -26,8 +26,6 @@ EXTRA_FLAGS=""
 
 start() {
 	echo -n "Starting ${desc} (${prog}): "
-        touch ${pidfile}
-        chown ${user}:${user} ${pidfile}
         daemon --user ${user} ${prog_with_path} -x ${config} -P ${pidfile} -p ${SOCKET} ${EXTRA_FLAGS}
         RETVAL=$?
         echo


Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/EL-5/dkim-milter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dkim-milter.spec	21 Aug 2009 13:05:15 -0000	1.9
+++ dkim-milter.spec	12 Sep 2009 22:56:52 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           dkim-milter
 Version:        2.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -126,6 +126,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sat Sep 12 2009 Jim Radford <radford at blackbean.org> - 2.8.3-3
+- init script cleanup to help selinux
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.3-2
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Sat Sep 12 23:03:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:03:25 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230326.1C50710F85E@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora devel is now owned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:03:37 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230337.DEF2310F85E@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora 11 is now owned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:03:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:03:55 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230355.D7DD210F88A@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Io-language (Fedora 11) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:03:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:03:54 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230354.A16C710F87C@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Io-language (Fedora 11) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:03:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:03:58 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230358.1F80910F893@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Io-language (Fedora 11) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:03:59 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230400.03C8910F894@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Io-language (Fedora 11) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:02 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230403.254F410F898@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora 11 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:13 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230413.3D7EA10F87C@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Io-language (Fedora 10) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:15 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230415.5E5C010F88A@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Io-language (Fedora 10) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:16 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230417.0A25010F89C@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Io-language (Fedora 10) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:19 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230419.3B44510F89F@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Io-language (Fedora 10) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:19 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230419.A0D3310F8A1@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora 10 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:28 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230428.7E32010F8A2@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Io-language (Fedora devel) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:26 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230426.E55D010F894@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Io-language (Fedora devel) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:28 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230428.F25B910F8A4@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Io-language (Fedora devel) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:33 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20090912230433.3EA4C10F8A5@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Io-language (Fedora devel) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:33 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230433.B1D8110F8A9@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora devel is now owned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:39 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230439.AF8FA10F8A8@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora devel was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:46 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230447.043F810F88A@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora 8 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Sep 12 23:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:04:49 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20090912230449.26DAD10F89B@bastion2.fedora.phx.redhat.com>

Package Io-language in Fedora 9 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From radford at fedoraproject.org  Sat Sep 12 23:05:23 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Sat, 12 Sep 2009 23:05:23 +0000 (UTC)
Subject: rpms/dkim-milter/F-11 .cvsignore, 1.4, 1.5 dkim-milter, 1.1,
	1.2 dkim-milter.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090912230523.1609C11C00CE@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30120

Modified Files:
	.cvsignore dkim-milter dkim-milter.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Feb 2009 19:46:29 -0000	1.4
+++ .cvsignore	12 Sep 2009 23:05:15 -0000	1.5
@@ -1 +1,2 @@
 dkim-milter-2.8.1.tar.gz
+dkim-milter-2.8.3.tar.gz


Index: dkim-milter
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-11/dkim-milter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dkim-milter	1 Apr 2008 03:34:38 -0000	1.1
+++ dkim-milter	12 Sep 2009 23:05:17 -0000	1.2
@@ -7,7 +7,7 @@
 # processname: dkim-filter
 # config:      /etc/mail/dkim-milter/dkim-milter.conf
 # config:      /etc/sysconfig/dkim-milter
-# pidfile:     /var/run/dkim-milter.pid
+# pidfile:     /var/run/dkim-milter/dkim-milter.pid
 
 # Source function library.
 . /etc/init.d/functions
@@ -17,7 +17,7 @@ name=dkim-milter
 prog=dkim-filter
 prog_with_path=/usr/sbin/${prog}
 user=${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 config=/etc/mail/${name}/${prog}.conf
 
 SOCKET=local:/var/run/${name}/${name}.sock
@@ -26,8 +26,6 @@ EXTRA_FLAGS=""
 
 start() {
 	echo -n "Starting ${desc} (${prog}): "
-        touch ${pidfile}
-        chown ${user}:${user} ${pidfile}
         daemon --user ${user} ${prog_with_path} -x ${config} -P ${pidfile} -p ${SOCKET} ${EXTRA_FLAGS}
         RETVAL=$?
         echo


Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-11/dkim-milter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dkim-milter.spec	24 Feb 2009 12:06:33 -0000	1.6
+++ dkim-milter.spec	12 Sep 2009 23:05:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           dkim-milter
-Version:        2.8.1
-Release:        2%{?dist}
+Version:        2.8.3
+Release:        3%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -69,9 +69,11 @@ EOF
 
 install -p -d %{buildroot}%{_mandir}/man{3,5,8}
 install -p -d %{buildroot}%{_sbindir}
+install -p -d %{buildroot}%{_includedir}
 make install DESTDIR=%{buildroot} {UBIN,MAN}{OWN,GRP}=$(whoami) UBINMODE=755 MANMODE=644
 
 rm -rf %{buildroot}%{_mandir}/man3 # /ar.3.gz
+rm -rf %{buildroot}%{_includedir} # /dkim.h
 
 install -p -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 
@@ -124,6 +126,18 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sat Sep 12 2009 Jim Radford <radford at blackbean.org> - 2.8.3-3
+- init script cleanup to help selinux
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.3-2
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Jim Radford <radford at blackbean.org> - 2.8.3-1
+- update to 2.8.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Feb 2009 19:46:29 -0000	1.4
+++ sources	12 Sep 2009 23:05:18 -0000	1.5
@@ -1 +1,2 @@
 a822f7f5eb36f15d1377ca534d5d7edf  dkim-milter-2.8.1.tar.gz
+d2043c269f1720cc095a9b4f163cf3df  dkim-milter-2.8.3.tar.gz



From radford at fedoraproject.org  Sat Sep 12 23:10:54 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Sat, 12 Sep 2009 23:10:54 +0000 (UTC)
Subject: rpms/dkim-milter/F-10 .cvsignore, 1.4, 1.5 dkim-milter, 1.1,
	1.2 dkim-milter.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090912231054.5AD4911C043A@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2368

Modified Files:
	.cvsignore dkim-milter dkim-milter.spec sources 
Log Message:
update to 2.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Feb 2009 19:59:37 -0000	1.4
+++ .cvsignore	12 Sep 2009 23:10:51 -0000	1.5
@@ -1 +1,2 @@
 dkim-milter-2.8.1.tar.gz
+dkim-milter-2.8.3.tar.gz


Index: dkim-milter
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-10/dkim-milter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dkim-milter	1 Apr 2008 03:34:38 -0000	1.1
+++ dkim-milter	12 Sep 2009 23:10:52 -0000	1.2
@@ -7,7 +7,7 @@
 # processname: dkim-filter
 # config:      /etc/mail/dkim-milter/dkim-milter.conf
 # config:      /etc/sysconfig/dkim-milter
-# pidfile:     /var/run/dkim-milter.pid
+# pidfile:     /var/run/dkim-milter/dkim-milter.pid
 
 # Source function library.
 . /etc/init.d/functions
@@ -17,7 +17,7 @@ name=dkim-milter
 prog=dkim-filter
 prog_with_path=/usr/sbin/${prog}
 user=${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 config=/etc/mail/${name}/${prog}.conf
 
 SOCKET=local:/var/run/${name}/${name}.sock
@@ -26,8 +26,6 @@ EXTRA_FLAGS=""
 
 start() {
 	echo -n "Starting ${desc} (${prog}): "
-        touch ${pidfile}
-        chown ${user}:${user} ${pidfile}
         daemon --user ${user} ${prog_with_path} -x ${config} -P ${pidfile} -p ${SOCKET} ${EXTRA_FLAGS}
         RETVAL=$?
         echo


Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-10/dkim-milter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dkim-milter.spec	12 Feb 2009 19:59:37 -0000	1.4
+++ dkim-milter.spec	12 Sep 2009 23:10:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           dkim-milter
-Version:        2.8.1
-Release:        1%{?dist}
+Version:        2.8.3
+Release:        3%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -69,9 +69,11 @@ EOF
 
 install -p -d %{buildroot}%{_mandir}/man{3,5,8}
 install -p -d %{buildroot}%{_sbindir}
+install -p -d %{buildroot}%{_includedir}
 make install DESTDIR=%{buildroot} {UBIN,MAN}{OWN,GRP}=$(whoami) UBINMODE=755 MANMODE=644
 
 rm -rf %{buildroot}%{_mandir}/man3 # /ar.3.gz
+rm -rf %{buildroot}%{_includedir} # /dkim.h
 
 install -p -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 
@@ -124,9 +126,27 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sat Sep 12 2009 Jim Radford <radford at blackbean.org> - 2.8.3-3
+- init script cleanup to help selinux
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.3-2
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Jim Radford <radford at blackbean.org> - 2.8.3-1
+- update to 2.8.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Feb 12 2009 Jim Radford <radford at blackbean.org> - 2.8.1-1
 - updated to 2.8.1
 
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.2-3
+- rebuild with new openssl
+
 * Wed Dec 10 2008 Jim Radford <radford at blackbean.org> - 2.7.2-2
 - updated to 2.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Feb 2009 19:59:37 -0000	1.4
+++ sources	12 Sep 2009 23:10:52 -0000	1.5
@@ -1 +1,2 @@
 a822f7f5eb36f15d1377ca534d5d7edf  dkim-milter-2.8.1.tar.gz
+d2043c269f1720cc095a9b4f163cf3df  dkim-milter-2.8.3.tar.gz



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:06 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested watchcommits
Message-ID: <20090912233506.6DBCF10F85E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ez-ipupdate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:07 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested watchbugzilla
Message-ID: <20090912233507.69DFE10F87E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ez-ipupdate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:08 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested approveacls
Message-ID: <20090912233508.2F89910F893@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ez-ipupdate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:10 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested commit
Message-ID: <20090912233510.8BCCB10F898@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ez-ipupdate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:16 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested watchbugzilla
Message-ID: <20090912233516.8554F10F89D@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ez-ipupdate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:16 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested watchcommits
Message-ID: <20090912233516.CEA0110F8A1@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ez-ipupdate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:17 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested commit
Message-ID: <20090912233517.EA21B10F8A4@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ez-ipupdate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:20 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested approveacls
Message-ID: <20090912233520.6053010F85E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ez-ipupdate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From spot at fedoraproject.org  Sat Sep 12 23:35:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 12 Sep 2009 23:35:21 +0000 (UTC)
Subject: rpms/srecord/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 srecord.spec, 1.26, 1.27
Message-ID: <20090912233521.D0D2511C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/srecord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18780

Modified Files:
	.cvsignore sources srecord.spec 
Log Message:
1.51


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/srecord/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	10 Jul 2009 20:40:56 -0000	1.19
+++ .cvsignore	12 Sep 2009 23:35:18 -0000	1.20
@@ -1 +1 @@
-srecord-1.50.tar.gz
+srecord-1.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/srecord/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	10 Jul 2009 20:40:56 -0000	1.19
+++ sources	12 Sep 2009 23:35:19 -0000	1.20
@@ -1 +1 @@
-32e325f6f66e0abdc70903497d05c992  srecord-1.50.tar.gz
+4c801c0d5a59239c05485c05f5684879  srecord-1.51.tar.gz


Index: srecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/srecord/devel/srecord.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- srecord.spec	27 Jul 2009 04:46:17 -0000	1.26
+++ srecord.spec	12 Sep 2009 23:35:19 -0000	1.27
@@ -1,15 +1,12 @@
 Name:           srecord
-Version:        1.50
-Release:        3%{?dist}
+Version:        1.51
+Release:        1%{?dist}
 Summary:        Manipulate EPROM load files
 
 Group:          Development/Tools
 License:        GPLv3+
 URL:            http://srecord.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/srecord/srecord-%{version}.tar.gz
-# Sent upstream
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2606533&group_id=72866&atid=535950
-Patch0:         srecord-1.46-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  diffutils, sharutils, groff, boost-devel, libgcrypt-devel
@@ -40,7 +37,6 @@ file formats.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
 
 %build
 %configure
@@ -68,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.51-1
+- Update to 1.51
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.50-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:24 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested watchcommits
Message-ID: <20090912233524.BB9EB10F8AA@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ez-ipupdate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:25 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested commit
Message-ID: <20090912233525.94ED210F8AD@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ez-ipupdate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:28 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested approveacls
Message-ID: <20090912233528.849A910F87C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ez-ipupdate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sat Sep 12 23:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Sep 2009 23:35:30 +0000
Subject: [pkgdb] ez-ipupdate: itamarjp has requested watchbugzilla
Message-ID: <20090912233530.8639610F890@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ez-ipupdate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From kevin at fedoraproject.org  Sat Sep 12 23:43:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 12 Sep 2009 23:43:38 +0000 (UTC)
Subject: rpms/supybot-meetbot/EL-5 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5 supybot-meetbot.spec, 1.4, 1.5
Message-ID: <20090912234338.E750011C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23791

Modified Files:
	sources .cvsignore supybot-meetbot.spec 
Log Message:
Add default css files. 
Fix url
Update to 0.1.4 release. 



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 18:50:47 -0000	1.4
+++ sources	12 Sep 2009 23:43:34 -0000	1.5
@@ -1 +1 @@
-113a9c5ec0f8607e35821365c59d833d  MeetBot-0.1.3.tar.gz
+6d3997a46a9ce383ef6e09fc12ce9a06  MeetBot-0.1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 18:50:47 -0000	1.4
+++ .cvsignore	12 Sep 2009 23:43:35 -0000	1.5
@@ -1 +1 @@
-MeetBot-0.1.3.tar.gz
+MeetBot-0.1.4.tar.gz


Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/EL-5/supybot-meetbot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- supybot-meetbot.spec	23 Aug 2009 18:50:47 -0000	1.4
+++ supybot-meetbot.spec	12 Sep 2009 23:43:35 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-meetbot
-Version:        0.1.3
-Release:        1%{?dist}
+Version:        0.1.4
+Release:        3%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
 License:        BSD
-URL:            http://wiki.debian.org/MeatBot
-Source0:        http://rkd.zgib.net/http/code/MeetBot-%{version}.tar.gz
+URL:            http://wiki.debian.org/MeetBot
+Source0:        http://code.zgib.net/tar//MeetBot-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       supybot
@@ -33,6 +33,7 @@ easy to port to other bots. It is under 
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
 install -pm 644 *.py $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
+install -pm 644 *.css $RPM_BUILD_ROOT/%{python_sitelib}/supybot/plugins/MeetBot
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +44,15 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-3
+- Add default css files. 
+
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-2
+- Fix url
+
+* Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-1
+- Update to 0.1.4 release. 
+
 * Sun Aug 23 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.3-1
 - Update to 0.1.3 release. 
 



From rdieter at fedoraproject.org  Sat Sep 12 23:53:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 12 Sep 2009 23:53:24 +0000 (UTC)
Subject: rpms/kdevelop/devel kdevelop.spec,1.87,1.88
Message-ID: <20090912235324.18B2C11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1092

Modified Files:
	kdevelop.spec 
Log Message:
* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
- make -libs unconditional
- Requires: kdebase3 (#507653)



Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kdevelop.spec	25 Jul 2009 04:30:14 -0000	1.87
+++ kdevelop.spec	12 Sep 2009 23:53:23 -0000	1.88
@@ -11,16 +11,11 @@
 
 %define make_cvs 1
 
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
-
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 3.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -40,17 +35,11 @@ Patch4: kdevelop-3.5.2-kde4template.patc
 
 Provides: kdevelop3 = %{version}-%{release}
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
-
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires: kdelibs3-devel >= %{kde_version}
+# embedded konsole (#507653)
+Requires: kdebase3
 Requires: make
 Requires: perl
 Requires: automake libtool 
@@ -122,23 +111,21 @@ individual needs.
 Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdevelop3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs3-devel
 %description devel
 %{summary}.
 
-%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdevelop < 9:3.5.4-6
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-%endif
 
 
 
@@ -203,7 +190,6 @@ rm -rf %{buildroot}%{_prefix}/kdevbdb
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -211,18 +197,15 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 
 %clean
@@ -246,10 +229,8 @@ rm -rf %{buildroot}
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -260,6 +241,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
+- make -libs unconditional
+- Requires: kdebase3 (#507653)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9:3.5.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From vda at fedoraproject.org  Sun Sep 13 00:26:49 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Sun, 13 Sep 2009 00:26:49 +0000 (UTC)
Subject: rpms/busybox/devel busybox-static.config, NONE, 1.1 .cvsignore, 1.30,
	1.31 busybox-petitboot.config, 1.1, 1.2 busybox.spec, 1.101,
	1.102 sources, 1.30, 1.31 uClibc.config, 1.2,
	1.3 busybox-1.12.1-selinux.patch, 1.1,
	NONE busybox-1.12.1-static.patch, 1.2,
	NONE busybox-1.14.1-readlink.patch, 1.1,
	NONE busybox-1.2.0-ppc64.patch, 1.1, NONE busybox-1.2.2-ls.patch,
	1.2, NONE busybox-1.5.1-clean.patch, 1.1,
	NONE busybox-1.9.0-gc-section.patch, 1.1,
	NONE busybox-1.9.0-msh.patch, 1.3, NONE
Message-ID: <20090913002649.BD4C211C00CE@cvs1.fedora.phx.redhat.com>

Author: vda

Update of /cvs/extras/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10579

Modified Files:
	.cvsignore busybox-petitboot.config busybox.spec sources 
	uClibc.config 
Added Files:
	busybox-static.config 
Removed Files:
	busybox-1.12.1-selinux.patch busybox-1.12.1-static.patch 
	busybox-1.14.1-readlink.patch busybox-1.2.0-ppc64.patch 
	busybox-1.2.2-ls.patch busybox-1.5.1-clean.patch 
	busybox-1.9.0-gc-section.patch busybox-1.9.0-msh.patch 
Log Message:
* Sun Sep 13 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-1
- Rebase to 1.15.1




--- NEW FILE busybox-static.config ---
#
# Automatically generated make config: don't edit
# Busybox version: 1.15.1
# Sun Sep 13 01:42:00 2009
#
CONFIG_HAVE_DOT_CONFIG=y

#
# Busybox Settings
#

#
# General Configuration
#
CONFIG_DESKTOP=y
CONFIG_EXTRA_COMPAT=y
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
CONFIG_SHOW_USAGE=y
CONFIG_FEATURE_VERBOSE_USAGE=y
CONFIG_FEATURE_COMPRESS_USAGE=y
CONFIG_FEATURE_INSTALLER=y
# CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_ASSUME_UNICODE=y
CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
CONFIG_LONG_OPTS=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_PIDFILE=y
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
# CONFIG_SELINUX is not set
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
CONFIG_FEATURE_SYSLOG=y
CONFIG_FEATURE_HAVE_RPC=y

#
# Build Options
#
CONFIG_STATIC=y
# CONFIG_PIE is not set
# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_EXTRA_CFLAGS=""

#
# Debugging Options
#
# CONFIG_DEBUG is not set
# CONFIG_DEBUG_PESSIMIZE is not set
# CONFIG_WERROR is not set
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
CONFIG_INCLUDE_SUSv2=y

#
# Installation Options
#
# CONFIG_INSTALL_NO_USR is not set
CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
# CONFIG_INSTALL_APPLET_DONT is not set
# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
CONFIG_PREFIX="./_install"

#
# Busybox Library Tuning
#
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
CONFIG_FEATURE_EDITING_VI=y
CONFIG_FEATURE_EDITING_HISTORY=15
CONFIG_FEATURE_EDITING_SAVEHISTORY=y
CONFIG_FEATURE_TAB_COMPLETION=y
# CONFIG_FEATURE_USERNAME_COMPLETION is not set
# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
CONFIG_FEATURE_NON_POSIX_CP=y
CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
CONFIG_FEATURE_COPYBUF_KB=4
CONFIG_MONOTONIC_SYSCALL=y
CONFIG_IOCTL_HEX2STR_ERROR=y
CONFIG_FEATURE_HWIB=y

#
# Applets
#

#
# Archival Utilities
#
CONFIG_FEATURE_SEAMLESS_LZMA=y
CONFIG_FEATURE_SEAMLESS_BZ2=y
CONFIG_FEATURE_SEAMLESS_GZ=y
CONFIG_FEATURE_SEAMLESS_Z=y
CONFIG_AR=y
CONFIG_FEATURE_AR_LONG_FILENAMES=y
CONFIG_BUNZIP2=y
CONFIG_BZIP2=y
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
CONFIG_FEATURE_CPIO_P=y
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
CONFIG_GUNZIP=y
CONFIG_GZIP=y
# CONFIG_LZOP is not set
# CONFIG_LZOP_COMPR_HIGH is not set
CONFIG_RPM2CPIO=y
# CONFIG_RPM is not set
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
CONFIG_FEATURE_TAR_AUTODETECT=y
CONFIG_FEATURE_TAR_FROM=y
CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
CONFIG_FEATURE_TAR_LONG_OPTIONS=y
CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_UNCOMPRESS=y
CONFIG_UNLZMA=y
CONFIG_FEATURE_LZMA_FAST=y
CONFIG_UNZIP=y

#
# Coreutils
#
CONFIG_BASENAME=y
CONFIG_CAL=y
CONFIG_CAT=y
CONFIG_CATV=y
CONFIG_CHGRP=y
CONFIG_CHMOD=y
CONFIG_CHOWN=y
CONFIG_CHROOT=y
CONFIG_CKSUM=y
CONFIG_COMM=y
CONFIG_CP=y
CONFIG_CUT=y
CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_DF=y
CONFIG_FEATURE_DF_FANCY=y
CONFIG_DIRNAME=y
CONFIG_DOS2UNIX=y
CONFIG_UNIX2DOS=y
CONFIG_DU=y
CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y
CONFIG_ENV=y
CONFIG_FEATURE_ENV_LONG_OPTIONS=y
CONFIG_EXPAND=y
CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
CONFIG_EXPR=y
CONFIG_EXPR_MATH_SUPPORT_64=y
CONFIG_FALSE=y
CONFIG_FOLD=y
CONFIG_FSYNC=y
CONFIG_HEAD=y
CONFIG_FEATURE_FANCY_HEAD=y
CONFIG_HOSTID=y
CONFIG_ID=y
CONFIG_INSTALL=y
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
CONFIG_LENGTH=y
CONFIG_LN=y
CONFIG_LOGNAME=y
CONFIG_LS=y
CONFIG_FEATURE_LS_FILETYPES=y
CONFIG_FEATURE_LS_FOLLOWLINKS=y
CONFIG_FEATURE_LS_RECURSIVE=y
CONFIG_FEATURE_LS_SORTFILES=y
CONFIG_FEATURE_LS_TIMESTAMPS=y
CONFIG_FEATURE_LS_USERNAME=y
CONFIG_FEATURE_LS_COLOR=y
CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
CONFIG_MD5SUM=y
CONFIG_MKDIR=y
CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
CONFIG_MKFIFO=y
CONFIG_MKNOD=y
CONFIG_MV=y
CONFIG_FEATURE_MV_LONG_OPTIONS=y
CONFIG_NICE=y
CONFIG_NOHUP=y
CONFIG_OD=y
CONFIG_PRINTENV=y
CONFIG_PRINTF=y
CONFIG_PWD=y
CONFIG_READLINK=y
CONFIG_FEATURE_READLINK_FOLLOW=y
CONFIG_REALPATH=y
CONFIG_RM=y
CONFIG_RMDIR=y
CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
CONFIG_SEQ=y
CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y
CONFIG_SHA512SUM=y
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_FEATURE_FLOAT_SLEEP=y
CONFIG_SORT=y
CONFIG_FEATURE_SORT_BIG=y
CONFIG_SPLIT=y
CONFIG_FEATURE_SPLIT_FANCY=y
CONFIG_STAT=y
CONFIG_FEATURE_STAT_FORMAT=y
CONFIG_STTY=y
CONFIG_SUM=y
CONFIG_SYNC=y
CONFIG_TAC=y
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y
CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
CONFIG_FEATURE_TR_EQUIV=y
CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_UNAME=y
CONFIG_UNEXPAND=y
CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
CONFIG_UNIQ=y
CONFIG_USLEEP=y
CONFIG_UUDECODE=y
CONFIG_UUENCODE=y
CONFIG_WC=y
CONFIG_FEATURE_WC_LARGE=y
CONFIG_WHO=y
CONFIG_WHOAMI=y
CONFIG_YES=y

#
# Common options for cp and mv
#
CONFIG_FEATURE_PRESERVE_HARDLINKS=y

#
# Common options for ls, more and telnet
#
CONFIG_FEATURE_AUTOWIDTH=y

#
# Common options for df, du, ls
#
CONFIG_FEATURE_HUMAN_READABLE=y

#
# Common options for md5sum, sha1sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y

#
# Console Utilities
#
CONFIG_CHVT=y
CONFIG_CLEAR=y
CONFIG_DEALLOCVT=y
CONFIG_DUMPKMAP=y
CONFIG_KBD_MODE=y
CONFIG_LOADFONT=y
CONFIG_LOADKMAP=y
CONFIG_OPENVT=y
CONFIG_RESET=y
CONFIG_RESIZE=y
CONFIG_FEATURE_RESIZE_PRINT=y
CONFIG_SETCONSOLE=y
CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
CONFIG_SETFONT=y
CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
CONFIG_DEFAULT_SETFONT_DIR=""
CONFIG_SETKEYCODES=y
CONFIG_SETLOGCONS=y
CONFIG_SHOWKEY=y

#
# Debian Utilities
#
CONFIG_MKTEMP=y
CONFIG_PIPE_PROGRESS=y
CONFIG_RUN_PARTS=y
CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
CONFIG_FEATURE_RUN_PARTS_FANCY=y
CONFIG_START_STOP_DAEMON=y
CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
CONFIG_WHICH=y

#
# Editors
#
CONFIG_AWK=y
CONFIG_FEATURE_AWK_LIBM=y
CONFIG_CMP=y
CONFIG_DIFF=y
CONFIG_FEATURE_DIFF_BINARY=y
CONFIG_FEATURE_DIFF_DIR=y
CONFIG_FEATURE_DIFF_MINIMAL=y
CONFIG_ED=y
CONFIG_PATCH=y
CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
CONFIG_FEATURE_VI_8BIT=y
CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
CONFIG_FEATURE_VI_USE_SIGNALS=y
CONFIG_FEATURE_VI_DOT_CMD=y
CONFIG_FEATURE_VI_READONLY=y
CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
CONFIG_FEATURE_ALLOW_EXEC=y

#
# Finding Utilities
#
CONFIG_FIND=y
CONFIG_FEATURE_FIND_PRINT0=y
CONFIG_FEATURE_FIND_MTIME=y
CONFIG_FEATURE_FIND_MMIN=y
CONFIG_FEATURE_FIND_PERM=y
CONFIG_FEATURE_FIND_TYPE=y
CONFIG_FEATURE_FIND_XDEV=y
CONFIG_FEATURE_FIND_MAXDEPTH=y
CONFIG_FEATURE_FIND_NEWER=y
CONFIG_FEATURE_FIND_INUM=y
CONFIG_FEATURE_FIND_EXEC=y
CONFIG_FEATURE_FIND_USER=y
CONFIG_FEATURE_FIND_GROUP=y
CONFIG_FEATURE_FIND_NOT=y
CONFIG_FEATURE_FIND_DEPTH=y
CONFIG_FEATURE_FIND_PAREN=y
CONFIG_FEATURE_FIND_SIZE=y
CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_DELETE=y
CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set
CONFIG_GREP=y
CONFIG_FEATURE_GREP_EGREP_ALIAS=y
CONFIG_FEATURE_GREP_FGREP_ALIAS=y
CONFIG_FEATURE_GREP_CONTEXT=y
CONFIG_XARGS=y
CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y

#
# Init Utilities
#
CONFIG_INIT=y
CONFIG_FEATURE_USE_INITTAB=y
# CONFIG_FEATURE_KILL_REMOVED is not set
CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_FEATURE_INITRD=y
CONFIG_HALT=y
# CONFIG_FEATURE_CALL_TELINIT is not set
CONFIG_TELINIT_PATH=""
CONFIG_MESG=y

#
# Login/Password Management Utilities
#
CONFIG_FEATURE_SHADOWPASSWDS=y
CONFIG_USE_BB_PWD_GRP=y
CONFIG_USE_BB_SHADOW=y
CONFIG_USE_BB_CRYPT=y
CONFIG_USE_BB_CRYPT_SHA=y
CONFIG_ADDGROUP=y
CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
CONFIG_FEATURE_ADDUSER_TO_GROUP=y
CONFIG_DELGROUP=y
CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
# CONFIG_FEATURE_CHECK_NAMES is not set
CONFIG_ADDUSER=y
CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
CONFIG_FIRST_SYSTEM_ID=100
CONFIG_LAST_SYSTEM_ID=999
CONFIG_DELUSER=y
CONFIG_GETTY=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
CONFIG_LOGIN=y
# CONFIG_PAM is not set
CONFIG_LOGIN_SCRIPTS=y
CONFIG_FEATURE_NOLOGIN=y
CONFIG_FEATURE_SECURETTY=y
CONFIG_PASSWD=y
CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
CONFIG_CRYPTPW=y
CONFIG_CHPASSWD=y
CONFIG_SU=y
CONFIG_FEATURE_SU_SYSLOG=y
CONFIG_FEATURE_SU_CHECKS_SHELLS=y
CONFIG_SULOGIN=y
CONFIG_VLOCK=y

#
# Linux Ext2 FS Progs
#
CONFIG_CHATTR=y
CONFIG_FSCK=y
CONFIG_LSATTR=y

#
# Linux Module Utilities
#
# CONFIG_MODPROBE_SMALL is not set
# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
CONFIG_INSMOD=y
CONFIG_RMMOD=y
CONFIG_LSMOD=y
CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
CONFIG_MODPROBE=y
CONFIG_FEATURE_MODPROBE_BLACKLIST=y
CONFIG_DEPMOD=y

#
# Options common to multiple modutils
#
CONFIG_FEATURE_2_4_MODULES=y
CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
CONFIG_FEATURE_INSMOD_LOAD_MAP=y
CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
CONFIG_FEATURE_MODUTILS_ALIAS=y
CONFIG_FEATURE_MODUTILS_SYMBOLS=y
CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"

#
# Linux System Utilities
#
CONFIG_ACPID=y
CONFIG_FEATURE_ACPID_COMPAT=y
CONFIG_BLKID=y
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
CONFIG_FEATURE_FBSET_FANCY=y
CONFIG_FEATURE_FBSET_READMODE=y
CONFIG_FDFLUSH=y
CONFIG_FDFORMAT=y
CONFIG_FDISK=y
CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
# CONFIG_FEATURE_SUN_LABEL is not set
# CONFIG_FEATURE_OSF_LABEL is not set
CONFIG_FEATURE_FDISK_ADVANCED=y
CONFIG_FINDFS=y
CONFIG_FREERAMDISK=y
CONFIG_FSCK_MINIX=y
CONFIG_MKFS_MINIX=y

#
# Minix filesystem support
#
CONFIG_FEATURE_MINIX2=y
CONFIG_MKFS_VFAT=y
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
CONFIG_HEXDUMP=y
CONFIG_FEATURE_HEXDUMP_REVERSE=y
CONFIG_HD=y
CONFIG_HWCLOCK=y
CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
CONFIG_IPCRM=y
CONFIG_IPCS=y
CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_FEATURE_MDEV_CONF=y
CONFIG_FEATURE_MDEV_RENAME=y
CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
CONFIG_FEATURE_MDEV_EXEC=y
CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
CONFIG_MKSWAP=y
CONFIG_FEATURE_MKSWAP_UUID=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_VOLUMEID=y
CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_REISERFS=y
CONFIG_FEATURE_VOLUMEID_FAT=y
CONFIG_FEATURE_VOLUMEID_HFS=y
CONFIG_FEATURE_VOLUMEID_JFS=y
CONFIG_FEATURE_VOLUMEID_XFS=y
CONFIG_FEATURE_VOLUMEID_NTFS=y
CONFIG_FEATURE_VOLUMEID_ISO9660=y
CONFIG_FEATURE_VOLUMEID_UDF=y
CONFIG_FEATURE_VOLUMEID_LUKS=y
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
CONFIG_FEATURE_VOLUMEID_ROMFS=y
CONFIG_FEATURE_VOLUMEID_SYSV=y
CONFIG_FEATURE_VOLUMEID_OCFS2=y
CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_FAKE=y
CONFIG_FEATURE_MOUNT_VERBOSE=y
# CONFIG_FEATURE_MOUNT_HELPERS is not set
CONFIG_FEATURE_MOUNT_LABEL=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_FEATURE_MOUNT_CIFS=y
CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y
CONFIG_PIVOT_ROOT=y
CONFIG_RDATE=y
CONFIG_RDEV=y
CONFIG_READPROFILE=y
CONFIG_RTCWAKE=y
CONFIG_SCRIPT=y
CONFIG_SCRIPTREPLAY=y
CONFIG_SETARCH=y
CONFIG_SWAPONOFF=y
CONFIG_FEATURE_SWAPON_PRI=y
CONFIG_SWITCH_ROOT=y
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y

#
# Common options for mount/umount
#
CONFIG_FEATURE_MOUNT_LOOP=y
# CONFIG_FEATURE_MTAB_SUPPORT is not set

#
# Miscellaneous Utilities
#
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
CONFIG_BEEP=y
CONFIG_FEATURE_BEEP_FREQ=4000
CONFIG_FEATURE_BEEP_LENGTH_MS=30
CONFIG_CHAT=y
CONFIG_FEATURE_CHAT_NOFAIL=y
CONFIG_FEATURE_CHAT_TTY_HIFI=y
CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
CONFIG_FEATURE_CHAT_CLR_ABORT=y
CONFIG_CHRT=y
CONFIG_CROND=y
CONFIG_FEATURE_CROND_D=y
CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
CONFIG_CRONTAB=y
CONFIG_DC=y
CONFIG_FEATURE_DC_LIBM=y
# CONFIG_DEVFSD is not set
# CONFIG_DEVFSD_MODLOAD is not set
# CONFIG_DEVFSD_FG_NP is not set
# CONFIG_DEVFSD_VERBOSE is not set
# CONFIG_FEATURE_DEVFS is not set
CONFIG_DEVMEM=y
CONFIG_EJECT=y
CONFIG_FEATURE_EJECT_SCSI=y
CONFIG_FBSPLASH=y
# CONFIG_FLASH_LOCK is not set
# CONFIG_FLASH_UNLOCK is not set
# CONFIG_FLASH_ERASEALL is not set
CONFIG_IONICE=y
# CONFIG_INOTIFYD is not set
CONFIG_LAST=y
# CONFIG_FEATURE_LAST_SMALL is not set
CONFIG_FEATURE_LAST_FANCY=y
CONFIG_LESS=y
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
CONFIG_FEATURE_LESS_FLAGS=y
CONFIG_FEATURE_LESS_MARKS=y
CONFIG_FEATURE_LESS_REGEXP=y
CONFIG_FEATURE_LESS_WINCH=y
CONFIG_FEATURE_LESS_DASHCMD=y
CONFIG_FEATURE_LESS_LINENUMS=y
CONFIG_HDPARM=y
CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
CONFIG_MAKEDEVS=y
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
CONFIG_FEATURE_MAKEDEVS_TABLE=y
CONFIG_MAN=y
CONFIG_MICROCOM=y
CONFIG_MOUNTPOINT=y
CONFIG_MT=y
CONFIG_RAIDAUTORUN=y
CONFIG_READAHEAD=y
CONFIG_RUNLEVEL=y
CONFIG_RX=y
CONFIG_SETSID=y
CONFIG_STRINGS=y
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
CONFIG_TIME=y
CONFIG_TIMEOUT=y
CONFIG_TTYSIZE=y
CONFIG_VOLNAME=y
CONFIG_WATCHDOG=y

#
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
# CONFIG_FEATURE_UNIX_LOCAL is not set
CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
CONFIG_VERBOSE_RESOLUTION_ERRORS=y
CONFIG_ARP=y
CONFIG_ARPING=y
CONFIG_BRCTL=y
CONFIG_FEATURE_BRCTL_FANCY=y
CONFIG_FEATURE_BRCTL_SHOW=y
CONFIG_DNSD=y
CONFIG_ETHER_WAKE=y
CONFIG_FAKEIDENTD=y
CONFIG_FTPD=y
CONFIG_FEATURE_FTP_WRITE=y
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_HOSTNAME=y
CONFIG_HTTPD=y
CONFIG_FEATURE_HTTPD_RANGES=y
CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
CONFIG_FEATURE_HTTPD_SETUID=y
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
CONFIG_FEATURE_HTTPD_AUTH_MD5=y
CONFIG_FEATURE_HTTPD_CGI=y
CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
CONFIG_FEATURE_HTTPD_PROXY=y
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
CONFIG_FEATURE_IFCONFIG_SLIP=y
CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
CONFIG_FEATURE_IFCONFIG_HW=y
CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
CONFIG_IFENSLAVE=y
CONFIG_IFPLUGD=y
CONFIG_IFUPDOWN=y
CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
CONFIG_FEATURE_IFUPDOWN_IP=y
CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
CONFIG_FEATURE_IFUPDOWN_IPV4=y
CONFIG_FEATURE_IFUPDOWN_IPV6=y
CONFIG_FEATURE_IFUPDOWN_MAPPING=y
# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
CONFIG_INETD=y
CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
CONFIG_FEATURE_INETD_RPC=y
CONFIG_IP=y
CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
CONFIG_FEATURE_IP_ROUTE=y
CONFIG_FEATURE_IP_TUNNEL=y
CONFIG_FEATURE_IP_RULE=y
CONFIG_FEATURE_IP_SHORT_FORMS=y
# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
CONFIG_IPADDR=y
CONFIG_IPLINK=y
CONFIG_IPROUTE=y
CONFIG_IPTUNNEL=y
CONFIG_IPRULE=y
CONFIG_IPCALC=y
CONFIG_FEATURE_IPCALC_FANCY=y
CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
CONFIG_NAMEIF=y
CONFIG_FEATURE_NAMEIF_EXTENDED=y
CONFIG_NC=y
CONFIG_NC_SERVER=y
CONFIG_NC_EXTRA=y
CONFIG_NETSTAT=y
CONFIG_FEATURE_NETSTAT_WIDE=y
CONFIG_FEATURE_NETSTAT_PRG=y
CONFIG_NSLOOKUP=y
CONFIG_PING=y
CONFIG_PING6=y
CONFIG_FEATURE_FANCY_PING=y
CONFIG_PSCAN=y
CONFIG_ROUTE=y
CONFIG_SLATTACH=y
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
CONFIG_TELNETD=y
CONFIG_FEATURE_TELNETD_STANDALONE=y
CONFIG_TFTP=y
CONFIG_TFTPD=y
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
# CONFIG_TFTP_DEBUG is not set
CONFIG_TRACEROUTE=y
CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
CONFIG_APP_UDHCPD=y
CONFIG_APP_DHCPRELAY=y
CONFIG_APP_DUMPLEASES=y
CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
CONFIG_APP_UDHCPC=y
CONFIG_FEATURE_UDHCPC_ARPING=y
CONFIG_FEATURE_UDHCP_PORT=y
CONFIG_UDHCP_DEBUG=0
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
CONFIG_VCONFIG=y
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_ZCIP=y
CONFIG_TCPSVD=y
CONFIG_TUNCTL=y
CONFIG_FEATURE_TUNCTL_UG=y
CONFIG_UDPSVD=y

#
# Print Utilities
#
CONFIG_LPD=y
CONFIG_LPR=y
CONFIG_LPQ=y

#
# Mail Utilities
#
CONFIG_MAKEMIME=y
CONFIG_FEATURE_MIME_CHARSET="us-ascii"
CONFIG_POPMAILDIR=y
CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
CONFIG_REFORMIME=y
CONFIG_FEATURE_REFORMIME_COMPAT=y
CONFIG_SENDMAIL=y

#
# Process Utilities
#
CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
CONFIG_KILLALL5=y
CONFIG_NMETER=y
CONFIG_PGREP=y
CONFIG_PIDOF=y
CONFIG_FEATURE_PIDOF_SINGLE=y
CONFIG_FEATURE_PIDOF_OMIT=y
CONFIG_PKILL=y
CONFIG_PS=y
CONFIG_FEATURE_PS_WIDE=y
CONFIG_FEATURE_PS_TIME=y
CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
CONFIG_TOP=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
CONFIG_FEATURE_TOP_SMP_CPU=y
CONFIG_FEATURE_TOP_DECIMALS=y
CONFIG_FEATURE_TOP_SMP_PROCESS=y
CONFIG_FEATURE_TOPMEM=y
CONFIG_UPTIME=y
CONFIG_WATCH=y

#
# Runit Utilities
#
CONFIG_RUNSV=y
CONFIG_RUNSVDIR=y
# CONFIG_FEATURE_RUNSVDIR_LOG is not set
CONFIG_SV=y
CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
CONFIG_SVLOGD=y
CONFIG_CHPST=y
CONFIG_SETUIDGID=y
CONFIG_ENVUIDGID=y
CONFIG_ENVDIR=y
CONFIG_SOFTLIMIT=y
# CONFIG_CHCON is not set
# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
# CONFIG_GETENFORCE is not set
# CONFIG_GETSEBOOL is not set
# CONFIG_LOAD_POLICY is not set
# CONFIG_MATCHPATHCON is not set
# CONFIG_RESTORECON is not set
# CONFIG_RUNCON is not set
# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
# CONFIG_SELINUXENABLED is not set
# CONFIG_SETENFORCE is not set
# CONFIG_SETFILES is not set
# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
# CONFIG_SETSEBOOL is not set
# CONFIG_SESTATUS is not set

#
# Shells
#
CONFIG_FEATURE_SH_IS_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set
CONFIG_ASH=y
CONFIG_ASH_BASH_COMPAT=y
CONFIG_ASH_JOB_CONTROL=y
CONFIG_ASH_READ_NCHARS=y
CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_GETOPTS=y
CONFIG_ASH_BUILTIN_ECHO=y
CONFIG_ASH_BUILTIN_PRINTF=y
CONFIG_ASH_BUILTIN_TEST=y
CONFIG_ASH_CMDCMD=y
# CONFIG_ASH_MAIL is not set
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_RANDOM_SUPPORT=y
CONFIG_ASH_EXPAND_PRMT=y
CONFIG_HUSH=y
CONFIG_HUSH_BASH_COMPAT=y
CONFIG_HUSH_HELP=y
CONFIG_HUSH_INTERACTIVE=y
CONFIG_HUSH_JOB=y
CONFIG_HUSH_TICK=y
CONFIG_HUSH_IF=y
CONFIG_HUSH_LOOPS=y
CONFIG_HUSH_CASE=y
CONFIG_HUSH_FUNCTIONS=y
CONFIG_HUSH_LOCAL=y
CONFIG_HUSH_EXPORT_N=y
# CONFIG_LASH is not set
CONFIG_MSH=y
CONFIG_SH_MATH_SUPPORT=y
CONFIG_SH_MATH_SUPPORT_64=y
CONFIG_FEATURE_SH_EXTRA_QUIET=y
# CONFIG_FEATURE_SH_STANDALONE is not set
# CONFIG_FEATURE_SH_NOFORK is not set
CONFIG_CTTYHACK=y

#
# System Logging Utilities
#
CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_SYSLOGD_DUP=y
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
CONFIG_KLOGD=y
CONFIG_LOGGER=y


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	28 May 2009 11:32:31 -0000	1.30
+++ .cvsignore	13 Sep 2009 00:26:44 -0000	1.31
@@ -1,2 +1,3 @@
 uClibc-0.9.30.1.tar.bz2
 busybox-1.14.1.tar.bz2
+busybox-1.15.1.tar.bz2


Index: busybox-petitboot.config
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/busybox-petitboot.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- busybox-petitboot.config	10 Apr 2007 14:23:59 -0000	1.1
+++ busybox-petitboot.config	13 Sep 2009 00:26:45 -0000	1.2
@@ -1,7 +1,9 @@
 #
 # Automatically generated make config: don't edit
+# Busybox version: 1.15.1
+# Sun Sep 13 01:16:50 2009
 #
-HAVE_DOT_CONFIG=y
+CONFIG_HAVE_DOT_CONFIG=y
 
 #
 # Busybox Settings
@@ -10,45 +12,54 @@ HAVE_DOT_CONFIG=y
 #
 # General Configuration
 #
-CONFIG_NITPICK=y
+CONFIG_DESKTOP=y
+CONFIG_EXTRA_COMPAT=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 # CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_LOCALE_SUPPORT is not set
-CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_ASSUME_UNICODE=y
+CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
+CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
 
 #
 # Build Options
 #
 # CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
-# CONFIG_LFS is not set
-# USING_CROSS_COMPILER is not set
-CROSS_COMPILER_PREFIX=""
-# CONFIG_BUILD_AT_ONCE is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
 
 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
 # CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
-CONFIG_DEBUG_YANK_SUSv2=y
+CONFIG_INCLUDE_SUSv2=y
 
 #
 # Installation Options
@@ -56,13 +67,35 @@ CONFIG_DEBUG_YANK_SUSv2=y
 # CONFIG_INSTALL_NO_USR is not set
 CONFIG_INSTALL_APPLET_SYMLINKS=y
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
 # CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
 
 #
 # Busybox Library Tuning
 #
+CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
 
 #
 # Applets
@@ -71,40 +104,39 @@ CONFIG_MD5_SIZE_VS_SPEED=2
 #
 # Archival Utilities
 #
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+# CONFIG_FEATURE_SEAMLESS_Z is not set
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
 CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
-CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
 CONFIG_GZIP=y
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
 CONFIG_TAR=y
-# CONFIG_FEATURE_TAR_CREATE is not set
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
 # CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
+CONFIG_UNLZMA=y
 # CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_UNZIP is not set
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+CONFIG_UNZIP=y
 
 #
 # Coreutils
@@ -118,7 +150,6 @@ CONFIG_CAT=y
 # CONFIG_CHOWN is not set
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
-# CONFIG_CMP is not set
 # CONFIG_COMM is not set
 CONFIG_CP=y
 CONFIG_CUT=y
@@ -128,10 +159,7 @@ CONFIG_DD=y
 # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_BINARY is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_FEATURE_DF_FANCY=y
 CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -141,10 +169,13 @@ CONFIG_ECHO=y
 CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
 # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
 CONFIG_EXPR=y
 # CONFIG_EXPR_MATH_SUPPORT_64 is not set
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
+# CONFIG_FSYNC is not set
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
@@ -176,20 +207,29 @@ CONFIG_FEATURE_MV_LONG_OPTIONS=y
 # CONFIG_PRINTENV is not set
 # CONFIG_PRINTF is not set
 CONFIG_PWD=y
+# CONFIG_READLINK is not set
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
 # CONFIG_REALPATH is not set
 CONFIG_RM=y
 CONFIG_RMDIR=y
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
 # CONFIG_SEQ is not set
 # CONFIG_SHA1SUM is not set
+# CONFIG_SHA256SUM is not set
+# CONFIG_SHA512SUM is not set
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
 # CONFIG_SORT is not set
 # CONFIG_FEATURE_SORT_BIG is not set
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
 # CONFIG_STAT is not set
 # CONFIG_FEATURE_STAT_FORMAT is not set
 # CONFIG_STTY is not set
 # CONFIG_SUM is not set
 CONFIG_SYNC=y
+# CONFIG_TAC is not set
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
@@ -203,12 +243,14 @@ CONFIG_TEST=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 # CONFIG_UNIQ is not set
 # CONFIG_USLEEP is not set
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
 # CONFIG_WC is not set
+# CONFIG_FEATURE_WC_LARGE is not set
 # CONFIG_WHO is not set
 # CONFIG_WHOAMI is not set
 CONFIG_YES=y
@@ -240,24 +282,30 @@ CONFIG_CHVT=y
 CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
+# CONFIG_KBD_MODE is not set
 # CONFIG_LOADFONT is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
 CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
 # CONFIG_SETCONSOLE is not set
 # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
 CONFIG_SETKEYCODES=y
 # CONFIG_SETLOGCONS is not set
+# CONFIG_SHOWKEY is not set
 
 #
 # Debian Utilities
 #
 # CONFIG_MKTEMP is not set
 # CONFIG_PIPE_PROGRESS is not set
-# CONFIG_READLINK is not set
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
 CONFIG_RUN_PARTS=y
 # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
 # CONFIG_START_STOP_DAEMON is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
@@ -267,11 +315,18 @@ CONFIG_RUN_PARTS=y
 # Editors
 #
 # CONFIG_AWK is not set
-# CONFIG_FEATURE_AWK_MATH is not set
+# CONFIG_FEATURE_AWK_LIBM is not set
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
 # CONFIG_ED is not set
 # CONFIG_PATCH is not set
 # CONFIG_SED is not set
 # CONFIG_VI is not set
+CONFIG_FEATURE_VI_MAX_LEN=0
+# CONFIG_FEATURE_VI_8BIT is not set
 # CONFIG_FEATURE_VI_COLON is not set
 # CONFIG_FEATURE_VI_YANKMARK is not set
 # CONFIG_FEATURE_VI_SEARCH is not set
@@ -282,6 +337,7 @@ CONFIG_RUN_PARTS=y
 # CONFIG_FEATURE_VI_SET is not set
 # CONFIG_FEATURE_VI_WIN_RESIZE is not set
 # CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+# CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
 # Finding Utilities
@@ -293,9 +349,21 @@ CONFIG_RUN_PARTS=y
 # CONFIG_FEATURE_FIND_PERM is not set
 # CONFIG_FEATURE_FIND_TYPE is not set
 # CONFIG_FEATURE_FIND_XDEV is not set
+# CONFIG_FEATURE_FIND_MAXDEPTH is not set
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
 # CONFIG_FEATURE_FIND_EXEC is not set
+# CONFIG_FEATURE_FIND_USER is not set
+# CONFIG_FEATURE_FIND_GROUP is not set
+# CONFIG_FEATURE_FIND_NOT is not set
+# CONFIG_FEATURE_FIND_DEPTH is not set
+# CONFIG_FEATURE_FIND_PAREN is not set
+# CONFIG_FEATURE_FIND_SIZE is not set
+# CONFIG_FEATURE_FIND_PRUNE is not set
+# CONFIG_FEATURE_FIND_DELETE is not set
+# CONFIG_FEATURE_FIND_PATH is not set
+# CONFIG_FEATURE_FIND_REGEX is not set
+# CONFIG_FEATURE_FIND_CONTEXT is not set
 # CONFIG_GREP is not set
 # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
 # CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
@@ -310,32 +378,53 @@ CONFIG_RUN_PARTS=y
 # Init Utilities
 #
 # CONFIG_INIT is not set
-# CONFIG_DEBUG_INIT is not set
 # CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 # CONFIG_MESG is not set
 
 #
 # Login/Password Management Utilities
 #
 # CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_SHADOW is not set
 CONFIG_USE_BB_PWD_GRP=y
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
 # CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
 # CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
 # CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_FIRST_SYSTEM_ID=0
+CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_DELUSER is not set
 # CONFIG_GETTY is not set
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
 # CONFIG_LOGIN is not set
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
 # CONFIG_FEATURE_SECURETTY is not set
 # CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
 # CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
 # CONFIG_SULOGIN is not set
 # CONFIG_VLOCK is not set
 
@@ -343,60 +432,70 @@ CONFIG_USE_BB_PWD_GRP=y
 # Linux Ext2 FS Progs
 #
 # CONFIG_CHATTR is not set
-# CONFIG_E2FSCK is not set
 # CONFIG_FSCK is not set
 # CONFIG_LSATTR is not set
-# CONFIG_MKE2FS is not set
-# CONFIG_TUNE2FS is not set
-# CONFIG_E2LABEL is not set
-# CONFIG_FINDFS is not set
 
 #
 # Linux Module Utilities
 #
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
 CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 CONFIG_RMMOD=y
 CONFIG_LSMOD=y
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
 CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+CONFIG_DEPMOD=y
 
 #
 # Options common to multiple modutils
 #
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
 #
 # Linux System Utilities
 #
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
 CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
 CONFIG_FBSET=y
 CONFIG_FEATURE_FBSET_FANCY=y
 CONFIG_FEATURE_FBSET_READMODE=y
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
 # CONFIG_FEATURE_OSF_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_VFAT is not set
 # CONFIG_GETOPT is not set
+# CONFIG_FEATURE_GETOPT_LONG is not set
 # CONFIG_HEXDUMP is not set
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
@@ -405,18 +504,50 @@ FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_LOSETUP is not set
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 # CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_V0 is not set
+# CONFIG_FEATURE_MKSWAP_UUID is not set
 # CONFIG_MORE is not set
 # CONFIG_FEATURE_USE_TERMIOS is not set
+CONFIG_VOLUMEID=y
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_LABEL=y
 CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
 # CONFIG_PIVOT_ROOT is not set
 # CONFIG_RDATE is not set
+# CONFIG_RDEV is not set
 # CONFIG_READPROFILE is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
 # CONFIG_SETARCH is not set
 # CONFIG_SWAPONOFF is not set
+# CONFIG_FEATURE_SWAPON_PRI is not set
 # CONFIG_SWITCH_ROOT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -432,24 +563,51 @@ CONFIG_FEATURE_UMOUNT_ALL=y
 #
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
 # CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
+# CONFIG_FEATURE_DC_LIBM is not set
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
 CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
 # CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
 # CONFIG_LESS is not set
+CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_LESS_BRACKETS is not set
 # CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_FLAGCS is not set
 # CONFIG_FEATURE_LESS_MARKS is not set
 # CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -460,52 +618,74 @@ CONFIG_EJECT=y
 # CONFIG_MAKEDEVS is not set
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
-# CONFIG_STRINGS is not set
 # CONFIG_SETSID is not set
+# CONFIG_STRINGS is not set
 # CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_TIME is not set
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
 
 #
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
 # CONFIG_ARPING is not set
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
 # CONFIG_DNSD is not set
 # CONFIG_ETHER_WAKE is not set
 # CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
 CONFIG_FTPGET=y
 # CONFIG_FTPPUT is not set
 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
 # CONFIG_HOSTNAME is not set
 # CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
 # CONFIG_FEATURE_HTTPD_CGI is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
 # CONFIG_IFCONFIG is not set
 # CONFIG_FEATURE_IFCONFIG_STATUS is not set
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
 # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
 # CONFIG_FEATURE_IFCONFIG_HW is not set
 # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
 # CONFIG_IFUPDOWN is not set
+CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_IFUPDOWN_IP is not set
 # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
 # CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
 # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
 # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
 # CONFIG_INETD is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
@@ -518,54 +698,88 @@ CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
 CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
 CONFIG_IPADDR=y
 CONFIG_IPLINK=y
 CONFIG_IPROUTE=y
 # CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
 # CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NC is not set
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
 # CONFIG_NETSTAT is not set
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
 # CONFIG_NSLOOKUP is not set
 CONFIG_PING=y
-# CONFIG_FEATURE_FANCY_PING is not set
 CONFIG_PING6=y
-# CONFIG_FEATURE_FANCY_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING is not set
+# CONFIG_PSCAN is not set
 # CONFIG_ROUTE is not set
+# CONFIG_SLATTACH is not set
 # CONFIG_TELNET is not set
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
 # CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_INETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
 # CONFIG_TFTP is not set
+# CONFIG_TFTPD is not set
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_DEBUG_TFTP is not set
+# CONFIG_TFTP_DEBUG is not set
 # CONFIG_TRACEROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-
-#
-# udhcp Server/Client
-#
 # CONFIG_APP_UDHCPD is not set
-# CONFIG_APP_UDHCPC is not set
+# CONFIG_APP_DHCPRELAY is not set
 # CONFIG_APP_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCP_SYSLOG is not set
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 # CONFIG_VCONFIG is not set
 # CONFIG_WGET is not set
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
 # CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 # CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDPSVD is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
 
 #
 # Process Utilities
@@ -574,38 +788,75 @@ CONFIG_PING6=y
 # CONFIG_FUSER is not set
 CONFIG_KILL=y
 CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
 # CONFIG_PIDOF is not set
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
 # CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_TIME=y
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 # CONFIG_RENICE is not set
 # CONFIG_BB_SYSCTL is not set
 # CONFIG_TOP is not set
 # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_UPTIME is not set
+# CONFIG_WATCH is not set
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
 
 #
 # Shells
 #
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
+CONFIG_ASH_BASH_COMPAT=y
 # CONFIG_ASH_JOB_CONTROL is not set
 CONFIG_ASH_READ_NCHARS=y
 CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
 CONFIG_ASH_CMDCMD=y
 # CONFIG_ASH_MAIL is not set
@@ -613,21 +864,25 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 # CONFIG_ASH_EXPAND_PRMT is not set
 # CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
-CONFIG_FEATURE_SH_STANDALONE_SHELL=y
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=15
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_CTTYHACK is not set
 
 #
 # System Logging Utilities
@@ -635,14 +890,10 @@ CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 # CONFIG_SYSLOGD is not set
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
 # CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 # CONFIG_KLOGD is not set
 # CONFIG_LOGGER is not set
-
-#
-# Selinux Utilities
-#
-# CONFIG_LOAD_POLICY is not set


Index: busybox.spec
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- busybox.spec	11 Sep 2009 07:19:07 -0000	1.101
+++ busybox.spec	13 Sep 2009 00:26:45 -0000	1.102
@@ -1,22 +1,18 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.14.1
-Release: 6%{?dist}
+Version: 1.15.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-Source1: busybox-petitboot.config
-Source2: http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2
-Source3: uClibc.config
-Patch0: busybox-1.12.1-static.patch
-Patch12: busybox-1.2.2-ls.patch
-Patch14: busybox-1.9.0-msh.patch
+Source1: busybox-static.config
+Source2: busybox-petitboot.config
+Source3: http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2
+Source4: uClibc.config
 Patch16: busybox-1.10.1-hwclock.patch
-Patch20: busybox-1.12.1-selinux.patch
 # patch to avoid conflicts with getline() from stdio.h, already present in upstream VCS
 Patch22: uClibc-0.9.30.1-getline.patch
-Patch23: busybox-1.14.1-readlink.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,15 +42,10 @@ bootloader used on PlayStation 3. The bu
 better suited to normal use.
 
 %prep
-%setup -q -a2
-%patch0 -b .static -p1
-%patch12 -b .ls -p1
-%patch14 -b .msh -p1
+%setup -q -a3
 %patch16 -b .ia64 -p1
-%patch20 -b .sel -p1
-cat %{SOURCE3} >uClibc-0.9.30.1/.config1
+cat %{SOURCE4} >uClibc-0.9.30.1/.config1
 %patch22 -b .getline -p1
-%patch23 -b .opt -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -79,7 +70,9 @@ if test "$arch"; then make install; fi
 if test "$arch"; then make install_kernel_headers; fi
 cd ..
 # we are back in busybox-NN.MM dir now
-make defconfig
+cp %{SOURCE1} .config
+# set all new options to defaults
+yes "" | make oldconfig
 # gcc needs to be convinced to use neither system headers, nor libs,
 # nor startfiles (i.e. crtXXX.o files)
 if test "$arch"; then \
@@ -94,21 +87,21 @@ else \
     cat .config && \
     make V=1 CC="gcc $RPM_OPT_FLAGS"; \
 fi
-cp busybox busybox-static
+cp busybox busybox.static
 
 # create busybox optimized for petitboot
 make clean
 # copy new configuration file
-cp %{SOURCE1} .config
-# .config file has to be recreated to the new format
+cp %{SOURCE2} .config
+# set all new options to defaults
 yes "" | make oldconfig
-make CC="%__cc $RPM_OPT_FLAGS"
+make V=1 CC="%__cc $RPM_OPT_FLAGS"
 cp busybox busybox.petitboot
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
-install -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox
+install -m 755 busybox.static $RPM_BUILD_ROOT/sbin/busybox
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
 
 %clean
@@ -116,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docs/busybox.net/*.html docs/busybox.net/images/*
+%doc LICENSE docs/busybox.net/*.html
 /sbin/busybox
 
 %files petitboot
@@ -125,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/busybox.petitboot
 
 %changelog
+* Sun Sep 13 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-1
+- Rebase to 1.15.1
+
 * Fri Sep 11 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.14.1-6
 - REALLY fix build on s390, ia64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	28 May 2009 11:32:32 -0000	1.30
+++ sources	13 Sep 2009 00:26:45 -0000	1.31
@@ -1,2 +1,3 @@
 1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2
 d5186821d4f4cf6017452c7c8730cf19  busybox-1.14.1.tar.bz2
+e67a98eef14212abfc265092e4683fbe  busybox-1.15.1.tar.bz2


Index: uClibc.config
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/uClibc.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- uClibc.config	24 May 2009 01:32:19 -0000	1.2
+++ uClibc.config	13 Sep 2009 00:26:45 -0000	1.3
@@ -4,23 +4,12 @@
 FORCE_OPTIONS_FOR_ARCH=y
 TARGET_SUBARCH=""
 
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-DO_C99_MATH=n
+# DO_C99_MATH is not set
 UCLIBC_HAS_FENV=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS="./kernel-include"
-HAVE_DOT_CONFIG=y
 
 #
 # General Library Settings


--- busybox-1.12.1-selinux.patch DELETED ---


--- busybox-1.12.1-static.patch DELETED ---


--- busybox-1.14.1-readlink.patch DELETED ---


--- busybox-1.2.0-ppc64.patch DELETED ---


--- busybox-1.2.2-ls.patch DELETED ---


--- busybox-1.5.1-clean.patch DELETED ---


--- busybox-1.9.0-gc-section.patch DELETED ---


--- busybox-1.9.0-msh.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 13 05:17:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 13 Sep 2009 05:17:27 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.391, 1.392 jd.spec, 1.454, 1.455 sources,
	1.392, 1.393
Message-ID: <20090913051727.C2B5011C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27202

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3065



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- .cvsignore	10 Sep 2009 17:49:07 -0000	1.391
+++ .cvsignore	13 Sep 2009 05:17:25 -0000	1.392
@@ -1 +1 @@
-jd-2.4.2-svn3060_trunk.tgz
+jd-2.4.2-svn3065_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- jd.spec	10 Sep 2009 17:49:07 -0000	1.454
+++ jd.spec	13 Sep 2009 05:17:25 -0000	1.455
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3060_trunk
+%define         strtag        svn3065_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3060
+* Sun Sep 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3065
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- sources	10 Sep 2009 17:49:07 -0000	1.392
+++ sources	13 Sep 2009 05:17:25 -0000	1.393
@@ -1 +1 @@
-13a987c329366bbf000308bbdc97caf9  jd-2.4.2-svn3060_trunk.tgz
+44bc85cf8e0728a108c984fb4bb3722a  jd-2.4.2-svn3065_trunk.tgz



From akurtakov at fedoraproject.org  Sun Sep 13 07:45:09 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sun, 13 Sep 2009 07:45:09 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.18,1.19
Message-ID: <20090913074509.34E1C11C0099@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1673/devel

Modified Files:
	maven-scm.spec 
Log Message:
BR maven2-plugin-assembly.


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- maven-scm.spec	12 Sep 2009 20:55:47 -0000	1.18
+++ maven-scm.spec	13 Sep 2009 07:45:07 -0000	1.19
@@ -63,6 +63,7 @@ BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven2-common-poms >= 1.0-3
@@ -216,6 +217,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-3
 - BR maven-surefire-provider-junit.
 - BR plexus-maven-plugin.
+- BR maven2-plugin-assembly.
 
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-2
 - Add doxia-sitetools BR.



From djuran at fedoraproject.org  Sun Sep 13 08:49:27 2009
From: djuran at fedoraproject.org (David Juran)
Date: Sun, 13 Sep 2009 08:49:27 +0000 (UTC)
Subject: rpms/azureus/devel .cvsignore, 1.16,
	1.17 azureus-4.0.0.4-boo-osx.diff, 
	1.2, 1.3 azureus-4.0.0.4-boo-windows.diff, 1.2, 1.3 azureus.spec,
	1.78, 1.79 sources, 1.16, 1.17 build.xml, 1.1, NONE
Message-ID: <20090913084927.8AD6111C0099@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24515

Modified Files:
	.cvsignore azureus-4.0.0.4-boo-osx.diff 
	azureus-4.0.0.4-boo-windows.diff azureus.spec sources 
Removed Files:
	build.xml 
Log Message:
- Upgrade to 4.2.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	3 Aug 2009 19:05:58 -0000	1.16
+++ .cvsignore	13 Sep 2009 08:49:24 -0000	1.17
@@ -1 +1 @@
-Vuze_4.2.0.4_source.zip
+Vuze_4.2.0.8_source.zip

azureus-4.0.0.4-boo-osx.diff:
 org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java |   19 -------------------
 1 file changed, 19 deletions(-)

Index: azureus-4.0.0.4-boo-osx.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-osx.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- azureus-4.0.0.4-boo-osx.diff	3 Aug 2009 19:05:58 -0000	1.2
+++ azureus-4.0.0.4-boo-osx.diff	13 Sep 2009 08:49:25 -0000	1.3
@@ -1,221 +1,3 @@
-diff -urN org/gudy/azureus2/ui/swt.orig/osx/Start.java org/gudy/azureus2/ui/swt/osx/Start.java
---- org/gudy/azureus2/ui/swt.orig/osx/Start.java	2006-02-09 19:43:24.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/osx/Start.java	1969-12-31 16:00:00.000000000 -0800
-@@ -1,74 +0,0 @@
--/*
-- * Created on May 30, 2004
-- * Created by Olivier Chalouhi
-- * Copyright (C) 2004, 2005, 2006 Aelitis, 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, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-- * 
-- * AELITIS, SAS au capital de 46,603.30 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- *
-- */
--package org.gudy.azureus2.ui.swt.osx;
--
--import java.io.OutputStreamWriter;
--import java.io.PrintWriter;
--import java.net.Socket;
--
--import org.gudy.azureus2.core3.util.Debug;
--
--
--public class Start {
--    public Start(String args[]) {
--//      if(args.length == 0)
--//        return;
--
--      Socket sck = null;
--      PrintWriter pw = null;
--      try {          
--        System.out.println("StartSocket: passing startup args to already-running Azureus java process.");
--        
--        sck = new Socket("127.0.0.1", 6880);
--        
--        pw = new PrintWriter(new OutputStreamWriter(sck.getOutputStream(),"UTF8"));
--        
--        StringBuffer buffer = new StringBuffer("Azureus Start Server Access;args;");
--        
--        for(int i = 0 ; i < args.length ; i++) {
--          String arg = args[i].replaceAll("&","&&").replaceAll(";","&;");
--          buffer.append(arg);
--          buffer.append(';');
--        }
--       
--        pw.println(buffer.toString());
--        pw.flush();
--      } catch(Exception e) {
--      	Debug.printStackTrace( e );
--      } finally {
--        try {
--          if (pw != null)
--            pw.close();
--        } catch (Exception e) {
--        }
--        try {
--          if (sck != null)
--            sck.close();
--        } catch (Exception e) {
--        }
--      }
--    }
--    
--    public static void main(String args[]) {
--      new Start(args);
--    }
--  }
-\ No newline at end of file
-diff -urN org/gudy/azureus2/ui/swt.orig/win32/Win32UIEnhancer.java org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
---- org/gudy/azureus2/ui/swt.orig/win32/Win32UIEnhancer.java	2008-07-03 02:43:40.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java	1969-12-31 16:00:00.000000000 -0800
-@@ -1,135 +0,0 @@
--/**
-- * Copyright (C) 2006 Aelitis, 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, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 63.529,40 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- *
-- */
--
--package org.gudy.azureus2.ui.swt.win32;
--
--import org.eclipse.swt.SWT;
--import org.eclipse.swt.graphics.Image;
--import org.eclipse.swt.graphics.ImageData;
--import org.eclipse.swt.internal.win32.OS;
--import org.eclipse.swt.internal.win32.TCHAR;
--
--/**
-- * @author TuxPaper
-- * @created Nov 29, 2006
-- *
-- * Note: You can safely exclude this class from the build path.
-- * All calls to this class use (or at least should use) reflection
-- */
--public class Win32UIEnhancer
--{
--	static String findProgramKey(String extension) {
--		if (extension == null)
--			SWT.error(SWT.ERROR_NULL_ARGUMENT);
--		if (extension.length() == 0)
--			return null;
--		if (extension.charAt(0) != '.')
--			extension = "." + extension; //$NON-NLS-1$
--		/* Use the character encoding for the default locale */
--		TCHAR key = new TCHAR(0, extension, true);
--		int[] phkResult = new int[1];
--		if (OS.RegOpenKeyEx(OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
--			return null;
--		}
--		int[] lpcbData = new int[1];
--		int result = OS.RegQueryValueEx(phkResult[0], null, 0, null, (TCHAR) null,
--				lpcbData);
--		if (result == 0) {
--			TCHAR lpData = new TCHAR(0, lpcbData[0] / TCHAR.sizeof);
--			result = OS.RegQueryValueEx(phkResult[0], null, 0, null, lpData, lpcbData);
--			if (result == 0)
--				return lpData.toString(0, lpData.strlen());
--		}
--		OS.RegCloseKey(phkResult[0]);
--		return null;
--	}
--
--    public static ImageData getBigImageData(String extension) {
--		String key = findProgramKey(extension);
--		if (key == null) {
--			return null;
--		}
--
--		/* Icon */
--		String DEFAULT_ICON = "\\DefaultIcon"; //$NON-NLS-1$
--		String iconName = getKeyValue(key + DEFAULT_ICON, true);
--		if (iconName == null)
--			iconName = ""; //$NON-NLS-1$
--
--		int nIconIndex = 0;
--		String fileName = iconName;
--		int index = iconName.indexOf(',');
--		if (index != -1) {
--			fileName = iconName.substring(0, index);
--			String iconIndex = iconName.substring(index + 1, iconName.length()).trim();
--			try {
--				nIconIndex = Integer.parseInt(iconIndex);
--			} catch (NumberFormatException e) {
--			}
--		}
--		/* Use the character encoding for the default locale */
--		TCHAR lpszFile = new TCHAR(0, fileName, true);
--		int[] phiconSmall = null, phiconLarge = new int[1];
--		OS.ExtractIconEx(lpszFile, nIconIndex, phiconLarge, phiconSmall, 1);
--		if (phiconLarge[0] == 0) {
--			return null;
--		}
--		Image image = Image.win32_new(null, SWT.ICON, phiconLarge[0]);
--		ImageData imageData = image.getImageData();
--		image.dispose();
--		return imageData;
--	}
--
--	static String getKeyValue(String string, boolean expand) {
--		/* Use the character encoding for the default locale */
--		TCHAR key = new TCHAR(0, string, true);
--		int[] phkResult = new int[1];
--		if (OS.RegOpenKeyEx(OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
--			return null;
--		}
--		String result = null;
--		int[] lpcbData = new int[1];
--		if (OS.RegQueryValueEx(phkResult[0], (TCHAR) null, 0, null, (TCHAR) null,
--				lpcbData) == 0) {
--			result = "";
--			int length = lpcbData[0] / TCHAR.sizeof;
--			if (length != 0) {
--				/* Use the character encoding for the default locale */
--				TCHAR lpData = new TCHAR(0, length);
--				if (OS.RegQueryValueEx(phkResult[0], null, 0, null, lpData, lpcbData) == 0) {
--					if (!OS.IsWinCE && expand) {
--						length = OS.ExpandEnvironmentStrings(lpData, null, 0);
--						if (length != 0) {
--							TCHAR lpDst = new TCHAR(0, length);
--							OS.ExpandEnvironmentStrings(lpData, lpDst, length);
--							result = lpDst.toString(0, Math.max(0, length - 1));
--						}
--					} else {
--						length = Math.max(0, lpData.length() - 1);
--						result = lpData.toString(0, length);
--					}
--				}
--			}
--		}
--		if (phkResult[0] != 0)
--			OS.RegCloseKey(phkResult[0]);
--		return result;
--	}
--}
 diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
 --- org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx	2009-04-16 20:46:42.000000000 +0300
 +++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java	2009-07-31 19:35:41.000000000 +0300

azureus-4.0.0.4-boo-windows.diff:
 platform/PlatformManagerFactory.java        |   17 +++-----------
 platform/PlatformManagerPluginDelegate.java |    9 ++++---
 update/CoreUpdateChecker.java               |   33 +++++++++++++++-------------
 3 files changed, 27 insertions(+), 32 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 azureus-4.0.0.4-boo-windows.diffIndex: azureus-4.0.0.4-boo-windows.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-windows.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- azureus-4.0.0.4-boo-windows.diff	3 Aug 2009 19:05:58 -0000	1.2
+++ azureus-4.0.0.4-boo-windows.diff	13 Sep 2009 08:49:25 -0000	1.3
@@ -1,5853 +1,6 @@
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/jnilib/make.mak org/gudy/azureus2/platform/macosx/access/jnilib/make.mak
---- org/gudy/azureus2/platform.orig/macosx/access/jnilib/make.mak	2006-07-21 09:21:40.000000000 -0700
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/make.mak	1969-12-31 16:00:00.000000000 -0800
-@@ -1,12 +0,0 @@
--SDK = /Developer/SDKs/MacOSX10.4u.sdk
--ARCHS = -arch i386 -arch ppc
--LFLAGS = -bundle -isysroot $(SDK) $(ARCHS) -framework JavaVM -framework Carbon 
--CFLAGS = -c $(ARCHS) -I $(SDK)/System/Library/Frameworks/JavaVM.framework/Headers -I $(SDK)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/Headers
--
--
--OBJECTS = OSXAccess.o
--OUTLIB = libOSXAccess.jnilib
--
--all:
--	cc $(CFLAGS) OSXAccess.c
--	cc -o $(OUTLIB) $(LFLAGS) $(OBJECTS)
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.c org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.c
---- org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.c	2007-03-07 17:40:26.000000000 -0800
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.c	1969-12-31 16:00:00.000000000 -0800
-@@ -1,127 +0,0 @@
--#include <Carbon/Carbon.h>
--#include <jni.h>
--#include <AEDataModel.h>
--
--#define VERSION "1.03"
--
--/**
-- * AEDesc code from SWT, os_structs.c
-- * Copyright (c) 2000, 2006 IBM Corporation and others.
-- */
--typedef struct AEDesc_FID_CACHE {
--	int cached;
--	jclass clazz;
--	jfieldID descriptorType, dataHandle;
--} AEDesc_FID_CACHE;
--
--AEDesc_FID_CACHE AEDescFc;
--
--void cacheAEDescFields(JNIEnv *env, jobject lpObject)
--{
--	if (AEDescFc.cached) return;
--	AEDescFc.clazz = (*env)->GetObjectClass(env, lpObject);
--	AEDescFc.descriptorType = (*env)->GetFieldID(env, AEDescFc.clazz, "descriptorType", "I");
--	AEDescFc.dataHandle = (*env)->GetFieldID(env, AEDescFc.clazz, "dataHandle", "I");
--	AEDescFc.cached = 1;
--}
--
--AEDesc *getAEDescFields(JNIEnv *env, jobject lpObject, AEDesc *lpStruct)
--{
--	if (!AEDescFc.cached) cacheAEDescFields(env, lpObject);
--	lpStruct->descriptorType = (DescType)(*env)->GetIntField(env, lpObject, AEDescFc.descriptorType);
--	lpStruct->dataHandle = (AEDataStorage)(*env)->GetIntField(env, lpObject, AEDescFc.dataHandle);
--	return lpStruct;
--}
--
--void setAEDescFields(JNIEnv *env, jobject lpObject, AEDesc *lpStruct)
--{
--	if (!AEDescFc.cached) cacheAEDescFields(env, lpObject);
--	(*env)->SetIntField(env, lpObject, AEDescFc.descriptorType, (jint)lpStruct->descriptorType);
--	(*env)->SetIntField(env, lpObject, AEDescFc.dataHandle, (jint)lpStruct->dataHandle);
--}
--
--JNIEXPORT jint JNICALL Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_AEGetParamDesc
--	(JNIEnv *env, jclass that, jint theAppleEvent, jint theAEKeyword, 
--	 jint desiredType, jobject result)
--{
--	AEDesc _result, *lpresult=NULL;
--	
--	jint rc = 0;
--
--	if (result) if ((lpresult = getAEDescFields(env, result, &_result)) == NULL) goto fail;
--	
--	rc = (jint)AEGetParamDesc((const AppleEvent *)theAppleEvent, 
--	  (AEKeyword)theAEKeyword,
--	  (DescType)desiredType,
--	  (AEDescList *)lpresult);
--
--fail:
--	if (result && lpresult) setAEDescFields(env, result, lpresult);
--
--	return rc;
--}
--
--JNIEXPORT jstring JNICALL 
--Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_getVersion(
--	JNIEnv		*env,
--	jclass		cla )
--{
--	jstring	result =(*env)->NewStringUTF(env, (char *)VERSION);
--
--	return( result );
--}
--
--JNIEXPORT jstring JNICALL
--Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_getDocDir(
--	JNIEnv		*env,
--	jclass		cla )
--{
--	CFURLRef docURL;
--	CFStringRef docPath;
--	FSRef    fsRef;
--  OSErr    err = FSFindFolder(kUserDomain, kDocumentsFolderType, kDontCreateFolder, &fsRef);
--  
--  jstring result = 0;
--
--	if (err == noErr) {
--  	if((docURL = CFURLCreateFromFSRef( kCFAllocatorSystemDefault, &fsRef))) {
--			docPath = CFURLCopyFileSystemPath(docURL, kCFURLPOSIXPathStyle);
--			
--			if (docPath) {
--				// convert to unicode
--				CFIndex strLen = CFStringGetLength( docPath );
--				UniChar uniStr[ strLen ];
--				CFRange strRange;
--				strRange.location = 0;
--				strRange.length = strLen;
--				CFStringGetCharacters( docPath, strRange, uniStr );
--	
--				result = (*env)->NewString( env, (jchar*)uniStr, (jsize)strLen );
--
--				CFRelease(docPath);
--				
--				return result;
--			}
--			CFRelease(docURL);
--		}
--
--		return result;
--  }
--}
--
--JNIEXPORT void JNICALL
--Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_memmove(
--	JNIEnv *env,
--	jclass cla,
--	jbyteArray dest,
--	jint src,
--	jint count)
--{
--	jbyte *dest1;
--	
--	if (dest) {
--		dest1 = (*env)->GetByteArrayElements(env, dest, NULL);
--		memmove((void *)dest1, (void *)src, count);
--		(*env)->ReleaseByteArrayElements(env, dest, dest1, 0);
--	}
--}
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.java org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
---- org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.java	2007-03-07 16:49:10.000000000 -0800
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java	1969-12-31 16:00:00.000000000 -0800
-@@ -1,58 +0,0 @@
--/*
-- * Created on Jul 21, 2006 3:19:03 PM
-- * Copyright (C) 2006 Aelitis, 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, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 46,603.30 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- */
--package org.gudy.azureus2.platform.macosx.access.jnilib;
--
--import org.eclipse.swt.internal.carbon.AEDesc;
--
--import org.gudy.azureus2.core3.util.*;
--
--/**
-- * @author TuxPaper
-- * @created Jul 21, 2006
-- *
-- */
--public class OSXAccess
--{
--	private static boolean bLoaded = false;
--
--	static {
--		try {
--			System.loadLibrary ("OSXAccess");
--			System.out.println("OSXAccess v" + getVersion() + " Load complete!");
--			bLoaded = true;
--		} catch (UnsatisfiedLinkError e1) {
[...5497 lines suppressed...]
--					// get size here so it is cached
--				
--				rdf.getTimeoutDownloader(rdf.getRetryDownloader(alternate_rdl,RD_SIZE_RETRIES),RD_SIZE_TIMEOUT).getSize();
--				
--			
--				List	update_desc = new ArrayList();
--				
--				List	desc_lines = HTMLUtils.convertHTMLToText( "", sf_details.getDescription());
--								
--				update_desc.addAll( desc_lines );
--								
--				List	comment_lines = HTMLUtils.convertHTMLToText( "    ", sf_details.getComment());
--				
--				update_desc.addAll( comment_lines );
--
--				String[]	update_d = new String[update_desc.size()];
--				
--				update_desc.toArray( update_d );
--
--				final Update	update = 
--					checker.addUpdate(
--						UPDATE_NAME,
--						update_d,
--						target_version,
--						alternate_rdl,
--						Update.RESTART_REQUIRED_YES );
--				
--				update.setDescriptionURL(sf_details.getInfoURL());
--				
--				alternate_rdl.addListener( 
--						new ResourceDownloaderAdapter()
--						{
--							public boolean
--							completed(
--								final ResourceDownloader	downloader,
--								InputStream					data )
--							{	
--								installUpdate( checker, update, downloader, data );
--									
--								return( true );
--							}							
--						});
--			}
--		}catch( Throwable e ){
--			
--			Debug.printStackTrace( e );
--			
--			checker.reportProgress( "Failed to load plugin details for the platform manager: " + Debug.getNestedExceptionMessage(e));
--			
--			checker.failed();
--			
--		}finally{
--			
--			checker.completed();
--		}
--	}
--	
--	protected void
--	installUpdate(
--		UpdateChecker		checker,
--		Update 				update,
--		ResourceDownloader	rd,
--		InputStream			data )
--	{
--		ZipInputStream zip = null;
--		
--		try {
--			data = update.verifyData( data, true );
--
--			rd.reportActivity( "Data verified successfully" );
--			
--			UpdateInstaller installer = checker.createInstaller();
--
--			zip = new ZipInputStream(data);
--
--			ZipEntry entry = null;
--
--			while ((entry = zip.getNextEntry()) != null) {
--
--				String name = entry.getName();
--
--				if (name.toLowerCase().startsWith("windows/")) {
--
--					// win32 only files
--
--					name = name.substring(8);
--
--					// skip the directory entry
--
--					if (name.length() > 0) {
--
--						rd.reportActivity("Adding update action for '" + name + "'");
--
--						if (Logger.isEnabled())
--							Logger.log(new LogEvent(LOGID,
--									"PlatformManager:Win32 adding action for '" + name + "'"));
--
--						installer.addResource(name, zip, false);
--
--						installer.addMoveAction(name, installer.getInstallDir()
--								+ File.separator + name);
--					}
--				}
--			}
--		} catch (Throwable e) {
--
--			rd.reportActivity("Update install failed:" + e.getMessage());
--		}finally{
--			
--			if ( zip != null ){
--				
--				try{
--					zip.close();
--					
--				}catch( Throwable e ){
--				}
--			}
--		}
--	}
--	
--	protected List
--	splitMultiLine(
--		String		indent,
--		String		text )
--	{
--		int		pos = 0;
--		
--		String	lc_text = text.toLowerCase();
--		
--		List	lines = new ArrayList();
--		
--		while( true ){
--			
--			String	line;
--			
--			int	p1 = lc_text.indexOf( "<br>", pos );
--			
--			if ( p1 == -1 ){
--				
--				line = text.substring(pos);
--				
--			}else{
--				
--				line = text.substring(pos,p1);
--				
--				pos = p1+4;
--			}
--			
--			lines.add( indent + line );
--			
--			if ( p1 == -1 ){
--				
--				break;
--			}
--		}
--		
--		return( lines );
--	}
--}
-diff -up azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.foo azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.foo	2009-05-13 20:50:56.000000000 +0300
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2009-07-30 22:05:47.000000000 +0300
+diff -up azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java.boo-windows azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java.boo-windows	2009-05-13 20:50:56.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java	2009-09-13 09:11:45.000000000 +0200
 @@ -48,19 +48,9 @@ PlatformManagerFactory 
  			if ( platform_manager == null && !force_dummy ){
  										  
@@ -5881,9 +34,28 @@ diff -up azureus-4.2.0.4/org/gudy/azureu
  			}
  			
  			return( platform_manager );
-diff -up azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.original azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java
---- org/gudy/azureus2/update/CoreUpdateChecker.java.original	2009-07-31 22:04:53.000000000 +0300
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java	2009-07-31 22:13:46.000000000 +0300
+diff -up azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java.boo-windows azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java
+--- azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java.boo-windows	2009-08-25 02:14:26.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java	2009-09-13 09:16:41.000000000 +0200
+@@ -44,10 +44,11 @@ public class PlatformManagerPluginDelega
+ 		PlatformManager platform = PlatformManagerFactory.getPlatformManager();
+ 
+ 		int platformType = platform.getPlatformType();
+-		if ( platformType == PlatformManager.PT_WINDOWS ){
+-			org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker plugin = new org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker();
+-			plugin.initialize(pluginInterface);
+-		}else if ( platformType == PlatformManager.PT_MACOSX ){
++// 		if ( platformType == PlatformManager.PT_WINDOWS ){
++// 			org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker plugin = new org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker();
++// 			plugin.initialize(pluginInterface);
++// 		}else
++		    if ( platformType == PlatformManager.PT_MACOSX ){
+ 			org.gudy.azureus2.platform.macosx.PlatformManagerUpdateChecker plugin = new org.gudy.azureus2.platform.macosx.PlatformManagerUpdateChecker();
+ 			plugin.initialize(pluginInterface);
+ 		}else if ( platformType == PlatformManager.PT_UNIX ){
+diff -up azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.boo-windows azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.boo-windows	2009-07-07 00:52:10.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java	2009-09-13 09:11:45.000000000 +0200
 @@ -38,8 +38,8 @@ import org.gudy.azureus2.core3.logging.*
  import org.gudy.azureus2.core3.config.*;
  import org.gudy.azureus2.core3.html.*;


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- azureus.spec	4 Aug 2009 13:52:13 -0000	1.78
+++ azureus.spec	13 Sep 2009 08:49:25 -0000	1.79
@@ -1,8 +1,8 @@
 %define		_newname Vuze
 
 Name:		azureus
-Version:	4.2.0.4
-Release:	2%{?dist}
+Version:	4.2.0.8
+Release:	1%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -14,13 +14,6 @@ Source1:	azureus.script
 Source2:	Azureus.desktop
 Source3:	azureus.applications
 
-#retrieved from CVS
-Source4:	build.xml
-#Source4:	azureus-License.txt
-
-#Source5:	azplugins_2.1.6.jar
-#Source6:	bdcc_2.2.2.zip
-
 #Patch0:		azureus-remove-win32-osx-platforms.patch
 Patch2:		azureus-cache-size.patch
 Patch3:		azureus-remove-manifest-classpath.patch
@@ -79,7 +72,6 @@ advanced users.
 %prep
 %setup -q -c
 
-cp %{SOURCE4} .
 #%patch0 -p0
 %patch2 -p0
 %patch3 -p1 -b .remove-manifest-classpath
@@ -107,9 +99,34 @@ cp %{SOURCE4} .
 rm org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java
 rm org/gudy/azureus2/platform/macosx/PlatformManagerImpl.java
 rm org/gudy/azureus2/platform/win32/PlatformManagerImpl.java
-%patch50 -b .boo-windows
+rm org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32Access.java
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessInterface.java
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.cpp
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessImpl.java
+rm org/gudy/azureus2/platform/win32/access/impl/org_gudy_azureus2_platform_win32_access_impl_AEWin32AccessInterface.h
+rm org/gudy/azureus2/platform/win32/access/impl/Test.java
+rm org/gudy/azureus2/platform/macosx/NativeInvocationBridge.java
+rm org/gudy/azureus2/platform/macosx/PListEditor.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32AccessException.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32AccessListener.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32Manager.java
+rm org/gudy/azureus2/platform/win32/access/impl/aenet.cpp
+rm org/gudy/azureus2/platform/win32/access/impl/aenet.h
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.dsp
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.dsw
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.h
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessCallback.java
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessExceptionImpl.java
+rm org/gudy/azureus2/platform/win32/access/impl/generate_ini.bat
+rm org/gudy/azureus2/platform/win32/access/impl/StdAfx.cpp
+rm org/gudy/azureus2/platform/win32/access/impl/StdAfx.h
+rm org/gudy/azureus2/platform/win32/PlatformManagerUpdateChecker.java
+%patch50 -p1 -b .boo-windows
 
 rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
+rm org/gudy/azureus2/ui/swt/osx/Start.java
+rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
 %patch51 -b .boo-osx
 %patch52 -b .orig
 %patch53 -p1 -b .boo-updating-w32
@@ -216,7 +233,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog.txt
+%doc ChangeLog.txt GPL.txt
 %{_datadir}/applications/*
 %{_datadir}/application-registry/*
 %{_datadir}/pixmaps/azureus.png
@@ -227,6 +244,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Sat Sep 12 2009 David Juran <djuran at redhat.com> - 4.2.0.8-1
+- Upgrade to 4.2.0.8
+
 * Tue Aug  4 2009 David Juran <david at juran.se> - 4.2.0.4-2
 - Fix Bz 515228 properly
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	3 Aug 2009 19:05:59 -0000	1.16
+++ sources	13 Sep 2009 08:49:25 -0000	1.17
@@ -1 +1 @@
-5145354022b67cef3a26ac7f5bd1c4fb  Vuze_4.2.0.4_source.zip
+81af0887805afe7bba9b651b022a7b1f  Vuze_4.2.0.8_source.zip


--- build.xml DELETED ---



From mschwendt at fedoraproject.org  Sun Sep 13 08:53:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 13 Sep 2009 08:53:05 +0000 (UTC)
Subject: rpms/audacious/F-11 audacious-1.5.1-pulseaudio-by-default.patch,
	NONE, 1.1 audacious-1.5.1-tuple_get_int-assertion.patch, NONE,
	1.1 audacious.spec, 1.47,
	1.48 audacious-1.1.0-amidi-backend.patch, 1.1,
	NONE audacious-1.1.0-no-rpath.patch, 1.2,
	NONE audacious-1.1.0-quoting.patch, 1.2,
	NONE audacious-1.1.1-controlsocket-name.patch, 1.1,
	NONE audacious-1.1.1-playlist-twenty.patch, 1.3,
	NONE audacious-1.2.1-relative-links.patch, 1.1,
	NONE audacious-1.2.1-shaded-skin.patch, 1.1,
	NONE audacious-1.4.2-id3tag-close-file.patch, 1.1, NONE
Message-ID: <20090913085306.01CD911C0099@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25640

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.5.1-pulseaudio-by-default.patch 
	audacious-1.5.1-tuple_get_int-assertion.patch 
Removed Files:
	audacious-1.1.0-amidi-backend.patch 
	audacious-1.1.0-no-rpath.patch audacious-1.1.0-quoting.patch 
	audacious-1.1.1-controlsocket-name.patch 
	audacious-1.1.1-playlist-twenty.patch 
	audacious-1.2.1-relative-links.patch 
	audacious-1.2.1-shaded-skin.patch 
	audacious-1.4.2-id3tag-close-file.patch 
Log Message:
* Sun Sep 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
- Fix playlist tuple_get_int assertion (#522995).
- Default to pulseaudio output plugin.
- Prune obsolete/unapplied patches.


audacious-1.5.1-pulseaudio-by-default.patch:
 audconfig.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-1.5.1-pulseaudio-by-default.patch ---
diff -Nur audacious-1.5.1-orig/src/audacious/audconfig.c audacious-1.5.1/src/audacious/audconfig.c
--- audacious-1.5.1-orig/src/audacious/audconfig.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/audconfig.c	2009-09-13 10:02:11.118092467 +0200
@@ -104,7 +104,7 @@
     .equalizer_bands = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
     .scale_factor = 2.0,
     .skin = NULL,
-    .outputplugin = NULL,
+    .outputplugin = "__RPM_LIBDIR__/audacious/Output/pulse_audio.so (#0)",
     .filesel_path = NULL,
     .playlist_path = NULL,
     .playlist_font = NULL,

audacious-1.5.1-tuple_get_int-assertion.patch:
 playlist.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-1.5.1-tuple_get_int-assertion.patch ---
diff -Nur 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-09-13 09:46:50.030085752 +0200
@@ -2429,7 +2429,7 @@
                     /* Entry disappeared while we looked it up.
                        Restart. */
                     node = playlist->entries;
-                else if ((entry->tuple != NULL || entry->title != NULL) && 
+                else if (entry->tuple != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                          tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)
                 {
@@ -2480,7 +2480,7 @@
                         node = g_list_nth(playlist->entries,
                                           playlistwin_get_toprow());
                 }
-                else if ((entry->tuple != NULL || entry->title != NULL) && 
+                else if (entry->tuple != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                          tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1) {
                     update_playlistwin = TRUE;


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-11/audacious.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- audacious.spec	12 Sep 2009 08:57:44 -0000	1.47
+++ audacious.spec	13 Sep 2009 08:53:05 -0000	1.48
@@ -4,7 +4,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        GTK2 based media player similar to XMMS
 
 Group:          Applications/Multimedia
@@ -13,19 +13,13 @@ URL:            http://audacious-media-p
 
 Source0:        http://distfiles.atheme.org/audacious-%{version}.tgz
 Patch0:         audacious-1.5.1-xmms-skins.patch
-Patch1:         audacious-1.5.1-default-skin.patch
-# Patch2:         audacious-1.1.0-no-rpath.patch
-Patch3:         audacious-1.2.1-relative-links.patch
-# Patch4:         audacious-1.1.0-quoting.patch
-# Patch5:         audacious-1.1.0-amidi-backend.patch
-Patch6:         audacious-1.2.1-shaded-skin.patch
-# Patch7:         audacious-1.1.1-controlsocket-name.patch
-# Patch8:         audacious-1.1.1-playlist-twenty.patch
-Patch9:         audacious-1.4.2-id3tag-close-file.patch
+#Patch1:         audacious-1.5.1-default-skin.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
 Patch13:        audacious-1.5.1-desktop-name.patch
+Patch14:        audacious-1.5.1-tuple_get_int-assertion.patch
+Patch15:        audacious-1.5.1-pulseaudio-by-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -81,32 +75,8 @@ Files needed when building software for 
 # Read xmms skins directory
 %patch0 -p1 -b .xmms-skins
 
-# Use bluecurve as default skin
-%patch1 -p1 -b .default-skin
-
-# No rpath in binaries
-# %patch2 -p1 -b .no-rpath
-
-# Relative symlink paths
-# %patch3 -p1 -b .relative-links
-
-# Filename quoting
-# %patch4 -p1 -b .quoting
-
-# Amidi backends path
-# %patch5 -p1 -b .amidi-backend
-
-# Shaded playlist window decorations
-# %patch6 -p1 -b .shaded-skin
-
-# Controlsocket named "xmms" instead of "audacious"
-# %patch7 -p1 -b controlsocket-name
-
-# Fix "%20" in playlist entries
-# %patch8 -p1 -b playlist-twenty
-
-# Fix files left open on non-seekable mp3 streams
-# %patch9 -p1 -b id3tag-close-file
+# Use bluecurve as default skin (from package "bluecurve-xmms-skin")
+#patch1 -p1 -b .default-skin
 
 # Remove libSAD references from the public headers
 %patch10 -p1 -b libsad-header
@@ -120,6 +90,12 @@ Files needed when building software for 
 # /usr/bin/audacious looks for the fedora-audacious.desktop file
 %patch13 -p1 -b .desktop-name
 
+# was scheduled for 1.5.2
+%patch14 -p1 -b .tuple_get_int-assertion
+
+%patch15 -p1 -b .pulseaudio-by-default
+sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' src/audacious/audconfig.c
+
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
@@ -207,6 +183,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
+- Fix playlist tuple_get_int assertion (#522995).
+- Default to pulseaudio output plugin.
+- Prune obsolete/unapplied patches.
+
 * Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
 - Build with --enable-samplerate (off by default), BR libsamplerate-devel
 


--- audacious-1.1.0-amidi-backend.patch DELETED ---


--- audacious-1.1.0-no-rpath.patch DELETED ---


--- audacious-1.1.0-quoting.patch DELETED ---


--- audacious-1.1.1-controlsocket-name.patch DELETED ---


--- audacious-1.1.1-playlist-twenty.patch DELETED ---


--- audacious-1.2.1-relative-links.patch DELETED ---


--- audacious-1.2.1-shaded-skin.patch DELETED ---


--- audacious-1.4.2-id3tag-close-file.patch DELETED ---



From mschwendt at fedoraproject.org  Sun Sep 13 08:55:03 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 13 Sep 2009 08:55:03 +0000 (UTC)
Subject: rpms/audacious/F-10 audacious-1.5.1-pulseaudio-by-default.patch,
	NONE, 1.1 audacious-1.5.1-tuple_get_int-assertion.patch, NONE,
	1.1 audacious.spec, 1.44,
	1.45 audacious-1.1.0-amidi-backend.patch, 1.1,
	NONE audacious-1.1.0-no-rpath.patch, 1.2,
	NONE audacious-1.1.0-quoting.patch, 1.2,
	NONE audacious-1.1.1-controlsocket-name.patch, 1.1,
	NONE audacious-1.1.1-playlist-twenty.patch, 1.3,
	NONE audacious-1.2.1-relative-links.patch, 1.1,
	NONE audacious-1.2.1-shaded-skin.patch, 1.1,
	NONE audacious-1.4.2-id3tag-close-file.patch, 1.1, NONE
Message-ID: <20090913085503.B7CB211C0099@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26339

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.5.1-pulseaudio-by-default.patch 
	audacious-1.5.1-tuple_get_int-assertion.patch 
Removed Files:
	audacious-1.1.0-amidi-backend.patch 
	audacious-1.1.0-no-rpath.patch audacious-1.1.0-quoting.patch 
	audacious-1.1.1-controlsocket-name.patch 
	audacious-1.1.1-playlist-twenty.patch 
	audacious-1.2.1-relative-links.patch 
	audacious-1.2.1-shaded-skin.patch 
	audacious-1.4.2-id3tag-close-file.patch 
Log Message:
* Sun Sep 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
- Fix playlist tuple_get_int assertion (#522995).
- Default to pulseaudio output plugin.
- Prune obsolete/unapplied patches.


audacious-1.5.1-pulseaudio-by-default.patch:
 audconfig.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-1.5.1-pulseaudio-by-default.patch ---
diff -Nur audacious-1.5.1-orig/src/audacious/audconfig.c audacious-1.5.1/src/audacious/audconfig.c
--- audacious-1.5.1-orig/src/audacious/audconfig.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/audconfig.c	2009-09-13 10:02:11.118092467 +0200
@@ -104,7 +104,7 @@
     .equalizer_bands = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
     .scale_factor = 2.0,
     .skin = NULL,
-    .outputplugin = NULL,
+    .outputplugin = "__RPM_LIBDIR__/audacious/Output/pulse_audio.so (#0)",
     .filesel_path = NULL,
     .playlist_path = NULL,
     .playlist_font = NULL,

audacious-1.5.1-tuple_get_int-assertion.patch:
 playlist.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-1.5.1-tuple_get_int-assertion.patch ---
diff -Nur 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-09-13 09:46:50.030085752 +0200
@@ -2429,7 +2429,7 @@
                     /* Entry disappeared while we looked it up.
                        Restart. */
                     node = playlist->entries;
-                else if ((entry->tuple != NULL || entry->title != NULL) && 
+                else if (entry->tuple != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                          tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)
                 {
@@ -2480,7 +2480,7 @@
                         node = g_list_nth(playlist->entries,
                                           playlistwin_get_toprow());
                 }
-                else if ((entry->tuple != NULL || entry->title != NULL) && 
+                else if (entry->tuple != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                          tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1) {
                     update_playlistwin = TRUE;


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-10/audacious.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- audacious.spec	12 Sep 2009 08:58:09 -0000	1.44
+++ audacious.spec	13 Sep 2009 08:55:03 -0000	1.45
@@ -4,7 +4,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        GTK2 based media player similar to XMMS
 
 Group:          Applications/Multimedia
@@ -13,19 +13,13 @@ URL:            http://audacious-media-p
 
 Source0:        http://distfiles.atheme.org/audacious-%{version}.tgz
 Patch0:         audacious-1.5.1-xmms-skins.patch
-Patch1:         audacious-1.5.1-default-skin.patch
-# Patch2:         audacious-1.1.0-no-rpath.patch
-Patch3:         audacious-1.2.1-relative-links.patch
-# Patch4:         audacious-1.1.0-quoting.patch
-# Patch5:         audacious-1.1.0-amidi-backend.patch
-Patch6:         audacious-1.2.1-shaded-skin.patch
-# Patch7:         audacious-1.1.1-controlsocket-name.patch
-# Patch8:         audacious-1.1.1-playlist-twenty.patch
-Patch9:         audacious-1.4.2-id3tag-close-file.patch
+#Patch1:         audacious-1.5.1-default-skin.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
 Patch13:        audacious-1.5.1-desktop-name.patch
+Patch14:        audacious-1.5.1-tuple_get_int-assertion.patch
+Patch15:        audacious-1.5.1-pulseaudio-by-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -81,32 +75,8 @@ Files needed when building software for 
 # Read xmms skins directory
 %patch0 -p1 -b .xmms-skins
 
-# Use bluecurve as default skin
-%patch1 -p1 -b .default-skin
-
-# No rpath in binaries
-# %patch2 -p1 -b .no-rpath
-
-# Relative symlink paths
-# %patch3 -p1 -b .relative-links
-
-# Filename quoting
-# %patch4 -p1 -b .quoting
-
-# Amidi backends path
-# %patch5 -p1 -b .amidi-backend
-
-# Shaded playlist window decorations
-# %patch6 -p1 -b .shaded-skin
-
-# Controlsocket named "xmms" instead of "audacious"
-# %patch7 -p1 -b controlsocket-name
-
-# Fix "%20" in playlist entries
-# %patch8 -p1 -b playlist-twenty
-
-# Fix files left open on non-seekable mp3 streams
-# %patch9 -p1 -b id3tag-close-file
+# Use bluecurve as default skin (from package "bluecurve-xmms-skin")
+#patch1 -p1 -b .default-skin
 
 # Remove libSAD references from the public headers
 %patch10 -p1 -b libsad-header
@@ -120,6 +90,12 @@ Files needed when building software for 
 # /usr/bin/audacious looks for the fedora-audacious.desktop file
 %patch13 -p1 -b .desktop-name
 
+# was scheduled for 1.5.2
+%patch14 -p1 -b .tuple_get_int-assertion
+
+%patch15 -p1 -b .pulseaudio-by-default
+sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' src/audacious/audconfig.c
+
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
@@ -207,6 +183,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
+- Fix playlist tuple_get_int assertion (#522995).
+- Default to pulseaudio output plugin.
+- Prune obsolete/unapplied patches.
+
 * Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
 - Build with --enable-samplerate (off by default), BR libsamplerate-devel
 


--- audacious-1.1.0-amidi-backend.patch DELETED ---


--- audacious-1.1.0-no-rpath.patch DELETED ---


--- audacious-1.1.0-quoting.patch DELETED ---


--- audacious-1.1.1-controlsocket-name.patch DELETED ---


--- audacious-1.1.1-playlist-twenty.patch DELETED ---


--- audacious-1.2.1-relative-links.patch DELETED ---


--- audacious-1.2.1-shaded-skin.patch DELETED ---


--- audacious-1.4.2-id3tag-close-file.patch DELETED ---



From nim at fedoraproject.org  Sun Sep 13 09:11:33 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:11:33 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel
	google-droid-fonts-sans-fontconfig.conf, 
	1.3, 1.4 google-droid-fonts-sans-mono-fontconfig.conf, 1.1,
	1.2 google-droid-fonts-serif-fontconfig.conf, 1.1,
	1.2 google-droid-fonts.spec, 1.11, 1.12 import.log, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20090913091133.D715211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31828/devel

Modified Files:
	google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts-sans-mono-fontconfig.conf 
	google-droid-fonts-serif-fontconfig.conf 
	google-droid-fonts.spec import.log sources 
Log Message:
fontconfig tweaks


Index: google-droid-fonts-sans-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- google-droid-fonts-sans-fontconfig.conf	7 Sep 2009 19:36:14 -0000	1.3
+++ google-droid-fonts-sans-fontconfig.conf	13 Sep 2009 09:11:32 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>sans-serif</family>
@@ -13,18 +13,6 @@
       <family>sans-serif</family>
     </default>
   </alias>
-  <alias>
-    <family>Droid Sans Japanese</family>
-    <default>
-      <family>Droid Sans</family>
-    </default>
-  </alias>
-  <alias>
-    <family>Droid Sans Fallback</family>
-    <default>
-      <family>Droid Sans</family>
-    </default>
-  </alias>
   <match target="scan">
     <test name="family">
       <string>Droid Sans</string>
@@ -55,4 +43,16 @@
       <int>1</int>
     </edit>
   </match>
+  <alias binding="same">
+    <family>Droid Sans Japanese</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Fallback</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
 </fontconfig>


Index: google-droid-fonts-sans-mono-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-mono-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- google-droid-fonts-sans-mono-fontconfig.conf	16 Jan 2009 22:10:40 -0000	1.1
+++ google-droid-fonts-sans-mono-fontconfig.conf	13 Sep 2009 09:11:32 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>monospace</family>


Index: google-droid-fonts-serif-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-serif-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- google-droid-fonts-serif-fontconfig.conf	16 Jan 2009 22:10:40 -0000	1.1
+++ google-droid-fonts-serif-fontconfig.conf	13 Sep 2009 09:11:32 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- google-droid-fonts.spec	7 Sep 2009 19:36:14 -0000	1.11
+++ google-droid-fonts.spec	13 Sep 2009 09:11:32 -0000	1.12
@@ -12,7 +12,7 @@ other screen text.
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use the date we did a git dump
 Version: 20090906
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -138,6 +138,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-3
+? more Behdad-suggested fontconfig tweaks
+
 * Sun Sep  7 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090906-2
 ? first-level CJK fixes (as suggested by Behdad in bug #517789, complete fix


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	7 Sep 2009 19:36:14 -0000	1.8
+++ import.log	13 Sep 2009 09:11:32 -0000	1.9
@@ -6,3 +6,4 @@ google-droid-fonts-20090320-1_fc12:HEAD:
 google-droid-fonts-20090320-3_fc12:HEAD:google-droid-fonts-20090320-3.fc12.src.rpm:1248532826
 google-droid-fonts-20090906-1_fc12:HEAD:google-droid-fonts-20090906-1.fc12.src.rpm:1252264176
 google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.rpm:1252351928
+google-droid-fonts-20090906-3_fc12:HEAD:google-droid-fonts-20090906-3.fc12.src.rpm:1252833055


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Sep 2009 19:36:14 -0000	1.6
+++ sources	13 Sep 2009 09:11:32 -0000	1.7
@@ -5,5 +5,5 @@
 a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
 a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
 bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf
-6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
-8fbc87c7c5089a8e86c670b93a78964f  DroidSansJapanese.ttf
+9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
+6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf



From nim at fedoraproject.org  Sun Sep 13 09:17:15 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:15 +0000 (UTC)
Subject: rpms/gfs-bodoni-fonts/devel gfs-bodoni-fonts-fontconfig.conf, 1.3,
	1.4
Message-ID: <20090913091715.D823F11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-bodoni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1138/gfs-bodoni-fonts/devel

Modified Files:
	gfs-bodoni-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-bodoni-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-bodoni-fonts/devel/gfs-bodoni-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-bodoni-fonts-fontconfig.conf	17 Dec 2008 19:32:35 -0000	1.3
+++ gfs-bodoni-fonts-fontconfig.conf	13 Sep 2009 09:17:15 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:17:23 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:23 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel
	apanov-heuristica-fonts-fontconfig.conf, 1.1, 1.2
Message-ID: <20090913091723.2F8AA11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1200/apanov-heuristica-fonts/devel

Modified Files:
	apanov-heuristica-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: apanov-heuristica-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apanov-heuristica-fonts-fontconfig.conf	16 Nov 2008 21:40:37 -0000	1.1
+++ apanov-heuristica-fonts-fontconfig.conf	13 Sep 2009 09:17:22 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:17:30 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:30 +0000 (UTC)
Subject: rpms/gfs-didot-fonts/devel gfs-didot-fonts-fontconfig.conf,1.3,1.4
Message-ID: <20090913091730.9A91E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-didot-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1247/gfs-didot-fonts/devel

Modified Files:
	gfs-didot-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-didot-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/gfs-didot-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-didot-fonts-fontconfig.conf	17 Dec 2008 19:37:36 -0000	1.3
+++ gfs-didot-fonts-fontconfig.conf	13 Sep 2009 09:17:30 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:17:38 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:38 +0000 (UTC)
Subject: rpms/gfs-jackson-fonts/devel gfs-jackson-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913091738.15CD111C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-jackson-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1297/gfs-jackson-fonts/devel

Modified Files:
	gfs-jackson-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-jackson-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-jackson-fonts/devel/gfs-jackson-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-jackson-fonts-fontconfig.conf	17 Dec 2008 19:46:11 -0000	1.2
+++ gfs-jackson-fonts-fontconfig.conf	13 Sep 2009 09:17:37 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:17:45 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:45 +0000 (UTC)
Subject: rpms/gfs-nicefore-fonts/devel gfs-nicefore-fonts-fontconfig.conf,
	1.2, 1.3
Message-ID: <20090913091745.D17C311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-nicefore-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1342/gfs-nicefore-fonts/devel

Modified Files:
	gfs-nicefore-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-nicefore-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-nicefore-fonts/devel/gfs-nicefore-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-nicefore-fonts-fontconfig.conf	17 Dec 2008 19:49:49 -0000	1.2
+++ gfs-nicefore-fonts-fontconfig.conf	13 Sep 2009 09:17:45 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:17:52 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:52 +0000 (UTC)
Subject: rpms/gfs-complutum-fonts/devel gfs-complutum-fonts-fontconfig.conf, 
	1.2, 1.3
Message-ID: <20090913091752.D014311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-complutum-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1390/gfs-complutum-fonts/devel

Modified Files:
	gfs-complutum-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-complutum-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-complutum-fonts/devel/gfs-complutum-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-complutum-fonts-fontconfig.conf	17 Dec 2008 19:34:18 -0000	1.2
+++ gfs-complutum-fonts-fontconfig.conf	13 Sep 2009 09:17:52 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:17:59 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:17:59 +0000 (UTC)
Subject: rpms/sil-charis-fonts/devel sil-charis-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913091759.DB47F11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1429/sil-charis-fonts/devel

Modified Files:
	sil-charis-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: sil-charis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/sil-charis-fonts/devel/sil-charis-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sil-charis-fonts-fontconfig.conf	27 May 2009 19:06:00 -0000	1.2
+++ sil-charis-fonts-fontconfig.conf	13 Sep 2009 09:17:59 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:06 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:06 +0000 (UTC)
Subject: rpms/gfs-garaldus-fonts/devel gfs-garaldus-fonts-fontconfig.conf,
	1.2, 1.3
Message-ID: <20090913091806.988EE11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-garaldus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1468/gfs-garaldus-fonts/devel

Modified Files:
	gfs-garaldus-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-garaldus-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-garaldus-fonts/devel/gfs-garaldus-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-garaldus-fonts-fontconfig.conf	17 Dec 2008 19:42:45 -0000	1.2
+++ gfs-garaldus-fonts-fontconfig.conf	13 Sep 2009 09:18:06 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:15 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:15 +0000 (UTC)
Subject: rpms/gfs-olga-fonts/devel gfs-olga-fonts-fontconfig.conf,1.2,1.3
Message-ID: <20090913091815.E3D1911C0375@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-olga-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1544/gfs-olga-fonts/devel

Modified Files:
	gfs-olga-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-olga-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-olga-fonts/devel/gfs-olga-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-olga-fonts-fontconfig.conf	17 Dec 2008 19:51:36 -0000	1.2
+++ gfs-olga-fonts-fontconfig.conf	13 Sep 2009 09:18:15 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:23 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:23 +0000 (UTC)
Subject: rpms/gfs-decker-fonts/devel gfs-decker-fonts-fontconfig.conf, 1.1,
	1.2
Message-ID: <20090913091823.7EB8911C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-decker-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1618/gfs-decker-fonts/devel

Modified Files:
	gfs-decker-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-decker-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-decker-fonts/devel/gfs-decker-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gfs-decker-fonts-fontconfig.conf	23 Jun 2009 06:10:37 -0000	1.1
+++ gfs-decker-fonts-fontconfig.conf	13 Sep 2009 09:18:23 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>sans</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:31 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:31 +0000 (UTC)
Subject: rpms/gfs-gazis-fonts/devel gfs-gazis-fonts-fontconfig.conf,1.3,1.4
Message-ID: <20090913091831.00E4C11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-gazis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1670/gfs-gazis-fonts/devel

Modified Files:
	gfs-gazis-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-gazis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-gazis-fonts/devel/gfs-gazis-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-gazis-fonts-fontconfig.conf	17 Dec 2008 19:44:27 -0000	1.3
+++ gfs-gazis-fonts-fontconfig.conf	13 Sep 2009 09:18:30 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:38 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:38 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel adf-accanthis-fonts-fontconfig.conf, 
	1.1, 1.2
Message-ID: <20090913091838.EB9C111C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1739/adf-accanthis-fonts/devel

Modified Files:
	adf-accanthis-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: adf-accanthis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- adf-accanthis-fonts-fontconfig.conf	16 Jul 2009 18:18:05 -0000	1.1
+++ adf-accanthis-fonts-fontconfig.conf	13 Sep 2009 09:18:38 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:46 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:46 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel
	adf-accanthis-fonts-fontconfig-2.conf, 1.1, 1.2
Message-ID: <20090913091846.6051E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1796/adf-accanthis-fonts/devel

Modified Files:
	adf-accanthis-fonts-fontconfig-2.conf 
Log Message:
use canonical dtd declaration


Index: adf-accanthis-fonts-fontconfig-2.conf
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts-fontconfig-2.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- adf-accanthis-fonts-fontconfig-2.conf	16 Jul 2009 18:18:05 -0000	1.1
+++ adf-accanthis-fonts-fontconfig-2.conf	13 Sep 2009 09:18:46 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:18:53 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:18:53 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel
	adf-accanthis-fonts-fontconfig-3.conf, 1.1, 1.2
Message-ID: <20090913091853.7FA8611C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1856/adf-accanthis-fonts/devel

Modified Files:
	adf-accanthis-fonts-fontconfig-3.conf 
Log Message:
use canonical dtd declaration


Index: adf-accanthis-fonts-fontconfig-3.conf
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts-fontconfig-3.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- adf-accanthis-fonts-fontconfig-3.conf	16 Jul 2009 18:18:05 -0000	1.1
+++ adf-accanthis-fonts-fontconfig-3.conf	13 Sep 2009 09:18:53 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:00 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:00 +0000 (UTC)
Subject: rpms/gfs-neohellenic-fonts/devel
	gfs-neohellenic-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913091900.B8B2511C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-neohellenic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1919/gfs-neohellenic-fonts/devel

Modified Files:
	gfs-neohellenic-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-neohellenic-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-neohellenic-fonts/devel/gfs-neohellenic-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-neohellenic-fonts-fontconfig.conf	17 Dec 2008 19:47:54 -0000	1.3
+++ gfs-neohellenic-fonts-fontconfig.conf	13 Sep 2009 09:19:00 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>sans-serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:07 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:07 +0000 (UTC)
Subject: rpms/gfs-solomos-fonts/devel gfs-solomos-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913091907.DB15111C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-solomos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1979/gfs-solomos-fonts/devel

Modified Files:
	gfs-solomos-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-solomos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-solomos-fonts/devel/gfs-solomos-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-solomos-fonts-fontconfig.conf	17 Dec 2008 19:55:21 -0000	1.2
+++ gfs-solomos-fonts-fontconfig.conf	13 Sep 2009 09:19:07 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:14 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:14 +0000 (UTC)
Subject: rpms/gfs-ambrosia-fonts/devel gfs-ambrosia-fonts-fontconfig.conf,
	1.2, 1.3
Message-ID: <20090913091914.EFB8611C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-ambrosia-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2036/gfs-ambrosia-fonts/devel

Modified Files:
	gfs-ambrosia-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-ambrosia-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-ambrosia-fonts/devel/gfs-ambrosia-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-ambrosia-fonts-fontconfig.conf	17 Dec 2008 19:25:25 -0000	1.2
+++ gfs-ambrosia-fonts-fontconfig.conf	13 Sep 2009 09:19:14 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:23 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:23 +0000 (UTC)
Subject: rpms/gfs-bodoni-classic-fonts/devel
	gfs-bodoni-classic-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913091923.0943C11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-bodoni-classic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2098/gfs-bodoni-classic-fonts/devel

Modified Files:
	gfs-bodoni-classic-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-bodoni-classic-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-bodoni-classic-fonts/devel/gfs-bodoni-classic-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-bodoni-classic-fonts-fontconfig.conf	17 Dec 2008 19:30:55 -0000	1.2
+++ gfs-bodoni-classic-fonts-fontconfig.conf	13 Sep 2009 09:19:22 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:30 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:30 +0000 (UTC)
Subject: rpms/gfs-baskerville-fonts/devel
	gfs-baskerville-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913091930.96BCA11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-baskerville-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2149/gfs-baskerville-fonts/devel

Modified Files:
	gfs-baskerville-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-baskerville-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-baskerville-fonts/devel/gfs-baskerville-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-baskerville-fonts-fontconfig.conf	17 Dec 2008 19:28:57 -0000	1.2
+++ gfs-baskerville-fonts-fontconfig.conf	13 Sep 2009 09:19:30 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:38 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:38 +0000 (UTC)
Subject: rpms/sil-andika-fonts/devel sil-andika-fonts-fontconfig.conf, 1.1,
	1.2
Message-ID: <20090913091938.6ED3411C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-andika-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2195/sil-andika-fonts/devel

Modified Files:
	sil-andika-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: sil-andika-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/sil-andika-fonts/devel/sil-andika-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sil-andika-fonts-fontconfig.conf	27 Jan 2009 06:57:20 -0000	1.1
+++ sil-andika-fonts-fontconfig.conf	13 Sep 2009 09:19:38 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>sans-serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:46 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:46 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts/devel apanov-edrip-fonts-fontconfig.conf,
	1.1, 1.2
Message-ID: <20090913091946.695AC11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2252/apanov-edrip-fonts/devel

Modified Files:
	apanov-edrip-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: apanov-edrip-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/apanov-edrip-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apanov-edrip-fonts-fontconfig.conf	27 Jan 2009 06:55:56 -0000	1.1
+++ apanov-edrip-fonts-fontconfig.conf	13 Sep 2009 09:19:46 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:19:53 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:19:53 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/devel
	gfs-philostratos-fonts-fontconfig.conf, 1.1, 1.2
Message-ID: <20090913091953.7CF3511C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-philostratos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2299/gfs-philostratos-fonts/devel

Modified Files:
	gfs-philostratos-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-philostratos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/devel/gfs-philostratos-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gfs-philostratos-fonts-fontconfig.conf	9 Sep 2009 18:48:53 -0000	1.1
+++ gfs-philostratos-fonts-fontconfig.conf	13 Sep 2009 09:19:53 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:04 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:04 +0000 (UTC)
Subject: rpms/sil-charis-compact-fonts/devel
	sil-charis-compact-fonts-fontconfig.conf, 1.1, 1.2
Message-ID: <20090913092004.744C111C0425@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-charis-compact-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2376/sil-charis-compact-fonts/devel

Modified Files:
	sil-charis-compact-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: sil-charis-compact-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/sil-charis-compact-fonts/devel/sil-charis-compact-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sil-charis-compact-fonts-fontconfig.conf	27 May 2009 19:10:45 -0000	1.1
+++ sil-charis-compact-fonts-fontconfig.conf	13 Sep 2009 09:20:04 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:12 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:12 +0000 (UTC)
Subject: rpms/yanone-kaffeesatz-fonts/devel
	yanone-kaffeesatz-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913092012.0346911C0425@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2441/yanone-kaffeesatz-fonts/devel

Modified Files:
	yanone-kaffeesatz-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: yanone-kaffeesatz-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- yanone-kaffeesatz-fonts-fontconfig.conf	17 Dec 2008 20:00:45 -0000	1.3
+++ yanone-kaffeesatz-fonts-fontconfig.conf	13 Sep 2009 09:20:11 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:20 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:20 +0000 (UTC)
Subject: rpms/gfs-artemisia-fonts/devel gfs-artemisia-fonts-fontconfig.conf, 
	1.3, 1.4
Message-ID: <20090913092020.4A4B611C0425@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-artemisia-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2479/gfs-artemisia-fonts/devel

Modified Files:
	gfs-artemisia-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-artemisia-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-artemisia-fonts/devel/gfs-artemisia-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-artemisia-fonts-fontconfig.conf	17 Dec 2008 19:27:14 -0000	1.3
+++ gfs-artemisia-fonts-fontconfig.conf	13 Sep 2009 09:20:20 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:29 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:29 +0000 (UTC)
Subject: rpms/gfs-fleischman-fonts/devel
	gfs-fleischman-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913092029.5534411C0425@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-fleischman-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2535/gfs-fleischman-fonts/devel

Modified Files:
	gfs-fleischman-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-fleischman-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-fleischman-fonts/devel/gfs-fleischman-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-fleischman-fonts-fontconfig.conf	17 Dec 2008 19:41:00 -0000	1.2
+++ gfs-fleischman-fonts-fontconfig.conf	13 Sep 2009 09:20:29 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:37 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:37 +0000 (UTC)
Subject: rpms/gfs-didot-classic-fonts/devel
	gfs-didot-classic-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913092037.8F59011C0425@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-didot-classic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2601/gfs-didot-classic-fonts/devel

Modified Files:
	gfs-didot-classic-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-didot-classic-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/gfs-didot-classic-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-didot-classic-fonts-fontconfig.conf	17 Dec 2008 19:35:56 -0000	1.3
+++ gfs-didot-classic-fonts-fontconfig.conf	13 Sep 2009 09:20:37 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:45 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:45 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-fontconfig.conf,1.4,1.5
Message-ID: <20090913092045.2645A11C0425@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2665/stix-fonts/devel

Modified Files:
	stix-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: stix-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stix-fonts-fontconfig.conf	17 Dec 2008 19:58:52 -0000	1.4
+++ stix-fonts-fontconfig.conf	13 Sep 2009 09:20:44 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:20:53 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:20:53 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-pua-fontconfig.conf,1.3,1.4
Message-ID: <20090913092053.5848F11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2723/stix-fonts/devel

Modified Files:
	stix-fonts-pua-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: stix-fonts-pua-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-pua-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- stix-fonts-pua-fontconfig.conf	11 Jul 2008 20:56:41 -0000	1.3
+++ stix-fonts-pua-fontconfig.conf	13 Sep 2009 09:20:53 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">
     <family>STIXNonUnicode</family>



From nim at fedoraproject.org  Sun Sep 13 09:21:01 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:21:01 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-variants-fontconfig.conf,1.3,1.4
Message-ID: <20090913092101.3B24B11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2770/stix-fonts/devel

Modified Files:
	stix-fonts-variants-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: stix-fonts-variants-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-variants-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- stix-fonts-variants-fontconfig.conf	11 Jul 2008 20:56:41 -0000	1.3
+++ stix-fonts-variants-fontconfig.conf	13 Sep 2009 09:21:01 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">
     <family>STIXVariants</family>



From nim at fedoraproject.org  Sun Sep 13 09:21:09 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:21:09 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-integrals-fontconfig.conf,1.3,1.4
Message-ID: <20090913092109.BA62E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2820/stix-fonts/devel

Modified Files:
	stix-fonts-integrals-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: stix-fonts-integrals-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-integrals-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- stix-fonts-integrals-fontconfig.conf	11 Jul 2008 20:56:41 -0000	1.3
+++ stix-fonts-integrals-fontconfig.conf	13 Sep 2009 09:21:09 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">
     <family>STIXIntegrals</family>



From nim at fedoraproject.org  Sun Sep 13 09:21:17 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:21:17 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-sizes-fontconfig.conf,1.3,1.4
Message-ID: <20090913092117.8538611C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2875/stix-fonts/devel

Modified Files:
	stix-fonts-sizes-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: stix-fonts-sizes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-sizes-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- stix-fonts-sizes-fontconfig.conf	11 Jul 2008 20:56:41 -0000	1.3
+++ stix-fonts-sizes-fontconfig.conf	13 Sep 2009 09:21:17 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">
     <family>STIXSize1</family>



From nim at fedoraproject.org  Sun Sep 13 09:21:25 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:21:25 +0000 (UTC)
Subject: rpms/gfs-eustace-fonts/devel gfs-eustace-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913092125.52E1D11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-eustace-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2930/gfs-eustace-fonts/devel

Modified Files:
	gfs-eustace-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-eustace-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-eustace-fonts/devel/gfs-eustace-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-eustace-fonts-fontconfig.conf	17 Dec 2008 19:39:21 -0000	1.2
+++ gfs-eustace-fonts-fontconfig.conf	13 Sep 2009 09:21:24 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:21:44 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:21:44 +0000 (UTC)
Subject: rpms/gfs-pyrsos-fonts/devel gfs-pyrsos-fonts-fontconfig.conf, 1.1,
	1.2
Message-ID: <20090913092144.47C4211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-pyrsos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3117/gfs-pyrsos-fonts/devel

Modified Files:
	gfs-pyrsos-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-pyrsos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-pyrsos-fonts/devel/gfs-pyrsos-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gfs-pyrsos-fonts-fontconfig.conf	23 Jun 2009 06:12:22 -0000	1.1
+++ gfs-pyrsos-fonts-fontconfig.conf	13 Sep 2009 09:21:44 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:21:52 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:21:52 +0000 (UTC)
Subject: rpms/senamirmir-washra-fonts/devel
	senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf, 1.1, 1.2
Message-ID: <20090913092152.5125311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3166/senamirmir-washra-fonts/devel

Modified Files:
	senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf	10 Jun 2009 21:48:27 -0000	1.1
+++ senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf	13 Sep 2009 09:21:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:22:01 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:22:01 +0000 (UTC)
Subject: rpms/senamirmir-washra-fonts/devel
	senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf, 1.1, 1.2
Message-ID: <20090913092201.4743211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3225/senamirmir-washra-fonts/devel

Modified Files:
	senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf	10 Jun 2009 21:48:27 -0000	1.1
+++ senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf	13 Sep 2009 09:22:00 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:22:09 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:22:09 +0000 (UTC)
Subject: rpms/gfs-porson-fonts/devel gfs-porson-fonts-fontconfig.conf, 1.3,
	1.4
Message-ID: <20090913092209.6827D11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-porson-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3287/gfs-porson-fonts/devel

Modified Files:
	gfs-porson-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-porson-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-porson-fonts/devel/gfs-porson-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-porson-fonts-fontconfig.conf	17 Dec 2008 19:53:31 -0000	1.3
+++ gfs-porson-fonts-fontconfig.conf	13 Sep 2009 09:22:08 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>



From nim at fedoraproject.org  Sun Sep 13 09:22:17 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:22:17 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts-fontconfig.conf, 
	1.2, 1.3
Message-ID: <20090913092217.2C27611C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3346/ecolier-court-fonts/devel

Modified Files:
	ecolier-court-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: ecolier-court-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecolier-court-fonts-fontconfig.conf	17 Dec 2008 19:21:34 -0000	1.2
+++ ecolier-court-fonts-fontconfig.conf	13 Sep 2009 09:22:16 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>cursive</family>



From nim at fedoraproject.org  Sun Sep 13 09:22:24 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:22:24 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel
	ecolier-court-fonts-lignes-fontconfig.conf, 1.1, 1.2
Message-ID: <20090913092224.6A96E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3423/ecolier-court-fonts/devel

Modified Files:
	ecolier-court-fonts-lignes-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: ecolier-court-fonts-lignes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-lignes-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecolier-court-fonts-lignes-fontconfig.conf	17 Dec 2008 19:21:34 -0000	1.1
+++ ecolier-court-fonts-lignes-fontconfig.conf	13 Sep 2009 09:22:24 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:22:31 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:22:31 +0000 (UTC)
Subject: rpms/gfs-theokritos-fonts/devel
	gfs-theokritos-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913092231.B8C6A11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-theokritos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3470/gfs-theokritos-fonts/devel

Modified Files:
	gfs-theokritos-fonts-fontconfig.conf 
Log Message:
use canonical dtd declaration


Index: gfs-theokritos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-theokritos-fonts/devel/gfs-theokritos-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-theokritos-fonts-fontconfig.conf	17 Dec 2008 19:57:03 -0000	1.2
+++ gfs-theokritos-fonts-fontconfig.conf	13 Sep 2009 09:22:31 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>fantasy</family>



From nim at fedoraproject.org  Sun Sep 13 09:39:54 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:39:54 +0000 (UTC)
Subject: rpms/gfs-bodoni-fonts/devel gfs-bodoni-fonts-fontconfig.conf, 1.4,
	1.5
Message-ID: <20090913093954.17DAB11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-bodoni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9011/gfs-bodoni-fonts/devel

Modified Files:
	gfs-bodoni-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-bodoni-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-bodoni-fonts/devel/gfs-bodoni-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-bodoni-fonts-fontconfig.conf	13 Sep 2009 09:17:15 -0000	1.4
+++ gfs-bodoni-fonts-fontconfig.conf	13 Sep 2009 09:39:52 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:01 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:01 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel
	apanov-heuristica-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094001.725F211C0427@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073/apanov-heuristica-fonts/devel

Modified Files:
	apanov-heuristica-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: apanov-heuristica-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- apanov-heuristica-fonts-fontconfig.conf	13 Sep 2009 09:17:22 -0000	1.2
+++ apanov-heuristica-fonts-fontconfig.conf	13 Sep 2009 09:40:01 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:09 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:09 +0000 (UTC)
Subject: rpms/gfs-didot-fonts/devel gfs-didot-fonts-fontconfig.conf,1.4,1.5
Message-ID: <20090913094009.A755A11C0489@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-didot-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9148/gfs-didot-fonts/devel

Modified Files:
	gfs-didot-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-didot-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/gfs-didot-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-didot-fonts-fontconfig.conf	13 Sep 2009 09:17:30 -0000	1.4
+++ gfs-didot-fonts-fontconfig.conf	13 Sep 2009 09:40:09 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:17 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:17 +0000 (UTC)
Subject: rpms/gfs-jackson-fonts/devel gfs-jackson-fonts-fontconfig.conf, 1.3,
	1.4
Message-ID: <20090913094017.7496F11C0489@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-jackson-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9206/gfs-jackson-fonts/devel

Modified Files:
	gfs-jackson-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-jackson-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-jackson-fonts/devel/gfs-jackson-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-jackson-fonts-fontconfig.conf	13 Sep 2009 09:17:37 -0000	1.3
+++ gfs-jackson-fonts-fontconfig.conf	13 Sep 2009 09:40:17 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:25 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:25 +0000 (UTC)
Subject: rpms/gfs-nicefore-fonts/devel gfs-nicefore-fonts-fontconfig.conf,
	1.3, 1.4
Message-ID: <20090913094025.831B711C0489@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-nicefore-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9274/gfs-nicefore-fonts/devel

Modified Files:
	gfs-nicefore-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-nicefore-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-nicefore-fonts/devel/gfs-nicefore-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-nicefore-fonts-fontconfig.conf	13 Sep 2009 09:17:45 -0000	1.3
+++ gfs-nicefore-fonts-fontconfig.conf	13 Sep 2009 09:40:25 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:33 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:33 +0000 (UTC)
Subject: rpms/gfs-complutum-fonts/devel gfs-complutum-fonts-fontconfig.conf, 
	1.3, 1.4
Message-ID: <20090913094033.6937511C0489@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-complutum-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9329/gfs-complutum-fonts/devel

Modified Files:
	gfs-complutum-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-complutum-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-complutum-fonts/devel/gfs-complutum-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-complutum-fonts-fontconfig.conf	13 Sep 2009 09:17:52 -0000	1.3
+++ gfs-complutum-fonts-fontconfig.conf	13 Sep 2009 09:40:33 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:41 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:41 +0000 (UTC)
Subject: rpms/sil-charis-fonts/devel sil-charis-fonts-fontconfig.conf, 1.3,
	1.4
Message-ID: <20090913094041.B441411C0489@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9391/sil-charis-fonts/devel

Modified Files:
	sil-charis-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: sil-charis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/sil-charis-fonts/devel/sil-charis-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sil-charis-fonts-fontconfig.conf	13 Sep 2009 09:17:59 -0000	1.3
+++ sil-charis-fonts-fontconfig.conf	13 Sep 2009 09:40:41 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:49 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:49 +0000 (UTC)
Subject: rpms/gfs-garaldus-fonts/devel gfs-garaldus-fonts-fontconfig.conf,
	1.3, 1.4
Message-ID: <20090913094049.DED5311C0489@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-garaldus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9437/gfs-garaldus-fonts/devel

Modified Files:
	gfs-garaldus-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-garaldus-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-garaldus-fonts/devel/gfs-garaldus-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-garaldus-fonts-fontconfig.conf	13 Sep 2009 09:18:06 -0000	1.3
+++ gfs-garaldus-fonts-fontconfig.conf	13 Sep 2009 09:40:49 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:40:58 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:40:58 +0000 (UTC)
Subject: rpms/gfs-olga-fonts/devel gfs-olga-fonts-fontconfig.conf,1.3,1.4
Message-ID: <20090913094058.0FBAC11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-olga-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/gfs-olga-fonts/devel

Modified Files:
	gfs-olga-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-olga-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-olga-fonts/devel/gfs-olga-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-olga-fonts-fontconfig.conf	13 Sep 2009 09:18:15 -0000	1.3
+++ gfs-olga-fonts-fontconfig.conf	13 Sep 2009 09:40:57 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:05 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:05 +0000 (UTC)
Subject: rpms/gfs-decker-fonts/devel gfs-decker-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913094105.D2A7611C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-decker-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9561/gfs-decker-fonts/devel

Modified Files:
	gfs-decker-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-decker-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-decker-fonts/devel/gfs-decker-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-decker-fonts-fontconfig.conf	13 Sep 2009 09:18:23 -0000	1.2
+++ gfs-decker-fonts-fontconfig.conf	13 Sep 2009 09:41:05 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:13 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:13 +0000 (UTC)
Subject: rpms/gfs-gazis-fonts/devel gfs-gazis-fonts-fontconfig.conf,1.4,1.5
Message-ID: <20090913094113.2677211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-gazis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9626/gfs-gazis-fonts/devel

Modified Files:
	gfs-gazis-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-gazis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-gazis-fonts/devel/gfs-gazis-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-gazis-fonts-fontconfig.conf	13 Sep 2009 09:18:30 -0000	1.4
+++ gfs-gazis-fonts-fontconfig.conf	13 Sep 2009 09:41:12 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:21 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:21 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel adf-accanthis-fonts-fontconfig.conf, 
	1.2, 1.3
Message-ID: <20090913094121.83B8111C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9676/adf-accanthis-fonts/devel

Modified Files:
	adf-accanthis-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: adf-accanthis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- adf-accanthis-fonts-fontconfig.conf	13 Sep 2009 09:18:38 -0000	1.2
+++ adf-accanthis-fonts-fontconfig.conf	13 Sep 2009 09:41:21 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:28 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:28 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel
	adf-accanthis-fonts-fontconfig-2.conf, 1.2, 1.3
Message-ID: <20090913094128.F387A11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9731/adf-accanthis-fonts/devel

Modified Files:
	adf-accanthis-fonts-fontconfig-2.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: adf-accanthis-fonts-fontconfig-2.conf
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts-fontconfig-2.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- adf-accanthis-fonts-fontconfig-2.conf	13 Sep 2009 09:18:46 -0000	1.2
+++ adf-accanthis-fonts-fontconfig-2.conf	13 Sep 2009 09:41:28 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:36 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:36 +0000 (UTC)
Subject: rpms/adf-accanthis-fonts/devel
	adf-accanthis-fonts-fontconfig-3.conf, 1.2, 1.3
Message-ID: <20090913094136.A992F11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-accanthis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9798/adf-accanthis-fonts/devel

Modified Files:
	adf-accanthis-fonts-fontconfig-3.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: adf-accanthis-fonts-fontconfig-3.conf
===================================================================
RCS file: /cvs/extras/rpms/adf-accanthis-fonts/devel/adf-accanthis-fonts-fontconfig-3.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- adf-accanthis-fonts-fontconfig-3.conf	13 Sep 2009 09:18:53 -0000	1.2
+++ adf-accanthis-fonts-fontconfig-3.conf	13 Sep 2009 09:41:36 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:43 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:43 +0000 (UTC)
Subject: rpms/gfs-neohellenic-fonts/devel
	gfs-neohellenic-fonts-fontconfig.conf, 1.4, 1.5
Message-ID: <20090913094143.E841311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-neohellenic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9855/gfs-neohellenic-fonts/devel

Modified Files:
	gfs-neohellenic-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-neohellenic-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-neohellenic-fonts/devel/gfs-neohellenic-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-neohellenic-fonts-fontconfig.conf	13 Sep 2009 09:19:00 -0000	1.4
+++ gfs-neohellenic-fonts-fontconfig.conf	13 Sep 2009 09:41:43 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:51 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:51 +0000 (UTC)
Subject: rpms/gfs-solomos-fonts/devel gfs-solomos-fonts-fontconfig.conf, 1.3,
	1.4
Message-ID: <20090913094151.A333811C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-solomos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9910/gfs-solomos-fonts/devel

Modified Files:
	gfs-solomos-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-solomos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-solomos-fonts/devel/gfs-solomos-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-solomos-fonts-fontconfig.conf	13 Sep 2009 09:19:07 -0000	1.3
+++ gfs-solomos-fonts-fontconfig.conf	13 Sep 2009 09:41:51 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:41:58 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:41:58 +0000 (UTC)
Subject: rpms/gfs-ambrosia-fonts/devel gfs-ambrosia-fonts-fontconfig.conf,
	1.3, 1.4
Message-ID: <20090913094158.D4F6E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-ambrosia-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9954/gfs-ambrosia-fonts/devel

Modified Files:
	gfs-ambrosia-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-ambrosia-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-ambrosia-fonts/devel/gfs-ambrosia-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-ambrosia-fonts-fontconfig.conf	13 Sep 2009 09:19:14 -0000	1.3
+++ gfs-ambrosia-fonts-fontconfig.conf	13 Sep 2009 09:41:58 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:06 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:06 +0000 (UTC)
Subject: rpms/gfs-bodoni-classic-fonts/devel
	gfs-bodoni-classic-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913094206.1551011C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-bodoni-classic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10024/gfs-bodoni-classic-fonts/devel

Modified Files:
	gfs-bodoni-classic-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-bodoni-classic-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-bodoni-classic-fonts/devel/gfs-bodoni-classic-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-bodoni-classic-fonts-fontconfig.conf	13 Sep 2009 09:19:22 -0000	1.3
+++ gfs-bodoni-classic-fonts-fontconfig.conf	13 Sep 2009 09:42:05 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:13 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:13 +0000 (UTC)
Subject: rpms/gfs-baskerville-fonts/devel
	gfs-baskerville-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913094213.B565E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-baskerville-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10083/gfs-baskerville-fonts/devel

Modified Files:
	gfs-baskerville-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-baskerville-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-baskerville-fonts/devel/gfs-baskerville-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-baskerville-fonts-fontconfig.conf	13 Sep 2009 09:19:30 -0000	1.3
+++ gfs-baskerville-fonts-fontconfig.conf	13 Sep 2009 09:42:13 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:21 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:21 +0000 (UTC)
Subject: rpms/sil-andika-fonts/devel sil-andika-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913094221.F20CE11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-andika-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10137/sil-andika-fonts/devel

Modified Files:
	sil-andika-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: sil-andika-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/sil-andika-fonts/devel/sil-andika-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sil-andika-fonts-fontconfig.conf	13 Sep 2009 09:19:38 -0000	1.2
+++ sil-andika-fonts-fontconfig.conf	13 Sep 2009 09:42:21 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:29 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:29 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts/devel apanov-edrip-fonts-fontconfig.conf,
	1.2, 1.3
Message-ID: <20090913094229.D4A5C11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10194/apanov-edrip-fonts/devel

Modified Files:
	apanov-edrip-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: apanov-edrip-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/apanov-edrip-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- apanov-edrip-fonts-fontconfig.conf	13 Sep 2009 09:19:46 -0000	1.2
+++ apanov-edrip-fonts-fontconfig.conf	13 Sep 2009 09:42:29 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:37 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:37 +0000 (UTC)
Subject: rpms/gfs-philostratos-fonts/devel
	gfs-philostratos-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094237.91A9911C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-philostratos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10245/gfs-philostratos-fonts/devel

Modified Files:
	gfs-philostratos-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-philostratos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-philostratos-fonts/devel/gfs-philostratos-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-philostratos-fonts-fontconfig.conf	13 Sep 2009 09:19:53 -0000	1.2
+++ gfs-philostratos-fonts-fontconfig.conf	13 Sep 2009 09:42:37 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:49 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:49 +0000 (UTC)
Subject: rpms/sil-charis-compact-fonts/devel
	sil-charis-compact-fonts-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094249.5B21311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-charis-compact-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10328/sil-charis-compact-fonts/devel

Modified Files:
	sil-charis-compact-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: sil-charis-compact-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/sil-charis-compact-fonts/devel/sil-charis-compact-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sil-charis-compact-fonts-fontconfig.conf	13 Sep 2009 09:20:04 -0000	1.2
+++ sil-charis-compact-fonts-fontconfig.conf	13 Sep 2009 09:42:49 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:42:56 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:42:56 +0000 (UTC)
Subject: rpms/yanone-kaffeesatz-fonts/devel
	yanone-kaffeesatz-fonts-fontconfig.conf, 1.4, 1.5
Message-ID: <20090913094256.8A33F11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10387/yanone-kaffeesatz-fonts/devel

Modified Files:
	yanone-kaffeesatz-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: yanone-kaffeesatz-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- yanone-kaffeesatz-fonts-fontconfig.conf	13 Sep 2009 09:20:11 -0000	1.4
+++ yanone-kaffeesatz-fonts-fontconfig.conf	13 Sep 2009 09:42:56 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:43:03 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:03 +0000 (UTC)
Subject: rpms/gfs-artemisia-fonts/devel gfs-artemisia-fonts-fontconfig.conf, 
	1.4, 1.5
Message-ID: <20090913094303.7F61211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-artemisia-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10450/gfs-artemisia-fonts/devel

Modified Files:
	gfs-artemisia-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-artemisia-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-artemisia-fonts/devel/gfs-artemisia-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-artemisia-fonts-fontconfig.conf	13 Sep 2009 09:20:20 -0000	1.4
+++ gfs-artemisia-fonts-fontconfig.conf	13 Sep 2009 09:43:03 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:43:10 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:10 +0000 (UTC)
Subject: rpms/gfs-fleischman-fonts/devel
	gfs-fleischman-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913094310.EAD6311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-fleischman-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10497/gfs-fleischman-fonts/devel

Modified Files:
	gfs-fleischman-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-fleischman-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-fleischman-fonts/devel/gfs-fleischman-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-fleischman-fonts-fontconfig.conf	13 Sep 2009 09:20:29 -0000	1.3
+++ gfs-fleischman-fonts-fontconfig.conf	13 Sep 2009 09:43:10 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:43:18 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:18 +0000 (UTC)
Subject: rpms/gfs-didot-classic-fonts/devel
	gfs-didot-classic-fonts-fontconfig.conf, 1.4, 1.5
Message-ID: <20090913094318.D697211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-didot-classic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10541/gfs-didot-classic-fonts/devel

Modified Files:
	gfs-didot-classic-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-didot-classic-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/gfs-didot-classic-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-didot-classic-fonts-fontconfig.conf	13 Sep 2009 09:20:37 -0000	1.4
+++ gfs-didot-classic-fonts-fontconfig.conf	13 Sep 2009 09:43:18 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:43:26 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:26 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-fontconfig.conf,1.5,1.6
Message-ID: <20090913094326.8D13911C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10590/stix-fonts/devel

Modified Files:
	stix-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: stix-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- stix-fonts-fontconfig.conf	13 Sep 2009 09:20:44 -0000	1.5
+++ stix-fonts-fontconfig.conf	13 Sep 2009 09:43:26 -0000	1.6
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:43:33 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:33 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-pua-fontconfig.conf,1.4,1.5
Message-ID: <20090913094333.9661E11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10650/stix-fonts/devel

Modified Files:
	stix-fonts-pua-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: stix-fonts-pua-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-pua-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stix-fonts-pua-fontconfig.conf	13 Sep 2009 09:20:53 -0000	1.4
+++ stix-fonts-pua-fontconfig.conf	13 Sep 2009 09:43:33 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">



From nim at fedoraproject.org  Sun Sep 13 09:43:41 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:41 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-variants-fontconfig.conf,1.4,1.5
Message-ID: <20090913094341.01B9511C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10704/stix-fonts/devel

Modified Files:
	stix-fonts-variants-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: stix-fonts-variants-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-variants-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stix-fonts-variants-fontconfig.conf	13 Sep 2009 09:21:01 -0000	1.4
+++ stix-fonts-variants-fontconfig.conf	13 Sep 2009 09:43:40 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">



From nim at fedoraproject.org  Sun Sep 13 09:43:48 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:48 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-integrals-fontconfig.conf,1.4,1.5
Message-ID: <20090913094348.E587711C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10756/stix-fonts/devel

Modified Files:
	stix-fonts-integrals-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: stix-fonts-integrals-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-integrals-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stix-fonts-integrals-fontconfig.conf	13 Sep 2009 09:21:09 -0000	1.4
+++ stix-fonts-integrals-fontconfig.conf	13 Sep 2009 09:43:48 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">



From nim at fedoraproject.org  Sun Sep 13 09:43:56 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:43:56 +0000 (UTC)
Subject: rpms/stix-fonts/devel stix-fonts-sizes-fontconfig.conf,1.4,1.5
Message-ID: <20090913094356.802F911C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10816/stix-fonts/devel

Modified Files:
	stix-fonts-sizes-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: stix-fonts-sizes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-sizes-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stix-fonts-sizes-fontconfig.conf	13 Sep 2009 09:21:17 -0000	1.4
+++ stix-fonts-sizes-fontconfig.conf	13 Sep 2009 09:43:56 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias binding="same">



From nim at fedoraproject.org  Sun Sep 13 09:44:03 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:03 +0000 (UTC)
Subject: rpms/gfs-eustace-fonts/devel gfs-eustace-fonts-fontconfig.conf, 1.3,
	1.4
Message-ID: <20090913094403.C172511C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-eustace-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10865/gfs-eustace-fonts/devel

Modified Files:
	gfs-eustace-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-eustace-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-eustace-fonts/devel/gfs-eustace-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-eustace-fonts-fontconfig.conf	13 Sep 2009 09:21:24 -0000	1.3
+++ gfs-eustace-fonts-fontconfig.conf	13 Sep 2009 09:44:03 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:11 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:11 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel
	google-droid-fonts-serif-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094411.059EE11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10933/google-droid-fonts/devel

Modified Files:
	google-droid-fonts-serif-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: google-droid-fonts-serif-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-serif-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- google-droid-fonts-serif-fontconfig.conf	13 Sep 2009 09:11:32 -0000	1.2
+++ google-droid-fonts-serif-fontconfig.conf	13 Sep 2009 09:44:10 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:18 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:18 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel
	google-droid-fonts-sans-fontconfig.conf, 1.4, 1.5
Message-ID: <20090913094418.EE85311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10974/google-droid-fonts/devel

Modified Files:
	google-droid-fonts-sans-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: google-droid-fonts-sans-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- google-droid-fonts-sans-fontconfig.conf	13 Sep 2009 09:11:32 -0000	1.4
+++ google-droid-fonts-sans-fontconfig.conf	13 Sep 2009 09:44:18 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:26 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:26 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel
	google-droid-fonts-sans-mono-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094426.C40DE11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033/google-droid-fonts/devel

Modified Files:
	google-droid-fonts-sans-mono-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: google-droid-fonts-sans-mono-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-mono-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- google-droid-fonts-sans-mono-fontconfig.conf	13 Sep 2009 09:11:32 -0000	1.2
+++ google-droid-fonts-sans-mono-fontconfig.conf	13 Sep 2009 09:44:26 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:33 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:33 +0000 (UTC)
Subject: rpms/gfs-pyrsos-fonts/devel gfs-pyrsos-fonts-fontconfig.conf, 1.2,
	1.3
Message-ID: <20090913094433.BF32D11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-pyrsos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11092/gfs-pyrsos-fonts/devel

Modified Files:
	gfs-pyrsos-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-pyrsos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-pyrsos-fonts/devel/gfs-pyrsos-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gfs-pyrsos-fonts-fontconfig.conf	13 Sep 2009 09:21:44 -0000	1.2
+++ gfs-pyrsos-fonts-fontconfig.conf	13 Sep 2009 09:44:33 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:41 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:41 +0000 (UTC)
Subject: rpms/senamirmir-washra-fonts/devel
	senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094441.4511C11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11142/senamirmir-washra-fonts/devel

Modified Files:
	senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf	13 Sep 2009 09:21:52 -0000	1.2
+++ senamirmir-washra-fonts-yigezu-bisrat-goffer-fontconfig.conf	13 Sep 2009 09:44:41 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:49 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:49 +0000 (UTC)
Subject: rpms/senamirmir-washra-fonts/devel
	senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094449.0DB0311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11185/senamirmir-washra-fonts/devel

Modified Files:
	senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf	13 Sep 2009 09:22:00 -0000	1.2
+++ senamirmir-washra-fonts-yigezu-bisrat-gothic-fontconfig.conf	13 Sep 2009 09:44:48 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:44:57 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:44:57 +0000 (UTC)
Subject: rpms/gfs-porson-fonts/devel gfs-porson-fonts-fontconfig.conf, 1.4,
	1.5
Message-ID: <20090913094457.2CEF311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-porson-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11243/gfs-porson-fonts/devel

Modified Files:
	gfs-porson-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-porson-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-porson-fonts/devel/gfs-porson-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfs-porson-fonts-fontconfig.conf	13 Sep 2009 09:22:08 -0000	1.4
+++ gfs-porson-fonts-fontconfig.conf	13 Sep 2009 09:44:56 -0000	1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:45:04 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:45:04 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts-fontconfig.conf, 
	1.3, 1.4
Message-ID: <20090913094504.DA94211C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11297/ecolier-court-fonts/devel

Modified Files:
	ecolier-court-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: ecolier-court-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ecolier-court-fonts-fontconfig.conf	13 Sep 2009 09:22:16 -0000	1.3
+++ ecolier-court-fonts-fontconfig.conf	13 Sep 2009 09:45:04 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:45:13 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:45:13 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel
	ecolier-court-fonts-lignes-fontconfig.conf, 1.2, 1.3
Message-ID: <20090913094513.399BB11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362/ecolier-court-fonts/devel

Modified Files:
	ecolier-court-fonts-lignes-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: ecolier-court-fonts-lignes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-lignes-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecolier-court-fonts-lignes-fontconfig.conf	13 Sep 2009 09:22:24 -0000	1.2
+++ ecolier-court-fonts-lignes-fontconfig.conf	13 Sep 2009 09:45:12 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From nim at fedoraproject.org  Sun Sep 13 09:45:21 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 09:45:21 +0000 (UTC)
Subject: rpms/gfs-theokritos-fonts/devel
	gfs-theokritos-fonts-fontconfig.conf, 1.3, 1.4
Message-ID: <20090913094521.AA0D311C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-theokritos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11417/gfs-theokritos-fonts/devel

Modified Files:
	gfs-theokritos-fonts-fontconfig.conf 
Log Message:
xml uses UTF-8 as default encoding, let's be less verbose


Index: gfs-theokritos-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-theokritos-fonts/devel/gfs-theokritos-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gfs-theokritos-fonts-fontconfig.conf	13 Sep 2009 09:22:31 -0000	1.3
+++ gfs-theokritos-fonts-fontconfig.conf	13 Sep 2009 09:45:21 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>



From thm at fedoraproject.org  Sun Sep 13 10:03:49 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 13 Sep 2009 10:03:49 +0000 (UTC)
Subject: rpms/monotone/devel monotone-0.45-ls-output.patch, NONE,
	1.1 .cvsignore, 1.24, 1.25 import.log, 1.6, 1.7 monotone.spec,
	1.48, 1.49 sources, 1.24, 1.25
Message-ID: <20090913100350.0665F11C0099@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16652/devel

Modified Files:
	.cvsignore import.log monotone.spec sources 
Added Files:
	monotone-0.45-ls-output.patch 
Log Message:
Update to 0.45.

monotone-0.45-ls-output.patch:
 __driver__.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE monotone-0.45-ls-output.patch ---
============================================================
--- tests/key_files_created_securely/__driver__.lua	63a9bd279770dc1fcefec5eb6cead7fd3e061982
+++ tests/key_files_created_securely/__driver__.lua	2a0d5d0376174967369a15795f30a6e081af81b6
@@ -25,4 +25,4 @@ check({ "ls", "-l", "keys/foobar." .. ke
 keyid = string.sub(line, 0, 40)
 
 check({ "ls", "-l", "keys/foobar." .. keyid }, 0, true, nil)
-check(qgrep("^-rw------- .*keys/foobar." .. keyid, "stdout"))
+check(qgrep("^-rw-------[.+]? .*keys/foobar." .. keyid, "stdout"))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	15 May 2009 18:04:49 -0000	1.24
+++ .cvsignore	13 Sep 2009 10:03:48 -0000	1.25
@@ -1 +1 @@
-monotone-0.44.tar.gz
+monotone-0.45.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	15 May 2009 18:04:49 -0000	1.6
+++ import.log	13 Sep 2009 10:03:48 -0000	1.7
@@ -4,3 +4,4 @@ monotone-0_42-3_fc10:HEAD:monotone-0.42-
 monotone-0_42-5_fc10:HEAD:monotone-0.42-5.fc10.src.rpm:1235765112
 monotone-0_43-1_fc10:HEAD:monotone-0.43-1.fc10.src.rpm:1238237776
 monotone-0_44-1_fc11:HEAD:monotone-0.44-1.fc11.src.rpm:1242410660
+monotone-0_45-1_fc11:HEAD:monotone-0.45-1.fc11.src.rpm:1252835264


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- monotone.spec	25 Jul 2009 15:04:09 -0000	1.48
+++ monotone.spec	13 Sep 2009 10:03:48 -0000	1.49
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.44
-Release: 2%{?dist}
+Version: 0.45
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -11,6 +11,7 @@ Source0: http://monotone.ca/downloads/%{
 Source1: monotone.init
 Source2: monotone.sysconfig
 Source3: README.monotone-server
+Patch0: monotone-0.45-ls-output.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@ and then pass commands to it.
 
 %prep
 %setup -q
+%patch0 -p0 -b .ls-output
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
@@ -191,6 +193,9 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.45-1
+- Update to 0.45.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	15 May 2009 18:04:49 -0000	1.24
+++ sources	13 Sep 2009 10:03:48 -0000	1.25
@@ -1 +1 @@
-6cc1f5f31df2e41bdfe502310463924a  monotone-0.44.tar.gz
+bd37c3d75e3fd1974a17f556499b42ab  monotone-0.45.tar.gz



From rakesh at fedoraproject.org  Sun Sep 13 10:34:44 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 13 Sep 2009 10:34:44 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 perl-Search-Xapian.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090913103444.CB7B411C0099@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/perl-Search-Xapian/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26114/devel

Modified Files:
	.cvsignore import.log perl-Search-Xapian.spec sources 
Log Message:
Updated to 1.0.15.0 in sync with xapian core



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2009 13:53:15 -0000	1.2
+++ .cvsignore	13 Sep 2009 10:34:43 -0000	1.3
@@ -1 +1 @@
-Search-Xapian-1.0.11.0.tar.gz
+Search-Xapian-1.0.15.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Aug 2009 13:53:15 -0000	1.1
+++ import.log	13 Sep 2009 10:34:43 -0000	1.2
@@ -1 +1,2 @@
 perl-Search-Xapian-1_0_11_0-5_fc11:HEAD:perl-Search-Xapian-1.0.11.0-5.fc11.src.rpm:1251380736
+perl-Search-Xapian-1_0_15_0-1_fc12:HEAD:perl-Search-Xapian-1.0.15.0-1.fc12.src.rpm:1252838654


Index: perl-Search-Xapian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/perl-Search-Xapian.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Search-Xapian.spec	27 Aug 2009 13:53:15 -0000	1.1
+++ perl-Search-Xapian.spec	13 Sep 2009 10:34:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Search-Xapian
-Version:        1.0.11.0
-Release:        5%{?dist}
+Version:        1.0.15.0
+Release:        1%{?dist}
 Summary:        Xapian perl bindings
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.15.0-1
+- Updated to 1.0.15 to match xapian-core new updates
+
 * Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-5
 - Cleaned %%files section and fixed version in changelog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2009 13:53:15 -0000	1.2
+++ sources	13 Sep 2009 10:34:43 -0000	1.3
@@ -1 +1 @@
-2b5096a768e4bfcac04b316d4fa83da5  Search-Xapian-1.0.11.0.tar.gz
+98081f239455734f568c5e509c102e3b  Search-Xapian-1.0.15.0.tar.gz



From rakesh at fedoraproject.org  Sun Sep 13 10:37:49 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 13 Sep 2009 10:37:49 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 perl-Search-Xapian.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090913103749.3602E11C0099@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/perl-Search-Xapian/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26950/F-11

Modified Files:
	.cvsignore import.log perl-Search-Xapian.spec sources 
Log Message:
Updated to 1.0.15.0 to sync with xapian core



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2009 13:53:40 -0000	1.2
+++ .cvsignore	13 Sep 2009 10:37:48 -0000	1.3
@@ -1 +1 @@
-Search-Xapian-1.0.11.0.tar.gz
+Search-Xapian-1.0.15.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Aug 2009 13:53:40 -0000	1.1
+++ import.log	13 Sep 2009 10:37:48 -0000	1.2
@@ -1 +1,2 @@
 perl-Search-Xapian-1_0_11_0-5_fc11:F-11:perl-Search-Xapian-1.0.11.0-5.fc11.src.rpm:1251380768
+perl-Search-Xapian-1_0_15_0-1_fc12:F-11:perl-Search-Xapian-1.0.15.0-1.fc12.src.rpm:1252838792


Index: perl-Search-Xapian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-11/perl-Search-Xapian.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Search-Xapian.spec	27 Aug 2009 13:53:40 -0000	1.1
+++ perl-Search-Xapian.spec	13 Sep 2009 10:37:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Search-Xapian
-Version:        1.0.11.0
-Release:        5%{?dist}
+Version:        1.0.15.0
+Release:        1%{?dist}
 Summary:        Xapian perl bindings
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.15.0-1
+- Updated to 1.0.15 to match xapian-core new updates
+
 * Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-5
 - Cleaned %%files section and fixed version in changelog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2009 13:53:40 -0000	1.2
+++ sources	13 Sep 2009 10:37:48 -0000	1.3
@@ -1 +1 @@
-2b5096a768e4bfcac04b316d4fa83da5  Search-Xapian-1.0.11.0.tar.gz
+98081f239455734f568c5e509c102e3b  Search-Xapian-1.0.15.0.tar.gz



From rakesh at fedoraproject.org  Sun Sep 13 10:38:29 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 13 Sep 2009 10:38:29 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 perl-Search-Xapian.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090913103829.3A52011C0099@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/perl-Search-Xapian/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27958/F-10

Modified Files:
	.cvsignore import.log perl-Search-Xapian.spec sources 
Log Message:
Updated to 1.0.15.0 in sync with xapian core libs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2009 13:53:33 -0000	1.2
+++ .cvsignore	13 Sep 2009 10:38:28 -0000	1.3
@@ -1 +1 @@
-Search-Xapian-1.0.11.0.tar.gz
+Search-Xapian-1.0.15.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Aug 2009 13:53:33 -0000	1.1
+++ import.log	13 Sep 2009 10:38:28 -0000	1.2
@@ -1 +1,2 @@
 perl-Search-Xapian-1_0_11_0-5_fc11:F-10:perl-Search-Xapian-1.0.11.0-5.fc11.src.rpm:1251380758
+perl-Search-Xapian-1_0_15_0-1_fc12:F-10:perl-Search-Xapian-1.0.15.0-1.fc12.src.rpm:1252838815


Index: perl-Search-Xapian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-10/perl-Search-Xapian.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Search-Xapian.spec	27 Aug 2009 13:53:33 -0000	1.1
+++ perl-Search-Xapian.spec	13 Sep 2009 10:38:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Search-Xapian
-Version:        1.0.11.0
-Release:        5%{?dist}
+Version:        1.0.15.0
+Release:        1%{?dist}
 Summary:        Xapian perl bindings
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.15.0-1
+- Updated to 1.0.15 to match xapian-core new updates
+
 * Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-5
 - Cleaned %%files section and fixed version in changelog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2009 13:53:33 -0000	1.2
+++ sources	13 Sep 2009 10:38:28 -0000	1.3
@@ -1 +1 @@
-2b5096a768e4bfcac04b316d4fa83da5  Search-Xapian-1.0.11.0.tar.gz
+98081f239455734f568c5e509c102e3b  Search-Xapian-1.0.15.0.tar.gz



From pkgdb at fedoraproject.org  Sun Sep 13 10:52:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:52:07 +0000
Subject: [pkgdb] yum: rakesh has requested watchcommits
Message-ID: <20090913105207.C2D7310F880@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on yum (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum



From pkgdb at fedoraproject.org  Sun Sep 13 10:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:52:10 +0000
Subject: [pkgdb] yum: rakesh has requested watchcommits
Message-ID: <20090913105211.0C02D10F88C@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on yum (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum



From pkgdb at fedoraproject.org  Sun Sep 13 10:52:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:52:24 +0000
Subject: [pkgdb] yum: rakesh has requested watchcommits
Message-ID: <20090913105224.D9F2C10F895@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on yum (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum



From awjb at fedoraproject.org  Sun Sep 13 10:56:19 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sun, 13 Sep 2009 10:56:19 +0000 (UTC)
Subject: rpms/wine/F-11 steam-regression.patch, NONE,
	1.1 winepulse-winecfg-0.6.patch, NONE, 1.1 wine.spec, 1.111,
	1.112 adding-pulseaudio-to-winecfg-0.4.patch, 1.1,
	NONE pulseaudio-winecfg-update.patch, 1.1, NONE
Message-ID: <20090913105619.9F23311C0099@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv937/F-11

Modified Files:
	wine.spec 
Added Files:
	steam-regression.patch winepulse-winecfg-0.6.patch 
Removed Files:
	adding-pulseaudio-to-winecfg-0.4.patch 
	pulseaudio-winecfg-update.patch 
Log Message:
- fix steam regression
- winepulse winecfg update


steam-regression.patch:
 bitmap.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE steam-regression.patch ---
--- a/dlls/winex11.drv/bitmap.c
+++ b/dlls/winex11.drv/bitmap.c
@@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
     if (physDev->depth != physBitmap->pixmap_depth)
     {
         physDev->depth = physBitmap->pixmap_depth;
-        if(physDev->depth == 1)
-            physDev->color_shifts = NULL;
-        else
-            physDev->color_shifts = &physBitmap->pixmap_color_shifts;
         wine_tsx11_lock();
         XFreeGC( gdi_display, physDev->gc );
         physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL );
@@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
         XFlush( gdi_display );
         wine_tsx11_unlock();
     }
+
+    if(physDev->depth == 1)
+        physDev->color_shifts = NULL;
+    else
+        physDev->color_shifts = &physBitmap->pixmap_color_shifts;
+
     return hbitmap;
 }

winepulse-winecfg-0.6.patch:
 Bg.rc       |    1 +
 Cs.rc       |    1 +
 Da.rc       |    1 +
 De.rc       |    1 +
 En.rc       |    1 +
 Es.rc       |    1 +
 Fi.rc       |    1 +
 Fr.rc       |    1 +
 Hu.rc       |    1 +
 It.rc       |    1 +
 Ja.rc       |    1 +
 Ko.rc       |    1 +
 Lt.rc       |    1 +
 Nl.rc       |    1 +
 No.rc       |    1 +
 Pl.rc       |    1 +
 Pt.rc       |    1 +
 Ro.rc       |    1 +
 Ru.rc       |    1 +
 Si.rc       |    1 +
 Sv.rc       |    1 +
 Tr.rc       |    1 +
 Zh.rc       |    1 +
 audio.c     |    1 +
 libraries.c |    1 +
 resource.h  |    2 +-
 26 files changed, 26 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-winecfg-0.6.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..ec24068 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index d9c0b28..6171f1f 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardn?"
     IDS_ACCEL_BASIC             "Z?kladn?"
     IDS_ACCEL_EMULATION         "Emulace"
+    IDS_DRIVER_PULSE            "Ovlada? PulseAudio"
     IDS_DRIVER_ALSA             "Ovlada? ALSA"
     IDS_DRIVER_ESOUND           "Ovlada? EsounD"
     IDS_DRIVER_OSS              "Ovlada? OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index f53aead..e33bd78 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggende"
     IDS_ACCEL_EMULATION         "Emul?ring"
+    IDS_DRIVER_PULSE            "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index aadd21e..f3016ab 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -282,6 +282,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Einfach"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio-Treiber"
     IDS_DRIVER_ALSA             "ALSA-Treiber"
     IDS_DRIVER_ESOUND           "EsounD-Treiber"
     IDS_DRIVER_OSS              "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 6aa5120..6f30805 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -282,6 +282,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 1771b4e..aaacaa9 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Est?ndar"
     IDS_ACCEL_BASIC             "B?sica"
     IDS_ACCEL_EMULATION         "Emulaci?n"
+    IDS_DRIVER_PULSE            "Manejador PulseAudio"
     IDS_DRIVER_ALSA             "Manejador ALSA"
     IDS_DRIVER_ESOUND           "Manejador EsounD"
     IDS_DRIVER_OSS              "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 0dedf3a..5217482 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index a9184f9..004ebb0 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -284,6 +284,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basique"
     IDS_ACCEL_EMULATION         "??mulation"
+    IDS_DRIVER_PULSE            "Pilote PulseAudio"
     IDS_DRIVER_ALSA             "Pilote ALSA"
     IDS_DRIVER_ESOUND           "Pilote EsounD"
     IDS_DRIVER_OSS              "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index dc887fe..9bd192e 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc
index ddeda8c..1530b5f 100644
--- a/programs/winecfg/It.rc
+++ b/programs/winecfg/It.rc
@@ -284,6 +284,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Base"
     IDS_ACCEL_EMULATION         "Emulazione"
+    IDS_DRIVER_PULSE            "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 5b77da7..316d2e5 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -285,6 +285,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????????"
     IDS_DRIVER_ALSA             "ALSA ????????????"
     IDS_DRIVER_ESOUND           "EsounD ????????????"
     IDS_DRIVER_OSS              "OSS ????????????"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index bf06647..66f9803 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -285,6 +285,7 @@ BEGIN
    IDS_ACCEL_STANDARD          "????"
    IDS_ACCEL_BASIC             "????"
    IDS_ACCEL_EMULATION         "??????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????"
    IDS_DRIVER_ALSA             "ALSA ????????"
    IDS_DRIVER_ESOUND           "EsounD ????????"
    IDS_DRIVER_OSS              "OSS ????????"
diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc
index 7208cc6..5aa8fdb 100644
--- a/programs/winecfg/Lt.rc
+++ b/programs/winecfg/Lt.rc
@@ -283,6 +283,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standartinis"
     IDS_ACCEL_BASIC             "Bazinis"
     IDS_ACCEL_EMULATION         "Emuliacija"
+    IDS_DRIVER_PULSE            "PulseAudio tvarkykl??"
     IDS_DRIVER_ALSA             "ALSA tvarkykl??"
     IDS_DRIVER_ESOUND           "EsounD tvarkykl??"
     IDS_DRIVER_OSS              "OSS tvarkykl??"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 2fbba6a..802abab 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -283,6 +283,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standaard"
     IDS_ACCEL_BASIC             "Eenvoudig"
     IDS_ACCEL_EMULATION         "Emulatie"
+    IDS_DRIVER_PULSE            "PulseAudio Stuurprogramma"
     IDS_DRIVER_ALSA             "ALSA Stuurprogramma"
     IDS_DRIVER_ESOUND           "EsounD Stuurprogramma"
     IDS_DRIVER_OSS              "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index cc34fad..0f0aea8 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grunnleggende"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE            "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index d884881..bb97de5 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardowe"
     IDS_ACCEL_BASIC             "Podstawowe"
     IDS_ACCEL_EMULATION         "Emulacja"
+    IDS_DRIVER_PULSE            "Sterownik PulseAudio"
     IDS_DRIVER_ALSA             "Sterownik ALSA"
     IDS_DRIVER_ESOUND           "Sterownik EsounD"
     IDS_DRIVER_OSS              "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 683dc68..be92466 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -470,6 +470,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Padr??o"
     IDS_ACCEL_BASIC             "B??sico"
     IDS_ACCEL_EMULATION         "Emula????o"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index 5626018..6c84511 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -282,6 +282,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "De baz??"
     IDS_ACCEL_EMULATION         "Emulare"
+    IDS_DRIVER_PULSE            "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 38b4546..73c0250 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -287,6 +287,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????????????????????"
     IDS_ACCEL_BASIC             "??????????????????????"
     IDS_ACCEL_EMULATION         "????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ??????????????"
     IDS_DRIVER_ALSA             "ALSA ??????????????"
     IDS_DRIVER_ESOUND           "EsounD ??????????????"
     IDS_DRIVER_OSS              "OSS ??????????????"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index feaef36..1d10bae 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardno"
     IDS_ACCEL_BASIC             "Osnovno"
     IDS_ACCEL_EMULATION         "Emulacija"
+    IDS_DRIVER_PULSE            "PulseAudio gonilnik"
     IDS_DRIVER_ALSA             "ALSA gonilnik"
     IDS_DRIVER_ESOUND           "EsounD gonilnik"
     IDS_DRIVER_OSS              "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 7fea5aa..1979b5a 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggande"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE            "PulseAudio-drivrutin"
     IDS_DRIVER_ALSA             "ALSA-drivrutin"
     IDS_DRIVER_ESOUND           "EsounD-drivrutin"
     IDS_DRIVER_OSS              "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 0fa9778..5ea7da1 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standart"
     IDS_ACCEL_BASIC             "Temel"
     IDS_ACCEL_EMULATION         "Taklit"
+    IDS_DRIVER_PULSE            "PulseAudio S?r?c?s?"
     IDS_DRIVER_ALSA             "ALSA S?r?c?s?"
     IDS_DRIVER_ESOUND           "EsounD S?r?c?s?"
     IDS_DRIVER_OSS              "OSS S?r?c?s?"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index 8c84061..3de1da8 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -275,6 +275,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ??????"
     IDS_DRIVER_ALSA             "ALSA ??????"
     IDS_DRIVER_ESOUND           "EsounD ??????"
     IDS_DRIVER_OSS              "OSS ??????"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 9f8a0a2..59837ef 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
 } AUDIO_DRIVER;
 
 static const AUDIO_DRIVER sAudioDrivers[] = {
+  {IDS_DRIVER_PULSE,     "pulse"},
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..7c13fad 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -81,6 +81,7 @@ static const char * const builtin_only[] =
     "wineoss.drv",
     "wineps",
     "wineps.drv",
+    "winepulse.drv",
     "winex11.drv",
     "winmm",
     "wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index f006861..57b2a15 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -187,7 +187,7 @@
 #define IDS_ACCEL_BASIC                 8302
 #define IDS_ACCEL_EMULATION             8303
 #define IDS_DRIVER_ALSA                 8304
-
+#define IDS_DRIVER_PULSE                8305
 #define IDS_DRIVER_ESOUND               8306
 #define IDS_DRIVER_OSS                  8307
 #define IDS_DRIVER_JACK                 8308


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- wine.spec	2 Sep 2009 20:36:03 -0000	1.111
+++ wine.spec	13 Sep 2009 10:56:19 -0000	1.112
@@ -1,7 +1,7 @@
 %define no64bit 0
 Name:		wine
 Version:	1.1.29
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -49,11 +49,16 @@ Source300:      wine-mime-msi.desktop
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.30-configure.ac.patch
 Patch401:       http://art.ified.ca/downloads/winepulse-0.30.patch
-Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.4.patch
+Patch402:        http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
-Patch403:       pulseaudio-winecfg-update.patch
 
 Patch1:         wine-rpath.patch
+
+# bugfix patches
+# fix steam regression http://bugs.winehq.org/show_bug.cgi?id=19916
+# upstream commit 70241904b9efacab9fb6c7d8701b1cfdb86f49f7
+Patch1000:      steam-regression.patch
+
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if !%{?no64bit}
@@ -301,7 +306,8 @@ This package adds an oss driver for wine
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
-%patch403
+
+%patch1000 -p1
 
 autoreconf
 
@@ -1025,6 +1031,15 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Sun Sep 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-3
+- patch for steam regression (upstream #19916)
+- update winepulse winecfg patch
+
+* Thu Sep 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-2
+- rebuild for new gcc (#505862)
+
 * Wed Sep 02 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.29-1
 - version upgrade


--- adding-pulseaudio-to-winecfg-0.4.patch DELETED ---


--- pulseaudio-winecfg-update.patch DELETED ---



From awjb at fedoraproject.org  Sun Sep 13 10:56:20 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sun, 13 Sep 2009 10:56:20 +0000 (UTC)
Subject: rpms/wine/devel steam-regression.patch, NONE,
	1.1 winepulse-winecfg-0.6.patch, NONE, 1.1 wine.spec, 1.113,
	1.114 adding-pulseaudio-to-winecfg-0.4.patch, 1.1,
	NONE pulseaudio-winecfg-update.patch, 1.1, NONE
Message-ID: <20090913105620.30D4E11C0099@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv937/devel

Modified Files:
	wine.spec 
Added Files:
	steam-regression.patch winepulse-winecfg-0.6.patch 
Removed Files:
	adding-pulseaudio-to-winecfg-0.4.patch 
	pulseaudio-winecfg-update.patch 
Log Message:
- fix steam regression
- winepulse winecfg update


steam-regression.patch:
 bitmap.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE steam-regression.patch ---
--- a/dlls/winex11.drv/bitmap.c
+++ b/dlls/winex11.drv/bitmap.c
@@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
     if (physDev->depth != physBitmap->pixmap_depth)
     {
         physDev->depth = physBitmap->pixmap_depth;
-        if(physDev->depth == 1)
-            physDev->color_shifts = NULL;
-        else
-            physDev->color_shifts = &physBitmap->pixmap_color_shifts;
         wine_tsx11_lock();
         XFreeGC( gdi_display, physDev->gc );
         physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL );
@@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
         XFlush( gdi_display );
         wine_tsx11_unlock();
     }
+
+    if(physDev->depth == 1)
+        physDev->color_shifts = NULL;
+    else
+        physDev->color_shifts = &physBitmap->pixmap_color_shifts;
+
     return hbitmap;
 }

winepulse-winecfg-0.6.patch:
 Bg.rc       |    1 +
 Cs.rc       |    1 +
 Da.rc       |    1 +
 De.rc       |    1 +
 En.rc       |    1 +
 Es.rc       |    1 +
 Fi.rc       |    1 +
 Fr.rc       |    1 +
 Hu.rc       |    1 +
 It.rc       |    1 +
 Ja.rc       |    1 +
 Ko.rc       |    1 +
 Lt.rc       |    1 +
 Nl.rc       |    1 +
 No.rc       |    1 +
 Pl.rc       |    1 +
 Pt.rc       |    1 +
 Ro.rc       |    1 +
 Ru.rc       |    1 +
 Si.rc       |    1 +
 Sv.rc       |    1 +
 Tr.rc       |    1 +
 Zh.rc       |    1 +
 audio.c     |    1 +
 libraries.c |    1 +
 resource.h  |    2 +-
 26 files changed, 26 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-winecfg-0.6.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..ec24068 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index d9c0b28..6171f1f 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardn?"
     IDS_ACCEL_BASIC             "Z?kladn?"
     IDS_ACCEL_EMULATION         "Emulace"
+    IDS_DRIVER_PULSE            "Ovlada? PulseAudio"
     IDS_DRIVER_ALSA             "Ovlada? ALSA"
     IDS_DRIVER_ESOUND           "Ovlada? EsounD"
     IDS_DRIVER_OSS              "Ovlada? OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index f53aead..e33bd78 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggende"
     IDS_ACCEL_EMULATION         "Emul?ring"
+    IDS_DRIVER_PULSE            "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index aadd21e..f3016ab 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -282,6 +282,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Einfach"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio-Treiber"
     IDS_DRIVER_ALSA             "ALSA-Treiber"
     IDS_DRIVER_ESOUND           "EsounD-Treiber"
     IDS_DRIVER_OSS              "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 6aa5120..6f30805 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -282,6 +282,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 1771b4e..aaacaa9 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Est?ndar"
     IDS_ACCEL_BASIC             "B?sica"
     IDS_ACCEL_EMULATION         "Emulaci?n"
+    IDS_DRIVER_PULSE            "Manejador PulseAudio"
     IDS_DRIVER_ALSA             "Manejador ALSA"
     IDS_DRIVER_ESOUND           "Manejador EsounD"
     IDS_DRIVER_OSS              "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 0dedf3a..5217482 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index a9184f9..004ebb0 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -284,6 +284,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basique"
     IDS_ACCEL_EMULATION         "??mulation"
+    IDS_DRIVER_PULSE            "Pilote PulseAudio"
     IDS_DRIVER_ALSA             "Pilote ALSA"
     IDS_DRIVER_ESOUND           "Pilote EsounD"
     IDS_DRIVER_OSS              "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index dc887fe..9bd192e 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE            "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc
index ddeda8c..1530b5f 100644
--- a/programs/winecfg/It.rc
+++ b/programs/winecfg/It.rc
@@ -284,6 +284,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Base"
     IDS_ACCEL_EMULATION         "Emulazione"
+    IDS_DRIVER_PULSE            "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 5b77da7..316d2e5 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -285,6 +285,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????????"
     IDS_DRIVER_ALSA             "ALSA ????????????"
     IDS_DRIVER_ESOUND           "EsounD ????????????"
     IDS_DRIVER_OSS              "OSS ????????????"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index bf06647..66f9803 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -285,6 +285,7 @@ BEGIN
    IDS_ACCEL_STANDARD          "????"
    IDS_ACCEL_BASIC             "????"
    IDS_ACCEL_EMULATION         "??????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????"
    IDS_DRIVER_ALSA             "ALSA ????????"
    IDS_DRIVER_ESOUND           "EsounD ????????"
    IDS_DRIVER_OSS              "OSS ????????"
diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc
index 7208cc6..5aa8fdb 100644
--- a/programs/winecfg/Lt.rc
+++ b/programs/winecfg/Lt.rc
@@ -283,6 +283,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standartinis"
     IDS_ACCEL_BASIC             "Bazinis"
     IDS_ACCEL_EMULATION         "Emuliacija"
+    IDS_DRIVER_PULSE            "PulseAudio tvarkykl??"
     IDS_DRIVER_ALSA             "ALSA tvarkykl??"
     IDS_DRIVER_ESOUND           "EsounD tvarkykl??"
     IDS_DRIVER_OSS              "OSS tvarkykl??"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 2fbba6a..802abab 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -283,6 +283,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standaard"
     IDS_ACCEL_BASIC             "Eenvoudig"
     IDS_ACCEL_EMULATION         "Emulatie"
+    IDS_DRIVER_PULSE            "PulseAudio Stuurprogramma"
     IDS_DRIVER_ALSA             "ALSA Stuurprogramma"
     IDS_DRIVER_ESOUND           "EsounD Stuurprogramma"
     IDS_DRIVER_OSS              "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index cc34fad..0f0aea8 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grunnleggende"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE            "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index d884881..bb97de5 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardowe"
     IDS_ACCEL_BASIC             "Podstawowe"
     IDS_ACCEL_EMULATION         "Emulacja"
+    IDS_DRIVER_PULSE            "Sterownik PulseAudio"
     IDS_DRIVER_ALSA             "Sterownik ALSA"
     IDS_DRIVER_ESOUND           "Sterownik EsounD"
     IDS_DRIVER_OSS              "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 683dc68..be92466 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -470,6 +470,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Padr??o"
     IDS_ACCEL_BASIC             "B??sico"
     IDS_ACCEL_EMULATION         "Emula????o"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index 5626018..6c84511 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -282,6 +282,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "De baz??"
     IDS_ACCEL_EMULATION         "Emulare"
+    IDS_DRIVER_PULSE            "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 38b4546..73c0250 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -287,6 +287,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????????????????????"
     IDS_ACCEL_BASIC             "??????????????????????"
     IDS_ACCEL_EMULATION         "????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ??????????????"
     IDS_DRIVER_ALSA             "ALSA ??????????????"
     IDS_DRIVER_ESOUND           "EsounD ??????????????"
     IDS_DRIVER_OSS              "OSS ??????????????"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index feaef36..1d10bae 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardno"
     IDS_ACCEL_BASIC             "Osnovno"
     IDS_ACCEL_EMULATION         "Emulacija"
+    IDS_DRIVER_PULSE            "PulseAudio gonilnik"
     IDS_DRIVER_ALSA             "ALSA gonilnik"
     IDS_DRIVER_ESOUND           "EsounD gonilnik"
     IDS_DRIVER_OSS              "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 7fea5aa..1979b5a 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggande"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE            "PulseAudio-drivrutin"
     IDS_DRIVER_ALSA             "ALSA-drivrutin"
     IDS_DRIVER_ESOUND           "EsounD-drivrutin"
     IDS_DRIVER_OSS              "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 0fa9778..5ea7da1 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standart"
     IDS_ACCEL_BASIC             "Temel"
     IDS_ACCEL_EMULATION         "Taklit"
+    IDS_DRIVER_PULSE            "PulseAudio S?r?c?s?"
     IDS_DRIVER_ALSA             "ALSA S?r?c?s?"
     IDS_DRIVER_ESOUND           "EsounD S?r?c?s?"
     IDS_DRIVER_OSS              "OSS S?r?c?s?"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index 8c84061..3de1da8 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -275,6 +275,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ??????"
     IDS_DRIVER_ALSA             "ALSA ??????"
     IDS_DRIVER_ESOUND           "EsounD ??????"
     IDS_DRIVER_OSS              "OSS ??????"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 9f8a0a2..59837ef 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
 } AUDIO_DRIVER;
 
 static const AUDIO_DRIVER sAudioDrivers[] = {
+  {IDS_DRIVER_PULSE,     "pulse"},
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..7c13fad 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -81,6 +81,7 @@ static const char * const builtin_only[] =
     "wineoss.drv",
     "wineps",
     "wineps.drv",
+    "winepulse.drv",
     "winex11.drv",
     "winmm",
     "wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index f006861..57b2a15 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -187,7 +187,7 @@
 #define IDS_ACCEL_BASIC                 8302
 #define IDS_ACCEL_EMULATION             8303
 #define IDS_DRIVER_ALSA                 8304
-
+#define IDS_DRIVER_PULSE                8305
 #define IDS_DRIVER_ESOUND               8306
 #define IDS_DRIVER_OSS                  8307
 #define IDS_DRIVER_JACK                 8308


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- wine.spec	10 Sep 2009 14:46:01 -0000	1.113
+++ wine.spec	13 Sep 2009 10:56:19 -0000	1.114
@@ -1,7 +1,7 @@
 %define no64bit 0
 Name:		wine
 Version:	1.1.29
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -49,11 +49,16 @@ Source300:      wine-mime-msi.desktop
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.30-configure.ac.patch
 Patch401:       http://art.ified.ca/downloads/winepulse-0.30.patch
-Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.4.patch
+Patch402:        http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
-Patch403:       pulseaudio-winecfg-update.patch
 
 Patch1:         wine-rpath.patch
+
+# bugfix patches
+# fix steam regression http://bugs.winehq.org/show_bug.cgi?id=19916
+# upstream commit 70241904b9efacab9fb6c7d8701b1cfdb86f49f7
+Patch1000:      steam-regression.patch
+
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if !%{?no64bit}
@@ -301,7 +306,8 @@ This package adds an oss driver for wine
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
-%patch403
+
+%patch1000 -p1
 
 autoreconf
 
@@ -1025,6 +1031,11 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Sun Sep 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.29-3
+- patch for steam regression (upstream #19916)
+- update winepulse winecfg patch
+
 * Thu Sep 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.29-2
 - rebuild for new gcc (#505862)


--- adding-pulseaudio-to-winecfg-0.4.patch DELETED ---


--- pulseaudio-winecfg-update.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Sep 13 10:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:59:03 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913105903.4CA5110F80B@bastion2.fedora.phx.redhat.com>

jlayton has set the watchbugzilla acl on ez-ipupdate (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 10:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:59:06 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913105906.41D3F10F880@bastion2.fedora.phx.redhat.com>

jlayton has set the watchcommits acl on ez-ipupdate (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 10:59:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:59:19 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913105919.6E3C110F894@bastion2.fedora.phx.redhat.com>

jlayton has set the watchcommits acl on ez-ipupdate (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 10:59:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:59:18 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913105918.0C71910F80B@bastion2.fedora.phx.redhat.com>

jlayton has set the watchbugzilla acl on ez-ipupdate (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 10:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:59:26 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913105926.1FE3310F89C@bastion2.fedora.phx.redhat.com>

jlayton has set the approveacls acl on ez-ipupdate (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 10:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 10:59:24 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913105924.73CCE10F898@bastion2.fedora.phx.redhat.com>

jlayton has set the commit acl on ez-ipupdate (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:00:06 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110006.62CAD10F851@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora devel is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:00:48 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110048.7D3C310F867@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 10 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:00:54 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110054.4552910F883@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 10 is now owned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:02 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913110102.3C38E10F888@bastion2.fedora.phx.redhat.com>

jlayton has set the watchbugzilla acl on ez-ipupdate (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:03 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913110103.2CF8510F898@bastion2.fedora.phx.redhat.com>

jlayton has set the watchcommits acl on ez-ipupdate (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:03 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913110103.CA04A10F896@bastion2.fedora.phx.redhat.com>

jlayton has set the approveacls acl on ez-ipupdate (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:03 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913110103.C99B510F895@bastion2.fedora.phx.redhat.com>

jlayton has set the commit acl on ez-ipupdate (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:10 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913110110.915A510F883@bastion2.fedora.phx.redhat.com>

jlayton has set the commit acl on ez-ipupdate (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:12 +0000
Subject: [pkgdb] ez-ipupdate had acl change status
Message-ID: <20090913110113.03DBF10F8A0@bastion2.fedora.phx.redhat.com>

jlayton has set the approveacls acl on ez-ipupdate (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:26 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110126.F1CAC10F88C@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 10 is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:30 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110130.79D8C10F895@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 11 is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:48 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110148.768C210F89C@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 7 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:48 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110148.E7BD010F89F@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 1 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:48 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110148.3FB3710F883@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 7 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:48 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110148.EE41610F8A3@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 1 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:51 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110151.C2F5810F851@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 2 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:51 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110151.D2D9410F8A2@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 2 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:54 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110154.A631510F8A6@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 3 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:54 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110154.B3CAF10F8A9@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 3 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:56 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110157.0F80710F8AB@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 4 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:57 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110157.1B0F610F8AD@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 4 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:58 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110158.E536910F8B1@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 5 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:01:58 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110158.F3DD010F8B3@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 5 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:02:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:02:00 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110200.834EC10F867@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 6 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:02:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:02:00 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110200.881D310F8B5@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 6 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:02:03 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110203.AADC610F896@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 8 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:02:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:02:02 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110202.3F67410F8B8@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Red Hat Linux 9 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:02:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:02:01 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913110202.0895410F89A@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Red Hat Linux 9 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:02:03 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913110204.29FC110F8BC@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 8 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From trasher at fedoraproject.org  Sun Sep 13 11:04:43 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sun, 13 Sep 2009 11:04:43 +0000 (UTC)
Subject: rpms/childsplay/devel .cvsignore, 1.9, 1.10 childsplay.spec, 1.20, 
	1.21 sources, 1.10, 1.11
Message-ID: <20090913110443.39EE111C0099@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632

Modified Files:
	.cvsignore childsplay.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 May 2009 08:19:21 -0000	1.9
+++ .cvsignore	13 Sep 2009 11:04:42 -0000	1.10
@@ -1,8 +1,17 @@
-childsplay-1.3.tgz
-alphabet_sounds_ca-0.8.5.tgz
-alphabet_sounds_de-0.8.5.tgz
-alphabet_sounds_es-0.8.5.tgz
-alphabet_sounds_fr-0.8.5.tgz
-alphabet_sounds_it-0.8.5.tgz
-alphabet_sounds_nl-0.8.5.tgz
-alphabet_sounds_ru-0.8.5.tgz
+childsplay-1.4.tgz
+alphabet_sounds_bg-0.9.tgz
+alphabet_sounds_ca-0.9.tgz
+alphabet_sounds_de-0.9.tgz
+alphabet_sounds_el-0.9.tgz
+alphabet_sounds_en_GB-0.9.tgz
+alphabet_sounds_es-0.9.tgz
+alphabet_sounds_fr-0.9.tgz
+alphabet_sounds_it-0.9.tgz
+alphabet_sounds_lt-0.9.tgz
+alphabet_sounds_nb-0.9.tgz
+alphabet_sounds_nl-0.9.tgz
+alphabet_sounds_pt-0.9.tgz
+alphabet_sounds_ro-0.9.tgz
+alphabet_sounds_ru-0.9.tgz
+alphabet_sounds_sl-0.9.tgz
+alphabet_sounds_sv-0.9.tgz


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- childsplay.spec	24 Jul 2009 18:54:14 -0000	1.20
+++ childsplay.spec	13 Sep 2009 11:04:42 -0000	1.21
@@ -1,9 +1,9 @@
 %define realname childsplay_sp
-%define alphabet_ver 0.8.5
+%define alphabet_ver 0.9
 
 Name:           childsplay
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -11,13 +11,23 @@ URL:            http://www.schoolsplay.o
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Source2:        childsplay.README.RPM
-Source10:       alphabet_sounds_ca-%{alphabet_ver}.tgz
-Source11:       alphabet_sounds_de-%{alphabet_ver}.tgz
-Source12:       alphabet_sounds_es-%{alphabet_ver}.tgz
-Source13:       alphabet_sounds_fr-%{alphabet_ver}.tgz
-Source14:       alphabet_sounds_it-%{alphabet_ver}.tgz
-Source15:       alphabet_sounds_nl-%{alphabet_ver}.tgz
-Source16:       alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source10:       alphabet_sounds_bg-%{alphabet_ver}.tgz
+Source11:       alphabet_sounds_ca-%{alphabet_ver}.tgz
+Source12:       alphabet_sounds_de-%{alphabet_ver}.tgz
+Source13:       alphabet_sounds_el-%{alphabet_ver}.tgz
+Source14:       alphabet_sounds_en_GB-%{alphabet_ver}.tgz
+Source15:       alphabet_sounds_es-%{alphabet_ver}.tgz
+Source16:       alphabet_sounds_fr-%{alphabet_ver}.tgz
+Source17:       alphabet_sounds_it-%{alphabet_ver}.tgz
+Source18:       alphabet_sounds_lt-%{alphabet_ver}.tgz
+Source19:       alphabet_sounds_nb-%{alphabet_ver}.tgz
+Source20:       alphabet_sounds_nl-%{alphabet_ver}.tgz
+Source21:       alphabet_sounds_pt-%{alphabet_ver}.tgz
+Source22:       alphabet_sounds_ro-%{alphabet_ver}.tgz
+Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
+Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -26,7 +36,7 @@ Requires:       pygame
 Requires:       python-sqlalchemy
 Requires:       hicolor-icon-theme
 Requires:       pyfribidi
-Requires:	dejavu-sans-fonts
+Requires:       dejavu-sans-fonts
 
 
 Provides:       childsplay_sp = %{version}-%{release}
@@ -45,6 +55,13 @@ Some activities make use of language dep
 shared with gcompris. For those you'll have to install the gcompris-sound
 package for the languages you intend to use. For example gcompris-sound-en .
 
+%package alphabet_sounds_bg
+Summary:        Bulgarian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_bg
+Bulgarian alphabet sounds for Childsplay
+
 
 %package alphabet_sounds_ca
 Summary:        Catalan alphabet sounds for Childsplay
@@ -62,6 +79,22 @@ Requires:       %{name} = %{version}-%{r
 German alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_el
+Summary:        New Greek alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_el
+new Greek alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_en_GB
+Summary:        British English alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_en_GB
+British English alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_es
 Summary:        Spanish alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -86,6 +119,23 @@ Requires:       %{name} = %{version}-%{r
 Italian alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_lt
+Summary:        Lithuanian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_lt
+Lithuanian alphabet sounds for Childsplay
+
+
+# I do not know which language 'nb' is :/
+%package alphabet_sounds_nb
+Summary:        nb alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_nb
+nb alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_nl
 Summary:        Dutch alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -94,6 +144,22 @@ Requires:       %{name} = %{version}-%{r
 Dutch alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_pt
+Summary:        Portuguese alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_pt
+Portuguese alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_ro
+Summary:        Romanian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_ro
+Romanian alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_ru
 Summary:        Russian alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -102,19 +168,38 @@ Requires:       %{name} = %{version}-%{r
 Russian alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_sl
+Summary:        Slovenian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_sl
+Slovenian alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_sv
+Summary:        Swedish alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_sv
+Swedish alphabet sounds for Childsplay
+
+
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25
 # we don't use the buggy provided install
 rm setup.py
 rm `find alphabet_sounds_??-%{alphabet_ver} -name install.py`
 rm -rf po
 # fixup the python scripts to call python directly and make them executable
 sed -i 's!/usr/bin/env python!%{_bindir}/python!' bin/%{name}
-#Fix a typo in the German sounds directory name
-mv alphabet_sounds_de-%{alphabet_ver}/FlashCardSounds alphabet_sounds_de-%{alphabet_ver}/FlashCardsSounds
 cp %{SOURCE2} README.RPM
 # fix wrong end of line encoding
 sed -i -e 's|\r||g' doc/license.txt
+# lang lt miss subdir
+pushd  alphabet_sounds_lt-%{alphabet_ver}/AlphabetSounds
+mkdir lt
+mv *.* lt
+popd
 
 
 %build
@@ -161,15 +246,18 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icon
 install -p -m 644 lib/SPData/menu/default/logo_cp_64x64.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
-#Remove provided font and symlint system one
+#Remove provided font and symlink system one
 rm $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVuSansCondensed-Bold.ttf
 rm $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVu-ttf.copyright
 ln -s ../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVuSansCondensed-Bold.ttf
 
 #Alphabet sounds
-for sounds in ca de es fr it nl ru
+for sounds in bg ca de el en_GB es fr it lt nb nl ro ru sl sv 
 do
   cp -a alphabet_sounds_$sounds-%{alphabet_ver}/AlphabetSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/alphabetsounds
+done
+for sounds in ca de es fr it nl ru sl
+do
   cp -a alphabet_sounds_$sounds-%{alphabet_ver}/FlashCardsSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/CPData/FlashcardsData/names
 done
 
@@ -217,6 +305,12 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
+%files alphabet_sounds_bg
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_bg-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/bg
+
+
 %files alphabet_sounds_ca
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_ca-%{alphabet_ver}/copyright  alphabet_sounds_ca-%{alphabet_ver}/GPL-2
@@ -231,6 +325,18 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/de
 
 
+%files alphabet_sounds_el
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_el-%{alphabet_ver}/copyright  alphabet_sounds_el-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/el
+
+
+%files alphabet_sounds_en_GB
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_en_GB-%{alphabet_ver}/copyright  alphabet_sounds_en_GB-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/en_GB
+
+
 %files alphabet_sounds_es
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_es-%{alphabet_ver}/copyright  alphabet_sounds_es-%{alphabet_ver}/GPL-2
@@ -252,6 +358,18 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/it
 
 
+%files alphabet_sounds_lt
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_lt-%{alphabet_ver}/copyright  alphabet_sounds_lt-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/lt
+
+
+%files alphabet_sounds_nb
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_nb-%{alphabet_ver}/copyright  alphabet_sounds_nb-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/nb
+
+
 %files alphabet_sounds_nl
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_nl-%{alphabet_ver}/copyright  alphabet_sounds_nl-%{alphabet_ver}/GPL-2
@@ -259,14 +377,34 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/nl
 
 
+%files alphabet_sounds_ro
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_ro-%{alphabet_ver}/copyright  alphabet_sounds_ro-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/ro
+
+
 %files alphabet_sounds_ru
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_ru-%{alphabet_ver}/copyright  alphabet_sounds_ru-%{alphabet_ver}/GPL-2
 %{_datadir}/%{realname}/CPData/FlashcardsData/names/ru
 %{_datadir}/%{realname}/alphabetsounds/ru
 
+%files alphabet_sounds_sl
+%defattr(-, root, root, -)
+%{_datadir}/%{realname}/alphabetsounds/sl
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/sl
+
+
+%files alphabet_sounds_sv
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_sv-%{alphabet_ver}/copyright  alphabet_sounds_sv-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/sv
+
 
 %changelog
+* Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
+- 1.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 May 2009 08:19:21 -0000	1.10
+++ sources	13 Sep 2009 11:04:42 -0000	1.11
@@ -1,8 +1,17 @@
-b38bba758f4f78bf94f0516cb161e108  childsplay-1.3.tgz
-c15fe300181c1131551bae709779d044  alphabet_sounds_ca-0.8.5.tgz
-9c58d16686fde679c6530304397eb0a5  alphabet_sounds_de-0.8.5.tgz
-74ced81c2c6dd0cb89c619593e7c5bc5  alphabet_sounds_es-0.8.5.tgz
-77cbae60e5118f77e9dec28ad6dcca0a  alphabet_sounds_fr-0.8.5.tgz
-d5bfff67c31a234cc8731d864a3b2bcc  alphabet_sounds_it-0.8.5.tgz
-dea508513cbb89a651dd6ea2c847ae16  alphabet_sounds_nl-0.8.5.tgz
-83b19344e70b1290c6126f1073da6390  alphabet_sounds_ru-0.8.5.tgz
+80251bd541071ad80419c7671c55b45c  childsplay-1.4.tgz
+6edf3f5bdcd72b0be8b6b39090ba550b  alphabet_sounds_bg-0.9.tgz
+4d364cf6c8ea2d0de76e549112736f76  alphabet_sounds_ca-0.9.tgz
+bca24f936474862f03dee738f17b32df  alphabet_sounds_de-0.9.tgz
+8d3037784e12b2c3fd65bba52d228efa  alphabet_sounds_el-0.9.tgz
+6c42429083e5d9eeeb04e53970e1b3d3  alphabet_sounds_en_GB-0.9.tgz
+7786a47749312158fa6b9f1c38448ef4  alphabet_sounds_es-0.9.tgz
+4f5c73c33faad81b62c86daa6f5f8f0b  alphabet_sounds_fr-0.9.tgz
+b9a898c9d4e19427efcc91b9e5a4db56  alphabet_sounds_it-0.9.tgz
+2c5d412e1d431bf379b88fe6ab0e4045  alphabet_sounds_lt-0.9.tgz
+8774b1de15eb331ad2377ca0a90291c2  alphabet_sounds_nb-0.9.tgz
+c8dccd02255b0530674a740a75cb7537  alphabet_sounds_nl-0.9.tgz
+4bd40b14a4ab598ffd5676361e6aed0e  alphabet_sounds_pt-0.9.tgz
+7fde0f2ebd2ce1c26d361efb20794a19  alphabet_sounds_ro-0.9.tgz
+8019fbfcb83e76bee6e1f5d721c663bf  alphabet_sounds_ru-0.9.tgz
+bb66cad97471022c0221209fe45ec6fb  alphabet_sounds_sl-0.9.tgz
+1dafe67b13cce379d97efe420d428ed2  alphabet_sounds_sv-0.9.tgz



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:02 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has requested watchbugzilla
Message-ID: <20090913110802.1431610F80B@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchbugzilla acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:02 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has requested watchcommits
Message-ID: <20090913110802.6C51C10F867@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchcommits acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:03 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has requested commit
Message-ID: <20090913110803.ECEC710F883@bastion2.fedora.phx.redhat.com>

jlayton has requested the commit acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:06 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has requested approveacls
Message-ID: <20090913110806.32BFE10F888@bastion2.fedora.phx.redhat.com>

jlayton has requested the approveacls acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:11 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has given up commit
Message-ID: <20090913110811.17F5610F89A@bastion2.fedora.phx.redhat.com>

jlayton has given up the commit acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:09 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has given up watchbugzilla
Message-ID: <20090913110809.C22E910F894@bastion2.fedora.phx.redhat.com>

jlayton has given up the watchbugzilla acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:10 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has given up watchcommits
Message-ID: <20090913110810.7095010F896@bastion2.fedora.phx.redhat.com>

jlayton has given up the watchcommits acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:08:12 +0000
Subject: [pkgdb] ez-ipupdate: jlayton has given up approveacls
Message-ID: <20090913110812.A19A110F89C@bastion2.fedora.phx.redhat.com>

jlayton has given up the approveacls acl on ez-ipupdate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:10:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:10:09 +0000
Subject: [pkgdb] ez-ipupdate ownership updated
Message-ID: <20090913111009.B603510F851@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 9 was orphaned by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Sun Sep 13 11:10:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 11:10:09 +0000
Subject: [pkgdb] ez-ipupdate (un)retirement
Message-ID: <20090913111009.C5DB310F880@bastion2.fedora.phx.redhat.com>

Package ez-ipupdate in Fedora 9 has been retired by jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From ensc at fedoraproject.org  Sun Sep 13 11:20:03 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 11:20:03 +0000 (UTC)
Subject: rpms/xca/devel xca-0.7.0-locale.patch, NONE,
	1.1 xca-0.6.4-includes.patch, 1.1, 1.2 xca-0.6.4-openssl10.patch,
	1.1, 1.2 xca-0.6.3-locale.patch, 1.1,
	NONE xca-0.6.4-newopenssl.patch, 1.1, NONE
Message-ID: <20090913112003.A4CF211C0425@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9715

Modified Files:
	xca-0.6.4-includes.patch xca-0.6.4-openssl10.patch 
Added Files:
	xca-0.7.0-locale.patch 
Removed Files:
	xca-0.6.3-locale.patch xca-0.6.4-newopenssl.patch 
Log Message:
rediffed patches


xca-0.7.0-locale.patch:
 main.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xca-0.7.0-locale.patch ---
2007-03-17  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/main.c: use correct locale for the xca.qm file
	* lib/main.c: [SECURITY] do not load qt.qm file from current
	  directory

Index: xca-0.7.0/lib/main.cpp
===================================================================
--- xca-0.7.0.orig/lib/main.cpp
+++ xca-0.7.0/lib/main.cpp
@@ -9,6 +9,7 @@
 #include <qtranslator.h>
 #include <qtextcodec.h>
 #include <qdir.h>
+#include <Qt/qlocale.h>
 #include <qtranslator.h>
 #include "widgets/MainWindow.h"
 #include "lib/func.h"
@@ -39,7 +40,7 @@ int main( int argc, char *argv[] )
 #else
 	locale = QLocale::system().name();
 #endif
-	qtTr.load( QString( "qt_" ) + locale, "." );
+	qtTr.load( QString( "qt_" ) + locale, XCA_DEFAULT_TRANSLATE);
 	xcaTr.load( QString( "xca_" ) + locale, getPrefix() );
 
 	a.installTranslator( &qtTr );

xca-0.6.4-includes.patch:
 db.h |    1 +
 1 file changed, 1 insertion(+)

Index: xca-0.6.4-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca-0.6.4-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xca-0.6.4-includes.patch	5 Mar 2009 19:51:29 -0000	1.1
+++ xca-0.6.4-includes.patch	13 Sep 2009 11:20:03 -0000	1.2
@@ -1,6 +1,7 @@
-diff -ru xca-0.6.4.orig/lib/db.h xca-0.6.4/lib/db.h
---- xca-0.6.4.orig/lib/db.h	2009-03-05 17:19:23.000000000 +0000
-+++ xca-0.6.4/lib/db.h	2009-03-05 17:19:41.000000000 +0000
+Index: xca-0.7.0/lib/db.h
+===================================================================
+--- xca-0.7.0.orig/lib/db.h
++++ xca-0.7.0/lib/db.h
 @@ -13,6 +13,7 @@
  #include <fcntl.h>
  #include <qstring.h>

xca-0.6.4-openssl10.patch:
 pki_x509req.cpp |    4 ++++
 1 file changed, 4 insertions(+)

Index: xca-0.6.4-openssl10.patch
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca-0.6.4-openssl10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xca-0.6.4-openssl10.patch	26 Aug 2009 14:21:51 -0000	1.1
+++ xca-0.6.4-openssl10.patch	13 Sep 2009 11:20:03 -0000	1.2
@@ -1,7 +1,8 @@
-diff -up xca-0.6.4/lib/pki_x509req.cpp.openssl xca-0.6.4/lib/pki_x509req.cpp
---- xca-0.6.4/lib/pki_x509req.cpp.openssl	2007-08-13 20:55:50.000000000 +0200
-+++ xca-0.6.4/lib/pki_x509req.cpp	2009-08-26 16:18:58.000000000 +0200
-@@ -335,7 +335,11 @@ void pki_x509req::set_spki(NETSCAPE_SPKI
+Index: xca-0.7.0/lib/pki_x509req.cpp
+===================================================================
+--- xca-0.7.0.orig/lib/pki_x509req.cpp
++++ xca-0.7.0/lib/pki_x509req.cpp
+@@ -350,7 +350,11 @@ void pki_x509req::set_spki(NETSCAPE_SPKI
  void pki_x509req::load_spkac(const QString filename)
  {
  	STACK_OF(CONF_VALUE) *sk=NULL;


--- xca-0.6.3-locale.patch DELETED ---


--- xca-0.6.4-newopenssl.patch DELETED ---



From ensc at fedoraproject.org  Sun Sep 13 11:20:38 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 11:20:38 +0000 (UTC)
Subject: rpms/xca/devel verinfo,1.1,1.2
Message-ID: <20090913112039.0206311C0425@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9927

Modified Files:
	verinfo 
Log Message:
updated url



Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- verinfo	1 Sep 2007 14:45:38 -0000	1.1
+++ verinfo	13 Sep 2009 11:20:38 -0000	1.2
@@ -1,2 +1,2 @@
-http://prdownloads.sourceforge.net/sourceforge/xca/
+http://sourceforge.net/project/showfiles.php?group_id=62274
 xca-(.*?)\.tar\.



From ensc at fedoraproject.org  Sun Sep 13 11:21:17 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 11:21:17 +0000 (UTC)
Subject: rpms/xca/devel xca.spec,1.30,1.31
Message-ID: <20090913112117.CF62611C0099@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10188

Modified Files:
	xca.spec 
Log Message:
updated to 0.7.0; rediffed patches



Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xca.spec	26 Aug 2009 14:21:51 -0000	1.30
+++ xca.spec	13 Sep 2009 11:21:17 -0000	1.31
@@ -2,8 +2,8 @@
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.6.4
-Release:	%release_func 9
+Version:	0.7.0
+Release:	%release_func 0
 
 License:	BSD
 Group:		Applications/Productivity
@@ -11,8 +11,7 @@ URL:		http://www.hohnstaedt.de/xca.html
 Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
 Source1:	README.update
 Source4:	xca.xml
-Patch0:		xca-0.6.3-locale.patch
-Patch1:         xca-0.6.4-newopenssl.patch
+Patch0:		xca-0.7.0-locale.patch
 Patch2:         xca-0.6.4-includes.patch
 Patch3:		xca-0.6.4-openssl10.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
@@ -39,13 +38,17 @@ PEM, DER, PKCS#8.
 
 %prep
 %setup -q
-%patch0 -p1 -b .locale
-%patch1 -p1 -b .newopenssl
-%patch2 -p1 -b .includes
-%patch3 -p1 -b .openssl10
+%if 0
+quilt import %PATCH0 %PATCH2 %PATCH3
+quilt push -a
+%else
+%patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%endif
 
-mkdir -p _tmp_root/usr 	 
-ln -s /usr/%_lib	_tmp_root/usr/lib 	 
+mkdir -p _tmp_root/usr
+ln -s /usr/%_lib	_tmp_root/usr/lib
 ln -s /%_lib		_tmp_root/lib
 ln -s %_includedir/Qt	_tmp_root/include
 
@@ -119,6 +122,7 @@ gtk-update-icon-cache %_datadir/icons/hi
 %_bindir/*
 %attr(0644,root,root) %_mandir/*/*
 %dir %{_datadir}/xca
+%_datadir/pixmaps/*.xpm
 %_datadir/xca/*.png
 %_datadir/xca/*.txt
 %_datadir/xca/*.html
@@ -132,6 +136,9 @@ gtk-update-icon-cache %_datadir/icons/hi
 
 
 %changelog
+* Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7.0-0
+- updated to 0.7.0; rediffed patches
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
 - rebuilt with new openssl
 



From ensc at fedoraproject.org  Sun Sep 13 11:22:52 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 11:22:52 +0000 (UTC)
Subject: rpms/xca/devel .cvsignore,1.3,1.4 lastver,1.1,1.2 sources,1.8,1.9
Message-ID: <20090913112252.DF6D511C0099@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10698

Modified Files:
	.cvsignore lastver sources 
Log Message:
updated to 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Mar 2005 17:16:58 -0000	1.3
+++ .cvsignore	13 Sep 2009 11:22:52 -0000	1.4
@@ -1,3 +1 @@
-xca-*.tar.gz
-xca-*.*.rpm
-i386
+xca-0.7.0.tar.gz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:38 -0000	1.1
+++ lastver	13 Sep 2009 11:22:52 -0000	1.2
@@ -1 +1 @@
-0.6.4
+0.7.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Aug 2007 12:13:40 -0000	1.8
+++ sources	13 Sep 2009 11:22:52 -0000	1.9
@@ -1 +1 @@
-f805a2e094436f976c7a4cda5980027e  xca-0.6.4.tar.gz
+c6d6bfb1955aecdd2829db5bb1290d00  xca-0.7.0.tar.gz



From rakesh at fedoraproject.org  Sun Sep 13 11:39:17 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 13 Sep 2009 11:39:17 +0000 (UTC)
Subject: rpms/yum-plugin-download-order/F-10 import.log, NONE,
	1.1 yum-plugin-download-order.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090913113917.A06A111C0425@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/yum-plugin-download-order/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15000/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-plugin-download-order.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
yum-plugin-download-order-0_1-5_fc12:F-10:yum-plugin-download-order-0.1-5.fc12.src.rpm:1252842460


--- NEW FILE yum-plugin-download-order.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Yum plugin to order downloaded packages
Name: yum-plugin-download-order
Version: 0.1
Release: 5%{?dist}
License: GPLv2+
Group: Development/Tools
Source: http://rakesh.fedorapeople.org/yum/%{name}-%{version}.tar.gz
URL: http://rakesh.fedorapeople.org/yum/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-setuptools, python-devel
Requires: yum >= 3.2.23

%description
Yum plugin to order downloads. Right now it just orders based on size.


%prep
%setup -q

%build
#Empty build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%doc README COPYING
%{python_sitelib}/*
/usr/lib/yum-plugins/download-order.py*
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/download-order.conf

%changelog
* Wed Aug 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-5
- Added python-devel as BR and renamed to yum-plugin-download-order

* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-4
- fixed buildrequire and definition of python_sitelib

* Tue Aug 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-3
- fixed tarball, fixed import bug

* Tue Jun 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-2
- Updated with setup file
- Included egg files

* Mon Jun 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-plugin-download-order/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:35:23 -0000	1.1
+++ .cvsignore	13 Sep 2009 11:39:15 -0000	1.2
@@ -0,0 +1 @@
+yum-plugin-download-order-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-plugin-download-order/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:35:23 -0000	1.1
+++ sources	13 Sep 2009 11:39:15 -0000	1.2
@@ -0,0 +1 @@
+e38b9c40164b0881c96664bcb9fb24ba  yum-plugin-download-order-0.1.tar.gz



From transif at fedoraproject.org  Sun Sep 13 11:45:26 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 13 Sep 2009 11:45:26 +0000 (UTC)
Subject: comps/po de.po,1.40,1.41
Message-ID: <20090913114526.2952511C0099@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17611/po

Modified Files:
	de.po 
Log Message:
Sending translation for German


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.40 -r 1.41 de.poIndex: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- de.po	11 Sep 2009 14:04:14 -0000	1.40
+++ de.po	13 Sep 2009 11:45:25 -0000	1.41
@@ -11,15 +11,16 @@
 # Severin Heiniger <severinheiniger at gmail.com>, 2007.
 # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
 # Dominik Sandjaja <dominiksandjaja at fedoraproject.org>, 2008.
-#
 # Fabian Affolter <fab at fedoraproject.org>, 2007-2009, 2009.
+# Marcus Nitzschke <kenda at fedoraproject.org>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-11 08:21+0000\n"
-"PO-Revision-Date: 2009-09-11 16:03+0200\n"
-"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
+"POT-Creation-Date: 2009-09-13 08:22+0000\n"
+"PO-Revision-Date: 2009-09-13 13:37+0200\n"
+"Last-Translator: Marcus Nitzschke <kenda at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,1704 +30,2252 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
-#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1
+#: ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Eine schlanke Desktop-Umgebung, die gut auf ?lteren Systemen funktioniert."
+msgstr "Eine schlanke Desktop-Umgebung, die gut auf ?lteren Systemen funktioniert."
 
-#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5
+#: ../comps-f13.xml.in.h:5
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6
+#: ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Unterst?tzung f?r Afrikaans"
 
-#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7
+#: ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Unterst?tzung f?r Albanisch"
 
-#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9
+#: ../comps-f13.xml.in.h:9
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10
+#: ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zum Durchf?hren einer Vielzahl von Aufgaben"
 
-#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11
+#: ../comps-f13.xml.in.h:11
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst?tzung f?r Arabisch"
 
-#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12
+#: ../comps-f13.xml.in.h:12
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst?tzung f?r Armenisch"
 
-#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13
+#: ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Unterst?tzung f?r Assamesisch"
 
-#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14
+#: ../comps-f13.xml.in.h:14
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16
+#: ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Basis"
 
-#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17
+#: ../comps-f13.xml.in.h:17
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
-#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18
+#: ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst?tzung f?r die Programmiersprache Ruby."
 
-#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19
+#: ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Unterst?tzung f?r Baskisch (Spanien)"
 
-#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20
+#: ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Unterst?tzung f?r Wei?russisch"
 
-#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
+#: ../comps-f9.xml.in.h:16
[...2712 lines suppressed...]
+#: ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
 msgstr "B?cher und Anleitungen"
 
-#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+#: ../comps-f12.xml.in.h:24
+#: ../comps-f13.xml.in.h:24
 msgid "Books and Guides for Fedora users and developers"
 msgstr "B?cher und Anleitungen f?r Fedorabenutzer und Entwickler"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37
+#: ../comps-f13.xml.in.h:37
 msgid "Critical Path (Base)"
-msgstr ""
+msgstr "Kritischer Pfad (Basis)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38
+#: ../comps-f13.xml.in.h:38
 msgid "Critical Path (GNOME)"
-msgstr ""
+msgstr "Kritischer Pfad (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
-#, fuzzy
+#: ../comps-f12.xml.in.h:50
+#: ../comps-f13.xml.in.h:50
 msgid "Directory Server"
-msgstr "Netzwerk-Server"
+msgstr "Verzeichnis-Server"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88
+#: ../comps-f13.xml.in.h:88
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
-msgid ""
-"LXDE is a lightweight X11 desktop environment designed for computers with "
-"low hardware specifications like netbooks, mobile devices or older computers."
-msgstr ""
+#: ../comps-f12.xml.in.h:123
+#: ../comps-f13.xml.in.h:123
+msgid "LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ist eine schlanke X11 Desktopumgebung, welche f?r Computer mit leistungsschwacher Hardware, wie z.Bsp. Netbooks, mobile Ger?te oder ?ltere Computer entwickelt wurde."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136
+#: ../comps-f13.xml.in.h:136
 msgid "Machine and user identity servers."
-msgstr ""
+msgstr "Server f?r Maschinen- und Benutzeridentit?t."
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147
+#: ../comps-f13.xml.in.h:147
 msgid "Moblin Desktop Environment"
 msgstr "Moblin Desktopumgebung"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148
+#: ../comps-f13.xml.in.h:148
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "Moblin ist eine Desktopumgebung f?r NetBook/NetTop/MID Ger?te."
 
-#: ../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 "Anwendungen f?r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Unterst?tzung f?r DF?-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME ist eine leistungsstarke grafische Benutzeroberfl?che mit Men?leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE ist eine leistungsstarke, grafische Benutzeroberfl?che mit Men?leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Diese auch als Text-Editoren bezeichneten Programme erm?glichen das Anlegen "
-"und Bearbeiten von Dateien. Dazu geh?ren Emacs und Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:24
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl?che mit Men?leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:36
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl?che mit Men?leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:45
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Diese auch als Text-Editoren bezeichneten Programme erm?glichen das Anlegen und Bearbeiten von Dateien. Dazu geh?ren Emacs und Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Mit diesen Programmen k?nnen Sie Dokumentationen im DocBook-Format anlegen "
-"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:53
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Mit diesen Programmen k?nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f?r verschiedene "
-"Zwecke."
-
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"arabische Umgebungen."
+msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f?r verschiedene Zwecke."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"hebr?ische Umgebungen."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr?ische Umgebungen."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"japanische Umgebungen."
-
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"tschechischen Umgebungen."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
 
 #~ msgid "Eclipse"
 #~ msgstr "Eclipse"
-
 #~ msgid "The Eclipse Integrated Development Environment."
 #~ msgstr "Eclipse - Die integrierte Entwicklungsumgebung."
+



From trasher at fedoraproject.org  Sun Sep 13 11:53:00 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sun, 13 Sep 2009 11:53:00 +0000 (UTC)
Subject: rpms/childsplay/F-11 .cvsignore, 1.8, 1.9 childsplay.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20090913115300.50E5711C0099@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19625

Modified Files:
	.cvsignore childsplay.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Jan 2008 15:10:36 -0000	1.8
+++ .cvsignore	13 Sep 2009 11:52:59 -0000	1.9
@@ -1 +1,17 @@
-childsplay-0.90.2.tgz
+childsplay-1.4.tgz
+alphabet_sounds_bg-0.9.tgz
+alphabet_sounds_ca-0.9.tgz
+alphabet_sounds_de-0.9.tgz
+alphabet_sounds_el-0.9.tgz
+alphabet_sounds_en_GB-0.9.tgz
+alphabet_sounds_es-0.9.tgz
+alphabet_sounds_fr-0.9.tgz
+alphabet_sounds_it-0.9.tgz
+alphabet_sounds_lt-0.9.tgz
+alphabet_sounds_nb-0.9.tgz
+alphabet_sounds_nl-0.9.tgz
+alphabet_sounds_pt-0.9.tgz
+alphabet_sounds_ro-0.9.tgz
+alphabet_sounds_ru-0.9.tgz
+alphabet_sounds_sl-0.9.tgz
+alphabet_sounds_sv-0.9.tgz


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-11/childsplay.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- childsplay.spec	23 May 2009 08:31:18 -0000	1.19
+++ childsplay.spec	13 Sep 2009 11:53:00 -0000	1.20
@@ -1,8 +1,8 @@
 %define realname childsplay_sp
-%define alphabet_ver 0.8.5
+%define alphabet_ver 0.9
 
 Name:           childsplay
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -11,13 +11,23 @@ URL:            http://www.schoolsplay.o
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Source2:        childsplay.README.RPM
-Source10:       alphabet_sounds_ca-%{alphabet_ver}.tgz
-Source11:       alphabet_sounds_de-%{alphabet_ver}.tgz
-Source12:       alphabet_sounds_es-%{alphabet_ver}.tgz
-Source13:       alphabet_sounds_fr-%{alphabet_ver}.tgz
-Source14:       alphabet_sounds_it-%{alphabet_ver}.tgz
-Source15:       alphabet_sounds_nl-%{alphabet_ver}.tgz
-Source16:       alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source10:       alphabet_sounds_bg-%{alphabet_ver}.tgz
+Source11:       alphabet_sounds_ca-%{alphabet_ver}.tgz
+Source12:       alphabet_sounds_de-%{alphabet_ver}.tgz
+Source13:       alphabet_sounds_el-%{alphabet_ver}.tgz
+Source14:       alphabet_sounds_en_GB-%{alphabet_ver}.tgz
+Source15:       alphabet_sounds_es-%{alphabet_ver}.tgz
+Source16:       alphabet_sounds_fr-%{alphabet_ver}.tgz
+Source17:       alphabet_sounds_it-%{alphabet_ver}.tgz
+Source18:       alphabet_sounds_lt-%{alphabet_ver}.tgz
+Source19:       alphabet_sounds_nb-%{alphabet_ver}.tgz
+Source20:       alphabet_sounds_nl-%{alphabet_ver}.tgz
+Source21:       alphabet_sounds_pt-%{alphabet_ver}.tgz
+Source22:       alphabet_sounds_ro-%{alphabet_ver}.tgz
+Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
+Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -26,7 +36,7 @@ Requires:       pygame
 Requires:       python-sqlalchemy
 Requires:       hicolor-icon-theme
 Requires:       pyfribidi
-Requires:	dejavu-sans-fonts
+Requires:       dejavu-sans-fonts
 
 
 Provides:       childsplay_sp = %{version}-%{release}
@@ -45,6 +55,13 @@ Some activities make use of language dep
 shared with gcompris. For those you'll have to install the gcompris-sound
 package for the languages you intend to use. For example gcompris-sound-en .
 
+%package alphabet_sounds_bg
+Summary:        Bulgarian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_bg
+Bulgarian alphabet sounds for Childsplay
+
 
 %package alphabet_sounds_ca
 Summary:        Catalan alphabet sounds for Childsplay
@@ -62,6 +79,22 @@ Requires:       %{name} = %{version}-%{r
 German alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_el
+Summary:        New Greek alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_el
+new Greek alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_en_GB
+Summary:        British English alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_en_GB
+British English alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_es
 Summary:        Spanish alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -86,6 +119,23 @@ Requires:       %{name} = %{version}-%{r
 Italian alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_lt
+Summary:        Lithuanian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_lt
+Lithuanian alphabet sounds for Childsplay
+
+
+# I do not know which language 'nb' is :/
+%package alphabet_sounds_nb
+Summary:        nb alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_nb
+nb alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_nl
 Summary:        Dutch alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -94,6 +144,22 @@ Requires:       %{name} = %{version}-%{r
 Dutch alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_pt
+Summary:        Portuguese alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_pt
+Portuguese alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_ro
+Summary:        Romanian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_ro
+Romanian alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_ru
 Summary:        Russian alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -102,19 +168,38 @@ Requires:       %{name} = %{version}-%{r
 Russian alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_sl
+Summary:        Slovenian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_sl
+Slovenian alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_sv
+Summary:        Swedish alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_sv
+Swedish alphabet sounds for Childsplay
+
+
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25
 # we don't use the buggy provided install
 rm setup.py
 rm `find alphabet_sounds_??-%{alphabet_ver} -name install.py`
 rm -rf po
 # fixup the python scripts to call python directly and make them executable
 sed -i 's!/usr/bin/env python!%{_bindir}/python!' bin/%{name}
-#Fix a typo in the German sounds directory name
-mv alphabet_sounds_de-%{alphabet_ver}/FlashCardSounds alphabet_sounds_de-%{alphabet_ver}/FlashCardsSounds
 cp %{SOURCE2} README.RPM
 # fix wrong end of line encoding
 sed -i -e 's|\r||g' doc/license.txt
+# lang lt miss subdir
+pushd  alphabet_sounds_lt-%{alphabet_ver}/AlphabetSounds
+mkdir lt
+mv *.* lt
+popd
 
 
 %build
@@ -161,15 +246,18 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icon
 install -p -m 644 lib/SPData/menu/default/logo_cp_64x64.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
-#Remove provided font and symlint system one
+#Remove provided font and symlink system one
 rm $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVuSansCondensed-Bold.ttf
 rm $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVu-ttf.copyright
 ln -s ../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVuSansCondensed-Bold.ttf
 
 #Alphabet sounds
-for sounds in ca de es fr it nl ru
+for sounds in bg ca de el en_GB es fr it lt nb nl ro ru sl sv 
 do
   cp -a alphabet_sounds_$sounds-%{alphabet_ver}/AlphabetSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/alphabetsounds
+done
+for sounds in ca de es fr it nl ru sl
+do
   cp -a alphabet_sounds_$sounds-%{alphabet_ver}/FlashCardsSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/CPData/FlashcardsData/names
 done
 
@@ -217,6 +305,12 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
+%files alphabet_sounds_bg
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_bg-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/bg
+
+
 %files alphabet_sounds_ca
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_ca-%{alphabet_ver}/copyright  alphabet_sounds_ca-%{alphabet_ver}/GPL-2
@@ -231,6 +325,18 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/de
 
 
+%files alphabet_sounds_el
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_el-%{alphabet_ver}/copyright  alphabet_sounds_el-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/el
+
+
+%files alphabet_sounds_en_GB
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_en_GB-%{alphabet_ver}/copyright  alphabet_sounds_en_GB-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/en_GB
+
+
 %files alphabet_sounds_es
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_es-%{alphabet_ver}/copyright  alphabet_sounds_es-%{alphabet_ver}/GPL-2
@@ -252,6 +358,18 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/it
 
 
+%files alphabet_sounds_lt
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_lt-%{alphabet_ver}/copyright  alphabet_sounds_lt-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/lt
+
+
+%files alphabet_sounds_nb
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_nb-%{alphabet_ver}/copyright  alphabet_sounds_nb-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/nb
+
+
 %files alphabet_sounds_nl
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_nl-%{alphabet_ver}/copyright  alphabet_sounds_nl-%{alphabet_ver}/GPL-2
@@ -259,14 +377,34 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/nl
 
 
+%files alphabet_sounds_ro
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_ro-%{alphabet_ver}/copyright  alphabet_sounds_ro-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/ro
+
+
 %files alphabet_sounds_ru
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_ru-%{alphabet_ver}/copyright  alphabet_sounds_ru-%{alphabet_ver}/GPL-2
 %{_datadir}/%{realname}/CPData/FlashcardsData/names/ru
 %{_datadir}/%{realname}/alphabetsounds/ru
 
+%files alphabet_sounds_sl
+%defattr(-, root, root, -)
+%{_datadir}/%{realname}/alphabetsounds/sl
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/sl
+
+
+%files alphabet_sounds_sv
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_sv-%{alphabet_ver}/copyright  alphabet_sounds_sv-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/sv
+
 
 %changelog
+* Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
+- 1.4
+
 * Sat May 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.3-1
 - 1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 May 2009 08:31:18 -0000	1.10
+++ sources	13 Sep 2009 11:53:00 -0000	1.11
@@ -1,8 +1,17 @@
-b38bba758f4f78bf94f0516cb161e108  childsplay-1.3.tgz
-c15fe300181c1131551bae709779d044  alphabet_sounds_ca-0.8.5.tgz
-9c58d16686fde679c6530304397eb0a5  alphabet_sounds_de-0.8.5.tgz
-74ced81c2c6dd0cb89c619593e7c5bc5  alphabet_sounds_es-0.8.5.tgz
-77cbae60e5118f77e9dec28ad6dcca0a  alphabet_sounds_fr-0.8.5.tgz
-d5bfff67c31a234cc8731d864a3b2bcc  alphabet_sounds_it-0.8.5.tgz
-dea508513cbb89a651dd6ea2c847ae16  alphabet_sounds_nl-0.8.5.tgz
-83b19344e70b1290c6126f1073da6390  alphabet_sounds_ru-0.8.5.tgz
+80251bd541071ad80419c7671c55b45c  childsplay-1.4.tgz
+6edf3f5bdcd72b0be8b6b39090ba550b  alphabet_sounds_bg-0.9.tgz
+4d364cf6c8ea2d0de76e549112736f76  alphabet_sounds_ca-0.9.tgz
+bca24f936474862f03dee738f17b32df  alphabet_sounds_de-0.9.tgz
+8d3037784e12b2c3fd65bba52d228efa  alphabet_sounds_el-0.9.tgz
+6c42429083e5d9eeeb04e53970e1b3d3  alphabet_sounds_en_GB-0.9.tgz
+7786a47749312158fa6b9f1c38448ef4  alphabet_sounds_es-0.9.tgz
+4f5c73c33faad81b62c86daa6f5f8f0b  alphabet_sounds_fr-0.9.tgz
+b9a898c9d4e19427efcc91b9e5a4db56  alphabet_sounds_it-0.9.tgz
+2c5d412e1d431bf379b88fe6ab0e4045  alphabet_sounds_lt-0.9.tgz
+8774b1de15eb331ad2377ca0a90291c2  alphabet_sounds_nb-0.9.tgz
+c8dccd02255b0530674a740a75cb7537  alphabet_sounds_nl-0.9.tgz
+4bd40b14a4ab598ffd5676361e6aed0e  alphabet_sounds_pt-0.9.tgz
+7fde0f2ebd2ce1c26d361efb20794a19  alphabet_sounds_ro-0.9.tgz
+8019fbfcb83e76bee6e1f5d721c663bf  alphabet_sounds_ru-0.9.tgz
+bb66cad97471022c0221209fe45ec6fb  alphabet_sounds_sl-0.9.tgz
+1dafe67b13cce379d97efe420d428ed2  alphabet_sounds_sv-0.9.tgz



From pbrobinson at fedoraproject.org  Sun Sep 13 11:55:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 13 Sep 2009 11:55:12 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.4, 1.5 anjal.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20090913115512.428DE11C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20397

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- new git snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Sep 2009 13:55:25 -0000	1.4
+++ .cvsignore	13 Sep 2009 11:55:11 -0000	1.5
@@ -1 +1 @@
-anjal-0.1.0-20090903.tar.bz2
+anjal-0.1.0-20090913.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- anjal.spec	3 Sep 2009 13:55:25 -0000	1.5
+++ anjal.spec	13 Sep 2009 11:55:12 -0000	1.6
@@ -2,14 +2,14 @@
 # git clone git://git.gnome.org/anjal
 # git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090903
-%define git_version 62734e6
+%define gitdate 20090913
+%define git_version d0a14f2
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.8.%{snapshot}%{?dist}
+Release:        0.9.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/anjal.desktop
 
 %changelog
+* Sun Sep 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.9
+- New git snapshot
+
 * Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.8
 - New git snapshot, temporarily disable anerley
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Sep 2009 13:55:25 -0000	1.4
+++ sources	13 Sep 2009 11:55:12 -0000	1.5
@@ -1 +1 @@
-6416630251d0604b50a964f98d10d15f  anjal-0.1.0-20090903.tar.bz2
+251fe60f20ec3d975ec52d636c4fa6a2  anjal-0.1.0-20090913.tar.bz2



From pkgdb at fedoraproject.org  Sun Sep 13 12:08:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:08:45 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120845.9261C10F867@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:08:48 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120848.A47C910F886@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:08:54 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120854.3035F10F898@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:08:52 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120852.E001810F894@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:08:56 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120857.091A810F89C@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 1)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:08:58 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120858.E6F2D10F89D@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 1)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:02 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120902.AB65710F8A1@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 2)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:03 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120903.BFDF510F8A4@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 2)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:06 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120906.3E43910F8A8@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 3)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:06 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120907.0463910F8AB@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 3)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:08 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120909.282C310F8AF@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:10 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120910.3838C10F886@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:12 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120913.0469F10F8B3@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:12 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120912.662CC10F8B0@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:15 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120915.CEDDD10F8B6@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:16 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120916.AA8F210F8B9@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:18 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120918.CEBC810F8BD@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:23 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120923.9343010F8BE@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:19 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120919.EAC6B10F896@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:24 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120924.9EE8810F8C2@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:30 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120930.AB72D10F8C7@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:31 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120931.B763410F89B@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:35 +0000
Subject: [pkgdb] mantis: ensc has given up watchbugzilla
Message-ID: <20090913120935.6573410F8C8@bastion2.fedora.phx.redhat.com>

ensc has given up the watchbugzilla acl on mantis (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Sun Sep 13 12:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 12:09:37 +0000
Subject: [pkgdb] mantis: ensc has given up watchcommits
Message-ID: <20090913120937.1AF7D10F8CC@bastion2.fedora.phx.redhat.com>

ensc has given up the watchcommits acl on mantis (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From fkooman at fedoraproject.org  Sun Sep 13 12:29:18 2009
From: fkooman at fedoraproject.org (=?utf-8?q?Fran=C3=A7ois_Kooman?=)
Date: Sun, 13 Sep 2009 12:29:18 +0000 (UTC)
Subject: rpms/dumpasn1/devel dumpasn1.spec, 1.15, 1.16 sources, 1.12,
	1.13 dumpasn1.1, 1.1, NONE
Message-ID: <20090913122918.6BA9311C0099@cvs1.fedora.phx.redhat.com>

Author: fkooman

Update of /cvs/pkgs/rpms/dumpasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30579

Modified Files:
	dumpasn1.spec sources 
Removed Files:
	dumpasn1.1 
Log Message:
* Sun Sep 13 2009 Fran?ois Kooman <fkooman at tuxed.net> - 20090721-1
- update to upstream version 20090721




Index: dumpasn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/dumpasn1.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dumpasn1.spec	11 Aug 2009 18:14:59 -0000	1.15
+++ dumpasn1.spec	13 Sep 2009 12:29:18 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           dumpasn1
-Version:        20090318
-Release:        4%{?dist}
+Version:        20090721
+Release:        1%{?dist}
 Summary:        ASN.1 object dump utility
 
 Group:          Development/Tools
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 Fran?ois Kooman <fkooman at tuxed.net> - 20090721-1
+- update to upstream version 20090721
+
 * Tue Aug 11 2009 Fran?ois Kooman <fkooman at tuxed.net> - 20090318-4
 - upstream changed source file in place, update
 - remove patch which is no longer required


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 18:14:59 -0000	1.12
+++ sources	13 Sep 2009 12:29:18 -0000	1.13
@@ -1,3 +1,3 @@
-3b8a1eb0d30d422817be0f38bdb271c6  dumpasn1.c
+af42a762b0ccaf89b36a9f4f721cddad  dumpasn1.c
 81a057e27e8584001d93d2852dc4f096  dumpasn1.cfg
 ed16a714c3abe387122c6870f1c8aa49  dumpasn1.1


--- dumpasn1.1 DELETED ---



From bochecha at fedoraproject.org  Sun Sep 13 12:37:41 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sun, 13 Sep 2009 12:37:41 +0000 (UTC)
Subject: rpms/openlayers/devel .cvsignore, 1.3, 1.4 openlayers.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090913123741.C514C11C0099@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/openlayers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv529

Modified Files:
	.cvsignore openlayers.spec sources 
Log Message:
- removed the jsmin tool as its license is unacceptable in Fedora
- made a -doc subpackage, which makes the main package 75% smaller




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Jul 2009 16:38:59 -0000	1.3
+++ .cvsignore	13 Sep 2009 12:37:41 -0000	1.4
@@ -1 +1 @@
-OpenLayers-2.8.tar.gz
+OpenLayers-2.8-mod.tar.gz


Index: openlayers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/devel/openlayers.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openlayers.spec	25 Jul 2009 20:48:43 -0000	1.4
+++ openlayers.spec	13 Sep 2009 12:37:41 -0000	1.5
@@ -1,17 +1,32 @@
 Name:      openlayers
 Version:   2.8
-Release:   2%{?dist}
+Release:   4%{?dist}
 Summary:   A JavaScript library for displaying map data in web browsers
 Group:     Applications/Publishing
 License:   BSD
 URL:       http://www.openlayers.org/
-Source0:   http://openlayers.org/download/OpenLayers-%{version}.tar.gz
+# Source is modified as it bundles jsmin which license is unacceptable in Fedora:
+#   $ wget http://openlayers.org/download/OpenLayers-%{version}.tar.gz
+#   $ tar xzvf OpenLayers-%{version}.tar.gz
+#   $ cd OpenLayers-%{version}
+#   $ rm tools/jsmin.{c,py}
+#   $ tar czvf OpenLayers-%{version}-mod.tar.gz OpenLayers-%{version}
+Source0:   OpenLayers-%{version}-mod.tar.gz
 Source1:   openlayers.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 BuildRequires: python
 
-Requires: httpd
+Requires:   httpd
+
+
+%package doc
+Summary:    API documentation for %{name}
+
+Group:      Documentation
+Requires:   %{name} = %{version}-%{release}
+
 
 %description
 OpenLayers is a pure JavaScript library for displaying map data in most
@@ -28,6 +43,10 @@ in object-oriented JavaScript, using com
 Rico library. The OpenLayers code base already has hundreds of unit tests,
 via the Test.AnotherWay framework.
 
+%description doc
+Reference API documentation for the OpenLayers JavaScript library.
+
+
 %prep
 %setup -q -n OpenLayers-%{version}
 
@@ -62,13 +81,13 @@ sed -i -e 's|\r||g' tools/exampleparser.
 # fix shebag
 find . -type f -exec sed -i -e 's/\#\!\/usr\/bin\/env python/\#\!\/usr\/bin\/python/' '{}' +
 
-%build
 
-gcc %{optflags} tools/jsmin.c -o tools/jsmin
+%build
 pushd build
 ./build.py
 popd
 
+
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{_datadir}/%{name}/www
@@ -82,11 +101,8 @@ cp -rp lib %{buildroot}%{_datadir}/%{nam
 cp -rp tests %{buildroot}%{_datadir}/%{name}/
 
 # install tools
-install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/jsmin %{buildroot}%{_bindir}/
 install -p tools/BeautifulSoup.py %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/jsmin.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/mergejs.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/shrinksafe.py %{buildroot}%{_datadir}/%{name}/tools/
@@ -118,18 +134,18 @@ install -D -p %{SOURCE1} %{buildroot}%{_
 chmod -x %{buildroot}%{_datadir}/%{name}/lib/OpenLayers/Strategy.js
 chmod -x %{buildroot}%{_datadir}/%{name}/lib/OpenLayers/Protocol.js
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
-%doc examples doc
 %doc news.txt readme.txt release-license.txt repository-license.txt
 %doc tools/README.txt build/license.txt tools/exampleparser.py
 %dir %{_sysconfdir}/%{name}
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/tools/*.py?
 %exclude %{_datadir}/%{name}/build/*.txt
@@ -137,7 +153,19 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/%{name}/build/OpenLayers.js
 %{_datadir}/%{name}/*
 
+%files doc
+%defattr(-,root,root)
+%doc examples doc
+
+
 %changelog
+* Sun Sep 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-4
+- Make a -doc subpackage for the API documentation which makes the main package 75% smaller
+
+* Sun Sep 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-3
+- Removed the bundled jsmin tool which license is unacptable in Fedora
+- This makes it a noarch package
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Jul 2009 16:38:59 -0000	1.3
+++ sources	13 Sep 2009 12:37:41 -0000	1.4
@@ -1 +1 @@
-660e279a00efaa6d058f5570425507fd  OpenLayers-2.8.tar.gz
+772fe3d7d00f5a7b5fb8560242f46074  OpenLayers-2.8-mod.tar.gz



From ensc at fedoraproject.org  Sun Sep 13 12:39:14 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 12:39:14 +0000 (UTC)
Subject: rpms/clamav/F-11 clamav.spec,1.89,1.90
Message-ID: <20090913123914.B770D11C0099@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1329

Modified Files:
	clamav.spec 
Log Message:
- add the '%milteruser' user to the '%scanuser' group when the -scanner
  subpackage is installed (#505739)
- whitespace cleanups



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- clamav.spec	9 Aug 2009 11:25:07 -0000	1.89
+++ clamav.spec	13 Sep 2009 12:39:14 -0000	1.90
@@ -1,7 +1,7 @@
 #global snapshot	rc1
 
 ## Fedora Extras specific customization below...
-%bcond_without       	fedora
+%bcond_without		fedora
 %bcond_with		unrar
 ##
 
@@ -21,7 +21,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.2
-Release:	%release_func 2%{?snapshot:.%snapshot}
+Release:	%release_func 3%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -30,7 +30,7 @@ URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz
 Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz.sig
 %else
-# Unfortunately, clamav includes support for RAR v3, derived from GPL 
+# Unfortunately, clamav includes support for RAR v3, derived from GPL
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #   make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
@@ -159,7 +159,7 @@ Source410:	clamd.scan.upstart
 Provides:	init(clamav-scanner) = upstart
 Requires:	clamav-scanner = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 
@@ -208,7 +208,7 @@ Source310:	clamav-milter.upstart
 Provides:	init(clamav-milter) = upstart
 Requires:	clamav-milter = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 
@@ -347,7 +347,7 @@ export have_cv_ipv6=yes
 
 # build with --as-needed and disable rpath
 sed -i \
-	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e 's! -shared ! -Wl,--as-needed\0!g'					\
 	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
 	libtool
 
@@ -397,10 +397,10 @@ mkdir _doc_server
 install -m644 -p %SOURCE2	_doc_server/clamd.sysconfig
 install -m644 -p %SOURCE3       _doc_server/clamd.logrotate
 install -m755 -p %SOURCE7	_doc_server/clamd.init
-install -m644 -p %SOURCE5      	_doc_server/README
+install -m644 -p %SOURCE5	_doc_server/README
 install -m644 -p etc/clamd.conf _doc_server/clamd.conf
 
-install -m644 -p %SOURCE1  	$RPM_BUILD_ROOT%pkgdatadir
+install -m644 -p %SOURCE1	$RPM_BUILD_ROOT%pkgdatadir
 install -m755 -p %SOURCE100     $RPM_BUILD_ROOT%pkgdatadir
 cp -pa _doc_server/*            $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
@@ -507,6 +507,12 @@ test -e %freshclamlog || {
 	%__chown root:%username %freshclamlog
 }
 
+
+%triggerin milter -- clamav-scanner
+# Add the milteruser to the scanuser group; this is required when
+# milter and clamd communicate through local sockets
+/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || :
+
 %pre milter
 %__fe_groupadd 5 -r %milteruser &>/dev/null || :
 %__fe_useradd  5 -r -s /sbin/nologin -d %milterstatedir -M \
@@ -666,6 +672,10 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-3
+- add the '%milteruser' user to the '%scanuser' group when the -scanner
+  subpackage is installed (#505739)
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-2
 - disabled LocalSocket option in sample configuration
 - fixed clamav-milter sysv initscript to use bash interpreter and to
@@ -769,7 +779,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability
 
 * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.91.2-3
-- remove RAR decompression code from source tarball because of 
+- remove RAR decompression code from source tarball because of
   legal problems (resolves 334371)
 - correct license tag
 
@@ -796,7 +806,7 @@ test "$1" != "0" || /sbin/initctl -q sto
   in FC6- and F7+
 
 * Fri Apr 13 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.90.2-1
-- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 
+- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997
 
 * Fri Mar  2 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.90.1-2
 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers'



From bochecha at fedoraproject.org  Sun Sep 13 12:50:32 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sun, 13 Sep 2009 12:50:32 +0000 (UTC)
Subject: rpms/openlayers/F-11 .cvsignore, 1.3, 1.4 openlayers.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090913125032.2FA9911C0425@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/openlayers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4763

Modified Files:
	.cvsignore openlayers.spec sources 
Log Message:
- removed the jsmin tool as its license is unacceptable in Fedora
- made a -doc subpackage, which makes the main package 75% smaller




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Jul 2009 16:49:35 -0000	1.3
+++ .cvsignore	13 Sep 2009 12:50:31 -0000	1.4
@@ -1 +1 @@
-OpenLayers-2.8.tar.gz
+OpenLayers-2.8-mod.tar.gz


Index: openlayers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/openlayers.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openlayers.spec	4 Jul 2009 16:49:35 -0000	1.3
+++ openlayers.spec	13 Sep 2009 12:50:31 -0000	1.4
@@ -1,17 +1,32 @@
 Name:      openlayers
 Version:   2.8
-Release:   1%{?dist}
+Release:   4%{?dist}
 Summary:   A JavaScript library for displaying map data in web browsers
 Group:     Applications/Publishing
 License:   BSD
 URL:       http://www.openlayers.org/
-Source0:   http://openlayers.org/download/OpenLayers-%{version}.tar.gz
+# Source is modified as it bundles jsmin which license is unacceptable in Fedora:
+#   $ wget http://openlayers.org/download/OpenLayers-%{version}.tar.gz
+#   $ tar xzvf OpenLayers-%{version}.tar.gz
+#   $ cd OpenLayers-%{version}
+#   $ rm tools/jsmin.{c,py}
+#   $ tar czvf OpenLayers-%{version}-mod.tar.gz OpenLayers-%{version}
+Source0:   OpenLayers-%{version}-mod.tar.gz
 Source1:   openlayers.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 BuildRequires: python
 
-Requires: httpd
+Requires:  httpd
+
+
+%package doc
+Summary:   API documentation for %{name}
+
+Group:     Documentation
+Requires:  %{name} = %{version}-%{release}
+
 
 %description
 OpenLayers is a pure JavaScript library for displaying map data in most
@@ -28,6 +43,10 @@ in object-oriented JavaScript, using com
 Rico library. The OpenLayers code base already has hundreds of unit tests,
 via the Test.AnotherWay framework.
 
+%description doc
+Reference API documentation for the OpenLayers JavaScript library.
+
+
 %prep
 %setup -q -n OpenLayers-%{version}
 
@@ -62,13 +81,13 @@ sed -i -e 's|\r||g' tools/exampleparser.
 # fix shebag
 find . -type f -exec sed -i -e 's/\#\!\/usr\/bin\/env python/\#\!\/usr\/bin\/python/' '{}' +
 
-%build
 
-gcc %{optflags} tools/jsmin.c -o tools/jsmin
+%build
 pushd build
 ./build.py
 popd
 
+
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{_datadir}/%{name}/www
@@ -82,11 +101,8 @@ cp -rp lib %{buildroot}%{_datadir}/%{nam
 cp -rp tests %{buildroot}%{_datadir}/%{name}/
 
 # install tools
-install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/jsmin %{buildroot}%{_bindir}/
 install -p tools/BeautifulSoup.py %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/jsmin.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/mergejs.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/shrinksafe.py %{buildroot}%{_datadir}/%{name}/tools/
@@ -118,18 +134,18 @@ install -D -p %{SOURCE1} %{buildroot}%{_
 chmod -x %{buildroot}%{_datadir}/%{name}/lib/OpenLayers/Strategy.js
 chmod -x %{buildroot}%{_datadir}/%{name}/lib/OpenLayers/Protocol.js
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
-%doc examples doc
 %doc news.txt readme.txt release-license.txt repository-license.txt
 %doc tools/README.txt build/license.txt tools/exampleparser.py
 %dir %{_sysconfdir}/%{name}
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/tools/*.py?
 %exclude %{_datadir}/%{name}/build/*.txt
@@ -137,7 +153,19 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/%{name}/build/OpenLayers.js
 %{_datadir}/%{name}/*
 
+%files doc
+%defattr(-,root,root)
+%doc examples doc
+
+
 %changelog
+* Sun Sep 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-4
+- Make a -doc subpackage for the API documentation which makes the main package 75% smaller
+
+* Sun Sep 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-3
+- Removed the bundled jsmin tool which license is unacptable in Fedora
+- This makes it a noarch package
+
 * Sun Jun 28 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-1
 - New upstream version: 2.8
 - see http://trac.openlayers.org/wiki/Release/2.8/Notes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Jul 2009 16:49:35 -0000	1.3
+++ sources	13 Sep 2009 12:50:31 -0000	1.4
@@ -1 +1 @@
-660e279a00efaa6d058f5570425507fd  OpenLayers-2.8.tar.gz
+772fe3d7d00f5a7b5fb8560242f46074  OpenLayers-2.8-mod.tar.gz



From rathann at fedoraproject.org  Sun Sep 13 13:02:20 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 13 Sep 2009 13:02:20 +0000 (UTC)
Subject: rpms/comgt/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 
	1.2, 1.3 comgt-rpm.patch, 1.1, NONE comgt.spec, 1.5, NONE
Message-ID: <20090913130220.55FD911C0099@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/comgt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8456

Modified Files:
	.cvsignore sources 
Added Files:
	dead.package 
Removed Files:
	comgt-rpm.patch comgt.spec 
Log Message:
Obsolete package. No point in maintaining it anymore.



--- NEW FILE dead.package ---
Obsolete package. 3G modems are now handled better by NetworkManager.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/comgt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Aug 2007 21:12:42 -0000	1.2
+++ .cvsignore	13 Sep 2009 13:02:20 -0000	1.3
@@ -1 +0,0 @@
-comgt.0.32.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/comgt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Aug 2007 21:12:42 -0000	1.2
+++ sources	13 Sep 2009 13:02:20 -0000	1.3
@@ -1 +0,0 @@
-db2452680c3d953631299e331daf49ef  comgt.0.32.tgz


--- comgt-rpm.patch DELETED ---


--- comgt.spec DELETED ---



From ensc at fedoraproject.org  Sun Sep 13 13:30:26 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 13:30:26 +0000 (UTC)
Subject: rpms/libextractor/devel libextractor.spec,1.14,1.15
Message-ID: <20090913133027.1A77811C04EB@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17054

Modified Files:
	libextractor.spec 
Log Message:
- conditionalized build of 'flac' plugin to ease packaging under RHEL5



Index: libextractor.spec
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/libextractor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libextractor.spec	12 Sep 2009 18:14:26 -0000	1.14
+++ libextractor.spec	13 Sep 2009 13:30:25 -0000	1.15
@@ -1,4 +1,5 @@
 %bcond_with	mpeg
+%bcond_without	flac
 
 %global plugindir	%_libdir/%name
 
@@ -41,7 +42,7 @@ Requires:	%name-plugins-exiv2
 Requires:	%name-plugins-ogg
 Requires:	%name-plugins-ole2
 Requires:	%name-plugins-pdf
-Requires:	%name-plugins-flac
+%{?with_flac:Requires:	%name-plugins-flac}
 Requires:	%name-plugins-thumbnailgtk
 Requires:	%name-plugins-thumbnailqt
 #Requires:	%name-plugins-rpm
@@ -76,7 +77,7 @@ Group:		System Environment/Libraries
 Requires:	%name = %version-%release
 
 %{?with_mpeg:%pluginpkg mpeg -B mpeg2dec-devel}
-%pluginpkg flac -B flac-devel
+%{?with_flac:%pluginpkg flac -B flac-devel}
 %pluginpkg exiv2 -B exiv2-devel
 %pluginpkg ogg
 %pluginpkg ole2
@@ -247,6 +248,9 @@ test "$1" != 0 || \
 
 
 %changelog
+* Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+- conditionalized build of 'flac' plugin to ease packaging under RHEL5
+
 * Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.23-0
 - updated to 0.5.23
 - reenabled rpm plugin



From nim at fedoraproject.org  Sun Sep 13 13:36:14 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 13:36:14 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.12, 1.13 fontpackages.spec,
	1.18, 1.19 import.log, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20090913133614.2383411C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18816/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Jun 2009 08:57:44 -0000	1.12
+++ .cvsignore	13 Sep 2009 13:36:13 -0000	1.13
@@ -1 +1 @@
-fontpackages-1.22.tar.bz2
+fontpackages-1.23.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fontpackages.spec	24 Jul 2009 22:59:54 -0000	1.18
+++ fontpackages.spec	13 Sep 2009 13:36:13 -0000	1.19
@@ -3,8 +3,8 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.22
-Release: 2%{?dist}
+Version: 1.23
+Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -12,7 +12,7 @@ Group:     Development/System
 # license of the packages they're inserted in
 License:   LGPLv3+
 URL:       http://fedoraproject.org/wiki/fontpackages/
-Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
+Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.xz
 
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -100,8 +100,13 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Sep 13 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.23-1
+? cleanups + add merging/remapping templates
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 1.22-2
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sat Jun 20 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.22-1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	21 Jun 2009 08:57:45 -0000	1.14
+++ import.log	13 Sep 2009 13:36:13 -0000	1.15
@@ -12,3 +12,4 @@ fontpackages-1_20-1_fc11:HEAD:fontpackag
 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1235377920
 fontpackages-1_21-1_fc12:HEAD:fontpackages-1.21-1.fc12.src.rpm:1243980659
 fontpackages-1_22-1_fc12:HEAD:fontpackages-1.22-1.fc12.src.rpm:1245574642
+fontpackages-1_23-1_fc12:HEAD:fontpackages-1.23-1.fc12.src.rpm:1252848946


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Jun 2009 08:57:45 -0000	1.12
+++ sources	13 Sep 2009 13:36:13 -0000	1.13
@@ -1 +1 @@
-9c010dccfc942b3b06859d324c299d2c  fontpackages-1.22.tar.bz2
+508caf81a8cffd7bbd3ee3208720d19b  fontpackages-1.23.tar.xz



From ensc at fedoraproject.org  Sun Sep 13 13:36:27 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 13:36:27 +0000 (UTC)
Subject: rpms/libextractor/devel libextractor.spec,1.15,1.16
Message-ID: <20090913133627.8E37611C0099@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18971

Modified Files:
	libextractor.spec 
Log Message:
- conditionalized build of noarch subpackages



Index: libextractor.spec
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/libextractor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libextractor.spec	13 Sep 2009 13:30:25 -0000	1.15
+++ libextractor.spec	13 Sep 2009 13:36:27 -0000	1.16
@@ -1,8 +1,10 @@
 %bcond_with	mpeg
 %bcond_without	flac
+%bcond_without	noarch
 
 %global plugindir	%_libdir/%name
 
+%{?with_noarch:%global noarch	BuildArch:	noarch}
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		libextractor
@@ -35,7 +37,6 @@ Requires:	%_libdir/pkgconfig
 %package plugins
 Summary:	Plugins for libextractor
 Group:		System Environment/Libraries
-BuildArch:	noarch
 Requires:	%name = %version-%release
 Requires:	%name-plugins-base
 Requires:	%name-plugins-exiv2
@@ -46,6 +47,7 @@ Requires:	%name-plugins-pdf
 Requires:	%name-plugins-thumbnailgtk
 Requires:	%name-plugins-thumbnailqt
 #Requires:	%name-plugins-rpm
+%{?noarch}
 
 
 %global pluginpkg(B:R:P:u)	\
@@ -249,7 +251,8 @@ test "$1" != 0 || \
 
 %changelog
 * Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
-- conditionalized build of 'flac' plugin to ease packaging under RHEL5
+- conditionalized build of 'flac' plugin and noarch subpackages to
+  ease packaging under RHEL5
 
 * Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.23-0
 - updated to 0.5.23



From nim at fedoraproject.org  Sun Sep 13 13:41:26 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 13:41:26 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel .cvsignore, 1.5,
	1.6 google-droid-fonts-sans-fontconfig.conf, 1.5,
	1.6 google-droid-fonts-sans-mono-fontconfig.conf, 1.3,
	1.4 google-droid-fonts-serif-fontconfig.conf, 1.3,
	1.4 google-droid-fonts.spec, 1.12, 1.13 import.log, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090913134126.F0D9811C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20391/devel

Modified Files:
	.cvsignore google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts-sans-mono-fontconfig.conf 
	google-droid-fonts-serif-fontconfig.conf 
	google-droid-fonts.spec import.log sources 
Log Message:
fontconfig tweaks


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Sep 2009 19:15:37 -0000	1.5
+++ .cvsignore	13 Sep 2009 13:41:26 -0000	1.6
@@ -1,9 +1,9 @@
 DroidSans-Bold.ttf
+DroidSans.ttf
 DroidSansFallback.ttf
+DroidSansJapanese.ttf
 DroidSansMono.ttf
 DroidSerif-Bold.ttf
 DroidSerif-BoldItalic.ttf
 DroidSerif-Italic.ttf
 DroidSerif-Regular.ttf
-DroidSans.ttf
-DroidSansJapanese.ttf


Index: google-droid-fonts-sans-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- google-droid-fonts-sans-fontconfig.conf	13 Sep 2009 09:44:18 -0000	1.5
+++ google-droid-fonts-sans-fontconfig.conf	13 Sep 2009 13:41:26 -0000	1.6
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Droid Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Droid Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
   <match target="scan">
     <test name="family">
       <string>Droid Sans</string>
@@ -55,4 +43,16 @@
       <family>Droid Sans</family>
     </accept>
   </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Droid Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
 </fontconfig>


Index: google-droid-fonts-sans-mono-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-mono-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- google-droid-fonts-sans-mono-fontconfig.conf	13 Sep 2009 09:44:26 -0000	1.3
+++ google-droid-fonts-sans-mono-fontconfig.conf	13 Sep 2009 13:41:26 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>


Index: google-droid-fonts-serif-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-serif-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- google-droid-fonts-serif-fontconfig.conf	13 Sep 2009 09:44:10 -0000	1.3
+++ google-droid-fonts-serif-fontconfig.conf	13 Sep 2009 13:41:26 -0000	1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- google-droid-fonts.spec	13 Sep 2009 09:11:32 -0000	1.12
+++ google-droid-fonts.spec	13 Sep 2009 13:41:26 -0000	1.13
@@ -12,7 +12,7 @@ other screen text.
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use the date we did a git dump
 Version: 20090906
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -139,6 +139,8 @@ rm -fr %{buildroot}
 
 %changelog
 * Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-4
+? follow the fontpackages template more closely
 - 20090906-3
 ? more Behdad-suggested fontconfig tweaks
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	13 Sep 2009 09:11:32 -0000	1.9
+++ import.log	13 Sep 2009 13:41:26 -0000	1.10
@@ -7,3 +7,4 @@ google-droid-fonts-20090320-3_fc12:HEAD:
 google-droid-fonts-20090906-1_fc12:HEAD:google-droid-fonts-20090906-1.fc12.src.rpm:1252264176
 google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.rpm:1252351928
 google-droid-fonts-20090906-3_fc12:HEAD:google-droid-fonts-20090906-3.fc12.src.rpm:1252833055
+google-droid-fonts-20090906-4_fc12:HEAD:google-droid-fonts-20090906-4.fc12.src.rpm:1252849244


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Sep 2009 09:11:32 -0000	1.7
+++ sources	13 Sep 2009 13:41:26 -0000	1.8
@@ -1,9 +1,9 @@
 2afdf28d5cdd079b41968cdabf1b469e  DroidSans-Bold.ttf
+9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
 4caeadd734f4be9973163bdf02ea6cf5  DroidSansFallback.ttf
+6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf
 3922dfe38a36da7d6edfb1fe77b276fb  DroidSansMono.ttf
 849a92990a80cbb665bfc74fd03743bd  DroidSerif-Bold.ttf
 a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
 a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
 bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf
-9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
-6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf



From ensc at fedoraproject.org  Sun Sep 13 13:43:35 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 13 Sep 2009 13:43:35 +0000 (UTC)
Subject: rpms/clamav/devel clamav.spec,1.92,1.93
Message-ID: <20090913134335.45FF711C0099@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21212

Modified Files:
	clamav.spec 
Log Message:
- conditionalized build of noarch subpackages



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- clamav.spec	9 Aug 2009 11:25:35 -0000	1.92
+++ clamav.spec	13 Sep 2009 13:43:34 -0000	1.93
@@ -1,9 +1,10 @@
 #global snapshot	rc1
 
 ## Fedora Extras specific customization below...
-%bcond_without       	fedora
+%bcond_without		fedora
 %bcond_without		upstart
 %bcond_with		unrar
+%bcond_without		noarch
 ##
 
 %global username	clamupdate
@@ -17,6 +18,7 @@
 %global scanuser	clamscan
 %global scanstatedir	%_var/run/clamd.scan
 
+%{?with_noarch:%global noarch	BuildArch:	noarch}
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	End-user tools for the Clam Antivirus scanner
@@ -31,7 +33,7 @@ URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz
 Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz.sig
 %else
-# Unfortunately, clamav includes support for RAR v3, derived from GPL 
+# Unfortunately, clamav includes support for RAR v3, derived from GPL
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #   make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
@@ -59,13 +61,13 @@ BuildRequires:	bc
 %package filesystem
 Summary:	Filesystem structure for clamav
 Group:		Applications/File
-BuildArch:	noarch
 Provides:	user(%username)  = 4
 Provides:	group(%username) = 4
 # Prevent version mix
 Conflicts:	%name < %version-%release
 Conflicts:	%name > %version-%release
 BuildRequires:	fedora-usermgmt-devel
+%{?noarch}
 %{?FE_USERADD_REQ}
 
 %package lib
@@ -85,20 +87,20 @@ Requires:	pkgconfig
 %package data
 Summary:	Virus signature data for the Clam Antivirus scanner
 Group:		Applications/File
-BuildArch:	noarch
 Requires(pre):		clamav-filesystem = %version-%release
 Requires(postun):	clamav-filesystem = %version-%release
 Provides:		data(clamav) = full
 Conflicts:		data(clamav) < full
 Conflicts:		data(clamav) > full
+%{?noarch}
 
 %package data-empty
 Summary:	Empty data package for the Clam Antivirus scanner
 Group:		Applications/File
-BuildArch:	noarch
 Provides:	data(clamav) = empty
 Conflicts:	data(clamav) < empty
 Conflicts:	data(clamav) > empty
+%{?noarch}
 
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
@@ -122,28 +124,27 @@ Requires:	clamav-lib        = %version-%
 %package server-sysvinit
 Summary:	SysV initscripts for clamav server
 Group:		System Environment/Daemons
-BuildArch:	noarch
 Provides:	init(clamav-server) = sysv
 Requires:	clamav-server = %version-%release
 Requires(pre):		%_initrddir
 Requires(postun):	%_initrddir
 Provides:	clamav-server-sysv = %version-%release
 Obsoletes:	clamav-server-sysv < %version-%release
+%{?noarch}
 
 
 %package scanner
 Summary:	Clamav scanner daemon
 Group:		System Environment/Daemons
-BuildArch:	noarch
 Requires:	init(clamav-scanner)
 Provides:	user(%scanuser)  = 49
 Provides:	group(%scanuser) = 49
 Requires:	clamav-server = %version-%release
+%{?noarch}
 
 %package scanner-sysvinit
 Summary:	SysV initscripts for clamav scanner daemon
 Group:		System Environment/Daemons
-BuildArch:	noarch
 Provides:	init(clamav-scanner) = sysv
 Requires:	clamav-server-sysvinit = %version-%release
 Requires:	clamav-scanner = %version-%release
@@ -151,18 +152,19 @@ Requires(pre):		%_initrddir
 Requires(postun):	%_initrddir initscripts
 Requires(post):		chkconfig
 Requires(preun):	chkconfig initscripts
+%{?noarch}
 
 %package scanner-upstart
 Summary:	Upstart initscripts for clamav scanner daemon
 Group:		System Environment/Daemons
-BuildArch:	noarch
 Source410:	clamd.scan.upstart
 Provides:	init(clamav-scanner) = upstart
 Requires:	clamav-scanner = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
+%{?noarch}
 
 
 %package milter
@@ -188,7 +190,6 @@ Obsoletes:	clamav-milter-sendmail < %ver
 %package milter-sysvinit
 Summary:	SysV initscripts for the clamav sendmail-milter
 Group:		System Environment/Daemons
-BuildArch:	noarch
 Source320:	clamav-milter.sysv
 Provides:	init(clamav-milter) = sysvinit
 Requires:	clamav-milter = %version-%release
@@ -200,18 +201,19 @@ Requires(post):		chkconfig
 Requires(preun):	chkconfig initscripts
 Provides:		clamav-milter-sysv = %version-%release
 Obsoletes:		clamav-milter-sysv < %version-%release
+%{?noarch}
 
 %package milter-upstart
 Summary:	Upstart initscripts for the clamav sendmail-milter
 Group:		System Environment/Daemons
-BuildArch:	noarch
 Source310:	clamav-milter.upstart
 Provides:	init(clamav-milter) = upstart
 Requires:	clamav-milter = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
+%{?noarch}
 
 
 %description
@@ -356,7 +358,7 @@ export have_cv_ipv6=yes
 
 # build with --as-needed and disable rpath
 sed -i \
-	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e 's! -shared ! -Wl,--as-needed\0!g'					\
 	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
 	libtool
 
@@ -406,10 +408,10 @@ mkdir _doc_server
 install -m644 -p %SOURCE2	_doc_server/clamd.sysconfig
 install -m644 -p %SOURCE3       _doc_server/clamd.logrotate
 install -m755 -p %SOURCE7	_doc_server/clamd.init
-install -m644 -p %SOURCE5      	_doc_server/README
+install -m644 -p %SOURCE5	_doc_server/README
 install -m644 -p etc/clamd.conf _doc_server/clamd.conf
 
-install -m644 -p %SOURCE1  	$RPM_BUILD_ROOT%pkgdatadir
+install -m644 -p %SOURCE1	$RPM_BUILD_ROOT%pkgdatadir
 install -m755 -p %SOURCE100     $RPM_BUILD_ROOT%pkgdatadir
 cp -pa _doc_server/*            $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
@@ -473,7 +475,7 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %triggerprein filesystem -- clamav-filesystem < 0.96
 ## REMOVE me in F14 or F15 (added in pre F12)
-! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { 
+! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || {
 	/usr/sbin/usermod  -l %username clamav || :
 	/usr/sbin/groupmod -n %username clamav || :
 	logger -t rpm/clamav "Renamed clamav user+group to %username" || :
@@ -694,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+- conditionalized build of noarch subpackages to ease packaging under RHEL5
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-5
 - modified freshclam configuration to log by syslog by default
 - disabled LocalSocket option in sample configuration
@@ -811,7 +816,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability
 
 * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.91.2-3
-- remove RAR decompression code from source tarball because of 
+- remove RAR decompression code from source tarball because of
   legal problems (resolves 334371)
 - correct license tag
 
@@ -838,7 +843,7 @@ test "$1" != "0" || /sbin/initctl -q sto
   in FC6- and F7+
 
 * Fri Apr 13 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.90.2-1
-- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 
+- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997
 
 * Fri Mar  2 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.90.1-2
 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers'



From remi at fedoraproject.org  Sun Sep 13 14:31:45 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 13 Sep 2009 14:31:45 +0000 (UTC)
Subject: rpms/libmemcached/devel .cvsignore, 1.4, 1.5 libmemcached.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090913143145.AEFF911C0099@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/libmemcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3267

Modified Files:
	.cvsignore libmemcached.spec sources 
Log Message:
update to 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmemcached/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Jun 2009 09:58:21 -0000	1.4
+++ .cvsignore	13 Sep 2009 14:31:44 -0000	1.5
@@ -1 +1 @@
-libmemcached-0.30.tar.gz
+libmemcached-0.31.tar.gz


Index: libmemcached.spec
===================================================================
RCS file: /cvs/extras/rpms/libmemcached/devel/libmemcached.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libmemcached.spec	25 Jul 2009 06:04:51 -0000	1.4
+++ libmemcached.spec	13 Sep 2009 14:31:44 -0000	1.5
@@ -1,7 +1,7 @@
 Name:      libmemcached
 Summary:   Client library and command line tools for memcached server
-Version:   0.30
-Release:   2%{?dist}
+Version:   0.31
+Release:   1%{?dist}
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://tangent.org/552/libmemcached.html
@@ -105,6 +105,9 @@ you will need to install %{name}-devel.
 
 
 %changelog
+* Sun Sep 13 2009 Remi Collet <Fedora at famillecollet.com> - 0.31-1
+- update to 0.31
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmemcached/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Jun 2009 09:58:22 -0000	1.4
+++ sources	13 Sep 2009 14:31:44 -0000	1.5
@@ -1 +1 @@
-a67c5a9062325ff4a09db56e2426e104  libmemcached-0.30.tar.gz
+a549d035ae99325994400ee2d2f49192  libmemcached-0.31.tar.gz



From jdieter at fedoraproject.org  Sun Sep 13 14:32:53 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Sun, 13 Sep 2009 14:32:53 +0000 (UTC)
Subject: rpms/deltarpm/devel .cvsignore, 1.7, 1.8 deltarpm.spec, 1.30,
	1.31 import.log, 1.5, 1.6 sources, 1.8,
	1.9 deltarpm-python-error.patch, 1.4, NONE
Message-ID: <20090913143253.791F911C0099@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3715/devel

Modified Files:
	.cvsignore deltarpm.spec import.log sources 
Removed Files:
	deltarpm-python-error.patch 
Log Message:
Merge patches upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	31 Aug 2009 14:26:03 -0000	1.7
+++ .cvsignore	13 Sep 2009 14:32:52 -0000	1.8
@@ -1 +1 @@
-deltarpm-git-20090831.1.tar.bz2
+deltarpm-git-20090913.tar.bz2


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- deltarpm.spec	10 Sep 2009 19:10:40 -0000	1.30
+++ deltarpm.spec	13 Sep 2009 14:32:52 -0000	1.31
@@ -3,17 +3,16 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1.4%{?dist}
+Release: 0.git.20090913%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
 # Generate source by doing:
 # git clone git://gitorious.org/deltarpm/deltarpm
 # cd deltarpm
-# git archive --format=tar --prefix="deltarpm-git-20090831.1/" a3c6998 | \
+# git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
-Source: %{name}-git-20090831.1.tar.bz2
-Patch: deltarpm-python-error.patch
+Source: %{name}-git-20090913.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
@@ -50,8 +49,7 @@ Requires: deltarpm = %{version}-%{releas
 This package contains python bindings for deltarpm.
 
 %prep
-%setup -q -n %{name}-git-20090831.1
-%patch -p1 -b .foo
+%setup -q -n %{name}-git-20090913
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -98,6 +96,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
+- Merge python error patch upstream
+
 * Thu Sep 10 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.4
 - fix python bindings to not require kernel >= 2.6.27
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	31 Aug 2009 14:26:04 -0000	1.5
+++ import.log	13 Sep 2009 14:32:53 -0000	1.6
@@ -3,3 +3,4 @@ deltarpm-3_5-0_git_20090727_1_fc11:HEAD:
 deltarpm-3_5-0_git_20090729_fc11:HEAD:deltarpm-3.5-0.git.20090729.fc11.src.rpm:1248862477
 deltarpm-3_5-0_git_20090831_fc11:HEAD:deltarpm-3.5-0.git.20090831.fc11.src.rpm:1251726064
 deltarpm-3_5-0_git_20090831_1_fc11:HEAD:deltarpm-3.5-0.git.20090831.1.fc11.src.rpm:1251728709
+deltarpm-3_5-0_git_20090913_fc11:HEAD:deltarpm-3.5-0.git.20090913.fc11.src.rpm:1252852324


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	31 Aug 2009 14:26:04 -0000	1.8
+++ sources	13 Sep 2009 14:32:53 -0000	1.9
@@ -1 +1 @@
-08f91084efa0283bda2aa0cdaf8b649e  deltarpm-git-20090831.1.tar.bz2
+d83662fbd6745b3eab85543d2ac7b6b4  deltarpm-git-20090913.tar.bz2


--- deltarpm-python-error.patch DELETED ---



From olea at fedoraproject.org  Sun Sep 13 14:34:59 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sun, 13 Sep 2009 14:34:59 +0000 (UTC)
Subject: rpms/purple-microblog/F-10 import.log, 1.4,
	1.5 purple-microblog.spec, 1.11, 1.12
Message-ID: <20090913143459.E05E011C0099@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4435/F-10

Modified Files:
	import.log purple-microblog.spec 
Log Message:
make build fixed


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	12 Sep 2009 17:36:15 -0000	1.4
+++ import.log	13 Sep 2009 14:34:59 -0000	1.5
@@ -2,3 +2,4 @@ purple-microblog-0_1_2-2_20080911svn148_
 purple-microblog-0_2_2-1olea:F-10:purple-microblog-0.2.2-1olea.src.rpm:1245015253
 purple-microblog-0_2_3-1_olea:F-10:purple-microblog-0.2.3-1.olea.src.rpm:1252755464
 purple-microblog-0_2_3-2_olea:F-10:purple-microblog-0.2.3-2.olea.src.rpm:1252776946
+purple-microblog-0_2_3-3_olea:F-10:purple-microblog-0.2.3-3.olea.src.rpm:1252852370


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/purple-microblog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- purple-microblog.spec	12 Sep 2009 17:36:16 -0000	1.11
+++ purple-microblog.spec	13 Sep 2009 14:34:59 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           purple-microblog
 Version:        0.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -11,7 +11,7 @@ URL:            http://code.google.com/p
 Source0: http://microblog-purple.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pidgin-devel >= 2.5, ElectricFence, subversion
+BuildRequires:  pidgin-devel >= 2.5, ElectricFence
 ExcludeArch:    s390x
 
 %description
@@ -28,7 +28,7 @@ test it. 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-make LIBDIR=%{_libdir}
+make LIBDIR=%{_libdir} build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sun Sep 13 2009 Ismael Olea <ismael at olea.org> - 0.2.3-3
+- fixing make invocation avoiding call to subversion
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-2
 - adding svn building requirement
 



From olea at fedoraproject.org  Sun Sep 13 14:39:17 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sun, 13 Sep 2009 14:39:17 +0000 (UTC)
Subject: rpms/purple-microblog/F-11 import.log, 1.3,
	1.4 purple-microblog.spec, 1.11, 1.12
Message-ID: <20090913143917.4DC8811C0374@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5650/F-11

Modified Files:
	import.log purple-microblog.spec 
Log Message:
make build fixed


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Sep 2009 11:35:45 -0000	1.3
+++ import.log	13 Sep 2009 14:39:16 -0000	1.4
@@ -1,3 +1,4 @@
 purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448
 purple-microblog-0_2_2-1olea:F-11:purple-microblog-0.2.2-1olea.src.rpm:1245015255
 purple-microblog-0_2_3-1_olea:F-11:purple-microblog-0.2.3-1.olea.src.rpm:1252755184
+purple-microblog-0_2_3-3_olea:F-11:purple-microblog-0.2.3-3.olea.src.rpm:1252852551


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/purple-microblog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- purple-microblog.spec	12 Sep 2009 11:35:45 -0000	1.11
+++ purple-microblog.spec	13 Sep 2009 14:39:17 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           purple-microblog
 Version:        0.2.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -28,7 +28,7 @@ test it. 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-make LIBDIR=%{_libdir}
+make LIBDIR=%{_libdir} build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sun Sep 13 2009 Ismael Olea <ismael at olea.org> - 0.2.3-3
+- fixing make invocation avoiding call to subversion
+
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-2
+- adding svn building requirement
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-1
 - New upstream release 
 



From tmz at fedoraproject.org  Sun Sep 13 14:40:24 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sun, 13 Sep 2009 14:40:24 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.79, 1.80 git.spec, 1.92, 1.93 sources, 
	1.79, 1.80
Message-ID: <20090913144024.E86D611C0489@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6023

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	31 Aug 2009 14:30:41 -0000	1.79
+++ .cvsignore	13 Sep 2009 14:40:24 -0000	1.80
@@ -1 +1 @@
-git-1.6.4.2.tar.bz2
+git-1.6.4.3.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- git.spec	31 Aug 2009 14:30:41 -0000	1.92
+++ git.spec	13 Sep 2009 14:40:24 -0000	1.93
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.4.2
+Version:        1.6.4.3
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Sep 13 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.3-1
+- git-1.6.4.2
+
 * Sun Aug 30 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.2-1
 - git-1.6.4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	31 Aug 2009 14:30:41 -0000	1.79
+++ sources	13 Sep 2009 14:40:24 -0000	1.80
@@ -1 +1 @@
-05c41dc84eae47e3d4fe5b3dee9cc73c  git-1.6.4.2.tar.bz2
+4af70ff9b8f209704059f7ef96127236  git-1.6.4.3.tar.bz2



From olea at fedoraproject.org  Sun Sep 13 14:48:26 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sun, 13 Sep 2009 14:48:26 +0000 (UTC)
Subject: rpms/purple-microblog/devel import.log, 1.3,
	1.4 purple-microblog.spec, 1.12, 1.13
Message-ID: <20090913144826.5BFF211C0099@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8831/devel

Modified Files:
	import.log purple-microblog.spec 
Log Message:
make build fixed


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Sep 2009 11:30:15 -0000	1.3
+++ import.log	13 Sep 2009 14:48:26 -0000	1.4
@@ -1,3 +1,4 @@
 purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448
 purple-microblog-0_2_2-1olea:HEAD:purple-microblog-0.2.2-1olea.src.rpm:1245015253
 purple-microblog-0_2_3-1_olea:HEAD:purple-microblog-0.2.3-1.olea.src.rpm:1252754970
+purple-microblog-0_2_3-3_olea:HEAD:purple-microblog-0.2.3-3.olea.src.rpm:1252852861


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/purple-microblog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- purple-microblog.spec	12 Sep 2009 11:30:15 -0000	1.12
+++ purple-microblog.spec	13 Sep 2009 14:48:26 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           purple-microblog
 Version:        0.2.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -28,7 +28,7 @@ test it. 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-make LIBDIR=%{_libdir}
+make LIBDIR=%{_libdir} build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sun Sep 13 2009 Ismael Olea <ismael at olea.org> - 0.2.3-3
+- fixing make invocation avoiding call to subversion
+
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-2
+- adding svn building requirement
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> - 0.2.3-1
 - New upstream release 
 



From tmz at fedoraproject.org  Sun Sep 13 15:03:53 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sun, 13 Sep 2009 15:03:53 +0000 (UTC)
Subject: rpms/git/devel git.spec,1.93,1.94
Message-ID: <20090913150353.9ECB611C0099@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12834

Modified Files:
	git.spec 
Log Message:
Fix %changelog typo (hardly worth a rebuild, as 1.6.5 is not too far off)


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- git.spec	13 Sep 2009 14:40:24 -0000	1.93
+++ git.spec	13 Sep 2009 15:03:53 -0000	1.94
@@ -387,7 +387,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Sep 13 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.3-1
-- git-1.6.4.2
+- git-1.6.4.3
 
 * Sun Aug 30 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.2-1
 - git-1.6.4.2



From trasher at fedoraproject.org  Sun Sep 13 15:05:15 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sun, 13 Sep 2009 15:05:15 +0000 (UTC)
Subject: rpms/childsplay/F-10 .cvsignore, 1.9, 1.10 childsplay.spec, 1.15,
	1.16 sources, 1.10, 1.11
Message-ID: <20090913150515.D4EF411C0099@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13250

Modified Files:
	.cvsignore childsplay.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	29 Mar 2009 16:44:00 -0000	1.9
+++ .cvsignore	13 Sep 2009 15:05:15 -0000	1.10
@@ -1,8 +1,17 @@
-childsplay-1.1.tgz
-alphabet_sounds_ca-0.8.5.tgz
-alphabet_sounds_de-0.8.5.tgz
-alphabet_sounds_es-0.8.5.tgz
-alphabet_sounds_fr-0.8.5.tgz
-alphabet_sounds_it-0.8.5.tgz
-alphabet_sounds_nl-0.8.5.tgz
-alphabet_sounds_ru-0.8.5.tgz
+childsplay-1.4.tgz
+alphabet_sounds_bg-0.9.tgz
+alphabet_sounds_ca-0.9.tgz
+alphabet_sounds_de-0.9.tgz
+alphabet_sounds_el-0.9.tgz
+alphabet_sounds_en_GB-0.9.tgz
+alphabet_sounds_es-0.9.tgz
+alphabet_sounds_fr-0.9.tgz
+alphabet_sounds_it-0.9.tgz
+alphabet_sounds_lt-0.9.tgz
+alphabet_sounds_nb-0.9.tgz
+alphabet_sounds_nl-0.9.tgz
+alphabet_sounds_pt-0.9.tgz
+alphabet_sounds_ro-0.9.tgz
+alphabet_sounds_ru-0.9.tgz
+alphabet_sounds_sl-0.9.tgz
+alphabet_sounds_sv-0.9.tgz


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-10/childsplay.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- childsplay.spec	23 May 2009 08:33:47 -0000	1.15
+++ childsplay.spec	13 Sep 2009 15:05:15 -0000	1.16
@@ -1,8 +1,8 @@
 %define realname childsplay_sp
-%define alphabet_ver 0.8.5
+%define alphabet_ver 0.9
 
 Name:           childsplay
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -11,16 +11,27 @@ URL:            http://www.schoolsplay.o
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Source2:        childsplay.README.RPM
-Source10:       alphabet_sounds_ca-%{alphabet_ver}.tgz
-Source11:       alphabet_sounds_de-%{alphabet_ver}.tgz
-Source12:       alphabet_sounds_es-%{alphabet_ver}.tgz
-Source13:       alphabet_sounds_fr-%{alphabet_ver}.tgz
-Source14:       alphabet_sounds_it-%{alphabet_ver}.tgz
-Source15:       alphabet_sounds_nl-%{alphabet_ver}.tgz
-Source16:       alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source10:       alphabet_sounds_bg-%{alphabet_ver}.tgz
+Source11:       alphabet_sounds_ca-%{alphabet_ver}.tgz
+Source12:       alphabet_sounds_de-%{alphabet_ver}.tgz
+Source13:       alphabet_sounds_el-%{alphabet_ver}.tgz
+Source14:       alphabet_sounds_en_GB-%{alphabet_ver}.tgz
+Source15:       alphabet_sounds_es-%{alphabet_ver}.tgz
+Source16:       alphabet_sounds_fr-%{alphabet_ver}.tgz
+Source17:       alphabet_sounds_it-%{alphabet_ver}.tgz
+Source18:       alphabet_sounds_lt-%{alphabet_ver}.tgz
+Source19:       alphabet_sounds_nb-%{alphabet_ver}.tgz
+Source20:       alphabet_sounds_nl-%{alphabet_ver}.tgz
+Source21:       alphabet_sounds_pt-%{alphabet_ver}.tgz
+Source22:       alphabet_sounds_ro-%{alphabet_ver}.tgz
+Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
+Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
+Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
+BuildRequires:  python
 Requires:       pygame
 Requires:       python-sqlalchemy
 Requires:       hicolor-icon-theme
@@ -42,6 +53,13 @@ Some activities make use of language dep
 shared with gcompris. For those you'll have to install the gcompris-sound
 package for the languages you intend to use. For example gcompris-sound-en .
 
+%package alphabet_sounds_bg
+Summary:        Bulgarian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_bg
+Bulgarian alphabet sounds for Childsplay
+
 
 %package alphabet_sounds_ca
 Summary:        Catalan alphabet sounds for Childsplay
@@ -59,6 +77,22 @@ Requires:       %{name} = %{version}-%{r
 German alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_el
+Summary:        New Greek alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_el
+new Greek alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_en_GB
+Summary:        British English alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_en_GB
+British English alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_es
 Summary:        Spanish alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -83,6 +117,23 @@ Requires:       %{name} = %{version}-%{r
 Italian alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_lt
+Summary:        Lithuanian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_lt
+Lithuanian alphabet sounds for Childsplay
+
+
+# I do not know which language 'nb' is :/
+%package alphabet_sounds_nb
+Summary:        nb alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_nb
+nb alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_nl
 Summary:        Dutch alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -91,6 +142,22 @@ Requires:       %{name} = %{version}-%{r
 Dutch alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_pt
+Summary:        Portuguese alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_pt
+Portuguese alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_ro
+Summary:        Romanian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_ro
+Romanian alphabet sounds for Childsplay
+
+
 %package alphabet_sounds_ru
 Summary:        Russian alphabet sounds for Childsplay
 Group:          Amusements/Games
@@ -99,19 +166,38 @@ Requires:       %{name} = %{version}-%{r
 Russian alphabet sounds for Childsplay
 
 
+%package alphabet_sounds_sl
+Summary:        Slovenian alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_sl
+Slovenian alphabet sounds for Childsplay
+
+
+%package alphabet_sounds_sv
+Summary:        Swedish alphabet sounds for Childsplay
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description alphabet_sounds_sv
+Swedish alphabet sounds for Childsplay
+
+
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25
 # we don't use the buggy provided install
 rm setup.py
 rm `find alphabet_sounds_??-%{alphabet_ver} -name install.py`
 rm -rf po
 # fixup the python scripts to call python directly and make them executable
 sed -i 's!/usr/bin/env python!%{_bindir}/python!' bin/%{name}
-#Fix a typo in the German sounds directory name
-mv alphabet_sounds_de-%{alphabet_ver}/FlashCardSounds alphabet_sounds_de-%{alphabet_ver}/FlashCardsSounds
 cp %{SOURCE2} README.RPM
 # fix wrong end of line encoding
 sed -i -e 's|\r||g' doc/license.txt
+# lang lt miss subdir
+pushd  alphabet_sounds_lt-%{alphabet_ver}/AlphabetSounds
+mkdir lt
+mv *.* lt
+popd
 
 
 %build
@@ -159,9 +245,12 @@ install -p -m 644 lib/SPData/menu/defaul
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 #Alphabet sounds
-for sounds in ca de es fr it nl ru
+for sounds in bg ca de el en_GB es fr it lt nb nl ro ru sl sv 
 do
   cp -a alphabet_sounds_$sounds-%{alphabet_ver}/AlphabetSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/alphabetsounds
+done
+for sounds in ca de es fr it nl ru sl
+do
   cp -a alphabet_sounds_$sounds-%{alphabet_ver}/FlashCardsSounds/$sounds $RPM_BUILD_ROOT%{_datadir}/%{realname}/CPData/FlashcardsData/names
 done
 
@@ -209,6 +298,12 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
+%files alphabet_sounds_bg
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_bg-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/bg
+
+
 %files alphabet_sounds_ca
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_ca-%{alphabet_ver}/copyright  alphabet_sounds_ca-%{alphabet_ver}/GPL-2
@@ -223,6 +318,18 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/de
 
 
+%files alphabet_sounds_el
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_el-%{alphabet_ver}/copyright  alphabet_sounds_el-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/el
+
+
+%files alphabet_sounds_en_GB
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_en_GB-%{alphabet_ver}/copyright  alphabet_sounds_en_GB-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/en_GB
+
+
 %files alphabet_sounds_es
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_es-%{alphabet_ver}/copyright  alphabet_sounds_es-%{alphabet_ver}/GPL-2
@@ -244,6 +351,18 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/it
 
 
+%files alphabet_sounds_lt
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_lt-%{alphabet_ver}/copyright  alphabet_sounds_lt-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/lt
+
+
+%files alphabet_sounds_nb
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_nb-%{alphabet_ver}/copyright  alphabet_sounds_nb-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/nb
+
+
 %files alphabet_sounds_nl
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_nl-%{alphabet_ver}/copyright  alphabet_sounds_nl-%{alphabet_ver}/GPL-2
@@ -251,14 +370,34 @@ fi
 %{_datadir}/%{realname}/alphabetsounds/nl
 
 
+%files alphabet_sounds_ro
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_ro-%{alphabet_ver}/copyright  alphabet_sounds_ro-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/ro
+
+
 %files alphabet_sounds_ru
 %defattr(-, root, root, -)
 %doc  alphabet_sounds_ru-%{alphabet_ver}/copyright  alphabet_sounds_ru-%{alphabet_ver}/GPL-2
 %{_datadir}/%{realname}/CPData/FlashcardsData/names/ru
 %{_datadir}/%{realname}/alphabetsounds/ru
 
+%files alphabet_sounds_sl
+%defattr(-, root, root, -)
+%{_datadir}/%{realname}/alphabetsounds/sl
+%{_datadir}/%{realname}/CPData/FlashcardsData/names/sl
+
+
+%files alphabet_sounds_sv
+%defattr(-, root, root, -)
+%doc  alphabet_sounds_sv-%{alphabet_ver}/copyright  alphabet_sounds_sv-%{alphabet_ver}/GPL-2
+%{_datadir}/%{realname}/alphabetsounds/sv
+
 
 %changelog
+* Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
+- 1.4
+
 * Sat May 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.3-1
 - 1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 May 2009 08:33:47 -0000	1.10
+++ sources	13 Sep 2009 15:05:15 -0000	1.11
@@ -1,8 +1,17 @@
-b38bba758f4f78bf94f0516cb161e108  childsplay-1.3.tgz
-c15fe300181c1131551bae709779d044  alphabet_sounds_ca-0.8.5.tgz
-9c58d16686fde679c6530304397eb0a5  alphabet_sounds_de-0.8.5.tgz
-74ced81c2c6dd0cb89c619593e7c5bc5  alphabet_sounds_es-0.8.5.tgz
-77cbae60e5118f77e9dec28ad6dcca0a  alphabet_sounds_fr-0.8.5.tgz
-d5bfff67c31a234cc8731d864a3b2bcc  alphabet_sounds_it-0.8.5.tgz
-dea508513cbb89a651dd6ea2c847ae16  alphabet_sounds_nl-0.8.5.tgz
-83b19344e70b1290c6126f1073da6390  alphabet_sounds_ru-0.8.5.tgz
+80251bd541071ad80419c7671c55b45c  childsplay-1.4.tgz
+6edf3f5bdcd72b0be8b6b39090ba550b  alphabet_sounds_bg-0.9.tgz
+4d364cf6c8ea2d0de76e549112736f76  alphabet_sounds_ca-0.9.tgz
+bca24f936474862f03dee738f17b32df  alphabet_sounds_de-0.9.tgz
+8d3037784e12b2c3fd65bba52d228efa  alphabet_sounds_el-0.9.tgz
+6c42429083e5d9eeeb04e53970e1b3d3  alphabet_sounds_en_GB-0.9.tgz
+7786a47749312158fa6b9f1c38448ef4  alphabet_sounds_es-0.9.tgz
+4f5c73c33faad81b62c86daa6f5f8f0b  alphabet_sounds_fr-0.9.tgz
+b9a898c9d4e19427efcc91b9e5a4db56  alphabet_sounds_it-0.9.tgz
+2c5d412e1d431bf379b88fe6ab0e4045  alphabet_sounds_lt-0.9.tgz
+8774b1de15eb331ad2377ca0a90291c2  alphabet_sounds_nb-0.9.tgz
+c8dccd02255b0530674a740a75cb7537  alphabet_sounds_nl-0.9.tgz
+4bd40b14a4ab598ffd5676361e6aed0e  alphabet_sounds_pt-0.9.tgz
+7fde0f2ebd2ce1c26d361efb20794a19  alphabet_sounds_ro-0.9.tgz
+8019fbfcb83e76bee6e1f5d721c663bf  alphabet_sounds_ru-0.9.tgz
+bb66cad97471022c0221209fe45ec6fb  alphabet_sounds_sl-0.9.tgz
+1dafe67b13cce379d97efe420d428ed2  alphabet_sounds_sv-0.9.tgz



From petersen at fedoraproject.org  Sun Sep 13 15:05:15 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 13 Sep 2009 15:05:15 +0000 (UTC)
Subject: rpms/happy/F-11 .cvsignore, 1.4, 1.5 happy.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <20090913150515.7C62811C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/happy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13249

Modified Files:
	.cvsignore happy.spec sources 
Log Message:
backport 1.18.4 from devel, for haskell-platform


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/happy/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Nov 2008 06:35:56 -0000	1.4
+++ .cvsignore	13 Sep 2009 15:05:15 -0000	1.5
@@ -1 +1 @@
-happy-1.18.2.tar.gz
+happy-1.18.4.tar.gz


Index: happy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/happy/F-11/happy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- happy.spec	26 Feb 2009 09:46:22 -0000	1.10
+++ happy.spec	13 Sep 2009 15:05:15 -0000	1.11
@@ -2,16 +2,18 @@
 %define debug_package %{nil}
 
 Name:           happy
-Version:        1.18.2
-Release:        3%{?dist}
+# part of haskell-platform-2009.2.0.1
+Version:        1.18.4
+Release:        2%{?dist}
 License:        BSD
 Group:          Development/Tools
 URL:            http://haskell.org/happy/
 Source:         http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf, ghc, docbook-dtds, docbook-style-xsl, libxslt, libxml2
-Summary:        The LALR(1) Parser Generator for Haskell
-# ghc has only been bootstrapped on the following archs:
+BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  autoconf, docbook-dtds, docbook-style-xsl, libxslt, libxml2
+Summary:        LALR(1) Parser Generator for Haskell
+# fedora ghc archs:
 ExclusiveArch:	%{ix86} x86_64 ppc alpha
 Requires(post): policycoreutils
 
@@ -43,12 +45,12 @@ popd
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 %cabal_install
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post
@@ -64,6 +66,12 @@ restorecon %{_bindir}/%{name}
 
 
 %changelog
+* Sun May 17 2009 Jens Petersen <petersen at redhat.com> - 1.18.4-2
+- buildrequires ghc-rpm-macros
+
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 1.18.4-1
+- 1.18.4 release
+
 * Wed Feb 25 2009 Jens Petersen <petersen at redhat.com> - 1.18.2-3
 - rebuild with %%ix86 for i586
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/happy/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Nov 2008 06:35:56 -0000	1.4
+++ sources	13 Sep 2009 15:05:15 -0000	1.5
@@ -1 +1 @@
-adb1679a1fa8cec74a6e621a4a277e98  happy-1.18.2.tar.gz
+614e3ef9623dbeefc4c8ca699912efb4  happy-1.18.4.tar.gz



From robert at fedoraproject.org  Sun Sep 13 15:14:41 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 13 Sep 2009 15:14:41 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-11 .cvsignore, 1.41, 1.42 phpMyAdmin.htaccess, 1.5,
	1.6 phpMyAdmin.spec, 1.46, 1.47 sources, 1.41, 1.42
Message-ID: <20090913151441.B7C9411C0099@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15719/F-11

Modified Files:
	.cvsignore phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2
- Added ::1 for localhost/loopback access (for IPv6 users)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	9 Aug 2009 22:23:46 -0000	1.41
+++ .cvsignore	13 Sep 2009 15:14:41 -0000	1.42
@@ -1 +1 @@
-phpMyAdmin-3.2.1-all-languages.tar.bz2
+phpMyAdmin-3.2.2-all-languages.tar.bz2


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin.htaccess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- phpMyAdmin.htaccess	29 Nov 2008 00:09:02 -0000	1.5
+++ phpMyAdmin.htaccess	13 Sep 2009 15:14:41 -0000	1.6
@@ -11,6 +11,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   allow from ::1
 </Directory>
 
 # This directory does not require access over HTTP - taken from the original


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- phpMyAdmin.spec	9 Aug 2009 22:23:46 -0000	1.46
+++ phpMyAdmin.spec	13 Sep 2009 15:14:41 -0000	1.47
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.1
+Version: 3.2.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
+- Upstream released 3.2.2
+
+* Sun Sep 06 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-2
+- Added ::1 for localhost/loopback access (for IPv6 users)
+
 * Mon Aug 10 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-1
 - Upstream released 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	9 Aug 2009 22:23:46 -0000	1.41
+++ sources	13 Sep 2009 15:14:41 -0000	1.42
@@ -1 +1 @@
-f6b0273cba534fefa0a1d69b78a003df  phpMyAdmin-3.2.1-all-languages.tar.bz2
+a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2



From robert at fedoraproject.org  Sun Sep 13 15:14:41 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 13 Sep 2009 15:14:41 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.41, 1.42 phpMyAdmin.htaccess, 1.5,
	1.6 phpMyAdmin.spec, 1.45, 1.46 sources, 1.41, 1.42
Message-ID: <20090913151441.BEEC811C02BD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15719/F-10

Modified Files:
	.cvsignore phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2
- Added ::1 for localhost/loopback access (for IPv6 users)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	9 Aug 2009 22:23:45 -0000	1.41
+++ .cvsignore	13 Sep 2009 15:14:40 -0000	1.42
@@ -1 +1 @@
-phpMyAdmin-3.2.1-all-languages.tar.bz2
+phpMyAdmin-3.2.2-all-languages.tar.bz2


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.htaccess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- phpMyAdmin.htaccess	29 Nov 2008 00:09:01 -0000	1.5
+++ phpMyAdmin.htaccess	13 Sep 2009 15:14:40 -0000	1.6
@@ -11,6 +11,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   allow from ::1
 </Directory>
 
 # This directory does not require access over HTTP - taken from the original


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- phpMyAdmin.spec	9 Aug 2009 22:23:45 -0000	1.45
+++ phpMyAdmin.spec	13 Sep 2009 15:14:40 -0000	1.46
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.1
+Version: 3.2.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
+- Upstream released 3.2.2
+
+* Sun Sep 06 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-2
+- Added ::1 for localhost/loopback access (for IPv6 users)
+
 * Mon Aug 10 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-1
 - Upstream released 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	9 Aug 2009 22:23:45 -0000	1.41
+++ sources	13 Sep 2009 15:14:40 -0000	1.42
@@ -1 +1 @@
-f6b0273cba534fefa0a1d69b78a003df  phpMyAdmin-3.2.1-all-languages.tar.bz2
+a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2



From robert at fedoraproject.org  Sun Sep 13 15:14:42 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 13 Sep 2009 15:14:42 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.41, 1.42 phpMyAdmin.htaccess,
	1.5, 1.6 phpMyAdmin.spec, 1.47, 1.48 sources, 1.41, 1.42
Message-ID: <20090913151442.0B3DC11C0099@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15719/devel

Modified Files:
	.cvsignore phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2
- Added ::1 for localhost/loopback access (for IPv6 users)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	9 Aug 2009 22:23:46 -0000	1.41
+++ .cvsignore	13 Sep 2009 15:14:41 -0000	1.42
@@ -1 +1 @@
-phpMyAdmin-3.2.1-all-languages.tar.bz2
+phpMyAdmin-3.2.2-all-languages.tar.bz2


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.htaccess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- phpMyAdmin.htaccess	29 Nov 2008 00:09:02 -0000	1.5
+++ phpMyAdmin.htaccess	13 Sep 2009 15:14:41 -0000	1.6
@@ -11,6 +11,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   allow from ::1
 </Directory>
 
 # This directory does not require access over HTTP - taken from the original


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- phpMyAdmin.spec	9 Aug 2009 22:23:46 -0000	1.47
+++ phpMyAdmin.spec	13 Sep 2009 15:14:41 -0000	1.48
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.1
+Version: 3.2.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
+- Upstream released 3.2.2
+
+* Sun Sep 06 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-2
+- Added ::1 for localhost/loopback access (for IPv6 users)
+
 * Mon Aug 10 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-1
 - Upstream released 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	9 Aug 2009 22:23:46 -0000	1.41
+++ sources	13 Sep 2009 15:14:41 -0000	1.42
@@ -1 +1 @@
-f6b0273cba534fefa0a1d69b78a003df  phpMyAdmin-3.2.1-all-languages.tar.bz2
+a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2



From robert at fedoraproject.org  Sun Sep 13 15:17:35 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 13 Sep 2009 15:17:35 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-4 phpMyAdmin.htaccess, 1.5, 1.6 phpMyAdmin.spec, 
	1.35, 1.36
Message-ID: <20090913151735.B03D911C0099@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16701/EL-4

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec 
Log Message:
Added ::1 for localhost/loopback access (for IPv6 users)



Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.htaccess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- phpMyAdmin.htaccess	29 Nov 2008 00:04:56 -0000	1.5
+++ phpMyAdmin.htaccess	13 Sep 2009 15:17:35 -0000	1.6
@@ -11,6 +11,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   allow from ::1
 </Directory>
 
 # This directory does not require access over HTTP - taken from the original


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- phpMyAdmin.spec	25 Mar 2009 08:59:11 -0000	1.35
+++ phpMyAdmin.spec	13 Sep 2009 15:17:35 -0000	1.36
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.11.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.5-2
+- Added ::1 for localhost/loopback access (for IPv6 users)
+
 * Wed Mar 25 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.5-1
 - Upstream released 2.11.9.5 (#492066)
 



From robert at fedoraproject.org  Sun Sep 13 15:17:35 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 13 Sep 2009 15:17:35 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-5 phpMyAdmin.htaccess, 1.5, 1.6 phpMyAdmin.spec, 
	1.35, 1.36
Message-ID: <20090913151735.D8F5611C0099@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16701/EL-5

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec 
Log Message:
Added ::1 for localhost/loopback access (for IPv6 users)



Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.htaccess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- phpMyAdmin.htaccess	29 Nov 2008 00:04:57 -0000	1.5
+++ phpMyAdmin.htaccess	13 Sep 2009 15:17:35 -0000	1.6
@@ -11,6 +11,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   allow from ::1
 </Directory>
 
 # This directory does not require access over HTTP - taken from the original


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- phpMyAdmin.spec	25 Mar 2009 08:59:12 -0000	1.35
+++ phpMyAdmin.spec	13 Sep 2009 15:17:35 -0000	1.36
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.11.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.5-2
+- Added ::1 for localhost/loopback access (for IPv6 users)
+
 * Wed Mar 25 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.5-1
 - Upstream released 2.11.9.5 (#492066)
 



From chitlesh at fedoraproject.org  Sun Sep 13 15:17:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 13 Sep 2009 15:17:48 +0000 (UTC)
Subject: rpms/gerbv/F-10 gerbv-empty_orientation.patch, NONE, 1.1 gerbv.spec,
	1.7, 1.8 import.log, 1.3, 1.4
Message-ID: <20090913151748.88C5D11C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17102/F-10

Modified Files:
	gerbv.spec import.log 
Added Files:
	gerbv-empty_orientation.patch 
Log Message:
no layer orientation crash fix

gerbv-empty_orientation.patch:
 callbacks.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE gerbv-empty_orientation.patch ---
--- src/callbacks.c	2009-07-10 23:34:26.000000000 +0200
+++ callbacks.c	2009-09-13 15:59:38.561102851 +0200
@@ -1997,6 +1997,14 @@
 callbacks_change_layer_orientation_clicked  (GtkButton *button, gpointer userData){
 	gint index = callbacks_get_selected_row_index();
 
+	if (index < 0) {
+		interface_show_alert_dialog("No layers are currently loaded",
+									"A layer must be loaded before the orientation can be modified.",
+									FALSE,
+									NULL);
+		return;
+	}
+	
 	interface_show_modify_orientation_dialog(&mainProject->file[index]->transform,screen.unit);
 	render_refresh_rendered_image_on_screen ();
 	callbacks_update_layer_tree ();	
@@ -2433,7 +2441,7 @@
 callbacks_delete_objects_clicked (GtkButton *button, gpointer   user_data){
 	if (screen.selectionInfo.type == GERBV_SELECTION_EMPTY) {
 		interface_show_alert_dialog("No object is currently selected",
-		                        NULL,
+		                        "Objects must be selected using the pointer tool before they can be deleted.",
 		                        FALSE,
 		                        NULL);
 		return;


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-10/gerbv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gerbv.spec	12 Jul 2009 09:12:54 -0000	1.7
+++ gerbv.spec	13 Sep 2009 15:17:48 -0000	1.8
@@ -1,13 +1,18 @@
+# Fixing the end-of-line encodings is omitted because of
+# https://fedorahosted.org/fedora-electronic-lab/ticket/47
+
 Name:             gerbv
 Version:          2.3.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.sourceforge.net/
+URL:              http://gerbv.gpleda.org/index.html
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
+# Fix bug 2841371 (segfault on edit->orientation with no layer loaded
+Patch0:           gerbv-empty_orientation.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtk2-devel, libpng-devel, desktop-file-utils, automake, ImageMagick-devel
@@ -44,6 +49,8 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
+%patch0 -p0 -b .orientation
+
 %build
 
 # default measurement units set to millimeters
@@ -65,7 +72,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 %{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
@@ -89,17 +96,6 @@ for dir in * ; do
 done
 popd
 
-#Fixing the end-of-line encodings
-set +x
-for f in `find example/ -name \*.* | sort` doc/eagle/eagle2exc.txt ; do
-   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
-   sed -i.bak -e 's|\r||g' $f
-   touch -r $f.bak $f
-   %{__rm} -f $f.bak
-   echo "done"
-done
-set -x
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -119,7 +115,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO CONTRIBUTORS HACKING
 %doc example/
 %doc doc/example-code
 %doc doc/eagle
@@ -131,7 +127,7 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/gerbv.*
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/lib%{name}.so.*
 
 
@@ -144,6 +140,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Sun Sep 13 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-2
+- Fixed gerbv-2.3.0-1 png failed to open - FEL ticket #47 
+- Fixed bug 2841371 (segfault on edit->orientation with no layer loaded)
+
 * Sat Jul 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Jul 2009 09:12:54 -0000	1.3
+++ import.log	13 Sep 2009 15:17:48 -0000	1.4
@@ -1,3 +1,4 @@
 gerbv-2_1_0-2_fc9:F-10:gerbv-2.1.0-2.fc9.src.rpm:1226608650
 gerbv-2_2_0-1_fc10:F-10:gerbv-2.2.0-1.fc10.src.rpm:1233179789
 gerbv-2_3_0-1_fc11:F-10:gerbv-2.3.0-1.fc11.src.rpm:1247389835
+gerbv-2_3_0-2_fc11:F-10:gerbv-2.3.0-2.fc11.src.rpm:1252854827



From chitlesh at fedoraproject.org  Sun Sep 13 15:19:59 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 13 Sep 2009 15:19:59 +0000 (UTC)
Subject: rpms/gerbv/F-11 gerbv-empty_orientation.patch, NONE, 1.1 gerbv.spec,
	1.11, 1.12 import.log, 1.3, 1.4
Message-ID: <20090913151959.7ACF011C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18373/F-11

Modified Files:
	gerbv.spec import.log 
Added Files:
	gerbv-empty_orientation.patch 
Log Message:
no layer orientation crash fix

gerbv-empty_orientation.patch:
 callbacks.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE gerbv-empty_orientation.patch ---
--- src/callbacks.c	2009-07-10 23:34:26.000000000 +0200
+++ callbacks.c	2009-09-13 15:59:38.561102851 +0200
@@ -1997,6 +1997,14 @@
 callbacks_change_layer_orientation_clicked  (GtkButton *button, gpointer userData){
 	gint index = callbacks_get_selected_row_index();
 
+	if (index < 0) {
+		interface_show_alert_dialog("No layers are currently loaded",
+									"A layer must be loaded before the orientation can be modified.",
+									FALSE,
+									NULL);
+		return;
+	}
+	
 	interface_show_modify_orientation_dialog(&mainProject->file[index]->transform,screen.unit);
 	render_refresh_rendered_image_on_screen ();
 	callbacks_update_layer_tree ();	
@@ -2433,7 +2441,7 @@
 callbacks_delete_objects_clicked (GtkButton *button, gpointer   user_data){
 	if (screen.selectionInfo.type == GERBV_SELECTION_EMPTY) {
 		interface_show_alert_dialog("No object is currently selected",
-		                        NULL,
+		                        "Objects must be selected using the pointer tool before they can be deleted.",
 		                        FALSE,
 		                        NULL);
 		return;


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-11/gerbv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gerbv.spec	12 Jul 2009 09:17:46 -0000	1.11
+++ gerbv.spec	13 Sep 2009 15:19:59 -0000	1.12
@@ -1,13 +1,18 @@
+# Fixing the end-of-line encodings is omitted because of
+# https://fedorahosted.org/fedora-electronic-lab/ticket/47
+
 Name:             gerbv
 Version:          2.3.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.sourceforge.net/
+URL:              http://gerbv.gpleda.org/index.html
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
+# Fix bug 2841371 (segfault on edit->orientation with no layer loaded
+Patch0:           gerbv-empty_orientation.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtk2-devel, libpng-devel, desktop-file-utils, automake, ImageMagick-devel
@@ -44,6 +49,8 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
+%patch0 -p0 -b .orientation
+
 %build
 
 # default measurement units set to millimeters
@@ -65,7 +72,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 %{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
@@ -89,17 +96,6 @@ for dir in * ; do
 done
 popd
 
-#Fixing the end-of-line encodings
-set +x
-for f in `find example/ -name \*.* | sort` doc/eagle/eagle2exc.txt ; do
-   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
-   sed -i.bak -e 's|\r||g' $f
-   touch -r $f.bak $f
-   %{__rm} -f $f.bak
-   echo "done"
-done
-set -x
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -119,7 +115,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO CONTRIBUTORS HACKING
 %doc example/
 %doc doc/example-code
 %doc doc/eagle
@@ -131,7 +127,7 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/gerbv.*
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/lib%{name}.so.*
 
 
@@ -144,6 +140,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Sun Sep 13 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-2
+- Fixed gerbv-2.3.0-1 png failed to open - FEL ticket #47 
+- Fixed bug 2841371 (segfault on edit->orientation with no layer loaded)
+
 * Sat Jul 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Jul 2009 09:17:46 -0000	1.3
+++ import.log	13 Sep 2009 15:19:59 -0000	1.4
@@ -1,3 +1,4 @@
 gerbv-2_1_0-2_fc9:HEAD:gerbv-2.1.0-2.fc9.src.rpm:1226608797
 gerbv-2_2_0-1_fc10:HEAD:gerbv-2.2.0-1.fc10.src.rpm:1233179942
 gerbv-2_3_0-1_fc11:F-11:gerbv-2.3.0-1.fc11.src.rpm:1247389952
+gerbv-2_3_0-2_fc11:F-11:gerbv-2.3.0-2.fc11.src.rpm:1252854968



From chitlesh at fedoraproject.org  Sun Sep 13 15:24:20 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 13 Sep 2009 15:24:20 +0000 (UTC)
Subject: rpms/gerbv/EL-5 gerbv-empty_orientation.patch, NONE, 1.1 gerbv.spec,
	1.4, 1.5 import.log, 1.2, 1.3
Message-ID: <20090913152420.6BA7B11C0489@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19673/EL-5

Modified Files:
	gerbv.spec import.log 
Added Files:
	gerbv-empty_orientation.patch 
Log Message:
no layer orientation crash fix

gerbv-empty_orientation.patch:
 callbacks.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE gerbv-empty_orientation.patch ---
--- src/callbacks.c	2009-07-10 23:34:26.000000000 +0200
+++ callbacks.c	2009-09-13 15:59:38.561102851 +0200
@@ -1997,6 +1997,14 @@
 callbacks_change_layer_orientation_clicked  (GtkButton *button, gpointer userData){
 	gint index = callbacks_get_selected_row_index();
 
+	if (index < 0) {
+		interface_show_alert_dialog("No layers are currently loaded",
+									"A layer must be loaded before the orientation can be modified.",
+									FALSE,
+									NULL);
+		return;
+	}
+	
 	interface_show_modify_orientation_dialog(&mainProject->file[index]->transform,screen.unit);
 	render_refresh_rendered_image_on_screen ();
 	callbacks_update_layer_tree ();	
@@ -2433,7 +2441,7 @@
 callbacks_delete_objects_clicked (GtkButton *button, gpointer   user_data){
 	if (screen.selectionInfo.type == GERBV_SELECTION_EMPTY) {
 		interface_show_alert_dialog("No object is currently selected",
-		                        NULL,
+		                        "Objects must be selected using the pointer tool before they can be deleted.",
 		                        FALSE,
 		                        NULL);
 		return;


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/EL-5/gerbv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gerbv.spec	12 Jul 2009 09:21:23 -0000	1.4
+++ gerbv.spec	13 Sep 2009 15:24:19 -0000	1.5
@@ -1,13 +1,18 @@
+# Fixing the end-of-line encodings is omitted because of
+# https://fedorahosted.org/fedora-electronic-lab/ticket/47
+
 Name:             gerbv
 Version:          2.3.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.sourceforge.net/
+URL:              http://gerbv.gpleda.org/index.html
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
+# Fix bug 2841371 (segfault on edit->orientation with no layer loaded
+Patch0:           gerbv-empty_orientation.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtk2-devel, libpng-devel, desktop-file-utils, automake, ImageMagick-devel
@@ -44,6 +49,8 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
+%patch0 -p0 -b .orientation
+
 %build
 
 # default measurement units set to millimeters
@@ -65,7 +72,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 %{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
@@ -89,17 +96,6 @@ for dir in * ; do
 done
 popd
 
-#Fixing the end-of-line encodings
-set +x
-for f in `find example/ -name \*.* | sort` doc/eagle/eagle2exc.txt ; do
-   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
-   sed -i.bak -e 's|\r||g' $f
-   touch -r $f.bak $f
-   %{__rm} -f $f.bak
-   echo "done"
-done
-set -x
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -119,7 +115,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO CONTRIBUTORS HACKING
 %doc example/
 %doc doc/example-code
 %doc doc/eagle
@@ -131,7 +127,7 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/gerbv.*
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/lib%{name}.so.*
 
 
@@ -144,6 +140,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Sun Sep 13 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-2
+- Fixed gerbv-2.3.0-1 png failed to open - FEL ticket #47 
+- Fixed bug 2841371 (segfault on edit->orientation with no layer loaded)
+
 * Sat Jul 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Jul 2009 09:21:23 -0000	1.2
+++ import.log	13 Sep 2009 15:24:19 -0000	1.3
@@ -1,2 +1,3 @@
 gerbv-2_1_0-2_fc9:EL-5:gerbv-2.1.0-2.fc9.src.rpm:1226668665
 gerbv-2_3_0-1_fc11:EL-5:gerbv-2.3.0-1.fc11.src.rpm:1247390404
+gerbv-2_3_0-2_fc11:EL-5:gerbv-2.3.0-2.fc11.src.rpm:1252855094



From chitlesh at fedoraproject.org  Sun Sep 13 15:27:15 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 13 Sep 2009 15:27:15 +0000 (UTC)
Subject: rpms/gerbv/devel gerbv-empty_orientation.patch, NONE, 1.1 gerbv.spec,
	1.12, 1.13 import.log, 1.3, 1.4
Message-ID: <20090913152715.1C50511C0099@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20631/devel

Modified Files:
	gerbv.spec import.log 
Added Files:
	gerbv-empty_orientation.patch 
Log Message:
no layer orientation crash fix

gerbv-empty_orientation.patch:
 callbacks.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE gerbv-empty_orientation.patch ---
--- src/callbacks.c	2009-07-10 23:34:26.000000000 +0200
+++ callbacks.c	2009-09-13 15:59:38.561102851 +0200
@@ -1997,6 +1997,14 @@
 callbacks_change_layer_orientation_clicked  (GtkButton *button, gpointer userData){
 	gint index = callbacks_get_selected_row_index();
 
+	if (index < 0) {
+		interface_show_alert_dialog("No layers are currently loaded",
+									"A layer must be loaded before the orientation can be modified.",
+									FALSE,
+									NULL);
+		return;
+	}
+	
 	interface_show_modify_orientation_dialog(&mainProject->file[index]->transform,screen.unit);
 	render_refresh_rendered_image_on_screen ();
 	callbacks_update_layer_tree ();	
@@ -2433,7 +2441,7 @@
 callbacks_delete_objects_clicked (GtkButton *button, gpointer   user_data){
 	if (screen.selectionInfo.type == GERBV_SELECTION_EMPTY) {
 		interface_show_alert_dialog("No object is currently selected",
-		                        NULL,
+		                        "Objects must be selected using the pointer tool before they can be deleted.",
 		                        FALSE,
 		                        NULL);
 		return;


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/devel/gerbv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gerbv.spec	24 Jul 2009 23:53:28 -0000	1.12
+++ gerbv.spec	13 Sep 2009 15:27:14 -0000	1.13
@@ -1,13 +1,18 @@
+# Fixing the end-of-line encodings is omitted because of
+# https://fedorahosted.org/fedora-electronic-lab/ticket/47
+
 Name:             gerbv
 Version:          2.3.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.sourceforge.net/
+URL:              http://gerbv.gpleda.org/index.html
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
+# Fix bug 2841371 (segfault on edit->orientation with no layer loaded
+Patch0:           gerbv-empty_orientation.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtk2-devel, libpng-devel, desktop-file-utils, automake, ImageMagick-devel
@@ -44,6 +49,8 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
+%patch0 -p0 -b .orientation
+
 %build
 
 # default measurement units set to millimeters
@@ -65,7 +72,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 %{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
@@ -89,17 +96,6 @@ for dir in * ; do
 done
 popd
 
-#Fixing the end-of-line encodings
-set +x
-for f in `find example/ -name \*.* | sort` doc/eagle/eagle2exc.txt ; do
-   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
-   sed -i.bak -e 's|\r||g' $f
-   touch -r $f.bak $f
-   %{__rm} -f $f.bak
-   echo "done"
-done
-set -x
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -119,7 +115,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO CONTRIBUTORS HACKING
 %doc example/
 %doc doc/example-code
 %doc doc/eagle
@@ -131,7 +127,7 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/gerbv.*
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/lib%{name}.so.*
 
 
@@ -144,6 +140,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %Changelog
+* Sun Sep 13 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-3
+- Fixed gerbv-2.3.0-1 png failed to open - FEL ticket #47 
+- Fixed bug 2841371 (segfault on edit->orientation with no layer loaded)
+
 * Sat Jul 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Jul 2009 09:19:26 -0000	1.3
+++ import.log	13 Sep 2009 15:27:14 -0000	1.4
@@ -1,3 +1,4 @@
 gerbv-2_1_0-2_fc9:HEAD:gerbv-2.1.0-2.fc9.src.rpm:1226608797
 gerbv-2_2_0-1_fc10:HEAD:gerbv-2.2.0-1.fc10.src.rpm:1233179942
 gerbv-2_3_0-1_fc11:HEAD:gerbv-2.3.0-1.fc11.src.rpm:1247390294
+gerbv-2_3_0-3_fc11:HEAD:gerbv-2.3.0-3.fc11.src.rpm:1252855435



From mbarnes at fedoraproject.org  Sun Sep 13 15:28:51 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 13 Sep 2009 15:28:51 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.21,
	1.116.2.22 evolution.spec, 
	1.394.2.46, 1.394.2.47 sources, 1.116.2.25, 1.116.2.26
Message-ID: <20090913152851.8810A11C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21195

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Sun Sep 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.6.fc12
- Snapshot of "kill-bonobo" progress at commit f8a2538.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.21
retrieving revision 1.116.2.22
diff -u -p -r1.116.2.21 -r1.116.2.22
--- .cvsignore	9 Sep 2009 02:44:27 -0000	1.116.2.21
+++ .cvsignore	13 Sep 2009 15:28:51 -0000	1.116.2.22
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2
+evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.46
retrieving revision 1.394.2.47
diff -u -p -r1.394.2.46 -r1.394.2.47
--- evolution.spec	9 Sep 2009 09:51:54 -0000	1.394.2.46
+++ evolution.spec	13 Sep 2009 15:28:51 -0000	1.394.2.47
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 0a47d87
+%define hash f8a2538
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.5%{?dist}
+Release: 1.kb.6%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Sun Sep 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.6.fc12
+- Snapshot of "kill-bonobo" progress at commit f8a2538.
+
 * Tue Sep 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.5.fc12
 - Snapshot of "kill-bonobo" progress at commit 0a47d87.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.25
retrieving revision 1.116.2.26
diff -u -p -r1.116.2.25 -r1.116.2.26
--- sources	9 Sep 2009 02:44:27 -0000	1.116.2.25
+++ sources	13 Sep 2009 15:28:51 -0000	1.116.2.26
@@ -1 +1 @@
-84efc5b17b678292d07b8da65f97122f  evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2
+2c95705bbd990367b34606dc1450fdf9  evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2



From djuran at fedoraproject.org  Sun Sep 13 15:36:36 2009
From: djuran at fedoraproject.org (David Juran)
Date: Sun, 13 Sep 2009 15:36:36 +0000 (UTC)
Subject: rpms/azureus/devel
	azureus-no-update-manager-CoreUpdateChecker.patch, 
	1.5, 1.6 azureus-no-update-manager-PluginInstallerImpl.patch,
	1.3, 1.4 azureus-no-update-manager-PluginUpdatePlugin.patch, 1.1,
	1.2 azureus-no-update-manager-SWTUpdateChecker.patch, 1.6,
	1.7 azureus-no-update-manager-UpdateMonitor.patch, 1.7,
	1.8 azureus-no-updates-PluginInitializer.patch, 1.3,
	1.4 azureus-no-updates-PluginInterfaceImpl.patch, 1.3,
	1.4 azureus.script, 1.24, 1.25 azureus.spec, 1.79,
	1.80 azureus-no-update-manager-PluginInstallerImpl-2.patch, 1.1, NONE
Message-ID: <20090913153636.917AA11C0099@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23444

Modified Files:
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-PluginInstallerImpl.patch 
	azureus-no-update-manager-PluginUpdatePlugin.patch 
	azureus-no-update-manager-SWTUpdateChecker.patch 
	azureus-no-update-manager-UpdateMonitor.patch 
	azureus-no-updates-PluginInitializer.patch 
	azureus-no-updates-PluginInterfaceImpl.patch azureus.script 
	azureus.spec 
Removed Files:
	azureus-no-update-manager-PluginInstallerImpl-2.patch 
Log Message:
- revive the no-updates patches (Bz515131)
- fix start-script to work when  /usr/share/azureus/plugins/ is empty


azureus-no-update-manager-CoreUpdateChecker.patch:
 CoreUpdateChecker.java |  300 -------------------------------------------------
 1 file changed, 300 deletions(-)

Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- azureus-no-update-manager-CoreUpdateChecker.patch	3 Dec 2007 17:03:21 -0000	1.5
+++ azureus-no-update-manager-CoreUpdateChecker.patch	13 Sep 2009 15:36:35 -0000	1.6
@@ -1,6 +1,7 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/update/CoreUpdateChecker.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java	2007-12-03 10:30:37.000000000 -0500
-@@ -124,8 +124,6 @@
+diff -up azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker	2009-07-07 00:52:10.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java	2009-09-13 12:41:05.000000000 +0200
+@@ -127,8 +127,6 @@ CoreUpdateChecker
  		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
  		
  		rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +10,7 @@
  	}
  	
  	public String
-@@ -144,302 +142,10 @@
+@@ -147,309 +145,11 @@ CoreUpdateChecker
  	checkForUpdate(
  		final UpdateChecker	checker )
  	{
@@ -20,10 +21,15 @@
 -													
 -			Map	decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
 -		  			first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
--
+ 
 -      
 -			displayUserMessage( decoded );
 -			
+-			// No point complaining later if we don't have any data in the map (which is
+-			// more likely due to network problems rather than the version check server
+-			// *actually* returning a map with nothing in it. 
+-			if (decoded.isEmpty()) {return;}
+-			
 -			String latest_version;
 -			String latest_file_name;
 -			
@@ -100,7 +106,7 @@
 -			if ( full_download_url == null ){
 -				
 -				ResourceDownloader[]	primary_mirrors;
--					
+-									
 -				primary_mirrors = getPrimaryDownloaders( latest_file_name );
 -	
 -					// the download hierarchy is primary mirrors first (randomised alternate)
@@ -188,7 +194,7 @@
 -			if ( info_b != null ){
 -			
 -				try{
--					info = new String( info_b );
+-					info = new String( info_b, "UTF-8" );
 -				
 -				}catch( Throwable e ){
 -					
@@ -290,7 +296,7 @@
 -							final ResourceDownloader	downloader,
 -							InputStream					data )
 -						{	
--							installUpdate( checker, update, downloader, f_latest_version, data );
+-							installUpdate( checker, update, downloader, f_latest_file_name, f_latest_version, data );
 -									
 -							return( true );
 -						}
@@ -301,6 +307,8 @@
 -			
 -			Debug.printStackTrace( e );
 -			
+-			checker.reportProgress( "Failed to check for core update: " + Debug.getNestedExceptionMessage(e));
+-			
 -			checker.failed();
 -			
 -		}finally{

azureus-no-update-manager-PluginInstallerImpl.patch:
 PluginInstallerImpl.java |  354 +++++++++++++++++------------------------------
 1 file changed, 130 insertions(+), 224 deletions(-)

Index: azureus-no-update-manager-PluginInstallerImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-PluginInstallerImpl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-update-manager-PluginInstallerImpl.patch	3 Dec 2007 17:03:21 -0000	1.3
+++ azureus-no-update-manager-PluginInstallerImpl.patch	13 Sep 2009 15:36:35 -0000	1.4
@@ -1,22 +1,110 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2007-12-03 10:32:17.000000000 -0500
-@@ -181,13 +181,6 @@
+diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java
+--- azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl	2009-03-09 20:25:32.000000000 +0100
++++ azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2009-09-13 17:14:11.000000000 +0200
+@@ -464,97 +464,7 @@ PluginInstallerImpl
+ 		throws PluginException
  	{
  		PluginUpdatePlugin	pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
- 		
--		UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
 -		
--		UpdateCheckInstance	inst = 
+-		UpdateManagerImpl	uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
+-		
+-		UpdateCheckInstanceImpl	inst = 
 -			uman.createEmptyUpdateCheckInstance( 
 -					UpdateCheckInstance.UCI_INSTALL,
--					"update.instance.install" );
+-					"update.instance.install",
+-					low_noise );
+-		
+-		if ( properties != null ){
+-			
+-			for ( Map.Entry<Integer,Object> entry: properties.entrySet()){
+ 				
+-				inst.setProperty( entry.getKey(), entry.getValue());
+-			}
+-		}
+-		
+-		if ( listener != null ){
+-			
+-			inst.addListener(
+-				new UpdateCheckInstanceListener()
+-				{
+-					public void
+-					cancelled(
+-						UpdateCheckInstance		instance )
+-					{
+-						listener.cancelled();
+-					}
+-					
+-					public void
+-					complete(
+-						UpdateCheckInstance		instance )
+-					{
+-						final Update[] updates = instance.getUpdates();
+-						
+-						if ( updates.length == 0 ){
+-														
+-							listener.failed( new PluginException( "No updates were added during check process" ));
+-							
+-						}else{
+-							
+-							for (int i=0;i<updates.length;i++){
+-								
+-								updates[i].addListener(
+-									new UpdateListener()
+-									{
+-										private boolean	cancelled;
+-										
+-										public void 
+-										cancelled(
+-											Update update) 
+-										{
+-											cancelled = true;
+-											
+-											check();
+-										}
+-										
+-										public void 
+-										complete(
+-											Update update ) 
+-										{
+-											check();
+-										}
+-										
+-										protected void
+-										check()
+-										{
+-											for (int i=0;i<updates.length;i++){
+-												
+-												if ( !updates[i].isCancelled() && !updates[i].isComplete()){
+-													
+-													return;
+-												}
+-											}
+-											
+-											if ( cancelled ){
+-												
+-												listener.cancelled();
+-												
+-											}else{
+-												
+-												listener.completed();
+-											}
+-										}
+-									});
+-							}
+-						}
+-					}
+-				});
+-		}
 -		
  		try{
  			
  			for (int i=0;i<plugins.length;i++){
-@@ -254,23 +247,6 @@
+@@ -619,56 +529,52 @@ PluginInstallerImpl
+ 				
+ 					final PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id, false );
  					
- 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
+-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
++// 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
  							
 -					inst.addListener(
 -						new UpdateCheckInstanceListener()
@@ -25,20 +113,67 @@
 -							cancelled(
 -								UpdateCheckInstance		instance )
 -							{
--								dummy_plugin.requestUnload();
+-								try{
++// 					inst.addListener(
++// 						new UpdateCheckInstanceListener()
++// 						{
++// 							public void
++// 							cancelled(
++// 								UpdateCheckInstance		instance )
++// 							{
++// 								try{
+ 								
+-									dummy_plugin_interface.getPluginState().unload();
++// 									dummy_plugin_interface.getPluginState().unload();
+ 									
+-								}catch( Throwable e ){
++// 								}catch( Throwable e ){
+ 									
+-									Debug.out( "Failed to unload plugin", e );
+-								}
 -							}
--							
++// 									Debug.out( "Failed to unload plugin", e );
++// 								}
++// 							}
+ 							
 -							public void
 -							complete(
 -								UpdateCheckInstance		instance )
 -							{
--								dummy_plugin.requestUnload();
+-								PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
++// 							public void
++// 							complete(
++// 								UpdateCheckInstance		instance )
++// 							{
++// 								PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
+ 								
+-								if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
++// 								if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
+ 									
+-									try{
+-										pi.getPluginState().unload();
++// 									try{
++// 										pi.getPluginState().unload();
+ 										
+-									}catch( Throwable e ){
++// 									}catch( Throwable e ){
+ 										
+-										Debug.out( "Failed to unload plugin", e );
+-									}
+-								}
++// 										Debug.out( "Failed to unload plugin", e );
++// 									}
++// 								}
+ 
 -							}
 -						});
- 				}else{
+-				}else{
++// 							}
++// 						});
++// 				}else{
  					
- 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-@@ -278,12 +254,8 @@
+-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
++// 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
  				}
  			}
  		
@@ -51,24 +186,33 @@
  			if ( e instanceof PluginException ){
  				
  				throw((PluginException)e);
-@@ -347,138 +319,6 @@
+@@ -732,138 +638,138 @@ PluginInstallerImpl
  			}
  		}
  		
 -		try{
 -			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
--			
++// 		try{
++// 			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
+ 			
 -			UpdateCheckInstance	inst = 
 -				uman.createEmptyUpdateCheckInstance(
 -						UpdateCheckInstance.UCI_UNINSTALL,
 -						"update.instance.uninstall");
--
++// 			UpdateCheckInstance	inst = 
++// 				uman.createEmptyUpdateCheckInstance(
++// 						UpdateCheckInstance.UCI_UNINSTALL,
++// 						"update.instance.uninstall");
+ 
 -			for (int i=0;i<pis.length;i++){
--				
++// 			for (int i=0;i<pis.length;i++){
+ 				
 -				final PluginInterface	pi = pis[i];
--				
++// 				final PluginInterface	pi = pis[i];
+ 				
 -				final String	plugin_dir = pi.getPluginDirectoryName();
--
++// 				final String	plugin_dir = pi.getPluginDirectoryName();
+ 
 -				inst.addUpdatableComponent(
 -					new UpdatableComponent()
 -					{
@@ -83,7 +227,21 @@
 -						{
 -							return( 0 );
 -						}
--						
++// 				inst.addUpdatableComponent(
++// 					new UpdatableComponent()
++// 					{
++// 						public String
++// 						getName()
++// 						{
++// 							return( pi.getPluginName());
++// 						}
++					
++// 						public int
++// 						getMaximumCheckTime()
++// 						{
++// 							return( 0 );
++// 						}
+ 						
 -						public void
 -						checkForUpdate(
 -							final UpdateChecker	checker )
@@ -91,7 +249,14 @@
 -							try{
 -								ResourceDownloader rd = 
 -									manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
--								
++// 						public void
++// 						checkForUpdate(
++// 							final UpdateChecker	checker )
++// 						{
++// 							try{
++// 								ResourceDownloader rd = 
++// 									manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
+ 								
 -								rd.addListener(
 -									new ResourceDownloaderAdapter()
 -									{
@@ -101,31 +266,54 @@
 -											InputStream			data )
 -										{
 -											try{
--												if ( pi.isUnloadable()){
--											
--													pi.unload();
--													
+-												if ( pi.getPluginState().isUnloadable()){
++// 								rd.addListener(
++// 									new ResourceDownloaderAdapter()
++// 									{
++// 										public boolean
++// 										completed(
++// 											ResourceDownloader	downloader,
++// 											InputStream			data )
++// 										{
++// 											try{
++// 												if ( pi.getPluginState().isUnloadable()){
+ 											
+-													pi.getPluginState().unload();
++// 													pi.getPluginState().unload();
+ 													
 -													FileUtil.recursiveDelete( new File( plugin_dir ));
--												
++// 													FileUtil.recursiveDelete( new File( plugin_dir ));
+ 												
 -												}
--																
++// 												}
+ 																
 -												UpdateInstaller installer = checker.createInstaller();
--													
++// 												UpdateInstaller installer = checker.createInstaller();
+ 													
 -												installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
--											
--												
++// 												installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
+ 											
+ 												
 -											}catch( Throwable e ){
--												
++// 											}catch( Throwable e ){
+ 												
 -												Debug.printStackTrace(e);
 -												Logger.log(new LogAlert(LogAlert.REPEATABLE,
 -														"Plugin uninstall failed", e));
 -											}
--											
++// 												Debug.printStackTrace(e);
++// 												Logger.log(new LogAlert(LogAlert.REPEATABLE,
++// 														"Plugin uninstall failed", e));
++// 											}
+ 											
 -												// don't close the stream as we process it later
--												
++// 												// don't close the stream as we process it later
+ 												
 -											return( true );
 -										}
--										
++// 											return( true );
++// 										}
+ 										
 -										public void
 -										failed(
 -											ResourceDownloader			downloader,
@@ -137,13 +325,27 @@
 -											}
 -										}
 -									});
--	
++// 										public void
++// 										failed(
++// 											ResourceDownloader			downloader,
++// 											ResourceDownloaderException e )
++// 										{
++// 											if ( !downloader.isCancelled()){
++// 												Logger.log(new LogAlert(LogAlert.REPEATABLE,
++// 														"Plugin uninstall failed", e));
++// 											}
++// 										}
++// 									});
+ 	
 -									// the plugin may have > 1 plugin interfaces, make the name up appropriately
--								
++// 									// the plugin may have > 1 plugin interfaces, make the name up appropriately
+ 								
 -								String	update_name = "";
--									
++// 								String	update_name = "";
+ 									
 -								PluginInterface[]	ifs = manager.getPluginInterfaces();
--								
++// 								PluginInterface[]	ifs = manager.getPluginInterfaces();
+ 								
 -							    Arrays.sort( 
 -							    		ifs,
 -									  	new Comparator()
@@ -156,37 +358,70 @@
 -								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
 -								      		}
 -										});
--							    
++// 							    Arrays.sort( 
++// 							    		ifs,
++// 									  	new Comparator()
++// 										{
++// 								      		public int 
++// 											compare(
++// 												Object o1, 
++// 												Object o2)
++// 								      		{
++// 								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
++// 								      		}
++// 										});
+ 							    
 -								for (int i=0;i<ifs.length;i++){
--									
++// 								for (int i=0;i<ifs.length;i++){
+ 									
 -									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
--									
++// 									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
+ 									
 -										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
 -									}
 -								}
--								
++// 										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
++// 									}
++// 								}
+ 								
 -								checker.addUpdate(
 -									update_name,
 -									new String[]{ "Uninstall: " + plugin_dir},
 -									pi.getPluginVersion(),
 -									rd,
--									pi.isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
--									
+-									pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
++// 								checker.addUpdate(
++// 									update_name,
++// 									new String[]{ "Uninstall: " + plugin_dir},
++// 									pi.getPluginVersion(),
++// 									rd,
++// 									pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
+ 									
 -							}finally{
--								
++// 							}finally{
+ 								
 -								checker.completed();
 -							}
--								
++// 								checker.completed();
++// 							}
+ 								
 -						}
 -					}, false );
 -			}
--
++// 						}
++// 					}, false );
++// 			}
+ 
 -			inst.start();
--			
++// 			inst.start();
+ 			
 -		}catch( Throwable e ){
--			
++// 		}catch( Throwable e ){
+ 			
 -			Debug.printStackTrace(e);
 -		}
++// 			Debug.printStackTrace(e);
++// 		}
  	}
  	
  	protected PluginInterface

azureus-no-update-manager-PluginUpdatePlugin.patch:
 PluginUpdatePlugin.java |  234 ++++++++++++++++++++++++------------------------
 1 file changed, 117 insertions(+), 117 deletions(-)

Index: azureus-no-update-manager-PluginUpdatePlugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-PluginUpdatePlugin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-no-update-manager-PluginUpdatePlugin.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-PluginUpdatePlugin.patch	13 Sep 2009 15:36:35 -0000	1.2
@@ -1,11 +1,13 @@
---- org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.orig	2006-02-09 23:32:49.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java	2006-02-09 23:33:49.000000000 -0500
-@@ -130,20 +130,6 @@
- 		
- 		config.addBooleanParameter2( "enable.update", "Plugin.pluginupdate.enablecheck", true );
- 				
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin	2008-09-25 14:32:04.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java	2009-09-05 17:29:07.000000000 +0300
+@@ -138,19 +138,19 @@ PluginUpdatePlugin
+ 	initComplete(
+ 		final PluginConfig		plugin_config )
+ 	{
 -		UpdateManager	update_manager = plugin_interface.getUpdateManager();
--		
++// 		UpdateManager	update_manager = plugin_interface.getUpdateManager();
+ 		
 -		update_manager.addListener(
 -			new UpdateManagerListener()
 -			{
@@ -15,17 +17,25 @@
 -				{
 -					SFPluginDetailsLoaderFactory.getSingleton().reset();
 -				}
--				
++// 		update_manager.addListener(
++// 			new UpdateManagerListener()
++// 			{
++// 				public void
++// 				checkInstanceCreated(
++// 					UpdateCheckInstance	inst )
++// 				{
++// 					SFPluginDetailsLoaderFactory.getSingleton().reset();
++// 				}
+ 				
 -			});
--		
- 		final PluginManager	plugin_manager = plugin_interface.getPluginManager();
++// 			});
  		
- 		PluginInterface[]	plugins = plugin_manager.getPlugins();
-@@ -169,134 +155,6 @@
+ 		final PluginManager	plugin_manager = plugin_interface.getPluginManager();
  		
+@@ -178,133 +178,133 @@ PluginUpdatePlugin
  		final int f_non_mandatory_count	= non_mandatory_count;
  		final int f_mandatory_count		= mandatory_count;
--		
+ 		
 -		update_manager.registerUpdatableComponent( 
 -			new UpdatableComponent()
 -			{
@@ -34,51 +44,86 @@
 -				{
 -					return( "Non-mandatory plugins" );
 -				}
--				
++// 		update_manager.registerUpdatableComponent( 
++// 			new UpdatableComponent()
++// 			{
++// 				public String
++// 				getName()
++// 				{
++// 					return( "Non-mandatory plugins" );
++// 				}
+ 				
 -				public int
 -				getMaximumCheckTime()
 -				{
 -					return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
 -				}	
--				
++// 				public int
++// 				getMaximumCheckTime()
++// 				{
++// 					return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
++// 				}	
+ 				
 -				public void
 -				checkForUpdate(
 -					UpdateChecker	checker )
 -				{
 -					if ( checkForUpdateSupport( checker, null, false ) == 0 ){
--						
++// 				public void
++// 				checkForUpdate(
++// 					UpdateChecker	checker )
++// 				{
++// 					if ( checkForUpdateSupport( checker, null, false ) == 0 ){
+ 						
 -						String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
--						
++// 						String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
+ 						
 -						boolean	found_one = false;
--						
++// 						boolean	found_one = false;
+ 						
 -						for (int i=0;i<rps.length;i++){
--							
++// 						for (int i=0;i<rps.length;i++){
+ 							
 -							String	rp_id = rps[i];
--							
--							if ( plugin_manager.getPluginInterfaceByID( rp_id ) != null ){
--								
++// 							String	rp_id = rps[i];
+ 							
+-							if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
++// 							if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
+ 								
 -									// already installed
--								
++// 									// already installed
+ 								
 -								continue;
 -							}
--							
++// 								continue;
++// 							}
+ 							
 -							final String	config_key = "recommended.processed." + rp_id;
--							
++// 							final String	config_key = "recommended.processed." + rp_id;
+ 							
 -							if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
--								
++// 							if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
+ 								
 -								try{
 -									final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
--									
++// 								try{
++// 									final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
+ 									
 -									StandardPlugin[]	sps = installer.getStandardPlugins();
--									
++// 									StandardPlugin[]	sps = installer.getStandardPlugins();
+ 									
 -									for (int j=0;j<sps.length;j++){
--										
++// 									for (int j=0;j<sps.length;j++){
+ 										
 -										final StandardPlugin	sp = sps[j];
--										
++// 										final StandardPlugin	sp = sps[j];
+ 										
 -										if ( sp.getId().equals( rp_id )){
--										
++// 										if ( sp.getId().equals( rp_id )){
+ 										
 -											found_one = true;
--											
++// 											found_one = true;
+ 											
 -											checker.getCheckInstance().addListener(
 -												new UpdateCheckInstanceListener()
 -												{
@@ -87,15 +132,29 @@
 -														UpdateCheckInstance		instance )
 -													{													
 -													}
--													
++// 											checker.getCheckInstance().addListener(
++// 												new UpdateCheckInstanceListener()
++// 												{
++// 													public void
++// 													cancelled(
++// 														UpdateCheckInstance		instance )
++// 													{													
++// 													}
+ 													
 -													public void
 -													complete(
 -														UpdateCheckInstance		instance )
 -													{
 -														if ( instance.getUpdates().length == 0 ){
--															
++// 													public void
++// 													complete(
++// 														UpdateCheckInstance		instance )
++// 													{
++// 														if ( instance.getUpdates().length == 0 ){
+ 															
 -															installRecommendedPlugin( installer, sp );
--															
++// 															installRecommendedPlugin( installer, sp );
+ 															
 -															plugin_config.setPluginParameter( config_key, true );
 -														}
 -													}
@@ -153,6 +212,63 @@
 -					log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
 -				}
 -			});
++// 															plugin_config.setPluginParameter( config_key, true );
++// 														}
++// 													}
++// 												});
++											
++// 											break;
++// 										}
++// 									}
++									
++// 								}catch( Throwable e ){
++									
++// 								}
++// 							}
++							
++// 							if ( found_one ){
++								
++// 								break;
++// 							}
++// 						}
++// 					}
++// 				}
++				
++// 			}, false );
++		
++// 		update_manager.registerUpdatableComponent( 
++// 				new UpdatableComponent()
++// 				{
++// 					public String
++// 					getName()
++// 					{
++// 						return( "Mandatory plugins" );
++// 					}
++					
++// 					public int
++// 					getMaximumCheckTime()
++// 					{
++// 						return( f_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
++// 					}
++					
++// 					public void
++// 					checkForUpdate(
++// 						UpdateChecker	checker )
++// 					{
++// 						checkForUpdateSupport( checker, null, true );
++// 					}			
++// 				}, true );
++		
++// 		update_manager.addListener(
++// 			new UpdateManagerListener()
++// 			{
++// 				public void
++// 				checkInstanceCreated(
++// 					UpdateCheckInstance	instance )
++// 				{
++// 					log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
++// 				}
++// 			});
  	}
  	
  	protected void

azureus-no-update-manager-SWTUpdateChecker.patch:
 SWTUpdateChecker.java |  168 --------------------------------------------------
 1 file changed, 1 insertion(+), 167 deletions(-)

Index: azureus-no-update-manager-SWTUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-SWTUpdateChecker.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- azureus-no-update-manager-SWTUpdateChecker.patch	7 Dec 2007 15:58:19 -0000	1.6
+++ azureus-no-update-manager-SWTUpdateChecker.patch	13 Sep 2009 15:36:35 -0000	1.7
@@ -1,10 +1,12 @@
---- iorigorg/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2007-12-07 09:52:45.000000000 -0500
-@@ -64,180 +64,12 @@
+diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
+--- azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker	2009-04-16 20:46:42.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2009-09-13 12:57:58.000000000 +0200
+@@ -64,180 +64,14 @@ public class SWTUpdateChecker implements
    public static void
    initialize()
    {
--    PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
+-  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
++
    }
    
    public SWTUpdateChecker() {    
@@ -14,13 +16,12 @@
 -  	try{
 -	    SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
 -	    
--     	boolean	update_required  = 	versionGetter.needsUpdate() && 
--     								System.getProperty("azureus.skipSWTcheck") == null ;
+-     	boolean	update_required  = 	System.getProperty("azureus.skipSWTcheck") == null && versionGetter.needsUpdate();
 -    	
 -	    if ( update_required ){
 -        	    
 -	       	int	update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
--
+ 
 -	    	try{
 -		        URL	swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
 -		        
@@ -69,6 +70,17 @@
 -		        	    			// we need to periodically remind the user there's a problem as they need to realise that
 -		        	    			// it is causing ALL updates (core/plugin) to fail
 -		        	    		
+-		        	    		String	alert = 
+-		        	    			MessageText.getString( 
+-		        	    					"swt.alert.cant.update", 
+-		        	    					new String[]{
+-			        	    					String.valueOf( versionGetter.getCurrentVersion()),
+-			        	    					String.valueOf( versionGetter.getLatestVersion()),
+-		        	    						jar_file_dir.toString(), 
+-		        	    						expected_dir.toString()});
+-		        	    		
+-		        	    		checker.reportProgress( alert );
+-		        	    		
 -		        	    		long	last_prompt = COConfigurationManager.getLongParameter( "swt.update.prevented.version.time", 0 );
 -		        	    		long	now			= SystemTime.getCurrentTime();
 -		        	    		
@@ -80,16 +92,7 @@
 -		        	    		}
 -		        	    		
 -		        		    	if ( force || update_prevented_version != versionGetter.getCurrentVersion()){
--			        		    		
--			        	    		String	alert = 
--			        	    			MessageText.getString( 
--			        	    					"swt.alert.cant.update", 
--			        	    					new String[]{
--				        	    					String.valueOf( versionGetter.getCurrentVersion()),
--				        	    					String.valueOf( versionGetter.getLatestVersion()),
--			        	    						jar_file_dir.toString(), 
--			        	    						expected_dir.toString()});
--			        	    		
+-			        		    				        	    		
 -			        	     		Logger.log(	new LogAlert(LogAlert.REPEATABLE, LogEvent.LT_ERROR, alert ));
 -			        						
 -			        	     		update_prevented_version = versionGetter.getCurrentVersion();
@@ -151,7 +154,7 @@
 -	      
 -	      final Update update = 
 -	    	  checker.addUpdate("SWT Library for " + versionGetter.getPlatform(),
--		          new String[] {"SWT is the graphical library used by Azureus"},
+-		          new String[] {"SWT is the graphical library used by " + Constants.APP_NAME},
 -		          "" + versionGetter.getLatestVersion(),
 -		          swtDownloader,
 -		          Update.RESTART_REQUIRED_YES
@@ -177,7 +180,6 @@
 -  		
 -  		checker.completed();
 -  	}
--    
+     
    }
    
-   private boolean 

azureus-no-update-manager-UpdateMonitor.patch:
 UpdateMonitor.java |  220 +++++++++++++----------------------------------------
 1 file changed, 57 insertions(+), 163 deletions(-)

Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- azureus-no-update-manager-UpdateMonitor.patch	29 Jan 2008 16:02:38 -0000	1.7
+++ azureus-no-update-manager-UpdateMonitor.patch	13 Sep 2009 15:36:35 -0000	1.8
@@ -1,17 +1,27 @@
---- origorg/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2007-11-30 10:44:14.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2008-01-29 10:08:47.000000000 -0500
-@@ -89,70 +89,6 @@
+diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
+--- azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor	2009-07-08 19:00:26.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2009-09-13 13:24:24.000000000 +0200
+@@ -100,66 +100,66 @@ public class UpdateMonitor
  	protected UpdateMonitor(AzureusCore _azureus_core) {
  		azCore = _azureus_core;
  
--		PluginInterface defPI = azCore.getPluginManager().getDefaultPluginInterface();
+-		PluginInterface defPI = PluginInitializer.getDefaultInterface();
 -		UpdateManager um = defPI.getUpdateManager();
--
++// 		PluginInterface defPI = PluginInitializer.getDefaultInterface();
++// 		UpdateManager um = defPI.getUpdateManager();
+ 
 -		um.addListener(new UpdateManagerListener() {
 -			public void checkInstanceCreated(UpdateCheckInstance instance) {
 -				instance.addListener(UpdateMonitor.this);
--				
--				new updateStatusChanger(instance);
++// 		um.addListener(new UpdateManagerListener() {
++// 			public void checkInstanceCreated(UpdateCheckInstance instance) {
++// 				instance.addListener(UpdateMonitor.this);
+ 				
+-				if ( !instance.isLowNoise()){
++// 				if ( !instance.isLowNoise()){
+ 				
+-					new updateStatusChanger(instance);
+-				}
 -			}
 -		});
 -
@@ -61,17 +71,61 @@
 -						performAutoCheck(false);
 -					}
 -				});
--
--		// wait a bit before starting check to give rest of AZ time to initialise 
--		new DelayedEvent("UpdateMon:wait", 2500, new AERunnable() {
--			public void runSupport() {
--				performAutoCheck(true);
--			}
--		});
- 	}
++// 					new updateStatusChanger(instance);
++// 				}
++// 			}
++// 		});
++
++// 		um.addVerificationListener(new UpdateManagerVerificationListener() {
++// 			public boolean acceptUnVerifiedUpdate(final Update update) {
++// 				UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
++// 				if (uiFunctions != null) {
++// 					String title = MessageText.getString(MSG_PREFIX
++// 							+ "accept.unverified.title");
++// 					String text = MessageText.getString(MSG_PREFIX
++// 							+ "accept.unverified.text", new String[] {
++// 						update.getName()
++// 					});
++// 					return uiFunctions.promptUser(title, text, new String[] {
++// 						MessageText.getString("Button.yes"),
++// 						MessageText.getString("Button.no")
++// 					}, 1, MSG_PREFIX + "accept.unverified",
++// 							MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
++// 							0) == 0;
++// 				}
++
++// 				return false;
++// 			}
++
++// 			public void verificationFailed(final Update update, final Throwable cause) {
++// 				final String cause_str = Debug.getNestedExceptionMessage(cause);
++// 				UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
++// 				if (uiFunctions != null) {
++// 					String title = MessageText.getString(MSG_PREFIX
++// 							+ "verification.failed.title");
++// 					String text = MessageText.getString(MSG_PREFIX
++// 							+ "verification.failed.text", new String[] {
++// 						update.getName(),
++// 						cause_str
++// 					});
++// 					uiFunctions.promptUser(title, text, new String[] {
++// 						MessageText.getString("Button.ok")
++// 					}, 0, null, null, false, 0);
++// 				}
++// 			}
++// 		});
++
++
++// 		SimpleTimer.addPeriodicEvent("UpdateMon:autocheck",
++// 				AUTO_UPDATE_CHECK_PERIOD, new TimerEventPerformer() {
++// 					public void perform(TimerEvent ev) {
++// 						performAutoCheck(false);
++// 					}
++// 				});
  
- 	protected class updateStatusChanger
-@@ -306,43 +242,6 @@
+ 		DelayedTask delayed_task = 
+ 			UtilitiesImpl.addDelayedTask(
+@@ -381,43 +381,6 @@ public class UpdateMonitor
  	}
  	
  	protected void performAutoCheck(final boolean start_of_day) {
@@ -115,7 +169,7 @@
  	}
  
  	public void 
-@@ -352,76 +251,6 @@
+@@ -427,76 +390,7 @@ public class UpdateMonitor
  		final boolean						isRecheck,
  		final UpdateCheckInstanceListener 	l ) 
  	{
@@ -170,7 +224,7 @@
 -
 -		AEThread2 t = new AEThread2("UpdateMonitor:kickoff", true) {
 -			public void run() {
--				UpdateManager um = azCore.getPluginManager().getDefaultPluginInterface().getUpdateManager();
+-				UpdateManager um = PluginInitializer.getDefaultInterface().getUpdateManager();
 -
 -				current_update_instance = um.createUpdateCheckInstance(bForce
 -						? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE,
@@ -187,8 +241,8 @@
 -				current_update_instance.start();
 -			}
 -		};
--
+ 
 -		t.start();
  	}
  
- 	public void complete(UpdateCheckInstance instance) {
+ 	public void complete( final UpdateCheckInstance instance) {

azureus-no-updates-PluginInitializer.patch:
 PluginInitializer.java |   52 ++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Index: azureus-no-updates-PluginInitializer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-updates-PluginInitializer.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-updates-PluginInitializer.patch	3 Dec 2007 17:03:21 -0000	1.3
+++ azureus-no-updates-PluginInitializer.patch	13 Sep 2009 15:36:35 -0000	1.4
@@ -1,74 +1,106 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2007-12-03 10:27:39.000000000 -0500
-@@ -44,13 +44,8 @@
+diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
+--- azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer	2009-07-01 01:24:02.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2009-09-13 12:36:54.000000000 +0200
+@@ -39,11 +39,11 @@ import org.gudy.azureus2.core3.util.*;
  import org.gudy.azureus2.plugins.*;
  import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
  import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
--import org.gudy.azureus2.pluginsimpl.local.update.*;
+-import org.gudy.azureus2.pluginsimpl.local.update.UpdateManagerImpl;
++//import org.gudy.azureus2.pluginsimpl.local.update.UpdateManagerImpl;
  import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl;
- 
+ import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl.runnableWithException;
 -import org.gudy.azureus2.update.UpdaterUpdateChecker;
 -import org.gudy.azureus2.update.UpdaterUtils;
--
--
++//import org.gudy.azureus2.update.UpdaterUpdateChecker;
++//import org.gudy.azureus2.update.UpdaterUtils;
+ 
+ import com.aelitis.azureus.core.*;
  
- /**
-  * @author Olivier
-@@ -91,11 +86,6 @@
-    					"azbpsharehoster", 
+@@ -92,12 +92,12 @@ PluginInitializer
     					"ShareHoster",
- 					"true" },
+ 					"true",
+ 					"false"},
 -   			{	 PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER, 
 -   					"org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin", 
 -   					"azbppluginupdate", 
 -   					"PluginUpdate",
--					"true" },
- 			{	 PluginManagerDefaults.PID_CLIENT_ID, 
- 				    "com.aelitis.azureus.plugins.clientid.ClientIDPlugin", 
- 				    "azbpclientid", 
-@@ -121,16 +111,6 @@
- 					"azbpmagnet", 
+-					"true",
+-					"true"},
++//    			{	 PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER, 
++//    					"org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin", 
++//    					"azbppluginupdate", 
++//    					"PluginUpdate",
++// 					"true",
++// 					"true"},
+ 			{	 PluginManagerDefaults.PID_UPNP, 
+ 				    "com.aelitis.azureus.plugins.upnp.UPnPPlugin", 
+ 				    "azbpupnp", 
+@@ -122,18 +122,18 @@ PluginInitializer
  					"Magnet URI Handler",
- 					"true" },
+ 					"true",
+ 					"false"},
 -			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
 -   					"org.gudy.azureus2.update.CoreUpdateChecker", 
 -   					"azbpcoreupdater", 
 -   					"CoreUpdater",
--					"true" },
+-					"true",
+-					"true"},
 -			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
 -   					"org.gudy.azureus2.update.CorePatchChecker", 
 -   					"azbpcorepatcher", 
 -   					"CorePatcher",
--					"true" },
+-					"true",
+-					"true"},
++// 			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
++//    					"org.gudy.azureus2.update.CoreUpdateChecker", 
++//    					"azbpcoreupdater", 
++//    					"CoreUpdater",
++// 					"true",
++// 					"true"},
++// 			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
++//    					"org.gudy.azureus2.update.CorePatchChecker", 
++//    					"azbpcorepatcher", 
++//    					"CorePatcher",
++// 					"true",
++// 					"true"},
  	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
     					"org.gudy.azureus2.platform.PlatformManagerPluginDelegate", 
     					"azplatform2", 
-@@ -316,11 +296,7 @@
+@@ -417,7 +417,7 @@ PluginInitializer
    	
    	core_operation 	= _core_operation;
      
 -    UpdateManagerImpl.getSingleton( azureus_core );	// initialise the update manager
--       
++//     UpdateManagerImpl.getSingleton( azureus_core );	// initialise the update manager
+        
      plugin_manager = PluginManagerImpl.getSingleton( this );
--    
+     
+@@ -439,7 +439,7 @@ PluginInitializer
+     	}
+     }
+     
 -    UpdaterUtils.checkBootstrapPlugins();
++//     UpdaterUtils.checkBootstrapPlugins();
    }
    
-   protected boolean
-@@ -946,16 +922,11 @@
- 	      
+   protected void
+@@ -1145,8 +1145,8 @@ PluginInitializer
  	      if ( load_failure != null ){
- 	      		  
--	    	  	// don't complain about our internal one
--	    	  
+ 	    	  plugin_interface.setAsFailed();
+ 	    	  
+-	    	// don't complain about our internal one
 -	    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
--	    		  
- 		      	String	msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
- 		   	 
- 		      	Logger.log(new LogAlert(LogAlert.UNREPEATABLE, msg, load_failure));
++		  //	    	// don't complain about our internal one
++		  //	    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
+ 	    		  
+ 		      	String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
+ 		      	LogAlert la;
+@@ -1159,7 +1159,7 @@ PluginInitializer
+ 		      	Logger.log(la);
  	
- 		      	System.out.println( msg + " : " + load_failure);
+ 		      	System.out.println( msg + ": " + load_failure);
 -		      }
++			//		      }
  	      }
    		}
  	      

azureus-no-updates-PluginInterfaceImpl.patch:
 PluginInterfaceImpl.java |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: azureus-no-updates-PluginInterfaceImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-updates-PluginInterfaceImpl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-updates-PluginInterfaceImpl.patch	29 May 2006 16:02:45 -0000	1.3
+++ azureus-no-updates-PluginInterfaceImpl.patch	13 Sep 2009 15:36:35 -0000	1.4
@@ -1,6 +1,7 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig	2006-05-02 02:33:14.000000000 -0700
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2006-05-12 09:58:07.000000000 -0700
-@@ -48,7 +48,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.no-updates-PluginInterfaceImpl azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.no-updates-PluginInterfaceImpl	2008-08-20 08:20:26.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2009-09-03 20:35:39.000000000 +0300
+@@ -50,7 +50,6 @@ import org.gudy.azureus2.pluginsimpl.loc
  import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository;
  import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl;
  import org.gudy.azureus2.pluginsimpl.local.utils.*;
@@ -8,12 +9,12 @@
  import org.gudy.azureus2.plugins.ipc.IPCInterface;
  import org.gudy.azureus2.plugins.ipfilter.IPFilter;
  import org.gudy.azureus2.plugins.tracker.Tracker;
-@@ -412,7 +411,7 @@
+@@ -426,7 +425,7 @@ PluginInterfaceImpl 
    public UpdateManager
    getUpdateManager()
    {
 -  	return( UpdateManagerImpl.getSingleton( initialiser.getAzureusCore()));
-+      return( null );
++  	return( null );
    }
  
-   public PeerProtocolManager
+   


Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.script,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- azureus.script	4 Aug 2009 13:52:13 -0000	1.24
+++ azureus.script	13 Sep 2009 15:36:35 -0000	1.25
@@ -12,9 +12,12 @@ SCRIPT_VERSION=2
 rm -rf $APPDIR/plugins
 mkdir -p $APPDIR/plugins
 pushd $APPDIR/plugins > /dev/null 2>&1
-for pdir in /usr/share/azureus/plugins/*; do
-  ln -s $pdir .;
-done;
+if ls /usr/share/azureus/plugins/* > /dev/null 2>&1;then
+    for pdir in /usr/share/azureus/plugins/*; do
+	ln -s $pdir .;
+    done;
+fi
+
 popd > /dev/null 2>&1
 
 case $(uname -i) in


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- azureus.spec	13 Sep 2009 08:49:25 -0000	1.79
+++ azureus.spec	13 Sep 2009 15:36:35 -0000	1.80
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	4.2.0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -18,16 +18,15 @@ Source3:	azureus.applications
 Patch2:		azureus-cache-size.patch
 Patch3:		azureus-remove-manifest-classpath.patch
 Patch9:		azureus-no-shared-plugins.patch
-#Patch12:	azureus-no-updates-PluginInitializer.patch
-#Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
+Patch12:	azureus-no-updates-PluginInitializer.patch
+Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
 Patch14:	azureus-no-update-manager-AzureusCoreImpl.patch
 Patch15:	azureus-no-update-manager-CorePatchChecker.patch
-#Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
-#Patch18:	azureus-no-update-manager-PluginInstallerImpl.patch
-#Patch19:	azureus-no-update-manager-PluginUpdatePlugin.patch
-#Patch20:	azureus-no-update-manager-SWTUpdateChecker.patch
-#Patch22:	azureus-no-update-manager-UpdateMonitor.patch
-#Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
+Patch18:	azureus-no-update-manager-PluginInstallerImpl.patch
+Patch19:	azureus-no-update-manager-PluginUpdatePlugin.patch
+Patch20:	azureus-no-update-manager-SWTUpdateChecker.patch
+Patch22:	azureus-no-update-manager-UpdateMonitor.patch
 Patch27:	azureus-SecureMessageServiceClientHelper-bcprov.patch
 Patch28:	azureus-configuration.patch
 #Patch31:	azureus-fix-menu-MainMenu.patch
@@ -76,16 +75,15 @@ advanced users.
 %patch2 -p0
 %patch3 -p1 -b .remove-manifest-classpath
 %patch9 -p0
-#%patch12 -p0
-#%patch13 -p0
+%patch12 -p1 -b .no-updates-PluginInitializer
+%patch13 -p1 -b .no-updates-PluginInterfaceImpl
 %patch14 -p0
 %patch15 -p0
-#%patch16 -p0
-#%patch18 -p0
-#%patch19 -p0
-#%patch20 -p0
-#%patch22 -p0
-#%patch23 -p0
+%patch16 -p1 -b .no-update-manager-CoreUpdateChecker
+%patch18 -p1 -b .no-update-manager-PluginInstallerImpl
+%patch19 -p1 -b .no-update-manager-PluginUpdatePlugin
+%patch20 -p1 -b .no-update-manager-SWTUpdateChecker
+%patch22 -p1 -b .no-update-manager-UpdateMonitor
 %patch27 -p1 -b .nobcprov
 %patch28 -p0
 #%patch31 -p0
@@ -244,6 +242,10 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Sun Sep  13 2009 David Juran <djuran at redhat.com> - 4.2.0.8-2
+- revive the no-updates patches (Bz515131)
+- fix start-script to work when  /usr/share/azureus/plugins/ is empty
+
 * Sat Sep 12 2009 David Juran <djuran at redhat.com> - 4.2.0.8-1
 - Upgrade to 4.2.0.8
 


--- azureus-no-update-manager-PluginInstallerImpl-2.patch DELETED ---



From salimma at fedoraproject.org  Sun Sep 13 15:56:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 15:56:29 +0000 (UTC)
Subject: rpms/sonic-visualiser/devel .cvsignore, 1.6,
	1.7 sonic-visualiser.desktop, 1.1, 1.2 sonic-visualiser.spec,
	1.16, 1.17 sources, 1.6, 1.7
Message-ID: <20090913155629.DBCE911C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/sonic-visualiser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29573/devel

Modified Files:
	.cvsignore sonic-visualiser.desktop sonic-visualiser.spec 
	sources 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
- No longer conflict with RPM Fusion packaging
- Updated icon cache scriptlet

* Sun Aug 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-2
- Package now conflicts with RPM Fusion packaging

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-1
- Update to 1.6




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Mar 2009 20:45:42 -0000	1.6
+++ .cvsignore	13 Sep 2009 15:56:29 -0000	1.7
@@ -1 +1 @@
-sonic-visualiser-1.5.tar.bz2
+sonic-visualiser-1.6.tar.bz2


Index: sonic-visualiser.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sonic-visualiser.desktop	30 Jan 2008 21:03:31 -0000	1.1
+++ sonic-visualiser.desktop	13 Sep 2009 15:56:29 -0000	1.2
@@ -6,7 +6,7 @@ Categories=AudioVideo;Viewer;Player;
 Encoding=UTF-8
 Exec=sonic-visualiser %U
 Icon=sonic-visualiser
-MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;audio/x-mp3;application/x-ogg;application/ogg;audio/ogg;
+MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;application/x-ogg;application/ogg;audio/ogg;
 StartupNotify=true
 Terminal=false
 Type=Application


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sonic-visualiser.spec	27 Jul 2009 04:34:56 -0000	1.16
+++ sonic-visualiser.spec	13 Sep 2009 15:56:29 -0000	1.17
@@ -1,16 +1,15 @@
-# rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
-Version:        1.5
-Release:        2%{?dist}
+Version:        1.6
+Release:        3%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
-Source1:        %{name}.desktop
-Patch0:         %{name}-1.5-gcc44.patch
-Patch1:         %{name}-1.5-alsa.patch
+Source1:        sonic-visualiser.desktop
+Patch0:         sonic-visualiser-1.5-gcc44.patch
+Patch1:         sonic-visualiser-1.5-alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
@@ -18,7 +17,6 @@ BuildRequires:  libsndfile-devel libsamp
 BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  redland-devel rubberband-devel
-%{?_with_libmad:BuildRequires:  libmad-devel}
 BuildRequires:  liboggz-devel libfishsound-devel liblo-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -48,10 +46,7 @@ analysis plugin format ? as well as ap
 
 %build
 qmake-qt4
-# patch in correct optflags
-sed -i 's|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING .*|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING ${RPM_OPT_FLAGS}|1' sv.prf
-# parallel build does not work
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -75,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/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
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -96,6 +91,16 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
+- No longer conflict with RPM Fusion packaging
+- Updated icon cache scriptlet
+
+* Sun Aug 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-2
+- Package now conflicts with RPM Fusion packaging
+
+* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-1
+- Update to 1.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Mar 2009 20:45:42 -0000	1.6
+++ sources	13 Sep 2009 15:56:29 -0000	1.7
@@ -1 +1 @@
-6a4c29abbadce83dc8b55ac84c34c0d4  sonic-visualiser-1.5.tar.bz2
+2c547a0eb5c61a8fb6318db1370a872b  sonic-visualiser-1.6.tar.bz2



From salimma at fedoraproject.org  Sun Sep 13 15:56:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 15:56:29 +0000 (UTC)
Subject: rpms/sonic-visualiser/F-11 .cvsignore, 1.6,
	1.7 sonic-visualiser.desktop, 1.1, 1.2 sonic-visualiser.spec,
	1.15, 1.16 sources, 1.6, 1.7
Message-ID: <20090913155629.B157311C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/sonic-visualiser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29573/F-11

Modified Files:
	.cvsignore sonic-visualiser.desktop sonic-visualiser.spec 
	sources 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
- No longer conflict with RPM Fusion packaging
- Updated icon cache scriptlet

* Sun Aug 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-2
- Package now conflicts with RPM Fusion packaging

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-1
- Update to 1.6




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Mar 2009 20:45:42 -0000	1.6
+++ .cvsignore	13 Sep 2009 15:56:29 -0000	1.7
@@ -1 +1 @@
-sonic-visualiser-1.5.tar.bz2
+sonic-visualiser-1.6.tar.bz2


Index: sonic-visualiser.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/sonic-visualiser.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sonic-visualiser.desktop	30 Jan 2008 21:03:31 -0000	1.1
+++ sonic-visualiser.desktop	13 Sep 2009 15:56:29 -0000	1.2
@@ -6,7 +6,7 @@ Categories=AudioVideo;Viewer;Player;
 Encoding=UTF-8
 Exec=sonic-visualiser %U
 Icon=sonic-visualiser
-MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;audio/x-mp3;application/x-ogg;application/ogg;audio/ogg;
+MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;application/x-ogg;application/ogg;audio/ogg;
 StartupNotify=true
 Terminal=false
 Type=Application


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/sonic-visualiser.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sonic-visualiser.spec	26 Mar 2009 20:45:42 -0000	1.15
+++ sonic-visualiser.spec	13 Sep 2009 15:56:29 -0000	1.16
@@ -1,16 +1,15 @@
-# rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
-Version:        1.5
-Release:        1%{?dist}
+Version:        1.6
+Release:        3%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
-Source1:        %{name}.desktop
-Patch0:         %{name}-1.5-gcc44.patch
-Patch1:         %{name}-1.5-alsa.patch
+Source1:        sonic-visualiser.desktop
+Patch0:         sonic-visualiser-1.5-gcc44.patch
+Patch1:         sonic-visualiser-1.5-alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
@@ -18,7 +17,6 @@ BuildRequires:  libsndfile-devel libsamp
 BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  redland-devel rubberband-devel
-%{?_with_libmad:BuildRequires:  libmad-devel}
 BuildRequires:  liboggz-devel libfishsound-devel liblo-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -48,10 +46,7 @@ analysis plugin format ? as well as ap
 
 %build
 qmake-qt4
-# patch in correct optflags
-sed -i 's|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING .*|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING ${RPM_OPT_FLAGS}|1' sv.prf
-# parallel build does not work
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -75,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/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
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -96,6 +91,16 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
+- No longer conflict with RPM Fusion packaging
+- Updated icon cache scriptlet
+
+* Sun Aug 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-2
+- Package now conflicts with RPM Fusion packaging
+
+* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-1
+- Update to 1.6
+
 * Thu Mar 26 2009 Michel Salim <salimma at fedoraproject.org> - 1.5-1
 - Update to 1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Mar 2009 20:45:42 -0000	1.6
+++ sources	13 Sep 2009 15:56:29 -0000	1.7
@@ -1 +1 @@
-6a4c29abbadce83dc8b55ac84c34c0d4  sonic-visualiser-1.5.tar.bz2
+2c547a0eb5c61a8fb6318db1370a872b  sonic-visualiser-1.6.tar.bz2



From mbarnes at fedoraproject.org  Sun Sep 13 16:19:30 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 13 Sep 2009 16:19:30 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.47,1.394.2.48
Message-ID: <20090913161930.4F29811C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4030

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.47
retrieving revision 1.394.2.48
diff -u -p -r1.394.2.47 -r1.394.2.48
--- evolution.spec	13 Sep 2009 15:28:51 -0000	1.394.2.47
+++ evolution.spec	13 Sep 2009 16:19:29 -0000	1.394.2.48
@@ -387,7 +387,6 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
@@ -415,7 +414,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
@@ -530,12 +528,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-google.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-google.so
 
-%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so
-
-%{evo_plugin_dir}/org-gnome-evolution-profiler.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-profiler.so
-
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
@@ -547,12 +539,6 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/org-gnome-folder-permissions.xml
 #%{evo_plugin_dir}/org-gnome-folder-subscription.xml
 
-%{evo_plugin_dir}/org-gnome-external-editor.eplug
-%{evo_plugin_dir}/liborg-gnome-external-editor.so
-
-%{evo_plugin_dir}/org-gnome-face.eplug
-%{evo_plugin_dir}/liborg-gnome-face.so
-
 #%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 #%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 #%{evo_plugin_dir}/org-gnome-compose-send-options.xml



From thm at fedoraproject.org  Sun Sep 13 16:32:06 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 13 Sep 2009 16:32:06 +0000 (UTC)
Subject: rpms/monotone/F-11 monotone-0.45-ls-output.patch, NONE,
	1.1 .cvsignore, 
	1.24, 1.25 import.log, 1.6, 1.7 monotone.spec, 1.46,
	1.47 sources, 1.24, 1.25
Message-ID: <20090913163206.B461911C0099@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8265/F-11

Modified Files:
	.cvsignore import.log monotone.spec sources 
Added Files:
	monotone-0.45-ls-output.patch 
Log Message:
Update to 0.45.

monotone-0.45-ls-output.patch:
 __driver__.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE monotone-0.45-ls-output.patch ---
============================================================
--- tests/key_files_created_securely/__driver__.lua	63a9bd279770dc1fcefec5eb6cead7fd3e061982
+++ tests/key_files_created_securely/__driver__.lua	2a0d5d0376174967369a15795f30a6e081af81b6
@@ -25,4 +25,4 @@ check({ "ls", "-l", "keys/foobar." .. ke
 keyid = string.sub(line, 0, 40)
 
 check({ "ls", "-l", "keys/foobar." .. keyid }, 0, true, nil)
-check(qgrep("^-rw------- .*keys/foobar." .. keyid, "stdout"))
+check(qgrep("^-rw-------[.+]? .*keys/foobar." .. keyid, "stdout"))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	18 May 2009 18:04:30 -0000	1.24
+++ .cvsignore	13 Sep 2009 16:32:06 -0000	1.25
@@ -1 +1 @@
-monotone-0.44.tar.gz
+monotone-0.45.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	18 May 2009 18:04:31 -0000	1.6
+++ import.log	13 Sep 2009 16:32:06 -0000	1.7
@@ -4,3 +4,4 @@ monotone-0_42-3_fc10:HEAD:monotone-0.42-
 monotone-0_42-5_fc10:HEAD:monotone-0.42-5.fc10.src.rpm:1235765112
 monotone-0_43-1_fc10:HEAD:monotone-0.43-1.fc10.src.rpm:1238237776
 monotone-0_44-1_fc12:F-11:monotone-0.44-1.fc12.src.rpm:1242669791
+monotone-0_45-1_fc11:F-11:monotone-0.45-1.fc11.src.rpm:1252859489


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-11/monotone.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- monotone.spec	18 May 2009 18:04:31 -0000	1.46
+++ monotone.spec	13 Sep 2009 16:32:06 -0000	1.47
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.44
+Version: 0.45
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -11,6 +11,7 @@ Source0: http://monotone.ca/downloads/%{
 Source1: monotone.init
 Source2: monotone.sysconfig
 Source3: README.monotone-server
+Patch0: monotone-0.45-ls-output.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@ and then pass commands to it.
 
 %prep
 %setup -q
+%patch0 -p0 -b .ls-output
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
@@ -191,6 +193,12 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.45-1
+- Update to 0.45.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.44-1
 - Update to 0.44.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	18 May 2009 18:04:31 -0000	1.24
+++ sources	13 Sep 2009 16:32:06 -0000	1.25
@@ -1 +1 @@
-6cc1f5f31df2e41bdfe502310463924a  monotone-0.44.tar.gz
+bd37c3d75e3fd1974a17f556499b42ab  monotone-0.45.tar.gz



From mtasaka at fedoraproject.org  Sun Sep 13 16:44:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 13 Sep 2009 16:44:29 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.392, 1.393 jd.spec, 1.455, 1.456 sources,
	1.393, 1.394 noautobuild, 1.2, NONE
Message-ID: <20090913164429.5DE1C11C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13885

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	noautobuild 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3068



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- .cvsignore	13 Sep 2009 05:17:25 -0000	1.392
+++ .cvsignore	13 Sep 2009 16:44:28 -0000	1.393
@@ -1 +1 @@
-jd-2.4.2-svn3065_trunk.tgz
+jd-2.4.2-svn3068_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- jd.spec	13 Sep 2009 05:17:25 -0000	1.455
+++ jd.spec	13 Sep 2009 16:44:28 -0000	1.456
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3065_trunk
+%define         strtag        svn3068_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3065
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3068
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- sources	13 Sep 2009 05:17:25 -0000	1.393
+++ sources	13 Sep 2009 16:44:28 -0000	1.394
@@ -1 +1 @@
-44bc85cf8e0728a108c984fb4bb3722a  jd-2.4.2-svn3065_trunk.tgz
+32bf54781c54bf2000ca06db453b6f72  jd-2.4.2-svn3068_trunk.tgz


--- noautobuild DELETED ---



From mbarnes at fedoraproject.org  Sun Sep 13 16:56:34 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 13 Sep 2009 16:56:34 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.48,1.394.2.49
Message-ID: <20090913165634.E8FCC11C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26125

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list again.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.48
retrieving revision 1.394.2.49
diff -u -p -r1.394.2.48 -r1.394.2.49
--- evolution.spec	13 Sep 2009 16:19:29 -0000	1.394.2.48
+++ evolution.spec	13 Sep 2009 16:56:34 -0000	1.394.2.49
@@ -543,8 +543,8 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 #%{evo_plugin_dir}/org-gnome-compose-send-options.xml
 
-#%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
-#%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
+%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
+%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
 
 %{evo_plugin_dir}/org-gnome-imap-features.eplug
 %{evo_plugin_dir}/liborg-gnome-imap-features.so



From nim at fedoraproject.org  Sun Sep 13 16:56:49 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 16:56:49 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel
	apanov-heuristica-fonts-bolditalic.patch, NONE,
	1.1 apanov-heuristica-fonts.spec, 1.11, 1.12 import.log, 1.8, 1.9
Message-ID: <20090913165649.7209811C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26323/devel

Modified Files:
	apanov-heuristica-fonts.spec import.log 
Added Files:
	apanov-heuristica-fonts-bolditalic.patch 
Log Message:
fix bolditalic naming

apanov-heuristica-fonts-bolditalic.patch:
 Heuristica-BoldItalic.sfd |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE apanov-heuristica-fonts-bolditalic.patch ---
--- Heuristica-BoldItalic.sfd	2009-08-09 08:50:01.000000000 +0200
+++ /tmp/Heuristica-BoldItalic.sfd	2009-09-13 18:02:59.339810191 +0200
@@ -43,14 +43,14 @@
 Lookup: 258 0 0 "LGC kerning"  {"LGC kerning subtable"  } ['kern' ('cyrl' <'dflt' > 'grek' <'dflt' > 'latn' <'dflt' > ) ]
 DEI: 91125
 LangName: 1049 "" "+BC0EMgRABDgEQQRCBDgEOgQw" 
-LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "" "" "+AAoA-Copyright (c) 2008, 2009 Andrey V. Panov (panov at canopus.iacp.dvo.ru), +AAoA-with Reserved Font Name Heuristica.+AAoACgAA-This Font Software is licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is copied together with this font package in OFL.txt, +AAoA-and is also available with a FAQ at:+AAoA-http://scripts.sil.org/OFL" 
+LangName: 1033 "" "" "Bold Italic" "" "" "" "" "" "" "" "" "" "" "+AAoA-Copyright (c) 2008, 2009 Andrey V. Panov (panov at canopus.iacp.dvo.ru), +AAoA-with Reserved Font Name Heuristica.+AAoACgAA-This Font Software is licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is copied together with this font package in OFL.txt, +AAoA-and is also available with a FAQ at:+AAoA-http://scripts.sil.org/OFL" 
 Encoding: UnicodeBmp
 UnicodeInterp: none
 NameList: Adobe Glyph List
 DisplaySize: -48
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 32 16 14
+WinInfo: 32 16 10
 BeginPrivate: 9
 BlueValues 41 [ -15 0 692 707 490 502 668 680 742 742 ]
 OtherBlues 31 [ -242 -230 -190 -190 557 566 ]


Index: apanov-heuristica-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- apanov-heuristica-fonts.spec	6 Sep 2009 18:45:43 -0000	1.11
+++ apanov-heuristica-fonts.spec	13 Sep 2009 16:56:49 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:    %{fontname}-fonts
 Version: 0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 Summary: Heuristica font
 
@@ -14,6 +14,7 @@ License:   OFL
 URL:       ftp://ftp.dvo.ru/pub/Font/heuristica/
 Source0:   %{url}%{archivename}.tar.xz
 Source1:   %{name}-fontconfig.conf
+Patch0:    %{name}-bolditalic.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:     noarch
@@ -28,6 +29,7 @@ font that was released to the TeX Users 
 
 %prep
 %setup -q -c
+%patch0 -p0
 for txt in *.txt ; do
    fold -s $txt > $txt.new
    sed -i 's/\r//' $txt.new
@@ -70,6 +72,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1:0.2-2
+? make Bold Italic Bold Italic not BoldItalic
+
 * Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1:0.2-1
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	6 Sep 2009 18:45:43 -0000	1.8
+++ import.log	13 Sep 2009 16:56:49 -0000	1.9
@@ -6,3 +6,4 @@ apanov-heuristica-fonts-20090125-3_fc11:
 apanov-heuristica-fonts-20090125-5_fc11:HEAD:apanov-heuristica-fonts-20090125-5.fc11.src.rpm:1237147311
 apanov-heuristica-fonts-20090507-1_fc12:HEAD:apanov-heuristica-fonts-20090507-1.fc12.src.rpm:1247609683
 apanov-heuristica-fonts-0_2-1_fc12:HEAD:apanov-heuristica-fonts-0.2-1.fc12.src.rpm:1252262664
+apanov-heuristica-fonts-0_2-2_fc12:HEAD:apanov-heuristica-fonts-0.2-2.fc12.src.rpm:1252860982



From thm at fedoraproject.org  Sun Sep 13 17:06:17 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 13 Sep 2009 17:06:17 +0000 (UTC)
Subject: rpms/monotone/F-10 monotone-0.45-ls-output.patch, NONE,
	1.1 .cvsignore, 
	1.24, 1.25 import.log, 1.4, 1.5 monotone.spec, 1.43,
	1.44 sources, 1.24, 1.25
Message-ID: <20090913170617.7810211C0099@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4994/F-10

Modified Files:
	.cvsignore import.log monotone.spec sources 
Added Files:
	monotone-0.45-ls-output.patch 
Log Message:
Update to 0.45.

monotone-0.45-ls-output.patch:
 __driver__.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE monotone-0.45-ls-output.patch ---
============================================================
--- tests/key_files_created_securely/__driver__.lua	63a9bd279770dc1fcefec5eb6cead7fd3e061982
+++ tests/key_files_created_securely/__driver__.lua	2a0d5d0376174967369a15795f30a6e081af81b6
@@ -25,4 +25,4 @@ check({ "ls", "-l", "keys/foobar." .. ke
 keyid = string.sub(line, 0, 40)
 
 check({ "ls", "-l", "keys/foobar." .. keyid }, 0, true, nil)
-check(qgrep("^-rw------- .*keys/foobar." .. keyid, "stdout"))
+check(qgrep("^-rw-------[.+]? .*keys/foobar." .. keyid, "stdout"))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	18 May 2009 19:49:42 -0000	1.24
+++ .cvsignore	13 Sep 2009 17:06:16 -0000	1.25
@@ -1 +1 @@
-monotone-0.44.tar.gz
+monotone-0.45.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	18 May 2009 19:49:42 -0000	1.4
+++ import.log	13 Sep 2009 17:06:17 -0000	1.5
@@ -2,3 +2,4 @@ monotone-0_42-2_fc10:F-10:monotone-0.42-
 monotone-0_42-5_fc11:F-10:monotone-0.42-5.fc11.src.rpm:1236376035
 monotone-0_43-1_fc11:F-10:monotone-0.43-1.fc11.src.rpm:1238425471
 monotone-0_44-1_fc12:F-10:monotone-0.44-1.fc12.src.rpm:1242676153
+monotone-0_45-1_fc11:F-10:monotone-0.45-1.fc11.src.rpm:1252861537


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/monotone.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- monotone.spec	18 May 2009 19:49:42 -0000	1.43
+++ monotone.spec	13 Sep 2009 17:06:17 -0000	1.44
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.44
+Version: 0.45
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -11,6 +11,7 @@ Source0: http://monotone.ca/downloads/%{
 Source1: monotone.init
 Source2: monotone.sysconfig
 Source3: README.monotone-server
+Patch0: monotone-0.45-ls-output.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@ and then pass commands to it.
 
 %prep
 %setup -q
+%patch0 -p0 -b .ls-output
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
@@ -191,6 +193,12 @@ fi
 
 
 %changelog
+* Sat Sep 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.45-1
+- Update to 0.45.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.44-1
 - Update to 0.44.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	18 May 2009 19:49:42 -0000	1.24
+++ sources	13 Sep 2009 17:06:17 -0000	1.25
@@ -1 +1 @@
-6cc1f5f31df2e41bdfe502310463924a  monotone-0.44.tar.gz
+bd37c3d75e3fd1974a17f556499b42ab  monotone-0.45.tar.gz



From nim at fedoraproject.org  Sun Sep 13 17:09:39 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 17:09:39 +0000 (UTC)
Subject: rpms/senamirmir-washra-fonts/devel
	senamirmir-washra-fonts-fontconfig.conf, NONE, 1.1 import.log,
	1.1, 1.2 senamirmir-washra-fonts.spec, 1.2, 1.3
Message-ID: <20090913170939.C28CF11C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6030/devel

Modified Files:
	import.log senamirmir-washra-fonts.spec 
Added Files:
	senamirmir-washra-fonts-fontconfig.conf 
Log Message:
fixup washra bold/semibold naming


--- NEW FILE senamirmir-washra-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <match target="scan">
    <test name="family">
      <string>Ethiopic WashRa Bold</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Ethiopic WashRa</string>
    </edit>
    <edit name="weight">
      <int>700</int>
    </edit>
  </match>
  <alias binding="same">
    <family>Ethiopic WashRa Bold</family>
    <accept>
      <family>Ethiopic WashRa</family>
    </accept>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Ethiopic WashRa SemiBold</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Ethiopic WashRa</string>
    </edit>
    <edit name="style">
      <string>DemiBold</string>
    </edit>
    <edit name="weight">
      <int>600</int>
    </edit>
  </match>
  <alias binding="same">
    <family>Ethiopic WashRa SemiBold</family>
    <style>Bold</style>
    <accept>
      <family>Ethiopic WashRa</family>
      <style>DemiBold</style>
    </accept>
  </alias>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Ethiopic WashRa</family>
    </prefer>
  </alias>
  <alias>
    <family>Ethiopic WashRa</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Jun 2009 21:48:27 -0000	1.1
+++ import.log	13 Sep 2009 17:09:39 -0000	1.2
@@ -1 +1,2 @@
 senamirmir-washra-fonts-4_1-1_fc12:HEAD:senamirmir-washra-fonts-4.1-1.fc12.src.rpm:1244670473
+senamirmir-washra-fonts-4_1-3_fc12:HEAD:senamirmir-washra-fonts-4.1-3.fc12.src.rpm:1252861746


Index: senamirmir-washra-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- senamirmir-washra-fonts.spec	27 Jul 2009 04:08:59 -0000	1.2
+++ senamirmir-washra-fonts.spec	13 Sep 2009 17:09:39 -0000	1.3
@@ -11,18 +11,21 @@ Eritrean languages (Amharic, Blin, Ge?e
 
 Name:    %{fontname}-fonts
 Version: 4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Fonts for the Ge?ez (Ethiopic) script
 
 Group:   User Interface/X
 License: OFL
 URL:     http://www.senamirmir.org/projects/typography/typeface.html
 Source0: http://www.senamirmir.org/downloads/%{archivename}.zip
+# Problems reported upstream
+# https://www.redhat.com/archives/fedora-fonts-list/2009-June/msg00002.html
+Source1: %{name}-fontconfig.conf
 # We need upstream or someone who knows local Ethiopian usage to suggest a
-# classification we could relay to fontconfig. In the meanwhile, only two
+# classification we could relay to fontconfig. In the meanwhile, only three
 # font families classified
-Source1: %{name}-yigezu-bisrat-goffer-fontconfig.conf
-Source2: %{name}-yigezu-bisrat-gothic-fontconfig.conf
+Source2: %{name}-yigezu-bisrat-goffer-fontconfig.conf
+Source3: %{name}-yigezu-bisrat-gothic-fontconfig.conf
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -32,7 +35,7 @@ BuildRequires: fontpackages-devel
 %description
 %common_desc
 
-%_font_pkg washrab.ttf washrasb.ttf
+%_font_pkg -f %{fontconf}.conf washrab.ttf washrasb.ttf
 
 %package common
 Summary:  Common files of %{name}
@@ -181,11 +184,14 @@ install -m 0755 -d %{buildroot}%{_fontco
 
 # No info available to classify the other fonts
 install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yigezu-bisrat-goffer.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
 install -m 0644 -p %{SOURCE2} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yigezu-bisrat-goffer.conf
+install -m 0644 -p %{SOURCE3} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yigezu-bisrat-gothic.conf
 
-for fconf in %{fontconf}-yigezu-bisrat-goffer.conf \
+for fconf in %{fontconf}.conf \
+             %{fontconf}-yigezu-bisrat-goffer.conf \
              %{fontconf}-yigezu-bisrat-gothic.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
@@ -202,9 +208,13 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
+* Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 4.1-3
+? Fix WashRa Bold and SemiBold naming
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 4.1-2
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jun 2 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 4.1-1



From rathann at fedoraproject.org  Sun Sep 13 17:26:03 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 13 Sep 2009 17:26:03 +0000 (UTC)
Subject: rpms/inchi/devel .cvsignore, 1.2, 1.3 inchi-rpm.patch, 1.1,
	1.2 inchi.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090913172603.CDDEB11C0099@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/inchi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11141

Modified Files:
	.cvsignore inchi-rpm.patch inchi.spec sources 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-1
- updated to final 1.02 release (unfortunately, it breaks ABI)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Oct 2007 19:28:42 -0000	1.2
+++ .cvsignore	13 Sep 2009 17:26:03 -0000	1.3
@@ -1 +1 @@
-inchi102b.zip
+STDINCHI-1-API.zip

inchi-rpm.patch:
 makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: inchi-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/inchi-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inchi-rpm.patch	25 Oct 2007 19:28:42 -0000	1.1
+++ inchi-rpm.patch	13 Sep 2009 17:26:03 -0000	1.2
@@ -1,17 +1,14 @@
---- InChI-1-API/cInChI/gcc_makefile/makefile.r	2006-05-08 19:28:26.000000000 +0200
-+++ InChI-1-API/cInChI/gcc_makefile/makefile	2007-07-01 14:05:00.000000000 +0200
-@@ -31,7 +31,7 @@
+diff -up STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile.r STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile
+--- STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile.r	2008-11-28 19:16:50.000000000 +0100
++++ STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile	2009-08-26 16:02:09.000000000 +0200
+@@ -1,5 +1,5 @@
+ # Comment out the next line to create so/dll only
+-CREATE_MAIN = 1
++#CREATE_MAIN = 1
  
- # === C Compiler Options =======
- ifndef C_OPTIONS
--  C_OPTIONS = $(P_INCL) -ansi -O3 -c
-+  C_OPTIONS = $(P_INCL) -ansi $(OPTFLAGS) -c
- #  C_OPTIONS = $(P_INCL) -ansi -O1 -fsigned-char -ffunction-sections -fexpensive-optimizations -fstack-check -fexceptions -Wall -pedantic -Wbad-function-cast -Wreturn-type -Wformat -Wuninitialized -Wcast-align -Wshadow -Wunused -Wunused-value -Wunused-variable -Wunused-function -Wunused-parameter -Wunused-label -Wcomment -Wcast-qual -Wconversion -Wimplicit-function-dec -Wimplicit-int -Wmissing-braces -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wsign-compare -Wfloat-equal -Wstrict-prototypes -Wwrite-strings -Wundef -Waggregate-return -Wchar-subscripts -Wformat-nonliteral -Wnested-externs -Wsequence-point -Wpointer-arith -m32 -mfancy-math-387 -mieee-fp -mno-soft-float -c
- endif
- 
---- InChI-1-API/INCHI_API/gcc_so_makefile/makefile.r	2006-05-16 18:56:32.000000000 +0200
-+++ InChI-1-API/INCHI_API/gcc_so_makefile/makefile	2007-07-01 14:00:42.000000000 +0200
-@@ -9,7 +9,7 @@
+ ifdef windir
+ # Under Win32/MinGW/gcc to add functions compliant to Pascal/stdcall calling
+@@ -9,7 +9,7 @@ ifdef windir
  else
  # Uncomment the following line in case of Linux
  # or define ISLINUX in command line: make ISLINUX=1
@@ -20,7 +17,7 @@
  endif
  
  # Linux fpic option: replace -fPIC with -fpic if the latter works
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ endif
  
  # === C Compiler Options =======
  ifndef C_OPTIONS


Index: inchi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/inchi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- inchi.spec	25 Jul 2009 03:20:31 -0000	1.4
+++ inchi.spec	13 Sep 2009 17:26:03 -0000	1.5
@@ -3,10 +3,10 @@
 Summary: The IUPAC International Chemical Identifier library
 Name: inchi
 Version: 1.0.2
-Release: 0.5%{?dist}
+Release: 1%{?dist}
 URL: http://www.iupac.org/inchi/
 Group: Development/Libraries
-Source0: http://www.iupac.org/inchi/download/inchi102b.zip
+Source0: http://www.iupac.org/inchi/download/STDINCHI-1-API.zip
 Patch0: %{name}-rpm.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,22 +33,23 @@ you should install inchi-devel.  You'll 
 inchi package installed.
 
 %prep
-%setup -q -n InChI-1-software-1-02-beta
+%setup -q -n STDINCHI-1-API
 %patch0 -p1 -b .r
+rm STDINCHI_API/gcc_so_makefile/result/{libstdinchi,stdinchi}*
 
 %build
-pushd INCHI_API/gcc_so_makefile
+pushd STDINCHI_API/gcc_so_makefile
 %{__make} OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/inchi}
-install -p INCHI_API/gcc_so_makefile/result/libinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}
-ln -s libinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}/libinchi.so.1
-ln -s libinchi.so.1               $RPM_BUILD_ROOT%{_libdir}/libinchi.so
-sed -i 's/\r//' INCHI_API/INCHI_DLL/inchi_api.h
-install -pm644 INCHI_API/INCHI_DLL/inchi_api.h $RPM_BUILD_ROOT%{_includedir}/inchi
+install -p STDINCHI_API/gcc_so_makefile/result/libstdinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}
+ln -s libstdinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}/libstdinchi.so.1
+ln -s libstdinchi.so.1               $RPM_BUILD_ROOT%{_libdir}/libstdinchi.so
+sed -i 's/\r//' STDINCHI_API/INCHI_DLL/inchi_api.h
+install -pm644 STDINCHI_API/INCHI_DLL/inchi_api.h $RPM_BUILD_ROOT%{_includedir}/inchi
 sed -i 's/\r//' LICENSE readme.txt
 
 %clean
@@ -60,15 +61,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE readme.txt Software-1-02-beta.pdf
-%{_libdir}/libinchi.so.*
+%doc LICENSE readme.txt
+%{_libdir}/libstdinchi.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/inchi
-%{_libdir}/libinchi.so
+%{_libdir}/libstdinchi.so
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-1
+- updated to final 1.02 release (unfortunately, it breaks ABI)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Oct 2007 19:28:42 -0000	1.2
+++ sources	13 Sep 2009 17:26:03 -0000	1.3
@@ -1 +1 @@
-8cf52a73c369bda28de95f4280872e81  inchi102b.zip
+aa8bab9424a4c9683b63706c18d55479  STDINCHI-1-API.zip



From rathann at fedoraproject.org  Sun Sep 13 17:27:34 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 13 Sep 2009 17:27:34 +0000 (UTC)
Subject: rpms/openbabel/devel openbabel-inchi.patch, NONE,
	1.1 openbabel-check.patch, 1.10, 1.11 openbabel.spec, 1.47,
	1.48 openbabel-gcc43.patch, 1.17, NONE
Message-ID: <20090913172734.E1D4E11C0099@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/openbabel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11591

Modified Files:
	openbabel-check.patch openbabel.spec 
Added Files:
	openbabel-inchi.patch 
Removed Files:
	openbabel-gcc43.patch 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.3-1
- updated to 2.2.3
- dropped obsolete patch
- fix configure to detect external inchi-1.0.2


openbabel-inchi.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbabel-inchi.patch ---
diff -up openbabel-2.2.3/configure.in.inchi openbabel-2.2.3/configure.in
--- openbabel-2.2.3/configure.in.inchi	2009-07-29 03:05:04.000000000 +0200
+++ openbabel-2.2.3/configure.in	2009-08-26 16:26:08.000000000 +0200
@@ -239,7 +239,7 @@ AC_SUBST(LIBDL)
 AM_PATH_XML2(2.6.5)
 AM_CONDITIONAL(BUILD_XML, test x"$XML_LIBS" != "x")
 
-AC_CHECK_LIB(inchi, GetINCHI, LIBINCHI="-linchi", LIBINCHI="")
+AC_CHECK_LIB(stdinchi, GetStdINCHI, LIBINCHI="-lstdinchi", LIBINCHI="")
 AM_CONDITIONAL(BUILD_INCHI, test x"$LIBINCHI" = "x" -o "$inchi" = "yes")
 
 AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])

openbabel-check.patch:
 wrapper.sh |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: openbabel-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openbabel-check.patch	1 Mar 2009 17:46:41 -0000	1.10
+++ openbabel-check.patch	13 Sep 2009 17:27:34 -0000	1.11
@@ -1,10 +1,10 @@
-diff -up openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh
---- openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk	2009-01-12 20:10:33.000000000 +0100
-+++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh	2009-03-01 16:19:28.000000000 +0100
+diff -up openbabel-2.2.3/test/wrapper.sh.chk openbabel-2.2.3/test/wrapper.sh
+--- openbabel-2.2.3/test/wrapper.sh.chk	2009-07-29 01:05:03.000000000 +0200
++++ openbabel-2.2.3/test/wrapper.sh	2009-08-26 15:55:28.000000000 +0200
 @@ -16,11 +16,11 @@ TESTS="${TESTS} logp_psa math"
  TESTS="${TESTS} mol phmodel residue rings"
- TESTS="${TESTS} smarts smilesmatch unitcell"
- TESTS="${TESTS} cml.sh test-set.sh"
+ TESTS="${TESTS} smarts smilesmatch strip unitcell"
+ TESTS="${TESTS} zipstream cml.sh test-set.sh"
 -if [ "x${srcdir}" != "x" ]; then
 -  TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl"
 -else
@@ -18,21 +18,3 @@ diff -up openbabel-2.2.1b3-20090215-r289
  PROVE=prove
  
  echo "top srcdir: .${topsrcdir}."
-@@ -45,4 +45,4 @@ if [ -d ../src/formats/.libs ]; then
-     fi
- fi
- 
--${PROVE} "$@" ${TESTS}
-+${PROVE} --verbose "$@" ${TESTS}
-diff -up openbabel-2.2.0/test/bond.cpp.chk openbabel-2.2.0/test/bond.cpp
---- openbabel-2.2.0/test/bond.cpp.chk	2008-06-13 22:48:05.000000000 +0200
-+++ openbabel-2.2.0/test/bond.cpp	2008-07-06 21:45:44.000000000 +0200
-@@ -58,7 +58,7 @@ int main(int argc,char *argv[])
- 
-   bond1.SetBegin(&begin1);
-   bond1.SetEnd(&end1);
--  cout << "ok 4\n";
-+  cout << "ok 3\n";
- 
-   return(0);
- }


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openbabel.spec	25 Jul 2009 20:44:32 -0000	1.47
+++ openbabel.spec	13 Sep 2009 17:27:34 -0000	1.48
@@ -4,20 +4,20 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 
-%define beta_ver b3
-%define beta_str b3-20090215-r2890
+%define beta_ver %{nil}
+%define beta_str %{nil}
 
 Name: openbabel
-Version: 2.2.1
-Release: 0.2.%{beta_ver}%{?dist}
+Version: 2.2.3
+Release: 1%{beta_ver}%{?dist}
 Summary: Chemistry software file format converter
 License: GPLv2
 Group: Applications/File
 URL: http://openbabel.org/
-Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
-Patch: %{name}-gcc43.patch
+Source: http://downloads.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
 Patch1: %{name}-rpm.patch
 Patch2: %{name}-check.patch
+Patch3: %{name}-inchi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: inchi-devel
 BuildRequires: libtool
@@ -90,10 +90,10 @@ Ruby wrapper for the Open Babel library.
 
 %prep
 %setup -q -n %{name}-%{version}%{beta_str}
-%patch -p1 -b .gcc43
 %patch1 -p1 -b .r
 %patch2 -p1 -b .chk
-chmod 644 src/formats/{mmcif,fchk}format.cpp
+%patch3 -p1 -b .inchi
+chmod 644 src/formats/mmcifformat.cpp
 
 %build
 autoreconf --force --install
@@ -183,6 +183,11 @@ popd
 %{ruby_sitearch}/openbabel.so
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.3-1
+- updated to 2.2.3
+- dropped obsolete patch
+- fix configure to detect external inchi-1.0.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-0.2.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- openbabel-gcc43.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 13 17:37:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 13 Sep 2009 17:37:07 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.392, 1.393 jd.spec, 1.454, 1.455 sources,
	1.393, 1.394
Message-ID: <20090913173707.43A3A11C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14126

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3068



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- .cvsignore	11 Sep 2009 14:22:48 -0000	1.392
+++ .cvsignore	13 Sep 2009 17:37:06 -0000	1.393
@@ -1 +1 @@
-jd-2.4.2-svn3060_trunk.tgz
+jd-2.4.2-svn3068_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- jd.spec	11 Sep 2009 14:22:48 -0000	1.454
+++ jd.spec	13 Sep 2009 17:37:06 -0000	1.455
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3060_trunk
+%define         strtag        svn3068_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3060
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3068
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- sources	11 Sep 2009 14:22:48 -0000	1.393
+++ sources	13 Sep 2009 17:37:07 -0000	1.394
@@ -1 +1 @@
-13a987c329366bbf000308bbdc97caf9  jd-2.4.2-svn3060_trunk.tgz
+32bf54781c54bf2000ca06db453b6f72  jd-2.4.2-svn3068_trunk.tgz



From mtasaka at fedoraproject.org  Sun Sep 13 17:45:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 13 Sep 2009 17:45:30 +0000 (UTC)
Subject: rpms/kazehakase/devel
	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch,
	NONE, 1.1 .cvsignore, 1.37, 1.38 kazehakase.spec, 1.94,
	1.95 sources, 1.37, 1.38
Message-ID: <20090913174530.5628711C0099@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16610

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3846


kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch ---
Index: libegg/pixbufthumbnail/Makefile.am
===================================================================
--- libegg/pixbufthumbnail/Makefile.am	(revision 938)
+++ libegg/pixbufthumbnail/Makefile.am	(working copy)
@@ -26,7 +26,7 @@
 
 testeggpixbufthumbnail_LDADD = \
 	$(EGG_LIBS) \
-	$(top_builddir)/libegg/pixbufthumbnail/libeggpixbufthumbnail.la
+	libeggpixbufthumbnail.la
 
 testeggpixbufthumbnail_SOURCES = \
 	testeggpixbufthumbnail.c


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	7 Sep 2009 17:03:16 -0000	1.37
+++ .cvsignore	13 Sep 2009 17:45:30 -0000	1.38
@@ -1 +1 @@
-kazehakase-0.5.7-svn3832_trunk.tar.gz
+kazehakase-0.5.7-svn3846_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kazehakase.spec	7 Sep 2009 17:03:16 -0000	1.94
+++ kazehakase.spec	13 Sep 2009 17:45:30 -0000	1.95
@@ -36,7 +36,7 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		43338
-%define		svnver		3832_trunk
+%define		svnver		3846_trunk
 
 
 %define		fedorarel	3
@@ -63,6 +63,7 @@ Patch14:	kazehakase-0.5.6-rev3769-embed-
 Patch15:	kazehakase-0.5.7-gtk0218.patch
 %endif
 Patch16:	kazehakase-0.5.7-rev3832-dbus.patch
+Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
@@ -194,7 +195,8 @@ This package uses WebKit for HTML render
 # Reverse!!
 %patch15 -p0 -b .gtk -R
 %endif
-%patch16 -p0 -b .mak
+%patch16 -p0 -b .dbus_mak
+%patch17 -p0 -b .libegg_mak
 
 %if %{need_autogen}
 sh autogen.sh
@@ -257,7 +259,6 @@ export CFLAGS="%{optflags} -DVERSION_VEN
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
-%{__make} -C libegg -k # not parallel make
 %{__make} %{?_smp_mflags} -k
 
 %install
@@ -341,6 +342,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3846
+
 * Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
 - Try rev 3832 for new dbus feature
 - Kill ruby support until it gets compiled


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	7 Sep 2009 17:03:16 -0000	1.37
+++ sources	13 Sep 2009 17:45:30 -0000	1.38
@@ -1 +1 @@
-c0dc821388840869ba4ef97e14d02661  kazehakase-0.5.7-svn3832_trunk.tar.gz
+78ad88120148bf370d040707b23e72ad  kazehakase-0.5.7-svn3846_trunk.tar.gz



From nim at fedoraproject.org  Sun Sep 13 18:07:36 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 13 Sep 2009 18:07:36 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts-fontconfig.conf, 
	1.4, 1.5 ecolier-court-fonts-lignes-fontconfig.conf, 1.3,
	1.4 ecolier-court-fonts.spec, 1.10, 1.11 import.log, 1.7, 1.8
Message-ID: <20090913180736.EF18811C0099@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23401/devel

Modified Files:
	ecolier-court-fonts-fontconfig.conf 
	ecolier-court-fonts-lignes-fontconfig.conf 
	ecolier-court-fonts.spec import.log 
Log Message:
naming tweaks


Index: ecolier-court-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ecolier-court-fonts-fontconfig.conf	13 Sep 2009 09:45:04 -0000	1.4
+++ ecolier-court-fonts-fontconfig.conf	13 Sep 2009 18:07:36 -0000	1.5
@@ -1,14 +1,28 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Ecolier_court</string>
+    </test>
+    <edit name="family">
+      <string>?colier court</string>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Ecolier_court</family>
+    <accept>
+      <family>?colier court</family>
+    </accept>
+  </alias>
   <alias>
     <family>cursive</family>
     <prefer>
-      <family>Ecolier_court</family>
+      <family>?colier court</family>
     </prefer>
   </alias>
   <alias>
-    <family>Ecolier_court</family>
+    <family>?colier court</family>
     <default>
       <family>cursive</family>
     </default>


Index: ecolier-court-fonts-lignes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-lignes-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ecolier-court-fonts-lignes-fontconfig.conf	13 Sep 2009 09:45:12 -0000	1.3
+++ ecolier-court-fonts-lignes-fontconfig.conf	13 Sep 2009 18:07:36 -0000	1.4
@@ -1,14 +1,28 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Ecolier_lignes_court</string>
+    </test>
+    <edit name="family">
+      <string>?colier lignes court</string>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Ecolier_lignes_court</family>
+    <accept>
+      <family>?colier lignes court</family>
+    </accept>
+  </alias>
   <alias>
     <family>fantasy</family>
     <prefer>
-      <family>Ecolier_lignes_court</family>
+      <family>?colier lignes court</family>
     </prefer>
   </alias>
   <alias>
-    <family>Ecolier_lignes_court</family>
+    <family>?colier lignes court</family>
     <default>
       <family>fantasy</family>
     </default>


Index: ecolier-court-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ecolier-court-fonts.spec	24 Jul 2009 21:00:17 -0000	1.10
+++ ecolier-court-fonts.spec	13 Sep 2009 18:07:36 -0000	1.11
@@ -11,7 +11,7 @@ this package.
 
 Name:    %{fontname}-fonts
 Version: 20070702
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Schoolchildren cursive fonts
 
 Group:     User Interface/X
@@ -107,11 +107,18 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070702-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070702-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20070702-11
+? Fix the font naming to something more user friendly (remove PS1 legacy
+  limitations)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20070702-10
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20070702-9
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Feb 16 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20070702-8


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	23 Feb 2009 08:31:12 -0000	1.7
+++ import.log	13 Sep 2009 18:07:36 -0000	1.8
@@ -5,3 +5,4 @@ ecolier-court-fonts-20070702-6_fc11:HEAD
 ecolier-court-fonts-20070702-6_fc11:HEAD:ecolier-court-fonts-20070702-6.fc11.src.rpm:1232192497
 ecolier-court-fonts-20070702-7_fc11:HEAD:ecolier-court-fonts-20070702-7.fc11.src.rpm:1232193736
 ecolier-court-fonts-20070702-8_fc11:HEAD:ecolier-court-fonts-20070702-8.fc11.src.rpm:1235377848
+ecolier-court-fonts-20070702-11_fc12:HEAD:ecolier-court-fonts-20070702-11.fc12.src.rpm:1252865221



From rathann at fedoraproject.org  Sun Sep 13 18:22:52 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 13 Sep 2009 18:22:52 +0000 (UTC)
Subject: rpms/openbabel/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20090913182252.9111F11C0099@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/openbabel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27545

Modified Files:
	.cvsignore sources 
Log Message:
forgot to upload new source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	1 Mar 2009 12:18:32 -0000	1.13
+++ .cvsignore	13 Sep 2009 18:22:52 -0000	1.14
@@ -1 +1 @@
-openbabel-2.2.1b3-20090215-r2890.tar.gz
+openbabel-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Mar 2009 12:18:33 -0000	1.13
+++ sources	13 Sep 2009 18:22:52 -0000	1.14
@@ -1 +1 @@
-b71b29d0e42dbcd779bded9f583a172f  openbabel-2.2.1b3-20090215-r2890.tar.gz
+7ea8845c54d6d3a9be378c78088af804  openbabel-2.2.3.tar.gz



From jorton at fedoraproject.org  Sun Sep 13 18:54:14 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 13 Sep 2009 18:54:14 +0000 (UTC)
Subject: rpms/neon/devel .cvsignore, 1.18, 1.19 neon.spec, 1.52, 1.53 sources,
	1.17, 1.18 upstream, 1.11, 1.12
Message-ID: <20090913185414.EE09211C0099@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4222

Modified Files:
	.cvsignore neon.spec sources upstream 
Log Message:
* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-1
- update to 0.29.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 Aug 2009 07:59:52 -0000	1.18
+++ .cvsignore	13 Sep 2009 18:54:13 -0000	1.19
@@ -1 +1 @@
-neon-0.28.6.tar.gz
+neon-0.29.0.tar.gz


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- neon.spec	19 Aug 2009 07:59:52 -0000	1.52
+++ neon.spec	13 Sep 2009 18:54:13 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.28.6
+Version: 0.29.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-1
+- update to 0.29.0
+
 * Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
 - update to 0.28.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	19 Aug 2009 07:59:52 -0000	1.17
+++ sources	13 Sep 2009 18:54:13 -0000	1.18
@@ -1 +1 @@
-252578ed555552b71d15909641484951  neon-0.28.6.tar.gz
+18a3764b70f9317f8b61509fd90d9e7a  neon-0.29.0.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/upstream,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- upstream	19 Aug 2009 07:59:52 -0000	1.11
+++ upstream	13 Sep 2009 18:54:13 -0000	1.12
@@ -1 +1 @@
-neon-0.28.6.tar.gz
+neon-0.29.0.tar.gz



From pghmcfc at fedoraproject.org  Sun Sep 13 19:20:49 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sun, 13 Sep 2009 19:20:49 +0000 (UTC)
Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA-dsaparam.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 perl-Crypt-DSA.spec, 1.11, 1.12 sources,
	1.3, 1.4
Message-ID: <20090913192049.E30EF11C0099@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Crypt-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17463

Modified Files:
	.cvsignore perl-Crypt-DSA.spec sources 
Added Files:
	perl-Crypt-DSA-dsaparam.patch 
Log Message:
* Fri Sep 11 2009 Paul Howarth <paul at city-fan.org> 1.16-1
- Update to 1.16 (first production release)
- New upstream maintainer -> change source URL
- Change buildreq which to perl(File::Which)
- Add new buildreqs perl(Crypt::DES_EDE3), perl(File::Spec), perl(IPC::Open3)
- Buildreq perl(Math::BigInt) >= 1.78
- Enable AUTOMATED_TESTING
- New test requirements:
  - perl(Perl::MinimumVersion) >= 1.20
  - perl(Test::CPAN::Meta) >= 0.12
  - perl(Test::MinimumVersion) >= 0.008
  - perl(Test::Pod) >= 1.26
- ToDo no longer present upstream, but add LICENSE and README as %doc
- Add runtime dependency on openssl (used for DSA parameter generation)
- Add patch for openssl dsaparam 1.0 compatibility (CPAN RT#49668)


perl-Crypt-DSA-dsaparam.patch:
 KeyChain.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-Crypt-DSA-dsaparam.patch ---
There's a slight change of output format in the openssl dsaparam command from
current versions to the forthcoming 1.0 release:

openssl 0.9.8k:

$ openssl dsaparam -text -noout 512
Generating DSA parameters, 512 bit long prime
This could take some time
........+..+++++++++++++++++++++++++++++++++++++++++++++++++++*
..+....................+................+.+................+................................+...+..+...........+.....+.............+.......+....+..............+.......+...+.....+.................+....+.............................+.......+..........+..+...+........+...............+......+..........+..+.....+............+.+..+...+.....+....+++++++++++++++++++++++++++++++++++++++++++++++++++*
DSA-Parameters: (512 bit)
    p:
        00:e6:6c:38:ce:8d:9f:1d:f0:7a:12:50:1e:ef:5c:
        73:fe:2e:7a:b0:ed:27:a0:96:c3:37:98:de:e9:b6:
        a2:e6:3a:97:9d:d5:c1:f8:1e:f4:2d:38:29:d8:08:
        ac:f1:20:28:51:54:cb:7a:a1:36:f6:e7:07:b1:cf:
        23:8d:6e:a1:33
    q:
        00:f4:7b:0c:a8:98:d7:e0:d0:3e:92:94:95:30:f5:
        21:0a:86:db:16:55
    g:
        00:c6:81:8d:32:72:6b:6b:a5:d2:90:fb:c2:31:c4:
        73:e0:1b:05:bb:17:5c:b2:b2:09:69:17:78:41:fc:
        99:a1:9b:07:ca:a7:02:5f:0e:1f:dd:35:05:90:ac:
        e8:66:47:ca:9a:1a:77:a4:f4:5e:65:66:64:bf:34:
        7d:fe:30:bf:5a

openssl 1.0 beta 3:

$ openssl dsaparam -text -noout 512
Generating DSA parameters, 512 bit long prime
This could take some time
.+........+++++++++++++++++++++++++++++++++++++++++++++++++++*
...+................+.....+..........+.+.+...........+.+............+............+......+...+.........................................+......+......+...............+...+....+..............+++++++++++++++++++++++++++++++++++++++++++++++++++*
    P:   
        00:82:ab:91:c2:9e:8e:c1:cd:cb:70:68:12:c9:44:
        90:20:97:e4:69:77:fc:53:ce:78:2c:3d:01:5c:69:
        42:45:bc:e7:06:2f:4e:75:d4:10:3b:ae:de:43:6f:
        d8:86:6d:1e:f9:1d:c5:8e:0d:92:ca:e7:23:2e:5b:
        42:26:09:88:3b
    Q:   
        00:f9:dc:55:fd:ca:48:8c:d4:e9:df:8a:25:6d:f7:
        82:5d:f8:34:34:3f
    G:   
        6b:75:a7:e5:ac:2e:3a:79:65:01:51:cb:78:a3:06:
        73:47:0a:b8:9c:de:68:36:c5:5e:44:02:fe:8a:73:
        73:bc:d3:1a:ec:08:40:da:b3:f6:e2:0b:14:e6:1c:
        0d:f5:ef:62:0e:bf:64:18:96:ee:87:f7:13:89:42:
        cc:69:6e:be

The change to labelling the parameters in upper case causes
Crypt::DSA::Keychain to fail like this (from the test suite):

Use of uninitialized value $parts{"p"} in concatenation (.) or string at /builddir/build/BUILD/Crypt-DSA-1.16/blib/lib/Crypt/DSA/KeyChain.pm line 69.
Use of uninitialized value $parts{"q"} in concatenation (.) or string at /builddir/build/BUILD/Crypt-DSA-1.16/blib/lib/Crypt/DSA/KeyChain.pm line 70.
Use of uninitialized value $parts{"g"} in concatenation (.) or string at /builddir/build/BUILD/Crypt-DSA-1.16/blib/lib/Crypt/DSA/KeyChain.pm line 71.
Can't locate object method "copy" via package "NaN" (perhaps you forgot to load "NaN"?) at /builddir/build/BUILD/Crypt-DSA-1.16/blib/lib/Crypt/DSA/Util.pm line 43.
# Looks like your test exited with 255 before it could output anything.

The patch changes the parameter labels to lower case, making the code
compatible with both old and new versions of openssl.

--- Crypt-DSA-1.16/lib/Crypt/DSA/KeyChain.pm	2009-09-11 13:45:37.000000000 +0100
+++ Crypt-DSA-1.16/lib/Crypt/DSA/KeyChain.pm	2009-09-12 22:56:31.000000000 +0100
@@ -53,7 +53,7 @@
             my $cur_part;
             foreach (@res) {
                 if (/^\s+(\w):\s*$/) {
-                    $cur_part = $1;
+                    $cur_part = lc($1);
                     next;
                 }
                 if (/^\s*((?:[0-9a-f]{2,2}:?)+)\s*$/) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DSA/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 May 2006 09:29:15 -0000	1.3
+++ .cvsignore	13 Sep 2009 19:20:49 -0000	1.4
@@ -1 +1 @@
-Crypt-DSA-0.14.tar.gz
+Crypt-DSA-1.16.tar.gz


Index: perl-Crypt-DSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-DSA.spec	30 Jul 2009 22:21:16 -0000	1.11
+++ perl-Crypt-DSA.spec	13 Sep 2009 19:20:49 -0000	1.12
@@ -1,19 +1,32 @@
 Summary:	Perl module for DSA signatures and key generation
 Name:		perl-Crypt-DSA
-Version:	0.14
-Release:	9%{?dist}
+Version:	1.16
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DSA/
-Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Crypt-DSA-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Crypt-DSA-%{version}.tar.gz
+Patch0:		perl-Crypt-DSA-dsaparam.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:	noarch
-BuildRequires:	perl(Convert::PEM) >= 0.07
+BuildRequires:	perl(Convert::PEM)
+BuildRequires:	perl(Crypt::DES_EDE3)
 BuildRequires:	perl(Data::Buffer) >= 0.01
 BuildRequires:	perl(Digest::SHA1)
-BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::More)
-BuildRequires:	which, openssl
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(File::Spec)
+BuildRequires:	perl(File::Which) >= 0.05
+BuildRequires:	perl(IPC::Open3)
+BuildRequires:	perl(Math::BigInt) >= 1.78
+BuildRequires:	perl(Perl::MinimumVersion) >= 1.20
+BuildRequires:	perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:	perl(Test::More) >= 0.42
+BuildRequires:	perl(Test::MinimumVersion) >= 0.008
+BuildRequires:	perl(Test::Pod) >= 1.26
+BuildRequires:	openssl
+# Crypt::DSA::Keychain calls openssl for DSA parameter generation
+Requires:	openssl
 
 # Pull in Math::BigInt::GMP for GMP support for suitably recent versions of Math::BigInt
 # else use Math::GMP
@@ -33,18 +46,21 @@ verification, and key generation.
 %prep
 %setup -q -n Crypt-DSA-%{version}
 
+# Patch for openssl dsaparam 1.0 compatibility (CPAN RT#49668)
+%patch0 -p1
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 %{__make} %{?_smp_mflags}
 
 %check
-%{__make} test
+%{__make} test AUTOMATED_TESTING=1
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -52,7 +68,7 @@ verification, and key generation.
 
 %files
 %defattr(-,root,root,-)
-%doc Changes ToDo
+%doc Changes LICENSE README
 %{perl_vendorlib}/Crypt/
 %{_mandir}/man3/Crypt::DSA.3pm*
 %{_mandir}/man3/Crypt::DSA::Key.3pm*
@@ -63,10 +79,26 @@ verification, and key generation.
 %{_mandir}/man3/Crypt::DSA::Util.3pm*
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-9
+* Fri Sep 11 2009 Paul Howarth <paul at city-fan.org> 1.16-1
+- Update to 1.16 (first production release)
+- New upstream maintainer -> change source URL
+- Change buildreq which to perl(File::Which)
+- Add new buildreqs perl(Crypt::DES_EDE3), perl(File::Spec), perl(IPC::Open3)
+- Buildreq perl(Math::BigInt) >= 1.78
+- Enable AUTOMATED_TESTING
+- New test requirements:
+  - perl(Perl::MinimumVersion) >= 1.20
+  - perl(Test::CPAN::Meta) >= 0.12
+  - perl(Test::MinimumVersion) >= 0.008
+  - perl(Test::Pod) >= 1.26
+- ToDo no longer present upstream, but add LICENSE and README as %%doc
+- Add runtime dependency on openssl (used for DSA parameter generation)
+- Add patch for openssl dsaparam 1.0 compatibility (CPAN RT#49668)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.14-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-8
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.14-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Nov  3 2008 Paul Howarth <paul at city-fan.org> 0.14-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DSA/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 May 2006 09:29:15 -0000	1.3
+++ sources	13 Sep 2009 19:20:49 -0000	1.4
@@ -1 +1 @@
-5ff5ab4be5501f5547bbe46cdc3de442  Crypt-DSA-0.14.tar.gz
+a099204d57043767fbe31d639eb43b03  Crypt-DSA-1.16.tar.gz



From jorton at fedoraproject.org  Sun Sep 13 19:34:05 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 13 Sep 2009 19:34:05 +0000 (UTC)
Subject: rpms/neon/devel neon.spec,1.53,1.54
Message-ID: <20090913193405.2B04511C0099@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22018

Modified Files:
	neon.spec 
Log Message:
* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-2
- enable libproxy support



Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- neon.spec	13 Sep 2009 18:54:13 -0000	1.53
+++ neon.spec	13 Sep 2009 19:34:04 -0000	1.54
@@ -1,14 +1,14 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.29.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel
+BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel, libproxy-devel
 BuildRequires: pkgconfig, pakchois-devel
 Requires: ca-certificates
 Conflicts: subversion < 0.22.2-4
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-2
+- enable libproxy support
+
 * Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-1
 - update to 0.29.0
 



From jorton at fedoraproject.org  Sun Sep 13 19:34:50 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 13 Sep 2009 19:34:50 +0000 (UTC)
Subject: rpms/neon/devel neon.spec,1.54,1.55
Message-ID: <20090913193450.9FF6611C0099@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22352

Modified Files:
	neon.spec 
Log Message:
* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-3
- enable libproxy support



Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- neon.spec	13 Sep 2009 19:34:04 -0000	1.54
+++ neon.spec	13 Sep 2009 19:34:50 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.29.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
@@ -40,7 +40,8 @@ export CC="%{__cc} -pthread"
 %define cabundle %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 %configure --with-expat --enable-shared --disable-static \
         --enable-warnings --with-ca-bundle=%{cabundle} \
-        --with-ssl=gnutls --enable-threadsafe-ssl=posix
+        --with-ssl=gnutls --enable-threadsafe-ssl=posix \
+        --with-libproxy
 make %{?_smp_mflags}
 
 %install
@@ -75,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
-* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-2
+* Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-3
 - enable libproxy support
 
 * Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-1



From rathann at fedoraproject.org  Sun Sep 13 19:44:01 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 13 Sep 2009 19:44:01 +0000 (UTC)
Subject: rpms/libgadu/devel .cvsignore, 1.7, 1.8 libgadu.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <20090913194401.B046D11C0099@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libgadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24908

Modified Files:
	.cvsignore libgadu.spec sources 
Log Message:
* Sun Sep 13 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.1.rc1
- updated to 1.9.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Oct 2008 15:25:37 -0000	1.7
+++ .cvsignore	13 Sep 2009 19:44:01 -0000	1.8
@@ -1 +1 @@
-libgadu-1.8.2.tar.gz
+libgadu-1.9.0-rc1.tar.gz


Index: libgadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/libgadu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libgadu.spec	21 Aug 2009 14:16:52 -0000	1.12
+++ libgadu.spec	13 Sep 2009 19:44:01 -0000	1.13
@@ -1,10 +1,10 @@
 Name:		libgadu
-Version:	1.8.2
-Release:	5%{?dist}
+Version:	1.9.0
+Release:	0.1.rc1%{?dist}
 Summary:	A Gadu-gadu protocol compatible communications library
 License:	LGPLv2
 Group:		System Environment/Libraries
-Source0:	http://toxygen.net/libgadu/files/%{name}-%{version}.tar.gz
+Source0:	http://toxygen.net/libgadu/files/%{name}-%{version}-rc1.tar.gz
 URL:		http://toxygen.net/libgadu/
 BuildRequires:	openssl-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -35,7 +35,7 @@ Pakiet libgadu-devel zawiera pliki nag?
 potrzebne do kompilowania aplikacji korzystaj?cych z libgadu.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 
 %build
 %configure \
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Sep 13 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.1.rc1
+- updated to 1.9.0-rc1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.2-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Oct 2008 15:25:37 -0000	1.7
+++ sources	13 Sep 2009 19:44:01 -0000	1.8
@@ -1 +1 @@
-1090f82f8a1bb99e9cdf5853188f625f  libgadu-1.8.2.tar.gz
+96d2e3e48803ff6cd2a281c0b52d2167  libgadu-1.9.0-rc1.tar.gz



From davidz at fedoraproject.org  Sun Sep 13 19:52:31 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sun, 13 Sep 2009 19:52:31 +0000 (UTC)
Subject: rpms/polkit/devel .cvsignore, 1.4, 1.5 polkit.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20090913195231.D7C9811C0099@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27305

Modified Files:
	.cvsignore polkit.spec sources 
Log Message:
* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913
- Update to git snapshot
- Drop upstreamed patches
- Turn on GObject introspection
- Don't delete desktop_admin_r and desktop_user_r groups when
  uninstalling polkit-desktop-policy




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 19:25:45 -0000	1.4
+++ .cvsignore	13 Sep 2009 19:52:31 -0000	1.5
@@ -1,3 +1,4 @@
 polkit-0.92.tar.gz
 polkit-0.93.tar.gz
 polkit-0.94.tar.gz
+polkit-0.95.git20090913.tar.gz


Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- polkit.spec	11 Sep 2009 19:50:47 -0000	1.10
+++ polkit.spec	13 Sep 2009 19:52:31 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
-Version: 0.94
-Release: 4%{?dist}
+Version: 0.95
+Release: 0.git20090913%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Group: System Environment/Libraries
 BuildRequires: glib2-devel
@@ -18,9 +18,6 @@ BuildRequires: gobject-introspection-dev
 Requires: ConsoleKit
 Requires: dbus
 
-Patch0: 0001-Sort-by-action-id-in-pkaction-1-output.patch
-Patch1: 0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch
-
 %description
 PolicyKit is a toolkit for defining and handling authorizations.
 It is used for allowing unprivileged processes to speak to privileged
@@ -59,11 +56,9 @@ Roles and default policy for desktop usa
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --disable-introspection
+%configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --enable-introspection --enable-examples
 make
 
 %install
@@ -131,10 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/groupadd -r desktop_admin_r 2> /dev/null || :
 /usr/sbin/groupadd -r desktop_user_r 2> /dev/null || :
 
-%preun desktop-policy
-/usr/sbin/groupdel desktop_admin_r 2> /dev/null || :
-/usr/sbin/groupdel desktop_user_r 2> /dev/null || :
-
 %files desktop-policy
 %{_sysconfdir}/polkit-1/localauthority.conf.d/60-desktop-policy.conf
 %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/10-desktop-policy.pkla
@@ -157,27 +148,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/polkit-1
 %{_bindir}/pkaction
 %{_bindir}/pkcheck
+%{_bindir}/pklalockdown
 %{_libexecdir}/polkit-1/polkitd
-#%{_libdir}/girepository-1.0/*.typelib
+%{_libdir}/girepository-1.0/*.typelib
 
 # see upstream docs for why these permissions are necessary
-%attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1/
 %attr(4755,root,root) %{_bindir}/pkexec
 %attr(4755,root,root) %{_libexecdir}/polkit-1/polkit-agent-helper-1
 
-%attr(0700,root,root) %dir /var/lib/polkit-1/
-%dir /var/lib/polkit-1/localauthority
-%dir /var/lib/polkit-1/localauthority/10-vendor.d
-%dir /var/lib/polkit-1/localauthority/20-org.d
-%dir /var/lib/polkit-1/localauthority/30-site.d
-%dir /var/lib/polkit-1/localauthority/50-local.d
-%dir /var/lib/polkit-1/localauthority/90-mandatory.d
+%attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1/
+%dir %{_localstatedir}/lib/polkit-1/localauthority
+%dir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
+%dir %{_localstatedir}/lib/polkit-1/localauthority/20-org.d
+%dir %{_localstatedir}/lib/polkit-1/localauthority/30-site.d
+%dir %{_localstatedir}/lib/polkit-1/localauthority/50-local.d
+%dir %{_localstatedir}/lib/polkit-1/localauthority/90-mandatory.d
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-#%{_datadir}/gir-1.0/*.gir
+%{_datadir}/gir-1.0/*.gir
 %{_includedir}/*
 %{_bindir}/pk-example-frobnicate
 %{_datadir}/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
@@ -187,6 +178,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913
+- Update to git snapshot
+- Drop upstreamed patches
+- Turn on GObject introspection
+- Don't delete desktop_admin_r and desktop_user_r groups when
+  uninstalling polkit-desktop-policy
+
 * Fri Sep 11 2009 David Zeuthen <davidz at redhat.com> - 0.94-4
 - Add some patches from git master
 - Sort pkaction(1) output


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 19:25:45 -0000	1.4
+++ sources	13 Sep 2009 19:52:31 -0000	1.5
@@ -1 +1 @@
-5abc9f858e7b614ef41161db36d53915  polkit-0.94.tar.gz
+205463b529dd5c475883433515e5b668  polkit-0.95.git20090913.tar.gz



From rdieter at fedoraproject.org  Sun Sep 13 19:53:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 13 Sep 2009 19:53:34 +0000 (UTC)
Subject: rpms/xdg-utils/devel .cvsignore, 1.11, 1.12 sources, 1.10,
	1.11 xdg-utils-cvs_checkout.sh, 1.1, 1.2 xdg-utils.spec, 1.22, 1.23
Message-ID: <20090913195334.C138E11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27739

Modified Files:
	.cvsignore sources xdg-utils-cvs_checkout.sh xdg-utils.spec 
Log Message:
* Sun Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-11.20090913cvs
- 20090913cvs snapshot
- xdg-open in xdg-utils expects xprop to be available (#506857)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Aug 2009 03:11:05 -0000	1.11
+++ .cvsignore	13 Sep 2009 19:53:34 -0000	1.12
@@ -1 +1 @@
-xdg-utils-20090824cvs.tgz
+xdg-utils-20090913cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Aug 2009 03:11:05 -0000	1.10
+++ sources	13 Sep 2009 19:53:34 -0000	1.11
@@ -1 +1 @@
-78598c3e7ff5877577dd5c83ada1a925  xdg-utils-20090824cvs.tgz
+c4fd2aa002dbb61520db9462b233f2b3  xdg-utils-20090913cvs.tgz


Index: xdg-utils-cvs_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils-cvs_checkout.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xdg-utils-cvs_checkout.sh	21 Nov 2008 20:25:45 -0000	1.1
+++ xdg-utils-cvs_checkout.sh	13 Sep 2009 19:53:34 -0000	1.2
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 
+CVSUSER=:pserver:anonymous
+#CVSUSER=rdieter
 MODULE=$(basename $0 -cvs_checkout.sh)
 DATE=$(date +%Y%m%d)
 
@@ -8,7 +10,7 @@ set -x
 
 rm -rf $MODULE
 
-cvs -z3 -d:pserver:anonymous at cvs.freedesktop.org:/cvs/portland checkout -P portland/$MODULE 
+cvs -z3 -d$CVSUSER at cvs.freedesktop.org:/cvs/portland checkout -P portland/$MODULE 
 pushd portland
 tar czf ../$MODULE-${DATE}cvs.tgz $MODULE
 popd


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xdg-utils.spec	25 Aug 2009 03:11:05 -0000	1.22
+++ xdg-utils.spec	13 Sep 2009 19:53:34 -0000	1.23
@@ -1,10 +1,10 @@
 
-%define cvs 20090824cvs
+%define cvs 20090913cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 10.%{cvs}%{?dist}
+Release: 11.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -106,6 +106,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-11.20090913cvs
+- 20090913cvs snapshot
+- xdg-open in xdg-utils expects xprop to be available (#506857)
+
 * Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-10.20090824cvs
 - 20090824cvs snapshot
 



From davidz at fedoraproject.org  Sun Sep 13 19:54:33 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sun, 13 Sep 2009 19:54:33 +0000 (UTC)
Subject: rpms/polkit-gnome/devel .cvsignore, 1.4, 1.5 polkit-gnome.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20090913195433.E35C111C0099@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28051

Modified Files:
	.cvsignore polkit-gnome.spec sources 
Log Message:
* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913
- Update to git snapshot
- Turn on GObject introspection




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 19:26:04 -0000	1.4
+++ .cvsignore	13 Sep 2009 19:54:33 -0000	1.5
@@ -1,3 +1,4 @@
 polkit-gnome-0.92.tar.bz2
 polkit-gnome-0.93.tar.bz2
 polkit-gnome-0.94.tar.bz2
+polkit-gnome-0.95.git20090913.tar.bz2


Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- polkit-gnome.spec	3 Sep 2009 03:13:45 -0000	1.10
+++ polkit-gnome.spec	13 Sep 2009 19:54:33 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
-Version: 0.94
-Release: 4%{?dist}
+Version: 0.95
+Release: 0.git20090913%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
 BuildRequires: polkit-devel >= 0.94
@@ -67,12 +67,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/xdg/autostart/*
 %{_libexecdir}/*
 %{_libdir}/lib*.so.*
+%{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
+%{_datadir}/gir-1.0/*.gir
 
 %files docs
 %defattr(-,root,root,-)
@@ -80,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913
+- Update to git snapshot
+- Turn on GObject introspection
+
 * Wed Sep  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.94-4
 - Just remove the OnlyShowIn, it turns out everybody wants this
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 19:26:04 -0000	1.4
+++ sources	13 Sep 2009 19:54:33 -0000	1.5
@@ -1 +1 @@
-eebab8363a7b7c0516aca4f7b7cd7f7a  polkit-gnome-0.94.tar.bz2
+cc26b62d84350bd4bd5970f8e1c89f69  polkit-gnome-0.95.git20090913.tar.bz2



From davidz at fedoraproject.org  Sun Sep 13 20:29:40 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sun, 13 Sep 2009 20:29:40 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.11,1.12
Message-ID: <20090913202940.C5F3911C0099@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6270

Modified Files:
	polkit-gnome.spec 
Log Message:
* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.1
- Update BR




Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- polkit-gnome.spec	13 Sep 2009 19:54:33 -0000	1.11
+++ polkit-gnome.spec	13 Sep 2009 20:29:40 -0000	1.12
@@ -1,17 +1,20 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.95
-Release: 0.git20090913%{?dist}
+Release: 0.git20090913.1%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
-BuildRequires: polkit-devel >= 0.94
+BuildRequires: polkit-devel >= 0.95
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
-Requires: polkit >= 0.94
+BuildRequires: dbus-glib-devel
+BuildRequires: gobject-introspection-devel
+
+Requires: polkit >= 0.95
 
 %description
 polkit-gnome provides an authentication agent for PolicyKit
@@ -82,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.1
+- Update BR
+
 * Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913
 - Update to git snapshot
 - Turn on GObject introspection



From topdog at fedoraproject.org  Sun Sep 13 20:34:57 2009
From: topdog at fedoraproject.org (topdog)
Date: Sun, 13 Sep 2009 20:34:57 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/devel import.log, NONE,
	1.1 php-pecl-sphinx.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090913203457.DDBFD11C0099@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pecl-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pecl-sphinx.spec 
Log Message:
Sun Sep 13 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Initial cvs import




--- NEW FILE import.log ---
php-pecl-sphinx-1_0_0-2_fc11:HEAD:php-pecl-sphinx-1.0.0-2.fc11.src.rpm:1252873982


--- NEW FILE php-pecl-sphinx.spec ---
%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%{!?__pecl:		%{expand: %%global __pecl     %{_bindir}/pecl}}
%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name sphinx

Name:		php-pecl-sphinx
Version:	1.0.0
Release:	2%{?dist}
Summary:	PECL extension for Sphinx SQL full-text search engine
Group:		Development/Languages
License:	PHP
URL:		http://pecl.php.net/package/%{pecl_name}
Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libsphinxclient-devel php-pear
BuildRequires:	php-devel >= 5.1.3
Requires(post):	%{__pecl}
Requires(postun):	%{__pecl}
Provides:	php-pecl(%{pecl_name}) = %{version}

%if %{?php_zend_api}0
Requires:	php(zend-abi) = %{php_zend_api}
Requires:	php(api) = %{php_core_api}
%else
Requires:	php-api = %{php_apiver}
%endif


%description
This extension provides PHP bindings for libsphinxclient, 
client library for Sphinx the SQL full-text search engine.

%prep
%setup -q -c
[ -f package2.xml ] || %{__mv} package.xml package2.xml
%{__mv} package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml


%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}

%check
# simple module load test
cd %{pecl_name}-%{version}
php --no-php-ini \
    --define extension_dir=modules \
    --define extension=%{pecl_name}.so \
    --modules | grep %{pecl_name}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot} INSTALL="install -p"

%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so
EOF

%{__mkdir_p} %{buildroot}%{pecl_xmldir}
%{__install} -p -m 644 %{pecl_name}.xml %{buildroot}%{pecl_xmldir}/%{name}.xml


%clean
%{__rm} -rf %{buildroot}

%if 0%{?pecl_install:1}
%post
%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
%endif


%if 0%{?pecl_uninstall:1}
%postun
if [ $1 -eq 0 ]; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
%endif


%files
%defattr(-,root,root,-)
%doc %{pecl_name}-%{version}/CREDITS
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so
%{pecl_xmldir}/%{name}.xml


%changelog
* Sun Sep 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Add checks
- Add php-devel version requirement

* Mon Aug 05 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:18:56 -0000	1.1
+++ .cvsignore	13 Sep 2009 20:34:57 -0000	1.2
@@ -0,0 +1 @@
+sphinx-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:18:56 -0000	1.1
+++ sources	13 Sep 2009 20:34:57 -0000	1.2
@@ -0,0 +1 @@
+d5bd7c00a8e036d7f82e98ebb0d9b210  sphinx-1.0.0.tgz



From topdog at fedoraproject.org  Sun Sep 13 20:38:01 2009
From: topdog at fedoraproject.org (topdog)
Date: Sun, 13 Sep 2009 20:38:01 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/F-12 import.log, NONE, 1.1 php-pecl-sphinx.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090913203801.9EE4111C0099@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pecl-sphinx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8698/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pecl-sphinx.spec 
Log Message:
Sun Sep 13 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Initial cvs import




--- NEW FILE import.log ---
php-pecl-sphinx-1_0_0-2_fc11:F-12:php-pecl-sphinx-1.0.0-2.fc11.src.rpm:1252874245


--- NEW FILE php-pecl-sphinx.spec ---
%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%{!?__pecl:		%{expand: %%global __pecl     %{_bindir}/pecl}}
%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name sphinx

Name:		php-pecl-sphinx
Version:	1.0.0
Release:	2%{?dist}
Summary:	PECL extension for Sphinx SQL full-text search engine
Group:		Development/Languages
License:	PHP
URL:		http://pecl.php.net/package/%{pecl_name}
Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libsphinxclient-devel php-pear
BuildRequires:	php-devel >= 5.1.3
Requires(post):	%{__pecl}
Requires(postun):	%{__pecl}
Provides:	php-pecl(%{pecl_name}) = %{version}

%if %{?php_zend_api}0
Requires:	php(zend-abi) = %{php_zend_api}
Requires:	php(api) = %{php_core_api}
%else
Requires:	php-api = %{php_apiver}
%endif


%description
This extension provides PHP bindings for libsphinxclient, 
client library for Sphinx the SQL full-text search engine.

%prep
%setup -q -c
[ -f package2.xml ] || %{__mv} package.xml package2.xml
%{__mv} package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml


%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}

%check
# simple module load test
cd %{pecl_name}-%{version}
php --no-php-ini \
    --define extension_dir=modules \
    --define extension=%{pecl_name}.so \
    --modules | grep %{pecl_name}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot} INSTALL="install -p"

%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so
EOF

%{__mkdir_p} %{buildroot}%{pecl_xmldir}
%{__install} -p -m 644 %{pecl_name}.xml %{buildroot}%{pecl_xmldir}/%{name}.xml


%clean
%{__rm} -rf %{buildroot}

%if 0%{?pecl_install:1}
%post
%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
%endif


%if 0%{?pecl_uninstall:1}
%postun
if [ $1 -eq 0 ]; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
%endif


%files
%defattr(-,root,root,-)
%doc %{pecl_name}-%{version}/CREDITS
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so
%{pecl_xmldir}/%{name}.xml


%changelog
* Sun Sep 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Add checks
- Add php-devel version requirement

* Mon Aug 05 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:18:56 -0000	1.1
+++ .cvsignore	13 Sep 2009 20:38:01 -0000	1.2
@@ -0,0 +1 @@
+sphinx-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:18:56 -0000	1.1
+++ sources	13 Sep 2009 20:38:01 -0000	1.2
@@ -0,0 +1 @@
+d5bd7c00a8e036d7f82e98ebb0d9b210  sphinx-1.0.0.tgz



From davidz at fedoraproject.org  Sun Sep 13 20:40:34 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sun, 13 Sep 2009 20:40:34 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.12,1.13
Message-ID: <20090913204034.D9AE511C0489@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9580

Modified Files:
	polkit-gnome.spec 
Log Message:
* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.2
- Update BR




Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- polkit-gnome.spec	13 Sep 2009 20:29:40 -0000	1.12
+++ polkit-gnome.spec	13 Sep 2009 20:40:34 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.95
-Release: 0.git20090913.1%{?dist}
+Release: 0.git20090913.2%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -13,6 +13,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: intltool
 BuildRequires: dbus-glib-devel
 BuildRequires: gobject-introspection-devel
+BuildRequires: gir-repository-devel
 
 Requires: polkit >= 0.95
 
@@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.2
+- Update BR
+
 * Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.1
 - Update BR
 



From topdog at fedoraproject.org  Sun Sep 13 20:43:10 2009
From: topdog at fedoraproject.org (topdog)
Date: Sun, 13 Sep 2009 20:43:10 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/F-11 import.log, NONE, 1.1 php-pecl-sphinx.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090913204310.E271A11C0099@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pecl-sphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10329/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pecl-sphinx.spec 
Log Message:
Sun Sep 13 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Initial cvs import




--- NEW FILE import.log ---
php-pecl-sphinx-1_0_0-2_fc11:F-11:php-pecl-sphinx-1.0.0-2.fc11.src.rpm:1252874425


--- NEW FILE php-pecl-sphinx.spec ---
%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%{!?__pecl:		%{expand: %%global __pecl     %{_bindir}/pecl}}
%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name sphinx

Name:		php-pecl-sphinx
Version:	1.0.0
Release:	2%{?dist}
Summary:	PECL extension for Sphinx SQL full-text search engine
Group:		Development/Languages
License:	PHP
URL:		http://pecl.php.net/package/%{pecl_name}
Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libsphinxclient-devel php-pear
BuildRequires:	php-devel >= 5.1.3
Requires(post):	%{__pecl}
Requires(postun):	%{__pecl}
Provides:	php-pecl(%{pecl_name}) = %{version}

%if %{?php_zend_api}0
Requires:	php(zend-abi) = %{php_zend_api}
Requires:	php(api) = %{php_core_api}
%else
Requires:	php-api = %{php_apiver}
%endif


%description
This extension provides PHP bindings for libsphinxclient, 
client library for Sphinx the SQL full-text search engine.

%prep
%setup -q -c
[ -f package2.xml ] || %{__mv} package.xml package2.xml
%{__mv} package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml


%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}

%check
# simple module load test
cd %{pecl_name}-%{version}
php --no-php-ini \
    --define extension_dir=modules \
    --define extension=%{pecl_name}.so \
    --modules | grep %{pecl_name}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot} INSTALL="install -p"

%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so
EOF

%{__mkdir_p} %{buildroot}%{pecl_xmldir}
%{__install} -p -m 644 %{pecl_name}.xml %{buildroot}%{pecl_xmldir}/%{name}.xml


%clean
%{__rm} -rf %{buildroot}

%if 0%{?pecl_install:1}
%post
%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
%endif


%if 0%{?pecl_uninstall:1}
%postun
if [ $1 -eq 0 ]; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
%endif


%files
%defattr(-,root,root,-)
%doc %{pecl_name}-%{version}/CREDITS
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so
%{pecl_xmldir}/%{name}.xml


%changelog
* Sun Sep 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Add checks
- Add php-devel version requirement

* Mon Aug 05 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:18:56 -0000	1.1
+++ .cvsignore	13 Sep 2009 20:43:10 -0000	1.2
@@ -0,0 +1 @@
+sphinx-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:18:56 -0000	1.1
+++ sources	13 Sep 2009 20:43:10 -0000	1.2
@@ -0,0 +1 @@
+d5bd7c00a8e036d7f82e98ebb0d9b210  sphinx-1.0.0.tgz



From pfj at fedoraproject.org  Sun Sep 13 20:47:40 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 13 Sep 2009 20:47:40 +0000 (UTC)
Subject: rpms/monodevelop-debugger-mdb/devel .cvsignore, 1.2, 1.3 import.log,
	1.1, 1.2 monodevelop-debugger-mdb.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090913204740.C5BB811C0099@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11811/devel

Modified Files:
	.cvsignore import.log monodevelop-debugger-mdb.spec sources 
Log Message:

Update to 2.2 beta 1 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jul 2009 21:45:44 -0000	1.2
+++ .cvsignore	13 Sep 2009 20:47:40 -0000	1.3
@@ -1 +1 @@
-monodevelop-debugger-mdb-2.0.tar.bz2
+monodevelop-debugger-mdb-2.1.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Jul 2009 21:45:44 -0000	1.1
+++ import.log	13 Sep 2009 20:47:40 -0000	1.2
@@ -1 +1,2 @@
 monodevelop-debugger-mdb-2_0-1_fc10:HEAD:monodevelop-debugger-mdb-2.0-1.fc10.src.rpm:1246571076
+monodevelop-debugger-mdb-2_1_0-1_fc12:HEAD:monodevelop-debugger-mdb-2.1.0-1.fc12.src.rpm:1252874834


Index: monodevelop-debugger-mdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/monodevelop-debugger-mdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- monodevelop-debugger-mdb.spec	25 Jul 2009 15:03:28 -0000	1.2
+++ monodevelop-debugger-mdb.spec	13 Sep 2009 20:47:40 -0000	1.3
@@ -3,16 +3,16 @@
 
 Summary:        MonoDevelop Debugger Addin
 Name:           monodevelop-debugger-mdb
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 License:        MIT
 Group:          Development/Tools
-Source:         http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2
+Source:         http://www.monodevelop.com/Downloads/%{name}-%{version}.tar.bz2
 URL:            http://www.monodevelop.com
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)  
-BuildRequires:  monodevelop = %{version} mono-devel mono-debugger-devel monodevelop-devel mono-addins-devel
+BuildRequires:  monodevelop = %{version} mono-devel >= 2.4 mono-debugger-devel >= 2.4 monodevelop-devel >= 2.1 mono-addins-devel
 Requires:       mono-debugger >= 2.0
-ExclusiveArch:  %ix86 x86_64
+ExclusiveArch:  %ix86
 
 %description
 Mono Debugger Addin for MonoDevelop. 
@@ -58,14 +58,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{assembly_path}DebuggerClient.dll*
 %{assembly_path}DebuggerServer.exe*
+%{assembly_path}AspNetDebuggerClient.dll*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/mono.debugging.backend.mdb.pc
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Sep 13 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.0-0
+- Bump to 2.2 beta 1 mdb
+- Added AspNetDebugger dll
+
+* Fri Jul 03 2009 Paul Lange <palango at gmx.de> - 2.0-2
+- Fix build
 
 * Thu Jun 04 2009 Mauricio Henriquez <buhochileno at gmail.com> - 2.0-1
 - Initial packaging with help by Ryan Bair


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 21:45:44 -0000	1.2
+++ sources	13 Sep 2009 20:47:40 -0000	1.3
@@ -1 +1 @@
-a63a3f9cf26dcdb1dfc6b6e5f31cb8a4  monodevelop-debugger-mdb-2.0.tar.bz2
+446b9a0498313016a26af2fd7e96d0bf  monodevelop-debugger-mdb-2.1.0.tar.bz2



From anyremote at fedoraproject.org  Sun Sep 13 20:49:22 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 13 Sep 2009 20:49:22 +0000 (UTC)
Subject: rpms/anyremote/F-11 .cvsignore, 1.18, 1.19 anyremote.spec, 1.19,
	1.20 import.log, 1.12, 1.13 sources, 1.18, 1.19
Message-ID: <20090913204922.D0A7F11C0099@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12695/F-11

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Mar 2009 19:01:55 -0000	1.18
+++ .cvsignore	13 Sep 2009 20:49:22 -0000	1.19
@@ -1 +1 @@
-anyremote-4.18.1.tar.gz
+anyremote-5.0.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-11/anyremote.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- anyremote.spec	30 Mar 2009 19:01:55 -0000	1.19
+++ anyremote.spec	13 Sep 2009 20:49:22 -0000	1.20
@@ -1,13 +1,13 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.18.1
+Version: 5.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-data >= 4.18.1
-BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
+Requires: bc,dbus-glib,anyremote-data >= 5.0
+BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel, glib2-devel >= 2.18, dbus-devel >= 1.2.4, dbus-glib-devel >= 0.76
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -60,6 +60,10 @@ Documentation for anyRemote
 
 %changelog
 
+* Mon Sep 14 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.0
+- anyRemote was rewritten using multithreading and GLib.
+  Native D-BUS support. Format of configuration file was significantly changed.
+
 * Mon Mar 30 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.18.1-1
 - Add GuiAppModes tag to configuration files.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-11/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	30 Mar 2009 19:01:55 -0000	1.12
+++ import.log	13 Sep 2009 20:49:22 -0000	1.13
@@ -10,3 +10,4 @@ anyremote-4_16-1_fc10:HEAD:anyremote-4.1
 anyremote-4_17-1_fc10:HEAD:anyremote-4.17-1.fc10.src.rpm:1233864361
 anyremote-4_18-1_fc10:HEAD:anyremote-4.18-1.fc10.src.rpm:1237404993
 anyremote-4_18_1-1_fc10:HEAD:anyremote-4.18.1-1.fc10.src.rpm:1238436109
+anyremote-5_0-1_fc11:F-11:anyremote-5.0-1.fc11.src.rpm:1252874953


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	30 Mar 2009 19:01:55 -0000	1.18
+++ sources	13 Sep 2009 20:49:22 -0000	1.19
@@ -1 +1 @@
-005e3bd09a5a982cae68a53549235003  anyremote-4.18.1.tar.gz
+c7e2def41a920d826866b4de2b54a1ad  anyremote-5.0.tar.gz



From anyremote at fedoraproject.org  Sun Sep 13 20:49:43 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 13 Sep 2009 20:49:43 +0000 (UTC)
Subject: rpms/anyremote/F-10 .cvsignore, 1.18, 1.19 anyremote.spec, 1.18,
	1.19 import.log, 1.12, 1.13 sources, 1.18, 1.19
Message-ID: <20090913204943.CF89311C0099@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12876/F-10

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Mar 2009 19:01:37 -0000	1.18
+++ .cvsignore	13 Sep 2009 20:49:43 -0000	1.19
@@ -1 +1 @@
-anyremote-4.18.1.tar.gz
+anyremote-5.0.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/anyremote.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- anyremote.spec	30 Mar 2009 19:01:37 -0000	1.18
+++ anyremote.spec	13 Sep 2009 20:49:43 -0000	1.19
@@ -1,13 +1,13 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.18.1
+Version: 5.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-data >= 4.18.1
-BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
+Requires: bc,dbus-glib,anyremote-data >= 5.0
+BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel, glib2-devel >= 2.18, dbus-devel >= 1.2.4, dbus-glib-devel >= 0.76
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -60,6 +60,10 @@ Documentation for anyRemote
 
 %changelog
 
+* Mon Sep 14 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.0
+- anyRemote was rewritten using multithreading and GLib.
+  Native D-BUS support. Format of configuration file was significantly changed.
+
 * Mon Mar 30 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.18.1-1
 - Add GuiAppModes tag to configuration files.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	30 Mar 2009 19:01:37 -0000	1.12
+++ import.log	13 Sep 2009 20:49:43 -0000	1.13
@@ -10,3 +10,4 @@ anyremote-4_16-1_fc10:F-10:anyremote-4.1
 anyremote-4_17-1_fc10:F-10:anyremote-4.17-1.fc10.src.rpm:1233864337
 anyremote-4_18-1_fc10:F-10:anyremote-4.18-1.fc10.src.rpm:1237404991
 anyremote-4_18_1-1_fc10:F-10:anyremote-4.18.1-1.fc10.src.rpm:1238436092
+anyremote-5_0-1_fc11:F-10:anyremote-5.0-1.fc11.src.rpm:1252874973


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	30 Mar 2009 19:01:37 -0000	1.18
+++ sources	13 Sep 2009 20:49:43 -0000	1.19
@@ -1 +1 @@
-005e3bd09a5a982cae68a53549235003  anyremote-4.18.1.tar.gz
+c7e2def41a920d826866b4de2b54a1ad  anyremote-5.0.tar.gz



From anyremote at fedoraproject.org  Sun Sep 13 20:49:56 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 13 Sep 2009 20:49:56 +0000 (UTC)
Subject: rpms/anyremote/devel .cvsignore, 1.18, 1.19 anyremote.spec, 1.20,
	1.21 import.log, 1.12, 1.13 sources, 1.18, 1.19
Message-ID: <20090913204956.F0C1E11C0099@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12959/devel

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Mar 2009 19:01:55 -0000	1.18
+++ .cvsignore	13 Sep 2009 20:49:56 -0000	1.19
@@ -1 +1 @@
-anyremote-4.18.1.tar.gz
+anyremote-5.0.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- anyremote.spec	24 Jul 2009 16:55:40 -0000	1.20
+++ anyremote.spec	13 Sep 2009 20:49:56 -0000	1.21
@@ -1,13 +1,13 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.18.1
-Release: 2%{?dist}
+Version: 5.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-data >= 4.18.1
-BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
+Requires: bc,dbus-glib,anyremote-data >= 5.0
+BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel, glib2-devel >= 2.18, dbus-devel >= 1.2.4, dbus-glib-devel >= 0.76
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -59,9 +59,10 @@ Documentation for anyRemote
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.18.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon Sep 14 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.0
+- anyRemote was rewritten using multithreading and GLib.
+  Native D-BUS support. Format of configuration file was significantly changed.
 
 * Mon Mar 30 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.18.1-1
 - Add GuiAppModes tag to configuration files.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	30 Mar 2009 19:01:55 -0000	1.12
+++ import.log	13 Sep 2009 20:49:56 -0000	1.13
@@ -10,3 +10,4 @@ anyremote-4_16-1_fc10:HEAD:anyremote-4.1
 anyremote-4_17-1_fc10:HEAD:anyremote-4.17-1.fc10.src.rpm:1233864361
 anyremote-4_18-1_fc10:HEAD:anyremote-4.18-1.fc10.src.rpm:1237404993
 anyremote-4_18_1-1_fc10:HEAD:anyremote-4.18.1-1.fc10.src.rpm:1238436109
+anyremote-5_0-1_fc11:HEAD:anyremote-5.0-1.fc11.src.rpm:1252874976


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	30 Mar 2009 19:01:55 -0000	1.18
+++ sources	13 Sep 2009 20:49:56 -0000	1.19
@@ -1 +1 @@
-005e3bd09a5a982cae68a53549235003  anyremote-4.18.1.tar.gz
+c7e2def41a920d826866b4de2b54a1ad  anyremote-5.0.tar.gz



From topdog at fedoraproject.org  Sun Sep 13 21:08:12 2009
From: topdog at fedoraproject.org (topdog)
Date: Sun, 13 Sep 2009 21:08:12 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/F-10 import.log, NONE, 1.1 php-pecl-sphinx.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090913210812.0B55D11C0099@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pecl-sphinx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26005/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pecl-sphinx.spec 
Log Message:
Sun Sep 13 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Initial cvs import




--- NEW FILE import.log ---
php-pecl-sphinx-1_0_0-2_fc11:F-10:php-pecl-sphinx-1.0.0-2.fc11.src.rpm:1252874727


--- NEW FILE php-pecl-sphinx.spec ---
%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%{!?__pecl:		%{expand: %%global __pecl     %{_bindir}/pecl}}
%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name sphinx

Name:		php-pecl-sphinx
Version:	1.0.0
Release:	2%{?dist}
Summary:	PECL extension for Sphinx SQL full-text search engine
Group:		Development/Languages
License:	PHP
URL:		http://pecl.php.net/package/%{pecl_name}
Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libsphinxclient-devel php-pear
BuildRequires:	php-devel >= 5.1.3
Requires(post):	%{__pecl}
Requires(postun):	%{__pecl}
Provides:	php-pecl(%{pecl_name}) = %{version}

%if %{?php_zend_api}0
Requires:	php(zend-abi) = %{php_zend_api}
Requires:	php(api) = %{php_core_api}
%else
Requires:	php-api = %{php_apiver}
%endif


%description
This extension provides PHP bindings for libsphinxclient, 
client library for Sphinx the SQL full-text search engine.

%prep
%setup -q -c
[ -f package2.xml ] || %{__mv} package.xml package2.xml
%{__mv} package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml


%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}

%check
# simple module load test
cd %{pecl_name}-%{version}
php --no-php-ini \
    --define extension_dir=modules \
    --define extension=%{pecl_name}.so \
    --modules | grep %{pecl_name}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot} INSTALL="install -p"

%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so
EOF

%{__mkdir_p} %{buildroot}%{pecl_xmldir}
%{__install} -p -m 644 %{pecl_name}.xml %{buildroot}%{pecl_xmldir}/%{name}.xml


%clean
%{__rm} -rf %{buildroot}

%if 0%{?pecl_install:1}
%post
%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
%endif


%if 0%{?pecl_uninstall:1}
%postun
if [ $1 -eq 0 ]; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
%endif


%files
%defattr(-,root,root,-)
%doc %{pecl_name}-%{version}/CREDITS
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so
%{pecl_xmldir}/%{name}.xml


%changelog
* Sun Sep 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Add checks
- Add php-devel version requirement

* Mon Aug 05 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:18:56 -0000	1.1
+++ .cvsignore	13 Sep 2009 21:08:10 -0000	1.2
@@ -0,0 +1 @@
+sphinx-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:18:56 -0000	1.1
+++ sources	13 Sep 2009 21:08:10 -0000	1.2
@@ -0,0 +1 @@
+d5bd7c00a8e036d7f82e98ebb0d9b210  sphinx-1.0.0.tgz



From topdog at fedoraproject.org  Sun Sep 13 21:13:52 2009
From: topdog at fedoraproject.org (topdog)
Date: Sun, 13 Sep 2009 21:13:52 +0000 (UTC)
Subject: rpms/php-pecl-sphinx/EL-5 import.log, NONE, 1.1 php-pecl-sphinx.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090913211352.77C0A11C0099@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pecl-sphinx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28598/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pecl-sphinx.spec 
Log Message:
Sun Sep 13 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Initial cvs import




--- NEW FILE import.log ---
php-pecl-sphinx-1_0_0-2_fc11:EL-5:php-pecl-sphinx-1.0.0-2.fc11.src.rpm:1252876367


--- NEW FILE php-pecl-sphinx.spec ---
%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%{!?__pecl:		%{expand: %%global __pecl     %{_bindir}/pecl}}
%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name sphinx

Name:		php-pecl-sphinx
Version:	1.0.0
Release:	2%{?dist}
Summary:	PECL extension for Sphinx SQL full-text search engine
Group:		Development/Languages
License:	PHP
URL:		http://pecl.php.net/package/%{pecl_name}
Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libsphinxclient-devel php-pear
BuildRequires:	php-devel >= 5.1.3
Requires(post):	%{__pecl}
Requires(postun):	%{__pecl}
Provides:	php-pecl(%{pecl_name}) = %{version}

%if %{?php_zend_api}0
Requires:	php(zend-abi) = %{php_zend_api}
Requires:	php(api) = %{php_core_api}
%else
Requires:	php-api = %{php_apiver}
%endif


%description
This extension provides PHP bindings for libsphinxclient, 
client library for Sphinx the SQL full-text search engine.

%prep
%setup -q -c
[ -f package2.xml ] || %{__mv} package.xml package2.xml
%{__mv} package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml


%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}

%check
# simple module load test
cd %{pecl_name}-%{version}
php --no-php-ini \
    --define extension_dir=modules \
    --define extension=%{pecl_name}.so \
    --modules | grep %{pecl_name}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot} INSTALL="install -p"

%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so
EOF

%{__mkdir_p} %{buildroot}%{pecl_xmldir}
%{__install} -p -m 644 %{pecl_name}.xml %{buildroot}%{pecl_xmldir}/%{name}.xml


%clean
%{__rm} -rf %{buildroot}

%if 0%{?pecl_install:1}
%post
%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
%endif


%if 0%{?pecl_uninstall:1}
%postun
if [ $1 -eq 0 ]; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
%endif


%files
%defattr(-,root,root,-)
%doc %{pecl_name}-%{version}/CREDITS
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so
%{pecl_xmldir}/%{name}.xml


%changelog
* Sun Sep 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-2
- Add checks
- Add php-devel version requirement

* Mon Aug 05 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:18:56 -0000	1.1
+++ .cvsignore	13 Sep 2009 21:13:51 -0000	1.2
@@ -0,0 +1 @@
+sphinx-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-sphinx/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:18:56 -0000	1.1
+++ sources	13 Sep 2009 21:13:51 -0000	1.2
@@ -0,0 +1 @@
+d5bd7c00a8e036d7f82e98ebb0d9b210  sphinx-1.0.0.tgz



From pkgdb at fedoraproject.org  Sun Sep 13 21:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:32:54 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213254.4E00A10F867@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora devel) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:32:55 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213255.710E110F886@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora devel) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:32:59 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213259.639D510F895@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora devel) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:32:59 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213259.99D4010F89A@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora devel) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:01 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213302.1A7E410F89F@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:02 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213302.BBAE610F8A3@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:04 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213304.7723F10F8A8@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:07 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213307.35DBB10F8AA@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:19 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213319.48CE310F883@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:21 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213321.9425410F8B1@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:24 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213325.1E7ED10F8B4@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:26 +0000
Subject: [pkgdb] gnustep-make ownership updated
Message-ID: <20090913213326.4F7AB10F8B7@bastion2.fedora.phx.redhat.com>

Package gnustep-make in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:34 +0000
Subject: [pkgdb] gnustep-make (un)retirement
Message-ID: <20090913213334.43F5210F8B8@bastion2.fedora.phx.redhat.com>

Package gnustep-make in Fedora EPEL 4 has been retired by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:47 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213347.E860410F89D@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:49 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213349.4EBD810F8BC@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:50 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213350.52C1110F8BF@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:52 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213352.7B55910F8C1@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:53 +0000
Subject: [pkgdb] gnustep-make (un)retirement
Message-ID: <20090913213353.A48AD10F8C4@bastion2.fedora.phx.redhat.com>

Package gnustep-make in Fedora EPEL 5 has been retired by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:33:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:33:53 +0000
Subject: [pkgdb] gnustep-make ownership updated
Message-ID: <20090913213353.9B83410F8A3@bastion2.fedora.phx.redhat.com>

Package gnustep-make in Fedora EPEL 5 is now owned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:04 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213404.905D210F8A5@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora 9) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:06 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213406.80BBD10F8C7@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora 9) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:07 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213407.9F7F910F8CA@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora 9) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:08 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213409.134EB10F8CE@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora 9) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:15 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213415.D95F610F8AA@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:17 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213417.3A23510F8D0@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:17 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213417.B92F610F8D3@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:19 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213419.41A6910F8D8@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:26 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213426.64D4210F883@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora 11) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:27 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213428.24C2A10F8DB@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on gnustep-make (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:30 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213430.E54E710F8DE@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora 11) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:33 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213433.BAE1710F8EE@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora 11) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:30 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213431.0EC9510F8E1@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on gnustep-make (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:34 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213434.625C410F8FA@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on gnustep-make (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:36 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213437.3D24110F8B3@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora 11) to Approved for s4504kr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:34:38 +0000
Subject: [pkgdb] gnustep-make had acl change status
Message-ID: <20090913213438.A014310F8FC@bastion2.fedora.phx.redhat.com>

athimm has set the approveacls acl on gnustep-make (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From pkgdb at fedoraproject.org  Sun Sep 13 21:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:35:42 +0000
Subject: [pkgdb] freenx (un)retirement
Message-ID: <20090913213542.6B8A710F89F@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora devel has been retired by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From pkgdb at fedoraproject.org  Sun Sep 13 21:35:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:35:54 +0000
Subject: [pkgdb] freenx ownership updated
Message-ID: <20090913213554.ED3D110F8A4@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora 7 is now owned by limb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From pkgdb at fedoraproject.org  Sun Sep 13 21:35:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:35:54 +0000
Subject: [pkgdb] freenx (un)retirement
Message-ID: <20090913213555.0861410F8B4@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora 7 has been retired by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From pkgdb at fedoraproject.org  Sun Sep 13 21:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:36:03 +0000
Subject: [pkgdb] freenx ownership updated
Message-ID: <20090913213603.7E30B10F8B8@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora 8 is now owned by limb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From pkgdb at fedoraproject.org  Sun Sep 13 21:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:36:03 +0000
Subject: [pkgdb] freenx (un)retirement
Message-ID: <20090913213603.867E510F8BC@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora 8 has been retired by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From pkgdb at fedoraproject.org  Sun Sep 13 21:36:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:36:05 +0000
Subject: [pkgdb] freenx ownership updated
Message-ID: <20090913213605.6C29710F8BF@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora 9 is now owned by limb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From pkgdb at fedoraproject.org  Sun Sep 13 21:36:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Sep 2009 21:36:05 +0000
Subject: [pkgdb] freenx (un)retirement
Message-ID: <20090913213605.8E9EF10F8C0@bastion2.fedora.phx.redhat.com>

Package freenx in Fedora 9 has been retired by athimm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From scop at fedoraproject.org  Sun Sep 13 22:15:38 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 13 Sep 2009 22:15:38 +0000 (UTC)
Subject: rpms/rpmlint/devel .cvsignore, 1.25,
	1.26 rpmlint-CHANGES.package.old, 
	1.2, 1.3 rpmlint.config, 1.36, 1.37 rpmlint.spec, 1.68,
	1.69 sources, 1.25, 1.26
Message-ID: <20090913221538.3411911C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27512

Modified Files:
	.cvsignore rpmlint-CHANGES.package.old rpmlint.config 
	rpmlint.spec sources 
Log Message:
* Mon Sep 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.91-1
- Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630.
- Add dependencies on gzip, bzip2, and xz.
- Sync Fedora license list with Wiki revision 1.49.
- Move pre-2008 %changelog entries to CHANGES.package.old.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	29 Jun 2009 15:36:38 -0000	1.25
+++ .cvsignore	13 Sep 2009 22:15:35 -0000	1.26
@@ -1 +1 @@
-rpmlint-0.90.tar.bz2
+rpmlint-0.91.tar.bz2


Index: rpmlint-CHANGES.package.old
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint-CHANGES.package.old,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpmlint-CHANGES.package.old	27 May 2008 16:41:44 -0000	1.2
+++ rpmlint-CHANGES.package.old	13 Sep 2009 22:15:35 -0000	1.3
@@ -1,16 +1,55 @@
-* Sun Oct 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-2
+* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-2
+- Remove leftover "Affero GPL" from last license list sync (Todd Zullinger).
+
+* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-1
+- 0.82, fixes #362441, #388881, #399871, #409941.
+- Sync Fedora license list with Revision 0.61 (Wiki rev 98).
+
+* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
+- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
+
+* Mon Sep  3 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skytt? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-3
+- Sync Fedora license list with Wiki rev 68.
+- Move pre-2006 changelog entries to CHANGES.package.old.
+
+* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
+- new fedora licensing scheme
+
+* Thu May 31 2007 Ville Skytt? <ville.skytta at iki.fi>
+- Filter hardcoded-library-path errors for /lib/udev.
+
+* Thu Apr 12 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-1
+- 0.80, fixes #227389, #228645, #233795.
+- Accept "Redistributable, no modification permitted" as a valid license.
+- Filter messages about doc file dependencies on /bin/sh.
+- Add missing dependency on file.
+
+* Fri Feb  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.79-1
+- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116,
+  #222585, and #226879.
+- Accept *.elX disttags in default config.
+
+* Sun Oct 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-2
 - Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
 - Filter messages about gpg-pubkeys for now.
 
-* Sun Sep 24 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-1
+* Sun Sep 24 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-1
 - 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
 - /etc/profile.d/* filtering no longer needed.
 
-* Sat Sep 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-2
+* Sat Sep 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-2
 - Filter false positives for /etc/profile.d/* file modes.
 - Ship *.pyc and *.pyo as usual.
 
-* Thu Jun 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-1
+* Thu Jun 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-1
 - 0.77, fixes #194466, #195962, #196008, #196985.
 - Make "disttag" configurable using the DistRegex config file option.
 - Sync standard users and groups with the FC setup package.
@@ -20,28 +59,28 @@
   the GROUPS file shipped with rpm).
 - Allow /usr/libexec, fixes #195992.
 
-* Tue Apr 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.76-1
+* Tue Apr 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.76-1
 - 0.76.
 
-* Mon Mar 27 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Mar 27 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Don't pass -T to objdump for *.debug files (#185227).
 - lib64 library path fixes (#185228).
 
-* Wed Mar 15 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Mar 15 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Accept zlib License (#185501).
 
-* Tue Feb 28 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Feb 28 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Accept Ruby License (#183384) and SIL Open Font License (#176405).
 
-* Sat Feb 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.75-1
+* Sat Feb 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 
-* Tue Jan 17 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.71-3
+* Tue Jan 17 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.71-3
 - Sync with upstream CVS as of 2006-01-15, includes improved versions of
   most of the earlier patches.
 - Add dependency on binutils.
 
-* Sun Nov 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-2
+* Sun Nov 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-2
 - Take file based dependencies into account in dangling symlink checks
   (completes the fix for #165839).
 - Skip some checks for binaries not understood by objdump (#165173).
@@ -50,31 +89,31 @@
 - Import Enrico's latest DocFilesCheck (with some local tweaks).
 - Use rm instead of %%exclude.
 
-* Wed Nov 16 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Nov 16 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Add DocFilesCheck from Enrico Scholz.
 
-* Sat Sep  3 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Sep  3 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Improve accuracy of doc, info and games path regexps.
 - Improve error message when invoked on non-rpm files.
 - Filter more Mandriva specific warnings.
 
-* Sat Aug 13 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Aug 13 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Add dangling symlink exceptions tuned for Fedora to default config
   (partially fixes #165839).
 
-* Wed Aug 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-1
+* Wed Aug 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-1
 - 0.71, confmsg patch and bits from initvars patch applied upstream.
 - Filter out Mandriva-specific errors about missing locales-* deps (#165457).
 - Patch to not warn about non-empty *.bs (in Perl packages).
 - Patch to clarify PreReq explanation, make it a warning instead of an error.
 - Patch to warn about use of BuildPreReq.
 
-* Thu Jul  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-4
+* Thu Jul  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-4
 - Fix false "positives" from libtool archives confused as scripts,
   non-executable scripts installed in docs, FE disttags, unsuccessfully
   expanded shell variables and quotation in init scripts.
 
-* Mon Jun 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-3
+* Mon Jun 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-3
 - 0.70, use sed instead of perl during build.
 - Default configuration improvements: allow Development/Debug group (for
   debuginfo packages), filter out errors/warnings about non-indexed jars,
@@ -84,10 +123,10 @@
 - Patch to warn about services that default to enabled after "chkconfig add",
   not the other way around.
 
-* Thu May 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-3
+* Thu May 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-3
 - Filter out more not-that-useful messages in the default config.
 
-* Sat Apr 16 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-2
+* Sat Apr 16 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-2
 - 0.69.
 - Simplify bash-completion snippet installation, remove triggers.
 - Default configuration improvements: filter messages about missing packager,
@@ -97,99 +136,99 @@
 - Convert docs to UTF-8.
 - Improve summary.
 
-* Sun Mar 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.68-2
+* Sun Mar 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.68-2
 - 0.68, siteperl patch applied upstream.
 - Fix "no-dependency-on" filtering in default config.
 - Add LaTeX Project Public License to default config.
 - Remove upstream-only %%changelog entries.
 
-* Sun Feb 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.67-1
+* Sun Feb 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.67-1
 - 0.67.
 - Patch to catch more site_perl directories.
 - Default config improvements: filter Distribution and Vendor warnings,
   use empty string instead of None for release extension (fixes -i).
 
-* Sat Jan 29 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.65-1
+* Sat Jan 29 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.65-1
 - Update to 0.65.
 
-* Sat Jan  1 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.64-1
+* Sat Jan  1 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.64-1
 - Update to 0.64.
 - Default config tweaks: don't mandate Epochs nor "fdr" in Release.
 
-* Tue Oct 19 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
+* Tue Oct 19 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
 - Requires cpio (bug 2169).
 
-* Sun Oct  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
+* Sun Oct  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
 - Update to 0.61.
 
-* Mon Aug 16 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
+* Mon Aug 16 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
 - Update to 0.60.
 
-* Mon May  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
+* Mon May  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
 - Update to 0.59.
 
-* Sun Feb 22 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
+* Sun Feb 22 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
 - Update to 0.57.1.
 
-* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
+* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
 - Update to 0.56.
 
-* Mon Feb  2 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
+* Mon Feb  2 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
 - Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).
 
-* Sun Feb  1 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
+* Sun Feb  1 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
 - Add back %%ghost handling of not-installed compiled versions of *.py.
 
-* Fri Jan 30 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
+* Fri Jan 30 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
 - Update to 0.55.
 - Spec cleanups.
 
-* Tue Dec 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
+* Tue Dec 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
 - Update to 0.53.
 
-* Thu Oct  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
+* Thu Oct  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
 - Add list of valid shells for post'n'friends scriptlets into default config.
 
-* Sat Sep 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
+* Sat Sep 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
 - Update to 0.52.
 
-* Thu Sep  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
+* Thu Sep  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
 - Filter more Mdk-specific warnings in default config.
 
-* Wed Sep  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
+* Wed Sep  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
 - Upstream tarball reappeared, use it.
 
-* Sun Aug 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
+* Sun Aug 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
 - Filter Mdk-specific python-related stuff in the default config.
 
-* Fri Aug 15 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
+* Fri Aug 15 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
 - Update to 0.51.1.
 - Own %%ghost'ed *.py{c,o}, and ditto for the config file.
 - Add list of valid licenses to default config.
 - Set "Fedora Linux" as suggested distribution in default config.
 - Clean up %%doc list.
 
-* Fri May  9 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
+* Fri May  9 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
 - Update to 0.50, all patches now applied upstream.
 
-* Mon May  5 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
+* Mon May  5 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
 - %%{buildroot} -> $RPM_BUILD_ROOT.
 - Filter out mdk-specific "no-dependancy perl-base" messages in config.
 
-* Thu May  1 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
+* Thu May  1 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
 - Update to 0.49.
 
-* Sun Apr 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
+* Sun Apr 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
 - Add one more strict Epoch checking patch.
 - Slightly enhanced default config.
 
-* Fri Apr 11 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
+* Fri Apr 11 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
 - Patch to work with installed packages (including -a) and rpm 4.2.
 - Remove spurious rpm-devel BuildRequirement.
 
-* Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
+* Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
 - Patch to work with packages signed with an unknown key.
 - Save .spec in UTF-8.
 
-* Sun Mar 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
+* Sun Mar 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
 - First Fedora release, based on upstream spec.


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- rpmlint.config	21 Jun 2009 21:17:41 -0000	1.36
+++ rpmlint.config	13 Sep 2009 22:15:36 -0000	1.37
@@ -10,6 +10,7 @@ from Config import *
 import Pkg
 
 
+setOption("MaxLineLength", 80)
 setOption("ReleaseExtension", '\.(fc|rhe?l|el)\d+(?=\.|$)')
 setOption("UseVersionInChangeLog", True)
 setOption("UseBzip2", False)
@@ -33,7 +34,7 @@ setOption("DanglingSymlinkExceptions", (
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with revision "1.44, 5 June 2009" of that page.
+    # Last synced with revision "1.49, 15 August 2009" of that page.
     'AAL',
     'Adobe',
     'ADSL',
@@ -128,6 +129,7 @@ setOption("ValidLicenses", (
     'LPL',
     'LPPL',
     'mecab-ipadic',
+    'MirOS',
     'MIT',
     'MIT with advertising',
     'Motosoto',
@@ -135,12 +137,14 @@ setOption("ValidLicenses", (
     'MPLv1.0+',
     'MPLv1.1',
     'MPLv1.1+',
+    'MS-PL',
     'NCSA',
     'NetCDF',
     'NGPL',
     'NOSL',
     'Naumen',
     'Netscape',
+    'Newmat',
     'Nokia',
     'Noweb',
     'OpenLDAP',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- rpmlint.spec	27 Jul 2009 03:13:44 -0000	1.68
+++ rpmlint.spec	13 Sep 2009 22:15:36 -0000	1.69
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.90
-Release:        2%{?dist}
+Version:        0.91
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -25,6 +25,9 @@ Requires:       python-magic
 Requires:       cpio
 Requires:       binutils
 Requires:       desktop-file-utils
+Requires:       gzip
+Requires:       bzip2
+Requires:       xz
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -51,6 +54,10 @@ make install DESTDIR=$RPM_BUILD_ROOT ETC
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 
+%check
+make check
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,18 +75,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.91-1
+- Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630.
+- Add dependencies on gzip, bzip2, and xz.
+- Sync Fedora license list with Wiki revision 1.49.
+- Move pre-2008 %%changelog entries to CHANGES.package.old.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.90-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jun 29 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.90-1
+* Mon Jun 29 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.90-1
 - 0.90; fixes #508683.
 
-* Sun Jun 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.89-1
-- Update to 0.89; fixes #461610, #496735, #496737 (partially), #491188, #506957.
+* Sun Jun 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.89-1
+- Update to 0.89; fixes #461610, #496735, #496737 (partially), #498107,
+  #491188, and #506957.
 - Sync Fedora license list with Wiki revision 1.44.
 - Parse list of standard users and groups from the setup package's uidgid file.
 
-* Thu Mar 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.87-1
+* Thu Mar 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.87-1
 - 0.87; fixes #480664, #483196, #483199, #486748, #488146, #488930, #489118.
 - Sync Fedora license list with Wiki revision 1.38.
 - Configs patch included upstream.
@@ -87,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.85-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Jan 20 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Jan 20 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Sync Fedora license list with Wiki revision 1.34.
 - Filter out filename-too-long-for-joliet and symlink-should-be-* warnings in
   default config.
@@ -95,10 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.85-3
 - Rebuild for Python 2.6
 
-* Thu Oct 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-2
+* Thu Oct 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-2
 - Apply upstream patch to load all *config from /etc/rpmlint.
 
-* Thu Oct 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-1
+* Thu Oct 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-1
 - 0.85, fixes #355861, #450011, #455371, #456843, #461421, #461423, #461434.
 - Mute some explicit-lib-dependency false positives (#458290).
 - Sync Fedora license list with Wiki revision 1.19.
@@ -107,12 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.84-3
 - Sync Fedora license list with Wiki revision 1.09
 
-* Sat Jul 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.84-2
+* Sat Jul 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".
 - Rediff patches.
 
-* Tue May 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.83-1
+* Tue May 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.83-1
 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441.
 - Fedora licensing patch applied upstream.
 - Move pre-2007 changelog entries to CHANGES.package.old.
@@ -121,44 +135,5 @@ rm -rf $RPM_BUILD_ROOT
 * Tue May 20 2008 Todd Zullinger <tmz at pobox.com> 
 - Sync Fedora license list with Revision 0.83 (Wiki rev 131).
 
-* Mon Mar  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.82-3
+* Mon Mar  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.82-3
 - Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690).
-
-* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-2
-- Remove leftover "Affero GPL" from last license list sync (Todd Zullinger).
-
-* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-1
-- 0.82, fixes #362441, #388881, #399871, #409941.
-- Sync Fedora license list with Revision 0.61 (Wiki rev 98).
-
-* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
-- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
-
-* Mon Sep  3 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.81-1
-- 0.81, fixes #239611, #240840, #241471, #244835.
-- Improve Fedora license check (Todd Zullinger).
-- Sync Fedora license list with Wiki rev 87.
-
-* Wed Aug 29 2007 Ville Skytt? <ville.skytta at iki.fi>
-- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
-
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-3
-- Sync Fedora license list with Wiki rev 68.
-- Move pre-2006 changelog entries to CHANGES.package.old.
-
-* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
-- new fedora licensing scheme
-
-* Thu May 31 2007 Ville Skytt? <ville.skytta at iki.fi>
-- Filter hardcoded-library-path errors for /lib/udev.
-
-* Thu Apr 12 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-1
-- 0.80, fixes #227389, #228645, #233795.
-- Accept "Redistributable, no modification permitted" as a valid license.
-- Filter messages about doc file dependencies on /bin/sh.
-- Add missing dependency on file.
-
-* Fri Feb  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.79-1
-- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116,
-  #222585, and #226879.
-- Accept *.elX disttags in default config.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	29 Jun 2009 15:36:38 -0000	1.25
+++ sources	13 Sep 2009 22:15:36 -0000	1.26
@@ -1 +1 @@
-5b2402a8072dfa6af5add80969230d4c  rpmlint-0.90.tar.bz2
+38b22629d28a02c0f6d675860dc6f6d7  rpmlint-0.91.tar.bz2



From scop at fedoraproject.org  Sun Sep 13 22:21:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 13 Sep 2009 22:21:15 +0000 (UTC)
Subject: rpms/rpmlint/F-11 .cvsignore, 1.25, 1.26 rpmlint-CHANGES.package.old,
	1.2, 1.3 rpmlint.config, 1.33, 1.34 rpmlint.spec, 1.64,
	1.65 sources, 1.25, 1.26
Message-ID: <20090913222116.02E6E11C0099@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2474

Modified Files:
	.cvsignore rpmlint-CHANGES.package.old rpmlint.config 
	rpmlint.spec sources 
Log Message:
* Mon Sep 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.91-1
- Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630.
- Add dependencies on gzip, bzip2, and xz.
- Sync Fedora license list with Wiki revision 1.49.
- Move pre-2008 %changelog entries to CHANGES.package.old.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	29 Jun 2009 15:36:37 -0000	1.25
+++ .cvsignore	13 Sep 2009 22:21:15 -0000	1.26
@@ -1 +1 @@
-rpmlint-0.90.tar.bz2
+rpmlint-0.91.tar.bz2


Index: rpmlint-CHANGES.package.old
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-11/rpmlint-CHANGES.package.old,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpmlint-CHANGES.package.old	27 May 2008 16:41:44 -0000	1.2
+++ rpmlint-CHANGES.package.old	13 Sep 2009 22:21:15 -0000	1.3
@@ -1,16 +1,55 @@
-* Sun Oct 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-2
+* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-2
+- Remove leftover "Affero GPL" from last license list sync (Todd Zullinger).
+
+* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-1
+- 0.82, fixes #362441, #388881, #399871, #409941.
+- Sync Fedora license list with Revision 0.61 (Wiki rev 98).
+
+* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
+- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
+
+* Mon Sep  3 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skytt? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-3
+- Sync Fedora license list with Wiki rev 68.
+- Move pre-2006 changelog entries to CHANGES.package.old.
+
+* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
+- new fedora licensing scheme
+
+* Thu May 31 2007 Ville Skytt? <ville.skytta at iki.fi>
+- Filter hardcoded-library-path errors for /lib/udev.
+
+* Thu Apr 12 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-1
+- 0.80, fixes #227389, #228645, #233795.
+- Accept "Redistributable, no modification permitted" as a valid license.
+- Filter messages about doc file dependencies on /bin/sh.
+- Add missing dependency on file.
+
+* Fri Feb  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.79-1
+- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116,
+  #222585, and #226879.
+- Accept *.elX disttags in default config.
+
+* Sun Oct 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-2
 - Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
 - Filter messages about gpg-pubkeys for now.
 
-* Sun Sep 24 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-1
+* Sun Sep 24 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.78-1
 - 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
 - /etc/profile.d/* filtering no longer needed.
 
-* Sat Sep 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-2
+* Sat Sep 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-2
 - Filter false positives for /etc/profile.d/* file modes.
 - Ship *.pyc and *.pyo as usual.
 
-* Thu Jun 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-1
+* Thu Jun 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.77-1
 - 0.77, fixes #194466, #195962, #196008, #196985.
 - Make "disttag" configurable using the DistRegex config file option.
 - Sync standard users and groups with the FC setup package.
@@ -20,28 +59,28 @@
   the GROUPS file shipped with rpm).
 - Allow /usr/libexec, fixes #195992.
 
-* Tue Apr 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.76-1
+* Tue Apr 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.76-1
 - 0.76.
 
-* Mon Mar 27 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Mar 27 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Don't pass -T to objdump for *.debug files (#185227).
 - lib64 library path fixes (#185228).
 
-* Wed Mar 15 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Mar 15 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Accept zlib License (#185501).
 
-* Tue Feb 28 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Feb 28 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Accept Ruby License (#183384) and SIL Open Font License (#176405).
 
-* Sat Feb 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.75-1
+* Sat Feb 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 
-* Tue Jan 17 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.71-3
+* Tue Jan 17 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.71-3
 - Sync with upstream CVS as of 2006-01-15, includes improved versions of
   most of the earlier patches.
 - Add dependency on binutils.
 
-* Sun Nov 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-2
+* Sun Nov 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-2
 - Take file based dependencies into account in dangling symlink checks
   (completes the fix for #165839).
 - Skip some checks for binaries not understood by objdump (#165173).
@@ -50,31 +89,31 @@
 - Import Enrico's latest DocFilesCheck (with some local tweaks).
 - Use rm instead of %%exclude.
 
-* Wed Nov 16 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Nov 16 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Add DocFilesCheck from Enrico Scholz.
 
-* Sat Sep  3 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Sep  3 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Improve accuracy of doc, info and games path regexps.
 - Improve error message when invoked on non-rpm files.
 - Filter more Mandriva specific warnings.
 
-* Sat Aug 13 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Aug 13 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Add dangling symlink exceptions tuned for Fedora to default config
   (partially fixes #165839).
 
-* Wed Aug 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-1
+* Wed Aug 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.71-1
 - 0.71, confmsg patch and bits from initvars patch applied upstream.
 - Filter out Mandriva-specific errors about missing locales-* deps (#165457).
 - Patch to not warn about non-empty *.bs (in Perl packages).
 - Patch to clarify PreReq explanation, make it a warning instead of an error.
 - Patch to warn about use of BuildPreReq.
 
-* Thu Jul  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-4
+* Thu Jul  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-4
 - Fix false "positives" from libtool archives confused as scripts,
   non-executable scripts installed in docs, FE disttags, unsuccessfully
   expanded shell variables and quotation in init scripts.
 
-* Mon Jun 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-3
+* Mon Jun 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.70-3
 - 0.70, use sed instead of perl during build.
 - Default configuration improvements: allow Development/Debug group (for
   debuginfo packages), filter out errors/warnings about non-indexed jars,
@@ -84,10 +123,10 @@
 - Patch to warn about services that default to enabled after "chkconfig add",
   not the other way around.
 
-* Thu May 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-3
+* Thu May 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-3
 - Filter out more not-that-useful messages in the default config.
 
-* Sat Apr 16 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-2
+* Sat Apr 16 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.69-2
 - 0.69.
 - Simplify bash-completion snippet installation, remove triggers.
 - Default configuration improvements: filter messages about missing packager,
@@ -97,99 +136,99 @@
 - Convert docs to UTF-8.
 - Improve summary.
 
-* Sun Mar 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.68-2
+* Sun Mar 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.68-2
 - 0.68, siteperl patch applied upstream.
 - Fix "no-dependency-on" filtering in default config.
 - Add LaTeX Project Public License to default config.
 - Remove upstream-only %%changelog entries.
 
-* Sun Feb 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.67-1
+* Sun Feb 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.67-1
 - 0.67.
 - Patch to catch more site_perl directories.
 - Default config improvements: filter Distribution and Vendor warnings,
   use empty string instead of None for release extension (fixes -i).
 
-* Sat Jan 29 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.65-1
+* Sat Jan 29 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.65-1
 - Update to 0.65.
 
-* Sat Jan  1 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.64-1
+* Sat Jan  1 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.64-1
 - Update to 0.64.
 - Default config tweaks: don't mandate Epochs nor "fdr" in Release.
 
-* Tue Oct 19 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
+* Tue Oct 19 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
 - Requires cpio (bug 2169).
 
-* Sun Oct  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
+* Sun Oct  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
 - Update to 0.61.
 
-* Mon Aug 16 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
+* Mon Aug 16 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
 - Update to 0.60.
 
-* Mon May  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
+* Mon May  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
 - Update to 0.59.
 
-* Sun Feb 22 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
+* Sun Feb 22 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
 - Update to 0.57.1.
 
-* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
+* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
 - Update to 0.56.
 
-* Mon Feb  2 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
+* Mon Feb  2 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
 - Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).
 
-* Sun Feb  1 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
+* Sun Feb  1 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
 - Add back %%ghost handling of not-installed compiled versions of *.py.
 
-* Fri Jan 30 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
+* Fri Jan 30 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
 - Update to 0.55.
 - Spec cleanups.
 
-* Tue Dec 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
+* Tue Dec 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
 - Update to 0.53.
 
-* Thu Oct  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
+* Thu Oct  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
 - Add list of valid shells for post'n'friends scriptlets into default config.
 
-* Sat Sep 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
+* Sat Sep 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
 - Update to 0.52.
 
-* Thu Sep  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
+* Thu Sep  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
 - Filter more Mdk-specific warnings in default config.
 
-* Wed Sep  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
+* Wed Sep  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
 - Upstream tarball reappeared, use it.
 
-* Sun Aug 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
+* Sun Aug 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
 - Filter Mdk-specific python-related stuff in the default config.
 
-* Fri Aug 15 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
+* Fri Aug 15 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
 - Update to 0.51.1.
 - Own %%ghost'ed *.py{c,o}, and ditto for the config file.
 - Add list of valid licenses to default config.
 - Set "Fedora Linux" as suggested distribution in default config.
 - Clean up %%doc list.
 
-* Fri May  9 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
+* Fri May  9 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
 - Update to 0.50, all patches now applied upstream.
 
-* Mon May  5 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
+* Mon May  5 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
 - %%{buildroot} -> $RPM_BUILD_ROOT.
 - Filter out mdk-specific "no-dependancy perl-base" messages in config.
 
-* Thu May  1 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
+* Thu May  1 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
 - Update to 0.49.
 
-* Sun Apr 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
+* Sun Apr 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
 - Add one more strict Epoch checking patch.
 - Slightly enhanced default config.
 
-* Fri Apr 11 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
+* Fri Apr 11 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
 - Patch to work with installed packages (including -a) and rpm 4.2.
 - Remove spurious rpm-devel BuildRequirement.
 
-* Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
+* Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
 - Patch to work with packages signed with an unknown key.
 - Save .spec in UTF-8.
 
-* Sun Mar 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
+* Sun Mar 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
 - First Fedora release, based on upstream spec.


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-11/rpmlint.config,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- rpmlint.config	21 Jun 2009 21:17:40 -0000	1.33
+++ rpmlint.config	13 Sep 2009 22:21:15 -0000	1.34
@@ -10,6 +10,7 @@ from Config import *
 import Pkg
 
 
+setOption("MaxLineLength", 80)
 setOption("ReleaseExtension", '\.(fc|rhe?l|el)\d+(?=\.|$)')
 setOption("UseVersionInChangeLog", True)
 setOption("UseBzip2", False)
@@ -33,7 +34,7 @@ setOption("DanglingSymlinkExceptions", (
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with revision "1.44, 5 June 2009" of that page.
+    # Last synced with revision "1.49, 15 August 2009" of that page.
     'AAL',
     'Adobe',
     'ADSL',
@@ -128,6 +129,7 @@ setOption("ValidLicenses", (
     'LPL',
     'LPPL',
     'mecab-ipadic',
+    'MirOS',
     'MIT',
     'MIT with advertising',
     'Motosoto',
@@ -135,12 +137,14 @@ setOption("ValidLicenses", (
     'MPLv1.0+',
     'MPLv1.1',
     'MPLv1.1+',
+    'MS-PL',
     'NCSA',
     'NetCDF',
     'NGPL',
     'NOSL',
     'Naumen',
     'Netscape',
+    'Newmat',
     'Nokia',
     'Noweb',
     'OpenLDAP',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-11/rpmlint.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- rpmlint.spec	29 Jun 2009 15:36:37 -0000	1.64
+++ rpmlint.spec	13 Sep 2009 22:21:15 -0000	1.65
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -25,6 +25,9 @@ Requires:       python-magic
 Requires:       cpio
 Requires:       binutils
 Requires:       desktop-file-utils
+Requires:       gzip
+Requires:       bzip2
+Requires:       xz
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -51,6 +54,10 @@ make install DESTDIR=$RPM_BUILD_ROOT ETC
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 
+%check
+make check
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,15 +75,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Jun 29 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.90-1
+* Mon Sep 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.91-1
+- Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630.
+- Add dependencies on gzip, bzip2, and xz.
+- Sync Fedora license list with Wiki revision 1.49.
+- Move pre-2008 %%changelog entries to CHANGES.package.old.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.90-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.90-1
 - 0.90; fixes #508683.
 
-* Sun Jun 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.89-1
-- Update to 0.89; fixes #461610, #496735, #496737 (partially), #491188, #506957.
+* Sun Jun 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.89-1
+- Update to 0.89; fixes #461610, #496735, #496737 (partially), #498107,
+  #491188, and #506957.
 - Sync Fedora license list with Wiki revision 1.44.
 - Parse list of standard users and groups from the setup package's uidgid file.
 
-* Thu Mar 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.87-1
+* Thu Mar 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.87-1
 - 0.87; fixes #480664, #483196, #483199, #486748, #488146, #488930, #489118.
 - Sync Fedora license list with Wiki revision 1.38.
 - Configs patch included upstream.
@@ -84,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.85-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Jan 20 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Jan 20 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Sync Fedora license list with Wiki revision 1.34.
 - Filter out filename-too-long-for-joliet and symlink-should-be-* warnings in
   default config.
@@ -92,10 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.85-3
 - Rebuild for Python 2.6
 
-* Thu Oct 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-2
+* Thu Oct 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-2
 - Apply upstream patch to load all *config from /etc/rpmlint.
 
-* Thu Oct 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-1
+* Thu Oct 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.85-1
 - 0.85, fixes #355861, #450011, #455371, #456843, #461421, #461423, #461434.
 - Mute some explicit-lib-dependency false positives (#458290).
 - Sync Fedora license list with Wiki revision 1.19.
@@ -104,12 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.84-3
 - Sync Fedora license list with Wiki revision 1.09
 
-* Sat Jul 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.84-2
+* Sat Jul 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".
 - Rediff patches.
 
-* Tue May 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.83-1
+* Tue May 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.83-1
 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441.
 - Fedora licensing patch applied upstream.
 - Move pre-2007 changelog entries to CHANGES.package.old.
@@ -118,44 +135,5 @@ rm -rf $RPM_BUILD_ROOT
 * Tue May 20 2008 Todd Zullinger <tmz at pobox.com> 
 - Sync Fedora license list with Revision 0.83 (Wiki rev 131).
 
-* Mon Mar  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.82-3
+* Mon Mar  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.82-3
 - Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690).
-
-* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-2
-- Remove leftover "Affero GPL" from last license list sync (Todd Zullinger).
-
-* Thu Dec  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.82-1
-- 0.82, fixes #362441, #388881, #399871, #409941.
-- Sync Fedora license list with Revision 0.61 (Wiki rev 98).
-
-* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
-- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
-
-* Mon Sep  3 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.81-1
-- 0.81, fixes #239611, #240840, #241471, #244835.
-- Improve Fedora license check (Todd Zullinger).
-- Sync Fedora license list with Wiki rev 87.
-
-* Wed Aug 29 2007 Ville Skytt? <ville.skytta at iki.fi>
-- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
-
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-3
-- Sync Fedora license list with Wiki rev 68.
-- Move pre-2006 changelog entries to CHANGES.package.old.
-
-* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
-- new fedora licensing scheme
-
-* Thu May 31 2007 Ville Skytt? <ville.skytta at iki.fi>
-- Filter hardcoded-library-path errors for /lib/udev.
-
-* Thu Apr 12 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.80-1
-- 0.80, fixes #227389, #228645, #233795.
-- Accept "Redistributable, no modification permitted" as a valid license.
-- Filter messages about doc file dependencies on /bin/sh.
-- Add missing dependency on file.
-
-* Fri Feb  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.79-1
-- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116,
-  #222585, and #226879.
-- Accept *.elX disttags in default config.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	29 Jun 2009 15:36:37 -0000	1.25
+++ sources	13 Sep 2009 22:21:15 -0000	1.26
@@ -1 +1 @@
-5b2402a8072dfa6af5add80969230d4c  rpmlint-0.90.tar.bz2
+38b22629d28a02c0f6d675860dc6f6d7  rpmlint-0.91.tar.bz2



From salimma at fedoraproject.org  Sun Sep 13 22:34:03 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 22:34:03 +0000 (UTC)
Subject: rpms/gnustep-make/F-11 gnustep-make-2.2.0-addgsprefix.patch, NONE, 
	1.1 gnustep-make-2.2.0-fix-rename-note.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 gnustep-make.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <20090913223403.7129E11C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16665/F-11

Modified Files:
	.cvsignore gnustep-make.spec sources 
Added Files:
	gnustep-make-2.2.0-addgsprefix.patch 
	gnustep-make-2.2.0-fix-rename-note.patch 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
- Rename overly-generic info files
- Fix all references to lib -> %%{_lib}
- Add more directories to gnustep-filesystem

* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Replace perl scripts with sed equivalents; dropping BR



gnustep-make-2.2.0-addgsprefix.patch:
 GNUmakefile        |   31 ++++++++++++++++---------------
 gnustep-howto.texi |    2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE gnustep-make-2.2.0-addgsprefix.patch ---
--- gnustep-make-2.2.0/Documentation/GNUmakefile.addgsprefix	2008-06-11 12:28:47.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/GNUmakefile	2009-09-13 14:32:11.067200455 -0400
@@ -71,7 +71,8 @@
 # info 'faq' would probably return our faq before anything else
 # because the INFOPATH is used before built-in paths, but it's
 # still confusing to have conflicts.
-DOCUMENT_NAME = gnustep-howto faq filesystem internals machines gnustep-make userfaq
+DOCUMENT_NAME = gnustep-howto gnustep-faq gnustep-filesystem internals \
+	gnustep-machines gnustep-make gnustep-userfaq
 
 # The text documents to be generated
 DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS RELEASENOTES GNUstep-HOWTO ANNOUNCE
@@ -86,30 +87,30 @@
 GNUstep-HOWTO_DOC_INSTALL_DIR = User/GNUstep/
 
 FAQ_TEXI_FILES = version.texi
-FAQ_TEXT_MAIN = faq.texi
+FAQ_TEXT_MAIN = gnustep-faq.texi
 FAQ_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-make_TEXI_FILES = \
 gnustep-make.texi
 gnustep-make_DOC_INSTALL_DIR = Developer/Make/Manual/
 
-faq_TEXI_FILES = \
-faq.texi \
+gnustep-faq_TEXI_FILES = \
+gnustep-faq.texi \
 version.texi
-faq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-faq_DOC_INSTALL_DIR = User/GNUstep/
 
-userfaq_TEXI_FILES = \
-userfaq.texi \
+gnustep-userfaq_TEXI_FILES = \
+gnustep-userfaq.texi \
 version.texi
-userfaq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-userfaq_DOC_INSTALL_DIR = User/GNUstep/
 
-filesystem_TEXI_FILES = \
-filesystem.texi
-filesystem_DOC_INSTALL_DIR = User/GNUstep/
-
-machines_TEXI_FILES = \
-machines.texi 
-machines_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-filesystem_TEXI_FILES = \
+gnustep-filesystem.texi
+gnustep-filesystem_DOC_INSTALL_DIR = User/GNUstep/
+
+gnustep-machines_TEXI_FILES = \
+gnustep-machines.texi 
+gnustep-machines_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-howto_TEXI_FILES = \
 gnustep-howto.texi \
--- gnustep-make-2.2.0/Documentation/gnustep-howto.texi.addgsprefix	2007-03-17 16:19:11.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/gnustep-howto.texi	2009-09-13 14:33:14.792200412 -0400
@@ -460,7 +460,7 @@
 @node Machine Specific, Source via SVN, Tools and Applications, Top
 @chapter Machine Specific Instructions
 
- at include machines.texi
+ at include gnustep-machines.texi
 
 
 @node Source via SVN,  , Machine Specific, Top

gnustep-make-2.2.0-fix-rename-note.patch:
 releasenotes.texi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnustep-make-2.2.0-fix-rename-note.patch ---
--- gnustep-make-2.2.0/Documentation/releasenotes.texi.fix-rename-note	2009-05-09 14:32:29.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/releasenotes.texi	2009-09-13 14:22:43.075450206 -0400
@@ -91,7 +91,7 @@
 different location, use the --with-config-file=PATH option, as in
 --with-config-file=/usr/pkg/etc/GNUstep.conf.
 
- at item gnustep-make.info renamed to make.info
+ at item make.info renamed to gnustep-make.info
 To prevent conflicts with the standard GNU 'make' info documentation,
 the gnustep-make one has been renamed.  Now you can access it as in
 'info gnustep-make' instead of 'info make', avoiding any conflicts and


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Mar 2009 19:30:01 -0000	1.5
+++ .cvsignore	13 Sep 2009 22:34:01 -0000	1.6
@@ -1 +1 @@
-gnustep-make-2.0.8.tar.gz
+gnustep-make-2.2.0.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-11/gnustep-make.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnustep-make.spec	24 Mar 2009 19:30:01 -0000	1.12
+++ gnustep-make.spec	13 Sep 2009 22:34:01 -0000	1.13
@@ -1,19 +1,26 @@
 %global debug_package %{nil}
-%bcond_without docs
 
-Summary: GNUstep makefile package
-Name: gnustep-make
-Version: 2.0.8
-Release: 2%{?dist}
-License: GPLv3+
-Group: Development/Tools
-URL: http://www.gnustep.org/
-Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl
-%if %{with docs}
-BuildRequires: texinfo-tex, tetex-latex, tetex-dvips, latex2html, texi2html
-%endif
+Name:           gnustep-make
+Version:        2.2.0
+Release:        2%{?dist}
+Summary:        GNUstep makefile package
+
+Group:          Development/Tools
+License:        GPLv3+
+URL:            http://www.gnustep.org/
+Source0:        ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
+
+# https://savannah.gnu.org/bugs/index.php?27433
+Patch0:         %{name}-2.2.0-addgsprefix.patch
+# https://savannah.gnu.org/bugs/index.php?27432
+Patch1:         %{name}-2.2.0-fix-rename-note.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
+Requires:       gnustep-filesystem = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
+
 
 %description
 The makefile package is a simple, powerful and extensible way to write
@@ -22,14 +29,25 @@ project without having to deal with the 
 configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 
-%if %{with docs}
+
+%package -n     gnustep-filesystem
+Summary:        The basic directory layout for GNUstep packages
+Group:          System Environment/Base
+License:        Public Domain
+BuildArch:      noarch
+
+%description -n gnustep-filesystem
+The gnustep-filesystem package contains the basic directory layout for
+GNUstep packages.
+
+
 %package        doc
 Summary:        Documentation for %{name}
 Group:          Documentation
 License:        GPLv3+
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
-
 %description    doc
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
@@ -38,58 +56,105 @@ configuration, building, installation, a
 the user to easily create cross-compiled binaries.
 
 This package contains documentation for %{name}.
-%endif
 
 %prep
 %setup -q
-perl -pi -e"s,/share/GNUstep/Documentation,`echo %{_defaultdocdir}/%{name}-doc-%{version} | sed -e's,^/usr,,'`," \
-  FilesystemLayouts/fhs-system
+%patch0 -p1 -b .addgsprefix
+%patch1 -p1 -b .fix-release-note
+sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs-system
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs-system
+sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs
 # /usr/share/GNUstep/Makefiles/config-noarch.make and
 # /usr/share/GNUstep/Makefiles/ix86/linux-gnu/gnu-gnu-gnu/config.make
 # are spoiling a pure /usr/share install
-sed -i -e 's,/local,,' FilesystemLayouts/fhs-system
-sed -i -e 's,=/lib,=/%_lib,' FilesystemLayouts/fhs-system
-perl -pi -e"s,GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles,GNUSTEP_MAKEFILES=`echo %{_libdir} | sed -e's,^/usr,,'`/GNUstep/Makefiles," \
-  FilesystemLayouts/fhs-system
+sed -i "s|=/share/GNUstep/Makefiles|=/%{_lib}/GNUstep/Makefiles|" \
+    FilesystemLayouts/fhs-system
+
+# Rename overly-generic .info files
+for i in faq filesystem machines userfaq; do
+    mv Documentation/{$i,gnustep-$i}.texi
+done
+
 
 %build
 %configure --with-layout=fhs-system --enable-flattened
 make
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-doc-%{version}
-%if %{with docs}
 make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles
 make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles DESTDIR=%{buildroot}
-%endif
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-install -p ANNOUNCE COPYING FAQ NEWS README \
-  %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+
+# create remaining GNUstep directories
+for i in Applications WebApplications; do
+    mkdir -p %{buildroot}%{_prefix}{,/local}/lib{,64}/GNUstep/$i
+done
+mkdir -p %{buildroot}%{_prefix}/local/share/GNUstep/Documentation
+
 
 %clean
 rm -rf %{buildroot}
 
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}
-#%{_datadir}/GNUstep
-%{_libdir}/GNUstep
-#%{_libexecdir}/GNUstep
-%dir /etc/GNUstep
-%config(noreplace) /etc/GNUstep/GNUstep.conf
+%doc ANNOUNCE COPYING FAQ NEWS README
+%config(noreplace) %{_sysconfdir}/GNUstep/GNUstep.conf
 %{_bindir}/*
+%{_libdir}/GNUstep/Makefiles
 %{_mandir}/man*/*
-%if %{with docs}
 %{_infodir}/*
-%endif
+
+%files -n gnustep-filesystem
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/GNUstep
+%dir %{_prefix}/lib/GNUstep
+%dir %{_prefix}/lib64/GNUstep
+%dir %{_prefix}/lib/GNUstep/Applications
+%dir %{_prefix}/lib64/GNUstep/Applications
+%dir %{_prefix}/lib/GNUstep/WebApplications
+%dir %{_prefix}/lib64/GNUstep/WebApplications
+%dir %{_prefix}/local/lib/GNUstep
+%dir %{_prefix}/local/lib/GNUstep/Applications
+%dir %{_prefix}/local/lib/GNUstep/WebApplications
+%dir %{_prefix}/local/lib64/GNUstep
+%dir %{_prefix}/local/lib64/GNUstep/Applications
+%dir %{_prefix}/local/lib64/GNUstep/WebApplications
+%dir %{_datadir}/GNUstep
+%dir %{_datadir}/GNUstep/Documentation
+%dir %{_prefix}/local/share/GNUstep
+%dir %{_prefix}/local/share/GNUstep/Documentation
+
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}-doc-%{version}
+%doc %{_datadir}/GNUstep/Documentation/*
+
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
+- Rename overly-generic info files
+- Fix all references to lib -> %%{_lib}
+- Add more directories to gnustep-filesystem
+
+* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- Replace perl scripts with sed equivalents; dropping BR
+
 * Thu Mar 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.0.8-2
 - Put documentation into separate subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Mar 2009 19:30:01 -0000	1.5
+++ sources	13 Sep 2009 22:34:01 -0000	1.6
@@ -1 +1 @@
-13bd26f135cbc38a94dfb220e9ffd460  gnustep-make-2.0.8.tar.gz
+3d2d06d3313432fc82e6b09c49fb7f8a  gnustep-make-2.2.0.tar.gz



From salimma at fedoraproject.org  Sun Sep 13 22:34:01 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 22:34:01 +0000 (UTC)
Subject: rpms/gnustep-make/F-10 gnustep-make-2.2.0-addgsprefix.patch, NONE, 
	1.1 gnustep-make-2.2.0-fix-rename-note.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 gnustep-make.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20090913223401.E176411C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16665/F-10

Modified Files:
	.cvsignore gnustep-make.spec sources 
Added Files:
	gnustep-make-2.2.0-addgsprefix.patch 
	gnustep-make-2.2.0-fix-rename-note.patch 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
- Rename overly-generic info files
- Fix all references to lib -> %%{_lib}
- Add more directories to gnustep-filesystem

* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Replace perl scripts with sed equivalents; dropping BR



gnustep-make-2.2.0-addgsprefix.patch:
 GNUmakefile        |   31 ++++++++++++++++---------------
 gnustep-howto.texi |    2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE gnustep-make-2.2.0-addgsprefix.patch ---
--- gnustep-make-2.2.0/Documentation/GNUmakefile.addgsprefix	2008-06-11 12:28:47.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/GNUmakefile	2009-09-13 14:32:11.067200455 -0400
@@ -71,7 +71,8 @@
 # info 'faq' would probably return our faq before anything else
 # because the INFOPATH is used before built-in paths, but it's
 # still confusing to have conflicts.
-DOCUMENT_NAME = gnustep-howto faq filesystem internals machines gnustep-make userfaq
+DOCUMENT_NAME = gnustep-howto gnustep-faq gnustep-filesystem internals \
+	gnustep-machines gnustep-make gnustep-userfaq
 
 # The text documents to be generated
 DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS RELEASENOTES GNUstep-HOWTO ANNOUNCE
@@ -86,30 +87,30 @@
 GNUstep-HOWTO_DOC_INSTALL_DIR = User/GNUstep/
 
 FAQ_TEXI_FILES = version.texi
-FAQ_TEXT_MAIN = faq.texi
+FAQ_TEXT_MAIN = gnustep-faq.texi
 FAQ_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-make_TEXI_FILES = \
 gnustep-make.texi
 gnustep-make_DOC_INSTALL_DIR = Developer/Make/Manual/
 
-faq_TEXI_FILES = \
-faq.texi \
+gnustep-faq_TEXI_FILES = \
+gnustep-faq.texi \
 version.texi
-faq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-faq_DOC_INSTALL_DIR = User/GNUstep/
 
-userfaq_TEXI_FILES = \
-userfaq.texi \
+gnustep-userfaq_TEXI_FILES = \
+gnustep-userfaq.texi \
 version.texi
-userfaq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-userfaq_DOC_INSTALL_DIR = User/GNUstep/
 
-filesystem_TEXI_FILES = \
-filesystem.texi
-filesystem_DOC_INSTALL_DIR = User/GNUstep/
-
-machines_TEXI_FILES = \
-machines.texi 
-machines_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-filesystem_TEXI_FILES = \
+gnustep-filesystem.texi
+gnustep-filesystem_DOC_INSTALL_DIR = User/GNUstep/
+
+gnustep-machines_TEXI_FILES = \
+gnustep-machines.texi 
+gnustep-machines_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-howto_TEXI_FILES = \
 gnustep-howto.texi \
--- gnustep-make-2.2.0/Documentation/gnustep-howto.texi.addgsprefix	2007-03-17 16:19:11.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/gnustep-howto.texi	2009-09-13 14:33:14.792200412 -0400
@@ -460,7 +460,7 @@
 @node Machine Specific, Source via SVN, Tools and Applications, Top
 @chapter Machine Specific Instructions
 
- at include machines.texi
+ at include gnustep-machines.texi
 
 
 @node Source via SVN,  , Machine Specific, Top

gnustep-make-2.2.0-fix-rename-note.patch:
 releasenotes.texi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnustep-make-2.2.0-fix-rename-note.patch ---
--- gnustep-make-2.2.0/Documentation/releasenotes.texi.fix-rename-note	2009-05-09 14:32:29.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/releasenotes.texi	2009-09-13 14:22:43.075450206 -0400
@@ -91,7 +91,7 @@
 different location, use the --with-config-file=PATH option, as in
 --with-config-file=/usr/pkg/etc/GNUstep.conf.
 
- at item gnustep-make.info renamed to make.info
+ at item make.info renamed to gnustep-make.info
 To prevent conflicts with the standard GNU 'make' info documentation,
 the gnustep-make one has been renamed.  Now you can access it as in
 'info gnustep-make' instead of 'info make', avoiding any conflicts and


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Mar 2009 19:30:00 -0000	1.5
+++ .cvsignore	13 Sep 2009 22:34:00 -0000	1.6
@@ -1 +1 @@
-gnustep-make-2.0.8.tar.gz
+gnustep-make-2.2.0.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/gnustep-make.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gnustep-make.spec	24 Mar 2009 19:30:01 -0000	1.10
+++ gnustep-make.spec	13 Sep 2009 22:34:00 -0000	1.11
@@ -1,19 +1,26 @@
 %global debug_package %{nil}
-%bcond_without docs
 
-Summary: GNUstep makefile package
-Name: gnustep-make
-Version: 2.0.8
-Release: 2%{?dist}
-License: GPLv3+
-Group: Development/Tools
-URL: http://www.gnustep.org/
-Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl
-%if %{with docs}
-BuildRequires: texinfo-tex, tetex-latex, tetex-dvips, latex2html, texi2html
-%endif
+Name:           gnustep-make
+Version:        2.2.0
+Release:        2%{?dist}
+Summary:        GNUstep makefile package
+
+Group:          Development/Tools
+License:        GPLv3+
+URL:            http://www.gnustep.org/
+Source0:        ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
+
+# https://savannah.gnu.org/bugs/index.php?27433
+Patch0:         %{name}-2.2.0-addgsprefix.patch
+# https://savannah.gnu.org/bugs/index.php?27432
+Patch1:         %{name}-2.2.0-fix-rename-note.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
+Requires:       gnustep-filesystem = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
+
 
 %description
 The makefile package is a simple, powerful and extensible way to write
@@ -22,14 +29,25 @@ project without having to deal with the 
 configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 
-%if %{with docs}
+
+%package -n     gnustep-filesystem
+Summary:        The basic directory layout for GNUstep packages
+Group:          System Environment/Base
+License:        Public Domain
+BuildArch:      noarch
+
+%description -n gnustep-filesystem
+The gnustep-filesystem package contains the basic directory layout for
+GNUstep packages.
+
+
 %package        doc
 Summary:        Documentation for %{name}
 Group:          Documentation
 License:        GPLv3+
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
-
 %description    doc
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
@@ -38,58 +56,105 @@ configuration, building, installation, a
 the user to easily create cross-compiled binaries.
 
 This package contains documentation for %{name}.
-%endif
 
 %prep
 %setup -q
-perl -pi -e"s,/share/GNUstep/Documentation,`echo %{_defaultdocdir}/%{name}-doc-%{version} | sed -e's,^/usr,,'`," \
-  FilesystemLayouts/fhs-system
+%patch0 -p1 -b .addgsprefix
+%patch1 -p1 -b .fix-release-note
+sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs-system
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs-system
+sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs
 # /usr/share/GNUstep/Makefiles/config-noarch.make and
 # /usr/share/GNUstep/Makefiles/ix86/linux-gnu/gnu-gnu-gnu/config.make
 # are spoiling a pure /usr/share install
-sed -i -e 's,/local,,' FilesystemLayouts/fhs-system
-sed -i -e 's,=/lib,=/%_lib,' FilesystemLayouts/fhs-system
-perl -pi -e"s,GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles,GNUSTEP_MAKEFILES=`echo %{_libdir} | sed -e's,^/usr,,'`/GNUstep/Makefiles," \
-  FilesystemLayouts/fhs-system
+sed -i "s|=/share/GNUstep/Makefiles|=/%{_lib}/GNUstep/Makefiles|" \
+    FilesystemLayouts/fhs-system
+
+# Rename overly-generic .info files
+for i in faq filesystem machines userfaq; do
+    mv Documentation/{$i,gnustep-$i}.texi
+done
+
 
 %build
 %configure --with-layout=fhs-system --enable-flattened
 make
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-doc-%{version}
-%if %{with docs}
 make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles
 make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles DESTDIR=%{buildroot}
-%endif
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-install -p ANNOUNCE COPYING FAQ NEWS README \
-  %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+
+# create remaining GNUstep directories
+for i in Applications WebApplications; do
+    mkdir -p %{buildroot}%{_prefix}{,/local}/lib{,64}/GNUstep/$i
+done
+mkdir -p %{buildroot}%{_prefix}/local/share/GNUstep/Documentation
+
 
 %clean
 rm -rf %{buildroot}
 
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}
-#%{_datadir}/GNUstep
-%{_libdir}/GNUstep
-#%{_libexecdir}/GNUstep
-%dir /etc/GNUstep
-%config(noreplace) /etc/GNUstep/GNUstep.conf
+%doc ANNOUNCE COPYING FAQ NEWS README
+%config(noreplace) %{_sysconfdir}/GNUstep/GNUstep.conf
 %{_bindir}/*
+%{_libdir}/GNUstep/Makefiles
 %{_mandir}/man*/*
-%if %{with docs}
 %{_infodir}/*
-%endif
+
+%files -n gnustep-filesystem
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/GNUstep
+%dir %{_prefix}/lib/GNUstep
+%dir %{_prefix}/lib64/GNUstep
+%dir %{_prefix}/lib/GNUstep/Applications
+%dir %{_prefix}/lib64/GNUstep/Applications
+%dir %{_prefix}/lib/GNUstep/WebApplications
+%dir %{_prefix}/lib64/GNUstep/WebApplications
+%dir %{_prefix}/local/lib/GNUstep
+%dir %{_prefix}/local/lib/GNUstep/Applications
+%dir %{_prefix}/local/lib/GNUstep/WebApplications
+%dir %{_prefix}/local/lib64/GNUstep
+%dir %{_prefix}/local/lib64/GNUstep/Applications
+%dir %{_prefix}/local/lib64/GNUstep/WebApplications
+%dir %{_datadir}/GNUstep
+%dir %{_datadir}/GNUstep/Documentation
+%dir %{_prefix}/local/share/GNUstep
+%dir %{_prefix}/local/share/GNUstep/Documentation
+
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}-doc-%{version}
+%doc %{_datadir}/GNUstep/Documentation/*
+
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
+- Rename overly-generic info files
+- Fix all references to lib -> %%{_lib}
+- Add more directories to gnustep-filesystem
+
+* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- Replace perl scripts with sed equivalents; dropping BR
+
 * Thu Mar 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.0.8-2
 - Put documentation into separate subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Mar 2009 19:30:01 -0000	1.5
+++ sources	13 Sep 2009 22:34:00 -0000	1.6
@@ -1 +1 @@
-13bd26f135cbc38a94dfb220e9ffd460  gnustep-make-2.0.8.tar.gz
+3d2d06d3313432fc82e6b09c49fb7f8a  gnustep-make-2.2.0.tar.gz



From salimma at fedoraproject.org  Sun Sep 13 22:34:03 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 22:34:03 +0000 (UTC)
Subject: rpms/gnustep-make/devel gnustep-make-2.2.0-addgsprefix.patch, NONE, 
	1.1 gnustep-make-2.2.0-fix-rename-note.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 gnustep-make.spec, 1.13, 1.14 sources,
	1.5, 1.6
Message-ID: <20090913223403.E7C8D11C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16665/devel

Modified Files:
	.cvsignore gnustep-make.spec sources 
Added Files:
	gnustep-make-2.2.0-addgsprefix.patch 
	gnustep-make-2.2.0-fix-rename-note.patch 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
- Rename overly-generic info files
- Fix all references to lib -> %%{_lib}
- Add more directories to gnustep-filesystem

* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Replace perl scripts with sed equivalents; dropping BR



gnustep-make-2.2.0-addgsprefix.patch:
 GNUmakefile        |   31 ++++++++++++++++---------------
 gnustep-howto.texi |    2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE gnustep-make-2.2.0-addgsprefix.patch ---
--- gnustep-make-2.2.0/Documentation/GNUmakefile.addgsprefix	2008-06-11 12:28:47.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/GNUmakefile	2009-09-13 14:32:11.067200455 -0400
@@ -71,7 +71,8 @@
 # info 'faq' would probably return our faq before anything else
 # because the INFOPATH is used before built-in paths, but it's
 # still confusing to have conflicts.
-DOCUMENT_NAME = gnustep-howto faq filesystem internals machines gnustep-make userfaq
+DOCUMENT_NAME = gnustep-howto gnustep-faq gnustep-filesystem internals \
+	gnustep-machines gnustep-make gnustep-userfaq
 
 # The text documents to be generated
 DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS RELEASENOTES GNUstep-HOWTO ANNOUNCE
@@ -86,30 +87,30 @@
 GNUstep-HOWTO_DOC_INSTALL_DIR = User/GNUstep/
 
 FAQ_TEXI_FILES = version.texi
-FAQ_TEXT_MAIN = faq.texi
+FAQ_TEXT_MAIN = gnustep-faq.texi
 FAQ_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-make_TEXI_FILES = \
 gnustep-make.texi
 gnustep-make_DOC_INSTALL_DIR = Developer/Make/Manual/
 
-faq_TEXI_FILES = \
-faq.texi \
+gnustep-faq_TEXI_FILES = \
+gnustep-faq.texi \
 version.texi
-faq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-faq_DOC_INSTALL_DIR = User/GNUstep/
 
-userfaq_TEXI_FILES = \
-userfaq.texi \
+gnustep-userfaq_TEXI_FILES = \
+gnustep-userfaq.texi \
 version.texi
-userfaq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-userfaq_DOC_INSTALL_DIR = User/GNUstep/
 
-filesystem_TEXI_FILES = \
-filesystem.texi
-filesystem_DOC_INSTALL_DIR = User/GNUstep/
-
-machines_TEXI_FILES = \
-machines.texi 
-machines_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-filesystem_TEXI_FILES = \
+gnustep-filesystem.texi
+gnustep-filesystem_DOC_INSTALL_DIR = User/GNUstep/
+
+gnustep-machines_TEXI_FILES = \
+gnustep-machines.texi 
+gnustep-machines_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-howto_TEXI_FILES = \
 gnustep-howto.texi \
--- gnustep-make-2.2.0/Documentation/gnustep-howto.texi.addgsprefix	2007-03-17 16:19:11.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/gnustep-howto.texi	2009-09-13 14:33:14.792200412 -0400
@@ -460,7 +460,7 @@
 @node Machine Specific, Source via SVN, Tools and Applications, Top
 @chapter Machine Specific Instructions
 
- at include machines.texi
+ at include gnustep-machines.texi
 
 
 @node Source via SVN,  , Machine Specific, Top

gnustep-make-2.2.0-fix-rename-note.patch:
 releasenotes.texi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnustep-make-2.2.0-fix-rename-note.patch ---
--- gnustep-make-2.2.0/Documentation/releasenotes.texi.fix-rename-note	2009-05-09 14:32:29.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/releasenotes.texi	2009-09-13 14:22:43.075450206 -0400
@@ -91,7 +91,7 @@
 different location, use the --with-config-file=PATH option, as in
 --with-config-file=/usr/pkg/etc/GNUstep.conf.
 
- at item gnustep-make.info renamed to make.info
+ at item make.info renamed to gnustep-make.info
 To prevent conflicts with the standard GNU 'make' info documentation,
 the gnustep-make one has been renamed.  Now you can access it as in
 'info gnustep-make' instead of 'info make', avoiding any conflicts and


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Mar 2009 19:30:01 -0000	1.5
+++ .cvsignore	13 Sep 2009 22:34:02 -0000	1.6
@@ -1 +1 @@
-gnustep-make-2.0.8.tar.gz
+gnustep-make-2.2.0.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/gnustep-make.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gnustep-make.spec	25 Jul 2009 01:00:07 -0000	1.13
+++ gnustep-make.spec	13 Sep 2009 22:34:02 -0000	1.14
@@ -1,19 +1,26 @@
 %global debug_package %{nil}
-%bcond_without docs
 
-Summary: GNUstep makefile package
-Name: gnustep-make
-Version: 2.0.8
-Release: 3%{?dist}
-License: GPLv3+
-Group: Development/Tools
-URL: http://www.gnustep.org/
-Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl
-%if %{with docs}
-BuildRequires: texinfo-tex, tetex-latex, tetex-dvips, latex2html, texi2html
-%endif
+Name:           gnustep-make
+Version:        2.2.0
+Release:        2%{?dist}
+Summary:        GNUstep makefile package
+
+Group:          Development/Tools
+License:        GPLv3+
+URL:            http://www.gnustep.org/
+Source0:        ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
+
+# https://savannah.gnu.org/bugs/index.php?27433
+Patch0:         %{name}-2.2.0-addgsprefix.patch
+# https://savannah.gnu.org/bugs/index.php?27432
+Patch1:         %{name}-2.2.0-fix-rename-note.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
+Requires:       gnustep-filesystem = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
+
 
 %description
 The makefile package is a simple, powerful and extensible way to write
@@ -22,14 +29,25 @@ project without having to deal with the 
 configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 
-%if %{with docs}
+
+%package -n     gnustep-filesystem
+Summary:        The basic directory layout for GNUstep packages
+Group:          System Environment/Base
+License:        Public Domain
+BuildArch:      noarch
+
+%description -n gnustep-filesystem
+The gnustep-filesystem package contains the basic directory layout for
+GNUstep packages.
+
+
 %package        doc
 Summary:        Documentation for %{name}
 Group:          Documentation
 License:        GPLv3+
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
-
 %description    doc
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
@@ -38,58 +56,105 @@ configuration, building, installation, a
 the user to easily create cross-compiled binaries.
 
 This package contains documentation for %{name}.
-%endif
 
 %prep
 %setup -q
-perl -pi -e"s,/share/GNUstep/Documentation,`echo %{_defaultdocdir}/%{name}-doc-%{version} | sed -e's,^/usr,,'`," \
-  FilesystemLayouts/fhs-system
+%patch0 -p1 -b .addgsprefix
+%patch1 -p1 -b .fix-release-note
+sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs-system
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs-system
+sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs
 # /usr/share/GNUstep/Makefiles/config-noarch.make and
 # /usr/share/GNUstep/Makefiles/ix86/linux-gnu/gnu-gnu-gnu/config.make
 # are spoiling a pure /usr/share install
-sed -i -e 's,/local,,' FilesystemLayouts/fhs-system
-sed -i -e 's,=/lib,=/%_lib,' FilesystemLayouts/fhs-system
-perl -pi -e"s,GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles,GNUSTEP_MAKEFILES=`echo %{_libdir} | sed -e's,^/usr,,'`/GNUstep/Makefiles," \
-  FilesystemLayouts/fhs-system
+sed -i "s|=/share/GNUstep/Makefiles|=/%{_lib}/GNUstep/Makefiles|" \
+    FilesystemLayouts/fhs-system
+
+# Rename overly-generic .info files
+for i in faq filesystem machines userfaq; do
+    mv Documentation/{$i,gnustep-$i}.texi
+done
+
 
 %build
 %configure --with-layout=fhs-system --enable-flattened
 make
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-doc-%{version}
-%if %{with docs}
 make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles
 make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles DESTDIR=%{buildroot}
-%endif
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-install -p ANNOUNCE COPYING FAQ NEWS README \
-  %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+
+# create remaining GNUstep directories
+for i in Applications WebApplications; do
+    mkdir -p %{buildroot}%{_prefix}{,/local}/lib{,64}/GNUstep/$i
+done
+mkdir -p %{buildroot}%{_prefix}/local/share/GNUstep/Documentation
+
 
 %clean
 rm -rf %{buildroot}
 
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}
-#%{_datadir}/GNUstep
-%{_libdir}/GNUstep
-#%{_libexecdir}/GNUstep
-%dir /etc/GNUstep
-%config(noreplace) /etc/GNUstep/GNUstep.conf
+%doc ANNOUNCE COPYING FAQ NEWS README
+%config(noreplace) %{_sysconfdir}/GNUstep/GNUstep.conf
 %{_bindir}/*
+%{_libdir}/GNUstep/Makefiles
 %{_mandir}/man*/*
-%if %{with docs}
 %{_infodir}/*
-%endif
+
+%files -n gnustep-filesystem
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/GNUstep
+%dir %{_prefix}/lib/GNUstep
+%dir %{_prefix}/lib64/GNUstep
+%dir %{_prefix}/lib/GNUstep/Applications
+%dir %{_prefix}/lib64/GNUstep/Applications
+%dir %{_prefix}/lib/GNUstep/WebApplications
+%dir %{_prefix}/lib64/GNUstep/WebApplications
+%dir %{_prefix}/local/lib/GNUstep
+%dir %{_prefix}/local/lib/GNUstep/Applications
+%dir %{_prefix}/local/lib/GNUstep/WebApplications
+%dir %{_prefix}/local/lib64/GNUstep
+%dir %{_prefix}/local/lib64/GNUstep/Applications
+%dir %{_prefix}/local/lib64/GNUstep/WebApplications
+%dir %{_datadir}/GNUstep
+%dir %{_datadir}/GNUstep/Documentation
+%dir %{_prefix}/local/share/GNUstep
+%dir %{_prefix}/local/share/GNUstep/Documentation
+
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}-doc-%{version}
+%doc %{_datadir}/GNUstep/Documentation/*
+
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
+- Rename overly-generic info files
+- Fix all references to lib -> %%{_lib}
+- Add more directories to gnustep-filesystem
+
+* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- Replace perl scripts with sed equivalents; dropping BR
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Mar 2009 19:30:01 -0000	1.5
+++ sources	13 Sep 2009 22:34:03 -0000	1.6
@@ -1 +1 @@
-13bd26f135cbc38a94dfb220e9ffd460  gnustep-make-2.0.8.tar.gz
+3d2d06d3313432fc82e6b09c49fb7f8a  gnustep-make-2.2.0.tar.gz



From salimma at fedoraproject.org  Sun Sep 13 23:02:09 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 23:02:09 +0000 (UTC)
Subject: rpms/gnustep-make/F-10 gnustep-make.spec,1.11,1.12
Message-ID: <20090913230210.1A05011C0427@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21860/F-10

Modified Files:
	gnustep-make.spec 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
- Package now BuildConflicts: itself (bz#473342)



Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/gnustep-make.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnustep-make.spec	13 Sep 2009 22:34:00 -0000	1.11
+++ gnustep-make.spec	13 Sep 2009 23:02:04 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@ Patch0:         %{name}-2.2.0-addgsprefi
 Patch1:         %{name}-2.2.0-fix-rename-note.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildConflicts: gnustep-make
 BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
 Requires:       gnustep-filesystem = %{version}-%{release}
 Requires(post): info
@@ -146,6 +147,9 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
+- Package now BuildConflicts: itself (bz#473342)
+
 * Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
 - Rename overly-generic info files
 - Fix all references to lib -> %%{_lib}



From salimma at fedoraproject.org  Sun Sep 13 23:02:09 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 23:02:09 +0000 (UTC)
Subject: rpms/gnustep-make/devel gnustep-make.spec,1.14,1.15
Message-ID: <20090913230210.16AD611C0425@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21860/devel

Modified Files:
	gnustep-make.spec 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
- Package now BuildConflicts: itself (bz#473342)



Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/gnustep-make.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gnustep-make.spec	13 Sep 2009 22:34:02 -0000	1.14
+++ gnustep-make.spec	13 Sep 2009 23:02:09 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@ Patch0:         %{name}-2.2.0-addgsprefi
 Patch1:         %{name}-2.2.0-fix-rename-note.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildConflicts: gnustep-make
 BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
 Requires:       gnustep-filesystem = %{version}-%{release}
 Requires(post): info
@@ -146,6 +147,9 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
+- Package now BuildConflicts: itself (bz#473342)
+
 * Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
 - Rename overly-generic info files
 - Fix all references to lib -> %%{_lib}



From salimma at fedoraproject.org  Sun Sep 13 23:02:09 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 13 Sep 2009 23:02:09 +0000 (UTC)
Subject: rpms/gnustep-make/F-11 gnustep-make.spec,1.13,1.14
Message-ID: <20090913230210.1279B11C0375@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21860/F-11

Modified Files:
	gnustep-make.spec 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
- Package now BuildConflicts: itself (bz#473342)



Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-11/gnustep-make.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gnustep-make.spec	13 Sep 2009 22:34:01 -0000	1.13
+++ gnustep-make.spec	13 Sep 2009 23:02:07 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@ Patch0:         %{name}-2.2.0-addgsprefi
 Patch1:         %{name}-2.2.0-fix-rename-note.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildConflicts: gnustep-make
 BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
 Requires:       gnustep-filesystem = %{version}-%{release}
 Requires(post): info
@@ -146,6 +147,9 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
+- Package now BuildConflicts: itself (bz#473342)
+
 * Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
 - Rename overly-generic info files
 - Fix all references to lib -> %%{_lib}



From crobinso at fedoraproject.org  Sun Sep 13 23:14:09 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Sun, 13 Sep 2009 23:14:09 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.500.0-no-default-keymap.patch,
	NONE, 1.1 virtinst-0.500.0-update-testsuite.patch, NONE,
	1.1 virtinst-0.500.0-virtio-cdrom.patch, NONE,
	1.1 virtinst-0.500.0-virtio-dev-limit.patch, NONE,
	1.1 python-virtinst.spec, 1.70, 1.71
Message-ID: <20090913231409.19E4411C0374@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv846

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.0-no-default-keymap.patch 
	virtinst-0.500.0-update-testsuite.patch 
	virtinst-0.500.0-virtio-cdrom.patch 
	virtinst-0.500.0-virtio-dev-limit.patch 
Log Message:
Don't erroneously set limit for amount of virtio devices (bz 499654)
Don't use virtio for cdrom devices (bz 517151)
Auto detect keymapping (bz 487735)


virtinst-0.500.0-no-default-keymap.patch:
 VirtualGraphics.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE virtinst-0.500.0-no-default-keymap.patch ---
diff -r 712276328f75 virtinst/VirtualGraphics.py
--- a/virtinst/VirtualGraphics.py	Wed Apr 08 10:27:20 2009 -0400
+++ b/virtinst/VirtualGraphics.py	Thu Apr 09 09:48:36 2009 -0400
@@ -55,8 +55,9 @@
     def get_keymap(self):
         return self._keymap
     def set_keymap(self, val):
-        if not val:
-            val = _util.default_keymap()
+        if val == None:
+            self._keymap = val
+            return
         if not val or type(val) != type("string"):
             raise ValueError, _("Keymap must be a string")
         if len(val) > 16:

virtinst-0.500.0-update-testsuite.patch:
 testdriver.xml |   16 ++++++++++++----
 xmlconfig.py   |    3 +--
 2 files changed, 13 insertions(+), 6 deletions(-)

--- NEW FILE virtinst-0.500.0-update-testsuite.patch ---
diff -rup old/tests/testdriver.xml virtinst-0.500.0/tests/testdriver.xml
--- old/tests/testdriver.xml	2009-09-13 19:06:49.000000000 -0400
+++ virtinst-0.500.0/tests/testdriver.xml	2009-09-13 19:07:02.000000000 -0400
@@ -62,19 +62,25 @@
     <name>default-vol</name>
     <capacity>1000000</capacity>
     <allocation>50000</allocation>
-    <target/>
+    <target>
+      <format type='qcow2'/>
+    </target>
   </volume>
   <volume>
     <name>testvol1.img</name>
     <capacity>1000000</capacity>
     <allocation>50000</allocation>
-    <target/>
+    <target>
+      <format type='qcow2'/>
+    </target>
   </volume>
   <volume>
     <name>testvol2.img</name>
     <capacity>1000000</capacity>
     <allocation>50000</allocation>
-    <target/>
+    <target>
+      <format type='qcow2'/>
+    </target>
   </volume>
 </pool>
 
@@ -153,7 +159,9 @@
     <name>testvol1.img</name>
     <capacity>107374182400</capacity>
     <allocation>107374182400</allocation>
-    <target/>
+    <target>
+      <format type='qcow2'/>
+    </target>
   </volume>
 </pool>
 
diff -rup old/tests/xmlconfig.py virtinst-0.500.0/tests/xmlconfig.py
--- old/tests/xmlconfig.py	2009-09-13 19:06:49.000000000 -0400
+++ virtinst-0.500.0/tests/xmlconfig.py	2009-09-13 19:10:56.000000000 -0400
@@ -28,7 +28,7 @@ from virtinst import VirtualCharDevice
 from virtinst import VirtualVideoDevice
 import tests
 
-conn = libvirt.open("test:///default")
+conn = tests.open_testdriver()
 
 def get_basic_paravirt_guest():
     g = virtinst.ParaVirtGuest(connection=conn, type="xen")
@@ -41,7 +41,6 @@ def get_basic_paravirt_guest():
     g.vcpus = 5
     return g
 
-conn = libvirt.open("test:///default")
 def get_basic_fullyvirt_guest(typ="xen"):
     g = virtinst.FullVirtGuest(connection=conn, type=typ,
                                emulator="/usr/lib/xen/bin/qemu-dm",

virtinst-0.500.0-virtio-cdrom.patch:
 tests/xmlconfig-xml/install-f11.xml |    9 +++++++++
 tests/xmlconfig.py                  |   10 ++++++++--
 virtinst/FullVirtGuest.py           |    4 +++-
 3 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE virtinst-0.500.0-virtio-cdrom.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1252880415 14400
# Node ID 252ff7bc5ff9e95f49dd7deb6ef6af07287a5055
# Parent  726dc69533961f5cf7865e35be2b851f5f686c52
Don't use virtio for cdrom/floppy devices (bz 517151)

Also add a test case to prevent against this issue in the future.

diff -r 726dc6953396 -r 252ff7bc5ff9 tests/xmlconfig-xml/install-f11.xml
--- a/tests/xmlconfig-xml/install-f11.xml	Sun Sep 13 13:05:53 2009 -0400
+++ b/tests/xmlconfig-xml/install-f11.xml	Sun Sep 13 18:20:15 2009 -0400
@@ -17,6 +17,10 @@
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <disk type='file' device='floppy'>
+      <source file='/default-pool/testvol1.img'/>
+      <target dev='fda' bus='fdc'/>
+    </disk>
     <disk type='file' device='disk'>
       <source file='/tmp/test.img'/>
       <target dev='vda' bus='virtio'/>
@@ -25,6 +29,11 @@
       <source dev='/dev/loop0'/>
       <target dev='vdb' bus='virtio'/>
     </disk>
+    <disk type='file' device='cdrom'>
+      <source file='/default-pool/default-vol'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+    </disk>
     <interface type='network'>
       <source network='default'/>
       <mac address='11:22:33:44:55:66'/>
diff -r 726dc6953396 -r 252ff7bc5ff9 tests/xmlconfig.py
--- a/tests/xmlconfig.py	Sun Sep 13 13:05:53 2009 -0400
+++ b/tests/xmlconfig.py	Sun Sep 13 18:20:15 2009 -0400
@@ -57,6 +57,9 @@
     g.vcpus = 5
     return g
 
+def get_floppy(path="/default-pool/testvol1.img"):
+    return VirtualDisk(path, conn=conn, device=VirtualDisk.DEVICE_FLOPPY)
+
 def get_filedisk(path="/tmp/test.img"):
     return VirtualDisk(path, size=.0001, conn=conn)
 
@@ -326,8 +329,11 @@
         g = get_basic_fullyvirt_guest("kvm")
         g.os_type = "linux"
         g.os_variant = "fedora11"
-        g.installer = virtinst.PXEInstaller(type="kvm", os_type="hvm",
-                                            conn=g.conn)
+        g.installer = virtinst.DistroInstaller(type="kvm", os_type="hvm",
+                                               conn=g.conn,
+                                               location="/default-pool/default-vol")
+        g.installer.cdrom = True
+        g.disks.append(get_floppy())
         g.disks.append(get_filedisk())
         g.disks.append(get_blkdisk())
         g.nics.append(get_virtual_network())
diff -r 726dc6953396 -r 252ff7bc5ff9 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Sun Sep 13 13:05:53 2009 -0400
+++ b/virtinst/FullVirtGuest.py	Sun Sep 13 18:20:15 2009 -0400
@@ -24,6 +24,7 @@
 
 from Guest import Guest
 from VirtualDevice import VirtualDevice
+from VirtualDisk import VirtualDisk
 from VirtualInputDevice import VirtualInputDevice
 from VirtualCharDevice import VirtualCharDevice
 
@@ -122,7 +123,8 @@
             if net_model and not net.model:
                 net.model = net_model
         for disk in self._get_install_devs(VirtualDevice.VIRTUAL_DEV_DISK):
-            if disk_bus and not disk.bus:
+            if (disk_bus and not disk.bus and
+                disk.device == VirtualDisk.DEVICE_DISK):
                 disk.bus = disk_bus
 
         # If no serial devices were attached to the guest, stick the default

virtinst-0.500.0-virtio-dev-limit.patch:
 tests/clitest.py        |    2 ++
 virtinst/VirtualDisk.py |    8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE virtinst-0.500.0-virtio-dev-limit.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1252861553 14400
# Node ID 726dc69533961f5cf7865e35be2b851f5f686c52
# Parent  0d3cdc5ff5d091dd73d3ef0fe21123fb63b4d7a0
Don't erroneously limit the amount of virtio disks (bz 499654)

Just let qemu error if we add too many.

diff -r 0d3cdc5ff5d0 -r 726dc6953396 tests/clitest.py
--- a/tests/clitest.py	Wed Aug 05 14:37:02 2009 -0400
+++ b/tests/clitest.py	Sun Sep 13 13:05:53 2009 -0400
@@ -128,6 +128,8 @@
         "--disk vol=%(POOL)s/%(VOL)s",
         # 3 IDE and CD
         "--disk path=%(EXISTIMG1)s --disk path=%(EXISTIMG1)s --disk path=%(EXISTIMG1)s --disk path=%(EXISTIMG1)s,device=cdrom",
+        # > 16 scsi disks
+        " --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi",
       ],
 
       "invalid": [
diff -r 0d3cdc5ff5d0 -r 726dc6953396 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Wed Aug 05 14:37:02 2009 -0400
+++ b/virtinst/VirtualDisk.py	Sun Sep 13 13:05:53 2009 -0400
@@ -1142,12 +1142,14 @@
         the passed parameters.
         @returns: str prefix, or None if no reasonable guess can be made
         """
+        # The upper limits here aren't necessarilly 1024, but let the HV
+        # error as appropriate.
         if self.bus == "virtio":
-            return ("vd", 16)
+            return ("vd", 1024)
         elif self.bus == "scsi" or self.bus == "usb":
-            return ("sd", 16)
+            return ("sd", 1024)
         elif self.bus == "xen":
-            return ("xvd", 16)
+            return ("xvd", 1024)
         elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY:
             return ("fd", 2)
         elif self.bus == "ide":


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- python-virtinst.spec	29 Jul 2009 02:17:47 -0000	1.70
+++ python-virtinst.spec	13 Sep 2009 23:14:03 -0000	1.71
@@ -17,8 +17,17 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.0
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+# Don't erroneously set limit for amount of virtio devices (bz 499654)
+Patch1: %{appname}-%{version}-virtio-dev-limit.patch
+# Don't use virtio for cdrom devices (bz 517151)
+Patch2: %{appname}-%{version}-virtio-cdrom.patch
+# Rawhide/F11 can auto detect keymapping (bz 487735)
+Patch3: %{appname}-%{version}-no-default-keymap.patch
+# Update test suite to verify patches
+Patch4: %{appname}-%{version}-update-testsuite.patch
+
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +54,10 @@ and install new VMs) and virt-clone (clo
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 python setup.py build
@@ -80,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Sun Sep 13 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-2.fc12
+- Don't erroneously set limit for amount of virtio devices (bz 499654)
+- Don't use virtio for cdrom devices (bz 517151)
+- Auto detect keymapping (bz 487735)
+
 * Tue Jul 28 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-1.fc12
 - Update to version 0.500.0
 - New virt-install device options --serial, --parallel, and --video



From crobinso at fedoraproject.org  Sun Sep 13 23:48:36 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Sun, 13 Sep 2009 23:48:36 +0000 (UTC)
Subject: rpms/python-virtinst/F-11
	virtinst-0.400.3-default-bridge-error.patch, 
	NONE, 1.1 virtinst-0.400.3-sles-virtio.patch, NONE,
	1.1 virtinst-0.400.3-virtio-dev-limit.patch, NONE,
	1.1 python-virtinst.spec, 1.69, 1.70
Message-ID: <20090913234836.BF88E11C0374@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-serv23121

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-default-bridge-error.patch 
	virtinst-0.400.3-sles-virtio.patch 
	virtinst-0.400.3-virtio-dev-limit.patch 
Log Message:
Fix parse error when looking for default bridge (bz 506319)
Use virtio for SLES guests (bz 505317)
Don't erroneously set limit for amount of virtio devices (bz 499654)


virtinst-0.400.3-default-bridge-error.patch:
 VirtualNetworkInterface.py |    2 -
 _util.py                   |   50 ++++++++++++++++++++++++++++++++++++++
 util.py                    |   58 +++++++++------------------------------------
 3 files changed, 62 insertions(+), 48 deletions(-)

--- NEW FILE virtinst-0.400.3-default-bridge-error.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1245253380 14400
# Node ID 503cd42936a950399e3684430d6caffe3aa75c1f
# Parent  9da0cafaf0e9c68a0e3ada8ca33eff0999493533
Refactor default net device searching.

We had some duplicate code, and some pretty careless code that could
bomb out in corner cases (rhbz 506319)

diff -rup old/virtinst/_util.py virtinst-0.400.3/virtinst/_util.py
--- old/virtinst/_util.py	2009-09-13 18:44:41.000000000 -0400
+++ virtinst-0.400.3/virtinst/_util.py	2009-09-13 18:51:17.000000000 -0400
@@ -28,10 +28,12 @@ import os
 import re
 import commands
 import logging
+import platform
+import subprocess
 
 import libvirt
 
-from virtinst import util
+import virtinst.util as util
 from virtinst import _virtinst as _
 
 def is_vdisk(path):
@@ -176,6 +178,52 @@ def fetch_all_guests(conn):
     return (active, inactive)
 
 
+def default_nic():
+    """
+    Return the default NIC to use, if one is specified.
+    """
+
+    dev = ''
+
+    if platform.system() != 'SunOS':
+        return dev
+
+    # XXX: fails without PRIV_XVM_CONTROL
+    proc = subprocess.Popen(['/usr/lib/xen/bin/xenstore-read',
+        'device-misc/vif/default-nic'], stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE)
+    out = proc.stdout.readlines()
+    if len(out) > 0:
+        dev = out[0].rstrip()
+
+    return dev
+
+def default_bridge2(conn = None):
+    if platform.system() == 'SunOS':
+        return ["bridge", default_nic()]
+
+    dev = util.default_route()
+
+    if (dev is not None and
+        (not conn or not is_uri_remote(conn.getURI()))):
+        # New style peth0 == phys dev, eth0 == bridge, eth0 == default route
+        if os.path.exists("/sys/class/net/%s/bridge" % dev):
+            return ["bridge", dev]
+
+        # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge,
+        # vif0.0 == netloop enslaved, eth0 == default route
+        try:
+            defn = int(dev[-1])
+        except:
+            defn = -1
+
+        if (defn >= 0 and
+            os.path.exists("/sys/class/net/peth%d/brport" % defn) and
+            os.path.exists("/sys/class/net/xenbr%d/bridge" % defn)):
+            return ["bridge", "xenbr%d" % defn]
+
+    return None
+
 #
 # These functions accidentally ended up in the API under virtinst.util
 #
diff -rup old/virtinst/util.py virtinst-0.400.3/virtinst/util.py
--- old/virtinst/util.py	2009-09-13 18:44:41.000000000 -0400
+++ virtinst-0.400.3/virtinst/util.py	2009-09-13 18:51:17.000000000 -0400
@@ -38,6 +38,7 @@ from sys import stderr
 
 import libvirt
 from virtinst import _virtinst as _
+import virtinst
 import CapabilitiesParser
 from User import User
 
@@ -75,59 +76,24 @@ def default_route(nic = None):
             continue
     return None
 
-def _default_nic():
-    """Return the default NIC to use, if one is specified.
-       This is NOT part of the API and may change at will."""
-
-    dev = ''
-
-    if platform.system() != 'SunOS':
-        return dev
-
-    # XXX: fails without PRIV_XVM_CONTROL
-    proc = subprocess.Popen(['/usr/lib/xen/bin/xenstore-read',
-        'device-misc/vif/default-nic'], stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE)
-    out = proc.stdout.readlines()
-    if len(out) > 0:
-        dev = out[0].rstrip()
-
-    return dev
 
 def default_bridge():
-    if platform.system() == 'SunOS':
-        return _default_nic()
-
-    rt = default_route()
-    if rt is None:
-        defn = None
+    ret = virtinst._util.default_bridge2(None)
+    if not ret:
+        # Maintain this behavior for back compat
+        ret = "xenbr0"
     else:
-        defn = int(rt[-1])
+        ret = ret[1]
 
-    if defn is None:
-        return "xenbr0"
-    else:
-        return "xenbr%d"%(defn)
+    return ret
 
 def default_network(conn):
-    if platform.system() == 'SunOS':
-        return ["bridge", _default_nic()]
-
-    dev = default_route()
-
-    if dev is not None and not is_uri_remote(conn.getURI()):
-        # New style peth0 == phys dev, eth0 == bridge, eth0 == default route
-        if os.path.exists("/sys/class/net/%s/bridge" % dev):
-            return ["bridge", dev]
-
-        # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge,
-        # vif0.0 == netloop enslaved, eth0 == default route
-        defn = int(dev[-1])
-        if os.path.exists("/sys/class/net/peth%d/brport" % defn) and \
-           os.path.exists("/sys/class/net/xenbr%d/bridge" % defn):
-            return ["bridge", "xenbr%d" % defn]
+    ret = virtinst._util.default_bridge2(conn)
+    if not ret:
+        # FIXME: Check that this exists
+        ret = ["network", "default"]
 
-    return ["network", "default"]
+    return ret
 
 def default_connection():
     if os.path.exists('/var/lib/xend'):
diff -rup old/virtinst/VirtualNetworkInterface.py virtinst-0.400.3/virtinst/VirtualNetworkInterface.py
--- old/virtinst/VirtualNetworkInterface.py	2009-09-13 18:44:41.000000000 -0400
+++ virtinst-0.400.3/virtinst/VirtualNetworkInterface.py	2009-09-13 18:51:17.000000000 -0400
@@ -127,7 +127,7 @@ class VirtualNetworkInterface(VirtualDev
                     raise RuntimeError(msg)
 
         if not self.bridge and self.type == "bridge":
-            self.bridge = _util.default_bridge()
+            self.bridge = _util.default_bridge2(self.conn)
 
     def get_xml_config(self):
         src_xml = ""

virtinst-0.400.3-sles-virtio.patch:
 osdict.py |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE virtinst-0.400.3-sles-virtio.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1247623635 14400
# Node ID dbda3bfc28f8d81d244c7b54998e63a85ddf9824
# Parent  3c68ba7758a6190f28ec32ab20a3ce96f7802542
osdict: Add SLES 11 (supports virtio)

diff -r 3c68ba7758a6 -r dbda3bfc28f8 virtinst/osdict.py
--- a/virtinst/osdict.py	Tue Jul 14 12:13:50 2009 -0400
+++ b/virtinst/osdict.py	Tue Jul 14 22:07:15 2009 -0400
@@ -174,6 +174,13 @@
                      }},
         "sles10": { "label": "Suse Linux Enterprise Server",
                     "distro": "suse" },
+        "sles11": { "label": "Suse Linux Enterprise Server 11",
+                    "distro": "suse",
+                      "devices" : {
+                        "disk" : { "bus"   : [ (["kvm"], "virtio") ] },
+                        "net"  : { "model" : [ (["kvm"], "virtio") ] },
+                    },
+                  },
         "debianetch": { "label": "Debian Etch", "distro": "debian" },
         "debianlenny": { "label": "Debian Lenny", "distro": "debian",
                       "devices" : {

virtinst-0.400.3-virtio-dev-limit.patch:
 VirtualDisk.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE virtinst-0.400.3-virtio-dev-limit.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1252861553 14400
# Node ID 726dc69533961f5cf7865e35be2b851f5f686c52
# Parent  0d3cdc5ff5d091dd73d3ef0fe21123fb63b4d7a0
Don't erroneously limit the amount of virtio disks (bz 499654)

Just let qemu error if we add too many.

diff -r 0d3cdc5ff5d0 -r 726dc6953396 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Wed Aug 05 14:37:02 2009 -0400
+++ b/virtinst/VirtualDisk.py	Sun Sep 13 13:05:53 2009 -0400
@@ -1142,12 +1142,14 @@
         the passed parameters.
         @returns: str prefix, or None if no reasonable guess can be made
         """
+        # The upper limits here aren't necessarilly 1024, but let the HV
+        # error as appropriate.
         if self.bus == "virtio":
-            return ("vd", 16)
+            return ("vd", 1024)
         elif self.bus == "scsi" or self.bus == "usb":
-            return ("sd", 16)
+            return ("sd", 1024)
         elif self.bus == "xen":
-            return ("xvd", 16)
+            return ("xvd", 1024)
         elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY:
             return ("fd", 2)
         elif self.bus == "ide":


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- python-virtinst.spec	6 May 2009 16:10:47 -0000	1.69
+++ python-virtinst.spec	13 Sep 2009 23:48:25 -0000	1.70
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 8%{_extra_release}
+Release: 9%{_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
@@ -33,6 +33,13 @@ Patch7: %{appname}-%{version}-updated-tr
 Patch8: %{appname}-%{version}-selinux-warn.patch
 # Fix PCI assignment detach/reset calls (bz 499267)
 Patch9: %{appname}-%{version}-fix-pci-assign.patch
+# Fix parse error when looking for default bridge (bz 506319)
+Patch10: %{appname}-%{version}-default-bridge-error.patch
+# Use virtio for SLES guests (bz 505317)
+Patch11: %{appname}-%{version}-sles-virtio.patch
+# Don't erroneously set limit for amount of virtio devices (bz 499654)
+Patch12: %{appname}-%{version}-virtio-dev-limit.patch
+
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +75,9 @@ and install new VMs) and virt-clone (clo
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 python setup.py build
@@ -103,6 +113,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Sun Sep 13 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-9.fc11
+- Fix parse error when looking for default bridge (bz 506319)
+- Use virtio for SLES guests (bz 505317)
+- Don't erroneously set limit for amount of virtio devices (bz 499654)
+
 * Wed May 06 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-8.fc11
 - Fix PCI assignment (bz 499267)
 



From rathann at fedoraproject.org  Mon Sep 14 00:01:21 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 00:01:21 +0000 (UTC)
Subject: rpms/openbabel/devel openbabel-inchi.patch, 1.1, 1.2 openbabel.spec,
	1.48, 1.49 openbabel-check.patch, 1.11, NONE
Message-ID: <20090914000121.9D60A11C0375@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/openbabel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2117

Modified Files:
	openbabel-inchi.patch openbabel.spec 
Removed Files:
	openbabel-check.patch 
Log Message:
- fixed configure to detect external inchi (both pre-1.0.2 and 1.0.2)
- re-enabled inchi tests


openbabel-inchi.patch:
 configure.in            |    5 ++++-
 src/formats/Makefile.am |   14 +++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

Index: openbabel-inchi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-inchi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openbabel-inchi.patch	13 Sep 2009 17:27:34 -0000	1.1
+++ openbabel-inchi.patch	14 Sep 2009 00:01:18 -0000	1.2
@@ -1,12 +1,65 @@
 diff -up openbabel-2.2.3/configure.in.inchi openbabel-2.2.3/configure.in
 --- openbabel-2.2.3/configure.in.inchi	2009-07-29 03:05:04.000000000 +0200
-+++ openbabel-2.2.3/configure.in	2009-08-26 16:26:08.000000000 +0200
-@@ -239,7 +239,7 @@ AC_SUBST(LIBDL)
++++ openbabel-2.2.3/configure.in	2009-09-14 01:14:49.000000000 +0200
+@@ -239,8 +239,11 @@ AC_SUBST(LIBDL)
  AM_PATH_XML2(2.6.5)
  AM_CONDITIONAL(BUILD_XML, test x"$XML_LIBS" != "x")
  
--AC_CHECK_LIB(inchi, GetINCHI, LIBINCHI="-linchi", LIBINCHI="")
-+AC_CHECK_LIB(stdinchi, GetStdINCHI, LIBINCHI="-lstdinchi", LIBINCHI="")
- AM_CONDITIONAL(BUILD_INCHI, test x"$LIBINCHI" = "x" -o "$inchi" = "yes")
++AC_CHECK_LIB(stdinchi, GetStdINCHI, LIBSTDINCHI="-lstdinchi", LIBSTDINCHI="")
+ AC_CHECK_LIB(inchi, GetINCHI, LIBINCHI="-linchi", LIBINCHI="")
+-AM_CONDITIONAL(BUILD_INCHI, test x"$LIBINCHI" = "x" -o "$inchi" = "yes")
++AM_CONDITIONAL(HAVE_INCHI, test x"$LIBINCHI" != "x" -o x"$LIBSTDINCHI" != "x" -o "$inchi" = "yes")
++AM_CONDITIONAL(HAVE_STDINCHI, test x"$LIBSTDINCHI" != "x")
++AM_CONDITIONAL(BUILD_INCHI, test "$inchi" = "yes")
  
  AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])
+ AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
+diff -up openbabel-2.2.3/src/formats/Makefile.am.inchi openbabel-2.2.3/src/formats/Makefile.am
+--- openbabel-2.2.3/src/formats/Makefile.am.inchi	2009-07-09 15:05:02.000000000 +0200
++++ openbabel-2.2.3/src/formats/Makefile.am	2009-09-14 01:15:55.000000000 +0200
+@@ -39,11 +39,17 @@ endif
+ 
+ if !BUILD_SHARED
+ noinst_LTLIBRARIES = libformats.la
++if HAVE_INCHI
+ if BUILD_INCHI
+ libformats_la_LIBADD = inchi102/libinchi.la
+ else
++if HAVE_STDINCHI
++libformats_la_LIBADD = -lstdinchi
++else
+ libformats_la_LIBADD = -linchi
+ endif
++endif
++endif
+ libformats_la_SOURCES = \
+ 	APIInterface.cpp MCDLformat.cpp \
+ 	CSRformat.cpp PQSformat.cpp alchemyformat.cpp \
+@@ -124,7 +130,7 @@ if HAVE_SHARED_POINTER
+ formats_LTLIBRARIES += chemdrawcdxformat.la chemkinformat.la \
+                           rxnformat.la rsmiformat.la
+ endif
+-if BUILD_INCHI
++if HAVE_INCHI
+ formats_LTLIBRARIES += inchiformat.la
+ endif
+ if BUILD_ZLIB
+@@ -261,12 +267,18 @@ hinformat_la_SOURCES = hinformat.cpp 
+ hinformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la 
+ 
+ inchiformat_la_SOURCES = inchiformat.cpp  getinchi.cpp
++if HAVE_INCHI
+ if BUILD_INCHI
+ inchiformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la inchi102/libinchi.la
+ else
+ inchiformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la
++if HAVE_STDINCHI
++inchiformat_la_LIBADD = -lstdinchi
++else
+ inchiformat_la_LIBADD = -linchi
+ endif
++endif
++endif
+ 
+ jaguarformat_la_SOURCES = jaguarformat.cpp 
+ jaguarformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la 


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- openbabel.spec	13 Sep 2009 17:27:34 -0000	1.48
+++ openbabel.spec	14 Sep 2009 00:01:18 -0000	1.49
@@ -16,7 +16,6 @@ Group: Applications/File
 URL: http://openbabel.org/
 Source: http://downloads.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
 Patch1: %{name}-rpm.patch
-Patch2: %{name}-check.patch
 Patch3: %{name}-inchi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: inchi-devel
@@ -91,7 +90,6 @@ Ruby wrapper for the Open Babel library.
 %prep
 %setup -q -n %{name}-%{version}%{beta_str}
 %patch1 -p1 -b .r
-%patch2 -p1 -b .chk
 %patch3 -p1 -b .inchi
 chmod 644 src/formats/mmcifformat.cpp
 
@@ -186,7 +184,8 @@ popd
 * Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.3-1
 - updated to 2.2.3
 - dropped obsolete patch
-- fix configure to detect external inchi-1.0.2
+- fixed configure to detect external inchi (both pre-1.0.2 and 1.0.2)
+- re-enabled inchi tests
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-0.2.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


--- openbabel-check.patch DELETED ---



From cebbert at fedoraproject.org  Mon Sep 14 00:34:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 14 Sep 2009 00:34:35 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-scsi-sd-fix-oops-during-scanning.patch, 
	NONE, 1.1 linux-2.6-scsi-sg-fix-oops-in-error-path.patch, NONE,
	1.1 kernel.spec, 1.1796, 1.1797
Message-ID: <20090914003435.6F55711C0099@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19152

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-scsi-sd-fix-oops-during-scanning.patch 
	linux-2.6-scsi-sg-fix-oops-in-error-path.patch 
Log Message:
SCSI oops fixes requested for -stable

linux-2.6-scsi-sd-fix-oops-during-scanning.patch:
 sd.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE linux-2.6-scsi-sd-fix-oops-during-scanning.patch ---
From: James Bottomley <James.Bottomley at suse.de>
Date: Fri, 21 Aug 2009 15:47:54 +0000 (-0600)
Subject: [SCSI] fix oops during scsi scanning
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjejb%2Fscsi-misc-2.6.git;a=commitdiff_plain;h=ea038f63ac52439e7816295fa6064fe95e6c1f51

[SCSI] fix oops during scsi scanning

Chris Webb reported:
  p0# uname -a
  Linux f7ea8425-d45b-490f-a738-d181d0df6963.host.elastichosts.com 2.6.30.4-elastic-lon-p #2 SMP PREEMPT Thu Aug 20 14:30:50 BST 2009 x86_64 Intel(R) Xeon(R) CPU E5420 @ 2.50GHz GenuineIntel GNU/Linux
  p0# zgrep SCAN_ASYNC /proc/config.gz
  # CONFIG_SCSI_SCAN_ASYNC is not set

  p0# cat /var/log/kern/2009-08-20
  [...]
  15:27:10.485 kernel: scsi9 : iSCSI Initiator over TCP/IP
  15:27:11.493 kernel: scsi 9:0:0:0: RAID              IET      Controller       0001 PQ: 0 ANSI: 5
  15:27:11.493 kernel: scsi 9:0:0:0: Attached scsi generic sg6 type 12
  15:27:11.495 kernel: scsi 9:0:0:1: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
  15:27:11.495 kernel: sd 9:0:0:1: Attached scsi generic sg7 type 0
  15:27:11.495 kernel: sd 9:0:0:1: [sdg] 4194304 512-byte hardware sectors: (2.14 GB/2.00 GiB)
  15:27:11.495 kernel: sd 9:0:0:1: [sdg] Write Protect is off
  15:27:11.495 kernel: sd 9:0:0:1: [sdg] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
  15:27:13.012 kernel: sdg:<6>scsi 9:0:0:1: [sdg] Unhandled error code
  15:27:13.012 kernel: scsi 9:0:0:1: [sdg] Result: hostbyte=0x07 driverbyte=0x00
  15:27:13.012 kernel: end_request: I/O error, dev sdg, sector 0
  15:27:13.012 kernel: Buffer I/O error on device sdg, logical block 0
  15:27:13.012 kernel: ldm_validate_partition_table(): Disk read failed.
  15:27:13.012 kernel: unable to read partition table
  15:27:13.014 kernel: BUG: unable to handle kernel NULL pointer dereference at 0000000000000010
  15:27:13.014 kernel: IP: [<ffffffff803f0d77>] disk_part_iter_next+0x74/0xfd
  15:27:13.014 kernel: PGD 82ad0b067 PUD 82cd7e067 PMD 0
  15:27:13.014 kernel: Oops: 0000 [#1] PREEMPT SMP
  15:27:13.014 kernel: last sysfs file: /sys/devices/platform/host9/session4/iscsi_session/session4/ifacename
  15:27:13.014 kernel: CPU 5
  15:27:13.014 kernel: Modules linked in:
  15:27:13.014 kernel: Pid: 13999, comm: async/0 Not tainted 2.6.30.4-elastic-lon-p #2 X7DBN
  15:27:13.014 kernel: RIP: 0010:[<ffffffff803f0d77>]  [<ffffffff803f0d77>] disk_part_iter_next+0x74/0xfd
  15:27:13.014 kernel: RSP: 0018:ffff88066afa3dd0  EFLAGS: 00010246
  15:27:13.014 kernel: RAX: ffff88082b58a000 RBX: ffff88066afa3e00 RCX: 0000000000000000
  15:27:13.014 kernel: RDX: 0000000000000000 RSI: ffff88082b58a000 RDI: 0000000000000000
  15:27:13.014 kernel: RBP: ffff88066afa3df0 R08: ffff88066afa2000 R09: ffff8806a204f000
  15:27:13.014 kernel: R10: 000000fb12c7d274 R11: ffff8806c2bf0628 R12: ffff88066afa3e00
  15:27:13.014 kernel: R13: ffff88082c829a00 R14: 0000000000000000 R15: ffff8806bc50c920
  15:27:13.014 kernel: FS:  0000000000000000(0000) GS:ffff88002818a000(0000) knlGS:0000000000000000
  15:27:13.014 kernel: CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
  15:27:13.014 kernel: CR2: 0000000000000010 CR3: 000000082ade3000 CR4: 00000000000426e0
  15:27:13.014 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
  15:27:13.014 kernel: DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
  15:27:13.014 kernel: Process async/0 (pid: 13999, threadinfo ffff88066afa2000, task ffff8806c2bf05e0)
  15:27:13.014 kernel: Stack:
  15:27:13.014 kernel: 0000000000000000 ffff88066afa3e00 ffff88066afa3e00 ffff88082c829a00
  15:27:13.014 kernel: ffff88066afa3e40 ffffffff80306feb ffff88082b58a000 0000000000000000
  15:27:13.014 kernel: 0000000000000001 ffff8806bc50c920 ffff88066afa3e40 ffff88082b58a000
  15:27:13.014 kernel: Call Trace:
  15:27:13.014 kernel: [<ffffffff80306feb>] register_disk+0x122/0x13a
  15:27:13.014 kernel: [<ffffffff803f0b0f>] add_disk+0xaa/0x106
  15:27:13.014 kernel: [<ffffffff80493609>] sd_probe_async+0x198/0x25b
  15:27:13.014 kernel: [<ffffffff80270482>] async_thread+0x10c/0x20d
  15:27:13.014 kernel: [<ffffffff802545ff>] ? default_wake_function+0x0/0xf
  15:27:13.014 kernel: [<ffffffff80270376>] ? async_thread+0x0/0x20d
  15:27:13.014 kernel: [<ffffffff8026ad89>] kthread+0x55/0x80
  15:27:13.014 kernel: [<ffffffff8022be6a>] child_rip+0xa/0x20
  15:27:13.014 kernel: [<ffffffff8026ad34>] ? kthread+0x0/0x80
  15:27:13.014 kernel: [<ffffffff8022be60>] ? child_rip+0x0/0x20
  15:27:13.014 kernel: Code: c8 ff 80 e1 0c b9 00 00 00 00 0f 44 c1 41 83 cd ff 48 8d 7a 20 48 be ff ff ff ff 08 00 00 00 48 b9 00 00 00 00 08 00 00 00 eb 50 <8b> 42 10 41 bd 01 00 00 00 eb db 4c 63 c2 4e 8d 04 c7 4d 8b 20
  15:27:13.015 kernel: RIP  [<ffffffff803f0d77>] disk_part_iter_next+0x74/0xfd
  15:27:13.015 kernel: RSP <ffff88066afa3dd0>
  15:27:13.015 kernel: CR2: 0000000000000010
  15:27:13.015 kernel: ---[ end trace 6104b56ef5590e25 ]---

The problem is caused because the async scanning split in sd.c doesn't hold
any reference to the device when it kicks off the async piece.  What's
happening is that an iSCSI disconnect is destorying the device again *before*
the async sd scanning thread even starts.  Fix this by taking a reference
before starting the thread and dropping it again when the thread completes.

Reported-by: Chris Webb <chris at arachsys.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at suse.de>
---

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b7b9fec..a89c421 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2021,6 +2021,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
 
 	sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
 		  sdp->removable ? "removable " : "");
+	put_device(&sdkp->dev);
 }
 
 /**
@@ -2106,6 +2107,7 @@ static int sd_probe(struct device *dev)
 
 	get_device(&sdp->sdev_gendev);
 
+	get_device(&sdkp->dev);	/* prevent release before async_schedule */
 	async_schedule(sd_probe_async, sdkp);
 
 	return 0;

linux-2.6-scsi-sg-fix-oops-in-error-path.patch:
 sg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-scsi-sg-fix-oops-in-error-path.patch ---
From: Michal Schmidt <mschmidt at redhat.com>
Date: Thu, 3 Sep 2009 12:27:08 +0000 (+0200)
Subject: [SCSI] sg: fix oops in the error path in sg_build_indirect()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjejb%2Fscsi-misc-2.6.git;a=commitdiff_plain;h=e71044ee2efa4792e21d243b03d49006db66aec9

[SCSI] sg: fix oops in the error path in sg_build_indirect()

When the allocation fails in sg_build_indirect(), an oops happens in
the error path. It's caused by an obvious typo.

Signed-off-by: Michal Schmidt <mschmidt at redhat.com>
Reported-by: Bob Tracy <rct at gherkin.frus.com>
Acked-by: Douglas Gilbert <dgilbert at interlog.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at suse.de>
---

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 9230402..4968c4c 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1811,7 +1811,7 @@ retry:
 	return 0;
 out:
 	for (i = 0; i < k; i++)
-		__free_pages(schp->pages[k], order);
+		__free_pages(schp->pages[i], order);
 
 	if (--order >= 0)
 		goto retry;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1796
retrieving revision 1.1797
diff -u -p -r1.1796 -r1.1797
--- kernel.spec	11 Sep 2009 15:40:07 -0000	1.1796
+++ kernel.spec	14 Sep 2009 00:34:30 -0000	1.1797
@@ -735,6 +735,12 @@ Patch12011: linux-2.6-block-silently-err
 Patch12012: linux-2.6-rtc-show-hctosys.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
+# patches headed for -stable
+
+# scsi oops fixes
+Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1370,6 +1376,12 @@ ApplyPatch v4l-dvb-fix-cx25840-firmware-
 ApplyPatch linux-2.6-rtc-show-hctosys.patch
 ApplyPatch linux-2.6-rfkill-all.patch
 
+# patches headed for -stable
+
+# scsi oops fixes
+ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2026,6 +2038,9 @@ fi
 # and build.
 
 %changelog
+* Sun Sep 13 2009 Chuck Ebbert <cebbert at redhat.com>
+- SCSI oops fixes requested for -stable
+
 * Fri Sep 11 2009 Dave Jones <davej at redhat.com>
 - Apply NX/RO to modules
 



From crobinso at fedoraproject.org  Mon Sep 14 01:01:42 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Sep 2009 01:01:42 +0000 (UTC)
Subject: rpms/virt-manager/F-10 virt-manager-0.6.1-migrate-fixes.patch, NONE,
	1.1 virt-manager-0.6.1-rhel-fixes.patch, NONE,
	1.1 virt-manager.spec, 1.40, 1.41
Message-ID: <20090914010142.EC43F11C0375@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6875

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.6.1-migrate-fixes.patch 
	virt-manager-0.6.1-rhel-fixes.patch 
Log Message:
Fix migration for qemu/kvm guests (bz 517548)
Back compat fixes for connecting to older xen installations (bz 489885)


virt-manager-0.6.1-migrate-fixes.patch:
 new/src/virtManager/domain.py |   10 +++++++---
 src/virtManager/details.py    |   11 +++++------
 src/virtManager/engine.py     |   13 ++++++++++++-
 src/virtManager/manager.py    |   11 ++++-------
 4 files changed, 28 insertions(+), 17 deletions(-)

--- NEW FILE virt-manager-0.6.1-migrate-fixes.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1236630113 14400
# Node ID 6126a50801deafa155b17b66cfc3008ffe584b24
# Parent  3f37d0519b1750666e88e7eaef8d5dfaafc34237
Fix conn uri lookup for domain migration.

diff -r 3f37d0519b17 -r 6126a50801de src/virtManager/details.py
--- a/src/virtManager/details.py	Mon Mar 09 16:21:32 2009 -0400
+++ b/src/virtManager/details.py	Mon Mar 09 16:21:53 2009 -0400
@@ -719,12 +719,11 @@
 
     def control_vm_migrate(self, src):
         # get selected submenu(destination hostname)
-        hostname = self.window.get_widget("details-menu-migrate_menu").get_active().get_image().get_stock()[0]
-        for key in self.engine.connections.keys():
-            if self.engine.get_connection(key).get_hostname() == hostname:
-                host_uri = key
-                break
-        self.emit("action-migrate-domain", self.vm.get_connection().get_uri(), self.vm.get_uuid(), host_uri)
+        info = self.window.get_widget("details-menu-migrate_menu").get_active().get_image().get_stock()[0]
+        hostname = info.split(" ")[0]
+
+        self.emit("action-migrate-domain", self.vm.get_connection().get_uri(),
+                  self.vm.get_uuid(), hostname)
 
     def set_migrate_menu(self):
         menu = self.window.get_widget("details-menu-migrate_menu")
diff -r 3f37d0519b17 -r 6126a50801de src/virtManager/engine.py
--- a/src/virtManager/engine.py	Mon Mar 09 16:21:32 2009 -0400
+++ b/src/virtManager/engine.py	Mon Mar 09 16:21:53 2009 -0400
@@ -527,7 +527,18 @@
         else:
             logging.warning("Reboot requested, but machine is already shutting down / shutoff")
 
-    def migrate_domain(self, uri, uuid, desturi):
+    def migrate_domain(self, uri, uuid, desthost):
+        desturi = None
+        for key in self.connections.keys():
+            if self.get_connection(key).get_hostname() == desthost:
+                desturi = key
+                break
+
+        if desturi == None:
+            logging.debug("Could not find dest uri for migrate hostname: %s"
+                          % desthost)
+            return
+
         conn = self.get_connection(uri, False)
         vm = conn.get_vm(uuid)
         destconn = self.get_connection(desturi, False)
diff -r 3f37d0519b17 -r 6126a50801de src/virtManager/manager.py
--- a/src/virtManager/manager.py	Mon Mar 09 16:21:32 2009 -0400
+++ b/src/virtManager/manager.py	Mon Mar 09 16:21:53 2009 -0400
@@ -1100,14 +1100,11 @@
 
     def migrate(self, ignore):
         vm = self.current_vm()
-        # get selected submenu(destination hostname)
-        hostname = self.vmmenumigrate.get_active().get_image().get_stock()[0]
-        for key in self.engine.connections.keys():
-            if self.engine.get_connection(key).get_hostname() == hostname:
-                host_uri = key
-                break
+        label = self.vmmenumigrate.get_active().get_image().get_stock()[0]
+        hostname = label.split(" ")[0]
         if vm is not None:
-            self.emit("action-migrate-domain", vm.get_connection().get_uri(), vm.get_uuid(), host_uri)
+            self.emit("action-migrate-domain", vm.get_connection().get_uri(),
+                      vm.get_uuid(), hostname)
 
     def set_migrate_submenu(self, src):
         self.engine.populate_migrate_menu(self.vmmenumigrate, self.migrate)
diff -rup virt-manager-0.6.1/src/virtManager/domain.py new/src/virtManager/domain.py
--- virt-manager-0.6.1/src/virtManager/domain.py	2009-09-13 20:25:12.000000000 -0400
+++ new/src/virtManager/domain.py	2009-09-13 20:24:29.000000000 -0400
@@ -1293,11 +1293,15 @@ class vmmDomain(gobject.GObject):
         else:
             self._disk_io = self._sample_disk_io_dummy
 
-
-    def migrate(self, dictcon):
+    def migrate(self, destconn):
         flags = 0
         if self.lastStatus == libvirt.VIR_DOMAIN_RUNNING:
             flags = libvirt.VIR_MIGRATE_LIVE
-        self.vm.migrate(self.connection.vmm, flags, None, dictcon.get_short_hostname(), 0)
+
+        newxml = self.get_xml()
+
+        self.vm.migrate(destconn.vmm, flags, None, None, 0)
+
+        destconn.define_domain(newxml)
 
 gobject.type_register(vmmDomain)

virt-manager-0.6.1-rhel-fixes.patch:
 details.py |    2 +-
 domain.py  |   29 +++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

--- NEW FILE virt-manager-0.6.1-rhel-fixes.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1236957667 14400
# Node ID 4331403b2e66dafdda618283dcea259a66fba423
# Parent  89c007e38850e1283447ea4c19ff6f64ce6224b6
Fix xml parsing for old style 'console' xml.

diff -r 89c007e38850 -r 4331403b2e66 src/virtManager/details.py
--- a/src/virtManager/details.py	Mon Mar 09 23:38:03 2009 -0400
+++ b/src/virtManager/details.py	Fri Mar 13 11:21:07 2009 -0400
@@ -1106,7 +1106,7 @@
                                              _("(Primary Console)") or "")
         self.window.get_widget("char-type").set_markup(typelabel)
         self.window.get_widget("char-dev-type").set_text(charinfo[4] or "-")
-        self.window.get_widget("char-target-port").set_text(charinfo[3])
+        self.window.get_widget("char-target-port").set_text(charinfo[3] or "")
         self.window.get_widget("char-source-path").set_text(charinfo[5] or "-")
 
     def refresh_hostdev_page(self):
diff -r 89c007e38850 -r 4331403b2e66 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Mon Mar 09 23:38:03 2009 -0400
+++ b/src/virtManager/domain.py	Fri Mar 13 11:21:07 2009 -0400
@@ -806,7 +806,7 @@
         def _parse_char_devs(ctx):
             chars = []
             devs  = []
-            devs = ctx.xpathEval("/domain/devices/console")
+            devs.extend(ctx.xpathEval("/domain/devices/console"))
             devs.extend(ctx.xpathEval("/domain/devices/parallel"))
             devs.extend(ctx.xpathEval("/domain/devices/serial"))
 
@@ -822,7 +822,7 @@
                 target_port = None
                 source_path = None
 
-                for child in node.children:
+                for child in node.children or []:
                     if child.name == "target":
                         target_port = child.prop("port")
                     if child.name == "source":
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1236969355 14400
# Node ID 403916479f503f79f23bb682698b38f595eb0626
# Parent  81c591e8c64053840c12dac67ee06b5b97d419e7
Handle old style 'console' tag in 'Connect to serial' list.

diff -r 81c591e8c640 -r 403916479f50 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Fri Mar 13 14:35:28 2009 -0400
+++ b/src/virtManager/domain.py	Fri Mar 13 14:35:55 2009 -0400
@@ -606,8 +606,9 @@
         def _parse_serial_consoles(ctx):
             # [ Name, device type, source path
             serial_list = []
-            devs = ctx.xpathEval("/domain/devices/serial")
-            for node in devs:
+            sdevs = ctx.xpathEval("/domain/devices/serial")
+            cdevs = ctx.xpathEval("/domain/devices/console")
+            for node in sdevs:
                 name = "Serial "
                 dev_type = node.prop("type")
                 source_path = None
@@ -622,6 +623,26 @@
 
                 serial_list.append([name, dev_type, source_path])
 
+            for node in cdevs:
+                name = "Serial Console"
+                dev_type = "pty"
+                source_path = None
+                inuse = False
+
+                for child in node.children:
+                    if child.name == "source":
+                        source_path = child.prop("path")
+                        break
+
+                if source_path:
+                    for dev in serial_list:
+                        if source_path == dev[2]:
+                            inuse = True
+                            break
+
+                if not inuse:
+                    serial_list.append([name, dev_type, source_path])
+
             return serial_list
         return self._parse_device_xml(_parse_serial_consoles)
 


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-10/virt-manager.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- virt-manager.spec	4 Mar 2009 18:28:24 -0000	1.40
+++ virt-manager.spec	14 Sep 2009 01:01:38 -0000	1.41
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.6.1
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -18,6 +18,11 @@ Source0: http://virt-manager.org/downloa
 Patch1: %{name}-%{version}-update-polish.patch
 Patch2: %{name}-%{version}-fix-cadl.patch
 Patch3: %{name}-%{version}-fix-stats-prefs.patch
+# Fix migration for qemu/kvm guests (bz 517548)
+Patch4: %{name}-%{version}-migrate-fixes.patch
+# Back compat fixes for connecting to older xen installations (bz 489885)
+Patch5: %{name}-%{version}-rhel-fixes.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -92,6 +97,8 @@ management API.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -169,6 +176,10 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Sun Sep 13 2009 Cole Robinson <crobinso at redhat.com> - 0.6.1-2.fc10
+- Fix migration for qemu/kvm guests (bz 517548)
+- Back compat fixes for connecting to older xen installations (bz 489885)
+
 * Wed Mar  4 2009 Cole Robinson <crobinso at redhat.com> - 0.6.1-1.fc10
 - Update to 0.6.1 release
 - Disk and Network VM stats reporting



From petersen at fedoraproject.org  Mon Sep 14 02:16:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 14 Sep 2009 02:16:18 +0000 (UTC)
Subject: rpms/alex/devel alex.spec,1.16,1.17
Message-ID: <20090914021618.B8DB311C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/alex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529

Modified Files:
	alex.spec 
Log Message:
 comment on haskell-platform version


Index: alex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alex/devel/alex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- alex.spec	24 Jul 2009 16:42:18 -0000	1.16
+++ alex.spec	14 Sep 2009 02:16:16 -0000	1.17
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 Name:           alex
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version:        2.3.1
 Release:        6%{?dist}
 Summary:        A lexer generator for Haskell



From petersen at fedoraproject.org  Mon Sep 14 02:17:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 14 Sep 2009 02:17:16 +0000 (UTC)
Subject: rpms/cabal-install/devel cabal-install.spec,1.6,1.7
Message-ID: <20090914021716.DDE6411C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal-install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32302

Modified Files:
	cabal-install.spec 
Log Message:
 comment on haskell-platform version


Index: cabal-install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal-install/devel/cabal-install.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cabal-install.spec	24 Jul 2009 18:34:41 -0000	1.6
+++ cabal-install.spec	14 Sep 2009 02:17:16 -0000	1.7
@@ -2,6 +2,7 @@
 %global debug_package %{nil}
 
 Name:           cabal-install
+# part of haskell-platform-2009.2.0.2
 Version:        0.6.2
 Release:        5%{?dist}
 Summary:        Haskell package tool



From petersen at fedoraproject.org  Mon Sep 14 02:19:22 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 14 Sep 2009 02:19:22 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel ghc-GLUT.spec,1.4,1.5
Message-ID: <20090914021922.552FB11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv907

Modified Files:
	ghc-GLUT.spec 
Log Message:
 comment on haskell-platform version


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-GLUT.spec	1 Sep 2009 03:59:25 -0000	1.4
+++ ghc-GLUT.spec	14 Sep 2009 02:19:21 -0000	1.5
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version:        2.1.1.2
 Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Mon Sep 14 02:20:30 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 14 Sep 2009 02:20:30 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel ghc-HTTP.spec,1.12,1.13
Message-ID: <20090914022030.81F3411C0425@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1325

Modified Files:
	ghc-HTTP.spec 
Log Message:
 comment on haskell-platform version


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/ghc-HTTP.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ghc-HTTP.spec	25 Jul 2009 00:03:32 -0000	1.12
+++ ghc-HTTP.spec	14 Sep 2009 02:20:28 -0000	1.13
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version:        4000.0.6
 Release:        4%{?dist}
 Summary:        Haskell HTTP client library



From wtogami at fedoraproject.org  Mon Sep 14 02:44:56 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 14 Sep 2009 02:44:56 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.127,1.128
Message-ID: <20090914024456.DD1EC11C0099@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27273

Modified Files:
	spamassassin.spec 
Log Message:
require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- spamassassin.spec	10 Sep 2009 16:44:31 -0000	1.127
+++ spamassassin.spec	14 Sep 2009 02:44:55 -0000	1.128
@@ -36,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename alpha2
-Release: 0.6.alpha2%{?dist}
+Release: 0.12.alpha2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -71,6 +71,7 @@ Requires: perl(LWP::UserAgent)
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
+Requires: perl(Mail::DKIM)
 Requires: procmail
 Requires: gnupg
 
@@ -222,6 +223,9 @@ fi
 exit 0
 
 %changelog
+* Sun Sep 13 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.12.alpha2
+- require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-0.6.alpha2
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Mon Sep 14 02:51:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 02:51:05 +0000
Subject: [pkgdb] kernel: bskeggs has requested watchcommits
Message-ID: <20090914025106.3B3FD10F867@bastion2.fedora.phx.redhat.com>

bskeggs has requested the watchcommits acl on kernel (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Sep 14 02:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 02:51:07 +0000
Subject: [pkgdb] kernel: bskeggs has requested commit
Message-ID: <20090914025107.885B710F886@bastion2.fedora.phx.redhat.com>

bskeggs has requested the commit acl on kernel (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From bos at fedoraproject.org  Mon Sep 14 03:15:29 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 14 Sep 2009 03:15:29 +0000 (UTC)
Subject: rpms/ghc-fgl/devel ghc-fgl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914031529.8F07311C0099@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-fgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20663

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-fgl.spec 
Log Message:
ghc-fgl 5.4.2.2


--- NEW FILE ghc-fgl.spec ---
%global pkg_name fgl

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        5.4.2.2
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://web.engr.oregonstate.edu/~erwig/fgl/haskell/
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.  This
is a library of types and functions for addressing graph problems.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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 doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 5.4.2.2-1
- initial packaging for Fedora created by cabal2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-fgl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:38:56 -0000	1.1
+++ .cvsignore	14 Sep 2009 03:15:21 -0000	1.2
@@ -0,0 +1 @@
+fgl-5.4.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-fgl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:38:56 -0000	1.1
+++ sources	14 Sep 2009 03:15:21 -0000	1.2
@@ -0,0 +1 @@
+ad49ce31af04c0fd9c6dbfa52801ff83  fgl-5.4.2.2.tar.gz



From mclasen at fedoraproject.org  Mon Sep 14 03:24:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Sep 2009 03:24:00 +0000 (UTC)
Subject: rpms/gtk2/devel gtk-bell.patch,NONE,1.1 gtk2.spec,1.403,1.404
Message-ID: <20090914032400.5698111C0099@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25201

Modified Files:
	gtk2.spec 
Added Files:
	gtk-bell.patch 
Log Message:
fix the bell


gtk-bell.patch:
 gdkdisplay-x11.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtk-bell.patch ---
diff -up gtk+-2.17.11/gdk/x11/gdkdisplay-x11.c.bell gtk+-2.17.11/gdk/x11/gdkdisplay-x11.c
--- gtk+-2.17.11/gdk/x11/gdkdisplay-x11.c.bell	2009-09-13 23:20:20.540275068 -0400
+++ gtk+-2.17.11/gdk/x11/gdkdisplay-x11.c	2009-09-13 23:20:39.649290396 -0400
@@ -691,7 +691,7 @@ gdk_display_beep (GdkDisplay *display)
 {
   g_return_if_fail (GDK_IS_DISPLAY (display));
   
-  XBell (GDK_DISPLAY_XDISPLAY (display), 0);
+  XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None);
 }
 
 /**


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- gtk2.spec	7 Sep 2009 01:37:18 -0000	1.403
+++ gtk2.spec	14 Sep 2009 03:23:59 -0000	1.404
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch0: gtk+-2.13.5-lib64.patch
 # from upstream
 Patch1: gtk2-fix-install.patch
 Patch2: root-event-mask.patch
+Patch3: gtk-bell.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -144,6 +145,7 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .fix-install
 %patch2 -p1 -b .root-event-mask
+%patch3 -p1 -b .bell
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -385,6 +387,9 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.11-3
+- Fix the bell
+
 * Sun Sep  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.11-2
 - Fix the initial event mask for the root window (#521137)
 



From jwilson at fedoraproject.org  Mon Sep 14 03:30:52 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 14 Sep 2009 03:30:52 +0000 (UTC)
Subject: rpms/lirc/devel .cvsignore, 1.33,
	1.34 lirc-0.8.6-standardized-remote-keycodes.patch, 1.1,
	1.2 lirc.init, 1.4, 1.5 lirc.spec, 1.61, 1.62 lirc.sysconfig,
	1.2, 1.3 sources, 1.33, 1.34
Message-ID: <20090914033052.8A58411C0375@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27024

Modified Files:
	.cvsignore lirc-0.8.6-standardized-remote-keycodes.patch 
	lirc.init lirc.spec lirc.sysconfig sources 
Log Message:
* Sun Sep 13 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-1
- Update to lirc 0.8.6 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	29 Aug 2009 17:13:54 -0000	1.33
+++ .cvsignore	14 Sep 2009 03:30:45 -0000	1.34
@@ -9,3 +9,4 @@ lirc-0.8.5pre3.tar.bz2
 lirc-0.8.5.tar.bz2
 lirc-0.8.6pre1.tar.bz2
 lirc-0.8.6pre2.tar.bz2
+lirc-0.8.6.tar.bz2

lirc-0.8.6-standardized-remote-keycodes.patch:
 adstech/lircd.conf.usbx-707          |   76 ++++-----
 animax/lircd.conf.animax             |   66 ++++----
 apple/lircd.conf.macmini             |   12 -
 asus/lircd.conf.asus                 |   56 +++----
 asus/lircd.conf.asusdh               |   12 -
 asus/lircd.conf.digimatrix           |   64 ++++----
 atiusb/lircd.conf.atilibusb          |  104 ++++++-------
 atiusb/lircd.conf.atiusb             |   84 +++++-----
 avermedia/lircd.conf.avermedia       |   48 +++---
 avermedia/lircd.conf.avermedia98     |   58 +++----
 avermedia/lircd.conf.vdomate         |   36 ++--
 bestbuy/lircd.conf.bestbuy           |   50 +++---
 bestbuy/lircd.conf.bestbuy2          |   38 ++--
 caraca/lircd.conf.caraca             |   42 ++---
 chronos/lircd.conf.chronos           |   50 +++---
 cph03x/lircd.conf.cph03x             |   46 ++---
 creative/lircd.conf.alsa_usb         |   54 +++---
 creative/lircd.conf.breakoutbox      |   52 +++---
 creative/lircd.conf.creative         |   38 ++--
 creative/lircd.conf.livedrive        |   56 +++----
 dvico/lircd.conf.fusionHDTV          |   62 +++----
 ea65/lircd.conf.ea65                 |   68 ++++----
 ericsson/lircd.conf.bte              |   44 ++---
 hauppauge/lircd.conf.hauppauge       |   34 ++--
 hercules/lircd.conf.smarttv_stereo   |   46 ++---
 imon/lircd.conf.imon                 |   72 ++++-----
 imon/lircd.conf.imon-knob            |  105 ++++++-------
 imon/lircd.conf.imon-pad             |  272 +++++++++++++++++------------------
 imon/lircd.conf.imon-rsc             |   64 ++++----
 iodata/lircd.conf.gvbctv5pci         |   54 +++---
 kanam_accent/lircd.conf.IR-100       |   82 +++++-----
 knc_one/lircd.conf.knc_one           |   52 +++---
 kworld/lircd.conf.kworld             |   42 ++---
 leadtek/lircd.conf.PVR2000           |   74 ++++-----
 leadtek/lircd.conf.RM-0007           |   50 +++---
 leadtek/lircd.conf.RM-0010           |   78 +++++-----
 life-view/lircd.conf.flyvideo        |   58 +++----
 logitech/lircd.conf.logitech         |   54 +++---
 mceusb/lircd.conf.mceusb             |   93 ++++++-----
 packard_bell/lircd.conf.packard_bell |   50 +++---
 pcmak/lircd.conf.pcmak               |  112 +++++++-------
 pinnacle_systems/lircd.conf.pctv     |   70 ++++-----
 pixelview/lircd.conf.playtv          |   30 +--
 pixelview/lircd.conf.playtv_bt878    |   52 +++---
 pixelview/lircd.conf.playtv_pro      |   34 ++--
 pixelview/lircd.conf.remotemaster    |   54 +++---
 provideo/lircd.conf.pv951            |   32 ++--
 remotec/lircd.conf.BW6130            |   28 +--
 samsung/lircd.conf.samsung           |   98 ++++++------
 sasem/lircd.conf.sasem               |   64 ++++----
 sigma_designs/lircd.conf.realmagic   |   64 ++++----
 silitek/lircd.conf.silitek           |   96 ++++++------
 streamzap/lircd.conf.streamzap       |   70 ++++-----
 technisat/lircd.conf.mediafocusI     |   10 -
 tekram/lircd.conf.m230               |   46 ++---
 vlsystem/lircd.conf.mplay            |   86 +++++------
 x10/lircd.conf.mouseremote           |   62 +++----
 x10/lircd.conf.mp3anywhere           |   70 ++++-----
 58 files changed, 1784 insertions(+), 1790 deletions(-)

Index: lirc-0.8.6-standardized-remote-keycodes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc-0.8.6-standardized-remote-keycodes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lirc-0.8.6-standardized-remote-keycodes.patch	29 Aug 2009 17:30:25 -0000	1.1
+++ lirc-0.8.6-standardized-remote-keycodes.patch	14 Sep 2009 03:30:46 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naurp lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707	2009-09-13 21:37:03.000000000 -0400
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -90,9 +90,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax lirc-0.8.6pre2/remotes/animax/lircd.conf.animax
---- lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/animax/lircd.conf.animax	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/animax/lircd.conf.animax
+--- lirc-0.8.6/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
++++ lirc-0.8.6.new/remotes/animax/lircd.conf.animax	2009-09-13 21:37:03.000000000 -0400
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -206,9 +206,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini
---- lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/apple/lircd.conf.macmini lirc-0.8.6.new/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.6/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
++++ lirc-0.8.6.new/remotes/apple/lircd.conf.macmini	2009-09-13 21:37:03.000000000 -0400
 @@ -26,12 +26,12 @@ begin remote
    ignore_mask 0x0000ff01
  
@@ -228,9 +228,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus lirc-0.8.6pre2/remotes/asus/lircd.conf.asus
---- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asus	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asus lirc-0.8.6.new/remotes/asus/lircd.conf.asus
+--- lirc-0.8.6/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
++++ lirc-0.8.6.new/remotes/asus/lircd.conf.asus	2009-09-13 21:37:03.000000000 -0400
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -298,9 +298,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
          end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asusdh lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.6/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
++++ lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh	2009-09-13 21:37:03.000000000 -0400
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -325,9 +325,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
          end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.digimatrix lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.6/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
++++ lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix	2009-09-13 21:37:03.000000000 -0400
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -404,9 +404,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
++++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb	2009-09-13 21:37:03.000000000 -0400
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -518,9 +518,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb	2009-09-13 21:37:03.000000000 -0400
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -618,9 +618,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
++++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia	2009-09-13 21:37:03.000000000 -0400
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -683,9 +683,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
++++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98	2009-09-13 21:37:03.000000000 -0400
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -765,9 +765,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
++++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate	2009-09-13 21:37:03.000000000 -0400
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -820,9 +820,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
++++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy	2009-09-13 21:37:03.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -885,9 +885,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
++++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2	2009-09-13 21:37:03.000000000 -0400
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -937,9 +937,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/caraca/lircd.conf.caraca lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.6/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
++++ lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca	2009-09-13 21:37:03.000000000 -0400
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -991,9 +991,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            TV/FM                    0x3fe3
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/chronos/lircd.conf.chronos lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.6/remotes/chronos/lircd.conf.chronos	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos	2009-09-13 21:37:03.000000000 -0400
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1057,9 +1057,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
++++ lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x	2009-09-13 21:37:03.000000000 -0400
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1123,9 +1123,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb	2009-09-13 21:37:03.000000000 -0400
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1192,9 +1192,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            Step                     0x0000000000007E81
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox	2009-09-13 21:37:03.000000000 -0400
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1259,9 +1259,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative lirc-0.8.6pre2/remotes/creative/lircd.conf.creative
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.creative	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.creative lirc-0.8.6.new/remotes/creative/lircd.conf.creative
+--- lirc-0.8.6/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.creative	2009-09-13 21:37:03.000000000 -0400
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1312,9 +1312,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.livedrive lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.6/remotes/creative/lircd.conf.livedrive	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive	2009-09-13 21:37:03.000000000 -0400
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1384,9 +1384,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
  	  
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
++++ lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV	2009-09-13 21:37:03.000000000 -0400
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1461,9 +1461,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/ea65/lircd.conf.ea65 lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.6/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
++++ lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65	2009-09-13 21:37:03.000000000 -0400
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1552,9 +1552,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -Naurp lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/ericsson/lircd.conf.bte lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.6/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
++++ lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte	2009-09-13 21:37:03.000000000 -0400
 @@ -11,29 +11,29 @@
  
  begin remote
@@ -1616,9 +1616,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
++++ lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge	2009-09-13 21:37:03.000000000 -0400
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1662,9 +1662,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo	2009-09-13 21:37:03.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1725,9 +1725,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon lirc-0.8.6pre2/remotes/imon/lircd.conf.imon
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon lirc-0.8.6.new/remotes/imon/lircd.conf.imon
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon	2009-09-13 21:37:03.000000000 -0400
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1813,9 +1813,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob	2009-09-13 21:37:03.000000000 -0400
 @@ -23,74 +23,67 @@ begin remote
  
  
@@ -1940,18 +1940,19 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad	2009-06-03 15:13:42.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad	2009-08-29 13:23:31.000000000 -0400
-@@ -24,96 +24,96 @@ begin remote
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-pad lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon-pad	2009-09-03 10:33:19.000000000 -0400
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad	2009-09-13 22:12:32.000000000 -0400
+@@ -24,99 +24,99 @@ begin remote
  
  
        begin codes
 -          AppExit                  0x288195B7
-+          KEY_EXIT                 0x288195B7
-           Power                    0x289115B7
+-          Power                    0x289115B7
 -          Record                   0x298115B7
 -          Play                     0x2A8115B7
++          KEY_EXIT                 0x288195B7
++          KEY_POWER                0x289115B7
 +          KEY_RECORD               0x298115B7
 +          KEY_PLAY                 0x2A8115B7
            SlowMotion               0x29B195B7
@@ -1962,7 +1963,6 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 -          Stop                     0x2B9715B7
 -          NextChapter              0x298195B7
 -          Esc                      0x2BB715B7
--          Eject                    0x299395B7
 +          KEY_REWIND               0x2A8195B7
 +          KEY_PAUSE                0x2A9115B7
 +          KEY_FASTFORWARD          0x2B8115B7
@@ -1970,7 +1970,7 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 +          KEY_STOP                 0x2B9715B7
 +          KEY_NEXT                 0x298195B7
 +          KEY_ESC                  0x2BB715B7
-+          KEY_EJECTCD              0x299395B7
+           Eject                    0x299395B7
            AppLauncher              0x29B715B7
            MultiMon                 0x2AB195B7
            TaskSwitcher             0x2A9395B7
@@ -2009,12 +2009,13 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 -          Tab                      0x29A115B7
 -          MyMovie                  0x2B8515B7
 -          MyMusic                  0x299195B7
+-          MyPhoto                  0x2BA115B7
+-          MyTV                     0x28A515B7
+-          Bookmark                 0x288515B7
 +          KEY_TAB                  0x29A115B7
 +          KEY_VIDEO                0x2B8515B7
 +          KEY_AUDIO                0x299195B7
-           MyPhoto                  0x2BA115B7
--          MyTV                     0x28A515B7
--          Bookmark                 0x288515B7
++          KEY_PHOTO                0x2BA115B7
 +          KEY_TV                   0x28A515B7
 +          KEY_BOOKMARKS            0x288515B7
            Thumbnail                0x2AB715B7
@@ -2081,8 +2082,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 +          KEY_0                    0x02000027
            Hash                     0x02200020
 -          Backspace                0x0200002A
+-          Select                   0x0200002C
 +          KEY_BACKSPACE            0x0200002A
-           Select                   0x0200002C
++          KEY_SELECT               0x0200002C
            LeftMenu                 0x02800000
            RightMenu                0x02000065
 -          Enter                    0x02000028
@@ -2101,12 +2103,192 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 +          KEY_DOWN                 0x01007F00
 +          KEY_LEFT                 0x01000080
 +          KEY_RIGHT                0x0100007F
+ # Variations on the mouse buttons from Jan Schneider
+-          LeftClick                0x01010080
+-          RightClick               0x01020080
++          BTN_LEFT                 0x01010080
++          BTN_RIGHT                0x01020080
+ 
+       end codes
+ 
+@@ -170,7 +170,7 @@ end remote
+ 
+ begin remote
  
+-  name     iMON-PAD
++  name   iMON-PAD64
+   bits           64
+   eps            30
+   aeps          100
+@@ -182,98 +182,98 @@ begin remote
+   ignore_mask 0x00000000FFFFFFFF
+ 
+       begin codes
+-          AppExit                  0x288195B700002401
+-          Power                    0x289115B700002401
+-          Record                   0x298115B700002401
+-          Play                     0x2A8115B700002401
++          KEY_EXIT                 0x288195B700002401
++          KEY_POWER                0x289115B700002401
++          KEY_RECORD               0x298115B700002401
++          KEY_PLAY                 0x2A8115B700002401
+           SlowMotion               0x29B195B700002401
+-          Rewind                   0x2A8195B700002401
+-          Pause                    0x2A9115B700002401
+-          FastForward              0x2B8115B700002401
+-          PrevChapter              0x2B9115B700002401
+-          Stop                     0x2B9715B700002401
+-          NextChapter              0x298195B700002401
+-          Esc                      0x2BB715B700002401
+-          Eject                    0x299395B700002401
++          KEY_REWIND               0x2A8195B700002401
++          KEY_PAUSE                0x2A9115B700002401
++          KEY_FASTFORWARD          0x2B8115B700002401
++          KEY_PREVIOUS             0x2B9115B700002401
++          KEY_STOP                 0x2B9715B700002401
++          KEY_NEXT                 0x298195B700002401
++          KEY_ESC                  0x2BB715B700002401
++          KEY_EJECT                0x299395B700002401
+           AppLauncher              0x29B715B700002401
+           MultiMon                 0x2AB195B700002401
+           TaskSwitcher             0x2A9395B700002401
+-          Mute                     0x2B9595B700002401
+-          Vol+                     0x28A395B700002401
+-          Vol-                     0x28A595B700002401
+-          Ch+                      0x289395B700002401
+-          Ch-                      0x288795B700002401
++          KEY_MUTE                 0x2B9595B700002401
++          KEY_VOLUMEUP             0x28A395B700002401
++          KEY_VOLUMEDOWN           0x28A595B700002401
++          KEY_CHANNELUP            0x289395B700002401
++          KEY_CHANNELDOWN          0x288795B700002401
+           Timer                    0x2B8395B700002401
+-          1                        0x28B595B700002401
+-          2                        0x2BB195B700002401
+-          3                        0x28B195B700002401
+-          4                        0x2A8595B700002401
+-          5                        0x299595B700002401
+-          6                        0x2AA595B700002401
+-          7                        0x2B9395B700002401
+-          8                        0x2A8515B700002401
+-          9                        0x2AA115B700002401
+-          0                        0x2BA595B700002401
++          KEY_1                    0x28B595B700002401
++          KEY_2                    0x2BB195B700002401
++          KEY_3                    0x28B195B700002401
++          KEY_4                    0x2A8595B700002401
++          KEY_5                    0x299595B700002401
++          KEY_6                    0x2AA595B700002401
++          KEY_7                    0x2B9395B700002401
++          KEY_8                    0x2A8515B700002401
++          KEY_9                    0x2AA115B700002401
++          KEY_0                    0x2BA595B700002401
+           ShiftTab                 0x28B515B700002401
+-          Tab                      0x29A115B700002401
+-          MyMovie                  0x2B8515B700002401
+-          MyMusic                  0x299195B700002401
+-          MyPhoto                  0x2BA115B700002401
+-          MyTV                     0x28A515B700002401
+-          Bookmark                 0x288515B700002401
++          KEY_TAB                  0x29A115B700002401
++          KEY_VIDEO                0x2B8515B700002401
++          KEY_AUDIO                0x299195B700002401
++          KEY_PHOTO                0x2BA115B700002401
++          KEY_TV                   0x28A515B700002401
++          KEY_BOOKMARKS            0x288515B700002401
+           Thumbnail                0x2AB715B700002401
+           AspectRatio              0x29A595B700002401
+           FullScreen               0x2AA395B700002401
+ 
+-          MyDVD                    0x29A295B700002401
+-          Menu                     0x2BA385B700002401
++          KEY_DVD                  0x29A295B700002401
++          KEY_MENU                 0x2BA385B700002401
+ # different codes
+ # These codes are the button release codes, which will cause duplicate
+ # events, so they are commented out here.
+-#          MyDVD                    0x29A3D5B700002401
+-#          Menu                     0x2BA3D5B700002401
++#          KEY_DVD                  0x29A3D5B700002401
++#          KEY_MENU                 0x2BA3D5B700002401
+ 
+           Caption                  0x298595B700002401
+-          Language                 0x2B8595B700002401
++          KEY_LANGUAGE             0x2B8595B700002401
+           MouseKeyboard            0x299115B700002401
+           SelectSpace              0x2A9315B700002401
+           MouseMenu                0x28B715B700002401
+-          MouseRightClick          0x688481B700002401
+-          Enter                    0x28A195B700002401
+-          MouseLeftClick           0x688301B700002401
++          BTN_RIGHT                0x688481B700002401
++          KEY_ENTER                0x28A195B700002401
++          BTN_LEFT                 0x688301B700002401
+           WindowsKey               0x2B8195B700002401
+-          Backspace                0x28A115B700002401
++          KEY_BACKSPACE            0x28A115B700002401
+ # Corrin added
+-          Space                    0x2B9B15F700002401
+-          Up                       0xEB53F9B700002401
+-          Left                     0x6ABAFFBF00002401
+-          Down                     0x6F9ECBB700002401
+-          Right                    0x69A281B700002401
++          KEY_SPACE                0x2B9B15F700002401
++          KEY_UP                   0xEB53F9B700002401
++          KEY_LEFT                 0x6ABAFFBF00002401
++          KEY_DOWN                 0x6F9ECBB700002401
++          KEY_RIGHT                0x69A281B700002401
+ # Variants and additions of keys reported by Ryan Gardner
+-          1                        0x0200001E00000000
+-          2                        0x0200001F00000000
+-          3                        0x0200002000000000
+-          4                        0x0200002100000000
+-          5                        0x0200002200000000
+-          6                        0x0200002300000000
+-          7                        0x0200002400000000
+-          8                        0x0200002500000000
+-          9                        0x0200002600000000
++          KEY_1                    0x0200001E00000000
++          KEY_2                    0x0200001F00000000
++          KEY_3                    0x0200002000000000
++          KEY_4                    0x0200002100000000
++          KEY_5                    0x0200002200000000
++          KEY_6                    0x0200002300000000
++          KEY_7                    0x0200002400000000
++          KEY_8                    0x0200002500000000
++          KEY_9                    0x0200002600000000
+           Star                     0x0220002500000000
+-          0                        0x0200002700000000
++          KEY_0                    0x0200002700000000
+           Hash                     0x0220002000000000
+-          Backspace                0x0200002A00000000
+-          Select                   0x0200002C00000000
++          KEY_BACKSPACE            0x0200002A00000000
++          KEY_SELECT               0x0200002C00000000
+           LeftMenu                 0x0280000000000000
+           RightMenu                0x0200006500000000
+-          Enter                    0x0200002800000000
+-          Escape                   0x0200002900000000
+-          LeftClick                0x0101000000000000
+-          RightClick               0x0102000000000000
+-          Up                       0x0100800000000000
+-          Down                     0x01007F0000000000
+-          Left                     0x0100008000000000
+-          Right                    0x0100007F00000000
++          KEY_ENTER                0x0200002800000000
++          KEY_ESC                  0x0200002900000000
++          BTN_LEFT                 0x0101000000000000
++          BTN_RIGHT                0x0102000000000000
++          KEY_UP                   0x0100800000000000
++          KEY_DOWN                 0x01007F0000000000
++          KEY_LEFT                 0x0100008000000000
++          KEY_RIGHT                0x0100007F00000000
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc	2009-08-29 13:23:31.000000000 -0400
+ end remote
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc	2009-09-13 21:37:03.000000000 -0400
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2188,9 +2370,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            Full.Screen        0x000000000000916e
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
++++ lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci	2009-09-13 21:37:03.000000000 -0400
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2260,9 +2442,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            SYNC                     0x0000000000000003
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
++++ lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100	2009-09-13 21:37:03.000000000 -0400
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2352,9 +2534,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
++++ lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one	2009-09-13 21:37:03.000000000 -0400
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2419,9 +2601,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/kworld/lircd.conf.kworld lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.6/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
++++ lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld	2009-09-13 21:37:03.000000000 -0400
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2480,9 +2662,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
++++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000	2009-09-13 21:37:03.000000000 -0400
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2575,9 +2757,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
++++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007	2009-09-13 21:37:03.000000000 -0400
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2647,9 +2829,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
++++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010	2009-09-13 21:37:03.000000000 -0400
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2759,9 +2941,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
++++ lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo	2009-09-13 21:37:03.000000000 -0400
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -2842,9 +3024,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
   
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/logitech/lircd.conf.logitech lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.6/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
++++ lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech	2009-09-13 21:37:03.000000000 -0400
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -2914,9 +3096,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -Naurp lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
++++ lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb	2009-09-13 21:37:03.000000000 -0400
 @@ -1,7 +1,8 @@
  #
 -# brand:                        HP 
@@ -3062,9 +3244,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
++++ lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell	2009-09-13 21:37:03.000000000 -0400
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3129,9 +3311,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
++++ lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak	2009-09-13 21:37:03.000000000 -0400
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3275,9 +3457,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
++++ lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv	2009-09-13 21:37:03.000000000 -0400
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3377,9 +3559,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            middle                   0x0000000000000014
  
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv	2009-09-13 21:37:03.000000000 -0400
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3418,9 +3600,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
    end codes
  end remote
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878	2009-09-13 21:37:03.000000000 -0400
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3487,9 +3669,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
    end codes
  end remote
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro	2009-09-13 21:37:03.000000000 -0400
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3540,9 +3722,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
  
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster	2009-09-13 21:37:03.000000000 -0400
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3610,9 +3792,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/provideo/lircd.conf.pv951 lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.6/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
++++ lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951	2009-09-13 21:37:03.000000000 -0400
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3658,9 +3840,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -Naurp lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.6/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
++++ lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130	2009-09-13 21:37:03.000000000 -0400
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3696,9 +3878,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -Naurp lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/samsung/lircd.conf.samsung lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.6/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
++++ lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung	2009-09-13 21:37:03.000000000 -0400
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3809,9 +3991,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/sasem/lircd.conf.sasem lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.6/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
++++ lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem	2009-09-13 21:37:03.000000000 -0400
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -3892,9 +4074,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
++++ lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic	2009-09-13 21:37:03.000000000 -0400
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -3971,9 +4153,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/silitek/lircd.conf.silitek lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.6/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
++++ lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek	2009-09-13 21:37:03.000000000 -0400
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4091,9 +4273,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
++++ lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap	2009-09-13 21:37:03.000000000 -0400
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4171,9 +4353,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
++++ lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI	2009-09-13 21:37:03.000000000 -0400
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4191,9 +4373,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230
---- lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/tekram/lircd.conf.m230 lirc-0.8.6.new/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.6/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
++++ lirc-0.8.6.new/remotes/tekram/lircd.conf.m230	2009-09-13 21:37:03.000000000 -0400
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4254,9 +4436,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
++++ lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay	2009-09-13 21:37:03.000000000 -0400
 @@ -22,49 +22,49 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -4350,9 +4532,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.6/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
++++ lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote	2009-09-13 21:37:03.000000000 -0400
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4435,9 +4617,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/
  	end codes	
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
++++ lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere	2009-09-13 21:37:03.000000000 -0400
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  


Index: lirc.init
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lirc.init	23 Jun 2008 18:06:40 -0000	1.4
+++ lirc.init	14 Sep 2009 03:30:46 -0000	1.5
@@ -6,9 +6,9 @@
 # description: Enables infrared controls through LIRC.
 # processname: lircd
 # processname: lircmd
-# config:      /etc/lircd.conf
-# config:      /etc/lircmd.conf
-# pidfile:     /var/run/lircd.pid
+# config:      /etc/lirc/lircd.conf
+# config:      /etc/lirc/lircmd.conf
+# pidfile:     /var/run/lirc/lircd.pid
 
 ### BEGIN INIT INFO
 # Provides: lirc


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- lirc.spec	29 Aug 2009 17:30:25 -0000	1.61
+++ lirc.spec	14 Sep 2009 03:30:46 -0000	1.62
@@ -14,18 +14,18 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre2
+#define pre     pre2
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.6%{?pre:.%{pre}}%{?dist}
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -208,7 +208,8 @@ rm -rf doc/Makefile* doc/.libs doc/man* 
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{d,md}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
@@ -224,6 +225,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add lirc
+# If we're upgrading, move config files into their new location, if need be
+if [ $1 -ge 2 ] ; then
+  if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
+    mv %{_sysconfdir}/lircd.conf %{_sysconfdir}/lirc/lircd.conf
+  fi
+  if [ -e %{_sysconfdir}/lircmd.conf -a ! -e %{_sysconfdir}/lirc/lircmd.conf ]; then
+    mv %{_sysconfdir}/lircmd.conf %{_sysconfdir}/lirc/lircmd.conf
+  fi
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -239,7 +249,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
+%ghost %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_initrddir}/lirc
 %{_bindir}/*ir*
@@ -273,6 +283,9 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-1
+- Update to lirc 0.8.6 release
+
 * Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.6.pre2
 - Rediff patches so they actually apply still
 


Index: lirc.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc.sysconfig	23 Jun 2008 18:06:40 -0000	1.2
+++ lirc.sysconfig	14 Sep 2009 03:30:46 -0000	1.3
@@ -12,7 +12,7 @@ LIRC_DRIVER=""
 
 # Which lirc device will be used by lircd(8).
 # This is the same as passing "-d device" to lircd.
-# An empty value will use the default /dev/lirc device.
+# An empty value will use the default /dev/lirc0 device.
 LIRC_DEVICE=""
 
 # If "yes", the init script will try to start lircmd(8) too.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	29 Aug 2009 17:13:54 -0000	1.33
+++ sources	14 Sep 2009 03:30:46 -0000	1.34
@@ -1 +1 @@
-cebc6e5aaa6bffc22c48e3b237ab0f2f  lirc-0.8.6pre2.tar.bz2
+4ca24da6f5e7c2dcea74878c27a4a3f7  lirc-0.8.6.tar.bz2



From trasher at fedoraproject.org  Mon Sep 14 03:33:28 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon, 14 Sep 2009 03:33:28 +0000 (UTC)
Subject: rpms/eric/devel .cvsignore, 1.18, 1.19 eric.spec, 1.47, 1.48 sources,
	1.23, 1.24
Message-ID: <20090914033329.22E4911C0375@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27893

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Jul 2009 15:27:44 -0000	1.18
+++ .cvsignore	14 Sep 2009 03:33:25 -0000	1.19
@@ -1,8 +1,8 @@
-eric4-4.3.5.tar.gz
-eric4-i18n-fr-4.3.5.tar.gz
-eric4-i18n-de-4.3.5.tar.gz
-eric4-i18n-ru-4.3.5.tar.gz
-eric4-i18n-cs-4.3.5.tar.gz
-eric4-i18n-es-4.3.5.tar.gz
-eric4-i18n-tr-4.3.5.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz
+eric4-4.3.7.1.tar.gz
+eric4-i18n-cs-4.3.7.1.tar.gz
+eric4-i18n-de-4.3.7.1.tar.gz
+eric4-i18n-es-4.3.7.1.tar.gz
+eric4-i18n-fr-4.3.7.1.tar.gz
+eric4-i18n-ru-4.3.7.1.tar.gz
+eric4-i18n-tr-4.3.7.1.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- eric.spec	24 Jul 2009 22:14:38 -0000	1.47
+++ eric.spec	14 Sep 2009 03:33:25 -0000	1.48
@@ -7,8 +7,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.5
-Release: 2%{?dist}
+Version: 4.3.7.1
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -31,6 +31,7 @@ Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
 BuildRequires: qscintilla-python-devel
+BuildRequires: qscintilla-python
 BuildRequires: python
 
 # This can be left unversioned
@@ -148,6 +149,11 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-1
+- 4.3.7.1
+- add BR on qscintilla-python since qscintilla-python-devel no longer
+  requires it
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	5 Jul 2009 15:27:44 -0000	1.23
+++ sources	14 Sep 2009 03:33:26 -0000	1.24
@@ -1,8 +1,8 @@
-3dc719330b4b82edc17939068180cc6a  eric4-4.3.5.tar.gz
-b90cf27a4d595f54b81851222a64ad7b  eric4-i18n-fr-4.3.5.tar.gz
-7c3ebbe36d0e305c48e6f3da444cdcb3  eric4-i18n-de-4.3.5.tar.gz
-5ebd2f978e3d61b7ccc9c90b1ab6c676  eric4-i18n-ru-4.3.5.tar.gz
-b55a007ddfafc98f9533df77ba52983a  eric4-i18n-cs-4.3.5.tar.gz
-9ce364f90909d5d7fa873ff3db980c77  eric4-i18n-es-4.3.5.tar.gz
-28c5d615eea8f10e94bae717d6023527  eric4-i18n-tr-4.3.5.tar.gz
-fb29d702bff9c9f7eed0f992a8394ba9  eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz
+c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
+06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
+9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
+1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
+e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
+b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
+b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
+eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz



From trasher at fedoraproject.org  Mon Sep 14 03:51:27 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon, 14 Sep 2009 03:51:27 +0000 (UTC)
Subject: rpms/eric/F-11 .cvsignore, 1.16, 1.17 eric.spec, 1.44, 1.45 sources,
	1.23, 1.24
Message-ID: <20090914035128.4A38111C0375@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1700

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	5 Jul 2009 15:43:03 -0000	1.16
+++ .cvsignore	14 Sep 2009 03:51:26 -0000	1.17
@@ -1,8 +1,8 @@
-eric4-4.3.5.tar.gz
-eric4-i18n-fr-4.3.5.tar.gz
-eric4-i18n-de-4.3.5.tar.gz
-eric4-i18n-ru-4.3.5.tar.gz
-eric4-i18n-cs-4.3.5.tar.gz
-eric4-i18n-es-4.3.5.tar.gz
-eric4-i18n-tr-4.3.5.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz
+eric4-4.3.7.1.tar.gz
+eric4-i18n-cs-4.3.7.1.tar.gz
+eric4-i18n-de-4.3.7.1.tar.gz
+eric4-i18n-es-4.3.7.1.tar.gz
+eric4-i18n-fr-4.3.7.1.tar.gz
+eric4-i18n-ru-4.3.7.1.tar.gz
+eric4-i18n-tr-4.3.7.1.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/eric.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- eric.spec	5 Jul 2009 15:43:03 -0000	1.44
+++ eric.spec	14 Sep 2009 03:51:26 -0000	1.45
@@ -7,7 +7,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.5
+Version: 4.3.7.1
 Release: 1%{?dist}
 
 License: GPL+
@@ -31,6 +31,7 @@ Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
 BuildRequires: qscintilla-python-devel
+BuildRequires: qscintilla-python
 BuildRequires: python
 
 # This can be left unversioned
@@ -148,6 +149,11 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-1
+- 4.3.7.1
+- add BR on qscintilla-python since qscintilla-python-devel no longer
+  requires it
+
 * Sun Jul 5 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.5-1
 - 4.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	5 Jul 2009 15:43:03 -0000	1.23
+++ sources	14 Sep 2009 03:51:26 -0000	1.24
@@ -1,8 +1,8 @@
-3dc719330b4b82edc17939068180cc6a  eric4-4.3.5.tar.gz
-b90cf27a4d595f54b81851222a64ad7b  eric4-i18n-fr-4.3.5.tar.gz
-7c3ebbe36d0e305c48e6f3da444cdcb3  eric4-i18n-de-4.3.5.tar.gz
-5ebd2f978e3d61b7ccc9c90b1ab6c676  eric4-i18n-ru-4.3.5.tar.gz
-b55a007ddfafc98f9533df77ba52983a  eric4-i18n-cs-4.3.5.tar.gz
-9ce364f90909d5d7fa873ff3db980c77  eric4-i18n-es-4.3.5.tar.gz
-28c5d615eea8f10e94bae717d6023527  eric4-i18n-tr-4.3.5.tar.gz
-fb29d702bff9c9f7eed0f992a8394ba9  eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz
+c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
+06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
+9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
+1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
+e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
+b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
+b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
+eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz



From jwilson at fedoraproject.org  Mon Sep 14 04:16:31 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 14 Sep 2009 04:16:31 +0000 (UTC)
Subject: rpms/lirc/F-11 lirc-0.8.6-standardized-remote-keycodes.patch, NONE, 
	1.1 lirc.init, 1.4, 1.5 lirc.spec, 1.55, 1.56 lirc.sysconfig,
	1.2, 1.3 sources, 1.30, 1.31
Message-ID: <20090914041631.2920B11C00CE@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14764

Modified Files:
	lirc.init lirc.spec lirc.sysconfig sources 
Added Files:
	lirc-0.8.6-standardized-remote-keycodes.patch 
Log Message:
* Sun Sep 13 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-1
- Update to lirc 0.8.6 release


lirc-0.8.6-standardized-remote-keycodes.patch:
 adstech/lircd.conf.usbx-707          |   76 ++++-----
 animax/lircd.conf.animax             |   66 ++++----
 apple/lircd.conf.macmini             |   12 -
 asus/lircd.conf.asus                 |   56 +++----
 asus/lircd.conf.asusdh               |   12 -
 asus/lircd.conf.digimatrix           |   64 ++++----
 atiusb/lircd.conf.atilibusb          |  104 ++++++-------
 atiusb/lircd.conf.atiusb             |   84 +++++-----
 avermedia/lircd.conf.avermedia       |   48 +++---
 avermedia/lircd.conf.avermedia98     |   58 +++----
 avermedia/lircd.conf.vdomate         |   36 ++--
 bestbuy/lircd.conf.bestbuy           |   50 +++---
 bestbuy/lircd.conf.bestbuy2          |   38 ++--
 caraca/lircd.conf.caraca             |   42 ++---
 chronos/lircd.conf.chronos           |   50 +++---
 cph03x/lircd.conf.cph03x             |   46 ++---
 creative/lircd.conf.alsa_usb         |   54 +++---
 creative/lircd.conf.breakoutbox      |   52 +++---
 creative/lircd.conf.creative         |   38 ++--
 creative/lircd.conf.livedrive        |   56 +++----
 dvico/lircd.conf.fusionHDTV          |   62 +++----
 ea65/lircd.conf.ea65                 |   68 ++++----
 ericsson/lircd.conf.bte              |   44 ++---
 hauppauge/lircd.conf.hauppauge       |   34 ++--
 hercules/lircd.conf.smarttv_stereo   |   46 ++---
 imon/lircd.conf.imon                 |   72 ++++-----
 imon/lircd.conf.imon-knob            |  105 ++++++-------
 imon/lircd.conf.imon-pad             |  272 +++++++++++++++++------------------
 imon/lircd.conf.imon-rsc             |   64 ++++----
 iodata/lircd.conf.gvbctv5pci         |   54 +++---
 kanam_accent/lircd.conf.IR-100       |   82 +++++-----
 knc_one/lircd.conf.knc_one           |   52 +++---
 kworld/lircd.conf.kworld             |   42 ++---
 leadtek/lircd.conf.PVR2000           |   74 ++++-----
 leadtek/lircd.conf.RM-0007           |   50 +++---
 leadtek/lircd.conf.RM-0010           |   78 +++++-----
 life-view/lircd.conf.flyvideo        |   58 +++----
 logitech/lircd.conf.logitech         |   54 +++---
 mceusb/lircd.conf.mceusb             |   93 ++++++-----
 packard_bell/lircd.conf.packard_bell |   50 +++---
 pcmak/lircd.conf.pcmak               |  112 +++++++-------
 pinnacle_systems/lircd.conf.pctv     |   70 ++++-----
 pixelview/lircd.conf.playtv          |   30 +--
 pixelview/lircd.conf.playtv_bt878    |   52 +++---
 pixelview/lircd.conf.playtv_pro      |   34 ++--
 pixelview/lircd.conf.remotemaster    |   54 +++---
 provideo/lircd.conf.pv951            |   32 ++--
 remotec/lircd.conf.BW6130            |   28 +--
 samsung/lircd.conf.samsung           |   98 ++++++------
 sasem/lircd.conf.sasem               |   64 ++++----
 sigma_designs/lircd.conf.realmagic   |   64 ++++----
 silitek/lircd.conf.silitek           |   96 ++++++------
 streamzap/lircd.conf.streamzap       |   70 ++++-----
 technisat/lircd.conf.mediafocusI     |   10 -
 tekram/lircd.conf.m230               |   46 ++---
 vlsystem/lircd.conf.mplay            |   86 +++++------
 x10/lircd.conf.mouseremote           |   62 +++----
 x10/lircd.conf.mp3anywhere           |   70 ++++-----
 58 files changed, 1784 insertions(+), 1790 deletions(-)

--- NEW FILE lirc-0.8.6-standardized-remote-keycodes.patch ---
diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707
--- lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707	2009-09-13 22:12:44.000000000 -0400
+++ lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707	2009-09-13 21:37:03.000000000 -0400
@@ -26,50 +26,50 @@ begin remote
   toggle_bit_mask 0x0
 
       begin codes
-          Power                    0x02FD5BA400
-          Mute                     0x02FD5FA000
-          1                        0x02FD57A800
-          2                        0x02FD4FB000
-          3                        0x02FD53AC00
-          4                        0x02FD56A900
-          5                        0x02FD4EB100
-          6                        0x02FD5EA100
-          7                        0x02FD54AB00
-          8                        0x02FD4CB300
-          9                        0x02FD5CA300
-          Jump                     0x02FD55AA00
-          0                        0x02FD4DB200
+          KEY_POWER                    0x02FD5BA400
+          KEY_MUTE                     0x02FD5FA000
+          KEY_1                        0x02FD57A800
+          KEY_2                        0x02FD4FB000
+          KEY_3                        0x02FD53AC00
+          KEY_4                        0x02FD56A900
+          KEY_5                        0x02FD4EB100
+          KEY_6                        0x02FD5EA100
+          KEY_7                        0x02FD54AB00
+          KEY_8                        0x02FD4CB300
+          KEY_9                        0x02FD5CA300
+          Jump                         0x02FD55AA00
+          KEY_0                        0x02FD4DB200
           Search                   0x02FD5DA200
-          Guide                    0x02FD17E800
-          Up                       0x02FD0FF000
-          Menu                     0x02FD1FE000
-          Left                     0x02FD16E900
-          Enter                    0x02FD0EF100
-          Right                    0x02FD1EE100
-          Info                     0x02FD5AA500
-          Down                     0x02FD46B900
-          Exit                     0x02FD52AD00
-          Replay                   0x02FD59A600
-          Skip                     0x02FD51AE00
-          Rewind                   0x02FD58A700
-          Play                     0x02FD44BB00
-          Forward                  0x02FD50AF00
-          Stop                     0x02FD07F800
-          Record                   0x02FD1BE400
+          GUIDE                    0x02FD17E800
+          KEY_UP                       0x02FD0FF000
+          KEY_MENU                     0x02FD1FE000
+          KEY_LEFT                     0x02FD16E900
+          KEY_ENTER                    0x02FD0EF100
+          KEY_RIGHT                    0x02FD1EE100
+          KEY_INFO                     0x02FD5AA500
+          KEY_DOWN                     0x02FD46B900
+          KEY_EXIT                     0x02FD52AD00
+          KEY_AGAIN                   0x02FD59A600
+          KEY_NEXT                     0x02FD51AE00
+          KEY_REWIND                   0x02FD58A700
+          KEY_PLAY                     0x02FD44BB00
+          KEY_FORWARD                  0x02FD50AF00
+          KEY_STOP                     0x02FD07F800
+          KEY_RECORD                   0x02FD1BE400
           Live                     0x02FD13EC00
-          A                        0x02FD0AF500
-          DVD                      0x02FD06F900
-          B                        0x02FD12ED00
+          KEY_A                        0x02FD0AF500
+          KEY_DVD                      0x02FD06F900
+          KEY_B                        0x02FD12ED00
           Photo                    0x02FD48B700
-          Video                    0x02FD40BF00
-          Music                    0x02FD19E600
-          Ch+                      0x02FD0BF400
-          Ch-                      0x02FD08F700
+          KEY_VIDEO                    0x02FD40BF00
+          KEY_AUDIO                    0x02FD19E600
+          KEY_CHANNELUP                      0x02FD0BF400
+          KEY_CHANNELDOWN                      0x02FD08F700
           S1                       0x02FD03FC00
           S2                       0x02FD01FE00
           S3                       0x02FD00FF00
-          Vol+                     0x02FD15EA00
-          Vol-                     0x02FD1CE300
+          KEY_VOLUMEUP                     0x02FD15EA00
+          KEY_VOLUMEDOWN                     0x02FD1CE300
       end codes
 
 end remote
diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/animax/lircd.conf.animax
--- lirc-0.8.6/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
+++ lirc-0.8.6.new/remotes/animax/lircd.conf.animax	2009-09-13 21:37:03.000000000 -0400
@@ -38,79 +38,79 @@ begin remote
 
       begin codes
           CD_DOWN                  0x000000000000DB24
-          CD_UP                    0x0000000000005BA4
+          KEY_CD                    0x0000000000005BA4
           TV_DOWN                  0x000000000000DC23
-          TV_UP                    0x0000000000005CA3
+          KEY_TV                    0x0000000000005CA3
           PHONE_DOWN               0x000000000000DD22
-          PHONE_UP                 0x0000000000005DA2
+          KEY_PHONE                 0x0000000000005DA2
           RADIO_DOWN               0x000000000000DE21
-          RADIO_UP                 0x0000000000005EA1
+          KEY_RADIO                 0x0000000000005EA1
           VIDEO_DOWN               0x000000000000DF20
-          VIDEO_UP                 0x0000000000005FA0
+          KEY_VIDEO                 0x0000000000005FA0
           AUX1_DOWN                0x000000000000E01F
-          AUX1_UP                  0x000000000000609F
+          KEY_AUX                  0x000000000000609F
           MAIL_DOWN                0x000000000000E11E
-          MAIL_UP                  0x000000000000619E
+          KEY_MAIL                  0x000000000000619E
           AUX2_DOWN                0x000000000000E21D
           AUX2_UP                  0x000000000000629D
           POWER_DOWN               0x000000000000E31C
-          POWER_UP                 0x000000000000639C
+          KEY_POWER                 0x000000000000639C
           LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B
           LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B
           REWIND_DOWN              0x000000000000E51A
-          REWIND_UP                0x000000000000659A
+          KEY_REWIND                0x000000000000659A
           PLAY_DOWN                0x000000000000E619
-          PLAY_UP                  0x0000000000006699
+          KEY_PLAY                  0x0000000000006699
           FORWARD_DOWN             0x000000000000E718
-          FORWARD_UP               0x0000000000006798
+          KEY_FORWARD               0x0000000000006798
           SKIP_BACKWARD_DOWN       0x000000000000E817
           SKIP_BACKWARD            0x0000000000006897
           STOP_DOWN                0x000000000000E916
-          STOP_UP                  0x0000000000006996
+          KEY_STOP                  0x0000000000006996
           SKIP_FORWARD_DOWN        0x000000000000EA15
           SKIP_FORWARD_UP          0x0000000000006A95
           CHANNEL_UP_DOWN          0x000000000000EB14
-          CHANNEL_UP_UP            0x0000000000006B94
+          KEY_CHANNELUP            0x0000000000006B94
           MENU_DOWN                0x000000000000EC13
-          MENU_UP                  0x0000000000006C93
+          KEY_MENU                  0x0000000000006C93
           VOLUME_UP_DOWN           0x000000000000ED12
-          VOLUME_UP_UP             0x0000000000006D92
+          KEY_VOLUMEUP             0x0000000000006D92
           BLUE_BUTTON_DOWN         0x000000000000EE11
-          BLUE_BUTTON_UP           0x0000000000006E91
+          KEY_BLUE           0x0000000000006E91
           MUTE_DOWN                0x000000000000EF10
-          MUTE_UP                  0x0000000000006F90
+          KEY_MUTE                  0x0000000000006F90
           VOLUME_DOWN_DOWN         0x000000000000F00F
-          VOLUME_DOWN_UP           0x000000000000708F
+          KEY_VOLUMEDOWN           0x000000000000708F
           RED_BUTTON_DOWN          0x000000000000F10E
-          RED_BUTTON_UP            0x000000000000718E
+          KEY_RED            0x000000000000718E
           GREEN_BUTTON_DOWN        0x000000000000F20D
-          GREEN_BUTTON_UP          0x000000000000728D
+          KEY_GREEN          0x000000000000728D
           CHANNEL_DOWN_DOWN        0x000000000000F30C
-          CHANNEL_DOWN_UP          0x000000000000738C
+          KEY_CHANNELDOWN          0x000000000000738C
           1_DOWN                   0x000000000000F40B
-          1_UP                     0x000000000000748B
+          KEY_1                     0x000000000000748B
           2_DOWN                   0x000000000000F50A
-          2_UP                     0x000000000000758A
+          KEY_2                     0x000000000000758A
           3_DOWN                   0x000000000000F609
-          3_UP                     0x0000000000007689
+          KEY_3                     0x0000000000007689
           4_DOWN                   0x000000000000F708
-          4_UP                     0x0000000000007788
+          KEY_4                     0x0000000000007788
           5_DOWN                   0x000000000000F807
-          5_UP                     0x0000000000007887
+          KEY_5                     0x0000000000007887
           6_DOWN                   0x000000000000F906
-          6_UP                     0x0000000000007986
+          KEY_6                     0x0000000000007986
           7_DOWN                   0x000000000000FA05
-          7_UP                     0x0000000000007A85
+          KEY_7                     0x0000000000007A85
           8_DOWN                   0x000000000000FB04
-          8_UP                     0x0000000000007B84
+          KEY_8                     0x0000000000007B84
           9_DOWN                   0x000000000000FC03
-          9_UP                     0x0000000000007C83
+          KEY_9                     0x0000000000007C83
           SLASH_DOWN               0x000000000000FD02
-          SLASH_UP                 0x0000000000007D82
+          KEY_SLASH                 0x0000000000007D82
[...4302 lines suppressed...]
+          KEY_8                        0x03
+          KEY_9                        0x07
+          KEY_0                        0x4c
+          KEY_VOLUMEUP                 0x0a
+          KEY_VOLUMEDOWN               0x0e
+          KEY_CHANNELUP                0x12
+          KEY_CHANNELDOWN              0x16
+          Guide                        0x0f
+          KEY_BACK                     0x0b
+          KEY_TV                       0x13
+          KEY_OK                       0x42
+          KEY_UP                       0x19
+          KEY_LEFT                     0x54
+          KEY_RIGHT                    0x43
+          KEY_DOWN                     0x1d
+          Exit_Click                   0x1f
+          Task_Quick                   0x17
+          Run_DClick                   0x1b
+          KEY_REWIND                   0x0d
+          KEY_PLAY                     0x09
+          KEY_FASTFORWARD              0x15
+          KEY_PREVIOUS                 0x1a
+          KEY_STOP                     0x01
+          KEY_NEXT                     0x1e
+          KEY_PAUSE                    0x05
+          KEY_MUTE                     0x4a
+          Warp_Mouse                   0x47
+          KEY_RECORD                   0x11
+          KEY_ZOOM                     0x14
+          Detail                       0x4b
       end codes
 
 end remote
diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote
--- lirc-0.8.6/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote	2009-09-13 21:37:03.000000000 -0400
@@ -24,42 +24,42 @@ begin remote
   gap		140000
 
       begin codes
-        POWER			0x000000000000000F
-	PC			0x000000000000002B
+        KEY_POWER			0x000000000000000F
+	KEY_PC			0x000000000000002B
 	LAST			0x000000000000004F
-	CHANUP			0x0000000000000002
-	CHANDOWN		0x0000000000000003
-	VOLUP			0x0000000000000006
-	VOLDOWN			0x0000000000000007
-	MUTE			0x0000000000000005
-	1			0x0000000000000041
-	2			0x0000000000000042
-	3			0x0000000000000043
-	4			0x0000000000000044
-	5			0x0000000000000045
-	6			0x0000000000000046
-	7			0x0000000000000047
-	8			0x0000000000000048
-	9			0x0000000000000049
-	0			0x0000000000000040
-	ENTER			0x000000000000004a
+	KEY_CHANNELUP			0x0000000000000002
+	KEY_CHANNELDOWN		0x0000000000000003
+	KEY_VOLUMEUP			0x0000000000000006
+	KEY_VOLUMEDOWN			0x0000000000000007
+	KEY_MUTE			0x0000000000000005
+	KEY_1			0x0000000000000041
+	KEY_2			0x0000000000000042
+	KEY_3			0x0000000000000043
+	KEY_4			0x0000000000000044
+	KEY_5			0x0000000000000045
+	KEY_6			0x0000000000000046
+	KEY_7			0x0000000000000047
+	KEY_8			0x0000000000000048
+	KEY_9			0x0000000000000049
+	KEY_0			0x0000000000000040
+	KEY_ENTER			0x000000000000004a
 	ADOTB			0x000000000000005D
-	REWIND			0x000000000000001C
-	PLAY			0x000000000000000D
-	FFWD			0x000000000000001D
-	STOP			0x000000000000000E
-	PAUSE			0x000000000000004E
-	RECORD			0x00000000000000FF
-	ENTER			0x000000000000004A
+	KEY_REWIND			0x000000000000001C
+	KEY_PLAY			0x000000000000000D
+	KEY_FASTFORWARD			0x000000000000001D
+	KEY_STOP			0x000000000000000E
+	KEY_PAUSE			0x000000000000004E
+	KEY_RECORD			0x00000000000000FF
+	KEY_ENTER			0x000000000000004A
 	LAST			0x000000000000004F
 	DISP			0x000000000000005C
 	SHIFT			0x000000000000006B
 	GUIDE			0x000000000000006D
-	SELECT			0x0000000000000093
-	PHONE			0x000000000000004B
-	WEB			0x000000000000008B
-	CD			0x00000000000000AB
-	DVD			0x00000000000000CB
+	KEY_SELECT			0x0000000000000093
+	KEY_PHONE			0x000000000000004B
+	KEY_WWW			0x000000000000008B
+	KEY_CD			0x00000000000000AB
+	KEY_DVD			0x00000000000000CB
 	MOUSE_SLOW_N		0x0000000000000110
 	MOUSE_SLOW_NNE		0x0000000000000131
 	MOUSE_SLOW_NE		0x0000000000000111
@@ -110,7 +110,7 @@ begin remote
 	MOUSE_FAST_NNW		0x0000000000000539
 	BUTTONR_DOWN		0x0000000000000801
 	BUTTONL_DOWN		0x0000000000000804
-	BUTTON_UP		0x0000000000000800
+	KEY_UP		0x0000000000000800
 	end codes	
 
 end remote
diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere
--- lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere	2009-09-13 21:37:03.000000000 -0400
@@ -22,43 +22,43 @@ begin remote
   gap		140000
 
       begin codes
-        POWER			0x00000000000000F0
-	PC			0x00000000000000D4
+        KEY_POWER			0x00000000000000F0
+	KEY_PC			0x00000000000000D4
 	LAST			0x00000000000000F2
-	CHANUP			0x0000000000000040
-	CHANDOWN		0x00000000000000C0
-	VOLUP			0x0000000000000060
-	VOLDOWN			0x00000000000000E0
-	MUTE			0x00000000000000A0
-	ONE			0x0000000000000082
-	TWO			0x0000000000000042
-	THREE			0x00000000000000C2
-	FOUR			0x0000000000000022
-	FIVE			0x00000000000000A2
-	SIX			0x0000000000000062
-	SEVEN			0x00000000000000E2
-	EIGHT			0x0000000000000012
-	NINE			0x0000000000000092
-	ZERO			0x0000000000000002
-	ENTER			0x0000000000000052
+	KEY_CHANNELUP			0x0000000000000040
+	KEY_CHANNELDOWN		0x00000000000000C0
+	KEY_VOLUMEUP			0x0000000000000060
+	KEY_VOLUMEDOWN			0x00000000000000E0
+	KEY_MUTE			0x00000000000000A0
+	KEY_1			0x0000000000000082
+	KEY_2			0x0000000000000042
+	KEY_3			0x00000000000000C2
+	KEY_4			0x0000000000000022
+	KEY_5			0x00000000000000A2
+	KEY_6			0x0000000000000062
+	KEY_7			0x00000000000000E2
+	KEY_8			0x0000000000000012
+	KEY_9			0x0000000000000092
+	KEY_0			0x0000000000000002
+	KEY_ENTER			0x0000000000000052
 	ADOTB			0x00000000000000BA
-	A			0x000000000000003A
-	B			0x00000000000000D8
-	C			0x00000000000000D6
-	D			0x00000000000000D4
-	MENU			0x00000000000000B6
-	EXIT			0x00000000000000C9
-	UP			0x00000000000000D5
-	DOWN			0x00000000000000D3
-	LEFT			0x00000000000000D2
-	RIGHT			0x00000000000000D1
-	OK			0x0000000000000052
-	REWIND			0x0000000000000038
-	PLAY			0x00000000000000B0
-	FFWD			0x00000000000000B8
-	RECORD			0x00000000000000FF
-	STOP			0x0000000000000070
-	PAUSE			0x0000000000000072
+	KEY_A			0x000000000000003A
+	KEY_B			0x00000000000000D8
+	KEY_C			0x00000000000000D6
+	KEY_D			0x00000000000000D4
+	KEY_MENU			0x00000000000000B6
+	KEY_EXIT			0x00000000000000C9
+	KEY_UP			0x00000000000000D5
+	KEY_DOWN			0x00000000000000D3
+	KEY_LEFT			0x00000000000000D2
+	KEY_RIGHT			0x00000000000000D1
+	KEY_OK			0x0000000000000052
+	KEY_REWIND			0x0000000000000038
+	KEY_PLAY			0x00000000000000B0
+	KEY_FASTFORWARD			0x00000000000000B8
+	KEY_RECORD			0x00000000000000FF
+	KEY_STOP			0x0000000000000070
+	KEY_PAUSE			0x0000000000000072
       end codes	
 
 end remote


Index: lirc.init
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lirc.init	23 Jun 2008 18:06:40 -0000	1.4
+++ lirc.init	14 Sep 2009 04:16:25 -0000	1.5
@@ -6,9 +6,9 @@
 # description: Enables infrared controls through LIRC.
 # processname: lircd
 # processname: lircmd
-# config:      /etc/lircd.conf
-# config:      /etc/lircmd.conf
-# pidfile:     /var/run/lircd.pid
+# config:      /etc/lirc/lircd.conf
+# config:      /etc/lirc/lircmd.conf
+# pidfile:     /var/run/lirc/lircd.pid
 
 ### BEGIN INIT INFO
 # Provides: lirc


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- lirc.spec	30 Aug 2009 04:27:30 -0000	1.55
+++ lirc.spec	14 Sep 2009 04:16:25 -0000	1.56
@@ -14,24 +14,24 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-#define pre     pre3
+#define pre     pre2
 
 Name:           lirc
-Version:        0.8.5
-Release:        3%{?pre:.%{pre}}%{?dist}
+Version:        0.8.6
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
 Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.5-standardized-remote-keycodes.patch
+Patch1:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -136,6 +136,12 @@ for f in remotes/chronos/lircd.conf.chro
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 
+# use /dev/lirc0 by default instead of /dev/lirc
+sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
+
+# use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+sed -i -e 's|char.*font1_name.*Courier.*$|char		font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
 sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
 
 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
@@ -202,10 +208,11 @@ rm -rf doc/Makefile* doc/.libs doc/man* 
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{d,md}.conf
 
-install -dm 755 $RPM_BUILD_ROOT/dev
-touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
+touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
 
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 
@@ -218,6 +225,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add lirc
+# If we're upgrading, move config files into their new location, if need be
+if [ $1 -ge 2 ] ; then
+  if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
+    mv %{_sysconfdir}/lircd.conf %{_sysconfdir}/lirc/lircd.conf
+  fi
+  if [ -e %{_sysconfdir}/lircmd.conf -a ! -e %{_sysconfdir}/lirc/lircmd.conf ]; then
+    mv %{_sysconfdir}/lircmd.conf %{_sysconfdir}/lirc/lircmd.conf
+  fi
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -233,17 +249,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
+%ghost %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_initrddir}/lirc
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
+%dir %{_datadir}/lirc/
 %{_datadir}/lirc/
+%dir %{_localstatedir}/run/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
-%ghost /dev/lirc*
+%ghost %{_localstatedir}/run/lirc/lirc*
 
 %files libs
 %defattr(-,root,root,-)
@@ -265,8 +283,31 @@ fi
 
 
 %changelog
-* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-3
-- Bump to keep F11 version rpm-newer than F10
+* Sun Sep 13 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-1
+- Update to lirc 0.8.6 release
+
+* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.6.pre2
+- Rediff patches so they actually apply still
+
+* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.5.pre2
+- Update to lirc 0.8.6pre2
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-0.4.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.3.pre1
+- Set up tools to use /dev/lirc0 instead of /dev/lirc by default
+- Set a default font for xmode2 most people actually have (#467339)
+
+* Wed Jun 24 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.2.pre1
+- Fix things up so the relocated socket actually works out of the box
+
+* Tue Jun 23 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.1.pre1
+- Update to lirc 0.8.6pre1
+- Adds Linux input layer support to lircmd
+- Adds XMP protocol support
+- Moves lircd socket from /dev/ to /var/run/lirc/ and pid file from
+  /var/run/ to /var/run/lirc/
 
 * Thu May 28 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-2
 - Update to lirc 0.8.5


Index: lirc.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc.sysconfig	23 Jun 2008 18:06:40 -0000	1.2
+++ lirc.sysconfig	14 Sep 2009 04:16:25 -0000	1.3
@@ -12,7 +12,7 @@ LIRC_DRIVER=""
 
 # Which lirc device will be used by lircd(8).
 # This is the same as passing "-d device" to lircd.
-# An empty value will use the default /dev/lirc device.
+# An empty value will use the default /dev/lirc0 device.
 LIRC_DEVICE=""
 
 # If "yes", the init script will try to start lircmd(8) too.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	28 May 2009 17:04:07 -0000	1.30
+++ sources	14 Sep 2009 04:16:25 -0000	1.31
@@ -1 +1 @@
-5a274e4eaff8156b17903c22ea01f506  lirc-0.8.5.tar.bz2
+4ca24da6f5e7c2dcea74878c27a4a3f7  lirc-0.8.6.tar.bz2



From trasher at fedoraproject.org  Mon Sep 14 04:31:02 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon, 14 Sep 2009 04:31:02 +0000 (UTC)
Subject: rpms/eric/F-10 .cvsignore, 1.18, 1.19 eric.spec, 1.41, 1.42 sources,
	1.23, 1.24
Message-ID: <20090914043102.AD0CB11C0380@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Jul 2009 16:03:59 -0000	1.18
+++ .cvsignore	14 Sep 2009 04:31:01 -0000	1.19
@@ -1,8 +1,8 @@
-eric4-4.3.5.tar.gz
-eric4-i18n-fr-4.3.5.tar.gz
-eric4-i18n-de-4.3.5.tar.gz
-eric4-i18n-ru-4.3.5.tar.gz
-eric4-i18n-cs-4.3.5.tar.gz
-eric4-i18n-es-4.3.5.tar.gz
-eric4-i18n-tr-4.3.5.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz
+eric4-4.3.7.1.tar.gz
+eric4-i18n-cs-4.3.7.1.tar.gz
+eric4-i18n-de-4.3.7.1.tar.gz
+eric4-i18n-es-4.3.7.1.tar.gz
+eric4-i18n-fr-4.3.7.1.tar.gz
+eric4-i18n-ru-4.3.7.1.tar.gz
+eric4-i18n-tr-4.3.7.1.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/eric.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- eric.spec	5 Jul 2009 16:03:59 -0000	1.41
+++ eric.spec	14 Sep 2009 04:31:01 -0000	1.42
@@ -7,7 +7,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.5
+Version: 4.3.7.1
 Release: 1%{?dist}
 
 License: GPL+
@@ -31,6 +31,8 @@ Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
 BuildRequires: qscintilla-python-devel
+BuildRequires: qscintilla-python
+BuildRequires: python
 
 # This can be left unversioned
 Requires: qscintilla-python
@@ -147,6 +149,11 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-1
+- 4.3.7.1
+- add BR on qscintilla-python since qscintilla-python-devel no longer
+  requires it
+
 * Sun Jul 5 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.5-1
 - 4.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	5 Jul 2009 16:03:59 -0000	1.23
+++ sources	14 Sep 2009 04:31:01 -0000	1.24
@@ -1,8 +1,8 @@
-3dc719330b4b82edc17939068180cc6a  eric4-4.3.5.tar.gz
-b90cf27a4d595f54b81851222a64ad7b  eric4-i18n-fr-4.3.5.tar.gz
-7c3ebbe36d0e305c48e6f3da444cdcb3  eric4-i18n-de-4.3.5.tar.gz
-5ebd2f978e3d61b7ccc9c90b1ab6c676  eric4-i18n-ru-4.3.5.tar.gz
-b55a007ddfafc98f9533df77ba52983a  eric4-i18n-cs-4.3.5.tar.gz
-9ce364f90909d5d7fa873ff3db980c77  eric4-i18n-es-4.3.5.tar.gz
-28c5d615eea8f10e94bae717d6023527  eric4-i18n-tr-4.3.5.tar.gz
-fb29d702bff9c9f7eed0f992a8394ba9  eric4-i18n-zh_CN.GB2312-4.3.5.tar.gz
+c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
+06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
+9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
+1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
+e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
+b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
+b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
+eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 14 04:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:42:57 +0000
Subject: [pkgdb] kernel F-12 cloned from devel
Message-ID: <20090914044257.BC0EC10F880@bastion2.fedora.phx.redhat.com>

kevin cloned kernel F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Sep 14 04:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:49:36 +0000
Subject: [pkgdb] php-email-address-validation was added for topdog
Message-ID: <20090914044936.78BD310F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package php-email-address-validation with summary A PHP class for validating email addresses
kevin has approved Package php-email-address-validation
kevin has added a Fedora devel branch for php-email-address-validation with an owner of topdog
kevin has approved php-email-address-validation in Fedora devel
kevin has approved Package php-email-address-validation
kevin has set commit to Approved for 107427 on php-email-address-validation (Fedora devel)
kevin has set checkout to Approved for 107427 on php-email-address-validation (Fedora devel)
kevin has set build to Approved for 107427 on php-email-address-validation (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-email-address-validation



From pkgdb at fedoraproject.org  Mon Sep 14 04:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:49:38 +0000
Subject: [pkgdb] php-email-address-validation summary updated by kevin
Message-ID: <20090914044938.26C6F10F883@bastion2.fedora.phx.redhat.com>

kevin set package php-email-address-validation summary to A PHP class for validating email addresses

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-email-address-validation



From pkgdb at fedoraproject.org  Mon Sep 14 04:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:49:38 +0000
Subject: [pkgdb] php-email-address-validation (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090914044938.2CE8410F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-email-address-validation
kevin has set commit to Approved for 107427 on php-email-address-validation (Fedora 11)
kevin has set checkout to Approved for 107427 on php-email-address-validation (Fedora 11)
kevin has set build to Approved for 107427 on php-email-address-validation (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-email-address-validation



From pkgdb at fedoraproject.org  Mon Sep 14 04:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:49:38 +0000
Subject: [pkgdb] php-email-address-validation (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090914044938.3809410F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-email-address-validation
kevin has set commit to Approved for 107427 on php-email-address-validation (Fedora 10)
kevin has set checkout to Approved for 107427 on php-email-address-validation (Fedora 10)
kevin has set build to Approved for 107427 on php-email-address-validation (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-email-address-validation



From kevin at fedoraproject.org  Mon Sep 14 04:50:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:50:03 +0000 (UTC)
Subject: rpms/php-email-address-validation - New directory
Message-ID: <20090914045003.1DDFE11C048A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-email-address-validation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ17409/rpms/php-email-address-validation

Log Message:
Directory /cvs/pkgs/rpms/php-email-address-validation added to the repository




From pkgdb at fedoraproject.org  Mon Sep 14 04:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:49:38 +0000
Subject: [pkgdb] php-email-address-validation (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090914044938.4199710F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-email-address-validation
kevin has set commit to Approved for 107427 on php-email-address-validation (Fedora 12)
kevin has set checkout to Approved for 107427 on php-email-address-validation (Fedora 12)
kevin has set build to Approved for 107427 on php-email-address-validation (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-email-address-validation



From pkgdb at fedoraproject.org  Mon Sep 14 04:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:49:38 +0000
Subject: [pkgdb] php-email-address-validation (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090914044938.4C30F10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-email-address-validation
kevin has set commit to Approved for 107427 on php-email-address-validation (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-email-address-validation (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-email-address-validation (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-email-address-validation



From kevin at fedoraproject.org  Mon Sep 14 04:50:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:50:03 +0000 (UTC)
Subject: rpms/php-email-address-validation/devel - New directory
Message-ID: <20090914045003.4130B11C0495@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-email-address-validation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ17409/rpms/php-email-address-validation/devel

Log Message:
Directory /cvs/pkgs/rpms/php-email-address-validation/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:50:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:50:09 +0000 (UTC)
Subject: rpms/php-email-address-validation Makefile,NONE,1.1
Message-ID: <20090914045009.B501511C048A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-email-address-validation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ17409/rpms/php-email-address-validation

Added Files:
	Makefile 
Log Message:
Setup of module php-email-address-validation


--- NEW FILE Makefile ---
# Top level Makefile for module php-email-address-validation
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 Sep 14 04:50:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:50:09 +0000 (UTC)
Subject: rpms/php-email-address-validation/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090914045009.EBCBF11C048A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-email-address-validation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ17409/rpms/php-email-address-validation/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-email-address-validation


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-email-address-validation
# $Id: Makefile,v 1.1 2009/09/14 04:50:09 kevin Exp $
NAME := php-email-address-validation
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 Sep 14 04:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:51:09 +0000
Subject: [pkgdb] ez-ipupdate (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045109.E139110F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for ez-ipupdate
kevin has set commit to Approved for 107427 on ez-ipupdate (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on ez-ipupdate (Fedora EPEL 4)
kevin has set build to Approved for 107427 on ez-ipupdate (Fedora EPEL 4)
kevin changed owner of ez-ipupdate in Fedora EPEL 4 to itamarjp
kevin approved watchbugzilla on ez-ipupdate (Fedora EPEL 4) for jlayton
kevin approved watchcommits on ez-ipupdate (Fedora EPEL 4) for jlayton
kevin approved commit on ez-ipupdate (Fedora EPEL 4) for jlayton
kevin approved build on ez-ipupdate (Fedora EPEL 4) for jlayton
kevin approved approveacls on ez-ipupdate (Fedora EPEL 4) for jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Mon Sep 14 04:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:51:09 +0000
Subject: [pkgdb] ez-ipupdate (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045110.1B8C510F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ez-ipupdate
kevin has set commit to Approved for 107427 on ez-ipupdate (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on ez-ipupdate (Fedora EPEL 5)
kevin has set build to Approved for 107427 on ez-ipupdate (Fedora EPEL 5)
kevin changed owner of ez-ipupdate in Fedora EPEL 5 to itamarjp
kevin approved watchbugzilla on ez-ipupdate (Fedora EPEL 5) for jlayton
kevin approved watchcommits on ez-ipupdate (Fedora EPEL 5) for jlayton
kevin approved commit on ez-ipupdate (Fedora EPEL 5) for jlayton
kevin approved build on ez-ipupdate (Fedora EPEL 5) for jlayton
kevin approved approveacls on ez-ipupdate (Fedora EPEL 5) for jlayton

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ez-ipupdate



From pkgdb at fedoraproject.org  Mon Sep 14 04:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:52:50 +0000
Subject: [pkgdb] vrq was added for shakthimaan
Message-ID: <20090914045250.909E310F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package vrq with summary Verilog tool framework with plugins for manipulating source code
kevin has approved Package vrq
kevin has added a Fedora devel branch for vrq with an owner of shakthimaan
kevin has approved vrq in Fedora devel
kevin has approved Package vrq
kevin has set commit to Approved for 107427 on vrq (Fedora devel)
kevin has set checkout to Approved for 107427 on vrq (Fedora devel)
kevin has set build to Approved for 107427 on vrq (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vrq



From pkgdb at fedoraproject.org  Mon Sep 14 04:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:52:52 +0000
Subject: [pkgdb] vrq summary updated by kevin
Message-ID: <20090914045252.B824D10F886@bastion2.fedora.phx.redhat.com>

kevin set package vrq summary to Verilog tool framework with plugins for manipulating source code

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vrq



From pkgdb at fedoraproject.org  Mon Sep 14 04:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:52:52 +0000
Subject: [pkgdb] vrq (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914045252.C293810F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vrq
kevin has set commit to Approved for 107427 on vrq (Fedora 10)
kevin has set checkout to Approved for 107427 on vrq (Fedora 10)
kevin has set build to Approved for 107427 on vrq (Fedora 10)
kevin approved watchbugzilla on vrq (Fedora 10) for chitlesh
kevin approved watchcommits on vrq (Fedora 10) for chitlesh
kevin approved commit on vrq (Fedora 10) for chitlesh
kevin approved build on vrq (Fedora 10) for chitlesh
kevin approved approveacls on vrq (Fedora 10) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vrq



From pkgdb at fedoraproject.org  Mon Sep 14 04:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:52:52 +0000
Subject: [pkgdb] vrq (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914045252.CF0F310F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for vrq
kevin has set commit to Approved for 107427 on vrq (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on vrq (Fedora EPEL 5)
kevin has set build to Approved for 107427 on vrq (Fedora EPEL 5)
kevin approved watchbugzilla on vrq (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on vrq (Fedora EPEL 5) for chitlesh
kevin approved commit on vrq (Fedora EPEL 5) for chitlesh
kevin approved build on vrq (Fedora EPEL 5) for chitlesh
kevin approved approveacls on vrq (Fedora EPEL 5) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vrq



From pkgdb at fedoraproject.org  Mon Sep 14 04:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:52:52 +0000
Subject: [pkgdb] vrq (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914045252.DAE4810F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vrq
kevin has set commit to Approved for 107427 on vrq (Fedora 11)
kevin has set checkout to Approved for 107427 on vrq (Fedora 11)
kevin has set build to Approved for 107427 on vrq (Fedora 11)
kevin approved watchbugzilla on vrq (Fedora 11) for chitlesh
kevin approved watchcommits on vrq (Fedora 11) for chitlesh
kevin approved commit on vrq (Fedora 11) for chitlesh
kevin approved build on vrq (Fedora 11) for chitlesh
kevin approved approveacls on vrq (Fedora 11) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vrq



From pkgdb at fedoraproject.org  Mon Sep 14 04:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:52:52 +0000
Subject: [pkgdb] vrq (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914045252.EC6DD10F8A4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on vrq (Fedora devel) for chitlesh
kevin approved watchcommits on vrq (Fedora devel) for chitlesh
kevin approved commit on vrq (Fedora devel) for chitlesh
kevin approved build on vrq (Fedora devel) for chitlesh
kevin approved approveacls on vrq (Fedora devel) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vrq



From kevin at fedoraproject.org  Mon Sep 14 04:53:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:53:07 +0000 (UTC)
Subject: rpms/vrq - New directory
Message-ID: <20090914045307.1C2E411C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vrq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw18594/rpms/vrq

Log Message:
Directory /cvs/pkgs/rpms/vrq added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:53:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:53:07 +0000 (UTC)
Subject: rpms/vrq/devel - New directory
Message-ID: <20090914045307.4269611C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw18594/rpms/vrq/devel

Log Message:
Directory /cvs/pkgs/rpms/vrq/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:53:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:53:14 +0000 (UTC)
Subject: rpms/vrq Makefile,NONE,1.1
Message-ID: <20090914045314.B067E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vrq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw18594/rpms/vrq

Added Files:
	Makefile 
Log Message:
Setup of module vrq


--- NEW FILE Makefile ---
# Top level Makefile for module vrq
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 Sep 14 04:53:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:53:14 +0000 (UTC)
Subject: rpms/vrq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090914045314.D8DEF11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw18594/rpms/vrq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vrq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vrq
# $Id: Makefile,v 1.1 2009/09/14 04:53:14 kevin Exp $
NAME := vrq
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 Sep 14 04:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:54:47 +0000
Subject: [pkgdb] gtk-splitter was added for fab
Message-ID: <20090914045447.3E0ED10F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package gtk-splitter with summary A file splitter
kevin has approved Package gtk-splitter
kevin has added a Fedora devel branch for gtk-splitter with an owner of fab
kevin has approved gtk-splitter in Fedora devel
kevin has approved Package gtk-splitter
kevin has set commit to Approved for 107427 on gtk-splitter (Fedora devel)
kevin has set checkout to Approved for 107427 on gtk-splitter (Fedora devel)
kevin has set build to Approved for 107427 on gtk-splitter (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk-splitter



From pkgdb at fedoraproject.org  Mon Sep 14 04:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:54:48 +0000
Subject: [pkgdb] gtk-splitter summary updated by kevin
Message-ID: <20090914045448.5AEC210F886@bastion2.fedora.phx.redhat.com>

kevin set package gtk-splitter summary to A file splitter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk-splitter



From pkgdb at fedoraproject.org  Mon Sep 14 04:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:54:48 +0000
Subject: [pkgdb] gtk-splitter (Fedora, 10) updated by kevin
Message-ID: <20090914045448.6BDBF10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gtk-splitter
kevin has set commit to Approved for 107427 on gtk-splitter (Fedora 11)
kevin has set checkout to Approved for 107427 on gtk-splitter (Fedora 11)
kevin has set build to Approved for 107427 on gtk-splitter (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk-splitter



From pkgdb at fedoraproject.org  Mon Sep 14 04:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:54:48 +0000
Subject: [pkgdb] gtk-splitter (Fedora, 10) updated by kevin
Message-ID: <20090914045448.6279A10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gtk-splitter
kevin has set commit to Approved for 107427 on gtk-splitter (Fedora 10)
kevin has set checkout to Approved for 107427 on gtk-splitter (Fedora 10)
kevin has set build to Approved for 107427 on gtk-splitter (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk-splitter



From kevin at fedoraproject.org  Mon Sep 14 04:54:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:54:58 +0000 (UTC)
Subject: rpms/gtk-splitter/devel - New directory
Message-ID: <20090914045458.5CA8811C0261@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtk-splitter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19391/rpms/gtk-splitter/devel

Log Message:
Directory /cvs/pkgs/rpms/gtk-splitter/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:54:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:54:58 +0000 (UTC)
Subject: rpms/gtk-splitter - New directory
Message-ID: <20090914045458.267DC11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtk-splitter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19391/rpms/gtk-splitter

Log Message:
Directory /cvs/pkgs/rpms/gtk-splitter added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:55:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:55:04 +0000 (UTC)
Subject: rpms/gtk-splitter Makefile,NONE,1.1
Message-ID: <20090914045504.D521B11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtk-splitter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19391/rpms/gtk-splitter

Added Files:
	Makefile 
Log Message:
Setup of module gtk-splitter


--- NEW FILE Makefile ---
# Top level Makefile for module gtk-splitter
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 Sep 14 04:55:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:55:05 +0000 (UTC)
Subject: rpms/gtk-splitter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090914045505.2F4B911C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtk-splitter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19391/rpms/gtk-splitter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtk-splitter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gtk-splitter
# $Id: Makefile,v 1.1 2009/09/14 04:55:05 kevin Exp $
NAME := gtk-splitter
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 Sep 14 04:56:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:56:10 +0000
Subject: [pkgdb] givaro was added for mycae
Message-ID: <20090914045610.555BD10F883@bastion2.fedora.phx.redhat.com>

kevin has added Package givaro with summary C++ library for arithmetic and algebraic computations
kevin has approved Package givaro
kevin has added a Fedora devel branch for givaro with an owner of mycae
kevin has approved givaro in Fedora devel
kevin has approved Package givaro
kevin has set commit to Approved for 107427 on givaro (Fedora devel)
kevin has set checkout to Approved for 107427 on givaro (Fedora devel)
kevin has set build to Approved for 107427 on givaro (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/givaro



From kevin at fedoraproject.org  Mon Sep 14 04:56:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:56:21 +0000 (UTC)
Subject: rpms/givaro - New directory
Message-ID: <20090914045621.1D24411C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/givaro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20464/rpms/givaro

Log Message:
Directory /cvs/pkgs/rpms/givaro added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:56:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:56:21 +0000 (UTC)
Subject: rpms/givaro/devel - New directory
Message-ID: <20090914045621.4C9A111C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/givaro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20464/rpms/givaro/devel

Log Message:
Directory /cvs/pkgs/rpms/givaro/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:56:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:56:28 +0000 (UTC)
Subject: rpms/givaro Makefile,NONE,1.1
Message-ID: <20090914045628.B50E911C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/givaro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20464/rpms/givaro

Added Files:
	Makefile 
Log Message:
Setup of module givaro


--- NEW FILE Makefile ---
# Top level Makefile for module givaro
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 Sep 14 04:56:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:56:29 +0000 (UTC)
Subject: rpms/givaro/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090914045629.2EDA811C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/givaro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20464/rpms/givaro/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module givaro


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: givaro
# $Id: Makefile,v 1.1 2009/09/14 04:56:28 kevin Exp $
NAME := givaro
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 Sep 14 04:58:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:58:20 +0000
Subject: [pkgdb] synergy-plus was added for thias
Message-ID: <20090914045820.E9FF910F867@bastion2.fedora.phx.redhat.com>

kevin has added Package synergy-plus with summary Mouse and keyboard sharing utility
kevin has approved Package synergy-plus
kevin has added a Fedora devel branch for synergy-plus with an owner of thias
kevin has approved synergy-plus in Fedora devel
kevin has approved Package synergy-plus
kevin has set commit to Approved for 107427 on synergy-plus (Fedora devel)
kevin has set checkout to Approved for 107427 on synergy-plus (Fedora devel)
kevin has set build to Approved for 107427 on synergy-plus (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/synergy-plus



From pkgdb at fedoraproject.org  Mon Sep 14 04:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:58:22 +0000
Subject: [pkgdb] synergy-plus summary updated by kevin
Message-ID: <20090914045822.7061910F883@bastion2.fedora.phx.redhat.com>

kevin set package synergy-plus summary to Mouse and keyboard sharing utility

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/synergy-plus



From pkgdb at fedoraproject.org  Mon Sep 14 04:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:58:22 +0000
Subject: [pkgdb] synergy-plus (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045822.82B4D10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for synergy-plus
kevin has set commit to Approved for 107427 on synergy-plus (Fedora 11)
kevin has set checkout to Approved for 107427 on synergy-plus (Fedora 11)
kevin has set build to Approved for 107427 on synergy-plus (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/synergy-plus



From pkgdb at fedoraproject.org  Mon Sep 14 04:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:58:22 +0000
Subject: [pkgdb] synergy-plus (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045822.77F9D10F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for synergy-plus
kevin has set commit to Approved for 107427 on synergy-plus (Fedora 10)
kevin has set checkout to Approved for 107427 on synergy-plus (Fedora 10)
kevin has set build to Approved for 107427 on synergy-plus (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/synergy-plus



From pkgdb at fedoraproject.org  Mon Sep 14 04:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:58:22 +0000
Subject: [pkgdb] synergy-plus (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045822.874F810F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for synergy-plus
kevin has set commit to Approved for 107427 on synergy-plus (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on synergy-plus (Fedora EPEL 5)
kevin has set build to Approved for 107427 on synergy-plus (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/synergy-plus



From pkgdb at fedoraproject.org  Mon Sep 14 04:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:58:22 +0000
Subject: [pkgdb] synergy-plus (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045822.92C8F10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for synergy-plus
kevin has set commit to Approved for 107427 on synergy-plus (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on synergy-plus (Fedora EPEL 4)
kevin has set build to Approved for 107427 on synergy-plus (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/synergy-plus



From kevin at fedoraproject.org  Mon Sep 14 04:58:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:58:36 +0000 (UTC)
Subject: rpms/synergy-plus - New directory
Message-ID: <20090914045836.234FB11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/synergy-plus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/synergy-plus

Log Message:
Directory /cvs/pkgs/rpms/synergy-plus added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:58:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:58:36 +0000 (UTC)
Subject: rpms/synergy-plus/devel - New directory
Message-ID: <20090914045836.496CE11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/synergy-plus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/synergy-plus/devel

Log Message:
Directory /cvs/pkgs/rpms/synergy-plus/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:58:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:58:42 +0000 (UTC)
Subject: rpms/synergy-plus Makefile,NONE,1.1
Message-ID: <20090914045842.9377D11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/synergy-plus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/synergy-plus

Added Files:
	Makefile 
Log Message:
Setup of module synergy-plus


--- NEW FILE Makefile ---
# Top level Makefile for module synergy-plus
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 Sep 14 04:58:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:58:42 +0000 (UTC)
Subject: rpms/synergy-plus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090914045842.D4D8A11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/synergy-plus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/synergy-plus/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synergy-plus


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: synergy-plus
# $Id: Makefile,v 1.1 2009/09/14 04:58:42 kevin Exp $
NAME := synergy-plus
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 Sep 14 04:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:59:23 +0000
Subject: [pkgdb] spawn-fcgi was added for thias
Message-ID: <20090914045923.AA83D10F89B@bastion2.fedora.phx.redhat.com>

kevin has added Package spawn-fcgi with summary Simple program for spawning FastCGI processes
kevin has approved Package spawn-fcgi
kevin has added a Fedora devel branch for spawn-fcgi with an owner of thias
kevin has approved spawn-fcgi in Fedora devel
kevin has approved Package spawn-fcgi
kevin has set commit to Approved for 107427 on spawn-fcgi (Fedora devel)
kevin has set checkout to Approved for 107427 on spawn-fcgi (Fedora devel)
kevin has set build to Approved for 107427 on spawn-fcgi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spawn-fcgi



From pkgdb at fedoraproject.org  Mon Sep 14 04:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:59:25 +0000
Subject: [pkgdb] spawn-fcgi summary updated by kevin
Message-ID: <20090914045925.4E64710F89D@bastion2.fedora.phx.redhat.com>

kevin set package spawn-fcgi summary to Simple program for spawning FastCGI processes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spawn-fcgi



From pkgdb at fedoraproject.org  Mon Sep 14 04:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:59:25 +0000
Subject: [pkgdb] spawn-fcgi (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045925.5A85C10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for spawn-fcgi
kevin has set commit to Approved for 107427 on spawn-fcgi (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on spawn-fcgi (Fedora EPEL 4)
kevin has set build to Approved for 107427 on spawn-fcgi (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spawn-fcgi



From pkgdb at fedoraproject.org  Mon Sep 14 04:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:59:25 +0000
Subject: [pkgdb] spawn-fcgi (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045925.5FE9510F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for spawn-fcgi
kevin has set commit to Approved for 107427 on spawn-fcgi (Fedora 10)
kevin has set checkout to Approved for 107427 on spawn-fcgi (Fedora 10)
kevin has set build to Approved for 107427 on spawn-fcgi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spawn-fcgi



From pkgdb at fedoraproject.org  Mon Sep 14 04:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:59:25 +0000
Subject: [pkgdb] spawn-fcgi (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045925.6C01810F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for spawn-fcgi
kevin has set commit to Approved for 107427 on spawn-fcgi (Fedora 11)
kevin has set checkout to Approved for 107427 on spawn-fcgi (Fedora 11)
kevin has set build to Approved for 107427 on spawn-fcgi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spawn-fcgi



From pkgdb at fedoraproject.org  Mon Sep 14 04:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 04:59:25 +0000
Subject: [pkgdb] spawn-fcgi (Fedora EPEL, 4) updated by kevin
Message-ID: <20090914045925.7892A10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for spawn-fcgi
kevin has set commit to Approved for 107427 on spawn-fcgi (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on spawn-fcgi (Fedora EPEL 5)
kevin has set build to Approved for 107427 on spawn-fcgi (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spawn-fcgi



From kevin at fedoraproject.org  Mon Sep 14 04:59:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:59:34 +0000 (UTC)
Subject: rpms/spawn-fcgi - New directory
Message-ID: <20090914045934.1B43E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn-fcgi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21823/rpms/spawn-fcgi

Log Message:
Directory /cvs/pkgs/rpms/spawn-fcgi added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:59:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:59:34 +0000 (UTC)
Subject: rpms/spawn-fcgi/devel - New directory
Message-ID: <20090914045934.42F9311C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn-fcgi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21823/rpms/spawn-fcgi/devel

Log Message:
Directory /cvs/pkgs/rpms/spawn-fcgi/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 04:59:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:59:41 +0000 (UTC)
Subject: rpms/spawn-fcgi Makefile,NONE,1.1
Message-ID: <20090914045941.0C7B111C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn-fcgi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21823/rpms/spawn-fcgi

Added Files:
	Makefile 
Log Message:
Setup of module spawn-fcgi


--- NEW FILE Makefile ---
# Top level Makefile for module spawn-fcgi
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 Sep 14 04:59:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 04:59:41 +0000 (UTC)
Subject: rpms/spawn-fcgi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090914045941.43C0711C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn-fcgi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21823/rpms/spawn-fcgi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spawn-fcgi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: spawn-fcgi
# $Id: Makefile,v 1.1 2009/09/14 04:59:41 kevin Exp $
NAME := spawn-fcgi
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 Sep 14 05:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:00:37 +0000
Subject: [pkgdb] monkeystudio was added for eponyme
Message-ID: <20090914050037.1E90210F886@bastion2.fedora.phx.redhat.com>

kevin has added Package monkeystudio with summary Free crossplatform Qt 4 IDE
kevin has approved Package monkeystudio
kevin has added a Fedora devel branch for monkeystudio with an owner of eponyme
kevin has approved monkeystudio in Fedora devel
kevin has approved Package monkeystudio
kevin has set commit to Approved for 107427 on monkeystudio (Fedora devel)
kevin has set checkout to Approved for 107427 on monkeystudio (Fedora devel)
kevin has set build to Approved for 107427 on monkeystudio (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/monkeystudio



From pkgdb at fedoraproject.org  Mon Sep 14 05:00:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:00:39 +0000
Subject: [pkgdb] monkeystudio summary updated by kevin
Message-ID: <20090914050039.5EA0310F894@bastion2.fedora.phx.redhat.com>

kevin set package monkeystudio summary to Free crossplatform Qt 4 IDE

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/monkeystudio



From kevin at fedoraproject.org  Mon Sep 14 05:01:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:01:04 +0000 (UTC)
Subject: rpms/monkeystudio - New directory
Message-ID: <20090914050104.1A02911C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/monkeystudio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS22514/rpms/monkeystudio

Log Message:
Directory /cvs/pkgs/rpms/monkeystudio added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:01:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:01:04 +0000 (UTC)
Subject: rpms/monkeystudio/devel - New directory
Message-ID: <20090914050104.3B7A911C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/monkeystudio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS22514/rpms/monkeystudio/devel

Log Message:
Directory /cvs/pkgs/rpms/monkeystudio/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:01:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:01:13 +0000 (UTC)
Subject: rpms/monkeystudio Makefile,NONE,1.1
Message-ID: <20090914050113.38B3711C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/monkeystudio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS22514/rpms/monkeystudio

Added Files:
	Makefile 
Log Message:
Setup of module monkeystudio


--- NEW FILE Makefile ---
# Top level Makefile for module monkeystudio
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 Sep 14 05:01:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:01:13 +0000 (UTC)
Subject: rpms/monkeystudio/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090914050113.7FC3211C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/monkeystudio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS22514/rpms/monkeystudio/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module monkeystudio


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: monkeystudio
# $Id: Makefile,v 1.1 2009/09/14 05:01:13 kevin Exp $
NAME := monkeystudio
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 Sep 14 05:01:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:01:52 +0000
Subject: [pkgdb] kdevplatform was added for mathstuf
Message-ID: <20090914050152.5FA5910F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package kdevplatform with summary Libraries for use by KDE development tools
kevin has approved Package kdevplatform
kevin has added a Fedora devel branch for kdevplatform with an owner of mathstuf
kevin has approved kdevplatform in Fedora devel
kevin has approved Package kdevplatform
kevin has set commit to Approved for 107427 on kdevplatform (Fedora devel)
kevin has set checkout to Approved for 107427 on kdevplatform (Fedora devel)
kevin has set build to Approved for 107427 on kdevplatform (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdevplatform



From pkgdb at fedoraproject.org  Mon Sep 14 05:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:01:53 +0000
Subject: [pkgdb] kdevplatform summary updated by kevin
Message-ID: <20090914050153.B5E1210F886@bastion2.fedora.phx.redhat.com>

kevin set package kdevplatform summary to Libraries for use by KDE development tools

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdevplatform



From pkgdb at fedoraproject.org  Mon Sep 14 05:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:01:53 +0000
Subject: [pkgdb] kdevplatform (Fedora, 10) updated by kevin
Message-ID: <20090914050153.BDF7B10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kdevplatform
kevin has set commit to Approved for 107427 on kdevplatform (Fedora 10)
kevin has set checkout to Approved for 107427 on kdevplatform (Fedora 10)
kevin has set build to Approved for 107427 on kdevplatform (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdevplatform



From pkgdb at fedoraproject.org  Mon Sep 14 05:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:01:53 +0000
Subject: [pkgdb] kdevplatform (Fedora, 10) updated by kevin
Message-ID: <20090914050153.C6ED510F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for kdevplatform
kevin has set commit to Approved for 107427 on kdevplatform (Fedora 11)
kevin has set checkout to Approved for 107427 on kdevplatform (Fedora 11)
kevin has set build to Approved for 107427 on kdevplatform (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdevplatform



From kevin at fedoraproject.org  Mon Sep 14 05:02:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:02:05 +0000 (UTC)
Subject: rpms/kdevplatform - New directory
Message-ID: <20090914050205.1A7BA11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kdevplatform
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22828/rpms/kdevplatform

Log Message:
Directory /cvs/pkgs/rpms/kdevplatform added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:02:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:02:05 +0000 (UTC)
Subject: rpms/kdevplatform/devel - New directory
Message-ID: <20090914050205.44EF511C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22828/rpms/kdevplatform/devel

Log Message:
Directory /cvs/pkgs/rpms/kdevplatform/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:02:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:02:11 +0000 (UTC)
Subject: rpms/kdevplatform Makefile,NONE,1.1
Message-ID: <20090914050211.B825D11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kdevplatform
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22828/rpms/kdevplatform

Added Files:
	Makefile 
Log Message:
Setup of module kdevplatform


--- NEW FILE Makefile ---
# Top level Makefile for module kdevplatform
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 Sep 14 05:02:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:02:12 +0000 (UTC)
Subject: rpms/kdevplatform/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090914050212.2455211C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22828/rpms/kdevplatform/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdevplatform


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kdevplatform
# $Id: Makefile,v 1.1 2009/09/14 05:02:11 kevin Exp $
NAME := kdevplatform
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 Sep 14 05:02:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:02:53 +0000
Subject: [pkgdb] libkni3 was added for timn
Message-ID: <20090914050253.D474910F895@bastion2.fedora.phx.redhat.com>

kevin has added Package libkni3 with summary C++ library for the Katana robot arm
kevin has approved Package libkni3
kevin has added a Fedora devel branch for libkni3 with an owner of timn
kevin has approved libkni3 in Fedora devel
kevin has approved Package libkni3
kevin has set commit to Approved for 107427 on libkni3 (Fedora devel)
kevin has set checkout to Approved for 107427 on libkni3 (Fedora devel)
kevin has set build to Approved for 107427 on libkni3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkni3



From pkgdb at fedoraproject.org  Mon Sep 14 05:02:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:02:55 +0000
Subject: [pkgdb] libkni3 summary updated by kevin
Message-ID: <20090914050255.4C4D110F880@bastion2.fedora.phx.redhat.com>

kevin set package libkni3 summary to C++ library for the Katana robot arm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkni3



From pkgdb at fedoraproject.org  Mon Sep 14 05:02:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:02:55 +0000
Subject: [pkgdb] libkni3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914050255.53D1010F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libkni3
kevin has set commit to Approved for 107427 on libkni3 (Fedora 10)
kevin has set checkout to Approved for 107427 on libkni3 (Fedora 10)
kevin has set build to Approved for 107427 on libkni3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkni3



From pkgdb at fedoraproject.org  Mon Sep 14 05:02:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:02:55 +0000
Subject: [pkgdb] libkni3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914050255.5F83A10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libkni3
kevin has set commit to Approved for 107427 on libkni3 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on libkni3 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on libkni3 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkni3



From rakesh at fedoraproject.org  Mon Sep 14 05:02:57 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 14 Sep 2009 05:02:57 +0000 (UTC)
Subject: rpms/yum-plugin-download-order/F-11 import.log, NONE,
	1.1 yum-plugin-download-order.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914050257.2BF3111C00EC@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/yum-plugin-download-order/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23169/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-plugin-download-order.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
yum-plugin-download-order-0_2-1_fc12:F-11:yum-plugin-download-order-0.2-1.fc12.src.rpm:1252905159


--- NEW FILE yum-plugin-download-order.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Yum plugin to order downloaded packages
Name: yum-plugin-download-order
Version: 0.2
Release: 1%{?dist}
License: GPLv2+
Group: Development/Tools
Source: http://rakesh.fedorapeople.org/yum/%{name}-%{version}.tar.gz
URL: http://rakesh.fedorapeople.org/yum/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-setuptools, python-devel
Requires: yum >= 3.2.24

%description
Yum plugin to order downloads. Right now it just orders based on size.


%prep
%setup -q

%build
#Empty build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%doc README COPYING
%{python_sitelib}/*
/usr/lib/yum-plugins/download-order.py*
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/download-order.conf

%changelog
* Mon Sep 14 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.2-1
- Updated to 0.2 in sync with 3.2.24

* Wed Aug 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-5
- Added python-devel as BR and renamed to yum-plugin-download-order

* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-4
- fixed buildrequire and definition of python_sitelib

* Tue Aug 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-3
- fixed tarball, fixed import bug

* Tue Jun 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-2
- Updated with setup file
- Included egg files

* Mon Jun 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-plugin-download-order/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:35:23 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:02:57 -0000	1.2
@@ -0,0 +1 @@
+yum-plugin-download-order-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-plugin-download-order/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:35:23 -0000	1.1
+++ sources	14 Sep 2009 05:02:57 -0000	1.2
@@ -0,0 +1 @@
+34bd463e89d176699afd3fa8b55abff6  yum-plugin-download-order-0.2.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 14 05:02:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:02:55 +0000
Subject: [pkgdb] libkni3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914050255.7063510F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libkni3
kevin has set commit to Approved for 107427 on libkni3 (Fedora 11)
kevin has set checkout to Approved for 107427 on libkni3 (Fedora 11)
kevin has set build to Approved for 107427 on libkni3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkni3



From kevin at fedoraproject.org  Mon Sep 14 05:03:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:03:04 +0000 (UTC)
Subject: rpms/libkni3 - New directory
Message-ID: <20090914050304.1710E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkni3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23315/rpms/libkni3

Log Message:
Directory /cvs/pkgs/rpms/libkni3 added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:03:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:03:04 +0000 (UTC)
Subject: rpms/libkni3/devel - New directory
Message-ID: <20090914050304.3E27B11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkni3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23315/rpms/libkni3/devel

Log Message:
Directory /cvs/pkgs/rpms/libkni3/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:03:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:03:12 +0000 (UTC)
Subject: rpms/libkni3 Makefile,NONE,1.1
Message-ID: <20090914050312.24F6011C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkni3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23315/rpms/libkni3

Added Files:
	Makefile 
Log Message:
Setup of module libkni3


--- NEW FILE Makefile ---
# Top level Makefile for module libkni3
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 Sep 14 05:03:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:03:12 +0000 (UTC)
Subject: rpms/libkni3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090914050312.5E3B011C0261@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkni3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM23315/rpms/libkni3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libkni3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libkni3
# $Id: Makefile,v 1.1 2009/09/14 05:03:12 kevin Exp $
NAME := libkni3
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 Sep 14 05:04:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:04:04 +0000
Subject: [pkgdb] mathgl was added for mycae
Message-ID: <20090914050404.BC0F210F894@bastion2.fedora.phx.redhat.com>

kevin has added Package mathgl with summary Scientific plotting library
kevin has approved Package mathgl
kevin has added a Fedora devel branch for mathgl with an owner of mycae
kevin has approved mathgl in Fedora devel
kevin has approved Package mathgl
kevin has set commit to Approved for 107427 on mathgl (Fedora devel)
kevin has set checkout to Approved for 107427 on mathgl (Fedora devel)
kevin has set build to Approved for 107427 on mathgl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mathgl



From kevin at fedoraproject.org  Mon Sep 14 05:04:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:04:14 +0000 (UTC)
Subject: rpms/mathgl - New directory
Message-ID: <20090914050414.167C011C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mathgl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF23926/rpms/mathgl

Log Message:
Directory /cvs/pkgs/rpms/mathgl added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:04:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:04:14 +0000 (UTC)
Subject: rpms/mathgl/devel - New directory
Message-ID: <20090914050414.3E25811C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mathgl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF23926/rpms/mathgl/devel

Log Message:
Directory /cvs/pkgs/rpms/mathgl/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 05:04:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:04:20 +0000 (UTC)
Subject: rpms/mathgl Makefile,NONE,1.1
Message-ID: <20090914050420.91B2B11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mathgl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF23926/rpms/mathgl

Added Files:
	Makefile 
Log Message:
Setup of module mathgl


--- NEW FILE Makefile ---
# Top level Makefile for module mathgl
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 Sep 14 05:04:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 05:04:20 +0000 (UTC)
Subject: rpms/mathgl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090914050420.E214C11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mathgl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF23926/rpms/mathgl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mathgl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mathgl
# $Id: Makefile,v 1.1 2009/09/14 05:04:20 kevin Exp $
NAME := mathgl
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 Sep 14 05:06:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 05:06:25 +0000
Subject: [pkgdb] xtide F-12 cloned from devel
Message-ID: <20090914050625.9B45C10F87D@bastion2.fedora.phx.redhat.com>

kevin cloned xtide F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xtide



From rakesh at fedoraproject.org  Mon Sep 14 05:08:54 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 14 Sep 2009 05:08:54 +0000 (UTC)
Subject: rpms/yum-plugin-download-order/devel import.log, NONE,
	1.1 yum-plugin-download-order.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914050854.BF7DA11C00EC@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/yum-plugin-download-order/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24673/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-plugin-download-order.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
yum-plugin-download-order-0_2-1_fc12:HEAD:yum-plugin-download-order-0.2-1.fc12.src.rpm:1252905342


--- NEW FILE yum-plugin-download-order.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Yum plugin to order downloaded packages
Name: yum-plugin-download-order
Version: 0.2
Release: 1%{?dist}
License: GPLv2+
Group: Development/Tools
Source: http://rakesh.fedorapeople.org/yum/%{name}-%{version}.tar.gz
URL: http://rakesh.fedorapeople.org/yum/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-setuptools, python-devel
Requires: yum >= 3.2.24

%description
Yum plugin to order downloads. Right now it just orders based on size.


%prep
%setup -q

%build
#Empty build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%doc README COPYING
%{python_sitelib}/*
/usr/lib/yum-plugins/download-order.py*
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/download-order.conf

%changelog
* Mon Sep 14 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.2-1
- Updated to 0.2 in sync with 3.2.24

* Wed Aug 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-5
- Added python-devel as BR and renamed to yum-plugin-download-order

* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-4
- fixed buildrequire and definition of python_sitelib

* Tue Aug 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-3
- fixed tarball, fixed import bug

* Tue Jun 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-2
- Updated with setup file
- Included egg files

* Mon Jun 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-plugin-download-order/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:35:23 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:08:54 -0000	1.2
@@ -0,0 +1 @@
+yum-plugin-download-order-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-plugin-download-order/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:35:23 -0000	1.1
+++ sources	14 Sep 2009 05:08:54 -0000	1.2
@@ -0,0 +1 @@
+34bd463e89d176699afd3fa8b55abff6  yum-plugin-download-order-0.2.tar.gz



From itamarjp at fedoraproject.org  Mon Sep 14 05:13:50 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Sep 2009 05:13:50 +0000 (UTC)
Subject: rpms/ez-ipupdate/EL-5 ez-ipupdate-3.0.11b8-zoneedit-server.patch,
	NONE, 1.1 import.log, NONE, 1.1 ez-ipupdate.init, 1.2,
	1.3 ez-ipupdate.spec, 1.14, 1.15
Message-ID: <20090914051350.74B4211C00EC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ez-ipupdate/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26686/EL-5

Modified Files:
	ez-ipupdate.init ez-ipupdate.spec 
Added Files:
	ez-ipupdate-3.0.11b8-zoneedit-server.patch import.log 
Log Message:
sync with fedora


ez-ipupdate-3.0.11b8-zoneedit-server.patch:
 ez-ipupdate.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ez-ipupdate-3.0.11b8-zoneedit-server.patch ---
diff --git a/ez-ipupdate.c b/ez-ipupdate.c
index 9aea495..a6d2528 100644
--- a/ez-ipupdate.c
+++ b/ez-ipupdate.c
@@ -95,7 +95,7 @@
 #define HN_DEFAULT_PORT "80"
 #define HN_REQUEST "/vanity/update"
 
-#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com"
+#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com"
 #define ZONEEDIT_DEFAULT_PORT "80"
 #define ZONEEDIT_REQUEST "/auth/dynamic.html"
 


--- NEW FILE import.log ---
ez-ipupdate-3_0_11-0_22_b8_fc12:EL-5:ez-ipupdate-3.0.11-0.22.b8.fc12.src.rpm:1252905075


Index: ez-ipupdate.init
===================================================================
RCS file: /cvs/pkgs/rpms/ez-ipupdate/EL-5/ez-ipupdate.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ez-ipupdate.init	2 Jul 2006 21:16:44 -0000	1.2
+++ ez-ipupdate.init	14 Sep 2009 05:13:50 -0000	1.3
@@ -2,10 +2,17 @@
 #
 # ez-ipupdate     Starts and stops the ez-ipupdate daemon
 #
-# chkconfig: - 55 45
 #
+# chkconfig: - 55 45
 # processname: ez-ipupdate
 # description: Check and update your IP to dynamic DNS Server.
+### BEGIN INIT INFO
+# Short-Description: Check and update your IP to dynamic DNS Server
+# Provides: ez-ipupdate
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs
+# Should-Start: $time
+### END INIT INFO
 
 ez_configdir=/etc/ez-ipupdate
 ez_piddir=/var/run/ez-ipupdate
@@ -35,12 +42,15 @@ start() {
 	    # Don't run configurations that run in foreground
 	    if grep -q '^ *foreground' ${ez_configfile}; then continue; fi
 	    ez_name=`basename $ez_configfile .conf`
+	    if [ -f $ez_piddir/$ez_name.pid ]; then
+		if status -p $ez_piddir/$ez_name.pid; then
+		    continue
+		fi
+	    fi	
 	    echo -n $"Starting $prog for $ez_name: "
 	    daemon $ez_bin --daemon --config-file $ez_configfile --pid-file $ez_piddir/$ez_name.pid
-	    error=$?
+	    [ $? -ne 0 ] && RETVAL=1
 	    echo
-	    [ $error -eq 0 ] && touch /var/lock/subsys/$prog-$ez_name
-	    [ $RETVAL -eq 0 ] && RETVAL=$error
 	fi
     done
 }
@@ -52,10 +62,8 @@ stop() {
 	    ez_name=`basename $pidfile .pid`
 	    echo -n $"Shutting down $prog for $ez_name: "
 	    killproc -p $pidfile $prog -QUIT
-	    error=$?
+    	    [ $? -ne 0 ] && RETVAL=1
 	    echo
-    	    [ $error -eq 0 ] && rm -f /var/lock/subsys/$prog-$ez_name && rm -f $ez_piddir/$ez_name
-	    [ $RETVAL -eq 0 ] && RETVAL=$error
 	fi
     done
 }
@@ -67,16 +75,14 @@ reload() {
 	    ez_name=`basename $pidfile .pid`
 	    echo -n $"Reloading $prog for $ez_name: "
 	    killproc -p $pidfile $prog -HUP
-	    error=$?
-	    [ $RETVAL -eq 0 ] && RETVAL=$error
+	    [ $? -ne 0 ] && RETVAL=1
 	    echo
 	fi
     done
 }
 
 restart() {
-    stop
-    start
+    stop && start
     RETVAL=$?
 }
 
@@ -95,7 +101,7 @@ case "$1" in
     reload
     ;;
   condrestart|try-restart)
-    ls /var/lock/subsys/$prog-* 1>/dev/null 2>&1 && restart
+    ls ${ez_piddir}/*.pid >/dev/null && restart
     ;;
   status)
     status $prog


Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ez-ipupdate/EL-5/ez-ipupdate.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ez-ipupdate.spec	17 Jun 2007 02:26:57 -0000	1.14
+++ ez-ipupdate.spec	14 Sep 2009 05:13:50 -0000	1.15
@@ -1,15 +1,16 @@
 Name:           ez-ipupdate
 Version:        3.0.11
-Release:        0.14.b8%{?dist}
+Release:        0.22.b8%{?dist}
 Summary:        Client for Dynamic DNS Services
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://www.gusnet.cx/proj/ez-ipupdate/
 Source0:        http://www.gusnet.cx/proj/ez-ipupdate/dist/ez-ipupdate-3.0.11b8.tar.gz
 Source1:        %{name}.init
 Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-10.diff.gz
 Patch1:         %{name}-pidfile.patch
+Patch2:		ez-ipupdate-3.0.11b8-zoneedit-server.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
@@ -40,12 +41,14 @@ You can find some examples in %{_docdir}
 %setup -q -n %{name}-%{version}b8
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 touch *.in aclocal.m4 configure
 chmod +x missing
 chmod a-x example*.conf
 
 
 %build
+export CFLAGS="-D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
 
@@ -118,6 +121,32 @@ fi
 %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.11-0.22.b8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.11-0.21.b8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.11-0.20.b8
+- fix license tag
+
+* Mon Jun 16 2008 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.19.b8
+- compile with -D_FILE_OFFSET_BITS=64 so we can handle 64-bit inode numbers
+  in stat() calls
+
+* Sun Jun  8 2008 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.18.b8
+- default server for zoneedit has changed to dynamic.zoneedit.com (BZ#449375)
+
+* Tue Mar 11 2008 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.17.b8
+- ez-ipupdate would be started a second time on runlevel changes (BZ#436616)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.11-0.16.b8
+- Autorebuild for GCC 4.3
+
+* Sun Jul 15 2007 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.15.b8
+- initscript: add LSB header and fix return values
+- initscript: remove /var/lock/subsys references
+
 * Fri Jun 15 2007 J. Randall Owens <jrowens at ghiapet.homeip.net> - 3.0.11-0.14.b8
 - fix doc directory permissions
 



From itamarjp at fedoraproject.org  Mon Sep 14 05:16:10 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Sep 2009 05:16:10 +0000 (UTC)
Subject: rpms/ez-ipupdate/EL-4 ez-ipupdate-3.0.11b8-zoneedit-server.patch,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 ez-ipupdate.init,
	1.1, 1.2 ez-ipupdate.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090914051610.C700011C00EC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ez-ipupdate/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28020/EL-4

Modified Files:
	.cvsignore ez-ipupdate.init ez-ipupdate.spec sources 
Added Files:
	ez-ipupdate-3.0.11b8-zoneedit-server.patch import.log 
Log Message:
sync with fedora


ez-ipupdate-3.0.11b8-zoneedit-server.patch:
 ez-ipupdate.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ez-ipupdate-3.0.11b8-zoneedit-server.patch ---
diff --git a/ez-ipupdate.c b/ez-ipupdate.c
index 9aea495..a6d2528 100644
--- a/ez-ipupdate.c
+++ b/ez-ipupdate.c
@@ -95,7 +95,7 @@
 #define HN_DEFAULT_PORT "80"
 #define HN_REQUEST "/vanity/update"
 
-#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com"
+#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com"
 #define ZONEEDIT_DEFAULT_PORT "80"
 #define ZONEEDIT_REQUEST "/auth/dynamic.html"
 


--- NEW FILE import.log ---
ez-ipupdate-3_0_11-0_22_b8_fc12:EL-4:ez-ipupdate-3.0.11-0.22.b8.fc12.src.rpm:1252905315


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ez-ipupdate/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Nov 2004 11:21:02 -0000	1.3
+++ .cvsignore	14 Sep 2009 05:16:10 -0000	1.4
@@ -1,3 +1,2 @@
 ez-ipupdate-3.0.11b8.tar.gz
-ez-ipupdate_3.0.11b8-6.diff.gz
-ez-ipupdate_3.0.11b8-8.diff.gz
+ez-ipupdate_3.0.11b8-10.diff.gz


Index: ez-ipupdate.init
===================================================================
RCS file: /cvs/pkgs/rpms/ez-ipupdate/EL-4/ez-ipupdate.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ez-ipupdate.init	8 Nov 2004 04:15:56 -0000	1.1
+++ ez-ipupdate.init	14 Sep 2009 05:16:10 -0000	1.2
@@ -2,19 +2,24 @@
 #
 # ez-ipupdate     Starts and stops the ez-ipupdate daemon
 #
-# chkconfig: - 55 45
 #
+# chkconfig: - 55 45
 # processname: ez-ipupdate
 # description: Check and update your IP to dynamic DNS Server.
-# pidfile: /var/run/ez-ipupdate/ez-ipudpate.pid
-# config: /etc/ez-ipupdate.conf
+### BEGIN INIT INFO
+# Short-Description: Check and update your IP to dynamic DNS Server
+# Provides: ez-ipupdate
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs
+# Should-Start: $time
+### END INIT INFO
 
-ez_config=/etc/ez-ipupdate.conf
+ez_configdir=/etc/ez-ipupdate
+ez_piddir=/var/run/ez-ipupdate
 ez_bin=/usr/sbin/ez-ipupdate
-ez_pid=/var/run/ez-ipupdate/ez-ipupdate.pid
 
 # Make sure relevant files exist
-[ -x "$ez_bin" -a -s "$ez_config" ] || exit 0
+[ -x "$ez_bin" -a -d "$ez_configdir" ] || exit 0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -30,33 +35,54 @@ prog=ez-ipupdate
 
 start() {
     # Start daemons.
-    echo -n $"Starting $prog: "
-    daemon $ez_bin --daemon --config-file $ez_config --pid-file $ez_pid
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    for ez_configfile in ${ez_configdir}/*.conf; do
+	if [ -r ${ez_configfile} ]; then
+	    # Don't run configurations that are not daemons
+	    if ! grep -q '^ *daemon' ${ez_configfile}; then continue; fi
+	    # Don't run configurations that run in foreground
+	    if grep -q '^ *foreground' ${ez_configfile}; then continue; fi
+	    ez_name=`basename $ez_configfile .conf`
+	    if [ -f $ez_piddir/$ez_name.pid ]; then
+		if status -p $ez_piddir/$ez_name.pid; then
+		    continue
+		fi
+	    fi	
+	    echo -n $"Starting $prog for $ez_name: "
+	    daemon $ez_bin --daemon --config-file $ez_configfile --pid-file $ez_piddir/$ez_name.pid
+	    [ $? -ne 0 ] && RETVAL=1
+	    echo
+	fi
+    done
 }
 
 stop() {
     # Stop daemons.
-    echo -n $"Shutting down $prog: "
-    killproc $prog -QUIT
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog && rm -f $ez_pid
+    for pidfile in ${ez_piddir}/*.pid; do
+	if [ -r ${pidfile} ]; then
+	    ez_name=`basename $pidfile .pid`
+	    echo -n $"Shutting down $prog for $ez_name: "
+	    killproc -p $pidfile $prog -QUIT
+    	    [ $? -ne 0 ] && RETVAL=1
+	    echo
+	fi
+    done
 }
 
 reload() {
     # Reload config by sending a SIGHUP.
-    echo -n $"Reloading $prog: "
-    killproc $prog -HUP
-    RETVAL=$?
-    echo
+    for pidfile in ${ez_piddir}/*.pid; do
+	if [ -r ${pidfile} ]; then
+	    ez_name=`basename $pidfile .pid`
+	    echo -n $"Reloading $prog for $ez_name: "
+	    killproc -p $pidfile $prog -HUP
+	    [ $? -ne 0 ] && RETVAL=1
+	    echo
+	fi
+    done
 }
 
 restart() {
-    stop
-    start
+    stop && start
     RETVAL=$?
 }
 
@@ -71,20 +97,24 @@ case "$1" in
   restart)
     restart
     ;;
-  reload)
+  reload|force-reload)
     reload
     ;;
-  condrestart)
-    [ -e /var/lock/subsys/$prog ] && restart || :
+  condrestart|try-restart)
+    ls ${ez_piddir}/*.pid >/dev/null && restart
     ;;
   status)
     status $prog
     RETVAL=$?
-    if [ -r $ez_config ]; then
-      ez_cache=`grep -E '^[[:space:]]*cache-file' $ez_config | cut -d "=" -f2`
-      [ -n "$ez_cache" ] && \
-        echo "Last IP update: "`cat $ez_cache | cut -d "," -f2`
-    fi
+    for ez_config in $ez_configdir/*.conf; do
+	if [ -r $ez_config ]; then
+	    ez_cache=`grep -E '^[[:space:]]*cache-file' $ez_config | cut -d "=" -f2`
+	    ez_host=`grep -E '^[[:space:]]*host' $ez_config | cut -d "=" -f2`
+	    ez_iface=`grep -E '^[[:space:]]*interface' $ez_config | cut -d "=" -f2`
+	    [ -n "$ez_cache" ] && \
+	    echo "Last IP update of $ez_host on $ez_iface: "`cat $ez_cache | cut -d "," -f2`
+	fi
+    done
     ;;
   *)
     echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"


Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ez-ipupdate/EL-4/ez-ipupdate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ez-ipupdate.spec	27 Nov 2004 11:21:02 -0000	1.5
+++ ez-ipupdate.spec	14 Sep 2009 05:16:10 -0000	1.6
@@ -1,26 +1,25 @@
 Name:           ez-ipupdate
 Version:        3.0.11
-Release:        0.7.b8
-Epoch:          0
+Release:        0.22.b8%{?dist}
 Summary:        Client for Dynamic DNS Services
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://www.gusnet.cx/proj/ez-ipupdate/
 Source0:        http://www.gusnet.cx/proj/ez-ipupdate/dist/ez-ipupdate-3.0.11b8.tar.gz
 Source1:        %{name}.init
-Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-8.diff.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-10.diff.gz
 Patch1:         %{name}-pidfile.patch
+Patch2:		ez-ipupdate-3.0.11b8-zoneedit-server.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 Requires(pre):    /usr/sbin/useradd /usr/sbin/groupadd
-Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
 
 %description
 ez-ipupdate is a small utility for updating your host name for any of the
-dynamic DNS service offered at: 
+dynamic DNS service offered at:
   * http://www.ez-ip.net
   * http://www.justlinux.com
   * http://www.dhs.org
@@ -42,11 +41,14 @@ You can find some examples in %{_docdir}
 %setup -q -n %{name}-%{version}b8
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 touch *.in aclocal.m4 configure
 chmod +x missing
+chmod a-x example*.conf
 
 
 %build
+export CFLAGS="-D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
 
@@ -70,13 +72,15 @@ mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/ez-ipupdate
 > $RPM_BUILD_ROOT%{_localstatedir}/cache/ez-ipupdate/default-cache
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-> $RPM_BUILD_ROOT%{_sysconfdir}/ez-ipupdate.conf
+# Make a directory for config files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ez-ipupdate
+> $RPM_BUILD_ROOT%{_sysconfdir}/ez-ipupdate/default.conf
 
 # Create a dedicated dir for the pid file so we can run as non-root.
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ez-ipupdate
 
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,6 +92,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add ez-ipupdate
+# move config file from old location to new if it exists
+if [ $1 -gt 1 ]; then
+    [ -f %{_sysconfdir}/ez-ipupdate.conf ] && /bin/mv %{_sysconfdir}/ez-ipupdate.conf %{_sysconfdir}/ez-ipupdate/default.conf
+    [ -f %{_localstatedir}/run/ez-ipupdate/ez-ipupdate.pid ] && /bin/mv %{_localstatedir}/run/ez-ipupdate/ez-ipupdate.pid %{_localstatedir}/run/ez-ipupdate/default.pid
+    [ -f %{_localstatedir}/lock/subsys/ez-ipupdate ] && /bin/mv %{_localstatedir}/lock/subsys/ez-ipupdate %{_localstatedir}/lock/subsys/ez-ipupdate-default
+    %{_initrddir}/ez-ipupdate condrestart >/dev/null
+fi
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -95,30 +106,71 @@ if [ $1 -eq 0 ] ; then
   /sbin/chkconfig --del ez-ipupdate
 fi
 
-%postun
-if [ $1 -eq 0 ] ; then
-  /usr/sbin/userdel ez-ipupd >/dev/null 2>&1 || :
-  /usr/sbin/groupdel ez-ipupd >/dev/null 2>&1 || :
-elif [ $1 -ge 1 ] ; then
-  %{_initrddir}/ez-ipupdate condrestart >/dev/null
-fi
-
-
 %files
-%defattr(0644,root,root,0755)
-%doc CHANGELOG COPYING README example-*.conf
+%defattr(-,root,root,-)
 %{_mandir}/man8/ez-ipupdate.8*
-%defattr(0755,root,root,0755)
 %attr(0755,root,root) %{_sbindir}/ez-ipupdate
 %attr(0755,root,root) %{_initrddir}/ez-ipupdate
-%defattr(0644,ez-ipupd,ez-ipupd,0755)
-%dir %{_localstatedir}/cache/ez-ipupdate
+%dir %{_sysconfdir}/ez-ipupdate/
+%doc CHANGELOG COPYING README example.conf example-*.conf
+%defattr(0644,root,root,-)
+%defattr(-,ez-ipupd,ez-ipupd,-)
+%dir %{_localstatedir}/cache/ez-ipupdate/
+%dir %{_localstatedir}/run/ez-ipupdate/
 %ghost %{_localstatedir}/cache/ez-ipupdate/default-cache
-%dir %{_localstatedir}/run/ez-ipupdate
-%ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate.conf
-
+%ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.11-0.22.b8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.11-0.21.b8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.11-0.20.b8
+- fix license tag
+
+* Mon Jun 16 2008 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.19.b8
+- compile with -D_FILE_OFFSET_BITS=64 so we can handle 64-bit inode numbers
+  in stat() calls
+
+* Sun Jun  8 2008 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.18.b8
+- default server for zoneedit has changed to dynamic.zoneedit.com (BZ#449375)
+
+* Tue Mar 11 2008 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.17.b8
+- ez-ipupdate would be started a second time on runlevel changes (BZ#436616)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.11-0.16.b8
+- Autorebuild for GCC 4.3
+
+* Sun Jul 15 2007 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.15.b8
+- initscript: add LSB header and fix return values
+- initscript: remove /var/lock/subsys references
+
+* Fri Jun 15 2007 J. Randall Owens <jrowens at ghiapet.homeip.net> - 3.0.11-0.14.b8
+- fix doc directory permissions
+
+* Thu Mar  8 2007 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.13.b8
+- remove Requires(postun) for user/groupdel since they're no longer needed
+
+* Tue Sep 12 2006 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.12.b8
+- clean up changelog for specfile
+
+* Tue Sep 12 2006 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.11.b8
+- rebuild for FC6
+
+* Sat Jul 1 2006 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.10.b8
+- new init script that can handle more than one config file
+- move config files into directory under sysconfdir
+- don't remove user and group on exit
+- don't set permissions explicitly except where needed
+
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.0.11-0.9.b8
+- Sync with Debian's 3.0.11b8-10.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.0.11-0.8.b8
+- rebuilt
+
 * Sun Nov 14 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:3.0.11-0.7.b8
 - Update patch from Debian to 3.0.11b8-8, fixes CAN-2004-0980.
 - Try harder to avoid (re-)running aclocal and friends during build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ez-ipupdate/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Nov 2004 11:21:02 -0000	1.3
+++ sources	14 Sep 2009 05:16:10 -0000	1.4
@@ -1,2 +1,2 @@
 000211add4c4845ffa4211841bff4fb0  ez-ipupdate-3.0.11b8.tar.gz
-2d3fd3d0599667244931444c69394c51  ez-ipupdate_3.0.11b8-8.diff.gz
+e400c9c8d594922e394806b717250c35  ez-ipupdate_3.0.11b8-10.diff.gz



From trasher at fedoraproject.org  Mon Sep 14 05:35:30 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon, 14 Sep 2009 05:35:30 +0000 (UTC)
Subject: rpms/tuxtype2/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tuxtype2.spec, 1.14, 1.15
Message-ID: <20090914053530.17B2111C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/tuxtype2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1610

Modified Files:
	.cvsignore sources tuxtype2.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Sep 2008 15:58:21 -0000	1.4
+++ .cvsignore	14 Sep 2009 05:35:29 -0000	1.5
@@ -1 +1 @@
-tuxtype_w_fonts-1.5.17.tar.gz
+tuxtype_w_fonts-1.7.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Sep 2008 15:58:21 -0000	1.4
+++ sources	14 Sep 2009 05:35:29 -0000	1.5
@@ -1 +1 @@
-c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz
+54017a392624444c71670345e10fc55c  tuxtype_w_fonts-1.7.5.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/devel/tuxtype2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tuxtype2.spec	27 Jul 2009 06:23:52 -0000	1.14
+++ tuxtype2.spec	14 Sep 2009 05:35:29 -0000	1.15
@@ -1,17 +1,19 @@
 Name:           tuxtype2
-Version:        1.5.17
-Release:        3%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://tuxtype.sourceforge.net/
-Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
+URL:            http://tux4kids.alioth.debian.org/tuxtype/index.php
+Source0:        https://alioth.debian.org/frs/download.php/3051/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
+BuildRequires:  librsvg2-devel
+
 
 %description
 Tux Typing is an educational typing tutor for children. It features several
@@ -20,6 +22,9 @@ different types of gameplay, at a variet
 
 %prep
 %setup -q -n tuxtype_w_fonts-%{version}
+rm -rf data/fonts/*.ttf
+# fix wrong end of line encoding
+sed -i -e 's|\r||g' doc/en/TuxType_port_Mac.txt
 
 
 %build
@@ -49,22 +54,29 @@ EOF
 
 convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
-		     --add-category X-Fedora \
-		     --vendor fedora \
-		     %{name}.desktop
+                     --add-category X-Fedora \
+                     --vendor fedora \
+                     %{name}.desktop
+
+%find_lang tuxtype
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f tuxtype.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
+%doc AUTHORS COPYING ChangeLog README TODO doc/en/howtotheme.html doc/en/TuxType_port_Mac.txt
 %{_bindir}/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 14 2009 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.7.5-1
+- 1.7.5
+- removed shipped fonts
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mathstuf at fedoraproject.org  Mon Sep 14 05:38:33 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Mon, 14 Sep 2009 05:38:33 +0000 (UTC)
Subject: rpms/kdevplatform/devel kdevplatform.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914053833.E03E411C00EC@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2589

Modified Files:
	.cvsignore sources 
Added Files:
	kdevplatform.spec 
Log Message:
Initial commit


--- NEW FILE kdevplatform.spec ---
%define alphatag .20090914svn1023119

Name:           kdevplatform
Summary:        Libraries for use by KDE development tools
Version:        0.9.95
Release:        0.1%{?alphatag}%{?dist}

Group:          Development/Tools
License:        GPLv2
URL:            http://www.kde.org/
### SNAPSHOT
#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform | grep 'Rev:' | cut -d" " -f4)
#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform kdevplatform-%{version}.%{svnrel}
#Source0:CMD tar cjf %{_sourcedir}/kdevplatform-%{version}.%{svnrel}.tar.bz2 kdevplatform-%{version}.%{svnrel}
#Source0:CMD rm -rf kdevplatform-%{version}.%{svnrel}
### TAG
#Source0:DISABLECMD svn export svn://anonsvn.kde.org/home/kde/tags/kdevplatform/%{version} kdevplatform-%{version}
#Source0:DISABLECMD tar cjf %{_sourcedir}/kdevplatform-%{version}.tar.bz2 kdevplatform-%{version}
#Source0:DISABLECMD rm -rf kdevplatform-%{version}
Source0:	kdevplatform-%{version}%{?alphatag}.tar.bz2
### ORIGINAL
#Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}

BuildRequires:  kdelibs-devel >= 4.2.0
BuildRequires:  pcre-devel
BuildRequires:  giflib-devel
BuildRequires:  boost-devel
BuildRequires:  subversion-devel
BuildRequires:  kdesdk-devel >= 4.2.85

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }


%description
KDE Development platform, the foundations upon which
KDevelop and Quanta are built.

%package libs
Summary: Runtime libraries for %{name}
Group:   System Environment/Libraries
%description libs
%{summary}.

%package devel
Group:    Development/Libraries
Summary:  Developer files for %{name}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: boost-devel
Requires: subversion-devel
Requires: commoncpp2-devel
%description devel
%{summary}.


%prep
%setup -q -n kdevplatform-%{version}%{?alphatag}

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} -DCMAKE_BUILD_TYPE=Debugfull ..
popd
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

%clean
rm -rf %{buildroot}


%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.PLUGINS COPYING.SRC
#{_kde4_bindir}/kdevteamwork_server
%{_kde4_datadir}/kde4/apps/*
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_iconsdir}/hicolor/*/*/*

%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/kde4/*

%files devel
%defattr(-,root,root,-)
%{_kde4_datadir}/kde4/apps/cmake/modules/FindKDevPlatform.cmake
%{_kde4_libdir}/lib*.so
%{_kde4_includedir}/kdevplatform/
%{_kde4_libdir}/cmake/kdevplatform/*.cmake


%changelog
* Fri May 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.93-0.1
- 1.0 Beta 3

* Sat Feb 21 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.9.91-0.2.20090221svn929301
- Post KDevplatform 1.0 Beta 1 snapshot

* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.9.85-1
- 0.9.85 snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:02:11 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:38:33 -0000	1.2
@@ -0,0 +1 @@
+kdevplatform-0.9.95.20090914svn1023119.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:02:11 -0000	1.1
+++ sources	14 Sep 2009 05:38:33 -0000	1.2
@@ -0,0 +1 @@
+a60de80748d1a130f3f3ce0a10f471ae  kdevplatform-0.9.95.20090914svn1023119.tar.bz2



From topdog at fedoraproject.org  Mon Sep 14 05:39:32 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 14 Sep 2009 05:39:32 +0000 (UTC)
Subject: rpms/php-email-address-validation/devel import.log, NONE,
	1.1 php-email-address-validation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914053932.9A27511C00EC@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-email-address-validation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2637/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-email-address-validation.spec 
Log Message:
* Mon Sep 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- initial cvs import




--- NEW FILE import.log ---
php-email-address-validation-0-0_3_20090910svn_fc11:HEAD:php-email-address-validation-0-0.3.20090910svn.fc11.src.rpm:1252906689


--- NEW FILE php-email-address-validation.spec ---
Name:		php-email-address-validation
Version:	0
Release:	0.3.20090910svn%{?dist}
Summary:	A PHP class for validating email addresses
Group:		Development/Libraries
License:	BSD
URL:		http://code.google.com/p/php-email-address-validation/
# The source for this package was pulled from the upstream's vcs.
# The following commands can be used to generate the tarball.
# svn export -r10 http://php-email-address-validation.googlecode.com/svn/trunk/ php-email-address-validation
# tar cjvf rpmbuild/SOURCES/php-email-address-validation-0-0.1.20090910svn.tar.bz2 php-email-address-validation/ 
Source0:	%{name}-0-0.2.20090910svn.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-common
Requires:	php

%description
This PHP class is used to check email addresses for technical validity.

%prep
%setup -q -n %{name}
sed -i 's/\r//' tests/EmailAddressValidatorTest.php

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_datadir}/php/%{name}
cp -rp EmailAddressValidator.php $RPM_BUILD_ROOT%{_datadir}/php/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc tests/
%{_datadir}/php/%{name}

%changelog
* Fri Sep 11 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- Add php dependency

* Thu Sep 10 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090910svn
- Improved description
- Add comments to indicate source generation.
- Add php-common dependency

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090806svn
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:50:09 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:39:32 -0000	1.2
@@ -0,0 +1 @@
+php-email-address-validation-0-0.2.20090910svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:50:09 -0000	1.1
+++ sources	14 Sep 2009 05:39:32 -0000	1.2
@@ -0,0 +1 @@
+02fffc92c790fad6edea1d78cbf688be  php-email-address-validation-0-0.2.20090910svn.tar.bz2



From topdog at fedoraproject.org  Mon Sep 14 05:42:51 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 14 Sep 2009 05:42:51 +0000 (UTC)
Subject: rpms/php-email-address-validation/F-12 import.log, NONE,
	1.1 php-email-address-validation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914054251.BCBD911C00EC@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-email-address-validation/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-email-address-validation.spec 
Log Message:
* Mon Sep 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- initial cvs import




--- NEW FILE import.log ---
php-email-address-validation-0-0_3_20090910svn_fc11:F-12:php-email-address-validation-0-0.3.20090910svn.fc11.src.rpm:1252906911


--- NEW FILE php-email-address-validation.spec ---
Name:		php-email-address-validation
Version:	0
Release:	0.3.20090910svn%{?dist}
Summary:	A PHP class for validating email addresses
Group:		Development/Libraries
License:	BSD
URL:		http://code.google.com/p/php-email-address-validation/
# The source for this package was pulled from the upstream's vcs.
# The following commands can be used to generate the tarball.
# svn export -r10 http://php-email-address-validation.googlecode.com/svn/trunk/ php-email-address-validation
# tar cjvf rpmbuild/SOURCES/php-email-address-validation-0-0.1.20090910svn.tar.bz2 php-email-address-validation/ 
Source0:	%{name}-0-0.2.20090910svn.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-common
Requires:	php

%description
This PHP class is used to check email addresses for technical validity.

%prep
%setup -q -n %{name}
sed -i 's/\r//' tests/EmailAddressValidatorTest.php

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_datadir}/php/%{name}
cp -rp EmailAddressValidator.php $RPM_BUILD_ROOT%{_datadir}/php/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc tests/
%{_datadir}/php/%{name}

%changelog
* Fri Sep 11 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- Add php dependency

* Thu Sep 10 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090910svn
- Improved description
- Add comments to indicate source generation.
- Add php-common dependency

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090806svn
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:50:09 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:42:51 -0000	1.2
@@ -0,0 +1 @@
+php-email-address-validation-0-0.2.20090910svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:50:09 -0000	1.1
+++ sources	14 Sep 2009 05:42:51 -0000	1.2
@@ -0,0 +1 @@
+02fffc92c790fad6edea1d78cbf688be  php-email-address-validation-0-0.2.20090910svn.tar.bz2



From topdog at fedoraproject.org  Mon Sep 14 05:45:47 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 14 Sep 2009 05:45:47 +0000 (UTC)
Subject: rpms/php-email-address-validation/F-11 import.log, NONE,
	1.1 php-email-address-validation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914054547.05A6F11C00EC@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-email-address-validation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4500/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-email-address-validation.spec 
Log Message:
* Mon Sep 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- initial cvs import




--- NEW FILE import.log ---
php-email-address-validation-0-0_3_20090910svn_fc11:F-11:php-email-address-validation-0-0.3.20090910svn.fc11.src.rpm:1252907101


--- NEW FILE php-email-address-validation.spec ---
Name:		php-email-address-validation
Version:	0
Release:	0.3.20090910svn%{?dist}
Summary:	A PHP class for validating email addresses
Group:		Development/Libraries
License:	BSD
URL:		http://code.google.com/p/php-email-address-validation/
# The source for this package was pulled from the upstream's vcs.
# The following commands can be used to generate the tarball.
# svn export -r10 http://php-email-address-validation.googlecode.com/svn/trunk/ php-email-address-validation
# tar cjvf rpmbuild/SOURCES/php-email-address-validation-0-0.1.20090910svn.tar.bz2 php-email-address-validation/ 
Source0:	%{name}-0-0.2.20090910svn.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-common
Requires:	php

%description
This PHP class is used to check email addresses for technical validity.

%prep
%setup -q -n %{name}
sed -i 's/\r//' tests/EmailAddressValidatorTest.php

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_datadir}/php/%{name}
cp -rp EmailAddressValidator.php $RPM_BUILD_ROOT%{_datadir}/php/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc tests/
%{_datadir}/php/%{name}

%changelog
* Fri Sep 11 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- Add php dependency

* Thu Sep 10 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090910svn
- Improved description
- Add comments to indicate source generation.
- Add php-common dependency

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090806svn
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:50:09 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:45:46 -0000	1.2
@@ -0,0 +1 @@
+php-email-address-validation-0-0.2.20090910svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:50:09 -0000	1.1
+++ sources	14 Sep 2009 05:45:46 -0000	1.2
@@ -0,0 +1 @@
+02fffc92c790fad6edea1d78cbf688be  php-email-address-validation-0-0.2.20090910svn.tar.bz2



From mathstuf at fedoraproject.org  Mon Sep 14 05:45:47 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Mon, 14 Sep 2009 05:45:47 +0000 (UTC)
Subject: rpms/kdevplatform/devel kdevplatform.spec,1.1,1.2
Message-ID: <20090914054547.0973B11C0261@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4563

Modified Files:
	kdevplatform.spec 
Log Message:
Add scriptlets for icons


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/kdevplatform.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdevplatform.spec	14 Sep 2009 05:38:33 -0000	1.1
+++ kdevplatform.spec	14 Sep 2009 05:45:46 -0000	1.2
@@ -3,7 +3,7 @@
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        0.9.95
-Release:        0.1%{?alphatag}%{?dist}
+Release:        0.2%{?alphatag}%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
@@ -17,7 +17,7 @@ URL:            http://www.kde.org/
 #Source0:DISABLECMD svn export svn://anonsvn.kde.org/home/kde/tags/kdevplatform/%{version} kdevplatform-%{version}
 #Source0:DISABLECMD tar cjf %{_sourcedir}/kdevplatform-%{version}.tar.bz2 kdevplatform-%{version}
 #Source0:DISABLECMD rm -rf kdevplatform-%{version}
-Source0:	kdevplatform-%{version}%{?alphatag}.tar.bz2
+Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
 ### ORIGINAL
 #Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,10 +74,22 @@ make install/fast DESTDIR=%{buildroot} -
 rm -rf %{buildroot}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 %post libs -p /sbin/ldconfig
 
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
 %postun libs -p /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -102,6 +114,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.2
+- Add icon scriptlets
+
+* Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.1
+- Update tarball
+
 * Fri May 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.93-0.1
 - 1.0 Beta 3
 



From topdog at fedoraproject.org  Mon Sep 14 05:50:49 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 14 Sep 2009 05:50:49 +0000 (UTC)
Subject: rpms/php-email-address-validation/F-10 import.log, NONE,
	1.1 php-email-address-validation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914055049.BC73F11C00EC@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-email-address-validation/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5336/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-email-address-validation.spec 
Log Message:
* Mon Sep 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- initial cvs import




--- NEW FILE import.log ---
php-email-address-validation-0-0_3_20090910svn_fc11:F-10:php-email-address-validation-0-0.3.20090910svn.fc11.src.rpm:1252907280


--- NEW FILE php-email-address-validation.spec ---
Name:		php-email-address-validation
Version:	0
Release:	0.3.20090910svn%{?dist}
Summary:	A PHP class for validating email addresses
Group:		Development/Libraries
License:	BSD
URL:		http://code.google.com/p/php-email-address-validation/
# The source for this package was pulled from the upstream's vcs.
# The following commands can be used to generate the tarball.
# svn export -r10 http://php-email-address-validation.googlecode.com/svn/trunk/ php-email-address-validation
# tar cjvf rpmbuild/SOURCES/php-email-address-validation-0-0.1.20090910svn.tar.bz2 php-email-address-validation/ 
Source0:	%{name}-0-0.2.20090910svn.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-common
Requires:	php

%description
This PHP class is used to check email addresses for technical validity.

%prep
%setup -q -n %{name}
sed -i 's/\r//' tests/EmailAddressValidatorTest.php

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_datadir}/php/%{name}
cp -rp EmailAddressValidator.php $RPM_BUILD_ROOT%{_datadir}/php/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc tests/
%{_datadir}/php/%{name}

%changelog
* Fri Sep 11 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- Add php dependency

* Thu Sep 10 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090910svn
- Improved description
- Add comments to indicate source generation.
- Add php-common dependency

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090806svn
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:50:09 -0000	1.1
+++ .cvsignore	14 Sep 2009 05:50:49 -0000	1.2
@@ -0,0 +1 @@
+php-email-address-validation-0-0.2.20090910svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:50:09 -0000	1.1
+++ sources	14 Sep 2009 05:50:49 -0000	1.2
@@ -0,0 +1 @@
+02fffc92c790fad6edea1d78cbf688be  php-email-address-validation-0-0.2.20090910svn.tar.bz2



From bos at fedoraproject.org  Mon Sep 14 05:55:36 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 14 Sep 2009 05:55:36 +0000 (UTC)
Subject: rpms/ghc-fgl/F-11 ghc-fgl.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090914055536.A440E11C00EC@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-fgl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6754

Modified Files:
	sources 
Added Files:
	ghc-fgl.spec 
Log Message:
ghc-fgl 5.4.2.2


--- NEW FILE ghc-fgl.spec ---
%global pkg_name fgl

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        5.4.2.2
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://web.engr.oregonstate.edu/~erwig/fgl/haskell/
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.  This
is a library of types and functions for addressing graph problems.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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 doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 5.4.2.2-1
- initial packaging for Fedora created by cabal2spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-fgl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:38:56 -0000	1.1
+++ sources	14 Sep 2009 05:55:36 -0000	1.2
@@ -0,0 +1 @@
+ad49ce31af04c0fd9c6dbfa52801ff83  fgl-5.4.2.2.tar.gz



From bskeggs at fedoraproject.org  Mon Sep 14 06:01:44 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 14 Sep 2009 06:01:44 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.53, 1.54 kernel.spec, 1.1797, 
	1.1798
Message-ID: <20090914060144.D63DF11C00EC@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8710

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: avoid PFIFO IRQ hardlock, misc LVDS mode fixes, nv5x RAMFC cleanup



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  750 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  355 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  683 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  473 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  443 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 57990 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- drm-nouveau.patch	11 Sep 2009 07:05:05 -0000	1.53
+++ drm-nouveau.patch	14 Sep 2009 06:01:42 -0000	1.54
@@ -9064,10 +9064,10 @@ index 0000000..7761425
 +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
 diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
 new file mode 100644
-index 0000000..ddecec4
+index 0000000..e9577db
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,748 @@
+@@ -0,0 +1,750 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -9463,8 +9463,9 @@ index 0000000..ddecec4
 +};
 +
 +static struct moderec scaler_modes[] = {
-+	{ 1920, 1440 },
-+	{ 1920, 1280 },
++	{ 1920, 1200 },
++	{ 1920, 1080 },
++	{ 1680, 1050 },
 +	{ 1600, 1200 },
 +	{ 1400, 1050 },
 +	{ 1280, 1024 },
@@ -9573,6 +9574,7 @@ index 0000000..ddecec4
 +		    mode->vdisplay > nv_connector->native_mode->vdisplay)
 +			return MODE_PANEL;
 +
++		min_clock = 0;
 +		max_clock = 400000;
 +		break;
 +	case OUTPUT_TMDS:
@@ -15823,10 +15825,10 @@ index 0000000..a2c30f4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
 new file mode 100644
-index 0000000..d3ade09
+index 0000000..a23b2fb
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
-@@ -0,0 +1,675 @@
+@@ -0,0 +1,683 @@
 +/*
 + * Copyright (C) 2006 Ben Skeggs.
 + *
@@ -15963,9 +15965,10 @@ index 0000000..d3ade09
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
 +	uint32_t status, reassign;
++	int cnt = 0;
 +
 +	reassign = nv_rd32(dev, NV03_PFIFO_CACHES) & 1;
-+	while ((status = nv_rd32(dev, NV03_PFIFO_INTR_0))) {
++	while ((status = nv_rd32(dev, NV03_PFIFO_INTR_0)) && (cnt++ < 100)) {
 +		struct nouveau_channel *chan = NULL;
 +		uint32_t chid, get;
 +
@@ -16042,11 +16045,18 @@ index 0000000..d3ade09
 +			NV_INFO(dev, "PFIFO_INTR 0x%08x - Ch %d\n",
 +				status, chid);
 +			nv_wr32(dev, NV03_PFIFO_INTR_0, status);
++			status = 0;
 +		}
 +
 +		nv_wr32(dev, NV03_PFIFO_CACHES, reassign);
 +	}
 +
++	if (status) {
++		NV_INFO(dev, "PFIFO still angry after %d spins, halt\n", cnt);
++		nv_wr32(dev, 0x2140, 0);
++		nv_wr32(dev, 0x140, 0);
++	}
++
 +	nv_wr32(dev, NV03_PMC_INTR_0, NV_PMC_INTR_0_PFIFO_PENDING);
 +}
 +
@@ -18560,10 +18570,10 @@ index 0000000..66ab939
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h
 new file mode 100644
-index 0000000..4824984
+index 0000000..af9c822
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_reg.h
-@@ -0,0 +1,834 @@
+@@ -0,0 +1,833 @@
 +
 +
 +#define NV03_BOOT_0                                        0x00100000
@@ -18641,7 +18651,6 @@ index 0000000..4824984
 +#define NV50_USER_DMA_PUT__SIZE                                              128
 +#define NV50_USER_DMA_GET(i)                     (0x00c00044+(i*NV50_USER_SIZE))
 +#define NV50_USER_DMA_GET__SIZE                                              128
-+/*XXX: I don't think this actually exists.. */
 +#define NV50_USER_REF_CNT(i)                     (0x00c00048+(i*NV50_USER_SIZE))
 +#define NV50_USER_REF_CNT__SIZE                                              128
 +
@@ -33641,10 +33650,10 @@ index 0000000..d3807e3
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..3d12e12
+index 0000000..6bc0824
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
-@@ -0,0 +1,475 @@
+@@ -0,0 +1,473 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -33927,8 +33936,6 @@ index 0000000..3d12e12
 +	nv_wo32(dev, ramfc, 0x44/4, 0x2101ffff);
 +	nv_wo32(dev, ramfc, 0x60/4, 0x7fffffff);
 +	nv_wo32(dev, ramfc, 0x40/4, 0x00000000);
-+	nv_wo32(dev, ramfc, 0x50/4, 0x2039b2e0);
-+	nv_wo32(dev, ramfc, 0x54/4, 0x000f0000);
 +	nv_wo32(dev, ramfc, 0x7c/4, 0x30000001);
 +	nv_wo32(dev, ramfc, 0x78/4, 0x00000000);
 +	nv_wo32(dev, ramfc, 0x4c/4, 0xffffffff);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1797
retrieving revision 1.1798
diff -u -p -r1.1797 -r1.1798
--- kernel.spec	14 Sep 2009 00:34:30 -0000	1.1797
+++ kernel.spec	14 Sep 2009 06:01:43 -0000	1.1798
@@ -2038,6 +2038,9 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: avoid PFIFO IRQ hardlock, misc LVDS mode fixes, nv5x RAMFC cleanup
+
 * Sun Sep 13 2009 Chuck Ebbert <cebbert at redhat.com>
 - SCSI oops fixes requested for -stable
 



From mtasaka at fedoraproject.org  Mon Sep 14 06:05:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Sep 2009 06:05:21 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.398, 1.399 jd.spec, 1.458, 1.459 sources,
	1.399, 1.400
Message-ID: <20090914060521.A99EE11C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9634

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3068



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- .cvsignore	11 Sep 2009 14:22:47 -0000	1.398
+++ .cvsignore	14 Sep 2009 06:05:21 -0000	1.399
@@ -1 +1 @@
-jd-2.4.2-svn3060_trunk.tgz
+jd-2.4.2-svn3068_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- jd.spec	11 Sep 2009 14:22:47 -0000	1.458
+++ jd.spec	14 Sep 2009 06:05:21 -0000	1.459
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3060_trunk
+%define         strtag        svn3068_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3060
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3068
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
 - 2.4.1 beta 090806


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- sources	11 Sep 2009 14:22:48 -0000	1.399
+++ sources	14 Sep 2009 06:05:21 -0000	1.400
@@ -1 +1 @@
-13a987c329366bbf000308bbdc97caf9  jd-2.4.2-svn3060_trunk.tgz
+32bf54781c54bf2000ca06db453b6f72  jd-2.4.2-svn3068_trunk.tgz



From bskeggs at fedoraproject.org  Mon Sep 14 06:12:16 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 14 Sep 2009 06:12:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.44,
	1.45 nouveau-bicubic-2x.patch, 1.12,
	1.13 nouveau-multiple-xserver.patch, 1.14,
	1.15 nouveau-tile7000.patch, 1.2, 1.3 sources, 1.45,
	1.46 xorg-x11-drv-nouveau.spec, 1.57, 1.58
Message-ID: <20090914061216.0E99C11C00EC@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11197

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-10.20090914git1b72020
- wait for fbcon copy to complete before switching mode (rh#522688)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	10 Sep 2009 05:37:03 -0000	1.44
+++ .cvsignore	14 Sep 2009 06:12:15 -0000	1.45
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090910git806eaf6.tar.bz2
+xf86-video-nouveau-0.0.15-20090914git1b72020.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nouveau-bicubic-2x.patch	10 Sep 2009 05:37:03 -0000	1.12
+++ nouveau-bicubic-2x.patch	14 Sep 2009 06:12:15 -0000	1.13
@@ -1,4 +1,4 @@
-From 4c5b7cde89e9411aa5b107be48ce164837b05881 Mon Sep 17 00:00:00 2001
+From 36281908ca3785b8fb50907b892ff49970c6f2c7 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nouveau-multiple-xserver.patch	10 Sep 2009 05:37:03 -0000	1.14
+++ nouveau-multiple-xserver.patch	14 Sep 2009 06:12:15 -0000	1.15
@@ -1,4 +1,4 @@
-From 2c643c98ae006460c0a3fdb5f9660bd3ea9a4fce Mon Sep 17 00:00:00 2001
+From 9a882ef6e1e0112112ac9819632bd320f1f34c1a Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nouveau-tile7000.patch	10 Sep 2009 05:37:03 -0000	1.2
+++ nouveau-tile7000.patch	14 Sep 2009 06:12:15 -0000	1.3
@@ -1,4 +1,4 @@
-From 2b030e60ff009bf8ee80c4d91d9d92081a711e3d Mon Sep 17 00:00:00 2001
+From 44148dd51aa13876490063ce4e89ae94b6d9b604 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] f12: use 0x7000 fla
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 3010396..a9962ec 100644
+index e152e7f..455c44f 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -436,7 +436,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -442,7 +442,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50) {
  		tile_mode = 4;
@@ -22,7 +22,7 @@ index 3010396..a9962ec 100644
  		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
  		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
  	} else {
-@@ -1057,7 +1057,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1063,7 +1063,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	10 Sep 2009 05:37:03 -0000	1.45
+++ sources	14 Sep 2009 06:12:15 -0000	1.46
@@ -1 +1 @@
-51ba1ce895c4e2b5ce34fe88034b676f  xf86-video-nouveau-0.0.15-20090910git806eaf6.tar.bz2
+cebf1f04b03cf524930bd0f472a5f8b7  xf86-video-nouveau-0.0.15-20090914git1b72020.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- xorg-x11-drv-nouveau.spec	10 Sep 2009 05:37:03 -0000	1.57
+++ xorg-x11-drv-nouveau.spec	14 Sep 2009 06:12:15 -0000	1.58
@@ -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 20090910
-%define git_version 806eaf6
+%define gitdate 20090914
+%define git_version 1b72020
 
 %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:   9.%{snapshot}%{?dist}
+Release:   10.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-10.20090914git1b72020
+- wait for fbcon copy to complete before switching mode (rh#522688)
+
 * Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-9.20090910git806eaf6
 - fix a hang/crash issue that could occur during a modeset
 - nouveau-transition-hack.patch: drop, supported with driver pixmaps anyway



From topdog at fedoraproject.org  Mon Sep 14 06:16:42 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 14 Sep 2009 06:16:42 +0000 (UTC)
Subject: rpms/php-email-address-validation/EL-5 import.log, NONE,
	1.1 php-email-address-validation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914061643.0AC2311C00EC@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-email-address-validation/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12226/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-email-address-validation.spec 
Log Message:
* Mon Sep 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- initial cvs import




--- NEW FILE import.log ---
php-email-address-validation-0-0_3_20090910svn_fc11:EL-5:php-email-address-validation-0-0.3.20090910svn.fc11.src.rpm:1252907590


--- NEW FILE php-email-address-validation.spec ---
Name:		php-email-address-validation
Version:	0
Release:	0.3.20090910svn%{?dist}
Summary:	A PHP class for validating email addresses
Group:		Development/Libraries
License:	BSD
URL:		http://code.google.com/p/php-email-address-validation/
# The source for this package was pulled from the upstream's vcs.
# The following commands can be used to generate the tarball.
# svn export -r10 http://php-email-address-validation.googlecode.com/svn/trunk/ php-email-address-validation
# tar cjvf rpmbuild/SOURCES/php-email-address-validation-0-0.1.20090910svn.tar.bz2 php-email-address-validation/ 
Source0:	%{name}-0-0.2.20090910svn.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-common
Requires:	php

%description
This PHP class is used to check email addresses for technical validity.

%prep
%setup -q -n %{name}
sed -i 's/\r//' tests/EmailAddressValidatorTest.php

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_datadir}/php/%{name}
cp -rp EmailAddressValidator.php $RPM_BUILD_ROOT%{_datadir}/php/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc tests/
%{_datadir}/php/%{name}

%changelog
* Fri Sep 11 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20090910svn
- Add php dependency

* Thu Sep 10 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090910svn
- Improved description
- Add comments to indicate source generation.
- Add php-common dependency

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090806svn
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:50:09 -0000	1.1
+++ .cvsignore	14 Sep 2009 06:16:42 -0000	1.2
@@ -0,0 +1 @@
+php-email-address-validation-0-0.2.20090910svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-email-address-validation/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:50:09 -0000	1.1
+++ sources	14 Sep 2009 06:16:42 -0000	1.2
@@ -0,0 +1 @@
+02fffc92c790fad6edea1d78cbf688be  php-email-address-validation-0-0.2.20090910svn.tar.bz2



From kraxel at fedoraproject.org  Mon Sep 14 06:54:49 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Mon, 14 Sep 2009 06:54:49 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.247,1.248
Message-ID: <20090914065450.19D9111C00EC@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22816

Modified Files:
	xen.spec 
Log Message:
add e2fsprogs-devel to build dependencies


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- xen.spec	2 Sep 2009 11:36:00 -0000	1.247
+++ xen.spec	14 Sep 2009 06:54:47 -0000	1.248
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -66,6 +66,8 @@ BuildRequires: openssl-devel
 BuildRequires: pciutils-devel
 # modern compressed kernels
 BuildRequires: bzip2-devel xz-devel
+# libfsimage
+BuildRequires: e2fsprogs-devel
 Requires: bridge-utils
 Requires: udev >= 059
 Requires: xen-runtime = %{version}-%{release}
@@ -462,6 +464,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 14 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-4
+- add e2fsprogs-devel to build dependencies.
+
 * Tue Sep 2 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-3
 - swap bzip2+xz linux kernel compression support patches.
 - backport one more bugfix (videoram option).



From mschwendt at fedoraproject.org  Mon Sep 14 07:11:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 07:11:27 +0000 (UTC)
Subject: rpms/audacity/devel audacity-1.3.9-labelpopup.patch, NONE,
	1.1 audacity.spec, 1.83, 1.84
Message-ID: <20090914071127.CE2A611C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28108

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.9-labelpopup.patch 
Log Message:
* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
- add patch to fix LabelTrack popup


audacity-1.3.9-labelpopup.patch:
 TrackPanel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-labelpopup.patch ---
diff -Nur audacity-src-1.3.9-orig/src/TrackPanel.cpp audacity-src-1.3.9/src/TrackPanel.cpp
--- audacity-src-1.3.9-orig/src/TrackPanel.cpp	2009-08-31 12:45:39.000000000 +0200
+++ audacity-src-1.3.9/src/TrackPanel.cpp	2009-09-14 08:52:22.764231346 +0200
@@ -4464,7 +4464,7 @@
    }
 
    
-   if (event.RightDown()) {
+   if (event.RightUp()) {
       // popup menu for editing
       RefreshTrack(lTrack);
      


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- audacity.spec	12 Sep 2009 14:08:26 -0000	1.83
+++ audacity.spec	14 Sep 2009 07:11:24 -0000	1.84
@@ -19,6 +19,7 @@ Patch1: audacity-1.3.7-libmp3lame-defaul
 Patch2: audacity-1.3.9-libdir.patch
 Patch3: audacity-1.3.8-gsocket-conflict.patch
 Patch4: audacity-1.3.9-labeltrack-crash.patch
+Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,6 +71,7 @@ grep -q -s __RPM_LIB * -R && exit 1
 
 %patch3 -p1 -b .gsocket-conflict
 %patch4 -p1 -b .labeltrack-crash
+%patch5 -p1 -b .labelpopup
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -148,6 +150,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
+- add patch to fix LabelTrack popup
+
 * Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.2.beta
 - add wxGTK work-around patches to fix LabelTrack crash
   (shall fix #520917 and similar race-conditions)



From mschwendt at fedoraproject.org  Mon Sep 14 07:11:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 07:11:56 +0000 (UTC)
Subject: rpms/audacity/devel audacity.spec,1.84,1.85
Message-ID: <20090914071156.2DCE311C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28282

Modified Files:
	audacity.spec 
Log Message:
* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
- add patch to fix LabelTrack popup



Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- audacity.spec	14 Sep 2009 07:11:24 -0000	1.84
+++ audacity.spec	14 Sep 2009 07:11:55 -0000	1.85
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.9
-Release: 0.2.beta%{?dist}
+Release: 0.3.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2



From dtardon at fedoraproject.org  Mon Sep 14 07:56:05 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 14 Sep 2009 07:56:05 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2002,1.2003
Message-ID: <20090914075605.D1F5511C00EC@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10802

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#523106 [indic] changed names of lohit-* fonts


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2002
retrieving revision 1.2003
diff -u -p -r1.2002 -r1.2003
--- openoffice.org.spec	11 Sep 2009 06:51:26 -0000	1.2002
+++ openoffice.org.spec	14 Sep 2009 07:56:02 -0000	1.2003
@@ -688,7 +688,7 @@ Provides additional bulgarian translatio
 Summary: Bengali language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: lohit-fonts-bengali
+Requires: lohit-bengali-fonts
 Requires: hunspell-bn, hyphen-bn
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-bn_IN < 1:2.0.3
@@ -866,7 +866,7 @@ Summary: Gujarati language pack for Open
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-gu, hyphen-gu
-Requires: lohit-fonts-gujarati
+Requires: lohit-gujarati-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-gu_IN < 1:3.0.0
 
@@ -878,7 +878,7 @@ Summary: Punjabi language pack for OpenO
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-pa, hyphen-pa
-Requires: lohit-fonts-punjabi
+Requires: lohit-punjabi-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-pa_IN < 1:3.0.0
 
@@ -903,7 +903,7 @@ Summary: Hindi language pack for OpenOff
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-hi, hyphen-hi
-Requires: lohit-fonts-hindi
+Requires: lohit-hindi-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-hi-IN < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-hi_IN < 1:3.0.0
@@ -1159,7 +1159,7 @@ Summary: Tamil language pack for OpenOff
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires:  hunspell-ta, hyphen-ta
-Requires:  lohit-fonts-tamil
+Requires:  lohit-tamil-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-ta_IN < 1:3.0.0
 
@@ -1287,7 +1287,7 @@ Summary: Assamese language pack for Open
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-as, hyphen-as
-Requires: lohit-fonts-bengali
+Requires: lohit-bengali-fonts
 Obsoletes: openoffice.org2-langpack-as_IN < 1:3.0.0
 
 %description langpack-as_IN
@@ -1298,7 +1298,7 @@ Summary: Marathi language pack for OpenO
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-mr, hyphen-mr
-Requires: lohit-fonts-marathi
+Requires: lohit-marathi-fonts
 Obsoletes: openoffice.org2-langpack-mr_IN < 1:3.0.0
 
 %description langpack-mr_IN
@@ -1320,7 +1320,7 @@ Summary: Oriya language pack for OpenOff
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-or, hyphen-or
-Requires: lohit-fonts-oriya
+Requires: lohit-oriya-fonts
 Obsoletes: openoffice.org2-langpack-or_IN < 1:3.0.0
 
 %description langpack-or_IN
@@ -1331,7 +1331,7 @@ Summary: Telugu language pack for OpenOf
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-te, hyphen-te
-Requires: lohit-fonts-telugu
+Requires: lohit-telugu-fonts
 Obsoletes: openoffice.org2-langpack-te_IN < 1:3.0.0
 
 %description langpack-te_IN
@@ -1353,7 +1353,7 @@ Summary: Kannada language pack for OpenO
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-kn, hyphen-kn
-Requires: lohit-fonts-kannada
+Requires: lohit-kannada-fonts
 Obsoletes: openoffice.org2-langpack-kn_IN < 1:3.0.0
 
 %description langpack-kn_IN
@@ -4246,6 +4246,7 @@ fi
 %changelog
 * Fri Sep 11 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7-UNBUILT
 - make oo.o buildable without langpacks again
+- Resolves: rhbz#523106 [indic] changed names of lohit-* fonts
 
 * Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch



From mschwendt at fedoraproject.org  Mon Sep 14 07:57:43 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 07:57:43 +0000 (UTC)
Subject: rpms/taglib/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 taglib.spec, 1.43, 1.44 taglib-1.5-1.6-ape.patch, 1.1,
	NONE taglib-1.5-1.6-flac.patch, 1.1,
	NONE taglib-1.5-1.6-mpeg-cmake.patch, 1.1,
	NONE taglib-1.5-1.6-mpeg.patch, 1.1,
	NONE taglib-1.5-1.6-ogg.patch, 1.2,
	NONE taglib-1.5-1.6-toolkit.patch, 1.2,
	NONE taglib-1.5-tests.patch, 1.1, NONE
Message-ID: <20090914075743.D98F611C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11400

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib-1.5-tests.patch 
Log Message:
* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
- Update to 1.6 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Feb 2008 02:44:59 -0000	1.11
+++ .cvsignore	14 Sep 2009 07:57:42 -0000	1.12
@@ -1 +1 @@
-taglib-1.5.tar.gz
+taglib-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Feb 2008 02:44:59 -0000	1.11
+++ sources	14 Sep 2009 07:57:42 -0000	1.12
@@ -1 +1 @@
-7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz
+5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- taglib.spec	4 Sep 2009 10:21:32 -0000	1.43
+++ taglib.spec	14 Sep 2009 07:57:43 -0000	1.44
@@ -11,14 +11,16 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    8%{?dist}
+Version:    1.6
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+# the temporary url from the 1.6 announcement
+Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
+#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -30,16 +32,6 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.5-tests.patch
-
-## upstream patches
-Patch101: taglib-1.5-1.6-ape.patch
-Patch102: taglib-1.5-1.6-ogg.patch
-Patch103: taglib-1.5-1.6-flac.patch
-Patch104: taglib-1.5-1.6-toolkit.patch
-Patch105: taglib-1.5-1.6-mpeg.patch
-Patch106: taglib-1.5-1.6-mpeg-cmake.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -92,19 +84,11 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .tests
-%patch101 -p1 -b .ape
-%patch102 -p1 -b .ogg
-%patch103 -p1 -b .flac
-%patch104 -p1 -b .toolkit
-%patch105 -p1 -b .mpeg
-%patch106 -p1 -b .mpeg-build
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?buildtests} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -171,6 +155,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Update to 1.6 final.
+
+* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
+- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
+- Build optional support for MP4 and ASF/WMA files.
+
 * Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
 - Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and
   really add tstring bug-fix:


--- taglib-1.5-1.6-ape.patch DELETED ---


--- taglib-1.5-1.6-flac.patch DELETED ---


--- taglib-1.5-1.6-mpeg-cmake.patch DELETED ---


--- taglib-1.5-1.6-mpeg.patch DELETED ---


--- taglib-1.5-1.6-ogg.patch DELETED ---


--- taglib-1.5-1.6-toolkit.patch DELETED ---


--- taglib-1.5-tests.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Sep 14 08:02:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 08:02:05 +0000 (UTC)
Subject: rpms/taglib/F-11 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 taglib.spec, 1.32, 1.33 taglib-1.5-kde#161721.patch, 1.1, NONE
Message-ID: <20090914080205.B598C11C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13041

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.5-kde#161721.patch 
Log Message:
sync with 1.6 final from Rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Feb 2008 02:44:59 -0000	1.11
+++ .cvsignore	14 Sep 2009 08:02:05 -0000	1.12
@@ -1 +1 @@
-taglib-1.5.tar.gz
+taglib-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Feb 2008 02:44:59 -0000	1.11
+++ sources	14 Sep 2009 08:02:05 -0000	1.12
@@ -1 +1 @@
-7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz
+5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/taglib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- taglib.spec	25 Feb 2009 18:20:14 -0000	1.32
+++ taglib.spec	14 Sep 2009 08:02:05 -0000	1.33
@@ -1,15 +1,26 @@
 
-# cvsadmin: http://bugzilla.redhat.com/418271
+# Fedora cvs admin requests for taglib: http://bugzilla.redhat.com/418271
+
+%bcond_without tests
+
+%if %{with tests}
+%global buildtests -DBUILD_TESTS=ON
+%endif
+
+%bcond_without doc
+%global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    4%{?dist}
+Version:    1.6
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+# the temporary url from the 1.6 announcement
+Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
+#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -21,45 +32,73 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-## upstream patches
-Patch100: taglib-1.5-kde#161721.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
+%if %{with tests}
+BuildRequires: cppunit-devel
+%endif
+%if %{with doc}
+BuildRequires: doxygen
+BuildRequires: graphviz
+%endif
+
 
 %description
 TagLib is a library for reading and editing the meta-data of several
-popular audio formats. Currently it supports both ID3v1 and ID3v2 for
-MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
-FLAC files.
+popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3
+files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
+Speex, WavPack, TrueAudio files, as well as APE Tags.
+
+
+%if %{with doc}
+%package doc
+Summary: API Documentation for %{name}
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description doc
+This is API documentation generated from the TagLib source code.
+%endif
+
 
 %package devel
 Summary: Development files for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+%if ! %{with doc}
+Obsoletes: %{name}-doc
+%endif
+
 %description devel
-%{summary}.
+Files needed when building software with %{name}.
 
 
 %prep
 %setup -q -n taglib-%{version}%{?beta}
 
+# patch1 not applied
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch100 -p1 -b .kde#161721.patch
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+%if %{with doc}
+cd doc
+doxygen taglib.doxygen
+cd -
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -67,9 +106,24 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr examples/.deps
-rm -fr examples/Makefile*
+rm -fr examples/Makefile* examples/CMake*
 rm -f %{buildroot}%{_libdir}/lib*.la
 
+%if %{with doc}
+rm -fr %{apidocdir} ; mkdir %{apidocdir}
+cp -a doc/html doc/*.png %{apidocdir}
+ln -s html/index.html %{apidocdir}
+find %{apidocdir} -name '*.md5' | xargs rm
+%endif
+
+
+%if %{with tests}
+%check
+cp -a tests/data %{_target_platform}/tests
+cd %{_target_platform}
+LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -93,8 +147,61 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with doc}
+%files doc
+%defattr(-,root,root,-)
+%doc %{apidocdir}/*
+%endif
+
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Update to 1.6 final.
+
+* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
+- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
+- Build optional support for MP4 and ASF/WMA files.
+
+* Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
+- Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and
+  really add tstring bug-fix:
+  * Split Ogg packets larger than 64k into multiple pages. (BUG:171957)
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+
+* Sun Aug 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-7
+- Build API documentation into -doc package.
+
+* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
+- Add %%check section and conditionally build with tests.
+- Update descriptions (and mention the additional file formats).
+- Cherry-pick bug-fix patches from 1.6 development (also replaces the
+  old taglib-1.5-kde#161721.patch):
+  * Fixed crash when saving a Locator APEv2 tag. (BUG:169810)
+  * TagLib can now use FLAC padding block. (BUG:107659)
+  * Fixed overflow while calculating bitrate of FLAC files with a very
+    high bitrate.
+  * XiphComment::year() now falls back to YEAR if DATE doesn't exist
+    and XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
+    exist. (BUG:144396)
+  * Fixed a bug in ByteVectorList::split().
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+  * ID3v2.2 frames are now not incorrectly saved. (BUG:176373)
+  * Support for ID3v2.2 PIC frames. (BUG:167786)
+  * Improved ID3v2.3 genre parsing. (BUG:188578)
+  * Better checking of corrupted ID3v2 APIC data. (BUG:168382)
+  * Bitrate calculating using the Xing header now uses floating point
+    numbers. (BUG:172556)
+  * Added support for PRIV ID3v2 frames.
+  * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
+  * Added support for the POPM (rating/playcount) ID3v2 frame.
+  * Fixed crash on handling unsupported ID3v2 frames, e.g. on encrypted
+    frames. (BUG:161721)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- taglib-1.5-kde#161721.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Sep 14 08:02:18 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 08:02:18 +0000 (UTC)
Subject: rpms/taglib/F-10 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 taglib.spec, 1.30, 1.31 taglib-1.5-kde#161721.patch, 1.1, NONE
Message-ID: <20090914080218.BD6D911C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13305

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.5-kde#161721.patch 
Log Message:
sync with 1.6 final from Rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Feb 2008 02:44:59 -0000	1.11
+++ .cvsignore	14 Sep 2009 08:02:18 -0000	1.12
@@ -1 +1 @@
-taglib-1.5.tar.gz
+taglib-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Feb 2008 02:44:59 -0000	1.11
+++ sources	14 Sep 2009 08:02:18 -0000	1.12
@@ -1 +1 @@
-7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz
+5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/taglib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- taglib.spec	6 Oct 2008 20:54:30 -0000	1.30
+++ taglib.spec	14 Sep 2009 08:02:18 -0000	1.31
@@ -1,15 +1,26 @@
 
-# cvsadmin: http://bugzilla.redhat.com/418271
+# Fedora cvs admin requests for taglib: http://bugzilla.redhat.com/418271
+
+%bcond_without tests
+
+%if %{with tests}
+%global buildtests -DBUILD_TESTS=ON
+%endif
+
+%bcond_without doc
+%global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    2%{?dist}
+Version:    1.6
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+# the temporary url from the 1.6 announcement
+Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
+#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -21,44 +32,73 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-## upstream patches
-Patch100: taglib-1.5-kde#161721.patch
-
 BuildRequires: cmake
+BuildRequires: pkgconfig
 BuildRequires: zlib-devel
+%if %{with tests}
+BuildRequires: cppunit-devel
+%endif
+%if %{with doc}
+BuildRequires: doxygen
+BuildRequires: graphviz
+%endif
+
 
 %description
 TagLib is a library for reading and editing the meta-data of several
-popular audio formats. Currently it supports both ID3v1 and ID3v2 for
-MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
-FLAC files.
+popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3
+files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
+Speex, WavPack, TrueAudio files, as well as APE Tags.
+
+
+%if %{with doc}
+%package doc
+Summary: API Documentation for %{name}
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description doc
+This is API documentation generated from the TagLib source code.
+%endif
+
 
 %package devel
 Summary: Development files for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+%if ! %{with doc}
+Obsoletes: %{name}-doc
+%endif
+
 %description devel
-%{summary}.
+Files needed when building software with %{name}.
 
 
 %prep
 %setup -q -n taglib-%{version}%{?beta}
 
+# patch1 not applied
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch100 -p1 -b .kde#161721.patch
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+%if %{with doc}
+cd doc
+doxygen taglib.doxygen
+cd -
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -66,9 +106,24 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr examples/.deps
-rm -fr examples/Makefile*
+rm -fr examples/Makefile* examples/CMake*
 rm -f %{buildroot}%{_libdir}/lib*.la
 
+%if %{with doc}
+rm -fr %{apidocdir} ; mkdir %{apidocdir}
+cp -a doc/html doc/*.png %{apidocdir}
+ln -s html/index.html %{apidocdir}
+find %{apidocdir} -name '*.md5' | xargs rm
+%endif
+
+
+%if %{with tests}
+%check
+cp -a tests/data %{_target_platform}/tests
+cd %{_target_platform}
+LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -92,8 +147,67 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with doc}
+%files doc
+%defattr(-,root,root,-)
+%doc %{apidocdir}/*
+%endif
+
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Update to 1.6 final.
+
+* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
+- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
+- Build optional support for MP4 and ASF/WMA files.
+
+* Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
+- Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and
+  really add tstring bug-fix:
+  * Split Ogg packets larger than 64k into multiple pages. (BUG:171957)
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+
+* Sun Aug 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-7
+- Build API documentation into -doc package.
+
+* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
+- Add %%check section and conditionally build with tests.
+- Update descriptions (and mention the additional file formats).
+- Cherry-pick bug-fix patches from 1.6 development (also replaces the
+  old taglib-1.5-kde#161721.patch):
+  * Fixed crash when saving a Locator APEv2 tag. (BUG:169810)
+  * TagLib can now use FLAC padding block. (BUG:107659)
+  * Fixed overflow while calculating bitrate of FLAC files with a very
+    high bitrate.
+  * XiphComment::year() now falls back to YEAR if DATE doesn't exist
+    and XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
+    exist. (BUG:144396)
+  * Fixed a bug in ByteVectorList::split().
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+  * ID3v2.2 frames are now not incorrectly saved. (BUG:176373)
+  * Support for ID3v2.2 PIC frames. (BUG:167786)
+  * Improved ID3v2.3 genre parsing. (BUG:188578)
+  * Better checking of corrupted ID3v2 APIC data. (BUG:168382)
+  * Bitrate calculating using the Xing header now uses floating point
+    numbers. (BUG:172556)
+  * Added support for PRIV ID3v2 frames.
+  * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
+  * Added support for the POPM (rating/playcount) ID3v2 frame.
+  * Fixed crash on handling unsupported ID3v2 frames, e.g. on encrypted
+    frames. (BUG:161721)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-3
+- rebuild for pkgconfig deps
+
 * Mon Oct 06 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-2
 - Encrypted frames taglib/Amarok crash (kde#161721)
 


--- taglib-1.5-kde#161721.patch DELETED ---



From choeger at fedoraproject.org  Mon Sep 14 08:11:31 2009
From: choeger at fedoraproject.org (=?utf-8?q?Christoph_H=C3=B6ger?=)
Date: Mon, 14 Sep 2009 08:11:31 +0000 (UTC)
Subject: rpms/bsf/devel build-file.patch, NONE, 1.1 build.properties.patch, 
	NONE, 1.1 .cvsignore, 1.5, 1.6 bsf.spec, 1.20, 1.21 sources, 1.5,
	1.6 bsf-javac.patch, 1.1, NONE
Message-ID: <20090914081132.0092F11C00EC@cvs1.fedora.phx.redhat.com>

Author: choeger

Update of /cvs/pkgs/rpms/bsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799

Modified Files:
	.cvsignore bsf.spec sources 
Added Files:
	build-file.patch build.properties.patch 
Removed Files:
	bsf-javac.patch 
Log Message:
Update to the latest stable upstream release

* added build.properties.xml per patch (upstream release bug)
* patched build.xml around some strange ant bug
* removed javac patch (does not apply anymore)
* added jython build dependency



build-file.patch:
 build.xml |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE build-file.patch ---
--- bsf-2.4.0-orig/build.xml	2009-09-09 11:51:20.000000000 +0200
+++ bsf-2.4.0/build.xml	2009-09-14 08:42:17.000000000 +0200
@@ -102,7 +102,7 @@
 		<pathelement location="${build.tests}"/>
 	</path>
 
-	<target name="init" depends="clean">
+	<target name="init">
 		<tstamp />
 
 
@@ -134,11 +134,13 @@
 
 		<available property="junit.present" classname="junit.framework.TestCase" />
 
+		<!--
 		<uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">
 			<srcfiles dir="${src.dir}">
 				<patternset refid="javac.source.files" />
 			</srcfiles>
 		</uptodate>
+		-->		
 
 		<uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar">
 			<srcfiles dir="${build.dir}" includes="**/*.html" />

build.properties.patch:
 build-properties.xml |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

--- NEW FILE build.properties.patch ---
diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-properties.xml
--- bsf-2.4.0-orig/build-properties.xml	1970-01-01 01:00:00.000000000 +0100
+++ bsf-2.4.0/build-properties.xml	2007-05-23 15:33:04.000000000 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="props">
+    <property name="project.name" value="bsf"/>
+    <property name="project.fullName" value="Bean Scripting Framework"/>
+    <property name="project.version" value="2.4.0"/>
+    <property name="project.debug" value="on"/>
+    <property name="project.deprecation" value="on"/>
+
+    <property name="build.file" value="build.xml"/>
+    <property name="build.dir" value="build"/>
+    <property name="build.dest" value="build/classes"/>
+    <property name="build.lib" value="build/lib"/>
+    <property name="build.lib.win32" value="build/lib/win32"/>
+    <property name="build.samples" value="build/samples"/>
+    <property name="build.samples.calc" value="build/samples/calc"/>
+    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
+    <property name="build.samples.xsl" value="build/samples/xsl"/>
+    <property name="build.javadocs" value="build/javadocs"/>
+    <property name="build.tests" value="build/testcases" />
+
+    <property name="dist.dir" value="dist"/>
+    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
+    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
+    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
+
+    <property name="packages" value="org.apache.*"/>
+
+    <property name="samples.dir" value="samples"/>
+
+    <property name="site.src" location="xdocs"/>
+    <property name="site.dest" location="docs"/>
+    <property name="site.projectFile" value="stylesheets/project.xml"/>
+
+    <property name="source.level" value="1.3" />
+
+    <property name="src.dir" value="src"/>
+
+    <property name="templ.path" location="xdocs/stylesheets"/>
+
+    <property name="tests.dir" value="test"/>
+
+    <property name="velocity.props" location="${site.src}/velocity.properties"/>
+</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2007 17:22:14 -0000	1.5
+++ .cvsignore	14 Sep 2009 08:11:30 -0000	1.6
@@ -1 +1 @@
-bsf-src-2.3.0.tar.gz
+build-file.patch


Index: bsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bsf.spec	24 Jul 2009 18:26:53 -0000	1.20
+++ bsf.spec	14 Sep 2009 08:11:31 -0000	1.21
@@ -33,8 +33,8 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 Name:           bsf
-Version:        2.3.0
-Release:        15%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 1.1
@@ -42,12 +42,16 @@ Url:            http://jakarta.apache.or
 Group:          Development/Libraries/Java
 #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
 Source0:        %{name}-src-%{version}.tar.gz
-Patch1:                 %{name}-javac.patch
+Patch0:	        build-file.patch
+Patch1:	        build.properties.patch
 BuildRequires:  jpackage-utils >= 1.6
 BuildRequires:  ant
 BuildRequires:  servlet
 BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  xalan-j2
+BuildRequires:  jython
+BuildRequires:  jakarta-commons-logging
+Requires:		jakarta-commons.logging
 Requires:               servletapi5
 Requires:               xalan-j2
 Requires:               tomcat5-jsp-2.0-api
@@ -102,14 +106,13 @@ Javadoc for %{name}.
 find . -name "*.jar" -exec %{__rm} -f {} \;
 %{__rm} -fr bsf
 
+%patch0 -p1
 %patch1 -p1
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
-export CLASSPATH=$(build-classpath xalan-j2 servlet jspapi)
-cd src
-ant realclean
-ant compile
+export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jspapi)
+ant jar 
 %{__rm} -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
 
@@ -117,13 +120,13 @@ ant javadocs
 %{__rm} -fr %{buildroot}
 # jar
 %{__install} -d -m 755 %{buildroot}%{_javadir}
-%{__install} -m 644 src/build/lib/%{name}.jar \
+%{__install} -m 644 build/lib/%{name}.jar \
 %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
 %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
@@ -152,7 +155,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc license.txt src/AUTHORS src/CHANGES src/CHANGES.old src/README src/TODO
+%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
 %{_javadir}/*
 
 %if %{gcj_support}
@@ -166,6 +169,10 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 09 2009 Christoph H?ger <choeger at cs.tu-berlin.de> - 0:2.4.0-1
+- New Upstream release: 2.4.0
+- Add jython build dependency to include bsf-jython engine
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2007 17:22:14 -0000	1.5
+++ sources	14 Sep 2009 08:11:31 -0000	1.6
@@ -1 +1 @@
-78bae3747ca5734bb7554eed6868b7da  bsf-src-2.3.0.tar.gz
+6e460bb4f709df97bfb8b0029952ba59  build-file.patch


--- bsf-javac.patch DELETED ---



From dtardon at fedoraproject.org  Mon Sep 14 08:11:49 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 14 Sep 2009 08:11:49 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2003,1.2004
Message-ID: <20090914081149.76E1D11C00EC@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16325

Modified Files:
	openoffice.org.spec 
Log Message:
update of changelog


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2003
retrieving revision 1.2004
diff -u -p -r1.2003 -r1.2004
--- openoffice.org.spec	14 Sep 2009 07:56:02 -0000	1.2003
+++ openoffice.org.spec	14 Sep 2009 08:11:49 -0000	1.2004
@@ -4244,7 +4244,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Sep 11 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7-UNBUILT
+* Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
 - make oo.o buildable without langpacks again
 - Resolves: rhbz#523106 [indic] changed names of lohit-* fonts
 



From choeger at fedoraproject.org  Mon Sep 14 08:31:36 2009
From: choeger at fedoraproject.org (=?utf-8?q?Christoph_H=C3=B6ger?=)
Date: Mon, 14 Sep 2009 08:31:36 +0000 (UTC)
Subject: rpms/bsf/devel .cvsignore, 1.6, 1.7 bsf.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <20090914083136.8C14311C00EC@cvs1.fedora.phx.redhat.com>

Author: choeger

Update of /cvs/pkgs/rpms/bsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22255

Modified Files:
	.cvsignore bsf.spec sources 
Log Message:
fix missing sources




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Sep 2009 08:11:30 -0000	1.6
+++ .cvsignore	14 Sep 2009 08:31:34 -0000	1.7
@@ -1 +1,3 @@
+bsf-src-2.4.0.tar.gz
 build-file.patch
+build.properties.patch


Index: bsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- bsf.spec	14 Sep 2009 08:11:31 -0000	1.21
+++ bsf.spec	14 Sep 2009 08:31:34 -0000	1.22
@@ -34,7 +34,7 @@
 
 Name:           bsf
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Sep 2009 08:11:31 -0000	1.6
+++ sources	14 Sep 2009 08:31:34 -0000	1.7
@@ -1 +1,3 @@
+7e58b2a009c0f70ab36bbef420b25c07  bsf-src-2.4.0.tar.gz
 6e460bb4f709df97bfb8b0029952ba59  build-file.patch
+57faf92e2bb07e22dcf7227ca174a659  build.properties.patch



From kzak at fedoraproject.org  Mon Sep 14 08:40:52 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon, 14 Sep 2009 08:40:52 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng-2.14-sfdisk-dump.patch, NONE,
	1.1 util-linux-ng-2.16-blkid-swsuspend.patch, NONE,
	1.1 util-linux-ng.spec, 1.58, 1.59
Message-ID: <20090914084053.12D7011C00EC@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26033

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.14-sfdisk-dump.patch 
	util-linux-ng-2.16-blkid-swsuspend.patch 
Log Message:
* Mon Sep 14 2009 Karel Zak <kzak at redhat.com> 2.16-9
- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
- fix typo in swsuspend detection


util-linux-ng-2.14-sfdisk-dump.patch:
 sfdisk.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE util-linux-ng-2.14-sfdisk-dump.patch ---
>From 1f1614f6a89de4b06e1843d0fadbca3f8a5521fe Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Fri, 11 Sep 2009 14:00:50 +0200
Subject: [PATCH 1/2] sfdisk: dump has to be $LANG insensitive

This stupid bug has been introduced by:

	commit add5133f4ad5136aac3ce7627e615d14893d0aeb
	Author: Pedro Ribeiro <p.m42.ribeiro at gmail.com>
	Date:   Fri Oct 3 08:52:35 2008 +0200
	fdisk: several strings without gettext calls

... so it shows that we need to improve our review process... :-(

Address-Red-Hat-Bug: #522718
Signed-off-by: Karel Zak <kzak at redhat.com>
---
 fdisk/sfdisk.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 8fae5bb..427cb40 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -930,8 +930,8 @@ get_disksize(int format) {
 static void
 out_partition_header(char *dev, int format, struct geometry G) {
     if (dump) {
-	printf(_("# partition table of %s\n"), dev);
-	printf(_("unit: sectors\n\n"));
+	printf("# partition table of %s\n", dev);
+	printf("unit: sectors\n\n");
 	return;
     }
 
@@ -1059,12 +1059,12 @@ out_partition(char *dev, int format, struct part_desc *p,
     size = p->size;
 
     if (dump) {
-	printf(_(" start=%9lu"), start);
-	printf(_(", size=%9lu"), size);
+	printf(" start=%9lu", start);
+	printf(", size=%9lu", size);
 	if (p->ptype == DOS_TYPE) {
 	    printf(", Id=%2x", p->p.sys_type);
 	    if (p->p.bootable == 0x80)
-		printf(_(", bootable"));
+		printf(", bootable");
 	}
 	printf("\n");
 	return;
-- 
1.6.2.5


util-linux-ng-2.16-blkid-swsuspend.patch:
 swap.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE util-linux-ng-2.16-blkid-swsuspend.patch ---
>From 71cd5d8a775d98e93f7583210a5b53c52b4ec34f Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Mon, 14 Sep 2009 10:24:07 +0200
Subject: [PATCH] libblkid: fix typo (swsupend -> swsuspend)

Signed-off-by: Karel Zak <kzak at redhat.com>
---
 shlibs/blkid/src/probers/swap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/shlibs/blkid/src/probers/swap.c b/shlibs/blkid/src/probers/swap.c
index 86eb94c..c289488 100644
--- a/shlibs/blkid/src/probers/swap.c
+++ b/shlibs/blkid/src/probers/swap.c
@@ -118,7 +118,7 @@ const struct blkid_idinfo swap_idinfo =
 
 const struct blkid_idinfo swsuspend_idinfo =
 {
-	.name		= "swsupend",
+	.name		= "swsuspend",
 	.usage		= BLKID_USAGE_OTHER,
 	.probefunc	= probe_swsuspend,
 	.magics		=
-- 
1.6.2.5



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- util-linux-ng.spec	26 Aug 2009 16:05:05 -0000	1.58
+++ util-linux-ng.spec	14 Sep 2009 08:40:51 -0000	1.59
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -110,6 +110,10 @@ Patch8: util-linux-ng-2.15-ipcs-32bit.pa
 Patch9: util-linux-ng-2.16-libblkid-ext2.patch
 # 518572 -  blkid requires ext2.ko to be decompressed on installation media 
 Patch10: util-linux-ng-2.16-libblkid-compression.patch
+# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
+Patch11: util-linux-ng-2.14-sfdisk-dump.patch
+# Swsuspend does not work
+Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -206,6 +210,8 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 unset LINGUAS || :
@@ -716,6 +722,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Karel Zak <kzak at redhat.com> 2.16-9
+- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
+- fix typo in swsuspend detection
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-8
 - rebuilt with new audit
 



From choeger at fedoraproject.org  Mon Sep 14 08:42:48 2009
From: choeger at fedoraproject.org (=?utf-8?q?Christoph_H=C3=B6ger?=)
Date: Mon, 14 Sep 2009 08:42:48 +0000 (UTC)
Subject: rpms/bsf/F-11 build-file.patch, NONE, 1.1 build.properties.patch,
	NONE, 1.1 .cvsignore, 1.5, 1.6 bsf.spec, 1.19, 1.20 sources, 1.5,
	1.6 bsf-javac.patch, 1.1, NONE
Message-ID: <20090914084248.3D7C611C00EC@cvs1.fedora.phx.redhat.com>

Author: choeger

Update of /cvs/pkgs/rpms/bsf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26492

Modified Files:
	.cvsignore bsf.spec sources 
Added Files:
	build-file.patch build.properties.patch 
Removed Files:
	bsf-javac.patch 
Log Message:
Update to the latest stable upstream release

* added build.properties.xml per patch (upstream release bug)
* patched build.xml around some strange ant bug
* removed javac patch (does not apply anymore)
* added jython build dependency



build-file.patch:
 build.xml |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE build-file.patch ---
--- bsf-2.4.0-orig/build.xml	2009-09-09 11:51:20.000000000 +0200
+++ bsf-2.4.0/build.xml	2009-09-14 08:42:17.000000000 +0200
@@ -102,7 +102,7 @@
 		<pathelement location="${build.tests}"/>
 	</path>
 
-	<target name="init" depends="clean">
+	<target name="init">
 		<tstamp />
 
 
@@ -134,11 +134,13 @@
 
 		<available property="junit.present" classname="junit.framework.TestCase" />
 
+		<!--
 		<uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">
 			<srcfiles dir="${src.dir}">
 				<patternset refid="javac.source.files" />
 			</srcfiles>
 		</uptodate>
+		-->		
 
 		<uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar">
 			<srcfiles dir="${build.dir}" includes="**/*.html" />

build.properties.patch:
 build-properties.xml |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

--- NEW FILE build.properties.patch ---
diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-properties.xml
--- bsf-2.4.0-orig/build-properties.xml	1970-01-01 01:00:00.000000000 +0100
+++ bsf-2.4.0/build-properties.xml	2007-05-23 15:33:04.000000000 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="props">
+    <property name="project.name" value="bsf"/>
+    <property name="project.fullName" value="Bean Scripting Framework"/>
+    <property name="project.version" value="2.4.0"/>
+    <property name="project.debug" value="on"/>
+    <property name="project.deprecation" value="on"/>
+
+    <property name="build.file" value="build.xml"/>
+    <property name="build.dir" value="build"/>
+    <property name="build.dest" value="build/classes"/>
+    <property name="build.lib" value="build/lib"/>
+    <property name="build.lib.win32" value="build/lib/win32"/>
+    <property name="build.samples" value="build/samples"/>
+    <property name="build.samples.calc" value="build/samples/calc"/>
+    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
+    <property name="build.samples.xsl" value="build/samples/xsl"/>
+    <property name="build.javadocs" value="build/javadocs"/>
+    <property name="build.tests" value="build/testcases" />
+
+    <property name="dist.dir" value="dist"/>
+    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
+    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
+    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
+
+    <property name="packages" value="org.apache.*"/>
+
+    <property name="samples.dir" value="samples"/>
+
+    <property name="site.src" location="xdocs"/>
+    <property name="site.dest" location="docs"/>
+    <property name="site.projectFile" value="stylesheets/project.xml"/>
+
+    <property name="source.level" value="1.3" />
+
+    <property name="src.dir" value="src"/>
+
+    <property name="templ.path" location="xdocs/stylesheets"/>
+
+    <property name="tests.dir" value="test"/>
+
+    <property name="velocity.props" location="${site.src}/velocity.properties"/>
+</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2007 17:22:14 -0000	1.5
+++ .cvsignore	14 Sep 2009 08:42:47 -0000	1.6
@@ -1 +1,3 @@
-bsf-src-2.3.0.tar.gz
+bsf-src-2.4.0.tar.gz
+build-file.patch
+build.properties.patch


Index: bsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/F-11/bsf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- bsf.spec	24 Feb 2009 05:55:51 -0000	1.19
+++ bsf.spec	14 Sep 2009 08:42:47 -0000	1.20
@@ -33,8 +33,8 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 Name:           bsf
-Version:        2.3.0
-Release:        14%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 1.1
@@ -42,12 +42,16 @@ Url:            http://jakarta.apache.or
 Group:          Development/Libraries/Java
 #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
 Source0:        %{name}-src-%{version}.tar.gz
-Patch1:                 %{name}-javac.patch
+Patch0:	        build-file.patch
+Patch1:	        build.properties.patch
 BuildRequires:  jpackage-utils >= 1.6
 BuildRequires:  ant
 BuildRequires:  servlet
 BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  xalan-j2
+BuildRequires:  jython
+BuildRequires:  jakarta-commons-logging
+Requires:		jakarta-commons.logging
 Requires:               servletapi5
 Requires:               xalan-j2
 Requires:               tomcat5-jsp-2.0-api
@@ -102,14 +106,13 @@ Javadoc for %{name}.
 find . -name "*.jar" -exec %{__rm} -f {} \;
 %{__rm} -fr bsf
 
+%patch0 -p1
 %patch1 -p1
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
-export CLASSPATH=$(build-classpath xalan-j2 servlet jspapi)
-cd src
-ant realclean
-ant compile
+export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jspapi)
+ant jar 
 %{__rm} -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
 
@@ -117,13 +120,13 @@ ant javadocs
 %{__rm} -fr %{buildroot}
 # jar
 %{__install} -d -m 755 %{buildroot}%{_javadir}
-%{__install} -m 644 src/build/lib/%{name}.jar \
+%{__install} -m 644 build/lib/%{name}.jar \
 %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
 %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
@@ -152,7 +155,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc license.txt src/AUTHORS src/CHANGES src/CHANGES.old src/README src/TODO
+%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
 %{_javadir}/*
 
 %if %{gcj_support}
@@ -166,6 +169,13 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 09 2009 Christoph H?ger <choeger at cs.tu-berlin.de> - 0:2.4.0-1
+- New Upstream release: 2.4.0
+- Add jython build dependency to include bsf-jython engine
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2007 17:22:14 -0000	1.5
+++ sources	14 Sep 2009 08:42:48 -0000	1.6
@@ -1 +1,3 @@
-78bae3747ca5734bb7554eed6868b7da  bsf-src-2.3.0.tar.gz
+7e58b2a009c0f70ab36bbef420b25c07  bsf-src-2.4.0.tar.gz
+6e460bb4f709df97bfb8b0029952ba59  build-file.patch
+57faf92e2bb07e22dcf7227ca174a659  build.properties.patch


--- bsf-javac.patch DELETED ---



From mhlavink at fedoraproject.org  Mon Sep 14 08:49:49 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Sep 2009 08:49:49 +0000 (UTC)
Subject: rpms/dovecot/F-10 .cvsignore, 1.53, 1.54 dovecot.spec, 1.123,
	1.124 sources, 1.56, 1.57
Message-ID: <20090914084949.7FACB11C00EC@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28947

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
dovecot-sieve updated to 1.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	29 Jul 2009 12:11:20 -0000	1.53
+++ .cvsignore	14 Sep 2009 08:49:49 -0000	1.54
@@ -1,4 +1,4 @@
 dovecot-1.1.18.tar.gz
 dovecot-1.1.18-managesieve-0.10.7.diff.gz
 dovecot-1.1-managesieve-0.10.7.tar.gz
-dovecot-sieve-1.1.6.tar.gz
+dovecot-sieve-1.1.7.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- dovecot.spec	29 Jul 2009 12:11:20 -0000	1.123
+++ dovecot.spec	14 Sep 2009 08:49:49 -0000	1.124
@@ -2,7 +2,7 @@ Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
 Version: 1.1.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -14,7 +14,7 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 1.1.6
+%define sieve_version 1.1.7
 %define sieve_name dovecot-sieve
 %define managesieve_version 0.10.7
 %define managesieve_name dovecot-1.1-managesieve
@@ -425,6 +425,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.18-2
+- dovecot-sieve updated to 1.1.7
+- fixes bug similar to CVE-2009-2632 (buffer overflow)
+
 * Wed Jul 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.18-1
 - updated to 1.1.18
 - Maildir++ quota: Quota was sometimes updated wrong when it was


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	29 Jul 2009 12:11:20 -0000	1.56
+++ sources	14 Sep 2009 08:49:49 -0000	1.57
@@ -1,4 +1,4 @@
 b30bde50771100c60e2d5d4d4c8e2ceb  dovecot-1.1.18.tar.gz
 76ce80824dec0700c2138aee3dda1e30  dovecot-1.1.18-managesieve-0.10.7.diff.gz
 05bc554ed97c93695c676eaff6069485  dovecot-1.1-managesieve-0.10.7.tar.gz
-7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
+f133f49a9876ddf7c9290f2c4d255b44  dovecot-sieve-1.1.7.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 14 08:56:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Sep 2009 08:56:47 +0000 (UTC)
Subject: rpms/xtide/devel .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 xtide.spec, 1.45, 1.46
Message-ID: <20090914085647.85F5311C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31568

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.1.dev20090913
- Update to 2.11 development branch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	7 Jan 2009 17:41:08 -0000	1.28
+++ .cvsignore	14 Sep 2009 08:56:47 -0000	1.29
@@ -1,2 +1 @@
-xtide-2.10.tar.bz2
-harmonics-dwf-20081228-free.tar.bz2
+xtide-2.11-dev-20090913.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	7 Jan 2009 17:41:08 -0000	1.28
+++ sources	14 Sep 2009 08:56:47 -0000	1.29
@@ -1,2 +1 @@
-a14d9db748a86bed37769f38c4320ddd  xtide-2.10.tar.bz2
-2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2
+718f6fcc35b81b3638c66b088989a7f9  xtide-2.11-dev-20090913.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- xtide.spec	24 Jul 2009 20:20:01 -0000	1.45
+++ xtide.spec	14 Sep 2009 08:56:47 -0000	1.46
@@ -1,12 +1,12 @@
-%define          mainver   2.10
-%undefine          betatag
+%define          mainver   2.11
+%define          betatag   dev-20090913
 %define          dwfdate   20081228
 
 
-%define          fedorarel  5
+%define          fedorarel  1
 
 
-%define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
+%define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
 
 
 Summary:         Calculate tide all over the world
@@ -91,14 +91,15 @@ tideEditor.
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q -T -c -n %{name}-%{version}%{?betatag:-%betatag}/TMPDIR -a 42
-%setup -q -D -n %{name}-%{version}%{?betatag:-%betatag}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-DEVELOPMENT}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-DEVELOPMENT}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-DEVELOPMENT}
 
 # Dstr -> Dstr.h
 set +x
 echo
 echo "Changing Dstr -> Dstr"
-find . -type f | while read f ; do
+grep -rl Dstr . | while read f ; do
 	if grep -q 'include.*<Dstr>' $f ; then
 		sed -i.name -e 's|\(include.*\)<Dstr>|\1<Dstr.h>|' $f
 		echo -n -e "\t$f\tModified\n"
@@ -112,19 +113,11 @@ set -x
    --with-xttpd-user=xttpd \
    --with-xttpd-group=xttpd
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} -k
 
 echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
 echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
-# create US part tcd data
-pushd TMPDIR
-%if 0
-build_tide_db harmonics-dwf-%{dwfdate}-Fedora.tcd \
-   *txt *xml
-%endif
-popd
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT
@@ -284,6 +277,9 @@ exit 0
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.1.dev20090913
+- Update to 2.11 development branch
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-5
 - Use %%_initddir instead of %%_initrddir
 



From mtasaka at fedoraproject.org  Mon Sep 14 09:01:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Sep 2009 09:01:29 +0000 (UTC)
Subject: rpms/xtide/devel .cvsignore,1.29,1.30 sources,1.29,1.30
Message-ID: <20090914090129.3FD0011C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv957

Modified Files:
	.cvsignore sources 
Log Message:
Reupload a file which was deleted by mistake


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	14 Sep 2009 08:56:47 -0000	1.29
+++ .cvsignore	14 Sep 2009 09:01:28 -0000	1.30
@@ -1 +1,2 @@
+harmonics-dwf-20081228-free.tar.bz2
 xtide-2.11-dev-20090913.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	14 Sep 2009 08:56:47 -0000	1.29
+++ sources	14 Sep 2009 09:01:28 -0000	1.30
@@ -1 +1,2 @@
+2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2
 718f6fcc35b81b3638c66b088989a7f9  xtide-2.11-dev-20090913.tar.bz2



From mhlavink at fedoraproject.org  Mon Sep 14 09:08:51 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Sep 2009 09:08:51 +0000 (UTC)
Subject: rpms/dovecot/F-11 dovecot.spec,1.139,1.140
Message-ID: <20090914090851.BA49511C00EC@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4501

Modified Files:
	dovecot.spec 
Log Message:
update sieve summary



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- dovecot.spec	21 Aug 2009 10:56:56 -0000	1.139
+++ dovecot.spec	14 Sep 2009 09:08:50 -0000	1.140
@@ -90,7 +90,7 @@ The SQL drivers and authentication plugi
 %if %{build_sieve}
 %package sieve
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: CMU Sieve plugin for dovecot LDA
+Summary: Sieve plugin for dovecot LDA
 Group: System Environment/Daemons
 License: MIT and LGPLv2+
 



From mhlavink at fedoraproject.org  Mon Sep 14 09:10:36 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Sep 2009 09:10:36 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.135,1.136
Message-ID: <20090914091036.4460511C0489@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5528

Modified Files:
	dovecot.spec 
Log Message:
update sieve summary and description



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- dovecot.spec	21 Aug 2009 13:07:34 -0000	1.135
+++ dovecot.spec	14 Sep 2009 09:10:35 -0000	1.136
@@ -90,12 +90,12 @@ The SQL drivers and authentication plugi
 %if %{build_sieve}
 %package sieve
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: CMU Sieve plugin for dovecot LDA
+Summary: Sieve plugin for dovecot LDA
 Group: System Environment/Daemons
 License: MIT and LGPLv2+
 
 %description sieve
-This package provides the CMU Sieve plugin version %{sieve_version} for dovecot LDA.
+This package provides sieve plugin version %{sieve_version} for dovecot LDA.
 %endif
 
 %if %{build_managesieve}



From denis at fedoraproject.org  Mon Sep 14 09:10:54 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 14 Sep 2009 09:10:54 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.40, 1.41 glibmm.spec, 1.58,
	1.59 sources, 1.41, 1.42
Message-ID: <20090914091054.3C4BB11C00EC@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5819

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.21.5. Keep datadir/glibmm-2.4, for doc scripts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	2 Sep 2009 10:03:38 -0000	1.40
+++ .cvsignore	14 Sep 2009 09:10:53 -0000	1.41
@@ -1 +1 @@
-glibmm-2.21.4.2.tar.bz2
+glibmm-2.21.5.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- glibmm.spec	2 Sep 2009 10:03:38 -0000	1.58
+++ glibmm.spec	14 Sep 2009 09:10:54 -0000	1.59
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.21.4.2
+Version:        2.21.5
 Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -64,7 +64,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-
 %{__mv} ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
 sed -i 's:../../../doc/glibmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
 rm -fr $RPM_BUILD_ROOT%{_datadir}/devhelp/books/glibmm-2.4
-rm -fr $RPM_BUILD_ROOT%{_datadir}/glibmm-2.4
 
 
 %clean
@@ -92,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/glibmm-2.4
 %{_libdir}/giomm-2.4
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/glibmm-2.4
 %{_datadir}/aclocal/*.m4
 
 
@@ -101,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.21.5-1
+- Update to upstream 2.21.5
+- Keep datadir/glibmm-2.4, for doc scripts
+
 * Wed Sep  2 2009 Denis Leroy <denis at poolshark.org> - 2.21.4.2-1
 - Update to upstream 2.21.4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	2 Sep 2009 10:03:38 -0000	1.41
+++ sources	14 Sep 2009 09:10:54 -0000	1.42
@@ -1 +1 @@
-1f14c41e08b3663a2929370834e7834e  glibmm-2.21.4.2.tar.bz2
+9fa38563cbe6bf232ddbbe114f6f3a3f  glibmm-2.21.5.tar.bz2



From choeger at fedoraproject.org  Mon Sep 14 09:11:01 2009
From: choeger at fedoraproject.org (=?utf-8?q?Christoph_H=C3=B6ger?=)
Date: Mon, 14 Sep 2009 09:11:01 +0000 (UTC)
Subject: rpms/bsf/devel bsf.spec,1.22,1.23
Message-ID: <20090914091101.569E111C00EC@cvs1.fedora.phx.redhat.com>

Author: choeger

Update of /cvs/pkgs/rpms/bsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5784

Modified Files:
	bsf.spec 
Log Message:
fix typo in Requires: field




Index: bsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- bsf.spec	14 Sep 2009 08:31:34 -0000	1.22
+++ bsf.spec	14 Sep 2009 09:11:01 -0000	1.23
@@ -34,7 +34,7 @@
 
 Name:           bsf
 Version:        2.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 1.1
@@ -51,7 +51,7 @@ BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  xalan-j2
 BuildRequires:  jython
 BuildRequires:  jakarta-commons-logging
-Requires:		jakarta-commons.logging
+Requires:		jakarta-commons-logging
 Requires:               servletapi5
 Requires:               xalan-j2
 Requires:               tomcat5-jsp-2.0-api
@@ -169,6 +169,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 14 2009 Christoph H?ger <choeger at cs.tu-berlin.de> - 0:2.4.0-3
+- Fix typo in Requires
+
 * Wed Sep 09 2009 Christoph H?ger <choeger at cs.tu-berlin.de> - 0:2.4.0-1
 - New Upstream release: 2.4.0
 - Add jython build dependency to include bsf-jython engine



From mhlavink at fedoraproject.org  Mon Sep 14 09:11:12 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Sep 2009 09:11:12 +0000 (UTC)
Subject: rpms/dovecot/F-11 dovecot.spec,1.140,1.141
Message-ID: <20090914091112.4F9A511C00EC@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5933

Modified Files:
	dovecot.spec 
Log Message:
update sieve description



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- dovecot.spec	14 Sep 2009 09:08:50 -0000	1.140
+++ dovecot.spec	14 Sep 2009 09:11:11 -0000	1.141
@@ -95,7 +95,7 @@ Group: System Environment/Daemons
 License: MIT and LGPLv2+
 
 %description sieve
-This package provides the CMU Sieve plugin version %{sieve_version} for dovecot LDA.
+This package provides sieve plugin version %{sieve_version} for dovecot LDA.
 %endif
 
 %if %{build_managesieve}



From choeger at fedoraproject.org  Mon Sep 14 09:11:45 2009
From: choeger at fedoraproject.org (=?utf-8?q?Christoph_H=C3=B6ger?=)
Date: Mon, 14 Sep 2009 09:11:45 +0000 (UTC)
Subject: rpms/bsf/F-11 bsf.spec,1.20,1.21
Message-ID: <20090914091145.0FCD011C00EC@cvs1.fedora.phx.redhat.com>

Author: choeger

Update of /cvs/pkgs/rpms/bsf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6330

Modified Files:
	bsf.spec 
Log Message:
Fix typo in Requires:




Index: bsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/F-11/bsf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bsf.spec	14 Sep 2009 08:42:47 -0000	1.20
+++ bsf.spec	14 Sep 2009 09:11:44 -0000	1.21
@@ -34,7 +34,7 @@
 
 Name:           bsf
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 1.1
@@ -51,7 +51,7 @@ BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  xalan-j2
 BuildRequires:  jython
 BuildRequires:  jakarta-commons-logging
-Requires:		jakarta-commons.logging
+Requires:		jakarta-commons-logging
 Requires:               servletapi5
 Requires:               xalan-j2
 Requires:               tomcat5-jsp-2.0-api
@@ -169,6 +169,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 14 2009 Christoph H?ger <choeger at cs.tu-berlin.de> - 0:2.4.0-3
+- Fix typo in Requires
+
 * Wed Sep 09 2009 Christoph H?ger <choeger at cs.tu-berlin.de> - 0:2.4.0-1
 - New Upstream release: 2.4.0
 - Add jython build dependency to include bsf-jython engine



From denis at fedoraproject.org  Mon Sep 14 09:14:51 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 14 Sep 2009 09:14:51 +0000 (UTC)
Subject: rpms/pangomm/devel .cvsignore, 1.5, 1.6 pangomm.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090914091451.E409311C00EC@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7275

Modified Files:
	.cvsignore pangomm.spec sources 
Log Message:
- Update to upstream 2.25.1.3
- Package pangomm libdir directory with config include header



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Apr 2009 10:26:31 -0000	1.5
+++ .cvsignore	14 Sep 2009 09:14:51 -0000	1.6
@@ -1 +1 @@
-pangomm-2.24.0.tar.bz2
+pangomm-2.25.1.3.tar.bz2


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pangomm.spec	25 Jul 2009 23:12:53 -0000	1.8
+++ pangomm.spec	14 Sep 2009 09:14:51 -0000	1.9
@@ -1,8 +1,8 @@
 %define apiver 1.4
 
 Name:           pangomm
-Version:        2.24.0
-Release:        2%{?dist}
+Version:        2.25.1.3
+Release:        1%{?dist}
 Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
@@ -54,15 +54,14 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pangomm-%{apiver}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation, put everything under gtk-doc and fix
 # relative paths.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pangomm-%{apiver}
 mv ${RPM_BUILD_ROOT}%{_docdir}/pangomm-%{apiver}/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/pangomm-%{apiver}/*.devhelp ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}
-sed -i 's:../../../doc/pangomm-%{apiver}/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}/*.devhelp
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/pangomm-%{apiver}/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}
+sed -i 's:../../../doc/pangomm-%{apiver}/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}/*.devhelp2
 rm -r ${RPM_BUILD_ROOT}%{_docdir}/pangomm-%{apiver}
 
 
@@ -87,10 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/pangomm-%{apiver}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/pangomm-%{apiver}
 %{_datadir}/gtk-doc/html/pangomm-%{apiver}
 
 
 %changelog
+* Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.25.1.3-1
+- Update to upstream 2.25.1.3
+- Package pangomm libdir directory with config include header
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Apr 2009 10:26:31 -0000	1.5
+++ sources	14 Sep 2009 09:14:51 -0000	1.6
@@ -1 +1 @@
-fa0f44c37499433455857becad4bbcda  pangomm-2.24.0.tar.bz2
+e9aac0019cb56350ceb5fcb316f2797c  pangomm-2.25.1.3.tar.bz2



From denis at fedoraproject.org  Mon Sep 14 09:18:57 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 14 Sep 2009 09:18:57 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.34, 1.35 gtkmm.spec, 1.53,
	1.54 sources, 1.36, 1.37
Message-ID: <20090914091857.1E2C511C00EC@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8994

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
- Update to upstream 2.25.1.3
- Package pangomm libdir directory with config include header



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	16 Aug 2009 17:26:50 -0000	1.34
+++ .cvsignore	14 Sep 2009 09:18:56 -0000	1.35
@@ -1 +1 @@
-gtkmm-2.17.2.tar.bz2
+gtkmm-2.17.11.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gtkmm.spec	16 Aug 2009 17:26:50 -0000	1.53
+++ gtkmm.spec	14 Sep 2009 09:18:56 -0000	1.54
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.17.2
+Version:        2.17.11
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  glibmm24-devel >= 2.21.2
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel
-BuildRequires:  gtk2-devel >= 2.17.4
+BuildRequires:  gtk2-devel >= 2.17.11
 BuildRequires:  cairomm-devel >= 1.2.2
 BuildRequires:  pangomm-devel >= 2.14.0
 
@@ -63,17 +63,21 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT docs-to-include
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation, put everything under gtk-doc
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
 mv ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/*.devhelp ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
-sed -i 's:../../../doc/gtkmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
+sed -i 's:../../../doc/gtkmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp2
 rm -r ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4
 
+# Move demo examples into devel doc directory
+mkdir docs-to-include
+mv ${RPM_BUILD_ROOT}%{_datadir}/gtkmm-2.4/demo docs-to-include/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root, -)
-%doc CHANGES PORTING
+%doc CHANGES PORTING docs-to-include/*
 %{_includedir}/gtkmm-2.4
 %{_includedir}/atkmm-1.6
 %{_includedir}/gdkmm-2.4
@@ -110,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.17.11-1
+- Update to upstream 2.17.11
+- Added demo code to devel package doc directory
+
 * Sun Aug 16 2009 Denis Leroy <denis at poolshark.org> - 2.17.2-1
 - Update to upstream 2.17.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	16 Aug 2009 17:26:50 -0000	1.36
+++ sources	14 Sep 2009 09:18:56 -0000	1.37
@@ -1 +1 @@
-fdb4932b254c270c0023addd6c2ec420  gtkmm-2.17.2.tar.bz2
+17c651028978e1ecb182f0d387a253b5  gtkmm-2.17.11.tar.bz2



From nphilipp at fedoraproject.org  Mon Sep 14 09:46:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 14 Sep 2009 09:46:58 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.77, 1.78 sources, 1.86,
	1.87 system-config-users.spec, 1.94, 1.95
Message-ID: <20090914094659.0F60111C00EC@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18345

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
use str.startswith() method (#523068)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	3 Sep 2009 13:03:12 -0000	1.77
+++ .cvsignore	14 Sep 2009 09:46:57 -0000	1.78
@@ -1 +1 @@
-system-config-users-1.2.90.tar.bz2
+system-config-users-1.2.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	3 Sep 2009 13:03:13 -0000	1.86
+++ sources	14 Sep 2009 09:46:57 -0000	1.87
@@ -1 +1 @@
-9a901c52d40ac62c5cfffec89e854b7e  system-config-users-1.2.90.tar.bz2
+c61f9911a8275aa969e7c8ce4be0b050  system-config-users-1.2.91.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- system-config-users.spec	3 Sep 2009 13:03:13 -0000	1.94
+++ system-config-users.spec	14 Sep 2009 09:46:57 -0000	1.95
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.90
+Version: 1.2.91
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -127,6 +127,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.2.91-1
+- use str.startswith() method (#523068)
+
 * Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> - 1.2.90-1
 - import gettext from each module again
 - use gtk.ComboBoxEntry instead of gtk.Combo
@@ -141,6 +144,9 @@ fi
 * Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
 - explain obsoleting old versions
 
+* Wed Jun 10 2009 Nils Philippsen <nils at redhat.com>
+- avoid duplicate shortcuts in main window (#275621)
+
 * Wed Jun 03 2009 Nils Philippsen <nils at redhat.com> - 1.2.87-1
 - handle 64bit uids/gids (#503821)
 



From tagoh at fedoraproject.org  Mon Sep 14 09:49:53 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 14 Sep 2009 09:49:53 +0000 (UTC)
Subject: rpms/im-chooser/devel .cvsignore, 1.31, 1.32 im-chooser.spec, 1.58, 
	1.59 sources, 1.30, 1.31
Message-ID: <20090914094953.5DDAB11C00EC@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Mon Sep 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
- New upstream release.
  - translation updates only.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	23 Feb 2009 14:46:44 -0000	1.31
+++ .cvsignore	14 Sep 2009 09:49:52 -0000	1.32
@@ -31,3 +31,4 @@ im-chooser-1.2.3.tar.bz2
 im-chooser-1.2.4.tar.bz2
 im-chooser-1.2.5.tar.bz2
 im-chooser-1.2.6.tar.bz2
+im-chooser-1.2.7.tar.bz2


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- im-chooser.spec	25 Jul 2009 03:17:20 -0000	1.58
+++ im-chooser.spec	14 Sep 2009 09:49:53 -0000	1.59
@@ -1,6 +1,6 @@
 Name:		im-chooser
-Version:	1.2.6
-Release:	4%{?dist}
+Version:	1.2.7
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,9 +33,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-sed -i -e 's/^\(OnlyShowIn\): \(.*\)$/\1=\2/' $RPM_BUILD_ROOT%{_datadir}/applications/xfce4-im-chooser.desktop
-touch -r src/xfce4-im-chooser.desktop $RPM_BUILD_ROOT%{_datadir}/applications/xfce4-im-chooser.desktop
-
 desktop-file-install --vendor=fedora                            \
         --add-category=X-GNOME-PersonalSettings                 \
         --delete-original                                       \
@@ -58,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
+- New upstream release.
+  - translation updates only.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	23 Feb 2009 14:46:44 -0000	1.30
+++ sources	14 Sep 2009 09:49:53 -0000	1.31
@@ -1 +1 @@
-a19cbe60de3702af59280f630bcbc384  im-chooser-1.2.6.tar.bz2
+229cbb124082224a8f6d1bab207248b3  im-chooser-1.2.7.tar.bz2



From jsafrane at fedoraproject.org  Mon Sep 14 09:53:26 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon, 14 Sep 2009 09:53:26 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec, 1.187, 1.188 net-snmpd.init, 1.7,
	1.8 net-snmptrapd.init, 1.4, 1.5
Message-ID: <20090914095326.0E39311C00EC@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20599

Modified Files:
	net-snmp.spec net-snmpd.init net-snmptrapd.init 
Log Message:
implement force-reload command in initscripts
Resolves: #523126


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- net-snmp.spec	21 Aug 2009 14:40:21 -0000	1.187
+++ net-snmp.spec	14 Sep 2009 09:53:25 -0000	1.188
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -429,6 +429,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
+* Mon Sep 14 2009 Jan Safranek <orion at cora.nwra.com> 1:5.4.2.1-17
+- implement force-reload command in initscripts (#523126)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:5.4.2.1-16
 - rebuilt with new openssl
 


Index: net-snmpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmpd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- net-snmpd.init	9 Jul 2009 12:19:27 -0000	1.7
+++ net-snmpd.init	14 Sep 2009 09:53:25 -0000	1.8
@@ -95,7 +95,7 @@ case "$1" in
 	restart
 	RETVAL=$?
         ;;
-  reload)
+  reload|force-reload)
 	reload
 	RETVAL=$?
         ;;
@@ -108,7 +108,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
 	RETVAL=2
 esac
 


Index: net-snmptrapd.init
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmptrapd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- net-snmptrapd.init	28 Jan 2008 12:49:25 -0000	1.4
+++ net-snmptrapd.init	14 Sep 2009 09:53:25 -0000	1.5
@@ -84,7 +84,7 @@ case "$1" in
 	restart
 	RETVAL=$?
         ;;
-  reload)
+  reload|force-reload)
 	reload
 	RETVAL=$?
         ;;
@@ -97,7 +97,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
 	RETVAL=2
 esac
 



From jreznik at fedoraproject.org  Mon Sep 14 09:56:47 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 14 Sep 2009 09:56:47 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.11,
	1.12 kde-plasma-runcommand.spec, 1.15, 1.16 sources, 1.11, 1.12
Message-ID: <20090914095647.5505811C00EC@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21798

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.1-1
- update to 2.1
- requires KDE 4.3
- translations added



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Aug 2009 12:57:03 -0000	1.11
+++ .cvsignore	14 Sep 2009 09:56:47 -0000	1.12
@@ -1 +1 @@
-91495-runcommand-2.0.tar.bz2
+91495-runcommand-2.1.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kde-plasma-runcommand.spec	7 Aug 2009 13:14:32 -0000	1.15
+++ kde-plasma-runcommand.spec	14 Sep 2009 09:56:47 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -11,7 +11,7 @@ Source0:        http://www.kde-look.org/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext
 
 %description
@@ -36,18 +36,24 @@ make VERBOSE=1 %{?_smp_mflags} -C %{_tar
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f plasma_applet_runcommand.lang
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.1-1
+- update to 2.1
+- requires KDE 4.3
+- translations added
+
 * Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
 - gettext BR readded
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Aug 2009 12:57:03 -0000	1.11
+++ sources	14 Sep 2009 09:56:47 -0000	1.12
@@ -1 +1 @@
-f6564295ce60a7622d03a50767a5c4bb  91495-runcommand-2.0.tar.bz2
+d9a5b05bce4d34307a74df3c56fca981  91495-runcommand-2.1.tar.bz2



From thias at fedoraproject.org  Mon Sep 14 09:59:29 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 09:59:29 +0000 (UTC)
Subject: rpms/spawn-fcgi/devel spawn-fcgi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914095929.7EF0011C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spawn-fcgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874

Modified Files:
	.cvsignore sources 
Added Files:
	spawn-fcgi.spec 
Log Message:
Initial import.



--- NEW FILE spawn-fcgi.spec ---
Summary: Simple program for spawning FastCGI processes
Name: spawn-fcgi
Version: 1.6.2
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
Source0: http://www.lighttpd.net/download/spawn-fcgi-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package contains the spawn-fcgi program used for spawning FastCGI
processes, which can be local or remote.


%prep
%setup -q


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/spawn-fcgi
%{_mandir}/man1/spawn-fcgi.1*


%changelog
* Tue Apr 21 2009 Matthias Saou <http://freshrpms.net/> 1.6.2-1
- Update to 1.6.2.
- Remove leftover -f from %%files section.

* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.6.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:59:41 -0000	1.1
+++ .cvsignore	14 Sep 2009 09:59:29 -0000	1.2
@@ -0,0 +1 @@
+spawn-fcgi-1.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:59:41 -0000	1.1
+++ sources	14 Sep 2009 09:59:29 -0000	1.2
@@ -0,0 +1 @@
+f74a8f4d8e379c53926b5eeef84b381c  spawn-fcgi-1.6.2.tar.bz2



From thias at fedoraproject.org  Mon Sep 14 10:00:10 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 10:00:10 +0000 (UTC)
Subject: rpms/synergy-plus/devel synergy-plus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914100010.7D4F411C0489@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23173

Modified Files:
	.cvsignore sources 
Added Files:
	synergy-plus.spec 
Log Message:
Initial build.



--- NEW FILE synergy-plus.spec ---
Summary: Mouse and keyboard sharing utility
Name: synergy-plus
Version: 1.3.4
Release: 2%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://code.google.com/p/synergy-plus/
Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXt-devel
BuildRequires: libXinerama-devel

%description
Synergy+ (synergy-plus) lets you easily share a single mouse and keyboard
between multiple computers with different operating systems, without special
hardware. All you need is a LAN connection. It's intended for users with
multiple computers, where each system uses its own display. It's a little
like having a 2nd or a 3rd desktop.
Synergy+ is a maintenance fork for implementing bug fixes to the original
Synergy, which hasn't received any source updates or new releases since 2006.


%prep
%setup -q
# Remove spurious executable bit from sources files
find . -type f -name '*.cpp' -executable -exec chmod -x {} \;


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
# None of the documentation files are actually useful here, they all point to
# the online website, so include just one, the README
%doc COPYING README examples/synergy.conf
%{_bindir}/synergyc
%{_bindir}/synergys


%changelog
* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-2
- Initial RPM release, based on the spec from the original synergy.
- Remove spurious executable bit from sources files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:58:42 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:00:10 -0000	1.2
@@ -0,0 +1 @@
+synergy-plus-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:58:42 -0000	1.1
+++ sources	14 Sep 2009 10:00:10 -0000	1.2
@@ -0,0 +1 @@
+2c565afe5f920d363eef38dd97449b73  synergy-plus-1.3.4.tar.gz



From mycae at fedoraproject.org  Mon Sep 14 10:11:03 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:11:03 +0000 (UTC)
Subject: rpms/givaro/F-10 givaro-config-script.patch, NONE,
	1.1 givaro-config.h, 
	NONE, 1.1 givaro.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914101103.4124411C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27827/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	givaro-config-script.patch givaro-config.h givaro.spec 
	import.log 
Log Message:
- F-10 intial import


givaro-config-script.patch:
 givaro-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE givaro-config-script.patch ---
--- givaro-config.in	2004-05-13 02:08:24.000000000 +1000
+++ givaro-config.in.new	2009-08-23 14:53:24.000000000 +1000
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@
+       	echo -n " -I${includedir} @GMP_CFLAGS@"
 	;;
 
     --libs)
-       	echo -L${libdir} -lgivaro @GMP_LIBS@ 
+       	echo -n " -L${libdir} -lgivaro @GMP_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0


--- NEW FILE givaro-config.h ---
#ifndef _GIVARO_CONFIG_H
#define _GIVARO_CONFIG_H 1

#ifndef __GIVARO_HAVE_DLFCN_H
#define __GIVARO_HAVE_DLFCN_H  1
#endif

#ifndef __GIVARO_HAVE_GMP
#define __GIVARO_HAVE_GMP  1
#endif

/* #undef __GIVARO_GMP_NO_CXX */

/* #undef __GIVARO_GMP_VERSION_3 */

#ifndef __GIVARO_HAVE_INTTYPES_H
#define __GIVARO_HAVE_INTTYPES_H  1
#endif

#ifndef __GIVARO_HAVE_MEMORY_H
#define __GIVARO_HAVE_MEMORY_H  1
#endif

#ifndef __GIVARO_HAVE_STDINT_H
#define __GIVARO_HAVE_STDINT_H  1
#endif

#ifndef __GIVARO_HAVE_STDLIB_H
#define __GIVARO_HAVE_STDLIB_H  1
#endif

#ifndef __GIVARO_HAVE_STRINGS_H
#define __GIVARO_HAVE_STRINGS_H  1
#endif

#ifndef __GIVARO_HAVE_STRING_H
#define __GIVARO_HAVE_STRING_H  1
#endif

#ifndef __GIVARO_HAVE_SYS_STAT_H
#define __GIVARO_HAVE_SYS_STAT_H  1
#endif

#ifndef __GIVARO_HAVE_SYS_TYPES_H
#define __GIVARO_HAVE_SYS_TYPES_H  1
#endif

#ifndef __GIVARO_HAVE_UNISTD_H
#define __GIVARO_HAVE_UNISTD_H  1
#endif

#ifndef __GIVARO_STDC_HEADERS
#define __GIVARO_STDC_HEADERS  1
#endif

#ifndef __GIVARO_INT8
#define __GIVARO_INT8  char
#endif

#ifndef __GIVARO_INT16
#define __GIVARO_INT16  short
#endif

#ifndef __GIVARO_INT32
#define __GIVARO_INT32  int
#endif

#ifndef __GIVARO_INT64
#define __GIVARO_INT64  long long
#endif

#ifndef __GIVARO_PACKAGE
#define __GIVARO_PACKAGE  "givaro"
#endif

#ifndef __GIVARO_PACKAGE_BUGREPORT
#define __GIVARO_PACKAGE_BUGREPORT  ""
#endif

#ifndef __GIVARO_PACKAGE_NAME
#define __GIVARO_PACKAGE_NAME  ""
#endif

#ifndef __GIVARO_PACKAGE_STRING
#define __GIVARO_PACKAGE_STRING  ""
#endif

#ifndef __GIVARO_PACKAGE_TARNAME
#define __GIVARO_PACKAGE_TARNAME  ""
#endif

#ifndef __GIVARO_PACKAGE_VERSION
#define __GIVARO_PACKAGE_VERSION  ""
#endif

#ifndef __GIVARO_VERSION
#define __GIVARO_VERSION  "3.2.13"
#endif

#endif


--- NEW FILE givaro.spec ---
Name:		givaro
Version:	3.2.15
Release:	0.2.rc1%{?dist}
Summary:	C++ library for arithmetic and algebraic computations
Group:		Development/Libraries

#GPL boilerplate missing. Upstream has been notified via email
License:	GPL+
URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
Source1:	givaro-config.h
Patch0:		givaro-config-script.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gmp-devel


%description
Givaro is a C++ library for arithmetic and algebraic computations.
Its main features are implementations of the basic arithmetic of many
mathematical entities: Primes fields, Extensions Fields, Finite Fields,
Finite Rings, Polynomials, Algebraic numbers, Arbitrary precision
integers and rationals (C++ wrappers over gmp) It also provides
data-structures and templated classes for the manipulation of basic
algebraic objects, such as vectors, matrices (dense, sparse, structured),
univariate polynomials (and therefore recursive multivariate).


%package        devel
Summary:	Files useful for %{name} development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}


%description    devel
The libraries and header files for using %{name} for development.


%package        static
Summary:	Files used for static linking with %{name}
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-devel = %{version}-%{release}


%description    static
The static libraries for using %{name} for development.


%prep
%setup -q
cp %{SOURCE1} new-givaro-config.h

sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
%patch0


%build
%configure --with-gmp --enable-shared=yes
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la

rm -f $RPM_BUILD_ROOT%{_includedir}/givaro-config.h
install -m 644 new-givaro-config.h $RPM_BUILD_ROOT%{_includedir}/givaro-config.h

#givaro-makefile is installed incorrectly in usr/bin
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
mv $RPM_BUILD_ROOT/%{_bindir}/givaro-makefile $RPM_BUILD_ROOT%{_datadir}/%{name}/
chmod 644  $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
sed -i 's|#! /bin/sh||' $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/lib%{name}.so.*


%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_includedir}/%{name}/
%{_includedir}/gmp++/
%{_datadir}/%{name}/
%{_includedir}/%{name}-config.h
%{_libdir}/lib%{name}.so


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%changelog
* Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
- Change to GPL+ from GPL2 per bugzilla comment

* Sun Aug 23 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.1.rc1
- Upgrade to 3.2.15rc1
- Modify givaro-config.in to allow multiple flags simultaneously

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 3.2.13-2
- Fix endian header to be non-endian.

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 3.2.13-1
- Initial package.


--- NEW FILE import.log ---
givaro-3_2_15-0_2_rc1_fc10:F-10:givaro-3.2.15-0.2.rc1.fc10.src.rpm:1252923450


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:56:28 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:11:02 -0000	1.2
@@ -0,0 +1 @@
+givaro-3.2.15rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:56:28 -0000	1.1
+++ sources	14 Sep 2009 10:11:02 -0000	1.2
@@ -0,0 +1 @@
+f0b754ee54bcac0e866f2979b57393ba  givaro-3.2.15rc1.tar.gz



From mycae at fedoraproject.org  Mon Sep 14 10:13:32 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:13:32 +0000 (UTC)
Subject: rpms/givaro/F-11 givaro-config-script.patch, NONE,
	1.1 givaro-config.h, 
	NONE, 1.1 givaro.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914101332.EDF4811C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28808/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	givaro-config-script.patch givaro-config.h givaro.spec 
	import.log 
Log Message:
- F-11 initial import


givaro-config-script.patch:
 givaro-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE givaro-config-script.patch ---
--- givaro-config.in	2004-05-13 02:08:24.000000000 +1000
+++ givaro-config.in.new	2009-08-23 14:53:24.000000000 +1000
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@
+       	echo -n " -I${includedir} @GMP_CFLAGS@"
 	;;
 
     --libs)
-       	echo -L${libdir} -lgivaro @GMP_LIBS@ 
+       	echo -n " -L${libdir} -lgivaro @GMP_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0


--- NEW FILE givaro-config.h ---
#ifndef _GIVARO_CONFIG_H
#define _GIVARO_CONFIG_H 1

#ifndef __GIVARO_HAVE_DLFCN_H
#define __GIVARO_HAVE_DLFCN_H  1
#endif

#ifndef __GIVARO_HAVE_GMP
#define __GIVARO_HAVE_GMP  1
#endif

/* #undef __GIVARO_GMP_NO_CXX */

/* #undef __GIVARO_GMP_VERSION_3 */

#ifndef __GIVARO_HAVE_INTTYPES_H
#define __GIVARO_HAVE_INTTYPES_H  1
#endif

#ifndef __GIVARO_HAVE_MEMORY_H
#define __GIVARO_HAVE_MEMORY_H  1
#endif

#ifndef __GIVARO_HAVE_STDINT_H
#define __GIVARO_HAVE_STDINT_H  1
#endif

#ifndef __GIVARO_HAVE_STDLIB_H
#define __GIVARO_HAVE_STDLIB_H  1
#endif

#ifndef __GIVARO_HAVE_STRINGS_H
#define __GIVARO_HAVE_STRINGS_H  1
#endif

#ifndef __GIVARO_HAVE_STRING_H
#define __GIVARO_HAVE_STRING_H  1
#endif

#ifndef __GIVARO_HAVE_SYS_STAT_H
#define __GIVARO_HAVE_SYS_STAT_H  1
#endif

#ifndef __GIVARO_HAVE_SYS_TYPES_H
#define __GIVARO_HAVE_SYS_TYPES_H  1
#endif

#ifndef __GIVARO_HAVE_UNISTD_H
#define __GIVARO_HAVE_UNISTD_H  1
#endif

#ifndef __GIVARO_STDC_HEADERS
#define __GIVARO_STDC_HEADERS  1
#endif

#ifndef __GIVARO_INT8
#define __GIVARO_INT8  char
#endif

#ifndef __GIVARO_INT16
#define __GIVARO_INT16  short
#endif

#ifndef __GIVARO_INT32
#define __GIVARO_INT32  int
#endif

#ifndef __GIVARO_INT64
#define __GIVARO_INT64  long long
#endif

#ifndef __GIVARO_PACKAGE
#define __GIVARO_PACKAGE  "givaro"
#endif

#ifndef __GIVARO_PACKAGE_BUGREPORT
#define __GIVARO_PACKAGE_BUGREPORT  ""
#endif

#ifndef __GIVARO_PACKAGE_NAME
#define __GIVARO_PACKAGE_NAME  ""
#endif

#ifndef __GIVARO_PACKAGE_STRING
#define __GIVARO_PACKAGE_STRING  ""
#endif

#ifndef __GIVARO_PACKAGE_TARNAME
#define __GIVARO_PACKAGE_TARNAME  ""
#endif

#ifndef __GIVARO_PACKAGE_VERSION
#define __GIVARO_PACKAGE_VERSION  ""
#endif

#ifndef __GIVARO_VERSION
#define __GIVARO_VERSION  "3.2.13"
#endif

#endif


--- NEW FILE givaro.spec ---
Name:		givaro
Version:	3.2.15
Release:	0.2.rc1%{?dist}
Summary:	C++ library for arithmetic and algebraic computations
Group:		Development/Libraries

#GPL boilerplate missing. Upstream has been notified via email
License:	GPL+
URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
Source1:	givaro-config.h
Patch0:		givaro-config-script.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gmp-devel


%description
Givaro is a C++ library for arithmetic and algebraic computations.
Its main features are implementations of the basic arithmetic of many
mathematical entities: Primes fields, Extensions Fields, Finite Fields,
Finite Rings, Polynomials, Algebraic numbers, Arbitrary precision
integers and rationals (C++ wrappers over gmp) It also provides
data-structures and templated classes for the manipulation of basic
algebraic objects, such as vectors, matrices (dense, sparse, structured),
univariate polynomials (and therefore recursive multivariate).


%package        devel
Summary:	Files useful for %{name} development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}


%description    devel
The libraries and header files for using %{name} for development.


%package        static
Summary:	Files used for static linking with %{name}
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-devel = %{version}-%{release}


%description    static
The static libraries for using %{name} for development.


%prep
%setup -q
cp %{SOURCE1} new-givaro-config.h

sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
%patch0


%build
%configure --with-gmp --enable-shared=yes
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la

rm -f $RPM_BUILD_ROOT%{_includedir}/givaro-config.h
install -m 644 new-givaro-config.h $RPM_BUILD_ROOT%{_includedir}/givaro-config.h

#givaro-makefile is installed incorrectly in usr/bin
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
mv $RPM_BUILD_ROOT/%{_bindir}/givaro-makefile $RPM_BUILD_ROOT%{_datadir}/%{name}/
chmod 644  $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
sed -i 's|#! /bin/sh||' $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/lib%{name}.so.*


%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_includedir}/%{name}/
%{_includedir}/gmp++/
%{_datadir}/%{name}/
%{_includedir}/%{name}-config.h
%{_libdir}/lib%{name}.so


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%changelog
* Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
- Change to GPL+ from GPL2 per bugzilla comment

* Sun Aug 23 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.1.rc1
- Upgrade to 3.2.15rc1
- Modify givaro-config.in to allow multiple flags simultaneously

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 3.2.13-2
- Fix endian header to be non-endian.

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 3.2.13-1
- Initial package.


--- NEW FILE import.log ---
givaro-3_2_15-0_2_rc1_fc10:F-11:givaro-3.2.15-0.2.rc1.fc10.src.rpm:1252923597


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:56:28 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:13:32 -0000	1.2
@@ -0,0 +1 @@
+givaro-3.2.15rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:56:28 -0000	1.1
+++ sources	14 Sep 2009 10:13:32 -0000	1.2
@@ -0,0 +1 @@
+f0b754ee54bcac0e866f2979b57393ba  givaro-3.2.15rc1.tar.gz



From jreznik at fedoraproject.org  Mon Sep 14 10:18:17 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 14 Sep 2009 10:18:17 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-11 .cvsignore, 1.11,
	1.12 kde-plasma-runcommand.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <20090914101817.CF23A11C00EC@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30738

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.1-1
- update to 2.1
- requires KDE 4.3
- translations added



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Aug 2009 13:04:28 -0000	1.11
+++ .cvsignore	14 Sep 2009 10:18:17 -0000	1.12
@@ -1 +1 @@
-91495-runcommand-2.0.tar.bz2
+91495-runcommand-2.1.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/kde-plasma-runcommand.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kde-plasma-runcommand.spec	7 Aug 2009 13:22:17 -0000	1.14
+++ kde-plasma-runcommand.spec	14 Sep 2009 10:18:17 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -11,7 +11,7 @@ Source0:        http://www.kde-look.org/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext
 
 %description
@@ -36,18 +36,24 @@ make VERBOSE=1 %{?_smp_mflags} -C %{_tar
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f plasma_applet_runcommand.lang
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.1-1
+- update to 2.1
+- requires KDE 4.3
+- translations added
+
 * Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
 - gettext BR readded
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Aug 2009 13:04:28 -0000	1.11
+++ sources	14 Sep 2009 10:18:17 -0000	1.12
@@ -1 +1 @@
-f6564295ce60a7622d03a50767a5c4bb  91495-runcommand-2.0.tar.bz2
+d9a5b05bce4d34307a74df3c56fca981  91495-runcommand-2.1.tar.bz2



From mycae at fedoraproject.org  Mon Sep 14 10:18:15 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:18:15 +0000 (UTC)
Subject: rpms/givaro/devel givaro-config-script.patch, NONE,
	1.1 givaro-config.h, NONE, 1.1 givaro.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914101816.0216411C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30701/devel

Modified Files:
	.cvsignore sources 
Added Files:
	givaro-config-script.patch givaro-config.h givaro.spec 
	import.log 
Log Message:
- Devel import


givaro-config-script.patch:
 givaro-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE givaro-config-script.patch ---
--- givaro-config.in	2004-05-13 02:08:24.000000000 +1000
+++ givaro-config.in.new	2009-08-23 14:53:24.000000000 +1000
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@
+       	echo -n " -I${includedir} @GMP_CFLAGS@"
 	;;
 
     --libs)
-       	echo -L${libdir} -lgivaro @GMP_LIBS@ 
+       	echo -n " -L${libdir} -lgivaro @GMP_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0


--- NEW FILE givaro-config.h ---
#ifndef _GIVARO_CONFIG_H
#define _GIVARO_CONFIG_H 1

#ifndef __GIVARO_HAVE_DLFCN_H
#define __GIVARO_HAVE_DLFCN_H  1
#endif

#ifndef __GIVARO_HAVE_GMP
#define __GIVARO_HAVE_GMP  1
#endif

/* #undef __GIVARO_GMP_NO_CXX */

/* #undef __GIVARO_GMP_VERSION_3 */

#ifndef __GIVARO_HAVE_INTTYPES_H
#define __GIVARO_HAVE_INTTYPES_H  1
#endif

#ifndef __GIVARO_HAVE_MEMORY_H
#define __GIVARO_HAVE_MEMORY_H  1
#endif

#ifndef __GIVARO_HAVE_STDINT_H
#define __GIVARO_HAVE_STDINT_H  1
#endif

#ifndef __GIVARO_HAVE_STDLIB_H
#define __GIVARO_HAVE_STDLIB_H  1
#endif

#ifndef __GIVARO_HAVE_STRINGS_H
#define __GIVARO_HAVE_STRINGS_H  1
#endif

#ifndef __GIVARO_HAVE_STRING_H
#define __GIVARO_HAVE_STRING_H  1
#endif

#ifndef __GIVARO_HAVE_SYS_STAT_H
#define __GIVARO_HAVE_SYS_STAT_H  1
#endif

#ifndef __GIVARO_HAVE_SYS_TYPES_H
#define __GIVARO_HAVE_SYS_TYPES_H  1
#endif

#ifndef __GIVARO_HAVE_UNISTD_H
#define __GIVARO_HAVE_UNISTD_H  1
#endif

#ifndef __GIVARO_STDC_HEADERS
#define __GIVARO_STDC_HEADERS  1
#endif

#ifndef __GIVARO_INT8
#define __GIVARO_INT8  char
#endif

#ifndef __GIVARO_INT16
#define __GIVARO_INT16  short
#endif

#ifndef __GIVARO_INT32
#define __GIVARO_INT32  int
#endif

#ifndef __GIVARO_INT64
#define __GIVARO_INT64  long long
#endif

#ifndef __GIVARO_PACKAGE
#define __GIVARO_PACKAGE  "givaro"
#endif

#ifndef __GIVARO_PACKAGE_BUGREPORT
#define __GIVARO_PACKAGE_BUGREPORT  ""
#endif

#ifndef __GIVARO_PACKAGE_NAME
#define __GIVARO_PACKAGE_NAME  ""
#endif

#ifndef __GIVARO_PACKAGE_STRING
#define __GIVARO_PACKAGE_STRING  ""
#endif

#ifndef __GIVARO_PACKAGE_TARNAME
#define __GIVARO_PACKAGE_TARNAME  ""
#endif

#ifndef __GIVARO_PACKAGE_VERSION
#define __GIVARO_PACKAGE_VERSION  ""
#endif

#ifndef __GIVARO_VERSION
#define __GIVARO_VERSION  "3.2.13"
#endif

#endif


--- NEW FILE givaro.spec ---
Name:		givaro
Version:	3.2.15
Release:	0.2.rc1%{?dist}
Summary:	C++ library for arithmetic and algebraic computations
Group:		Development/Libraries

#GPL boilerplate missing. Upstream has been notified via email
License:	GPL+
URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
Source1:	givaro-config.h
Patch0:		givaro-config-script.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gmp-devel


%description
Givaro is a C++ library for arithmetic and algebraic computations.
Its main features are implementations of the basic arithmetic of many
mathematical entities: Primes fields, Extensions Fields, Finite Fields,
Finite Rings, Polynomials, Algebraic numbers, Arbitrary precision
integers and rationals (C++ wrappers over gmp) It also provides
data-structures and templated classes for the manipulation of basic
algebraic objects, such as vectors, matrices (dense, sparse, structured),
univariate polynomials (and therefore recursive multivariate).


%package        devel
Summary:	Files useful for %{name} development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}


%description    devel
The libraries and header files for using %{name} for development.


%package        static
Summary:	Files used for static linking with %{name}
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-devel = %{version}-%{release}


%description    static
The static libraries for using %{name} for development.


%prep
%setup -q
cp %{SOURCE1} new-givaro-config.h

sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
%patch0


%build
%configure --with-gmp --enable-shared=yes
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la

rm -f $RPM_BUILD_ROOT%{_includedir}/givaro-config.h
install -m 644 new-givaro-config.h $RPM_BUILD_ROOT%{_includedir}/givaro-config.h

#givaro-makefile is installed incorrectly in usr/bin
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
mv $RPM_BUILD_ROOT/%{_bindir}/givaro-makefile $RPM_BUILD_ROOT%{_datadir}/%{name}/
chmod 644  $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
sed -i 's|#! /bin/sh||' $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/lib%{name}.so.*


%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_includedir}/%{name}/
%{_includedir}/gmp++/
%{_datadir}/%{name}/
%{_includedir}/%{name}-config.h
%{_libdir}/lib%{name}.so


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%changelog
* Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
- Change to GPL+ from GPL2 per bugzilla comment

* Sun Aug 23 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.1.rc1
- Upgrade to 3.2.15rc1
- Modify givaro-config.in to allow multiple flags simultaneously

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 3.2.13-2
- Fix endian header to be non-endian.

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 3.2.13-1
- Initial package.


--- NEW FILE import.log ---
givaro-3_2_15-0_2_rc1_fc10:HEAD:givaro-3.2.15-0.2.rc1.fc10.src.rpm:1252923885


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:56:28 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:18:15 -0000	1.2
@@ -0,0 +1 @@
+givaro-3.2.15rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:56:28 -0000	1.1
+++ sources	14 Sep 2009 10:18:15 -0000	1.2
@@ -0,0 +1 @@
+f0b754ee54bcac0e866f2979b57393ba  givaro-3.2.15rc1.tar.gz



From jreznik at fedoraproject.org  Mon Sep 14 10:22:51 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 14 Sep 2009 10:22:51 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.9,
	1.10 kde-plasma-runcommand.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20090914102251.4030F11C00EC@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32557

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.1-1
- update to 2.1
- requires KDE 4.3
- translations added



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Aug 2009 13:30:44 -0000	1.9
+++ .cvsignore	14 Sep 2009 10:22:50 -0000	1.10
@@ -1 +1 @@
-91495-runcommand-2.0.tar.bz2
+91495-runcommand-2.1.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kde-plasma-runcommand.spec	7 Aug 2009 13:30:44 -0000	1.10
+++ kde-plasma-runcommand.spec	14 Sep 2009 10:22:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -11,7 +11,7 @@ Source0:        http://www.kde-look.org/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext
 
 %description
@@ -36,18 +36,24 @@ make VERBOSE=1 %{?_smp_mflags} -C %{_tar
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f plasma_applet_runcommand.lang
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.1-1
+- update to 2.1
+- requires KDE 4.3
+- translations added
+
 * Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
 - gettext BR readded
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	7 Aug 2009 13:30:44 -0000	1.10
+++ sources	14 Sep 2009 10:22:50 -0000	1.11
@@ -1 +1 @@
-f6564295ce60a7622d03a50767a5c4bb  91495-runcommand-2.0.tar.bz2
+d9a5b05bce4d34307a74df3c56fca981  91495-runcommand-2.1.tar.bz2



From jzeleny at fedoraproject.org  Mon Sep 14 10:28:16 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 14 Sep 2009 10:28:16 +0000 (UTC)
Subject: rpms/fcoe-utils/devel fcoe-utils-1.0.8-init-LSB.patch, NONE,
	1.1 fcoe-utils.spec, 1.7, 1.8
Message-ID: <20090914102816.8663D11C00EC@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2078

Modified Files:
	fcoe-utils.spec 
Added Files:
	fcoe-utils-1.0.8-init-LSB.patch 
Log Message:
Update of init script to be LSB-compliant

fcoe-utils-1.0.8-init-LSB.patch:
 initd.fedora |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE fcoe-utils-1.0.8-init-LSB.patch ---
--- fcoe-utils-1.0.8/etc/initd/initd.fedora.orig	2009-09-14 09:40:57.000000000 +0200
+++ fcoe-utils-1.0.8/etc/initd/initd.fedora	2009-09-14 11:06:34.000000000 +0200
@@ -231,11 +231,13 @@
 
 service_status()
 {
+	status=0
 	pidof $FCOEMON
 	if [ $? -eq 0 ]; then
 		echo "$FCOEMON -- RUNNING, pid=`cat $PID_FILE`"
 	else
 		echo "$FCOEMON -- UNUSED"
+		status=3
 	fi
 	IF_LIST=`$FCOEADM -i 2>&1 | \
 		awk '/Symbolic Name:/{print $6}' | \
@@ -244,9 +246,15 @@
 		echo "No interfaces created."
 	else
 		echo "Created interfaces: $IF_LIST"
+		status=0
 	fi
-	test -f /var/lock/subsys/fcoe
-	return $@
+  if [ -f /var/lock/subsys/fcoe -a $status -eq 3 ]; then
+    status=2
+  fi
+  if [ -f /var/run/fcoe.pid -a $status -eq 3 ]; then
+    status=1
+  fi
+	return $status
 }
 
 case "$1" in


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fcoe-utils.spec	31 Jul 2009 17:51:10 -0000	1.7
+++ fcoe-utils.spec	14 Sep 2009 10:28:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -16,6 +16,7 @@ Source1:        quickstart.txt
 Patch0:         fcoe-utils-1.0.7-init.patch
 Patch1:         fcoe-utils-1.0.7-init-condrestart.patch
 Patch2:         fcoe-utils-1.0.8-includes.patch
+Patch3:         fcoe-utils-1.0.8-init-LSB.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libhbaapi-devel dcbd-devel libtool automake kernel-devel
@@ -34,6 +35,7 @@ fcoemon - service to configure DCB Ether
 %patch0 -p1 -b .initPatch
 %patch1 -p1 -b .condrestartPatch
 %patch2 -p1 -b .includes-fix
+%patch3 -p1 -b .initLSB
 
 %build
 ./bootstrap.sh
@@ -96,6 +98,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-3
+- update of init script to be LSB-compliant
+
 * Fri Jul 31 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-2
 - patch for clean compilation without usage of upstream's ugly hack
 



From pghmcfc at fedoraproject.org  Mon Sep 14 10:34:27 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon, 14 Sep 2009 10:34:27 +0000 (UTC)
Subject: rpms/perl-Sysadm-Install/devel .cvsignore, 1.6,
	1.7 perl-Sysadm-Install.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090914103427.4178B11C00EC@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Sysadm-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4149

Modified Files:
	.cvsignore perl-Sysadm-Install.spec sources 
Log Message:
Update to 0.33
- No longer require perl(Encode)
- Use perl(LWP::UserAgent) rather than perl(LWP::Simple)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Sep 2009 10:13:34 -0000	1.6
+++ .cvsignore	14 Sep 2009 10:34:26 -0000	1.7
@@ -1 +1 @@
-Sysadm-Install-0.32.tar.gz
+Sysadm-Install-0.33.tar.gz


Index: perl-Sysadm-Install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/perl-Sysadm-Install.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Sysadm-Install.spec	1 Sep 2009 10:13:34 -0000	1.7
+++ perl-Sysadm-Install.spec	14 Sep 2009 10:34:26 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:	Typical installation tasks for system administrators
 Name:		perl-Sysadm-Install
-Version:	0.32
+Version:	0.33
 Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -18,13 +18,14 @@ BuildRequires:	perl(File::Copy)
 BuildRequires:	perl(File::Path)
 BuildRequires:	perl(File::Temp) >= 0.16
 BuildRequires:	perl(Log::Log4perl) >= 1.00
-BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(LWP::UserAgent)
 BuildRequires:	perl(Term::ReadKey)
 # For test suite
 BuildRequires:	perl(Test::More)
 # Runtime deps not automatically picked up by RPM
 Requires:	perl(Archive::Tar)
 Requires:	perl(Expect)
+Requires:	perl(LWP::UserAgent)
 
 %description
 "Sysadm::Install" executes shell-like commands performing typical
@@ -72,6 +73,11 @@ everything, but suppresses any write act
 %{_mandir}/man3/Sysadm::Install.3pm*
 
 %changelog
+* Mon Sep 14 2009 Paul Howarth <paul at city-fan.org> 0.33-1
+- Update to 0.33
+  - No longer require perl(Encode)
+  - Use perl(LWP::UserAgent) rather than perl(LWP::Simple)
+
 * Tue Sep  1 2009 Paul Howarth <paul at city-fan.org> 0.32-1
 - Update to 0.32 (make UTF-8 handling configurable, not automatic)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	1 Sep 2009 10:13:34 -0000	1.6
+++ sources	14 Sep 2009 10:34:27 -0000	1.7
@@ -1 +1 @@
-665bdb7e37c74ee32b0aa4d0e782fe17  Sysadm-Install-0.32.tar.gz
+46b680a62c4f90821cbe17c858f64b54  Sysadm-Install-0.33.tar.gz



From caolanm at fedoraproject.org  Mon Sep 14 10:40:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Sep 2009 10:40:32 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2004,
	1.2005 sources, 1.373, 1.374
Message-ID: <20090914104032.76E5E11C0489@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7044

Modified Files:
	openoffice.org.spec sources 
Log Message:
disable NumberFormatRecognition from default writer configuration


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2004
retrieving revision 1.2005
diff -u -p -r1.2004 -r1.2005
--- openoffice.org.spec	14 Sep 2009 08:11:49 -0000	1.2004
+++ openoffice.org.spec	14 Sep 2009 10:40:31 -0000	1.2005
@@ -3763,8 +3763,9 @@ update-desktop-database %{_datadir}/appl
 %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_writer_types.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_web_bf_types.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_writer_bf_types.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Writer
-%{basisinstdir}/share/registry/modules/org/openoffice/Writer/TableNumberRecognition.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer/TableNumberRecognition.xcu
 %dir %{basisinstdir}/share/registry/schema
 %dir %{basisinstdir}/share/registry/schema/org
 %dir %{basisinstdir}/share/registry/schema/org/openoffice
@@ -4247,6 +4248,7 @@ fi
 * Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
 - make oo.o buildable without langpacks again
 - Resolves: rhbz#523106 [indic] changed names of lohit-* fonts
+- disable NumberFormatRecognition from default writer configuration
 
 * Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- sources	20 Aug 2009 19:28:15 -0000	1.373
+++ sources	14 Sep 2009 10:40:32 -0000	1.374
@@ -3,8 +3,8 @@ e3a0b76dcd876f3d721ee7183729153d  unowin
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
+39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 f3842c64faf98fe9a8752e4a820c97bc  acor_en-GB.dat



From caolanm at fedoraproject.org  Mon Sep 14 10:42:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Sep 2009 10:42:22 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2005,1.2006
Message-ID: <20090914104222.B5BE911C0489@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7736

Modified Files:
	openoffice.org.spec 
Log Message:
disable NumberFormatRecognition from default writer configuration


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2005
retrieving revision 1.2006
diff -u -p -r1.2005 -r1.2006
--- openoffice.org.spec	14 Sep 2009 10:40:31 -0000	1.2005
+++ openoffice.org.spec	14 Sep 2009 10:42:22 -0000	1.2006
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4245,10 +4245,12 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
+- disable NumberFormatRecognition from default writer configuration
+
 * Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
 - make oo.o buildable without langpacks again
 - Resolves: rhbz#523106 [indic] changed names of lohit-* fonts
-- disable NumberFormatRecognition from default writer configuration
 
 * Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch



From rhughes at fedoraproject.org  Mon Sep 14 10:44:55 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 14 Sep 2009 10:44:55 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel .cvsignore, 1.15,
	1.16 DeviceKit-power.spec, 1.23, 1.24 sources, 1.15,
	1.16 DeviceKit-power-010-continue-to-poll-when-guessing.patch,
	1.1, NONE
Message-ID: <20090914104455.0A9FA11C00EC@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8677

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Removed Files:
	DeviceKit-power-010-continue-to-poll-when-guessing.patch 
Log Message:
* Mon Sep 14 2009 Richard Hughes  <rhughes at redhat.com> - 011-0.1.20090914git
- Update to todays git snapshot to fix the session exploding when a USB UPS is
  inserted then removed a few times.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Jul 2009 12:15:57 -0000	1.15
+++ .cvsignore	14 Sep 2009 10:44:54 -0000	1.16
@@ -1 +1 @@
-DeviceKit-power-010.tar.gz
+DeviceKit-power-011-20090914.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- DeviceKit-power.spec	3 Aug 2009 14:44:36 -0000	1.23
+++ DeviceKit-power.spec	14 Sep 2009 10:44:54 -0000	1.24
@@ -3,23 +3,20 @@
 %define dbus_glib_version       0.70
 %define polkit_version          0.92
 %define parted_version          1.8.8
-%define alphatag                20090616
+%define alphatag                20090914
 
 Summary: Power Management Service
 Name: DeviceKit-power
-Version: 010
-#Release: 0.4.%{?alphatag}git%{?dist}
-Release: 4%{?dist}
+Version: 011
+Release: 0.1.%{?alphatag}git%{?dist}
+#Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/
-#Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+#Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-# upstream, 91c1718f6367f9855847611a62365a65d0557d59
-Patch1: DeviceKit-power-010-continue-to-poll-when-guessing.patch
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -53,9 +50,8 @@ Requires: %{name} = %{version}-%{release
 Headers and libraries for DeviceKit-power.
 
 %prep
-%setup -q
-%patch1 -p1 -b .poll-when-guessing
-#%setup -q -n %{?name}-%{?version}-%{?alphatag}
+#%setup -q
+%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure
@@ -113,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Mon Sep 14 2009 Richard Hughes  <rhughes at redhat.com> - 011-0.1.20090914git
+- Update to todays git snapshot to fix the session exploding when a USB UPS is
+  inserted then removed a few times.
+
 * Mon Aug 03 2009 Richard Hughes <richard at hughsie.com> - 010-4
 - Continue to poll when we guessed a status value, and only stop when the
   kernel says definitively that we are fully charged.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Jul 2009 12:15:58 -0000	1.15
+++ sources	14 Sep 2009 10:44:54 -0000	1.16
@@ -1 +1 @@
-ab6d840efd70b4dcc6008782454e5e7a  DeviceKit-power-010.tar.gz
+3c19e1040d34657a988e8374219cd576  DeviceKit-power-011-20090914.tar.gz


--- DeviceKit-power-010-continue-to-poll-when-guessing.patch DELETED ---



From mycae at fedoraproject.org  Mon Sep 14 10:45:37 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:45:37 +0000 (UTC)
Subject: rpms/mathgl/EL-5 import.log, NONE, 1.1 mathgl-info.patch, NONE,
	1.1 mathgl-io.patch, NONE, 1.1 mathgl-no-mglwx.patch, NONE,
	1.1 mathgl-png.patch, NONE, 1.1 mathgl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914104537.E182011C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8957/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mathgl-info.patch mathgl-io.patch 
	mathgl-no-mglwx.patch mathgl-png.patch mathgl.spec 
Log Message:
- EL-5 import



--- NEW FILE import.log ---
mathgl-1_9-6_fc10:EL-5:mathgl-1.9-6.fc10.src.rpm:1252925436

mathgl-info.patch:
 mathgl.texi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-info.patch ---
Index: mathgl/texinfo/mathgl.texi
===================================================================
--- texinfo/mathgl.texi	2009-03-04 13:22:15.000000000 +0000
+++ texinfo/mathgl.texi	2009-05-27 17:39:59.000000000 +0100
@@ -25,10 +25,10 @@
 @end quotation
 @end copying
 
- at c @dircategory MathGL documentation system
- at c @direntry
- at c * MathGL: (mathgl). The library for scientific graphics.
- at c @end direntry
+ at dircategory MathGL documentation system
+ at direntry
+* MathGL: (mathgl). The library for scientific graphics.
+ at end direntry
 
 @titlepage
 @title MathGL


mathgl-io.patch:
 mgl_data_io.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-io.patch ---
--- mgl/mgl_data_io.cpp	2009-07-02 01:49:42.000000000 +1000
+++ mgl/mgl_data_io.cpp.new	2009-07-25 12:16:55.000000000 +1000
@@ -918,7 +918,7 @@
 	hid_t hf,hd,hs;
 	hsize_t dims[3];
 	long rank = 3, res;
-	H5Eset_auto(0,0);
+	H5Eset_auto2(0,0,0);
 	res=H5Fis_hdf5(fname);
 	if(res>0 && !rewrite)	hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 	else	hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -928,10 +928,10 @@
 	else	{	rank = 3;	dims[0] = nz;	dims[1] = ny;	dims[2] = nx;	}
 	hs = H5Screate_simple(rank, dims, 0);
 #if(MGL_USE_DOUBLE==1)
-	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a);
 #else
-	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a);
 #endif
 	H5Dclose(hd);	H5Sclose(hs);	H5Fclose(hf);
@@ -943,7 +943,7 @@
 	hsize_t dims[3];
 	long rank;
 	hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-	hd = H5Dopen(hf,data);
+	hd = H5Dopen(hf,data,H5P_DEFAULT);
 	hs = H5Dget_space(hd);
 	rank = H5Sget_simple_extent_ndims(hs);
 	if(rank>0 && rank<=3)

mathgl-no-mglwx.patch:
 examples/Makefile.am |    8 ++++----
 widgets/Makefile.am  |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE mathgl-no-mglwx.patch ---
--- widgets/Makefile.am.orig	2009-08-15 12:35:36.000000000 +1000
+++ widgets/Makefile.am	2009-08-15 12:35:27.000000000 +1000
@@ -18,11 +18,11 @@
 endif
 
 if USE_WX
-lib_LTLIBRARIES += libmgl-wx.la
-libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
-libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
-libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-libmgl_wx_la_SOURCES = mgl_wx.cpp
+#lib_LTLIBRARIES += libmgl-wx.la
+#libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
+#libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
+#libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#libmgl_wx_la_SOURCES = mgl_wx.cpp
 endif
 
 if USE_QT
--- examples/Makefile.am.orig	2009-08-15 12:55:36.000000000 +1000
+++ examples/Makefile.am	2009-08-15 12:55:29.000000000 +1000
@@ -24,10 +24,10 @@
 endif
 
 if USE_WX
-bin_PROGRAMS += mgl_wx_example
-mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
-mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-mgl_wx_example_SOURCES = wx_example.cpp
+#bin_PROGRAMS += mgl_wx_example
+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#mgl_wx_example_SOURCES = wx_example.cpp
 endif
 
 if USE_QT

mathgl-png.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mathgl-png.patch ---
--- texinfo/png/Makefile.am	2009-07-02 01:50:09.000000000 +1000
+++ texinfo/png/Makefile.am.new	2009-07-25 12:36:15.000000000 +1000
@@ -18,7 +18,7 @@
 type2.png	vect3.png	vectc3.png	vectc.png	vect.png
 
 pngdir = $(docdir)/png
-png_DATA = all.png $(png_images)
+png_DATA = all.png 
 CLEANFILES = all.png $(png_images)
 all.png: hotdogs.pts
 	$(top_builddir)/examples/mgl_example


--- NEW FILE mathgl.spec ---
%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
Name: mathgl
Version: 1.9
Release: 6%{?dist}
Summary: Cross-platform library for making high-quality scientific graphics
Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
License: GPLv2+
Group: Development/Libraries
Url: http://mathgl.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz

#Fix missing default parameter in hdf5 code 
Patch0: %{name}-io.patch
#Patch to fix parallel build issue (from debian pts)
Patch1: %{name}-png.patch
#Uncomment mathgl dif listing (fix warning) also from pts
Patch2: %{name}-info.patch
#Remove empty libmgl-wx from compilation
Patch3: %{name}-no-mglwx.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# mandatory packages
BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool 
BuildRequires: swig 

# optional packages
BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
BuildRequires: wxGTK-devel giflib-devel octave-devel

#For autoreconf (required for patch1, libtool)
BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	libtool

Requires(post): info
Requires(preun): info

Requires: octave(api) = %{octave_api}

%description
Mathgl is a cross-platform library for making high-quality scientific
graphics. It provides fast data plotting and handling of large data
arrays, as well as  window and console modes and for easy embedding
into other programs. Mathgl integrates into fltk, qt and
opengl applications

%package devel
Summary: Libraries and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%description devel -l ru
????? %{name}-devel ???????? ?????????? ? ????? ?????????? ??????????? 
??? ?????????? ?????????? ? ?????????????? %{name}.

%package doc
Group:		Documentation
Summary:	HTML documentation and tutorial for the %{name} applications

BuildArch:	noarch
BuildRequires:	texi2html texinfo-tex	


%description doc
This package contains the documentation in the HTML format of the %{name}
package.

%prep
%setup -q

#convert EOL encodings, maintaining timestames
for file in AUTHORS ChangeLog.txt README COPYRIGHT; do
	sed 's/\r//' $file > $file.new && \
	touch -r $file $file.new && \
	mv $file.new $file
done

%patch0
%patch1
%patch2
%patch3

autoreconf


%build
#configure looks for * not *-qt4
QMAKE=/usr/bin/qmake-qt4
LUPDATE=/usr/bin/lupdate-qt4
LRELEASE=/usr/bin/lrelease-qt4

%configure	--disable-static \
		--enable-shared \
		--enable-all --enable-octave --disable-rpath

#Force strip 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

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/widgets/.libs/:`pwd`/mgl/.libs

make %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

#Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la


#Fix up octave .oct file install
mkdir -p temp-octave

pushd .
cd temp-octave
#Decompress tarballed "oct" file and remove tarball
tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz

#Copy the .oct file and supporting files to octave packages dir
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
#Remove empty INDEX file
rm %{name}/INDEX

#We cannot use version macro with octave package search,
# as pkg.m assumes a x.y.z format for packages. Failing
# to do this renders the plugin inoperable
cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/

#packinfo dir is required, or octave will not find the dir in recursive search
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo

popd



pushd .
#Lets build a "docs" dir to maintain the dir relationships needed for html files
mkdir -p  texinfo/docs
cd texinfo/docs/
cp -pr ../mathgl.html .
cp -pr ../png_static .
cp -pr ../png/ .

#remove zero length faux PNG file
rm -f png/all.png

popd

#remove installed docs, which we are installing via doc macro
rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}

#remove misplaced info "dir" file
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir

%post 
/sbin/ldconfig
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
octave -q -H --no-site-file --eval "pkg('rebuild');"

%preun
if [ $1 = 0 ] ; then
	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%postun
/sbin/ldconfig
octave -q -H --no-site-file --eval "pkg('rebuild');"

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog.txt README COPYING COPYRIGHT NEWS TODO
%{_libdir}/*.so.*
%{_bindir}/mgl*
%{_datadir}/%{name}/
%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
%{_datadir}/octave/packages/%{name}-1.9.0/
%{_infodir}/%{name}.*.gz


%files devel
%defattr(-,root,root,-)
%{_includedir}/mgl/
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc texinfo/docs/*

%changelog
* Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
- Add COPYING to doc

* Sat Sep 12 2009 <mycae(a!t)yahoo.com> 1.9-5
- Removed the word "static" from devel description, as doesn't have static
- Fonts now owned at datadir/name level
- Added COPYRIGHT NEWS and TODO

* Sat Aug 15 2009 <mycae(a!t)yahoo.com> 1.9-4
- Fix octave installation method
- Remove wx lib, which doesn't have meaningful code.

* Sun Aug 02 2009  <mycae(a!t)yahoo.com> 1.9-3
- Fix texinfo install (mv to main & add pre/post)
- Remove chrpath, as we now autoreconf
- Add octave pkg rebuild commands

* Tue Jul 21 2009  <mycae(a!t)yahoo.com> 1.9-2 
- Fix rpath for build on x86_64. 
- remove unrecognized configure options: --enable-tiff, --disable-ltdl-install
- Switch to --enable-all --enable-octave
- Add hdf5 patch
- Add doc subpackage

* Thu Jul 09 2009 <mycae(a!t)yahoo.com> 1.9-1
- Update to 1.9
- Drop explicit Requires
- Perserve timestamps on EOL conversion
- Added patch to disable unused gsl cblas link

* Fri May 02 2009 <mycae(a!t)yahoo.com> 1.8.1-1
- Update to 1.8.1

* Wed Jan 28 2009 <mycae(a!t)yahoo.com> 1.8-3
- Ensure timestamps are preserved during make install
- Modify defattr
- Remove UDAV from package summary

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-2
- Remove redundant and erroneous licence field in devel section
- Fix files from mgl/*h to mgl/
- Removed Requires, per bugzilla recommendation.
- Disabled static library generation
- Removed libltdl from build 
- Added libtool-ltdl as BuildRequires

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-1
- Updated to version 1.8
- Added QT env. vars for fedora
- Cleaned up description
- Change licence field from GPL to GPLv2

* Wed Jun 4 2008 Nik <niktr at mail.ru> 
- disabled hdf5 support according to developer request

* Tue Jun 3 2008 Nik <niktr at mail.ru> 
- updated to version 1.7.1

* Sun Jun 2 2008 Nik <niktr at mail.ru> 
- updated to version 1.7

* Sat Apr 5 2008 Nik <niktr at mail.ru> 
- updated to version 1.6.2

* Thu Mar 13 2008 Nik <niktr at mail.ru>
- updated to version 1.6
- added fltk(-devel) to requres list

* Tue Mar 11 2008 Nik <niktr at mail.ru>
- tiff bug fixed
- enable-all option added

* Sat Mar 1 2008 Nik <niktr at mail.ru>
- spec cleanup
- --enable(jpeg, tiff, hdf5) features added
- enable-tiff leads to make error, submitted to author. Feature disabled.

* Fri Feb 29 2008 Nik <niktr at mail.ru>
- initial build of version 1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:04:20 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:45:37 -0000	1.2
@@ -0,0 +1 @@
+mathgl-1.9.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:04:20 -0000	1.1
+++ sources	14 Sep 2009 10:45:37 -0000	1.2
@@ -0,0 +1 @@
+9aa6b5f8c4a6f7d5b8708b8565b17b63  mathgl-1.9.tgz



From mycae at fedoraproject.org  Mon Sep 14 10:47:29 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:47:29 +0000 (UTC)
Subject: rpms/mathgl/F-10 import.log, NONE, 1.1 mathgl-info.patch, NONE,
	1.1 mathgl-io.patch, NONE, 1.1 mathgl-no-mglwx.patch, NONE,
	1.1 mathgl-png.patch, NONE, 1.1 mathgl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914104729.7858611C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9767/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mathgl-info.patch mathgl-io.patch 
	mathgl-no-mglwx.patch mathgl-png.patch mathgl.spec 
Log Message:
- F-10 import



--- NEW FILE import.log ---
mathgl-1_9-6_fc10:F-10:mathgl-1.9-6.fc10.src.rpm:1252925615

mathgl-info.patch:
 mathgl.texi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-info.patch ---
Index: mathgl/texinfo/mathgl.texi
===================================================================
--- texinfo/mathgl.texi	2009-03-04 13:22:15.000000000 +0000
+++ texinfo/mathgl.texi	2009-05-27 17:39:59.000000000 +0100
@@ -25,10 +25,10 @@
 @end quotation
 @end copying
 
- at c @dircategory MathGL documentation system
- at c @direntry
- at c * MathGL: (mathgl). The library for scientific graphics.
- at c @end direntry
+ at dircategory MathGL documentation system
+ at direntry
+* MathGL: (mathgl). The library for scientific graphics.
+ at end direntry
 
 @titlepage
 @title MathGL


mathgl-io.patch:
 mgl_data_io.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-io.patch ---
--- mgl/mgl_data_io.cpp	2009-07-02 01:49:42.000000000 +1000
+++ mgl/mgl_data_io.cpp.new	2009-07-25 12:16:55.000000000 +1000
@@ -918,7 +918,7 @@
 	hid_t hf,hd,hs;
 	hsize_t dims[3];
 	long rank = 3, res;
-	H5Eset_auto(0,0);
+	H5Eset_auto2(0,0,0);
 	res=H5Fis_hdf5(fname);
 	if(res>0 && !rewrite)	hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 	else	hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -928,10 +928,10 @@
 	else	{	rank = 3;	dims[0] = nz;	dims[1] = ny;	dims[2] = nx;	}
 	hs = H5Screate_simple(rank, dims, 0);
 #if(MGL_USE_DOUBLE==1)
-	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a);
 #else
-	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a);
 #endif
 	H5Dclose(hd);	H5Sclose(hs);	H5Fclose(hf);
@@ -943,7 +943,7 @@
 	hsize_t dims[3];
 	long rank;
 	hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-	hd = H5Dopen(hf,data);
+	hd = H5Dopen(hf,data,H5P_DEFAULT);
 	hs = H5Dget_space(hd);
 	rank = H5Sget_simple_extent_ndims(hs);
 	if(rank>0 && rank<=3)

mathgl-no-mglwx.patch:
 examples/Makefile.am |    8 ++++----
 widgets/Makefile.am  |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE mathgl-no-mglwx.patch ---
--- widgets/Makefile.am.orig	2009-08-15 12:35:36.000000000 +1000
+++ widgets/Makefile.am	2009-08-15 12:35:27.000000000 +1000
@@ -18,11 +18,11 @@
 endif
 
 if USE_WX
-lib_LTLIBRARIES += libmgl-wx.la
-libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
-libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
-libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-libmgl_wx_la_SOURCES = mgl_wx.cpp
+#lib_LTLIBRARIES += libmgl-wx.la
+#libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
+#libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
+#libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#libmgl_wx_la_SOURCES = mgl_wx.cpp
 endif
 
 if USE_QT
--- examples/Makefile.am.orig	2009-08-15 12:55:36.000000000 +1000
+++ examples/Makefile.am	2009-08-15 12:55:29.000000000 +1000
@@ -24,10 +24,10 @@
 endif
 
 if USE_WX
-bin_PROGRAMS += mgl_wx_example
-mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
-mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-mgl_wx_example_SOURCES = wx_example.cpp
+#bin_PROGRAMS += mgl_wx_example
+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#mgl_wx_example_SOURCES = wx_example.cpp
 endif
 
 if USE_QT

mathgl-png.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mathgl-png.patch ---
--- texinfo/png/Makefile.am	2009-07-02 01:50:09.000000000 +1000
+++ texinfo/png/Makefile.am.new	2009-07-25 12:36:15.000000000 +1000
@@ -18,7 +18,7 @@
 type2.png	vect3.png	vectc3.png	vectc.png	vect.png
 
 pngdir = $(docdir)/png
-png_DATA = all.png $(png_images)
+png_DATA = all.png 
 CLEANFILES = all.png $(png_images)
 all.png: hotdogs.pts
 	$(top_builddir)/examples/mgl_example


--- NEW FILE mathgl.spec ---
%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
Name: mathgl
Version: 1.9
Release: 6%{?dist}
Summary: Cross-platform library for making high-quality scientific graphics
Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
License: GPLv2+
Group: Development/Libraries
Url: http://mathgl.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz

#Fix missing default parameter in hdf5 code 
Patch0: %{name}-io.patch
#Patch to fix parallel build issue (from debian pts)
Patch1: %{name}-png.patch
#Uncomment mathgl dif listing (fix warning) also from pts
Patch2: %{name}-info.patch
#Remove empty libmgl-wx from compilation
Patch3: %{name}-no-mglwx.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# mandatory packages
BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool 
BuildRequires: swig 

# optional packages
BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
BuildRequires: wxGTK-devel giflib-devel octave-devel

#For autoreconf (required for patch1, libtool)
BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	libtool

Requires(post): info
Requires(preun): info

Requires: octave(api) = %{octave_api}

%description
Mathgl is a cross-platform library for making high-quality scientific
graphics. It provides fast data plotting and handling of large data
arrays, as well as  window and console modes and for easy embedding
into other programs. Mathgl integrates into fltk, qt and
opengl applications

%package devel
Summary: Libraries and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%description devel -l ru
????? %{name}-devel ???????? ?????????? ? ????? ?????????? ??????????? 
??? ?????????? ?????????? ? ?????????????? %{name}.

%package doc
Group:		Documentation
Summary:	HTML documentation and tutorial for the %{name} applications

BuildArch:	noarch
BuildRequires:	texi2html texinfo-tex	


%description doc
This package contains the documentation in the HTML format of the %{name}
package.

%prep
%setup -q

#convert EOL encodings, maintaining timestames
for file in AUTHORS ChangeLog.txt README COPYRIGHT; do
	sed 's/\r//' $file > $file.new && \
	touch -r $file $file.new && \
	mv $file.new $file
done

%patch0
%patch1
%patch2
%patch3

autoreconf


%build
#configure looks for * not *-qt4
QMAKE=/usr/bin/qmake-qt4
LUPDATE=/usr/bin/lupdate-qt4
LRELEASE=/usr/bin/lrelease-qt4

%configure	--disable-static \
		--enable-shared \
		--enable-all --enable-octave --disable-rpath

#Force strip 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

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/widgets/.libs/:`pwd`/mgl/.libs

make %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

#Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la


#Fix up octave .oct file install
mkdir -p temp-octave

pushd .
cd temp-octave
#Decompress tarballed "oct" file and remove tarball
tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz

#Copy the .oct file and supporting files to octave packages dir
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
#Remove empty INDEX file
rm %{name}/INDEX

#We cannot use version macro with octave package search,
# as pkg.m assumes a x.y.z format for packages. Failing
# to do this renders the plugin inoperable
cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/

#packinfo dir is required, or octave will not find the dir in recursive search
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo

popd



pushd .
#Lets build a "docs" dir to maintain the dir relationships needed for html files
mkdir -p  texinfo/docs
cd texinfo/docs/
cp -pr ../mathgl.html .
cp -pr ../png_static .
cp -pr ../png/ .

#remove zero length faux PNG file
rm -f png/all.png

popd

#remove installed docs, which we are installing via doc macro
rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}

#remove misplaced info "dir" file
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir

%post 
/sbin/ldconfig
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
octave -q -H --no-site-file --eval "pkg('rebuild');"

%preun
if [ $1 = 0 ] ; then
	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%postun
/sbin/ldconfig
octave -q -H --no-site-file --eval "pkg('rebuild');"

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog.txt README COPYING COPYRIGHT NEWS TODO
%{_libdir}/*.so.*
%{_bindir}/mgl*
%{_datadir}/%{name}/
%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
%{_datadir}/octave/packages/%{name}-1.9.0/
%{_infodir}/%{name}.*.gz


%files devel
%defattr(-,root,root,-)
%{_includedir}/mgl/
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc texinfo/docs/*

%changelog
* Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
- Add COPYING to doc

* Sat Sep 12 2009 <mycae(a!t)yahoo.com> 1.9-5
- Removed the word "static" from devel description, as doesn't have static
- Fonts now owned at datadir/name level
- Added COPYRIGHT NEWS and TODO

* Sat Aug 15 2009 <mycae(a!t)yahoo.com> 1.9-4
- Fix octave installation method
- Remove wx lib, which doesn't have meaningful code.

* Sun Aug 02 2009  <mycae(a!t)yahoo.com> 1.9-3
- Fix texinfo install (mv to main & add pre/post)
- Remove chrpath, as we now autoreconf
- Add octave pkg rebuild commands

* Tue Jul 21 2009  <mycae(a!t)yahoo.com> 1.9-2 
- Fix rpath for build on x86_64. 
- remove unrecognized configure options: --enable-tiff, --disable-ltdl-install
- Switch to --enable-all --enable-octave
- Add hdf5 patch
- Add doc subpackage

* Thu Jul 09 2009 <mycae(a!t)yahoo.com> 1.9-1
- Update to 1.9
- Drop explicit Requires
- Perserve timestamps on EOL conversion
- Added patch to disable unused gsl cblas link

* Fri May 02 2009 <mycae(a!t)yahoo.com> 1.8.1-1
- Update to 1.8.1

* Wed Jan 28 2009 <mycae(a!t)yahoo.com> 1.8-3
- Ensure timestamps are preserved during make install
- Modify defattr
- Remove UDAV from package summary

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-2
- Remove redundant and erroneous licence field in devel section
- Fix files from mgl/*h to mgl/
- Removed Requires, per bugzilla recommendation.
- Disabled static library generation
- Removed libltdl from build 
- Added libtool-ltdl as BuildRequires

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-1
- Updated to version 1.8
- Added QT env. vars for fedora
- Cleaned up description
- Change licence field from GPL to GPLv2

* Wed Jun 4 2008 Nik <niktr at mail.ru> 
- disabled hdf5 support according to developer request

* Tue Jun 3 2008 Nik <niktr at mail.ru> 
- updated to version 1.7.1

* Sun Jun 2 2008 Nik <niktr at mail.ru> 
- updated to version 1.7

* Sat Apr 5 2008 Nik <niktr at mail.ru> 
- updated to version 1.6.2

* Thu Mar 13 2008 Nik <niktr at mail.ru>
- updated to version 1.6
- added fltk(-devel) to requres list

* Tue Mar 11 2008 Nik <niktr at mail.ru>
- tiff bug fixed
- enable-all option added

* Sat Mar 1 2008 Nik <niktr at mail.ru>
- spec cleanup
- --enable(jpeg, tiff, hdf5) features added
- enable-tiff leads to make error, submitted to author. Feature disabled.

* Fri Feb 29 2008 Nik <niktr at mail.ru>
- initial build of version 1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:04:20 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:47:29 -0000	1.2
@@ -0,0 +1 @@
+mathgl-1.9.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:04:20 -0000	1.1
+++ sources	14 Sep 2009 10:47:29 -0000	1.2
@@ -0,0 +1 @@
+9aa6b5f8c4a6f7d5b8708b8565b17b63  mathgl-1.9.tgz



From mycae at fedoraproject.org  Mon Sep 14 10:49:18 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:49:18 +0000 (UTC)
Subject: rpms/mathgl/F-11 import.log, NONE, 1.1 mathgl-info.patch, NONE,
	1.1 mathgl-io.patch, NONE, 1.1 mathgl-no-mglwx.patch, NONE,
	1.1 mathgl-png.patch, NONE, 1.1 mathgl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914104918.4DD8D11C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10553/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mathgl-info.patch mathgl-io.patch 
	mathgl-no-mglwx.patch mathgl-png.patch mathgl.spec 
Log Message:
- F-11 initial import



--- NEW FILE import.log ---
mathgl-1_9-6_fc10:F-11:mathgl-1.9-6.fc10.src.rpm:1252925744

mathgl-info.patch:
 mathgl.texi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-info.patch ---
Index: mathgl/texinfo/mathgl.texi
===================================================================
--- texinfo/mathgl.texi	2009-03-04 13:22:15.000000000 +0000
+++ texinfo/mathgl.texi	2009-05-27 17:39:59.000000000 +0100
@@ -25,10 +25,10 @@
 @end quotation
 @end copying
 
- at c @dircategory MathGL documentation system
- at c @direntry
- at c * MathGL: (mathgl). The library for scientific graphics.
- at c @end direntry
+ at dircategory MathGL documentation system
+ at direntry
+* MathGL: (mathgl). The library for scientific graphics.
+ at end direntry
 
 @titlepage
 @title MathGL


mathgl-io.patch:
 mgl_data_io.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-io.patch ---
--- mgl/mgl_data_io.cpp	2009-07-02 01:49:42.000000000 +1000
+++ mgl/mgl_data_io.cpp.new	2009-07-25 12:16:55.000000000 +1000
@@ -918,7 +918,7 @@
 	hid_t hf,hd,hs;
 	hsize_t dims[3];
 	long rank = 3, res;
-	H5Eset_auto(0,0);
+	H5Eset_auto2(0,0,0);
 	res=H5Fis_hdf5(fname);
 	if(res>0 && !rewrite)	hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 	else	hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -928,10 +928,10 @@
 	else	{	rank = 3;	dims[0] = nz;	dims[1] = ny;	dims[2] = nx;	}
 	hs = H5Screate_simple(rank, dims, 0);
 #if(MGL_USE_DOUBLE==1)
-	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a);
 #else
-	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a);
 #endif
 	H5Dclose(hd);	H5Sclose(hs);	H5Fclose(hf);
@@ -943,7 +943,7 @@
 	hsize_t dims[3];
 	long rank;
 	hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-	hd = H5Dopen(hf,data);
+	hd = H5Dopen(hf,data,H5P_DEFAULT);
 	hs = H5Dget_space(hd);
 	rank = H5Sget_simple_extent_ndims(hs);
 	if(rank>0 && rank<=3)

mathgl-no-mglwx.patch:
 examples/Makefile.am |    8 ++++----
 widgets/Makefile.am  |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE mathgl-no-mglwx.patch ---
--- widgets/Makefile.am.orig	2009-08-15 12:35:36.000000000 +1000
+++ widgets/Makefile.am	2009-08-15 12:35:27.000000000 +1000
@@ -18,11 +18,11 @@
 endif
 
 if USE_WX
-lib_LTLIBRARIES += libmgl-wx.la
-libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
-libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
-libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-libmgl_wx_la_SOURCES = mgl_wx.cpp
+#lib_LTLIBRARIES += libmgl-wx.la
+#libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
+#libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
+#libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#libmgl_wx_la_SOURCES = mgl_wx.cpp
 endif
 
 if USE_QT
--- examples/Makefile.am.orig	2009-08-15 12:55:36.000000000 +1000
+++ examples/Makefile.am	2009-08-15 12:55:29.000000000 +1000
@@ -24,10 +24,10 @@
 endif
 
 if USE_WX
-bin_PROGRAMS += mgl_wx_example
-mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
-mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-mgl_wx_example_SOURCES = wx_example.cpp
+#bin_PROGRAMS += mgl_wx_example
+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#mgl_wx_example_SOURCES = wx_example.cpp
 endif
 
 if USE_QT

mathgl-png.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mathgl-png.patch ---
--- texinfo/png/Makefile.am	2009-07-02 01:50:09.000000000 +1000
+++ texinfo/png/Makefile.am.new	2009-07-25 12:36:15.000000000 +1000
@@ -18,7 +18,7 @@
 type2.png	vect3.png	vectc3.png	vectc.png	vect.png
 
 pngdir = $(docdir)/png
-png_DATA = all.png $(png_images)
+png_DATA = all.png 
 CLEANFILES = all.png $(png_images)
 all.png: hotdogs.pts
 	$(top_builddir)/examples/mgl_example


--- NEW FILE mathgl.spec ---
%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
Name: mathgl
Version: 1.9
Release: 6%{?dist}
Summary: Cross-platform library for making high-quality scientific graphics
Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
License: GPLv2+
Group: Development/Libraries
Url: http://mathgl.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz

#Fix missing default parameter in hdf5 code 
Patch0: %{name}-io.patch
#Patch to fix parallel build issue (from debian pts)
Patch1: %{name}-png.patch
#Uncomment mathgl dif listing (fix warning) also from pts
Patch2: %{name}-info.patch
#Remove empty libmgl-wx from compilation
Patch3: %{name}-no-mglwx.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# mandatory packages
BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool 
BuildRequires: swig 

# optional packages
BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
BuildRequires: wxGTK-devel giflib-devel octave-devel

#For autoreconf (required for patch1, libtool)
BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	libtool

Requires(post): info
Requires(preun): info

Requires: octave(api) = %{octave_api}

%description
Mathgl is a cross-platform library for making high-quality scientific
graphics. It provides fast data plotting and handling of large data
arrays, as well as  window and console modes and for easy embedding
into other programs. Mathgl integrates into fltk, qt and
opengl applications

%package devel
Summary: Libraries and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%description devel -l ru
????? %{name}-devel ???????? ?????????? ? ????? ?????????? ??????????? 
??? ?????????? ?????????? ? ?????????????? %{name}.

%package doc
Group:		Documentation
Summary:	HTML documentation and tutorial for the %{name} applications

BuildArch:	noarch
BuildRequires:	texi2html texinfo-tex	


%description doc
This package contains the documentation in the HTML format of the %{name}
package.

%prep
%setup -q

#convert EOL encodings, maintaining timestames
for file in AUTHORS ChangeLog.txt README COPYRIGHT; do
	sed 's/\r//' $file > $file.new && \
	touch -r $file $file.new && \
	mv $file.new $file
done

%patch0
%patch1
%patch2
%patch3

autoreconf


%build
#configure looks for * not *-qt4
QMAKE=/usr/bin/qmake-qt4
LUPDATE=/usr/bin/lupdate-qt4
LRELEASE=/usr/bin/lrelease-qt4

%configure	--disable-static \
		--enable-shared \
		--enable-all --enable-octave --disable-rpath

#Force strip 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

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/widgets/.libs/:`pwd`/mgl/.libs

make %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

#Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la


#Fix up octave .oct file install
mkdir -p temp-octave

pushd .
cd temp-octave
#Decompress tarballed "oct" file and remove tarball
tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz

#Copy the .oct file and supporting files to octave packages dir
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
#Remove empty INDEX file
rm %{name}/INDEX

#We cannot use version macro with octave package search,
# as pkg.m assumes a x.y.z format for packages. Failing
# to do this renders the plugin inoperable
cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/

#packinfo dir is required, or octave will not find the dir in recursive search
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo

popd



pushd .
#Lets build a "docs" dir to maintain the dir relationships needed for html files
mkdir -p  texinfo/docs
cd texinfo/docs/
cp -pr ../mathgl.html .
cp -pr ../png_static .
cp -pr ../png/ .

#remove zero length faux PNG file
rm -f png/all.png

popd

#remove installed docs, which we are installing via doc macro
rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}

#remove misplaced info "dir" file
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir

%post 
/sbin/ldconfig
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
octave -q -H --no-site-file --eval "pkg('rebuild');"

%preun
if [ $1 = 0 ] ; then
	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%postun
/sbin/ldconfig
octave -q -H --no-site-file --eval "pkg('rebuild');"

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog.txt README COPYING COPYRIGHT NEWS TODO
%{_libdir}/*.so.*
%{_bindir}/mgl*
%{_datadir}/%{name}/
%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
%{_datadir}/octave/packages/%{name}-1.9.0/
%{_infodir}/%{name}.*.gz


%files devel
%defattr(-,root,root,-)
%{_includedir}/mgl/
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc texinfo/docs/*

%changelog
* Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
- Add COPYING to doc

* Sat Sep 12 2009 <mycae(a!t)yahoo.com> 1.9-5
- Removed the word "static" from devel description, as doesn't have static
- Fonts now owned at datadir/name level
- Added COPYRIGHT NEWS and TODO

* Sat Aug 15 2009 <mycae(a!t)yahoo.com> 1.9-4
- Fix octave installation method
- Remove wx lib, which doesn't have meaningful code.

* Sun Aug 02 2009  <mycae(a!t)yahoo.com> 1.9-3
- Fix texinfo install (mv to main & add pre/post)
- Remove chrpath, as we now autoreconf
- Add octave pkg rebuild commands

* Tue Jul 21 2009  <mycae(a!t)yahoo.com> 1.9-2 
- Fix rpath for build on x86_64. 
- remove unrecognized configure options: --enable-tiff, --disable-ltdl-install
- Switch to --enable-all --enable-octave
- Add hdf5 patch
- Add doc subpackage

* Thu Jul 09 2009 <mycae(a!t)yahoo.com> 1.9-1
- Update to 1.9
- Drop explicit Requires
- Perserve timestamps on EOL conversion
- Added patch to disable unused gsl cblas link

* Fri May 02 2009 <mycae(a!t)yahoo.com> 1.8.1-1
- Update to 1.8.1

* Wed Jan 28 2009 <mycae(a!t)yahoo.com> 1.8-3
- Ensure timestamps are preserved during make install
- Modify defattr
- Remove UDAV from package summary

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-2
- Remove redundant and erroneous licence field in devel section
- Fix files from mgl/*h to mgl/
- Removed Requires, per bugzilla recommendation.
- Disabled static library generation
- Removed libltdl from build 
- Added libtool-ltdl as BuildRequires

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-1
- Updated to version 1.8
- Added QT env. vars for fedora
- Cleaned up description
- Change licence field from GPL to GPLv2

* Wed Jun 4 2008 Nik <niktr at mail.ru> 
- disabled hdf5 support according to developer request

* Tue Jun 3 2008 Nik <niktr at mail.ru> 
- updated to version 1.7.1

* Sun Jun 2 2008 Nik <niktr at mail.ru> 
- updated to version 1.7

* Sat Apr 5 2008 Nik <niktr at mail.ru> 
- updated to version 1.6.2

* Thu Mar 13 2008 Nik <niktr at mail.ru>
- updated to version 1.6
- added fltk(-devel) to requres list

* Tue Mar 11 2008 Nik <niktr at mail.ru>
- tiff bug fixed
- enable-all option added

* Sat Mar 1 2008 Nik <niktr at mail.ru>
- spec cleanup
- --enable(jpeg, tiff, hdf5) features added
- enable-tiff leads to make error, submitted to author. Feature disabled.

* Fri Feb 29 2008 Nik <niktr at mail.ru>
- initial build of version 1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:04:20 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:49:17 -0000	1.2
@@ -0,0 +1 @@
+mathgl-1.9.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:04:20 -0000	1.1
+++ sources	14 Sep 2009 10:49:18 -0000	1.2
@@ -0,0 +1 @@
+9aa6b5f8c4a6f7d5b8708b8565b17b63  mathgl-1.9.tgz



From mycae at fedoraproject.org  Mon Sep 14 10:51:23 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 10:51:23 +0000 (UTC)
Subject: rpms/mathgl/devel import.log, NONE, 1.1 mathgl-info.patch, NONE,
	1.1 mathgl-io.patch, NONE, 1.1 mathgl-no-mglwx.patch, NONE,
	1.1 mathgl-png.patch, NONE, 1.1 mathgl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914105123.B6CAC11C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11460/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mathgl-info.patch mathgl-io.patch 
	mathgl-no-mglwx.patch mathgl-png.patch mathgl.spec 
Log Message:
- devel import



--- NEW FILE import.log ---
mathgl-1_9-6_fc10:HEAD:mathgl-1.9-6.fc10.src.rpm:1252925836

mathgl-info.patch:
 mathgl.texi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-info.patch ---
Index: mathgl/texinfo/mathgl.texi
===================================================================
--- texinfo/mathgl.texi	2009-03-04 13:22:15.000000000 +0000
+++ texinfo/mathgl.texi	2009-05-27 17:39:59.000000000 +0100
@@ -25,10 +25,10 @@
 @end quotation
 @end copying
 
- at c @dircategory MathGL documentation system
- at c @direntry
- at c * MathGL: (mathgl). The library for scientific graphics.
- at c @end direntry
+ at dircategory MathGL documentation system
+ at direntry
+* MathGL: (mathgl). The library for scientific graphics.
+ at end direntry
 
 @titlepage
 @title MathGL


mathgl-io.patch:
 mgl_data_io.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mathgl-io.patch ---
--- mgl/mgl_data_io.cpp	2009-07-02 01:49:42.000000000 +1000
+++ mgl/mgl_data_io.cpp.new	2009-07-25 12:16:55.000000000 +1000
@@ -918,7 +918,7 @@
 	hid_t hf,hd,hs;
 	hsize_t dims[3];
 	long rank = 3, res;
-	H5Eset_auto(0,0);
+	H5Eset_auto2(0,0,0);
 	res=H5Fis_hdf5(fname);
 	if(res>0 && !rewrite)	hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 	else	hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -928,10 +928,10 @@
 	else	{	rank = 3;	dims[0] = nz;	dims[1] = ny;	dims[2] = nx;	}
 	hs = H5Screate_simple(rank, dims, 0);
 #if(MGL_USE_DOUBLE==1)
-	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a);
 #else
-	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT);
+	hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
 	H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a);
 #endif
 	H5Dclose(hd);	H5Sclose(hs);	H5Fclose(hf);
@@ -943,7 +943,7 @@
 	hsize_t dims[3];
 	long rank;
 	hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-	hd = H5Dopen(hf,data);
+	hd = H5Dopen(hf,data,H5P_DEFAULT);
 	hs = H5Dget_space(hd);
 	rank = H5Sget_simple_extent_ndims(hs);
 	if(rank>0 && rank<=3)

mathgl-no-mglwx.patch:
 examples/Makefile.am |    8 ++++----
 widgets/Makefile.am  |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE mathgl-no-mglwx.patch ---
--- widgets/Makefile.am.orig	2009-08-15 12:35:36.000000000 +1000
+++ widgets/Makefile.am	2009-08-15 12:35:27.000000000 +1000
@@ -18,11 +18,11 @@
 endif
 
 if USE_WX
-lib_LTLIBRARIES += libmgl-wx.la
-libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
-libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
-libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-libmgl_wx_la_SOURCES = mgl_wx.cpp
+#lib_LTLIBRARIES += libmgl-wx.la
+#libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
+#libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
+#libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#libmgl_wx_la_SOURCES = mgl_wx.cpp
 endif
 
 if USE_QT
--- examples/Makefile.am.orig	2009-08-15 12:55:36.000000000 +1000
+++ examples/Makefile.am	2009-08-15 12:55:29.000000000 +1000
@@ -24,10 +24,10 @@
 endif
 
 if USE_WX
-bin_PROGRAMS += mgl_wx_example
-mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
-mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
-mgl_wx_example_SOURCES = wx_example.cpp
+#bin_PROGRAMS += mgl_wx_example
+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
+#mgl_wx_example_SOURCES = wx_example.cpp
 endif
 
 if USE_QT

mathgl-png.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mathgl-png.patch ---
--- texinfo/png/Makefile.am	2009-07-02 01:50:09.000000000 +1000
+++ texinfo/png/Makefile.am.new	2009-07-25 12:36:15.000000000 +1000
@@ -18,7 +18,7 @@
 type2.png	vect3.png	vectc3.png	vectc.png	vect.png
 
 pngdir = $(docdir)/png
-png_DATA = all.png $(png_images)
+png_DATA = all.png 
 CLEANFILES = all.png $(png_images)
 all.png: hotdogs.pts
 	$(top_builddir)/examples/mgl_example


--- NEW FILE mathgl.spec ---
%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
Name: mathgl
Version: 1.9
Release: 6%{?dist}
Summary: Cross-platform library for making high-quality scientific graphics
Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
License: GPLv2+
Group: Development/Libraries
Url: http://mathgl.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz

#Fix missing default parameter in hdf5 code 
Patch0: %{name}-io.patch
#Patch to fix parallel build issue (from debian pts)
Patch1: %{name}-png.patch
#Uncomment mathgl dif listing (fix warning) also from pts
Patch2: %{name}-info.patch
#Remove empty libmgl-wx from compilation
Patch3: %{name}-no-mglwx.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# mandatory packages
BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool 
BuildRequires: swig 

# optional packages
BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
BuildRequires: wxGTK-devel giflib-devel octave-devel

#For autoreconf (required for patch1, libtool)
BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	libtool

Requires(post): info
Requires(preun): info

Requires: octave(api) = %{octave_api}

%description
Mathgl is a cross-platform library for making high-quality scientific
graphics. It provides fast data plotting and handling of large data
arrays, as well as  window and console modes and for easy embedding
into other programs. Mathgl integrates into fltk, qt and
opengl applications

%package devel
Summary: Libraries and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%description devel -l ru
????? %{name}-devel ???????? ?????????? ? ????? ?????????? ??????????? 
??? ?????????? ?????????? ? ?????????????? %{name}.

%package doc
Group:		Documentation
Summary:	HTML documentation and tutorial for the %{name} applications

BuildArch:	noarch
BuildRequires:	texi2html texinfo-tex	


%description doc
This package contains the documentation in the HTML format of the %{name}
package.

%prep
%setup -q

#convert EOL encodings, maintaining timestames
for file in AUTHORS ChangeLog.txt README COPYRIGHT; do
	sed 's/\r//' $file > $file.new && \
	touch -r $file $file.new && \
	mv $file.new $file
done

%patch0
%patch1
%patch2
%patch3

autoreconf


%build
#configure looks for * not *-qt4
QMAKE=/usr/bin/qmake-qt4
LUPDATE=/usr/bin/lupdate-qt4
LRELEASE=/usr/bin/lrelease-qt4

%configure	--disable-static \
		--enable-shared \
		--enable-all --enable-octave --disable-rpath

#Force strip 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

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/widgets/.libs/:`pwd`/mgl/.libs

make %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

#Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la


#Fix up octave .oct file install
mkdir -p temp-octave

pushd .
cd temp-octave
#Decompress tarballed "oct" file and remove tarball
tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz

#Copy the .oct file and supporting files to octave packages dir
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
#Remove empty INDEX file
rm %{name}/INDEX

#We cannot use version macro with octave package search,
# as pkg.m assumes a x.y.z format for packages. Failing
# to do this renders the plugin inoperable
cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/

#packinfo dir is required, or octave will not find the dir in recursive search
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo

popd



pushd .
#Lets build a "docs" dir to maintain the dir relationships needed for html files
mkdir -p  texinfo/docs
cd texinfo/docs/
cp -pr ../mathgl.html .
cp -pr ../png_static .
cp -pr ../png/ .

#remove zero length faux PNG file
rm -f png/all.png

popd

#remove installed docs, which we are installing via doc macro
rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}

#remove misplaced info "dir" file
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir

%post 
/sbin/ldconfig
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
octave -q -H --no-site-file --eval "pkg('rebuild');"

%preun
if [ $1 = 0 ] ; then
	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%postun
/sbin/ldconfig
octave -q -H --no-site-file --eval "pkg('rebuild');"

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog.txt README COPYING COPYRIGHT NEWS TODO
%{_libdir}/*.so.*
%{_bindir}/mgl*
%{_datadir}/%{name}/
%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
%{_datadir}/octave/packages/%{name}-1.9.0/
%{_infodir}/%{name}.*.gz


%files devel
%defattr(-,root,root,-)
%{_includedir}/mgl/
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc texinfo/docs/*

%changelog
* Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
- Add COPYING to doc

* Sat Sep 12 2009 <mycae(a!t)yahoo.com> 1.9-5
- Removed the word "static" from devel description, as doesn't have static
- Fonts now owned at datadir/name level
- Added COPYRIGHT NEWS and TODO

* Sat Aug 15 2009 <mycae(a!t)yahoo.com> 1.9-4
- Fix octave installation method
- Remove wx lib, which doesn't have meaningful code.

* Sun Aug 02 2009  <mycae(a!t)yahoo.com> 1.9-3
- Fix texinfo install (mv to main & add pre/post)
- Remove chrpath, as we now autoreconf
- Add octave pkg rebuild commands

* Tue Jul 21 2009  <mycae(a!t)yahoo.com> 1.9-2 
- Fix rpath for build on x86_64. 
- remove unrecognized configure options: --enable-tiff, --disable-ltdl-install
- Switch to --enable-all --enable-octave
- Add hdf5 patch
- Add doc subpackage

* Thu Jul 09 2009 <mycae(a!t)yahoo.com> 1.9-1
- Update to 1.9
- Drop explicit Requires
- Perserve timestamps on EOL conversion
- Added patch to disable unused gsl cblas link

* Fri May 02 2009 <mycae(a!t)yahoo.com> 1.8.1-1
- Update to 1.8.1

* Wed Jan 28 2009 <mycae(a!t)yahoo.com> 1.8-3
- Ensure timestamps are preserved during make install
- Modify defattr
- Remove UDAV from package summary

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-2
- Remove redundant and erroneous licence field in devel section
- Fix files from mgl/*h to mgl/
- Removed Requires, per bugzilla recommendation.
- Disabled static library generation
- Removed libltdl from build 
- Added libtool-ltdl as BuildRequires

* Mon Dec 29 2008 <mycae(a!t)yahoo.com> 1.8-1
- Updated to version 1.8
- Added QT env. vars for fedora
- Cleaned up description
- Change licence field from GPL to GPLv2

* Wed Jun 4 2008 Nik <niktr at mail.ru> 
- disabled hdf5 support according to developer request

* Tue Jun 3 2008 Nik <niktr at mail.ru> 
- updated to version 1.7.1

* Sun Jun 2 2008 Nik <niktr at mail.ru> 
- updated to version 1.7

* Sat Apr 5 2008 Nik <niktr at mail.ru> 
- updated to version 1.6.2

* Thu Mar 13 2008 Nik <niktr at mail.ru>
- updated to version 1.6
- added fltk(-devel) to requres list

* Tue Mar 11 2008 Nik <niktr at mail.ru>
- tiff bug fixed
- enable-all option added

* Sat Mar 1 2008 Nik <niktr at mail.ru>
- spec cleanup
- --enable(jpeg, tiff, hdf5) features added
- enable-tiff leads to make error, submitted to author. Feature disabled.

* Fri Feb 29 2008 Nik <niktr at mail.ru>
- initial build of version 1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:04:20 -0000	1.1
+++ .cvsignore	14 Sep 2009 10:51:22 -0000	1.2
@@ -0,0 +1 @@
+mathgl-1.9.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:04:20 -0000	1.1
+++ sources	14 Sep 2009 10:51:23 -0000	1.2
@@ -0,0 +1 @@
+9aa6b5f8c4a6f7d5b8708b8565b17b63  mathgl-1.9.tgz



From lkundrak at fedoraproject.org  Mon Sep 14 11:08:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 14 Sep 2009 11:08:59 +0000 (UTC)
Subject: rpms/system-config-keyboard/devel .cvsignore, 1.17, 1.18 sources,
	1.21, 1.22 system-config-keyboard.spec, 1.53,
	1.54 system-config-keyboard-1.3.0-instroot.patch, 1.1,
	NONE system-config-keyboard-dracut.patch, 1.1, NONE
Message-ID: <20090914110859.66BF811C00EC@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17570

Modified Files:
	.cvsignore sources system-config-keyboard.spec 
Removed Files:
	system-config-keyboard-1.3.0-instroot.patch 
	system-config-keyboard-dracut.patch 
Log Message:
* Mon Sep 14 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.1-1
- New upstream release
- Drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	27 Jul 2009 01:48:05 -0000	1.17
+++ .cvsignore	14 Sep 2009 11:08:58 -0000	1.18
@@ -1 +1 @@
-system-config-keyboard-1.3.0.tar.gz
+system-config-keyboard-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	27 Jul 2009 01:48:05 -0000	1.21
+++ sources	14 Sep 2009 11:08:58 -0000	1.22
@@ -1 +1 @@
-8cb9171cb71beedd8359c959fb518628  system-config-keyboard-1.3.0.tar.gz
+012b1aec6d237f853bea6824e71d19ed  system-config-keyboard-1.3.1.tar.gz


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- system-config-keyboard.spec	18 Aug 2009 05:21:53 -0000	1.53
+++ system-config-keyboard.spec	14 Sep 2009 11:08:59 -0000	1.54
@@ -2,16 +2,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           system-config-keyboard
-Version:        1.3.0
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
-Patch0:         system-config-keyboard-dracut.patch
-Patch1:         system-config-keyboard-1.3.0-instroot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -35,8 +33,6 @@ the user to change the default keyboard 
 
 %prep
 %setup -q
-%patch0 -p0 -b .dracut
-%patch1 -p1 -b .instroot
 
 
 %build
@@ -86,6 +82,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.1-1
+- New upstream release
+- Drop upstreamed patches
+
 * Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-4
 - Wrong keyboard layout after install fix (#517542), Chris Lumens
 


--- system-config-keyboard-1.3.0-instroot.patch DELETED ---


--- system-config-keyboard-dracut.patch DELETED ---



From hguemar at fedoraproject.org  Mon Sep 14 11:11:27 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 14 Sep 2009 11:11:27 +0000 (UTC)
Subject: rpms/pessulus/devel .cvsignore, 1.10, 1.11 pessulus.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <20090914111127.F1A8F11C00EC@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/pessulus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19071

Modified Files:
	.cvsignore pessulus.spec sources 
Log Message:
Updated to 2.27.92


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Jul 2009 18:09:33 -0000	1.10
+++ .cvsignore	14 Sep 2009 11:11:27 -0000	1.11
@@ -1 +1 @@
-pessulus-2.27.5.tar.bz2
+pessulus-2.27.92.tar.bz2


Index: pessulus.spec
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- pessulus.spec	29 Jul 2009 18:09:33 -0000	1.21
+++ pessulus.spec	14 Sep 2009 11:11:27 -0000	1.22
@@ -2,7 +2,7 @@
 %define basever 2.27
 
 Name:           pessulus
-Version:        %{basever}.5
+Version:        %{basever}.92
 Release:        1%{?dist}
 Summary:        A lockdown editor for GNOME
 
@@ -80,6 +80,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/pessulus.*
 
 %changelog
+* Mon Sep 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.27.92-1
+- Updated to 2.27.92
+
 * Wed Jul 29 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.27.5-1
 - Updated to 2.24.0
 - Remove now unneeded pythondir patch (GNOME #549728 fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Jul 2009 18:09:33 -0000	1.10
+++ sources	14 Sep 2009 11:11:27 -0000	1.11
@@ -1 +1 @@
-5813ab0c1f6bba8a8d0be5fd9f3fdc81  pessulus-2.27.5.tar.bz2
+88ed22b15f851ef59e3340294c4f1cc0  pessulus-2.27.92.tar.bz2



From lkundrak at fedoraproject.org  Mon Sep 14 11:21:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 14 Sep 2009 11:21:00 +0000 (UTC)
Subject: rpms/system-config-rootpassword/devel .cvsignore, 1.13, 1.14 sources,
	1.14, 1.15 system-config-rootpassword.spec, 1.27, 1.28
Message-ID: <20090914112100.C7DB411C00EC@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-rootpassword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23913

Modified Files:
	.cvsignore sources system-config-rootpassword.spec 
Log Message:
* Mon Sep 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.99.6-1
- Update to latest upstream codebase
- Drop rhpl dependency



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-rootpassword/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Apr 2008 09:39:09 -0000	1.13
+++ .cvsignore	14 Sep 2009 11:21:00 -0000	1.14
@@ -1 +1 @@
-system-config-rootpassword-1.99.4.tar.gz
+system-config-rootpassword-1.99.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-rootpassword/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Apr 2008 09:39:09 -0000	1.14
+++ sources	14 Sep 2009 11:21:00 -0000	1.15
@@ -1 +1 @@
-7e7702045bcd94cbd83d397b200c0a85  system-config-rootpassword-1.99.4.tar.gz
+9f617727a0efc3dcbd0aa94db3998ae6  system-config-rootpassword-1.99.6.tar.gz


Index: system-config-rootpassword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-rootpassword/devel/system-config-rootpassword.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- system-config-rootpassword.spec	27 Jul 2009 05:24:57 -0000	1.27
+++ system-config-rootpassword.spec	14 Sep 2009 11:21:00 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           system-config-rootpassword
-Version:        1.99.4
-Release:        5%{?dist}
+Version:        1.99.6
+Release:        1%{?dist}
 Summary:        A graphical interface for modifying the rootpassword
 
 Group:          System Environment/Base
@@ -14,7 +14,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  gettext intltool
 BuildRequires:  desktop-file-utils
-Requires:       rhpl
 Requires:       usermode >= 1.36
 Requires:       libuser-python >= 0.49
 Requires:       cracklib-python
@@ -80,6 +79,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.99.6-1
+- Update to latest upstream codebase
+- Drop rhpl dependency
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.99.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Mon Sep 14 11:24:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 14 Sep 2009 11:24:25 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.76, 1.77 authconfig.spec, 1.107,
	1.108 sources, 1.84, 1.85
Message-ID: <20090914112425.8288211C00EC@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25567

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Sep 24 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.11-1
- updated translations (#522444)
- silence failures when restarting services (#500385)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	23 Apr 2009 10:10:07 -0000	1.76
+++ .cvsignore	14 Sep 2009 11:24:25 -0000	1.77
@@ -1 +1 @@
-authconfig-5.4.10.tar.bz2
+authconfig-5.4.11.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- authconfig.spec	24 Jul 2009 17:35:00 -0000	1.107
+++ authconfig.spec	14 Sep 2009 11:24:25 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.10
-Release: 2%{?dist}
+Version: 5.4.11
+Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -101,8 +101,9 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 24 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.11-1
+- updated translations (#522444)
+- silence failures when restarting services (#500385)
 
 * Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.10-1
 - update PAM configuration when updating from old authconfig versions (#495924)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	23 Apr 2009 10:10:08 -0000	1.84
+++ sources	14 Sep 2009 11:24:25 -0000	1.85
@@ -1 +1 @@
-368fb2d5738cf86d46de64ceced1b20a  authconfig-5.4.10.tar.bz2
+03ff93a37132c1d589b98b9c922e7671  authconfig-5.4.11.tar.bz2



From varekova at fedoraproject.org  Mon Sep 14 11:40:37 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 14 Sep 2009 11:40:37 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages-3.22-strcpy.patch, NONE,
	1.1 .cvsignore, 
	1.61, 1.62 man-pages.spec, 1.120, 1.121 sources, 1.60, 1.61
Message-ID: <20090914114037.AE89311C0489@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31251

Modified Files:
	.cvsignore man-pages.spec sources 
Added Files:
	man-pages-3.22-strcpy.patch 
Log Message:
- fix strcpy.3 man page
- remove statfc64 man page from syscalls tarball


man-pages-3.22-strcpy.patch:
 strcpy.3 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-3.22-strcpy.patch ---
diff -up man-pages-3.22/man3/strcpy.3.pom man-pages-3.22/man3/strcpy.3
--- man-pages-3.22/man3/strcpy.3.pom	2009-07-25 08:53:39.000000000 +0200
+++ man-pages-3.22/man3/strcpy.3	2009-09-14 10:53:54.000000000 +0200
@@ -137,7 +137,7 @@ in ways that may make the impossible pos
 .BR memcpy (3),
 .BR memmove (3),
 .BR strdup (3),
-.BR strpcpy (3),
+.BR stpcpy (3),
 .BR wcscpy (3),
 .BR wcsncpy (3)
 .SH COLOPHON


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	27 Jul 2009 11:42:14 -0000	1.61
+++ .cvsignore	14 Sep 2009 11:40:37 -0000	1.62
@@ -1,6 +1,6 @@
 man-pages-extralocale.tar.bz2
 man-suid-bins.tar.bz2
 man-pages-posix-2003-a.tar.bz2
-man-pages_syscalls.tar.bz2
 man-pages_add-01.tar.bz2
 man-pages-3.22.tar.bz2
+man-pages_syscalls-01.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- man-pages.spec	11 Aug 2009 07:05:07 -0000	1.120
+++ man-pages.spec	14 Sep 2009 11:40:37 -0000	1.121
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -14,7 +14,7 @@ Source0: http://www.kernel.org/pub/linux
 Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}-%{posix_release}.tar.bz2
 Source2: man-pages_add-01.tar.bz2
 Source3: man-pages-extralocale.tar.bz2
-Source4: man-pages_syscalls.tar.bz2
+Source4: man-pages_syscalls-01.tar.bz2
 # IBM-supplied man pages for suid binaries:
 Source5: man-suid-bins.tar.bz2
 Patch1: man-pages-1.51-iconv.patch
@@ -29,6 +29,7 @@ Patch50: man-pages-2.63-iconv.patch
 Patch53: man-pages-2.78-stream.patch
 Patch54: man-pages-2.80-malloc_h.patch
 Patch55: man-pages-3.22-gai.conf.patch
+Patch56: man-pages-3.22-strcpy.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -56,6 +57,7 @@ rmdir man-pages-posix-%{posix_version}-%
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
+%patch56 -p1
 
 ### And now remove those we are not going to use:
 
@@ -126,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Mon Sep 14 2009 Ivana Varekova <varekova at redhat.com> - 3.22-5
+- fix strcpy.3 man page
+- remove statfc64 man page from syscalls tarball
+
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> - 3.22-4
 - fix gai.conf an page (#515347)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	27 Jul 2009 11:42:14 -0000	1.60
+++ sources	14 Sep 2009 11:40:37 -0000	1.61
@@ -1,6 +1,6 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 a9c6a14e5b34c18c3684a0b68322572f  man-suid-bins.tar.bz2
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-bf0d94a7faf6dc0db31325dbf576fd84  man-pages_syscalls.tar.bz2
 4ae755c6caaa035cb7737bf4a3ec7927  man-pages_add-01.tar.bz2
 30adc758b14a45efff785f7c1e43a130  man-pages-3.22.tar.bz2
+24a7571e8d525b3c8bf5afd5299f0bad  man-pages_syscalls-01.tar.bz2



From hguemar at fedoraproject.org  Mon Sep 14 11:42:54 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 14 Sep 2009 11:42:54 +0000 (UTC)
Subject: rpms/listen/devel .cvsignore, 1.7, 1.8 listen.spec, 1.42,
	1.43 sources, 1.9, 1.10
Message-ID: <20090914114254.1429D11C00EC@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32648

Modified Files:
	.cvsignore listen.spec sources 
Log Message:
Updated to 0.6.3. Better memory usage


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Jul 2009 17:16:35 -0000	1.7
+++ .cvsignore	14 Sep 2009 11:42:53 -0000	1.8
@@ -1 +1 @@
-listen-0.6.2.tar.gz
+listen-0.6.3.tar.gz


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- listen.spec	14 Aug 2009 16:18:09 -0000	1.42
+++ listen.spec	14 Sep 2009 11:42:53 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           listen
-Version:        0.6.2
-Release:        4%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -15,7 +15,7 @@ BuildRequires: dbus-python
 #Buildrequires: pkgconfig
 BuildRequires: pygtk2-devel >= 2.8
 BuildRequires: gtk2-devel >= 2.8
-BuildRequires: gstreamer-python
+BuildRequires: gstreamer-python >= 0.10
 #BuildRequires: gnome-python2
 #BuildRequires: gnome-python2-extras
 BuildRequires: gnome-python2-libegg
@@ -126,16 +126,19 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> 0.6.2-4
+* Mon Sep 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.3-1
+- Updated to 0.6.3
+
+* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> - 0.6.2-4
 - fix libdir on s390x
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-2
+* Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-2
 - added python-inotify as Requires
 
-* Wed Jul 01 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-1
+* Wed Jul 01 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-1
 - updated to 0.6.2
 - fixed website url
 - removed the now useless Xvfb hack


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Jul 2009 17:16:35 -0000	1.9
+++ sources	14 Sep 2009 11:42:53 -0000	1.10
@@ -1 +1 @@
-d5b039a1679246ab6224a4aefe16e1be  listen-0.6.2.tar.gz
+eda59033c1d040b9dc10142af1db6a57  listen-0.6.3.tar.gz



From thias at fedoraproject.org  Mon Sep 14 11:49:40 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 11:49:40 +0000 (UTC)
Subject: rpms/lighttpd/devel lighttpd-1.4.23-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.23-mod_geoip.patch, NONE, 1.1 .cvsignore, 1.27,
	1.28 lighttpd.spec, 1.60, 1.61 sources, 1.27,
	1.28 lighttpd-1.4.18-mod_geoip.patch, 1.1,
	NONE lighttpd-1.4.20-defaultconf.patch, 1.1,
	NONE lighttpd-1.4.20-initinfo.patch, 1.1, NONE
Message-ID: <20090914114940.B981111C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2381

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.23-defaultconf.patch 
	lighttpd-1.4.23-mod_geoip.patch 
Removed Files:
	lighttpd-1.4.18-mod_geoip.patch 
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch 
Log Message:
Update to 1.4.23.


lighttpd-1.4.23-defaultconf.patch:
 lighttpd.conf |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-defaultconf.patch ---
diff -Naupr lighttpd-1.4.23.orig/doc/lighttpd.conf lighttpd-1.4.23/doc/lighttpd.conf
--- lighttpd-1.4.23.orig/doc/lighttpd.conf	2009-04-09 22:02:00.000000000 +0200
+++ lighttpd-1.4.23/doc/lighttpd.conf	2009-09-03 22:41:33.139052014 +0200
@@ -36,7 +36,7 @@ server.modules              = (
 
 ## A static document-root. For virtual hosting take a look at the
 ## mod_simple_vhost module.
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -50,6 +50,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -188,10 +189,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -215,7 +216,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )
@@ -320,3 +321,7 @@ static-file.exclude-extensions = ( ".php
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

lighttpd-1.4.23-mod_geoip.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 src/Makefile.in |   20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-mod_geoip.patch ---
diff -Naupr lighttpd-1.4.23.orig/configure lighttpd-1.4.23/configure
--- lighttpd-1.4.23.orig/configure	2009-06-07 21:26:07.000000000 +0200
+++ lighttpd-1.4.23/configure	2009-09-03 22:59:34.696051769 +0200
@@ -23235,7 +23235,7 @@ fi
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/configure.ac lighttpd-1.4.23/configure.ac
--- lighttpd-1.4.23.orig/configure.ac	2009-06-07 21:13:05.000000000 +0200
+++ lighttpd-1.4.23/configure.ac	2009-09-03 22:59:22.781056867 +0200
@@ -571,7 +571,7 @@ AC_OUTPUT
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
--- lighttpd-1.4.23.orig/src/Makefile.am	2009-06-16 15:45:42.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.am	2009-09-03 22:46:47.527052167 +0200
@@ -264,6 +264,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
 
+lib_LTLIBRARIES += mod_geoip.la
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
+
 
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.in lighttpd-1.4.23/src/Makefile.in
--- lighttpd-1.4.23.orig/src/Makefile.in	2009-06-19 21:19:22.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.in	2009-09-03 23:02:32.905052466 +0200
@@ -124,6 +124,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
 mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
 mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_mod_alias_la_OBJECTS = mod_alias.lo
 mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
@@ -406,7 +412,8 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
@@ -425,7 +432,8 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -612,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
 	mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
 	mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
 	mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
-	mod_redirect.la mod_status.la mod_accesslog.la
+	mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
 @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
@@ -719,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
 mod_accesslog_la_SOURCES = mod_accesslog.c
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
       settings.h http_chunk.h http_auth_digest.h \
@@ -822,6 +833,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
 	$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
 mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) 
 	$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) 
+	$(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
 mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) 
 	$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
 mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) 
@@ -1012,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Mar 2009 09:02:38 -0000	1.27
+++ .cvsignore	14 Sep 2009 11:49:40 -0000	1.28
@@ -1 +1 @@
-lighttpd-1.4.22.tar.bz2
+lighttpd-1.4.23.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- lighttpd.spec	21 Aug 2009 14:26:05 -0000	1.60
+++ lighttpd.spec	14 Sep 2009 11:49:40 -0000	1.61
@@ -5,8 +5,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.22
-Release: 5%{?dist}
+Version: 1.4.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -21,9 +21,8 @@ Source13: http://www.lighttpd.net/light_
 Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.20-defaultconf.patch
-Patch1: lighttpd-1.4.18-mod_geoip.patch
-Patch2: lighttpd-1.4.20-initinfo.patch
+Patch0: lighttpd-1.4.23-defaultconf.patch
+Patch1: lighttpd-1.4.23-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if 0%{!?rhel:1}
@@ -94,20 +93,10 @@ BuildRequires: mysql-devel
 Virtual host module for lighttpd that uses a MySQL database.
 
 
-%package -n spawn-fcgi
-Summary: Simple program for spawning FastCGI processes
-Group: System Environment/Daemons
-
-%description -n spawn-fcgi
-This package contains the spawn-fcgi program used for spawning FastCGI
-processes, which can be local or remote.
-
-
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -207,7 +196,7 @@ fi
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_geoip.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
+%{_mandir}/man8/lighttpd.8*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %dir %{webroot}/
@@ -235,13 +224,14 @@ fi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
-%files -n spawn-fcgi
-%defattr(-,root,root,-)
-%{_bindir}/spawn-fcgi
-%{_mandir}/man1/spawn-fcgi.1*
-
 
 %changelog
+* Thu Sep  3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+- Update to 1.4.23.
+- Update defaultconf and mod_geoip patches.
+- Remove no longer shipped spawn-fcgi, it's a separate source package now.
+- Remove unused patch to the init script.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.22-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	30 Mar 2009 09:02:38 -0000	1.27
+++ sources	14 Sep 2009 11:49:40 -0000	1.28
@@ -1 +1 @@
-ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2


--- lighttpd-1.4.18-mod_geoip.patch DELETED ---


--- lighttpd-1.4.20-defaultconf.patch DELETED ---


--- lighttpd-1.4.20-initinfo.patch DELETED ---



From jzeleny at fedoraproject.org  Mon Sep 14 11:55:32 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 14 Sep 2009 11:55:32 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd-2.3.14-autoconf.patch, NONE,
	1.1 xinetd-2.3.14-poll.patch, NONE, 1.1 xinetd.spec, 1.61, 1.62
Message-ID: <20090914115532.90DAE11C00EC@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5062

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-autoconf.patch xinetd-2.3.14-poll.patch 
Log Message:
select() function and it's supporting macros replaced by poll() and it's supporting macros

xinetd-2.3.14-autoconf.patch:
 aclocal.m4   |    2 -
 configure.in |   94 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

--- NEW FILE xinetd-2.3.14-autoconf.patch ---
--- xinetd-2.3.14/configure.in	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-mod/configure.in	2009-07-29 10:05:44.000000000 +0200
@@ -20,34 +20,34 @@ AC_CHECK_FUNCS(ecvt, ,
 AC_CHECK_FUNCS(gcvt, ,
    AC_CHECK_LIB(m, gcvt))
 
-AC_CHECK_FUNC(strerror, [AC_DEFINE(HAVE_STRERROR)])
-AC_CHECK_FUNC(strcasecmp, [AC_DEFINE(HAVE_STRCASECMP)])
+AC_CHECK_FUNC(strerror, [AC_DEFINE(HAVE_STRERROR, 1, "")])
+AC_CHECK_FUNC(strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1, "")])
 AC_CHECK_FUNC(socket, ,
    AC_CHECK_LIB(socket, socket, ,
       AC_CHECK_LIB(nsl, socket)))
 AC_CHECK_FUNC(inet_aton, ,
 	AC_CHECK_LIB(nsl, inet_aton, ,
 		AC_CHECK_LIB(socket, inet_aton, ,
-			AC_CHECK_LIB(resolv, inet_aton, ,[AC_DEFINE(NO_INET_ATON)]))))
-AC_CHECK_FUNC(setenv,[AC_DEFINE(HAVE_SETENV)])
-AC_CHECK_FUNC(strsignal, [AC_DEFINE(HAVE_STRSIGNAL)])
-AC_CHECK_LIB(c, sys_siglist, [AC_DEFINE(HAVE_SYS_SIGLIST)])
-AC_CHECK_FUNC(gai_strerror,[AC_DEFINE(HAVE_GAI_STRERROR)])
-AC_CHECK_FUNC(freeaddrinfo,[AC_DEFINE(HAVE_FREEADDRINFO)])
-AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE(HAVE_GETADDRINFO)])
+			AC_CHECK_LIB(resolv, inet_aton, ,[AC_DEFINE(NO_INET_ATON, 1, "")]))))
+AC_CHECK_FUNC(setenv,[AC_DEFINE(HAVE_SETENV, 1, "")])
+AC_CHECK_FUNC(strsignal, [AC_DEFINE(HAVE_STRSIGNAL, 1, "")])
+AC_CHECK_LIB(c, sys_siglist, [AC_DEFINE(HAVE_SYS_SIGLIST, 1, "")])
+AC_CHECK_FUNC(gai_strerror,[AC_DEFINE(HAVE_GAI_STRERROR, 1, "")])
+AC_CHECK_FUNC(freeaddrinfo,[AC_DEFINE(HAVE_FREEADDRINFO, 1, "")])
+AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE(HAVE_GETADDRINFO, 1, "")])
 
 AC_CHECK_HEADERS(sys/types.h sys/termios.h termios.h sys/ioctl.h sys/select.h rpc/rpc.h rpc/rpcent.h sys/file.h ftw.h machine/reg.h netdb.h)
-AC_CHECK_HEADER(sys/resource.h, [AC_DEFINE(HAVE_SYS_RESOURCE_H)])
-AC_CHECK_HEADER(arpa/inet.h, [AC_DEFINE(HAVE_ARPA_INET_H)])
-AC_CHECK_HEADER(grp.h, [AC_DEFINE(HAVE_GRP_H)])
-AC_CHECK_HEADER(rpc/pmap_clnt.h, [AC_DEFINE(HAVE_RPC_PMAP_CLNT_H)])
-AC_CHECK_HEADER(sys/socket.h, [AC_DEFINE(HAVE_SYS_SOCKET_H)])
-AC_CHECK_HEADER(sys/signal.h, [AC_DEFINE(HAVE_SYS_SIGNAL_H)])
-AC_CHECK_HEADER(crypt.h, [AC_DEFINE(HAVE_CRYPT_H)])
-AC_CHECK_HEADER(stdint.h, [AC_DEFINE(HAVE_STDINT_H)])
-AC_CHECK_HEADER(stdbool.h, [AC_DEFINE(HAVE_STDBOOL_H)])
-AC_CHECK_HEADER(sys/filio.h, [AC_DEFINE(HAVE_SYS_FILIO_H)])
-AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [AC_DEFINE(HAVE_DNSREGISTRATION) AC_DEFINE(HAVE_MDNS)])
+AC_CHECK_HEADER(sys/resource.h, [AC_DEFINE(HAVE_SYS_RESOURCE_H, 1, "")])
+AC_CHECK_HEADER(arpa/inet.h, [AC_DEFINE(HAVE_ARPA_INET_H, 1, "")])
+AC_CHECK_HEADER(grp.h, [AC_DEFINE(HAVE_GRP_H, 1, "")])
+AC_CHECK_HEADER(rpc/pmap_clnt.h, [AC_DEFINE(HAVE_RPC_PMAP_CLNT_H, 1, "")])
+AC_CHECK_HEADER(sys/socket.h, [AC_DEFINE(HAVE_SYS_SOCKET_H, 1, "")])
+AC_CHECK_HEADER(sys/signal.h, [AC_DEFINE(HAVE_SYS_SIGNAL_H, 1, "")])
+AC_CHECK_HEADER(crypt.h, [AC_DEFINE(HAVE_CRYPT_H, 1, "")])
+AC_CHECK_HEADER(stdint.h, [AC_DEFINE(HAVE_STDINT_H, 1, "")])
+AC_CHECK_HEADER(stdbool.h, [AC_DEFINE(HAVE_STDBOOL_H, 1, "")])
+AC_CHECK_HEADER(sys/filio.h, [AC_DEFINE(HAVE_SYS_FILIO_H, 1, "")])
+AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [AC_DEFINE(HAVE_DNSREGISTRATION, 1, "") AC_DEFINE(HAVE_MDNS, 1, "")])
 
 AC_ARG_WITH(howl, [  --with-howl=PATH        Compile in howl support.  
                           PATH is the prefix where howl is installed,
@@ -56,7 +56,7 @@ AC_ARG_WITH(howl, [  --with-howl=PATH   
      OLDLDFLAGS=$LDFLAGS; LDFLAGS="-L$withval/lib/ $LDFLAGS"; 
      OLDCPPFLAGS=$CPPFLAGS; CPPFLAGS="-I$withval/include/howl/ $CPPFLAGS";
      AC_CHECK_HEADER($withval/include/howl/howl.h, 
-        [AC_DEFINE(HAVE_HOWL) AC_DEFINE(HAVE_MDNS)], 
+        [AC_DEFINE(HAVE_HOWL, 1, "") AC_DEFINE(HAVE_MDNS, 1, "")], 
         [CFLAGS=$OLDCFLAGS; LDFLAGS=$OLDLDFLAGS; CPPFLAGS=$OLDCPPFLAGS;]) 
      AC_CHECK_LIB(howl, sw_discovery_publish, [LIBS="-lhowl $LIBS"], [
         OLDLIBS=$LIBS; LIBS="-lpthread $LIBS"; 
@@ -88,7 +88,7 @@ AC_CACHE_CHECK([for struct addrinfo], ac
         )
 ])
 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
-        AC_DEFINE(HAVE_STRUCT_ADDRINFO)
+        AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, "")
 fi
 
 AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
@@ -103,7 +103,7 @@ AC_CACHE_CHECK([for struct in6_addr], ac
         )
 ])
 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
-        AC_DEFINE(HAVE_STRUCT_IN6_ADDR)
+        AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, "")
 fi
 
 AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
@@ -118,7 +118,7 @@ AC_CACHE_CHECK([for struct sockaddr_in6]
         )
 ])
 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
-        AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
+        AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1, "")
 fi
 
 AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [
@@ -133,15 +133,15 @@ AC_CACHE_CHECK([for struct sockaddr_stor
         )
 ])
 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
-        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
+        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, "")
 fi
 
 
 case "$target_os" in
 
 solaris*)
-	AC_DEFINE(N0_SIGLIST)
-	AC_DEFINE(solaris)
+	AC_DEFINE(N0_SIGLIST, 1, "")
+	AC_DEFINE(solaris, 1, "")
 
 	AC_MSG_CHECKING(whether to compile in loadavg)
 	AC_ARG_WITH(loadavg,
@@ -153,12 +153,12 @@ solaris*)
 		yes)
 			AC_MSG_RESULT(yes)
 			AC_CHECK_LIB(kstat, main)
-			AC_CHECK_HEADER(kstat.h, [AC_DEFINE(HAVE_KSTAT_H)])
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_CHECK_HEADER(kstat.h, [AC_DEFINE(HAVE_KSTAT_H, 1, "")])
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 		*)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 	esac ], AC_MSG_RESULT(no) )
 	;;
@@ -172,11 +172,11 @@ osf*)
 			;;
 		yes)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 		*)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 	esac ], AC_MSG_RESULT(no))
 	;;
@@ -191,18 +191,18 @@ linux*|freebsd*)
 			;;
 		yes)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 		*)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 	esac ], AC_MSG_RESULT(no))
 	;;
 darwin* | "Mac OS"*)
 	ac_cv_prog_RANLIB="ranlib"
 	# AC_CHECK_FUNCS doesn't look in the proper header file...
-	AC_DEFINE(HAVE_ISATTY)
+	AC_DEFINE(HAVE_ISATTY, 1, "")
 	CFLAGS="$CFLAGS -no-cpp-precomp"
 	AC_MSG_CHECKING(whether to compile in loadavg)
 	AC_ARG_WITH(loadavg,,
@@ -212,11 +212,11 @@ darwin* | "Mac OS"*)
 			;;
 		yes)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 		*)
 			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_LOADAVG)
+			AC_DEFINE(HAVE_LOADAVG, 1, "")
 			;;
 	esac ], AC_MSG_RESULT(no))
 	;;
@@ -229,13 +229,13 @@ darwin* | "Mac OS"*)
                        ;;
                yes)
                        AC_MSG_RESULT(yes)
-                       AC_DEFINE(bsdi)
-                       AC_DEFINE(HAVE_LOADAVG)
+                       AC_DEFINE(bsdi, 1, "")
+                       AC_DEFINE(HAVE_LOADAVG, 1, "")
                        ;;
                *)
                        AC_MSG_RESULT(yes)
-                       AC_DEFINE(bsdi)
-                       AC_DEFINE(HAVE_LOADAVG)
+                       AC_DEFINE(bsdi, 1, "")
+                       AC_DEFINE(HAVE_LOADAVG, 1, "")
                        ;;
        esac ], AC_MSG_RESULT(no))
        ;;
@@ -245,7 +245,7 @@ esac
 AC_CHECK_LIB(c, crypt, [:], [
  AC_CHECK_LIB(crypt, crypt, [
   LIBS="-lcrypt $LIBS"
-  AC_DEFINE(HAVE_LIBCRYPT) ], []) ])
+  AC_DEFINE(HAVE_LIBCRYPT, 1, "") ], []) ])
 
 AC_CHECK_LIB(m, log10, [ LIBS="-lm $LIBS" ], [])
 
@@ -263,16 +263,16 @@ AC_ARG_WITH(libwrap,
 	yes)
 		AC_MSG_RESULT(yes)
 		AC_CHECK_LIB(wrap, request_init, [
-			AC_DEFINE(LIBWRAP)
+			AC_DEFINE(LIBWRAP, 1, "")
 			WRAPLIBS="-lwrap"
-			AC_DEFINE(HAVE_LIBWRAP) ])
+			AC_DEFINE(HAVE_LIBWRAP, 1, "") ])
 		AC_CHECK_LIB(nsl, yp_get_default_domain, [ 
 			WRAPLIBS="$WRAPLIBS -lnsl" ])
 		LIBS="$WRAPLIBS $LIBS"
 		;;
 	*)
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(LIBWRAP)
+		AC_DEFINE(LIBWRAP, 1, "")
 		if test -d "$withval"; then
 			WRAPLIBS="-L$withval -lwrap"
 		else
@@ -299,13 +299,13 @@ AC_ARG_WITH(labeled-networking,
 	yes)
 		AC_MSG_RESULT(yes)
 		AC_CHECK_LIB(selinux, setexeccon, [
-			AC_DEFINE(LABELED_NET)
+			AC_DEFINE(LABELED_NET, 1, "")
 			LABELLIBS="-lselinux" ])
 		LIBS="$LABELLIBS $LIBS"
 		;;
 	*)
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(LABELED_NET)
+		AC_DEFINE(LABELED_NET, 1, "")
 		if test -d "$withval"; then
 			LABELLIBS="-L$withval -lselinux"
 		else
--- xinetd-2.3.14/aclocal.m4	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14-mod/aclocal.m4	2009-07-29 10:10:03.000000000 +0200
@@ -22,6 +22,6 @@ AC_CACHE_VAL(xinetd_cv_type_$1,
 #endif], xinetd_cv_type_$1=yes, xinetd_cv_type_$1=no)])dnl
 AC_MSG_RESULT($xinetd_cv_type_$1)
 if test $xinetd_cv_type_$1 = no; then
-   AC_DEFINE($1, $2)
+   AC_DEFINE($1, $2, "")
 fi
 ])

xinetd-2.3.14-poll.patch:
 config.h.in        |    2 +
 configure.in       |    1 
 xinetd/conf.c      |    5 ++
 xinetd/defs.h      |    9 ++++
 xinetd/init.c      |   33 +++++++----------
 xinetd/intcommon.c |   36 +++++++++++++------
 xinetd/internals.c |   99 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 xinetd/main.c      |   76 ++++++++++++++++++++++++++++++++++++++--
 xinetd/redirect.c  |   35 ++++++++++++++++++
 xinetd/server.c    |    4 ++
 xinetd/service.c   |   47 ++++++++++++++++++++++++-
 xinetd/service.h   |   19 ++++++++++
 xinetd/state.h     |   12 +++++-
 xinetd/tcpint.c    |   81 +++++++++++++++++++++++++++++++++++++++++++
 xinetd/udpint.c    |   40 +++++++++++++++++++++
 xinetd/xmdns.c     |   19 ++++++++++
 xinetd/xpoll.h     |   23 ++++++++++++
 17 files changed, 499 insertions(+), 42 deletions(-)

--- NEW FILE xinetd-2.3.14-poll.patch ---
diff -Nurp xinetd-2.3.14-orig/config.h.in xinetd-2.3.14-poll/config.h.in
--- xinetd-2.3.14-orig/config.h.in	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-poll/config.h.in	2009-09-02 11:30:27.000000000 +0200
@@ -106,6 +106,8 @@
 
 #undef HAVE_HOWL
 
+#undef HAVE_POLL
+
 /* OS specific */
 #undef solaris
 
diff -Nurp xinetd-2.3.14-orig/configure.in xinetd-2.3.14-poll/configure.in
--- xinetd-2.3.14-orig/configure.in	2009-09-02 11:32:54.000000000 +0200
+++ xinetd-2.3.14-poll/configure.in	2009-09-02 11:30:27.000000000 +0200
@@ -35,6 +35,7 @@ AC_CHECK_LIB(c, sys_siglist, [AC_DEFINE(
 AC_CHECK_FUNC(gai_strerror,[AC_DEFINE(HAVE_GAI_STRERROR, 1, "")])
 AC_CHECK_FUNC(freeaddrinfo,[AC_DEFINE(HAVE_FREEADDRINFO, 1, "")])
 AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE(HAVE_GETADDRINFO, 1, "")])
+AC_CHECK_FUNC(poll, [AC_DEFINE(HAVE_POLL, 1, "")])
 
 AC_CHECK_HEADERS(sys/types.h sys/termios.h termios.h sys/ioctl.h sys/select.h rpc/rpc.h rpc/rpcent.h sys/file.h ftw.h machine/reg.h netdb.h)
 AC_CHECK_HEADER(sys/resource.h, [AC_DEFINE(HAVE_SYS_RESOURCE_H, 1, "")])
diff -Nurp xinetd-2.3.14-orig/xinetd/conf.c xinetd-2.3.14-poll/xinetd/conf.c
--- xinetd-2.3.14-orig/xinetd/conf.c	2003-12-30 14:44:09.000000000 +0100
+++ xinetd-2.3.14-poll/xinetd/conf.c	2009-09-02 11:30:27.000000000 +0200
@@ -209,8 +209,13 @@ unsigned cnf_start_services( struct conf
    pset_clear( sconfs ) ;
 
    if ( debug.on )
+#ifdef HAVE_POLL
+      msg( LOG_DEBUG, func, "pfds_last = %d, services_started = %d",
+            ps.rws.pfds_last, services_started ) ;
+#else
       msg( LOG_DEBUG, func, "mask_max = %d, services_started = %d",
             ps.rws.mask_max, services_started ) ;
+#endif
          
    return( services_started ) ;
 }
diff -Nurp xinetd-2.3.14-orig/xinetd/defs.h xinetd-2.3.14-poll/xinetd/defs.h
--- xinetd-2.3.14-orig/xinetd/defs.h	2005-03-29 17:50:34.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/defs.h	2009-09-02 11:30:27.000000000 +0200
@@ -111,6 +111,15 @@ union xsockaddr {
 #define LISTEN_BACKLOG               64
 
 /*
+ * constants for limiting ps.rws.fd_list 
+ */
+
+#ifdef HAVE_POLL
+#define INIT_POLLFDS                 1024
+#define MAX_POLLFDS                  8192
+#endif
+
+/*
  * When explicit values are given for enum's, that is because the structures 
  * that the enum's are in may be initialized by a memory clear operation.
  */
diff -Nurp xinetd-2.3.14-orig/xinetd/init.c xinetd-2.3.14-poll/xinetd/init.c
--- xinetd-2.3.14-orig/xinetd/init.c	2003-09-06 16:41:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/init.c	2009-09-02 11:30:27.000000000 +0200
@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-
+#include <malloc.h>
 #include "sio.h"
 #include "init.h"
 #include "defs.h"
@@ -140,7 +140,6 @@ static void set_fd_limit(void)
 {
 #ifdef RLIMIT_NOFILE
    struct rlimit rl ;
-   rlim_t maxfd ;
     
    /*
     * Set the soft file descriptor limit to the hard limit.
@@ -151,25 +150,9 @@ static void set_fd_limit(void)
       exit( 1 ) ;
    }
 
-   maxfd = rl.rlim_max;
    if ( rl.rlim_max == RLIM_INFINITY ) 
       rl.rlim_max = FD_SETSIZE;
 
-   /* XXX: a dumb way to prevent fd_set overflow possibilities; the rest
-    * of xinetd should be changed to use an OpenBSD inetd-like fd_grow(). */
-   if ( rl.rlim_max > FD_SETSIZE )
-      rl.rlim_max = FD_SETSIZE;
-     
-   rl.rlim_cur = rl.rlim_max ;
-   if ( setrlimit( RLIMIT_NOFILE, &rl ) == -1 )
-   {
-      syscall_failed("setrlimit(RLIMIT_NOFILE)");
-      ps.ros.max_descriptors = FD_SETSIZE;
-      ps.ros.orig_max_descriptors = FD_SETSIZE;
-      return ;
-   }
-
-   ps.ros.orig_max_descriptors = maxfd ;
    ps.ros.max_descriptors = rl.rlim_max ;
 #else      /* ! RLIMIT_NOFILE */
    ps.ros.max_descriptors = getdtablesize() ;
@@ -292,15 +275,27 @@ static pset_h new_table( unsigned size )
  */
 static void init_rw_state( void )
 {
+   const char *func = "init_rw_state" ;
    SERVERS( ps ) = new_table( 0 ) ;
    RETRIES( ps ) = new_table( 0 ) ;
    SERVICES( ps ) = new_table( 0 ) ;
 
    ps.rws.descriptors_free = ps.ros.max_descriptors - DESCRIPTORS_RESERVED ;
 
+#ifdef HAVE_POLL
+   ps.rws.pfds_allocated = INIT_POLLFDS ;
+   ps.rws.pfd_array = (struct pollfd *) 
+                      malloc( sizeof( struct pollfd ) * ps.rws.pfds_allocated ) ;
+   if ( ps.rws.pfd_array == NULL ) 
+   {
+      out_of_memory(func);
+      exit( 1 ) ;
+   }
+   ps.rws.pfds_last = 0 ;
+#else
    FD_ZERO( &ps.rws.socket_mask ) ;
    ps.rws.mask_max = 0 ;
-
+#endif /* HAVE_POLL */
 }
 
 
diff -Nurp xinetd-2.3.14-orig/xinetd/intcommon.c xinetd-2.3.14-poll/xinetd/intcommon.c
--- xinetd-2.3.14-orig/xinetd/intcommon.c	2003-08-06 08:12:10.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/intcommon.c	2009-09-03 16:15:49.000000000 +0200
@@ -14,6 +14,9 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
+#ifdef HAVE_POLL
+#include <poll.h>
+#endif
 
 #include "intcommon.h"
 #include "msg.h"
@@ -36,27 +39,38 @@ void int_fail( const struct intercept_s 
 /*
  * Returns either a positive number or -1
  */
+#ifdef HAVE_POLL
+int int_poll( int pfds_last, struct pollfd *pfd_array )
+{
+   const char *func = "int_poll" ;
+#else
 int int_select( int max, fd_set *read_mask )
 {
    const char *func = "int_select" ;
+#endif
 
    for ( ;; )
    {
       int n_ready ;
 
-      n_ready = select( max+1, read_mask,
-                                 FD_SET_NULL, FD_SET_NULL, TIMEVAL_NULL ) ;
+      do {
+#ifdef HAVE_POLL
+         n_ready = poll( pfd_array, pfds_last, -1 );
+#else
+         n_ready = select( max+1, read_mask,
+                           FD_SET_NULL, FD_SET_NULL, TIMEVAL_NULL ) ;
+#endif
+      } while (n_ready == -1 && errno == EINTR);
+
+
       if ( n_ready > 0 )
          return( n_ready ) ;
-      else if ( n_ready == -1 ) {
-         if ( errno == EINTR )
-            continue ;
-         else
-         {
-            msg( LOG_ERR, func, "select: %m" ) ;
-            return( -1 ) ;
-         }
-      }
+#ifdef HAVE_POLL
+      msg( LOG_ERR, func, "poll: %m" ) ;
+#else
+      msg( LOG_ERR, func, "select: %m" ) ;
+#endif
+      return( -1 ) ;
    }
 }
 
diff -Nurp xinetd-2.3.14-orig/xinetd/internals.c xinetd-2.3.14-poll/xinetd/internals.c
--- xinetd-2.3.14-orig/xinetd/internals.c	2003-09-06 16:41:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/internals.c	2009-09-03 10:38:29.000000000 +0200
@@ -53,6 +53,9 @@ void dump_internal_state(void)
    const char *dump_file = DUMP_FILE ;
    time_t current_time ;
    int fd ;
+#ifdef HAVE_POLL
+   int *listed_fds;
+#endif
    unsigned u ;
    const char *func = "dump_internal_state" ;
 
@@ -104,6 +107,41 @@ void dump_internal_state(void)
       server_dump( SERP( pset_pointer( RETRIES( ps ), u ) ), dump_fd ) ;
    Sputchar( dump_fd, '\n' ) ;
 
+#ifdef HAVE_POLL
+   /*
+    * Dump the socket mask
+    */
+   listed_fds = (int *)calloc(sizeof(int),ps.ros.max_descriptors);
+   if (listed_fds != NULL)
+   {
+      Sprint( dump_fd, "Socket mask:" ) ;
+      for ( fd = 0 ; fd < ps.rws.pfds_last ; fd++ )
+      {
+         listed_fds[ps.rws.pfd_array[fd].fd] = 1;
+         Sprint( dump_fd, " %d", ps.rws.pfd_array[fd].fd ) ;
+      }
+      Sputchar( dump_fd, '\n' ) ;
+      Sprint( dump_fd, "pfds_last = %d\n", ps.rws.pfds_last ) ;
+
+      /*
+       * Dump the descriptors that are open and are *not* in the socket list
+       */
+      Sprint( dump_fd, "Open descriptors (not in socket mask):" ) ;
+      for ( fd = 0 ; (unsigned)fd < ps.ros.max_descriptors ; fd++ )
+      {
+         struct stat st ;
+
+         if ( !listed_fds[fd] && fstat( fd, &st ) != -1 )
+            Sprint( dump_fd, " %d", fd ) ;
+      }
+
+      Sputchar( dump_fd, '\n' ) ;
+      Sputchar( dump_fd, '\n' ) ;
+      free(listed_fds);
+   }
+   else
+     Sprint( dump_fd, "Could not dump open descriptors, not enough memory!\n" );
+#else /* !HAVE_POLL */
    /*
     * Dump the socket mask
     */
@@ -114,6 +152,7 @@ void dump_internal_state(void)
    Sputchar( dump_fd, '\n' ) ;
    Sprint( dump_fd, "mask_max = %d\n", ps.rws.mask_max ) ;
 
+
    /*
     * Dump the descriptors that are open and are *not* in the socket mask
     */
@@ -130,6 +169,7 @@ void dump_internal_state(void)
    }
    Sputchar( dump_fd, '\n' ) ;
    Sputchar( dump_fd, '\n' ) ;
+#endif /* !HAVE_POLL */
 
    Sprint( dump_fd, "active_services = %d\n", ps.rws.active_services ) ;
    Sprint( dump_fd, "available_services = %d\n", ps.rws.available_services ) ;
@@ -162,7 +202,6 @@ enum check_type { PERIODIC, USER_REQUEST
 static void consistency_check( enum check_type type )
 {
    int         fd ;
-   fd_set      socket_mask_copy ;
    unsigned    u ;
    int         errors ;
    unsigned    total_running_servers        = 0 ;
@@ -171,7 +210,19 @@ static void consistency_check( enum chec
    bool_int    service_count_check_failed   = FALSE ;
    const char  *func                        = "consistency_check" ;
 
+
+#ifdef HAVE_POLL
+  struct pollfd *pfd_array_copy = calloc(sizeof(struct pollfd), ps.rws.pfds_last);
+  if (pfd_array_copy == NULL)
+  {
+     msg( LOG_ERR, func, "Could not run consistency check! Not enough memory!\n" ) ;
+     return;
+  }
+  memcpy(pfd_array_copy, ps.rws.pfd_array, ps.rws.pfds_last*sizeof(struct pollfd));
+#else /* !HAVE_POLL */
+   fd_set      socket_mask_copy ;
    socket_mask_copy = ps.rws.socket_mask ;
+#endif /* HAVE_POLL */
 
    for ( u = 0 ; u < pset_count( SERVICES( ps ) ) ; u++ )
    {
@@ -184,9 +235,22 @@ static void consistency_check( enum chec
 
       if ( SVC_IS_AVAILABLE( sp ) || SVC_IS_DISABLED ( sp ) )
       {
+
          /*
           * In this case, there may be some servers running
           */
+#ifdef HAVE_POLL
+         if ( pfd_array_copy[ SVC_POLLFD_OFF( sp ) ].events )
+         {
+            if ( SVC_IS_DISABLED( sp ) )
+            {
+               msg( LOG_ERR, func,
+                  "fd of disabled service %s still in socket mask", sid ) ;
+               error_count++ ;
+            }
+            pfd_array_copy[ SVC_POLLFD_OFF( sp ) ].events = 0;
+         }
+#else /* !HAVE_POLL */
          if ( FD_ISSET( SVC_FD( sp ), &socket_mask_copy ) )
          {
             if ( SVC_IS_DISABLED( sp ) )
@@ -197,8 +261,9 @@ static void consistency_check( enum chec
             }
             FD_CLR( SVC_FD( sp ), &socket_mask_copy ) ;
          }
-         error_count += thread_check( sp, running_servers, retry_servers ) ;
+#endif /* HAVE_POLL */
 
+         error_count += thread_check( sp, running_servers, retry_servers ) ;
          errors = service_count_check( sp, running_servers, retry_servers ) ;
          if ( ! errors && ! service_count_check_failed )
          {
@@ -248,6 +313,18 @@ static void consistency_check( enum chec
    /*
     * Check if there are any descriptors set in socket_mask_copy
     */
+#ifdef HAVE_POLL
+   for ( fd = 0 ; fd < ps.rws.pfds_last ; fd++)
+     if ( pfd_array_copy[fd].events && pfd_array_copy[fd].fd != signals_pending[0] && 
+          pfd_array_copy[fd].fd != signals_pending[1] )
+     {
+         msg( LOG_ERR, func,
+            "descriptor %d set in socket mask but there is no service for it",
+               fd ) ;
+         error_count++ ;
+     }
+   free(pfd_array_copy);
+#else /* !HAVE_POLL */
    for ( fd = 0 ; (unsigned)fd < ps.ros.max_descriptors ; fd++ )
       if ( FD_ISSET( fd, &socket_mask_copy ) && ((fd != signals_pending[0]) && fd != signals_pending[1]))
       {
@@ -256,6 +333,7 @@ static void consistency_check( enum chec
                fd ) ;
          error_count++ ;
       }
+#endif /* !HAVE_POLL */
 
    if ( error_count != 0 )
       msg( LOG_WARNING, func,
@@ -304,7 +382,6 @@ static unsigned service_count_check( str
 }
 
 
-
 /*
  * If the service is single-threaded:
  *         if the descriptor is set in the socket mask, there must
@@ -317,7 +394,11 @@ static unsigned thread_check( struct ser
                                unsigned retry_servers )
 {
    unsigned error_count = 0 ;
+#ifdef HAVE_POLL
+   struct pollfd *pfd= SVC_POLLFD( sp ) ;
+#else
    int sd = SVC_FD( sp ) ;
+#endif
    char *sid = SVC_ID( sp ) ;
    const char *func = "thread_check" ;
 
@@ -325,13 +406,21 @@ static unsigned thread_check( struct ser
    {
       bool_int has_servers = ( running_servers + retry_servers != 0 ) ;
 
+#ifdef HAVE_POLL
+      if ( has_servers && pfd->events )
+#else
       if ( has_servers && FD_ISSET( sd, &ps.rws.socket_mask ) )
+#endif
       {
          msg( LOG_ERR, func,
 "Active single-threaded service %s: server running, descriptor set", sid ) ;
          error_count++ ;
       }
+#ifdef HAVE_POLL
+      if ( !has_servers && !pfd->events )
+#else
       if ( !has_servers && !FD_ISSET( sd, &ps.rws.socket_mask ) )
+#endif
       {
          msg( LOG_ERR, func,
 "Active single-threaded service %s: no server running, descriptor not set",
@@ -340,7 +429,11 @@ static unsigned thread_check( struct ser
       }
    }
    else
+#ifdef HAVE_POLL
+      if ( ! pfd->events )
+#else
       if ( ! FD_ISSET( sd, &ps.rws.socket_mask ) )
+#endif
       {
          msg( LOG_ERR, func,
             "Active multi-threaded service %s: descriptor not set", sid ) ;
diff -Nurp xinetd-2.3.14-orig/xinetd/main.c xinetd-2.3.14-poll/xinetd/main.c
--- xinetd-2.3.14-orig/xinetd/main.c	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/main.c	2009-09-03 16:23:11.000000000 +0200
@@ -25,6 +25,9 @@
 #include "xtimer.h"
 #include "sensor.h"
 #include "xmdns.h"
+#ifdef HAVE_POLL
+#include "xpoll.h"
+#endif
 
 #ifdef __GNUC__
 __attribute__ ((noreturn))
@@ -119,16 +122,24 @@ static void main_loop(void)
 {
    const char      *func = "main_loop" ;
    struct timeval   tv, *tvptr = NULL;
+#ifdef HAVE_POLL
+   struct pollfd   *signal_pfd;
 
-   FD_SET(signals_pending[0], &ps.rws.socket_mask);
+   ps.rws.pfd_array[ps.rws.pfds_last].fd = signals_pending[0] ;
+   ps.rws.pfd_array[ps.rws.pfds_last].events = POLLIN ;
+   signal_pfd = &ps.rws.pfd_array[ps.rws.pfds_last] ;
+   ps.rws.pfds_last++;
+#else
+   FD_SET(signals_pending[0], &ps.rws.socket_mask) ;
    if ( signals_pending[0] > ps.rws.mask_max )
       ps.rws.mask_max = signals_pending[0] ;
-   if ( signals_pending[1] > ps.rws.mask_max )
-      ps.rws.mask_max = signals_pending[1] ;
+#endif /* HAVE_POLL */
 
    for ( ;; )
    {
+#ifndef HAVE_POLL
       fd_set read_mask ;
+#endif
       int n_active ;
       unsigned u ;
 
@@ -144,9 +155,14 @@ static void main_loop(void)
          tvptr = NULL;
       }
 
+#ifdef HAVE_POLL
+      n_active = poll( ps.rws.pfd_array, ps.rws.pfds_last,
+                       tvptr == NULL ? -1 : tvptr->tv_sec*1000 ) ;
+#else
       read_mask = ps.rws.socket_mask ;
       n_active = select( ps.rws.mask_max+1, &read_mask,
                         FD_SET_NULL, FD_SET_NULL, tvptr ) ;
+#endif
       if ( n_active == -1 )
       {
          if ( errno == EINTR ) {
@@ -165,11 +181,27 @@ static void main_loop(void)
 
       xtimer_poll();
 
-      if( FD_ISSET(signals_pending[0], &read_mask) ) {
+#ifdef HAVE_POLL
+      if ( POLLFD_REVENTS( signal_pfd ) ) 
+      {
+        if ( POLLFD_REVENTS( signal_pfd ) & (POLLERR | POLLHUP | 
+            POLLNVAL) ) 
+          find_bad_fd();
+        else
+        {
+          check_pipe();
+          if ( --n_active == 0 )
+            continue ;
+        }
+      }
+#else
+      if( FD_ISSET(signals_pending[0], &read_mask) ) 
+      {
          check_pipe();
             if ( --n_active == 0 )
                continue ;
       }
+#endif
 
 #ifdef HAVE_MDNS
       if( xinetd_mdns_poll() == 0 )
@@ -186,19 +218,33 @@ static void main_loop(void)
          if ( ! SVC_IS_ACTIVE( sp ) )
             continue ;
 
+#ifdef HAVE_POLL
+         if ( SVC_REVENTS( sp ) )
+         {
+           if ( SVC_REVENTS( sp ) & (POLLERR | POLLHUP | 
+               POLLNVAL) ) 
+             find_bad_fd();
+           else
+           {
+             svc_request( sp ) ;
+             if ( --n_active == 0 )
+               break ;
+           }
+         }
+#else
          if ( FD_ISSET( SVC_FD( sp ), &read_mask ) )
          {
             svc_request( sp ) ;
             if ( --n_active == 0 )
                break ;
          }
+#endif
       }
       if ( n_active > 0 )
          msg( LOG_ERR, func, "%d descriptors still set", n_active ) ;
    }
 }
 
-
 /*
  * This function identifies if any of the fd's in the socket mask
  * is bad. We use it in case select(2) returns EBADF
@@ -208,13 +254,29 @@ static void main_loop(void)
 static void find_bad_fd(void)
 {
    int fd ;
+#ifdef HAVE_POLL
+   const char *reason;
+#else
    struct stat st ;
+#endif
    unsigned bad_fd_count = 0 ;
    const char *func = "find_bad_fd" ;
 
+#ifdef HAVE_POLL
+   for ( fd = 0 ; (unsigned)fd < ps.rws.pfds_last ; fd++ )
+      if ( ps.rws.pfd_array[fd].revents & ( POLLHUP|POLLNVAL|POLLERR ) )
+      {
+         if ( ps.rws.pfd_array[fd].revents & POLLHUP )
+            reason = "hung up";
+         else if ( ps.rws.pfd_array[fd].revents & POLLNVAL )
+            reason = "been closed";
+         else if ( ps.rws.pfd_array[fd].revents & POLLERR )
+            reason = "reported error condition";
+#else
    for ( fd = 0 ; (unsigned)fd < ps.ros.max_descriptors ; fd++ )
       if ( FD_ISSET( fd, &ps.rws.socket_mask ) && fstat( fd, &st ) == -1 )
       {
+#endif
          int found = FALSE ;
          unsigned u ;
 
@@ -239,7 +301,11 @@ static void find_bad_fd(void)
          }
          if ( ! found )
          {
+#ifdef HAVE_POLL
+            ps.rws.pfd_array[fd].events = 0;
+#else
             FD_CLR( fd, &ps.rws.socket_mask ) ;
+#endif
             msg( LOG_ERR, func,
                "No active service for file descriptor %d\n", fd ) ;
             bad_fd_count++ ;
diff -Nurp xinetd-2.3.14-orig/xinetd/redirect.c xinetd-2.3.14-poll/xinetd/redirect.c
--- xinetd-2.3.14-orig/xinetd/redirect.c	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/redirect.c	2009-09-02 16:00:34.000000000 +0200
@@ -58,14 +58,19 @@ void redir_handler( struct server *serp 
    struct service *sp = SERVER_SERVICE( serp );
    struct service_config *scp = SVC_CONF( sp );
    int RedirDescrip = SERVER_FD( serp );
-   int maxfd;
    ssize_t num_read, num_wrote=0, ret=0;
    unsigned int sin_len = 0;
    unsigned long bytes_in = 0, bytes_out = 0;
    int no_to_nagle = 1;
    int on = 1, v6on;
    char buff[NET_BUFFER];
+#ifdef HAVE_POLL
+   struct pollfd *pfd_array;
+   int            pfds_last = 0;
+#else
    fd_set rdfd, msfd;
+   int maxfd;
+#endif
    struct timeval *timep = NULL;
    const char *func = "redir_handler";
    union xsockaddr serveraddr ;
@@ -141,19 +146,43 @@ void redir_handler( struct server *serp 
          msg(LOG_ERR, func, "setsockopt RedirDescrip failed: %m");
       }
 
+#ifdef HAVE_POLL
+#define REDIR_DESCRIP_INDEX 0
+#define REDIR_SERVER_INDEX 1
+      pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),INIT_POLLFDS);
+      if (pfd_array == NULL)
+      {
+         msg( LOG_ERR, func, "Cannot allocate memory for file descriptors!\n");
+         exit( 1 );
+      }
+      pfd_array[ REDIR_DESCRIP_INDEX ].fd = RedirDescrip;
+      pfd_array[ REDIR_DESCRIP_INDEX ].events = POLLIN;
+      pfd_array[ REDIR_SERVER_INDEX ].fd = RedirServerFd;
+      pfd_array[ REDIR_SERVER_INDEX ].events = POLLIN;
+      pfds_last += 2;
+#else
       maxfd = (RedirServerFd > RedirDescrip)?RedirServerFd:RedirDescrip;
       FD_ZERO(&msfd);
       FD_SET(RedirDescrip, &msfd);
       FD_SET(RedirServerFd, &msfd);
+#endif
 
       while(1) {
+#ifdef HAVE_POLL
+         if ( poll( pfd_array, pfds_last, -1 ) <= 0 ) {
+#else
          memcpy(&rdfd, &msfd, sizeof(rdfd));
          if (select(maxfd + 1, &rdfd, (fd_set *)0, (fd_set *)0, timep) <= 0) {
+#endif
             /* place for timeout code, currently does not time out */
             break;
          }
 
+#ifdef HAVE_POLL
+         if ( pfd_array[REDIR_DESCRIP_INDEX].revents ) {
+#else
          if (FD_ISSET(RedirDescrip, &rdfd)) {
+#endif
             do {
                num_read = read(RedirDescrip,
                   buff, sizeof(buff));
@@ -179,7 +208,11 @@ void redir_handler( struct server *serp 
             }
          }
 
+#ifdef HAVE_POLL
+         if ( pfd_array[REDIR_SERVER_INDEX].revents ) {
+#else
          if (FD_ISSET(RedirServerFd, &rdfd)) {
+#endif
             do {
                num_read = read(RedirServerFd,
                   buff, sizeof(buff));
diff -Nurp xinetd-2.3.14-orig/xinetd/server.c xinetd-2.3.14-poll/xinetd/server.c
--- xinetd-2.3.14-orig/xinetd/server.c	2005-03-29 17:50:34.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/server.c	2009-09-02 11:30:27.000000000 +0200
@@ -298,7 +298,11 @@ void server_end( struct server *serp )
       
       /* Added this for when accepting wait=yes services */
       if( SVC_WAITS( sp ) )
+#ifdef HAVE_POLL
+         SVC_EVENTS( sp ) = POLLIN ;
+#else
          FD_SET( SVC_FD( sp ), &ps.rws.socket_mask ) ;
+#endif /* HAVE_POLL */
 
       svc_postmortem( sp, serp ) ;
       server_release( serp ) ;
diff -Nurp xinetd-2.3.14-orig/xinetd/service.c xinetd-2.3.14-poll/xinetd/service.c
--- xinetd-2.3.14-orig/xinetd/service.c	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/service.c	2009-09-02 17:03:49.000000000 +0200
@@ -71,8 +71,6 @@ static const struct name_value service_s
       { "BAD STATE",          0                        }
    } ;
 
-
-
 /*
  * Allocate a new struct service and initialize it from scp 
  */
@@ -115,6 +113,10 @@ struct service *svc_make_special( struct
 
 void svc_free( struct service *sp )
 {
+#ifdef HAVE_POLL
+   *SVC_POLLFD( sp ) = ps.rws.pfd_array[--ps.rws.pfds_last] ;
+#endif /* HAVE_POLL */
+
    sc_free( SVC_CONF(sp) ) ;
    CLEAR( *sp ) ;
    FREE_SVC( sp ) ;
@@ -325,6 +327,25 @@ status_e svc_activate( struct service *s
       return( OK );
    }
 
+#ifdef HAVE_POLL
+   if ( ps.rws.pfds_last >= ps.rws.pfds_allocated )
+   {
+     int pos;
+     ps.rws.pfds_allocated += INIT_POLLFDS;
+     struct pollfd *tmp = (struct pollfd *)realloc( ps.rws.pfd_array,
+       ps.rws.pfds_allocated*sizeof(struct pollfd));
+     if ( tmp == NULL )
+     {
+       out_of_memory( func );
+       return( FAILED );
+     }
+     memset(&ps.rws.pfd_array[ps.rws.pfds_last], 0, (ps.rws.pfds_allocated-
+       ps.rws.pfds_last)*sizeof(struct pollfd));
+     ps.rws.pfd_array = tmp;
+   }
+   SVC_POLLFD( sp ) = &ps.rws.pfd_array[ps.rws.pfds_last++] ;
+#endif /* HAVE_POLL */
+
    if( SC_IPV4( scp ) ) {
       SVC_FD(sp) = socket( AF_INET, 
                            SC_SOCKET_TYPE( scp ), SC_PROTOVAL( scp ) ) ;
@@ -390,9 +411,14 @@ status_e svc_activate( struct service *s
 
    SVC_STATE(sp) = SVC_ACTIVE ;
 
+#ifdef HAVE_POLL
+   SVC_EVENTS( sp ) = POLLIN ;
+#else
    FD_SET( SVC_FD(sp), &ps.rws.socket_mask ) ;
+
    if ( SVC_FD(sp) > ps.rws.mask_max )
       ps.rws.mask_max = SVC_FD(sp) ;
+#endif /* HAVE_POLL */
 
    ps.rws.active_services++ ;
    ps.rws.available_services++ ;
@@ -442,7 +468,11 @@ void svc_deactivate( struct service *sp 
 
    if ( SVC_IS_ACTIVE( sp ) )
    {
+#ifdef HAVE_POLL
+      SVC_EVENTS( sp ) = 0;
+#else      
       FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ;
+#endif /* HAVE_POLL */
       ps.rws.active_services-- ;
    }
 
@@ -465,7 +495,15 @@ void svc_suspend( struct service *sp )
       return ;
    }
 
+#ifdef HAVE_POLL
+   /* 
+    * don't reap the pfd from pfd_array, since we must have it allocated for
+    * SVC_FD( sp )
+    */
+   SVC_EVENTS( sp ) = 0;
+#else
    FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ;
+#endif
    ps.rws.active_services-- ;
    if ( debug.on )
       msg( LOG_DEBUG, func, "Suspended service %s", SVC_ID( sp ) ) ;
@@ -481,7 +519,12 @@ void svc_resume( struct service *sp )
 {
    const char *func = "svc_resume" ;
 
+#ifdef HAVE_POLL
+   SVC_EVENTS( sp ) = POLLIN ;
+#else
    FD_SET( SVC_FD( sp ), &ps.rws.socket_mask ) ;
+#endif
+
    ps.rws.active_services++ ;
    if ( debug.on )
       msg( LOG_DEBUG, func, "Resumed service %s", SVC_ID( sp ) ) ;
diff -Nurp xinetd-2.3.14-orig/xinetd/service.h xinetd-2.3.14-poll/xinetd/service.h
--- xinetd-2.3.14-orig/xinetd/service.h	2005-03-29 17:50:34.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/service.h	2009-09-03 16:24:16.000000000 +0200
@@ -17,6 +17,9 @@
 #include "pset.h"
 #include "xlog.h"
 #include "server.h"
+#ifdef HAVE_POLL
+#include "xpoll.h"
+#endif
 
 /*
  * $Id: service.h,v 1.5 2005/03/29 15:50:34 bbraun Exp $
@@ -45,7 +48,13 @@ struct service
    state_e                svc_state ;
    int                    svc_ref_count ;   /* # of pters to this struct */
    struct service_config *svc_conf ;    /* service configuration */
+
+#ifdef HAVE_POLL
+   struct pollfd         *svc_pfd ;  /* pointer to the pollfd */
+#else
    int                    svc_fd ;	/* The Listening FD for the service */
+#endif /* HAVE_POLL */
+
    unsigned               svc_running_servers ;
    unsigned               svc_retry_servers ;
    unsigned               svc_attempts ; /* # of attempts to start server */
@@ -70,7 +79,17 @@ struct service
  * Field access macros
  */
 #define SVC_CONF( sp )             ( (sp)->svc_conf )
+
+#ifdef HAVE_POLL
+#define SVC_POLLFD( sp )           ( (sp)->svc_pfd )
+#define SVC_POLLFD_OFF( sp )       ( SVC_POLLFD( sp )-ps.rws.pfd_array )
+#define SVC_EVENTS( sp )           ( POLLFD_EVENTS( SVC_POLLFD( sp ) ) )
+#define SVC_REVENTS( sp )          ( POLLFD_REVENTS( SVC_POLLFD( sp ) ) )
+#define SVC_FD( sp )               ( POLLFD_FD( SVC_POLLFD( sp ) ) )
+#else
 #define SVC_FD( sp )               ( (sp)->svc_fd )
+#endif /* HAVE_POLL */
+
 #define SVC_RUNNING_SERVERS( sp )  (sp)->svc_running_servers
 #define SVC_RETRIES( sp )          (sp)->svc_retry_servers
 #define SVC_LOG( sp )              (sp)->svc_log
diff -Nurp xinetd-2.3.14-orig/xinetd/state.h xinetd-2.3.14-poll/xinetd/state.h
--- xinetd-2.3.14-orig/xinetd/state.h	2005-03-31 01:15:28.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/state.h	2009-09-02 11:30:27.000000000 +0200
@@ -21,7 +21,10 @@
 #endif
 #include "libportable.h"
 
-#ifdef HAVE_SYS_SELECT_H
+#ifdef HAVE_POLL
+#include <poll.h>
+#endif
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 
@@ -58,8 +61,15 @@ struct read_write_state
    int              available_services ;   /* # of available services       */
    int              active_services ;      /* services with descriptors set */
                                            /* in socket mask                */
+#ifdef HAVE_POLL 
+   struct pollfd   *pfd_array;             /* array passed to poll(2)       */
+   int              pfds_last;             /* index of last fd in the array */
+   int              pfds_allocated;        /* size of the array             */
+#else
    fd_set           socket_mask ;
    int              mask_max ;
+#endif /* HAVE_POLL */
+
    pset_h           servers ;              /* table of running servers      */
    pset_h           retries ;              /* table of servers to retry     */
    pset_h           services ;             /* table of services             */
diff -Nurp xinetd-2.3.14-orig/xinetd/tcpint.c xinetd-2.3.14-poll/xinetd/tcpint.c
--- xinetd-2.3.14-orig/xinetd/tcpint.c	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/tcpint.c	2009-09-02 16:49:32.000000000 +0200
@@ -63,7 +63,15 @@ struct intercept_s *si_init( struct serv
    return( ip ) ;
 }
 
+#ifdef HAVE_POLL
+static status_e handle_io( psi_h iter, channel_s *chp,
+                           struct pollfd *pfd_handled,
+                           struct pollfd *pfd_array,
+                           int *pfds_last,
+                           stream_status_e (*iofunc)() );
+#else
 static status_e handle_io( psi_h iter, channel_s *chp, fd_set *maskp, stream_status_e (*iofunc)() );
+#endif
 static stream_status_e tcp_local_to_remote( channel_s *chp );
 static stream_status_e tcp_remote_to_local( channel_s *chp );
 static void connection_request( struct intercept_s *ip, channel_s **chpp );
@@ -82,14 +90,26 @@ void si_exit(void)
 static void si_mux(void)
 {
    struct intercept_s   *ip = &stream_intercept_state ;
+#ifdef HAVE_POLL
+   struct pollfd        *pfd_array;
+   int                   pfds_last = 0;
+   int                   pfds_allocated = INIT_POLLFDS;
+#else
    fd_set                     socket_mask ;
    int                        mask_max ;
+#endif
    psi_h                      iter ;
    const char                *func = "si_mux" ;
 
+#ifdef HAVE_POLL
+   pfd_array = calloc(sizeof(struct pollfd),INIT_POLLFDS);
+   pfd_array[ pfds_last ].fd = INT_REMOTE( ip ) ;
+   pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT;
+#else
    FD_ZERO( &socket_mask ) ;
    FD_SET( INT_REMOTE( ip ), &socket_mask ) ;
    mask_max = INT_REMOTE( ip ) ;
+#endif
 
    iter = psi_create( INT_CONNECTIONS( ip ) ) ;
    if ( iter == NULL )
@@ -101,26 +121,43 @@ static void si_mux(void)
    for ( ;; )
    {
       channel_s *chp ;
+#ifndef HAVE_POLL
       fd_set read_mask ;
+#endif
       int n_ready ;
 
+#ifdef HAVE_POLL
+      n_ready = int_poll( pfds_last, pfd_array ) ;
+#else
       read_mask = socket_mask ;
       n_ready = int_select( mask_max+1, &read_mask ) ;
+#endif
 
       if ( n_ready == -1 )
          return ;
       
+#ifdef HAVE_POLL
+      if ( pfd_array[0].revents & ( POLLIN | POLLOUT ) )
+#else
       if ( FD_ISSET( INT_REMOTE( ip ), &read_mask ) )
+#endif
       {
          connection_request( ip, &chp ) ;
          if ( chp != NULL )
          {
+#ifdef HAVE_POLL
+            pfd_array[ pfds_last ].fd = chp->ch_local_socket ;
+            pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT ;
+            pfd_array[ pfds_last ].fd = chp->ch_remote_socket ;
+            pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT ;
+#else
             FD_SET( chp->ch_local_socket, &socket_mask ) ;
             if ( chp->ch_local_socket > mask_max )
                mask_max = chp->ch_local_socket ;
             FD_SET( chp->ch_remote_socket, &socket_mask ) ;
             if ( chp->ch_remote_socket > mask_max )
                mask_max = chp->ch_remote_socket ;
+#endif
          }
          if ( --n_ready == 0 )
             continue ;
@@ -128,27 +165,57 @@ static void si_mux(void)
 
       for ( chp = CHP( psi_start(iter) ) ; chp ; chp = CHP( psi_next(iter) ) )
       {
+#ifdef HAVE_POLL
+         int i;
+         struct pollfd *local_pfd = NULL, *remote_pfd = NULL;
+
+         /* TODO: detection with O(n)=1 */
+         for (i = 0 ; i < pfds_last ; i++ )
+           if (pfd_array[i].fd == chp->ch_local_socket)
+             local_pfd = &pfd_array[i];
+           else if (pfd_array[i] .fd== chp->ch_remote_socket)
+             remote_pfd = &pfd_array[i];
+
+         if ( local_pfd != NULL && 
+              local_pfd->revents & ( POLLIN | POLLOUT) )
+#else
          if ( FD_ISSET( chp->ch_local_socket, &read_mask ) )
+#endif
          {
 #ifdef DEBUG_TCPINT
             if ( debug.on )
                msg( LOG_DEBUG, func, "Input available on local socket %d", 
                                                          chp->ch_local_socket ) ;
 #endif
+#ifdef HAVE_POLL
+            if ( handle_io( iter, chp, local_pfd, pfd_array,
+                    &pfds_last, tcp_local_to_remote ) == FAILED )
+#else
             if ( handle_io( iter, chp, &socket_mask, tcp_local_to_remote ) == FAILED )
+#endif
                return ;
             if ( --n_ready == 0 )
                break ;
          }
 
+#ifdef HAVE_POLL
+         if ( remote_pfd != NULL && 
+              remote_pfd->revents & ( POLLIN | POLLOUT) )
+#else
          if ( FD_ISSET( chp->ch_remote_socket, &read_mask ) )
+#endif
          {
 #ifdef DEBUG_TCPINT
             msg( LOG_DEBUG, func, "Input available on remote socket %d", 
                                                       chp->ch_remote_socket ) ;
 #endif
+#ifdef HAVE_POLL
+            if ( handle_io( iter, chp, remote_pfd, pfd_array,
+                    &pfds_last, tcp_local_to_remote ) == FAILED )
+#else
             if ( handle_io( iter, chp,
                         &socket_mask, tcp_remote_to_local ) == FAILED )
+#endif
                return ;
             if ( --n_ready == 0 )
                break ;
@@ -158,10 +225,19 @@ static void si_mux(void)
 }
 
 
+#ifdef HAVE_POLL
+static status_e handle_io( psi_h iter, 
+                            channel_s *chp, 
+                            struct pollfd *pfd_handled,
+                            struct pollfd *pfd_array,
+                            int *pfds_last,
+                            stream_status_e (*iofunc)() )
+#else
 static status_e handle_io( psi_h iter, 
                             channel_s *chp, 
                             fd_set *maskp, 
                             stream_status_e (*iofunc)() )
+#endif
 {
    const char *func = "handle_io" ;
 
@@ -178,8 +254,13 @@ static status_e handle_io( psi_h iter, 
                   xaddrname( &chp->ch_from ), ntohs(xaddrport( &chp->ch_from )),
                         chp->ch_local_socket, chp->ch_remote_socket ) ;
 
+#ifdef HAVE_POLL
+         if ( pfd_handled != NULL)
+           *pfd_handled = pfd_array[ --( *pfds_last ) ];
+#else
          FD_CLR( chp->ch_local_socket, maskp ) ;
          FD_CLR( chp->ch_remote_socket, maskp ) ;
+#endif
          (void) Sclose( chp->ch_remote_socket ) ;
          (void) Sclose( chp->ch_local_socket ) ;
          psi_remove( iter ) ;
diff -Nurp xinetd-2.3.14-orig/xinetd/udpint.c xinetd-2.3.14-poll/xinetd/udpint.c
--- xinetd-2.3.14-orig/xinetd/udpint.c	2009-07-27 13:27:59.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/udpint.c	2009-09-02 16:59:33.000000000 +0200
@@ -15,6 +15,9 @@
 #include <syslog.h>
 #include <errno.h>
 
+#ifdef HAVE_POLL
+#include <poll.h>
+#endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -97,34 +100,61 @@ void di_exit(void)
 static void di_mux(void)
 {
    struct intercept_s   *ip = &dgram_intercept_state ;
+#ifdef HAVE_POLL
+   struct pollfd        *pfd_array;
+   int                   pfds_last = 0;
+   int                   pfds_allocated = INIT_POLLFDS;
+#else
    fd_set                     socket_mask ;
    int                        mask_max ;
+#endif
 
+#ifdef HAVE_POLL
+   pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),INIT_POLLFDS);
+   pfd_array[ pfds_last ].fd = INT_REMOTE( ip );
+   pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT;
+#else
    FD_ZERO( &socket_mask ) ;
    FD_SET( INT_REMOTE( ip ), &socket_mask ) ;
    mask_max = INT_REMOTE( ip ) ;
+#endif
 
    for ( ;; )
    {
       unsigned u ;
       channel_s *chp ;
+#ifndef HAVE_POLL
       fd_set read_mask ;
+#endif
       int n_ready ;
 
+#ifdef HAVE_POLL
+      n_ready = int_poll( pfds_last, pfd_array ) ;
+#else
       read_mask = socket_mask ;
       n_ready = int_select( mask_max+1, &read_mask ) ;
+#endif
 
       if ( n_ready == -1 )
          return ;
       
+#ifdef HAVE_POLL
+      if ( pfd_array[0].revents & ( POLLIN | POLLOUT ) )
+#else
       if ( FD_ISSET( INT_REMOTE( ip ), &read_mask ) )
+#endif
       {
          udp_remote_to_local( ip, &chp ) ;
          if ( chp != NULL )
          {
+#ifdef HAVE_POLL
+            pfd_array[ pfds_last ].fd = chp->ch_local_socket ;
+            pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT ;
+#else
             FD_SET( chp->ch_local_socket, &socket_mask ) ;
             if ( chp->ch_local_socket > mask_max )
                mask_max = chp->ch_local_socket ;
+#endif
          }
          if ( --n_ready == 0 )
             continue ;
@@ -134,7 +164,17 @@ static void di_mux(void)
       {
          chp = CHP( pset_pointer( INT_CONNECTIONS( ip ), u ) ) ;
 
+#ifdef HAVE_POLL
+         int i;
+         /* TODO: detection with O(n)=1 */
+         for (i = 0 ; i < pfds_last ; i++)
+           if (pfd_array[i].fd == chp->ch_local_socket)
+             break;
+         if (pfd_array[i].fd == chp->ch_local_socket &&
+             (pfd_array[i].revents & ( POLLIN | POLLOUT )))
+#else
          if ( FD_ISSET( chp->ch_local_socket, &read_mask ) )
+#endif
          {
             if ( udp_local_to_remote( chp ) == FAILED )
                return ;
diff -Nurp xinetd-2.3.14-orig/xinetd/xmdns.c xinetd-2.3.14-poll/xinetd/xmdns.c
--- xinetd-2.3.14-orig/xinetd/xmdns.c	2005-04-08 23:23:07.000000000 +0200
+++ xinetd-2.3.14-poll/xinetd/xmdns.c	2009-09-02 17:01:54.000000000 +0200
@@ -109,7 +109,26 @@ int xinetd_mdns_init(void) {
       ps.rws.mdns_state = NULL;
       return -1;
    }
+#ifdef HAVE_POLL
+   if ( ps.rws.pfds_last >= ps.rws.pfds_allocated )
+   {
+     ps.rws.pfds_allocated += INIT_POLLFDS;
+     struct pollfd *tmp = (struct pollfd *)realloc( ps.rws.pfd_array,
+         ps.rws.pfds_allocated*sizeof(struct pollfd));
+     if ( tmp == NULL )
+     {
+       out_of_memory( func );
+       return -1;
+     }
+     memset(&ps.rws.pfd_array[ps.rws.pfds_last], 0, (ps.rws.pfds_allocated-
+           ps.rws.pfds_last)*sizeof(struct pollfd));
+     ps.rws.pfd_array = tmp;
+   }
+   ps.rws.pfd_array[ ps.rws.pfds_last ].fd = sw_discovery_socket(*(sw_discovery *)ps.rws.mdns_state);
+   ps.rws.pfd_array[ ps.rws.pfds_last++ ].events = POLLIN;
+#else
    FD_SET( sw_discovery_socket(*(sw_discovery *)ps.rws.mdns_state), &ps.rws.socket_mask ) ;
+#endif
    return 0;
 #endif
 }
diff -Nurp xinetd-2.3.14-orig/xinetd/xpoll.h xinetd-2.3.14-poll/xinetd/xpoll.h
--- xinetd-2.3.14-orig/xinetd/xpoll.h	1970-01-01 01:00:00.000000000 +0100
+++ xinetd-2.3.14-poll/xinetd/xpoll.h	2009-09-02 11:30:27.000000000 +0200
@@ -0,0 +1,23 @@
+/*
+ * (c) Copyright 2009 by Red Hat Inc.
+ * All rights reserved.  The file named COPYRIGHT specifies the terms 
+ * and conditions for redistribution.
+ */
+#include "config.h"
+#ifdef HAVE_POLL
+#ifndef _X_POLL_H
+#define _X_POLL_H
+
+#include <poll.h>
+#include "defs.h"
+
+
+/* Field accessor methods for pollfd in defined in poll.h */
+#define POLLFD_FD( pfd )           ( (pfd)->fd )
+#define POLLFD_EVENTS( pfd )       ( (pfd)->events )
+#define POLLFD_REVENTS( pfd )      ( (pfd)->revents )
+
+/* TODO: write memory management stuff in xpoll.c if needed */
+
+#endif /* _X_POLL_H */
+#endif /* HAVE_POLL */


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xinetd.spec	27 Jul 2009 08:06:05 -0000	1.61
+++ xinetd.spec	14 Sep 2009 11:55:32 -0000	1.62
@@ -19,6 +19,8 @@ Patch6: xinetd-2.3.14-man-section.patch
 Patch7: xinetd-2.3.11-PIE.patch
 Patch8: xinetd-2.3.14-ident-bind.patch
 Patch9: xinetd-2.3.14-readable-debuginfo.patch
+Patch10: xinetd-2.3.14-autoconf.patch
+Patch11: xinetd-2.3.14-poll.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -56,6 +58,8 @@ located in the /etc/xinetd.d directory.
 %patch6 -p1 -b .man-section
 %patch8 -p1 -b .ident-bind
 %patch9 -p1 -b .readable-debuginfo
+%patch10 -p1 -b .autoconf
+%patch11 -p1 -b .poll
 
 aclocal
 autoconf
@@ -115,6 +119,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-24
+- select() function and it's supporting macros replaced by poll() and it's supporting macros
+- added patch of configure.in for clean compilation
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.3.14-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hguemar at fedoraproject.org  Mon Sep 14 11:57:08 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 14 Sep 2009 11:57:08 +0000 (UTC)
Subject: rpms/listen/F-11 .cvsignore, 1.7, 1.8 listen.spec, 1.42,
	1.43 sources, 1.9, 1.10
Message-ID: <20090914115708.1939611C00EC@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5685

Modified Files:
	.cvsignore listen.spec sources 
Log Message:
Updated to 0.6.3. Better memory usage


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Jul 2009 17:27:06 -0000	1.7
+++ .cvsignore	14 Sep 2009 11:57:07 -0000	1.8
@@ -1 +1 @@
-listen-0.6.2.tar.gz
+listen-0.6.3.tar.gz


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/F-11/listen.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- listen.spec	14 Aug 2009 16:16:09 -0000	1.42
+++ listen.spec	14 Sep 2009 11:57:07 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           listen
-Version:        0.6.2
-Release:        2.1%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -15,7 +15,7 @@ BuildRequires: dbus-python
 #Buildrequires: pkgconfig
 BuildRequires: pygtk2-devel >= 2.8
 BuildRequires: gtk2-devel >= 2.8
-BuildRequires: gstreamer-python
+BuildRequires: gstreamer-python >= 0.10
 #BuildRequires: gnome-python2
 #BuildRequires: gnome-python2-extras
 BuildRequires: gnome-python2-libegg
@@ -126,13 +126,16 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> 0.6.2-2.1
+* Mon Sep 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.3-1
+* Updated to 0.6.3
+
+* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> - 0.6.2-2.1
 - fix libdir on s390x
 
-* Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-2
+* Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-2
 - added python-inotify as Requires
 
-* Wed Jul 01 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-1
+* Wed Jul 01 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-1
 - updated to 0.6.2
 - fixed website url
 - removed the now useless Xvfb hack


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Jul 2009 17:27:07 -0000	1.9
+++ sources	14 Sep 2009 11:57:07 -0000	1.10
@@ -1 +1 @@
-d5b039a1679246ab6224a4aefe16e1be  listen-0.6.2.tar.gz
+eda59033c1d040b9dc10142af1db6a57  listen-0.6.3.tar.gz



From jzeleny at fedoraproject.org  Mon Sep 14 11:59:09 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 14 Sep 2009 11:59:09 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd.spec,1.62,1.63
Message-ID: <20090914115909.A6C9C11C00EC@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6508

Modified Files:
	xinetd.spec 
Log Message:
Corrected previously forgotten release number.


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- xinetd.spec	14 Sep 2009 11:55:32 -0000	1.62
+++ xinetd.spec	14 Sep 2009 11:59:09 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2



From jskala at fedoraproject.org  Mon Sep 14 12:05:04 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Mon, 14 Sep 2009 12:05:04 +0000 (UTC)
Subject: rpms/quagga/devel quagga.spec,1.53,1.54
Message-ID: <20090914120504.85C1C11C00EC@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/quagga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8665

Modified Files:
	quagga.spec 
Log Message:
* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 0.99.12-3
- fixed #516005 - Errors installing quagga-0.99.11-2.fc11.i586 with --excludedocs
- fixed #522787 - quagga: build future versions without PAM



Index: quagga.spec
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- quagga.spec	27 Jul 2009 02:38:58 -0000	1.53
+++ quagga.spec	14 Sep 2009 12:05:04 -0000	1.54
@@ -5,7 +5,7 @@
 %define		with_nssa	1
 %define		with_opaque_lsa 1
 %define		with_tcp_zebra	0
-%define		with_pam	1
+%define		with_pam	0
 %define		with_ipv6	1
 %define		with_ospfclient 1
 %define		with_ospfapi	1
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.12
-Release:    3%{?dist}
+Release:    4%{?dist}
 Epoch:      0
 License:	GPLv2+
 Group:      System Environment/Daemons
@@ -240,7 +240,9 @@ if getent passwd %quagga_user >/dev/null
 /sbin/chkconfig --add ospfd
 /sbin/chkconfig --add bgpd
 
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -f %{_infodir}/%{name}.inf* ]; then
+	/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 # Create dummy files if they don't exist so basic functions can be used.
 if [ ! -e %{_sysconfdir}/zebra.conf ]; then
@@ -269,14 +271,13 @@ if [ "$1" -ge  "1" ]; then
 %endif
 	/etc/rc.d/init.d/bgpd   condrestart >/dev/null 2>&1
 fi
-if [ "$1" = "0" ]; then
-	/sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir
+if [ -f %{_infodir}/%{name}.inf* ]; then
+	/sbin/install-info --delete %{_infodir}/quagga.info %{_infodir}/dir || :
 fi
 
 
 %preun
 if [ "$1" = "0" ]; then
-	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
     /sbin/chkconfig --del zebra
 	/sbin/chkconfig --del ripd
 %if %with_ipv6
@@ -345,6 +346,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 0.99.12-3
+- fixed #516005 - Errors installing quagga-0.99.11-2.fc11.i586 with --excludedocs
+- fixed #522787 - quagga: build future versions without PAM
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.99.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Mon Sep 14 12:10:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 14 Sep 2009 12:10:49 +0000 (UTC)
Subject: rpms/passwd/devel .cvsignore, 1.19, 1.20 passwd.spec, 1.41,
	1.42 sources, 1.21, 1.22
Message-ID: <20090914121049.874CF11C00EC@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/passwd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11220

Modified Files:
	.cvsignore passwd.spec sources 
Log Message:
* Mon Sep 14 2009 Tomas Mraz <tmraz at redhat.com> 0.77-1
- updated translations
- improved manual page



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	11 Feb 2009 14:16:00 -0000	1.19
+++ .cvsignore	14 Sep 2009 12:10:48 -0000	1.20
@@ -1 +1 @@
-passwd-0.76.tar.bz2
+passwd-0.77.tar.bz2


Index: passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- passwd.spec	21 Aug 2009 10:28:44 -0000	1.41
+++ passwd.spec	14 Sep 2009 12:10:49 -0000	1.42
@@ -6,8 +6,8 @@
 %endif
 Summary: An utility for setting or changing passwords using PAM
 Name: passwd
-Version: 0.76
-Release: 5%{?dist}
+Version: 0.77
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://fedorahosted.org/passwd
@@ -64,17 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/passwd.1*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.76-5
-- rebuilt with new audit
-
-* Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.76-4
-- rebuilt with new audit library
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.76-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.76-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Sep 14 2009 Tomas Mraz <tmraz at redhat.com> 0.77-1
+- updated translations
+- improved manual page
 
 * Wed Feb 11 2009 Tomas Mraz <tmraz at redhat.com> 0.76-1
 - identify SHA-256 and SHA-512 password hashes (#484994)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	11 Feb 2009 14:16:00 -0000	1.21
+++ sources	14 Sep 2009 12:10:49 -0000	1.22
@@ -1 +1 @@
-6daf488ad9e30327c6a01521d2d02cae  passwd-0.76.tar.bz2
+dc54bf41a67f046ab742f5b3badbd247  passwd-0.77.tar.bz2



From hguemar at fedoraproject.org  Mon Sep 14 12:12:18 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 14 Sep 2009 12:12:18 +0000 (UTC)
Subject: rpms/listen/F-10 .cvsignore, 1.7, 1.8 listen.spec, 1.38,
	1.39 sources, 1.9, 1.10
Message-ID: <20090914121218.DB55211C0427@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11912

Modified Files:
	.cvsignore listen.spec sources 
Log Message:
Updated to 0.6.3. Fix libdir on s390x. Better memory usage


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Jul 2009 17:38:23 -0000	1.7
+++ .cvsignore	14 Sep 2009 12:12:18 -0000	1.8
@@ -1 +1 @@
-listen-0.6.2.tar.gz
+listen-0.6.3.tar.gz


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/F-10/listen.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- listen.spec	6 Jul 2009 09:13:26 -0000	1.38
+++ listen.spec	14 Sep 2009 12:12:18 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           listen
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -15,7 +15,7 @@ BuildRequires: dbus-python
 #Buildrequires: pkgconfig
 BuildRequires: pygtk2-devel >= 2.8
 BuildRequires: gtk2-devel >= 2.8
-BuildRequires: gstreamer-python
+BuildRequires: gstreamer-python >= 0.10
 #BuildRequires: gnome-python2
 #BuildRequires: gnome-python2-extras
 BuildRequires: gnome-python2-libegg
@@ -76,7 +76,7 @@ Listen can be extended with plugins.
 # mandatory to build inside mock
 %{__sed} -i 's#CHECK_DEPENDS ?= 1#CHECK_DEPENDS ?= 0#' Makefile
 # correct path issue on x86_64 box
-%ifarch x86_64 ppc64 sparc64
+%ifarch x86_64 ppc64 sparc64 s390x
     %{__sed} -i 's#/lib#/lib64#' Makefile
 %endif
 %build
@@ -126,10 +126,14 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-2
+* Mon Sep 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-1
+- Updated to 0.6.3
+- Fix libdir on s390x
+
+* Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-2
 - added python-inotify as Requires
 
-* Wed Jul 01 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-1
+* Wed Jul 01 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.6.2-1
 - updated to 0.6.2
 - fixed website url
 - removed the now useless Xvfb hack


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Jul 2009 17:38:23 -0000	1.9
+++ sources	14 Sep 2009 12:12:18 -0000	1.10
@@ -1 +1 @@
-d5b039a1679246ab6224a4aefe16e1be  listen-0.6.2.tar.gz
+eda59033c1d040b9dc10142af1db6a57  listen-0.6.3.tar.gz



From jskala at fedoraproject.org  Mon Sep 14 12:17:29 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Mon, 14 Sep 2009 12:17:29 +0000 (UTC)
Subject: rpms/mgetty/devel mgetty.spec,1.52,1.53
Message-ID: <20090914121729.C9C7511C00EC@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/mgetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13739

Modified Files:
	mgetty.spec 
Log Message:
* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-5
- fixed #516001 - Errors installing mgetty with --excludedocs



Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- mgetty.spec	25 Jul 2009 12:08:47 -0000	1.52
+++ mgetty.spec	14 Sep 2009 12:17:29 -0000	1.53
@@ -3,7 +3,7 @@
 Summary: A getty replacement for use with data and fax modems
 Name: mgetty
 Version: 1.1.36
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz
 Source1: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz.asc
 Source2: logrotate.mgetty
@@ -176,10 +176,12 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/g3topbm
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty).		Package to handle faxes, voicemail and more." || :
+if [ -f %{_infodir}/mgetty.inf* ]; then
+	/sbin/install-info %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty).		Package to handle faxes, voicemail and more." || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ -f %{_infodir}/mgetty.inf* ]; then
     /sbin/install-info --delete %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty). 	Package to handle faxes, voicemail and more." || :
 fi
 
@@ -319,6 +321,9 @@ fi
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-5
+- fixed #516001 - Errors installing mgetty with --excludedocs
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.36-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mycae at fedoraproject.org  Mon Sep 14 12:20:40 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 12:20:40 +0000 (UTC)
Subject: rpms/mathgl/EL-5 mathgl.spec,1.1,1.2
Message-ID: <20090914122040.F29CE11C0425@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14846

Modified Files:
	mathgl.spec 
Log Message:
- Fix several build errors with epel



Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/EL-5/mathgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mathgl.spec	14 Sep 2009 10:45:37 -0000	1.1
+++ mathgl.spec	14 Sep 2009 12:20:40 -0000	1.2
@@ -10,19 +10,23 @@ Url: http://mathgl.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 
 #Fix missing default parameter in hdf5 code 
-Patch0: %{name}-io.patch
+#Patch0: %{name}-io.patch
 #Patch to fix parallel build issue (from debian pts)
 Patch1: %{name}-png.patch
 #Uncomment mathgl dif listing (fix warning) also from pts
 Patch2: %{name}-info.patch
 #Remove empty libmgl-wx from compilation
 Patch3: %{name}-no-mglwx.patch
+#Allow autoconf 2.59 to work
+Patch4: %{name}-allow-autoconf-2p59.patch
+#disable texi2html (which crashes)
+Patch5: %{name}-disable-texinfo-html.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # mandatory packages
 BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool 
-BuildRequires: swig 
+#BuildRequires: swig 
 
 # optional packages
 BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
@@ -80,23 +84,27 @@ for file in AUTHORS ChangeLog.txt README
 	mv $file.new $file
 done
 
-%patch0
+#%patch0
 %patch1
 %patch2
 %patch3
 
+#EPEL specific patches
+%patch4
+%patch5
+
 autoreconf
 
 
 %build
-#configure looks for * not *-qt4
-QMAKE=/usr/bin/qmake-qt4
-LUPDATE=/usr/bin/lupdate-qt4
-LRELEASE=/usr/bin/lrelease-qt4
+QMAKE=/usr/lib/qt4/bin/qmake
+LUPDATE=/usr/lib/qt4/bin/lupdate
+LRELEASE=/usr/lib/qt4/bin/lrelease
+PATH=$PATH:/usr/lib/qt4/bin/
 
 %configure	--disable-static \
 		--enable-shared \
-		--enable-all --enable-octave --disable-rpath
+		--enable-all --disable-rpath --with-qt=/usr/lib/qt4/
 
 #Force strip rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool



From mycae at fedoraproject.org  Mon Sep 14 12:21:36 2009
From: mycae at fedoraproject.org (mycae)
Date: Mon, 14 Sep 2009 12:21:36 +0000 (UTC)
Subject: rpms/mathgl/EL-5 mathgl-allow-autoconf-2p59.patch, NONE,
	1.1 mathgl-disable-texinfo-html.patch, NONE, 1.1
Message-ID: <20090914122136.E21BD11C00EC@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15163

Added Files:
	mathgl-allow-autoconf-2p59.patch 
	mathgl-disable-texinfo-html.patch 
Log Message:
- commit patches to fix autoconf. Partial fix for texinfo crash


mathgl-allow-autoconf-2p59.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mathgl-allow-autoconf-2p59.patch ---
--- configure.ac	2009-07-01 09:50:10.000000000 -0600
+++ configure.ac.new	2009-09-14 05:26:25.000000000 -0600
@@ -1,5 +1,6 @@
 AC_INIT(mgl/mgl_main.cpp)
 
+AC_PREREQ(2.59)
 MGL_RELEASE=1.8
 AC_SUBST(MGL_RELEASE)
 
@@ -239,7 +240,7 @@
 esac],[qt=false])
 if (test x$all = xtrue || test x$qt = xtrue) ;then
     AT_WITH_QT
-    AT_REQUIRE_QT_VERSION(4.3)
+#    AT_REQUIRE_QT_VERSION(4.3)
     test_qt=true
 fi
 AM_CONDITIONAL(USE_QT, test x$test_qt = xtrue)

mathgl-disable-texinfo-html.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mathgl-disable-texinfo-html.patch ---
--- texinfo/Makefile.am	2009-07-01 09:50:10.000000000 -0600
+++ texinfo/Makefile.am.new	2009-09-14 06:10:13.000000000 -0600
@@ -23,4 +23,4 @@
 uninstall-local:
 	rm -rf $(mglpng)
 
-all-local: html pdf
+all-local: pdf



From schwab at fedoraproject.org  Mon Sep 14 12:23:30 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 14 Sep 2009 12:23:30 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.288, 1.289 glibc-fedora.patch, 1.322,
	1.323 glibc.spec, 1.415, 1.416 import.log, 1.31, 1.32 sources,
	1.313, 1.314
Message-ID: <20090914122330.B511611C00EC@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15940/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- .cvsignore	7 Sep 2009 09:07:09 -0000	1.288
+++ .cvsignore	14 Sep 2009 12:23:29 -0000	1.289
@@ -1,2 +1,2 @@
-glibc-2.10-330-gd76da20-fedora.tar.bz2
-glibc-2.10-330-gd76da20.tar.bz2
+glibc-2.10-335-g02bf610-fedora.tar.bz2
+glibc-2.10-335-g02bf610.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   32 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 768 insertions(+), 469 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- glibc-fedora.patch	7 Sep 2009 09:07:09 -0000	1.322
+++ glibc-fedora.patch	14 Sep 2009 12:23:29 -0000	1.323
@@ -1,6 +1,6 @@
---- glibc-2.10-330-gd76da20/ChangeLog
-+++ glibc-2.10.90-20/ChangeLog
-@@ -577,6 +577,11 @@
+--- glibc-2.10-335-g02bf610/ChangeLog
++++ glibc-2.10.90-22/ChangeLog
+@@ -596,6 +596,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -842,6 +847,11 @@
+@@ -861,6 +866,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9240,6 +9250,13 @@
+@@ -9259,6 +9269,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9535,6 +9552,10 @@
+@@ -9554,6 +9571,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10792,6 +10813,15 @@
+@@ -10811,6 +10832,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,8 +65,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-330-gd76da20/ChangeLog.15
-+++ glibc-2.10.90-20/ChangeLog.15
+--- glibc-2.10-335-g02bf610/ChangeLog.15
++++ glibc-2.10.90-22/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -132,8 +132,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-330-gd76da20/ChangeLog.16
-+++ glibc-2.10.90-20/ChangeLog.16
+--- glibc-2.10-335-g02bf610/ChangeLog.16
++++ glibc-2.10.90-22/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -305,8 +305,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-330-gd76da20/Makeconfig
-+++ glibc-2.10.90-20/Makeconfig
+--- glibc-2.10-335-g02bf610/Makeconfig
++++ glibc-2.10.90-22/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -323,8 +323,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-330-gd76da20/csu/Makefile
-+++ glibc-2.10.90-20/csu/Makefile
+--- glibc-2.10-335-g02bf610/csu/Makefile
++++ glibc-2.10.90-22/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -335,8 +335,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-330-gd76da20/csu/elf-init.c
-+++ glibc-2.10.90-20/csu/elf-init.c
+--- glibc-2.10-335-g02bf610/csu/elf-init.c
++++ glibc-2.10.90-22/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -361,8 +361,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-330-gd76da20/debug/tst-chk1.c
-+++ glibc-2.10.90-20/debug/tst-chk1.c
+--- glibc-2.10-335-g02bf610/debug/tst-chk1.c
++++ glibc-2.10.90-22/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -391,8 +391,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-330-gd76da20/elf/ldconfig.c
-+++ glibc-2.10.90-20/elf/ldconfig.c
+--- glibc-2.10-335-g02bf610/elf/ldconfig.c
++++ glibc-2.10.90-22/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -474,8 +474,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-330-gd76da20/elf/tst-stackguard1.c
-+++ glibc-2.10.90-20/elf/tst-stackguard1.c
+--- glibc-2.10-335-g02bf610/elf/tst-stackguard1.c
++++ glibc-2.10.90-22/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -500,16 +500,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-330-gd76da20/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-20/include/bits/stdlib-ldbl.h
+--- glibc-2.10-335-g02bf610/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-22/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-330-gd76da20/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-20/include/bits/wchar-ldbl.h
+--- glibc-2.10-335-g02bf610/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-22/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-330-gd76da20/include/features.h
-+++ glibc-2.10.90-20/include/features.h
+--- glibc-2.10-335-g02bf610/include/features.h
++++ glibc-2.10.90-22/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -526,8 +526,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-330-gd76da20/intl/locale.alias
-+++ glibc-2.10.90-20/intl/locale.alias
+--- glibc-2.10-335-g02bf610/intl/locale.alias
++++ glibc-2.10.90-22/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -537,8 +537,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-330-gd76da20/libio/stdio.h
-+++ glibc-2.10.90-20/libio/stdio.h
+--- glibc-2.10-335-g02bf610/libio/stdio.h
++++ glibc-2.10.90-22/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -552,8 +552,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-330-gd76da20/locale/iso-4217.def
-+++ glibc-2.10.90-20/locale/iso-4217.def
+--- glibc-2.10-335-g02bf610/locale/iso-4217.def
++++ glibc-2.10.90-22/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -645,8 +645,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-330-gd76da20/locale/programs/locarchive.c
-+++ glibc-2.10.90-20/locale/programs/locarchive.c
+--- glibc-2.10-335-g02bf610/locale/programs/locarchive.c
++++ glibc-2.10.90-22/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -678,8 +678,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-330-gd76da20/localedata/Makefile
-+++ glibc-2.10.90-20/localedata/Makefile
+--- glibc-2.10-335-g02bf610/localedata/Makefile
++++ glibc-2.10.90-22/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -688,8 +688,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-330-gd76da20/localedata/SUPPORTED
-+++ glibc-2.10.90-20/localedata/SUPPORTED
+--- glibc-2.10-335-g02bf610/localedata/SUPPORTED
++++ glibc-2.10.90-22/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -731,8 +731,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-330-gd76da20/localedata/locales/cy_GB
-+++ glibc-2.10.90-20/localedata/locales/cy_GB
+--- glibc-2.10-335-g02bf610/localedata/locales/cy_GB
++++ glibc-2.10.90-22/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -747,8 +747,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-330-gd76da20/localedata/locales/en_GB
-+++ glibc-2.10.90-20/localedata/locales/en_GB
+--- glibc-2.10-335-g02bf610/localedata/locales/en_GB
++++ glibc-2.10.90-22/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -760,8 +760,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-330-gd76da20/localedata/locales/no_NO
-+++ glibc-2.10.90-20/localedata/locales/no_NO
+--- glibc-2.10-335-g02bf610/localedata/locales/no_NO
++++ glibc-2.10.90-22/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -832,8 +832,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-330-gd76da20/localedata/locales/zh_TW
-+++ glibc-2.10.90-20/localedata/locales/zh_TW
+--- glibc-2.10-335-g02bf610/localedata/locales/zh_TW
++++ glibc-2.10.90-22/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -861,8 +861,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-330-gd76da20/malloc/mcheck.c
-+++ glibc-2.10.90-20/malloc/mcheck.c
+--- glibc-2.10-335-g02bf610/malloc/mcheck.c
++++ glibc-2.10.90-22/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -938,8 +938,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-330-gd76da20/manual/libc.texinfo
-+++ glibc-2.10.90-20/manual/libc.texinfo
+--- glibc-2.10-335-g02bf610/manual/libc.texinfo
++++ glibc-2.10.90-22/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -949,8 +949,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-330-gd76da20/misc/sys/cdefs.h
-+++ glibc-2.10.90-20/misc/sys/cdefs.h
+--- glibc-2.10-335-g02bf610/misc/sys/cdefs.h
++++ glibc-2.10.90-22/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -994,17 +994,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-330-gd76da20/nis/nss
-+++ glibc-2.10.90-20/nis/nss
+--- glibc-2.10-335-g02bf610/nis/nss
++++ glibc-2.10.90-22/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-330-gd76da20/nptl/ChangeLog
-+++ glibc-2.10.90-20/nptl/ChangeLog
-@@ -3713,6 +3713,15 @@
+--- glibc-2.10-335-g02bf610/nptl/ChangeLog
++++ glibc-2.10.90-22/nptl/ChangeLog
+@@ -3717,6 +3717,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1020,7 +1020,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4449,6 +4458,11 @@
+@@ -4453,6 +4462,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1032,7 +1032,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6523,6 +6537,11 @@
+@@ -6527,6 +6541,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1044,8 +1044,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-330-gd76da20/nptl/Makefile
-+++ glibc-2.10.90-20/nptl/Makefile
+--- glibc-2.10-335-g02bf610/nptl/Makefile
++++ glibc-2.10.90-22/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1078,8 +1078,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-330-gd76da20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-335-g02bf610/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-22/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1088,8 +1088,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-330-gd76da20/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-20/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-335-g02bf610/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-22/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1097,8 +1097,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-330-gd76da20/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-20/nptl/tst-stackguard1.c
+--- glibc-2.10-335-g02bf610/nptl/tst-stackguard1.c
++++ glibc-2.10.90-22/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1123,8 +1123,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-330-gd76da20/nscd/nscd.conf
-+++ glibc-2.10.90-20/nscd/nscd.conf
+--- glibc-2.10-335-g02bf610/nscd/nscd.conf
++++ glibc-2.10.90-22/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1134,8 +1134,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-330-gd76da20/nscd/nscd.init
-+++ glibc-2.10.90-20/nscd/nscd.init
+--- glibc-2.10-335-g02bf610/nscd/nscd.init
++++ glibc-2.10.90-22/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1176,7 +1176,22 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
-@@ -104,9 +93,12 @@ case "$1" in
+@@ -83,7 +72,7 @@ restart() {
+ # See how we were called.
+ case "$1" in
+     start)
+-	start
++	[ -e /var/lock/subsys/nscd ] || start
+ 	RETVAL=$?
+ 	;;
+     stop)
+@@ -99,14 +88,17 @@ case "$1" in
+ 	RETVAL=$?
+ 	;;
+     try-restart | condrestart)
+-	[ -e /var/lock/subsys/nscd ] && restart
++	[ ! -e /var/lock/subsys/nscd ] || restart
+ 	RETVAL=$?
  	;;
      force-reload | reload)
      	echo -n $"Reloading $prog: "
@@ -1192,8 +1207,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-330-gd76da20/posix/Makefile
-+++ glibc-2.10.90-20/posix/Makefile
+--- glibc-2.10-335-g02bf610/posix/Makefile
++++ glibc-2.10.90-22/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1214,8 +1229,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-330-gd76da20/posix/getconf.speclist.h
-+++ glibc-2.10.90-20/posix/getconf.speclist.h
+--- glibc-2.10-335-g02bf610/posix/getconf.speclist.h
++++ glibc-2.10.90-22/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1256,8 +1271,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-330-gd76da20/streams/Makefile
-+++ glibc-2.10.90-20/streams/Makefile
+--- glibc-2.10-335-g02bf610/streams/Makefile
++++ glibc-2.10.90-22/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1267,8 +1282,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-330-gd76da20/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-20/sysdeps/generic/dl-cache.h
+--- glibc-2.10-335-g02bf610/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-22/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1284,8 +1299,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-330-gd76da20/sysdeps/i386/Makefile
-+++ glibc-2.10.90-20/sysdeps/i386/Makefile
+--- glibc-2.10-335-g02bf610/sysdeps/i386/Makefile
++++ glibc-2.10.90-22/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1310,8 +1325,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-330-gd76da20/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-20/sysdeps/ia64/Makefile
+--- glibc-2.10-335-g02bf610/sysdeps/ia64/Makefile
++++ glibc-2.10.90-22/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1323,8 +1338,8 @@
  endif
  endif
  
---- glibc-2.10-330-gd76da20/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-20/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-335-g02bf610/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-22/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1676,8 +1691,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-330-gd76da20/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-20/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-335-g02bf610/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-22/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1763,8 +1778,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-330-gd76da20/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-20/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-335-g02bf610/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-22/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1773,8 +1788,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-330-gd76da20/sysdeps/unix/nice.c
-+++ glibc-2.10.90-20/sysdeps/unix/nice.c
+--- glibc-2.10-335-g02bf610/sysdeps/unix/nice.c
++++ glibc-2.10.90-22/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1789,8 +1804,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1806,8 +1821,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1855,8 +1870,8 @@
      }
    else
  #endif
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1899,8 +1914,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1919,8 +1934,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1981,8 +1996,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2015,29 +2030,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2063,8 +2078,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2074,8 +2089,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2121,8 +2136,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-330-gd76da20/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-20/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2141,8 +2156,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-330-gd76da20/timezone/zic.c
-+++ glibc-2.10.90-20/timezone/zic.c
+--- glibc-2.10-335-g02bf610/timezone/zic.c
++++ glibc-2.10.90-22/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- glibc.spec	7 Sep 2009 09:07:10 -0000	1.415
+++ glibc.spec	14 Sep 2009 12:23:30 -0000	1.416
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-330-gd76da20
+%define glibcsrcdir glibc-2.10-335-g02bf610
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 21
+Release: 22
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -320,6 +320,8 @@ GXX="g++ -m64"
 %endif
 
 BuildFlags="$BuildFlags -fasynchronous-unwind-tables"
+# gcc is a memory hog without that (#523172).
+BuildFlags="$BuildFlags -fno-var-tracking-assignments"
 # Add -DNDEBUG unless using a prerelease
 case %{version} in
   *.*.9[0-9]*) ;;
@@ -1029,6 +1031,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Sep 14 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-22
+- Update from master.
+  - Fix endless loop in localedef.
+  - Fix __longjmp_chk on s390/s390x.
+- Fix exit codes in nscd start script (#521848).
+- Build with -fno-var-tracking-assignments for now (#523172).
+
 * Mon Sep  7 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-21
 - Update from master.
   - Fix strstr/strcasestr on i386 (#519226).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- import.log	7 Sep 2009 09:07:10 -0000	1.31
+++ import.log	14 Sep 2009 12:23:30 -0000	1.32
@@ -29,3 +29,4 @@ glibc-2_10_90-18:HEAD:glibc-2.10.90-18.s
 glibc-2_10_90-19:HEAD:glibc-2.10.90-19.src.rpm:1251889856
 glibc-2_10_90-20:HEAD:glibc-2.10.90-20.src.rpm:1251969190
 glibc-2_10_90-21:HEAD:glibc-2.10.90-21.src.rpm:1252314102
+glibc-2_10_90-22:HEAD:glibc-2.10.90-22.src.rpm:1252930886


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- sources	7 Sep 2009 09:07:10 -0000	1.313
+++ sources	14 Sep 2009 12:23:30 -0000	1.314
@@ -1,2 +1,2 @@
-ef40c728d91ed19586b58497d91383fa  glibc-2.10-330-gd76da20-fedora.tar.bz2
-9f6e94c84392136723f0c4f249123ae2  glibc-2.10-330-gd76da20.tar.bz2
+7cf85b26787ff05f8f286ba49ce6cfd3  glibc-2.10-335-g02bf610-fedora.tar.bz2
+f886b8d4e1f0d30bc6ae0039cd7e93b0  glibc-2.10-335-g02bf610.tar.bz2



From jreznik at fedoraproject.org  Mon Sep 14 12:26:00 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 14 Sep 2009 12:26:00 +0000 (UTC)
Subject: rpms/system-config-bind/devel .cvsignore, 1.40, 1.41 sources, 1.57, 
	1.58 system-config-bind.spec, 1.85, 1.86
Message-ID: <20090914122600.AC0FE11C00EC@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17032

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.14-1
- repackage for translation team request (rhbz#522429)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	11 Jun 2009 12:17:55 -0000	1.40
+++ .cvsignore	14 Sep 2009 12:26:00 -0000	1.41
@@ -1 +1 @@
-system-config-bind-4.0.13.tar.gz
+system-config-bind-4.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	11 Jun 2009 12:17:55 -0000	1.57
+++ sources	14 Sep 2009 12:26:00 -0000	1.58
@@ -1 +1 @@
-ac3de87507dd803b0bf1cacdbaf6ca63  system-config-bind-4.0.13.tar.gz
+718b2cc5c47351d14f8cf77370011a04  system-config-bind-4.0.14.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- system-config-bind.spec	27 Jul 2009 05:21:16 -0000	1.85
+++ system-config-bind.spec	14 Sep 2009 12:26:00 -0000	1.86
@@ -1,7 +1,7 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.13
-Release:        2%{?dist}
+Version:        4.0.14
+Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
 Group:          Applications/System
@@ -82,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi;
 
 %changelog
+* Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.14-1
+- repackage for translation team request (rhbz#522429)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Sep 14 12:31:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:31:18 +0000
Subject: [pkgdb] python-cryptsetup: agk has requested watchcommits
Message-ID: <20090914123118.B303710F87D@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on python-cryptsetup (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-cryptsetup



From pkgdb at fedoraproject.org  Mon Sep 14 12:31:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:31:19 +0000
Subject: [pkgdb] python-cryptsetup: agk has requested watchcommits
Message-ID: <20090914123119.60A0C10F886@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on python-cryptsetup (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-cryptsetup



From pkgdb at fedoraproject.org  Mon Sep 14 12:32:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:32:00 +0000
Subject: [pkgdb] pam_mount: agk has requested watchcommits
Message-ID: <20090914123200.02BED10F87D@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pam_mount (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pam_mount



From pkgdb at fedoraproject.org  Mon Sep 14 12:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:33:37 +0000
Subject: [pkgdb] dracut: agk has requested watchcommits
Message-ID: <20090914123338.00B2F10F895@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on dracut (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dracut



From pkgdb at fedoraproject.org  Mon Sep 14 12:33:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:33:41 +0000
Subject: [pkgdb] dracut: agk has requested watchcommits
Message-ID: <20090914123341.6651D10F898@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on dracut (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dracut



From harald at fedoraproject.org  Mon Sep 14 12:34:10 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 14 Sep 2009 12:34:10 +0000 (UTC)
Subject: rpms/system-config-network/devel system-config-network.spec, 1.50, 
	1.51
Message-ID: <20090914123410.CB35011C00EC@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20103

Modified Files:
	system-config-network.spec 
Log Message:
* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.99-1
- version 1.5.99
- removed all rhpl requirements
- extended classes for --import and --export



Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- system-config-network.spec	27 Jul 2009 05:24:19 -0000	1.50
+++ system-config-network.spec	14 Sep 2009 12:34:10 -0000	1.51
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.5.97
-Release: 2%{?dist}
+Version: 1.5.99
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -26,7 +26,8 @@ Summary: The Network Adminstration Tool
 Group: Applications/System 
 Obsoletes: netcfg <= 2.36-3p redhat-config-network-tui <= %{version} netconf <= 0.1-1 netconfig <= 0.8.24-1.2.2.1
 Provides: redhat-config-network-tui = %{version} netcfg = 2.36-3p.1 netconf = 0.1-1.1 netconfig = 0.8.24-1.2.2.1.1
-Requires: initscripts >= 0:5.99, usermode , python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils, usermode, dbus-python
+Requires: initscripts >= 0:5.99, usermode , python, rpm-python, newt-python, pciutils, usermode, dbus-python
+Requires: python-ethtool python-iwlib
 
 %description tui
 This is the network configuration tool,
@@ -102,8 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.97-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.99-1
+- version 1.5.99
+- removed all rhpl requirements
+- extended classes for --import and --export
 
 * Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 1.5.97-1
 - translation update



From pkgdb at fedoraproject.org  Mon Sep 14 12:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:34:48 +0000
Subject: [pkgdb] udev-extras: agk has requested watchcommits
Message-ID: <20090914123448.2229D10F880@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on udev-extras (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/udev-extras



From pkgdb at fedoraproject.org  Mon Sep 14 12:34:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:34:57 +0000
Subject: [pkgdb] udev-extras: agk has requested watchcommits
Message-ID: <20090914123457.97AC710F888@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on udev-extras (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/udev-extras



From harald at fedoraproject.org  Mon Sep 14 12:35:07 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 14 Sep 2009 12:35:07 +0000 (UTC)
Subject: rpms/system-config-network/devel .cvsignore, 1.32, 1.33 sources,
	1.35, 1.36
Message-ID: <20090914123507.6345E11C00EC@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20508

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.99-1
- version 1.5.99
- removed all rhpl requirements
- extended classes for --import and --export



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	14 Apr 2009 14:17:56 -0000	1.32
+++ .cvsignore	14 Sep 2009 12:35:07 -0000	1.33
@@ -1 +1 @@
-system-config-network-1.5.97.tar.bz2
+system-config-network-1.5.99.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	14 Apr 2009 14:17:57 -0000	1.35
+++ sources	14 Sep 2009 12:35:07 -0000	1.36
@@ -1 +1 @@
-eb3d4d9f61c42e24d32cce719af0a739  system-config-network-1.5.97.tar.bz2
+a8cc18cd00ff4099ba502634e866c724  system-config-network-1.5.99.tar.bz2



From thias at fedoraproject.org  Mon Sep 14 12:43:23 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:43:23 +0000 (UTC)
Subject: rpms/synergy-plus/EL-4 synergy-plus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914124323.9C8E811C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	synergy-plus.spec 
Log Message:
Don't use the -executable find option as it doesn't work with older versions, initial import for non-devel branches.



--- NEW FILE synergy-plus.spec ---
Summary: Mouse and keyboard sharing utility
Name: synergy-plus
Version: 1.3.4
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://code.google.com/p/synergy-plus/
Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: xorg-x11-devel

%description
Synergy+ (synergy-plus) lets you easily share a single mouse and keyboard
between multiple computers with different operating systems, without special
hardware. All you need is a LAN connection. It's intended for users with
multiple computers, where each system uses its own display. It's a little
like having a 2nd or a 3rd desktop.
Synergy+ is a maintenance fork for implementing bug fixes to the original
Synergy, which hasn't received any source updates or new releases since 2006.


%prep
%setup -q
# Remove spurious executable bit from sources files
find . -type f -name '*.cpp' -exec chmod -x {} \;


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
# None of the documentation files are actually useful here, they all point to
# the online website, so include just one, the README
%doc COPYING README examples/synergy.conf
%{_bindir}/synergyc
%{_bindir}/synergys


%changelog
* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-3
- Don't use the -executable find option, it doesn't work with older versions.

* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-2
- Initial RPM release, based on the spec from the original synergy.
- Remove spurious executable bit from sources files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:58:42 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:43:23 -0000	1.2
@@ -0,0 +1 @@
+synergy-plus-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:58:42 -0000	1.1
+++ sources	14 Sep 2009 12:43:23 -0000	1.2
@@ -0,0 +1 @@
+2c565afe5f920d363eef38dd97449b73  synergy-plus-1.3.4.tar.gz



From thias at fedoraproject.org  Mon Sep 14 12:43:23 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:43:23 +0000 (UTC)
Subject: rpms/synergy-plus/EL-5 synergy-plus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914124323.DA26611C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	synergy-plus.spec 
Log Message:
Don't use the -executable find option as it doesn't work with older versions, initial import for non-devel branches.



--- NEW FILE synergy-plus.spec ---
Summary: Mouse and keyboard sharing utility
Name: synergy-plus
Version: 1.3.4
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://code.google.com/p/synergy-plus/
Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXt-devel
BuildRequires: libXinerama-devel

%description
Synergy+ (synergy-plus) lets you easily share a single mouse and keyboard
between multiple computers with different operating systems, without special
hardware. All you need is a LAN connection. It's intended for users with
multiple computers, where each system uses its own display. It's a little
like having a 2nd or a 3rd desktop.
Synergy+ is a maintenance fork for implementing bug fixes to the original
Synergy, which hasn't received any source updates or new releases since 2006.


%prep
%setup -q
# Remove spurious executable bit from sources files
find . -type f -name '*.cpp' -exec chmod -x {} \;


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
# None of the documentation files are actually useful here, they all point to
# the online website, so include just one, the README
%doc COPYING README examples/synergy.conf
%{_bindir}/synergyc
%{_bindir}/synergys


%changelog
* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-3
- Don't use the -executable find option, it doesn't work with older versions.

* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-2
- Initial RPM release, based on the spec from the original synergy.
- Remove spurious executable bit from sources files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:58:42 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:43:23 -0000	1.2
@@ -0,0 +1 @@
+synergy-plus-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:58:42 -0000	1.1
+++ sources	14 Sep 2009 12:43:23 -0000	1.2
@@ -0,0 +1 @@
+2c565afe5f920d363eef38dd97449b73  synergy-plus-1.3.4.tar.gz



From thias at fedoraproject.org  Mon Sep 14 12:43:24 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:43:24 +0000 (UTC)
Subject: rpms/synergy-plus/devel synergy-plus.spec,1.1,1.2
Message-ID: <20090914124324.7CDD111C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789/devel

Modified Files:
	synergy-plus.spec 
Log Message:
Don't use the -executable find option as it doesn't work with older versions, initial import for non-devel branches.



Index: synergy-plus.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/devel/synergy-plus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synergy-plus.spec	14 Sep 2009 10:00:10 -0000	1.1
+++ synergy-plus.spec	14 Sep 2009 12:43:24 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy-plus
 Version: 1.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://code.google.com/p/synergy-plus/
@@ -26,7 +26,7 @@ Synergy, which hasn't received any sourc
 %prep
 %setup -q
 # Remove spurious executable bit from sources files
-find . -type f -name '*.cpp' -executable -exec chmod -x {} \;
+find . -type f -name '*.cpp' -exec chmod -x {} \;
 
 
 %build
@@ -53,6 +53,9 @@ find . -type f -name '*.cpp' -executable
 
 
 %changelog
+* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-3
+- Don't use the -executable find option, it doesn't work with older versions.
+
 * Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-2
 - Initial RPM release, based on the spec from the original synergy.
 - Remove spurious executable bit from sources files.



From thias at fedoraproject.org  Mon Sep 14 12:43:24 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:43:24 +0000 (UTC)
Subject: rpms/synergy-plus/F-10 synergy-plus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914124324.1FE2411C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	synergy-plus.spec 
Log Message:
Don't use the -executable find option as it doesn't work with older versions, initial import for non-devel branches.



--- NEW FILE synergy-plus.spec ---
Summary: Mouse and keyboard sharing utility
Name: synergy-plus
Version: 1.3.4
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://code.google.com/p/synergy-plus/
Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXt-devel
BuildRequires: libXinerama-devel

%description
Synergy+ (synergy-plus) lets you easily share a single mouse and keyboard
between multiple computers with different operating systems, without special
hardware. All you need is a LAN connection. It's intended for users with
multiple computers, where each system uses its own display. It's a little
like having a 2nd or a 3rd desktop.
Synergy+ is a maintenance fork for implementing bug fixes to the original
Synergy, which hasn't received any source updates or new releases since 2006.


%prep
%setup -q
# Remove spurious executable bit from sources files
find . -type f -name '*.cpp' -exec chmod -x {} \;


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
# None of the documentation files are actually useful here, they all point to
# the online website, so include just one, the README
%doc COPYING README examples/synergy.conf
%{_bindir}/synergyc
%{_bindir}/synergys


%changelog
* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-3
- Don't use the -executable find option, it doesn't work with older versions.

* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-2
- Initial RPM release, based on the spec from the original synergy.
- Remove spurious executable bit from sources files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:58:42 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:43:23 -0000	1.2
@@ -0,0 +1 @@
+synergy-plus-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:58:42 -0000	1.1
+++ sources	14 Sep 2009 12:43:23 -0000	1.2
@@ -0,0 +1 @@
+2c565afe5f920d363eef38dd97449b73  synergy-plus-1.3.4.tar.gz



From thias at fedoraproject.org  Mon Sep 14 12:43:24 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:43:24 +0000 (UTC)
Subject: rpms/synergy-plus/F-11 synergy-plus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914124324.5157E11C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	synergy-plus.spec 
Log Message:
Don't use the -executable find option as it doesn't work with older versions, initial import for non-devel branches.



--- NEW FILE synergy-plus.spec ---
Summary: Mouse and keyboard sharing utility
Name: synergy-plus
Version: 1.3.4
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://code.google.com/p/synergy-plus/
Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXt-devel
BuildRequires: libXinerama-devel

%description
Synergy+ (synergy-plus) lets you easily share a single mouse and keyboard
between multiple computers with different operating systems, without special
hardware. All you need is a LAN connection. It's intended for users with
multiple computers, where each system uses its own display. It's a little
like having a 2nd or a 3rd desktop.
Synergy+ is a maintenance fork for implementing bug fixes to the original
Synergy, which hasn't received any source updates or new releases since 2006.


%prep
%setup -q
# Remove spurious executable bit from sources files
find . -type f -name '*.cpp' -exec chmod -x {} \;


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
# None of the documentation files are actually useful here, they all point to
# the online website, so include just one, the README
%doc COPYING README examples/synergy.conf
%{_bindir}/synergyc
%{_bindir}/synergys


%changelog
* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-3
- Don't use the -executable find option, it doesn't work with older versions.

* Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-2
- Initial RPM release, based on the spec from the original synergy.
- Remove spurious executable bit from sources files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:58:42 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:43:24 -0000	1.2
@@ -0,0 +1 @@
+synergy-plus-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:58:42 -0000	1.1
+++ sources	14 Sep 2009 12:43:24 -0000	1.2
@@ -0,0 +1 @@
+2c565afe5f920d363eef38dd97449b73  synergy-plus-1.3.4.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 14 12:47:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:47:52 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090914124752.0AB8F10F87D@bastion2.fedora.phx.redhat.com>

bkearney has set the watchbugzilla acl on sugar-turtleart (Fedora devel) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Sep 14 12:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:47:53 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090914124753.2850D10F886@bastion2.fedora.phx.redhat.com>

bkearney has set the watchcommits acl on sugar-turtleart (Fedora devel) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Sep 14 12:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:47:54 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090914124754.80D6210F894@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-turtleart (Fedora devel) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Sep 14 12:48:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:48:01 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090914124801.2DBCF10F89B@bastion2.fedora.phx.redhat.com>

bkearney has set the watchbugzilla acl on sugar-turtleart (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Sep 14 12:48:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:48:01 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090914124802.061DF10F89F@bastion2.fedora.phx.redhat.com>

bkearney has set the watchcommits acl on sugar-turtleart (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Sep 14 12:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:48:03 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090914124803.90B2710F8A3@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-turtleart (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From marx at fedoraproject.org  Mon Sep 14 12:49:48 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Sep 2009 12:49:48 +0000 (UTC)
Subject: rpms/system-config-lvm/devel .cvsignore, 1.27, 1.28 sources, 1.29, 
	1.30 system-config-lvm.spec, 1.42, 1.43
Message-ID: <20090914124948.B2E3B11C00EC@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26450

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
Resolves: #522315, #522448




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	20 Aug 2009 22:37:50 -0000	1.27
+++ .cvsignore	14 Sep 2009 12:49:48 -0000	1.28
@@ -1 +1,2 @@
 system-config-lvm-1.1.9.tar.gz
+system-config-lvm-1.1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	20 Aug 2009 22:37:51 -0000	1.29
+++ sources	14 Sep 2009 12:49:48 -0000	1.30
@@ -1 +1 @@
-03f76abaa184b3c1df713113cd64f4f3  system-config-lvm-1.1.9.tar.gz
+042e369e6f45cc27a35d2c3ea97b525c  system-config-lvm-1.1.10.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- system-config-lvm.spec	20 Aug 2009 22:37:51 -0000	1.42
+++ system-config-lvm.spec	14 Sep 2009 12:49:48 -0000	1.43
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.9
+Version: 1.1.10
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Sep 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.10
+- Resolves: #522315 - Fails when using pvcreate
+- Resolves: #522448 - Request for rebuilding
+
 * Fri Aug 21 2009 Marek Grac <mgrac at redhat.com> - 1.1.9
 - Bugfix #474996: Unable to start without cluster.conf
 



From thias at fedoraproject.org  Mon Sep 14 12:53:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:53:25 +0000 (UTC)
Subject: rpms/spawn-fcgi/EL-5 spawn-fcgi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914125325.55BB311C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spawn-fcgi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	spawn-fcgi.spec 
Log Message:
Initial import for all non-devel branches.



--- NEW FILE spawn-fcgi.spec ---
Summary: Simple program for spawning FastCGI processes
Name: spawn-fcgi
Version: 1.6.2
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
Source0: http://www.lighttpd.net/download/spawn-fcgi-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package contains the spawn-fcgi program used for spawning FastCGI
processes, which can be local or remote.


%prep
%setup -q


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/spawn-fcgi
%{_mandir}/man1/spawn-fcgi.1*


%changelog
* Tue Apr 21 2009 Matthias Saou <http://freshrpms.net/> 1.6.2-1
- Update to 1.6.2.
- Remove leftover -f from %%files section.

* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.6.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:59:41 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:53:25 -0000	1.2
@@ -0,0 +1 @@
+spawn-fcgi-1.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:59:41 -0000	1.1
+++ sources	14 Sep 2009 12:53:25 -0000	1.2
@@ -0,0 +1 @@
+f74a8f4d8e379c53926b5eeef84b381c  spawn-fcgi-1.6.2.tar.bz2



From thias at fedoraproject.org  Mon Sep 14 12:53:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:53:25 +0000 (UTC)
Subject: rpms/spawn-fcgi/EL-4 spawn-fcgi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914125325.30BEC11C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spawn-fcgi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	spawn-fcgi.spec 
Log Message:
Initial import for all non-devel branches.



--- NEW FILE spawn-fcgi.spec ---
Summary: Simple program for spawning FastCGI processes
Name: spawn-fcgi
Version: 1.6.2
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
Source0: http://www.lighttpd.net/download/spawn-fcgi-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package contains the spawn-fcgi program used for spawning FastCGI
processes, which can be local or remote.


%prep
%setup -q


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/spawn-fcgi
%{_mandir}/man1/spawn-fcgi.1*


%changelog
* Tue Apr 21 2009 Matthias Saou <http://freshrpms.net/> 1.6.2-1
- Update to 1.6.2.
- Remove leftover -f from %%files section.

* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.6.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:59:41 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:53:24 -0000	1.2
@@ -0,0 +1 @@
+spawn-fcgi-1.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:59:41 -0000	1.1
+++ sources	14 Sep 2009 12:53:24 -0000	1.2
@@ -0,0 +1 @@
+f74a8f4d8e379c53926b5eeef84b381c  spawn-fcgi-1.6.2.tar.bz2



From marx at fedoraproject.org  Mon Sep 14 12:53:31 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Sep 2009 12:53:31 +0000 (UTC)
Subject: rpms/system-config-lvm/F-10 .cvsignore, 1.25, 1.26 sources, 1.27,
	1.28 system-config-lvm.spec, 1.34, 1.35
Message-ID: <20090914125331.D7C8111C00EC@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28193

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
Resolves: #522315, #522448



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	20 Aug 2009 22:53:02 -0000	1.25
+++ .cvsignore	14 Sep 2009 12:53:31 -0000	1.26
@@ -1 +1 @@
-system-config-lvm-1.1.9.tar.gz
+system-config-lvm-1.1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	20 Aug 2009 22:53:02 -0000	1.27
+++ sources	14 Sep 2009 12:53:31 -0000	1.28
@@ -1 +1 @@
-03f76abaa184b3c1df713113cd64f4f3  system-config-lvm-1.1.9.tar.gz
+042e369e6f45cc27a35d2c3ea97b525c  system-config-lvm-1.1.10.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/system-config-lvm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- system-config-lvm.spec	20 Aug 2009 22:53:02 -0000	1.34
+++ system-config-lvm.spec	14 Sep 2009 12:53:31 -0000	1.35
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.9
+Version: 1.1.10
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -62,6 +62,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Sep 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.10
+- Resolves: #522315 - Fails when using pvcreate
+- Resolves: #522448 - Request for rebuilding
+
 * Fri Aug 21 2009 Marek Grac <mgrac at redhat.com> - 1.1.9
 - Bugfix #474996: Unable to start without cluster.conf
 



From thias at fedoraproject.org  Mon Sep 14 12:53:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:53:25 +0000 (UTC)
Subject: rpms/spawn-fcgi/F-10 spawn-fcgi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914125325.879A611C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spawn-fcgi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	spawn-fcgi.spec 
Log Message:
Initial import for all non-devel branches.



--- NEW FILE spawn-fcgi.spec ---
Summary: Simple program for spawning FastCGI processes
Name: spawn-fcgi
Version: 1.6.2
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
Source0: http://www.lighttpd.net/download/spawn-fcgi-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package contains the spawn-fcgi program used for spawning FastCGI
processes, which can be local or remote.


%prep
%setup -q


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/spawn-fcgi
%{_mandir}/man1/spawn-fcgi.1*


%changelog
* Tue Apr 21 2009 Matthias Saou <http://freshrpms.net/> 1.6.2-1
- Update to 1.6.2.
- Remove leftover -f from %%files section.

* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.6.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:59:41 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:53:25 -0000	1.2
@@ -0,0 +1 @@
+spawn-fcgi-1.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:59:41 -0000	1.1
+++ sources	14 Sep 2009 12:53:25 -0000	1.2
@@ -0,0 +1 @@
+f74a8f4d8e379c53926b5eeef84b381c  spawn-fcgi-1.6.2.tar.bz2



From thias at fedoraproject.org  Mon Sep 14 12:53:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 12:53:25 +0000 (UTC)
Subject: rpms/spawn-fcgi/F-11 spawn-fcgi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090914125325.BA55011C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spawn-fcgi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	spawn-fcgi.spec 
Log Message:
Initial import for all non-devel branches.



--- NEW FILE spawn-fcgi.spec ---
Summary: Simple program for spawning FastCGI processes
Name: spawn-fcgi
Version: 1.6.2
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
Source0: http://www.lighttpd.net/download/spawn-fcgi-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package contains the spawn-fcgi program used for spawning FastCGI
processes, which can be local or remote.


%prep
%setup -q


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/spawn-fcgi
%{_mandir}/man1/spawn-fcgi.1*


%changelog
* Tue Apr 21 2009 Matthias Saou <http://freshrpms.net/> 1.6.2-1
- Update to 1.6.2.
- Remove leftover -f from %%files section.

* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.6.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:59:41 -0000	1.1
+++ .cvsignore	14 Sep 2009 12:53:25 -0000	1.2
@@ -0,0 +1 @@
+spawn-fcgi-1.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:59:41 -0000	1.1
+++ sources	14 Sep 2009 12:53:25 -0000	1.2
@@ -0,0 +1 @@
+f74a8f4d8e379c53926b5eeef84b381c  spawn-fcgi-1.6.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:40 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchcommits
Message-ID: <20090914125340.4A04B10F888@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchcommits acl on system-config-rootpassword (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:40 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchbugzilla
Message-ID: <20090914125340.E38FE10F89A@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchbugzilla acl on system-config-rootpassword (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:40 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested commit
Message-ID: <20090914125340.EAB3810F88C@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on system-config-rootpassword (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:44 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	approveacls
Message-ID: <20090914125344.5BFDE10F89C@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on system-config-rootpassword (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:49 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchbugzilla
Message-ID: <20090914125349.1B1A410F89D@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchbugzilla acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:49 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested commit
Message-ID: <20090914125350.0D77910F8A1@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:54 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	approveacls
Message-ID: <20090914125354.3ADCA10F8A2@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:53:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:53:55 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchcommits
Message-ID: <20090914125355.C882210F8A6@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchcommits acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:01 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchcommits
Message-ID: <20090914125401.6468210F8AF@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchcommits acl on system-config-rootpassword (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:01 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchbugzilla
Message-ID: <20090914125401.6459E10F8AD@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchbugzilla acl on system-config-rootpassword (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:02 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested commit
Message-ID: <20090914125402.54CB510F8B2@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on system-config-rootpassword (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:02 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	approveacls
Message-ID: <20090914125402.E261D10F8B5@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on system-config-rootpassword (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:14 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested commit
Message-ID: <20090914125414.9861D10F8B9@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on system-config-rootpassword (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:14 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchcommits
Message-ID: <20090914125414.51F1010F8B6@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchcommits acl on system-config-rootpassword (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:16 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	approveacls
Message-ID: <20090914125417.3964610F8BA@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on system-config-rootpassword (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:19 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchbugzilla
Message-ID: <20090914125419.5175110F8BE@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchbugzilla acl on system-config-rootpassword (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:24 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchcommits
Message-ID: <20090914125424.EF58D10F8C0@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchcommits acl on system-config-rootpassword (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:25 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchbugzilla
Message-ID: <20090914125425.57F2610F8C3@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchbugzilla acl on system-config-rootpassword (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:25 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested commit
Message-ID: <20090914125425.A126810F8C5@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on system-config-rootpassword (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:27 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	approveacls
Message-ID: <20090914125427.800D210F8C6@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on system-config-rootpassword (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:32 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchcommits
Message-ID: <20090914125432.4C48110F8A3@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchcommits acl on system-config-rootpassword (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:33 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested commit
Message-ID: <20090914125433.69A6B10F8CE@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on system-config-rootpassword (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:37 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	approveacls
Message-ID: <20090914125437.7B66110F8D1@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on system-config-rootpassword (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:38 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has requested
	watchbugzilla
Message-ID: <20090914125439.0A38710F8D0@bastion2.fedora.phx.redhat.com>

rnovacek has requested the watchbugzilla acl on system-config-rootpassword (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:43 +0000
Subject: [pkgdb] dracut had acl change status
Message-ID: <20090914125443.2516610F8D4@bastion2.fedora.phx.redhat.com>

harald has set the watchcommits acl on dracut (Fedora devel) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dracut



From pkgdb at fedoraproject.org  Mon Sep 14 12:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:54:46 +0000
Subject: [pkgdb] dracut had acl change status
Message-ID: <20090914125446.987FB10F8A4@bastion2.fedora.phx.redhat.com>

harald has set the watchcommits acl on dracut (Fedora 11) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dracut



From pkgdb at fedoraproject.org  Mon Sep 14 12:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:55:48 +0000
Subject: [pkgdb] udev-extras had acl change status
Message-ID: <20090914125548.E58BF10F8B0@bastion2.fedora.phx.redhat.com>

harald has set the watchcommits acl on udev-extras (Fedora devel) to Obsolete for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/udev-extras



From marx at fedoraproject.org  Mon Sep 14 12:55:58 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Sep 2009 12:55:58 +0000 (UTC)
Subject: rpms/system-config-lvm/F-11 .cvsignore, 1.25, 1.26 sources, 1.27,
	1.28 system-config-lvm.spec, 1.36, 1.37
Message-ID: <20090914125558.A81D211C00EC@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29332

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
Resolves: #522315, #522448



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	20 Aug 2009 22:40:03 -0000	1.25
+++ .cvsignore	14 Sep 2009 12:55:58 -0000	1.26
@@ -1 +1 @@
-system-config-lvm-1.1.9.tar.gz
+system-config-lvm-1.1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	20 Aug 2009 22:40:03 -0000	1.27
+++ sources	14 Sep 2009 12:55:58 -0000	1.28
@@ -1 +1 @@
-03f76abaa184b3c1df713113cd64f4f3  system-config-lvm-1.1.9.tar.gz
+042e369e6f45cc27a35d2c3ea97b525c  system-config-lvm-1.1.10.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/system-config-lvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- system-config-lvm.spec	20 Aug 2009 22:40:03 -0000	1.36
+++ system-config-lvm.spec	14 Sep 2009 12:55:58 -0000	1.37
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.9
+Version: 1.1.10
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -62,6 +62,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Sep 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.10
+- Resolves: #522315 - Fails when using pvcreate
+- Resolves: #522448 - Request for rebuilding
+
 * Fri Aug 21 2009 Marek Grac <mgrac at redhat.com> - 1.1.9
 - Bugfix #474996: Unable to start without cluster.conf
 



From pkgdb at fedoraproject.org  Mon Sep 14 12:55:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:55:57 +0000
Subject: [pkgdb] udev-extras had acl change status
Message-ID: <20090914125558.0471310F8B4@bastion2.fedora.phx.redhat.com>

harald has set the watchcommits acl on udev-extras (Fedora 11) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/udev-extras



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:27 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125627.8CAFF10F8B9@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on system-config-rootpassword (Fedora devel) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:27 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125627.A437510F8BD@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on system-config-rootpassword (Fedora devel) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:28 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125628.C69D710F8C0@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on system-config-rootpassword (Fedora devel) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:29 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125629.B3A2310F8C4@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on system-config-rootpassword (Fedora devel) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:33 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125633.2229B10F8C7@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on system-config-rootpassword (Fedora 7) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:35 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125635.E66C110F8D9@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on system-config-rootpassword (Fedora 7) to Obsolete for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:41 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125642.00C8810F8DA@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on system-config-rootpassword (Fedora 10) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:42 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125642.9E93910F8DD@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on system-config-rootpassword (Fedora 10) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:42 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125643.1323510F8E0@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on system-config-rootpassword (Fedora 10) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:44 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125644.98D6210F8ED@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on system-config-rootpassword (Fedora 10) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:46 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125646.5D09610F8FC@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on system-config-rootpassword (Fedora 11) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:45 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125646.08FBA10F8F2@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on system-config-rootpassword (Fedora 11) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:47 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125647.8FCE810F8FE@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on system-config-rootpassword (Fedora 11) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 12:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 12:56:50 +0000
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <20090914125650.14ECE10F8D1@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on system-config-rootpassword (Fedora 11) to Approved for rnovacek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 13:00:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 13:00:12 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has given up
	watchcommits
Message-ID: <20090914130012.CE71510F888@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchcommits acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 13:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 13:00:26 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has given up
	approveacls
Message-ID: <20090914130026.AC6C810F88C@bastion2.fedora.phx.redhat.com>

rnovacek has given up the approveacls acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From pkgdb at fedoraproject.org  Mon Sep 14 13:00:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 13:00:35 +0000
Subject: [pkgdb] system-config-rootpassword: rnovacek has given up commit
Message-ID: <20090914130035.F1A2510F898@bastion2.fedora.phx.redhat.com>

rnovacek has given up the commit acl on system-config-rootpassword (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From npajkovs at fedoraproject.org  Mon Sep 14 13:03:26 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 14 Sep 2009 13:03:26 +0000 (UTC)
Subject: rpms/inn/devel inn.spec,1.68,1.69
Message-ID: <20090914130326.313D611C00EC@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32225

Modified Files:
	inn.spec 
Log Message:
resolved: 511772 - inn/storage.h not self-contained, missing inn/options.h


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- inn.spec	25 Jul 2009 03:24:51 -0000	1.68
+++ inn.spec	14 Sep 2009 13:03:25 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -23,6 +23,7 @@ Patch10: inn-2.4.3-nologinshell.patch
 Patch11: inn-2.4.5-dynlib.patch
 Patch12: inn-sasl_encode64nullterm.patch
 Patch13: inn-2.5.0-chown.patch
+Patch14: inn-2.5.0-missing-headers.patch
 BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
 BuildRequires: perl(ExtUtils::Embed)
 Requires(pre): shadow-utils
@@ -94,6 +95,7 @@ exit 0
 %patch11 -p1 -b .dynlib
 %patch12 -p1 -b .nullterm
 %patch13 -p1 -b .chown
+%patch14 -p1 -b .missing-headers
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -137,7 +139,7 @@ for f in clibrary.h config.h dbz.h
 do
     install -c -m 0644 ./include/$f $RPM_BUILD_ROOT/usr/include/inn
 done
-for f in defines.h system.h libinn.h storage.h
+for f in defines.h system.h libinn.h storage.h options.h
 do
     install -c -m 0644 ./include/inn/$f $RPM_BUILD_ROOT/usr/include/inn
 done
@@ -534,6 +536,7 @@ exit 0
 /usr/include/inn/libinn.h
 /usr/include/inn/storage.h
 /usr/include/inn/system.h
+/usr/include/inn/options.h
 %{_libdir}/news/lib/libstorage.so
 %{_libdir}/news/lib/libinn.so
 %{_libdir}/news/lib/libinnhist.so
@@ -547,6 +550,9 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Mon Sep 14 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 2.5.0-5
+- resolved: 511772 - inn/storage.h not self-contained, missing inn/options.h
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Mon Sep 14 13:09:01 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 14 Sep 2009 13:09:01 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.107, 1.108 sources,
	1.119, 1.120 system-config-date.spec, 1.127, 1.128
Message-ID: <20090914130901.AC20411C00EC@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1926

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.49


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- .cvsignore	7 Sep 2009 16:15:15 -0000	1.107
+++ .cvsignore	14 Sep 2009 13:09:01 -0000	1.108
@@ -1 +1 @@
-system-config-date-1.9.48.tar.bz2
+system-config-date-1.9.49.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	7 Sep 2009 16:23:59 -0000	1.119
+++ sources	14 Sep 2009 13:09:01 -0000	1.120
@@ -1 +1 @@
-4b65073d4af73e4bfddc4a56a65d68f6  system-config-date-1.9.48.tar.bz2
+c0a537c04cd685fd534672f155bd8c3a  system-config-date-1.9.49.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- system-config-date.spec	7 Sep 2009 16:23:59 -0000	1.127
+++ system-config-date.spec	14 Sep 2009 13:09:01 -0000	1.128
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.48
+Version: 1.9.49
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.9.49-1
+- pick up updated translations
+
 * Mon Sep 07 2009 Nils Philippsen <nils at redhat.com> - 1.9.48-1
 - use string object methods instead of string module
 - get rid of timeconfig and compat program names



From mschwendt at fedoraproject.org  Mon Sep 14 13:13:25 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 13:13:25 +0000 (UTC)
Subject: rpms/taglib/devel taglib-1.6-test_mp4.patch, NONE, 1.1 taglib.spec, 
	1.44, 1.45
Message-ID: <20090914131325.6661911C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4116/devel

Modified Files:
	taglib.spec 
Added Files:
	taglib-1.6-test_mp4.patch 
Log Message:
* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
- Add patch to fix MP4 test on ppc/ppc64.
- Update to 1.6 final.


taglib-1.6-test_mp4.patch:
 test_mp4.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE taglib-1.6-test_mp4.patch ---
diff -Nur taglib-1.6-orig/tests/test_mp4.cpp taglib-1.6/tests/test_mp4.cpp
--- taglib-1.6-orig/tests/test_mp4.cpp	2009-07-24 15:08:51.000000000 +0200
+++ taglib-1.6/tests/test_mp4.cpp	2009-09-14 14:46:41.724715605 +0200
@@ -130,7 +130,7 @@
     MP4::Atom *moov = atoms->atoms[0];
     CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
 
-    f->tag()->itemListMap()["pgap"] = 1;
+    f->tag()->itemListMap()["pgap"] = true;
     f->save();
 
     f = new MP4::File(filename.c_str());


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- taglib.spec	14 Sep 2009 07:57:43 -0000	1.44
+++ taglib.spec	14 Sep 2009 13:13:25 -0000	1.45
@@ -32,6 +32,8 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
+Patch3: taglib-1.6-test_mp4.patch
+
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,6 +86,8 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
+%patch3 -p1 -b .test_mp4
+
 
 %build
 mkdir -p %{_target_platform}
@@ -156,6 +160,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Add patch to fix MP4 test on ppc/ppc64.
 - Update to 1.6 final.
 
 * Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1



From mschwendt at fedoraproject.org  Mon Sep 14 13:13:25 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 13:13:25 +0000 (UTC)
Subject: rpms/taglib/F-11 taglib-1.6-test_mp4.patch, NONE, 1.1 taglib.spec, 
	1.33, 1.34
Message-ID: <20090914131325.83AAA11C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4116/F-11

Modified Files:
	taglib.spec 
Added Files:
	taglib-1.6-test_mp4.patch 
Log Message:
* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
- Add patch to fix MP4 test on ppc/ppc64.
- Update to 1.6 final.


taglib-1.6-test_mp4.patch:
 test_mp4.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE taglib-1.6-test_mp4.patch ---
diff -Nur taglib-1.6-orig/tests/test_mp4.cpp taglib-1.6/tests/test_mp4.cpp
--- taglib-1.6-orig/tests/test_mp4.cpp	2009-07-24 15:08:51.000000000 +0200
+++ taglib-1.6/tests/test_mp4.cpp	2009-09-14 14:46:41.724715605 +0200
@@ -130,7 +130,7 @@
     MP4::Atom *moov = atoms->atoms[0];
     CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
 
-    f->tag()->itemListMap()["pgap"] = 1;
+    f->tag()->itemListMap()["pgap"] = true;
     f->save();
 
     f = new MP4::File(filename.c_str());


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/taglib.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- taglib.spec	14 Sep 2009 08:02:05 -0000	1.33
+++ taglib.spec	14 Sep 2009 13:13:25 -0000	1.34
@@ -32,6 +32,8 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
+Patch3: taglib-1.6-test_mp4.patch
+
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,6 +86,8 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
+%patch3 -p1 -b .test_mp4
+
 
 %build
 mkdir -p %{_target_platform}
@@ -156,6 +160,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Add patch to fix MP4 test on ppc/ppc64.
 - Update to 1.6 final.
 
 * Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1



From mschwendt at fedoraproject.org  Mon Sep 14 13:13:25 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 13:13:25 +0000 (UTC)
Subject: rpms/taglib/F-10 taglib-1.6-test_mp4.patch, NONE, 1.1 taglib.spec, 
	1.31, 1.32
Message-ID: <20090914131325.D827F11C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4116/F-10

Modified Files:
	taglib.spec 
Added Files:
	taglib-1.6-test_mp4.patch 
Log Message:
* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
- Add patch to fix MP4 test on ppc/ppc64.
- Update to 1.6 final.


taglib-1.6-test_mp4.patch:
 test_mp4.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE taglib-1.6-test_mp4.patch ---
diff -Nur taglib-1.6-orig/tests/test_mp4.cpp taglib-1.6/tests/test_mp4.cpp
--- taglib-1.6-orig/tests/test_mp4.cpp	2009-07-24 15:08:51.000000000 +0200
+++ taglib-1.6/tests/test_mp4.cpp	2009-09-14 14:46:41.724715605 +0200
@@ -130,7 +130,7 @@
     MP4::Atom *moov = atoms->atoms[0];
     CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
 
-    f->tag()->itemListMap()["pgap"] = 1;
+    f->tag()->itemListMap()["pgap"] = true;
     f->save();
 
     f = new MP4::File(filename.c_str());


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/taglib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- taglib.spec	14 Sep 2009 08:02:18 -0000	1.31
+++ taglib.spec	14 Sep 2009 13:13:25 -0000	1.32
@@ -32,6 +32,8 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
+Patch3: taglib-1.6-test_mp4.patch
+
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,6 +86,8 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
+%patch3 -p1 -b .test_mp4
+
 
 %build
 mkdir -p %{_target_platform}
@@ -156,6 +160,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Add patch to fix MP4 test on ppc/ppc64.
 - Update to 1.6 final.
 
 * Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1



From otaylor at fedoraproject.org  Mon Sep 14 13:17:57 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Mon, 14 Sep 2009 13:17:57 +0000 (UTC)
Subject: rpms/desktop-effects/devel .cvsignore, 1.3, 1.4 desktop-effects.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090914131757.EE61A11C00EC@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5898

Modified Files:
	.cvsignore desktop-effects.spec sources 
Log Message:
* Mon Sep 14 2009 Owen Taylor <otaylor at redhat.com> - 0.8.3-1
- Update to 0.8.3 (translations)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Sep 2009 15:52:01 -0000	1.3
+++ .cvsignore	14 Sep 2009 13:17:57 -0000	1.4
@@ -1,2 +1,3 @@
 desktop-effects-0.8.1.tar.bz2
 desktop-effects-0.8.2.tar.bz2
+desktop-effects-0.8.3.tar.bz2


Index: desktop-effects.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/desktop-effects.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- desktop-effects.spec	4 Sep 2009 16:01:54 -0000	1.3
+++ desktop-effects.spec	14 Sep 2009 13:17:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           desktop-effects
-Version:        0.8.2
-Release:        2%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        Switch GNOME window management and effects
 
 Group:          User Interface/Desktops
@@ -67,6 +67,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
 fi
 
 %changelog
+* Mon Sep 14 2009 Owen Taylor <otaylor at redhat.com> - 0.8.3-1
+- Update to 0.8.3 (translations)
+
 * Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 0.8.2-2
 - Add missing BuildRequires on mesa-libGL-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2009 15:52:01 -0000	1.3
+++ sources	14 Sep 2009 13:17:57 -0000	1.4
@@ -1 +1 @@
-806fc8eef9788ae1ca7654d7cae75e7d  desktop-effects-0.8.2.tar.bz2
+a43557f0f6351d183bc614bde3adb31a  desktop-effects-0.8.3.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 14 13:20:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 13:20:18 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.62, 1.63 kde-settings.spec,
	1.88, 1.89 sources, 1.64, 1.65
Message-ID: <20090914132018.19CD511C0425@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6755

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-7
- plasma-desktop-appletsrc: Constantine_Mosaico virus wallpaper default (#519320)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	8 Sep 2009 15:23:33 -0000	1.62
+++ .cvsignore	14 Sep 2009 13:20:17 -0000	1.63
@@ -1 +1 @@
-kde-settings-4.3-6.tar.bz2
+kde-settings-4.3-7.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kde-settings.spec	12 Sep 2009 22:02:23 -0000	1.88
+++ kde-settings.spec	14 Sep 2009 13:20:17 -0000	1.89
@@ -1,11 +1,11 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 6
+%define rel 7
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}.1
+Release: %{rel}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -150,6 +150,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-7
+- plasma-desktop-appletsrc: Constantine_Mosaico virus wallpaper default (#519320)
+
 * Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-6.1
 - -kdm: fix up %%post, s/oxygen-air/Constantine/
 - -kdm: Requires: system-kdm-theme


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	8 Sep 2009 15:23:33 -0000	1.64
+++ sources	14 Sep 2009 13:20:17 -0000	1.65
@@ -1 +1 @@
-cc0723c3f6aacb05fd4655d7b2101d4f  kde-settings-4.3-6.tar.bz2
+1f3b71dfd1a836e78214790ef48bed59  kde-settings-4.3-7.tar.bz2



From mhlavink at fedoraproject.org  Mon Sep 14 13:23:29 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Sep 2009 13:23:29 +0000 (UTC)
Subject: rpms/setuptool/devel setuptool.spec,1.37,1.38
Message-ID: <20090914132329.4B68F11C00EC@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/setuptool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7911

Modified Files:
	setuptool.spec 
Log Message:
relase with updated translations



Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- setuptool.spec	4 Aug 2009 08:55:27 -0000	1.37
+++ setuptool.spec	14 Sep 2009 13:23:28 -0000	1.38
@@ -1,5 +1,5 @@
 Name: setuptool
-Version: 1.19.6
+Version: 1.19.7
 Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Mon Sep 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.7-1
+- relase with updated translations
+
 * Tue Aug 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.6-1
 - updated to 1.19.6
 - don't display *_IN locale in /dev/tty/X it does not work (#511193)



From varekova at fedoraproject.org  Mon Sep 14 13:30:50 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 14 Sep 2009 13:30:50 +0000 (UTC)
Subject: rpms/sysstat/devel sysstat-9.0.4-init_script.patch, NONE,
	1.1 sysstat.spec, 1.70, 1.71
Message-ID: <20090914133050.97D5611C00EC@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10500

Modified Files:
	sysstat.spec 
Added Files:
	sysstat-9.0.4-init_script.patch 
Log Message:
- fix init script - add INIT INFO flags (#522740)
  and add condrestart, try-restart and force-reload (#522743)


sysstat-9.0.4-init_script.patch:
 sysstat.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE sysstat-9.0.4-init_script.patch ---
diff -up sysstat-9.0.4/sysstat.in.ii sysstat-9.0.4/sysstat.in
--- sysstat-9.0.4/sysstat.in.ii	2009-02-15 15:49:24.000000000 +0100
+++ sysstat-9.0.4/sysstat.in	2009-09-14 15:22:34.000000000 +0200
@@ -4,11 +4,13 @@
 # @INIT_DIR@/sysstat
 # (C) 2000-2009 Sebastien Godard (sysstat <at> orange.fr)
 #
+### BEGIN INIT INFO
 # Description: Reset the system activity logs
+# Short-Description: reset the system activity logs
 #@(#) @PACKAGE_NAME at -@PACKAGE_VERSION@ startup script:
 #@(#)	 Insert a dummy record in current daily data file.
 #@(#)	 This indicates that the counters have restarted from 0.
-#
+### END INIT INFO
 
 RETVAL=0
 SYSCONFIG_DIR=@SYSCONFIG_DIR@
@@ -31,7 +33,7 @@ case "$1" in
 	fi
 	echo
 	;;
-  stop|status|restart|reload)
+  stop|status|restart|reload|force-reload|condrestart|try-restart)
 	;;
   *)
 	echo "Usage: sysstat {start|stop|status|restart|reload}"


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sysstat.spec	27 Jul 2009 05:20:48 -0000	1.70
+++ sysstat.spec	14 Sep 2009 13:30:48 -0000	1.71
@@ -1,11 +1,12 @@
 Name: sysstat
 Version: 9.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
 URL: 	http://perso.orange.fr/sebastien.godard/
 Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
+Patch0: sysstat-9.0.4-init_script.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -21,6 +22,7 @@ activity.
 
 %prep
 %setup -q
+%patch0 -p1 -b .ii
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
@@ -72,6 +74,10 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
+* Mon Sep 14 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-3
+- fix init script - add INIT INFO flags (#522740)
+  and add condrestart, try-restart and force-reload (#522743)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From npajkovs at fedoraproject.org  Mon Sep 14 13:42:35 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 14 Sep 2009 13:42:35 +0000 (UTC)
Subject: rpms/inn/devel inn-2.5.0-missing-headers.patch,NONE,1.1
Message-ID: <20090914134235.E9AEC11C00EC@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14605

Added Files:
	inn-2.5.0-missing-headers.patch 
Log Message:
forgot last patch inn-2.5.0-missing-headers.patch

inn-2.5.0-missing-headers.patch:
 storage.h |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE inn-2.5.0-missing-headers.patch ---
--- inn-2.5.0/include/inn/storage.h.old	2009-09-14 14:23:49.000000000 +0200
+++ inn-2.5.0/include/inn/storage.h	2009-09-14 14:32:42.934749553 +0200
@@ -8,6 +8,8 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <inn/defines.h>
+#include <inn/options.h>
 
 #define STORAGE_TOKEN_LENGTH 16
 



From rdieter at fedoraproject.org  Mon Sep 14 13:42:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 13:42:51 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork-4.3.0-fix-bonjour.patch, NONE,
	1.1 kdenetwork-4.3.1-kde#162493.patch, NONE, 1.1 kdenetwork.spec,
	1.197, 1.198
Message-ID: <20090914134251.A282011C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14708

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kopete/bonjour patch
- krfb produces garbled display (#523131, kde#162493)


kdenetwork-4.3.0-fix-bonjour.patch:
 bonjourcontactconnection.cpp |   11 ++++++++++-
 bonjourcontactconnection.h   |    3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdenetwork-4.3.0-fix-bonjour.patch ---
diff --git kopete/protocols/bonjour/bonjourcontactconnection.cpp kopete/protocols/bonjour/bonjourcontactconnection.cpp
index 0a925b4..c126011 100644
--- kopete/protocols/bonjour/bonjourcontactconnection.cpp
+++ kopete/protocols/bonjour/bonjourcontactconnection.cpp
@@ -56,9 +56,10 @@ void BonjourContactConnection::setSocket(QTcpSocket *aSocket)
 }
 
 BonjourContactConnection::BonjourContactConnection(QTcpSocket *aSocket, 
-		QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), socket(aSocket), parser(),
+		QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), parser(),
 					local(), remote()
 {
+	setSocket(aSocket);
 }
 
 BonjourContactConnection::BonjourContactConnection(const QHostAddress &address, short int port,
@@ -188,6 +189,14 @@ void BonjourContactConnection::dataInSocket()
 			getStreamTag(token);
 			break;
 	}
+
+	if (moreTokensAvailable())
+		dataInSocket();
+}
+
+bool BonjourContactConnection::moreTokensAvailable()
+{
+	return ! parser.atEnd();
 }
 
 void BonjourContactConnection::getStreamTag(BonjourXmlToken &token)
diff --git kopete/protocols/bonjour/bonjourcontactconnection.h kopete/protocols/bonjour/bonjourcontactconnection.h
index c0d347a..6c06300 100644
--- kopete/protocols/bonjour/bonjourcontactconnection.h
+++ kopete/protocols/bonjour/bonjourcontactconnection.h
@@ -80,6 +80,9 @@ class BonjourContactConnection : public QObject {
 	// Set the Socket
 	void setSocket(QTcpSocket *socket);
 
+	// Determine if there is more data available
+	bool moreTokensAvailable();
+
 	/**
 	 * @brief Description of A Token
 	 *

kdenetwork-4.3.1-kde#162493.patch:
 krfbserver.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdenetwork-4.3.1-kde#162493.patch ---
--- branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp	2009/06/24 10:17:04	986143
+++ branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp	2009/09/11 09:48:36	1022262
@@ -164,9 +164,14 @@
     int w = d->fb->width();
     int h = d->fb->height();
     int depth = d->fb->depth();
+    
+    int bpp = depth >> 3;
+    if (bpp != 1 && bpp != 2 && bpp != 4) bpp = 4;
+    kDebug() << "bpp: " << bpp;
 
     rfbLogEnable(0);
-    screen = rfbGetScreen(0, 0, w, h, 8, 3,depth / 8);
+    screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+    
     screen->paddedWidthInBytes = d->fb->paddedWidth();
 
     d->fb->getServerFormat(screen->serverFormat);


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- kdenetwork.spec	28 Aug 2009 14:49:50 -0000	1.197
+++ kdenetwork.spec	14 Sep 2009 13:42:51 -0000	1.198
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,6 +14,9 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdenetwork-4.3.0-fix-bonjour.patch
+# http://bugs.kde.org/162493
+Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -94,6 +97,8 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
+%patch100 -p0 -b .bonjour
+%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -186,6 +191,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- kopete/bonjour patch
+- krfb produces garbled display (#523131, kde#162493)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From jsafrane at fedoraproject.org  Mon Sep 14 13:44:49 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon, 14 Sep 2009 13:44:49 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi-0.7.12-lsb.patch, NONE,
	1.1 freeipmi.spec, 1.23, 1.24
Message-ID: <20090914134449.A8D5211C00EC@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16219

Modified Files:
	freeipmi.spec 
Added Files:
	freeipmi-0.7.12-lsb.patch 
Log Message:
Fix init scripts to be LSB compliant and return correct exit codes and provide mandatory actions
Resolves: #523169 #523177

freeipmi-0.7.12-lsb.patch:
 freeipmi-ipmidetectd.init |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE freeipmi-0.7.12-lsb.patch ---
523177:  Initscript: ipmidetectd incorrect exit codes
523169:  Initscript: ipmidetectd missing actions

Implement try-restart and force-reload actions.
Return correct exit codes.

diff -up freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init.lsb freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init
--- freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init.lsb	2007-12-14 20:16:25.000000000 +0100
+++ freeipmi-0.7.12/ipmidetect/freeipmi-ipmidetectd.init	2009-09-14 15:38:12.000000000 +0200
@@ -14,6 +14,7 @@
 ### END INIT INFO
 
 IPMIDETECTD=/usr/sbin/ipmidetectd
+IPMIDETECTD_CFG=/etc/ipmidetectd.cfg
 
 [ -f $IPMIDETECTD ] || exit 1
 
@@ -21,6 +22,11 @@ IPMIDETECTD=/usr/sbin/ipmidetectd
 if [ -f /etc/rc.d/init.d/functions ] ; then
     . /etc/rc.d/init.d/functions
     Xstart() {
+        if [ ! -f IPMIDETECTD_CFG ] ; then
+            failure; echo
+            RETVAL=6
+            return
+        fi
         daemon $IPMIDETECTD
         RETVAL=$?
         echo
@@ -89,7 +95,7 @@ case "$1" in
    	echo -n "Shutting down ipmidetectd: "
 	Xstop
    	;;
-  restart|reload)
+  restart|force-reload)
    	$0 stop
    	$0 start
    	RETVAL=$?
@@ -97,10 +103,11 @@ case "$1" in
   status)
         Xstatus
    	;;
-  condrestart)
+  condrestart|try-restart)
         Xcondrestart
    	;;
   *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart}"
+	echo "Usage: $0 {start|stop|restart|status|condrestart|force-reload|try-restart}"
 	exit 1
 esac
+exit $RETVAL


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- freeipmi.spec	9 Sep 2009 07:01:05 -0000	1.23
+++ freeipmi.spec	14 Sep 2009 13:44:49 -0000	1.24
@@ -2,7 +2,7 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: freeipmi
 Version: 0.7.12
@@ -14,6 +14,7 @@ Patch1: freeipmi-0.5.1-regex.patch
 Patch2: freeipmi-0.6.4-silent.patch
 Patch3: freeipmi-0.6.4-argmax.patch
 Patch4: freeipmi-0.6.4-pathsep.patch
+Patch5: freeipmi-0.7.12-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(pre): chkconfig
@@ -68,6 +69,7 @@ Provides a tool and a daemon for IPMI no
 %patch2 -p1 -b .silent
 %patch3 -p1 -b .argmax
 %patch4 -p1 -b .pathsep
+%patch5 -p1 -b .lsb
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -291,7 +293,11 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
-* Wed Sep  9 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12
+* Mon Sep 14 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-2
+- Fix init scripts to be LSB compliant and return correct exit codes
+  and provide mandatory actions (#523169, #523177)
+
+* Wed Sep  9 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-2
 - Update to freeipmi-0.7.12
 
 * Thu Aug  6 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.11-2



From ltinkl at fedoraproject.org  Mon Sep 14 13:45:23 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 14 Sep 2009 13:45:23 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.2-imapMove.patch, NONE, 1.1 kdepim.spec,
	1.217, 1.218
Message-ID: <20090914134523.A289D11C00EC@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16137/F-10

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-imapMove.patch 
Log Message:
fix KMail issues losing messages when renaming folder with disconnected IMAP


kdepim-4.3.2-imapMove.patch:
 cachedimapjob.cpp      |    2 +-
 kmfoldercachedimap.cpp |   10 ++++++++++
 kmfoldercachedimap.h   |   17 +++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE kdepim-4.3.2-imapMove.patch ---
Index: branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022963)
@@ -510,7 +510,7 @@
         bool b = kmkernel->iCalIface().isResourceQuiet();
         kmkernel->iCalIface().setResourceQuiet( true );
 
-        mFolder->take( i );
+        mFolder->takeTemporarily( i );
         mFolder->addMsgKeepUID( mMsg );
         mMsg->setTransferInProgress( false );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
@@ -527,6 +527,11 @@
   return KMFolderMaildir::take( idx );
 }
 
+void KMFolderCachedImap::takeTemporarily( int idx )
+{
+  KMFolderMaildir::take( idx );
+}
+
 int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
 {
   // Possible optimization: Only dirty if not filtered below
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022963)
@@ -228,10 +228,23 @@
     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
 
-    /** Reimplemented from KMFolderMaildir */
-    virtual KMMessage *take( int idx );
     bool canDeleteMessages() const;
 
+    /**
+     * Reimplemented from KMFolderMaildir
+     * This deletes the message permanently, also from the server. For this,
+     * rememberDeletion() is called, so that the message can be deleted from
+     * the server on the next sync.
+     */
+    virtual KMMessage* take( int idx );
+
+    /**
+     * Like take(), only that the deletion is not remembered, i.e. the
+     * message will not be deleted from the server. Calling this can cause
+     * inconsistencies, so make sure you re-add the message later!
+     */
+    void takeTemporarily( int idx );
+
     /** Reimplemented from KMFolderMaildir */
     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022964)
@@ -1678,6 +1678,11 @@
     job->start();
     return true;
   } else {
+
+    // Nothing to delete on the server, make sure the map is clear again.
+    // Normally this wouldn't be necessary, but there can be stale maps because of
+    // https://issues.kolab.org/issue3833.
+    mDeletedUIDsSinceLastSync.clear();
     return false;
   }
 }


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- kdepim.spec	1 Sep 2009 18:10:07 -0000	1.217
+++ kdepim.spec	14 Sep 2009 13:45:22 -0000	1.218
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-# 4.3.1 upstream 
+# 4.3.1 upstream
+# http://websvn.kde.org/?view=rev&revision=1022963
+# http://websvn.kde.org/?view=rev&revision=1022964
+Patch100: kdepim-4.3.2-imapMove.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,6 +98,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p4 -b .imapMove
 
 
 %build
@@ -213,6 +217,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-3
+- fix KMail issues losing messages when renaming folder with disconnected IMAP
+
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- rebuild (gnokii)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From ltinkl at fedoraproject.org  Mon Sep 14 13:45:24 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 14 Sep 2009 13:45:24 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.2-imapMove.patch, NONE, 1.1 kdepim.spec,
	1.223, 1.224
Message-ID: <20090914134524.9C13B11C00EC@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16137/F-11

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-imapMove.patch 
Log Message:
fix KMail issues losing messages when renaming folder with disconnected IMAP


kdepim-4.3.2-imapMove.patch:
 cachedimapjob.cpp      |    2 +-
 kmfoldercachedimap.cpp |   10 ++++++++++
 kmfoldercachedimap.h   |   17 +++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE kdepim-4.3.2-imapMove.patch ---
Index: branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022963)
@@ -510,7 +510,7 @@
         bool b = kmkernel->iCalIface().isResourceQuiet();
         kmkernel->iCalIface().setResourceQuiet( true );
 
-        mFolder->take( i );
+        mFolder->takeTemporarily( i );
         mFolder->addMsgKeepUID( mMsg );
         mMsg->setTransferInProgress( false );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
@@ -527,6 +527,11 @@
   return KMFolderMaildir::take( idx );
 }
 
+void KMFolderCachedImap::takeTemporarily( int idx )
+{
+  KMFolderMaildir::take( idx );
+}
+
 int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
 {
   // Possible optimization: Only dirty if not filtered below
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022963)
@@ -228,10 +228,23 @@
     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
 
-    /** Reimplemented from KMFolderMaildir */
-    virtual KMMessage *take( int idx );
     bool canDeleteMessages() const;
 
+    /**
+     * Reimplemented from KMFolderMaildir
+     * This deletes the message permanently, also from the server. For this,
+     * rememberDeletion() is called, so that the message can be deleted from
+     * the server on the next sync.
+     */
+    virtual KMMessage* take( int idx );
+
+    /**
+     * Like take(), only that the deletion is not remembered, i.e. the
+     * message will not be deleted from the server. Calling this can cause
+     * inconsistencies, so make sure you re-add the message later!
+     */
+    void takeTemporarily( int idx );
+
     /** Reimplemented from KMFolderMaildir */
     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022964)
@@ -1678,6 +1678,11 @@
     job->start();
     return true;
   } else {
+
+    // Nothing to delete on the server, make sure the map is clear again.
+    // Normally this wouldn't be necessary, but there can be stale maps because of
+    // https://issues.kolab.org/issue3833.
+    mDeletedUIDsSinceLastSync.clear();
     return false;
   }
 }


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- kdepim.spec	1 Sep 2009 18:10:08 -0000	1.223
+++ kdepim.spec	14 Sep 2009 13:45:24 -0000	1.224
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-# 4.3.1 upstream 
+# 4.3.1 upstream
+# http://websvn.kde.org/?view=rev&revision=1022963
+# http://websvn.kde.org/?view=rev&revision=1022964
+Patch100: kdepim-4.3.2-imapMove.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,6 +98,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p4 -b .imapMove
 
 
 %build
@@ -213,6 +217,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-3
+- fix KMail issues losing messages when renaming folder with disconnected IMAP
+
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- rebuild (gnokii)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From ltinkl at fedoraproject.org  Mon Sep 14 13:45:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 14 Sep 2009 13:45:25 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.2-imapMove.patch, NONE, 1.1 kdepim.spec,
	1.234, 1.235
Message-ID: <20090914134525.69EB711C00EC@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16137/devel

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-imapMove.patch 
Log Message:
fix KMail issues losing messages when renaming folder with disconnected IMAP


kdepim-4.3.2-imapMove.patch:
 cachedimapjob.cpp      |    2 +-
 kmfoldercachedimap.cpp |   10 ++++++++++
 kmfoldercachedimap.h   |   17 +++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE kdepim-4.3.2-imapMove.patch ---
Index: branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022963)
@@ -510,7 +510,7 @@
         bool b = kmkernel->iCalIface().isResourceQuiet();
         kmkernel->iCalIface().setResourceQuiet( true );
 
-        mFolder->take( i );
+        mFolder->takeTemporarily( i );
         mFolder->addMsgKeepUID( mMsg );
         mMsg->setTransferInProgress( false );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
@@ -527,6 +527,11 @@
   return KMFolderMaildir::take( idx );
 }
 
+void KMFolderCachedImap::takeTemporarily( int idx )
+{
+  KMFolderMaildir::take( idx );
+}
+
 int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
 {
   // Possible optimization: Only dirty if not filtered below
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022963)
@@ -228,10 +228,23 @@
     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
 
-    /** Reimplemented from KMFolderMaildir */
-    virtual KMMessage *take( int idx );
     bool canDeleteMessages() const;
 
+    /**
+     * Reimplemented from KMFolderMaildir
+     * This deletes the message permanently, also from the server. For this,
+     * rememberDeletion() is called, so that the message can be deleted from
+     * the server on the next sync.
+     */
+    virtual KMMessage* take( int idx );
+
+    /**
+     * Like take(), only that the deletion is not remembered, i.e. the
+     * message will not be deleted from the server. Calling this can cause
+     * inconsistencies, so make sure you re-add the message later!
+     */
+    void takeTemporarily( int idx );
+
     /** Reimplemented from KMFolderMaildir */
     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022964)
@@ -1678,6 +1678,11 @@
     job->start();
     return true;
   } else {
+
+    // Nothing to delete on the server, make sure the map is clear again.
+    // Normally this wouldn't be necessary, but there can be stale maps because of
+    // https://issues.kolab.org/issue3833.
+    mDeletedUIDsSinceLastSync.clear();
     return false;
   }
 }


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- kdepim.spec	8 Sep 2009 15:45:38 -0000	1.234
+++ kdepim.spec	14 Sep 2009 13:45:24 -0000	1.235
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-# 4.3.1 upstream 
+# 4.3.1 upstream
+# http://websvn.kde.org/?view=rev&revision=1022963
+# http://websvn.kde.org/?view=rev&revision=1022964
+Patch100: kdepim-4.3.2-imapMove.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,6 +98,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p4 -b .imapMove
 
 
 %build
@@ -213,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-3
+- fix KMail issues losing messages when renaming folder with disconnected IMAP
+
 * Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - rebuild (gnokii)
 



From jsafrane at fedoraproject.org  Mon Sep 14 13:46:46 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon, 14 Sep 2009 13:46:46 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi-0.7.12-lsb.patch,1.1,1.2
Message-ID: <20090914134646.E64EA11C00EC@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16995

Modified Files:
	freeipmi-0.7.12-lsb.patch 
Log Message:
fix additional exit code to be LSB compliant... wrong params should result in 2

freeipmi-0.7.12-lsb.patch:
 freeipmi-ipmidetectd.init |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Index: freeipmi-0.7.12-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi-0.7.12-lsb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freeipmi-0.7.12-lsb.patch	14 Sep 2009 13:44:49 -0000	1.1
+++ freeipmi-0.7.12-lsb.patch	14 Sep 2009 13:46:46 -0000	1.2
@@ -47,6 +47,7 @@ diff -up freeipmi-0.7.12/ipmidetect/free
    *)
 -	echo "Usage: $0 {start|stop|restart|status|condrestart}"
 +	echo "Usage: $0 {start|stop|restart|status|condrestart|force-reload|try-restart}"
- 	exit 1
+-	exit 1
++	exit 2
  esac
 +exit $RETVAL



From rathann at fedoraproject.org  Mon Sep 14 13:50:43 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 13:50:43 +0000 (UTC)
Subject: rpms/obexfs/devel .cvsignore, 1.4, 1.5 obexfs.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090914135043.1400211C00EC@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/obexfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18444

Modified Files:
	.cvsignore obexfs.spec sources 
Log Message:
* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.12-1
- updated to 0.12
- changed source URL to sourceforge



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexfs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Feb 2009 14:29:51 -0000	1.4
+++ .cvsignore	14 Sep 2009 13:50:42 -0000	1.5
@@ -1 +1 @@
-obexfs-0.11.tar.gz
+obexfs-0.12.tar.gz


Index: obexfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexfs/devel/obexfs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- obexfs.spec	25 Jul 2009 19:47:19 -0000	1.7
+++ obexfs.spec	14 Sep 2009 13:50:42 -0000	1.8
@@ -1,11 +1,11 @@
 Name: obexfs
 Summary: FUSE based filesystem using ObexFTP
 Group: System Environment/Base
-Version: 0.11
-Release: 2%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
-Source: http://triq.net/obexftp/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/openobex/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: obexftp-devel >= 0.22
 BuildRequires: fuse-devel
@@ -35,6 +35,10 @@ to mobile phones.
 %{_bindir}/obexfs
 
 %changelog
+* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.12-1
+- updated to 0.12
+- changed source URL to sourceforge
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexfs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Feb 2009 14:29:51 -0000	1.4
+++ sources	14 Sep 2009 13:50:42 -0000	1.5
@@ -1 +1 @@
-0980ad75b27e15347c7621ca525ba36b  obexfs-0.11.tar.gz
+0f505672b025cdb505e215ee707a2e2f  obexfs-0.12.tar.gz



From nphilipp at fedoraproject.org  Mon Sep 14 13:52:34 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 14 Sep 2009 13:52:34 +0000 (UTC)
Subject: rpms/hwbrowser/devel .cvsignore, 1.40, 1.41 hwbrowser.spec, 1.57,
	1.58 sources, 1.48, 1.49
Message-ID: <20090914135234.0636311C00EC@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19164

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
version 0.43


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	8 Apr 2008 12:48:06 -0000	1.40
+++ .cvsignore	14 Sep 2009 13:52:33 -0000	1.41
@@ -1 +1 @@
-hwbrowser-0.42.tar.bz2
+hwbrowser-0.43.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- hwbrowser.spec	25 Jul 2009 02:47:05 -0000	1.57
+++ hwbrowser.spec	14 Sep 2009 13:52:33 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.42
-Release: 4%{?dist}
+Version: 0.43
+Release: 1%{?dist}
 # We are upstream, thus the source is only available from within this source
 # package.
 Source0: %{name}-%{version}.tar.bz2
@@ -54,14 +54,8 @@ rm -rf %{buildroot}
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.42-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.42-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.42-2
-- Rebuild for Python 2.6
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 0.43-1
+- pick up updated translations
 
 * Tue Apr 08 2008 Nils Philippsen <nphilipp at redhat.com> - 0.42-1
 - pick up updated translations


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	8 Apr 2008 12:48:06 -0000	1.48
+++ sources	14 Sep 2009 13:52:33 -0000	1.49
@@ -1 +1 @@
-d9f4a8c6adc8f5437d01ebe493e22f48  hwbrowser-0.42.tar.bz2
+814f67634945391bdf6c71df36aba387  hwbrowser-0.43.tar.bz2



From kdudka at fedoraproject.org  Mon Sep 14 13:52:38 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Mon, 14 Sep 2009 13:52:38 +0000 (UTC)
Subject: rpms/findutils/devel findutils.spec,1.63,1.64
Message-ID: <20090914135238.0655C11C00EC@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/findutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19203

Modified Files:
	findutils.spec 
Log Message:
- do process install-info only without --excludedocs(#515914)


Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- findutils.spec	24 Jul 2009 22:47:14 -0000	1.63
+++ findutils.spec	14 Sep 2009 13:52:37 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv3+
 Group: Applications/File
@@ -61,11 +61,16 @@ mv $RPM_BUILD_ROOT{%_bindir,/bin}/find
 ln -sf ../../bin/find $RPM_BUILD_ROOT/usr/bin
 
 %post
-/sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/find.info.gz ]; then
+    /sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir || :
+    if [ -f %{_infodir}/find.info.gz ]; then
+        /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir \
+            || :
+    fi
 fi
 
 %clean
@@ -84,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info.gz
 
 %changelog
+* Mon Sep 14 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-3
+- do process install-info only without --excludedocs(#515914)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kdudka at fedoraproject.org  Mon Sep 14 13:53:48 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Mon, 14 Sep 2009 13:53:48 +0000 (UTC)
Subject: rpms/findutils/devel .cvsignore,1.17,1.18
Message-ID: <20090914135348.4CEC211C00EC@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/findutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19784

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	30 Apr 2008 10:02:05 -0000	1.17
+++ .cvsignore	14 Sep 2009 13:53:48 -0000	1.18
@@ -1,7 +1,2 @@
-findutils-4.2.29.tar.gz
-findutils-4.2.29.tar.gz.sig
-findutils-4.2.31.tar.gz
-findutils-4.2.32.tar.gz
-findutils-4.2.33.tar.gz
-findutils-4.4.0.tar.gz
-findutils-4.4.0.tar.gz.sig
+findutils-4.4.2.tar.gz
+findutils-4.4.2.tar.gz.sig



From varekova at fedoraproject.org  Mon Sep 14 13:56:46 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 14 Sep 2009 13:56:46 +0000 (UTC)
Subject: rpms/sysstat/devel sysstat-9.0.4-init_script.patch,1.1,1.2
Message-ID: <20090914135646.6FB2711C00EC@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20814

Modified Files:
	sysstat-9.0.4-init_script.patch 
Log Message:
fix the return value


sysstat-9.0.4-init_script.patch:
 sysstat.in |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: sysstat-9.0.4-init_script.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat-9.0.4-init_script.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sysstat-9.0.4-init_script.patch	14 Sep 2009 13:30:48 -0000	1.1
+++ sysstat-9.0.4-init_script.patch	14 Sep 2009 13:56:46 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up sysstat-9.0.4/sysstat.in.ii sysstat-9.0.4/sysstat.in
 --- sysstat-9.0.4/sysstat.in.ii	2009-02-15 15:49:24.000000000 +0100
-+++ sysstat-9.0.4/sysstat.in	2009-09-14 15:22:34.000000000 +0200
++++ sysstat-9.0.4/sysstat.in	2009-09-14 15:47:07.000000000 +0200
 @@ -4,11 +4,13 @@
  # @INIT_DIR@/sysstat
  # (C) 2000-2009 Sebastien Godard (sysstat <at> orange.fr)
@@ -16,7 +16,12 @@ diff -up sysstat-9.0.4/sysstat.in.ii sys
  
  RETVAL=0
  SYSCONFIG_DIR=@SYSCONFIG_DIR@
-@@ -31,7 +33,7 @@ case "$1" in
+@@ -27,11 +29,11 @@ case "$1" in
+ 	if [ -f "${exitCodeIndicator}" ]; then
+ 		rm -f ${exitCodeIndicator}
+ 	else
+-		RETVAL=1
++		RETVAL=2
  	fi
  	echo
  	;;



From nphilipp at fedoraproject.org  Mon Sep 14 14:01:33 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 14 Sep 2009 14:01:33 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.74, 1.75 sources, 1.79,
	1.80 system-config-samba.spec, 1.83, 1.84
Message-ID: <20090914140134.5997311C00EC@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22731

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.82


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	2 Sep 2009 08:59:15 -0000	1.74
+++ .cvsignore	14 Sep 2009 14:01:32 -0000	1.75
@@ -1 +1 @@
-system-config-samba-1.2.81.tar.bz2
+system-config-samba-1.2.82.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	2 Sep 2009 08:59:16 -0000	1.79
+++ sources	14 Sep 2009 14:01:33 -0000	1.80
@@ -1 +1 @@
-b852bd0866a75eb1e1c1ebfaa96587eb  system-config-samba-1.2.81.tar.bz2
+97f9c087fda8a0a6f4bc15082389f739  system-config-samba-1.2.82.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- system-config-samba.spec	2 Sep 2009 08:59:16 -0000	1.83
+++ system-config-samba.spec	14 Sep 2009 14:01:33 -0000	1.84
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.81
+Version: 1.2.82
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -112,6 +112,9 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.2.82-1
+- pick up updated translations
+
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.2.81-1
 - initialize gettext correctly
 



From nphilipp at fedoraproject.org  Mon Sep 14 14:08:59 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 14 Sep 2009 14:08:59 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.84, 1.85 sources,
	1.97, 1.98 system-config-services.spec, 1.99, 1.100
Message-ID: <20090914140859.6291211C00EC@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25406

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.40


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	2 Sep 2009 09:03:41 -0000	1.84
+++ .cvsignore	14 Sep 2009 14:08:58 -0000	1.85
@@ -1 +1 @@
-system-config-services-0.99.39.tar.bz2
+system-config-services-0.99.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	2 Sep 2009 09:03:41 -0000	1.97
+++ sources	14 Sep 2009 14:08:59 -0000	1.98
@@ -1 +1 @@
-40dec5f16dda6da1eb1778811341aec0  system-config-services-0.99.39.tar.bz2
+81c097eeec959c12303cbae4421bcfa0  system-config-services-0.99.40.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- system-config-services.spec	2 Sep 2009 09:03:41 -0000	1.99
+++ system-config-services.spec	14 Sep 2009 14:08:59 -0000	1.100
@@ -11,7 +11,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.39
+Version: 0.99.40
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.40-1
+- pick up updated translations
+
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 0.99.39-1
 - initialize gettext correctly
 



From mtasaka at fedoraproject.org  Mon Sep 14 14:12:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Sep 2009 14:12:10 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.399, 1.400 jd.spec, 1.459, 1.460 sources,
	1.400, 1.401
Message-ID: <20090914141210.626BA11C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26666/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
- 2.4.2 beta 090914



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- .cvsignore	14 Sep 2009 06:05:21 -0000	1.399
+++ .cvsignore	14 Sep 2009 14:12:09 -0000	1.400
@@ -1 +1 @@
-jd-2.4.2-svn3068_trunk.tgz
+jd-2.4.2-beta090914.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- jd.spec	14 Sep 2009 06:05:21 -0000	1.459
+++ jd.spec	14 Sep 2009 14:12:10 -0000	1.460
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3068_trunk
-%define         repoid        43007
+%define         strtag        beta090914
+%define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -49,7 +49,7 @@ Summary:        A 2ch browser
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -135,11 +135,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3068
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
+- 2.4.2 beta 090914
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
-- 2.4.1 beta 090806
+- 2.4.2 beta 090806
 
 * Sun Jul 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.1-1
 - 2.4.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- sources	14 Sep 2009 06:05:21 -0000	1.400
+++ sources	14 Sep 2009 14:12:10 -0000	1.401
@@ -1 +1 @@
-32bf54781c54bf2000ca06db453b6f72  jd-2.4.2-svn3068_trunk.tgz
+298facf48ce377f0ff0a153f6d9dd433  jd-2.4.2-beta090914.tgz



From mtasaka at fedoraproject.org  Mon Sep 14 14:12:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Sep 2009 14:12:10 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.393, 1.394 jd.spec, 1.455, 1.456 sources,
	1.394, 1.395
Message-ID: <20090914141210.CA76E11C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26666/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
- 2.4.2 beta 090914



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- .cvsignore	13 Sep 2009 17:37:06 -0000	1.393
+++ .cvsignore	14 Sep 2009 14:12:10 -0000	1.394
@@ -1 +1 @@
-jd-2.4.2-svn3068_trunk.tgz
+jd-2.4.2-beta090914.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- jd.spec	13 Sep 2009 17:37:06 -0000	1.455
+++ jd.spec	14 Sep 2009 14:12:10 -0000	1.456
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3068_trunk
-%define         repoid        43007
+%define         strtag        beta090914
+%define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -49,7 +49,7 @@ Summary:        A 2ch browser
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -135,11 +135,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3068
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
+- 2.4.2 beta 090914
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
-- 2.4.1 beta 090806
+- 2.4.2 beta 090806
 
 * Sun Jul 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.1-1
 - 2.4.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- sources	13 Sep 2009 17:37:07 -0000	1.394
+++ sources	14 Sep 2009 14:12:10 -0000	1.395
@@ -1 +1 @@
-32bf54781c54bf2000ca06db453b6f72  jd-2.4.2-svn3068_trunk.tgz
+298facf48ce377f0ff0a153f6d9dd433  jd-2.4.2-beta090914.tgz



From mtasaka at fedoraproject.org  Mon Sep 14 14:12:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Sep 2009 14:12:11 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.393, 1.394 jd.spec, 1.456, 1.457 sources,
	1.394, 1.395
Message-ID: <20090914141211.E788D11C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26666/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
- 2.4.2 beta 090914



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- .cvsignore	13 Sep 2009 16:44:28 -0000	1.393
+++ .cvsignore	14 Sep 2009 14:12:10 -0000	1.394
@@ -1 +1 @@
-jd-2.4.2-svn3068_trunk.tgz
+jd-2.4.2-beta090914.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -p -r1.456 -r1.457
--- jd.spec	13 Sep 2009 16:44:28 -0000	1.456
+++ jd.spec	14 Sep 2009 14:12:11 -0000	1.457
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3068_trunk
-%define         repoid        43007
+%define         strtag        beta090914
+%define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -49,7 +49,7 @@ Summary:        A 2ch browser
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -135,11 +135,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3068
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
+- 2.4.2 beta 090914
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
-- 2.4.1 beta 090806
+- 2.4.2 beta 090806
 
 * Sun Jul 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.1-1
 - 2.4.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- sources	13 Sep 2009 16:44:28 -0000	1.394
+++ sources	14 Sep 2009 14:12:11 -0000	1.395
@@ -1 +1 @@
-32bf54781c54bf2000ca06db453b6f72  jd-2.4.2-svn3068_trunk.tgz
+298facf48ce377f0ff0a153f6d9dd433  jd-2.4.2-beta090914.tgz



From twaugh at fedoraproject.org  Mon Sep 14 14:13:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 14 Sep 2009 14:13:20 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-polkit-1.patch, 
	NONE, 1.1 system-config-printer-get-devices.patch, 1.2,
	1.3 system-config-printer.spec, 1.283, 1.284
Message-ID: <20090914141320.5F9DE11C00EC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27279

Modified Files:
	system-config-printer-get-devices.patch 
	system-config-printer.spec 
Added Files:
	system-config-printer-polkit-1.patch 
Log Message:
* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-9
- Fixed traceback when fetching devices (bug #522139).


system-config-printer-polkit-1.patch:
 Makefile.am              |    1 +
 authconn.py              |   10 +++++-----
 config.py.in             |    1 +
 configure.in             |   11 +++++++++++
 cupspk.py                |    9 ++++++++-
 system-config-printer.py |   35 ++++++++++++++++++++++++-----------
 6 files changed, 50 insertions(+), 17 deletions(-)

--- NEW FILE system-config-printer-polkit-1.patch ---
diff -up system-config-printer-1.1.12/authconn.py.polkit-1 system-config-printer-1.1.12/authconn.py
--- system-config-printer-1.1.12/authconn.py.polkit-1	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/authconn.py	2009-09-14 14:54:09.999997175 +0100
@@ -24,6 +24,7 @@ import gobject
 import gtk
 import os
 from errordialogs import *
+import config
 from debug import *
 
 _ = lambda x: x
@@ -156,8 +157,11 @@ class Connection:
         cups.setUser (self._use_user)
 
         self._use_pk = ((self._server[0] == '/' or self._server == 'localhost')
-                        and not self._lock
                         and os.getuid () != 0)
+
+        if not config.WITH_POLKIT_1 and self._lock:
+            self._use_pk = False
+
         if self._use_pk:
             create_object = cupspk.Connection
         else:
@@ -208,10 +212,6 @@ class Connection:
                 break
             except cups.IPPError, (e, m):
                 if self._use_pk and m == 'pkcancel':
-                    title = _('Unauthorized request (%s)') % fname
-                    text = _("You are not authorized to carry out the "
-                             "requested action.")
-                    show_error_dialog (title, text, None)
                     raise cups.IPPError (0, _("Operation canceled"))
                 if not self._cancel and (e == cups.IPP_NOT_AUTHORIZED or
                                          e == cups.IPP_FORBIDDEN):
diff -up system-config-printer-1.1.12/config.py.in.polkit-1 system-config-printer-1.1.12/config.py.in
--- system-config-printer-1.1.12/config.py.in.polkit-1	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/config.py.in	2009-09-14 14:54:10.003997327 +0100
@@ -24,3 +24,4 @@ localedir="@localedir@"
 pkgdatadir="@datadir@/@PACKAGE@"
 VERSION="@VERSION@"
 PACKAGE="@PACKAGE@"
+WITH_POLKIT_1=@WITH_POLKIT_1@
diff -up system-config-printer-1.1.12/configure.in.polkit-1 system-config-printer-1.1.12/configure.in
--- system-config-printer-1.1.12/configure.in.polkit-1	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/configure.in	2009-09-14 14:54:10.004997135 +0100
@@ -43,6 +43,17 @@ if test x$with_udev_rules != xno; then
    AM_PROG_CC_C_O
 fi
 
+AC_ARG_WITH(polkit-1,
+	    [AC_HELP_STRING([--with-polkit-1],
+			    [Enable support for polkit-1 @<:@default=no@:>@])],
+			    [],
+			    [with_polkit_1=no])
+WITH_POLKIT_1=False
+if test x$with_polkit_1 != xno; then
+    WITH_POLKIT_1=True
+fi
+AC_SUBST(WITH_POLKIT_1)
+
 ALL_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms my nb nl nn or pa pl pt_BR pt ro ru si sk sl sr at latin sr sv ta te th tr uk vi zh_CN zh_TW"
 AC_CONFIG_FILES([
 Makefile
diff -up system-config-printer-1.1.12/cupspk.py.polkit-1 system-config-printer-1.1.12/cupspk.py
--- system-config-printer-1.1.12/cupspk.py.polkit-1	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupspk.py	2009-09-14 14:54:10.015998069 +0100
@@ -34,6 +34,7 @@ import tempfile
 import cups
 import dbus
 import gtk
+import config
 from debug import debugprint
 
 from dbus.mainloop.glib import DBusGMainLoop
@@ -221,8 +222,14 @@ class Connection:
                             return retval
                 break
             except dbus.exceptions.DBusException, e:
-                if not self._handle_exception_with_auth(e):
+                if config.WITH_POLKIT_1:
+                    if e.get_dbus_name() == CUPS_PK_NEED_AUTH:
+                        raise cups.IPPError(cups.IPP_NOT_AUTHORIZED, 'pkcancel')
+
                     break
+                else:
+                    if not self._handle_exception_with_auth(e):
+                        break
 
         # The PolicyKit call did not work (either a PK-error and we got a dbus
         # exception that wasn't handled, or an error in the mechanism itself)
diff -up system-config-printer-1.1.12/Makefile.am.polkit-1 system-config-printer-1.1.12/Makefile.am
--- system-config-printer-1.1.12/Makefile.am.polkit-1	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/Makefile.am	2009-09-14 14:54:10.018997090 +0100
@@ -39,6 +39,7 @@ config.py: config.py.in Makefile
 	  -e "s|\@localedir\@|$(localedir)|" \
 	  -e "s|\@VERSION\@|$(VERSION)|" \
 	  -e "s|\@PACKAGE\@|$(PACKAGE)|" \
+	  -e "s|\@WITH_POLKIT_1\@|$(WITH_POLKIT_1)|" \
 	  $< > $@
 
 # Use distutils to build the module.
diff -up system-config-printer-1.1.12/system-config-printer.py.polkit-1 system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.polkit-1	2009-09-14 14:53:42.800872681 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-14 14:54:10.046997443 +0100
@@ -4620,19 +4620,32 @@ class NewPrinterGUI(GtkGUI):
         self.WaitWindow.set_transient_for (parent)
         self.WaitWindow.show_now ()
         self.busy (self.WaitWindow)
-        while gtk.events_pending ():
-            gtk.main_iteration ()
 
-        debugprint ("Fetching devices")
-        self.mainapp.cups._begin_operation (_("fetching device list"))
-        try:
-            devices = cupshelpers.getDevices(self.mainapp.cups)
-        except:
-            self.mainapp.cups._end_operation ()
-            self.WaitWindow.hide ()
-            raise
+        if self.mainapp.cups._use_pk and config.WITH_POLKIT_1:
+            def get_devices():
+                c = authconn.Connection (host=self.mainapp.connect_server,
+                                         parent=parent, lock=True)
+                c._begin_operation (_("fetching device list"))
+                ret = cupshelpers.getDevices (c)
+                c._end_operation ()
+                return ret
+
+            op = TimedOperation (get_devices)
+            try:
+                devices = op.run ()
+            except (OperationCanceled, RuntimeError, cups.IPPError):
+                self.WaitWindow.hide ()
+                raise
+        else:
+            self.mainapp.cups._begin_operation (_("fetching device list"))
+            try:
+                devices = cupshelpers.getDevices (self.mainapp.cups)
+                self.mainapp.cups._end_operation ()
+            except cups.IPPError:
+                self.mainapp.cups._end_operation ()
+                self.WaitWindow.hide ()
+                raise
 
-        self.mainapp.cups._end_operation ()
         self.WaitWindow.hide ()
         debugprint ("Got devices")
         return devices

system-config-printer-get-devices.patch:
 cupshelpers/cupshelpers.py |    4 
 cupspk.py                  |   18 +++
 gtkspinner.py              |    2 
 system-config-printer.py   |  220 ++++++++++++++++++++++++++++-----------------
 timedops.py                |   38 ++++++-
 5 files changed, 189 insertions(+), 93 deletions(-)

Index: system-config-printer-get-devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer-get-devices.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-printer-get-devices.patch	4 Sep 2009 10:12:44 -0000	1.2
+++ system-config-printer-get-devices.patch	14 Sep 2009 14:13:19 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices system-config-printer-1.1.12/cupshelpers/cupshelpers.py
 --- system-config-printer-1.1.12/cupshelpers/cupshelpers.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-04 10:41:43.122388349 +0100
++++ system-config-printer-1.1.12/cupshelpers/cupshelpers.py	2009-09-04 10:40:45.092512574 +0100
 @@ -541,7 +541,7 @@ class Device:
          
          return result
@@ -20,9 +20,9 @@ diff -up system-config-printer-1.1.12/cu
          device = Device(uri, **data)
          devices[uri] = device
 diff -up system-config-printer-1.1.12/cupspk.py.get-devices system-config-printer-1.1.12/cupspk.py
---- system-config-printer-1.1.12/cupspk.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/cupspk.py	2009-09-04 10:41:43.125389269 +0100
-@@ -304,12 +304,13 @@ class Connection:
+--- system-config-printer-1.1.12/cupspk.py.get-devices	2009-09-04 10:40:45.010390541 +0100
++++ system-config-printer-1.1.12/cupspk.py	2009-09-04 10:40:45.095512451 +0100
+@@ -311,12 +311,13 @@ class Connection:
      def getDevices(self, *args, **kwds):
          use_pycups = False
  
@@ -39,7 +39,7 @@ diff -up system-config-printer-1.1.12/cu
          else:
              if kwds.has_key('timeout'):
                  timeout = kwds['timeout']
-@@ -320,6 +321,17 @@ class Connection:
+@@ -327,6 +328,17 @@ class Connection:
              if kwds.has_key('exclude_schemes'):
                  exclude_schemes = kwds['exclude_schemes']
  
@@ -59,7 +59,7 @@ diff -up system-config-printer-1.1.12/cu
          result = self._call_with_pk_and_fallback(use_pycups,
 diff -up system-config-printer-1.1.12/gtkspinner.py.get-devices system-config-printer-1.1.12/gtkspinner.py
 --- system-config-printer-1.1.12/gtkspinner.py.get-devices	2009-08-25 15:01:40.000000000 +0100
-+++ system-config-printer-1.1.12/gtkspinner.py	2009-09-04 10:41:43.126388753 +0100
++++ system-config-printer-1.1.12/gtkspinner.py	2009-09-04 10:40:45.096512525 +0100
 @@ -65,7 +65,7 @@ class Spinner:
      def _next_frame (self):
          n = self._current_frame + 1
@@ -70,8 +70,8 @@ diff -up system-config-printer-1.1.12/gt
          self._set_frame (n)
          return True
 diff -up system-config-printer-1.1.12/system-config-printer.py.get-devices system-config-printer-1.1.12/system-config-printer.py
---- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-04 10:41:43.112387975 +0100
-+++ system-config-printer-1.1.12/system-config-printer.py	2009-09-04 10:41:50.189513008 +0100
+--- system-config-printer-1.1.12/system-config-printer.py.get-devices	2009-09-04 10:40:45.074388881 +0100
++++ system-config-printer-1.1.12/system-config-printer.py	2009-09-04 10:40:54.528387635 +0100
 @@ -3681,6 +3681,7 @@ class NewPrinterGUI(GtkGUI):
          self.ntbkNPDownloadableDriverProperties.set_show_tabs(False)
  
@@ -111,7 +111,7 @@ diff -up system-config-printer-1.1.12/sy
          self.NewPrinterWindow.hide()
          if self.openprinting_query_handle != None:
              self.openprinting.cancelOperation (self.openprinting_query_handle)
-@@ -4611,32 +4629,48 @@ class NewPrinterGUI(GtkGUI):
+@@ -4611,45 +4629,48 @@ class NewPrinterGUI(GtkGUI):
              self.btnNPForward.set_sensitive(
                  self.mainapp.checkNPName(new_text))
  
@@ -126,24 +126,40 @@ diff -up system-config-printer-1.1.12/sy
 -        self.WaitWindow.set_transient_for (parent)
 -        self.WaitWindow.show_now ()
 -        self.busy (self.WaitWindow)
--        while gtk.events_pending ():
--            gtk.main_iteration ()
  
--        debugprint ("Fetching devices")
--        self.mainapp.cups._begin_operation (_("fetching device list"))
+-        if self.mainapp.cups._use_pk and config.WITH_POLKIT_1:
+-            def get_devices():
+-                c = authconn.Connection (host=self.mainapp.connect_server,
+-                                         parent=parent, lock=True)
+-                c._begin_operation (_("fetching device list"))
+-                ret = cupshelpers.getDevices (c)
+-                c._end_operation ()
+-                return ret
 +        have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
 +        if not have_polkit_1:
 +            if network:
 +                return {}
-+
+ 
+-            op = TimedOperation (get_devices)
+-            try:
+-                devices = op.run ()
+-            except (OperationCanceled, RuntimeError, cups.IPPError):
+-                self.WaitWindow.hide ()
+-                raise
+-        else:
+-            self.mainapp.cups._begin_operation (_("fetching device list"))
+-            try:
+-                devices = cupshelpers.getDevices (self.mainapp.cups)
+-                self.mainapp.cups._end_operation ()
+-            except cups.IPPError:
+-                self.mainapp.cups._end_operation ()
+-                self.WaitWindow.hide ()
+-                raise
 +            network = True
-+
+ 
+-        self.WaitWindow.hide ()
 +        network_schemes = ["dnssd", "snmp"]
-         try:
--            devices = cupshelpers.getDevices(self.mainapp.cups)
--        except:
--            self.mainapp.cups._end_operation ()
--            self.WaitWindow.hide ()
++        try:
 +            c = authconn.Connection (host=self.mainapp.connect_server,
 +                                     parent=parent, lock=True)
 +            debugprint ("in get_devices: connected")
@@ -169,10 +185,8 @@ diff -up system-config-printer-1.1.12/sy
 +            raise
 +        except cups.IPPError:
 +            c._end_operation ()
-             raise
- 
--        self.mainapp.cups._end_operation ()
--        self.WaitWindow.hide ()
++            raise
++
 +        c._end_operation ()
          debugprint ("Got devices")
 -        return devices
@@ -180,7 +194,7 @@ diff -up system-config-printer-1.1.12/sy
  
      def install_hplip_plugin(self, uri):
          """
-@@ -4949,23 +4983,66 @@ class NewPrinterGUI(GtkGUI):
+@@ -4962,23 +4983,66 @@ class NewPrinterGUI(GtkGUI):
          return (host, uri)
  
      def fillDeviceTab(self, current_uri=None):
@@ -232,7 +246,7 @@ diff -up system-config-printer-1.1.12/sy
 +            except:
 +                nonfatalException()
 +            return
- 
++
 +        if network:
 +            self.fetchDevices_op = None
 +        else:
@@ -244,7 +258,7 @@ diff -up system-config-printer-1.1.12/sy
 +                                                   kwargs={"network": True},
 +                                                   callback=self.got_devices,
 +                                                   context=context)
-+
+ 
 +        devices = result
          if current_uri:
              if devices.has_key (current_uri):
@@ -257,7 +271,7 @@ diff -up system-config-printer-1.1.12/sy
              else:
                  current = cupshelpers.Device (current_uri)
                  current.info = "Current device"
-@@ -5008,7 +5085,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5021,7 +5085,7 @@ class NewPrinterGUI(GtkGUI):
                                                   "hal", "beh",
                                                   "scsi", "http", "delete"),
                           devices)
@@ -266,7 +280,7 @@ diff -up system-config-printer-1.1.12/sy
          for device in devices:
              physicaldevice = PhysicalDevice (device)
              try:
-@@ -5016,43 +5093,32 @@ class NewPrinterGUI(GtkGUI):
+@@ -5029,43 +5093,32 @@ class NewPrinterGUI(GtkGUI):
                  self.devices[i].add_device (device)
              except ValueError:
                  self.devices.append (physicaldevice)
@@ -324,7 +338,7 @@ diff -up system-config-printer-1.1.12/sy
              if network:
                  if devs[0].uri != devs[0].type:
                      # An actual network printer device.  Put this at the top.
-@@ -5062,24 +5128,31 @@ class NewPrinterGUI(GtkGUI):
+@@ -5075,24 +5128,31 @@ class NewPrinterGUI(GtkGUI):
                      # If this is the currently selected device we need
                      # to expand the "Network Printer" row so that it
                      # is visible.
@@ -361,7 +375,7 @@ diff -up system-config-printer-1.1.12/sy
          connection_select_path = 0
          if current_uri:
              model = self.tvNPDeviceURIs.get_model ()
-@@ -5093,6 +5166,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5106,6 +5166,9 @@ class NewPrinterGUI(GtkGUI):
  
                  iter = model.iter_next (iter)
                  i += 1
@@ -371,7 +385,7 @@ diff -up system-config-printer-1.1.12/sy
  
          column = self.tvNPDeviceURIs.get_column (0)
          self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
-@@ -5552,6 +5628,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5565,6 +5628,7 @@ class NewPrinterGUI(GtkGUI):
          return False
  
      def on_tvNPDevices_cursor_changed(self, widget):
@@ -379,7 +393,7 @@ diff -up system-config-printer-1.1.12/sy
          path, column = widget.get_cursor ()
          if path == None:
              return
-@@ -5855,8 +5932,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5868,8 +5932,7 @@ class NewPrinterGUI(GtkGUI):
          self.network_found = 0
          self.lblNetworkFindSearching.show_all ()
          finder = probe_printer.PrinterFinder ()
@@ -389,7 +403,7 @@ diff -up system-config-printer-1.1.12/sy
          finder.find (host, found_callback)
  
      def found_network_printer_callback (self, new_device):
-@@ -5885,8 +5961,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5898,8 +5961,7 @@ class NewPrinterGUI(GtkGUI):
                  path = model.get_path (iter)
                  self.tvNPDevices.set_cursor (path)
          else:
@@ -401,7 +415,7 @@ diff -up system-config-printer-1.1.12/sy
              self.btnNetworkFind.set_sensitive (True)
 diff -up system-config-printer-1.1.12/timedops.py.get-devices system-config-printer-1.1.12/timedops.py
 --- system-config-printer-1.1.12/timedops.py.get-devices	2009-08-25 15:01:41.000000000 +0100
-+++ system-config-printer-1.1.12/timedops.py	2009-09-04 10:41:50.191513591 +0100
++++ system-config-printer-1.1.12/timedops.py	2009-09-04 10:40:54.530391539 +0100
 @@ -152,16 +152,25 @@ class OperationThread(threading.Thread):
  
  class TimedOperation(Timed):


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- system-config-printer.spec	4 Sep 2009 10:12:44 -0000	1.283
+++ system-config-printer.spec	14 Sep 2009 14:13:20 -0000	1.284
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,10 +17,11 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
-Patch4: system-config-printer-proxy-auth.patch
-Patch5: system-config-printer-ppdippstr.patch
-Patch6: system-config-printer-raw-device-change.patch
-Patch7: system-config-printer-get-devices.patch
+Patch4: system-config-printer-polkit-1.patch
+Patch5: system-config-printer-proxy-auth.patch
+Patch6: system-config-printer-ppdippstr.patch
+Patch7: system-config-printer-raw-device-change.patch
+Patch8: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -72,10 +73,11 @@ the configuration tool.
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
-%patch4 -p1 -b .proxy-auth
-%patch5 -p1 -b .ppdippstr
-%patch6 -p1 -b .raw-device-change
-%patch7 -p1 -b .get-devices
+%patch4 -p1 -b .polkit-1
+%patch5 -p1 -b .proxy-auth
+%patch6 -p1 -b .ppdippstr
+%patch7 -p1 -b .raw-device-change
+%patch8 -p1 -b .get-devices
 
 %build
 %configure
@@ -177,6 +179,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-9
+- Fixed traceback when fetching devices (bug #522139).
+
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
 - Further speed improvement when fetching devices.
 



From pkgdb at fedoraproject.org  Mon Sep 14 14:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 14:17:18 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has requested commit
Message-ID: <20090914141718.CF92A10F89A@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-network (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 14 14:18:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 14:18:07 +0000
Subject: [pkgdb] ghc F-12 cloned from devel
Message-ID: <20090914141808.19B1A10F880@bastion2.fedora.phx.redhat.com>

petersen cloned ghc F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From thias at fedoraproject.org  Mon Sep 14 14:22:54 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 14:22:54 +0000 (UTC)
Subject: rpms/synergy/devel synergy.spec,1.28,1.29
Message-ID: <20090914142254.E184411C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31394

Modified Files:
	synergy.spec 
Log Message:
Add xorg-x11-proto-devel build requirement for X11/extensions/XTest.h.



Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- synergy.spec	27 Jul 2009 05:18:19 -0000	1.28
+++ synergy.spec	14 Sep 2009 14:22:53 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
 Version: 1.3.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
@@ -17,8 +17,12 @@ Patch5: synergy-1.3.1-warnings.patch
 Patch6: synergy-1.3.1-stuttered-delay-fix.patch
 Patch7: synergy-1.3.1-stuttered-delay-fix-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: libXtst-devel
+BuildRequires: libXt-devel
 BuildRequires: libXinerama-devel
+BuildRequires: xorg-x11-proto-devel
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -67,6 +71,9 @@ install -p -m 644 %{SOURCE2} %{buildroot
 
 
 %changelog
+* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-14
+- Add xorg-x11-proto-devel build requirement for X11/extensions/XTest.h.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From denis at fedoraproject.org  Mon Sep 14 14:26:24 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 14 Sep 2009 14:26:24 +0000 (UTC)
Subject: rpms/glibmm24/devel glibmm-2.21.5-devhelp.patch, NONE,
	1.1 glibmm.spec, 1.59, 1.60
Message-ID: <20090914142624.B0EA611C00EC@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv367

Modified Files:
	glibmm.spec 
Added Files:
	glibmm-2.21.5-devhelp.patch 
Log Message:
Fixed postprocessing of devhelp links

glibmm-2.21.5-devhelp.patch:
 glibmm-2.4.devhelp2 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibmm-2.21.5-devhelp.patch ---
--- glibmm-2.21.5/docs/reference/glibmm-2.4.devhelp2~	2009-09-08 20:53:54.000000000 +0200
+++ glibmm-2.21.5/docs/reference/glibmm-2.4.devhelp2	2009-09-14 15:58:20.465208463 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<book xmlns="http://www.devhelp.net/book" title="glibmm Reference Manual" name="glibmm-2.4" base="http://library.gnome.org/devel/glibmm/unstable" link="index.html" version="2" language="c++">
+<book xmlns="http://www.devhelp.net/book" title="glibmm Reference Manual" name="glibmm-2.4" link="index.html" version="2" language="c++">
   <chapters>
     <sub name="Modules" link="modules.html">
       <sub name="Character Set Conversion" link="group__CharsetConv.html"/>


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- glibmm.spec	14 Sep 2009 09:10:54 -0000	1.59
+++ glibmm.spec	14 Sep 2009 14:26:24 -0000	1.60
@@ -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.21.5-devhelp.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 .devhelp
 
 
 %build
@@ -60,10 +62,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 
 # Fix documentation installation, put everything under gtk-doc
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4
-%{__mv} ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-sed -i 's:../../../doc/glibmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
-rm -fr $RPM_BUILD_ROOT%{_datadir}/devhelp/books/glibmm-2.4
+mv ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+# Remove old doc directory
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/glibmm-2.4
 
 
 %clean



From spot at fedoraproject.org  Mon Sep 14 14:45:11 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 14 Sep 2009 14:45:11 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.114,1.115 comps-f13.xml.in,1.6,1.7
Message-ID: <20090914144511.6802A11C00EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6825

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
move kde-l10n-Bengali-India out of assamese-support, into bengali-support (bz 518802)


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- comps-f12.xml.in	11 Sep 2009 17:17:18 -0000	1.114
+++ comps-f12.xml.in	14 Sep 2009 14:45:09 -0000	1.115
@@ -143,7 +143,6 @@
       <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-as</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -459,6 +458,7 @@
       <packagereq type="conditional" requires="hyphen">hyphen-bn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali-India</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>
       <packagereq type="default">iok</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- comps-f13.xml.in	11 Sep 2009 17:17:18 -0000	1.6
+++ comps-f13.xml.in	14 Sep 2009 14:45:09 -0000	1.7
@@ -143,7 +143,6 @@
       <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-as</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -459,6 +458,7 @@
       <packagereq type="conditional" requires="hyphen">hyphen-bn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali-India</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>
       <packagereq type="default">iok</packagereq>



From shakthimaan at fedoraproject.org  Mon Sep 14 14:49:47 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Mon, 14 Sep 2009 14:49:47 +0000 (UTC)
Subject: rpms/vrq/devel vrq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090914144947.67B0611C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4755/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vrq.spec 
Log Message:
vrq first package.



--- NEW FILE vrq.spec ---
Name:           vrq
Version:        1.0.58
Release:        3%{?dist}
Summary:        Verilog tool framework with plugins for manipulating source code

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://vrq.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# ---- Exclusive Arch: ----
# plugin/sim uses x86 inline assembly

ExclusiveArch:  %{ix86} x86_64

BuildRequires:  bison flex help2man doxygen iverilog-devel
Requires:       bzip2-libs

%description
VRQ is modular verilog parser that supports plugin tools to process verilog. 
Multiple tools may be invoked in a pipeline fashion within a single execution 
of vrq. It is a generic front-end parser with support for plugin backend 
customizable tools.

%package devel
Summary:        Header files and libraries for Vrq development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The vrq-devel package contains the header files and libraries needed
to develop backend plugin customization tools for the vrq tool framework.

%prep
%setup -q 
%{__rm} -rf `find . -name CVS`
%{__rm} -f `find . -name *.o`
%{__rm} -f `find . -name *.so`
%{__sed} -i "s|^MYDOCDIR = |MYDOCDIR = \$(DESTDIR)|" doc/Makefile*

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.la`
%{__rm} -rf `find %{buildroot} -name latex`

# Fedora Electronic Lab: Package Self Check
%check
%{__make} check

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README doc/faq.html
%{_bindir}/%{name}
%{_libdir}/%{name}-%{version}
%{_mandir}/man1/vrq.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/html plugin/examples/example1 plugin/examples/example2
%{_includedir}/%{name}-%{version}

%changelog
* Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
- Removed ldconfig for post and postun as shared library not in /usr/lib

* Sat Sep 12 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-2
- Removed ldconfig for post and postun in -devel package as it does not
  contain any shared libraries

* Thu Sep 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-1
- Added comment for using ExclusiveArch
- Removed perl from BR
- Simplified make install command and used -p to preserve timestamps for
  install files
- Updated MYDOCDIR in prep section 
- The main package doc contains AUTHORS ChangeLog COPYING README faq.html
- The devel package doc contains doc/html and example* folders
- Cleanup .so and .o files in example* folders

* Tue Sep 08 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-2
- Added Requires for -devel section as it is a MUST requirement.
- Added post, postun for -devel package as well.
- Cleaned up .la files in the shipped package.
- Replaced rm with __rm usage.

* Sun Sep 06 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:53:14 -0000	1.1
+++ .cvsignore	14 Sep 2009 14:49:46 -0000	1.2
@@ -0,0 +1 @@
+vrq-1.0.58.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:53:14 -0000	1.1
+++ sources	14 Sep 2009 14:49:47 -0000	1.2
@@ -0,0 +1 @@
+8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz



From shakthimaan at fedoraproject.org  Mon Sep 14 14:53:31 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Mon, 14 Sep 2009 14:53:31 +0000 (UTC)
Subject: rpms/vrq/F-10 import.log, NONE, 1.1 vrq.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914145331.AF61C11C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10086/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vrq.spec 
Log Message:
vrq first package.



--- NEW FILE import.log ---
vrq-1_0_58-3_fc11:F-10:vrq-1.0.58-3.fc11.src.rpm:1252940282


--- NEW FILE vrq.spec ---
Name:           vrq
Version:        1.0.58
Release:        3%{?dist}
Summary:        Verilog tool framework with plugins for manipulating source code

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://vrq.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# ---- Exclusive Arch: ----
# plugin/sim uses x86 inline assembly

ExclusiveArch:  %{ix86} x86_64

BuildRequires:  bison flex help2man doxygen iverilog-devel
Requires:       bzip2-libs

%description
VRQ is modular verilog parser that supports plugin tools to process verilog. 
Multiple tools may be invoked in a pipeline fashion within a single execution 
of vrq. It is a generic front-end parser with support for plugin backend 
customizable tools.

%package devel
Summary:        Header files and libraries for Vrq development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The vrq-devel package contains the header files and libraries needed
to develop backend plugin customization tools for the vrq tool framework.

%prep
%setup -q 
%{__rm} -rf `find . -name CVS`
%{__rm} -f `find . -name *.o`
%{__rm} -f `find . -name *.so`
%{__sed} -i "s|^MYDOCDIR = |MYDOCDIR = \$(DESTDIR)|" doc/Makefile*

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.la`
%{__rm} -rf `find %{buildroot} -name latex`

# Fedora Electronic Lab: Package Self Check
%check
%{__make} check

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README doc/faq.html
%{_bindir}/%{name}
%{_libdir}/%{name}-%{version}
%{_mandir}/man1/vrq.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/html plugin/examples/example1 plugin/examples/example2
%{_includedir}/%{name}-%{version}

%changelog
* Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
- Removed ldconfig for post and postun as shared library not in /usr/lib

* Sat Sep 12 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-2
- Removed ldconfig for post and postun in -devel package as it does not
  contain any shared libraries

* Thu Sep 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-1
- Added comment for using ExclusiveArch
- Removed perl from BR
- Simplified make install command and used -p to preserve timestamps for
  install files
- Updated MYDOCDIR in prep section 
- The main package doc contains AUTHORS ChangeLog COPYING README faq.html
- The devel package doc contains doc/html and example* folders
- Cleanup .so and .o files in example* folders

* Tue Sep 08 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-2
- Added Requires for -devel section as it is a MUST requirement.
- Added post, postun for -devel package as well.
- Cleaned up .la files in the shipped package.
- Replaced rm with __rm usage.

* Sun Sep 06 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:53:14 -0000	1.1
+++ .cvsignore	14 Sep 2009 14:53:31 -0000	1.2
@@ -0,0 +1 @@
+vrq-1.0.58.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:53:14 -0000	1.1
+++ sources	14 Sep 2009 14:53:31 -0000	1.2
@@ -0,0 +1 @@
+8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz



From shakthimaan at fedoraproject.org  Mon Sep 14 14:55:05 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Mon, 14 Sep 2009 14:55:05 +0000 (UTC)
Subject: rpms/vrq/F-11 import.log, NONE, 1.1 vrq.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914145505.323CB11C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10837/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vrq.spec 
Log Message:
vrq first package.



--- NEW FILE import.log ---
vrq-1_0_58-3_fc11:F-11:vrq-1.0.58-3.fc11.src.rpm:1252940486


--- NEW FILE vrq.spec ---
Name:           vrq
Version:        1.0.58
Release:        3%{?dist}
Summary:        Verilog tool framework with plugins for manipulating source code

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://vrq.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# ---- Exclusive Arch: ----
# plugin/sim uses x86 inline assembly

ExclusiveArch:  %{ix86} x86_64

BuildRequires:  bison flex help2man doxygen iverilog-devel
Requires:       bzip2-libs

%description
VRQ is modular verilog parser that supports plugin tools to process verilog. 
Multiple tools may be invoked in a pipeline fashion within a single execution 
of vrq. It is a generic front-end parser with support for plugin backend 
customizable tools.

%package devel
Summary:        Header files and libraries for Vrq development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The vrq-devel package contains the header files and libraries needed
to develop backend plugin customization tools for the vrq tool framework.

%prep
%setup -q 
%{__rm} -rf `find . -name CVS`
%{__rm} -f `find . -name *.o`
%{__rm} -f `find . -name *.so`
%{__sed} -i "s|^MYDOCDIR = |MYDOCDIR = \$(DESTDIR)|" doc/Makefile*

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.la`
%{__rm} -rf `find %{buildroot} -name latex`

# Fedora Electronic Lab: Package Self Check
%check
%{__make} check

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README doc/faq.html
%{_bindir}/%{name}
%{_libdir}/%{name}-%{version}
%{_mandir}/man1/vrq.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/html plugin/examples/example1 plugin/examples/example2
%{_includedir}/%{name}-%{version}

%changelog
* Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
- Removed ldconfig for post and postun as shared library not in /usr/lib

* Sat Sep 12 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-2
- Removed ldconfig for post and postun in -devel package as it does not
  contain any shared libraries

* Thu Sep 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-1
- Added comment for using ExclusiveArch
- Removed perl from BR
- Simplified make install command and used -p to preserve timestamps for
  install files
- Updated MYDOCDIR in prep section 
- The main package doc contains AUTHORS ChangeLog COPYING README faq.html
- The devel package doc contains doc/html and example* folders
- Cleanup .so and .o files in example* folders

* Tue Sep 08 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-2
- Added Requires for -devel section as it is a MUST requirement.
- Added post, postun for -devel package as well.
- Cleaned up .la files in the shipped package.
- Replaced rm with __rm usage.

* Sun Sep 06 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:53:14 -0000	1.1
+++ .cvsignore	14 Sep 2009 14:55:04 -0000	1.2
@@ -0,0 +1 @@
+vrq-1.0.58.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:53:14 -0000	1.1
+++ sources	14 Sep 2009 14:55:05 -0000	1.2
@@ -0,0 +1 @@
+8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz



From shakthimaan at fedoraproject.org  Mon Sep 14 14:56:42 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Mon, 14 Sep 2009 14:56:42 +0000 (UTC)
Subject: rpms/vrq/EL-5 import.log, NONE, 1.1 vrq.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914145642.6FEB011C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11527/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vrq.spec 
Log Message:
vrq first package.



--- NEW FILE import.log ---
vrq-1_0_58-3_fc11:EL-5:vrq-1.0.58-3.fc11.src.rpm:1252940578


--- NEW FILE vrq.spec ---
Name:           vrq
Version:        1.0.58
Release:        3%{?dist}
Summary:        Verilog tool framework with plugins for manipulating source code

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://vrq.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# ---- Exclusive Arch: ----
# plugin/sim uses x86 inline assembly

ExclusiveArch:  %{ix86} x86_64

BuildRequires:  bison flex help2man doxygen iverilog-devel
Requires:       bzip2-libs

%description
VRQ is modular verilog parser that supports plugin tools to process verilog. 
Multiple tools may be invoked in a pipeline fashion within a single execution 
of vrq. It is a generic front-end parser with support for plugin backend 
customizable tools.

%package devel
Summary:        Header files and libraries for Vrq development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The vrq-devel package contains the header files and libraries needed
to develop backend plugin customization tools for the vrq tool framework.

%prep
%setup -q 
%{__rm} -rf `find . -name CVS`
%{__rm} -f `find . -name *.o`
%{__rm} -f `find . -name *.so`
%{__sed} -i "s|^MYDOCDIR = |MYDOCDIR = \$(DESTDIR)|" doc/Makefile*

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.la`
%{__rm} -rf `find %{buildroot} -name latex`

# Fedora Electronic Lab: Package Self Check
%check
%{__make} check

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README doc/faq.html
%{_bindir}/%{name}
%{_libdir}/%{name}-%{version}
%{_mandir}/man1/vrq.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/html plugin/examples/example1 plugin/examples/example2
%{_includedir}/%{name}-%{version}

%changelog
* Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
- Removed ldconfig for post and postun as shared library not in /usr/lib

* Sat Sep 12 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-2
- Removed ldconfig for post and postun in -devel package as it does not
  contain any shared libraries

* Thu Sep 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-1
- Added comment for using ExclusiveArch
- Removed perl from BR
- Simplified make install command and used -p to preserve timestamps for
  install files
- Updated MYDOCDIR in prep section 
- The main package doc contains AUTHORS ChangeLog COPYING README faq.html
- The devel package doc contains doc/html and example* folders
- Cleanup .so and .o files in example* folders

* Tue Sep 08 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-2
- Added Requires for -devel section as it is a MUST requirement.
- Added post, postun for -devel package as well.
- Cleaned up .la files in the shipped package.
- Replaced rm with __rm usage.

* Sun Sep 06 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.56-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 04:53:14 -0000	1.1
+++ .cvsignore	14 Sep 2009 14:56:42 -0000	1.2
@@ -0,0 +1 @@
+vrq-1.0.58.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 04:53:14 -0000	1.1
+++ sources	14 Sep 2009 14:56:42 -0000	1.2
@@ -0,0 +1 @@
+8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz



From rdieter at fedoraproject.org  Mon Sep 14 14:57:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 14:57:29 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork.spec,1.193,1.194
Message-ID: <20090914145729.9353811C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11915

Modified Files:
	kdenetwork.spec 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kopete/bonjour patch
- krfb produces garbled display (#523131, kde#162493)



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- kdenetwork.spec	1 Sep 2009 17:52:31 -0000	1.193
+++ kdenetwork.spec	14 Sep 2009 14:57:29 -0000	1.194
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,6 +14,9 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdenetwork-4.3.0-fix-bonjour.patch
+# http://bugs.kde.org/162493
+Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -94,6 +97,8 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
+%patch100 -p0 -b .bonjour
+%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -186,6 +191,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- kopete/bonjour patch
+- krfb produces garbled display (#523131, kde#162493)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From rdieter at fedoraproject.org  Mon Sep 14 14:57:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 14:57:54 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork-4.3.0-fix-bonjour.patch, NONE,
	1.1 kdenetwork-4.3.1-kde#162493.patch, NONE, 1.1
Message-ID: <20090914145754.465D411C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12203

Added Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kopete/bonjour patch
- krfb produces garbled display (#523131, kde#162493)


kdenetwork-4.3.0-fix-bonjour.patch:
 bonjourcontactconnection.cpp |   11 ++++++++++-
 bonjourcontactconnection.h   |    3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdenetwork-4.3.0-fix-bonjour.patch ---
diff --git kopete/protocols/bonjour/bonjourcontactconnection.cpp kopete/protocols/bonjour/bonjourcontactconnection.cpp
index 0a925b4..c126011 100644
--- kopete/protocols/bonjour/bonjourcontactconnection.cpp
+++ kopete/protocols/bonjour/bonjourcontactconnection.cpp
@@ -56,9 +56,10 @@ void BonjourContactConnection::setSocket(QTcpSocket *aSocket)
 }
 
 BonjourContactConnection::BonjourContactConnection(QTcpSocket *aSocket, 
-		QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), socket(aSocket), parser(),
+		QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), parser(),
 					local(), remote()
 {
+	setSocket(aSocket);
 }
 
 BonjourContactConnection::BonjourContactConnection(const QHostAddress &address, short int port,
@@ -188,6 +189,14 @@ void BonjourContactConnection::dataInSocket()
 			getStreamTag(token);
 			break;
 	}
+
+	if (moreTokensAvailable())
+		dataInSocket();
+}
+
+bool BonjourContactConnection::moreTokensAvailable()
+{
+	return ! parser.atEnd();
 }
 
 void BonjourContactConnection::getStreamTag(BonjourXmlToken &token)
diff --git kopete/protocols/bonjour/bonjourcontactconnection.h kopete/protocols/bonjour/bonjourcontactconnection.h
index c0d347a..6c06300 100644
--- kopete/protocols/bonjour/bonjourcontactconnection.h
+++ kopete/protocols/bonjour/bonjourcontactconnection.h
@@ -80,6 +80,9 @@ class BonjourContactConnection : public QObject {
 	// Set the Socket
 	void setSocket(QTcpSocket *socket);
 
+	// Determine if there is more data available
+	bool moreTokensAvailable();
+
 	/**
 	 * @brief Description of A Token
 	 *

kdenetwork-4.3.1-kde#162493.patch:
 krfbserver.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdenetwork-4.3.1-kde#162493.patch ---
--- branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp	2009/06/24 10:17:04	986143
+++ branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp	2009/09/11 09:48:36	1022262
@@ -164,9 +164,14 @@
     int w = d->fb->width();
     int h = d->fb->height();
     int depth = d->fb->depth();
+    
+    int bpp = depth >> 3;
+    if (bpp != 1 && bpp != 2 && bpp != 4) bpp = 4;
+    kDebug() << "bpp: " << bpp;
 
     rfbLogEnable(0);
-    screen = rfbGetScreen(0, 0, w, h, 8, 3,depth / 8);
+    screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+    
     screen->paddedWidthInBytes = d->fb->paddedWidth();
 
     d->fb->getServerFormat(screen->serverFormat);



From rdieter at fedoraproject.org  Mon Sep 14 14:58:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 14:58:23 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.3.0-fix-bonjour.patch, NONE,
	1.1 kdenetwork-4.3.1-kde#162493.patch, NONE, 1.1 kdenetwork.spec,
	1.175, 1.176
Message-ID: <20090914145823.0A4BC11C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12457

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kopete/bonjour patch
- krfb produces garbled display (#523131, kde#162493)


kdenetwork-4.3.0-fix-bonjour.patch:
 bonjourcontactconnection.cpp |   11 ++++++++++-
 bonjourcontactconnection.h   |    3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdenetwork-4.3.0-fix-bonjour.patch ---
diff --git kopete/protocols/bonjour/bonjourcontactconnection.cpp kopete/protocols/bonjour/bonjourcontactconnection.cpp
index 0a925b4..c126011 100644
--- kopete/protocols/bonjour/bonjourcontactconnection.cpp
+++ kopete/protocols/bonjour/bonjourcontactconnection.cpp
@@ -56,9 +56,10 @@ void BonjourContactConnection::setSocket(QTcpSocket *aSocket)
 }
 
 BonjourContactConnection::BonjourContactConnection(QTcpSocket *aSocket, 
-		QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), socket(aSocket), parser(),
+		QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), parser(),
 					local(), remote()
 {
+	setSocket(aSocket);
 }
 
 BonjourContactConnection::BonjourContactConnection(const QHostAddress &address, short int port,
@@ -188,6 +189,14 @@ void BonjourContactConnection::dataInSocket()
 			getStreamTag(token);
 			break;
 	}
+
+	if (moreTokensAvailable())
+		dataInSocket();
+}
+
+bool BonjourContactConnection::moreTokensAvailable()
+{
+	return ! parser.atEnd();
 }
 
 void BonjourContactConnection::getStreamTag(BonjourXmlToken &token)
diff --git kopete/protocols/bonjour/bonjourcontactconnection.h kopete/protocols/bonjour/bonjourcontactconnection.h
index c0d347a..6c06300 100644
--- kopete/protocols/bonjour/bonjourcontactconnection.h
+++ kopete/protocols/bonjour/bonjourcontactconnection.h
@@ -80,6 +80,9 @@ class BonjourContactConnection : public QObject {
 	// Set the Socket
 	void setSocket(QTcpSocket *socket);
 
+	// Determine if there is more data available
+	bool moreTokensAvailable();
+
 	/**
 	 * @brief Description of A Token
 	 *

kdenetwork-4.3.1-kde#162493.patch:
 krfbserver.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdenetwork-4.3.1-kde#162493.patch ---
--- branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp	2009/06/24 10:17:04	986143
+++ branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp	2009/09/11 09:48:36	1022262
@@ -164,9 +164,14 @@
     int w = d->fb->width();
     int h = d->fb->height();
     int depth = d->fb->depth();
+    
+    int bpp = depth >> 3;
+    if (bpp != 1 && bpp != 2 && bpp != 4) bpp = 4;
+    kDebug() << "bpp: " << bpp;
 
     rfbLogEnable(0);
-    screen = rfbGetScreen(0, 0, w, h, 8, 3,depth / 8);
+    screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+    
     screen->paddedWidthInBytes = d->fb->paddedWidth();
 
     d->fb->getServerFormat(screen->serverFormat);


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- kdenetwork.spec	1 Sep 2009 17:52:30 -0000	1.175
+++ kdenetwork.spec	14 Sep 2009 14:58:22 -0000	1.176
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,6 +14,9 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdenetwork-4.3.0-fix-bonjour.patch
+# http://bugs.kde.org/162493
+Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -94,6 +97,8 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
+%patch100 -p0 -b .bonjour
+%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -186,6 +191,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- kopete/bonjour patch
+- krfb produces garbled display (#523131, kde#162493)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From crobinso at fedoraproject.org  Mon Sep 14 14:58:39 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Sep 2009 14:58:39 +0000 (UTC)
Subject: rpms/virt-manager/F-10 virt-manager-0.6.1-pylint-script.patch, NONE,
	1.1 virt-manager.spec, 1.41, 1.42
Message-ID: <20090914145839.092C611C00EC@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12576

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.6.1-pylint-script.patch 
Log Message:
Add pylint script for sanity testing.


virt-manager-0.6.1-pylint-script.patch:
 Makefile.am                  |    2 
 tests/Makefile.am            |    4 +
 tests/pylint-virt-manager.sh |  115 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)

--- NEW FILE virt-manager-0.6.1-pylint-script.patch ---
diff -rupN virt-manager-0.6.1/tests/Makefile.am new/tests/Makefile.am
--- virt-manager-0.6.1/tests/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/Makefile.am	2009-03-18 13:05:51.516847000 -0400
@@ -0,0 +1,4 @@
+testsdir = $(pkgdatadir)/tests
+tests_DATA = $(wildcard $(srcdir)/*.sh)
+
+EXTRA_DIST = $(tests_DATA)
diff -rupN virt-manager-0.6.1/tests/pylint-virt-manager.sh new/tests/pylint-virt-manager.sh
--- virt-manager-0.6.1/tests/pylint-virt-manager.sh	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/pylint-virt-manager.sh	2009-03-18 13:05:51.513848000 -0400
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# pylint doesn't work well with a file named xxx.py.xxx
+cp src/virt-manager.py.in src/_virt-manager
+
+cd src || exit 1
+
+IGNOREFILES="IPy.py"
+FILES="virtManager/ _virt-manager"
+
+# Deliberately ignored warnings:
+# Don't print pylint config warning
+NO_PYL_CONFIG=".*No config file found.*"
+
+# The gettext function is installed in the builtin namespace
+GETTEXT_VAR="Undefined variable '_'"
+
+# These all work fine and are legit, just false positives
+GOBJECT_VAR="has no '__gobject_init__' member"
+EMIT_VAR="has no 'emit' member"
+ERROR_VBOX="vmmErrorDialog.__init__.*Class 'vbox' has no 'pack_start' member"
+EXCEPTHOOK="no '__excepthook__' member"
+CONNECT_VAR="no 'connect' member"
+DISCONNECT_VAR="no 'disconnect' member"
+
+# os._exit is needed for forked processes.
+OS_EXIT="protected member _exit of a client class"
+
+# Avahi API may have requirements on callback argument names, so ignore these
+# warnings
+BTYPE_LIST="(vmmConnect.add_service|vmmConnect.remove_service|vmmConnect.add_conn_to_list)"
+BUILTIN_TYPE="${BTYPE_LIST}.*Redefining built-in 'type'"
+
+
+DMSG=""
+addmsg() {
+    DMSG="${DMSG},$1"
+}
+
+addchecker() {
+    DCHECKERS="${DCHECKERS},$1"
+}
+
+# Disabled unwanted messages
+addmsg "C0103"      # C0103: Name doesn't match some style regex
+addmsg "C0111"      # C0111: No docstring
+addmsg "C0301"      # C0301: Line too long
+addmsg "C0302"      # C0302: Too many lines in module
+addmsg "C0324"      # C0324: *Comma not followed by a space*
+addmsg "R0201"      # R0201: Method could be a function
+addmsg "W0105"      # W0105: String statement has no effect
+addmsg "W0141"      # W0141: Complaining about 'map' and 'filter'
+addmsg "W0142"      # W0142: *Used * or ** magic*
+addmsg "W0403"      # W0403: Relative imports
+addmsg "W0603"      # W0603: Using the global statement
+addmsg "W0702"      # W0703: No exception type specified
+addmsg "W0703"      # W0703: Catch 'Exception'
+addmsg "W0704"      # W0704: Exception doesn't do anything
+
+# Potentially useful messages, disabled for now
+addmsg "C0322"      # C0322: *Operator not preceded by a space*
+addmsg "C0323"      # C0323: *Operator not followed by a space*
+addmsg "W0201"      # W0201: Defined outside __init__
+addmsg "W0511"      # W0511: FIXME and XXX: messages
+addmsg "W0613"      # W0613: Unused arguments
+
+# Disabled Checkers:
+addchecker "Design"         # Things like "Too many func arguments",
+                            #             "Too man public methods"
+addchecker "Similarities"   # Finds duplicate code (enable this later?)
+
+# May want to enable this in the future
+SHOW_REPORT="n"
+
+AWK=awk
+[ `uname -s` = 'SunOS' ] && AWK=nawk
+
+pylint --ignore=IPy.py $FILES \
+  --reports=$SHOW_REPORT \
+  --output-format=colorized \
+  --dummy-variables-rgx="dummy|ignore*" \
+  --disable-msg=${DMSG}\
+  --disable-checker=${DCHECKERS} 2>&1 | \
+  egrep -ve "$NO_PYL_CONFIG" \
+        -ve "$GOBJECT_VAR" \
+        -ve "$EMIT_VAR" \
+        -ve "$CONNECT_VAR" \
+        -ve "$DISCONNECT_VAR" \
+        -ve "$GETTEXT_VAR" \
+        -ve "$OS_EXIT" \
+        -ve "$BUILTIN_TYPE" \
+        -ve "$ERROR_VBOX" \
+        -ve "$EXCEPTHOOK" | \
+$AWK '\
+# Strip out any "*** Module name" lines if we dont list any errors for them
+BEGIN { found=0; cur_line="" }
+{
+    if (found == 1) {
+        if ( /\*\*\*/ ) {
+            prev_line = $0
+        } else {
+            print prev_line
+            print $0
+            found = 0
+        }
+    } else if ( /\*\*\*/ ) {
+        found = 1
+        prev_line = $0
+    } else {
+        print $0
+    }
+}'
+
+cd - > /dev/null
+rm src/_virt-manager
diff -rup virt-manager-0.6.1/Makefile.am new/Makefile.am
--- virt-manager-0.6.1/Makefile.am	2009-01-26 14:33:33.000000000 -0500
+++ new/Makefile.am	2009-03-18 13:25:07.912999000 -0400
@@ -11,4 +11,4 @@ rpm: clean
 	$(MAKE) dist && rpmbuild -ta $(distdir).tar.gz
 
 check-pylint:
-	tests/pylint-virt-manager.sh
+	sh tests/pylint-virt-manager.sh


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-10/virt-manager.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- virt-manager.spec	14 Sep 2009 01:01:38 -0000	1.41
+++ virt-manager.spec	14 Sep 2009 14:58:38 -0000	1.42
@@ -22,6 +22,8 @@ Patch3: %{name}-%{version}-fix-stats-pre
 Patch4: %{name}-%{version}-migrate-fixes.patch
 # Back compat fixes for connecting to older xen installations (bz 489885)
 Patch5: %{name}-%{version}-rhel-fixes.patch
+# Add pylint script for sanity testing the build
+Patch6: %{name}-%{version}-pylint-script.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +101,7 @@ management API.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure



From pwouters at fedoraproject.org  Mon Sep 14 15:03:27 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 14 Sep 2009 15:03:27 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.cron, 1.2, 1.3 nsd.spec, 1.26, 1.27 nsd.sysconfig,
	1.3, 1.4
Message-ID: <20090914150327.2411E11C00EC@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233

Modified Files:
	nsd.cron nsd.spec nsd.sysconfig 
Log Message:
* Mon Sep 14 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-3
- Fix for another redirection error in nsd.cron (Ville Mattila)
- Add support for NSD_AUTOREBUILD disabling via /etc/sysconfig/nsd (Ville Mattila)
- Fix for checking rebuild with large amount of zones (Ville Mattila)



Index: nsd.cron
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.cron,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nsd.cron	4 Jun 2009 18:19:32 -0000	1.2
+++ nsd.cron	14 Sep 2009 15:03:26 -0000	1.3
@@ -5,8 +5,17 @@
 # in the ixfr.db and nsd.db files back into the zone files or visa
 # versa
 
+# Default settings - do not edit these but /etc/sysconfig/nsd instead!
+NSD_CONF="/etc/nsd/nsd.conf"
+NSDC_PROG="/usr/sbin/nsdc"
+NSD_CHECKCONF_PROG="/usr/sbin/nsd-checkconf"
+NSD_AUTOREBUILD="yes"
+
+# Read in local settings.
+[ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
+
 # Ideally check if ixfr.db newer then any zones, only then do
-/usr/sbin/nsdc patch > /dev/null 2>&1
+$NSDC_PROG patch > /dev/null 2>&1
 
 # We try to only rebuild/reload when neccessary. If 1 zone is newer,
 # we need to rebuild the db file.
@@ -14,19 +23,25 @@
 # complete this operation within an hour, but it should work fine for
 # most other uses.
 
-for zonefile in `/usr/sbin/nsd-checkconf -v /etc/nsd/nsd.conf  |grep zonefile: | sed "s/^.*\"\(.*\)\"/\1/"`
-do
-	if [ $zonefile -nt /var/lib/nsd/nsd.db ]
-	then
-		echo "Zone $zonefile update requires nsd.db rebuild"
-		/usr/sbin/nsdc rebuild > /dev/null 2>%1
-		/usr/sbin/nsdc reload > /dev/null 2>%1
-		break
-	fi
-done
-
+case "$NSD_AUTOREBUILD" in
+	[Yy]|[Yy][Ee][Ss])
+		database="`$NSD_CHECKCONF_PROG -o database $NSD_CONF`"
+		$NSD_CHECKCONF_PROG -v $NSD_CONF | grep zonefile: | sed "s/^.*\"\(.*\)\"/\1/" | while read zonefile
+		do
+			if [ $zonefile -nt $database ]
+			then
+				echo "Zone $zonefile update requires database rebuild"
+				$NSDC_PROG rebuild > /dev/null 2>&1
+				$NSDC_PROG reload > /dev/null 2>&1
+				break
+			fi
+		done
+		;;
+	*)
+		;;	
+esac
 
 # nsd checks the serial in notify requests, so its better to send an
 # occasional redundant notify, then to miss it.
 # According to the nsd team, this is no longer neccessary
-# /usr/sbin/nsdc notify > /dev/null 2>%1
+# $NSDC_PROG notify > /dev/null 2>&1


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nsd.spec	17 Aug 2009 22:08:44 -0000	1.26
+++ nsd.spec	14 Sep 2009 15:03:26 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,11 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Sep 14 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-3
+- Fix for another redirection error in nsd.cron (Ville Mattila)
+- Add support for NSD_AUTOREBUILD disabling via /etc/sysconfig/nsd (Ville Mattila)
+- Fix for checking rebuild with large amount of zones (Ville Mattila)
+
 * Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-2
 - Updated to 3.2.3
 


Index: nsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nsd.sysconfig	4 Jun 2009 20:59:34 -0000	1.3
+++ nsd.sysconfig	14 Sep 2009 15:03:26 -0000	1.4
@@ -20,6 +20,9 @@ OTHER_NSD_OPTS=""
 # Path to nsd program
 #NSD_PROG="/usr/sbin/nsd"
 
+# Path to nsd-checkconf program
+#NSD_CHECKCONF_PROG="/usr/sbin/nsd-checkconf"
+
 # NSD pid file
 #NSD_PIDFILE="/var/run/nsd/nsd.pid"
 
@@ -27,4 +30,9 @@ OTHER_NSD_OPTS=""
 # parameter set in nsd.conf)
 #NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
 
+# NSD_AUTOREBUILD:  Choose with "yes" or "no" whether NSD database should
+# be rebuilt and reloaded automatically hourly by /etc/cron.hourly/nsd script.
+# (Default value is set in the script.)
+#NSD_AUTOREBUILD="no"
+
 # EOF



From crobinso at fedoraproject.org  Mon Sep 14 15:05:51 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Sep 2009 15:05:51 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.0-addhw-errmsg-typo.patch, 
	NONE, 1.1 virt-manager-0.8.0-cdrom-eject-driver.patch, NONE,
	1.1 virt-manager-0.8.0-newvm-storage-cb.patch, NONE,
	1.1 virt-manager-0.8.0-no-delete-active.patch, NONE,
	1.1 virt-manager-0.8.0-pylint-tweak.patch, NONE,
	1.1 virt-manager.spec, 1.56, 1.57
Message-ID: <20090914150551.B0F2411C00EC@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15203

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-addhw-errmsg-typo.patch 
	virt-manager-0.8.0-cdrom-eject-driver.patch 
	virt-manager-0.8.0-newvm-storage-cb.patch 
	virt-manager-0.8.0-no-delete-active.patch 
	virt-manager-0.8.0-pylint-tweak.patch 
Log Message:
Fix disk XML mangling via connect/eject cdrom (bz 516116)
Fix delete button sensitivity (bz 518536)
Fix populating text box from storage browser in 'New VM' (bz 517263)
Fix a traceback in an 'Add Hardware' error path (bz 517286)


virt-manager-0.8.0-addhw-errmsg-typo.patch:
 AUTHORS                        |    1 +
 src/virtManager/addhardware.py |    4 ++--
 src/vmm-manager.glade          |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE virt-manager-0.8.0-addhw-errmsg-typo.patch ---
# HG changeset patch
# User Paul W. Frields <stickster at gmail.com>
# Date 1251729959 14400
# Node ID d34def55dbd78e2ad5f099d6a38c1f358c798555
# Parent  b70858b9f8c6f9fea21f6e66a10e7b9498f11e5e
addhardware: Fix error message syntax typo

diff -r b70858b9f8c6 -r d34def55dbd7 AUTHORS
--- a/AUTHORS	Mon Aug 31 10:19:49 2009 -0400
+++ b/AUTHORS	Mon Aug 31 10:45:59 2009 -0400
@@ -59,6 +59,7 @@
   Emmanuel Lacour <elacour-at-home-dn-dot-net>
   Laurent L?onard <laurent-at-open-minds-dot-org>
   Michal Novotny <minovotn-at-redhat-dot-com>
+  Paul W. Frields <stickster-at-gmail-dot-com>
 
   <...send a patch & get your name here...>
 
diff -r b70858b9f8c6 -r d34def55dbd7 src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Mon Aug 31 10:19:49 2009 -0400
+++ b/src/virtManager/addhardware.py	Mon Aug 31 10:45:59 2009 -0400
@@ -1186,8 +1186,8 @@
                     conn = self.vm.get_connection().vmm,
                     name = nodedev_name)
             except Exception, e:
-                return self.err.val_err(_("Host device parameter error",
-                                        str(e)))
+                return self.err.val_err(_("Host device parameter error"),
+                                        str(e))
 
         elif page_num == PAGE_CHAR:
             chartype = self.get_char_type()
diff -r b70858b9f8c6 -r d34def55dbd7 src/vmm-manager.glade
--- a/src/vmm-manager.glade	Mon Aug 31 10:19:49 2009 -0400
+++ b/src/vmm-manager.glade	Mon Aug 31 10:45:59 2009 -0400
@@ -118,7 +118,7 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="menu_edit_delete">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Delete Virtual Machine</property>
+                        <property name="label" translatable="yes">Delete</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_menu_edit_delete_activate"/>
                         <child internal-child="image">

virt-manager-0.8.0-cdrom-eject-driver.patch:
 domain.py |   33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

--- NEW FILE virt-manager-0.8.0-cdrom-eject-driver.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1251727555 14400
# Node ID c0de24094ca26b8da900d29746adba056f4114f7
# Parent  37a986ce54ceac389573d763c78f633a10ec1ab7
Don't mangle QEMU driver name on cdrom connect (bz 516116)

diff -r 37a986ce54ce -r c0de24094ca2 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Thu Aug 27 11:07:35 2009 -0400
+++ b/src/virtManager/domain.py	Mon Aug 31 10:05:55 2009 -0400
@@ -1291,19 +1291,28 @@
         xml = self.get_device_xml("disk", dev_id_info)
 
         def cdrom_xml_connect(doc, ctx):
-            disk_fragment = ctx.xpathEval("/disk")
+            disk_fragment = ctx.xpathEval("/disk")[0]
             driver_fragment = ctx.xpathEval("/disk/driver")
-            disk_fragment[0].setProp("type", _type)
-            elem = disk_fragment[0].newChild(None, "source", None)
+            disk_fragment.setProp("type", _type)
+            elem = disk_fragment.newChild(None, "source", None)
+
             if _type == "file":
                 elem.setProp("file", source)
-                if driver_fragment:
-                    driver_fragment[0].setProp("name", _type)
+                driver_name = _type
             else:
                 elem.setProp("dev", source)
-                if driver_fragment:
-                    driver_fragment[0].setProp("name", "phy")
-            return disk_fragment[0].serialize()
+                driver_name = "phy"
+
+            if driver_fragment:
+                driver_fragment = driver_fragment[0]
+                orig_name = driver_fragment.prop("name")
+
+                # For Xen, the driver name is dependent on the storage type
+                # (file or phys).
+                if orig_name and orig_name in [ "file", "phy" ]:
+                    driver_fragment.setProp("name", driver_name)
+
+            return disk_fragment.serialize()
 
         result = util.xml_parse_wrapper(xml, cdrom_xml_connect)
         logging.debug("connect_cdrom produced: %s" % result)
@@ -1313,17 +1322,19 @@
         xml = self.get_device_xml("disk", dev_id_info)
 
         def cdrom_xml_disconnect(doc, ctx):
-            disk_fragment = ctx.xpathEval("/disk")
+            disk_fragment = ctx.xpathEval("/disk")[0]
             sourcenode = None
-            for child in disk_fragment[0].children:
+
+            for child in disk_fragment.children:
                 if child.name == "source":
                     sourcenode = child
                     break
                 else:
                     continue
+
             sourcenode.unlinkNode()
             sourcenode.freeNode()
-            return disk_fragment[0].serialize()
+            return disk_fragment.serialize()
 
         result = util.xml_parse_wrapper(xml, cdrom_xml_disconnect)
         logging.debug("eject_cdrom produced: %s" % result)

virt-manager-0.8.0-newvm-storage-cb.patch:
 addhardware.py   |    5 +----
 create.py        |    5 +++--
 storagebrowse.py |    6 ++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE virt-manager-0.8.0-newvm-storage-cb.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1252939197 14400
# Node ID 486cd6791c3926420786d30401a690884acdf653
# Parent  043ca66e19aabcdb89b8bbe76ef5ded8b0c0fc54
Fix populating text box with storage browser selection in 'New VM' (bz 517263)

We were only properly setting the 'finish' callback for the first time the
storage browser was launched. All subsequent runs would not enter anything
in the associated text box.

diff -r 043ca66e19aa -r 486cd6791c39 src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Mon Sep 14 10:14:41 2009 -0400
+++ b/src/virtManager/addhardware.py	Mon Sep 14 10:39:57 2009 -0400
@@ -80,7 +80,6 @@
                                   _("An unexpected error occurred"))
 
         self.storage_browser = None
-        self._browse_cb_id = None
 
         self._dev = None
 
@@ -911,10 +910,8 @@
         conn = self.vm.get_connection()
         if self.storage_browser == None:
             self.storage_browser = vmmStorageBrowser(self.config, conn, False)
-        if self._browse_cb_id:
-            self.storage_browser.disconnect(self._browse_cb_id)
 
-        self._browse_cb_id = self.storage_browser.connect("storage-browse-finish", set_storage_cb)
+        self.storage_browser.set_finish_cb(set_storage_cb)
         self.storage_browser.local_args = { "dialog_name": dialog_name,
                                             "confirm_func": confirm_func,
                                             "browse_reason":
diff -r 043ca66e19aa -r 486cd6791c39 src/virtManager/create.py
--- a/src/virtManager/create.py	Mon Sep 14 10:14:41 2009 -0400
+++ b/src/virtManager/create.py	Mon Sep 14 10:39:57 2009 -0400
@@ -1644,8 +1644,9 @@
         if self.storage_browser == None:
             self.storage_browser = vmmStorageBrowser(self.config, self.conn,
                                                      is_media)
-            self.storage_browser.connect("storage-browse-finish",
-                                         callback)
+
+        self.storage_browser.set_finish_cb(callback)
+
         if is_media:
             reason = self.config.CONFIG_DIR_MEDIA
         else:
diff -r 043ca66e19aa -r 486cd6791c39 src/virtManager/storagebrowse.py
--- a/src/virtManager/storagebrowse.py	Mon Sep 14 10:14:41 2009 -0400
+++ b/src/virtManager/storagebrowse.py	Mon Sep 14 10:39:57 2009 -0400
@@ -47,6 +47,7 @@
         self.config = config
         self.conn = conn
         self.conn_signal_ids = []
+        self.finish_cb_id = None
 
         self.topwin = self.window.get_widget("vmm-storage-browse")
         self.err = vmmErrorDialog(self.topwin,
@@ -89,6 +90,11 @@
             self.addvol.close()
         return 1
 
+    def set_finish_cb(self, callback):
+        if self.finish_cb_id:
+            self.disconnect(self.finish_cb_id)
+        self.finish_cb_id = self.connect("storage-browse-finish", callback)
+
     def set_initial_state(self):
         pool_list = self.window.get_widget("pool-list")
         virtManager.host.init_pool_list(pool_list, self.pool_selected)

virt-manager-0.8.0-no-delete-active.patch:
 manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.0-no-delete-active.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1251728389 14400
# Node ID b70858b9f8c6f9fea21f6e66a10e7b9498f11e5e
# Parent  0bdea2b6c30e3b9ac7ca7b35f957598e66fd8c36
Don't allow deleting an active VM (bz 518536)

diff -r 0bdea2b6c30e -r b70858b9f8c6 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Mon Aug 31 10:07:06 2009 -0400
+++ b/src/virtManager/manager.py	Mon Aug 31 10:19:49 2009 -0400
@@ -684,7 +684,8 @@
         show_open = bool(vm)
         show_details = bool(vm)
         host_details = bool(vm or conn)
-        delete = bool((vm and vm.is_runable()) or conn)
+        delete = bool((vm and vm.is_runable()) or
+                      (not vm and conn))
         show_run = bool(vm and vm.is_runable())
         is_paused = bool(vm and vm.is_paused())
         if is_paused:

virt-manager-0.8.0-pylint-tweak.patch:
 pylint-virt-manager.sh |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE virt-manager-0.8.0-pylint-tweak.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1252937681 14400
# Node ID 043ca66e19aabcdb89b8bbe76ef5ded8b0c0fc54
# Parent  d34def55dbd78e2ad5f099d6a38c1f358c798555
Try to avoid 'maximum recursion depth' errors from pylint script.

diff -r d34def55dbd7 -r 043ca66e19aa tests/pylint-virt-manager.sh
--- a/tests/pylint-virt-manager.sh	Mon Aug 31 10:45:59 2009 -0400
+++ b/tests/pylint-virt-manager.sh	Mon Sep 14 10:14:41 2009 -0400
@@ -95,6 +95,7 @@
         -ve "$BUILTIN_TYPE" \
         -ve "$ERROR_VBOX" \
         -ve "$UNABLE_IMPORT" \
+        -ve "$MAX_RECURSION" \
         -ve "$EXCEPTHOOK" | \
 $AWK '\
 # Strip out any "*** Module name" lines if we dont list any errors for them


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- virt-manager.spec	13 Aug 2009 15:51:03 -0000	1.56
+++ virt-manager.spec	14 Sep 2009 15:05:51 -0000	1.57
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -17,6 +17,16 @@ URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+# Fix disk XML mangling via connect/eject cdrom (bz 516116)
+Patch1: %{name}-%{version}-cdrom-eject-driver.patch
+# Fix delete button sensitivity (bz 518536)
+Patch2: %{name}-%{version}-no-delete-active.patch
+# Fix populating text box from storage browser in 'New VM' (bz 517263)
+Patch3: %{name}-%{version}-newvm-storage-cb.patch
+# Fix a traceback in an 'Add Hardware' error path (bz 517286)
+Patch4: %{name}-%{version}-addhw-errmsg-typo.patch
+# Fixes for pylint script to return nicer results on F11/F12
+Patch5: %{name}-%{version}-pylint-tweak.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -81,6 +91,11 @@ management API.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -154,6 +169,12 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Sep 14 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-3.fc12
+- Fix disk XML mangling via connect/eject cdrom (bz 516116)
+- Fix delete button sensitivity (bz 518536)
+- Fix populating text box from storage browser in 'New VM' (bz 517263)
+- Fix a traceback in an 'Add Hardware' error path (bz 517286)
+
 * Thu Aug 13 2009 Daniel P. Berrange <berrange at redhat.com> - 0.8.0-2.fc12
 - Remove obsolete dep on policykit agent
 



From twaugh at fedoraproject.org  Mon Sep 14 15:07:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 14 Sep 2009 15:07:15 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.1.13.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.205, 1.206 sources, 1.211, 1.212 system-config-printer.spec,
	1.292, 1.293 system-config-printer-1.1.12.tar.xz.sig, 1.1,
	NONE system-config-printer-get-devices.patch, 1.2,
	NONE system-config-printer-get_cursor.patch, 1.1,
	NONE system-config-printer-icon-load-traceback.patch, 1.1,
	NONE system-config-printer-polkit-1.patch, 1.1,
	NONE system-config-printer-ppdippstr.patch, 1.1,
	NONE system-config-printer-proxy-auth.patch, 1.1,
	NONE system-config-printer-raw-device-change.patch, 1.1,
	NONE system-config-printer-statereason-icons.patch, 1.1, NONE
Message-ID: <20090914150715.8310211C00EC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15810

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.13.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.12.tar.xz.sig 
	system-config-printer-get-devices.patch 
	system-config-printer-get_cursor.patch 
	system-config-printer-icon-load-traceback.patch 
	system-config-printer-polkit-1.patch 
	system-config-printer-ppdippstr.patch 
	system-config-printer-proxy-auth.patch 
	system-config-printer-raw-device-change.patch 
	system-config-printer-statereason-icons.patch 
Log Message:
* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
- 1.1.13:
  - Translation updates (bug #522451).



--- NEW FILE system-config-printer-1.1.13.tar.xz.sig ---
??
8"o??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- .cvsignore	25 Aug 2009 16:29:14 -0000	1.205
+++ .cvsignore	14 Sep 2009 15:07:13 -0000	1.206
@@ -204,3 +204,4 @@ system-config-printer-1.1.8.tar.bz2
 system-config-printer-1.1.10.tar.bz2
 system-config-printer-1.1.11.tar.xz
 system-config-printer-1.1.12.tar.xz
+system-config-printer-1.1.13.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- sources	25 Aug 2009 16:29:14 -0000	1.211
+++ sources	14 Sep 2009 15:07:14 -0000	1.212
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-588d53af2750aa4e3418b61262012880  system-config-printer-1.1.12.tar.xz
+15fec6e2bb9543aa42bf86814855f25c  system-config-printer-1.1.13.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- system-config-printer.spec	4 Sep 2009 10:13:07 -0000	1.292
+++ system-config-printer.spec	14 Sep 2009 15:07:15 -0000	1.293
@@ -6,22 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.12
-Release: 8%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-get_cursor.patch
-Patch2: system-config-printer-statereason-icons.patch
-Patch3: system-config-printer-icon-load-traceback.patch
-Patch4: system-config-printer-polkit-1.patch
-Patch5: system-config-printer-proxy-auth.patch
-Patch6: system-config-printer-ppdippstr.patch
-Patch7: system-config-printer-raw-device-change.patch
-Patch8: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -32,7 +24,6 @@ BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
 BuildRequires: xmlto
 BuildRequires: epydoc
-BuildRequires: automake, autoconf
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,19 +74,8 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .get_cursor
-%patch2 -p1 -b .statereason-icons
-%patch3 -p1 -b .icon-load-traceback
-%patch4 -p1 -b .polkit-1
-%patch5 -p1 -b .proxy-auth
-%patch6 -p1 -b .ppdippstr
-%patch7 -p1 -b .raw-device-change
-%patch8 -p1 -b .get-devices
 
 %build
-aclocal
-automake --copy --add-missing
-autoconf
 %configure --with-udev-rules --with-polkit-1
 
 pushd pycups-%{pycups_version}
@@ -205,6 +185,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
+- 1.1.13:
+  - Translation updates (bug #522451).
+
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
 - Further speed improvement when fetching devices.
 


--- system-config-printer-1.1.12.tar.xz.sig DELETED ---


--- system-config-printer-get-devices.patch DELETED ---


--- system-config-printer-get_cursor.patch DELETED ---


--- system-config-printer-icon-load-traceback.patch DELETED ---


--- system-config-printer-polkit-1.patch DELETED ---


--- system-config-printer-ppdippstr.patch DELETED ---


--- system-config-printer-proxy-auth.patch DELETED ---


--- system-config-printer-raw-device-change.patch DELETED ---


--- system-config-printer-statereason-icons.patch DELETED ---



From twaugh at fedoraproject.org  Mon Sep 14 15:11:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 14 Sep 2009 15:11:55 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-1.1.13.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.205, 1.206 sources, 1.211, 1.212 system-config-printer.spec,
	1.284, 1.285 system-config-printer-1.1.12.tar.xz.sig, 1.1,
	NONE system-config-printer-get-devices.patch, 1.3,
	NONE system-config-printer-get_cursor.patch, 1.1,
	NONE system-config-printer-icon-load-traceback.patch, 1.1,
	NONE system-config-printer-polkit-1.patch, 1.1,
	NONE system-config-printer-ppdippstr.patch, 1.1,
	NONE system-config-printer-proxy-auth.patch, 1.1,
	NONE system-config-printer-raw-device-change.patch, 1.1,
	NONE system-config-printer-statereason-icons.patch, 1.1, NONE
Message-ID: <20090914151155.AFCC511C00EC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17682

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.13.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.12.tar.xz.sig 
	system-config-printer-get-devices.patch 
	system-config-printer-get_cursor.patch 
	system-config-printer-icon-load-traceback.patch 
	system-config-printer-polkit-1.patch 
	system-config-printer-ppdippstr.patch 
	system-config-printer-proxy-auth.patch 
	system-config-printer-raw-device-change.patch 
	system-config-printer-statereason-icons.patch 
Log Message:
* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
- 1.1.13:
  - Translation updates (bug #522451).



--- NEW FILE system-config-printer-1.1.13.tar.xz.sig ---
??
8"o??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/.cvsignore,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- .cvsignore	25 Aug 2009 16:45:08 -0000	1.205
+++ .cvsignore	14 Sep 2009 15:11:54 -0000	1.206
@@ -204,3 +204,4 @@ system-config-printer-1.1.8.tar.bz2
 system-config-printer-1.1.10.tar.bz2
 system-config-printer-1.1.11.tar.xz
 system-config-printer-1.1.12.tar.xz
+system-config-printer-1.1.13.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/sources,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- sources	25 Aug 2009 16:45:09 -0000	1.211
+++ sources	14 Sep 2009 15:11:54 -0000	1.212
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-588d53af2750aa4e3418b61262012880  system-config-printer-1.1.12.tar.xz
+15fec6e2bb9543aa42bf86814855f25c  system-config-printer-1.1.13.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- system-config-printer.spec	14 Sep 2009 14:13:20 -0000	1.284
+++ system-config-printer.spec	14 Sep 2009 15:11:55 -0000	1.285
@@ -6,22 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.12
-Release: 9%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-get_cursor.patch
-Patch2: system-config-printer-statereason-icons.patch
-Patch3: system-config-printer-icon-load-traceback.patch
-Patch4: system-config-printer-polkit-1.patch
-Patch5: system-config-printer-proxy-auth.patch
-Patch6: system-config-printer-ppdippstr.patch
-Patch7: system-config-printer-raw-device-change.patch
-Patch8: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -70,14 +62,6 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .get_cursor
-%patch2 -p1 -b .statereason-icons
-%patch3 -p1 -b .icon-load-traceback
-%patch4 -p1 -b .polkit-1
-%patch5 -p1 -b .proxy-auth
-%patch6 -p1 -b .ppdippstr
-%patch7 -p1 -b .raw-device-change
-%patch8 -p1 -b .get-devices
 
 %build
 %configure
@@ -179,8 +163,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-9
-- Fixed traceback when fetching devices (bug #522139).
+* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
+- 1.1.13:
+  - Translation updates (bug #522451).
 
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-8
 - Further speed improvement when fetching devices.


--- system-config-printer-1.1.12.tar.xz.sig DELETED ---


--- system-config-printer-get-devices.patch DELETED ---


--- system-config-printer-get_cursor.patch DELETED ---


--- system-config-printer-icon-load-traceback.patch DELETED ---


--- system-config-printer-polkit-1.patch DELETED ---


--- system-config-printer-ppdippstr.patch DELETED ---


--- system-config-printer-proxy-auth.patch DELETED ---


--- system-config-printer-raw-device-change.patch DELETED ---


--- system-config-printer-statereason-icons.patch DELETED ---



From bpepple at fedoraproject.org  Mon Sep 14 15:15:37 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Sep 2009 15:15:37 +0000 (UTC)
Subject: rpms/telepathy-idle/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 telepathy-idle.spec, 1.13,
	1.14 telepathy-idle-0.1.4-glibc.patch, 1.1, NONE
Message-ID: <20090914151537.3753B11C00EC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-idle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19160

Modified Files:
	.cvsignore sources telepathy-idle.spec 
Removed Files:
	telepathy-idle-0.1.4-glibc.patch 
Log Message:
* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.5-1
- Update to 0.1.5.
- Drop glibc patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-idle/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Jun 2009 23:17:56 -0000	1.6
+++ .cvsignore	14 Sep 2009 15:15:35 -0000	1.7
@@ -1 +1 @@
-telepathy-idle-0.1.4.tar.gz
+telepathy-idle-0.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-idle/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Jun 2009 23:17:56 -0000	1.6
+++ sources	14 Sep 2009 15:15:35 -0000	1.7
@@ -1 +1 @@
-a5893ee2f9e2d30be4cc86312479d99f  telepathy-idle-0.1.4.tar.gz
+b7516b9d199ef34949cf402e04f89881  telepathy-idle-0.1.5.tar.gz


Index: telepathy-idle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-idle/devel/telepathy-idle.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- telepathy-idle.spec	21 Aug 2009 16:06:39 -0000	1.13
+++ telepathy-idle.spec	14 Sep 2009 15:15:35 -0000	1.14
@@ -1,13 +1,12 @@
 Name:           telepathy-idle
-Version:        0.1.4
-Release:        3%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        IRC connection manager for Telepathy
 
 Group:          Applications/Communications
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-0.1.4-glibc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -26,7 +25,6 @@ A full-featured IRC connection manager f
 
 %prep
 %setup -q
-%patch0 -p1 -b .glibc
 
 
 %check
@@ -57,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.5-1
+- Update to 0.1.5.
+- Drop glibc patch.  Fixed upstream.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.4-3
 - rebuilt with new openssl
 


--- telepathy-idle-0.1.4-glibc.patch DELETED ---



From harald at fedoraproject.org  Mon Sep 14 15:17:49 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 14 Sep 2009 15:17:49 +0000 (UTC)
Subject: rpms/readahead/devel .cvsignore, 1.12, 1.13 readahead.spec, 1.59,
	1.60 sources, 1.16, 1.17
Message-ID: <20090914151749.D70F811C00EC@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20397

Modified Files:
	.cvsignore readahead.spec sources 
Log Message:
* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.1-1
- readahead-1.5.1
- add syslog() to collector
- translation update
- let upstart set console owner for collector



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	13 Aug 2009 11:08:11 -0000	1.12
+++ .cvsignore	14 Sep 2009 15:17:48 -0000	1.13
@@ -1 +1 @@
-readahead-1.5.0.tar.bz2
+readahead-1.5.1.tar.bz2


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- readahead.spec	21 Aug 2009 11:15:33 -0000	1.59
+++ readahead.spec	14 Sep 2009 15:17:49 -0000	1.60
@@ -1,7 +1,7 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -68,6 +68,12 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.1-1
+- readahead-1.5.1
+- add syslog() to collector
+- translation update
+- let upstart set console owner for collector
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.5.0-2
 - rebuilt with new audit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Aug 2009 11:08:11 -0000	1.16
+++ sources	14 Sep 2009 15:17:49 -0000	1.17
@@ -1 +1 @@
-409a1fedb5d9c72c023541156b250e3f  readahead-1.5.0.tar.bz2
+abb783e835272290722da9d9affc618b  readahead-1.5.1.tar.bz2



From twaugh at fedoraproject.org  Mon Sep 14 15:21:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 14 Sep 2009 15:21:01 +0000 (UTC)
Subject: rpms/system-config-printer/F-10 .cvsignore, 1.196, 1.197 sources,
	1.204, 1.205 system-config-printer.spec, 1.251, 1.252
Message-ID: <20090914152101.A7A3F11C00EC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21874

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
- 1.1.13:
  - Translation updates (bug #522451).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/.cvsignore,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- .cvsignore	25 Aug 2009 21:42:21 -0000	1.196
+++ .cvsignore	14 Sep 2009 15:21:01 -0000	1.197
@@ -193,5 +193,5 @@ pycups-1.9.45.tar.bz2
 system-config-printer-1.0.13.tar.bz2
 system-config-printer-1.0.14.tar.bz2
 system-config-printer-1.0.16.tar.bz2
-system-config-printer-1.1.12.tar.xz
 system-config-printer-1.1.12.tar.bz2
+system-config-printer-1.1.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/sources,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- sources	25 Aug 2009 21:42:21 -0000	1.204
+++ sources	14 Sep 2009 15:21:01 -0000	1.205
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-43be348b60651e79479b5c396d9f6003  system-config-printer-1.1.12.tar.bz2
+c0b50c8c8682a0aaf5b39ffec25318ee  system-config-printer-1.1.13.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- system-config-printer.spec	4 Sep 2009 10:46:55 -0000	1.251
+++ system-config-printer.spec	14 Sep 2009 15:21:01 -0000	1.252
@@ -6,21 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.12
-Release: 7%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-get_cursor.patch
-Patch2: system-config-printer-statereason-icons.patch
-Patch3: system-config-printer-icon-load-traceback.patch
-Patch4: system-config-printer-older-gtk.patch
-Patch5: system-config-printer-proxy-auth.patch
-Patch6: system-config-printer-ppdippstr.patch
-Patch7: system-config-printer-get-devices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -69,13 +62,6 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .get_cursor
-%patch2 -p1 -b .statereason-icons
-%patch3 -p1 -b .icon-load-traceback
-%patch4 -p1 -b .older-gtk
-%patch5 -p1 -b .proxy-auth
-%patch6 -p1 -b .ppdippstr
-%patch7 -p1 -b .get-devices
 
 %build
 %configure
@@ -177,6 +163,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
+- 1.1.13:
+  - Translation updates (bug #522451).
+
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-7
 - Speed improvement when fetching devices.
 



From astokes at fedoraproject.org  Mon Sep 14 15:29:53 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 14 Sep 2009 15:29:53 +0000 (UTC)
Subject: rpms/sos/devel sos.spec,1.13,1.14 sources,1.8,1.9
Message-ID: <20090914152953.AF4E711C00EC@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25133

Modified Files:
	sos.spec sources 
Log Message:
update translations, plugin/tunable support via conf file


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sos.spec	27 Jul 2009 04:35:46 -0000	1.13
+++ sos.spec	14 Sep 2009 15:29:53 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -41,7 +41,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/rh-upload-core
+%{_bindir}/rh-upload
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
@@ -49,10 +49,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%doc README README.rh-upload-core TODO LICENSE ChangeLog
+%doc README README.rh-upload TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
+- Update rh-upload-core to rh-upload and allows general files
+- Fix cluster plugin with pwd mangling invalidating xml
+- Cluster support detecting invalid fence_id and fence states
+- Read variables from conf file
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Jul 2009 16:00:59 -0000	1.8
+++ sources	14 Sep 2009 15:29:53 -0000	1.9
@@ -1 +1 @@
-2af6163d2475e81724408a433bc031ac  sos-1.8.tar.gz
+f2a05a90adfc4799ff65425488c5ae16  sos-1.8.tar.gz



From sandeen at fedoraproject.org  Mon Sep 14 15:34:39 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 14 Sep 2009 15:34:39 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs.spec, 1.150,
	1.151 e2fsprogs-1.41.9-defrag.patch, 1.1, NONE
Message-ID: <20090914153439.804B711C00EC@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26857

Modified Files:
	e2fsprogs.spec 
Removed Files:
	e2fsprogs-1.41.9-defrag.patch 
Log Message:
* Thu Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-3
- Drop defrag bits for now, not ready yet.



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- e2fsprogs.spec	10 Sep 2009 21:51:50 -0000	1.150
+++ e2fsprogs.spec	14 Sep 2009 15:34:39 -0000	1.151
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -13,7 +13,6 @@ Source0: http://downloads.sourceforge.ne
 Source1: ext2_types-wrapper.h
 
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-1.41.9-defrag.patch
 Patch4: e2fsprogs-resize-minimum-fix.patch
 
 Url: http://e2fsprogs.sourceforge.net/
@@ -140,8 +139,6 @@ It was originally inspired by the Multic
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# defrag command for testing, from non-release branch
-%patch3 -p1 -b .defrag
 %patch4 -p1 -b .resize
 
 %build
@@ -152,7 +149,7 @@ make %{?_smp_mflags} V=1
 %install
 rm -rf %{buildroot}
 export PATH=/sbin:$PATH
-make install install-libs install-e4defrag DESTDIR=%{buildroot} INSTALL="%{__install} -p" \
+make install install-libs DESTDIR=%{buildroot} INSTALL="%{__install} -p" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
 
 # ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
@@ -218,9 +215,6 @@ exit 0
 %{_sbindir}/e2freefrag
 %{_sbindir}/mklost+found
 
-%{_bindir}/e4defrag
-%{_mandir}/man8/e4defrag.8*
-
 %{_bindir}/chattr
 %{_bindir}/lsattr
 %{_mandir}/man1/chattr.1*
@@ -303,6 +297,9 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Thu Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-3
+- Drop defrag bits for now, not ready yet.
+
 * Thu Sep 10 2009 Josef Bacik <josef at toxicpanda.com> 1.41.9-2
 - Fix resize -m bug with flexbg (#519131)
 


--- e2fsprogs-1.41.9-defrag.patch DELETED ---



From crobinso at fedoraproject.org  Mon Sep 14 15:52:03 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Sep 2009 15:52:03 +0000 (UTC)
Subject: rpms/virt-manager/F-10 virt-manager.spec,1.42,1.43
Message-ID: <20090914155203.140C711C00EC@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1429

Modified Files:
	virt-manager.spec 
Log Message:
Depend on virtinst 0.400.3 (bz 493256)



Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-10/virt-manager.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- virt-manager.spec	14 Sep 2009 14:58:38 -0000	1.42
+++ virt-manager.spec	14 Sep 2009 15:52:02 -0000	1.43
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.6.1
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -51,7 +51,7 @@ Requires: gnome-python2-gnome
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.400.0
+Requires: python-virtinst >= 0.400.3
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -179,6 +179,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Sep 14 2009 Cole Robinson <crobinso at redhat.com> - 0.6.1-3.fc10
+- Depend on virtinst 0.400.3 (bz 493256)
+
 * Sun Sep 13 2009 Cole Robinson <crobinso at redhat.com> - 0.6.1-2.fc10
 - Fix migration for qemu/kvm guests (bz 517548)
 - Back compat fixes for connecting to older xen installations (bz 489885)



From pkgdb at fedoraproject.org  Mon Sep 14 16:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 16:11:36 +0000
Subject: [pkgdb] yum had acl change status
Message-ID: <20090914161136.42EDF10F867@bastion2.fedora.phx.redhat.com>

skvidal has set the watchcommits acl on yum (Fedora devel) to Approved for rakesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum



From pkgdb at fedoraproject.org  Mon Sep 14 16:11:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 16:11:48 +0000
Subject: [pkgdb] yum had acl change status
Message-ID: <20090914161148.E263210F851@bastion2.fedora.phx.redhat.com>

skvidal has set the watchcommits acl on yum (Fedora 10) to Approved for rakesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum



From pkgdb at fedoraproject.org  Mon Sep 14 16:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 16:11:55 +0000
Subject: [pkgdb] yum had acl change status
Message-ID: <20090914161155.61B5110F883@bastion2.fedora.phx.redhat.com>

skvidal has set the watchcommits acl on yum (Fedora 11) to Approved for rakesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum



From overholt at fedoraproject.org  Mon Sep 14 16:12:51 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 14 Sep 2009 16:12:51 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-addusrsharedropins.patch, NONE,
	1.1 eclipse.spec, 1.663, 1.664
Message-ID: <20090914161251.805FB11C00EC@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8890

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-addusrsharedropins.patch 
Log Message:
* Mon Sep 14 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.11
- Add /usr/share/eclipse/dropins to list of dropins locations
  (rhbz#522117).

eclipse-addusrsharedropins.patch:
 sdk.product |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-addusrsharedropins.patch ---
diff -up ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product
--- ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation	2009-09-14 11:04:38.000000000 -0400
+++ ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-09-14 10:56:56.000000000 -0400
@@ -9,7 +9,7 @@
    
    <launcherArgs>
       <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
-      <vmArgs>-Xms40m -Xmx256m</vmArgs>
+      <vmArgs>-Xms40m -Xmx256m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -p -r1.663 -r1.664
--- eclipse.spec	10 Sep 2009 14:11:54 -0000	1.663
+++ eclipse.spec	14 Sep 2009 16:12:51 -0000	1.664
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.10%{?dist}
+Release:        0.11%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -132,6 +132,10 @@ Patch49:        %{name}-add-ppc64-filesy
 # need to go upstream.
 Patch50:        %{name}-target-platform-template.patch
 
+# Add /usr/share/eclipse/dropins to list of dropins locations
+# Already applied in eclipse-build upstream rev. #23023
+Patch51:        %{name}-addusrsharedropins.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -281,6 +285,9 @@ sed --in-place "s/<target name=\"build\"
 ant -DbuildId=I20090611-1540 applyPatches
 pushd build/eclipse-I20090611-1540-fetched-src
 
+# Add /usr/share/eclipse/dropins
+%patch51 -p3
+
 #sed --in-place "s/java5.home/java.home/" build.xml
 #sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
 # Build swttools.jar and native libraries
@@ -1413,6 +1420,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Sep 14 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.11
+- Add /usr/share/eclipse/dropins to list of dropins locations
+  (rhbz#522117).
+
 * Wed Sep 09 2009 Mat Booth <fedora at matbooth.co.uk> 1:3.5.0-0.10
 - Patch the target platform templates so they find all the required
   source bundles (see RHBZ # 521969).



From notting at fedoraproject.org  Mon Sep 14 16:21:46 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 14 Sep 2009 16:21:46 +0000 (UTC)
Subject: rpms/chkconfig/devel .cvsignore, 1.44, 1.45 chkconfig.spec, 1.56,
	1.57 sources, 1.45, 1.46
Message-ID: <20090914162146.DBF2811C00EC@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/chkconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12673

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
1.3.43


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	9 Mar 2009 20:01:18 -0000	1.44
+++ .cvsignore	14 Sep 2009 16:21:46 -0000	1.45
@@ -1 +1 @@
-chkconfig-1.3.42.tar.bz2
+chkconfig-1.3.43.tar.bz2


Index: chkconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- chkconfig.spec	24 Jul 2009 18:55:21 -0000	1.56
+++ chkconfig.spec	14 Sep 2009 16:21:46 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.42
-Release: 2
+Version: 1.3.43
+Release: 1
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -74,8 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/ntsysv.8*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.42-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 14 2009 Bill Nottingham <notting at redhat.com> 1.3.43-1
+- ntsysv man page tweak (#516599)
+- another minor LSB tweak (#474223)
+- translation updates
 
 * Fri Mar  6 2009 Bill Nottingham <notting at redhat.com> 1.3.42-1
 - further LSB fixes (#474223)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	9 Mar 2009 20:01:18 -0000	1.45
+++ sources	14 Sep 2009 16:21:46 -0000	1.46
@@ -1 +1 @@
-5366f164e08a8982a6606a08b8918cc3  chkconfig-1.3.42.tar.bz2
+208ed7aa3e6165f10f3e9204da585106  chkconfig-1.3.43.tar.bz2



From astokes at fedoraproject.org  Mon Sep 14 16:41:24 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 14 Sep 2009 16:41:24 +0000 (UTC)
Subject: rpms/sos/F-11 sos.spec,1.12,1.13 sources,1.8,1.9
Message-ID: <20090914164124.2703B11C00EC@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20119

Modified Files:
	sos.spec sources 
Log Message:
update translations, plugin/tunable support via conf file


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-11/sos.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sos.spec	23 Jul 2009 16:03:49 -0000	1.12
+++ sos.spec	14 Sep 2009 16:41:23 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 14%{?dist}
+Release: 16%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -41,7 +41,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/rh-upload-core
+%{_bindir}/rh-upload
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
@@ -49,10 +49,19 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%doc README README.rh-upload-core TODO LICENSE ChangeLog
+%doc README README.rh-upload TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
+- Update rh-upload-core to rh-upload and allows general files
+- Fix cluster plugin with pwd mangling invalidating xml
+- Cluster support detecting invalid fence_id and fence states
+- Read variables from conf file
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14
 - resolves: rhbz512536 wrong group in spec file
 - resolves: rhbz498398 A series of refactoring patches to sos


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Jul 2009 16:03:49 -0000	1.8
+++ sources	14 Sep 2009 16:41:23 -0000	1.9
@@ -1 +1 @@
-2af6163d2475e81724408a433bc031ac  sos-1.8.tar.gz
+f2a05a90adfc4799ff65425488c5ae16  sos-1.8.tar.gz



From notting at fedoraproject.org  Mon Sep 14 16:41:35 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 14 Sep 2009 16:41:35 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.168, 1.169 initscripts.spec,
	1.199, 1.200 sources, 1.187, 1.188
Message-ID: <20090914164135.066B311C00EC@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20209

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.99-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- .cvsignore	2 Sep 2009 21:38:27 -0000	1.168
+++ .cvsignore	14 Sep 2009 16:41:34 -0000	1.169
@@ -1 +1 @@
-initscripts-8.98.tar.bz2
+initscripts-8.99.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- initscripts.spec	4 Sep 2009 18:27:26 -0000	1.199
+++ initscripts.spec	14 Sep 2009 16:41:34 -0000	1.200
@@ -2,11 +2,11 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.98
+Version: 8.99
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1.1
+Release: 1
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -251,8 +251,10 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
-* Fri Sep  4 2009 Bill Nottingham <notting at redhat.com> - 8.98-1.1
+* Mon Sep 14 2009 Bill Nottingham <notting at redhat.com> - 8.99-1
+- init.d/functions: add a '-l' option to status to pass lock file name (#521772)
 - tweak kernel conflict
+- translation updates: as, bn_IN, de, fr, hi, it, hu, kn, mr, or, pa, pt, ru, te
 
 * Wed Sep  2 2009 Bill Nottingham <notting at redhat.com> - 8.98-1
 - sysconfig.txt: doucment DHCP_HOSTNAME (#498052)
@@ -264,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT
 - sysconfig.txt: clarify docs (#518614)
 - rc.sysinit: don't pretend /selinux is configurable (#518164)
 - assorted ipv6 redundant code deletion
-- translation updates: bn, ca, d, es, fi, fr, gu, hi, it, ja, ko, ml, nb, nl, pl, pt, pt_BR, ru, sr, ta, zh_CN, zh_TW
+- translation updates: bn, ca, de, es, fi, fr, gu, hi, it, ja, ko, ml, nb, nl, pl, pt, pt_BR, ru, sr, ta, zh_CN, zh_TW
 
 * Mon Aug 10 2009 Bill Nottingham <notting at redhat.com> - 8.97-1
 - ipcalc: fix IPv6 address checking (#516319)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- sources	2 Sep 2009 21:38:27 -0000	1.187
+++ sources	14 Sep 2009 16:41:34 -0000	1.188
@@ -1 +1 @@
-bc4ed1f39917bab795140bfaeccae18c  initscripts-8.98.tar.bz2
+ec294a0d68f6a14c1b6f3cf507a48aad  initscripts-8.99.tar.bz2



From astokes at fedoraproject.org  Mon Sep 14 16:41:50 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 14 Sep 2009 16:41:50 +0000 (UTC)
Subject: rpms/sos/F-10 sos.spec,1.10,1.11 sources,1.9,1.10
Message-ID: <20090914164150.C53AC11C00EC@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20437

Modified Files:
	sos.spec sources 
Log Message:
update translations, plugin/tunable support via conf file


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sos.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sos.spec	23 Jul 2009 16:02:00 -0000	1.10
+++ sos.spec	14 Sep 2009 16:41:50 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 14%{?dist}
+Release: 16%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -41,7 +41,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/rh-upload-core
+%{_bindir}/rh-upload
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
@@ -49,10 +49,19 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%doc README README.rh-upload-core TODO LICENSE ChangeLog
+%doc README README.rh-upload TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
+- Update rh-upload-core to rh-upload and allows general files
+- Fix cluster plugin with pwd mangling invalidating xml
+- Cluster support detecting invalid fence_id and fence states
+- Read variables from conf file
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14
 - resolves: rhbz512536 wrong group in spec file
 - resolves: rhbz498398 A series of refactoring patches to sos


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Jul 2009 16:02:00 -0000	1.9
+++ sources	14 Sep 2009 16:41:50 -0000	1.10
@@ -1 +1 @@
-2af6163d2475e81724408a433bc031ac  sos-1.8.tar.gz
+f2a05a90adfc4799ff65425488c5ae16  sos-1.8.tar.gz



From erikos at fedoraproject.org  Mon Sep 14 16:49:49 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon, 14 Sep 2009 16:49:49 +0000 (UTC)
Subject: rpms/sugar-turtleart/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 sugar-turtleart.spec, 1.11, 1.12
Message-ID: <20090914164949.9821411C00EC@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-turtleart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23503

Modified Files:
	.cvsignore sources sugar-turtleart.spec 
Log Message:
* Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 65-1
- new toolbar design
- added help toolbar




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 17:15:48 -0000	1.9
+++ .cvsignore	14 Sep 2009 16:49:49 -0000	1.10
@@ -1 +1 @@
-TurtleArt-51.tar.bz2
+TurtleArt-65.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 17:15:49 -0000	1.9
+++ sources	14 Sep 2009 16:49:49 -0000	1.10
@@ -1 +1 @@
-bb54fb922717ac53b69ea8835051b404  TurtleArt-51.tar.bz2
+7b392815c01892999b914f0aa29349e4  TurtleArt-65.tar.bz2


Index: sugar-turtleart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sugar-turtleart.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sugar-turtleart.spec	27 Jul 2009 05:05:41 -0000	1.11
+++ sugar-turtleart.spec	14 Sep 2009 16:49:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name: sugar-turtleart
-Version: 51
-Release: 2%{?dist}
+Version: 65
+Release: 1%{?dist}
 Summary: Turtle Art activity for sugar
 
 Group: Sugar/Activities
@@ -9,10 +9,12 @@ BuildArch: noarch
 URL: http://sugarlabs.org/go/Activities/Turtle_Art
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/TurtleArt/TurtleArt-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: python 
 BuildRequires: sugar-toolkit
-Requires: sugar 
+BuildRequires: gettext
 
+Requires: sugar
 
 %description
 The Turtle Art activity is an Logo-inspired graphical "turtle" that 
@@ -45,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 65-1
+- new toolbar design
+- added help toolbar
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 51-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From trasher at fedoraproject.org  Mon Sep 14 16:52:08 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon, 14 Sep 2009 16:52:08 +0000 (UTC)
Subject: rpms/tuxtype2/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tuxtype2.spec, 1.13, 1.14
Message-ID: <20090914165208.72D0411C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/tuxtype2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24972

Modified Files:
	.cvsignore sources tuxtype2.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Sep 2008 15:58:21 -0000	1.4
+++ .cvsignore	14 Sep 2009 16:52:07 -0000	1.5
@@ -1 +1 @@
-tuxtype_w_fonts-1.5.17.tar.gz
+tuxtype_w_fonts-1.7.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Sep 2008 15:58:21 -0000	1.4
+++ sources	14 Sep 2009 16:52:08 -0000	1.5
@@ -1 +1 @@
-c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz
+54017a392624444c71670345e10fc55c  tuxtype_w_fonts-1.7.5.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/F-11/tuxtype2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tuxtype2.spec	25 Feb 2009 22:18:03 -0000	1.13
+++ tuxtype2.spec	14 Sep 2009 16:52:08 -0000	1.14
@@ -1,17 +1,19 @@
 Name:           tuxtype2
-Version:        1.5.17
-Release:        2%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://tuxtype.sourceforge.net/
-Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
+URL:            http://tux4kids.alioth.debian.org/tuxtype/index.php
+Source0:        https://alioth.debian.org/frs/download.php/3051/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
+BuildRequires:  librsvg2-devel
+
 
 %description
 Tux Typing is an educational typing tutor for children. It features several
@@ -20,6 +22,9 @@ different types of gameplay, at a variet
 
 %prep
 %setup -q -n tuxtype_w_fonts-%{version}
+rm -rf data/fonts/*.ttf
+# fix wrong end of line encoding
+sed -i -e 's|\r||g' doc/en/TuxType_port_Mac.txt
 
 
 %build
@@ -49,22 +54,29 @@ EOF
 
 convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
-		     --add-category X-Fedora \
-		     --vendor fedora \
-		     %{name}.desktop
+                     --add-category X-Fedora \
+                     --vendor fedora \
+                     %{name}.desktop
+
+%find_lang tuxtype
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f tuxtype.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
+%doc AUTHORS COPYING ChangeLog README TODO doc/en/howtotheme.html doc/en/TuxType_port_Mac.txt
 %{_bindir}/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 14 2009 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.7.5-1
+- 1.7.5
+- removed shipped fonts
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From theinric at fedoraproject.org  Mon Sep 14 16:54:27 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Mon, 14 Sep 2009 16:54:27 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog.init,1.2,1.3 rsyslog.spec,1.63,1.64
Message-ID: <20090914165427.34BF811C00EC@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27226

Modified Files:
	rsyslog.init rsyslog.spec 
Log Message:
adjust init script according to guidelines (#522071)




Index: rsyslog.init
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rsyslog.init	15 Sep 2008 12:39:34 -0000	1.2
+++ rsyslog.init	14 Sep 2009 16:54:26 -0000	1.3
@@ -24,9 +24,14 @@
 . /etc/init.d/functions
 
 RETVAL=0
+PIDFILE=/var/run/syslogd.pid
+
+prog=rsyslogd
+exec=/sbin/rsyslogd
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	[ -x /sbin/rsyslogd ] || exit 5
+	[ -x $exec ] || exit 5
 
 	# Source config
         if [ -f /etc/sysconfig/rsyslog ] ; then
@@ -35,23 +40,23 @@ start() {
 	umask 077
 
         echo -n $"Starting system logger: "
-        daemon rsyslogd $SYSLOGD_OPTIONS
+        daemon --pidfile="${PIDFILE}" $exec $SYSLOGD_OPTIONS
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog
+        [ $RETVAL -eq 0 ] && touch $lockfile
         return $RETVAL
 }
 stop() {
         echo -n $"Shutting down system logger: "
-        killproc rsyslogd
+        killproc $prog
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rsyslog
+        [ $RETVAL -eq 0 ] && rm -f $lockfile
         return $RETVAL
 }
 reload()  {
     RETVAL=1
-    syslog=`cat /var/run/syslogd.pid 2>/dev/null`
+    syslog=$(cat "${PIDFILE}" 2>/dev/null)
     echo -n "Reloading system logger..."
     if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
 	kill -HUP "$syslog";
@@ -66,7 +71,7 @@ reload()  {
     return $RETVAL
 }
 rhstatus() {
-        status rsyslogd
+        status -p "${PIDFILE}" $prog
 }
 restart() {
         stop
@@ -89,12 +94,13 @@ case "$1" in
   status)
         rhstatus
         ;;
-  condrestart)
-        [ -f /var/lock/subsys/rsyslog ] && restart || :
+  condrestart|try-restart)
+        rhstatus >/dev/null 2>&1 || exit 0
+        restart
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart}"
-        exit 2
+        echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+        exit 3
 esac
 
 exit $?


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- rsyslog.spec	3 Sep 2009 12:23:12 -0000	1.63
+++ rsyslog.spec	14 Sep 2009 16:54:26 -0000	1.64
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 4.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -194,6 +194,9 @@ fi	
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Sep 14 2009 Tomas Heinrich <theinric at redhat.com> 4.4.1-2
+- adjust init script according to guidelines (#522071)
+
 * Thu Sep 03 2009 Tomas Heinrich <theinric at redhat.com> 4.4.1-1
 - upgrade to new upstream stable version
 



From pbrobinson at fedoraproject.org  Mon Sep 14 16:56:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Sep 2009 16:56:03 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.3,
	1.4 moblin-panel-myzone.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090914165603.A02C011C00EC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30411

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Sep 2009 18:22:47 -0000	1.3
+++ .cvsignore	14 Sep 2009 16:56:03 -0000	1.4
@@ -1 +1 @@
-moblin-panel-myzone-0.0.4.tar.bz2
+moblin-panel-myzone-0.0.5.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-panel-myzone.spec	10 Sep 2009 18:22:47 -0000	1.3
+++ moblin-panel-myzone.spec	14 Sep 2009 16:56:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.4
+Version:        0.0.5
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Mon Sep 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
+- New upstream 0.0.5 release
+
 * Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
 - New upstream 0.0.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Sep 2009 18:22:47 -0000	1.3
+++ sources	14 Sep 2009 16:56:03 -0000	1.4
@@ -1 +1 @@
-f2e6abf58c1815291ef5a180c32ddd05  moblin-panel-myzone-0.0.4.tar.bz2
+a45b2bfb6a6d118427f20ec9d57ede98  moblin-panel-myzone-0.0.5.tar.bz2



From mitr at fedoraproject.org  Mon Sep 14 16:59:05 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon, 14 Sep 2009 16:59:05 +0000 (UTC)
Subject: rpms/libuser/devel .cvsignore, 1.51, 1.52 libuser.spec, 1.84,
	1.85 sources, 1.53, 1.54 libuser-0.56.10-nscd.patch, 1.1, NONE
Message-ID: <20090914165905.32B5711C00EC@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/libuser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2091

Modified Files:
	.cvsignore libuser.spec sources 
Removed Files:
	libuser-0.56.10-nscd.patch 
Log Message:
* Mon Sep 14 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.11-1
- Update to libuser-0.56.11.
  Resolves: #454091
  Resolves: #456267
  Resolves: #456270
  Resolves: #487129



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	15 Apr 2009 15:45:29 -0000	1.51
+++ .cvsignore	14 Sep 2009 16:59:04 -0000	1.52
@@ -1 +1 @@
-libuser-0.56.10.tar.bz2
+libuser-0.56.11.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- libuser.spec	30 Jul 2009 19:37:11 -0000	1.84
+++ libuser.spec	14 Sep 2009 16:59:04 -0000	1.85
@@ -1,20 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.10
-Release: 3
+Version: 0.56.11
+Release: 1
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://fedorahosted.org/libuser/
 Source: https://fedorahosted.org/releases/l/i/libuser/libuser-%{version}.tar.bz2
-Patch0: libuser-0.56.10-nscd.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python-devel
 BuildRequires: cyrus-sasl-devel, libselinux-devel, openldap-devel
 # To make sure the configure script can find it
 BuildRequires: nscd
-# For Patch0
-BuildRequires: autoconf, automake, cvs, gettext-devel, gtk-doc, libtool
 Summary: A user and group account administration library
 
 %description
@@ -47,14 +44,6 @@ administering user and group accounts.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nscd
-gtkdocize --docdir docs/reference
-libtoolize --force
-autopoint
-aclocal -I m4
-autoconf -Wall
-autoheader -Wall
-automake -Wall --add-missing
 
 %build
 %configure --with-selinux --with-ldap --with-html-dir=%{_datadir}/gtk-doc/html
@@ -111,6 +100,13 @@ python -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 14 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.11-1
+- Update to libuser-0.56.11.
+  Resolves: #454091
+  Resolves: #456267
+  Resolves: #456270
+  Resolves: #487129
+
 * Thu Jul 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.10-3
 - Fix nscd cache invalidation
   Resolves: #506628


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	15 Apr 2009 15:45:29 -0000	1.53
+++ sources	14 Sep 2009 16:59:04 -0000	1.54
@@ -1 +1 @@
-fd721419a92cc05b4fb5e770260f38aa  libuser-0.56.10.tar.bz2
+fc58c832b7f0f0af88f56d1d6d5d7c22  libuser-0.56.11.tar.bz2


--- libuser-0.56.10-nscd.patch DELETED ---



From harald at fedoraproject.org  Mon Sep 14 17:02:58 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 14 Sep 2009 17:02:58 +0000 (UTC)
Subject: rpms/udev/F-11 udev-141-max_short.patch, NONE, 1.1 udev.spec, 1.277,
	1.278
Message-ID: <20090914170258.529DB11C00EC@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5672

Modified Files:
	udev.spec 
Added Files:
	udev-141-max_short.patch 
Log Message:
* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 141-7
- fix scsi_id segfault (bug #516920)


udev-141-max_short.patch:
 scsi_serial.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE udev-141-max_short.patch ---
diff -up udev-141/extras/scsi_id/scsi_serial.c.max_short udev-141/extras/scsi_id/scsi_serial.c
--- udev-141/extras/scsi_id/scsi_serial.c.max_short	2009-09-14 18:31:54.000000000 +0200
+++ udev-141/extras/scsi_id/scsi_serial.c	2009-09-14 18:31:57.000000000 +0200
@@ -587,7 +587,7 @@ static int check_fill_0x83_prespc3(struc
 		serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4];
 		serial[j++] = hex_str[ page_83[4+i] & 0x0f];
 	}
-	strcpy(serial_short, serial);
+	strncpy(serial_short, serial, max_len-1);
 	return 0;
 }
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- udev.spec	4 Aug 2009 09:27:17 -0000	1.277
+++ udev.spec	14 Sep 2009 17:02:57 -0000	1.278
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 141
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -27,6 +27,7 @@ Patch5: udev.git-d6f0b22d574c6a5e5f3430b
 Patch6: udev.git-d3c8231e738dd286591c1becc2f327ed55ed89d1.patch
 Patch7: udev.git-f58a9099bb2b18f3f683615324a4382b95446305.patch
 Patch8: Prioritize-dmraid-formats-over-md-raid.patch
+Patch9: udev-141-max_short.patch
 
 Patch102: udev-118-sysconf.patch
 
@@ -110,6 +111,7 @@ dynamic library, which provides access t
 %patch6 -p1 
 %patch7 -p1 
 %patch8 -p1 
+%patch9 -p1 
 
 %patch102 -p1 -b .sysconf
 
@@ -412,6 +414,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 141-7
+- fix scsi_id segfault (bug #516920)
+
 * Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-6
 - try to fix audio cdrom problems (bug #513495)
 



From twaugh at fedoraproject.org  Mon Sep 14 17:03:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 14 Sep 2009 17:03:49 +0000 (UTC)
Subject: rpms/cups/devel cups-str3332.patch, NONE, 1.1 cups-lspp.patch, 1.43,
	1.44 cups.spec, 1.517, 1.518 sources, 1.50,
	1.51 cups-str3262.patch, 1.1, NONE cups-str3279.patch, 1.1,
	NONE cups-str3284.patch, 1.1, NONE cups-str3285.patch, 1.1,
	NONE cups-str3287.patch, 1.1, NONE cups-str3292.patch, 1.2,
	NONE cups-str3293.patch, 1.1, NONE cups-str3308.patch, 1.1,
	NONE cups-str3311.patch, 1.1, NONE cups-str3312.patch, 1.1, NONE
Message-ID: <20090914170349.C727F11C00EC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6434

Modified Files:
	cups-lspp.patch cups.spec sources 
Added Files:
	cups-str3332.patch 
Removed Files:
	cups-str3262.patch cups-str3279.patch cups-str3284.patch 
	cups-str3285.patch cups-str3287.patch cups-str3292.patch 
	cups-str3293.patch cups-str3308.patch cups-str3311.patch 
	cups-str3312.patch 
Log Message:
* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
- 1.4.1.


cups-str3332.patch:
 usb-unix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3332.patch ---
diff -up cups-1.4.1/backend/usb-unix.c.function-decl cups-1.4.1/backend/usb-unix.c
--- cups-1.4.1/backend/usb-unix.c.function-decl	2009-09-14 17:36:06.087996470 +0100
+++ cups-1.4.1/backend/usb-unix.c	2009-09-14 17:36:13.656996607 +0100
@@ -605,7 +605,7 @@ open_device(const char *uri,		/* I - Dev
  * 'side_cb()' - Handle side-channel requests...
  */
 
-static void
+static int
 side_cb(int         print_fd,		/* I - Print file */
         int         device_fd,		/* I - Device file */
         int         snmp_fd,		/* I - SNMP socket (unused) */

cups-lspp.patch:
 Makedefs.in                 |    4 
 config-scripts/cups-lspp.m4 |   36 +++
 config.h.in                 |    7 
 configure.in                |    2 
 cups/cups.h                 |    9 
 data/Makefile               |    5 
 data/mls                    |  261 +++++++++++++++++++++++++
 data/selinux                |  261 +++++++++++++++++++++++++
 data/te                     |  261 +++++++++++++++++++++++++
 filter/common.c             |  139 +++++++++++++
 filter/pstops.c             |  133 ++++++++++++
 scheduler/client.c          |  171 ++++++++++++++++
 scheduler/client.h          |   14 +
 scheduler/conf.c            |   56 +++++
 scheduler/conf.h            |    9 
 scheduler/ipp.c             |  456 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  303 ++++++++++++++++++++++++++++-
 scheduler/job.h             |   11 +
 scheduler/main.c            |   32 +++
 scheduler/printers.c        |   50 ++++
 20 files changed, 2212 insertions(+), 8 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- cups-lspp.patch	17 Jun 2009 11:30:02 -0000	1.43
+++ cups-lspp.patch	14 Sep 2009 17:03:47 -0000	1.44
@@ -1,7 +1,7 @@
-diff -up cups-1.4rc1/config.h.in.lspp cups-1.4rc1/config.h.in
---- cups-1.4rc1/config.h.in.lspp	2009-05-14 21:48:55.000000000 +0100
-+++ cups-1.4rc1/config.h.in	2009-06-17 11:24:06.635318677 +0100
-@@ -628,6 +628,13 @@
+diff -up cups-1.4.1/config.h.in.lspp cups-1.4.1/config.h.in
+--- cups-1.4.1/config.h.in.lspp	2009-09-14 16:59:30.108873598 +0100
++++ cups-1.4.1/config.h.in	2009-09-14 16:59:30.122873526 +0100
+@@ -619,6 +619,13 @@
  #undef HAVE_TCPD_H
  
  
@@ -15,9 +15,9 @@ diff -up cups-1.4rc1/config.h.in.lspp cu
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up /dev/null cups-1.4rc1/config-scripts/cups-lspp.m4
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/config-scripts/cups-lspp.m4	2009-06-17 11:24:06.636318615 +0100
+diff -up /dev/null cups-1.4.1/config-scripts/cups-lspp.m4
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/config-scripts/cups-lspp.m4	2009-09-14 16:59:30.124872629 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@ diff -up /dev/null cups-1.4rc1/config-sc
 +            ;;
 +    esac
 +fi
-diff -up cups-1.4rc1/configure.in.lspp cups-1.4rc1/configure.in
---- cups-1.4rc1/configure.in.lspp	2008-11-14 19:32:22.000000000 +0000
-+++ cups-1.4rc1/configure.in	2009-06-17 11:24:06.636318615 +0100
+diff -up cups-1.4.1/configure.in.lspp cups-1.4.1/configure.in
+--- cups-1.4.1/configure.in.lspp	2008-11-14 19:32:22.000000000 +0000
++++ cups-1.4.1/configure.in	2009-09-14 16:59:30.125879233 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -67,9 +67,9 @@ diff -up cups-1.4rc1/configure.in.lspp c
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-1.4rc1/cups/cups.h.lspp cups-1.4rc1/cups/cups.h
---- cups-1.4rc1/cups/cups.h.lspp	2009-05-22 22:46:12.000000000 +0100
-+++ cups-1.4rc1/cups/cups.h	2009-06-17 11:24:06.637318262 +0100
+diff -up cups-1.4.1/cups/cups.h.lspp cups-1.4.1/cups/cups.h
+--- cups-1.4.1/cups/cups.h.lspp	2009-08-28 18:51:05.000000000 +0100
++++ cups-1.4.1/cups/cups.h	2009-09-14 16:59:30.127873074 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -93,9 +93,9 @@ diff -up cups-1.4rc1/cups/cups.h.lspp cu
  /*
   * Types and structures...
   */
-diff -up cups-1.4rc1/data/Makefile.lspp cups-1.4rc1/data/Makefile
---- cups-1.4rc1/data/Makefile.lspp	2008-11-12 19:30:57.000000000 +0000
-+++ cups-1.4rc1/data/Makefile	2009-06-17 11:24:06.638317553 +0100
+diff -up cups-1.4.1/data/Makefile.lspp cups-1.4.1/data/Makefile
+--- cups-1.4.1/data/Makefile.lspp	2008-11-12 19:30:57.000000000 +0000
++++ cups-1.4.1/data/Makefile	2009-09-14 16:59:30.129874067 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -108,9 +108,9 @@ diff -up cups-1.4rc1/data/Makefile.lspp 
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.4rc1/data/mls
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/data/mls	2009-06-17 11:24:06.639317340 +0100
+diff -up /dev/null cups-1.4.1/data/mls
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/data/mls	2009-09-14 16:59:30.131873095 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -373,9 +373,9 @@ diff -up /dev/null cups-1.4rc1/data/mls
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.4rc1/data/selinux
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/data/selinux	2009-06-17 11:24:06.639317340 +0100
+diff -up /dev/null cups-1.4.1/data/selinux
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/data/selinux	2009-09-14 16:59:30.133872489 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -638,9 +638,9 @@ diff -up /dev/null cups-1.4rc1/data/seli
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.4rc1/data/te
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/data/te	2009-06-17 11:24:06.640317408 +0100
+diff -up /dev/null cups-1.4.1/data/te
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/data/te	2009-09-14 16:59:30.135873116 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -903,9 +903,9 @@ diff -up /dev/null cups-1.4rc1/data/te
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.4rc1/filter/common.c.lspp cups-1.4rc1/filter/common.c
---- cups-1.4rc1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.4rc1/filter/common.c	2009-06-17 11:24:06.641317391 +0100
+diff -up cups-1.4.1/filter/common.c.lspp cups-1.4.1/filter/common.c
+--- cups-1.4.1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.4.1/filter/common.c	2009-09-14 16:59:30.137872500 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1074,9 +1074,9 @@ diff -up cups-1.4rc1/filter/common.c.lsp
  
  
  /*
-diff -up cups-1.4rc1/filter/pstops.c.lspp cups-1.4rc1/filter/pstops.c
---- cups-1.4rc1/filter/pstops.c.lspp	2009-06-17 11:24:06.511318859 +0100
-+++ cups-1.4rc1/filter/pstops.c	2009-06-17 11:24:06.643317146 +0100
+diff -up cups-1.4.1/filter/pstops.c.lspp cups-1.4.1/filter/pstops.c
+--- cups-1.4.1/filter/pstops.c.lspp	2009-09-14 16:59:29.803998275 +0100
++++ cups-1.4.1/filter/pstops.c	2009-09-14 16:59:30.141872862 +0100
 @@ -3242,6 +3242,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
@@ -1232,9 +1232,9 @@ diff -up cups-1.4rc1/filter/pstops.c.lsp
  
  
  /*
-diff -up cups-1.4rc1/Makedefs.in.lspp cups-1.4rc1/Makedefs.in
---- cups-1.4rc1/Makedefs.in.lspp	2009-06-17 11:24:06.613318752 +0100
-+++ cups-1.4rc1/Makedefs.in	2009-06-17 11:24:06.645317442 +0100
+diff -up cups-1.4.1/Makedefs.in.lspp cups-1.4.1/Makedefs.in
+--- cups-1.4.1/Makedefs.in.lspp	2009-09-14 16:59:30.024872775 +0100
++++ cups-1.4.1/Makedefs.in	2009-09-14 16:59:30.143872406 +0100
 @@ -146,7 +146,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@@ -1253,9 +1253,9 @@ diff -up cups-1.4rc1/Makedefs.in.lspp cu
  .SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
  
  .c.o:
-diff -up cups-1.4rc1/scheduler/client.c.lspp cups-1.4rc1/scheduler/client.c
---- cups-1.4rc1/scheduler/client.c.lspp	2009-05-26 23:01:23.000000000 +0100
-+++ cups-1.4rc1/scheduler/client.c	2009-06-17 11:24:32.101443240 +0100
+diff -up cups-1.4.1/scheduler/client.c.lspp cups-1.4.1/scheduler/client.c
+--- cups-1.4.1/scheduler/client.c.lspp	2009-07-15 00:02:05.000000000 +0100
++++ cups-1.4.1/scheduler/client.c	2009-09-14 16:59:30.148872510 +0100
 @@ -44,6 +44,7 @@
   *   valid_host()           - Is the Host: field valid?
   *   write_file()           - Send a file via HTTP.
@@ -1425,7 +1425,7 @@ diff -up cups-1.4rc1/scheduler/client.c.
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4448,6 +4575,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4472,6 +4599,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1476,9 +1476,9 @@ diff -up cups-1.4rc1/scheduler/client.c.
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -up cups-1.4rc1/scheduler/client.h.lspp cups-1.4rc1/scheduler/client.h
---- cups-1.4rc1/scheduler/client.h.lspp	2009-05-26 23:01:23.000000000 +0100
-+++ cups-1.4rc1/scheduler/client.h	2009-06-17 11:24:06.652317592 +0100
+diff -up cups-1.4.1/scheduler/client.h.lspp cups-1.4.1/scheduler/client.h
+--- cups-1.4.1/scheduler/client.h.lspp	2009-05-26 23:01:23.000000000 +0100
++++ cups-1.4.1/scheduler/client.h	2009-09-14 16:59:30.150872942 +0100
 @@ -18,6 +18,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1514,9 +1514,9 @@ diff -up cups-1.4rc1/scheduler/client.h.
  
  
  /*
-diff -up cups-1.4rc1/scheduler/conf.c.lspp cups-1.4rc1/scheduler/conf.c
---- cups-1.4rc1/scheduler/conf.c.lspp	2009-06-17 11:24:06.521317718 +0100
-+++ cups-1.4rc1/scheduler/conf.c	2009-06-17 11:25:04.221442770 +0100
+diff -up cups-1.4.1/scheduler/conf.c.lspp cups-1.4.1/scheduler/conf.c
+--- cups-1.4.1/scheduler/conf.c.lspp	2009-09-14 16:59:29.837998036 +0100
++++ cups-1.4.1/scheduler/conf.c	2009-09-14 16:59:30.155872264 +0100
 @@ -29,6 +29,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1626,9 +1626,9 @@ diff -up cups-1.4rc1/scheduler/conf.c.ls
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-1.4rc1/scheduler/conf.h.lspp cups-1.4rc1/scheduler/conf.h
---- cups-1.4rc1/scheduler/conf.h.lspp	2009-06-17 11:24:06.522318771 +0100
-+++ cups-1.4rc1/scheduler/conf.h	2009-06-17 11:24:06.663317557 +0100
+diff -up cups-1.4.1/scheduler/conf.h.lspp cups-1.4.1/scheduler/conf.h
+--- cups-1.4.1/scheduler/conf.h.lspp	2009-09-14 16:59:29.839997456 +0100
++++ cups-1.4.1/scheduler/conf.h	2009-09-14 16:59:30.157872484 +0100
 @@ -253,6 +253,12 @@ VAR char		*ServerKey		VALUE(NULL);
  VAR int			SSLOptions		VALUE(CUPSD_SSL_NONE);
  					/* SSL/TLS options */
@@ -1652,9 +1652,9 @@ diff -up cups-1.4rc1/scheduler/conf.h.ls
  
  /*
   * Prototypes...
-diff -up cups-1.4rc1/scheduler/ipp.c.lspp cups-1.4rc1/scheduler/ipp.c
---- cups-1.4rc1/scheduler/ipp.c.lspp	2009-06-17 11:24:06.598318705 +0100
-+++ cups-1.4rc1/scheduler/ipp.c	2009-06-17 11:24:06.668442879 +0100
+diff -up cups-1.4.1/scheduler/ipp.c.lspp cups-1.4.1/scheduler/ipp.c
+--- cups-1.4.1/scheduler/ipp.c.lspp	2009-09-14 16:59:29.974871379 +0100
++++ cups-1.4.1/scheduler/ipp.c	2009-09-14 16:59:30.168872218 +0100
 @@ -41,6 +41,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1698,7 +1698,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  static int	check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
  static ipp_attribute_t	*copy_attribute(ipp_t *to, ipp_attribute_t *attr,
  		                        int quickcopy);
-@@ -1332,6 +1347,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1338,6 +1353,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1720,7 +1720,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1548,6 +1578,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1554,6 +1584,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -1825,7 +1825,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1556,6 +1684,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1562,6 +1690,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      return (NULL);
    }
  
@@ -1858,7 +1858,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1764,6 +1918,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1769,6 +1923,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
        attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]);
        attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]);
      }
@@ -1888,7 +1888,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
      job->job_sheets = attr;
  
-@@ -1794,6 +1971,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1799,6 +1976,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                		     "job-sheets=\"%s,none\", "
  					     "job-originating-user-name=\"%s\"",
  	              Classification, job->username);
@@ -1898,7 +1898,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1812,6 +1992,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1817,6 +1997,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  					     "job-originating-user-name=\"%s\"",
  		      attr->values[0].string.text,
  		      attr->values[1].string.text, job->username);
@@ -1908,7 +1908,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1832,6 +2015,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1837,6 +2020,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  			"job-originating-user-name=\"%s\"",
  			attr->values[0].string.text,
  			attr->values[1].string.text, job->username);
@@ -1918,7 +1918,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1872,8 +2058,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1877,8 +2063,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  		      "job-sheets=\"%s\", "
  		      "job-originating-user-name=\"%s\"",
  		      Classification, job->username);
@@ -1971,7 +1971,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
     /*
      * See if we need to add the starting sheet...
-@@ -4205,6 +4435,103 @@ check_rss_recipient(
+@@ -4210,6 +4440,103 @@ check_rss_recipient(
  }
  
  
@@ -2075,7 +2075,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4756,6 +5083,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4761,6 +5088,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -2091,7 +2091,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4791,6 +5127,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4796,6 +5132,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2174,7 +2174,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4885,6 +5297,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4890,6 +5302,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2199,7 +2199,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -6824,6 +7254,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -6829,6 +7259,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2222,7 +2222,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
   /*
    * Copy attributes...
    */
-@@ -7043,6 +7489,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -7048,6 +7494,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (username[0] && strcasecmp(username, job->username))
        continue;
  
@@ -2234,7 +2234,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
      if (count > 0)
        ippAddSeparator(con->response);
  
-@@ -11425,6 +11876,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -11430,6 +11881,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2246,9 +2246,9 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
   /*
    * Check the username against the owner...
    */
-diff -up cups-1.4rc1/scheduler/job.c.lspp cups-1.4rc1/scheduler/job.c
---- cups-1.4rc1/scheduler/job.c.lspp	2009-06-17 11:24:06.534317793 +0100
-+++ cups-1.4rc1/scheduler/job.c	2009-06-17 11:24:06.674442529 +0100
+diff -up cups-1.4.1/scheduler/job.c.lspp cups-1.4.1/scheduler/job.c
+--- cups-1.4.1/scheduler/job.c.lspp	2009-09-14 16:59:30.058872907 +0100
++++ cups-1.4.1/scheduler/job.c	2009-09-14 17:00:42.616998003 +0100
 @@ -66,6 +66,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2289,7 +2289,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -911,6 +930,67 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -929,6 +948,67 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
      }
    }
  
@@ -2357,7 +2357,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-@@ -1147,13 +1227,13 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -1165,13 +1245,13 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
        if (access(command, F_OK))
  	{
  	  snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
@@ -2373,7 +2373,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  			      ServerBin);
  	    }
  	  else
-@@ -1161,7 +1241,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -1179,7 +1259,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
  	      /* Not in the compat directory either; make any error
  		 messages use the correct directory name then. */
  	      snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
@@ -2382,7 +2382,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  	    }
  	}
  #endif /* __x86_64__ */
-@@ -1608,6 +1688,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+@@ -1626,6 +1706,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
      goto error;
    }
  
@@ -2403,7 +2403,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1957,6 +2051,14 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1975,6 +2069,14 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2418,7 +2418,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1975,6 +2077,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1993,6 +2095,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2495,7 +2495,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3103,6 +3275,18 @@ get_options(cupsd_job_t *job,		/* I - Jo
+@@ -3138,6 +3310,18 @@ get_options(cupsd_job_t *job,		/* I - Jo
  	  banner_page)
          continue;
  
@@ -2514,7 +2514,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
       /*
        * Otherwise add them to the list...
        */
-@@ -3777,6 +3961,19 @@ static void
+@@ -3810,6 +3994,19 @@ static void
  start_job(cupsd_job_t     *job,		/* I - Job ID */
            cupsd_printer_t *printer)	/* I - Printer to print job */
  {
@@ -2534,9 +2534,9 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))",
                    job, job->id, printer, printer->name);
  
-@@ -3894,6 +4091,106 @@ start_job(cupsd_job_t     *job,		/* I - 
-   fcntl(job->side_pipes[1], F_SETFL,
- 	fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
+@@ -3932,6 +4129,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+   fcntl(job->side_pipes[1], F_SETFD,
+ 	fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
  
 +#ifdef WITH_LSPP
 +  if (is_lspp_config())
@@ -2641,9 +2641,9 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
   /*
    * Now start the first file in the job...
    */
-diff -up cups-1.4rc1/scheduler/job.h.lspp cups-1.4rc1/scheduler/job.h
---- cups-1.4rc1/scheduler/job.h.lspp	2009-05-11 23:46:01.000000000 +0100
-+++ cups-1.4rc1/scheduler/job.h	2009-06-17 11:25:35.151318166 +0100
+diff -up cups-1.4.1/scheduler/job.h.lspp cups-1.4.1/scheduler/job.h
+--- cups-1.4.1/scheduler/job.h.lspp	2009-05-11 23:46:01.000000000 +0100
++++ cups-1.4.1/scheduler/job.h	2009-09-14 16:59:30.177872674 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2669,9 +2669,9 @@ diff -up cups-1.4rc1/scheduler/job.h.lsp
  };
  
  typedef struct cupsd_joblog_s		/**** Job log message ****/
-diff -up cups-1.4rc1/scheduler/main.c.lspp cups-1.4rc1/scheduler/main.c
---- cups-1.4rc1/scheduler/main.c.lspp	2009-06-17 11:24:06.577318612 +0100
-+++ cups-1.4rc1/scheduler/main.c	2009-06-17 11:24:06.678443262 +0100
+diff -up cups-1.4.1/scheduler/main.c.lspp cups-1.4.1/scheduler/main.c
+--- cups-1.4.1/scheduler/main.c.lspp	2009-09-14 16:59:29.925872130 +0100
++++ cups-1.4.1/scheduler/main.c	2009-09-14 16:59:30.180872667 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -2739,9 +2739,9 @@ diff -up cups-1.4rc1/scheduler/main.c.ls
    return (!stop_scheduler);
  }
  
-diff -up cups-1.4rc1/scheduler/printers.c.lspp cups-1.4rc1/scheduler/printers.c
---- cups-1.4rc1/scheduler/printers.c.lspp	2009-06-17 11:24:06.543317142 +0100
-+++ cups-1.4rc1/scheduler/printers.c	2009-06-17 11:26:11.746318088 +0100
+diff -up cups-1.4.1/scheduler/printers.c.lspp cups-1.4.1/scheduler/printers.c
+--- cups-1.4.1/scheduler/printers.c.lspp	2009-09-14 16:59:29.866997809 +0100
++++ cups-1.4.1/scheduler/printers.c	2009-09-14 16:59:30.185871787 +0100
 @@ -58,6 +58,8 @@
   *   write_xml_string()         - Write a string with XML escaping.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -p -r1.517 -r1.518
--- cups.spec	4 Sep 2009 14:07:55 -0000	1.517
+++ cups.spec	14 Sep 2009 17:03:49 -0000	1.518
@@ -8,8 +8,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -49,18 +49,9 @@ Patch22: cups-build.patch
 Patch23: cups-res_init.patch
 Patch25: cups-filter-debug.patch
 Patch30: cups-uri-compat.patch
-Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
-Patch39: cups-str3284.patch
-Patch40: cups-str3285.patch
-Patch41: cups-str3279.patch
-Patch42: cups-str3287.patch
-Patch43: cups-str3292.patch
-Patch44: cups-str3293.patch
-Patch45: cups-str3308.patch
-Patch46: cups-str3311.patch
-Patch47: cups-str3312.patch
+Patch38: cups-str3332.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -211,18 +202,9 @@ module. 
 %patch23 -p1 -b .res_init
 %patch25 -p1 -b .filter-debug
 %patch30 -p1 -b .uri-compat
-%patch34 -p1 -b .str3262
 %patch35 -p1 -b .cups-get-classes
 %patch37 -p1 -b .avahi
-%patch39 -p1 -b .str3284
-%patch40 -p1 -b .str3285
-%patch41 -p1 -b .str3279
-%patch42 -p1 -b .str3287
-%patch43 -p1 -b .str3292
-%patch44 -p1 -b .str3293
-%patch45 -p1 -b .str3308
-%patch46 -p1 -b .str3311
-%patch47 -p1 -b .str3312
+%patch38 -p1 -b .str3332
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -523,6 +505,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
+- 1.4.1.
+
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
 - Fixed the dnssd backend so that it only reports devices once avahi
   resolution has completed.  This makes it report Device IDs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	28 Aug 2009 21:06:47 -0000	1.50
+++ sources	14 Sep 2009 17:03:49 -0000	1.51
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-bc5e777d4320cecdd1a64de8035171a8  cups-1.4.0-source.tar.bz2
+587a58039c112ecb3c932e048c8a7b01  cups-1.4.1-source.tar.bz2


--- cups-str3262.patch DELETED ---


--- cups-str3279.patch DELETED ---


--- cups-str3284.patch DELETED ---


--- cups-str3285.patch DELETED ---


--- cups-str3287.patch DELETED ---


--- cups-str3292.patch DELETED ---


--- cups-str3293.patch DELETED ---


--- cups-str3308.patch DELETED ---


--- cups-str3311.patch DELETED ---


--- cups-str3312.patch DELETED ---



From trasher at fedoraproject.org  Mon Sep 14 17:08:43 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon, 14 Sep 2009 17:08:43 +0000 (UTC)
Subject: rpms/tuxtype2/F-10 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tuxtype2.spec, 1.12, 1.13
Message-ID: <20090914170843.9A21011C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/tuxtype2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13131

Modified Files:
	.cvsignore sources tuxtype2.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Sep 2008 15:58:21 -0000	1.4
+++ .cvsignore	14 Sep 2009 17:08:43 -0000	1.5
@@ -1 +1 @@
-tuxtype_w_fonts-1.5.17.tar.gz
+tuxtype_w_fonts-1.7.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Sep 2008 15:58:21 -0000	1.4
+++ sources	14 Sep 2009 17:08:43 -0000	1.5
@@ -1 +1 @@
-c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz
+54017a392624444c71670345e10fc55c  tuxtype_w_fonts-1.7.5.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/F-10/tuxtype2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tuxtype2.spec	15 Sep 2008 15:58:21 -0000	1.12
+++ tuxtype2.spec	14 Sep 2009 17:08:43 -0000	1.13
@@ -1,17 +1,19 @@
 Name:           tuxtype2
-Version:        1.5.17
+Version:        1.7.5
 Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://tuxtype.sourceforge.net/
-Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
+URL:            http://tux4kids.alioth.debian.org/tuxtype/index.php
+Source0:        https://alioth.debian.org/frs/download.php/3051/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
+BuildRequires:  librsvg2-devel
+
 
 %description
 Tux Typing is an educational typing tutor for children. It features several
@@ -20,6 +22,9 @@ different types of gameplay, at a variet
 
 %prep
 %setup -q -n tuxtype_w_fonts-%{version}
+rm -rf data/fonts/*.ttf
+# fix wrong end of line encoding
+sed -i -e 's|\r||g' doc/en/TuxType_port_Mac.txt
 
 
 %build
@@ -49,22 +54,29 @@ EOF
 
 convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
-		     --add-category X-Fedora \
-		     --vendor fedora \
-		     %{name}.desktop
+                     --add-category X-Fedora \
+                     --vendor fedora \
+                     %{name}.desktop
+
+%find_lang tuxtype
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f tuxtype.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
+%doc AUTHORS COPYING ChangeLog README TODO doc/en/howtotheme.html doc/en/TuxType_port_Mac.txt
 %{_bindir}/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 14 2009 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.7.5-1
+- 1.7.5
+- removed shipped fonts
+
 * Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.17-1
 - update to 1.5.17 (incorporate Jonathan Dieter's changes)
 



From mschwendt at fedoraproject.org  Mon Sep 14 17:09:37 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 17:09:37 +0000 (UTC)
Subject: rpms/taglib/F-11 taglib-1.5-1.6-ape.patch, NONE,
	1.1 taglib-1.5-1.6-flac.patch, NONE,
	1.1 taglib-1.5-1.6-mpeg-cmake.patch, NONE,
	1.1 taglib-1.5-1.6-mpeg.patch, NONE,
	1.1 taglib-1.5-1.6-ogg.patch, NONE,
	1.1 taglib-1.5-1.6-toolkit.patch, NONE,
	1.1 taglib-1.5-tests.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 taglib.spec, 1.34,
	1.35 taglib-1.6-test_mp4.patch, 1.1, NONE
Message-ID: <20090914170937.8911011C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14180/F-11

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib-1.5-tests.patch 
Removed Files:
	taglib-1.6-test_mp4.patch 
Log Message:
resurrect taglib 1.5 with bug-fixes from 1.6

taglib-1.5-1.6-ape.patch:
 apeitem.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE taglib-1.5-1.6-ape.patch ---
diff -Nur taglib-1.5/taglib/ape/apeitem.cpp taglib/taglib/ape/apeitem.cpp
--- taglib-1.5/taglib/ape/apeitem.cpp	2008-02-12 17:30:25.000000000 +0100
+++ taglib/taglib/ape/apeitem.cpp	2009-01-11 00:15:33.000000000 +0100
@@ -160,14 +160,14 @@
 bool APE::Item::isEmpty() const
 {
   switch(d->type) {
-    case 0:
-    case 1:
+    case Text:
+    case Binary:
       if(d->text.isEmpty())
         return true;
       if(d->text.size() == 1 && d->text.front().isEmpty())
         return true;
       return false;
-    case 2:
+    case Locator:
       return d->value.isEmpty();
     default:
       return false;
@@ -206,8 +206,9 @@
   if(isEmpty())
     return data;
 
-  if(d->type != Item::Binary) {
+  if(d->type == Text) {
     StringList::ConstIterator it = d->text.begin();
+
     value.append(it->data(String::UTF8));
     it++;
     for(; it != d->text.end(); ++it) {

taglib-1.5-1.6-flac.patch:
 flacfile.cpp       |   83 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 flacfile.h         |    1 
 flacproperties.cpp |    2 -
 3 files changed, 78 insertions(+), 8 deletions(-)

--- NEW FILE taglib-1.5-1.6-flac.patch ---
diff -Nur taglib-1.5/taglib/flac/flacfile.cpp taglib/taglib/flac/flacfile.cpp
--- taglib-1.5/taglib/flac/flacfile.cpp	2008-01-31 06:19:03.000000000 +0100
+++ taglib/taglib/flac/flacfile.cpp	2009-07-12 23:53:18.000000000 +0200
@@ -42,6 +42,7 @@
 {
   enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 };
   enum { StreamInfo = 0, Padding, Application, SeekTable, VorbisComment, CueSheet };
+  enum { MinPaddingLength = 4096 };
 }
 
 class FLAC::File::FilePrivate
@@ -167,9 +168,49 @@
       uint blockLength = header.mid(1, 3).toUInt();
 
       if(blockType == VorbisComment) {
-        data[0] = header[0];
-        insert(data, nextBlockOffset, blockLength + 4);
-        break;
+
+        long paddingBreak = 0;
+
+        if(!isLastBlock) {
+          paddingBreak = findPaddingBreak(nextBlockOffset + blockLength + 4,
+                                          nextBlockOffset + d->xiphCommentData.size() + 8,
+                                          &isLastBlock);
+        }
+
+        uint paddingLength = 0;
+
+         if(paddingBreak) {
+
+           // There is space for comment and padding blocks without rewriting the
+           // whole file.  Note: This cannot overflow.
+
+           paddingLength = paddingBreak - (nextBlockOffset + d->xiphCommentData.size() + 8);
+         }
+         else {
+
+           // Not enough space, so we will have to rewrite the whole file
+           // following this block
+
+           paddingLength = d->xiphCommentData.size();
+
+           if(paddingLength < MinPaddingLength)
+             paddingLength = MinPaddingLength;
+
+           paddingBreak = nextBlockOffset + blockLength + 4;
+         }
+
+         ByteVector padding = ByteVector::fromUInt(paddingLength);
+
+         padding[0] = 1;
+
+         if(isLastBlock)
+           padding[0] |= 0x80;
+
+         padding.resize(paddingLength + 4);
+         ByteVector pair(data);
+         pair.append(padding);
+         insert(pair, nextBlockOffset, paddingBreak - nextBlockOffset);
+         break;
       }
 
       nextBlockOffset += blockLength + 4;
@@ -373,11 +414,8 @@
     isLastBlock = (header[0] & 0x80) != 0;
     length = header.mid(1, 3).toUInt();
 
-    if(blockType == Padding) {
-      // debug("FLAC::File::scan() -- Padding found");
-    }
     // Found the vorbis-comment
-    else if(blockType == VorbisComment) {
+    if(blockType == VorbisComment) {
       d->xiphCommentData = readBlock(length);
       d->hasXiphComment = true;
     }
@@ -429,3 +467,34 @@
 
   return -1;
 }
+
+long FLAC::File::findPaddingBreak(long nextBlockOffset, long targetOffset, bool *isLast)
+{
+  // Starting from nextBlockOffset, step over padding blocks to find the
+  // address of a block which is after targetOffset. Return zero if
+  // a non-padding block occurs before that point.
+
+  while(true) {
+    seek(nextBlockOffset);
+
+    ByteVector header = readBlock(4);
+    char blockType = header[0] & 0x7f;
+    bool isLastBlock = header[0] & 0x80;
+    uint length = header.mid(1, 3).toUInt();
+
+    if(blockType != Padding)
+      break;
+
+    nextBlockOffset += 4 + length;
+
+    if(nextBlockOffset >= targetOffset) {
+      *isLast = isLastBlock;
+      return nextBlockOffset;
+    }
+
+    if(isLastBlock)
+      break;
+  }
+
+  return 0;
+}
diff -Nur taglib-1.5/taglib/flac/flacfile.h taglib/taglib/flac/flacfile.h
--- taglib-1.5/taglib/flac/flacfile.h	2008-01-31 05:07:29.000000000 +0100
+++ taglib/taglib/flac/flacfile.h	2009-07-12 23:53:18.000000000 +0200
@@ -191,6 +191,7 @@
       long findID3v2();
       long findID3v1();
       ByteVector xiphCommentData() const;
+      long findPaddingBreak(long nextPageOffset, long targetOffset, bool *isLast);
 
       class FilePrivate;
       FilePrivate *d;
diff -Nur taglib-1.5/taglib/flac/flacproperties.cpp taglib/taglib/flac/flacproperties.cpp
--- taglib-1.5/taglib/flac/flacproperties.cpp	2008-01-11 01:55:09.000000000 +0100
+++ taglib/taglib/flac/flacproperties.cpp	2008-04-08 14:15:20.000000000 +0200
@@ -146,5 +146,5 @@
 
   // Real bitrate:
 
-  d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
+  d->bitrate = d->length > 0 ? ((d->streamLength * 8UL) / d->length) / 1000 : 0;
 }

taglib-1.5-1.6-mpeg-cmake.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE taglib-1.5-1.6-mpeg-cmake.patch ---
diff -Nur taglib-1.5-orig/taglib/CMakeLists.txt taglib-1.5/taglib/CMakeLists.txt
--- taglib-1.5-orig/taglib/CMakeLists.txt	2008-02-12 05:15:20.000000000 +0100
+++ taglib-1.5/taglib/CMakeLists.txt	2009-08-22 12:18:40.000000000 +0200
@@ -62,6 +62,8 @@
 mpeg/id3v2/frames/attachedpictureframe.cpp
 mpeg/id3v2/frames/commentsframe.cpp
 mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
+mpeg/id3v2/frames/popularimeterframe.cpp
+mpeg/id3v2/frames/privateframe.cpp
 mpeg/id3v2/frames/relativevolumeframe.cpp
 mpeg/id3v2/frames/textidentificationframe.cpp
 mpeg/id3v2/frames/uniquefileidentifierframe.cpp

taglib-1.5-1.6-mpeg.patch:
 id3v2/frames/CMakeLists.txt                   |    2 
 id3v2/frames/Makefile.am                      |    4 
 id3v2/frames/attachedpictureframe.cpp         |   56 ++++++++++
 id3v2/frames/attachedpictureframe.h           |   16 ++-
 id3v2/frames/generalencapsulatedobjectframe.h |    4 
 id3v2/frames/popularimeterframe.cpp           |  137 ++++++++++++++++++++++++++
 id3v2/frames/popularimeterframe.h             |  132 +++++++++++++++++++++++++
 id3v2/frames/privateframe.cpp                 |  128 ++++++++++++++++++++++++
 id3v2/frames/privateframe.h                   |  111 +++++++++++++++++++++
 id3v2/id3v2footer.cpp                         |    2 
 id3v2/id3v2footer.h                           |    2 
 id3v2/id3v2framefactory.cpp                   |   63 ++++++++---
 id3v2/id3v2tag.cpp                            |   12 ++
 mpegheader.cpp                                |    4 
 mpegproperties.cpp                            |    6 -
 15 files changed, 649 insertions(+), 30 deletions(-)

--- NEW FILE taglib-1.5-1.6-mpeg.patch ---
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp	2009-09-04 10:50:24.000000000 +0200
@@ -50,7 +50,7 @@
 
 AttachedPictureFrame::AttachedPictureFrame() : Frame("APIC")
 {
-    d = new AttachedPictureFramePrivate;
+  d = new AttachedPictureFramePrivate;
 }
 
 AttachedPictureFrame::AttachedPictureFrame(const ByteVector &data) : Frame(data)
@@ -136,6 +136,12 @@
   int pos = 1;
 
   d->mimeType = readStringField(data, String::Latin1, &pos);
+  /* Now we need at least two more bytes available */	
+  if (uint(pos) + 1 >= data.size()) {
+    debug("Truncated picture frame.");
+    return;
+  }
+
   d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
   d->description = readStringField(data, d->textEncoding, &pos);
 
@@ -168,3 +174,51 @@
   d = new AttachedPictureFramePrivate;
   parseFields(fieldData(data));
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// support for ID3v2.2 PIC frames
+////////////////////////////////////////////////////////////////////////////////
+
+void AttachedPictureFrameV22::parseFields(const ByteVector &data)
+{
+  if(data.size() < 5) {
+    debug("A picture frame must contain at least 5 bytes.");
+    return;
+  }
+
+  d->textEncoding = String::Type(data[0]);
+
+  int pos = 1;
+
+  String fixedString = String(data.mid(pos, 3), String::Latin1);
+  pos += 3;
+  // convert fixed string image type to mime string
+  if (fixedString.upper() == "JPG") {
+    d->mimeType = "image/jpeg";
+  } else if (fixedString.upper() == "PNG") {
+    d->mimeType = "image/png";
+  } else {
+    debug("probably unsupported image type");
+    d->mimeType = "image/" + fixedString;
+  }
+
+  d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+  d->description = readStringField(data, d->textEncoding, &pos);
+
+  d->data = data.mid(pos);
+}
+
+AttachedPictureFrameV22::AttachedPictureFrameV22(const ByteVector &data, Header *h)
+{
+  d = new AttachedPictureFramePrivate;
+
+  // set v2.2 header to make fieldData work correctly
+  setHeader(h, true);
+
+  parseFields(fieldData(data));
+
+  // now set the v2.4 header
+  Frame::Header *newHeader = new Frame::Header("APIC");
+  newHeader->setFrameSize(h->frameSize());
+  setHeader(newHeader, false);
+}
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.h	2009-09-14 18:56:05.113767634 +0200
@@ -205,14 +205,24 @@
     protected:
       virtual void parseFields(const ByteVector &data);
       virtual ByteVector renderFields() const;
+      class AttachedPictureFramePrivate;
+      AttachedPictureFramePrivate *d;
 
     private:
-      AttachedPictureFrame(const ByteVector &data, Header *h);
       AttachedPictureFrame(const AttachedPictureFrame &);
       AttachedPictureFrame &operator=(const AttachedPictureFrame &);
+      AttachedPictureFrame(const ByteVector &data, Header *h);
 
-      class AttachedPictureFramePrivate;
-      AttachedPictureFramePrivate *d;
+    };
+
+    //! support for ID3v2.2 PIC frames
+    class TAGLIB_EXPORT AttachedPictureFrameV22 : public AttachedPictureFrame
+    {
+    protected:
+      virtual void parseFields(const ByteVector &data);
+    private:
+      AttachedPictureFrameV22(const ByteVector &data, Header *h);
+      friend class FrameFactory;
     };
   }
 }
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/CMakeLists.txt taglib-1.5-1.6/taglib/mpeg/id3v2/frames/CMakeLists.txt
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/CMakeLists.txt	2008-01-31 22:48:39.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/CMakeLists.txt	2009-09-14 18:56:05.119755592 +0200
@@ -2,6 +2,8 @@
 	attachedpictureframe.h
 	commentsframe.h
 	generalencapsulatedobjectframe.h
+	popularimeterframe.h
+	privateframe.h
 	relativevolumeframe.h
 	textidentificationframe.h
 	uniquefileidentifierframe.h
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h	2009-09-14 18:56:05.126760312 +0200
@@ -61,6 +61,10 @@
 
       /*!
        * Constructs a GeneralEncapsulatedObjectFrame frame based on \a data.
+       *
+       * \warning This is \em not data for the encapsulated object, for that use
+       * setObject().  This constructor is used when reading the frame from the
+       * disk.
        */
       explicit GeneralEncapsulatedObjectFrame(const ByteVector &data);
 
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/Makefile.am taglib-1.5-1.6/taglib/mpeg/id3v2/frames/Makefile.am
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/Makefile.am	2008-01-31 22:48:28.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/Makefile.am	2009-09-14 18:56:05.132766369 +0200
@@ -10,6 +10,8 @@
 	attachedpictureframe.cpp \
 	commentsframe.cpp \
 	generalencapsulatedobjectframe.cpp \
+	popularimeterframe.cpp \
+	privateframe.cpp \
 	relativevolumeframe.cpp \
 	textidentificationframe.cpp \
 	uniquefileidentifierframe.cpp \
@@ -21,6 +23,8 @@
 	attachedpictureframe.h \
 	commentsframe.h \
 	generalencapsulatedobjectframe.h \
+	popularimeterframe.h \
+	privateframe.h \
 	relativevolumeframe.h \
 	textidentificationframe.h \
 	uniquefileidentifierframe.h \
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.cpp	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.cpp	2009-09-14 18:56:05.139766543 +0200
@@ -0,0 +1,137 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Lukas Lalinsky
+    email                : lalinsky at gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tdebug.h>
+
+#include "popularimeterframe.h"
+
+using namespace TagLib;
+using namespace ID3v2;
+
+class PopularimeterFrame::PopularimeterFramePrivate
+{
+public:
+  PopularimeterFramePrivate() : rating(0), counter(0) {}
+  String email;
+  int rating;
+  TagLib::uint counter;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+PopularimeterFrame::PopularimeterFrame() : Frame("POPM")
+{
+  d = new PopularimeterFramePrivate;
+}
+
+PopularimeterFrame::PopularimeterFrame(const ByteVector &data) : Frame(data)
+{
+  d = new PopularimeterFramePrivate;
+  setData(data);
+}
+
+PopularimeterFrame::~PopularimeterFrame()
+{
+  delete d;
+}
+
+String PopularimeterFrame::toString() const
+{
+  return d->email + " rating=" + String::number(d->rating) + " counter=" + String::number(d->counter);
+}
+
+String PopularimeterFrame::email() const
+{
+  return d->email;
+}
+
+void PopularimeterFrame::setEmail(const String &s)
+{
+  d->email = s;
+}
+
+int PopularimeterFrame::rating() const
+{
+  return d->rating;
+}
+
+void PopularimeterFrame::setRating(int s)
+{
+  d->rating = s;
+}
+
+TagLib::uint PopularimeterFrame::counter() const
+{
+  return d->counter;
+}
+
+void PopularimeterFrame::setCounter(TagLib::uint s)
+{
+  d->counter = s;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+void PopularimeterFrame::parseFields(const ByteVector &data)
+{
+  int pos = 0, size = int(data.size());
+
+  d->email = readStringField(data, String::Latin1, &pos);
+
+  d->rating = 0;
+  d->counter = 0;
+  if(pos < size) {
+    d->rating = (unsigned char)(data[pos++]);
+    if(pos < size) {
+      d->counter = data.mid(pos, 4).toUInt();
+    }
+  }
+}
+
+ByteVector PopularimeterFrame::renderFields() const
+{
+  ByteVector data;
+
+  data.append(d->email.data(String::Latin1));
+  data.append(textDelimiter(String::Latin1));
+  data.append(char(d->rating));
+  data.append(ByteVector::fromUInt(d->counter));
+
+  return data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+PopularimeterFrame::PopularimeterFrame(const ByteVector &data, Header *h) : Frame(h)
+{
+  d = new PopularimeterFramePrivate;
+  parseFields(fieldData(data));
+}
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.h	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.h	2009-09-14 18:56:05.140768942 +0200
@@ -0,0 +1,132 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Lukas Lalinsky
+    email                : lalinsky at gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_POPULARIMETERFRAME_H
+#define TAGLIB_POPULARIMETERFRAME_H
+
+#include <id3v2frame.h>
+#include "taglib_export.h"
+
+namespace TagLib {
+
+  namespace ID3v2 {
+
+    //! An implementation of ID3v2 "popularimeter"
+
+    /*!
+     * This implements the ID3v2 popularimeter (POPM frame).  It concists of
+     * an email, a rating and an optional counter.
+     */
+
+    class TAGLIB_EXPORT PopularimeterFrame : public Frame
+    {
+      friend class FrameFactory;
+
+    public:
+      /*!
+       * Construct an empty popularimeter frame.
+       */
+      explicit PopularimeterFrame();
+
+      /*!
+       * Construct a popularimeter based on the data in \a data.
+       */
+      explicit PopularimeterFrame(const ByteVector &data);
+
+      /*!
+       * Destroys this PopularimeterFrame instance.
+       */
+      virtual ~PopularimeterFrame();
+
+      /*!
+       * Returns the text of this popularimeter.
+       *
+       * \see text()
+       */
+      virtual String toString() const;
+
+      /*!
+       * Returns the email.
+       *
+       * \see setEmail()
+       */
+      String email() const;
+
+      /*!
+       * Set the email.
+       *
+       * \see email()
+       */
+      void setEmail(const String &email);
+
+      /*!
+       * Returns the rating.
+       *
+       * \see setRating()
+       */
+      int rating() const;
+
+      /*!
+       * Set the rating.
+       *
+       * \see rating()
+       */
+      void setRating(int rating);
+
+      /*!
+       * Returns the counter.
+       *
+       * \see setCounter()
+       */
+      uint counter() const;
+
+      /*!
+       * Set the counter.
+       *
+       * \see counter()
+       */
+      void setCounter(uint counter);
+
+    protected:
+      // Reimplementations.
+
+      virtual void parseFields(const ByteVector &data);
+      virtual ByteVector renderFields() const;
+
+    private:
+      /*!
+       * The constructor used by the FrameFactory.
+       */
+      PopularimeterFrame(const ByteVector &data, Header *h);
+      PopularimeterFrame(const PopularimeterFrame &);
+      PopularimeterFrame &operator=(const PopularimeterFrame &);
+
+      class PopularimeterFramePrivate;
+      PopularimeterFramePrivate *d;
+    };
+
+  }
+}
+#endif
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.cpp	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.cpp	2009-09-14 18:56:05.142767428 +0200
@@ -0,0 +1,128 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Serkan Kalyoncu
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler at kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tbytevectorlist.h>
+#include <id3v2tag.h>
+#include <tdebug.h>
+
+#include "privateframe.h"
+
+using namespace TagLib;
+using namespace ID3v2;
+
+
+class PrivateFrame::PrivateFramePrivate
+{
+public:
+  ByteVector data;
+  String owner;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+PrivateFrame::PrivateFrame() : Frame("PRIV")
+{
+  d = new PrivateFramePrivate;
+}
+
+PrivateFrame::PrivateFrame(const ByteVector &data) : Frame(data)
+{
+  d = new PrivateFramePrivate;
+  setData(data);
+}
+
+PrivateFrame::~PrivateFrame()
+{
+  delete d;
+}
+
+String PrivateFrame::toString() const
+{
+  return d->owner;
+}
+
+String PrivateFrame::owner() const
+{
+  return d->owner;
+}
+
+ByteVector PrivateFrame::data() const
+{
+  return d->data;
+}
+
+void PrivateFrame::setOwner(const String &s)
+{
+  d->owner = s;
+}
+
+void PrivateFrame::setData(const ByteVector & data)
+{
+  d->data = data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+void PrivateFrame::parseFields(const ByteVector &data)
+{
+  if(data.size() < 2) {
+    debug("A private frame must contain at least 2 bytes.");
+    return;
+  }
+
+  // Owner identifier is assumed to be Latin1
+  
+  const int byteAlign =  1;
+  const int endOfOwner = data.find(textDelimiter(String::Latin1), 0, byteAlign);
+
+  d->owner =  String(data.mid(0, endOfOwner));
+  d->data = data.mid(endOfOwner + 1);
+}
+
+ByteVector PrivateFrame::renderFields() const
+{
+  ByteVector v;
+
+  v.append(d->owner.data(String::Latin1));
+  v.append(textDelimiter(String::Latin1));
+  v.append(d->data);
+
+  return v;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+PrivateFrame::PrivateFrame(const ByteVector &data, Header *h) : Frame(h)
+{
+  d = new PrivateFramePrivate();
+  parseFields(fieldData(data));
+}
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.h	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.h	2009-09-14 18:56:05.143769445 +0200
@@ -0,0 +1,111 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Serkan Kalyoncu
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler at kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_PRIVATEFRAME_H
+#define TAGLIB_PRIVATEFRAME_H
+
+#include "id3v2frame.h"
+#include "taglib_export.h"
+
+namespace TagLib {
+
+  namespace ID3v2 {
+
+    //! An implementation of ID3v2 privateframe
+
+    class TAGLIB_EXPORT PrivateFrame : public Frame
+    {
+      friend class FrameFactory;
+
+    public:
+      /*!
+       * Construct an empty private frame.
+       */
+      PrivateFrame();
+
+      /*!
+       * Construct a private frame based on the data in \a data.
+       *
+       * \note This is the constructor used when parsing the frame from a file.
+       */
+      explicit PrivateFrame(const ByteVector &data);
+
+      /*!
+       * Destroys this private frame instance.
+       */
+      virtual ~PrivateFrame();
+
+      /*!
+       * Returns the text of this private frame, currently just the owner.
+       *
+       * \see text()
+       */
+      virtual String toString() const;
+
+      /*!
+       * \return The owner of the private frame.
+       * \note This should contain an email address or link to a website.
+       */
+      String owner() const;
+
+      /*!
+       *
+       */
+      ByteVector data() const;
+
+      /*!
+       * Sets the owner of the frame to \a s.
+       * \note This should contain an email address or link to a website.
+       */
+      void setOwner(const String &s);
+
+      /*!
+       *
+       */
+      void setData(const ByteVector &v);
+
+    protected:
+      // Reimplementations.
+
+      virtual void parseFields(const ByteVector &data);
+      virtual ByteVector renderFields() const;
+
+    private:
+      /*!
+       * The constructor used by the FrameFactory.
+       */
+      PrivateFrame(const ByteVector &data, Header *h);
+
+      PrivateFrame(const PrivateFrame &);
+      PrivateFrame &operator=(const PrivateFrame &);
+
+      class PrivateFramePrivate;
+      PrivateFramePrivate *d;
+    };
+
+  }
+}
+#endif
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.cpp	2009-09-14 18:56:05.144768996 +0200
@@ -45,7 +45,7 @@
 
 }
 
-const unsigned int Footer::size()
+TagLib::uint Footer::size()
 {
   return FooterPrivate::size;
 }
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.h taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.h	2009-09-14 18:56:05.145768506 +0200
@@ -62,7 +62,7 @@
       /*!
        * Returns the size of the footer.  Presently this is always 10 bytes.
        */
-      static const unsigned int size();
+      static uint size();
 
       /*!
        * Renders the footer based on the data in \a header.
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2framefactory.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2framefactory.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2framefactory.cpp	2008-02-21 01:43:14.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2framefactory.cpp	2009-09-14 18:56:05.147769486 +0200
@@ -31,6 +31,7 @@
 
 #include "id3v2framefactory.h"
 #include "id3v2synchdata.h"
+#include "id3v1genres.h"
 
 #include "frames/attachedpictureframe.h"
 #include "frames/commentsframe.h"
@@ -41,6 +42,8 @@
 #include "frames/generalencapsulatedobjectframe.h"
 #include "frames/urllinkframe.h"
 #include "frames/unsynchronizedlyricsframe.h"
+#include "frames/popularimeterframe.h"
+#include "frames/privateframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -180,7 +183,15 @@
     return f;
   }
 
-  // Relative Volume Adjustment (frames 4.11)
+  // ID3v2.2 Attached Picture
+
+	if(frameID == "PIC") {
+    AttachedPictureFrame *f = new AttachedPictureFrameV22(data, header);
+    d->setTextEncoding(f);
+    return f;
+  }
+
+	// Relative Volume Adjustment (frames 4.11)
 
   if(frameID == "RVA2")
     return new RelativeVolumeFrame(data, header);
@@ -220,6 +231,16 @@
     return f;
   }
 
+  // Popularimeter (frames 4.17)
+
+  if(frameID == "POPM")
+    return new PopularimeterFrame(data, header);
+
+  // Private (frames 4.27)
+
+  if(frameID == "PRIV")
+    return new PrivateFrame(data, header);
+
   return new UnknownFrame(data, header);
 }
 
@@ -280,7 +301,6 @@
     convertFrame("IPL", "TIPL", header);
     convertFrame("MCI", "MCDI", header);
     convertFrame("MLL", "MLLT", header);
-    convertFrame("PIC", "APIC", header);
     convertFrame("POP", "POPM", header);
     convertFrame("REV", "RVRB", header);
     convertFrame("SLT", "SYLT", header);
@@ -382,26 +402,31 @@
 
 void FrameFactory::updateGenre(TextIdentificationFrame *frame) const
 {
-  StringList fields;
-  String s = frame->toString();
+  StringList fields = frame->fieldList();
+  StringList newfields;
 
-  while(s.startsWith("(")) {
-
-    int closing = s.find(")");
-
-    if(closing < 0)
-      break;
-
-    fields.append(s.substr(1, closing - 1));
-
-    s = s.substr(closing + 1);
+  for(StringList::Iterator it = fields.begin(); it != fields.end(); ++it) {
+    String s = *it;
+    int end = s.find(")");
+
+    if(s.startsWith("(") && end > 0) {
+      // "(12)Genre"
+      String text = s.substr(end + 1);
+      int number = s.substr(1, end - 1).toInt();
+      if (number > 0 && number <= 255 && !(ID3v1::genre(number) == text))
+        newfields.append(s.substr(1, end - 1));
+      if (!text.isEmpty())
+        newfields.append(text);
+    }
+    else {
+      // "Genre" or "12"
+      newfields.append(s);
+    }
   }
 
-  if(!s.isEmpty())
-    fields.append(s);
-
-  if(fields.isEmpty())
+  if(newfields.isEmpty())
     fields.append(String::null);
 
-  frame->setText(fields);
+  frame->setText(newfields);
+
 }
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2tag.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2tag.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2tag.cpp	2008-02-04 21:33:54.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2tag.cpp	2009-09-14 18:56:05.149769670 +0200
@@ -125,7 +125,9 @@
 
   for(FrameList::ConstIterator it = comments.begin(); it != comments.end(); ++it)
   {
-    if(static_cast<CommentsFrame *>(*it)->description().isEmpty())
+    CommentsFrame *frame = dynamic_cast<CommentsFrame *>(*it);
+
+    if(frame && frame->description().isEmpty())
       return (*it)->toString();
   }
 
@@ -159,6 +161,9 @@
 
   for(StringList::Iterator it = fields.begin(); it != fields.end(); ++it) {
 
+    if((*it).isEmpty())
+      continue;
+
     bool isNumber = true;
 
     for(String::ConstIterator charIt = (*it).begin();
@@ -347,6 +352,11 @@
   // Loop through the frames rendering them and adding them to the tagData.
 
   for(FrameList::Iterator it = d->frameList.begin(); it != d->frameList.end(); it++) {
+    if ((*it)->header()->frameID().size() != 4) {
+      debug("A frame of unsupported or unknown type \'"
+          + String((*it)->header()->frameID()) + "\' has been discarded");
+      continue;
+    }
     if(!(*it)->header()->tagAlterPreservation())
       tagData.append((*it)->render());
   }
diff -Nur taglib-1.5-orig/taglib/mpeg/mpegheader.cpp taglib-1.5-1.6/taglib/mpeg/mpegheader.cpp
--- taglib-1.5-orig/taglib/mpeg/mpegheader.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/mpegheader.cpp	2009-09-14 18:56:05.102768244 +0200
@@ -164,7 +164,7 @@
 void MPEG::Header::parse(const ByteVector &data)
 {
   if(data.size() < 4 || uchar(data[0]) != 0xff) {
-    debug("MPEG::Header::parse() -- First byte did not mactch MPEG synch.");
+    debug("MPEG::Header::parse() -- First byte did not match MPEG synch.");
     return;
   }
 
@@ -173,7 +173,7 @@
   // Check for the second byte's part of the MPEG synch
 
   if(!flags[23] || !flags[22] || !flags[21]) {
-    debug("MPEG::Header::parse() -- Second byte did not mactch MPEG synch.");
+    debug("MPEG::Header::parse() -- Second byte did not match MPEG synch.");
     return;
   }
 
diff -Nur taglib-1.5-orig/taglib/mpeg/mpegproperties.cpp taglib-1.5-1.6/taglib/mpeg/mpegproperties.cpp
--- taglib-1.5-orig/taglib/mpeg/mpegproperties.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/mpegproperties.cpp	2009-09-14 18:56:05.104764564 +0200
@@ -218,8 +218,10 @@
       double timePerFrame =
         double(firstHeader.samplesPerFrame()) / firstHeader.sampleRate();
 
-      d->length = int(timePerFrame * d->xingHeader->totalFrames());
-      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / d->length / 1000 : 0;
+      double length = timePerFrame * d->xingHeader->totalFrames();
+
+      d->length = int(length);
+      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / length / 1000 : 0;
   }
   else {
     // Since there was no valid Xing header found, we hope that we're in a constant

taglib-1.5-1.6-ogg.patch:
 oggfile.cpp     |  101 ++++++++++++++++++++++++++++++++++++++++++++++++--
 oggpage.cpp     |  112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 oggpage.h       |    8 ++++
 xiphcomment.cpp |   18 ++++++---
 4 files changed, 214 insertions(+), 25 deletions(-)

--- NEW FILE taglib-1.5-1.6-ogg.patch ---
diff -Nur taglib-1.5-orig/taglib/ogg/oggfile.cpp taglib-1.5-1.6/taglib/ogg/oggfile.cpp
--- taglib-1.5-orig/taglib/ogg/oggfile.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/oggfile.cpp	2009-09-04 10:50:24.000000000 +0200
@@ -270,11 +270,28 @@
   return true;
 }
 
-void Ogg::File::writePageGroup(const List<int> &pageGroup)
+void Ogg::File::writePageGroup(const List<int> &thePageGroup)
 {
-  if(pageGroup.isEmpty())
+  if(thePageGroup.isEmpty())
     return;
 
+
+  // pages in the pageGroup and packets must be equivalent 
+  // (originalSize and size of packets would not work together), 
+  // therefore we sometimes have to add pages to the group
+  List<int> pageGroup(thePageGroup);
+  while (!d->pages[pageGroup.back()]->header()->lastPacketCompleted()) {
+    if (d->currentPage->header()->pageSequenceNumber() == pageGroup.back()) {
+      if (nextPage() == false) {
+        debug("broken ogg file");
+        return;
+      }
+      pageGroup.append(d->currentPage->header()->pageSequenceNumber());
+    } else {
+      pageGroup.append(pageGroup.back() + 1);
+    }
+  }
+
   ByteVectorList packets;
 
   // If the first page of the group isn't dirty, append its partial content here.
@@ -313,6 +330,52 @@
                                       d->streamSerialNumber, pageGroup.front(),
                                       continued, completed);
 
+  List<Page *> renumberedPages;
+
+  // Correct the page numbering of following pages
+
+  if (pages.back()->header()->pageSequenceNumber() != pageGroup.back()) {
+
+    // TODO: change the internal data structure so that we don't need to hold the 
+    // complete file in memory (is unavoidable at the moment)
+
+    // read the complete stream
+    while(!d->currentPage->header()->lastPageOfStream()) {
+      if(nextPage() == false) {
+        debug("broken ogg file");
+        break;
+      }
+    }
+
+    // create a gap for the new pages
+    int numberOfNewPages = pages.back()->header()->pageSequenceNumber() - pageGroup.back();
+    List<Page *>::Iterator pageIter = d->pages.begin();
+    for(int i = 0; i < pageGroup.back(); i++) {
+      if(pageIter != d->pages.end()) {
+        ++pageIter;
+      }
+      else {
+        debug("Ogg::File::writePageGroup() -- Page sequence is broken in original file.");
+        break;
+      }
+    }
+
+    ++pageIter;
+    for(; pageIter != d->pages.end(); ++pageIter) {
+      Ogg::Page *newPage =
+        (*pageIter)->getCopyWithNewPageSequenceNumber(
+            (*pageIter)->header()->pageSequenceNumber() + numberOfNewPages);
+
+      ByteVector data;
+      data.append(newPage->render());
+      insert(data, newPage->fileOffset(), data.size());
+
+      renumberedPages.append(newPage);
+    }
+  }
+
+  // insert the new data
+
   ByteVector data;
   for(List<Page *>::ConstIterator it = pages.begin(); it != pages.end(); ++it)
     data.append((*it)->render());
@@ -328,9 +391,37 @@
   // Update the page index to include the pages we just created and to delete the
   // old pages.
 
+  // First step: Pages that contain the comment data
+
   for(List<Page *>::ConstIterator it = pages.begin(); it != pages.end(); ++it) {
-    const int index = (*it)->header()->pageSequenceNumber();
-    delete d->pages[index];
-    d->pages[index] = *it;
+    const unsigned int index = (*it)->header()->pageSequenceNumber();
+    if(index < d->pages.size()) {
+      delete d->pages[index];
+      d->pages[index] = *it;
+    }
+    else if(index == d->pages.size()) {
+      d->pages.append(*it);
+    }
+    else {
+      // oops - there's a hole in the sequence
+      debug("Ogg::File::writePageGroup() -- Page sequence is broken.");
+    }
+  }
+
+  // Second step: the renumbered pages
+
+  for(List<Page *>::ConstIterator it = renumberedPages.begin(); it != renumberedPages.end(); ++it) {
+    const unsigned int index = (*it)->header()->pageSequenceNumber();
+    if(index < d->pages.size()) {
+      delete d->pages[index];
+      d->pages[index] = *it;
+    }
+    else if(index == d->pages.size()) {
+      d->pages.append(*it);
+    }
+    else {
+      // oops - there's a hole in the sequence
+      debug("Ogg::File::writePageGroup() -- Page sequence is broken.");
+    }
   }
 }
diff -Nur taglib-1.5-orig/taglib/ogg/oggpage.cpp taglib-1.5-1.6/taglib/ogg/oggpage.cpp
--- taglib-1.5-orig/taglib/ogg/oggpage.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/oggpage.cpp	2009-09-14 19:01:31.026763633 +0200
@@ -116,12 +116,14 @@
     flags = ContainsPacketFlags(flags | CompletePacket);
   }
 
-  // Or if the page is (a) the first page and it's complete or (b) the last page
-  // and it's complete or (c) a page in the middle.
-
-  else if((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
-          (flags & EndsWithPacket && d->header.lastPacketCompleted()) ||
-          (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket)))
+  // Or if there is more than one page and the page is 
+  // (a) the first page and it's complete or 
+  // (b) the last page and it's complete or 
+  // (c) a page in the middle.
+  else if(packetCount() > 1 &&
+          ((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
+           (flags & EndsWithPacket && d->header.lastPacketCompleted()) ||
+           (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket))))
   {
     flags = ContainsPacketFlags(flags | CompletePacket);
   }
@@ -208,20 +210,101 @@
   for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it)
     totalSize += (*it).size();
 
-  if(strategy == Repaginate || totalSize + packets.size() > 255 * 256) {
-    debug("Ogg::Page::paginate() -- Sorry!  Repagination is not yet implemented.");
-    return l;
-  }
+  // Handle creation of multiple pages with appropriate pagination.
+  if(strategy == Repaginate || totalSize + packets.size() > 255 * 255) {
 
-  // TODO: Handle creation of multiple pages here with appropriate pagination.
+    // SPLITSIZE must be a multiple of 255 in order to get the lacing values right
+    // create pages of about 8KB each
+#define SPLITSIZE (32*255)
+
+    int pageIndex = 0;
+
+    for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it) {
+      bool continued = false;
+
+      // mark very first packet?
+      if(firstPacketContinued && it==packets.begin()) {
+        continued = true;
+      }
+
+      // append to buf
+      ByteVector packetBuf;
+      packetBuf.append(*it);
+
+      while(packetBuf.size() > SPLITSIZE) {
+        // output a Page
+        ByteVector packetForOnePage;
+        packetForOnePage.resize(SPLITSIZE);
+        std::copy(packetBuf.begin(), packetBuf.begin() + SPLITSIZE, packetForOnePage.begin());
+
+        ByteVectorList packetList;
+        packetList.append(packetForOnePage);
+        Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued, false, false);
+        l.append(p);
+
+        pageIndex++;
+        continued = true;
+        packetBuf = packetBuf.mid(SPLITSIZE);
+      }
+
+      ByteVectorList::ConstIterator jt = it;
+      ++jt;
+      bool lastPacketInList = (jt == packets.end());
+
+      // output a page for the rest (we output one packet per page, so this one should be completed)
+      ByteVectorList packetList;
+      packetList.append(packetBuf);
+
+      bool isVeryLastPacket = false;
+      if(containsLastPacket) {
+        // mark the very last output page as last of stream
+        ByteVectorList::ConstIterator jt = it;
+        ++jt;
+        if(jt == packets.end()) {
+          isVeryLastPacket = true;
+        }
+      }
+
+      Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued,
+                         lastPacketInList ? lastPacketCompleted : true, 
+                         isVeryLastPacket);
+      pageIndex++;
 
-  Page *p = new Page(packets, streamSerialNumber, firstPage, firstPacketContinued,
-                     lastPacketCompleted, containsLastPacket);
-  l.append(p);
+      l.append(p);
+    }
+  }
+  else {
+    Page *p = new Page(packets, streamSerialNumber, firstPage, firstPacketContinued,
+                       lastPacketCompleted, containsLastPacket);
+    l.append(p);
+  }
 
   return l;
 }
 
+Ogg::Page* Ogg::Page::getCopyWithNewPageSequenceNumber(int sequenceNumber)
+{
+  Page *pResultPage = NULL;
+
+  // TODO: a copy constructor would be helpful
+
+  if(d->file == 0) {
+    pResultPage = new Page(
+        d->packets,
+        d->header.streamSerialNumber(),
+        sequenceNumber,
+        d->header.firstPacketContinued(),
+        d->header.lastPacketCompleted(),
+        d->header.lastPageOfStream());
+  }
+  else
+  {
+    pResultPage = new Page(d->file, d->fileOffset);
+    pResultPage->d->header.setPageSequenceNumber(sequenceNumber);
+  }
+  return pResultPage;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -254,3 +337,4 @@
   d->packets = packets;
   d->header.setPacketSizes(packetSizes);
 }
+
diff -Nur taglib-1.5-orig/taglib/ogg/oggpage.h taglib-1.5-1.6/taglib/ogg/oggpage.h
--- taglib-1.5-orig/taglib/ogg/oggpage.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/oggpage.h	2009-09-14 19:01:31.031764764 +0200
@@ -70,6 +70,14 @@
        */
       const PageHeader *header() const;
 
+      /*! 
+       * Returns a copy of the page with \a sequenceNumber set as sequence number.
+       * 
+       * \see header()
+       * \see PageHeader::setPageSequenceNumber()
+       */
+      Page* getCopyWithNewPageSequenceNumber(int sequenceNumber);
+
       /*!
        * Returns the index of the first packet wholly or partially contained in
        * this page.
diff -Nur taglib-1.5-orig/taglib/ogg/xiphcomment.cpp taglib-1.5-1.6/taglib/ogg/xiphcomment.cpp
--- taglib-1.5-orig/taglib/ogg/xiphcomment.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/xiphcomment.cpp	2009-09-14 19:01:31.011763641 +0200
@@ -103,16 +103,20 @@
 
 TagLib::uint Ogg::XiphComment::year() const
 {
-  if(d->fieldListMap["DATE"].isEmpty())
-    return 0;
-  return d->fieldListMap["DATE"].front().toInt();
+  if(!d->fieldListMap["DATE"].isEmpty())
+    return d->fieldListMap["DATE"].front().toInt();
+  if(!d->fieldListMap["YEAR"].isEmpty())
+    return d->fieldListMap["YEAR"].front().toInt();
+  return 0;
 }
 
 TagLib::uint Ogg::XiphComment::track() const
 {
-  if(d->fieldListMap["TRACKNUMBER"].isEmpty())
-    return 0;
-  return d->fieldListMap["TRACKNUMBER"].front().toInt();
+  if(!d->fieldListMap["TRACKNUMBER"].isEmpty())
+    return d->fieldListMap["TRACKNUMBER"].front().toInt();
+  if(!d->fieldListMap["TRACKNUM"].isEmpty())
+    return d->fieldListMap["TRACKNUM"].front().toInt();
+  return 0;
 }
 
 void Ogg::XiphComment::setTitle(const String &s)
@@ -142,6 +146,7 @@
 
 void Ogg::XiphComment::setYear(uint i)
 {
+  removeField("YEAR");
   if(i == 0)
     removeField("DATE");
   else
@@ -150,6 +155,7 @@
 
 void Ogg::XiphComment::setTrack(uint i)
 {
+  removeField("TRACKNUM");
   if(i == 0)
     removeField("TRACKNUMBER");
   else

taglib-1.5-1.6-toolkit.patch:
 taglib-1.5/taglib/toolkit/tstring.cpp     |    6 +++++-
 taglib-1.5/taglib/toolkit/tstring.h       |    2 +-
 taglib/taglib/toolkit/tbytevector.cpp     |    4 ++--
 taglib/taglib/toolkit/tbytevector.h       |    2 +-
 taglib/taglib/toolkit/tbytevectorlist.cpp |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE taglib-1.5-1.6-toolkit.patch ---
diff -Nur taglib-1.5/taglib/toolkit/tbytevector.cpp taglib/taglib/toolkit/tbytevector.cpp
--- taglib-1.5/taglib/toolkit/tbytevector.cpp	2008-02-12 04:18:52.000000000 +0100
+++ taglib/taglib/toolkit/tbytevector.cpp	2008-12-04 13:37:36.000000000 +0100
@@ -147,12 +147,12 @@
   public:
     ByteVectorMirror(const ByteVector &source) : v(source) {}
 
-    const char operator[](int index) const
+    char operator[](int index) const
     {
       return v[v.size() - index - 1];
     }
 
-    const char at(int index) const
+    char at(int index) const
     {
       return v.at(v.size() - index - 1);
     }
diff -Nur taglib-1.5/taglib/toolkit/tbytevector.h taglib/taglib/toolkit/tbytevector.h
--- taglib-1.5/taglib/toolkit/tbytevector.h	2008-02-05 19:51:48.000000000 +0100
+++ taglib/taglib/toolkit/tbytevector.h	2009-07-02 22:54:32.000000000 +0200
@@ -30,7 +30,7 @@
 #include "taglib_export.h"
 
 #include <vector>
-#include <ostream>
+#include <iostream>
 
 namespace TagLib {
 
diff -Nur taglib-1.5/taglib/toolkit/tbytevectorlist.cpp taglib/taglib/toolkit/tbytevectorlist.cpp
--- taglib-1.5/taglib/toolkit/tbytevectorlist.cpp	2008-02-04 16:14:45.000000000 +0100
+++ taglib/taglib/toolkit/tbytevectorlist.cpp	2009-07-11 15:24:21.000000000 +0200
@@ -52,7 +52,7 @@
       offset != -1 && (max == 0 || max > int(l.size()) + 1);
       offset = v.find(pattern, offset + pattern.size(), byteAlign))
   {
-    if(offset - previousOffset > 1)
+    if(offset - previousOffset >= 1)
       l.append(v.mid(previousOffset, offset - previousOffset));
     else
       l.append(ByteVector::null);
diff -Nur taglib-1.5-orig/taglib/toolkit/tstring.cpp taglib-1.5/taglib/toolkit/tstring.cpp
--- taglib-1.5-orig/taglib/toolkit/tstring.cpp	2008-02-04 16:14:45.000000000 +0100
+++ taglib-1.5/taglib/toolkit/tstring.cpp	2009-09-04 12:07:00.506121756 +0200
@@ -35,7 +35,7 @@
 
   inline unsigned short byteSwap(unsigned short x)
   {
-    return ((x) >> 8) & 0xff | ((x) & 0xff) << 8;
+    return (((x) >> 8) & 0xff) | (((x) & 0xff) << 8);
   }
 
   inline unsigned short combine(unsigned char c1, unsigned char c2)
@@ -510,6 +510,8 @@
 
 TagLib::wchar &String::operator[](int i)
 {
+  detach();
+
   return d->data[i];
 }
 
@@ -558,6 +560,8 @@
 
 String &String::operator+=(char c)
 {
+  detach();
+
   d->data += uchar(c);
   return *this;
 }
diff -Nur taglib-1.5-orig/taglib/toolkit/tstring.h taglib-1.5/taglib/toolkit/tstring.h
--- taglib-1.5-orig/taglib/toolkit/tstring.h	2008-02-04 16:14:45.000000000 +0100
+++ taglib-1.5/taglib/toolkit/tstring.h	2009-09-04 12:07:03.465121011 +0200
@@ -31,7 +31,7 @@
 #include "tbytevector.h"
 
 #include <string>
-#include <ostream>
+#include <iostream>
 
 /*!
  * \relates TagLib::String

taglib-1.5-tests.patch:
 test_string.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE taglib-1.5-tests.patch ---
diff -Nur taglib-1.5-orig/tests/test_string.cpp taglib-1.5/tests/test_string.cpp
--- taglib-1.5-orig/tests/test_string.cpp	2008-01-26 11:57:06.000000000 +0100
+++ taglib-1.5/tests/test_string.cpp	2009-08-22 11:17:55.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <tstring.h>
+#include <cstring>
 
 using namespace std;
 using namespace TagLib;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Sep 2009 08:02:05 -0000	1.12
+++ .cvsignore	14 Sep 2009 17:09:36 -0000	1.13
@@ -1 +1 @@
-taglib-1.6.tar.gz
+taglib-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Sep 2009 08:02:05 -0000	1.12
+++ sources	14 Sep 2009 17:09:36 -0000	1.13
@@ -1 +1 @@
-5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz
+7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/taglib.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- taglib.spec	14 Sep 2009 13:13:25 -0000	1.34
+++ taglib.spec	14 Sep 2009 17:09:37 -0000	1.35
@@ -11,16 +11,14 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.6
-Release:    1%{?dist}
+Version:    1.5
+Release:    9%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-# the temporary url from the 1.6 announcement
-Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
-#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -32,7 +30,15 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.6-test_mp4.patch
+Patch3: taglib-1.5-tests.patch
+
+## upstream patches
+Patch101: taglib-1.5-1.6-ape.patch
+Patch102: taglib-1.5-1.6-ogg.patch
+Patch103: taglib-1.5-1.6-flac.patch
+Patch104: taglib-1.5-1.6-toolkit.patch
+Patch105: taglib-1.5-1.6-mpeg.patch
+Patch106: taglib-1.5-1.6-mpeg-cmake.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig
@@ -86,13 +92,19 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .test_mp4
+%patch3 -p1 -b .tests
+%patch101 -p1 -b .ape
+%patch102 -p1 -b .ogg
+%patch103 -p1 -b .flac
+%patch104 -p1 -b .toolkit
+%patch105 -p1 -b .mpeg
+%patch106 -p1 -b .mpeg-build
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
+%{cmake} %{?buildtests} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -159,13 +171,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
-- Add patch to fix MP4 test on ppc/ppc64.
-- Update to 1.6 final.
-
-* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
-- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
-- Build optional support for MP4 and ASF/WMA files.
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-9
+- Merge minor changes in id3v2/ogg from 1.6 final.
 
 * Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
 - Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and


--- taglib-1.6-test_mp4.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Sep 14 17:09:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 14 Sep 2009 17:09:38 +0000 (UTC)
Subject: rpms/taglib/F-10 taglib-1.5-1.6-ape.patch, NONE,
	1.1 taglib-1.5-1.6-flac.patch, NONE,
	1.1 taglib-1.5-1.6-mpeg-cmake.patch, NONE,
	1.1 taglib-1.5-1.6-mpeg.patch, NONE,
	1.1 taglib-1.5-1.6-ogg.patch, NONE,
	1.1 taglib-1.5-1.6-toolkit.patch, NONE,
	1.1 taglib-1.5-tests.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 taglib.spec, 1.32,
	1.33 taglib-1.6-test_mp4.patch, 1.1, NONE
Message-ID: <20090914170938.ACDFF11C00EC@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14180/F-10

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib-1.5-tests.patch 
Removed Files:
	taglib-1.6-test_mp4.patch 
Log Message:
resurrect taglib 1.5 with bug-fixes from 1.6

taglib-1.5-1.6-ape.patch:
 apeitem.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE taglib-1.5-1.6-ape.patch ---
diff -Nur taglib-1.5/taglib/ape/apeitem.cpp taglib/taglib/ape/apeitem.cpp
--- taglib-1.5/taglib/ape/apeitem.cpp	2008-02-12 17:30:25.000000000 +0100
+++ taglib/taglib/ape/apeitem.cpp	2009-01-11 00:15:33.000000000 +0100
@@ -160,14 +160,14 @@
 bool APE::Item::isEmpty() const
 {
   switch(d->type) {
-    case 0:
-    case 1:
+    case Text:
+    case Binary:
       if(d->text.isEmpty())
         return true;
       if(d->text.size() == 1 && d->text.front().isEmpty())
         return true;
       return false;
-    case 2:
+    case Locator:
       return d->value.isEmpty();
     default:
       return false;
@@ -206,8 +206,9 @@
   if(isEmpty())
     return data;
 
-  if(d->type != Item::Binary) {
+  if(d->type == Text) {
     StringList::ConstIterator it = d->text.begin();
+
     value.append(it->data(String::UTF8));
     it++;
     for(; it != d->text.end(); ++it) {

taglib-1.5-1.6-flac.patch:
 flacfile.cpp       |   83 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 flacfile.h         |    1 
 flacproperties.cpp |    2 -
 3 files changed, 78 insertions(+), 8 deletions(-)

--- NEW FILE taglib-1.5-1.6-flac.patch ---
diff -Nur taglib-1.5/taglib/flac/flacfile.cpp taglib/taglib/flac/flacfile.cpp
--- taglib-1.5/taglib/flac/flacfile.cpp	2008-01-31 06:19:03.000000000 +0100
+++ taglib/taglib/flac/flacfile.cpp	2009-07-12 23:53:18.000000000 +0200
@@ -42,6 +42,7 @@
 {
   enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 };
   enum { StreamInfo = 0, Padding, Application, SeekTable, VorbisComment, CueSheet };
+  enum { MinPaddingLength = 4096 };
 }
 
 class FLAC::File::FilePrivate
@@ -167,9 +168,49 @@
       uint blockLength = header.mid(1, 3).toUInt();
 
       if(blockType == VorbisComment) {
-        data[0] = header[0];
-        insert(data, nextBlockOffset, blockLength + 4);
-        break;
+
+        long paddingBreak = 0;
+
+        if(!isLastBlock) {
+          paddingBreak = findPaddingBreak(nextBlockOffset + blockLength + 4,
+                                          nextBlockOffset + d->xiphCommentData.size() + 8,
+                                          &isLastBlock);
+        }
+
+        uint paddingLength = 0;
+
+         if(paddingBreak) {
+
+           // There is space for comment and padding blocks without rewriting the
+           // whole file.  Note: This cannot overflow.
+
+           paddingLength = paddingBreak - (nextBlockOffset + d->xiphCommentData.size() + 8);
+         }
+         else {
+
+           // Not enough space, so we will have to rewrite the whole file
+           // following this block
+
+           paddingLength = d->xiphCommentData.size();
+
+           if(paddingLength < MinPaddingLength)
+             paddingLength = MinPaddingLength;
+
+           paddingBreak = nextBlockOffset + blockLength + 4;
+         }
+
+         ByteVector padding = ByteVector::fromUInt(paddingLength);
+
+         padding[0] = 1;
+
+         if(isLastBlock)
+           padding[0] |= 0x80;
+
+         padding.resize(paddingLength + 4);
+         ByteVector pair(data);
+         pair.append(padding);
+         insert(pair, nextBlockOffset, paddingBreak - nextBlockOffset);
+         break;
       }
 
       nextBlockOffset += blockLength + 4;
@@ -373,11 +414,8 @@
     isLastBlock = (header[0] & 0x80) != 0;
     length = header.mid(1, 3).toUInt();
 
-    if(blockType == Padding) {
-      // debug("FLAC::File::scan() -- Padding found");
-    }
     // Found the vorbis-comment
-    else if(blockType == VorbisComment) {
+    if(blockType == VorbisComment) {
       d->xiphCommentData = readBlock(length);
       d->hasXiphComment = true;
     }
@@ -429,3 +467,34 @@
 
   return -1;
 }
+
+long FLAC::File::findPaddingBreak(long nextBlockOffset, long targetOffset, bool *isLast)
+{
+  // Starting from nextBlockOffset, step over padding blocks to find the
+  // address of a block which is after targetOffset. Return zero if
+  // a non-padding block occurs before that point.
+
+  while(true) {
+    seek(nextBlockOffset);
+
+    ByteVector header = readBlock(4);
+    char blockType = header[0] & 0x7f;
+    bool isLastBlock = header[0] & 0x80;
+    uint length = header.mid(1, 3).toUInt();
+
+    if(blockType != Padding)
+      break;
+
+    nextBlockOffset += 4 + length;
+
+    if(nextBlockOffset >= targetOffset) {
+      *isLast = isLastBlock;
+      return nextBlockOffset;
+    }
+
+    if(isLastBlock)
+      break;
+  }
+
+  return 0;
+}
diff -Nur taglib-1.5/taglib/flac/flacfile.h taglib/taglib/flac/flacfile.h
--- taglib-1.5/taglib/flac/flacfile.h	2008-01-31 05:07:29.000000000 +0100
+++ taglib/taglib/flac/flacfile.h	2009-07-12 23:53:18.000000000 +0200
@@ -191,6 +191,7 @@
       long findID3v2();
       long findID3v1();
       ByteVector xiphCommentData() const;
+      long findPaddingBreak(long nextPageOffset, long targetOffset, bool *isLast);
 
       class FilePrivate;
       FilePrivate *d;
diff -Nur taglib-1.5/taglib/flac/flacproperties.cpp taglib/taglib/flac/flacproperties.cpp
--- taglib-1.5/taglib/flac/flacproperties.cpp	2008-01-11 01:55:09.000000000 +0100
+++ taglib/taglib/flac/flacproperties.cpp	2008-04-08 14:15:20.000000000 +0200
@@ -146,5 +146,5 @@
 
   // Real bitrate:
 
-  d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
+  d->bitrate = d->length > 0 ? ((d->streamLength * 8UL) / d->length) / 1000 : 0;
 }

taglib-1.5-1.6-mpeg-cmake.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE taglib-1.5-1.6-mpeg-cmake.patch ---
diff -Nur taglib-1.5-orig/taglib/CMakeLists.txt taglib-1.5/taglib/CMakeLists.txt
--- taglib-1.5-orig/taglib/CMakeLists.txt	2008-02-12 05:15:20.000000000 +0100
+++ taglib-1.5/taglib/CMakeLists.txt	2009-08-22 12:18:40.000000000 +0200
@@ -62,6 +62,8 @@
 mpeg/id3v2/frames/attachedpictureframe.cpp
 mpeg/id3v2/frames/commentsframe.cpp
 mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
+mpeg/id3v2/frames/popularimeterframe.cpp
+mpeg/id3v2/frames/privateframe.cpp
 mpeg/id3v2/frames/relativevolumeframe.cpp
 mpeg/id3v2/frames/textidentificationframe.cpp
 mpeg/id3v2/frames/uniquefileidentifierframe.cpp

taglib-1.5-1.6-mpeg.patch:
 id3v2/frames/CMakeLists.txt                   |    2 
 id3v2/frames/Makefile.am                      |    4 
 id3v2/frames/attachedpictureframe.cpp         |   56 ++++++++++
 id3v2/frames/attachedpictureframe.h           |   16 ++-
 id3v2/frames/generalencapsulatedobjectframe.h |    4 
 id3v2/frames/popularimeterframe.cpp           |  137 ++++++++++++++++++++++++++
 id3v2/frames/popularimeterframe.h             |  132 +++++++++++++++++++++++++
 id3v2/frames/privateframe.cpp                 |  128 ++++++++++++++++++++++++
 id3v2/frames/privateframe.h                   |  111 +++++++++++++++++++++
 id3v2/id3v2footer.cpp                         |    2 
 id3v2/id3v2footer.h                           |    2 
 id3v2/id3v2framefactory.cpp                   |   63 ++++++++---
 id3v2/id3v2tag.cpp                            |   12 ++
 mpegheader.cpp                                |    4 
 mpegproperties.cpp                            |    6 -
 15 files changed, 649 insertions(+), 30 deletions(-)

--- NEW FILE taglib-1.5-1.6-mpeg.patch ---
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp	2009-09-04 10:50:24.000000000 +0200
@@ -50,7 +50,7 @@
 
 AttachedPictureFrame::AttachedPictureFrame() : Frame("APIC")
 {
-    d = new AttachedPictureFramePrivate;
+  d = new AttachedPictureFramePrivate;
 }
 
 AttachedPictureFrame::AttachedPictureFrame(const ByteVector &data) : Frame(data)
@@ -136,6 +136,12 @@
   int pos = 1;
 
   d->mimeType = readStringField(data, String::Latin1, &pos);
+  /* Now we need at least two more bytes available */	
+  if (uint(pos) + 1 >= data.size()) {
+    debug("Truncated picture frame.");
+    return;
+  }
+
   d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
   d->description = readStringField(data, d->textEncoding, &pos);
 
@@ -168,3 +174,51 @@
   d = new AttachedPictureFramePrivate;
   parseFields(fieldData(data));
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// support for ID3v2.2 PIC frames
+////////////////////////////////////////////////////////////////////////////////
+
+void AttachedPictureFrameV22::parseFields(const ByteVector &data)
+{
+  if(data.size() < 5) {
+    debug("A picture frame must contain at least 5 bytes.");
+    return;
+  }
+
+  d->textEncoding = String::Type(data[0]);
+
+  int pos = 1;
+
+  String fixedString = String(data.mid(pos, 3), String::Latin1);
+  pos += 3;
+  // convert fixed string image type to mime string
+  if (fixedString.upper() == "JPG") {
+    d->mimeType = "image/jpeg";
+  } else if (fixedString.upper() == "PNG") {
+    d->mimeType = "image/png";
+  } else {
+    debug("probably unsupported image type");
+    d->mimeType = "image/" + fixedString;
+  }
+
+  d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+  d->description = readStringField(data, d->textEncoding, &pos);
+
+  d->data = data.mid(pos);
+}
+
+AttachedPictureFrameV22::AttachedPictureFrameV22(const ByteVector &data, Header *h)
+{
+  d = new AttachedPictureFramePrivate;
+
+  // set v2.2 header to make fieldData work correctly
+  setHeader(h, true);
+
+  parseFields(fieldData(data));
+
+  // now set the v2.4 header
+  Frame::Header *newHeader = new Frame::Header("APIC");
+  newHeader->setFrameSize(h->frameSize());
+  setHeader(newHeader, false);
+}
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/attachedpictureframe.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/attachedpictureframe.h	2009-09-14 18:56:05.113767634 +0200
@@ -205,14 +205,24 @@
     protected:
       virtual void parseFields(const ByteVector &data);
       virtual ByteVector renderFields() const;
+      class AttachedPictureFramePrivate;
+      AttachedPictureFramePrivate *d;
 
     private:
-      AttachedPictureFrame(const ByteVector &data, Header *h);
       AttachedPictureFrame(const AttachedPictureFrame &);
       AttachedPictureFrame &operator=(const AttachedPictureFrame &);
+      AttachedPictureFrame(const ByteVector &data, Header *h);
 
-      class AttachedPictureFramePrivate;
-      AttachedPictureFramePrivate *d;
+    };
+
+    //! support for ID3v2.2 PIC frames
+    class TAGLIB_EXPORT AttachedPictureFrameV22 : public AttachedPictureFrame
+    {
+    protected:
+      virtual void parseFields(const ByteVector &data);
+    private:
+      AttachedPictureFrameV22(const ByteVector &data, Header *h);
+      friend class FrameFactory;
     };
   }
 }
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/CMakeLists.txt taglib-1.5-1.6/taglib/mpeg/id3v2/frames/CMakeLists.txt
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/CMakeLists.txt	2008-01-31 22:48:39.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/CMakeLists.txt	2009-09-14 18:56:05.119755592 +0200
@@ -2,6 +2,8 @@
 	attachedpictureframe.h
 	commentsframe.h
 	generalencapsulatedobjectframe.h
+	popularimeterframe.h
+	privateframe.h
 	relativevolumeframe.h
 	textidentificationframe.h
 	uniquefileidentifierframe.h
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h	2009-09-14 18:56:05.126760312 +0200
@@ -61,6 +61,10 @@
 
       /*!
        * Constructs a GeneralEncapsulatedObjectFrame frame based on \a data.
+       *
+       * \warning This is \em not data for the encapsulated object, for that use
+       * setObject().  This constructor is used when reading the frame from the
+       * disk.
        */
       explicit GeneralEncapsulatedObjectFrame(const ByteVector &data);
 
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/Makefile.am taglib-1.5-1.6/taglib/mpeg/id3v2/frames/Makefile.am
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/Makefile.am	2008-01-31 22:48:28.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/Makefile.am	2009-09-14 18:56:05.132766369 +0200
@@ -10,6 +10,8 @@
 	attachedpictureframe.cpp \
 	commentsframe.cpp \
 	generalencapsulatedobjectframe.cpp \
+	popularimeterframe.cpp \
+	privateframe.cpp \
 	relativevolumeframe.cpp \
 	textidentificationframe.cpp \
 	uniquefileidentifierframe.cpp \
@@ -21,6 +23,8 @@
 	attachedpictureframe.h \
 	commentsframe.h \
 	generalencapsulatedobjectframe.h \
+	popularimeterframe.h \
+	privateframe.h \
 	relativevolumeframe.h \
 	textidentificationframe.h \
 	uniquefileidentifierframe.h \
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.cpp	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.cpp	2009-09-14 18:56:05.139766543 +0200
@@ -0,0 +1,137 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Lukas Lalinsky
+    email                : lalinsky at gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tdebug.h>
+
+#include "popularimeterframe.h"
+
+using namespace TagLib;
+using namespace ID3v2;
+
+class PopularimeterFrame::PopularimeterFramePrivate
+{
+public:
+  PopularimeterFramePrivate() : rating(0), counter(0) {}
+  String email;
+  int rating;
+  TagLib::uint counter;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+PopularimeterFrame::PopularimeterFrame() : Frame("POPM")
+{
+  d = new PopularimeterFramePrivate;
+}
+
+PopularimeterFrame::PopularimeterFrame(const ByteVector &data) : Frame(data)
+{
+  d = new PopularimeterFramePrivate;
+  setData(data);
+}
+
+PopularimeterFrame::~PopularimeterFrame()
+{
+  delete d;
+}
+
+String PopularimeterFrame::toString() const
+{
+  return d->email + " rating=" + String::number(d->rating) + " counter=" + String::number(d->counter);
+}
+
+String PopularimeterFrame::email() const
+{
+  return d->email;
+}
+
+void PopularimeterFrame::setEmail(const String &s)
+{
+  d->email = s;
+}
+
+int PopularimeterFrame::rating() const
+{
+  return d->rating;
+}
+
+void PopularimeterFrame::setRating(int s)
+{
+  d->rating = s;
+}
+
+TagLib::uint PopularimeterFrame::counter() const
+{
+  return d->counter;
+}
+
+void PopularimeterFrame::setCounter(TagLib::uint s)
+{
+  d->counter = s;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+void PopularimeterFrame::parseFields(const ByteVector &data)
+{
+  int pos = 0, size = int(data.size());
+
+  d->email = readStringField(data, String::Latin1, &pos);
+
+  d->rating = 0;
+  d->counter = 0;
+  if(pos < size) {
+    d->rating = (unsigned char)(data[pos++]);
+    if(pos < size) {
+      d->counter = data.mid(pos, 4).toUInt();
+    }
+  }
+}
+
+ByteVector PopularimeterFrame::renderFields() const
+{
+  ByteVector data;
+
+  data.append(d->email.data(String::Latin1));
+  data.append(textDelimiter(String::Latin1));
+  data.append(char(d->rating));
+  data.append(ByteVector::fromUInt(d->counter));
+
+  return data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+PopularimeterFrame::PopularimeterFrame(const ByteVector &data, Header *h) : Frame(h)
+{
+  d = new PopularimeterFramePrivate;
+  parseFields(fieldData(data));
+}
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/popularimeterframe.h	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/popularimeterframe.h	2009-09-14 18:56:05.140768942 +0200
@@ -0,0 +1,132 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Lukas Lalinsky
+    email                : lalinsky at gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_POPULARIMETERFRAME_H
+#define TAGLIB_POPULARIMETERFRAME_H
+
+#include <id3v2frame.h>
+#include "taglib_export.h"
+
+namespace TagLib {
+
+  namespace ID3v2 {
+
+    //! An implementation of ID3v2 "popularimeter"
+
+    /*!
+     * This implements the ID3v2 popularimeter (POPM frame).  It concists of
+     * an email, a rating and an optional counter.
+     */
+
+    class TAGLIB_EXPORT PopularimeterFrame : public Frame
+    {
+      friend class FrameFactory;
+
+    public:
+      /*!
+       * Construct an empty popularimeter frame.
+       */
+      explicit PopularimeterFrame();
+
+      /*!
+       * Construct a popularimeter based on the data in \a data.
+       */
+      explicit PopularimeterFrame(const ByteVector &data);
+
+      /*!
+       * Destroys this PopularimeterFrame instance.
+       */
+      virtual ~PopularimeterFrame();
+
+      /*!
+       * Returns the text of this popularimeter.
+       *
+       * \see text()
+       */
+      virtual String toString() const;
+
+      /*!
+       * Returns the email.
+       *
+       * \see setEmail()
+       */
+      String email() const;
+
+      /*!
+       * Set the email.
+       *
+       * \see email()
+       */
+      void setEmail(const String &email);
+
+      /*!
+       * Returns the rating.
+       *
+       * \see setRating()
+       */
+      int rating() const;
+
+      /*!
+       * Set the rating.
+       *
+       * \see rating()
+       */
+      void setRating(int rating);
+
+      /*!
+       * Returns the counter.
+       *
+       * \see setCounter()
+       */
+      uint counter() const;
+
+      /*!
+       * Set the counter.
+       *
+       * \see counter()
+       */
+      void setCounter(uint counter);
+
+    protected:
+      // Reimplementations.
+
+      virtual void parseFields(const ByteVector &data);
+      virtual ByteVector renderFields() const;
+
+    private:
+      /*!
+       * The constructor used by the FrameFactory.
+       */
+      PopularimeterFrame(const ByteVector &data, Header *h);
+      PopularimeterFrame(const PopularimeterFrame &);
+      PopularimeterFrame &operator=(const PopularimeterFrame &);
+
+      class PopularimeterFramePrivate;
+      PopularimeterFramePrivate *d;
+    };
+
+  }
+}
+#endif
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.cpp	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.cpp	2009-09-14 18:56:05.142767428 +0200
@@ -0,0 +1,128 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Serkan Kalyoncu
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler at kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tbytevectorlist.h>
+#include <id3v2tag.h>
+#include <tdebug.h>
+
+#include "privateframe.h"
+
+using namespace TagLib;
+using namespace ID3v2;
+
+
+class PrivateFrame::PrivateFramePrivate
+{
+public:
+  ByteVector data;
+  String owner;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+PrivateFrame::PrivateFrame() : Frame("PRIV")
+{
+  d = new PrivateFramePrivate;
+}
+
+PrivateFrame::PrivateFrame(const ByteVector &data) : Frame(data)
+{
+  d = new PrivateFramePrivate;
+  setData(data);
+}
+
+PrivateFrame::~PrivateFrame()
+{
+  delete d;
+}
+
+String PrivateFrame::toString() const
+{
+  return d->owner;
+}
+
+String PrivateFrame::owner() const
+{
+  return d->owner;
+}
+
+ByteVector PrivateFrame::data() const
+{
+  return d->data;
+}
+
+void PrivateFrame::setOwner(const String &s)
+{
+  d->owner = s;
+}
+
+void PrivateFrame::setData(const ByteVector & data)
+{
+  d->data = data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+void PrivateFrame::parseFields(const ByteVector &data)
+{
+  if(data.size() < 2) {
+    debug("A private frame must contain at least 2 bytes.");
+    return;
+  }
+
+  // Owner identifier is assumed to be Latin1
+  
+  const int byteAlign =  1;
+  const int endOfOwner = data.find(textDelimiter(String::Latin1), 0, byteAlign);
+
+  d->owner =  String(data.mid(0, endOfOwner));
+  d->data = data.mid(endOfOwner + 1);
+}
+
+ByteVector PrivateFrame::renderFields() const
+{
+  ByteVector v;
+
+  v.append(d->owner.data(String::Latin1));
+  v.append(textDelimiter(String::Latin1));
+  v.append(d->data);
+
+  return v;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+PrivateFrame::PrivateFrame(const ByteVector &data, Header *h) : Frame(h)
+{
+  d = new PrivateFramePrivate();
+  parseFields(fieldData(data));
+}
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.h taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/frames/privateframe.h	1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/frames/privateframe.h	2009-09-14 18:56:05.143769445 +0200
@@ -0,0 +1,111 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Serkan Kalyoncu
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler at kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This 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 this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_PRIVATEFRAME_H
+#define TAGLIB_PRIVATEFRAME_H
+
+#include "id3v2frame.h"
+#include "taglib_export.h"
+
+namespace TagLib {
+
+  namespace ID3v2 {
+
+    //! An implementation of ID3v2 privateframe
+
+    class TAGLIB_EXPORT PrivateFrame : public Frame
+    {
+      friend class FrameFactory;
+
+    public:
+      /*!
+       * Construct an empty private frame.
+       */
+      PrivateFrame();
+
+      /*!
+       * Construct a private frame based on the data in \a data.
+       *
+       * \note This is the constructor used when parsing the frame from a file.
+       */
+      explicit PrivateFrame(const ByteVector &data);
+
+      /*!
+       * Destroys this private frame instance.
+       */
+      virtual ~PrivateFrame();
+
+      /*!
+       * Returns the text of this private frame, currently just the owner.
+       *
+       * \see text()
+       */
+      virtual String toString() const;
+
+      /*!
+       * \return The owner of the private frame.
+       * \note This should contain an email address or link to a website.
+       */
+      String owner() const;
+
+      /*!
+       *
+       */
+      ByteVector data() const;
+
+      /*!
+       * Sets the owner of the frame to \a s.
+       * \note This should contain an email address or link to a website.
+       */
+      void setOwner(const String &s);
+
+      /*!
+       *
+       */
+      void setData(const ByteVector &v);
+
+    protected:
+      // Reimplementations.
+
+      virtual void parseFields(const ByteVector &data);
+      virtual ByteVector renderFields() const;
+
+    private:
+      /*!
+       * The constructor used by the FrameFactory.
+       */
+      PrivateFrame(const ByteVector &data, Header *h);
+
+      PrivateFrame(const PrivateFrame &);
+      PrivateFrame &operator=(const PrivateFrame &);
+
+      class PrivateFramePrivate;
+      PrivateFramePrivate *d;
+    };
+
+  }
+}
+#endif
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.cpp	2009-09-14 18:56:05.144768996 +0200
@@ -45,7 +45,7 @@
 
 }
 
-const unsigned int Footer::size()
+TagLib::uint Footer::size()
 {
   return FooterPrivate::size;
 }
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.h taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.h
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2footer.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2footer.h	2009-09-14 18:56:05.145768506 +0200
@@ -62,7 +62,7 @@
       /*!
        * Returns the size of the footer.  Presently this is always 10 bytes.
        */
-      static const unsigned int size();
+      static uint size();
 
       /*!
        * Renders the footer based on the data in \a header.
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2framefactory.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2framefactory.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2framefactory.cpp	2008-02-21 01:43:14.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2framefactory.cpp	2009-09-14 18:56:05.147769486 +0200
@@ -31,6 +31,7 @@
 
 #include "id3v2framefactory.h"
 #include "id3v2synchdata.h"
+#include "id3v1genres.h"
 
 #include "frames/attachedpictureframe.h"
 #include "frames/commentsframe.h"
@@ -41,6 +42,8 @@
 #include "frames/generalencapsulatedobjectframe.h"
 #include "frames/urllinkframe.h"
 #include "frames/unsynchronizedlyricsframe.h"
+#include "frames/popularimeterframe.h"
+#include "frames/privateframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -180,7 +183,15 @@
     return f;
   }
 
-  // Relative Volume Adjustment (frames 4.11)
+  // ID3v2.2 Attached Picture
+
+	if(frameID == "PIC") {
+    AttachedPictureFrame *f = new AttachedPictureFrameV22(data, header);
+    d->setTextEncoding(f);
+    return f;
+  }
+
+	// Relative Volume Adjustment (frames 4.11)
 
   if(frameID == "RVA2")
     return new RelativeVolumeFrame(data, header);
@@ -220,6 +231,16 @@
     return f;
   }
 
+  // Popularimeter (frames 4.17)
+
+  if(frameID == "POPM")
+    return new PopularimeterFrame(data, header);
+
+  // Private (frames 4.27)
+
+  if(frameID == "PRIV")
+    return new PrivateFrame(data, header);
+
   return new UnknownFrame(data, header);
 }
 
@@ -280,7 +301,6 @@
     convertFrame("IPL", "TIPL", header);
     convertFrame("MCI", "MCDI", header);
     convertFrame("MLL", "MLLT", header);
-    convertFrame("PIC", "APIC", header);
     convertFrame("POP", "POPM", header);
     convertFrame("REV", "RVRB", header);
     convertFrame("SLT", "SYLT", header);
@@ -382,26 +402,31 @@
 
 void FrameFactory::updateGenre(TextIdentificationFrame *frame) const
 {
-  StringList fields;
-  String s = frame->toString();
+  StringList fields = frame->fieldList();
+  StringList newfields;
 
-  while(s.startsWith("(")) {
-
-    int closing = s.find(")");
-
-    if(closing < 0)
-      break;
-
-    fields.append(s.substr(1, closing - 1));
-
-    s = s.substr(closing + 1);
+  for(StringList::Iterator it = fields.begin(); it != fields.end(); ++it) {
+    String s = *it;
+    int end = s.find(")");
+
+    if(s.startsWith("(") && end > 0) {
+      // "(12)Genre"
+      String text = s.substr(end + 1);
+      int number = s.substr(1, end - 1).toInt();
+      if (number > 0 && number <= 255 && !(ID3v1::genre(number) == text))
+        newfields.append(s.substr(1, end - 1));
+      if (!text.isEmpty())
+        newfields.append(text);
+    }
+    else {
+      // "Genre" or "12"
+      newfields.append(s);
+    }
   }
 
-  if(!s.isEmpty())
-    fields.append(s);
-
-  if(fields.isEmpty())
+  if(newfields.isEmpty())
     fields.append(String::null);
 
-  frame->setText(fields);
+  frame->setText(newfields);
+
 }
diff -Nur taglib-1.5-orig/taglib/mpeg/id3v2/id3v2tag.cpp taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2tag.cpp
--- taglib-1.5-orig/taglib/mpeg/id3v2/id3v2tag.cpp	2008-02-04 21:33:54.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/id3v2/id3v2tag.cpp	2009-09-14 18:56:05.149769670 +0200
@@ -125,7 +125,9 @@
 
   for(FrameList::ConstIterator it = comments.begin(); it != comments.end(); ++it)
   {
-    if(static_cast<CommentsFrame *>(*it)->description().isEmpty())
+    CommentsFrame *frame = dynamic_cast<CommentsFrame *>(*it);
+
+    if(frame && frame->description().isEmpty())
       return (*it)->toString();
   }
 
@@ -159,6 +161,9 @@
 
   for(StringList::Iterator it = fields.begin(); it != fields.end(); ++it) {
 
+    if((*it).isEmpty())
+      continue;
+
     bool isNumber = true;
 
     for(String::ConstIterator charIt = (*it).begin();
@@ -347,6 +352,11 @@
   // Loop through the frames rendering them and adding them to the tagData.
 
   for(FrameList::Iterator it = d->frameList.begin(); it != d->frameList.end(); it++) {
+    if ((*it)->header()->frameID().size() != 4) {
+      debug("A frame of unsupported or unknown type \'"
+          + String((*it)->header()->frameID()) + "\' has been discarded");
+      continue;
+    }
     if(!(*it)->header()->tagAlterPreservation())
       tagData.append((*it)->render());
   }
diff -Nur taglib-1.5-orig/taglib/mpeg/mpegheader.cpp taglib-1.5-1.6/taglib/mpeg/mpegheader.cpp
--- taglib-1.5-orig/taglib/mpeg/mpegheader.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/mpegheader.cpp	2009-09-14 18:56:05.102768244 +0200
@@ -164,7 +164,7 @@
 void MPEG::Header::parse(const ByteVector &data)
 {
   if(data.size() < 4 || uchar(data[0]) != 0xff) {
-    debug("MPEG::Header::parse() -- First byte did not mactch MPEG synch.");
+    debug("MPEG::Header::parse() -- First byte did not match MPEG synch.");
     return;
   }
 
@@ -173,7 +173,7 @@
   // Check for the second byte's part of the MPEG synch
 
   if(!flags[23] || !flags[22] || !flags[21]) {
-    debug("MPEG::Header::parse() -- Second byte did not mactch MPEG synch.");
+    debug("MPEG::Header::parse() -- Second byte did not match MPEG synch.");
     return;
   }
 
diff -Nur taglib-1.5-orig/taglib/mpeg/mpegproperties.cpp taglib-1.5-1.6/taglib/mpeg/mpegproperties.cpp
--- taglib-1.5-orig/taglib/mpeg/mpegproperties.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/mpeg/mpegproperties.cpp	2009-09-14 18:56:05.104764564 +0200
@@ -218,8 +218,10 @@
       double timePerFrame =
         double(firstHeader.samplesPerFrame()) / firstHeader.sampleRate();
 
-      d->length = int(timePerFrame * d->xingHeader->totalFrames());
-      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / d->length / 1000 : 0;
+      double length = timePerFrame * d->xingHeader->totalFrames();
+
+      d->length = int(length);
+      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / length / 1000 : 0;
   }
   else {
     // Since there was no valid Xing header found, we hope that we're in a constant

taglib-1.5-1.6-ogg.patch:
 oggfile.cpp     |  101 ++++++++++++++++++++++++++++++++++++++++++++++++--
 oggpage.cpp     |  112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 oggpage.h       |    8 ++++
 xiphcomment.cpp |   18 ++++++---
 4 files changed, 214 insertions(+), 25 deletions(-)

--- NEW FILE taglib-1.5-1.6-ogg.patch ---
diff -Nur taglib-1.5-orig/taglib/ogg/oggfile.cpp taglib-1.5-1.6/taglib/ogg/oggfile.cpp
--- taglib-1.5-orig/taglib/ogg/oggfile.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/oggfile.cpp	2009-09-04 10:50:24.000000000 +0200
@@ -270,11 +270,28 @@
   return true;
 }
 
-void Ogg::File::writePageGroup(const List<int> &pageGroup)
+void Ogg::File::writePageGroup(const List<int> &thePageGroup)
 {
-  if(pageGroup.isEmpty())
+  if(thePageGroup.isEmpty())
     return;
 
+
+  // pages in the pageGroup and packets must be equivalent 
+  // (originalSize and size of packets would not work together), 
+  // therefore we sometimes have to add pages to the group
+  List<int> pageGroup(thePageGroup);
+  while (!d->pages[pageGroup.back()]->header()->lastPacketCompleted()) {
+    if (d->currentPage->header()->pageSequenceNumber() == pageGroup.back()) {
+      if (nextPage() == false) {
+        debug("broken ogg file");
+        return;
+      }
+      pageGroup.append(d->currentPage->header()->pageSequenceNumber());
+    } else {
+      pageGroup.append(pageGroup.back() + 1);
+    }
+  }
+
   ByteVectorList packets;
 
   // If the first page of the group isn't dirty, append its partial content here.
@@ -313,6 +330,52 @@
                                       d->streamSerialNumber, pageGroup.front(),
                                       continued, completed);
 
+  List<Page *> renumberedPages;
+
+  // Correct the page numbering of following pages
+
+  if (pages.back()->header()->pageSequenceNumber() != pageGroup.back()) {
+
+    // TODO: change the internal data structure so that we don't need to hold the 
+    // complete file in memory (is unavoidable at the moment)
+
+    // read the complete stream
+    while(!d->currentPage->header()->lastPageOfStream()) {
+      if(nextPage() == false) {
+        debug("broken ogg file");
+        break;
+      }
+    }
+
+    // create a gap for the new pages
+    int numberOfNewPages = pages.back()->header()->pageSequenceNumber() - pageGroup.back();
+    List<Page *>::Iterator pageIter = d->pages.begin();
+    for(int i = 0; i < pageGroup.back(); i++) {
+      if(pageIter != d->pages.end()) {
+        ++pageIter;
+      }
+      else {
+        debug("Ogg::File::writePageGroup() -- Page sequence is broken in original file.");
+        break;
+      }
+    }
+
+    ++pageIter;
+    for(; pageIter != d->pages.end(); ++pageIter) {
+      Ogg::Page *newPage =
+        (*pageIter)->getCopyWithNewPageSequenceNumber(
+            (*pageIter)->header()->pageSequenceNumber() + numberOfNewPages);
+
+      ByteVector data;
+      data.append(newPage->render());
+      insert(data, newPage->fileOffset(), data.size());
+
+      renumberedPages.append(newPage);
+    }
+  }
+
+  // insert the new data
+
   ByteVector data;
   for(List<Page *>::ConstIterator it = pages.begin(); it != pages.end(); ++it)
     data.append((*it)->render());
@@ -328,9 +391,37 @@
   // Update the page index to include the pages we just created and to delete the
   // old pages.
 
+  // First step: Pages that contain the comment data
+
   for(List<Page *>::ConstIterator it = pages.begin(); it != pages.end(); ++it) {
-    const int index = (*it)->header()->pageSequenceNumber();
-    delete d->pages[index];
-    d->pages[index] = *it;
+    const unsigned int index = (*it)->header()->pageSequenceNumber();
+    if(index < d->pages.size()) {
+      delete d->pages[index];
+      d->pages[index] = *it;
+    }
+    else if(index == d->pages.size()) {
+      d->pages.append(*it);
+    }
+    else {
+      // oops - there's a hole in the sequence
+      debug("Ogg::File::writePageGroup() -- Page sequence is broken.");
+    }
+  }
+
+  // Second step: the renumbered pages
+
+  for(List<Page *>::ConstIterator it = renumberedPages.begin(); it != renumberedPages.end(); ++it) {
+    const unsigned int index = (*it)->header()->pageSequenceNumber();
+    if(index < d->pages.size()) {
+      delete d->pages[index];
+      d->pages[index] = *it;
+    }
+    else if(index == d->pages.size()) {
+      d->pages.append(*it);
+    }
+    else {
+      // oops - there's a hole in the sequence
+      debug("Ogg::File::writePageGroup() -- Page sequence is broken.");
+    }
   }
 }
diff -Nur taglib-1.5-orig/taglib/ogg/oggpage.cpp taglib-1.5-1.6/taglib/ogg/oggpage.cpp
--- taglib-1.5-orig/taglib/ogg/oggpage.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/oggpage.cpp	2009-09-14 19:01:31.026763633 +0200
@@ -116,12 +116,14 @@
     flags = ContainsPacketFlags(flags | CompletePacket);
   }
 
-  // Or if the page is (a) the first page and it's complete or (b) the last page
-  // and it's complete or (c) a page in the middle.
-
-  else if((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
-          (flags & EndsWithPacket && d->header.lastPacketCompleted()) ||
-          (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket)))
+  // Or if there is more than one page and the page is 
+  // (a) the first page and it's complete or 
+  // (b) the last page and it's complete or 
+  // (c) a page in the middle.
+  else if(packetCount() > 1 &&
+          ((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
+           (flags & EndsWithPacket && d->header.lastPacketCompleted()) ||
+           (!(flags & BeginsWithPacket) && !(flags & EndsWithPacket))))
   {
     flags = ContainsPacketFlags(flags | CompletePacket);
   }
@@ -208,20 +210,101 @@
   for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it)
     totalSize += (*it).size();
 
-  if(strategy == Repaginate || totalSize + packets.size() > 255 * 256) {
-    debug("Ogg::Page::paginate() -- Sorry!  Repagination is not yet implemented.");
-    return l;
-  }
+  // Handle creation of multiple pages with appropriate pagination.
+  if(strategy == Repaginate || totalSize + packets.size() > 255 * 255) {
 
-  // TODO: Handle creation of multiple pages here with appropriate pagination.
+    // SPLITSIZE must be a multiple of 255 in order to get the lacing values right
+    // create pages of about 8KB each
+#define SPLITSIZE (32*255)
+
+    int pageIndex = 0;
+
+    for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it) {
+      bool continued = false;
+
+      // mark very first packet?
+      if(firstPacketContinued && it==packets.begin()) {
+        continued = true;
+      }
+
+      // append to buf
+      ByteVector packetBuf;
+      packetBuf.append(*it);
+
+      while(packetBuf.size() > SPLITSIZE) {
+        // output a Page
+        ByteVector packetForOnePage;
+        packetForOnePage.resize(SPLITSIZE);
+        std::copy(packetBuf.begin(), packetBuf.begin() + SPLITSIZE, packetForOnePage.begin());
+
+        ByteVectorList packetList;
+        packetList.append(packetForOnePage);
+        Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued, false, false);
+        l.append(p);
+
+        pageIndex++;
+        continued = true;
+        packetBuf = packetBuf.mid(SPLITSIZE);
+      }
+
+      ByteVectorList::ConstIterator jt = it;
+      ++jt;
+      bool lastPacketInList = (jt == packets.end());
+
+      // output a page for the rest (we output one packet per page, so this one should be completed)
+      ByteVectorList packetList;
+      packetList.append(packetBuf);
+
+      bool isVeryLastPacket = false;
+      if(containsLastPacket) {
+        // mark the very last output page as last of stream
+        ByteVectorList::ConstIterator jt = it;
+        ++jt;
+        if(jt == packets.end()) {
+          isVeryLastPacket = true;
+        }
+      }
+
+      Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued,
+                         lastPacketInList ? lastPacketCompleted : true, 
+                         isVeryLastPacket);
+      pageIndex++;
 
-  Page *p = new Page(packets, streamSerialNumber, firstPage, firstPacketContinued,
-                     lastPacketCompleted, containsLastPacket);
-  l.append(p);
+      l.append(p);
+    }
+  }
+  else {
+    Page *p = new Page(packets, streamSerialNumber, firstPage, firstPacketContinued,
+                       lastPacketCompleted, containsLastPacket);
+    l.append(p);
+  }
 
   return l;
 }
 
+Ogg::Page* Ogg::Page::getCopyWithNewPageSequenceNumber(int sequenceNumber)
+{
+  Page *pResultPage = NULL;
+
+  // TODO: a copy constructor would be helpful
+
+  if(d->file == 0) {
+    pResultPage = new Page(
+        d->packets,
+        d->header.streamSerialNumber(),
+        sequenceNumber,
+        d->header.firstPacketContinued(),
+        d->header.lastPacketCompleted(),
+        d->header.lastPageOfStream());
+  }
+  else
+  {
+    pResultPage = new Page(d->file, d->fileOffset);
+    pResultPage->d->header.setPageSequenceNumber(sequenceNumber);
+  }
+  return pResultPage;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -254,3 +337,4 @@
   d->packets = packets;
   d->header.setPacketSizes(packetSizes);
 }
+
diff -Nur taglib-1.5-orig/taglib/ogg/oggpage.h taglib-1.5-1.6/taglib/ogg/oggpage.h
--- taglib-1.5-orig/taglib/ogg/oggpage.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/oggpage.h	2009-09-14 19:01:31.031764764 +0200
@@ -70,6 +70,14 @@
        */
       const PageHeader *header() const;
 
+      /*! 
+       * Returns a copy of the page with \a sequenceNumber set as sequence number.
+       * 
+       * \see header()
+       * \see PageHeader::setPageSequenceNumber()
+       */
+      Page* getCopyWithNewPageSequenceNumber(int sequenceNumber);
+
       /*!
        * Returns the index of the first packet wholly or partially contained in
        * this page.
diff -Nur taglib-1.5-orig/taglib/ogg/xiphcomment.cpp taglib-1.5-1.6/taglib/ogg/xiphcomment.cpp
--- taglib-1.5-orig/taglib/ogg/xiphcomment.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib-1.5-1.6/taglib/ogg/xiphcomment.cpp	2009-09-14 19:01:31.011763641 +0200
@@ -103,16 +103,20 @@
 
 TagLib::uint Ogg::XiphComment::year() const
 {
-  if(d->fieldListMap["DATE"].isEmpty())
-    return 0;
-  return d->fieldListMap["DATE"].front().toInt();
+  if(!d->fieldListMap["DATE"].isEmpty())
+    return d->fieldListMap["DATE"].front().toInt();
+  if(!d->fieldListMap["YEAR"].isEmpty())
+    return d->fieldListMap["YEAR"].front().toInt();
+  return 0;
 }
 
 TagLib::uint Ogg::XiphComment::track() const
 {
-  if(d->fieldListMap["TRACKNUMBER"].isEmpty())
-    return 0;
-  return d->fieldListMap["TRACKNUMBER"].front().toInt();
+  if(!d->fieldListMap["TRACKNUMBER"].isEmpty())
+    return d->fieldListMap["TRACKNUMBER"].front().toInt();
+  if(!d->fieldListMap["TRACKNUM"].isEmpty())
+    return d->fieldListMap["TRACKNUM"].front().toInt();
+  return 0;
 }
 
 void Ogg::XiphComment::setTitle(const String &s)
@@ -142,6 +146,7 @@
 
 void Ogg::XiphComment::setYear(uint i)
 {
+  removeField("YEAR");
   if(i == 0)
     removeField("DATE");
   else
@@ -150,6 +155,7 @@
 
 void Ogg::XiphComment::setTrack(uint i)
 {
+  removeField("TRACKNUM");
   if(i == 0)
     removeField("TRACKNUMBER");
   else

taglib-1.5-1.6-toolkit.patch:
 taglib-1.5/taglib/toolkit/tstring.cpp     |    6 +++++-
 taglib-1.5/taglib/toolkit/tstring.h       |    2 +-
 taglib/taglib/toolkit/tbytevector.cpp     |    4 ++--
 taglib/taglib/toolkit/tbytevector.h       |    2 +-
 taglib/taglib/toolkit/tbytevectorlist.cpp |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE taglib-1.5-1.6-toolkit.patch ---
diff -Nur taglib-1.5/taglib/toolkit/tbytevector.cpp taglib/taglib/toolkit/tbytevector.cpp
--- taglib-1.5/taglib/toolkit/tbytevector.cpp	2008-02-12 04:18:52.000000000 +0100
+++ taglib/taglib/toolkit/tbytevector.cpp	2008-12-04 13:37:36.000000000 +0100
@@ -147,12 +147,12 @@
   public:
     ByteVectorMirror(const ByteVector &source) : v(source) {}
 
-    const char operator[](int index) const
+    char operator[](int index) const
     {
       return v[v.size() - index - 1];
     }
 
-    const char at(int index) const
+    char at(int index) const
     {
       return v.at(v.size() - index - 1);
     }
diff -Nur taglib-1.5/taglib/toolkit/tbytevector.h taglib/taglib/toolkit/tbytevector.h
--- taglib-1.5/taglib/toolkit/tbytevector.h	2008-02-05 19:51:48.000000000 +0100
+++ taglib/taglib/toolkit/tbytevector.h	2009-07-02 22:54:32.000000000 +0200
@@ -30,7 +30,7 @@
 #include "taglib_export.h"
 
 #include <vector>
-#include <ostream>
+#include <iostream>
 
 namespace TagLib {
 
diff -Nur taglib-1.5/taglib/toolkit/tbytevectorlist.cpp taglib/taglib/toolkit/tbytevectorlist.cpp
--- taglib-1.5/taglib/toolkit/tbytevectorlist.cpp	2008-02-04 16:14:45.000000000 +0100
+++ taglib/taglib/toolkit/tbytevectorlist.cpp	2009-07-11 15:24:21.000000000 +0200
@@ -52,7 +52,7 @@
       offset != -1 && (max == 0 || max > int(l.size()) + 1);
       offset = v.find(pattern, offset + pattern.size(), byteAlign))
   {
-    if(offset - previousOffset > 1)
+    if(offset - previousOffset >= 1)
       l.append(v.mid(previousOffset, offset - previousOffset));
     else
       l.append(ByteVector::null);
diff -Nur taglib-1.5-orig/taglib/toolkit/tstring.cpp taglib-1.5/taglib/toolkit/tstring.cpp
--- taglib-1.5-orig/taglib/toolkit/tstring.cpp	2008-02-04 16:14:45.000000000 +0100
+++ taglib-1.5/taglib/toolkit/tstring.cpp	2009-09-04 12:07:00.506121756 +0200
@@ -35,7 +35,7 @@
 
   inline unsigned short byteSwap(unsigned short x)
   {
-    return ((x) >> 8) & 0xff | ((x) & 0xff) << 8;
+    return (((x) >> 8) & 0xff) | (((x) & 0xff) << 8);
   }
 
   inline unsigned short combine(unsigned char c1, unsigned char c2)
@@ -510,6 +510,8 @@
 
 TagLib::wchar &String::operator[](int i)
 {
+  detach();
+
   return d->data[i];
 }
 
@@ -558,6 +560,8 @@
 
 String &String::operator+=(char c)
 {
+  detach();
+
   d->data += uchar(c);
   return *this;
 }
diff -Nur taglib-1.5-orig/taglib/toolkit/tstring.h taglib-1.5/taglib/toolkit/tstring.h
--- taglib-1.5-orig/taglib/toolkit/tstring.h	2008-02-04 16:14:45.000000000 +0100
+++ taglib-1.5/taglib/toolkit/tstring.h	2009-09-04 12:07:03.465121011 +0200
@@ -31,7 +31,7 @@
 #include "tbytevector.h"
 
 #include <string>
-#include <ostream>
+#include <iostream>
 
 /*!
  * \relates TagLib::String

taglib-1.5-tests.patch:
 test_string.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE taglib-1.5-tests.patch ---
diff -Nur taglib-1.5-orig/tests/test_string.cpp taglib-1.5/tests/test_string.cpp
--- taglib-1.5-orig/tests/test_string.cpp	2008-01-26 11:57:06.000000000 +0100
+++ taglib-1.5/tests/test_string.cpp	2009-08-22 11:17:55.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <tstring.h>
+#include <cstring>
 
 using namespace std;
 using namespace TagLib;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Sep 2009 08:02:18 -0000	1.12
+++ .cvsignore	14 Sep 2009 17:09:37 -0000	1.13
@@ -1 +1 @@
-taglib-1.6.tar.gz
+taglib-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Sep 2009 08:02:18 -0000	1.12
+++ sources	14 Sep 2009 17:09:37 -0000	1.13
@@ -1 +1 @@
-5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz
+7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/taglib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- taglib.spec	14 Sep 2009 13:13:25 -0000	1.32
+++ taglib.spec	14 Sep 2009 17:09:38 -0000	1.33
@@ -11,16 +11,14 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.6
-Release:    1%{?dist}
+Version:    1.5
+Release:    9%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-# the temporary url from the 1.6 announcement
-Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
-#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -32,7 +30,15 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.6-test_mp4.patch
+Patch3: taglib-1.5-tests.patch
+
+## upstream patches
+Patch101: taglib-1.5-1.6-ape.patch
+Patch102: taglib-1.5-1.6-ogg.patch
+Patch103: taglib-1.5-1.6-flac.patch
+Patch104: taglib-1.5-1.6-toolkit.patch
+Patch105: taglib-1.5-1.6-mpeg.patch
+Patch106: taglib-1.5-1.6-mpeg-cmake.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig
@@ -86,13 +92,19 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .test_mp4
+%patch3 -p1 -b .tests
+%patch101 -p1 -b .ape
+%patch102 -p1 -b .ogg
+%patch103 -p1 -b .flac
+%patch104 -p1 -b .toolkit
+%patch105 -p1 -b .mpeg
+%patch106 -p1 -b .mpeg-build
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
+%{cmake} %{?buildtests} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -159,13 +171,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
-- Add patch to fix MP4 test on ppc/ppc64.
-- Update to 1.6 final.
-
-* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
-- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
-- Build optional support for MP4 and ASF/WMA files.
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-9
+- Merge minor changes in id3v2/ogg from 1.6 final.
 
 * Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
 - Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and


--- taglib-1.6-test_mp4.patch DELETED ---



From abompard at fedoraproject.org  Mon Sep 14 17:11:25 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 14 Sep 2009 17:11:25 +0000 (UTC)
Subject: rpms/springlobby/F-11 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 springlobby.spec, 1.11, 1.12
Message-ID: <20090914171125.54C6411C0489@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16148/F-11

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
- version 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2009 07:02:42 -0000	1.7
+++ .cvsignore	14 Sep 2009 17:11:24 -0000	1.8
@@ -1 +1 @@
-springlobby-0.22.tar.bz2
+springlobby-0.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2009 07:02:42 -0000	1.7
+++ sources	14 Sep 2009 17:11:24 -0000	1.8
@@ -1 +1 @@
-e9200084c40080a1c1b052c7dbb237b3  springlobby-0.22.tar.bz2
+f11e08920496e07702c0b21549c7afd1  springlobby-0.23.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/springlobby.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- springlobby.spec	9 Sep 2009 07:02:42 -0000	1.11
+++ springlobby.spec	14 Sep 2009 17:11:24 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.22
+Version:        0.23
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
+- version 0.23
+
 * Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.22-1
 - version 0.22
 



From abompard at fedoraproject.org  Mon Sep 14 17:11:25 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 14 Sep 2009 17:11:25 +0000 (UTC)
Subject: rpms/springlobby/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 springlobby.spec, 1.13, 1.14
Message-ID: <20090914171125.A246111C04BF@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16148/devel

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
- version 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2009 07:02:42 -0000	1.7
+++ .cvsignore	14 Sep 2009 17:11:24 -0000	1.8
@@ -1 +1 @@
-springlobby-0.22.tar.bz2
+springlobby-0.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2009 07:02:42 -0000	1.7
+++ sources	14 Sep 2009 17:11:24 -0000	1.8
@@ -1 +1 @@
-e9200084c40080a1c1b052c7dbb237b3  springlobby-0.22.tar.bz2
+f11e08920496e07702c0b21549c7afd1  springlobby-0.23.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- springlobby.spec	9 Sep 2009 07:02:43 -0000	1.13
+++ springlobby.spec	14 Sep 2009 17:11:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.22
+Version:        0.23
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
+- version 0.23
+
 * Wed Sep 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.22-1
 - version 0.22
 



From nalin at fedoraproject.org  Mon Sep 14 17:18:59 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 14 Sep 2009 17:18:59 +0000 (UTC)
Subject: rpms/krb5/devel kadmind.init, 1.17, 1.18 kpropd.init, 1.8,
	1.9 krb5.spec, 1.211, 1.212
Message-ID: <20090914171859.A6A5811C00EC@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19646

Modified Files:
	kadmind.init kpropd.init krb5.spec 
Log Message:
- specify the location of the subsystem lock when using the status() function
  in the kadmind and kpropd init scripts, so that we get the right error when
  we're dead but have a lock file - requires initscripts 8.99 (#521772)



Index: kadmind.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kadmind.init	8 Sep 2009 19:08:28 -0000	1.17
+++ kadmind.init	14 Sep 2009 17:18:59 -0000	1.18
@@ -57,7 +57,7 @@ start() {
 	RETVAL=$?
 	echo
 	if test $RETVAL -ne 0 ; then
-	    if status ${kadmind} > /dev/null ; then
+	    if status -l kadmin ${kadmind} > /dev/null ; then
 		RETVAL=0
 	    fi
 	fi
@@ -90,7 +90,7 @@ case "$1" in
 	start
 	;;
   status)
-	status ${kadmind}
+	status -l kadmin ${kadmind}
 	RETVAL=$?
 	;;
   reload)


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kpropd.init	8 Sep 2009 19:08:28 -0000	1.8
+++ kpropd.init	14 Sep 2009 17:18:59 -0000	1.9
@@ -39,7 +39,7 @@ start() {
 	RETVAL=$?
 	echo
 	if test $RETVAL -ne 0 ; then
-	    if status ${kpropd} > /dev/null ; then
+	    if status -l kprop ${kpropd} > /dev/null ; then
 		RETVAL=0
 	    fi
 	fi
@@ -67,7 +67,7 @@ case "$1" in
 	start
 	;;
   status)
-	status ${kpropd}
+	status -l kprop ${kpropd}
 	retval=$?
 	;;
   condrestart)


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- krb5.spec	8 Sep 2009 19:08:28 -0000	1.211
+++ krb5.spec	14 Sep 2009 17:18:59 -0000	1.212
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -130,6 +130,8 @@ Group: System Environment/Daemons
 Summary: The KDC and related programs for Kerberos 5
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info, chkconfig
+# we need 'status -l' to work, and that option was added in 8.99
+Requires: initscripts >= 8.99-1
 Requires(preun): /sbin/install-info, chkconfig, initscripts
 Requires(postun): initscripts
 # mktemp is used by krb5-send-pr
@@ -208,6 +210,11 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Mon Sep 14 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-8
+- specify the location of the subsystem lock when using the status() function
+  in the kadmind and kpropd init scripts, so that we get the right error when
+  we're dead but have a lock file - requires initscripts 8.99 (#521772)
+
 * Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com>
 - if the init script fails to start krb5kdc/kadmind/kpropd because it's already
   running (according to status()), return 0 (part of #521772)



From jgu at fedoraproject.org  Mon Sep 14 17:35:29 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Mon, 14 Sep 2009 17:35:29 +0000 (UTC)
Subject: rpms/dvipdfmx/F-11 .cvsignore, 1.5, 1.6 dvipdfmx.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090914173529.D4E5C11C00EC@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26324

Modified Files:
	.cvsignore dvipdfmx.spec sources 
Log Message:
* Fri Sep 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.28.20090708cvs
- Update to 20090708 snapshot to fix BZ 519672
- Remove dvipdfmx-20080617-ebb-to-ebbx.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jan 2009 00:16:33 -0000	1.5
+++ .cvsignore	14 Sep 2009 17:35:29 -0000	1.6
@@ -1 +1 @@
-dvipdfmx-20090115.tar.gz
+dvipdfmx-20090708.tar.gz


Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-11/dvipdfmx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dvipdfmx.spec	24 Feb 2009 13:08:35 -0000	1.8
+++ dvipdfmx.spec	14 Sep 2009 17:35:29 -0000	1.9
@@ -6,11 +6,11 @@
 %{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
 %{!?_texmf_conf: %define _texmf_conf %{_sysconfdir}/texmf}
 
-%define snapshot 20090115
+%define snapshot 20090708
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.27.%{snapshot}cvs%{?dist}
+Release:        0.28.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -18,12 +18,6 @@ License:        GPLv2+
 URL:            http://project.ktug.or.kr/dvipdfmx/
 Source0:        http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz
 
-# This patch renames ebb to ebbx to prevent conflict with the ebb from the
-# dvipdfm package. 
-# htps://bugzilla.redhat.com/show_bug.cgi?id=448347
-# Reported to upstream on 26th May 2008 via email
-Patch0:		dvipdfmx-20080617-ebb-to-ebbx.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf
@@ -46,7 +40,6 @@ Hirata and its modified one, dvipdfm-kor
 
 %prep
 %setup -q -n %{name}-%{snapshot}
-%patch0 -p1 -b .ebb-to-ebbx
 
 %build
 %configure
@@ -98,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.28.20090708cvs
+- Update to 20090708 snapshot to fix BZ 519672
+- Remove dvipdfmx-20080617-ebb-to-ebbx.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.27.20090115cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jan 2009 00:16:33 -0000	1.5
+++ sources	14 Sep 2009 17:35:29 -0000	1.6
@@ -1 +1 @@
-098cef238de53adc5e98fe56a451f6f7  dvipdfmx-20090115.tar.gz
+c727370d57633eb58618022516d17b07  dvipdfmx-20090708.tar.gz



From davidz at fedoraproject.org  Mon Sep 14 17:41:42 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 14 Sep 2009 17:41:42 +0000 (UTC)
Subject: rpms/polkit/devel
	0001-Fix-process-start-time-when-using-polkit_unix_proces.patch,
	NONE, 1.1 polkit.spec, 1.11, 1.12
Message-ID: <20090914174142.3928211C00EC@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29595

Modified Files:
	polkit.spec 
Added Files:
	0001-Fix-process-start-time-when-using-polkit_unix_proces.patch 
Log Message:
* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.1
- Add bugfix for polkit_unix_process_new_full() (thanks Bastien Nocera)
- Obsolete old PolicyKit packages



0001-Fix-process-start-time-when-using-polkit_unix_proces.patch:
 polkitunixprocess.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-process-start-time-when-using-polkit_unix_proces.patch ---
>From 50385761decb0a5a79c6cdc975b427c5918d7de3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Sep 2009 13:10:27 -0400
Subject: [PATCH] Fix process start time when using polkit_unix_process_new_full()

When using polkit_unix_process_new_full() the start-time
wasn't being set from the process' PID if it wasn't
passed to the function.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 src/polkit/polkitunixprocess.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
index c690077..e132387 100644
--- a/src/polkit/polkitunixprocess.c
+++ b/src/polkit/polkitunixprocess.c
@@ -157,7 +157,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
                                    g_param_spec_int ("pid",
                                                      "Process ID",
                                                      "The UNIX process ID",
-                                                     0,
+                                                     -1,
                                                      G_MAXINT,
                                                      0,
                                                      G_PARAM_CONSTRUCT |
@@ -323,7 +323,10 @@ polkit_unix_process_new_full (gint pid,
 
   process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1));
   process->pid = pid;
-  process->start_time = start_time;
+  if (start_time != 0)
+    process->start_time = start_time;
+  else
+    process->start_time = get_start_time_for_pid (pid, NULL);
 
   return POLKIT_SUBJECT (process);
 }
-- 
1.6.4.2



Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- polkit.spec	13 Sep 2009 19:52:31 -0000	1.11
+++ polkit.spec	14 Sep 2009 17:41:41 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.95
-Release: 0.git20090913%{?dist}
+Release: 0.git20090913.1%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.gz
@@ -18,6 +18,10 @@ BuildRequires: gobject-introspection-dev
 Requires: ConsoleKit
 Requires: dbus
 
+Obsoletes: PolicyKit
+
+Patch0: 0001-Fix-process-start-time-when-using-polkit_unix_proces.patch
+
 %description
 PolicyKit is a toolkit for defining and handling authorizations.
 It is used for allowing unprivileged processes to speak to privileged
@@ -56,6 +60,7 @@ Roles and default policy for desktop usa
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --enable-introspection --enable-examples
@@ -178,6 +183,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.1
+- Add bugfix for polkit_unix_process_new_full() (thanks Bastien Nocera)
+- Obsolete old PolicyKit packages
+
 * Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913
 - Update to git snapshot
 - Drop upstreamed patches



From steved at fedoraproject.org  Mon Sep 14 17:52:35 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 14 Sep 2009 17:52:35 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-nfs4-ver4opt.patch, NONE, 1.1 kernel.spec,
	1.1798, 1.1799
Message-ID: <20090914175235.3E49A11C00EC@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2123

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-nfs4-ver4opt.patch 
Log Message:
Added support for -o v4 mount parsing


linux-2.6-nfs4-ver4opt.patch:
 fs/nfs/internal.h    |   10 +-
 fs/nfs/super.c       |  214 ++++++++++++++++++++++++++++++++++-----------------
 include/linux/nfs4.h |    1 
 3 files changed, 155 insertions(+), 70 deletions(-)

--- NEW FILE linux-2.6-nfs4-ver4opt.patch ---
diff -up linux-2.6.30.i686/fs/nfs/internal.h.save linux-2.6.30.i686/fs/nfs/internal.h
--- linux-2.6.30.i686/fs/nfs/internal.h.save	2009-09-10 10:14:10.000000000 -0400
+++ linux-2.6.30.i686/fs/nfs/internal.h	2009-09-10 11:06:38.000000000 -0400
@@ -49,6 +49,11 @@ struct nfs_clone_mount {
 #define NFS_MAX_SECFLAVORS	(12)
 
 /*
+ * Value used if the user did not specify a port value.
+ */
+#define NFS_UNSPEC_PORT		(-1)
+
+/*
  * In-kernel mount arguments
  */
 struct nfs_parsed_mount_data {
@@ -63,6 +68,7 @@ struct nfs_parsed_mount_data {
 	unsigned int		auth_flavor_len;
 	rpc_authflavor_t	auth_flavors[1];
 	char			*client_address;
+	unsigned int		version;
 	unsigned int		minorversion;
 	char			*fscache_uniq;
 
@@ -71,7 +77,7 @@ struct nfs_parsed_mount_data {
 		size_t			addrlen;
 		char			*hostname;
 		u32			version;
-		unsigned short		port;
+		int			port;
 		unsigned short		protocol;
 	} mount_server;
 
@@ -80,7 +86,7 @@ struct nfs_parsed_mount_data {
 		size_t			addrlen;
 		char			*hostname;
 		char			*export_path;
-		unsigned short		port;
+		int			port;
 		unsigned short		protocol;
 	} nfs_server;
 
diff -up linux-2.6.30.i686/fs/nfs/super.c.save linux-2.6.30.i686/fs/nfs/super.c
--- linux-2.6.30.i686/fs/nfs/super.c.save	2009-09-10 10:14:24.000000000 -0400
+++ linux-2.6.30.i686/fs/nfs/super.c	2009-09-10 15:14:10.000000000 -0400
@@ -73,7 +73,7 @@ enum {
 	Opt_cto, Opt_nocto,
 	Opt_ac, Opt_noac,
 	Opt_lock, Opt_nolock,
-	Opt_v2, Opt_v3,
+	Opt_v2, Opt_v3, Opt_v4,
 	Opt_udp, Opt_tcp, Opt_rdma,
 	Opt_acl, Opt_noacl,
 	Opt_rdirplus, Opt_nordirplus,
@@ -127,6 +127,7 @@ static const match_table_t nfs_mount_opt
 	{ Opt_nolock, "nolock" },
 	{ Opt_v2, "v2" },
 	{ Opt_v3, "v3" },
+	{ Opt_v4, "v4" },
 	{ Opt_udp, "udp" },
 	{ Opt_tcp, "tcp" },
 	{ Opt_rdma, "rdma" },
@@ -272,6 +273,10 @@ static const struct super_operations nfs
 };
 
 #ifdef CONFIG_NFS_V4
+static int nfs4_validate_text_mount_data(void *options,
+	struct nfs_parsed_mount_data *args, const char *dev_name);
+static int nfs4_try_mount(int flags, const char *dev_name,
+	struct nfs_parsed_mount_data *data, struct vfsmount *mnt);
 static int nfs4_get_sb(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);
 static int nfs4_remote_get_sb(struct file_system_type *fs_type,
@@ -866,6 +871,21 @@ void nfs_parse_ip_address(char *string, 
 }
 
 /*
+ * Select between a default port value and a user-specified port value.
+ * If a zero value is set, then autobind will be used.
+ */
+static void nfs_set_default_port(struct sockaddr *sap, const int parsed_port,
+				 const unsigned short default_port)
+{
+	unsigned short port = default_port;
+
+	if (parsed_port != NFS_UNSPEC_PORT)
+		port = parsed_port;
+
+	nfs_set_port(sap, port);
+}
+
+/*
  * Sanity check the NFS transport protocol.
  *
  */
@@ -1047,10 +1067,18 @@ static int nfs_parse_mount_options(char 
 			break;
 		case Opt_v2:
 			mnt->flags &= ~NFS_MOUNT_VER3;
+			mnt->version = 2;
 			break;
 		case Opt_v3:
 			mnt->flags |= NFS_MOUNT_VER3;
+			mnt->version = 3;
 			break;
+#ifdef CONFIG_NFS_V4
+		case Opt_v4:
+			mnt->flags &= ~NFS_MOUNT_VER3;
+			mnt->version = 4;
+			break;
+#endif
 		case Opt_udp:
 			mnt->flags &= ~NFS_MOUNT_TCP;
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
@@ -1264,10 +1292,18 @@ static int nfs_parse_mount_options(char 
 			switch (option) {
 			case NFS2_VERSION:
 				mnt->flags &= ~NFS_MOUNT_VER3;
+				mnt->version = 2;
 				break;
 			case NFS3_VERSION:
 				mnt->flags |= NFS_MOUNT_VER3;
+				mnt->version = 3;
+				break;
+#ifdef CONFIG_NFS_V4
+			case NFS4_VERSION:
+				mnt->flags &= ~NFS_MOUNT_VER3;
+				mnt->version = 4;
 				break;
+#endif
 			default:
 				goto out_invalid_value;
 			}
@@ -1485,11 +1521,7 @@ static int nfs_try_mount(struct nfs_pars
 		args->mount_server.addrlen = args->nfs_server.addrlen;
 	}
 	request.salen = args->mount_server.addrlen;
-
-	/*
-	 * autobind will be used if mount_server.port == 0
-	 */
-	nfs_set_port(request.sap, args->mount_server.port);
+	nfs_set_default_port(request.sap, args->mount_server.port, 0);
 
 	/*
 	 * Now ask the mount server to map our export path
@@ -1661,6 +1693,7 @@ static int nfs_validate_mount_data(void 
 				   const char *dev_name)
 {
 	struct nfs_mount_data *data = (struct nfs_mount_data *)options;
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
 
 	if (data == NULL)
 		goto out_no_data;
@@ -1672,10 +1705,11 @@ static int nfs_validate_mount_data(void 
 	args->acregmax		= NFS_DEF_ACREGMAX;
 	args->acdirmin		= NFS_DEF_ACDIRMIN;
 	args->acdirmax		= NFS_DEF_ACDIRMAX;
-	args->mount_server.port	= 0;	/* autobind unless user sets port */
-	args->nfs_server.port	= 0;	/* autobind unless user sets port */
+	args->mount_server.port	= NFS_UNSPEC_PORT;
+	args->nfs_server.port	= NFS_UNSPEC_PORT;
 	args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
 	args->auth_flavors[0]	= RPC_AUTH_UNIX;
+	args->minorversion	= 0;
 
 	switch (data->version) {
 	case 1:
@@ -1697,8 +1731,11 @@ static int nfs_validate_mount_data(void 
 			if (data->root.size > NFS3_FHSIZE || data->root.size == 0)
 				goto out_invalid_fh;
 			mntfh->size = data->root.size;
-		} else
+			args->version = 3;
+		} else {
 			mntfh->size = NFS2_FHSIZE;
+			args->version = 2;
+		}
 
 
 		memcpy(mntfh->data, data->root.data, mntfh->size);
@@ -1720,11 +1757,9 @@ static int nfs_validate_mount_data(void 
 		args->acdirmin		= data->acdirmin;
 		args->acdirmax		= data->acdirmax;
 
-		memcpy(&args->nfs_server.address, &data->addr,
-		       sizeof(data->addr));
+		memcpy(sap, &data->addr, sizeof(data->addr));
 		args->nfs_server.addrlen = sizeof(data->addr);
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
 		if (!(data->flags & NFS_MOUNT_TCP))
@@ -1772,12 +1807,18 @@ static int nfs_validate_mount_data(void 
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
-		nfs_set_port((struct sockaddr *)&args->nfs_server.address,
-				args->nfs_server.port);
+		if (args->version == 4)
+#ifdef CONFIG_NFS_V4
+			return nfs4_validate_text_mount_data(options,
+							     args, dev_name);
+#else
+			goto out_v4_not_compiled;
+#endif
+
+		nfs_set_default_port(sap, args->nfs_server.port, 0);
 
 		nfs_set_mount_transport_protocol(args);
 
@@ -1825,6 +1866,12 @@ out_v3_not_compiled:
 	return -EPROTONOSUPPORT;
 #endif /* !CONFIG_NFS_V3 */
 
+#ifndef CONFIG_NFS_V4
+out_v4_not_compiled:
+	dfprintk(MOUNT, "NFS: NFSv4 is not compiled into kernel\n");
+	return -EPROTONOSUPPORT;
+#endif /* !CONFIG_NFS_V4 */
+
 out_nomem:
 	dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n");
 	return -ENOMEM;
@@ -2120,6 +2167,14 @@ static int nfs_get_sb(struct file_system
 	if (error < 0)
 		goto out;
 
+#ifdef CONFIG_NFS_V4
+	if (data->version == 4) {
+		error = nfs4_try_mount(flags, dev_name, data, mnt);
+		kfree(data->client_address);
+		goto out;
+	}
+#endif	/* CONFIG_NFS_V4 */
+
 	/* Get a volume representation */
 	server = nfs_create_server(data, mntfh);
 	if (IS_ERR(server)) {
@@ -2317,6 +2372,43 @@ static void nfs4_validate_mount_flags(st
 	args->flags &= ~(NFS_MOUNT_NONLM|NFS_MOUNT_NOACL|NFS_MOUNT_VER3);
 }
 
+static int nfs4_validate_text_mount_data(void *options,
+					 struct nfs_parsed_mount_data *args,
+					 const char *dev_name)
+{
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
+
+	nfs_set_default_port(sap, args->nfs_server.port, NFS_PORT);
+
+	nfs_validate_transport_protocol(args);
+
+	nfs4_validate_mount_flags(args);
+
+	if (args->version != 4) {
+		dfprintk(MOUNT,
+			 "NFS4: Illegal mount version\n");
+		return -EINVAL;
+	}
+
+	if (args->auth_flavor_len > 1) {
+		dfprintk(MOUNT,
+			 "NFS4: Too many RPC auth flavours specified\n");
+		return -EINVAL;
+	}
+
+	if (args->client_address == NULL) {
+		dfprintk(MOUNT,
+			 "NFS4: mount program didn't pass callback address\n");
+		return -EINVAL;
+	}
+
+	return nfs_parse_devname(dev_name,
+				   &args->nfs_server.hostname,
+				   NFS4_MAXNAMLEN,
+				   &args->nfs_server.export_path,
+				   NFS4_MAXPATHLEN);
+}
+
 /*
  * Validate NFSv4 mount options
  */
@@ -2324,7 +2416,7 @@ static int nfs4_validate_mount_data(void
 				    struct nfs_parsed_mount_data *args,
 				    const char *dev_name)
 {
-	struct sockaddr_in *ap;
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
 	struct nfs4_mount_data *data = (struct nfs4_mount_data *)options;
 	char *c;
 
@@ -2337,23 +2429,22 @@ static int nfs4_validate_mount_data(void
 	args->acregmax		= NFS_DEF_ACREGMAX;
 	args->acdirmin		= NFS_DEF_ACDIRMIN;
 	args->acdirmax		= NFS_DEF_ACDIRMAX;
-	args->nfs_server.port	= NFS_PORT; /* 2049 unless user set port= */
+	args->nfs_server.port	= NFS_UNSPEC_PORT;
 	args->auth_flavors[0]	= RPC_AUTH_UNIX;
 	args->auth_flavor_len	= 0;
+	args->version		= 4;
 	args->minorversion	= 0;
 
 	switch (data->version) {
 	case 1:
-		ap = (struct sockaddr_in *)&args->nfs_server.address;
 		if (data->host_addrlen > sizeof(args->nfs_server.address))
 			goto out_no_address;
 		if (data->host_addrlen == 0)
 			goto out_no_address;
 		args->nfs_server.addrlen = data->host_addrlen;
-		if (copy_from_user(ap, data->host_addr, data->host_addrlen))
+		if (copy_from_user(sap, data->host_addr, data->host_addrlen))
 			return -EFAULT;
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (nfs_verify_server_address(sap))
 			goto out_no_address;
 
 		if (data->auth_flavourlen) {
@@ -2399,39 +2490,14 @@ static int nfs4_validate_mount_data(void
 		nfs_validate_transport_protocol(args);
 
 		break;
-	default: {
-		int status;
-
+	default:
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			return -EINVAL;
 
-		nfs_set_port((struct sockaddr *)&args->nfs_server.address,
-				args->nfs_server.port);
-
-		nfs_validate_transport_protocol(args);
-
-		nfs4_validate_mount_flags(args);
-
-		if (args->auth_flavor_len > 1)
-			goto out_inval_auth;
-
-		if (args->client_address == NULL)
-			goto out_no_client_address;
-
-		status = nfs_parse_devname(dev_name,
-					   &args->nfs_server.hostname,
-					   NFS4_MAXNAMLEN,
-					   &args->nfs_server.export_path,
-					   NFS4_MAXPATHLEN);
-		if (status < 0)
-			return status;
-
-		break;
-		}
+		return nfs4_validate_text_mount_data(options, args, dev_name);
 	}
 
 	return 0;
@@ -2448,10 +2514,6 @@ out_inval_auth:
 out_no_address:
 	dfprintk(MOUNT, "NFS4: mount program didn't pass remote address\n");
 	return -EINVAL;
-
-out_no_client_address:
-	dfprintk(MOUNT, "NFS4: mount program didn't pass callback address\n");
-	return -EINVAL;
 }
 
 /*
@@ -2618,6 +2680,34 @@ out_err:
 	return ret;
 }
 
+static int nfs4_try_mount(int flags, const char *dev_name,
+			 struct nfs_parsed_mount_data *data,
+			 struct vfsmount *mnt)
+{
+	char *export_path;
+	struct vfsmount *root_mnt;
+	int error;
+
+	dfprintk(MOUNT, "--> nfs4_try_mount()\n");
+
+	export_path = data->nfs_server.export_path;
+	data->nfs_server.export_path = "/";
+	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
+			data->nfs_server.hostname);
+	data->nfs_server.export_path = export_path;
+
+	error = PTR_ERR(root_mnt);
+	if (IS_ERR(root_mnt))
+		goto out;
+
+	error = nfs_follow_remote_path(root_mnt, export_path, mnt);
+
+out:
+	dfprintk(MOUNT, "<-- nfs4_try_mount() = %d%s\n", error,
+			error != 0 ? " [error]" : "");
+	return error;
+}
+
 /*
  * Get the superblock for an NFS4 mountpoint
  */
@@ -2625,8 +2715,6 @@ static int nfs4_get_sb(struct file_syste
 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)
 {
 	struct nfs_parsed_mount_data *data;
-	char *export_path;
-	struct vfsmount *root_mnt;
 	int error = -ENOMEM;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);
@@ -2638,17 +2726,7 @@ static int nfs4_get_sb(struct file_syste
 	if (error < 0)
 		goto out;
 
-	export_path = data->nfs_server.export_path;
-	data->nfs_server.export_path = "/";
-	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
-			data->nfs_server.hostname);
-	data->nfs_server.export_path = export_path;
-
-	error = PTR_ERR(root_mnt);
-	if (IS_ERR(root_mnt))
-		goto out;
-
-	error = nfs_follow_remote_path(root_mnt, export_path, mnt);
+	error = nfs4_try_mount(flags, dev_name, data, mnt);
 
 out:
 	kfree(data->client_address);
diff -up linux-2.6.30.i686/include/linux/nfs4.h.save linux-2.6.30.i686/include/linux/nfs4.h
--- linux-2.6.30.i686/include/linux/nfs4.h.save	2009-09-10 10:14:38.000000000 -0400
+++ linux-2.6.30.i686/include/linux/nfs4.h	2009-09-10 11:06:38.000000000 -0400
@@ -472,6 +472,7 @@ enum lock_type4 {
 
 #define NFSPROC4_NULL 0
 #define NFSPROC4_COMPOUND 1
+#define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
 #if defined(CONFIG_NFS_V4_1)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1798
retrieving revision 1.1799
diff -u -p -r1.1798 -r1.1799
--- kernel.spec	14 Sep 2009 06:01:43 -0000	1.1798
+++ kernel.spec	14 Sep 2009 17:52:34 -0000	1.1799
@@ -725,6 +725,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: linux-2.6-nfs4-ver4opt.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1217,6 +1218,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6-nfs4-ver4opt.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -2038,6 +2040,9 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 14 2009 Steve Dickson <steved at redhat.com>
+- Added support for -o v4 mount parsing
+
 * Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: avoid PFIFO IRQ hardlock, misc LVDS mode fixes, nv5x RAMFC cleanup
 



From steved at fedoraproject.org  Mon Sep 14 17:53:31 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 14 Sep 2009 17:53:31 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-nfs4-ver4opt.patch, NONE,
	1.1 kernel.spec, 1.1799, 1.1800
Message-ID: <20090914175331.58F3E11C00EC@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2467

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-nfs4-ver4opt.patch 
Log Message:
Added support for -o v4 mount parsing


linux-2.6-nfs4-ver4opt.patch:
 fs/nfs/internal.h    |   10 +-
 fs/nfs/super.c       |  214 ++++++++++++++++++++++++++++++++++-----------------
 include/linux/nfs4.h |    1 
 3 files changed, 155 insertions(+), 70 deletions(-)

--- NEW FILE linux-2.6-nfs4-ver4opt.patch ---
diff -up linux-2.6.30.i686/fs/nfs/internal.h.save linux-2.6.30.i686/fs/nfs/internal.h
--- linux-2.6.30.i686/fs/nfs/internal.h.save	2009-09-10 10:14:10.000000000 -0400
+++ linux-2.6.30.i686/fs/nfs/internal.h	2009-09-10 11:06:38.000000000 -0400
@@ -49,6 +49,11 @@ struct nfs_clone_mount {
 #define NFS_MAX_SECFLAVORS	(12)
 
 /*
+ * Value used if the user did not specify a port value.
+ */
+#define NFS_UNSPEC_PORT		(-1)
+
+/*
  * In-kernel mount arguments
  */
 struct nfs_parsed_mount_data {
@@ -63,6 +68,7 @@ struct nfs_parsed_mount_data {
 	unsigned int		auth_flavor_len;
 	rpc_authflavor_t	auth_flavors[1];
 	char			*client_address;
+	unsigned int		version;
 	unsigned int		minorversion;
 	char			*fscache_uniq;
 
@@ -71,7 +77,7 @@ struct nfs_parsed_mount_data {
 		size_t			addrlen;
 		char			*hostname;
 		u32			version;
-		unsigned short		port;
+		int			port;
 		unsigned short		protocol;
 	} mount_server;
 
@@ -80,7 +86,7 @@ struct nfs_parsed_mount_data {
 		size_t			addrlen;
 		char			*hostname;
 		char			*export_path;
-		unsigned short		port;
+		int			port;
 		unsigned short		protocol;
 	} nfs_server;
 
diff -up linux-2.6.30.i686/fs/nfs/super.c.save linux-2.6.30.i686/fs/nfs/super.c
--- linux-2.6.30.i686/fs/nfs/super.c.save	2009-09-10 10:14:24.000000000 -0400
+++ linux-2.6.30.i686/fs/nfs/super.c	2009-09-10 15:14:10.000000000 -0400
@@ -73,7 +73,7 @@ enum {
 	Opt_cto, Opt_nocto,
 	Opt_ac, Opt_noac,
 	Opt_lock, Opt_nolock,
-	Opt_v2, Opt_v3,
+	Opt_v2, Opt_v3, Opt_v4,
 	Opt_udp, Opt_tcp, Opt_rdma,
 	Opt_acl, Opt_noacl,
 	Opt_rdirplus, Opt_nordirplus,
@@ -127,6 +127,7 @@ static const match_table_t nfs_mount_opt
 	{ Opt_nolock, "nolock" },
 	{ Opt_v2, "v2" },
 	{ Opt_v3, "v3" },
+	{ Opt_v4, "v4" },
 	{ Opt_udp, "udp" },
 	{ Opt_tcp, "tcp" },
 	{ Opt_rdma, "rdma" },
@@ -272,6 +273,10 @@ static const struct super_operations nfs
 };
 
 #ifdef CONFIG_NFS_V4
+static int nfs4_validate_text_mount_data(void *options,
+	struct nfs_parsed_mount_data *args, const char *dev_name);
+static int nfs4_try_mount(int flags, const char *dev_name,
+	struct nfs_parsed_mount_data *data, struct vfsmount *mnt);
 static int nfs4_get_sb(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);
 static int nfs4_remote_get_sb(struct file_system_type *fs_type,
@@ -866,6 +871,21 @@ void nfs_parse_ip_address(char *string, 
 }
 
 /*
+ * Select between a default port value and a user-specified port value.
+ * If a zero value is set, then autobind will be used.
+ */
+static void nfs_set_default_port(struct sockaddr *sap, const int parsed_port,
+				 const unsigned short default_port)
+{
+	unsigned short port = default_port;
+
+	if (parsed_port != NFS_UNSPEC_PORT)
+		port = parsed_port;
+
+	nfs_set_port(sap, port);
+}
+
+/*
  * Sanity check the NFS transport protocol.
  *
  */
@@ -1047,10 +1067,18 @@ static int nfs_parse_mount_options(char 
 			break;
 		case Opt_v2:
 			mnt->flags &= ~NFS_MOUNT_VER3;
+			mnt->version = 2;
 			break;
 		case Opt_v3:
 			mnt->flags |= NFS_MOUNT_VER3;
+			mnt->version = 3;
 			break;
+#ifdef CONFIG_NFS_V4
+		case Opt_v4:
+			mnt->flags &= ~NFS_MOUNT_VER3;
+			mnt->version = 4;
+			break;
+#endif
 		case Opt_udp:
 			mnt->flags &= ~NFS_MOUNT_TCP;
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
@@ -1264,10 +1292,18 @@ static int nfs_parse_mount_options(char 
 			switch (option) {
 			case NFS2_VERSION:
 				mnt->flags &= ~NFS_MOUNT_VER3;
+				mnt->version = 2;
 				break;
 			case NFS3_VERSION:
 				mnt->flags |= NFS_MOUNT_VER3;
+				mnt->version = 3;
+				break;
+#ifdef CONFIG_NFS_V4
+			case NFS4_VERSION:
+				mnt->flags &= ~NFS_MOUNT_VER3;
+				mnt->version = 4;
 				break;
+#endif
 			default:
 				goto out_invalid_value;
 			}
@@ -1485,11 +1521,7 @@ static int nfs_try_mount(struct nfs_pars
 		args->mount_server.addrlen = args->nfs_server.addrlen;
 	}
 	request.salen = args->mount_server.addrlen;
-
-	/*
-	 * autobind will be used if mount_server.port == 0
-	 */
-	nfs_set_port(request.sap, args->mount_server.port);
+	nfs_set_default_port(request.sap, args->mount_server.port, 0);
 
 	/*
 	 * Now ask the mount server to map our export path
@@ -1661,6 +1693,7 @@ static int nfs_validate_mount_data(void 
 				   const char *dev_name)
 {
 	struct nfs_mount_data *data = (struct nfs_mount_data *)options;
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
 
 	if (data == NULL)
 		goto out_no_data;
@@ -1672,10 +1705,11 @@ static int nfs_validate_mount_data(void 
 	args->acregmax		= NFS_DEF_ACREGMAX;
 	args->acdirmin		= NFS_DEF_ACDIRMIN;
 	args->acdirmax		= NFS_DEF_ACDIRMAX;
-	args->mount_server.port	= 0;	/* autobind unless user sets port */
-	args->nfs_server.port	= 0;	/* autobind unless user sets port */
+	args->mount_server.port	= NFS_UNSPEC_PORT;
+	args->nfs_server.port	= NFS_UNSPEC_PORT;
 	args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
 	args->auth_flavors[0]	= RPC_AUTH_UNIX;
+	args->minorversion	= 0;
 
 	switch (data->version) {
 	case 1:
@@ -1697,8 +1731,11 @@ static int nfs_validate_mount_data(void 
 			if (data->root.size > NFS3_FHSIZE || data->root.size == 0)
 				goto out_invalid_fh;
 			mntfh->size = data->root.size;
-		} else
+			args->version = 3;
+		} else {
 			mntfh->size = NFS2_FHSIZE;
+			args->version = 2;
+		}
 
 
 		memcpy(mntfh->data, data->root.data, mntfh->size);
@@ -1720,11 +1757,9 @@ static int nfs_validate_mount_data(void 
 		args->acdirmin		= data->acdirmin;
 		args->acdirmax		= data->acdirmax;
 
-		memcpy(&args->nfs_server.address, &data->addr,
-		       sizeof(data->addr));
+		memcpy(sap, &data->addr, sizeof(data->addr));
 		args->nfs_server.addrlen = sizeof(data->addr);
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
 		if (!(data->flags & NFS_MOUNT_TCP))
@@ -1772,12 +1807,18 @@ static int nfs_validate_mount_data(void 
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
-		nfs_set_port((struct sockaddr *)&args->nfs_server.address,
-				args->nfs_server.port);
+		if (args->version == 4)
+#ifdef CONFIG_NFS_V4
+			return nfs4_validate_text_mount_data(options,
+							     args, dev_name);
+#else
+			goto out_v4_not_compiled;
+#endif
+
+		nfs_set_default_port(sap, args->nfs_server.port, 0);
 
 		nfs_set_mount_transport_protocol(args);
 
@@ -1825,6 +1866,12 @@ out_v3_not_compiled:
 	return -EPROTONOSUPPORT;
 #endif /* !CONFIG_NFS_V3 */
 
+#ifndef CONFIG_NFS_V4
+out_v4_not_compiled:
+	dfprintk(MOUNT, "NFS: NFSv4 is not compiled into kernel\n");
+	return -EPROTONOSUPPORT;
+#endif /* !CONFIG_NFS_V4 */
+
 out_nomem:
 	dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n");
 	return -ENOMEM;
@@ -2120,6 +2167,14 @@ static int nfs_get_sb(struct file_system
 	if (error < 0)
 		goto out;
 
+#ifdef CONFIG_NFS_V4
+	if (data->version == 4) {
+		error = nfs4_try_mount(flags, dev_name, data, mnt);
+		kfree(data->client_address);
+		goto out;
+	}
+#endif	/* CONFIG_NFS_V4 */
+
 	/* Get a volume representation */
 	server = nfs_create_server(data, mntfh);
 	if (IS_ERR(server)) {
@@ -2317,6 +2372,43 @@ static void nfs4_validate_mount_flags(st
 	args->flags &= ~(NFS_MOUNT_NONLM|NFS_MOUNT_NOACL|NFS_MOUNT_VER3);
 }
 
+static int nfs4_validate_text_mount_data(void *options,
+					 struct nfs_parsed_mount_data *args,
+					 const char *dev_name)
+{
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
+
+	nfs_set_default_port(sap, args->nfs_server.port, NFS_PORT);
+
+	nfs_validate_transport_protocol(args);
+
+	nfs4_validate_mount_flags(args);
+
+	if (args->version != 4) {
+		dfprintk(MOUNT,
+			 "NFS4: Illegal mount version\n");
+		return -EINVAL;
+	}
+
+	if (args->auth_flavor_len > 1) {
+		dfprintk(MOUNT,
+			 "NFS4: Too many RPC auth flavours specified\n");
+		return -EINVAL;
+	}
+
+	if (args->client_address == NULL) {
+		dfprintk(MOUNT,
+			 "NFS4: mount program didn't pass callback address\n");
+		return -EINVAL;
+	}
+
+	return nfs_parse_devname(dev_name,
+				   &args->nfs_server.hostname,
+				   NFS4_MAXNAMLEN,
+				   &args->nfs_server.export_path,
+				   NFS4_MAXPATHLEN);
+}
+
 /*
  * Validate NFSv4 mount options
  */
@@ -2324,7 +2416,7 @@ static int nfs4_validate_mount_data(void
 				    struct nfs_parsed_mount_data *args,
 				    const char *dev_name)
 {
-	struct sockaddr_in *ap;
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
 	struct nfs4_mount_data *data = (struct nfs4_mount_data *)options;
 	char *c;
 
@@ -2337,23 +2429,22 @@ static int nfs4_validate_mount_data(void
 	args->acregmax		= NFS_DEF_ACREGMAX;
 	args->acdirmin		= NFS_DEF_ACDIRMIN;
 	args->acdirmax		= NFS_DEF_ACDIRMAX;
-	args->nfs_server.port	= NFS_PORT; /* 2049 unless user set port= */
+	args->nfs_server.port	= NFS_UNSPEC_PORT;
 	args->auth_flavors[0]	= RPC_AUTH_UNIX;
 	args->auth_flavor_len	= 0;
+	args->version		= 4;
 	args->minorversion	= 0;
 
 	switch (data->version) {
 	case 1:
-		ap = (struct sockaddr_in *)&args->nfs_server.address;
 		if (data->host_addrlen > sizeof(args->nfs_server.address))
 			goto out_no_address;
 		if (data->host_addrlen == 0)
 			goto out_no_address;
 		args->nfs_server.addrlen = data->host_addrlen;
-		if (copy_from_user(ap, data->host_addr, data->host_addrlen))
+		if (copy_from_user(sap, data->host_addr, data->host_addrlen))
 			return -EFAULT;
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (nfs_verify_server_address(sap))
 			goto out_no_address;
 
 		if (data->auth_flavourlen) {
@@ -2399,39 +2490,14 @@ static int nfs4_validate_mount_data(void
 		nfs_validate_transport_protocol(args);
 
 		break;
-	default: {
-		int status;
-
+	default:
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			return -EINVAL;
 
-		nfs_set_port((struct sockaddr *)&args->nfs_server.address,
-				args->nfs_server.port);
-
-		nfs_validate_transport_protocol(args);
-
-		nfs4_validate_mount_flags(args);
-
-		if (args->auth_flavor_len > 1)
-			goto out_inval_auth;
-
-		if (args->client_address == NULL)
-			goto out_no_client_address;
-
-		status = nfs_parse_devname(dev_name,
-					   &args->nfs_server.hostname,
-					   NFS4_MAXNAMLEN,
-					   &args->nfs_server.export_path,
-					   NFS4_MAXPATHLEN);
-		if (status < 0)
-			return status;
-
-		break;
-		}
+		return nfs4_validate_text_mount_data(options, args, dev_name);
 	}
 
 	return 0;
@@ -2448,10 +2514,6 @@ out_inval_auth:
 out_no_address:
 	dfprintk(MOUNT, "NFS4: mount program didn't pass remote address\n");
 	return -EINVAL;
-
-out_no_client_address:
-	dfprintk(MOUNT, "NFS4: mount program didn't pass callback address\n");
-	return -EINVAL;
 }
 
 /*
@@ -2618,6 +2680,34 @@ out_err:
 	return ret;
 }
 
+static int nfs4_try_mount(int flags, const char *dev_name,
+			 struct nfs_parsed_mount_data *data,
+			 struct vfsmount *mnt)
+{
+	char *export_path;
+	struct vfsmount *root_mnt;
+	int error;
+
+	dfprintk(MOUNT, "--> nfs4_try_mount()\n");
+
+	export_path = data->nfs_server.export_path;
+	data->nfs_server.export_path = "/";
+	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
+			data->nfs_server.hostname);
+	data->nfs_server.export_path = export_path;
+
+	error = PTR_ERR(root_mnt);
+	if (IS_ERR(root_mnt))
+		goto out;
+
+	error = nfs_follow_remote_path(root_mnt, export_path, mnt);
+
+out:
+	dfprintk(MOUNT, "<-- nfs4_try_mount() = %d%s\n", error,
+			error != 0 ? " [error]" : "");
+	return error;
+}
+
 /*
  * Get the superblock for an NFS4 mountpoint
  */
@@ -2625,8 +2715,6 @@ static int nfs4_get_sb(struct file_syste
 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)
 {
 	struct nfs_parsed_mount_data *data;
-	char *export_path;
-	struct vfsmount *root_mnt;
 	int error = -ENOMEM;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);
@@ -2638,17 +2726,7 @@ static int nfs4_get_sb(struct file_syste
 	if (error < 0)
 		goto out;
 
-	export_path = data->nfs_server.export_path;
-	data->nfs_server.export_path = "/";
-	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
-			data->nfs_server.hostname);
-	data->nfs_server.export_path = export_path;
-
-	error = PTR_ERR(root_mnt);
-	if (IS_ERR(root_mnt))
-		goto out;
-
-	error = nfs_follow_remote_path(root_mnt, export_path, mnt);
+	error = nfs4_try_mount(flags, dev_name, data, mnt);
 
 out:
 	kfree(data->client_address);
diff -up linux-2.6.30.i686/include/linux/nfs4.h.save linux-2.6.30.i686/include/linux/nfs4.h
--- linux-2.6.30.i686/include/linux/nfs4.h.save	2009-09-10 10:14:38.000000000 -0400
+++ linux-2.6.30.i686/include/linux/nfs4.h	2009-09-10 11:06:38.000000000 -0400
@@ -472,6 +472,7 @@ enum lock_type4 {
 
 #define NFSPROC4_NULL 0
 #define NFSPROC4_COMPOUND 1
+#define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
 #if defined(CONFIG_NFS_V4_1)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1799
retrieving revision 1.1800
diff -u -p -r1.1799 -r1.1800
--- kernel.spec	11 Sep 2009 20:04:56 -0000	1.1799
+++ kernel.spec	14 Sep 2009 17:53:31 -0000	1.1800
@@ -726,6 +726,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: linux-2.6-nfs4-ver4opt.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1214,6 +1215,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6-nfs4-ver4opt.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -2035,6 +2037,9 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Sep 14 2009 Steve Dickson <steved at redhat.com>
+- Added support for -o v4 mount parsing
+
 * Fri Sep 11 2009 Dave Jones <davej at redhat.com>
 - Apply NX/RO to modules
 



From hadess at fedoraproject.org  Mon Sep 14 17:56:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 14 Sep 2009 17:56:12 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkit-1.1.14-nspluginwrapper.patch, NONE,
	1.1 webkitgtk.spec, 1.20, 1.21
Message-ID: <20090914175612.4134111C00EC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3572

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.1.14-nspluginwrapper.patch 
Log Message:
* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3
- Add support for nspluginwrapper plugins


webkit-1.1.14-nspluginwrapper.patch:
 PluginDatabase.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE webkit-1.1.14-nspluginwrapper.patch ---
--- webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp.orig	2009-09-14 17:48:44.000000000 +0100
+++ webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp	2009-09-14 17:50:28.000000000 +0100
@@ -355,6 +355,9 @@ Vector<String> PluginDatabase::defaultPl
     paths.append("/usr/lib/netscape/plugins-libc6");
     paths.append("/usr/lib64/netscape/plugins");
     paths.append("/usr/lib64/mozilla/plugins");
+    /* And for nspluginwrapper */
+    paths.append("/usr/lib64/mozilla/plugins-wrapped");
+    paths.append("/usr/lib/mozilla/plugins-wrapped");
 
     String mozHome(getenv("MOZILLA_HOME"));
     mozHome.append("/plugins");


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- webkitgtk.spec	8 Sep 2009 19:02:17 -0000	1.20
+++ webkitgtk.spec	14 Sep 2009 17:56:12 -0000	1.21
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -49,6 +49,7 @@ Source0:	http://www.webkitgtk.org/webkit
 
 Patch0: 	webkit-1.1.14-atomic-word.patch
 Patch1: 	webkit-1.1.13-no-execmem.patch
+Patch2: 	webkit-1.1.14-nspluginwrapper.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +113,7 @@ LICENSE, README, and AUTHORS files.
 %setup -qn "webkit-%{version}"
 %patch0 -p1 -b .atomic-word
 %patch1 -p1 -b .no-execmem
+%patch2 -p1 -b .nspluginwrapper
 
 %build
 CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
@@ -188,6 +190,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3
+- Add support for nspluginwrapper plugins
+
 * Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.1.14-2
 - bump release and rebuild as the package was linked with an old libicu
   during the mass rebuild on s390x



From davidz at fedoraproject.org  Mon Sep 14 18:19:29 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 14 Sep 2009 18:19:29 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.13,1.14
Message-ID: <20090914181929.2247211C00EC@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11639

Modified Files:
	polkit-gnome.spec 
Log Message:
* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.3
- Obsolete old PolicyKit-gnome packages




Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- polkit-gnome.spec	13 Sep 2009 20:40:34 -0000	1.13
+++ polkit-gnome.spec	14 Sep 2009 18:19:28 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.95
-Release: 0.git20090913.2%{?dist}
+Release: 0.git20090913.3%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -15,6 +15,9 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gir-repository-devel
 
+Obsoletes: PolicyKit-gnome
+Obsoletes: PolicyKit-gnome-libs
+
 Requires: polkit >= 0.95
 
 %description
@@ -86,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.3
+- Obsolete old PolicyKit-gnome packages
+
 * Sun Sep 13 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.2
 - Update BR
 



From markmc at fedoraproject.org  Mon Sep 14 18:30:46 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 14 Sep 2009 18:30:46 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.6.4-svirt-sound.patch, 1.4,
	1.5 libvirt.spec, 1.174, 1.175 sources, 1.47, 1.48
Message-ID: <20090914183046.2243011C00EC@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16180

Modified Files:
	libvirt-0.6.4-svirt-sound.patch libvirt.spec sources 
Log Message:
* Mon Sep 14 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.2.gitfac3f4c
- Update to newer snapshot of 0.7.1
- Stop libvirt using untrusted 'info vcpus' PID data (#520864)
- Support relabelling of USB and PCI devices
- Enable multipath storage support
- Restart libvirtd upon RPM upgrade


libvirt-0.6.4-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libvirt-0.6.4-svirt-sound.patch	19 Aug 2009 17:13:01 -0000	1.4
+++ libvirt-0.6.4-svirt-sound.patch	14 Sep 2009 18:30:45 -0000	1.5
@@ -1,4 +1,4 @@
-From 5f8d720b5f1393ee333a5fa8375ffe9ac954d48b Mon Sep 17 00:00:00 2001
+From e2106f6db9beb9f48e9f87f8a1eaba821d1a2296 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 17 Aug 2009 08:32:08 +0100
 Subject: [PATCH] Disable sound cards when running sVirt
@@ -12,10 +12,10 @@ Fedora-patch: libvirt-0.6.4-svirt-sound.
  1 files changed, 16 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 6b0b404..53186e0 100644
+index f92bcef..f3b4ef0 100644
 --- a/src/qemu_conf.c
 +++ b/src/qemu_conf.c
-@@ -1384,6 +1384,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
+@@ -1510,6 +1510,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
      char uuid[VIR_UUID_STRING_BUFLEN];
      char domid[50];
      const char *cpu = NULL;
@@ -36,7 +36,7 @@ index 6b0b404..53186e0 100644
  
      uname_normalize(&ut);
  
-@@ -2015,7 +2029,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
+@@ -2181,7 +2195,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
      }
  
      /* Add sound hardware */


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- libvirt.spec	6 Sep 2009 13:46:19 -0000	1.174
+++ libvirt.spec	14 Sep 2009 18:30:45 -0000	1.175
@@ -18,6 +18,7 @@
 %define with_storage_lvm   0%{!?_without_storage_lvm:1}
 %define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
 %define with_storage_disk  0%{!?_without_storage_disk:1}
+%define with_storage_mpath 0%{!?_without_storage_mpath:1}
 %define with_numactl       0%{!?_without_numactl:1}
 
 # default to off - selectively enabled below
@@ -72,12 +73,12 @@
 %define with_one    0
 %endif
 
-%define git_snapshot git3ef2e05
+%define git_snapshot gitfac3f4c
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 0.1.%{git_snapshot}%{?dist}%{?extra_release}
+Release: 0.2.%{git_snapshot}%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}-%{git_snapshot}.tar.gz
@@ -119,6 +120,11 @@ Requires: glusterfs-client >= 2.0.1
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
+# For image compression
+Requires: gzip
+Requires: bzip2
+Requires: lzop
+Requires: xz
 %else
 %if %{with_xen}
 # From Xen RPMs
@@ -137,6 +143,10 @@ Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
 %endif
+%if %{with_storage_mpath}
+# For multipath support
+Requires: device-mapper
+%endif
 %if %{with_xen}
 BuildRequires: xen-devel
 %endif
@@ -192,6 +202,10 @@ BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
 %endif
+%if %{with_storage_mpath}
+# For Multipath support
+BuildRequires: device-mapper-devel
+%endif
 %if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
@@ -341,6 +355,10 @@ of recent versions of Linux (and other O
 %define _without_storage_disk --without-storage-disk
 %endif
 
+%if ! %{with_storage_mpath}
+%define _without_storage_mpath --without-storage-mpath
+%endif
+
 %if ! %{with_numactl}
 %define _without_numactl --without-numactl
 %endif
@@ -372,6 +390,7 @@ of recent versions of Linux (and other O
            %{?_without_storage_lvm} \
            %{?_without_storage_iscsi} \
            %{?_without_storage_disk} \
+           %{?_without_storage_mpath} \
            %{?_without_numactl} \
            %{?_without_capng} \
            %{?_without_netcf} \
@@ -460,6 +479,9 @@ fi
 %endif
 
 /sbin/chkconfig --add libvirtd
+if [ "$1" -ge "1" ]; then
+	/sbin/service libvirtd condrestart > /dev/null 2>&1
+fi
 %endif
 
 %preun
@@ -628,6 +650,13 @@ fi
 %endif
 
 %changelog
+* Mon Sep 14 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.2.gitfac3f4c
+- Update to newer snapshot of 0.7.1
+- Stop libvirt using untrusted 'info vcpus' PID data (#520864)
+- Support relabelling of USB and PCI devices
+- Enable multipath storage support
+- Restart libvirtd upon RPM upgrade
+
 * Sun Sep  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.1.gitg3ef2e05
 - Update to pre-release git snapshot of 0.7.1
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	6 Sep 2009 13:46:19 -0000	1.47
+++ sources	14 Sep 2009 18:30:45 -0000	1.48
@@ -1 +1 @@
-d47a8065f71e68d60ff020ba9b370801  libvirt-0.7.1-git3ef2e05.tar.gz
+84cb07d98032787f1e2a36776768e297  libvirt-0.7.1-gitfac3f4c.tar.gz



From hadess at fedoraproject.org  Mon Sep 14 18:32:25 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 14 Sep 2009 18:32:25 +0000 (UTC)
Subject: rpms/epiphany/devel 0001-Setup-nspluginwrapper-if-available.patch, 
	NONE, 1.1 epiphany.spec, 1.243,
	1.244 epiphany-2.20.1-wrapped-plugins.patch, 1.3, NONE
Message-ID: <20090914183225.0403B11C00EC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16945

Modified Files:
	epiphany.spec 
Added Files:
	0001-Setup-nspluginwrapper-if-available.patch 
Removed Files:
	epiphany-2.20.1-wrapped-plugins.patch 
Log Message:
* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
- Call nspluginwrapper's config tool if available


0001-Setup-nspluginwrapper-if-available.patch:
 ephy-embed-single.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Setup-nspluginwrapper-if-available.patch ---
>From bd03e748e07dd300015fdfee111420162f346e5f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Sep 2009 19:30:03 +0100
Subject: [PATCH] Setup nspluginwrapper if available

By calling mozilla-plugin-config on startup.
---
 embed/ephy-embed-single.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 4930f8e..aba0916 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
+#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
 
 #include "ephy-embed-single.h"
 #include "ephy-embed-prefs.h"
@@ -333,6 +334,10 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
   SoupCookieJar *jar;
   char *filename;
 
+  /* Initialise nspluginwrapper's plugins if available */
+  if (g_file_test (NSPLUGINWRAPPER_SETUP, G_FILE_TEST_EXISTS) != FALSE)
+    g_spawn_command_line_sync (NSPLUGINWRAPPER_SETUP, NULL, NULL, NULL, NULL);
+
   ephy_embed_prefs_init ();
 
   session = webkit_get_default_session ();
-- 
1.6.2.5



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- epiphany.spec	8 Sep 2009 19:32:02 -0000	1.243
+++ epiphany.spec	14 Sep 2009 18:32:24 -0000	1.244
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.27.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -51,6 +51,7 @@ BuildRequires: nss-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
+Patch1: 0001-Setup-nspluginwrapper-if-available.patch
 Patch2: epiphany-default-bookmarks.patch
 
 %description
@@ -96,6 +97,7 @@ Install epiphany-devel if you want to wr
 %setup -q
 
 %patch0 -p1 -b .homepage
+%patch1 -p1 -b .nspluginwrapper
 %patch2 -p1 -b .default-bookmarks
 
 # Fedora Epiphany version
@@ -245,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
+- Call nspluginwrapper's config tool if available
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


--- epiphany-2.20.1-wrapped-plugins.patch DELETED ---



From kkofler at fedoraproject.org  Mon Sep 14 18:36:37 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 14 Sep 2009 18:36:37 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.287,1.288
Message-ID: <20090914183637.80E0611C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18534/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- kdebase-workspace.spec	12 Sep 2009 22:43:45 -0000	1.287
+++ kdebase-workspace.spec	14 Sep 2009 18:36:36 -0000	1.288
@@ -1,3 +1,6 @@
+%if 0%{?fedora} && 0%{?fedora} < 12
+%define with_polkit_09 1
+%endif
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -5,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -37,7 +40,12 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
+%if 0%{?with_polkit_09}
 Requires: PolicyKit-authentication-agent
+%else
+Obsoletes: PolicyKit-kde < %{version}-%{release}
+#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+%endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -67,7 +75,9 @@ BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+%if 0%{?with_polkit_09}
 BuildRequires: polkit-qt-devel
+%endif
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
@@ -543,6 +553,7 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%if 0%{?with_polkit_09}
 %files -n PolicyKit-kde
 %defattr(-,root,root,-)
 %{_kde4_bindir}/polkit-kde-authorization
@@ -555,6 +566,7 @@ fi
 #files -n PolicyKit-kde-libs
 #defattr(-,root,root,-)
 %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
 
 %files python-applet
 %defattr(-,root,root,-)
@@ -571,6 +583,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
+
 * Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - -python-applet: Provides: plasma-scriptengine-python
 - Requires: system-ksplash-theme (f12+,rhel6+)



From kkofler at fedoraproject.org  Mon Sep 14 18:46:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 14 Sep 2009 18:46:31 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.288,1.289
Message-ID: <20090914184631.8569E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21939/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
Obsoletes: polkit-qt < 0.10


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- kdebase-workspace.spec	14 Sep 2009 18:36:36 -0000	1.288
+++ kdebase-workspace.spec	14 Sep 2009 18:46:31 -0000	1.289
@@ -44,7 +44,9 @@ Obsoletes: kdebase-workspace < 4.3.0-2
 Requires: PolicyKit-authentication-agent
 %else
 Obsoletes: PolicyKit-kde < %{version}-%{release}
+# if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+Obsoletes: polkit-qt < 0.10
 %endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself



From rathann at fedoraproject.org  Mon Sep 14 19:05:18 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 19:05:18 +0000 (UTC)
Subject: rpms/xmp/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xmp.spec, 1.6,
	1.7 xmp-2.5.1-audacious2.patch, 1.3, NONE
Message-ID: <20090914190518.C577711C00EC@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/xmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28833

Modified Files:
	.cvsignore sources xmp.spec 
Removed Files:
	xmp-2.5.1-audacious2.patch 
Log Message:
* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
- updated to 2.7.1
- dropped obsolete patch
- fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Nov 2008 16:52:31 -0000	1.2
+++ .cvsignore	14 Sep 2009 19:05:18 -0000	1.3
@@ -1 +1 @@
-xmp-2.5.1-free.tar.gz
+xmp-2.7.1-free.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Nov 2008 16:52:31 -0000	1.2
+++ sources	14 Sep 2009 19:05:18 -0000	1.3
@@ -1 +1 @@
-bf44830ae7d82adb346820024a02350e  xmp-2.5.1-free.tar.gz
+b80fef62b1326bb5f0f970348ed8306f  xmp-2.7.1-free.tar.gz


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xmp.spec	27 Jul 2009 08:20:10 -0000	1.6
+++ xmp.spec	14 Sep 2009 19:05:18 -0000	1.7
@@ -2,8 +2,8 @@
 %define xmms_input_plugin_dir %(xmms-config --input-plugin-dir)
 
 Name: xmp
-Version: 2.5.1
-Release: 8%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -12,7 +12,6 @@ Source: http://rathann.fedorapeople.org/
 # run this to get the above tarball
 Source1: mktarball.sh
 Patch0: %{name}-nostrip.patch
-Patch1: xmp-2.5.1-audacious2.patch
 License: GPLv2+
 URL: http://xmp.sourceforge.net/
 Buildrequires: alsa-lib-devel
@@ -56,7 +55,6 @@ This package contains the xmp plugin for
 %prep
 %setup -q
 %patch0 -p1 -b .nostrip
-%patch1 -p1 -b .audacious2
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -94,6 +92,11 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
+- updated to 2.7.1
+- dropped obsolete patch
+- fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xmp-2.5.1-audacious2.patch DELETED ---



From eponyme at fedoraproject.org  Mon Sep 14 19:21:25 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon, 14 Sep 2009 19:21:25 +0000 (UTC)
Subject: rpms/monkeystudio/devel import.log, NONE, 1.1 monkeystudio.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914192125.08F1A11C00EC@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/monkeystudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5701/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log monkeystudio.spec 
Log Message:
New package



--- NEW FILE import.log ---
monkeystudio-1_8_4_0-0_2_20090824svn3243_fc11:HEAD:monkeystudio-1.8.4.0-0.2.20090824svn3243.fc11.src.rpm:1252956054


--- NEW FILE monkeystudio.spec ---
%global alphatag     20090824
%global svn_revision svn3243

# Package source is take from upstream svn repository
# Use this command to generate source tarball :
# svn export -r 3243 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3243
# tar cfz mks-svn3243.tar.gz mks-svn3243 

Name:           monkeystudio
Version:        1.8.4.0
Release:        0.2.%{alphatag}%{svn_revision}%{?dist}
Summary:        Free crossplatform Qt 4 IDE

Group:          Development/Tools
License:        GPLv3
URL:            http://www.%{name}.org/
Source0:        mks-%{svn_revision}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Version is specified to avoid plugin problems (see #475110 C22)
BuildRequires:  qt-devel >= 4.5.2-12
BuildRequires:  desktop-file-utils
BuildRequires:  qscintilla-devel

%description
MonkeyStudio is a crossplatform Integrated Development Environment ( IDE )
aiming to become a Rapid Application Development ( RAD ) environment.
MonkeyStudio runs everywhere Qt 4.4.0 ( minimum required to build it )
is available as a shared library. It is extensible via a great and powerful
plugin system which help make it do nearly anything you want and support
virtually any kind of project type for which a plugin exists or is created.
The primary goal of MonkeyStudio was to manage Qt4 projects as best
as possible, it directly uses .pro files and does not create intrusive or
unsightly configuration files. MonkyStudio is also a multi language
code editor too ( javascript, xml, ... ).


%prep
%setup -q -n mks-%{svn_revision}

chmod 0644 datas/templates/Python/PyQt\ Gui/{\$Form\ File\ Name\$.ui,template.ini,\$Project\ Name\$.xpyqt}
chmod 0644 datas/templates/Python/Qt\ Form/{\$Class\ Name\$.ui,template.ini}
chmod 0644 datas/templates/Python/PyQt\ Console/{template.ini,\$Project\ Name\$.xpyqt}
chmod 0644 datas/templates/Python/QObject\ Herited\ Class/template.ini
chmod 0644 plugins/interpreter/Python/src/*.{cpp,h}
chmod 0644 plugins/xup/PyQt/src/PyQt.{cpp,h}
chmod 0755 datas/apis/tags2api.py

# UpdateChecker is removed because yum will take care of updates
sed -i -e 's/UpdateChecker//' plugins/base/base.pro

sed -i -e 's/\r//' 'datas/templates/Python/Qt Form/template.ini' 'datas/templates/Python/Qt Form/$Class Name$.ui' readme.txt 'datas/templates/Python/PyQt Gui/$Form File Name$.ui' dev-readme 'datas/apis/tags2api.py'
sed -i -e 's/\.ui/ui/' -e 's/\.moc/moc/' -e 's/\.rcc/rcc/' config.pri
sed -i -e 's/\.moc/moc/' plugins/plugins.pri 


%build
%{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
# removing %%{?_smp_mflags} because parallel compilation doesn't work on this package
make 


%install
rm -rf $RPM_BUILD_ROOT
%{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
make install INSTALL_ROOT=$RPM_BUILD_ROOT
desktop-file-install --vendor="" \
  --mode 644 \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Doxyfile GPL-2 GPL-3 LGPL-3 readme.txt dev-readme
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Mon Aug 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.2.20090824svn3243
- Add qt-devel version to avoid plugin problems
- Removed UpdateChecker plugin compilation
* Mon Aug 24 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.1.20090824svn3243
- Now using svn
* Sat Jun 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.3-2
- Remove 64 bits trick
- Use qt4 macros
- Fix some files permissions
* Sun May 10 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.3-1
- Rebuild for 1.8.3.3
* Sun Feb 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.2-1
- Rebuild for 1.8.3.2
* Mon Dec 29 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.0-1
- Rebuild for 1.8.3.0 release
* Sun Dec  7 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.3.0-1.2625svn
- initital build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:01:13 -0000	1.1
+++ .cvsignore	14 Sep 2009 19:21:24 -0000	1.2
@@ -0,0 +1 @@
+mks-svn3243.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:01:13 -0000	1.1
+++ sources	14 Sep 2009 19:21:24 -0000	1.2
@@ -0,0 +1 @@
+103e041f523cbbc249e2d127eef221fb  mks-svn3243.tar.gz



From rathann at fedoraproject.org  Mon Sep 14 19:23:01 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 19:23:01 +0000 (UTC)
Subject: rpms/newsx/devel newsx.spec,1.13,1.14
Message-ID: <20090914192301.0F64111C00EC@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/newsx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7373

Modified Files:
	newsx.spec 
Log Message:
- changed source URL to tin.org
- rebuilt after rhbz#511772 was fixed



Index: newsx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- newsx.spec	25 Jul 2009 19:15:35 -0000	1.13
+++ newsx.spec	14 Sep 2009 19:23:00 -0000	1.14
@@ -1,11 +1,11 @@
 Name:		newsx
 Version:	1.6
-Release:	12%{?dist}
+Release:	13%{?dist}
 License:	GPLv2+
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz?dzie do wymiany news?w po NNTP
 Group:		Applications/Internet
-Source0:	ftp://ftp.kvaleberg.com/pub/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.tin.org/pub/news/utils/newsx/%{name}-%{version}.tar.gz
 # Source0-md5:	ad9c76c53d5c7d21d86bec805fe8cd34
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-stack.patch
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man[158]/*
 
 %changelog
+* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 1.6-13
+- changed source URL to tin.org
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Sep 14 19:27:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:27:32 +0000
Subject: [pkgdb] wesnoth: bruno has requested watchbugzilla
Message-ID: <20090914192732.738FF10F867@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on wesnoth (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:27:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:27:36 +0000
Subject: [pkgdb] wesnoth: bruno has requested watchcommits
Message-ID: <20090914192736.B27CF10F883@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on wesnoth (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:27:57 +0000
Subject: [pkgdb] wesnoth: bruno has requested watchbugzilla
Message-ID: <20090914192757.BD2F210F880@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on wesnoth (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:27:58 +0000
Subject: [pkgdb] wesnoth: bruno has requested watchcommits
Message-ID: <20090914192758.3E79410F888@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on wesnoth (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:28:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:28:01 +0000
Subject: [pkgdb] wesnoth: bruno has requested watchbugzilla
Message-ID: <20090914192802.0A82B10F895@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on wesnoth (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:28:02 +0000
Subject: [pkgdb] wesnoth: bruno has requested watchcommits
Message-ID: <20090914192802.646F010F89A@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on wesnoth (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From eponyme at fedoraproject.org  Mon Sep 14 19:30:44 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon, 14 Sep 2009 19:30:44 +0000 (UTC)
Subject: rpms/monkeystudio/devel monkeystudio.spec,1.1,1.2
Message-ID: <20090914193044.5873111C0374@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/monkeystudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11813

Modified Files:
	monkeystudio.spec 
Log Message:
Removed unused licence files


Index: monkeystudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/monkeystudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monkeystudio.spec	14 Sep 2009 19:21:24 -0000	1.1
+++ monkeystudio.spec	14 Sep 2009 19:30:44 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           monkeystudio
 Version:        1.8.4.0
-Release:        0.2.%{alphatag}%{svn_revision}%{?dist}
+Release:        0.3.%{alphatag}%{svn_revision}%{?dist}
 Summary:        Free crossplatform Qt 4 IDE
 
 Group:          Development/Tools
@@ -18,7 +18,7 @@ Source0:        mks-%{svn_revision}.tar.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Version is specified to avoid plugin problems (see #475110 C22)
-BuildRequires:  qt-devel >= 4.5.2-12
+BuildRequires:  qt-devel>=4.5.2-12
 BuildRequires:  desktop-file-utils
 BuildRequires:  qscintilla-devel
 
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Doxyfile GPL-2 GPL-3 LGPL-3 readme.txt dev-readme
+%doc Doxyfile GPL-3 readme.txt dev-readme
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/%{name}
@@ -85,6 +85,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.3.20090824svn3243
+- Removed unused licence files
 * Mon Aug 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.2.20090824svn3243
 - Add qt-devel version to avoid plugin problems
 - Removed UpdateChecker plugin compilation



From pkgdb at fedoraproject.org  Mon Sep 14 19:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:32:12 +0000
Subject: [pkgdb] wesnoth had acl change status
Message-ID: <20090914193212.6719B10F867@bastion2.fedora.phx.redhat.com>

limb has set the watchbugzilla acl on wesnoth (Fedora devel) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:32:13 +0000
Subject: [pkgdb] wesnoth had acl change status
Message-ID: <20090914193213.6320510F883@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on wesnoth (Fedora devel) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:32:24 +0000
Subject: [pkgdb] wesnoth had acl change status
Message-ID: <20090914193224.4B04F10F895@bastion2.fedora.phx.redhat.com>

limb has set the watchbugzilla acl on wesnoth (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:32:26 +0000
Subject: [pkgdb] wesnoth had acl change status
Message-ID: <20090914193226.10FD510F896@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on wesnoth (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:32:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:32:28 +0000
Subject: [pkgdb] wesnoth had acl change status
Message-ID: <20090914193228.1F0CD10F89C@bastion2.fedora.phx.redhat.com>

limb has set the watchbugzilla acl on wesnoth (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From pkgdb at fedoraproject.org  Mon Sep 14 19:32:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 19:32:28 +0000
Subject: [pkgdb] wesnoth had acl change status
Message-ID: <20090914193228.A853B10F8A0@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on wesnoth (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wesnoth



From clumens at fedoraproject.org  Mon Sep 14 19:34:01 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Mon, 14 Sep 2009 19:34:01 +0000 (UTC)
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.62, 1.63 sources, 
	1.76, 1.77 system-config-kickstart.spec, 1.83, 1.84
Message-ID: <20090914193401.1004311C00EC@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13005

Modified Files:
	.cvsignore sources system-config-kickstart.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	29 Jul 2009 03:15:30 -0000	1.62
+++ .cvsignore	14 Sep 2009 19:34:00 -0000	1.63
@@ -6,3 +6,4 @@ system-config-kickstart-2.7.21.tar.gz
 system-config-kickstart-2.7.22.tar.gz
 system-config-kickstart-2.8.0.tar.gz
 system-config-kickstart-2.8.1.tar.gz
+system-config-kickstart-2.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	29 Jul 2009 03:15:30 -0000	1.76
+++ sources	14 Sep 2009 19:34:00 -0000	1.77
@@ -1 +1 @@
-7a0f2981e53957198d2d6b4528a1a4e2  system-config-kickstart-2.8.1.tar.gz
+86d2f4272a525afdd1e8336c6d19464a  system-config-kickstart-2.8.2.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- system-config-kickstart.spec	10 Aug 2009 10:11:20 -0000	1.83
+++ system-config-kickstart.spec	14 Sep 2009 19:34:00 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
-Version: 2.8.1
-Release: 2%{?dist}
+Version: 2.8.2
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
@@ -15,9 +15,10 @@ Source0: %{name}-%{version}.tar.gz
 
 Obsoletes: ksconfig, redhat-config-kickstart, mkkickstart
 BuildRequires: desktop-file-utils, intltool, gettext
-Requires: pygtk2 >= 1.99.11, pygtk2-libglade, python >= 2.3.3, hwdata, rhpl
+Requires: pygtk2 >= 1.99.11, pygtk2-libglade, python >= 2.3.3, hwdata
 Requires: system-config-language, system-config-date, python-meh
 Requires: pykickstart >= 0.96, yum, anaconda >= 11.4.0.42-1, hicolor-icon-theme
+Requires: system-config-keyboard >= 1.3.1
 Requires(post): gtk2 >= 2.6
 Requires(postun): gtk2 >= 2.6
 
@@ -68,9 +69,6 @@ fi
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
-* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.8.1-2
-- Convert specfile to UTF-8.
-
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> - 2.8.1-1
 - Change the skipx blurb to make more sense (#493835).
 - Update to using python-meh for exception handling instead of rhpl.
@@ -665,7 +663,7 @@ fi
 * Mon May 13 2002 Brent Fox <bfox at redhat.com> 2.0-8
 - Fixed bug #64835 to make UK keyboard 'uk' not 'gb'
 
-* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0-7
+* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0-7
 - Update translations
 
 * Thu Apr 11 2002 Brent Fox <bfox at redhat.com>



From dwalsh at fedoraproject.org  Mon Sep 14 19:39:20 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 14 Sep 2009 19:39:20 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.55,
	1.56 policycoreutils-rhat.patch, 1.440,
	1.441 policycoreutils.spec, 1.639, 1.640
Message-ID: <20090914193920.5DCB711C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14819

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-3
- Fix restorecond script to use force-reload


policycoreutils-po.patch:
 Makefile            |   28 
 POTFILES            |   28 
 POTFILES.in         |    1 
 af.po               | 2449 +++++++++++++++++++++++--
 am.po               | 2449 +++++++++++++++++++++++--
 ar.po               | 2449 +++++++++++++++++++++++--
 as.po               | 3499 ++++++++++++++++++++++--------------
 be.po               | 2449 +++++++++++++++++++++++--
 bg.po               | 3605 ++++++++++++++++++++++---------------
 bn.po               | 2449 +++++++++++++++++++++++--
 bn_IN.po            | 4066 ++++++++++++++++++++++++------------------
 bs.po               | 2505 +++++++++++++++++++++++---
 ca.po               | 2906 +++++++++++++++++++++++++-----
 cs.po               | 2841 ++++++++++++++++++++++++-----
 cy.po               | 2449 +++++++++++++++++++++++--
 da.po               | 3128 +++++++++++++++++++++++++++-----
 de.po               | 4298 +++++++++++++++++++++++++-------------------
 el.po               | 2512 +++++++++++++++++++++++---
 en_GB.po            | 2505 +++++++++++++++++++++++---
 es.po               | 4575 ++++++++++++++++++++++++++---------------------
 et.po               | 2447 +++++++++++++++++++++++--
 eu_ES.po            | 2449 +++++++++++++++++++++++--
 fa.po               | 2449 +++++++++++++++++++++++--
 fi.po               | 3158 ++++++++++++++++++++++++++++----
 fr.po               | 3856 +++++++++++++++++++++++-----------------
 gl.po               | 2447 +++++++++++++++++++++++--
 gu.po               | 4130 ++++++++++++++++++++++++------------------
 he.po               | 2449 +++++++++++++++++++++++--
 hi.po               | 4117 ++++++++++++++++++++++++------------------
 hr.po               | 2997 ++++++++++++++++++++-----------
 hu.po               | 3071 +++++++++++++++++++++++++++----
 hy.po               | 2449 +++++++++++++++++++++++--
 id.po               | 2447 +++++++++++++++++++++++--
 is.po               | 2449 +++++++++++++++++++++++--
 it.po               | 4531 ++++++++++++++++++++++++++---------------------
 ja.po               | 4183 ++++++++++++++++++++++++-------------------
 ka.po               | 2449 +++++++++++++++++++++++--
 kn.po               | 3841 ++++++++++-----------------------------
 ko.po               | 2793 ++++++++++++++++++++++++-----
 ku.po               | 2449 +++++++++++++++++++++++--
 lo.po               | 2449 +++++++++++++++++++++++--
 lt.po               | 2449 +++++++++++++++++++++++--
 lv.po               | 2449 +++++++++++++++++++++++--
 mai.po              | 3462 ++++++++++++++++++++++++++++++++++++
 mk.po               | 2505 +++++++++++++++++++++++---
 ml.po               | 4274 ++++++++++++++++++++++++--------------------
 mr.po               | 4156 ++++++++++++++++++++++++-------------------
 ms.po               | 2498 +++++++++++++++++++++++--
 my.po               | 2449 +++++++++++++++++++++++--
 nb.po               | 2485 +++++++++++++++++++++++--
 nl.po               | 2920 ++++++++++++++++++++++++------
 nn.po               | 2449 +++++++++++++++++++++++--
 no.po               | 1272 -------------
 nso.po              | 2449 +++++++++++++++++++++++--
 or.po               | 3984 +++++++++++++++++++++++------------------
 pa.po               | 4075 +++++++++++++++++++++++-------------------
 pl.po               | 4014 +++++++++++++++++++++++------------------
 policycoreutils.pot | 2431 +++++++++++++++++++++++--
 pt.po               | 4999 ++++++++++++++++++++++++++++------------------------
 pt_BR.po            | 4979 ++++++++++++++++++++++++++++-----------------------
 ro.po               | 2449 +++++++++++++++++++++++--
 ru.po               | 3468 +++++++++++++++++++++++-------------
 si.po               | 2449 +++++++++++++++++++++++--
 sk.po               | 2505 +++++++++++++++++++++++---
 sl.po               | 2449 +++++++++++++++++++++++--
 sq.po               | 2449 +++++++++++++++++++++++--
 sr.po               | 4125 ++++++++++++++++++++++++------------------
 sr at latin.po         | 4135 ++++++++++++++++++++++++-------------------
 sv.po               | 3165 ++++++++++++++++++++++----------
 ta.po               | 3935 ++++++++++++++++++++++++++--------------
 te.po               | 4069 +++++++++++++++++++++++-------------------
 th.po               | 2449 +++++++++++++++++++++++--
 tr.po               | 2449 +++++++++++++++++++++++--
 uk.po               | 2505 +++++++++++++++++++++++---
 ur.po               | 2449 +++++++++++++++++++++++--
 vi.po               | 2449 +++++++++++++++++++++++--
 zh_CN.po            | 3887 +++++++++++++++++++++++-----------------
 zh_TW.po            | 4174 ++++++++++++++++++++++++-------------------
 zu.po               | 2449 +++++++++++++++++++++++--
 79 files changed, 173328 insertions(+), 59781 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.55 -r 1.56 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- policycoreutils-po.patch	8 Sep 2009 14:15:50 -0000	1.55
+++ policycoreutils-po.patch	14 Sep 2009 19:39:09 -0000	1.56
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.73/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/af.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/af.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3047,7 +3047,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.73/po/am.po
 --- nsapolicycoreutils/po/am.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/am.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/am.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6094,7 +6094,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.73/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ar.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/ar.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -9141,7 +9141,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.73/po/as.po
 --- nsapolicycoreutils/po/as.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/as.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/as.po	2009-09-14 15:37:43.000000000 -0400
 @@ -1,23 +1,23 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -13728,7 +13728,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "????????????"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.73/po/be.po
 --- nsapolicycoreutils/po/be.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/be.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/be.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -16775,7 +16775,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.73/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bg.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bg.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21344,7 +21344,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.73/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn_IN.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bn_IN.po	2009-09-14 15:37:43.000000000 -0400
 @@ -9,10 +9,10 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -26105,7 +26105,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Disabled\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.73/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bn.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -29152,7 +29152,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.73/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bs.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bs.po	2009-09-14 15:37:43.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -32289,7 +32289,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgstr "Zahtijeva vrijednost"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.73/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ca.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/ca.po	2009-09-14 15:37:43.000000000 -0400
 @@ -5,6 +5,8 @@
  #
  # Josep Puigdemont Casamaj?? <josep.puigdemont at gmail.com>, 2006.
@@ -35813,7 +35813,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "Error en les opcions: %s "
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.73/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cs.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/cs.po	2009-09-14 15:37:43.000000000 -0400
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -39435,7 +39435,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.73/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cy.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/cy.po	2009-09-14 15:37:43.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -42482,7 +42482,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.73/po/da.po
 --- nsapolicycoreutils/po/da.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/da.po	2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/da.po	2009-09-14 15:37:43.000000000 -0400
 @@ -1,24 +1,25 @@
 -# translation of da.po to
 -# Danish messages for policycoreutils.
@@ -46378,13 +46378,15 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ "semodule -i %s.pp\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.73/po/de.po
 --- nsapolicycoreutils/po/de.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/de.po	2009-09-08 09:38:58.000000000 -0400
-@@ -1,4 +1,3 @@
++++ policycoreutils-2.0.73/po/de.po	2009-09-14 15:37:43.000000000 -0400
+@@ -1,28 +1,30 @@
 -# translation of policycoreutils.HEAD.de.po to German
++# translation of policycoreutils.HEAD.de.po to
  # German translation of policycoreutils.
- # Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+-# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ #
  #
-@@ -6,23 +5,24 @@
  # Holger Wansing <linux at wansing-online.de>, 2006.
  # Timo Trinks <ttrinks at redhat.com>, 2006, 2007.
  # Michael Sch??nitzer <michael at schoenitzer.de>, 2007.
@@ -46393,6 +46395,7 @@ diff --exclude-from=exclude -N -u -r nsa
  # Timo Trinks <ttrinks at redhat.com>, 2008.
  # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
 +# Michael M??nch <micm at fedoraproject.org.org>, 2009.
++# Hedda Peters <hpeters at redhat.com>, 2009.
  msgid ""
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD.de\n"
@@ -46402,20 +46405,20 @@ diff --exclude-from=exclude -N -u -r nsa
 -"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
 -"Language-Team: German <i18 at redhat.com>\n"
 +"POT-Creation-Date: 2008-09-09 13:24-0400\n"
-+"PO-Revision-Date: 2009-07-11 10:02+0200\n"
-+"Last-Translator: Michael M??nch <micm at fedoraproject.org>\n"
-+"Language-Team: German <fedora-trans-de at redhat.com>\n"
++"PO-Revision-Date: 2009-09-14 17:02+1000\n"
++"Last-Translator: Hedda Peters <hpeters at redhat.com>\n"
++"Language-Team: \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"
  "X-Poedit-Language: German\n"
-+"X-Generator: Lokalize 1.0\n"
++"X-Generator: KBabel 1.11.4\n"
  
  #: ../run_init/run_init.c:67
  msgid ""
-@@ -31,11 +31,11 @@
+@@ -31,11 +33,11 @@
  "         <args ...> are the arguments to that script."
  msgstr ""
  "VERWENDUNG: run_init <script> <args ...>\n"
@@ -46430,7 +46433,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #, c-format
  msgid "failed to initialize PAM\n"
  msgstr "Initialisieren von PAM fehlgeschlagen\n"
-@@ -45,16 +45,19 @@
+@@ -45,16 +47,19 @@
  msgid "failed to get account information\n"
  msgstr "Konnte keine Account-Informationen abrufen\n"
  
@@ -46453,14 +46456,14 @@ diff --exclude-from=exclude -N -u -r nsa
  #, c-format
  msgid "getpass cannot open /dev/tty\n"
  msgstr "getpass kann /dev/tty nicht ??ffnen\n"
-@@ -77,16 +80,15 @@
+@@ -77,16 +82,15 @@
  #: ../run_init/run_init.c:361
  #, c-format
  msgid "Sorry, run_init may be used only on a SELinux kernel.\n"
 -msgstr ""
 -"Entschuldigung, run_init sollte nur auf einem SELinux-Kernel benutzt "
 -"werden.\n"
-+msgstr "Entschuldigung, run_init sollte nur auf einem SELinux-Kernel benutzt werden.\n"
[...6388 lines suppressed...]
  
 -#~ msgid "Disable SELinux protection for squid daemon"
@@ -220071,7 +220297,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +#: ../gui/selinux.tbl:173
 +msgid "Disable SELinux protection for setroubleshoot daemon"
-+msgstr "????????? ??????? SELinux ??? ?????? setroubleshoot"
++msgstr "????????? ?????? SELinux ??? ?????? setroubleshoot"
 +
 +#: ../gui/selinux.tbl:174
 +msgid "Disable SELinux protection for slapd daemon"
@@ -220167,7 +220393,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +#: ../gui/selinux.tbl:192
 +msgid "Disable SELinux protection for swat daemon"
-+msgstr "???????? ?????? SELinux ??? ?????? swat"
++msgstr "????????? ?????? SELinux ??? ?????? swat"
 +
 +#: ../gui/selinux.tbl:193
 +msgid "Disable SELinux protection for sxid daemon"
@@ -220397,7 +220623,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +#: ../gui/selinux.tbl:233
 +msgid "Allow SELinux webadm user to read unprivileged users home directories"
 +msgstr ""
-+"????????? ????????????? webadm ???????????? ?????? ???????? ????????? "
++"????????? ???????????? webadm ???????????? ?????? ???????? ????????? "
 +"??????????????????? ?????????????"
  
 -#~ msgid "Delete %s"
@@ -220419,7 +220645,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +#: ../gui/semanagePage.py:134
 +#, python-format
 +msgid "Add %s"
-+msgstr "??????? %s"
++msgstr "???????? %s"
  
 -#, fuzzy
 -#~ msgid "Disabled"
@@ -220771,7 +220997,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +#: ../gui/system-config-selinux.glade:2991
 +msgid "Generate new policy module"
-+msgstr "???????????? ?????? ????? ????????"
++msgstr "???????????? ?????? ????? ????????"
 +
 +#: ../gui/system-config-selinux.glade:3007
 +msgid "Load policy module"
@@ -220849,7 +221075,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "????????? SELinux ???????????? '%s' "
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.73/po/si.po
 --- nsapolicycoreutils/po/si.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/si.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/si.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -223896,7 +224122,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.73/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sk.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sk.po	2009-09-14 15:37:44.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -227033,7 +227259,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgstr "Po??aduje hodnotu"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.73/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sl.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sl.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -230080,7 +230306,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.73/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sq.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sq.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -233127,7 +233353,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.73/po/sr at latin.po
 --- nsapolicycoreutils/po/sr at latin.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr at latin.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sr at latin.po	2009-09-14 15:37:44.000000000 -0400
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian(Latin) translations for policycoreutils
@@ -238000,7 +238226,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr "SELinux korisnik ???%s??? je neophodan"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.73/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sr.po	2009-09-14 15:37:44.000000000 -0400
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian translations for policycoreutils
@@ -242865,7 +243091,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr "SELinux ???????????????? ???%s??? ???? ??????????????????"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.73/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sv.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sv.po	2009-09-14 15:37:44.000000000 -0400
 @@ -1,16 +1,18 @@
  # Swedish messages for policycoreutils.
 -# Copyright ?? 2001-2008 Free Software Foundation, Inc.
@@ -246953,7 +247179,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr "SELinux-anv??ndare \"%s\" kr??vs"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.73/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ta.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/ta.po	2009-09-14 15:37:44.000000000 -0400
 @@ -1,28 +1,23 @@
 -# translation of ta.po to Tamil
 +# translation of policycoreutils.HEAD.ta.po to Tamil
@@ -251644,7 +251870,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "MCS ????????????"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.73/po/te.po
 --- nsapolicycoreutils/po/te.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/te.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/te.po	2009-09-14 15:37:44.000000000 -0400
 @@ -1,21 +1,23 @@
 -# translation of new_policycoreutils.HEAD.te.po to Telugu
 +# translation of policycoreutils.HEAD.te.po to Telugu
@@ -256425,7 +256651,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "????????????????????????\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.73/po/th.po
 --- nsapolicycoreutils/po/th.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/th.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/th.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -259472,7 +259698,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.73/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/tr.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/tr.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -262519,7 +262745,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.73/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/uk.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/uk.po	2009-09-14 15:37:44.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -265656,7 +265882,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgstr "???????????????? ?????????????? ????????????????"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.73/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ur.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/ur.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -268703,7 +268929,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.73/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/vi.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/vi.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -271750,7 +271976,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.73/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_CN.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/zh_CN.po	2009-09-14 15:37:44.000000000 -0400
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -276371,7 +276597,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "SELinux ?????? '%s' ????????????"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.73/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_TW.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/zh_TW.po	2009-09-14 15:37:44.000000000 -0400
 @@ -1,19 +1,19 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -281289,7 +281515,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "udp"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.73/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zu.po	2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/zu.po	2009-09-14 15:37:44.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  200 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   51 +-
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1834 insertions(+), 951 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -p -r1.440 -r1.441
--- policycoreutils-rhat.patch	9 Sep 2009 21:07:24 -0000	1.440
+++ policycoreutils-rhat.patch	14 Sep 2009 19:39:17 -0000	1.441
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.73/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.73/audit2allow/audit2allow	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/audit2allow/audit2allow	2009-09-09 17:05:42.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -40,7 +40,7 @@ diff --exclude-from=exclude --exclude=se
              f = sys.stdin
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.73/load_policy/Makefile
 --- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/load_policy/Makefile	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/load_policy/Makefile	2009-09-09 17:05:42.000000000 -0400
 @@ -1,6 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -51,7 +51,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.73/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/Makefile	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/Makefile	2009-09-09 17:05:42.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 sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -60,7 +60,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.73/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/Makefile	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/Makefile	2009-09-09 17:05:42.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -109,14 +109,14 @@ diff --exclude-from=exclude --exclude=se
  	/sbin/restorecon $(SBINDIR)/restorecond 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service	2009-09-09 17:05:42.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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.73/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.c	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.c	2009-09-09 17:05:42.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -609,7 +609,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.73/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.conf	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.conf	2009-09-09 17:05:42.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -622,7 +622,7 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.73/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond.desktop	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.desktop	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -633,7 +633,7 @@ diff --exclude-from=exclude --exclude=se
 +StartupNotify=false
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.73/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.h	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.h	2009-09-09 17:05:42.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -660,13 +660,21 @@ diff --exclude-from=exclude --exclude=se
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.73/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.init	2009-09-09 16:27:14.000000000 -0400
-@@ -82,9 +82,8 @@
++++ policycoreutils-2.0.73/restorecond/restorecond.init	2009-09-14 15:32:27.000000000 -0400
+@@ -75,16 +75,15 @@
+ 	status restorecond
+ 	RETVAL=$?
+ 	;;
+-  restart|reload)
++  force-reload|restart|reload)
+ 	restart
+ 	;;
+   condrestart)
  	[ -e /var/lock/subsys/restorecond ] && restart || :
  	;;
    *)
 -        echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
-+        echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
++        echo $"Usage: $0 {start|stop|restart|force-reload|status|condrestart}"
          RETVAL=3
  esac
  
@@ -674,13 +682,13 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.73/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.73/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/user.c	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/user.c	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -921,7 +929,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.73/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/watch.c	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/watch.c	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1179,7 +1187,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.73/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/Makefile	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/Makefile	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1214,7 +1222,7 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,200 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1418,7 +1426,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.73/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox.8	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox.8	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1448,7 +1456,7 @@ diff --exclude-from=exclude --exclude=se
 +.PP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.73/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandboxX.sh	2009-09-09 17:01:54.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandboxX.sh	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1468,7 +1476,7 @@ diff --exclude-from=exclude --exclude=se
 +done
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.73/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/seunshare.c	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/seunshare.c	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,203 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -1675,7 +1683,7 @@ diff --exclude-from=exclude --exclude=se
 +}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.73/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/chcat	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/scripts/chcat	2009-09-09 17:05:42.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1687,7 +1695,7 @@ diff --exclude-from=exclude --exclude=se
      
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.73/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/Makefile	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/scripts/Makefile	2009-09-09 17:05:42.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1699,7 +1707,7 @@ diff --exclude-from=exclude --exclude=se
  	-mkdir -p $(BINDIR)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.73/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/semanage	2009-09-09 16:28:00.000000000 -0400
++++ policycoreutils-2.0.73/semanage/semanage	2009-09-09 17:05:42.000000000 -0400
 @@ -85,6 +85,7 @@
          -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)
@@ -1792,7 +1800,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.73/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/seobject.py	2009-09-09 16:29:52.000000000 -0400
++++ policycoreutils-2.0.73/semanage/seobject.py	2009-09-09 17:05:42.000000000 -0400
 @@ -1586,9 +1586,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
@@ -1826,7 +1834,7 @@ diff --exclude-from=exclude --exclude=se
  				if is_mls_enabled:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.73/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-09 17:05:42.000000000 -0400
 @@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
@@ -1842,7 +1850,7 @@ diff --exclude-from=exclude --exclude=se
  .TP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.73/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-09 17:05:42.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -1959,7 +1967,7 @@ diff --exclude-from=exclude --exclude=se
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.73/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-09 17:05:42.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1980,7 +1988,7 @@ diff --exclude-from=exclude --exclude=se
  	ln -sf setfiles restorecon
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.73/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.c	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.c	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2503,7 +2511,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.73/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.h	2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.h	2009-09-09 17:05:42.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2555,8 +2563,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-09-08 19:09:27.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-09 16:27:14.000000000 -0400
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-14 15:36:23.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-09 17:05:42.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE
@@ -3083,7 +3091,7 @@ diff --exclude-from=exclude --exclude=se
  }
  
  int canoncon(char **contextp)
-@@ -584,77 +152,6 @@
+@@ -585,77 +152,6 @@
  	return 0;
  }
  
@@ -3161,7 +3169,7 @@ diff --exclude-from=exclude --exclude=se
  static int process_one_realpath(char *name)
  {
  	int rc = 0;
-@@ -667,7 +164,7 @@
+@@ -668,7 +164,7 @@
  		rc = lstat(name, &sb);
  		if (rc < 0) {
  			fprintf(stderr, "%s:  lstat(%s) failed:  %s\n",
@@ -3170,7 +3178,7 @@ diff --exclude-from=exclude --exclude=se
  			return -1;
  		}
  
-@@ -801,20 +298,30 @@
+@@ -802,20 +298,30 @@
  	char *buf = NULL;
  	size_t buf_len;
  	char *base;
@@ -3209,7 +3217,7 @@ diff --exclude-from=exclude --exclude=se
  	
  	if (!strcmp(base, SETFILES)) {
  		/* 
-@@ -829,28 +336,28 @@
+@@ -830,28 +336,28 @@
  		iamrestorecon = 0;
  		recurse = 1;
  		expand_realpath = 0;
@@ -3246,7 +3254,7 @@ diff --exclude-from=exclude --exclude=se
  		ctx_validate = 0;
  
  		/* restorecon only:  silent exit if no SELinux.
-@@ -912,37 +419,37 @@
+@@ -913,37 +419,37 @@
  			input_filename = optarg;
  			break;			
  		case 'd':
@@ -3293,7 +3301,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'R':
  		case 'r':
-@@ -955,7 +462,7 @@
+@@ -956,7 +462,7 @@
  					argv[0]);
  				exit(1);
  			}
@@ -3302,7 +3310,7 @@ diff --exclude-from=exclude --exclude=se
  				fprintf(stderr,
  					"%s: only one -r can be specified\n",
  					argv[0]);
-@@ -966,23 +473,23 @@
+@@ -967,23 +473,23 @@
  		case 's':
  			use_input_file = 1;
  			input_filename = "-";
@@ -3331,7 +3339,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'W':
  			warn_no_match = 1;
-@@ -1030,18 +537,13 @@
+@@ -1031,18 +537,13 @@
  	}
  
  	/* Load the file contexts configuration and check it. */
@@ -3353,7 +3361,7 @@ diff --exclude-from=exclude --exclude=se
  	if (use_input_file) {
  		FILE *f = stdin;
  		ssize_t len;
-@@ -1058,6 +560,9 @@
+@@ -1059,6 +560,9 @@
  		delim = (null_terminated != 0) ? '\0' : '\n';
  		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
  			buf[len - 1] = 0;
@@ -3363,7 +3371,7 @@ diff --exclude-from=exclude --exclude=se
  			errors |= process_one_realpath(buf);
  		}
  		if (strcmp(input_filename, "-") != 0)
-@@ -1067,22 +572,21 @@
+@@ -1068,22 +572,21 @@
  			errors |= process_one_realpath(argv[i]);
  		}
  	}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.639
retrieving revision 1.640
diff -u -p -r1.639 -r1.640
--- policycoreutils.spec	9 Sep 2009 17:04:52 -0000	1.639
+++ policycoreutils.spec	14 Sep 2009 19:39:18 -0000	1.640
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.73
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -295,6 +295,9 @@ fi
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-3
+- Fix restorecond script to use force-reload
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-2
 - Fix init script to show status in usage message
 



From eponyme at fedoraproject.org  Mon Sep 14 19:52:55 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon, 14 Sep 2009 19:52:55 +0000 (UTC)
Subject: rpms/monkeystudio/devel monkeystudio.spec,1.2,1.3
Message-ID: <20090914195255.6D1EB11C00EC@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/monkeystudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366

Modified Files:
	monkeystudio.spec 
Log Message:
Fix qt-devel version


Index: monkeystudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/monkeystudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- monkeystudio.spec	14 Sep 2009 19:30:44 -0000	1.2
+++ monkeystudio.spec	14 Sep 2009 19:52:55 -0000	1.3
@@ -18,7 +18,7 @@ Source0:        mks-%{svn_revision}.tar.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Version is specified to avoid plugin problems (see #475110 C22)
-BuildRequires:  qt-devel>=4.5.2-12
+BuildRequires:  qt-devel >= 4.5.2-12
 BuildRequires:  desktop-file-utils
 BuildRequires:  qscintilla-devel
 



From davidz at fedoraproject.org  Mon Sep 14 19:57:29 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 14 Sep 2009 19:57:29 +0000 (UTC)
Subject: rpms/polkit/devel polkit.spec,1.12,1.13
Message-ID: <20090914195729.8FF5111C00EC@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21693

Modified Files:
	polkit.spec 
Log Message:
* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.2
- Refine how Obsolete: is used and also add Provides: (thanks Jesse
  Keating and nim-nim)




Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- polkit.spec	14 Sep 2009 17:41:41 -0000	1.12
+++ polkit.spec	14 Sep 2009 19:57:29 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.95
-Release: 0.git20090913.1%{?dist}
+Release: 0.git20090913.2%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.gz
@@ -18,7 +18,8 @@ BuildRequires: gobject-introspection-dev
 Requires: ConsoleKit
 Requires: dbus
 
-Obsoletes: PolicyKit
+Obsoletes: PolicyKit <= 0.10
+Provides: PolicyKit = 0.11
 
 Patch0: 0001-Fix-process-start-time-when-using-polkit_unix_proces.patch
 
@@ -34,6 +35,8 @@ Requires: %name = %{version}-%{release}
 Requires: %name-docs = %{version}-%{release}
 Requires: pkgconfig
 Requires: glib2-devel
+Obsoletes: PolicyKit-devel <= 0.10
+Provides: PolicyKit-devel = 0.11
 
 %description devel
 Development files for PolicyKit.
@@ -43,6 +46,8 @@ Summary: Development documentation for P
 Group: Development/Libraries
 Requires: %name-devel = %{version}-%{release}
 Requires: gtk-doc
+Obsoletes: PolicyKit-docs <= 0.10
+Provides: PolicyKit-docs = 0.11
 
 %description docs
 Development documentation for PolicyKit.
@@ -183,6 +188,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.2
+- Refine how Obsolete: is used and also add Provides: (thanks Jesse
+  Keating and nim-nim)
+
 * Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.1
 - Add bugfix for polkit_unix_process_new_full() (thanks Bastien Nocera)
 - Obsolete old PolicyKit packages



From kkofler at fedoraproject.org  Mon Sep 14 19:57:47 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 14 Sep 2009 19:57:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.289,1.290
Message-ID: <20090914195747.1650611C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21801/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
Fix file list for builds without PolicyKit 0.9.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- kdebase-workspace.spec	14 Sep 2009 18:46:31 -0000	1.289
+++ kdebase-workspace.spec	14 Sep 2009 19:57:46 -0000	1.290
@@ -415,7 +415,6 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
-%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -425,8 +424,6 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
-%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
-%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -444,7 +441,6 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
-%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -489,6 +485,13 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 %exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
+%if 0%{?with_polkit_09}
+# PolicyKit-kde
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%endif
 
 %files libs
 %defattr(-,root,root,-)



From davidz at fedoraproject.org  Mon Sep 14 19:58:03 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 14 Sep 2009 19:58:03 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.14,1.15
Message-ID: <20090914195803.CB85E11C00EC@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21922

Modified Files:
	polkit-gnome.spec 
Log Message:
* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.4
- Refine how Obsolete: is used and also add Provides: (thanks Jesse
  Keating and nim-nim)




Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- polkit-gnome.spec	14 Sep 2009 18:19:28 -0000	1.14
+++ polkit-gnome.spec	14 Sep 2009 19:58:03 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.95
-Release: 0.git20090913.3%{?dist}
+Release: 0.git20090913.4%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -15,8 +15,10 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gir-repository-devel
 
-Obsoletes: PolicyKit-gnome
-Obsoletes: PolicyKit-gnome-libs
+Obsoletes: PolicyKit-gnome <= 0.10
+Provides: PolicyKit-gnome = 0.11
+Obsoletes: PolicyKit-gnome-libs <= 0.10
+Provides: PolicyKit-gnome-libs = 0.11
 
 Requires: polkit >= 0.95
 
@@ -31,6 +33,10 @@ Requires: %name = %{version}-%{release}
 Requires: %name-docs = %{version}-%{release}
 Requires: pkgconfig
 Requires: polkit-devel
+Obsoletes: PolicyKit-gnome-devel <= 0.10
+Provides: PolicyKit-gnome-devel = 0.11
+Obsoletes: PolicyKit-gnome-demo <= 0.10
+Provides: PolicyKit-gnome-demo = 0.11
 
 %description devel
 Development files for polkit-gnome.
@@ -89,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.4
+- Refine how Obsolete: is used and also add Provides: (thanks Jesse
+  Keating and nim-nim)
+
 * Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.3
 - Obsolete old PolicyKit-gnome packages
 



From jjh at fedoraproject.org  Mon Sep 14 20:01:30 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 14 Sep 2009 20:01:30 +0000 (UTC)
Subject: rpms/nginx/devel .cvsignore, 1.23, 1.24 nginx.spec, 1.37,
	1.38 sources, 1.23, 1.24
Message-ID: <20090914200130.BC73511C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23284

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.62


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	3 Aug 2009 01:04:00 -0000	1.23
+++ .cvsignore	14 Sep 2009 20:01:30 -0000	1.24
@@ -1 +1 @@
-nginx-0.7.61.tar.gz
+nginx-0.7.62.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- nginx.spec	21 Aug 2009 14:41:58 -0000	1.37
+++ nginx.spec	14 Sep 2009 20:01:30 -0000	1.38
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.61
-Release:        2%{?dist}
+Version:        0.7.62
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -20,7 +20,7 @@ URL:            http://nginx.net/ 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
-Requires:           pcre,zlib,openssl
+Requires:           pcre,openssl
 Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # for /usr/sbin/useradd
 Requires(pre):      shadow-utils
@@ -174,6 +174,11 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
+- Update to new stable 0.7.62
+- fixes CVE-2009-2629
+- fix rpmlint zlib dependency complaint
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.61-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	3 Aug 2009 01:04:00 -0000	1.23
+++ sources	14 Sep 2009 20:01:30 -0000	1.24
@@ -1 +1 @@
-6ebf89b9b00a3b82734e93c32da7df07  nginx-0.7.61.tar.gz
+ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz



From jjh at fedoraproject.org  Mon Sep 14 20:03:52 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 14 Sep 2009 20:03:52 +0000 (UTC)
Subject: rpms/nginx/EL-4 .cvsignore, 1.16, 1.17 nginx.spec, 1.22,
	1.23 sources, 1.16, 1.17
Message-ID: <20090914200352.656A911C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24209

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.39


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	3 Aug 2009 02:29:26 -0000	1.16
+++ .cvsignore	14 Sep 2009 20:03:52 -0000	1.17
@@ -1 +1 @@
-nginx-0.6.38.tar.gz
+nginx-0.6.39.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nginx.spec	3 Aug 2009 02:40:06 -0000	1.22
+++ nginx.spec	14 Sep 2009 20:03:52 -0000	1.23
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.6.38
-Release:        2%{?dist}
+Version:        0.6.39
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -152,6 +152,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-1
+- update to 0.6.39
+- fixes CVE-2009-2629
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-2
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	3 Aug 2009 02:29:26 -0000	1.16
+++ sources	14 Sep 2009 20:03:52 -0000	1.17
@@ -1 +1 @@
-58f35e44b695d1013add16ab45beb410  nginx-0.6.38.tar.gz
+5c22787fe88e37d694e773f1dda52005  nginx-0.6.39.tar.gz



From jjh at fedoraproject.org  Mon Sep 14 20:06:10 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 14 Sep 2009 20:06:10 +0000 (UTC)
Subject: rpms/nginx/EL-5 .cvsignore, 1.17, 1.18 nginx.spec, 1.23,
	1.24 sources, 1.18, 1.19
Message-ID: <20090914200610.927C111C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24958

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.39


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Aug 2009 02:14:01 -0000	1.17
+++ .cvsignore	14 Sep 2009 20:06:10 -0000	1.18
@@ -1 +1 @@
-nginx-0.6.38.tar.gz
+nginx-0.6.39.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nginx.spec	3 Aug 2009 02:14:01 -0000	1.23
+++ nginx.spec	14 Sep 2009 20:06:10 -0000	1.24
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.38
+Version:        0.6.39
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -180,6 +180,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-1
+- update to 0.6.39
+- fixes CVE-2009-2629
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-1
 - update to 0.6.38
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Aug 2009 02:14:01 -0000	1.18
+++ sources	14 Sep 2009 20:06:10 -0000	1.19
@@ -1 +1 @@
-58f35e44b695d1013add16ab45beb410  nginx-0.6.38.tar.gz
+5c22787fe88e37d694e773f1dda52005  nginx-0.6.39.tar.gz



From jjh at fedoraproject.org  Mon Sep 14 20:09:55 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 14 Sep 2009 20:09:55 +0000 (UTC)
Subject: rpms/nginx/F-11 .cvsignore, 1.23, 1.24 nginx.spec, 1.34,
	1.35 sources, 1.23, 1.24
Message-ID: <20090914200955.8EBE711C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26274

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.62


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	3 Aug 2009 02:00:17 -0000	1.23
+++ .cvsignore	14 Sep 2009 20:09:55 -0000	1.24
@@ -1 +1 @@
-nginx-0.7.61.tar.gz
+nginx-0.7.62.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/nginx.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- nginx.spec	3 Aug 2009 02:00:17 -0000	1.34
+++ nginx.spec	14 Sep 2009 20:09:55 -0000	1.35
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.61
+Version:        0.7.62
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -177,7 +177,11 @@ fi
 
 
 %changelog
-* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61 -
+* Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
+- update to 0.7.62
+- fixes CVE-2009-2629
+
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61-1
 - update to new stable 0.7.61
 - remove third party module
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	3 Aug 2009 02:00:17 -0000	1.23
+++ sources	14 Sep 2009 20:09:55 -0000	1.24
@@ -1 +1 @@
-6ebf89b9b00a3b82734e93c32da7df07  nginx-0.7.61.tar.gz
+ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz



From jjh at fedoraproject.org  Mon Sep 14 20:11:22 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 14 Sep 2009 20:11:22 +0000 (UTC)
Subject: rpms/nginx/F-10 .cvsignore, 1.23, 1.24 nginx.spec, 1.31,
	1.32 sources, 1.23, 1.24
Message-ID: <20090914201122.9332911C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.62


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	3 Aug 2009 02:06:34 -0000	1.23
+++ .cvsignore	14 Sep 2009 20:11:22 -0000	1.24
@@ -1 +1 @@
-nginx-0.7.61.tar.gz
+nginx-0.7.62.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nginx.spec	3 Aug 2009 02:06:34 -0000	1.31
+++ nginx.spec	14 Sep 2009 20:11:22 -0000	1.32
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.61
+Version:        0.7.62
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -177,6 +177,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
+- update to 0.7.62 
+- fixes CVE-2009-2629
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61-1
 - update to new stable 0.7.61
 - remove third party module


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	3 Aug 2009 02:06:34 -0000	1.23
+++ sources	14 Sep 2009 20:11:22 -0000	1.24
@@ -1 +1 @@
-6ebf89b9b00a3b82734e93c32da7df07  nginx-0.7.61.tar.gz
+ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz



From davidz at fedoraproject.org  Mon Sep 14 20:11:21 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 14 Sep 2009 20:11:21 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.15,1.16
Message-ID: <20090914201121.5EA3411C00EC@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26769

Modified Files:
	polkit-gnome.spec 
Log Message:
* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.5
- add Provides: PolicyKit-authentication-agent to satify what PolicyKit-gnome
  also provided




Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- polkit-gnome.spec	14 Sep 2009 19:58:03 -0000	1.15
+++ polkit-gnome.spec	14 Sep 2009 20:11:21 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.95
-Release: 0.git20090913.4%{?dist}
+Release: 0.git20090913.5%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -20,6 +20,8 @@ Provides: PolicyKit-gnome = 0.11
 Obsoletes: PolicyKit-gnome-libs <= 0.10
 Provides: PolicyKit-gnome-libs = 0.11
 
+Provides: PolicyKit-authentication-agent
+
 Requires: polkit >= 0.95
 
 %description
@@ -95,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.5
+- add Provides: PolicyKit-authentication-agent to satify what PolicyKit-gnome
+  also provided
+
 * Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.4
 - Refine how Obsolete: is used and also add Provides: (thanks Jesse
   Keating and nim-nim)



From rdieter at fedoraproject.org  Mon Sep 14 20:38:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 20:38:52 +0000 (UTC)
Subject: rpms/amarok/devel .cvsignore, 1.49, 1.50 amarok.spec, 1.161,
	1.162 sources, 1.50, 1.51 amarok-2.1.80-lyricwiki.patch, 1.1, NONE
Message-ID: <20090914203852.9901111C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7205

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.1.80-lyricwiki.patch 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
- amarok-2.1.85 (2.2beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	2 Sep 2009 17:21:05 -0000	1.49
+++ .cvsignore	14 Sep 2009 20:38:52 -0000	1.50
@@ -1 +1 @@
-amarok-2.1.80.tar.bz2
+amarok-2.1.85.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- amarok.spec	2 Sep 2009 17:21:05 -0000	1.161
+++ amarok.spec	14 Sep 2009 20:38:52 -0000	1.162
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.80
-Release: 2%{?dist}
+Version: 2.1.85
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: amarok-2.1.80-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -79,8 +78,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .lyricwiki
-
 
 %build
 mkdir -p %{_target_platform}
@@ -143,7 +140,6 @@ fi
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
-%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
@@ -172,6 +168,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
+- amarok-2.1.85 (2.2beta2)
+
 * Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
 - another lyricwiki fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	2 Sep 2009 17:21:05 -0000	1.50
+++ sources	14 Sep 2009 20:38:52 -0000	1.51
@@ -1 +1 @@
-0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2
+38311a55767fb8d85254b248a46433d8  amarok-2.1.85.tar.bz2


--- amarok-2.1.80-lyricwiki.patch DELETED ---



From rdieter at fedoraproject.org  Mon Sep 14 20:51:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 20:51:03 +0000 (UTC)
Subject: rpms/amarok/F-12 .cvsignore, 1.49, 1.50 amarok.spec, 1.161,
	1.162 sources, 1.50, 1.51 amarok-2.1.80-lyricwiki.patch, 1.1, NONE
Message-ID: <20090914205103.46E4111C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13909

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.1.80-lyricwiki.patch 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	2 Sep 2009 17:21:05 -0000	1.49
+++ .cvsignore	14 Sep 2009 20:51:02 -0000	1.50
@@ -1 +1 @@
-amarok-2.1.80.tar.bz2
+amarok-2.1.85.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- amarok.spec	2 Sep 2009 17:21:05 -0000	1.161
+++ amarok.spec	14 Sep 2009 20:51:03 -0000	1.162
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.80
-Release: 2%{?dist}
+Version: 2.1.85
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: amarok-2.1.80-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -79,8 +78,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .lyricwiki
-
 
 %build
 mkdir -p %{_target_platform}
@@ -143,7 +140,6 @@ fi
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
-%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
@@ -172,6 +168,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
+- amarok-2.1.85 (2.2beta2)
+
 * Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
 - another lyricwiki fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	2 Sep 2009 17:21:05 -0000	1.50
+++ sources	14 Sep 2009 20:51:03 -0000	1.51
@@ -1 +1 @@
-0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2
+38311a55767fb8d85254b248a46433d8  amarok-2.1.85.tar.bz2


--- amarok-2.1.80-lyricwiki.patch DELETED ---



From jskala at fedoraproject.org  Mon Sep 14 21:21:28 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Mon, 14 Sep 2009 21:21:28 +0000 (UTC)
Subject: rpms/lftp/devel .cvsignore, 1.41, 1.42 lftp.spec, 1.84, 1.85 sources,
	1.41, 1.42
Message-ID: <20090914212128.4F4CF11C0375@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv871

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 4.0.0-1
- updated to latest stable version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	2 Sep 2009 06:24:36 -0000	1.41
+++ .cvsignore	14 Sep 2009 21:21:25 -0000	1.42
@@ -1 +1 @@
-lftp-3.7.15.tar.lzma
+lftp-4.0.0.tar.lzma


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- lftp.spec	2 Sep 2009 06:24:36 -0000	1.84
+++ lftp.spec	14 Sep 2009 21:21:25 -0000	1.85
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	3.7.15
+Version:	4.0.0
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -69,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 %dir %{_libdir}/lftp
 %dir %{_libdir}/lftp/%{version}
+%{_libdir}/lftp/%{version}/cmd-torrent.so
 %{_libdir}/lftp/%{version}/cmd-mirror.so
 %{_libdir}/lftp/%{version}/cmd-sleep.so
 %{_libdir}/lftp/%{version}/liblftp-network.so
@@ -87,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 4.0.0-1
+- updated to latest stable version
+
 * Wed Sep 02 2009 Jiri Skala <jskala at redhat.com> - 3.7.15-1
 - updated to latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	2 Sep 2009 06:24:36 -0000	1.41
+++ sources	14 Sep 2009 21:21:25 -0000	1.42
@@ -1 +1 @@
-7407a8eadacae90c9c6caf542c3f46d2  lftp-3.7.15.tar.lzma
+3a0baead3174e6d10c3262b03bc642c3  lftp-4.0.0.tar.lzma



From thias at fedoraproject.org  Mon Sep 14 21:24:22 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:24:22 +0000 (UTC)
Subject: rpms/xmms-crossfade/F-10 xmms-crossfade-0.3.14-libexec.patch, NONE, 
	1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xmms-crossfade.spec,
	1.16, 1.17
Message-ID: <20090914212422.E54B311C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2590/F-10

Modified Files:
	.cvsignore sources xmms-crossfade.spec 
Added Files:
	xmms-crossfade-0.3.14-libexec.patch 
Log Message:
Update to 0.3.14 for F-10 and F-11, with minor fixes.


xmms-crossfade-0.3.14-libexec.patch:
 configure    |    2 +-
 configure.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmms-crossfade-0.3.14-libexec.patch ---
diff -Naupr xmms-crossfade-0.3.14.orig/configure xmms-crossfade-0.3.14/configure
--- xmms-crossfade-0.3.14.orig/configure	2007-11-26 01:14:07.000000000 +0100
+++ xmms-crossfade-0.3.14/configure	2007-11-26 01:14:07.000000000 +0100
@@ -20650,7 +20650,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"
diff -Naupr xmms-crossfade-0.3.14.orig/configure.in xmms-crossfade-0.3.14/configure.in
--- xmms-crossfade-0.3.14.orig/configure.in	2007-11-26 01:13:58.000000000 +0100
+++ xmms-crossfade-0.3.14/configure.in	2007-11-26 01:13:58.000000000 +0100
@@ -103,7 +103,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Aug 2007 08:45:37 -0000	1.7
+++ .cvsignore	14 Sep 2009 21:24:21 -0000	1.8
@@ -1 +1 @@
-xmms-crossfade-0.3.12.tar.gz
+xmms-crossfade-0.3.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2007 08:45:37 -0000	1.7
+++ sources	14 Sep 2009 21:24:21 -0000	1.8
@@ -1 +1 @@
-fe009c43948d01347e4ecdf8e5fe39bf  xmms-crossfade-0.3.12.tar.gz
+026c52544c7f3193d384288c9f8296aa  xmms-crossfade-0.3.14.tar.gz


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/xmms-crossfade.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xmms-crossfade.spec	20 Feb 2008 04:48:54 -0000	1.16
+++ xmms-crossfade.spec	14 Sep 2009 21:24:21 -0000	1.17
@@ -1,35 +1,69 @@
 %define xmms_outputdir %(xmms-config --output-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Output)
 
+%define audacious_outputdir %(pkg-config audacious --variable=output_plugin_dir)
+
+%define audacious_builddir audacious-crossfade-build
+
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
-Version: 0.3.12
-Release: 3
+Version: 0.3.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
 Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
+Patch0: xmms-crossfade-0.3.14-libexec.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1:1.2.10-20
-BuildRequires: xmms, xmms-devel, libsamplerate-devel
+BuildRequires: xmms
+BuildRequires: xmms-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: id3lib-devel
 
 %description
 A plugin for XMMS featuring crossfading, continuous output between songs and
 a gap-killer.
 
 
+%package -n audacious-plugins-crossfade
+Summary: Audio crossfade plugin for Audacious
+Requires: audacious
+BuildRequires: audacious, audacious-devel
+
+%description -n audacious-plugins-crossfade
+A plugin for Audacious featuring crossfading, continuous output between
+songs and a gap-killer.
+
+
 %prep
-%setup -q
+%setup -q -T -b 0
+%patch0 -p1 -b .libexec
+# Convert docs to UTF-8
+for f in ChangeLog README; do
+  iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
+# Extract tarball a second time for audacious plugin build
+mkdir %{audacious_builddir} ; tar xfz %{SOURCE0} -C %{audacious_builddir}
 
 
 %build
-%configure --libdir=%{xmms_outputdir}
+%configure --enable-id3 --enable-player=xmms --libdir=%{xmms_outputdir}
 %{__make} %{?_smp_mflags}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%configure --enable-id3 --enable-player=audacious --libdir=%{audacious_outputdir}
+%{__make} %{?_smp_mflags}
+cd -
+
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%{__make} install DESTDIR=%{buildroot}
+cd -
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -42,7 +76,25 @@ a gap-killer.
 %{xmms_outputdir}/libcrossfade.so
 
 
+%files -n audacious-plugins-crossfade
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%exclude %{audacious_outputdir}/libcrossfade.la
+%{audacious_outputdir}/libcrossfade.so
+
+
 %changelog
+* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 0.3.14-2
+- Include patch for configure to check /usr/libexec/xmms for strings.
+- Convert ChangeLog and README to UTF-8.
+- Enable id3lib support for reading track number.
+
+* Wed Aug 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.14-1
+- Also build Audacious plugin.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.12-3
 - Autorebuild for GCC 4.3
 



From thias at fedoraproject.org  Mon Sep 14 21:24:24 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:24:24 +0000 (UTC)
Subject: rpms/xmms-crossfade/F-11 xmms-crossfade-0.3.14-libexec.patch, NONE, 
	1.1 xmms-crossfade.spec, 1.18, 1.19
Message-ID: <20090914212424.28BB211C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2590/F-11

Modified Files:
	xmms-crossfade.spec 
Added Files:
	xmms-crossfade-0.3.14-libexec.patch 
Log Message:
Update to 0.3.14 for F-10 and F-11, with minor fixes.


xmms-crossfade-0.3.14-libexec.patch:
 configure    |    2 +-
 configure.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmms-crossfade-0.3.14-libexec.patch ---
diff -Naupr xmms-crossfade-0.3.14.orig/configure xmms-crossfade-0.3.14/configure
--- xmms-crossfade-0.3.14.orig/configure	2007-11-26 01:14:07.000000000 +0100
+++ xmms-crossfade-0.3.14/configure	2007-11-26 01:14:07.000000000 +0100
@@ -20650,7 +20650,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"
diff -Naupr xmms-crossfade-0.3.14.orig/configure.in xmms-crossfade-0.3.14/configure.in
--- xmms-crossfade-0.3.14.orig/configure.in	2007-11-26 01:13:58.000000000 +0100
+++ xmms-crossfade-0.3.14/configure.in	2007-11-26 01:13:58.000000000 +0100
@@ -103,7 +103,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-11/xmms-crossfade.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xmms-crossfade.spec	12 Sep 2009 21:15:10 -0000	1.18
+++ xmms-crossfade.spec	14 Sep 2009 21:24:23 -0000	1.19
@@ -12,9 +12,13 @@ License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
 Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
+Patch0: xmms-crossfade-0.3.14-libexec.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1:1.2.10-20
-BuildRequires: xmms, xmms-devel, libsamplerate-devel
+BuildRequires: xmms
+BuildRequires: xmms-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: id3lib-devel
 
 %description
 A plugin for XMMS featuring crossfading, continuous output between songs and
@@ -33,16 +37,21 @@ songs and a gap-killer.
 
 %prep
 %setup -q -T -b 0
-# extract tarball 2nd time for audacious plugin build
+%patch0 -p1 -b .libexec
+# Convert docs to UTF-8
+for f in ChangeLog README; do
+  iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
+# Extract tarball a second time for audacious plugin build
 mkdir %{audacious_builddir} ; tar xfz %{SOURCE0} -C %{audacious_builddir}
 
 
 %build
-%configure --enable-player=xmms --libdir=%{xmms_outputdir}
+%configure --enable-id3 --enable-player=xmms --libdir=%{xmms_outputdir}
 %{__make} %{?_smp_mflags}
 
 cd %{audacious_builddir}/%{name}-%{version}
-%configure --enable-player=audacious --libdir=%{audacious_outputdir}
+%configure --enable-id3 --enable-player=audacious --libdir=%{audacious_outputdir}
 %{__make} %{?_smp_mflags}
 cd -
 
@@ -75,6 +84,11 @@ cd -
 
 
 %changelog
+* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 0.3.14-2
+- Include patch for configure to check /usr/libexec/xmms for strings.
+- Convert ChangeLog and README to UTF-8.
+- Enable id3lib support for reading track number.
+
 * Wed Aug 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.14-1
 - Also build Audacious plugin.
 



From thias at fedoraproject.org  Mon Sep 14 21:24:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:24:25 +0000 (UTC)
Subject: rpms/xmms-crossfade/devel xmms-crossfade-0.3.14-libexec.patch, NONE,
	1.1 xmms-crossfade.spec, 1.19, 1.20
Message-ID: <20090914212425.5FC1111C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2590/devel

Modified Files:
	xmms-crossfade.spec 
Added Files:
	xmms-crossfade-0.3.14-libexec.patch 
Log Message:
Update to 0.3.14 for F-10 and F-11, with minor fixes.


xmms-crossfade-0.3.14-libexec.patch:
 configure    |    2 +-
 configure.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmms-crossfade-0.3.14-libexec.patch ---
diff -Naupr xmms-crossfade-0.3.14.orig/configure xmms-crossfade-0.3.14/configure
--- xmms-crossfade-0.3.14.orig/configure	2007-11-26 01:14:07.000000000 +0100
+++ xmms-crossfade-0.3.14/configure	2007-11-26 01:14:07.000000000 +0100
@@ -20650,7 +20650,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"
diff -Naupr xmms-crossfade-0.3.14.orig/configure.in xmms-crossfade-0.3.14/configure.in
--- xmms-crossfade-0.3.14.orig/configure.in	2007-11-26 01:13:58.000000000 +0100
+++ xmms-crossfade-0.3.14/configure.in	2007-11-26 01:13:58.000000000 +0100
@@ -103,7 +103,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/xmms-crossfade.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xmms-crossfade.spec	12 Sep 2009 21:15:11 -0000	1.19
+++ xmms-crossfade.spec	14 Sep 2009 21:24:24 -0000	1.20
@@ -12,9 +12,13 @@ License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
 Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
+Patch0: xmms-crossfade-0.3.14-libexec.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1:1.2.10-20
-BuildRequires: xmms, xmms-devel, libsamplerate-devel
+BuildRequires: xmms
+BuildRequires: xmms-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: id3lib-devel
 
 %description
 A plugin for XMMS featuring crossfading, continuous output between songs and
@@ -33,16 +37,21 @@ songs and a gap-killer.
 
 %prep
 %setup -q -T -b 0
-# extract tarball 2nd time for audacious plugin build
+%patch0 -p1 -b .libexec
+# Convert docs to UTF-8
+for f in ChangeLog README; do
+  iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
+# Extract tarball a second time for audacious plugin build
 mkdir %{audacious_builddir} ; tar xfz %{SOURCE0} -C %{audacious_builddir}
 
 
 %build
-%configure --enable-player=xmms --libdir=%{xmms_outputdir}
+%configure --enable-id3 --enable-player=xmms --libdir=%{xmms_outputdir}
 %{__make} %{?_smp_mflags}
 
 cd %{audacious_builddir}/%{name}-%{version}
-%configure --enable-player=audacious --libdir=%{audacious_outputdir}
+%configure --enable-id3 --enable-player=audacious --libdir=%{audacious_outputdir}
 %{__make} %{?_smp_mflags}
 cd -
 
@@ -75,6 +84,11 @@ cd -
 
 
 %changelog
+* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 0.3.14-2
+- Include patch for configure to check /usr/libexec/xmms for strings.
+- Convert ChangeLog and README to UTF-8.
+- Enable id3lib support for reading track number.
+
 * Wed Aug 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.14-1
 - Also build Audacious plugin.
 



From thias at fedoraproject.org  Mon Sep 14 21:26:02 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:26:02 +0000 (UTC)
Subject: rpms/xmms-crossfade/F-10 xmms-crossfade.spec,1.17,1.18
Message-ID: <20090914212602.09E2F11C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4081/F-10

Modified Files:
	xmms-crossfade.spec 
Log Message:
Bump release, d'oh!



Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/xmms-crossfade.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xmms-crossfade.spec	14 Sep 2009 21:24:21 -0000	1.17
+++ xmms-crossfade.spec	14 Sep 2009 21:26:01 -0000	1.18
@@ -7,7 +7,7 @@
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
 Version: 0.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/



From thias at fedoraproject.org  Mon Sep 14 21:26:02 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:26:02 +0000 (UTC)
Subject: rpms/xmms-crossfade/devel xmms-crossfade.spec,1.20,1.21
Message-ID: <20090914212602.679A011C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4081/devel

Modified Files:
	xmms-crossfade.spec 
Log Message:
Bump release, d'oh!



Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/xmms-crossfade.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xmms-crossfade.spec	14 Sep 2009 21:24:24 -0000	1.20
+++ xmms-crossfade.spec	14 Sep 2009 21:26:02 -0000	1.21
@@ -7,7 +7,7 @@
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
 Version: 0.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/



From thias at fedoraproject.org  Mon Sep 14 21:26:02 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:26:02 +0000 (UTC)
Subject: rpms/xmms-crossfade/F-11 xmms-crossfade.spec,1.19,1.20
Message-ID: <20090914212602.3DFDF11C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4081/F-11

Modified Files:
	xmms-crossfade.spec 
Log Message:
Bump release, d'oh!



Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-11/xmms-crossfade.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xmms-crossfade.spec	14 Sep 2009 21:24:23 -0000	1.19
+++ xmms-crossfade.spec	14 Sep 2009 21:26:02 -0000	1.20
@@ -7,7 +7,7 @@
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
 Version: 0.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/



From pkgdb at fedoraproject.org  Mon Sep 14 21:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:32:21 +0000
Subject: [pkgdb] fastback was added for gavin
Message-ID: <20090914213221.E04AF10F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package fastback with summary File uploader, configureable file uploader
kevin has approved Package fastback
kevin has added a Fedora devel branch for fastback with an owner of gavin
kevin has approved fastback in Fedora devel
kevin has approved Package fastback
kevin has set commit to Approved for 107427 on fastback (Fedora devel)
kevin has set checkout to Approved for 107427 on fastback (Fedora devel)
kevin has set build to Approved for 107427 on fastback (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fastback



From pkgdb at fedoraproject.org  Mon Sep 14 21:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:32:23 +0000
Subject: [pkgdb] fastback summary updated by kevin
Message-ID: <20090914213223.1D53E10F895@bastion2.fedora.phx.redhat.com>

kevin set package fastback summary to File uploader, configureable file uploader

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fastback



From pkgdb at fedoraproject.org  Mon Sep 14 21:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:32:23 +0000
Subject: [pkgdb] fastback (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914213223.22B7410F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for fastback
kevin has set commit to Approved for 107427 on fastback (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on fastback (Fedora EPEL 5)
kevin has set build to Approved for 107427 on fastback (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fastback



From pkgdb at fedoraproject.org  Mon Sep 14 21:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:32:23 +0000
Subject: [pkgdb] fastback (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914213223.2DB4A10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for fastback
kevin has set commit to Approved for 107427 on fastback (Fedora 11)
kevin has set checkout to Approved for 107427 on fastback (Fedora 11)
kevin has set build to Approved for 107427 on fastback (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fastback



From pkgdb at fedoraproject.org  Mon Sep 14 21:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:32:23 +0000
Subject: [pkgdb] fastback (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914213223.468B510F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for fastback
kevin has set commit to Approved for 107427 on fastback (Fedora 12)
kevin has set checkout to Approved for 107427 on fastback (Fedora 12)
kevin has set build to Approved for 107427 on fastback (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fastback



From thias at fedoraproject.org  Mon Sep 14 21:32:53 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 14 Sep 2009 21:32:53 +0000 (UTC)
Subject: rpms/xmms/devel xmms-1.2.11-is_quitting.patch, NONE, 1.1 xmms.spec, 
	1.42, 1.43 xmms-1.2.10-crossfade-0.3.9.patch, 1.1, NONE
Message-ID: <20090914213253.246FB11C00EC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8663

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.11-is_quitting.patch 
Removed Files:
	xmms-1.2.10-crossfade-0.3.9.patch 
Log Message:
Update crossfade patch to the latest version (#518176).


xmms-1.2.11-is_quitting.patch:
 input.c    |    8 ++++++++
 input.h    |    1 +
 main.c     |    5 ++++-
 playlist.c |   33 ++++++++++++++++++++++++---------
 4 files changed, 37 insertions(+), 10 deletions(-)

--- NEW FILE xmms-1.2.11-is_quitting.patch ---
diff -Naupr xmms-1.2.11.orig/xmms/input.c xmms-1.2.11/xmms/input.c
--- xmms-1.2.11.orig/xmms/input.c	2005-05-15 02:01:21.000000000 +0200
+++ xmms-1.2.11/xmms/input.c	2009-09-14 22:17:57.756115021 +0200
@@ -286,6 +286,14 @@ void input_seek(int time)
 	}
 }
 
+gboolean input_stopped_for_restart = FALSE;  /* crossfade */
+void input_stop_for_restart()  /* crossfade */
+{
+	input_stopped_for_restart = TRUE;
+	input_stop();
+	input_stopped_for_restart = FALSE;
+}
+
 void input_stop(void)
 {
 	if (ip_data->playing && get_current_input_plugin())
diff -Naupr xmms-1.2.11.orig/xmms/input.h xmms-1.2.11/xmms/input.h
--- xmms-1.2.11.orig/xmms/input.h	2000-02-16 22:05:57.000000000 +0100
+++ xmms-1.2.11/xmms/input.h	2009-09-14 22:17:57.757114619 +0200
@@ -34,6 +34,7 @@ InputVisType input_get_vis_type();
 gboolean input_check_file(gchar * filename);
 void input_play(char *filename);
 void input_stop(void);
+void input_stop_for_restart(void);
 void input_pause(void);
 int input_get_time(void);
 void input_set_eq(int on, float preamp, float *bands);
diff -Naupr xmms-1.2.11.orig/xmms/main.c xmms-1.2.11/xmms/main.c
--- xmms-1.2.11.orig/xmms/main.c	2006-07-16 15:40:04.000000000 +0200
+++ xmms-1.2.11/xmms/main.c	2009-09-14 22:17:57.759114418 +0200
@@ -888,8 +888,10 @@ void mainwin_shade_toggle(void)
 	mainwin_set_shade(!cfg.player_shaded);
 }
 
+gboolean is_quitting = FALSE;  /* crossfade */
 void mainwin_quit_cb(void)
 {
+	is_quitting = TRUE;  /* crossfade */
 	input_stop();
 	gtk_widget_hide(equalizerwin);
 	gtk_widget_hide(playlistwin);
@@ -1540,7 +1542,8 @@ static void mainwin_jump_to_file_real_cb
 		int *pos;
 
 		if (get_input_playing())
-			input_stop();
+			input_stop_for_restart();
+		
 		pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
 		playlist_set_position(*pos);
 		playlist_play();
diff -Naupr xmms-1.2.11.orig/xmms/playlist.c xmms-1.2.11/xmms/playlist.c
--- xmms-1.2.11.orig/xmms/playlist.c	2007-11-16 22:51:30.000000000 +0100
+++ xmms-1.2.11/xmms/playlist.c	2009-09-14 22:17:57.763114547 +0200
@@ -78,9 +78,10 @@ void playlist_clear(void)
 {
 	GList *node;
 	PlaylistEntry *entry;
-	
+
+	/* always assume that there is another song comming up */	
 	if (get_input_playing())
-		input_stop();
+		input_stop_for_restart();
 
 	PL_LOCK();
 	if (playlist)
@@ -142,7 +143,7 @@ void playlist_delete_node(GList *node, g
 		if (get_input_playing())
 		{
 			PL_UNLOCK();
-			input_stop();
+			input_stop_for_restart();
 			PL_LOCK();
 			*restart_playing = TRUE;
 		}
@@ -583,7 +584,7 @@ void playlist_play(void)
 	}
 
 	if (get_input_playing())
-		input_stop();
+		input_stop_for_restart();
 
 	vis_clear_data(mainwin_vis);
 	vis_clear_data(playlistwin_vis);
@@ -681,7 +682,7 @@ void playlist_next(void)
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -736,7 +737,7 @@ void playlist_prev(void)
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -924,7 +925,7 @@ void playlist_set_position(int pos)
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -951,11 +952,25 @@ void playlist_set_position(int pos)
 void playlist_eof_reached(void)
 {
 	GList *plist_pos_list;
-
-	input_stop();
+	gboolean stop_for_restart = TRUE;
 
 	PL_LOCK();
+	
+	/*
+	 * First, determine if we are going to play another song after
+	 * this one and call input_stop() / input_stop_for_restart()
+	 * accordingly.
+	 */	
 	plist_pos_list = find_playlist_position_list();
+	if (!queued_list && !g_list_next(plist_pos_list) && !cfg.repeat)
+		stop_for_restart = FALSE;
+
+	PL_UNLOCK();
+	if (stop_for_restart)
+		input_stop_for_restart();
+	else
+		input_stop();
+	PL_LOCK();
 
 	if (cfg.no_playlist_advance)
 	{


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xmms.spec	2 Sep 2009 13:42:45 -0000	1.42
+++ xmms.spec	14 Sep 2009 21:32:52 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        7.20071117cvs%{?dist}
+Release:        8.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -27,7 +27,8 @@ Patch7:         %{name}-cd-mountpoint.pa
 Patch8:         %{name}-1.2.11-multilib.patch
 Patch9:		%{name}-play.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
-Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
+# From xmms-crossfade-0.3.14/patches/ adapted from 1.2.10 to 1.2.11
+Patch12:        %{name}-1.2.11-is_quitting.patch
 Patch14:	%{name}-1.2.10-configfile-safe-write.patch
 Patch15:	%{name}-1.2.10-reposition.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,7 +104,7 @@ Files needed for building plug-ins for t
 %patch7 -p0 -b .cd-mountpoint
 # Avoid multilib devel conflicts
 %patch8 -p1 -b .multidevel
-# Fix for crossfade >= 0.3.9 to work properly
+# Fix for crossfade >= 0.3.14 to work properly
 %patch12 -p1 -b .crossfade
 # Randomize playlists better
 %patch14 -p1
@@ -220,6 +221,9 @@ update-desktop-database -q || :
 
 
 %changelog
+* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-8.20071117cvs
+- Update crossfade patch to the latest version (#518176).
+
 * Wed Sep 02 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1:1.2.11-7.20071117cvs
 - Fix play on click bug (BZ434692)
 


--- xmms-1.2.10-crossfade-0.3.9.patch DELETED ---



From kevin at fedoraproject.org  Mon Sep 14 21:33:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:33:14 +0000 (UTC)
Subject: rpms/fastback - New directory
Message-ID: <20090914213314.D77C611C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fastback
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscb8884/rpms/fastback

Log Message:
Directory /cvs/pkgs/rpms/fastback added to the repository




From kevin at fedoraproject.org  Mon Sep 14 21:33:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:33:15 +0000 (UTC)
Subject: rpms/fastback/devel - New directory
Message-ID: <20090914213315.6581911C0261@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fastback/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscb8884/rpms/fastback/devel

Log Message:
Directory /cvs/pkgs/rpms/fastback/devel added to the repository




From pkgdb at fedoraproject.org  Mon Sep 14 21:33:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:33:40 +0000
Subject: [pkgdb] seeker was added for scop
Message-ID: <20090914213341.1029610F883@bastion2.fedora.phx.redhat.com>

kevin has added Package seeker with summary Random access disk benchmark utility
kevin has approved Package seeker
kevin has added a Fedora devel branch for seeker with an owner of scop
kevin has approved seeker in Fedora devel
kevin has approved Package seeker
kevin has set commit to Approved for 107427 on seeker (Fedora devel)
kevin has set checkout to Approved for 107427 on seeker (Fedora devel)
kevin has set build to Approved for 107427 on seeker (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/seeker



From pkgdb at fedoraproject.org  Mon Sep 14 21:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:33:42 +0000
Subject: [pkgdb] seeker summary updated by kevin
Message-ID: <20090914213342.34EAA10F88C@bastion2.fedora.phx.redhat.com>

kevin set package seeker summary to Random access disk benchmark utility

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/seeker



From pkgdb at fedoraproject.org  Mon Sep 14 21:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:33:42 +0000
Subject: [pkgdb] seeker (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914213342.408D410F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for seeker
kevin has set commit to Approved for 107427 on seeker (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on seeker (Fedora EPEL 5)
kevin has set build to Approved for 107427 on seeker (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/seeker



From kevin at fedoraproject.org  Mon Sep 14 21:33:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:33:51 +0000 (UTC)
Subject: rpms/fastback Makefile,NONE,1.1
Message-ID: <20090914213351.1833F11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fastback
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscb8884/rpms/fastback

Added Files:
	Makefile 
Log Message:
Setup of module fastback


--- NEW FILE Makefile ---
# Top level Makefile for module fastback
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 Sep 14 21:33:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:33:54 +0000 (UTC)
Subject: rpms/fastback/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090914213354.EC82011C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fastback/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscb8884/rpms/fastback/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fastback


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fastback
# $Id: Makefile,v 1.1 2009/09/14 21:33:53 kevin Exp $
NAME := fastback
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 Sep 14 21:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 21:33:42 +0000
Subject: [pkgdb] seeker (Fedora EPEL, 5) updated by kevin
Message-ID: <20090914213342.4A9CB10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for seeker
kevin has set commit to Approved for 107427 on seeker (Fedora 11)
kevin has set checkout to Approved for 107427 on seeker (Fedora 11)
kevin has set build to Approved for 107427 on seeker (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/seeker



From cebbert at fedoraproject.org  Mon Sep 14 21:33:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 14 Sep 2009 21:33:57 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-git2.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1126, 1.1127 Makefile, 1.108, 1.109 config-debug, 1.29,
	1.30 config-generic, 1.324, 1.325 config-nodebug, 1.38,
	1.39 config-s390x, 1.18, 1.19 kernel.spec, 1.1800,
	1.1801 linux-2.6-silence-acpi-blacklist.patch, 1.1,
	1.2 linux-2.6.31-modules-ro-nx.patch, 1.1, 1.2 sources, 1.1084,
	1.1085 upstream, 1.998,
	1.999 alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch,
	1.1, NONE linux-2.6-ahci-export-capabilities.patch, 1.1,
	NONE linux-2.6-alsa-improve-hda-powerdown.patch, 1.1,
	NONE linux-2.6-nfs4-ver4opt.patch, 1.1,
	NONE sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch,
	1.2, NONE
Message-ID: <20090914213357.71EEC11C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9261

Modified Files:
	.cvsignore Makefile config-debug config-generic config-nodebug 
	config-s390x kernel.spec 
	linux-2.6-silence-acpi-blacklist.patch 
	linux-2.6.31-modules-ro-nx.patch sources upstream 
Added Files:
	patch-2.6.31-git2.bz2.sign 
Removed Files:
	alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch 
	linux-2.6-ahci-export-capabilities.patch 
	linux-2.6-alsa-improve-hda-powerdown.patch 
	linux-2.6-nfs4-ver4opt.patch 
	sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch 
Log Message:
2.6.31-git2
Drop merged patches:
  sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
  linux-2.6-nfs4-ver4opt.patch
  linux-2.6-alsa-improve-hda-powerdown.patch
  alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
  linux-2.6-ahci-export-capabilities.patch
New s390 config option:
   CONFIG_SCLP_ASYNC=m
New generic config options:
   CONFIG_ATA_VERBOSE_ERROR=y
   CONFIG_PATA_RDC=m
   CONFIG_SOUND_OSS_CORE_PRECLAIM=y
   CONFIG_SND_HDA_PATCH_LOADER=y
   CONFIG_SND_HDA_CODEC_CIRRUS=y
   CONFIG_OPROFILE_EVENT_MULTIPLEX=y
   CONFIG_CRYPTO_VMAC=m
   CONFIG_CRYPTO_GHASH=m
New debug option:
   CONFIG_DEBUG_CREDENTIALS=y in debug kernels


--- NEW FILE patch-2.6.31-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKquVqyGugalF9Dw4RAncFAJkBB38InJEooRNf4EOuyZesGOruwwCfV+i2
vllZljmZWHTH3xwMf3xBVgA=
=TyaM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1126
retrieving revision 1.1127
diff -u -p -r1.1126 -r1.1127
--- .cvsignore	10 Sep 2009 00:43:48 -0000	1.1126
+++ .cvsignore	14 Sep 2009 21:33:52 -0000	1.1127
@@ -5,3 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
+patch-2.6.31-git2.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- Makefile	27 Jul 2009 17:42:03 -0000	1.108
+++ Makefile	14 Sep 2009 21:33:53 -0000	1.109
@@ -72,6 +72,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -118,6 +119,7 @@ release:
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- config-debug	27 Jul 2009 17:42:04 -0000	1.29
+++ config-debug	14 Sep 2009 21:33:54 -0000	1.30
@@ -50,3 +50,5 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
+
+CONFIG_DEBUG_CREDENTIALS=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- config-generic	9 Sep 2009 21:15:12 -0000	1.324
+++ config-generic	14 Sep 2009 21:33:54 -0000	1.325
@@ -540,6 +540,7 @@ CONFIG_SCSI_BNX2_ISCSI=m
 
 
 CONFIG_ATA=y
+CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_PIIX=y
 CONFIG_ATA_ACPI=y
@@ -599,6 +600,7 @@ CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_QDI=m
 # CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RDC=m
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SERVERWORKS=m
@@ -2554,6 +2556,7 @@ CONFIG_SOUND=m
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_SEQUENCER=y
@@ -2630,6 +2633,7 @@ CONFIG_SND_LX6464ES=m
 CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -2637,6 +2641,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_INTELHDMI=y
@@ -3336,6 +3341,7 @@ CONFIG_NLS_ASCII=y
 #
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+CONFIG_OPROFILE_EVENT_MULTIPLEX=y
 
 #
 # Kernel hacking
@@ -3439,10 +3445,12 @@ CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- config-nodebug	27 Jul 2009 17:42:04 -0000	1.38
+++ config-nodebug	14 Sep 2009 21:33:54 -0000	1.39
@@ -49,3 +49,5 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
+
+CONFIG_DEBUG_CREDENTIALS=y


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- config-s390x	8 Sep 2009 20:55:49 -0000	1.18
+++ config-s390x	14 Sep 2009 21:33:54 -0000	1.19
@@ -75,6 +75,7 @@ CONFIG_SCLP_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=m
+CONFIG_SCLP_ASYNC=m
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_3590=m
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1800
retrieving revision 1.1801
diff -u -p -r1.1800 -r1.1801
--- kernel.spec	14 Sep 2009 17:53:31 -0000	1.1800
+++ kernel.spec	14 Sep 2009 21:33:54 -0000	1.1801
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -609,8 +609,6 @@ Patch20: linux-2.6-hotfixes.patch
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
 
-Patch30: sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
-
 Patch41: linux-2.6-sysrq-c.patch
 
 # Intel IOMMU fixes/workarounds
@@ -658,12 +656,9 @@ Patch570: linux-2.6-selinux-mprotect-che
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch601: linux-2.6-alsa-improve-hda-powerdown.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
-Patch611: alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 Patch670: linux-2.6-ata-quirk.patch
-Patch671: linux-2.6-ahci-export-capabilities.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
@@ -726,7 +721,6 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
-Patch3060: linux-2.6-nfs4-ver4opt.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1156,8 +1150,6 @@ ApplyPatch linux-2.6-hotfixes.patch
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
 
-ApplyPatch sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
-
 # enable sysrq-c on all kernels, not only kexec
 #ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1215,7 +1207,6 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
-ApplyPatch linux-2.6-nfs4-ver4opt.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1255,9 +1246,7 @@ ApplyPatch linux-2.6-defaults-aspm.patch
 # ALSA
 # squelch hda_beep by default
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-ApplyPatch linux-2.6-alsa-improve-hda-powerdown.patch
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
-ApplyPatch alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 # Networking
 
@@ -1294,9 +1283,6 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# Make it possible to identify non-hotplug SATA ports
-ApplyPatch linux-2.6-ahci-export-capabilities.patch
-
 # rt2x00: back-port activity LED init patches
 #ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
@@ -2037,6 +2023,28 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Sep 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-git2
+- Drop merged patches:
+  sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
+  linux-2.6-nfs4-ver4opt.patch
+  linux-2.6-alsa-improve-hda-powerdown.patch
+  alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
+  linux-2.6-ahci-export-capabilities.patch
+- New s390 config option:
+   CONFIG_SCLP_ASYNC=m
+- New generic config options:
+   CONFIG_ATA_VERBOSE_ERROR=y
+   CONFIG_PATA_RDC=m
+   CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+   CONFIG_SND_HDA_PATCH_LOADER=y
+   CONFIG_SND_HDA_CODEC_CIRRUS=y
+   CONFIG_OPROFILE_EVENT_MULTIPLEX=y
+   CONFIG_CRYPTO_VMAC=m
+   CONFIG_CRYPTO_GHASH=m
+- New debug option:
+   CONFIG_DEBUG_CREDENTIALS=y in debug kernels
+
 * Mon Sep 14 2009 Steve Dickson <steved at redhat.com>
 - Added support for -o v4 mount parsing
 

linux-2.6-silence-acpi-blacklist.patch:
 blacklist.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-silence-acpi-blacklist.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-acpi-blacklist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-silence-acpi-blacklist.patch	12 Aug 2008 18:24:18 -0000	1.1
+++ linux-2.6-silence-acpi-blacklist.patch	14 Sep 2009 21:33:54 -0000	1.2
@@ -2,9 +2,9 @@ diff -up linux-2.6.26.noarch/drivers/acp
 --- linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx	2008-07-13 17:51:29.000000000 -0400
 +++ linux-2.6.26.noarch/drivers/acpi/blacklist.c	2008-08-12 14:21:39.000000000 -0400
 @@ -81,18 +81,18 @@ static int __init blacklist_by_year(void
- 	int year = dmi_get_year(DMI_BIOS_DATE);
+ 
  	/* Doesn't exist? Likely an old system */
- 	if (year == -1) {
+ 	if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {
 -		printk(KERN_ERR PREFIX "no DMI BIOS year, "
 +		printk(KERN_INFO PREFIX "no DMI BIOS year, "
  			"acpi=force is required to enable ACPI\n" );

linux-2.6.31-modules-ro-nx.patch:
 include/linux/module.h |    3 +
 kernel/module.c        |  126 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 126 insertions(+), 3 deletions(-)

Index: linux-2.6.31-modules-ro-nx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.31-modules-ro-nx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.31-modules-ro-nx.patch	11 Sep 2009 15:40:08 -0000	1.1
+++ linux-2.6.31-modules-ro-nx.patch	14 Sep 2009 21:33:54 -0000	1.2
@@ -1,62 +1,4 @@
 From davej  Fri Sep 11 11:06:50 2009
-Return-Path: linux-kernel-owner at vger.kernel.org
-X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
-	gelk.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-5.5 required=5.0 tests=AWL,BAYES_00,
-	RCVD_IN_DNSWL_MED,SARE_MSGID_LONG40,UNPARSEABLE_RELAY autolearn=ham
-	version=3.2.5
-Received: from mail.corp.redhat.com [10.5.5.51]
-	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
-	for <davej at localhost> (single-drop); Fri, 11 Sep 2009 11:06:50 -0400 (EDT)
-Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
- zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
- mail04.corp.redhat.com with LMTP; Thu, 10 Sep 2009 22:51:21 -0400 (EDT)
-Received: from localhost (localhost.localdomain [127.0.0.1])
-	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E57644F1AB;
-	Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
-Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
-	by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id PqMpQop0Dbp5; Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
-Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
-	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A56F64F1AA;
-	Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
-Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.12])
-	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8B2pDoM001214;
-	Thu, 10 Sep 2009 22:51:13 -0400
-Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
-	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8B2jC2e031184;
-	Thu, 10 Sep 2009 22:51:01 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S1753321AbZIKCur (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
-	Thu, 10 Sep 2009 22:50:47 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752432AbZIKCuq
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Thu, 10 Sep 2009 22:50:46 -0400
-Received: from mail-yw0-f174.google.com ([209.85.211.174]:34234 "EHLO
-	mail-yw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752401AbZIKCup (ORCPT
-	<rfc822;linux-kernel at vger.kernel.org>);
-	Thu, 10 Sep 2009 22:50:45 -0400
-Received: by ywh4 with SMTP id 4so897627ywh.5
-        for <multiple recipients>; Thu, 10 Sep 2009 19:50:47 -0700 (PDT)
-DKIM-Signature: 	v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=gamma;
-        h=domainkey-signature:mime-version:received:date:message-id:subject
-         :from:to:cc:content-type;
-        bh=p3+H2ZvljQZotPAF9Gb+FxecqVT3MH9YeBjUUKwwvY0=;
-        b=JTV6NmVCgyrG6SVi/FbmJR4FeIQuc44rC3EV0D1A8qPb+xMwNYK5QlD8do+3+FKgbc
-         CH/kgCjakj8e5v4ipROLQjPEiN/TETq15ITPKToCOHKve4jS1GMgkZYyYScpBfOj7N9R
-         VaWi9sbsNBvUtf1wS83Uqy4GBjZ88MEoBetrs=
-DomainKey-Signature: a=rsa-sha1; c=nofws;
-        d=gmail.com; s=gamma;
-        h=mime-version:date:message-id:subject:from:to:cc:content-type;
-        b=Ksz1JD3HRA+cyDH560RvcyHLpdr4+4Tost2JUGQV5a1m/XC/zwqLdXWNlkWTsuNVvJ
-         n+vlXd8VrHE+9h54vf+BMqmK+3LB6Q1iV3nLFpRoU7qaEdnPrWdRcCi8Ot6vIzLrHLf2
-         Xu6y7fJWaLQ+cbIGNY2LGR5UlkBul7kaj1API=
-MIME-Version: 1.0
-Received: by 10.150.17.5 with SMTP id 5mr3930758ybq.195.1252637447825; Thu, 10 
-	Sep 2009 19:50:47 -0700 (PDT)
 Date: 	Thu, 10 Sep 2009 22:50:47 -0400
 Message-ID: <817ecb6f0909101950v2fc6dc6u5cbc40cd9a9dde77 at mail.gmail.com>
 Subject: [PATCH v6] RO/NX protection for loadable kernel modules
@@ -68,17 +10,6 @@ Cc: Arjan van de Ven <arjan at infradead.or
         Thomas Gleixner <tglx at linutronix.de>, "H. Peter Anvin" <hpa at zytor.com>,
         Ingo Molnar <mingo at elte.hu>, Rusty Russell <rusty at rustcorp.com.au>,
         Stephen Rothwell <sfr at canb.auug.org.au>
-Content-Type: text/plain; charset=ISO-8859-1
-Sender: linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: 	linux-kernel at vger.kernel.org
-X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
-X-Scanned-By: MIMEDefang 2.67 on 10.5.110.12
-Status: RO
-Content-Length: 8042
-Lines: 260
 
 This patch is a logical extension of the protection provided by
 CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting
@@ -150,8 +81,8 @@ index e797812..660278a 100644
  #include <linux/kmemleak.h>
 +#include <linux/pfn.h>
  
- #if 0
- #define DEBUGP printk
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/module.h>
 @@ -63,6 +64,26 @@
  #define ARCH_SHF_SMALL 0
  #endif
@@ -323,9 +254,9 @@ index e797812..660278a 100644
 +				mod->init_ro_size,
 +				mod->init_size);
 +
+ 	trace_module_load(mod);
+ 
  	/* Done! */
- 	return mod;
-
 @@ -2598,6 +2598,7 @@ SYSCALL_DEFINE3(init_module, void __user
  	mutex_lock(&module_mutex);
  	/* Drop initial reference. */
@@ -335,8 +266,4 @@ index e797812..660278a 100644
  	module_free(mod, mod->module_init);
  	mod->module_init = NULL;
 --
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1084
retrieving revision 1.1085
diff -u -p -r1.1084 -r1.1085
--- sources	10 Sep 2009 00:43:49 -0000	1.1084
+++ sources	14 Sep 2009 21:33:55 -0000	1.1085
@@ -1 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
+1e664c17a5f41ca9ac2d3d7f18cfb5ab  patch-2.6.31-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -p -r1.998 -r1.999
--- upstream	10 Sep 2009 00:43:49 -0000	1.998
+++ upstream	14 Sep 2009 21:33:55 -0000	1.999
@@ -1 +1,2 @@
 linux-2.6.31.tar.bz2
+patch-2.6.31-git2.bz2


--- alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch DELETED ---


--- linux-2.6-ahci-export-capabilities.patch DELETED ---


--- linux-2.6-alsa-improve-hda-powerdown.patch DELETED ---


--- linux-2.6-nfs4-ver4opt.patch DELETED ---


--- sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch DELETED ---



From kevin at fedoraproject.org  Mon Sep 14 21:36:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:36:12 +0000 (UTC)
Subject: rpms/seeker - New directory
Message-ID: <20090914213612.D8E7111C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/seeker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10689/rpms/seeker

Log Message:
Directory /cvs/pkgs/rpms/seeker added to the repository




From kevin at fedoraproject.org  Mon Sep 14 21:36:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:36:13 +0000 (UTC)
Subject: rpms/seeker/devel - New directory
Message-ID: <20090914213613.89FCD11C0380@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/seeker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10689/rpms/seeker/devel

Log Message:
Directory /cvs/pkgs/rpms/seeker/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 14 21:36:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:36:49 +0000 (UTC)
Subject: rpms/seeker Makefile,NONE,1.1
Message-ID: <20090914213649.D7E4F11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/seeker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10689/rpms/seeker

Added Files:
	Makefile 
Log Message:
Setup of module seeker


--- NEW FILE Makefile ---
# Top level Makefile for module seeker
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 Sep 14 21:36:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Sep 2009 21:36:51 +0000 (UTC)
Subject: rpms/seeker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090914213651.CB3F811C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/seeker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10689/rpms/seeker/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module seeker


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: seeker
# $Id: Makefile,v 1.1 2009/09/14 21:36:50 kevin Exp $
NAME := seeker
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 kkofler at fedoraproject.org  Mon Sep 14 21:46:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 14 Sep 2009 21:46:34 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.290,1.291
Message-ID: <20090914214634.ACF6211C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22514/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
One more fix to the file list for builds without PolicyKit 0.9.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- kdebase-workspace.spec	14 Sep 2009 19:57:46 -0000	1.290
+++ kdebase-workspace.spec	14 Sep 2009 21:46:34 -0000	1.291
@@ -496,7 +496,9 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%if 0%{?with_polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so



From sandeen at fedoraproject.org  Mon Sep 14 21:48:55 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 14 Sep 2009 21:48:55 +0000 (UTC)
Subject: rpms/fio/devel .cvsignore, 1.12, 1.13 fio.spec, 1.13, 1.14 sources, 
	1.12, 1.13
Message-ID: <20090914214855.81AE811C00EC@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/fio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25640

Modified Files:
	.cvsignore fio.spec sources 
Log Message:
* Mon Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.34-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Sep 2009 15:53:39 -0000	1.12
+++ .cvsignore	14 Sep 2009 21:48:54 -0000	1.13
@@ -1 +1 @@
-fio-1.33.1.tar.bz2
+fio-1.34.tar.bz2


Index: fio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/fio.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fio.spec	10 Sep 2009 15:53:39 -0000	1.13
+++ fio.spec	14 Sep 2009 21:48:55 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		fio
-Version:	1.33.1
+Version:	1.34
 Release:	1%{?dist}
 Summary:	Multithreaded IO generation tool
 
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.34-1
+- New upstream version
+
 * Thu Sep 10 2009 Eric Sandeen <sandeen at redhat.com> 1.33.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Sep 2009 15:53:39 -0000	1.12
+++ sources	14 Sep 2009 21:48:55 -0000	1.13
@@ -1 +1 @@
-d345b60d28d57a077dc95c81121f18d1  fio-1.33.1.tar.bz2
+88a5e18e6b58a6d8952735f4e733358a  fio-1.34.tar.bz2



From mmcgrath at fedoraproject.org  Mon Sep 14 21:53:34 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 14 Sep 2009 21:53:34 +0000 (UTC)
Subject: rpms/smolt/devel .cvsignore, 1.27, 1.28 smolt.spec, 1.74,
	1.75 sources, 1.28, 1.29
Message-ID: <20090914215334.4959A11C00EC@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29571

Modified Files:
	.cvsignore smolt.spec sources 
Log Message:
building for the 1.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	3 Sep 2009 16:41:00 -0000	1.27
+++ .cvsignore	14 Sep 2009 21:53:33 -0000	1.28
@@ -1 +1 @@
-smolt-1.3.2.tar.gz
+smolt-1.4.tar.gz


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- smolt.spec	10 Sep 2009 14:26:25 -0000	1.74
+++ smolt.spec	14 Sep 2009 21:53:33 -0000	1.75
@@ -1,8 +1,8 @@
 Name: smolt
 
 Summary: Fedora hardware profiler
-Version: 1.3.2
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -207,6 +207,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Mon Sep 14 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-1
+- Upstream released new version
+
 * Thu Sep 10 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-2
 - Added requires for PyQt4 on smolt gui
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	3 Sep 2009 16:41:00 -0000	1.28
+++ sources	14 Sep 2009 21:53:33 -0000	1.29
@@ -1 +1 @@
-1b6d9f58cf400e1115825c2039383609  smolt-1.3.2.tar.gz
+a5a56912381e71f75b4c0368670a0ca8  smolt-1.4.tar.gz



From pbrobinson at fedoraproject.org  Mon Sep 14 22:05:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Sep 2009 22:05:02 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.22,1.23
Message-ID: <20090914220502.1FAA711C00EC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12935

Modified Files:
	nbtk.spec 
Log Message:
- New upstream 1.1.2 release


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nbtk.spec	7 Sep 2009 20:56:50 -0000	1.22
+++ nbtk.spec	14 Sep 2009 22:05:01 -0000	1.23
@@ -1,18 +1,18 @@
 Name:           nbtk
-Version:        1.0.0
-Release:        0.2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
-# Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-# git archive --format=tar --prefix=nbtk-1.0.0/ ff163ba | bzip2 > nbtk-1.0.0.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: gir-repository-devel
 BuildRequires: gtk2-devel
 BuildRequires: libccss-devel
 BuildRequires: pkgconfig
@@ -74,6 +74,8 @@ rm -rf %{buildroot}
 %doc COPYING.LIB
 %{_bindir}/nbtk-create-image-cache
 %{_libdir}/libnbtk-*.so.*
+%{_libdir}/girepository-1.0/Nbtk-1.0.typelib
+%{_libdir}/girepository-1.0/NbtkGtk-1.0.typelib
 %{_datadir}/nbtk
 
 %files devel
@@ -81,9 +83,14 @@ rm -rf %{buildroot}
 %{_includedir}/nbtk-1.0
 %{_libdir}/pkgconfig/nbtk*.pc
 %{_libdir}/libnbtk*.so
+%{_datadir}/gir-1.0/Nbtk-1.0.gir
+%{_datadir}/gir-1.0/NbtkGtk-1.0.gir
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep 12 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.2-1
+- New upstream 1.1.2 release
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.2
 - Add gettext and intltool for translations
 



From gavin at fedoraproject.org  Mon Sep 14 22:09:16 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Mon, 14 Sep 2009 22:09:16 +0000 (UTC)
Subject: rpms/fastback/devel fastback.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914220916.8FFFC11C00EC@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/fastback/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19203/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fastback.spec import.log 
Log Message:
initial import



--- NEW FILE fastback.spec ---
Name:           fastback
Version:        0.2
Release:        3%{?dist}
Summary:        File uploader, configureable file uploader

Group:          System Environment/Base
License:        GPLv2+
URL:            http://fedorahosted.org/fastback
Source0:        http://fedorahosted.org/released/fastback/fastback-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: openssl-devel
Requires: openssl

%if 0%{?rhel} && 0%{?rhel} <= 5
BuildRequires: curl-devel
%else
BuildRequires: libcurl-devel
%endif  

%description
Fastback is a command line tool to upload files to a ticketing system, or
other configurable URL (FTP,SCP,...).

%prep
%setup -q

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README FIXME
/bin/fastback
/bin/fastback-unload-receipt
%attr(0644,root,root) %config(noreplace) /etc/fastback.conf


%changelog
* Thu Sep  3 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-3
- clean up the curl-devel/libcurl-devel buildrequires

* Mon Sep  2 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-2
- clean up documentation
- clean up spec file (for rpmlint)

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- added support for SCP and HTTP
- improved the documentation
- improved the error handling

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- Initial version.



--- NEW FILE import.log ---
fastback-0_2-3_fc11:HEAD:fastback-0.2-3.fc11.src.rpm:1252965806


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:33:53 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:09:14 -0000	1.2
@@ -0,0 +1 @@
+fastback-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:33:53 -0000	1.1
+++ sources	14 Sep 2009 22:09:15 -0000	1.2
@@ -0,0 +1 @@
+424a9169782beaacfcc94df8cafa2626  fastback-0.2.tar.gz



From gavin at fedoraproject.org  Mon Sep 14 22:10:43 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Mon, 14 Sep 2009 22:10:43 +0000 (UTC)
Subject: rpms/fastback/F-12 fastback.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914221043.E0A0B11C0489@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/fastback/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22189/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	fastback.spec import.log 
Log Message:
initial import



--- NEW FILE fastback.spec ---
Name:           fastback
Version:        0.2
Release:        3%{?dist}
Summary:        File uploader, configureable file uploader

Group:          System Environment/Base
License:        GPLv2+
URL:            http://fedorahosted.org/fastback
Source0:        http://fedorahosted.org/released/fastback/fastback-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: openssl-devel
Requires: openssl

%if 0%{?rhel} && 0%{?rhel} <= 5
BuildRequires: curl-devel
%else
BuildRequires: libcurl-devel
%endif  

%description
Fastback is a command line tool to upload files to a ticketing system, or
other configurable URL (FTP,SCP,...).

%prep
%setup -q

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README FIXME
/bin/fastback
/bin/fastback-unload-receipt
%attr(0644,root,root) %config(noreplace) /etc/fastback.conf


%changelog
* Thu Sep  3 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-3
- clean up the curl-devel/libcurl-devel buildrequires

* Mon Sep  2 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-2
- clean up documentation
- clean up spec file (for rpmlint)

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- added support for SCP and HTTP
- improved the documentation
- improved the error handling

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- Initial version.



--- NEW FILE import.log ---
fastback-0_2-3_fc11:F-12:fastback-0.2-3.fc11.src.rpm:1252965906


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:33:53 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:10:43 -0000	1.2
@@ -0,0 +1 @@
+fastback-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:33:53 -0000	1.1
+++ sources	14 Sep 2009 22:10:43 -0000	1.2
@@ -0,0 +1 @@
+424a9169782beaacfcc94df8cafa2626  fastback-0.2.tar.gz



From gavin at fedoraproject.org  Mon Sep 14 22:12:11 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Mon, 14 Sep 2009 22:12:11 +0000 (UTC)
Subject: rpms/fastback/F-11 fastback.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914221211.08A8311C00EC@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/fastback/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24521/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	fastback.spec import.log 
Log Message:
initial commit



--- NEW FILE fastback.spec ---
Name:           fastback
Version:        0.2
Release:        3%{?dist}
Summary:        File uploader, configureable file uploader

Group:          System Environment/Base
License:        GPLv2+
URL:            http://fedorahosted.org/fastback
Source0:        http://fedorahosted.org/released/fastback/fastback-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: openssl-devel
Requires: openssl

%if 0%{?rhel} && 0%{?rhel} <= 5
BuildRequires: curl-devel
%else
BuildRequires: libcurl-devel
%endif  

%description
Fastback is a command line tool to upload files to a ticketing system, or
other configurable URL (FTP,SCP,...).

%prep
%setup -q

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README FIXME
/bin/fastback
/bin/fastback-unload-receipt
%attr(0644,root,root) %config(noreplace) /etc/fastback.conf


%changelog
* Thu Sep  3 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-3
- clean up the curl-devel/libcurl-devel buildrequires

* Mon Sep  2 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-2
- clean up documentation
- clean up spec file (for rpmlint)

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- added support for SCP and HTTP
- improved the documentation
- improved the error handling

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- Initial version.



--- NEW FILE import.log ---
fastback-0_2-3_fc11:F-11:fastback-0.2-3.fc11.src.rpm:1252966005


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:33:53 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:12:10 -0000	1.2
@@ -0,0 +1 @@
+fastback-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:33:53 -0000	1.1
+++ sources	14 Sep 2009 22:12:10 -0000	1.2
@@ -0,0 +1 @@
+424a9169782beaacfcc94df8cafa2626  fastback-0.2.tar.gz



From gavin at fedoraproject.org  Mon Sep 14 22:13:38 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Mon, 14 Sep 2009 22:13:38 +0000 (UTC)
Subject: rpms/fastback/EL-5 fastback.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914221338.E1C8E11C00EC@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/fastback/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25983/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	fastback.spec import.log 
Log Message:
initial commit



--- NEW FILE fastback.spec ---
Name:           fastback
Version:        0.2
Release:        3%{?dist}
Summary:        File uploader, configureable file uploader

Group:          System Environment/Base
License:        GPLv2+
URL:            http://fedorahosted.org/fastback
Source0:        http://fedorahosted.org/released/fastback/fastback-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: openssl-devel
Requires: openssl

%if 0%{?rhel} && 0%{?rhel} <= 5
BuildRequires: curl-devel
%else
BuildRequires: libcurl-devel
%endif  

%description
Fastback is a command line tool to upload files to a ticketing system, or
other configurable URL (FTP,SCP,...).

%prep
%setup -q

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README FIXME
/bin/fastback
/bin/fastback-unload-receipt
%attr(0644,root,root) %config(noreplace) /etc/fastback.conf


%changelog
* Thu Sep  3 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-3
- clean up the curl-devel/libcurl-devel buildrequires

* Mon Sep  2 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-2
- clean up documentation
- clean up spec file (for rpmlint)

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- added support for SCP and HTTP
- improved the documentation
- improved the error handling

* Mon Aug 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- Initial version.



--- NEW FILE import.log ---
fastback-0_2-3_fc11:EL-5:fastback-0.2-3.fc11.src.rpm:1252966057


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:33:53 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:13:38 -0000	1.2
@@ -0,0 +1 @@
+fastback-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fastback/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:33:53 -0000	1.1
+++ sources	14 Sep 2009 22:13:38 -0000	1.2
@@ -0,0 +1 @@
+424a9169782beaacfcc94df8cafa2626  fastback-0.2.tar.gz



From lutter at fedoraproject.org  Mon Sep 14 22:16:41 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon, 14 Sep 2009 22:16:41 +0000 (UTC)
Subject: rpms/augeas/EL-4 .cvsignore, 1.19, 1.20 augeas.spec, 1.22,
	1.23 sources, 1.19, 1.20
Message-ID: <20090914221641.9036E11C00EC@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30516/EL-4

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 02:53:42 -0000	1.19
+++ .cvsignore	14 Sep 2009 22:16:40 -0000	1.20
@@ -1 +1 @@
-augeas-0.5.2.tar.gz
+augeas-0.5.3.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- augeas.spec	26 Aug 2009 16:54:44 -0000	1.22
+++ augeas.spec	14 Sep 2009 22:16:41 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           augeas
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,9 +12,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
-# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
-Source1:        xorg.aug
-
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -56,9 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Replace xorg lens with new version from upstream
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Sep 14 2009 David Lutterkort <lutter at redhat.com> - 0.5.3-1
+- Remove separate xorg.aug, included in upstream source
+
 * Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
 - Include new xorg lens from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Jul 2009 02:53:42 -0000	1.19
+++ sources	14 Sep 2009 22:16:41 -0000	1.20
@@ -1 +1 @@
-83937c683999d7f53d91df56750e3b66  augeas-0.5.2.tar.gz
+7bec933b3f3c01d24955fb5b1fc5aac9  augeas-0.5.3.tar.gz



From lutter at fedoraproject.org  Mon Sep 14 22:16:41 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon, 14 Sep 2009 22:16:41 +0000 (UTC)
Subject: rpms/augeas/EL-5 .cvsignore, 1.19, 1.20 augeas.spec, 1.21,
	1.22 sources, 1.19, 1.20
Message-ID: <20090914221641.E191311C00EC@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30516/EL-5

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 02:53:42 -0000	1.19
+++ .cvsignore	14 Sep 2009 22:16:41 -0000	1.20
@@ -1 +1 @@
-augeas-0.5.2.tar.gz
+augeas-0.5.3.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- augeas.spec	26 Aug 2009 16:39:29 -0000	1.21
+++ augeas.spec	14 Sep 2009 22:16:41 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           augeas
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,9 +12,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
-# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
-Source1:        xorg.aug
-
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -56,9 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Replace xorg lens with new version from upstream
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Sep 14 2009 David Lutterkort <lutter at redhat.com> - 0.5.3-1
+- Remove separate xorg.aug, included in upstream source
+
 * Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
 - Include new xorg lens from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Jul 2009 02:53:42 -0000	1.19
+++ sources	14 Sep 2009 22:16:41 -0000	1.20
@@ -1 +1 @@
-83937c683999d7f53d91df56750e3b66  augeas-0.5.2.tar.gz
+7bec933b3f3c01d24955fb5b1fc5aac9  augeas-0.5.3.tar.gz



From lutter at fedoraproject.org  Mon Sep 14 22:16:42 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon, 14 Sep 2009 22:16:42 +0000 (UTC)
Subject: rpms/augeas/F-10 .cvsignore, 1.19, 1.20 augeas.spec, 1.20,
	1.21 sources, 1.19, 1.20
Message-ID: <20090914221642.810E211C00EC@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30516/F-10

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 02:53:42 -0000	1.19
+++ .cvsignore	14 Sep 2009 22:16:41 -0000	1.20
@@ -1 +1 @@
-augeas-0.5.2.tar.gz
+augeas-0.5.3.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/augeas.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- augeas.spec	26 Aug 2009 16:25:02 -0000	1.20
+++ augeas.spec	14 Sep 2009 22:16:41 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           augeas
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,9 +12,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
-# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
-Source1:        xorg.aug
-
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -56,9 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Replace xorg lens with new version from upstream
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Sep 14 2009 David Lutterkort <lutter at redhat.com> - 0.5.3-1
+- Remove separate xorg.aug, included in upstream source
+
 * Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
 - Include new xorg lens from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Jul 2009 02:53:42 -0000	1.19
+++ sources	14 Sep 2009 22:16:41 -0000	1.20
@@ -1 +1 @@
-83937c683999d7f53d91df56750e3b66  augeas-0.5.2.tar.gz
+7bec933b3f3c01d24955fb5b1fc5aac9  augeas-0.5.3.tar.gz



From lutter at fedoraproject.org  Mon Sep 14 22:16:42 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon, 14 Sep 2009 22:16:42 +0000 (UTC)
Subject: rpms/augeas/F-11 .cvsignore, 1.19, 1.20 augeas.spec, 1.21,
	1.22 sources, 1.19, 1.20
Message-ID: <20090914221642.E074611C0261@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30516/F-11

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 02:53:43 -0000	1.19
+++ .cvsignore	14 Sep 2009 22:16:42 -0000	1.20
@@ -1 +1 @@
-augeas-0.5.2.tar.gz
+augeas-0.5.3.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-11/augeas.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- augeas.spec	26 Aug 2009 16:23:38 -0000	1.21
+++ augeas.spec	14 Sep 2009 22:16:42 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           augeas
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,9 +12,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
-# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
-Source1:        xorg.aug
-
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -56,9 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Replace xorg lens with new version from upstream
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Sep 14 2009 David Lutterkort <lutter at redhat.com> - 0.5.3-1
+- Remove separate xorg.aug, included in upstream source
+
 * Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
 - Include new xorg lens from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Jul 2009 02:53:43 -0000	1.19
+++ sources	14 Sep 2009 22:16:42 -0000	1.20
@@ -1 +1 @@
-83937c683999d7f53d91df56750e3b66  augeas-0.5.2.tar.gz
+7bec933b3f3c01d24955fb5b1fc5aac9  augeas-0.5.3.tar.gz



From lutter at fedoraproject.org  Mon Sep 14 22:16:43 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon, 14 Sep 2009 22:16:43 +0000 (UTC)
Subject: rpms/augeas/devel .cvsignore, 1.19, 1.20 augeas.spec, 1.22,
	1.23 sources, 1.19, 1.20
Message-ID: <20090914221643.8FD7211C00EC@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30516/devel

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 02:53:43 -0000	1.19
+++ .cvsignore	14 Sep 2009 22:16:42 -0000	1.20
@@ -1 +1 @@
-augeas-0.5.2.tar.gz
+augeas-0.5.3.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- augeas.spec	26 Aug 2009 16:20:30 -0000	1.22
+++ augeas.spec	14 Sep 2009 22:16:42 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           augeas
-Version:        0.5.2
-Release:        3%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,9 +12,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
-# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
-Source1:        xorg.aug
-
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -56,9 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Replace xorg lens with new version from upstream
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Sep 14 2009 David Lutterkort <lutter at redhat.com> - 0.5.3-1
+- Remove separate xorg.aug, included in upstream source
+
 * Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-3
 - Include new xorg lens from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Jul 2009 02:53:43 -0000	1.19
+++ sources	14 Sep 2009 22:16:43 -0000	1.20
@@ -1 +1 @@
-83937c683999d7f53d91df56750e3b66  augeas-0.5.2.tar.gz
+7bec933b3f3c01d24955fb5b1fc5aac9  augeas-0.5.3.tar.gz



From bpepple at fedoraproject.org  Mon Sep 14 22:19:23 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Sep 2009 22:19:23 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.36, 1.37 sources, 1.36,
	1.37 telepathy-glib.spec, 1.45, 1.46
Message-ID: <20090914221923.4894311C00EC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2642

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.37-1
- Update to 0.7.37.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	3 Sep 2009 20:26:32 -0000	1.36
+++ .cvsignore	14 Sep 2009 22:19:22 -0000	1.37
@@ -1 +1 @@
-telepathy-glib-0.7.36.tar.gz
+telepathy-glib-0.7.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	3 Sep 2009 20:26:32 -0000	1.36
+++ sources	14 Sep 2009 22:19:22 -0000	1.37
@@ -1 +1 @@
-b557e89db1be21b2a3c2935fb04e3b4e  telepathy-glib-0.7.36.tar.gz
+681b5b82fc3ec65d86a6cb409ec38e5d  telepathy-glib-0.7.37.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- telepathy-glib.spec	3 Sep 2009 20:26:32 -0000	1.45
+++ telepathy-glib.spec	14 Sep 2009 22:19:22 -0000	1.46
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.36
+Version:        0.7.37
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.37-1
+- Update to 0.7.37.
+
 * Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.36-1
 - Update to 0.7.36.
 



From timn at fedoraproject.org  Mon Sep 14 22:25:06 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon, 14 Sep 2009 22:25:06 +0000 (UTC)
Subject: rpms/libkni3/devel import.log, NONE, 1.1 kni-3.9.2-ctor.patch, NONE,
	1.1 kni-3.9.2-gcc43.patch, NONE, 1.1 kni-3.9.2-noexit.patch,
	NONE, 1.1 kni-3.9.2-sofixes.patch, NONE, 1.1 libkni3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914222507.73D8A11C00EC@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/libkni3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9566/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kni-3.9.2-ctor.patch kni-3.9.2-gcc43.patch 
	kni-3.9.2-noexit.patch kni-3.9.2-sofixes.patch libkni3.spec 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
libkni3-3_9_2-12_fc11:HEAD:libkni3-3.9.2-12.fc11.src.rpm:1252967051

kni-3.9.2-ctor.patch:
 include/KNI/cdlCOM.h     |    2 
 src/Base/cdlCOM.cpp      |   17 +-
 src/Base/cdlCOM.cpp.orig |  369 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 380 insertions(+), 8 deletions(-)

--- NEW FILE kni-3.9.2-ctor.patch ---
diff -urN KNI_3.9.2/include/KNI/cdlCOM.h KNI_3.9.2.ctor/include/KNI/cdlCOM.h
--- KNI_3.9.2/include/KNI/cdlCOM.h	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.ctor/include/KNI/cdlCOM.h	2009-06-12 16:44:42.000000000 +0200
@@ -107,7 +107,7 @@
 	 *	describes the desired serial port. An attempt to open a connection
 	 *	to the desired device will be tried.
 	 */
-	CCdlCOM(TCdlCOMDesc ccd);
+	CCdlCOM(TCdlCOMDesc ccd, const char *dev_name = 0);
 
 	/*! \brief	Destructs the class
 	 */	virtual ~CCdlCOM();
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.ctor/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2009-06-12 16:44:03.000000000 +0200
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp	2009-06-12 16:45:02.000000000 +0200
@@ -23,8 +23,9 @@
 
 #include "common/Timer.h"
 #include <cstring>
+#include <cstdio>
 
-
+#include <cstdlib>
 #ifdef WIN32
 
 CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
@@ -160,21 +161,24 @@
 
 #else //LINUX
 
-CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd, const char *dev_name) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
 
 	int prtHdl	= -1;
 
-	std::string deviceName;
 	struct termios	nto, oto;
-	char		name[11];
+	char *name;
 
 	errno = 0;
 
-	strncpy(name, "/dev/ttyS ", 11);
-	name[9] = digit(ccd.port);
+	if (dev_name) {
+          name = strdup(dev_name);
+        } else {
+          asprintf(&name, "/dev/ttyS%i", ccd.port);
+        }
 	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
 
 	_deviceName = name;
+        free(name);
 
 	if (prtHdl < 0) {
 		throw CannotOpenPortException(_deviceName, strerror(errno));
@@ -290,7 +294,6 @@
 	}
 
 	_prtHdl = prtHdl;
-	_deviceName = deviceName;
 	_ccd = ccd;
 	_oto = oto;
 }
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp.orig KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig
--- KNI_3.9.2/src/Base/cdlCOM.cpp.orig	1970-01-01 01:00:00.000000000 +0100
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig	2009-06-12 16:44:42.000000000 +0200
@@ -0,0 +1,369 @@
+/*
+ *   Katana Native Interface - A C++ interface to the robot arm Katana.
+ *   Copyright (C) 2005 Neuronics AG
+ *   Check out the AUTHORS file for detailed contact 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
+ */
+
+
+#include "KNI/cdlCOM.h"
+
+#include "common/Timer.h"
+#include <cstring>
+
+
+#ifdef WIN32
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
+
+	DCB commDCB;	//COM port parameters
+	COMMTIMEOUTS nto;	//new timeouts
+	char comX[5];
+	char dcb[35];
+	int i, d;
+
+	std::string deviceName;
+	HANDLE prtHdl;
+	COMMTIMEOUTS oto;
+
+	strncpy_s(comX, "COM ", 5);
+	comX[3] = digit(ccd.port);
+	deviceName = comX;
+	prtHdl = CreateFile(comX,
+	                    GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING,
+	                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, 0
+	                   );
+
+	if (prtHdl == INVALID_HANDLE_VALUE) {
+		throw CannotOpenPortException(_deviceName, "info from win32-system not yet available");
+	}
+
+	FillMemory(&commDCB, sizeof(commDCB), 0);
+	commDCB.DCBlength = sizeof(commDCB);
+	strncpy_s(dcb, "baud=       parity=  data=  stop= ", 35);
+	for(i=5,d=100000; d>=1; d=d/10) {
+		if(d <= ccd.baud) {
+			dcb[i++] = digit((ccd.baud/d) % 10);
+		}
+	}
+	dcb[19] = ccd.parity;
+	dcb[26] = digit(ccd.data);
+	dcb[33] = digit(ccd.stop);
+	if (!BuildCommDCB(dcb, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	commDCB.fAbortOnError	= false;
+	commDCB.fInX			= false;
+	commDCB.fOutX			= false;
+	commDCB.fOutxCtsFlow	= false;
+	if (!SetCommState(prtHdl, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	PurgeComm(	prtHdl,	PURGE_TXABORT | PURGE_RXABORT | PURGE_TXCLEAR | PURGE_RXCLEAR);
+
+	GetCommTimeouts(prtHdl, &oto);
+	nto.ReadIntervalTimeout			= MAXDWORD;
+	nto.ReadTotalTimeoutMultiplier	= 0;
+	nto.ReadTotalTimeoutConstant	= 0;
+	nto.WriteTotalTimeoutMultiplier	= 0;
+	nto.WriteTotalTimeoutConstant	= 0;
+	if (!SetCommTimeouts(prtHdl, &nto)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	// Everything done, now we can change the state
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+	if(_prtHdl == INVALID_HANDLE_VALUE)
+		return;
+
+	FlushFileBuffers(_prtHdl);
+	SetCommTimeouts(_prtHdl, &_oto);
+
+	CloseHandle(_prtHdl);
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_TXABORT | PURGE_TXCLEAR) == 0) {
+		throw DeviceWriteException(_deviceName, "PurgeComm failed");
+	}
+
+	unsigned long readsz;
+	if (WriteFile(_prtHdl, buf, size, &readsz, 0) == 0) {
+		throw DeviceWriteException(_deviceName, "WriteFile failed");
+	}
+
+	if(readsz != static_cast<long>(size)) {
+		throw WriteNotCompleteException(_deviceName);
+	}
+
+	return (int)readsz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	unsigned long readsz = 0, readsz_temp = 0;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<(unsigned long)size && !timeout.Elapsed()) {
+		if(ReadFile(_prtHdl, &tmp[readsz], size, &readsz_temp, 0) == 0) {
+			DeviceReadException( _deviceName, "ReadFile failed" );
+		} else {
+			readsz  += readsz_temp;
+		}
+	}
+
+	if((unsigned)size != readsz) {
+		throw ReadNotCompleteException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_RXABORT | PURGE_RXCLEAR) == 0) {
+		throw DeviceReadException(_deviceName, "PurgeComm failed");
+	}
+	return (int)readsz;
+}
+
+
+#else //LINUX
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+
+	int prtHdl	= -1;
+
+	std::string deviceName;
+	struct termios	nto, oto;
+	char		name[11];
+
+	errno = 0;
+
+	strncpy(name, "/dev/ttyS ", 11);
+	name[9] = digit(ccd.port);
+	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
+
+	_deviceName = name;
+
+	if (prtHdl < 0) {
+		throw CannotOpenPortException(_deviceName, strerror(errno));
+	}
+
+	tcgetattr(prtHdl, &oto);
+	bzero(&nto, sizeof(nto));
+	nto.c_cc[VTIME]	= 0;
+	nto.c_cc[VMIN]	= 0;
+	nto.c_oflag	= 0;
+	nto.c_lflag	= 0;
+	nto.c_cflag	= CLOCAL | CREAD;
+	nto.c_iflag	= 0;
+
+	switch (ccd.baud) {
+	case     50:
+		nto.c_cflag |= B50;
+		break;
+	case     75:
+		nto.c_cflag |= B75;
+		break;
+	case    110:
+		nto.c_cflag |= B110;
+		break;
+	case    134:
+		nto.c_cflag |= B134;
+		break;
+	case    150:
+		nto.c_cflag |= B150;
+		break;
+	case    200:
+		nto.c_cflag |= B200;
+		break;
+	case    300:
+		nto.c_cflag |= B300;
+		break;
+	case    600:
+		nto.c_cflag |= B600;
+		break;
+	case   1200:
+		nto.c_cflag |= B1200;
+		break;
+	case   1800:
+		nto.c_cflag |= B1800;
+		break;
+	case   2400:
+		nto.c_cflag |= B2400;
+		break;
+	case   4800:
+		nto.c_cflag |= B4800;
+		break;
+	case   9600:
+		nto.c_cflag |= B9600;
+		break;
+	case  19200:
+		nto.c_cflag |= B19200;
+		break;
+	case  38400:
+		nto.c_cflag |= B38400;
+		break;
+	case  57600:
+		nto.c_cflag |= B57600;
+		break;
+	case 115200:
+		nto.c_cflag |= B115200;
+		break;
+	case 230400:
+		nto.c_cflag |= B230400;
+		break;
+	}
+
+	switch (ccd.data) {
+	case  5:
+		nto.c_cflag |= CS5;
+		break;
+	case  6:
+		nto.c_cflag |= CS6;
+		break;
+	case  7:
+		nto.c_cflag |= CS7;
+		break;
+	case  8:
+		nto.c_cflag |= CS8;
+		break;
+	}
+
+	switch (ccd.parity) {
+	case 'N':
+	case 'n':
+		break;
+	case 'O':
+	case 'o':
+		nto.c_cflag |= PARENB | PARODD;
+		break;
+	case 'E':
+	case 'e':
+		nto.c_cflag |= PARENB;
+		break;
+	}
+
+	switch (ccd.stop) {
+	case  1:
+		break;
+	case  2:
+		nto.c_cflag |= CSTOPB;
+		break;
+	}
+
+	tcflush(prtHdl,TCIFLUSH);
+	if (tcsetattr(prtHdl, TCSANOW, &nto) != 0) {
+		::close(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+
+	if (_prtHdl < 0) {
+		return;
+	}
+
+	tcflush(_prtHdl, TCIFLUSH);
+	tcsetattr(_prtHdl, TCSANOW, &_oto);
+
+	::close(_prtHdl); // there's nothing we can do about failing
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	int writesz = write(_prtHdl, buf, size);
+
+	if(writesz < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	if(writesz != size)
+		throw WriteNotCompleteException(_deviceName);
+
+	return writesz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	register int	readsz 	= 0;
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int read_return;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<size && !timeout.Elapsed()) {
+		read_return = read(_prtHdl, &tmp[readsz], size-readsz);
+		if(read_return < 0) {
+			if(errno != EAGAIN)
+				throw DeviceReadException( _deviceName, strerror(errno));
+		} else {
+			readsz  += read_return;
+		}
+	}
+
+	if (readsz != size)
+		throw ReadNotCompleteException(_deviceName);
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceReadException( _deviceName, strerror(errno));
+
+	return readsz;
+
+}
+
+
+
+#endif //WIN32 else LINUX
+

kni-3.9.2-gcc43.patch:
 demo/keycontrol/keycontrol.cpp         |    1 +
 demo/perfo/main.cpp                    |    1 +
 demo/perfo/perfo.cpp                   |    9 +++++----
 demo/positions/main.cpp                |    1 +
 demo/sensor/main.cpp                   |    1 +
 demo/socketcommands/socketcommands.cpp |    1 +
 demo/socketcontrol/socketcontrol.cpp   |    1 +
 include/KNI/kmlMotBase.h               |    4 ++--
 src/Base/cdlCOM.cpp                    |    1 +
 src/Base/cdlSocket.cpp                 |    3 +++
 src/Base/cplSerial.cpp                 |    1 +
 src/Base/kmlBase.cpp                   |    1 +
 src/Base/kmlFactories.cpp              |    2 ++
 src/Base/kmlMotBase.cpp                |    2 ++
 14 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE kni-3.9.2-gcc43.patch ---
diff -urN KNI_3.9.2/demo/keycontrol/keycontrol.cpp KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp
--- KNI_3.9.2/demo/keycontrol/keycontrol.cpp	2007-08-10 14:37:42.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/perfo/main.cpp KNI_3.9.2.gcc43/demo/perfo/main.cpp
--- KNI_3.9.2/demo/perfo/main.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/main.cpp	2009-06-12 16:48:21.000000000 +0200
@@ -19,6 +19,7 @@
 #include "KNI/kmlBase.h"	//for robot: CKatBase, CMotBase, CSctBase
 #include "KNI/kmlExt.h"	// extended katana features
 #include <iostream>		//for messages: printf()
+#include <cstdio>
 
 /**********************************************************************************/
 #include "perfo.h"	//for performance checking..
diff -urN KNI_3.9.2/demo/perfo/perfo.cpp KNI_3.9.2.gcc43/demo/perfo/perfo.cpp
--- KNI_3.9.2/demo/perfo/perfo.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/perfo.cpp	2009-06-12 16:48:29.000000000 +0200
@@ -2,6 +2,7 @@
 #include "perfo.h"
 #include <time.h>
 #include <iostream>
+#include <cstdio>
 
 #include "KNI/cdlCOMExceptions.h"
 #include "KNI/cplSerial.h"
@@ -13,7 +14,7 @@
 #define CLOCK() (clock_t)((double)(1000.0f * clock()) / CLOCKS_PER_SEC)
 //-------------------------------------------------------------------------------//
 
-void statKatRecv(char strTitle[], long i, long j, clock_t t, long l) {
+void statKatRecv(const char strTitle[], long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -102,7 +103,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statMotRecv(char strTitle[], short idx, long i, long j, clock_t t, long l) {
+void statMotRecv(const char strTitle[], short idx, long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -111,7 +112,7 @@
 	printf("-------------------------------------------\n\n");
 }
 
-void statMotSend(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statMotSend(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -278,7 +279,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statSct(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statSct(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
diff -urN KNI_3.9.2/demo/positions/main.cpp KNI_3.9.2.gcc43/demo/positions/main.cpp
--- KNI_3.9.2/demo/positions/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/positions/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -8,6 +8,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/sensor/main.cpp KNI_3.9.2.gcc43/demo/sensor/main.cpp
--- KNI_3.9.2/demo/sensor/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/sensor/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <conio.h> //ONLY WIN32 COMPATIBLE!!
 #endif
 #include <time.h>
+#include <cstdlib>
 
 //------------------------------------------------------------------------//
 
diff -urN KNI_3.9.2/demo/socketcommands/socketcommands.cpp KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp
--- KNI_3.9.2/demo/socketcommands/socketcommands.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <cstdio>
 #include <memory>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp
--- KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp	2007-09-03 16:04:48.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -11,6 +11,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/include/KNI/kmlMotBase.h KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h
--- KNI_3.9.2/include/KNI/kmlMotBase.h	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h	2009-06-12 16:48:02.000000000 +0200
@@ -45,7 +45,7 @@
 
 /*!	\brief	command flags
  */
-typedef enum TMotCmdFlg {
+enum TMotCmdFlg {
 	MCF_OFF		= 0,		//!< set the motor off
 	MCF_CALIB	= 4,		//!< calibrate
 	MCF_FREEZE	= 8,		//!< freeze the motor
@@ -54,7 +54,7 @@
 
 /*!	\brief	status flags
  */
-typedef enum TMotStsFlg	{
+enum TMotStsFlg	{
 	MSF_MECHSTOP	= 1,		//!< mechanical stopper reached
 	MSF_MAXPOS	= 2,		//!< max. position was reached
 	MSF_MINPOS	= 4,		//!< min. position was reached
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/cdlCOM.h"
 
 #include "common/Timer.h"
+#include <cstring>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/src/Base/cdlSocket.cpp KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp
--- KNI_3.9.2/src/Base/cdlSocket.cpp	2007-11-06 14:45:08.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,9 @@
 /****************************************************************************/
 #include "KNI/cdlSocket.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
+
 /****************************************************************************/
 //test write:
 int writesz;
diff -urN KNI_3.9.2/src/Base/cplSerial.cpp KNI_3.9.2.gcc43/src/Base/cplSerial.cpp
--- KNI_3.9.2/src/Base/cplSerial.cpp	2007-11-13 10:38:44.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cplSerial.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/CRC.h"
 #include <assert.h>
 #include <iostream>
+#include <cstring>
 
 
 /*
diff -urN KNI_3.9.2/src/Base/kmlBase.cpp KNI_3.9.2.gcc43/src/Base/kmlBase.cpp
--- KNI_3.9.2/src/Base/kmlBase.cpp	2007-11-07 09:22:52.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/kmlBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,7 @@
 #include "KNI/kmlBase.h"
 
 #include <vector>
+#include <cstring>
 
 bool CKatBase::init(
     const TKatGNL _gnl,
diff -urN KNI_3.9.2/src/Base/kmlFactories.cpp KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp
--- KNI_3.9.2/src/Base/kmlFactories.cpp	2007-07-16 14:17:40.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -1,5 +1,7 @@
 
 #include "KNI/kmlFactories.h"
+#include <cstring>
+#include <cstdlib>
 
 namespace KNI {
 
diff -urN KNI_3.9.2/src/Base/kmlMotBase.cpp KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp
--- KNI_3.9.2/src/Base/kmlMotBase.cpp	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -15,6 +15,8 @@
 #include "common/MathHelperFunctions.h"
 #include "common/Timer.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 
 bool CMotBase::init(CKatBase* _own, const TMotDesc _motDesc, CCplBase* _protocol) {

kni-3.9.2-noexit.patch:
 cdlSocket.cpp |    7 ++++---
 kmlExt.cpp    |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE kni-3.9.2-noexit.patch ---
diff -urN KNI_3.9.2.patched/src/Base/cdlSocket.cpp KNI_3.9.2.noexit/src/Base/cdlSocket.cpp
--- KNI_3.9.2.patched/src/Base/cdlSocket.cpp	2008-12-01 13:12:13.000000000 +0100
+++ KNI_3.9.2.noexit/src/Base/cdlSocket.cpp	2008-12-01 13:16:07.000000000 +0100
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <cstring>
 #include <cstdlib>
+#include <stdexcept>
 
 /****************************************************************************/
 //test write:
@@ -95,7 +96,7 @@
 	_socketfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if(_socketfd == -1){
 		std::cout << "socket could not be created"<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("socket could not be created");
 	}
 	memset(&_socketAddr, 0, sizeof(_socketAddr));  
 	_socketAddr.sin_family = AF_INET;
@@ -106,13 +107,13 @@
 	res = inet_pton ( AF_INET, _ipAddr, &_socketAddr.sin_addr );
 	if ( errno == EAFNOSUPPORT ){
 		std::cout << "inet_pton failed, try again "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("inet_pton failed (EAFNOSUPPORT)");
 	}
 //	std::cout << "trying to connect to server...\n";
 	res = connect(_socketfd, (struct sockaddr *) &_socketAddr, _len);
 	if(res != 0){
 		std::cout << "client could not connect, check if server is running on ip "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("client could not connect, check if server is running");
 	}
 	else{
 //		std::cout << "client connected to ip "<<_ipAddr<<", port: "<< _port<<" \n";
diff -urN KNI_3.9.2.patched/src/Base/kmlExt.cpp KNI_3.9.2.noexit/src/Base/kmlExt.cpp
--- KNI_3.9.2.patched/src/Base/kmlExt.cpp	2007-09-28 07:38:10.000000000 +0200
+++ KNI_3.9.2.noexit/src/Base/kmlExt.cpp	2008-12-01 13:16:58.000000000 +0100
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <algorithm>
 #include <vector>
+#include <stdexcept>
 
 #define max(a,b) (((a)>(b))?(a):(b))
 KNI::Timer kni_timer;
@@ -145,7 +146,8 @@
 		std::cout << "Exit: Incompatible Config File!\n";
 		std::cout << "Check whether you have a Katana 400 or 300 and choose the config file accordingly\n";
 		std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n.";
-		exit(0);
+		throw std::runtime_error("Exit: Incompatible Config File! "
+					 "Check whether you have a Katana 400 or 300 and choose the config file accordingly");
 	}
 	bool gripperIsPresent;
 	int gripperOpenEncoders, gripperCloseEncoders;

kni-3.9.2-sofixes.patch:
 demo/Makefile       |   10 +++++-----
 src/Base/Makefile   |   13 ++++++++-----
 src/InvKin/Makefile |   14 +++++++++-----
 src/LM/Makefile     |   13 ++++++++-----
 src/common/Makefile |    4 ++--
 5 files changed, 32 insertions(+), 22 deletions(-)

--- NEW FILE kni-3.9.2-sofixes.patch ---
diff -urN KNI_3.9.2/demo/Makefile KNI_3.9.2.sofixes/demo/Makefile
--- KNI_3.9.2/demo/Makefile	2007-06-20 08:05:24.000000000 +0200
+++ KNI_3.9.2.sofixes/demo/Makefile	2009-08-28 22:09:05.000000000 +0200
@@ -34,11 +34,11 @@
 INCLUDE_DIR = ../include -I./common
 LIBRARY_DIR  = ../lib/linux
 
-BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase.a
-INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin.a
-LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM.a
+BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase3.a
+INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin3.a
+LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM3.a
 
-AVAILABLE_LIBRARIES = ./common/keyboard.o ${BASE_LIBRARY} ${INVKIN_LIBRARY} ${LM_LIBRARY}
+AVAILABLE_LIBRARIES = ./common/keyboard.o
 
 .SILENT:
 
@@ -55,7 +55,7 @@
 
 $(TARGETS_D): $(CTARGETS_D)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
+	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
 	then echo " [ok]"; \
 		cat .clog; \
 	else echo " [failed]"; \
diff -urN KNI_3.9.2/src/Base/Makefile KNI_3.9.2.sofixes/src/Base/Makefile
--- KNI_3.9.2/src/Base/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/Base/Makefile	2009-08-28 22:08:00.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNIBase
+LIBNAME = libKNIBase3
 SOURCES = cdlCOM.cpp cplSerial.cpp cdlSocket.cpp CRC.cpp kmlBase.cpp kmlExt.cpp kmlMotBase.cpp kmlSctBase.cpp kmlFactories.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS = -shared -L$(TARGET_DIR)
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/common/Makefile KNI_3.9.2.sofixes/src/common/Makefile
--- KNI_3.9.2/src/common/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/common/Makefile	2009-08-28 22:08:16.000000000 +0200
@@ -17,14 +17,14 @@
 #===========================================================================
 
 CXX		=	g++
-CXXFLAGS	+=	-g -O2 -Wall
+CXXFLAGS	+=	-g -O2 -Wall -fPIC
 
 MAJOR_VERSION	=	3.9
 MINOR_VERSION	=	0
 
 TARGETS		=	alib
 
-LIBNAME = knicommon
+LIBNAME = knicommon3
 SOURCES = Timer.cpp
 
 LIBNAME_A  = $(LIBNAME).a
diff -urN KNI_3.9.2/src/InvKin/Makefile KNI_3.9.2.sofixes/src/InvKin/Makefile
--- KNI_3.9.2/src/InvKin/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/InvKin/Makefile	2009-08-28 22:08:25.000000000 +0200
@@ -24,20 +24,23 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_InvKin
+LIBNAME = libKNI_InvKin3
 SOURCES = ikBase.cpp KatanaKinematics6M90G.cpp KatanaKinematics6M90T.cpp KatanaKinematics6M180.cpp KatanaKinematics5M180.cpp KatanaKinematicsDecisionAlgorithms.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3
+
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +72,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/LM/Makefile KNI_3.9.2.sofixes/src/LM/Makefile
--- KNI_3.9.2/src/LM/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/LM/Makefile	2009-08-28 22:08:40.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_LM
+LIBNAME = libKNI_LM3
 SOURCES = lmBase.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3 -lKNI_InvKin3
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \


--- NEW FILE libkni3.spec ---
Name:           libkni3
Version:        3.9.2
Release:        12%{?dist}
Summary:        C++ KNI library v3 for the Katana 300 robot arm

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.neuronics.ch/cms_de/web/index.php?id=386
Source0:        http://www.neuronics.ch/cms_de/mediabase/KNI_3.9.2.tar.gz
Patch0:         kni-3.9.2-gcc43.patch
Patch1:         kni-3.9.2-sofixes.patch
Patch2:         kni-3.9.2-ctor.patch
Patch3:         kni-3.9.2-noexit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen, graphviz
%if 0%{?fedora} >= 9
BuildRequires:  texlive-utils
%else
BuildRequires:  tetex
%endif

BuildRequires:  boost-devel

%description
Katana Native Interface is a C++ library for programmers who would like to
write their own programs, but don't want to implement the protocol and
device stuff katana is using.

This package contains the library for the Katana 300 series of the arm. For
newer robots use libkni (version 4 and above).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static libraries that can be used to
compile static binaries using %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation

%description    doc
This package contains the documentation for developing with %{name}.

%package        examples
Summary:        Example applications for %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}

%description    examples
This package contains demo applications for %{name}.

%prep
%setup -q -n KNI_%{version}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .sofixes
%patch2 -p1 -b .ctor
%patch3 -p1 -b .noexit


%build
make CFLAGS="%{optflags}"
make doc
echo "prefix=%{prefix}
exec_prefix=%{prefix}
libdir=%{_libdir}
includedir=%{_includedir}

Name: %{name}
Description: %{summary}
Version: %{version}
Libs: -L\${libdir} -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3
Cflags: -I\${includedir}/kni3" > libkni3.pc


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
mkdir -p %{buildroot}%{_libdir}
install -m 0644 -p lib/linux/*.a %{buildroot}%{_libdir}
install -p lib/linux/*.so.* %{buildroot}%{_libdir}
for f in `find %{buildroot}%{_libdir} -name '*.so.*.*.*'`; do
    ln -s `basename $f` %{buildroot}%{_libdir}/`echo \`basename $f\` | sed -e 's/\(\(.*\).so\)\(.*\)/\1/'`
    ln -s `basename $f` %{buildroot}%{_libdir}/`objdump --private-headers $f | grep SONAME | awk '{print $2}'`
done
mkdir -p %{buildroot}%{_bindir}
for f in `find demo/ -perm /a+x -type f`; do
    install -p $f %{buildroot}%{_bindir}/kni_`basename $f`
done
mkdir -p %{buildroot}%{_sysconfdir}/kni3
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd300
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd400
install -p -m 0644 configfiles300/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd300
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
mkdir -p %{buildroot}%{_includedir}/kni3
cp -a include/* %{buildroot}%{_includedir}/kni3
mkdir -p %{buildroot}%{_docdir}/%{name}-doc-%{version}
cp -a doc/html %{buildroot}%{_docdir}/%{name}-doc-%{version}
install -p -m 0644 doc/*.pdf %{buildroot}%{_docdir}/%{name}-doc-%{version}
find %{buildroot} -name '.svn' | xargs rm -rf
mkdir -p %{buildroot}%{_libdir}/pkgconfig
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE.txt readme.txt AUTHORS.txt
%{_libdir}/*.so.*
%dir %{_sysconfdir}/kni3
%dir %{_sysconfdir}/kni3/hd300
%dir %{_sysconfdir}/kni3/hd400
%config(noreplace)%{_sysconfdir}/kni3/*/*.cfg

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%files static
%defattr(-,root,root,-)
%{_libdir}/*.a

%files doc
%defattr(-, root, root, 0755)
%{_docdir}/%{name}-doc-%{version}

%files examples
%defattr(-, root, root, 0755)
%{_bindir}/kni_*


%changelog
* Mon Sep 14 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-12
- doc package contains doc dir, not docs

* Fri Aug 28 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-11
- Rename shared libs to allow parallel installation for libkni
- Merge all shared lib related patches to one sofixes patch

* Sat Jun 13 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-10
- Update ctor and gcc43 patch for F11

* Tue Jun 09 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-9
- Rename to libkni3, libkni will be the most up2date version (v4), but this
  version is still required for older Katana 300 arms
- Add patch to fix library building, did work on my machin only because libs
  were installed on the system

* Wed Dec 03 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-8
- Fix noexit patch

* Mon Dec 01 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-7
- Make patch 3 apply with fuzz=0
- Added patch that removes calls to exit() but throws exceptions

* Sun Nov 09 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-6
- Updated license tag
- Consistent (non-)macro usage

* Tue Jul 15 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-5
- Added ctor patch which adds an optional argument to the ctor to allow for
  accessing an arbitrary device, for example a usb2ser converter
  (RoboCup 2008)

* Mon Jun 23 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-4
- More .so fixes, link libs against base lib to get rid of
  undefined-non-weak-symbol rpmlint warnings

* Mon Jun 16 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-3
- Fixed summary

* Thu Jun 12 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-2
- Upgraded BR to support building on Fedora version < 9

* Sat Jun 07 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:03:12 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:25:05 -0000	1.2
@@ -0,0 +1 @@
+KNI_3.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:03:12 -0000	1.1
+++ sources	14 Sep 2009 22:25:05 -0000	1.2
@@ -0,0 +1 @@
+63b40f2c258f7ce2159b2471f4569165  KNI_3.9.2.tar.gz



From pbrobinson at fedoraproject.org  Mon Sep 14 22:28:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Sep 2009 22:28:56 +0000 (UTC)
Subject: rpms/mutter-moblin/devel mutter-moblin-verfix.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 mutter-moblin.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20090914222856.AD1E611C00EC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15272

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Added Files:
	mutter-moblin-verfix.patch 
Log Message:
- New 0.38.0 upstream release

mutter-moblin-verfix.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mutter-moblin-verfix.patch ---
--- mutter-moblin-0.38.0/configure.ac.orig	2009-09-15 00:07:49.474527133 +0100
+++ mutter-moblin-0.38.0/configure.ac	2009-09-15 00:08:31.980304649 +0100
@@ -1,4 +1,4 @@
-m4_define([mutter_version], [2.27.4_0.0])
+m4_define([mutter_version], [2.27.4])
 m4_define([plugin_major_version], [0])
 m4_define([plugin_minor_version], [38])
 m4_define([plugin_micro_version], [0])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Sep 2009 12:10:27 -0000	1.6
+++ .cvsignore	14 Sep 2009 22:28:55 -0000	1.7
@@ -1 +1 @@
-mutter-moblin-0.35.5.tar.bz2
+mutter-moblin-0.38.0.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mutter-moblin.spec	10 Sep 2009 12:10:27 -0000	1.7
+++ mutter-moblin.spec	14 Sep 2009 22:28:55 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.35.5
+Version:        0.38.0
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -7,6 +7,7 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:         mutter-moblin-verfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -39,6 +40,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .verfix
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -78,6 +80,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Mon Sep 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.38.0-1
+- New 0.38.0 upstream release
+
 * Thu Sep  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.35.5-1
 - New 0.35.5 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Sep 2009 12:10:27 -0000	1.6
+++ sources	14 Sep 2009 22:28:55 -0000	1.7
@@ -1 +1 @@
-05e1a68c2c37d156aa1458fb15c2c611  mutter-moblin-0.35.5.tar.bz2
+aad20db3f904b58f9198e0c8435e578b  mutter-moblin-0.38.0.tar.bz2



From bpepple at fedoraproject.org  Mon Sep 14 22:39:54 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Sep 2009 22:39:54 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.14, 1.15 sources,
	1.14, 1.15 telepathy-mission-control.spec, 1.22, 1.23
Message-ID: <20090914223954.7FBC111C00EC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30352

Modified Files:
	.cvsignore sources telepathy-mission-control.spec 
Log Message:
* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.3.0-1
- Update to 5.3.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	10 Sep 2009 13:50:00 -0000	1.14
+++ .cvsignore	14 Sep 2009 22:39:53 -0000	1.15
@@ -1 +1 @@
-telepathy-mission-control-5.2.3.tar.gz
+telepathy-mission-control-5.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Sep 2009 13:50:00 -0000	1.14
+++ sources	14 Sep 2009 22:39:53 -0000	1.15
@@ -1 +1 @@
-ce241d3d28d9381afd4c0ffd03bd7093  telepathy-mission-control-5.2.3.tar.gz
+cdf3e9d508121ff5fb994bda9011b520  telepathy-mission-control-5.3.0.tar.gz


Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- telepathy-mission-control.spec	10 Sep 2009 13:50:00 -0000	1.22
+++ telepathy-mission-control.spec	14 Sep 2009 22:39:53 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           telepathy-mission-control
-Version:        5.2.3
+Version:        5.3.0
 Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
@@ -40,7 +40,7 @@ files for developing applications that u
 
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-gnome-keyring=yes
 make %{?_smp_mflags}
 
 
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.3.0-1
+- Update to 5.3.0.
+
 * Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.3-1
 - Update to 5.2.3.
 - Drop mission-control directory since it's no longer needed.



From pbrobinson at fedoraproject.org  Mon Sep 14 22:40:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Sep 2009 22:40:59 +0000 (UTC)
Subject: rpms/nbtk/devel .cvsignore, 1.5, 1.6 nbtk.spec, 1.23, 1.24 sources, 
	1.5, 1.6
Message-ID: <20090914224059.2390C11C0425@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31550

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- Actually add the source file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Sep 2009 20:41:00 -0000	1.5
+++ .cvsignore	14 Sep 2009 22:40:56 -0000	1.6
@@ -1 +1 @@
-nbtk-1.0.0.tar.bz2
+nbtk-1.1.2.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nbtk.spec	14 Sep 2009 22:05:01 -0000	1.23
+++ nbtk.spec	14 Sep 2009 22:40:57 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep 12 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.2-2
+- Add new source file
+
 * Mon Sep 12 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.2-1
 - New upstream 1.1.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Sep 2009 20:41:01 -0000	1.5
+++ sources	14 Sep 2009 22:40:58 -0000	1.6
@@ -1 +1 @@
-2eb59819848e1b3a6deb0818f8e322af  nbtk-1.0.0.tar.bz2
+2750817ea5115c87f5ab6de1c8b174d3  nbtk-1.1.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 14 22:50:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 22:50:33 +0000
Subject: [pkgdb] pam_mount had acl change status
Message-ID: <20090914225033.68A1510F867@bastion2.fedora.phx.redhat.com>

till has set the watchcommits acl on pam_mount (Fedora devel) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pam_mount



From timn at fedoraproject.org  Mon Sep 14 22:52:01 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon, 14 Sep 2009 22:52:01 +0000 (UTC)
Subject: rpms/libkni3/F-11 import.log, NONE, 1.1 kni-3.9.2-ctor.patch, NONE, 
	1.1 kni-3.9.2-gcc43.patch, NONE, 1.1 kni-3.9.2-noexit.patch,
	NONE, 1.1 kni-3.9.2-sofixes.patch, NONE, 1.1 libkni3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914225201.B156711C0375@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/libkni3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14183/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kni-3.9.2-ctor.patch kni-3.9.2-gcc43.patch 
	kni-3.9.2-noexit.patch kni-3.9.2-sofixes.patch libkni3.spec 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
libkni3-3_9_2-12_fc11:F-11:libkni3-3.9.2-12.fc11.src.rpm:1252967789

kni-3.9.2-ctor.patch:
 include/KNI/cdlCOM.h     |    2 
 src/Base/cdlCOM.cpp      |   17 +-
 src/Base/cdlCOM.cpp.orig |  369 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 380 insertions(+), 8 deletions(-)

--- NEW FILE kni-3.9.2-ctor.patch ---
diff -urN KNI_3.9.2/include/KNI/cdlCOM.h KNI_3.9.2.ctor/include/KNI/cdlCOM.h
--- KNI_3.9.2/include/KNI/cdlCOM.h	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.ctor/include/KNI/cdlCOM.h	2009-06-12 16:44:42.000000000 +0200
@@ -107,7 +107,7 @@
 	 *	describes the desired serial port. An attempt to open a connection
 	 *	to the desired device will be tried.
 	 */
-	CCdlCOM(TCdlCOMDesc ccd);
+	CCdlCOM(TCdlCOMDesc ccd, const char *dev_name = 0);
 
 	/*! \brief	Destructs the class
 	 */	virtual ~CCdlCOM();
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.ctor/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2009-06-12 16:44:03.000000000 +0200
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp	2009-06-12 16:45:02.000000000 +0200
@@ -23,8 +23,9 @@
 
 #include "common/Timer.h"
 #include <cstring>
+#include <cstdio>
 
-
+#include <cstdlib>
 #ifdef WIN32
 
 CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
@@ -160,21 +161,24 @@
 
 #else //LINUX
 
-CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd, const char *dev_name) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
 
 	int prtHdl	= -1;
 
-	std::string deviceName;
 	struct termios	nto, oto;
-	char		name[11];
+	char *name;
 
 	errno = 0;
 
-	strncpy(name, "/dev/ttyS ", 11);
-	name[9] = digit(ccd.port);
+	if (dev_name) {
+          name = strdup(dev_name);
+        } else {
+          asprintf(&name, "/dev/ttyS%i", ccd.port);
+        }
 	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
 
 	_deviceName = name;
+        free(name);
 
 	if (prtHdl < 0) {
 		throw CannotOpenPortException(_deviceName, strerror(errno));
@@ -290,7 +294,6 @@
 	}
 
 	_prtHdl = prtHdl;
-	_deviceName = deviceName;
 	_ccd = ccd;
 	_oto = oto;
 }
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp.orig KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig
--- KNI_3.9.2/src/Base/cdlCOM.cpp.orig	1970-01-01 01:00:00.000000000 +0100
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig	2009-06-12 16:44:42.000000000 +0200
@@ -0,0 +1,369 @@
+/*
+ *   Katana Native Interface - A C++ interface to the robot arm Katana.
+ *   Copyright (C) 2005 Neuronics AG
+ *   Check out the AUTHORS file for detailed contact 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
+ */
+
+
+#include "KNI/cdlCOM.h"
+
+#include "common/Timer.h"
+#include <cstring>
+
+
+#ifdef WIN32
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
+
+	DCB commDCB;	//COM port parameters
+	COMMTIMEOUTS nto;	//new timeouts
+	char comX[5];
+	char dcb[35];
+	int i, d;
+
+	std::string deviceName;
+	HANDLE prtHdl;
+	COMMTIMEOUTS oto;
+
+	strncpy_s(comX, "COM ", 5);
+	comX[3] = digit(ccd.port);
+	deviceName = comX;
+	prtHdl = CreateFile(comX,
+	                    GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING,
+	                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, 0
+	                   );
+
+	if (prtHdl == INVALID_HANDLE_VALUE) {
+		throw CannotOpenPortException(_deviceName, "info from win32-system not yet available");
+	}
+
+	FillMemory(&commDCB, sizeof(commDCB), 0);
+	commDCB.DCBlength = sizeof(commDCB);
+	strncpy_s(dcb, "baud=       parity=  data=  stop= ", 35);
+	for(i=5,d=100000; d>=1; d=d/10) {
+		if(d <= ccd.baud) {
+			dcb[i++] = digit((ccd.baud/d) % 10);
+		}
+	}
+	dcb[19] = ccd.parity;
+	dcb[26] = digit(ccd.data);
+	dcb[33] = digit(ccd.stop);
+	if (!BuildCommDCB(dcb, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	commDCB.fAbortOnError	= false;
+	commDCB.fInX			= false;
+	commDCB.fOutX			= false;
+	commDCB.fOutxCtsFlow	= false;
+	if (!SetCommState(prtHdl, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	PurgeComm(	prtHdl,	PURGE_TXABORT | PURGE_RXABORT | PURGE_TXCLEAR | PURGE_RXCLEAR);
+
+	GetCommTimeouts(prtHdl, &oto);
+	nto.ReadIntervalTimeout			= MAXDWORD;
+	nto.ReadTotalTimeoutMultiplier	= 0;
+	nto.ReadTotalTimeoutConstant	= 0;
+	nto.WriteTotalTimeoutMultiplier	= 0;
+	nto.WriteTotalTimeoutConstant	= 0;
+	if (!SetCommTimeouts(prtHdl, &nto)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	// Everything done, now we can change the state
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+	if(_prtHdl == INVALID_HANDLE_VALUE)
+		return;
+
+	FlushFileBuffers(_prtHdl);
+	SetCommTimeouts(_prtHdl, &_oto);
+
+	CloseHandle(_prtHdl);
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_TXABORT | PURGE_TXCLEAR) == 0) {
+		throw DeviceWriteException(_deviceName, "PurgeComm failed");
+	}
+
+	unsigned long readsz;
+	if (WriteFile(_prtHdl, buf, size, &readsz, 0) == 0) {
+		throw DeviceWriteException(_deviceName, "WriteFile failed");
+	}
+
+	if(readsz != static_cast<long>(size)) {
+		throw WriteNotCompleteException(_deviceName);
+	}
+
+	return (int)readsz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	unsigned long readsz = 0, readsz_temp = 0;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<(unsigned long)size && !timeout.Elapsed()) {
+		if(ReadFile(_prtHdl, &tmp[readsz], size, &readsz_temp, 0) == 0) {
+			DeviceReadException( _deviceName, "ReadFile failed" );
+		} else {
+			readsz  += readsz_temp;
+		}
+	}
+
+	if((unsigned)size != readsz) {
+		throw ReadNotCompleteException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_RXABORT | PURGE_RXCLEAR) == 0) {
+		throw DeviceReadException(_deviceName, "PurgeComm failed");
+	}
+	return (int)readsz;
+}
+
+
+#else //LINUX
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+
+	int prtHdl	= -1;
+
+	std::string deviceName;
+	struct termios	nto, oto;
+	char		name[11];
+
+	errno = 0;
+
+	strncpy(name, "/dev/ttyS ", 11);
+	name[9] = digit(ccd.port);
+	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
+
+	_deviceName = name;
+
+	if (prtHdl < 0) {
+		throw CannotOpenPortException(_deviceName, strerror(errno));
+	}
+
+	tcgetattr(prtHdl, &oto);
+	bzero(&nto, sizeof(nto));
+	nto.c_cc[VTIME]	= 0;
+	nto.c_cc[VMIN]	= 0;
+	nto.c_oflag	= 0;
+	nto.c_lflag	= 0;
+	nto.c_cflag	= CLOCAL | CREAD;
+	nto.c_iflag	= 0;
+
+	switch (ccd.baud) {
+	case     50:
+		nto.c_cflag |= B50;
+		break;
+	case     75:
+		nto.c_cflag |= B75;
+		break;
+	case    110:
+		nto.c_cflag |= B110;
+		break;
+	case    134:
+		nto.c_cflag |= B134;
+		break;
+	case    150:
+		nto.c_cflag |= B150;
+		break;
+	case    200:
+		nto.c_cflag |= B200;
+		break;
+	case    300:
+		nto.c_cflag |= B300;
+		break;
+	case    600:
+		nto.c_cflag |= B600;
+		break;
+	case   1200:
+		nto.c_cflag |= B1200;
+		break;
+	case   1800:
+		nto.c_cflag |= B1800;
+		break;
+	case   2400:
+		nto.c_cflag |= B2400;
+		break;
+	case   4800:
+		nto.c_cflag |= B4800;
+		break;
+	case   9600:
+		nto.c_cflag |= B9600;
+		break;
+	case  19200:
+		nto.c_cflag |= B19200;
+		break;
+	case  38400:
+		nto.c_cflag |= B38400;
+		break;
+	case  57600:
+		nto.c_cflag |= B57600;
+		break;
+	case 115200:
+		nto.c_cflag |= B115200;
+		break;
+	case 230400:
+		nto.c_cflag |= B230400;
+		break;
+	}
+
+	switch (ccd.data) {
+	case  5:
+		nto.c_cflag |= CS5;
+		break;
+	case  6:
+		nto.c_cflag |= CS6;
+		break;
+	case  7:
+		nto.c_cflag |= CS7;
+		break;
+	case  8:
+		nto.c_cflag |= CS8;
+		break;
+	}
+
+	switch (ccd.parity) {
+	case 'N':
+	case 'n':
+		break;
+	case 'O':
+	case 'o':
+		nto.c_cflag |= PARENB | PARODD;
+		break;
+	case 'E':
+	case 'e':
+		nto.c_cflag |= PARENB;
+		break;
+	}
+
+	switch (ccd.stop) {
+	case  1:
+		break;
+	case  2:
+		nto.c_cflag |= CSTOPB;
+		break;
+	}
+
+	tcflush(prtHdl,TCIFLUSH);
+	if (tcsetattr(prtHdl, TCSANOW, &nto) != 0) {
+		::close(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+
+	if (_prtHdl < 0) {
+		return;
+	}
+
+	tcflush(_prtHdl, TCIFLUSH);
+	tcsetattr(_prtHdl, TCSANOW, &_oto);
+
+	::close(_prtHdl); // there's nothing we can do about failing
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	int writesz = write(_prtHdl, buf, size);
+
+	if(writesz < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	if(writesz != size)
+		throw WriteNotCompleteException(_deviceName);
+
+	return writesz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	register int	readsz 	= 0;
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int read_return;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<size && !timeout.Elapsed()) {
+		read_return = read(_prtHdl, &tmp[readsz], size-readsz);
+		if(read_return < 0) {
+			if(errno != EAGAIN)
+				throw DeviceReadException( _deviceName, strerror(errno));
+		} else {
+			readsz  += read_return;
+		}
+	}
+
+	if (readsz != size)
+		throw ReadNotCompleteException(_deviceName);
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceReadException( _deviceName, strerror(errno));
+
+	return readsz;
+
+}
+
+
+
+#endif //WIN32 else LINUX
+

kni-3.9.2-gcc43.patch:
 demo/keycontrol/keycontrol.cpp         |    1 +
 demo/perfo/main.cpp                    |    1 +
 demo/perfo/perfo.cpp                   |    9 +++++----
 demo/positions/main.cpp                |    1 +
 demo/sensor/main.cpp                   |    1 +
 demo/socketcommands/socketcommands.cpp |    1 +
 demo/socketcontrol/socketcontrol.cpp   |    1 +
 include/KNI/kmlMotBase.h               |    4 ++--
 src/Base/cdlCOM.cpp                    |    1 +
 src/Base/cdlSocket.cpp                 |    3 +++
 src/Base/cplSerial.cpp                 |    1 +
 src/Base/kmlBase.cpp                   |    1 +
 src/Base/kmlFactories.cpp              |    2 ++
 src/Base/kmlMotBase.cpp                |    2 ++
 14 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE kni-3.9.2-gcc43.patch ---
diff -urN KNI_3.9.2/demo/keycontrol/keycontrol.cpp KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp
--- KNI_3.9.2/demo/keycontrol/keycontrol.cpp	2007-08-10 14:37:42.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/perfo/main.cpp KNI_3.9.2.gcc43/demo/perfo/main.cpp
--- KNI_3.9.2/demo/perfo/main.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/main.cpp	2009-06-12 16:48:21.000000000 +0200
@@ -19,6 +19,7 @@
 #include "KNI/kmlBase.h"	//for robot: CKatBase, CMotBase, CSctBase
 #include "KNI/kmlExt.h"	// extended katana features
 #include <iostream>		//for messages: printf()
+#include <cstdio>
 
 /**********************************************************************************/
 #include "perfo.h"	//for performance checking..
diff -urN KNI_3.9.2/demo/perfo/perfo.cpp KNI_3.9.2.gcc43/demo/perfo/perfo.cpp
--- KNI_3.9.2/demo/perfo/perfo.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/perfo.cpp	2009-06-12 16:48:29.000000000 +0200
@@ -2,6 +2,7 @@
 #include "perfo.h"
 #include <time.h>
 #include <iostream>
+#include <cstdio>
 
 #include "KNI/cdlCOMExceptions.h"
 #include "KNI/cplSerial.h"
@@ -13,7 +14,7 @@
 #define CLOCK() (clock_t)((double)(1000.0f * clock()) / CLOCKS_PER_SEC)
 //-------------------------------------------------------------------------------//
 
-void statKatRecv(char strTitle[], long i, long j, clock_t t, long l) {
+void statKatRecv(const char strTitle[], long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -102,7 +103,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statMotRecv(char strTitle[], short idx, long i, long j, clock_t t, long l) {
+void statMotRecv(const char strTitle[], short idx, long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -111,7 +112,7 @@
 	printf("-------------------------------------------\n\n");
 }
 
-void statMotSend(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statMotSend(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -278,7 +279,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statSct(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statSct(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
diff -urN KNI_3.9.2/demo/positions/main.cpp KNI_3.9.2.gcc43/demo/positions/main.cpp
--- KNI_3.9.2/demo/positions/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/positions/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -8,6 +8,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/sensor/main.cpp KNI_3.9.2.gcc43/demo/sensor/main.cpp
--- KNI_3.9.2/demo/sensor/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/sensor/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <conio.h> //ONLY WIN32 COMPATIBLE!!
 #endif
 #include <time.h>
+#include <cstdlib>
 
 //------------------------------------------------------------------------//
 
diff -urN KNI_3.9.2/demo/socketcommands/socketcommands.cpp KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp
--- KNI_3.9.2/demo/socketcommands/socketcommands.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <cstdio>
 #include <memory>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp
--- KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp	2007-09-03 16:04:48.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -11,6 +11,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/include/KNI/kmlMotBase.h KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h
--- KNI_3.9.2/include/KNI/kmlMotBase.h	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h	2009-06-12 16:48:02.000000000 +0200
@@ -45,7 +45,7 @@
 
 /*!	\brief	command flags
  */
-typedef enum TMotCmdFlg {
+enum TMotCmdFlg {
 	MCF_OFF		= 0,		//!< set the motor off
 	MCF_CALIB	= 4,		//!< calibrate
 	MCF_FREEZE	= 8,		//!< freeze the motor
@@ -54,7 +54,7 @@
 
 /*!	\brief	status flags
  */
-typedef enum TMotStsFlg	{
+enum TMotStsFlg	{
 	MSF_MECHSTOP	= 1,		//!< mechanical stopper reached
 	MSF_MAXPOS	= 2,		//!< max. position was reached
 	MSF_MINPOS	= 4,		//!< min. position was reached
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/cdlCOM.h"
 
 #include "common/Timer.h"
+#include <cstring>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/src/Base/cdlSocket.cpp KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp
--- KNI_3.9.2/src/Base/cdlSocket.cpp	2007-11-06 14:45:08.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,9 @@
 /****************************************************************************/
 #include "KNI/cdlSocket.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
+
 /****************************************************************************/
 //test write:
 int writesz;
diff -urN KNI_3.9.2/src/Base/cplSerial.cpp KNI_3.9.2.gcc43/src/Base/cplSerial.cpp
--- KNI_3.9.2/src/Base/cplSerial.cpp	2007-11-13 10:38:44.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cplSerial.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/CRC.h"
 #include <assert.h>
 #include <iostream>
+#include <cstring>
 
 
 /*
diff -urN KNI_3.9.2/src/Base/kmlBase.cpp KNI_3.9.2.gcc43/src/Base/kmlBase.cpp
--- KNI_3.9.2/src/Base/kmlBase.cpp	2007-11-07 09:22:52.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/kmlBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,7 @@
 #include "KNI/kmlBase.h"
 
 #include <vector>
+#include <cstring>
 
 bool CKatBase::init(
     const TKatGNL _gnl,
diff -urN KNI_3.9.2/src/Base/kmlFactories.cpp KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp
--- KNI_3.9.2/src/Base/kmlFactories.cpp	2007-07-16 14:17:40.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -1,5 +1,7 @@
 
 #include "KNI/kmlFactories.h"
+#include <cstring>
+#include <cstdlib>
 
 namespace KNI {
 
diff -urN KNI_3.9.2/src/Base/kmlMotBase.cpp KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp
--- KNI_3.9.2/src/Base/kmlMotBase.cpp	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -15,6 +15,8 @@
 #include "common/MathHelperFunctions.h"
 #include "common/Timer.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 
 bool CMotBase::init(CKatBase* _own, const TMotDesc _motDesc, CCplBase* _protocol) {

kni-3.9.2-noexit.patch:
 cdlSocket.cpp |    7 ++++---
 kmlExt.cpp    |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE kni-3.9.2-noexit.patch ---
diff -urN KNI_3.9.2.patched/src/Base/cdlSocket.cpp KNI_3.9.2.noexit/src/Base/cdlSocket.cpp
--- KNI_3.9.2.patched/src/Base/cdlSocket.cpp	2008-12-01 13:12:13.000000000 +0100
+++ KNI_3.9.2.noexit/src/Base/cdlSocket.cpp	2008-12-01 13:16:07.000000000 +0100
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <cstring>
 #include <cstdlib>
+#include <stdexcept>
 
 /****************************************************************************/
 //test write:
@@ -95,7 +96,7 @@
 	_socketfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if(_socketfd == -1){
 		std::cout << "socket could not be created"<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("socket could not be created");
 	}
 	memset(&_socketAddr, 0, sizeof(_socketAddr));  
 	_socketAddr.sin_family = AF_INET;
@@ -106,13 +107,13 @@
 	res = inet_pton ( AF_INET, _ipAddr, &_socketAddr.sin_addr );
 	if ( errno == EAFNOSUPPORT ){
 		std::cout << "inet_pton failed, try again "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("inet_pton failed (EAFNOSUPPORT)");
 	}
 //	std::cout << "trying to connect to server...\n";
 	res = connect(_socketfd, (struct sockaddr *) &_socketAddr, _len);
 	if(res != 0){
 		std::cout << "client could not connect, check if server is running on ip "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("client could not connect, check if server is running");
 	}
 	else{
 //		std::cout << "client connected to ip "<<_ipAddr<<", port: "<< _port<<" \n";
diff -urN KNI_3.9.2.patched/src/Base/kmlExt.cpp KNI_3.9.2.noexit/src/Base/kmlExt.cpp
--- KNI_3.9.2.patched/src/Base/kmlExt.cpp	2007-09-28 07:38:10.000000000 +0200
+++ KNI_3.9.2.noexit/src/Base/kmlExt.cpp	2008-12-01 13:16:58.000000000 +0100
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <algorithm>
 #include <vector>
+#include <stdexcept>
 
 #define max(a,b) (((a)>(b))?(a):(b))
 KNI::Timer kni_timer;
@@ -145,7 +146,8 @@
 		std::cout << "Exit: Incompatible Config File!\n";
 		std::cout << "Check whether you have a Katana 400 or 300 and choose the config file accordingly\n";
 		std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n.";
-		exit(0);
+		throw std::runtime_error("Exit: Incompatible Config File! "
+					 "Check whether you have a Katana 400 or 300 and choose the config file accordingly");
 	}
 	bool gripperIsPresent;
 	int gripperOpenEncoders, gripperCloseEncoders;

kni-3.9.2-sofixes.patch:
 demo/Makefile       |   10 +++++-----
 src/Base/Makefile   |   13 ++++++++-----
 src/InvKin/Makefile |   14 +++++++++-----
 src/LM/Makefile     |   13 ++++++++-----
 src/common/Makefile |    4 ++--
 5 files changed, 32 insertions(+), 22 deletions(-)

--- NEW FILE kni-3.9.2-sofixes.patch ---
diff -urN KNI_3.9.2/demo/Makefile KNI_3.9.2.sofixes/demo/Makefile
--- KNI_3.9.2/demo/Makefile	2007-06-20 08:05:24.000000000 +0200
+++ KNI_3.9.2.sofixes/demo/Makefile	2009-08-28 22:09:05.000000000 +0200
@@ -34,11 +34,11 @@
 INCLUDE_DIR = ../include -I./common
 LIBRARY_DIR  = ../lib/linux
 
-BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase.a
-INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin.a
-LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM.a
+BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase3.a
+INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin3.a
+LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM3.a
 
-AVAILABLE_LIBRARIES = ./common/keyboard.o ${BASE_LIBRARY} ${INVKIN_LIBRARY} ${LM_LIBRARY}
+AVAILABLE_LIBRARIES = ./common/keyboard.o
 
 .SILENT:
 
@@ -55,7 +55,7 @@
 
 $(TARGETS_D): $(CTARGETS_D)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
+	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
 	then echo " [ok]"; \
 		cat .clog; \
 	else echo " [failed]"; \
diff -urN KNI_3.9.2/src/Base/Makefile KNI_3.9.2.sofixes/src/Base/Makefile
--- KNI_3.9.2/src/Base/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/Base/Makefile	2009-08-28 22:08:00.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNIBase
+LIBNAME = libKNIBase3
 SOURCES = cdlCOM.cpp cplSerial.cpp cdlSocket.cpp CRC.cpp kmlBase.cpp kmlExt.cpp kmlMotBase.cpp kmlSctBase.cpp kmlFactories.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS = -shared -L$(TARGET_DIR)
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/common/Makefile KNI_3.9.2.sofixes/src/common/Makefile
--- KNI_3.9.2/src/common/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/common/Makefile	2009-08-28 22:08:16.000000000 +0200
@@ -17,14 +17,14 @@
 #===========================================================================
 
 CXX		=	g++
-CXXFLAGS	+=	-g -O2 -Wall
+CXXFLAGS	+=	-g -O2 -Wall -fPIC
 
 MAJOR_VERSION	=	3.9
 MINOR_VERSION	=	0
 
 TARGETS		=	alib
 
-LIBNAME = knicommon
+LIBNAME = knicommon3
 SOURCES = Timer.cpp
 
 LIBNAME_A  = $(LIBNAME).a
diff -urN KNI_3.9.2/src/InvKin/Makefile KNI_3.9.2.sofixes/src/InvKin/Makefile
--- KNI_3.9.2/src/InvKin/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/InvKin/Makefile	2009-08-28 22:08:25.000000000 +0200
@@ -24,20 +24,23 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_InvKin
+LIBNAME = libKNI_InvKin3
 SOURCES = ikBase.cpp KatanaKinematics6M90G.cpp KatanaKinematics6M90T.cpp KatanaKinematics6M180.cpp KatanaKinematics5M180.cpp KatanaKinematicsDecisionAlgorithms.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3
+
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +72,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/LM/Makefile KNI_3.9.2.sofixes/src/LM/Makefile
--- KNI_3.9.2/src/LM/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/LM/Makefile	2009-08-28 22:08:40.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_LM
+LIBNAME = libKNI_LM3
 SOURCES = lmBase.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3 -lKNI_InvKin3
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \


--- NEW FILE libkni3.spec ---
Name:           libkni3
Version:        3.9.2
Release:        12%{?dist}
Summary:        C++ KNI library v3 for the Katana 300 robot arm

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.neuronics.ch/cms_de/web/index.php?id=386
Source0:        http://www.neuronics.ch/cms_de/mediabase/KNI_3.9.2.tar.gz
Patch0:         kni-3.9.2-gcc43.patch
Patch1:         kni-3.9.2-sofixes.patch
Patch2:         kni-3.9.2-ctor.patch
Patch3:         kni-3.9.2-noexit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen, graphviz
%if 0%{?fedora} >= 9
BuildRequires:  texlive-utils
%else
BuildRequires:  tetex
%endif

BuildRequires:  boost-devel

%description
Katana Native Interface is a C++ library for programmers who would like to
write their own programs, but don't want to implement the protocol and
device stuff katana is using.

This package contains the library for the Katana 300 series of the arm. For
newer robots use libkni (version 4 and above).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static libraries that can be used to
compile static binaries using %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation

%description    doc
This package contains the documentation for developing with %{name}.

%package        examples
Summary:        Example applications for %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}

%description    examples
This package contains demo applications for %{name}.

%prep
%setup -q -n KNI_%{version}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .sofixes
%patch2 -p1 -b .ctor
%patch3 -p1 -b .noexit


%build
make CFLAGS="%{optflags}"
make doc
echo "prefix=%{prefix}
exec_prefix=%{prefix}
libdir=%{_libdir}
includedir=%{_includedir}

Name: %{name}
Description: %{summary}
Version: %{version}
Libs: -L\${libdir} -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3
Cflags: -I\${includedir}/kni3" > libkni3.pc


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
mkdir -p %{buildroot}%{_libdir}
install -m 0644 -p lib/linux/*.a %{buildroot}%{_libdir}
install -p lib/linux/*.so.* %{buildroot}%{_libdir}
for f in `find %{buildroot}%{_libdir} -name '*.so.*.*.*'`; do
    ln -s `basename $f` %{buildroot}%{_libdir}/`echo \`basename $f\` | sed -e 's/\(\(.*\).so\)\(.*\)/\1/'`
    ln -s `basename $f` %{buildroot}%{_libdir}/`objdump --private-headers $f | grep SONAME | awk '{print $2}'`
done
mkdir -p %{buildroot}%{_bindir}
for f in `find demo/ -perm /a+x -type f`; do
    install -p $f %{buildroot}%{_bindir}/kni_`basename $f`
done
mkdir -p %{buildroot}%{_sysconfdir}/kni3
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd300
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd400
install -p -m 0644 configfiles300/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd300
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
mkdir -p %{buildroot}%{_includedir}/kni3
cp -a include/* %{buildroot}%{_includedir}/kni3
mkdir -p %{buildroot}%{_docdir}/%{name}-doc-%{version}
cp -a doc/html %{buildroot}%{_docdir}/%{name}-doc-%{version}
install -p -m 0644 doc/*.pdf %{buildroot}%{_docdir}/%{name}-doc-%{version}
find %{buildroot} -name '.svn' | xargs rm -rf
mkdir -p %{buildroot}%{_libdir}/pkgconfig
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE.txt readme.txt AUTHORS.txt
%{_libdir}/*.so.*
%dir %{_sysconfdir}/kni3
%dir %{_sysconfdir}/kni3/hd300
%dir %{_sysconfdir}/kni3/hd400
%config(noreplace)%{_sysconfdir}/kni3/*/*.cfg

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%files static
%defattr(-,root,root,-)
%{_libdir}/*.a

%files doc
%defattr(-, root, root, 0755)
%{_docdir}/%{name}-doc-%{version}

%files examples
%defattr(-, root, root, 0755)
%{_bindir}/kni_*


%changelog
* Mon Sep 14 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-12
- doc package contains doc dir, not docs

* Fri Aug 28 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-11
- Rename shared libs to allow parallel installation for libkni
- Merge all shared lib related patches to one sofixes patch

* Sat Jun 13 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-10
- Update ctor and gcc43 patch for F11

* Tue Jun 09 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-9
- Rename to libkni3, libkni will be the most up2date version (v4), but this
  version is still required for older Katana 300 arms
- Add patch to fix library building, did work on my machin only because libs
  were installed on the system

* Wed Dec 03 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-8
- Fix noexit patch

* Mon Dec 01 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-7
- Make patch 3 apply with fuzz=0
- Added patch that removes calls to exit() but throws exceptions

* Sun Nov 09 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-6
- Updated license tag
- Consistent (non-)macro usage

* Tue Jul 15 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-5
- Added ctor patch which adds an optional argument to the ctor to allow for
  accessing an arbitrary device, for example a usb2ser converter
  (RoboCup 2008)

* Mon Jun 23 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-4
- More .so fixes, link libs against base lib to get rid of
  undefined-non-weak-symbol rpmlint warnings

* Mon Jun 16 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-3
- Fixed summary

* Thu Jun 12 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-2
- Upgraded BR to support building on Fedora version < 9

* Sat Jun 07 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:03:12 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:51:58 -0000	1.2
@@ -0,0 +1 @@
+KNI_3.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:03:12 -0000	1.1
+++ sources	14 Sep 2009 22:51:58 -0000	1.2
@@ -0,0 +1 @@
+63b40f2c258f7ce2159b2471f4569165  KNI_3.9.2.tar.gz



From mclasen at fedoraproject.org  Mon Sep 14 22:55:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Sep 2009 22:55:18 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.30, 1.31 gtksourceview2.spec,
	1.37, 1.38 sources, 1.30, 1.31
Message-ID: <20090914225518.7723911C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18414

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	25 Aug 2009 01:15:17 -0000	1.30
+++ .cvsignore	14 Sep 2009 22:55:17 -0000	1.31
@@ -1 +1 @@
-gtksourceview-2.7.4.tar.bz2
+gtksourceview-2.7.5.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gtksourceview2.spec	25 Aug 2009 01:15:17 -0000	1.37
+++ gtksourceview2.spec	14 Sep 2009 22:55:17 -0000	1.38
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.7.4
+Version: 2.7.5
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.5-1
+- Update to 2.7.5
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.4-1
 - Update to 2.7.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	25 Aug 2009 01:15:17 -0000	1.30
+++ sources	14 Sep 2009 22:55:17 -0000	1.31
@@ -1 +1 @@
-d57e4839a37899810d84f628482e2baf  gtksourceview-2.7.4.tar.bz2
+cfd9d4d81536f73b3e0ac2ef0c890bd8  gtksourceview-2.7.5.tar.bz2



From timn at fedoraproject.org  Mon Sep 14 22:55:15 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon, 14 Sep 2009 22:55:15 +0000 (UTC)
Subject: rpms/libkni3/F-10 import.log, NONE, 1.1 kni-3.9.2-ctor.patch, NONE, 
	1.1 kni-3.9.2-gcc43.patch, NONE, 1.1 kni-3.9.2-noexit.patch,
	NONE, 1.1 kni-3.9.2-sofixes.patch, NONE, 1.1 libkni3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914225515.EF75011C00EC@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/libkni3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18326/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kni-3.9.2-ctor.patch kni-3.9.2-gcc43.patch 
	kni-3.9.2-noexit.patch kni-3.9.2-sofixes.patch libkni3.spec 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
libkni3-3_9_2-12_fc11:F-10:libkni3-3.9.2-12.fc11.src.rpm:1252968861

kni-3.9.2-ctor.patch:
 include/KNI/cdlCOM.h     |    2 
 src/Base/cdlCOM.cpp      |   17 +-
 src/Base/cdlCOM.cpp.orig |  369 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 380 insertions(+), 8 deletions(-)

--- NEW FILE kni-3.9.2-ctor.patch ---
diff -urN KNI_3.9.2/include/KNI/cdlCOM.h KNI_3.9.2.ctor/include/KNI/cdlCOM.h
--- KNI_3.9.2/include/KNI/cdlCOM.h	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.ctor/include/KNI/cdlCOM.h	2009-06-12 16:44:42.000000000 +0200
@@ -107,7 +107,7 @@
 	 *	describes the desired serial port. An attempt to open a connection
 	 *	to the desired device will be tried.
 	 */
-	CCdlCOM(TCdlCOMDesc ccd);
+	CCdlCOM(TCdlCOMDesc ccd, const char *dev_name = 0);
 
 	/*! \brief	Destructs the class
 	 */	virtual ~CCdlCOM();
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.ctor/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2009-06-12 16:44:03.000000000 +0200
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp	2009-06-12 16:45:02.000000000 +0200
@@ -23,8 +23,9 @@
 
 #include "common/Timer.h"
 #include <cstring>
+#include <cstdio>
 
-
+#include <cstdlib>
 #ifdef WIN32
 
 CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
@@ -160,21 +161,24 @@
 
 #else //LINUX
 
-CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd, const char *dev_name) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
 
 	int prtHdl	= -1;
 
-	std::string deviceName;
 	struct termios	nto, oto;
-	char		name[11];
+	char *name;
 
 	errno = 0;
 
-	strncpy(name, "/dev/ttyS ", 11);
-	name[9] = digit(ccd.port);
+	if (dev_name) {
+          name = strdup(dev_name);
+        } else {
+          asprintf(&name, "/dev/ttyS%i", ccd.port);
+        }
 	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
 
 	_deviceName = name;
+        free(name);
 
 	if (prtHdl < 0) {
 		throw CannotOpenPortException(_deviceName, strerror(errno));
@@ -290,7 +294,6 @@
 	}
 
 	_prtHdl = prtHdl;
-	_deviceName = deviceName;
 	_ccd = ccd;
 	_oto = oto;
 }
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp.orig KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig
--- KNI_3.9.2/src/Base/cdlCOM.cpp.orig	1970-01-01 01:00:00.000000000 +0100
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig	2009-06-12 16:44:42.000000000 +0200
@@ -0,0 +1,369 @@
+/*
+ *   Katana Native Interface - A C++ interface to the robot arm Katana.
+ *   Copyright (C) 2005 Neuronics AG
+ *   Check out the AUTHORS file for detailed contact 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
+ */
+
+
+#include "KNI/cdlCOM.h"
+
+#include "common/Timer.h"
+#include <cstring>
+
+
+#ifdef WIN32
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
+
+	DCB commDCB;	//COM port parameters
+	COMMTIMEOUTS nto;	//new timeouts
+	char comX[5];
+	char dcb[35];
+	int i, d;
+
+	std::string deviceName;
+	HANDLE prtHdl;
+	COMMTIMEOUTS oto;
+
+	strncpy_s(comX, "COM ", 5);
+	comX[3] = digit(ccd.port);
+	deviceName = comX;
+	prtHdl = CreateFile(comX,
+	                    GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING,
+	                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, 0
+	                   );
+
+	if (prtHdl == INVALID_HANDLE_VALUE) {
+		throw CannotOpenPortException(_deviceName, "info from win32-system not yet available");
+	}
+
+	FillMemory(&commDCB, sizeof(commDCB), 0);
+	commDCB.DCBlength = sizeof(commDCB);
+	strncpy_s(dcb, "baud=       parity=  data=  stop= ", 35);
+	for(i=5,d=100000; d>=1; d=d/10) {
+		if(d <= ccd.baud) {
+			dcb[i++] = digit((ccd.baud/d) % 10);
+		}
+	}
+	dcb[19] = ccd.parity;
+	dcb[26] = digit(ccd.data);
+	dcb[33] = digit(ccd.stop);
+	if (!BuildCommDCB(dcb, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	commDCB.fAbortOnError	= false;
+	commDCB.fInX			= false;
+	commDCB.fOutX			= false;
+	commDCB.fOutxCtsFlow	= false;
+	if (!SetCommState(prtHdl, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	PurgeComm(	prtHdl,	PURGE_TXABORT | PURGE_RXABORT | PURGE_TXCLEAR | PURGE_RXCLEAR);
+
+	GetCommTimeouts(prtHdl, &oto);
+	nto.ReadIntervalTimeout			= MAXDWORD;
+	nto.ReadTotalTimeoutMultiplier	= 0;
+	nto.ReadTotalTimeoutConstant	= 0;
+	nto.WriteTotalTimeoutMultiplier	= 0;
+	nto.WriteTotalTimeoutConstant	= 0;
+	if (!SetCommTimeouts(prtHdl, &nto)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	// Everything done, now we can change the state
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+	if(_prtHdl == INVALID_HANDLE_VALUE)
+		return;
+
+	FlushFileBuffers(_prtHdl);
+	SetCommTimeouts(_prtHdl, &_oto);
+
+	CloseHandle(_prtHdl);
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_TXABORT | PURGE_TXCLEAR) == 0) {
+		throw DeviceWriteException(_deviceName, "PurgeComm failed");
+	}
+
+	unsigned long readsz;
+	if (WriteFile(_prtHdl, buf, size, &readsz, 0) == 0) {
+		throw DeviceWriteException(_deviceName, "WriteFile failed");
+	}
+
+	if(readsz != static_cast<long>(size)) {
+		throw WriteNotCompleteException(_deviceName);
+	}
+
+	return (int)readsz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	unsigned long readsz = 0, readsz_temp = 0;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<(unsigned long)size && !timeout.Elapsed()) {
+		if(ReadFile(_prtHdl, &tmp[readsz], size, &readsz_temp, 0) == 0) {
+			DeviceReadException( _deviceName, "ReadFile failed" );
+		} else {
+			readsz  += readsz_temp;
+		}
+	}
+
+	if((unsigned)size != readsz) {
+		throw ReadNotCompleteException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_RXABORT | PURGE_RXCLEAR) == 0) {
+		throw DeviceReadException(_deviceName, "PurgeComm failed");
+	}
+	return (int)readsz;
+}
+
+
+#else //LINUX
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+
+	int prtHdl	= -1;
+
+	std::string deviceName;
+	struct termios	nto, oto;
+	char		name[11];
+
+	errno = 0;
+
+	strncpy(name, "/dev/ttyS ", 11);
+	name[9] = digit(ccd.port);
+	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
+
+	_deviceName = name;
+
+	if (prtHdl < 0) {
+		throw CannotOpenPortException(_deviceName, strerror(errno));
+	}
+
+	tcgetattr(prtHdl, &oto);
+	bzero(&nto, sizeof(nto));
+	nto.c_cc[VTIME]	= 0;
+	nto.c_cc[VMIN]	= 0;
+	nto.c_oflag	= 0;
+	nto.c_lflag	= 0;
+	nto.c_cflag	= CLOCAL | CREAD;
+	nto.c_iflag	= 0;
+
+	switch (ccd.baud) {
+	case     50:
+		nto.c_cflag |= B50;
+		break;
+	case     75:
+		nto.c_cflag |= B75;
+		break;
+	case    110:
+		nto.c_cflag |= B110;
+		break;
+	case    134:
+		nto.c_cflag |= B134;
+		break;
+	case    150:
+		nto.c_cflag |= B150;
+		break;
+	case    200:
+		nto.c_cflag |= B200;
+		break;
+	case    300:
+		nto.c_cflag |= B300;
+		break;
+	case    600:
+		nto.c_cflag |= B600;
+		break;
+	case   1200:
+		nto.c_cflag |= B1200;
+		break;
+	case   1800:
+		nto.c_cflag |= B1800;
+		break;
+	case   2400:
+		nto.c_cflag |= B2400;
+		break;
+	case   4800:
+		nto.c_cflag |= B4800;
+		break;
+	case   9600:
+		nto.c_cflag |= B9600;
+		break;
+	case  19200:
+		nto.c_cflag |= B19200;
+		break;
+	case  38400:
+		nto.c_cflag |= B38400;
+		break;
+	case  57600:
+		nto.c_cflag |= B57600;
+		break;
+	case 115200:
+		nto.c_cflag |= B115200;
+		break;
+	case 230400:
+		nto.c_cflag |= B230400;
+		break;
+	}
+
+	switch (ccd.data) {
+	case  5:
+		nto.c_cflag |= CS5;
+		break;
+	case  6:
+		nto.c_cflag |= CS6;
+		break;
+	case  7:
+		nto.c_cflag |= CS7;
+		break;
+	case  8:
+		nto.c_cflag |= CS8;
+		break;
+	}
+
+	switch (ccd.parity) {
+	case 'N':
+	case 'n':
+		break;
+	case 'O':
+	case 'o':
+		nto.c_cflag |= PARENB | PARODD;
+		break;
+	case 'E':
+	case 'e':
+		nto.c_cflag |= PARENB;
+		break;
+	}
+
+	switch (ccd.stop) {
+	case  1:
+		break;
+	case  2:
+		nto.c_cflag |= CSTOPB;
+		break;
+	}
+
+	tcflush(prtHdl,TCIFLUSH);
+	if (tcsetattr(prtHdl, TCSANOW, &nto) != 0) {
+		::close(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+
+	if (_prtHdl < 0) {
+		return;
+	}
+
+	tcflush(_prtHdl, TCIFLUSH);
+	tcsetattr(_prtHdl, TCSANOW, &_oto);
+
+	::close(_prtHdl); // there's nothing we can do about failing
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	int writesz = write(_prtHdl, buf, size);
+
+	if(writesz < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	if(writesz != size)
+		throw WriteNotCompleteException(_deviceName);
+
+	return writesz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	register int	readsz 	= 0;
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int read_return;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<size && !timeout.Elapsed()) {
+		read_return = read(_prtHdl, &tmp[readsz], size-readsz);
+		if(read_return < 0) {
+			if(errno != EAGAIN)
+				throw DeviceReadException( _deviceName, strerror(errno));
+		} else {
+			readsz  += read_return;
+		}
+	}
+
+	if (readsz != size)
+		throw ReadNotCompleteException(_deviceName);
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceReadException( _deviceName, strerror(errno));
+
+	return readsz;
+
+}
+
+
+
+#endif //WIN32 else LINUX
+

kni-3.9.2-gcc43.patch:
 demo/keycontrol/keycontrol.cpp         |    1 +
 demo/perfo/main.cpp                    |    1 +
 demo/perfo/perfo.cpp                   |    9 +++++----
 demo/positions/main.cpp                |    1 +
 demo/sensor/main.cpp                   |    1 +
 demo/socketcommands/socketcommands.cpp |    1 +
 demo/socketcontrol/socketcontrol.cpp   |    1 +
 include/KNI/kmlMotBase.h               |    4 ++--
 src/Base/cdlCOM.cpp                    |    1 +
 src/Base/cdlSocket.cpp                 |    3 +++
 src/Base/cplSerial.cpp                 |    1 +
 src/Base/kmlBase.cpp                   |    1 +
 src/Base/kmlFactories.cpp              |    2 ++
 src/Base/kmlMotBase.cpp                |    2 ++
 14 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE kni-3.9.2-gcc43.patch ---
diff -urN KNI_3.9.2/demo/keycontrol/keycontrol.cpp KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp
--- KNI_3.9.2/demo/keycontrol/keycontrol.cpp	2007-08-10 14:37:42.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/perfo/main.cpp KNI_3.9.2.gcc43/demo/perfo/main.cpp
--- KNI_3.9.2/demo/perfo/main.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/main.cpp	2009-06-12 16:48:21.000000000 +0200
@@ -19,6 +19,7 @@
 #include "KNI/kmlBase.h"	//for robot: CKatBase, CMotBase, CSctBase
 #include "KNI/kmlExt.h"	// extended katana features
 #include <iostream>		//for messages: printf()
+#include <cstdio>
 
 /**********************************************************************************/
 #include "perfo.h"	//for performance checking..
diff -urN KNI_3.9.2/demo/perfo/perfo.cpp KNI_3.9.2.gcc43/demo/perfo/perfo.cpp
--- KNI_3.9.2/demo/perfo/perfo.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/perfo.cpp	2009-06-12 16:48:29.000000000 +0200
@@ -2,6 +2,7 @@
 #include "perfo.h"
 #include <time.h>
 #include <iostream>
+#include <cstdio>
 
 #include "KNI/cdlCOMExceptions.h"
 #include "KNI/cplSerial.h"
@@ -13,7 +14,7 @@
 #define CLOCK() (clock_t)((double)(1000.0f * clock()) / CLOCKS_PER_SEC)
 //-------------------------------------------------------------------------------//
 
-void statKatRecv(char strTitle[], long i, long j, clock_t t, long l) {
+void statKatRecv(const char strTitle[], long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -102,7 +103,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statMotRecv(char strTitle[], short idx, long i, long j, clock_t t, long l) {
+void statMotRecv(const char strTitle[], short idx, long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -111,7 +112,7 @@
 	printf("-------------------------------------------\n\n");
 }
 
-void statMotSend(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statMotSend(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -278,7 +279,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statSct(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statSct(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
diff -urN KNI_3.9.2/demo/positions/main.cpp KNI_3.9.2.gcc43/demo/positions/main.cpp
--- KNI_3.9.2/demo/positions/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/positions/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -8,6 +8,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/sensor/main.cpp KNI_3.9.2.gcc43/demo/sensor/main.cpp
--- KNI_3.9.2/demo/sensor/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/sensor/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <conio.h> //ONLY WIN32 COMPATIBLE!!
 #endif
 #include <time.h>
+#include <cstdlib>
 
 //------------------------------------------------------------------------//
 
diff -urN KNI_3.9.2/demo/socketcommands/socketcommands.cpp KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp
--- KNI_3.9.2/demo/socketcommands/socketcommands.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <cstdio>
 #include <memory>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp
--- KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp	2007-09-03 16:04:48.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -11,6 +11,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/include/KNI/kmlMotBase.h KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h
--- KNI_3.9.2/include/KNI/kmlMotBase.h	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h	2009-06-12 16:48:02.000000000 +0200
@@ -45,7 +45,7 @@
 
 /*!	\brief	command flags
  */
-typedef enum TMotCmdFlg {
+enum TMotCmdFlg {
 	MCF_OFF		= 0,		//!< set the motor off
 	MCF_CALIB	= 4,		//!< calibrate
 	MCF_FREEZE	= 8,		//!< freeze the motor
@@ -54,7 +54,7 @@
 
 /*!	\brief	status flags
  */
-typedef enum TMotStsFlg	{
+enum TMotStsFlg	{
 	MSF_MECHSTOP	= 1,		//!< mechanical stopper reached
 	MSF_MAXPOS	= 2,		//!< max. position was reached
 	MSF_MINPOS	= 4,		//!< min. position was reached
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/cdlCOM.h"
 
 #include "common/Timer.h"
+#include <cstring>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/src/Base/cdlSocket.cpp KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp
--- KNI_3.9.2/src/Base/cdlSocket.cpp	2007-11-06 14:45:08.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,9 @@
 /****************************************************************************/
 #include "KNI/cdlSocket.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
+
 /****************************************************************************/
 //test write:
 int writesz;
diff -urN KNI_3.9.2/src/Base/cplSerial.cpp KNI_3.9.2.gcc43/src/Base/cplSerial.cpp
--- KNI_3.9.2/src/Base/cplSerial.cpp	2007-11-13 10:38:44.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cplSerial.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/CRC.h"
 #include <assert.h>
 #include <iostream>
+#include <cstring>
 
 
 /*
diff -urN KNI_3.9.2/src/Base/kmlBase.cpp KNI_3.9.2.gcc43/src/Base/kmlBase.cpp
--- KNI_3.9.2/src/Base/kmlBase.cpp	2007-11-07 09:22:52.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/kmlBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,7 @@
 #include "KNI/kmlBase.h"
 
 #include <vector>
+#include <cstring>
 
 bool CKatBase::init(
     const TKatGNL _gnl,
diff -urN KNI_3.9.2/src/Base/kmlFactories.cpp KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp
--- KNI_3.9.2/src/Base/kmlFactories.cpp	2007-07-16 14:17:40.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -1,5 +1,7 @@
 
 #include "KNI/kmlFactories.h"
+#include <cstring>
+#include <cstdlib>
 
 namespace KNI {
 
diff -urN KNI_3.9.2/src/Base/kmlMotBase.cpp KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp
--- KNI_3.9.2/src/Base/kmlMotBase.cpp	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -15,6 +15,8 @@
 #include "common/MathHelperFunctions.h"
 #include "common/Timer.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 
 bool CMotBase::init(CKatBase* _own, const TMotDesc _motDesc, CCplBase* _protocol) {

kni-3.9.2-noexit.patch:
 cdlSocket.cpp |    7 ++++---
 kmlExt.cpp    |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE kni-3.9.2-noexit.patch ---
diff -urN KNI_3.9.2.patched/src/Base/cdlSocket.cpp KNI_3.9.2.noexit/src/Base/cdlSocket.cpp
--- KNI_3.9.2.patched/src/Base/cdlSocket.cpp	2008-12-01 13:12:13.000000000 +0100
+++ KNI_3.9.2.noexit/src/Base/cdlSocket.cpp	2008-12-01 13:16:07.000000000 +0100
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <cstring>
 #include <cstdlib>
+#include <stdexcept>
 
 /****************************************************************************/
 //test write:
@@ -95,7 +96,7 @@
 	_socketfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if(_socketfd == -1){
 		std::cout << "socket could not be created"<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("socket could not be created");
 	}
 	memset(&_socketAddr, 0, sizeof(_socketAddr));  
 	_socketAddr.sin_family = AF_INET;
@@ -106,13 +107,13 @@
 	res = inet_pton ( AF_INET, _ipAddr, &_socketAddr.sin_addr );
 	if ( errno == EAFNOSUPPORT ){
 		std::cout << "inet_pton failed, try again "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("inet_pton failed (EAFNOSUPPORT)");
 	}
 //	std::cout << "trying to connect to server...\n";
 	res = connect(_socketfd, (struct sockaddr *) &_socketAddr, _len);
 	if(res != 0){
 		std::cout << "client could not connect, check if server is running on ip "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("client could not connect, check if server is running");
 	}
 	else{
 //		std::cout << "client connected to ip "<<_ipAddr<<", port: "<< _port<<" \n";
diff -urN KNI_3.9.2.patched/src/Base/kmlExt.cpp KNI_3.9.2.noexit/src/Base/kmlExt.cpp
--- KNI_3.9.2.patched/src/Base/kmlExt.cpp	2007-09-28 07:38:10.000000000 +0200
+++ KNI_3.9.2.noexit/src/Base/kmlExt.cpp	2008-12-01 13:16:58.000000000 +0100
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <algorithm>
 #include <vector>
+#include <stdexcept>
 
 #define max(a,b) (((a)>(b))?(a):(b))
 KNI::Timer kni_timer;
@@ -145,7 +146,8 @@
 		std::cout << "Exit: Incompatible Config File!\n";
 		std::cout << "Check whether you have a Katana 400 or 300 and choose the config file accordingly\n";
 		std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n.";
-		exit(0);
+		throw std::runtime_error("Exit: Incompatible Config File! "
+					 "Check whether you have a Katana 400 or 300 and choose the config file accordingly");
 	}
 	bool gripperIsPresent;
 	int gripperOpenEncoders, gripperCloseEncoders;

kni-3.9.2-sofixes.patch:
 demo/Makefile       |   10 +++++-----
 src/Base/Makefile   |   13 ++++++++-----
 src/InvKin/Makefile |   14 +++++++++-----
 src/LM/Makefile     |   13 ++++++++-----
 src/common/Makefile |    4 ++--
 5 files changed, 32 insertions(+), 22 deletions(-)

--- NEW FILE kni-3.9.2-sofixes.patch ---
diff -urN KNI_3.9.2/demo/Makefile KNI_3.9.2.sofixes/demo/Makefile
--- KNI_3.9.2/demo/Makefile	2007-06-20 08:05:24.000000000 +0200
+++ KNI_3.9.2.sofixes/demo/Makefile	2009-08-28 22:09:05.000000000 +0200
@@ -34,11 +34,11 @@
 INCLUDE_DIR = ../include -I./common
 LIBRARY_DIR  = ../lib/linux
 
-BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase.a
-INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin.a
-LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM.a
+BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase3.a
+INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin3.a
+LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM3.a
 
-AVAILABLE_LIBRARIES = ./common/keyboard.o ${BASE_LIBRARY} ${INVKIN_LIBRARY} ${LM_LIBRARY}
+AVAILABLE_LIBRARIES = ./common/keyboard.o
 
 .SILENT:
 
@@ -55,7 +55,7 @@
 
 $(TARGETS_D): $(CTARGETS_D)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
+	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
 	then echo " [ok]"; \
 		cat .clog; \
 	else echo " [failed]"; \
diff -urN KNI_3.9.2/src/Base/Makefile KNI_3.9.2.sofixes/src/Base/Makefile
--- KNI_3.9.2/src/Base/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/Base/Makefile	2009-08-28 22:08:00.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNIBase
+LIBNAME = libKNIBase3
 SOURCES = cdlCOM.cpp cplSerial.cpp cdlSocket.cpp CRC.cpp kmlBase.cpp kmlExt.cpp kmlMotBase.cpp kmlSctBase.cpp kmlFactories.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS = -shared -L$(TARGET_DIR)
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/common/Makefile KNI_3.9.2.sofixes/src/common/Makefile
--- KNI_3.9.2/src/common/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/common/Makefile	2009-08-28 22:08:16.000000000 +0200
@@ -17,14 +17,14 @@
 #===========================================================================
 
 CXX		=	g++
-CXXFLAGS	+=	-g -O2 -Wall
+CXXFLAGS	+=	-g -O2 -Wall -fPIC
 
 MAJOR_VERSION	=	3.9
 MINOR_VERSION	=	0
 
 TARGETS		=	alib
 
-LIBNAME = knicommon
+LIBNAME = knicommon3
 SOURCES = Timer.cpp
 
 LIBNAME_A  = $(LIBNAME).a
diff -urN KNI_3.9.2/src/InvKin/Makefile KNI_3.9.2.sofixes/src/InvKin/Makefile
--- KNI_3.9.2/src/InvKin/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/InvKin/Makefile	2009-08-28 22:08:25.000000000 +0200
@@ -24,20 +24,23 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_InvKin
+LIBNAME = libKNI_InvKin3
 SOURCES = ikBase.cpp KatanaKinematics6M90G.cpp KatanaKinematics6M90T.cpp KatanaKinematics6M180.cpp KatanaKinematics5M180.cpp KatanaKinematicsDecisionAlgorithms.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3
+
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +72,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/LM/Makefile KNI_3.9.2.sofixes/src/LM/Makefile
--- KNI_3.9.2/src/LM/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/LM/Makefile	2009-08-28 22:08:40.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_LM
+LIBNAME = libKNI_LM3
 SOURCES = lmBase.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3 -lKNI_InvKin3
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \


--- NEW FILE libkni3.spec ---
Name:           libkni3
Version:        3.9.2
Release:        12%{?dist}
Summary:        C++ KNI library v3 for the Katana 300 robot arm

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.neuronics.ch/cms_de/web/index.php?id=386
Source0:        http://www.neuronics.ch/cms_de/mediabase/KNI_3.9.2.tar.gz
Patch0:         kni-3.9.2-gcc43.patch
Patch1:         kni-3.9.2-sofixes.patch
Patch2:         kni-3.9.2-ctor.patch
Patch3:         kni-3.9.2-noexit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen, graphviz
%if 0%{?fedora} >= 9
BuildRequires:  texlive-utils
%else
BuildRequires:  tetex
%endif

BuildRequires:  boost-devel

%description
Katana Native Interface is a C++ library for programmers who would like to
write their own programs, but don't want to implement the protocol and
device stuff katana is using.

This package contains the library for the Katana 300 series of the arm. For
newer robots use libkni (version 4 and above).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static libraries that can be used to
compile static binaries using %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation

%description    doc
This package contains the documentation for developing with %{name}.

%package        examples
Summary:        Example applications for %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}

%description    examples
This package contains demo applications for %{name}.

%prep
%setup -q -n KNI_%{version}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .sofixes
%patch2 -p1 -b .ctor
%patch3 -p1 -b .noexit


%build
make CFLAGS="%{optflags}"
make doc
echo "prefix=%{prefix}
exec_prefix=%{prefix}
libdir=%{_libdir}
includedir=%{_includedir}

Name: %{name}
Description: %{summary}
Version: %{version}
Libs: -L\${libdir} -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3
Cflags: -I\${includedir}/kni3" > libkni3.pc


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
mkdir -p %{buildroot}%{_libdir}
install -m 0644 -p lib/linux/*.a %{buildroot}%{_libdir}
install -p lib/linux/*.so.* %{buildroot}%{_libdir}
for f in `find %{buildroot}%{_libdir} -name '*.so.*.*.*'`; do
    ln -s `basename $f` %{buildroot}%{_libdir}/`echo \`basename $f\` | sed -e 's/\(\(.*\).so\)\(.*\)/\1/'`
    ln -s `basename $f` %{buildroot}%{_libdir}/`objdump --private-headers $f | grep SONAME | awk '{print $2}'`
done
mkdir -p %{buildroot}%{_bindir}
for f in `find demo/ -perm /a+x -type f`; do
    install -p $f %{buildroot}%{_bindir}/kni_`basename $f`
done
mkdir -p %{buildroot}%{_sysconfdir}/kni3
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd300
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd400
install -p -m 0644 configfiles300/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd300
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
mkdir -p %{buildroot}%{_includedir}/kni3
cp -a include/* %{buildroot}%{_includedir}/kni3
mkdir -p %{buildroot}%{_docdir}/%{name}-doc-%{version}
cp -a doc/html %{buildroot}%{_docdir}/%{name}-doc-%{version}
install -p -m 0644 doc/*.pdf %{buildroot}%{_docdir}/%{name}-doc-%{version}
find %{buildroot} -name '.svn' | xargs rm -rf
mkdir -p %{buildroot}%{_libdir}/pkgconfig
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE.txt readme.txt AUTHORS.txt
%{_libdir}/*.so.*
%dir %{_sysconfdir}/kni3
%dir %{_sysconfdir}/kni3/hd300
%dir %{_sysconfdir}/kni3/hd400
%config(noreplace)%{_sysconfdir}/kni3/*/*.cfg

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%files static
%defattr(-,root,root,-)
%{_libdir}/*.a

%files doc
%defattr(-, root, root, 0755)
%{_docdir}/%{name}-doc-%{version}

%files examples
%defattr(-, root, root, 0755)
%{_bindir}/kni_*


%changelog
* Mon Sep 14 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-12
- doc package contains doc dir, not docs

* Fri Aug 28 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-11
- Rename shared libs to allow parallel installation for libkni
- Merge all shared lib related patches to one sofixes patch

* Sat Jun 13 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-10
- Update ctor and gcc43 patch for F11

* Tue Jun 09 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-9
- Rename to libkni3, libkni will be the most up2date version (v4), but this
  version is still required for older Katana 300 arms
- Add patch to fix library building, did work on my machin only because libs
  were installed on the system

* Wed Dec 03 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-8
- Fix noexit patch

* Mon Dec 01 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-7
- Make patch 3 apply with fuzz=0
- Added patch that removes calls to exit() but throws exceptions

* Sun Nov 09 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-6
- Updated license tag
- Consistent (non-)macro usage

* Tue Jul 15 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-5
- Added ctor patch which adds an optional argument to the ctor to allow for
  accessing an arbitrary device, for example a usb2ser converter
  (RoboCup 2008)

* Mon Jun 23 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-4
- More .so fixes, link libs against base lib to get rid of
  undefined-non-weak-symbol rpmlint warnings

* Mon Jun 16 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-3
- Fixed summary

* Thu Jun 12 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-2
- Upgraded BR to support building on Fedora version < 9

* Sat Jun 07 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:03:12 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:55:13 -0000	1.2
@@ -0,0 +1 @@
+KNI_3.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:03:12 -0000	1.1
+++ sources	14 Sep 2009 22:55:14 -0000	1.2
@@ -0,0 +1 @@
+63b40f2c258f7ce2159b2471f4569165  KNI_3.9.2.tar.gz



From timn at fedoraproject.org  Mon Sep 14 22:57:16 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon, 14 Sep 2009 22:57:16 +0000 (UTC)
Subject: rpms/libkni3/EL-5 import.log, NONE, 1.1 kni-3.9.2-ctor.patch, NONE, 
	1.1 kni-3.9.2-gcc43.patch, NONE, 1.1 kni-3.9.2-noexit.patch,
	NONE, 1.1 kni-3.9.2-sofixes.patch, NONE, 1.1 libkni3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090914225716.93D3F11C00EC@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/libkni3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21693/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kni-3.9.2-ctor.patch kni-3.9.2-gcc43.patch 
	kni-3.9.2-noexit.patch kni-3.9.2-sofixes.patch libkni3.spec 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
libkni3-3_9_2-12_fc11:EL-5:libkni3-3.9.2-12.fc11.src.rpm:1252968983

kni-3.9.2-ctor.patch:
 include/KNI/cdlCOM.h     |    2 
 src/Base/cdlCOM.cpp      |   17 +-
 src/Base/cdlCOM.cpp.orig |  369 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 380 insertions(+), 8 deletions(-)

--- NEW FILE kni-3.9.2-ctor.patch ---
diff -urN KNI_3.9.2/include/KNI/cdlCOM.h KNI_3.9.2.ctor/include/KNI/cdlCOM.h
--- KNI_3.9.2/include/KNI/cdlCOM.h	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.ctor/include/KNI/cdlCOM.h	2009-06-12 16:44:42.000000000 +0200
@@ -107,7 +107,7 @@
 	 *	describes the desired serial port. An attempt to open a connection
 	 *	to the desired device will be tried.
 	 */
-	CCdlCOM(TCdlCOMDesc ccd);
+	CCdlCOM(TCdlCOMDesc ccd, const char *dev_name = 0);
 
 	/*! \brief	Destructs the class
 	 */	virtual ~CCdlCOM();
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.ctor/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2009-06-12 16:44:03.000000000 +0200
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp	2009-06-12 16:45:02.000000000 +0200
@@ -23,8 +23,9 @@
 
 #include "common/Timer.h"
 #include <cstring>
+#include <cstdio>
 
-
+#include <cstdlib>
 #ifdef WIN32
 
 CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
@@ -160,21 +161,24 @@
 
 #else //LINUX
 
-CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd, const char *dev_name) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
 
 	int prtHdl	= -1;
 
-	std::string deviceName;
 	struct termios	nto, oto;
-	char		name[11];
+	char *name;
 
 	errno = 0;
 
-	strncpy(name, "/dev/ttyS ", 11);
-	name[9] = digit(ccd.port);
+	if (dev_name) {
+          name = strdup(dev_name);
+        } else {
+          asprintf(&name, "/dev/ttyS%i", ccd.port);
+        }
 	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
 
 	_deviceName = name;
+        free(name);
 
 	if (prtHdl < 0) {
 		throw CannotOpenPortException(_deviceName, strerror(errno));
@@ -290,7 +294,6 @@
 	}
 
 	_prtHdl = prtHdl;
-	_deviceName = deviceName;
 	_ccd = ccd;
 	_oto = oto;
 }
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp.orig KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig
--- KNI_3.9.2/src/Base/cdlCOM.cpp.orig	1970-01-01 01:00:00.000000000 +0100
+++ KNI_3.9.2.ctor/src/Base/cdlCOM.cpp.orig	2009-06-12 16:44:42.000000000 +0200
@@ -0,0 +1,369 @@
+/*
+ *   Katana Native Interface - A C++ interface to the robot arm Katana.
+ *   Copyright (C) 2005 Neuronics AG
+ *   Check out the AUTHORS file for detailed contact 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
+ */
+
+
+#include "KNI/cdlCOM.h"
+
+#include "common/Timer.h"
+#include <cstring>
+
+
+#ifdef WIN32
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
+
+	DCB commDCB;	//COM port parameters
+	COMMTIMEOUTS nto;	//new timeouts
+	char comX[5];
+	char dcb[35];
+	int i, d;
+
+	std::string deviceName;
+	HANDLE prtHdl;
+	COMMTIMEOUTS oto;
+
+	strncpy_s(comX, "COM ", 5);
+	comX[3] = digit(ccd.port);
+	deviceName = comX;
+	prtHdl = CreateFile(comX,
+	                    GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING,
+	                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, 0
+	                   );
+
+	if (prtHdl == INVALID_HANDLE_VALUE) {
+		throw CannotOpenPortException(_deviceName, "info from win32-system not yet available");
+	}
+
+	FillMemory(&commDCB, sizeof(commDCB), 0);
+	commDCB.DCBlength = sizeof(commDCB);
+	strncpy_s(dcb, "baud=       parity=  data=  stop= ", 35);
+	for(i=5,d=100000; d>=1; d=d/10) {
+		if(d <= ccd.baud) {
+			dcb[i++] = digit((ccd.baud/d) % 10);
+		}
+	}
+	dcb[19] = ccd.parity;
+	dcb[26] = digit(ccd.data);
+	dcb[33] = digit(ccd.stop);
+	if (!BuildCommDCB(dcb, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	commDCB.fAbortOnError	= false;
+	commDCB.fInX			= false;
+	commDCB.fOutX			= false;
+	commDCB.fOutxCtsFlow	= false;
+	if (!SetCommState(prtHdl, &commDCB)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	PurgeComm(	prtHdl,	PURGE_TXABORT | PURGE_RXABORT | PURGE_TXCLEAR | PURGE_RXCLEAR);
+
+	GetCommTimeouts(prtHdl, &oto);
+	nto.ReadIntervalTimeout			= MAXDWORD;
+	nto.ReadTotalTimeoutMultiplier	= 0;
+	nto.ReadTotalTimeoutConstant	= 0;
+	nto.WriteTotalTimeoutMultiplier	= 0;
+	nto.WriteTotalTimeoutConstant	= 0;
+	if (!SetCommTimeouts(prtHdl, &nto)) {
+		CloseHandle(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	// Everything done, now we can change the state
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+	if(_prtHdl == INVALID_HANDLE_VALUE)
+		return;
+
+	FlushFileBuffers(_prtHdl);
+	SetCommTimeouts(_prtHdl, &_oto);
+
+	CloseHandle(_prtHdl);
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_TXABORT | PURGE_TXCLEAR) == 0) {
+		throw DeviceWriteException(_deviceName, "PurgeComm failed");
+	}
+
+	unsigned long readsz;
+	if (WriteFile(_prtHdl, buf, size, &readsz, 0) == 0) {
+		throw DeviceWriteException(_deviceName, "WriteFile failed");
+	}
+
+	if(readsz != static_cast<long>(size)) {
+		throw WriteNotCompleteException(_deviceName);
+	}
+
+	return (int)readsz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+
+	if (_prtHdl == INVALID_HANDLE_VALUE) {
+		throw PortNotOpenException(_deviceName);
+	}
+
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	unsigned long readsz = 0, readsz_temp = 0;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<(unsigned long)size && !timeout.Elapsed()) {
+		if(ReadFile(_prtHdl, &tmp[readsz], size, &readsz_temp, 0) == 0) {
+			DeviceReadException( _deviceName, "ReadFile failed" );
+		} else {
+			readsz  += readsz_temp;
+		}
+	}
+
+	if((unsigned)size != readsz) {
+		throw ReadNotCompleteException(_deviceName);
+	}
+
+	if(PurgeComm(_prtHdl, PURGE_RXABORT | PURGE_RXCLEAR) == 0) {
+		throw DeviceReadException(_deviceName, "PurgeComm failed");
+	}
+	return (int)readsz;
+}
+
+
+#else //LINUX
+
+CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(-1), _oto() {
+
+	int prtHdl	= -1;
+
+	std::string deviceName;
+	struct termios	nto, oto;
+	char		name[11];
+
+	errno = 0;
+
+	strncpy(name, "/dev/ttyS ", 11);
+	name[9] = digit(ccd.port);
+	prtHdl = ::open(name, O_RDWR | O_NOCTTY | O_NDELAY| O_NONBLOCK);
+
+	_deviceName = name;
+
+	if (prtHdl < 0) {
+		throw CannotOpenPortException(_deviceName, strerror(errno));
+	}
+
+	tcgetattr(prtHdl, &oto);
+	bzero(&nto, sizeof(nto));
+	nto.c_cc[VTIME]	= 0;
+	nto.c_cc[VMIN]	= 0;
+	nto.c_oflag	= 0;
+	nto.c_lflag	= 0;
+	nto.c_cflag	= CLOCAL | CREAD;
+	nto.c_iflag	= 0;
+
+	switch (ccd.baud) {
+	case     50:
+		nto.c_cflag |= B50;
+		break;
+	case     75:
+		nto.c_cflag |= B75;
+		break;
+	case    110:
+		nto.c_cflag |= B110;
+		break;
+	case    134:
+		nto.c_cflag |= B134;
+		break;
+	case    150:
+		nto.c_cflag |= B150;
+		break;
+	case    200:
+		nto.c_cflag |= B200;
+		break;
+	case    300:
+		nto.c_cflag |= B300;
+		break;
+	case    600:
+		nto.c_cflag |= B600;
+		break;
+	case   1200:
+		nto.c_cflag |= B1200;
+		break;
+	case   1800:
+		nto.c_cflag |= B1800;
+		break;
+	case   2400:
+		nto.c_cflag |= B2400;
+		break;
+	case   4800:
+		nto.c_cflag |= B4800;
+		break;
+	case   9600:
+		nto.c_cflag |= B9600;
+		break;
+	case  19200:
+		nto.c_cflag |= B19200;
+		break;
+	case  38400:
+		nto.c_cflag |= B38400;
+		break;
+	case  57600:
+		nto.c_cflag |= B57600;
+		break;
+	case 115200:
+		nto.c_cflag |= B115200;
+		break;
+	case 230400:
+		nto.c_cflag |= B230400;
+		break;
+	}
+
+	switch (ccd.data) {
+	case  5:
+		nto.c_cflag |= CS5;
+		break;
+	case  6:
+		nto.c_cflag |= CS6;
+		break;
+	case  7:
+		nto.c_cflag |= CS7;
+		break;
+	case  8:
+		nto.c_cflag |= CS8;
+		break;
+	}
+
+	switch (ccd.parity) {
+	case 'N':
+	case 'n':
+		break;
+	case 'O':
+	case 'o':
+		nto.c_cflag |= PARENB | PARODD;
+		break;
+	case 'E':
+	case 'e':
+		nto.c_cflag |= PARENB;
+		break;
+	}
+
+	switch (ccd.stop) {
+	case  1:
+		break;
+	case  2:
+		nto.c_cflag |= CSTOPB;
+		break;
+	}
+
+	tcflush(prtHdl,TCIFLUSH);
+	if (tcsetattr(prtHdl, TCSANOW, &nto) != 0) {
+		::close(prtHdl);
+		throw CannotGetSetPortAttributesException(_deviceName);
+	}
+
+	_prtHdl = prtHdl;
+	_deviceName = deviceName;
+	_ccd = ccd;
+	_oto = oto;
+}
+
+CCdlCOM::~CCdlCOM() {
+
+	if (_prtHdl < 0) {
+		return;
+	}
+
+	tcflush(_prtHdl, TCIFLUSH);
+	tcsetattr(_prtHdl, TCSANOW, &_oto);
+
+	::close(_prtHdl); // there's nothing we can do about failing
+
+}
+
+int  CCdlCOM::send(const void* buf, int size) {
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	int writesz = write(_prtHdl, buf, size);
+
+	if(writesz < 0)
+		throw DeviceWriteException( _deviceName, strerror(errno) );
+
+	if(writesz != size)
+		throw WriteNotCompleteException(_deviceName);
+
+	return writesz;
+}
+
+int  CCdlCOM::recv(void* buf, int size) {
+	unsigned char*	tmp	= static_cast<unsigned char*>(buf);
+	register int	readsz 	= 0;
+
+	if (_prtHdl < 0)
+		throw PortNotOpenException(_deviceName);
+
+	errno = 0;
+
+	int read_return;
+	KNI::Timer timeout(_ccd.rttc);
+	timeout.Start();
+	while (readsz<size && !timeout.Elapsed()) {
+		read_return = read(_prtHdl, &tmp[readsz], size-readsz);
+		if(read_return < 0) {
+			if(errno != EAGAIN)
+				throw DeviceReadException( _deviceName, strerror(errno));
+		} else {
+			readsz  += read_return;
+		}
+	}
+
+	if (readsz != size)
+		throw ReadNotCompleteException(_deviceName);
+
+	int tcflush_return = tcflush(_prtHdl,TCIFLUSH);
+	if(tcflush_return < 0)
+		throw DeviceReadException( _deviceName, strerror(errno));
+
+	return readsz;
+
+}
+
+
+
+#endif //WIN32 else LINUX
+

kni-3.9.2-gcc43.patch:
 demo/keycontrol/keycontrol.cpp         |    1 +
 demo/perfo/main.cpp                    |    1 +
 demo/perfo/perfo.cpp                   |    9 +++++----
 demo/positions/main.cpp                |    1 +
 demo/sensor/main.cpp                   |    1 +
 demo/socketcommands/socketcommands.cpp |    1 +
 demo/socketcontrol/socketcontrol.cpp   |    1 +
 include/KNI/kmlMotBase.h               |    4 ++--
 src/Base/cdlCOM.cpp                    |    1 +
 src/Base/cdlSocket.cpp                 |    3 +++
 src/Base/cplSerial.cpp                 |    1 +
 src/Base/kmlBase.cpp                   |    1 +
 src/Base/kmlFactories.cpp              |    2 ++
 src/Base/kmlMotBase.cpp                |    2 ++
 14 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE kni-3.9.2-gcc43.patch ---
diff -urN KNI_3.9.2/demo/keycontrol/keycontrol.cpp KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp
--- KNI_3.9.2/demo/keycontrol/keycontrol.cpp	2007-08-10 14:37:42.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/perfo/main.cpp KNI_3.9.2.gcc43/demo/perfo/main.cpp
--- KNI_3.9.2/demo/perfo/main.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/main.cpp	2009-06-12 16:48:21.000000000 +0200
@@ -19,6 +19,7 @@
 #include "KNI/kmlBase.h"	//for robot: CKatBase, CMotBase, CSctBase
 #include "KNI/kmlExt.h"	// extended katana features
 #include <iostream>		//for messages: printf()
+#include <cstdio>
 
 /**********************************************************************************/
 #include "perfo.h"	//for performance checking..
diff -urN KNI_3.9.2/demo/perfo/perfo.cpp KNI_3.9.2.gcc43/demo/perfo/perfo.cpp
--- KNI_3.9.2/demo/perfo/perfo.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/perfo.cpp	2009-06-12 16:48:29.000000000 +0200
@@ -2,6 +2,7 @@
 #include "perfo.h"
 #include <time.h>
 #include <iostream>
+#include <cstdio>
 
 #include "KNI/cdlCOMExceptions.h"
 #include "KNI/cplSerial.h"
@@ -13,7 +14,7 @@
 #define CLOCK() (clock_t)((double)(1000.0f * clock()) / CLOCKS_PER_SEC)
 //-------------------------------------------------------------------------------//
 
-void statKatRecv(char strTitle[], long i, long j, clock_t t, long l) {
+void statKatRecv(const char strTitle[], long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -102,7 +103,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statMotRecv(char strTitle[], short idx, long i, long j, clock_t t, long l) {
+void statMotRecv(const char strTitle[], short idx, long i, long j, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -111,7 +112,7 @@
 	printf("-------------------------------------------\n\n");
 }
 
-void statMotSend(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statMotSend(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
@@ -278,7 +279,7 @@
 //-------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------//
 
-void statSct(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statSct(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
 	printf("-------------------------------------------\n");
 	printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
 	printf("-------------------------------------------\n");
diff -urN KNI_3.9.2/demo/positions/main.cpp KNI_3.9.2.gcc43/demo/positions/main.cpp
--- KNI_3.9.2/demo/positions/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/positions/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -8,6 +8,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/sensor/main.cpp KNI_3.9.2.gcc43/demo/sensor/main.cpp
--- KNI_3.9.2/demo/sensor/main.cpp	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/sensor/main.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <conio.h> //ONLY WIN32 COMPATIBLE!!
 #endif
 #include <time.h>
+#include <cstdlib>
 
 //------------------------------------------------------------------------//
 
diff -urN KNI_3.9.2/demo/socketcommands/socketcommands.cpp KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp
--- KNI_3.9.2/demo/socketcommands/socketcommands.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <cstdio>
 #include <memory>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp
--- KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp	2007-09-03 16:04:48.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -11,6 +11,7 @@
 #include <vector>
 #include <fstream>
 #include <pthread.h>
+#include <cstdlib>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/include/KNI/kmlMotBase.h KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h
--- KNI_3.9.2/include/KNI/kmlMotBase.h	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h	2009-06-12 16:48:02.000000000 +0200
@@ -45,7 +45,7 @@
 
 /*!	\brief	command flags
  */
-typedef enum TMotCmdFlg {
+enum TMotCmdFlg {
 	MCF_OFF		= 0,		//!< set the motor off
 	MCF_CALIB	= 4,		//!< calibrate
 	MCF_FREEZE	= 8,		//!< freeze the motor
@@ -54,7 +54,7 @@
 
 /*!	\brief	status flags
  */
-typedef enum TMotStsFlg	{
+enum TMotStsFlg	{
 	MSF_MECHSTOP	= 1,		//!< mechanical stopper reached
 	MSF_MAXPOS	= 2,		//!< max. position was reached
 	MSF_MINPOS	= 4,		//!< min. position was reached
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp	2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/cdlCOM.h"
 
 #include "common/Timer.h"
+#include <cstring>
 
 
 #ifdef WIN32
diff -urN KNI_3.9.2/src/Base/cdlSocket.cpp KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp
--- KNI_3.9.2/src/Base/cdlSocket.cpp	2007-11-06 14:45:08.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,9 @@
 /****************************************************************************/
 #include "KNI/cdlSocket.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
+
 /****************************************************************************/
 //test write:
 int writesz;
diff -urN KNI_3.9.2/src/Base/cplSerial.cpp KNI_3.9.2.gcc43/src/Base/cplSerial.cpp
--- KNI_3.9.2/src/Base/cplSerial.cpp	2007-11-13 10:38:44.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cplSerial.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include "KNI/CRC.h"
 #include <assert.h>
 #include <iostream>
+#include <cstring>
 
 
 /*
diff -urN KNI_3.9.2/src/Base/kmlBase.cpp KNI_3.9.2.gcc43/src/Base/kmlBase.cpp
--- KNI_3.9.2/src/Base/kmlBase.cpp	2007-11-07 09:22:52.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/kmlBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,7 @@
 #include "KNI/kmlBase.h"
 
 #include <vector>
+#include <cstring>
 
 bool CKatBase::init(
     const TKatGNL _gnl,
diff -urN KNI_3.9.2/src/Base/kmlFactories.cpp KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp
--- KNI_3.9.2/src/Base/kmlFactories.cpp	2007-07-16 14:17:40.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -1,5 +1,7 @@
 
 #include "KNI/kmlFactories.h"
+#include <cstring>
+#include <cstdlib>
 
 namespace KNI {
 
diff -urN KNI_3.9.2/src/Base/kmlMotBase.cpp KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp
--- KNI_3.9.2/src/Base/kmlMotBase.cpp	2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp	2009-06-12 16:48:02.000000000 +0200
@@ -15,6 +15,8 @@
 #include "common/MathHelperFunctions.h"
 #include "common/Timer.h"
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 
 bool CMotBase::init(CKatBase* _own, const TMotDesc _motDesc, CCplBase* _protocol) {

kni-3.9.2-noexit.patch:
 cdlSocket.cpp |    7 ++++---
 kmlExt.cpp    |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE kni-3.9.2-noexit.patch ---
diff -urN KNI_3.9.2.patched/src/Base/cdlSocket.cpp KNI_3.9.2.noexit/src/Base/cdlSocket.cpp
--- KNI_3.9.2.patched/src/Base/cdlSocket.cpp	2008-12-01 13:12:13.000000000 +0100
+++ KNI_3.9.2.noexit/src/Base/cdlSocket.cpp	2008-12-01 13:16:07.000000000 +0100
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <cstring>
 #include <cstdlib>
+#include <stdexcept>
 
 /****************************************************************************/
 //test write:
@@ -95,7 +96,7 @@
 	_socketfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if(_socketfd == -1){
 		std::cout << "socket could not be created"<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("socket could not be created");
 	}
 	memset(&_socketAddr, 0, sizeof(_socketAddr));  
 	_socketAddr.sin_family = AF_INET;
@@ -106,13 +107,13 @@
 	res = inet_pton ( AF_INET, _ipAddr, &_socketAddr.sin_addr );
 	if ( errno == EAFNOSUPPORT ){
 		std::cout << "inet_pton failed, try again "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("inet_pton failed (EAFNOSUPPORT)");
 	}
 //	std::cout << "trying to connect to server...\n";
 	res = connect(_socketfd, (struct sockaddr *) &_socketAddr, _len);
 	if(res != 0){
 		std::cout << "client could not connect, check if server is running on ip "<<_ipAddr<<" port: "<< _port<<" \n";
-		exit(1);
+		throw std::runtime_error("client could not connect, check if server is running");
 	}
 	else{
 //		std::cout << "client connected to ip "<<_ipAddr<<", port: "<< _port<<" \n";
diff -urN KNI_3.9.2.patched/src/Base/kmlExt.cpp KNI_3.9.2.noexit/src/Base/kmlExt.cpp
--- KNI_3.9.2.patched/src/Base/kmlExt.cpp	2007-09-28 07:38:10.000000000 +0200
+++ KNI_3.9.2.noexit/src/Base/kmlExt.cpp	2008-12-01 13:16:58.000000000 +0100
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <algorithm>
 #include <vector>
+#include <stdexcept>
 
 #define max(a,b) (((a)>(b))?(a):(b))
 KNI::Timer kni_timer;
@@ -145,7 +146,8 @@
 		std::cout << "Exit: Incompatible Config File!\n";
 		std::cout << "Check whether you have a Katana 400 or 300 and choose the config file accordingly\n";
 		std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n.";
-		exit(0);
+		throw std::runtime_error("Exit: Incompatible Config File! "
+					 "Check whether you have a Katana 400 or 300 and choose the config file accordingly");
 	}
 	bool gripperIsPresent;
 	int gripperOpenEncoders, gripperCloseEncoders;

kni-3.9.2-sofixes.patch:
 demo/Makefile       |   10 +++++-----
 src/Base/Makefile   |   13 ++++++++-----
 src/InvKin/Makefile |   14 +++++++++-----
 src/LM/Makefile     |   13 ++++++++-----
 src/common/Makefile |    4 ++--
 5 files changed, 32 insertions(+), 22 deletions(-)

--- NEW FILE kni-3.9.2-sofixes.patch ---
diff -urN KNI_3.9.2/demo/Makefile KNI_3.9.2.sofixes/demo/Makefile
--- KNI_3.9.2/demo/Makefile	2007-06-20 08:05:24.000000000 +0200
+++ KNI_3.9.2.sofixes/demo/Makefile	2009-08-28 22:09:05.000000000 +0200
@@ -34,11 +34,11 @@
 INCLUDE_DIR = ../include -I./common
 LIBRARY_DIR  = ../lib/linux
 
-BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase.a
-INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin.a
-LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM.a
+BASE_LIBRARY = $(LIBRARY_DIR)/libKNIBase3.a
+INVKIN_LIBRARY = $(LIBRARY_DIR)/libKNI_InvKin3.a
+LM_LIBRARY = $(LIBRARY_DIR)/libKNI_LM3.a
 
-AVAILABLE_LIBRARIES = ./common/keyboard.o ${BASE_LIBRARY} ${INVKIN_LIBRARY} ${LM_LIBRARY}
+AVAILABLE_LIBRARIES = ./common/keyboard.o
 
 .SILENT:
 
@@ -55,7 +55,7 @@
 
 $(TARGETS_D): $(CTARGETS_D)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
+	if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
 	then echo " [ok]"; \
 		cat .clog; \
 	else echo " [failed]"; \
diff -urN KNI_3.9.2/src/Base/Makefile KNI_3.9.2.sofixes/src/Base/Makefile
--- KNI_3.9.2/src/Base/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/Base/Makefile	2009-08-28 22:08:00.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNIBase
+LIBNAME = libKNIBase3
 SOURCES = cdlCOM.cpp cplSerial.cpp cdlSocket.cpp CRC.cpp kmlBase.cpp kmlExt.cpp kmlMotBase.cpp kmlSctBase.cpp kmlFactories.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS = -shared -L$(TARGET_DIR)
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/common/Makefile KNI_3.9.2.sofixes/src/common/Makefile
--- KNI_3.9.2/src/common/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/common/Makefile	2009-08-28 22:08:16.000000000 +0200
@@ -17,14 +17,14 @@
 #===========================================================================
 
 CXX		=	g++
-CXXFLAGS	+=	-g -O2 -Wall
+CXXFLAGS	+=	-g -O2 -Wall -fPIC
 
 MAJOR_VERSION	=	3.9
 MINOR_VERSION	=	0
 
 TARGETS		=	alib
 
-LIBNAME = knicommon
+LIBNAME = knicommon3
 SOURCES = Timer.cpp
 
 LIBNAME_A  = $(LIBNAME).a
diff -urN KNI_3.9.2/src/InvKin/Makefile KNI_3.9.2.sofixes/src/InvKin/Makefile
--- KNI_3.9.2/src/InvKin/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/InvKin/Makefile	2009-08-28 22:08:25.000000000 +0200
@@ -24,20 +24,23 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_InvKin
+LIBNAME = libKNI_InvKin3
 SOURCES = ikBase.cpp KatanaKinematics6M90G.cpp KatanaKinematics6M90T.cpp KatanaKinematics6M180.cpp KatanaKinematics5M180.cpp KatanaKinematicsDecisionAlgorithms.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3
+
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +72,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \
diff -urN KNI_3.9.2/src/LM/Makefile KNI_3.9.2.sofixes/src/LM/Makefile
--- KNI_3.9.2/src/LM/Makefile	2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.sofixes/src/LM/Makefile	2009-08-28 22:08:40.000000000 +0200
@@ -24,20 +24,22 @@
 
 TARGETS		=	alib solib
 
-LIBNAME = libKNI_LM
+LIBNAME = libKNI_LM3
 SOURCES = lmBase.cpp
 
 ADDITIONAL_DEPS = ../common/Timer.o
 
 LIBNAME_A  = $(LIBNAME).a
 LIBNAME_SO = $(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-
-SLCFLAGS=-fPIC
-SLLDFLAGS=-shared
+LIBNAME_SO_LN = $(LIBNAME).so
+LIBNAME_SONAME = $(LIBNAME).so.$(MAJOR_VERSION)
 
 INCLUDE_DIR = ../../include
 TARGET_DIR  = ../../lib/linux
 
+SLCFLAGS=-fPIC
+SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3 -lKNI_InvKin3
+
 .SILENT:
 
 .SUFFIXES: .cpp.o
@@ -69,8 +71,9 @@
 
 $(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
 	echo -n "Building: $@"
-	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ $(SOURCES:.cpp=.o) $(ADDITITIONAL_DEPS) 2>.slog; \
+	if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
 	then echo " [ok]"; \
+	     ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
 	     cat .slog; \
 	else echo " [failed]"; \
 	     cat .slog; \


--- NEW FILE libkni3.spec ---
Name:           libkni3
Version:        3.9.2
Release:        12%{?dist}
Summary:        C++ KNI library v3 for the Katana 300 robot arm

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.neuronics.ch/cms_de/web/index.php?id=386
Source0:        http://www.neuronics.ch/cms_de/mediabase/KNI_3.9.2.tar.gz
Patch0:         kni-3.9.2-gcc43.patch
Patch1:         kni-3.9.2-sofixes.patch
Patch2:         kni-3.9.2-ctor.patch
Patch3:         kni-3.9.2-noexit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen, graphviz
%if 0%{?fedora} >= 9
BuildRequires:  texlive-utils
%else
BuildRequires:  tetex
%endif

BuildRequires:  boost-devel

%description
Katana Native Interface is a C++ library for programmers who would like to
write their own programs, but don't want to implement the protocol and
device stuff katana is using.

This package contains the library for the Katana 300 series of the arm. For
newer robots use libkni (version 4 and above).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static libraries that can be used to
compile static binaries using %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation

%description    doc
This package contains the documentation for developing with %{name}.

%package        examples
Summary:        Example applications for %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}

%description    examples
This package contains demo applications for %{name}.

%prep
%setup -q -n KNI_%{version}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .sofixes
%patch2 -p1 -b .ctor
%patch3 -p1 -b .noexit


%build
make CFLAGS="%{optflags}"
make doc
echo "prefix=%{prefix}
exec_prefix=%{prefix}
libdir=%{_libdir}
includedir=%{_includedir}

Name: %{name}
Description: %{summary}
Version: %{version}
Libs: -L\${libdir} -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3
Cflags: -I\${includedir}/kni3" > libkni3.pc


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
mkdir -p %{buildroot}%{_libdir}
install -m 0644 -p lib/linux/*.a %{buildroot}%{_libdir}
install -p lib/linux/*.so.* %{buildroot}%{_libdir}
for f in `find %{buildroot}%{_libdir} -name '*.so.*.*.*'`; do
    ln -s `basename $f` %{buildroot}%{_libdir}/`echo \`basename $f\` | sed -e 's/\(\(.*\).so\)\(.*\)/\1/'`
    ln -s `basename $f` %{buildroot}%{_libdir}/`objdump --private-headers $f | grep SONAME | awk '{print $2}'`
done
mkdir -p %{buildroot}%{_bindir}
for f in `find demo/ -perm /a+x -type f`; do
    install -p $f %{buildroot}%{_bindir}/kni_`basename $f`
done
mkdir -p %{buildroot}%{_sysconfdir}/kni3
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd300
mkdir -p %{buildroot}%{_sysconfdir}/kni3/hd400
install -p -m 0644 configfiles300/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd300
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
mkdir -p %{buildroot}%{_includedir}/kni3
cp -a include/* %{buildroot}%{_includedir}/kni3
mkdir -p %{buildroot}%{_docdir}/%{name}-doc-%{version}
cp -a doc/html %{buildroot}%{_docdir}/%{name}-doc-%{version}
install -p -m 0644 doc/*.pdf %{buildroot}%{_docdir}/%{name}-doc-%{version}
find %{buildroot} -name '.svn' | xargs rm -rf
mkdir -p %{buildroot}%{_libdir}/pkgconfig
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE.txt readme.txt AUTHORS.txt
%{_libdir}/*.so.*
%dir %{_sysconfdir}/kni3
%dir %{_sysconfdir}/kni3/hd300
%dir %{_sysconfdir}/kni3/hd400
%config(noreplace)%{_sysconfdir}/kni3/*/*.cfg

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%files static
%defattr(-,root,root,-)
%{_libdir}/*.a

%files doc
%defattr(-, root, root, 0755)
%{_docdir}/%{name}-doc-%{version}

%files examples
%defattr(-, root, root, 0755)
%{_bindir}/kni_*


%changelog
* Mon Sep 14 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-12
- doc package contains doc dir, not docs

* Fri Aug 28 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-11
- Rename shared libs to allow parallel installation for libkni
- Merge all shared lib related patches to one sofixes patch

* Sat Jun 13 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-10
- Update ctor and gcc43 patch for F11

* Tue Jun 09 2009 Tim Niemueller <tim at niemueller.de> - 3.9.2-9
- Rename to libkni3, libkni will be the most up2date version (v4), but this
  version is still required for older Katana 300 arms
- Add patch to fix library building, did work on my machin only because libs
  were installed on the system

* Wed Dec 03 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-8
- Fix noexit patch

* Mon Dec 01 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-7
- Make patch 3 apply with fuzz=0
- Added patch that removes calls to exit() but throws exceptions

* Sun Nov 09 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-6
- Updated license tag
- Consistent (non-)macro usage

* Tue Jul 15 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-5
- Added ctor patch which adds an optional argument to the ctor to allow for
  accessing an arbitrary device, for example a usb2ser converter
  (RoboCup 2008)

* Mon Jun 23 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-4
- More .so fixes, link libs against base lib to get rid of
  undefined-non-weak-symbol rpmlint warnings

* Mon Jun 16 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-3
- Fixed summary

* Thu Jun 12 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-2
- Upgraded BR to support building on Fedora version < 9

* Sat Jun 07 2008 Tim Niemueller <tim at niemueller.de> - 3.9.2-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:03:12 -0000	1.1
+++ .cvsignore	14 Sep 2009 22:57:13 -0000	1.2
@@ -0,0 +1 @@
+KNI_3.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkni3/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:03:12 -0000	1.1
+++ sources	14 Sep 2009 22:57:15 -0000	1.2
@@ -0,0 +1 @@
+63b40f2c258f7ce2159b2471f4569165  KNI_3.9.2.tar.gz



From mclasen at fedoraproject.org  Mon Sep 14 23:13:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Sep 2009 23:13:46 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.128,1.129
Message-ID: <20090914231347.47B5911C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7545

Modified Files:
	gnome-keyring.spec 
Log Message:
2.27.92



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- gnome-keyring.spec	11 Aug 2009 04:14:31 -0000	1.128
+++ gnome-keyring.spec	14 Sep 2009 23:13:44 -0000	1.129
@@ -7,7 +7,7 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.27.90
+Version: 2.27.92
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -141,6 +141,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 



From rathann at fedoraproject.org  Mon Sep 14 23:20:20 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 23:20:20 +0000 (UTC)
Subject: rpms/xmp/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3 xmp.spec,1.2,1.3
Message-ID: <20090914232020.2450711C0489@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/xmp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16365

Modified Files:
	.cvsignore sources xmp.spec 
Log Message:
* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
- updated to 2.7.1
- dropped obsolete patch
- fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Nov 2008 16:52:31 -0000	1.2
+++ .cvsignore	14 Sep 2009 23:20:14 -0000	1.3
@@ -1 +1 @@
-xmp-2.5.1-free.tar.gz
+xmp-2.7.1-free.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Nov 2008 16:52:31 -0000	1.2
+++ sources	14 Sep 2009 23:20:15 -0000	1.3
@@ -1 +1 @@
-bf44830ae7d82adb346820024a02350e  xmp-2.5.1-free.tar.gz
+b80fef62b1326bb5f0f970348ed8306f  xmp-2.7.1-free.tar.gz


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-11/xmp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmp.spec	26 Feb 2009 10:30:34 -0000	1.2
+++ xmp.spec	14 Sep 2009 23:20:16 -0000	1.3
@@ -2,8 +2,8 @@
 %define xmms_input_plugin_dir %(xmms-config --input-plugin-dir)
 
 Name: xmp
-Version: 2.5.1
-Release: 4%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -92,6 +92,11 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
+- updated to 2.7.1
+- dropped obsolete patch
+- fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Sep 14 23:21:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Sep 2009 23:21:49 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore,1.64,1.65 sources,1.64,1.65
Message-ID: <20090914232149.7C96A11C0374@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17465

Modified Files:
	.cvsignore sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	11 Aug 2009 04:14:31 -0000	1.64
+++ .cvsignore	14 Sep 2009 23:21:47 -0000	1.65
@@ -1 +1 @@
-gnome-keyring-2.27.90.tar.bz2
+gnome-keyring-2.27.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	11 Aug 2009 04:14:31 -0000	1.64
+++ sources	14 Sep 2009 23:21:47 -0000	1.65
@@ -1 +1 @@
-0734f60d9f0eb3667244cdcf6b4b44fe  gnome-keyring-2.27.90.tar.bz2
+2680e94500f540247af9d89f6aa9270b  gnome-keyring-2.27.92.tar.bz2



From eseyman at fedoraproject.org  Mon Sep 14 23:22:28 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 14 Sep 2009 23:22:28 +0000 (UTC)
Subject: rpms/perl-Alien-SeleniumRC/devel .cvsignore, 1.2,
	1.3 perl-Alien-SeleniumRC.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090914232228.DC8EA11C0374@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18856

Modified Files:
	.cvsignore perl-Alien-SeleniumRC.spec sources 
Log Message:
Update 1.01


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Jun 2009 22:24:59 -0000	1.2
+++ .cvsignore	14 Sep 2009 23:22:26 -0000	1.3
@@ -1 +1 @@
-Alien-SeleniumRC-1.00.tar.gz
+Alien-SeleniumRC-1.01.tar.gz


Index: perl-Alien-SeleniumRC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel/perl-Alien-SeleniumRC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Alien-SeleniumRC.spec	26 Jul 2009 01:35:38 -0000	1.2
+++ perl-Alien-SeleniumRC.spec	14 Sep 2009 23:22:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Alien-SeleniumRC
-Version:        1.00
-Release:        2%{?dist}
+Version:        1.01
+Release:        1%{?dist}
 Summary:        Packages the Selenium Remote Control server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.01-1
+- Update to 1.01
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jun 2009 22:24:59 -0000	1.2
+++ sources	14 Sep 2009 23:22:26 -0000	1.3
@@ -1 +1 @@
-8dfe7a67b2246e6ceb85a912fd642687  Alien-SeleniumRC-1.00.tar.gz
+c182f197f828f05b9b587467fb66546e  Alien-SeleniumRC-1.01.tar.gz



From rdieter at fedoraproject.org  Mon Sep 14 23:23:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Sep 2009 23:23:21 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.22, 1.23 soprano.spec, 1.37,
	1.38 sources, 1.22,
	1.23 soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch, 1.1, NONE
Message-ID: <20090914232321.8672511C0374@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19601

Modified Files:
	.cvsignore soprano.spec sources 
Removed Files:
	soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch 
Log Message:
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
- soprano-2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	16 Jul 2009 19:20:41 -0000	1.22
+++ .cvsignore	14 Sep 2009 23:23:19 -0000	1.23
@@ -1 +1 @@
-soprano-2.3.0.tar.bz2
+soprano-2.3.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- soprano.spec	27 Jul 2009 04:35:22 -0000	1.37
+++ soprano.spec	14 Sep 2009 23:23:20 -0000	1.38
@@ -6,8 +6,8 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -16,9 +16,6 @@ Source0: http://downloads.sf.net/soprano
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch
-
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
 BuildRequires: kde-filesystem
@@ -64,12 +61,9 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
-%patch50 -p1 -b .cmake_DATA_INSTALL_DIR
-
 
 %build
 
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} \
@@ -113,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/cmake/modules/SopranoAddOntology.cmake
+%{_datadir}/soprano/cmake/
 %{_libdir}/libsoprano*.so
 %{_libdir}/pkgconfig/soprano.pc
 %{_includedir}/soprano/
@@ -127,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- soprano-2.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	16 Jul 2009 19:20:41 -0000	1.22
+++ sources	14 Sep 2009 23:23:20 -0000	1.23
@@ -1 +1 @@
-286d5d37c1d4f070527758e79706d1a7  soprano-2.3.0.tar.bz2
+c9a2c008b80cd5d76599e9d48139dfe9  soprano-2.3.1.tar.bz2


--- soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep 14 23:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:25:04 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has requested commit
Message-ID: <20090914232504.4025810F886@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-network (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 14 23:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:25:07 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has requested commit
Message-ID: <20090914232507.6E3A410F88C@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-network (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 14 23:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:25:09 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has requested commit
Message-ID: <20090914232509.7E84D10F896@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-network (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 14 23:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:25:27 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has given up commit
Message-ID: <20090914232528.1ED3310F883@bastion2.fedora.phx.redhat.com>

praveenp has given up the commit acl on sblim-cmpi-network (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 14 23:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:25:30 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has requested commit
Message-ID: <20090914232530.92C1B10F886@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-network (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 14 23:25:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:25:47 +0000
Subject: [pkgdb] sblim-cmpi-network: praveenp has requested commit
Message-ID: <20090914232548.034E210F883@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-network (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From rathann at fedoraproject.org  Mon Sep 14 23:29:39 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 23:29:39 +0000 (UTC)
Subject: rpms/xmp/F-11 xmp.spec,1.3,1.4
Message-ID: <20090914232940.047FC11C00EC@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/xmp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26472

Modified Files:
	xmp.spec 
Log Message:
drop unnecessary changelog entry (copy&paste error)



Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-11/xmp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmp.spec	14 Sep 2009 23:20:16 -0000	1.3
+++ xmp.spec	14 Sep 2009 23:29:39 -0000	1.4
@@ -94,7 +94,6 @@ rm -rf %{buildroot}
 %changelog
 * Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
 - updated to 2.7.1
-- dropped obsolete patch
 - fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-4



From bpepple at fedoraproject.org  Mon Sep 14 23:32:04 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Sep 2009 23:32:04 +0000 (UTC)
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 telepathy-butterfly.spec, 1.17, 1.18
Message-ID: <20090914233205.1122211C0375@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29681

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 Aug 2009 02:41:30 -0000	1.11
+++ .cvsignore	14 Sep 2009 23:32:02 -0000	1.12
@@ -1 +1 @@
-telepathy-butterfly-0.5.0.tar.gz
+telepathy-butterfly-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Aug 2009 02:41:30 -0000	1.11
+++ sources	14 Sep 2009 23:32:04 -0000	1.12
@@ -1 +1 @@
-8c55e6446ec40924a655502a66ba6b47  telepathy-butterfly-0.5.0.tar.gz
+80adcd8acb9564f25b865d92914d62d4  telepathy-butterfly-0.5.1.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- telepathy-butterfly.spec	15 Aug 2009 02:41:30 -0000	1.17
+++ telepathy-butterfly.spec	14 Sep 2009 23:32:04 -0000	1.18
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.5.0
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -18,8 +18,8 @@ BuildRequires:	dbus-devel
 BuildRequires:	python-devel
 BuildRequires:	pkgconfig
 
-Requires:	python-telepathy >= 0.15.9
-Requires:	papyon >= 0.4.1
+Requires:	python-telepathy >= 0.15.11
+Requires:	papyon >= 0.4.2
 Requires:	dbus
 Requires:	telepathy-filesystem
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+
 * Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Actually upload the tarball.
 



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:01 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested commit
Message-ID: <20090914233501.277AD10F880@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-devel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:05 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested watchcommits
Message-ID: <20090914233505.AE1A610F88C@bastion2.fedora.phx.redhat.com>

praveenp has requested the watchcommits acl on sblim-cmpi-devel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:18 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested watchcommits
Message-ID: <20090914233518.4384E10F894@bastion2.fedora.phx.redhat.com>

praveenp has requested the watchcommits acl on sblim-cmpi-devel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:19 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested commit
Message-ID: <20090914233519.EF43010F898@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-devel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:25 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has given up commit
Message-ID: <20090914233525.1A0D310F886@bastion2.fedora.phx.redhat.com>

praveenp has given up the commit acl on sblim-cmpi-devel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:27 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has given up watchcommits
Message-ID: <20090914233527.890E110F89C@bastion2.fedora.phx.redhat.com>

praveenp has given up the watchcommits acl on sblim-cmpi-devel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:30 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested watchcommits
Message-ID: <20090914233530.DEBD010F89D@bastion2.fedora.phx.redhat.com>

praveenp has requested the watchcommits acl on sblim-cmpi-devel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:35 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested commit
Message-ID: <20090914233535.B1C3710F894@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-devel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:37 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested watchcommits
Message-ID: <20090914233537.AAEBC10F8A1@bastion2.fedora.phx.redhat.com>

praveenp has requested the watchcommits acl on sblim-cmpi-devel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 14 23:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:35:38 +0000
Subject: [pkgdb] sblim-cmpi-devel: praveenp has requested commit
Message-ID: <20090914233538.DE5E410F8A3@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-devel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From mclasen at fedoraproject.org  Mon Sep 14 23:35:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Sep 2009 23:35:59 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.31, 1.32 seahorse.spec, 1.79,
	1.80 sources, 1.33, 1.34
Message-ID: <20090914233559.B091911C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32730

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	11 Aug 2009 04:12:54 -0000	1.31
+++ .cvsignore	14 Sep 2009 23:35:57 -0000	1.32
@@ -1 +1 @@
-seahorse-2.27.90.tar.bz2
+seahorse-2.27.92.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- seahorse.spec	27 Aug 2009 01:57:08 -0000	1.79
+++ seahorse.spec	14 Sep 2009 23:35:57 -0000	1.80
@@ -1,6 +1,6 @@
 Name: 		seahorse
-Version: 	2.27.90
-Release:        2%{?dist}
+Version: 	2.27.92
+Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -10,9 +10,6 @@ URL:            http://projects.gnome.or
 Source:         http://download.gnome.org/sources/seahorse/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=593247
-Patch0:		seahorse-button-images.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
@@ -62,7 +59,6 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
-%patch0 -p1 -b .button-images
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -167,6 +163,9 @@ fi
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
+- Update to 2.27.92
+
 * Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-2
 - Make seahorse respect the button-images setting
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	11 Aug 2009 04:12:54 -0000	1.33
+++ sources	14 Sep 2009 23:35:58 -0000	1.34
@@ -1 +1 @@
-f93e734d5d778ff19585696ccce65458  seahorse-2.27.90.tar.bz2
+6bb39999af3e4aee4450aac8a7d4a622  seahorse-2.27.92.tar.bz2



From rathann at fedoraproject.org  Mon Sep 14 23:38:05 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 14 Sep 2009 23:38:05 +0000 (UTC)
Subject: rpms/xmp/F-10 .cvsignore,1.2,1.3 sources,1.2,1.3 xmp.spec,1.1,1.2
Message-ID: <20090914233805.355B811C00EC@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/xmp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1839

Modified Files:
	.cvsignore sources xmp.spec 
Log Message:
* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
- updated to 2.7.1
- fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Nov 2008 23:53:43 -0000	1.2
+++ .cvsignore	14 Sep 2009 23:38:03 -0000	1.3
@@ -1 +1 @@
-xmp-2.5.1-free.tar.gz
+xmp-2.7.1-free.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Nov 2008 23:53:44 -0000	1.2
+++ sources	14 Sep 2009 23:38:04 -0000	1.3
@@ -1 +1 @@
-bf44830ae7d82adb346820024a02350e  xmp-2.5.1-free.tar.gz
+b80fef62b1326bb5f0f970348ed8306f  xmp-2.7.1-free.tar.gz


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/F-10/xmp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmp.spec	16 Nov 2008 23:53:44 -0000	1.1
+++ xmp.spec	14 Sep 2009 23:38:04 -0000	1.2
@@ -2,8 +2,8 @@
 %define xmms_input_plugin_dir %(xmms-config --input-plugin-dir)
 
 Name: xmp
-Version: 2.5.1
-Release: 3%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -92,6 +92,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
+- updated to 2.7.1
+- fixes CVE-2007-6731 (rhbz#523138) and CVE-2007-6732 (rhbz#523147)
+
 * Mon Oct 13 2008 Dominik Mierzejewski <rpm at greysector.net> 2.5.1-3
 - add a script to create the free tarball
 - drop workaround for missing audacious-devel Requires:



From pkgdb at fedoraproject.org  Mon Sep 14 23:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Sep 2009 23:40:11 +0000
Subject: [pkgdb] comps-extras ownership updated
Message-ID: <20090914234011.6E15A10F851@bastion2.fedora.phx.redhat.com>

Package comps-extras in Fedora devel was orphaned by katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/comps-extras



From bpepple at fedoraproject.org  Mon Sep 14 23:45:57 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Sep 2009 23:45:57 +0000 (UTC)
Subject: rpms/empathy/devel empathy-video-widget.patch, NONE,
	1.1 empathy.spec, 1.76, 1.77
Message-ID: <20090914234557.AE20E11C00EC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8529

Modified Files:
	empathy.spec 
Added Files:
	empathy-video-widget.patch 
Log Message:
* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-2
- Back-port patch to prevent video widget from crashing.


empathy-video-widget.patch:
 empathy-video-widget.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE empathy-video-widget.patch ---
>From ddcb7848002b70bc8950d45a9079582a8787c394 Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley at collabora.co.uk>
Date: Mon, 14 Sep 2009 11:33:06 +1000
Subject: [PATCH] [EmpathyVideoWidget] fix X crash when using Empathy with GTK+ c-s-w

In client-side-windows enabled GTK+, a call to GDK_WINDOW_XID() implicitly calls
gdk_window_ensure_native() so that a native X11 window exists serverside to
have an XID for.

Calling gdk_window_ensure_native() from a thread is not awesome and causes
Empathy to abort with one of several X errors. The fix is to call
GDK_WINDOW_XID() as soon as the widget is realized, before the XID is requested
from a thread (it would be neater to call gdk_window_ensure_native() here,
but that would force us to require GTK+ 2.18, which we don't want to do).

Fixes gnome bug #594890
---
 libempathy-gtk/empathy-video-widget.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/libempathy-gtk/empathy-video-widget.c b/libempathy-gtk/empathy-video-widget.c
index 0f62496..915aa33 100644
--- a/libempathy-gtk/empathy-video-widget.c
+++ b/libempathy-gtk/empathy-video-widget.c
@@ -100,12 +100,25 @@ empathy_video_widget_init (EmpathyVideoWidget *obj)
 }
 
 static void
+empathy_video_widget_realized (GtkWidget *widget, gpointer user_data)
+{
+  /* requesting the XID forces the GdkWindow to be native in GTK+ 2.18
+   * onwards, requesting the native window in a thread causes a BadWindowID,
+   * so we need to request it now. We could call gdk_window_ensure_native(),
+   * but that would mean we require GTK+ 2.18, so instead we call this */
+  GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (widget)));
+}
+
+static void
 empathy_video_widget_constructed (GObject *object)
 {
   EmpathyVideoWidgetPriv *priv = GET_PRIV (object);
   GstElement *colorspace, *videoscale, *sink;
   GstPad *pad;
 
+  g_signal_connect (object, "realize",
+      G_CALLBACK (empathy_video_widget_realized), NULL);
+
   priv->videosink = gst_bin_new (NULL);
 
   gst_object_ref (priv->videosink);
-- 
1.6.4.2



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- empathy.spec	8 Sep 2009 17:13:28 -0000	1.76
+++ empathy.spec	14 Sep 2009 23:45:54 -0000	1.77
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,9 @@ Source1:	%{name}-README.ConnectionManage
 Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
+# Backported patch to fix crash with video widget.
+# http://bugzilla.gnome.org/show_bug.cgi?id=594890
+Patch4:		%{name}-video-widget.patch
 Patch5:		%{name}-broken-nm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -136,6 +139,7 @@ bindings to the libempathy and libempath
 %setup -q
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
+%patch4 -p1 -b .video
 %patch5 -p1 -b .nm
 
 # force these to be regenerated
@@ -245,6 +249,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-2
+- Back-port patch to prevent video widget from crashing.
+
 * Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-1
 - Update to 2.27.92.
 - Drop desktop category patch.  Fixed upstream.



From jkeating at fedoraproject.org  Tue Sep 15 00:11:45 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 15 Sep 2009 00:11:45 +0000 (UTC)
Subject: rpms/pungi/devel .cvsignore, 1.67, 1.68 import.log, 1.18,
	1.19 pungi.spec, 1.75, 1.76 sources, 1.70, 1.71
Message-ID: <20090915001145.1AE0611C0489@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7823/devel

Modified Files:
	.cvsignore import.log pungi.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	10 Aug 2009 22:02:36 -0000	1.67
+++ .cvsignore	15 Sep 2009 00:11:43 -0000	1.68
@@ -1 +1 @@
-pungi-2.0.17.tar.bz2
+pungi-2.0.18.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- import.log	10 Aug 2009 22:02:36 -0000	1.18
+++ import.log	15 Sep 2009 00:11:43 -0000	1.19
@@ -16,3 +16,4 @@ pungi-2_0_14-1_fc11:HEAD:pungi-2.0.14-1.
 pungi-2_0_15-1_fc11:HEAD:pungi-2.0.15-1.fc11.src.rpm:1242758222
 pungi-2_0_16-1_fc11:HEAD:pungi-2.0.16-1.fc11.src.rpm:1242927301
 pungi-2_0_17-1_fc11:HEAD:pungi-2.0.17-1.fc11.src.rpm:1249941703
+pungi-2_0_18-1_fc12:HEAD:pungi-2.0.18-1.fc12.src.rpm:1252973400


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pungi.spec	10 Aug 2009 22:02:36 -0000	1.75
+++ pungi.spec	15 Sep 2009 00:11:44 -0000	1.76
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.17
+Version:        2.0.18
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -45,7 +45,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc Authors Changelog COPYING GPL ToDo doc/README
 # For noarch packages: sitelib
 %{python_sitelib}/pypungi
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
   %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
 %endif
 %{_bindir}/pungi
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Jesse Keating <jkeating at redhat.com> - 2.0.18-1
+- Search for dracut for pkgorder
+
 * Mon Aug 10 2009 Jesse Keating <jkeating at redhat.com> - 2.0.17-1
 - Fix pkgorder to not conflict with yum internals.
 - Remove dead code from splittree


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	10 Aug 2009 22:02:36 -0000	1.70
+++ sources	15 Sep 2009 00:11:44 -0000	1.71
@@ -1 +1 @@
-ddda59bb1eaaa9ae82818c0d598ba340  pungi-2.0.17.tar.bz2
+fa3d49efb95c12f937aee263502def72  pungi-2.0.18.tar.bz2



From whot at fedoraproject.org  Tue Sep 15 00:46:02 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 15 Sep 2009 00:46:02 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.74, 1.75 sources, 1.69,
	1.70 xorg-x11-server.spec, 1.484,
	1.485 xserver-1.4.99-document-fontpath-correctly.patch, 1.2, NONE
Message-ID: <20090915004603.2012511C00EC@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18538

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.4.99-document-fontpath-correctly.patch 
Log Message:
* Mon Sep 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.901-1
- xserver 1.6.99.901 
- Re-enable Xdmx
- xserver-1.4.99-document-fontpath-correctly.patch: Drop



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	7 Sep 2009 05:54:49 -0000	1.74
+++ .cvsignore	15 Sep 2009 00:46:01 -0000	1.75
@@ -1 +1 @@
-xorg-server-1.6.99.900.tar.bz2
+xorg-server-1.6.99.901.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	7 Sep 2009 05:54:50 -0000	1.69
+++ sources	15 Sep 2009 00:46:01 -0000	1.70
@@ -1 +1 @@
-e12b367b44e27def991f4542d85a9c63  xorg-server-1.6.99.900.tar.bz2
+f30ecd48ae45f5bbe62fd17e81ee28c3  xorg-server-1.6.99.901.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -p -r1.484 -r1.485
--- xorg-x11-server.spec	8 Sep 2009 18:10:23 -0000	1.484
+++ xorg-x11-server.spec	15 Sep 2009 00:46:01 -0000	1.485
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.99.900
-Release:   2%{?dist}
+Version:   1.6.99.901
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -52,7 +52,6 @@ Patch5: xserver-1.4.99-pic-libxf86config
 Patch103:  xserver-1.5.0-bg-none-root.patch
 Patch104:  dri2-page-flip.patch
 
-Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
 # Trivial things to never merge upstream ever:
@@ -96,7 +95,6 @@ Patch6033: xserver-1.6.99-default-modes.
 %endif
 
 %define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
-# XXX dmx
 %define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
 
 BuildRequires: git-core
@@ -203,7 +201,6 @@ but it is an X server itself in which yo
 is a very useful tool for developers who wish to test their
 applications without running them on their real X server.
 
-%if 0
 %package Xdmx
 Summary: Distributed Multihead X Server and utilities
 Group: User Interface/X
@@ -220,7 +217,6 @@ for Xdmx would be to provide multi-head 
 each of which has a single display device attached to it.  A complex
 application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
 (each attached to one of 16 computers) into a unified 5120x4096 display.
-%endif
 
 %package Xvfb
 Summary: A X Windows System virtual framebuffer X server.
@@ -456,7 +452,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Xnest
 %{_mandir}/man1/Xnest.1*
 
-%if 0
 %files Xdmx
 %defattr(-,root,root,-)
 %{_bindir}/Xdmx
@@ -475,7 +470,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dmxtodmx.1*
 %{_mandir}/man1/vdltodmx.1*
 %{_mandir}/man1/xdmxconfig.1*
-%endif
 
 %files Xvfb
 %defattr(-,root,root,-)
@@ -506,6 +500,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Sep 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.901-1
+- xserver 1.6.99.901 
+- Re-enable Xdmx
+- xserver-1.4.99-document-fontpath-correctly.patch: Drop
+
 * Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 1.6.99.900-2
 - Fix -source subtree to not include generated C files from hw/xfree86.
   Actually, just remove all C files from hw/xfree86 in -source, since we


--- xserver-1.4.99-document-fontpath-correctly.patch DELETED ---



From mclasen at fedoraproject.org  Tue Sep 15 00:52:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Sep 2009 00:52:07 +0000 (UTC)
Subject: rpms/seahorse/devel seahorse.spec,1.80,1.81
Message-ID: <20090915005207.746D711C0375@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28743

Modified Files:
	seahorse.spec 
Log Message:
fix file lists



Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- seahorse.spec	14 Sep 2009 23:35:57 -0000	1.80
+++ seahorse.spec	15 Sep 2009 00:52:05 -0000	1.81
@@ -161,6 +161,7 @@ fi
 %{_includedir}/libcryptui
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 %{_datadir}/gtk-doc/html/libcryptui
+%{_datadir}/gtk-doc/html/libseahorse
 
 %changelog
 * Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1



From pkgdb at fedoraproject.org  Tue Sep 15 00:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 00:59:01 +0000
Subject: [pkgdb] libtevent was added for simo
Message-ID: <20090915005901.2E97B10F87D@bastion2.fedora.phx.redhat.com>

ausil has added Package libtevent with summary Tevent is an event system based on the talloc memory management library.
ausil has approved Package libtevent
ausil has added a Fedora devel branch for libtevent with an owner of simo
ausil has approved libtevent in Fedora devel
ausil has approved Package libtevent
ausil has set commit to Approved for 107427 on libtevent (Fedora devel)
ausil has set checkout to Approved for 107427 on libtevent (Fedora devel)
ausil has set build to Approved for 107427 on libtevent (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtevent



From pkgdb at fedoraproject.org  Tue Sep 15 00:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 00:59:02 +0000
Subject: [pkgdb] libtevent summary updated by ausil
Message-ID: <20090915005902.6871810F886@bastion2.fedora.phx.redhat.com>

ausil set package libtevent summary to Tevent is an event system based on the talloc memory management library.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtevent



From pkgdb at fedoraproject.org  Tue Sep 15 00:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 00:59:02 +0000
Subject: [pkgdb] libtevent (Fedora, 11) updated by ausil
Message-ID: <20090915005902.76E0810F894@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on libtevent (Fedora devel) for gd
ausil approved watchcommits on libtevent (Fedora devel) for gd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtevent



From pkgdb at fedoraproject.org  Tue Sep 15 00:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 00:59:02 +0000
Subject: [pkgdb] libtevent (Fedora, 11) updated by ausil
Message-ID: <20090915005902.805CD10F898@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for libtevent
ausil has set commit to Approved for 107427 on libtevent (Fedora 11)
ausil has set checkout to Approved for 107427 on libtevent (Fedora 11)
ausil has set build to Approved for 107427 on libtevent (Fedora 11)
ausil approved watchbugzilla on libtevent (Fedora 11) for gd
ausil approved watchcommits on libtevent (Fedora 11) for gd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtevent



From ausil at fedoraproject.org  Tue Sep 15 00:59:42 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 00:59:42 +0000 (UTC)
Subject: rpms/libtevent - New directory
Message-ID: <20090915005942.9C35D11C00EC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libtevent
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsRf3655/rpms/libtevent

Log Message:
Directory /cvs/pkgs/rpms/libtevent added to the repository




From ausil at fedoraproject.org  Tue Sep 15 00:59:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 00:59:43 +0000 (UTC)
Subject: rpms/libtevent/devel - New directory
Message-ID: <20090915005943.120C711C0375@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsRf3655/rpms/libtevent/devel

Log Message:
Directory /cvs/pkgs/rpms/libtevent/devel added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:00:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:00:22 +0000 (UTC)
Subject: rpms/libtevent Makefile,NONE,1.1
Message-ID: <20090915010022.6EC6E11C0489@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libtevent
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsRf3655/rpms/libtevent

Added Files:
	Makefile 
Log Message:
Setup of module libtevent


--- NEW FILE Makefile ---
# Top level Makefile for module libtevent
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  Tue Sep 15 01:00:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:00:25 +0000 (UTC)
Subject: rpms/libtevent/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090915010025.32CD111C0489@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsRf3655/rpms/libtevent/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtevent


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libtevent
# $Id: Makefile,v 1.1 2009/09/15 01:00:22 ausil Exp $
NAME := libtevent
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  Tue Sep 15 01:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:01:03 +0000
Subject: [pkgdb] ath_info was added for michich
Message-ID: <20090915010103.3DF1110F883@bastion2.fedora.phx.redhat.com>

ausil has added Package ath_info with summary Tool to get detailed information from Atheros WLAN cards
ausil has approved Package ath_info
ausil has added a Fedora devel branch for ath_info with an owner of michich
ausil has approved ath_info in Fedora devel
ausil has approved Package ath_info
ausil has set commit to Approved for 107427 on ath_info (Fedora devel)
ausil has set checkout to Approved for 107427 on ath_info (Fedora devel)
ausil has set build to Approved for 107427 on ath_info (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ath_info



From pkgdb at fedoraproject.org  Tue Sep 15 01:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:01:18 +0000
Subject: [pkgdb] ath_info summary updated by ausil
Message-ID: <20090915010118.B869510F898@bastion2.fedora.phx.redhat.com>

ausil set package ath_info summary to Tool to get detailed information from Atheros WLAN cards

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ath_info



From pkgdb at fedoraproject.org  Tue Sep 15 01:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:01:18 +0000
Subject: [pkgdb] ath_info (Fedora EPEL, 5) updated by ausil
Message-ID: <20090915010118.D1CCB10F89C@bastion2.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for ath_info
ausil has set commit to Approved for 107427 on ath_info (Fedora EPEL 5)
ausil has set checkout to Approved for 107427 on ath_info (Fedora EPEL 5)
ausil has set build to Approved for 107427 on ath_info (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ath_info



From pkgdb at fedoraproject.org  Tue Sep 15 01:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:01:18 +0000
Subject: [pkgdb] ath_info (Fedora EPEL, 5) updated by ausil
Message-ID: <20090915010119.259D110F8A1@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for ath_info
ausil has set commit to Approved for 107427 on ath_info (Fedora 10)
ausil has set checkout to Approved for 107427 on ath_info (Fedora 10)
ausil has set build to Approved for 107427 on ath_info (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ath_info



From pkgdb at fedoraproject.org  Tue Sep 15 01:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:01:18 +0000
Subject: [pkgdb] ath_info (Fedora EPEL, 5) updated by ausil
Message-ID: <20090915010119.3821310F8A3@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for ath_info
ausil has set commit to Approved for 107427 on ath_info (Fedora 11)
ausil has set checkout to Approved for 107427 on ath_info (Fedora 11)
ausil has set build to Approved for 107427 on ath_info (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ath_info



From ausil at fedoraproject.org  Tue Sep 15 01:02:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:02:24 +0000 (UTC)
Subject: rpms/ath_info - New directory
Message-ID: <20090915010224.90EA511C0374@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ath_info
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZi6347/rpms/ath_info

Log Message:
Directory /cvs/pkgs/rpms/ath_info added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:02:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:02:25 +0000 (UTC)
Subject: rpms/ath_info/devel - New directory
Message-ID: <20090915010225.BBF3011C0374@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ath_info/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZi6347/rpms/ath_info/devel

Log Message:
Directory /cvs/pkgs/rpms/ath_info/devel added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:03:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:03:24 +0000 (UTC)
Subject: rpms/ath_info Makefile,NONE,1.1
Message-ID: <20090915010324.A75FE11C0489@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ath_info
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZi6347/rpms/ath_info

Added Files:
	Makefile 
Log Message:
Setup of module ath_info


--- NEW FILE Makefile ---
# Top level Makefile for module ath_info
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  Tue Sep 15 01:03:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:03:26 +0000 (UTC)
Subject: rpms/ath_info/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090915010326.9A41411C0489@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ath_info/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZi6347/rpms/ath_info/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ath_info


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ath_info
# $Id: Makefile,v 1.1 2009/09/15 01:03:25 ausil Exp $
NAME := ath_info
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  Tue Sep 15 01:08:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:08:34 +0000
Subject: [pkgdb] rfkill was added for linville
Message-ID: <20090915010834.BA8FE10F880@bastion2.fedora.phx.redhat.com>

ausil has added Package rfkill with summary A tool to query the state of RF kill interfaces
ausil has approved Package rfkill
ausil has added a Fedora devel branch for rfkill with an owner of linville
ausil has approved rfkill in Fedora devel
ausil has approved Package rfkill
ausil has set commit to Approved for 107427 on rfkill (Fedora devel)
ausil has set checkout to Approved for 107427 on rfkill (Fedora devel)
ausil has set build to Approved for 107427 on rfkill (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rfkill



From pkgdb at fedoraproject.org  Tue Sep 15 01:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:08:36 +0000
Subject: [pkgdb] rfkill summary updated by ausil
Message-ID: <20090915010836.6324B10F888@bastion2.fedora.phx.redhat.com>

ausil set package rfkill summary to A tool to query the state of RF kill interfaces

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rfkill



From pkgdb at fedoraproject.org  Tue Sep 15 01:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:08:36 +0000
Subject: [pkgdb] rfkill (Fedora, 11) updated by ausil
Message-ID: <20090915010836.6D5E510F895@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on rfkill (Fedora devel) for linville
ausil approved watchcommits on rfkill (Fedora devel) for linville

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rfkill



From pkgdb at fedoraproject.org  Tue Sep 15 01:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:08:36 +0000
Subject: [pkgdb] rfkill (Fedora, 11) updated by ausil
Message-ID: <20090915010836.7555C10F89A@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for rfkill
ausil has set commit to Approved for 107427 on rfkill (Fedora 11)
ausil has set checkout to Approved for 107427 on rfkill (Fedora 11)
ausil has set build to Approved for 107427 on rfkill (Fedora 11)
ausil approved watchbugzilla on rfkill (Fedora 11) for linville
ausil approved watchcommits on rfkill (Fedora 11) for linville

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rfkill



From ausil at fedoraproject.org  Tue Sep 15 01:09:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:09:14 +0000 (UTC)
Subject: rpms/rfkill - New directory
Message-ID: <20090915010914.0F14A11C00EC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rfkill
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsN13311/rpms/rfkill

Log Message:
Directory /cvs/pkgs/rpms/rfkill added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:09:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:09:14 +0000 (UTC)
Subject: rpms/rfkill/devel - New directory
Message-ID: <20090915010914.9480F11C0375@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rfkill/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsN13311/rpms/rfkill/devel

Log Message:
Directory /cvs/pkgs/rpms/rfkill/devel added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:09:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:09:43 +0000 (UTC)
Subject: rpms/rfkill/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090915010943.116C411C00EC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rfkill/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsN13311/rpms/rfkill/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rfkill


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rfkill
# $Id: Makefile,v 1.1 2009/09/15 01:09:42 ausil Exp $
NAME := rfkill
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 ausil at fedoraproject.org  Tue Sep 15 01:09:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:09:41 +0000 (UTC)
Subject: rpms/rfkill Makefile,NONE,1.1
Message-ID: <20090915010941.C2EE711C00EC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rfkill
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsN13311/rpms/rfkill

Added Files:
	Makefile 
Log Message:
Setup of module rfkill


--- NEW FILE Makefile ---
# Top level Makefile for module rfkill
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  Tue Sep 15 01:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:11:55 +0000
Subject: [pkgdb] wipe EL-4 cloned from devel
Message-ID: <20090915011156.0B12710F87D@bastion2.fedora.phx.redhat.com>

ausil cloned wipe EL-4 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wipe



From pkgdb at fedoraproject.org  Tue Sep 15 01:11:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:11:57 +0000
Subject: [pkgdb] wipe EL-5 cloned from devel
Message-ID: <20090915011158.0BED510F886@bastion2.fedora.phx.redhat.com>

ausil cloned wipe EL-5 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wipe



From pkgdb at fedoraproject.org  Tue Sep 15 01:13:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:13:48 +0000
Subject: [pkgdb] bind F-12 cloned from devel
Message-ID: <20090915011348.9F0F110F867@bastion2.fedora.phx.redhat.com>

ausil cloned bind F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind



From pkgdb at fedoraproject.org  Tue Sep 15 01:14:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:14:44 +0000
Subject: [pkgdb] bind F-12 cloned from devel
Message-ID: <20090915011444.604CF10F867@bastion2.fedora.phx.redhat.com>

ausil cloned bind F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bind



From pkgdb at fedoraproject.org  Tue Sep 15 01:19:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:19:14 +0000
Subject: [pkgdb] gprof2dot was added for toshio
Message-ID: <20090915011914.9DDFD10F880@bastion2.fedora.phx.redhat.com>

ausil has added Package gprof2dot with summary Generate dot graphs from the output of several profilers
ausil has approved Package gprof2dot
ausil has added a Fedora devel branch for gprof2dot with an owner of toshio
ausil has approved gprof2dot in Fedora devel
ausil has approved Package gprof2dot
ausil has set commit to Approved for 107427 on gprof2dot (Fedora devel)
ausil has set checkout to Approved for 107427 on gprof2dot (Fedora devel)
ausil has set build to Approved for 107427 on gprof2dot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gprof2dot



From pkgdb at fedoraproject.org  Tue Sep 15 01:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:19:15 +0000
Subject: [pkgdb] gprof2dot summary updated by ausil
Message-ID: <20090915011915.D368710F88C@bastion2.fedora.phx.redhat.com>

ausil set package gprof2dot summary to Generate dot graphs from the output of several profilers

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gprof2dot



From pkgdb at fedoraproject.org  Tue Sep 15 01:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:19:15 +0000
Subject: [pkgdb] gprof2dot (Fedora EPEL, 5) updated by ausil
Message-ID: <20090915011915.DEA7110F895@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for gprof2dot
ausil has set commit to Approved for 107427 on gprof2dot (Fedora 11)
ausil has set checkout to Approved for 107427 on gprof2dot (Fedora 11)
ausil has set build to Approved for 107427 on gprof2dot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gprof2dot



From pkgdb at fedoraproject.org  Tue Sep 15 01:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:19:15 +0000
Subject: [pkgdb] gprof2dot (Fedora EPEL, 5) updated by ausil
Message-ID: <20090915011915.E94FF10F89B@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for gprof2dot
ausil has set commit to Approved for 107427 on gprof2dot (Fedora 10)
ausil has set checkout to Approved for 107427 on gprof2dot (Fedora 10)
ausil has set build to Approved for 107427 on gprof2dot (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gprof2dot



From pkgdb at fedoraproject.org  Tue Sep 15 01:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:19:15 +0000
Subject: [pkgdb] gprof2dot (Fedora EPEL, 5) updated by ausil
Message-ID: <20090915011915.EFB7910F89D@bastion2.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for gprof2dot
ausil has set commit to Approved for 107427 on gprof2dot (Fedora EPEL 5)
ausil has set checkout to Approved for 107427 on gprof2dot (Fedora EPEL 5)
ausil has set build to Approved for 107427 on gprof2dot (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gprof2dot



From ausil at fedoraproject.org  Tue Sep 15 01:20:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:20:06 +0000 (UTC)
Subject: rpms/gprof2dot - New directory
Message-ID: <20090915012006.47AC411C048A@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gprof2dot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk24272/rpms/gprof2dot

Log Message:
Directory /cvs/pkgs/rpms/gprof2dot added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:20:07 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:20:07 +0000 (UTC)
Subject: rpms/gprof2dot/devel - New directory
Message-ID: <20090915012007.A316511C048A@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gprof2dot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk24272/rpms/gprof2dot/devel

Log Message:
Directory /cvs/pkgs/rpms/gprof2dot/devel added to the repository




From xulchris at fedoraproject.org  Tue Sep 15 01:20:46 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:20:46 +0000 (UTC)
Subject: rpms/php-pear-Validate/EL-5 .cvsignore, 1.4,
	1.5 php-pear-Validate.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090915012046.E3DEB11C0425@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Validate/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250/EL-5

Modified Files:
	.cvsignore php-pear-Validate.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Feb 2008 03:16:13 -0000	1.4
+++ .cvsignore	15 Sep 2009 01:20:45 -0000	1.5
@@ -1 +1 @@
-Validate-0.8.1.tgz
+Validate-0.8.2.tgz


Index: php-pear-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/EL-5/php-pear-Validate.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Validate.spec	21 Feb 2008 03:16:13 -0000	1.3
+++ php-pear-Validate.spec	15 Sep 2009 01:20:46 -0000	1.4
@@ -2,7 +2,7 @@
 %define ClassName Validate
 
 Name:           php-pear-Validate
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Validation Class for Various Data Types
 
@@ -83,6 +83,15 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 0.8.2-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 20 2008 Christopher Stone <chris.stone at gmail.com> 0.8.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Feb 2008 03:16:13 -0000	1.4
+++ sources	15 Sep 2009 01:20:46 -0000	1.5
@@ -1 +1 @@
-d3bc3cd1186794da23e8f4cd2f6b0c35  Validate-0.8.1.tgz
+769dfcc329ae7f42f9d874fc7baec4a1  Validate-0.8.2.tgz



From xulchris at fedoraproject.org  Tue Sep 15 01:20:47 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:20:47 +0000 (UTC)
Subject: rpms/php-pear-Validate/F-10 .cvsignore, 1.4,
	1.5 php-pear-Validate.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090915012047.C49E911C0425@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Validate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250/F-10

Modified Files:
	.cvsignore php-pear-Validate.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Feb 2008 03:16:45 -0000	1.4
+++ .cvsignore	15 Sep 2009 01:20:46 -0000	1.5
@@ -1 +1 @@
-Validate-0.8.1.tgz
+Validate-0.8.2.tgz


Index: php-pear-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/F-10/php-pear-Validate.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Validate.spec	21 Feb 2008 03:16:45 -0000	1.3
+++ php-pear-Validate.spec	15 Sep 2009 01:20:46 -0000	1.4
@@ -2,7 +2,7 @@
 %define ClassName Validate
 
 Name:           php-pear-Validate
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Validation Class for Various Data Types
 
@@ -83,6 +83,15 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 0.8.2-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 20 2008 Christopher Stone <chris.stone at gmail.com> 0.8.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Feb 2008 03:16:45 -0000	1.4
+++ sources	15 Sep 2009 01:20:46 -0000	1.5
@@ -1 +1 @@
-d3bc3cd1186794da23e8f4cd2f6b0c35  Validate-0.8.1.tgz
+769dfcc329ae7f42f9d874fc7baec4a1  Validate-0.8.2.tgz



From xulchris at fedoraproject.org  Tue Sep 15 01:20:50 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:20:50 +0000 (UTC)
Subject: rpms/php-pear-Validate/F-11 .cvsignore, 1.4,
	1.5 php-pear-Validate.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090915012050.4A2D911C0425@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Validate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250/F-11

Modified Files:
	.cvsignore php-pear-Validate.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Feb 2008 03:16:45 -0000	1.4
+++ .cvsignore	15 Sep 2009 01:20:47 -0000	1.5
@@ -1 +1 @@
-Validate-0.8.1.tgz
+Validate-0.8.2.tgz


Index: php-pear-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/F-11/php-pear-Validate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Validate.spec	26 Feb 2009 22:19:16 -0000	1.4
+++ php-pear-Validate.spec	15 Sep 2009 01:20:47 -0000	1.5
@@ -2,8 +2,8 @@
 %define ClassName Validate
 
 Name:           php-pear-Validate
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Validation Class for Various Data Types
 
 Group:          Development/Libraries
@@ -83,6 +83,12 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 0.8.2-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Feb 2008 03:16:45 -0000	1.4
+++ sources	15 Sep 2009 01:20:47 -0000	1.5
@@ -1 +1 @@
-d3bc3cd1186794da23e8f4cd2f6b0c35  Validate-0.8.1.tgz
+769dfcc329ae7f42f9d874fc7baec4a1  Validate-0.8.2.tgz



From xulchris at fedoraproject.org  Tue Sep 15 01:20:51 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:20:51 +0000 (UTC)
Subject: rpms/php-pear-Validate/devel .cvsignore, 1.4,
	1.5 php-pear-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090915012051.5AAD211C0425@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250/devel

Modified Files:
	.cvsignore php-pear-Validate.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Feb 2008 03:16:45 -0000	1.4
+++ .cvsignore	15 Sep 2009 01:20:49 -0000	1.5
@@ -1 +1 @@
-Validate-0.8.1.tgz
+Validate-0.8.2.tgz


Index: php-pear-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/devel/php-pear-Validate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Validate.spec	26 Jul 2009 18:30:43 -0000	1.5
+++ php-pear-Validate.spec	15 Sep 2009 01:20:50 -0000	1.6
@@ -2,8 +2,8 @@
 %define ClassName Validate
 
 Name:           php-pear-Validate
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Validation Class for Various Data Types
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 0.8.2-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Validate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Feb 2008 03:16:45 -0000	1.4
+++ sources	15 Sep 2009 01:20:50 -0000	1.5
@@ -1 +1 @@
-d3bc3cd1186794da23e8f4cd2f6b0c35  Validate-0.8.1.tgz
+769dfcc329ae7f42f9d874fc7baec4a1  Validate-0.8.2.tgz



From ausil at fedoraproject.org  Tue Sep 15 01:21:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:21:27 +0000 (UTC)
Subject: rpms/gprof2dot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090915012127.0322111C0425@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gprof2dot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk24272/rpms/gprof2dot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gprof2dot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gprof2dot
# $Id: Makefile,v 1.1 2009/09/15 01:21:25 ausil Exp $
NAME := gprof2dot
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 ausil at fedoraproject.org  Tue Sep 15 01:21:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:21:25 +0000 (UTC)
Subject: rpms/gprof2dot Makefile,NONE,1.1
Message-ID: <20090915012125.A94C111C0425@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gprof2dot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsk24272/rpms/gprof2dot

Added Files:
	Makefile 
Log Message:
Setup of module gprof2dot


--- NEW FILE Makefile ---
# Top level Makefile for module gprof2dot
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  Tue Sep 15 01:23:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:23:02 +0000
Subject: [pkgdb] tomcatjss was added for kwright
Message-ID: <20090915012302.EE1F810F880@bastion2.fedora.phx.redhat.com>

ausil has added Package tomcatjss with summary A Java Secure Socket Extension (JSSE) implementation using Java Security Services (JSS) for Tomcat 5.5.
ausil has approved Package tomcatjss
ausil has added a Fedora devel branch for tomcatjss with an owner of kwright
ausil has approved tomcatjss in Fedora devel
ausil has approved Package tomcatjss
ausil has set commit to Approved for 107427 on tomcatjss (Fedora devel)
ausil has set checkout to Approved for 107427 on tomcatjss (Fedora devel)
ausil has set build to Approved for 107427 on tomcatjss (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:23:03 +0000
Subject: [pkgdb] tomcatjss summary updated by ausil
Message-ID: <20090915012304.0370A10F888@bastion2.fedora.phx.redhat.com>

ausil set package tomcatjss summary to A Java Secure Socket Extension (JSSE) implementation using Java Security Services (JSS) for Tomcat 5.5.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:23:03 +0000
Subject: [pkgdb] tomcatjss (Fedora, 11) updated by ausil
Message-ID: <20090915012304.0BD4C10F895@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for tomcatjss
ausil has set commit to Approved for 107427 on tomcatjss (Fedora 11)
ausil has set checkout to Approved for 107427 on tomcatjss (Fedora 11)
ausil has set build to Approved for 107427 on tomcatjss (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:23:03 +0000
Subject: [pkgdb] tomcatjss (Fedora, 11) updated by ausil
Message-ID: <20090915012304.156F910F89A@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for tomcatjss
ausil has set commit to Approved for 107427 on tomcatjss (Fedora 10)
ausil has set checkout to Approved for 107427 on tomcatjss (Fedora 10)
ausil has set build to Approved for 107427 on tomcatjss (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From ausil at fedoraproject.org  Tue Sep 15 01:23:50 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:23:50 +0000 (UTC)
Subject: rpms/tomcatjss/devel - New directory
Message-ID: <20090915012351.0950711C0425@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tomcatjss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz26831/rpms/tomcatjss/devel

Log Message:
Directory /cvs/pkgs/rpms/tomcatjss/devel added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:23:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:23:49 +0000 (UTC)
Subject: rpms/tomcatjss - New directory
Message-ID: <20090915012349.DC08711C0375@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tomcatjss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz26831/rpms/tomcatjss

Log Message:
Directory /cvs/pkgs/rpms/tomcatjss added to the repository




From ausil at fedoraproject.org  Tue Sep 15 01:25:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:25:20 +0000 (UTC)
Subject: rpms/tomcatjss Makefile,NONE,1.1
Message-ID: <20090915012521.3BA8711C0375@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tomcatjss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz26831/rpms/tomcatjss

Added Files:
	Makefile 
Log Message:
Setup of module tomcatjss


--- NEW FILE Makefile ---
# Top level Makefile for module tomcatjss
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  Tue Sep 15 01:25:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 15 Sep 2009 01:25:21 +0000 (UTC)
Subject: rpms/tomcatjss/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090915012521.A682F11C0425@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tomcatjss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz26831/rpms/tomcatjss/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tomcatjss


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tomcatjss
# $Id: Makefile,v 1.1 2009/09/15 01:25:20 ausil Exp $
NAME := tomcatjss
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  Tue Sep 15 01:30:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:30:59 +0000
Subject: [pkgdb] tomcatjss: ausil has requested watchcommits
Message-ID: <20090915013100.150A710F888@bastion2.fedora.phx.redhat.com>

ausil has requested the watchcommits acl on tomcatjss (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:03 +0000
Subject: [pkgdb] tomcatjss: ausil has requested watchbugzilla
Message-ID: <20090915013104.12E9C10F894@bastion2.fedora.phx.redhat.com>

ausil has requested the watchbugzilla acl on tomcatjss (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:06 +0000
Subject: [pkgdb] tomcatjss: ausil has requested watchbugzilla
Message-ID: <20090915013106.754B810F880@bastion2.fedora.phx.redhat.com>

ausil has requested the watchbugzilla acl on tomcatjss (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:10 +0000
Subject: [pkgdb] tomcatjss: ausil has requested watchbugzilla
Message-ID: <20090915013111.1C4E910F898@bastion2.fedora.phx.redhat.com>

ausil has requested the watchbugzilla acl on tomcatjss (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:14 +0000
Subject: [pkgdb] tomcatjss: ausil has requested watchcommits
Message-ID: <20090915013114.C4C0310F89B@bastion2.fedora.phx.redhat.com>

ausil has requested the watchcommits acl on tomcatjss (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:30 +0000
Subject: [pkgdb] tomcatjss: ausil has requested watchcommits
Message-ID: <20090915013130.E2F2010F880@bastion2.fedora.phx.redhat.com>

ausil has requested the watchcommits acl on tomcatjss (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:44 +0000
Subject: [pkgdb] tomcatjss: ausil has requested commit
Message-ID: <20090915013145.4F0AC10F888@bastion2.fedora.phx.redhat.com>

ausil has requested the commit acl on tomcatjss (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:50 +0000
Subject: [pkgdb] tomcatjss: ausil has requested commit
Message-ID: <20090915013151.16BE010F8A0@bastion2.fedora.phx.redhat.com>

ausil has requested the commit acl on tomcatjss (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From pkgdb at fedoraproject.org  Tue Sep 15 01:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 01:31:58 +0000
Subject: [pkgdb] tomcatjss: ausil has requested commit
Message-ID: <20090915013158.30C5A10F8A2@bastion2.fedora.phx.redhat.com>

ausil has requested the commit acl on tomcatjss (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomcatjss



From xulchris at fedoraproject.org  Tue Sep 15 01:58:54 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:58:54 +0000 (UTC)
Subject: rpms/php-pecl-xdebug/F-10 .cvsignore, 1.7, 1.8 php-pecl-xdebug.spec,
	1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20090915015854.0963311C0261@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pecl-xdebug/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252/F-10

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 May 2008 22:57:23 -0000	1.7
+++ .cvsignore	15 Sep 2009 01:58:52 -0000	1.8
@@ -1 +1 @@
-xdebug-2.0.3.tgz
+xdebug-2.0.5.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/F-10/php-pecl-xdebug.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- php-pecl-xdebug.spec	9 Oct 2008 18:46:13 -0000	1.17
+++ php-pecl-xdebug.spec	15 Sep 2009 01:58:52 -0000	1.18
@@ -5,8 +5,8 @@
 %define pecl_name xdebug
 
 Name:           php-pecl-xdebug
-Version:        2.0.3
-Release:        4%{?dist}
+Version:        2.0.5
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -61,7 +61,7 @@ CFLAGS="$RPM_OPT_FLAGS" make
 
 # Build debugclient
 pushd debugclient
-cp %{_datadir}/automake*/depcomp .
+cp %{_datadir}/automake-1.??/depcomp .
 chmod +x configure
 %configure %{config_flags}
 CFLAGS="$RPM_OPT_FLAGS" make
@@ -121,6 +121,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 2.0.5-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.0.4-1
+- update to 2.0.4 (bugfix + Basic PHP 5.3 support)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 2.0.3-4
 - Add code coverage patch (bz #460348)
 - http://bugs.xdebug.org/bug_view_page.php?bug_id=0000344


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 May 2008 22:57:23 -0000	1.7
+++ sources	15 Sep 2009 01:58:53 -0000	1.8
@@ -1 +1 @@
-0735584168c8c9f111252128d0076d7c  xdebug-2.0.3.tgz
+2d87dab7b6c499a80f0961af602d030c  xdebug-2.0.5.tgz



From xulchris at fedoraproject.org  Tue Sep 15 01:58:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:58:52 +0000 (UTC)
Subject: rpms/php-pecl-xdebug/EL-5 .cvsignore, 1.7, 1.8 php-pecl-xdebug.spec,
	1.18, 1.19 sources, 1.7, 1.8
Message-ID: <20090915015853.CD5C011C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pecl-xdebug/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252/EL-5

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 May 2008 22:56:06 -0000	1.7
+++ .cvsignore	15 Sep 2009 01:58:50 -0000	1.8
@@ -1 +1 @@
-xdebug-2.0.3.tgz
+xdebug-2.0.5.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- php-pecl-xdebug.spec	9 Oct 2008 18:46:12 -0000	1.18
+++ php-pecl-xdebug.spec	15 Sep 2009 01:58:50 -0000	1.19
@@ -5,8 +5,8 @@
 %define pecl_name xdebug
 
 Name:           php-pecl-xdebug
-Version:        2.0.3
-Release:        4%{?dist}
+Version:        2.0.5
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -61,7 +61,7 @@ CFLAGS="$RPM_OPT_FLAGS" make
 
 # Build debugclient
 pushd debugclient
-cp %{_datadir}/automake*/depcomp .
+cp %{_datadir}/automake-1.??/depcomp .
 chmod +x configure
 %configure %{config_flags}
 CFLAGS="$RPM_OPT_FLAGS" make
@@ -121,6 +121,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 2.0.5-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.0.4-1
+- update to 2.0.4 (bugfix + Basic PHP 5.3 support)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 2.0.3-4
 - Add code coverage patch (bz #460348)
 - http://bugs.xdebug.org/bug_view_page.php?bug_id=0000344


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 May 2008 22:56:06 -0000	1.7
+++ sources	15 Sep 2009 01:58:50 -0000	1.8
@@ -1 +1 @@
-0735584168c8c9f111252128d0076d7c  xdebug-2.0.3.tgz
+2d87dab7b6c499a80f0961af602d030c  xdebug-2.0.5.tgz



From xulchris at fedoraproject.org  Tue Sep 15 01:58:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:58:56 +0000 (UTC)
Subject: rpms/php-pecl-xdebug/devel .cvsignore, 1.8, 1.9 php-pecl-xdebug.spec,
	1.20, 1.21 sources, 1.8, 1.9
Message-ID: <20090915015856.32C2611C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pecl-xdebug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252/devel

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Jul 2009 20:30:01 -0000	1.8
+++ .cvsignore	15 Sep 2009 01:58:55 -0000	1.9
@@ -1 +1 @@
-xdebug-2.0.4.tgz
+xdebug-2.0.5.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- php-pecl-xdebug.spec	26 Jul 2009 18:37:07 -0000	1.20
+++ php-pecl-xdebug.spec	15 Sep 2009 01:58:55 -0000	1.21
@@ -5,8 +5,8 @@
 %define pecl_name xdebug
 
 Name:           php-pecl-xdebug
-Version:        2.0.4
-Release:        2%{?dist}
+Version:        2.0.5
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 2.0.5-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Jul 2009 20:30:01 -0000	1.8
+++ sources	15 Sep 2009 01:58:55 -0000	1.9
@@ -1 +1 @@
-2fd6adb30c338d7667b464506fd58eca  xdebug-2.0.4.tgz
+2d87dab7b6c499a80f0961af602d030c  xdebug-2.0.5.tgz



From xulchris at fedoraproject.org  Tue Sep 15 01:58:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 01:58:56 +0000 (UTC)
Subject: rpms/php-pecl-xdebug/F-11 .cvsignore, 1.7, 1.8 php-pecl-xdebug.spec,
	1.18, 1.19 sources, 1.7, 1.8
Message-ID: <20090915015856.76DFD11C0261@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pecl-xdebug/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252/F-11

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 May 2008 22:57:23 -0000	1.7
+++ .cvsignore	15 Sep 2009 01:58:54 -0000	1.8
@@ -1 +1 @@
-xdebug-2.0.3.tgz
+xdebug-2.0.5.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/F-11/php-pecl-xdebug.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- php-pecl-xdebug.spec	26 Feb 2009 22:41:35 -0000	1.18
+++ php-pecl-xdebug.spec	15 Sep 2009 01:58:54 -0000	1.19
@@ -5,8 +5,8 @@
 %define pecl_name xdebug
 
 Name:           php-pecl-xdebug
-Version:        2.0.3
-Release:        5%{?dist}
+Version:        2.0.5
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -61,7 +61,7 @@ CFLAGS="$RPM_OPT_FLAGS" make
 
 # Build debugclient
 pushd debugclient
-cp %{_datadir}/automake*/depcomp .
+cp %{_datadir}/automake-1.??/depcomp .
 chmod +x configure
 %configure %{config_flags}
 CFLAGS="$RPM_OPT_FLAGS" make
@@ -121,6 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 2.0.5-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.0.4-1
+- update to 2.0.4 (bugfix + Basic PHP 5.3 support)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 May 2008 22:57:23 -0000	1.7
+++ sources	15 Sep 2009 01:58:54 -0000	1.8
@@ -1 +1 @@
-0735584168c8c9f111252128d0076d7c  xdebug-2.0.3.tgz
+2d87dab7b6c499a80f0961af602d030c  xdebug-2.0.5.tgz



From kwright at fedoraproject.org  Tue Sep 15 02:38:03 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 15 Sep 2009 02:38:03 +0000 (UTC)
Subject: rpms/tomcatjss/F-11 import.log, NONE, 1.1 tomcatjss.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915023804.4DAB811C00EC@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/tomcatjss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4880/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tomcatjss.spec 
Log Message:
initial import of tomcatjss into fedora



--- NEW FILE import.log ---
tomcatjss-1_2_0-2_fc11:F-11:tomcatjss-1.2.0-2.fc11.src.rpm:1252982234


--- NEW FILE tomcatjss.spec ---
Name:     tomcatjss
Version:  1.2.0
Release:  2%{?dist}
Summary:  JSSE implementation using JSS for Tomcat
URL:      http://pki.fedoraproject.org/
License:  LGPLv2+
Group:    System Environment/Libraries

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Source0:  http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

BuildRequires:    ant
BuildRequires:    java-devel >= 1:1.6.0
BuildRequires:    jpackage-utils
BuildRequires:    tomcat5
BuildRequires:    jss >= 4.2.6
Requires:         java >= 1:1.6.0
Requires:         jpackage-utils
Requires:         tomcat5
Requires:         jss >= 4.2.6

%description
A Java Secure Socket Extension (JSSE) implementation
using Java Security Services (JSS) for Tomcat 5.5.

%prep

%setup -q

%build

ant -f build.xml
ant -f build.xml dist

%install
rm -rf %{buildroot}

# Unpack the files we just built
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

# Install our files
cd %{buildroot}%{_javadir}
mv %{name}.jar %{name}-%{version}.jar
ln -s %{name}-%{version}.jar %{name}.jar
mkdir -p %{buildroot}%{_sharedstatedir}/tomcat5/server/lib
cd %{buildroot}%{_sharedstatedir}/tomcat5/server/lib
ln -s ../../../../../usr/share/java/%{name}.jar %{name}.jar
mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc %attr(644,root,root) README LICENSE
%attr(00755,root,root) %{_datadir}/doc/%{name}-%{version}
%{_javadir}/*
%{_sharedstatedir}/tomcat5/server/lib/%{name}.jar

%changelog
* Fri Sep 11 2009 Kevin Wright <kwright at redhat.com> 1.2.0-2
- Bugzilla Bug #521979 - Removed references to jre, fedora 8, etc

* Fri Aug 28 2009 Matthew Harmsen <mharmsen at redhat.com> 1.2.0-1
- Bugzilla Bug #521979 -  New Package for Dogtag PKI: tomcatjss

* Thu Jul 16 2009 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-15
- Release Candidate 4 build

* Wed Jun 3 2009 Christina Fu <cfu at redhat.com> 1.1.0-14
- Bugzilla Bug #455305 - CA ECC signing Key Failure
  Bugzilla Bug #223279 - ECC: Ca: unable to perform agent auth on a machine with nCipher ECC HSM
- This log entry does not apply to tomcatjss.  Ignore.
* Fri May 1 2009 Christina Fu <cfu at redhat.com> - 1.1.0-13
- Bugzilla #498652 - SSL handshake Failure on RHCS java subsystems with nethsm2000
 
* Thu Feb  26 2009 Kevin Wright <kwright at redhat.com> - 1.1.0-12
- Updated to release 1.1.0-12 to build with idm extension

* Sat Nov 22 2008 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-11
- Updated to require "java" and "java-devel" >= 1.6.0

* Thu Aug 02 2007 Thomas kwan <nkwan at redhat.com> 1.1.0-10
- Required JSS 4.2.5

* Fri Apr 26 2007 Kevin McCarthy <kmccarth at redhat.com> 1.1.0-9
- Change specfile to RHEL5 dependencies

* Fri Apr 20 2007 Thomas Kwan <nkwan at redhat.com> 1.1.0-8
- Re-integrated Solaris logic into the spec file

* Wed Apr 4 2007 Thomas Kwan <nkwan at redhat.com> 1.1.0-7
- Called new JSS api for client authentication

* Fri Mar 09 2007 Rob Crittenden <rcritten at redhat.com> 1.1.0-6
- Add Solaris directives for building with pkgbuild

* Mon Mar  3 2007 Rob Crittenden <rcritten at redhat.com> 1.1.0-5
- More spec file cleanup

* Fri Jan 26 2007 Rob Crittenden <rcritten at redhat.com> 1.1.0-4
- General spec file cleanup
- Added LGPL license

* Wed Feb 22 2006 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-3
- Renamed "rpm.template" to "pki.template". Filled in Solaris section.

* Mon Feb 20 2006 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-2
- Separated template into Linux, Solaris, and Changelog sections.

* Mon Dec 5 2005 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-1
- Initial RPM template.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcatjss/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:25:20 -0000	1.1
+++ .cvsignore	15 Sep 2009 02:38:00 -0000	1.2
@@ -0,0 +1 @@
+tomcatjss-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcatjss/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:25:21 -0000	1.1
+++ sources	15 Sep 2009 02:38:00 -0000	1.2
@@ -0,0 +1 @@
+0b0b41f84d8424b811f743fce82fd0b9  tomcatjss-1.2.0.tar.gz



From rrankin at fedoraproject.org  Tue Sep 15 02:54:11 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Tue, 15 Sep 2009 02:54:11 +0000 (UTC)
Subject: rpms/gpsim/devel .cvsignore, 1.8, 1.9 gpsim.spec, 1.26, 1.27 sources,
	1.8, 1.9
Message-ID: <20090915025411.CB55E11C00EC@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23075

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
Update to gpsim 0.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Mar 2009 05:05:12 -0000	1.8
+++ .cvsignore	15 Sep 2009 02:54:10 -0000	1.9
@@ -1 +1 @@
-gpsim-0.23.0.tar.gz
+gpsim-0.24.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gpsim.spec	25 Jul 2009 01:21:24 -0000	1.26
+++ gpsim.spec	15 Sep 2009 02:54:10 -0000	1.27
@@ -1,14 +1,14 @@
 Name:		gpsim
-Version:	0.23.0
-Release:	5%{?dist}
+Version:	0.24.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
 Group:		Development/Debuggers
 License:	GPLv2+
-URL:		http://www.dattalo.com/gnupic/gpsim.html
+URL:		http://gpsim.sourceforge.net/gpsim.html
 Source:		http://downloads.sourceforge.net/gpsim/gpsim-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
 BuildRequires:	autoconf
@@ -89,6 +89,10 @@ autoconf
 %{_includedir}/*
 
 %changelog
+* Mon Sep 15 2009 Roy Rankin <rrankin at ihug.com.au> 0.24.0-1
+- upstream release of gpsim 0.24.0 - bug fixes and see ANNOUNCE for
+  new features and processors.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Mar 2009 05:05:13 -0000	1.8
+++ sources	15 Sep 2009 02:54:10 -0000	1.9
@@ -1 +1 @@
-d19a3aef6e62fed6a7e23d5c5817ed56  gpsim-0.23.0.tar.gz
+3185c8729ac47359e0bf52e2ea46735b  gpsim-0.24.0.tar.gz



From toshio at fedoraproject.org  Tue Sep 15 03:23:22 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Sep 2009 03:23:22 +0000 (UTC)
Subject: rpms/gprof2dot/devel gprof2dot.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915032322.6011511C00EC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gprof2dot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15836/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gprof2dot.spec import.log 
Log Message:
Initial import.



--- NEW FILE gprof2dot.spec ---
Name:           gprof2dot
Version:        1.0
Release:        0.2.20090901svn%{?dist}
Summary:        Generate dot graphs from the output of several profilers

Group:          Applications/Multimedia
License:        LGPLv3+
URL:            http://code.google.com/p/jrfonseca/wiki/Gprof2Dot
# The Source0 used in this version of the package can be obtained by:
# svn export -r 276 http://jrfonseca.googlecode.com/svn/trunk/gprof2dot/ gprof2dot-1.0
# tar -cf - gprof2dot-1.0 |xz  -9c --memory=500MiB > gprof2dot-1.0.tar.xz
Source0:        gprof2dot-1.0.tar.xz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires:  python
BuildRequires:  graphviz
Requires:       python

%description
This is a Python script to convert the output from prof, gprof, oprofile,
Shark, AQtime, and python profilers into a dot graph.  It has the following
features:

* can correctly parse C++ template function names
* allows to prune nodes and edges below a certain threshold
* uses an heuristic to propagate time inside mutually recursive functions
* uses color efficiently to draw attention to hot-spots

%prep
%setup -q
sed -i '1s@^#!/usr/bin/env python$@#!/usr/bin/python@'  gprof2dot.py
cd tests
sed -i 's/^PYTHON=python2.5$/PYTHON=python/' runtests.sh

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -p -m 0755 gprof2dot.py %{buildroot}%{_bindir}/gprof2dot
chmod 0644 hotshotmain.py

%clean
rm -rf %{buildroot}

%check
cd tests
./runtests.sh

%files
%defattr(-,root,root,-)
%doc hotshotmain.py 
%{_bindir}/gprof2dot


%changelog
* Mon Sep 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.2.20090901svn
- Use svn export instead of svn checkout to generate the tarball
- Replace use of env with direct call to the python interpreter

* Tue Sep 1 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.20090901svn
- Initial Fedora build


--- NEW FILE import.log ---
gprof2dot-1_0-0_2_20090901svn_fc11:HEAD:gprof2dot-1.0-0.2.20090901svn.fc11.src.rpm:1252984716


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:21:25 -0000	1.1
+++ .cvsignore	15 Sep 2009 03:23:18 -0000	1.2
@@ -0,0 +1 @@
+gprof2dot-1.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:21:25 -0000	1.1
+++ sources	15 Sep 2009 03:23:18 -0000	1.2
@@ -0,0 +1 @@
+9ce33729ea4888edbf5a4f9fab868cb2  gprof2dot-1.0.tar.xz



From toshio at fedoraproject.org  Tue Sep 15 03:46:01 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Sep 2009 03:46:01 +0000 (UTC)
Subject: rpms/gprof2dot/F-11 gprof2dot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915034601.C717611C0374@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gprof2dot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2834/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gprof2dot.spec 
Log Message:
Initial import.



--- NEW FILE gprof2dot.spec ---
Name:           gprof2dot
Version:        1.0
Release:        0.2.20090901svn%{?dist}
Summary:        Generate dot graphs from the output of several profilers

Group:          Applications/Multimedia
License:        LGPLv3+
URL:            http://code.google.com/p/jrfonseca/wiki/Gprof2Dot
# The Source0 used in this version of the package can be obtained by:
# svn export -r 276 http://jrfonseca.googlecode.com/svn/trunk/gprof2dot/ gprof2dot-1.0
# tar -cf - gprof2dot-1.0 |xz  -9c --memory=500MiB > gprof2dot-1.0.tar.xz
Source0:        gprof2dot-1.0.tar.xz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires:  python
BuildRequires:  graphviz
Requires:       python

%description
This is a Python script to convert the output from prof, gprof, oprofile,
Shark, AQtime, and python profilers into a dot graph.  It has the following
features:

* can correctly parse C++ template function names
* allows to prune nodes and edges below a certain threshold
* uses an heuristic to propagate time inside mutually recursive functions
* uses color efficiently to draw attention to hot-spots

%prep
%setup -q
sed -i '1s@^#!/usr/bin/env python$@#!/usr/bin/python@'  gprof2dot.py
cd tests
sed -i 's/^PYTHON=python2.5$/PYTHON=python/' runtests.sh

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -p -m 0755 gprof2dot.py %{buildroot}%{_bindir}/gprof2dot
chmod 0644 hotshotmain.py

%clean
rm -rf %{buildroot}

%check
cd tests
./runtests.sh

%files
%defattr(-,root,root,-)
%doc hotshotmain.py 
%{_bindir}/gprof2dot


%changelog
* Mon Sep 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.2.20090901svn
- Use svn export instead of svn checkout to generate the tarball
- Replace use of env with direct call to the python interpreter

* Tue Sep 1 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.20090901svn
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:21:25 -0000	1.1
+++ .cvsignore	15 Sep 2009 03:45:56 -0000	1.2
@@ -0,0 +1 @@
+gprof2dot-1.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:21:25 -0000	1.1
+++ sources	15 Sep 2009 03:45:56 -0000	1.2
@@ -0,0 +1 @@
+9ce33729ea4888edbf5a4f9fab868cb2  gprof2dot-1.0.tar.xz



From toshio at fedoraproject.org  Tue Sep 15 03:46:01 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Sep 2009 03:46:01 +0000 (UTC)
Subject: rpms/gprof2dot/F-10 gprof2dot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915034601.C1EC911C0261@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gprof2dot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2834/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gprof2dot.spec 
Log Message:
Initial import.



--- NEW FILE gprof2dot.spec ---
Name:           gprof2dot
Version:        1.0
Release:        0.2.20090901svn%{?dist}
Summary:        Generate dot graphs from the output of several profilers

Group:          Applications/Multimedia
License:        LGPLv3+
URL:            http://code.google.com/p/jrfonseca/wiki/Gprof2Dot
# The Source0 used in this version of the package can be obtained by:
# svn export -r 276 http://jrfonseca.googlecode.com/svn/trunk/gprof2dot/ gprof2dot-1.0
# tar -cf - gprof2dot-1.0 |xz  -9c --memory=500MiB > gprof2dot-1.0.tar.xz
Source0:        gprof2dot-1.0.tar.xz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires:  python
BuildRequires:  graphviz
Requires:       python

%description
This is a Python script to convert the output from prof, gprof, oprofile,
Shark, AQtime, and python profilers into a dot graph.  It has the following
features:

* can correctly parse C++ template function names
* allows to prune nodes and edges below a certain threshold
* uses an heuristic to propagate time inside mutually recursive functions
* uses color efficiently to draw attention to hot-spots

%prep
%setup -q
sed -i '1s@^#!/usr/bin/env python$@#!/usr/bin/python@'  gprof2dot.py
cd tests
sed -i 's/^PYTHON=python2.5$/PYTHON=python/' runtests.sh

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -p -m 0755 gprof2dot.py %{buildroot}%{_bindir}/gprof2dot
chmod 0644 hotshotmain.py

%clean
rm -rf %{buildroot}

%check
cd tests
./runtests.sh

%files
%defattr(-,root,root,-)
%doc hotshotmain.py 
%{_bindir}/gprof2dot


%changelog
* Mon Sep 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.2.20090901svn
- Use svn export instead of svn checkout to generate the tarball
- Replace use of env with direct call to the python interpreter

* Tue Sep 1 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.20090901svn
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:21:25 -0000	1.1
+++ .cvsignore	15 Sep 2009 03:45:55 -0000	1.2
@@ -0,0 +1 @@
+gprof2dot-1.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:21:25 -0000	1.1
+++ sources	15 Sep 2009 03:45:55 -0000	1.2
@@ -0,0 +1 @@
+9ce33729ea4888edbf5a4f9fab868cb2  gprof2dot-1.0.tar.xz



From toshio at fedoraproject.org  Tue Sep 15 03:46:01 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Sep 2009 03:46:01 +0000 (UTC)
Subject: rpms/gprof2dot/EL-5 gprof2dot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915034601.B988211C00EC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gprof2dot/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2834/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	gprof2dot.spec 
Log Message:
Initial import.



--- NEW FILE gprof2dot.spec ---
Name:           gprof2dot
Version:        1.0
Release:        0.2.20090901svn%{?dist}
Summary:        Generate dot graphs from the output of several profilers

Group:          Applications/Multimedia
License:        LGPLv3+
URL:            http://code.google.com/p/jrfonseca/wiki/Gprof2Dot
# The Source0 used in this version of the package can be obtained by:
# svn export -r 276 http://jrfonseca.googlecode.com/svn/trunk/gprof2dot/ gprof2dot-1.0
# tar -cf - gprof2dot-1.0 |xz  -9c --memory=500MiB > gprof2dot-1.0.tar.xz
Source0:        gprof2dot-1.0.tar.xz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires:  python
BuildRequires:  graphviz
Requires:       python

%description
This is a Python script to convert the output from prof, gprof, oprofile,
Shark, AQtime, and python profilers into a dot graph.  It has the following
features:

* can correctly parse C++ template function names
* allows to prune nodes and edges below a certain threshold
* uses an heuristic to propagate time inside mutually recursive functions
* uses color efficiently to draw attention to hot-spots

%prep
%setup -q
sed -i '1s@^#!/usr/bin/env python$@#!/usr/bin/python@'  gprof2dot.py
cd tests
sed -i 's/^PYTHON=python2.5$/PYTHON=python/' runtests.sh

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -p -m 0755 gprof2dot.py %{buildroot}%{_bindir}/gprof2dot
chmod 0644 hotshotmain.py

%clean
rm -rf %{buildroot}

%check
cd tests
./runtests.sh

%files
%defattr(-,root,root,-)
%doc hotshotmain.py 
%{_bindir}/gprof2dot


%changelog
* Mon Sep 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.2.20090901svn
- Use svn export instead of svn checkout to generate the tarball
- Replace use of env with direct call to the python interpreter

* Tue Sep 1 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.20090901svn
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:21:25 -0000	1.1
+++ .cvsignore	15 Sep 2009 03:45:53 -0000	1.2
@@ -0,0 +1 @@
+gprof2dot-1.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gprof2dot/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:21:25 -0000	1.1
+++ sources	15 Sep 2009 03:45:54 -0000	1.2
@@ -0,0 +1 @@
+9ce33729ea4888edbf5a4f9fab868cb2  gprof2dot-1.0.tar.xz



From xulchris at fedoraproject.org  Tue Sep 15 03:50:04 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 03:50:04 +0000 (UTC)
Subject: rpms/php-pecl-xdebug/EL-5 php-pecl-xdebug.spec,1.19,1.20
Message-ID: <20090915035004.B814611C0427@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pecl-xdebug/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8900

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
fixes for el5


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- php-pecl-xdebug.spec	15 Sep 2009 01:58:50 -0000	1.19
+++ php-pecl-xdebug.spec	15 Sep 2009 03:50:02 -0000	1.20
@@ -61,7 +61,7 @@ CFLAGS="$RPM_OPT_FLAGS" make
 
 # Build debugclient
 pushd debugclient
-cp %{_datadir}/automake-1.??/depcomp .
+cp %{_datadir}/automake*/depcomp .
 chmod +x configure
 %configure %{config_flags}
 CFLAGS="$RPM_OPT_FLAGS" make



From xulchris at fedoraproject.org  Tue Sep 15 03:51:34 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Tue, 15 Sep 2009 03:51:34 +0000 (UTC)
Subject: rpms/php-pecl-xdebug/EL-5 php-pecl-xdebug.spec,1.20,1.21
Message-ID: <20090915035134.1192511C0374@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pecl-xdebug/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
el5 bump


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- php-pecl-xdebug.spec	15 Sep 2009 03:50:02 -0000	1.20
+++ php-pecl-xdebug.spec	15 Sep 2009 03:51:32 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           php-pecl-xdebug
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -121,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 2.0.5-1
+* Mon Sep 14 2009 Christopher Stone <chris.stone at gmail.com> 2.0.5-1.1
 - Upstream sync
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2



From oget at fedoraproject.org  Tue Sep 15 04:53:35 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 04:53:35 +0000 (UTC)
Subject: rpms/multimedia-menus/devel .cvsignore, 1.2,
	1.3 multimedia-menus.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090915045337.7152811C00EB@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1061

Modified Files:
	.cvsignore multimedia-menus.spec sources 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-1
- Lots of translations! YAAY!
- Change URL to fedorahosted



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Aug 2009 19:50:38 -0000	1.2
+++ .cvsignore	15 Sep 2009 04:53:26 -0000	1.3
@@ -1 +1 @@
-multimedia-menus-0.2.tar.bz2
+multimedia-menus-0.3.tar.gz


Index: multimedia-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/multimedia-menus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- multimedia-menus.spec	4 Aug 2009 19:50:38 -0000	1.1
+++ multimedia-menus.spec	15 Sep 2009 04:53:26 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           multimedia-menus
-Version:        0.2
+Version:        0.3
 Release:        1%{?dist}
-Summary:        Categorization for the GNOME/KDE Audio&Video/Multimedia menu
+Summary:        Categorization for the GNOME/KDE Sound&Video/Multimedia menu
 Group:          User Interface/Desktops
 # Licensing of individual parts is explained in licensing.txt file
 License:        GPLv2+ and LGPLv2+ and GPL+ and LGPLv2 and LGPLv3+ and GPLv2 and MIT
-URL:            http://oget.fedorapeople.org/multimedia-menus/
-Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/multimedia-menus/
+Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       redhat-menus hicolor-icon-theme
@@ -21,15 +21,17 @@ usuability and easy access of multimedia
 
 
 %build
-
+make %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/desktop-directories/
 install -p -m 644 multimedia-categories.menu \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
-cp -a desktop-directories/ $RPM_BUILD_ROOT%{_datadir}/
+cp -a desktop-directories/*.directory \
+  $RPM_BUILD_ROOT%{_datadir}/desktop-directories/
 cp -a icons/* $RPM_BUILD_ROOT%{_datadir}/icons/
 
 
@@ -59,6 +61,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-1
+- Lots of translations! YAAY!
+- Change URL to fedorahosted
+
 * Tue Aug 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2-1
 - Version bump with fixes in category names
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Aug 2009 19:50:38 -0000	1.2
+++ sources	15 Sep 2009 04:53:27 -0000	1.3
@@ -1 +1 @@
-6a44ac53f4ef4071d06cc8c49dd6b5a7  multimedia-menus-0.2.tar.bz2
+b4d4f92d6ecc960b0cc0df3633d1da9c  multimedia-menus-0.3.tar.gz



From oget at fedoraproject.org  Tue Sep 15 04:55:27 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 04:55:27 +0000 (UTC)
Subject: rpms/multimedia-menus/F-11 .cvsignore, 1.2,
	1.3 multimedia-menus.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090915045527.5E94311C00EB@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3058

Modified Files:
	.cvsignore multimedia-menus.spec sources 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-1
- Lots of translations! YAAY!
- Change URL to fedorahosted



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Aug 2009 19:51:45 -0000	1.2
+++ .cvsignore	15 Sep 2009 04:55:26 -0000	1.3
@@ -1 +1 @@
-multimedia-menus-0.2.tar.bz2
+multimedia-menus-0.3.tar.gz


Index: multimedia-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/multimedia-menus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- multimedia-menus.spec	4 Aug 2009 19:51:45 -0000	1.1
+++ multimedia-menus.spec	15 Sep 2009 04:55:26 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           multimedia-menus
-Version:        0.2
+Version:        0.3
 Release:        1%{?dist}
-Summary:        Categorization for the GNOME/KDE Audio&Video/Multimedia menu
+Summary:        Categorization for the GNOME/KDE Sound&Video/Multimedia menu
 Group:          User Interface/Desktops
 # Licensing of individual parts is explained in licensing.txt file
 License:        GPLv2+ and LGPLv2+ and GPL+ and LGPLv2 and LGPLv3+ and GPLv2 and MIT
-URL:            http://oget.fedorapeople.org/multimedia-menus/
-Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/multimedia-menus/
+Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       redhat-menus hicolor-icon-theme
@@ -21,15 +21,17 @@ usuability and easy access of multimedia
 
 
 %build
-
+make %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/desktop-directories/
 install -p -m 644 multimedia-categories.menu \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
-cp -a desktop-directories/ $RPM_BUILD_ROOT%{_datadir}/
+cp -a desktop-directories/*.directory \
+  $RPM_BUILD_ROOT%{_datadir}/desktop-directories/
 cp -a icons/* $RPM_BUILD_ROOT%{_datadir}/icons/
 
 
@@ -59,6 +61,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-1
+- Lots of translations! YAAY!
+- Change URL to fedorahosted
+
 * Tue Aug 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2-1
 - Version bump with fixes in category names
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Aug 2009 19:51:45 -0000	1.2
+++ sources	15 Sep 2009 04:55:26 -0000	1.3
@@ -1 +1 @@
-6a44ac53f4ef4071d06cc8c49dd6b5a7  multimedia-menus-0.2.tar.bz2
+b4d4f92d6ecc960b0cc0df3633d1da9c  multimedia-menus-0.3.tar.gz



From cebbert at fedoraproject.org  Tue Sep 15 05:00:21 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 15 Sep 2009 05:00:21 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch, 
	NONE, 1.1 linux-2.6-cpufreq-eliminate-lockdep-warnings.patch,
	NONE, 1.1 kernel.spec, 1.1733, 1.1734
Message-ID: <20090915050021.2F84011C04EA@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7691

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch 
	linux-2.6-cpufreq-eliminate-lockdep-warnings.patch 
Log Message:
Fix cpufreq lockdep warnings (#522685)

linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch:
 cpufreq_ondemand.c |   62 +++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 35 deletions(-)

--- NEW FILE linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch ---
From: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Fri, 3 Jul 2009 00:08:32 +0000 (-0700)
Subject: [CPUFREQ] Cleanup locking in ondemand governor
X-Git-Tag: v2.6.31-rc3~50^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5a75c82828e7c088ca6e7b4827911dc29cc8e774

[ <cebbert at redhat.com> : backport to 2.6.30 ]

[CPUFREQ] Cleanup locking in ondemand governor

Redesign the locking inside ondemand driver. Make dbs_mutex handle all the
global state changes inside the driver and invent a new percpu mutex
to serialize percpu timer and frequency limit change.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Dave Jones <davej at redhat.com>
---

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 246ae14..d6ba142 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -70,8 +70,13 @@ struct cpu_dbs_info_s {
 	unsigned int freq_lo_jiffies;
 	unsigned int freq_hi_jiffies;
 	int cpu;
-	unsigned int enable:1,
-		sample_type:1;
+	unsigned int sample_type:1;
+	/*
+	 * percpu mutex that serializes governor limit change with
+	 * do_dbs_timer invocation. We do not want do_dbs_timer to run
+	 * when user is changing the governor or limits.
+	 */
+	struct mutex timer_mutex;
 };
 static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 
@@ -79,9 +84,7 @@ static unsigned int dbs_enable;	/* number of CPUs using this policy */
 
 /*
  * dbs_mutex protects data in dbs_tuners_ins from concurrent changes on
- * different CPUs. It protects dbs_enable in governor start/stop. It also
- * serializes governor limit_change with do_dbs_timer. We do not want
- * do_dbs_timer to run when user is changing the governor or limits.
+ * different CPUs. It protects dbs_enable in governor start/stop.
  */
 static DEFINE_MUTEX(dbs_mutex);
 
@@ -187,13 +190,18 @@ static unsigned int powersave_bias_target(struct cpufreq_policy *policy,
 	return freq_hi;
 }
 
+static void ondemand_powersave_bias_init_cpu(int cpu)
+{
+	struct cpu_dbs_info_s *dbs_info = &per_cpu(cpu_dbs_info, cpu);
+	dbs_info->freq_table = cpufreq_frequency_get_table(cpu);
+	dbs_info->freq_lo = 0;
+}
+
 static void ondemand_powersave_bias_init(void)
 {
 	int i;
 	for_each_online_cpu(i) {
-		struct cpu_dbs_info_s *dbs_info = &per_cpu(cpu_dbs_info, i);
-		dbs_info->freq_table = cpufreq_frequency_get_table(i);
-		dbs_info->freq_lo = 0;
+		ondemand_powersave_bias_init_cpu(i);
 	}
 }
 
@@ -235,12 +243,10 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
 	unsigned int input;
 	int ret;
 	ret = sscanf(buf, "%u", &input);
+	if (ret != 1)
+		return -EINVAL;
 
 	mutex_lock(&dbs_mutex);
-	if (ret != 1) {
-		mutex_unlock(&dbs_mutex);
-		return -EINVAL;
-	}
 	dbs_tuners_ins.sampling_rate = max(input, minimum_sampling_rate());
 	mutex_unlock(&dbs_mutex);
 
@@ -254,13 +260,12 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
 	int ret;
 	ret = sscanf(buf, "%u", &input);
 
-	mutex_lock(&dbs_mutex);
 	if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD ||
 			input < MIN_FREQUENCY_UP_THRESHOLD) {
-		mutex_unlock(&dbs_mutex);
 		return -EINVAL;
 	}
 
+	mutex_lock(&dbs_mutex);
 	dbs_tuners_ins.up_threshold = input;
 	mutex_unlock(&dbs_mutex);
 
@@ -358,9 +363,6 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
 	struct cpufreq_policy *policy;
 	unsigned int j;
 
-	if (!this_dbs_info->enable)
-		return;
-
 	this_dbs_info->freq_lo = 0;
 	policy = this_dbs_info->cur_policy;
 
@@ -488,13 +490,7 @@ static void do_dbs_timer(struct work_struct *work)
 	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
 
 	delay -= jiffies % delay;
-
-	mutex_lock(&dbs_mutex);
-
-	if (!dbs_info->enable) {
-		mutex_unlock(&dbs_mutex);
-		return;
-	}
+	mutex_lock(&dbs_info->timer_mutex);
 
 	/* Common NORMAL_SAMPLE setup */
 	dbs_info->sample_type = DBS_NORMAL_SAMPLE;
@@ -511,7 +507,7 @@ static void do_dbs_timer(struct work_struct *work)
 			dbs_info->freq_lo, CPUFREQ_RELATION_H);
 	}
 	queue_delayed_work_on(cpu, kondemand_wq, &dbs_info->work, delay);
-	mutex_unlock(&dbs_mutex);
+	mutex_unlock(&dbs_info->timer_mutex);
 }
 
 static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
@@ -520,8 +516,6 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
 	delay -= jiffies % delay;
 
-	dbs_info->enable = 1;
-	ondemand_powersave_bias_init();
 	dbs_info->sample_type = DBS_NORMAL_SAMPLE;
 	INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
 	queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,
@@ -530,7 +524,6 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 
 static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info)
 {
-	dbs_info->enable = 0;
 	cancel_delayed_work_sync(&dbs_info->work);
 }
 
@@ -549,19 +542,15 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 		if ((!cpu_online(cpu)) || (!policy->cur))
 			return -EINVAL;
 
-		if (this_dbs_info->enable) /* Already enabled */
-			break;
-
 		mutex_lock(&dbs_mutex);
-		dbs_enable++;
 
 		rc = sysfs_create_group(&policy->kobj, &dbs_attr_group);
 		if (rc) {
-			dbs_enable--;
 			mutex_unlock(&dbs_mutex);
 			return rc;
 		}
 
+		dbs_enable++;
 		for_each_cpu(j, policy->cpus) {
 			struct cpu_dbs_info_s *j_dbs_info;
 			j_dbs_info = &per_cpu(cpu_dbs_info, j);
@@ -575,6 +564,8 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 			}
 		}
 		this_dbs_info->cpu = cpu;
+		ondemand_powersave_bias_init_cpu(cpu);
+		mutex_init(&this_dbs_info->timer_mutex);
 		/*
 		 * Start the timerschedule work, when this governor
 		 * is used for first time
@@ -602,20 +593,21 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
 		mutex_lock(&dbs_mutex);
 		sysfs_remove_group(&policy->kobj, &dbs_attr_group);
+		mutex_destroy(&this_dbs_info->timer_mutex);
 		dbs_enable--;
 		mutex_unlock(&dbs_mutex);
 
 		break;
 
 	case CPUFREQ_GOV_LIMITS:
-		mutex_lock(&dbs_mutex);
+		mutex_lock(&this_dbs_info->timer_mutex);
 		if (policy->max < this_dbs_info->cur_policy->cur)
 			__cpufreq_driver_target(this_dbs_info->cur_policy,
 				policy->max, CPUFREQ_RELATION_H);
 		else if (policy->min > this_dbs_info->cur_policy->cur)
 			__cpufreq_driver_target(this_dbs_info->cur_policy,
 				policy->min, CPUFREQ_RELATION_L);
-		mutex_unlock(&dbs_mutex);
+		mutex_unlock(&this_dbs_info->timer_mutex);
 		break;
 	}
 	return 0;

linux-2.6-cpufreq-eliminate-lockdep-warnings.patch:
 cpufreq.c              |    4 ++--
 cpufreq_conservative.c |   27 +++++++++++----------------
 cpufreq_ondemand.c     |   27 +++++++++++----------------
 3 files changed, 24 insertions(+), 34 deletions(-)

--- NEW FILE linux-2.6-cpufreq-eliminate-lockdep-warnings.patch ---
From: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Fri, 3 Jul 2009 00:08:30 +0000 (-0700)
Subject: [CPUFREQ] Eliminate the recent lockdep warnings in cpufreq
X-Git-Tag: v2.6.31-rc3~50^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7d26e2d5e2da37e92c6c7644b26b294dedd8c982

[ <cebbert at redhat.com> : backport to 2.6.30 ]

[CPUFREQ] Eliminate the recent lockdep warnings in cpufreq

Commit b14893a62c73af0eca414cfed505b8c09efc613c although it was very
much needed to properly cleanup ondemand timer, opened-up a can of worms
related to locking dependencies in cpufreq.

Patch here defines the need for dbs_mutex and cleans up its usage in
ondemand governor. This also resolves the lockdep warnings reported here

http://lkml.indiana.edu/hypermail/linux/kernel/0906.1/01925.html
http://lkml.indiana.edu/hypermail/linux/kernel/0907.0/00820.html

and few others..

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Dave Jones <davej at redhat.com>
---

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 6e2ec0b..c7fe16e 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1070,8 +1070,6 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)
 	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
 #endif
 
-	unlock_policy_rwsem_write(cpu);
-
 	if (cpufreq_driver->target)
 		__cpufreq_governor(data, CPUFREQ_GOV_STOP);
 
@@ -1088,6 +1086,8 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)
 	if (cpufreq_driver->exit)
 		cpufreq_driver->exit(data);
 
+	unlock_policy_rwsem_write(cpu);
+
 	free_cpumask_var(data->related_cpus);
 	free_cpumask_var(data->cpus);
 	kfree(data);
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 7fc58af..58889f2 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -70,15 +70,10 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 static unsigned int dbs_enable;	/* number of CPUs using this policy */
 
 /*
- * DEADLOCK ALERT! There is a ordering requirement between cpu_hotplug
- * lock and dbs_mutex. cpu_hotplug lock should always be held before
- * dbs_mutex. If any function that can potentially take cpu_hotplug lock
- * (like __cpufreq_driver_target()) is being called with dbs_mutex taken, then
- * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock
- * is recursive for the same process. -Venki
- * DEADLOCK ALERT! (2) : do_dbs_timer() must not take the dbs_mutex, because it
- * would deadlock with cancel_delayed_work_sync(), which is needed for proper
- * raceless workqueue teardown.
+ * dbs_mutex protects data in dbs_tuners_ins from concurrent changes on
+ * different CPUs. It protects dbs_enable in governor start/stop. It also
+ * serializes governor limit_change with do_dbs_timer. We do not want
+ * do_dbs_timer to run when user is changing the governor or limits.
  */
 static DEFINE_MUTEX(dbs_mutex);
 
@@ -488,18 +483,17 @@ static void do_dbs_timer(struct work_struct *work)
 
 	delay -= jiffies % delay;
 
-	if (lock_policy_rwsem_write(cpu) < 0)
-		return;
+	mutex_lock(&dbs_mutex);
 
 	if (!dbs_info->enable) {
-		unlock_policy_rwsem_write(cpu);
+		mutex_unlock(&dbs_mutex);
 		return;
 	}
 
 	dbs_check_cpu(dbs_info);
 
 	queue_delayed_work_on(cpu, kconservative_wq, &dbs_info->work, delay);
-	unlock_policy_rwsem_write(cpu);
+	mutex_unlock(&dbs_mutex);
 }
 
 static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
@@ -590,15 +584,16 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 					&dbs_cpufreq_notifier_block,
 					CPUFREQ_TRANSITION_NOTIFIER);
 		}
-		dbs_timer_init(this_dbs_info);
-
 		mutex_unlock(&dbs_mutex);
 
+		dbs_timer_init(this_dbs_info);
+
 		break;
 
 	case CPUFREQ_GOV_STOP:
-		mutex_lock(&dbs_mutex);
 		dbs_timer_exit(this_dbs_info);
+
+		mutex_lock(&dbs_mutex);
 		sysfs_remove_group(&policy->kobj, &dbs_attr_group);
 		dbs_enable--;
 
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 1911d17..246ae14 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -78,15 +78,10 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 static unsigned int dbs_enable;	/* number of CPUs using this policy */
 
 /*
- * DEADLOCK ALERT! There is a ordering requirement between cpu_hotplug
- * lock and dbs_mutex. cpu_hotplug lock should always be held before
- * dbs_mutex. If any function that can potentially take cpu_hotplug lock
- * (like __cpufreq_driver_target()) is being called with dbs_mutex taken, then
- * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock
- * is recursive for the same process. -Venki
- * DEADLOCK ALERT! (2) : do_dbs_timer() must not take the dbs_mutex, because it
- * would deadlock with cancel_delayed_work_sync(), which is needed for proper
- * raceless workqueue teardown.
+ * dbs_mutex protects data in dbs_tuners_ins from concurrent changes on
+ * different CPUs. It protects dbs_enable in governor start/stop. It also
+ * serializes governor limit_change with do_dbs_timer. We do not want
+ * do_dbs_timer to run when user is changing the governor or limits.
  */
 static DEFINE_MUTEX(dbs_mutex);
 
@@ -494,11 +489,10 @@ static void do_dbs_timer(struct work_struct *work)
 
 	delay -= jiffies % delay;
 
-	if (lock_policy_rwsem_write(cpu) < 0)
-		return;
+	mutex_lock(&dbs_mutex);
 
 	if (!dbs_info->enable) {
-		unlock_policy_rwsem_write(cpu);
+		mutex_unlock(&dbs_mutex);
 		return;
 	}
 
@@ -517,7 +511,7 @@ static void do_dbs_timer(struct work_struct *work)
 			dbs_info->freq_lo, CPUFREQ_RELATION_H);
 	}
 	queue_delayed_work_on(cpu, kondemand_wq, &dbs_info->work, delay);
-	unlock_policy_rwsem_write(cpu);
+	mutex_unlock(&dbs_mutex);
 }
 
 static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
@@ -598,14 +592,15 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
 			dbs_tuners_ins.sampling_rate = def_sampling_rate;
 		}
-		dbs_timer_init(this_dbs_info);
-
 		mutex_unlock(&dbs_mutex);
+
+		dbs_timer_init(this_dbs_info);
 		break;
 
 	case CPUFREQ_GOV_STOP:
-		mutex_lock(&dbs_mutex);
 		dbs_timer_exit(this_dbs_info);
+
+		mutex_lock(&dbs_mutex);
 		sysfs_remove_group(&policy->kobj, &dbs_attr_group);
 		dbs_enable--;
 		mutex_unlock(&dbs_mutex);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1733
retrieving revision 1.1734
diff -u -p -r1.1733 -r1.1734
--- kernel.spec	12 Sep 2009 05:46:30 -0000	1.1733
+++ kernel.spec	15 Sep 2009 05:00:12 -0000	1.1734
@@ -735,6 +735,10 @@ Patch14060: linux-2.6-v4l-dvb-af9015-fix
 Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
+# fix lockdep warnings in cpufreq (#522685)
+Patch14100: linux-2.6-cpufreq-eliminate-lockdep-warnings.patch
+Patch14101: linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1365,6 +1369,10 @@ ApplyPatch linux-2.6-v4l-dvb-af9015-fix-
 ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
 ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
 
+# fix lockdep warnings in cpufreq (#522685)
+ApplyPatch linux-2.6-cpufreq-eliminate-lockdep-warnings.patch
+ApplyPatch linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1953,6 +1961,9 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-55.rc1
+- Fix cpufreq lockdep warnings (#522685)
+
 * Sat Sep 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-54.rc1
 - 2.6.30.7-rc1
 - Drop patches merged in -stable:



From oget at fedoraproject.org  Tue Sep 15 05:02:00 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 05:02:00 +0000 (UTC)
Subject: rpms/multimedia-menus/devel multimedia-menus.spec,1.2,1.3
Message-ID: <20090915050200.41E3711C0374@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9974

Modified Files:
	multimedia-menus.spec 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-2
- Add missing BR: intltool



Index: multimedia-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/multimedia-menus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- multimedia-menus.spec	15 Sep 2009 04:53:26 -0000	1.2
+++ multimedia-menus.spec	15 Sep 2009 05:01:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           multimedia-menus
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Categorization for the GNOME/KDE Sound&Video/Multimedia menu
 Group:          User Interface/Desktops
 # Licensing of individual parts is explained in licensing.txt file
@@ -9,6 +9,7 @@ URL:            https://fedorahosted.org
 Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  intltool
 Requires:       redhat-menus hicolor-icon-theme
 
 %description
@@ -61,6 +62,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-2
+- Add missing BR: intltool
+
 * Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-1
 - Lots of translations! YAAY!
 - Change URL to fedorahosted



From oget at fedoraproject.org  Tue Sep 15 05:03:26 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 05:03:26 +0000 (UTC)
Subject: rpms/multimedia-menus/F-11 multimedia-menus.spec,1.2,1.3
Message-ID: <20090915050326.77C9411C0374@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11080

Modified Files:
	multimedia-menus.spec 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-2
- Add missing BR: intltool



Index: multimedia-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/multimedia-menus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- multimedia-menus.spec	15 Sep 2009 04:55:26 -0000	1.2
+++ multimedia-menus.spec	15 Sep 2009 05:03:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           multimedia-menus
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Categorization for the GNOME/KDE Sound&Video/Multimedia menu
 Group:          User Interface/Desktops
 # Licensing of individual parts is explained in licensing.txt file
@@ -9,6 +9,7 @@ URL:            https://fedorahosted.org
 Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  intltool
 Requires:       redhat-menus hicolor-icon-theme
 
 %description
@@ -61,6 +62,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-2
+- Add missing BR: intltool
+
 * Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-1
 - Lots of translations! YAAY!
 - Change URL to fedorahosted



From cebbert at fedoraproject.org  Tue Sep 15 05:48:14 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 15 Sep 2009 05:48:14 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-cifs-reenable-lanman-security.patch, NONE,
	1.1 kernel.spec, 1.1734, 1.1735
Message-ID: <20090915054814.C3FE611C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18393

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-cifs-reenable-lanman-security.patch 
Log Message:
Fix CIFS security flags mask broken in 2.6.30 (#523173)

linux-2.6-cifs-reenable-lanman-security.patch:
 cifsglob.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-cifs-reenable-lanman-security.patch ---
[CIFS] Re-enable Lanman security

commit ac68392460ffefed13020967bae04edc4d3add06 ("[CIFS] Allow raw 
ntlmssp code to be enabled with sec=ntlmssp") added a new bit to the
allowed security flags mask but seems to have inadvertently removed
Lanman security from the allowed flags. Add it back.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- linux-2.6.30.noarch.orig/fs/cifs/cifsglob.h
+++ linux-2.6.30.noarch/fs/cifs/cifsglob.h
@@ -544,9 +544,9 @@ require use of the stronger protocol */
 #define   CIFSSEC_MUST_LANMAN	0x10010
 #define   CIFSSEC_MUST_PLNTXT	0x20020
 #ifdef CONFIG_CIFS_UPCALL
-#define   CIFSSEC_MASK          0xAF0AF /* allows weak security but also krb5 */
+#define   CIFSSEC_MASK          0xBF0BF /* allows weak security but also krb5 */
 #else
-#define   CIFSSEC_MASK          0xA70A7 /* current flags supported if weak */
+#define   CIFSSEC_MASK          0xB70B7 /* current flags supported if weak */
 #endif /* UPCALL */
 #else /* do not allow weak pw hash */
 #ifdef CONFIG_CIFS_UPCALL


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1734
retrieving revision 1.1735
diff -u -p -r1.1734 -r1.1735
--- kernel.spec	15 Sep 2009 05:00:12 -0000	1.1734
+++ kernel.spec	15 Sep 2009 05:48:12 -0000	1.1735
@@ -725,6 +725,9 @@ Patch13002: linux-2.6-virtio_blk-dont-bo
 
 Patch14000: make-mmap_min_addr-suck-less.patch
 
+# ----- send for upstream inclusion -----
+Patch14010: linux-2.6-cifs-reenable-lanman-security.patch
+
 # ----- patches headed for -stable -----
 
 # Fix string overflows found by stackprotector:
@@ -1357,6 +1360,9 @@ ApplyPatch linux-2.6-virtio_blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
+# ----- send for upstream inclusion -----
+ApplyPatch linux-2.6-cifs-reenable-lanman-security.patch
+
 # ----- patches headed for -stable -----
 
 # CVE-2009-2847
@@ -1961,7 +1967,10 @@ fi
 # and build.
 
 %changelog
-* Sat Sep 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-55.rc1
+* Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-56.rc1
+- Fix CIFS security flags mask broken in 2.6.30 (#523173)
+
+* Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-55.rc1
 - Fix cpufreq lockdep warnings (#522685)
 
 * Sat Sep 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-54.rc1



From phuang at fedoraproject.org  Tue Sep 15 05:49:17 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 15 Sep 2009 05:49:17 +0000 (UTC)
Subject: rpms/ibus-pinyin/devel .cvsignore, 1.15, 1.16 ibus-pinyin.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <20090915054917.1884211C00EB@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20245

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Update to 1.2.0.20090915


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Jun 2009 05:33:50 -0000	1.15
+++ .cvsignore	15 Sep 2009 05:49:16 -0000	1.16
@@ -1,2 +1,2 @@
 pinyin-database-0.1.10.6.tar.bz2
-ibus-pinyin-1.2.0.20090617.tar.gz
+ibus-pinyin-1.2.0.20090915.tar.gz


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/ibus-pinyin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ibus-pinyin.spec	25 Jul 2009 03:02:30 -0000	1.17
+++ ibus-pinyin.spec	15 Sep 2009 05:49:16 -0000	1.18
@@ -1,8 +1,8 @@
 %define reqiure_ibus_version 1.2.0
 
 Name:       ibus-pinyin
-Version:    1.2.0.20090617
-Release:    2%{?dist}
+Version:    1.2.0.20090915
+Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -54,6 +54,10 @@ python -c "import pysqlitedb; db = pysql
 %{_libexecdir}/ibus-setup-pinyin
 
 %changelog
+* Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
+- Update to 1.2.0.20090915.
+- Fix bug 508006 - The color of English Candidates doesn't work
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Jun 2009 05:33:50 -0000	1.15
+++ sources	15 Sep 2009 05:49:16 -0000	1.16
@@ -1,2 +1,2 @@
 ebd8d2381993372bb97a877b549e14a0  pinyin-database-0.1.10.6.tar.bz2
-f647d320d1c22c7f4bc322eddd638050  ibus-pinyin-1.2.0.20090617.tar.gz
+97b3c95280bec6a56c587d12158139a2  ibus-pinyin-1.2.0.20090915.tar.gz



From phuang at fedoraproject.org  Tue Sep 15 06:05:02 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 15 Sep 2009 06:05:02 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.42, 1.43 ibus.spec, 1.90, 1.91 sources,
	1.48, 1.49
Message-ID: <20090915060503.097B611C00EB@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21217

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20090915


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	4 Sep 2009 04:29:20 -0000	1.42
+++ .cvsignore	15 Sep 2009 06:04:52 -0000	1.43
@@ -1 +1 @@
-ibus-1.2.0.20090904.tar.gz
+ibus-1.2.0.20090915.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- ibus.spec	4 Sep 2009 10:42:49 -0000	1.90
+++ ibus.spec	15 Sep 2009 06:04:57 -0000	1.91
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090904
-Release:    2%{?dist}
+Version:    1.2.0.20090915
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -234,6 +234,12 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
+- Update to 1.2.0.20090915
+- Fix bug 521591 - check if the icon filename is a real file before trying to open it
+- Fix bug 522310 - Memory leak on show/hide
+- Fix bug 509518 - ibus-anthy should only override to jp layout for kana input
+
 * Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-2
 - Refresh the tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	4 Sep 2009 10:42:49 -0000	1.48
+++ sources	15 Sep 2009 06:04:57 -0000	1.49
@@ -1 +1 @@
-77af615da11d5c30b331951172c449fb  ibus-1.2.0.20090904.tar.gz
+755442695b6f98f3bfa64bad6d778412  ibus-1.2.0.20090915.tar.gz



From chitlesh at fedoraproject.org  Tue Sep 15 06:05:54 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 06:05:54 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.115,1.116
Message-ID: <20090915060554.941D111C00EB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22262

Modified Files:
	comps-f12.xml.in 
Log Message:
Added texlipse, PLA tools for FEL


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- comps-f12.xml.in	14 Sep 2009 14:45:09 -0000	1.115
+++ comps-f12.xml.in	15 Sep 2009 06:05:53 -0000	1.116
@@ -1387,7 +1387,12 @@
       <packagereq type="default">drawtiming</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
+      <packagereq type="default">eclipse-texlipse</packagereq>
       <packagereq type="default">electric</packagereq>
+      <packagereq type="default">emacs-dinotrace</packagereq>
+      <packagereq type="default">emacs-verilog-mode</packagereq>
+      <packagereq type="default">emacs-vregs-mode</packagereq>
+      <packagereq type="default">eqntott</packagereq>
       <packagereq type="default">espresso-ab</packagereq>
       <packagereq type="default">gds2pov</packagereq>
       <packagereq type="default">geda-docs</packagereq>
@@ -1421,6 +1426,7 @@
       <packagereq type="default">netgen</packagereq>
       <packagereq type="default">ngspice</packagereq>
       <packagereq type="default">ngspice-doc</packagereq>
+      <packagereq type="default">openocd</packagereq>
       <packagereq type="default">pcb</packagereq>
       <packagereq type="default">perl-Hardware-Verilog-Parser</packagereq>
       <packagereq type="default">perl-Hardware-Vhdl-Lexer</packagereq>
@@ -1454,6 +1460,7 @@
       <packagereq type="default">usrp</packagereq>
       <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
+      <packagereq type="default">vrq</packagereq>
       <packagereq type="default">vym</packagereq>
       <packagereq type="default">xcircuit</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>



From scop at fedoraproject.org  Tue Sep 15 06:06:56 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 15 Sep 2009 06:06:56 +0000 (UTC)
Subject: rpms/seeker/devel import.log, NONE, 1.1 seeker.LICENSE, NONE,
	1.1 seeker.spec, NONE, 1.1 seeker_baryluk.c, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915060656.F40B311C00EB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/seeker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24898/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log seeker.LICENSE seeker.spec seeker_baryluk.c 
Log Message:
Initial import (#520701).


--- NEW FILE import.log ---
seeker-3_0-2_fc11:HEAD:seeker-3.0-2.fc11.src.rpm:1252994774


--- NEW FILE seeker.LICENSE ---
http://www.linuxinsight.com/how_fast_is_your_disk.html?page=1#comment-971

ChangeLog, AUTHORS, TODO...
Submitted by admin on Wed, 2007-01-17 20:39.

Well, I don't have plans to make this a full blown package at this
time, because of the utter lack of free time, sorry. But in time, yes,
why not. The trigger event could be when I have time to make it
multithreaded. Then it should become much more useful.

In the meantime, put this on the top of seeker.c:

# Seeker v2.0, 2007-01-15, by linportal at gmail.com
# http://www.linuxinsight.com/how_fast_is_your_disk.html
# Distributed under the terms of the GNU General Public License v2

And then you can do whatever you like with it. If it's not against GPL
rules, of course. ;)


--- NEW FILE seeker.spec ---
Name:           seeker
Version:        3.0
Release:        2%{?dist}
Summary:        Random access disk benchmark utility

Group:          Applications/System
License:        GPLv2 and CC-BY-SA
URL:            http://www.linuxinsight.com/how_fast_is_your_disk.html
# http://www.linuxinsight.com/how_fast_is_your_disk.html#comment-1583
Source0:        http://smp.if.uj.edu.pl/~baryluk/seeker_baryluk.c
# http://www.linuxinsight.com/how_fast_is_your_disk.html?page=1#comment-971
Source1:        %{name}.LICENSE
# Grabbed with firefox, modified, ran through tidy(1) per CC BY-SA 2.5:
# http://www.linuxinsight.com/about.html
Source2:        %{name}-docs.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Seeker is a simple utility that reads small pieces of data from a raw
disk device in a random access pattern, and reports the average number
of seeks per second, and calculated random access time of the disk.
The seeker variant included in this package is the multithreaded one
by Witold Baryluk.


%prep
%setup -q -c -T -a 2
install -pm 644 %{SOURCE0} $(basename %{SOURCE0}) # for debuginfo
cp -p %{SOURCE1} LICENSE


%build
%{__cc} $RPM_OPT_FLAGS -pthread $(basename %{SOURCE0}) -o seeker


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 seeker $RPM_BUILD_ROOT%{_sbindir}/seeker


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE how_fast_is_your_disk*
%{_sbindir}/seeker


%changelog
* Sun Sep 13 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0-2
- Address review comments (#520701):
- Improve %%description.
- Include upstream article in docs.

* Fri Aug 28 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0-1
- First build.


--- NEW FILE seeker_baryluk.c ---
#define _LARGEFILE64_SOURCE

#ifndef _REENTRANT
#define _REENTRANT
#endif
#include <pthread.h>

#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
#include <time.h>
#include <signal.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <linux/fs.h>

#define BLOCKSIZE 512
#define TIMEOUT 30

pthread_mutex_t muteks = PTHREAD_MUTEX_INITIALIZER;

int count;
time_t start;
off64_t maxoffset = 0;
off64_t minoffset = 249994674176000uLL;


int threads;

typedef struct {
	int id;
	int fd;
	int run;
	char* filename;
	unsigned int seed;
	unsigned long long numbytes;
	char* buffer;
	int count;
	off64_t maxoffset;
	off64_t minoffset;
} parm;

parm *p;

void done() {
	int i;
	time_t end;

	time(&end);

	if (end < start + TIMEOUT) {
		printf(".");
		alarm(1);
		return;
	}

	for (i = 0; i < threads; i++) {
		p[i].run = 0;
	}
}

void report() {
	if (count) {
		printf(".\nResults: %d seeks/second, %.3f ms random access time (%llu < offsets < %llu)\n",
			count / TIMEOUT, 1000.0 * TIMEOUT / count, (unsigned long long)minoffset, (unsigned long long)maxoffset);
	}
	exit(EXIT_SUCCESS);
}

void handle(const char *string, int error) {
	if (error) {
		perror(string);
		exit(EXIT_FAILURE);
	}
}

void* f(void *arg) {
	int retval;
	off64_t offset;

	parm *p = (parm*)arg;

	srand(p->seed);

	/* wait for all processes */
	pthread_mutex_lock(&muteks);
	pthread_mutex_unlock(&muteks);

	while (p->run) {
		offset = (off64_t) ( (unsigned long long) (p->numbytes * (rand_r(&(p->seed)) / (RAND_MAX + 1.0) )));
		//printf("%d %llu\n", p->id, (unsigned long long )offset);
		retval = lseek64(p->fd, offset, SEEK_SET);
		handle("lseek64", retval == (off64_t) -1);
		retval = read(p->fd, p->buffer, BLOCKSIZE);
		handle("read", retval < 0);

		p->count++;
		if (offset > p->maxoffset) {
			p->maxoffset = offset;
		} else if (offset < p->minoffset) {
			p->minoffset = offset;
		}
	}

	//pthread_exit(NULL);
	return NULL;
}

int main(int argc, char **argv) {
	int fd, retval;
	int physical_sector_size = 0;
	size_t logical_sector_size = 0ULL;
	unsigned long long numblocks, numbytes;
	unsigned long long ull;
	unsigned long ul;
	pthread_t *t_id;
	pthread_attr_t pthread_custom_attr;
	int i;

	setvbuf(stdout, NULL, _IONBF, 0);

	printf("Seeker v3.0, 2009-06-17, "
	       "http://www.linuxinsight.com/how_fast_is_your_disk.html\n");

	if (!(argc == 2 || argc == 3)) {
		printf("Usage: %s device [threads]\n", argv[0]);
		exit(1);
	}

	threads = 1;
	if (argc == 3) {
		threads = atoi(argv[2]);
	}

	//pthread_mutex_init(&muteks, NULL); 

	fd = open(argv[1], O_RDONLY | O_LARGEFILE);
	handle("open", fd < 0);

#ifdef BLKGETSIZE64
	retval = ioctl(fd, BLKGETSIZE64, &ull);
	numbytes = (unsigned long long)ull;
#else
	retval = ioctl(fd, BLKGETSIZE, &ul);
	numbytes = (unsigned long long)ul;
#endif
	handle("ioctl", retval == -1);
	retval = ioctl(fd, BLKBSZGET, &logical_sector_size);
	handle("ioctl", retval == -1 && logical_sector_size > 0);
	retval = ioctl(fd, BLKSSZGET, &physical_sector_size);
	handle("ioctl", retval == -1 && physical_sector_size > 0);
	numblocks = ((unsigned long long)numbytes)/(unsigned long long)BLOCKSIZE;
	printf("Benchmarking %s [%llu blocks, %llu bytes, %llu GB, %llu MB, %llu GiB, %llu MiB]\n",
		argv[1], numblocks, numbytes, numbytes/(1024uLL*1024uLL*1024uLL), numbytes / (1024uLL*1024uLL), numbytes/(1000uLL*1000uLL*1000uLL), numbytes / (1000uLL*1000uLL));
	printf("[%d logical sector size, %d physical sector size]\n", physical_sector_size, physical_sector_size);
	printf("[%d threads]\n", threads);
	printf("Wait %d seconds", TIMEOUT);

	t_id = (pthread_t *)malloc(threads*sizeof(pthread_t));
	handle("malloc", t_id == NULL);
	pthread_attr_init(&pthread_custom_attr);
	p = (parm *)malloc(sizeof(parm)*threads);
	handle("malloc", p == NULL);

	time(&start);

	pthread_mutex_lock(&muteks);


	srand((unsigned int)start*(unsigned int)getpid());

	for (i = 0; i < threads; i++) {
		p[i].id = i;
		p[i].filename = argv[1];
		p[i].seed = rand()+i;
		p[i].fd = dup(fd);
		handle("dup", p[i].fd < 0);
		p[i].buffer = malloc(sizeof(char)*BLOCKSIZE);
		p[i].numbytes = numbytes;
		handle("malloc", p[i].buffer == NULL);
		p[i].run = 1;
		p[i].count = 0;
		p[i].minoffset = minoffset;
		p[i].maxoffset = maxoffset;

		retval = pthread_create(&(t_id[i]), NULL, f, (void*)(p+i));
		handle("pthread_create", retval != 0);
	}

	sleep(1);

	time(&start);
	signal(SIGALRM, &done);
	alarm(1);

	pthread_mutex_unlock(&muteks);

	for (i = 0; i < threads; i++) {
		pthread_join(t_id[i], NULL);
	}

	for (i = 0; i < threads; i++) {
		count += p[i].count;
		if (p[i].maxoffset > maxoffset) {
			maxoffset = p[i].maxoffset;
		}
		if (p[i].minoffset < minoffset) {
			minoffset = p[i].minoffset;
		}
	}

	report();

	/* notreached */
	return 0;
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:36:50 -0000	1.1
+++ .cvsignore	15 Sep 2009 06:06:55 -0000	1.2
@@ -0,0 +1 @@
+seeker-docs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:36:50 -0000	1.1
+++ sources	15 Sep 2009 06:06:56 -0000	1.2
@@ -0,0 +1 @@
+b169f93946dd18a46f4f63f71a2229fc  seeker-docs.tar.gz



From chitlesh at fedoraproject.org  Tue Sep 15 06:09:36 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 06:09:36 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.7,1.8
Message-ID: <20090915060936.9806D11C00EB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27769

Modified Files:
	comps-f13.xml.in 
Log Message:
Added texlipse, PLA tools for FEL 13


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- comps-f13.xml.in	14 Sep 2009 14:45:09 -0000	1.7
+++ comps-f13.xml.in	15 Sep 2009 06:09:34 -0000	1.8
@@ -1385,9 +1385,14 @@
       <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
-      <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
+      <packagereq type="default">eclipse-texlipse</packagereq>
+      <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">electric</packagereq>
+      <packagereq type="default">emacs-dinotrace</packagereq>
+      <packagereq type="default">emacs-verilog-mode</packagereq>
+      <packagereq type="default">emacs-vregs-mode</packagereq>
+      <packagereq type="default">eqntott</packagereq>
       <packagereq type="default">espresso-ab</packagereq>
       <packagereq type="default">gds2pov</packagereq>
       <packagereq type="default">geda-docs</packagereq>
@@ -1421,6 +1426,7 @@
       <packagereq type="default">netgen</packagereq>
       <packagereq type="default">ngspice</packagereq>
       <packagereq type="default">ngspice-doc</packagereq>
+      <packagereq type="default">openocd</packagereq>
       <packagereq type="default">pcb</packagereq>
       <packagereq type="default">perl-Hardware-Verilog-Parser</packagereq>
       <packagereq type="default">perl-Hardware-Vhdl-Lexer</packagereq>
@@ -1454,6 +1460,7 @@
       <packagereq type="default">usrp</packagereq>
       <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
+      <packagereq type="default">vrq</packagereq>
       <packagereq type="default">vym</packagereq>
       <packagereq type="default">xcircuit</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>



From scop at fedoraproject.org  Tue Sep 15 06:12:06 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 15 Sep 2009 06:12:06 +0000 (UTC)
Subject: rpms/seeker/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 seeker_baryluk.c, 1.1, NONE
Message-ID: <20090915061206.DA09611C048A@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/seeker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30408

Modified Files:
	.cvsignore sources 
Removed Files:
	seeker_baryluk.c 
Log Message:
Move source to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Sep 2009 06:06:55 -0000	1.2
+++ .cvsignore	15 Sep 2009 06:12:04 -0000	1.3
@@ -1 +1,2 @@
+seeker_baryluk.c
 seeker-docs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Sep 2009 06:06:56 -0000	1.2
+++ sources	15 Sep 2009 06:12:04 -0000	1.3
@@ -1 +1,2 @@
+593802c3a86923fff7659a256bc43b1b  seeker_baryluk.c
 b169f93946dd18a46f4f63f71a2229fc  seeker-docs.tar.gz


--- seeker_baryluk.c DELETED ---



From oget at fedoraproject.org  Tue Sep 15 06:14:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 06:14:06 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.116,1.117 comps-f13.xml.in,1.8,1.9
Message-ID: <20090915061406.A49A811C0261@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32144

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Add the optional multimedia-menus package



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- comps-f12.xml.in	15 Sep 2009 06:05:53 -0000	1.116
+++ comps-f12.xml.in	15 Sep 2009 06:14:02 -0000	1.117
@@ -5060,6 +5060,7 @@
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">muine</packagereq>
+      <packagereq type="optional">multimedia-menus</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nted</packagereq>
       <packagereq type="optional">nyquist</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- comps-f13.xml.in	15 Sep 2009 06:09:34 -0000	1.8
+++ comps-f13.xml.in	15 Sep 2009 06:14:02 -0000	1.9
@@ -5056,6 +5056,7 @@
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">muine</packagereq>
+      <packagereq type="optional">multimedia-menus</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nted</packagereq>
       <packagereq type="optional">nyquist</packagereq>



From bskeggs at fedoraproject.org  Tue Sep 15 06:44:15 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 15 Sep 2009 06:44:15 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.54, 1.55 kernel.spec, 1.1799, 
	1.1800
Message-ID: <20090915064415.E9AD111C00CE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24640

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: temporarily disable fbcon accel, it's racing with ttm



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  520 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  750 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  357 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  683 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  473 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  443 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 57992 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- drm-nouveau.patch	14 Sep 2009 06:01:42 -0000	1.54
+++ drm-nouveau.patch	15 Sep 2009 06:44:12 -0000	1.55
@@ -12257,10 +12257,10 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..cf772af
+index 0000000..af69791
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,357 @@
 +/*
 + * Copyright ? 2007 David Airlie
 + *
@@ -12549,6 +12549,7 @@ index 0000000..cf772af
 +	par->nouveau_fb = nouveau_fb;
 +	par->dev = dev;
 +
++#if 0
 +	switch (dev_priv->card_type) {
 +	case NV_50:
 +		nv50_fbcon_accel_init(info);
@@ -12557,6 +12558,7 @@ index 0000000..cf772af
 +		nv04_fbcon_accel_init(info);
 +		break;
 +	};
++#endif
 +
 +	/* Clear the entire fbcon.  The drm will program every connector
 +	 * with it's preferred mode.  If the sizes differ, one display will


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1799
retrieving revision 1.1800
diff -u -p -r1.1799 -r1.1800
--- kernel.spec	14 Sep 2009 17:52:34 -0000	1.1799
+++ kernel.spec	15 Sep 2009 06:44:13 -0000	1.1800
@@ -2040,6 +2040,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: temporarily disable fbcon accel, it's racing with ttm
+
 * Mon Sep 14 2009 Steve Dickson <steved at redhat.com>
 - Added support for -o v4 mount parsing
 



From oget at fedoraproject.org  Tue Sep 15 06:52:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 06:52:42 +0000 (UTC)
Subject: rpms/hydrogen/devel .cvsignore, 1.5, 1.6 hydrogen.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20090915065242.CBC8111C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27454

Modified Files:
	.cvsignore hydrogen.spec sources 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
- Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Aug 2009 05:16:47 -0000	1.5
+++ .cvsignore	15 Sep 2009 06:52:42 -0000	1.6
@@ -1 +1 @@
-hydrogen-0.9.4-rc2.tar.gz
+hydrogen-0.9.4.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hydrogen.spec	23 Aug 2009 05:16:47 -0000	1.14
+++ hydrogen.spec	15 Sep 2009 06:52:42 -0000	1.15
@@ -1,11 +1,9 @@
-%global prerel rc2
-
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.7.%{prerel}%{?dist}
+Release:      1%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel}.tar.gz
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
 License:      GPLv2+
@@ -30,7 +28,7 @@ Hydrogen is an advanced drum machine for
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel}
+%setup -q -n %{name}-%{version}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
 
@@ -84,13 +82,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README.txt
+%doc AUTHORS ChangeLog COPYING* README.txt
 %{_bindir}/hydrogen
 %{_datadir}/hydrogen
 %{_datadir}/applications/fedora-hydrogen.desktop
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
+- Update to 0.9.4
+
 * Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
 - Update to 0.9.4-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 05:16:47 -0000	1.5
+++ sources	15 Sep 2009 06:52:42 -0000	1.6
@@ -1 +1 @@
-92337e1fddcbe9b9581b7a43d8823c9e  hydrogen-0.9.4-rc2.tar.gz
+69b0e35a5bba8151347c5e6ec9e8e4f3  hydrogen-0.9.4.tar.gz



From oget at fedoraproject.org  Tue Sep 15 06:53:55 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 06:53:55 +0000 (UTC)
Subject: rpms/hydrogen/F-11 .cvsignore, 1.5, 1.6 hydrogen.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <20090915065355.EB15E11C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27935

Modified Files:
	.cvsignore hydrogen.spec sources 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
- Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Aug 2009 05:17:46 -0000	1.5
+++ .cvsignore	15 Sep 2009 06:53:55 -0000	1.6
@@ -1 +1 @@
-hydrogen-0.9.4-rc2.tar.gz
+hydrogen-0.9.4.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-11/hydrogen.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hydrogen.spec	23 Aug 2009 05:17:46 -0000	1.12
+++ hydrogen.spec	15 Sep 2009 06:53:55 -0000	1.13
@@ -1,11 +1,9 @@
-%global prerel rc2
-
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.7.%{prerel}%{?dist}
+Release:      1%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel}.tar.gz
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
 License:      GPLv2+
@@ -30,7 +28,7 @@ Hydrogen is an advanced drum machine for
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel}
+%setup -q -n %{name}-%{version}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
 
@@ -84,13 +82,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README.txt
+%doc AUTHORS ChangeLog COPYING* README.txt
 %{_bindir}/hydrogen
 %{_datadir}/hydrogen
 %{_datadir}/applications/fedora-hydrogen.desktop
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
+- Update to 0.9.4
+
 * Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
 - Update to 0.9.4-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 05:17:46 -0000	1.5
+++ sources	15 Sep 2009 06:53:55 -0000	1.6
@@ -1 +1 @@
-92337e1fddcbe9b9581b7a43d8823c9e  hydrogen-0.9.4-rc2.tar.gz
+69b0e35a5bba8151347c5e6ec9e8e4f3  hydrogen-0.9.4.tar.gz



From oget at fedoraproject.org  Tue Sep 15 06:55:57 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 15 Sep 2009 06:55:57 +0000 (UTC)
Subject: rpms/hydrogen/F-10 .cvsignore, 1.5, 1.6 hydrogen.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20090915065557.5FF5211C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28691

Modified Files:
	.cvsignore hydrogen.spec sources 
Log Message:
* Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
- Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Aug 2009 05:23:10 -0000	1.5
+++ .cvsignore	15 Sep 2009 06:55:55 -0000	1.6
@@ -1 +1 @@
-hydrogen-0.9.4-rc2.tar.gz
+hydrogen-0.9.4.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/hydrogen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- hydrogen.spec	23 Aug 2009 05:23:10 -0000	1.9
+++ hydrogen.spec	15 Sep 2009 06:55:55 -0000	1.10
@@ -1,11 +1,9 @@
-%global prerel rc2
-
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.7.%{prerel}%{?dist}
+Release:      1%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel}.tar.gz
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
 License:      GPLv2+
@@ -30,7 +28,7 @@ Hydrogen is an advanced drum machine for
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel}
+%setup -q -n %{name}-%{version}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
 
@@ -84,13 +82,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README.txt
+%doc AUTHORS ChangeLog COPYING* README.txt
 %{_bindir}/hydrogen
 %{_datadir}/hydrogen
 %{_datadir}/applications/fedora-hydrogen.desktop
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Tue Sep 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-1
+- Update to 0.9.4
+
 * Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
 - Update to 0.9.4-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 05:23:10 -0000	1.5
+++ sources	15 Sep 2009 06:55:55 -0000	1.6
@@ -1 +1 @@
-92337e1fddcbe9b9581b7a43d8823c9e  hydrogen-0.9.4-rc2.tar.gz
+69b0e35a5bba8151347c5e6ec9e8e4f3  hydrogen-0.9.4.tar.gz



From rvokal at fedoraproject.org  Tue Sep 15 06:56:15 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Tue, 15 Sep 2009 06:56:15 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark.spec,1.57,1.58
Message-ID: <20090915065615.2216E11C00CE@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28846

Modified Files:
	wireshark.spec 
Log Message:
Disable portaudio for RHEL


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- wireshark.spec	28 Aug 2009 12:13:05 -0000	1.57
+++ wireshark.spec	15 Sep 2009 06:56:14 -0000	1.58
@@ -2,12 +2,16 @@
 #define to 0 for final version
 %define svn_version 0
 %define with_adns 0
+%if 0%{?rhel} != 0
+%define with_portaudio 0
+%else
 %define with_portaudio 1
+%endif
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.1
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -210,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Bill Nottingham <notting at redhat.com> - 1.2.1-5
+- do not use portaudio in RHEL
+
 * Fri Aug 28 2009 Radek Vokal <rvokal at redhat.com> - 1.2.1-4
 - yet anohter rebuilt
 



From pmatilai at fedoraproject.org  Tue Sep 15 07:08:35 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 15 Sep 2009 07:08:35 +0000 (UTC)
Subject: rpms/rpm/F-10 rpm-4.6.1-pkgconfig-nover.patch, NONE,
	1.1 rpm-4.6.1-xz-support.patch, NONE, 1.1 rpm.spec, 1.314, 1.315
Message-ID: <20090915070837.6D37A11C00CE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32557

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.1-pkgconfig-nover.patch rpm-4.6.1-xz-support.patch 
Log Message:
- add support for XZ payloads and sources (#514480)
- handle empty version in pkg-config files (#505351)


rpm-4.6.1-pkgconfig-nover.patch:
 pkgconfigdeps.sh |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.6.1-pkgconfig-nover.patch ---
diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh
index 6baa0f1..00cba00 100755
--- a/scripts/pkgconfigdeps.sh
+++ b/scripts/pkgconfigdeps.sh
@@ -20,9 +20,12 @@ case $1 in
 	DIR="`dirname ${filename}`"
 	export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
 	$pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
+	    [ -n "$n" ] || continue
 	    # We have a dependency.  Make a note that we need the pkgconfig
 	    # tool for this package.
-	    echo "pkgconfig($n)" "$r" "$v"
+	    echo -n "pkgconfig($n) "
+	    [ -n "$r" ] && [ -n "$v" ] && echo -n "$r" "$v"
+	    echo
 	done
 	;;
     esac
@@ -34,8 +37,13 @@ case $1 in
     *.pc)
 	i="`expr $i + 1`"
 	[ $i -eq 1 ] && echo "$pkgconfig"
+	DIR="`dirname ${filename}`"
+	export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
 	$pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
-	    echo "pkgconfig($n)" "$r" "$v"
+	    [ -n "$n" ] || continue
+	    echo -n "pkgconfig($n) "
+	    [ -n "$r" ] && [ -n "$v" ] && echo -n "$r" "$v"
+	    echo
 	done
     esac
     done

rpm-4.6.1-xz-support.patch:
 build/pack.c           |    9 ++++
 build/parsePrep.c      |    3 +
 configure.ac           |    3 +
 lib/psm.c              |    2 +
 lib/rpmds.c            |    7 +++
 macros.in              |    4 +-
 rpm2cpio.c             |    2 +
 rpmio/macro.c          |    3 +
 rpmio/rpmfileutil.c    |   10 ++---
 rpmio/rpmfileutil.h    |    3 +
 rpmio/rpmio.c          |   97 ++++++++++++++++++++++++++++++++++++++-----------
 rpmio/rpmio_internal.h |    2 -
 12 files changed, 113 insertions(+), 32 deletions(-)

--- NEW FILE rpm-4.6.1-xz-support.patch ---
diff --git a/build/pack.c b/build/pack.c
index 523367b..c3b1245 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -379,13 +379,20 @@ rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
 
 	if (strcmp(s+1, "gzdio") == 0) {
 	    compr = "gzip";
+#if HAVE_BZLIB_H
 	} else if (strcmp(s+1, "bzdio") == 0) {
 	    compr = "bzip2";
 	    /* Add prereq on rpm version that understands bzip2 payloads */
 	    (void) rpmlibNeedsFeature(h, "PayloadIsBzip2", "3.0.5-1");
+#endif
+#if HAVE_LZMA_H
+	} else if (strcmp(s+1, "xzdio") == 0) {
+	    compr = "xz";
+	    (void) rpmlibNeedsFeature(h, "PayloadIsXz", "5.2-1");
 	} else if (strcmp(s+1, "lzdio") == 0) {
 	    compr = "lzma";
-	    (void) rpmlibNeedsFeature(h, "PayloadIsLzma", "4.4.90-1");
+	    (void) rpmlibNeedsFeature(h, "PayloadIsLzma", "4.4.6-1");
+#endif
 	} else {
 	    rpmlog(RPMLOG_ERR, _("Unknown payload compression: %s\n"),
 		   rpmio_flags);
diff --git a/build/parsePrep.c b/build/parsePrep.c
index 52f192e..c14af1c 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -213,6 +213,9 @@ static char *doUntar(rpmSpec spec, uint32_t c, int quietly)
 	case COMPRESSED_LZMA:
 	    t = "%{__lzma} -dc";
 	    break;
+	case COMPRESSED_XZ:
+	    t = "%{__xz} -dc";
+	    break;
 	}
 	zipper = rpmGetPath(t, NULL);
 	if (needtar) {
diff --git a/configure.ac b/configure.ac
index a72dd3b..3c84b65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,7 @@ AC_SUBST(__ID_U)
 
 AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
 AC_PATH_PROG(__LZMA, lzma, /usr/bin/lzma, $MYPATH)
+AC_PATH_PROG(__XZ, xz, /usr/bin/xz, $MYPATH)
 AC_PATH_PROG(__MAKE, make, /usr/bin/make, $MYPATH)
 AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
 AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
@@ -224,7 +225,7 @@ AC_SUBST(WITH_BZ2_LIB)
 # Check for lzma library.
 
 AC_CHECK_HEADERS([lzma.h],[
-  AC_CHECK_LIB(lzma, lzma_auto_decoder, [WITH_LZMA_LIB=-llzma])
+  AC_CHECK_LIB(lzma, lzma_easy_encoder, [WITH_LZMA_LIB=-llzma])
 ])
 AC_SUBST(WITH_LZMA_LIB)
 
diff --git a/lib/psm.c b/lib/psm.c
index 9070c6d..d476d14 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1706,6 +1706,8 @@ assert(psm->mi == NULL);
 	    psm->rpmio_flags = "r.gzdio";
 	if (!strcmp(payload_compressor, "bzip2"))
 	    psm->rpmio_flags = "r.bzdio";
+	if (!strcmp(payload_compressor, "xz"))
+	    psm->rpmio_flags = "r.xzdio";
 	if (!strcmp(payload_compressor, "lzma"))
 	    psm->rpmio_flags = "r.lzdio";
 	rpmtdFreeData(&pc);
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 6b59a6c..4f4b0cd 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -984,9 +984,14 @@ static const struct rpmlibProvides_s rpmlibProvides[] = {
 	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
     N_("package payload can be compressed using bzip2.") },
 #endif
-    { "rpmlib(PayloadIsLzma)",		"4.4.90-1",
+#if HAVE_LZMA_H
+    { "rpmlib(PayloadIsXz)",		"5.2-1",
+	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
+    N_("package payload can be compressed using xz.") },
+    { "rpmlib(PayloadIsLzma)",		"4.4.2-1",
 	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
     N_("package payload can be compressed using lzma.") },
+#endif
     { "rpmlib(PayloadFilesHavePrefix)",	"4.0-1",
 	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
     N_("package payload file(s) have \"./\" prefix.") },
diff --git a/macros.in b/macros.in
index 28a048c..d0a4208 100644
--- a/macros.in
+++ b/macros.in
@@ -47,6 +47,7 @@
 %__install		@__INSTALL@
 %__ln_s			@LN_S@
 %__lzma			@__LZMA@
+%__xz			@__XZ@
 %__make			@__MAKE@
 %__mkdir		@__MKDIR@
 %__mkdir_p		@MKDIR_P@
@@ -322,7 +323,8 @@ package or when debugging this package.\
 #	Compression type and level for source/binary package payloads.
 #		"w9.gzdio"	gzip level 9 (default).
 #		"w9.bzdio"	bzip2 level 9.
-#		"w7.lzdio"	lzma level 7, lzma's default.
+#		"w7.xzdio"	xz level 7, xz's default.
+#		"w7.lzdio"	lzma-alone level 7, lzma's default
 #
 #%_source_payload	w9.gzdio
 #%_binary_payload	w9.gzdio
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 6674a72..eabefa1 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -78,6 +78,8 @@ int main(int argc, char *argv[])
 	    rpmio_flags = "r.gzdio";
 	if (!strcmp(payload_compressor, "bzip2"))
 	    rpmio_flags = "r.bzdio";
+	if (!strcmp(payload_compressor, "xz"))
+	    rpmio_flags = "r.xzdio";
 	if (!strcmp(payload_compressor, "lzma"))
 	    rpmio_flags = "r.lzdio";
 	rpmtdFreeData(&pc);
diff --git a/rpmio/macro.c b/rpmio/macro.c
index d1cbf93..9e7c3a5 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -981,6 +981,9 @@ doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
         case COMPRESSED_LZMA:
             sprintf(be, "%%__lzma -dc %s", b);
             break;
+        case COMPRESSED_XZ:
+            sprintf(be, "%%__xz -dc %s", b);
+            break;
 	}
 	b = be;
     } else if (STREQ("S", f, fn)) {
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index de326e6..8286647 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -353,11 +353,11 @@ int rpmFileIsCompressed(const char * file, rpmCompressedMagic * compressed)
     } else if ((magic[0] == 0120) && (magic[1] == 0113) &&
 	 (magic[2] == 0003) && (magic[3] == 0004)) {	/* pkzip */
 	*compressed = COMPRESSED_ZIP;
-    } else if ((magic[0] == 0xff) && (magic[1] == 0x4c) &&
-	       (magic[2] == 0x5a) && (magic[3] == 0x4d) &&
-	       (magic[4] == 0x41) && (magic[5] == 0x00)) {
-	/* new style lzma with magic */
-	*compressed = COMPRESSED_LZMA;
+    } else if ((magic[0] == 0xfd) && (magic[1] == 0x37) &&
+	       (magic[2] == 0x7a) && (magic[3] == 0x58) &&
+	       (magic[4] == 0x5a) && (magic[5] == 0x00)) {
+	/* new style xz (lzma) with magic */
+	*compressed = COMPRESSED_XZ;
     } else if (((magic[0] == 0037) && (magic[1] == 0213)) || /* gzip */
 	((magic[0] == 0037) && (magic[1] == 0236)) ||	/* old gzip */
 	((magic[0] == 0037) && (magic[1] == 0036)) ||	/* pack */
diff --git a/rpmio/rpmfileutil.h b/rpmio/rpmfileutil.h
index 7f92cbc..c39abf1 100644
--- a/rpmio/rpmfileutil.h
+++ b/rpmio/rpmfileutil.h
@@ -22,7 +22,8 @@ typedef enum rpmCompressedMagic_e {
     COMPRESSED_OTHER		= 1,	/*!< gzip can handle */
     COMPRESSED_BZIP2		= 2,	/*!< bzip2 can handle */
     COMPRESSED_ZIP		= 3,	/*!< unzip can handle */
-    COMPRESSED_LZMA		= 4	/*!< lzma can handle */
+    COMPRESSED_LZMA		= 4,	/*!< lzma can handle */
+    COMPRESSED_XZ		= 5	/*!< xz can handle */
 } rpmCompressedMagic;
 
 /** \ingroup rpmfileutil
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index be9e99d..78a86c8 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -36,7 +36,7 @@ extern int h_errno;
 #define	FDONLY(fd)	assert(fdGetIo(fd) == fdio)
 #define	GZDONLY(fd)	assert(fdGetIo(fd) == gzdio)
 #define	BZDONLY(fd)	assert(fdGetIo(fd) == bzdio)
-#define	LZDONLY(fd)	assert(fdGetIo(fd) == lzdio)
+#define	LZDONLY(fd)	assert(fdGetIo(fd) == xzdio || fdGetIo(fd) == lzdio)
 
 #define	UFDONLY(fd)	/* assert(fdGetIo(fd) == ufdio) */
 
@@ -91,6 +91,7 @@ static const FDIO_t fpio;
 static const FDIO_t ufdio;
 static const FDIO_t gzdio;
 static const FDIO_t bzdio;
+static const FDIO_t xzdio;
 static const FDIO_t lzdio;
 
 /**
@@ -140,6 +141,8 @@ static const char * fdbg(FD_t fd)
 	    sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
 #endif
 #if HAVE_LZMA_H
+	} else if (fps->io == xzdio) {
+	    sprintf(be, "XZD %p fdno %d", fps->fp, fps->fdno);
 	} else if (fps->io == lzdio) {
 	    sprintf(be, "LZD %p fdno %d", fps->fp, fps->fdno);
 #endif
@@ -1158,7 +1161,7 @@ static const char * getFdErrstr (FD_t fd)
     } else
 #endif	/* HAVE_BZLIB_H */
 #ifdef	HAVE_LZMA_H
-    if (fdGetIo(fd) == lzdio) {
+    if (fdGetIo(fd) == xzdio || fdGetIo(fd) == lzdio) {
 	errstr = fd->errcookie;
     } else
 #endif	/* HAVE_LZMA_H */
@@ -1194,13 +1197,14 @@ typedef struct lzfile {
 
 } LZFILE;
 
-static LZFILE *lzopen_internal(const char *path, const char *mode, int fd)
+static LZFILE *lzopen_internal(const char *path, const char *mode, int fd, int xz)
 {
-    int level = 5;
+    int level = 7;	/* Use XZ's default compression level if unspecified */
     int encoding = 0;
     FILE *fp;
     LZFILE *lzfile;
     lzma_ret ret;
+    lzma_stream init_strm = LZMA_STREAM_INIT;
 
     for (; *mode; mode++) {
 	if (*mode == 'w')
@@ -1221,17 +1225,21 @@ static LZFILE *lzopen_internal(const char *path, const char *mode, int fd)
 	fclose(fp);
 	return 0;
     }
+    
     lzfile->file = fp;
     lzfile->encoding = encoding;
     lzfile->eof = 0;
-    lzfile->strm = LZMA_STREAM_INIT_VAR;
+    lzfile->strm = init_strm;
     if (encoding) {
-	lzma_options_alone alone;
-	alone.uncompressed_size = LZMA_VLI_VALUE_UNKNOWN;
-	memcpy(&alone.lzma, &lzma_preset_lzma[level - 1], sizeof(alone.lzma));
-	ret = lzma_alone_encoder(&lzfile->strm, &alone);
-    } else {
-	ret = lzma_auto_decoder(&lzfile->strm, 0, 0);
+	if (xz) {
+	    ret = lzma_easy_encoder(&lzfile->strm, level, LZMA_CHECK_SHA256);
+	} else {
+	    lzma_options_lzma options;
+	    lzma_lzma_preset(&options, level);
+	    ret = lzma_alone_encoder(&lzfile->strm, &options);
+	}
+    } else {	/* lzma_easy_decoder_memusage(level) is not ready yet, use hardcoded limit for now */
+	ret = lzma_auto_decoder(&lzfile->strm, 100<<20, 0);
     }
     if (ret != LZMA_OK) {
 	fclose(fp);
@@ -1241,16 +1249,28 @@ static LZFILE *lzopen_internal(const char *path, const char *mode, int fd)
     return lzfile;
 }
 
+static LZFILE *xzopen(const char *path, const char *mode)
+{
+    return lzopen_internal(path, mode, -1, 1);
+}
+
+static LZFILE *xzdopen(int fd, const char *mode)
+{
+    if (fd < 0)
+	return 0;
+    return lzopen_internal(0, mode, fd, 1);
+}
+
 static LZFILE *lzopen(const char *path, const char *mode)
 {
-    return lzopen_internal(path, mode, -1);
+    return lzopen_internal(path, mode, -1, 0);
 }
 
 static LZFILE *lzdopen(int fd, const char *mode)
 {
     if (fd < 0)
 	return 0;
-    return lzopen_internal(0, mode, fd);
+    return lzopen_internal(0, mode, fd, 0);
 }
 
 static int lzflush(LZFILE *lzfile)
@@ -1352,7 +1372,7 @@ static inline void * lzdFileno(FD_t fd)
     FDSANE(fd);
     for (i = fd->nfps; i >= 0; i--) {
 	    FDSTACK_t * fps = &fd->fps[i];
-	    if (fps->io != lzdio)
+	    if (fps->io != xzdio && fps->io != lzdio)
 		continue;
 	    rc = fps->fp;
 	break;
@@ -1361,6 +1381,33 @@ static inline void * lzdFileno(FD_t fd)
     return rc;
 }
 
+static FD_t xzdOpen(const char * path, const char * mode)
+{
+    FD_t fd;
+    LZFILE *lzfile;
+    if ((lzfile = xzopen(path, mode)) == NULL)
+	return NULL;
+    fd = fdNew("open (xzdOpen)");
+    fdPop(fd); fdPush(fd, xzdio, lzfile, -1);
+    return fdLink(fd, "xzdOpen");
+}
+
+static FD_t xzdFdopen(void * cookie, const char * fmode)
+{
+    FD_t fd = c2f(cookie);
+    int fdno;
+    LZFILE *lzfile;
+
+    if (fmode == NULL) return NULL;
+    fdno = fdFileno(fd);
+    fdSetFdno(fd, -1);          /* XXX skip the fdio close */
+    if (fdno < 0) return NULL;
+    lzfile = xzdopen(fdno, fmode);
+    if (lzfile == NULL) return NULL;
+    fdPush(fd, xzdio, lzfile, fdno);
+    return fdLink(fd, "xzdFdopen");
+}
+
 static FD_t lzdOpen(const char * path, const char * mode)
 {
     FD_t fd;
@@ -1368,7 +1415,7 @@ static FD_t lzdOpen(const char * path, const char * mode)
     if ((lzfile = lzopen(path, mode)) == NULL)
 	return NULL;
     fd = fdNew("open (lzdOpen)");
-    fdPop(fd); fdPush(fd, lzdio, lzfile, -1);
+    fdPop(fd); fdPush(fd, xzdio, lzfile, -1);
     return fdLink(fd, "lzdOpen");
 }
 
@@ -1384,7 +1431,7 @@ static FD_t lzdFdopen(void * cookie, const char * fmode)
     if (fdno < 0) return NULL;
     lzfile = lzdopen(fdno, fmode);
     if (lzfile == NULL) return NULL;
-    fdPush(fd, lzdio, lzfile, fdno);
+    fdPush(fd, xzdio, lzfile, fdno);
     return fdLink(fd, "lzdFdopen");
 }
 
@@ -1468,17 +1515,22 @@ static int lzdClose(void * cookie)
 
 DBGIO(fd, (stderr, "==>\tlzdClose(%p) rc %lx %s\n", cookie, (unsigned long)rc, fdbg(fd)));
 
-    if (_rpmio_debug || rpmIsDebug()) fdstat_print(fd, "LZDIO", stderr);
+    if (_rpmio_debug || rpmIsDebug()) fdstat_print(fd, "XZDIO", stderr);
     if (rc == 0)
 	fd = fdFree(fd, "open (lzdClose)");
     return rc;
 }
 
+static struct FDIO_s xzdio_s = {
+  lzdRead, lzdWrite, lzdSeek, lzdClose, NULL, NULL, NULL, fdFileno,
+  NULL, xzdOpen, lzdFileno, lzdFlush
+};
+static const FDIO_t xzdio = &xzdio_s;
+
 static struct FDIO_s lzdio_s = {
   lzdRead, lzdWrite, lzdSeek, lzdClose, NULL, NULL, NULL, fdFileno,
   NULL, lzdOpen, lzdFileno, lzdFlush
 };
-
 static const FDIO_t lzdio = &lzdio_s;
 
 #endif	/* HAVE_LZMA_H */
@@ -1716,6 +1768,9 @@ fprintf(stderr, "*** Fdopen(%p,%s) %s\n", fd, fmode, fdbg(fd));
 	    fd = bzdFdopen(fd, zstdio);
 #endif
 #if HAVE_LZMA_H
+	} else if (!strcmp(end, "xzdio")) {
+	    iof = xzdio;
+	    fd = xzdFdopen(fd, zstdio);
 	} else if (!strcmp(end, "lzdio")) {
 	    iof = lzdio;
 	    fd = lzdFdopen(fd, zstdio);
@@ -1847,7 +1902,7 @@ int Fflush(FD_t fd)
 	return bzdFlush(vh);
 #endif
 #if HAVE_LZMA_H
-    if (vh && fdGetIo(fd) == lzdio)
+    if (vh && (fdGetIo(fd) == xzdio || fdGetIo(fd) == lzdio))
 	return lzdFlush(vh);
 #endif
 /* FIXME: If we get here, something went wrong above */
@@ -1876,9 +1931,9 @@ int Ferror(FD_t fd)
 	    i--;	/* XXX fdio under bzdio always has fdno == -1 */
 #endif
 #if HAVE_LZMA_H
-	} else if (fps->io == lzdio) {
+	} else if (fps->io == xzdio || fps->io == lzdio) {
 	    ec = (fd->syserrno  || fd->errcookie != NULL) ? -1 : 0;
-	    i--;	/* XXX fdio under lzdio always has fdno == -1 */
+	    i--;	/* XXX fdio under xzdio/lzdio always has fdno == -1 */
 #endif
 	} else {
 	/* XXX need to check ufdio/gzdio/bzdio/fdio errors correctly. */
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 25c6d5b..a6a6252 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -53,7 +53,7 @@ struct _FD_s {
     ssize_t	bytesRemain;	/* ufdio: */
 
     int		syserrno;	/* last system errno encountered */
-    const void *errcookie;	/* gzdio/bzdio/ufdio: */
+    const void *errcookie;	/* gzdio/bzdio/ufdio/xzdio: */
 
     FDSTAT_t	stats;		/* I/O statistics */
 


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-10/rpm.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- rpm.spec	18 May 2009 11:08:17 -0000	1.314
+++ rpm.spec	15 Sep 2009 07:08:27 -0000	1.315
@@ -1,5 +1,5 @@
-# rawhide doesn't have new enough lzma yet
-%bcond_with lzma
+# enable xz payload support
+%bcond_without xz
 # sqlite backend is broken atm, disabled for now
 %bcond_with sqlite
 # just for giggles, option to build with internal Berkeley DB
@@ -17,7 +17,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -39,6 +39,8 @@ Patch100: rpm-4.6.x-no-pkgconfig-reqs.pa
 
 # Patches not yet upstream
 Patch300: rpm-4.6.0-niagara.patch
+Patch301: rpm-4.6.1-xz-support.patch
+Patch302: rpm-4.6.1-pkgconfig-nover.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -77,8 +79,8 @@ BuildRequires: ncurses-devel
 BuildRequires: bzip2-devel >= 0.9.0c-2
 BuildRequires: python-devel >= 2.2
 BuildRequires: lua-devel >= 5.1
-%if %{with lzma}
-BuildRequires: lzma-devel >= 4.42
+%if %{with xz}
+BuildRequires: xz-devel >= 4.999.8
 %endif
 %if %{with sqlite}
 BuildRequires: sqlite-devel
@@ -112,8 +114,8 @@ Requires: nss-devel 
 Requires: libselinux-devel
 Requires: elfutils-libelf-devel
 Requires: popt-devel
-%if %{with lzma}
-Requires: lzma-devel >= 4.42
+%if %{with xz}
+Requires: xz-devel >= 4.999.8
 %endif
 %if %{with sqlite}
 Requires: sqlite-devel
@@ -136,7 +138,7 @@ Group: Development/Tools
 Requires: rpm = %{version}-%{release}
 Requires: elfutils >= 0.128 binutils
 Requires: findutils sed grep gawk diffutils file patch >= 2.5
-Requires: unzip gzip bzip2 cpio lzma
+Requires: unzip gzip bzip2 cpio lzma xz
 
 %description build
 The rpm-build package contains the scripts and executable programs
@@ -172,6 +174,8 @@ that will manipulate RPM packages and da
 %patch100 -p1 -b .pkgconfig-deps
 
 %patch300 -p1 -b .niagara
+%patch301 -p1 -b .xz
+%patch302 -p1 -b .pkgconfig-nover
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -368,6 +372,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Sep 15 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.1-2
+- add support for XZ payloads and sources (#514480)
+- handle empty version in pkg-config files (#505351)
+
 * Mon May 18 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.1-1
 - update to rpm 4.6.1 (http://rpm.org/wiki/Releases/4.6.1)
 - fixes #487855, #493157 and several others already fixed in F11/rawhide



From fabbione at fedoraproject.org  Tue Sep 15 07:08:43 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 15 Sep 2009 07:08:43 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel o2cb_pcmk.diff, NONE, 1.1 ocfs2-tools.spec, 
	1.10, 1.11
Message-ID: <20090915070843.4B29811C00CE@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32662

Modified Files:
	ocfs2-tools.spec 
Added Files:
	o2cb_pcmk.diff 
Log Message:
Add pacemaker resource agent for ocfs2 support


o2cb_pcmk.diff:
 o2cb.ocf |  456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 456 insertions(+)

--- NEW FILE o2cb_pcmk.diff ---
diff -Nuard ocfs2-tools-1.4.2.orig/vendor/common/o2cb.ocf ocfs2-tools-1.4.2/vendor/common/o2cb.ocf
--- ocfs2-tools-1.4.2.orig/vendor/common/o2cb.ocf	1970-01-01 01:00:00.000000000 +0100
+++ ocfs2-tools-1.4.2/vendor/common/o2cb.ocf	2009-09-15 06:30:58.000000000 +0200
@@ -0,0 +1,456 @@
+#!/bin/bash
+# Copyright (c) 2008 Andrew Beekhof
+#                    All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like.  Any license provided herein, whether implied or
+# otherwise, applies only to this software file.  Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+#
+#######################################################################
+
+# OCF initialization
+. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
+
+# Parameter defaults
+: ${OCF_RESKEY_stack:="pcmk"}
+: ${OCF_RESKEY_sysfs:="/sys/fs"}
+: ${OCF_RESKEY_daemon_timeout:="10"} 
+: ${OCF_RESKEY_configfs:="/sys/kernel/config"}
+: ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"}
+
+# Common variables
+DAEMON="/sbin/ocfs2_controld.${OCF_RESKEY_stack}"
+CLUSTER_STACK_FILE="${OCF_RESKEY_sysfs}/ocfs2/cluster_stack"
+LOADED_PLUGINS_FILE="${OCF_RESKEY_sysfs}/ocfs2/loaded_cluster_plugins"
+
+#
+# Check to see if a filesystem driver is loaded.
+# 0 is loaded, 1 is not.
+#
+driver_filesystem() {
+    if [ -z "$1" ]
+    then
+        ocf_log err "driver_filesystem(): Missing an argument"
+        exit 1
+    fi
+    FSNAME="$1"
+
+    FSOUT="$(awk '(NF == 1 && $1 ~ /^'$FSNAME'$/) || $2 ~ /^'$FSNAME'$/{
+                      print $1;exit
+                  }' /proc/filesystems 2>/dev/null)"
+
+    test -n "$FSOUT"
+    return $?
+}
+
+#
+# Check to see if a filesystem of type $1 is mounted at $2.
+#
+# 0 is mounted, 1 is not.
+#
+check_filesystem()
+{
+    if [ "$#" != "2" -o -z "$1" -o -z "$2" ]
+    then
+        ocf_log err "check_filesystem(): Missing arguments"
+        exit 4
+    fi
+    FSNAME="$1"
+    MOUNTPOINT="$2"
+
+    FULL_MOUNTSEARCH="`echo "$MOUNTPOINT" | sed -e 's/\//\\\\\//g'`"
+    MOUNTOUT="`awk '$2 ~ /^'$FULL_MOUNTSEARCH'$/ && $3 ~ /^'$FSNAME'$/{print $2; exit}' < /proc/mounts 2>/dev/null`"
+    test -n "$MOUNTOUT"
+    return $?
+}
+
+#
+# Unload a filesystem driver.  
+# Be careful to notice if the driver is built-in and do nothing.
+#
+# 0 is success, 1 is error, 2 is already unloaded.
+#
+unload_filesystem()
+{
+    if [ "$#" != "1" -o -z "$1" ]
+    then
+        ocf_log err "unload_filesystem(): Missing an argument"
+        return 1
+    fi
+    FSNAME="$1"
+
+    driver_filesystem "$FSNAME" || return 2
+
+    MODOUT="`awk '$1 ~ /^'$FSNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`"
+    if [ -z "$MODOUT" ]; then
+        # The driver is built in, we can't unload it.
+        return 0
+    fi
+
+    case "$MODOUT" in
+    $FSNAME\ 0)
+        ;;
+    $FSNAME\ *)
+        # The driver is busy, leave it alone
+        ocf_log err "Module $FSNAME is still in use"
+        return 1
+        ;;
+    *)
+        ocf_log err "Invalid module parsing! "
+        return 1
+        ;;
+    esac
+
+    modprobe -rs "$FSNAME"
+    if [ "$?" != 0 ]; then
+        ocf_log err "Unable to unload module: $FSNAME"
+        return 1
+    fi
+
+    return 0
+}
+
+status_daemon()
+{
+    PID=`pidofproc "$DAEMON"`
+    if [ -n "$PID" ]; then
+	return $OCF_SUCCESS
+    fi
+    return $OCF_NOT_RUNNING
+}
+
+bringup_daemon()
+{
+    if [ ! -e "$DAEMON" ]; then
+	ocf_log err "Required binary not found: $DAEMON"
+	return $OCF_ERR_INSTALLED
+    fi
+
+    start_daemon "$DAEMON"; rc=$?
+    if [ $rc != 0 ]; then
+	ocf_log err "Could not start $DAEMON"
+	return $OCF_ERR_GENERIC
+    fi
+
+    sleep 1
+    COUNT=0
+    rc=$OCF_NOT_RUNNING
+
+    while [ $rc = $OCF_NOT_RUNNING ]; do
+        COUNT=`expr $COUNT + 1`
+        if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
+	    ocf_log err "`basename $DAEMON` did not come up"
+	    ps axf | grep -C 3 $$
+	    return $OCF_ERR_GENERIC
+        fi
+	status_daemon; rc=$?
+        sleep 1
+    done
+
+    return $rc
+}
+
+kill_daemon()
+{
+    status_daemon; rc=$?
+    if [ $rc != $OCF_SUCCESS ]; then
+	return $rc
+    fi
+
+    ocf_log info "Stopping `basename "$DAEMON"`"
+    killproc "$DAEMON"
+
+    while [ $rc = $OCF_NOT_RUNNING ]; do
+        sleep 1
+	status_daemon; rc=$?
+    done
+
+    return $OCF_SUCCESS
+}
+
+#
+# Unload a module
+# 0 is success, 1 is error, 2 is not loaded
+#
+unload_module()
+{
+    if [ "$#" -lt "1" -o -z "$1" ]
+    then
+	ocf_log err  "unload_module(): Requires an argument"
+        return 1
+    fi
+    MODNAME="$1"
+
+    MODOUT="`awk '$1 ~ /^'$MODNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`"
+    if [ -z "$MODOUT" ]
+    then
+        return 2
+    fi
+
+    case "$MODOUT" in
+    $MODNAME\ 0)
+        ;;
+    $MODNAME\ *)
+        return 2
+        ;;
+    *)
+	ocf_log err "Invalid module parsing!"
+        return 1
+        ;;
+    esac
+
+    modprobe -rs "$MODNAME"
+    if [ "$?" != 0 ]; then
+	ocf_log err "Unable to unload module \"$MODNAME\""
+        return 1
+    fi
+
+    return 0
+}
+
+o2cb_start() {
+
+    o2cb_monitor; rc=$?
+    if [ $rc != $OCF_NOT_RUNNING ]; then 
+	return $rc
+    fi
+
+    ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
+
+    if [ ! -e "$CLUSTER_STACK_FILE" ]; then
+	modprobe -s ocfs2_stackglue
+	if [ $? != 0 ]; then
+	    ocf_log err "Could not load ocfs2_stackglue"
+	    return $OCF_ERR_INSTALLED
+	fi
+    fi
+
+    SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)"
+    if [ -z "$SP_OUT" ]
+    then
+        modprobe -s ocfs2_stack_user
+	if [ $? != 0 ]; then
+	    ocf_log err "Could not load ocfs2_stack_user"
+	    return $OCF_ERR_INSTALLED
+	fi
+    fi
+
+    SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)"
+    if [ -z "$SP_OUT" ]; then
+	ocf_log err "Switch to userspace stack unsuccessful"
+	return $OCF_ERR_INSTALLED
+    fi
+
+    if [ -f "$CLUSTER_STACK_FILE" ]; then
+        echo "$OCF_RESKEY_stack" >"$CLUSTER_STACK_FILE"
+        if [ $? != 0 ]; then
+	    ocf_log err "Userspace stack '$OCF_RESKEY_stack' not supported"
+	    return $OCF_ERR_INSTALLED
+	fi
+    else
+	ocf_log err "Switch to userspace stack not supported"
+	return $OCF_ERR_INSTALLED
+    fi
+
+    driver_filesystem ocfs2; rc=$?
+    if [ $rc != 0 ]; then
+	modprobe -s ocfs2
+	if [ "$?" != 0 ]; then
+            ocf_log err "Unable to load ocfs2 module"
+            return $OCF_ERR_INSTALLED
+	fi
+    fi
+
+    bringup_daemon
+    return $?
+}
+
+o2cb_stop() {
+    o2cb_monitor; rc=$?
+    case $rc in
+	$OCF_NOT_RUNNING) return $OCF_SUCCESS;;
+    esac
+
+    ocf_log info "Stopping $OCF_RESOURCE_INSTANCE"
+
+    kill_daemon
+    if [ $? != 0 ]; then 
+        ocf_log err "Unable to unload modules: the cluster is still online"
+	return $OCF_ERR_GENERIC
+    fi
+
+    unload_filesystem ocfs2
+    if [ $? = 1 ]; then
+	ocf_log err "Unable to unload ocfs2 module"
+	return $OCF_ERR_GENERIC
+    fi
+
+    # If we can't find the stack glue, we have nothing to do.
+    [ ! -e "$LOADED_PLUGINS_FILE" ] && return $OCF_SUCCESS
+
+    while read plugin
+    do
+        unload_module "ocfs2_stack_${plugin}"
+        if [ $? = 1 ]; then
+	    ocf_log err "Unable to unload ocfs2_stack_${plugin}"
+	    return $OCF_ERR_GENERIC
+	fi
+    done <"$LOADED_PLUGINS_FILE"
+
+    unload_module "ocfs2_stackglue"
+    if [ $? = 1 ]; then
+	ocf_log err "Unable to unload ocfs2_stackglue"
+	return $OCF_ERR_GENERIC
+    fi
+
+    # Dont unmount configfs - its always in use by libdlm
+}
+
+o2cb_monitor() {
+    o2cb_validate
+
+    # Assume that ocfs2_controld will terminate if any of the conditions below are met
+
+    driver_filesystem configfs; rc=$?
+    if [ $rc != 0 ]; then
+	ocf_log info "configfs not laoded"
+	return $OCF_NOT_RUNNING
+    fi
+
+    check_filesystem configfs "${OCF_RESKEY_configfs}"; rc=$?
+    if [ $rc != 0 ]; then
+	ocf_log info "configfs not mounted"
+	return $OCF_NOT_RUNNING
+    fi
+
+    if [ ! -e "$LOADED_PLUGINS_FILE" ]; then
+	ocf_log info "Stack glue driver not loaded"
+	return $OCF_NOT_RUNNING
+    fi
+
+    grep user "$LOADED_PLUGINS_FILE" >/dev/null 2>&1; rc=$?
+    if [ $rc != 0 ]; then
+	ocf_log err "Wrong stack `cat $LOADED_PLUGINS_FILE`"
+	return $OCF_ERR_INSTALLED
+    fi
+
+    driver_filesystem ocfs2; rc=$?
+    if [ $rc != 0 ]; then
+	ocf_log info "ocfs2 not loaded"
+	return $OCF_NOT_RUNNING
+    fi
+
+    status_daemon
+    return $?
+}
+
+o2cb_usage() {
+    echo "usage: $0 {start|stop|monitor|validate-all|meta-data}"
+    echo "  Expects to have a fully populated OCF RA-compliant environment set."
+    echo "  In particualr, a value for OCF_ROOT"
+}
+
+o2cb_validate() {
+    : TODO: check for gloablly_unique=true and return OCF_ERR_CONFIGURED
+    case ${OCF_RESKEY_CRM_meta_gloablly_unique} in
+	yes|Yes|true|True|1) 
+	    ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the gloablly_unique=false meta attribute"
+	    exit $OCF_ERR_CONFIGURED
+	    ;;
+    esac
+
+    return $OCF_SUCCESS
+}
+
+meta_data() {
+	cat <<END
+<?xml version="1.0"?>
+<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+<resource-agent name="o2cb">
+  <version>1.0</version>
+  <shortdesc lang="en">o2cb resource agent</shortdesc>
+  <longdesc lang="en">
+This is a o2cb Resource Agent. It runs o2cb daemon as a instance of anonymous clone.
+  </longdesc>
+  <parameters>
+
+    <parameter name="sysfs" unique="0">
+      <longdesc lang="en">
+Location where sysfs is mounted
+      </longdesc>
+      <shortdesc lang="en">Sysfs location</shortdesc>
+      <content type="string" default="/sys/fs"/>
+    </parameter>
+
+    <parameter name="configfs" unique="0">
+      <longdesc lang="en">
+Location where configfs is mounted
+      </longdesc>
+      <shortdesc lang="en">Configfs location</shortdesc>
+      <content type="string" default="/sys/kernel/config"/>
+    </parameter>
+
+    <parameter name="stack" unique="0">
+      <longdesc lang="en">
+Which userspace stack to use.  Known values: pcmk, cman
+      </longdesc>
+      <shortdesc lang="en">Userspace stack</shortdesc>
+      <content type="string" default="pcmk"/>
+    </parameter>
+
+    <parameter name="daemon_timeout" unique="0">
+      <longdesc lang="en">
+Number of seconds to allow the control daemon to come up
+      </longdesc>
+      <shortdesc lang="en">Daemon Timeout</shortdesc>
+      <content type="string" default="10"/>
+    </parameter>
+
+  </parameters>
+  <actions>
+    <action name="start"         timeout="90" />
+    <action name="stop"          timeout="100" />
+    <action name="monitor"       timeout="20" depth="0"/>
+    <action name="meta-data"     timeout="5" />
+    <action name="validate-all"  timeout="30" />
+  </actions>
+</resource-agent>
+END
+}
+
+case $__OCF_ACTION in
+meta-data)	meta_data
+		exit $OCF_SUCCESS
+		;;
+start)		o2cb_start
+		;;
+stop)		o2cb_stop
+		;;
+monitor)	o2cb_monitor
+		;;
+validate-all)	o2cb_validate
+		;;
+usage|help)	o2cb_usage
+		exit $OCF_SUCCESS
+		;;
+*)		o2cb_usage
+		exit $OCF_ERR_UNIMPLEMENTED
+		;;
+esac
+
+exit $?


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocfs2-tools.spec	3 Sep 2009 10:17:47 -0000	1.10
+++ ocfs2-tools.spec	15 Sep 2009 07:08:41 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.2
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Release: 4%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -20,6 +20,7 @@ Group: System Environment/Base
 #   tar -czvf ocfs2-tools-1.3.9.tar.gz ocfs2-tools-1.3.9
 Source0: %{name}-%{version}.tar.gz
 Patch0: minor_build_fixes.diff
+Patch1: o2cb_pcmk.diff
 URL: http://oss.oracle.com/projects/ocfs2-tools/
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -96,6 +97,7 @@ pacemaker cluster manager
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{configure} \
@@ -118,6 +120,10 @@ cp -f vendor/common/o2cb.sysconfig $RPM_
 mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
 cp -f vendor/common/51-ocfs2.rules \
  $RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
+mkdir -p  $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2
+cp -f vendor/common/o2cb.ocf \
+ $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb
+chmod 0755 $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
@@ -202,8 +208,13 @@ fi
 %files pcmk
 %defattr(-,root,root,-)
 /sbin/ocfs2_controld.pcmk
+%dir /usr/lib/ocf/resource.d/ocfs2
+/usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Tue Sep 15 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-4
+- Add pcmk resource agent.
+
 * Thu Sep  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-3
 - Fix pcmk and cman Requires.
 



From varekova at fedoraproject.org  Tue Sep 15 07:13:53 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 07:13:53 +0000 (UTC)
Subject: rpms/gnuplot/devel .cvsignore, 1.11, 1.12 gnuplot.spec, 1.73,
	1.74 sources, 1.11, 1.12
Message-ID: <20090915071353.881B111C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2370

Modified Files:
	.cvsignore gnuplot.spec sources 
Log Message:
 - update to 4.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 May 2009 12:07:46 -0000	1.11
+++ .cvsignore	15 Sep 2009 07:13:44 -0000	1.12
@@ -1 +1 @@
-gnuplot-4.2.5.tar.gz
+gnuplot-4.2.6.tar.gz


Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gnuplot.spec	10 Aug 2009 14:04:27 -0000	1.73
+++ gnuplot.spec	15 Sep 2009 07:13:45 -0000	1.74
@@ -1,6 +1,6 @@
 %define major 4
 %define minor 2
-%define patchlevel 5
+%define patchlevel 6
 
 %define x11_app_defaults_dir %{_datadir}/X11/app-defaults
 
@@ -246,7 +246,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
 
 %changelog
-* Mon Aug 10 2009 Ivana Varekova <varekova redhat com> 4.2.5-6
+* Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> 4.2.6-1
+- update to 4.2.6
+
+* Mon Aug 10 2009 Ivana Varekova <varekova at redhat.com> 4.2.5-6
 - fix installation with --excludedocs option (#515963)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.5-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 May 2009 12:07:46 -0000	1.11
+++ sources	15 Sep 2009 07:13:46 -0000	1.12
@@ -1 +1 @@
-85d042f8efd7aae3d9cbfd85b14d06d2  gnuplot-4.2.5.tar.gz
+c10468d74030e8bed0fd6865a45cf1fd  gnuplot-4.2.6.tar.gz



From varekova at fedoraproject.org  Tue Sep 15 07:24:02 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 07:24:02 +0000 (UTC)
Subject: rpms/gnuplot/devel gnuplot.spec,1.74,1.75
Message-ID: <20090915072402.39C1311C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8965

Modified Files:
	gnuplot.spec 
Log Message:
fix release number



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- gnuplot.spec	15 Sep 2009 07:13:45 -0000	1.74
+++ gnuplot.spec	15 Sep 2009 07:24:01 -0000	1.75
@@ -17,7 +17,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 6%{?dist}
+Release: 1%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering



From tagoh at fedoraproject.org  Tue Sep 15 08:03:59 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue, 15 Sep 2009 08:03:59 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-update-info.patch, NONE,
	1.1 imsettings.spec, 1.40, 1.41
Message-ID: <20090915080400.3F50911C00CE@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5847

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-update-info.patch 
Log Message:
* Tue Sep 15 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-4
- Update the IM information as needed if the configuration file is written
  in the script. (#523349)

imsettings-update-info.patch:
 data/xinputinfo.sh.in        |   18 +++++++++++++++
 imsettings/imsettings-info.c |   51 +++++++++++++++++++++++++++++++++++++++++--
 imsettings/imsettings-info.h |    1 
 3 files changed, 68 insertions(+), 2 deletions(-)

--- NEW FILE imsettings-update-info.patch ---
2009-09-15  Akira TAGOH  <tagoh at redhat.com>

	* data/xinputinfo.sh.in: output the value if the configuration is
	the script or not.

	* tests/main.c (init): set IMSETTINGS_HELPER_PATH to xinputinfo.sh
	working without the real installation.

	* tests/rhbz_523349.c: new testcase.

	* imsettings/imsettings-info.c (imsettings_info_notify_properties):
	Add a reference of the environment variable to get the unit testing
	working.
	(_IMSETTINGS_DEFUNC_PROPERTY): update the variables before looking
	if the configuration is based on the script. (rhbz#523349)
	(imsettings_info_is_script): new.

Index: imsettings/imsettings-info.c
===================================================================
--- imsettings/imsettings-info.c	(????? 342)
+++ imsettings/imsettings-info.c	(????? 343)
@@ -74,6 +74,7 @@
 	gboolean  is_system_default;
 	gboolean  is_user_default;
 	gboolean  is_xim;
+	gboolean  is_script;
 } IMSettingsInfoPrivate;
 
 enum {
@@ -94,6 +95,7 @@
 	PROP_SHORT_DESC,
 	PROP_LONG_DESC,
 	PROP_ICON,
+	PROP_IS_SCRIPT,
 	PROP_IS_SYSTEM_DEFAULT,
 	PROP_IS_USER_DEFAULT,
 	PROP_IS_XIM,
@@ -181,6 +183,7 @@
 		"SHORT_DESC=",
 		"LONG_DESC=",
 		"ICON=",
+		"IMSETTINGS_IS_SCRIPT=",
 		NULL
 	};
 	static const gchar *properties[] = {
@@ -197,6 +200,7 @@
 		"short_desc",
 		"long_desc",
 		"icon",
+		"is_script",
 		NULL
 	};
 	gint i;
@@ -204,7 +208,7 @@
 	guint prop;
 	struct stat st;
 	IMSettingsInfoPrivate *priv = IMSETTINGS_INFO_GET_PRIVATE (object);
-	gchar *lang;
+	gchar *lang, *path;
 
 	cmd = g_string_new(NULL);
 	str = g_string_new(NULL);
@@ -212,7 +216,13 @@
 		lang = g_strdup_printf("LANG=%s ", priv->language);
 	else
 		lang = g_strdup("");
-	xinputinfo = g_build_filename(XINPUTINFO_PATH, "xinputinfo.sh", NULL);
+	if (g_getenv("IMSETTINGS_HELPER_PATH") != NULL) {
+		path = g_strdup(g_getenv("IMSETTINGS_HELPER_PATH"));
+	} else {
+		path = g_strdup(XINPUTINFO_PATH);
+	}
+	xinputinfo = g_build_filename(path, "xinputinfo.sh", NULL);
+	g_free(path);
 	g_string_append_printf(cmd, "%s. %s %s", lang, xinputinfo, filename);
 
 	g_free(xinputinfo);
@@ -268,6 +278,14 @@
 								 properties[prop - (PROP_GTK_IMM - PROP_0)], str->str,
 								 NULL);
 						    break;
+					    case PROP_IS_SCRIPT:
+						    g_object_set(object,
+								 "is_script",
+								 (g_ascii_strcasecmp(str->str, "true") == 0 ||
+								  g_ascii_strcasecmp(str->str, "yes") == 0 ||
+								  g_ascii_strcasecmp(str->str, "1") == 0),
+								 NULL);
+						    break;
 					    case PROP_IGNORE_FLAG:
 						    g_object_set(object,
 								 "ignore",
@@ -412,6 +430,9 @@
 			    }
 		    } G_STMT_END;
 		    break;
+	    case PROP_IS_SCRIPT:
+		    _set_bool_prop(is_script);
+		    break;
 	    case PROP_IS_SYSTEM_DEFAULT:
 		    _set_bool_prop(is_system_default);
 		    break;
@@ -489,6 +510,9 @@
 	    case PROP_ICON:
 		    _get_str_prop(icon_file);
 		    break;
+	    case PROP_IS_SCRIPT:
+		    _get_bool_prop(is_script);
+		    break;
 	    case PROP_IS_SYSTEM_DEFAULT:
 		    _get_bool_prop(is_system_default);
 		    break;
@@ -735,6 +759,12 @@
 							    _("Icon filename to be used on GUI"),
 							    ICONDIR G_DIR_SEPARATOR_S "imsettings-unknown.png",
 							    G_PARAM_READWRITE));
+	g_object_class_install_property(object_class, PROP_IS_SCRIPT,
+					g_param_spec_boolean("is_script",
+							     "Script",
+							     "Whether or not the configuration is written in the shell script",
+							     FALSE,
+							     G_PARAM_READWRITE));
 	g_object_class_install_property(object_class, PROP_IS_SYSTEM_DEFAULT,
 					g_param_spec_boolean("is_system_default",
 							     _("System Default"),
@@ -807,6 +837,11 @@
 		g_return_val_if_fail (IMSETTINGS_IS_INFO (info), (_v_)); \
 									\
 		priv = IMSETTINGS_INFO_GET_PRIVATE (info);		\
+		if (imsettings_info_is_script(info)) {			\
+			/* reload the configuration before referencing. */ \
+			g_object_set(info, "filename",			\
+				     priv->filename, NULL);		\
+		}							\
 									\
 		return priv->_m_;					\
 	}
@@ -863,6 +898,18 @@
 }
 
 gboolean
+imsettings_info_is_script(IMSettingsInfo *info)
+{
+	IMSettingsInfoPrivate *priv;
+
+	g_return_val_if_fail (IMSETTINGS_IS_INFO (info), FALSE);
+
+	priv = IMSETTINGS_INFO_GET_PRIVATE (info);
+
+	return priv->is_script;
+}
+
+gboolean
 imsettings_info_is_system_default(IMSettingsInfo *info)
 {
 	IMSettingsInfoPrivate *priv;
Index: imsettings/imsettings-info.h
===================================================================
--- imsettings/imsettings-info.h	(????? 342)
+++ imsettings/imsettings-info.h	(????? 343)
@@ -66,6 +66,7 @@
 const gchar    *imsettings_info_get_long_desc         (IMSettingsInfo       *info);
 const gchar    *imsettings_info_get_icon_file         (IMSettingsInfo       *info);
 const gchar    *imsettings_info_get_supported_language(IMSettingsInfo       *info);
+gboolean        imsettings_info_is_script             (IMSettingsInfo       *info);
 gboolean        imsettings_info_is_visible            (IMSettingsInfo       *info);
 gboolean        imsettings_info_is_system_default     (IMSettingsInfo       *info);
 gboolean        imsettings_info_is_user_default       (IMSettingsInfo       *info);
Index: data/xinputinfo.sh.in
===================================================================
--- data/xinputinfo.sh.in	(????? 342)
+++ data/xinputinfo.sh.in	(????? 343)
@@ -20,6 +20,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
+function is_script() {
+    if [ "x$(sed -re '/^[ 	]?*[a-zA-Z0-9_]+=.*/{d};/[ 	]?*#.*/{d}' $1)" = "x" ]; then
+	return 1
+    else
+	return 0
+    fi
+}
+
 USER_XINPUTRC="$HOME/.xinputrc"
 SYS_XINPUTRC="@XINPUTRC_PATH@/xinputrc"
 
@@ -42,13 +50,16 @@
 
 if [ $# -gt 0 ]; then
     source $1
+    IMSETTINGS_FILENAME=$1
 else
     [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
 
     if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
 	source "$USER_XINPUTRC"
+	IMSETTINGS_FILENAME=$USER_XINPUTRC
     elif [ -r "$SYS_XINPUTRC" ]; then
 	source "$SYS_XINPUTRC"
+	IMSETTINGS_FILENAME=$SYS_XINPUTRC
     fi
 fi
 
@@ -58,6 +69,12 @@
 # For backward compatibility
 [ -z "$IMSETTINGS_IGNORE_ME" ] && IMSETTINGS_IGNORE_ME=$IM_CHOOSER_IGNORE_ME
 
+if is_script $IMSETTINGS_FILENAME; then
+    IMSETTINGS_IS_SCRIPT=1
+else
+    IMSETTINGS_IS_SCRIPT=0
+fi
+
 cat <<EOF
 AUXILIARY_PROGRAM=$AUXILIARY_PROGRAM
 AUXILIARY_ARGS="`echo $AUXILIARY_ARGS | sed -e "s/\\\\([\\"']\\\\)/\\\\\\\\\\\\1/g"`"
@@ -72,4 +89,5 @@
 XIM=$XIM
 XIM_PROGRAM=$XIM_PROGRAM
 XIM_ARGS="`echo $XIM_ARGS | sed -e "s/\\\\([\\"']\\\\)/\\\\\\\\\\\\1/g"`"
+IMSETTINGS_IS_SCRIPT=$IMSETTINGS_IS_SCRIPT
 EOF


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- imsettings.spec	11 Sep 2009 07:23:39 -0000	1.40
+++ imsettings.spec	15 Sep 2009 08:03:57 -0000	1.41
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +20,7 @@ Patch0:		imsettings-constraint-of-langua
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-unref-notify.patch
 Patch3:		imsettings-unref-later.patch
+Patch4:		imsettings-update-info.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -90,6 +91,7 @@ This package contains a plugin to get th
 %patch1 -p1 -b .1-xim
 %patch2 -p0 -b .2-unref
 %patch3 -p0 -b .3-zombie
+%patch4 -p0 -b .4-update-info
 
 %build
 %configure	\
@@ -215,6 +217,10 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-4
+- Update the IM information as needed if the configuration file is written
+  in the script. (#523349)
+
 * Fri Sep 11 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-3
 - Fix keeping IM process running as the defunct process. (#522689)
 



From denis at fedoraproject.org  Tue Sep 15 08:07:18 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Sep 2009 08:07:18 +0000 (UTC)
Subject: rpms/glibmm24/devel glibmm.spec, 1.60,
	1.61 glibmm-2.21.5-devhelp.patch, 1.1, NONE
Message-ID: <20090915080718.B4C4A11C00CE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7048

Modified Files:
	glibmm.spec 
Removed Files:
	glibmm-2.21.5-devhelp.patch 
Log Message:
Better fix for devhelp file broken tags


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- glibmm.spec	14 Sep 2009 14:26:24 -0000	1.60
+++ glibmm.spec	15 Sep 2009 08:07:17 -0000	1.61
@@ -1,13 +1,12 @@
 Name:           glibmm24
 Version:        2.21.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 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.21.5-devhelp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
@@ -45,7 +44,6 @@ This package contains the full API docum
 
 %prep
 %setup -q -n glibmm-%{version}
-%patch0 -p1 -b .devhelp
 
 
 %build
@@ -62,8 +60,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 
 # Fix documentation installation, put everything under gtk-doc
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4
-mv ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+mv ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
 mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+# Fix devhelp broken base tag
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/glibmm-2.4/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
 # Remove old doc directory
 rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/glibmm-2.4
 
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Denis Leroy <denis at poolshark.org> - 2.21.5-2
+- Better fix for devhelp file broken tags
+
 * Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.21.5-1
 - Update to upstream 2.21.5
 - Keep datadir/glibmm-2.4, for doc scripts


--- glibmm-2.21.5-devhelp.patch DELETED ---



From denis at fedoraproject.org  Tue Sep 15 08:08:51 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Sep 2009 08:08:51 +0000 (UTC)
Subject: rpms/pangomm/devel pangomm.spec,1.9,1.10
Message-ID: <20090915080851.52DAA11C00CE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7590

Modified Files:
	pangomm.spec 
Log Message:
Better fix for broken devhelp file


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pangomm.spec	14 Sep 2009 09:14:51 -0000	1.9
+++ pangomm.spec	15 Sep 2009 08:08:50 -0000	1.10
@@ -8,7 +8,7 @@ Summary:        C++ interface for Pango
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.13/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.25/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.14.1
@@ -60,8 +60,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 # relative paths.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pangomm-%{apiver}
 mv ${RPM_BUILD_ROOT}%{_docdir}/pangomm-%{apiver}/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/pangomm-%{apiver}/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}
-sed -i 's:../../../doc/pangomm-%{apiver}/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}/*.devhelp2
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/pangomm-%{apiver}/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}# Fix broken devhelp base tag
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/pangomm-1.4/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pangomm-1.4/*.devhelp2
+# Remove old doc directory
 rm -r ${RPM_BUILD_ROOT}%{_docdir}/pangomm-%{apiver}
 
 
@@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.25.1.3-1
 - Update to upstream 2.25.1.3
 - Package pangomm libdir directory with config include header
+- Fix documentation location
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From denis at fedoraproject.org  Tue Sep 15 08:11:56 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Sep 2009 08:11:56 +0000 (UTC)
Subject: rpms/gtkmm24/devel gtkmm.spec,1.54,1.55
Message-ID: <20090915081156.7C3E111C00CE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8642

Modified Files:
	gtkmm.spec 
Log Message:
Better fix for broken devhelp file


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- gtkmm.spec	14 Sep 2009 09:18:56 -0000	1.54
+++ gtkmm.spec	15 Sep 2009 08:11:55 -0000	1.55
@@ -71,8 +71,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
 mv ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/
 mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
-sed -i 's:../../../doc/gtkmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp2
-rm -r ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4
+# Fix devhelp broken base tag
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/gtkmm-2.4/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp2
+# Remove old doc directory
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gtkmm-2.4
 
 # Move demo examples into devel doc directory
 mkdir docs-to-include



From denis at fedoraproject.org  Tue Sep 15 08:13:38 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Sep 2009 08:13:38 +0000 (UTC)
Subject: rpms/gstreamermm/devel .cvsignore, 1.8, 1.9 gstreamermm.spec, 1.14, 
	1.15 sources, 1.8, 1.9 gstreamermm-0.10.4-docs.patch, 1.1, NONE
Message-ID: <20090915081338.5D91911C00CE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187

Modified Files:
	.cvsignore gstreamermm.spec sources 
Removed Files:
	gstreamermm-0.10.4-docs.patch 
Log Message:
- Update to upstream 0.10.5
- doc patch upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Aug 2009 08:52:30 -0000	1.8
+++ .cvsignore	15 Sep 2009 08:13:36 -0000	1.9
@@ -1 +1 @@
-gstreamermm-0.10.4.tar.bz2
+gstreamermm-0.10.5.tar.bz2


Index: gstreamermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/gstreamermm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gstreamermm.spec	2 Sep 2009 10:43:15 -0000	1.14
+++ gstreamermm.spec	15 Sep 2009 08:13:36 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gstreamermm
-Version:        0.10.4
-Release:        2%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for GStreamer library
 
@@ -8,7 +8,6 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.9/%{name}-%{version}.tar.bz2
-Patch0:         gstreamermm-0.10.4-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibmm24-devel >= 2.21.1
@@ -41,14 +40,12 @@ developing gstreamermm applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .docs
 
 
 %build
 %configure --enable-shared --disable-examples --enable-docs --disable-dependency-tracking
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-# Parallel make not always working
-make
+make %{?_smp_mflags}
 
 
 %install
@@ -87,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 0.10.5-1
+- Update to upstream 0.10.5
+- doc patch upstreamed
+
 * Wed Sep  2 2009 Denis Leroy <denis at poolshark.org> - 0.10.4-2
 - Rebuild for new glibmm24
 - Added patch to remove beautify_docs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Aug 2009 08:52:31 -0000	1.8
+++ sources	15 Sep 2009 08:13:36 -0000	1.9
@@ -1 +1 @@
-390e3e5d86be85021a51f59d80bb3448  gstreamermm-0.10.4.tar.bz2
+0865345d926c11573a951a18a7a31eaa  gstreamermm-0.10.5.tar.bz2


--- gstreamermm-0.10.4-docs.patch DELETED ---



From dtardon at fedoraproject.org  Tue Sep 15 08:19:36 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Tue, 15 Sep 2009 08:19:36 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,
	NONE, 1.1 openoffice.org.spec, 1.2006, 1.2007
Message-ID: <20090915081936.1098D11C00CE@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11763

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 
Log Message:
Resolves: 522056 - wrong match of fonts (non-)proportional

openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch:
 canvas/source/cairo/cairo_canvasfont.cxx                      |    5 +++++
 canvas/source/directx/dx_textlayout_drawhelper.cxx            |    6 ++++++
 canvas/source/vcl/canvasfont.cxx                              |    5 +++++
 cppcanvas/inc/cppcanvas/renderer.hxx                          |    3 +++
 cppcanvas/source/mtfrenderer/implrenderer.cxx                 |   10 +++++++++-
 drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx |    6 +++++-
 drawinglayer/source/primitive2d/textlayoutdevice.cxx          |    2 ++
 drawinglayer/source/primitive2d/textprimitive2d.cxx           |    3 ++-
 drawinglayer/source/processor2d/canvasprocessor.cxx           |    5 +++++
 9 files changed, 42 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch ---
Index: cppcanvas/source/mtfrenderer/implrenderer.cxx
===================================================================
--- cppcanvas/source/mtfrenderer/implrenderer.cxx	(revision 276100)
+++ cppcanvas/source/mtfrenderer/implrenderer.cxx	(working copy)
@@ -52,6 +52,7 @@
 #include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
 #include <com/sun/star/rendering/ViewState.hpp>
 #include <com/sun/star/rendering/RenderState.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
@@ -956,6 +957,12 @@
                 rParms.mrParms.maFontLetterForm.isValid() ?
                 rParms.mrParms.maFontLetterForm.getValue() :
                 (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
+            aFontRequest.FontDescription.FontDescription.Proportion = 
+                rParms.mrParms.maFontProportion.isValid() ?
+                rParms.mrParms.maFontProportion.getValue() :
+                (rFont.GetPitch() == PITCH_FIXED)
+                    ? rendering::PanoseProportion::MONO_SPACED
+                    : rendering::PanoseProportion::ANYTHING;
 
             LanguageType aLang = rFont.GetLanguage();
             aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
@@ -3073,7 +3080,8 @@
             if( rParams.maFontName.isValid() ||
                 rParams.maFontWeight.isValid() ||
                 rParams.maFontLetterForm.isValid() ||
-                rParams.maFontUnderline.isValid() )
+                rParams.maFontUnderline.isValid() ||
+                rParams.maFontProportion.isValid() )
             {
                 ::cppcanvas::internal::OutDevState& rState = getState( aStateStack );
                     
Index: cppcanvas/inc/cppcanvas/renderer.hxx
===================================================================
--- cppcanvas/inc/cppcanvas/renderer.hxx	(revision 276100)
+++ cppcanvas/inc/cppcanvas/renderer.hxx	(working copy)
@@ -139,6 +139,9 @@
             /// Optionally forces the given font letter form (italics etc.) for all text actions
             ::comphelper::OptionalValue< sal_Int8 >					maFontLetterForm;
 
+            /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions
+            ::comphelper::OptionalValue< sal_Int8 >					maFontProportion;
+
             /// Optionally forces underlining for all text actions
             ::comphelper::OptionalValue< bool >						maFontUnderline;
         };
Index: canvas/source/directx/dx_textlayout_drawhelper.cxx
===================================================================
--- canvas/source/directx/dx_textlayout_drawhelper.cxx	(revision 276100)
+++ canvas/source/directx/dx_textlayout_drawhelper.cxx	(working copy)
@@ -135,6 +135,9 @@
             aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
             aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
             aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
+            aFont.SetPitch(
+                    rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+                    ? PITCH_FIXED : PITCH_VARIABLE);
 
             aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
 
@@ -267,6 +270,9 @@
         aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
         aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
         aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
+        aFont.SetPitch(
+                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+                ? PITCH_FIXED : PITCH_VARIABLE);
 
         // adjust to stretched font
         if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11))
Index: canvas/source/vcl/canvasfont.cxx
===================================================================
--- canvas/source/vcl/canvasfont.cxx	(revision 276100)
+++ canvas/source/vcl/canvasfont.cxx	(working copy)
@@ -33,6 +33,8 @@
 
 #include <canvas/debug.hxx>
 
+#include <com/sun/star/rendering/PanoseProportion.hpp>
+
 #include <rtl/math.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <i18npool/mslangid.hxx>
@@ -66,6 +68,9 @@
         // TODO(F2): improve panose->vclenum conversion
         maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
         maFont->SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
+        maFont->SetPitch(
+                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+                    ? PITCH_FIXED : PITCH_VARIABLE);
 
 		maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
 
Index: canvas/source/cairo/cairo_canvasfont.cxx
===================================================================
--- canvas/source/cairo/cairo_canvasfont.cxx	(revision 276100)
+++ canvas/source/cairo/cairo_canvasfont.cxx	(working copy)
@@ -36,6 +36,8 @@
 #include <rtl/math.hxx>
 #include <basegfx/numeric/ftools.hxx>
 
+#include <com/sun/star/rendering/PanoseProportion.hpp>
+
 #include <vcl/metric.hxx>
 #include <i18npool/mslangid.hxx>
 
@@ -86,6 +88,9 @@
         // TODO(F2): improve panose->vclenum conversion
         maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
         maFont->SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
+        maFont->SetPitch(
+                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+                    ? PITCH_FIXED : PITCH_VARIABLE);
 
         maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
 
Index: drawinglayer/source/processor2d/canvasprocessor.cxx
===================================================================
--- drawinglayer/source/processor2d/canvasprocessor.cxx	(revision 276100)
+++ drawinglayer/source/processor2d/canvasprocessor.cxx	(working copy)
@@ -64,6 +64,7 @@
 #include <drawinglayer/primitive2d/alphaprimitive2d.hxx>
 #include <basegfx/tuple/b2i64tuple.hxx>
 #include <basegfx/range/b2irange.hxx>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <com/sun/star/rendering/StrokeAttributes.hpp>
@@ -1526,6 +1527,10 @@
                     aFontRequest.FontDescription.IsVertical = rFontAttrs.getVertical() ? util::TriState_YES : util::TriState_NO;
                     // TODO(F2): improve vclenum->panose conversion
                     aFontRequest.FontDescription.FontDescription.Weight = static_cast< sal_uInt8 >(rFontAttrs.getWeight());
+                    aFontRequest.FontDescription.FontDescription.Proportion =
+                        rFontAttrs.getMonospaced()
+                            ? rendering::PanoseProportion::MONO_SPACED
+                            : rendering::PanoseProportion::ANYTHING;
                     aFontRequest.FontDescription.FontDescription.Letterform = rFontAttrs.getItalic() ? 9 : 0;
 
                     // init CellSize to 1.0, else a default font height will be used
Index: drawinglayer/source/primitive2d/textlayoutdevice.cxx
===================================================================
--- drawinglayer/source/primitive2d/textlayoutdevice.cxx	(revision 276100)
+++ drawinglayer/source/primitive2d/textlayoutdevice.cxx	(working copy)
@@ -346,6 +346,7 @@
 			aRetval.SetWeight(static_cast<FontWeight>(rFontAttributes.getWeight()));
 			aRetval.SetItalic(rFontAttributes.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
 			aRetval.SetOutline(rFontAttributes.getOutline());
+            aRetval.SetPitch(rFontAttributes.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
 
 #ifdef WIN32
 			// #100424# use higher precision
@@ -392,6 +393,7 @@
                 RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
 			    rFont.IsVertical(),
 			    ITALIC_NONE != rFont.GetItalic(),
+                PITCH_FIXED == rFont.GetPitch(),
 			    rFont.IsOutline(),
                 bRTL,
                 bBiDiStrong);
Index: drawinglayer/source/primitive2d/textprimitive2d.cxx
===================================================================
--- drawinglayer/source/primitive2d/textprimitive2d.cxx	(revision 276100)
+++ drawinglayer/source/primitive2d/textprimitive2d.cxx	(working copy)
@@ -63,7 +63,8 @@
 				&& getItalic() == rCompare.getItalic()
 				&& getOutline() == rCompare.getOutline()
 				&& getRTL() == rCompare.getRTL()
-				&& getBiDiStrong() == rCompare.getBiDiStrong());
+				&& getBiDiStrong() == rCompare.getBiDiStrong()
+                && getMonospaced() == rCompare.getMonospaced());
 		}
 	} // end of namespace primitive2d
 } // end of namespace drawinglayer
Index: drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
===================================================================
--- drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx	(revision 276100)
+++ drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx	(working copy)
@@ -75,6 +75,7 @@
 			unsigned									mbOutline : 1;      // Outline Flag
             unsigned                                    mbRTL : 1;          // RTL Flag
             unsigned                                    mbBiDiStrong : 1;   // BiDi Flag
+            unsigned mbMonospaced : 1;
 			// TODO: pair kerning and CJK kerning
 
         public:
@@ -85,6 +86,7 @@
                 bool bSymbol = false,
                 bool bVertical = false,
                 bool bItalic = false,
+                bool bMonospaced = false,
                 bool bOutline = false,
                 bool bRTL = false,
                 bool bBiDiStrong = false)
@@ -96,7 +98,8 @@
 			    mbItalic(bItalic),
 			    mbOutline(bOutline),
                 mbRTL(bRTL),
-                mbBiDiStrong(bBiDiStrong)
+                mbBiDiStrong(bBiDiStrong),
+                mbMonospaced(bMonospaced)
             {
             }
 
@@ -113,6 +116,7 @@
             bool getOutline() const { return mbOutline; }
             bool getRTL() const { return mbRTL; }
             bool getBiDiStrong() const { return mbBiDiStrong; }
+            bool getMonospaced() const { return mbMonospaced; }
 		};
 	} // end of namespace primitive2d
 } // end of namespace drawinglayer


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2006
retrieving revision 1.2007
diff -u -p -r1.2006 -r1.2007
--- openoffice.org.spec	14 Sep 2009 10:42:22 -0000	1.2006
+++ openoffice.org.spec	15 Sep 2009 08:19:35 -0000	1.2007
@@ -159,6 +159,7 @@ Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 Patch84: workspace.dr69.patch
+Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1703,6 +1704,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch82 -p0 -b .workspace.vcl102.patch
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.dr69.patch
+%patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4245,8 +4247,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
+* Tue Sep 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8-UNBUILT
 - disable NumberFormatRecognition from default writer configuration
+- Resolves: 522056 - wrong match of fonts (non-)proportional
 
 * Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
 - make oo.o buildable without langpacks again



From chitlesh at fedoraproject.org  Tue Sep 15 08:21:02 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 08:21:02 +0000 (UTC)
Subject: rpms/gspiceui/F-10 gspiceui-32x32.xpm, NONE,
	1.1 gspiceui-opamp-3.sym, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 gspiceui.desktop, 1.1,
	1.2 gspiceui.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090915082102.A165F11C0332@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12820/F-10

Modified Files:
	.cvsignore gspiceui.desktop gspiceui.spec import.log sources 
Added Files:
	gspiceui-32x32.xpm gspiceui-opamp-3.sym 
Log Message:
0.9.97


--- NEW FILE gspiceui-32x32.xpm ---
/* XPM */
static char *gspiceui_xpm[]={
"32 32 6 1",
"b c #000000",
"e c #0000ff",
"f c #58a8ff",
"d c #c00000",
". c #c000c0",
"# c #c0ffc0",
"................................",
".##############################.",
".##############################.",
".######bbbbbbbbb###############.",
".######b#######b###############.",
".##bbbbb#######bbbbbbbbbbbbbb##.",
".######b#######b#####b#########.",
".######bbbbbbbbb#####b#########.",
".####################b#########.",
".#################bbbbbbb######.",
".#####d########################.",
".#####d########################.",
".#####d###########bbbbbbb######.",
".#####d##############b#########.",
".#####d##ee##########b#########.",
".#####d#effe#######bbbbb#######.",
".#####dee##ee##################.",
".#####de####ef######bbb########.",
".#####ef####fe#################.",
".####fe######ef######b#########.",
".####ed######fe##########ee####.",
".###fed#######ef########effe###.",
".###efd#######fe#######ef##fe##.",
".##feddddddddddefdddddfeddddd##.",
".##e##d########fe#####ef#######.",
".#####d#########ef###fe########.",
".#####d#########fe###ef########.",
".#####d##########fefef#########.",
".#####d###########eee##########.",
".##############################.",
".##############################.",
"................................"};


--- NEW FILE gspiceui-opamp-3.sym ---
v 20040111 1
L 200 1200 200 0 3 0 0 0 -1 -1
L 200 0 1200 600 3 0 0 0 -1 -1
L 1200 600 200 1200 3 0 0 0 -1 -1
P 200 900 0 900 1 0 1
{
T 150 925 5 8 1 1 0 6 1
pinnumber=1
T 150 925 5 8 0 0 0 6 1
pinseq=1
}
P 200 300 0 300 1 0 1
{
T 150 325 5 8 1 1 0 6 1
pinnumber=2
T 150 325 5 8 0 0 0 6 1
pinseq=2
}
P 1200 600 1400 600 1 0 1
{
T 1275 625 5 8 1 1 0 0 1
pinnumber=5
T 1275 625 5 8 0 0 0 0 1
pinseq=5
}
P 700 900 700 1100 1 0 1
{
T 750 950 5 8 1 1 0 0 1
pinnumber=3
T 725 950 5 8 0 0 0 0 1
pinseq=3
}
P 700 300 700 100 1 0 1
{
T 600 125 5 8 0 0 0 0 1
pinseq=4
T 750 150 5 10 1 1 0 0 1
pinnumber=4
}
L 300 950 300 850 3 0 0 0 -1 -1
L 250 900 350 900 3 0 0 0 -1 -1
L 250 300 350 300 3 0 0 0 -1 -1
T 350 550 9 8 1 0 0 0 1
OP AMP
T 675 400 9 6 1 0 0 4 1
Vee
T 675 825 9 6 1 0 0 4 1
Vcc
T 1000 925 8 10 1 1 0 0 1
refdes=U?


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2008 07:41:35 -0000	1.2
+++ .cvsignore	15 Sep 2009 08:21:01 -0000	1.3
@@ -1 +1 @@
-gspiceui-v0.9.65.tar.gz
+gspiceui-v0.9.97.tar.gz


Index: gspiceui.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-10/gspiceui.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gspiceui.desktop	28 Jul 2008 07:41:35 -0000	1.1
+++ gspiceui.desktop	15 Sep 2009 08:21:01 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=GspiceUI
-Comment=Spice Electronic circuit similators UI
+Name=Spice Simulation Frontend
+Comment=Simulates spice netlists and gEDA schematics
 Exec=gspiceui
 Icon=gspiceui
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Education;Science;Engineering;
+Categories=Electronics;Engineering;


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-10/gspiceui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gspiceui.spec	31 Jul 2008 10:28:14 -0000	1.2
+++ gspiceui.spec	15 Sep 2009 08:21:01 -0000	1.3
@@ -1,20 +1,23 @@
-Name:		gspiceui
-Version:	0.9.65 
-Release:	3%{?dist}
-Summary:	A GUI to freely available Spice Electronic circuit similators
-
-Group:		Applications/System 
-License:	GPLv2+
-URL:		http://sourceforge.net/projects/gspiceui
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
-Source1:	%{name}.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	compat-wxGTK26-devel, desktop-file-utils  
-Requires:	ngspice, geda-gnetlist, geda-gschem 
-Requires:	gwave, electronics-menu
+Name:          gspiceui
+Version:       0.9.97
+Release:       1%{?dist}
+Summary:       A GUI to freely available Spice Electronic circuit similators
+
+Group:         Applications/Engineering
+License:       GPLv2+
+URL:           http://sourceforge.net/projects/gspiceui
+Source0:       http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
+Source1:       %{name}.desktop
+Source2:       %{name}-opamp-3.sym
+Source3:       %{name}-32x32.xpm
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: wxGTK-devel desktop-file-utils
+Requires:      ngspice geda-gnetlist geda-gschem geda-symbols
+Requires:      gwave electronics-menu
 
-ExcludeArch:	ppc64
+ExcludeArch:   ppc64
 
 %description
 GspiceUI is listed among the Fedora Electronic Lab (FEL) packages.
@@ -28,72 +31,88 @@ gSchem is used as the schematic generati
 %prep
 %setup -q -n %{name}-v%{version}
 
-sed -i 's|/usr/local|/usr|g' html/Makefile
-sed -i 's|cp|install -pm 644|g' Makefile html/Makefile
-sed -i 's|cp |install -m 755 |g' src/Makefile
-sed -i 's|wx-config|wx-2.6-config|' src/Makefile
+#wrong-file-end-of-line-encoding
+sed -i 's/\r//' lib/*/*.mod
+
+#spurious-executable-perm
+chmod 0644 lib/*/*.mod
+chmod 0644 sch/*/*.sch
+
+sed -i "s|/share/gspiceui/html/gSpiceUI.html|/share/doc/%{name}-%{version}/gSpiceUI.html|g" src/main/HelpTasks.cpp
+
 
 %build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6
+%{__make} %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
 
-%install
-rm -rf $RPM_BUILD_ROOT
 
-#fix installdir path
-sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile
+%install
+rm -rf %{buildroot}
 
-#Add missing folder
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -d %{buildroot}%{_bindir}
+install -pm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+install -d %{buildroot}%{_mandir}/man1/
+install -pm 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
-#remove default installed docs|files 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+#Upstream Sources is missing opamp-3.sym
+install -d %{buildroot}%{_datadir}/gEDA/sym/misc
+install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 #Add/Manage desktop file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-
-install -pm 0644 src/icons/%{name}-32x32.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -pm 0644 %{SOURCE3} \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 install -pm 0644 src/icons/%{name}-48x48.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
-desktop-file-install 	--vendor "Fedora"				\
-			--mode 0644					\
-			--remove-category="Science;Education"		\
-			--add-category Electronics			\
-			--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-			%{SOURCE1}
+desktop-file-install --vendor "" \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE1}
+
+rm -f sch/Makefile lib/Makefile
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%post   
+%post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :   
+touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog TODO
+%doc Authors License ReadMe ChangeLog ToDo
+%doc sch/ lib/ html/gSpiceUI.html
 %{_bindir}/%{name}
-%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/??x??/apps/*.xpm
-%{_datadir}/applications/*.desktop
-%{_mandir}/man1/gspiceui.1.gz
-
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 
 %changelog
+* Mon Sep 14 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.97-1
+- New upstream release
+- Added missing opamp-3.sym and corrected menu icon
+
+* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-6
+- Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
+- Added documentations: schematics and spice models
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jul 31 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.9.65-3
 - Excluded ppc64 (gwave is not available on ppc64).
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Jul 2008 07:41:35 -0000	1.1
+++ import.log	15 Sep 2009 08:21:01 -0000	1.2
@@ -1 +1,2 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
+gspiceui-0_9_97-1_fc11:F-10:gspiceui-0.9.97-1.fc11.src.rpm:1253002551


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2008 07:41:35 -0000	1.2
+++ sources	15 Sep 2009 08:21:02 -0000	1.3
@@ -1 +1 @@
-7243c51a7ad1d4138bc28db9695d18c2  gspiceui-v0.9.65.tar.gz
+b72bfcee7e1c57719bebbedf75530ebc  gspiceui-v0.9.97.tar.gz



From pmatilai at fedoraproject.org  Tue Sep 15 08:22:57 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 15 Sep 2009 08:22:57 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.1-abs-filelist.patch, NONE,
	1.1 rpm-4.7.1-bugurl.patch, NONE,
	1.1 rpm-4.7.1-debug-perms.patch, NONE,
	1.1 rpm-4.7.1-duplicate-deps.patch, NONE, 1.1 rpm.spec, 1.359, 1.360
Message-ID: <20090915082257.CA73511C00CE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13636

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.1-abs-filelist.patch rpm-4.7.1-bugurl.patch 
	rpm-4.7.1-debug-perms.patch rpm-4.7.1-duplicate-deps.patch 
Log Message:
- fix duplicate dependency filtering on build (#490378)
- permit absolute paths in file lists again (#521760)
- use permissions 444 for all .debug files (#522194)
- add support for optional bugurl tag (#512774)


rpm-4.7.1-abs-filelist.patch:
 files.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.1-abs-filelist.patch ---
commit 4018bbd08e84fd0cc227dcb8d2dc20693ce2296a
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 15 10:56:58 2009 +0300

    Allow absolute paths in file lists again (SuseBug:535594, RhBug:521760)
    - patch from OpenSUSE / Michael Schroeder
    - build-time generated file lists should be placed in the build directory,
      but at least one valid use case for this is things like %files -f %{SOURCE10}

diff --git a/build/files.c b/build/files.c
index b5c5437..061494d 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1755,9 +1755,13 @@ static rpmRC processPackageFiles(rpmSpec spec, Package pkg,
 
 	argvSplit(&filelists, getStringBuf(pkg->fileFile), "\n");
 	for (fp = filelists; *fp != NULL; fp++) {
-	    ffn = rpmGetPath("%{_builddir}/",
-		(spec->buildSubdir ? spec->buildSubdir : "") ,
-		"/", *fp, NULL);
+	    if (**fp == '/') {
+		ffn = rpmGetPath(*fp, NULL);
+	    } else {
+		ffn = rpmGetPath("%{_builddir}/",
+		    (spec->buildSubdir ? spec->buildSubdir : "") ,
+		    "/", *fp, NULL);
+	    }
 	    fd = fopen(ffn, "r");
 
 	    if (fd == NULL || ferror(fd)) {

rpm-4.7.1-bugurl.patch:
 build/files.c         |    1 +
 build/parsePreamble.c |    4 ++++
 lib/rpmtag.h          |    1 +
 macros.in             |    6 ++++++
 tests/rpmgeneral.at   |    1 +
 5 files changed, 13 insertions(+)

--- NEW FILE rpm-4.7.1-bugurl.patch ---
diff --git a/build/files.c b/build/files.c
index f3cf261..e1230a5 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1977,6 +1977,7 @@ static const rpmTag sourceTags[] = {
     RPMTAG_CHANGELOGNAME,
     RPMTAG_CHANGELOGTEXT,
     RPMTAG_URL,
+    RPMTAG_BUGURL,
     HEADER_I18NTABLE,
     0
 };
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index c000780..70b20a8 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -32,6 +32,7 @@ static const rpmTag copyTagsDuringParse[] = {
     RPMTAG_CHANGELOGTEXT,
     RPMTAG_PREFIXES,
     RPMTAG_DISTTAG,
+    RPMTAG_BUGURL,
     0
 };
 
@@ -307,6 +308,7 @@ static struct optionalTag {
     { RPMTAG_PACKAGER,		"%{packager}" },
     { RPMTAG_DISTRIBUTION,	"%{distribution}" },
     { RPMTAG_DISTURL,		"%{disturl}" },
+    { RPMTAG_BUGURL,		"%{bugurl}" },
     { -1, NULL }
 };
 
@@ -501,6 +503,7 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag,
 	}
     case RPMTAG_URL:
     case RPMTAG_DISTTAG:
+    case RPMTAG_BUGURL:
 	SINGLE_TOKEN_ONLY;
 	/* These macros are for backward compatibility */
 	if (tag == RPMTAG_VERSION) {
@@ -734,6 +737,7 @@ static struct PreambleRec_s preambleList[] = {
     {RPMTAG_AUTOPROV,		0, 0, 0, "autoprov"},
     {RPMTAG_DOCDIR,		0, 0, 0, "docdir"},
     {RPMTAG_DISTTAG,		0, 0, 0, "disttag"},
+    {RPMTAG_BUGURL,		0, 0, 0, "bugurl"},
    	/* LCL: can't add null annotation */
     {0, 0, 0, 0, 0}
 };
diff --git a/lib/rpmtag.h b/lib/rpmtag.h
index a0bbd79..7a3aa01 100644
--- a/lib/rpmtag.h
+++ b/lib/rpmtag.h
@@ -282,6 +282,7 @@ typedef enum rpmTag_e {
     RPMTAG_LONGSIZE		= 5009, /* l */
     RPMTAG_FILECAPS		= 5010, /* s[] */
     RPMTAG_FILEDIGESTALGO	= 5011, /* i file digest algorithm */
+    RPMTAG_BUGURL		= 5012, /* s */
 
     RPMTAG_FIRSTFREE_TAG	/*!< internal */
 } rpmTag;
diff --git a/macros.in b/macros.in
index 158ae34..ee10586 100644
--- a/macros.in
+++ b/macros.in
@@ -264,6 +264,12 @@ package or when debugging this package.\
 #
 #%disturl
 
+#	Configurable bug URL, same as BugURL: tag in a specfile.
+#	The URL will be used to supply reliable information to where
+#	to file bugs.
+#
+#%bugurl
+
 #	Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
 #	marked as %doc should be installed.
 #%_excludedocs
diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at
index d6f11a5..4956780 100644
--- a/tests/rpmgeneral.at
+++ b/tests/rpmgeneral.at
@@ -71,6 +71,7 @@ AT_CHECK([run rpm --querytags],[0],
 [ARCH
 ARCHIVESIZE
 BASENAMES
+BUGURL
 BUILDARCHS
 BUILDHOST
 BUILDTIME

rpm-4.7.1-debug-perms.patch:
 find-debuginfo.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-debug-perms.patch ---
>From 6cc599de01a9835b5128b7b2a869f9f7cf3976fb Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland at redhat.com>
Date: Wed, 9 Sep 2009 11:07:10 -0700
Subject: [PATCH] find-debuginfo.sh: use permissions 444 for all .debug files

Signed-off-by: Roland McGrath <roland at redhat.com>
---
 scripts/find-debuginfo.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index 21366bf..8d86de6 100644
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -93,6 +93,7 @@ strip_to_debug()
   application/x-sharedlib*) g=-g ;;
   esac
   eu-strip --remove-comment $g -f "$1" "$2" || exit
+  chmod 444 "$1" || exit
 }
 
 # Make a relative symlink to $1 called $3$2
-- 
1.6.2.5


rpm-4.7.1-duplicate-deps.patch:
 reqprov.c |   62 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 20 deletions(-)

--- NEW FILE rpm-4.7.1-duplicate-deps.patch ---
commit 10772ac7dfad60cb5a20681d22cf851468d0a8f9
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Aug 20 13:02:05 2009 +0300

    Fix duplicate dependency checking on build
    - Broken by commit af8b41c64af39ce07d85fcd92fa78d566747d815 which
      simplified too much.
    - There's no guarantee that rpmdsNew() returns a sorted dependency set
      so rpmdsFind() doesn't work correctly here. Walk the ds manually instead.
    - With multiple triggers of same type, identical trigger conditions on
      different trigger script were seen as duplicates (RhBug:490378)
    - Split the duplicate checking to separate helper function for clarity

diff --git a/build/reqprov.c b/build/reqprov.c
index 1e69bd2..ba6a1e8 100644
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -9,6 +9,38 @@
 #include <rpm/rpmbuild.h>
 #include "debug.h"
 
+static int isNewDep(Header h, rpmTag nametag,
+		  const char *N, const char *EVR, rpmsenseFlags Flags,
+		  rpmTag indextag, uint32_t index)
+{
+    int new = 1;
+    struct rpmtd_s idx;
+    rpmds ads = rpmdsNew(h, nametag, 0);
+    rpmds bds = rpmdsSingle(nametag, N, EVR, Flags);
+
+    if (indextag) {
+	headerGet(h, indextag, &idx, HEADERGET_MINMEM);
+    }
+
+    /* XXX there's no guarantee the ds is sorted here so rpmdsFind() wont do */
+    rpmdsInit(ads);
+    while (new && rpmdsNext(ads) >= 0) {
+	if (strcmp(rpmdsN(ads), rpmdsN(bds))) continue;
+	if (strcmp(rpmdsEVR(ads), rpmdsEVR(bds))) continue;
+	if (rpmdsFlags(ads) != rpmdsFlags(bds)) continue;
+	if (indextag && rpmtdSetIndex(&idx, rpmdsIx(ads)) >= 0 &&
+			rpmtdGetNumber(&idx) != index) continue;
+	new = 0;
+    }
+    
+    if (indextag) {
+	rpmtdFreeData(&idx);
+    }
+    rpmdsFree(ads);
+    rpmdsFree(bds);
+    return new;
+}
+
 int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
 		const char * N, const char * EVR, rpmsenseFlags Flags,
 		uint32_t index)
@@ -55,28 +87,18 @@ int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
     if (EVR == NULL)
 	EVR = "";
     
-    /* Check for duplicate dependencies. */
-    rpmds hds = rpmdsNew(h, nametag, 0);
-    rpmds newds = rpmdsSingle(nametag, N, EVR, Flags);
-    /* already got it, don't bother */
-    if (rpmdsFind(hds, newds) >= 0) {
-	goto exit;
-    }
-
-    /* Add this dependency. */
-    headerPutString(h, nametag, N);
-    if (flagtag) {
-	headerPutString(h, versiontag, EVR);
-	headerPutUint32(h, flagtag, &Flags, 1);
-    }
-    if (indextag) {
-	headerPutUint32(h, indextag, &index, 1);
+    /* Avoid adding duplicate dependencies. */
+    if (isNewDep(h, nametag, N, EVR, Flags, indextag, index)) {
+	headerPutString(h, nametag, N);
+	if (flagtag) {
+	    headerPutString(h, versiontag, EVR);
+	    headerPutUint32(h, flagtag, &Flags, 1);
+	}
+	if (indextag) {
+	    headerPutUint32(h, indextag, &index, 1);
+	}
     }
 
-exit:
-    rpmdsFree(hds);
-    rpmdsFree(newds);
-	
     return 0;
 }
 


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -p -r1.359 -r1.360
--- rpm.spec	14 Aug 2009 16:57:09 -0000	1.359
+++ rpm.spec	15 Sep 2009 08:22:57 -0000	1.360
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -39,6 +39,10 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
+Patch200: rpm-4.7.1-bugurl.patch
+Patch201: rpm-4.7.1-abs-filelist.patch
+Patch202: rpm-4.7.1-debug-perms.patch
+Patch203: rpm-4.7.1-duplicate-deps.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -192,6 +196,11 @@ packages on a system.
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
+%patch200 -p1 -b .bugurl
+%patch201 -p1 -b .abs-filelist
+%patch202 -p1 -b .debug-perms
+%patch203 -p1 -b .duplicate-deps
+
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -406,6 +415,12 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Sep 15 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-5
+- fix duplicate dependency filtering on build (#490378)
+- permit absolute paths in file lists again (#521760)
+- use permissions 444 for all .debug files (#522194)
+- add support for optional bugurl tag (#512774)
+
 * Fri Aug 14 2009 Jesse Keating <jkeating at redhat.com> - 4.7.1-4
 - Patch to make geode appear as i686 (#517475)
 



From caolanm at fedoraproject.org  Tue Sep 15 08:24:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Sep 2009 08:24:15 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch, NONE,
	1.1 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.9, 1.10 openoffice.org.spec, 1.2007, 1.2008
Message-ID: <20090915082415.7EBAF11C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14265

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch 
Log Message:
add openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch to go through abrt

openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch:
 signal.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch ---
--- openoffice.org.orig/sal/osl/unx/signal.c	2009-09-15 09:14:35.000000000 +0100
+++ openoffice.org/sal/osl/unx/signal.c	2009-09-15 09:14:40.000000000 +0100
@@ -77,10 +77,14 @@
 #include "file_path_helper.h"
 
 #define ACT_IGNORE	1
-#define ACT_ABORT	2
-#define ACT_EXIT	3
-#define ACT_SYSTEM	4
-#define ACT_HIDE	5
+#define ACT_EXIT	2
+#define ACT_SYSTEM	3
+#define ACT_HIDE	4
+#ifdef SAL_ENABLE_CRASH_REPORT
+#    define ACT_ABORT	5
+#else
+#    define ACT_ABORT   ACT_SYSTEM
+#endif
 
 #define MAX_PATH_LEN	2048
 
@@ -401,7 +405,7 @@
 
 #define REPORTENV_PARAM		"-crashreportenv:"
 
-#ifdef LINUX
+#if defined(LINUX) && defined(SAL_ENABLE_CRASH_REPORT)
 
 typedef struct
 {

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 SRC680_m123/desktop/scripts/soffice.sh |   13 ++++---------
 sal/osl/unx/signal.c                   |    8 ++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	1 Sep 2008 12:09:07 -0000	1.9
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	15 Sep 2009 08:24:14 -0000	1.10
@@ -61,20 +61,3 @@ diff -u -p -u -r1.28 signal.c
  		rtl_string_release (strProgName);
  	}
  	return (idx != -1);
-Index: osl/unx/makefile.mk
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/makefile.mk,v
-retrieving revision 1.28.42.1
-diff -u -r1.28.42.1 makefile.mk
---- openoffice.org.orig/sal/osl/unx/makefile.mk	3 Nov 2006 11:39:24 -0000	1.28.42.1
-+++ openoffice.org/sal/osl/unx/makefile.mk	2 Dec 2006 11:38:16 -0000
-@@ -136,9 +136,7 @@
- .ENDIF
- .ENDIF
- 
--.IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
- CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
--.ENDIF
- 
- .INCLUDE :  target.mk
- 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2007
retrieving revision 1.2008
diff -u -p -r1.2007 -r1.2008
--- openoffice.org.spec	15 Sep 2009 08:19:35 -0000	1.2007
+++ openoffice.org.spec	15 Sep 2009 08:24:14 -0000	1.2008
@@ -160,6 +160,7 @@ Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1705,6 +1706,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.dr69.patch
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch86 -p0 -b .oooXXXXXX.sal.justcoredump.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4248,12 +4250,13 @@ fi
 
 %changelog
 * Tue Sep 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8-UNBUILT
-- disable NumberFormatRecognition from default writer configuration
-- Resolves: 522056 - wrong match of fonts (non-)proportional
+- disable NumberFormatRecognition from default writer configuration (caolanm)
+- Resolves: rhbz#522056 - wrong match of fonts (non-)proportional (dtardon)
+- add openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch to go through abrt (caolanm)
 
 * Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
-- make oo.o buildable without langpacks again
-- Resolves: rhbz#523106 [indic] changed names of lohit-* fonts
+- make oo.o buildable without langpacks again (dtardon)
+- Resolves: rhbz#523106 [indic] changed names of lohit-* fonts (dtardon)
 
 * Tue Sep 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch



From chitlesh at fedoraproject.org  Tue Sep 15 08:26:23 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 08:26:23 +0000 (UTC)
Subject: rpms/gspiceui/F-11 gspiceui-32x32.xpm, NONE,
	1.1 gspiceui-opamp-3.sym, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 gspiceui.spec, 1.4,
	1.5 import.log, 1.2, 1.3 sources, 1.2, 1.3 gspiceui-xpm.patch,
	1.1, NONE
Message-ID: <20090915082623.807C411C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108/F-11

Modified Files:
	.cvsignore gspiceui.spec import.log sources 
Added Files:
	gspiceui-32x32.xpm gspiceui-opamp-3.sym 
Removed Files:
	gspiceui-xpm.patch 
Log Message:
0.9.97


--- NEW FILE gspiceui-32x32.xpm ---
/* XPM */
static char *gspiceui_xpm[]={
"32 32 6 1",
"b c #000000",
"e c #0000ff",
"f c #58a8ff",
"d c #c00000",
". c #c000c0",
"# c #c0ffc0",
"................................",
".##############################.",
".##############################.",
".######bbbbbbbbb###############.",
".######b#######b###############.",
".##bbbbb#######bbbbbbbbbbbbbb##.",
".######b#######b#####b#########.",
".######bbbbbbbbb#####b#########.",
".####################b#########.",
".#################bbbbbbb######.",
".#####d########################.",
".#####d########################.",
".#####d###########bbbbbbb######.",
".#####d##############b#########.",
".#####d##ee##########b#########.",
".#####d#effe#######bbbbb#######.",
".#####dee##ee##################.",
".#####de####ef######bbb########.",
".#####ef####fe#################.",
".####fe######ef######b#########.",
".####ed######fe##########ee####.",
".###fed#######ef########effe###.",
".###efd#######fe#######ef##fe##.",
".##feddddddddddefdddddfeddddd##.",
".##e##d########fe#####ef#######.",
".#####d#########ef###fe########.",
".#####d#########fe###ef########.",
".#####d##########fefef#########.",
".#####d###########eee##########.",
".##############################.",
".##############################.",
"................................"};


--- NEW FILE gspiceui-opamp-3.sym ---
v 20040111 1
L 200 1200 200 0 3 0 0 0 -1 -1
L 200 0 1200 600 3 0 0 0 -1 -1
L 1200 600 200 1200 3 0 0 0 -1 -1
P 200 900 0 900 1 0 1
{
T 150 925 5 8 1 1 0 6 1
pinnumber=1
T 150 925 5 8 0 0 0 6 1
pinseq=1
}
P 200 300 0 300 1 0 1
{
T 150 325 5 8 1 1 0 6 1
pinnumber=2
T 150 325 5 8 0 0 0 6 1
pinseq=2
}
P 1200 600 1400 600 1 0 1
{
T 1275 625 5 8 1 1 0 0 1
pinnumber=5
T 1275 625 5 8 0 0 0 0 1
pinseq=5
}
P 700 900 700 1100 1 0 1
{
T 750 950 5 8 1 1 0 0 1
pinnumber=3
T 725 950 5 8 0 0 0 0 1
pinseq=3
}
P 700 300 700 100 1 0 1
{
T 600 125 5 8 0 0 0 0 1
pinseq=4
T 750 150 5 10 1 1 0 0 1
pinnumber=4
}
L 300 950 300 850 3 0 0 0 -1 -1
L 250 900 350 900 3 0 0 0 -1 -1
L 250 300 350 300 3 0 0 0 -1 -1
T 350 550 9 8 1 0 0 0 1
OP AMP
T 675 400 9 6 1 0 0 4 1
Vee
T 675 825 9 6 1 0 0 4 1
Vcc
T 1000 925 8 10 1 1 0 0 1
refdes=U?


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2008 07:41:35 -0000	1.2
+++ .cvsignore	15 Sep 2009 08:26:22 -0000	1.3
@@ -1 +1 @@
-gspiceui-v0.9.65.tar.gz
+gspiceui-v0.9.97.tar.gz


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/gspiceui.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gspiceui.spec	3 Sep 2009 06:39:41 -0000	1.4
+++ gspiceui.spec	15 Sep 2009 08:26:23 -0000	1.5
@@ -1,21 +1,23 @@
-Name:		gspiceui
-Version:	0.9.65 
-Release:	5%{?dist}
-Summary:	A GUI to freely available Spice Electronic circuit similators
-
-Group:		Applications/System 
-License:	GPLv2+
-URL:		http://sourceforge.net/projects/gspiceui
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
-Source1:	%{name}.desktop
-Patch0:     gspiceui-xpm.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	wxGTK-devel, desktop-file-utils  
-Requires:	ngspice, geda-gnetlist, geda-gschem 
-Requires:	gwave, electronics-menu
+Name:          gspiceui
+Version:       0.9.97
+Release:       1%{?dist}
+Summary:       A GUI to freely available Spice Electronic circuit similators
+
+Group:         Applications/Engineering
+License:       GPLv2+
+URL:           http://sourceforge.net/projects/gspiceui
+Source0:       http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
+Source1:       %{name}.desktop
+Source2:       %{name}-opamp-3.sym
+Source3:       %{name}-32x32.xpm
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: wxGTK-devel desktop-file-utils
+Requires:      ngspice geda-gnetlist geda-gschem geda-symbols
+Requires:      gwave electronics-menu
 
-ExcludeArch:	ppc64
+ExcludeArch:   ppc64
 
 %description
 GspiceUI is listed among the Fedora Electronic Lab (FEL) packages.
@@ -29,85 +31,85 @@ gSchem is used as the schematic generati
 %prep
 %setup -q -n %{name}-v%{version}
 
-%patch0 -p1 -b .xpm
-
-sed -i 's|/usr/local|/usr|g' html/Makefile
-sed -i 's|cp|install -pm 644|g' Makefile html/Makefile
-sed -i 's|cp |install -m 755 |g' src/Makefile
-
 #wrong-file-end-of-line-encoding
 sed -i 's/\r//' lib/*/*.mod
 
 #spurious-executable-perm
 chmod 0644 lib/*/*.mod
+chmod 0644 sch/*/*.sch
+
+sed -i "s|/share/gspiceui/html/gSpiceUI.html|/share/doc/%{name}-%{version}/gSpiceUI.html|g" src/main/HelpTasks.cpp
 
 
 %build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
+%{__make} %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
 
-%install
-rm -rf $RPM_BUILD_ROOT
 
-#fix installdir path
-sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile
+%install
+rm -rf %{buildroot}
 
-#Add missing folder
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -d %{buildroot}%{_bindir}
+install -pm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+install -d %{buildroot}%{_mandir}/man1/
+install -pm 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
-#remove default installed docs|files 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+#Upstream Sources is missing opamp-3.sym
+install -d %{buildroot}%{_datadir}/gEDA/sym/misc
+install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 #Add/Manage desktop file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-
-install -pm 0644 src/icons/%{name}-32x32.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -pm 0644 %{SOURCE3} \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 install -pm 0644 src/icons/%{name}-48x48.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
-desktop-file-install 	--vendor ""				\
-			--mode 0644					\
-			--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-			%{SOURCE1}
+desktop-file-install --vendor "" \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE1}
 
-find %{buildroot} -name Makefile -exec rm -f {} ';'
+rm -f sch/Makefile lib/Makefile
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%post   
+%post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :   
+touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog TODO
-%doc sch/ lib/
+%doc Authors License ReadMe ChangeLog ToDo
+%doc sch/ lib/ html/gSpiceUI.html
 %{_bindir}/%{name}
-%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/??x??/apps/*.xpm
-%{_datadir}/applications/*.desktop
-%{_mandir}/man1/gspiceui.1.gz
-
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 
 %changelog
-* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-5
+* Mon Sep 14 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.97-1
+- New upstream release
+- Added missing opamp-3.sym and corrected menu icon
+
+* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-6
 - Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
 - Added documentations: schematics and spice models
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Sep 2009 06:39:41 -0000	1.2
+++ import.log	15 Sep 2009 08:26:23 -0000	1.3
@@ -1,2 +1,3 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
 gspiceui-0_9_65-5_fc11:F-11:gspiceui-0.9.65-5.fc11.src.rpm:1251959808
+gspiceui-0_9_97-1_fc11:F-11:gspiceui-0.9.97-1.fc11.src.rpm:1253002991


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2008 07:41:35 -0000	1.2
+++ sources	15 Sep 2009 08:26:23 -0000	1.3
@@ -1 +1 @@
-7243c51a7ad1d4138bc28db9695d18c2  gspiceui-v0.9.65.tar.gz
+b72bfcee7e1c57719bebbedf75530ebc  gspiceui-v0.9.97.tar.gz


--- gspiceui-xpm.patch DELETED ---



From chitlesh at fedoraproject.org  Tue Sep 15 08:28:36 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 08:28:36 +0000 (UTC)
Subject: rpms/gspiceui/devel gspiceui-32x32.xpm, NONE,
	1.1 gspiceui-opamp-3.sym, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 gspiceui.spec, 1.6,
	1.7 import.log, 1.3, 1.4 sources, 1.2, 1.3 gspiceui-xpm.patch,
	1.1, NONE
Message-ID: <20090915082836.4DA7F11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16233/devel

Modified Files:
	.cvsignore gspiceui.spec import.log sources 
Added Files:
	gspiceui-32x32.xpm gspiceui-opamp-3.sym 
Removed Files:
	gspiceui-xpm.patch 
Log Message:
0.9.97


--- NEW FILE gspiceui-32x32.xpm ---
/* XPM */
static char *gspiceui_xpm[]={
"32 32 6 1",
"b c #000000",
"e c #0000ff",
"f c #58a8ff",
"d c #c00000",
". c #c000c0",
"# c #c0ffc0",
"................................",
".##############################.",
".##############################.",
".######bbbbbbbbb###############.",
".######b#######b###############.",
".##bbbbb#######bbbbbbbbbbbbbb##.",
".######b#######b#####b#########.",
".######bbbbbbbbb#####b#########.",
".####################b#########.",
".#################bbbbbbb######.",
".#####d########################.",
".#####d########################.",
".#####d###########bbbbbbb######.",
".#####d##############b#########.",
".#####d##ee##########b#########.",
".#####d#effe#######bbbbb#######.",
".#####dee##ee##################.",
".#####de####ef######bbb########.",
".#####ef####fe#################.",
".####fe######ef######b#########.",
".####ed######fe##########ee####.",
".###fed#######ef########effe###.",
".###efd#######fe#######ef##fe##.",
".##feddddddddddefdddddfeddddd##.",
".##e##d########fe#####ef#######.",
".#####d#########ef###fe########.",
".#####d#########fe###ef########.",
".#####d##########fefef#########.",
".#####d###########eee##########.",
".##############################.",
".##############################.",
"................................"};


--- NEW FILE gspiceui-opamp-3.sym ---
v 20040111 1
L 200 1200 200 0 3 0 0 0 -1 -1
L 200 0 1200 600 3 0 0 0 -1 -1
L 1200 600 200 1200 3 0 0 0 -1 -1
P 200 900 0 900 1 0 1
{
T 150 925 5 8 1 1 0 6 1
pinnumber=1
T 150 925 5 8 0 0 0 6 1
pinseq=1
}
P 200 300 0 300 1 0 1
{
T 150 325 5 8 1 1 0 6 1
pinnumber=2
T 150 325 5 8 0 0 0 6 1
pinseq=2
}
P 1200 600 1400 600 1 0 1
{
T 1275 625 5 8 1 1 0 0 1
pinnumber=5
T 1275 625 5 8 0 0 0 0 1
pinseq=5
}
P 700 900 700 1100 1 0 1
{
T 750 950 5 8 1 1 0 0 1
pinnumber=3
T 725 950 5 8 0 0 0 0 1
pinseq=3
}
P 700 300 700 100 1 0 1
{
T 600 125 5 8 0 0 0 0 1
pinseq=4
T 750 150 5 10 1 1 0 0 1
pinnumber=4
}
L 300 950 300 850 3 0 0 0 -1 -1
L 250 900 350 900 3 0 0 0 -1 -1
L 250 300 350 300 3 0 0 0 -1 -1
T 350 550 9 8 1 0 0 0 1
OP AMP
T 675 400 9 6 1 0 0 4 1
Vee
T 675 825 9 6 1 0 0 4 1
Vcc
T 1000 925 8 10 1 1 0 0 1
refdes=U?


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2008 07:41:35 -0000	1.2
+++ .cvsignore	15 Sep 2009 08:28:35 -0000	1.3
@@ -1 +1 @@
-gspiceui-v0.9.65.tar.gz
+gspiceui-v0.9.97.tar.gz


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/gspiceui.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gspiceui.spec	3 Sep 2009 06:42:58 -0000	1.6
+++ gspiceui.spec	15 Sep 2009 08:28:35 -0000	1.7
@@ -1,21 +1,23 @@
-Name:		gspiceui
-Version:	0.9.65 
-Release:	6%{?dist}
-Summary:	A GUI to freely available Spice Electronic circuit similators
-
-Group:		Applications/System 
-License:	GPLv2+
-URL:		http://sourceforge.net/projects/gspiceui
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
-Source1:	%{name}.desktop
-Patch0:     gspiceui-xpm.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	wxGTK-devel, desktop-file-utils  
-Requires:	ngspice, geda-gnetlist, geda-gschem 
-Requires:	gwave, electronics-menu
+Name:          gspiceui
+Version:       0.9.97
+Release:       1%{?dist}
+Summary:       A GUI to freely available Spice Electronic circuit similators
+
+Group:         Applications/Engineering
+License:       GPLv2+
+URL:           http://sourceforge.net/projects/gspiceui
+Source0:       http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
+Source1:       %{name}.desktop
+Source2:       %{name}-opamp-3.sym
+Source3:       %{name}-32x32.xpm
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: wxGTK-devel desktop-file-utils
+Requires:      ngspice geda-gnetlist geda-gschem geda-symbols
+Requires:      gwave electronics-menu
 
-ExcludeArch:	ppc64
+ExcludeArch:   ppc64
 
 %description
 GspiceUI is listed among the Fedora Electronic Lab (FEL) packages.
@@ -29,81 +31,78 @@ gSchem is used as the schematic generati
 %prep
 %setup -q -n %{name}-v%{version}
 
-%patch0 -p1 -b .xpm
-
-sed -i 's|/usr/local|/usr|g' html/Makefile
-sed -i 's|cp|install -pm 644|g' Makefile html/Makefile
-sed -i 's|cp |install -m 755 |g' src/Makefile
-
 #wrong-file-end-of-line-encoding
 sed -i 's/\r//' lib/*/*.mod
 
 #spurious-executable-perm
 chmod 0644 lib/*/*.mod
+chmod 0644 sch/*/*.sch
+
+sed -i "s|/share/gspiceui/html/gSpiceUI.html|/share/doc/%{name}-%{version}/gSpiceUI.html|g" src/main/HelpTasks.cpp
 
 
 %build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
+%{__make} %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
 
-%install
-rm -rf $RPM_BUILD_ROOT
 
-#fix installdir path
-sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile
+%install
+rm -rf %{buildroot}
 
-#Add missing folder
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -d %{buildroot}%{_bindir}
+install -pm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+install -d %{buildroot}%{_mandir}/man1/
+install -pm 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
-#remove default installed docs|files 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+#Upstream Sources is missing opamp-3.sym
+install -d %{buildroot}%{_datadir}/gEDA/sym/misc
+install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 #Add/Manage desktop file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-
-install -pm 0644 src/icons/%{name}-32x32.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -pm 0644 %{SOURCE3} \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 install -pm 0644 src/icons/%{name}-48x48.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
-desktop-file-install 	--vendor ""				\
-			--mode 0644					\
-			--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-			%{SOURCE1}
+desktop-file-install --vendor "" \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE1}
 
-find %{buildroot} -name Makefile -exec rm -f {} ';'
+rm -f sch/Makefile lib/Makefile
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%post   
+%post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :   
+touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog TODO
-%doc sch/ lib/
+%doc Authors License ReadMe ChangeLog ToDo
+%doc sch/ lib/ html/gSpiceUI.html
 %{_bindir}/%{name}
-%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/??x??/apps/*.xpm
-%{_datadir}/applications/*.desktop
-%{_mandir}/man1/gspiceui.1.gz
-
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 
 %changelog
+* Mon Sep 14 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.97-1
+- New upstream release
+- Added missing opamp-3.sym and corrected menu icon
+
 * Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-6
 - Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
 - Added documentations: schematics and spice models


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	3 Sep 2009 06:42:58 -0000	1.3
+++ import.log	15 Sep 2009 08:28:35 -0000	1.4
@@ -1,3 +1,4 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
 gspiceui-0_9_65-5_fc11:HEAD:gspiceui-0.9.65-5.fc11.src.rpm:1251959887
 gspiceui-0_9_65-6_fc11:HEAD:gspiceui-0.9.65-6.fc11.src.rpm:1251960020
+gspiceui-0_9_97-1_fc11:HEAD:gspiceui-0.9.97-1.fc11.src.rpm:1253003117


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2008 07:41:35 -0000	1.2
+++ sources	15 Sep 2009 08:28:35 -0000	1.3
@@ -1 +1 @@
-7243c51a7ad1d4138bc28db9695d18c2  gspiceui-v0.9.65.tar.gz
+b72bfcee7e1c57719bebbedf75530ebc  gspiceui-v0.9.97.tar.gz


--- gspiceui-xpm.patch DELETED ---



From chitlesh at fedoraproject.org  Tue Sep 15 08:38:14 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 08:38:14 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.117,1.118 comps-f13.xml.in,1.9,1.10
Message-ID: <20090915083814.B284E11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20170

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
added Perl-SystemPerl to FEL


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- comps-f12.xml.in	15 Sep 2009 06:14:02 -0000	1.117
+++ comps-f12.xml.in	15 Sep 2009 08:38:14 -0000	1.118
@@ -1386,8 +1386,8 @@
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
-      <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">eclipse-texlipse</packagereq>
+      <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">electric</packagereq>
       <packagereq type="default">emacs-dinotrace</packagereq>
       <packagereq type="default">emacs-verilog-mode</packagereq>
@@ -1435,6 +1435,7 @@
       <packagereq type="default">perl-ModelSim-List</packagereq>
       <packagereq type="default">perl-Perlilog</packagereq>
       <packagereq type="default">perl-SystemC-Vregs</packagereq>
+      <packagereq type="default">perl-SystemPerl</packagereq>
       <packagereq type="default">perl-Verilog</packagereq>
       <packagereq type="default">perl-Verilog-CodeGen</packagereq>
       <packagereq type="default">perl-Verilog-Readmem</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- comps-f13.xml.in	15 Sep 2009 06:14:02 -0000	1.9
+++ comps-f13.xml.in	15 Sep 2009 08:38:14 -0000	1.10
@@ -1435,6 +1435,7 @@
       <packagereq type="default">perl-ModelSim-List</packagereq>
       <packagereq type="default">perl-Perlilog</packagereq>
       <packagereq type="default">perl-SystemC-Vregs</packagereq>
+      <packagereq type="default">perl-SystemPerl</packagereq>
       <packagereq type="default">perl-Verilog</packagereq>
       <packagereq type="default">perl-Verilog-CodeGen</packagereq>
       <packagereq type="default">perl-Verilog-Readmem</packagereq>



From pmatilai at fedoraproject.org  Tue Sep 15 08:50:14 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 15 Sep 2009 08:50:14 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.1-bugurl.patch,1.1,1.2
Message-ID: <20090915085014.604F711C0335@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23669

Modified Files:
	rpm-4.7.1-bugurl.patch 
Log Message:
- oops, need to patch rpmtests script too to avoid depending on autofoo
  at build time


rpm-4.7.1-bugurl.patch:
 build/files.c         |    1 +
 build/parsePreamble.c |    4 ++++
 lib/rpmtag.h          |    1 +
 macros.in             |    6 ++++++
 tests/rpmgeneral.at   |    1 +
 tests/rpmtests        |    1 +
 6 files changed, 14 insertions(+)

Index: rpm-4.7.1-bugurl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.7.1-bugurl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpm-4.7.1-bugurl.patch	15 Sep 2009 08:22:57 -0000	1.1
+++ rpm-4.7.1-bugurl.patch	15 Sep 2009 08:50:13 -0000	1.2
@@ -1,7 +1,6 @@
-diff --git a/build/files.c b/build/files.c
-index f3cf261..e1230a5 100644
---- a/build/files.c
-+++ b/build/files.c
+diff -up rpm-4.7.1/build/files.c.bugurl rpm-4.7.1/build/files.c
+--- rpm-4.7.1/build/files.c.bugurl	2009-07-21 09:42:51.000000000 +0300
++++ rpm-4.7.1/build/files.c	2009-09-15 11:37:45.000000000 +0300
 @@ -1977,6 +1977,7 @@ static const rpmTag sourceTags[] = {
      RPMTAG_CHANGELOGNAME,
      RPMTAG_CHANGELOGTEXT,
@@ -10,11 +9,10 @@ index f3cf261..e1230a5 100644
      HEADER_I18NTABLE,
      0
  };
-diff --git a/build/parsePreamble.c b/build/parsePreamble.c
-index c000780..70b20a8 100644
---- a/build/parsePreamble.c
-+++ b/build/parsePreamble.c
-@@ -32,6 +32,7 @@ static const rpmTag copyTagsDuringParse[] = {
+diff -up rpm-4.7.1/build/parsePreamble.c.bugurl rpm-4.7.1/build/parsePreamble.c
+--- rpm-4.7.1/build/parsePreamble.c.bugurl	2009-06-23 14:40:57.000000000 +0300
++++ rpm-4.7.1/build/parsePreamble.c	2009-09-15 11:37:45.000000000 +0300
+@@ -32,6 +32,7 @@ static const rpmTag copyTagsDuringParse[
      RPMTAG_CHANGELOGTEXT,
      RPMTAG_PREFIXES,
      RPMTAG_DISTTAG,
@@ -30,7 +28,7 @@ index c000780..70b20a8 100644
      { -1, NULL }
  };
  
-@@ -501,6 +503,7 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag,
+@@ -501,6 +503,7 @@ static int handlePreambleTag(rpmSpec spe
  	}
      case RPMTAG_URL:
      case RPMTAG_DISTTAG:
@@ -38,7 +36,7 @@ index c000780..70b20a8 100644
  	SINGLE_TOKEN_ONLY;
  	/* These macros are for backward compatibility */
  	if (tag == RPMTAG_VERSION) {
-@@ -734,6 +737,7 @@ static struct PreambleRec_s preambleList[] = {
+@@ -734,6 +737,7 @@ static struct PreambleRec_s preambleList
      {RPMTAG_AUTOPROV,		0, 0, 0, "autoprov"},
      {RPMTAG_DOCDIR,		0, 0, 0, "docdir"},
      {RPMTAG_DISTTAG,		0, 0, 0, "disttag"},
@@ -46,10 +44,9 @@ index c000780..70b20a8 100644
     	/* LCL: can't add null annotation */
      {0, 0, 0, 0, 0}
  };
-diff --git a/lib/rpmtag.h b/lib/rpmtag.h
-index a0bbd79..7a3aa01 100644
---- a/lib/rpmtag.h
-+++ b/lib/rpmtag.h
+diff -up rpm-4.7.1/lib/rpmtag.h.bugurl rpm-4.7.1/lib/rpmtag.h
+--- rpm-4.7.1/lib/rpmtag.h.bugurl	2009-06-23 14:40:57.000000000 +0300
++++ rpm-4.7.1/lib/rpmtag.h	2009-09-15 11:37:45.000000000 +0300
 @@ -282,6 +282,7 @@ typedef enum rpmTag_e {
      RPMTAG_LONGSIZE		= 5009, /* l */
      RPMTAG_FILECAPS		= 5010, /* s[] */
@@ -58,10 +55,9 @@ index a0bbd79..7a3aa01 100644
  
      RPMTAG_FIRSTFREE_TAG	/*!< internal */
  } rpmTag;
-diff --git a/macros.in b/macros.in
-index 158ae34..ee10586 100644
---- a/macros.in
-+++ b/macros.in
+diff -up rpm-4.7.1/macros.in.bugurl rpm-4.7.1/macros.in
+--- rpm-4.7.1/macros.in.bugurl	2009-09-15 11:37:45.000000000 +0300
++++ rpm-4.7.1/macros.in	2009-09-15 11:37:45.000000000 +0300
 @@ -264,6 +264,12 @@ package or when debugging this package.\
  #
  #%disturl
@@ -75,10 +71,9 @@ index 158ae34..ee10586 100644
  #	Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
  #	marked as %doc should be installed.
  #%_excludedocs
-diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at
-index d6f11a5..4956780 100644
---- a/tests/rpmgeneral.at
-+++ b/tests/rpmgeneral.at
+diff -up rpm-4.7.1/tests/rpmgeneral.at.bugurl rpm-4.7.1/tests/rpmgeneral.at
+--- rpm-4.7.1/tests/rpmgeneral.at.bugurl	2009-06-23 14:40:59.000000000 +0300
++++ rpm-4.7.1/tests/rpmgeneral.at	2009-09-15 11:37:45.000000000 +0300
 @@ -71,6 +71,7 @@ AT_CHECK([run rpm --querytags],[0],
  [ARCH
  ARCHIVESIZE
@@ -87,3 +82,14 @@ index d6f11a5..4956780 100644
  BUILDARCHS
  BUILDHOST
  BUILDTIME
+diff -up rpm-4.7.1/tests/rpmtests.bugurl rpm-4.7.1/tests/rpmtests
+--- rpm-4.7.1/tests/rpmtests.bugurl	2009-09-15 11:38:00.000000000 +0300
++++ rpm-4.7.1/tests/rpmtests	2009-09-15 11:38:10.000000000 +0300
+@@ -2165,6 +2165,7 @@ at_func_diff_devnull "$at_stderr" || at_
+ echo >>"$at_stdout"; $as_echo "ARCH
+ ARCHIVESIZE
+ BASENAMES
++BUGURL
+ BUILDARCHS
+ BUILDHOST
+ BUILDTIME



From denis at fedoraproject.org  Tue Sep 15 09:00:59 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Sep 2009 09:00:59 +0000 (UTC)
Subject: rpms/pangomm/devel pangomm.spec,1.10,1.11
Message-ID: <20090915090059.6513511C00EC@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27272

Modified Files:
	pangomm.spec 
Log Message:
Fixed typo in install script


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pangomm.spec	15 Sep 2009 08:08:50 -0000	1.10
+++ pangomm.spec	15 Sep 2009 09:00:58 -0000	1.11
@@ -60,7 +60,8 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 # relative paths.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pangomm-%{apiver}
 mv ${RPM_BUILD_ROOT}%{_docdir}/pangomm-%{apiver}/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/pangomm-%{apiver}/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}# Fix broken devhelp base tag
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/pangomm-%{apiver}/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/pangomm-%{apiver}
+# Fix broken devhelp base tag
 sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/pangomm-1.4/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pangomm-1.4/*.devhelp2
 # Remove old doc directory
 rm -r ${RPM_BUILD_ROOT}%{_docdir}/pangomm-%{apiver}



From rjones at fedoraproject.org  Tue Sep 15 09:05:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 09:05:02 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.47, 1.48 libguestfs.spec, 1.95, 
	1.96 sources, 1.47, 1.48
Message-ID: <20090915090502.6E05A11C00CE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28574

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream version 1.0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	19 Aug 2009 17:35:08 -0000	1.47
+++ .cvsignore	15 Sep 2009 09:05:01 -0000	1.48
@@ -1 +1 @@
-libguestfs-1.0.68.tar.gz
+libguestfs-1.0.69.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- libguestfs.spec	20 Aug 2009 15:41:37 -0000	1.95
+++ libguestfs.spec	15 Sep 2009 09:05:02 -0000	1.96
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.68
-Release:     2%{?dist}
+Version:     1.0.69
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -343,11 +343,11 @@ export LIBGUESTFS_DEBUG=1
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
 #                                 (FIXED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
-# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM
+# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM (FIXED)
 
-#%ifarch x86_64
-#make check
-#%endif
+%ifarch x86_64
+make check
+%endif
 
 
 %install
@@ -537,6 +537,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.69-1
+- New upstream release 1.0.69.
+- Reenable the tests (because RHBZ#516543 is supposed to be fixed).
+- New main loop code should fix RHBZ#501888, RHBZ#504418.
+- Add waitpid along guestfs_close path (fixes RHBZ#518747).
+
 * Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-2
 - New upstream release 1.0.68.
 - BR genisoimage.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	19 Aug 2009 17:35:08 -0000	1.47
+++ sources	15 Sep 2009 09:05:02 -0000	1.48
@@ -1 +1 @@
-2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz
+e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz



From rjones at fedoraproject.org  Tue Sep 15 09:05:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 09:05:04 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.34, 1.35 libguestfs.spec, 1.59, 
	1.60 sources, 1.34, 1.35
Message-ID: <20090915090504.D8A2B11C00CE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28625

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream version 1.0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	19 Aug 2009 17:35:16 -0000	1.34
+++ .cvsignore	15 Sep 2009 09:05:04 -0000	1.35
@@ -1 +1 @@
-libguestfs-1.0.68.tar.gz
+libguestfs-1.0.69.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libguestfs.spec	20 Aug 2009 15:41:36 -0000	1.59
+++ libguestfs.spec	15 Sep 2009 09:05:04 -0000	1.60
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.68
-Release:     2%{?dist}
+Version:     1.0.69
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -339,7 +339,7 @@ export LIBGUESTFS_DEBUG=1
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
 #                                 (FIXED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
-# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM
+# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM (FIXED)
 
 #%ifarch x86_64
 #make check
@@ -533,6 +533,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.69-1
+- New upstream release 1.0.69.
+- New main loop code should fix RHBZ#501888, RHBZ#504418.
+- Add waitpid along guestfs_close path (fixes RHBZ#518747).
+
 * Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-2
 - New upstream release 1.0.68.
 - BR genisoimage.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	19 Aug 2009 17:35:16 -0000	1.34
+++ sources	15 Sep 2009 09:05:04 -0000	1.35
@@ -1 +1 @@
-2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz
+e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz



From rjones at fedoraproject.org  Tue Sep 15 09:05:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 09:05:04 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.28, 1.29 libguestfs.spec, 1.64, 
	1.65 sources, 1.28,
	1.29 0001-tests-Found-three-more-references-to-the-squashfs.patch,
	1.1, NONE
Message-ID: <20090915090504.F41C111C00EB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28613

Modified Files:
	.cvsignore libguestfs.spec sources 
Removed Files:
	0001-tests-Found-three-more-references-to-the-squashfs.patch 
Log Message:
New upstream version 1.0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	19 Aug 2009 17:35:14 -0000	1.28
+++ .cvsignore	15 Sep 2009 09:05:04 -0000	1.29
@@ -1 +1 @@
-libguestfs-1.0.68.tar.gz
+libguestfs-1.0.69.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- libguestfs.spec	19 Aug 2009 20:41:43 -0000	1.64
+++ libguestfs.spec	15 Sep 2009 09:05:04 -0000	1.65
@@ -4,17 +4,14 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.68
-Release:     5%{?dist}
+Version:     1.0.69
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# This patch upstream in 1.0.69.
-Patch0:      0001-tests-Found-three-more-references-to-the-squashfs.patch
-
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -310,8 +307,6 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
-%patch0 -p1
-
 mkdir -p daemon/m4
 
 
@@ -541,6 +536,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.69-1
+- New upstream release 1.0.69.
+- New main loop code should fix RHBZ#501888, RHBZ#504418.
+- Add waitpid along guestfs_close path (fixes RHBZ#518747).
+- Remove fix-tests patch which is now upstream.
+
 * Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-5
 - New upstream release 1.0.68.
 - BR mkisofs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	19 Aug 2009 17:35:14 -0000	1.28
+++ sources	15 Sep 2009 09:05:04 -0000	1.29
@@ -1 +1 @@
-2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz
+e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz


--- 0001-tests-Found-three-more-references-to-the-squashfs.patch DELETED ---



From chitlesh at fedoraproject.org  Tue Sep 15 09:07:54 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 09:07:54 +0000 (UTC)
Subject: rpms/perl-SystemPerl/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-SystemPerl.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090915090754.9D90911C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-SystemPerl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29670/F-10

Modified Files:
	.cvsignore import.log perl-SystemPerl.spec sources 
Log Message:
1.331


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 12:22:00 -0000	1.3
+++ .cvsignore	15 Sep 2009 09:07:54 -0000	1.4
@@ -1 +1 @@
-SystemPerl-1.330.tar.gz
+SystemPerl-1.331.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jul 2009 12:22:00 -0000	1.2
+++ import.log	15 Sep 2009 09:07:54 -0000	1.3
@@ -1,2 +1,3 @@
 perl-SystemPerl-1_321-1_fc11:F-10:perl-SystemPerl-1.321-1.fc11.src.rpm:1244742733
 perl-SystemPerl-1_330-1_fc11:F-10:perl-SystemPerl-1.330-1.fc11.src.rpm:1247660375
+perl-SystemPerl-1_331-1_fc11:F-10:perl-SystemPerl-1.331-1.fc11.src.rpm:1253005508


Index: perl-SystemPerl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-10/perl-SystemPerl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-SystemPerl.spec	15 Jul 2009 12:22:00 -0000	1.2
+++ perl-SystemPerl.spec	15 Sep 2009 09:07:54 -0000	1.3
@@ -11,7 +11,7 @@
 %endif
 
 Name:           perl-SystemPerl
-Version:        1.330
+Version:        1.331
 Release:        1%{?dist}
 Summary:        SystemPerl Perl module
 
@@ -165,6 +165,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Chitlesh GOORAH < chitlesh [AT] fedoraproject DOT org > 1.331-1
+- New upsteam release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.330-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Chitlesh GOORAH < chitlesh [AT] fedoraproject DOT org > 1.330-1
 - uint_t bug file #RHBZ 511400 -  Header Include Bug
 - New upsteam release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 12:22:00 -0000	1.3
+++ sources	15 Sep 2009 09:07:54 -0000	1.4
@@ -1 +1 @@
-62054d4860b12ef297de75c4cbc68721  SystemPerl-1.330.tar.gz
+9c707cc349384c6c1de665e8eed37e96  SystemPerl-1.331.tar.gz



From chitlesh at fedoraproject.org  Tue Sep 15 09:08:41 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 09:08:41 +0000 (UTC)
Subject: rpms/perl-SystemPerl/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-SystemPerl.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090915090841.8BC9211C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-SystemPerl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29990/F-11

Modified Files:
	.cvsignore import.log perl-SystemPerl.spec sources 
Log Message:
1.331


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 12:22:48 -0000	1.3
+++ .cvsignore	15 Sep 2009 09:08:41 -0000	1.4
@@ -1 +1 @@
-SystemPerl-1.330.tar.gz
+SystemPerl-1.331.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jul 2009 12:22:48 -0000	1.2
+++ import.log	15 Sep 2009 09:08:41 -0000	1.3
@@ -1,2 +1,3 @@
 perl-SystemPerl-1_321-1_fc11:F-11:perl-SystemPerl-1.321-1.fc11.src.rpm:1244743482
 perl-SystemPerl-1_330-1_fc11:F-11:perl-SystemPerl-1.330-1.fc11.src.rpm:1247660495
+perl-SystemPerl-1_331-1_fc11:F-11:perl-SystemPerl-1.331-1.fc11.src.rpm:1253005560


Index: perl-SystemPerl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-11/perl-SystemPerl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-SystemPerl.spec	15 Jul 2009 12:22:48 -0000	1.2
+++ perl-SystemPerl.spec	15 Sep 2009 09:08:41 -0000	1.3
@@ -11,7 +11,7 @@
 %endif
 
 Name:           perl-SystemPerl
-Version:        1.330
+Version:        1.331
 Release:        1%{?dist}
 Summary:        SystemPerl Perl module
 
@@ -165,6 +165,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Chitlesh GOORAH < chitlesh [AT] fedoraproject DOT org > 1.331-1
+- New upsteam release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.330-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Chitlesh GOORAH < chitlesh [AT] fedoraproject DOT org > 1.330-1
 - uint_t bug file #RHBZ 511400 -  Header Include Bug
 - New upsteam release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 12:22:48 -0000	1.3
+++ sources	15 Sep 2009 09:08:41 -0000	1.4
@@ -1 +1 @@
-62054d4860b12ef297de75c4cbc68721  SystemPerl-1.330.tar.gz
+9c707cc349384c6c1de665e8eed37e96  SystemPerl-1.331.tar.gz



From chitlesh at fedoraproject.org  Tue Sep 15 09:10:14 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 15 Sep 2009 09:10:14 +0000 (UTC)
Subject: rpms/perl-SystemPerl/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-SystemPerl.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090915091014.0FBB611C0337@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-SystemPerl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30561/devel

Modified Files:
	.cvsignore import.log perl-SystemPerl.spec sources 
Log Message:
1.331


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 12:25:31 -0000	1.3
+++ .cvsignore	15 Sep 2009 09:10:13 -0000	1.4
@@ -1 +1 @@
-SystemPerl-1.330.tar.gz
+SystemPerl-1.331.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jul 2009 12:25:31 -0000	1.2
+++ import.log	15 Sep 2009 09:10:13 -0000	1.3
@@ -1,2 +1,3 @@
 perl-SystemPerl-1_321-1_fc11:HEAD:perl-SystemPerl-1.321-1.fc11.src.rpm:1244744524
 perl-SystemPerl-1_330-1_fc11:HEAD:perl-SystemPerl-1.330-1.fc11.src.rpm:1247660658
+perl-SystemPerl-1_331-1_fc11:HEAD:perl-SystemPerl-1.331-1.fc11.src.rpm:1253005615


Index: perl-SystemPerl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/devel/perl-SystemPerl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-SystemPerl.spec	26 Jul 2009 16:39:03 -0000	1.3
+++ perl-SystemPerl.spec	15 Sep 2009 09:10:13 -0000	1.4
@@ -11,8 +11,8 @@
 %endif
 
 Name:           perl-SystemPerl
-Version:        1.330
-Release:        2%{?dist}
+Version:        1.331
+Release:        1%{?dist}
 Summary:        SystemPerl Perl module
 
 License:        LGPLv3+ or Artistic 2.0
@@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Chitlesh GOORAH < chitlesh [AT] fedoraproject DOT org > 1.331-1
+- New upsteam release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.330-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 12:25:31 -0000	1.3
+++ sources	15 Sep 2009 09:10:13 -0000	1.4
@@ -1 +1 @@
-62054d4860b12ef297de75c4cbc68721  SystemPerl-1.330.tar.gz
+9c707cc349384c6c1de665e8eed37e96  SystemPerl-1.331.tar.gz



From varekova at fedoraproject.org  Tue Sep 15 09:42:29 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 09:42:29 +0000 (UTC)
Subject: rpms/man-pages-cs/devel man-pages-0.18.20090209-inst.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 man-pages-cs.spec, 1.24, 1.25 sources,
	1.10, 1.11
Message-ID: <20090915094229.C912711C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-cs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7918

Modified Files:
	.cvsignore man-pages-cs.spec sources 
Added Files:
	man-pages-0.18.20090209-inst.patch 
Log Message:
 - update to 0.18.20090209


man-pages-0.18.20090209-inst.patch:
 Makefile |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE man-pages-0.18.20090209-inst.patch ---
diff -up man-pages-cs-0.18.20090209/Makefile.pom man-pages-cs-0.18.20090209/Makefile
--- man-pages-cs-0.18.20090209/Makefile.pom	2009-02-08 21:41:47.000000000 +0100
+++ man-pages-cs-0.18.20090209/Makefile	2009-09-15 11:36:03.000000000 +0200
@@ -6,8 +6,10 @@ all:
 install: $(SECTIONS:%=install-section-%)
 
 install-section-%:
-	install -m 755 -d $(DESTDIR)$(MANDIR)/man$*
-	find . -name '*.$*' -not -path '*.pc*' -print0 | xargs -r -0 install -m 644 -t $(DESTDIR)$(MANDIR)/man$*
+	install -m 755 -d $(DESTDIR)$(MANDIR)/man$* 
+	for i in `find . -name '*.$*' -not -path '*.pc*' `; do \
+	    install -m 644 -t $(DESTDIR)$(MANDIR)/man$* $$i; \
+	done 
 
 check:
 	# Check man pages syntax


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-cs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	18 Dec 2008 09:44:46 -0000	1.10
+++ .cvsignore	15 Sep 2009 09:42:27 -0000	1.11
@@ -1,2 +1 @@
-man-pages-cs-0.17.20080113.tar.bz2
-coreutils-20081218.tar.gz
+man-pages-cs-0.18.20090209.tar.lzma


Index: man-pages-cs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-cs/devel/man-pages-cs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- man-pages-cs.spec	25 Jul 2009 11:42:57 -0000	1.24
+++ man-pages-cs.spec	15 Sep 2009 09:42:27 -0000	1.25
@@ -1,14 +1,13 @@
 %define coreutils_version 20081218
 Summary: Czech man pages from the Linux Documentation Project
 Name: man-pages-cs
-Version: 0.17.20080113
-Release: 8%{?dist}
+Version: 0.18.20090209
+Release: 1%{?dist}
 License: GFDL and GPL+
 Group: Documentation
 URL: http://sweb.cz/tropikhajma/man-pages-cs/index.html
-Source: ftp://ftp.linux.cz/pub/linux/localization/czman/man-pages-cs-%{version}.tar.bz2
-Source1: coreutils-%{coreutils_version}.tar.gz
-Patch1: man-pages-cs-0.17-noMANDIR.patch
+Source: http://tropikhajma.sweb.cz/%{name}/%{name}-%{version}.tar.lzma
+Patch1: man-pages-0.18.20090209-inst.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -17,19 +16,16 @@ Manual pages from the Linux Documentatio
 Czech.
 
 %prep
-%setup -q -a 1
-%patch1 -p1
+%setup -q
+%patch1 -p1 -b .inst
 
 %build
 
 %install
 rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-LC_ALL=cs_CZ.UTF-8 make all MANDIR=$RPM_BUILD_ROOT/%{_mandir}/cs
-for i in `ls man1`; do
-    gzip man1/$i
-done
-cp  man1/* $RPM_BUILD_ROOT/%{_mandir}/cs/man1/
+make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}/cs
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -40,6 +36,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/cs/*
 
 %changelog
+* Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-1
+- update to 0.18.20090209
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.20080113-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-cs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Dec 2008 09:44:46 -0000	1.10
+++ sources	15 Sep 2009 09:42:27 -0000	1.11
@@ -1,2 +1 @@
-a3df67d98ab63a0a360cd0794ec87e0e  man-pages-cs-0.17.20080113.tar.bz2
-8b1a0c43b6ef9d8c4e0cb6c0cbb3decf  coreutils-20081218.tar.gz
+ce0f9e3a6fe2de5c260d0034bd6ea74a  man-pages-cs-0.18.20090209.tar.lzma



From hadess at fedoraproject.org  Tue Sep 15 09:46:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 09:46:50 +0000 (UTC)
Subject: rpms/gnome-lirc-properties/devel .cvsignore, 1.4,
	1.5 glp-fedora-support.patch, 1.4,
	1.5 gnome-lirc-properties.spec, 1.21, 1.22 sources, 1.4,
	1.5 glp-dont-use-fluendo-remotes.patch, 1.1,
	NONE glp-remove-snapstream.patch, 1.1, NONE new-dbus-auth.patch,
	1.1, NONE
Message-ID: <20090915094650.7558D11C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9257

Modified Files:
	.cvsignore glp-fedora-support.patch gnome-lirc-properties.spec 
	sources 
Removed Files:
	glp-dont-use-fluendo-remotes.patch glp-remove-snapstream.patch 
	new-dbus-auth.patch 
Log Message:
* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
- Update to 0.4.0
- Port to polkit 1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 17:32:33 -0000	1.4
+++ .cvsignore	15 Sep 2009 09:46:49 -0000	1.5
@@ -1 +1 @@
-gnome-lirc-properties-0.3.1.tar.gz
+gnome-lirc-properties-0.4.0.tar.gz

glp-fedora-support.patch:
 backend.py                    |   49 ++++++++++++++++++++----------------------
 config.py.in                  |    2 -
 ui/RemoteControlProperties.py |    4 +--
 3 files changed, 27 insertions(+), 28 deletions(-)

Index: glp-fedora-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/glp-fedora-support.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glp-fedora-support.patch	27 Oct 2008 17:32:34 -0000	1.4
+++ glp-fedora-support.patch	15 Sep 2009 09:46:49 -0000	1.5
@@ -1,54 +1,8 @@
-Index: gnome_lirc_properties/config.py.in
-===================================================================
---- gnome_lirc_properties/config.py.in	(revision 44)
-+++ gnome_lirc_properties/config.py.in	(working copy)
-@@ -12,7 +12,7 @@
- 
- LIRC_CONFDIR          = '@with_lirc_confdir@'
- 
--LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
-+LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
- LIRC_REMOTE_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
- LIRC_DAEMON_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf')
- 
-Index: gnome_lirc_properties/ui/RemoteControlProperties.py
-===================================================================
---- gnome_lirc_properties/ui/RemoteControlProperties.py	(revision 44)
-+++ gnome_lirc_properties/ui/RemoteControlProperties.py	(working copy)
-@@ -297,13 +297,13 @@
-         #
-         # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
-         # receiver settings in "hardware.conf", whereas we have to. For that
--        # reason the device node's name is stored in REMOTE_DEVICE, instead
-+        # reason the device node's name is stored in LIRC_DEVICE, instead
-         # of RECEIVER_DEVICE.
-         #
-         self.selected_receiver = (
-             settings.get('RECEIVER_VENDOR'),
-             settings.get('RECEIVER_MODEL'),
--            settings.get('REMOTE_DEVICE'),
-+            settings.get('LIRC_DEVICE'),
-         )
- 
-         # Try to select configured remote vendor:
-Index: data/gnome-lirc-properties.desktop.in.in
-===================================================================
---- data/gnome-lirc-properties.desktop.in.in	(revision 44)
-+++ data/gnome-lirc-properties.desktop.in.in	(working copy)
-@@ -7,7 +7,7 @@
- Exec=@prefix@/bin/gnome-lirc-properties
- Icon=gnome-lirc-properties
- StartupNotify=true
--Categories=GNOME;GTK;Settings;HardwareSettings;System;
-+Categories=GNOME;GTK;Settings;HardwareSettings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-lirc-properties
- X-GNOME-Bugzilla-Component=general
-Index: gnome_lirc_properties/backend.py
-===================================================================
---- gnome_lirc_properties/backend.py	(revision 76)
-+++ gnome_lirc_properties/backend.py	(working copy)
-@@ -494,8 +494,8 @@
+diff --git a/gnome_lirc_properties/backend.py b/gnome_lirc_properties/backend.py
+index 881b7df..1bff4c1 100644
+--- a/gnome_lirc_properties/backend.py
++++ b/gnome_lirc_properties/backend.py
+@@ -494,8 +494,8 @@ class BackendService(PolicyKitService):
      # The "REMOTE_" prefix is made optional, since it only was introduced
      # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron.
  
@@ -59,15 +13,14 @@ Index: gnome_lirc_properties/backend.py
      __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
  
      def __init__(self, connection=None, path='/'):
-@@ -593,40 +593,37 @@
-                 print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
+@@ -599,22 +599,23 @@ class BackendService(PolicyKitService):
+                     print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
                  continue
  
 -            # Deal with the START_LIRCD line:
-+            output.write(line)
- 
+-
 -            match = self.__re_start_lircd.match(line)
-+        # Check whether we need to enable or disable lircd
++            output.write(line)
  
 -            if match:
 -                # pychecker says "Using a conditional statement with a constant value (true)",
@@ -76,6 +29,10 @@ Index: gnome_lirc_properties/backend.py
 -                # below ('condition and true_value or false_value') is the recommended aquivalent.
 -                value = (start_lircd is None) and 'true' or start_lircd
 -                start_lircd = None
++        # Check whether we need to enable or disable lircd
+ 
+-                print >> output, (match.group(0) + ShellQuote.shellquote(value))
+-                continue
 +        # pychecker says "Using a conditional statement with a constant value (true)",
 +        # which is ridicilous, considering Python 2.4 doesn't have conditional statements
 +        # yet (PEP 308, aka. 'true_value if condition else false_value') and the expression
@@ -83,8 +40,7 @@ Index: gnome_lirc_properties/backend.py
 +        value = (start_lircd is None) and 'true' or start_lircd
 +        start_lircd = None
  
--                print >> output, (match.group(0) + ShellQuote.shellquote(value))
--                continue
+-            output.write(line)
 +        if 'true' == value:
 +             args = '/sbin/chkconfig', 'lirc', 'on'
 +             os.spawnv(os.P_WAIT, args[0], args)
@@ -92,11 +48,9 @@ Index: gnome_lirc_properties/backend.py
 +             args = '/sbin/chkconfig', 'lirc', 'off'
 +             os.spawnv(os.P_WAIT, args[0], args)
  
--            output.write(line)
--
          # Write out any values that were not already in the file,
          # and therefore just replaced:
- 
+@@ -622,17 +623,13 @@ class BackendService(PolicyKitService):
          if remote_values:
              print >> output, '\n# Remote settings required by gnome-lirc-properties'
          for key, value in remote_values.items():
@@ -115,7 +69,7 @@ Index: gnome_lirc_properties/backend.py
          # Replace old file with new contents:
  
          os.unlink(oldfile)
-@@ -647,10 +644,10 @@
+@@ -653,10 +650,10 @@ class BackendService(PolicyKitService):
          self._check_permission(sender)
  
          remote_values = {
@@ -129,7 +83,7 @@ Index: gnome_lirc_properties/backend.py
              'LIRCD_CONF': '',
          }
  
-@@ -773,10 +770,12 @@
+@@ -779,10 +776,12 @@ class BackendService(PolicyKitService):
  	    raise AccessDeniedException
  
          if 'enable' == action:
@@ -144,3 +98,36 @@ Index: gnome_lirc_properties/backend.py
  
          else:
              args = '/etc/init.d/lirc', action
+diff --git a/gnome_lirc_properties/config.py.in b/gnome_lirc_properties/config.py.in
+index 69b232c..68b435c 100644
+--- a/gnome_lirc_properties/config.py.in
++++ b/gnome_lirc_properties/config.py.in
+@@ -12,7 +12,7 @@ PACKAGE_DIR           = path.join('@prefix@', 'share', '@PACKAGE@')
+ 
+ LIRC_CONFDIR          = '@with_lirc_confdir@'
+ 
+-LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
++LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
+ LIRC_REMOTE_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
+ LIRC_DAEMON_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf')
+ 
+diff --git a/gnome_lirc_properties/ui/RemoteControlProperties.py b/gnome_lirc_properties/ui/RemoteControlProperties.py
+index e65af35..f6e3fd4 100644
+--- a/gnome_lirc_properties/ui/RemoteControlProperties.py
++++ b/gnome_lirc_properties/ui/RemoteControlProperties.py
+@@ -296,13 +296,13 @@ class RemoteControlProperties(object):
+         #
+         # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
+         # receiver settings in "hardware.conf", whereas we have to. For that
+-        # reason the device node's name is stored in REMOTE_DEVICE, instead
++        # reason the device node's name is stored in LIRC_DEVICE, instead
+         # of RECEIVER_DEVICE.
+         #
+         self.selected_receiver = (
+             settings.get('RECEIVER_VENDOR'),
+             settings.get('RECEIVER_MODEL'),
+-            settings.get('REMOTE_DEVICE'),
++            settings.get('LIRC_DEVICE'),
+         )
+ 
+         # Try to select configured remote vendor:


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-lirc-properties.spec	11 Aug 2009 21:42:33 -0000	1.21
+++ gnome-lirc-properties.spec	15 Sep 2009 09:46:50 -0000	1.22
@@ -1,13 +1,12 @@
-%define		_default_patch_fuzz 2
-%define		polkit_minver 0.8-3
-%define		lirc_ver 0.8.4-2
+%define		polkit_minver 0.95-0.git20090913.2
+%define		lirc_ver 0.8.6-1
 
 # Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gnome-lirc-properties
-Version:	0.3.1
-Release:	6%{?dist}
+Version:	0.4.0
+Release:	1%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
@@ -15,32 +14,24 @@ License:	GPLv2+
 URL:		http://svn.gnome.org/svn/gnome-lirc-properties/trunk
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-lirc-properties/0.3/%{name}-%{version}.tar.gz
 # http://bugzilla.gnome.org/show_bug.cgi?id=530359 and blockers
-# http://bugzilla.gnome.org/show_bug.cgi?id=540897
-# and We have the patches in a 0.8.3 version in Fedora
 Patch0:		glp-fedora-support.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=556585
-Patch1:		glp-dont-use-fluendo-remotes.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=467340
-# http://bugzilla.gnome.org/show_bug.cgi?id=557429
-Patch2:		glp-remove-snapstream.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=563853
-Patch3:		new-dbus-auth.patch
-# http://git.gnome.org/cgit/gnome-lirc-properties/commit/?id=1f4673de56facbefbed6adb9465c358fbe93b0bc
-Patch4:		fix-default-config-name-quoting.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=594899
+Patch1:		0001-Port-to-PolicyKit-1.0.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires:	python >= 2.3
-Requires:	PolicyKit >= %{polkit_minver}
+Requires:	python >= 2.5
+Requires:	polkit >= %{polkit_minver}
 Requires:	pygtk2
 Requires:	lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver}
 
 BuildRequires:	intltool
 BuildRequires:	python-devel >= 2.3
-BuildRequires:	PolicyKit-gnome-devel >= %{polkit_minver} gtk2-devel
+BuildRequires:	polkit-devel >= %{polkit_minver} gtk2-devel
 BuildRequires:	gnome-doc-utils
 BuildRequires:	lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver}
 BuildRequires:	desktop-file-utils
+BuildRequires:	automake autoconf
 
 BuildArch:	noarch
 
@@ -50,14 +41,13 @@ the LIRC framework.
 
 %prep
 %setup -q
-%patch0 -p0 -b .fedora
-%patch1 -p0 -b .no-fluendo-remotes
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .polkit1
+
+autoreconf
 
 %build
-%configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir} --with-remotes-database=%{_datadir}/lirc-remotes/
+%configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir}/lirc --with-remotes-database=%{_datadir}/lirc-remotes/
 
 make
 
@@ -105,6 +95,10 @@ fi
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
+- Update to 0.4.0
+- Port to polkit 1.0
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.3.1-6
 - Fix source URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 17:32:34 -0000	1.4
+++ sources	15 Sep 2009 09:46:50 -0000	1.5
@@ -1 +1 @@
-6bb73e97ec08969c27d59cf578bc349f  gnome-lirc-properties-0.3.1.tar.gz
+672a58a3d80fa0573527381db5dd14f9  gnome-lirc-properties-0.4.0.tar.gz


--- glp-dont-use-fluendo-remotes.patch DELETED ---


--- glp-remove-snapstream.patch DELETED ---


--- new-dbus-auth.patch DELETED ---



From markmc at fedoraproject.org  Tue Sep 15 09:47:42 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 15 Sep 2009 09:47:42 +0000 (UTC)
Subject: rpms/netcf/devel netcf-0.1.0-fix-initialization-of-libxslt.patch,
	NONE, 1.1 netcf.spec, 1.2, 1.3
Message-ID: <20090915094742.6CDA811C00CE@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/netcf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9648

Modified Files:
	netcf.spec 
Added Files:
	netcf-0.1.0-fix-initialization-of-libxslt.patch 
Log Message:
* Tue Sep 15 2009 Mark McLoughlin <markmc at redhat.com> - 0.1.0-3
- Fix libvirtd segfault caused by libxslt init issue (#523382)


netcf-0.1.0-fix-initialization-of-libxslt.patch:
 drv_initscripts.c |   60 ++++++++++++++++++++++++++++++++++++++++++------------
 internal.h        |    5 ++--
 netcf.c           |    3 +-
 netcf.h           |    3 +-
 xslt_ext.c        |   40 ++++++++++++++----------------------
 5 files changed, 70 insertions(+), 41 deletions(-)

--- NEW FILE netcf-0.1.0-fix-initialization-of-libxslt.patch ---
>From 7badcfa2462599fbcdb11225486f771b06e5876a Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Fri, 14 Aug 2009 11:38:23 -0700
Subject: [PATCH] Fix initialization of libxslt

We used to initialize libxslt (and register extension modules) every time
ncf_init was called, and deregister/free libxslt globals every time
ncf_close was called. That breaks when libnetcf is used together with other
libraries that use libxslt, since they might continue using it after a call
to ncf_close.

To work around this, we now initialize and register our extension modules
every time we transform an XML doc, which obviates the need for global
cleanup (there's a small leak caused by global variables that libxslt
maintains, but that's negligible).

As a side-effect, we also capture error messages from the transform and
report them back with ncf_error.
---
 src/drv_initscripts.c |   60 ++++++++++++++++++++++++++++++++++++++----------
 src/internal.h        |    5 ++-
 src/netcf.c           |    3 +-
 src/netcf.h           |    3 +-
 src/xslt_ext.c        |   39 +++++++++++++------------------
 5 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index 66d668f..f39357e 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -45,6 +45,7 @@
 #include <libxslt/xslt.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
+#include <libxslt/xsltutils.h>
 
 static const char *const ifcfg_path =
     "/files/etc/sysconfig/network-scripts/*";
@@ -480,8 +481,6 @@ error:
 }
 
 int drv_init(struct netcf *ncf) {
-    int r;
-
     if (ALLOC(ncf->driver) < 0)
         return -1;
 
@@ -489,8 +488,6 @@ int drv_init(struct netcf *ncf) {
 
     // FIXME: Check for errors
     xsltInit();
-    r = xslt_ext_register();
-    ERR_THROW(r < 0, ncf, EINTERNAL, "xsltRegisterExtModule failed");
     ncf->driver->get = parse_stylesheet(ncf, "initscripts-get.xsl");
     ncf->driver->put = parse_stylesheet(ncf, "initscripts-put.xsl");
     ncf->driver->rng = rng_parse(ncf, "interface.rng");
@@ -513,8 +510,6 @@ int drv_init(struct netcf *ncf) {
 void drv_close(struct netcf *ncf) {
     xsltFreeStylesheet(ncf->driver->get);
     xsltFreeStylesheet(ncf->driver->put);
-    xslt_ext_unregister();
-    xsltCleanupGlobals();
     if (ncf->driver->ioctl_fd >= 0)
         close(ncf->driver->ioctl_fd);
     aug_close(ncf->driver->augeas);
@@ -777,6 +772,44 @@ error:
     return NULL;
 }
 
+ATTRIBUTE_FORMAT(printf, 2, 3)
+static void apply_stylesheet_error(void *ctx, const char *format, ...) {
+    struct netcf *ncf = ctx;
+    va_list ap;
+
+    va_start(ap, format);
+    vreport_error(ncf, NETCF_EXSLTFAILED, format, ap);
+    va_end(ap);
+}
+
+static xmlDocPtr apply_stylesheet(struct netcf *ncf, xsltStylesheetPtr style,
+                                  xmlDocPtr doc) {
+    xsltTransformContextPtr ctxt;
+    xmlDocPtr res = NULL;
+    int r;
+
+    ctxt = xsltNewTransformContext(style, doc);
+    ERR_COND_BAIL(ctxt == NULL, ncf, ENOMEM);
+
+    xsltSetTransformErrorFunc(ctxt, ncf, apply_stylesheet_error);
+
+    r = xslt_register_exts(ctxt);
+    ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+    res = xsltApplyStylesheetUser(style, doc, NULL, NULL, NULL, ctxt);
+    if ((ctxt->state == XSLT_STATE_ERROR) ||
+        (ctxt->state == XSLT_STATE_STOPPED)) {
+        xmlFreeDoc(res);
+        res = NULL;
+        /* Fallback, in case our error handler isn't called */
+        report_error(ncf, NETCF_EXSLTFAILED, NULL);
+    }
+
+error:
+    xsltFreeTransformContext(ctxt);
+    return res;
+}
+
 char *drv_xml_desc(struct netcf_if *nif) {
     char *path = NULL, *result = NULL;
     struct augeas *aug;
@@ -801,7 +834,8 @@ char *drv_xml_desc(struct netcf_if *nif) {
     FREE(path);
 
     aug_xml = aug_get_xml(ncf, nint, intf);
-    ncf_xml = xsltApplyStylesheet(ncf->driver->put, aug_xml, NULL);
+    ncf_xml = apply_stylesheet(ncf, ncf->driver->put, aug_xml);
+    ERR_BAIL(ncf);
 
     xmlDocDumpFormatMemory(ncf_xml, (xmlChar **) &result, NULL, 1);
 
@@ -974,8 +1008,8 @@ struct netcf_if *drv_define(struct netcf *ncf, const char *xml_str) {
     r = aug_rm(aug, path);
     ERR_COND_BAIL(r < 0, ncf, EOTHER);
 
-    // FIXME: Check for errors from ApplyStylesheet
-    aug_xml = xsltApplyStylesheet(ncf->driver->get, ncf_xml, NULL);
+    aug_xml = apply_stylesheet(ncf, ncf->driver->get, ncf_xml);
+    ERR_BAIL(ncf);
 
     aug_put_xml(ncf, aug_xml);
     ERR_BAIL(ncf);
@@ -1197,8 +1231,8 @@ int drv_get_aug(struct netcf *ncf, const char *ncf_xml, char **aug_xml) {
     rng_validate(ncf, ncf_doc);
     ERR_BAIL(ncf);
 
-    // FIXME: Check for errors from ApplyStylesheet
-    aug_doc = xsltApplyStylesheet(ncf->driver->get, ncf_doc, NULL);
+    aug_doc = apply_stylesheet(ncf, ncf->driver->get, ncf_doc);
+    ERR_BAIL(ncf);
 
     xmlDocDumpFormatMemory(aug_doc, (xmlChar **) aug_xml, NULL, 1);
     ERR_COND_BAIL(*aug_xml == NULL, ncf, EXMLINVALID);
@@ -1218,8 +1252,8 @@ int drv_put_aug(struct netcf *ncf, const char *aug_xml, char **ncf_xml) {
     aug_doc = parse_xml(ncf, aug_xml);
     ERR_BAIL(ncf);
 
-    // FIXME: Check for errors from ApplyStylesheet
-    ncf_doc = xsltApplyStylesheet(ncf->driver->put, aug_doc, NULL);
+    ncf_doc = apply_stylesheet(ncf, ncf->driver->put, aug_doc);
+    ERR_BAIL(ncf);
 
     xmlDocDumpFormatMemory(ncf_doc, (xmlChar **) ncf_xml, NULL, 1);
     ERR_COND_BAIL(*ncf_xml == NULL, ncf, EXMLINVALID);
diff --git a/src/internal.h b/src/internal.h
index a11648b..d083dc6 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -30,6 +30,8 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include <libxslt/transform.h>
+
 /*
  * Macros for gcc's attributes
  */
@@ -177,8 +179,7 @@ char *argv_to_string(const char *const *argv);
 /*
  * XSLT extension functions in xslt_ext.c
  */
-int xslt_ext_register(void);
-void xslt_ext_unregister(void);
+int xslt_register_exts(xsltTransformContextPtr ctxt);
 
 /*
  * Useful for debugging, used by ncftransform
diff --git a/src/netcf.c b/src/netcf.c
index e9e8e22..252a8e5 100644
--- a/src/netcf.c
+++ b/src/netcf.c
@@ -51,7 +51,8 @@ static const char *const errmsgs[] = {
     "XML invalid",                        /* EXMLINVALID */
     "required entry missing",             /* ENOENT */
     "failed to execute external program", /* EEXEC */
-    "instance still in use"               /* EINUSE */
+    "instance still in use",              /* EINUSE */
+    "XSLT transformation failed"          /* EXSLTFAILED */
 };
 
 static void free_netcf(struct netcf *ncf) {
diff --git a/src/netcf.h b/src/netcf.h
index 032be78..e08e94b 100644
--- a/src/netcf.h
+++ b/src/netcf.h
@@ -48,8 +48,9 @@ typedef enum {
     NETCF_ENOENT,        /* Required entry in a tree is missing */
     NETCF_EEXEC,         /* external program execution failed or returned
                           * non-0 */
-    NETCF_EINUSE         /* attempt to close a netcf instance that is still
+    NETCF_EINUSE,        /* attempt to close a netcf instance that is still
                           * used by other data structures */
+    NETCF_EXSLTFAILED    /* XSLT transformation failed */
 } netcf_errcode_t;
 
 
diff --git a/src/xslt_ext.c b/src/xslt_ext.c
index ea6d916..07e2b41 100644
--- a/src/xslt_ext.c
+++ b/src/xslt_ext.c
@@ -169,32 +169,25 @@ static void bond_option(xmlXPathParserContextPtr ctxt, int nargs) {
     xmlFree(bond_opts);
 }
 
-static void *xslt_ipcalc_init(ATTRIBUTE_UNUSED xsltTransformContextPtr ctxt,
-                              ATTRIBUTE_UNUSED const xmlChar *URI) {
-    xsltRegisterExtModuleFunction(BAD_CAST "netmask", XSLT_EXT_IPCALC_NS,
-                                  ipcalc_netmask);
-    xsltRegisterExtModuleFunction(BAD_CAST "prefix", XSLT_EXT_IPCALC_NS,
-                                  ipcalc_prefix);
-    return NULL;
-}
+int xslt_register_exts(xsltTransformContextPtr ctxt) {
+    int r;
 
-static void *xslt_bond_init(ATTRIBUTE_UNUSED xsltTransformContextPtr ctxt,
-                            ATTRIBUTE_UNUSED const xmlChar *URI) {
-    xsltRegisterExtModuleFunction(BAD_CAST "option", XSLT_EXT_BOND_NS,
-                                  bond_option);
-    return NULL;
-}
+    r = xsltRegisterExtFunction(ctxt, BAD_CAST "netmask",
+                                XSLT_EXT_IPCALC_NS, ipcalc_netmask);
+    if (r < 0)
+        return r;
 
-int xslt_ext_register(void) {
-    int r = 0;
-    r = xsltRegisterExtModule(XSLT_EXT_IPCALC_NS, xslt_ipcalc_init, NULL);
-    if (r < 0) return r;
-    r = xsltRegisterExtModule(XSLT_EXT_BOND_NS, xslt_bond_init, NULL);
-    return r;
-}
+    r = xsltRegisterExtFunction(ctxt, BAD_CAST "prefix",
+                                XSLT_EXT_IPCALC_NS, ipcalc_prefix);
+    if (r < 0)
+        return r;
+
+    r = xsltRegisterExtFunction(ctxt, BAD_CAST "option",
+                                XSLT_EXT_BOND_NS, bond_option);
+    if (r < 0)
+        return r;
 
-void xslt_ext_unregister(void) {
-    xsltUnregisterExtModule	(XSLT_EXT_IPCALC_NS);
+    return 0;
 }
 
 /*
-- 
1.6.2.5



Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/netcf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netcf.spec	25 Jul 2009 18:04:07 -0000	1.2
+++ netcf.spec	15 Sep 2009 09:47:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           netcf
 Version:        0.1.0
-Release:        2%{?dist}%{?extra_release}
+Release:        3%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
 Group:          System Environment/Libraries
@@ -13,6 +13,8 @@ BuildRequires:  readline-devel augeas-de
 BuildRequires:  libxml2-devel libxslt-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Patch01: netcf-0.1.0-fix-initialization-of-libxslt.patch
+
 %description
 A library for modifying the network configuration of a system. Network
 configurations are expresed in a platform-independent XML format, which
@@ -39,6 +41,8 @@ The libraries for %{name}.
 %prep
 %setup -q
 
+%patch01 -p1
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Tue Sep 15 2009 Mark McLoughlin <markmc at redhat.com> - 0.1.0-3
+- Fix libvirtd segfault caused by libxslt init issue (#523382)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Sep 15 09:50:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 09:50:11 +0000 (UTC)
Subject: rpms/gnome-lirc-properties/devel 0001-Port-to-PolicyKit-1.0.patch, 
	NONE, 1.1
Message-ID: <20090915095011.08DAC11C0335@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10575

Added Files:
	0001-Port-to-PolicyKit-1.0.patch 
Log Message:
Add missing patch

0001-Port-to-PolicyKit-1.0.patch:
 b/Makefile.am                                        |    2 -
 b/configure.ac                                       |    5 +-
 b/data/Makefile.am                                   |    6 +--
 b/data/org.gnome.lirc-properties.mechanism.policy.in |   22 +++++++++++
 b/gnome_lirc_properties/backend.py                   |   23 +++++++-----
 b/gnome_lirc_properties/policykit.py                 |   35 +++++++------------
 data/gnome-lirc-properties-mechanism.policy.in       |   22 -----------
 7 files changed, 55 insertions(+), 60 deletions(-)

--- NEW FILE 0001-Port-to-PolicyKit-1.0.patch ---
>From 4587a7037d05f4113b2e860afd634d01ec425d9e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 11 Sep 2009 16:34:45 +0100
Subject: [PATCH] Port to PolicyKit 1.0

- Port backend and policykit code to PolicyKit 1.0
- Rename mechanism's configuration file, as PolicyKit would
  ignore it otherwise
---
 Makefile.am                                        |    2 +-
 configure.ac                                       |    5 +--
 data/Makefile.am                                   |    6 ++--
 data/gnome-lirc-properties-mechanism.policy.in     |   22 -------------
 data/org.gnome.lirc-properties.mechanism.policy.in |   22 +++++++++++++
 gnome_lirc_properties/backend.py                   |   23 +++++++------
 gnome_lirc_properties/policykit.py                 |   34 ++++++++-----------
 7 files changed, 55 insertions(+), 59 deletions(-)
 delete mode 100644 data/gnome-lirc-properties-mechanism.policy.in
 create mode 100644 data/org.gnome.lirc-properties.mechanism.policy.in

diff --git a/Makefile.am b/Makefile.am
index b8dcf64..b4b2a55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ DISTCLEANFILES = \
 	intltool-update
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-scrollkeeper --disable-policy-kit
+	--disable-scrollkeeper
 
 # Build ChangeLog from GIT history
 ChangeLog:
diff --git a/configure.ac b/configure.ac
index 17551a4..97188c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,7 @@ AC_ARG_ENABLE([policy-kit],
 
 if test "$enable_policy_kit" != no
 then
-  PKG_CHECK_MODULES([POLICY_KIT], [polkit >= 0.7
-                                   polkit-gnome >= 0.7])
+  PKG_CHECK_MODULES([POLICY_KIT], [polkit-backend-1])
   ENABLE_POLICY_KIT=True
   enable_policy_kit=yes
 else
@@ -184,7 +183,7 @@ dnl generate files ===
 AC_CONFIG_FILES([Makefile
                  data/Makefile
                  data/gnome-lirc-properties.desktop.in
-                 data/gnome-lirc-properties-mechanism.policy
+                 data/org.gnome.lirc-properties.mechanism.policy
                  data/org.gnome.LircProperties.Mechanism.service
                  data/icons/Makefile
                  data/icons/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 8e98529..537f42b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,9 +5,9 @@ SUBDIRS = icons
 dbusconfdir = $(sysconfdir)/dbus-1/system.d
 dbusconf_DATA = org.gnome.LircProperties.Mechanism.conf
 
-policykitpolicydir = $(datadir)/PolicyKit/policy
-policykitpolicy_in_files = gnome-lirc-properties-mechanism.policy.in
-policykitpolicy_DATA = gnome-lirc-properties-mechanism.policy
+policykitpolicydir = $(datadir)/polkit-1/actions
+policykitpolicy_in_files = org.gnome.lirc-properties.mechanism.policy.in
+policykitpolicy_DATA = org.gnome.lirc-properties.mechanism.policy
 
 # The .service file is generated from a .service.in file
 # so that the install location can be inserted.
diff --git a/data/gnome-lirc-properties-mechanism.policy.in b/data/gnome-lirc-properties-mechanism.policy.in
deleted file mode 100644
index e99b880..0000000
--- a/data/gnome-lirc-properties-mechanism.policy.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!-- needs i18n work -->
-
-<policyconfig>
-  <vendor>Fluendo Embedded S.L.</vendor>
-  <vendor_url>http://www.fluendo.com/</vendor_url>
-  <icon_name>gnome-lirc-properties</icon_name>
-
-  <action id="@POLICY_KIT_ACTION@">
-    <description>Change LIRC Configuration</description>
-    <message>Changing the LIRC configuration requires privileges.</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep_always</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>
diff --git a/data/org.gnome.lirc-properties.mechanism.policy.in b/data/org.gnome.lirc-properties.mechanism.policy.in
new file mode 100644
index 0000000..9677d36
--- /dev/null
+++ b/data/org.gnome.lirc-properties.mechanism.policy.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<!-- needs i18n work -->
+
+<policyconfig>
+  <vendor>Fluendo Embedded S.L.</vendor>
+  <vendor_url>http://www.fluendo.com/</vendor_url>
+  <icon_name>gnome-lirc-properties</icon_name>
+
+  <action id="@POLICY_KIT_ACTION@">
+    <description>Change LIRC Configuration</description>
+    <message>Changing the LIRC configuration requires privileges.</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_self_keep</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>
diff --git a/gnome_lirc_properties/backend.py b/gnome_lirc_properties/backend.py
index 881b7df..2475b21 100644
--- a/gnome_lirc_properties/backend.py
+++ b/gnome_lirc_properties/backend.py
@@ -63,17 +63,20 @@ class PolicyKitService(dbus.service.Object):
 
         try:
             if sender:
-                kit = dbus.SystemBus().get_object('org.freedesktop.PolicyKit', '/')
-                kit = dbus.Interface(kit, 'org.freedesktop.PolicyKit')
-
-                # Note that we don't use IsProcessAuthorized because we have
-                # no ways to get the PID of the front-end, so we're left
-                # with checking that its bus name is authorised instead
-		# See http://bugzilla.gnome.org/show_bug.cgi?id=540912
-                granted = kit.IsSystemBusNameAuthorized(action, sender, False)
+                kit = dbus.SystemBus().get_object('org.freedesktop.PolicyKit1', '/org/freedesktop/PolicyKit1/Authority')
+                kit = dbus.Interface(kit, 'org.freedesktop.PolicyKit1.Authority')
+
+                # Note that we don't use CheckAuthorization with bus name
+                # details because we have no ways to get the PID of the
+                # front-end, so we're left with checking that its bus name
+                # is authorised instead
+                # See http://bugzilla.gnome.org/show_bug.cgi?id=540912
+                (granted, _, details) = kit.CheckAuthorization(
+                                ('system-bus-name', {'name': sender}),
+                                action, {}, dbus.UInt32(1), '', timeout=600)
                 logging.info('authorization of system bus name \'%s\': %r', sender, granted)
 
-                if 'yes' != granted:
+                if not granted:
                     raise AccessDeniedException('Session not authorized by PolicyKit')
 
         except AccessDeniedException:
@@ -484,7 +487,7 @@ class BackendService(PolicyKitService):
 
     INTERFACE_NAME = 'org.gnome.LircProperties.Mechanism'
     SERVICE_NAME   = 'org.gnome.LircProperties.Mechanism'
-    IDLE_TIMEOUT   =  30
+    IDLE_TIMEOUT   =  300
 
     # These are extra fields set by our GUI:
 
diff --git a/gnome_lirc_properties/policykit.py b/gnome_lirc_properties/policykit.py
index f60c1f8..750883c 100644
--- a/gnome_lirc_properties/policykit.py
+++ b/gnome_lirc_properties/policykit.py
@@ -39,42 +39,36 @@ class PolicyKitAuthentication(object):
             return True
 
         # Check whether the process is authorized:
-        pid = dbus.UInt32(os.getpid())
-        authorized = self.policy_kit.IsProcessAuthorized(action_id, pid, False)
-        logging.debug('%s: authorized=%r', action_id, authorized)
+        pid = os.getpid()
+        (is_auth, _, details) = self.policy_kit.CheckAuthorization(
+			('unix-process', {'pid': dbus.UInt32(pid, variant_level=1)}),
+			action_id, {}, dbus.UInt32(0), '', timeout=600)
+        logging.debug('%s: authorized=%r', action_id, is_auth)
 
-        return ('yes' == authorized)
+        return bool(is_auth)
 
     def obtain_authorization(self, widget, action_id=config.POLICY_KIT_ACTION):
         '''
-        Try to obtain authoriztation for the specified action.
+        Try to obtain authorization for the specified action.
         '''
 
         if not config.ENABLE_POLICY_KIT:
             return True
 
-        xid = (widget and widget.get_toplevel().window.xid or 0)
-        xid, pid = dbus.UInt32(xid), dbus.UInt32(os.getpid())
+        pid = os.getpid()
+        (granted, _, details) = self.policy_kit.CheckAuthorization(
+			('unix-process', {'pid': dbus.UInt32(pid, variant_level=1)}),
+			action_id, {}, dbus.UInt32(1), '', timeout=600)
 
-        granted = self.auth_agent.ObtainAuthorization(action_id, xid, pid)
         logging.debug('%s: granted=%r', action_id, granted)
 
         return bool(granted)
 
     def __get_policy_kit(self):
-        '''Retreive the D-Bus interface of PolicyKit.'''
+        '''Retrieve the D-Bus interface of PolicyKit.'''
 
         # retreiving the interface raises DBusException on error:
-        service = dbus.SystemBus().get_object('org.freedesktop.PolicyKit', '/')
-        return dbus.Interface(service, 'org.freedesktop.PolicyKit')
+        service = dbus.SystemBus().get_object('org.freedesktop.PolicyKit1', '/org/freedesktop/PolicyKit1/Authority')
+        return dbus.Interface(service, 'org.freedesktop.PolicyKit1.Authority')
 
-    def __get_auth_agent(self):
-        '''Retreive the D-Bus interface of the PolicyKit authentication agent.'''
-
-        # retreiving the interface raises DBusException on error:
-        return dbus.SessionBus().get_object(
-            'org.freedesktop.PolicyKit.AuthenticationAgent', '/',
-            'org.gnome.PolicyKit.AuthorizationManager.SingleInstance')
-
-    auth_agent = property(__get_auth_agent)
     policy_kit = property(__get_policy_kit)
-- 
1.6.2.5




From bskeggs at fedoraproject.org  Tue Sep 15 09:52:52 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 15 Sep 2009 09:52:52 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.55, 1.56 kernel.spec, 1.1800, 
	1.1801
Message-ID: <20090915095252.23E7B11C00CE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11282

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  537 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  750 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  354 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  683 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  213 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2214 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  473 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  443 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 58026 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- drm-nouveau.patch	15 Sep 2009 06:44:12 -0000	1.55
+++ drm-nouveau.patch	15 Sep 2009 09:52:49 -0000	1.56
@@ -8538,10 +8538,10 @@ index 0000000..3f80db8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
 new file mode 100644
-index 0000000..7761425
+index 0000000..65810d4
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
-@@ -0,0 +1,520 @@
+@@ -0,0 +1,537 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -8656,6 +8656,7 @@ index 0000000..7761425
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
 +	struct nouveau_channel *chan;
++	unsigned fbdev_flags = 0;
 +	int channel, user;
 +	int ret;
 +
@@ -8745,6 +8746,11 @@ index 0000000..7761425
 +		return ret;
 +	}
 +
++	if (dev_priv->fbdev_info) {
++		fbdev_flags = dev_priv->fbdev_info->flags;
++		dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
 +	engine->graph.fifo_access(dev, false);
 +	nouveau_wait_for_idle(dev);
 +
@@ -8773,25 +8779,24 @@ index 0000000..7761425
 +	 * isn't entirely.. well.. correct.. setup PFIFO ourselves.  For any
 +	 * other case, the GPU will handle this when it switches contexts.
 +	 */
-+	if (dev_priv->engine.fifo.init == nv04_fifo_init ||
-+	    dev_priv->engine.fifo.init == nv40_fifo_init) {
++	if ((dev_priv->engine.fifo.init == nv04_fifo_init ||
++	     dev_priv->engine.fifo.init == nv40_fifo_init) &&
++	    dev_priv->fifo_alloc_count == 1) {
 +		/* setup channel's default get/put values
 +		 */
 +		nvchan_wr32(chan->user_get, chan->pushbuf_base);
 +		nvchan_wr32(chan->user_put, chan->pushbuf_base);
 +
-+		if (dev_priv->fifo_alloc_count == 1) {
-+			ret = engine->fifo.load_context(chan);
-+			if (ret) {
-+				nouveau_channel_free(chan);
-+				return ret;
-+			}
++		ret = engine->fifo.load_context(chan);
++		if (ret) {
++			nouveau_channel_free(chan);
++			return ret;
++		}
 +
-+			ret = engine->graph.load_context(chan);
-+			if (ret) {
-+				nouveau_channel_free(chan);
-+				return ret;
-+			}
++		ret = engine->graph.load_context(chan);
++		if (ret) {
++			nouveau_channel_free(chan);
++			return ret;
 +		}
 +	}
 +
@@ -8806,6 +8811,9 @@ index 0000000..7761425
 +
 +	engine->graph.fifo_access(dev, true);
 +
++	if (dev_priv->fbdev_info)
++		dev_priv->fbdev_info->flags = fbdev_flags;
++
 +	ret = nouveau_dma_init(chan);
 +	if (!ret)
 +		ret = nouveau_fence_init(chan);
@@ -8867,6 +8875,7 @@ index 0000000..7761425
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
++	unsigned fbdev_flags = 0;
 +	uint64_t t_start;
 +	bool timeout = false;
 +	int ret;
@@ -8911,6 +8920,11 @@ index 0000000..7761425
 +	nouveau_fence_fini(chan);
 +
 +	/* disable the fifo caches */
++	if (dev_priv->fbdev_info) {
++		fbdev_flags = dev_priv->fbdev_info->flags;
++		dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
 +	nv_wr32(dev, NV03_PFIFO_CACHES, 0x00000000);
 +	nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUSH,
 +			nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUSH) & ~0x1);
@@ -8929,6 +8943,9 @@ index 0000000..7761425
 +	nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 0x00000001);
 +	nv_wr32(dev, NV03_PFIFO_CACHES, 0x00000001);
 +
++	if (dev_priv->fbdev_info)
++		dev_priv->fbdev_info->flags = fbdev_flags;
++
 +	/* Deallocate push buffer */
 +	nouveau_gpuobj_ref_del(dev, &chan->pushbuf);
 +	nouveau_bo_ref(NULL, &chan->pushbuf_bo);
@@ -12257,10 +12274,10 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..af69791
+index 0000000..f744723
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
-@@ -0,0 +1,357 @@
+@@ -0,0 +1,354 @@
 +/*
 + * Copyright ? 2007 David Airlie
 + *
@@ -12341,8 +12358,7 @@ index 0000000..af69791
 +
 +	ret = -EBUSY;
 +	for (i = 0; i < 100000; i++) {
-+		if (nouveau_bo_rd32(chan->notifier_bo, chan->m2mf_ntfy + 3)
-+									== 0) {
++		if (!nouveau_bo_rd32(chan->notifier_bo, chan->m2mf_ntfy + 3)) {
 +			ret = 0;
 +			break;
 +		}
@@ -12549,7 +12565,6 @@ index 0000000..af69791
 +	par->nouveau_fb = nouveau_fb;
 +	par->dev = dev;
 +
-+#if 0
 +	switch (dev_priv->card_type) {
 +	case NV_50:
 +		nv50_fbcon_accel_init(info);
@@ -12558,7 +12573,6 @@ index 0000000..af69791
 +		nv04_fbcon_accel_init(info);
 +		break;
 +	};
-+#endif
 +
 +	/* Clear the entire fbcon.  The drm will program every connector
 +	 * with it's preferred mode.  If the sizes differ, one display will
@@ -23330,10 +23344,10 @@ index 0000000..638cf60
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
 new file mode 100644
-index 0000000..a2046d6
+index 0000000..8915fb3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
-@@ -0,0 +1,292 @@
+@@ -0,0 +1,295 @@
 +/*
 + * Copyright 2009 Ben Skeggs
 + * Copyright 2008 Stuart Bennett
@@ -23439,14 +23453,17 @@ index 0000000..a2046d6
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (image->depth != 1 || info->flags & FBINFO_HWACCEL_DISABLED) {
++	if (image->depth != 1) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
 +
-+	if (RING_SPACE(chan, 8)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 8)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
@@ -23628,7 +23645,7 @@ index 0000000..a2046d6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
 new file mode 100644
-index 0000000..d9a6b70
+index 0000000..6e984dc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_fifo.c
 @@ -0,0 +1,295 @@
@@ -23710,7 +23727,7 @@ index 0000000..d9a6b70
 +			nv_wr32(dev, 0x2230, 0);
 +			nv_wr32(dev, NV40_PFIFO_RAMFC,
 +				((nouveau_mem_fb_amount(dev) - 512 * 1024 +
-+				  dev_priv->ramfc_offset) >> 16) | (2 << 16));
++				  dev_priv->ramfc_offset) >> 16) | (3 << 16));
 +			break;
 +		}
 +		break;
@@ -24518,10 +24535,10 @@ index 0000000..b74d2fc
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
 new file mode 100644
-index 0000000..0d1e3e8
+index 0000000..928464e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
-@@ -0,0 +1,207 @@
+@@ -0,0 +1,213 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -24645,12 +24662,18 @@ index 0000000..0d1e3e8
 +	 */
 +	offset = dev_priv->ramfc_offset + dev_priv->ramfc_size;
 +
-+	/* On my NV4E, there's *something* clobbering the 16KiB just after
-+	 * where we setup these fixed tables.  No idea what it is just yet,
-+	 * so reserve this space on all NV4X cards for now.
++	/* It appears RAMRO (or something?) is controlled by 0x2220/0x2230
++	 * on certain NV4x chipsets as well as RAMFC.  When 0x2230 == 0
++	 * ("new style" control) the upper 16-bits of 0x2220 points at this
++	 * other mysterious table that's clobbering important things.
++	 *
++	 * We're now pointing this at RAMIN+0x30000 to avoid RAMFC getting
++	 * smashed to pieces on us, so reserve 0x30000-0x40000 too..
 +	 */
-+	if (dev_priv->card_type >= NV_40)
-+		offset += 16*1024;
++	if (dev_priv->card_type >= NV_40) {
++		if (offset < 0x40000)
++			offset = 0x40000;
++	}
 +
 +	ret = nouveau_mem_init_heap(&dev_priv->ramin_heap,
 +				    offset, dev_priv->ramin_rsvd_vram - offset);
@@ -28791,10 +28814,10 @@ index 0000000..6b5fdcc
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
 new file mode 100644
-index 0000000..6415e4e
+index 0000000..915fe84
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_graph.c
-@@ -0,0 +1,2203 @@
+@@ -0,0 +1,2214 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -30311,6 +30334,17 @@ index 0000000..6415e4e
 +void
 +nv40_graph_destroy_context(struct nouveau_channel *chan)
 +{
++	struct drm_device *dev = chan->dev;
++	uint32_t inst;
++
++	/* Mark context as unloaded if still active on PGRAPH */
++	inst = nv_rd32(dev, NV40_PGRAPH_CTXCTL_CUR);
++	if (inst & NV40_PGRAPH_CTXCTL_CUR_LOADED) {
++		inst &= NV40_PGRAPH_CTXCTL_CUR_INSTANCE;
++		if (inst == (chan->ramin_grctx->instance >> 4))
++			nv_wr32(dev, NV40_PGRAPH_CTXCTL_CUR, inst);
++	}
++
 +	nouveau_gpuobj_ref_del(chan->dev, &chan->ramin_grctx);
 +}
 +
@@ -33390,7 +33424,7 @@ index 0000000..d2f0b80
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
 new file mode 100644
-index 0000000..d3807e3
+index 0000000..cc4c2f7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
 @@ -0,0 +1,256 @@
@@ -33410,15 +33444,14 @@ index 0000000..d3807e3
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (info->flags & FBINFO_HWACCEL_DISABLED) {
-+		cfb_fillrect(info, rect);
-+		return;
-+	}
-+
-+	if (RING_SPACE(chan, rect->rop == ROP_COPY ? 7 : 11)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) &&
++	     RING_SPACE(chan, rect->rop == ROP_COPY ? 7 : 11)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_fillrect(info, rect);
 +		return;
 +	}
@@ -33452,15 +33485,13 @@ index 0000000..d3807e3
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (info->flags & FBINFO_HWACCEL_DISABLED) {
-+		cfb_copyarea(info, region);
-+		return;
-+	}
-+
-+	if (RING_SPACE(chan, 12)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 12)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_copyarea(info, region);
 +		return;
 +	}
@@ -33494,14 +33525,17 @@ index 0000000..d3807e3
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (image->depth != 1 || (info->flags & FBINFO_HWACCEL_DISABLED)) {
++	if (image->depth != 1) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
 +
-+	if (RING_SPACE(chan, 11)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 11)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1800
retrieving revision 1.1801
diff -u -p -r1.1800 -r1.1801
--- kernel.spec	15 Sep 2009 06:44:13 -0000	1.1800
+++ kernel.spec	15 Sep 2009 09:52:51 -0000	1.1801
@@ -2041,6 +2041,9 @@ fi
 
 %changelog
 * Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs
+
+* Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: temporarily disable fbcon accel, it's racing with ttm
 
 * Mon Sep 14 2009 Steve Dickson <steved at redhat.com>



From hadess at fedoraproject.org  Tue Sep 15 10:06:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 10:06:54 +0000 (UTC)
Subject: rpms/gnome-lirc-properties/devel glp-fedora-support.patch, 1.5,
	1.6 gnome-lirc-properties.spec, 1.22, 1.23
Message-ID: <20090915100654.9E7D411C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16180

Modified Files:
	glp-fedora-support.patch gnome-lirc-properties.spec 
Log Message:
Update filelist

glp-fedora-support.patch:
 backend.py                    |   49 ++++++++++++++++++++----------------------
 config.py.in                  |    2 -
 ui/RemoteControlProperties.py |    5 +---
 3 files changed, 27 insertions(+), 29 deletions(-)

Index: glp-fedora-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/glp-fedora-support.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glp-fedora-support.patch	15 Sep 2009 09:46:49 -0000	1.5
+++ glp-fedora-support.patch	15 Sep 2009 10:06:53 -0000	1.6
@@ -1,8 +1,19 @@
+From fcebc7a9c8a240de4920fd1fc29781c8d4930897 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 10 Sep 2009 15:54:49 +0100
+Subject: [PATCH 1/2] Fedora support
+
+---
+ gnome_lirc_properties/backend.py                   |   49 ++++++++++----------
+ gnome_lirc_properties/config.py.in                 |    2 +-
+ .../ui/RemoteControlProperties.py                  |    4 +-
+ 3 files changed, 27 insertions(+), 28 deletions(-)
+
 diff --git a/gnome_lirc_properties/backend.py b/gnome_lirc_properties/backend.py
-index 881b7df..1bff4c1 100644
+index 2475b21..56244f3 100644
 --- a/gnome_lirc_properties/backend.py
 +++ b/gnome_lirc_properties/backend.py
-@@ -494,8 +494,8 @@ class BackendService(PolicyKitService):
+@@ -497,8 +497,8 @@ class BackendService(PolicyKitService):
      # The "REMOTE_" prefix is made optional, since it only was introduced
      # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron.
  
@@ -13,7 +24,7 @@ index 881b7df..1bff4c1 100644
      __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
  
      def __init__(self, connection=None, path='/'):
-@@ -599,22 +599,23 @@ class BackendService(PolicyKitService):
+@@ -602,22 +602,23 @@ class BackendService(PolicyKitService):
                      print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
                  continue
  
@@ -50,7 +61,7 @@ index 881b7df..1bff4c1 100644
  
          # Write out any values that were not already in the file,
          # and therefore just replaced:
-@@ -622,17 +623,13 @@ class BackendService(PolicyKitService):
+@@ -625,17 +626,13 @@ class BackendService(PolicyKitService):
          if remote_values:
              print >> output, '\n# Remote settings required by gnome-lirc-properties'
          for key, value in remote_values.items():
@@ -69,7 +80,7 @@ index 881b7df..1bff4c1 100644
          # Replace old file with new contents:
  
          os.unlink(oldfile)
-@@ -653,10 +650,10 @@ class BackendService(PolicyKitService):
+@@ -656,10 +653,10 @@ class BackendService(PolicyKitService):
          self._check_permission(sender)
  
          remote_values = {
@@ -83,7 +94,7 @@ index 881b7df..1bff4c1 100644
              'LIRCD_CONF': '',
          }
  
-@@ -779,10 +776,12 @@ class BackendService(PolicyKitService):
+@@ -782,10 +779,12 @@ class BackendService(PolicyKitService):
  	    raise AccessDeniedException
  
          if 'enable' == action:
@@ -99,12 +110,12 @@ index 881b7df..1bff4c1 100644
          else:
              args = '/etc/init.d/lirc', action
 diff --git a/gnome_lirc_properties/config.py.in b/gnome_lirc_properties/config.py.in
-index 69b232c..68b435c 100644
+index eeeda1c..0fd3f69 100644
 --- a/gnome_lirc_properties/config.py.in
 +++ b/gnome_lirc_properties/config.py.in
-@@ -12,7 +12,7 @@ PACKAGE_DIR           = path.join('@prefix@', 'share', '@PACKAGE@')
- 
+@@ -13,7 +13,7 @@ PACKAGE_DIR           = path.join('@prefix@', 'share', '@PACKAGE@')
  LIRC_CONFDIR          = '@with_lirc_confdir@'
+ LIRCD_SOCKET          = '@with_lircd_socket@'
  
 -LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
 +LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
@@ -131,3 +142,6 @@ index e65af35..f6e3fd4 100644
          )
  
          # Try to select configured remote vendor:
+-- 
+1.6.2.5
+


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-lirc-properties.spec	15 Sep 2009 09:46:50 -0000	1.22
+++ gnome-lirc-properties.spec	15 Sep 2009 10:06:53 -0000	1.23
@@ -82,7 +82,7 @@ fi
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README AUTHORS
 %{_sysconfdir}/dbus-1/system.d/org.gnome.LircProperties.Mechanism.conf
-%{_datadir}/PolicyKit/policy/gnome-lirc-properties-mechanism.policy
+%{_datadir}/polkit-1/actions/org.gnome.lirc-properties.mechanism.policy
 %{_datadir}/dbus-1/system-services/org.gnome.LircProperties.Mechanism.service
 %{_datadir}/hal/fdi/policy/10osvendor/*.fdi
 %{_datadir}/applications/gnome-lirc-properties.desktop



From twaugh at fedoraproject.org  Tue Sep 15 10:11:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 15 Sep 2009 10:11:02 +0000 (UTC)
Subject: rpms/cups/devel cups.init,1.19,1.20 cups.spec,1.518,1.519
Message-ID: <20090915101102.1103B11C00CE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17526

Modified Files:
	cups.init cups.spec 
Log Message:
* Tue Sep 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
- Fixed 'service cups status' to check for correct subsys name
  (bug #521641).



Index: cups.init
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cups.init	24 Jul 2009 12:22:35 -0000	1.19
+++ cups.init	15 Sep 2009 10:11:01 -0000	1.20
@@ -112,7 +112,7 @@ case $1 in
 		echo
 	;;
 	status)
-		status $DAEMON
+		status cups
 		RETVAL=$?
 	;;
 	restartlog)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- cups.spec	14 Sep 2009 17:03:49 -0000	1.518
+++ cups.spec	15 Sep 2009 10:11:01 -0000	1.519
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -505,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Sep 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
+- Fixed 'service cups status' to check for correct subsys name
+  (bug #521641).
+
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
 - 1.4.1.
 



From hadess at fedoraproject.org  Tue Sep 15 10:13:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 10:13:30 +0000 (UTC)
Subject: rpms/gnome-lirc-properties/F-11 .cvsignore, 1.4,
	1.5 glp-fedora-support.patch, 1.4,
	1.5 gnome-lirc-properties.spec, 1.19, 1.20 sources, 1.4,
	1.5 fix-default-config-name-quoting.patch, 1.1,
	NONE glp-dont-use-fluendo-remotes.patch, 1.1,
	NONE glp-remove-snapstream.patch, 1.1, NONE new-dbus-auth.patch,
	1.1, NONE
Message-ID: <20090915101330.B444911C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18385

Modified Files:
	.cvsignore glp-fedora-support.patch gnome-lirc-properties.spec 
	sources 
Removed Files:
	fix-default-config-name-quoting.patch 
	glp-dont-use-fluendo-remotes.patch glp-remove-snapstream.patch 
	new-dbus-auth.patch 
Log Message:
* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
- Update to 0.4.0
- Drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 17:32:33 -0000	1.4
+++ .cvsignore	15 Sep 2009 10:13:29 -0000	1.5
@@ -1 +1 @@
-gnome-lirc-properties-0.3.1.tar.gz
+gnome-lirc-properties-0.4.0.tar.gz

glp-fedora-support.patch:
 backend.py                    |   49 ++++++++++++++++++++----------------------
 config.py.in                  |    2 -
 ui/RemoteControlProperties.py |    5 +---
 3 files changed, 27 insertions(+), 29 deletions(-)

Index: glp-fedora-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/glp-fedora-support.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glp-fedora-support.patch	27 Oct 2008 17:32:34 -0000	1.4
+++ glp-fedora-support.patch	15 Sep 2009 10:13:30 -0000	1.5
@@ -1,54 +1,19 @@
-Index: gnome_lirc_properties/config.py.in
-===================================================================
---- gnome_lirc_properties/config.py.in	(revision 44)
-+++ gnome_lirc_properties/config.py.in	(working copy)
-@@ -12,7 +12,7 @@
- 
- LIRC_CONFDIR          = '@with_lirc_confdir@'
- 
--LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
-+LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
- LIRC_REMOTE_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
- LIRC_DAEMON_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf')
- 
-Index: gnome_lirc_properties/ui/RemoteControlProperties.py
-===================================================================
---- gnome_lirc_properties/ui/RemoteControlProperties.py	(revision 44)
-+++ gnome_lirc_properties/ui/RemoteControlProperties.py	(working copy)
-@@ -297,13 +297,13 @@
-         #
-         # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
-         # receiver settings in "hardware.conf", whereas we have to. For that
--        # reason the device node's name is stored in REMOTE_DEVICE, instead
-+        # reason the device node's name is stored in LIRC_DEVICE, instead
-         # of RECEIVER_DEVICE.
-         #
-         self.selected_receiver = (
-             settings.get('RECEIVER_VENDOR'),
-             settings.get('RECEIVER_MODEL'),
--            settings.get('REMOTE_DEVICE'),
-+            settings.get('LIRC_DEVICE'),
-         )
- 
-         # Try to select configured remote vendor:
-Index: data/gnome-lirc-properties.desktop.in.in
-===================================================================
---- data/gnome-lirc-properties.desktop.in.in	(revision 44)
-+++ data/gnome-lirc-properties.desktop.in.in	(working copy)
-@@ -7,7 +7,7 @@
- Exec=@prefix@/bin/gnome-lirc-properties
- Icon=gnome-lirc-properties
- StartupNotify=true
--Categories=GNOME;GTK;Settings;HardwareSettings;System;
-+Categories=GNOME;GTK;Settings;HardwareSettings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-lirc-properties
- X-GNOME-Bugzilla-Component=general
-Index: gnome_lirc_properties/backend.py
-===================================================================
---- gnome_lirc_properties/backend.py	(revision 76)
-+++ gnome_lirc_properties/backend.py	(working copy)
-@@ -494,8 +494,8 @@
+From fcebc7a9c8a240de4920fd1fc29781c8d4930897 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 10 Sep 2009 15:54:49 +0100
+Subject: [PATCH 1/2] Fedora support
+
+---
+ gnome_lirc_properties/backend.py                   |   49 ++++++++++----------
+ gnome_lirc_properties/config.py.in                 |    2 +-
+ .../ui/RemoteControlProperties.py                  |    4 +-
+ 3 files changed, 27 insertions(+), 28 deletions(-)
+
+diff --git a/gnome_lirc_properties/backend.py b/gnome_lirc_properties/backend.py
+index 2475b21..56244f3 100644
+--- a/gnome_lirc_properties/backend.py
++++ b/gnome_lirc_properties/backend.py
+@@ -497,8 +497,8 @@ class BackendService(PolicyKitService):
      # The "REMOTE_" prefix is made optional, since it only was introduced
      # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron.
  
@@ -59,15 +24,14 @@ Index: gnome_lirc_properties/backend.py
      __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
  
      def __init__(self, connection=None, path='/'):
-@@ -593,40 +593,37 @@
-                 print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
+@@ -602,22 +602,23 @@ class BackendService(PolicyKitService):
+                     print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
                  continue
  
 -            # Deal with the START_LIRCD line:
-+            output.write(line)
- 
+-
 -            match = self.__re_start_lircd.match(line)
-+        # Check whether we need to enable or disable lircd
++            output.write(line)
  
 -            if match:
 -                # pychecker says "Using a conditional statement with a constant value (true)",
@@ -76,6 +40,10 @@ Index: gnome_lirc_properties/backend.py
 -                # below ('condition and true_value or false_value') is the recommended aquivalent.
 -                value = (start_lircd is None) and 'true' or start_lircd
 -                start_lircd = None
++        # Check whether we need to enable or disable lircd
+ 
+-                print >> output, (match.group(0) + ShellQuote.shellquote(value))
+-                continue
 +        # pychecker says "Using a conditional statement with a constant value (true)",
 +        # which is ridicilous, considering Python 2.4 doesn't have conditional statements
 +        # yet (PEP 308, aka. 'true_value if condition else false_value') and the expression
@@ -83,8 +51,7 @@ Index: gnome_lirc_properties/backend.py
 +        value = (start_lircd is None) and 'true' or start_lircd
 +        start_lircd = None
  
--                print >> output, (match.group(0) + ShellQuote.shellquote(value))
--                continue
+-            output.write(line)
 +        if 'true' == value:
 +             args = '/sbin/chkconfig', 'lirc', 'on'
 +             os.spawnv(os.P_WAIT, args[0], args)
@@ -92,11 +59,9 @@ Index: gnome_lirc_properties/backend.py
 +             args = '/sbin/chkconfig', 'lirc', 'off'
 +             os.spawnv(os.P_WAIT, args[0], args)
  
--            output.write(line)
--
          # Write out any values that were not already in the file,
          # and therefore just replaced:
- 
+@@ -625,17 +626,13 @@ class BackendService(PolicyKitService):
          if remote_values:
              print >> output, '\n# Remote settings required by gnome-lirc-properties'
          for key, value in remote_values.items():
@@ -115,7 +80,7 @@ Index: gnome_lirc_properties/backend.py
          # Replace old file with new contents:
  
          os.unlink(oldfile)
-@@ -647,10 +644,10 @@
+@@ -656,10 +653,10 @@ class BackendService(PolicyKitService):
          self._check_permission(sender)
  
          remote_values = {
@@ -129,7 +94,7 @@ Index: gnome_lirc_properties/backend.py
              'LIRCD_CONF': '',
          }
  
-@@ -773,10 +770,12 @@
+@@ -782,10 +779,12 @@ class BackendService(PolicyKitService):
  	    raise AccessDeniedException
  
          if 'enable' == action:
@@ -144,3 +109,39 @@ Index: gnome_lirc_properties/backend.py
  
          else:
              args = '/etc/init.d/lirc', action
+diff --git a/gnome_lirc_properties/config.py.in b/gnome_lirc_properties/config.py.in
+index eeeda1c..0fd3f69 100644
+--- a/gnome_lirc_properties/config.py.in
++++ b/gnome_lirc_properties/config.py.in
+@@ -13,7 +13,7 @@ PACKAGE_DIR           = path.join('@prefix@', 'share', '@PACKAGE@')
+ LIRC_CONFDIR          = '@with_lirc_confdir@'
+ LIRCD_SOCKET          = '@with_lircd_socket@'
+ 
+-LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
++LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
+ LIRC_REMOTE_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
+ LIRC_DAEMON_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf')
+ 
+diff --git a/gnome_lirc_properties/ui/RemoteControlProperties.py b/gnome_lirc_properties/ui/RemoteControlProperties.py
+index e65af35..f6e3fd4 100644
+--- a/gnome_lirc_properties/ui/RemoteControlProperties.py
++++ b/gnome_lirc_properties/ui/RemoteControlProperties.py
+@@ -296,13 +296,13 @@ class RemoteControlProperties(object):
+         #
+         # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
+         # receiver settings in "hardware.conf", whereas we have to. For that
+-        # reason the device node's name is stored in REMOTE_DEVICE, instead
++        # reason the device node's name is stored in LIRC_DEVICE, instead
+         # of RECEIVER_DEVICE.
+         #
+         self.selected_receiver = (
+             settings.get('RECEIVER_VENDOR'),
+             settings.get('RECEIVER_MODEL'),
+-            settings.get('REMOTE_DEVICE'),
++            settings.get('LIRC_DEVICE'),
+         )
+ 
+         # Try to select configured remote vendor:
+-- 
+1.6.2.5
+


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/gnome-lirc-properties.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnome-lirc-properties.spec	30 Jun 2009 11:56:23 -0000	1.19
+++ gnome-lirc-properties.spec	15 Sep 2009 10:13:30 -0000	1.20
@@ -1,13 +1,12 @@
-%define		_default_patch_fuzz 2
 %define		polkit_minver 0.8-3
-%define		lirc_ver 0.8.4-2
+%define		lirc_ver 0.8.6-1
 
 # Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gnome-lirc-properties
-Version:	0.3.1
-Release:	4%{?dist}
+Version:	0.4.0
+Release:	1%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
@@ -15,18 +14,7 @@ License:	GPLv2+
 URL:		http://svn.gnome.org/svn/gnome-lirc-properties/trunk
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-lirc-properties/0.2/%{name}-%{version}.tar.gz
 # http://bugzilla.gnome.org/show_bug.cgi?id=530359 and blockers
-# http://bugzilla.gnome.org/show_bug.cgi?id=540897
-# and We have the patches in a 0.8.3 version in Fedora
 Patch0:		glp-fedora-support.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=556585
-Patch1:		glp-dont-use-fluendo-remotes.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=467340
-# http://bugzilla.gnome.org/show_bug.cgi?id=557429
-Patch2:		glp-remove-snapstream.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=563853
-Patch3:		new-dbus-auth.patch
-# http://git.gnome.org/cgit/gnome-lirc-properties/commit/?id=1f4673de56facbefbed6adb9465c358fbe93b0bc
-Patch4:		fix-default-config-name-quoting.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -51,10 +39,6 @@ the LIRC framework.
 %prep
 %setup -q
 %patch0 -p0 -b .fedora
-%patch1 -p0 -b .no-fluendo-remotes
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
 
 %build
 %configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir} --with-remotes-database=%{_datadir}/lirc-remotes/
@@ -105,6 +89,10 @@ fi
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
+- Update to 0.4.0
+- Drop upstreamed patches
+
 * Tue Jun 30 2009 Bastien Nocera <bnocera at redhat.com> 0.3.1-4
 - Add D-Bus patch to allow the front-end to run
 - Fix overly enthusiastic quoting


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 17:32:34 -0000	1.4
+++ sources	15 Sep 2009 10:13:30 -0000	1.5
@@ -1 +1 @@
-6bb73e97ec08969c27d59cf578bc349f  gnome-lirc-properties-0.3.1.tar.gz
+672a58a3d80fa0573527381db5dd14f9  gnome-lirc-properties-0.4.0.tar.gz


--- fix-default-config-name-quoting.patch DELETED ---


--- glp-dont-use-fluendo-remotes.patch DELETED ---


--- glp-remove-snapstream.patch DELETED ---


--- new-dbus-auth.patch DELETED ---



From harald at fedoraproject.org  Tue Sep 15 10:27:07 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 15 Sep 2009 10:27:07 +0000 (UTC)
Subject: rpms/readahead/devel readahead-1.5.1-noconsole.patch, NONE,
	1.1 readahead.spec, 1.60, 1.61
Message-ID: <20090915102707.798A911C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23227

Modified Files:
	readahead.spec 
Added Files:
	readahead-1.5.1-noconsole.patch 
Log Message:
* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 1.5.1-2
- remove console owner from collector (gets killed by SIGHUP)


readahead-1.5.1-noconsole.patch:
 readahead-collector.event |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE readahead-1.5.1-noconsole.patch ---
diff -up readahead-1.5.1/scripts/readahead-collector.event.noconsole readahead-1.5.1/scripts/readahead-collector.event
--- readahead-1.5.1/scripts/readahead-collector.event.noconsole	2009-09-15 12:23:46.000000000 +0200
+++ readahead-1.5.1/scripts/readahead-collector.event	2009-09-15 12:25:17.000000000 +0200
@@ -8,8 +8,6 @@ stop on started prefdm
 stop on stopped rc[234]
 stop on runlevel [16]
 
-console owner
-
 kill timeout 60
 
 script


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- readahead.spec	14 Sep 2009 15:17:49 -0000	1.60
+++ readahead.spec	15 Sep 2009 10:27:06 -0000	1.61
@@ -1,11 +1,12 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
+Patch1: 	readahead-1.5.1-noconsole.patch
 
 URL: 		https://fedorahosted.org/readahead/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +27,7 @@ needed. Its goal is to speed up the boot
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --sbindir=/sbin
@@ -68,6 +70,9 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 1.5.1-2
+- remove console owner from collector (gets killed by SIGHUP)
+
 * Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.1-1
 - readahead-1.5.1
 - add syslog() to collector



From rjones at fedoraproject.org  Tue Sep 15 10:35:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 10:35:03 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.29, 1.30 libguestfs.spec, 1.65, 
	1.66 sources, 1.29, 1.30
Message-ID: <20090915103503.954E711C00CE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25902

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
Version 1.0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	15 Sep 2009 09:05:04 -0000	1.29
+++ .cvsignore	15 Sep 2009 10:35:03 -0000	1.30
@@ -1 +1 @@
-libguestfs-1.0.69.tar.gz
+libguestfs-1.0.70.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- libguestfs.spec	15 Sep 2009 09:05:04 -0000	1.65
+++ libguestfs.spec	15 Sep 2009 10:35:03 -0000	1.66
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.69
+Version:     1.0.70
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -536,6 +536,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-1
+- New upstream release 1.0.70.
+- Fixes build problem related to old version of GNU gettext.
+
 * Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.69-1
 - New upstream release 1.0.69.
 - New main loop code should fix RHBZ#501888, RHBZ#504418.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	15 Sep 2009 09:05:04 -0000	1.29
+++ sources	15 Sep 2009 10:35:03 -0000	1.30
@@ -1 +1 @@
-e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz
+31de0cb2ac480cbb4a1c7398f2963caf  libguestfs-1.0.70.tar.gz



From rjones at fedoraproject.org  Tue Sep 15 10:35:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 10:35:17 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.35, 1.36 libguestfs.spec, 1.60, 
	1.61 sources, 1.35, 1.36
Message-ID: <20090915103517.1AD2A11C00CE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25449

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
Version 1.0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	15 Sep 2009 09:05:04 -0000	1.35
+++ .cvsignore	15 Sep 2009 10:35:16 -0000	1.36
@@ -1 +1 @@
-libguestfs-1.0.69.tar.gz
+libguestfs-1.0.70.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- libguestfs.spec	15 Sep 2009 09:05:04 -0000	1.60
+++ libguestfs.spec	15 Sep 2009 10:35:16 -0000	1.61
@@ -533,6 +533,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-1
+- New upstream release 1.0.70.
+- Fixes build problem related to old version of GNU gettext.
+
 * Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.69-1
 - New upstream release 1.0.69.
 - New main loop code should fix RHBZ#501888, RHBZ#504418.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	15 Sep 2009 09:05:04 -0000	1.35
+++ sources	15 Sep 2009 10:35:16 -0000	1.36
@@ -1 +1 @@
-e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz
+31de0cb2ac480cbb4a1c7398f2963caf  libguestfs-1.0.70.tar.gz



From rjones at fedoraproject.org  Tue Sep 15 10:35:22 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 10:35:22 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.48, 1.49 libguestfs.spec, 1.96, 
	1.97 sources, 1.48, 1.49
Message-ID: <20090915103522.3285F11C00CE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25490

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
Version 1.0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	15 Sep 2009 09:05:01 -0000	1.48
+++ .cvsignore	15 Sep 2009 10:35:21 -0000	1.49
@@ -1 +1 @@
-libguestfs-1.0.69.tar.gz
+libguestfs-1.0.70.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- libguestfs.spec	15 Sep 2009 09:05:02 -0000	1.96
+++ libguestfs.spec	15 Sep 2009 10:35:21 -0000	1.97
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.69
+Version:     1.0.70
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -537,6 +537,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-1
+- New upstream release 1.0.70.
+- Fixes build problem related to old version of GNU gettext.
+
 * Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.69-1
 - New upstream release 1.0.69.
 - Reenable the tests (because RHBZ#516543 is supposed to be fixed).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	15 Sep 2009 09:05:02 -0000	1.48
+++ sources	15 Sep 2009 10:35:21 -0000	1.49
@@ -1 +1 @@
-e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz
+31de0cb2ac480cbb4a1c7398f2963caf  libguestfs-1.0.70.tar.gz



From rjones at fedoraproject.org  Tue Sep 15 10:36:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 15 Sep 2009 10:36:27 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.61,1.62
Message-ID: <20090915103627.B578E11C00CE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26579

Modified Files:
	libguestfs.spec 
Log Message:
Version 1.0.70.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- libguestfs.spec	15 Sep 2009 10:35:16 -0000	1.61
+++ libguestfs.spec	15 Sep 2009 10:36:27 -0000	1.62
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.69
+Version:     1.0.70
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries



From hadess at fedoraproject.org  Tue Sep 15 10:48:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 10:48:52 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 totem-pl-parser.spec, 1.43, 1.44
Message-ID: <20090915104852.8D08911C00CE@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-serv30980

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-1
- Update to 2.27.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	23 Jul 2009 19:35:20 -0000	1.23
+++ .cvsignore	15 Sep 2009 10:48:51 -0000	1.24
@@ -1 +1 @@
-totem-pl-parser-2.27.2.tar.bz2
+totem-pl-parser-2.27.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	23 Jul 2009 19:35:20 -0000	1.23
+++ sources	15 Sep 2009 10:48:52 -0000	1.24
@@ -1 +1 @@
-65fe6b0f523e4d90fda97736bbdaf637  totem-pl-parser-2.27.2.tar.bz2
+f01c54af09eeb65950a9b339e150978f  totem-pl-parser-2.27.92.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- totem-pl-parser.spec	8 Sep 2009 15:25:24 -0000	1.43
+++ totem-pl-parser.spec	15 Sep 2009 10:48:52 -0000	1.44
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
-Version:	2.27.2
-Release:	4%{?dist}
+Version:	2.27.92
+Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-1
+- Update to 2.27.92
+
 * Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
 - Version Obsoletes for totem-devel (#520874)
 



From jgu at fedoraproject.org  Tue Sep 15 11:15:00 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 15 Sep 2009 11:15:00 +0000 (UTC)
Subject: rpms/dvipdfmx/F-11 dvipdfmx-20080617-ebb-to-ebbx.patch,1.1,NONE
Message-ID: <20090915111500.E4EF311C00CE@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7964

Removed Files:
	dvipdfmx-20080617-ebb-to-ebbx.patch 
Log Message:
Remove dvipdfmx-20080617-ebb-to-ebbx.patch


--- dvipdfmx-20080617-ebb-to-ebbx.patch DELETED ---



From varekova at fedoraproject.org  Tue Sep 15 11:41:24 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 11:41:24 +0000 (UTC)
Subject: rpms/man-pages-cs/devel man-pages-cs-01.patch, NONE,
	1.1 man-pages-cs-02.patch, NONE, 1.1 man-pages-cs-03.patch, NONE,
	1.1 man-pages-cs.spec, 1.25,
	1.26 man-pages-0.18.20090209-inst.patch, 1.1, NONE
Message-ID: <20090915114124.C8ED311C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-cs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18338

Modified Files:
	man-pages-cs.spec 
Added Files:
	man-pages-cs-01.patch man-pages-cs-02.patch 
	man-pages-cs-03.patch 
Removed Files:
	man-pages-0.18.20090209-inst.patch 
Log Message:
- fix instalation part
- remove duplicate files
- add patches created by Ludek Dolihal



man-pages-cs-01.patch:
 at/at.1                  |    9 ++++
 at/atrun.8               |    3 +
 man-pages/man1/diff.1    |   18 ++++++++-
 man-pages/man3/atexit.3  |   90 +++++++++++++++++++++++++++++++++++++++++------
 man-pages/man4/console.4 |    3 +
 man-pages/man4/mem.4     |    3 +
 man-pages/man4/mouse.4   |    3 +
 man-pages/man4/null.4    |    3 +
 man-pages/man4/ram.4     |    3 +
 man-pages/man4/ttyS.4    |    3 +
 man-pages/man7/svipc.7   |    3 +
 11 files changed, 121 insertions(+), 20 deletions(-)

--- NEW FILE man-pages-cs-01.patch ---
diff -up man-pages-cs-0.18.20090209/at/at.1.pom man-pages-cs-0.18.20090209/at/at.1
--- man-pages-cs-0.18.20090209/at/at.1.pom	2009-02-07 21:39:05.000000000 +0100
+++ man-pages-cs-0.18.20090209/at/at.1	2009-09-15 12:37:35.000000000 +0200
@@ -4,7 +4,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AT 1 "Nov 1996" local "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle at-3.1.10-26 z distribuce Fedora 10
+.TH AT 1 "Sep 2009" local "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 at, batch, atq, atrm \- umis?uje do fronty, zobrazuje ?i ma?e ?lohy
 ur?en? pro pozd?j?? proveden?
@@ -125,6 +126,12 @@ Zobrazen? ?as bude ve form?tu "Thu Fe
 .TP 
 \fB\-c\fP
 vyp??e ?lohy z p??kazov? ??dky na standardn? v?stup.
+.TP
+\fB\-t\fP time_arg
+Napl?nuje ?lohu na spu?t?n? v ?ase specifikovan?m argumentem \fBtime_arg\fP.^ 
+Ten mus? m?t stejn? form?t, jako parametr \fB -t \fP utility \fBtouch(1)\fP^ 
+([[CC]YY]MMDDhhmm).
+.TP
 .SH SOUBORY
 \fI/var/spool/cron/atjobs\fP
 .br
diff -up man-pages-cs-0.18.20090209/at/atrun.8.pom man-pages-cs-0.18.20090209/at/atrun.8
--- man-pages-cs-0.18.20090209/at/atrun.8.pom	2009-02-07 21:39:25.000000000 +0100
+++ man-pages-cs-0.18.20090209/at/atrun.8	2009-09-15 12:37:35.000000000 +0200
@@ -4,7 +4,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH ATRUN 8 "Nov 1996" local "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle at-3.1.10-26 z distribuce Fedora 10
+.TH ATRUN 8 "Sep 2008" local "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 atrun \- spou?t? ?lohy, kter? ?ekaj? ve front? na pozd?j??
 proveden?
diff -up man-pages-cs-0.18.20090209/man-pages/man1/diff.1.pom man-pages-cs-0.18.20090209/man-pages/man1/diff.1
--- man-pages-cs-0.18.20090209/man-pages/man1/diff.1.pom	2006-05-20 03:40:49.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man1/diff.1	2009-09-15 12:37:35.000000000 +0200
@@ -3,7 +3,8 @@
 .\"
 .\" Derived from the GNU diff info page.
 .\" May be distributed under the GPL.
-.TH DIFF 1 22.z??? 1993 "N?stroje GNU" "N?stroje GNU"
+.\" Aktualizov?no podle diffutils-2.8.1-21 z distribuce Fedora 10
+.TH DIFF 1 3.z??? 2009 "N?stroje GNU" "N?stroje GNU"
 .SH JM?NO
 diff \- najde rozd?ly mezi dv?ma soubory
 .SH POU?IT?
@@ -331,6 +332,21 @@ P?i porovn?v?n? adres??? za?ne s
 .IR soubor .
 To se pou??v? pro obnoven? p?eru?en?ho porovn?v?n?.
 .TP
+.BI \-\-from\-file= soubor
+Porovn?
+.I soubor
+se v?emi operandy.
+.I soubor
+m??e b?t adres??.
+.TP
+.BI \-\-to\-file= soubor
+Porovn?
+v?echny operandy se
+.I soubor\fRem.
+.I soubor
+m??e b?t adres??.
+
+.TP
 .B \-\-sdiff\-merge\-assist
 Vyp??e dal?? informace pro pomoc programu
 .IR sdiff .
diff -up man-pages-cs-0.18.20090209/man-pages/man3/atexit.3.pom man-pages-cs-0.18.20090209/man-pages/man3/atexit.3
--- man-pages-cs-0.18.20090209/man-pages/man3/atexit.3.pom	1999-05-31 19:28:30.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/atexit.3	2009-09-15 12:45:23.000000000 +0200
@@ -1,4 +1,5 @@
-.TH ATEXIT 3  "26.prosince 1996" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ATEXIT 3  "3.z??? 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -16,16 +17,85 @@ vyvol?ny p?i norm?ln?m ukon?en? pr
 nebo n?vratem z funkce \fBmain\fP.
 Funkce takto registrovan? jsou vol?ny v obr?cen?m po?ad? jejich registrace;
 nejsou jim poskytnuty ??dn? argumenty.
+
+
+
+POSIX.1-2001 vy?aduje, aby implementace dovolovala minim?ln?
+\fB ATEXIT_MAX \fP
+(32)  registrac? takov?chto funkc?. Skute?n? po?et mo?n?ch registrac?
+podporovan?ch v dan? implementaci je mo?n? zjistit pomoc?
+\fBsysconf \fP
+(3).
+
+P?i vytvo?en? procesu pomoc? \fB fork\fP
+(2), zd?d? potomek registrace sv?ch rodi??.
+P?i ?sp??n?m vol?n? funkce
+\fBexec
+\fP(3), jsou v?echny registrace odstran?ny.
+
 .SH N?VRATOV? HODNOTA
 Funkce \fBatexit()\fP vrac? hodnotu 0, byla-li ?sp??n?, jinak je vr?cena
-hodnota -1 a glob?ln? prom?nn? \fIerrno\fP je nastavena k indikaci chyby.
-.SH CHYBY
-.TP 
-.B ENOMEM
-Nen? k dispozici pot?ebn? mno?stv? pam?ti pro p?id?n? funkce.
+nenulov? hodnota.
 .SH SPL?UJE STANDARDY
-SVID 3, BSD 4.3, ISO 9899 
+SVr4, BSD 4.3, C89, C99, POSIX.1-2001
+.SH POZN?MKA
+Funkce registrovan? pomoc? \fB atexit\fP() (a \fBon_exit\fP()) nejsou vol?ny, pokud
+je proces abnorm?ln? ukon?en, nap??klad kv?li doru?en? sign?lu.
+
+\fB Linuxov? pozn?mka\fP
+
+
+
+Od verze glibc 2.2.3, mohou b?t \fBatexit\fP() (a \fB on_exit\fP()) pou?ity uvnit? sd?len?ch knihoven,
+aby spou?t?ly funkce, kter? jsou vol?ny, je-li knihovna uvoln?na z pam?ti.
+
+.SH P??KLAD
+#include <stdio.h>
+.br
+#include <stdlib.h>
+.br
+#include <unistd.h>
+.br
+.sp
+void
+.br
+bye(void)
+.br
+{
+.br
+	printf("That was all, folks \n");
+.br
+}
+.br
+.sp
+int
+.br
+main(void)
+.br
+{
+.br
+	long a;
+.br
+	int i;
+.br
+.sp
+	a=sysconf(_SC_ATEXIT_MAX);
+.br
+	printf("ATEXIT_MAX = %ld\n", a);
+.br
+.sp
+	i=atexit(bye);
+.br
+	if(i != 0) {
+.br
+		fprintf(stderr, "cannot set exit functoin\n");
+.br
+		exit(EXIT_FAILURE);
+.br
+	}
+.br
+	exit(EXIT_SUCCESS);
+.br
+}
 .SH DAL?? INFORMACE
-.BR exit "(3), " on_exit (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR _exit "(2), " exit "(3), " on_exit (3)
diff -up man-pages-cs-0.18.20090209/man-pages/man4/console.4.pom man-pages-cs-0.18.20090209/man-pages/man4/console.4
--- man-pages-cs-0.18.20090209/man-pages/man4/console.4.pom	2009-02-09 01:15:05.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man4/console.4	2009-09-15 12:37:35.000000000 +0200
@@ -12,7 +12,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH CONSOLE 4 1994\-10\-31 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH CONSOLE 4 2009\-09\-03 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 console \- konzola a virtu?ln? konzoly
 .SH POPIS
diff -up man-pages-cs-0.18.20090209/man-pages/man4/mem.4.pom man-pages-cs-0.18.20090209/man-pages/man4/mem.4
--- man-pages-cs-0.18.20090209/man-pages/man4/mem.4.pom	2009-02-09 01:15:06.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man4/mem.4	2009-09-15 12:37:35.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH MEM 4 1992\-11\-21 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH MEM 4 2009\-03\-09 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 mem, kmem, port \- syst?mov? pam??, pam?? j?dra a syst?mov? porty
 .SH POPIS
diff -up man-pages-cs-0.18.20090209/man-pages/man4/mouse.4.pom man-pages-cs-0.18.20090209/man-pages/man4/mouse.4
--- man-pages-cs-0.18.20090209/man-pages/man4/mouse.4.pom	2009-02-09 01:15:07.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man4/mouse.4	2009-09-15 12:37:35.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH MOUSE 4 1996\-02\-10 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH MOUSE 4 2009\-09\-03 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 mouse \- rozhran? pro s?riovou my?
 .SH KONFIGURACE
diff -up man-pages-cs-0.18.20090209/man-pages/man4/null.4.pom man-pages-cs-0.18.20090209/man-pages/man4/null.4
--- man-pages-cs-0.18.20090209/man-pages/man4/null.4.pom	2009-02-09 01:15:06.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man4/null.4	2009-09-15 12:37:35.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH NULL 4 1992\-11\-21 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH NULL 4 2009\-09\-03 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 null, zero \- "propadli?t?" dat
 .SH POPIS
diff -up man-pages-cs-0.18.20090209/man-pages/man4/ram.4.pom man-pages-cs-0.18.20090209/man-pages/man4/ram.4
--- man-pages-cs-0.18.20090209/man-pages/man4/ram.4.pom	2009-02-09 01:15:06.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man4/ram.4	2009-09-15 12:37:35.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH RAM 4 1992\-11\-21 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH RAM 4 2009\-09\-03 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 ram \- za??zen? ramdisku
 .SH POPIS
diff -up man-pages-cs-0.18.20090209/man-pages/man4/ttyS.4.pom man-pages-cs-0.18.20090209/man-pages/man4/ttyS.4
--- man-pages-cs-0.18.20090209/man-pages/man4/ttyS.4.pom	2009-02-09 01:15:07.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man4/ttyS.4	2009-09-15 12:37:35.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH TTYS 4 1992\-12\-19 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH TTYS 4 2009\-09\-03 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 ttys \- s?riov? termin?lov? linky
 .SH POPIS
diff -up man-pages-cs-0.18.20090209/man-pages/man7/svipc.7.pom man-pages-cs-0.18.20090209/man-pages/man7/svipc.7
--- man-pages-cs-0.18.20090209/man-pages/man7/svipc.7.pom	2009-02-09 01:15:15.000000000 +0100
+++ man-pages-cs-0.18.20090209/man-pages/man7/svipc.7	2009-09-15 12:37:35.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH SVIPC 7 1993\-11\-01 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SVIPC 7 2009\-09\-03 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 svipc \- System V meziprocesov? komunika?n? mechanismus
 .SH POU?IT?

man-pages-cs-02.patch:
 man2/_exit.2      |   50 +++++++---
 man2/socketcall.2 |   13 ++
 man3/abort.3      |   21 ++--
 man3/fpathconf.3  |    6 -
 man3/on_exit.3    |   20 +++-
 man3/sysconf.3    |  261 +++++++++++++++++++++++++++++++-----------------------
 man5/charmap.5    |    3 
 man5/group.5      |    3 
 man5/issue.5      |    3 
 man5/motd.5       |    3 
 man5/shells.5     |    3 
 11 files changed, 238 insertions(+), 148 deletions(-)

--- NEW FILE man-pages-cs-02.patch ---
diff -ur man-pages-cs-orig/man-pages/man2/_exit.2 man-pages-cs-new/man-pages/man2/_exit.2
--- man-pages-cs-orig/man-pages/man2/_exit.2	1999-05-31 19:28:27.000000000 +0200
+++ man-pages-cs-new/man-pages/man2/_exit.2	2009-09-04 13:56:24.000000000 +0200
@@ -1,12 +1,23 @@
-.TH _EXIT 2 "26. prosince 1996" Linux "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH _EXIT 2 "3. z??? 2009" Linux "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-_exit \- ukon?i pr?v? prob?haj?c? proces
+_exit, _Exit \- ukon?i pr?v? prob?haj?c? proces
 .SH SYNTAXE
 .B #include <unistd.h>
 .sp
 .BI "void _exit(int " status );
+.sp
+.B #include <stdlib.h>
+.sp
+.BI "void _Exit(int " status );
+.sp
+Vy?aduje Feature Test Macro pro glibc (viz \fB feature-test-macros\fP(7)):
+.sp
+\fB _Exit\fP(): _XOPEN_SOURCE >= 600 || _ISOC99_SOURCE; nebo
+.I cc -std=c99
+.br
 .SH POPIS
 .B _exit
 okam?it? ukon?? volaj?c? proces. V?echny otev?en? deskriptory soubor?, kter?
@@ -18,19 +29,30 @@
 je vr?cen rodi?i jako n?vratov? k?d, a m??e b?t pou?it n?kterou funkc?
 z rodiny
 .B wait.
+
+Funkce \fB _Exit\fP() je shodn? s funkc? \fB_exit\fP().
+.sp
+
 .SH N?VRATOV? HODNOTA
-.B _exit
-se nikdy nevr?t?, okam?it? ukon?? proces.
+Funkce nic nevrac?.
+
 .SH SPL?UJE STANDARDY
-SVID, AT&T, POSIX, X/OPEN, BSD 4.3
+SVr4, POSIX.1-2001, 4.3BSD.. Funkce \fB_EXIT\fP() byla uvedena v C99.
 .SH POZN?MKY
-.B _exit
-nevol? ??dn? funkce registrovan? ANSI C funkc? 
-.B atexit
-a ani nevypr?zdn? standardn? vstupn? v?stupn? buffery. Tyto operace prov?d? 
-.BR exit (3).
+Pro dal?? informace o efektech funkce exit, jako nap??klad p?enos n?vratov?ho stavu,
+zombie procesy, zas?l?n? sign?l?, viz. \fBexit\fP(3).
+
+Funkce \fB_exit\fP() pracuje podobn? jako \fBexit\fP(3), ale nevol? ??dn? funkce registrovan? v
+\fBatexit\fP(3) nebo \fBon_exit\fP(3). To, zda ma?e standardn? vstup, v?stupn? z?sobn?ky
+a odstra?uje do?asn? soubory vytvo?en? pomoc? \fBtmpfile\fP(3) je z?visl? na implementaci.
+Na druhou stranu \fB_exit\fP() zav?r? otev?en? file descriptory, co? m??e zp?sobit zpo?d?n?, ?ek?-li
+se na dokon?en? zah?jen?ho p?enosu. Pokud je ?ek?n? ne??douc?, je vhodn? zavolat funkce jako \fBtcflush\fP(3)
+p?ed t?m, ne? zavol?me \fB_exit\fP(). Zda bude n?jak? zah?jen? vstupn? v?stupn? operace zru?ena a kter? to p??padn? bude,
+je implementa?n? z?visl?.
+
 .SH DAL?? INFORMACE
-.BR fork "(2), " execve "(2), " waitpid "(2), " wait4 "(2), " kill "(2), "
-.BR wait "(3), " exit (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR execve "(2), " exit_group "(2), " fork " (2),  " kill "(2), " wait "(2), " wait4 "(2), " waitpid "(2),
+.BR   atexit " (3), " exit " (3), " onexit " (3), " terminos "(3)
+.SH TIR??
+Tato str?nka je sou??st? vyd?n? linuxov?ch manu?lov?ch str?nek verze 3.09. popis projektu a informace o zp?sobu oznamov?n?
+chyb v dokumentaci najdete na: http://www.kernel.org/doc/man-pages/.
diff -ur man-pages-cs-orig/man-pages/man2/socketcall.2 man-pages-cs-new/man-pages/man2/socketcall.2
--- man-pages-cs-orig/man-pages/man2/socketcall.2	2001-10-22 22:53:29.000000000 +0200
+++ man-pages-cs-new/man-pages/man2/socketcall.2	2009-09-04 13:57:00.000000000 +0200
@@ -2,6 +2,7 @@
 .\"
 .\" Copyright (c) 1995 Michael Chastain (mec at shell.portal.com), 15 April 1995.
 .\" P?elo?il Doubek V?clav, 06/2001
+.\" Aktualizoval Dol?hal Lud?k, 09/2009
 .\"
 .\" Tato dokumentace je voln? ?i?iteln?; m??ete ji voln? distribuovat a
 .\" upravovat v souladu s podm?nkami GNU General Public Licence
@@ -24,6 +25,7 @@
 .\" USA.
 .\"
 .\" Upraveno Tue Oct 22 22:11:53 1996 by Eric S. Raymond <esr at thyrsus.com>
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
 .TH IPC 2 "15 April 1995" "Linux 1.2.4" "Linux Programmer's Manual"
 .SH NAME
 socketcall \- socketov? syst?mov? vol?n?
@@ -46,6 +48,10 @@
 .SH "POZN?MKA"
 Toto vol?n? je specifick? pro Linux, a nem?lo by b?t pou??v?no v
 p?enositeln?ch programech ur?en?ch i pro jin? platformy.
+.sp
+Na n?kter?ch architektur?ch (jako nap??klad ia64) neexistuje
+\fBsocketcall\fP(), jeho funkci zde zastupuj? \fB socket\fP(2),
+\fBaccept\fP(2), \fBbind\fP(2).
 .SH "VIZ TAK?"
 .BR accept (2),
 .BR bind (2),
@@ -55,8 +62,10 @@
 .BR getsockopt (2),
 .BR listen (2),
 .BR recv (2),
+.BR recvmsg (2),
 .BR recvfrom (2),
 .BR send (2),
+.BR sendmsg (2),
 .BR sendto (2),
 .BR setsockopt (2),
 .BR shutdown (2),
@@ -64,5 +73,6 @@
 .BR socketpair (2)
 .SH P?ELO?IL
 V?clav Doubek (vaclav.doubek at pslib.cz)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? vyd?n? linuxov?ch manu?lov?ch str?nek verze 3.09. popis projektu a informace o zp?sobu oznamov?n?
+chyb v dokumentaci najdete na: http://www.kernel.org/doc/man-pages/.
diff -ur man-pages-cs-orig/man-pages/man3/abort.3 man-pages-cs-new/man-pages/man3/abort.3
--- man-pages-cs-orig/man-pages/man3/abort.3	1999-05-31 19:28:29.000000000 +0200
+++ man-pages-cs-new/man-pages/man3/abort.3	2009-09-04 13:58:03.000000000 +0200
@@ -1,4 +1,5 @@
-.TH ABORT 3  "26.prosince 1996" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ABORT 3  "3.z??? 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -11,18 +12,20 @@
 .fi
 .SH POPIS
 Funkce \fBabort()\fP zp?sob? abnorm?ln? ukon?en? procesu, pouze je-li
-sign?l SIGABORT zachycen a ovlada? tohoto sign?lu se nevr?t?, nedojde k jeho
-ukon?en?.
+sign?l \fBSIGABRT\fP zachycen a ovlada? tohoto sign?lu se nevr?t?, nedojde k jeho
+ukon?en?(viz. \fBlongjmp\fP(3)).
 Jestli?e funkce \fBabort()\fP zp?sob? ukon?en? programu, v?echny otev?en?
 proudy jsou vypr?zdn?ny a uzav?eny.
 .PP
-Je-li sign?l SIGABORT blokov?n nebo ignorov?n, funkce \fBabort()\fP
-jej i p?esto p?ekryje.
+Je-li sign?l \fBSIGABRT\fP blokov?n nebo ignorov?n, funkce \fBabort()\fP
+jej i p?esto p?ekryje a ukon?? proces. To je zap???in?no t?m, ?e funkce obnov? p?vodn? zpracov?n? \fBSIGABRT\fP
+a znovu vyvol? sign?l.
 .SH N?VRATOV? HODNOTA
 Funkce \fBabort()\fP se nikdy nevrac?.
 .SH SPL?UJE STANDARDY
-SVID 3, POSIX, BSD 4.3, ISO 9899
+SVr4, POSIX.1-2001, 4.3BSD, C89, C99
 .SH DAL?? INFORMACE
-.BR sigaction "(2), " exit (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR gdb " (1), " sigaction "(2), " exit "(3), " longjmp "(3), " raise "(3)
+.SH TIR??
+Tato str?nka je sou??st? vyd?n? linuxov?ch manu?lov?ch str?nek verze 3.09. popis projektu a informace o zp?sobu oznamov?n?
+chyb v dokumentaci najdete na: http://www.kernel.org/doc/man-pages/.
diff -ur man-pages-cs-orig/man-pages/man3/fpathconf.3 man-pages-cs-new/man-pages/man3/fpathconf.3
--- man-pages-cs-orig/man-pages/man3/fpathconf.3	1999-05-31 19:28:32.000000000 +0200
+++ man-pages-cs-new/man-pages/man3/fpathconf.3	2009-09-04 13:58:23.000000000 +0200
@@ -1,3 +1,4 @@
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
 .TH FPATHCONF 3  "26.prosince 1996" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
@@ -131,5 +132,6 @@
 N?kter? vr?cen? hodnoty mohou b?t velk?, nehod? se k alokov?n? pam?ti.
 .SH DAL?? INFORMACE
 .BR getconf "(1), " statfs "(2), " open "(2), " sysconf (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? vyd?n? linuxov?ch manu?lov?ch str?nek verze 3.09. popis projektu a informace o zp?sobu oznamov?n?
+chyb v dokumentaci najdete na: http://www.kernel.org/doc/man-pages/.
diff -ur man-pages-cs-orig/man-pages/man3/on_exit.3 man-pages-cs-new/man-pages/man3/on_exit.3
--- man-pages-cs-orig/man-pages/man3/on_exit.3	1999-05-31 19:28:33.000000000 +0200
+++ man-pages-cs-new/man-pages/man3/on_exit.3	2009-09-04 13:58:41.000000000 +0200
@@ -1,3 +1,4 @@
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
 .TH ON_EXIT 3  "26.prosince 1996" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
@@ -9,6 +10,12 @@
 .sp
 .BI "int on_exit(void (*" function ")(int , void *), void *" arg );
 .fi
+.sp
+Vy?aduje Feature Test Makro pro glibc (viz \fB feature_test_macros\fP(7)):
+.br
+.sp
+\fB on_exit\fP(): _BSD_SOURCE || _SVID_SOURCE
+.br
 .SH POPIS
 Funkce \fBon_exit()\fP za?ad? funkci \fIfunction\fP do seznamu funkc?, kter?
 se maj? vyvolat p?i ukon?en? programu, a? ji? funkc?
@@ -18,9 +25,12 @@
 .BR exit (3)
 a argument \fIarg\fP z funkce \fBon_exit()\fP.
 .SH N?VRATOV? HODNOTA
-Funkce \fBon_exit()\fP vrac? hodnotu 0, byla-li ?sp??n?, jinak vrac? hodnotu
--1.
+Funkce \fBon_exit()\fP vrac? hodnotu 0, byla-li ?sp??n?, jinak vrac? nenulovou hodnotu.
+.SH SPL?UJE STANDARDY
+Tato funkce poch?z? ze SunOS 4, ale je tak? v libc4, libc5 a glibc. Na Solarisu (od verze SunOS 5) se ji? d?le nevyskytuje.
+Vyhn?te se pros?m t?to funkci a rad?ji pou??vejte standard \fB atexit\fP(3).
 .SH DAL?? INFORMACE
-.BR exit "(3), " atexit (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR exit "(3), "_exit "(2),  " atexit (3)
+.SH TIR??
+Tato str?nka je sou??st? vyd?n? linuxov?ch manu?lov?ch str?nek verze 3.09. popis projektu a informace o zp?sobu oznamov?n?
+chyb v dokumentaci najdete na: http://www.kernel.org/doc/man-pages/.
diff -ur man-pages-cs-orig/man-pages/man3/sysconf.3 man-pages-cs-new/man-pages/man3/sysconf.3
--- man-pages-cs-orig/man-pages/man3/sysconf.3	1999-05-31 19:28:33.000000000 +0200
+++ man-pages-cs-new/man-pages/man3/sysconf.3	2009-09-04 13:59:16.000000000 +0200
@@ -1,4 +1,5 @@
-.TH SYSCONF 3  "26.prosince 1996" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SYSCONF 3  "4.z??? 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -10,168 +11,205 @@
 .BI "long sysconf(int " "name" ");"
 .fi
 .SH POPIS
-.B sysconf()
-poskytuje aplikaci mo?nost, jak z?skat hodnoty syst?mov?ch omezen? nebo
-voleb za b?hu.
-.PP
-Ekvivalentn? makra definovan? v 
-.B <unistd.h>
-mohou poskytnout pouze informativn? hodnoty; jestli?e aplikace bude cht?t
-vyu??t hodnot, kter? se mohou m?nit, je l?pe pou??t vol?n?
-.B sysconf()
-, kter? vr?t? aktu?ln? hodnoty.
-.PP
-Limity, je? z?vis? na konkr?tn?m souboru lze z?skat pomoc? 
-.BR fpathconf() " or " pathconf() .
-.PP
-N?sleduj?c? hodnoty m??ete dosadit za
-.IR name .
-Nejd??ve POSIX.1 kompatibiln? hodnoty:
+POSIX dovoluje aplikaci v ?ase p?ekladu, nebo b?hu aplikace, testovat, zda jsou ur?it?
+volby podporov?ny, nebo jak? jsou hodnoty t?chto konfigurovateln?ch syst?mov?ch parametr?.
+.PP
+V ?ase p?ekladu se toto d?je pomoc? vlo?en?
+.I <unistd.h>
+a/nebo
+.I <limits.h>
+a testov?n? hodnot p??slu?n?ch maker.
+.PP
+V ?ase b?hu, se m??eme dotazovat na numerick? hodnoty pou?it?m
+funkce \fBsysconf\fP(). Pokud se budeme dotazovat na hodnoty,
+kter? jsou z?visl? na souborov?m syst?mu, je vhodn? pou??t vol?n?
+\fBfpathconf\fP(3) nebo \fBpathconf\fP(3). Pro dotazov?n? se
+na hodnoty ?et?zc? je vhodn? pou??t \fBconfstr\fP(3).
+.PP
+Hodnoty z?skan? z t?chto funkc? jsou syst?mov? konstanty. Nem?n?
+se po dobu ?ivota procesu.
+.PP
+Pro jednotliv? prom?nn? existuje obvykle konstanta \fB _POSIX_FOO\fP
+definovan? v
+.I <unistd.h>.
+Pokud definovan? nejsou, m??eme se dotazovat v dob? b?hu programu.
+Pokud je hodnota definov?na jako -1, potom
+nen? podporov?na. Pokud je definov?no na hodnotu 0, pak dan? funkce
+a hlavi?ky existuj?, nicm?n? mus?me se dotazovat v dob? b?hu programu, jak? stupe? podpory
+je k dispozici. Pokud je hodnota definov?na jinak ne? 0 nebo -1 pak je nastaveni podporov?no.
+Obvykle hodnota (jako nap??klad 200112L) signalizuje rok a m?s?c POSIXov? revize  popisuj?c?
+dan? nastaven?. Glibc pou??v? hodnotu 1 k signalizace podpory, proto?e POSIX standard je?t? st?le
+nebyl zapracov?n do Glibc. Argumentem  \fBsysconf\fP() bude  \fB_SC_FOO\fP.
+Pro seznam voleb viz  \fBposixoptions\fP(7).
+.PP
+
+Pro prom?nn?, nebo limity obvykle existuje konstanta  \fB_FOO\fP, kter? je definov?na v
+.I <limits.h>,
+nebo \fB_POSIC_FOO\fP, kterou lze nal?zt v
+.I <unistd.h>.
+Konstanta nebude definov?na, pokud nen? specifikov?n limit. Pokud je konstanta
+definov?na, definuje zaru?enou hodnotu a dokonce m??e b?t podporov?na i vy??? hodnota.
+Pokud chce aplikace vyu??vat hodnot, kter? se mohou m?nit mezi jednotliv?mi syst?my,
+m??e b?t vol?n  \fBsysconf\fP(). Argumentem  \fBsysconf\fP() bude  \fB_SC_FOO\fP.
+
+.SH PROM?NN? POSIX.1
+Uv?d?me jm?no prom?nn?, jm?no parametru funkce  \fBsysconf\fP(), kter? je pou??v?n pro dotazov?n? se
+na tuto hodnotu, a kr?tk? popis.
+.PP
+Nejd??ve prom?nn? kompatibiln? s POSIX.1.
 .TP
-.B _SC_ARG_MAX
+.B ARG_MAC - _SC_ARG_MAX
 Maxim?ln? d?lka argument? pro funkce z rodiny
-.B exec()
-; odpov?daj?c? makro z
-.B <unistd.h>
-je
-.BR ARG_MAX .
-.TP
-.B _SC_CHILD_MAX
-Po?et simult?nn? b???c?ch proces? jednoho u?ivatele, odpov?daj?c? makro je
-.BR _POSIX_CHILD_MAX .
+.B exec(3).
+Nesm? b?t m?n? ne?  \fB_POSIX_ARG_MAX\fP(4096).
+.TP
+.B CHILD_MAX - _SC_CHILD_MAX
+Po?et simult?nn? b???c?ch proces? jednoho u?ivatele.
+Nesm? b?t m?n? ne?  \fB_POSIX_CHILD_MAX\fP(25).
+.TP
+.B HOST_NAME_MAX - _SC_HOST_NAME_MAX
+Maxim?ln? d?lka hostname, kter? nezahrnuje ukon?uj?c? null byte, tak jak jej
+vrac? funkce \fBgethostname\fP(2). Nesm? b?t m?n? ne?  \fB_POSIX_HOST_NAME_MAX\fP(255).
 .TP
-.B _SC_CLK_TCK
-Po?et takt? hodin za sekundu; odpov?daj?c? makro je 
+.B LOGIN_NAME_MAX - _SC_LOGIN_NAME_MAX
+Maxim?ln? d?lka loginu, kter? zahrnuje i ukon?uj?c? null byte. Nesm? b?t m?n? ne?  \fB_POSIX_LOGIN_NAME_MAX\fP(9).
+.TP
+takt hodin  \fB - _SC_CLK_TCK\fP
+Po?et takt? hodin za sekundu. Odpov?daj?c? prom?nn? je zastaral?.  Samoz?ejm? byla nazv?na
 .BR CLK_TCK .
+(Pozn?mka: makro \fBCLOCKS_PER_SEC\fP ned?v? ??dnou informaci: mus? b?t rovno 1000000.)
+.TP
+.B OPEN_MAX - _SC_OPEN_MAX
+Maxim?ln? po?et soubor?, kter? m??e m?t proces v libovoln? okam?ik otev?en. Nesm? b?t m?n? ne?  \fB_POSIX_OPEN_MAX\fP(20).
 .TP
-.B _SC_STREAM_MAX
+.B PAGESIZE - _SC_PAGESIZE
+Velikost str?nky v bytech. Nesm? b?t m?n? ne? 1.(N?kter? syst?my pou??vaj? prom?nnou PAGE_SIZE.)
+.TP
+.B RE_DUP_MAX - _SC_RE_DUP_MAX
+Po?et opakuj?c?ch se v?skyt? BRE povolen?ch  \fBregexec\fP(3) a  \fBregcomp\fP(3).  Nesm? b?t m?n? ne?  \fB_POSIX2_RE_DUP_MAX\fP (255).
+.TP
+.B STREAM_MAX - _SC_STREAM_MAX
 Maxim?ln? po?et proud?, kter? m??e m?t proces kdykoliv otev?en.
-Odpov?daj?c? POSIX makro je 
-.BR STREAM_MAX ,
-odpov?daj?c? standard C makro je
-.BR FOPEN_MAX .
-.TP
-.B _SC_TZNAME_MAX
-Maxim?ln? po?et byt? ve jm?nu ?asov?ho p?sma, odpov?daj?c? makro je 
-.BR TZNAME_MAX .
-.TP
-.B _SC_OPEN_MAX
-Maxim?ln? po?et soubor?, kter? m??e m?t proces kdykoliv otev?en,
-odpov?daj?c? makro je
-.BR _POSIX_OPEN_MAX .
-.TP
-.B _SC_JOB_CONTROL
-Indikuje je-li podporov?no POSIXov? ??zen? proces?, odpov?daj?c? makro je
-.BR _POSIX_JOB_CONTROL .
-.TP
-.B _SC_SAVED_IDS
-Indikuje, m?-li proces ulo?eno set-user-ID a set-group-ID;
-odpov?daj?c? makro je 
-.BR _POSIX_SAVED_IDS .
+Pokud je definov?n, m? stejnou hodnotu jako C makro  \fB FOPEN_MAX \fP.
+Nesm? b?t m?n? ne?  \fB_POSIX_STREAM_MAX\fP (8).
+.TP
+.B SYMLOOP_MAX
+Maxim?ln? po?et symbolick?ch link?, kter? jsou vid?t ve jm?n? souboru, ne? se vr?t?
+\fB ELOOP \fP.
+Nesm? b?t m?n? ne?  \fB_POSIX_SYMLOOP_MAX\fP (8).
+.TP
+.B TTY_NAME_MAX - _SC_TTY_NAME_MAX
+Maxim?ln? d?lka jm?na termin?lu, v?etn? ukon?uj?c?ho null bytu.
+Nesm? b?t m?n? ne?  \fB_POSIX_TTY_NAME_MAX\fP (9).
 .TP
-.B _SC_VERSION
+.B TZNAME_MAX - _SC_TZNAME_MAX
+Maxim?ln? po?et byt? ve jm?nu ?asov?ho p?sma.Nesm? b?t m?n? ne? \fB_POSIX_TZNAME_MAX\fP (6).
+.TP
+
+.B _POSIX_VERSION - _SC_VERSION
 zna?? m?s?c a rok POSIX.1 standardu ve form?tu
 .BR YYYYMML
 ; hodnota
-.B 199309L
-je nejnov?j?? revize - z roku 1993.
+.B 199009L
+zna?? revizi Z??? 1990.
 .PP
+.SH PROM?NN? POSIX.2
+
 D?le, hodnoty POSIX.2 :
 .TP
-.B _SC_BC_BASE_MAX
+.B BC_BASE_MAX - _SC_BC_BASE_MAX
 maxim?ln? hodnota
 .I obase
 bran? jako spr?vn? v utilit?
-.BR bc (1)
-; odpov?daj?c? makro je
-.BR BC_BASE_MAX .
+.BR bc (1).
 .TP
-.B _SC_BC_DIM_MAX
+.B BC_DIM_MAX - _SC_BC_DIM_MAX
 maxim?ln? po?et prvk? v poli pro utilitu
-.BR bc (1);
-odpov?daj?c? makro je
-.BR BC_DIM_MAX . 
+.BR bc (1).
 .TP
-.B _SC_BC_SCALE_MAX
+.B BC_SCALE_MAX - _SC_BC_SCALE_MAX
 maxim?ln? hodnota
 .I scale
 povolen?
-.BR bc (1);
-odpov?daj?c? makro je
-.BR BC_SCALE_MAX .
+.BR bc (1).
 .TP
-.B _SC_BC_STRING_MAX
+.B BC_STRING_MAX - _SC_BC_STRING_MAX
 maxim?ln? d?lka ?et?zce povolen?
-.BR bc (1);
-odpov?daj?c? makro je
-.BR BC_STRING_MAX .
+.BR bc (1).
 .TP
-.B _SC_COLL_WEIGHTS_MAX
+.B COLL_WEIGHTS_MAX - _SC_COLL_WEIGHTS_MAX
 maxim?ln? po?et ???ek, kter? mohou b?t p?i?azeny z?znamu
 .B LC_COLLATE order
-v defini?n?m souboru locale; odpov?daj?c? makro je
-.BR COLL_WEIGHTS_MAX .
+v defini?n?m souboru locale.
 .TP
-.B _SC_EXPR_NEST_MAX
+.B EXPR_NEST_MAX - _SC_EXPR_NEST_MAX
 maxim?ln? po?et v?raz?, kter? mohou b?t vno?eny v z?vork?ch v
 .BR expr (1).
-Odpov?daj?c? makro je
-.BR EXPR_NEST_MAX .
 .TP
-.B _SC_LINE_MAX
+.B LINE_MAX - _SC_LINE_MAX
 Maxim?ln? d?lka vstupn?ho ??dku pro utility, jak ze standardn?ho vstupu, tak
 i ze souboru.
-Odpov?daj?c? makro je
-.BR LINE_MAX .
+
 .TP
-.B _SC_RE_DUP_MAX
+.B RE_DUP_MAX - _SC_RE_DUP_MAX
 Maxim?ln? po?et opakovan?ch v?skyt? regul?rn?ho v?razu v intervalov? notaci
 .B \e{m,n\e} ;
-odpov?daj?c? makro je
-.BR RE_DUP_MAX .
+
 .TP
-.B _SC_2_VERSION
+.B POSIX2_VERSION - _SC_2_VERSION
 verze POSIX.2 standardu ve form?tu YYYYMML. 
-Odpov?daj?c? makro je 
-.BR POSIX2_VERSION .
 .TP
-.B _SC_2_DEV
+.B POSIX2_C_DEV - _SC_2_C_DEV
 jsou podporov?ny POSIX.2 standardy t?kaj?c? se jazyka C ?
-Odpov?daj?c? makro je
-.BR POSIX2_C_DEV .
 .TP
-.B _SC_2_FORT_DEV
+.B POSIX2_FORT_DEV - _SC_2_FORT_DEV
 jsou podporov?ny POSIX.2 standardy t?kaj?c? se jazyka FORTRAN ?
-Odpov?daj?c? makro je
-.BR POSIX2_FORT_RUN .
 .TP
-.B _SC_2_FORT_RUN
+.B POSIX2_FORT_RUN - _SC_2_FORT_RUN
 jsou podporov?ny POSIX.2 FORTRAN utility ?
-Odpov?daj?c? makro je
-.BR POSIX2_FORT_RUN .
 .TP
-.B POSIX2_LOCALEDEF
+.B _POSIX2_LOCALEDEF - POSIX2_LOCALEDEF
 je mo?no vytv??et POSIX.2 locales pomoc?
-.BR locale (1) ;
-odpov?daj?c? makro je
-.BR POSIX2_LOCALEDEF .
+.BR locale (1).
 .TP
-.B _SC_2_SW_DEV
+.B POSIX2_SW_DEV - _SC_2_SW_DEV
 je podporov?na volba POSIX.2 v?vojov?ch utilit ?
-Odpov?daj?c? makro je
-.BR POSIX2_SW_DEV .
+.tp
+
+N?sleduj?c? hodnoty tak? existuj?, ale nejsou standard.
+
+TP
+.B - _SC_PHYS_PAGES
+Po?et str?nek fyzick? pam?ti. Je mo?n?, ?e toto ??slo bude p?ekon?no
+a dojde k p?ete?en?.
+TP
+.B - _SC_AVPHYS_PAGES
+Po?et aktu?ln? dostupn?ch str?nek fyzick? pam?ti.
+TP
+.B - _SC_NPROCESSORS_CONF
+Po?et nakonfigurovan?ch procesor?.
+TP
+.B - _SC_NPROCESSORS_ONLN
+Po?et dostupn?ch online procesor?.
+
 .SH N?VRATOV? HODNOTA
-Navr?cen? hodnota je hodnota syst?mov?ho parametru. 1 je-li tato volba k
-dispozici, 0 jestli?e nen?, nebo -1 v p??pad? chyby. Prom?nn? 
+Pokud je
+.I jm?no
+neplatn?, je navr?cena hodnota -1 a
+.I errno
+ je nastaveno na \fB EINVAL\fP.
+Jinak je vr?cena hodnota syst?mov?ho zdroje a
 .I errno
-nen? nastavena.
+z?st?v? beze zm?ny. V p??pad? jednotliv?ch voleb je navr?cena pozitivn? hodnota pokud
+je dotazovan? nastaven? k dispozici a -1 pokud k dispozici nen?. V p??pad? limit -1 znamen?, ?e nen? definov?n ??dn? limit.
+
 .SH SPL?UJE STANDARDY
-POSIX.1, n?vrh POSIX.2
+POSIX.1-2001.
 .SH CHYBY
 Je velmi t??k? pou??vat 
 .B ARG_MAX
 proto?e nen? specifikov?no, jak? mno?stv? pam?ti je p?i vol?n?
-.B exec()
+\fBexec\fP(3)
 spot?ebov?no u?ivatelsk?mi prom?nn?mi v prost?ed?.
 .PP
 N?kter? hodnoty mohou b?t p??li? velk?; nejsou vhodn? k alokov?n? pam?ti.
@@ -179,6 +217,7 @@
 POSIX.2 je?t? nen? standardem a proto se informace v t?to manu?lov? str?nce
 jist? stanou p?edm?tem zm?n.
 .SH DAL?? INFORMACE
-.BR bc "(1), " expr "(1), " locale "(1), " fpathconf "(3), " pathconf (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR bc "(1), " expr "(1), " getconf "(1), " locale "(1), " fpathconf "(3), " pathconf "(3), " posixoptions "(7)
+.SH TIR??
+Tato str?nka je sou??st? vyd?n? linuxov?ch manu?lov?ch str?nek verze 3.09. popis projektu a informace o zp?sobu oznamov?n?
+chyb v dokumentaci najdete na: http://www.kernel.org/doc/man-pages/.
diff -ur man-pages-cs-orig/man-pages/man5/group.5 man-pages-cs-new/man-pages/man5/group.5
--- man-pages-cs-orig/man-pages/man5/group.5	2009-02-09 01:15:08.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/group.5	2009-09-04 14:00:14.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH GROUP 5 1992\-12\-29 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH GROUP 5 2009\-09\-04 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 group \- seznam skupin u?ivatel?
 .SH POPIS
diff -ur man-pages-cs-orig/man-pages/man5/charmap.5 man-pages-cs-new/man-pages/man5/charmap.5
--- man-pages-cs-orig/man-pages/man5/charmap.5	2009-02-09 01:15:10.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/charmap.5	2009-09-04 14:00:27.000000000 +0200
@@ -23,7 +23,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH CHARMAP 5 1994\-11\-28 "" "Linux \- p??ru?ka u?ivatele"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH CHARMAP 5 2009\-09\-04 "" "Linux \- p??ru?ka u?ivatele"
 .SH JM?NO
 charmap \- symboly pro definici k?dov?n? znak?
 .SH POPIS
diff -ur man-pages-cs-orig/man-pages/man5/issue.5 man-pages-cs-new/man-pages/man5/issue.5
--- man-pages-cs-orig/man-pages/man5/issue.5	2009-02-09 01:15:10.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/issue.5	2009-09-04 14:01:03.000000000 +0200
@@ -28,7 +28,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH ISSUE 5 1993\-07\-24 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ISSUE 5 2009\-09\-04 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 issue \- zpr?va p?ed p?ihl??en?m a identifika?n? soubor
 .SH POPIS
diff -ur man-pages-cs-orig/man-pages/man5/motd.5 man-pages-cs-new/man-pages/man5/motd.5
--- man-pages-cs-orig/man-pages/man5/motd.5	2009-02-09 01:15:11.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/motd.5	2009-09-04 14:01:11.000000000 +0200
@@ -28,7 +28,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH MOTD 5 1992\-12\-29 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH MOTD 5 2009\-09\-04 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 motd \- zpr?va dne
 .SH POPIS
diff -ur man-pages-cs-orig/man-pages/man5/shells.5 man-pages-cs-new/man-pages/man5/shells.5
--- man-pages-cs-orig/man-pages/man5/shells.5	2009-02-09 01:15:12.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/shells.5	2009-09-04 14:01:38.000000000 +0200
@@ -29,7 +29,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH SHELLS 5 1993\-11\-21 "" "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SHELLS 5 2009\-09\-04 "" "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 shells \- cesty p?ihla?ovac?ch shell?
 .SH POPIS

man-pages-cs-03.patch:
 man-pages/man5/nologin.5      |   23 +-
 man-pages/man5/securetty.5    |    3 
 openssh/ssh-add.1             |  217 +++++++++++++-----------
 openssh/ssh-agent.1           |  160 +++++++++++------
 openssh/ssh-keygen.1          |  374 +++++++++++++++++++++++++++++++++++-------
 openssh/sshd.8                |  263 ++++++++++++++++++-----------
 procps/free.1                 |    5 
 procps/tload.1                |    3 
 procps/w.1                    |    3 
 util-linux/misc-utils/write.1 |    3 
 10 files changed, 717 insertions(+), 337 deletions(-)

--- NEW FILE man-pages-cs-03.patch ---
diff -ur man-pages-cs-orig/man-pages/man5/nologin.5 man-pages-cs-new/man-pages/man5/nologin.5
--- man-pages-cs-orig/man-pages/man5/nologin.5	2009-02-09 01:15:08.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/nologin.5	2009-09-09 13:50:42.000000000 +0200
@@ -28,18 +28,17 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH NOLOGIN 5 1992\-12\-29 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH NOLOGIN 5 2009\-09\-07 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
-nologin \- znemo??uje u?ivatel?m jin?m ne? root p?ihl??en? do
-syst?mu
+nologin \- zdvo?ile odm?tne p?ihl??en?
 .SH POPIS
-Existuje\-li soubor \fI/etc/nologin\fP, \fBlogin\fP(1)  povol? pouze
-p?ihl??en? u?ivatele root. Jin?m u?ivatel?m uk??e obsah tohoto
-souboru a odm?tne jejich p?ihl??en?.
-.SH SOUBORY
-/etc/nologin
+\fBnologin\fP zobraz? zpr?vu, ?e ??et nen? dostupn? a skon?? s nenulovou
+hodnotou. Tento program je zam??len jako varov?n? pro ??ty, kter? byly zablokov?ny.
+.sp
+Existuje\-li soubor \fI/etc/nologin\fP, \fBlogin\fP(1), \fBnologin\fP zobraz? u?ivateli obsah tohoto souboru m?sto
+implicitn? hl??ky.
 .SH "DAL?? INFORMACE"
-\fBlogin\fP(1), \fBshutdown\fP(8)
-.SH TIR??
-Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
-informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+login(1)
+.SH HISTORIE
+P??kaz \fBnologin\fP se poprv? objevil v 4.4BSD.
diff -ur man-pages-cs-orig/man-pages/man5/securetty.5 man-pages-cs-new/man-pages/man5/securetty.5
--- man-pages-cs-orig/man-pages/man5/securetty.5	2009-02-09 01:15:09.000000000 +0100
+++ man-pages-cs-new/man-pages/man5/securetty.5	2009-09-09 13:50:42.000000000 +0200
@@ -27,7 +27,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH SECURETTY 5 1992\-12\-29 Linux "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SECURETTY 5 2009\-09\-07 Linux "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 securetty \- soubor obsahuj?c? seznam termin?l?, ze kter?ch se m??e
 p?ihl?sit superu?ivatel
diff -ur man-pages-cs-orig/openssh/ssh-add.1 man-pages-cs-new/openssh/ssh-add.1
--- man-pages-cs-orig/openssh/ssh-add.1	1999-05-31 19:28:25.000000000 +0200
+++ man-pages-cs-new/openssh/ssh-add.1	2009-09-09 13:50:42.000000000 +0200
@@ -14,34 +14,37 @@
 .\" Translation into Czech 1998/04/28 03:30:00  kolar
 .\" <Petr.Kolar at vslib.cz>
 .\"
+.\" Podle openssh-clients-5.1p1-3 z distribuce Fedora 10
+.\" aktualizoval Lud?k Dol?hal - 8. z??? 2009
+.\"
 .\" Revision 1.5  1998/07/08 00:40:34  kivinen
-.\" 	Changed to do similar commercial #ifdef processing than other
-.\" 	files.
+.\"     Changed to do similar commercial #ifdef processing than other
+.\"     files.
 .\"
 .\" Revision 1.4  1997/04/27 21:48:43  kivinen
-.\" 	Added F-SECURE stuff.
+.\"     Added F-SECURE stuff.
 .\"
 .\" Revision 1.3  1997/04/23 00:03:50  kivinen
-.\" 	Documented -p flag.
+.\"     Documented -p flag.
 .\"
 .\" Revision 1.2  1997/03/25 05:41:32  kivinen
-.\" 	Changed ylo's email to @ssh.fi.
+.\"     Changed ylo's email to @ssh.fi.
 .\"
 .\" Revision 1.1.1.1  1996/02/18 21:38:13  ylo
-.\" 	Imported ssh-1.2.13.
+.\"     Imported ssh-1.2.13.
 .\"
 .\" Revision 1.5  1995/08/31  09:22:20  ylo
-.\" 	Proofreading fixes.
+.\"     Proofreading fixes.
 .\"
 .\" Revision 1.4  1995/08/29  22:30:37  ylo
-.\" 	Improved manual pages from Andrew Macpherson.
+.\"     Improved manual pages from Andrew Macpherson.
 .\"
 .\" Revision 1.3  1995/08/21  23:27:06  ylo
-.\" 	Minor additions.
+.\"     Minor additions.
 .\"
 .\" Revision 1.2  1995/07/13  01:36:56  ylo
-.\" 	Removed "Last modified" header.
-.\" 	Added cvs log.
+.\"     Removed "Last modified" header.
+.\"     Added cvs log.
 .\"
 .\" $Endlog$
 .\"
@@ -49,126 +52,138 @@
 .\"
 .\"
 .\" #ifndef F_SECURE_COMMERCIAL
-.TH SSH-ADD 1 "8. listopadu 1995" "SSH" "SSH"
+.TH SSH-ADD 1 "8. z??? 2009" "SSH" "SSH"
 .do hla cs
 .do hpf hyphen.cs
 .\" #endif F_SECURE_COMMERCIAL
 
 .SH JM?NO
-ssh-add \- p?id? identifika?n? kl?? (identitu) do autentiza?n?ho agenta
+ssh-add \- p?id? RSA nebo DSA kl?? (identitu) do autentiza?n?ho agenta
 
 .SH POU?IT?
 .B ssh-add
 [\c
-.B \-p\c
-]
-[\c
-.B \-l\c
+.B \-cDdLlXx\c
 ]
 [\c
-.B \-d\c
+.BI \-t  \ ?ivotnost \fR \c
 ]
 [\c
-.B \-D\c
+.I \-soubor ...
 ]
-[\c
-.B soubor\c
-\&.\|.\|.\|]
-
+.br
+.B ssh-add
+.BI \-s  \ ?te?ka \fR
+.br
+.B ssh-add
+.BI \-e  \ ?te?ka \fR
 .SH POPIS
 .LP
 P??kaz
 .B ssh-add
-p?id? identitu do autentiza?n?ho agenta
-.BR ssh-agent .
-P?i spu?t?n? bez parametr? p?id? identitu ze souboru
-.IR $HOME/\s+2.\s0ssh/identity ".
+p?id? RSA nebo DSA identitu do autentiza?n?ho agenta
+ ssh-agent(1) .
+P?i spu?t?n? bez parametr? p?id? identitu ze soubor?
+.I ~/.ssh/id_rsa, ~/.ssh/id_dsa
+a
+.I ~/.ssh/identity.
 V p??kazov?m ??dku lze zadat jm?na jin?ch soubor?.
-Jestli?e je pro p??stup k souboru pot?eba p??stupov? heslo (passphrase),
+Jestli?e je pro p??stup k souboru pot?eba p??stupov? heslo,
 .B ssh-add
-se na n?j dot??e u?ivatele. Je-li zad?na volba \-p, bude p??stupov?
-heslo ?teno z stdin. Nen?-li zad?na volba \-p a u?ivatel pou??v? X11,
-bude p??stupov? heslo vy??d?no zvl??tn?m X11 programem, jinak bude ?teno
-z u?ivatelova termin?lu. (Pozn?mka: m?-li b?t pro na?ten? p??stupov?ho
-hesla pou?it X11 program, je n?kdy nezbytn? p?esm?rovat stdin na
-/dev/null.)
-.LP
+se na n?j dot??e u?ivatele. Heslo je p?e?teno z u?ivatelova
+termin?lu.\fB ssh-add\fP pou?ije posledn? heslo, pokud
+je zad?no n?kolik soubor? s hesly.
 Aby program
 .B ssh-add
-fungoval, mus? b??et autentiza?n? agent a mus? b?t p?edkem
-aktu?ln?ho procesu.
-
+fungoval, mus? b??et autentiza?n? agent a prom?nn? prost?ed?
+SSH_AUTH_SOCK mus? obsahovat n?zev socketu agenta.
 .SH VOLBY
 .TP 0.5i
-.B \-p
-?te p??stupov? heslo ze standardn?ho vstupu (nebo z roury).
+.B \-c
+P?id?van? kl??e by m?ly b?t potvrzeny ne? budou pou?ity pro
+autentizaci. Potvrzov?n? je prov?d?no pomoc? programu
+SSH_ASKPASS. ?sp??n? potvrzen? je signalizov?no nulov?m
+n?vratov?m statusem programu SSH_ASKPASS.
+.B \-D
+Sma?e v?echny identity z agenta.
+.TP
+.B \-d
+Vyma?e identitu z agenta. Pokud je program spu?t?n bez parametr?,
+budou vymaz?ny kl??e implicitn? identity. Jinak bude seznam
+parametr? interpretov?n jako seznam cest k ve?ejn?m kl???m a
+odpov?daj?c? kl??e budou vymaz?ny z agenta. Pokud nen? nalezen
+??dn? kl??, kter? odpov?d? zadan? cest?, \fBssh-add\fP p?ipoj?
+\fI.pub\fP a provede cel? proces znovu.
+.TP
+.BI \-e \ ?te?ka \fR
+Vyma?e identitu z ?te?ky karet
+.TP
+.B \-L
+Vyp??e seznam parametr? ve?ejn?ch kl??? v?ech identit aktu?ln? ulo?en?ch
+v agentovi.
 .TP
 .B \-l
-Vyp??e v?echny identity zn?m? autentiza?n?mu agentu.
+Vyp??e seznam otisk? v?ech identit aktu?ln? ulo?en?ch
+v agentovi.
 .TP
-.B \-d
-Vyma?e zadanou identitu z agenta.
+.BI \-e \ ?te?ka \fR
+P?id? identitu do ?te?ky karet
 .TP
-.B \-D
-Sma?e v?echny identity z agenta.
-
-.SH N?VRATOV? K?DY
-
-P??kaz
-.B ssh-add
-nastavuje pro pou?it? ve skriptech n?vratov? k?d na jednu
-z n?sleduj?c?ch hodnot:
-.IP 0
-Po?adovan? operace byla provedena ?sp??n?.
-.IP 1
-Nebylo nav?z?no spojen? s autentiza?n?m agentem.
-V prost?ed? programu
-.B ssh-add
-pravd?podobn? nen? autentiza?n? agent.
-.IP 2
-U?ivatel nezadal po?adovan? p??stupov? heslo.
-.IP 3
-Soubor identit nebyl nalezen, nen? ?iteln?, nebo m? ?patn?
-form?t.
-.IP 4
-Agent nem? po?adovanou identitu.
-.IP 5
-Bl??e nespecifikovan? chyba; jak?koli chyba, kter? nen? pops?na v??e.
-.RT
+.BI \-t \ ?ivotnost \fR
+Nastav? maxim?ln? d?lku ?ivota p?i p?id?v?n? identity do agenta.
+D?lka ?ivota m??e b?t specifikov?na v sekund?ch, nebo v ?asov?m
+form?tu specifikovan?m v sshd_config(5).
+.TP
+.B \-X
+Odemkne agenta.
+.TP
+.B \-x
+Uzamkne agenta heslem.
+.SH PROST?ED?
+.TP
+DISPLAY a SSH_ASKPASS
+Pokud \fBssh-add\fP pot?ebuje heslo a agent je spu?t?n
+z termin?lu, bude ??st heslo z termin?lu, ze kter?ho
+je spu?t?n. Pokud nen?  \fBssh-add\fP p?idru?en? k
+termin?lu a jsou nastaveny prom?nn? DISPLAY a SSH_ASKPASS,
+spust? program specifikovan? v SSH_ASKPASS a otev?e okno
+X11 ze kter?ho bude ??st heslo. Toto je velmi u?ite?n? zejm?na
+vol?me-li \fBssh-add\fP z \fI.xsession\fP nebo ze skriptu.
+(Na n?kter?ch po??ta??ch je nutn? p?esm?rovat vstup z \fI/dev/null\fP
+aby tento postup fungoval.)
+.TP
+SSH_AUTH_SOCK
+Cesta k unixov?mu socketu, kter? je pou??v?n pro komunikaci s
+agentem.
 
 .SH SOUBORY
-.TP 
-.I \&$HOME/\s+2.\s0ssh/identity
-Implicitn? soubor, ze kter?ho program
-.B ssh-add
-?te RSA autentiza?n? identitu u?ivatele, pokud nebylo
-zad?no jm?no jin?ho souboru. Tento soubor nesm? b?t ?iteln?
-nik?m krom? u?ivatele. P?i generov?n? kl??e je mo?n? zadat
-p??stupov? heslo, kter? bude pou?ito na za?ifrov?n?
-soukrom? ??sti tohoto souboru.
-.IP
-Pokud
-.B ssh-add
-pot?ebuje p??stupov? heslo a byl spu?t?n z termin?lu, bude jej
-??st z tohoto termin?lu. Pokud s programem
-.B ssh-add
-nen? spojen ??dn? termin?l, ale je nastavena prom?nn? prost?ed?
-.BR DISPLAY ,
-bude otev?eno X11 okno pro zad?n? p??stupov?ho hesla. To je obzvl???
-u?ite?n? p?i vyvol?n? programu
-.B ssh-add
-ze skriptu .Xsession nebo podobn?ho skriptu, kter?m se startuj?
-X11. Na n?kter?ch stroj?ch je t?eba spu?t?n? tohoto programu vynutit
-p?esm?rov?n?m standardn?ho vstupu na /dev/null.
+.TP
+~/.ssh/identity
+Obsahuje RSA identitu u?ivatele ve verzi 1.
+.TP
+~/.ssh/id_DSA
+Obsahuje DSA identitu u?ivatele ve verzi 2.
+.TP
+~/.ssh/id_RSA
+Obsahuje RSA identitu u?ivatele ve verzi 2.
 
-.SH AUTOR
-.LP
-Tatu Ylonen <ylo at ssh.fi>
+Soubory s identitou by nem?ly b?t ?iteln? nik?m jin?m
+ne? u?ivatelem. Program \fBssh-add\fP ignoruje identifika?n?
+soubory pokud jsou dostupn? jin?m u?ivatel?m.
+.SH N?VRATOV? HODNOTA
+V p??pad? ?sp?chu je n?vratov? hodnota 0. Hodnota 1 je vr?cena v
+p??pad? selh?n? p??kazu a pokud \fBssh-add\fP nen? schopen se spojit
+s autentiza?n?m agentem je vr?cena hodnota 2.
 
 .SH VIZ T??
-.BR ssh-agent (1),
-.BR ssh-keygen (1),
-.BR ssh (1),
-.BR sshd (8)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+ssh-agent (1), ssh-keygen (1), ssh (1), sshd (8)
+
+
+.SH AUTO?I
+OpenSSH je odvozeno od origin?ln?ho a voln?ho ssh 1.2.12, kter? bylo
+vyd?no Tatu Ylonenem. Aaron Campbell, Bob Beck, MArkus Friedl, Niels Provos,
+Theo de Raadt and Dug Song odstranili mnohe chyby, doplnili  funk?nost
+a vytvo?ili tak OpenSSH. Markus Friedl p?ispel k v?voji SSH protokolu ve verz?ch
+1.5 a 2.0. Niels Provos a Markus Friedl p?isp?li k odd?len? privilegi?.
+
+
diff -ur man-pages-cs-orig/openssh/ssh-agent.1 man-pages-cs-new/openssh/ssh-agent.1
--- man-pages-cs-orig/openssh/ssh-agent.1	1999-05-31 19:28:25.000000000 +0200
+++ man-pages-cs-new/openssh/ssh-agent.1	2009-09-09 13:50:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\"  -*- nroff -*-
 .\"
 .\" ssh-agent.1
 .\"
@@ -14,42 +13,45 @@
 .\" Translation into Czech 1998/09/25 03:35:00  kolar
 .\" <Petr.Kolar at vslib.cz>
 .\"
+.\" Podle openssh-clients-5.1p1-3 z distribuce Fedora 10
+.\" aktualizoval Lud?k Dol?hal - 8. z??? 2009
+.\"
 .\" Revision 1.8  1998/07/08 00:40:26  kivinen
-.\" 	Changed to do similar commercial #ifdef processing than other
-.\" 	files.
+.\"	Changed to do similar commercial #ifdef processing than other
+.\"	files.
 .\"
 .\" Revision 1.7  1998/01/02 06:21:20  kivinen
-.\" 	Documented -k option. Renamed SSH_AUTHENCATION_SOCKET to
-.\" 	SSH_AUTH_SOCK.
+.\"	Documented -k option. Renamed SSH_AUTHENCATION_SOCKET to
+.\"	SSH_AUTH_SOCK.
 .\"
 .\" Revision 1.6  1997/04/27 21:48:50  kivinen
-.\" 	Added F-SECURE stuff.
+.\"	Added F-SECURE stuff.
 .\"
 .\" Revision 1.5  1997/03/25 05:42:01  kivinen
-.\" 	Added comment about ALTSHELL from napo.
-.\" 	Changed ylo's email to @ssh.fi.
+.\"	Added comment about ALTSHELL from napo.
+.\"	Changed ylo's email to @ssh.fi.
 .\"
 .\" Revision 1.4  1997/03/19 17:38:20  kivinen
-.\" 	Added documentation for -c and -s options.
+.\"	Added documentation for -c and -s options.
 .\"
 .\" Revision 1.3  1996/11/24 08:26:35  kivinen
-.\" 	Documented new usage of ssh-agent.
+.\"	Documented new usage of ssh-agent.
 .\"
 .\" Revision 1.2  1996/11/01 15:32:49  ttsalo
 .\"       Updated the manpage
 .\"
 .\" Revision 1.1.1.1  1996/02/18 21:38:13  ylo
-.\" 	Imported ssh-1.2.13.
+.\"	Imported ssh-1.2.13.
 .\"
 .\" Revision 1.4  1995/08/31  09:22:32  ylo
-.\" 	Minor cleanup.
+.\"	Minor cleanup.
 .\"
 .\" Revision 1.3  1995/08/29  22:30:57  ylo
 .\" *** empty log message ***
 .\"
 .\" Revision 1.2  1995/07/13  01:36:44  ylo
-.\" 	Removed "Last modified" header.
-.\" 	Added cvs log.
+.\"	Removed "Last modified" header.
+.\"	Added cvs log.
 .\"
 .\" $Endlog$
 .\"
@@ -57,7 +59,7 @@
 .\"
 .\"
 .\" #ifndef F_SECURE_COMMERCIAL
-.TH SSH-AGENT 1 "8. listopadu 1995" "SSH" "SSH"
+.TH SSH-AGENT 1 "8. z??? 2009" "SSH" "SSH"
 .do hla cs
 .do hpf hyphen.cs
 .\" #endif F_SECURE_COMMERCIAL
@@ -67,19 +69,22 @@
 
 .SH POU?IT?
 .LP
-.B ssh-agent 
-.I p??kaz
-
-.B eval `ssh-agent
+.B ssh-agent [-c | -s] [-d]
 [\c
-.BR \-k \c
+.BI \-a \ nava?_adresu\fR\c
 ]
 [\c
-.BR \-s \c
+.BI \-t \ ?ivotnost\fR\c
 ]
 [\c
-.BR \-c \c
-]`
+.I p??kaz [parametry ...]\fR\c
+]
+
+.B ssh-agent
+[\c
+.BR \-c | -s \c
+]
+.BR \-k \c
 
 .SH POPIS
 .LP
@@ -87,7 +92,7 @@
 .B ssh-agent
 shroma??uje soukrom? autentiza?n? kl??e.
 .B Ssh-agent
-by m?l b?t odstartov?n na za??tku X-session nebo login session,
+by m?l b?t odstartov?n na za??tku X-sezen? nebo login sezen?,
 a v?echna okna nebo ostatn? programy by m?ly b?t startov?ny jako
 jeho potomci (\fIp??kaz\fR zadan? jako parametr slou?? norm?ln?
 ke startu X Window Systemu nebo je u?ivatelsk?m shellem).
@@ -96,6 +101,36 @@
 stroje pomoc?
 .BR ssh .
 .LP
+Parametry:
+.br
+.TP
+.BI \-a \ adresa
+Nav??e agenta na unixov? socket \fI bind_address\fP. Implicitn?
+adresa je \fI /tmp/ssh-XXXXXXXXXX/agent.<ppid>\fP.
+.TP
+.B \-c
+Generuje C-shell p??kazy na standardn? v?stup. Toto je implicitn? nastaven?, pokud
+SHELL vypad? jako csh styl shellu.
+.TP
+.B \-d
+Debug m?d. Je-li zad?n tento p?ep?na?, \fBssh-agent\fP neprovede fork.
+.TP
+.B \-k
+Ukon?? sou?asn?ho ssh agenta. (d?no prom?nnou prost?ed? SSH_AGENT_PID)
+-TP
+.B \-s
+Generuje Bourne shell p??kazy na standardn? v?stup. Toto je implicitn? nastaven?, pokud
+SHELL nevypad? jako csh styl shellu
+.TP
+.BI \-t \ ?ivotnost
+Nastav? implicitn? maxim?ln? d?lku ?ivota identifikac? p?idan?ch k agentovi.
+D?lka ?ivota m??e b?t specifikov?na v sekund?ch, nebo ve form?tu definovan?m
+sshd_config(5). D?lka ?ivota specifikovan? v ssh-add(1) p?ep??e hodnotu
+definovanou pomoc? parametru -t. Pokud nen? nastaven tento parametr je maxim?ln?
+d?lka ?ivota nekone?no.
+.br
+.TP
+
 Jestli?e je
 .B ssh-agent
 odstartov?n bez parametr?, pob??? jako proces v pozad?.
@@ -110,7 +145,7 @@
 Prom?nn? prost?ed?
 .B \s-1SSH_AGENT_PID\s0
 m??e b?t pou?ita pro ukon?en? agenta p??kazem kill, kdy? u?
-nen? pot?eba (nap??klad p?i odhla?ov?n? z X-session atd.).
+nen? pot?eba (nap??klad p?i odhla?ov?n? z X-sezen? atd.).
 Nejsou-li zad?ny ??dn? volby,
 .B ssh-agent
 zjist? podle hodnoty prom?nn? prost?ed? SHELL, jak? shell
@@ -130,7 +165,7 @@
 .LP
 Volba
 .BI \-k
-m??e b?t pou?ita k automatick?mu ukon?en? agenta. Zabije agenta
+m??e b?t pou?ita k automatick?mu ukon?en? agenta. Ukon?? agenta
 (pro jeho nalezen? pou?ije hodnotu prom?nn? prost?ed?
 .BR \s-1SSH_AGENT_PID\s0 )
 a vyp??e na stdout p??kazy shellu, kter?
@@ -144,9 +179,9 @@
 .BR ssh-add .
 P??kaz
 .B ssh-add
-p?i spu?t?n? bez parametr? p?id? obsah souboru 
+p?i spu?t?n? bez parametr? p?id? obsah souboru
 .IR \&$HOME/\s+2.\s0ssh/identity .
-Jestli?e m? soubor p??stupov? heslo, 
+Jestli?e m? soubor p??stupov? heslo,
 .B ssh-add
 se na n?j dot??e (pou?ije malou X11 aplikaci pokud b??? pod X11,
 nebo termin?l pokud b??? bez X). Potom za?le identitu agentovi.
@@ -159,30 +194,38 @@
 V?hodou je fakt, ?e agent je spu?t?n na u?ivatelov? lok?ln?m PC,
 laptopu nebo termin?lu. Autentiza?n? data nemus? b?t ulo?ena na
 ??dn?m jin?m stroji, a autentiza?n? p??stupov? hesla nejsou nikdy
-pos?l?na p?es s??. Spojen? s agentem je forwardovan? pomoc?
+pos?l?na p?es s??. Spojen? s agentem je udr?ov?no pomoc?
 .BR ssh ,
 tak?e u?ivatel m??e bezpe?n? pou??vat p??stupov? pr?va dan? identitami
 kdekoli v s?ti.
 .LP
-Spojen? s agentem je dostupn? program?m-potomk?m. Toto spojen? je
-realizov?no unix-domain soketem
-(\fI/tmp/ssh-$USER/agent-socket-<pid>\fR), kde <pid> je ??slo procesu
-poslucha?e (agenta nebo sshd d?mona realizuj?c?ho pro agenta proxy).
-Jm?no tohoto soketu je ulo?eno v prom?nn? prost?ed?
-.BR \s-1SSH_AUTH_SOCK\s0 .
-Soket je p??stupn? pouze pro aktu?ln?ho u?ivatele. Tato metoda
-je snadno zneu?iteln? superu?ivatelem nebo jinou instanc? t?ho?
-u?ivatele. Star?? verze ssh pou??valy pro komunikaci s agentem
-zd?d?n? popisova?e soubor? a unix-domain sokety pou??valy
-nekompatibiln?m zp?sobem.
-.LP
-Jestli?e byl jako parametr programu ssh-agent zad?n p??kaz, agent
-p?i skon?en? tohoto p??kazu automaticky skon?? tak?. Zadan? p??kaz
-bude proveden, i kdyby agent nebyl schopen poskytovat sv? slu?by.
+Existuj? dv? z?kladn? cesty, jak agenta nastavit. Prvn? z nich
+je, ?e agent spust? nov? podp??kaz, do kter?ho jsou exportov?ny
+n?jak? prom?nn? prost?ed?, nap?. \fB ssh-agent xterm&\fP.
+Druhou mo?nost? je, ?e agent vytiskne pot?ebn? shellovsk? p??kazy,
+kter? pak mohou b?t spu?t?ny volaj?c?m shellem.
+.sp
+Shell pak m??e pou??t tyto informace pro spojen? s agentem.
+.sp
+Agent nikdy nepo?le soukrom? kl?? p?es po?adovan? kan?l.
+M?sto toho jsou operace, kter? vy?aduj? soukrom? kl?? provedeny
+na stran? agenta a v?sledek bude zasl?n ?adateli.  D?ky
+tomuto postupu nejsou soukrom? kl??e vystaveny klient?m,
+kte?? agenta pou??vaj?.
+.sp
+Je vytvo?en unixov? secket a jeho jm?no je ulo?eno v prom?nn?
+SSH_AUTH_SOCK. Socket je dostupn? pouze dan?mu u?ivateli. Tato
+metoda m??e b?t snadno zneu?ita ko?enov?m u?ivatelem.
+.sp
+Promm?nn? prost?ed? SSH_AGENT_PID obsahuje ID ??slo procesu agenta.
+.sp
+Agent je automaticky ukon?en, kdy? p?ikaz zadan? na p??kazov?m ??dku
+skon??.
+
 
 .SH SOUBORY
 .TP
-.I \&$HOME/\s+2.\s0ssh/identity
+~/.ssh/identity
 Obsahuje RSA autentiza?n? identitu u?ivatele. Tento soubor
 nesm? b?t ?iteln? nik?m krom? u?ivatele. P?i generov?n? kl??e
 je mo?n? zadat p??stupov? heslo; toto heslo bude pou?ito na
@@ -193,21 +236,26 @@
 .B ssh-add
 p?id?n do agenta.
 .TP
-.I \&/tmp/ssh-$USER/agent-socket-<pid>
+~/.ssh/id_dsa
+Obshuje protokol verze 2 DSA ov??en? identity u?ivatele.
+.TP
+~/.ssh/id_rsa
+Obshuje protokol verze 2 RSA ov??en? identity u?ivatele.
+.TP
+/tmp/ssh-XXXXXXXXXX/agent<ppid>
 Unix-domain sokety pou?it? pro spojen? s autentiza?n?m
 agentem. Sokety mus? b?t ?iteln? pouze vlastn?kem. Sokety
 mus? b?t p?i ukon?en? agenta automaticky zru?eny.
 Nad??zen? adres?? adres??e ssh-$USER mus? m?t nastaven
 sticky bit.
 
-.SH AUTOR
-.LP
-Tatu Ylonen <ylo at ssh.fi>
-
 .SH VIZ T??
-.BR ssh-add (1),
-.BR ssh-keygen (1),
-.BR ssh (1),
-.BR sshd (8)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+ ssh-add (1), ssh-keygen (1), ssh (1), sshd (8)
+
+.SH AUTO?I
+OpenSSH je odvozeno od origin?ln?ho a voln?ho ssh 1.2.12, kter? bylo
+vyd?no Tatu Ylonenem. Aaron Campbell, Bob Beck, MArkus Friedl, Niels Provos,
+Theo de Raadt and Dug Song odstranili mnohe chyby, doplnili  funk?nost
+a vytvo?ili tak OpenSSH. Markus Friedl p?ispel k v?voji SSH protokolu ve verz?ch
+
+1.5 a 2.0.
diff -ur man-pages-cs-orig/openssh/sshd.8 man-pages-cs-new/openssh/sshd.8
--- man-pages-cs-orig/openssh/sshd.8	1999-05-31 19:28:38.000000000 +0200
+++ man-pages-cs-new/openssh/sshd.8	2009-09-09 13:50:42.000000000 +0200
@@ -14,109 +14,112 @@
 .\" Translation into Czech 1998/09/25 05:06:20  kolar
 .\" <Petr.Kolar at vslib.cz>
 .\"
+.\" Podle openssh-server-5.1p1-3 z distribuce Fedora 10
+.\" aktualizoval Lud?k Dol?hal - 7. z??? 2009
+.\"
 .\" Revision 1.21  1998/07/08 00:41:22  kivinen
-.\" 	Changed to do similar commercial #ifdef processing than other
-.\" 	files.
+.\"     Changed to do similar commercial #ifdef processing than other
+.\"     files.
 .\"
 .\" Revision 1.20  1998/06/11 00:11:47  kivinen
-.\" 	Documented Allow/DenyUsers user at host format.
+.\"     Documented Allow/DenyUsers user at host format.
 .\"
 .\" Revision 1.19  1998/05/23  20:38:47  kivinen
-.\" 	Documented AccountExpireWarningDays, AllowSHosts, DenySHosts,
-.\" 	ForcedEmptyPasswdChange, ForcedPasswdChange, and
-.\" 	PasswordExpireWarningDays options.
+.\"     Documented AccountExpireWarningDays, AllowSHosts, DenySHosts,
+.\"     ForcedEmptyPasswdChange, ForcedPasswdChange, and
+.\"     PasswordExpireWarningDays options.
 .\"
 .\" Revision 1.18  1998/05/04  13:37:32  kivinen
-.\" 	Fixed layout of authorized key options.
+.\"     Fixed layout of authorized key options.
 .\"
 .\" Revision 1.17  1998/04/30 03:58:29  kivinen
-.\" 	Documented -V option.
+.\"     Documented -V option.
 .\"
 .\" Revision 1.16  1998/03/27 17:05:18  kivinen
-.\" 	Documented IgnoreRootRhosts option.
+.\"     Documented IgnoreRootRhosts option.
 .\"
 .\" Revision 1.15  1998/01/03 06:42:24  kivinen
-.\" 	Added allow/deny groups option documentation..
+.\"     Added allow/deny groups option documentation..
 .\"
 .\" Revision 1.14  1998/01/02 06:37:48  kivinen
-.\" 	Sorted options. Added CheckMail and XAuthLocation options.
-.\" 	Added {Allow,Deny}Forwarding{Port,To} options to
-.\" 	authorized_keys file. Added SSH WITH TCP WRAPPERS section.
+.\"     Sorted options. Added CheckMail and XAuthLocation options.
+.\"     Added {Allow,Deny}Forwarding{Port,To} options to
+.\"     authorized_keys file. Added SSH WITH TCP WRAPPERS section.
 .\"
 .\" Revision 1.13  1997/06/04 13:53:07  kivinen
-.\" 	Added .TP before DenyUsers.
+.\"     Added .TP before DenyUsers.
 .\"
 .\" Revision 1.12  1997/05/13 22:30:47  kivinen
-.\" 	Fixed default value of AllowTcpForwarding.
+.\"     Fixed default value of AllowTcpForwarding.
 .\"
 .\" Revision 1.11  1997/05/08 03:06:01  kivinen
-.\" 	Added \ before all '-characters (it is troff command if it is
-.\" 	in the beginning of line).
+.\"     Added \ before all '-characters (it is troff command if it is
+.\"     in the beginning of line).
 .\"
 .\" Revision 1.10  1997/04/27 21:50:16  kivinen
-.\" 	Added F-SECURE stuff. Added {Allow,Deny}Forwarding{To,Port}
-.\" 	documentation, added {Allow,Deny}Users documentation from
-.\" 	Steve Kann <stevek at SteveK.COM>.
+.\"     Added F-SECURE stuff. Added {Allow,Deny}Forwarding{To,Port}
+.\"     documentation, added {Allow,Deny}Users documentation from
+.\"     Steve Kann <stevek at SteveK.COM>.
 .\"
 .\" Revision 1.9  1997/03/27 03:16:41  kivinen
-.\" 	Added kerberos patches from Glenn Machin.
-.\" 	Added USELOGIN patches from Brian Cully.
+.\"     Added kerberos patches from Glenn Machin.
+.\"     Added USELOGIN patches from Brian Cully.
 .\"
 .\" Revision 1.8  1997/03/26 05:29:08  kivinen
-.\" 	Documented IdleTimeout option and idle-timeout setting in
-.\" 	authorized_keys.
+.\"	     Documented IdleTimeout option and idle-timeout setting in
+.\"	     authorized_keys.
 .\"
 .\" Revision 1.7  1997/03/25 05:43:18  kivinen
-.\" 	Updated. Changed ylo's email to @ssh.fi.
+.\"     Updated. Changed ylo's email to @ssh.fi.
 .\"
 .\" Revision 1.6  1997/03/19 17:45:53  kivinen
-.\" 	Added TIS authentication code from Andre April
-.\" 	<Andre.April at cediti.be>.
+.\"     Added TIS authentication code from Andre April
+.\"     <Andre.April at cediti.be>.
 .\"
 .\" Revision 1.5  1996/11/27 15:45:38  ttsalo
 .\"     Added X11DisplayOffset-option
 .\"
 .\" Revision 1.4  1996/11/12 15:56:19  ttsalo
-.\"       Fixed a typo
+.\"     Fixed a typo
 .\"
 .\" Revision 1.3  1996/10/29 22:47:36  kivinen
-.\" 	Documented ListenAddress.
+.\"     Documented ListenAddress.
 .\"
 .\" Revision 1.2  1996/08/13 00:25:15  ylo
-.\" 	Documented that $HOME/.ssh/rc is run with user's shell,
-.\" 	/etc/sshrc with /bin/sh.
+.\"     Documented that $HOME/.ssh/rc is run with user's shell,
+.\"     /etc/sshrc with /bin/sh.
 .\"
 .\" Revision 1.1.1.1  1996/02/18 21:38:13  ylo
-.\" 	Imported ssh-1.2.13.
+.\"     Imported ssh-1.2.13.
 .\"
 .\" Revision 1.10  1995/10/02  01:31:37  ylo
-.\" 	Make substitutions in configure.
+.\"     Make substitutions in configure.
 .\"
 .\" Revision 1.9  1995/09/27  02:17:12  ylo
-.\" 	Added a section on what happens at login.
-.\" 	Other additions.
+.\"     Added a section on what happens at login.
+.\"     Other additions.
 .\"
 .\" Revision 1.8  1995/09/22  22:21:36  ylo
-.\" 	Added username and netgroups for hosts.equiv and rhosts.
+.\"     Added username and netgroups for hosts.equiv and rhosts.
 .\"
 .\" Revision 1.7  1995/09/21  17:14:38  ylo
-.\" 	Added /etc/environment and IgnoreRhosts.  Other minor fixes.
+.\"     Added /etc/environment and IgnoreRhosts.  Other minor fixes.
 .\"
 .\" Revision 1.6  1995/08/31  09:24:31  ylo
-.\" 	Minor cleanup.
+.\"     Minor cleanup.
 .\"
 .\" Revision 1.5  1995/08/29  22:31:25  ylo
-.\" 	Improved manual pages from Andrew Macpherson.
+.\"     Improved manual pages from Andrew Macpherson.
 .\"
 .\" Revision 1.4  1995/08/21  23:29:52  ylo
-.\" 	Added documentation for the configuration file.
+.\"     Added documentation for the configuration file.
 .\"
 .\" Revision 1.3  1995/08/18  22:57:27  ylo
-.\" 	Removed obsolete XXX stuff.
+.\"     Removed obsolete XXX stuff.
 .\"
 .\" Revision 1.2  1995/07/13  01:36:06  ylo
-.\" 	Removed "Last modified" header.
-.\" 	Added cvs log.
+.\"     Removed "Last modified" header.
+.\"     Added cvs log.
 .\"
 .\" $Endlog$
 .\"
@@ -124,22 +127,26 @@
 .\"
 .\"
 .\" #ifndef F_SECURE_COMMERCIAL
-.TH SSHD 8 "8. listopadu 1995" "SSH" "SSH"
+.TH SSHD 8 "7. z??? 2009" "SSH" "SSH"
 .do hla cs
 .do hpf hyphen.cs
 .\" #endif F_SECURE_COMMERCIAL
 
 .SH JM?NO
-sshd \- secure shell d?mon
+sshd \- OpenSSH SSH d?mon
 
 .SH POU?IT?
 .na
 .B sshd
+
+[\c
+.B \-46DdeiqTt\fR\c
+]
 [\c
 .BI \-b \ bit?\fR\c
 ]
 [\c
-.B \-d \c
+.BI \-C \ specifikace_p?ipojen?\fR\c
 ]
 [\c
 .BI \-f \ konfig_soubor\fR\c
@@ -151,27 +158,24 @@
 .BI \-h \ host_key_file\fR\c
 ]
 [\c
-.B \-i \c
-]
-[\c
 .BI \-k \ key_gen_time\fR\c
 ]
 [\c
-.BI \-p \ port\fR\c
+.BI \-o \ option\fR\c
 ]
 [\c
-.B \-q \c
+.BI \-p \ port\fR\c
 ]
 [\c
-.BI \-V \ version\fR\c
+.BI \-u \ len\fR\c
 ]
 .ad
 
 .SH POPIS
 .LP
 Program
-.B sshd 
-(secure shell d?mon) je server pro 
+.B sshd
+(secure shell d?mon) je server pro
 .BR ssh ".
 Program
 .B ssh
@@ -250,7 +254,7 @@
 p??kazu a ob? strany skon??.
 .LP
 Program
-.B sshd 
+.B sshd
 m??e b?t zkonfigurov?n pomoc? voleb v p??kazov?m ??dku nebo
 pomoc? konfigura?n?ho souboru. Volby v p??kazov?m ??dku maj?
 p?ednost p?ed hodnotami zadan?mi v konfigura?n?m souboru.
@@ -262,18 +266,41 @@
 
 .SH VOLBY
 .TP
+.B -4
+vnut? \fBsshd\fP pou?it? IPv4 adresy
+.TP
+.B -6
+vnut? \fBsshd\fP pou?it? IPv6 adresy
+.TP
 .BI \-b \ bit?
 Ur?uje po?et bit? v kl??i serveru (implicitn? 768).
 .TP
+.BI \-C \ specifikace_p?ipojen?
+Specifikuje parametry p?ipojen? pro parametr -T, co? je roz???en? testovac? re?im.
+Pokud je parametr poskytnut, jak?koliv shodn? direktivy v konfigura?n?m souboru, kter? by
+mohly b?t nastaveny na specifick?ho u?ivatele, hosta nebo adresu budou nastaveny d??ve, ne?
+je konfigurace vyps?na na standardn? v?stup.  Parametry spojen? jsou ve form?tu kl??ov?_slovo=
+hodnota. Kl??ov? slova jsou "user", "host" a "addr". V?echna jsou vy?adov?na a mohou b?t uvedena
+v libovoln?m po?ad? bu? v jednotliv?ch -C volb?ch, nebo jako seznam odd?lan? ??rkami.
+
+.TP
+.BI \-D
+Je-li specifikov?na tato volba, \fBsshd\fP bude pos?lat v?stup na standardn? chybov? v?stup m?sto
+syst?mov?ho logu.
+.TP
 .B \-d
 Lad?c? re?im. Server zapisuje podrobn? lad?c? v?stup do syst?mov?ho
 logu a neb??? v pozad?. Server tak? nebude vytv??et podprocesy
 a bude zpracov?vat pouze jedno spojen?. Tato volba je ur?ena pouze
 pro lad?n? serveru.
 .TP
+.BI \-e
+Je-li specifikov?na tato volba, \fBsshd\fP bude pos?lat v?stup na chybov? v?stup
+m?sto syst?mov?ho logu.
+.TP
 .BI \-f \ konfig_soubor
 Ur?uje jm?no konfigura?n?ho souboru. Implicitn?
-.IR /etc/ssh/sshd_config ".
+.IR /etc/ssh/sshd_config ".  \fBsshd\fP odm?tna nastartovat bez konfigura?n?ho souboru.
 .TP
 .BI \-g \ login_grace_time
 Ud?v? ?asov? limit, v n?m? se klienti mus? autentizovat (implicitn?
@@ -282,7 +309,7 @@
 .TP
 .BI \-h \ host_key_file
 Ur?uje soubor, z n?ho? se ?te kl?? po??ta?e (implicitn?
-.IR /etc/ssh/ssh_host_key ).  
+.IR /etc/ssh/ssh_host_key ).
 Tato volba mus? b?t zad?na, jestli?e sshd nen? spu?t?n jako root
 (norm?ln? tento soubor nen? ?iteln? k?mkoli krom? roota).
 .TP
@@ -302,17 +329,40 @@
 de?ifrov?n? zachycen? komunikace (kl?? nen? nikde ulo?en). Hodnota
 nula znamen?, ?e kl?? nebude nikdy znovu generov?n.
 .TP
+.BI \-o \ option
+M??e b?t pou?ito pro zad?n? parametr? ve form?tu pou?it?m v konfigura?n?m souboru.
+Toto m??e b?t u?ite?n? pro specifikov?n? voleb, kter? nemaj? vlastn? command-line
+flag. Pro v?ce informac? viz sshd_config(5).
+.TP
 .BI \-p \ port
 Ur?uje ??slo portu, na kter?m server o?ek?v? spojen?
-(implicitn? 22).
+(implicitn? 22). V?cen?sobn? volby portu jsou povoleny.  Porty specifikovan?
+v konfigura?n?m souboru pod n?zvem \fB Port\fP jsou ignorov?ny, pokud je specifikov?n port
+p?es p??kazovou ??dku. Porty specifikovan? pomoc? \fBListenAddress\fP p?episuj? porty specifikovan? p?es
+p??kazovou ??dku.
 .TP
 .B \-q
 Tich? re?im. Do syst?mov?ho logu se nic nep??e. Norm?ln? se tam
 zapisuje za??tek, autentizace a ukon?en? ka?d?ho spojen?.
-.B \-V
-Re?im kompatibility s SSH verze 2. Server p?i zad?n? t?to volby
-p?edpokl?d?, ?e ?et?zec s ??slem verze u? od klienta p?e?etl SSH
-d?mon verze 2 a proto nebude trvat na zasl?n? tohoto ?et?zce.
+.TP
+.B \-T
+Roz???en? testovac? m?d. Kontroluje spr?vnost konfigura?n?ho souboru, vyp??e efektivn?
+konfiguraci na stdout a skon??. P??padn? m??e b?t aplikov?no \fBMatch\fP pravidlo t?m, ?e specifikujeme
+jednu, nebo v?ce \fB-C\fP voleb.
+.TP
+.B \-t
+Testovac? m?d. Pouze kontroluje spr?vnost konfigura?n?ho souboru a norm?lnost p?ep?na??.
+.TP
+.BI \-u \ len
+Tato volba je pou??v?na pro specifikaci velikosti pole ve struktu?e utmp, kde bude ulo?eno jm?no hosta.
+Pokud je d?lka jm?na hosta del?? ne? \fIlen\fP, pak bude pou?ita hodnota v te?kov? decim?ln? konvenci. Toto
+umo??uje unik?tn? identifikaci host?, jejich? jm?na jsou p??li? dlouh?. Parametr  \fB-u0\fP indikuje, ?e pouze
+hodnota v te?kov? des?tkov? soustav? by m?la b?t pou?ita v utmp souboru. Parametr \fB-u0\fP je tak? pou??v?n k tomu,
+aby \fBsshd\fP nepos?lal DNS requesty, pokud je autentiza?n? mechanismus nebo konfigurace nevy?aduj?. Autentiza?n?
+mechanismus, kter? m??e   vy?adovat DNS zahrnuje \fBRhostsRSAAuthentication, HostbasedAuthentication\fP a pou??v?
+\fBfrom="pattern-list"\fP v souboru s kl??em. Konfigura?n? volby, kter? vy?aduj? DNS zahrnuj? pou?it? USER at HOST v
+\fBAllowUsers\fP nebo \fBDenyUsers\fP.
+
 
 .SH KONFIGURA?N? SOUBOR
 
@@ -410,7 +460,7 @@
 zad?no, bude p?ihl??en? povoleno pouze pro u?ivatele, jejich? jm?na
 vyhovuj? n?kter?mu ze vzork?. Ve vzorc?ch mohou b?t pou?ity znaky
 '*' a '?' jako ?ol?ky. Implicitn? je povoleno p?ihl??en? v?ech
-u?ivatel?.  
+u?ivatel?.
 
 Pamatujte, ?e v?echny ostatn? autentiza?n? kroky mus? b?t st?le
 ?sp??n? provedeny. Volby AllowUsers a DenyUsers jsou dodate?n?
@@ -516,7 +566,7 @@
 Soubory
 .I /etc/hosts.equiv
 a
-.I /etc/ssh/shosts.equiv 
+.I /etc/ssh/shosts.equiv
 budou st?le pou??v?ny. Implicitn? hodnota je "none".
 
 .TP
@@ -634,7 +684,7 @@
 .B PrintMotd
 Ur?uje, zda
 .B sshd
-bude vypisovat 
+bude vypisovat
 .I /etc/motd
 kdy? se u?ivatel p?ihl?s? interaktivn?. (Na n?kter?ch syst?mech se
 tento soubor vypisuje zvl??tn?m p??kazem um?st?n?m v /etc/profile
@@ -750,25 +800,24 @@
 .IP 5.
 Nastav? z?kladn? prost?ed?.
 .IP 6.
-Na?te soubor /etc/environment, pokud existuje.
+Na?te soubor /etc/environment, pokud existuje.U?ivatel?m je povoleno
+m?nit svoje prost?ed?. Viz \fBPermitUserEnvironment\fP v sshd_config(5).
 .IP 7.
-Na?te $HOME/.ssh/environment, pokud existuje.
-.IP 8.
 P?epne se do u?ivatelova domovsk?ho adres??e.
-.IP 9.
+.IP 8.
 Jestli?e existuje soubor $HOME/.ssh/rc, interpretuje jej
 (u?ivatelov?m shellem); jinak jestli?e existuje /etc/ssh/sshrc,
 interpretuje jej (shellem /bin/sh); jinak spust? xauth.
 Soubory "rc" jsou d?ny X11 autentiza?n?m protokolem
 a cookie na standardn? vstupu.
-.IP 10.
+.IP 9.
 Spust? u?ivatel?v shell nebo p??kaz.
 .RT
 
 
 .SH FORM?T SOUBORU AUTHORIZED_KEYS
 .LP
-Soubor 
+Soubor
 .I \&$HOME/\s+2.\s0ssh/authorized_keys
 obsahuje seznam RSA kl??? pro RSA autentizaci. Ka?d? ??dek
 souboru obsahuje jeden kl?? (pr?zdn? ??dky a ??dky za??naj?c?
@@ -790,7 +839,6 @@
 odd?len?ch ??rkami. Nesm? obsahovat ??dn? mezery, krom? mezer
 uvnit? uvozovek. Ve jm?nech voleb se nerozli?uj? mal? a velk?
 p?smena. Jsou podporov?ny n?sleduj?c? volby:
-jsou supported: 
 .IP
 .ti -.5i
 \fBfrom="seznam-vzork?" \fR
@@ -851,17 +899,33 @@
 .br
 Zak??e X11 forwardov?n? kdy? je tento kl?? pou?it pro autentizaci.
 Jak?koli po?adavky na forwardov?n? X11 spojen? z klienta vr?t? chybu.
-.IP
+.TP
 \fBno-agent-forwarding\fR
 .br
 Zak??e forwardov?n? pro autentiza?n?ho agenta kdy? je tento kl??
 pou?it pro autentizaci.
-.IP
+.TP
 \fBno-pty\fR
 .br
 Zabr?n? p?id?len? pseudotermin?lu (po?adavek na p?id?len? pty skon??
 chybou).
-
+.TP
+\fBno-user-rc\fR
+.br
+Znemo?n? spu?t?n? ~/.ssh/rc.
+.TP
+\fBpermitopen="host:port"\fR
+.br
+Omez? lok?ln? "ssh -L" p?ed?v?n? port?, tak?e je mo?n? se p?ipojit pouze
+ke specifikovan?mu hostovi a portu. IPv6 adresa m??e b?t specifikov?na
+v alternativn? syntaxi \fIhost/port\fP. N?kolik \fBpermitopen\fP voleb
+m??e b?t specifikov?no, ale mus? b?t odd?leny ??rkami. Nen? aplikov?no
+??dn? rozpozn?v?ni vzor? nad specifikovan?mi jm?ny host?. Mus? to b?t dom?ny nebo adresy.
+.TP
+\fBtunnel="n"\fR
+.br
+Vnut? tun(4) za??zen? na server. Bez t?to volby bude pou?ito n?sleduj?c?
+dostupn? za??zen?, po?aduje-li klient tunel.
 .\"
 .\"
 .\"
@@ -917,9 +981,9 @@
 
 .SH SSH_KNOWN_HOSTS FILE FORMAT
 .LP
-Soubory 
+Soubory
 .I /etc/ssh/ssh_known_hosts
-a 
+a
 .I \&$HOME/\s+2.\s0ssh/known_hosts
 obsahuj? ve?ejn? kl??e v?ech zn?m?ch po??ta??. Prvn? ze soubor?
 (plat? pro v?echny u?ivatele) p?ipravuje spr?vce, zat?mco soubory
@@ -974,7 +1038,7 @@
 .TP
 .I /etc/ssh/sshd_config
 Obsahuje konfigura?n? data pro
-.BR sshd .  
+.BR sshd .
 Tento soubor mus? b?t zapisovateln? pouze u?ivatelem root, ale je
 doporu?eno (i kdy? nikoli nezbytn?), aby byl ?iteln? pro v?echny.
 .TP
@@ -1027,7 +1091,7 @@
 m??e ale nemus? b?t ?iteln? pro v?echny.
 .TP
 .I /etc/nologin
-Jestli?e tento soubor existuje, 
+Jestli?e tento soubor existuje,
 .B sshd
 bude se moci p?ihl?sit pouze u?ivatel root. Obsah souboru bude vyps?n
 komukoli, kdo se pokus? p?ihl?sit, a ne-root spojen? budou odm?tnuta.
@@ -1039,7 +1103,7 @@
 po??ta??ch je povoleno p?ihl??en? bez p?ihla?ovac?ho hesla. Stejn?
 soubor je pou?it programem rlogind a rshd.
 Rozd?l mezi
-.B ssh 
+.B ssh
 a rlogind a rshd je v tom, ?e krom? ov??en? jm?na po??ta?e pomoc?
 domain name serveru po?aduj? RSA autentizaci po??ta?e (pokud
 nejsou p?elo?eny s konfigura?n? volbou \-\-s\-rhosts). Soubor mus?
@@ -1109,7 +1173,7 @@
 shellem po na?ten? soubor? environment, ale p?ed spu?t?n?m
 u?ivatelova shellu nebo p??kazu. Jestli?e se pou??v? X11 spoofing,
 p?ijme p?r "proto cookie" ze standardn?ho vstupu (a prom?nnou prost?ed?
-DISPLAY). Proto mus? v tomto p??pad? vyvolat xauth. 
+DISPLAY). Proto mus? v tomto p??pad? vyvolat xauth.
 
 Prim?rn?m ??elem tohoto souboru je spustit jak?koli inicializa?n?
 rutiny, kter? mohou b?t pot?ebn? ne? je dostupn? u?ivatel?v
@@ -1142,7 +1206,7 @@
 .SH INSTALACE
 .LP
 Program
-.B sshd 
+.B sshd
 se norm?ln? spou?t? jako root. Jestli?e nen? spu?t?n jako root, m??e
 b?t pou?it pouze pro p?ihla?ov?n? u?ivatele, kter?m je spu?t?n, a
 pokud syst?m pou??v? /etc/shadows, nebude fungovat autentizace
@@ -1150,7 +1214,7 @@
 s kl??em po??ta?e.
 .LP
 Program
-.B sshd 
+.B sshd
 se norm?ln? startuje ze souboru
 .I /etc/rc.local
 nebo ekvivalentn?ho p?i bootu syst?mu.
@@ -1160,23 +1224,18 @@
 bezpe?n?. Pokud p?esto objev?te bezpe?nostn? probl?m, oznamte to
 pros?m ihned na <ssh-bugs at cs.hut.fi>.
 
-.SH AUTOR
-.LP
-Tatu Ylonen <ylo at ssh.fi>
-.LP
-Informace o nov?ch verz?ch, mailing listech, a podobn?
-m??ete nal?zt na domovsk? WWW str?nce programu ssh
-na http://www.cs.hut.fi/ssh.
-
 .SH VIZ TAK?
-.LP
-.BR ssh (1),
-.BR make-ssh-known-hosts (1),
-.BR ssh-keygen (1),
-.BR ssh-agent (1),
-.BR ssh-add (1),
-.BR scp (1),
-.BR rlogin (1),
-.BR rsh (1)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+scp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssy-keyscan(1),
+chroot(2), hosts_access(5), login.conf(5), moduli(5), sshd_config(5), inetd(8), sftp-server(8)
+
+.SH AUTO?I
+OpenSSH je odvozeno od origin?ln?ho a voln?ho ssh 1.2.12, kter? bylo
+vyd?no Tatu Ylonenem. Aaron Campbell, Bob Beck, MArkus Friedl, Niels Provos,
+Theo de Raadt and Dug Song odstranili mnohe chyby, doplnili  funk?nost
+a vytvo?ili tak OpenSSH. Markus Friedl p?ispel k v?voji SSH protokolu ve verz?ch
+
+1.5 a 2.0. Niels Provos a Markus Friedl p?isp?li k odd?len? privilegi?.
+
+.SH UPOZORN?N?
+Bezpe?nost syst?mu nen? zv??ena, pokud nejsou vypnuty slu?by \fBrshd, rlogind\fP a \fB rexecd\fP.
+(je tedy nutn? kompletn? zablokovat p??stup p?es rlogin a rsh do po??ta?e)
diff -ur man-pages-cs-orig/openssh/ssh-keygen.1 man-pages-cs-new/openssh/ssh-keygen.1
--- man-pages-cs-orig/openssh/ssh-keygen.1	1999-05-31 19:28:25.000000000 +0200
+++ man-pages-cs-new/openssh/ssh-keygen.1	2009-09-09 13:50:42.000000000 +0200
@@ -14,43 +14,46 @@
 .\" Translation into Czech 1998/09/25 03:40:00  kolar
 .\" <Petr.Kolar at vslib.cz>
 .\"
+.\" Podle openssh-5.1p1-3 z distribuce Fedora 10
+.\" aktualizoval Lud?k Dol?hal - 9. z??? 2009
+.\"
 .\" Revision 1.10  1998/07/08 00:40:42  kivinen
-.\" 	Changed to do similar commercial #ifdef processing than other
-.\" 	files.
+.\"     Changed to do similar commercial #ifdef processing than other
+.\"     files.
 .\"
 .\" Revision 1.9  1997/04/27 21:59:09  kivinen
-.\" 	Added F-SECURE stuff.
+.\"     Added F-SECURE stuff.
 .\"
 .\" Revision 1.8  1997/03/25 05:42:26  kivinen
-.\" 	Small changes from Sakari. Changed ylo's email to @ssh.fi.
+.\"     Small changes from Sakari. Changed ylo's email to @ssh.fi.
 .\"
 .\" Revision 1.7  1996/10/03 23:27:59  ylo
-.\" 	A minor clarification.
+.\"     A minor clarification.
 .\"
 .\" Revision 1.6  1996/10/03 23:27:02  ylo
-.\" 	Fixed a typo.
+.\"     Fixed a typo.
 .\"
 .\" Revision 1.5  1996/10/03 16:54:57  ttsalo
-.\" 	New feature: updating the keyfiles' cipher type.
+.\"     New feature: updating the keyfiles' cipher type.
 .\"
 .\" Revision 1.4  1996/09/29 01:00:38  ylo
-.\" 	Updated to use 3DES.
+.\"     Updated to use 3DES.
 .\"
 .\" Revision 1.3  1996/08/06 07:55:01  ylo
-.\" 	Added a note about empty passphrases.
+.\"     Added a note about empty passphrases.
 .\"
 .\" Revision 1.2  1996/05/30 16:10:50  ylo
-.\" 	Documented -f.
+.\"     Documented -f.
 .\"
 .\" Revision 1.1.1.1  1996/02/18 21:38:13  ylo
-.\" 	Imported ssh-1.2.13.
+.\"     Imported ssh-1.2.13.
 .\"
 .\" Revision 1.3  1995/08/29  22:30:01  ylo
-.\" 	Improved manual pages from Andrew Macpherson.
+.\"     Improved manual pages from Andrew Macpherson.
 .\"
 .\" Revision 1.2  1995/07/13  01:36:30  ylo
-.\" 	Removed "Last modified" header.
-.\" 	Added cvs log.
+.\"     Removed "Last modified" header.
+.\"     Added cvs log.
 .\"
 .\" $Endlog$
 .\"
@@ -58,30 +61,34 @@
 .\"
 .\"
 .\" #ifndef F_SECURE_COMMERCIAL
-.TH SSH-KEYGEN 1 "8. listopadu 1995" "SSH" "SSH"
+.TH SSH-KEYGEN 1 "9. z??? 2009" "SSH" "SSH"
 .do hla cs
 .do hpf hyphen.cs
 .\" #endif F_SECURE_COMMERCIAL
 
 .SH JM?NO
-ssh-keygen \- gener?tor p?ru autentiza?n?ch kl??? 
+ssh-keygen \- gener?tor p?ru autentiza?n?ch kl???
 
 .SH POU?IT?
 .LP
 .B ssh-keygen
 [\c
-.BI \-b \ bit?\c
+.B \-q \c
 ]
 [\c
-.BI \-f \ soubor\c
+.BI \-b \ bit?\c
 ]
+.BI \-t \ typ
 [\c
 .BI \-N \ nov?-p??stup-heslo\c
 ]
 [\c
 .BI \-C \ koment??\c
 ]
-
+[\c
+.BI \-f \ v?stup_soubor_s_kl??em\c
+]
+.br
 .B "ssh-keygen \-p
 [\c
 .BI \-P \ star?-p??stup-heslo\c
@@ -89,7 +96,25 @@
 [\c
 .BI \-N \ nov?-p??stup-heslo\c
 ]
-
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
+.B "ssh-keygen \-i
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
+.B "ssh-keygen \-e
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
+.B "ssh-keygen \-y
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
 .B "ssh-keygen \-c
 [\c
 .BI \-P \ p??stupov?-heslo\c
@@ -97,30 +122,108 @@
 [\c
 .BI \-C \ koment??\c
 ]
-
-.B "ssh-keygen \-u
 [\c
-.BI \-f \ soubor\c
+.BI \-f \ soubor_s_kl??em\c
 ]
+.br
+.B "ssh-keygen \-l
 [\c
-.BI \-P \ p??stupov?-heslo\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
+.B "ssh-keygen \-B
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
+.BI "ssh-keygen \-D \fI?te?ka\FP
+.br
+.BI "ssh-keygen \-F \fIjm?no_hosta\FP
+[\c
+.BI \-f \ seznam_zn?m?ch_host?\c
+]
+.br
+.BI "ssh-keygen \-H
+[\c
+.BI \-f \ seznam_zn?m?ch_host?\c
 ]
+.br
+.BI "ssh-keygen \-R \fIjm?no_hosta\fP
+[\c
+.BI \-f \ seznam_zn?m?ch_host?\c
+]
+.br
+.B "ssh-keygen \-U \fI?te?ka\fP
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+.br
+.B "ssh-keygen \-r \fIjm?no_hosta\fP
+[\c
+.BI \-f \ soubor_s_kl??em\c
+]
+[\c
+.B \-g\c
+]
+.br
+.B "ssh-keygen \-G \fIv?stup_soubor\fP
+[\c
+.B \-v\c
+]
+[\c
+.BI \-b \ po?et_bit?\c
+]
+[\c
+.BI \-M \ pam?t\c
+]
+[\c
+.BI \-S \ m?sto_startu\c
+]
+.br
+.B "ssh-keygen \-T \fIv?stup_soubor\fP
+[\c
+.BI \-f \ vstup_soubor\c
+]
+[\c
+.B \-v\c
+]
+[\c
+.BI \-a \ po?et_test?\c
+]
+[\c
+.BI \-W \ gener?tor\c
+]
+
+
+
 
 .SH POPIS
 .LP
 Program
 .B ssh-keygen
-generuje a spravuje autentiza?n? kl??e pro 
-.BR ssh (1).
+generuje a spravuje autentiza?n? kl??e pro
+ssh (1).
+\fBssh-keygen\fP je schopen vytvo?it RSA kl??e
+pro pou?it? v ssh protokolu verze 1 a
+RSA nebo DSA kl??e pro ssh protokol verze 2. Typ generovan?ho kl??e
+lze ovlivnit pomoc? parametru  \fB-t\fP. Pokud je program spu?t?n bez parametr?
+je vygenerov?n RSA kl?? pro protokol ssh ve verzi 2.
+.sp
+Program \fBssh-keygen\fP m??e b?t tak? pou?it pro generov?n? skupin
+pou??van?ch v Diffie-Hellman v?m?n?(DH-GEX). Viz. \fI MODULI GENERATION\fP.
+.sp
 Norm?ln? ka?d? u?ivatel, kter? si p?eje pou??vat
 .B ssh
 s RSA autentizac?, spust? jednou p??kaz
 .B ssh-keygen
 pro vytvo?en? autentiza?n?ho kl??e a jeho ulo?en? do
-.IR \&$HOME/\s+2.\s0ssh/identity ".
+.IR ~/.ssh/identity,
+.IR ~/.ssh/id_dsa
+nebo
+.IR ~/.ssh/id_rsa.
 Spr?vce syst?mu m??e pou??vat
 .B ssh-keygen
-pro generov?n? kl??? po??ta?e.
+pro generov?n? kl??? po??ta?e. Viz \fI /etc/rc\fP.
 .LP
 Program norm?ln? vygeneruje kl?? a zept? se na jm?no souboru, do kter?ho
 m? ulo?it soukrom? kl??. Ve?ejn? kl?? ulo?? do souboru se stejn?m
@@ -141,7 +244,7 @@
 JE D?RAZN? DOPORU?ENO POU?IT? DOBR?HO, NEUHODNUTELN?HO P??STUPOV?HO HESLA.
 NEPOU??VEJTE PR?ZDN? P??STUPOV? HESLO POKUD NEV?TE, CO D?L?TE.
 .LP
-V souboru s kl??i je tak? polo?ka koment??. Tato polo?ka slou??
+V souboru s kl??i RSA1 je tak? polo?ka koment??. Tato polo?ka slou??
 u?ivateli pro snadn?j?? identifikaci kl??e. Koment?? m??e informovat,
 k ?emu kl?? je nebo jak je u?ite?n?. P?i vytv??en? kl??e je koment??
 inicializov?n na u?ivatel at po??ta?, ale m??e b?t kdykoli zm?n?n
@@ -156,48 +259,164 @@
 
 .SH VOLBY
 .TP 0.6i
+.BI \-a \ pokusy
+Ur?uje po?et test?, kter? budou provedeny kdy? jsou
+prov??ov?ni DH-GEX kandid?ti p?i pou?it? -T p??kazu.
+.TP
+.B \-B
+Uk??e zak?dovan? obsah specifikovan?ho soukrom?ho nebo
+priv?tn?ho kl??e.
+.TP
 .BI \-b \ bit?
-Ur?uje d?lku vytv??en?ho kl??e v bitech. Minimum je 512 bit?.
-Obecn? se za dosta?uj?c? pokl?d? 1024 bit?; kl??e s v?t?? d?lkou
-nep?in??ej? ??dn? dal?? zlep?en? bezpe?nosti, ale pouze zpomaluj?.
-Implicitn? d?lka je 1024 bit?.
+Ur?uje d?lku vytv??en?ho kl??e v bitech. Pro RSA kl??e je minimum 768 bit?.
+Implicitn? je hodnota 2048 .Obecn? se za dosta?uj?c? pokl?d? 2048 bit?.
+Kl??e DSA maj? d?lku p?esn? 1024 bit? dle FIPS 186-2.
+.TP
+.BI \-C \ koment??
+Vlo?? nov? koment??.
 .TP
 .B \-c
 Zm?n? koment?? v souborech se soukrom?mi a ve?ejn?mi kl??i.
+Je podporov?no pouze pro RSA1 kl??e.
 Program ze zept? na jm?no souboru, kter? obsahuje soukrom? kl??,
 na p??stupov? heslo (jestli?e jej kl?? m?), a na nov? koment??.
 .TP
-.B \-f
+.B \-e
+P?e?te soukrom?, nebo ve?ejn? OpenSSH kl?? a vytiskne jej na stdout
+podle normy RFC 4716 SSH Public Key File. Tato volba dovoluje export kl???
+ayb mohly b?t pou?ity n?kolika komer?n?mi SSH implementacemi.
+.TP
+.BI \-F \ jm?no_hosta
+Vyhled? dan? \fIhostname\fP v souboru \fIknown_hosts\fP a vyp??e v?echny v?skyty.
+Tato volba je u?ite?n? pokud pot?ebujeme nal?zt zahashovan? jm?no hosta nebo adresu
+a m??e b?t tak? pou?ita ve spojen? s parametrem \fB-H \fP  pro vyti?t?n? nalezen?ch
+kl??? v zahashovan? podob?.
+.TP
+.BI \-f \ jm?no_souboru
 Ur?uje jm?no souboru, do n?ho? bude ulo?en nebo z n?ho? bude ?ten
 kl??.
 .TP
+.BI \-G \ v?stupn?_soubor
+Vygeneruje kandid?tn? prvo??sla pro DH-GEX. Tato prvo??sla mus? proj?t
+bezpe?nostn? kontrolou(parametr \fB-T\fP) p?ed t?m ne? budou pou?ita.
+.TP
+.B \-g
+U?it? generick?ho DNS form?tu v kombinaci s parametrem \fB-r\fP.
+.TP
+.B \-H
+Zahashuje soubor \fIzn?m?_host?\fP. Tento postup nahrad? v?echna jm?na host?
+a jejich adresy jejich zahashovanou reprezentaci. Origin?ln? obsah souboru je
+p?em?st?n do souboru s p??ponou .old. Tyto hashe mohou b?t norm?ln? pou?ity
+\fBssh\fP nebo \fBsshd\fP, ale pokud je obsah souboru prozrazen, neobsahuj?
+??dn? informace, kter? by mohly slou?it k identifikaci. Tento parametr nem?n?
+existuj?c? zahashovan? jm?na host? a jeho pou?it? je proto bezpe?n? i na soubory
+obsahuj?c? kombinaci zahashovan?ch a nezahashovan?ch jmen.
+.TP
+.B \-i
+Tato volba p?e?te ne?ifrovan? soukrom?(nebo ve?ejn?) soubor s kl??em ve
+form?tu kompatibiln?m s SSH2 a vytiskne OpenSSH kompatibiln? soukrom?
+(nebo ve?ejn?) kl?? na stdout. \fBssh-keygen\fP um? tak? ??st RFC 4716
+SSH Public Key File Format. Tento parametr dovoluje import kl??? z
+n?kolika komer?n?ch SSH implementac?.
+.TP
+.B \-l
+Uk??e otisk zadan?ho souboru s ve?ejn?m kl??em. Soukrom? kl??e ve form?tu RSA1
+jsou tak? podporov?ny. Pro RSA a DSA kl??e se \fBssh-keygen\fP pokus? naj?t
+odpov?daj?c? ve?ejn? kl?? a vytisknout jeho otisk. Pokud je tento parametr
+pou?it v kombinaci s \fB-v\fP tak je spole?n? s otiskem poskytnuta i ASCII
+reprezentace.
+.TP
+.BI \-M \ pam??
+Ur?uje mno?stv? pam?ti(v megabytech), kter? bude pou?ito p?i generov?n?
+modula pro DH-GEX.
+.TP
+.B \-N
+Definuje nov? p??stupov? heslo.
+.TP
+.B \-P
+Definuje (star?) p??stupov? heslo.
+.TP
 .B \-p
 Zm?n? p??stupov? heslo k souboru se soukrom?m kl??em m?sto
 vytvo?en? nov?ho soukrom?ho kl??e. Program se zept? na jm?no
 souboru, kter? obsahuje soukrom? kl??, na star? p??stupov? heslo,
 a dvakr?t na nov? p??stupov? heslo.
 .TP
-.B \-u
-Zm?n? ?ifru kl??e na implicitn? (ur?ena p?i p?ekladu programu
-v sou?asnosti 3DES).
+.B \-q
+Tich? \fBssh-keygen\fP. Pou??v? \fI/etc/rc\fP p?i vytv??en? nov?ho kl??e.
 .TP
-.B \-C
-Definuje nov? koment??.
+.BI \-R \ jm?no_hosta
+Vyma?e v?echny kl??e pat??c? k zadan?mu \fIjm?nu hosta\fP ze souboru
+\fIzn?m?ch host?\fP. Tento parametr je u?ite?n? k vymaz?n? hashovan?ch host?.
+(Viz \fB-H\fP parametr v??e)
 .TP
-.B \-N
-Definuje nov? p??stupov? heslo.
+.BI \-r \ jm?no_hosta
+Vytiskne SSHFP otisk zdrojov?ho z?znamu se \fIjm?nem hosta\fP pro zadan?
+soubor s ve?ejn?m kl??em.
 .TP
-.B \-P
-Definuje (star?) p??stupov? heslo.
+.BI \-s \ start
+Definuje startovn? bod (v hexadecim?ln? soustav?) pro generov?n?
+kandid?tn?ch modulo pro DH-GEX.
+.TP
+.BI \-T \ v?stupn?_soubor
+Testuje zda jsou skupiny DH kandid?tn?ch prvo??sel(vygenerovan?
+pomoc? \fB-G\fP) bezpe?n?.
+.TP
+.BI \-t \ typ
+Specifikuje jak? typ kl??e m? b?t vytvo?en. Mo?n? hodnoty jsou
+"rsa1" pro protokol verze 1 a "rsa" nebo "dsa" pro protokol verze 2.
+.TP
+.BI \-U \ ?te?ka
+Nahraje existuj?c? RSA soukrom? kl?? do karty ve \fI?te?ce\fP.
+.TP
+.B \-v
+Pln? m?d. Umo?n? aby \fBssh-keygen\fP tiskl lad?c? informace o pr?v?
+prov?d?n? operaci. Toto je obzvl??t? vhodn? pro lad?n? generov?n? modula.
+N?kolikan?sobn? zad?n? parametru \fB-v\fP zv??? mno?stv? generovan?
+informace. Maximum je 3.
+.TP
+.BI \-W \ gener?tor
+Ur?uje po?adovan? gener?tor p?i testov?n? kandid?tn?ch modulo pro DH-GEX.
+.TP
+.B \-y
+Tento parametr p?e?te priv?tn? soubor v form?tu OpenSSH a vytiskne
+ve?ejn? kl?? na stdout.
+
+.SH GENEROV?N? MODULA
+Program \fBssh-keygen\fP m??e b?t pou?it pro generov?n? skupin pro
+Diffie-Hellman Group Exchange (DH-GEX) protokol. Generov?n? t?chto
+skupin je rozd?leno na dva kroky: nejd??ve jsou nagenerov?na kandid?tn?
+prvo??sla pomoc? rychl?ho, ale pam??ov? n?ro?n?ho procesu. Tato prvo??sla jsou
+n?sledn? testov?na na vhodnost(n?ro?n? na CPU).
+.sp
+Generov?n? prvo??sel je prov?d?no pomoc? parametru \fB-G\fP. Po?adovan? d?lka prvo??sla
+je specifikov?na pomoc? parametru \fB-b\fP. Nap??klad:
+.sp
+# ssh-keygen -G moduli-2048.candidates -b 2048
+.sp
+Implicitn? za??n? p?tr?n? po prvo??slech na n?hodn? zvolen?m m?st? p?i?em? se bere ohled
+na preferovanou d?lku. Toto se d? zm?nit pou?it?m parametru \fB-S\fP, kter? specifikuje
+jin? m?sto ne n?m? se m? za??t s vyhled?v?n?m(v hexadecim?ln? soustav?).
+.sp
+Jakmile byli kandid?ti nagenerov?n?, mus? b?t ov??ena jejich vhodnost. To m??e b?t ud?l?no
+pomoc? parametru \fB -T\fP. V tomto m?du bude \fBssh-keygen\fP ??st kandid?ty ze standardn?ho
+vstupu(pokud nen? specifikov?n soubor pomoc? \fB-f\fP). Nap??klad:
+.sp
+# ssh-keygen -T moduli-2048 -f moduli-2048.candidates
+.sp
+Implicitn? je ka?d? kandid?t podroben 100 test?m. Jejich po?et m??e b?t zm?n?n
+pomoc? parametru \fB -a\fP. Hodnota gener?toru DH bude zvolena automaticky s
+p?ihl?dnut?m a prvo??slu. Pokud je ??douc? pou??t specifick? gener?tor je toho
+mo?n? doc?lit pomoc? parametru \fB -W\fP. Povolen? hodnoty jsou 2,3 a 5.
+.sp
+Vyt??d?n? DH skupiny mohou b?t instalov?ny v \fI /etc/ssh/moduli\fP. Je
+nezbytn?, aby tento soubor obsahoval modula v po?adovan? bitov? d?lce a
+aby oba komunikuj?c? konce sd?lely shodn? modula.
+
 
 .SH SOUBORY
-.TP 0.6i
-.I \&$HOME/\s+2.\s0ssh/random_seed
-Soubor je pou?it pro inicializaci gener?toru n?hodn?ch ??sel. Tento
-soubor nesm? b?t ?iteln? k?mkoli krom? u?ivatele. Tento soubor je
-vytvo?en? p?i prvn?m spu?t?n? programu a poka?d? je updatov?n.
 .TP
-.I \&$HOME/\s+2.\s0ssh/identity
+ ~/.ssh/identity
 Obsahuje RSA autentiza?n? identity u?ivatele. Soubor
 nesm? b?t ?iteln? pro nikoho krom? vlastn?ka. P?i generov?n?
 kl??e je mo?n? zadat p??stupov? heslo, kter? bude pou?ito
@@ -206,21 +425,56 @@
 .BR ssh-keygen ",
 ale je poskytov?n jako implicitn? soubor pro soukrom? kl??.
 .TP
-.I \&$HOME/\s+2.\s0ssh/identity.pub
+ ~/.ssh/identity.pub
 Obsahuje ve?ejn? kl?? pro autentizaci. Obsah tohoto souboru mus?
-b?t p?id?n do \f4$HOME/\s+2.\s0ssh/authorized_keys\f1 na v?ech stroj?ch,
+b?t p?id?n do \fI~/.ssh/authorized_keys\fP na v?ech stroj?ch,
 kam se budete cht?t p?ihla?ovat s pou?it?m RSA autentizace. Obsah
 tohoto souboru nen? nutn? udr?ovat v tajnosti.
+.TP
+ ~/.ssh/id_dsa
+Obsahuje protokol verze 2 DSA identitu u?ivatele pou??vanou pro
+autentizaci. Tento soubor by nem?l b?t ?iteln? nik?m jin?m ne? u?ivatelem.
+Je mo?n? specifikovat heslo p?i generov?n? kl??e; toto heslo pak bude pou?ito
+pro za?ifrov?n? soukrom? ??sti tohoto souboru pomoc? 3DES. Tento soubor nen?
+automaticky  zp??stupn?n \fBssh-keygen\fP, ale je nab?zen jako implicitn?
+soubor pro priv?tn? kl??. Tento soubor bude ?ten ssh(1) p?i pokusu o p?ihl??en?.
+.TP
+ ~/.ssh/id_dsa.pub
+Obsahuje DSA verze 2 ve?ejn? kl?? pro autentizaci. Obsah tohoto souboru by m?l b?t
+p?id?n k souboru \fI ~/.ssh/authorized_keys ne v?ech stroj?ch, ke kter?m se
+u?ivatel chce p?ihla?ovat pomoc? sv?ho kl??e. Nen? t?eba dr?et obsah tohoto
+souboru v tajnosti.
+.TP
+ ~/.ssh/id_rsa
+Obsahuje protokol verze 2 RSA identitu u?ivatele pou??vanou pro
+autentizaci. Tento soubor by nem?l b?t ?iteln? nik?m jin?m ne? u?ivatelem.
+Je mo?n? specifikovat heslo p?i generov?n? kl??e; toto heslo pak bude pou?ito
+pro za?ifrov?n? soukrom? ??sti tohoto souboru pomoc? 3DES. Tento soubor nen?
+automaticky  zp??stupn?n \fBssh-keygen\fP, ale je nab?zen jako implicitn?
+soubor pro priv?tn? kl??. Tento soubor bude ?ten ssh(1) p?i pokusu o p?ihl??en?.
+.TP
+ ~/.ssh/id_rsa.pub
+Obsahuje RSA verze 2 ve?ejn? kl?? pro autentizaci. Obsah tohoto souboru by m?l b?t
+p?id?n k souboru \fI ~/.ssh/authorized_keys ne v?ech stroj?ch, ke kter?m se
+u?ivatel chce p?ihla?ovat pomoc? sv?ho kl??e. Nen? t?eba dr?et obsah tohoto
+souboru v tajnosti.
+.TP
+~/.ssh/moduli
+Tento soubor obsahuje Diffie-Hellman skupiny pou??van? pro DH-GEX. Struktura souboru
+je pops?na v moduli(5).
 
-.SH AUTOR
+.SH VIZ T??
 .LP
-Tatu Ylonen <ylo at ssh.fi>
+ssh (1), ssh-add (1), ssh-agent (1), moduli(5), sshd (8)
+.br
+.sp
+.I The Secure Shell(SSH) Public Key File Format,
+RFC 4716, 2006.
 
-.SH VIZ T??
+.SH AUTO?I
+OpenSSH je odvozeno od origin?ln?ho a voln?ho ssh 1.2.12, kter? bylo
+vyd?no Tatu Ylonenem. Aaron Campbell, Bob Beck, MArkus Friedl, Niels Provos,
+Theo de Raadt and Dug Song odstranili mnohe chyby, doplnili  funk?nost
+a vytvo?ili tak OpenSSH. Markus Friedl p?ispel k v?voji SSH protokolu ve verz?ch
+1.5 a 2.0.
 .LP
-.BR ssh (1),
-.BR sshd (8),
-.BR ssh-agent (1),
-.BR ssh-add (1)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
diff -ur man-pages-cs-orig/procps/free.1 man-pages-cs-new/procps/free.1
--- man-pages-cs-orig/procps/free.1	2009-02-07 21:39:22.000000000 +0100
+++ man-pages-cs-new/procps/free.1	2009-09-09 13:50:42.000000000 +0200
@@ -6,7 +6,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH FREE 1 "20.b?ezen 1993 " "Cohesive Systems" "Linux \- P??ru?ka u?ivatele"
+.\" Aktualizov?no podle procps-3.2.7-21 z distribuce Fedora 10
+.TH FREE 1 "8.z??? 2009 " "Cohesive Systems" "Linux \- P??ru?ka u?ivatele"
 .SH JM?NO
 free \- zobrazuje pod?l voln? a pou??van? pam?ti v syst?mu
 .SH POU?IT?
@@ -31,7 +32,7 @@
 .PP
 P?ep?na? \fB\-V\fP vyp??e ??slo verze a skon??.
 .SH SOUBORY
-.ta 
+.ta
 \fI/proc/meminfo\fP\-\- informace o pam?ti
 .fi
 
diff -ur man-pages-cs-orig/procps/tload.1 man-pages-cs-new/procps/tload.1
--- man-pages-cs-orig/procps/tload.1	2009-02-07 21:39:23.000000000 +0100
+++ man-pages-cs-new/procps/tload.1	2009-09-09 13:50:42.000000000 +0200
@@ -6,7 +6,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH TLOAD 1 "20.b?ezen 1993 " "Cohesive Systems" "Linux \- P??ru?ka u?ivatele"
+.\" Aktualizov?no podle procps-3.2.7-21 z distribuce Fedora 10
+.TH TLOAD 1 "8.z??? 2009 " "Cohesive Systems" "Linux \- P??ru?ka u?ivatele"
 .SH JM?NO
 tload \- grafick? zn?zorn?n? vyt??en? syst?mu
 .SH POU?IT?
diff -ur man-pages-cs-orig/procps/w.1 man-pages-cs-new/procps/w.1
--- man-pages-cs-orig/procps/w.1	2009-02-07 21:39:23.000000000 +0100
+++ man-pages-cs-new/procps/w.1	2009-09-09 13:50:42.000000000 +0200
@@ -5,7 +5,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH W 1 "8. prosince 1993 " " " "Linux \- P??ru?ka u?ivatele"
+.\" Aktualizov?no podle procps-3.2.7-21 z distribuce Fedora 10
+.TH W 1 "8. z??? 2009 " " " "Linux \- P??ru?ka u?ivatele"
 .SH JM?NO
 w \- Zobraz?, kdo je p?ihl??en? k syst?mu a co d?l?.
 .SH POU?IT?
diff -ur man-pages-cs-orig/util-linux/misc-utils/write.1 man-pages-cs-new/util-linux/misc-utils/write.1
--- man-pages-cs-orig/util-linux/misc-utils/write.1	2009-02-07 21:39:05.000000000 +0100
+++ man-pages-cs-new/util-linux/misc-utils/write.1	2009-09-09 13:50:42.000000000 +0200
@@ -41,7 +41,8 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WRITE 1 "12.b?ezen 1995" "" "Linux \- p??ru?ka program?tora"
+.\" Aktualizov?no podle util-linux-ng-2.14.1-3 z distribuce Fedora 10
+.TH WRITE 1 "8.z??? 2009" "" "Linux \- p??ru?ka program?tora"
 .SH JM?NO
 write \- po?le zpr?vu jin?mu u?ivateli
 .SH POU?IT?


Index: man-pages-cs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-cs/devel/man-pages-cs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- man-pages-cs.spec	15 Sep 2009 09:42:27 -0000	1.25
+++ man-pages-cs.spec	15 Sep 2009 11:41:24 -0000	1.26
@@ -2,12 +2,14 @@
 Summary: Czech man pages from the Linux Documentation Project
 Name: man-pages-cs
 Version: 0.18.20090209
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GFDL and GPL+
 Group: Documentation
 URL: http://sweb.cz/tropikhajma/man-pages-cs/index.html
 Source: http://tropikhajma.sweb.cz/%{name}/%{name}-%{version}.tar.lzma
-Patch1: man-pages-0.18.20090209-inst.patch
+Patch1: man-pages-cs-01.patch
+Patch2: man-pages-cs-02.patch
+Patch3: man-pages-cs-03.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -17,9 +19,18 @@ Czech.
 
 %prep
 %setup -q
-%patch1 -p1 -b .inst
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+# coreutils directory contains newer version
+rm ./procps/kill.1
+rm ./procps/uptime.1
+rm ./man-pages/man1/du.1
+# links to ls - better version in coreutils directory
+rm ./man-pages/man1/dir.1
+rm ./man-pages/man1/vdir.1
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -36,6 +47,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/cs/*
 
 %changelog
+* Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-2
+- fix instalation part
+- remove duplicate files
+- add patches created by Ludek Dolihal
+
 * Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-1
 - update to 0.18.20090209
 


--- man-pages-0.18.20090209-inst.patch DELETED ---



From jgu at fedoraproject.org  Tue Sep 15 11:43:43 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 15 Sep 2009 11:43:43 +0000 (UTC)
Subject: rpms/dvipdfmx/F-11 dvipdfmx.spec,1.9,1.10
Message-ID: <20090915114343.621D911C00CE@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19350

Modified Files:
	dvipdfmx.spec 
Log Message:
* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
- Fix up errors in file list



Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-11/dvipdfmx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dvipdfmx.spec	14 Sep 2009 17:35:29 -0000	1.9
+++ dvipdfmx.spec	15 Sep 2009 11:43:43 -0000	1.10
@@ -10,7 +10,7 @@
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.28.%{snapshot}cvs%{?dist}
+Release:        0.29.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -80,17 +80,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/dvipdfmx
-%{_bindir}/ebbx
 %{_bindir}/extractbb
+%{_bindir}/ebb
 %dir %{_texmf_conf}/dvipdfmx/
 %config(noreplace) %{_texmf_conf}/dvipdfmx/cid-x.map
 %{_texmf_main}/dvipdfmx
 %{_texmf_main}/fonts/map/dvipdfmx/cid-x.map
 %{_texmf_main}/fonts/map/glyphlist/glyphlist.txt
 %{_texmf_main}/fonts/map/glyphlist/pdfglyphlist.txt
+%{_texmf_main}/fonts/cmap/dvipdfmx/EUC-UCS2
 
 
 %changelog
+* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
+- Fix up errors in file list
+
 * Fri Sep 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.28.20090708cvs
 - Update to 20090708 snapshot to fix BZ 519672
 - Remove dvipdfmx-20080617-ebb-to-ebbx.patch



From gerd at fedoraproject.org  Tue Sep 15 11:48:31 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 15 Sep 2009 11:48:31 +0000 (UTC)
Subject: rpms/parrot/devel .cvsignore, 1.7, 1.8 import.log, 1.13,
	1.14 parrot.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20090915114832.0708711C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20352/devel

Modified Files:
	.cvsignore import.log parrot.spec sources 
Log Message:
update to parrot release 1.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Aug 2009 16:18:02 -0000	1.7
+++ .cvsignore	15 Sep 2009 11:48:30 -0000	1.8
@@ -1 +1 @@
-parrot-1.5.0.tar.gz
+parrot-1.6.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- import.log	4 Sep 2009 15:11:24 -0000	1.13
+++ import.log	15 Sep 2009 11:48:31 -0000	1.14
@@ -11,3 +11,4 @@ parrot-1_4_0-6_fc11:HEAD:parrot-1.4.0-6.
 parrot-1_4_0-8_fc11:HEAD:parrot-1.4.0-8.fc11.src.rpm:1249350002
 parrot-1_5_0-1_fc11:HEAD:parrot-1.5.0-1.fc11.src.rpm:1250871327
 parrot-1_5_0-2_40969svn_fc11:HEAD:parrot-1.5.0-2.40969svn.fc11.src.rpm:1252076899
+parrot-1_6_0-1_fc11:HEAD:parrot-1.6.0-1.fc11.src.rpm:1253015088


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- parrot.spec	4 Sep 2009 15:11:24 -0000	1.17
+++ parrot.spec	15 Sep 2009 11:48:31 -0000	1.18
@@ -1,14 +1,12 @@
 Name:           parrot
-Version:        1.5.0
-Release:        2.40969svn%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-ExcludeArch:ppc64
-
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/SVN-checkout/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
 
 Patch0:         parrot-1.x.0.patch
 # patches file:           tools/dev/install_files.pl
@@ -114,6 +112,10 @@ chmod +x %{__perl_provides}
 # option.
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
+%ifarch ppc64
+# the TGE don't build with this version with the optimize="-O2" option on ppc64
+    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
+%endif
 
 %{__perl} Configure.pl \
     --prefix=%{_usr} \
@@ -126,8 +128,7 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex \
-    --libs='-lcurses -lm'
+    --lex=%{_bindir}/flex
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Sep 2009 15:11:25 -0000	1.8
+++ sources	15 Sep 2009 11:48:31 -0000	1.9
@@ -1 +1 @@
-3484552ba01980c1a397141b01c7351b  parrot-1.5.0.tar.gz
+6fde2d91278a3990213c8671a0856e4a  parrot-1.6.0.tar.gz



From jbowes at fedoraproject.org  Tue Sep 15 11:54:18 2009
From: jbowes at fedoraproject.org (jbowes)
Date: Tue, 15 Sep 2009 11:54:18 +0000 (UTC)
Subject: rpms/gitg/devel .cvsignore, 1.1, 1.2 gitg.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090915115418.D9FEF11C00CE@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/gitg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22931

Modified Files:
	.cvsignore gitg.spec sources 
Log Message:
update to 0.0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gitg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 May 2009 05:11:53 -0000	1.1
+++ .cvsignore	15 Sep 2009 11:54:18 -0000	1.2
@@ -0,0 +1 @@
+gitg-0.0.5.tar.bz2


Index: gitg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gitg/devel/gitg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gitg.spec	25 Jul 2009 00:13:13 -0000	1.2
+++ gitg.spec	15 Sep 2009 11:54:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gitg
-Version:        0.0.3
-Release:        2%{?dist}
+Version:        0.0.5
+Release:        1%{?dist}
 Summary:        GTK+ graphical interface for the git revision control system
 
 Group:          Development/Tools
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 James Bowes <jbowes at redhat.com> 0.0.5-1
+- Update to 0.0.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gitg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 13:05:11 -0000	1.2
+++ sources	15 Sep 2009 11:54:18 -0000	1.3
@@ -1 +1 @@
-0a61a7b98a8b54500c81d206f608f2de  gitg-0.0.3.tar.bz2
+d2b2cbd02a9fd69c67608e3a2e15c585  gitg-0.0.5.tar.bz2



From mdbooth at fedoraproject.org  Tue Sep 15 12:06:41 2009
From: mdbooth at fedoraproject.org (Matthew Booth)
Date: Tue, 15 Sep 2009 12:06:41 +0000 (UTC)
Subject: rpms/virt-v2v/devel virt-v2v.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915120641.CF38611C00CE@cvs1.fedora.phx.redhat.com>

Author: mdbooth

Update of /cvs/pkgs/rpms/virt-v2v/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27200

Modified Files:
	.cvsignore sources 
Added Files:
	virt-v2v.spec 
Log Message:
Initial devel commit for virt-v2v 0.2.0



--- NEW FILE virt-v2v.spec ---
Name:           virt-v2v
Version:        0.2.0
Release:        1%{?dist}
Summary:        Convert a virtual machine to run on KVM

Group:          Applications/System
License:        GPLv2+ and LGPLv2+
URL:            http://people.redhat.com/mbooth/virt-v2v/
Source0:        http://people.redhat.com/mbooth/virt-v2v/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

# Build system direct requirements
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(ExtUtils::Manifest)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(Module::Find)

# Runtime perl modules also required at build time for use_ok test
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(Locale::TextDomain)
BuildRequires:  perl(Module::Pluggable)
BuildRequires:  perl(Sys::Guestfs)
BuildRequires:  perl(Sys::Guestfs::Lib)
BuildRequires:  perl(Sys::Virt)
BuildRequires:  perl(XML::DOM)
BuildRequires:  perl(XML::DOM::XPath)
BuildRequires:  perl(XML::Writer)

# Need an explicit package dependency for version requires
BuildRequires:  perl-libguestfs >= 1:1.0.68

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# Perl module requirements
Requires:       perl(Config::Tiny)
Requires:       perl(Locale::TextDomain)
Requires:       perl(Module::Pluggable)
Requires:       perl(Sys::Guestfs)
Requires:       perl(Sys::Guestfs::Lib)
Requires:       perl(Sys::Virt)
Requires:       perl(XML::DOM)
Requires:       perl(XML::DOM::XPath)
Requires:       perl(XML::Writer)

# Need an explicit package dependency for version requires
Requires:       perl-libguestfs >= 1:1.0.68

# For GuestOS transfer image
Requires:       /usr/bin/genisoimage

# For virt-snapshot
Requires:       /usr/bin/qemu-img


%description
virt-v2v is a tool for converting virtual machines to use the KVM hypervisor.
It modifies both the virtual machine image and its associated libvirt metadata.
virt-v2v will also configure a guest to use VirtIO drivers if possible.

virt-v2v also includes the virt-snapshot tool, which will modify a guest to use
snapshot storage, and later commit the snapshot back to the original storage if
desired.


%prep
%setup -q


%build
%{__perl} Build.PL
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install \
    --destdir $RPM_BUILD_ROOT \
    --installdirs vendor \
    --install_path locale=%{_datadir}/locale \
    --install_path confdoc=%{_mandir}/man5
# No translations yet. %find_lang fails.
#%find_lang %{name}
touch %{name}.lang

# Create virt-snapshot directories
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/virt-snapshot/{images,xml}

%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)

%doc TODO
%doc META.yml
%doc ChangeLog
%doc COPYING COPYING.LIB
%doc v2v/virt-v2v.conf

# For noarch packages: vendorlib
%{perl_vendorlib}/*

# Man pages
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*
%{_mandir}/man5/*.5*

# Executables
%attr(0755,root,root) %{_bindir}/*

%{_localstatedir}/lib/virt-snapshot


%changelog
* Tue Sep 15 2009 Matthew Booth <mbooth at redhat.com> - 0.2.0-1
- Update to release 0.2.0

* Tue Sep  4 2009 Matthew Booth <mbooth at redhat.com> - 0.1.0-1
- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:19:36 -0000	1.1
+++ .cvsignore	15 Sep 2009 12:06:41 -0000	1.2
@@ -0,0 +1 @@
+virt-v2v-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:19:37 -0000	1.1
+++ sources	15 Sep 2009 12:06:41 -0000	1.2
@@ -0,0 +1 @@
+74202b6864dba7904cf293c997d9fd55  virt-v2v-0.2.0.tar.gz



From mdbooth at fedoraproject.org  Tue Sep 15 12:11:32 2009
From: mdbooth at fedoraproject.org (Matthew Booth)
Date: Tue, 15 Sep 2009 12:11:32 +0000 (UTC)
Subject: rpms/virt-v2v/F-12 virt-v2v.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915121132.1DC8E11C00CE@cvs1.fedora.phx.redhat.com>

Author: mdbooth

Update of /cvs/pkgs/rpms/virt-v2v/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29085

Modified Files:
	.cvsignore sources 
Added Files:
	virt-v2v.spec 
Log Message:
Initial F-12 commit for virt-v2v 0.2.0



--- NEW FILE virt-v2v.spec ---
Name:           virt-v2v
Version:        0.2.0
Release:        1%{?dist}
Summary:        Convert a virtual machine to run on KVM

Group:          Applications/System
License:        GPLv2+ and LGPLv2+
URL:            http://people.redhat.com/mbooth/virt-v2v/
Source0:        http://people.redhat.com/mbooth/virt-v2v/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

# Build system direct requirements
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(ExtUtils::Manifest)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(Module::Find)

# Runtime perl modules also required at build time for use_ok test
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(Locale::TextDomain)
BuildRequires:  perl(Module::Pluggable)
BuildRequires:  perl(Sys::Guestfs)
BuildRequires:  perl(Sys::Guestfs::Lib)
BuildRequires:  perl(Sys::Virt)
BuildRequires:  perl(XML::DOM)
BuildRequires:  perl(XML::DOM::XPath)
BuildRequires:  perl(XML::Writer)

# Need an explicit package dependency for version requires
BuildRequires:  perl-libguestfs >= 1:1.0.68

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# Perl module requirements
Requires:       perl(Config::Tiny)
Requires:       perl(Locale::TextDomain)
Requires:       perl(Module::Pluggable)
Requires:       perl(Sys::Guestfs)
Requires:       perl(Sys::Guestfs::Lib)
Requires:       perl(Sys::Virt)
Requires:       perl(XML::DOM)
Requires:       perl(XML::DOM::XPath)
Requires:       perl(XML::Writer)

# Need an explicit package dependency for version requires
Requires:       perl-libguestfs >= 1:1.0.68

# For GuestOS transfer image
Requires:       /usr/bin/genisoimage

# For virt-snapshot
Requires:       /usr/bin/qemu-img


%description
virt-v2v is a tool for converting virtual machines to use the KVM hypervisor.
It modifies both the virtual machine image and its associated libvirt metadata.
virt-v2v will also configure a guest to use VirtIO drivers if possible.

virt-v2v also includes the virt-snapshot tool, which will modify a guest to use
snapshot storage, and later commit the snapshot back to the original storage if
desired.


%prep
%setup -q


%build
%{__perl} Build.PL
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install \
    --destdir $RPM_BUILD_ROOT \
    --installdirs vendor \
    --install_path locale=%{_datadir}/locale \
    --install_path confdoc=%{_mandir}/man5
# No translations yet. %find_lang fails.
#%find_lang %{name}
touch %{name}.lang

# Create virt-snapshot directories
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/virt-snapshot/{images,xml}

%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)

%doc TODO
%doc META.yml
%doc ChangeLog
%doc COPYING COPYING.LIB
%doc v2v/virt-v2v.conf

# For noarch packages: vendorlib
%{perl_vendorlib}/*

# Man pages
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*
%{_mandir}/man5/*.5*

# Executables
%attr(0755,root,root) %{_bindir}/*

%{_localstatedir}/lib/virt-snapshot


%changelog
* Tue Sep 15 2009 Matthew Booth <mbooth at redhat.com> - 0.2.0-1
- Update to release 0.2.0

* Tue Sep  4 2009 Matthew Booth <mbooth at redhat.com> - 0.1.0-1
- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:19:36 -0000	1.1
+++ .cvsignore	15 Sep 2009 12:11:30 -0000	1.2
@@ -0,0 +1 @@
+virt-v2v-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:19:37 -0000	1.1
+++ sources	15 Sep 2009 12:11:31 -0000	1.2
@@ -0,0 +1 @@
+74202b6864dba7904cf293c997d9fd55  virt-v2v-0.2.0.tar.gz



From jgu at fedoraproject.org  Tue Sep 15 12:14:29 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 15 Sep 2009 12:14:29 +0000 (UTC)
Subject: rpms/dvipdfmx/devel dvipdfmx.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <20090915121429.BC7C111C00CE@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30031

Modified Files:
	dvipdfmx.spec sources 
Log Message:
* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
- Fix up errors in file list



Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/dvipdfmx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dvipdfmx.spec	24 Jul 2009 20:40:31 -0000	1.9
+++ dvipdfmx.spec	15 Sep 2009 12:14:29 -0000	1.10
@@ -6,11 +6,11 @@
 %{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
 %{!?_texmf_conf: %define _texmf_conf %{_sysconfdir}/texmf}
 
-%define snapshot 20090115
+%define snapshot 20090708
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.28.%{snapshot}cvs%{?dist}
+Release:        0.29.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -18,12 +18,6 @@ License:        GPLv2+
 URL:            http://project.ktug.or.kr/dvipdfmx/
 Source0:        http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz
 
-# This patch renames ebb to ebbx to prevent conflict with the ebb from the
-# dvipdfm package. 
-# htps://bugzilla.redhat.com/show_bug.cgi?id=448347
-# Reported to upstream on 26th May 2008 via email
-Patch0:		dvipdfmx-20080617-ebb-to-ebbx.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf
@@ -46,7 +40,6 @@ Hirata and its modified one, dvipdfm-kor
 
 %prep
 %setup -q -n %{name}-%{snapshot}
-%patch0 -p1 -b .ebb-to-ebbx
 
 %build
 %configure
@@ -87,19 +80,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/dvipdfmx
-%{_bindir}/ebbx
 %{_bindir}/extractbb
+%{_bindir}/ebb
 %dir %{_texmf_conf}/dvipdfmx/
 %config(noreplace) %{_texmf_conf}/dvipdfmx/cid-x.map
 %{_texmf_main}/dvipdfmx
 %{_texmf_main}/fonts/map/dvipdfmx/cid-x.map
 %{_texmf_main}/fonts/map/glyphlist/glyphlist.txt
 %{_texmf_main}/fonts/map/glyphlist/pdfglyphlist.txt
+%{_texmf_main}/fonts/cmap/dvipdfmx/EUC-UCS2
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.28.20090115cvs
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
+- Fix up errors in file list
+
+* Fri Sep 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.28.20090708cvs
+- Update to 20090708 snapshot to fix BZ 519672
+- Remove dvipdfmx-20080617-ebb-to-ebbx.patch
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.27.20090115cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jan 2009 00:16:33 -0000	1.5
+++ sources	15 Sep 2009 12:14:29 -0000	1.6
@@ -1 +1 @@
-098cef238de53adc5e98fe56a451f6f7  dvipdfmx-20090115.tar.gz
+c727370d57633eb58618022516d17b07  dvipdfmx-20090708.tar.gz



From jskala at fedoraproject.org  Tue Sep 15 12:18:06 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 15 Sep 2009 12:18:06 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd.init,1.6,1.7 vsftpd.spec,1.99,1.100
Message-ID: <20090915121806.CE27B11C00CE@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30916

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Mon Sep 14 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-4
- modified init script to be LSB compliant



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vsftpd.init	21 May 2009 05:53:01 -0000	1.6
+++ vsftpd.init	15 Sep 2009 12:18:06 -0000	1.7
@@ -43,8 +43,16 @@ start() {
                         echo -n $"Starting $prog for $site: "
                         daemon /usr/sbin/vsftpd $i
                         RETVAL=$?
-                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
                         echo
+                        if [ $RETVAL -eq 0 ]; then
+                                touch /var/lock/subsys/$prog
+                                break
+                        else
+                                if [ -f /var/lock/subsys/$prog ]; then
+                                        RETVAL=0
+                                        break
+                                fi
+                        fi
                 done
         else
                 RETVAL=1
@@ -75,7 +83,7 @@ case "$1" in
         start
         RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart|force-reload)
         if [ -f /var/lock/subsys/$prog ]; then
             stop
             start
@@ -87,7 +95,7 @@ case "$1" in
         RETVAL=$?
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|force-reload|status}"
         exit 1
 esac
 


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- vsftpd.spec	8 Sep 2009 11:05:03 -0000	1.99
+++ vsftpd.spec	15 Sep 2009 12:18:06 -0000	1.100
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-4
+- modified init script to be LSB compliant
+
 * Tue Sep 08 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-3
 - fixed bug messaged in RHEL-4 #479774 - Wildcard failures with vsftpd
 



From gerd at fedoraproject.org  Tue Sep 15 12:23:24 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 15 Sep 2009 12:23:24 +0000 (UTC)
Subject: rpms/parrot/devel parrot.spec,1.18,1.19
Message-ID: <20090915122324.8A86211C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32350

Modified Files:
	parrot.spec 
Log Message:
* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
- new upstream version
- build only without the option '-O2' on ppc64



Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- parrot.spec	15 Sep 2009 11:48:31 -0000	1.18
+++ parrot.spec	15 Sep 2009 12:23:24 -0000	1.19
@@ -283,11 +283,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
+- new upstream version
+- build only without the option '-O2' on ppc64
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl
 
 * Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
-- new upstream version
 - add man pages
 
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9



From hadess at fedoraproject.org  Tue Sep 15 12:23:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 12:23:20 +0000 (UTC)
Subject: rpms/totem/F-11 0001-Set-the-PA-stream-volume-from-Totem.patch, 1.1,
	1.2 totem.spec, 1.244, 1.245
Message-ID: <20090915122320.3C55411C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32294

Modified Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch totem.spec 
Log Message:
* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-5
- Another pass at PA volume patch, should be much better


0001-Set-the-PA-stream-volume-from-Totem.patch:
 bacon-video-widget-gst-0.10.c |   96 +++++++++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 20 deletions(-)

Index: 0001-Set-the-PA-stream-volume-from-Totem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/0001-Set-the-PA-stream-volume-from-Totem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Set-the-PA-stream-volume-from-Totem.patch	19 Aug 2009 10:11:12 -0000	1.1
+++ 0001-Set-the-PA-stream-volume-from-Totem.patch	15 Sep 2009 12:23:19 -0000	1.2
@@ -1,4 +1,4 @@
-From c303cf285622fe8ded8e46b0a7c61a756501156d Mon Sep 17 00:00:00 2001
+From 6bd2e600030cfd3b19a4612a79eb8fcf07d878b5 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 18 Aug 2009 17:11:18 +0100
 Subject: [PATCH] Set the PA stream volume from Totem
@@ -9,11 +9,11 @@ Subject: [PATCH] Set the PA stream volum
 a stream
 - don't set the volume on the stream on startup when using pulsesink
 ---
- src/backend/bacon-video-widget-gst-0.10.c |   97 +++++++++++++++++++++++------
- 1 files changed, 78 insertions(+), 19 deletions(-)
+ src/backend/bacon-video-widget-gst-0.10.c |   95 +++++++++++++++++++++++------
+ 1 files changed, 76 insertions(+), 19 deletions(-)
 
 diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
-index e43e068..0440777 100644
+index e43e068..066b2f3 100644
 --- a/src/backend/bacon-video-widget-gst-0.10.c
 +++ b/src/backend/bacon-video-widget-gst-0.10.c
 @@ -163,7 +163,9 @@ struct BaconVideoWidgetPrivate
@@ -171,7 +171,7 @@ index e43e068..0440777 100644
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5160,9 +5209,19 @@ bacon_video_widget_new (int width, int height,
+@@ -5160,9 +5209,17 @@ bacon_video_widget_new (int width, int height,
        /* make fakesink sync to the clock like a real sink */
        g_object_set (audio_sink, "sync", TRUE, NULL);
        GST_DEBUG ("audio sink doesn't work, using fakesink instead");
@@ -184,8 +184,6 @@ index e43e068..0440777 100644
 +     * we need to modify, not playbin's one */
 +    if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "volume")) {
 +      bvw->priv->pulse_audio_sink = g_object_ref (audio_sink);
-+      g_object_set (bvw->priv->play, "volume",
-+		    (gdouble) 1.0, NULL);
 +      g_signal_connect (G_OBJECT (bvw->priv->pulse_audio_sink), "notify::volume",
 +			G_CALLBACK (notify_volume_cb), bvw);
 +    }


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- totem.spec	2 Sep 2009 16:25:10 -0000	1.244
+++ totem.spec	15 Sep 2009 12:23:19 -0000	1.245
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -485,6 +485,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-5
+- Another pass at PA volume patch, should be much better
+
 * Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-4
 - Really fix #514914 (crash when a drive has an emblemed icon)
 



From mdbooth at fedoraproject.org  Tue Sep 15 12:24:02 2009
From: mdbooth at fedoraproject.org (Matthew Booth)
Date: Tue, 15 Sep 2009 12:24:02 +0000 (UTC)
Subject: rpms/virt-v2v/F-11 virt-v2v.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915122402.DB58711C00CE@cvs1.fedora.phx.redhat.com>

Author: mdbooth

Update of /cvs/pkgs/rpms/virt-v2v/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32548

Modified Files:
	.cvsignore sources 
Added Files:
	virt-v2v.spec 
Log Message:
Initial F-11 commit for virt-v2v 0.2.0



--- NEW FILE virt-v2v.spec ---
Name:           virt-v2v
Version:        0.2.0
Release:        1%{?dist}
Summary:        Convert a virtual machine to run on KVM

Group:          Applications/System
License:        GPLv2+ and LGPLv2+
URL:            http://people.redhat.com/mbooth/virt-v2v/
Source0:        http://people.redhat.com/mbooth/virt-v2v/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

# Build system direct requirements
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(ExtUtils::Manifest)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(Module::Find)

# Runtime perl modules also required at build time for use_ok test
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(Locale::TextDomain)
BuildRequires:  perl(Module::Pluggable)
BuildRequires:  perl(Sys::Guestfs)
BuildRequires:  perl(Sys::Guestfs::Lib)
BuildRequires:  perl(Sys::Virt)
BuildRequires:  perl(XML::DOM)
BuildRequires:  perl(XML::DOM::XPath)
BuildRequires:  perl(XML::Writer)

# Need an explicit package dependency for version requires
BuildRequires:  perl-libguestfs >= 1:1.0.68

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# Perl module requirements
Requires:       perl(Config::Tiny)
Requires:       perl(Locale::TextDomain)
Requires:       perl(Module::Pluggable)
Requires:       perl(Sys::Guestfs)
Requires:       perl(Sys::Guestfs::Lib)
Requires:       perl(Sys::Virt)
Requires:       perl(XML::DOM)
Requires:       perl(XML::DOM::XPath)
Requires:       perl(XML::Writer)

# Need an explicit package dependency for version requires
Requires:       perl-libguestfs >= 1:1.0.68

# For GuestOS transfer image
Requires:       /usr/bin/genisoimage

# For virt-snapshot
Requires:       /usr/bin/qemu-img


%description
virt-v2v is a tool for converting virtual machines to use the KVM hypervisor.
It modifies both the virtual machine image and its associated libvirt metadata.
virt-v2v will also configure a guest to use VirtIO drivers if possible.

virt-v2v also includes the virt-snapshot tool, which will modify a guest to use
snapshot storage, and later commit the snapshot back to the original storage if
desired.


%prep
%setup -q


%build
%{__perl} Build.PL
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install \
    --destdir $RPM_BUILD_ROOT \
    --installdirs vendor \
    --install_path locale=%{_datadir}/locale \
    --install_path confdoc=%{_mandir}/man5
# No translations yet. %find_lang fails.
#%find_lang %{name}
touch %{name}.lang

# Create virt-snapshot directories
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/virt-snapshot/{images,xml}

%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)

%doc TODO
%doc META.yml
%doc ChangeLog
%doc COPYING COPYING.LIB
%doc v2v/virt-v2v.conf

# For noarch packages: vendorlib
%{perl_vendorlib}/*

# Man pages
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*
%{_mandir}/man5/*.5*

# Executables
%attr(0755,root,root) %{_bindir}/*

%{_localstatedir}/lib/virt-snapshot


%changelog
* Tue Sep 15 2009 Matthew Booth <mbooth at redhat.com> - 0.2.0-1
- Update to release 0.2.0

* Tue Sep  4 2009 Matthew Booth <mbooth at redhat.com> - 0.1.0-1
- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:19:36 -0000	1.1
+++ .cvsignore	15 Sep 2009 12:24:02 -0000	1.2
@@ -0,0 +1 @@
+virt-v2v-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:19:37 -0000	1.1
+++ sources	15 Sep 2009 12:24:02 -0000	1.2
@@ -0,0 +1 @@
+74202b6864dba7904cf293c997d9fd55  virt-v2v-0.2.0.tar.gz



From rhughes at fedoraproject.org  Tue Sep 15 12:47:16 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 15 Sep 2009 12:47:16 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.56, 1.57 PackageKit.spec, 1.117,
	1.118 sources, 1.57, 1.58
Message-ID: <20090915124717.30B5011C00CE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8565

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Tue Sep 15 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090915git
- Update to a newer git snapshot from the 0.5.x series.
- Lots of updated translations.
- Refresh the free licenses from the Fedora wiki. Fixes #519394
- The fixed packagekit-qt should also now allow KPackageKit to build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	7 Sep 2009 12:13:03 -0000	1.56
+++ .cvsignore	15 Sep 2009 12:47:14 -0000	1.57
@@ -1 +1 @@
-PackageKit-0.5.2.tar.gz
+PackageKit-0.5.3-20090915.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- PackageKit.spec	7 Sep 2009 12:13:03 -0000	1.117
+++ PackageKit.spec	15 Sep 2009 12:47:14 -0000	1.118
@@ -3,20 +3,20 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090903
+%define alphatag			20090915
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.5.2
-#Release:   0.2.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Version:   0.5.3
+Release:   0.1.%{?alphatag}git%{?dist}
+#Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
-#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+#Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fedora-specific: set Vendor.conf up for Fedora.
@@ -238,8 +238,8 @@ after firmware has been installed by Pac
 user to restart the computer or remove and re-insert the device.
 
 %prep
-#%setup -q -n %{?name}-%{?version}-%{?alphatag}
-%setup -q
+%setup -q -n %{?name}-%{?version}-%{?alphatag}
+#%setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 
@@ -415,10 +415,11 @@ update-mime-database %{_datadir}/mime &>
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %{_libdir}/libpackagekit-glib*.so
-%{_libdir}/pkgconfig/packagekit-glib.pc
+%{_libdir}/pkgconfig/packagekit-glib*.pc
 %dir %{_includedir}/PackageKit
 %dir %{_includedir}/PackageKit/packagekit-glib
-%{_includedir}/PackageKit/packagekit-glib/*.h
+%dir %{_includedir}/PackageKit/packagekit-glib2
+%{_includedir}/PackageKit/packagekit-glib*/*.h
 
 %files qt-devel
 %defattr(-,root,root,-)
@@ -439,6 +440,12 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Sep 15 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090915git
+- Update to a newer git snapshot from the 0.5.x series.
+- Lots of updated translations.
+- Refresh the free licenses from the Fedora wiki. Fixes #519394
+- The fixed packagekit-qt should also now allow KPackageKit to build.
+
 * Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-1
 - Update to 0.5.2.
 - Many new and updated translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	7 Sep 2009 12:13:03 -0000	1.57
+++ sources	15 Sep 2009 12:47:14 -0000	1.58
@@ -1 +1 @@
-e406ad5e776e31c99e70c7cf6e7bcdc4  PackageKit-0.5.2.tar.gz
+f440f3de9bffeb6967f2562a8a482fc3  PackageKit-0.5.3-20090915.tar.gz



From veillard at fedoraproject.org  Tue Sep 15 12:50:58 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 15 Sep 2009 12:50:58 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.46, 1.47 libvirt.spec, 1.175,
	1.176 sources, 1.48, 1.49
Message-ID: <20090915125059.00D1211C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10061

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Release of 0.7.1 upstream, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	6 Sep 2009 13:46:19 -0000	1.46
+++ .cvsignore	15 Sep 2009 12:50:58 -0000	1.47
@@ -3,3 +3,11 @@
 i686
 x86_64
 libvirt-*.tar.gz
+libvirt-0.6.0.tar.gz
+libvirt-0.6.1.tar.gz
+libvirt-0.6.2.tar.gz
+libvirt-0.6.3.tar.gz
+libvirt-0.6.4.tar.gz
+libvirt-0.6.5.tar.gz
+libvirt-0.7.0.tar.gz
+libvirt-0.7.1.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- libvirt.spec	14 Sep 2009 18:30:45 -0000	1.175
+++ libvirt.spec	15 Sep 2009 12:50:58 -0000	1.176
@@ -73,15 +73,14 @@
 %define with_one    0
 %endif
 
-%define git_snapshot gitfac3f4c
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 0.2.%{git_snapshot}%{?dist}%{?extra_release}
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: http://libvirt.org/sources/libvirt-%{version}-%{git_snapshot}.tar.gz
+Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
 
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
@@ -650,6 +649,16 @@ fi
 %endif
 
 %changelog
+* Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-1
+- Upstream release of 0.7.1
+- ESX, VBox driver updates
+- mutipath support
+- support for encrypted (qcow) volume
+- compressed save image format for Qemu/KVM
+- QEmu host PCI device hotplug support
+- configuration of huge pages in guests
+- a lot of fixes
+
 * Mon Sep 14 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.2.gitfac3f4c
 - Update to newer snapshot of 0.7.1
 - Stop libvirt using untrusted 'info vcpus' PID data (#520864)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	14 Sep 2009 18:30:45 -0000	1.48
+++ sources	15 Sep 2009 12:50:58 -0000	1.49
@@ -1 +1 @@
-84cb07d98032787f1e2a36776768e297  libvirt-0.7.1-gitfac3f4c.tar.gz
+f1cd360a5da38b847e166c6482141940  libvirt-0.7.1.tar.gz



From akurtakov at fedoraproject.org  Tue Sep 15 12:51:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 15 Sep 2009 12:51:06 +0000 (UTC)
Subject: rpms/jetty/devel disable-modules.patch, NONE, 1.1 jetty-settings.xml,
	NONE, 1.1 jetty-depmap.xml, NONE, 1.1 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5 jetty.spec, 1.16,
	1.17 jetty-OSGi-MANIFEST.MF, 1.3, NONE jetty-webdefault.patch,
	1.1, NONE jetty-TestRFC2616-libgcj-bad-date-parser.patch, 1.1,
	NONE jetty-libgcj-bad-serialization.patch, 1.1,
	NONE jetty-CERT438616-CERT237888-CERT21284.patch, 1.1,
	NONE jetty-PostFileFilter.patch, 1.1,
	NONE jetty-extra-j2ee-build_xml.patch, 1.1, NONE
Message-ID: <20090915125106.0656E11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10222/devel

Modified Files:
	sources .cvsignore jetty.spec 
Added Files:
	disable-modules.patch jetty-settings.xml jetty-depmap.xml 
Removed Files:
	jetty-OSGi-MANIFEST.MF jetty-webdefault.patch 
	jetty-TestRFC2616-libgcj-bad-date-parser.patch 
	jetty-libgcj-bad-serialization.patch 
	jetty-CERT438616-CERT237888-CERT21284.patch 
	jetty-PostFileFilter.patch jetty-extra-j2ee-build_xml.patch 
Log Message:
Update to upstream 6.1.20.

disable-modules.patch:
 pom.xml |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE disable-modules.patch ---
--- pom.xml.sav	2009-09-01 21:19:01.000000000 +0300
+++ pom.xml	2009-09-14 12:59:01.723285440 +0300
@@ -61,12 +61,12 @@
           <target>1.4</target>
         </configuration>
       </plugin>
-      <plugin>
+      <!--plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
           <tagBase>https://svn.codehaus.org/jetty/jetty/tags</tagBase>
         </configuration>
-      </plugin>
+      </plugin-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -110,47 +110,47 @@
     <module>modules/util</module>
     <module>modules/util5</module>
     <module>modules/jetty</module>
-    <module>modules/jsp-2.1</module>
+    <!--module>modules/jsp-2.1</module-->
     <module>modules/jsp-api-2.0</module>
     <module>modules/jsp-2.0</module>
     <module>modules/management</module>
     <module>modules/start</module>
     <module>modules/maven-plugin</module>
-    <module>modules/jspc-maven-plugin</module>
+    <!--module>modules/jspc-maven-plugin</module-->
     <module>modules/naming</module>
     <module>modules/plus</module>
     <module>modules/html</module>
-    <module>modules/annotations</module>
+    <!--module>modules/annotations</module-->
 
     <module>extras/servlet-tester</module>
-    <module>extras/xbean</module>
-    <module>extras/spring</module>
+    <!--module>extras/xbean</module>
+    <module>extras/spring</module-->
     <module>extras/sslengine</module>
-    <module>extras/ajp</module>
-    <module>extras/win32service</module>
+    <!--module>extras/ajp</module>
+    <module>extras/win32service</module-->
     <!--module>extras/gwt</module-->
-    <module>extras/threadpool</module>
+    <!--module>extras/threadpool</module-->
     <module>extras/client</module>
-    <module>extras/jetty-java5-stats</module>
+    <!--module>extras/jetty-java5-stats</module-->
 
     <module>examples/test-webapp</module>
-    <module>examples/test-jaas-webapp</module>
+    <!--module>examples/test-jaas-webapp</module>
     <module>examples/test-jndi-webapp</module>
-    <module>examples/embedded</module>
+    <module>examples/embedded</module-->
     <!-- <module>examples/spring-ebj3-demo</module> -->
-    <module>examples/tests</module>
+    <!--module>examples/tests</module>
 
 
     <module>contrib/cometd</module>
     <module>contrib/jetty-ant</module>
     <module>contrib/jetty-rewrite-handler</module>
     <module>contrib/jetty-ldap-jaas</module>
-    <module>contrib/start-daemon</module>
+    <module>contrib/start-daemon</module-->
     <!--module>contrib/grizzly</module-->
     <!--module>contrib/wadi</module-->
     <!--<module>contrib/terracotta</module-->
 
-    <module>extras/setuid</module>
+    <!--module>extras/setuid</module-->
   </modules>
   <dependencyManagement>
     <dependencies>


--- NEW FILE jetty-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>


--- NEW FILE jetty-depmap.xml ---
<dependencies>
<dependency>                                                                                                                      
    <maven>                                                                                                                       
        <groupId>asm</groupId>                                                                                      
        <artifactId>asm</artifactId>                                                                                              
        <version>3.1</version>                                                                                                    
    </maven>                                                                                                                      
    <jpp>                                                                                                                         
        <groupId>JPP/objectweb-asm</groupId>                                                                                      
        <artifactId>asm</artifactId>                                                                                              
        <version>3.1</version>                                                                                                    
    </jpp>                                                                                                                        
</dependency>
	<dependency>
		<maven>
			<groupId>org.mortbay.jetty</groupId>
			<artifactId>servlet-api</artifactId>
			<version>2.5-20081211</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>tomcat6-servlet-2.5-api</artifactId>
			<version>6.0.18</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.mortbay.jetty</groupId>
			<artifactId>jsp-2.1-glassfish</artifactId>
			<version>9.1.1.B60.25.p2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>tomcat6-jsp-2.1-api</artifactId>
			<version>6.0.18</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.mortbay.jetty</groupId>
			<artifactId>jsp-api-2.1-glassfish</artifactId>
			<version>9.1.1.B60.25.p2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>tomcat6-jsp-2.1-api</artifactId>
			<version>6.0.18</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>javax.servlet.jsp</groupId>
			<artifactId>jsp-api</artifactId>
			<version>2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>tomcat6-jsp-2.1-api</artifactId>
			<version>6.0.18</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.mortbay.jetty</groupId>
			<artifactId>jsp-2.1-jetty</artifactId>
			<version>9.1.1.B60.25.p2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>tomcat6-jsp-2.1-api</artifactId>
			<version>6.0.18</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>tomcat</groupId>
			<artifactId>jasper-compiler-jdt</artifactId>
			<version>5.5.15</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>jasper5-compiler</artifactId>
			<version>5.5.27</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-el</groupId>
			<artifactId>commons-el</artifactId>
			<version>1.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-el</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>mx4j</groupId>
			<artifactId>mx4j</artifactId>
			<version>3.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP/mx4j</groupId>
			<artifactId>mx4j</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>mx4j</groupId>
			<artifactId>mx4j-tools</artifactId>
			<version>3.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP/mx4j</groupId>
			<artifactId>mx4j-tools</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>geronimo-spec</groupId>
			<artifactId>geronimo-spec-jta</artifactId>
			<version>1.0.1B-rc4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>jta</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-release-plugin</artifactId>
			<version>1.0.1</version>
		</maven>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.codehaus.plexus</groupId>
			<artifactId>plexus-apacheds</artifactId>
			<version>1.0-alpha-1</version>
		</maven>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.derby</groupId>
			<artifactId>derby</artifactId>
			<version>10.1.1.0</version>
		</maven>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.geronimo.specs</groupId>
			<artifactId>geronimo-annotation_1.0_spec</artifactId>
			<version>1.0</version>
		</maven>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.mortbay.jetty</groupId>
			<artifactId>jetty-annotations</artifactId>
			<version>6.1.20</version>
		</maven>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.maven.skins</groupId>
			<artifactId>maven-default-skin</artifactId>
			<version>2.0.8</version>
		</maven>
	</dependency>
	
</dependencies>



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 May 2009 21:10:35 -0000	1.4
+++ sources	15 Sep 2009 12:51:05 -0000	1.5
@@ -1 +1 @@
-09d5e3204f5c74efcd3ae9330f92838b  jetty-5.1.15.fedora.tgz
+716cc87428b90ef88b0461bc54856379  jetty-6.1.20-src.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 May 2009 21:10:34 -0000	1.4
+++ .cvsignore	15 Sep 2009 12:51:05 -0000	1.5
@@ -1,3 +1,4 @@
 jetty-5.1.12.fedora.zip
 jetty-5.1.14.fedora.tgz
 jetty-5.1.15.fedora.tgz
+jetty-6.1.20-src.zip


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- jetty.spec	25 Jul 2009 03:59:44 -0000	1.16
+++ jetty.spec	15 Sep 2009 12:51:05 -0000	1.17
@@ -28,18 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%bcond_without fedora
-
-%define gcj_support 1
-%define bootstrap 0
-
-# If you don't want the -extras subpackage to be built
-# in order to avoid its (Build)Requires
-# give rpmbuild option '--without extra'
-
-%define with_extra 0
-
-%define section     free
 %define jettyname   jetty
 %define jtuid       110
 %define username    %{name}
@@ -50,89 +38,55 @@
 %define tempdir     %{jettycachedir}/temp
 %define rundir      %{_localstatedir}/run/%{name}
 %define jettylibdir %{_localstatedir}/lib/%{name}
-%define libdir      %{jettylibdir}/lib
 %define appdir      %{jettylibdir}/webapps
-%define demodir     %{jettylibdir}/demo
 
 Name:           jetty
-Version:        5.1.15
-Release:        4%{?dist}
+Version:        6.1.20
+Release:        1%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
 License:        ASL 2.0
 URL:            http://jetty.mortbay.org/jetty/
-# Following source tarball was originally taken from the following location:
-# http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.15.tgz
-# The tarball was modified by removing all jars and BCLA licenses.
-# tar -xzf jetty-5.1.15.tgz
-# pushd jetty-5.1.15
-# find . -name *.jar -exec rm {} \;
-# rm ./etc/LICENSE.javax.xml.html ./etc/LICENSE.jsse.txt
-# popd
-# tar -czf jetty-5.1.15.fedora.tgz jetty-5.1.15/*
-Source0:        %{jettyname}-%{version}.fedora.tgz
-Source1:        jetty.script
+Source0:        http://dist.codehaus.org/jetty/jetty-6.1.20/jetty-6.1.20-src.zip
 Source2:        jetty.init
 Source3:        jetty.logrotate
-Source4:        jetty-OSGi-MANIFEST.MF
-Patch0:         jetty-extra-j2ee-build_xml.patch
-Patch1:         jetty-PostFileFilter.patch
-Patch2:         jetty-libgcj-bad-serialization.patch
-Patch3:         jetty-TestRFC2616-libgcj-bad-date-parser.patch
-Patch4:		jetty-webdefault.patch
+Source4:        %{name}-depmap.xml
+Source7:        %{name}-settings.xml
+Patch0:     disable-modules.patch
 Patch5:		jetty-unix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  fedora-usermgmt-devel
 %{?FE_USERADD_REQ}
 BuildRequires:  jpackage-utils >= 0:1.6
-#BuildRequires:  perl >= 0:5.005
 # build only
-BuildRequires:  ant-junit
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  junit
-BuildRequires:  xdoclet
-BuildRequires:  xjavadoc
-# main
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  jakarta-commons-el
-BuildRequires:  jakarta-commons-logging
-BuildRequires:  jsse
-BuildRequires:  mx4j >= 0:3.0
-BuildRequires:  tomcat5-jasper >= 5.5.26-1.5
-BuildRequires:  tomcat5-servlet-2.4-api >= 5.5.26-1.5
-BuildRequires:  xerces-j2 >= 0:2.7
-BuildRequires:  xml-commons-apis
-
-# extra
-%if %{with_extra}
-BuildRequires:  carol
-BuildRequires:  geronimo-j2ee-connector-1.5-api
-BuildRequires:  geronimo-j2ee-management-1.0-api
-BuildRequires:  howl-logger
-BuildRequires:  hsqldb
-BuildRequires:  jaf
-BuildRequires:  jakarta-commons-cli
-BuildRequires:  javamail
-BuildRequires:  jboss4-cluster
-BuildRequires:  jboss4-common
-BuildRequires:  jboss4-j2ee
-BuildRequires:  jboss4-jmx
-BuildRequires:  jboss4-security
-BuildRequires:  jboss4-server
-BuildRequires:  jboss4-system
-BuildRequires:  jgroups
-BuildRequires:  jotm
-BuildRequires:  geronimo-jta-1.0.1B-api
-BuildRequires:  log4j
-BuildRequires:  openorb-ots
-BuildRequires:  xapool
-%endif
-#
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-dependency
+BuildRequires: maven2-plugin-enforcer
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-plugin
+BuildRequires: maven2-plugin-project-info-reports
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-site
+BuildRequires: maven2-plugin-source
+BuildRequires: maven2-plugin-remote-resources
+BuildRequires: maven2-plugin-war
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-shared-dependency-tree
+BuildRequires: tomcat5
+BuildRequires: tomcat5-jasper
+BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: tomcat6-jsp-2.1-api
+BuildRequires: slf4j
+BuildRequires: objectweb-asm
+BuildRequires: jakarta-commons-el
+
 Requires:  chkconfig
 Requires:  jpackage-utils >= 0:1.6
 Requires:  ant >= 0:1.6
@@ -147,12 +101,6 @@ Requires:  xml-commons-apis
 Provides:  group(%username) = %jtuid
 Provides:  user(%username) = %jtuid
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 Jetty is a 100% Java HTTP Server and Servlet Container. 
 This means that you do not need to configure and run a 
@@ -175,56 +123,6 @@ Requires:       %{name} = %{version}
 %description    javadoc
 %{summary}.
 
-%if %{with_extra}
-%package        extra
-Summary:        Extras for %{name}
-Group:          Applications/Internet
-Requires:       %{name} = %{version}
-Requires:  carol
-Requires:  geronimo-j2ee-connector-1.5-api
-Requires:  geronimo-j2ee-management-1.0-api
-Requires:  howl-logger
-Requires:  hsqldb
-Requires:  jaf
-Requires:  jakarta-commons-cli
-Requires:  javamail
-Requires:  jboss4-cluster
-Requires:  jboss4-common
-Requires:  jboss4-j2ee
-Requires:  jboss4-jmx
-Requires:  jboss4-system
-Requires:  jboss4-security
-Requires:  jboss4-server
-Requires:  jgroups
-# jonas_timer
-# objectweb-datasource
-Requires:  jotm
-Requires:  geronimo-jta-1.0.1B-api
-Requires:  log4j
-Requires:  openorb-ots
-Requires:  xapool
-Requires:  xdoclet
-Requires:  xjavadoc
-
-%description    extra
-The purpose of this project is to enrich Jetty by 
-selectively incorporating useful J2EE and non-J2EE 
-features. The result is JettyPlus, an environment 
-offering additional facilities to core web and servlet 
-services, but which does not entail a full-blown 
-application server (such as JettyJBoss and JettyJOnAS). 
-The feature set currently contains: 
-Java Transaction API (JTA) and Resource references, eg DataSources 
-Java Naming and Directory Interface API (JNDI) 
-Log4J 
-Java Authentication and Authorization Service (JAAS) 
-Java Mail  
-These features have been implemented as a pluggable, 
-Service-based architecture. This means that it is 
-possible to develop and use alternative services to 
-those provided. 
-%endif
-
 %package        manual
 Summary:        Documents for %{name}
 Group:          Documentation
@@ -233,106 +131,67 @@ Requires:       %{name} = %{version}
 %description    manual
 %{summary}.
 
-
 %prep
 %setup -q -n %{jettyname}-%{version}
-mv demo/webapps/servlets-examples.war \
-  demo/webapps/servlets-examples-dontdelete
-mv demo/webapps/jsp-examples.war \
-  demo/webapps/jsp-examples-dontdelete
 for f in $(find . -name "*.?ar"); do rm $f; done
 find . -name "*.class" -exec rm {} \;
-# .war files needed for tests
-mv demo/webapps/servlets-examples-dontdelete \
-  demo/webapps/servlets-examples.war
-mv demo/webapps/jsp-examples-dontdelete \
-  demo/webapps/jsp-examples.war
-
-%if %{bootstrap}
-rm src/org/mortbay/util/jmx/MX4JHttpAdaptor.java
-%endif
 
 %patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%patch3 -b .sav
-%patch4
-%patch5
-
-# Delete this Sun specific file.
-rm src/org/mortbay/http/SunJsseListener.java
-
-# Convert line endings...
-%{__sed} -i 's/\r//' demo/webapps/jetty/auth/logon.html
-%{__sed} -i 's/\r//' demo/webapps/jetty/auth/logon.jsp
-%{__sed} -i 's/\r//' demo/webapps/jetty/auth/logonError.html
+#%patch5
 
-%build
+cp %{SOURCE7} settings.xml
+
+#remove glassfish specific file
+rm -fr modules/jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java
+
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/management/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/management/pom.xml
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/jsp-2.0/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/jsp-2.0/pom.xml
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/naming/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/naming/pom.xml
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/annotations/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/annotations/pom.xml
+
+sed -i "s|mvn|mvn-jpp|g" distribution/jetty-assembly/pom.xml
 
-pushd ext
-  ln -s $(build-classpath ant) .
-  ln -s $(build-classpath commons-el) .
-  ln -s $(build-classpath commons-logging) .
-  ln -s $(build-classpath jasper5-compiler) jasper-compiler.jar
-  ln -s $(build-classpath jasper5-runtime)  jasper-runtime.jar
-  ln -s $(build-classpath mx4j/mx4j) .
-  ln -s $(build-classpath mx4j/mx4j-jmx) .
-  ln -s $(build-classpath mx4j/mx4j-remote) .
-  ln -s $(build-classpath mx4j/mx4j-tools) .
-  ln -s $(build-classpath xerces-j2) xercesImpl.jar
-  ln -s $(build-classpath xml-commons-apis) xml-apis.jar
-popd
-%if %{with_extra}
-pushd extra/ext
-  ln -s $(build-classpath jaf) activation.jar
-  ln -s $(build-classpath commons-cli) .
-  ln -s $(build-classpath geronimo-j2ee-connector-1.5-api) connector-1_5.jar
-  ln -s $(build-classpath hsqldb) .
-  ln -s $(build-classpath geronimo-j2ee-management-1.0-api) javax77.jar
-  ln -s $(build-classpath geronimo-jta-1.0.1B-api) jta-spec1_0_1.jar
-  ln -s $(build-classpath log4j) .
-  ln -s $(build-classpath javamail/mailapi) mail.jar
-  ln -s $(build-classpath carol/ow_carol) .
-  ln -s $(build-classpath howl-logger) .
-#  #jonas_timer.jar
-  ln -s $(build-classpath jotm/jotm) .
-  ln -s $(build-classpath jotm/iiop-stubs) jotm_iiop_stubs.jar
-  ln -s $(build-classpath jotm/jrmp-stubs) jotm_jrmp_stubs.jar
-  ln -s $(build-classpath openorb-ots) jts1_0.jar
-  #objectweb-datasource.jar
-  ln -s $(build-classpath xapool) .
-popd
-%endif
-
-export CLASSPATH=$(build-classpath \
-xjavadoc \
-)
-
-%if %{with_extra}
-CLASSPATH=$CLASSPATH:$(build-classpath \
-jboss4/jboss-j2ee \
-jboss4/jboss-common \
-jboss4/jboss-system \
-jboss4/jboss-jmx \
-jboss4/jboss \
-jboss4/jbosssx \
-jboss4/jbossha \
-jgroups \
-log4j \
-)
-%endif
-
-%if %{with_extra}
-ant -Dxdoclet.home=%{_javadir}/xdoclet -Dbuild.sysclasspath=first all extra
-%else
-ant -Dxdoclet.home=%{_javadir}/xdoclet -Dbuild.sysclasspath=first all
-%endif
-
-# inject OSGi manifests
-mkdir -p META-INF
-cp %{SOURCE4} META-INF/MANIFEST.MF
-zip -u lib/org.mortbay.jetty.jar META-INF/MANIFEST.MF
+sed -i "s|zip \$D/\$N|zip \$D/\$N/\$N|g" bin/build_release_bundles.sh
 
+sed -i "s|# look for JETTY_HOME|export JETTY_HOME=/usr/share/jetty|g" bin/jetty-xinetd.sh
+
+%build
+sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
+sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
+sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
+
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
+
+mvn-jpp \
+    -e \
+    -s $(pwd)/settings.xml \
+    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+    -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+    -Dmaven.test.skip=true \
+    install
+    
+#pushd distribution/jetty-assembly
+#  mvn-jpp \
+#       -e \
+#       -s $(pwd)/settings.xml \
+#       -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+#       -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+#       -Dmaven.test.skip=true \
+#       install
+#popd
+
+sh bin/build_release_bundles.sh .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -341,50 +200,26 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir
 install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 install -dm 755 $RPM_BUILD_ROOT%{confdir}
-install -dm 755 $RPM_BUILD_ROOT%{confdir}/extra
-install -dm 755 $RPM_BUILD_ROOT%{demodir}
 install -dm 755 $RPM_BUILD_ROOT%{homedir}
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/bin
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/ext
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/extra
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/extra/ext
-install -dm 755 $RPM_BUILD_ROOT%{libdir}
-install -dm 755 $RPM_BUILD_ROOT%{libdir}/extra
 install -dm 755 $RPM_BUILD_ROOT%{logdir}
 install -dm 755 $RPM_BUILD_ROOT%{rundir}
 install -dm 755 $RPM_BUILD_ROOT%{tempdir}
 install -dm 755 $RPM_BUILD_ROOT%{appdir}
 # main pkg
-install -pm 755 extra/unix/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
-install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+unzip -q %{name}-%{version}.zip -d $RPM_BUILD_ROOT%{homedir}
+mv $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}/* $RPM_BUILD_ROOT%{homedir}/
+rm -fr $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}
+
+chmod +x $RPM_BUILD_ROOT%{homedir}/bin/jetty-xinetd.sh
+ln -s %{homedir}/bin/jetty-xinetd.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
+ln -s %{homedir}/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
 install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-install -pm 644 start.jar $RPM_BUILD_ROOT%{homedir}/bin
-install -pm 644 stop.jar $RPM_BUILD_ROOT%{homedir}/bin
-cp -pr etc/* $RPM_BUILD_ROOT%{confdir}
 echo '# Placeholder configuration file.  No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf
-install -pm 644 lib/org.mortbay.jetty.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
-install -pm 644 lib/org.mortbay.jmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmx-%{version}.jar
-install -pm 644 lib/javax.servlet.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-servlet-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-pushd $RPM_BUILD_ROOT%{libdir}
-  ln -sf %{_javadir}/%{name}/%{name}.jar org.mortbay.jetty.jar
-  ln -sf %{_javadir}/%{name}/%{name}-jmx.jar org.mortbay.jmx.jar
-popd
-pushd $RPM_BUILD_ROOT%{homedir}/ext
-ln -s $(build-classpath ant)
-ln -s $(build-classpath jasper5-compiler)
-ln -s $(build-classpath jasper5-runtime)
-ln -s $(build-classpath commons-el)
-ln -s $(build-classpath commons-logging)
-ln -s $(build-classpath mx4j/mx4j-jmx)
-ln -s $(build-classpath mx4j/mx4j-tools)
-ln -s $(build-classpath servletapi5)
-ln -s $(build-classpath jspapi)
-ln -s $(build-classpath xerces-j2)
-ln -s $(build-classpath xml-commons-apis)
-popd
+ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
+ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util-%{version}.jar
 ( cat << EO_RC
 JAVA_HOME=/usr/lib/jvm/java
 JAVA_OPTIONS=
@@ -396,98 +231,40 @@ JETTY_PID=\$JETTY_RUN/jetty.pid
 EO_RC
 ) > $RPM_BUILD_ROOT%{homedir}/.jettyrc
 
-# extra
-%if %{with_extra}
-cp -pr extra/etc/* $RPM_BUILD_ROOT%{confdir}/extra
-rm $RPM_BUILD_ROOT%{confdir}/extra/LICENSE.apache.txt
-rm $RPM_BUILD_ROOT%{confdir}/extra/LICENSE.hsqldb.html
-rm $RPM_BUILD_ROOT%{confdir}/extra/LICENSE.p6spy.html
-
-install -pm 644 extra/lib/org.jboss.jetty.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jboss-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.ftp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-ftp-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.j2ee.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-j2ee-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.jaas.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jaas-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.jsr77.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsr77-%{version}.jar
-# omit for 1.6
-# install -pm 644 extra/lib/org.mortbay.jetty-jdk1.2.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jetty-jdk1.2-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.jetty.plus.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-plus-%{version}.jar
-# omit for 1.6
-# install -pm 644 extra/lib/org.mortbay.jmx-jdk1.2.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmx-jdk1.2-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.loadbalancer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-loadbalancer-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-pushd $RPM_BUILD_ROOT%{libdir}/extra
-  ln -sf %{_javadir}/%{name}/%{name}-jboss.jar org.jboss.jetty.jar
-  ln -sf %{_javadir}/%{name}/%{name}-ftp.jar org.mortbay.ftp.jar
-  ln -sf %{_javadir}/%{name}/%{name}-j2ee.jar org.mortbay.j2ee.jar
-  ln -sf %{_javadir}/%{name}/%{name}-jaas.jar org.mortbay.jaas.jar
-  ln -sf %{_javadir}/%{name}/%{name}-jsr77.jar org.mortbay.jsr77.jar
-  ln -sf %{_javadir}/%{name}/%{name}-plus.jar org.mortbay.jetty.plus.jar
-  ln -sf %{_javadir}/%{name}/%{name}-loadbalancer.jar org.mortbay.loadbalancer.jar
-popd
-pushd $RPM_BUILD_ROOT%{homedir}/extra/ext
-  #jonas_timer.jar
-  #objectweb-datasource.jar
-ln -s $(build-classpath jaf)
-ln -s $(build-classpath carol/carol)
-ln -s $(build-classpath commons-cli)
-ln -s $(build-classpath hsqldb)
-ln -s $(build-classpath jotm/jotm)
-ln -s $(build-classpath jotm/iiop-stubs)
-ln -s $(build-classpath jotm/jrmp-stubs)
-ln -s $(build-classpath jta)
-ln -s $(build-classpath openorb-ots)
-ln -s $(build-classpath log4j)
-ln -s $(build-classpath javamail/mailapi)
-ln -s $(build-classpath xapool)
-popd
-%endif
-
-cp -pr demo/* $RPM_BUILD_ROOT%{demodir}
-
 # javadoc
-cp -pr webapps/* $RPM_BUILD_ROOT%{appdir}
-rm $RPM_BUILD_ROOT/%{appdir}/template/WEB-INF/lib/.keepme
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-pushd $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-unzip -q $RPM_BUILD_ROOT%{appdir}/javadoc.war
-%{__sed} -i 's/\r//' META-INF/MANIFEST.MF
-popd
+mv $RPM_BUILD_ROOT%{homedir}/jxr/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 # manual
 install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p {LICENSE.TXT,VERSION.TXT} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mv $RPM_BUILD_ROOT%{demodir}/webapps/jetty/* \
-                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/WEB-INF/.cvsignore
-rm -rf $RPM_BUILD_ROOT%{appdir}/jetty
-# Remaining files in demodir are not built into any subpackage.
-rm -rf $RPM_BUILD_ROOT%{demodir}/*
-
-
-pushd $RPM_BUILD_ROOT%{homedir}
-   [ -d etc ]    || ln -fs %{confdir}   etc
-   [ -d demo ]    || ln -fs %{demodir}   demo
-   [ -d logs ]    || ln -fs %{logdir}    logs
-   [ -d lib ]     || ln -fs %{libdir}    lib
-   [ -d temp ]    || ln -fs %{tempdir}   temp
-   [ -d webapps ] || ln -fs %{appdir}    webapps
-%if %{with_extra}
-   pushd extra
-     [ -d etc ]    || ln -fs %{confdir}/extra  etc
-     [ -d lib ]    || ln -fs %{libdir}/extra    lib
-   popd
-%endif
-popd
-
-# no need to fix paths
-#perl -pi -e 's#etc/#conf/#g;' $RPM_BUILD_ROOT%{confdir}/*.xml
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm \
-      --exclude /var/lib/jetty/webapps/javadoc.war \
-      --exclude /usr/share/doc/jetty-%{version}/WEB-INF/classes \
-      --exclude /var/lib/jetty/webapps/template/WEB-INF/classes
-%endif
+
+rm -fr $RPM_BUILD_ROOT%{homedir}/logs
+ln -s %{logdir} $RPM_BUILD_ROOT%{homedir}/logs
+
+mv $RPM_BUILD_ROOT%{homedir}/etc/* $RPM_BUILD_ROOT/%{confdir}
+rm -fr $RPM_BUILD_ROOT%{homedir}/etc
+ln -s %{confdir} $RPM_BUILD_ROOT%{homedir}/etc
+
+mv $RPM_BUILD_ROOT%{homedir}/webapps/* $RPM_BUILD_ROOT/%{appdir}
+rm -fr $RPM_BUILD_ROOT%{homedir}/webapps
+ln -s %{appdir} $RPM_BUILD_ROOT%{homedir}/webapps
+
+rm -fr $RPM_BUILD_ROOT%{homedir}/contrib
+rm -fr $RPM_BUILD_ROOT%{homedir}/distribution
+rm -fr $RPM_BUILD_ROOT%{homedir}/examples
+rm -fr $RPM_BUILD_ROOT%{homedir}/extras
+rm -fr $RPM_BUILD_ROOT%{homedir}/modules
+rm -fr $RPM_BUILD_ROOT%{homedir}/patches
+rm -fr $RPM_BUILD_ROOT%{homedir}/jxr
+rm -fr $RPM_BUILD_ROOT%{homedir}/project-website
+rm -fr $RPM_BUILD_ROOT%{homedir}/LICENSES
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/jetty-service.conf
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/Jetty-Service.exe
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/README.jetty-cygwin.txt.txt
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/build_release_bundles.sh
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/jetty-cygwin.sh
+rm -fr $RPM_BUILD_ROOT%{homedir}/*.txt
+rm -fr $RPM_BUILD_ROOT%{homedir}/pom.*
+rm -fr $RPM_BUILD_ROOT%{homedir}/*.zip
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -501,22 +278,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 [ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name}
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %__fe_userdel  %username &>/dev/null || :
 %__fe_groupdel %username &>/dev/null || :
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 
 %preun
@@ -532,80 +297,34 @@ fi
 %{_bindir}/*
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}-%{version}.jar
-%{_javadir}/%{name}/%{name}-jmx-%{version}.jar
-%{_javadir}/%{name}/%{name}-servlet-%{version}.jar
-%{_javadir}/%{name}/%{name}.jar
-%{_javadir}/%{name}/%{name}-jmx.jar
-%{_javadir}/%{name}/%{name}-servlet.jar
+%{_javadir}/%{name}/%{name}-util-%{version}.jar
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
 %dir %{jettycachedir}
-%dir %{libdir}
-%{libdir}/org.mortbay.jetty.jar
-%{libdir}/org.mortbay.jmx.jar
-%dir %{homedir}
-%{homedir}/[^e]*
-%{homedir}/ext
-%{homedir}/etc
-%{homedir}/.jettyrc
-%dir %{demodir}
+%{homedir}
+%{appdir}
 %attr(755, jetty, jetty) %{logdir}
 %attr(755, jetty, jetty) %{tempdir}
 %attr(755, jetty, jetty) %{rundir}
 %dir %{appdir}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/LICENSE.TXT
-%doc %{_docdir}/%{name}-%{version}/VERSION.TXT
+%doc NOTICE.txt
+%doc README.txt
+%doc VERSION.txt
 %{_initrddir}/%{name}
 %{_sysconfdir}/logrotate.d/%{name}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}/
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.so
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.db
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
-%{appdir}/template
-%{appdir}/javadoc.war
 %doc %{_javadocdir}/%{name}-%{version}
 
 %files manual
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
 
-%if %{with_extra}
-%files extra
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/%{name}-ftp-%{version}.jar
-%{_javadir}/%{name}/%{name}-ftp.jar
-%{_javadir}/%{name}/%{name}-j2ee-%{version}.jar
-%{_javadir}/%{name}/%{name}-j2ee.jar
-%{_javadir}/%{name}/%{name}-jaas-%{version}.jar
-%{_javadir}/%{name}/%{name}-jaas.jar
-%{_javadir}/%{name}/%{name}-jboss-%{version}.jar
-%{_javadir}/%{name}/%{name}-jboss.jar
-%{_javadir}/%{name}/%{name}-jsr77-%{version}.jar
-%{_javadir}/%{name}/%{name}-jsr77.jar
-%{_javadir}/%{name}/%{name}-loadbalancer-%{version}.jar
-%{_javadir}/%{name}/%{name}-loadbalancer.jar
-%{_javadir}/%{name}/%{name}-plus-%{version}.jar
-%{_javadir}/%{name}/%{name}-plus.jar
-%{confdir}/extra
-%{homedir}/extra
-%{libdir}/extra
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-ftp-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-j2ee-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jaas-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jboss-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsr77-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-loadbalancer-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-plus-%{version}.jar.*
-%endif
-%endif
-
 %changelog
+* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-1
+- Update to upstream 6.1.20.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- jetty-OSGi-MANIFEST.MF DELETED ---


--- jetty-webdefault.patch DELETED ---


--- jetty-TestRFC2616-libgcj-bad-date-parser.patch DELETED ---


--- jetty-libgcj-bad-serialization.patch DELETED ---


--- jetty-CERT438616-CERT237888-CERT21284.patch DELETED ---


--- jetty-PostFileFilter.patch DELETED ---


--- jetty-extra-j2ee-build_xml.patch DELETED ---



From atkac at fedoraproject.org  Tue Sep 15 12:56:46 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Sep 2009 12:56:46 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.55, 1.56 bind-9.3.2b2-sdbsrc.patch,
	1.1, 1.2 bind-9.5-sdb.patch, 1.3, 1.4 bind-96-dyndb.patch, 1.9,
	1.10 bind.spec, 1.324, 1.325 sources, 1.64,
	1.65 bind-96-db_unregister.patch, 1.1,
	NONE bind96-rh507469.patch, 1.1, NONE
Message-ID: <20090915125646.8673D11C00CE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11996

Modified Files:
	.cvsignore bind-9.3.2b2-sdbsrc.patch bind-9.5-sdb.patch 
	bind-96-dyndb.patch bind.spec sources 
Removed Files:
	bind-96-db_unregister.patch bind96-rh507469.patch 
Log Message:
- update to 9.7.0a2
- merged patches
  - bind-96-db_unregister.patch
  - bind96-rh507469.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	29 Jul 2009 13:18:38 -0000	1.55
+++ .cvsignore	15 Sep 2009 12:56:45 -0000	1.56
@@ -1,2 +1,2 @@
-bind-9.6.1-P1.tar.gz
+bind-9.7.0a2.tar.gz
 config-4.tar.bz2

bind-9.3.2b2-sdbsrc.patch:
 bdb/bdb.c        |    2 -
 ldap/zone2ldap.c |   59 +++++++++++++++++++++++++++++++------------------------
 pgsql/pgsqldb.c  |    2 -
 pgsql/zonetodb.c |   11 ++++++++--
 4 files changed, 45 insertions(+), 29 deletions(-)

Index: bind-9.3.2b2-sdbsrc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.3.2b2-sdbsrc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bind-9.3.2b2-sdbsrc.patch	3 Dec 2005 00:10:48 -0000	1.1
+++ bind-9.3.2b2-sdbsrc.patch	15 Sep 2009 12:56:45 -0000	1.2
@@ -241,12 +241,3 @@
  void
  addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
  	unsigned char namearray[DNS_NAME_MAXTEXT + 1];
-@@ -165,7 +172,7 @@
- 	check_result(result, "isc_mem_create");
- 
- 	result = isc_entropy_create(mctx, &ectx);
--	result_check (result, "isc_entropy_create");
-+	check_result (result, "isc_entropy_create");
- 
- 	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
- 	check_result (result, "isc_hash_create");

bind-9.5-sdb.patch:
 bin/Makefile.in           |    3 +-
 bin/named-sdb/Makefile.in |   20 +++++---------
 bin/named-sdb/main.c      |   62 ++++++++++++++++++++++++++++++++++++++++++++++
 bin/named/Makefile.in     |   12 ++------
 configure.in              |    3 ++
 5 files changed, 78 insertions(+), 22 deletions(-)

Index: bind-9.5-sdb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-sdb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bind-9.5-sdb.patch	19 Feb 2008 10:20:49 -0000	1.3
+++ bind-9.5-sdb.patch	15 Sep 2009 12:56:45 -0000	1.4
@@ -1,7 +1,67 @@
-diff -up bind-9.5.0b2/bin/named-sdb/main.c.sdb bind-9.5.0b2/bin/named/main-sdb.c
---- bind-9.5.0b2/bin/named-sdb/main.c.sdb	2008-02-11 17:32:43.000000000 +0100
-+++ bind-9.5.0b2/bin/named-sdb/main.c	2008-02-11 17:32:43.000000000 +0100
-@@ -72,6 +72,9 @@
+diff -up bind-9.7.0a2/bin/Makefile.in.sdb bind-9.7.0a2/bin/Makefile.in
+--- bind-9.7.0a2/bin/Makefile.in.sdb	2009-06-10 02:27:21.000000000 +0200
++++ bind-9.7.0a2/bin/Makefile.in	2009-09-15 14:43:48.966994484 +0200
+@@ -19,7 +19,8 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate check confgen
++SUBDIRS =	named named-sdb rndc dig dnssec tests tools nsupdate check \
++		confgen sdb_tools
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile.in
+--- bind-9.7.0a2/bin/named/Makefile.in.sdb	2009-09-15 14:41:03.827015348 +0200
++++ bind-9.7.0a2/bin/named/Makefile.in	2009-09-15 14:41:03.886994927 +0200
+@@ -45,7 +45,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
+ 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
+ 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
+ 
+-CDEFINES =      @USE_DLZ@
++CDEFINES =
+ 
+ CWARNINGS =
+ 
+@@ -68,7 +68,7 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+ 
+ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
+ 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
+-		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
++		@LIBS@
+ 
+ SUBDIRS =	unix
+ 
+@@ -81,8 +81,7 @@ OBJS =		builtin. at O@ client. at O@ config. at O
+ 		tkeyconf. at O@ tsigconf. at O@ update. at O@ xfrout. at O@ \
+ 		zoneconf. at O@ \
+ 		lwaddr. at O@ lwresd. at O@ lwdclient. at O@ lwderror. at O@ lwdgabn. at O@ \
+-		lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@ \
+-		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
++		lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@
+ 
+ UOBJS =		unix/os. at O@
+ 
+@@ -93,8 +92,7 @@ SRCS =		builtin.c client.c config.c cont
+ 		tkeyconf.c tsigconf.c update.c xfrout.c \
+ 		zoneconf.c \
+ 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
+-		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
+-		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
++		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
+ 
+ MANPAGES =	named.8 lwresd.8 named.conf.5
+ 
+@@ -158,5 +156,3 @@ install:: named at EXEEXT@ lwresd at EXEEXT@ i
+ 	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
+-
+- at DLZ_DRIVER_RULES@
+diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
+--- bind-9.7.0a2/bin/named-sdb/main.c.sdb	2009-09-15 14:41:03.846995272 +0200
++++ bind-9.7.0a2/bin/named-sdb/main.c	2009-09-15 14:41:03.886994927 +0200
+@@ -74,6 +74,9 @@
   * Include header files for database drivers here.
   */
  /* #include "xxdb.h" */
@@ -11,7 +71,7 @@ diff -up bind-9.5.0b2/bin/named-sdb/main
  
  /*
   * Include DLZ drivers if appropriate.
-@@ -641,6 +644,10 @@ setup(void) {
+@@ -685,6 +688,10 @@ setup(void) {
  		ns_main_earlyfatal("isc_app_start() failed: %s",
  				   isc_result_totext(result));
  
@@ -22,7 +82,7 @@ diff -up bind-9.5.0b2/bin/named-sdb/main
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
  		      saved_command_line);
-@@ -702,6 +709,57 @@ setup(void) {
+@@ -766,6 +773,57 @@ setup(void) {
  				   isc_result_totext(result));
  #endif
  
@@ -80,7 +140,7 @@ diff -up bind-9.5.0b2/bin/named-sdb/main
  	ns_server_create(ns_g_mctx, &ns_g_server);
  }
  
-@@ -727,6 +785,10 @@ cleanup(void) {
+@@ -793,6 +851,10 @@ cleanup(void) {
  
  	dns_name_destroy();
  
@@ -91,30 +151,10 @@ diff -up bind-9.5.0b2/bin/named-sdb/main
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
-diff -up bind-9.5.0b2/configure.in.sdb bind-9.5.0b2/configure.in
---- bind-9.5.0b2/configure.in.sdb	2008-02-14 14:14:55.000000000 +0100
-+++ bind-9.5.0b2/configure.in	2008-02-14 14:15:34.000000000 +0100
-@@ -2761,6 +2761,8 @@ AC_CONFIG_FILES([
- 	bin/check/Makefile
- 	bin/named/Makefile
- 	bin/named/unix/Makefile
-+	bin/named-sdb/Makefile
-+	bin/named-sdb/unix/Makefile
- 	bin/rndc/Makefile
- 	bin/rndc/unix/Makefile
- 	bin/dig/Makefile
-@@ -2782,6 +2784,7 @@ AC_CONFIG_FILES([
- 	bin/tests/system/tkey/Makefile
- 	bin/tests/headerdep_test.sh
- 	bin/dnssec/Makefile
-+	bin/sdb_tools/Makefile
- 	doc/Makefile
- 	doc/arm/Makefile
- 	doc/misc/Makefile
-diff -up bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb bind-9.5.0b2/bin/named-sdb/Makefile.in
---- bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb	2008-02-14 14:16:10.000000000 +0100
-+++ bind-9.5.0b2/bin/named-sdb/Makefile.in	2008-02-14 14:18:45.000000000 +0100
-@@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
+diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/Makefile.in
+--- bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb	2009-09-15 14:41:03.846995272 +0200
++++ bind-9.7.0a2/bin/named-sdb/Makefile.in	2009-09-15 14:43:19.486994430 +0200
+@@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
  #
@@ -128,7 +168,7 @@ diff -up bind-9.5.0b2/bin/named-sdb/Make
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-@@ -70,7 +70,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9L
+@@ -72,7 +72,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9L
  
  SUBDIRS =	unix
  
@@ -137,8 +177,8 @@ diff -up bind-9.5.0b2/bin/named-sdb/Make
  
  OBJS =		builtin. at O@ client. at O@ config. at O@ control. at O@ \
  		controlconf. at O@ interfacemgr. at O@ \
-@@ -118,7 +118,7 @@ config. at O@: config.c
- 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
+@@ -125,7 +125,7 @@ config. at O@: config.c bind.keys.h
+ 		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
  		-c ${srcdir}/config.c
  
 -named at EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
@@ -146,7 +186,7 @@ diff -up bind-9.5.0b2/bin/named-sdb/Make
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
  	${OBJS} ${UOBJS} ${LIBS}
  
-@@ -142,14 +142,8 @@ server.o: bind9.xsl.h
+@@ -149,14 +149,8 @@ statschannel. at O@: bind9.xsl.h
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -163,62 +203,23 @@ diff -up bind-9.5.0b2/bin/named-sdb/Make
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb at EXEEXT@ ${DESTDIR}${sbindir}
  
  @DLZ_DRIVER_RULES@
-diff -up bind-9.5.0b2/bin/Makefile.in.sdb bind-9.5.0b2/bin/Makefile.in
---- bind-9.5.0b2/bin/Makefile.in.sdb	2008-02-14 14:15:42.000000000 +0100
-+++ bind-9.5.0b2/bin/Makefile.in	2008-02-14 14:15:55.000000000 +0100
-@@ -19,7 +19,7 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests nsupdate check
-+SUBDIRS =	named named-sdb rndc dig dnssec tests nsupdate check sdb_tools
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -up bind-9.5.0b2/bin/named/Makefile.in.sdb bind-9.5.0b2/bin/named/Makefile.in
---- bind-9.5.0b2/bin/named/Makefile.in.sdb	2008-02-14 14:19:39.000000000 +0100
-+++ bind-9.5.0b2/bin/named/Makefile.in	2008-02-14 14:20:18.000000000 +0100
-@@ -43,7 +43,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
- 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
- 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
- 
--CDEFINES =      @USE_DLZ@
-+CDEFINES =
- 
- CWARNINGS =
- 
-@@ -66,7 +66,7 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
- 
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- SUBDIRS =	unix
- 
-@@ -79,8 +79,7 @@ OBJS =		builtin. at O@ client. at O@ config. at O
- 		tkeyconf. at O@ tsigconf. at O@ update. at O@ xfrout. at O@ \
- 		zoneconf. at O@ \
- 		lwaddr. at O@ lwresd. at O@ lwdclient. at O@ lwderror. at O@ lwdgabn. at O@ \
--		lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@ \
--		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
-+		lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@
- 
- UOBJS =		unix/os. at O@
- 
-@@ -91,8 +90,7 @@ SRCS =		builtin.c client.c config.c cont
- 		tkeyconf.c tsigconf.c update.c xfrout.c \
- 		zoneconf.c \
- 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
--		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
--		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
-+		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
- 
- MANPAGES =	named.8 lwresd.8 named.conf.5
- 
-@@ -151,5 +149,3 @@ install:: named at EXEEXT@ lwresd at EXEEXT@ i
- 	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
- 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
- 	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
--
-- at DLZ_DRIVER_RULES@
+diff -up bind-9.7.0a2/configure.in.sdb bind-9.7.0a2/configure.in
+--- bind-9.7.0a2/configure.in.sdb	2009-07-15 00:38:37.000000000 +0200
++++ bind-9.7.0a2/configure.in	2009-09-15 14:43:00.036994464 +0200
+@@ -2958,6 +2958,8 @@ AC_CONFIG_FILES([
+ 	bin/confgen/unix/Makefile
+ 	bin/named/Makefile
+ 	bin/named/unix/Makefile
++	bin/named-sdb/Makefile
++	bin/named-sdb/unix/Makefile
+ 	bin/rndc/Makefile
+ 	bin/dig/Makefile
+ 	bin/nsupdate/Makefile
+@@ -2979,6 +2981,7 @@ AC_CONFIG_FILES([
+ 	bin/tests/headerdep_test.sh
+ 	bin/tools/Makefile
+ 	bin/dnssec/Makefile
++	bin/sdb_tools/Makefile
+ 	doc/Makefile
+ 	doc/arm/Makefile
+ 	doc/misc/Makefile

bind-96-dyndb.patch:
 bin/named/main.c                 |    3 
 bin/named/server.c               |  102 ++++++++++
 lib/dns/Makefile.in              |   11 -
 lib/dns/dynamic_db.c             |  364 +++++++++++++++++++++++++++++++++++++++
 lib/dns/include/dns/Makefile.in  |    2 
 lib/dns/include/dns/dynamic_db.h |   50 +++++
 lib/dns/include/dns/log.h        |    1 
 lib/dns/include/dns/types.h      |    1 
 lib/dns/log.c                    |    1 
 lib/isccfg/namedconf.c           |   36 +++
 10 files changed, 567 insertions(+), 4 deletions(-)

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bind-96-dyndb.patch	4 Aug 2009 05:15:49 -0000	1.9
+++ bind-96-dyndb.patch	15 Sep 2009 12:56:46 -0000	1.10
@@ -1,5 +1,6 @@
---- a/bin/named/main.c
-+++ b/bin/named/main.c
+diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c
+--- bind-9.7.0a2/bin/named/main.c.dyndb	2009-05-07 11:33:52.000000000 +0200
++++ bind-9.7.0a2/bin/named/main.c	2009-09-15 14:35:49.054494598 +0200
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -8,7 +9,7 @@
  #include <dns/name.h>
  #include <dns/result.h>
  #include <dns/view.h>
-@@ -760,6 +761,8 @@ setup(void) {
+@@ -770,6 +771,8 @@ setup(void) {
  
  static void
  cleanup(void) {
@@ -17,9 +18,10 @@
  	destroy_managers();
  
  	ns_server_destroy(&ns_g_server);
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -57,6 +57,7 @@
+diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c
+--- bind-9.7.0a2/bin/named/server.c.dyndb	2009-08-05 19:35:33.000000000 +0200
++++ bind-9.7.0a2/bin/named/server.c	2009-09-15 14:35:49.064494786 +0200
+@@ -58,6 +58,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -27,7 +29,7 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -1036,6 +1037,72 @@ configure_peer(const cfg_obj_t *cpeer, i
  }
  
  static isc_result_t
@@ -100,7 +102,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
+@@ -1245,6 +1312,7 @@ configure_view(dns_view_t *view, const c
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -108,7 +110,7 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1189,6 +1257,37 @@ configure_view(dns_view_t *view, const c
+@@ -1429,6 +1497,37 @@ configure_view(dns_view_t *view, const c
  #endif
  
  	/*
@@ -146,7 +148,7 @@
  	 * Obtain configuration parameters that affect the decision of whether
  	 * we can reuse/share an existing cache.
  	 */
-@@ -2942,6 +3041,7 @@ load_configuration(const char *filename,
+@@ -3581,6 +3680,7 @@ load_configuration(const char *filename,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
  
@@ -154,7 +156,7 @@
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4185,6 +4285,8 @@ loadconfig(ns_server_t *server) {
+@@ -4927,6 +5027,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -163,41 +165,9 @@
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
---- a/lib/dns/Makefile.in
-+++ b/lib/dns/Makefile.in
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-@@ -114,6 +115,11 @@ version. at O@: version.c
- 		-DLIBAGE=${LIBAGE} \
- 		-c ${srcdir}/version.c
- 
-+dynamic_db. at O@: dynamic_db.c
-+	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-+	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
-+	-c ${srcdir}/dynamic_db.c
-+
- libdns. at SA@: ${OBJS}
- 	${AR} ${ARFLAGS} $@ ${OBJS}
- 	${RANLIB} $@
---- /dev/null
-+++ b/lib/dns/dynamic_db.c
+diff -up /dev/null bind-9.7.0a2/lib/dns/dynamic_db.c
+--- /dev/null	2009-09-15 11:43:46.690717252 +0200
++++ bind-9.7.0a2/lib/dns/dynamic_db.c	2009-09-15 14:35:49.064494786 +0200
 @@ -0,0 +1,364 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -563,19 +533,9 @@
 +
 +	return args->timermgr;
 +}
---- a/lib/dns/include/dns/Makefile.in
-+++ b/lib/dns/include/dns/Makefile.in
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
---- /dev/null
-+++ b/lib/dns/include/dns/dynamic_db.h
+diff -up /dev/null bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h
+--- /dev/null	2009-09-15 11:43:46.690717252 +0200
++++ bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h	2009-09-15 14:35:49.064494786 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -627,8 +587,9 @@
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
---- a/lib/dns/include/dns/log.h
-+++ b/lib/dns/include/dns/log.h
+diff -up bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb bind-9.7.0a2/lib/dns/include/dns/log.h
+--- bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb	2009-01-18 00:47:43.000000000 +0100
++++ bind-9.7.0a2/lib/dns/include/dns/log.h	2009-09-15 14:35:49.064494786 +0200
 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
@@ -637,8 +598,21 @@
  
  ISC_LANG_BEGINDECLS
  
---- a/lib/dns/include/dns/types.h
-+++ b/lib/dns/include/dns/types.h
+diff -up bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/include/dns/Makefile.in
+--- bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
++++ bind-9.7.0a2/lib/dns/include/dns/Makefile.in	2009-09-15 14:35:49.064494786 +0200
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff -up bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb bind-9.7.0a2/lib/dns/include/dns/types.h
+--- bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb	2009-07-19 06:18:05.000000000 +0200
++++ bind-9.7.0a2/lib/dns/include/dns/types.h	2009-09-15 14:35:49.064494786 +0200
 @@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
@@ -647,8 +621,9 @@
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
---- a/lib/dns/log.c
-+++ b/lib/dns/log.c
+diff -up bind-9.7.0a2/lib/dns/log.c.dyndb bind-9.7.0a2/lib/dns/log.c
+--- bind-9.7.0a2/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
++++ bind-9.7.0a2/lib/dns/log.c	2009-09-15 14:35:49.064494786 +0200
 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
@@ -657,9 +632,45 @@
  	{ NULL, 		0 }
  };
  
---- a/lib/isccfg/namedconf.c
-+++ b/lib/isccfg/namedconf.c
-@@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
+diff -up bind-9.7.0a2/lib/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/Makefile.in
+--- bind-9.7.0a2/lib/dns/Makefile.in.dyndb	2009-09-15 14:35:49.044494756 +0200
++++ bind-9.7.0a2/lib/dns/Makefile.in	2009-09-15 14:36:51.104494645 +0200
+@@ -57,8 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
+-		keydata. at O@ keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ iptable. at O@ \
++		journal. at O@ keydata. at O@ keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ \
+ 		portlist. at O@ \
+@@ -84,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keydata.c keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+@@ -115,6 +115,11 @@ version. at O@: version.c
+ 		-DLIBAGE=${LIBAGE} \
+ 		-c ${srcdir}/version.c
+ 
++dynamic_db. at O@: dynamic_db.c
++	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
++	-c ${srcdir}/dynamic_db.c
++
+ libdns. at SA@: ${OBJS}
+ 	${AR} ${ARFLAGS} $@ ${OBJS}
+ 	${RANLIB} $@
+diff -up bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb bind-9.7.0a2/lib/isccfg/namedconf.c
+--- bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb	2009-07-29 19:52:00.000000000 +0200
++++ bind-9.7.0a2/lib/isccfg/namedconf.c	2009-09-15 14:37:13.096994453 +0200
+@@ -87,6 +87,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
  static cfg_type_t cfg_type_dialuptype;
@@ -667,15 +678,15 @@
  static cfg_type_t cfg_type_ixfrdifftype;
  static cfg_type_t cfg_type_key;
  static cfg_type_t cfg_type_logfile;
-@@ -651,6 +652,7 @@ namedconf_or_view_clauses[] = {
+@@ -760,6 +761,7 @@ namedconf_or_view_clauses[] = {
  	{ "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
  	/* only 1 DLZ per view allowed */
  	{ "dlz", &cfg_type_dynamically_loadable_zones, 0 },
 +	{ "dynamic-db", &cfg_type_dynamic_db, CFG_CLAUSEFLAG_MULTI },
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
- 	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
- 	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
+ 	{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
+ 	{ "managed-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
+@@ -1531,6 +1533,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- bind.spec	1 Sep 2009 10:22:39 -0000	1.324
+++ bind.spec	15 Sep 2009 12:56:46 -0000	1.325
@@ -2,11 +2,11 @@
 # Red Hat BIND package .spec file
 #
 
-%define PATCHVER P1
+#%define PATCHVER P1
 #%define PREVER rc1
-#%define VERSION %{version}
 #%define VERSION %{version}-%{PATCHVER}
-%define VERSION %{version}-%{PATCHVER}
+%define PREVER a2
+%define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
 %{?!test:      %define test      0}
@@ -19,8 +19,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  ISC
-Version:  9.6.1
-Release:  9.%{PATCHVER}%{?dist}
+Version:  9.7.0
+Release:  0.1.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +50,6 @@ Patch99: bind-96-libtool2.patch
 Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
-Patch107:bind96-rh507469.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -60,7 +59,6 @@ Patch62: bind-9.5-sdb-sqlite-bld.patch
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 Patch104: bind-96-dyndb.patch
-Patch105: bind-96-db_unregister.patch
 
 # IDN paches
 Patch73: bind-9.5-libidn.patch
@@ -167,7 +165,6 @@ Based on the code from Jan "Yenya" Kaspr
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
 %patch104 -p1 -b .dyndb
-%patch105 -p1 -b .db_unregister
 %if %{SDB}
 %patch101 -p1 -b .old-api
 mkdir bin/named-sdb
@@ -215,7 +212,6 @@ mkdir m4
 
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
-%patch107 -p1 -b .rh507469
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -315,6 +311,10 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}
 #end chroot
 
 make DESTDIR=${RPM_BUILD_ROOT} install
+
+# Remove unwanted files
+rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
+
 install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
@@ -493,6 +493,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
+%{_sbindir}/arpaname
+%{_sbindir}/ddns-confgen
+%{_sbindir}/genrandom
+%{_sbindir}/journalprint
+%{_sbindir}/nsec3hash
 %{_sbindir}/dnssec*
 %{_sbindir}/named-check*
 %{_sbindir}/lwresd
@@ -500,6 +505,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/named-bootconf
 %{_sbindir}/rndc*
 %{_sbindir}/named-compilezone
+%{_mandir}/man1/arpaname.1*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/rndc.8*
@@ -510,6 +516,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
 %{_mandir}/man8/rndc-confgen.8*
+%{_mandir}/man8/ddns-confgen.8*
+%{_mandir}/man8/genrandom.8*
+%{_mandir}/man8/journalprint.8*
+%{_mandir}/man8/nsec3hash.8*
 %doc CHANGES COPYRIGHT README named.conf.default
 %doc doc/arm doc/misc doc/draft doc/rfc
 %doc sample/
@@ -582,6 +592,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.1.a2
+- update to 9.7.0a2
+- merged patches
+  - bind-96-db_unregister.patch
+  - bind96-rh507469.patch
+
 * Tue Sep 01 2009 Adam Tkac <atkac redhat com> 32:9.6.1-9.P1
 - next attempt to fix the postun trigger (#520385)
 - remove obsolete bind-9.3.1rc1-fix_libbind_includedir.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	29 Jul 2009 13:18:39 -0000	1.64
+++ sources	15 Sep 2009 12:56:46 -0000	1.65
@@ -1,2 +1,2 @@
-e6ce3b355c4e6bf5d66ef100f555da3f  bind-9.6.1-P1.tar.gz
+e2e3fd011f57dcec46d2f968016e3e93  bind-9.7.0a2.tar.gz
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2


--- bind-96-db_unregister.patch DELETED ---


--- bind96-rh507469.patch DELETED ---



From hadess at fedoraproject.org  Tue Sep 15 12:57:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Sep 2009 12:57:22 +0000 (UTC)
Subject: rpms/totem/devel 0001-Set-the-PA-stream-volume-from-Totem.patch,
	NONE, 1.1 totem.spec, 1.255, 1.256
Message-ID: <20090915125722.8631711C0334@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12369

Modified Files:
	totem.spec 
Added Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch 
Log Message:
* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
- Use PA to set the stream volume


0001-Set-the-PA-stream-volume-from-Totem.patch:
 bacon-video-widget-gst-0.10.c |   96 +++++++++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 20 deletions(-)

--- NEW FILE 0001-Set-the-PA-stream-volume-from-Totem.patch ---
>From d0db90fd6bbc2c2bae92dfa717c1b9c77c0ecc4e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 15 Sep 2009 13:54:29 +0100
Subject: [PATCH] Set the PA stream volume from Totem

...instead of having a separate one.

- avoid setting the volume when pulsesink isn't in a state where it has
a stream
- don't set the volume on the stream on startup when using pulsesink
---
 src/backend/bacon-video-widget-gst-0.10.c |   95 +++++++++++++++++++++++------
 1 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index b5a19ff..262e5a6 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -189,7 +189,9 @@ struct BaconVideoWidgetPrivate
   gboolean                     cursor_shown;
   gboolean                     fullscreen_mode;
   gboolean                     auto_resize;
-  gboolean                     uses_fakesink;
+  gboolean                     uses_audio_fakesink;
+  GstElement                  *pulse_audio_sink;
+  gdouble                      volume;
   gboolean                     is_menu;
   
   gint                         video_width; /* Movie width */
@@ -1210,6 +1212,7 @@ bacon_video_widget_init (BaconVideoWidget * bvw)
   priv->audiotags = NULL;
   priv->videotags = NULL;
   priv->zoom = 1.0;
+  priv->volume = -1.0;
 
   priv->lock = g_mutex_new ();
 
@@ -2234,6 +2237,11 @@ bacon_video_widget_finalize (GObject * object)
   g_free (bvw->priv->vis_element_name);
   bvw->priv->vis_element_name = NULL;
 
+  if (bvw->priv->pulse_audio_sink) {
+    g_object_unref (bvw->priv->pulse_audio_sink);
+    bvw->priv->pulse_audio_sink = NULL;
+  }
+
   if (bvw->priv->vis_plugins_list) {
     g_list_free (bvw->priv->vis_plugins_list);
     bvw->priv->vis_plugins_list = NULL;
@@ -2350,7 +2358,7 @@ bacon_video_widget_get_property (GObject * object, guint property_id,
       bacon_video_widget_get_show_cursor (bvw));
       break;
     case PROP_VOLUME:
-      g_value_set_double (value, bacon_video_widget_get_volume (bvw));
+      g_value_set_double (value, bvw->priv->volume);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -3854,7 +3862,7 @@ bacon_video_widget_can_set_volume (BaconVideoWidget * bvw)
   if (bvw->priv->speakersetup == BVW_AUDIO_SOUND_AC3PASSTHRU)
     return FALSE;
 
-  return !bvw->priv->uses_fakesink;
+  return !bvw->priv->uses_audio_fakesink;
 }
 
 /**
@@ -3872,11 +3880,32 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
   g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
   g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
 
+  if (bvw->priv->volume < 0.0 && bvw->priv->pulse_audio_sink != NULL) {
+    bvw->priv->volume = volume;
+    return;
+  }
+
   if (bacon_video_widget_can_set_volume (bvw) != FALSE)
   {
     volume = CLAMP (volume, 0.0, 1.0);
-    g_object_set (bvw->priv->play, "volume",
-	          (gdouble) volume, NULL);
+    if (bvw->priv->pulse_audio_sink) {
+      GstState cur_state;
+
+      gst_element_get_state (bvw->priv->pulse_audio_sink, &cur_state, NULL, 0);
+      if (cur_state == GST_STATE_READY || cur_state == GST_STATE_PLAYING)
+      {
+	gdouble new_vol;
+	g_object_set (bvw->priv->pulse_audio_sink, "volume",
+		      (gdouble) volume, NULL);
+
+        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
+      }
+    } else {
+      g_object_set (bvw->priv->play, "volume",
+		    (gdouble) volume, NULL);
+    }
+
+    bvw->priv->volume = volume;
     g_object_notify (G_OBJECT (bvw), "volume");
   }
 }
@@ -3892,14 +3921,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
 double
 bacon_video_widget_get_volume (BaconVideoWidget * bvw)
 {
-  double vol;
-
   g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
   g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
 
-  g_object_get (G_OBJECT (bvw->priv->play), "volume", &vol, NULL);
-
-  return vol;
+  return bvw->priv->volume;
 }
 
 /**
@@ -4599,6 +4624,27 @@ bacon_video_widget_has_menus (BaconVideoWidget *bvw)
     return bvw->priv->is_menu;
 }
 
+static gboolean
+notify_volume_idle_cb (BaconVideoWidget *bvw)
+{
+  gdouble vol;
+
+  g_object_get (G_OBJECT (bvw->priv->pulse_audio_sink), "volume", &vol, NULL);
+  bvw->priv->volume = vol;
+
+  g_object_notify (G_OBJECT (bvw), "volume");
+
+  return FALSE;
+}
+
+static void
+notify_volume_cb (GObject             *object,
+		  GParamSpec          *pspec,
+		  BaconVideoWidget    *bvw)
+{
+  g_idle_add ((GSourceFunc) notify_volume_idle_cb, bvw);
+}
+
 /**
  * bacon_video_widget_set_video_property:
  * @bvw: a #BaconVideoWidget
@@ -6138,15 +6184,18 @@ bacon_video_widget_new (int width, int height,
       cb_gconf, bvw, NULL, NULL);
 
   if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
-    audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
+    audio_sink = gst_element_factory_make ("pulsesink", "audio-sink");
     if (audio_sink == NULL) {
-      g_warning ("Could not create element 'gconfaudiosink'");
-      /* Try to fallback on autoaudiosink */
-      audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
-    } else {
-      /* set the profile property on the gconfaudiosink to "music and movies" */
-      if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "profile"))
-        g_object_set (G_OBJECT (audio_sink), "profile", 1, NULL);
+      audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
+      if (audio_sink == NULL) {
+	g_warning ("Could not create element 'gconfaudiosink'");
+	/* Try to fallback on autoaudiosink */
+	audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
+      } else {
+	/* set the profile property on the gconfaudiosink to "music and movies" */
+	if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "profile"))
+	  g_object_set (G_OBJECT (audio_sink), "profile", 1, NULL);
+      }
     }
   } else {
     audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
@@ -6293,9 +6342,17 @@ bacon_video_widget_new (int width, int height,
       /* make fakesink sync to the clock like a real sink */
       g_object_set (audio_sink, "sync", TRUE, NULL);
       GST_DEBUG ("audio sink doesn't work, using fakesink instead");
-      bvw->priv->uses_fakesink = TRUE;
+      bvw->priv->uses_audio_fakesink = TRUE;
     }
     gst_object_unref (bus);
+
+    /* If we're using a sink that has a volume property, then that's what
+     * we need to modify, not playbin's one */
+    if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "volume")) {
+      bvw->priv->pulse_audio_sink = g_object_ref (audio_sink);
+      g_signal_connect (G_OBJECT (bvw->priv->pulse_audio_sink), "notify::volume",
+			G_CALLBACK (notify_volume_cb), bvw);
+    }
   } else {
     g_set_error_literal (error, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
                  _("Could not find the audio output. "
-- 
1.6.2.5



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- totem.spec	8 Sep 2009 10:48:31 -0000	1.255
+++ totem.spec	15 Sep 2009 12:57:22 -0000	1.256
@@ -6,11 +6,12 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.27/totem-%{version}.tar.bz2
+Patch0: 0001-Set-the-PA-stream-volume-from-Totem.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -181,6 +182,7 @@ audio and video files in the properties 
 
 %prep
 %setup -q
+%patch0 -p1 -b .pulse-volume
 
 %build
 
@@ -377,6 +379,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
+- Use PA to set the stream volume
+
 * Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-1
 - Update to 2.27.92
 



From jgu at fedoraproject.org  Tue Sep 15 13:19:14 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 15 Sep 2009 13:19:14 +0000 (UTC)
Subject: rpms/dvipdfmx/F-11 dvipdfmx-20090708-ebb-to-ebbx.patch, NONE,
	1.1 dvipdfmx.spec, 1.10, 1.11
Message-ID: <20090915131915.013CA11C00CE@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19488

Modified Files:
	dvipdfmx.spec 
Added Files:
	dvipdfmx-20090708-ebb-to-ebbx.patch 
Log Message:
* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.30.20090708cvs
- Add dvipdfmx-20090708-ebb-to-ebbx.patch to rename ebb to ebbx to avoid file
  conflict with ebb package


dvipdfmx-20090708-ebb-to-ebbx.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 dvipdfmx.c  |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvipdfmx-20090708-ebb-to-ebbx.patch ---
diff -up dvipdfmx-20090708/src/dvipdfmx.c.ebb-to-ebbx dvipdfmx-20090708/src/dvipdfmx.c
--- dvipdfmx-20090708/src/dvipdfmx.c.ebb-to-ebbx	2009-09-15 13:48:07.071988198 +0100
+++ dvipdfmx-20090708/src/dvipdfmx.c	2009-09-15 13:48:29.232050928 +0100
@@ -807,11 +807,11 @@ main (int argc, char *argv[]) 
   {
     const char *base = xbasename(argv[0]);
 
-    if (!(strcmp(base, "dvipdfm") && strcmp(base, "ebb")))
+    if (!(strcmp(base, "dvipdfm") && strcmp(base, "ebbx")))
       compat_mode = 1;
 
     if (!(strcmp(base, "extractbb") && strcmp(base, "xbb") &&
-	  strcmp(base, "ebb")))
+	  strcmp(base, "ebbx")))
       return extractbb(argc, argv);
   }
 
diff -up dvipdfmx-20090708/src/Makefile.am.ebb-to-ebbx dvipdfmx-20090708/src/Makefile.am
--- dvipdfmx-20090708/src/Makefile.am.ebb-to-ebbx	2009-09-15 13:49:26.639987749 +0100
+++ dvipdfmx-20090708/src/Makefile.am	2009-09-15 13:50:27.855050812 +0100
@@ -39,5 +39,5 @@ dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIB
 dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
+	cd $(DESTDIR)$(bindir) && rm -f ebbx && $(LN_S) dvipdfmx ebbx
 	cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
diff -up dvipdfmx-20090708/src/Makefile.in.ebb-to-ebbx dvipdfmx-20090708/src/Makefile.in
--- dvipdfmx-20090708/src/Makefile.in.ebb-to-ebbx	2009-09-15 13:49:32.351988463 +0100
+++ dvipdfmx-20090708/src/Makefile.in	2009-09-15 13:50:21.122050455 +0100
@@ -1517,7 +1517,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
+	cd $(DESTDIR)$(bindir) && rm -f ebbx && $(LN_S) dvipdfmx ebbx
 	cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
 # 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.


Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-11/dvipdfmx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dvipdfmx.spec	15 Sep 2009 11:43:43 -0000	1.10
+++ dvipdfmx.spec	15 Sep 2009 13:19:13 -0000	1.11
@@ -10,7 +10,7 @@
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.29.%{snapshot}cvs%{?dist}
+Release:        0.30.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -18,6 +18,10 @@ License:        GPLv2+
 URL:            http://project.ktug.or.kr/dvipdfmx/
 Source0:        http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz
 
+# This patch not accepted upstream, but is to avoid a filename conflict with
+# ebb from the dvipdfm package. Long term we should just drop the dvipdfm package.
+Patch0:	       dvipdfmx-20090708-ebb-to-ebbx.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf
@@ -40,6 +44,7 @@ Hirata and its modified one, dvipdfm-kor
 
 %prep
 %setup -q -n %{name}-%{snapshot}
+%patch0 -p1 -b ebb-to-ebbx
 
 %build
 %configure
@@ -81,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/dvipdfmx
 %{_bindir}/extractbb
-%{_bindir}/ebb
+%{_bindir}/ebbx
 %dir %{_texmf_conf}/dvipdfmx/
 %config(noreplace) %{_texmf_conf}/dvipdfmx/cid-x.map
 %{_texmf_main}/dvipdfmx
@@ -92,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.30.20090708cvs
+- Add dvipdfmx-20090708-ebb-to-ebbx.patch to rename ebb to ebbx to avoid file
+  conflict with ebb package
+
 * Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
 - Fix up errors in file list
 



From jgu at fedoraproject.org  Tue Sep 15 13:20:51 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 15 Sep 2009 13:20:51 +0000 (UTC)
Subject: rpms/dvipdfmx/devel dvipdfmx-20090708-ebb-to-ebbx.patch, NONE,
	1.1 dvipdfmx.spec, 1.10, 1.11
Message-ID: <20090915132051.670C911C00CE@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19910

Modified Files:
	dvipdfmx.spec 
Added Files:
	dvipdfmx-20090708-ebb-to-ebbx.patch 
Log Message:
* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.30.20090708cvs
- Add dvipdfmx-20090708-ebb-to-ebbx.patch to rename ebb to ebbx to avoid file
  conflict with ebb package


dvipdfmx-20090708-ebb-to-ebbx.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 dvipdfmx.c  |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvipdfmx-20090708-ebb-to-ebbx.patch ---
diff -up dvipdfmx-20090708/src/dvipdfmx.c.ebb-to-ebbx dvipdfmx-20090708/src/dvipdfmx.c
--- dvipdfmx-20090708/src/dvipdfmx.c.ebb-to-ebbx	2009-09-15 13:48:07.071988198 +0100
+++ dvipdfmx-20090708/src/dvipdfmx.c	2009-09-15 13:48:29.232050928 +0100
@@ -807,11 +807,11 @@ main (int argc, char *argv[]) 
   {
     const char *base = xbasename(argv[0]);
 
-    if (!(strcmp(base, "dvipdfm") && strcmp(base, "ebb")))
+    if (!(strcmp(base, "dvipdfm") && strcmp(base, "ebbx")))
       compat_mode = 1;
 
     if (!(strcmp(base, "extractbb") && strcmp(base, "xbb") &&
-	  strcmp(base, "ebb")))
+	  strcmp(base, "ebbx")))
       return extractbb(argc, argv);
   }
 
diff -up dvipdfmx-20090708/src/Makefile.am.ebb-to-ebbx dvipdfmx-20090708/src/Makefile.am
--- dvipdfmx-20090708/src/Makefile.am.ebb-to-ebbx	2009-09-15 13:49:26.639987749 +0100
+++ dvipdfmx-20090708/src/Makefile.am	2009-09-15 13:50:27.855050812 +0100
@@ -39,5 +39,5 @@ dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIB
 dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
+	cd $(DESTDIR)$(bindir) && rm -f ebbx && $(LN_S) dvipdfmx ebbx
 	cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
diff -up dvipdfmx-20090708/src/Makefile.in.ebb-to-ebbx dvipdfmx-20090708/src/Makefile.in
--- dvipdfmx-20090708/src/Makefile.in.ebb-to-ebbx	2009-09-15 13:49:32.351988463 +0100
+++ dvipdfmx-20090708/src/Makefile.in	2009-09-15 13:50:21.122050455 +0100
@@ -1517,7 +1517,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
+	cd $(DESTDIR)$(bindir) && rm -f ebbx && $(LN_S) dvipdfmx ebbx
 	cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
 # 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.


Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/dvipdfmx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dvipdfmx.spec	15 Sep 2009 12:14:29 -0000	1.10
+++ dvipdfmx.spec	15 Sep 2009 13:20:51 -0000	1.11
@@ -10,7 +10,7 @@
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.29.%{snapshot}cvs%{?dist}
+Release:        0.30.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -18,6 +18,10 @@ License:        GPLv2+
 URL:            http://project.ktug.or.kr/dvipdfmx/
 Source0:        http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz
 
+# This patch not accepted upstream, but is to avoid a filename conflict with
+# ebb from the dvipdfm package. Long term we should just drop the dvipdfm package.
+Patch0:	       dvipdfmx-20090708-ebb-to-ebbx.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf
@@ -40,6 +44,7 @@ Hirata and its modified one, dvipdfm-kor
 
 %prep
 %setup -q -n %{name}-%{snapshot}
+%patch0 -p1 -b ebb-to-ebbx
 
 %build
 %configure
@@ -81,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/dvipdfmx
 %{_bindir}/extractbb
-%{_bindir}/ebb
+%{_bindir}/ebbx
 %dir %{_texmf_conf}/dvipdfmx/
 %config(noreplace) %{_texmf_conf}/dvipdfmx/cid-x.map
 %{_texmf_main}/dvipdfmx
@@ -92,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.30.20090708cvs
+- Add dvipdfmx-20090708-ebb-to-ebbx.patch to rename ebb to ebbx to avoid file
+  conflict with ebb package
+
 * Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
 - Fix up errors in file list
 



From transif at fedoraproject.org  Tue Sep 15 13:25:02 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 15 Sep 2009 13:25:02 +0000 (UTC)
Subject: comps/po th.po,1.16,1.17
Message-ID: <20090915132502.C67A811C00CE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054/po

Modified Files:
	th.po 
Log Message:
Sending translation for Thai


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.16 -r 1.17 th.poIndex: th.po
===================================================================
RCS file: /cvs/pkgs/comps/po/th.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- th.po	29 Apr 2009 20:00:24 -0000	1.16
+++ th.po	15 Sep 2009 13:25:02 -0000	1.17
@@ -1,299 +1,317 @@
 # translation of th.po to Thai
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
-#
 # Kamthorn Krairaksa <kamthorn_k at yahoo.com>, 2004, 2006.
 # Manatsawin Hanmongkolchai <manatsawin at gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: th\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-04-02 17:29+0700\n"
+"POT-Creation-Date: 2009-09-15 11:09+0000\n"
+"PO-Revision-Date: 2009-09-15 20:21+0700\n"
 "Last-Translator: Manatsawin Hanmongkolchai <manatsawin at gmail.com>\n"
 "Language-Team: Thai <thai-l10n at googlegroups.com>\n"
+"Language: th\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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.4.0\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-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "??????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????????????????????????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
-#, fuzzy
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
-msgstr "??????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "?????????????????????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "??????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????????????????????????????????????? Buildsystem"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
[...1942 lines suppressed...]
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Objective CAML"
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 #, fuzzy
 msgid "Swahili Support"
 msgstr "?????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 #, fuzzy
 msgid "Tetum Support"
 msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????, ??????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 #, fuzzy
 msgid "Turkmen Support"
 msgstr "Turkish Support"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 #, fuzzy
 msgid "Upper Sorbian Support"
 msgstr "Serbian Support"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#, fuzzy
+msgid "Directory Server"
+msgstr "??????????????????????????????????????????????????????????????????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#, fuzzy
+msgid "Moblin Desktop Environment"
+msgstr "????????????????????????????????????????????????????????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr ""
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1461,7 +1607,7 @@ msgstr ""
 "GNOME ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ??????????????????????????? ??????????????????????????? "
 "??????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1469,18 +1615,18 @@ msgstr ""
 "KDE ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ??????????????????????????? ??????????????????????????? "
 "??????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr ""
 "???????????????????????????????????????????????? ????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????? Emacs ????????? Vi"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "????????????????????????????????????????????????????????? XEmacs"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1488,34 +1634,40 @@ msgstr ""
 "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? DocBook ????????????????????????????????? HTML, PDF, "
 "Postscript ????????? text ?????????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 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
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 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
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "?????????????????????????????????????????????????????????????????????????????? Eclipse"
+
 #~ msgid "British Support"
 #~ msgstr "British Support"
 
@@ -1614,9 +1766,6 @@ msgstr "????????????????????????????????
 #~ msgid "KDE Desktop Environment"
 #~ msgstr "???????????????????????????????????????????????????????????? KDE"
 
-#~ msgid "Kernel Development"
-#~ msgstr "???????????????????????????????????????????????????????????????????????????"
-
 #~ msgid "Mozilla packages for the x86 platform"
 #~ msgstr "???????????????????????????????????????????????????????????????????????????????????? x86"
 



From mcpierce at fedoraproject.org  Tue Sep 15 13:29:02 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue, 15 Sep 2009 13:29:02 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/devel .cvsignore, 1.7,
	1.8 rubygem-rubyforge.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090915132902.1B2E211C00CE@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22103

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
* Tue Sep 15 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.5-1
- Release 1.0.5 of RubyForge.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Aug 2009 12:56:40 -0000	1.7
+++ .cvsignore	15 Sep 2009 13:29:01 -0000	1.8
@@ -1 +1 @@
-rubyforge-1.0.4.gem
+rubyforge-1.0.5.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/rubygem-rubyforge.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-rubyforge.spec	8 Aug 2009 12:56:40 -0000	1.10
+++ rubygem-rubyforge.spec	15 Sep 2009 13:29:01 -0000	1.11
@@ -4,20 +4,20 @@
 %define gemname rubyforge
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: 	A script which automates a limited set of rubyforge operations
-Name: 		rubygem-%{gemname}
-Version: 	1.0.4
-Release: 	1%{?dist}
-Group: 		Development/Languages
-License: 	GPLv2+ or Ruby
-URL: 		http://rubyforge.org/projects/codeforpeople
-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
-BuildArch: 	noarch
-Provides: 	rubygem(%{gemname}) = %{version}
+Summary:       A script which automates a limited set of rubyforge operations
+Name:          rubygem-%{gemname}
+Version:       1.0.5
+Release:       1%{?dist}
+Group:         Development/Languages
+License:       GPLv2+ or Ruby
+URL:           http://rubyforge.org/projects/codeforpeople
+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
+BuildArch:     noarch
+Provides:      rubygem(%{gemname}) = %{version}
 
 %description
 A script which automates a limited set of rubyforge operations.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 15 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.5-1
+- Release 1.0.5 of RubyForge.
+
 * Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
 - Release 1.0.4 of RubyForge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 12:56:40 -0000	1.7
+++ sources	15 Sep 2009 13:29:01 -0000	1.8
@@ -1 +1 @@
-923d48c9a664e32869e00af990fb83ac  rubyforge-1.0.4.gem
+cc7405680148d7b3ffdab9c090808bf5  rubyforge-1.0.5.gem



From vpv at fedoraproject.org  Tue Sep 15 13:36:29 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 13:36:29 +0000 (UTC)
Subject: rpms/moin/devel .cvsignore, 1.16, 1.17 moin.spec, 1.30, 1.31 sources,
	1.16, 1.17
Message-ID: <20090915133629.74EE711C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24825

Modified Files:
	.cvsignore moin.spec sources 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
- 1.8.5
- Includes multiple bug fixes, a new FCKeditor version and some new features
- http://hg.moinmo.in/moin/1.8/raw-file/1.8.5/docs/CHANGES



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	13 Jun 2009 19:03:59 -0000	1.16
+++ .cvsignore	15 Sep 2009 13:36:28 -0000	1.17
@@ -1 +1 @@
-moin-1.8.4.tar.gz
+moin-1.8.5.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- moin.spec	25 Jul 2009 14:57:01 -0000	1.30
+++ moin.spec	15 Sep 2009 13:36:28 -0000	1.31
@@ -2,8 +2,8 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.8.4
-Release: 3%{?dist}
+Version: 1.8.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
@@ -21,8 +21,8 @@ editable web pages.
 
 %prep
 %setup -q
-# The filemanager directory includes vulnerable code, which can't be invoked by
-# default, but let's remove it just to be sure.
+# The filemanager directory included vulnerable code in the past, it shouldn't
+# anymore, but let's remove it just to be sure.
 rm -r wiki/htdocs/applets/FCKeditor/editor/filemanager/
 
 
@@ -54,6 +54,11 @@ rm -r wiki/htdocs/applets/FCKeditor/edit
 
 
 %changelog
+* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
+- 1.8.5
+- Includes multiple bug fixes, a new FCKeditor version and some new features
+- http://hg.moinmo.in/moin/1.8/raw-file/1.8.5/docs/CHANGES
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Jun 2009 19:03:59 -0000	1.16
+++ sources	15 Sep 2009 13:36:28 -0000	1.17
@@ -1 +1 @@
-6a91a62f5c0dd5379f3c2411c6629496  moin-1.8.4.tar.gz
+779543d32dacc904c306d5d8ace99207  moin-1.8.5.tar.gz



From mcpierce at fedoraproject.org  Tue Sep 15 13:41:39 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue, 15 Sep 2009 13:41:39 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-10 .cvsignore, 1.7,
	1.8 rubygem-rubyforge.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090915134139.269B711C00CE@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26380

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
* Tue Sep 15 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.5-1
- Release 1.0.5 of RubyForge.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Aug 2009 13:04:34 -0000	1.7
+++ .cvsignore	15 Sep 2009 13:41:38 -0000	1.8
@@ -1 +1 @@
-rubyforge-1.0.4.gem
+rubyforge-1.0.5.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/rubygem-rubyforge.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-rubyforge.spec	8 Aug 2009 13:04:34 -0000	1.8
+++ rubygem-rubyforge.spec	15 Sep 2009 13:41:38 -0000	1.9
@@ -4,20 +4,20 @@
 %define gemname rubyforge
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: 	A script which automates a limited set of rubyforge operations
-Name: 		rubygem-%{gemname}
-Version: 	1.0.4
-Release: 	1%{?dist}
-Group: 		Development/Languages
-License: 	GPLv2+ or Ruby
-URL: 		http://rubyforge.org/projects/codeforpeople
-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
-BuildArch: 	noarch
-Provides: 	rubygem(%{gemname}) = %{version}
+Summary:        A script which automates a limited set of rubyforge operations
+Name:           rubygem-%{gemname}
+Version:        1.0.5
+Release:        1%{?dist}
+Group:          Development/Languages
+License:        GPLv2+ or Ruby
+URL:            http://rubyforge.org/projects/codeforpeople
+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
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 A script which automates a limited set of rubyforge operations.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 15 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.5-1
+- Release 1.0.5 of RubyForge.
+
 * Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
 - Release 1.0.4 of RubyForge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 13:04:34 -0000	1.7
+++ sources	15 Sep 2009 13:41:38 -0000	1.8
@@ -1 +1 @@
-923d48c9a664e32869e00af990fb83ac  rubyforge-1.0.4.gem
+cc7405680148d7b3ffdab9c090808bf5  rubyforge-1.0.5.gem



From vpv at fedoraproject.org  Tue Sep 15 13:46:50 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 13:46:50 +0000 (UTC)
Subject: rpms/moin/F-11 .cvsignore, 1.16, 1.17 moin.spec, 1.29, 1.30 sources,
	1.16, 1.17
Message-ID: <20090915134650.9A95411C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28047

Modified Files:
	.cvsignore moin.spec sources 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
- 1.8.5
- Includes multiple bug fixes, a new FCKeditor version and some new features
- http://hg.moinmo.in/moin/1.8/raw-file/1.8.5/docs/CHANGES



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	13 Jun 2009 19:13:17 -0000	1.16
+++ .cvsignore	15 Sep 2009 13:46:50 -0000	1.17
@@ -1 +1 @@
-moin-1.8.4.tar.gz
+moin-1.8.5.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/moin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- moin.spec	12 Jul 2009 17:36:14 -0000	1.29
+++ moin.spec	15 Sep 2009 13:46:50 -0000	1.30
@@ -2,8 +2,8 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.8.4
-Release: 2%{?dist}
+Version: 1.8.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
@@ -21,8 +21,8 @@ editable web pages.
 
 %prep
 %setup -q
-# The filemanager directory includes vulnerable code, which can't be invoked by
-# default, but let's remove it just to be sure.
+# The filemanager directory included vulnerable code in the past, it shouldn't
+# anymore, but let's remove it just to be sure.
 rm -r wiki/htdocs/applets/FCKeditor/editor/filemanager/
 
 
@@ -54,6 +54,11 @@ rm -r wiki/htdocs/applets/FCKeditor/edit
 
 
 %changelog
+* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
+- 1.8.5
+- Includes multiple bug fixes, a new FCKeditor version and some new features
+- http://hg.moinmo.in/moin/1.8/raw-file/1.8.5/docs/CHANGES
+
 * Sun Jul 12 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.4-2
 - Remove the filemanager directory from the embedded FCKeditor, it contains
   code with know security vulnerabilities, even though that code couldn't


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Jun 2009 19:13:17 -0000	1.16
+++ sources	15 Sep 2009 13:46:50 -0000	1.17
@@ -1 +1 @@
-6a91a62f5c0dd5379f3c2411c6629496  moin-1.8.4.tar.gz
+779543d32dacc904c306d5d8ace99207  moin-1.8.5.tar.gz



From varekova at fedoraproject.org  Tue Sep 15 13:47:21 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 13:47:21 +0000 (UTC)
Subject: rpms/gsl/devel .cvsignore, 1.15, 1.16 gsl.spec, 1.52, 1.53 sources, 
	1.16, 1.17
Message-ID: <20090915134721.7C8D611C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28190

Modified Files:
	.cvsignore gsl.spec sources 
Log Message:
update to 1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Jan 2009 10:01:23 -0000	1.15
+++ .cvsignore	15 Sep 2009 13:47:21 -0000	1.16
@@ -1 +1 @@
-gsl-1.12.tar.gz
+gsl-1.13.tar.gz


Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gsl.spec	17 Aug 2009 08:39:59 -0000	1.52
+++ gsl.spec	15 Sep 2009 13:47:21 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
-Version: 1.12
-Release: 6%{?dist}
+Version: 1.13
+Release: 1%{?dist}
 URL: http://www.gnu.org/software/gsl/
 Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.10-lib64.patch
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 1.13-1
+- update to 1.13
+
 * Mon Aug 17 2009 Ivana Varekova <varekova at redhat.com> - 1.12-6
 - fix preun and post scripts (#517568)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	19 Jan 2009 10:01:23 -0000	1.16
+++ sources	15 Sep 2009 13:47:21 -0000	1.17
@@ -1 +1 @@
-3ec101903c8157756fa1352161bd4c39  gsl-1.12.tar.gz
+d9fcfa367c44ab68a25b4edf34c3c5f7  gsl-1.13.tar.gz



From michich at fedoraproject.org  Tue Sep 15 13:49:28 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 15 Sep 2009 13:49:28 +0000 (UTC)
Subject: rpms/ath_info/devel ath_info.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915134928.71B1111C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/ath_info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28992/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ath_info.spec import.log 
Log Message:
Initial import



--- NEW FILE ath_info.spec ---
Name:		ath_info
Version:	0
Release:	0.1.20090902svn%{?dist}
Summary:	Tool to get detailed information from Atheros WLAN cards

Group:		Applications/System
License:	GPLv2
URL:		http://madwifi-project.org/wiki/UserDocs/AthInfo
# The source tarball was generated with:
# svn export -r 4091 http://madwifi-project.org/svn/ath_info/trunk ath_info-20090902
# tar -Jcf ath_info-20090902.tar.xz ath_info-20090902/
Source0:	ath_info-20090902.tar.xz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
ath_info prints some version information of Atheros WLAN modules. It
furthermore allows to change regulatory domain and PCI ID fields in the EEPROM.
Since the output of lspci and dmesg is not always sufficient to correctly
identify chipset versions, it is useful to attach ath_info output to bug
reports for the ath5k driver.

%prep
%setup -q -n ath_info-20090902

%build
make PREFIX=%{_prefix} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install PREFIX=%{_prefix} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/ath_info
%{_mandir}/man8/ath_info.*

%changelog
* Wed Sep 02 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn
- Initial Fedora package.


--- NEW FILE import.log ---
ath_info-0-0_1_20090902svn_fc11:HEAD:ath_info-0-0.1.20090902svn.fc11.src.rpm:1253022797


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:03:24 -0000	1.1
+++ .cvsignore	15 Sep 2009 13:49:27 -0000	1.2
@@ -0,0 +1 @@
+ath_info-20090902.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:03:25 -0000	1.1
+++ sources	15 Sep 2009 13:49:28 -0000	1.2
@@ -0,0 +1 @@
+45c09afe75003e449266b487138c7232  ath_info-20090902.tar.xz



From mcpierce at fedoraproject.org  Tue Sep 15 13:50:30 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue, 15 Sep 2009 13:50:30 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-11 .cvsignore, 1.7,
	1.8 rubygem-rubyforge.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090915135030.92A3711C0335@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29466

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
* Tue Sep 15 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.5-1
- Release 1.0.5 of RubyForge.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Aug 2009 13:11:26 -0000	1.7
+++ .cvsignore	15 Sep 2009 13:50:30 -0000	1.8
@@ -1 +1 @@
-rubyforge-1.0.4.gem
+rubyforge-1.0.5.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-11/rubygem-rubyforge.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-rubyforge.spec	8 Aug 2009 13:11:26 -0000	1.9
+++ rubygem-rubyforge.spec	15 Sep 2009 13:50:30 -0000	1.10
@@ -4,20 +4,20 @@
 %define gemname rubyforge
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: 	A script which automates a limited set of rubyforge operations
-Name: 		rubygem-%{gemname}
-Version: 	1.0.4
-Release: 	1%{?dist}
-Group: 		Development/Languages
-License: 	GPLv2+ or Ruby
-URL: 		http://rubyforge.org/projects/codeforpeople
-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
-BuildArch: 	noarch
-Provides: 	rubygem(%{gemname}) = %{version}
+Summary:        A script which automates a limited set of rubyforge operations
+Name:           rubygem-%{gemname}
+Version:        1.0.5
+Release:        1%{?dist}
+Group:          Development/Languages
+License:        GPLv2+ or Ruby
+URL:            http://rubyforge.org/projects/codeforpeople
+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
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 A script which automates a limited set of rubyforge operations.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 15 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.5-1
+- Release 1.0.5 of RubyForge.
+
 * Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
 - Release 1.0.4 of RubyForge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 13:11:26 -0000	1.7
+++ sources	15 Sep 2009 13:50:30 -0000	1.8
@@ -1 +1 @@
-923d48c9a664e32869e00af990fb83ac  rubyforge-1.0.4.gem
+cc7405680148d7b3ffdab9c090808bf5  rubyforge-1.0.5.gem



From harald at fedoraproject.org  Tue Sep 15 13:57:14 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 15 Sep 2009 13:57:14 +0000 (UTC)
Subject: rpms/dracut/F-11 .cvsignore, 1.9, 1.10 dracut.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090915135714.9614711C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31155

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 001-9
- add ifname= argument for persistent netdev names
- new /initqueue-finished to check if the main loop can be left
- copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf

* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
- plymouth: use plymouth-populate-initrd
- add add_drivers for dracut and dracut.conf
- do not mount /proc and /selinux manually in selinux-load-policy

* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-7
- add scsi_wait_scan to be sure everything was scanned

* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-6
- fixed several problems with md raid containers
- fixed selinux policy loading

* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-5
- patch does not honor file modes, fixed them manually

* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-4
 fixed mdraid for IMSM




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Sep 2009 13:58:33 -0000	1.9
+++ .cvsignore	15 Sep 2009 13:57:13 -0000	1.10
@@ -1 +1 @@
-dracut-001.tar.bz2
+dracut-001-4d924752.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dracut.spec	7 Sep 2009 10:24:11 -0000	1.10
+++ dracut.spec	15 Sep 2009 13:57:13 -0000	1.11
@@ -1,3 +1,4 @@
+%define gittag 4d924752
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -13,17 +14,12 @@
 
 Name: dracut
 Version: 001
-Release: 3%{?rdist}
+Release: 9%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
-
-Patch1: 0005-mdraid-add-grep-for-convenience.patch
-Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
-Patch3: 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
@@ -47,9 +43,9 @@ Requires: mdadm, elfutils-libelf, plymou
 Requires: cryptsetup-luks
 Requires: file
 Requires: bzip2
-Requires: policycoreutils
 Requires: dmraid
 Requires: kbd
+Requires: plymouth-scripts
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
@@ -107,9 +103,6 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 make
@@ -187,6 +180,29 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 001-9
+- add ifname= argument for persistent netdev names
+- new /initqueue-finished to check if the main loop can be left
+- copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf
+
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
+- plymouth: use plymouth-populate-initrd
+- add add_drivers for dracut and dracut.conf
+- do not mount /proc and /selinux manually in selinux-load-policy
+
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-7
+- add scsi_wait_scan to be sure everything was scanned
+
+* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-6
+- fixed several problems with md raid containers
+- fixed selinux policy loading
+
+* Tue Sep 08 2009 Harald Hoyer <harald at redhat.com> 001-5
+- patch does not honor file modes, fixed them manually
+
+* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-4
+- fixed mdraid for IMSM
+
 * Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
 - fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Sep 2009 13:58:33 -0000	1.9
+++ sources	15 Sep 2009 13:57:13 -0000	1.10
@@ -1 +1 @@
-12d60478b28876747bee3d7c8c04be95  dracut-001.tar.bz2
+563decee38dd5987709dba90328c35f2  dracut-001-4d924752.tar.bz2



From michich at fedoraproject.org  Tue Sep 15 13:59:39 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 15 Sep 2009 13:59:39 +0000 (UTC)
Subject: rpms/ath_info/F-11 ath_info.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090915135939.17D5311C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/ath_info/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31961

Modified Files:
	sources 
Added Files:
	ath_info.spec 
Log Message:
Initial import to F-11.



--- NEW FILE ath_info.spec ---
Name:		ath_info
Version:	0
Release:	0.1.20090902svn%{?dist}
Summary:	Tool to get detailed information from Atheros WLAN cards

Group:		Applications/System
License:	GPLv2
URL:		http://madwifi-project.org/wiki/UserDocs/AthInfo
# The source tarball was generated with:
# svn export -r 4091 http://madwifi-project.org/svn/ath_info/trunk ath_info-20090902
# tar -Jcf ath_info-20090902.tar.xz ath_info-20090902/
Source0:	ath_info-20090902.tar.xz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
ath_info prints some version information of Atheros WLAN modules. It
furthermore allows to change regulatory domain and PCI ID fields in the EEPROM.
Since the output of lspci and dmesg is not always sufficient to correctly
identify chipset versions, it is useful to attach ath_info output to bug
reports for the ath5k driver.

%prep
%setup -q -n ath_info-20090902

%build
make PREFIX=%{_prefix} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install PREFIX=%{_prefix} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/ath_info
%{_mandir}/man8/ath_info.*

%changelog
* Wed Sep 02 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn
- Initial Fedora package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:03:25 -0000	1.1
+++ sources	15 Sep 2009 13:59:38 -0000	1.2
@@ -0,0 +1 @@
+45c09afe75003e449266b487138c7232  ath_info-20090902.tar.xz



From michich at fedoraproject.org  Tue Sep 15 14:06:03 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 15 Sep 2009 14:06:03 +0000 (UTC)
Subject: rpms/ath_info/F-10 ath_info.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090915140603.D724E11C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/ath_info/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2501

Modified Files:
	sources 
Added Files:
	ath_info.spec 
Log Message:
Initial import for F-10.



--- NEW FILE ath_info.spec ---
Name:		ath_info
Version:	0
Release:	0.1.20090902svn%{?dist}
Summary:	Tool to get detailed information from Atheros WLAN cards

Group:		Applications/System
License:	GPLv2
URL:		http://madwifi-project.org/wiki/UserDocs/AthInfo
# The source tarball was generated with:
# svn export -r 4091 http://madwifi-project.org/svn/ath_info/trunk ath_info-20090902
# tar -Jcf ath_info-20090902.tar.xz ath_info-20090902/
Source0:	ath_info-20090902.tar.xz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
ath_info prints some version information of Atheros WLAN modules. It
furthermore allows to change regulatory domain and PCI ID fields in the EEPROM.
Since the output of lspci and dmesg is not always sufficient to correctly
identify chipset versions, it is useful to attach ath_info output to bug
reports for the ath5k driver.

%prep
%setup -q -n ath_info-20090902

%build
make PREFIX=%{_prefix} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install PREFIX=%{_prefix} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/ath_info
%{_mandir}/man8/ath_info.*

%changelog
* Wed Sep 02 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn
- Initial Fedora package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:03:25 -0000	1.1
+++ sources	15 Sep 2009 14:06:03 -0000	1.2
@@ -0,0 +1 @@
+45c09afe75003e449266b487138c7232  ath_info-20090902.tar.xz



From michich at fedoraproject.org  Tue Sep 15 14:07:06 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 15 Sep 2009 14:07:06 +0000 (UTC)
Subject: rpms/ath_info/EL-5 ath_info.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090915140706.0D82F11C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/ath_info/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2906

Modified Files:
	sources 
Added Files:
	ath_info.spec 
Log Message:
Initial import for EL-5.



--- NEW FILE ath_info.spec ---
Name:		ath_info
Version:	0
Release:	0.1.20090902svn%{?dist}
Summary:	Tool to get detailed information from Atheros WLAN cards

Group:		Applications/System
License:	GPLv2
URL:		http://madwifi-project.org/wiki/UserDocs/AthInfo
# The source tarball was generated with:
# svn export -r 4091 http://madwifi-project.org/svn/ath_info/trunk ath_info-20090902
# tar -Jcf ath_info-20090902.tar.xz ath_info-20090902/
Source0:	ath_info-20090902.tar.xz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
ath_info prints some version information of Atheros WLAN modules. It
furthermore allows to change regulatory domain and PCI ID fields in the EEPROM.
Since the output of lspci and dmesg is not always sufficient to correctly
identify chipset versions, it is useful to attach ath_info output to bug
reports for the ath5k driver.

%prep
%setup -q -n ath_info-20090902

%build
make PREFIX=%{_prefix} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install PREFIX=%{_prefix} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/ath_info
%{_mandir}/man8/ath_info.*

%changelog
* Wed Sep 02 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn
- Initial Fedora package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:03:25 -0000	1.1
+++ sources	15 Sep 2009 14:07:05 -0000	1.2
@@ -0,0 +1 @@
+45c09afe75003e449266b487138c7232  ath_info-20090902.tar.xz



From akurtakov at fedoraproject.org  Tue Sep 15 14:10:01 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 15 Sep 2009 14:10:01 +0000 (UTC)
Subject: rpms/jetty/devel jetty.spec,1.17,1.18
Message-ID: <20090915141001.5D03811C0336@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3811/devel

Modified Files:
	jetty.spec 
Log Message:
use system jars


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- jetty.spec	15 Sep 2009 12:51:05 -0000	1.17
+++ jetty.spec	15 Sep 2009 14:10:01 -0000	1.18
@@ -266,6 +266,37 @@ rm -fr $RPM_BUILD_ROOT%{homedir}/*.txt
 rm -fr $RPM_BUILD_ROOT%{homedir}/pom.*
 rm -fr $RPM_BUILD_ROOT%{homedir}/*.zip
 
+#use system jars
+pushd $RPM_BUILD_ROOT%{homedir}/lib/jsp-2.0
+rm -fr *.jar
+build-jar-repository . ant
+build-jar-repository . commons-el
+build-jar-repository . jasper5-compiler
+build-jar-repository . jasper5-runtime
+build-jar-repository . slf4j/jcl-over-slf4j
+build-jar-repository . slf4j/api
+build-jar-repository . slf4j/simple
+build-jar-repository . xerces-j2
+build-jar-repository . xml-commons-apis
+build-jar-repository . tomcat6-jsp-2.1-api
+popd
+
+pushd $RPM_BUILD_ROOT%{homedir}/lib/management/mx4j
+rm -fr *.jar
+build-jar-repository . mx4j/mx4j
+build-jar-repository . mx4j/mx4j-tools
+popd
+
+pushd $RPM_BUILD_ROOT%{homedir}/lib/naming
+build-jar-repository . javamail
+rm -fr mail-*.jar
+popd
+
+pushd $RPM_BUILD_ROOT%{homedir}/lib
+build-jar-repository . tomcat6-servlet-2.5-api
+rm -fr servlet-api-*.jar
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From akurtakov at fedoraproject.org  Tue Sep 15 14:16:56 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 15 Sep 2009 14:16:56 +0000 (UTC)
Subject: rpms/jetty/devel jetty.spec,1.18,1.19
Message-ID: <20090915141656.6134D11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5635/devel

Modified Files:
	jetty.spec 
Log Message:
- Fix requires.


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- jetty.spec	15 Sep 2009 14:10:01 -0000	1.18
+++ jetty.spec	15 Sep 2009 14:16:56 -0000	1.19
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -95,7 +95,12 @@ Requires:  jakarta-commons-logging
 Requires:  tomcat5-jasper >= 5.5.26-1.5
 Requires:  jsp
 Requires:  mx4j >= 0:3.0
-Requires:  tomcat5-servlet-2.4-api >= 5.5.26-1.5
+Requires: tomcat5
+Requires: tomcat5-jasper
+Requires: tomcat6-servlet-2.5-api
+Requires: tomcat6-jsp-2.1-api
+Requires: slf4j
+Requires: classpathx-mail
 Requires:  xerces-j2 >= 0:2.7
 Requires:  xml-commons-apis
 Provides:  group(%username) = %jtuid
@@ -353,6 +358,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-2
+- Fix requires.
+
 * Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-1
 - Update to upstream 6.1.20.
 



From michich at fedoraproject.org  Tue Sep 15 14:22:11 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 15 Sep 2009 14:22:11 +0000 (UTC)
Subject: rpms/ath_info/F-10 .cvsignore, 1.1, 1.2 ath_info.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090915142212.0094811C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/ath_info/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7418

Modified Files:
	.cvsignore ath_info.spec sources 
Log Message:
* Tue Sep 15 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn.fc10.1
- Use bz2 tarball instead of xz for F-10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:03:24 -0000	1.1
+++ .cvsignore	15 Sep 2009 14:22:11 -0000	1.2
@@ -0,0 +1 @@
+ath_info-20090902.tar.bz2


Index: ath_info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/F-10/ath_info.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ath_info.spec	15 Sep 2009 14:06:03 -0000	1.1
+++ ath_info.spec	15 Sep 2009 14:22:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ath_info
 Version:	0
-Release:	0.1.20090902svn%{?dist}
+Release:	0.1.20090902svn%{?dist}.1
 Summary:	Tool to get detailed information from Atheros WLAN cards
 
 Group:		Applications/System
@@ -8,8 +8,8 @@ License:	GPLv2
 URL:		http://madwifi-project.org/wiki/UserDocs/AthInfo
 # The source tarball was generated with:
 # svn export -r 4091 http://madwifi-project.org/svn/ath_info/trunk ath_info-20090902
-# tar -Jcf ath_info-20090902.tar.xz ath_info-20090902/
-Source0:	ath_info-20090902.tar.xz
+# tar -jcf ath_info-20090902.tar.bz2 ath_info-20090902/
+Source0:	ath_info-20090902.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -39,5 +39,8 @@ rm -rf %{buildroot}
 %{_mandir}/man8/ath_info.*
 
 %changelog
+* Tue Sep 15 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn.fc10.1
+- Use bz2 tarball instead of xz for F-10.
+
 * Wed Sep 02 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn
 - Initial Fedora package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Sep 2009 14:06:03 -0000	1.2
+++ sources	15 Sep 2009 14:22:11 -0000	1.3
@@ -1 +1 @@
-45c09afe75003e449266b487138c7232  ath_info-20090902.tar.xz
+5476ef2569d0c29402f1d9867186dd37  ath_info-20090902.tar.bz2



From limb at fedoraproject.org  Tue Sep 15 14:26:23 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 15 Sep 2009 14:26:23 +0000 (UTC)
Subject: rpms/squidGuard/F-10 squidGuard.spec,1.14,1.15 squidguard,1.1,1.2
Message-ID: <20090915142623.A2DA711C00CE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8720

Modified Files:
	squidGuard.spec squidguard 
Log Message:
Include babel files.



Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/squidGuard.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- squidGuard.spec	24 Feb 2009 16:33:55 -0000	1.14
+++ squidGuard.spec	15 Sep 2009 14:26:23 -0000	1.15
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		2%{?dist}
+Release:		6%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -39,7 +39,8 @@ Patch5:			squidGuard-makeinstall.patch
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bison, byacc, openldap-devel, flex, db4-devel
+BuildRequires:	bison, byacc, openldap-devel, flex, compat-db46
+#put db4-devel back and remove compat-db46 once release > 1.4
 Requires:		squid
 #Requires(post):	%{_bindir}/chcon
 Requires(post):	/sbin/chkconfig
@@ -129,6 +130,8 @@ popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
+%{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -181,10 +184,23 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
+- Include babel files, BZ 522038.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-4
+- Initscript cleanup, BZ 247065.
+
+* Tue Feb 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-3
+- Drop chcon Req.
+
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-2
 - Dropping selinux policy and chcon, BZ 486634.
 - Fixed URL of Source0.


Index: squidguard
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/squidguard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidguard	9 Sep 2005 12:16:10 -0000	1.1
+++ squidguard	15 Sep 2009 14:26:23 -0000	1.2
@@ -13,6 +13,16 @@
 # pidfile: /var/run/squid.pid
 # config: /etc/squid/squid-squidGuard.conf
 
+### BEGIN INIT INFO
+# Provides: lsb-squidguard
+# Required-Start: $local_fs $network $remote_fs $squid
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop squidGuard
+# Description: SquidGuard - web filtering system for the Squid proxy server.
+### END INIT INFO
+
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 



From vpv at fedoraproject.org  Tue Sep 15 14:26:33 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 14:26:33 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel .cvsignore, 1.9,
	1.10 malaga-suomi-voikko.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20090915142633.1F9F411C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8831

Modified Files:
	.cvsignore malaga-suomi-voikko.spec sources 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
- New release candidate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Mar 2009 17:40:57 -0000	1.9
+++ .cvsignore	15 Sep 2009 14:26:32 -0000	1.10
@@ -1 +1 @@
-suomi-malaga-1.3.tar.gz
+suomi-malaga-1.4rc1.tar.gz


Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- malaga-suomi-voikko.spec	25 Jul 2009 11:42:12 -0000	1.11
+++ malaga-suomi-voikko.spec	15 Sep 2009 14:26:33 -0000	1.12
@@ -1,15 +1,15 @@
 Name:           malaga-suomi-voikko
-Version:        1.3
-Release:        11%{?dist}
+Version:        1.4
+Release:        0.1.rc1%{?dist}
 Summary:        A description of Finnish morphology written in Malaga (Voikko edition)
 
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release source URLs
-Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
 # The usual format of testing release source URLs
-#Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc1.tar.gz
+Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga >= 7.8 python
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
+- New release candidate
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Mar 2009 17:40:57 -0000	1.9
+++ sources	15 Sep 2009 14:26:33 -0000	1.10
@@ -1 +1 @@
-fbe33195df95e79faee1a4262b445cf0  suomi-malaga-1.3.tar.gz
+cc4c075a809d5f67fe8a68e65d6c052e  suomi-malaga-1.4rc1.tar.gz



From michich at fedoraproject.org  Tue Sep 15 14:26:53 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 15 Sep 2009 14:26:53 +0000 (UTC)
Subject: rpms/ath_info/EL-5 ath_info.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090915142653.86EE511C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/ath_info/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8993

Modified Files:
	ath_info.spec sources 
Log Message:
* Tue Sep 15 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn.el5.1
- Use bz2 tarball instead of xz for EL-5.



Index: ath_info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/EL-5/ath_info.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ath_info.spec	15 Sep 2009 14:07:05 -0000	1.1
+++ ath_info.spec	15 Sep 2009 14:26:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ath_info
 Version:	0
-Release:	0.1.20090902svn%{?dist}
+Release:	0.1.20090902svn%{?dist}.1
 Summary:	Tool to get detailed information from Atheros WLAN cards
 
 Group:		Applications/System
@@ -8,8 +8,8 @@ License:	GPLv2
 URL:		http://madwifi-project.org/wiki/UserDocs/AthInfo
 # The source tarball was generated with:
 # svn export -r 4091 http://madwifi-project.org/svn/ath_info/trunk ath_info-20090902
-# tar -Jcf ath_info-20090902.tar.xz ath_info-20090902/
-Source0:	ath_info-20090902.tar.xz
+# tar -jcf ath_info-20090902.tar.bz2 ath_info-20090902/
+Source0:	ath_info-20090902.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -39,5 +39,8 @@ rm -rf %{buildroot}
 %{_mandir}/man8/ath_info.*
 
 %changelog
+* Tue Sep 15 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn.el5.1
+- Use bz2 tarball instead of xz for EL-5.
+
 * Wed Sep 02 2009 Michal Schmidt <mschmidt at redhat.com> 0-0.1.20090902svn
 - Initial Fedora package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ath_info/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Sep 2009 14:07:05 -0000	1.2
+++ sources	15 Sep 2009 14:26:53 -0000	1.3
@@ -1 +1 @@
-45c09afe75003e449266b487138c7232  ath_info-20090902.tar.xz
+5476ef2569d0c29402f1d9867186dd37  ath_info-20090902.tar.bz2



From ltinkl at fedoraproject.org  Tue Sep 15 14:33:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 15 Sep 2009 14:33:57 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.2-ldapCompletionCrash.patch, NONE,
	1.1 kdepim.spec, 1.218, 1.219
Message-ID: <20090915143357.D974E11C00CE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893/F-10

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
fix crash when autocompleting LDAP address (kdebug:206024)


kdepim-4.3.2-ldapCompletionCrash.patch:
 addresseelineedit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.2-ldapCompletionCrash.patch ---
Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
===================================================================
--- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019118)
+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019119)
@@ -800,7 +800,7 @@
 
 void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
 {
-  if ( s_LDAPLineEdit != this ) {
+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
     return;
   }
 


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- kdepim.spec	14 Sep 2009 13:45:22 -0000	1.218
+++ kdepim.spec	15 Sep 2009 14:33:57 -0000	1.219
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -19,6 +19,8 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # http://websvn.kde.org/?view=rev&revision=1022963
 # http://websvn.kde.org/?view=rev&revision=1022964
 Patch100: kdepim-4.3.2-imapMove.patch
+#?http://websvn.kde.org/?view=rev&revision=1019119
+Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +101,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 %patch100 -p4 -b .imapMove
+%patch101 -p4 -b .ldapCompletionCrash
 
 
 %build
@@ -217,6 +220,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 15 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-4
+- fix crash when autocompleting LDAP address (kdebug:206024)
+
 * Mon Sep 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-3
 - fix KMail issues losing messages when renaming folder with disconnected IMAP
 



From ltinkl at fedoraproject.org  Tue Sep 15 14:33:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 15 Sep 2009 14:33:57 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.2-ldapCompletionCrash.patch, NONE,
	1.1 kdepim.spec, 1.224, 1.225
Message-ID: <20090915143357.EBCC611C00EB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893/F-11

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
fix crash when autocompleting LDAP address (kdebug:206024)


kdepim-4.3.2-ldapCompletionCrash.patch:
 addresseelineedit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.2-ldapCompletionCrash.patch ---
Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
===================================================================
--- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019118)
+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019119)
@@ -800,7 +800,7 @@
 
 void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
 {
-  if ( s_LDAPLineEdit != this ) {
+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
     return;
   }
 


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- kdepim.spec	14 Sep 2009 13:45:24 -0000	1.224
+++ kdepim.spec	15 Sep 2009 14:33:57 -0000	1.225
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -19,6 +19,8 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # http://websvn.kde.org/?view=rev&revision=1022963
 # http://websvn.kde.org/?view=rev&revision=1022964
 Patch100: kdepim-4.3.2-imapMove.patch
+#?http://websvn.kde.org/?view=rev&revision=1019119
+Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +101,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 %patch100 -p4 -b .imapMove
+%patch101 -p4 -b .ldapCompletionCrash
 
 
 %build
@@ -217,6 +220,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 15 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-4
+- fix crash when autocompleting LDAP address (kdebug:206024)
+
 * Mon Sep 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-3
 - fix KMail issues losing messages when renaming folder with disconnected IMAP
 



From ltinkl at fedoraproject.org  Tue Sep 15 14:33:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 15 Sep 2009 14:33:58 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.2-ldapCompletionCrash.patch, NONE,
	1.1 kdepim.spec, 1.235, 1.236
Message-ID: <20090915143358.6904911C00CE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893/devel

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
fix crash when autocompleting LDAP address (kdebug:206024)


kdepim-4.3.2-ldapCompletionCrash.patch:
 addresseelineedit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.2-ldapCompletionCrash.patch ---
Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
===================================================================
--- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019118)
+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019119)
@@ -800,7 +800,7 @@
 
 void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
 {
-  if ( s_LDAPLineEdit != this ) {
+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
     return;
   }
 


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- kdepim.spec	14 Sep 2009 13:45:24 -0000	1.235
+++ kdepim.spec	15 Sep 2009 14:33:58 -0000	1.236
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -19,6 +19,8 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # http://websvn.kde.org/?view=rev&revision=1022963
 # http://websvn.kde.org/?view=rev&revision=1022964
 Patch100: kdepim-4.3.2-imapMove.patch
+#?http://websvn.kde.org/?view=rev&revision=1019119
+Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +101,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 %patch100 -p4 -b .imapMove
+%patch101 -p4 -b .ldapCompletionCrash
 
 
 %build
@@ -217,6 +220,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 15 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-4
+- fix crash when autocompleting LDAP address (kdebug:206024)
+
 * Mon Sep 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-3
 - fix KMail issues losing messages when renaming folder with disconnected IMAP
 



From thias at fedoraproject.org  Tue Sep 15 14:34:00 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue, 15 Sep 2009 14:34:00 +0000 (UTC)
Subject: rpms/fillets-ng-data/devel fillets-ng-data.spec,1.14,1.15
Message-ID: <20090915143400.5CF2911C00CE@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10952

Modified Files:
	fillets-ng-data.spec 
Log Message:
Rebuild for devel/F-12 to have the new package payload.



Index: fillets-ng-data.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/fillets-ng-data.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fillets-ng-data.spec	12 Sep 2009 21:02:34 -0000	1.14
+++ fillets-ng-data.spec	15 Sep 2009 14:34:00 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
 Version: 0.9.0
-Release: 1
+Release: 2
 # The GPLv2 is included and nothing indicates "any later version". Exceptions :
 # - images/menu/flags/ is Public Domain
 # - font/ is GPLv2+ (taken from "freefont")
@@ -51,6 +51,9 @@ This package contains the data files req
 
 
 %changelog
+* Tue Sep 15 2009 Matthias Saou <http://freshrpms.net/> 0.9.0-2
+- Rebuild for devel/F-12 to have the new package payload.
+
 * Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 0.9.0-1
 - Update to 0.9.0.
 - Don't replace fonts with symlinks, as it's fragile (see #505192) and the files



From vpv at fedoraproject.org  Tue Sep 15 14:34:31 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 14:34:31 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel malaga-suomi-voikko.spec,1.12,1.13
Message-ID: <20090915143431.ECDD411C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11371

Modified Files:
	malaga-suomi-voikko.spec 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
- New release candidate
- Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga
  implementation for Finnish spell checking. Malaga is still required for
  building this package



Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- malaga-suomi-voikko.spec	15 Sep 2009 14:26:33 -0000	1.12
+++ malaga-suomi-voikko.spec	15 Sep 2009 14:34:31 -0000	1.13
@@ -13,7 +13,6 @@ Source0:        http://www.puimula.org/h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga >= 7.8 python
-Requires:       libmalaga >= 7.8
 
 # debuginfo would be empty
 %define debug_package %{nil}
@@ -53,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
 - New release candidate
+- Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga
+  implementation for Finnish spell checking. Malaga is still required for
+  building this package
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From notting at fedoraproject.org  Tue Sep 15 14:39:57 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 15 Sep 2009 14:39:57 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.256,1.257
Message-ID: <20090915143957.0522A11C00CE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13934

Modified Files:
	totem.spec 
Log Message:
Remove extraneous requires from youtube plugin.



Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/devel/totem.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- totem.spec	15 Sep 2009 12:57:22 -0000	1.256
+++ totem.spec	15 Sep 2009 14:39:56 -0000	1.257
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -109,7 +109,6 @@ a remote MythTV server.
 %package youtube
 Summary: YouTube plugin for Totem
 Group: Applications/Multimedia
-Requires: python-gdata gnome-python2-gconf
 Requires: %{name} = %{version}-%{release}
 
 %description youtube
@@ -379,6 +378,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Sep 15 2009 Bill Nottingham <notting at redhat.com> 2.27.92-3
+- youtube plugin is now in C, remove python requires
+
 * Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
 - Use PA to set the stream volume
 



From jdennis at fedoraproject.org  Tue Sep 15 14:47:19 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Tue, 15 Sep 2009 14:47:19 +0000 (UTC)
Subject: rpms/freeradius/devel .cvsignore, 1.21, 1.22 freeradius.spec, 1.85, 
	1.86 sources, 1.22, 1.23
Message-ID: <20090915144719.5614411C00CE@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15999

Modified Files:
	.cvsignore freeradius.spec sources 
Log Message:
- enable building of the rlm_wimax module
- pcap wire analysis support is enabled and available in utils subpackage
- Resolves bug #523053 radtest manpage in wrong package
- update to latest upstream release: 2.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	18 May 2009 16:03:13 -0000	1.21
+++ .cvsignore	15 Sep 2009 14:47:18 -0000	1.22
@@ -1 +1 @@
-freeradius-server-2.1.6.tar.bz2
+freeradius-server-2.1.7.tar.bz2


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- freeradius.spec	21 Aug 2009 13:25:25 -0000	1.85
+++ freeradius.spec	15 Sep 2009 14:47:18 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 2.1.6
-Release: 6%{?dist}
+Version: 2.1.7
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -28,6 +28,7 @@ BuildRequires: zlib-devel
 BuildRequires: net-snmp-devel
 BuildRequires: net-snmp-utils
 BuildRequires: readline-devel
+BuildRequires: libpcap-devel
 
 Requires(pre): shadow-utils glibc-common
 Requires(post): /sbin/ldconfig /sbin/chkconfig
@@ -35,18 +36,18 @@ Requires(postun): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 
 %description
-The FreeRADIUS Server Project is a high performance and highly configurable 
-GPL'd free RADIUS server. The server is similar in some respects to 
-Livingston's 2.0 server.  While FreeRADIUS started as a variant of the 
-Cistron RADIUS server, they don't share a lot in common any more. It now has 
+The FreeRADIUS Server Project is a high performance and highly configurable
+GPL'd free RADIUS server. The server is similar in some respects to
+Livingston's 2.0 server.  While FreeRADIUS started as a variant of the
+Cistron RADIUS server, they don't share a lot in common any more. It now has
 many more features than Cistron or Livingston, and is much more configurable.
 
-FreeRADIUS is an Internet authentication daemon, which implements the RADIUS 
-protocol, as defined in RFC 2865 (and others). It allows Network Access 
-Servers (NAS boxes) to perform authentication for dial-up users. There are 
-also RADIUS clients available for Web servers, firewalls, Unix logins, and 
-more.  Using RADIUS allows authentication and authorization for a network to 
-be centralized, and minimizes the amount of re-configuration which has to be 
+FreeRADIUS is an Internet authentication daemon, which implements the RADIUS
+protocol, as defined in RFC 2865 (and others). It allows Network Access
+Servers (NAS boxes) to perform authentication for dial-up users. There are
+also RADIUS clients available for Web servers, firewalls, Unix logins, and
+more.  Using RADIUS allows authentication and authorization for a network to
+be centralized, and minimizes the amount of re-configuration which has to be
 done when adding or deleting new users.
 
 %package libs
@@ -60,6 +61,7 @@ The FreeRADIUS shared library
 Group: System Environment/Daemons
 Summary: FreeRADIUS utilities
 Requires: %{name}-libs = %{version}-%{release}
+Requires: libpcap >= 0.9.4
 
 %description utils
 The FreeRADIUS server has a number of features found in other servers,
@@ -174,6 +176,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic"
         --with-unixodbc-lib-dir=%{_libdir} \
         --with-rlm-dbm-lib-dir=%{_libdir} \
         --with-rlm-krb5-include-dir=/usr/kerberos/include \
+        --with-modules="rlm_wimax" \
         --without-rlm_eap_ikev2 \
         --without-rlm_sql_iodbc \
         --without-rlm_sql_firebird \
@@ -372,6 +375,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/chap
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/checkval
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/counter
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/cui
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail.example.com
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail.log
@@ -414,9 +418,36 @@ fi
 /usr/sbin/radwatch
 /usr/sbin/radmin
 # man-pages
-%doc %{_mandir}/man1/*
-%doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/*
+%doc %{_mandir}/man5/acct_users.5.gz
+%doc %{_mandir}/man5/clients.conf.5.gz
+%doc %{_mandir}/man5/dictionary.5.gz
+%doc %{_mandir}/man5/radiusd.conf.5.gz
+%doc %{_mandir}/man5/radrelay.conf.5.gz
+%doc %{_mandir}/man5/rlm_acct_unique.5.gz
+%doc %{_mandir}/man5/rlm_always.5.gz
+%doc %{_mandir}/man5/rlm_attr_filter.5.gz
+%doc %{_mandir}/man5/rlm_attr_rewrite.5.gz
+%doc %{_mandir}/man5/rlm_chap.5.gz
+%doc %{_mandir}/man5/rlm_counter.5.gz
+%doc %{_mandir}/man5/rlm_detail.5.gz
+%doc %{_mandir}/man5/rlm_digest.5.gz
+%doc %{_mandir}/man5/rlm_expr.5.gz
+%doc %{_mandir}/man5/rlm_files.5.gz
+%doc %{_mandir}/man5/rlm_mschap.5.gz
+%doc %{_mandir}/man5/rlm_pap.5.gz
+%doc %{_mandir}/man5/rlm_passwd.5.gz
+%doc %{_mandir}/man5/rlm_policy.5.gz
+%doc %{_mandir}/man5/rlm_realm.5.gz
+%doc %{_mandir}/man5/rlm_sql.5.gz
+%doc %{_mandir}/man5/rlm_sql_log.5.gz
+%doc %{_mandir}/man5/rlm_unix.5.gz
+%doc %{_mandir}/man5/unlang.5.gz
+%doc %{_mandir}/man5/users.5.gz
+%doc %{_mandir}/man8/raddebug.8.gz
+%doc %{_mandir}/man8/radiusd.8.gz
+%doc %{_mandir}/man8/radmin.8.gz
+%doc %{_mandir}/man8/radrelay.8.gz
+%doc %{_mandir}/man8/radwatch.8.gz
 # dictionaries
 %dir %attr(755,root,root) /usr/share/freeradius
 /usr/share/freeradius/*
@@ -517,10 +548,21 @@ fi
 %{_libdir}/freeradius/rlm_sqlippool-%{version}.so
 %{_libdir}/freeradius/rlm_unix.so
 %{_libdir}/freeradius/rlm_unix-%{version}.so
+%{_libdir}/freeradius/rlm_wimax.so
+%{_libdir}/freeradius/rlm_wimax-%{version}.so
 
 %files utils
 %defattr(-,root,root)
 /usr/bin/*
+# man-pages
+%doc %{_mandir}/man1/radclient.1.gz
+%doc %{_mandir}/man1/radeapclient.1.gz
+%doc %{_mandir}/man1/radlast.1.gz
+%doc %{_mandir}/man1/radtest.1.gz
+%doc %{_mandir}/man1/radwho.1.gz
+%doc %{_mandir}/man1/radzap.1.gz
+%doc %{_mandir}/man8/radsqlrelay.8.gz
+%doc %{_mandir}/man8/rlm_ippool_tool.8.gz
 
 %files libs
 # RADIU shared libs
@@ -554,6 +596,8 @@ fi
 %defattr(-,root,root)
 %dir %attr(750,root,radiusd) /etc/raddb/sql/mysql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/mysql/*
+%dir %attr(750,root,radiusd) /etc/raddb/sql/ndb
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/ndb/*
 %{_libdir}/freeradius/rlm_sql_mysql.so
 %{_libdir}/freeradius/rlm_sql_mysql-%{version}.so
 
@@ -577,6 +621,87 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Tue Sep 15 2009 John Dennis <jdennis at redhat.com> - 2.1.7-1
+- enable building of the rlm_wimax module
+- pcap wire analysis support is enabled and available in utils subpackage
+- Resolves bug #523053 radtest manpage in wrong package
+- update to latest upstream release, from upstream Changelog:
+  Feature improvements
+    * Full support for CoA and Disconnect packets as per RFC 3576
+      and RFC 5176.  Both receiving and proxying CoA is supported.
+    * Added "src_ipaddr" configuration to "home_server".  See
+      proxy.conf for details.
+    * radsniff now accepts -I, to read from a filename instead of
+      a device.
+    * radsniff also prints matching requests and any responses to those
+      requests when '-r' is used.
+    * Added example of attr_filter for Access-Challenge packets
+    * Added support for udpfromto in DHCP code
+    * radmin can now selectively mark modules alive/dead.
+      See "set module state".
+    * Added customizable messages on login success/fail.
+      See msg_goodpass && msg_badpass in log{} section of radiusd.conf
+    * Document "chase_referrals" and "rebind" in raddb/modules/ldap
+    * Preliminary implementation of DHCP relay.
+    * Made thread pool section optional.  If it doesn't exist,
+      the server will run single-threaded.
+    * Added sample radrelay.conf for people upgrading from 1.x
+    * Made proxying more stable by failing over, rather than
+      rejecting the first request.  See "response_window" in proxy.conf
+    * Allow home_server_pools to exist without realms.
+    * Add dictionary.iea (closes bug #7)
+    * Added support for RFC 5580
+    * Added experimental sql_freetds module from Gabriel Blanchard.
+    * Updated dictionary.foundry
+    * Added sample configuration for MySQL cluster in raddb/sql/ndb
+      See the README file for explanations.
+  Bug fixes
+    * Fixed corner case where proxied packets could have extra
+      character in User-Password attribute.  Fix from Niko Tyni.
+    * Extended size of "attribute" field in SQL to 64.
+    * Fixes to ruby module to be more careful about when it builds.
+    * Updated Perl module "configure" script to check for broken
+      Perl installations.
+    * Fix "status_check = none".  It would still send packets
+      in some cases.
+    * Set recursive flag on the proxy mutex, which enables safer
+      cleanup on some platforms.
+    * Copy the EAP username verbatim, rather than escaping it.
+    * Update handling so that robust-proxy-accounting works when
+      all home servers are down for extended periods of time.
+    * Look for DHCP option 53 anywhere in the packet, not just
+      at the start.
+    * Fix processing of proxy fail handler with virtual servers.
+    * DHCP code now prints out correct src/dst IP addresses
+      when sending packets.
+    * Removed requirement for DHCP to have clients
+    * Fixed handling of DHCP packets with message-type buried in the packet
+    * Fixed corner case with negation in unlang.
+    * Minor fixes to default MySQL & PostgreSQL schemas
+    * Suppress MSCHAP complaints in debugging mode.
+    * Fix SQL module for multiple instance, and possible crash on HUP
+    * Fix permissions for radius.log for sites that change user/group,
+      but which don't create the file before starting radiusd.
+    * Fix double counting of packets when proxying
+    * Make %%l work
+    * Fix pthread keys in rlm_perl
+    * Log reasons for EAP failure (closes bug #8)
+    * Load home servers and pools that aren't referenced from a realm.
+    * Handle return codes from virtual attributes in "unlang"
+      (e.g. LDAP-Group).  This makes "!(expr)" work for them.
+    * Enable VMPS to see contents of virtual server again
+    * Fix WiMAX module to be consistent with examples.  (closes bug #10)
+    * Fixed crash with policies dependent on NAS-Port comparisons
+    * Allowed vendor IDs to be be higher than 32767.
+    * Fix crash on startup with certain regexes in "hints" file.
+    * Fix crash in attr_filter module when packets don't exist
+    * Allow detail file reader to be faster when "load_factor = 100"
+    * Add work-around for build failures with errors related to
+      lt__PROGRAM__LTX_preloaded_symbols.  libltdl / libtool are horrible.
+    * Made ldap module "rebind" option aware of older, incompatible
+      versions of OpenLDAP.
+    * Check value of Fall-Through in attr_filter module.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.6-6
 - rebuilt with new openssl
 
@@ -593,96 +718,95 @@ fi
 - make /etc/raddb/sites-available/* be config(noreplace)
 
 * Mon May 18 2009 John Dennis <jdennis at redhat.com> - 2.1.6-1
-  - update to latest upstream release, from upstream Changelog:
-    Feature improvements
-      * radclient exits with 0 on successful (accept / ack), and 1
-        otherwise (no response / reject)
-      * Added support for %%{sql:UPDATE ..}, and insert/delete
-        Patch from Arran Cudbard-Bell
-      * Added sample "do not respond" policy.  See raddb/policy.conf
-        and raddb/sites-available/do_not_respond
-      * Cleanups to Suse spec file from Norbert Wegener
-      * New VSAs for Juniper from Bjorn Mork
-      * Include more RFC dictionaries in the default install
-      * More documentation for the WiMAX module
-      * Added "chase_referrals" and "rebind" configuration to rlm_ldap.
-        This helps with Active Directory.  See raddb/modules/ldap
-      * Don't load pre/post-proxy if proxying is disabled.
-      * Added %%{md5:...}, which returns MD5 hash in hex.
-      * Added configurable "retry_interval" and "poll_interval"
-        for "detail" listeners.
-      * Added "delete_mppe_keys" configuration option to rlm_wimax.
-        Apparently some WiMAX clients misbehave when they see those keys.
-      * Added experimental rlm_ruby from
-        http://github.com/Antti/freeradius-server/tree/master
-      * Add Tunnel attributes to ldap.attrmap
-      * Enable virtual servers to be reloaded on HUP.  For now, only
-        the "authorize", "authenticate", etc. processing sections are
-        reloaded.  Clients and "listen" sections are NOT reloaded.
-      * Updated "radwatch" script to be more robust.  See scripts/radwatch
-      * Added certificate compatibility notes in raddb/certs/README,
-        for compatibility with different operating systems. (i.e. Windows)
-      * Permit multiple "-e" in radmin.
-      * Add support for originating CoA-Request and Disconnect-Request.
-        See raddb/sites-available/originate-coa.
-      * Added "lifetime" and "max_queries" to raddb/sql.conf.
-        This helps address the problem of hung SQL sockets.
-      * Allow packets to be injected via radmin.  See "inject help"
-        in radmin.
-      * Answer VMPS reconfirmation request.  Patch from Hermann Lauer.
-      * Sample logrotate script in scripts/logrotate.freeradius
-      * Add configurable poll interval for "detail" listeners
-      * New "raddebug" command.  This prints debugging information from
-        a running server.  See "man raddebug.
-      * Add "require_message_authenticator" configuration to home_server
-        configuration.  This makes the server add Message-Authenticator
-        to all outgoing Access-Request packets.
-      * Added smsotp module, as contributed by Siemens.
-      * Enabled the administration socket in the default install.
-        See raddb/sites-available/control-socket, and "man radmin"
-      * Handle duplicate clients, such as with replicated or
-        load-balanced SQL servers and "readclients = yes"
-
-    Bug fixes
-      * Minor changes to allow building without VQP.
-      * Minor fixes from John Center
-      * Fixed raddebug example
-      * Don't crash when deleting attributes via unlang
-      * Be friendlier to very fast clients
-      * Updated the "detail" listener so that it only polls once,
-        and not many times in a row, leaking memory each time...
-      * Update comparison for Packet-Src-IP-Address (etc.) so that
-        the operators other than '==' work.
-      * Did autoconf magic to work around weird libtool bug
-      * Make rlm_perl keep tags for tagged attributes in more situations
-      * Update UID checking for radmin
-      * Added "include_length" field for TTLS.  It's needed for RFC
-        compliance, but not (apparently) for interoperability.
-      * Clean up control sockets when they are closed, so that we don't
-        leak memory.
-      * Define SUN_LEN for systems that don't have it.
-      * Correct some boundary conditions in the conditional checker ("if")
-        in "unlang".  Bug noted by Arran Cudbard-Bell.
-      * Work around minor building issues in gmake.  This should only
-        have affected developers.
-      * Change how we manage unprivileged user/group, so that we do not
-        create control sockets owned by root.
-      * Fixed more minor issues found by Coverity.
-      * Allow raddb/certs/bootstrap to run when there is no "make"
-        command installed.
-      * In radiusd.conf, run_dir depends on the name of the program,
-        and isn't hard-coded to "..../radiusd"
-      * Check for EOF in more places in the "detail" file reader.
-      * Added Freeswitch dictionary.
-      * Chop ethernet frames in VMPS, rather than droppping packets.
-      * Fix EAP-TLS bug.  Patch from Arnaud Ebalard
-      * Don't lose string for regex-compares in the "users" file.
-      * Expose more functions in rlm_sql to rlm_sqlippool, which 
-        helps on systems where RTLD_GLOBAL is off.
-      * Fix typos in MySQL schemas for ippools.
-      * Remove macro that was causing build issues on some platforms.
-      * Fixed issues with dead home servers.  Bug noted by Chris Moules.
-      * Fixed "access after free" with some dynamic clients.
+- update to latest upstream release, from upstream Changelog:
+  Feature improvements
+    * radclient exits with 0 on successful (accept / ack), and 1
+      otherwise (no response / reject)
+    * Added support for %%{sql:UPDATE ..}, and insert/delete
+      Patch from Arran Cudbard-Bell
+    * Added sample "do not respond" policy.  See raddb/policy.conf
+      and raddb/sites-available/do_not_respond
+    * Cleanups to Suse spec file from Norbert Wegener
+    * New VSAs for Juniper from Bjorn Mork
+    * Include more RFC dictionaries in the default install
+    * More documentation for the WiMAX module
+    * Added "chase_referrals" and "rebind" configuration to rlm_ldap.
+      This helps with Active Directory.  See raddb/modules/ldap
+    * Don't load pre/post-proxy if proxying is disabled.
+    * Added %%{md5:...}, which returns MD5 hash in hex.
+    * Added configurable "retry_interval" and "poll_interval"
+      for "detail" listeners.
+    * Added "delete_mppe_keys" configuration option to rlm_wimax.
+      Apparently some WiMAX clients misbehave when they see those keys.
+    * Added experimental rlm_ruby from
+      http://github.com/Antti/freeradius-server/tree/master
+    * Add Tunnel attributes to ldap.attrmap
+    * Enable virtual servers to be reloaded on HUP.  For now, only
+      the "authorize", "authenticate", etc. processing sections are
+      reloaded.  Clients and "listen" sections are NOT reloaded.
+    * Updated "radwatch" script to be more robust.  See scripts/radwatch
+    * Added certificate compatibility notes in raddb/certs/README,
+      for compatibility with different operating systems. (i.e. Windows)
+    * Permit multiple "-e" in radmin.
+    * Add support for originating CoA-Request and Disconnect-Request.
+      See raddb/sites-available/originate-coa.
+    * Added "lifetime" and "max_queries" to raddb/sql.conf.
+      This helps address the problem of hung SQL sockets.
+    * Allow packets to be injected via radmin.  See "inject help"
+      in radmin.
+    * Answer VMPS reconfirmation request.  Patch from Hermann Lauer.
+    * Sample logrotate script in scripts/logrotate.freeradius
+    * Add configurable poll interval for "detail" listeners
+    * New "raddebug" command.  This prints debugging information from
+      a running server.  See "man raddebug.
+    * Add "require_message_authenticator" configuration to home_server
+      configuration.  This makes the server add Message-Authenticator
+      to all outgoing Access-Request packets.
+    * Added smsotp module, as contributed by Siemens.
+    * Enabled the administration socket in the default install.
+      See raddb/sites-available/control-socket, and "man radmin"
+    * Handle duplicate clients, such as with replicated or
+      load-balanced SQL servers and "readclients = yes"
+  Bug fixes
+    * Minor changes to allow building without VQP.
+    * Minor fixes from John Center
+    * Fixed raddebug example
+    * Don't crash when deleting attributes via unlang
+    * Be friendlier to very fast clients
+    * Updated the "detail" listener so that it only polls once,
+      and not many times in a row, leaking memory each time...
+    * Update comparison for Packet-Src-IP-Address (etc.) so that
+      the operators other than '==' work.
+    * Did autoconf magic to work around weird libtool bug
+    * Make rlm_perl keep tags for tagged attributes in more situations
+    * Update UID checking for radmin
+    * Added "include_length" field for TTLS.  It's needed for RFC
+      compliance, but not (apparently) for interoperability.
+    * Clean up control sockets when they are closed, so that we don't
+      leak memory.
+    * Define SUN_LEN for systems that don't have it.
+    * Correct some boundary conditions in the conditional checker ("if")
+      in "unlang".  Bug noted by Arran Cudbard-Bell.
+    * Work around minor building issues in gmake.  This should only
+      have affected developers.
+    * Change how we manage unprivileged user/group, so that we do not
+      create control sockets owned by root.
+    * Fixed more minor issues found by Coverity.
+    * Allow raddb/certs/bootstrap to run when there is no "make"
+      command installed.
+    * In radiusd.conf, run_dir depends on the name of the program,
+      and isn't hard-coded to "..../radiusd"
+    * Check for EOF in more places in the "detail" file reader.
+    * Added Freeswitch dictionary.
+    * Chop ethernet frames in VMPS, rather than droppping packets.
+    * Fix EAP-TLS bug.  Patch from Arnaud Ebalard
+    * Don't lose string for regex-compares in the "users" file.
+    * Expose more functions in rlm_sql to rlm_sqlippool, which
+      helps on systems where RTLD_GLOBAL is off.
+    * Fix typos in MySQL schemas for ippools.
+    * Remove macro that was causing build issues on some platforms.
+    * Fixed issues with dead home servers.  Bug noted by Chris Moules.
+    * Fixed "access after free" with some dynamic clients.
 
 - fix packaging bug, some directories missing execute permission
   /etc/raddb/dictionary now readable by all.
@@ -926,7 +1050,7 @@ undefined reference to lt__PROGRAM__LTX_
 - Other minor cleanups
 
 * Wed Aug 25 2004 Thomas Woerner <twoerner at redhat.com> 1.0.0-2.1
-- renamed /etc/pam.d/radius to /etc/pam.d/radiusd to match default 
+- renamed /etc/pam.d/radius to /etc/pam.d/radiusd to match default
   configuration (#130613)
 
 * Wed Aug 25 2004 Thomas Woerner <twoerner at redhat.com> 1.0.0-2
@@ -1012,5 +1136,5 @@ undefined reference to lt__PROGRAM__LTX_
 - create logging dir in post if it does not exist
 - fixed module load without la files
 
-* Thu Apr 17 2003 Thomas Woerner <twoerner at redhat.com> 
+* Thu Apr 17 2003 Thomas Woerner <twoerner at redhat.com>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	18 May 2009 16:03:13 -0000	1.22
+++ sources	15 Sep 2009 14:47:18 -0000	1.23
@@ -1 +1 @@
-645ac631505cde46e93c47e273bdec19  freeradius-server-2.1.6.tar.bz2
+b8df6cf0c3df1dded205ad5f954feb78  freeradius-server-2.1.7.tar.bz2



From kyle at fedoraproject.org  Tue Sep 15 14:47:35 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 15 Sep 2009 14:47:35 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-git4.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1127, 1.1128 kernel.spec, 1.1801,
	1.1802 linux-2.6-build-nonintconfig.patch, 1.15,
	1.16 linux-2.6-execshield.patch, 1.108, 1.109 sources, 1.1085,
	1.1086 upstream, 1.999,
	1.1000 hid-ignore-all-recent-imon-devices.patch, 1.1,
	NONE linux-2.6-bluetooth-autosuspend.diff, 1.2, NONE
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch,
	1.1, NONE
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch,
	1.1,
	NONE linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch,
	1.1, NONE linux-2.6-xen-stack-protector-fix.patch, 1.1,
	NONE patch-2.6.31-git2.bz2.sign, 1.1, NONE
Message-ID: <20090915144735.ECC9911C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16136

Modified Files:
	.cvsignore kernel.spec linux-2.6-build-nonintconfig.patch 
	linux-2.6-execshield.patch sources upstream 
Added Files:
	patch-2.6.31-git4.bz2.sign 
Removed Files:
	hid-ignore-all-recent-imon-devices.patch 
	linux-2.6-bluetooth-autosuspend.diff 
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch 
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch 
	linux-2.6-xen-stack-protector-fix.patch 
	patch-2.6.31-git2.bz2.sign 
Log Message:
* Tue Sep 15 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.31-git4
- rebased:
 - linux-2.6-execshield.patch: split paravirt_types.h
 - linux-2.6-buildnonintconfig.patch
- disabled:
 - ksm, drm.
- merged:
 - linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 - linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
 - linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
 - linux-2.6-xen-stack-protector-fix.patch
 - linux-2.6-bluetooth-autosuspend.diff
 - hid-ignore-all-recent-imon-devices.patch



--- NEW FILE patch-2.6.31-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKr4RRyGugalF9Dw4RAo/qAJ9qsvMMKDPmOEWI8kNI13jkqf2HoQCdHdxk
+sPmmSk3Am3XAsFjZbiKMq8=
=yc2b
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1127
retrieving revision 1.1128
diff -u -p -r1.1127 -r1.1128
--- .cvsignore	14 Sep 2009 21:33:52 -0000	1.1127
+++ .cvsignore	15 Sep 2009 14:47:35 -0000	1.1128
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31-git2.bz2
+patch-2.6.31-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1801
retrieving revision 1.1802
diff -u -p -r1.1801 -r1.1802
--- kernel.spec	14 Sep 2009 21:33:54 -0000	1.1801
+++ kernel.spec	15 Sep 2009 14:47:35 -0000	1.1802
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -631,7 +631,6 @@ Patch280: linux-2.6-debug-spinlock-taint
 Patch300: linux-2.6-driver-level-usb-autosuspend.diff
 Patch301: linux-2.6-fix-usb-serial-autosuspend.diff
 Patch302: linux-2.6-qcserial-autosuspend.diff
-Patch303: linux-2.6-bluetooth-autosuspend.diff
 Patch304: linux-2.6-usb-uvc-autosuspend.diff
 Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
 Patch360: linux-2.6-debug-always-inline-kzalloc.patch
@@ -672,17 +671,12 @@ Patch900: linux-2.6-pci-cacheline-sizing
 
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
-Patch1518: hid-ignore-all-recent-imon-devices.patch
 
 # virt + ksm patches
 Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
-Patch1575: linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
-Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
@@ -1212,7 +1206,6 @@ ApplyPatch linux-2.6-nfsd4-proots.patch
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
 ApplyPatch linux-2.6-fix-usb-serial-autosuspend.diff
 ApplyPatch linux-2.6-qcserial-autosuspend.diff
-ApplyPatch linux-2.6-bluetooth-autosuspend.diff
 ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
 
 # ACPI
@@ -1304,44 +1297,38 @@ ApplyPatch linux-2.6-pci-cacheline-sizin
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
-# tell usbhid to ignore all imon devices (sent upstream 2009.07.31)
-ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Add kernel KSM support
 ApplyPatch linux-2.6-ksm.patch
 ApplyPatch linux-2.6-ksm-updates.patch
 ApplyPatch linux-2.6-ksm-fix-munlock.patch
 # Optimize KVM for KSM support
-ApplyPatch linux-2.6-ksm-kvm.patch
+#ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-ApplyPatch linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
-ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # Fix block I/O errors in KVM
-ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
+#ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
+#ApplyPatch drm-next.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-page-flip.patch
+#ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
-ApplyPatch drm-vga-arb.patch
+#ApplyPatch drm-vga-arb.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2023,6 +2010,21 @@ fi
 # ##############################################################
 
 %changelog
+* Tue Sep 15 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.31-git4
+- rebased:
+ - linux-2.6-execshield.patch: split paravirt_types.h
+ - linux-2.6-buildnonintconfig.patch
+- disabled:
+ - ksm, drm.
+- merged:
+ - linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+ - linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+ - linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+ - linux-2.6-xen-stack-protector-fix.patch
+ - linux-2.6-bluetooth-autosuspend.diff
+ - hid-ignore-all-recent-imon-devices.patch
+
 * Mon Sep 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-git2
 - Drop merged patches:

linux-2.6-build-nonintconfig.patch:
 Makefile |    5 +++++
 conf.c   |   36 ++++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 4 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- linux-2.6-build-nonintconfig.patch	30 Sep 2008 03:24:30 -0000	1.15
+++ linux-2.6-build-nonintconfig.patch	15 Sep 2009 14:47:35 -0000	1.16
@@ -1,10 +1,10 @@
 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index 32e8c5a..8020453 100644
+index 6d69c7c..ff84d12 100644
 --- a/scripts/kconfig/Makefile
 +++ b/scripts/kconfig/Makefile
-@@ -24,6 +24,11 @@ oldconfig: $(obj)/conf
- silentoldconfig: $(obj)/conf
- 	$< -s $(Kconfig)
+@@ -58,6 +58,11 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
+ 	fi
+ 	$(Q)rm -f .tmp.config
  
 +nonint_oldconfig: $(obj)/conf
 +	$< -b $(Kconfig)
@@ -15,10 +15,10 @@ index 32e8c5a..8020453 100644
  # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
  # The symlink is used to repair a deficiency in arch/um
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index fda6313..ed33b66 100644
+index 3baaaec..2a81742 100644
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
-@@ -22,6 +22,8 @@
+@@ -23,6 +23,8 @@ enum {
  	ask_all,
  	ask_new,
  	ask_silent,
@@ -27,7 +27,7 @@ index fda6313..ed33b66 100644
  	set_default,
  	set_yes,
  	set_mod,
-@@ -39,6 +41,8 @@
+@@ -40,6 +42,8 @@ static struct menu *rootEntry;
  
  static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
  
@@ -36,7 +36,7 @@ index fda6313..ed33b66 100644
  static const char *get_help(struct menu *menu)
  {
  	if (menu_has_help(menu))
-@@ -359,7 +363,10 @@
+@@ -360,7 +364,10 @@ static void conf(struct menu *menu)
  
  		switch (prop->type) {
  		case P_MENU:
@@ -48,7 +48,7 @@ index fda6313..ed33b66 100644
  				check_conf(menu);
  				return;
  			}
-@@ -417,12 +424,21 @@
+@@ -418,12 +425,21 @@ static void check_conf(struct menu *menu)
  	if (sym && !sym_has_value(sym)) {
  		if (sym_is_changable(sym) ||
  		    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
@@ -70,7 +70,7 @@ index fda6313..ed33b66 100644
  
  	for (child = menu->list; child; child = child->next)
  		check_conf(child);
-@@ -438,7 +454,7 @@
+@@ -439,7 +455,7 @@ int main(int ac, char **av)
  	bindtextdomain(PACKAGE, LOCALEDIR);
  	textdomain(PACKAGE);
  
@@ -79,7 +79,7 @@ index fda6313..ed33b66 100644
  		switch (opt) {
  		case 'o':
  			input_mode = ask_silent;
-@@ -447,6 +463,12 @@
+@@ -448,6 +464,12 @@ int main(int ac, char **av)
  			input_mode = ask_silent;
  			sync_kconfig = 1;
  			break;
@@ -92,7 +92,7 @@ index fda6313..ed33b66 100644
  		case 'd':
  			input_mode = set_default;
  			break;
-@@ -510,6 +532,8 @@
+@@ -525,6 +547,8 @@ int main(int ac, char **av)
  	case ask_silent:
  	case ask_all:
  	case ask_new:
@@ -101,7 +101,7 @@ index fda6313..ed33b66 100644
  		conf_read(NULL);
  		break;
  	case set_no:
-@@ -571,12 +595,16 @@
+@@ -586,12 +610,16 @@ int main(int ac, char **av)
  		conf(&rootmenu);
  		input_mode = ask_silent;
  		/* fall through */
@@ -119,7 +119,7 @@ index fda6313..ed33b66 100644
  		break;
  	}
  
-@@ -598,5 +626,5 @@
+@@ -613,5 +641,5 @@ int main(int ac, char **av)
  			exit(1);
  		}
  	}

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  129 +++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c                    |    6 +
 arch/x86/mm/init_32.c                 |   48 ++++++++++++
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 24 files changed, 507 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- linux-2.6-execshield.patch	21 Jun 2009 20:52:20 -0000	1.108
+++ linux-2.6-execshield.patch	15 Sep 2009 14:47:35 -0000	1.109
@@ -1,8 +1,8 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index c45f415..3a6dbad 100644
+index e8de2f6..538c2b6 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
-@@ -6,6 +6,7 @@
+@@ -5,6 +5,7 @@
  #include <asm/ldt.h>
  #include <asm/mmu.h>
  #include <linux/smp.h>
@@ -10,7 +10,7 @@ index c45f415..3a6dbad 100644
  
  static inline void fill_ldt(struct desc_struct *desc,
  			    const struct user_desc *info)
-@@ -94,6 +95,9 @@ static inline int desc_empty(const void *ptr)
+@@ -93,6 +94,9 @@ static inline int desc_empty(const void *ptr)
  
  #define load_TLS(t, cpu) native_load_tls(t, cpu)
  #define set_ldt native_set_ldt
@@ -20,7 +20,7 @@ index c45f415..3a6dbad 100644
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -380,4 +384,25 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -392,4 +396,25 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -71,20 +71,10 @@ index 80a1dee..8314c66 100644
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 4fb37c8..d5cc31c 100644
+index 40d6586..c75290e 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
-@@ -139,6 +139,9 @@ struct pv_cpu_ops {
- 	void (*store_gdt)(struct desc_ptr *);
- 	void (*store_idt)(struct desc_ptr *);
- 	void (*set_ldt)(const void *desc, unsigned entries);
-+#ifdef CONFIG_X86_32
-+	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
-+#endif /*CONFIG_X86_32*/
- 	unsigned long (*store_tr)(void);
- 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
- #ifdef CONFIG_X86_64
-@@ -955,6 +958,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+@@ -306,6 +306,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
  {
  	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
  }
@@ -97,8 +87,22 @@ index 4fb37c8..d5cc31c 100644
  static inline void store_gdt(struct desc_ptr *dtr)
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
+diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
+index 25402d0..d825de0 100644
+--- a/arch/x86/include/asm/paravirt_types.h
++++ b/arch/x86/include/asm/paravirt_types.h
+@@ -132,6 +132,9 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
++#ifdef CONFIG_X86_32
++	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
++#endif
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index c776826..fb6b579 100644
+index e08ea04..329836f 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
 @@ -160,6 +160,9 @@ static inline int hlt_works(int cpu)
@@ -112,10 +116,10 @@ index c776826..fb6b579 100644
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 3ffdcfa..62cba96 100644
+index 2055fc2..68c1e79 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -804,6 +804,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -799,6 +799,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	/* Filter out anything that depends on CPUID levels we don't have */
  	filter_cpuid_features(c, true);
  
@@ -137,10 +141,10 @@ index 3ffdcfa..62cba96 100644
  	if (!c->x86_model_id[0]) {
  		const char *p;
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index 70ec9b9..d956b8c 100644
+index f5b0b4a..b102671 100644
 --- a/arch/x86/kernel/paravirt.c
 +++ b/arch/x86/kernel/paravirt.c
-@@ -369,6 +369,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -370,6 +370,9 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.read_tscp = native_read_tscp,
  	.load_tr_desc = native_load_tr_desc,
  	.set_ldt = native_set_ldt,
@@ -151,10 +155,10 @@ index 70ec9b9..d956b8c 100644
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 59f4524..068e286 100644
+index 4cf7956..b2407dc 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -299,7 +299,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -296,7 +296,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  void
  start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  {
@@ -165,7 +169,7 @@ index 59f4524..068e286 100644
  	regs->fs		= 0;
  	set_fs(USER_DS);
  	regs->ds		= __USER_DS;
-@@ -308,6 +311,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -305,6 +308,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -177,17 +181,17 @@ index 59f4524..068e286 100644
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -354,7 +362,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
- 	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
+@@ -364,6 +372,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ 	if (preload_fpu)
+ 		prefetch(next->xstate);
  
- 	__unlazy_fpu(prev_p);
--
 +	if (next_p->mm)
 +		load_user_cs_desc(cpu, next_p->mm);
- 
- 	/* we're going to use this soon, after a few expensive things */
- 	if (next_p->fpu_counter > 5)
-@@ -495,3 +504,40 @@ unsigned long get_wchan(struct task_struct *p)
++
+ 	/*
+ 	 * Reload esp0.
+ 	 */
+@@ -497,3 +508,40 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -229,7 +233,7 @@ index 59f4524..068e286 100644
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 07d60c8..41e9129 100644
+index 8326492..4b645d3 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
 @@ -118,6 +118,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
@@ -339,7 +343,7 @@ index 07d60c8..41e9129 100644
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -885,19 +978,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -884,19 +977,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -387,10 +391,10 @@ index 07d60c8..41e9129 100644
  #endif
  
 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 34c1bfb..32c3d8d 100644
+index 0607119..a48b69c 100644
 --- a/arch/x86/mm/init.c
 +++ b/arch/x86/mm/init.c
-@@ -228,6 +228,12 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -212,6 +212,12 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
  	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
@@ -404,10 +408,10 @@ index 34c1bfb..32c3d8d 100644
  	/* Enable PSE if available */
  	if (cpu_has_pse)
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 949708d..c1373b6 100644
+index 3cd7711..771b1e5 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -587,6 +587,54 @@ void zap_low_mappings(void)
+@@ -591,6 +591,54 @@ void zap_low_mappings(bool early)
  pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
@@ -485,7 +489,7 @@ index 1658296..72056cf 100644
  	}
  }
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 821e970..ea5a4c3 100644
+index c814e14..d4dd851 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -6,6 +6,7 @@
@@ -523,10 +527,10 @@ index 58bc00f..1fdafb5 100644
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 0a1700a..37b8744 100644
+index 0dd0c2c..661ecf1 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -321,6 +321,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -323,6 +323,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -551,7 +555,7 @@ index 0a1700a..37b8744 100644
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long va = dtr->address;
-@@ -886,6 +904,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -959,6 +977,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -562,7 +566,7 @@ index 0a1700a..37b8744 100644
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 40381df..f856fab 100644
+index 7c1e65d..8d25676 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
 @@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
@@ -622,10 +626,10 @@ index 40381df..f856fab 100644
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ad613ed..08f08d0 100644
+index 9a72cc7..d571ff3 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1135,7 +1135,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1118,7 +1118,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -641,10 +645,10 @@ index ad613ed..08f08d0 100644
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 0e80e26..af904ea 100644
+index 0042090..c675fb7 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -198,6 +198,9 @@ struct mm_struct {
+@@ -206,6 +206,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -672,10 +676,10 @@ index 40fc7e6..68c2549 100644
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 4896fdf..3513e03 100644
+index f3d74bd..26417ac 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -101,6 +101,9 @@ struct fs_struct;
+@@ -102,6 +102,9 @@ struct fs_struct;
  struct bts_context;
  struct perf_counter_context;
  
@@ -685,7 +689,7 @@ index 4896fdf..3513e03 100644
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -359,6 +362,10 @@ extern int sysctl_max_map_count;
+@@ -373,6 +376,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -697,10 +701,10 @@ index 4896fdf..3513e03 100644
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index ce664f9..1905e22 100644
+index 6bb59f7..58b2801 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -87,6 +87,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -88,6 +88,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
  #ifndef CONFIG_MMU
  extern int sysctl_nr_trim_pages;
  #endif
@@ -727,7 +731,7 @@ index ce664f9..1905e22 100644
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -382,6 +402,14 @@ static struct ctl_table kern_table[] = {
+@@ -403,6 +423,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -743,7 +747,7 @@ index ce664f9..1905e22 100644
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 34579b2..260bb3c 100644
+index 8101de4..543272b 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -29,6 +29,7 @@
@@ -773,7 +777,7 @@ index 34579b2..260bb3c 100644
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -392,6 +405,8 @@ static inline void
+@@ -389,6 +402,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -782,7 +786,7 @@ index 34579b2..260bb3c 100644
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -491,6 +506,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -791,7 +795,7 @@ index 34579b2..260bb3c 100644
  }
  
  /*
-@@ -803,6 +820,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -800,7 +804,7 @@ index 34579b2..260bb3c 100644
  		return prev;
  	}
  
-@@ -957,7 +976,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -810,7 +814,7 @@ index 34579b2..260bb3c 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1442,13 +1462,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -831,7 +835,7 @@ index 34579b2..260bb3c 100644
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1462,8 +1486,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -909,7 +913,7 @@ index 34579b2..260bb3c 100644
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1538,6 +1630,14 @@ out:
+@@ -1535,6 +1627,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -924,7 +928,7 @@ index 34579b2..260bb3c 100644
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1554,7 +1654,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -933,7 +937,7 @@ index 34579b2..260bb3c 100644
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1864,10 +1964,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -950,7 +954,7 @@ index 34579b2..260bb3c 100644
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2116,6 +2220,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2113,6 +2217,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -p -r1.1085 -r1.1086
--- sources	14 Sep 2009 21:33:55 -0000	1.1085
+++ sources	15 Sep 2009 14:47:35 -0000	1.1086
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-1e664c17a5f41ca9ac2d3d7f18cfb5ab  patch-2.6.31-git2.bz2
+3894e5c148d260a7cb891b86a1939f69  patch-2.6.31-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.999
retrieving revision 1.1000
diff -u -p -r1.999 -r1.1000
--- upstream	14 Sep 2009 21:33:55 -0000	1.999
+++ upstream	15 Sep 2009 14:47:35 -0000	1.1000
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31-git2.bz2
+patch-2.6.31-git4.bz2


--- hid-ignore-all-recent-imon-devices.patch DELETED ---


--- linux-2.6-bluetooth-autosuspend.diff DELETED ---


--- linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch DELETED ---


--- linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch DELETED ---


--- linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch DELETED ---


--- linux-2.6-xen-stack-protector-fix.patch DELETED ---


--- patch-2.6.31-git2.bz2.sign DELETED ---



From varekova at fedoraproject.org  Tue Sep 15 14:48:25 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 14:48:25 +0000 (UTC)
Subject: rpms/sysstat/devel sysstat-9.0.4-init_script.patch, 1.2,
	1.3 sysstat.spec, 1.71, 1.72
Message-ID: <20090915144825.E9AC711C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16424

Modified Files:
	sysstat-9.0.4-init_script.patch sysstat.spec 
Log Message:
fix init script


sysstat-9.0.4-init_script.patch:
 sysstat.in |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Index: sysstat-9.0.4-init_script.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat-9.0.4-init_script.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sysstat-9.0.4-init_script.patch	14 Sep 2009 13:56:46 -0000	1.2
+++ sysstat-9.0.4-init_script.patch	15 Sep 2009 14:48:25 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up sysstat-9.0.4/sysstat.in.ii sysstat-9.0.4/sysstat.in
 --- sysstat-9.0.4/sysstat.in.ii	2009-02-15 15:49:24.000000000 +0100
-+++ sysstat-9.0.4/sysstat.in	2009-09-14 15:47:07.000000000 +0200
++++ sysstat-9.0.4/sysstat.in	2009-09-15 16:47:02.000000000 +0200
 @@ -4,11 +4,13 @@
  # @INIT_DIR@/sysstat
  # (C) 2000-2009 Sebastien Godard (sysstat <at> orange.fr)
@@ -16,7 +16,7 @@ diff -up sysstat-9.0.4/sysstat.in.ii sys
  
  RETVAL=0
  SYSCONFIG_DIR=@SYSCONFIG_DIR@
-@@ -27,11 +29,11 @@ case "$1" in
+@@ -27,15 +29,15 @@ case "$1" in
  	if [ -f "${exitCodeIndicator}" ]; then
  		rm -f ${exitCodeIndicator}
  	else
@@ -29,4 +29,10 @@ diff -up sysstat-9.0.4/sysstat.in.ii sys
 +  stop|status|restart|reload|force-reload|condrestart|try-restart)
  	;;
    *)
- 	echo "Usage: sysstat {start|stop|status|restart|reload}"
+-	echo "Usage: sysstat {start|stop|status|restart|reload}"
+-	exit 1
++	echo "Usage: sysstat {start|stop|status|restart|reload|force-reload|condrestart|try-restart}"
++	exit 2
+ esac
+ exit ${RETVAL}
+ 


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sysstat.spec	14 Sep 2009 13:30:48 -0000	1.71
+++ sysstat.spec	15 Sep 2009 14:48:25 -0000	1.72
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 9.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
+* Tue sep 15 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-4
+- fix init script
+
 * Mon Sep 14 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-3
 - fix init script - add INIT INFO flags (#522740)
   and add condrestart, try-restart and force-reload (#522743)



From varekova at fedoraproject.org  Tue Sep 15 14:49:20 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Sep 2009 14:49:20 +0000 (UTC)
Subject: rpms/sysstat/devel sysstat.spec,1.72,1.73
Message-ID: <20090915144920.84BC711C00CE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16673

Modified Files:
	sysstat.spec 
Log Message:
fix changelog tag 



Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sysstat.spec	15 Sep 2009 14:48:25 -0000	1.72
+++ sysstat.spec	15 Sep 2009 14:49:20 -0000	1.73
@@ -74,7 +74,7 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
-* Tue sep 15 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-4
+* Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-4
 - fix init script
 
 * Mon Sep 14 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-3



From tuxbrewr at fedoraproject.org  Tue Sep 15 14:50:25 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 15 Sep 2009 14:50:25 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec, 1.44, 1.45 sources, 1.21,
	1.22
Message-ID: <20090915145025.B575711C0335@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17036

Modified Files:
	kpackagekit.spec sources 
Log Message:
new snapshot


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- kpackagekit.spec	9 Sep 2009 23:07:41 -0000	1.44
+++ kpackagekit.spec	15 Sep 2009 14:50:25 -0000	1.45
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.5.0
-Release:	0.1.20090908svn%{?dist}
+Release:	0.1.20090915svn%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090915svn
+- New git snapshot
+
 * Tue Sep 08 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090908svn
 - New git snapshot, disable history
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Sep 2009 23:07:41 -0000	1.21
+++ sources	15 Sep 2009 14:50:25 -0000	1.22
@@ -1 +1 @@
-0f78e8e6be17c4cf33df3984d0b7e1e7  kpackagekit-0.5.0.tar.bz2
+6eb244d6297a980d85aa580748444d6a  kpackagekit-0.5.0.tar.bz2



From vpv at fedoraproject.org  Tue Sep 15 14:52:13 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 14:52:13 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel malaga-suomi-voikko.spec,1.13,1.14
Message-ID: <20090915145213.F1CAB11C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17577

Modified Files:
	malaga-suomi-voikko.spec 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
- New release candidate
- Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga
  implementation for Finnish spell checking. Malaga is still required for
  building this package
- Cleanup DESTDIR, the Makefile now automatically adds the directory version
  and variant to it



Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- malaga-suomi-voikko.spec	15 Sep 2009 14:34:31 -0000	1.13
+++ malaga-suomi-voikko.spec	15 Sep 2009 14:52:13 -0000	1.14
@@ -36,7 +36,7 @@ rm -rf $RPM_BUILD_ROOT
 # Files differ on big-endian and small-endian archs, and they have different
 # names (*_l vs *_b). This is the reason we use %{_libdir} instead of
 # %{_datadir} and won't noarch the package.
-make voikko-install DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko/1/mor-standard
+make voikko-install DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko
 
 
 %clean
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 - Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga
   implementation for Finnish spell checking. Malaga is still required for
   building this package
+- Cleanup DESTDIR, the Makefile now automatically adds the directory version
+  and variant to it
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From ajax at fedoraproject.org  Tue Sep 15 15:10:04 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 15 Sep 2009 15:10:04 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel dri2-page-flip.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.485,
	1.486 xserver-1.6.99-randr-error-debugging.patch, 1.1,
	1.2 xserver-1.6.99-right-of.patch, 1.1, 1.2
Message-ID: <20090915151004.6AC9A11C0337@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047

Modified Files:
	dri2-page-flip.patch xorg-x11-server.spec 
	xserver-1.6.99-randr-error-debugging.patch 
	xserver-1.6.99-right-of.patch 
Log Message:
* Tue Sep 15 2009 Adam Jackson <ajax at redhat.com> 1.6.99.901-2
- xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you.
- Point to bodhi for the "check for latest version" message.


dri2-page-flip.patch:
 glx/glxcontext.h          |    4 +
 glx/glxdri2.c             |   47 ++++++++++++++----
 glx/glxext.c              |    3 +
 glx/glxserver.h           |   18 +++----
 hw/xfree86/dri2/dri2.c    |  118 ++++++++++++++++++++++++++++++++++++++++++++--
 hw/xfree86/dri2/dri2.h    |   12 +++-
 hw/xfree86/dri2/dri2ext.c |   27 +++++++++-
 7 files changed, 201 insertions(+), 28 deletions(-)

Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/dri2-page-flip.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dri2-page-flip.patch	1 Sep 2009 06:22:47 -0000	1.3
+++ dri2-page-flip.patch	15 Sep 2009 15:10:02 -0000	1.4
@@ -1,7 +1,7 @@
-From f66b2a8321af2e7779b18e1bcf5f60752b9e3705 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
+From 4b3dcbc2b7175262cd6ec13778cfd02efacc9ab7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
 Date: Wed, 29 Jul 2009 08:26:14 -0400
-Subject: [PATCH] DRI2 Page Flipping
+Subject: [PATCH 04/16] DRI2 Page Flipping
 
 ---
  glx/glxcontext.h          |    4 ++
@@ -172,7 +172,7 @@ index 46c9382..3e62782 100644
  extern __GLXclientState *glxGetClient(ClientPtr pClient);
  
 diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index d15ced1..7b9fb23 100644
+index d15ced1..2285fd4 100644
 --- a/hw/xfree86/dri2/dri2.c
 +++ b/hw/xfree86/dri2/dri2.c
 @@ -38,6 +38,7 @@
@@ -275,7 +275,7 @@ index d15ced1..7b9fb23 100644
 +    box.x2 = pDraw->width;
 +    box.y2 = pDraw->height;
 +    REGION_INIT(drawable->pDraw->pScreen, &region, &box, 0);
-+    
++
 +    return DRI2CopyRegion(pDraw, &region,
 +			  DRI2BufferFrontLeft, DRI2BufferBackLeft);
 +}
@@ -457,5 +457,5 @@ index 72f9a44..c859e6e 100644
  	return BadRequest;
      }
 -- 
-1.6.3.rc1.2.g0164.dirty
+1.6.4.2
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -p -r1.485 -r1.486
--- xorg-x11-server.spec	15 Sep 2009 00:46:01 -0000	1.485
+++ xorg-x11-server.spec	15 Sep 2009 15:10:02 -0000	1.486
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99.901
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -77,6 +77,7 @@ Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
 Patch6033: xserver-1.6.99-default-modes.patch
+Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -319,6 +320,10 @@ git am -p1 %{lua: for i, p in ipairs(pat
 %define dri_flags --disable-dri
 %endif
 
+%if 0%{?fedora}
+%define bodhi_flags --with-vendor-web="http://bodhi.fedoraproject.org/"
+%endif
+
 # --with-pie ?
 autoreconf -v --install || exit 1
 export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
@@ -329,10 +334,11 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict
 	--with-default-font-path=%{default_font_path} \
 	--with-module-dir=%{moduledir} \
 	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
+	--with-os-name="$(hostname -s) $(uname -r)" \
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--enable-install-libxf86config \
 	--enable-xselinux --enable-record \
-	%{dri_flags} \
+	%{dri_flags} %{?bodhi_flags} \
 	${CONFIGURE}
         
 make %{?_smp_mflags}
@@ -500,6 +506,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Sep 15 2009 Adam Jackson <ajax at redhat.com> 1.6.99.901-2
+- xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you.
+- Point to bodhi for the "check for latest version" message.
+
 * Mon Sep 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.901-1
 - xserver 1.6.99.901 
 - Re-enable Xdmx

xserver-1.6.99-randr-error-debugging.patch:
 randr.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Index: xserver-1.6.99-randr-error-debugging.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-randr-error-debugging.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.99-randr-error-debugging.patch	28 Jul 2009 14:16:23 -0000	1.1
+++ xserver-1.6.99-randr-error-debugging.patch	15 Sep 2009 15:10:02 -0000	1.2
@@ -1,14 +1,14 @@
-From 9e5f2dcdd30c22661760a0a962da44e4acb6a7e3 Mon Sep 17 00:00:00 2001
+From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Mon, 27 Jul 2009 16:52:42 -0400
-Subject: [PATCH] additional randr debugging
+Subject: [PATCH 11/16] additional randr debugging
 
 ---
- randr/randr.c |   32 ++++++++++++++++++++++++++++----
- 1 files changed, 28 insertions(+), 4 deletions(-)
+ randr/randr.c |   16 +++++++++++++++-
+ 1 files changed, 15 insertions(+), 1 deletions(-)
 
 diff --git a/randr/randr.c b/randr/randr.c
-index 1c1d0c4..e4d7cfc 100644
+index 1c1d0c4..accf614 100644
 --- a/randr/randr.c
 +++ b/randr/randr.c
 @@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode)
@@ -21,7 +21,7 @@ index 1c1d0c4..e4d7cfc 100644
  	return BadRequest;
 -    return (*ProcRandrVector[stuff->data]) (client);
 +    ret = ProcRandrVector[stuff->data](client);
-+    
++
 +    if (ret) {
 +        int i;
 +        ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase);
@@ -30,7 +30,7 @@ index 1c1d0c4..e4d7cfc 100644
 +            if ((i+1) % 4 == 0)
 +               ErrorF("\n");
 +        }
-+        ErrorF("\n"); 
++        ErrorF("\n");
 +    }
 +
 +    return ret;
@@ -38,5 +38,5 @@ index 1c1d0c4..e4d7cfc 100644
  
  static int
 -- 
-1.6.3.3
+1.6.4.2
 

xserver-1.6.99-right-of.patch:
 xf86Crtc.c |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 8 deletions(-)

Index: xserver-1.6.99-right-of.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-right-of.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.99-right-of.patch	28 Jul 2009 18:41:29 -0000	1.1
+++ xserver-1.6.99-right-of.patch	15 Sep 2009 15:10:02 -0000	1.2
@@ -1,17 +1,17 @@
-From 9d16f202248b0ca29b832d28441871b96d0b040d Mon Sep 17 00:00:00 2001
+From 96794b48a3dd37bf0e74b566e5bcba00293836c7 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Tue, 28 Jul 2009 11:07:13 -0400
-Subject: [PATCH] RANDR: right-of placement by default
+Subject: [PATCH 12/16] RANDR: right-of placement by default
 
 ---
  hw/xfree86/modes/xf86Crtc.c |   71 ++++++++++++++++++++++++++++++++++++++----
  1 files changed, 64 insertions(+), 7 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 94fc158..4f14a75 100644
+index 2ee109b..8f726fa 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1140,6 +1140,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
+@@ -1141,6 +1141,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
      int			o;
      int			min_x, min_y;
      
@@ -23,11 +23,11 @@ index 94fc158..4f14a75 100644
 +	if (output->initial_x || output->initial_y)
 +            return TRUE;
 +    }
-+    
++
      for (o = 0; o < config->num_output; o++)
      {
  	xf86OutputPtr	output = config->output[o];
-@@ -2025,6 +2034,54 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
+@@ -2026,6 +2035,54 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
      return match;
  }
  
@@ -51,7 +51,7 @@ index 94fc158..4f14a75 100644
 +
 +    if (numEnabledOutputs(config, enabled) < 2)
 +	return FALSE;
-+    
++
 +    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
 +	DisplayModePtr mode =
 +	    xf86OutputHasPreferredMode(config->output[o], width, height);
@@ -82,7 +82,7 @@ index 94fc158..4f14a75 100644
  static Bool
  xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
  		    DisplayModePtr *modes, Bool *enabled,
-@@ -2082,13 +2139,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+@@ -2083,13 +2140,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
       * biggest mode for its aspect ratio, assuming one exists.
       */
      if (!ret) do {
@@ -97,7 +97,7 @@ index 94fc158..4f14a75 100644
  	    break;
  
  	p = -1;
-@@ -2375,6 +2428,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -2376,6 +2429,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
  
      if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
  	xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
@@ -106,7 +106,7 @@ index 94fc158..4f14a75 100644
      else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
  	xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
      else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-@@ -2391,8 +2446,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -2392,8 +2447,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
  			config->output[o]->name);
  	else
  	    xf86DrvMsg (scrn->scrnIndex, X_INFO,
@@ -120,5 +120,5 @@ index 94fc158..4f14a75 100644
  
      /*
 -- 
-1.6.3.3
+1.6.4.2
 



From kyle at fedoraproject.org  Tue Sep 15 15:12:46 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 15 Sep 2009 15:12:46 +0000 (UTC)
Subject: rpms/kernel/devel config-arm, 1.4, 1.5 config-generic, 1.325,
	1.326 config-powerpc-generic, 1.49, 1.50 config-sparc64-generic,
	1.28, 1.29 kernel.spec, 1.1802, 1.1803
Message-ID: <20090915151246.3A3E411C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23835

Modified Files:
	config-arm config-generic config-powerpc-generic 
	config-sparc64-generic kernel.spec 
Log Message:
* Tue Sep 15 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.31-git4
- rebased:
 - linux-2.6-execshield.patch: split paravirt_types.h
 - linux-2.6-buildnonintconfig.patch
- disabled:
 - ksm, drm.
- merged:
 - linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 - linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
 - linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
 - linux-2.6-xen-stack-protector-fix.patch
 - linux-2.6-bluetooth-autosuspend.diff
 - hid-ignore-all-recent-imon-devices.patch
- config changes:
 - arm:
  - CONFIG_HIGHPTE off, seems safer this way.
 - generic:
  - RDS_RDMA/RDS_TCP=m
  - SCSI_PMCRAID=m
  - WLAN=y, CFG80211_DEFAULT_PS=y, NL80211_TESTMODE off.
  - WL12XX=m
  - B43_PHY_LP=y
  - BT_MRVL=m
  - new MISDN stuff modular.
 - sparc:
  - enable PERF_COUNTERS & EVENT_PROFILE
 - ppc:
  - XILINX_EMACSLITE=m



Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-arm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- config-arm	18 Jun 2009 19:05:53 -0000	1.4
+++ config-arm	15 Sep 2009 15:12:45 -0000	1.5
@@ -9,6 +9,7 @@ CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
 
 CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
 
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- config-generic	14 Sep 2009 21:33:54 -0000	1.325
+++ config-generic	15 Sep 2009 15:12:45 -0000	1.326
@@ -538,6 +538,8 @@ CONFIG_SCSI_OSD_DPRINT_SENSE=1
 
 CONFIG_SCSI_BNX2_ISCSI=m
 
+CONFIG_SCSI_PMCRAID=m
+
 
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -817,6 +819,8 @@ CONFIG_IPV6_PIMSM_V2=y
 
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
 
 CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
@@ -1356,6 +1360,8 @@ CONFIG_SLIP_SMART=y
 #
 # Wireless LAN
 #
+#
+CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
@@ -1368,7 +1374,10 @@ CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEBUGFS=y
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_NL80211=y
+# CONFIG_NL80211_TESTMODE is not set
 # CONFIG_WIRELESS_OLD_REGULATORY is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
@@ -1397,6 +1406,7 @@ CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 
 CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH9K=m
@@ -1409,6 +1419,7 @@ CONFIG_ATMEL=m
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_DEBUG=y
+CONFIG_B43_PHY_LP=y
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_DEBUG=y
@@ -1495,6 +1506,12 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_AR9170_USB=m
 
+CONFIG_WL12XX=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL1271=m
+
 #
 # Token Ring devices
 #
@@ -1543,6 +1560,7 @@ CONFIG_CAN_VCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_KVASER_PCI=m
@@ -1636,6 +1654,8 @@ CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
 
 #
 # ISDN subsystem
@@ -1644,6 +1664,11 @@ CONFIG_ISDN=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
 
 #
 # mISDN hardware drivers
@@ -1819,6 +1844,7 @@ CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MOUSE_APPLETOUCH=m
@@ -1870,6 +1896,7 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_EETI=m
@@ -3036,6 +3063,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_SDIOHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
@@ -3538,6 +3566,7 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
 CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_RUNTIME=y
 
 ## BEGIN ISA Junk.
 


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- config-powerpc-generic	1 Aug 2009 11:33:42 -0000	1.49
+++ config-powerpc-generic	15 Sep 2009 15:12:45 -0000	1.50
@@ -331,3 +331,5 @@ CONFIG_SWIOTLB=y
 # CONFIG_RDS is not set
 
 CONFIG_PPC_DISABLE_WERROR=y
+
+CONFIG_XILINX_EMACLITE=m


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- config-sparc64-generic	18 Aug 2009 17:48:12 -0000	1.28
+++ config-sparc64-generic	15 Sep 2009 15:12:45 -0000	1.29
@@ -206,3 +206,5 @@ CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
+CONFIG_PERF_COUNTERS=y
+CONFIG_EVENT_PROFILE=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1802
retrieving revision 1.1803
diff -u -p -r1.1802 -r1.1803
--- kernel.spec	15 Sep 2009 14:47:35 -0000	1.1802
+++ kernel.spec	15 Sep 2009 15:12:45 -0000	1.1803
@@ -2024,6 +2024,21 @@ fi
  - linux-2.6-xen-stack-protector-fix.patch
  - linux-2.6-bluetooth-autosuspend.diff
  - hid-ignore-all-recent-imon-devices.patch
+- config changes:
+ - arm:
+  - CONFIG_HIGHPTE off, seems safer this way.
+ - generic:
+  - RDS_RDMA/RDS_TCP=m
+  - SCSI_PMCRAID=m
+  - WLAN=y, CFG80211_DEFAULT_PS=y, NL80211_TESTMODE off.
+  - WL12XX=m
+  - B43_PHY_LP=y
+  - BT_MRVL=m
+  - new MISDN stuff modular.
+ - sparc:
+  - enable PERF_COUNTERS & EVENT_PROFILE
+ - ppc:
+  - XILINX_EMACSLITE=m
 
 * Mon Sep 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-git2



From jdennis at fedoraproject.org  Tue Sep 15 15:24:12 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Tue, 15 Sep 2009 15:24:12 +0000 (UTC)
Subject: rpms/freeradius/F-11 .cvsignore, 1.21, 1.22 freeradius.spec, 1.82, 
	1.83 sources, 1.22, 1.23
Message-ID: <20090915152412.7B65B11C00CE@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25988

Modified Files:
	.cvsignore freeradius.spec sources 
Log Message:
- enable building of the rlm_wimax module
- pcap wire analysis support is enabled and available in utils subpackage
- Resolves bug #523053 radtest manpage in wrong package
- install COPYRIGHT CREDITS INSTALL LICENSE README into docdir
- resolves bug #507571 freeradius packages do not check for user/group existence
- update to latest upstream release: 2.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	22 May 2009 13:02:38 -0000	1.21
+++ .cvsignore	15 Sep 2009 15:24:12 -0000	1.22
@@ -1 +1 @@
-freeradius-server-2.1.6.tar.bz2
+freeradius-server-2.1.7.tar.bz2


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-11/freeradius.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- freeradius.spec	2 Jun 2009 20:59:11 -0000	1.82
+++ freeradius.spec	15 Sep 2009 15:24:12 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 2.1.6
-Release: 2%{?dist}
+Version: 2.1.7
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -28,25 +28,26 @@ BuildRequires: zlib-devel
 BuildRequires: net-snmp-devel
 BuildRequires: net-snmp-utils
 BuildRequires: readline-devel
+BuildRequires: libpcap-devel
 
-Requires(pre): shadow-utils
+Requires(pre): shadow-utils glibc-common
 Requires(post): /sbin/ldconfig /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 
 %description
-The FreeRADIUS Server Project is a high performance and highly configurable 
-GPL'd free RADIUS server. The server is similar in some respects to 
-Livingston's 2.0 server.  While FreeRADIUS started as a variant of the 
-Cistron RADIUS server, they don't share a lot in common any more. It now has 
+The FreeRADIUS Server Project is a high performance and highly configurable
+GPL'd free RADIUS server. The server is similar in some respects to
+Livingston's 2.0 server.  While FreeRADIUS started as a variant of the
+Cistron RADIUS server, they don't share a lot in common any more. It now has
 many more features than Cistron or Livingston, and is much more configurable.
 
-FreeRADIUS is an Internet authentication daemon, which implements the RADIUS 
-protocol, as defined in RFC 2865 (and others). It allows Network Access 
-Servers (NAS boxes) to perform authentication for dial-up users. There are 
-also RADIUS clients available for Web servers, firewalls, Unix logins, and 
-more.  Using RADIUS allows authentication and authorization for a network to 
-be centralized, and minimizes the amount of re-configuration which has to be 
+FreeRADIUS is an Internet authentication daemon, which implements the RADIUS
+protocol, as defined in RFC 2865 (and others). It allows Network Access
+Servers (NAS boxes) to perform authentication for dial-up users. There are
+also RADIUS clients available for Web servers, firewalls, Unix logins, and
+more.  Using RADIUS allows authentication and authorization for a network to
+be centralized, and minimizes the amount of re-configuration which has to be
 done when adding or deleting new users.
 
 %package libs
@@ -60,6 +61,7 @@ The FreeRADIUS shared library
 Group: System Environment/Daemons
 Summary: FreeRADIUS utilities
 Requires: %{name}-libs = %{version}-%{release}
+Requires: libpcap >= 0.9.4
 
 %description utils
 The FreeRADIUS server has a number of features found in other servers,
@@ -174,6 +176,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic"
         --with-unixodbc-lib-dir=%{_libdir} \
         --with-rlm-dbm-lib-dir=%{_libdir} \
         --with-rlm-krb5-include-dir=/usr/kerberos/include \
+        --with-modules="rlm_wimax" \
         --without-rlm_eap_ikev2 \
         --without-rlm_sql_iodbc \
         --without-rlm_sql_firebird \
@@ -221,6 +224,11 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialu
 # remove unsupported config files
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
 
+# install doc files omitted by standard install
+for f in COPYRIGHT CREDITS INSTALL LICENSE README; do
+    cp $f $RPM_BUILD_ROOT/%{docdir}
+done
+
 # add Red Hat specific documentation
 cat >> $RPM_BUILD_ROOT/%{docdir}/REDHAT << EOF
 
@@ -237,11 +245,66 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 
+
+# Make sure our user/group is present prior to any package or subpackage installation
 %pre
 getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
 getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
 exit 0
 
+%pre devel
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre krb5
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre ldap
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre libs
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre mysql
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre perl
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre postgresql
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre python
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre unixODBC
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+%pre utils
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
+
+
+
+
 %post
 /sbin/ldconfig
 if [ $1 = 1 ]; then
@@ -312,6 +375,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/chap
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/checkval
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/counter
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/cui
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail.example.com
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail.log
@@ -354,9 +418,36 @@ fi
 /usr/sbin/radwatch
 /usr/sbin/radmin
 # man-pages
-%doc %{_mandir}/man1/*
-%doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/*
+%doc %{_mandir}/man5/acct_users.5.gz
+%doc %{_mandir}/man5/clients.conf.5.gz
+%doc %{_mandir}/man5/dictionary.5.gz
+%doc %{_mandir}/man5/radiusd.conf.5.gz
+%doc %{_mandir}/man5/radrelay.conf.5.gz
+%doc %{_mandir}/man5/rlm_acct_unique.5.gz
+%doc %{_mandir}/man5/rlm_always.5.gz
+%doc %{_mandir}/man5/rlm_attr_filter.5.gz
+%doc %{_mandir}/man5/rlm_attr_rewrite.5.gz
+%doc %{_mandir}/man5/rlm_chap.5.gz
+%doc %{_mandir}/man5/rlm_counter.5.gz
+%doc %{_mandir}/man5/rlm_detail.5.gz
+%doc %{_mandir}/man5/rlm_digest.5.gz
+%doc %{_mandir}/man5/rlm_expr.5.gz
+%doc %{_mandir}/man5/rlm_files.5.gz
+%doc %{_mandir}/man5/rlm_mschap.5.gz
+%doc %{_mandir}/man5/rlm_pap.5.gz
+%doc %{_mandir}/man5/rlm_passwd.5.gz
+%doc %{_mandir}/man5/rlm_policy.5.gz
+%doc %{_mandir}/man5/rlm_realm.5.gz
+%doc %{_mandir}/man5/rlm_sql.5.gz
+%doc %{_mandir}/man5/rlm_sql_log.5.gz
+%doc %{_mandir}/man5/rlm_unix.5.gz
+%doc %{_mandir}/man5/unlang.5.gz
+%doc %{_mandir}/man5/users.5.gz
+%doc %{_mandir}/man8/raddebug.8.gz
+%doc %{_mandir}/man8/radiusd.8.gz
+%doc %{_mandir}/man8/radmin.8.gz
+%doc %{_mandir}/man8/radrelay.8.gz
+%doc %{_mandir}/man8/radwatch.8.gz
 # dictionaries
 %dir %attr(755,root,root) /usr/share/freeradius
 /usr/share/freeradius/*
@@ -457,10 +548,21 @@ fi
 %{_libdir}/freeradius/rlm_sqlippool-%{version}.so
 %{_libdir}/freeradius/rlm_unix.so
 %{_libdir}/freeradius/rlm_unix-%{version}.so
+%{_libdir}/freeradius/rlm_wimax.so
+%{_libdir}/freeradius/rlm_wimax-%{version}.so
 
 %files utils
 %defattr(-,root,root)
 /usr/bin/*
+# man-pages
+%doc %{_mandir}/man1/radclient.1.gz
+%doc %{_mandir}/man1/radeapclient.1.gz
+%doc %{_mandir}/man1/radlast.1.gz
+%doc %{_mandir}/man1/radtest.1.gz
+%doc %{_mandir}/man1/radwho.1.gz
+%doc %{_mandir}/man1/radzap.1.gz
+%doc %{_mandir}/man8/radsqlrelay.8.gz
+%doc %{_mandir}/man8/rlm_ippool_tool.8.gz
 
 %files libs
 # RADIU shared libs
@@ -494,6 +596,8 @@ fi
 %defattr(-,root,root)
 %dir %attr(750,root,radiusd) /etc/raddb/sql/mysql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/mysql/*
+%dir %attr(750,root,radiusd) /etc/raddb/sql/ndb
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/ndb/*
 %{_libdir}/freeradius/rlm_sql_mysql.so
 %{_libdir}/freeradius/rlm_sql_mysql-%{version}.so
 
@@ -517,6 +621,89 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Tue Sep 15 2009 John Dennis <jdennis at redhat.com> - 2.1.7-1
+- enable building of the rlm_wimax module
+- pcap wire analysis support is enabled and available in utils subpackage
+- Resolves bug #523053 radtest manpage in wrong package
+- install COPYRIGHT CREDITS INSTALL LICENSE README into docdir
+- resolves bug #507571 freeradius packages do not check for user/group existence
+- update to latest upstream release, from upstream Changelog:
+  Feature improvements
+    * Full support for CoA and Disconnect packets as per RFC 3576
+      and RFC 5176.  Both receiving and proxying CoA is supported.
+    * Added "src_ipaddr" configuration to "home_server".  See
+      proxy.conf for details.
+    * radsniff now accepts -I, to read from a filename instead of
+      a device.
+    * radsniff also prints matching requests and any responses to those
+      requests when '-r' is used.
+    * Added example of attr_filter for Access-Challenge packets
+    * Added support for udpfromto in DHCP code
+    * radmin can now selectively mark modules alive/dead.
+      See "set module state".
+    * Added customizable messages on login success/fail.
+      See msg_goodpass && msg_badpass in log{} section of radiusd.conf
+    * Document "chase_referrals" and "rebind" in raddb/modules/ldap
+    * Preliminary implementation of DHCP relay.
+    * Made thread pool section optional.  If it doesn't exist,
+      the server will run single-threaded.
+    * Added sample radrelay.conf for people upgrading from 1.x
+    * Made proxying more stable by failing over, rather than
+      rejecting the first request.  See "response_window" in proxy.conf
+    * Allow home_server_pools to exist without realms.
+    * Add dictionary.iea (closes bug #7)
+    * Added support for RFC 5580
+    * Added experimental sql_freetds module from Gabriel Blanchard.
+    * Updated dictionary.foundry
+    * Added sample configuration for MySQL cluster in raddb/sql/ndb
+      See the README file for explanations.
+  Bug fixes
+    * Fixed corner case where proxied packets could have extra
+      character in User-Password attribute.  Fix from Niko Tyni.
+    * Extended size of "attribute" field in SQL to 64.
+    * Fixes to ruby module to be more careful about when it builds.
+    * Updated Perl module "configure" script to check for broken
+      Perl installations.
+    * Fix "status_check = none".  It would still send packets
+      in some cases.
+    * Set recursive flag on the proxy mutex, which enables safer
+      cleanup on some platforms.
+    * Copy the EAP username verbatim, rather than escaping it.
+    * Update handling so that robust-proxy-accounting works when
+      all home servers are down for extended periods of time.
+    * Look for DHCP option 53 anywhere in the packet, not just
+      at the start.
+    * Fix processing of proxy fail handler with virtual servers.
+    * DHCP code now prints out correct src/dst IP addresses
+      when sending packets.
+    * Removed requirement for DHCP to have clients
+    * Fixed handling of DHCP packets with message-type buried in the packet
+    * Fixed corner case with negation in unlang.
+    * Minor fixes to default MySQL & PostgreSQL schemas
+    * Suppress MSCHAP complaints in debugging mode.
+    * Fix SQL module for multiple instance, and possible crash on HUP
+    * Fix permissions for radius.log for sites that change user/group,
+      but which don't create the file before starting radiusd.
+    * Fix double counting of packets when proxying
+    * Make %%l work
+    * Fix pthread keys in rlm_perl
+    * Log reasons for EAP failure (closes bug #8)
+    * Load home servers and pools that aren't referenced from a realm.
+    * Handle return codes from virtual attributes in "unlang"
+      (e.g. LDAP-Group).  This makes "!(expr)" work for them.
+    * Enable VMPS to see contents of virtual server again
+    * Fix WiMAX module to be consistent with examples.  (closes bug #10)
+    * Fixed crash with policies dependent on NAS-Port comparisons
+    * Allowed vendor IDs to be be higher than 32767.
+    * Fix crash on startup with certain regexes in "hints" file.
+    * Fix crash in attr_filter module when packets don't exist
+    * Allow detail file reader to be faster when "load_factor = 100"
+    * Add work-around for build failures with errors related to
+      lt__PROGRAM__LTX_preloaded_symbols.  libltdl / libtool are horrible.
+    * Made ldap module "rebind" option aware of older, incompatible
+      versions of OpenLDAP.
+    * Check value of Fall-Through in attr_filter module.
+
 * Tue Jun  2 2009 John Dennis <jdennis at redhat.com> - 2.1.6-2
 - make /etc/raddb/sites-available/* be config(noreplace)
 
@@ -605,7 +792,7 @@ fi
       * Chop ethernet frames in VMPS, rather than droppping packets.
       * Fix EAP-TLS bug.  Patch from Arnaud Ebalard
       * Don't lose string for regex-compares in the "users" file.
-      * Expose more functions in rlm_sql to rlm_sqlippool, which 
+      * Expose more functions in rlm_sql to rlm_sqlippool, which
         helps on systems where RTLD_GLOBAL is off.
       * Fix typos in MySQL schemas for ippools.
       * Remove macro that was causing build issues on some platforms.
@@ -854,7 +1041,7 @@ undefined reference to lt__PROGRAM__LTX_
 - Other minor cleanups
 
 * Wed Aug 25 2004 Thomas Woerner <twoerner at redhat.com> 1.0.0-2.1
-- renamed /etc/pam.d/radius to /etc/pam.d/radiusd to match default 
+- renamed /etc/pam.d/radius to /etc/pam.d/radiusd to match default
   configuration (#130613)
 
 * Wed Aug 25 2004 Thomas Woerner <twoerner at redhat.com> 1.0.0-2
@@ -940,5 +1127,5 @@ undefined reference to lt__PROGRAM__LTX_
 - create logging dir in post if it does not exist
 - fixed module load without la files
 
-* Thu Apr 17 2003 Thomas Woerner <twoerner at redhat.com> 
+* Thu Apr 17 2003 Thomas Woerner <twoerner at redhat.com>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	22 May 2009 13:02:38 -0000	1.22
+++ sources	15 Sep 2009 15:24:12 -0000	1.23
@@ -1 +1 @@
-645ac631505cde46e93c47e273bdec19  freeradius-server-2.1.6.tar.bz2
+b8df6cf0c3df1dded205ad5f954feb78  freeradius-server-2.1.7.tar.bz2



From agk at fedoraproject.org  Tue Sep 15 15:29:24 2009
From: agk at fedoraproject.org (agk)
Date: Tue, 15 Sep 2009 15:29:24 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.52.tgz.asc, NONE, 1.1 .cvsignore, 1.70,
	1.71 lvm2.spec, 1.170, 1.171 sources, 1.75, 1.76 upstream, 1.63,
	1.64 LVM2.2.02.51.tgz.asc, 1.1,
	NONE lvm2-2_02_52-fix-pvcreate-partition.patch, 1.1,
	NONE lvm2-2_02_52-fix-pvs-global-lock.patch, 1.1, NONE
Message-ID: <20090915152924.D5F5811C00CE@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27232

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.52.tgz.asc 
Removed Files:
	LVM2.2.02.51.tgz.asc lvm2-2_02_52-fix-pvcreate-partition.patch 
	lvm2-2_02_52-fix-pvs-global-lock.patch 
Log Message:
New upstream with fixes and new udev code (not yet switched on).



--- NEW FILE LVM2.2.02.52.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBKr5wNIoGRwVZ+LBcRAiGiAKD5qxF5j/XVemM+mLiKed3J48BOrwCfUzEh
RZTZYuW+YYd6o+HzY/3GqH0=
=cddF
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	6 Aug 2009 19:18:15 -0000	1.70
+++ .cvsignore	15 Sep 2009 15:29:24 -0000	1.71
@@ -1 +1 @@
-LVM2.2.02.51.tgz
+LVM2.2.02.52.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- lvm2.spec	24 Aug 2009 12:23:10 -0000	1.170
+++ lvm2.spec	15 Sep 2009 15:29:24 -0000	1.171
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.36
+%define device_mapper_version 1.02.37
 %define corosync_version 1.0.0-1
 %define clusterlib_version 3.0.0-20
 
@@ -7,8 +7,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.51
-Release: 3%{?dist}
+Version: 2.02.52
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -16,8 +16,6 @@ Source0: ftp://sources.redhat.com/pub/lv
 
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
-Patch1: lvm2-2_02_52-fix-pvcreate-partition.patch
-Patch2: lvm2-2_02_52-fix-pvs-global-lock.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -43,8 +41,6 @@ or more physical volumes and creating on
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
-%patch1 -p1 -b .partition
-%patch2 -p1 -b .globallock
 
 %build
 %define _exec_prefix /
@@ -310,6 +306,23 @@ This package contains the device-mapper 
 
 
 %changelog
+* Tue Sep 15 2009 Alasdair Kergon <agk at redhat.com> - 2.02.52-1
+- Prioritise write locks over read locks by default for file locking.
+- Add local lock files with suffix ':aux' to serialise locking requests.
+- Fix readonly locking to permit writeable global locks (for vgscan). (2.02.49)
+- Make readonly locking available as locking type 4.
+- Fix global locking in PV reporting commands (2.02.49).
+- Make lvchange --refresh only take a read lock on volume group.
+- Fix race where non-blocking file locks could be granted in error.
+- Fix pvcreate string termination in duplicate uuid warning message.
+- Don't loop reading sysfs with pvcreate on a non-blkext partition (2.02.51).
+- Fix vgcfgrestore error paths when locking fails (2.02.49).
+- Make clvmd check corosync to see what cluster interface it should use.
+- Fix vgextend error path - if ORPHAN lock fails, unlock / release vg (2.02.49).
+- Clarify use of PE ranges in lv{convert|create|extend|resize} man pages.
+- Restore umask when device node creation fails.
+- Check kernel vsn to use 'block_on_error' or 'handle_errors' in mirror table.
+
 * Mon Aug 24 2009 Milan Broz <mbroz at redhat.com> - 2.02.51-3
 - Fix global locking in PV reporting commands (2.02.49).
 - Fix pvcreate on a partition (2.02.51).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	6 Aug 2009 19:18:15 -0000	1.75
+++ sources	15 Sep 2009 15:29:24 -0000	1.76
@@ -1 +1 @@
-725d07794007e021bfc592b1636100c7  LVM2.2.02.51.tgz
+e92f83deb74b5b82439b63faf63128f3  LVM2.2.02.52.tgz


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- upstream	6 Aug 2009 19:18:15 -0000	1.63
+++ upstream	15 Sep 2009 15:29:24 -0000	1.64
@@ -1 +1 @@
-LVM2.2.02.51.tgz
+LVM2.2.02.52.tgz


--- LVM2.2.02.51.tgz.asc DELETED ---


--- lvm2-2_02_52-fix-pvcreate-partition.patch DELETED ---


--- lvm2-2_02_52-fix-pvs-global-lock.patch DELETED ---



From atkac at fedoraproject.org  Tue Sep 15 15:34:01 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Sep 2009 15:34:01 +0000 (UTC)
Subject: rpms/bind/devel named.NetworkManager, NONE, 1.1 bind.spec, 1.325,
	1.326 named.init, 1.73, 1.74 named.sysconfig, 1.11, 1.12
Message-ID: <20090915153401.1A2F411C00CE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28530

Modified Files:
	bind.spec named.init named.sysconfig 
Added Files:
	named.NetworkManager 
Log Message:
- improve chroot related documentation (#507795)
- add NetworkManager dispatcher script to reload named when network interface is
  activated/deactivated (#490275)
- don't set/unset named_write_master_zones SELinux boolean every time in
  initscript, modify it only when it's actually needed



--- NEW FILE named.NetworkManager ---
#!/bin/bash

# Check if named is running
/sbin/service named status > /dev/null 2>&1 || exit 0

[ "$2" = 'up' -o "$2" = 'down' ] && /sbin/service named reload


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- bind.spec	15 Sep 2009 12:56:46 -0000	1.325
+++ bind.spec	15 Sep 2009 15:34:00 -0000	1.326
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.1.%{PREVER}%{?dist}
+Release:  0.2.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@ Source:   ftp://ftp.isc.org/isc/bind9/%{
 Source1:  named.sysconfig
 Source2:  named.init
 Source3:  named.logrotate
+Source4:  named.NetworkManager
 Source5:  rfc1912.txt
 Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
 Source8:  dnszone.schema
@@ -288,7 +289,7 @@ cp  --preserve=timestamps %{SOURCE5} doc
 gzip -9 doc/rfc/*
 
 # Build directory hierarchy
-mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
+mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d,NetworkManager/dispatcher.d}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -318,6 +319,7 @@ rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
 install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
+install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
 %if %{SDB}
@@ -493,6 +495,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
+%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
 %{_sbindir}/arpaname
 %{_sbindir}/ddns-confgen
 %{_sbindir}/genrandom
@@ -592,6 +595,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.2.a2
+- improve chroot related documentation (#507795)
+- add NetworkManager dispatcher script to reload named when network interface is
+  activated/deactivated (#490275)
+- don't set/unset named_write_master_zones SELinux boolean every time in
+  initscript, modify it only when it's actually needed
+
 * Tue Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.1.a2
 - update to 9.7.0a2
 - merged patches


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- named.init	13 Jul 2009 13:02:42 -0000	1.73
+++ named.init	15 Sep 2009 15:34:00 -0000	1.74
@@ -50,12 +50,16 @@ fi
 # Enable/disable debugging
 if [ "x$DEBUG" = 'xyes' ]; then
   chown named.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 1
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'off' ]; then
+      setsebool named_write_master_zones 1
+  fi;
 else
   chown root.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 0
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'on' ]; then
+      setsebool named_write_master_zones 0
+  fi;
 fi
 
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf


Index: named.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.sysconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- named.sysconfig	13 Jul 2009 13:02:42 -0000	1.11
+++ named.sysconfig	15 Sep 2009 15:34:00 -0000	1.12
@@ -22,7 +22,10 @@
 #          - /etc/rndc.key
 #          - /etc/named.rfc1912.zones
 #          - /etc/named.dnssec.keys
-#                          
+#
+#	Don't forget to add "$AddUnixListenSocket /var/named/chroot/dev/log"
+#	line to your /etc/rsyslog.conf file. Otherwise your logging becomes
+#	broken when rsyslogd daemon is restarted (due update, for example).
 #
 # OPTIONS="whatever"     --  These additional options will be passed to named
 #                            at startup. Don't add -t here, use ROOTDIR instead.



From atkac at fedoraproject.org  Tue Sep 15 15:34:16 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Sep 2009 15:34:16 +0000 (UTC)
Subject: rpms/bind/F-12 named.NetworkManager, NONE, 1.1 bind.spec, 1.324,
	1.325 named.init, 1.73, 1.74 named.sysconfig, 1.11, 1.12
Message-ID: <20090915153416.BF8CB11C00CE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28613

Modified Files:
	bind.spec named.init named.sysconfig 
Added Files:
	named.NetworkManager 
Log Message:
- improve chroot related documentation (#507795)
- add NetworkManager dispatcher script to reload named when network interface is
  activated/deactivated (#490275)
- don't set/unset named_write_master_zones SELinux boolean every time in
  initscript, modify it only when it's actually needed



--- NEW FILE named.NetworkManager ---
#!/bin/bash

# Check if named is running
/sbin/service named status > /dev/null 2>&1 || exit 0

[ "$2" = 'up' -o "$2" = 'down' ] && /sbin/service named reload


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-12/bind.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- bind.spec	1 Sep 2009 10:22:39 -0000	1.324
+++ bind.spec	15 Sep 2009 15:34:16 -0000	1.325
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  9.%{PATCHVER}%{?dist}
+Release:  10.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@ Source:   ftp://ftp.isc.org/isc/bind9/%{
 Source1:  named.sysconfig
 Source2:  named.init
 Source3:  named.logrotate
+Source4:  named.NetworkManager
 Source5:  rfc1912.txt
 Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
 Source8:  dnszone.schema
@@ -292,7 +293,7 @@ cp  --preserve=timestamps %{SOURCE5} doc
 gzip -9 doc/rfc/*
 
 # Build directory hierarchy
-mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
+mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d,NetworkManager/dispatcher.d}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -318,6 +319,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
+install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
 %if %{SDB}
@@ -493,6 +495,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
+%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
 %{_sbindir}/dnssec*
 %{_sbindir}/named-check*
 %{_sbindir}/lwresd
@@ -582,6 +585,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-10.P1
+- improve chroot related documentation (#507795)
+- add NetworkManager dispatcher script to reload named when network interface is
+  activated/deactivated (#490275)
+- don't set/unset named_write_master_zones SELinux boolean every time in 
+  initscript, modify it only when it's actually needed
+
 * Tue Sep 01 2009 Adam Tkac <atkac redhat com> 32:9.6.1-9.P1
 - next attempt to fix the postun trigger (#520385)
 - remove obsolete bind-9.3.1rc1-fix_libbind_includedir.patch


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-12/named.init,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- named.init	13 Jul 2009 13:02:42 -0000	1.73
+++ named.init	15 Sep 2009 15:34:16 -0000	1.74
@@ -50,12 +50,16 @@ fi
 # Enable/disable debugging
 if [ "x$DEBUG" = 'xyes' ]; then
   chown named.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 1
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'off' ]; then
+      setsebool named_write_master_zones 1
+  fi;
 else
   chown root.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 0
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'on' ]; then
+      setsebool named_write_master_zones 0
+  fi;
 fi
 
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf


Index: named.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-12/named.sysconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- named.sysconfig	13 Jul 2009 13:02:42 -0000	1.11
+++ named.sysconfig	15 Sep 2009 15:34:16 -0000	1.12
@@ -22,7 +22,10 @@
 #          - /etc/rndc.key
 #          - /etc/named.rfc1912.zones
 #          - /etc/named.dnssec.keys
-#                          
+#
+#	Don't forget to add "$AddUnixListenSocket /var/named/chroot/dev/log"
+#	line to your /etc/rsyslog.conf file. Otherwise your logging becomes
+#	broken when rsyslogd daemon is restarted (due update, for example).
 #
 # OPTIONS="whatever"     --  These additional options will be passed to named
 #                            at startup. Don't add -t here, use ROOTDIR instead.



From atkac at fedoraproject.org  Tue Sep 15 15:35:28 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Sep 2009 15:35:28 +0000 (UTC)
Subject: rpms/bind/F-11 named.NetworkManager, NONE, 1.1 bind.spec, 1.320,
	1.321 named.init, 1.73, 1.74 named.sysconfig, 1.11, 1.12
Message-ID: <20090915153528.EDE7911C00CE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29028

Modified Files:
	bind.spec named.init named.sysconfig 
Added Files:
	named.NetworkManager 
Log Message:
- fix libs postun section again (#514728)
- improve chroot related documentation (#507795)
- add NetworkManager dispatcher script to reload named when network interface is
  activated/deactivated (#490275)
- don't set/unset named_write_master_zones SELinux boolean every time in
  initscript, modify it only when it's actually needed



--- NEW FILE named.NetworkManager ---
#!/bin/bash

# Check if named is running
/sbin/service named status > /dev/null 2>&1 || exit 0

[ "$2" = 'up' -o "$2" = 'down' ] && /sbin/service named reload


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- bind.spec	3 Sep 2009 13:03:21 -0000	1.320
+++ bind.spec	15 Sep 2009 15:35:28 -0000	1.321
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  4.%{PATCHVER}%{?dist}.1
+Release:  5.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@ Source:   ftp://ftp.isc.org/isc/bind9/%{
 Source1:  named.sysconfig
 Source2:  named.init
 Source3:  named.logrotate
+Source4:  named.NetworkManager
 Source5:  rfc1912.txt
 Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
 Source8:  dnszone.schema
@@ -295,7 +296,7 @@ cp  --preserve=timestamps %{SOURCE5} doc
 gzip -9 doc/rfc/*
 
 # Build directory hierarchy
-mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
+mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d,NetworkManager/dispatcher.d}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -321,6 +322,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
+install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
 %if %{SDB}
@@ -424,11 +426,13 @@ fi
 
 %post libs -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 # bind-libs between 32:9.6.1-0.1.b1 and 32:9.6.1-0.4.rc1 have bigger SOnames
 # than current bind - https://bugzilla.redhat.com/show_bug.cgi?id=509635.
-# Remove this trigger when SOnames get bigger.
+# Remove this trigger when SOnames get bigger and also correct the %%postun
+# section above (use %%postun libs -p /sbin/ldconfig)
 %triggerpostun -n bind-libs -p /bin/bash -- bind-libs > 32:9.6.1-0.1.b1
 /sbin/ldconfig
 
@@ -494,6 +498,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
+%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
 %{_sbindir}/dnssec*
 %{_sbindir}/named-check*
 %{_sbindir}/lwresd
@@ -583,6 +588,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-5.P1
+- fix libs postun section again (#514728)
+- improve chroot related documentation (#507795)
+- add NetworkManager dispatcher script to reload named when network interface is
+  activated/deactivated (#490275)
+- don't set/unset named_write_master_zones SELinux boolean every time in 
+  initscript, modify it only when it's actually needed
+
 * Thu Sep 03 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-4.P1.1
 - update the patch for dynamic loading of database backends
 


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/named.init,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- named.init	13 Jul 2009 12:57:28 -0000	1.73
+++ named.init	15 Sep 2009 15:35:28 -0000	1.74
@@ -50,12 +50,16 @@ fi
 # Enable/disable debugging
 if [ "x$DEBUG" = 'xyes' ]; then
   chown named.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 1
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'off' ]; then
+      setsebool named_write_master_zones 1
+  fi;
 else
   chown root.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 0
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'on' ]; then
+      setsebool named_write_master_zones 0
+  fi;
 fi
 
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf


Index: named.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/named.sysconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- named.sysconfig	13 Jul 2009 12:57:28 -0000	1.11
+++ named.sysconfig	15 Sep 2009 15:35:28 -0000	1.12
@@ -22,7 +22,10 @@
 #          - /etc/rndc.key
 #          - /etc/named.rfc1912.zones
 #          - /etc/named.dnssec.keys
-#                          
+#
+#	Don't forget to add "$AddUnixListenSocket /var/named/chroot/dev/log"
+#	line to your /etc/rsyslog.conf file. Otherwise your logging becomes
+#	broken when rsyslogd daemon is restarted (due update, for example).
 #
 # OPTIONS="whatever"     --  These additional options will be passed to named
 #                            at startup. Don't add -t here, use ROOTDIR instead.



From notting at fedoraproject.org  Tue Sep 15 15:37:54 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 15 Sep 2009 15:37:54 +0000 (UTC)
Subject: rpms/sysvinit/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090915153754.B73F211C00CE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/sysvinit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30395

Modified Files:
	.cvsignore sources 
Log Message:
Finish update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Dec 2005 04:07:54 -0000	1.6
+++ .cvsignore	15 Sep 2009 15:37:54 -0000	1.7
@@ -1 +1 @@
-sysvinit-2.86.tar.gz
+sysvinit-2.87dsf.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Dec 2005 04:07:54 -0000	1.6
+++ sources	15 Sep 2009 15:37:54 -0000	1.7
@@ -1 +1 @@
-7d5d61c026122ab791ac04c8a84db967  sysvinit-2.86.tar.gz
+0c1066b3c46e70e964d0bfe50bbd4f8c  sysvinit-2.87dsf.tar.gz



From ajax at fedoraproject.org  Tue Sep 15 15:51:43 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 15 Sep 2009 15:51:43 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel
	xserver-1.6.99-hush-prerelease-warning.patch, NONE, 1.1
Message-ID: <20090915155143.E7E7611C00CE@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1381

Added Files:
	xserver-1.6.99-hush-prerelease-warning.patch 
Log Message:
* Tue Sep 15 2009 Adam Jackson <ajax at redhat.com> 1.6.99.901-2
- xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you.
- Point to bodhi for the "check for latest version" message.


xserver-1.6.99-hush-prerelease-warning.patch:
 xf86Init.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE xserver-1.6.99-hush-prerelease-warning.patch ---
>From e9a81cb99315cf4c5325b276b802c659b9f04045 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 15 Sep 2009 10:33:40 -0400
Subject: [PATCH] Hush prerelease warning.

---
 hw/xfree86/common/xf86Init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 056e46d..3cdbdf4 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -132,7 +132,7 @@ static Bool formatsDone = FALSE;
 static void
 xf86PrintBanner(void)
 {
-#if PRE_RELEASE
+#if 0
   ErrorF("\n"
     "This is a pre-release version of the X server from " XVENDORNAME ".\n"
     "It is not supported in any way.\n"
-- 
1.6.4.2




From agk at fedoraproject.org  Tue Sep 15 16:00:30 2009
From: agk at fedoraproject.org (agk)
Date: Tue, 15 Sep 2009 16:00:30 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.52.tgz.asc,1.1,1.2 sources,1.76,1.77
Message-ID: <20090915160030.A0B0011C00EC@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3447

Modified Files:
	LVM2.2.02.52.tgz.asc sources 
Log Message:
fix tarball - remove test/api from build



Index: LVM2.2.02.52.tgz.asc
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/LVM2.2.02.52.tgz.asc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- LVM2.2.02.52.tgz.asc	15 Sep 2009 15:29:24 -0000	1.1
+++ LVM2.2.02.52.tgz.asc	15 Sep 2009 16:00:30 -0000	1.2
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (GNU/Linux)
 
-iD8DBQBKr5wNIoGRwVZ+LBcRAiGiAKD5qxF5j/XVemM+mLiKed3J48BOrwCfUzEh
-RZTZYuW+YYd6o+HzY/3GqH0=
-=cddF
+iD4DBQBKr7UYIoGRwVZ+LBcRAh22AJin0LR/fCG9hyO5BmP/oSF5PRL5AJ9K+zHr
+lydgLlodTRRJnJxWXECc5Q==
+=TPcL
 -----END PGP SIGNATURE-----


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	15 Sep 2009 15:29:24 -0000	1.76
+++ sources	15 Sep 2009 16:00:30 -0000	1.77
@@ -1 +1 @@
-e92f83deb74b5b82439b63faf63128f3  LVM2.2.02.52.tgz
+f3b3aed6f6aacd8f351d9a5da097293f  LVM2.2.02.52.tgz



From bpepple at fedoraproject.org  Tue Sep 15 16:10:44 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 15 Sep 2009 16:10:44 +0000 (UTC)
Subject: rpms/telepathy-sofiasip/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 telepathy-sofiasip.spec, 1.8, 1.9
Message-ID: <20090915161044.5086311C00CE@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-sofiasip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6906

Modified Files:
	.cvsignore sources telepathy-sofiasip.spec 
Log Message:
* Tue Sep 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.18-1
- Update to 0.5.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Aug 2009 01:41:33 -0000	1.7
+++ .cvsignore	15 Sep 2009 16:10:44 -0000	1.8
@@ -1 +1 @@
-telepathy-sofiasip-0.5.17.tar.gz
+telepathy-sofiasip-0.5.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Aug 2009 01:41:33 -0000	1.7
+++ sources	15 Sep 2009 16:10:44 -0000	1.8
@@ -1 +1 @@
-ac2d6338781cf7a458b8b4150f9b81d8  telepathy-sofiasip-0.5.17.tar.gz
+84fad8075833d2e666f0e3b2a64d6e27  telepathy-sofiasip-0.5.18.tar.gz


Index: telepathy-sofiasip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/telepathy-sofiasip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- telepathy-sofiasip.spec	3 Aug 2009 01:41:33 -0000	1.8
+++ telepathy-sofiasip.spec	15 Sep 2009 16:10:44 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           telepathy-sofiasip
-Version:        0.5.17
+Version:        0.5.18
 Release:        1%{?dist}
 Summary:        SIP connection manager for Telepathy
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.18-1
+- Update to 0.5.18.
+
 * Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.17-1
 - Update to 0.5.17.
 



From caolanm at fedoraproject.org  Tue Sep 15 16:13:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Sep 2009 16:13:04 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes63.patch, NONE,
	1.1 openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.4,
	1.5 openoffice.org.spec, 1.2008,
	1.2009 openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch, 1.1,
	NONE openoffice.org-simple-crash_report.sh, 1.14, NONE
Message-ID: <20090915161304.F36EF11C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7541

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes63.patch 
Removed Files:
	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 
	openoffice.org-simple-crash_report.sh 
Log Message:
drop custom crash reporter

workspace.cmcfixes63.patch:
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx  |    1 +
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE workspace.cmcfixes63.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.13.64.2
diff -u -r1.13.64.2 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	15 Dec 2008 10:29:47 -0000	1.13.64.2
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	23 Dec 2008 09:24:57 -0000
@@ -102,7 +102,7 @@
 extern "C" {
 #include <npsdk/npupp.h>
 }
-#include <npapi.h>
+#include <npsdk/npapi.h>
 
 #if NP_VERSION_MINOR < 17
 // compatibility hack: compile with older NPN api header, but define
diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
@@ -33,6 +33,7 @@
 #include "precompiled_bridges.hxx"
 
 #include <stdio.h>
+#include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
 #include <hash_map>

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:
 sc/source/filter/ftools/ftools.cxx    |    1 +
 soltools/mkdepend/def.h               |    2 +-
 soltools/mkdepend/main.c              |    2 +-
 soltools/mkdepend/parse.c             |    4 ++--
 sw/source/core/doc/docbm.cxx          |    4 ++--
 sw/source/filter/ww8/WW8TableInfo.cxx |    1 +
 6 files changed, 8 insertions(+), 6 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	5 Aug 2009 22:07:27 -0000	1.4
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	15 Sep 2009 16:13:04 -0000	1.5
@@ -86,14 +86,3 @@ Index: mkdepend/parse.c
  		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
  		case IF:
  		case IFFALSE:
-diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
---- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
-+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "precompiled_bridges.hxx"
- 
- #include <stdio.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -p -r1.2008 -r1.2009
--- openoffice.org.spec	15 Sep 2009 08:24:14 -0000	1.2008
+++ openoffice.org.spec	15 Sep 2009 16:13:04 -0000	1.2009
@@ -70,7 +70,6 @@ BuildRequires:  jakarta-commons-codec, j
 BuildRequires:  jakarta-commons-lang, poppler-devel, fontpackages-devel
 BuildRequires:  pentaho-reporting-flow-engine, libXinerama-devel
 
-Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
 Patch2:  workspace.defaultdoclang.patch
 %if %{gtkprintui}
@@ -108,7 +107,7 @@ Patch30: workspace.calc50.patch
 Patch31: workspace.mav46.patch
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
-Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch34: workspace.cmcfixes63.patch
 Patch35: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch36: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch37: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
@@ -1654,7 +1653,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch31 -p1 -b .workspace.mav46.patch
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
-%patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch34 -p1 -b .workspace.cmcfixes63.patch
 %patch35 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch36 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch37 -p0 -b .ooo98137.filter.redeclared-variables.patch
@@ -2248,13 +2247,6 @@ done
 if [ $pic == 1 ]; then false; fi
 if [ $executable == 1 ]; then false; fi
 
-#add in a simple crash reporter replacement
-cp -f %{PATCH0} $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report
-chmod a+x $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report
-%if %{langpacks}
-cp $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report $RPM_BUILD_ROOT/%{brinstdir}/program/crash_report
-%endif
-
 #make up some /usr/bin scripts
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 
@@ -3134,7 +3126,6 @@ fi
 %doc %{oooinstdir}/THIRDPARTYLICENSEREADME.html
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/about.bmp
-%{oooinstdir}/program/crash_report
 %{oooinstdir}/program/intro.bmp
 %dir %{oooinstdir}/program/resource
 %{oooinstdir}/program/resource/ooo%{UPD}en-US.res
@@ -3198,7 +3189,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/about.bmp
 %{brinstdir}/program/bootstraprc
 %{brinstdir}/program/setuprc
-%{brinstdir}/program/crash_report
 %{brinstdir}/program/intro.bmp
 %dir %{brinstdir}/program/resource
 %{brinstdir}/program/resource/ooo%{UPD}pt-BR.res
@@ -4249,10 +4239,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Sep 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8-UNBUILT
+* Tue Sep 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - disable NumberFormatRecognition from default writer configuration (caolanm)
 - Resolves: rhbz#522056 - wrong match of fonts (non-)proportional (dtardon)
-- add openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch to go through abrt (caolanm)
+- drop custom crash reporter and add
+  openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch and use abrt (caolanm)
 
 * Mon Sep 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
 - make oo.o buildable without langpacks again (dtardon)


--- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch DELETED ---


--- openoffice.org-simple-crash_report.sh DELETED ---



From akurtakov at fedoraproject.org  Tue Sep 15 16:19:48 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 15 Sep 2009 16:19:48 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.664,1.665
Message-ID: <20090915161948.C8CCC11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9208/devel

Modified Files:
	eclipse.spec 
Log Message:
Build with system jetty.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -p -r1.664 -r1.665
--- eclipse.spec	14 Sep 2009 16:12:51 -0000	1.664
+++ eclipse.spec	15 Sep 2009 16:19:48 -0000	1.665
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.11%{?dist}
+Release:        0.12%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -170,7 +170,7 @@ BuildRequires: jakarta-commons-logging >
 BuildRequires: jakarta-commons-codec
 BuildRequires: jakarta-commons-httpclient
 BuildRequires: mx4j >= 2.1
-BuildRequires: jetty >= 5.1.14-1.6
+BuildRequires: jetty >= 6.1.20
 BuildRequires: lucene >= 2.3.1-3.4
 BuildRequires: lucene-contrib >= 2.3.1-3.4
 BuildRequires: regexp
@@ -229,7 +229,7 @@ Requires: jakarta-commons-logging >= 1.0
 Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
-Requires: jetty >= 5.1.14-1.6
+Requires: jetty >= 6.1.20
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
@@ -512,10 +512,13 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 #ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
 # END ANT ##
 
-#JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
-# TODO fix jetty
-#rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
-#ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
+JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
+rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+
+JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
+rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@@ -1086,9 +1089,13 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 #ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
 ## END ANT ##
 
-#JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
-#rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
-#ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
+JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
+rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+
+JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
+rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1420,6 +1427,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-0.12
+- Build with system jetty.
+
 * Mon Sep 14 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.11
 - Add /usr/share/eclipse/dropins to list of dropins locations
   (rhbz#522117).



From pbrobinson at fedoraproject.org  Tue Sep 15 16:20:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 15 Sep 2009 16:20:27 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.9, 1.10 mojito.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <20090915162027.43D2911C0335@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9460

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Sep 2009 20:21:18 -0000	1.9
+++ .cvsignore	15 Sep 2009 16:20:26 -0000	1.10
@@ -1 +1 @@
-mojito-0.20.1.tar.bz2
+mojito-0.21.1.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mojito.spec	3 Sep 2009 20:21:18 -0000	1.18
+++ mojito.spec	15 Sep 2009 16:20:27 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.20.1
+Version:        0.21.1
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Tue Sep 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.1-1
+- Update to 0.21.1
+
 * Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.20.1-1
 - Update to 0.20.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Sep 2009 20:21:18 -0000	1.9
+++ sources	15 Sep 2009 16:20:27 -0000	1.10
@@ -1 +1 @@
-35ddb7e1f8ef396e24b9c5fef99ced5f  mojito-0.20.1.tar.bz2
+7e4b359014ade0576431cab32c9cbff1  mojito-0.21.1.tar.bz2



From jamatos at fedoraproject.org  Tue Sep 15 16:48:36 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Tue, 15 Sep 2009 16:48:36 +0000 (UTC)
Subject: rpms/pygsl/devel pygsl.spec,1.23,1.24
Message-ID: <20090915164836.AE43411C00CE@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17232

Modified Files:
	pygsl.spec 
Log Message:
* Tue Sep 15 2009 Jos? Matos <jamatos at fc.up.pt> - 0.9.4-3
- Rebuild for new upstream gsl version (F12+).



Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pygsl.spec	30 Jul 2009 21:08:04 -0000	1.23
+++ pygsl.spec	15 Sep 2009 16:48:36 -0000	1.24
@@ -7,7 +7,7 @@
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.4
-Release:       2%{?dist}
+Release:       3%{?dist}
 # The package is mostly GPL+ but there are two scripts
 # GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
 License:       GPLv2+
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Jos? Matos <jamatos at fc.up.pt> - 0.9.4-3
+- Rebuild for new upstream gsl version (F12+).
+
 * Thu Jul 30 2009 Jos? Matos <jamatos[AT]fc.up.pt> - 0.9.4-2
 - Add missing BR numpy-f2py
 



From mikeb at fedoraproject.org  Tue Sep 15 16:55:51 2009
From: mikeb at fedoraproject.org (Mike Bonnet)
Date: Tue, 15 Sep 2009 16:55:51 +0000 (UTC)
Subject: rpms/python-cheetah/devel .cvsignore, 1.9, 1.10 python-cheetah.spec,
	1.22, 1.23 sources, 1.9, 1.10
Message-ID: <20090915165551.1BE3A11C00CE@cvs1.fedora.phx.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19370

Modified Files:
	.cvsignore python-cheetah.spec sources 
Log Message:
update to the 2.2.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Jun 2009 14:37:30 -0000	1.9
+++ .cvsignore	15 Sep 2009 16:55:50 -0000	1.10
@@ -1 +1 @@
-Cheetah-2.2.1.tar.gz
+Cheetah-2.2.2.tar.gz


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/python-cheetah.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-cheetah.spec	26 Jul 2009 20:12:27 -0000	1.22
+++ python-cheetah.spec	15 Sep 2009 16:55:50 -0000	1.23
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %global python_sitearch %([ -x %{__python} ] && %{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" || :)}
 
 Name:           python-cheetah
-Version:        2.2.1
-Release:        2%{?dist}
-Summary:        Template engine and code-generator
+Version:        2.2.2
+Release:        1%{?dist}
+Summary:        Template engine and code generator
 
 Group:          Development/Libraries
 License:        MIT
@@ -16,6 +16,8 @@ BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: python-setuptools
 
+Requires: python-markdown >= 2.0.1
+
 %description
 Cheetah is an open source template engine and code generation tool,
 written in Python. It can be used standalone or combined with other
@@ -27,12 +29,10 @@ code, Java, sql, form emails and even Py
 %setup -q -n Cheetah-%{version}
 
 %build
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
@@ -71,17 +71,15 @@ rm -rf %{buildroot}
 %dir %{python_sitearch}/Cheetah/Utils
 %{python_sitearch}/Cheetah/Utils/*.py*
 
-%dir %{python_sitearch}/Cheetah/contrib
-%{python_sitearch}/Cheetah/contrib/*.py*
-
-%dir %{python_sitearch}/Cheetah/contrib/markdown
-%{python_sitearch}/Cheetah/contrib/markdown/*.py*
-
 %dir %{python_sitearch}/Cheetah-%{version}-*.egg-info
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/PKG-INFO
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Mon Sep 14 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-1
+- update to the 2.2.2 release
+- add dependency on python-markdown for consistency with the egg-info
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Jun 2009 14:37:30 -0000	1.9
+++ sources	15 Sep 2009 16:55:50 -0000	1.10
@@ -1 +1 @@
-137491aef378b502b2ee71c03b929faf  Cheetah-2.2.1.tar.gz
+e0d89113ab6bb0935d2b67395960264c  Cheetah-2.2.2.tar.gz



From veillard at fedoraproject.org  Tue Sep 15 17:02:03 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 15 Sep 2009 17:02:03 +0000 (UTC)
Subject: rpms/libxml2/devel libxml2-2.7.4-input-parser.patch, NONE,
	1.1 libxml2.spec, 1.75, 1.76
Message-ID: <20090915170203.D0E0B11C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21310

Modified Files:
	libxml2.spec 
Added Files:
	libxml2-2.7.4-input-parser.patch 
Log Message:
Fix for #523002 affecting inkscape at least, Daniel


libxml2-2.7.4-input-parser.patch:
 parser.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE libxml2-2.7.4-input-parser.patch ---
commit 9d3d141c412baa5c713ad3df48f1a4d179e07b05
Author: Daniel Veillard <veillard at redhat.com>
Date:   Tue Sep 15 18:41:30 2009 +0200

    Fix a parsing problem with little data at startup
    
    * parser.c: inkscape extension loader (and possibly others) feed
      data to the parser very slowly, 0 at start, 4 bytes on first GROW
      and this broke after the fix for
      https://bugzilla.gnome.org/show_bug.cgi?id=566012
      http://git.gnome.org/cgit/libxml2/commit/?id=7e385bd4e28a0cc12b6b26ed178c620e3c3ab8d8
      leading to another bug
      https://bugzilla.redhat.com/show_bug.cgi?id=523002
      this detects the situation and GROW when needed for proper processing.

diff --git a/parser.c b/parser.c
index e415339..b41dcc3 100644
--- a/parser.c
+++ b/parser.c
@@ -10130,8 +10130,12 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
     /*
      * Check for the XMLDecl in the Prolog.
      * do not GROW here to avoid the detected encoder to decode more
-     * than just the first line
+     * than just the first line, unless the amount of data is really
+     * too small to hold "<?xml version="1.0" encoding="foo"
      */
+    if ((ctxt->input->end - ctxt->input->cur) < 35) {
+       GROW;
+    }
     if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
 
 	/*


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- libxml2.spec	10 Sep 2009 16:54:25 -0000	1.75
+++ libxml2.spec	15 Sep 2009 17:02:03 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.7.4
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -67,6 +68,7 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -141,6 +143,9 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-2
+- fix a problem with little data at startup affecting inkscape #523002
+
 * Thu Sep 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-1
 - upstream release 2.7.4
 - symbol versioning of libxml2 shared libs



From scop at fedoraproject.org  Tue Sep 15 17:04:23 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 15 Sep 2009 17:04:23 +0000 (UTC)
Subject: rpms/seeker/F-11 seeker.LICENSE, NONE, 1.1 seeker.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915170423.1926E11C00CE@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/seeker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22250

Modified Files:
	.cvsignore sources 
Added Files:
	seeker.LICENSE seeker.spec 
Log Message:
Initial build.


--- NEW FILE seeker.LICENSE ---
http://www.linuxinsight.com/how_fast_is_your_disk.html?page=1#comment-971

ChangeLog, AUTHORS, TODO...
Submitted by admin on Wed, 2007-01-17 20:39.

Well, I don't have plans to make this a full blown package at this
time, because of the utter lack of free time, sorry. But in time, yes,
why not. The trigger event could be when I have time to make it
multithreaded. Then it should become much more useful.

In the meantime, put this on the top of seeker.c:

# Seeker v2.0, 2007-01-15, by linportal at gmail.com
# http://www.linuxinsight.com/how_fast_is_your_disk.html
# Distributed under the terms of the GNU General Public License v2

And then you can do whatever you like with it. If it's not against GPL
rules, of course. ;)


--- NEW FILE seeker.spec ---
Name:           seeker
Version:        3.0
Release:        2%{?dist}
Summary:        Random access disk benchmark utility

Group:          Applications/System
License:        GPLv2 and CC-BY-SA
URL:            http://www.linuxinsight.com/how_fast_is_your_disk.html
# http://www.linuxinsight.com/how_fast_is_your_disk.html#comment-1583
Source0:        http://smp.if.uj.edu.pl/~baryluk/seeker_baryluk.c
# http://www.linuxinsight.com/how_fast_is_your_disk.html?page=1#comment-971
Source1:        %{name}.LICENSE
# Grabbed with firefox, modified, ran through tidy(1) per CC BY-SA 2.5:
# http://www.linuxinsight.com/about.html
Source2:        %{name}-docs.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Seeker is a simple utility that reads small pieces of data from a raw
disk device in a random access pattern, and reports the average number
of seeks per second, and calculated random access time of the disk.
The seeker variant included in this package is the multithreaded one
by Witold Baryluk.


%prep
%setup -q -c -T -a 2
install -pm 644 %{SOURCE0} $(basename %{SOURCE0}) # for debuginfo
cp -p %{SOURCE1} LICENSE


%build
%{__cc} $RPM_OPT_FLAGS -pthread $(basename %{SOURCE0}) -o seeker


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 seeker $RPM_BUILD_ROOT%{_sbindir}/seeker


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE how_fast_is_your_disk*
%{_sbindir}/seeker


%changelog
* Sun Sep 13 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0-2
- Address review comments (#520701):
- Improve %%description.
- Include upstream article in docs.

* Fri Aug 28 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:36:50 -0000	1.1
+++ .cvsignore	15 Sep 2009 17:04:22 -0000	1.2
@@ -0,0 +1,2 @@
+seeker_baryluk.c
+seeker-docs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:36:50 -0000	1.1
+++ sources	15 Sep 2009 17:04:22 -0000	1.2
@@ -0,0 +1,2 @@
+593802c3a86923fff7659a256bc43b1b  seeker_baryluk.c
+b169f93946dd18a46f4f63f71a2229fc  seeker-docs.tar.gz



From nhorman at fedoraproject.org  Tue Sep 15 17:05:01 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 15 Sep 2009 17:05:01 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.152, 1.153 sources, 1.23,
	1.24
Message-ID: <20090915170501.38B3211C00CE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22494

Modified Files:
	kexec-tools.spec sources 
Log Message:
Resolves: bz 522486


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kexec-tools.spec	11 Sep 2009 17:09:51 -0000	1.152
+++ kexec-tools.spec	15 Sep 2009 17:05:00 -0000	1.153
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -150,6 +150,9 @@ make -C kexec-tools-po install DESTDIR=$
 # untar the dracut package
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf
 tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100}
+chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/check
+chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/install
+
 
 #and move the custom dracut modules to the dracut directory
 mkdir -p $RPM_BUILD_ROOT/usr/share/dracut/modules.d/
@@ -261,6 +264,9 @@ done
 
 
 %changelog
+* Tue Sep 15 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-27
+- Fixing permissions on dracut module files
+
 * Fri Sep 11 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-26
 - Rebuild for translation team (bz 522415)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	10 Sep 2009 14:36:34 -0000	1.23
+++ sources	15 Sep 2009 17:05:01 -0000	1.24
@@ -1,4 +1,4 @@
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 190f8878aa7e7b63a96fde5d59538eec  makedumpfile-1.3.3.tar.gz
-1c240b7c727d44c5a3e1ef2d59a4f80d  dracut-files.tbz2
+9a5f7a5781bd9c357badb0ade0896842  dracut-files.tbz2



From nhorman at fedoraproject.org  Tue Sep 15 17:05:01 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 15 Sep 2009 17:05:01 +0000 (UTC)
Subject: rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase check, 1.3, 
	1.4 install, 1.3, 1.4
Message-ID: <20090915170501.8A46111C00CE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22494/kdump_dracut_modules/99kdumpbase

Modified Files:
	check install 
Log Message:
Resolves: bz 522486


Index: check
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase/check,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- check	10 Sep 2009 14:36:34 -0000	1.3
+++ check	15 Sep 2009 17:05:01 -0000	1.4
@@ -1,4 +1,9 @@
 #!/bin/sh
+if [ ! -f /etc/kdump-adv-conf/init ]
+then
+	# exit if we didn't set up an init script
+	exit 1
+fi
 
 #do not add this module by default
 exit 1


Index: install
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase/install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- install	14 Aug 2009 13:30:28 -0000	1.3
+++ install	15 Sep 2009 17:05:01 -0000	1.4
@@ -2,4 +2,4 @@
 rm -f $initdir/init
 inst "/etc/kdump-adv-conf/init" "/init"
 inst "/bin/date" "/bin/date"
-inst "/usr/bin/reboot" "bin/reboot"
+inst "/usr/bin/reboot" "/bin/reboot"



From scop at fedoraproject.org  Tue Sep 15 17:05:14 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 15 Sep 2009 17:05:14 +0000 (UTC)
Subject: rpms/seeker/EL-5 seeker.LICENSE, NONE, 1.1 seeker.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915170514.E54EF11C00CE@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/seeker/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22620

Modified Files:
	.cvsignore sources 
Added Files:
	seeker.LICENSE seeker.spec 
Log Message:
Initial build.


--- NEW FILE seeker.LICENSE ---
http://www.linuxinsight.com/how_fast_is_your_disk.html?page=1#comment-971

ChangeLog, AUTHORS, TODO...
Submitted by admin on Wed, 2007-01-17 20:39.

Well, I don't have plans to make this a full blown package at this
time, because of the utter lack of free time, sorry. But in time, yes,
why not. The trigger event could be when I have time to make it
multithreaded. Then it should become much more useful.

In the meantime, put this on the top of seeker.c:

# Seeker v2.0, 2007-01-15, by linportal at gmail.com
# http://www.linuxinsight.com/how_fast_is_your_disk.html
# Distributed under the terms of the GNU General Public License v2

And then you can do whatever you like with it. If it's not against GPL
rules, of course. ;)


--- NEW FILE seeker.spec ---
Name:           seeker
Version:        3.0
Release:        2%{?dist}
Summary:        Random access disk benchmark utility

Group:          Applications/System
License:        GPLv2 and CC-BY-SA
URL:            http://www.linuxinsight.com/how_fast_is_your_disk.html
# http://www.linuxinsight.com/how_fast_is_your_disk.html#comment-1583
Source0:        http://smp.if.uj.edu.pl/~baryluk/seeker_baryluk.c
# http://www.linuxinsight.com/how_fast_is_your_disk.html?page=1#comment-971
Source1:        %{name}.LICENSE
# Grabbed with firefox, modified, ran through tidy(1) per CC BY-SA 2.5:
# http://www.linuxinsight.com/about.html
Source2:        %{name}-docs.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Seeker is a simple utility that reads small pieces of data from a raw
disk device in a random access pattern, and reports the average number
of seeks per second, and calculated random access time of the disk.
The seeker variant included in this package is the multithreaded one
by Witold Baryluk.


%prep
%setup -q -c -T -a 2
install -pm 644 %{SOURCE0} $(basename %{SOURCE0}) # for debuginfo
cp -p %{SOURCE1} LICENSE


%build
%{__cc} $RPM_OPT_FLAGS -pthread $(basename %{SOURCE0}) -o seeker


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 seeker $RPM_BUILD_ROOT%{_sbindir}/seeker


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE how_fast_is_your_disk*
%{_sbindir}/seeker


%changelog
* Sun Sep 13 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0-2
- Address review comments (#520701):
- Improve %%description.
- Include upstream article in docs.

* Fri Aug 28 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 21:36:50 -0000	1.1
+++ .cvsignore	15 Sep 2009 17:05:14 -0000	1.2
@@ -0,0 +1,2 @@
+seeker_baryluk.c
+seeker-docs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seeker/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 21:36:50 -0000	1.1
+++ sources	15 Sep 2009 17:05:14 -0000	1.2
@@ -0,0 +1,2 @@
+593802c3a86923fff7659a256bc43b1b  seeker_baryluk.c
+b169f93946dd18a46f4f63f71a2229fc  seeker-docs.tar.gz



From veillard at fedoraproject.org  Tue Sep 15 17:07:27 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 15 Sep 2009 17:07:27 +0000 (UTC)
Subject: rpms/libxml2/F-11 libxml2-2.7.4-input-parser.patch, NONE,
	1.1 libxml2.spec, 1.72, 1.73
Message-ID: <20090915170727.A63C711C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23367

Modified Files:
	libxml2.spec 
Added Files:
	libxml2-2.7.4-input-parser.patch 
Log Message:
Fix for #523002 affecting inkscpae and possibly others, daniel


libxml2-2.7.4-input-parser.patch:
 parser.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE libxml2-2.7.4-input-parser.patch ---
commit 9d3d141c412baa5c713ad3df48f1a4d179e07b05
Author: Daniel Veillard <veillard at redhat.com>
Date:   Tue Sep 15 18:41:30 2009 +0200

    Fix a parsing problem with little data at startup
    
    * parser.c: inkscape extension loader (and possibly others) feed
      data to the parser very slowly, 0 at start, 4 bytes on first GROW
      and this broke after the fix for
      https://bugzilla.gnome.org/show_bug.cgi?id=566012
      http://git.gnome.org/cgit/libxml2/commit/?id=7e385bd4e28a0cc12b6b26ed178c620e3c3ab8d8
      leading to another bug
      https://bugzilla.redhat.com/show_bug.cgi?id=523002
      this detects the situation and GROW when needed for proper processing.

diff --git a/parser.c b/parser.c
index e415339..b41dcc3 100644
--- a/parser.c
+++ b/parser.c
@@ -10130,8 +10130,12 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
     /*
      * Check for the XMLDecl in the Prolog.
      * do not GROW here to avoid the detected encoder to decode more
-     * than just the first line
+     * than just the first line, unless the amount of data is really
+     * too small to hold "<?xml version="1.0" encoding="foo"
      */
+    if ((ctxt->input->end - ctxt->input->cur) < 35) {
+       GROW;
+    }
     if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
 
 	/*


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/libxml2.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- libxml2.spec	10 Sep 2009 17:48:16 -0000	1.72
+++ libxml2.spec	15 Sep 2009 17:07:27 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.7.4
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -67,6 +68,7 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -141,6 +143,9 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-2
+- fix a problem with little data at startup affecting inkscape #523002
+
 * Thu Sep 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-1
 - upstream release 2.7.4
 - symbol versioning of libxml2 shared libs



From mitr at fedoraproject.org  Tue Sep 15 17:08:52 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 15 Sep 2009 17:08:52 +0000 (UTC)
Subject: rpms/system-config-audit/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 system-config-audit.spec, 1.1, 1.2
Message-ID: <20090915170852.CC39811C00CE@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/system-config-audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25577

Modified Files:
	.cvsignore sources system-config-audit.spec 
Log Message:
* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.12-1
- Update to system-config-audit-0.4.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 13:07:33 -0000	1.2
+++ .cvsignore	15 Sep 2009 17:08:52 -0000	1.3
@@ -1 +1 @@
-system-config-audit-0.4.11.tar.bz2
+system-config-audit-0.4.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 13:07:33 -0000	1.2
+++ sources	15 Sep 2009 17:08:52 -0000	1.3
@@ -1 +1 @@
-2f47c6549b6adee06126243ec2162cb9  system-config-audit-0.4.11.tar.bz2
+58668dd6702f1fe86f11da3f93f751d4  system-config-audit-0.4.12.tar.bz2


Index: system-config-audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/system-config-audit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-audit.spec	11 Aug 2009 13:07:33 -0000	1.1
+++ system-config-audit.spec	15 Sep 2009 17:08:52 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Utility for editing audit configuration
 Name: system-config-audit
-Version: 0.4.11
-Release: 2
+Version: 0.4.12
+Release: 1
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/system-config-audit/
@@ -43,8 +43,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.12-1
+- Update to system-config-audit-0.4.12.
+
 * Thu Jul 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.11-2
 - Expand %%description.
 
-* Wed Jul 29 2009 Miloslav Trma? <mitr at volny.cz> - 0.4.11-1
+* Wed Jul 29 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.11-1
 - Separate from audit.



From maxamillion at fedoraproject.org  Tue Sep 15 17:10:00 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 15 Sep 2009 17:10:00 +0000 (UTC)
Subject: rpms/fail2ban/EL-5 fail2ban-0.8.3-log2syslog.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 fail2ban-logrotate, 1.1,
	1.2 fail2ban.spec, 1.3, 1.4 import.log, 1.1, 1.2 sources, 1.3,
	1.4 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch, 1.1, NONE
Message-ID: <20090915171000.12E2311C00CE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/fail2ban/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258/EL-5

Modified Files:
	.cvsignore fail2ban-logrotate fail2ban.spec import.log sources 
Added Files:
	fail2ban-0.8.3-log2syslog.patch 
Removed Files:
	0001-BF-anchoring-regex-for-IP-with-at-the-end.patch 
Log Message:
Update to 0.8.4



fail2ban-0.8.3-log2syslog.patch:
 fail2ban.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fail2ban-0.8.3-log2syslog.patch ---
--- fail2ban-0.8.3/config/fail2ban.conf~	2008-02-27 22:44:55.000000000 +0100
+++ fail2ban-0.8.3/config/fail2ban.conf	2009-08-27 20:48:25.000000000 +0200
@@ -22,7 +22,7 @@
 #          Only one log target can be specified.
 # Values:  STDOUT STDERR SYSLOG file  Default:  /var/log/fail2ban.log
 #
-logtarget = /var/log/fail2ban.log
+logtarget = SYSLOG
 
 # Option: socket
 # Notes.: Set the socket file. This is used to communicate with the daemon. Do


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 May 2009 19:25:05 -0000	1.3
+++ .cvsignore	15 Sep 2009 17:09:59 -0000	1.4
@@ -1 +1 @@
-fail2ban-0.8.3.tar.bz2
+fail2ban-0.8.4.tar.bz2


Index: fail2ban-logrotate
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-5/fail2ban-logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fail2ban-logrotate	4 May 2009 19:25:06 -0000	1.1
+++ fail2ban-logrotate	15 Sep 2009 17:09:59 -0000	1.2
@@ -4,6 +4,6 @@
     size 30k
     create 0600 root root
     postrotate
-        /usr/bin/fail2ban-client reload 2> /dev/null || true
+        /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
     endscript
 }


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-5/fail2ban.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fail2ban.spec	4 May 2009 19:25:06 -0000	1.3
+++ fail2ban.spec	15 Sep 2009 17:09:59 -0000	1.4
@@ -3,18 +3,17 @@
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
-Version: 0.8.3
-Release: 18%{?dist}
+Version: 0.8.4
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 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
+Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildArch: noarch
@@ -32,9 +31,8 @@ failures. It updates firewall rules to r
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
-#patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
-%patch4 -p1 -b .CVE-2009-0362
+%patch6 -p1 -b .log2syslog
 
 %build
 python setup.py build
@@ -84,6 +82,19 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Tue Sep 15 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.8.4-23
+- Rebuild for EPEL (First release of 0.8.4)
+
+* Fri Sep 11 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.4-23
+- update to 0.8.4.
+
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
+- Update to a newer svn snapshot to fix python 2.6 issue.
+
+* Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
+- Log to syslog (RH bug #491983). Also deals with RH bug #515116.
+- Check inodes of log files (RH bug #503852).
+
 * Mon Mar 04 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.8.3-18
 - Rebuild For EPEL
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/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 19:25:06 -0000	1.1
+++ import.log	15 Sep 2009 17:09:59 -0000	1.2
@@ -1 +1,2 @@
 fail2ban-0_8_3-18:EL-5:fail2ban-0.8.3-18.src.rpm:1241465071
+fail2ban-0_8_4-23_el5:EL-5:fail2ban-0.8.4-23.el5.src.rpm:1253034570


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 May 2009 19:25:06 -0000	1.3
+++ sources	15 Sep 2009 17:09:59 -0000	1.4
@@ -1 +1 @@
-b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2
+df94335a5d12b4750869e5fe350073fa  fail2ban-0.8.4.tar.bz2


--- 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Sep 15 17:10:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Sep 2009 17:10:49 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.394, 1.395 jd.spec, 1.457, 1.458 sources,
	1.395, 1.396
Message-ID: <20090915171049.6B18811C0337@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28696

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3074



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- .cvsignore	14 Sep 2009 14:12:10 -0000	1.394
+++ .cvsignore	15 Sep 2009 17:10:48 -0000	1.395
@@ -1 +1 @@
-jd-2.4.2-beta090914.tgz
+jd-2.4.2-svn3074_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- jd.spec	14 Sep 2009 14:12:11 -0000	1.457
+++ jd.spec	15 Sep 2009 17:10:48 -0000	1.458
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        beta090914
+%define         strtag        svn3074_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3074
+
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- sources	14 Sep 2009 14:12:11 -0000	1.395
+++ sources	15 Sep 2009 17:10:48 -0000	1.396
@@ -1 +1 @@
-298facf48ce377f0ff0a153f6d9dd433  jd-2.4.2-beta090914.tgz
+eede99e5283a2c1f52780c53c7812904  jd-2.4.2-svn3074_trunk.tgz



From maxamillion at fedoraproject.org  Tue Sep 15 17:11:12 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 15 Sep 2009 17:11:12 +0000 (UTC)
Subject: rpms/fail2ban/EL-4 fail2ban-0.8.3-log2syslog.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 fail2ban-logrotate, 1.1,
	1.2 fail2ban.spec, 1.3, 1.4 import.log, 1.1, 1.2 sources, 1.3,
	1.4 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch, 1.1, NONE
Message-ID: <20090915171112.A8E0411C0337@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/fail2ban/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29200/EL-4

Modified Files:
	.cvsignore fail2ban-logrotate fail2ban.spec import.log sources 
Added Files:
	fail2ban-0.8.3-log2syslog.patch 
Removed Files:
	0001-BF-anchoring-regex-for-IP-with-at-the-end.patch 
Log Message:
Update to 0.8.4



fail2ban-0.8.3-log2syslog.patch:
 fail2ban.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fail2ban-0.8.3-log2syslog.patch ---
--- fail2ban-0.8.3/config/fail2ban.conf~	2008-02-27 22:44:55.000000000 +0100
+++ fail2ban-0.8.3/config/fail2ban.conf	2009-08-27 20:48:25.000000000 +0200
@@ -22,7 +22,7 @@
 #          Only one log target can be specified.
 # Values:  STDOUT STDERR SYSLOG file  Default:  /var/log/fail2ban.log
 #
-logtarget = /var/log/fail2ban.log
+logtarget = SYSLOG
 
 # Option: socket
 # Notes.: Set the socket file. This is used to communicate with the daemon. Do


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 May 2009 19:31:03 -0000	1.3
+++ .cvsignore	15 Sep 2009 17:11:11 -0000	1.4
@@ -1 +1 @@
-fail2ban-0.8.3.tar.bz2
+fail2ban-0.8.4.tar.bz2


Index: fail2ban-logrotate
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-4/fail2ban-logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fail2ban-logrotate	4 May 2009 19:31:03 -0000	1.1
+++ fail2ban-logrotate	15 Sep 2009 17:11:12 -0000	1.2
@@ -4,6 +4,6 @@
     size 30k
     create 0600 root root
     postrotate
-        /usr/bin/fail2ban-client reload 2> /dev/null || true
+        /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
     endscript
 }


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-4/fail2ban.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fail2ban.spec	4 May 2009 19:31:03 -0000	1.3
+++ fail2ban.spec	15 Sep 2009 17:11:12 -0000	1.4
@@ -3,18 +3,17 @@
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
-Version: 0.8.3
-Release: 18%{?dist}
+Version: 0.8.4
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 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
+Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildArch: noarch
@@ -32,9 +31,8 @@ failures. It updates firewall rules to r
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
-#patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
-%patch4 -p1 -b .CVE-2009-0362
+%patch6 -p1 -b .log2syslog
 
 %build
 python setup.py build
@@ -84,6 +82,19 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Tue Sep 15 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.8.4-23
+- Rebuild for EPEL (First release of 0.8.4)
+
+* Fri Sep 11 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.4-23
+- update to 0.8.4.
+
+* Wed Sep  2 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-22
+- Update to a newer svn snapshot to fix python 2.6 issue.
+
+* Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
+- Log to syslog (RH bug #491983). Also deals with RH bug #515116.
+- Check inodes of log files (RH bug #503852).
+
 * Mon Mar 04 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.8.3-18
 - Rebuild For EPEL
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 May 2009 19:31:03 -0000	1.1
+++ import.log	15 Sep 2009 17:11:12 -0000	1.2
@@ -1 +1,2 @@
 fail2ban-0_8_3-18:EL-4:fail2ban-0.8.3-18.src.rpm:1241465271
+fail2ban-0_8_4-23_el5:EL-4:fail2ban-0.8.4-23.el5.src.rpm:1253034648


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 May 2009 19:31:03 -0000	1.3
+++ sources	15 Sep 2009 17:11:12 -0000	1.4
@@ -1 +1 @@
-b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2
+df94335a5d12b4750869e5fe350073fa  fail2ban-0.8.4.tar.bz2


--- 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch DELETED ---



From veillard at fedoraproject.org  Tue Sep 15 17:12:41 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 15 Sep 2009 17:12:41 +0000 (UTC)
Subject: rpms/libxml2/F-10 libxml2-2.7.4-input-parser.patch, NONE,
	1.1 libxml2.spec, 1.65, 1.66
Message-ID: <20090915171241.C59C611C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30444

Modified Files:
	libxml2.spec 
Added Files:
	libxml2-2.7.4-input-parser.patch 
Log Message:
Fixes #523002 affecting inkscape and possibly others, Daniel


libxml2-2.7.4-input-parser.patch:
 parser.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE libxml2-2.7.4-input-parser.patch ---
commit 9d3d141c412baa5c713ad3df48f1a4d179e07b05
Author: Daniel Veillard <veillard at redhat.com>
Date:   Tue Sep 15 18:41:30 2009 +0200

    Fix a parsing problem with little data at startup
    
    * parser.c: inkscape extension loader (and possibly others) feed
      data to the parser very slowly, 0 at start, 4 bytes on first GROW
      and this broke after the fix for
      https://bugzilla.gnome.org/show_bug.cgi?id=566012
      http://git.gnome.org/cgit/libxml2/commit/?id=7e385bd4e28a0cc12b6b26ed178c620e3c3ab8d8
      leading to another bug
      https://bugzilla.redhat.com/show_bug.cgi?id=523002
      this detects the situation and GROW when needed for proper processing.

diff --git a/parser.c b/parser.c
index e415339..b41dcc3 100644
--- a/parser.c
+++ b/parser.c
@@ -10130,8 +10130,12 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
     /*
      * Check for the XMLDecl in the Prolog.
      * do not GROW here to avoid the detected encoder to decode more
-     * than just the first line
+     * than just the first line, unless the amount of data is really
+     * too small to hold "<?xml version="1.0" encoding="foo"
      */
+    if ((ctxt->input->end - ctxt->input->cur) < 35) {
+       GROW;
+    }
     if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
 
 	/*


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/libxml2.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- libxml2.spec	10 Sep 2009 17:52:09 -0000	1.65
+++ libxml2.spec	15 Sep 2009 17:12:41 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.7.4
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support
@@ -67,6 +68,7 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -141,6 +143,9 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-2
+- fix a problem with little data at startup affecting inkscape #523002
+
 * Thu Sep 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-1
 - upstream release 2.7.4
 - symbol versioning of libxml2 shared libs



From linville at fedoraproject.org  Tue Sep 15 17:33:15 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 15 Sep 2009 17:33:15 +0000 (UTC)
Subject: rpms/rfkill/devel import.log, NONE, 1.1 rfkill.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090915173315.80AF611C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12555/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rfkill.spec 
Log Message:
Initial import (#519221)


--- NEW FILE import.log ---
rfkill-0_3-1_fc11:HEAD:rfkill-0.3-1.fc11.src.rpm:1253035958


--- NEW FILE rfkill.spec ---
Name:           rfkill
Version:        0.3
Release:        1%{?dist}
Summary:        A tool to query the state of RF kill interfaces

Group:          System Environment/Base
License:        BSD
URL:            http://www.linuxwireless.org/en/users/Documentation/rfkill
Source0:        http://wireless.kernel.org/download/rfkill/rfkill-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
rfkill is a small tool to query the state of the rfkill switches,
buttons and subsystem interfaces.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/rfkill
%{_mandir}/man1/*
%doc COPYING README


%changelog
* Thu Sep  3 2009 John W. Linville <linville at tuxdriver.com> 0.3-1
- Update to upstream version 0.3
- Use 'make install' and include man page in files section

* Tue Aug 25 2009 John W. Linville <linville at tuxdriver.com> 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:09:41 -0000	1.1
+++ .cvsignore	15 Sep 2009 17:33:15 -0000	1.2
@@ -0,0 +1 @@
+rfkill-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:09:42 -0000	1.1
+++ sources	15 Sep 2009 17:33:15 -0000	1.2
@@ -0,0 +1 @@
+f4d693c2a3e5f0503a3cde3d84be8919  rfkill-0.3.tar.bz2



From linville at fedoraproject.org  Tue Sep 15 17:39:02 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 15 Sep 2009 17:39:02 +0000 (UTC)
Subject: rpms/rfkill/devel rfkill.spec,1.1,1.2
Message-ID: <20090915173902.3825C11C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14369

Modified Files:
	rfkill.spec 
Log Message:
Change summary and description as suggested by Tomasz Torcz <zdzichu at irc.pl>


Index: rfkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/devel/rfkill.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rfkill.spec	15 Sep 2009 17:33:15 -0000	1.1
+++ rfkill.spec	15 Sep 2009 17:39:02 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           rfkill
 Version:        0.3
-Release:        1%{?dist}
-Summary:        A tool to query the state of RF kill interfaces
+Release:        2%{?dist}
+Summary:        A tool for enabling and disabling wireless devices
 
 Group:          System Environment/Base
 License:        BSD
@@ -11,9 +11,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 
 %description
-rfkill is a small tool to query the state of the rfkill switches,
-buttons and subsystem interfaces.
-
+rfkill is a simple tool for accessing the Linux rfkill device interface,
+which is used to enable and disable wireless networking devices, typically
+WLAN, Bluetooth and mobile broadband.
 
 %prep
 %setup -q
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 John W. Linville <linville at tuxdriver.com> 0.3-2
+- Change summary and description as suggested by Tomasz Torcz <zdzichu at irc.pl>
+
 * Thu Sep  3 2009 John W. Linville <linville at tuxdriver.com> 0.3-1
 - Update to upstream version 0.3
 - Use 'make install' and include man page in files section



From jamatos at fedoraproject.org  Tue Sep 15 17:46:26 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Tue, 15 Sep 2009 17:46:26 +0000 (UTC)
Subject: rpms/pygsl/devel pygsl-0.9.4-removed-gsm-units.patch, NONE,
	1.1 pygsl.spec, 1.24, 1.25
Message-ID: <20090915174626.479BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20892

Modified Files:
	pygsl.spec 
Added Files:
	pygsl-0.9.4-removed-gsm-units.patch 
Log Message:
* Tue Sep 15 2009 Jos? Matos <jamatos at fc.up.pt> - 0.9.4-4
- Remove gsm units taken away in gsl-1.13.


pygsl-0.9.4-removed-gsm-units.patch:
 const_cgs_array.c  |   16 ++++++++--------
 const_cgsm_array.c |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE pygsl-0.9.4-removed-gsm-units.patch ---
diff -ur pygsl-0.9.4.orig/src/const_cgs_array.c pygsl-0.9.4/src/const_cgs_array.c
--- pygsl-0.9.4.orig/src/const_cgs_array.c	2005-04-27 08:53:37.000000000 +0100
+++ pygsl-0.9.4/src/const_cgs_array.c	2009-09-15 18:26:29.000000000 +0100
@@ -14,10 +14,10 @@
 {"mass_neutron",GSL_CONST_CGS_MASS_NEUTRON,"g"},
 {"rydberg",GSL_CONST_CGS_RYDBERG,"g cm^2 / s^2"},
 {"boltzmann",GSL_CONST_CGS_BOLTZMANN,"g cm^2 / K s^2"},
-{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},
-{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},
-{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},
-{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},
+/*{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},*/
+/*{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},*/
+/*{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},*/
+/*{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},*/
 {"molar_gas",GSL_CONST_CGS_MOLAR_GAS,"g cm^2 / K mol s^2"},
 {"standard_gas_volume",GSL_CONST_CGS_STANDARD_GAS_VOLUME,"cm^3 / mol"},
 {"minute",GSL_CONST_CGS_MINUTE,"s"},
@@ -76,9 +76,9 @@
 {"psi",GSL_CONST_CGS_PSI,"g / cm s^2"},
 {"poise",GSL_CONST_CGS_POISE,"g / cm s"},
 {"stokes",GSL_CONST_CGS_STOKES,"cm^2 / s"},
-{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},
-{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},
-{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},
+/*{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},*/
+/*{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},*/
+/*{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},*/
 {"stilb",GSL_CONST_CGS_STILB,"cd / cm^2"},
 {"lumen",GSL_CONST_CGS_LUMEN,"cd sr"},
 {"lux",GSL_CONST_CGS_LUX,"cd sr / cm^2"},
@@ -87,7 +87,7 @@
 {"lambert",GSL_CONST_CGS_LAMBERT,"cd sr / cm^2"},
 {"footlambert",GSL_CONST_CGS_FOOTLAMBERT,"cd sr / cm^2"},
 {"curie",GSL_CONST_CGS_CURIE,"1 / s"},
-{"roentgen",GSL_CONST_CGS_ROENTGEN,"A s / g"},
+/*{"roentgen",GSL_CONST_CGS_ROENTGEN,"A s / g"},*/
 {"rad",GSL_CONST_CGS_RAD,"cm^2 / s^2"},
 {"solar_mass",GSL_CONST_CGS_SOLAR_MASS,"g"},
 {"bohr_radius",GSL_CONST_CGS_BOHR_RADIUS,"cm"},
diff -ur pygsl-0.9.4.orig/src/const_cgsm_array.c pygsl-0.9.4/src/const_cgsm_array.c
--- pygsl-0.9.4.orig/src/const_cgsm_array.c	2006-12-21 12:20:15.000000000 +0000
+++ pygsl-0.9.4/src/const_cgsm_array.c	2009-09-15 18:36:50.000000000 +0100
@@ -77,7 +77,7 @@
 {"stokes",GSL_CONST_CGSM_STOKES,"cm^2 / s"},
 {"faraday",GSL_CONST_CGSM_FARADAY,"abamp s / mol"},
 {"electron_charge",GSL_CONST_CGSM_ELECTRON_CHARGE,"abamp s"},
-{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},
+/*{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},*/
 {"stilb",GSL_CONST_CGSM_STILB,"cd / cm^2"},
 {"lumen",GSL_CONST_CGSM_LUMEN,"cd sr"},
 {"lux",GSL_CONST_CGSM_LUX,"cd sr / cm^2"},


Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pygsl.spec	15 Sep 2009 16:48:36 -0000	1.24
+++ pygsl.spec	15 Sep 2009 17:46:26 -0000	1.25
@@ -7,7 +7,7 @@
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.4
-Release:       3%{?dist}
+Release:       4%{?dist}
 # The package is mostly GPL+ but there are two scripts
 # GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
 License:       GPLv2+
@@ -17,6 +17,8 @@ Url:           http://pygsl.sourceforge.
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:       COPYING
 
+Patch0:	       pygsl-0.9.4-removed-gsm-units.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: numpy
 BuildRequires: gsl-devel
@@ -42,9 +44,10 @@ Development files for pygsl
 
 %prep
 %setup
+cp %{SOURCE1} .
+%patch0 -p1
 
 %build
-cp %{SOURCE1} .
 rm -f swig_src/gslwrap_wrap.c
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Jos? Matos <jamatos at fc.up.pt> - 0.9.4-4
+- Remove gsm units taken away in gsl-1.13.
+
 * Tue Sep 15 2009 Jos? Matos <jamatos at fc.up.pt> - 0.9.4-3
 - Rebuild for new upstream gsl version (F12+).
 



From mikeb at fedoraproject.org  Tue Sep 15 17:49:45 2009
From: mikeb at fedoraproject.org (Mike Bonnet)
Date: Tue, 15 Sep 2009 17:49:45 +0000 (UTC)
Subject: rpms/python-cheetah/F-11
	cheetah-2.2.2-remove-markdown-dependency.patch, NONE,
	1.1 python-cheetah.spec, 1.20, 1.21 sources, 1.9, 1.10
Message-ID: <20090915174945.21FF811C00CE@cvs1.fedora.phx.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24342

Modified Files:
	python-cheetah.spec sources 
Added Files:
	cheetah-2.2.2-remove-markdown-dependency.patch 
Log Message:
update to the 2.2.2 release

cheetah-2.2.2-remove-markdown-dependency.patch:
 SetupConfig.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE cheetah-2.2.2-remove-markdown-dependency.patch ---
diff -uNr Cheetah-2.2.2.orig/SetupConfig.py Cheetah-2.2.2/SetupConfig.py
--- Cheetah-2.2.2.orig/SetupConfig.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/SetupConfig.py	2009-09-15 13:29:26.293920000 -0400
@@ -58,9 +58,9 @@
 if not os.getenv('CHEETAH_INSTALL_WITHOUT_SETUPTOOLS'):
     try:
         from setuptools import setup
-        install_requires = [
-                "Markdown >= 2.0.1",
-        ]
+        # install_requires = [
+        #         "Markdown >= 2.0.1",
+        # ]
         if sys.platform == 'win32':
             # use 'entry_points' instead of 'scripts'
             del scripts


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/F-11/python-cheetah.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-cheetah.spec	5 Jun 2009 14:54:40 -0000	1.20
+++ python-cheetah.spec	15 Sep 2009 17:49:44 -0000	1.21
@@ -1,14 +1,15 @@
 %{!?python_sitearch: %global python_sitearch %([ -x %{__python} ] && %{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" || :)}
 
 Name:           python-cheetah
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
-Summary:        Template engine and code-generator
+Summary:        Template engine and code generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
+Patch0:         cheetah-2.2.2-remove-markdown-dependency.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -25,14 +26,13 @@ code, Java, sql, form emails and even Py
 
 %prep
 %setup -q -n Cheetah-%{version}
+%patch0 -p1
 
 %build
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
@@ -71,17 +71,18 @@ rm -rf %{buildroot}
 %dir %{python_sitearch}/Cheetah/Utils
 %{python_sitearch}/Cheetah/Utils/*.py*
 
-%dir %{python_sitearch}/Cheetah/contrib
-%{python_sitearch}/Cheetah/contrib/*.py*
-
-%dir %{python_sitearch}/Cheetah/contrib/markdown
-%{python_sitearch}/Cheetah/contrib/markdown/*.py*
-
 %dir %{python_sitearch}/Cheetah-%{version}-*.egg-info
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/PKG-INFO
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Mon Sep 14 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-1
+- update to the 2.2.2 release
+- remove dependency on Markdown because it's not available in F-11
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun  5 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.1-1
 - update to the 2.2.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Jun 2009 14:54:40 -0000	1.9
+++ sources	15 Sep 2009 17:49:44 -0000	1.10
@@ -1 +1 @@
-137491aef378b502b2ee71c03b929faf  Cheetah-2.2.1.tar.gz
+e0d89113ab6bb0935d2b67395960264c  Cheetah-2.2.2.tar.gz



From linville at fedoraproject.org  Tue Sep 15 17:50:55 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 15 Sep 2009 17:50:55 +0000 (UTC)
Subject: rpms/rfkill/F-11 rfkill.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090915175055.489B911C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24827

Modified Files:
	.cvsignore sources 
Added Files:
	rfkill.spec 
Log Message:
Initial import for F-11


--- NEW FILE rfkill.spec ---
Name:           rfkill
Version:        0.3
Release:        2%{?dist}
Summary:        A tool for enabling and disabling wireless devices

Group:          System Environment/Base
License:        BSD
URL:            http://www.linuxwireless.org/en/users/Documentation/rfkill
Source0:        http://wireless.kernel.org/download/rfkill/rfkill-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
rfkill is a simple tool for accessing the Linux rfkill device interface,
which is used to enable and disable wireless networking devices, typically
WLAN, Bluetooth and mobile broadband.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/rfkill
%{_mandir}/man1/*
%doc COPYING README


%changelog
* Tue Sep 15 2009 John W. Linville <linville at tuxdriver.com> 0.3-2
- Change summary and description as suggested by Tomasz Torcz <zdzichu at irc.pl>

* Thu Sep  3 2009 John W. Linville <linville at tuxdriver.com> 0.3-1
- Update to upstream version 0.3
- Use 'make install' and include man page in files section

* Tue Aug 25 2009 John W. Linville <linville at tuxdriver.com> 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:09:41 -0000	1.1
+++ .cvsignore	15 Sep 2009 17:50:55 -0000	1.2
@@ -0,0 +1 @@
+rfkill-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:09:42 -0000	1.1
+++ sources	15 Sep 2009 17:50:55 -0000	1.2
@@ -0,0 +1 @@
+f4d693c2a3e5f0503a3cde3d84be8919  rfkill-0.3.tar.bz2



From jskala at fedoraproject.org  Tue Sep 15 17:56:15 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 15 Sep 2009 17:56:15 +0000 (UTC)
Subject: rpms/squid/devel squid.init,1.14,1.15 squid.spec,1.142,1.143
Message-ID: <20090915175615.368AC11C00CE@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27168

Modified Files:
	squid.init squid.spec 
Log Message:
* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 7:3.1.0.13-4
- fixed #521596 - wrong return code of init script



Index: squid.init
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- squid.init	4 Sep 2009 03:39:42 -0000	1.14
+++ squid.init	15 Sep 2009 17:56:14 -0000	1.15
@@ -116,6 +116,9 @@ stop() {
 		echo
 	else
 		echo_failure
+		if [ ! -e /var/lock/subsys/$SQUID ]; then
+			RETVAL=0
+		fi
 		echo
 	fi
 	return $RETVAL
@@ -148,7 +151,7 @@ stop)
 	stop
 	;;
 
-reload)
+reload|force-reload)
 	reload
 	;;
 
@@ -156,7 +159,7 @@ restart)
 	restart
 	;;
 
-condrestart)
+condrestart|try-restart)
 	condrestart
 	;;
 
@@ -170,7 +173,7 @@ probe)
 	;;
 
 *)
-	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart|probe}"
+	echo $"Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
 	exit 2
 esac
 


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- squid.spec	8 Sep 2009 15:57:10 -0000	1.142
+++ squid.spec	15 Sep 2009 17:56:14 -0000	1.143
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -253,6 +253,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 7:3.1.0.13-4
+- fixed #521596 - wrong return code of init script
+
 * Tue Sep 08 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-3
 - Enable squid_kerb_auth
 



From gerd at fedoraproject.org  Tue Sep 15 18:17:12 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 15 Sep 2009 18:17:12 +0000 (UTC)
Subject: rpms/parrot/F-12 import.log, 1.1, 1.2 parrot.spec, 1.1, 1.2 sources,
	1.1, 1.2 patch-1.5.0.ppc, 1.1, NONE
Message-ID: <20090915181712.7B60B11C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1436/F-12

Modified Files:
	import.log parrot.spec sources 
Removed Files:
	patch-1.5.0.ppc 
Log Message:
update to parrot release 1.6.0



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Sep 2009 14:28:33 -0000	1.1
+++ import.log	15 Sep 2009 18:17:12 -0000	1.2
@@ -1 +1,2 @@
 parrot-1_5_0-2_fc11:F-12:parrot-1.5.0-2.fc11.src.rpm:1252074189
+parrot-1_6_0-1_fc11:F-12:parrot-1.6.0-1.fc11.src.rpm:1253038484


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/parrot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot.spec	4 Sep 2009 14:28:33 -0000	1.1
+++ parrot.spec	15 Sep 2009 18:17:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           parrot
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -8,14 +8,7 @@ URL:            http://www.parrot.org/
 
 Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
 
-Patch1:         patch-1.5.0.ppc
-%ifarch %{ix86} x86_64 ppc64
 Patch0:         parrot-1.x.0.patch
-%else
-# The PowerPC-architecture
-Patch0:         patch-1.5.0.ppc
-%endif
-
 # patches file:           tools/dev/install_files.pl
 # It is responsible to have no subdirectory under pkgconfig.
 #
@@ -39,6 +32,7 @@ BuildRequires:  perl(Test::Simple)
 BuildRequires:  ctags
 BuildRequires:  openssl-devel
 BuildRequires:  flex
+BuildRequires:  bison
  
 
 %package docs
@@ -118,6 +112,10 @@ chmod +x %{__perl_provides}
 # option.
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
+%ifarch ppc64
+# the TGE don't build with this version with the optimize="-O2" option on ppc64
+    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
+%endif
 
 %{__perl} Configure.pl \
     --prefix=%{_usr} \
@@ -130,9 +128,7 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex \
-    --yacc=%{_bindir}/yacc \
-    --libs='-lcurses -lm'
+    --lex=%{_bindir}/flex
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
@@ -287,21 +283,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
+- new upstream version
+- build only without the option '-O2' on ppc64
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl
 
 * Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
-- new upstream version
+- add man pages
 
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
-- ppc test included again
 - include the necessary module Parrot::OpLib::core
 - change the place of header files to /usr/include/parrot/<version>
 - install the files /usr/src/parrot/*
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
@@ -340,9 +336,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
-- Update to 0.5.3.
-
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Sep 2009 14:28:33 -0000	1.1
+++ sources	15 Sep 2009 18:17:12 -0000	1.2
@@ -1 +1 @@
-f209c337b488bfa244520d38502ef330  parrot-1.5.0.tar.gz
+6fde2d91278a3990213c8671a0856e4a  parrot-1.6.0.tar.gz


--- patch-1.5.0.ppc DELETED ---



From gerd at fedoraproject.org  Tue Sep 15 18:18:22 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 15 Sep 2009 18:18:22 +0000 (UTC)
Subject: rpms/parrot/F-11 .cvsignore, 1.3, 1.4 import.log, 1.6,
	1.7 parrot.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <20090915181822.A68E611C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1931/F-11

Modified Files:
	.cvsignore import.log parrot.spec sources 
Log Message:
update to new parrot release 1.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Jul 2009 16:51:41 -0000	1.3
+++ .cvsignore	15 Sep 2009 18:18:22 -0000	1.4
@@ -1 +1 @@
-parrot-1.4.0.tar.gz
+parrot-1.6.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	3 Aug 2009 12:42:58 -0000	1.6
+++ import.log	15 Sep 2009 18:18:22 -0000	1.7
@@ -4,3 +4,4 @@ parrot-1_4_0-3_fc11:F-11:parrot-1.4.0-3.
 parrot-1_4_0-5_fc11:F-11:parrot-1.4.0-5.fc11.src.rpm:1249128393
 parrot-1_4_0-6_fc11:F-11:parrot-1.4.0-6.fc11.src.rpm:1249129108
 parrot-1_4_0-7_fc11:F-11:parrot-1.4.0-7.fc11.src.rpm:1249303263
+parrot-1_6_0-1_fc11:F-11:parrot-1.6.0-1.fc11.src.rpm:1253038605


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- parrot.spec	6 Aug 2009 07:24:18 -0000	1.10
+++ parrot.spec	15 Sep 2009 18:18:22 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           parrot
-Version:        1.4.0
-Release:        9%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
 
 Patch0:         parrot-1.x.0.patch
 # patches file:           tools/dev/install_files.pl
@@ -32,6 +32,7 @@ BuildRequires:  perl(Test::Simple)
 BuildRequires:  ctags
 BuildRequires:  openssl-devel
 BuildRequires:  flex
+BuildRequires:  bison
  
 
 %package docs
@@ -92,8 +93,6 @@ Parrot Virtual Machine development files
 %setup -q
 %patch0 -p0
 
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
-
 
 cat << \EOF > %{name}-prov
 #!/bin/sh
@@ -113,6 +112,10 @@ chmod +x %{__perl_provides}
 # option.
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
+%ifarch ppc64
+# the TGE don't build with this version with the optimize="-O2" option on ppc64
+    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
+%endif
 
 %{__perl} Configure.pl \
     --prefix=%{_usr} \
@@ -125,11 +128,9 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex \
-    --yacc=%{_bindir}/yacc \
-    --libs='-lcurses -lm'
+    --lex=%{_bindir}/flex
 
-# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
+# The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 
@@ -143,12 +144,20 @@ make html
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib" 
-export LD_LIBRARY_PATH=$( pwd )/blib/lib
-
-# install-dev: Same as 'install' taget but also install support for development.
+# install-dev: Same as 'install' taget but also install support for 
+#              language development 
 make install-dev DESTDIR=$RPM_BUILD_ROOT
 
+#Creating man-pages
+%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man --section=1 --name=parrot docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot.1.gz
+pod2man --section=1 --name=parrot_debugger src/parrot_debugger.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_debugger.1.gz
+pod2man --section=1 --name=pbc_disassemble src/pbc_disassemble.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_disassemble.1.gz
+pod2man --section=1 --name=pbc_dump src/pbc_dump.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_dump.1.gz
+pod2man --section=1 --name=pbc_merge src/pbc_merge.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_merge.1.gz
+pod2man --section=1 --name=parrot_config tools/build/parrot_config_c.pl | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_config.1.gz
+pod2man --section=1 --name=pbc_to_exe tools/dev/pbc_to_exe.pir | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_to_exe.1.gz
+
 %define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
 
 
@@ -208,7 +217,7 @@ find examples -wholename 'examples/langu
 
 find examples/languages -type f -name harness \
     -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
-for file in docs/book/draft/ch05_pge.pod docs/memory_internals.pod; do
+for file in docs/book/pct/ch04_pge.pod docs/memory_internals.pod; do
         %{__mv} $file timestamp
         iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
         touch -r timestamp $file
@@ -240,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/parrot/%{version}/tools
 %exclude %{_libdir}/parrot/%{version}/VERSION
 %{_libdir}/libparrot.so.*
+%{_mandir}/man1/parrot.1.gz
 
 %files docs
 %defattr(-,root,root,-)
@@ -250,7 +260,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/parrot_config
 %{_bindir}/parrot_debugger
 %{_bindir}/pbc_disassemble
-%{_bindir}/pbc_info
 %{_bindir}/pbc_merge
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
@@ -258,6 +267,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
+%{_mandir}/man1/parrot_config.1.gz
+%{_mandir}/man1/parrot_debugger.1.gz
+%{_mandir}/man1/pbc_disassemble.1.gz
+%{_mandir}/man1/pbc_merge.1.gz
+%{_mandir}/man1/pbc_to_exe.1.gz
+%{_mandir}/man1/pbc_dump.1.gz
 
 %files tools
 %defattr(-,root,root,-)
@@ -268,15 +283,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
+- new upstream version
+- build only without the option '-O2' on ppc64
+
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
+- rebuilt with new openssl
+
+* Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
+- add man pages
+
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
-- ppc test included again
-- include the necessary module Parrot::Oplib::core
-- change the place of header files to /usr/include/parrrot/<version>
+- include the necessary module Parrot::OpLib::core
+- change the place of header files to /usr/include/parrot/<version>
 - install the files /usr/src/parrot/*
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
@@ -315,9 +336,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
-- Update to 0.5.3.
-
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Jul 2009 16:51:41 -0000	1.3
+++ sources	15 Sep 2009 18:18:22 -0000	1.4
@@ -1 +1 @@
-3f66816c0f2ba18bdd2cf7bedd59f045  parrot-1.4.0.tar.gz
+6fde2d91278a3990213c8671a0856e4a  parrot-1.6.0.tar.gz



From dwalsh at fedoraproject.org  Tue Sep 15 18:26:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 15 Sep 2009 18:26:13 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.32,
	1.33 modules-targeted.conf, 1.141, 1.142 policy-F12.patch, 1.79,
	1.80 selinux-policy.spec, 1.917, 1.918
Message-ID: <20090915182613.81AB111C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4202

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-4
- Fix devicekit_disk_t to getattr on all domains sockets and fifo_files
- Conflicts seedit (You can not use selinux-policy-targeted and seedit at the same time.)



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- modules-minimum.conf	9 Sep 2009 21:08:00 -0000	1.32
+++ modules-minimum.conf	15 Sep 2009 18:26:12 -0000	1.33
@@ -521,6 +521,13 @@ finger = module
 # 
 firstboot = base
 
+# Layer: apps
+# Module: firewallgui
+#
+# policy for system-config-firewall
+# 
+firewallgui = module
+
 # Layer: services
 # Module: fprintd
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- modules-targeted.conf	9 Sep 2009 21:08:00 -0000	1.141
+++ modules-targeted.conf	15 Sep 2009 18:26:12 -0000	1.142
@@ -521,6 +521,13 @@ finger = module
 # 
 firstboot = base
 
+# Layer: apps
+# Module: firewallgui
+#
+# policy for system-config-firewall
+# 
+firewallgui = module
+
 # Layer: services
 # Module: fprintd
 #

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   15 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  317 ++++++
 policy/modules/apps/nsplugin.te           |  290 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  171 +++
 policy/modules/apps/sandbox.te            |  315 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  122 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  154 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  277 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   43 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1399 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 320 files changed, 15132 insertions(+), 2609 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- policy-F12.patch	11 Sep 2009 21:15:35 -0000	1.79
+++ policy-F12.patch	15 Sep 2009 18:26:12 -0000	1.80
@@ -10,6 +10,17 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.31/policy/flask/access_vectors
+--- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.31/policy/flask/access_vectors	2009-09-14 16:52:50.000000000 -0400
+@@ -349,6 +349,7 @@
+ 	syslog_read  
+ 	syslog_mod
+ 	syslog_console
++	request_module
+ }
+ 
+ #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.31/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
 +++ serefpolicy-3.6.31/policy/global_tunables	2009-09-09 15:38:24.000000000 -0400
@@ -251,6 +262,17 @@ diff -b -B --ignore-all-space --exclude-
  
  netutils_domtrans_ping(mrtg_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.31/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/netutils.te	2009-09-14 11:29:19.000000000 -0400
+@@ -85,6 +85,7 @@
+ 
+ miscfiles_read_localization(netutils_t)
+ 
++term_dontaudit_use_console(netutils_t)
+ userdom_use_user_terminals(netutils_t)
+ userdom_use_all_users_fds(netutils_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.31/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/admin/portage.te	2009-09-09 15:38:24.000000000 -0400
@@ -302,7 +324,7 @@ diff -b -B --ignore-all-space --exclude-
  	amanda_manage_lib(prelink_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.31/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/readahead.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/readahead.te	2009-09-14 12:53:07.000000000 -0400
 @@ -54,7 +54,10 @@
  files_dontaudit_getattr_all_sockets(readahead_t)
  files_list_non_security(readahead_t)
@@ -365,7 +387,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.31/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/rpm.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/admin/rpm.if	2009-09-14 12:43:24.000000000 -0400
 @@ -66,6 +66,11 @@
  	rpm_domtrans($1)
  	role $2 types rpm_t;
@@ -488,7 +510,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +313,29 @@
+@@ -219,7 +313,51 @@
  	')
  
  	files_search_tmp($1)
@@ -499,6 +521,28 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Create, read, write, and delete RPM
++##	 temporary files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rpm_manage_tmp_files',`
++	gen_require(`
++		type rpm_tmp_t;
++	')
++
++	files_search_tmp($1)
++	manage_dirs_pattern($1, rpm_tmp_t, rpm_tmp_t)
++	manage_files_pattern($1, rpm_tmp_t, rpm_tmp_t)
++	manage_lnk_files_pattern($1, rpm_tmp_t, rpm_tmp_t)
++')
++
++########################################
++## <summary>
 +##	read, RPM
 +##	script temporary files.
 +## </summary>
@@ -518,7 +562,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -245,6 +361,24 @@
+@@ -245,6 +383,24 @@
  
  ########################################
  ## <summary>
@@ -543,7 +587,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM package database.
  ## </summary>
  ## <param name="domain">
-@@ -283,3 +417,46 @@
+@@ -283,3 +439,46 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1227,6 +1271,87 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.fc serefpolicy-3.6.31/policy/modules/apps/firewallgui.fc
+--- nsaserefpolicy/policy/modules/apps/firewallgui.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.31/policy/modules/apps/firewallgui.fc	2009-09-14 13:14:48.000000000 -0400
+@@ -0,0 +1,3 @@
++
++/usr/share/system-config-firewall/system-config-firewall-mechanism.py	--	gen_context(system_u:object_r:firewallgui_exec_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.if serefpolicy-3.6.31/policy/modules/apps/firewallgui.if
+--- nsaserefpolicy/policy/modules/apps/firewallgui.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.31/policy/modules/apps/firewallgui.if	2009-09-14 13:14:48.000000000 -0400
+@@ -0,0 +1,3 @@
++
++## <summary>policy for firewallgui</summary>
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.te serefpolicy-3.6.31/policy/modules/apps/firewallgui.te
+--- nsaserefpolicy/policy/modules/apps/firewallgui.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.31/policy/modules/apps/firewallgui.te	2009-09-14 13:14:49.000000000 -0400
+@@ -0,0 +1,63 @@
++
++policy_module(firewallgui,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type firewallgui_t;
++type firewallgui_exec_t;
++dbus_system_domain(firewallgui_t, firewallgui_exec_t)
++
++type firewallgui_tmp_t;
++files_tmp_file(firewallgui_tmp_t)
++
++permissive firewallgui_t;
++
++########################################
++#
++# firewallgui local policy
++#
++
++allow firewallgui_t self:capability net_admin;
++
++allow firewallgui_t self:fifo_file rw_fifo_file_perms;
++
++manage_files_pattern(firewallgui_t,firewallgui_tmp_t,firewallgui_tmp_t)
++manage_dirs_pattern(firewallgui_t,firewallgui_tmp_t,firewallgui_tmp_t)
++files_tmp_filetrans(firewallgui_t,firewallgui_tmp_t, { file dir })
++
++iptables_manage_config(firewallgui_t)
++iptables_etc_filetrans_config(firewallgui_t)
++
++corecmd_exec_shell(firewallgui_t)
++corecmd_exec_bin(firewallgui_t)
++consoletype_exec(firewallgui_t)
++
++kernel_read_system_state(firewallgui_t)
++kernel_read_network_state(firewallgui_t)
++kernel_rw_net_sysctls(firewallgui_t)
++kernel_rw_kernel_sysctl(firewallgui_t)
++
++files_read_etc_files(firewallgui_t)
++files_read_usr_files(firewallgui_t)
++files_search_kernel_modules(firewallgui_t)
++files_list_kernel_modules(firewallgui_t)
++
++modutils_getattr_module_deps(firewallgui_t)
++
++dev_read_urand(firewallgui_t)
++dev_read_sysfs(firewallgui_t)
++
++nscd_dontaudit_search_pid(firewallgui_t)
++
++miscfiles_read_localization(firewallgui_t)
++
++iptables_domtrans(firewallgui_t)
++iptables_initrc_domtrans(firewallgui_t)
++
++optional_policy(`
++        policykit_dbus_chat(firewallgui_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gitosis.if serefpolicy-3.6.31/policy/modules/apps/gitosis.if
 --- nsaserefpolicy/policy/modules/apps/gitosis.if	2009-09-09 09:23:16.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/apps/gitosis.if	2009-09-09 15:38:24.000000000 -0400
@@ -1603,8 +1728,19 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.6.31/policy/modules/apps/gpg.te
 --- nsaserefpolicy/policy/modules/apps/gpg.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/apps/gpg.te	2009-09-09 15:38:24.000000000 -0400
-@@ -151,6 +151,14 @@
++++ serefpolicy-3.6.31/policy/modules/apps/gpg.te	2009-09-14 12:12:53.000000000 -0400
+@@ -110,6 +110,10 @@
+ 
+ userdom_use_user_terminals(gpg_t)
+ 
++optional_policy(`
++	cron_system_entry(gpg_t, gpg_exec_t)
++')
++
+ ########################################
+ #
+ # GPG helper local policy
+@@ -151,6 +155,14 @@
  userdom_manage_user_home_content_files(gpg_t)
  
  tunable_policy(`use_nfs_home_dirs',`
@@ -1619,13 +1755,14 @@ diff -b -B --ignore-all-space --exclude-
  	fs_manage_nfs_dirs(gpg_t)
  	fs_manage_nfs_files(gpg_t)
  ')
-@@ -256,5 +264,5 @@
+@@ -256,5 +268,6 @@
  ')
  
  optional_policy(`
 -	xserver_stream_connect(gpg_pinentry_t)
 +	xserver_common_app(gpg_pinentry_t)
  ')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.6.31/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/apps/java.fc	2009-09-09 15:38:24.000000000 -0400
@@ -2298,8 +2435,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.31/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/apps/nsplugin.if	2009-09-09 15:38:24.000000000 -0400
-@@ -0,0 +1,313 @@
++++ serefpolicy-3.6.31/policy/modules/apps/nsplugin.if	2009-09-14 12:44:05.000000000 -0400
+@@ -0,0 +1,317 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2425,6 +2562,10 @@ diff -b -B --ignore-all-space --exclude-
 +	userdom_dontaudit_setattr_user_home_content_files(nsplugin_t)
 +	userdom_manage_tmpfs_role($1, nsplugin_t)
 +
++	optional_policy(`
++		pulseaudio_role($1, nsplugin_t)
++	')
++
 +	xserver_communicate(nsplugin_t, $2)
 +')
 +
@@ -4477,7 +4618,7 @@ diff -b -B --ignore-all-space --exclude-
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.31/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/devices.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/devices.fc	2009-09-15 11:25:08.000000000 -0400
 @@ -47,8 +47,10 @@
  /dev/kmem		-c	gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
  /dev/kmsg		-c	gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh)
@@ -4497,6 +4638,15 @@ diff -b -B --ignore-all-space --exclude-
  /dev/(misc/)?rtc[0-9]*	-c	gen_context(system_u:object_r:clock_device_t,s0)
  /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
+@@ -101,7 +104,7 @@
+ /dev/usbscanner		-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ ')
+ /dev/vbi.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
+-/dev/vboxadd.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/vbox.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
+ /dev/vmmon		-c	gen_context(system_u:object_r:vmware_device_t,s0)
+ /dev/vmnet.*		-c	gen_context(system_u:object_r:vmware_device_t,s0)
+ /dev/video.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 @@ -148,6 +151,8 @@
  /dev/touchscreen/ucb1x00 -c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/touchscreen/mk712	-c	gen_context(system_u:object_r:mouse_device_t,s0)
@@ -4508,7 +4658,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.31/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/devices.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/devices.if	2009-09-15 08:13:32.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -4746,7 +4896,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.31/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/domain.if	2009-09-10 10:26:38.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/domain.if	2009-09-14 12:06:23.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -4854,7 +5004,7 @@ diff -b -B --ignore-all-space --exclude-
 +		attribute domain;
 +	')
 +
-+	dontaudit $1 domain:fifo_file getattr;
++	allow $1 domain:fifo_file getattr;
 +')
 +
 +########################################
@@ -5108,7 +5258,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.31/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/files.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/files.if	2009-09-14 12:48:12.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -6049,7 +6199,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/tty		-c	gen_context(system_u:object_r:devtty_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.6.31/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/kernel/terminal.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/kernel/terminal.if	2009-09-14 11:29:12.000000000 -0400
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -8081,8 +8231,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.31/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/services/abrt.te	2009-09-11 16:04:15.000000000 -0400
-@@ -0,0 +1,121 @@
++++ serefpolicy-3.6.31/policy/modules/services/abrt.te	2009-09-14 12:19:03.000000000 -0400
+@@ -0,0 +1,122 @@
 +
 +policy_module(abrt,1.0.0)
 +
@@ -8195,6 +8345,7 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	rpm_manage_db(abrt_t)
 +	rpm_domtrans(abrt_t)
++	rpm_signull(abrt_t)
 +')
 +
 +# to run mailx plugin
@@ -8337,7 +8488,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn/conf(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.31/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/apache.if	2009-09-10 10:32:22.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/apache.if	2009-09-14 12:08:13.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8634,12 +8785,12 @@ diff -b -B --ignore-all-space --exclude-
  
  	manage_dirs_pattern($2, httpd_user_script_exec_t, httpd_user_script_exec_t)
  	manage_files_pattern($2, httpd_user_script_exec_t, httpd_user_script_exec_t)
-@@ -503,6 +443,66 @@
+@@ -503,6 +443,67 @@
  
  ########################################
  ## <summary>
 +##	Allow the specified domain to delete
-+##	Apache cache files.
++##	Apache cache.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -8647,11 +8798,12 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`apache_delete_cache_files',`
++interface(`apache_delete_cache',`
 +	gen_require(`
 +		type httpd_cache_t;
 +	')
 +
++	delete_dirs_pattern($1, httpd_cache_t, httpd_cache_t)
 +	delete_files_pattern($1, httpd_cache_t, httpd_cache_t)
 +')
 +
@@ -8701,7 +8853,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Allow the specified domain to read
  ##	apache configuration files.
  ## </summary>
-@@ -579,7 +579,7 @@
+@@ -579,7 +580,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -8710,7 +8862,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -715,6 +715,7 @@
+@@ -715,6 +716,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -8718,7 +8870,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -782,6 +783,32 @@
+@@ -782,6 +784,32 @@
  
  ########################################
  ## <summary>
@@ -8751,7 +8903,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute all web scripts in the system
  ##	script domain.
  ## </summary>
-@@ -791,16 +818,18 @@
+@@ -791,16 +819,18 @@
  ##	</summary>
  ## </param>
  #
@@ -8774,7 +8926,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -859,6 +888,8 @@
+@@ -859,6 +889,8 @@
  ##	</summary>
  ## </param>
  #
@@ -8783,7 +8935,7 @@ diff -b -B --ignore-all-space --exclude-
  interface(`apache_run_all_scripts',`
  	gen_require(`
  		attribute httpd_exec_scripts, httpd_script_domains;
-@@ -884,7 +915,7 @@
+@@ -884,7 +916,7 @@
  		type httpd_squirrelmail_t;
  	')
  
@@ -8792,7 +8944,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1043,6 +1074,44 @@
+@@ -1043,6 +1075,44 @@
  
  ########################################
  ## <summary>
@@ -8837,7 +8989,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate an apache environment
  ## </summary>
  ## <param name="prefix">
-@@ -1072,11 +1141,17 @@
+@@ -1072,11 +1142,17 @@
  		type httpd_modules_t, httpd_lock_t;
  		type httpd_var_run_t, httpd_php_tmp_t;
  		type httpd_suexec_tmp_t, httpd_tmp_t;
@@ -8855,7 +9007,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_manage_all_content($1)
  	miscfiles_manage_public_files($1)
  
-@@ -1096,12 +1171,57 @@
+@@ -1096,12 +1172,57 @@
  
  	kernel_search_proc($1)
  	allow $1 httpd_t:dir list_dir_perms;
@@ -8916,7 +9068,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.31/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/apache.te	2009-09-11 09:48:03.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/apache.te	2009-09-14 11:32:56.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -9391,7 +9543,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 +684,22 @@
+@@ -535,6 +684,23 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -9408,13 +9560,14 @@ diff -b -B --ignore-all-space --exclude-
 +	unconfined_domain(httpd_unconfined_script_t)
 +
 +	role system_r types httpd_unconfined_script_t;
++	allow httpd_t httpd_unconfined_script_t:process signal_perms;
 +')
 +
 +
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +729,25 @@
+@@ -564,20 +730,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -9446,7 +9599,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -595,23 +765,24 @@
+@@ -595,23 +766,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)
  
@@ -9475,7 +9628,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +795,7 @@
+@@ -624,6 +796,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -9483,7 +9636,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;
-@@ -631,22 +803,30 @@
+@@ -631,22 +804,30 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -9521,7 +9674,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +852,14 @@
+@@ -672,15 +853,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -9540,7 +9693,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 +878,24 @@
+@@ -699,12 +879,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -9567,7 +9720,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +903,35 @@
+@@ -712,6 +904,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -9603,7 +9756,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 +944,10 @@
+@@ -724,6 +945,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -9614,7 +9767,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -735,6 +959,8 @@
+@@ -735,6 +960,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -9623,7 +9776,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 +980,12 @@
+@@ -754,6 +981,12 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -9636,7 +9789,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +994,74 @@
+@@ -762,3 +995,74 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')
@@ -10512,7 +10665,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/log/mcelog.*		--	gen_context(system_u:object_r:cron_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.31/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/cron.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/cron.if	2009-09-14 12:11:46.000000000 -0400
 @@ -12,6 +12,10 @@
  ## </param>
  #
@@ -10816,7 +10969,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.31/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/cron.te	2009-09-09 18:02:56.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/cron.te	2009-09-14 12:53:22.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10956,15 +11109,18 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -209,6 +239,7 @@
+@@ -207,8 +237,10 @@
+ userdom_use_unpriv_users_fds(crond_t)
+ # Not sure why this is needed
  userdom_list_user_home_dirs(crond_t)
++userdom_create_all_users_keys(crond_t)
  
  mta_send_mail(crond_t)
 +mta_system_content(cron_spool_t)
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -228,21 +259,45 @@
+@@ -228,21 +260,45 @@
  	')
  ')
  
@@ -11011,7 +11167,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -269,8 +324,8 @@
+@@ -269,8 +325,8 @@
  # System cron process domain
  #
  
@@ -11022,7 +11178,7 @@ diff -b -B --ignore-all-space --exclude-
  allow system_cronjob_t self:fifo_file rw_fifo_file_perms;
  allow system_cronjob_t self:passwd rootok;
  
-@@ -281,10 +336,17 @@
+@@ -281,10 +337,17 @@
  
  # This is to handle /var/lib/misc directory.  Used currently
  # by prelink var/lib files for cron 
@@ -11041,7 +11197,7 @@ diff -b -B --ignore-all-space --exclude-
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
  # not directly executed, crond must ensure that
-@@ -304,6 +366,7 @@
+@@ -304,6 +367,7 @@
  allow system_cronjob_t crond_t:fd use;
  allow system_cronjob_t crond_t:fifo_file rw_file_perms;
  allow system_cronjob_t crond_t:process sigchld;
@@ -11049,7 +11205,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Write /var/lock/makewhatis.lock.
  allow system_cronjob_t system_cronjob_lock_t:file manage_file_perms;
-@@ -315,9 +378,13 @@
+@@ -315,9 +379,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -11064,7 +11220,21 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -371,7 +438,8 @@
+@@ -340,6 +408,7 @@
+ dev_getattr_all_blk_files(system_cronjob_t)
+ dev_getattr_all_chr_files(system_cronjob_t)
+ dev_read_urand(system_cronjob_t)
++dev_read_sysfs(system_cronjob_t)
+ 
+ fs_getattr_all_fs(system_cronjob_t)
+ fs_getattr_all_files(system_cronjob_t)
+@@ -366,12 +435,14 @@
+ # Access other spool directories like
+ # /var/spool/anacron and /var/spool/slrnpull.
+ files_manage_generic_spool(system_cronjob_t)
++files_create_boot_flag(system_cronjob_t)
+ 
+ init_use_script_fds(system_cronjob_t)
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -11074,7 +11244,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -379,6 +447,7 @@
+@@ -379,6 +450,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -11082,7 +11252,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -388,6 +457,8 @@
+@@ -388,6 +460,8 @@
  
  ifdef(`distro_redhat', `
  	# Run the rpm program in the rpm_t domain. Allow creation of RPM log files
@@ -11091,15 +11261,15 @@ diff -b -B --ignore-all-space --exclude-
  	# via redirection of standard out.
  	optional_policy(`
  		rpm_manage_log(system_cronjob_t)
-@@ -412,6 +483,7 @@
+@@ -412,6 +486,7 @@
  	apache_read_config(system_cronjob_t)
  	apache_read_log(system_cronjob_t)
  	apache_read_sys_content(system_cronjob_t)
-+	apache_delete_cache_files(system_cronjob_t)
++	apache_delete_cache(system_cronjob_t)
  ')
  
  optional_policy(`
-@@ -419,6 +491,14 @@
+@@ -419,6 +494,14 @@
  ')
  
  optional_policy(`
@@ -11114,7 +11284,7 @@ diff -b -B --ignore-all-space --exclude-
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -429,11 +509,20 @@
+@@ -429,11 +512,20 @@
  ')
  
  optional_policy(`
@@ -11135,7 +11305,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -445,9 +534,11 @@
+@@ -445,9 +537,11 @@
  ')	
  
  optional_policy(`
@@ -11149,7 +11319,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -461,8 +552,8 @@
+@@ -461,8 +555,8 @@
  ')
  
  optional_policy(`
@@ -11160,7 +11330,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -470,24 +561,17 @@
+@@ -470,24 +564,17 @@
  ')
  
  optional_policy(`
@@ -11188,7 +11358,7 @@ diff -b -B --ignore-all-space --exclude-
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -571,6 +655,9 @@
+@@ -571,6 +658,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -11198,7 +11368,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`fcron_crond', `
  	allow crond_t user_cron_spool_t:file manage_file_perms;
  ')
-@@ -590,13 +677,5 @@
+@@ -590,13 +680,5 @@
  #
  
  optional_policy(`
@@ -11658,7 +11828,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 devicekit_t:process { ptrace signal_perms getattr };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.31/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/devicekit.te	2009-09-10 10:27:07.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/devicekit.te	2009-09-14 12:14:36.000000000 -0400
 @@ -36,12 +36,15 @@
  manage_dirs_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
  manage_files_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
@@ -11698,15 +11868,18 @@ diff -b -B --ignore-all-space --exclude-
  kernel_setsched(devicekit_disk_t)
  
  corecmd_exec_bin(devicekit_disk_t)
-@@ -79,21 +87,31 @@
+@@ -79,21 +87,34 @@
  dev_rw_sysfs(devicekit_disk_t)
  dev_read_urand(devicekit_disk_t)
  dev_getattr_usbfs_dirs(devicekit_disk_t)
 +dev_manage_generic_files(devicekit_disk_t)
-+
-+domain_read_all_domains_state(devicekit_disk_t)
-+domain_getattr_all_stream_sockets(devicekit_disk_t)
++dev_getattr_all_chr_files(devicekit_disk_t)
  
++domain_read_all_domains_state(devicekit_disk_t)
++domain_getattr_all_sockets(devicekit_disk_t)
++domain_getattr_all_pipes(devicekit_disk_t)
++
++files_getattr_all_sockets(devicekit_disk_t)
 +files_getattr_all_mountpoints(devicekit_disk_t)
 +files_getattr_all_files(devicekit_disk_t)
  files_manage_mnt_dirs(devicekit_disk_t)
@@ -11731,7 +11904,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(devicekit_disk_t)
  
  miscfiles_read_localization(devicekit_disk_t)
-@@ -110,6 +128,7 @@
+@@ -110,6 +131,7 @@
  ')
  
  optional_policy(`
@@ -11739,7 +11912,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(devicekit_disk_t)
  	policykit_read_lib(devicekit_disk_t)
  	policykit_read_reload(devicekit_disk_t)
-@@ -134,14 +153,22 @@
+@@ -134,14 +156,22 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
@@ -11756,14 +11929,14 @@ diff -b -B --ignore-all-space --exclude-
  #
  
 -allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace };
-+allow devicekit_power_t self:capability { dac_override net_admin sys_tty_config sys_nice sys_ptrace };
++allow devicekit_power_t self:capability { dac_override net_admin sys_admin sys_tty_config sys_nice sys_ptrace };
  allow devicekit_power_t self:fifo_file rw_fifo_file_perms;
  allow devicekit_power_t self:unix_dgram_socket create_socket_perms;
 +allow devicekit_power_t self:netlink_kobject_uevent_socket create_socket_perms;
  
  manage_dirs_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
  manage_files_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
-@@ -151,6 +178,7 @@
+@@ -151,6 +181,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -11771,7 +11944,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +187,7 @@
+@@ -159,6 +190,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -11779,7 +11952,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_rw_generic_usb_dev(devicekit_power_t)
  dev_rw_netcontrol(devicekit_power_t)
  dev_rw_sysfs(devicekit_power_t)
-@@ -167,12 +196,17 @@
+@@ -167,12 +199,17 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -11797,7 +11970,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_all_users_state(devicekit_power_t)
  
  optional_policy(`
-@@ -180,8 +214,11 @@
+@@ -180,8 +217,11 @@
  ')
  
  optional_policy(`
@@ -11810,7 +11983,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +240,23 @@
+@@ -203,17 +243,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -11901,6 +12074,17 @@ diff -b -B --ignore-all-space --exclude-
  	spamassassin_exec(exim_t)
  	spamassassin_exec_client(exim_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.6.31/policy/modules/services/fail2ban.te
+--- nsaserefpolicy/policy/modules/services/fail2ban.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/fail2ban.te	2009-09-15 11:24:45.000000000 -0400
+@@ -33,6 +33,7 @@
+ allow fail2ban_t self:process signal;
+ allow fail2ban_t self:fifo_file rw_fifo_file_perms;
+ allow fail2ban_t self:unix_stream_socket { connectto create_stream_socket_perms };
++allow fail2ban_t self:unix_dgram_socket create_socket_perms;
+ allow fail2ban_t self:tcp_socket create_stream_socket_perms;
+ 
+ # log files
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.6.31/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/services/fetchmail.te	2009-09-09 15:38:24.000000000 -0400
@@ -12498,8 +12682,13 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(inetd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-3.6.31/policy/modules/services/irqbalance.te
 --- nsaserefpolicy/policy/modules/services/irqbalance.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/irqbalance.te	2009-09-10 11:10:00.000000000 -0400
-@@ -22,7 +22,7 @@
++++ serefpolicy-3.6.31/policy/modules/services/irqbalance.te	2009-09-14 11:37:06.000000000 -0400
+@@ -18,11 +18,11 @@
+ # Local policy
+ #
+ 
+-allow irqbalance_t self:capability net_admin;
++allow irqbalance_t self:capability { setpcap net_admin };
  allow irqbalance_t self:udp_socket create_socket_perms;
  
  dontaudit irqbalance_t self:capability sys_tty_config;
@@ -13884,8 +14073,8 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.6.31/policy/modules/services/nx.if
 --- nsaserefpolicy/policy/modules/services/nx.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/nx.if	2009-09-09 15:38:24.000000000 -0400
-@@ -17,3 +17,21 @@
++++ serefpolicy-3.6.31/policy/modules/services/nx.if	2009-09-14 13:19:13.000000000 -0400
+@@ -17,3 +17,22 @@
  
  	spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
  ')
@@ -13906,6 +14095,7 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	read_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
++	read_lnk_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.te serefpolicy-3.6.31/policy/modules/services/nx.te
 --- nsaserefpolicy/policy/modules/services/nx.te	2009-08-14 16:14:31.000000000 -0400
@@ -17256,7 +17446,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/share/setroubleshoot/SetroubleshootFixit\.py* 	--	gen_context(system_u:object_r:setroubleshoot_fixit_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.6.31/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/setroubleshoot.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/setroubleshoot.if	2009-09-14 12:25:32.000000000 -0400
 @@ -16,8 +16,8 @@
  	')
  
@@ -17356,14 +17546,14 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.31/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/setroubleshoot.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/setroubleshoot.te	2009-09-14 12:26:18.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
  
-+	type setroubleshoot_fixit_t;
-+	type setroubleshoot_fixit_exec_t;
-+	dbus_system_domain(setroubleshoot_fixit_t, setroubleshoot_fixit_exec_t)
++type setroubleshoot_fixit_t;
++type setroubleshoot_fixit_exec_t;
++dbus_system_domain(setroubleshoot_fixit_t, setroubleshoot_fixit_exec_t)
 +
  ########################################
  #
@@ -17372,10 +17562,10 @@ diff -b -B --ignore-all-space --exclude-
  
 -allow setroubleshootd_t self:capability { dac_override sys_tty_config };
 -allow setroubleshootd_t self:process { signull signal getattr getsched };
-+	allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
-+	allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
++allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
++allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
 +# if bad library causes setroubleshoot to require these, we want to give it so setroubleshoot can continue to run
-+	allow setroubleshootd_t self:process { execmem execstack };
++allow setroubleshootd_t self:process { execmem execstack };
  allow setroubleshootd_t self:fifo_file rw_fifo_file_perms;
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -17418,7 +17608,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,73 @@
+@@ -94,23 +113,74 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -17455,35 +17645,36 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# setroubleshoot_fixit local policy
 +#
-+	allow setroubleshoot_fixit_t self:capability sys_nice;
-+	allow setroubleshoot_fixit_t self:process { setsched getsched };
-+	allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
-+	allow setroubleshoot_fixit_t self:unix_dgram_socket create_socket_perms;
++allow setroubleshoot_fixit_t self:capability sys_nice;
++allow setroubleshoot_fixit_t self:process { setsched getsched };
++allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
++allow setroubleshoot_fixit_t self:unix_dgram_socket create_socket_perms;
 +
-+	setroubleshoot_dbus_chat(setroubleshoot_fixit_t)
++setroubleshoot_dbus_chat(setroubleshoot_fixit_t)
++setroubleshoot_stream_connect(setroubleshoot_fixit_t)
 +
-+	corecmd_exec_bin(setroubleshoot_fixit_t)
-+	corecmd_exec_shell(setroubleshoot_fixit_t)
++corecmd_exec_bin(setroubleshoot_fixit_t)
++corecmd_exec_shell(setroubleshoot_fixit_t)
 +
-+	seutil_domtrans_restorecon(setroubleshoot_fixit_t)
++seutil_domtrans_restorecon(setroubleshoot_fixit_t)
 +
-+	files_read_usr_files(setroubleshoot_fixit_t)
-+	files_read_etc_files(setroubleshoot_fixit_t)
-+	files_list_tmp(setroubleshoot_fixit_t)
++files_read_usr_files(setroubleshoot_fixit_t)
++files_read_etc_files(setroubleshoot_fixit_t)
++files_list_tmp(setroubleshoot_fixit_t)
 +
-+	kernel_read_system_state(setroubleshoot_fixit_t)
++kernel_read_system_state(setroubleshoot_fixit_t)
 +
-+	auth_use_nsswitch(setroubleshoot_fixit_t)
++auth_use_nsswitch(setroubleshoot_fixit_t)
 +
-+	logging_send_audit_msgs(setroubleshoot_fixit_t)
-+	logging_send_syslog_msg(setroubleshoot_fixit_t)
++logging_send_audit_msgs(setroubleshoot_fixit_t)
++logging_send_syslog_msg(setroubleshoot_fixit_t)
 +
-+	miscfiles_read_localization(setroubleshoot_fixit_t)
++miscfiles_read_localization(setroubleshoot_fixit_t)
 +
-+	userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
++userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
 +
-+	optional_policy(`
-+		rpm_signull(setroubleshoot_fixit_t)
++optional_policy(`
++	rpm_signull(setroubleshoot_fixit_t)
 +	rpm_read_db(setroubleshoot_fixit_t)
 +	rpm_dontaudit_manage_db(setroubleshoot_fixit_t)
 +	rpm_use_script_fds(setroubleshoot_fixit_t)
@@ -17590,7 +17781,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/spool/MIMEDefang(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.6.31/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/spamassassin.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/spamassassin.if	2009-09-15 08:26:58.000000000 -0400
 @@ -111,6 +111,27 @@
  	')
  
@@ -17619,15 +17810,17 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -166,6 +187,7 @@
+@@ -166,7 +187,9 @@
  	')
  
  	files_search_var_lib($1)
 +	list_dirs_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
  	read_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
++	read_lnk_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
  ')
  
-@@ -225,3 +247,69 @@
+ ########################################
+@@ -225,3 +248,69 @@
  
  	dontaudit $1 spamd_tmp_t:sock_file getattr;
  ')
@@ -17699,7 +17892,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.31/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/spamassassin.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/spamassassin.te	2009-09-15 08:27:19.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -17901,12 +18094,13 @@ diff -b -B --ignore-all-space --exclude-
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -316,10 +396,11 @@
+@@ -316,10 +396,12 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
 -read_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
 +manage_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
++manage_lnk_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
  
  manage_dirs_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
  manage_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
@@ -17914,7 +18108,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -369,22 +450,27 @@
+@@ -369,22 +451,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -17946,7 +18140,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -402,23 +488,16 @@
+@@ -402,23 +489,16 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -17971,7 +18165,7 @@ diff -b -B --ignore-all-space --exclude-
  	postfix_read_config(spamd_t)
  ')
  
-@@ -433,6 +512,10 @@
+@@ -433,6 +513,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -17982,7 +18176,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -445,5 +528,9 @@
+@@ -445,5 +529,9 @@
  ')
  
  optional_policy(`
@@ -18875,7 +19069,7 @@ 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.31/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-11 10:18:49.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-14 13:14:55.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -18990,7 +19184,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,30 +156,54 @@
+@@ -97,30 +156,55 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -19024,6 +19218,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_usr_src_files(virtd_t)
 +	
 +# Manages /etc/sysconfig/system-config-firewall
++iptables_manage_config(virtd_t)
 +files_manage_etc_files(virtd_t)
 +
 +modutils_read_module_deps(virtd_t)
@@ -19048,7 +19243,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -130,7 +213,14 @@
+@@ -130,7 +214,14 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -19063,7 +19258,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +258,35 @@
+@@ -168,22 +259,35 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -19104,7 +19299,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +299,159 @@
+@@ -196,8 +300,159 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -21521,7 +21716,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.31/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/init.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/init.te	2009-09-15 08:13:39.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -21664,7 +21859,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
-@@ -272,16 +315,62 @@
+@@ -272,16 +315,63 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -21683,6 +21878,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_delete_generic_symlinks(initrc_t)
 +dev_getattr_all_blk_files(initrc_t)
 +dev_getattr_all_chr_files(initrc_t)
++dev_rw_xserver_misc(initrc_t)
 +
 +fs_list_inotifyfs(initrc_t)
 +fs_register_binary_executable_type(initrc_t)
@@ -21728,7 +21924,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_kill_all_domains(initrc_t)
  domain_signal_all_domains(initrc_t)
-@@ -291,7 +380,7 @@
+@@ -291,7 +381,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -21737,7 +21933,7 @@ diff -b -B --ignore-all-space --exclude-
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -306,14 +395,15 @@
+@@ -306,14 +396,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -21755,7 +21951,7 @@ diff -b -B --ignore-all-space --exclude-
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -324,48 +414,16 @@
+@@ -324,48 +415,16 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -21808,7 +22004,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -374,19 +432,22 @@
+@@ -374,19 +433,22 @@
  
  miscfiles_read_localization(initrc_t)
  # slapd needs to read cert files from its initscript
@@ -21832,7 +22028,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_debian',`
  	dev_setattr_generic_dirs(initrc_t)
  
-@@ -422,8 +483,6 @@
+@@ -422,8 +484,6 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -21841,7 +22037,7 @@ diff -b -B --ignore-all-space --exclude-
  	# for integrated run_init to read run_init_type.
  	# happens during boot (/sbin/rc execs init scripts)
  	seutil_read_default_contexts(initrc_t)
-@@ -450,11 +509,9 @@
+@@ -450,11 +510,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -21854,7 +22050,7 @@ diff -b -B --ignore-all-space --exclude-
  	# These seem to be from the initrd
  	# during device initialization:
  	dev_create_generic_dirs(initrc_t)
-@@ -464,6 +521,7 @@
+@@ -464,6 +522,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -21862,7 +22058,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -492,11 +550,17 @@
+@@ -492,11 +551,17 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
@@ -21880,7 +22076,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -515,6 +579,33 @@
+@@ -515,6 +580,33 @@
  	')
  ')
  
@@ -21914,7 +22110,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -567,10 +658,19 @@
+@@ -567,10 +659,19 @@
  	dbus_connect_system_bus(initrc_t)
  	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
@@ -21934,7 +22130,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -590,6 +690,10 @@
+@@ -590,6 +691,10 @@
  ')
  
  optional_policy(`
@@ -21945,7 +22141,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +750,20 @@
+@@ -646,20 +751,20 @@
  ')
  
  optional_policy(`
@@ -21972,7 +22168,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +772,7 @@
+@@ -668,6 +773,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -21980,7 +22176,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -696,7 +801,6 @@
+@@ -696,7 +802,6 @@
  ')
  
  optional_policy(`
@@ -21988,7 +22184,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -718,8 +822,6 @@
+@@ -718,8 +823,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -21997,7 +22193,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -732,13 +834,16 @@
+@@ -732,13 +835,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -22014,7 +22210,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -747,6 +852,7 @@
+@@ -747,6 +853,7 @@
  
  optional_policy(`
  	udev_rw_db(initrc_t)
@@ -22022,7 +22218,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -754,6 +860,15 @@
+@@ -754,6 +861,15 @@
  ')
  
  optional_policy(`
@@ -22038,7 +22234,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +879,13 @@
+@@ -764,6 +880,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -22052,7 +22248,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +911,31 @@
+@@ -789,3 +912,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -22294,9 +22490,15 @@ diff -b -B --ignore-all-space --exclude-
  ipsec_setcontext_default_spd(setkey_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.31/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/iptables.fc	2009-09-09 15:38:24.000000000 -0400
-@@ -1,7 +1,10 @@
++++ serefpolicy-3.6.31/policy/modules/system/iptables.fc	2009-09-14 13:14:55.000000000 -0400
+@@ -1,7 +1,16 @@
 -/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++
++/etc/rc\.d/init\.d/ip6?tables           --      gen_context(system_u:object_r:iptables_initrc_exec_t,s0)
++
++/etc/sysconfig/ip6?tables.*             --      gen_context(system_u:object_r:iptables_conf_t,s0)
++/etc/sysconfig/system-config-firewall.* --      gen_context(system_u:object_r:iptables_conf_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)
@@ -22310,10 +22512,144 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/iptables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 +/usr/sbin/iptables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.if serefpolicy-3.6.31/policy/modules/system/iptables.if
+--- nsaserefpolicy/policy/modules/system/iptables.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/iptables.if	2009-09-14 13:14:55.000000000 -0400
+@@ -19,6 +19,24 @@
+ 	domtrans_pattern($1, iptables_exec_t, iptables_t)
+ ')
+ 
++#####################################
++## <summary>
++##      Execute iptables in the iptables domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`iptables_initrc_domtrans',`
++        gen_require(`
++                type iptables_initrc_exec_t;
++        ')
++
++        init_labeled_script_domtrans($1, iptables_initrc_exec_t)
++')
++
+ ########################################
+ ## <summary>
+ ##	Execute iptables in the iptables domain, and
+@@ -69,3 +87,82 @@
+ 	corecmd_search_bin($1)
+ 	can_exec($1, iptables_exec_t)
+ ')
++
++#####################################
++## <summary>
++##      Set the attributes of iptables config files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`iptables_setattr_config',`
++        gen_require(`
++                type iptables_conf_t;
++        ')
++
++        files_search_etc($1)
++        allow $1 iptables_conf_t:file setattr;
++')
++
++#####################################
++## <summary>
++##      Read iptables config files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`iptables_read_config',`
++        gen_require(`
++                type iptables_conf_t;
++        ')
++
++        files_search_etc($1)
++        allow $1 iptables_conf_t:dir list_dir_perms;
++        read_files_pattern($1, iptables_conf_t, iptables_conf_t)
++')
++
++#####################################
++## <summary>
++##      Create files in /etc with the type used for
++##      the iptables config files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`iptables_etc_filetrans_config',`
++        gen_require(`
++                type iptables_conf_t;
++        ')
++
++        files_etc_filetrans($1, iptables_conf_t, file)
++')
++
++###################################
++## <summary>
++##      Manage iptables config files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`iptables_manage_config',`
++        gen_require(`
++                type iptables_conf_t;
++                type etc_t;
++        ')
++
++        files_search_etc($1)
++        manage_files_pattern($1, iptables_conf_t, iptables_conf_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.31/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/iptables.te	2009-09-09 15:38:24.000000000 -0400
-@@ -53,6 +53,7 @@
++++ serefpolicy-3.6.31/policy/modules/system/iptables.te	2009-09-14 13:14:55.000000000 -0400
+@@ -11,6 +11,12 @@
+ init_system_domain(iptables_t, iptables_exec_t)
+ role system_r types iptables_t;
+ 
++type iptables_initrc_exec_t;
++init_script_file(iptables_initrc_exec_t)
++
++type iptables_conf_t;
++files_config_file(iptables_conf_t)
++
+ type iptables_tmp_t;
+ files_tmp_file(iptables_tmp_t)
+ 
+@@ -27,6 +33,9 @@
+ allow iptables_t self:process { sigchld sigkill sigstop signull signal };
+ allow iptables_t self:rawip_socket create_socket_perms;
+ 
++manage_files_pattern(iptables_t, iptables_conf_t, iptables_conf_t)
++files_etc_filetrans(iptables_t, iptables_conf_t, file)
++
+ manage_files_pattern(iptables_t, iptables_var_run_t, iptables_var_run_t)
+ files_pid_filetrans(iptables_t, iptables_var_run_t, file)
+ 
+@@ -53,6 +62,7 @@
  mls_file_read_all_levels(iptables_t)
  
  term_dontaudit_use_console(iptables_t)
@@ -22321,7 +22657,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(iptables_t)
  
-@@ -100,6 +101,10 @@
+@@ -100,6 +110,10 @@
  ')
  
  optional_policy(`
@@ -23129,8 +23465,33 @@ diff -b -B --ignore-all-space --exclude-
  # gentoo init scripts still manage this file
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.6.31/policy/modules/system/modutils.if
 --- nsaserefpolicy/policy/modules/system/modutils.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/modutils.if	2009-09-11 10:18:38.000000000 -0400
-@@ -41,8 +41,8 @@
++++ serefpolicy-3.6.31/policy/modules/system/modutils.if	2009-09-14 13:14:55.000000000 -0400
+@@ -1,5 +1,24 @@
+ ## <summary>Policy for kernel module utilities</summary>
+ 
++######################################
++## <summary>
++##      Getattr the dependencies of kernel modules.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`modutils_getattr_module_deps',`
++        gen_require(`
++                type modules_dep_t;
++        ')
++
++
++        getattr_files_pattern($1,modules_object_t,modules_dep_t)
++')
++
+ ########################################
+ ## <summary>
+ ##	Read the dependencies of kernel modules.
+@@ -41,8 +60,8 @@
  	files_search_etc($1)
  	files_search_boot($1)
  
@@ -23141,7 +23502,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -61,7 +61,7 @@
+@@ -61,7 +80,7 @@
  		type modules_conf_t;
  	')
  
@@ -23150,7 +23511,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -80,7 +80,26 @@
+@@ -80,7 +99,26 @@
  		type modules_conf_t;
  	')
  
@@ -23180,7 +23541,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.31/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/modutils.te	2009-09-09 15:47:14.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/modutils.te	2009-09-14 13:14:55.000000000 -0400
 @@ -19,6 +19,7 @@
  type insmod_exec_t;
  application_domain(insmod_t, insmod_exec_t)
@@ -23189,6 +23550,15 @@ diff -b -B --ignore-all-space --exclude-
  role system_r types insmod_t;
  
  # module loading config
+@@ -45,7 +46,7 @@
+ can_exec(depmod_t, depmod_exec_t)
+ 
+ # Read conf.modules.
+-allow depmod_t modules_conf_t:file read_file_perms;
++read_files_pattern(depmod_t, modules_conf_t, modules_conf_t)
+ 
+ allow depmod_t modules_dep_t:file manage_file_perms;
+ files_kernel_modules_filetrans(depmod_t, modules_dep_t, file)
 @@ -56,6 +57,7 @@
  
  domain_use_interactive_fds(depmod_t)
@@ -23211,7 +23581,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -91,7 +99,7 @@
+@@ -91,19 +99,21 @@
  # insmod local policy
  #
  
@@ -23220,7 +23590,14 @@ diff -b -B --ignore-all-space --exclude-
  allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal };
  
  allow insmod_t self:udp_socket create_socket_perms; 
-@@ -104,6 +112,7 @@
+ allow insmod_t self:rawip_socket create_socket_perms; 
+ 
+ # Read module config and dependency information
+-allow insmod_t { modules_conf_t modules_dep_t }:file read_file_perms;
++read_files_pattern(insmod_t, modules_conf_t, modules_conf_t)
++read_files_pattern(insmod_t, modules_dep_t, modules_dep_t)
+ 
+ can_exec(insmod_t, insmod_exec_t)
  
  kernel_load_module(insmod_t)
  kernel_read_system_state(insmod_t)
@@ -23228,7 +23605,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_write_proc_files(insmod_t)
  kernel_mount_debugfs(insmod_t)
  kernel_mount_kvmfs(insmod_t)
-@@ -112,6 +121,7 @@
+@@ -112,6 +122,7 @@
  kernel_read_kernel_sysctls(insmod_t)
  kernel_rw_kernel_sysctl(insmod_t)
  kernel_read_hotplug_sysctls(insmod_t)
@@ -23236,7 +23613,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(insmod_t)
  corecmd_exec_shell(insmod_t)
-@@ -124,9 +134,7 @@
+@@ -124,9 +135,7 @@
  dev_read_sound(insmod_t)
  dev_write_sound(insmod_t)
  dev_rw_apm_bios(insmod_t)
@@ -23247,7 +23624,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_signal_all_domains(insmod_t)
  domain_use_interactive_fds(insmod_t)
-@@ -144,11 +152,14 @@
+@@ -144,11 +153,14 @@
  files_write_kernel_modules(insmod_t)
  
  fs_getattr_xattr_fs(insmod_t)
@@ -23262,7 +23639,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(insmod_t)
  logging_search_logs(insmod_t)
-@@ -157,19 +168,30 @@
+@@ -157,19 +169,30 @@
  
  seutil_read_file_contexts(insmod_t)
  
@@ -23296,6 +23673,15 @@ diff -b -B --ignore-all-space --exclude-
  	hotplug_search_config(insmod_t)
  ')
  
+@@ -228,7 +251,7 @@
+ can_exec(update_modules_t, update_modules_exec_t)
+ 
+ # manage module loading configuration
+-allow update_modules_t modules_conf_t:file manage_file_perms;
++manage_files_pattern(update_modules_t, modules_conf_t, modules_conf_t)
+ files_kernel_modules_filetrans(update_modules_t, modules_conf_t, file)
+ files_etc_filetrans(update_modules_t, modules_conf_t, file)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.6.31/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/system/mount.fc	2009-09-09 15:38:24.000000000 -0400
@@ -24923,7 +25309,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.31/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/unconfined.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/unconfined.if	2009-09-14 09:54:34.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -24994,17 +25380,15 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -111,16 +122,17 @@
+@@ -111,16 +122,16 @@
  ## </param>
  #
  interface(`unconfined_domain',`
--	unconfined_domain_noaudit($1)
 +	gen_require(`
 +		attribute unconfined_services;
 +	')	
 +
-+	#		unconfined_domain_noaudit($1)
-+	permissive $1;
+ 	unconfined_domain_noaudit($1)
  
  	tunable_policy(`allow_execheap',`
  		auditallow $1 self:process execheap;
@@ -25017,7 +25401,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -173,411 +185,3 @@
+@@ -173,411 +184,3 @@
  	refpolicywarn(`$0($1) has been deprecated.')
  ')
  
@@ -25676,7 +26060,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.31/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/userdomain.if	2009-09-09 17:50:51.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/userdomain.if	2009-09-14 12:43:18.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.917
retrieving revision 1.918
diff -u -p -r1.917 -r1.918
--- selinux-policy.spec	11 Sep 2009 21:15:35 -0000	1.917
+++ selinux-policy.spec	15 Sep 2009 18:26:13 -0000	1.918
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.31
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -304,6 +304,7 @@ Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
 Conflicts:  audispd-plugins <= 1.7.7-1
 Obsoletes: mod_fcgid-selinux
+Conflicts:  seedit
 
 %description targeted
 SELinux Reference policy targeted base module.
@@ -355,6 +356,7 @@ Group: System Environment/Base
 Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Conflicts:  seedit
 
 %description minimum
 SELinux Reference policy minimum base module.
@@ -388,6 +390,7 @@ Provides: selinux-policy-base
 Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Conflicts:  seedit
 
 %description olpc 
 SELinux Reference policy olpc base module.
@@ -419,6 +422,7 @@ Requires: policycoreutils-newrole >= %{P
 Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Conflicts:  seedit
 
 %description mls 
 SELinux Reference policy mls base module.
@@ -443,6 +447,11 @@ exit 0
 %endif
 
 %changelog
+* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-4
+- Fix devicekit_disk_t to getattr on all domains sockets and fifo_files
+- Conflicts seedit (You can not use selinux-policy-targeted and seedit at the same time.)
+
+
 * Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-3
 - Add wordpress/wp-content/uploads label
 - Fixes for sandbox when run from staff_t



From mitr at fedoraproject.org  Tue Sep 15 18:34:48 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 15 Sep 2009 18:34:48 +0000 (UTC)
Subject: rpms/mlocate/devel .cvsignore, 1.13, 1.14 mlocate.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <20090915183448.E37D711C00CE@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/mlocate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6994

Modified Files:
	.cvsignore mlocate.spec sources 
Log Message:
* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.1-1
- Update to mlocate-0.22.1
- Drop Provides: slocate, per NamingGuidelines



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Apr 2009 10:36:51 -0000	1.13
+++ .cvsignore	15 Sep 2009 18:34:48 -0000	1.14
@@ -1 +1 @@
-mlocate-0.22.tar.bz2
+mlocate-0.22.1.tar.bz2


Index: mlocate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mlocate.spec	25 Jul 2009 14:38:00 -0000	1.25
+++ mlocate.spec	15 Sep 2009 18:34:48 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
-Version: 0.22
-Release: 3
+Version: 0.22.1
+Release: 1
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
 Group: Applications/System
@@ -13,7 +13,6 @@ Requires(pre): shadow-utils
 Requires(triggerpostun): shadow-utils
 Requires(post): grep, sed
 Obsoletes: slocate <= 2.7-30
-Provides: slocate
 
 %description
 mlocate is a locate/updatedb implementation.  It keeps a database of
@@ -70,6 +69,10 @@ exit 0
 %ghost %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
+* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.1-1
+- Update to mlocate-0.22.1
+- Drop Provides: slocate, per NamingGuidelines
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Apr 2009 10:36:52 -0000	1.13
+++ sources	15 Sep 2009 18:34:48 -0000	1.14
@@ -1 +1 @@
-ffd78b6ff967a8ae9f4780f6a9a95e68  mlocate-0.22.tar.bz2
+f62b5d072ac3d73a4bf161af696db6bf  mlocate-0.22.1.tar.bz2



From s4504kr at fedoraproject.org  Tue Sep 15 18:48:42 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 15 Sep 2009 18:48:42 +0000 (UTC)
Subject: rpms/blender/EL-5 blender.spec,1.45,1.46
Message-ID: <20090915184842.B847D11C00CE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11894

Modified Files:
	blender.spec 
Log Message:
Building agains glew system library


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/EL-5/blender.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- blender.spec	27 Dec 2008 11:53:32 -0000	1.45
+++ blender.spec	15 Sep 2009 18:48:42 -0000	1.46
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.45
-Release: 	17%{?dist}
+Release: 	18%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -58,6 +58,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
+BuildRequires: glew-devel
 
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
@@ -93,6 +94,8 @@ PYVER=$(%{__python} -c "import sys ; pri
 sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
 	 <%{SOURCE7} >user-config.py
 
+rm -rf extern/glew
+
 %build
 scons %{?_smp_mflags} blenderplayer BF_QUIET=0
 
@@ -184,10 +187,13 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
-* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.45-17
+* Wed Sep  9 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.45-18
+- Building agains new glew system library
+
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> 2.45-17
 - Fix optflags use, this time for real
 
-* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.45-16
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> 2.45-16
 - Use proper compiler flags (see #199418)
 - Minor grammar & language fixes and tidy-ups
 



From cebbert at fedoraproject.org  Tue Sep 15 18:53:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 15 Sep 2009 18:53:54 +0000 (UTC)
Subject: rpms/kernel/F-12 Makefile,1.108,1.109 kernel.spec,1.1801,1.1802
Message-ID: <20090915185354.A098111C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13461

Modified Files:
	Makefile kernel.spec 
Log Message:
Add unused-kernel-patches Make target, change some patches to
  use ApplyOptionalPatch


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/Makefile,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- Makefile	27 Jul 2009 17:42:03 -0000	1.108
+++ Makefile	15 Sep 2009 18:53:54 -0000	1.109
@@ -136,6 +136,9 @@ reconfig:
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
 	@$(MAKE) tag TAG_OPTS="-F $(TAG_OPTS)"
 
+unused-kernel-patches:
+	@for f in *.patch; do if [ -e $$f ]; then (egrep -q "^Patch[[:digit:]]+:[[:space:]]+$$f" $(SPECFILE) || echo "Unused:    $$f") && egrep -q "^ApplyPatch[[:space:]]+$$f|^ApplyOptionalPatch[[:space:]]+$$f" $(SPECFILE) || echo "Unapplied: $$f"; fi; done
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1801
retrieving revision 1.1802
diff -u -p -r1.1801 -r1.1802
--- kernel.spec	15 Sep 2009 09:52:51 -0000	1.1801
+++ kernel.spec	15 Sep 2009 18:53:54 -0000	1.1802
@@ -1150,8 +1150,8 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-#ApplyPatch git-cpufreq.patch
-#ApplyPatch git-bluetooth.patch
+ApplyOptionalPatch git-cpufreq.patch
+#ApplyOptionalPatch git-bluetooth.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -2040,6 +2040,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com>
+- Add unused-kernel-patches Make target, change some patches to
+  use ApplyOptionalPatch
+
 * Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs
 



From dledford at fedoraproject.org  Tue Sep 15 19:03:58 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Tue, 15 Sep 2009 19:03:58 +0000 (UTC)
Subject: rpms/mdadm/devel mdadm-3.0-metadata.patch, NONE,
	1.1 mdadm-3.0-uuid.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 mdadm.spec, 1.72, 1.73 sources, 1.24, 1.25
Message-ID: <20090915190358.AD55811C00CE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16392

Modified Files:
	.cvsignore mdadm.spec sources 
Added Files:
	mdadm-3.0-metadata.patch mdadm-3.0-uuid.patch 
Log Message:
* Tue Sep 15 2009 Doug Ledford <dledford at redhat.com> - 3.0-3
- Update to current head of upstream git repo for various imsm related fixes
  (fixes bz523262)
- Fix display of metadata version in output of Detail mode
- Add UUID output to --detail --export (bz523314)


mdadm-3.0-metadata.patch:
 Detail.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mdadm-3.0-metadata.patch ---
--- mdadm-3.0/Detail.c.metadata	2009-09-11 02:10:24.000000000 -0400
+++ mdadm-3.0/Detail.c	2009-09-15 14:54:56.849391192 -0400
@@ -161,7 +161,7 @@
 			if (sra && sra->array.major_version < 0)
 				printf("MD_METADATA=%s\n", sra->text_version);
 			else
-				printf("MD_METADATA=%d.%02d\n",
+				printf("MD_METADATA=%d.%d\n",
 				       array.major_version, array.minor_version);
 		}
 		
@@ -208,7 +208,7 @@
 			if (sra && sra->array.major_version < 0)
 				printf(" metadata=%s", sra->text_version);
 			else
-				printf(" metadata=%d.%02d",
+				printf(" metadata=%d.%d",
 				       array.major_version, array.minor_version);
 		}
 
@@ -241,7 +241,7 @@
 		if (sra && sra->array.major_version < 0)
 			printf("        Version : %s\n", sra->text_version);
 		else
-			printf("        Version : %d.%02d\n",
+			printf("        Version : %d.%d\n",
 			       array.major_version, array.minor_version);
 		}
 

mdadm-3.0-uuid.patch:
 Detail.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE mdadm-3.0-uuid.patch ---
diff -up mdadm-3.0/Detail.c~ mdadm-3.0/Detail.c
--- mdadm-3.0/Detail.c~	2009-06-02 07:48:29.000000000 +0200
+++ mdadm-3.0/Detail.c	2009-09-14 17:11:15.000000000 +0200
@@ -185,6 +185,11 @@ int Detail(char *dev, int brief, int exp
 			if (mp && mp->path &&
 			    strncmp(mp->path, "/dev/md/", 8) == 0)
 				printf("MD_DEVNAME=%s\n", mp->path+8);
+                        if (mp && (mp->uuid[0] || mp->uuid[1] || mp->uuid[2] ||
+                                   mp->uuid[3]))
+                                printf("MD_UUID=%08x:%08x:%08x:%08x\n",
+                                        mp->uuid[0], mp->uuid[1], mp->uuid[2],
+                                        mp->uuid[3]);
 		}
 		goto out;
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	29 Jun 2009 19:18:19 -0000	1.24
+++ .cvsignore	15 Sep 2009 19:03:58 -0000	1.25
@@ -13,3 +13,4 @@ mdadm-2.6.7.1.tar.bz2
 mdadm-3.0-devel2.tar.bz2
 mdadm-3.0-devel3.tar.bz2
 mdadm-3.0.tar.bz2
+mdadm-3.0-0.20090915git.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- mdadm.spec	24 Jul 2009 17:33:11 -0000	1.72
+++ mdadm.spec	15 Sep 2009 19:03:58 -0000	1.73
@@ -1,14 +1,16 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     2%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
+Release:     3%{?dist}
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-0.20090915git.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
 Source4:     mdadm-raid-check-sysconfig
 Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-endian-FAIL.patch
+Patch3:      mdadm-3.0-metadata.patch
+Patch4:      mdadm-3.0-uuid.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -31,6 +33,8 @@ file can be used to help with some commo
 %setup -q
 %patch1 -p1 -b .static
 %patch2 -p1 -b .endian
+%patch3 -p1 -b .metadata
+%patch4 -p1 -b .uuid
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -76,6 +80,12 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Sep 15 2009 Doug Ledford <dledford at redhat.com> - 3.0-3
+- Update to current head of upstream git repo for various imsm related fixes
+  (fixes bz523262)
+- Fix display of metadata version in output of Detail mode
+- Add UUID output to --detail --export (bz523314)
+
 * Fri Jul 24 2009 Doug Ledford <dledford at redhat.com> - 3.0-2
 - Improved raid-check script as well as the ability to configure what devices
   get checked


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	29 Jun 2009 19:18:19 -0000	1.24
+++ sources	15 Sep 2009 19:03:58 -0000	1.25
@@ -1 +1 @@
-bcd27a1359b18e25e61593221d098f6a  mdadm-3.0.tar.bz2
+7a1ba5aaaa04e34ef85b85fcadbf2519  mdadm-3.0-0.20090915git.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:04 +0000
Subject: [pkgdb] libraw1394: dajt has requested commit
Message-ID: <20090915190504.DF5FF10F87D@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:05 +0000
Subject: [pkgdb] libraw1394: dajt has requested watchbugzilla
Message-ID: <20090915190505.6055A10F886@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:11 +0000
Subject: [pkgdb] libraw1394: dajt has requested watchcommits
Message-ID: <20090915190511.9776610F88C@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:14 +0000
Subject: [pkgdb] libraw1394: dajt has requested approveacls
Message-ID: <20090915190515.07DD310F896@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:27 +0000
Subject: [pkgdb] libraw1394: dajt has requested watchbugzilla
Message-ID: <20090915190527.7C1B810F883@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libraw1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:30 +0000
Subject: [pkgdb] libraw1394: dajt has requested watchcommits
Message-ID: <20090915190530.8221610F89A@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libraw1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:32 +0000
Subject: [pkgdb] libraw1394: dajt has requested commit
Message-ID: <20090915190532.BB41E10F89D@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libraw1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:35 +0000
Subject: [pkgdb] libraw1394: dajt has requested approveacls
Message-ID: <20090915190535.9190E10F88C@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libraw1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:41 +0000
Subject: [pkgdb] libraw1394: dajt has requested watchbugzilla
Message-ID: <20090915190541.63CEE10F896@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libraw1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:43 +0000
Subject: [pkgdb] libraw1394: dajt has requested watchcommits
Message-ID: <20090915190543.756E210F8A1@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libraw1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:45 +0000
Subject: [pkgdb] libraw1394: dajt has requested commit
Message-ID: <20090915190545.BA10710F8A4@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libraw1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:05:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:05:48 +0000
Subject: [pkgdb] libraw1394: dajt has requested approveacls
Message-ID: <20090915190548.51AD210F8A8@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libraw1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:07:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:07:43 +0000
Subject: [pkgdb] libiec61883: dajt has requested watchbugzilla
Message-ID: <20090915190743.14F8910F851@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:07:45 +0000
Subject: [pkgdb] libiec61883: dajt has requested watchcommits
Message-ID: <20090915190745.A574710F886@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:07:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:07:48 +0000
Subject: [pkgdb] libiec61883: dajt has requested commit
Message-ID: <20090915190748.4F06810F895@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:07:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:07:50 +0000
Subject: [pkgdb] libiec61883: dajt has requested approveacls
Message-ID: <20090915190750.7314B10F898@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:16 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191016.A72DF10F880@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on libraw1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:17 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191018.04FFA10F886@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on libraw1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:18 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191018.92B0210F894@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on libraw1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:20 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191020.EA66610F896@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on libraw1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:50 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191051.141C910F880@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on libraw1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:51 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191051.BD43710F895@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on libraw1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:53 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191053.76D3010F894@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on libraw1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:10:55 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191055.1401C10F89A@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on libraw1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:12:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:12:19 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191219.717AA10F87D@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on libraw1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:12:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:12:20 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191220.49D0510F886@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on libraw1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:12:21 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191221.DA53410F894@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on libraw1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:12:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:12:23 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191223.1489910F898@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on libraw1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:13:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:13:36 +0000
Subject: [pkgdb] libraw1394: jwilson has requested commit
Message-ID: <20090915191336.A0EFD10F851@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on libraw1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:13:44 +0000
Subject: [pkgdb] libraw1394: jwilson has requested commit
Message-ID: <20090915191344.7632510F888@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on libraw1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:13:53 +0000
Subject: [pkgdb] libraw1394: jwilson has requested commit
Message-ID: <20090915191354.00ED010F851@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:13:56 +0000
Subject: [pkgdb] libraw1394: jwilson has requested watchbugzilla
Message-ID: <20090915191357.3910B10F896@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchbugzilla acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:14:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:14:38 +0000
Subject: [pkgdb] dvgrab: jwilson has requested commit
Message-ID: <20090915191438.7294610F80B@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:07 +0000
Subject: [pkgdb] dvgrab: jwilson has requested commit
Message-ID: <20090915191507.4C05710F886@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on dvgrab (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:03 +0000
Subject: [pkgdb] dvgrab: jwilson has requested commit
Message-ID: <20090915191503.7555F10F87D@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on dvgrab (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From steved at fedoraproject.org  Tue Sep 15 19:15:19 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 15 Sep 2009 19:15:19 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.1-rc5.patch, NONE,
	1.1 nfs-utils.spec, 1.240, 1.241
Message-ID: <20090915191519.E06C211C00CE@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20329

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.1-rc5.patch 
Log Message:
- Added upstream 1.2.1-rc5 patch
  - Added --sort --list functionality to nfs-iostat.py
  - Fixed event handler in idmapd
  - Added -o v4 support
  - Disabled IPv6 support in nfsd
  - Don't give client an empty flavor list
  - Fixed gssed so it does not blindly caches machine credentials


nfs-utils-1.2.1-rc5.patch:
 support/include/conffile.h     |    1 
 tools/nfs-iostat/nfs-iostat.py |  229 ++++++++++++++++++++++++++---------------
 utils/gssd/gssd_proc.c         |   74 +++++++------
 utils/gssd/krb5_util.c         |   13 +-
 utils/gssd/krb5_util.h         |    2 
 utils/idmapd/idmapd.c          |   18 +--
 utils/mount/mount_config.h     |    2 
 utils/mount/network.c          |   14 +-
 utils/mount/network.h          |    1 
 utils/mount/nfsumount.c        |    4 
 utils/mount/stropts.c          |   10 +
 utils/mountd/mountd.c          |    5 
 utils/nfsd/nfsd.c              |    9 +
 utils/nfsd/nfssvc.c            |    9 +
 14 files changed, 255 insertions(+), 136 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc5.patch ---
diff --git a/support/include/conffile.h b/support/include/conffile.h
index 132a149..672020a 100644
--- a/support/include/conffile.h
+++ b/support/include/conffile.h
@@ -34,6 +34,7 @@
 #define _CONFFILE_H_
 
 #include <sys/queue.h>
+#include <ctype.h>
 
 struct conf_list_node {
 	TAILQ_ENTRY(conf_list_node) link;
diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index 9626d42..2d0b143 100644
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- python-mode -*-
 """Emulate iostat for NFS mount points using /proc/self/mountstats
 """
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 import sys, os, time
+from optparse import OptionParser, OptionGroup
 
 Iostats_version = '0.2'
 
@@ -353,6 +354,12 @@ class DeviceData:
         print '\t%7.3f' % rtt_per_op,
         print '\t%7.3f' % exe_per_op
 
+    def ops(self, sample_time):
+        sends = float(self.__rpc_data['rpcsends'])
+        if sample_time == 0:
+            sample_time = float(self.__nfs_data['age'])
+        return (sends / sample_time)
+
     def display_iostats(self, sample_time, which):
         """Display NFS and RPC stats in an iostat-like way
         """
@@ -395,33 +402,6 @@ class DeviceData:
 # Functions
 #
 
-def print_iostat_help(name):
-    print 'usage: %s [ <interval> [ <count> ] ] [ <options> ] [ <mount point> ] ' % name
-    print
-    print ' Version %s' % Iostats_version
-    print
-    print ' Sample iostat-like program to display NFS client per-mount statistics.'
-    print
-    print ' The <interval> parameter specifies the amount of time in seconds between'
-    print ' each report.  The first report contains statistics for the time since each'
-    print ' file system was mounted.  Each subsequent report contains statistics'
-    print ' collected during the interval since the previous report.'
-    print
-    print ' If the <count> parameter is specified, the value of <count> determines the'
-    print ' number of reports generated at <interval> seconds apart.  If the interval'
-    print ' parameter is specified without the <count> parameter, the command generates'
-    print ' reports continuously.'
-    print
-    print ' Options include "--attr", which displays statistics related to the attribute'
-    print ' cache, "--dir", which displays statistics related to directory operations,'
-    print ' and "--page", which displays statistics related to the page cache.'
-    print ' By default, if no option is specified, statistics related to file I/O are'
-    print ' displayed.'
-    print
-    print ' If one or more <mount point> names are specified, statistics for only these'
-    print ' mount points will be displayed.  Otherwise, all NFS mount points on the'
-    print ' client are listed.'
-
 def parse_stats_file(filename):
     """pop the contents of a mountstats file into a dictionary,
     keyed by mount point.  each value object is a list of the
@@ -446,109 +426,198 @@ def parse_stats_file(filename):
 
     return ms_dict
 
-def print_iostat_summary(old, new, devices, time, ac):
-    for device in devices:
-        stats = DeviceData()
-        stats.parse_stats(new[device])
-        if not old:
-            stats.display_iostats(time, ac)
-        else:
+def print_iostat_summary(old, new, devices, time, options):
+    stats = {}
+    diff_stats = {}
+
+    if old:
+        # Trim device list to only include intersection of old and new data,
+        # this addresses umounts due to autofs mountpoints
+        devicelist = filter(lambda x:x in devices,old)
+    else:
+        devicelist = devices
+
+    for device in devicelist:
+        stats[device] = DeviceData()
+        stats[device].parse_stats(new[device])
+        if old:
             old_stats = DeviceData()
             old_stats.parse_stats(old[device])
-            diff_stats = stats.compare_iostats(old_stats)
-            diff_stats.display_iostats(time, ac)
+            diff_stats[device] = stats[device].compare_iostats(old_stats)
+
+    if options.sort:
+        if old:
+            # We now have compared data and can print a comparison
+            # ordered by mountpoint ops per second
+            devicelist.sort(key=lambda x: diff_stats[x].ops(time), reverse=True)
+        else:
+            # First iteration, just sort by newly parsed ops/s
+            devicelist.sort(key=lambda x: stats[x].ops(time), reverse=True)
+
+    count = 1
+    for device in devicelist:
+        if old:
+            diff_stats[device].display_iostats(time, options.which)
+        else:
+            stats[device].display_iostats(time, options.which)
+
+        count += 1
+        if (count > options.list):
+            return
+
+
+def list_nfs_mounts(givenlist, mountstats):
+    """return a list of NFS mounts given a list to validate or
+       return a full list if the given list is empty -
+       may return an empty list if none found
+    """
+    list = []
+    if len(givenlist) > 0:
+        for device in givenlist:
+            stats = DeviceData()
+            stats.parse_stats(mountstats[device])
+            if stats.is_nfs_mountpoint():
+                list += [device]
+    else:
+        for device, descr in mountstats.iteritems():
+            stats = DeviceData()
+            stats.parse_stats(descr)
+            if stats.is_nfs_mountpoint():
+                list += [device]
+    return list
 
 def iostat_command(name):
     """iostat-like command for NFS mount points
     """
     mountstats = parse_stats_file('/proc/self/mountstats')
     devices = []
-    which = 0
+    origdevices = []
     interval_seen = False
     count_seen = False
 
-    for arg in sys.argv:
-        if arg in ['-h', '--help', 'help', 'usage']:
-            print_iostat_help(name)
-            return
-
-        if arg in ['-v', '--version', 'version']:
-            print '%s version %s' % (name, Iostats_version)
-            return
-
-        if arg in ['-a', '--attr']:
-            which = 1
-            continue
-
-        if arg in ['-d', '--dir']:
-            which = 2
-            continue
-
-        if arg in ['-p', '--page']:
-            which = 3
-            continue
+    mydescription= """
+Sample iostat-like program to display NFS client per-mount'
+statistics.  The <interval> parameter specifies the amount of time in seconds
+between each report.  The first report contains statistics for the time since
+each file system was mounted.  Each subsequent report contains statistics
+collected during the interval since the previous report.  If the <count>
+parameter is specified, the value of <count> determines the number of reports
+generated at <interval> seconds apart.  If the interval parameter is specified
+without the <count> parameter, the command generates reports continuously.
+If one or more <mount point> names are specified, statistics for only these
+mount points will be displayed.  Otherwise, all NFS mount points on the
+client are listed.
+"""
+    parser = OptionParser(
+        usage="usage: %prog [ <interval> [ <count> ] ] [ <options> ] [ <mount point> ]",
+        description=mydescription,
+        version='version %s' % Iostats_version)
+    parser.set_defaults(which=0, sort=False, list=sys.maxint)
+
+    statgroup = OptionGroup(parser, "Statistics Options",
+                            'File I/O is displayed unless one of the following is specified:')
+    statgroup.add_option('-a', '--attr',
+                            action="store_const",
+                            dest="which",
+                            const=1,
+                            help='displays statistics related to the attribute cache')
+    statgroup.add_option('-d', '--dir',
+                            action="store_const",
+                            dest="which",
+                            const=2,
+                            help='displays statistics related to directory operations')
+    statgroup.add_option('-p', '--page',
+                            action="store_const",
+                            dest="which",
+                            const=3,
+                            help='displays statistics related to the page cache')
+    parser.add_option_group(statgroup)
+    displaygroup = OptionGroup(parser, "Display Options",
+                               'Options affecting display format:')
+    displaygroup.add_option('-s', '--sort',
+                            action="store_true",
+                            dest="sort",
+                            help="Sort NFS mount points by ops/second")
+    displaygroup.add_option('-l','--list',
+                            action="store",
+                            type="int",
+                            dest="list",
+                            help="only print stats for first LIST mount points")
+    parser.add_option_group(displaygroup)
+
+    (options, args) = parser.parse_args(sys.argv)
+
+    for arg in args:
 
         if arg == sys.argv[0]:
             continue
 
         if arg in mountstats:
-            devices += [arg]
+            origdevices += [arg]
         elif not interval_seen:
-            interval = int(arg)
+            try:
+                interval = int(arg)
+            except:
+                print 'Illegal <interval> value %s' % arg
+                return
             if interval > 0:
                 interval_seen = True
             else:
-                print 'Illegal <interval> value'
+                print 'Illegal <interval> value %s' % arg
                 return
         elif not count_seen:
-            count = int(arg)
+            try:
+                count = int(arg)
+            except:
+                print 'Ilegal <count> value %s' % arg
+                return
             if count > 0:
                 count_seen = True
             else:
-                print 'Illegal <count> value'
+                print 'Illegal <count> value %s' % arg
                 return
 
     # make certain devices contains only NFS mount points
-    if len(devices) > 0:
-        check = []
-        for device in devices:
-            stats = DeviceData()
-            stats.parse_stats(mountstats[device])
-            if stats.is_nfs_mountpoint():
-                check += [device]
-        devices = check
-    else:
-        for device, descr in mountstats.iteritems():
-            stats = DeviceData()
-            stats.parse_stats(descr)
-            if stats.is_nfs_mountpoint():
-                devices += [device]
+    devices = list_nfs_mounts(origdevices, mountstats)
     if len(devices) == 0:
         print 'No NFS mount points were found'
         return
 
+
     old_mountstats = None
     sample_time = 0.0
 
     if not interval_seen:
-        print_iostat_summary(old_mountstats, mountstats, devices, sample_time, which)
+        print_iostat_summary(old_mountstats, mountstats, devices, sample_time, options)
         return
 
     if count_seen:
         while count != 0:
-            print_iostat_summary(old_mountstats, mountstats, devices, sample_time, which)
+            print_iostat_summary(old_mountstats, mountstats, devices, sample_time, options)
             old_mountstats = mountstats
             time.sleep(interval)
             sample_time = interval
             mountstats = parse_stats_file('/proc/self/mountstats')
+            # automount mountpoints add and drop, if automount is involved
+            # we need to recheck the devices list when reparsing
+            devices = list_nfs_mounts(origdevices,mountstats)
+            if len(devices) == 0:
+                print 'No NFS mount points were found'
+                return
             count -= 1
     else: 
         while True:
-            print_iostat_summary(old_mountstats, mountstats, devices, sample_time, which)
+            print_iostat_summary(old_mountstats, mountstats, devices, sample_time, options)
             old_mountstats = mountstats
             time.sleep(interval)
             sample_time = interval
             mountstats = parse_stats_file('/proc/self/mountstats')
+            # automount mountpoints add and drop, if automount is involved
+            # we need to recheck the devices list when reparsing
+            devices = list_nfs_mounts(origdevices,mountstats)
+            if len(devices) == 0:
+                print 'No NFS mount points were found'
+                return
 
 #
 # Main
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 02239d2..37e2aa5 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -840,42 +840,48 @@ handle_krb5_upcall(struct clnt_info *clp)
 	}
 	if (create_resp != 0) {
 		if (uid == 0 && root_uses_machine_creds == 1) {
+			int nocache = 0;
 			int success = 0;
-
-			gssd_refresh_krb5_machine_credential(clp->servername,
-							     NULL);
-			/*
-			 * Get a list of credential cache names and try each
-			 * of them until one works or we've tried them all
-			 */
-			if (gssd_get_krb5_machine_cred_list(&credlist)) {
-				printerr(0, "ERROR: No credentials found "
-					 "for connection to server %s\n",
-					 clp->servername);
-					goto out_return_error;
-			}
-			for (ccname = credlist; ccname && *ccname; ccname++) {
-				gssd_setup_krb5_machine_gss_ccache(*ccname);
-				if ((create_auth_rpc_client(clp, &rpc_clnt,
-							    &auth, uid,
-							    AUTHTYPE_KRB5)) == 0) {
-					/* Success! */
-					success++;
-					break;
+			do {
+				gssd_refresh_krb5_machine_credential(clp->servername,
+								     NULL, nocache);
+				/*
+				 * Get a list of credential cache names and try each
+				 * of them until one works or we've tried them all
+				 */
+				if (gssd_get_krb5_machine_cred_list(&credlist)) {
+					printerr(0, "ERROR: No credentials found "
+						 "for connection to server %s\n",
+						 clp->servername);
+						goto out_return_error;
 				}
-				printerr(2, "WARNING: Failed to create krb5 context "
-					 "for user with uid %d with credentials "
-					 "cache %s for server %s\n",
-					 uid, *ccname, clp->servername);
-			}
-			gssd_free_krb5_machine_cred_list(credlist);
-			if (!success) {
-				printerr(1, "WARNING: Failed to create krb5 context "
-					 "for user with uid %d with any "
-					 "credentials cache for server %s\n",
-					 uid, clp->servername);
-				goto out_return_error;
-			}
+				for (ccname = credlist; ccname && *ccname; ccname++) {
+					gssd_setup_krb5_machine_gss_ccache(*ccname);
+					if ((create_auth_rpc_client(clp, &rpc_clnt,
+								    &auth, uid,
+								    AUTHTYPE_KRB5)) == 0) {
+						/* Success! */
+						success++;
+						break;
+					} 
+					printerr(2, "WARNING: Failed to create machine krb5 context "
+						 "with credentials cache %s for server %s\n",
+						 *ccname, clp->servername);
+				}
+				gssd_free_krb5_machine_cred_list(credlist);			
+				if (!success) {
+					if(nocache == 0) {
+						nocache++;
+						printerr(2, "WARNING: Machine cache is prematurely expired or corrupted "
+						            "trying to recreate cache for server %s\n", clp->servername);
+					} else {
+						printerr(1, "WARNING: Failed to create machine krb5 context "
+						 "with any credentials cache for server %s\n",
+						 clp->servername);
+						goto out_return_error;
+					}
+				}
+			} while(!success);
 		} else {
 			printerr(1, "WARNING: Failed to create krb5 context "
 				 "for user with uid %d for server %s\n",
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index 3009cc5..78e9775 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -137,7 +137,7 @@ static int select_krb5_ccache(const struct dirent *d);
 static int gssd_find_existing_krb5_ccache(uid_t uid, char *dirname,
 		struct dirent **d);
 static int gssd_get_single_krb5_cred(krb5_context context,
-		krb5_keytab kt, struct gssd_k5_kt_princ *ple);
+		krb5_keytab kt, struct gssd_k5_kt_princ *ple, int nocache);
 static int query_krb5_ccache(const char* cred_cache, char **ret_princname,
 		char **ret_realm);
 
@@ -359,7 +359,8 @@ limit_krb5_enctypes(struct rpc_gss_sec *sec, uid_t uid)
 static int
 gssd_get_single_krb5_cred(krb5_context context,
 			  krb5_keytab kt,
-			  struct gssd_k5_kt_princ *ple)
+			  struct gssd_k5_kt_princ *ple,
+			  int nocache)
 {
 #if HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
 	krb5_get_init_creds_opt *init_opts = NULL;
@@ -379,7 +380,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 
 	memset(&my_creds, 0, sizeof(my_creds));
 
-	if (ple->ccname && ple->endtime > now) {
+	if (ple->ccname && ple->endtime > now && !nocache) {
 		printerr(2, "INFO: Credentials in CC '%s' are good until %d\n",
 			 ple->ccname, ple->endtime);
 		code = 0;
@@ -1095,7 +1096,7 @@ gssd_get_krb5_machine_cred_list(char ***list)
 	for (ple = gssd_k5_kt_princ_list; ple; ple = ple->next) {
 		if (ple->ccname) {
 			/* Make sure cred is up-to-date before returning it */
-			retval = gssd_refresh_krb5_machine_credential(NULL, ple);
+			retval = gssd_refresh_krb5_machine_credential(NULL, ple, 0);
 			if (retval)
 				continue;
 			if (i + 1 > listsize) {
@@ -1185,7 +1186,7 @@ gssd_destroy_krb5_machine_creds(void)
  */
 int
 gssd_refresh_krb5_machine_credential(char *hostname,
-				     struct gssd_k5_kt_princ *ple)
+				     struct gssd_k5_kt_princ *ple, int nocache)
 {
 	krb5_error_code code = 0;
 	krb5_context context;
@@ -1240,7 +1241,7 @@ gssd_refresh_krb5_machine_credential(char *hostname,
 			goto out;
 		}
 	}
-	retval = gssd_get_single_krb5_cred(context, kt, ple);
+	retval = gssd_get_single_krb5_cred(context, kt, ple, nocache);
 out:
 	if (kt)
 		krb5_kt_close(context, kt);
diff --git a/utils/gssd/krb5_util.h b/utils/gssd/krb5_util.h
index 3d39300..4b6b281 100644
--- a/utils/gssd/krb5_util.h
+++ b/utils/gssd/krb5_util.h
@@ -30,7 +30,7 @@ void gssd_free_krb5_machine_cred_list(char **list);
 void gssd_setup_krb5_machine_gss_ccache(char *servername);
 void gssd_destroy_krb5_machine_creds(void);
 int  gssd_refresh_krb5_machine_credential(char *hostname,
-					  struct gssd_k5_kt_princ *ple);
+					  struct gssd_k5_kt_princ *ple, int nocache);
 char *gssd_k5_err_msg(krb5_context context, krb5_error_code code);
 void gssd_k5_get_default_realm(char **def_realm);
 
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 65a6a2a..573abaa 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -139,6 +139,7 @@ static void nametoidres(struct idmap_msg *);
 
 static int nfsdopen(void);
 static int nfsdopenone(struct idmap_client *);
+static void nfsdreopen_one(struct idmap_client *);
 static void nfsdreopen(void);
 
 size_t  strlcat(char *, const char *, size_t);
@@ -502,7 +503,8 @@ nfsdcb(int fd, short which, void *data)
 		xlog_warn("nfsdcb: read(%s) failed: errno %d (%s)",
 			     ic->ic_path, len?errno:0, 
 			     len?strerror(errno):"End of File");
-		goto out;
+		nfsdreopen_one(ic);
+		return;
 	}
 
 	/* Get rid of newline and terminate buffer*/
@@ -514,11 +516,11 @@ nfsdcb(int fd, short which, void *data)
 	/* Authentication name -- ignored for now*/
 	if (getfield(&bp, authbuf, sizeof(authbuf)) == -1) {
 		xlog_warn("nfsdcb: bad authentication name in upcall\n");
-		return;
+		goto out;
 	}
 	if (getfield(&bp, typebuf, sizeof(typebuf)) == -1) {
 		xlog_warn("nfsdcb: bad type in upcall\n");
-		return;
+		goto out;
 	}
 	if (verbose > 0)
 		xlog_warn("nfsdcb: authbuf=%s authtype=%s",
@@ -532,26 +534,26 @@ nfsdcb(int fd, short which, void *data)
 		im.im_conv = IDMAP_CONV_NAMETOID;
 		if (getfield(&bp, im.im_name, sizeof(im.im_name)) == -1) {
 			xlog_warn("nfsdcb: bad name in upcall\n");
-			return;
+			goto out;
 		}
 		break;
 	case IC_IDNAME:
 		im.im_conv = IDMAP_CONV_IDTONAME;
 		if (getfield(&bp, buf1, sizeof(buf1)) == -1) {
 			xlog_warn("nfsdcb: bad id in upcall\n");
-			return;
+			goto out;
 		}
 		tmp = strtoul(buf1, (char **)NULL, 10);
 		im.im_id = (u_int32_t)tmp;
 		if ((tmp == ULONG_MAX && errno == ERANGE)
 				|| (unsigned long)im.im_id != tmp) {
 			xlog_warn("nfsdcb: id '%s' too big!\n", buf1);
-			return;
+			goto out;
 		}
 		break;
 	default:
 		xlog_warn("nfsdcb: Unknown which type %d", ic->ic_which);
-		return;
+		goto out;
 	}
 
 	imconv(ic, &im);
@@ -612,7 +614,7 @@ nfsdcb(int fd, short which, void *data)
 		break;
 	default:
 		xlog_warn("nfsdcb: Unknown which type %d", ic->ic_which);
-		return;
+		goto out;
 	}
 
 	bsiz = sizeof(buf) - bsiz;
diff --git a/utils/mount/mount_config.h b/utils/mount/mount_config.h
index 9a885a9..3023306 100644
--- a/utils/mount/mount_config.h
+++ b/utils/mount/mount_config.h
@@ -20,6 +20,8 @@ inline void mount_config_init(char *);
 
 #ifdef MOUNT_CONFIG
 #include "conffile.h"
+#include "xlog.h"
+
 extern char *conf_get_mntopts(char *, char *, char *);
 
 inline void mount_config_init(char *program)
diff --git a/utils/mount/network.c b/utils/mount/network.c
index f6fa5fd..bd621be 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -90,6 +90,7 @@ static const char *nfs_transport_opttbl[] = {
 static const char *nfs_version_opttbl[] = {
 	"v2",
 	"v3",
+	"v4",
 	"vers",
 	"nfsvers",
 	NULL,
@@ -1203,7 +1204,7 @@ nfs_nfs_program(struct mount_options *options, unsigned long *program)
  * Returns TRUE if @version contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_version(struct mount_options *options, unsigned long *version)
 {
 	long tmp;
@@ -1215,10 +1216,13 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
 	case 1: /* v3 */
 		*version = 3;
 		return 1;
-	case 2:	/* vers */
+	case 2: /* v4 */
+		*version = 4;
+		return 1;
+	case 3:	/* vers */
 		switch (po_get_numeric(options, "vers", &tmp)) {
 		case PO_FOUND:
-			if (tmp >= 2 && tmp <= 3) {
+			if (tmp >= 2 && tmp <= 4) {
 				*version = tmp;
 				return 1;
 			}
@@ -1229,10 +1233,10 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
 		case PO_BAD_VALUE:
 			return 0;
 		}
-	case 3: /* nfsvers */
+	case 4: /* nfsvers */
 		switch (po_get_numeric(options, "nfsvers", &tmp)) {
 		case PO_FOUND:
-			if (tmp >= 2 && tmp <= 3) {
+			if (tmp >= 2 && tmp <= 4) {
 				*version = tmp;
 				return 1;
 			}
diff --git a/utils/mount/network.h b/utils/mount/network.h
index db5134c..402e0a5 100644
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -56,6 +56,7 @@ int clnt_ping(struct sockaddr_in *, const unsigned long,
 
 struct mount_options;
 
+int nfs_nfs_version(struct mount_options *options, unsigned long *version);
 int nfs_options2pmap(struct mount_options *,
 		      struct pmap *, struct pmap *);
 
diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index f81db14..c5505b1 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -179,6 +179,10 @@ static int nfs_umount_do_umnt(struct mount_options *options,
 		return EX_FAIL;
 	}
 
+	/* Skip UMNT call for vers=4 mounts */
+	if (nfs_pmap.pm_vers == 4)
+		return EX_SUCCESS;
+
 	*hostname = nfs_umount_hostname(options, *hostname);
 	if (!*hostname) {
 		nfs_error(_("%s: out of memory"), progname);
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index a12ace7..3eb661e 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -84,6 +84,7 @@ struct nfsmount_info {
 	struct mount_options	*options;	/* parsed mount options */
 	char			**extra_opts;	/* string for /etc/mtab */
 
+	unsigned long		version;	/* NFS version */
 	int			flags,		/* MS_ flags */
 				fake,		/* actually do the mount? */
 				child;		/* forked bg child? */
@@ -272,7 +273,12 @@ static int nfs_validate_options(struct nfsmount_info *mi)
 	if (!nfs_name_to_address(mi->hostname, sap, &salen))
 		return 0;
 
-	if (strncmp(mi->type, "nfs4", 4) == 0) {
+	if (!nfs_nfs_version(mi->options, &mi->version))
+		return 0;
+	if (strncmp(mi->type, "nfs4", 4) == 0)
+		mi->version = 4;
+
+	if (mi->version == 4) {
 		if (!nfs_append_clientaddr_option(sap, salen, mi->options))
 			return 0;
 	} else {
@@ -488,7 +494,7 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 	char *options = NULL;
 	int result;
 
-	if (strncmp(mi->type, "nfs4", 4) != 0) {
+	if (mi->version != 4) {
 		if (!nfs_rewrite_pmap_mount_options(mi->options))
 			return 0;
 	}
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index b59f939..888fd8c 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -359,6 +359,11 @@ static void set_authflavors(struct mountres3_ok *ok, nfs_export *exp)
 		flavors[i] = s->flav->fnum;
 		i++;
 	}
+	if (i == 0) {
+		/* default when there is no sec= option: */
+		i = 1;
+		flavors[0] = AUTH_UNIX;
+	}
 	ok->auth_flavors.auth_flavors_val = flavors;
 	ok->auth_flavors.auth_flavors_len = i;
 }
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 650c593..1cda1e5 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -27,6 +27,15 @@
 #include "nfssvc.h"
 #include "xlog.h"
 
+/*
+ * IPv6 support for nfsd was finished before some of the other daemons (mountd
+ * and statd in particular). That could be a problem in the future if someone
+ * were to boot a kernel that supports IPv6 serving with  an older nfs-utils. For
+ * now, hardcode the IPv6 switch into the off position until the other daemons
+ * are functional.
+ */
+#undef IPV6_SUPPORTED
+
 static void	usage(const char *);
 
 static struct option longopts[] =
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
index ee862b2..12d3253 100644
--- a/utils/nfsd/nfssvc.c
+++ b/utils/nfsd/nfssvc.c
@@ -22,6 +22,15 @@
 #include "nfslib.h"
 #include "xlog.h"
 
+/*
+ * IPv6 support for nfsd was finished before some of the other daemons (mountd
+ * and statd in particular). That could be a problem in the future if someone
+ * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
+ * now, hardcode the IPv6 switch into the off position until the other daemons
+ * are functional.
+ */
+#undef IPV6_SUPPORTED
+
 #define NFSD_PORTS_FILE     "/proc/fs/nfsd/portlist"
 #define NFSD_VERS_FILE    "/proc/fs/nfsd/versions"
 #define NFSD_THREAD_FILE  "/proc/fs/nfsd/threads"


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- nfs-utils.spec	17 Aug 2009 13:21:50 -0000	1.240
+++ nfs-utils.spec	15 Sep 2009 19:15:19 -0000	1.241
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -26,6 +26,7 @@ Patch100: nfs-utils-1.2.1-rc1.patch
 Patch101: nfs-utils-1.2.1-rc2.patch
 Patch102: nfs-utils-1.2.1-rc3.patch
 Patch103: nfs-utils-1.2.1-rc4.patch
+Patch104: nfs-utils-1.2.1-rc5.patch
 
 Patch200: nfs-utils-1.2.0-proots-rel5.patch
 
@@ -83,6 +84,7 @@ This package also contains the mount.nfs
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 %patch200 -p1
 
@@ -256,6 +258,15 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Sep 15 2009 Steve Dickson <steved at redhat.com> 1.2.0-11
+- Added upstream 1.2.1-rc5 patch
+  - Added --sort --list functionality to nfs-iostat.py
+  - Fixed event handler in idmapd
+  - Added -o v4 support
+  - Disabled IPv6 support in nfsd
+  - Don't give client an empty flavor list
+  - Fixed gssed so it does not blindly caches machine credentials
+
 * Mon Aug 17 2009 Steve Dickson <steved at redhat.com> 1.2.0-10
 - Added upstream 1.2.1-rc4 patch
   - Fix bug when both crossmnt



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:21 +0000
Subject: [pkgdb] libavc1394: jwilson has requested commit
Message-ID: <20090915191521.F18AD10F80B@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on libavc1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:28 +0000
Subject: [pkgdb] libavc1394 ownership updated
Message-ID: <20090915191528.C1DA010F851@bastion2.fedora.phx.redhat.com>

Package libavc1394 in Fedora 11 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:30 +0000
Subject: [pkgdb] libavc1394 ownership updated
Message-ID: <20090915191530.3605D10F883@bastion2.fedora.phx.redhat.com>

Package libavc1394 in Fedora 10 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:44 +0000
Subject: [pkgdb] libdv ownership updated
Message-ID: <20090915191544.A9A6310F851@bastion2.fedora.phx.redhat.com>

Package libdv in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:47 +0000
Subject: [pkgdb] libdv ownership updated
Message-ID: <20090915191547.8EF7610F880@bastion2.fedora.phx.redhat.com>

Package libdv in Fedora 11 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:15:49 +0000
Subject: [pkgdb] libdv ownership updated
Message-ID: <20090915191549.389C110F87D@bastion2.fedora.phx.redhat.com>

Package libdv in Fedora 10 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:16:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:16:02 +0000
Subject: [pkgdb] libiec61883 ownership updated
Message-ID: <20090915191602.9838610F80B@bastion2.fedora.phx.redhat.com>

Package libiec61883 in Fedora 11 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:16:03 +0000
Subject: [pkgdb] libiec61883 ownership updated
Message-ID: <20090915191603.E51CF10F883@bastion2.fedora.phx.redhat.com>

Package libiec61883 in Fedora 10 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:16:12 +0000
Subject: [pkgdb] libiec61883: jwilson has requested commit
Message-ID: <20090915191612.253E910F88C@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:16:15 +0000
Subject: [pkgdb] libiec61883: jwilson has requested watchbugzilla
Message-ID: <20090915191615.4886910F880@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchbugzilla acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:16:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:16:27 +0000
Subject: [pkgdb] libiec61883: jwilson has requested watchcommits
Message-ID: <20090915191627.240ED10F886@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchcommits acl on libiec61883 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:07 +0000
Subject: [pkgdb] libraw1394: jwilson has requested watchcommits
Message-ID: <20090915191707.7C50E10F87D@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchcommits acl on libraw1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:11 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191712.13E7D10F886@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on libraw1394 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:14 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191714.5B41610F88C@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on libraw1394 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:19 +0000
Subject: [pkgdb] libraw1394: jwilson has given up commit
Message-ID: <20090915191719.C247810F895@bastion2.fedora.phx.redhat.com>

jwilson has given up the commit acl on libraw1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:22 +0000
Subject: [pkgdb] libraw1394: jwilson has given up commit
Message-ID: <20090915191722.F0B5F10F89A@bastion2.fedora.phx.redhat.com>

jwilson has given up the commit acl on libraw1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:36 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915191736.6373610F80B@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on libiec61883 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:37 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915191737.21A9110F851@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on libiec61883 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:41 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915191741.D7FD410F894@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on libiec61883 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:17:57 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915191757.310C110F80B@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on libavc1394 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:02 +0000
Subject: [pkgdb] libavc1394 ownership updated
Message-ID: <20090915191802.B15D410F888@bastion2.fedora.phx.redhat.com>

Package libavc1394 in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:09 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915191809.686F910F895@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on dvgrab (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:12 +0000
Subject: [pkgdb] dvgrab: jwilson has requested watchcommits
Message-ID: <20090915191812.D85F710F89C@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchcommits acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:18 +0000
Subject: [pkgdb] dvgrab: jwilson has requested watchbugzilla
Message-ID: <20090915191818.0B75F10F80B@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchbugzilla acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:22 +0000
Subject: [pkgdb] libiec61883 ownership updated
Message-ID: <20090915191822.E4DB410F880@bastion2.fedora.phx.redhat.com>

Package libiec61883 in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:37 +0000
Subject: [pkgdb] libraw1394 had acl change status
Message-ID: <20090915191837.2A17E10F894@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on libraw1394 (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:45 +0000
Subject: [pkgdb] libraw1394 ownership updated
Message-ID: <20090915191845.46FE110F89B@bastion2.fedora.phx.redhat.com>

Package libraw1394 in Fedora 11 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:47 +0000
Subject: [pkgdb] libraw1394 ownership updated
Message-ID: <20090915191848.1ABE410F886@bastion2.fedora.phx.redhat.com>

Package libraw1394 in Fedora 10 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:18:54 +0000
Subject: [pkgdb] libraw1394 ownership updated
Message-ID: <20090915191854.12B5910F898@bastion2.fedora.phx.redhat.com>

Package libraw1394 in Fedora devel is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libraw1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:00 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915191900.EDADB10F8A3@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on dvgrab (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:03 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915191903.7FC5F10F894@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on dvgrab (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:05 +0000
Subject: [pkgdb] dvgrab ownership updated
Message-ID: <20090915191905.C52FB10F8A5@bastion2.fedora.phx.redhat.com>

Package dvgrab in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:12 +0000
Subject: [pkgdb] dvgrab: jwilson has given up commit
Message-ID: <20090915191912.1F6F810F895@bastion2.fedora.phx.redhat.com>

jwilson has given up the commit acl on dvgrab (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:13 +0000
Subject: [pkgdb] dvgrab: jwilson has given up commit
Message-ID: <20090915191913.5007510F80B@bastion2.fedora.phx.redhat.com>

jwilson has given up the commit acl on dvgrab (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:22 +0000
Subject: [pkgdb] dvgrab ownership updated
Message-ID: <20090915191922.3C14010F886@bastion2.fedora.phx.redhat.com>

Package dvgrab in Fedora 10 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:19:23 +0000
Subject: [pkgdb] dvgrab ownership updated
Message-ID: <20090915191923.507BD10F880@bastion2.fedora.phx.redhat.com>

Package dvgrab in Fedora 11 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:22:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:22:38 +0000
Subject: [pkgdb] libiec61883 ownership updated
Message-ID: <20090915192238.6733B10F851@bastion2.fedora.phx.redhat.com>

Package libiec61883 in Fedora devel is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From mitr at fedoraproject.org  Tue Sep 15 19:22:42 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 15 Sep 2009 19:22:42 +0000 (UTC)
Subject: rpms/usermode/devel .cvsignore, 1.61, 1.62 sources, 1.65,
	1.66 usermode.spec, 1.91, 1.92
Message-ID: <20090915192242.6127611C00CE@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23169

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.101-1
- Update to usermode-1.101



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	14 Apr 2009 11:41:12 -0000	1.61
+++ .cvsignore	15 Sep 2009 19:22:41 -0000	1.62
@@ -1 +1 @@
-usermode-1.100.tar.bz2
+usermode-1.101.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	14 Apr 2009 11:41:12 -0000	1.65
+++ sources	15 Sep 2009 19:22:41 -0000	1.66
@@ -1 +1 @@
-c7f1c6d353bed3d9c823e3620cab8d40  usermode-1.100.tar.bz2
+0f29075fc56be213496086c3fdbfa3d7  usermode-1.101.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- usermode.spec	27 Jul 2009 06:39:43 -0000	1.91
+++ usermode.spec	15 Sep 2009 19:22:41 -0000	1.92
@@ -1,16 +1,16 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.100
-Release: 4
+Version: 1.101
+Release: 1
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
 Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
 Requires: pam, passwd, util-linux
 BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
-BuildRequires: libblkid-devel, libSM-devel, libglade2-devel, libselinux-devel
-BuildRequires: libuser-devel, pam-devel, perl-XML-Parser
-BuildRequires: startup-notification-devel, util-linux
+BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
+BuildRequires: pam-devel, perl-XML-Parser, startup-notification-devel
+BuildRequires: util-linux
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.101-1
+- Update to usermode-1.101
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.100-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Sep 15 19:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:22:45 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192245.2A3BC10F886@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libiec61883 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:22:52 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192252.6220810F851@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libiec61883 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:22:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:22:46 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192247.0F3FB10F88C@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libiec61883 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:22:56 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192256.55F2A10F898@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libiec61883 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:04 +0000
Subject: [pkgdb] libiec61883 ownership updated
Message-ID: <20090915192304.E749B10F880@bastion2.fedora.phx.redhat.com>

Package libiec61883 in Fedora 10 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:11 +0000
Subject: [pkgdb] libiec61883 ownership updated
Message-ID: <20090915192311.502FA10F888@bastion2.fedora.phx.redhat.com>

Package libiec61883 in Fedora 11 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:18 +0000
Subject: [pkgdb] libiec61883: dajt has requested watchbugzilla
Message-ID: <20090915192319.03E3B10F88C@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libiec61883 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:23 +0000
Subject: [pkgdb] libiec61883: dajt has requested commit
Message-ID: <20090915192323.37EF610F89C@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libiec61883 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:21 +0000
Subject: [pkgdb] libiec61883: dajt has requested watchcommits
Message-ID: <20090915192321.6ED1310F895@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libiec61883 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:25 +0000
Subject: [pkgdb] libiec61883: dajt has requested approveacls
Message-ID: <20090915192325.3867210F880@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libiec61883 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:30 +0000
Subject: [pkgdb] libiec61883: dajt has requested watchbugzilla
Message-ID: <20090915192330.B398F10F8A1@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libiec61883 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:32 +0000
Subject: [pkgdb] libiec61883: dajt has requested watchcommits
Message-ID: <20090915192332.DFD9310F8A3@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libiec61883 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:34 +0000
Subject: [pkgdb] libiec61883: dajt has requested commit
Message-ID: <20090915192334.50B4D10F8A5@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libiec61883 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:36 +0000
Subject: [pkgdb] libiec61883: dajt has requested approveacls
Message-ID: <20090915192336.B140410F886@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libiec61883 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:56 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192356.BC9A410F883@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libiec61883 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:23:59 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192359.746C010F89B@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libiec61883 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:01 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192401.E80E210F8A4@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libiec61883 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:04 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192404.4449110F8A8@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libiec61883 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:07 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192407.5011B10F89F@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libiec61883 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:09 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192409.B9EEB10F8A2@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libiec61883 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:12 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192412.1889210F8AB@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libiec61883 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:14 +0000
Subject: [pkgdb] libiec61883 had acl change status
Message-ID: <20090915192414.8FC1710F8AD@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libiec61883 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libiec61883



From dwalsh at fedoraproject.org  Tue Sep 15 19:24:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 15 Sep 2009 19:24:23 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.197,
	1.198 libselinux.spec, 1.376, 1.377
Message-ID: <20090915192423.ACEA111C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25241

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-2
- Eliminate -pthread switch in Makefile


libselinux-rhat.patch:
 man/man8/selinuxconlist.8 |   18 
 man/man8/selinuxdefcon.8  |   19 
 src/Makefile              |    9 
 src/callbacks.c           |    1 
 src/exception.sh          |   12 
 src/matchpathcon.c        |    3 
 src/selinux.py            | 1997 +++++++-
 src/selinuxswig.i         |   18 
 src/selinuxswig_python.i  |   10 
 src/selinuxswig_wrap.c    |10943 ++++++++++++++++++++++++----------------------
 utils/matchpathcon.c      |   10 
 11 files changed, 7558 insertions(+), 5482 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- libselinux-rhat.patch	14 Jul 2009 15:29:54 -0000	1.197
+++ libselinux-rhat.patch	15 Sep 2009 19:24:21 -0000	1.198
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.82/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.86/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.82/man/man8/selinuxconlist.8	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/man/man8/selinuxconlist.8	2009-09-15 15:20:59.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -20,9 +20,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.82/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.86/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.82/man/man8/selinuxdefcon.8	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/man/man8/selinuxdefcon.8	2009-09-15 15:20:59.000000000 -0400
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -43,9 +43,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.82/src/callbacks.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.86/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2009-04-08 09:06:23.000000000 -0400
-+++ libselinux-2.0.82/src/callbacks.c	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/callbacks.c	2009-09-15 15:20:59.000000000 -0400
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -54,9 +54,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.82/src/exception.sh
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.86/src/exception.sh
 --- nsalibselinux/src/exception.sh	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.82/src/exception.sh	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/exception.sh	2009-09-15 15:20:59.000000000 -0400
 @@ -0,0 +1,12 @@
 +function except() {
 +echo "
@@ -70,15 +70,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"
 +}
 +for i in `grep "extern *int" ../include/selinux/selinux.h | awk '{ print $3 }' | cut -d '(' -f 1`; do except $i ; done 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.82/src/Makefile
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.86/src/Makefile
 --- nsalibselinux/src/Makefile	2009-07-14 11:16:03.000000000 -0400
-+++ libselinux-2.0.82/src/Makefile	2009-06-23 15:50:58.000000000 -0400
-@@ -79,9 +79,12 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -lpthread -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
++++ libselinux-2.0.86/src/Makefile	2009-09-15 15:21:17.000000000 -0400
+@@ -82,6 +82,9 @@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
  	ln -sf $@ $(TARGET) 
  
 +selinuxswig_exception.i: ../include/selinux/selinux.h
@@ -107,9 +103,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  distclean: clean
  	rm -f $(GENERATED) $(SWIGFILES)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.82/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.86/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/matchpathcon.c	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/matchpathcon.c	2009-09-15 15:20:59.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -127,9 +123,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.82/src/selinux.py
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.86/src/selinux.py
 --- nsalibselinux/src/selinux.py	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/selinux.py	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinux.py	2009-09-15 15:20:59.000000000 -0400
 @@ -1,12 +1,26 @@
  # This file was automatically generated by SWIG (http://www.swig.org).
 -# Version 1.3.35
@@ -2341,9 +2337,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +selinux_lsetfilecon_default = _selinux.selinux_lsetfilecon_default
  
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.82/src/selinuxswig.i
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.86/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2009-03-12 08:48:48.000000000 -0400
-+++ libselinux-2.0.82/src/selinuxswig.i	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinuxswig.i	2009-09-15 15:20:59.000000000 -0400
 @@ -4,11 +4,14 @@
  
  %module selinux
@@ -2377,9 +2373,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +%include "../include/selinux/get_default_type.h"
 +%include "../include/selinux/label.h"
 +%include "../include/selinux/selinux.h"
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.82/src/selinuxswig_python.i
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.86/src/selinuxswig_python.i
 --- nsalibselinux/src/selinuxswig_python.i	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/selinuxswig_python.i	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinuxswig_python.i	2009-09-15 15:20:59.000000000 -0400
 @@ -21,6 +21,15 @@
                               map(restorecon, [os.path.join(dirname, fname)
                                                for fname in fnames]), None)
@@ -2402,9 +2398,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
 +%include "selinuxswig_exception.i"
  %include "selinuxswig.i"
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.82/src/selinuxswig_wrap.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.86/src/selinuxswig_wrap.c
 --- nsalibselinux/src/selinuxswig_wrap.c	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/selinuxswig_wrap.c	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinuxswig_wrap.c	2009-09-15 15:20:59.000000000 -0400
 @@ -1,6 +1,6 @@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
@@ -16790,9 +16786,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#endif
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.82/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.86/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2009-05-18 13:53:14.000000000 -0400
-+++ libselinux-2.0.82/utils/matchpathcon.c	2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/utils/matchpathcon.c	2009-09-15 15:20:59.000000000 -0400
 @@ -22,9 +22,13 @@
  	char *buf;
  	int rc = matchpathcon(path, mode, &buf);


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- libselinux.spec	8 Sep 2009 13:09:19 -0000	1.376
+++ libselinux.spec	15 Sep 2009 19:24:22 -0000	1.377
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.86
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -165,6 +165,9 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-2
+- Eliminate -pthread switch in Makefile
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-1
 - Update to upstream 
 	* Removal of reference counting on userspace AVC SID's.



From pkgdb at fedoraproject.org  Tue Sep 15 19:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:24:58 +0000
Subject: [pkgdb] libdv ownership updated
Message-ID: <20090915192458.28E2310F895@bastion2.fedora.phx.redhat.com>

Package libdv in Fedora devel is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:02 +0000
Subject: [pkgdb] libdv: dajt has requested watchbugzilla
Message-ID: <20090915192503.0428C10F89A@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libdv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:04 +0000
Subject: [pkgdb] libdv: dajt has requested watchcommits
Message-ID: <20090915192504.B83AE10F89C@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libdv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:06 +0000
Subject: [pkgdb] libdv: dajt has requested commit
Message-ID: <20090915192506.5290610F89F@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libdv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:08 +0000
Subject: [pkgdb] libdv: dajt has requested approveacls
Message-ID: <20090915192508.CDF0610F8A2@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libdv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:14 +0000
Subject: [pkgdb] libdv ownership updated
Message-ID: <20090915192514.B840410F8A3@bastion2.fedora.phx.redhat.com>

Package libdv in Fedora 10 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:18 +0000
Subject: [pkgdb] libdv ownership updated
Message-ID: <20090915192518.5095810F8A5@bastion2.fedora.phx.redhat.com>

Package libdv in Fedora 11 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:34 +0000
Subject: [pkgdb] libdv: dajt has requested watchbugzilla
Message-ID: <20090915192534.9D63910F88C@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libdv (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:36 +0000
Subject: [pkgdb] libdv: dajt has requested watchcommits
Message-ID: <20090915192536.A636310F895@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libdv (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:38 +0000
Subject: [pkgdb] libdv: dajt has requested commit
Message-ID: <20090915192538.6561310F898@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libdv (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:40 +0000
Subject: [pkgdb] libdv: dajt has requested approveacls
Message-ID: <20090915192540.25EC310F8A9@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libdv (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:42 +0000
Subject: [pkgdb] libdv: dajt has requested watchbugzilla
Message-ID: <20090915192542.DF75210F8AB@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libdv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:25:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:25:45 +0000
Subject: [pkgdb] libdv: dajt has requested watchcommits
Message-ID: <20090915192545.822A010F8AD@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libdv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:10 +0000
Subject: [pkgdb] libdv: dajt has requested commit
Message-ID: <20090915192610.3EC3E10F8A2@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libdv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:12 +0000
Subject: [pkgdb] libdv: dajt has requested approveacls
Message-ID: <20090915192612.20EB610F8A5@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libdv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:24 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192624.3D0A010F8A6@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libdv (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:26 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192626.AB0E210F895@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libdv (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:28 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192628.D097C10F8B0@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libdv (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:31 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192631.B865A10F8B2@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libdv (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:46 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192646.9D3E910F8B3@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libdv (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:48 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192648.88E4310F89C@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libdv (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:50 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192650.784B110F8B4@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libdv (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:26:52 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192652.9B4CF10F8B6@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libdv (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:00 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192701.0C6E510F8A0@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libdv (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:02 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192702.7D42310F8A2@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libdv (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:02 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192702.E2C4410F8B9@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libdv (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:09 +0000
Subject: [pkgdb] libdv had acl change status
Message-ID: <20090915192710.1203010F8A5@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libdv (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdv



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:38 +0000
Subject: [pkgdb] libavc1394 ownership updated
Message-ID: <20090915192738.71EB810F896@bastion2.fedora.phx.redhat.com>

Package libavc1394 in Fedora devel is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:43 +0000
Subject: [pkgdb] libavc1394 ownership updated
Message-ID: <20090915192743.9EF4C10F8A6@bastion2.fedora.phx.redhat.com>

Package libavc1394 in Fedora 10 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:27:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:27:47 +0000
Subject: [pkgdb] libavc1394 ownership updated
Message-ID: <20090915192747.5810E10F8A9@bastion2.fedora.phx.redhat.com>

Package libavc1394 in Fedora 11 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:00 +0000
Subject: [pkgdb] libavc1394: dajt has requested watchbugzilla
Message-ID: <20090915192800.EA73810F89F@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libavc1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:02 +0000
Subject: [pkgdb] libavc1394: dajt has requested watchcommits
Message-ID: <20090915192802.50E8C10F8AF@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libavc1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:03 +0000
Subject: [pkgdb] libavc1394: dajt has requested commit
Message-ID: <20090915192803.A403210F8B1@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libavc1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:06 +0000
Subject: [pkgdb] libavc1394: dajt has requested approveacls
Message-ID: <20090915192806.9C6D810F89D@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libavc1394 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:13 +0000
Subject: [pkgdb] libavc1394: dajt has requested watchbugzilla
Message-ID: <20090915192813.1791A10F8B5@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libavc1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:17 +0000
Subject: [pkgdb] libavc1394: dajt has requested commit
Message-ID: <20090915192817.92C4C10F8B7@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libavc1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:15 +0000
Subject: [pkgdb] libavc1394: dajt has requested watchcommits
Message-ID: <20090915192815.C77CC10F8B6@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libavc1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:19 +0000
Subject: [pkgdb] libavc1394: dajt has requested approveacls
Message-ID: <20090915192819.9DC7210F8BD@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libavc1394 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:23 +0000
Subject: [pkgdb] libavc1394: dajt has requested watchbugzilla
Message-ID: <20090915192823.BC4A210F8BF@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on libavc1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:25 +0000
Subject: [pkgdb] libavc1394: dajt has requested watchcommits
Message-ID: <20090915192825.4E02710F8C0@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on libavc1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:26 +0000
Subject: [pkgdb] libavc1394: dajt has requested commit
Message-ID: <20090915192826.C823010F8C1@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on libavc1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:31 +0000
Subject: [pkgdb] libavc1394: dajt has requested approveacls
Message-ID: <20090915192831.A17FB10F8C2@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on libavc1394 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:43 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192843.50B0010F8A3@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libavc1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:45 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192845.96A3C10F895@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libavc1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:47 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192847.E5D4310F898@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libavc1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:51 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192851.66E5D10F8C3@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libavc1394 (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:53 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192853.87C9010F8C6@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libavc1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:28:59 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192859.7881510F8A8@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libavc1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:29:01 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192901.854F610F8AA@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libavc1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:29:05 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192906.6F1D910F8CA@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libavc1394 (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:29:29 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192929.9A5D110F89F@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on libavc1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:29:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:29:34 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192934.DF1EB10F8AC@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on libavc1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:29:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:29:37 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192937.45C1910F8AF@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on libavc1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:29:40 +0000
Subject: [pkgdb] libavc1394 had acl change status
Message-ID: <20090915192940.20EEA10F8B1@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on libavc1394 (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libavc1394



From pkgdb at fedoraproject.org  Tue Sep 15 19:30:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:30:14 +0000
Subject: [pkgdb] dvgrab ownership updated
Message-ID: <20090915193014.5CD5A10F8BA@bastion2.fedora.phx.redhat.com>

Package dvgrab in Fedora devel is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:30:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:30:33 +0000
Subject: [pkgdb] dvgrab: dajt has requested watchbugzilla
Message-ID: <20090915193034.01C2110F895@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:00 +0000
Subject: [pkgdb] dvgrab: dajt has requested watchcommits
Message-ID: <20090915193100.C3B0810F8A5@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From cebbert at fedoraproject.org  Tue Sep 15 19:31:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 15 Sep 2009 19:31:07 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.7.bz2.sign, NONE, 1.1 .cvsignore,
	1.1055, 1.1056 kernel.spec, 1.1735, 1.1736 sources, 1.1017,
	1.1018 upstream, 1.928, 1.929 patch-2.6.30.6.bz2.sign, 1.1,
	NONE patch-2.6.30.7-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090915193107.B316F11C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30749

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.7.bz2.sign 
Removed Files:
	patch-2.6.30.6.bz2.sign patch-2.6.30.7-rc1.bz2.sign 
Log Message:
Linux 2.6.30.7


--- NEW FILE patch-2.6.30.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKr9uAyGugalF9Dw4RAtv3AJ9XyL5ewhKcwMfiVs9/wHDmuTrEBACeLaf1
JqIztW5wx+M3E83sQhTWvTY=
=LMfv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1055
retrieving revision 1.1056
diff -u -p -r1.1055 -r1.1056
--- .cvsignore	12 Sep 2009 05:46:30 -0000	1.1055
+++ .cvsignore	15 Sep 2009 19:31:05 -0000	1.1056
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.6.bz2
-patch-2.6.30.7-rc1.bz2
+patch-2.6.30.7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -p -r1.1735 -r1.1736
--- kernel.spec	15 Sep 2009 05:48:12 -0000	1.1735
+++ kernel.spec	15 Sep 2009 19:31:06 -0000	1.1736
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 7
 # 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}
@@ -1967,6 +1967,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-57
+- Linux 2.6.30.7
+
 * Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-56.rc1
 - Fix CIFS security flags mask broken in 2.6.30 (#523173)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -p -r1.1017 -r1.1018
--- sources	12 Sep 2009 05:46:30 -0000	1.1017
+++ sources	15 Sep 2009 19:31:07 -0000	1.1018
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-f89295707f68c2b349534b490c9d5f2d  patch-2.6.30.6.bz2
-240ff5b047ddbb6adb7b08dca99b4a4a  patch-2.6.30.7-rc1.bz2
+7c91fa862b90d74da3aa83446d69a412  patch-2.6.30.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -p -r1.928 -r1.929
--- upstream	12 Sep 2009 05:46:30 -0000	1.928
+++ upstream	15 Sep 2009 19:31:07 -0000	1.929
@@ -1,4 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.6.bz2
-patch-2.6.30.7-rc1.bz2
+patch-2.6.30.7.bz2
 


--- patch-2.6.30.6.bz2.sign DELETED ---


--- patch-2.6.30.7-rc1.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:02 +0000
Subject: [pkgdb] dvgrab: dajt has requested commit
Message-ID: <20090915193102.9B86E10F8AA@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:07 +0000
Subject: [pkgdb] dvgrab: dajt has requested approveacls
Message-ID: <20090915193107.842DB10F8C0@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on dvgrab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:12 +0000
Subject: [pkgdb] dvgrab ownership updated
Message-ID: <20090915193112.CE90610F89F@bastion2.fedora.phx.redhat.com>

Package dvgrab in Fedora 10 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:19 +0000
Subject: [pkgdb] dvgrab: dajt has requested watchbugzilla
Message-ID: <20090915193119.3ABA110F89D@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on dvgrab (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:27 +0000
Subject: [pkgdb] dvgrab: dajt has requested watchcommits
Message-ID: <20090915193127.92DBA10F8AD@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on dvgrab (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:29 +0000
Subject: [pkgdb] dvgrab: dajt has requested commit
Message-ID: <20090915193129.DA5BF10F8C6@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on dvgrab (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:33 +0000
Subject: [pkgdb] dvgrab: dajt has requested approveacls
Message-ID: <20090915193133.3A40110F8A0@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on dvgrab (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:37 +0000
Subject: [pkgdb] dvgrab ownership updated
Message-ID: <20090915193137.BB59610F8C7@bastion2.fedora.phx.redhat.com>

Package dvgrab in Fedora 11 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:45 +0000
Subject: [pkgdb] dvgrab: dajt has requested watchbugzilla
Message-ID: <20090915193145.9493410F8B4@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on dvgrab (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:52 +0000
Subject: [pkgdb] dvgrab: dajt has requested watchcommits
Message-ID: <20090915193152.22E2910F8B7@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on dvgrab (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:55 +0000
Subject: [pkgdb] dvgrab: dajt has requested commit
Message-ID: <20090915193155.6A7EF10F8CA@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on dvgrab (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:31:58 +0000
Subject: [pkgdb] dvgrab: dajt has requested approveacls
Message-ID: <20090915193158.3D2B110F8CD@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on dvgrab (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:08 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193208.D992D10F8CE@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on dvgrab (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:07 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193207.177FF10F8B9@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on dvgrab (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:10 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193210.EE31710F8D1@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on dvgrab (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:13 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193213.DBE3410F895@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on dvgrab (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:16 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193216.4837110F8A3@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on dvgrab (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:18 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193218.C1E7310F8D2@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on dvgrab (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:20 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193220.A42DD10F8D3@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on dvgrab (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:23 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193223.788B310F8D4@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on dvgrab (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:33 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193233.DFE8B10F8A9@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on dvgrab (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:35 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193235.D8BD810F8BE@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on dvgrab (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:37 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193238.0534010F8D7@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on dvgrab (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From pkgdb at fedoraproject.org  Tue Sep 15 19:32:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 19:32:41 +0000
Subject: [pkgdb] dvgrab had acl change status
Message-ID: <20090915193241.A7E3B10F8DA@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on dvgrab (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvgrab



From cebbert at fedoraproject.org  Tue Sep 15 19:42:15 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 15 Sep 2009 19:42:15 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.34.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.20, 1.960.2.21 kernel.spec, 1.1206.2.90,
	1.1206.2.91 linux-2.6-compile-fixes.patch, 1.178.12.1,
	1.178.12.2 sources, 1.922.2.20, 1.922.2.21 upstream, 1.834.2.20,
	1.834.2.21 linux-2.6-slub-fix-destroy-by-rcu.patch, 1.1.2.1,
	NONE patch-2.6.27.32.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090915194215.3852D11C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2176

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.34.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-slub-fix-destroy-by-rcu.patch 
	patch-2.6.27.32.bz2.sign 
Log Message:
Linux 2.6.27.34
Drop merged patch: linux-2.6-slub-fix-destroy-by-rcu.patch


--- NEW FILE patch-2.6.27.34.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKr9tEyGugalF9Dw4RAiszAJ41dycD1p5yNwBZb3SMRW7i+t8cvQCeNzQJ
CoLNkLWcIRXg1IlpJva+keQ=
=koUm
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.20
retrieving revision 1.960.2.21
diff -u -p -r1.960.2.20 -r1.960.2.21
--- .cvsignore	9 Sep 2009 04:31:42 -0000	1.960.2.20
+++ .cvsignore	15 Sep 2009 19:42:14 -0000	1.960.2.21
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.32.bz2
+patch-2.6.27.34.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.90
retrieving revision 1.1206.2.91
diff -u -p -r1.1206.2.90 -r1.1206.2.91
--- kernel.spec	9 Sep 2009 04:31:42 -0000	1.1206.2.90
+++ kernel.spec	15 Sep 2009 19:42:14 -0000	1.1206.2.91
@@ -39,7 +39,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 32
+%define stable_update 34
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -782,9 +782,6 @@ Patch13000: make-mmap_min_addr-suck-less
 Patch14000: linux-2.6-nfsd-report-short-writes-fix.patch
 Patch14001: linux-2.6-nfsd-report-short-writes.patch
 
-# patches requested for the next -stable release
-Patch14010: linux-2.6-slub-fix-destroy-by-rcu.patch
-
 # send for -stable
 Patch15000: linux-2.6-ppc64-vs-broadcom.patch
 Patch15001: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
@@ -1421,9 +1418,6 @@ ApplyPatch make-mmap_min_addr-suck-less.
 ApplyPatch linux-2.6-nfsd-report-short-writes.patch
 ApplyPatch linux-2.6-nfsd-report-short-writes-fix.patch
 
-# patches requested for the next -stable release
-ApplyPatch linux-2.6-slub-fix-destroy-by-rcu.patch
-
 # send for -stable:
 ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
@@ -2004,6 +1998,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 15 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.34-170.2.91
+- Linux 2.6.27.34
+- Drop merged patch: linux-2.6-slub-fix-destroy-by-rcu.patch
+
 * Wed Sep 09 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.32-170.2.90
 - 2.6.27.32 final
 - Drop linux-2.6-ocfs2-handle-len-0.patch, added after .32-rc1

linux-2.6-compile-fixes.patch:
 fsl_lbc.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.178.12.1
retrieving revision 1.178.12.2
diff -u -p -r1.178.12.1 -r1.178.12.2
--- linux-2.6-compile-fixes.patch	5 Sep 2009 14:19:56 -0000	1.178.12.1
+++ linux-2.6-compile-fixes.patch	15 Sep 2009 19:42:14 -0000	1.178.12.2
@@ -22,21 +22,3 @@ index 422c8fa..1c6c522 100644
  
  struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  EXPORT_SYMBOL(fsl_lbc_regs);
-
-2.6.27.32-rc1 is missing this line, causing:
-fs/ocfs2/aops.c: In function 'ocfs2_write_cluster':
-fs/ocfs2/aops.c:1286: error: 'should_zero' undeclared (first use in this function)
-
-Caused by patch #41:
-ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
-
---- linux-2.6.27.x86_64.orig/fs/ocfs2/aops.c
-+++ linux-2.6.27.x86_64/fs/ocfs2/aops.c
-@@ -1234,6 +1234,7 @@ out:
-  */
- static int ocfs2_write_cluster(struct address_space *mapping,
- 			       u32 phys, unsigned int unwritten,
-+			       unsigned int should_zero,
- 			       struct ocfs2_alloc_context *data_ac,
- 			       struct ocfs2_alloc_context *meta_ac,
- 			       struct ocfs2_write_ctxt *wc, u32 cpos,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.20
retrieving revision 1.922.2.21
diff -u -p -r1.922.2.20 -r1.922.2.21
--- sources	9 Sep 2009 04:31:42 -0000	1.922.2.20
+++ sources	15 Sep 2009 19:42:14 -0000	1.922.2.21
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-3a3e67d089a707dbd8a34105ecce7d5f  patch-2.6.27.32.bz2
+e9c937fd29350075634f3b4d1a053825  patch-2.6.27.34.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.20
retrieving revision 1.834.2.21
diff -u -p -r1.834.2.20 -r1.834.2.21
--- upstream	9 Sep 2009 04:31:42 -0000	1.834.2.20
+++ upstream	15 Sep 2009 19:42:14 -0000	1.834.2.21
@@ -1,3 +1,3 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.32.bz2
+patch-2.6.27.34.bz2
 


--- linux-2.6-slub-fix-destroy-by-rcu.patch DELETED ---


--- patch-2.6.27.32.bz2.sign DELETED ---



From myoung at fedoraproject.org  Tue Sep 15 19:45:56 2009
From: myoung at fedoraproject.org (myoung)
Date: Tue, 15 Sep 2009 19:45:56 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ahci-export-capabilities.patch, NONE,
	1.2.2.2 linux-2.6-nfs4-ver4opt.patch, NONE,
	1.2.2.2 linux-2.6-rfkill-all.patch, NONE,
	1.1.2.2 linux-2.6-rtc-show-hctosys.patch, NONE,
	1.1.2.2 linux-2.6-scsi-sd-fix-oops-during-scanning.patch, NONE,
	1.1.2.1 linux-2.6-scsi-sg-fix-oops-in-error-path.patch, NONE,
	1.1.2.1 linux-2.6.31-modules-ro-nx.patch, NONE,
	1.2.2.2 linux-2.6.31-nx-data.patch, NONE,
	1.1.2.2 drm-nouveau.patch, 1.8.6.17, 1.8.6.18 kernel.spec,
	1.1294.2.65, 1.1294.2.66 xen.pvops.patch, 1.1.2.41, 1.1.2.42
Message-ID: <20090915194556.3B32A11C00CE@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2816

Modified Files:
      Tag: private-myoung-dom0-branch
	drm-nouveau.patch kernel.spec xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	linux-2.6-ahci-export-capabilities.patch 
	linux-2.6-nfs4-ver4opt.patch linux-2.6-rfkill-all.patch 
	linux-2.6-rtc-show-hctosys.patch 
	linux-2.6-scsi-sd-fix-oops-during-scanning.patch 
	linux-2.6-scsi-sg-fix-oops-in-error-path.patch 
	linux-2.6.31-modules-ro-nx.patch linux-2.6.31-nx-data.patch 
Log Message:
switch pvops to F-12 branch for the moment


linux-2.6-ahci-export-capabilities.patch:
 ahci.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

--- NEW FILE linux-2.6-ahci-export-capabilities.patch ---
commit 489b070aa53cb6a70494f53d9d8bd4c8570439e4
Author: Matthew Garrett <mjg at redhat.com>
Date:   Fri Jul 17 20:06:06 2009 +0100

    libata: Export AHCI capabilities
    
    AHCI exports various capability bits that may be of interest to userspace
    such as whether the BIOS claims a port is hotpluggable or eSATA. Providing
    these via sysfs along with the version of the AHCI spec implemented by
    the host allows userspace to make policy decisions for things like ALPM.
    
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 336eb1e..5a5c160 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -327,10 +327,24 @@ static ssize_t ahci_activity_store(struct ata_device *dev,
 				   enum sw_activity val);
 static void ahci_init_sw_activity(struct ata_link *link);
 
+static ssize_t ahci_show_host_caps(struct device *dev,
+				   struct device_attribute *attr, char *buf);
+static ssize_t ahci_show_host_version(struct device *dev,
+				      struct device_attribute *attr, char *buf);
+static ssize_t ahci_show_port_cmd(struct device *dev,
+				  struct device_attribute *attr, char *buf);
+
+DEVICE_ATTR(ahci_host_caps, S_IRUGO, ahci_show_host_caps, NULL);
+DEVICE_ATTR(ahci_host_version, S_IRUGO, ahci_show_host_version, NULL);
+DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL);
+
 static struct device_attribute *ahci_shost_attrs[] = {
 	&dev_attr_link_power_management_policy,
 	&dev_attr_em_message_type,
 	&dev_attr_em_message,
+	&dev_attr_ahci_host_caps,
+	&dev_attr_ahci_host_version,
+	&dev_attr_ahci_port_cmd,
 	NULL
 };
 
@@ -696,6 +710,36 @@ static void ahci_enable_ahci(void __iomem *mmio)
 	WARN_ON(1);
 }
 
+static ssize_t ahci_show_host_caps(struct device *dev,
+				   struct device_attribute *attr, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(dev);
+	struct ata_port *ap = ata_shost_to_port(shost);
+	struct ahci_host_priv *hpriv = ap->host->private_data;
+
+	return sprintf(buf, "%x\n", hpriv->cap);
+}
+
+static ssize_t ahci_show_host_version(struct device *dev,
+				   struct device_attribute *attr, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(dev);
+	struct ata_port *ap = ata_shost_to_port(shost);
+	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];
+
+	return sprintf(buf, "%x\n", readl(mmio + HOST_VERSION));
+}
+
+static ssize_t ahci_show_port_cmd(struct device *dev,
+				  struct device_attribute *attr, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(dev);
+	struct ata_port *ap = ata_shost_to_port(shost);
+	void __iomem *port_mmio = ahci_port_base(ap);
+
+	return sprintf(buf, "%x\n", readl(port_mmio + PORT_CMD));
+}
+
 /**
  *	ahci_save_initial_config - Save and fixup initial config values
  *	@pdev: target PCI device

linux-2.6-nfs4-ver4opt.patch:
 fs/nfs/internal.h    |   10 +-
 fs/nfs/super.c       |  214 ++++++++++++++++++++++++++++++++++-----------------
 include/linux/nfs4.h |    1 
 3 files changed, 155 insertions(+), 70 deletions(-)

--- NEW FILE linux-2.6-nfs4-ver4opt.patch ---
diff -up linux-2.6.30.i686/fs/nfs/internal.h.save linux-2.6.30.i686/fs/nfs/internal.h
--- linux-2.6.30.i686/fs/nfs/internal.h.save	2009-09-10 10:14:10.000000000 -0400
+++ linux-2.6.30.i686/fs/nfs/internal.h	2009-09-10 11:06:38.000000000 -0400
@@ -49,6 +49,11 @@ struct nfs_clone_mount {
 #define NFS_MAX_SECFLAVORS	(12)
 
 /*
+ * Value used if the user did not specify a port value.
+ */
+#define NFS_UNSPEC_PORT		(-1)
+
+/*
  * In-kernel mount arguments
  */
 struct nfs_parsed_mount_data {
@@ -63,6 +68,7 @@ struct nfs_parsed_mount_data {
 	unsigned int		auth_flavor_len;
 	rpc_authflavor_t	auth_flavors[1];
 	char			*client_address;
+	unsigned int		version;
 	unsigned int		minorversion;
 	char			*fscache_uniq;
 
@@ -71,7 +77,7 @@ struct nfs_parsed_mount_data {
 		size_t			addrlen;
 		char			*hostname;
 		u32			version;
-		unsigned short		port;
+		int			port;
 		unsigned short		protocol;
 	} mount_server;
 
@@ -80,7 +86,7 @@ struct nfs_parsed_mount_data {
 		size_t			addrlen;
 		char			*hostname;
 		char			*export_path;
-		unsigned short		port;
+		int			port;
 		unsigned short		protocol;
 	} nfs_server;
 
diff -up linux-2.6.30.i686/fs/nfs/super.c.save linux-2.6.30.i686/fs/nfs/super.c
--- linux-2.6.30.i686/fs/nfs/super.c.save	2009-09-10 10:14:24.000000000 -0400
+++ linux-2.6.30.i686/fs/nfs/super.c	2009-09-10 15:14:10.000000000 -0400
@@ -73,7 +73,7 @@ enum {
 	Opt_cto, Opt_nocto,
 	Opt_ac, Opt_noac,
 	Opt_lock, Opt_nolock,
-	Opt_v2, Opt_v3,
+	Opt_v2, Opt_v3, Opt_v4,
 	Opt_udp, Opt_tcp, Opt_rdma,
 	Opt_acl, Opt_noacl,
 	Opt_rdirplus, Opt_nordirplus,
@@ -127,6 +127,7 @@ static const match_table_t nfs_mount_opt
 	{ Opt_nolock, "nolock" },
 	{ Opt_v2, "v2" },
 	{ Opt_v3, "v3" },
+	{ Opt_v4, "v4" },
 	{ Opt_udp, "udp" },
 	{ Opt_tcp, "tcp" },
 	{ Opt_rdma, "rdma" },
@@ -272,6 +273,10 @@ static const struct super_operations nfs
 };
 
 #ifdef CONFIG_NFS_V4
+static int nfs4_validate_text_mount_data(void *options,
+	struct nfs_parsed_mount_data *args, const char *dev_name);
+static int nfs4_try_mount(int flags, const char *dev_name,
+	struct nfs_parsed_mount_data *data, struct vfsmount *mnt);
 static int nfs4_get_sb(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);
 static int nfs4_remote_get_sb(struct file_system_type *fs_type,
@@ -866,6 +871,21 @@ void nfs_parse_ip_address(char *string, 
 }
 
 /*
+ * Select between a default port value and a user-specified port value.
+ * If a zero value is set, then autobind will be used.
+ */
+static void nfs_set_default_port(struct sockaddr *sap, const int parsed_port,
+				 const unsigned short default_port)
+{
+	unsigned short port = default_port;
+
+	if (parsed_port != NFS_UNSPEC_PORT)
+		port = parsed_port;
+
+	nfs_set_port(sap, port);
+}
+
+/*
  * Sanity check the NFS transport protocol.
  *
  */
@@ -1047,10 +1067,18 @@ static int nfs_parse_mount_options(char 
 			break;
 		case Opt_v2:
 			mnt->flags &= ~NFS_MOUNT_VER3;
+			mnt->version = 2;
 			break;
 		case Opt_v3:
 			mnt->flags |= NFS_MOUNT_VER3;
+			mnt->version = 3;
 			break;
+#ifdef CONFIG_NFS_V4
+		case Opt_v4:
+			mnt->flags &= ~NFS_MOUNT_VER3;
+			mnt->version = 4;
+			break;
+#endif
 		case Opt_udp:
 			mnt->flags &= ~NFS_MOUNT_TCP;
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
@@ -1264,10 +1292,18 @@ static int nfs_parse_mount_options(char 
 			switch (option) {
 			case NFS2_VERSION:
 				mnt->flags &= ~NFS_MOUNT_VER3;
+				mnt->version = 2;
 				break;
 			case NFS3_VERSION:
 				mnt->flags |= NFS_MOUNT_VER3;
+				mnt->version = 3;
+				break;
+#ifdef CONFIG_NFS_V4
+			case NFS4_VERSION:
+				mnt->flags &= ~NFS_MOUNT_VER3;
+				mnt->version = 4;
 				break;
+#endif
 			default:
 				goto out_invalid_value;
 			}
@@ -1485,11 +1521,7 @@ static int nfs_try_mount(struct nfs_pars
 		args->mount_server.addrlen = args->nfs_server.addrlen;
 	}
 	request.salen = args->mount_server.addrlen;
-
-	/*
-	 * autobind will be used if mount_server.port == 0
-	 */
-	nfs_set_port(request.sap, args->mount_server.port);
+	nfs_set_default_port(request.sap, args->mount_server.port, 0);
 
 	/*
 	 * Now ask the mount server to map our export path
@@ -1661,6 +1693,7 @@ static int nfs_validate_mount_data(void 
 				   const char *dev_name)
 {
 	struct nfs_mount_data *data = (struct nfs_mount_data *)options;
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
 
 	if (data == NULL)
 		goto out_no_data;
@@ -1672,10 +1705,11 @@ static int nfs_validate_mount_data(void 
 	args->acregmax		= NFS_DEF_ACREGMAX;
 	args->acdirmin		= NFS_DEF_ACDIRMIN;
 	args->acdirmax		= NFS_DEF_ACDIRMAX;
-	args->mount_server.port	= 0;	/* autobind unless user sets port */
-	args->nfs_server.port	= 0;	/* autobind unless user sets port */
+	args->mount_server.port	= NFS_UNSPEC_PORT;
+	args->nfs_server.port	= NFS_UNSPEC_PORT;
 	args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
 	args->auth_flavors[0]	= RPC_AUTH_UNIX;
+	args->minorversion	= 0;
 
 	switch (data->version) {
 	case 1:
@@ -1697,8 +1731,11 @@ static int nfs_validate_mount_data(void 
 			if (data->root.size > NFS3_FHSIZE || data->root.size == 0)
 				goto out_invalid_fh;
 			mntfh->size = data->root.size;
-		} else
+			args->version = 3;
+		} else {
 			mntfh->size = NFS2_FHSIZE;
+			args->version = 2;
+		}
 
 
 		memcpy(mntfh->data, data->root.data, mntfh->size);
@@ -1720,11 +1757,9 @@ static int nfs_validate_mount_data(void 
 		args->acdirmin		= data->acdirmin;
 		args->acdirmax		= data->acdirmax;
 
-		memcpy(&args->nfs_server.address, &data->addr,
-		       sizeof(data->addr));
+		memcpy(sap, &data->addr, sizeof(data->addr));
 		args->nfs_server.addrlen = sizeof(data->addr);
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
 		if (!(data->flags & NFS_MOUNT_TCP))
@@ -1772,12 +1807,18 @@ static int nfs_validate_mount_data(void 
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
-		nfs_set_port((struct sockaddr *)&args->nfs_server.address,
-				args->nfs_server.port);
+		if (args->version == 4)
+#ifdef CONFIG_NFS_V4
+			return nfs4_validate_text_mount_data(options,
+							     args, dev_name);
+#else
+			goto out_v4_not_compiled;
+#endif
+
+		nfs_set_default_port(sap, args->nfs_server.port, 0);
 
 		nfs_set_mount_transport_protocol(args);
 
@@ -1825,6 +1866,12 @@ out_v3_not_compiled:
 	return -EPROTONOSUPPORT;
 #endif /* !CONFIG_NFS_V3 */
 
+#ifndef CONFIG_NFS_V4
+out_v4_not_compiled:
+	dfprintk(MOUNT, "NFS: NFSv4 is not compiled into kernel\n");
+	return -EPROTONOSUPPORT;
+#endif /* !CONFIG_NFS_V4 */
+
 out_nomem:
 	dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n");
 	return -ENOMEM;
@@ -2120,6 +2167,14 @@ static int nfs_get_sb(struct file_system
 	if (error < 0)
 		goto out;
 
+#ifdef CONFIG_NFS_V4
+	if (data->version == 4) {
+		error = nfs4_try_mount(flags, dev_name, data, mnt);
+		kfree(data->client_address);
+		goto out;
+	}
+#endif	/* CONFIG_NFS_V4 */
+
 	/* Get a volume representation */
 	server = nfs_create_server(data, mntfh);
 	if (IS_ERR(server)) {
@@ -2317,6 +2372,43 @@ static void nfs4_validate_mount_flags(st
 	args->flags &= ~(NFS_MOUNT_NONLM|NFS_MOUNT_NOACL|NFS_MOUNT_VER3);
 }
 
+static int nfs4_validate_text_mount_data(void *options,
+					 struct nfs_parsed_mount_data *args,
+					 const char *dev_name)
+{
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
+
+	nfs_set_default_port(sap, args->nfs_server.port, NFS_PORT);
+
+	nfs_validate_transport_protocol(args);
+
+	nfs4_validate_mount_flags(args);
+
+	if (args->version != 4) {
+		dfprintk(MOUNT,
+			 "NFS4: Illegal mount version\n");
+		return -EINVAL;
+	}
+
+	if (args->auth_flavor_len > 1) {
+		dfprintk(MOUNT,
+			 "NFS4: Too many RPC auth flavours specified\n");
+		return -EINVAL;
+	}
+
+	if (args->client_address == NULL) {
+		dfprintk(MOUNT,
+			 "NFS4: mount program didn't pass callback address\n");
+		return -EINVAL;
+	}
+
+	return nfs_parse_devname(dev_name,
+				   &args->nfs_server.hostname,
+				   NFS4_MAXNAMLEN,
+				   &args->nfs_server.export_path,
+				   NFS4_MAXPATHLEN);
+}
+
 /*
  * Validate NFSv4 mount options
  */
@@ -2324,7 +2416,7 @@ static int nfs4_validate_mount_data(void
 				    struct nfs_parsed_mount_data *args,
 				    const char *dev_name)
 {
-	struct sockaddr_in *ap;
+	struct sockaddr *sap = (struct sockaddr *)&args->nfs_server.address;
 	struct nfs4_mount_data *data = (struct nfs4_mount_data *)options;
 	char *c;
 
@@ -2337,23 +2429,22 @@ static int nfs4_validate_mount_data(void
 	args->acregmax		= NFS_DEF_ACREGMAX;
 	args->acdirmin		= NFS_DEF_ACDIRMIN;
 	args->acdirmax		= NFS_DEF_ACDIRMAX;
-	args->nfs_server.port	= NFS_PORT; /* 2049 unless user set port= */
+	args->nfs_server.port	= NFS_UNSPEC_PORT;
 	args->auth_flavors[0]	= RPC_AUTH_UNIX;
 	args->auth_flavor_len	= 0;
+	args->version		= 4;
 	args->minorversion	= 0;
 
 	switch (data->version) {
 	case 1:
-		ap = (struct sockaddr_in *)&args->nfs_server.address;
 		if (data->host_addrlen > sizeof(args->nfs_server.address))
 			goto out_no_address;
 		if (data->host_addrlen == 0)
 			goto out_no_address;
 		args->nfs_server.addrlen = data->host_addrlen;
-		if (copy_from_user(ap, data->host_addr, data->host_addrlen))
+		if (copy_from_user(sap, data->host_addr, data->host_addrlen))
 			return -EFAULT;
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (nfs_verify_server_address(sap))
 			goto out_no_address;
 
 		if (data->auth_flavourlen) {
@@ -2399,39 +2490,14 @@ static int nfs4_validate_mount_data(void
 		nfs_validate_transport_protocol(args);
 
 		break;
-	default: {
-		int status;
-
+	default:
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
-		if (!nfs_verify_server_address((struct sockaddr *)
-						&args->nfs_server.address))
+		if (!nfs_verify_server_address(sap))
 			return -EINVAL;
 
-		nfs_set_port((struct sockaddr *)&args->nfs_server.address,
-				args->nfs_server.port);
-
-		nfs_validate_transport_protocol(args);
-
-		nfs4_validate_mount_flags(args);
-
-		if (args->auth_flavor_len > 1)
-			goto out_inval_auth;
-
-		if (args->client_address == NULL)
-			goto out_no_client_address;
-
-		status = nfs_parse_devname(dev_name,
-					   &args->nfs_server.hostname,
-					   NFS4_MAXNAMLEN,
-					   &args->nfs_server.export_path,
-					   NFS4_MAXPATHLEN);
-		if (status < 0)
-			return status;
-
-		break;
-		}
+		return nfs4_validate_text_mount_data(options, args, dev_name);
 	}
 
 	return 0;
@@ -2448,10 +2514,6 @@ out_inval_auth:
 out_no_address:
 	dfprintk(MOUNT, "NFS4: mount program didn't pass remote address\n");
 	return -EINVAL;
-
-out_no_client_address:
-	dfprintk(MOUNT, "NFS4: mount program didn't pass callback address\n");
-	return -EINVAL;
 }
 
 /*
@@ -2618,6 +2680,34 @@ out_err:
 	return ret;
 }
 
+static int nfs4_try_mount(int flags, const char *dev_name,
+			 struct nfs_parsed_mount_data *data,
+			 struct vfsmount *mnt)
+{
+	char *export_path;
+	struct vfsmount *root_mnt;
+	int error;
+
+	dfprintk(MOUNT, "--> nfs4_try_mount()\n");
+
+	export_path = data->nfs_server.export_path;
+	data->nfs_server.export_path = "/";
+	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
+			data->nfs_server.hostname);
+	data->nfs_server.export_path = export_path;
+
+	error = PTR_ERR(root_mnt);
+	if (IS_ERR(root_mnt))
+		goto out;
+
+	error = nfs_follow_remote_path(root_mnt, export_path, mnt);
+
+out:
+	dfprintk(MOUNT, "<-- nfs4_try_mount() = %d%s\n", error,
+			error != 0 ? " [error]" : "");
+	return error;
+}
+
 /*
  * Get the superblock for an NFS4 mountpoint
  */
@@ -2625,8 +2715,6 @@ static int nfs4_get_sb(struct file_syste
 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)
 {
 	struct nfs_parsed_mount_data *data;
-	char *export_path;
-	struct vfsmount *root_mnt;
 	int error = -ENOMEM;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);
@@ -2638,17 +2726,7 @@ static int nfs4_get_sb(struct file_syste
 	if (error < 0)
 		goto out;
 
-	export_path = data->nfs_server.export_path;
-	data->nfs_server.export_path = "/";
-	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, data,
-			data->nfs_server.hostname);
-	data->nfs_server.export_path = export_path;
-
-	error = PTR_ERR(root_mnt);
-	if (IS_ERR(root_mnt))
-		goto out;
-
-	error = nfs_follow_remote_path(root_mnt, export_path, mnt);
+	error = nfs4_try_mount(flags, dev_name, data, mnt);
 
 out:
 	kfree(data->client_address);
diff -up linux-2.6.30.i686/include/linux/nfs4.h.save linux-2.6.30.i686/include/linux/nfs4.h
--- linux-2.6.30.i686/include/linux/nfs4.h.save	2009-09-10 10:14:38.000000000 -0400
+++ linux-2.6.30.i686/include/linux/nfs4.h	2009-09-10 11:06:38.000000000 -0400
@@ -472,6 +472,7 @@ enum lock_type4 {
 
 #define NFSPROC4_NULL 0
 #define NFSPROC4_COMPOUND 1
+#define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
 #if defined(CONFIG_NFS_V4_1)

linux-2.6-rfkill-all.patch:
 include/linux/input.h  |    2 ++
 include/linux/rfkill.h |    2 +-
 net/rfkill/input.c     |    8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-rfkill-all.patch ---
diff --git a/include/linux/input.h b/include/linux/input.h
index 8b3bc3e..20a622e 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -595,6 +595,8 @@ struct input_absinfo {
 #define KEY_NUMERIC_STAR	0x20a
 #define KEY_NUMERIC_POUND	0x20b
 
+#define KEY_RFKILL		0x20c /* Key that controls all radios */
+
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING	KEY_MUTE
 #define KEY_MAX			0x2ff
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 278777f..4c39f7e 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -32,7 +32,7 @@
 /**
  * enum rfkill_type - type of rfkill switch.
  *
- * @RFKILL_TYPE_ALL: toggles all switches (userspace only)
+ * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
  * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
  * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
  * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
diff --git a/net/rfkill/input.c b/net/rfkill/input.c
index a7295ad..3713d7e 100644
--- a/net/rfkill/input.c
+++ b/net/rfkill/input.c
@@ -212,6 +212,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
 		case KEY_WIMAX:
 			rfkill_schedule_toggle(RFKILL_TYPE_WIMAX);
 			break;
+		case KEY_RFKILL:
+			rfkill_schedule_toggle(RFKILL_TYPE_ALL);
+			break;
 		}
 	} else if (type == EV_SW && code == SW_RFKILL_ALL)
 		rfkill_schedule_evsw_rfkillall(data);
@@ -295,6 +298,11 @@ static const struct input_device_id rfkill_ids[] = {
 		.keybit = { [BIT_WORD(KEY_WIMAX)] = BIT_MASK(KEY_WIMAX) },
 	},
 	{
+		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
+		.evbit = { BIT_MASK(EV_KEY) },
+		.keybit = { [BIT_WORD(KEY_RFKILL)] = BIT_MASK(KEY_RFKILL) },
+	},
+	{
 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT,
 		.evbit = { BIT(EV_SW) },
 		.swbit = { [BIT_WORD(SW_RFKILL_ALL)] = BIT_MASK(SW_RFKILL_ALL) },

linux-2.6-rtc-show-hctosys.patch:
 Documentation/rtc.txt     |    2 ++
 b/Documentation/rtc.txt   |   22 ++++++++++++++++++++++
 b/drivers/rtc/rtc-sysfs.c |   14 ++++++++++++++
 3 files changed, 38 insertions(+)

--- NEW FILE linux-2.6-rtc-show-hctosys.patch ---
diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt
index 8deffcd..216bb8c 100644
--- a/Documentation/rtc.txt
+++ b/Documentation/rtc.txt
@@ -135,6 +135,28 @@ a high functionality RTC is integrated into the SOC.  That system might read
 the system clock from the discrete RTC, but use the integrated one for all
 other tasks, because of its greater functionality.
 
+SYSFS INTERFACE
+---------------
+
+The sysfs interface under /sys/class/rtc/rtcN provides access to various
+rtc attributes without requiring the use of ioctls. All dates and times
+are in the RTC's timezone, rather than in system time.
+
+date:  	   	 RTC-provided date
+max_user_freq:	 The maximum interrupt rate an unprivileged user may request
+		 from this RTC.
+name:		 The name of the RTC corresponding to this sysfs directory
+since_epoch:	 The number of seconds since the epoch according to the RTC
+time:		 RTC-provided time
+wakealarm:	 The time at which the clock will generate a system wakeup
+		 event. This is a one shot wakeup event, so must be reset
+		 after wake if a daily wakeup is required. Format is either
+		 seconds since the epoch or, if there's a leading +, seconds
+		 in the future.
+
+IOCTL INTERFACE
+---------------
+
 The ioctl() calls supported by /dev/rtc are also supported by the RTC class
 framework.  However, because the chips and systems are not standardized,
 some PC/AT functionality might not be provided.  And in the same way, some

diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt
index 216bb8c..baac51f 100644
--- a/Documentation/rtc.txt
+++ b/Documentation/rtc.txt
@@ -143,6 +143,8 @@ rtc attributes without requiring the use of ioctls. All dates and times
 are in the RTC's timezone, rather than in system time.
 
 date:  	   	 RTC-provided date
+hctosys:   	 1 if the RTC provided the system time at boot via the
+		 CONFIG_RTC_HCTOSYS kernel option, 0 otherwise
 max_user_freq:	 The maximum interrupt rate an unprivileged user may request
 		 from this RTC.
 name:		 The name of the RTC corresponding to this sysfs directory
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 2531ce4..7dd23a6 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -102,6 +102,19 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
 	return n;
 }
 
+static ssize_t
+rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
+		char *buf)
+{
+#ifdef CONFIG_RTC_HCTOSYS_DEVICE
+	if (strcmp(dev_name(&to_rtc_device(dev)->dev),
+		   CONFIG_RTC_HCTOSYS_DEVICE) == 0)
+		return sprintf(buf, "1\n");
+	else
+#endif
+		return sprintf(buf, "0\n");
+}
+
 static struct device_attribute rtc_attrs[] = {
 	__ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL),
 	__ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL),
@@ -109,6 +122,7 @@ static struct device_attribute rtc_attrs[] = {
 	__ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL),
 	__ATTR(max_user_freq, S_IRUGO | S_IWUSR, rtc_sysfs_show_max_user_freq,
 			rtc_sysfs_set_max_user_freq),
+	__ATTR(hctosys, S_IRUGO, rtc_sysfs_show_hctosys, NULL),
 	{ },
 };
 


linux-2.6-scsi-sd-fix-oops-during-scanning.patch:
 sd.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE linux-2.6-scsi-sd-fix-oops-during-scanning.patch ---
From: James Bottomley <James.Bottomley at suse.de>
Date: Fri, 21 Aug 2009 15:47:54 +0000 (-0600)
Subject: [SCSI] fix oops during scsi scanning
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjejb%2Fscsi-misc-2.6.git;a=commitdiff_plain;h=ea038f63ac52439e7816295fa6064fe95e6c1f51

[SCSI] fix oops during scsi scanning

Chris Webb reported:
  p0# uname -a
  Linux f7ea8425-d45b-490f-a738-d181d0df6963.host.elastichosts.com 2.6.30.4-elastic-lon-p #2 SMP PREEMPT Thu Aug 20 14:30:50 BST 2009 x86_64 Intel(R) Xeon(R) CPU E5420 @ 2.50GHz GenuineIntel GNU/Linux
  p0# zgrep SCAN_ASYNC /proc/config.gz
  # CONFIG_SCSI_SCAN_ASYNC is not set

  p0# cat /var/log/kern/2009-08-20
  [...]
  15:27:10.485 kernel: scsi9 : iSCSI Initiator over TCP/IP
  15:27:11.493 kernel: scsi 9:0:0:0: RAID              IET      Controller       0001 PQ: 0 ANSI: 5
  15:27:11.493 kernel: scsi 9:0:0:0: Attached scsi generic sg6 type 12
  15:27:11.495 kernel: scsi 9:0:0:1: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
  15:27:11.495 kernel: sd 9:0:0:1: Attached scsi generic sg7 type 0
  15:27:11.495 kernel: sd 9:0:0:1: [sdg] 4194304 512-byte hardware sectors: (2.14 GB/2.00 GiB)
  15:27:11.495 kernel: sd 9:0:0:1: [sdg] Write Protect is off
  15:27:11.495 kernel: sd 9:0:0:1: [sdg] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
  15:27:13.012 kernel: sdg:<6>scsi 9:0:0:1: [sdg] Unhandled error code
  15:27:13.012 kernel: scsi 9:0:0:1: [sdg] Result: hostbyte=0x07 driverbyte=0x00
  15:27:13.012 kernel: end_request: I/O error, dev sdg, sector 0
  15:27:13.012 kernel: Buffer I/O error on device sdg, logical block 0
  15:27:13.012 kernel: ldm_validate_partition_table(): Disk read failed.
  15:27:13.012 kernel: unable to read partition table
  15:27:13.014 kernel: BUG: unable to handle kernel NULL pointer dereference at 0000000000000010
  15:27:13.014 kernel: IP: [<ffffffff803f0d77>] disk_part_iter_next+0x74/0xfd
  15:27:13.014 kernel: PGD 82ad0b067 PUD 82cd7e067 PMD 0
  15:27:13.014 kernel: Oops: 0000 [#1] PREEMPT SMP
  15:27:13.014 kernel: last sysfs file: /sys/devices/platform/host9/session4/iscsi_session/session4/ifacename
  15:27:13.014 kernel: CPU 5
  15:27:13.014 kernel: Modules linked in:
  15:27:13.014 kernel: Pid: 13999, comm: async/0 Not tainted 2.6.30.4-elastic-lon-p #2 X7DBN
  15:27:13.014 kernel: RIP: 0010:[<ffffffff803f0d77>]  [<ffffffff803f0d77>] disk_part_iter_next+0x74/0xfd
  15:27:13.014 kernel: RSP: 0018:ffff88066afa3dd0  EFLAGS: 00010246
  15:27:13.014 kernel: RAX: ffff88082b58a000 RBX: ffff88066afa3e00 RCX: 0000000000000000
  15:27:13.014 kernel: RDX: 0000000000000000 RSI: ffff88082b58a000 RDI: 0000000000000000
  15:27:13.014 kernel: RBP: ffff88066afa3df0 R08: ffff88066afa2000 R09: ffff8806a204f000
  15:27:13.014 kernel: R10: 000000fb12c7d274 R11: ffff8806c2bf0628 R12: ffff88066afa3e00
  15:27:13.014 kernel: R13: ffff88082c829a00 R14: 0000000000000000 R15: ffff8806bc50c920
  15:27:13.014 kernel: FS:  0000000000000000(0000) GS:ffff88002818a000(0000) knlGS:0000000000000000
  15:27:13.014 kernel: CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
  15:27:13.014 kernel: CR2: 0000000000000010 CR3: 000000082ade3000 CR4: 00000000000426e0
  15:27:13.014 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
  15:27:13.014 kernel: DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
  15:27:13.014 kernel: Process async/0 (pid: 13999, threadinfo ffff88066afa2000, task ffff8806c2bf05e0)
  15:27:13.014 kernel: Stack:
  15:27:13.014 kernel: 0000000000000000 ffff88066afa3e00 ffff88066afa3e00 ffff88082c829a00
  15:27:13.014 kernel: ffff88066afa3e40 ffffffff80306feb ffff88082b58a000 0000000000000000
  15:27:13.014 kernel: 0000000000000001 ffff8806bc50c920 ffff88066afa3e40 ffff88082b58a000
  15:27:13.014 kernel: Call Trace:
  15:27:13.014 kernel: [<ffffffff80306feb>] register_disk+0x122/0x13a
  15:27:13.014 kernel: [<ffffffff803f0b0f>] add_disk+0xaa/0x106
  15:27:13.014 kernel: [<ffffffff80493609>] sd_probe_async+0x198/0x25b
  15:27:13.014 kernel: [<ffffffff80270482>] async_thread+0x10c/0x20d
  15:27:13.014 kernel: [<ffffffff802545ff>] ? default_wake_function+0x0/0xf
  15:27:13.014 kernel: [<ffffffff80270376>] ? async_thread+0x0/0x20d
  15:27:13.014 kernel: [<ffffffff8026ad89>] kthread+0x55/0x80
  15:27:13.014 kernel: [<ffffffff8022be6a>] child_rip+0xa/0x20
  15:27:13.014 kernel: [<ffffffff8026ad34>] ? kthread+0x0/0x80
  15:27:13.014 kernel: [<ffffffff8022be60>] ? child_rip+0x0/0x20
  15:27:13.014 kernel: Code: c8 ff 80 e1 0c b9 00 00 00 00 0f 44 c1 41 83 cd ff 48 8d 7a 20 48 be ff ff ff ff 08 00 00 00 48 b9 00 00 00 00 08 00 00 00 eb 50 <8b> 42 10 41 bd 01 00 00 00 eb db 4c 63 c2 4e 8d 04 c7 4d 8b 20
  15:27:13.015 kernel: RIP  [<ffffffff803f0d77>] disk_part_iter_next+0x74/0xfd
  15:27:13.015 kernel: RSP <ffff88066afa3dd0>
  15:27:13.015 kernel: CR2: 0000000000000010
  15:27:13.015 kernel: ---[ end trace 6104b56ef5590e25 ]---

The problem is caused because the async scanning split in sd.c doesn't hold
any reference to the device when it kicks off the async piece.  What's
happening is that an iSCSI disconnect is destorying the device again *before*
the async sd scanning thread even starts.  Fix this by taking a reference
before starting the thread and dropping it again when the thread completes.

Reported-by: Chris Webb <chris at arachsys.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at suse.de>
---

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b7b9fec..a89c421 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2021,6 +2021,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
 
 	sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
 		  sdp->removable ? "removable " : "");
+	put_device(&sdkp->dev);
 }
 
 /**
@@ -2106,6 +2107,7 @@ static int sd_probe(struct device *dev)
 
 	get_device(&sdp->sdev_gendev);
 
+	get_device(&sdkp->dev);	/* prevent release before async_schedule */
 	async_schedule(sd_probe_async, sdkp);
 
 	return 0;

linux-2.6-scsi-sg-fix-oops-in-error-path.patch:
 sg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-scsi-sg-fix-oops-in-error-path.patch ---
From: Michal Schmidt <mschmidt at redhat.com>
Date: Thu, 3 Sep 2009 12:27:08 +0000 (+0200)
Subject: [SCSI] sg: fix oops in the error path in sg_build_indirect()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjejb%2Fscsi-misc-2.6.git;a=commitdiff_plain;h=e71044ee2efa4792e21d243b03d49006db66aec9

[SCSI] sg: fix oops in the error path in sg_build_indirect()

When the allocation fails in sg_build_indirect(), an oops happens in
the error path. It's caused by an obvious typo.

Signed-off-by: Michal Schmidt <mschmidt at redhat.com>
Reported-by: Bob Tracy <rct at gherkin.frus.com>
Acked-by: Douglas Gilbert <dgilbert at interlog.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at suse.de>
---

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 9230402..4968c4c 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1811,7 +1811,7 @@ retry:
 	return 0;
 out:
 	for (i = 0; i < k; i++)
-		__free_pages(schp->pages[k], order);
+		__free_pages(schp->pages[i], order);
 
 	if (--order >= 0)
 		goto retry;

linux-2.6.31-modules-ro-nx.patch:
 include/linux/module.h |    3 +
 kernel/module.c        |  126 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 126 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.31-modules-ro-nx.patch ---
>From davej  Fri Sep 11 11:06:50 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.5 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,SARE_MSGID_LONG40,UNPARSEABLE_RELAY autolearn=ham
	version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.51]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Fri, 11 Sep 2009 11:06:50 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
 zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
 mail04.corp.redhat.com with LMTP; Thu, 10 Sep 2009 22:51:21 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E57644F1AB;
	Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id PqMpQop0Dbp5; Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A56F64F1AA;
	Thu, 10 Sep 2009 22:51:20 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.12])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8B2pDoM001214;
	Thu, 10 Sep 2009 22:51:13 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8B2jC2e031184;
	Thu, 10 Sep 2009 22:51:01 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753321AbZIKCur (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Thu, 10 Sep 2009 22:50:47 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752432AbZIKCuq
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 10 Sep 2009 22:50:46 -0400
Received: from mail-yw0-f174.google.com ([209.85.211.174]:34234 "EHLO
	mail-yw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752401AbZIKCup (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Thu, 10 Sep 2009 22:50:45 -0400
Received: by ywh4 with SMTP id 4so897627ywh.5
        for <multiple recipients>; Thu, 10 Sep 2009 19:50:47 -0700 (PDT)
DKIM-Signature: 	v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:mime-version:received:date:message-id:subject
         :from:to:cc:content-type;
        bh=p3+H2ZvljQZotPAF9Gb+FxecqVT3MH9YeBjUUKwwvY0=;
        b=JTV6NmVCgyrG6SVi/FbmJR4FeIQuc44rC3EV0D1A8qPb+xMwNYK5QlD8do+3+FKgbc
         CH/kgCjakj8e5v4ipROLQjPEiN/TETq15ITPKToCOHKve4jS1GMgkZYyYScpBfOj7N9R
         VaWi9sbsNBvUtf1wS83Uqy4GBjZ88MEoBetrs=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:date:message-id:subject:from:to:cc:content-type;
        b=Ksz1JD3HRA+cyDH560RvcyHLpdr4+4Tost2JUGQV5a1m/XC/zwqLdXWNlkWTsuNVvJ
         n+vlXd8VrHE+9h54vf+BMqmK+3LB6Q1iV3nLFpRoU7qaEdnPrWdRcCi8Ot6vIzLrHLf2
         Xu6y7fJWaLQ+cbIGNY2LGR5UlkBul7kaj1API=
MIME-Version: 1.0
Received: by 10.150.17.5 with SMTP id 5mr3930758ybq.195.1252637447825; Thu, 10 
	Sep 2009 19:50:47 -0700 (PDT)
Date: 	Thu, 10 Sep 2009 22:50:47 -0400
Message-ID: <817ecb6f0909101950v2fc6dc6u5cbc40cd9a9dde77 at mail.gmail.com>
Subject: [PATCH v6] RO/NX protection for loadable kernel modules
From: Siarhei Liakh <sliakh.lkml at gmail.com>
To: linux-kernel at vger.kernel.org, linux-security-module at vger.kernel.org,
        linux-next at vger.kernel.org
Cc: Arjan van de Ven <arjan at infradead.org>, James Morris <jmorris at namei.org>,
        Andrew Morton <akpm at linux-foundation.org>, Andi Kleen <ak at muc.de>,
        Thomas Gleixner <tglx at linutronix.de>, "H. Peter Anvin" <hpa at zytor.com>,
        Ingo Molnar <mingo at elte.hu>, Rusty Russell <rusty at rustcorp.com.au>,
        Stephen Rothwell <sfr at canb.auug.org.au>
Content-Type: text/plain; charset=ISO-8859-1
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.12
Status: RO
Content-Length: 8042
Lines: 260

This patch is a logical extension of the protection provided by
CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting
module_core and module_init into three logical parts each and setting
appropriate page access permissions for each individual section:

 1. Code: RO+X
 2. RO data: RO+NX
 3. RW data: RW+NX

In order to achieve proper protection, layout_sections() have been
modified to align each of the three parts mentioned above onto page
boundary. Next, the corresponding page access permissions are set
right before successful exit from load_module(). Further, free_module()
and sys_init_module have been modified to set module_core and
module_init as RW+NX right before calling module_free().

By default, the original section layout is preserved and RO/NX is
enforced only for whole pages of same content.
However, when compiled with CONFIG_DEBUG_RODATA=y, the patch
will page-align each group of sections to ensure that each page contains
only one type of content.
RO/NX enforcement is active on x86 only.

v1: Initial proof-of-concept patch.

v2: The patch have been re-written to reduce the number of #ifdefs and
to make it architecture-agnostic. Code formatting have been corrected also.

v3: Opportunistic RO/NX protectiuon is now unconditional. Section
page-alignment is enabled when CONFIG_DEBUG_RODATA=y.

v4: Removed most macros and improved coding style.

v5: Changed page-alignment and RO/NX section size calculation

v6: Fixed comments. Restricted RO/NX enforcement to x86 only

The patch have been developed for Linux 2.6.30 by Siarhei Liakh
<sliakh.lkml at gmail.com> and Xuxian Jiang <jiang at cs.ncsu.edu>.

---

Signed-off-by: Siarhei Liakh <sliakh.lkml at gmail.com>
Signed-off-by: Xuxian Jiang <jiang at cs.ncsu.edu>
Acked-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/include/linux/module.h b/include/linux/module.h
index 627ac08..5ba770e 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -293,6 +293,9 @@ struct module
 	/* The size of the executable code in each section.  */
 	unsigned int init_text_size, core_text_size;

+	/* Size of RO sections of the module (text+rodata) */
+	unsigned int init_ro_size, core_ro_size;
+
 	/* Arch-specific module values */
 	struct mod_arch_specific arch;

diff --git a/kernel/module.c b/kernel/module.c
index e797812..660278a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -54,6 +54,7 @@
 #include <linux/async.h>
 #include <linux/percpu.h>
 #include <linux/kmemleak.h>
+#include <linux/pfn.h>
 
 #if 0
 #define DEBUGP printk
@@ -63,6 +64,26 @@
 #define ARCH_SHF_SMALL 0
 #endif

+/*
+ * Modules' sections will be aligned on page boundaries
+ * to ensure complete separation of code and data, but
+ * only when CONFIG_DEBUG_RODATA=y
+ */
+#ifdef CONFIG_DEBUG_RODATA
+#define debug_align(X) ALIGN(X, PAGE_SIZE)
+#else
+#define debug_align(X) (X)
+#endif
+
+/*
+ * Given BASE and SIZE this macro calculates the number of pages the
+ * memory regions occupies
+ */
+#define NUMBER_OF_PAGES(BASE, SIZE) ((SIZE > 0) ?		\
+		(PFN_DOWN((unsigned long)BASE + SIZE - 1) -	\
+			 PFN_DOWN((unsigned long)BASE) + 1)	\
+		: (0UL))
+
 /* If this is set, the section belongs in the init part of the module */
 #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))

@@ -1471,6 +1492,69 @@ static int __unlink_module(void *_mod)
 	return 0;
 }

+/*
+ * LKM RO/NX protection: protect module's text/ro-data
+ * from modification and any data from execution.
+ */
+static void set_section_ro_nx(void *base,
+			unsigned long text_size,
+			unsigned long ro_size,
+			unsigned long total_size)
+{
+#ifdef CONFIG_X86
+	/* begin and end PFNs of the current subsection */
+	unsigned long begin_pfn;
+	unsigned long end_pfn;
+
+	/*
+	 * Set RO for module text and RO-data:
+	 * - Always protect first page.
+	 * - Do not protect last partial page.
+	 */
+	if (ro_size > 0) {
+		begin_pfn = PFN_DOWN((unsigned long)base);
+		end_pfn = PFN_DOWN((unsigned long)base + ro_size);
+		if (end_pfn > begin_pfn)
+			set_memory_ro(begin_pfn << PAGE_SHIFT,
+						end_pfn - begin_pfn);
+	}
+
+	/*
+	 * Set NX permissions for module data:
+	 * - Do not protect first partial page.
+	 * - Always protect last page.
+	 */
+	if (total_size > text_size) {
+		begin_pfn = PFN_UP((unsigned long)base + text_size);
+		end_pfn = PFN_UP((unsigned long)base + total_size);
+		if (end_pfn > begin_pfn)
+			set_memory_nx(begin_pfn << PAGE_SHIFT,
+						end_pfn - begin_pfn);
+	}
+#endif
+}
+
+/* Setting memory back to RW+NX before releasing it */
+void unset_section_ro_nx(struct module *mod, void *module_region)
+{
+#ifdef CONFIG_X86
+	unsigned long total_pages;
+
+	if (mod->module_core == module_region) {
+		/* Set core as NX+RW */
+		total_pages = NUMBER_OF_PAGES(mod->module_core, mod->core_size);
+		set_memory_nx((unsigned long)mod->module_core, total_pages);
+		set_memory_rw((unsigned long)mod->module_core, total_pages);
+
+	} else if (mod->module_init == module_region) {
+		/* Set init as NX+RW */
+		total_pages = NUMBER_OF_PAGES(mod->module_init, mod->init_size);
+		set_memory_nx((unsigned long)mod->module_init, total_pages);
+		set_memory_rw((unsigned long)mod->module_init, total_pages);
+	}
+#endif
+}
+
 /* Free a module, remove from lists, etc (must hold module_mutex). */
 static void free_module(struct module *mod)
 {
@@ -1493,6 +1577,7 @@ static void free_module(struct module *mod)
 	ftrace_release(mod->module_core, mod->core_size);

 	/* This may be NULL, but that's OK */
+	unset_section_ro_nx(mod, mod->module_init);
 	module_free(mod, mod->module_init);
 	kfree(mod->args);
 	if (mod->percpu)
@@ -1505,6 +1590,7 @@ static void free_module(struct module *mod)
 	lockdep_free_key_range(mod->module_core, mod->core_size);

 	/* Finally, free the core (containing the module structure) */
+	unset_section_ro_nx(mod, mod->module_core);
 	module_free(mod, mod->module_core);
 }

@@ -1678,8 +1764,19 @@ static void layout_sections(struct module *mod,
 			s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
 			DEBUGP("\t%s\n", secstrings + s->sh_name);
 		}
-		if (m == 0)
+		switch (m) {
+		case 0: /* executable */
+			mod->core_size = debug_align(mod->core_size);
 			mod->core_text_size = mod->core_size;
+			break;
+		case 1: /* RO: text and ro-data */
+			mod->core_size = debug_align(mod->core_size);
+			mod->core_ro_size = mod->core_size;
+			break;
+		case 3: /* whole core */
+			mod->core_size = debug_align(mod->core_size);
+			break;
+		}
 	}

 	DEBUGP("Init section allocation order:\n");
@@ -1696,8 +1793,19 @@ static void layout_sections(struct module *mod,
 					 | INIT_OFFSET_MASK);
 			DEBUGP("\t%s\n", secstrings + s->sh_name);
 		}
-		if (m == 0)
+		switch (m) {
+		case 0: /* executable */
+			mod->init_size = debug_align(mod->init_size);
 			mod->init_text_size = mod->init_size;
+			break;
+		case 1: /* RO: text and ro-data */
+			mod->init_size = debug_align(mod->init_size);
+			mod->init_ro_size = mod->init_size;
+			break;
+		case 3: /* whole init */
+			mod->init_size = debug_align(mod->init_size);
+			break;
+		}
 	}
 }

@@ -2291,6 +2399,18 @@ static noinline struct module *load_module(void __user *umod,
 	/* Get rid of temporary copy */
 	vfree(hdr);

+	/* Set RO and NX regions for core */
+	set_section_ro_nx(mod->module_core,
+				mod->core_text_size,
+				mod->core_ro_size,
+				mod->core_size);
+
+	/* Set RO and NX regions for init */
+	set_section_ro_nx(mod->module_init,
+				mod->init_text_size,
+				mod->init_ro_size,
+				mod->init_size);
+
 	/* Done! */
 	return mod;

@@ -2598,6 +2598,7 @@ SYSCALL_DEFINE3(init_module, void __user
 	mutex_lock(&module_mutex);
 	/* Drop initial reference. */
 	module_put(mod);
+	unset_section_ro_nx(mod, mod->module_init);
 	trim_init_extable(mod);
 	module_free(mod, mod->module_init);
 	mod->module_init = NULL;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


linux-2.6.31-nx-data.patch:
 kernel/vmlinux.lds.S |    6 +++++-
 mm/init.c            |   22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.31-nx-data.patch ---
Date: 	Thu, 10 Sep 2009 21:10:51 -0400
Message-ID: <817ecb6f0909101810u7774ca93u40a0a4b99f9fb6ba at mail.gmail.com>
Subject: [PATCH V4] x86: NX protection for kernel data
From: Siarhei Liakh <sliakh.lkml at gmail.com>
To: linux-kernel at vger.kernel.org, linux-security-module at vger.kernel.org
Cc: Arjan van de Ven <arjan at infradead.org>, James Morris <jmorris at namei.org>,
        Andrew Morton <akpm at linux-foundation.org>, Andi Kleen <ak at muc.de>,
        Rusty Russell <rusty at rustcorp.com.au>,
        Thomas Gleixner <tglx at linutronix.de>, "H. Peter Anvin" <hpa at zytor.com>,
        Ingo Molnar <mingo at elte.hu>

This patch expands functionality of CONFIG_DEBUG_RODATA to set main
(static) kernel data area as NX.
The following steps are taken to achieve this:
1. Linker script is adjusted so .text always starts and ends on a page boundary
2. Linker script is adjusted so .rodata and .data always start and
end on a page boundary
3. void mark_nxdata_nx(void) added to arch/x86/mm/init.c with actual
functionality: NX is set for all pages from _etext through _end.
4. mark_nxdata_nx() called from free_initmem() (after init has been released)
5. free_init_pages() sets released memory NX in arch/x86/mm/init.c

The patch have been developed for Linux 2.6.31-rc7 x86 by Siarhei Liakh
<sliakh.lkml at gmail.com> and Xuxian Jiang <jiang at cs.ncsu.edu>.

V1:  initial patch for 2.6.30
V2:  patch for 2.6.31-rc7
V3:  moved all code into arch/x86, adjusted credits
V4:  fixed ifdef, removed credits from CREDITS

---

Signed-off-by: Siarhei Liakh <sliakh.lkml at gmail.com>
Signed-off-by: Xuxian Jiang <jiang at cs.ncsu.edu>

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 9fc1782..b6b2bbf 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -43,7 +43,7 @@ jiffies_64 = jiffies;
 
 PHDRS {
 	text PT_LOAD FLAGS(5);          /* R_E */
-	data PT_LOAD FLAGS(7);          /* RWE */
+	data PT_LOAD FLAGS(6);          /* RW_ */
 #ifdef CONFIG_X86_64
 	user PT_LOAD FLAGS(7);          /* RWE */
 #ifdef CONFIG_SMP
@@ -88,6 +88,8 @@ SECTIONS
 		IRQENTRY_TEXT
 		*(.fixup)
 		*(.gnu.warning)
+		/* .text should occupy whole number of pages */
+		. = ALIGN(PAGE_SIZE);
 		/* End of text section */
 		_etext = .;
 	} :text = 0x9090
@@ -128,6 +130,8 @@ SECTIONS
 		/* rarely changed data like cpu maps */
 		READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES)
 
+		/* .data should occupy whole number of pages */
+		. = ALIGN(PAGE_SIZE);
 		/* End of data section */
 		_edata = .;
 	} :data
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 0607119..522e81b 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -423,9 +423,10 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 	/*
 	 * We just marked the kernel text read only above, now that
 	 * we are going to free part of that, we need to make that
-	 * writeable first.
+	 * writeable and non-executable first.
 	 */
 	set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
+	set_memory_nx(begin, (end - begin) >> PAGE_SHIFT);

 	printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);

@@ -440,11 +441,29 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 #endif
 }

+void mark_nxdata_nx(void)
+{
+#ifdef CONFIG_DEBUG_RODATA
+	/*
+	 * When this called, init has already been executed and released,
+	 * so everything past _etext sould be NX.
+	 */
+	unsigned long start = PFN_ALIGN(_etext);
+	unsigned long size = PFN_ALIGN(_end) - start;
+
+	printk(KERN_INFO "NX-protecting the kernel data: %lx, %lu pages\n",
+		start, size >> PAGE_SHIFT);
+	set_pages_nx(virt_to_page(start), size >> PAGE_SHIFT);
+#endif
+}
+
 void free_initmem(void)
 {
 	free_init_pages("unused kernel memory",
 			(unsigned long)(&__init_begin),
 			(unsigned long)(&__init_end));
+	/* Set kernel's data as NX */
+	mark_nxdata_nx();
 }

 #ifdef CONFIG_BLK_DEV_INITRD
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5209 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  537 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  750 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  354 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  683 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  213 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2214 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  473 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  443 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 58026 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.17
retrieving revision 1.8.6.18
diff -u -p -r1.8.6.17 -r1.8.6.18
--- drm-nouveau.patch	10 Sep 2009 14:00:26 -0000	1.8.6.17
+++ drm-nouveau.patch	15 Sep 2009 19:45:37 -0000	1.8.6.18
@@ -1494,10 +1494,10 @@ index 0000000..576bbea
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..5a46cdd
+index 0000000..a4e8223
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,28 @@
 +#
 +# Makefile for the drm device driver.  This driver provides support for the
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
@@ -1523,8 +1523,142 @@ index 0000000..5a46cdd
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
++nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
+diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
+new file mode 100644
+index 0000000..49514c6
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
+@@ -0,0 +1,127 @@
++#include <linux/pci.h>
++#include <linux/acpi.h>
++#include <acpi/acpi_drivers.h>
++#include <acpi/acpi_bus.h>
++
++#include "drmP.h"
++#include "drm.h"
++#include "drm_sarea.h"
++#include "drm_crtc_helper.h"
++#include "nouveau_drv.h"
++#include "nouveau_drm.h"
++#include "nv50_display.h"
++
++#define NOUVEAU_DSM_SUPPORTED 0x00
++#define NOUVEAU_DSM_SUPPORTED_FUNCTIONS 0x00
++
++#define NOUVEAU_DSM_ACTIVE 0x01
++#define NOUVEAU_DSM_ACTIVE_QUERY 0x00
++
++#define NOUVEAU_DSM_LED 0x02
++#define NOUVEAU_DSM_LED_STATE 0x00
++#define NOUVEAU_DSM_LED_OFF 0x10
++#define NOUVEAU_DSM_LED_STAMINA 0x11
++#define NOUVEAU_DSM_LED_SPEED 0x12
++
++#define NOUVEAU_DSM_POWER 0x03
++#define NOUVEAU_DSM_POWER_STATE 0x00
++#define NOUVEAU_DSM_POWER_SPEED 0x01
++#define NOUVEAU_DSM_POWER_STAMINA 0x02
++
++static int nvidia_dsm(struct pci_dev *dev, int func, int arg, int *result)
++{
++	static char muid[] = {
++		0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
++		0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
++	};
++
++	struct acpi_handle *handle;
++	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
++	struct acpi_object_list input;
++	union acpi_object params[4];
++	union acpi_object *obj;
++	int err;
++
++	handle = DEVICE_ACPI_HANDLE(&dev->dev);
++
++	if (!handle)
++		return -ENODEV;
++
++	input.count = 4;
++	input.pointer = params;
++	params[0].type = ACPI_TYPE_BUFFER;
++	params[0].buffer.length = sizeof(muid);
++	params[0].buffer.pointer = (char *)muid;
++	params[1].type = ACPI_TYPE_INTEGER;
++	params[1].integer.value = 0x00000102;
++	params[2].type = ACPI_TYPE_INTEGER;
++	params[2].integer.value = func;
++	params[3].type = ACPI_TYPE_INTEGER;
++	params[3].integer.value = arg;
++
++	err = acpi_evaluate_object(handle, "_DSM", &input, &output);
++	if (err) {
++		printk(KERN_ERR "nvidia-control: failed to evaluate _DSM: %d\n",
++		       err);
++		return err;
++	}
++
++	obj = (union acpi_object *)output.pointer;
++
++	if (obj->type == ACPI_TYPE_INTEGER)
++		if (obj->integer.value == 0x80000002)
++			return -ENODEV;
++
++	if (obj->type == ACPI_TYPE_BUFFER) {
++		if (obj->buffer.length == 4 && result) {
++			*result = 0;
++			*result |= obj->buffer.pointer[0];
++			*result |= (obj->buffer.pointer[1] << 8);
++			*result |= (obj->buffer.pointer[2] << 16);
++			*result |= (obj->buffer.pointer[3] << 24);
++		}
++	}
++
++	kfree(output.pointer);
++	return 0;
++}
++
++int nouveau_hybrid_setup(struct drm_device *dev)
++{
++	struct pci_dev *pdev = dev->pdev;
++	int result;
++
++	if (nvidia_dsm(pdev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
++		       &result))
++		return -ENODEV;
++
++	printk(KERN_INFO "nouveau: _DSM hardware status gave 0x%x\n", result);
++
++	if (result &= 0x1) {	/* Stamina mode - disable the external GPU */
++		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
++			   NULL);
++		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
++			   NULL);
++	} else {		/* Ensure that the external GPU is enabled */
++		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
++		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
++			   NULL);
++	}
++
++	return 0;
++}
++
++bool nouveau_dsm_probe(struct drm_device *dev)
++{
++	struct pci_dev *pdev = dev->pdev;
++	int support = 0;
++
++	if (nvidia_dsm(pdev, NOUVEAU_DSM_SUPPORTED,
++		       NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &support))
++		return false;
++
++	if (!support)
++		return false;
++
++	return true;
++}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
 index 0000000..20564f8
@@ -8404,10 +8538,10 @@ index 0000000..3f80db8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
 new file mode 100644
-index 0000000..7761425
+index 0000000..65810d4
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
-@@ -0,0 +1,520 @@
+@@ -0,0 +1,537 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -8522,6 +8656,7 @@ index 0000000..7761425
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
 +	struct nouveau_channel *chan;
++	unsigned fbdev_flags = 0;
 +	int channel, user;
 +	int ret;
 +
@@ -8611,6 +8746,11 @@ index 0000000..7761425
 +		return ret;
 +	}
 +
++	if (dev_priv->fbdev_info) {
++		fbdev_flags = dev_priv->fbdev_info->flags;
++		dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
 +	engine->graph.fifo_access(dev, false);
 +	nouveau_wait_for_idle(dev);
 +
@@ -8639,25 +8779,24 @@ index 0000000..7761425
 +	 * isn't entirely.. well.. correct.. setup PFIFO ourselves.  For any
 +	 * other case, the GPU will handle this when it switches contexts.
 +	 */
-+	if (dev_priv->engine.fifo.init == nv04_fifo_init ||
-+	    dev_priv->engine.fifo.init == nv40_fifo_init) {
++	if ((dev_priv->engine.fifo.init == nv04_fifo_init ||
++	     dev_priv->engine.fifo.init == nv40_fifo_init) &&
++	    dev_priv->fifo_alloc_count == 1) {
 +		/* setup channel's default get/put values
 +		 */
 +		nvchan_wr32(chan->user_get, chan->pushbuf_base);
 +		nvchan_wr32(chan->user_put, chan->pushbuf_base);
 +
-+		if (dev_priv->fifo_alloc_count == 1) {
-+			ret = engine->fifo.load_context(chan);
-+			if (ret) {
-+				nouveau_channel_free(chan);
-+				return ret;
-+			}
++		ret = engine->fifo.load_context(chan);
++		if (ret) {
++			nouveau_channel_free(chan);
++			return ret;
++		}
 +
-+			ret = engine->graph.load_context(chan);
-+			if (ret) {
-+				nouveau_channel_free(chan);
-+				return ret;
-+			}
++		ret = engine->graph.load_context(chan);
++		if (ret) {
++			nouveau_channel_free(chan);
++			return ret;
 +		}
 +	}
 +
@@ -8672,6 +8811,9 @@ index 0000000..7761425
 +
 +	engine->graph.fifo_access(dev, true);
 +
++	if (dev_priv->fbdev_info)
++		dev_priv->fbdev_info->flags = fbdev_flags;
++
 +	ret = nouveau_dma_init(chan);
 +	if (!ret)
 +		ret = nouveau_fence_init(chan);
@@ -8733,6 +8875,7 @@ index 0000000..7761425
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
++	unsigned fbdev_flags = 0;
 +	uint64_t t_start;
 +	bool timeout = false;
 +	int ret;
@@ -8777,6 +8920,11 @@ index 0000000..7761425
 +	nouveau_fence_fini(chan);
 +
 +	/* disable the fifo caches */
++	if (dev_priv->fbdev_info) {
++		fbdev_flags = dev_priv->fbdev_info->flags;
++		dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
 +	nv_wr32(dev, NV03_PFIFO_CACHES, 0x00000000);
 +	nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUSH,
 +			nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUSH) & ~0x1);
@@ -8795,6 +8943,9 @@ index 0000000..7761425
 +	nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 0x00000001);
 +	nv_wr32(dev, NV03_PFIFO_CACHES, 0x00000001);
 +
++	if (dev_priv->fbdev_info)
++		dev_priv->fbdev_info->flags = fbdev_flags;
++
 +	/* Deallocate push buffer */
 +	nouveau_gpuobj_ref_del(dev, &chan->pushbuf);
 +	nouveau_bo_ref(NULL, &chan->pushbuf_bo);
@@ -8930,10 +9081,10 @@ index 0000000..7761425
 +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
 diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
 new file mode 100644
-index 0000000..7f799f6
+index 0000000..e9577db
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,747 @@
+@@ -0,0 +1,750 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -9329,8 +9480,9 @@ index 0000000..7f799f6
 +};
 +
 +static struct moderec scaler_modes[] = {
-+	{ 1920, 1440 },
-+	{ 1920, 1280 },
++	{ 1920, 1200 },
++	{ 1920, 1080 },
++	{ 1680, 1050 },
 +	{ 1600, 1200 },
 +	{ 1400, 1050 },
 +	{ 1280, 1024 },
@@ -9439,6 +9591,7 @@ index 0000000..7f799f6
 +		    mode->vdisplay > nv_connector->native_mode->vdisplay)
 +			return MODE_PANEL;
 +
++		min_clock = 0;
 +		max_clock = 400000;
 +		break;
 +	case OUTPUT_TMDS:
@@ -9546,7 +9699,8 @@ index 0000000..7f799f6
 +	/* Still nothing, some VBIOS images have a hardcoded EDID block
 +	 * stored for the panel stored in them.
 +	 */
-+	if (!nv_connector->edid && !dev_priv->VBIOS.pub.fp_no_ddc) {
++	if (!nv_connector->edid && !nv_connector->native_mode &&
++	    !dev_priv->VBIOS.pub.fp_no_ddc) {
 +		nv_connector->edid =
 +			(struct edid *)nouveau_bios_embedded_edid(dev);
 +	}
@@ -10771,10 +10925,10 @@ index 0000000..f2b8b17
 +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..57e8db3
+index 0000000..6c9158e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1202 @@
+@@ -0,0 +1,1218 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -11343,6 +11497,7 @@ index 0000000..57e8db3
 +	} susres;
 +
 +	struct backlight_device *backlight;
++	bool acpi_dsm;
 +
 +	struct nouveau_channel *evo;
 +
@@ -11530,6 +11685,21 @@ index 0000000..57e8db3
 +extern int  nouveau_dma_init(struct nouveau_channel *);
 +extern int  nouveau_dma_wait(struct nouveau_channel *, int size);
 +
++/* nouveau_acpi.c */
++#ifdef CONFIG_ACPI
++extern int nouveau_hybrid_setup(struct drm_device *dev);
++extern bool nouveau_dsm_probe(struct drm_device *dev);
++#else
++static inline int nouveau_hybrid_setup(struct drm_device *dev)
++{
++	return 0;
++}
++static inline bool nouveau_dsm_probe(struct drm_device *dev)
++{
++	return false;
++}
++#endif
++
 +/* nouveau_backlight.c */
 +#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
 +extern int nouveau_backlight_init(struct drm_device *);
@@ -12104,10 +12274,10 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..cf772af
+index 0000000..f744723
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,354 @@
 +/*
 + * Copyright ? 2007 David Airlie
 + *
@@ -12188,8 +12358,7 @@ index 0000000..cf772af
 +
 +	ret = -EBUSY;
 +	for (i = 0; i < 100000; i++) {
-+		if (nouveau_bo_rd32(chan->notifier_bo, chan->m2mf_ntfy + 3)
-+									== 0) {
++		if (!nouveau_bo_rd32(chan->notifier_bo, chan->m2mf_ntfy + 3)) {
 +			ret = 0;
 +			break;
 +		}
@@ -12519,7 +12688,7 @@ index 0000000..0f40414
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
 new file mode 100644
-index 0000000..230a99b
+index 0000000..32b4bb9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
 @@ -0,0 +1,261 @@
@@ -12729,7 +12898,7 @@ index 0000000..230a99b
 +			schedule_timeout(1);
 +
 +		if (intr && signal_pending(current)) {
-+			ret = -ERESTARTSYS;
++			ret = -ERESTART;
 +			break;
 +		}
 +	}
@@ -15672,10 +15841,10 @@ index 0000000..a2c30f4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
 new file mode 100644
-index 0000000..d3ade09
+index 0000000..a23b2fb
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
-@@ -0,0 +1,675 @@
+@@ -0,0 +1,683 @@
 +/*
 + * Copyright (C) 2006 Ben Skeggs.
 + *
@@ -15812,9 +15981,10 @@ index 0000000..d3ade09
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
 +	uint32_t status, reassign;
++	int cnt = 0;
 +
 +	reassign = nv_rd32(dev, NV03_PFIFO_CACHES) & 1;
-+	while ((status = nv_rd32(dev, NV03_PFIFO_INTR_0))) {
++	while ((status = nv_rd32(dev, NV03_PFIFO_INTR_0)) && (cnt++ < 100)) {
 +		struct nouveau_channel *chan = NULL;
 +		uint32_t chid, get;
 +
@@ -15891,11 +16061,18 @@ index 0000000..d3ade09
 +			NV_INFO(dev, "PFIFO_INTR 0x%08x - Ch %d\n",
 +				status, chid);
 +			nv_wr32(dev, NV03_PFIFO_INTR_0, status);
++			status = 0;
 +		}
 +
 +		nv_wr32(dev, NV03_PFIFO_CACHES, reassign);
 +	}
 +
++	if (status) {
++		NV_INFO(dev, "PFIFO still angry after %d spins, halt\n", cnt);
++		nv_wr32(dev, 0x2140, 0);
++		nv_wr32(dev, 0x140, 0);
++	}
++
 +	nv_wr32(dev, NV03_PMC_INTR_0, NV_PMC_INTR_0_PFIFO_PENDING);
 +}
 +
@@ -18409,10 +18586,10 @@ index 0000000..66ab939
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h
 new file mode 100644
-index 0000000..4824984
+index 0000000..af9c822
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_reg.h
-@@ -0,0 +1,834 @@
+@@ -0,0 +1,833 @@
 +
 +
 +#define NV03_BOOT_0                                        0x00100000
@@ -18490,7 +18667,6 @@ index 0000000..4824984
 +#define NV50_USER_DMA_PUT__SIZE                                              128
 +#define NV50_USER_DMA_GET(i)                     (0x00c00044+(i*NV50_USER_SIZE))
 +#define NV50_USER_DMA_GET__SIZE                                              128
-+/*XXX: I don't think this actually exists.. */
 +#define NV50_USER_REF_CNT(i)                     (0x00c00048+(i*NV50_USER_SIZE))
 +#define NV50_USER_REF_CNT__SIZE                                              128
 +
@@ -19572,10 +19748,10 @@ index 0000000..d30c988
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..b39f11e
+index 0000000..2d62bdc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,829 @@
+@@ -0,0 +1,834 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -20119,6 +20295,11 @@ index 0000000..b39f11e
 +	NV_DEBUG(dev, "vendor: 0x%X device: 0x%X class: 0x%X\n",
 +		 dev->pci_vendor, dev->pci_device, dev->pdev->class);
 +
++	dev_priv->acpi_dsm = nouveau_dsm_probe(dev);
++
++	if (dev_priv->acpi_dsm)
++		nouveau_hybrid_setup(dev);
++
 +	/* resource 0 is mmio regs */
 +	/* resource 1 is linear FB */
 +	/* resource 2 is RAMIN (mmio regs + 0x1000000) */
@@ -23163,10 +23344,10 @@ index 0000000..638cf60
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
 new file mode 100644
-index 0000000..a2046d6
+index 0000000..8915fb3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
-@@ -0,0 +1,292 @@
+@@ -0,0 +1,295 @@
 +/*
 + * Copyright 2009 Ben Skeggs
 + * Copyright 2008 Stuart Bennett
@@ -23272,14 +23453,17 @@ index 0000000..a2046d6
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (image->depth != 1 || info->flags & FBINFO_HWACCEL_DISABLED) {
++	if (image->depth != 1) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
 +
-+	if (RING_SPACE(chan, 8)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 8)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
@@ -23461,7 +23645,7 @@ index 0000000..a2046d6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
 new file mode 100644
-index 0000000..d9a6b70
+index 0000000..6e984dc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_fifo.c
 @@ -0,0 +1,295 @@
@@ -23543,7 +23727,7 @@ index 0000000..d9a6b70
 +			nv_wr32(dev, 0x2230, 0);
 +			nv_wr32(dev, NV40_PFIFO_RAMFC,
 +				((nouveau_mem_fb_amount(dev) - 512 * 1024 +
-+				  dev_priv->ramfc_offset) >> 16) | (2 << 16));
++				  dev_priv->ramfc_offset) >> 16) | (3 << 16));
 +			break;
 +		}
 +		break;
@@ -24351,10 +24535,10 @@ index 0000000..b74d2fc
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
 new file mode 100644
-index 0000000..0d1e3e8
+index 0000000..928464e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
-@@ -0,0 +1,207 @@
+@@ -0,0 +1,213 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -24478,12 +24662,18 @@ index 0000000..0d1e3e8
 +	 */
 +	offset = dev_priv->ramfc_offset + dev_priv->ramfc_size;
 +
-+	/* On my NV4E, there's *something* clobbering the 16KiB just after
-+	 * where we setup these fixed tables.  No idea what it is just yet,
-+	 * so reserve this space on all NV4X cards for now.
++	/* It appears RAMRO (or something?) is controlled by 0x2220/0x2230
++	 * on certain NV4x chipsets as well as RAMFC.  When 0x2230 == 0
++	 * ("new style" control) the upper 16-bits of 0x2220 points at this
++	 * other mysterious table that's clobbering important things.
++	 *
++	 * We're now pointing this at RAMIN+0x30000 to avoid RAMFC getting
++	 * smashed to pieces on us, so reserve 0x30000-0x40000 too..
 +	 */
-+	if (dev_priv->card_type >= NV_40)
-+		offset += 16*1024;
++	if (dev_priv->card_type >= NV_40) {
++		if (offset < 0x40000)
++			offset = 0x40000;
++	}
 +
 +	ret = nouveau_mem_init_heap(&dev_priv->ramin_heap,
 +				    offset, dev_priv->ramin_rsvd_vram - offset);
@@ -28624,10 +28814,10 @@ index 0000000..6b5fdcc
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
 new file mode 100644
-index 0000000..6415e4e
+index 0000000..915fe84
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_graph.c
-@@ -0,0 +1,2203 @@
+@@ -0,0 +1,2214 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -30144,6 +30334,17 @@ index 0000000..6415e4e
 +void
 +nv40_graph_destroy_context(struct nouveau_channel *chan)
 +{
++	struct drm_device *dev = chan->dev;
++	uint32_t inst;
++
++	/* Mark context as unloaded if still active on PGRAPH */
++	inst = nv_rd32(dev, NV40_PGRAPH_CTXCTL_CUR);
++	if (inst & NV40_PGRAPH_CTXCTL_CUR_LOADED) {
++		inst &= NV40_PGRAPH_CTXCTL_CUR_INSTANCE;
++		if (inst == (chan->ramin_grctx->instance >> 4))
++			nv_wr32(dev, NV40_PGRAPH_CTXCTL_CUR, inst);
++	}
++
 +	nouveau_gpuobj_ref_del(chan->dev, &chan->ramin_grctx);
 +}
 +
@@ -33223,7 +33424,7 @@ index 0000000..d2f0b80
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
 new file mode 100644
-index 0000000..d3807e3
+index 0000000..cc4c2f7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
 @@ -0,0 +1,256 @@
@@ -33243,15 +33444,14 @@ index 0000000..d3807e3
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (info->flags & FBINFO_HWACCEL_DISABLED) {
-+		cfb_fillrect(info, rect);
-+		return;
-+	}
-+
-+	if (RING_SPACE(chan, rect->rop == ROP_COPY ? 7 : 11)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) &&
++	     RING_SPACE(chan, rect->rop == ROP_COPY ? 7 : 11)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_fillrect(info, rect);
 +		return;
 +	}
@@ -33285,15 +33485,13 @@ index 0000000..d3807e3
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (info->flags & FBINFO_HWACCEL_DISABLED) {
-+		cfb_copyarea(info, region);
-+		return;
-+	}
-+
-+	if (RING_SPACE(chan, 12)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 12)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_copyarea(info, region);
 +		return;
 +	}
@@ -33327,14 +33525,17 @@ index 0000000..d3807e3
 +	if (info->state != FBINFO_STATE_RUNNING)
 +		return;
 +
-+	if (image->depth != 1 || (info->flags & FBINFO_HWACCEL_DISABLED)) {
++	if (image->depth != 1) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
 +
-+	if (RING_SPACE(chan, 11)) {
++	if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 11)) {
 +		NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
 +		info->flags |= FBINFO_HWACCEL_DISABLED;
++	}
++
++	if (info->flags & FBINFO_HWACCEL_DISABLED) {
 +		cfb_imageblit(info, image);
 +		return;
 +	}
@@ -33485,10 +33686,10 @@ index 0000000..d3807e3
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..3d12e12
+index 0000000..6bc0824
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
-@@ -0,0 +1,475 @@
+@@ -0,0 +1,473 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -33771,8 +33972,6 @@ index 0000000..3d12e12
 +	nv_wo32(dev, ramfc, 0x44/4, 0x2101ffff);
 +	nv_wo32(dev, ramfc, 0x60/4, 0x7fffffff);
 +	nv_wo32(dev, ramfc, 0x40/4, 0x00000000);
-+	nv_wo32(dev, ramfc, 0x50/4, 0x2039b2e0);
-+	nv_wo32(dev, ramfc, 0x54/4, 0x000f0000);
 +	nv_wo32(dev, ramfc, 0x7c/4, 0x30000001);
 +	nv_wo32(dev, ramfc, 0x78/4, 0x00000000);
 +	nv_wo32(dev, ramfc, 0x4c/4, 0xffffffff);
@@ -33966,10 +34165,10 @@ index 0000000..3d12e12
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..108f672
+index 0000000..9a88a1a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,439 @@
+@@ -0,0 +1,443 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34086,9 +34285,11 @@ index 0000000..108f672
 +	case 0xaa:
 +		voodoo = nvaa_ctxprog;
 +		break;
++#if 0 /* block accel for now, it won't work */
 +	case 0xac:
 +		voodoo = nvac_ctxprog;
 +		break;
++#endif
 +	default:
 +		NV_ERROR(dev, "no ctxprog for chipset NV%02x\n", dev_priv->chipset);
 +		dev_priv->engine.graph.accel_blocked = true;
@@ -34207,9 +34408,11 @@ index 0000000..108f672
 +	case 0xaa:
 +		ctxvals = nvaa_ctxvals;
 +		break;
++#if 0 /* block accel for now, it won't work */
 +	case 0xac:
 +		ctxvals = nvac_ctxvals;
 +		break;
++#endif
 +	default:
 +		break;
 +	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.65
retrieving revision 1.1294.2.66
diff -u -p -r1.1294.2.65 -r1.1294.2.66
--- kernel.spec	10 Sep 2009 14:00:29 -0000	1.1294.2.65
+++ kernel.spec	15 Sep 2009 19:45:39 -0000	1.1294.2.66
@@ -665,10 +665,14 @@ Patch610: hda_intel-prealloc-4mb-dmabuff
 Patch611: alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 Patch670: linux-2.6-ata-quirk.patch
+Patch671: linux-2.6-ahci-export-capabilities.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 
+Patch700: linux-2.6.31-nx-data.patch
+Patch701: linux-2.6.31-modules-ro-nx.patch
+
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
@@ -724,6 +728,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: linux-2.6-nfs4-ver4opt.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -731,6 +736,14 @@ Patch11010: via-hwmon-temp-sensor.patch
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
+Patch12012: linux-2.6-rtc-show-hctosys.patch
+Patch12013: linux-2.6-rfkill-all.patch
+
+# patches headed for -stable
+
+# scsi oops fixes
+Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
@@ -1211,6 +1224,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6-nfs4-ver4opt.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1289,12 +1303,20 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
+# Make it possible to identify non-hotplug SATA ports
+ApplyPatch linux-2.6-ahci-export-capabilities.patch
+
 # rt2x00: back-port activity LED init patches
 #ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
+# Mark kernel data as NX
+ApplyPatch linux-2.6.31-nx-data.patch
+# Apply NX/RO to modules
+ApplyPatch linux-2.6.31-modules-ro-nx.patch
+
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -1359,6 +1381,14 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 ApplyPatch v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # Patches headed upstream
+ApplyPatch linux-2.6-rtc-show-hctosys.patch
+ApplyPatch linux-2.6-rfkill-all.patch
+
+# patches headed for -stable
+
+# scsi oops fixes
+ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
@@ -2019,6 +2049,42 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 15 2009 Michael Young <m.a.young at durham.ac.uk>
+- switch to the F-12 branch for the moment
+
+* Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs
+
+* Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: temporarily disable fbcon accel, it's racing with ttm
+
+* Mon Sep 14 2009 Steve Dickson <steved at redhat.com>
+- Added support for -o v4 mount parsing
+
+* Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: avoid PFIFO IRQ hardlock, misc LVDS mode fixes, nv5x RAMFC cleanup
+
+* Sun Sep 13 2009 Chuck Ebbert <cebbert at redhat.com>
+- SCSI oops fixes requested for -stable
+
+* Fri Sep 11 2009 Dave Jones <davej at redhat.com>
+- Apply NX/RO to modules
+
+* Fri Sep 11 2009 Dave Jones <davej at redhat.com>
+- Mark kernel data section as NX
+
+* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: bring in Matthew Garret's initial switchable graphics support
+
+* Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: fixed use of strap-based panel mode when required (rh#522649)
+- nouveau: temporarily block accel on NVAC chipsets (rh#522361, rh#522575)
+
+* Thu Sep 10 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-ahci-export-capabilities.patch: Backport from upstream
+- linux-2.6-rtc-show-hctosys.patch: Export the hctosys state of an rtc
+- linux-2.6-rfkill-all.patch: Support for keys that toggle all rfkill state
+
 * Thu Sep 10 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops and get to 2.6.31
 

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 ------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/include/asm/xen/swiotlb.h         |   12 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   49 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    8 
 arch/x86/kernel/pci-swiotlb.c              |   25 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    6 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/ioremap.c                      |   72 -
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/physaddr.c                     |   70 +
 arch/x86/mm/physaddr.h                     |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  202 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |  988 +++++++++++++++++
 arch/x86/xen/pci.c                         |  111 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/spinlock.c                    |   28 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  271 ++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  657 +++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 +++++++++
 drivers/xen/events.c                       |  422 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 +++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1602 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +-----
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 +++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |  102 +
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 143 files changed, 12716 insertions(+), 1421 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -u -p -r1.1.2.41 -r1.1.2.42
--- xen.pvops.patch	10 Sep 2009 14:00:31 -0000	1.1.2.41
+++ xen.pvops.patch	15 Sep 2009 19:45:40 -0000	1.1.2.42
@@ -3230,20 +3230,20 @@ index 5204332..22a5a6d 100644
  EXPORT_SYMBOL_GPL(math_state_restore);
  
 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
-index eefdeee..72bb3a2 100644
+index eefdeee..9b5a9f5 100644
 --- a/arch/x86/mm/Makefile
 +++ b/arch/x86/mm/Makefile
-@@ -1,6 +1,10 @@
+@@ -1,5 +1,9 @@
  obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
- 	    pat.o pgtable.o gup.o
- 
+-	    pat.o pgtable.o gup.o
++	    pat.o pgtable.o physaddr.o gup.o
++
 +# Make sure __phys_addr has no stackprotector
 +nostackp := $(call cc-option, -fno-stack-protector)
-+CFLAGS_ioremap.o		:= $(nostackp)
-+
++CFLAGS_physaddr.o		:= $(nostackp)
+ 
  obj-$(CONFIG_SMP)		+= tlb.o
  
- obj-$(CONFIG_X86_32)		+= pgtable_32.o iomap_32.o
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
 index 3cd7711..f16903d 100644
 --- a/arch/x86/mm/init_32.c
@@ -3311,6 +3311,89 @@ index 3cd7711..f16903d 100644
  	work_with_active_regions(nid, add_highpages_work_fn, &data);
  }
  
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index 8a45093..04e1ad6 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -22,77 +22,7 @@
+ #include <asm/pgalloc.h>
+ #include <asm/pat.h>
+ 
+-static inline int phys_addr_valid(resource_size_t addr)
+-{
+-#ifdef CONFIG_PHYS_ADDR_T_64BIT
+-	return !(addr >> boot_cpu_data.x86_phys_bits);
+-#else
+-	return 1;
+-#endif
+-}
+-
+-#ifdef CONFIG_X86_64
+-
+-unsigned long __phys_addr(unsigned long x)
+-{
+-	if (x >= __START_KERNEL_map) {
+-		x -= __START_KERNEL_map;
+-		VIRTUAL_BUG_ON(x >= KERNEL_IMAGE_SIZE);
+-		x += phys_base;
+-	} else {
+-		VIRTUAL_BUG_ON(x < PAGE_OFFSET);
+-		x -= PAGE_OFFSET;
+-		VIRTUAL_BUG_ON(!phys_addr_valid(x));
+-	}
+-	return x;
+-}
+-EXPORT_SYMBOL(__phys_addr);
+-
+-bool __virt_addr_valid(unsigned long x)
+-{
+-	if (x >= __START_KERNEL_map) {
+-		x -= __START_KERNEL_map;
+-		if (x >= KERNEL_IMAGE_SIZE)
+-			return false;
+-		x += phys_base;
+-	} else {
+-		if (x < PAGE_OFFSET)
+-			return false;
+-		x -= PAGE_OFFSET;
+-		if (!phys_addr_valid(x))
+-			return false;
+-	}
+-
+-	return pfn_valid(x >> PAGE_SHIFT);
+-}
+-EXPORT_SYMBOL(__virt_addr_valid);
+-
+-#else
+-
+-#ifdef CONFIG_DEBUG_VIRTUAL
+-unsigned long __phys_addr(unsigned long x)
+-{
+-	/* VMALLOC_* aren't constants  */
+-	VIRTUAL_BUG_ON(x < PAGE_OFFSET);
+-	VIRTUAL_BUG_ON(__vmalloc_start_set && is_vmalloc_addr((void *) x));
+-	return x - PAGE_OFFSET;
+-}
+-EXPORT_SYMBOL(__phys_addr);
+-#endif
+-
+-bool __virt_addr_valid(unsigned long x)
+-{
+-	if (x < PAGE_OFFSET)
+-		return false;
+-	if (__vmalloc_start_set && is_vmalloc_addr((void *) x))
+-		return false;
+-	if (x >= FIXADDR_START)
+-		return false;
+-	return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);
+-}
+-EXPORT_SYMBOL(__virt_addr_valid);
+-
+-#endif
++#include "physaddr.h"
+ 
+ int page_is_ram(unsigned long pagenr)
+ {
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
 index 352aa9e..95609e3 100644
 --- a/arch/x86/mm/pat.c
@@ -3345,6 +3428,98 @@ index ed34f5e..9c58425 100644
  pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
  {
  	return (pte_t *)__get_free_page(PGALLOC_GFP);
+diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
+new file mode 100644
+index 0000000..d2e2735
+--- /dev/null
++++ b/arch/x86/mm/physaddr.c
+@@ -0,0 +1,70 @@
++#include <linux/mmdebug.h>
++#include <linux/module.h>
++#include <linux/mm.h>
++
++#include <asm/page.h>
++
++#include "physaddr.h"
++
++#ifdef CONFIG_X86_64
++
++unsigned long __phys_addr(unsigned long x)
++{
++	if (x >= __START_KERNEL_map) {
++		x -= __START_KERNEL_map;
++		VIRTUAL_BUG_ON(x >= KERNEL_IMAGE_SIZE);
++		x += phys_base;
++	} else {
++		VIRTUAL_BUG_ON(x < PAGE_OFFSET);
++		x -= PAGE_OFFSET;
++		VIRTUAL_BUG_ON(!phys_addr_valid(x));
++	}
++	return x;
++}
++EXPORT_SYMBOL(__phys_addr);
++
++bool __virt_addr_valid(unsigned long x)
++{
++	if (x >= __START_KERNEL_map) {
++		x -= __START_KERNEL_map;
++		if (x >= KERNEL_IMAGE_SIZE)
++			return false;
++		x += phys_base;
++	} else {
++		if (x < PAGE_OFFSET)
++			return false;
++		x -= PAGE_OFFSET;
++		if (!phys_addr_valid(x))
++			return false;
++	}
++
++	return pfn_valid(x >> PAGE_SHIFT);
++}
++EXPORT_SYMBOL(__virt_addr_valid);
++
++#else
++
++#ifdef CONFIG_DEBUG_VIRTUAL
++unsigned long __phys_addr(unsigned long x)
++{
++	/* VMALLOC_* aren't constants  */
++	VIRTUAL_BUG_ON(x < PAGE_OFFSET);
++	VIRTUAL_BUG_ON(__vmalloc_start_set && is_vmalloc_addr((void *) x));
++	return x - PAGE_OFFSET;
++}
++EXPORT_SYMBOL(__phys_addr);
++#endif
++
++bool __virt_addr_valid(unsigned long x)
++{
++	if (x < PAGE_OFFSET)
++		return false;
++	if (__vmalloc_start_set && is_vmalloc_addr((void *) x))
++		return false;
++	if (x >= FIXADDR_START)
++		return false;
++	return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);
++}
++EXPORT_SYMBOL(__virt_addr_valid);
++
++#endif	/* CONFIG_X86_64 */
+diff --git a/arch/x86/mm/physaddr.h b/arch/x86/mm/physaddr.h
+new file mode 100644
+index 0000000..a3cd5a0
+--- /dev/null
++++ b/arch/x86/mm/physaddr.h
+@@ -0,0 +1,10 @@
++#include <asm/processor.h>
++
++static inline int phys_addr_valid(resource_size_t addr)
++{
++#ifdef CONFIG_PHYS_ADDR_T_64BIT
++	return !(addr >> boot_cpu_data.x86_phys_bits);
++#else
++	return 1;
++#endif
++}
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
 index c814e14..f68d42f 100644
 --- a/arch/x86/mm/tlb.c



From chkr at fedoraproject.org  Tue Sep 15 19:54:20 2009
From: chkr at fedoraproject.org (chkr)
Date: Tue, 15 Sep 2009 19:54:20 +0000 (UTC)
Subject: rpms/f-spot/F-10 0001-gtk-version.patch, NONE, 1.1 f-spot.spec, 1.84,
	1.85
Message-ID: <20090915195420.45D3611C00CE@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6715

Modified Files:
	f-spot.spec 
Added Files:
	0001-gtk-version.patch 
Log Message:
* Tue Sep 15 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1.1
- Fix crash due to incorrect GTK+ version (BZ #523236)


0001-gtk-version.patch:
 EditTagDialog.ui |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-gtk-version.patch ---
diff --git a/src/UI.Dialog/ui/EditTagDialog.ui b/src/UI.Dialog/ui/EditTagDialog.ui
index 1a34a0f..5639d0b 100644
--- a/src/UI.Dialog/ui/EditTagDialog.ui
+++ b/src/UI.Dialog/ui/EditTagDialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.14"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="edit_tag_dialog">
     <property name="border_width">6</property>
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- f-spot.spec	9 Aug 2009 17:49:05 -0000	1.84
+++ f-spot.spec	15 Sep 2009 19:54:19 -0000	1.85
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.0.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -16,6 +16,8 @@ Patch2:         0001-use-system-Mono.Add
 Patch3:         0002-enhance-the-f-spot-import-script.patch
 # I'm told this is fixed in SVN
 Patch4:         f-spot-0.6.0.0-gtk-deprecated.patch
+# Patch for gtk+-2.14 compatibility already applied upstream (f-spot > 0.6.1.1)
+Patch5:         0001-gtk-version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +63,7 @@ sorting and tagging of digital images. 
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
+%patch5 -p1 -b .gtk-api-version
 
 %build
 autoreconf -f -i
@@ -122,6 +125,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/omf/f-spot/
 
 %changelog
+* Tue Sep 15 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1.1
+- Fix crash due to incorrect GTK+ version (BZ #523236)
+
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
 - Update to new upstream version 0.6.0.0
 - Cleanup spec file



From caolanm at fedoraproject.org  Tue Sep 15 20:03:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Sep 2009 20:03:33 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,
	1.1, 1.2 openoffice.org.spec, 1.2009, 1.2010
Message-ID: <20090915200333.757E411C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506

Modified Files:
	openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 
	openoffice.org.spec 
Log Message:
defuzz patches

openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch:
 canvas/source/cairo/cairo_canvasfont.cxx                      |    5 +++++
 canvas/source/directx/dx_textlayout_drawhelper.cxx            |    6 ++++++
 canvas/source/vcl/canvasfont.cxx                              |    5 +++++
 cppcanvas/inc/cppcanvas/renderer.hxx                          |    3 +++
 cppcanvas/source/mtfrenderer/implrenderer.cxx                 |   10 +++++++++-
 drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx |    6 +++++-
 drawinglayer/source/primitive2d/textlayoutdevice.cxx          |    2 ++
 drawinglayer/source/primitive2d/textprimitive2d.cxx           |    3 ++-
 drawinglayer/source/processor2d/canvasprocessor.cxx           |    5 +++++
 9 files changed, 42 insertions(+), 3 deletions(-)

Index: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch	15 Sep 2009 08:19:34 -0000	1.1
+++ openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch	15 Sep 2009 20:03:32 -0000	1.2
@@ -10,7 +10,7 @@ Index: cppcanvas/source/mtfrenderer/impl
  #include <com/sun/star/rendering/ViewState.hpp>
  #include <com/sun/star/rendering/RenderState.hpp>
  #include <com/sun/star/rendering/XCanvasFont.hpp>
-@@ -956,6 +957,12 @@
+@@ -955,6 +956,12 @@
                  rParms.mrParms.maFontLetterForm.isValid() ?
                  rParms.mrParms.maFontLetterForm.getValue() :
                  (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
@@ -21,9 +21,9 @@ Index: cppcanvas/source/mtfrenderer/impl
 +                    ? rendering::PanoseProportion::MONO_SPACED
 +                    : rendering::PanoseProportion::ANYTHING;
  
-             LanguageType aLang = rFont.GetLanguage();
-             aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
-@@ -3073,7 +3080,8 @@
+             // setup state-local text transformation,
+             // if the font be rotated
+@@ -3061,7 +3068,8 @@
              if( rParams.maFontName.isValid() ||
                  rParams.maFontWeight.isValid() ||
                  rParams.maFontLetterForm.isValid() ||
@@ -51,7 +51,7 @@ Index: canvas/source/directx/dx_textlayo
 ===================================================================
 --- canvas/source/directx/dx_textlayout_drawhelper.cxx	(revision 276100)
 +++ canvas/source/directx/dx_textlayout_drawhelper.cxx	(working copy)
-@@ -135,6 +135,9 @@
+@@ -134,6 +134,9 @@
              aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
              aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
              aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -59,9 +59,9 @@ Index: canvas/source/directx/dx_textlayo
 +                    rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
 +                    ? PITCH_FIXED : PITCH_VARIABLE);
  
-             aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
- 
-@@ -267,6 +270,9 @@
+             // setup font color
+             aFont.SetColor( aColor );
+@@ -264,6 +267,9 @@
          aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
          aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
          aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -83,7 +83,7 @@ Index: canvas/source/vcl/canvasfont.cxx
 +
  #include <rtl/math.hxx>
  #include <basegfx/numeric/ftools.hxx>
- #include <i18npool/mslangid.hxx>
+ 
 @@ -66,6 +68,9 @@
          // TODO(F2): improve panose->vclenum conversion
          maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
@@ -92,22 +92,22 @@ Index: canvas/source/vcl/canvasfont.cxx
 +                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
 +                    ? PITCH_FIXED : PITCH_VARIABLE);
  
- 		maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
- 
+         // adjust to stretched/shrinked font
+         if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
 Index: canvas/source/cairo/cairo_canvasfont.cxx
 ===================================================================
 --- canvas/source/cairo/cairo_canvasfont.cxx	(revision 276100)
 +++ canvas/source/cairo/cairo_canvasfont.cxx	(working copy)
-@@ -36,6 +36,8 @@
- #include <rtl/math.hxx>
- #include <basegfx/numeric/ftools.hxx>
+@@ -33,6 +33,8 @@
+ 
+ #include <canvas/debug.hxx>
  
 +#include <com/sun/star/rendering/PanoseProportion.hpp>
 +
- #include <vcl/metric.hxx>
- #include <i18npool/mslangid.hxx>
+ #include <rtl/math.hxx>
+ #include <basegfx/numeric/ftools.hxx>
  
-@@ -86,6 +88,9 @@
+@@ -85,6 +87,9 @@
          // TODO(F2): improve panose->vclenum conversion
          maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
          maFont->SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -115,8 +115,8 @@ Index: canvas/source/cairo/cairo_canvasf
 +                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
 +                    ? PITCH_FIXED : PITCH_VARIABLE);
  
-         maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
- 
+         // adjust to stretched/shrinked font
+         if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
 Index: drawinglayer/source/processor2d/canvasprocessor.cxx
 ===================================================================
 --- drawinglayer/source/processor2d/canvasprocessor.cxx	(revision 276100)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2009
retrieving revision 1.2010
diff -u -p -r1.2009 -r1.2010
--- openoffice.org.spec	15 Sep 2009 16:13:04 -0000	1.2009
+++ openoffice.org.spec	15 Sep 2009 20:03:32 -0000	1.2010
@@ -1705,7 +1705,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.dr69.patch
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch86 -p0 -b .oooXXXXXX.sal.justcoredump.patch
+%patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From mitr at fedoraproject.org  Tue Sep 15 20:27:27 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 15 Sep 2009 20:27:27 +0000 (UTC)
Subject: rpms/audit-viewer/devel .cvsignore, 1.4, 1.5 audit-viewer.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090915202727.DB73311C00CE@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/audit-viewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18713

Modified Files:
	.cvsignore audit-viewer.spec sources 
Log Message:
* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-1
- Update to audit-viewer-0.5.
- Preserve timestamps of some installed files.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Oct 2008 18:24:45 -0000	1.4
+++ .cvsignore	15 Sep 2009 20:27:27 -0000	1.5
@@ -1 +1 @@
-audit-viewer-0.4.tar.bz2
+audit-viewer-0.5.tar.bz2


Index: audit-viewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/audit-viewer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- audit-viewer.spec	24 Jul 2009 17:33:46 -0000	1.8
+++ audit-viewer.spec	15 Sep 2009 20:27:27 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Audit event viewer
 Name: audit-viewer
-Version: 0.4
-Release: 4%{?dist}
+Version: 0.5
+Release: 1
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/audit-viewer/
@@ -24,7 +24,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install-fedora
+make DESTDIR=$RPM_BUILD_ROOT install-fedora INSTALL='install -p'
 
 %find_lang audit-viewer
 
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/audit-viewer-server
 
 %changelog
+* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-1
+- Update to audit-viewer-0.5.
+- Preserve timestamps of some installed files.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Oct 2008 18:24:45 -0000	1.4
+++ sources	15 Sep 2009 20:27:27 -0000	1.5
@@ -1 +1 @@
-eebb6f540d99b6baf210184183234ccd  audit-viewer-0.4.tar.bz2
+63966dcdc8c4388c966dc8972f5f1973  audit-viewer-0.5.tar.bz2



From vpv at fedoraproject.org  Tue Sep 15 20:32:22 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 20:32:22 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel malaga-suomi-voikko.spec,1.14,1.15
Message-ID: <20090915203222.8AC7111C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22910

Modified Files:
	malaga-suomi-voikko.spec 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
- New release candidate.
- Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga
  implementation for Finnish spell checking. Malaga is still required for
  building this package.
- Cleanup DESTDIR, Makefile now automatically adds the directory version
  and variant to it.



Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- malaga-suomi-voikko.spec	15 Sep 2009 14:52:13 -0000	1.14
+++ malaga-suomi-voikko.spec	15 Sep 2009 20:32:22 -0000	1.15
@@ -51,12 +51,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
-- New release candidate
+- New release candidate.
 - Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga
   implementation for Finnish spell checking. Malaga is still required for
-  building this package
-- Cleanup DESTDIR, the Makefile now automatically adds the directory version
-  and variant to it
+  building this package.
+- Cleanup DESTDIR, Makefile now automatically adds the directory version
+  and variant to it.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From mitr at fedoraproject.org  Tue Sep 15 20:34:55 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 15 Sep 2009 20:34:55 +0000 (UTC)
Subject: rpms/audit-viewer/devel audit-viewer.spec,1.9,1.10
Message-ID: <20090915203455.1940B11C00CE@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/audit-viewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23787

Modified Files:
	audit-viewer.spec 
Log Message:
* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-2
- BuildRequires: intltool



Index: audit-viewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/audit-viewer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- audit-viewer.spec	15 Sep 2009 20:27:27 -0000	1.9
+++ audit-viewer.spec	15 Sep 2009 20:34:54 -0000	1.10
@@ -1,13 +1,13 @@
 Summary: Audit event viewer
 Name: audit-viewer
 Version: 0.5
-Release: 1
+Release: 2
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/audit-viewer/
 Source0: https://fedorahosted.org/releases/a/u/audit-viewer/audit-viewer-%{version}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: desktop-file-utils, gettext, perl(XML::Parser), python
+BuildRequires: desktop-file-utils, gettext, intltool, python
 Requires: audit-libs-python, gnome-python2-gnome, gnome-python2-rsvg
 Requires: pygtk2-libglade, pychart, python-gtkextra, python-sexy, usermode
 Requires: usermode-gtk
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/audit-viewer-server
 
 %changelog
+* Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-2
+- BuildRequires: intltool
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-1
 - Update to audit-viewer-0.5.
 - Preserve timestamps of some installed files.



From vpv at fedoraproject.org  Tue Sep 15 20:37:39 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 20:37:39 +0000 (UTC)
Subject: rpms/libvoikko/devel libvoikko-2.2-check_getcwd.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 libvoikko.spec, 1.25, 1.26 sources,
	1.15, 1.16
Message-ID: <20090915203739.C696211C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25791

Modified Files:
	.cvsignore libvoikko.spec sources 
Added Files:
	libvoikko-2.2-check_getcwd.patch 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.1.rc1
- New release candidate
- Improvements to spelling suggestions, grammar checker etc.
- Libvoikko now uses its own internal implementation of malaga.
- This prevents symbol conflicts such as https://bugzilla.redhat.com/502546
- BuildRequires malaga removed and glib2-devel added.
- Require malaga-suomi-voikko >= 1.4, libvoikko 2.2 expects the newer
  dictionary format
- Add a patch to make it compile on Fedora with -Werror


libvoikko-2.2-check_getcwd.patch:
 files.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvoikko-2.2-check_getcwd.patch ---
diff -Naur libvoikko-2.2.orig/src/morphology/malaga/files.cpp libvoikko-2.2/src/morphology/malaga/files.cpp
--- libvoikko-2.2.orig/src/morphology/malaga/files.cpp	2009-09-15 18:13:31.226662282 +0300
+++ libvoikko-2.2/src/morphology/malaga/files.cpp	2009-09-15 18:18:53.658662494 +0300
@@ -337,10 +337,9 @@
       add_to_text( path, relative_dir );
       free_mem( &relative_dir );
     } 
-    else 
+    else if (getcwd( current_dir, MAX_PATH_SIZE ) != NULL)
     { 
       /* Put current directory in front. */
-      getcwd( current_dir, MAX_PATH_SIZE );
       add_to_text( path, current_dir );
     }
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 May 2009 17:42:55 -0000	1.15
+++ .cvsignore	15 Sep 2009 20:37:35 -0000	1.16
@@ -1 +1 @@
-libvoikko-2.1.tar.gz
+libvoikko-2.2rc1.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libvoikko.spec	25 Jul 2009 08:53:28 -0000	1.25
+++ libvoikko.spec	15 Sep 2009 20:37:36 -0000	1.26
@@ -1,20 +1,22 @@
 Name:           libvoikko
-Version:        2.1
-Release:        2%{?dist}
+Version:        2.2
+Release:        0.1.rc1%{?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}rc1.tar.gz
+# Sent upstream
+Patch0:         libvoikko-2.2-check_getcwd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  malaga-devel >= 7.8 python
-# Needed for the new dictionary directory layout
-Requires:       malaga-suomi-voikko >= 1.3-10
+BuildRequires:  python glib2-devel
+# Libvoikko >= 2.2 needs this, earlier versions won't work
+Requires:       malaga-suomi-voikko >= 1.4
 
 %description
 This is libvoikko, library for spellcheckers and hyphenators using Malaga
@@ -49,6 +51,7 @@ scripts.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -96,6 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.1.rc1
+- New release candidate
+- Improvements to spelling suggestions, grammar checker etc.
+- Libvoikko now uses its own internal implementation of malaga.
+- This prevents symbol conflicts such as https://bugzilla.redhat.com/502546
+- BuildRequires malaga removed and glib2-devel added.
+- Require malaga-suomi-voikko >= 1.4, libvoikko 2.2 expects the newer
+  dictionary format
+- Add a patch to make it compile on Fedora with -Werror
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	2 May 2009 17:42:55 -0000	1.15
+++ sources	15 Sep 2009 20:37:37 -0000	1.16
@@ -1 +1 @@
-c0c04a2979126fc9103fa4d88358c90a  libvoikko-2.1.tar.gz
+2513a38189fbda0818b107ad72c0ab59  libvoikko-2.2rc1.tar.gz



From vpv at fedoraproject.org  Tue Sep 15 20:41:12 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 15 Sep 2009 20:41:12 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.17,1.18
Message-ID: <20090915204112.6467411C00CE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29006

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-4
- Drop Requires for libmalaga, the current version of libvoikko in Fedora
  Rawhide doesn't depend on libmalaga anymore



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mozvoikko.spec	11 Sep 2009 07:53:02 -0000	1.17
+++ mozvoikko.spec	15 Sep 2009 20:41:12 -0000	1.18
@@ -5,14 +5,13 @@
 %global firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
 # These requires are hardcoded in the sources
 %global libvoikko libvoikko.so.1
-%global libmalaga libmalaga.so.7
 %ifarch x86_64 ppc64 ia64 sparc64 s390x
 %global mark64  ()(64bit)
 %endif
 
 Name:           mozvoikko
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -30,7 +29,6 @@ BuildRequires:  pkgconfig
 # For xulrunner unstable
 Requires:       gecko-libs = %{gecko_ver}
 Requires:       %{libvoikko}%{?mark64}
-Requires:       %{libmalaga}%{?mark64}
 # As long as Firefox is the only program which can use the extension,
 # we may as well require it, since this package is quite useless without it.
 Requires:       firefox
@@ -69,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-4
+- Drop Requires for libmalaga, the current version of libvoikko in Fedora
+  Rawhide doesn't depend on libmalaga anymore
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.0-3
 - Rebuild against newer gecko
 



From jmagne at fedoraproject.org  Tue Sep 15 20:52:46 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Tue, 15 Sep 2009 20:52:46 +0000 (UTC)
Subject: rpms/coolkey/devel coolkey-latest.patch, NONE, 1.1 import.log, NONE,
	1.1 coolkey.spec, 1.30, 1.31
Message-ID: <20090915205246.7A2D511C00CE@cvs1.fedora.phx.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3511/devel

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-latest.patch import.log 
Log Message:
Latest fixes for Safenet 330J and Gemalto 64K cards.


coolkey-latest.patch:
 coolkey/slot.cpp           |  146 +++++++++++++++++++++++++++++++++++++++------
 coolkey/slot.h             |   13 ++--
 libckyapplet/cky_applet.c  |  105 ++++++++++++++++++++++++++++++--
 libckyapplet/cky_applet.h  |   21 ++++++
 libckyapplet/cky_card.c    |   29 ++++++--
 libckyapplet/cky_factory.c |   61 +++++++++++++++++-
 libckyapplet/cky_factory.h |    3 
 7 files changed, 338 insertions(+), 40 deletions(-)

--- NEW FILE coolkey-latest.patch ---
diff -up ./src/coolkey/slot.cpp.coolkey-latest ./src/coolkey/slot.cpp
--- ./src/coolkey/slot.cpp.coolkey-latest	2009-09-11 13:58:24.423487305 -0700
+++ ./src/coolkey/slot.cpp	2009-09-11 14:04:30.813488220 -0700
@@ -203,6 +203,29 @@ SlotList::readerExists(const char *reade
     return FALSE;
 }
 
+bool
+SlotList::readerNameExistsInList(const char *readerName,CKYReaderNameList *readerNameList)
+{
+    if( !readerName || !readerNameList) {
+        return FALSE;
+    }
+
+    int i = 0;
+    int readerNameCnt = CKYReaderNameList_GetCount(*readerNameList);
+
+    const char *curReaderName = NULL;
+    for(i=0; i < readerNameCnt; i++) {
+        curReaderName = CKYReaderNameList_GetValue(*readerNameList,i);
+
+        if(!strcmp(curReaderName,readerName)) {
+            return TRUE;
+        }
+        
+    }
+    
+    return FALSE;
+}
+
 /*
  * you need to hold the ReaderList Lock before you can update the ReaderList
  */
@@ -256,6 +279,27 @@ SlotList::updateReaderList()
      * don't recognize.
      */
 
+    /* first though, let's check to see if any previously removed readers have 
+     * come back from the dead. If the ignored bit has been set, we do not need
+     * it any more.
+    */
+
+    const char *curReaderName = NULL;
+    unsigned long knownState = 0;
+    for(int ri = 0 ; ri < numReaders; ri ++)  {
+       
+        knownState = CKYReader_GetKnownState(&readerStates[ri]);
+        if( !(knownState & SCARD_STATE_IGNORE))  {
+            continue;
+        }
+ 
+        curReaderName =  CKYReader_GetReaderName(&readerStates[ri]); 
+        if(readerNameExistsInList(curReaderName,&readerNames)) {
+            CKYReader_SetKnownState(&readerStates[ri], knownState & ~SCARD_STATE_IGNORE); 
+                 
+        }
+    } 
+
     const char *newReadersData[MAX_READER_DELTA];
     const char **newReaders = &newReadersData[0];
     unsigned int newReaderCount = 0;
@@ -528,7 +572,7 @@ SlotList::getSlotList(CK_BBOOL tokenPres
 void
 Slot::connectToToken()
 {
-    CKYStatus status;
+    CKYStatus status = CKYSCARDERR;
     OSTime time = OSTimeNow();
 
     mCoolkey = 0;
@@ -537,13 +581,31 @@ Slot::connectToToken()
 
     // try to connect to the card
     if( ! CKYCardConnection_IsConnected(conn) ) {
-        status = CKYCardConnection_Connect(conn, readerName);
-        if( status != CKYSUCCESS ) {
-            log->log("Unable to connect to token\n");
+        int i = 0;
+    //for cranky readers try again a few more times
+        while( i++ < 5 && status != CKYSUCCESS )
+        {
+            status = CKYCardConnection_Connect(conn, readerName);
+            if( status != CKYSUCCESS && 
+                CKYCardConnection_GetLastError(conn) == SCARD_E_PROTO_MISMATCH ) 
+            {
+                log->log("Unable to connect to token status %d ConnGetGetLastError %x .\n",status,CKYCardConnection_GetLastError(conn));
+
+            }
+            else
+            {
+                break;
+            }
+            OSSleep(100000);
+        }
+
+        if( status != CKYSUCCESS)
+        {
             state = UNKNOWN;
             return;
         }
     }
+
     log->log("time connect: Connect Time %d ms\n", OSTimeNow() - time);
     if (!slotInfoFound) {
 	readSlotInfo();
@@ -562,15 +624,10 @@ Slot::connectToToken()
         state = CARD_PRESENT;
     }
 
-    if ( CKYBuffer_DataIsEqual(&cardATR, ATR, sizeof (ATR)) || 
-		CKYBuffer_DataIsEqual(&cardATR, ATR1, sizeof(ATR1)) ||
-		CKYBuffer_DataIsEqual(&cardATR, ATR2, sizeof(ATR2)) ) {
-
-        if (Params::hasParam("noAppletOK"))
-        {      
-            state |=  APPLET_SELECTABLE;
-	    mCoolkey = 1;
-        }
+    if (Params::hasParam("noAppletOK"))
+    {      
+        state |=  APPLET_SELECTABLE;
+	mCoolkey = 1;
     }
 
     /* support CAC card. identify the card based on applets, not the ATRS */
@@ -631,7 +688,7 @@ Slot::connectToToken()
          * unfriendly */
 	isVersion1Key = 0;
 	needLogin = 1;
-
+        mCoolkey = 0;
 	return;
     }
     mCoolkey = 1;
@@ -1077,6 +1134,7 @@ SlotList::waitForSlotEvent(CK_FLAGS flag
 	    }
 	    throw;
 	}
+
 	if (myNumReaders != numReaders) {
 	    if (myReaderStates) {
 		delete [] myReaderStates;
@@ -1103,6 +1161,7 @@ SlotList::waitForSlotEvent(CK_FLAGS flag
 		}
 	    }
 	}
+
         if (found || (flag == CKF_DONT_BLOCK) || shuttingDown) {
             break;
         }
@@ -1272,6 +1331,19 @@ class ObjectHandleMatch {
     }
 };
 
+class KeyNumMatch {
+  private:
+    CKYByte keyNum;
+    const Slot &slot;
+  public:
+    KeyNumMatch(CKYByte keyNum_, const Slot &s) : keyNum(keyNum_), slot(s) { }
+    bool operator() (const PKCS11Object& obj) {
+        unsigned long objID = obj.getMuscleObjID();
+        return (slot.getObjectClass(objID) == 'k')
+               && (slot.getObjectIndex(objID) == keyNum);
+    }
+};
+
 class ObjectCertCKAIDMatch {
   private:
     CKYByte cka_id;
@@ -3007,8 +3079,9 @@ Slot::sign(SessionHandleSuffix suffix, C
         CK_ULONG ulDataLen, CK_BYTE_PTR pSignature,
         CK_ULONG_PTR pulSignatureLen)
 {
+    RSASignatureParams params(CryptParams::DEFAULT_KEY_SIZE);
     cryptRSA(suffix, pData, ulDataLen, pSignature, pulSignatureLen,
-        RSASignatureParams(CryptParams::FIXED_KEY_SIZE));
+        params);
 }
 
 void
@@ -3016,14 +3089,15 @@ Slot::decrypt(SessionHandleSuffix suffix
         CK_ULONG ulDataLen, CK_BYTE_PTR pDecryptedData,
         CK_ULONG_PTR pulDecryptedDataLen)
 {
+    RSADecryptParams params(CryptParams::DEFAULT_KEY_SIZE);
     cryptRSA(suffix, pData, ulDataLen, pDecryptedData, pulDecryptedDataLen,
-        RSADecryptParams(CryptParams::FIXED_KEY_SIZE));
+        params);
 }
 
 void
 Slot::cryptRSA(SessionHandleSuffix suffix, CK_BYTE_PTR pInput,
         CK_ULONG ulInputLen, CK_BYTE_PTR pOutput,
-        CK_ULONG_PTR pulOutputLen, const CryptParams& params)
+        CK_ULONG_PTR pulOutputLen, CryptParams& params)
 {
     refreshTokenState();
     SessionIter session = findSession(suffix);
@@ -3041,6 +3115,11 @@ Slot::cryptRSA(SessionHandleSuffix suffi
     CKYBuffer *result = &opState.result;
     CKYByte keyNum = opState.keyNum;
 
+    unsigned int keySize = getKeySize(keyNum);
+
+    if(keySize != CryptParams::DEFAULT_KEY_SIZE)
+        params.setKeySize(keySize);
+
     if( CKYBuffer_Size(result) == 0 ) {
         // we haven't already peformed the decryption, so do it now.
         if( pInput == NULL || ulInputLen == 0) {
@@ -3243,3 +3322,36 @@ Slot::generateRandom(SessionHandleSuffix
 	throw PKCS11Exception(CKR_DEVICE_ERROR);
     }
 }
+
+#define MAX_NUM_KEYS 8
+unsigned int
+Slot::getKeySize(CKYByte keyNum)
+{
+    unsigned int keySize = CryptParams::DEFAULT_KEY_SIZE;
+    int modSize = 0;
+
+    if(keyNum >= MAX_NUM_KEYS) {
+        return keySize;
+    }
+
+    ObjectConstIter iter;
+    iter = find_if(tokenObjects.begin(), tokenObjects.end(),
+        KeyNumMatch(keyNum,*this));
+
+    if( iter == tokenObjects.end() ) {
+        return keySize;
+    }
+
+    CKYBuffer const *modulus = iter->getAttribute(CKA_MODULUS);
+
+    if(modulus) {
+        modSize = CKYBuffer_Size(modulus);
+        if(CKYBuffer_GetChar(modulus,0) == 0x0) {
+            modSize--;
+        }
+        if(modSize > 0)
+            keySize = modSize * 8;
+    }
+
+    return keySize;
+}
diff -up ./src/coolkey/slot.h.coolkey-latest ./src/coolkey/slot.h
--- ./src/coolkey/slot.h.coolkey-latest	2006-06-09 11:39:11.000000000 -0700
+++ ./src/coolkey/slot.h	2009-09-11 13:58:24.462488099 -0700
@@ -270,10 +270,9 @@ class CryptParams {
   protected:
     unsigned int getKeySize() const { return keySize; }
   public:
-    // !!!XXX hack. The right way to get the key size is to get all the
-    // key information from the token with MSCListKeys, the same way
-    // we get all the object information with MSCListObjects.
-    enum { FIXED_KEY_SIZE = 1024 };
+    // set the actual key size obtained from the card
+    void setKeySize(unsigned int newKeySize) { keySize = newKeySize; }
+    enum { DEFAULT_KEY_SIZE = 1024 };
 
 
     CryptParams(unsigned int keySize_) : keySize(keySize_) { }
@@ -422,7 +421,7 @@ class Slot {
 
     void cryptRSA(SessionHandleSuffix suffix, CK_BYTE_PTR pInput,
         CK_ULONG ulInputLen, CK_BYTE_PTR pOutput,
-        CK_ULONG_PTR pulOutputLen, const CryptParams& params);
+        CK_ULONG_PTR pulOutputLen, CryptParams& params);
 
     void performRSAOp(CKYBuffer *out, const CKYBuffer *input, CKYByte keyNum, 
 							     CKYByte direction);
@@ -460,6 +459,8 @@ class Slot {
         return (char )((objectID >> 16) & 0xff) - '0';
     }
 
+    // actually get the size of a key in bits from the card
+    unsigned int getKeySize(CKYByte keyNum);
 
     SessionHandleSuffix openSession(Session::Type type);
     void closeSession(SessionHandleSuffix handleSuffix);
@@ -527,6 +528,8 @@ class SlotList {
      * has called 'C_GetSlotList' with a NULL parameter */
     void updateReaderList();
 
+     /* see if a reader name exists in a caller provided reader name list. */
+    bool readerNameExistsInList(const char *readerName,CKYReaderNameList *readerNameList );
     bool readerExists(const char *readerName, unsigned int *hint = 0);
   public:
     SlotList(Log *log);
diff -up ./src/libckyapplet/cky_applet.c.coolkey-latest ./src/libckyapplet/cky_applet.c
--- ./src/libckyapplet/cky_applet.c.coolkey-latest	2006-06-09 11:44:17.000000000 -0700
+++ ./src/libckyapplet/cky_applet.c	2009-09-11 13:58:24.464487796 -0700
@@ -134,6 +134,13 @@ CKYAppletFactory_Logout(CKYAPDU *apdu, c
 /* Future add WriteObject */
 
 CKYStatus
+CKYAppletFactory_WriteObject(CKYAPDU *apdu, const void *param)
+{
+    const CKYAppletArgWriteObject *wos = (const CKYAppletArgWriteObject *)param;
+    return CKYAPDUFactory_WriteObject(apdu,wos->objectID,wos->offset,wos->size,wos->data);
+}
+
+CKYStatus
 CKYAppletFactory_CreateObject(CKYAPDU *apdu, const void *param)
 {
     const CKYAppletArgCreateObject *cos=(const CKYAppletArgCreateObject *)param;
@@ -192,7 +199,6 @@ CKYAppletFactory_GetLifeCycleV2(CKYAPDU 
 {
     return CKYAPDUFactory_GetLifeCycleV2(apdu);
 }
-
 CKYStatus
 CKYAppletFactory_GetRandom(CKYAPDU *apdu, const void *param)
 {
@@ -725,24 +731,48 @@ CKYApplet_ComputeCrypt(CKYCardConnection
     CKYAppletArgComputeCrypt ccd;
     CKYBuffer    empty;
     CKYISOStatus status;
+    short       dataSize = 0;
     int         use2APDUs = 0;
+    int 	use_dl_object =  CKYBuffer_Size(data) > 200 ;
 
     CKYBuffer_InitEmpty(&empty);
     ccd.keyNumber = keyNumber;
     ccd.mode      = mode;
     ccd.direction = direction;
-    ccd.location  = CKY_DL_APDU;
+    ccd.location  = use_dl_object ? CKY_DL_OBJECT : CKY_DL_APDU;
 
     if (!apduRC)
     	apduRC = &status;
 
+    if (use_dl_object) {
+	CKYBuffer  sizeBuf;
+ 
+	CKYBuffer_InitEmpty(&sizeBuf);
+	CKYBuffer_AppendShort(&sizeBuf, CKYBuffer_Size(data));
+
+        ret = CKYApplet_WriteObjectFull(conn, 0xffffffff,
+                  0, CKYBuffer_Size(&sizeBuf), nonce,
+                  &sizeBuf, apduRC);
+
+        CKYBuffer_FreeData(&sizeBuf);
+        if( ret != CKYSUCCESS)
+           goto fail;
+
+        ret = CKYApplet_WriteObjectFull(conn, 0xffffffff,
+                  2, CKYBuffer_Size(data), nonce,
+                  data, apduRC);
+
+        if(ret != CKYSUCCESS)
+           goto fail; 
+    }
+
     if (mode == CKY_RSA_NO_PAD) {
-	ccd.data = data;
+	ccd.data = use_dl_object ? &empty : data;
 	ccd.sig  = sig;
 	ret = CKYApplet_HandleAPDU(conn, 
 			    CKYAppletFactory_ComputeCryptOneStep, &ccd, nonce, 
 			    CKY_SIZE_UNKNOWN, ckyAppletFill_ComputeCryptFinal, 
-			    result, apduRC);
+			    use_dl_object ? NULL : result, apduRC);
     	if (ret == CKYAPDUFAIL && *apduRC == CKYISO_INCORRECT_P2) {
 	    use2APDUs = 1;  /* maybe it's an old applet */
 	}
@@ -759,13 +789,38 @@ CKYApplet_ComputeCrypt(CKYCardConnection
 			    CKYAppletFactory_ComputeCryptInit, &ccd, nonce, 
 			    0, CKYAppletFill_Null, NULL, apduRC);
 	if (ret == CKYSUCCESS) {
-	    ccd.data = data;
+	    ccd.data = use_dl_object ? &empty : data;
 	    ret = CKYApplet_HandleAPDU(conn, 
 			    CKYAppletFactory_ComputeCryptFinal, &ccd, nonce, 
 			    CKY_SIZE_UNKNOWN, ckyAppletFill_ComputeCryptFinal, 
-			    result, apduRC);
+			    use_dl_object ? NULL : result, apduRC);
 	}
     }
+
+    if (use_dl_object && ret == CKYSUCCESS) {
+        CKYBuffer  sizeOutBuf;
+        CKYBuffer_InitEmpty(&sizeOutBuf);
+
+        ret = CKYApplet_ReadObjectFull(conn,0xffffffff,
+                             0, 2,
+                             nonce,&sizeOutBuf,apduRC);
+
+        if(ret != CKYSUCCESS) {
+            CKYBuffer_FreeData(&sizeOutBuf);
+            goto fail;
+        }
+
+        dataSize = CKYBuffer_GetShort(&sizeOutBuf, 0);
+
+        CKYBuffer_FreeData(&sizeOutBuf);
+
+        ret = CKYApplet_ReadObjectFull(conn,0xffffffff, 
+                             2, dataSize,
+                             nonce,result,apduRC); 
+    }
+
+fail:
+
     return ret;
 }
 
@@ -1036,6 +1091,44 @@ CKYApplet_ReadObjectFull(CKYCardConnecti
 }
 
 /*
+ * Write Object
+ * This makes multiple APDU calls to write the entire object.
+ *
+ */
+
+CKYStatus 
+CKYApplet_WriteObjectFull(CKYCardConnection *conn, unsigned long objectID,
+                  CKYOffset offset, CKYSize size, const CKYBuffer *nonce,
+                  const CKYBuffer *data, CKYISOStatus *apduRC)
+{
+
+    CKYBuffer chunk;
+    CKYOffset srcOffset = 0;
+    CKYAppletArgWriteObject wod;
+    CKYStatus ret = CKYSUCCESS;
+
+    wod.objectID = objectID;
+    wod.offset = offset;
+    do {
+        wod.size = (CKYByte) MIN(size, 220);
+        ret = CKYBuffer_InitFromBuffer(&chunk, data,
+                                       srcOffset, wod.size);
+        if(ret == CKYSUCCESS)  {
+            wod.data = &chunk;
+            ret = CKYApplet_HandleAPDU(conn, CKYAppletFactory_WriteObject, &wod,
+               nonce, 0, CKYAppletFill_Null, NULL, apduRC);
+            size -= wod.size;
+            wod.offset += wod.size;
+            srcOffset  += wod.size;
+            CKYBuffer_FreeData(&chunk);
+       }
+
+    } while ((size > 0) && (ret == CKYSUCCESS));
+
+    return ret;
+}
+
+/*
  * List Object cluster
  */
 static CKYStatus
diff -up ./src/libckyapplet/cky_applet.h.coolkey-latest ./src/libckyapplet/cky_applet.h
--- ./src/libckyapplet/cky_applet.h.coolkey-latest	2006-06-09 11:44:17.000000000 -0700
+++ ./src/libckyapplet/cky_applet.h	2009-09-11 13:58:24.466487772 -0700
@@ -192,6 +192,14 @@ typedef struct _CKYAppletArgReadObject {
     CKYByte         size;
 } CKYAppletArgReadObject;
 
+typedef struct _CKYAppletArgWriteObject {
+    unsigned long objectID;
+    CKYOffset     offset;
+    CKYByte       size;
+    CKYBuffer     *data;
+
+} CKYAppletArgWriteObject;
+
 typedef struct _CKYAppletArgComputeCrypt {
     CKYByte   keyNumber;
     CKYByte   mode;
@@ -250,6 +258,8 @@ CKYStatus CKYAppletFactory_ListPINs(CKYA
 /* param == CKYByte * (pointer to pinNumber) */
 CKYStatus CKYAppletFactory_Logout(CKYAPDU *apdu, const void *param);
 /* Future add WriteObject */
+/* parm == CKYAppletArgWriteObject */
+CKYStatus CKYAppletFactory_WriteObject(CKYAPDU *apdu, const void *param);
 /* param == CKYAppletArgCreateObject */
 CKYStatus CKYAppletFactory_CreateObject(CKYAPDU *apdu, const void *param);
 /* param == CKYAppletArgDeleteObject */
@@ -482,6 +492,17 @@ CKYStatus CKYApplet_ReadObjectAppend(CKY
 CKYStatus CKYApplet_ReadObjectFull(CKYCardConnection *conn, 
 		unsigned long objectID, CKYOffset offset, CKYSize size,
 		 const CKYBuffer *nonce, CKYBuffer *data, CKYISOStatus *apduRC);
+/*
+ * There is 1 write command:
+ * CKYApplet_WriteObjectFull can write an entire data object. It makes multiple
+ * apdu calls in order to write the full amount into the buffer. The buffer is
+ * overwritten.
+*/
+
+CKYStatus CKYApplet_WriteObjectFull(CKYCardConnection *conn,
+        unsigned long objectID, CKYOffset offset, CKYSize size,
+        const CKYBuffer *nonce, const CKYBuffer *data, CKYISOStatus *apduRC);
+
 CKYStatus CKYApplet_ListObjects(CKYCardConnection *conn, CKYByte seq,
 		CKYAppletRespListObjects *lop, CKYISOStatus *apduRC);
 CKYStatus CKYApplet_GetStatus(CKYCardConnection *conn, 
diff -up ./src/libckyapplet/cky_card.c.coolkey-latest ./src/libckyapplet/cky_card.c
--- ./src/libckyapplet/cky_card.c.coolkey-latest	2006-06-09 11:44:17.000000000 -0700
+++ ./src/libckyapplet/cky_card.c	2009-09-11 13:58:24.468487469 -0700
@@ -129,6 +129,7 @@ typedef struct _SCard {
     SCardGetStatusChangeFn SCardGetStatusChange;
     SCardCancelFn SCardCancel;
     SCARD_IO_REQUEST *SCARD_PCI_T0_;
+    SCARD_IO_REQUEST *SCARD_PCI_T1_;
 } SCard;
 
 #define GET_ADDRESS(library, scard, name) \
@@ -195,6 +196,12 @@ ckySCard_Init(void)
     if( status != CKYSUCCESS ) {
         goto fail;
     }
+
+    status = ckyShLibrary_getAddress( library,
+        (void**) &scard->SCARD_PCI_T1_, MAKE_DLL_SYMBOL(g_rgSCardT1Pci));
+    if( status != CKYSUCCESS ) {
+        goto fail;
+    }
     return scard;
 
 fail:
@@ -884,6 +891,7 @@ struct _CKYCardConnection {
     SCARDHANDLE      cardHandle;
     unsigned long    lastError;
     CKYBool           inTransaction;
+    unsigned long    protocol;
 };
 
 static void
@@ -894,6 +902,7 @@ ckyCardConnection_init(CKYCardConnection
     conn->cardHandle = 0;
     conn->lastError = 0;
     conn->inTransaction = 0;
+    conn->protocol = SCARD_PROTOCOL_T0;
 }
 
 CKYCardConnection *
@@ -934,14 +943,13 @@ CKYCardConnection_Connect(CKYCardConnect
 {
     CKYStatus ret;
     unsigned long rv;
-    unsigned long protocol;
 
     ret = CKYCardConnection_Disconnect(conn);
     if (ret != CKYSUCCESS) {
 	return ret;
     }
     rv = conn->scard->SCardConnect( conn->ctx->context, readerName,
-	SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, &conn->cardHandle, &protocol);
+	SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, &conn->cardHandle, &conn->protocol);
     if (rv != SCARD_S_SUCCESS) {
 	conn->lastError = rv;
 	return CKYSCARDERR;
@@ -978,7 +986,7 @@ ckyCardConnection_reconnectRaw(CKYCardCo
     unsigned long protocol;
 
     rv = conn->scard->SCardReconnect(conn->cardHandle,
-	SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, init, &protocol);
+	SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1 , init, &protocol);
     if (rv != SCARD_S_SUCCESS) {
 	conn->lastError = rv;
 	return CKYSCARDERR;
@@ -1039,10 +1047,17 @@ CKYCardConnection_TransmitAPDU(CKYCardCo
 	return ret;
     }
 
-    rv = conn->scard->SCardTransmit(conn->cardHandle, 
-	conn->scard->SCARD_PCI_T0_,
-	CKYBuffer_Data(&apdu->apduBuf), CKYBuffer_Size(&apdu->apduBuf), 
-	NULL, response->data, &response->len);
+    if( conn->protocol == SCARD_PROTOCOL_T0 ) { 
+        rv = conn->scard->SCardTransmit(conn->cardHandle, 
+            conn->scard->SCARD_PCI_T0_,
+	    CKYBuffer_Data(&apdu->apduBuf), CKYBuffer_Size(&apdu->apduBuf), 
+	    NULL, response->data, &response->len);
+    }  else  {
+        rv = conn->scard->SCardTransmit(conn->cardHandle,
+            conn->scard->SCARD_PCI_T1_,
+            CKYBuffer_Data(&apdu->apduBuf), CKYBuffer_Size(&apdu->apduBuf),
+            NULL, response->data, &response->len);
+    } 
 
     if (rv != SCARD_S_SUCCESS) {
 	conn->lastError =rv;
diff -up ./src/libckyapplet/cky_factory.c.coolkey-latest ./src/libckyapplet/cky_factory.c
--- ./src/libckyapplet/cky_factory.c.coolkey-latest	2006-06-09 11:44:17.000000000 -0700
+++ ./src/libckyapplet/cky_factory.c	2009-09-11 13:58:24.470495267 -0700
@@ -190,8 +190,11 @@ CKYAPDUFactory_ComputeCryptOneStep(CKYAP
     CKYSize   len;
     CKYBuffer buf;
 
-    if (!idata || !(len = CKYBuffer_Size(idata)) || location != CKY_DL_APDU)
-    	return ret;
+    if (!idata)
+        return ret;
+
+    if (!(len = CKYBuffer_Size(idata)) && location != CKY_DL_OBJECT)
+        return ret;
 
     CKYAPDU_SetCLA(apdu, CKY_CLASS_COOLKEY);
     CKYAPDU_SetINS(apdu, CKY_INS_COMPUTE_CRYPT);
@@ -314,8 +317,6 @@ CKYAPDUFactory_Logout(CKYAPDU *apdu, CKY
     return CKYSUCCESS;
 }
 
-/* Future add WriteObject */
-
 CKYStatus
 CKYAPDUFactory_CreateObject(CKYAPDU *apdu, unsigned long objectID, CKYSize size,
     unsigned short readACL, unsigned short writeACL, unsigned short deleteACL)
@@ -419,6 +420,58 @@ fail:
 }
 
 CKYStatus
+CKYAPDUFactory_WriteObject(CKYAPDU *apdu, unsigned long objectID,
+                                    CKYOffset offset,CKYSize size,CKYBuffer *data)
+{
+    CKYBuffer buf;
+    CKYStatus ret = CKYSUCCESS;
+    unsigned short dataSize = 0;
+
+    CKYAPDU_SetCLA(apdu, CKY_CLASS_COOLKEY);
+    CKYAPDU_SetINS(apdu, CKY_INS_WRITE_OBJ);
+    CKYAPDU_SetP1(apdu, 0x00);
+    CKYAPDU_SetP2(apdu, 0x00);
+    CKYBuffer_InitEmpty(&buf);
+
+    dataSize = (unsigned short) CKYBuffer_Size(data);
+
+    if(!dataSize) {
+        ret = CKYINVALIDARGS;
+        goto fail;
+    }
+
+    ret = CKYBuffer_AppendLong(&buf,objectID);
+    if (ret != CKYSUCCESS) {
+        goto fail;
+    }
+    ret = CKYBuffer_AppendLong(&buf,offset);
+    if (ret != CKYSUCCESS) {
+        goto fail;
+    }
+    ret = CKYBuffer_AppendChar(&buf, size);
+    if (ret != CKYSUCCESS) {
+        goto fail;
+    }
+
+    ret = CKYAPDU_SetSendDataBuffer(apdu,&buf);
+
+    if (ret != CKYSUCCESS) {
+        goto fail;
+    }
+
+    ret = CKYAPDU_AppendSendDataBuffer(apdu, data);
+
+    if (ret != CKYSUCCESS) {
+        goto fail;
+    }
+
+fail:
+    CKYBuffer_FreeData(&buf);
+    return ret;
+
+}
+
+CKYStatus
 CKYAPDUFactory_ListObjects(CKYAPDU *apdu, CKYByte sequence)
 {
     CKYAPDU_SetCLA(apdu, CKY_CLASS_COOLKEY);
diff -up ./src/libckyapplet/cky_factory.h.coolkey-latest ./src/libckyapplet/cky_factory.h
--- ./src/libckyapplet/cky_factory.h.coolkey-latest	2006-06-09 11:44:17.000000000 -0700
+++ ./src/libckyapplet/cky_factory.h	2009-09-11 13:58:24.472487421 -0700
@@ -190,7 +190,8 @@ CKYStatus CKYAPDUFactory_ChangePIN(CKYAP
 				const char *oldPin, const char *newPin);
 CKYStatus CKYAPDUFactory_ListPINs(CKYAPDU *apdu);
 CKYStatus CKYAPDUFactory_Logout(CKYAPDU *apdu, CKYByte pinNumber);
-
+CKYStatus CKYAPDUFactory_WriteObject(CKYAPDU *apdu, unsigned long objectID,
+                CKYOffset offset,CKYSize size,CKYBuffer *data);
 /* Future add WriteObject */
 CKYStatus CKYAPDUFactory_CreateObject(CKYAPDU *apdu, unsigned long objectID,
  CKYSize size, unsigned short readACL, unsigned short writeACL, 


--- NEW FILE import.log ---
coolkey-1_1_0-10_fc12:HEAD:coolkey-1.1.0-10.fc12.src.rpm:1253047908


Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- coolkey.spec	24 Jul 2009 19:29:17 -0000	1.30
+++ coolkey.spec	15 Sep 2009 20:52:45 -0000	1.31
@@ -22,13 +22,14 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 9%{dist}
+Release: 10%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
 Patch1: coolkey-cache-dir-move.patch
 Patch2: coolkey-gcc43.patch
+Patch3: coolkey-latest.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -60,11 +61,12 @@ Linux Driver support to access the CoolK
 %setup -q
 %patch1 -b .cache.dir.move
 %patch2 -b .coolkey-gcc43
+%patch3 -b .coolkey-latest
 
 %build
 autoconf
 %configure --with-debug --disable-dependency-tracking --enable-pk11install
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$CFLAGS -g -O2 -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -g -O2 -fno-strict-aliasing"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +110,8 @@ fi
 
 
 %changelog
+* Fri Sep 11 2009 Jack Magne <jmagne at redhat.com> - 1.1.0-10
+- Include latest changes for Gemalto 64K and Safenet 330J.
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jskala at fedoraproject.org  Tue Sep 15 21:02:51 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 15 Sep 2009 21:02:51 +0000 (UTC)
Subject: rpms/netatalk/devel netatalk.spec,1.55,1.56
Message-ID: <20090915210251.E124611C00CE@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7497

Modified Files:
	netatalk.spec 
Log Message:
* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.4-4
- fixed #473943



Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- netatalk.spec	21 Aug 2009 14:41:11 -0000	1.55
+++ netatalk.spec	15 Sep 2009 21:02:51 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -66,9 +66,6 @@ export CFLAGS="$CFLAGS -fsigned-char"
 	--with-cracklib \
         --with-pam \
 	--with-shadow \
-	--with-tcp-wrappers \
-        --with-ssl \
-        --with-flock-locksi \
 	--with-uams-path=%{_libdir}/atalk \
 	--enable-shared \
         --enable-krbV-uam \
@@ -182,6 +179,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.4-4
+- fixed #473943
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.0.4-3
 - rebuilt with new openssl
 



From jskala at fedoraproject.org  Tue Sep 15 21:06:49 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 15 Sep 2009 21:06:49 +0000 (UTC)
Subject: rpms/netatalk/F-11 netatalk.spec,1.52,1.53
Message-ID: <20090915210650.1B1A211C00CE@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9441

Modified Files:
	netatalk.spec 
Log Message:
* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> -4:2.0.3-28
- fixed #473943



Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/F-11/netatalk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- netatalk.spec	26 Feb 2009 04:58:22 -0000	1.52
+++ netatalk.spec	15 Sep 2009 21:06:48 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 27%{?dist}
+Release: 28%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -88,9 +88,6 @@ export CFLAGS="$CFLAGS -fsigned-char"
 	--with-cracklib \
         --with-pam \
 	--with-shadow \
-	--with-tcp-wrappers \
-        --with-ssl \
-        --with-flock-locksi \
 	--with-uams-path=%{_libdir}/atalk \
 	--enable-shared \
         --enable-krbV-uam \
@@ -210,6 +207,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> -4:2.0.3-28
+- fixed #473943
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:2.0.3-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Sep 15 21:16:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 21:16:23 +0000
Subject: [pkgdb] jakarta-commons-io: akurtakov has requested watchcommits
Message-ID: <20090915211623.5B49E10F880@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on jakarta-commons-io (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From pkgdb at fedoraproject.org  Tue Sep 15 21:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 21:16:26 +0000
Subject: [pkgdb] jakarta-commons-io: akurtakov has requested watchbugzilla
Message-ID: <20090915211626.C1B5110F886@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on jakarta-commons-io (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From pkgdb at fedoraproject.org  Tue Sep 15 21:16:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 21:16:28 +0000
Subject: [pkgdb] jakarta-commons-io: akurtakov has requested commit
Message-ID: <20090915211628.8489610F894@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on jakarta-commons-io (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From pkgdb at fedoraproject.org  Tue Sep 15 21:16:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Sep 2009 21:16:31 +0000
Subject: [pkgdb] jakarta-commons-io: akurtakov has requested approveacls
Message-ID: <20090915211631.23AD610F898@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on jakarta-commons-io (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From jmagne at fedoraproject.org  Tue Sep 15 21:31:10 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Tue, 15 Sep 2009 21:31:10 +0000 (UTC)
Subject: rpms/esc/devel esc-1.1.0-fix1.patch, NONE, 1.1 esc-1.1.0-fix2.patch,
	NONE, 1.1 esc-1.1.0-fix3.patch, NONE, 1.1 esc-1.1.0-fix4.patch,
	NONE, 1.1 esc-1.1.0-fix5.patch, NONE, 1.1 esc-1.1.0-fix6.patch,
	NONE, 1.1 esc-1.1.0-fix7.patch, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.4, 1.5 esc, 1.8, 1.9 esc.spec, 1.41,
	1.42 sources, 1.5, 1.6 esc-1.0.1-admin-row-update.patch, 1.1,
	NONE esc-1.0.1-elif.patch, 1.1, NONE esc-1.0.1-lic-fix.patch,
	1.1, NONE esc-1.0.1-log-fixes-1.patch, 1.1,
	NONE esc-1.0.1-log-fixes.patch, 1.1,
	NONE esc-1.0.1-nss-devel-fix.patch, 1.1,
	NONE esc-1.0.1-ui-fixes-1.patch, 1.1,
	NONE esc-1.0.1-xulrunner-sparc-fixes.patch, 1.1,
	NONE firefox-1.5-with-system-nss.patch, 1.1,
	NONE firefox.secalg.patch, 1.1, NONE
Message-ID: <20090915213110.9926011C00EC@cvs1.fedora.phx.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/esc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23312/devel

Modified Files:
	.cvsignore esc esc.spec sources 
Added Files:
	esc-1.1.0-fix1.patch esc-1.1.0-fix2.patch esc-1.1.0-fix3.patch 
	esc-1.1.0-fix4.patch esc-1.1.0-fix5.patch esc-1.1.0-fix6.patch 
	esc-1.1.0-fix7.patch import.log 
Removed Files:
	esc-1.0.1-admin-row-update.patch esc-1.0.1-elif.patch 
	esc-1.0.1-lic-fix.patch esc-1.0.1-log-fixes-1.patch 
	esc-1.0.1-log-fixes.patch esc-1.0.1-nss-devel-fix.patch 
	esc-1.0.1-ui-fixes-1.patch 
	esc-1.0.1-xulrunner-sparc-fixes.patch 
	firefox-1.5-with-system-nss.patch firefox.secalg.patch 
Log Message:
Pick up latest improvements.


esc-1.1.0-fix1.patch:
 Makefile.sdk |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE esc-1.1.0-fix1.patch ---
--- ./esc/src/app/xpcom/tray/Makefile.sdk.fix1	2009-04-17 13:39:58.000000000 -0700
+++ ./esc/src/app/xpcom/tray/Makefile.sdk	2009-04-17 14:18:17.000000000 -0700
@@ -23,20 +23,20 @@
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 ifeq ($(OS_ARCH),Linux)
-CXXFLAGS        += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS)
+CXXFLAGS        += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC
 endif
 
 
 # Change this to point at your Gecko SDK directory.
 ifndef GECKO_SDK_PATH
-GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk
+GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9/sdk
 endif
 GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/include
 ifndef GECKO_INCLUDE_PATH
-GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre
+GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9
 endif
 ifndef GECKO_BIN_PATH
-GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre
+GECKO_BIN_PATH=/usr/lib/xulrunner-1.9
 endif
 
 ifeq ($(OS_ARCH),Darwin)
@@ -148,6 +148,10 @@
 
 endif
 
+ifeq ($(OS_ARCH),Linux)
+GECKO_LD_LIBS= -L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a
+endif
+
  
 # GCC only define which allows us to not have to #include mozilla-config 
 # in every .cpp file.  If your not using GCC remove this line and add 

esc-1.1.0-fix2.patch:
 app/xul/esc/application.ini                    |    2 +-
 app/xul/esc/chrome/content/esc/GenericAuth.xul |    2 +-
 lib/coolkey/SmartCardMonitoringThread.cpp      |    8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE esc-1.1.0-fix2.patch ---
--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix2	2009-04-18 13:19:20.000000000 -0700
+++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp	2009-04-18 13:20:23.000000000 -0700
@@ -104,12 +104,16 @@
     char tBuff[56];
     PK11SlotInfo *slot;
 
+    #ifdef LINUX
+    sleep(3);
+    #endif
+
     PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
          ("%s SmartCardMonitoringThread::Execute.\n",GetTStamp(tBuff,56)));
   //
   // populate token names for already inserted tokens.
   //
-    PK11SlotList *sl =
+   /* PK11SlotList *sl =
 	PK11_FindSlotsByNames(mModule->dllName, NULL, NULL, PR_TRUE);
     PK11SlotListElement *sle;
  
@@ -123,6 +127,8 @@
         PK11_FreeSlotList(sl);
     }
 
+   */
+
   // loop starts..
     do {
 
--- ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul.fix2	2009-04-18 13:21:34.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul	2009-04-18 13:21:47.000000000 -0700
@@ -24,7 +24,7 @@
     id="esc-window"
     title="&genericAuthTitle;"
     width="400"
-    height="225"
+    height="240"
     onload="UiLoad();"
     onunload="UiUnload();"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- ./esc/src/app/xul/esc/application.ini.fix2	2009-04-18 13:20:51.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2009-04-18 13:21:02.000000000 -0700
@@ -25,7 +25,7 @@
 Name=ESC
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.1.0-1
+Version=1.1.0-3
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.

esc-1.1.0-fix3.patch:
 application.ini                    |    2 +-
 chrome/locale/en-US/esc.properties |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE esc-1.1.0-fix3.patch ---
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix3	2009-04-22 17:44:14.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2009-04-22 17:46:41.000000000 -0700
@@ -104,7 +104,7 @@
 errorInvalidTokenTypeParams=The Smart Card Server cannot process the requested type of enrollment due to a misconfiguration.
 errorCannotPublish=The Smart Card Server cannot publish your card's certificates to the certificate directory.
 errorCommTokenDB=The Smart Card Server cannot connect to its internal database.
-errorTokenSuspended=Your smart card has been suspended.
+errorTokenSuspended=You are not allowed to perform this operation with this smart card.
 errorPinResetable=You are not allowed to reset the password of this smart card.
 errorConnLost=The Smart Card Manager has lost the connection to the Smart Card Server.
 errorEntryTokenDB=The Smart Card Server cannot add your smart card to its internal database.
--- ./esc/src/app/xul/esc/application.ini.fix3	2009-04-22 17:38:49.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2009-04-22 17:39:14.000000000 -0700
@@ -25,7 +25,7 @@
 Name=ESC
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.1.0-3
+Version=1.1.0-5
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.

esc-1.1.0-fix4.patch:
 app/xul/esc/application.ini |    2 +-
 lib/coolkey/manifest.mn     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE esc-1.1.0-fix4.patch ---
--- ./esc/src/lib/coolkey/manifest.mn.fix4	2009-04-23 14:13:21.000000000 -0700
+++ ./esc/src/lib/coolkey/manifest.mn	2009-04-23 14:15:00.000000000 -0700
@@ -27,7 +27,7 @@
 ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
 endif
-DEFINES		+= -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC  -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss
+DEFINES		+= -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC  -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fno-strict-aliasing
 MAPFILE 	= $(OBJDIR)/ckymanager.def
 
 #EXTRA_LIBS	+= -L$(DIST)/lib -lckyapplet
--- ./esc/src/app/xul/esc/application.ini.fix4	2009-04-23 14:12:52.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2009-04-23 14:13:01.000000000 -0700
@@ -25,7 +25,7 @@
 Name=ESC
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.1.0-5
+Version=1.1.0-6
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.

esc-1.1.0-fix5.patch:
 src/app/xul/esc/application.ini                    |    2 
 src/app/xul/esc/chrome/content/esc/ESC.js          |    5 +
 src/app/xul/esc/chrome/content/esc/certManager.xul |    1 
 src/app/xul/esc/chrome/content/esc/password.xul    |    1 
 src/lib/coolkey/SmartCardMonitoringThread.cpp      |    2 
 win32/build.sh                                     |   13 ++++-
 win32/setup.iss                                    |   54 ++++++++-------------
 7 files changed, 39 insertions(+), 39 deletions(-)

--- NEW FILE esc-1.1.0-fix5.patch ---
--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix5	2009-06-08 14:14:44.000000000 -0700
+++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp	2009-06-08 14:15:03.000000000 -0700
@@ -159,7 +159,7 @@
 
     /* if we think we have a token, but it's not the right one, or it's 
      * not there, then send a removal event */
-        if (info && (!isPresent || (info->mSeries != PK11_GetSlotSeries(slot))) ) {
+        if (info && !isPresent) {
 
             PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
              ("%s SmartCardMonitoringThread::Execute Token Removed : \n",GetTStamp(tBuff,56)));
--- ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul.fix5	2009-06-08 13:46:19.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul	2009-06-08 13:46:33.000000000 -0700
@@ -59,7 +59,6 @@
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
-  <script type="application/x-javascript" src="escCertManager.js"/>
 
   <vbox flex="1">
     <tabbox id="certmanagertabs" flex="1" style="margin:5px">
--- ./esc/src/app/xul/esc/chrome/content/esc/password.xul.fix5	2009-06-08 14:04:16.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/password.xul	2009-06-08 14:04:29.000000000 -0700
@@ -23,7 +23,6 @@
     id="esc-window"
     title="&getESCPassword;"
     onload="PasswordLoad();"
-    onunload="cleanup();"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix5	2009-06-08 14:02:26.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2009-06-08 14:03:46.000000000 -0700
@@ -522,7 +522,10 @@
     if(!string_id || !gStringBundle)
        return null;
 
-    str = gStringBundle.getString(string_id);
+    try {
+        str = gStringBundle.getString(string_id);
+    } catch(e) {
+    }
 
     return str;
 }
--- ./esc/src/app/xul/esc/application.ini.fix5	2009-06-08 13:44:59.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2009-06-08 13:45:15.000000000 -0700
@@ -25,7 +25,7 @@
 Name=ESC
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.1.0-6
+Version=1.1.0-7
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
--- ./esc/win32/setup.iss.fix5	2009-06-08 14:16:04.000000000 -0700
+++ ./esc/win32/setup.iss	2009-06-08 14:16:26.000000000 -0700
@@ -4,43 +4,31 @@
 [Setup]
 AppName=Smart Card Manager
 AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.1.0-3
-AppPublisher=Red Hat, Inc.
+AppVerName=Smart Card Manager 1.1.0-6
+AppPublisher=Fedora
 CreateAppDir=true
 Compression=lzma
 SolidCompression=true
 MinVersion=0,5.0.2195
 ShowLanguageDialog=yes
-OutputBaseFilename=SmartCardManagerSetup-1.1.0-3.win32.i386
-DefaultDirName={pf}\Red Hat\ESC
+OutputBaseFilename=SmartCardManagerSetup-1.1.0-6.win32.i386
+DefaultDirName={pf}\Fedora\ESC
 DisableProgramGroupPage=false
-DefaultGroupName=Red Hat
+DefaultGroupName=Fedora
 SetupIconFile=BUILD\ESC\components\esc.ico
 UninstallDisplayIcon={app}\components\esc.ico
-WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
+;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
+WizardImageFile=esc-image-large.bmp
 WizardSmallImageFile=BUILD\ESC\components\esc.bmp
 AllowNoIcons=yes
 LicenseFile=esc-license.txt
 InfoBeforeFile=info-before.txt
 InfoAfterFile=info-after.txt
 PrivilegesRequired=admin
-VersionInfoVersion=1.1.0.3
+VersionInfoVersion=1.1.0.6
 
 
 [Files]
-Source: BUILD\egate\slbmgpg.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egate.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egate.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egate.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egate_License.txt; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egatebus.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egatebus.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egatebus.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egaterdr.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egaterdr.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egaterdr.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\egdrvins1.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
-Source: BUILD\egate\eginstall.exe; DestDir: {win}\egate2.4; Flags: ignoreversion
 Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace
 Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
 Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
@@ -73,7 +61,6 @@
 Source: BUILD\ESC\application.ini; DestDir: {app}
 Source: BUILD\ESC\chrome\chrome.manifest; DestDir: {app}\chrome
 Source: BUILD\ESC\chrome\content\esc\TRAY.js; DestDir: {app}\chrome\content\esc
-Source: BUILD\ESC\chrome\content\esc\CertInfo.js; DestDir: {app}\chrome\content\esc
 ;Source: BUILD\ESC\chrome\content\esc\certinfo.xul; DestDir: {app}\chrome\content\esc
 Source: BUILD\ESC\chrome\content\esc\config.xul; DestDir: {app}\chrome\content\esc
 Source: BUILD\ESC\chrome\content\esc\contents.rdf; DestDir: {app}\chrome\content\esc
@@ -110,19 +97,18 @@
 Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11
+Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner
@@ -413,9 +399,6 @@
 Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXSize1.properties; DestDir: {app}\xulrunner\res\fonts
 Source: BUILD\ESC\xulrunner\res\html\folder.png; DestDir: {app}\xulrunner\res\html
 Source: BUILD\ESC\xulrunner\defaults\profile\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile
-Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\dictionaries\en-US.aff; DestDir: {app}\dictionaries
 Source: BUILD\ESC\xulrunner\dictionaries\en-US.dic; DestDir: {app}\dictionaries
 Source: BUILD\ESC\xulrunner\modules\XPCOMUtils.jsm; DestDir: {app}\modules
@@ -429,7 +412,6 @@
 
 [Run]
 
-Filename: {win}\egate2.4\eginstall.exe; Parameters: -f -l eginstall.txt; WorkingDir: {win}\egate2.4; Flags: waituntilterminated; StatusMsg: Installing smart card drivers....
 Filename: {app}\PKCS11\pk11install.exe; Parameters: "-v ""name='CoolKey Module' library=coolkeypk11.dll NSS=""slotParams={{0x1=[slotFlags=PublicCerts]}"""""; WorkingDir: {sys}; StatusMsg: Configuring System for smart cards...
 Filename: {app}\xulrunner\xulrunner.exe; Parameters: """--register-global"""
 Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg}; Flags: nowait
@@ -450,12 +432,18 @@
 Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
 
 ; Now register the Gemalto 64K V2
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask: ValueData: ff ff ff ff ff ff ff ff ff ff; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask; ValueData: ff ff 00 ff 00 ff ff ff 00 00; Flags: uninsdeletekey
 
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
 
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: binary; ValueName: ATR; ValueData: 3b 95 95 40 ff ae 01 03 00 00
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATR; ValueData: 3b 95 00 40 00 ae 01 03 00 00
 
+; Now register the Safenet 330J
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00
 
 Root: HKLM; Subkey: Software\
 ; Turn off the "pick a cert" dialog box
--- ./esc/win32/build.sh.fix5	2009-06-08 14:15:58.000000000 -0700
+++ ./esc/win32/build.sh	2009-06-08 14:16:33.000000000 -0700
@@ -37,6 +37,8 @@
 NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4
 NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_4_RTM/src/$NSS_ARCHIVE.tar.gz
 
+NSS_LIB_PATH=$NSS_NAME/mozilla/dist/WIN*/lib
+
 #Inno installer values
 
 #INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe"
@@ -76,7 +78,7 @@
 #ESC values
 
 ESC_NAME=esc
-ESC_VERSION_NO=1.1.0-3
+ESC_VERSION_NO=1.1.0-6
 
 
 #Cygwin values
@@ -462,6 +464,15 @@
 
     cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
 
+
+     #Transport the nss files needed for pk11install.exe
+
+    cp $NSS_LIB_PATH/softokn3.dll BUILD
+    cp $NSS_LIB_PATH/libplc4.dll BUILD
+    cp $NSS_LIB_PATH/libnspr4.dll BUILD
+    cp $NSS_LIB_PATH/libplds4.dll BUILD
+
+
     # Build the INNO executable installer
 
     "$INNO_PATH" setup.iss

esc-1.1.0-fix6.patch:
 app/xpcom/Makefile.sdk                         |    4 
 app/xpcom/rhCoolKey.cpp                        |  255 ++++++++++++++++++++++++-
 app/xpcom/rhCoolKey.h                          |   12 +
 app/xpcom/rhICoolKey.idl                       |    2 
 app/xul/esc/chrome/content/esc/certManager.xul |    2 
 lib/NssHttpClient/engine.cpp                   |   77 ++++++-
 lib/NssHttpClient/engine.h                     |   13 +
 lib/NssHttpClient/manifest.mn                  |    2 
 lib/coolkey/CoolKey.cpp                        |   22 ++
 lib/coolkey/CoolKey.h                          |   11 -
 lib/coolkey/Makefile                           |    3 
 lib/coolkey/NSSManager.cpp                     |   87 ++++++++
 lib/coolkey/NSSManager.h                       |    2 
 lib/coolkey/manifest.mn                        |    3 
 14 files changed, 468 insertions(+), 27 deletions(-)

--- NEW FILE esc-1.1.0-fix6.patch ---
--- ./esc/src/lib/NssHttpClient/engine.h.fix6	2009-06-19 16:07:39.000000000 -0700
+++ ./esc/src/lib/NssHttpClient/engine.h	2009-06-19 16:07:44.000000000 -0700
@@ -22,9 +22,17 @@
 #include "response.h"
 #include "request.h"
 
+struct BadCertData {
+ PRErrorCode error;
+ PRInt32 port;
+};
+
+typedef struct BadCertData BadCertData;
+
+
 class __EXPORT Engine {
     public:
-        Engine() {};
+        Engine() { _certData = NULL; _sock=NULL;};
         ~Engine() {};
 
         PRFileDesc *_doConnect(PRNetAddr *addr, PRBool SSLOn = PR_FALSE,
@@ -37,7 +45,8 @@
         static PRIntervalTime globaltimeout;
 
         PRFileDesc *_sock;
-
+        BadCertData *_certData;
+        BadCertData *getBadCertData() { return _certData;}
         PRFileDesc *getSocket() { return _sock;}
 
         bool connectionClosed ;
--- ./esc/src/lib/NssHttpClient/engine.cpp.fix6	2009-06-19 16:07:12.000000000 -0700
+++ ./esc/src/lib/NssHttpClient/engine.cpp	2009-06-19 16:07:29.000000000 -0700
@@ -16,6 +16,8 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#define FORCE_PR_LOG 1
+
 #include <nspr.h>
 #include "sslproto.h"
 #include <prerror.h>
@@ -27,7 +29,7 @@
 #include "certt.h"
 #include "sslerr.h"
 #include "secerr.h"
-
+#include "CoolKey.h"
 #include "engine.h"
 #include "http.h"
 
@@ -39,6 +41,9 @@
 int cipherCount = 0;
 int _doVerifyServerCert = 1;
 
+PRLogModuleInfo *httpEngineLog = PR_NewLogModule("coolKeyHttpEngine");
+
+
 PRIntervalTime Engine::globaltimeout = PR_TicksPerSecond()*30;
 
 /**
@@ -56,13 +61,26 @@
     SECStatus    secStatus = SECFailure;
     PRErrorCode    err;
 
+    char tBuff[56];
+
+    PR_LOG(httpEngineLog, PR_LOG_DEBUG,
+                          ("%s myBadCertHandler enter. \n",GetTStamp(tBuff,56)));
+
     /* log invalid cert here */
 
     if ( !arg ) {
         return secStatus;
     }
 
-    *(PRErrorCode *)arg = err = PORT_GetError();
+    err = PORT_GetError();
+
+    BadCertData *data = (BadCertData *) arg;
+    if(data) {
+        data->error = err;
+    }
+
+    PR_LOG(httpEngineLog, PR_LOG_DEBUG,
+                          ("%s myBadCertHandler err: %d .  \n",GetTStamp(tBuff,56),err));
 
     /* If any of the cases in the switch are met, then we will proceed   */
     /* with the processing of the request anyway. Otherwise, the default */    
@@ -91,6 +109,10 @@
     break;
     }
 
+    PR_LOG(httpEngineLog, PR_LOG_DEBUG,
+                          ("%s myBadCertHandler status: %d .  \n",GetTStamp(tBuff,56),secStatus));
+
+
     return secStatus;
 }
 
@@ -416,7 +438,6 @@
     return;
 }
 
-
 void Engine::CloseConnection()
 {
     connectionClosed = true;
@@ -426,7 +447,14 @@
         PR_Close(_sock);
         _sock = NULL;
     }
+
+    if(_certData)
+    {
+        delete _certData;
+        _certData = NULL;
+    }
 }
+
 /**
  * Returns a file descriptor for I/O if the HTTP connection is successful
  * @param addr PRnetAddr structure which points to the server to connect to
@@ -442,21 +470,19 @@
     PRFileDesc *tcpsock = NULL;
     PRFileDesc *sock = NULL;
     connectionClosed = false;
+    _certData = new BadCertData();
 
     tcpsock = PR_OpenTCPSocket(addr->raw.family);
-   
 
     if (!tcpsock) {
-
         return NULL;
     }
 
     nodelay(tcpsock);
 
     if (PR_TRUE == SSLOn) {
-        sock=SSL_ImportFD(NULL, tcpsock);
-
 
+        sock=SSL_ImportFD(NULL, tcpsock);
         if (!sock) {
             //xxx log
             if( tcpsock != NULL ) {
@@ -516,9 +542,23 @@
 
         PRErrorCode errCode = 0;
 
-        rv = SSL_BadCertHook( sock,
+        if(_certData) {
+            _certData->error = errCode;
+            _certData->port  = PR_ntohs(PR_NetAddrInetPort(addr));
+        }
+
+        CoolKeyBadCertHandler overriddenHandler =  CoolKeyGetBadCertHandler();
+
+        if(overriddenHandler)  {
+            rv = SSL_BadCertHook( sock,
+                              (SSLBadCertHandler)overriddenHandler,
+                               (void *)_certData);
+        } else {
+            rv = SSL_BadCertHook( sock,
                               (SSLBadCertHandler)myBadCertHandler,
-                              &errCode );
+                              (void *)_certData);
+        }
+
         rv = SSL_SetURL( sock, serverName );
 
         if (rv != SECSuccess ) {
@@ -536,8 +576,6 @@
         sock = tcpsock;
     }
 
-  
-
     if ( PR_Connect(sock, addr, timeout) == PR_FAILURE ) {
 
         if( sock != NULL ) {
@@ -563,11 +601,17 @@
                                           const PSHttpServer& server,
                                           int timeout, PRBool expectChunked ,PRBool processStreamed) {
     PRNetAddr addr;
-    PRFileDesc *sock = NULL;
     PSHttpResponse *resp = NULL;
 
     PRBool response_code = 0;
 
+    char tBuff[56];
+
+    PR_LOG(httpEngineLog, PR_LOG_DEBUG,
+                          ("%s HttpEngine::makeRequest  enter. \n",GetTStamp(tBuff,56)));
+
+
+
     server.getAddr(&addr);
 
     char *nickName = request.getCertNickName();
@@ -575,8 +619,17 @@
     char *serverName = (char *)server.getAddr();
     _sock = _doConnect( &addr, request.isSSL(), 0, 0,nickName, 0, serverName );
 
+    PR_LOG(httpEngineLog, PR_LOG_DEBUG,
+                          ("%s HttpEngine::makeRequest  past doConnect sock: %p. \n",
+                          GetTStamp(tBuff,56),_sock));
+
     if ( _sock != NULL) {
         PRBool status = request.send( _sock );
+
+        PR_LOG(httpEngineLog, PR_LOG_DEBUG,
+                          ("%s HttpEngine::makeRequest  past request.send status: %d. \n",
+                          GetTStamp(tBuff,56),status));
+
         if ( status ) {
             resp = new PSHttpResponse( _sock, &request, timeout, expectChunked ,this);
             response_code = resp->processResponse(processStreamed);
--- ./esc/src/lib/NssHttpClient/manifest.mn.fix6	2009-06-19 16:08:05.000000000 -0700
+++ ./esc/src/lib/NssHttpClient/manifest.mn	2009-06-19 16:08:13.000000000 -0700
@@ -24,7 +24,7 @@
 MODULE		= httpchunked
 LIBRARY_NAME	= $(MODULE)
 SHARED_NAME	= $(MODULE)
-REQUIRES	= nss nspr 
+REQUIRES	= nss nspr ckymanager
 ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
 endif
--- ./esc/src/lib/coolkey/NSSManager.h.fix6	2009-06-19 16:06:41.000000000 -0700
+++ ./esc/src/lib/coolkey/NSSManager.h	2009-06-19 16:06:47.000000000 -0700
@@ -70,6 +70,8 @@
 
   static HRESULT  GetKeyCertNicknames( const CoolKey *aKey,  vector<string> & aStrings  ); 
 
+  static HRESULT GetKeyUID(const CoolKey *aKey, char *aBuf, int aBufLength);
+
   static HRESULT GetKeyIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength);
 
   static HRESULT GetKeyIssuer(const CoolKey *aKey, char *aBuf, int aBufLength);
--- ./esc/src/lib/coolkey/CoolKey.cpp.fix6	2009-06-19 16:02:43.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKey.cpp	2009-06-19 16:03:03.000000000 -0700
@@ -259,12 +259,14 @@
 static CoolKeyRelease g_Release = NULL;
 static CoolKeyGetConfigValue g_GetConfigValue = NULL;
 static CoolKeySetConfigValue g_SetConfigValue = NULL;
+static CoolKeyBadCertHandler g_BadCertHandler = NULL;
 
 char* CoolKeyVerifyPassword(PK11SlotInfo *,PRBool,void *);
 
 COOLKEY_API HRESULT CoolKeySetCallbacks(CoolKeyDispatch dispatch,
 	CoolKeyReference reference, CoolKeyRelease release,
-        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue)
+        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue,
+        CoolKeyBadCertHandler badcerthandler)
 {
     char tBuff[56];
     g_Dispatch = dispatch;
@@ -272,6 +274,7 @@
     g_Release = release;
     g_GetConfigValue = getconfigvalue;
     g_SetConfigValue = setconfigvalue;
+    g_BadCertHandler = badcerthandler;
 
     char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.security.url");
 
@@ -997,6 +1000,16 @@
   
     return NSSManager::GetKeyPolicy(aKey, aBuf, aBufLen);
 }
+
+HRESULT
+CoolKeyGetUID(const CoolKey *aKey, char *aBuf, int aBufLength)
+{
+    if (!aKey || !aKey->mKeyID || !aBuf || aBufLength < 1)
+        return E_FAIL;
+
+    return NSSManager::GetKeyUID(aKey,aBuf,aBufLength);
+}
+
 HRESULT
 CoolKeyGetIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength)
 {
@@ -1290,6 +1303,13 @@
     return aCUID;
 }
 
+CoolKeyBadCertHandler CoolKeyGetBadCertHandler()
+{
+    if(g_BadCertHandler)
+        return g_BadCertHandler;
+    return NULL;
+}
+
 const char *CoolKeyGetConfig(const char *aValue)
 {
     if(!g_GetConfigValue || ! aValue)
--- ./esc/src/lib/coolkey/manifest.mn.fix6	2009-06-19 16:05:45.000000000 -0700
+++ ./esc/src/lib/coolkey/manifest.mn	2009-06-19 16:05:54.000000000 -0700
@@ -19,7 +19,6 @@
 
 XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build
 
-
 SYS_INC		= /usr/include
 MODULE		= ckymanager
 LIBRARY_NAME	= $(MODULE)
@@ -41,7 +40,7 @@
 		SmartCardMonitoringThread.cpp \
 		$(NULL)
 
-EXPORTS 	= \
+EXPORTS		= \
 		CoolKey.h \
 		$(NULL)
 
--- ./esc/src/lib/coolkey/NSSManager.cpp.fix6	2009-06-19 16:06:19.000000000 -0700
+++ ./esc/src/lib/coolkey/NSSManager.cpp	2009-06-19 16:06:28.000000000 -0700
@@ -369,7 +369,7 @@
 
     aBuf[0]=0;
 
-    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo \n",GetTStamp(tBuff,56)));
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuer \n",GetTStamp(tBuff,56)));
 
     if(!aKey )
         return E_FAIL;
@@ -409,7 +409,7 @@
                         continue;
                     }
                     orgID    = CERT_GetOrgName(&cert->subject);
-                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p org %s \n",GetTStamp(tBuff,56),slot,cert->slot,orgID));
+                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuer ourSlot %p curSlot  %p org %s \n",GetTStamp(tBuff,56),slot,cert->slot,orgID));
 
                 }
 
@@ -437,6 +437,85 @@
     return S_OK;
 }
 
+HRESULT NSSManager::GetKeyUID(const CoolKey *aKey, char *aBuf, int aBufLength)
+{
+    char tBuff[56];
+    if(!aBuf)
+        return E_FAIL;
+
+    aBuf[0]=0;
+
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyUID \n",GetTStamp(tBuff,56)));
+
+    if(!aKey )
+        return E_FAIL;
+
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+
+    if (!slot)
+        return E_FAIL;
+
+    CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
+
+    if (!certs)
+    {
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%sNSSManager::GetKeyUID no certs found! \n",GetTStamp(tBuff,56)));
+        PK11_FreeSlot(slot);
+        return E_FAIL;
+    }
+
+    CERTCertListNode *node= NULL;
+
+    char *certID = NULL;
+
+    for( node = CERT_LIST_HEAD(certs);
+             ! CERT_LIST_END(node, certs);
+             node = CERT_LIST_NEXT(node))     
+    {     
+        if(node->cert) 
+        {
+            CERTCertificate *cert = node->cert;
+
+            if(cert)
+            {
+                if(cert->slot == slot)
+                {
+                    if(IsCACert(cert))
+                    {
+                        continue;
+                    }
+
+                    certID = CERT_GetCertUid(&cert->subject);
+
+                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyUID ourSlot %p curSlot  %p certID %s  \n",GetTStamp(tBuff,56),slot,cert->slot,certID));
+           
+                }
+
+                if(certID)
+                    break;
+            }
+        }
+
+    }
+
+    if(certID && ((int)strlen(certID)  <  aBufLength))
+    {
+        strcpy(aBuf,certID);
+    }
+
+    if(certs)
+      CERT_DestroyCertList(certs);
+
+    if(slot)
+      PK11_FreeSlot(slot);
+
+    if(certID)
+        PORT_Free(certID);
+
+    return S_OK;
+}
+
+
 HRESULT NSSManager::GetKeyIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength)
 {
     char tBuff[56];
@@ -487,6 +566,10 @@
 
                     certID = CERT_GetCommonName(&cert->subject);
 
+                    if(!certID) {
+                        certID = CERT_GetCertUid(&cert->subject);
+                    }
+
                     PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p certID %s  \n",GetTStamp(tBuff,56),slot,cert->slot,certID));
 
                 }
--- ./esc/src/lib/coolkey/CoolKey.h.fix6	2009-06-19 16:04:59.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKey.h	2009-06-19 16:05:05.000000000 -0700
@@ -26,6 +26,7 @@
 // platforms (coreconf will do the appropriate processing.
 #define COOLKEY_API
 
+#include "ssl.h"
 #include <string.h>
 #include <stdlib.h>
 #include <vector>
@@ -100,7 +101,7 @@
 
 typedef HRESULT (*CoolKeySetConfigValue)(const char *name,const char *value);
 typedef const char * (*CoolKeyGetConfigValue)(const char *name);
-
+typedef SECStatus (*CoolKeyBadCertHandler)(void *arg, PRFileDesc *fd);
 
 
 extern "C" {
@@ -112,7 +113,8 @@
 COOLKEY_API HRESULT CoolKeyUnregisterListener(CoolKeyListener* aListener);
 COOLKEY_API HRESULT CoolKeySetCallbacks(CoolKeyDispatch dispatch,
                         CoolKeyReference reference, CoolKeyRelease release,
-                        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue);
+                        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue,
+                        CoolKeyBadCertHandler badcerthandler=NULL);
 
 COOLKEY_API bool    CoolKeyRequiresAuthentication(const CoolKey *aKey);
 COOLKEY_API bool    CoolKeyHasApplet(const CoolKey *aKey);
@@ -133,6 +135,8 @@
 
 COOLKEY_API HRESULT CoolKeyGetCertInfo(const CoolKey *aKey, char *aCertNickname, std::string & aCertInfo);
 
+COOLKEY_API HRESULT CoolKeyGetUID(const CoolKey *aKey, char *aBuf, int aBufLength);
+
 COOLKEY_API HRESULT CoolKeyGetIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength);
 COOLKEY_API HRESULT CoolKeyGetIssuer(const CoolKey *aKey, char *aBuf, int aBufLength);
 
@@ -257,6 +261,9 @@
 
 const char *CoolKeyGetConfig(const char *aName);
 HRESULT     CoolKeySetConfig(const char *aName,const char *aValue);
+CoolKeyBadCertHandler CoolKeyGetBadCertHandler();
+
+
 
 }
 
--- ./esc/src/lib/coolkey/Makefile.fix6	2009-06-19 16:05:24.000000000 -0700
+++ ./esc/src/lib/coolkey/Makefile	2009-06-19 16:05:32.000000000 -0700
@@ -35,6 +35,9 @@
 	echo "Build Linux or Windows."
 	make -f common.mk
 
+export::
+	make -f common.mk export
+
 endif
 
 ifeq ($(OS_ARCH),Darwin)
--- ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul.fix6	2009-06-19 16:01:21.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul	2009-06-19 16:01:43.000000000 -0700
@@ -65,7 +65,7 @@
       <tabs id="certMgrTabbox" onselect="CertsTabsSelected();">
         <tab id="mine_tab" label="&certmgr.tab.mine;" selected="true"/>
         <tab id="others_tab" hidden="true" label="&certmgr.tab.others2;"/>
-        <tab id="websites_tab" hidden="true" label="&certmgr.tab.websites3;"/>
+        <tab id="websites_tab" hidden="false" label="&certmgr.tab.websites3;"/>
         <tab id="ca_tab" hidden="false" label="&certmgr.tab.ca;"/>
         <tab id="orphan_tab" hidden="true" label="&certmgr.tab.orphan2;"/>
 
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix6	2009-06-19 15:56:20.000000000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp	2009-06-19 15:57:48.000000000 -0700
@@ -30,7 +30,7 @@
 #else
 #include "nsServiceManagerUtils.h"
 #endif
-
+#include "pipnss/nsICertOverrideService.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsCOMPtr.h"
@@ -69,6 +69,7 @@
 #endif
 
 #define PSM_COMPONENT_CONTRACTID "@mozilla.org/psm;1"
+#define NS_CERTOVERRIDE_CONTRACTID "@mozilla.org/security/certoverride;1"
 
 static const nsIID kIModuleIID = NS_IMODULE_IID;
 static const nsIID kIFactoryIID = NS_IFACTORY_IID;
@@ -89,6 +90,7 @@
 
 std::list< nsCOMPtr <rhIKeyNotify>  > rhCoolKey::gNotifyListeners;
 
+PRLock* rhCoolKey::certCBLock=NULL;
 
 PRBool rhCoolKey::gAutoEnrollBlankTokens = PR_FALSE; 
 
@@ -190,6 +192,13 @@
         mCSPListener = nsnull;
     #endif
 
+    certCBLock = PR_NewLock();
+
+    if(!certCBLock) {
+       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Failed to create lock exiting! \n",GetTStamp(tBuff,56)));
+        exit(1);
+    }
+
     PRBool res = InitInstance();
 
     if(res == PR_FALSE)
@@ -207,6 +216,10 @@
 
     char tBuff[56];
     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::~rhCoolKey: %p \n",GetTStamp(tBuff,56),this));
+
+    if(certCBLock) {
+        PR_DestroyLock(certCBLock);
+    }
 }
 
 void rhCoolKey::ShutDownInstance()
@@ -255,6 +268,212 @@
     return S_OK;
 }
 
+struct BadCertData {
+     PRErrorCode error; 
+     PRInt32 port;
+};  
+
+typedef struct BadCertData BadCertData;
+
+SECStatus rhCoolKey::badCertHandler(void *arg, PRFileDesc *fd)
+{
+    SECStatus    secStatus = SECFailure;
+    PRErrorCode    err;
+    char *host = NULL;
+    PRInt32 port = 0;
+    CERTCertificate *serverCert = NULL;
+    PRUint32 errorBits = 0;
+    char tBuff[56];
+    
+    PR_Lock(certCBLock);
+
+    if (!arg || !fd) {
+        PR_Unlock(certCBLock);
+        return secStatus;
+    }
+
+    // Retrieve callback data from NssHttpClient
+    // Caller cleans up this data
+    BadCertData *data = (BadCertData *) arg;
+    data->error = err = PORT_GetError();
+
+
+    /* If any of the cases in the switch are met, then we will proceed   */
+
+    switch (err) {
+    case SEC_ERROR_INVALID_AVA:
+    case SEC_ERROR_INVALID_TIME:
+    case SEC_ERROR_BAD_SIGNATURE:
+    case SEC_ERROR_EXPIRED_CERTIFICATE:
+    case SEC_ERROR_UNKNOWN_ISSUER:
+    case SEC_ERROR_UNTRUSTED_CERT:
+    case SEC_ERROR_CERT_VALID:
+    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+    case SEC_ERROR_CRL_EXPIRED:
+    case SEC_ERROR_CRL_BAD_SIGNATURE:
+    case SEC_ERROR_EXTENSION_VALUE_INVALID:
+    case SEC_ERROR_CA_CERT_INVALID:
+    case SEC_ERROR_CERT_USAGES_INVALID:
+    case SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION:
+    case SEC_ERROR_EXTENSION_NOT_FOUND: // Added by Rob 5/21/2002
+        secStatus = SECSuccess;
+    break;
+    default:
+        secStatus = SECFailure;
+    break;
+    }
+
+    if(secStatus == SECSuccess)  {
+        PR_Unlock(certCBLock);
+        return secStatus;
+    }
+
+    // Collect errors to compare with override service output
+    switch(err) {
+    case SEC_ERROR_UNTRUSTED_ISSUER:
+        errorBits |= nsICertOverrideService::ERROR_UNTRUSTED;
+    break;
+    case SSL_ERROR_BAD_CERT_DOMAIN:
+        errorBits |= nsICertOverrideService::ERROR_MISMATCH;
+    break;
+    case SEC_ERROR_EXPIRED_CERTIFICATE:
+        errorBits |= nsICertOverrideService::ERROR_TIME;
+    default:
+    break;
+    };
+
+    // Now proceed to see if we have an exception.
+    // Get the server certificate that was rejected.
+    serverCert = SSL_PeerCertificate(fd);
+
+    if(!serverCert) {
+        PR_Unlock(certCBLock);
+        return secStatus;
+    }
+
+    port = data->port;
+    host = SSL_RevealURL(fd);
+
+    if(!host || port <= 0) {
+        PR_Unlock(certCBLock);
+        return secStatus;
+    }
+
+    PR_LOG(coolKeyLog, PR_LOG_DEBUG,
+                          ("%s rhCoolKey::badCertHandler enter: error: %d  url: %s port: %d \n",
+                          GetTStamp(tBuff,56),err,host,port)
+    );
+
+    PRBool isTemporaryOverride = PR_FALSE;
+    PRUint32 overrideBits = 0;
+    PRBool overrideResult = PR_FALSE;
+
+    // Use the nsICertOverrideService to see if we have
+    // previously trusted this certificate.
+    nsCOMPtr<nsICertOverrideService> overrideService =
+       do_GetService(NS_CERTOVERRIDE_CONTRACTID);
+
+    const nsEmbedCString nsHost(host);
+    nsEmbedCString hashAlg,fingerPrint;
+
+    nsresult nsrv;
+    unsigned char* fingerprint=NULL;
+    if(overrideService) {
+        nsrv = overrideService->GetValidityOverride((const nsACString &)nsHost,
+            port,(nsACString &)hashAlg,
+            (nsACString&)fingerPrint,&overrideBits,
+            &isTemporaryOverride,&overrideResult
+        );
+        if(nsrv == NS_OK) { 
+           PR_LOG(coolKeyLog, PR_LOG_DEBUG,
+               ("%s rhCoolKey::badCertHandler res %d print %s len %d bits %u temp %d alg: %s  \n",
+               GetTStamp(tBuff,56),overrideResult,fingerPrint.get(),
+               fingerPrint.Length(),overrideBits, isTemporaryOverride,hashAlg.get())
+           );
+       }
+
+       PRBool certMatches = PR_FALSE;
+
+       if( (nsrv == NS_OK) && overrideResult) {
+            SECItem oid;
+            oid.data = nsnull;
+            oid.len = 0;
+            SECStatus srv = SEC_StringToOID(nsnull, &oid,
+                    hashAlg.get(), hashAlg.Length());
+
+            if (srv != SECSuccess)  {
+               PR_Free(host);
+               host=NULL;
+               CERT_DestroyCertificate(serverCert);
+               serverCert=NULL;
+               PR_Unlock(certCBLock);
+               return secStatus;
+            }
+
+            SECOidTag oid_tag = SECOID_FindOIDTag(&oid);
+
+            unsigned int hash_len = HASH_ResultLenByOidTag(oid_tag);
+            fingerprint = new unsigned char[hash_len];
+
+            if(!fingerprint)  {
+                CERT_DestroyCertificate(serverCert);
+                serverCert=NULL;
+                PR_Unlock(certCBLock);
+                return secStatus;
+            }
+
+            SECItem computedPrint;
+            memset(fingerprint, 0, sizeof fingerprint);
+            PK11_HashBuf(oid_tag, fingerprint,
+            serverCert->derCert.data, serverCert->derCert.len);
+            CERT_DestroyCertificate(serverCert);
+            serverCert=NULL;
+
+            computedPrint.data=fingerprint;
+            computedPrint.len=hash_len;
+
+            char *formattedPrint = CERT_Hexify(&computedPrint,1);
+            char *inputPrint = (char *)fingerPrint.get();
+
+            //Compare fingerprints.
+
+            if(formattedPrint && inputPrint)  {
+                if(!PL_strcmp(formattedPrint, inputPrint))
+                    certMatches = PR_TRUE;
+            }
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s certMatches: %d  \n",
+                GetTStamp(tBuff,56),certMatches)
+            );
+
+            if(formattedPrint)  {
+                PORT_Free(formattedPrint);
+                formattedPrint = NULL;
+            }
+      } else {
+          PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s override test failed. \n",
+              GetTStamp(tBuff,56))
+          );
+      }
+
+      if( certMatches ) {
+         if(overrideBits | errorBits)
+             secStatus = SECSuccess;   
+      }
+    }
+
+    PR_Free(host);
+    host = NULL;
+    if(fingerprint)  {
+        delete [] fingerprint;
+        fingerprint = NULL;
+    }
+
+    PR_Unlock(certCBLock);
+
+    return secStatus;
+}
+
+
 HRESULT rhCoolKey::doSetCoolKeyConfigValue(const char *aName, const char *aValue) 
 {
 
@@ -340,7 +559,7 @@
     nssComponent
     = do_GetService(PSM_COMPONENT_CONTRACTID); 
 
-    CoolKeySetCallbacks(Dispatch,Reference, Release,doGetCoolKeyConfigValue ,doSetCoolKeyConfigValue);
+    CoolKeySetCallbacks(Dispatch,Reference, Release,doGetCoolKeyConfigValue ,doSetCoolKeyConfigValue,badCertHandler);
 
     mProxy = CreateProxyObject();
 
@@ -1262,6 +1481,38 @@
 }
 
 /* string GetCoolKeyIssuedTo (in unsigned long aKeyType, in string aKeyID); */
+NS_IMETHODIMP rhCoolKey::GetCoolKeyUID(PRUint32 aKeyType, const char *aKeyID, char **uid)
+{
+    char tBuff[56];
+    if (!aKeyID) {
+        return NS_ERROR_FAILURE;
+    }
+
+    AutoCoolKey key(aKeyType, ( char *)aKeyID);
+
+    char buff[512];
+    int bufLength = 512;
+    buff[0] = 0;
+   
+    CoolKeyGetUID(&key, (char *) buff, bufLength);
+
+    if(!buff[0])
+    {
+        return NS_OK;
+    }
+
+    PR_LOG(coolKeyLog,PR_LOG_DEBUG,("%s rhCoolKey::RhGetCoolKeyGetUID  %s \n",GetTStamp(tBuff,56),(char *) buff));
+
+    char *temp =  (char *) nsMemory::Clone(buff,sizeof(char) * strlen(buff) + 1);
+
+    *uid = temp;
+
+    return NS_OK;
+
+}
+
+
+/* string GetCoolKeyIssuedTo (in unsigned long aKeyType, in string aKeyID); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuedTo(PRUint32 aKeyType, const char *aKeyID, char **issuedTo)
 {
     char tBuff[56];
--- ./esc/src/app/xpcom/rhICoolKey.idl.fix6	2009-06-19 16:00:20.000000000 -0700
+++ ./esc/src/app/xpcom/rhICoolKey.idl	2009-06-19 16:00:32.000000000 -0700
@@ -66,6 +66,8 @@
 
     string GetCoolKeyCertInfo(in unsigned long aKeyType, in string aKeyID, in string aCertNickname);
 
+    string GetCoolKeyUID(in unsigned long aKeyType, in string aKeyID);
+
     string GetCoolKeyIssuedTo(in unsigned long aKeyType, in string aKeyID);
    
     string GetCoolKeyIssuer(in unsigned long aKeyType, in string aKeyID);
--- ./esc/src/app/xpcom/Makefile.sdk.fix6	2009-06-19 15:54:52.000000000 -0700
+++ ./esc/src/app/xpcom/Makefile.sdk	2009-06-19 15:55:43.000000000 -0700
@@ -109,7 +109,7 @@
 CPPFLAGS += -fno-rtti \
                 -fno-exceptions \
                 -fshort-wchar -fPIC
-GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib    $(GECKO_SDK_PATH)/lib/libxpcomglue.a -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib    $(GECKO_SDK_PATH)/lib/libxpcomglue.a -lnssutil3 -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl
 endif
 
 ifeq ($(OS_ARCH),WINNT)
@@ -145,7 +145,7 @@
 GECKO_INCLUDES		+= -I $(GECKO_SDK_PATH)/sdk/include
 OBJECT			= rhCoolKey.obj
 OBJECTCSP		= CoolKeyCSP.obj 
-COOL_LDFLAGS		=   -IMPLIB:fake-import /LIBPATH:$(CORE_DIST)/lib ckymanager.lib httpchunked.lib $(GECKO_LD_LIBS) nss3.lib ssl3.lib smime3.lib softokn3.lib  /LIBPATH:$(CKY_LIB_LDD) libckyapplet.lib  crypt32.lib kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib /NODEFAULTLIB:libc.lib
+COOL_LDFLAGS		=   -IMPLIB:fake-import /LIBPATH:$(CORE_DIST)/lib ckymanager.lib httpchunked.lib $(GECKO_LD_LIBS) nssutil3.lib nss3.lib ssl3.lib smime3.lib softokn3.lib  /LIBPATH:$(CKY_LIB_LDD) libckyapplet.lib  crypt32.lib kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib /NODEFAULTLIB:libc.lib
 endif
 
 ifeq ($(OS_ARCH),Darwin)
--- ./esc/src/app/xpcom/rhCoolKey.h.fix6	2009-06-19 15:58:21.000000000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.h	2009-06-19 15:58:28.000000000 -0700
@@ -22,6 +22,15 @@
 #include "nsIGenericFactory.h"
 #include "nsEmbedString.h"
 #include <list>
+#include "nspr.h"
+#include "prio.h"
+#include "ssl.h"
+#include "pk11func.h"
+#include "cert.h"
+#include "sslerr.h"
+#include "secerr.h"
+#include "sechash.h"
+
 #include "CoolKey.h"
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
@@ -92,6 +101,7 @@
 
     static HRESULT doSetCoolKeyConfigValue(const char *aName, const char *aValue); 
     static const char *doGetCoolKeyConfigValue(const char *aName );
+    static SECStatus badCertHandler(void *arg, PRFileDesc *fd);
 
 protected:
   /* additional members */
@@ -107,6 +117,8 @@
 
     static std::list< nsCOMPtr <rhIKeyNotify> > gNotifyListeners;
 
+    static PRLock* certCBLock;
+
     rhICoolKey* mProxy;
 
     static PRBool      gAutoEnrollBlankTokens;

esc-1.1.0-fix7.patch:
 app/xul/esc/application.ini         |    2 -
 lib/NssHttpClient/httpClientNss.cpp |   49 ++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

--- NEW FILE esc-1.1.0-fix7.patch ---
--- ./esc/src/lib/NssHttpClient/httpClientNss.cpp.fix7	2009-06-22 13:00:20.000000000 -0700
+++ ./esc/src/lib/NssHttpClient/httpClientNss.cpp	2009-06-22 13:05:07.000000000 -0700
@@ -64,8 +64,53 @@
 
 PSHttpResponse *HttpClientNss::httpSendChunked(char *host_port, char *uri, char *method, char *body,PSChunkedResponseCallback cb,void *uw,PRBool doSSL,int messageTimeout )
 {
-    
-    PSHttpServer server(host_port, PR_AF_INET);
+    char *pPort = NULL;
+    char *pPortActual = NULL;
+
+    char hostName[512];
+
+    /*
+     * Isolate the host name, account for IPV6 numeric addresses.
+     *
+     */
+
+    if(host_port)
+        strncpy(hostName,host_port,512);
+
+    pPort = hostName;
+    while(1)  {
+        pPort = strchr(pPort, ':');
+        if (pPort) {
+            pPortActual = pPort;
+            pPort++;
+        } else
+            break;
+    }
+
+    if(pPortActual)
+        *pPortActual = '\0';
+
+    /*
+    *  Rifle through the values for the host
+    */
+
+    PRAddrInfo *ai;
+    void *iter;
+    PRNetAddr addr;
+    int family = PR_AF_INET;
+
+    ai = PR_GetAddrInfoByName(hostName, PR_AF_UNSPEC, PR_AI_ADDRCONFIG);
+    if (ai) {
+        printf("%s\n", PR_GetCanonNameFromAddrInfo(ai));
+        iter = NULL;
+        while ((iter = PR_EnumerateAddrInfo(iter, ai, 0, &addr)) != NULL) {
+            family = PR_NetAddrFamily(&addr);
+            break;
+        }
+        PR_FreeAddrInfo(ai);
+    }
+
+    PSHttpServer server(host_port, family);
  
     PSHttpRequest request( &server, uri, HTTP11, 0 );
     _request = &request;
--- ./esc/src/app/xul/esc/application.ini.fix7	2009-06-22 15:34:32.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2009-06-22 15:35:11.000000000 -0700
@@ -25,7 +25,7 @@
 Name=ESC
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.1.0-7
+Version=1.1.0-9
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.


--- NEW FILE import.log ---
esc-1_1_0-10_fc12:HEAD:esc-1.1.0-10.fc12.src.rpm:1253050190


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Mar 2007 20:34:09 -0000	1.4
+++ .cvsignore	15 Sep 2009 21:31:03 -0000	1.5
@@ -1,2 +1 @@
-esc-1.0.1.tar.bz2
-xulrunner-1.8.0.4-source.tar.bz2
+esc-1.1.0.tar.bz2


Index: esc
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/esc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- esc	17 Jul 2007 18:47:04 -0000	1.8
+++ esc	15 Sep 2009 21:31:03 -0000	1.9
@@ -18,10 +18,6 @@
 # END COPYRIGHT BLOCK
 
 
-
-
-DO_SECMODE="false"
-SECURITY_URL=
 DO_FORCEMODE="false"
 DO_SHOW_VERSION="false"
 ESC_ARGS=
@@ -30,7 +26,7 @@ ESC_ARGS=
 ESC_PROFILE_BASE=~/.redhat/esc
 ESC_LOG_FILE=esc.log
 
-ESC_PATH=$LIBDIR/esc-1.0.1
+ESC_PATH=$LIBDIR/esc-1.1.0
 ESC_BIN_PATH=/usr/bin
 ESC_EXEC=esc
 ESCD_EXEC=escd
@@ -97,25 +93,10 @@ function processArgs {
             #echo "Do show version!"
             DO_SHOW_VERSION="true"
         fi
-        if [ $DO_SECMODE == "true" ]
-        then
-            #echo "Sec Mode Url $arg"
-            SECURITY_URL=$arg
-        fi
-        if [ $arg == "-secmode" ]
-        then
-            DO_SECMODE="true"
-            #echo "Do security mode!"
-        fi
     done
-
-    if [ $DO_SECMODE == "true" ]
-    then
-        #echo "Launch ESC in security mode!"
-        ARGS="--secmode $SECURITY_URL"
-    fi
 }
 
+
 processArgs $*
 
 if [ ! -d $ESC_PROFILE_BASE ]
@@ -180,7 +161,6 @@ else
     #echo "esc not already running start up and bring up window."
     ./$ESC_EXEC & 
     sleep 4
-
     #echo "done sleeping bring up esc window."
     ./$ESC_EXEC
     exit 0


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/esc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- esc.spec	24 Jul 2009 22:17:11 -0000	1.41
+++ esc.spec	15 Sep 2009 21:31:05 -0000	1.42
@@ -1,41 +1,37 @@
 Name: esc 
-Version: 1.0.1
-Release: 15%{?dist} 
+Version: 1.1.0
+Release: 10%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
-License: GPL+
+License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
 Group: Applications/Internet
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: firefox-1.5-with-system-nss.patch
-Patch2: firefox-1.1-nss-system-nspr.patch
-Patch3: esc-1.0.1-admin-row-update.patch
-Patch4: esc-1.0.1-ui-fixes-1.patch 
-Patch5: esc-1.0.1-log-fixes.patch
-Patch6: esc-1.0.1-log-fixes-1.patch
-Patch7: esc-1.0.1-lic-fix.patch 
-Patch8: esc-1.0.1-misc.patch
-Patch9:  esc-1.0.1-nss-devel-fix.patch
-Patch10: firefox.secalg.patch
-Patch11: esc-1.0.1-xulrunner-sparc-fixes.patch
-Patch12: esc-1.0.1-elif.patch
+Patch1: esc-1.1.0-fix1.patch
+Patch2: esc-1.1.0-fix2.patch
+Patch3: esc-1.1.0-fix3.patch
+Patch4: esc-1.1.0-fix4.patch
+Patch5: esc-1.1.0-fix5.patch
+Patch6: esc-1.1.0-fix6.patch
+Patch7: esc-1.1.0-fix7.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
 BuildRequires: pango-devel libpng-devel pkgconfig zlib-devel
 BuildRequires: nspr-devel nss-devel
 BuildRequires: autoconf213 libX11-devel libXt-devel
+BuildRequires: xulrunner xulrunner-devel
 
 BuildRequires: pcsc-lite-devel coolkey-devel
 BuildRequires: desktop-file-utils zip binutils libnotify-devel
 BuildRequires: dbus-devel
 Requires: pcsc-lite ifd-egate coolkey nss nspr
 Requires: zip dbus >= 0.90 libnotify >= 0.4.2
+Requires: xulrunner
 
 # 390 does not have coolkey or smartCards
-# Xulrunner won't compile on ppc64 or sparc64 right now.
-ExcludeArch: s390 s390x ppc64 sparc64
+ExcludeArch: s390 s390x 
 
 # We can't allow the internal xulrunner to leak out
 AutoReqProv: 0
@@ -53,13 +49,14 @@ AutoReqProv: 0
 %define docdir    %{_defaultdocdir}/%{escname}
 %define escappdir src/app/xpcom
 %define escxuldir src/app/xul/esc
+%define escxulchromeicons %{escxuldir}/chrome/icons/default
+%define escdaemon escd
 
 
 Source0: %{escname}.tar.bz2
 Source1: esc
 Source2: esc.desktop
-Source3: xulrunner-1.8.0.4-source.tar.bz2
-Source4: esc.png
+Source3: esc.png
 
 
 %description
@@ -70,49 +67,44 @@ cryptographic smartcards.
 
 %setup -q -c -n %{escname}
 
-#Perform esc patching
+#patch esc 
 
+%patch1 -p1 -b .fix1
+%patch2 -p1 -b .fix2
 %patch3 -p1 -b .fix3
 %patch4 -p1 -b .fix4
 %patch5 -p1 -b .fix5
 %patch6 -p1 -b .fix6
 %patch7 -p1 -b .fix7
-%patch8 -p1 -b .fix8
-%patch9 -p1 -b .fix9
-
-
-#Unpack xulrunner where esc expects it to be.
-
-%setup -T -D -a 3 -n %{escname}/esc/dist/src
-
-#Perform the patching of xulrunner
-
-cd mozilla 
-
-%patch1 -p1 -b .fix1
-%patch2 -p1 -b .fix2
-%patch10 -p1 -b .secalg
-%patch11 -p1 -b .sparc
-%patch12 -p1 -b .elif
 
 %build
 
-%ifarch x86_64 ppc64 ia64 sparc64
+GECKO_SDK_PATH=%{_libdir}/xulrunner-sdk-1.9.1/sdk
+GECKO_BIN_PATH=%{_libdir}/xulrunner-1.9.1
+GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-sdk-1.9.1
+
+%ifarch x86_64 ppc64 ia64
 USE_64=1
 export USE_64
 %endif
 
+export GECKO_SDK_PATH
+export GECKO_BIN_PATH
+export GECKO_INCLUDE_PATH
 # last setup call moved  the current directory
 
-cd ../..
+cd esc 
+#cd ../..
 
-cp %{SOURCE4} %{escxuldir}/%{esc_chromepath}
+cp %{SOURCE3} %{escxuldir}/%{esc_chromepath}
+rm -f %{escxulchromeicons}/*.ico
+cp %{escxulchromeicons}/esc-window.xpm %{escxulchromeicons}/default.xpm
 
-make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release}
+make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release} USE_XUL_SDK=1
 
 %install
 
-cd ../../src/app/xpcom 
+cd esc/src/app/xpcom 
 
 mkdir -p $RPM_BUILD_ROOT/%{escbindir}
 mkdir -p $RPM_BUILD_ROOT/%{icondir}
@@ -125,18 +117,17 @@ mkdir -p $RPM_BUILD_ROOT/%{docdir}
 sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
 
 
-
 chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
 
-%ifarch x86_64 ppc64 ia64 sparc64
+%ifarch x86_64 ppc64 ia64
 USE_64=1
 export USE_64
 %endif
 
 
-make BUILD_OPT=1 install DESTDIR=$RPM_BUILD_ROOT/%{escdir}
+make BUILD_OPT=1 USE_XUL_SDK=1 install DESTDIR=$RPM_BUILD_ROOT/%{escdir}
 
 rm -rf $RPM_BUILD_ROOT/%{escdir}/usr
 
@@ -151,6 +142,11 @@ cp %{SOURCE2} $RPM_BUILD_ROOT/%{autostar
 cd %{_builddir}
 cp %{escname}/esc/LICENSE $RPM_BUILD_ROOT/%{docdir}
 
+chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/chrome
+chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/defaults
+chmod 755  $RPM_BUILD_ROOT/%{escdir}/application.ini
+
+
 %clean
 
 rm -rf $RPM_BUILD_ROOT
@@ -158,44 +154,38 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 
-%dir %{escdir}
 %{escdir}/esc
 %{escdir}/escd
 %{escbindir}/esc
 %{escdir}/application.ini
 
-%dir %{escdir}/chrome
 %{escdir}/chrome/chrome.manifest
 
-%{escdir}/chrome/content/
-%{escdir}/chrome/locale/
-%dir %{escdir}/chrome/icons
-%{escdir}/chrome/icons/default/
-%{escdir}/components/
+%{escdir}/chrome/content
+%{escdir}/chrome/locale
+%{escdir}/chrome/icons/default
+%{escdir}/components
 
-%dir %{escdir}/defaults
-%dir %{escdir}/defaults/preferences
 %{escdir}/defaults/preferences/esc-prefs.js   
 
-%{escdir}/xulrunner/
+#%{escdir}/xulrunner
 %{icondir}/esc.png
 %{pixmapdir}/esc.png
 %{autostartdir}/esc.desktop
 %{_datadir}/%{appdir}/esc.desktop
-%dir %{docdir}
 %doc %{docdir}/LICENSE
 
-%preun
-
-killall --exact -q escd
-exit 0
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%preun
+
+killall --exact -q escd
+exit 0
+
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -203,45 +193,70 @@ if [ -x %{_bindir}/gtk-update-icon-cache
 fi
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> - 1.0.1-14
-- Added a patch to correct the wrong elif preprocessor statement
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0.1-12
-- Include lots of missing directories (#233833) and mark
-  recursively included directories in files list with a trailing slash.
-
-* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-11
-- xulrunner still broken for sparc64
-
-* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-10
-- fix esc for sparc/sparc64
-
-* Wed Feb 13 2008 Jack Magne <jmagne at redhat.com>
-- Fix xulrunner build problem.
-* Fri Jan 18 2008 Jack Magne <jmagne at redhat.com> 
-- Fix tray icon menu issue #253248.
-* Thu Aug 30 2007 Jack Magne <jmagne at redhat.com> 
-- License field change- 1.0.1-7
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.1-6
-- Rebuild for selinux ppc32 issue.
-
-* Tue Jul 17 2007 Jack Magne <jmagne at redhat.com>- 1.0.1-5
-- Further fixes to the diagnostics logging.
-* Wed Jun 20 2007 Jack Magne <jmagne at redhat.com>- 1.0.1-4
-- Fixes to the diagnostics log files and esc  error messages.
-* Thu Apr 26 2007 Jack Magne <jmagne at redhat.com>- 1.0.1-3
-- Many UI usability fixes.
-* Tue Apr 03 2007 Jack Magne <jmagne at redhat.com>- 1.0.1-2
-* Mon Mar 05 2007 Jack Magne <jmagne at redhat.com>- 1.0.1-1
-- Stability fixes
-* Fri Oct 27 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-19
-- More mac and win fixes.
+* Tue Sep 15 2009   Jack Magne <jmagne at redhat.com>= 1.1.0-10
+- Pick up latest improvements.
+* Mon Jun 22 2009  Jack Magne <jmagne at redhat.com>= 1.1.0-9
+- Related: #496410, also IPV6 support.
+* Fri Jun 19 2009  Jack Magne <jmagne at redhat.com>= 1.1.0-8
+- Related: #496410, SSL Conn fix.
+* Mon Jun 8  2009  Jack Magne <jmagne at redhat.com>- 1.1.0-7
+- Releated: #496410.
+* Thu Apr 23 2009  Jack Magne <jmagne at redhat.com>- 1.1.0-6
+- Related: #496410. Appease rpmdiff.
+* Wed Apr 22 2009  Jack Magne <jmagne at redhat.com>- 1.1.0-5
+- Related: #496410, addresses 494981, better error message.
+* Wed Apr 22 2009  Jack Magne <jmagne at redhat.com>- 1.1.0-4
+- Move to latest rebased code. Related #496410.
+* Thu Dec 04 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-39
+- Resolves #469202 - Cert Viewer issue              
+* Tue Nov 11 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-38
+- Resolves  #471923 - ESC Connection issue.
+* Thu Oct 16 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-37
+- Resolves #467126 - Blank authentication dialog problem. 
+* Fri Sep 26 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-36
+- Related #200475 - Require the xulrunner package, Resolves #248493
+* Thu Sep 18 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-35
+- Related 200475, make rpmdiff tests happy.
+* Tue Sep 16 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-34
+- Resolves #200475 #253081 #437238
+* Thu Jan 10 2008  Jack Magne <jmagne at redhat.com>- 1.0.0-33
+- Resolves #25324a8 #253268
+* Thu Jul 12 2007  Jack Magne <jmagne at redhat.com>- 1.0.0-32
+- Resolves #248071 - ESC RPM unistall failure if daemon not running.
+* Fri Jun 22 2007  Jack Magne <jmagne at redhat.com>- 1.0.0-31
+- Related #208038 - Top things to put in diagnostics log
+* Wed Jun 20 2007  Jack Magne <jmagne at redhat.com>- 1.0.0-30
+- Related #204021
+* Fri Jun 8 2007   Jack Magne <jmagne at redhat.com>- 1.0-0-29
+- Related #212010
+* Fri Jun 8 2007   Jack Magne <jmagne at redhat.com>- 1.0.0-28
+- Resolves #212010 
+* Tue Jun 5 2007   Jack Magne <jmagne at redhat.com>- 1.0.0-27 
+- Resolves #203466 Better error message strings.
+* Mon May 21 2007  Jack Magne <jmagne at redhat.com>- 1.0.0-26
+- Related: #206783 Fix the launcher script to work with new logging.
+* Fri May 11 2007  Jack Magne <jmagne at redhat.com>- 1.0.0-25
+- Resolves: #206783.
+* Mon Apr 23 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-24
+- More Desktop appearance fixes.
+- Related: #208749
+* Mon Apr 23 2007  Jack Magne <jmagne at redhat.com>- 1.0.0-23
+- Desktop appearance fixes.
+- Related: #208749
+* Thu Apr 19 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-22
+- Second drop of 5.1 fixes.
+- Resolves: #203934, #203935, #204959, #206780, #206792, #207721
+- Resolves: #207816, #206791
+- Related:  #208749
+* Wed Apr 18 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-21
+- First 5.1 fixes.
+- Resolves: #203757, #203806, #204661, #205856, #206788, #206791
+- Resolves: #208037, #208333, #210589, #210590, #213912, #226913
+- Resolves: #204021, #205498, #224436
+* Tue Nov 28 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-20
+- fix for bug to commit config changes immediately.  Bug #210988
+* Wed Nov 15 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-19
+-fix for escd double free problem. Bug #209882
 * Tue Oct 24 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-18
 -rebuilt on RHEL-5 branch
 * Sun Oct 4  2006 Jack Magne <jmagne at redhat.com>- 1.0.0-17


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2007 20:34:09 -0000	1.5
+++ sources	15 Sep 2009 21:31:06 -0000	1.6
@@ -1,2 +1 @@
-3d3def2acd3c8d04dff47af5312a707c  esc-1.0.1.tar.bz2
-4dc09831aa4e94fda5182a4897ed08e9  xulrunner-1.8.0.4-source.tar.bz2
+76dc573edfd410f3fdd08ad0010b9205  esc-1.1.0.tar.bz2


--- esc-1.0.1-admin-row-update.patch DELETED ---


--- esc-1.0.1-elif.patch DELETED ---


--- esc-1.0.1-lic-fix.patch DELETED ---


--- esc-1.0.1-log-fixes-1.patch DELETED ---


--- esc-1.0.1-log-fixes.patch DELETED ---


--- esc-1.0.1-nss-devel-fix.patch DELETED ---


--- esc-1.0.1-ui-fixes-1.patch DELETED ---


--- esc-1.0.1-xulrunner-sparc-fixes.patch DELETED ---


--- firefox-1.5-with-system-nss.patch DELETED ---


--- firefox.secalg.patch DELETED ---



From wtogami at fedoraproject.org  Tue Sep 15 21:36:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 15 Sep 2009 21:36:46 +0000 (UTC)
Subject: rpms/livecd-tools/devel
	livecd-tools-027-make-liveusb-work-damnit.patch, NONE,
	1.1 livecd-tools.spec, 1.30, 1.31
Message-ID: <20090915213647.0C6A811C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26900

Modified Files:
	livecd-tools.spec 
Added Files:
	livecd-tools-027-make-liveusb-work-damnit.patch 
Log Message:
- test patch to make LiveUSB work again, need to be sure it doesn't
  break LiveCD before committing in the next version


livecd-tools-027-make-liveusb-work-damnit.patch:
 live.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE livecd-tools-027-make-liveusb-work-damnit.patch ---
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 85de975..ed3d563 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -416,7 +416,7 @@ menu hiddenrow 5
 
     def __get_image_stanza(self, is_xen, isDracut, **args):
         if isDracut:
-            args["rootlabel"] = "live:LABEL=%(fslabel)s" % args
+            args["rootlabel"] = "live:CDLABEL=%(fslabel)s" % args
         else:
             args["rootlabel"] = "CDLABEL=%(fslabel)s" % args
 


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- livecd-tools.spec	10 Sep 2009 20:09:59 -0000	1.30
+++ livecd-tools.spec	15 Sep 2009 21:36:45 -0000	1.31
@@ -5,11 +5,12 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 027
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
+Patch0: livecd-tools-027-make-liveusb-work-damnit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -51,6 +52,7 @@ like live image or appliances.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Tue Sep 15 2009 Warren Togami <wtogami at redhat.com> - 027-2
+- test patch to make LiveUSB work again, need to be sure it doesn't
+  break LiveCD before committing in the next version
+
 * Thu Sep 10 2009 Warren Togami <wtogami at redhat.com> - 027-1
 - Support new dracut output filename /boot/initramfs-*
 - Fix cleanup of fake /selinux directory during teardown Bug #522224



From dwalsh at fedoraproject.org  Tue Sep 15 21:36:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 15 Sep 2009 21:36:52 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.640,1.641
Message-ID: <20090915213652.3148E11C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27061

Modified Files:
	policycoreutils.spec 
Log Message:
* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-4
- Add symbolic link to load_policy



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -p -r1.640 -r1.641
--- policycoreutils.spec	14 Sep 2009 19:39:18 -0000	1.640
+++ policycoreutils.spec	15 Sep 2009 21:36:51 -0000	1.641
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.73
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -88,6 +88,7 @@ tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
+ln -s /sbin/load_policy %{buildroot}%{_sbindir}/load_policy
 
 desktop-file-install	--vendor fedora \
 			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -228,6 +229,7 @@ rm -rf %{buildroot}
 /sbin/setfiles
 /sbin/load_policy
 %{_sbindir}/genhomedircon
+%{_sbindir}/load_policy
 %{_sbindir}/restorecond
 %{_sbindir}/setsebool
 %{_sbindir}/semodule
@@ -295,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-4
+- Add symbolic link to load_policy
+
 * Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-3
 - Fix restorecond script to use force-reload
 



From otaylor at fedoraproject.org  Tue Sep 15 21:44:53 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue, 15 Sep 2009 21:44:53 +0000 (UTC)
Subject: rpms/mutter/devel .cvsignore, 1.5, 1.6 mutter.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090915214453.C6AF511C00CE@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2502

Modified Files:
	.cvsignore mutter.spec sources 
Log Message:
Update to 2.27.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Sep 2009 23:10:08 -0000	1.5
+++ .cvsignore	15 Sep 2009 21:44:53 -0000	1.6
@@ -2,3 +2,4 @@ mutter-2.27.1.tar.bz2
 mutter-2.27.2.tar.bz2
 mutter-2.27.3.tar.bz2
 mutter-2.27.4.tar.bz2
+mutter-2.27.5.tar.bz2


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mutter.spec	4 Sep 2009 23:10:09 -0000	1.10
+++ mutter.spec	15 Sep 2009 21:44:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           mutter
-Version:        2.27.4
+Version:        2.27.5
 Release:        1%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
@@ -147,6 +147,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.5-1
+- Update to 2.27.5
+
 * Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.4-1
 - Remove workaround for #520209
 - Update to 2.27.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Sep 2009 23:10:09 -0000	1.5
+++ sources	15 Sep 2009 21:44:53 -0000	1.6
@@ -1 +1 @@
-694d159af907cf785ab99d03756c6807  mutter-2.27.4.tar.bz2
+1ec88207ff366c09b8c590775d28ac3b  mutter-2.27.5.tar.bz2



From dwalsh at fedoraproject.org  Tue Sep 15 21:45:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 15 Sep 2009 21:45:13 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.80,
	1.81 selinux-policy.spec, 1.918, 1.919
Message-ID: <20090915214513.B288611C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2904

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Sep 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-5
- Fix label on /usr/bin/notepad, /usr/sbin/vboxadd-service
- Remove policycoreutils-python requirement except for minimum


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   15 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  317 ++++++
 policy/modules/apps/nsplugin.te           |  290 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  171 +++
 policy/modules/apps/sandbox.te            |  315 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  122 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  154 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   11 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   20 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  277 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   45 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1399 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 323 files changed, 15158 insertions(+), 2609 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- policy-F12.patch	15 Sep 2009 18:26:12 -0000	1.80
+++ policy-F12.patch	15 Sep 2009 21:45:12 -0000	1.81
@@ -4242,12 +4242,13 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`TODO',`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.6.31/policy/modules/apps/wine.fc
 --- nsaserefpolicy/policy/modules/apps/wine.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/apps/wine.fc	2009-09-09 15:38:24.000000000 -0400
-@@ -1,4 +1,21 @@
++++ serefpolicy-3.6.31/policy/modules/apps/wine.fc	2009-09-15 15:06:46.000000000 -0400
+@@ -1,4 +1,22 @@
 -/usr/bin/wine			--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/usr/bin/wine.*			--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/usr/bin/regsvr32		--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/usr/bin/regedit		--	gen_context(system_u:object_r:wine_exec_t,s0)
++/usr/bin/notepad		--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/usr/bin/uninstaller		--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/usr/bin/msiexec		--	gen_context(system_u:object_r:wine_exec_t,s0)
 +
@@ -6805,7 +6806,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.31/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.31/policy/modules/roles/unconfineduser.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/roles/unconfineduser.fc	2009-09-15 15:37:54.000000000 -0400
 @@ -0,0 +1,36 @@
 +# Add programs here which should not be confined by SELinux
 +# e.g.:
@@ -6813,7 +6814,7 @@ diff -b -B --ignore-all-space --exclude-
 +# For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
 +/usr/bin/valgrind 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/vncserver		--	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
-+
++/usr/sbin/vboxadd-service 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib(64)/virtualbox/VirtualBox  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
@@ -11531,6 +11532,17 @@ diff -b -B --ignore-all-space --exclude-
  	manage_files_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
 +	files_tmp_filetrans(httpd_cvs_script_t, cvs_tmp_t, { file dir })
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.6.31/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/cyrus.te	2009-09-15 17:43:50.000000000 -0400
+@@ -137,6 +137,7 @@
+ optional_policy(`
+ 	snmp_read_snmp_var_lib_files(cyrus_t)
+ 	snmp_dontaudit_write_snmp_var_lib_files(cyrus_t)
++	snmp_stream_connect(cyrus_t)
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.31/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/services/dbus.if	2009-09-09 15:38:24.000000000 -0400
@@ -17748,6 +17760,48 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.6.31/policy/modules/services/snmp.if
+--- nsaserefpolicy/policy/modules/services/snmp.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/snmp.if	2009-09-15 17:44:18.000000000 -0400
+@@ -85,6 +85,26 @@
+ 	dontaudit $1 snmpd_var_lib_t:file write;
+ ')
+ 
++
++########################################
++## <summary>
++## Connect to snmpd using a unix domain stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`snmp_stream_connect',`
++	 gen_require(`
++		type snmpd_t, snmpd_var_lib_t;
++	 ')
++
++	 files_search_var_lib($1)
++	 stream_connect_pattern($1, snmpd_var_lib_t, snmpd_var_lib_t, snmpd_t)
++') 
++
+ ########################################
+ ## <summary>
+ ##	All of the rules required to administrate 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.6.31/policy/modules/services/snmp.te
+--- nsaserefpolicy/policy/modules/services/snmp.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/snmp.te	2009-09-15 15:34:40.000000000 -0400
+@@ -72,6 +72,8 @@
+ corenet_udp_bind_snmp_port(snmpd_t)
+ corenet_sendrecv_snmp_server_packets(snmpd_t)
+ corenet_tcp_connect_agentx_port(snmpd_t)
++corenet_tcp_bind_agentx_port(snmpd_t)
++corenet_udp_bind_agentx_port(snmpd_t)  
+ 
+ dev_list_sysfs(snmpd_t)
+ dev_read_sysfs(snmpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.31/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.31/policy/modules/services/spamassassin.fc	2009-09-09 15:38:24.000000000 -0400
@@ -23541,7 +23595,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.31/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/modutils.te	2009-09-14 13:14:55.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/system/modutils.te	2009-09-15 15:38:39.000000000 -0400
 @@ -19,6 +19,7 @@
  type insmod_exec_t;
  application_domain(insmod_t, insmod_exec_t)
@@ -23581,7 +23635,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -91,19 +99,21 @@
+@@ -91,19 +99,23 @@
  # insmod local policy
  #
  
@@ -23594,7 +23648,9 @@ diff -b -B --ignore-all-space --exclude-
  
  # Read module config and dependency information
 -allow insmod_t { modules_conf_t modules_dep_t }:file read_file_perms;
++list_dirs_pattern(insmod_t, modules_conf_t, modules_conf_t)
 +read_files_pattern(insmod_t, modules_conf_t, modules_conf_t)
++list_dirs_pattern(insmod_t, modules_dep_t, modules_dep_t)
 +read_files_pattern(insmod_t, modules_dep_t, modules_dep_t)
  
  can_exec(insmod_t, insmod_exec_t)
@@ -23605,7 +23661,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_write_proc_files(insmod_t)
  kernel_mount_debugfs(insmod_t)
  kernel_mount_kvmfs(insmod_t)
-@@ -112,6 +122,7 @@
+@@ -112,6 +124,7 @@
  kernel_read_kernel_sysctls(insmod_t)
  kernel_rw_kernel_sysctl(insmod_t)
  kernel_read_hotplug_sysctls(insmod_t)
@@ -23613,7 +23669,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(insmod_t)
  corecmd_exec_shell(insmod_t)
-@@ -124,9 +135,7 @@
+@@ -124,9 +137,7 @@
  dev_read_sound(insmod_t)
  dev_write_sound(insmod_t)
  dev_rw_apm_bios(insmod_t)
@@ -23624,7 +23680,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_signal_all_domains(insmod_t)
  domain_use_interactive_fds(insmod_t)
-@@ -144,11 +153,14 @@
+@@ -144,11 +155,14 @@
  files_write_kernel_modules(insmod_t)
  
  fs_getattr_xattr_fs(insmod_t)
@@ -23639,7 +23695,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(insmod_t)
  logging_search_logs(insmod_t)
-@@ -157,19 +169,30 @@
+@@ -157,19 +171,30 @@
  
  seutil_read_file_contexts(insmod_t)
  
@@ -23673,7 +23729,7 @@ diff -b -B --ignore-all-space --exclude-
  	hotplug_search_config(insmod_t)
  ')
  
-@@ -228,7 +251,7 @@
+@@ -228,7 +253,7 @@
  can_exec(update_modules_t, update_modules_exec_t)
  
  # manage module loading configuration


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -p -r1.918 -r1.919
--- selinux-policy.spec	15 Sep 2009 18:26:13 -0000	1.918
+++ selinux-policy.spec	15 Sep 2009 21:45:12 -0000	1.919
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.31
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -50,7 +50,7 @@ Url: http://oss.tresys.com/repos/refpoli
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils-python >= %{POLICYCOREUTILSVER} bzip2 
-Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
+Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
 Requires(post): /usr/bin/bunzip2 /bin/mktemp /bin/awk
 Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
 Obsoletes: selinux-policy-devel
@@ -299,7 +299,7 @@ Summary: SELinux targeted base policy
 Provides: selinux-policy-base
 Group: System Environment/Base
 Obsoletes: selinux-policy-targeted-sources < 2
-Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
+Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
 Conflicts:  audispd-plugins <= 1.7.7-1
@@ -353,7 +353,7 @@ exit 0
 Summary: SELinux minimum base policy
 Provides: selinux-policy-base
 Group: System Environment/Base
-Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
+Requires(post): policycoreutils-python >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
 Conflicts:  seedit
@@ -387,7 +387,7 @@ exit 0
 Summary: SELinux olpc base policy
 Group: System Environment/Base
 Provides: selinux-policy-base
-Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
+Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
 Conflicts:  seedit
@@ -419,7 +419,7 @@ Group: System Environment/Base
 Provides: selinux-policy-base
 Obsoletes: selinux-policy-mls-sources < 2
 Requires: policycoreutils-newrole >= %{POLICYCOREUTILSVER} setransd
-Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER}
+Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
 Conflicts:  seedit
@@ -447,6 +447,10 @@ exit 0
 %endif
 
 %changelog
+* Mon Sep 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-5
+- Fix label on /usr/bin/notepad, /usr/sbin/vboxadd-service
+- Remove policycoreutils-python requirement except for minimum
+
 * Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-4
 - Fix devicekit_disk_t to getattr on all domains sockets and fifo_files
 - Conflicts seedit (You can not use selinux-policy-targeted and seedit at the same time.)



From jkeating at fedoraproject.org  Tue Sep 15 21:54:08 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 15 Sep 2009 21:54:08 +0000 (UTC)
Subject: rpms/pungi/devel .cvsignore, 1.68, 1.69 import.log, 1.19,
	1.20 pungi.spec, 1.76, 1.77 sources, 1.71, 1.72
Message-ID: <20090915215408.926E811C00CE@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14674/devel

Modified Files:
	.cvsignore import.log pungi.spec sources 
Log Message:
New upstream release, more fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	15 Sep 2009 00:11:43 -0000	1.68
+++ .cvsignore	15 Sep 2009 21:54:07 -0000	1.69
@@ -1 +1 @@
-pungi-2.0.18.tar.bz2
+pungi-2.0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log	15 Sep 2009 00:11:43 -0000	1.19
+++ import.log	15 Sep 2009 21:54:08 -0000	1.20
@@ -17,3 +17,4 @@ pungi-2_0_15-1_fc11:HEAD:pungi-2.0.15-1.
 pungi-2_0_16-1_fc11:HEAD:pungi-2.0.16-1.fc11.src.rpm:1242927301
 pungi-2_0_17-1_fc11:HEAD:pungi-2.0.17-1.fc11.src.rpm:1249941703
 pungi-2_0_18-1_fc12:HEAD:pungi-2.0.18-1.fc12.src.rpm:1252973400
+pungi-2_0_19-1_fc12:HEAD:pungi-2.0.19-1.fc12.src.rpm:1253051551


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- pungi.spec	15 Sep 2009 00:11:44 -0000	1.76
+++ pungi.spec	15 Sep 2009 21:54:08 -0000	1.77
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.18
+Version:        2.0.19
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Jesse Keating <jkeating at redhat.com> - 2.0.19-1
+- More upstream fixes for pkgorder and selfhosting composes
+
 * Mon Sep 14 2009 Jesse Keating <jkeating at redhat.com> - 2.0.18-1
 - Search for dracut for pkgorder
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	15 Sep 2009 00:11:44 -0000	1.71
+++ sources	15 Sep 2009 21:54:08 -0000	1.72
@@ -1 +1 @@
-fa3d49efb95c12f937aee263502def72  pungi-2.0.18.tar.bz2
+9a5d7d3df5e1045dca75ee4ccb8cc62f  pungi-2.0.19.tar.bz2



From simo at fedoraproject.org  Tue Sep 15 21:55:19 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 15 Sep 2009 21:55:19 +0000 (UTC)
Subject: rpms/libtevent/devel libtevent.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090915215519.0528811C00CE@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16608

Modified Files:
	.cvsignore sources 
Added Files:
	libtevent.spec 
Log Message:
* Sat Sep 8 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-1
- First independent release for tevent 0.9.8 



--- NEW FILE libtevent.spec ---
Name: libtevent
Version: 0.9.8
Release: 1%{?dist}
Group: System Environment/Daemons
Summary: The tevent library
License: LGPLv3+
URL: http://tevent.samba.org/
Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: libtalloc-devel >= 2.0.0

%description
Tevent is an event system based on the talloc memory management library.
Tevent has support for many event types, including timers, signals, and
the classic file descriptor events.
Tevent also provide helpers to deal with asynchronous code providing the
tevent_req (Tevent Request) functions. 

%package devel
Group: Development/Libraries
Summary: Developer tools for the Tevent library
Requires: libtevent = %{version}-%{release}
Requires: libtalloc-devel >= 2.0.0
Requires: pkgconfig

%description devel
Header files needed to develop programs that link against the Tevent library.

%prep
%setup -q -n tevent-%{version}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

ln -s libtevent.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so.0
ln -s libtevent.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so

rm -f $RPM_BUILD_ROOT%{_libdir}/libtevent.a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/libtevent.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/tevent.h
%{_libdir}/libtevent.so
%{_libdir}/pkgconfig/tevent.pc

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Sat Sep 8 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-1
- First independent release for tevent 0.9.8 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:00:22 -0000	1.1
+++ .cvsignore	15 Sep 2009 21:55:18 -0000	1.2
@@ -0,0 +1 @@
+tevent-0.9.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:00:23 -0000	1.1
+++ sources	15 Sep 2009 21:55:18 -0000	1.2
@@ -0,0 +1 @@
+edc29f20fb508b6b860d70f0f07ccd3f  tevent-0.9.8.tar.gz



From otaylor at fedoraproject.org  Tue Sep 15 22:07:47 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue, 15 Sep 2009 22:07:47 +0000 (UTC)
Subject: rpms/gnome-shell/devel .cvsignore, 1.4, 1.5 gnome-shell.spec, 1.7, 
	1.8 sources, 1.4, 1.5
Message-ID: <20090915220748.0D19011C00CE@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26409

Modified Files:
	.cvsignore gnome-shell.spec sources 
Log Message:
* Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
- Update to 2.27.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Sep 2009 00:35:36 -0000	1.4
+++ .cvsignore	15 Sep 2009 22:07:45 -0000	1.5
@@ -1,3 +1,4 @@
 gnome-shell-2.27.0.tar.bz2
 gnome-shell-2.27.1.tar.bz2
 gnome-shell-2.27.2.tar.bz2
+gnome-shell-2.27.3.tar.bz2


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnome-shell.spec	5 Sep 2009 00:42:24 -0000	1.7
+++ gnome-shell.spec	15 Sep 2009 22:07:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        2.27.2
-Release:        2
+Version:        2.27.3
+Release:        1
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -118,6 +118,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
+- Update to 2.27.3
+
 * Fri Sep  4 2009 Owen Taylor <otaylor at redhat.com> - 2.27.2-2
 - Test for gobject-introspection version should be >= not >
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Sep 2009 00:35:37 -0000	1.4
+++ sources	15 Sep 2009 22:07:45 -0000	1.5
@@ -1 +1 @@
-a24dfca62f92623ceaca66bdc99ceda1  gnome-shell-2.27.2.tar.bz2
+3b198ac1d5b72d2a04da82ed548249d6  gnome-shell-2.27.3.tar.bz2



From myoung at fedoraproject.org  Tue Sep 15 23:03:47 2009
From: myoung at fedoraproject.org (myoung)
Date: Tue, 15 Sep 2009 23:03:47 +0000 (UTC)
Subject: rpms/kernel/devel branch, 1.1.2.3, 1.1.2.4 kernel.spec, 1.1294.2.66,
	1.1294.2.67 xen.pvops.post.patch, 1.1.2.26, 1.1.2.27
Message-ID: <20090915230349.2C36111C0261@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30108

Modified Files:
      Tag: private-myoung-dom0-branch
	branch kernel.spec xen.pvops.post.patch 
Log Message:
test a pvops fix and correct the branch label



Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/branch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- branch	24 Apr 2009 22:27:04 -0000	1.1.2.3
+++ branch	15 Sep 2009 23:03:20 -0000	1.1.2.4
@@ -1 +1 @@
-devel
+F-12


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.66
retrieving revision 1.1294.2.67
diff -u -p -r1.1294.2.66 -r1.1294.2.67
--- kernel.spec	15 Sep 2009 19:45:39 -0000	1.1294.2.66
+++ kernel.spec	15 Sep 2009 23:03:21 -0000	1.1294.2.67
@@ -2051,6 +2051,7 @@ fi
 %changelog
 * Tue Sep 15 2009 Michael Young <m.a.young at durham.ac.uk>
 - switch to the F-12 branch for the moment
+- try an NX related fix
 
 * Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/mm/Makefile                  |    1 +
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/arch/x86/xen/enlighten.c              |   10 +++++-----
 b/include/linux/swiotlb.h               |    1 +
 drivers/pci/pci.h                       |    2 ++
 7 files changed, 30 insertions(+), 5 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -p -r1.1.2.26 -r1.1.2.27
--- xen.pvops.post.patch	5 Sep 2009 19:00:27 -0000	1.1.2.26
+++ xen.pvops.post.patch	15 Sep 2009 23:03:23 -0000	1.1.2.27
@@ -80,3 +80,43 @@ index cb1a663..f4ebffb 100644
  
  struct device;
  struct dma_attrs;
+diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
+index 72bb3a2..0088329 100644
+--- a/arch/x86/mm/Makefile
++++ b/arch/x86/mm/Makefile
+@@ -4,6 +4,7 @@ obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
+ # Make sure __phys_addr has no stackprotector
+ nostackp := $(call cc-option, -fno-stack-protector)
+ CFLAGS_physaddr.o		:= $(nostackp)
++CFLAGS_init.o			:= $(nostackp)
+ 
+ obj-$(CONFIG_SMP)		+= tlb.o
+ 
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 03644f9..5b55c92 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -1092,6 +1092,11 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	__supported_pte_mask |= _PAGE_IOMAP;
+ 
++#ifdef CONFIG_X86_64
++	/* Work out if we support NX */
++	check_efer();
++#endif
++
+ 	xen_setup_features();
+ 
+ 	/* Get mfn list */
+@@ -1132,11 +1137,6 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	pgd = (pgd_t *)xen_start_info->pt_base;
+ 
+-#ifdef CONFIG_X86_64
+-	/* Work out if we support NX */
+-	check_efer();
+-#endif
+-
+ 	/* Don't do the full vcpu_info placement stuff until we have a
+ 	   possible map and a non-dummy shared_info. */
+ 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];



From rdieter at fedoraproject.org  Tue Sep 15 23:42:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 15 Sep 2009 23:42:43 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.139,1.140
Message-ID: <20090915234244.0404411C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7747

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
- restore some previously inadvertantly omitted nepomuk ontologies



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- kdebase-runtime.spec	2 Sep 2009 08:04:43 -0000	1.139
+++ kdebase-runtime.spec	15 Sep 2009 23:42:42 -0000	1.140
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -129,8 +129,9 @@ install -p -D %{SOURCE1} %{buildroot}%{_
 rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
 # file conflicts with kdepim
-rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
-      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
+#rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
+#      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
+
 
 %clean
 rm -rf %{buildroot}
@@ -213,7 +214,10 @@ fi
 
 
 %changelog
-* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
+- restore some previously inadvertantly omitted nepomuk ontologies
+
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 
 * Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4



From rdieter at fedoraproject.org  Tue Sep 15 23:57:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 15 Sep 2009 23:57:38 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.140,1.141
Message-ID: <20090915235739.5B3BD11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648

Modified Files:
	kdebase-runtime.spec 
Log Message:
drop crud



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- kdebase-runtime.spec	15 Sep 2009 23:42:42 -0000	1.140
+++ kdebase-runtime.spec	15 Sep 2009 23:57:30 -0000	1.141
@@ -128,10 +128,6 @@ install -p -D %{SOURCE1} %{buildroot}%{_
 # FIXME: -devel type files, omit for now
 rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
-# file conflicts with kdepim
-#rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
-#      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
-
 
 %clean
 rm -rf %{buildroot}



From jkeating at fedoraproject.org  Tue Sep 15 23:58:25 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 15 Sep 2009 23:58:25 +0000 (UTC)
Subject: rpms/pungi/devel .cvsignore, 1.69, 1.70 import.log, 1.20,
	1.21 pungi.spec, 1.77, 1.78 sources, 1.72, 1.73
Message-ID: <20090915235825.7A56511C00CE@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22616/devel

Modified Files:
	.cvsignore import.log pungi.spec sources 
Log Message:
More upstream fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	15 Sep 2009 21:54:07 -0000	1.69
+++ .cvsignore	15 Sep 2009 23:58:23 -0000	1.70
@@ -1 +1 @@
-pungi-2.0.19.tar.bz2
+pungi-2.0.20.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- import.log	15 Sep 2009 21:54:08 -0000	1.20
+++ import.log	15 Sep 2009 23:58:24 -0000	1.21
@@ -18,3 +18,4 @@ pungi-2_0_16-1_fc11:HEAD:pungi-2.0.16-1.
 pungi-2_0_17-1_fc11:HEAD:pungi-2.0.17-1.fc11.src.rpm:1249941703
 pungi-2_0_18-1_fc12:HEAD:pungi-2.0.18-1.fc12.src.rpm:1252973400
 pungi-2_0_19-1_fc12:HEAD:pungi-2.0.19-1.fc12.src.rpm:1253051551
+pungi-2_0_20-1_fc12:HEAD:pungi-2.0.20-1.fc12.src.rpm:1253058966


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- pungi.spec	15 Sep 2009 21:54:08 -0000	1.77
+++ pungi.spec	15 Sep 2009 23:58:24 -0000	1.78
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.19
+Version:        2.0.20
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Jesse Keating <jkeating at redhat.com> - 2.0.20-1
+- One more upstream pkgorder fix
+
 * Tue Sep 15 2009 Jesse Keating <jkeating at redhat.com> - 2.0.19-1
 - More upstream fixes for pkgorder and selfhosting composes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	15 Sep 2009 21:54:08 -0000	1.72
+++ sources	15 Sep 2009 23:58:24 -0000	1.73
@@ -1 +1 @@
-9a5d7d3df5e1045dca75ee4ccb8cc62f  pungi-2.0.19.tar.bz2
+f8f5870b41afa8d33acb9aac3c597bf5  pungi-2.0.20.tar.bz2



From rdieter at fedoraproject.org  Tue Sep 15 23:58:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 15 Sep 2009 23:58:44 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.119,1.120
Message-ID: <20090915235844.79C9311C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24643

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
- restore some previously inadvertantly omitted nepomuk ontologies



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- kdebase-runtime.spec	3 Sep 2009 21:58:16 -0000	1.119
+++ kdebase-runtime.spec	15 Sep 2009 23:58:42 -0000	1.120
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -128,9 +128,6 @@ install -p -D %{SOURCE1} %{buildroot}%{_
 # FIXME: -devel type files, omit for now
 rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
-# file conflicts with kdepim
-rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
-      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
 
 %clean
 rm -rf %{buildroot}
@@ -213,7 +210,10 @@ fi
 
 
 %changelog
-* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
+- restore some previously inadvertantly omitted nepomuk ontologies
+
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 
 * Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4



From rdieter at fedoraproject.org  Tue Sep 15 23:59:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 15 Sep 2009 23:59:43 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.96,1.97
Message-ID: <20090915235943.7C2AD11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25604

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
- restore some previously inadvertantly omitted nepomuk ontologies



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kdebase-runtime.spec	3 Sep 2009 21:56:37 -0000	1.96
+++ kdebase-runtime.spec	15 Sep 2009 23:59:40 -0000	1.97
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -128,9 +128,6 @@ install -p -D %{SOURCE1} %{buildroot}%{_
 # FIXME: -devel type files, omit for now
 rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
-# file conflicts with kdepim
-rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
-      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
 
 %clean
 rm -rf %{buildroot}
@@ -213,7 +210,10 @@ fi
 
 
 %changelog
-* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
+- restore some previously inadvertantly omitted nepomuk ontologies
+
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 
 * Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4



From dcantrel at fedoraproject.org  Wed Sep 16 00:17:38 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 16 Sep 2009 00:17:38 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.667, 1.668 anaconda.spec, 1.817, 
	1.818 sources, 1.801, 1.802
Message-ID: <20090916001738.959E211C00CE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10373

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Sep 15 2009 David Cantrell <dcantrell at redhat.com> - 12.25-1
- Use pyblock for device-mapper devices' status. (dlehman)
- load_policy has moved from /usr/sbin to /sbin (#523506). (clumens)
- Collect all modules from modules.{ccwmap|networking} on s390x (#522519)
  (dcantrell)
- Copy cmsfscat from /usr/sbin, not /usr/bin. (dcantrell)
- Remove duplicate search_cu() in linuxrc.s390 (dcantrell)
- Try harder to stop mdraid arrays (hdegoede)
- Log when we are skipping disks without media (hdegoede)
- Don't scan stopped md devices (hdegoede)
- Make udev_get_block_device() return None on failure (hdegoede)
- Do not pass --update=super-minor to mdadm for containers and sets there in
  (hdegoede)
- Write mdadm.conf lines for mdraid container formats (imsm) (hdegoede)
- Really put appended kernel cmdline arguments at the end (hdegoede)
- Install dracut-network when using network storage (hdegoede)
- Make recreateInitrd() generate a dracut initrd (hdegoede)
- Use type of device rather than name in booty target selection. (hdegoede)
- write netroot=fcoe:... to kernel cmdline in grub.conf for dracut (hdegoede)
- write ifname=eth#:MAC to kernel cmdline in grub.conf for dracut (hdegoede)
- write iscsi initiator name to kernel cmdline in grub.conf for dracut
  (hdegoede)
- Make iswmd the default (hdegoede)
- Use new icons in anaconda so we don't look so dated (#515601). (clumens)
- Prevent infinite loop in doClearPartitionedDevice. (dlehman)
- Rename doDeleteDependentDevices to doClearPartitionedDevice for clarity.
  (dlehman)
- Handle Esc keypress in dialogs as Cancel (#520110). (rvykydal)
- Don't use baseurl containing space in yum repo object (#516042). (rvykydal)
- Add escrow support (mitr)
- Add python-{nss,volume_key} to stage2, volume_key to rescue (mitr)
- Update for pykickstart with escrow support (mitr)
- Fix --encrypted when creating volumes in kickstart (mitr)
- Remove the "Remove dmraid Device" button, which isn't even hooked up.
  (clumens)
- Require the right version of system-config-date (#523107). (clumens)
- Fix setting of "Add repository" dialog title. (rvykydal)
- Update state and name of repository in list after editing. (rvykydal)
- Fix busy cursor in repo editing (#518529) (rvykydal)
- Fix busy cursor stack popping when creating formats (#518529). (rvykydal)
- Remove partitions in reverse order when clearing disks. (dlehman)
- Improve the info provided to DeviceAction.__str__. (dlehman)
- Include device id in log lines since partitions can get renumbered.
  (dlehman)
- Don't try to preserve old format attrs when reinitializing pvs. (dlehman)
- remove the no longer used initcb and initlabel DiskDevice.__init__
  arguments (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -p -r1.667 -r1.668
--- .cvsignore	10 Sep 2009 21:19:55 -0000	1.667
+++ .cvsignore	16 Sep 2009 00:17:36 -0000	1.668
@@ -1,2 +1 @@
-anaconda-12.23.tar.bz2
-anaconda-12.24.tar.bz2
+anaconda-12.25.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -p -r1.817 -r1.818
--- anaconda.spec	10 Sep 2009 21:19:55 -0000	1.817
+++ anaconda.spec	16 Sep 2009 00:17:36 -0000	1.818
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.24
+Version: 12.25
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -33,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define yumver 2.9.2
 %define partedver 1.8.1
 %define pypartedver 2.1.2
-%define syscfgdatever 1.9.0
+%define syscfgdatever 1.9.48
 %define pythonpyblockver 0.24-1
 %define libbdevidver 5.1.2-1
 %define e2fsver 1.41.0
@@ -214,6 +214,54 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Sep 15 2009 David Cantrell <dcantrell at redhat.com> - 12.25-1
+- Use pyblock for device-mapper devices' status. (dlehman)
+- load_policy has moved from /usr/sbin to /sbin (#523506). (clumens)
+- Collect all modules from modules.{ccwmap|networking} on s390x (#522519)
+  (dcantrell)
+- Copy cmsfscat from /usr/sbin, not /usr/bin. (dcantrell)
+- Remove duplicate search_cu() in linuxrc.s390 (dcantrell)
+- Try harder to stop mdraid arrays (hdegoede)
+- Log when we are skipping disks without media (hdegoede)
+- Don't scan stopped md devices (hdegoede)
+- Make udev_get_block_device() return None on failure (hdegoede)
+- Do not pass --update=super-minor to mdadm for containers and sets there in
+  (hdegoede)
+- Write mdadm.conf lines for mdraid container formats (imsm) (hdegoede)
+- Really put appended kernel cmdline arguments at the end (hdegoede)
+- Install dracut-network when using network storage (hdegoede)
+- Make recreateInitrd() generate a dracut initrd (hdegoede)
+- Use type of device rather than name in booty target selection. (hdegoede)
+- write netroot=fcoe:... to kernel cmdline in grub.conf for dracut (hdegoede)
+- write ifname=eth#:MAC to kernel cmdline in grub.conf for dracut (hdegoede)
+- write iscsi initiator name to kernel cmdline in grub.conf for dracut
+  (hdegoede)
+- Make iswmd the default (hdegoede)
+- Use new icons in anaconda so we don't look so dated (#515601). (clumens)
+- Prevent infinite loop in doClearPartitionedDevice. (dlehman)
+- Rename doDeleteDependentDevices to doClearPartitionedDevice for clarity.
+  (dlehman)
+- Handle Esc keypress in dialogs as Cancel (#520110). (rvykydal)
+- Don't use baseurl containing space in yum repo object (#516042). (rvykydal)
+- Add escrow support (mitr)
+- Add python-{nss,volume_key} to stage2, volume_key to rescue (mitr)
+- Update for pykickstart with escrow support (mitr)
+- Fix --encrypted when creating volumes in kickstart (mitr)
+- Remove the "Remove dmraid Device" button, which isn't even hooked up.
+  (clumens)
+- Require the right version of system-config-date (#523107). (clumens)
+- Fix setting of "Add repository" dialog title. (rvykydal)
+- Update state and name of repository in list after editing. (rvykydal)
+- Fix busy cursor in repo editing (#518529) (rvykydal)
+- Fix busy cursor stack popping when creating formats (#518529). (rvykydal)
+- Remove partitions in reverse order when clearing disks. (dlehman)
+- Improve the info provided to DeviceAction.__str__. (dlehman)
+- Include device id in log lines since partitions can get renumbered.
+  (dlehman)
+- Don't try to preserve old format attrs when reinitializing pvs. (dlehman)
+- remove the no longer used initcb and initlabel DiskDevice.__init__
+  arguments (hdegoede)
+
 * Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> - 12.24-1
 - dmidecode is in /usr/sbin, not /usr/bin. (clumens)
 - Add cmsfscat to the initrd on s390 as well (#522535). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -p -r1.801 -r1.802
--- sources	10 Sep 2009 21:19:55 -0000	1.801
+++ sources	16 Sep 2009 00:17:37 -0000	1.802
@@ -1 +1 @@
-4cdda8aeb360ee8d30faa747d77a0533  anaconda-12.24.tar.bz2
+2f7b7b77418b5dd057045f7ebd359ebf  anaconda-12.25.tar.bz2



From rdieter at fedoraproject.org  Wed Sep 16 00:28:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 00:28:34 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.17, 1.18
Message-ID: <20090916002834.E6B0D11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21607

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
- Epoch: 1



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kde-plasma-networkmanagement.spec	28 Aug 2009 18:35:29 -0000	1.17
+++ kde-plasma-networkmanagement.spec	16 Sep 2009 00:28:32 -0000	1.18
@@ -5,8 +5,9 @@ We still recommend nm-applet from Networ
 
 Name:           kde-plasma-networkmanagement
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
+Epoch:          1
 Version:        0.8
-Release:        0.21.20090815svn%{?dist}
+Release:        0.22.20090815svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet 
@@ -32,7 +33,7 @@ Requires: NetworkManager
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
 
-Requires: knetworkmanager = %{version}-%{release}
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
@@ -42,7 +43,7 @@ the default NetworkManager service. 
 %package -n knetworkmanager
 Summary: NetworkManager KDE 4 integration 
 Group: Applications/Internet
-Requires: knetworkmanager-libs%{?_isa} = %{version}-%{release}
+Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
@@ -51,7 +52,7 @@ connections on systems that use the Netw
 %package -n knetworkmanager-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: knetworkmanager = %{version}-%{release}
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
 %description -n knetworkmanager-libs
 %{summary}.
@@ -59,10 +60,10 @@ Requires: knetworkmanager = %{version}-%
 %package -n knetworkmanager-openvpn
 Summary:        OpenVPN support for knetworkmanager
 Group:          Applications/Internet 
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
-Obsoletes:      kde-plasma-networkmanagement-openvpn < %{version}-%{release}
-Provides:       kde-plasma-networkmanagement-openvpn = %{version}-%{release} 
+Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager-openvpn
 %{summary}.
 %{?disclaimer}
@@ -70,10 +71,10 @@ Provides:       kde-plasma-networkmanage
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
 Group:          Applications/Internet 
-Requires:       knetworkmanager = %{version}-%{release}
+Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
-Obsoletes:      kde-plasma-networkmanagement-vpnc < %{version}-%{release}
-Provides:       kde-plasma-networkmanagement-vpnc = %{version}-%{release}
+Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
 %description -n knetworkmanager-vpnc
 %{summary}.
 %{?disclaimer}
@@ -175,6 +176,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
+- Epoch: 1
+
 * Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
 - use knetworkmanager pkg names
 - quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path 



From rdieter at fedoraproject.org  Wed Sep 16 00:32:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 00:32:55 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-11
	kde-plasma-networkmanagement.spec, 1.8, 1.9
Message-ID: <20090916003255.2E3A011C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24510

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
- Epoch: 1



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kde-plasma-networkmanagement.spec	28 Aug 2009 18:38:05 -0000	1.8
+++ kde-plasma-networkmanagement.spec	16 Sep 2009 00:32:54 -0000	1.9
@@ -5,8 +5,9 @@ We still recommend nm-applet from Networ
 
 Name:           kde-plasma-networkmanagement
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
+Epoch:          1
 Version:        0.8
-Release:        0.21.20090815svn%{?dist}
+Release:        0.22.20090815svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet 
@@ -32,7 +33,7 @@ Requires: NetworkManager
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
 
-Requires: knetworkmanager = %{version}-%{release}
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
@@ -42,7 +43,7 @@ the default NetworkManager service. 
 %package -n knetworkmanager
 Summary: NetworkManager KDE 4 integration 
 Group: Applications/Internet
-Requires: knetworkmanager-libs%{?_isa} = %{version}-%{release}
+Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
@@ -51,7 +52,7 @@ connections on systems that use the Netw
 %package -n knetworkmanager-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: knetworkmanager = %{version}-%{release}
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
 %description -n knetworkmanager-libs
 %{summary}.
@@ -59,10 +60,10 @@ Requires: knetworkmanager = %{version}-%
 %package -n knetworkmanager-openvpn
 Summary:        OpenVPN support for knetworkmanager
 Group:          Applications/Internet 
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
-Obsoletes:      kde-plasma-networkmanagement-openvpn < %{version}-%{release}
-Provides:       kde-plasma-networkmanagement-openvpn = %{version}-%{release} 
+Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager-openvpn
 %{summary}.
 %{?disclaimer}
@@ -70,10 +71,10 @@ Provides:       kde-plasma-networkmanage
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
 Group:          Applications/Internet 
-Requires:       knetworkmanager = %{version}-%{release}
+Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
-Obsoletes:      kde-plasma-networkmanagement-vpnc < %{version}-%{release}
-Provides:       kde-plasma-networkmanagement-vpnc = %{version}-%{release}
+Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
 %description -n knetworkmanager-vpnc
 %{summary}.
 %{?disclaimer}
@@ -175,6 +176,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
+- Epoch: 1
+
 * Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
 - use knetworkmanager pkg names
 - quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path 



From emaldonado at fedoraproject.org  Wed Sep 16 01:09:36 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 16 Sep 2009 01:09:36 +0000 (UTC)
Subject: rpms/nss/F-11 nss.spec,1.75,1.76
Message-ID: <20090916010938.5899011C0337@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6529

Modified Files:
	nss.spec 
Log Message:
Sign nsslibdm3.so, fixes inability to toggle fips mode when using legacy db, rhbz#483855


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- nss.spec	7 Sep 2009 21:40:30 -0000	1.75
+++ nss.spec	16 Sep 2009 01:09:31 -0000	1.76
@@ -8,12 +8,13 @@
     %{__os_install_post} \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
 %{nil}
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -251,7 +252,7 @@ do
 done
 
 # Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk
+for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
 do
   ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
@@ -306,6 +307,7 @@ done
 /%{_lib}/libnss3.so
 /%{_lib}/libnssutil3.so
 /%{_lib}/libnssdbm3.so
+/%{_lib}/libnssdbm3.chk
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
 /%{_lib}/libsoftokn3.so
@@ -354,6 +356,7 @@ done
 %{_libdir}/libnss3.so
 %{_libdir}/libnssutil3.so
 %{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
 %{_libdir}/libsoftokn3.so
@@ -468,6 +471,9 @@ done
 
 
 %changelog
+* Tue Sep 15 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
+- Fix inability to toggle fips mode when using legacy db - 483855
+
 * Mon Sep 07 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
 - Update to 3.12.4
 - Update the nss pem enabling source archive to roll in bug fixes



From pgordon at fedoraproject.org  Wed Sep 16 02:50:16 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed, 16 Sep 2009 02:50:16 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore, 1.13, 1.14 midori.spec, 1.26,
	1.27 sources, 1.13, 1.14
Message-ID: <20090916025017.8DB8C11C0335@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32605

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Aug 2009 04:30:25 -0000	1.13
+++ .cvsignore	16 Sep 2009 02:50:07 -0000	1.14
@@ -1 +1 @@
-midori-0.1.9.tar.bz2
+midori-0.1.10.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- midori.spec	6 Aug 2009 07:01:35 -0000	1.26
+++ midori.spec	16 Sep 2009 02:50:10 -0000	1.27
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.9
+Version:	0.1.10
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -101,6 +101,12 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.10-1
+- Update to new upstream release (0.1.10): Updated AdBlock for WebKitGTK+
+  1.1.14, improved address completion, fixes for tab and feed handling, better
+  desktop integration, and Undo/Redo support - among other bugfixes and
+  enhancements.
+
 * Wed Aug 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.9-1
 - Update to new upstream release (0.1.9): lots of fixes and updates for tab
   functionality and the tab panel, as well as menu fixes, and enhancements


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Aug 2009 04:30:25 -0000	1.13
+++ sources	16 Sep 2009 02:50:10 -0000	1.14
@@ -1 +1 @@
-faf5295091f47372352840b84c422149  midori-0.1.9.tar.bz2
+97b6a3a3ccb8458c68c335b2ee8e9197  midori-0.1.10.tar.bz2



From jcollie at fedoraproject.org  Wed Sep 16 03:10:38 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 16 Sep 2009 03:10:38 +0000 (UTC)
Subject: rpms/pitivi/devel .cvsignore, 1.18, 1.19 pitivi.spec, 1.39,
	1.40 sources, 1.18, 1.19
Message-ID: <20090916031038.474A111C0335@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15144

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Mon Sep 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-1
- 0.13.3 Release : ... we shall never (sur)render
-
- The PiTiVi team is proud to announce the second release in the
- unstable 0.13 PiTiVi series.
-
- Due to its dependency on GStreamer, The PiTiVi team strongly
- recommends users have all official latest gstreamer libraries and
- plugins installed for the best user experience.
-
- Title is from a quote by Winston Churchill ?We shall defend our
- island, whatever the cost may be, we shall fight on the beaches, we
- shall fight on the landing grounds, we shall fight in the fields and
- in the streets, we shall fight in the hills; we shall never
- surrender.?
-
- Features of this release
-
-    * Fix rendering failures
-    * UI beautifications
-    * Switch to themeable ruler
-    * Speed optimisations
-    * Show the project name in the window title 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Aug 2009 03:30:27 -0000	1.18
+++ .cvsignore	16 Sep 2009 03:10:35 -0000	1.19
@@ -1 +1 @@
-pitivi-0.13.2.2.tar.bz2
+pitivi-0.13.3.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- pitivi.spec	30 Aug 2009 03:30:28 -0000	1.39
+++ pitivi.spec	16 Sep 2009 03:10:36 -0000	1.40
@@ -1,8 +1,8 @@
 %define major   0.13
-%define minor   2.2
+%define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -75,12 +75,36 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING NEWS
 %{_bindir}/pitivi
 %{_datadir}/pitivi
-%{_datadir}/pixmaps/*
+#%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/pitivi.*
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Mon Sep 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-1
+- 0.13.3 Release : ... we shall never (sur)render
+-
+- The PiTiVi team is proud to announce the second release in the
+- unstable 0.13 PiTiVi series.
+-
+- Due to its dependency on GStreamer, The PiTiVi team strongly
+- recommends users have all official latest gstreamer libraries and
+- plugins installed for the best user experience.
+-
+- Title is from a quote by Winston Churchill ?We shall defend our
+- island, whatever the cost may be, we shall fight on the beaches, we
+- shall fight on the landing grounds, we shall fight in the fields and
+- in the streets, we shall fight in the hills; we shall never
+- surrender.?
+-
+- Features of this release
+-
+-    * Fix rendering failures
+-    * UI beautifications
+-    * Switch to themeable ruler
+-    * Speed optimisations
+-    * Show the project name in the window title 
+
 * Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2.2-0.1
 - Update to prerelease for 0.13.3
 - Streamline BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	30 Aug 2009 03:30:28 -0000	1.18
+++ sources	16 Sep 2009 03:10:36 -0000	1.19
@@ -1 +1 @@
-aeffb61cfed1c216798312e51ca2bac9  pitivi-0.13.2.2.tar.bz2
+ef9385f74173ddeb5bb10389c46d442a  pitivi-0.13.3.tar.bz2



From dchen at fedoraproject.org  Wed Sep 16 03:39:50 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Sep 2009 03:39:50 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.20, 1.21 ibus-chewing.spec,
	1.24, 1.25 import.log, 1.15, 1.16 sources, 1.21, 1.22
Message-ID: <20090916033950.9385911C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29789/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 IBus upstream issue 484   Pack the gob2 generation source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	24 Jun 2009 00:31:34 -0000	1.20
+++ .cvsignore	16 Sep 2009 03:39:47 -0000	1.21
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090624-Source.tar.gz
+ibus-chewing-1.2.0.20090916-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ibus-chewing.spec	25 Jul 2009 03:01:42 -0000	1.24
+++ ibus-chewing.spec	16 Sep 2009 03:39:47 -0000	1.25
@@ -1,6 +1,6 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090624
-Release:    2%{?dist}
+Version:    1.2.0.20090916
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -17,7 +17,6 @@ BuildRequires:  gob2
 BuildRequires:  libchewing-devel >= 0.3.2-4
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
-BuildRequires:  libX11-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
 Requires:  libchewing >= 0.3.2-4
@@ -33,8 +32,9 @@ libchewing.
 %setup -q -n %{name}-%{version}-Source
 
 %build
-%cmake -DCMAKE_INSTALL_PREFIX=%{_usr}
-make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
+# $RPM_OPT_FLAGS should be  loaded from cmake macro.
+%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
+make VERBOSE=1  %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,10 +77,27 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090916-1
+- Addressed Upstream (IBUS Google code) issue 484:
+  + Find the source that why the / and . are not working.
+- Pack the gob2 generation source to avoid the [Bug 519108]:
+  [gob2] class and enum names convert incorrectly in mock / koji.
+
+* Wed Sep 09 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090831-1
+- IBusProperty and IBusPropList are free upon destruction.
+- Fixed Red Hat Bugzilla [Bug 519328] [ibus-chewing] inconsistent between normal mode and plain Zhuyin mode.
+- Addressed Upstream (IBUS Google code) issue 484:
+  Arithmetic symbols (+-*/) on number pad does not input properly.
+
+* Wed Aug 26 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090818-1
+- Merged 1.2 and 1.1 source code.
+- Addressed Upstream (IBUS Google code) issue 471.
+- Remove libX11 dependency.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090624-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Jun 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090624-1
+* Fri Jul 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090624-1
 - Lookup table now shows the selection key.
 
 * Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090622-1
@@ -181,6 +198,3 @@ Fix the errors which Funda Wang as point
 
 
 
-
-
-


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	24 Jun 2009 00:31:34 -0000	1.15
+++ import.log	16 Sep 2009 03:39:47 -0000	1.16
@@ -13,3 +13,4 @@ ibus-chewing-1_0_10_20090522-1_fc11:HEAD
 ibus-chewing-1_0_10_20090523-1_fc11:HEAD:ibus-chewing-1.0.10.20090523-1.fc11.src.rpm:1242969995
 ibus-chewing-1_0_10_20090523-2_fc11:HEAD:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242973464
 ibus-chewing-1_2_0_20090624-1_fc11:HEAD:ibus-chewing-1.2.0.20090624-1.fc11.src.rpm:1245803467
+ibus-chewing-1_2_0_20090916-1_fc11:HEAD:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253071014


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Jun 2009 00:31:34 -0000	1.21
+++ sources	16 Sep 2009 03:39:47 -0000	1.22
@@ -1 +1 @@
-191289eaad54626d948b82c6412d056d  ibus-chewing-1.2.0.20090624-Source.tar.gz
+cc593bdb4a5254645960fdef3f35dcce  ibus-chewing-1.2.0.20090916-Source.tar.gz



From dchen at fedoraproject.org  Wed Sep 16 03:45:47 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Sep 2009 03:45:47 +0000 (UTC)
Subject: rpms/ibus-chewing/F-10 .cvsignore, 1.11, 1.12 ibus-chewing.spec,
	1.12, 1.13 import.log, 1.7, 1.8 sources, 1.13, 1.14
Message-ID: <20090916034547.0DC1C11C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv498/F-10

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 IBus upstream issue 484   Pack the gob2 generation source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 May 2009 05:36:11 -0000	1.11
+++ .cvsignore	16 Sep 2009 03:45:42 -0000	1.12
@@ -1 +1 @@
-ibus-chewing-1.0.10.20090523-Source.tar.gz
+ibus-chewing-1.2.0.20090916-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ibus-chewing.spec	22 May 2009 06:35:42 -0000	1.12
+++ ibus-chewing.spec	16 Sep 2009 03:45:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:       ibus-chewing
-Version:    1.0.10.20090523
-Release:    2%{?dist}
+Version:    1.2.0.20090916
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -17,7 +17,6 @@ BuildRequires:  gob2
 BuildRequires:  libchewing-devel >= 0.3.2-4
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
-BuildRequires:  libX11-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
 Requires:  libchewing >= 0.3.2-4
@@ -33,8 +32,9 @@ libchewing.
 %setup -q -n %{name}-%{version}-Source
 
 %build
-%cmake -DCMAKE_INSTALL_PREFIX=%{_usr}
-make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
+# $RPM_OPT_FLAGS should be  loaded from cmake macro.
+%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
+make VERBOSE=1  %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +77,32 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090916-1
+- Addressed Upstream (IBUS Google code) issue 484:
+  + Find the source that why the / and . are not working.
+- Pack the gob2 generation source to avoid the [Bug 519108]:
+  [gob2] class and enum names convert incorrectly in mock / koji.
+
+* Wed Sep 09 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090831-1
+- IBusProperty and IBusPropList are free upon destruction.
+- Fixed Red Hat Bugzilla [Bug 519328] [ibus-chewing] inconsistent between normal mode and plain Zhuyin mode.
+- Addressed Upstream (IBUS Google code) issue 484:
+  Arithmetic symbols (+-*/) on number pad does not input properly.
+
+* Wed Aug 26 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090818-1
+- Merged 1.2 and 1.1 source code.
+- Addressed Upstream (IBUS Google code) issue 471.
+- Remove libX11 dependency.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090624-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090624-1
+- Lookup table now shows the selection key.
+
+* Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090622-1
+- Update to 1.2.0.20090622.
+
 * Fri May 22 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.10.20090523-2
 - Add back the export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
@@ -172,5 +198,3 @@ Fix the errors which Funda Wang as point
 
 
 
-
-


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	22 May 2009 06:35:42 -0000	1.7
+++ import.log	16 Sep 2009 03:45:42 -0000	1.8
@@ -5,3 +5,4 @@ ibus-chewing-0_1_1_20090129-1_fc10:F-10:
 ibus-chewing-0_1_1_20090129-2_fc10:F-10:ibus-chewing-0.1.1.20090129-2.fc10.src.rpm:1236650663
 ibus-chewing-1_0_10_20090523-1_fc11:F-10:ibus-chewing-1.0.10.20090523-1.fc11.src.rpm:1242970551
 ibus-chewing-1_0_10_20090523-2_fc11:F-10:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242973527
+ibus-chewing-1_2_0_20090916-1_fc11:F-10:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253072451


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 May 2009 06:35:42 -0000	1.13
+++ sources	16 Sep 2009 03:45:42 -0000	1.14
@@ -1 +1 @@
-7cc0eada9c3ac7a77708f092a342d4cc  ibus-chewing-1.0.10.20090523-Source.tar.gz
+cc593bdb4a5254645960fdef3f35dcce  ibus-chewing-1.2.0.20090916-Source.tar.gz



From dchen at fedoraproject.org  Wed Sep 16 03:47:39 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Sep 2009 03:47:39 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.20, 1.21 ibus-chewing.spec,
	1.23, 1.24 import.log, 1.16, 1.17 sources, 1.21, 1.22
Message-ID: <20090916034739.4324E11C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1941/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 IBus upstream issue 484   Pack the gob2 generation source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	31 Aug 2009 07:32:37 -0000	1.20
+++ .cvsignore	16 Sep 2009 03:47:36 -0000	1.21
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090831-Source.tar.gz
+ibus-chewing-1.2.0.20090916-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ibus-chewing.spec	31 Aug 2009 07:32:38 -0000	1.23
+++ ibus-chewing.spec	16 Sep 2009 03:47:37 -0000	1.24
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090831
+Version:    1.2.0.20090916
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,13 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Mon Aug 31 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090831-1
+* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090916-1
+- Addressed Upstream (IBUS Google code) issue 484:
+  + Find the source that why the / and . are not working.
+- Pack the gob2 generation source to avoid the [Bug 519108]:
+  [gob2] class and enum names convert incorrectly in mock / koji.
+
+* Wed Sep 09 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090831-1
 - IBusProperty and IBusPropList are free upon destruction.
 - Fixed Red Hat Bugzilla [Bug 519328] [ibus-chewing] inconsistent between normal mode and plain Zhuyin mode.
 - Addressed Upstream (IBUS Google code) issue 484:
@@ -192,8 +198,3 @@ Fix the errors which Funda Wang as point
 
 
 
-
-
-
-
-


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	31 Aug 2009 07:32:38 -0000	1.16
+++ import.log	16 Sep 2009 03:47:37 -0000	1.17
@@ -14,3 +14,4 @@ ibus-chewing-1_0_10_20090523-1_fc11:F-11
 ibus-chewing-1_0_10_20090523-2_fc11:F-11:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242974190
 ibus-chewing-1_2_0_20090818-1_fc11:F-11:ibus-chewing-1.2.0.20090818-1.fc11.src.rpm:1250580564
 ibus-chewing-1_2_0_20090831-1_fc11:F-11:ibus-chewing-1.2.0.20090831-1.fc11.src.rpm:1251703942
+ibus-chewing-1_2_0_20090916-1_fc11:F-11:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253072780


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	31 Aug 2009 07:32:38 -0000	1.21
+++ sources	16 Sep 2009 03:47:37 -0000	1.22
@@ -1 +1 @@
-516b880189475ebe0a930dd1c3d2bb72  ibus-chewing-1.2.0.20090831-Source.tar.gz
+cc593bdb4a5254645960fdef3f35dcce  ibus-chewing-1.2.0.20090916-Source.tar.gz



From jcollie at fedoraproject.org  Wed Sep 16 04:16:06 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 16 Sep 2009 04:16:06 +0000 (UTC)
Subject: rpms/pitivi/F-11 .cvsignore, 1.18, 1.19 pitivi.spec, 1.40,
	1.41 sources, 1.18, 1.19
Message-ID: <20090916041607.4D89111C00CE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18977

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Mon Sep 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-1
- 0.13.3 Release : ... we shall never (sur)render
-
- The PiTiVi team is proud to announce the second release in the
- unstable 0.13 PiTiVi series.
-
- Due to its dependency on GStreamer, The PiTiVi team strongly
- recommends users have all official latest gstreamer libraries and
- plugins installed for the best user experience.
-
- Title is from a quote by Winston Churchill ?We shall defend our
- island, whatever the cost may be, we shall fight on the beaches, we
- shall fight on the landing grounds, we shall fight in the fields and
- in the streets, we shall fight in the hills; we shall never
- surrender.?
-
- Features of this release
-
-    * Fix rendering failures
-    * UI beautifications
-    * Switch to themeable ruler
-    * Speed optimisations
-    * Show the project name in the window title 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Aug 2009 03:38:12 -0000	1.18
+++ .cvsignore	16 Sep 2009 04:16:01 -0000	1.19
@@ -1 +1 @@
-pitivi-0.13.2.2.tar.bz2
+pitivi-0.13.3.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/pitivi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- pitivi.spec	30 Aug 2009 03:38:12 -0000	1.40
+++ pitivi.spec	16 Sep 2009 04:16:01 -0000	1.41
@@ -1,8 +1,8 @@
 %define major   0.13
-%define minor   2.2
+%define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -75,12 +75,36 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING NEWS
 %{_bindir}/pitivi
 %{_datadir}/pitivi
-%{_datadir}/pixmaps/*
+#%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/pitivi.*
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Mon Sep 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-1
+- 0.13.3 Release : ... we shall never (sur)render
+-
+- The PiTiVi team is proud to announce the second release in the
+- unstable 0.13 PiTiVi series.
+-
+- Due to its dependency on GStreamer, The PiTiVi team strongly
+- recommends users have all official latest gstreamer libraries and
+- plugins installed for the best user experience.
+-
+- Title is from a quote by Winston Churchill ?We shall defend our
+- island, whatever the cost may be, we shall fight on the beaches, we
+- shall fight on the landing grounds, we shall fight in the fields and
+- in the streets, we shall fight in the hills; we shall never
+- surrender.?
+-
+- Features of this release
+-
+-    * Fix rendering failures
+-    * UI beautifications
+-    * Switch to themeable ruler
+-    * Speed optimisations
+-    * Show the project name in the window title 
+
 * Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2.2-0.1
 - Update to prerelease for 0.13.3
 - Streamline BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	30 Aug 2009 03:38:12 -0000	1.18
+++ sources	16 Sep 2009 04:16:01 -0000	1.19
@@ -1 +1 @@
-aeffb61cfed1c216798312e51ca2bac9  pitivi-0.13.2.2.tar.bz2
+ef9385f74173ddeb5bb10389c46d442a  pitivi-0.13.3.tar.bz2



From rayvd at fedoraproject.org  Wed Sep 16 04:16:26 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:16:26 +0000 (UTC)
Subject: rpms/syslog-ng/F-11 sources, 1.18, 1.19 syslog-ng.init.d, 1.1,
	1.2 syslog-ng.spec, 1.41, 1.42
Message-ID: <20090916041626.8665511C00CE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19194

Modified Files:
	sources syslog-ng.init.d syslog-ng.spec 
Log Message:
Fix for bz #517339 and bz#518582


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	24 Mar 2009 13:52:29 -0000	1.18
+++ sources	16 Sep 2009 04:16:25 -0000	1.19
@@ -1 +1,2 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.init.d
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/syslog-ng.init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- syslog-ng.init.d	24 Mar 2009 13:52:29 -0000	1.1
+++ syslog-ng.init.d	16 Sep 2009 04:16:25 -0000	1.2
@@ -67,8 +67,10 @@ stop()
 {
 	echo -n $"Stopping syslog-ng: "
 	REMOVE_COMPAT_PID=0
-	if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
-		REMOVE_COMPAT_PID=1
+	if [ -e $SYSLOGNG_PID ]; then
+		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
+			REMOVE_COMPAT_PID=1
+		fi
 	fi
 	killproc syslog-ng
 	RETVAL=$?


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/syslog-ng.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- syslog-ng.spec	24 Mar 2009 13:52:29 -0000	1.41
+++ syslog-ng.spec	16 Sep 2009 04:16:25 -0000	1.42
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -22,6 +22,9 @@ Source20: rsyslog-syslog-ng.sysconfig
 Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
 Source30: rsyslog-syslog-ng-fc10.sysconfig
 Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log
+
+Patch0: syslog-ng-2.1.4-libnet.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: eventlog-devel >= %{evtlog_ver}
@@ -33,6 +36,7 @@ BuildRequires: glib2-static
 %if 0%{?rhel}
 BuildRequires: tcp_wrappers
 BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
 %else
 BuildRequires: tcp_wrappers-devel
 %endif
@@ -64,6 +68,9 @@ ideal for firewalled environments.
 
 %prep
 %setup -q
+%if 0%{?rhel}
+%patch0 -p1 -b .libnet
+%endif
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -219,6 +226,15 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Init script fix (bug#517339)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically



From rayvd at fedoraproject.org  Wed Sep 16 04:18:35 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:18:35 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 sources,1.17,1.18 syslog-ng.spec,1.39,1.40
Message-ID: <20090916041836.26B8411C00CE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20509

Modified Files:
	sources syslog-ng.spec 
Log Message:
Fix for bz #517339 and bz#518582


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	3 Dec 2008 03:54:55 -0000	1.17
+++ sources	16 Sep 2009 04:18:34 -0000	1.18
@@ -1 +1,2 @@
-3f96ccf13dda0b9e150e511bcffde795  syslog-ng-2.0.10.tar.gz
+17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/syslog-ng.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- syslog-ng.spec	3 Dec 2008 03:54:55 -0000	1.39
+++ syslog-ng.spec	16 Sep 2009 04:18:34 -0000	1.40
@@ -1,143 +1,192 @@
-# Rebuild option:
-#
-#   --with spoofsource              enables the syslog-ng spoof-source feature
-#
-
-%define spoofsource  0
 %{?_with_spoofsource:%define spoofsource 1}
+%define evtlog_ver 0.2.7-2
 
-%define sbindir   /sbin
+%define _sbindir /sbin
+%define _localstatedir /var/lib/syslog-ng
 
-Name:             syslog-ng
-Version:          2.0.10
-Release:          1%{?dist}
-Summary:          Syslog replacement daemon
-
-Group:            System Environment/Daemons
-License:          GPLv2
-URL:              http://www.balabit.com/products/syslog-ng/
-Source0:          http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-%{version}.tar.gz
-Source1:          syslog.log
-Patch0:           syslog-ng-2.0.0-init.patch
-Patch1:           syslog-ng-1.6.7-logrotate.patch
-Patch2:           syslog-ng-2.0.5-conf.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    flex
-BuildRequires:    byacc
-BuildRequires:    pkgconfig >= 0.20
-BuildRequires:    glib2-devel >= 2.2
-BuildRequires:    eventlog-devel >= 0.2.5
-BuildRequires:    tcp_wrappers-devel
-%if %{spoofsource}
-BuildRequires:    libnet-devel >= 1.1
+Name: syslog-ng
+Version: 2.1.4
+Release: 4%{?dist}
+Summary: Next-generation syslog server
+
+Group: System Environment/Daemons
+License: GPLv2+
+Url: http://www.balabit.com/products/syslog_ng/
+Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/%{name}-%{version}.tar.gz
+Source1: syslog-ng.conf
+Source2: syslog-ng.init.d
+Source10: sysklogd-syslog-ng.sysconfig
+Source11: sysklogd-1.4.1-logrotate.d-syslog.log
+Source12: sysklogd-1.4.1-44-logrotate.d-syslog.log
+Source20: rsyslog-syslog-ng.sysconfig
+Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
+Source30: rsyslog-syslog-ng-fc10.sysconfig
+Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log
+
+Patch0: syslog-ng-2.1.4-libnet.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: eventlog-devel >= %{evtlog_ver}
+BuildRequires: pkgconfig
+BuildRequires: glib2-devel
+%if 0%{?fedora}
+BuildRequires: glib2-static
+%endif
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: libnet-devel
+Requires: logrotate
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+Provides: syslog
+%if 0%{?rhel} == 4
+# makes vixie-cron and initscripts happy
+Provides: sysklogd = 1.3.33-6
 %endif
+# merge separate syslog-vim package into one
+Provides: syslog-ng-vim = %{version}-%{release}
+Obsoletes: syslog-ng-vim < 2.0.8-1
 
-Requires:         logrotate
-Requires(post):   chkconfig, initscripts
-Requires(preun):  chkconfig, initscripts
-Requires(postun): initscripts
-#
-# Keep initscripts and vixie-cron happy
-#
-Provides:         syslog
 
 %description
-syslog-ng, as the name shows, is a syslogd replacement, but with new
-functionality for the new generation. The original syslogd allows
-messages only to be sorted based on priority/facility pairs; syslog-ng
-adds the possibility to filter based on message contents using regular
-expressions. The new configuration scheme is intuitive and powerful.
-Forwarding logs over TCP and remembering all forwarding hops makes it
+syslog-ng, as the name shows, is a syslogd replacement, but with new 
+functionality for the new generation. The original syslogd allows 
+messages only to be sorted based on priority/facility pairs; syslog-ng 
+adds the possibility to filter based on message contents using regular 
+expressions. The new configuration scheme is intuitive and powerful. 
+Forwarding logs over TCP and remembering all forwarding hops makes it 
 ideal for firewalled environments.
 
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
-chmod -c a-x contrib/syslog2ng
+%if 0%{?rhel}
+%patch0 -p1 -b .libnet
+%endif
+
+# fix perl path
+%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 
 # force regeneration to avoid broken paths from upstream (#265221)
-touch src/cfg-grammar.y
+touch src/cfg-grammar.c src/cfg-lex.c
+
+%define logrotated_dst syslog
+%if 0%{?rhel}
+	%if 0%{?rhel} <= 4
+		%define sysconfig_src %{SOURCE10}
+		%define logrotated_src %{SOURCE11}
+	%endif
+	%if 0%{?rhel} >= 5
+		%define sysconfig_src %{SOURCE10}
+		%define logrotated_src %{SOURCE12}
+	%endif
+%endif
+%if 0%{?fedora}
+	%if 0%{?fedora} <= 9
+		%define sysconfig_src %{SOURCE20}
+		%define logrotated_src %{SOURCE21}
+	%endif
+	%if 0%{?fedora} >= 10
+		%define sysconfig_src %{SOURCE30}
+		%define logrotated_src %{SOURCE31}
+	%endif
+%endif
 
 
 %build
 %configure \
-    --sbindir=%{sbindir} \
-    --sysconfdir=%{_sysconfdir}/syslog-ng \
-    --enable-ipv6 \
-    --enable-tcp-wrapper \
-%if ! %{spoofsource}
-    --disable-spoof-source \
+	--enable-ipv6 \
+	--sysconfdir=%{_sysconfdir}/%{name} \
+	--enable-tcp-wrapper \
+%if 0%{?spoofsource}
+	--enable-spoof-source \
+%endif
+%if 0%{?rhel}
+	--enable-mixed-linking
 %else
-    --enable-spoof-source \
+	--enable-dynamic-linking
 %endif
-    --enable-dynamic-linking
-make %{?_smp_mflags}
+
+
+make %{_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+%{__install} -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
+%{__install} -p -m 644 %{sysconfig_src} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
+%{__install} -p -m 644 %{logrotated_src} \
+	%{buildroot}%{_sysconfdir}/logrotate.d/%{logrotated_dst}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+# make local state dir
+%{__install} -d -m 755 %{buildroot}/%{_localstatedir}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-
-install -p -m 755 contrib/fedora-packaging/syslog-ng.init \
-    $RPM_BUILD_ROOT%{_initrddir}/syslog-ng
-install -p -m 644 contrib/fedora-packaging/syslog-ng.conf \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/syslog-ng.conf
-install -p -m 644 contrib/fedora-packaging/syslog-ng.sysconfig \
-    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/syslog-ng
-install -p -m 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog
-
-# Vim syntax file
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 644 contrib/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/%{name}/
+# fix authors file
+/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
+	%{__mv} -f AUTHORS.conv AUTHORS
+
+# fix executable perms on contrib files
+%{__chmod} -x contrib/relogger.pl
+%{__chmod} -x contrib/syslog2ng
+
+# fix script interpreter
+sed -i 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' contrib/relogger.pl
+
+# install vim files
+%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
+%{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name}
 for vimver in 63 64 70 71 ; do
-    install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
-    cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
-    ln -s ../../../%{name}/syslog-ng.vim .
+	%{__install} -d -m 755 %{buildroot}%{_datadir}/vim/vim$vimver/syntax
+	cd %{buildroot}%{_datadir}/vim/vim$vimver/syntax
+	ln -s ../../../%{name}/syslog-ng.vim .
+	cd -
 done
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-# only rpm -i (not rpm {-U|-F})
-if [ $1 = 1 ]; then
-    /sbin/chkconfig --add syslog-ng
-#   /sbin/service syslog-ng start
-fi
+/sbin/chkconfig --add %{name}
+
 
 %preun
-# only rpm -e (not rpm {-U|-F})
-if [ $1 = 0 ]; then
-    /sbin/service syslog-ng stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del syslog-ng
+if [ "$1" = 0 ]; then
+	/sbin/service %{name} stop > /dev/null 2>&1
+	/sbin/chkconfig --del %{name}
 fi
 
+
 %postun
-# only rpm {-U|-F} (not rpm -e)
-if [ $1 = 1 ]; then
-    /sbin/service syslog-ng condrestart
+if [ "$1" -ge 1 ]; then
+	/sbin/service %{name} condrestart >/dev/null 2>&1
 fi
 
 
 %triggerin -- vim-common
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-    cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-    ln -sf ../../../%{name}/syslog-ng.vim . || :
+	cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+	ln -sf ../../../%{name}/syslog-ng.vim . || :
 
 %triggerun -- vim-common
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@@ -147,34 +196,62 @@ VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{ver
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 if [ $1 = 1 ]; then
-    rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
-    [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-        cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-        ln -sf ../../../%{name}/syslog-ng.vim . || :
+	rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
+	[ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
+		cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+		ln -sf ../../../%{name}/syslog-ng.vim . || :
 fi
 
 
+
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%defattr(-,root,root)
+%doc AUTHORS COPYING README ChangeLog NEWS
 %doc doc/reference/syslog-ng.txt
 %doc doc/security/*.txt
 %doc doc/examples/syslog-ng.conf.sample
 %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
-%{_bindir}/loggen
-%{sbindir}/%{name}
-%{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
-%{_datadir}/%{name}/
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{logrotated_dst}
+%{_sysconfdir}/init.d/%{name}
+%dir %{_localstatedir}
+%{_sbindir}/%{name}
+%{_bindir}/loggen
+%{_datadir}/%{name}
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 %ghost %{_datadir}/vim/
 
 
 %changelog
+* Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Init script fix (bug#517339)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
+- update to 2.1.4
+- enabling mixed linking to compile only non-system libs statically
+- lots of packaging updates to be able to build on RHEL4,5, Fedora9+ and be
+  parallel-installable with rsyslog and/or sysklogd on those platforms
+- removing BR for flex & byacc to try to prevent files from being regenerated
+- fixing build error with cfg-lex.l and flex 2.5.4
+- Fixed a possible DoS condition triggered by a destination port unreachable
+  ICMP packet received from a UDP destination.  syslog-ng started eating all
+  available memory and CPU until it crashed if this happened.
+- Fixed the rate at which files regular were read using the file() source.
+- Report connection breaks as a write error instead of reporting POLLERR as
+  the write error path reports more sensible information in the logs.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 02 2008 Douglas E. Warner <silfreed at silfreed.net> 2.0.10-1
 - update to 2.0.10
 - fix for CVE-2008-5110
@@ -417,4 +494,3 @@ fi
 * Sun Dec 08 2002 Richard E. Perlotto II <richard at perlotto.com> 1.5.23-1
 - Updated file with notes and PGP signatures
 
-# vim:set ai ts=4 sw=4 sts=4 et:



From jcm at fedoraproject.org  Wed Sep 16 04:19:46 2009
From: jcm at fedoraproject.org (Jon Masters)
Date: Wed, 16 Sep 2009 04:19:46 +0000 (UTC)
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.89,
	1.90 weak-modules, 1.17, 1.18
Message-ID: <20090916041946.CD57A11C00CE@cvs1.fedora.phx.redhat.com>

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21145

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
Sync weak-modules with RHEL.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- module-init-tools.spec	25 Jul 2009 14:56:30 -0000	1.89
+++ module-init-tools.spec	16 Sep 2009 04:19:45 -0000	1.90
@@ -2,7 +2,7 @@ Summary: Kernel module management utilit
 Name: module-init-tools
 Version: 3.9
 #define PreRelease
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 #Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
@@ -85,6 +85,9 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Wed Sep 16 2009 Jon Masters <jcm at redhat.com> -3.9-3
+- Sync weak-modules with RHEL.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: weak-modules
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- weak-modules	19 Mar 2009 18:50:42 -0000	1.17
+++ weak-modules	16 Sep 2009 04:19:46 -0000	1.18
@@ -6,8 +6,7 @@
 
 # Changelog:
 #
-# 2006/12/11 - Updated logic for determining the system's initrd location,
-#              to account for IA64 differences. (#215432)
+# 2009/09/16 - Rebase and add a bunch of updates for dracut.
 
 unset LANG LC_ALL LC_COLLATE
 
@@ -27,62 +26,20 @@ fi
 # rpmsort: The sort in coreutils can't sort the RPM list how we want it so we
 # instead transform the list into a form it will sort correctly, then sort.
 rpmsort() {
-
+	local IFS=$' '
+	REVERSE=""
 	rpmlist=($(cat))
 
-	if [ "$1" == "-r" ]; then
-		reverse=1
-	else
-		reverse=0
+	if [ "-r" == "$1" ];
+	then
+		REVERSE="-r"
 	fi
 
-        if [ ${#rpmlist[@]} = 1 ]; then
-        # By definition already sorted
-		echo ${rpmlist[@]}
-                return
-        fi
-
-        # Hash every value in the rpmlist
-        for ((i = 0; i < ${#rpmlist[@]}; i++)); do
-                rpmhash[i]="$(echo ${rpmlist[i]} | awk '{decode="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-."; split($1,tmp,"");for (i=1;i<=length($1);i++){ printf "%02x",index(decode,tmp[i]) } }')"
-        done
-
-        for ((i = 0; i < ${#rpmlist[@]}; i++)); do
-
-                for ((j = 0; j < ${#rpmlist[@]}-1; j++)); do
-
-                        rpm1=${rpmlist[j]}      rpm2=${rpmlist[j+1]}
-                        hex1=${rpmhash[j]}      hex2=${rpmhash[j+1]}
-
-                        if [ ${#rpm1} -lt ${#rpm2} ]; then
-                                len=$((${#rpm1}*2));
-                        else
-                                len=$((${#rpm2}*2));
-                        fi
-
-		# BZ249537 - don't use head -n 1 to rip out the first line
-		# and instead use a read loop to do it. There are better
-		# ways to do this, but this solution works too :-).
-
-                        if [ "$(printf "%s\n" ${hex1:0:$len} ${hex2:0:$len} \
-                              | sort | (read input; echo "$input"; \
-                                        while read input; do true; done))" = \
-                                "$hex2" ]; then
-                                rpmlist[j]=$rpm2; rpmlist[j+1]=$rpm1
-                                rpmhash[j]=$hex2; rpmhash[j+1]=$hex1
-                        fi
-                done
-        done
-
-	if [ $reverse = 0 ]; then
-        	for ((n = 0; n < ${#rpmlist[@]} ; n++)); do
-                	echo "${rpmlist[$n]}"
-        	done
-	else
-		for ((n = ${#rpmlist[@]}-1; n >= 0; n--)); do
-			echo "${rpmlist[$n]}"
-		done
-	fi
+	echo ${rpmlist[@]} | \
+	sed -e 's/-/../g' | \
+	sort ${REVERSE} -n -t"." -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 -k6,6 -k7,7 \
+				 -k8,8 -k9,9 -k10,10 | \
+	sed -e 's/\.\./-/g'
 }
 
 # read_modules_list:
@@ -153,27 +110,13 @@ compare_initrd_modules() {
 # check_initrd:
 check_initrd() {
     local kernel=$1
-    local kernel_is_xen=0
-    local xen_kverrel=0
-
-    if [ "xen" == "`echo $kernel|sed -nre 's:^.*(xen)$:\1:p'`" ];
-    then
-        kernel_is_xen=1
-        xen_kverrel="`echo $kernel|sed -nre 's:^(.*)xen$:\1:p'`"
-    else
-        kernel_is_xen=0
-    fi
 
     # This logic probably isn't needed. When are we ever actually likely to have
     # an unbootable system, with no kernel, *before* we run this script? :-)
     if [ ! -e "$initrd_prefix/initrd-$kernel.img" ];
     then
         new_initrd="$initrd_prefix/initrd-$kernel.img"
-        if [ "$kernel_is_xen" == "0" ]; then
-            /sbin/new-kernel-pkg --mkinitrd --initrdfile="$new_initrd" --depmod --install "$kernel"
-        else
-            /sbin/new-kernel-pkg --mkinitrd --initrdfile="$new_initrd" --depmod --install --multiboot="$initrd_prefix/xen.gz-$xen_kverrel" "$kernel"
-        fi
+        /sbin/new-kernel-pkg --mkinitrd --initrdfile="$new_initrd" --depmod --install "$kernel"
     else
         old_initrd="$initrd_prefix/initrd-$kernel.img"
         tmp_initrd="$initrd_prefix/initrd-$kernel.tmp"
@@ -183,14 +126,9 @@ check_initrd() {
 
         if ! $(compare_initrd_modules "$old_initrd" "$tmp_initrd");
         then
-            mv "$old_initrd" "$old_initrd".dup_orig
             mv "$tmp_initrd" "$new_initrd"
 
-            if [ "$kernel_is_xen" == "0" ]; then
-                /sbin/new-kernel-pkg --initrdfile="$new_initrd" --depmod --install "$kernel"
-            else
-                /sbin/new-kernel-pkg --initrdfile="$new_initrd" --depmod --install --multiboot="$initrd_prefix/xen.gz-$xen_kverrel" "$kernel"
-            fi
+            /sbin/new-kernel-pkg --initrdfile="$new_initrd" --depmod --install "$kernel"
         else
             rm -f "$tmp_initrd"
         fi
@@ -222,7 +160,8 @@ module_is_compatible() {
         # Symbols that other add-on modules of the "old" kernel export
         # (and that this module may require)
         if [ ! -e "$tmpdir/extra-symvers-$module_krel" ]; then
-            if [ -e /lib/modules/$module_krel/extra ]; then
+            if [ -e /lib/modules/$module_krel/extra ] && \
+	       [ -n "`find /lib/modules/$module_krel/extra -type f`" ]; then
                 find /lib/modules/$module_krel/extra -name '*.ko' \
                 | xargs nm \
                 | sed -nre 's:^[0]*([0-9a-f]{8}) A __crc_(.*):0x\1 \2:p'
@@ -341,11 +280,7 @@ add_modules() {
 		# kernel. We need to create symlinks for compatible kernels
 		# under /lib/modules and rerun depmod/mkinitrd for those.
 
-		# BZ249537 - don't use head -n 1 to rip out the first line
-		# and instead use a read loop to do it. There are better
-		# ways to do this, but this solution works too :-).
-
-                subpath="${module#/lib/modules/$module_krel/extra}"
+		subpath=`echo $module | sed -nre "s:/lib/modules/$module_krel/([^/]*)/(.*):\2:p"`
                 weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
                 if [ -r "$weak_module" ]; then
                     weak_krel=$(krel_of_module "$weak_module")



From rayvd at fedoraproject.org  Wed Sep 16 04:20:11 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:20:11 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 .cvsignore,1.17,1.18 sources,1.18,1.19
Message-ID: <20090916042011.61DD811C0336@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21658

Modified Files:
	.cvsignore sources 
Log Message:
init script



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Dec 2008 03:54:55 -0000	1.17
+++ .cvsignore	16 Sep 2009 04:20:09 -0000	1.18
@@ -1 +1,2 @@
 syslog-ng-2.0.10.tar.gz
+syslog-ng.init.d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Sep 2009 04:18:34 -0000	1.18
+++ sources	16 Sep 2009 04:20:09 -0000	1.19
@@ -1,2 +1,3 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
 02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch
+61c794092a4c86ee4b152df74f44c954  syslog-ng.init.d



From rayvd at fedoraproject.org  Wed Sep 16 04:25:44 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:25:44 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 syslog-ng-2.1.4-libnet.patch, NONE,
	1.1 syslog-ng.init.d, NONE, 1.1 sources, 1.19, 1.20
Message-ID: <20090916042544.6C19711C00CE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24928

Modified Files:
	sources 
Added Files:
	syslog-ng-2.1.4-libnet.patch syslog-ng.init.d 
Log Message:
Goofed with sources

syslog-ng-2.1.4-libnet.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syslog-ng-2.1.4-libnet.patch ---
diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
@@ -466,7 +466,7 @@
 elif test "x$enable_static_linking" = "xyes"; then
 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
 else
-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
 fi
 LIBS="$DEPS_LIBS"
 YFLAGS="-d"


--- NEW FILE syslog-ng.init.d ---
#!/bin/sh
#
# syslog-ng starts/stops syslog-ng service
#
# chkconfig: - 12 88
# description: Syslog is the facility by which many daemons use to log \
#     messages to various system log files.
#

### BEGIN INIT INFO
# Provides: $syslog
# Required-Start: $local_fs
# Required-Stop: $local_fs
# Short-Description: Next-generation syslog server
# Description: syslog-ng, as the name shows, is a syslogd replacement, but
#     with new functionality for the new generation. The original syslogd
#     allows messages only to be sorted based on priority/facility pairs;
#     syslog-ng adds the possibility to filter based on message contents
#     using regular expressions. The new configuration scheme is intuitive
#     and powerful.  Forwarding logs over TCP and remembering all forwarding
#     hops makes it ideal for firewalled environments.  
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -e /etc/sysconfig/syslog-ng ] && . /etc/sysconfig/syslog-ng

RETVAL=0

check_syntax()
{
	[ -x /sbin/syslog-ng ] || exit 5
	syslog-ng -s $SYSLOGNG_OPTIONS
	RETVAL=$?
	return $RETVAL
}

verify_config()
{
	check_syntax
	RETVAL=$?
	[ $RETVAL -eq 0 ] || exit $retval
}

checkconfig()
{
	action $"Checking Configuration: " check_syntax
}

start()
{
	verify_config
	echo -n $"Starting syslog-ng: "
	if [ -e $SYSLOGNG_COMPAT_PID ]; then
		failure "PID file for existing syslog daemon exists"
	fi
	daemon syslog-ng $SYSLOGNG_OPTIONS
	ln -sf $SYSLOGNG_PID $SYSLOGNG_COMPAT_PID
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
	return $RETVAL
}

stop()
{
	echo -n $"Stopping syslog-ng: "
	REMOVE_COMPAT_PID=0
	if [ -e $SYSLOGNG_PID ]; then
		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
			REMOVE_COMPAT_PID=1
		fi
	fi
	killproc syslog-ng
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/syslog-ng
	[ $RETVAL -eq 0 -a $REMOVE_COMPAT_PID -eq 1 ] && rm -f $SYSLOGNG_COMPAT_PID
	return $RETVAL
}

reload()
{
	verify_config
	echo -n $"Reloading syslog-ng: "
	killproc syslog-ng -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

restart()
{
	stop
	start
}


case "$1" in
	start|stop|reload)
		$1
		;;
	restart|force_reload)
		restart
		;;
	status)
		status syslog-ng
		;;
	checkconfig|configtest|check|test)
		checkconfig
		;;
	condrestart|try-restart)
		[ -f /var/lock/subsys/syslog-ng ] && restart || :
		;;
	*)
		echo $"Usage: $0 {start|stop|restart|reload|condrestart|checkconfig}"
		exit 1
esac

exit $?

# vim: ft=sh:ts=4:ai:si:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Sep 2009 04:20:09 -0000	1.19
+++ sources	16 Sep 2009 04:25:42 -0000	1.20
@@ -1,3 +1 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
-02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch
-61c794092a4c86ee4b152df74f44c954  syslog-ng.init.d



From rayvd at fedoraproject.org  Wed Sep 16 04:27:49 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:27:49 +0000 (UTC)
Subject: rpms/syslog-ng/F-11 syslog-ng-2.1.4-libnet.patch, NONE, 1.1 sources,
	1.19, 1.20
Message-ID: <20090916042749.7663211C00CE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26248

Modified Files:
	sources 
Added Files:
	syslog-ng-2.1.4-libnet.patch 
Log Message:
Goofed with sources

syslog-ng-2.1.4-libnet.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syslog-ng-2.1.4-libnet.patch ---
diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
@@ -466,7 +466,7 @@
 elif test "x$enable_static_linking" = "xyes"; then
 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
 else
-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
 fi
 LIBS="$DEPS_LIBS"
 YFLAGS="-d"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Sep 2009 04:16:25 -0000	1.19
+++ sources	16 Sep 2009 04:27:47 -0000	1.20
@@ -1,2 +1 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
-02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch



From rayvd at fedoraproject.org  Wed Sep 16 04:29:46 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:29:46 +0000 (UTC)
Subject: rpms/syslog-ng/EL-4 syslog-ng-2.1.4-libnet.patch, NONE, 1.1 sources,
	1.8, 1.9
Message-ID: <20090916042946.A496111C00CE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27196/EL-4

Modified Files:
	sources 
Added Files:
	syslog-ng-2.1.4-libnet.patch 
Log Message:
Goofed with sources

syslog-ng-2.1.4-libnet.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syslog-ng-2.1.4-libnet.patch ---
diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
@@ -466,7 +466,7 @@
 elif test "x$enable_static_linking" = "xyes"; then
 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
 else
-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
 fi
 LIBS="$DEPS_LIBS"
 YFLAGS="-d"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Sep 2009 13:23:54 -0000	1.8
+++ sources	16 Sep 2009 04:29:44 -0000	1.9
@@ -1,2 +1 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
-02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch



From rayvd at fedoraproject.org  Wed Sep 16 04:29:47 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:29:47 +0000 (UTC)
Subject: rpms/syslog-ng/EL-5 syslog-ng-2.1.4-libnet.patch, NONE, 1.1 sources,
	1.9, 1.10
Message-ID: <20090916042947.38C0011C00CE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27196/EL-5

Modified Files:
	sources 
Added Files:
	syslog-ng-2.1.4-libnet.patch 
Log Message:
Goofed with sources

syslog-ng-2.1.4-libnet.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syslog-ng-2.1.4-libnet.patch ---
diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
@@ -466,7 +466,7 @@
 elif test "x$enable_static_linking" = "xyes"; then
 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
 else
-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
 fi
 LIBS="$DEPS_LIBS"
 YFLAGS="-d"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 Aug 2009 18:32:46 -0000	1.9
+++ sources	16 Sep 2009 04:29:45 -0000	1.10
@@ -1,2 +1 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
-02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch



From rayvd at fedoraproject.org  Wed Sep 16 04:30:51 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:30:51 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng-2.1.4-libnet.patch, NONE, 1.1 sources,
	1.19, 1.20
Message-ID: <20090916043051.D481411C00EC@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28022

Modified Files:
	sources 
Added Files:
	syslog-ng-2.1.4-libnet.patch 
Log Message:
Goofed with sources

syslog-ng-2.1.4-libnet.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syslog-ng-2.1.4-libnet.patch ---
diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
@@ -466,7 +466,7 @@
 elif test "x$enable_static_linking" = "xyes"; then
 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
 else
-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
 fi
 LIBS="$DEPS_LIBS"
 YFLAGS="-d"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Aug 2009 18:29:07 -0000	1.19
+++ sources	16 Sep 2009 04:30:39 -0000	1.20
@@ -1,2 +1 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
-02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch



From rayvd at fedoraproject.org  Wed Sep 16 04:40:39 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:40:39 +0000 (UTC)
Subject: rpms/syslog-ng/EL-4 syslog-ng.spec,1.11,1.12
Message-ID: <20090916044039.9BC7611C0336@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2106/EL-4

Modified Files:
	syslog-ng.spec 
Log Message:
Bump release for b0rked tag.


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- syslog-ng.spec	11 Sep 2009 13:23:54 -0000	1.11
+++ syslog-ng.spec	16 Sep 2009 04:40:33 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,12 +226,18 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Rebuilding for tag issue
+
 * Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
 - libnet linking (bug#518150)
 
 * Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
 - Init script fix (bug#517339)
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically



From rayvd at fedoraproject.org  Wed Sep 16 04:40:40 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:40:40 +0000 (UTC)
Subject: rpms/syslog-ng/F-11 syslog-ng.spec,1.42,1.43
Message-ID: <20090916044040.1190611C0336@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2106/F-11

Modified Files:
	syslog-ng.spec 
Log Message:
Bump release for b0rked tag.


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/syslog-ng.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- syslog-ng.spec	16 Sep 2009 04:16:25 -0000	1.42
+++ syslog-ng.spec	16 Sep 2009 04:40:38 -0000	1.43
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Rebuilding for tag issue
+
 * Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
 - libnet linking (bug#518150)
 



From rayvd at fedoraproject.org  Wed Sep 16 04:40:40 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:40:40 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 syslog-ng.spec,1.40,1.41
Message-ID: <20090916044040.7E67111C0336@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2106/F-10

Modified Files:
	syslog-ng.spec 
Log Message:
Bump release for b0rked tag.


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/syslog-ng.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- syslog-ng.spec	16 Sep 2009 04:18:34 -0000	1.40
+++ syslog-ng.spec	16 Sep 2009 04:40:38 -0000	1.41
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Rebuilding for tag issue
+
 * Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
 - libnet linking (bug#518150)
 



From rayvd at fedoraproject.org  Wed Sep 16 04:40:42 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:40:42 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.45,1.46
Message-ID: <20090916044042.9DC4C11C0336@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2106/devel

Modified Files:
	syslog-ng.spec 
Log Message:
Bump release for b0rked tag.


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- syslog-ng.spec	29 Aug 2009 18:29:07 -0000	1.45
+++ syslog-ng.spec	16 Sep 2009 04:40:39 -0000	1.46
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Rebuilding for tag issue
+
 * Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
 - libnet linking (bug#518150)
 



From rayvd at fedoraproject.org  Wed Sep 16 04:40:39 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 04:40:39 +0000 (UTC)
Subject: rpms/syslog-ng/EL-5 syslog-ng.spec,1.19,1.20
Message-ID: <20090916044039.CDB5F11C04A6@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2106/EL-5

Modified Files:
	syslog-ng.spec 
Log Message:
Bump release for b0rked tag.


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/syslog-ng.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- syslog-ng.spec	29 Aug 2009 18:32:46 -0000	1.19
+++ syslog-ng.spec	16 Sep 2009 04:40:37 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,12 +226,18 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Rebuilding for tag issue
+
 * Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
 - libnet linking (bug#518150)
 
 * Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
 - Init script fix (bug#517339)
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically



From bskeggs at fedoraproject.org  Wed Sep 16 04:41:26 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed, 16 Sep 2009 04:41:26 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.56, 1.57 kernel.spec, 1.1802, 
	1.1803
Message-ID: <20090916044126.85B7C11C0336@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3009

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Sep 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-17
- nouveau: potential fix for rh#522649 + misc other fixes



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5217 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  537 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  750 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  354 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  683 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  213 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2214 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  473 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  450 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 58041 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- drm-nouveau.patch	15 Sep 2009 09:52:49 -0000	1.56
+++ drm-nouveau.patch	16 Sep 2009 04:41:24 -0000	1.57
@@ -1822,10 +1822,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..b37ad94
+index 0000000..305efc3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5209 @@
+@@ -0,0 +1,5217 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -6927,6 +6927,11 @@ index 0000000..b37ad94
 +	if (bios->major_version < 5)	/* BMP only */
 +		load_nv17_hw_sequencer_ucode(dev, bios);
 +
++	if (bios->execute) {
++		bios->fp.last_script_invoc = 0;
++		bios->fp.lvds_init_run = false;
++	}
++
 +	parse_init_tables(bios);
 +
 +	/* Runs some additional script seen on G8x VBIOSen.  The VBIOS'
@@ -7016,9 +7021,12 @@ index 0000000..b37ad94
 +		return ret;
 +	}
 +
-+	if (bios->major_version < 5)
-+		/* feature_byte on BMP is poor, but init always sets CR4B */
++	/* feature_byte on BMP is poor, but init always sets CR4B */
++	if (bios->major_version < 5) {
++		bool waslocked = NVLockVgaCrtcs(dev, false);
 +		bios->is_mobile = NVReadVgaCrtc(dev, 0, NV_CIO_CRE_4B) & 0x40;
++		NVLockVgaCrtcs(dev, waslocked);
++	}
 +
 +	/* all BIT systems need p_f_m_t for digital_min_front_porch */
 +	if (bios->is_mobile || bios->major_version >= 5)
@@ -34165,10 +34173,10 @@ index 0000000..6bc0824
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..9a88a1a
+index 0000000..a96766d
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,443 @@
+@@ -0,0 +1,450 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34445,20 +34453,27 @@ index 0000000..9a88a1a
 +{
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	int i, hdr = IS_G80 ? 0x200 : 0x20;
++	uint32_t inst;
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
-+	if (chan->ramin && chan->ramin->gpuobj) {
-+		int i, hdr;
-+
-+		hdr = IS_G80 ? 0x200 : 0x20;
-+		dev_priv->engine.instmem.prepare_access(dev, true);
-+		for (i=hdr; i<hdr+24; i+=4)
-+			nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
-+		dev_priv->engine.instmem.finish_access(dev);
++	if (!chan->ramin || !chan->ramin->gpuobj)
++		return;
 +
-+		nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
++	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
++	if (inst & NV50_PGRAPH_CTXCTL_CUR_LOADED) {
++		inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
++		if (inst == chan->ramin->instance >> 12)
++			nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR, inst);
 +	}
++
++	dev_priv->engine.instmem.prepare_access(dev, true);
++	for (i=hdr; i<hdr+24; i+=4)
++		nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
++	dev_priv->engine.instmem.finish_access(dev);
++
++	nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
 +}
 +
 +static int


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1802
retrieving revision 1.1803
diff -u -p -r1.1802 -r1.1803
--- kernel.spec	15 Sep 2009 18:53:54 -0000	1.1802
+++ kernel.spec	16 Sep 2009 04:41:25 -0000	1.1803
@@ -2040,6 +2040,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-17
+- nouveau: potential fix for rh#522649 + misc other fixes
+
 * Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com>
 - Add unused-kernel-patches Make target, change some patches to
   use ApplyOptionalPatch



From ovasik at fedoraproject.org  Wed Sep 16 06:03:44 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 16 Sep 2009 06:03:44 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-cpxattrreadonly.patch, NONE,
	1.1 coreutils.spec, 1.274, 1.275
Message-ID: <20090916060344.E21F111C0332@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4086

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-cpxattrreadonly.patch 
Log Message:
fix copying of extended attributes for read only source files

coreutils-cpxattrreadonly.patch:
 src/copy.c       |   23 ++++++++++++++++++-----
 tests/misc/xattr |   43 ++++++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 20 deletions(-)

--- NEW FILE coreutils-cpxattrreadonly.patch ---
>From cca83fafa69eb26db458714830b77498b88af8a4 Mon Sep 17 00:00:00 2001
From: Ond?ej Va??k <ovasik at redhat.com>
Date: Mon, 14 Sep 2009 13:12:01 +0000
Subject: cp,mv: preserve extended attributes even for read-only files

* src/copy.c (copy_reg): Temporarily set u+rw on the destination file
to allow GNU/Linux to set xattrs.
* tests/misc/xattr: Test that change.
Reported by Ernest N. Mamikonyan.
---
diff --git a/src/copy.c b/src/copy.c
index f3ff5a2..ad2060b 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -834,6 +834,24 @@ copy_reg (char const *src_name, char const *dst_name,
         }
     }
 
+  /* To allow copying xattrs on read-only files, temporarily chmod u+rw.
+     This workaround is required as an inode permission check is done
+     by xattr_permission() in fs/xattr.c of the GNU/Linux kernel tree.  */
+  if (x->preserve_xattr)
+    {
+      bool access_changed = false;
+
+      if (!(sb.st_mode & S_IWUSR) && geteuid() != 0)
+        access_changed = fchmod_or_lchmod (dest_desc, dst_name, 0600) == 0;
+
+      if (!copy_attr_by_fd (src_name, source_desc, dst_name, dest_desc, x)
+          && x->require_preserve_xattr)
+        return_val = false;
+
+      if (access_changed)
+        fchmod_or_lchmod (dest_desc, dst_name, dst_mode & ~omitted_permissions);
+    }
+
   if (x->preserve_ownership && ! SAME_OWNER_AND_GROUP (*src_sb, sb))
     {
       switch (set_owner (x, dst_name, dest_desc, src_sb, *new_dst, &sb))
@@ -850,11 +868,6 @@ copy_reg (char const *src_name, char const *dst_name,
 
   set_author (dst_name, dest_desc, src_sb);
 
-  if (x->preserve_xattr && ! copy_attr_by_fd (src_name, source_desc,
-                                              dst_name, dest_desc, x)
-      && x->require_preserve_xattr)
-    return_val = false;
-
   if (x->preserve_mode || x->move_mode)
     {
       if (copy_acl (src_name, source_desc, dst_name, dest_desc, src_mode) != 0
diff --git a/tests/misc/xattr b/tests/misc/xattr
index a27e1f6..fcf7ceb 100755
--- a/tests/misc/xattr
+++ b/tests/misc/xattr
@@ -29,7 +29,7 @@ fi
 
 # Skip this test if cp was built without xattr support:
 touch src dest || framework_failure
-cp --preserve=xattr -n src dest 2>/dev/null \
+cp --preserve=xattr -n src dest \
   || skip_test_ "coreutils built without xattr support"
 
 # this code was taken from test mv/backup-is-src
@@ -46,13 +46,13 @@ xattr_pair="$xattr_name=\"$xattr_value\""
 # create new file and check its xattrs
 touch a || framework_failure
 getfattr -d a >out_a || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_a >/dev/null && framework_failure
+grep -F "$xattr_pair" out_a && framework_failure
 
 # try to set user xattr on file
 setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \
   || skip_test_ "failed to set xattr of file"
 getfattr -d a >out_a || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_a >/dev/null \
+grep -F "$xattr_pair" out_a \
   || skip_test_ "failed to set xattr of file"
 
 fail=0
@@ -60,36 +60,50 @@ fail=0
 # cp should not preserve xattr by default
 cp a b || fail=1
 getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_b >/dev/null && fail=1
+grep -F "$xattr_pair" out_b && fail=1
 
 # test if --preserve=xattr option works
 cp --preserve=xattr a b || fail=1
 getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_b >/dev/null || fail=1
+grep -F "$xattr_pair" out_b || fail=1
 
 #test if --preserve=all option works
 cp --preserve=all a c || fail=1
 getfattr -d c >out_c || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_c >/dev/null || fail=1
+grep -F "$xattr_pair" out_c || fail=1
 
 #test if -a option works without any diagnostics
 cp -a a d 2>err && test -s err && fail=1
 getfattr -d d >out_d || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_d >/dev/null || fail=1
+grep -F "$xattr_pair" out_d || fail=1
+
+#test if --preserve=xattr works even for files without write access
+chmod a-w a || framework_failure
+rm -f e
+cp --preserve=xattr a e || fail=1
+getfattr -d e >out_e || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_e || fail=1
+
+#Ensure that permission bits are preserved, too.
+src_perm=$(stat --format=%a a)
+dst_perm=$(stat --format=%a e)
+test "$dst_perm" = "$src_perm" || fail=1
+
+chmod u+w a || framework_failure
 
 rm b || framework_failure
 
 # install should never preserve xattr
 ginstall a b || fail=1
 getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_b >/dev/null && fail=1
+grep -F "$xattr_pair" out_b && fail=1
 
 # mv should preserve xattr when renaming within a file system.
 # This is implicitly done by rename () and doesn't need explicit
 # xattr support in mv.
 mv a b || fail=1
 getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_b >/dev/null || cat >&2 <<EOF
+grep -F "$xattr_pair" out_b || cat >&2 <<EOF
 =================================================================
 $0: WARNING!!!
 rename () does not preserve extended attributes
@@ -99,18 +113,18 @@ EOF
 # try to set user xattr on file on other partition
 test_mv=1
 touch "$b_other" || framework_failure
-setfattr -n "$xattr_name" -v "$xattr_value" "$b_other" >out_a 2>/dev/null \
+setfattr -n "$xattr_name" -v "$xattr_value" "$b_other" >out_a \
   || test_mv=0
-getfattr -d "$b_other" >out_b 2>/dev/null || test_mv=0
-grep -F "$xattr_pair" out_b >/dev/null || test_mv=0
+getfattr -d "$b_other" >out_b || test_mv=0
+grep -F "$xattr_pair" out_b || test_mv=0
 rm -f "$b_other" || framework_failure
 
 if test $test_mv -eq 1; then
   # mv should preserve xattr when copying content from one partition to another
   mv b "$b_other" || fail=1
-  getfattr -d "$b_other" >out_b 2>/dev/null ||
+  getfattr -d "$b_other" >out_b ||
     skip_test_ "failed to get xattr of file"
-  grep -F "$xattr_pair" out_b >/dev/null || fail=1
+  grep -F "$xattr_pair" out_b || fail=1
 else
   cat >&2 <<EOF
 =================================================================
--
cgit v0.8.2.1


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- coreutils.spec	12 Sep 2009 09:28:49 -0000	1.274
+++ coreutils.spec	16 Sep 2009 06:03:40 -0000	1.275
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,6 +18,7 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
+Patch1: coreutils-cpxattrreadonly.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -107,6 +108,7 @@ Libraries for coreutils package.
 %setup -q
 
 # From upstream
+%patch1 -p1 -b .roxattr
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -135,13 +137,11 @@ Libraries for coreutils package.
 %patch951 -p1 -b .selinuxman
 
 chmod a+x tests/misc/sort-mb-tests
-chmod a+x tests/ls/readdir-mountpoint-inode
 
 #fix typos/mistakes in localized documentation(#439410, #440056)
 find ./po/ -name "*.p*" | xargs \
  sed -i \
- -e 's/-dpR/-cdpR/' \
- -e 's/commmand/command/'
+ -e 's/-dpR/-cdpR/'
 
 %build
 %ifarch s390 s390x
@@ -327,6 +327,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Wed Sep 16 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-2
+- fix copying of extended attributes for read only source
+  files
+
 * Sat Sep 12 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-1
 - new upstream bugfix release 7.6, removed applied patches,
   defuzzed the rest



From pgordon at fedoraproject.org  Wed Sep 16 06:07:11 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed, 16 Sep 2009 06:07:11 +0000 (UTC)
Subject: rpms/midori/F-11 .cvsignore, 1.13, 1.14 midori.spec, 1.26,
	1.27 sources, 1.13, 1.14
Message-ID: <20090916060711.9D94311C00E6@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6584

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Aug 2009 06:11:50 -0000	1.13
+++ .cvsignore	16 Sep 2009 06:07:09 -0000	1.14
@@ -1 +1 @@
-midori-0.1.9.tar.bz2
+midori-0.1.10.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- midori.spec	6 Aug 2009 07:01:34 -0000	1.26
+++ midori.spec	16 Sep 2009 06:07:09 -0000	1.27
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.9
+Version:	0.1.10
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -101,6 +101,12 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.10-1
+- Update to new upstream release (0.1.10): Updated AdBlock for WebKitGTK+
+  1.1.14, improved address completion, fixes for tab and feed handling, better
+  desktop integration, and Undo/Redo support - among other bugfixes and
+  enhancements.
+
 * Wed Aug 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.9-1
 - Update to new upstream release (0.1.9): lots of fixes and updates for tab
   functionality and the tab panel, as well as menu fixes, and enhancements


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Aug 2009 06:11:51 -0000	1.13
+++ sources	16 Sep 2009 06:07:09 -0000	1.14
@@ -1 +1 @@
-faf5295091f47372352840b84c422149  midori-0.1.9.tar.bz2
+97b6a3a3ccb8458c68c335b2ee8e9197  midori-0.1.10.tar.bz2



From rayvd at fedoraproject.org  Wed Sep 16 06:16:00 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:16:00 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 rsyslog-3.14.1-logrotate.d-rsyslog.log, NONE,
	1.1 rsyslog-syslog-ng-fc10.sysconfig, NONE,
	1.1 rsyslog-syslog-ng.sysconfig, NONE,
	1.1 sysklogd-1.4.1-44-logrotate.d-syslog.log, NONE,
	1.1 sysklogd-1.4.1-logrotate.d-syslog.log, NONE,
	1.1 sysklogd-syslog-ng.sysconfig, NONE, 1.1 syslog-ng.conf, NONE, 1.1
Message-ID: <20090916061600.5B89811C00E6@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11863

Added Files:
	rsyslog-3.14.1-logrotate.d-rsyslog.log 
	rsyslog-syslog-ng-fc10.sysconfig rsyslog-syslog-ng.sysconfig 
	sysklogd-1.4.1-44-logrotate.d-syslog.log 
	sysklogd-1.4.1-logrotate.d-syslog.log 
	sysklogd-syslog-ng.sysconfig syslog-ng.conf 
Log Message:
Missing files.


--- NEW FILE rsyslog-3.14.1-logrotate.d-rsyslog.log ---
/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


--- NEW FILE rsyslog-syslog-ng-fc10.sysconfig ---
SYSLOGNG_PID="/var/run/syslog-ng.pid"
SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"


--- NEW FILE rsyslog-syslog-ng.sysconfig ---
SYSLOGNG_PID="/var/run/syslog-ng.pid"
SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
SYSLOGNG_COMPAT_PID="/var/run/rsyslogd.pid"


--- NEW FILE sysklogd-1.4.1-44-logrotate.d-syslog.log ---
/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
    sharedscripts
    postrotate
	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
	/bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


--- NEW FILE sysklogd-1.4.1-logrotate.d-syslog.log ---
/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
    sharedscripts
    postrotate
	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


--- NEW FILE sysklogd-syslog-ng.sysconfig ---
SYSLOGNG_PID="/var/run/syslog-ng.pid"
SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"


--- NEW FILE syslog-ng.conf ---
# syslog-ng configuration file.
#
# This should behave pretty much like the original syslog on RedHat. But
# it could be configured a lot smarter.
#
# See syslog-ng(8) and syslog-ng.conf(5) for more information.
#

options {
	sync (0);
	time_reopen (10);
	log_fifo_size (1000);
	long_hostnames (off);
	use_dns (no);
	use_fqdn (no);
	create_dirs (no);
	keep_hostname (yes);
};

source s_sys {
	file ("/proc/kmsg" log_prefix("kernel: "));
	unix-stream ("/dev/log");
	internal();
	# udp(ip(0.0.0.0) port(514));
};

destination d_cons { file("/dev/console"); };
destination d_mesg { file("/var/log/messages"); };
destination d_auth { file("/var/log/secure"); };
destination d_mail { file("/var/log/maillog" sync(10)); };
destination d_spol { file("/var/log/spooler"); };
destination d_boot { file("/var/log/boot.log"); };
destination d_cron { file("/var/log/cron"); };
destination d_kern { file("/var/log/kern"); };
destination d_mlal { usertty("*"); };

filter f_kernel     { facility(kern); };
filter f_default    { level(info..emerg) and
                        not (facility(mail)
                        or facility(authpriv) 
                        or facility(cron)); };
filter f_auth       { facility(authpriv); };
filter f_mail       { facility(mail); };
filter f_emergency  { level(emerg); };
filter f_news       { facility(uucp) or
                        (facility(news) 
                        and level(crit..emerg)); };
filter f_boot   { facility(local7); };
filter f_cron   { facility(cron); };

#log { source(s_sys); filter(f_kernel); destination(d_cons); };
log { source(s_sys); filter(f_kernel); destination(d_kern); };
log { source(s_sys); filter(f_default); destination(d_mesg); };
log { source(s_sys); filter(f_auth); destination(d_auth); };
log { source(s_sys); filter(f_mail); destination(d_mail); };
log { source(s_sys); filter(f_emergency); destination(d_mlal); };
log { source(s_sys); filter(f_news); destination(d_spol); };
log { source(s_sys); filter(f_boot); destination(d_boot); };
log { source(s_sys); filter(f_cron); destination(d_cron); };

# vim:ft=syslog-ng:ai:si:ts=4:sw=4:et:



From rayvd at fedoraproject.org  Wed Sep 16 06:21:38 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:21:38 +0000 (UTC)
Subject: rpms/syslog-ng/F-11 syslog-ng.spec,1.43,1.44
Message-ID: <20090916062138.CA74C11C0332@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15464

Modified Files:
	syslog-ng.spec 
Log Message:
Branch sync


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/syslog-ng.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- syslog-ng.spec	16 Sep 2009 04:40:38 -0000	1.43
+++ syslog-ng.spec	16 Sep 2009 06:21:37 -0000	1.44
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Rebuilding for tag issue
 



From rayvd at fedoraproject.org  Wed Sep 16 06:22:01 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:22:01 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 syslog-ng.spec,1.41,1.42
Message-ID: <20090916062201.A8F2C11C0332@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15688

Modified Files:
	syslog-ng.spec 
Log Message:
Branch sync


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/syslog-ng.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- syslog-ng.spec	16 Sep 2009 04:40:38 -0000	1.41
+++ syslog-ng.spec	16 Sep 2009 06:22:01 -0000	1.42
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Rebuilding for tag issue
 



From rayvd at fedoraproject.org  Wed Sep 16 06:22:26 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:22:26 +0000 (UTC)
Subject: rpms/syslog-ng/EL-5 syslog-ng.spec,1.20,1.21
Message-ID: <20090916062226.2EB0611C0332@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15923

Modified Files:
	syslog-ng.spec 
Log Message:
Branch sync


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/syslog-ng.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- syslog-ng.spec	16 Sep 2009 04:40:37 -0000	1.20
+++ syslog-ng.spec	16 Sep 2009 06:22:25 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Rebuilding for tag issue
 



From rayvd at fedoraproject.org  Wed Sep 16 06:22:44 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:22:44 +0000 (UTC)
Subject: rpms/syslog-ng/EL-4 syslog-ng.spec,1.12,1.13
Message-ID: <20090916062244.00EFB11C0332@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16151

Modified Files:
	syslog-ng.spec 
Log Message:
Branch sync


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- syslog-ng.spec	16 Sep 2009 04:40:33 -0000	1.12
+++ syslog-ng.spec	16 Sep 2009 06:22:43 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Rebuilding for tag issue
 



From rayvd at fedoraproject.org  Wed Sep 16 06:23:27 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:23:27 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.46,1.47
Message-ID: <20090916062327.808BE11C00E6@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16397

Modified Files:
	syslog-ng.spec 
Log Message:
Branch sync


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- syslog-ng.spec	16 Sep 2009 04:40:39 -0000	1.46
+++ syslog-ng.spec	16 Sep 2009 06:23:21 -0000	1.47
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Rebuilding for tag issue
 



From jspaleta at fedoraproject.org  Wed Sep 16 06:37:43 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Wed, 16 Sep 2009 06:37:43 +0000 (UTC)
Subject: rpms/gpodder/devel .cvsignore, 1.24, 1.25 gpodder.spec, 1.33,
	1.34 sources, 1.24, 1.25
Message-ID: <20090916063743.CB9C911C00E6@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gpodder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24487

Modified Files:
	.cvsignore gpodder.spec sources 
Log Message:
* Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.0-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Jul 2009 06:22:11 -0000	1.24
+++ .cvsignore	16 Sep 2009 06:37:37 -0000	1.25
@@ -1 +1 @@
-gpodder-0.17.0.tar.gz
+gpodder-2.0.tar.gz


Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gpodder.spec	18 Aug 2009 15:11:28 -0000	1.33
+++ gpodder.spec	16 Sep 2009 06:37:38 -0000	1.34
@@ -2,8 +2,8 @@
 
 
 Name:           gpodder
-Version:        0.17.0
-Release:        3%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -74,6 +74,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.0-1
+- New upstream release
+
 * Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-3
 - Fix for desktop file encoding packaging problem
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Jul 2009 06:22:12 -0000	1.24
+++ sources	16 Sep 2009 06:37:38 -0000	1.25
@@ -1 +1 @@
-0290e4dee16a3220fc28d970d7ab4f9f  gpodder-0.17.0.tar.gz
+288641768cdef679ed2e7976562b200e  gpodder-2.0.tar.gz



From rayvd at fedoraproject.org  Wed Sep 16 06:39:44 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:39:44 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 rsyslog-3.21.9-logrotate.d-rsyslog.log, NONE,
	1.1 syslog-ng.spec, 1.42, 1.43
Message-ID: <20090916063944.77FD711C00E6@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25624

Modified Files:
	syslog-ng.spec 
Added Files:
	rsyslog-3.21.9-logrotate.d-rsyslog.log 
Log Message:



--- NEW FILE rsyslog-3.21.9-logrotate.d-rsyslog.log ---
/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
    sharedscripts
    postrotate
	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/syslog-ng.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- syslog-ng.spec	16 Sep 2009 06:22:01 -0000	1.42
+++ syslog-ng.spec	16 Sep 2009 06:39:43 -0000	1.43
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-7
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
 - Branch sync
 



From dchen at fedoraproject.org  Wed Sep 16 06:39:53 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Sep 2009 06:39:53 +0000 (UTC)
Subject: rpms/libsvm/devel import.log, 1.4, 1.5 libsvm-2.89.patch, 1.1,
	1.2 libsvm.spec, 1.36, 1.37
Message-ID: <20090916063953.D8E7E11C00E6@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26389/devel

Modified Files:
	import.log libsvm-2.89.patch libsvm.spec 
Log Message:
Fixed Bug 521194


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	3 Apr 2009 06:30:04 -0000	1.4
+++ import.log	16 Sep 2009 06:39:51 -0000	1.5
@@ -2,3 +2,4 @@ libsvm-2_88-0_fc9:HEAD:libsvm-2.88-0.fc9
 libsvm-2_88-1_fc9:HEAD:libsvm-2.88-1.fc9.src.rpm:1226296273
 libsvm-2_88-2_fc9:HEAD:libsvm-2.88-2.fc9.src.rpm:1226365469
 libsvm-2_89-1_fc10:HEAD:libsvm-2.89-1.fc10.src.rpm:1238738697
+libsvm-2_89-3_fc11:HEAD:libsvm-2.89-3.fc11.src.rpm:1253083141

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   29 ++++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 178 insertions(+), 31 deletions(-)

Index: libsvm-2.89.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm-2.89.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsvm-2.89.patch	3 Apr 2009 06:30:04 -0000	1.1
+++ libsvm-2.89.patch	16 Sep 2009 06:39:52 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./java/Makefile.bak ./java/Makefile
---- ./java/Makefile.bak	2009-02-18 10:41:04.000000000 +1000
-+++ ./java/Makefile	2009-04-03 15:13:40.000000000 +1000
+diff -up ./java/Makefile.orig ./java/Makefile
+--- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
++++ ./java/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		libsvm/svm_print_interface.class \
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
@@ -51,17 +51,17 @@ diff -up ./java/Makefile.bak ./java/Make
  
  dist: clean all
  	rm *.class libsvm/*.class
-diff -up ./java/test_applet.html.bak ./java/test_applet.html
---- ./java/test_applet.html.bak	2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html	2009-04-03 15:04:06.000000000 +1000
+diff -up ./java/test_applet.html.orig ./java/test_applet.html
+--- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
++++ ./java/test_applet.html	2009-09-16 13:44:31.000000000 +1000
 @@ -1 +1,3 @@
 -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
 +<html>
 +<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
 +</html>
-diff -up ./Makefile.bak ./Makefile
---- ./Makefile.bak	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2009-04-03 15:04:06.000000000 +1000
+diff -up ./Makefile.orig ./Makefile
+--- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
++++ ./Makefile	2009-09-16 14:40:39.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -106,7 +106,7 @@ diff -up ./Makefile.bak ./Makefile
  
  svm-predict: svm-predict.c svm.o
  	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
-@@ -16,4 +45,59 @@ svm-scale: svm-scale.c
+@@ -16,4 +45,65 @@ svm-scale: svm-scale.c
  svm.o: svm.cpp svm.h
  	$(CXX) $(CFLAGS) -c svm.cpp
  clean:
@@ -117,7 +117,9 @@ diff -up ./Makefile.bak ./Makefile
 +svm-python:
 +	${MAKE} -C python
 +svm-java:
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	${MAKE} -C java
++endif
 +svm-toy-gtk:
 +	${MAKE} -C svm-toy/gtk
 +svm-toy-qt:
@@ -138,14 +140,16 @@ diff -up ./Makefile.bak ./Makefile
 +	install -m 644 *.c ${INSTDIR}/share/libsvm/src
 +	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
 +	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
 +	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
 +	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
 +	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
-+# install package libsvm-python
-+	${MAKE} -C python install
 +# install package libsvm-java
 +	${MAKE} -C java install
++endif
++# install package libsvm-python
++	${MAKE} -C python install
 +# install package svm-toy
 +	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
 +	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
@@ -162,14 +166,16 @@ diff -up ./Makefile.bak ./Makefile
 +	rm -fr ${INSTDIR}/libsvm/src
 +	rm -fr ${INSTDIR}/libsvm
 +	${MAKE} -C python uninstall
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	${MAKE} -C java uninstall
++endif
 +	rm -f ${INSTDIR}/bin/svm-toy-gtk
 +	rm -f ${INSTDIR}/bin/svm-toy-qt
 +
 +
-diff -up ./python/Makefile.bak ./python/Makefile
---- ./python/Makefile.bak	2008-12-10 09:05:08.000000000 +1000
-+++ ./python/Makefile	2009-04-03 15:21:19.000000000 +1000
+diff -up ./python/Makefile.orig ./python/Makefile
+--- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
++++ ./python/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -2,9 +2,11 @@ CXX? = g++
  SWIG ?= swig
  
@@ -217,9 +223,9 @@ diff -up ./python/Makefile.bak ./python/
 +uninstall:
 +	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 +
-diff -up ./svm-toy/gtk/callbacks.cpp.bak ./svm-toy/gtk/callbacks.cpp
---- ./svm-toy/gtk/callbacks.cpp.bak	2006-03-04 17:40:12.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp	2009-04-03 15:04:06.000000000 +1000
+diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
+--- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
++++ ./svm-toy/gtk/callbacks.cpp	2009-09-16 13:44:31.000000000 +1000
 @@ -2,6 +2,7 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -228,9 +234,9 @@ diff -up ./svm-toy/gtk/callbacks.cpp.bak
  #include "callbacks.h"
  #include "interface.h"
  #include "../../svm.h"
-diff -up ./svm-toy/gtk/Makefile.bak ./svm-toy/gtk/Makefile
---- ./svm-toy/gtk/Makefile.bak	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/gtk/Makefile	2009-04-03 15:04:06.000000000 +1000
+diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
+--- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -2,21 +2,27 @@ CC? = gcc
  CXX? = g++
  CFLAGS = -Wall -O3 -g `gtk-config --cflags`
@@ -267,10 +273,10 @@ diff -up ./svm-toy/gtk/Makefile.bak ./sv
  clean:
 -	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
 +	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
-diff -up ./svm-toy/qt/Makefile.bak ./svm-toy/qt/Makefile
---- ./svm-toy/qt/Makefile.bak	2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2009-04-03 15:25:25.000000000 +1000
-@@ -1,17 +1,20 @@
+diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
+--- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
++++ ./svm-toy/qt/Makefile	2009-09-16 13:44:31.000000000 +1000
+@@ -1,17 +1,21 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
 +CFLAGS = -Wall -O3
@@ -279,10 +285,12 @@ diff -up ./svm-toy/qt/Makefile.bak ./svm
 +LIBS= -L${LOCAL_LIBDIR} -lsvm
 +
  INCLUDE = /usr/include/qt4
- MOC = /usr/bin/moc-qt4
+-MOC = /usr/bin/moc-qt4
  
 -svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
 -	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
++MOC=${MOC_PATH}
++
 +all: svm-toy-qt
 +
 +svm-toy-qt: svm-toy.cpp svm-toy.moc
@@ -298,9 +306,9 @@ diff -up ./svm-toy/qt/Makefile.bak ./svm
 -	rm -f *~ svm-toy svm-toy.moc ../../svm.o
 +	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
  
-diff -up ./tools/easy.py.bak ./tools/easy.py
---- ./tools/easy.py.bak	2009-01-14 07:13:26.000000000 +1000
-+++ ./tools/easy.py	2009-04-03 15:04:06.000000000 +1000
+diff -up ./tools/easy.py.orig ./tools/easy.py
+--- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
++++ ./tools/easy.py	2009-09-16 13:44:31.000000000 +1000
 @@ -2,6 +2,7 @@
  
  import sys
@@ -324,9 +332,9 @@ diff -up ./tools/easy.py.bak ./tools/eas
  	gnuplot_exe = "/usr/bin/gnuplot"
  else:
          # example for windows
-diff -up ./tools/grid.py.bak ./tools/grid.py
---- ./tools/grid.py.bak	2008-08-08 20:41:11.000000000 +1000
-+++ ./tools/grid.py	2009-04-03 15:04:06.000000000 +1000
+diff -up ./tools/grid.py.orig ./tools/grid.py
+--- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
++++ ./tools/grid.py	2009-09-16 13:44:31.000000000 +1000
 @@ -11,7 +11,7 @@ from subprocess import *
  
  is_win32 = (sys.platform == 'win32')


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libsvm.spec	25 Jul 2009 08:42:40 -0000	1.36
+++ libsvm.spec	16 Sep 2009 06:39:52 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.89
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -23,7 +23,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %define javac javac
 %define jar jar
 %define libdir_libsvm %{_libdir}/libsvm
-%{!?qt3-devel: }
+%if 0%{?fedora} >= 9
+%define moc_path %{_bindir}/moc-qt4
+%else
+%define moc_path %{_libdir}/qt4/bin/moc
+%endif
+%ifnarch ppc ppc64
+%define no_java FALSE
+%else
+%define no_java NO_JAVA
+%endif
 
 
 %description
@@ -55,19 +64,19 @@ Python tools and interfaces for libsvm.
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%ifnarch ppc ppc64
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-sdk >= 0:1.5.0
-Requires: jre >= 0:1.5.0
+BuildRequires:  java-1.6.0-openjdk-devel
+Requires: jre >= 1.6.0
 Requires:       %{name} = %{version}-%{release}
 
 %description java
 Java tools and interfaces for libsvm.
 Install this package if you want to develop 
 programs with libsvm in Java.
-Install libsvm-javadoc for 
-
+%endif
 
 %package svm-toy-gtk
 Summary:    GTK version of svm-toy (libsvm demostration program)
@@ -110,7 +119,7 @@ cp %{SOURCE5} %{name}-svm-toy-qt-48.png
 %build
 %{__sed} -i 's/\r//' FAQ.html
 %{__sed} -i 's/\r//' ChangeLog
-make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" 
+make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
 mv python/README python/README-Python
 mv tools/README tools/README-Tools
 cp README java/README-Java
@@ -120,7 +129,7 @@ cp README svm-toy/qt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"
+make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}"
 ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -130,6 +139,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/app
 cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 
+# [Bug 521194] Python: 'import libsvm' doesn't work
+echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
+# This file is released under BSD license, just like the rest of the package.\n"\
+ > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
+
 desktop-file-install --delete-original --vendor=fedora \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
@@ -181,11 +195,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
 %doc java/README-Java 
 %{_datadir}/%{name}/java
 #%{_datadir}/javadoc/%{name}-%{version}
+%endif
 
 %files svm-toy-gtk
 %defattr(-,root,root,-)
@@ -203,6 +219,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
+- Fix the building for EL-5
+  Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
+  as java-1.6.0-openjdk-devel for them do not exist yet.
+- Change the Java buildrequires from java-sdk to java-1.6.0-openjdk-devel
+- Fix [Bug 521194] Python: 'import libsvm' doesn't work.
+   By adding __init__.py to libsvm_python_dir
+  
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.89-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dchen at fedoraproject.org  Wed Sep 16 06:51:31 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Sep 2009 06:51:31 +0000 (UTC)
Subject: rpms/libsvm/F-11 import.log, 1.4, 1.5 libsvm-2.89.patch, 1.1,
	1.2 libsvm.spec, 1.35, 1.36
Message-ID: <20090916065133.DAEC611C00EC@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1065/F-11

Modified Files:
	import.log libsvm-2.89.patch libsvm.spec 
Log Message:
Fixed Bug 521194


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	3 Apr 2009 06:30:04 -0000	1.4
+++ import.log	16 Sep 2009 06:51:24 -0000	1.5
@@ -2,3 +2,4 @@ libsvm-2_88-0_fc9:HEAD:libsvm-2.88-0.fc9
 libsvm-2_88-1_fc9:HEAD:libsvm-2.88-1.fc9.src.rpm:1226296273
 libsvm-2_88-2_fc9:HEAD:libsvm-2.88-2.fc9.src.rpm:1226365469
 libsvm-2_89-1_fc10:HEAD:libsvm-2.89-1.fc10.src.rpm:1238738697
+libsvm-2_89-3_fc11:F-11:libsvm-2.89-3.fc11.src.rpm:1253083248

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   29 ++++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 178 insertions(+), 31 deletions(-)

Index: libsvm-2.89.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-11/libsvm-2.89.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsvm-2.89.patch	3 Apr 2009 06:30:04 -0000	1.1
+++ libsvm-2.89.patch	16 Sep 2009 06:51:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./java/Makefile.bak ./java/Makefile
---- ./java/Makefile.bak	2009-02-18 10:41:04.000000000 +1000
-+++ ./java/Makefile	2009-04-03 15:13:40.000000000 +1000
+diff -up ./java/Makefile.orig ./java/Makefile
+--- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
++++ ./java/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		libsvm/svm_print_interface.class \
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
@@ -51,17 +51,17 @@ diff -up ./java/Makefile.bak ./java/Make
  
  dist: clean all
  	rm *.class libsvm/*.class
-diff -up ./java/test_applet.html.bak ./java/test_applet.html
---- ./java/test_applet.html.bak	2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html	2009-04-03 15:04:06.000000000 +1000
+diff -up ./java/test_applet.html.orig ./java/test_applet.html
+--- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
++++ ./java/test_applet.html	2009-09-16 13:44:31.000000000 +1000
 @@ -1 +1,3 @@
 -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
 +<html>
 +<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
 +</html>
-diff -up ./Makefile.bak ./Makefile
---- ./Makefile.bak	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2009-04-03 15:04:06.000000000 +1000
+diff -up ./Makefile.orig ./Makefile
+--- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
++++ ./Makefile	2009-09-16 14:40:39.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -106,7 +106,7 @@ diff -up ./Makefile.bak ./Makefile
  
  svm-predict: svm-predict.c svm.o
  	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
-@@ -16,4 +45,59 @@ svm-scale: svm-scale.c
+@@ -16,4 +45,65 @@ svm-scale: svm-scale.c
  svm.o: svm.cpp svm.h
  	$(CXX) $(CFLAGS) -c svm.cpp
  clean:
@@ -117,7 +117,9 @@ diff -up ./Makefile.bak ./Makefile
 +svm-python:
 +	${MAKE} -C python
 +svm-java:
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	${MAKE} -C java
++endif
 +svm-toy-gtk:
 +	${MAKE} -C svm-toy/gtk
 +svm-toy-qt:
@@ -138,14 +140,16 @@ diff -up ./Makefile.bak ./Makefile
 +	install -m 644 *.c ${INSTDIR}/share/libsvm/src
 +	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
 +	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
 +	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
 +	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
 +	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
-+# install package libsvm-python
-+	${MAKE} -C python install
 +# install package libsvm-java
 +	${MAKE} -C java install
++endif
++# install package libsvm-python
++	${MAKE} -C python install
 +# install package svm-toy
 +	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
 +	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
@@ -162,14 +166,16 @@ diff -up ./Makefile.bak ./Makefile
 +	rm -fr ${INSTDIR}/libsvm/src
 +	rm -fr ${INSTDIR}/libsvm
 +	${MAKE} -C python uninstall
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	${MAKE} -C java uninstall
++endif
 +	rm -f ${INSTDIR}/bin/svm-toy-gtk
 +	rm -f ${INSTDIR}/bin/svm-toy-qt
 +
 +
-diff -up ./python/Makefile.bak ./python/Makefile
---- ./python/Makefile.bak	2008-12-10 09:05:08.000000000 +1000
-+++ ./python/Makefile	2009-04-03 15:21:19.000000000 +1000
+diff -up ./python/Makefile.orig ./python/Makefile
+--- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
++++ ./python/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -2,9 +2,11 @@ CXX? = g++
  SWIG ?= swig
  
@@ -217,9 +223,9 @@ diff -up ./python/Makefile.bak ./python/
 +uninstall:
 +	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 +
-diff -up ./svm-toy/gtk/callbacks.cpp.bak ./svm-toy/gtk/callbacks.cpp
---- ./svm-toy/gtk/callbacks.cpp.bak	2006-03-04 17:40:12.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp	2009-04-03 15:04:06.000000000 +1000
+diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
+--- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
++++ ./svm-toy/gtk/callbacks.cpp	2009-09-16 13:44:31.000000000 +1000
 @@ -2,6 +2,7 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -228,9 +234,9 @@ diff -up ./svm-toy/gtk/callbacks.cpp.bak
  #include "callbacks.h"
  #include "interface.h"
  #include "../../svm.h"
-diff -up ./svm-toy/gtk/Makefile.bak ./svm-toy/gtk/Makefile
---- ./svm-toy/gtk/Makefile.bak	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/gtk/Makefile	2009-04-03 15:04:06.000000000 +1000
+diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
+--- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -2,21 +2,27 @@ CC? = gcc
  CXX? = g++
  CFLAGS = -Wall -O3 -g `gtk-config --cflags`
@@ -267,10 +273,10 @@ diff -up ./svm-toy/gtk/Makefile.bak ./sv
  clean:
 -	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
 +	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
-diff -up ./svm-toy/qt/Makefile.bak ./svm-toy/qt/Makefile
---- ./svm-toy/qt/Makefile.bak	2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2009-04-03 15:25:25.000000000 +1000
-@@ -1,17 +1,20 @@
+diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
+--- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
++++ ./svm-toy/qt/Makefile	2009-09-16 13:44:31.000000000 +1000
+@@ -1,17 +1,21 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
 +CFLAGS = -Wall -O3
@@ -279,10 +285,12 @@ diff -up ./svm-toy/qt/Makefile.bak ./svm
 +LIBS= -L${LOCAL_LIBDIR} -lsvm
 +
  INCLUDE = /usr/include/qt4
- MOC = /usr/bin/moc-qt4
+-MOC = /usr/bin/moc-qt4
  
 -svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
 -	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
++MOC=${MOC_PATH}
++
 +all: svm-toy-qt
 +
 +svm-toy-qt: svm-toy.cpp svm-toy.moc
@@ -298,9 +306,9 @@ diff -up ./svm-toy/qt/Makefile.bak ./svm
 -	rm -f *~ svm-toy svm-toy.moc ../../svm.o
 +	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
  
-diff -up ./tools/easy.py.bak ./tools/easy.py
---- ./tools/easy.py.bak	2009-01-14 07:13:26.000000000 +1000
-+++ ./tools/easy.py	2009-04-03 15:04:06.000000000 +1000
+diff -up ./tools/easy.py.orig ./tools/easy.py
+--- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
++++ ./tools/easy.py	2009-09-16 13:44:31.000000000 +1000
 @@ -2,6 +2,7 @@
  
  import sys
@@ -324,9 +332,9 @@ diff -up ./tools/easy.py.bak ./tools/eas
  	gnuplot_exe = "/usr/bin/gnuplot"
  else:
          # example for windows
-diff -up ./tools/grid.py.bak ./tools/grid.py
---- ./tools/grid.py.bak	2008-08-08 20:41:11.000000000 +1000
-+++ ./tools/grid.py	2009-04-03 15:04:06.000000000 +1000
+diff -up ./tools/grid.py.orig ./tools/grid.py
+--- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
++++ ./tools/grid.py	2009-09-16 13:44:31.000000000 +1000
 @@ -11,7 +11,7 @@ from subprocess import *
  
  is_win32 = (sys.platform == 'win32')


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-11/libsvm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libsvm.spec	3 Apr 2009 06:30:04 -0000	1.35
+++ libsvm.spec	16 Sep 2009 06:51:25 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.89
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -23,7 +23,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %define javac javac
 %define jar jar
 %define libdir_libsvm %{_libdir}/libsvm
-%{!?qt3-devel: }
+%if 0%{?fedora} >= 9
+%define moc_path %{_bindir}/moc-qt4
+%else
+%define moc_path %{_libdir}/qt4/bin/moc
+%endif
+%ifnarch ppc ppc64
+%define no_java FALSE
+%else
+%define no_java NO_JAVA
+%endif
 
 
 %description
@@ -55,19 +64,19 @@ Python tools and interfaces for libsvm.
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%ifnarch ppc ppc64
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-sdk >= 0:1.5.0
-Requires: jre >= 0:1.5.0
+BuildRequires:  java-1.6.0-openjdk-devel
+Requires: jre >= 1.6.0
 Requires:       %{name} = %{version}-%{release}
 
 %description java
 Java tools and interfaces for libsvm.
 Install this package if you want to develop 
 programs with libsvm in Java.
-Install libsvm-javadoc for 
-
+%endif
 
 %package svm-toy-gtk
 Summary:    GTK version of svm-toy (libsvm demostration program)
@@ -110,7 +119,7 @@ cp %{SOURCE5} %{name}-svm-toy-qt-48.png
 %build
 %{__sed} -i 's/\r//' FAQ.html
 %{__sed} -i 's/\r//' ChangeLog
-make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" 
+make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
 mv python/README python/README-Python
 mv tools/README tools/README-Tools
 cp README java/README-Java
@@ -120,7 +129,7 @@ cp README svm-toy/qt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"
+make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}"
 ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -130,6 +139,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/app
 cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 
+# [Bug 521194] Python: 'import libsvm' doesn't work
+echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
+# This file is released under BSD license, just like the rest of the package.\n"\
+ > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
+
 desktop-file-install --delete-original --vendor=fedora \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
@@ -181,11 +195,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
 %doc java/README-Java 
 %{_datadir}/%{name}/java
 #%{_datadir}/javadoc/%{name}-%{version}
+%endif
 
 %files svm-toy-gtk
 %defattr(-,root,root,-)
@@ -203,6 +219,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
+- Fix the building for EL-5
+  Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
+  as java-1.6.0-openjdk-devel for them do not exist yet.
+- Change the Java buildrequires from java-sdk to java-1.6.0-openjdk-devel
+- Fix [Bug 521194] Python: 'import libsvm' doesn't work.
+   By adding __init__.py to libsvm_python_dir
+  
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.89-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-1
 - Upstream Update to 2.89:
   + reduce input/loading time of svm-train/svm-predict by half



From rayvd at fedoraproject.org  Wed Sep 16 06:57:33 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 16 Sep 2009 06:57:33 +0000 (UTC)
Subject: rpms/syslog-ng/F-10 syslog-ng.spec,1.43,1.44
Message-ID: <20090916065733.49C8211C00E6@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4547

Modified Files:
	syslog-ng.spec 
Log Message:
eventlog build requirement


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/syslog-ng.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- syslog-ng.spec	16 Sep 2009 06:39:43 -0000	1.43
+++ syslog-ng.spec	16 Sep 2009 06:57:31 -0000	1.44
@@ -1,12 +1,12 @@
 %{?_with_spoofsource:%define spoofsource 1}
-%define evtlog_ver 0.2.7-2
+%define evtlog_ver 0.2.7-1
 
 %define _sbindir /sbin
 %define _localstatedir /var/lib/syslog-ng
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-8
+- Adjust eventlog build requirement
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-7
 - Branch sync
 



From akurtakov at fedoraproject.org  Wed Sep 16 07:04:27 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 16 Sep 2009 07:04:27 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel maven2-common-poms.spec, 1.10,
	1.11 sources, 1.6, 1.7 maven2-common-poms-jpp-depmap.xml, 1.6, 1.7
Message-ID: <20090916070427.DBFEB11C00EC@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7788/devel

Modified Files:
	maven2-common-poms.spec sources 
	maven2-common-poms-jpp-depmap.xml 
Log Message:
Add apache-commons parent pom.


Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- maven2-common-poms.spec	10 Sep 2009 08:53:10 -0000	1.10
+++ maven2-common-poms.spec	16 Sep 2009 07:04:21 -0000	1.11
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           10%{?dist}
+Release:           11%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2
 
 %changelog
+* Wed Sep 16 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-11
+- Add apache-commons parent pom.
+
 * Thu Sep 10 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-10
 - Add jetty and plexus parent poms.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Sep 2009 08:53:11 -0000	1.6
+++ sources	16 Sep 2009 07:04:22 -0000	1.7
@@ -1,2 +1,2 @@
 e1a697356772cf0dc7badade59aa922b  maven2-common-poms-docs.tar.gz
-d36c495ac5869ec89aa9679b3e0aefbe  maven2-common-poms-src.tar.gz
+bb947f092599fc8830820856435b0d27  maven2-common-poms-src.tar.gz


Index: maven2-common-poms-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms-jpp-depmap.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- maven2-common-poms-jpp-depmap.xml	10 Sep 2009 08:53:11 -0000	1.6
+++ maven2-common-poms-jpp-depmap.xml	16 Sep 2009 07:04:22 -0000	1.7
@@ -4171,4 +4171,16 @@
             <version>1.0.2</version>
         </jpp>
     </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-parent</artifactId>
+            <version>11</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>commons-parent</artifactId>
+            <version>11</version>
+        </jpp>
+    </dependency>
 </dependencies>



From grof at fedoraproject.org  Wed Sep 16 07:08:53 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 16 Sep 2009 07:08:53 +0000 (UTC)
Subject: rpms/me-tv/devel me-tv-1.0.0-dupname.patch, NONE, 1.1 import.log,
	1.4, 1.5 me-tv.spec, 1.5, 1.6
Message-ID: <20090916070855.338E211C00E6@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/me-tv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9877/devel

Modified Files:
	import.log me-tv.spec 
Added Files:
	me-tv-1.0.0-dupname.patch 
Log Message:


me-tv-1.0.0-dupname.patch:
 me-tv.ui |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE me-tv-1.0.0-dupname.patch ---
--- me-tv-1.0.0/src/me-tv.ui
+++ me-tv-1.0.0/src/me-tv.ui
@@ -1216,7 +1216,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox9">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkComboBox" id="combo_box_deinterlace_type">
@@ -1866,7 +1866,7 @@
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkVBox" id="vbox8">
             <property name="visible">True</property>
             <child>
               <object class="GtkLabel" id="label_select_devic">


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	9 Sep 2009 08:53:13 -0000	1.4
+++ import.log	16 Sep 2009 07:08:51 -0000	1.5
@@ -2,3 +2,4 @@ me-tv-0_8_12-4_fc11:HEAD:me-tv-0.8.12-4.
 me-tv-0_8_12-5_fc11:HEAD:me-tv-0.8.12-5.fc11.src.rpm:1242984059
 me-tv-0_9_4-1_fc11:HEAD:me-tv-0.9.4-1.fc11.src.rpm:1246264304
 me-tv-1_0_0-1_fc11:HEAD:me-tv-1.0.0-1.fc11.src.rpm:1252486615
+me-tv-1_0_0-2_fc11:HEAD:me-tv-1.0.0-2.fc11.src.rpm:1253085150


Index: me-tv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/devel/me-tv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- me-tv.spec	9 Sep 2009 08:53:13 -0000	1.5
+++ me-tv.spec	16 Sep 2009 07:08:52 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           me-tv
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME desktop application for watching digital television
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            https://launchpad.net/me-tv
 Source0:        http://launchpad.net/me-tv/stable/%{version}/+download/%{name}-%{version}.tar.gz
+Patch0:         me-tv-1.0.0-dupname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel 
@@ -33,6 +34,8 @@ which can be used for scheduling recordi
 
 %prep
 %setup -q
+#Patch for resolving duplicate name bug at startup
+%patch0 -p1 -b .dupname
 
 %build
 %configure
@@ -69,6 +72,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Sep 16 2009 Zarko <zarko.pintar at gmail.com> - 1.0.0-2
+- Added patch for resolving duplicate name bug at startup
+
 * Wed Sep 09 2009 Zarko <zarko.pintar at gmail.com> - 1.0.0-1
 - new release
 - license changed to GPLv3



From grof at fedoraproject.org  Wed Sep 16 07:12:01 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 16 Sep 2009 07:12:01 +0000 (UTC)
Subject: rpms/me-tv/F-11 me-tv-1.0.0-dupname.patch, NONE, 1.1 import.log, 1.4,
	1.5 me-tv.spec, 1.4, 1.5
Message-ID: <20090916071203.582E511C0374@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/me-tv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10964/F-11

Modified Files:
	import.log me-tv.spec 
Added Files:
	me-tv-1.0.0-dupname.patch 
Log Message:


me-tv-1.0.0-dupname.patch:
 me-tv.ui |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE me-tv-1.0.0-dupname.patch ---
--- me-tv-1.0.0/src/me-tv.ui
+++ me-tv-1.0.0/src/me-tv.ui
@@ -1216,7 +1216,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox9">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkComboBox" id="combo_box_deinterlace_type">
@@ -1866,7 +1866,7 @@
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkVBox" id="vbox8">
             <property name="visible">True</property>
             <child>
               <object class="GtkLabel" id="label_select_devic">


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	9 Sep 2009 08:57:13 -0000	1.4
+++ import.log	16 Sep 2009 07:11:51 -0000	1.5
@@ -2,3 +2,4 @@ me-tv-0_8_12-4_fc11:F-11:me-tv-0.8.12-4.
 me-tv-0_8_12-5_fc11:F-11:me-tv-0.8.12-5.fc11.src.rpm:1242984225
 me-tv-0_9_4-1_fc11:F-11:me-tv-0.9.4-1.fc11.src.rpm:1246264585
 me-tv-1_0_0-1_fc11:F-11:me-tv-1.0.0-1.fc11.src.rpm:1252486814
+me-tv-1_0_0-2_fc11:F-11:me-tv-1.0.0-2.fc11.src.rpm:1253085311


Index: me-tv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/me-tv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- me-tv.spec	9 Sep 2009 08:57:13 -0000	1.4
+++ me-tv.spec	16 Sep 2009 07:11:52 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           me-tv
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME desktop application for watching digital television
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            https://launchpad.net/me-tv
 Source0:        http://launchpad.net/me-tv/stable/%{version}/+download/%{name}-%{version}.tar.gz
+Patch0:         me-tv-1.0.0-dupname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel 
@@ -33,6 +34,8 @@ which can be used for scheduling recordi
 
 %prep
 %setup -q
+#Patch for resolving duplicate name bug at startup
+%patch0 -p1 -b .dupname
 
 %build
 %configure
@@ -69,6 +72,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Sep 16 2009 Zarko <zarko.pintar at gmail.com> - 1.0.0-2
+- Added patch for resolving duplicate name bug at startup
+
 * Wed Sep 09 2009 Zarko <zarko.pintar at gmail.com> - 1.0.0-1
 - new release
 - license changed to GPLv3



From varekova at fedoraproject.org  Wed Sep 16 07:20:51 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed, 16 Sep 2009 07:20:51 +0000 (UTC)
Subject: rpms/psacct/devel psacct.init,1.6,1.7 psacct.spec,1.38,1.39
Message-ID: <20090916072051.A261411C0374@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/psacct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14331

Modified Files:
	psacct.init psacct.spec 
Log Message:
 - fix init script (#521195)



Index: psacct.init
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- psacct.init	25 Jul 2007 07:30:12 -0000	1.6
+++ psacct.init	16 Sep 2009 07:20:44 -0000	1.7
@@ -8,6 +8,10 @@
 # description:  Starts and stops process accounting
 # short-description:  Starts and stops process accounting
 
+### BEGIN INIT INFO
+# Description: Starts and stops process accounting
+# Short-Description: Starts and stops process accounting
+### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
@@ -24,10 +28,10 @@ start() {
     	    if [ $RETVAL -eq 0 ]; then
 		touch $LOCKFILE
 	    else 
-		exit 3
+		exit 7
 	    fi
 	else 
-	    exit 1
+	    exit 4
 	fi
 }
 
@@ -37,9 +41,9 @@ stop() {
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 	    rm -f $LOCKFILE
-	    exit 3
-	else 
 	    exit 0
+	else
+	    exit 1
 	fi
 }
 
@@ -67,7 +71,7 @@ case "$1" in
 	# do not advertise unreasonable commands that there is no reason
 	# to use with this device
 	echo $"Usage: $0 {start|stop|status|restart|reload}"
-	exit 1
+	exit 2
 esac
 
 exit 0


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- psacct.spec	26 Jul 2009 19:32:25 -0000	1.38
+++ psacct.spec	16 Sep 2009 07:20:45 -0000	1.39
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.3.2
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -174,6 +174,9 @@ fi
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Wed Sep 16 2009 Ivana Varekova <varekova at redhat.com> - 6.2.3-55
+- fix init script (#521195)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.2-54
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Wed Sep 16 07:51:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 07:51:01 +0000 (UTC)
Subject: rpms/ghc-editline/devel ghc-editline.spec,1.9,1.10
Message-ID: <20090916075101.6CD7F11C0374@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-editline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26335

Modified Files:
	ghc-editline.spec 
Log Message:
- sync with current cabal2spec template to minimise cabal2spec-diff
  - preun fixes postun uninstall error




Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ghc-editline.spec	27 Jul 2009 16:05:08 -0000	1.9
+++ ghc-editline.spec	16 Sep 2009 07:50:59 -0000	1.10
@@ -1,28 +1,30 @@
 %global pkg_name editline
-%global debug_package %{nil}
 
 %bcond_without doc
 %bcond_without prof
 
-Name:		ghc-%{pkg_name}
-Version:	0.2.1.0
-Release:	10%{?dist}
-Summary:	Haskell %{pkg_name} library
-Group:		Development/Libraries
-License:	BSD
-URL:		http://code.haskell.org/editline
-Source0:	http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-ExclusiveArch:	%{ix86} x86_64 ppc alpha
-
-BuildRequires:	ghc >= 6.10, ghc-rpm-macros, libedit-devel
-%if %{with_doc}
-BuildRequires:	ghc-doc
-%endif
+# ghc does not emit debug information
+%global debug_package %{nil}
 
-%if %{with_prof}
-BuildRequires:	ghc-prof
+Name:           ghc-%{pkg_name}
+Version:        0.2.1.0
+Release:        11%{?dist}
+Summary:        Haskell %{pkg_name} library
+
+Group:          Development/Libraries
+License:        BSD
+URL:            http://code.haskell.org/editline
+Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# fedora ghc archs:
+ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  libedit-devel
+%if %{with doc}
+BuildRequires:  ghc-doc
+%endif
+%if %{with prof}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -34,100 +36,113 @@ Additionally, a readline compatibility m
 provides a subset of the functionality of the readline library.
 
 %package devel
-Summary:	 Haskell %{pkg_name} library
-Group:		 Development/Libraries
-Requires:	 libedit-devel
-Requires:	 ghc = %{ghc_version}
-Requires(post):	 ghc = %{ghc_version}
-Requires(postun):    ghc = %{ghc_version}
-Requires:	     libedit-devel
+Summary:        Haskell %{pkg_name} library
+Group:          Development/Libraries
+Requires:       ghc = %{ghc_version}
+Requires(post): ghc = %{ghc_version}
+Requires(preun): ghc = %{ghc_version}
+Requires:       libedit-devel
 
 %description devel
-This package will contains the development files for %{name}
-built for ghc-%{ghc_version}
+This package contains the development files for %{name}
+built for ghc-%{ghc_version}.
 
 
-%if %{with_doc}
+%if %{with doc}
 %package 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}
+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 doc
-Thsi package contains the documentation files for the %{name} library
+This package contains development documentation files for the %{name} library.
 %endif
 
-%if %{with_prof}
+
+%if %{with prof}
 %package prof
-Summary:    Profiling libraries for %{name}
-Group:	    Development/Libraries
-Requires:   %{name}-devel = %{version}-%{release}
-Requires:   ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
+
 %description prof
 This package contains profiling libraries for %{name}
-built for ghc-%{version}
+built for ghc-%{ghc_version}.
 %endif
 
+
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
+
 %build
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
-
-%if %{with_doc}
+%if %{with doc}
 %cabal haddock
 %endif
-
 %ghc_gen_scripts
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %cabal_install
 %ghc_install_scripts
 %ghc_gen_filelists %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel 
+%post devel
 %ghc_register_pkg
 
-%if %{with_doc}
+
+%if %{with doc}
 %post doc
 %ghc_reindex_haddock
 %endif
 
-%postun devel
+
+%preun devel
 if [ "$1" -eq 0 ] ; then
-   %ghc_unregister_pkg
+  %ghc_unregister_pkg
 fi
 
-%if %{with_doc}
+
+%if %{with doc}
 %postun doc
 if [ "$1" -eq 0 ] ; then
-   %ghc_reindex_haddock
+  %ghc_reindex_haddock
 fi
 %endif
 
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
 
-%if %{with_doc}
+
+%if %{with doc}
 %files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
 %endif
 
-%if %{with_prof}
+
+%if %{with prof}
 %files prof -f %{name}-prof.files
 %defattr(-,root,root,-)
 %endif
 
 %Changelog
+* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
+- sync with current cabal2spec template to minimise cabal2spec-diff
+  - fixes uninstall error
+
 * Mon Jul 27 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.2.1.0-10
 - Rebuild
 



From dchen at fedoraproject.org  Wed Sep 16 08:04:55 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Sep 2009 08:04:55 +0000 (UTC)
Subject: rpms/libsvm/F-10 import.log, 1.4, 1.5 libsvm-2.89.patch, 1.1,
	1.2 libsvm.spec, 1.4, 1.5
Message-ID: <20090916080456.0AEB111C00E6@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1217/F-10

Modified Files:
	import.log libsvm-2.89.patch libsvm.spec 
Log Message:
Fixed Bug 521194


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	3 Apr 2009 06:57:42 -0000	1.4
+++ import.log	16 Sep 2009 08:04:52 -0000	1.5
@@ -2,3 +2,4 @@ libsvm-2_88-0_fc9:F-10:libsvm-2.88-0.fc9
 libsvm-2_88-1_fc9:F-10:libsvm-2.88-1.fc9.src.rpm:1226297083
 libsvm-2_88-2_fc9:F-10:libsvm-2.88-2.fc9.src.rpm:1226365621
 libsvm-2_89-1_fc10:F-10:libsvm-2.89-1.fc10.src.rpm:1238740885
+libsvm-2_89-3_fc11:F-10:libsvm-2.89-3.fc11.src.rpm:1253088241

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   29 ++++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 178 insertions(+), 31 deletions(-)

Index: libsvm-2.89.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/libsvm-2.89.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsvm-2.89.patch	3 Apr 2009 06:57:43 -0000	1.1
+++ libsvm-2.89.patch	16 Sep 2009 08:04:52 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./java/Makefile.bak ./java/Makefile
---- ./java/Makefile.bak	2009-02-18 10:41:04.000000000 +1000
-+++ ./java/Makefile	2009-04-03 15:13:40.000000000 +1000
+diff -up ./java/Makefile.orig ./java/Makefile
+--- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
++++ ./java/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		libsvm/svm_print_interface.class \
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
@@ -51,17 +51,17 @@ diff -up ./java/Makefile.bak ./java/Make
  
  dist: clean all
  	rm *.class libsvm/*.class
-diff -up ./java/test_applet.html.bak ./java/test_applet.html
---- ./java/test_applet.html.bak	2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html	2009-04-03 15:04:06.000000000 +1000
+diff -up ./java/test_applet.html.orig ./java/test_applet.html
+--- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
++++ ./java/test_applet.html	2009-09-16 13:44:31.000000000 +1000
 @@ -1 +1,3 @@
 -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
 +<html>
 +<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
 +</html>
-diff -up ./Makefile.bak ./Makefile
---- ./Makefile.bak	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2009-04-03 15:04:06.000000000 +1000
+diff -up ./Makefile.orig ./Makefile
+--- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
++++ ./Makefile	2009-09-16 14:40:39.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -106,7 +106,7 @@ diff -up ./Makefile.bak ./Makefile
  
  svm-predict: svm-predict.c svm.o
  	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
-@@ -16,4 +45,59 @@ svm-scale: svm-scale.c
+@@ -16,4 +45,65 @@ svm-scale: svm-scale.c
  svm.o: svm.cpp svm.h
  	$(CXX) $(CFLAGS) -c svm.cpp
  clean:
@@ -117,7 +117,9 @@ diff -up ./Makefile.bak ./Makefile
 +svm-python:
 +	${MAKE} -C python
 +svm-java:
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	${MAKE} -C java
++endif
 +svm-toy-gtk:
 +	${MAKE} -C svm-toy/gtk
 +svm-toy-qt:
@@ -138,14 +140,16 @@ diff -up ./Makefile.bak ./Makefile
 +	install -m 644 *.c ${INSTDIR}/share/libsvm/src
 +	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
 +	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
 +	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
 +	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
 +	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
-+# install package libsvm-python
-+	${MAKE} -C python install
 +# install package libsvm-java
 +	${MAKE} -C java install
++endif
++# install package libsvm-python
++	${MAKE} -C python install
 +# install package svm-toy
 +	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
 +	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
@@ -162,14 +166,16 @@ diff -up ./Makefile.bak ./Makefile
 +	rm -fr ${INSTDIR}/libsvm/src
 +	rm -fr ${INSTDIR}/libsvm
 +	${MAKE} -C python uninstall
++ifneq ("${NO_JAVA}","NO_JAVA")
 +	${MAKE} -C java uninstall
++endif
 +	rm -f ${INSTDIR}/bin/svm-toy-gtk
 +	rm -f ${INSTDIR}/bin/svm-toy-qt
 +
 +
-diff -up ./python/Makefile.bak ./python/Makefile
---- ./python/Makefile.bak	2008-12-10 09:05:08.000000000 +1000
-+++ ./python/Makefile	2009-04-03 15:21:19.000000000 +1000
+diff -up ./python/Makefile.orig ./python/Makefile
+--- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
++++ ./python/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -2,9 +2,11 @@ CXX? = g++
  SWIG ?= swig
  
@@ -217,9 +223,9 @@ diff -up ./python/Makefile.bak ./python/
 +uninstall:
 +	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 +
-diff -up ./svm-toy/gtk/callbacks.cpp.bak ./svm-toy/gtk/callbacks.cpp
---- ./svm-toy/gtk/callbacks.cpp.bak	2006-03-04 17:40:12.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp	2009-04-03 15:04:06.000000000 +1000
+diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
+--- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
++++ ./svm-toy/gtk/callbacks.cpp	2009-09-16 13:44:31.000000000 +1000
 @@ -2,6 +2,7 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -228,9 +234,9 @@ diff -up ./svm-toy/gtk/callbacks.cpp.bak
  #include "callbacks.h"
  #include "interface.h"
  #include "../../svm.h"
-diff -up ./svm-toy/gtk/Makefile.bak ./svm-toy/gtk/Makefile
---- ./svm-toy/gtk/Makefile.bak	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/gtk/Makefile	2009-04-03 15:04:06.000000000 +1000
+diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
+--- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2009-09-16 13:44:31.000000000 +1000
 @@ -2,21 +2,27 @@ CC? = gcc
  CXX? = g++
  CFLAGS = -Wall -O3 -g `gtk-config --cflags`
@@ -267,10 +273,10 @@ diff -up ./svm-toy/gtk/Makefile.bak ./sv
  clean:
 -	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
 +	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
-diff -up ./svm-toy/qt/Makefile.bak ./svm-toy/qt/Makefile
---- ./svm-toy/qt/Makefile.bak	2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2009-04-03 15:25:25.000000000 +1000
-@@ -1,17 +1,20 @@
+diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
+--- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
++++ ./svm-toy/qt/Makefile	2009-09-16 13:44:31.000000000 +1000
+@@ -1,17 +1,21 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
 +CFLAGS = -Wall -O3
@@ -279,10 +285,12 @@ diff -up ./svm-toy/qt/Makefile.bak ./svm
 +LIBS= -L${LOCAL_LIBDIR} -lsvm
 +
  INCLUDE = /usr/include/qt4
- MOC = /usr/bin/moc-qt4
+-MOC = /usr/bin/moc-qt4
  
 -svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
 -	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
++MOC=${MOC_PATH}
++
 +all: svm-toy-qt
 +
 +svm-toy-qt: svm-toy.cpp svm-toy.moc
@@ -298,9 +306,9 @@ diff -up ./svm-toy/qt/Makefile.bak ./svm
 -	rm -f *~ svm-toy svm-toy.moc ../../svm.o
 +	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
  
-diff -up ./tools/easy.py.bak ./tools/easy.py
---- ./tools/easy.py.bak	2009-01-14 07:13:26.000000000 +1000
-+++ ./tools/easy.py	2009-04-03 15:04:06.000000000 +1000
+diff -up ./tools/easy.py.orig ./tools/easy.py
+--- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
++++ ./tools/easy.py	2009-09-16 13:44:31.000000000 +1000
 @@ -2,6 +2,7 @@
  
  import sys
@@ -324,9 +332,9 @@ diff -up ./tools/easy.py.bak ./tools/eas
  	gnuplot_exe = "/usr/bin/gnuplot"
  else:
          # example for windows
-diff -up ./tools/grid.py.bak ./tools/grid.py
---- ./tools/grid.py.bak	2008-08-08 20:41:11.000000000 +1000
-+++ ./tools/grid.py	2009-04-03 15:04:06.000000000 +1000
+diff -up ./tools/grid.py.orig ./tools/grid.py
+--- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
++++ ./tools/grid.py	2009-09-16 13:44:31.000000000 +1000
 @@ -11,7 +11,7 @@ from subprocess import *
  
  is_win32 = (sys.platform == 'win32')


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/libsvm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libsvm.spec	3 Apr 2009 06:57:43 -0000	1.4
+++ libsvm.spec	16 Sep 2009 08:04:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.89
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -23,7 +23,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %define javac javac
 %define jar jar
 %define libdir_libsvm %{_libdir}/libsvm
-%{!?qt3-devel: }
+%if 0%{?fedora} >= 9
+%define moc_path %{_bindir}/moc-qt4
+%else
+%define moc_path %{_libdir}/qt4/bin/moc
+%endif
+%ifnarch ppc ppc64
+%define no_java FALSE
+%else
+%define no_java NO_JAVA
+%endif
 
 
 %description
@@ -55,19 +64,19 @@ Python tools and interfaces for libsvm.
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%ifnarch ppc ppc64
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-sdk >= 0:1.5.0
-Requires: jre >= 0:1.5.0
+BuildRequires:  java-1.6.0-openjdk-devel
+Requires: jre >= 1.6.0
 Requires:       %{name} = %{version}-%{release}
 
 %description java
 Java tools and interfaces for libsvm.
 Install this package if you want to develop 
 programs with libsvm in Java.
-Install libsvm-javadoc for 
-
+%endif
 
 %package svm-toy-gtk
 Summary:    GTK version of svm-toy (libsvm demostration program)
@@ -110,7 +119,7 @@ cp %{SOURCE5} %{name}-svm-toy-qt-48.png
 %build
 %{__sed} -i 's/\r//' FAQ.html
 %{__sed} -i 's/\r//' ChangeLog
-make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" 
+make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
 mv python/README python/README-Python
 mv tools/README tools/README-Tools
 cp README java/README-Java
@@ -120,7 +129,7 @@ cp README svm-toy/qt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"
+make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}"
 ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -130,6 +139,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/app
 cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 
+# [Bug 521194] Python: 'import libsvm' doesn't work
+echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
+# This file is released under BSD license, just like the rest of the package.\n"\
+ > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
+
 desktop-file-install --delete-original --vendor=fedora \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
@@ -181,11 +195,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
 %doc java/README-Java 
 %{_datadir}/%{name}/java
 #%{_datadir}/javadoc/%{name}-%{version}
+%endif
 
 %files svm-toy-gtk
 %defattr(-,root,root,-)
@@ -203,6 +219,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
+- Fix the building for EL-5
+  Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
+  as java-1.6.0-openjdk-devel for them do not exist yet.
+- Change the Java buildrequires from java-sdk to java-1.6.0-openjdk-devel
+- Fix [Bug 521194] Python: 'import libsvm' doesn't work.
+   By adding __init__.py to libsvm_python_dir
+  
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.89-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-1
 - Upstream Update to 2.89:
   + reduce input/loading time of svm-train/svm-predict by half



From jfch2222 at fedoraproject.org  Wed Sep 16 08:12:31 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 16 Sep 2009 08:12:31 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.166,1.167 sshd.pam,1.3,1.4
Message-ID: <20090916081231.4CE2811C0332@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6169

Modified Files:
	openssh.spec sshd.pam 
Log Message:
Changed pam stack to password-auth



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- openssh.spec	11 Sep 2009 08:10:13 -0000	1.166
+++ openssh.spec	16 Sep 2009 08:12:30 -0000	1.167
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 25%{?dist}%{?rescue_rel}
+Release: 26%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 16 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-26
+- Changed pam stack to password-auth
+
 * Fri Sep 11 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-25
 - Dropped homechroot patch
 


Index: sshd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sshd.pam	15 Jan 2009 10:52:07 -0000	1.3
+++ sshd.pam	16 Sep 2009 08:12:30 -0000	1.4
@@ -1,13 +1,13 @@
 #%PAM-1.0
 auth	   required	pam_sepermit.so
-auth       include      system-auth
+auth       include      password-auth
 account    required     pam_nologin.so
-account    include      system-auth
-password   include      system-auth
+account    include      password-auth
+password   include      password-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
 session    required     pam_loginuid.so
 # pam_selinux.so open should only be followed by sessions to be executed in the user context
 session    required     pam_selinux.so open env_params
 session    optional     pam_keyinit.so force revoke
-session    include      system-auth
+session    include      password-auth



From roland at fedoraproject.org  Wed Sep 16 08:17:11 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 16 Sep 2009 08:17:11 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1803,1.1804
Message-ID: <20090916081711.1ACDE11C00E6@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9412

Modified Files:
	kernel.spec 
Log Message:
Remove workaround for gcc bug #521991, now fixed.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1803
retrieving revision 1.1804
diff -u -p -r1.1803 -r1.1804
--- kernel.spec	15 Sep 2009 15:12:45 -0000	1.1803
+++ kernel.spec	16 Sep 2009 08:17:10 -0000	1.1804
@@ -1438,11 +1438,6 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
-    cat >> Makefile <<\EOF
-# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += -fno-var-tracking-assignments
-EOF
-
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -2010,6 +2005,9 @@ fi
 # ##############################################################
 
 %changelog
+* Wed Sep 16 2009 Roland McGrath <roland at redhat.com>
+- Remove workaround for gcc bug #521991, now fixed.
+
 * Tue Sep 15 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.31-git4
 - rebased:



From peter at fedoraproject.org  Wed Sep 16 08:28:03 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 16 Sep 2009 08:28:03 +0000 (UTC)
Subject: rpms/fuse/devel .cvsignore, 1.14, 1.15 fuse.spec, 1.37,
	1.38 import.log, 1.3, 1.4 sources, 1.14, 1.15
Message-ID: <20090916082803.5000711C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17192/devel

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
ver. 2.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	28 Sep 2008 10:32:57 -0000	1.14
+++ .cvsignore	16 Sep 2009 08:28:01 -0000	1.15
@@ -1 +1 @@
-fuse-2.7.4.tar.gz
+fuse-2.8.0.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- fuse.spec	24 Jul 2009 23:18:00 -0000	1.37
+++ fuse.spec	16 Sep 2009 08:28:02 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.7.4
-Release:        4%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -137,6 +137,9 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Wed Aug 19 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-1
+- Ver. 2.8.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Jan 2009 15:50:11 -0000	1.3
+++ import.log	16 Sep 2009 08:28:02 -0000	1.4
@@ -1,3 +1,4 @@
 fuse-2_7_3-3_fc9:HEAD:fuse-2.7.3-3.fc9.src.rpm:1215842579
 fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.src.rpm:1222597934
 fuse-2_7_4-2_fc10:HEAD:fuse-2.7.4-2.fc10.src.rpm:1233157758
+fuse-2_8_0-1_fc11:HEAD:fuse-2.8.0-1.fc11.src.rpm:1253089638


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	28 Sep 2008 10:32:57 -0000	1.14
+++ sources	16 Sep 2009 08:28:02 -0000	1.15
@@ -1 +1 @@
-4879f06570d2225667534c37fea04213  fuse-2.7.4.tar.gz
+faa62f2cf051866c61242f28e88d0832  fuse-2.8.0.tar.gz



From varekova at fedoraproject.org  Wed Sep 16 08:47:47 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed, 16 Sep 2009 08:47:47 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages-3.22-nsswitch.conf.patch, NONE,
	1.1 man-pages.spec, 1.121, 1.122
Message-ID: <20090916084748.41A1311C00E6@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3182

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-3.22-nsswitch.conf.patch 
Log Message:
- fix nsswitch.conf(5) man page



man-pages-3.22-nsswitch.conf.patch:
 nsswitch.conf.5 |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE man-pages-3.22-nsswitch.conf.patch ---
diff -up man-pages-3.22/man5/nsswitch.conf.5.pom man-pages-3.22/man5/nsswitch.conf.5
--- man-pages-3.22/man5/nsswitch.conf.5.pom	2009-07-25 08:53:42.000000000 +0200
+++ man-pages-3.22/man5/nsswitch.conf.5	2009-09-16 09:45:54.000000000 +0200
@@ -50,9 +50,11 @@ file.
 The following databases are available in the NSS:
 .TP
 .B aliases
-Mail aliases, used by
+Mail aliases, provides a system-wide mechanism to redirect mail for local
+recipients. Used by mail transfer agents such as Postfix or
 .BR sendmail (8).
-Presently ignored.
+Note: On Linux, not like on other Unices, Sendmail uses its own aliases
+resolution system independent on `/etc/nsswitch.conf'.
 .TP
 .B ethers
 Ethernet numbers.


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- man-pages.spec	14 Sep 2009 11:40:37 -0000	1.121
+++ man-pages.spec	16 Sep 2009 08:47:42 -0000	1.122
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.22
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -30,6 +30,7 @@ Patch53: man-pages-2.78-stream.patch
 Patch54: man-pages-2.80-malloc_h.patch
 Patch55: man-pages-3.22-gai.conf.patch
 Patch56: man-pages-3.22-strcpy.patch
+Patch57: man-pages-3.22-nsswitch.conf.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -58,6 +59,7 @@ rmdir man-pages-posix-%{posix_version}-%
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch57 -p1
 
 ### And now remove those we are not going to use:
 
@@ -128,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Wed Sep 16 2009 Ivana Varekova <varekova at redhat.com> - 3.22-6
+- fix nsswitch.conf(5) man page
+
 * Mon Sep 14 2009 Ivana Varekova <varekova at redhat.com> - 3.22-5
 - fix strcpy.3 man page
 - remove statfc64 man page from syscalls tarball



From pkgdb at fedoraproject.org  Wed Sep 16 09:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 09:15:16 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested commit
Message-ID: <20090916091516.9D15510F87D@bastion2.fedora.phx.redhat.com>

stefansf has requested the commit acl on pyicq-t (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Wed Sep 16 09:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 09:15:25 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested approveacls
Message-ID: <20090916091525.4DDC410F886@bastion2.fedora.phx.redhat.com>

stefansf has requested the approveacls acl on pyicq-t (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Wed Sep 16 09:15:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 09:15:31 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested commit
Message-ID: <20090916091532.170CA10F88C@bastion2.fedora.phx.redhat.com>

stefansf has requested the commit acl on pyicq-t (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Wed Sep 16 09:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 09:15:35 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested approveacls
Message-ID: <20090916091535.6E6CA10F896@bastion2.fedora.phx.redhat.com>

stefansf has requested the approveacls acl on pyicq-t (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From petersen at fedoraproject.org  Wed Sep 16 09:16:12 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 09:16:12 +0000 (UTC)
Subject: rpms/ghc/F-12 ghc.spec,1.95,1.96
Message-ID: <20090916091612.D9AF711C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26371

Modified Files:
	ghc.spec 
Log Message:
specify the haskell-platform version


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/F-12/ghc.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ghc.spec	25 Jul 2009 00:03:07 -0000	1.95
+++ ghc.spec	16 Sep 2009 09:16:09 -0000	1.96
@@ -27,7 +27,7 @@
 %global package_debugging 0
 
 Name: ghc
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version: 6.10.4
 Release: 2%{?dist}
 Summary: Glasgow Haskell Compilation system



From petersen at fedoraproject.org  Wed Sep 16 09:28:51 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 09:28:51 +0000 (UTC)
Subject: rpms/ghc-HUnit/devel ghc-HUnit.spec,1.1,1.2
Message-ID: <20090916092851.356CC11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv603

Modified Files:
	ghc-HUnit.spec 
Log Message:
specify the haskell-platform version and note part of ghc extralibs


Index: ghc-HUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HUnit/devel/ghc-HUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-HUnit.spec	27 Aug 2009 19:36:22 -0000	1.1
+++ ghc-HUnit.spec	16 Sep 2009 09:28:50 -0000	1.2
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs!
 Version:        1.2.0.3
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Wed Sep 16 09:30:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 09:30:16 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel ghc-OpenGL.spec,1.4,1.5
Message-ID: <20090916093016.06EB511C0336@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1321

Modified Files:
	ghc-OpenGL.spec 
Log Message:
specify the haskell-platform version


Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-OpenGL/devel/ghc-OpenGL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-OpenGL.spec	1 Sep 2009 04:01:51 -0000	1.4
+++ ghc-OpenGL.spec	16 Sep 2009 09:30:12 -0000	1.5
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version:        2.2.1.1
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Wed Sep 16 09:31:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 09:31:14 +0000 (UTC)
Subject: rpms/ghc-zlib/devel ghc-zlib.spec,1.14,1.15
Message-ID: <20090916093114.8E7A211C00EC@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1777

Modified Files:
	ghc-zlib.spec 
Log Message:
note the haskell-platform version


Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ghc-zlib.spec	25 Jul 2009 00:05:57 -0000	1.14
+++ ghc-zlib.spec	16 Sep 2009 09:31:12 -0000	1.15
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version:        0.5.0.0
 Release:        10%{?dist}
 Summary:        Haskell compression and decompression library binding



From tmraz at fedoraproject.org  Wed Sep 16 09:31:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 09:31:42 +0000 (UTC)
Subject: rpms/at/devel at-3.1.10-pam.patch,1.5,1.6 at.spec,1.77,1.78
Message-ID: <20090916093142.3530C11C00EC@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/at/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1975

Modified Files:
	at-3.1.10-pam.patch at.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-37
- improve the PAM configuration, use password-auth common stack


at-3.1.10-pam.patch:
 Makefile.in  |    5 -
 atd.c        |  251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 config.h.in  |    6 +
 configure.in |   15 +++
 pam_atd      |    8 +
 perm.c       |   51 +++++++++++
 6 files changed, 313 insertions(+), 23 deletions(-)

Index: at-3.1.10-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at-3.1.10-pam.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- at-3.1.10-pam.patch	1 Jun 2009 11:47:21 -0000	1.5
+++ at-3.1.10-pam.patch	16 Sep 2009 09:31:39 -0000	1.6
@@ -1,19 +1,14 @@
 --- at-3.1.10/pam_atd.pam   2007-07-03 13:29:24.000000000 +0200
 +++ at-3.1.10/pam_atd   2007-07-03 13:29:24.000000000 +0200
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,8 @@
 +# The PAM configuration file for the at daemon
 +#
 +#
-+auth       sufficient  pam_rootok.so
-+auth       required    pam_env.so
-+auth       include     system-auth
-+account        include     system-auth
-+session        required    pam_loginuid.so
-+session        include     system-auth
-+# Sets up user limits, please uncomment and read /etc/security/limits.conf
-+# to enable this functionality.
-+# session    required   pam_limits.so
-+#
++# PAM authentication not called, no auth modules needed
++account    required    pam_access.so
++account    include     password-auth
++session    required    pam_loginuid.so
++session    include     password-auth
 diff -up at-3.1.10/atd.c.pam at-3.1.10/atd.c
 --- at-3.1.10/atd.c.pam	2008-07-18 15:47:52.000000000 +0200
 +++ at-3.1.10/atd.c	2008-07-18 16:02:32.000000000 +0200


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- at.spec	18 Aug 2009 19:12:05 -0000	1.77
+++ at.spec	16 Sep 2009 09:31:40 -0000	1.78
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -196,6 +196,9 @@ fi
 %attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-37
+- improve the PAM configuration, use password-auth common stack
+
 * Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 3.1.10-36
 - Remove Requires: pm-utils-filesystem, dead package
 



From petersen at fedoraproject.org  Wed Sep 16 09:32:53 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 09:32:53 +0000 (UTC)
Subject: rpms/happy/devel happy.spec,1.13,1.14
Message-ID: <20090916093253.233C811C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/happy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2618

Modified Files:
	happy.spec 
Log Message:
note the haskell-platform version


Index: happy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/happy/devel/happy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- happy.spec	25 Jul 2009 02:01:31 -0000	1.13
+++ happy.spec	16 Sep 2009 09:32:51 -0000	1.14
@@ -2,7 +2,7 @@
 %define debug_package %{nil}
 
 Name:           happy
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version:        1.18.4
 Release:        3%{?dist}
 License:        BSD



From markmc at fedoraproject.org  Wed Sep 16 09:38:30 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 16 Sep 2009 09:38:30 +0000 (UTC)
Subject: rpms/qemu/devel ksm.init, NONE, 1.1 ksm.sysconfig, NONE,
	1.1 qemu.spec, 1.126, 1.127
Message-ID: <20090916093830.E874C11C0099@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5560

Modified Files:
	qemu.spec 
Added Files:
	ksm.init ksm.sysconfig 
Log Message:
* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-2
- Add ksm control script from Dan Kenigsberg



--- NEW FILE ksm.init ---
#!/bin/bash
#
# ksm          Kernel Samepage Merging
#
# Author:      Dan Kenigsberg <danken at redhat.com>
#
# Copyright 2009 Red Hat, Inc. and/or its affiliates.
# Released under the GPL
#
# chkconfig: - 84 16
# description: The KSM init script starts and stops the ksm kernel thread.
# config: /etc/sysconfig/ksm
#
### BEGIN INIT INFO
# Provides: ksm
# Required-Start:
# Required-Stop:
# Should-Start:
# Short-Description: start and stop ksm
# Description: The KSM init script starts and stops the ksm kernel thread.
### END INIT INFO

. /etc/rc.d/init.d/functions

if [ -f /etc/sysconfig/ksm ]; then
    . /etc/sysconfig/ksm
fi

prog=ksm
RETVAL=0

# unless KSM_MAX_KERNEL_PAGES is set, let ksm munch up to half of total memory.
default_max_kernel_pages () {
    local total pagesize
    total=`awk '/^MemTotal:/ {print $2}' /proc/meminfo`
    pagesize=`getconf PAGESIZE`
    echo $[total * 1024 / pagesize / 2]
}

start() {
    echo -n $"Starting $prog: "
    KSM_MAX_KERNEL_PAGES=${KSM_MAX_KERNEL_PAGES:-`default_max_kernel_pages`}
    echo $KSM_MAX_KERNEL_PAGES > /sys/kernel/mm/ksm/max_kernel_pages
    echo 1 > /sys/kernel/mm/ksm/run
    RETVAL=$?
    [ $RETVAL = 0 ] && success $"$prog startup" || failure $"$prog startup"
    echo
    return $RETVAL
}

stop() {
    echo -n $"Stopping $prog: "
    echo 0 > /sys/kernel/mm/ksm/run
    RETVAL=$?
    [ $RETVAL = 0 ] && success $"$prog shutdown" || failure $"$prog shutdown"
    echo
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        is_run=`cat /sys/kernel/mm/ksm/run`
	RETVAL=$?
        if [ $is_run -eq 1 ]; then
            echo $"$prog is running"
        else
            echo $"$prog is not running"
        fi
	;;
  restart)
	stop
	start
	;;
  signal)
	signal
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|status|help}"
	RETVAL=3
esac

exit $RETVAL


--- NEW FILE ksm.sysconfig ---
# The maximum number of unswappable kernel pages
# which may be allocated by ksm (0 for unlimited)
# If unset, defaults to half of total memory
# KSM_MAX_KERNEL_PAGES=


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- qemu.spec	7 Sep 2009 14:22:20 -0000	1.126
+++ qemu.spec	16 Sep 2009 09:38:29 -0000	1.127
@@ -3,7 +3,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -12,9 +12,17 @@ URL: http://www.qemu.org/
 
 Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
 Source1: qemu.init
+
+# Loads kvm kernel modules at boot
 Source2: kvm.modules
+
+# Creates /dev/kvm
 Source3: 80-kvm.rules
 
+# KSM control script
+Source4: ksm.init
+Source5: ksm.sysconfig
+
 # Not upstream, why?
 Patch01: qemu-bios-bigger-roms.patch
 
@@ -292,6 +300,9 @@ make V=1 %{?_smp_mflags} $buildldflags
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ksm
+install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ksm
+
 %ifarch %{ix86} x86_64
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
@@ -398,6 +409,8 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man8/qemu-nbd.8*
 %{_bindir}/qemu-nbd
 %config(noreplace) %{_sysconfdir}/sasl2/qemu.conf
+%{_sysconfdir}/rc.d/init.d/ksm
+%config(noreplace) %{_sysconfdir}/sysconfig/ksm
 %files user
 %defattr(-,root,root)
 %{_sysconfdir}/rc.d/init.d/qemu
@@ -483,6 +496,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-2
+- Add ksm control script from Dan Kenigsberg
+
 * Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-1
 - Update to qemu-kvm-0.11.0-rc2
 - Drop upstreamed patches



From lucilanga at fedoraproject.org  Wed Sep 16 09:39:38 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 16 Sep 2009 09:39:38 +0000 (UTC)
Subject: rpms/evolution-rss/devel
	evolution-rss-0.1.4-folder-properties.patch, 
	NONE, 1.1 evolution-rss-0.1.4-folder-rename.patch, NONE,
	1.1 evolution-rss.spec, 1.34, 1.35
Message-ID: <20090916093938.95B7811C0099@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6257

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-folder-properties.patch 
	evolution-rss-0.1.4-folder-rename.patch 
Log Message:
* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
- added upstream patch to fix folder rename (#594704)

evolution-rss-0.1.4-folder-properties.patch:
 rss-config-factory.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE evolution-rss-0.1.4-folder-properties.patch ---
diff -urN evolution-rss-0.1.4.orig/src/rss-config-factory.c evolution-rss-0.1.4/src/rss-config-factory.c
--- evolution-rss-0.1.4.orig/src/rss-config-factory.c	2009-08-26 09:24:36.000000000 +0100
+++ evolution-rss-0.1.4/src/rss-config-factory.c	2009-09-15 23:27:13.787560110 +0100
@@ -2192,7 +2192,15 @@
 	add_feed *feed = (add_feed *)g_object_get_data((GObject *)epl, "add-feed");
 	gchar *url = (gchar *)g_object_get_data((GObject *)epl, "url");
 	gchar *ofolder = (gchar *)g_object_get_data((GObject *)epl, "ofolder");
+
+	EMConfigTargetFolder *targetfolder = (EMConfigTargetFolder *)target->config->target;
+	gchar *main_folder = lookup_main_folder();
+	gchar *folder = targetfolder->folder->full_name;
 	
+	if (folder == NULL
+          || g_ascii_strncasecmp(folder, main_folder, strlen(main_folder))
+          || !g_ascii_strcasecmp(folder, main_folder))
+                return;
 
 	GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "url_entry");
         GtkWidget *checkbutton1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "html_check");


evolution-rss-0.1.4-folder-rename.patch:
 rss.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-folder-rename.patch ---
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-09-16 12:30:32.000000000 +0300
@@ -3659,8 +3659,13 @@
 		nname = g_strdup(new_name);
 	gchar *orig_name = g_hash_table_lookup(rf->feed_folders, oname);
 	if (!orig_name) {
-		if (valid_folder)
-			return 0;
+		if (valid_folder) {
+			gchar *ofolder = lookup_original_folder(old_name);
+			if (!ofolder)
+				return 0;
+			else if (!lookup_key(ofolder))
+				return 0;
+		}
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(oname));
 	} else {
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(orig_name));


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- evolution-rss.spec	26 Aug 2009 12:09:58 -0000	1.34
+++ evolution-rss.spec	16 Sep 2009 09:39:38 -0000	1.35
@@ -11,11 +11,13 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	2%{?dist}
+Release:	4%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
+Patch0:		evolution-rss-0.1.4-folder-rename.patch
+Patch1:		evolution-rss-0.1.4-folder-properties.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -39,6 +41,8 @@ This is an evolution plugin which enable
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .folder-rename
+%patch1 -p1 -b .folder-properties
 
 %build
 %configure --with-primary-render=gecko
@@ -92,6 +96,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
+- added upstream patch to fix folder rename (#594704)
+
 * Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
 - fix source0
 



From hadess at fedoraproject.org  Wed Sep 16 09:59:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Sep 2009 09:59:31 +0000 (UTC)
Subject: rpms/bluez/F-11 bluez-correct-udev-dell-mouse-rules.patch, NONE,
	1.1 bluez.spec, 1.70, 1.71
Message-ID: <20090916095931.9F5CE11C0099@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18931

Modified Files:
	bluez.spec 
Added Files:
	bluez-correct-udev-dell-mouse-rules.patch 
Log Message:
* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 4.42-6
- Fix hid2hci rules (#517088)


bluez-correct-udev-dell-mouse-rules.patch:
 bluetooth-hid2hci.rules |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE bluez-correct-udev-dell-mouse-rules.patch ---
>From linux-bluetooth-owner at vger.kernel.org Wed Sep 16 08:35:32 2009
Return-Path: <linux-bluetooth-owner at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
 bungle.evilgeniuses.org.uk
X-Spam-Level: 
X-Spam-Status: No, score=-3.7 required=5.0 tests=AWL,BAYES_00,
 RCVD_IN_DNSWL_MED autolearn=ham version=3.2.5
X-Original-To: hadess at hadess.net
Delivered-To: hadess at bungle.evilgeniuses.org.uk
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by
 bungle.evilgeniuses.org.uk (Postfix) with ESMTP id BC0161C3BCC0 for
 <hadess at hadess.net>; Wed, 16 Sep 2009 08:35:32 +0100 (BST)
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand id
 S1751251AbZIPHf1 (ORCPT <rfc822;hadess at hadess.net>); Wed, 16 Sep 2009
 03:35:27 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id
 S1751490AbZIPHf1 (ORCPT <rfc822;linux-bluetooth-outgoing>); Wed, 16 Sep
 2009 03:35:27 -0400
Received: from mga01.intel.com ([192.55.52.88]:35513 "EHLO mga01.intel.com"
 rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251AbZIPHf0
 (ORCPT <rfc822;linux-bluetooth at vger.kernel.org>); Wed, 16 Sep 2009 03:35:26
 -0400
Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by
 fmsmga101.fm.intel.com with ESMTP; 16 Sep 2009 00:31:16 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.44,396,1249282800"; 
 d="scan'208,223";a="493920533"
Received: from unknown (HELO yangyi-dev.bj.intel.com) ([172.16.180.135]) by
 fmsmga002.fm.intel.com with ESMTP; 16 Sep 2009 00:27:42 -0700
Date:	Wed, 16 Sep 2009 15:33:59 +0800
From:	Yi Yang <yi.y.yang at intel.com>
To:	linux-bluetooth at vger.kernel.org
Subject: [PATCH resent] bluez: correct udev rule for Dell mouse
Message-ID: <20090916073359.GA22265 at yangyi-dev.bj.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender:	linux-bluetooth-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List:	linux-bluetooth at vger.kernel.org
X-Evolution-Source: imap://hadess at bungle.evilgeniuses.org.uk/
Content-Transfer-Encoding: 8bit

>From dbcfcf5dfbdef2377f64c7cd737886e31ae17615 Mon Sep 17 00:00:00 2001
From: Yi Yang <yi.y.yang at intel.com>
Date: Wed, 16 Sep 2009 15:19:13 +0800
Subject: [PATCH] Correct udev rule for Dell mouse

Note: this rule should just for Dell bluetooth mouse, but it
does function for Dell general USB mouse, such as this one:

    ID 413c:3010 Dell Computer Corp. Optical Wheel Mouse

We should let it just function for Dell bluetooth mouse, udev
144 and later has included rules for hid2hci
extras/hid2hci/70-hid2hci.rules which has correct one, so we
should use that one
---
 scripts/bluetooth-hid2hci.rules |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/bluetooth-hid2hci.rules b/scripts/bluetooth-hid2hci.rules
index 1b231d1..eb63292 100644
--- a/scripts/bluetooth-hid2hci.rules
+++ b/scripts/bluetooth-hid2hci.rules
@@ -8,7 +8,8 @@
 #   413c:8154
 #   413c:8158
 #   413c:8162
-ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
+ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProtocol}=="02", ATTRS{bDeviceClass}=="00", ATTRS{idVendor}=="413c", ATTRS{bmAttributes}=="e0", \
+    RUN+="hid2hci --method dell -v $attr{idVendor} -p $attr{idProduct} --mode hci"
 
 # Logitech devices
 ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c703" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
-- 
1.6.0.6

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- bluez.spec	11 Aug 2009 13:57:02 -0000	1.70
+++ bluez.spec	16 Sep 2009 09:59:29 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -23,6 +23,8 @@ Patch7: 0002-Actually-read-the-CreateDev
 # http://thread.gmane.org/gmane.linux.bluez.kernel/3106/focus=3114
 Patch8: 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch
 Patch9: 0002-Mark-Bluetooth-printers-as-being-local.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3430
+Patch10: bluez-correct-udev-dell-mouse-rules.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -117,6 +119,7 @@ use in Bluetooth applications.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -211,6 +214,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 4.42-6
+- Fix hid2hci rules (#517088)
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-5
 - More upstream CUPS fixes
 



From petersen at fedoraproject.org  Wed Sep 16 10:03:34 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Sep 2009 10:03:34 +0000 (UTC)
Subject: rpms/cabal-install/devel cabal-install.spec,1.7,1.8
Message-ID: <20090916100334.91FAB11C0099@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal-install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21024

Modified Files:
	cabal-install.spec 
Log Message:
rebuild since mass rebuild failed


Index: cabal-install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal-install/devel/cabal-install.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cabal-install.spec	14 Sep 2009 02:17:16 -0000	1.7
+++ cabal-install.spec	16 Sep 2009 10:03:34 -0000	1.8
@@ -4,7 +4,7 @@
 Name:           cabal-install
 # part of haskell-platform-2009.2.0.2
 Version:        0.6.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Haskell package tool
 
 Group:          Development/Tools
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-6
+- really rebuild
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Sep 16 10:04:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 10:04:12 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested watchbugzilla
Message-ID: <20090916100412.7D2E410F886@bastion2.fedora.phx.redhat.com>

stefansf has requested the watchbugzilla acl on pyicq-t (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Wed Sep 16 10:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 10:04:15 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested watchcommits
Message-ID: <20090916100415.9AA3C10F894@bastion2.fedora.phx.redhat.com>

stefansf has requested the watchcommits acl on pyicq-t (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Wed Sep 16 10:04:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 10:04:17 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested commit
Message-ID: <20090916100417.33AEF10F898@bastion2.fedora.phx.redhat.com>

stefansf has requested the commit acl on pyicq-t (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Wed Sep 16 10:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 10:04:19 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested approveacls
Message-ID: <20090916100419.3E36110F89B@bastion2.fedora.phx.redhat.com>

stefansf has requested the approveacls acl on pyicq-t (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From hadess at fedoraproject.org  Wed Sep 16 10:07:27 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Sep 2009 10:07:27 +0000 (UTC)
Subject: rpms/bluez/devel 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.4, 
	1.5 bluez.spec, 1.96, 1.97
Message-ID: <20090916100727.D38CB11C0099@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23564

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch bluez.spec 
Log Message:
* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 4.53-2
- Update cable plugin for gudev changes


0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 388 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	1 Sep 2009 16:42:32 -0000	1.4
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	16 Sep 2009 10:07:26 -0000	1.5
@@ -1,4 +1,4 @@
-From 0f3b73be98d0f933970b87eda3fc6128de3788ab Mon Sep 17 00:00:00 2001
+From 0cb2225079979cc3c85c02a981ebad7742c1ff72 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -10,15 +10,15 @@ When a Sixaxis device is plugged in, eve
 the device is selected, poked around to set the default Bluetooth
 address, and added to the database of the current default adapter.
 ---
- Makefile.am     |   11 ++-
+ Makefile.am     |    9 ++
  acinclude.m4    |   16 +++
  configure.ac    |    1 +
- plugins/cable.c |  361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 388 insertions(+), 1 deletions(-)
+ plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 388 insertions(+), 0 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index 09eb7ec..cc8381e 100644
+index 09eb7ec..ad6fe25 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -162,6 +162,15 @@ builtin_modules += service
@@ -104,10 +104,10 @@ index 9e5279d..8b17659 100644
  
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
-index 0000000..9179c62
+index 0000000..6e81ba0
 --- /dev/null
 +++ b/plugins/cable.c
-@@ -0,0 +1,361 @@
+@@ -0,0 +1,362 @@
 +/*
 + *
 + *  BlueZ - Bluetooth protocol stack for Linux
@@ -418,13 +418,14 @@ index 0000000..9179c62
 +static gboolean device_event_idle(GUdevDevice *device)
 +{
 +	handle_device_plug(device);
++	g_object_unref (device);
 +	return FALSE;
 +}
 +
-+static void device_event_cb(GUdevClient  *client,
-+			    const char    *action,
-+			    GUdevDevice  *device,
-+			    gpointer       user_data)
++static void uevent_cb(GUdevClient  *client,
++		      const char    *action,
++		      GUdevDevice  *device,
++		      gpointer       user_data)
 +{
 +	if (g_strcmp0(action, "add") == 0) {
 +		/* FIXME:
@@ -450,8 +451,8 @@ index 0000000..9179c62
 +
 +	/* Listen for newly connected devices */
 +	g_signal_connect(G_OBJECT(client),
-+			 "device-event",
-+			 G_CALLBACK(device_event_cb),
++			 "uevent",
++			 G_CALLBACK(uevent_cb),
 +			 NULL);
 +
 +	return 0;


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- bluez.spec	10 Sep 2009 19:50:14 -0000	1.96
+++ bluez.spec	16 Sep 2009 10:07:26 -0000	1.97
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.53
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -271,6 +271,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 4.53-2
+- Update cable plugin for gudev changes
+
 * Thu Sep 10 2009 Bastien Nocera <bnocera at redhat.com> 4.53-1
 - Update to 4.53
 



From rrakus at fedoraproject.org  Wed Sep 16 10:07:28 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed, 16 Sep 2009 10:07:28 +0000 (UTC)
Subject: rpms/bash/devel bash40-029, NONE, 1.1 bash40-030, NONE,
	1.1 bash40-031, 
	NONE, 1.1 bash40-032, NONE, 1.1 bash40-033, NONE, 1.1 bash.spec,
	1.189, 1.190 bash-3.2-rng.patch, 1.2,
	NONE bash-4.0-key_alloc.patch, 1.1,
	NONE bash-4.0-no_debug_output.patch, 1.2,
	NONE bash-4.0-shell_pipelines_handling.patch, 1.1,
	NONE bash-ulimit-m.patch, 1.2, NONE
Message-ID: <20090916100728.47C9111C00E6@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23527

Modified Files:
	bash.spec 
Added Files:
	bash40-029 bash40-030 bash40-031 bash40-032 bash40-033 
Removed Files:
	bash-3.2-rng.patch bash-4.0-key_alloc.patch 
	bash-4.0-no_debug_output.patch 
	bash-4.0-shell_pipelines_handling.patch bash-ulimit-m.patch 
Log Message:
Patch level 33. Specfile and cvs cleanup.


--- NEW FILE bash40-029 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-029

Bug-Reported-by:	Christian Krause <chkr at plauener.de>
Bug-Reference-ID:	Thu, 25 Jun 2009 21:47:59 +0200
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-06/msg00078.html

Bug-Description:

Previous versions of bash accepted strings in the initial environment
that were not valid shell variable assignments, usually because the
names were invalid, but still created shell variables from them and
passed them to child processes in the environment.

Bash-4.0 ignores those names and does not pass them to child processes.
Some users and automated processes depend on invalid variables being
ignored and passed to child processes.

This patch makes bash continue to ignore the invalid names, but pass
them to child processes in the export environment.

Patch:

*** ../bash-4.0-patched/variables.c	2009-01-04 14:32:46.000000000 -0500
--- variables.c	2009-06-29 09:17:20.000000000 -0400
***************
*** 253,256 ****
--- 255,259 ----
  static int visible_var __P((SHELL_VAR *));
  static int visible_and_exported __P((SHELL_VAR *));
+ static int export_environment_candidate __P((SHELL_VAR *));
  static int local_and_exported __P((SHELL_VAR *));
  static int variable_in_context __P((SHELL_VAR *));
***************
*** 376,383 ****
  #  endif
  #endif
        else if (legal_identifier (name))
  	{
  	  temp_var = bind_variable (name, string, 0);
! 	  VSETATTR (temp_var, (att_exported | att_imported));
  	  array_needs_making = 1;
  	}
--- 379,393 ----
  #  endif
  #endif
+ #if 0
        else if (legal_identifier (name))
+ #else
+       else
+ #endif
  	{
  	  temp_var = bind_variable (name, string, 0);
! 	  if (legal_identifier (name))
! 	    VSETATTR (temp_var, (att_exported | att_imported));
! 	  else
! 	    VSETATTR (temp_var, (att_exported | att_imported | att_invisible));
  	  array_needs_making = 1;
  	}
***************
*** 3083,3086 ****
--- 3098,3111 ----
  }
  
+ /* Candidate variables for the export environment are either valid variables
+    with the export attribute or invalid variables inherited from the initial
+    environment and simply passed through. */
+ static int
+ export_environment_candidate (var)
+      SHELL_VAR *var;
+ {
+   return (exported_p (var) && (invisible_p (var) == 0 || imported_p (var)));
+ }
+ 
  /* Return non-zero if VAR is a local variable in the current context and
     is exported. */
***************
*** 3439,3443 ****
--- 3464,3472 ----
    SHELL_VAR **vars;
  
+ #if 0
    vars = map_over (visible_and_exported, vcxt);
+ #else
+   vars = map_over (export_environment_candidate, vcxt);
+ #endif
  
    if (vars == 0)
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 28
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 29
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-030 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-030

Bug-Reported-by:	Henning Bekel <h.bekel at googlemail.com>
Bug-Reference-ID:	<7c6eacF262ctuU1 at mid.individual.net>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-07/msg00054.html

Bug-Description:

A shell function invoked with `bind -x' is supposed to be able to move the
cursor by setting READLINE_POINT.  The effects of this assignment were
sometimes ignored.

Patch:

*** ../bash-4.0-patched/bashline.c	2009-01-08 09:29:24.000000000 -0500
--- bashline.c	2009-07-16 14:13:41.000000000 -0400
***************
*** 3389,3393 ****
    register int i;
    intmax_t mi;
-   int save_point;
    sh_parser_state_t ps;
    char *cmd, *value, *l;
--- 3389,3392 ----
***************
*** 3433,3437 ****
      VSETATTR (v, att_exported);
    l = value_cell (v);
-   save_point = rl_point;
    value = inttostr (rl_point, ibuf, sizeof (ibuf));
    v = bind_int_variable ("READLINE_POINT", value);
--- 3432,3435 ----
***************
*** 3451,3455 ****
      {
        i = mi;
!       if (i != save_point)
  	{
  	  rl_point = i;
--- 3449,3453 ----
      {
        i = mi;
!       if (i != rl_point)
  	{
  	  rl_point = i;
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 29
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 30
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-031 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-031

Bug-Reported-by:	Roman Rakus <rrakus at redhat.com>
Bug-Reference-ID:	<4A93F6E9.4050401 at redhat.com>
Bug-Reference-URL:	

Bug-Description:

An implicit assignment to index "0" of an existing array variable caused
the shell to crash when the variable was unset.

Patch:

*** ../bash-4.0-patched/arrayfunc.c	2009-03-08 21:24:39.000000000 -0400
--- arrayfunc.c	2009-08-24 09:29:43.000000000 -0400
***************
*** 99,103 ****
    hash = assoc_create (0);
    if (oldval)
!     assoc_insert (hash, "0", oldval);
  
    FREE (value_cell (var));
--- 99,103 ----
    hash = assoc_create (0);
    if (oldval)
!     assoc_insert (hash, savestring ("0"), oldval);
  
    FREE (value_cell (var));
*** ../bash-4.0-patched/variables.c	2009-01-04 14:32:46.000000000 -0500
--- variables.c	2009-08-24 09:29:58.000000000 -0400
***************
*** 2218,2222 ****
        else if (assoc_p (entry))
  	{
! 	  assoc_insert (assoc_cell (entry), "0", newval);
  	  free (newval);
  	}
--- 2218,2222 ----
        else if (assoc_p (entry))
  	{
! 	  assoc_insert (assoc_cell (entry), savestring ("0"), newval);
  	  free (newval);
  	}
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 30
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 31
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-032 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-032

Bug-Reported-by:	muszi at muszi.kite.hu
Bug-Reference-ID:	<20090826113159.18815.qmail at muszi.kite.hu>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-08/msg00090.html

Bug-Description:

Bash-4.0 has a memory leak when processing ${!prefix@}.

Patch:

*** ../bash-4.0-patched/subst.c	2009-07-22 23:18:55.000000000 -0400
--- subst.c	2009-08-26 23:08:51.000000000 -0400
***************
*** 6607,6611 ****
  	}
        free (x);
!       free (xlist);
        free (temp1);
        *indexp = sindex;
--- 6769,6773 ----
  	}
        free (x);
!       dispose_words (xlist);
        free (temp1);
        *indexp = sindex;
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 31
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 32
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-033 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-033

Bug-Reported-by:	Dr. Werner Fink <werner at suse.de>
Bug-Reference-ID:	<200907010951.n619p76I013912 at boole.suse.de>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-07/msg00000.html

Bug-Description:

Bash-4.0 has a memory leak in the `read' builtin when the number of fields
read is not the same as the number of variables passed as arguments.

Patch:

*** ../bash-4.0-patched/builtins/read.def	2009-03-08 21:24:45.000000000 -0400
--- builtins/read.def	2009-07-01 15:32:42.000000000 -0400
***************
*** 764,768 ****
  	tofree = input_string = t;
        else
! 	input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape);
      }
  #endif
--- 764,771 ----
  	tofree = input_string = t;
        else
! 	{
! 	  input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape);
! 	  tofree = t;
! 	}
      }
  #endif
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 32
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 33
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- bash.spec	4 Sep 2009 13:04:17 -0000	1.189
+++ bash.spec	16 Sep 2009 10:07:26 -0000	1.190
@@ -1,11 +1,11 @@
 #%define beta_tag rc1
-%define patchlevel .28
+%define patchlevel .33
 %define baseversion 4.0
 
 Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 3%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -47,6 +47,11 @@ Patch025: ftp://ftp.gnu.org/pub/gnu/bash
 Patch026: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-026
 Patch027: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-027
 Patch028: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-028
+Patch029: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-029
+Patch030: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-030
+Patch031: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-031
+Patch032: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-032
+Patch033: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-033
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -59,7 +64,6 @@ Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch109: bash-2.05b-xcc.patch
 Patch110: bash-3.2-audit.patch
-#Patch111: bash-3.2-rng.patch
 Patch112: bash-3.2-ssh_source_bash.patch
 Patch113: bash-bashbug.patch
 Patch114: bash-cond-rmatch.patch
@@ -67,12 +71,7 @@ Patch115: bash-infotags.patch
 Patch116: bash-requires.patch
 Patch117: bash-setlocale.patch
 Patch118: bash-tty-tests.patch
-#Patch119: bash-ulimit-m.patch
-#Patch120: bash-4.0-no_debug_output.patch
-#Patch121: bash-4.0-shell_pipelines_handling.patch
 
-# 518644, alloc memory for key in associative array creation
-Patch122: bash-4.0-key_alloc.patch
 
 # 484809, check if interp section is NOBITS
 Patch123: bash-4.0-nobits.patch
@@ -133,6 +132,11 @@ This package contains documentation file
 %patch026 -p0 -b .026
 %patch027 -p0 -b .027
 %patch028 -p0 -b .028
+%patch029 -p0 -b .029
+%patch030 -p0 -b .030
+%patch031 -p0 -b .031
+%patch032 -p0 -b .032
+%patch033 -p0 -b .033
 
 # Other patches
 %patch101 -p1 -b .security
@@ -145,7 +149,6 @@ This package contains documentation file
 %patch108 -p1 -b .readline_oom
 %patch109 -p1 -b .xcc
 %patch110 -p1 -b .audit
-#%patch111 -p1 -b .rng
 %patch112 -p1 -b .ssh_source_bash
 %patch113 -p1 -b .bashbug
 %patch114 -p1 -b .cond_rmatch
@@ -153,10 +156,6 @@ This package contains documentation file
 %patch116 -p1 -b .requires
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
-#%patch119 -p1 -b .ulimit-m
-#%patch120 -p1 -b .no_debug_output
-#%patch121 -p1 -b .pipelines_handling
-%patch122 -p1 -b .key_alloc
 %patch123 -p1 -b .nobits
 
 echo %{version} > _distribution
@@ -324,6 +323,10 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Sep 16 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-1
+- Patch level 33
+- spec file cleanup
+
 * Fri Sep 04 2009 Roman Rakus <rrakus at redhat.com> - 4.0.28-3
 - check if interp section is NOBITS
 - define Recycles pids


--- bash-3.2-rng.patch DELETED ---


--- bash-4.0-key_alloc.patch DELETED ---


--- bash-4.0-no_debug_output.patch DELETED ---


--- bash-4.0-shell_pipelines_handling.patch DELETED ---


--- bash-ulimit-m.patch DELETED ---



From tmraz at fedoraproject.org  Wed Sep 16 10:25:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 10:25:33 +0000 (UTC)
Subject: rpms/cups/devel cups-1.1.16-system-auth.patch, 1.4, 1.5 cups.spec, 
	1.519, 1.520
Message-ID: <20090916102533.804B911C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2498

Modified Files:
	cups-1.1.16-system-auth.patch cups.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1:1.4.1-3
- Use password-auth common PAM configuration instead of system-auth
  when available.


cups-1.1.16-system-auth.patch:
 Makefile           |   12 +++++++++---
 cups.password-auth |    4 ++++
 cups.system-auth   |    3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)

Index: cups-1.1.16-system-auth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-1.1.16-system-auth.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cups-1.1.16-system-auth.patch	17 Mar 2006 12:10:57 -0000	1.4
+++ cups-1.1.16-system-auth.patch	16 Sep 2009 10:25:32 -0000	1.5
@@ -1,12 +1,14 @@
 --- cups-1.2svn-r5238/conf/Makefile.system-auth	2006-03-07 09:34:20.000000000 +0000
 +++ cups-1.2svn-r5238/conf/Makefile	2006-03-07 09:45:41.000000000 +0000
-@@ -79,10 +79,14 @@
+@@ -79,10 +79,16 @@
  	done
  	-if test x$(PAMDIR) != x; then \
  		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
 -		if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
 -			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-+		if test -f /etc/pam.d/system-auth; then \
++		if test -f /etc/pam.d/password-auth; then \
++			$(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups ; \
++		elif test -f /etc/pam.d/system-auth; then \
 +			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
  		else \
 -			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
@@ -24,3 +26,10 @@
 +#%PAM-1.0
 +auth	include		system-auth
 +account	include		system-auth
+--- /dev/null	2006-03-07 09:12:30.964372750 +0000
++++ cups-1.2svn-r5238/conf/cups.password-auth	2006-03-07 09:43:12.000000000 +0000
+@@ -0,0 +1,4 @@
++#%PAM-1.0
++# Use password-auth common PAM configuration for the daemon
++auth        include     password-auth
++account     include     password-auth


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -p -r1.519 -r1.520
--- cups.spec	15 Sep 2009 10:11:01 -0000	1.519
+++ cups.spec	16 Sep 2009 10:25:32 -0000	1.520
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -505,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1:1.4.1-3
+- Use password-auth common PAM configuration instead of system-auth
+  when available.
+
 * Tue Sep 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
 - Fixed 'service cups status' to check for correct subsys name
   (bug #521641).



From mauelsha at fedoraproject.org  Wed Sep 16 10:29:44 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 10:29:44 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.94,1.95
Message-ID: <20090916102944.B42E611C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5238

Modified Files:
	dmraid.spec 
Log Message:
Update to 1.0.0.rc16 with event logging


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- dmraid.spec	17 Apr 2009 10:06:30 -0000	1.94
+++ dmraid.spec	16 Sep 2009 10:29:43 -0000	1.95
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdmraid.so.*
 
 %changelog
+* Thu Sep 11 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
+- Update to version 1.0.0.rc16
+
 * Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
 - Fix activation of isw raid sets when the disks have serialnumber longer
   then 16 characters (#490121)



From tmraz at fedoraproject.org  Wed Sep 16 10:29:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 10:29:49 +0000 (UTC)
Subject: rpms/cvs/devel cvs.pam,1.2,1.3 cvs.spec,1.65,1.66
Message-ID: <20090916102949.3C25511C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cvs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	cvs.pam cvs.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1.11.23-7
- Use password-auth common PAM configuration



Index: cvs.pam
===================================================================
RCS file: /cvs/pkgs/rpms/cvs/devel/cvs.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cvs.pam	15 Dec 2005 10:40:48 -0000	1.2
+++ cvs.pam	16 Sep 2009 10:29:46 -0000	1.3
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth		include		system-auth
-account		include		system-auth
+auth		include		password-auth
+account		include		password-auth


Index: cvs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- cvs.spec	24 Jul 2009 19:50:35 -0000	1.65
+++ cvs.spec	16 Sep 2009 10:29:47 -0000	1.66
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.23
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL+
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -165,6 +165,9 @@ exit 0
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1.11.23-7
+- Use password-auth common PAM configuration
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.23-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mauelsha at fedoraproject.org  Wed Sep 16 10:31:40 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 10:31:40 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.95,1.96
Message-ID: <20090916103140.4F31E11C00EC@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6356

Modified Files:
	dmraid.spec 
Log Message:
Update to 1.0.0.rc16 with event logging


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- dmraid.spec	16 Sep 2009 10:29:43 -0000	1.95
+++ dmraid.spec	16 Sep 2009 10:31:37 -0000	1.96
@@ -1,18 +1,19 @@
-Summary: Device-mapper RAID tool and library
+#
+# Copyright (C)  Heinz Mauelshagen, 2004-2009 Red Hat GmbH. All rights reserved.
+#
+# See file LICENSE at the top of this source tree for license information.
+#
+
+Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
-Version: 1.0.0.rc15
-Release: 7%{?dist}
+Version: 1.0.0.rc16
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
-Patch0: dmraid-1.0.0.rc15-whitespace.patch
-Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
-Patch2: dmraid-1.0.0.rc15-rm_partitions.patch
-Patch3: dmraid-1.0.0.rc15-isw-serial.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
-Requires: kpartx
-Requires: device-mapper >= 1.02.02-2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
+Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
@@ -22,78 +23,113 @@ DMRAID supports RAID device discovery, R
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
 Linux >= 2.4 using device-mapper.
 
-%package devel
-Summary: Development libraries and headers for dmraid
+%package -n dmraid-devel
+Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
 License: GPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 
-%description devel
+%description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
-RAID set activation, creation, removal, rebuild and display of
-properties for ATARAID/DDF1 metadata.
+RAID set activation and display of properties for ATARAID volumes.
 
-%package libs
-Summary: Shared library for RAID device discovery
-Group: System Environment/Libraries
-License: GPLv2+
+%package -n dmraid-events
+Summary: dmevent_tool (Device-mapper event tool) and DSO
+Group: System Environment/Base
+Requires: dmraid = %{version}-%{release}, sgpio
 
-%description libs
-This package contains the dmraid shared library, libdmraid.
+%description -n dmraid-events
+Provides a dmeventd DSO and the dmevent_tool to register devices with it
+for device monitoring.  All active RAID sets should be manually registered
+with dmevent_tool.
+
+%package -n dmraid-events-logwatch
+Summary: dmraid logwatch-based email reporting
+Group: System Environment/Base
+Requires: dmraid-events = %{version}-%{release}, logwatch, /etc/cron.d
+
+%description -n dmraid-events-logwatch
+Provides device failure reporting via logwatch-based email reporting.
+Device failure reporting has to be activated manually by activating the 
+/etc/cron.d/dmeventd-logwatch entry and by calling the dmevent_tool
+(see manual page for examples) for any active RAID sets.
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led
+make DESTDIR=$RPM_BUILD_ROOT
+mv tools/dmraid tools/dmraid.static
+make clean
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_linko --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
-make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid}
+install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
 make DESTDIR=$RPM_BUILD_ROOT install
-ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
+
+# Install static dmraid binary
+install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
+
+# Provide convenience link from dmevent_tool
+(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# if requested, install the dso
+# If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
 install -m 755 lib/libdmraid.so \
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
+install -m 755 lib/libdmraid-events-isw.so \
+	$RPM_BUILD_ROOT%{_libdir}/libdmraid-events-isw.so.%{version}
+(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so)
+
+# Install logwatch config file and script for dmeventd
+install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
+install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
+install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT/etc/cron.d/dmeventd-logwatch
+install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
- 
-%postun libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
-/%{_mandir}/man8/dmraid.8.gz
+/%{_mandir}/man8/dmraid*
 /sbin/dmraid
 /sbin/dmraid.static
+%{_libdir}/libdmraid.so*
+%{_libdir}/libdmraid-events-isw.so*
 /var/lock/dmraid
 
-%files devel
+%files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
-%{_includedir}/dmraid/*.h
-%attr(755,root,root) %{_libdir}/libdmraid.so
+%{_includedir}/dmraid/*
 
-%files libs
-%attr(755,root,root) %{_libdir}/libdmraid.so.*
+%files -n dmraid-events
+%defattr(-,root,root)
+/%{_mandir}/man8/dmevent_tool*
+/sbin/dmevent_tool
+/sbin/dm_dso_reg_tool
+
+%files -n dmraid-events-logwatch
+%defattr(-,root,root)
+%config(noreplace) /etc/logwatch/*
+%config(noreplace) /etc/cron.d/dmeventd-logwatch
+%ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
-* Thu Sep 11 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
+* Thu Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
 - Update to version 1.0.0.rc16
 
 * Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7



From mauelsha at fedoraproject.org  Wed Sep 16 10:39:01 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 10:39:01 +0000 (UTC)
Subject: rpms/dmraid/F-11 sources,1.23,1.24
Message-ID: <20090916103901.8E55111C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10842

Modified Files:
	sources 
Log Message:
Update to 1.0.0.rc16 with event logging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 Sep 2008 14:17:12 -0000	1.23
+++ sources	16 Sep 2009 10:39:00 -0000	1.24
@@ -1 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
+94994759eba7221579b17222bdaf34e7  dmraid-1.0.0.rc16.tar.bz2



From mauelsha at fedoraproject.org  Wed Sep 16 10:40:25 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 10:40:25 +0000 (UTC)
Subject: rpms/dmraid/F-11 .cvsignore,1.13,1.14
Message-ID: <20090916104025.A935D11C0338@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11713

Modified Files:
	.cvsignore 
Log Message:
Update to 1.0.0.rc16 with event logging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	25 Sep 2008 14:17:12 -0000	1.13
+++ .cvsignore	16 Sep 2009 10:40:23 -0000	1.14
@@ -1,2 +1,3 @@
 dmraid-1.0.0.rc14.tar.bz2
 dmraid-1.0.0.rc15.tar.bz2
+dmraid-1.0.0.rc16.tar.bz2



From jgu at fedoraproject.org  Wed Sep 16 10:50:13 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Wed, 16 Sep 2009 10:50:13 +0000 (UTC)
Subject: rpms/emacs-vm/F-11 vm-8.0.12-fix-charsets.patch, NONE,
	1.1 emacs-vm.spec, 1.35, 1.36
Message-ID: <20090916105013.466BC11C0336@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17447

Modified Files:
	emacs-vm.spec 
Added Files:
	vm-8.0.12-fix-charsets.patch 
Log Message:
* Wed Sep 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
- Add patch to fix charset recognition with emacs 23
- Bump minimum emacs to version 23.1
- Rebuild against emacs 23.1


vm-8.0.12-fix-charsets.patch:
 vm-mime.el |   43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

--- NEW FILE vm-8.0.12-fix-charsets.patch ---
--- vm-8.0.12-orig/lisp/vm-mime.el
+++ vm-8.0.12/lisp/vm-mime.el
@@ -1409,7 +1409,6 @@
 
 (defvar buffer-file-coding-system)
 
-;; TODO: integrate with the FSF's unify-8859-on-encoding-mode stuff.
 (defun vm-determine-proper-charset (beg end)
   "Work out what MIME character set to use for sending a message.
 
@@ -1430,6 +1429,28 @@
 	(if (or vm-xemacs-mule-p
 		(and vm-fsfemacs-mule-p enable-multibyte-characters))
 	    ;; Okay, we're on a MULE build.
+	  (if (fboundp 'check-coding-systems-region)
+	      ;; check-coding-systems-region appeared in GNU Emacs 23.
+	      (let* ((preapproved (vm-get-coding-system-priorities))
+		     (ucs-list (vm-get-mime-ucs-list))
+		     (cant-encode (check-coding-systems-region
+				   (point-min) (point-max)
+				   (cons 'us-ascii preapproved))))
+		(if (not (assq 'us-ascii cant-encode))
+		    ;; If there are only ASCII chars, we're done.
+		    "us-ascii"
+		  (while (and preapproved
+			      (assq (car preapproved) cant-encode)
+			      (not (memq (car preapproved) ucs-list)))
+		    (setq preapproved (cdr preapproved)))
+		  (if preapproved
+		      (cadr (assq (car preapproved)
+				  vm-mime-mule-coding-to-charset-alist))
+		    ;; None of the entries in vm-coding-system-priorities
+		    ;; can be used. This can only happen if no universal
+		    ;; coding system is included. Fall back to utf-8.
+		    "utf-8")))
+
 	    (let ((charsets (delq 'ascii
 				  (vm-charsets-in-region (point-min)
 							 (point-max)))))
@@ -1472,9 +1493,7 @@
 				(while preapproved
 				  (if (memq (car preapproved) ucs-list)
 				      (throw 'done 
-					     (car (cdr (assq 
-							(vm-coding-system-name 
-							 (car preapproved))
+					     (car (cdr (assq (car preapproved)
 				      vm-mime-mule-coding-to-charset-alist)))))
 				  (setq preapproved (cdr preapproved)))
 				;; Nothing universal in the preapproved list.
@@ -1488,8 +1507,8 @@
 			    (when (latin-unity-maybe-remap (point-min) 
 							   (point-max) sys 
 							   csets psets t)
-			      (throw 'done (second (assq 
-						    (vm-coding-system-name sys)
+			      (throw 'done
+				     (second (assq sys
 				    vm-mime-mule-coding-to-charset-alist)))))
 			  (setq systems (cdr systems)))
 			(throw 'done nil))
@@ -1511,9 +1530,8 @@
 			    ;; If we encounter a universal character set on
 			    ;; the preapproved list, pass it back.
 			    (if (memq (car preapproved) ucs-list)
-				(throw 'done (second (assq 
-						      (vm-coding-system-name
-						       (car preapproved))
+				(throw 'done
+				       (second (assq (car preapproved)
 				     vm-mime-mule-coding-to-charset-alist))))
 
 			    ;; The preapproved entry isn't universal. Check if
@@ -1549,15 +1567,14 @@
 			    ;; If we encounter a universal character set on
 			    ;; the preapproved list, pass it back.
 			    (when (memq (car preapproved) ucs-list)
-				(throw 'done (second (assq 
-						      (vm-coding-system-name
-						       (car preapproved))
+			      (throw 'done
+				     (second (assq (car preapproved)
 				     vm-mime-mule-coding-to-charset-alist))))
 			    (setq preapproved (cdr preapproved)))))
 		    (throw 'done nil))))
 	       ;; Couldn't do any magic with vm-coding-system-priorities. Pass
 	       ;; back a Japanese iso-2022 MIME character set.
-	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp"))))
+	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp")))))
 	  ;; If we're non-MULE and there are eight bit characters, use a
 	  ;; sensible default.
 	  (goto-char (point-min))


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-11/emacs-vm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- emacs-vm.spec	24 Feb 2009 14:47:51 -0000	1.35
+++ emacs-vm.spec	16 Sep 2009 10:50:12 -0000	1.36
@@ -13,7 +13,7 @@
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
 %if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 22.1
+%define emacs_version 23.1
 %define emacs_lispdir %{_datadir}/emacs/site-lisp
 %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
 %else
@@ -29,13 +29,14 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: 8.0.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
 Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{version}.tgz
 
 Patch0: vm-8.0.12-fix-missing-autoload.patch
+Patch1: vm-8.0.12-fix-charsets.patch
 
 Requires: emacs >= %{emacs_version}
 Requires(pre): /sbin/install-info 
@@ -70,6 +71,7 @@ package. It is not necessary to install 
 %setup -q -n vm-%{version}
 
 %patch0 -p1 -b .fix-missing-autoload
+%patch1 -p1 -b .fix-charsets.patch
 
 # Add missing entry for u-vm-color.el to lisp Makefile.in
 # This shouldn't be necessary after 8.0.12 
@@ -139,6 +141,11 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Wed Sep 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
+- Add patch to fix charset recognition with emacs 23
+- Bump minimum emacs to version 23.1
+- Rebuild against emacs 23.1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mauelsha at fedoraproject.org  Wed Sep 16 10:56:00 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 10:56:00 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.96,1.97
Message-ID: <20090916105600.D258411C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21458

Modified Files:
	dmraid.spec 
Log Message:
fix dmraid.spec requirement


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- dmraid.spec	16 Sep 2009 10:31:37 -0000	1.96
+++ dmraid.spec	16 Sep 2009 10:55:57 -0000	1.97
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
+BuildRequires: device-mapper >= 1.02.02-2, libdevmapper-devel, libselinux-devel, libsepol-devel
 Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig



From mauelsha at fedoraproject.org  Wed Sep 16 10:58:12 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 10:58:12 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.97,1.98
Message-ID: <20090916105812.CD6B611C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23360

Modified Files:
	dmraid.spec 
Log Message:
fix dmraid.spec requirement


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- dmraid.spec	16 Sep 2009 10:55:57 -0000	1.97
+++ dmraid.spec	16 Sep 2009 10:58:12 -0000	1.98
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.02-2, libdevmapper-devel, libselinux-devel, libsepol-devel
+BuildRequires: device-mapper >= 1.02.02-2, device-mapper-devel, libselinux-devel, libsepol-devel
 Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig



From palango at fedoraproject.org  Wed Sep 16 10:58:07 2009
From: palango at fedoraproject.org (palango)
Date: Wed, 16 Sep 2009 10:58:07 +0000 (UTC)
Subject: rpms/mono-nat/F-11 .cvsignore, 1.2, 1.3 mono-nat.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090916105807.E685711C0099@cvs1.fedora.phx.redhat.com>

Author: palango

Update of /cvs/pkgs/rpms/mono-nat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23156

Modified Files:
	.cvsignore mono-nat.spec sources 
Log Message:
update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nat/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Feb 2009 20:18:17 -0000	1.2
+++ .cvsignore	16 Sep 2009 10:58:06 -0000	1.3
@@ -1 +1 @@
-mono-nat-1.0.tar.gz
+mono-nat-1.0.2.tar.gz


Index: mono-nat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nat/F-11/mono-nat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mono-nat.spec	14 Jun 2009 20:27:36 -0000	1.3
+++ mono-nat.spec	16 Sep 2009 10:58:06 -0000	1.4
@@ -1,16 +1,18 @@
 %define		debug_package %{nil}
 
 Name:		mono-nat
-Version:	1.0
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 Summary:	.NET library for automatic port forwarding
 Group:		Development/Libraries
 License:	MIT
 URL:		http://anonsvn.mono-project.com/viewcvs/trunk/Mono.Nat/
-Source0:	http://www.monsoon-project.org/jaws/data/files/%{name}-%{version}.tar.gz
+Source0:	http://projects.qnetp.net/attachments/download/22/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+
 %description 
 Mono.Nat is a .NET library used for automatic port forwarding,
 using either uPnP or nat-pmp.
@@ -52,6 +54,12 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono.nat.pc
 
 %changelog
+* Wed Jul 01 2009 Paul Lange <palango at gmx.de> - 1.0.2-1
+- Update to 1.0.2
+
+* Sun Jun 21 2009 Paul Lange <palango at gmx.de> - 1.0-4
+- Fix supported archs
+
 * Sun Jun 14 2009 Paul Lange <palango at gmx.de> - 1.0-3
 - Enable ppc64 target
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nat/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Feb 2009 20:18:19 -0000	1.2
+++ sources	16 Sep 2009 10:58:07 -0000	1.3
@@ -1 +1 @@
-998da8f45265dd5e6865ceee1ed3a8d7  mono-nat-1.0.tar.gz
+7c62563a353ecf71857201496b7a8a54  mono-nat-1.0.2.tar.gz



From hadess at fedoraproject.org  Wed Sep 16 11:02:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Sep 2009 11:02:20 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-11 gbt-f11-backport.patch, NONE,
	1.1 gnome-bluetooth.spec, 1.82, 1.83
Message-ID: <20090916110220.484A411C00EC@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-serv25409

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	gbt-f11-backport.patch 
Log Message:
* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-2
- Backport loads of bug fixes from master (#523001)


gbt-f11-backport.patch:
 applet/main.c                    |   33 ++++++++++----
 b/applet/main.c                  |    4 -
 b/applet/notify.c                |    2 
 b/applet/popup-menu.ui           |    9 +++
 b/lib/bluetooth-client.c         |    5 +-
 b/lib/bluetooth-enums.h          |    7 ++-
 b/lib/bluetooth-plugin-manager.c |    5 +-
 b/lib/test-client.c              |   17 +++++--
 b/lib/test-plugins.c             |   12 ++++-
 b/properties/adapter.c           |    3 -
 b/properties/main.c              |    7 ++-
 b/wizard/main.c                  |    2 
 b/wizard/wizard.ui               |    3 -
 lib/bluetooth-client.c           |   91 ++++++++++++++++++++++++++-------------
 lib/bluetooth-enums.h            |   10 +---
 15 files changed, 145 insertions(+), 65 deletions(-)

--- NEW FILE gbt-f11-backport.patch ---
>From 20bc51c9b4bca1913f2dce4e897fe73e4bf4710e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 24 Jul 2009 12:12:38 +0100
Subject: [PATCH 01/21] [Bug 589593] New: Crashes when disconnecting audio service

---
 lib/bluetooth-client.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index b087861..caae303 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -1610,6 +1610,10 @@ service_to_index (const char *service)
 		if (g_str_equal (connectable_interfaces[i], service) != FALSE)
 			return i;
 	}
+	for (i = 0; i < G_N_ELEMENTS (detectable_interfaces); i++) {
+		if (g_str_equal (detectable_interfaces[i], service) != FALSE)
+			return i + G_N_ELEMENTS (connectable_interfaces);
+	}
 
 	g_assert_not_reached ();
 
-- 
1.6.2.5


>From ea8e00974c687eba2bf2b735245ea2a3b4d80af9 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 24 Jul 2009 13:37:05 +0100
Subject: [PATCH 02/21] Track the state of org.bluez.Audio service as well

Because otherwise we think it's still connected when it actually
isn't. Fixes the device showing up as connected when it wasn't
in BlueZ.
---
 lib/bluetooth-client.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index caae303..63582f1 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -61,6 +61,7 @@
 #define BLUEZ_DEVICE_INTERFACE	"org.bluez.Device"
 
 static char * detectable_interfaces[] = {
+	"org.bluez.Audio",
 	"org.bluez.Headset",
 	"org.bluez.AudioSink",
 	"org.bluez.Input"
@@ -349,22 +350,15 @@ device_list_nodes (DBusGProxy *device, BluetoothClient *client, gboolean connect
 	for (i = 0; i < G_N_ELEMENTS (detectable_interfaces); i++) {
 		DBusGProxy *iface;
 		GHashTable *props;
-		const char *iface_name;
 
 		/* Don't add the input interface for devices that already have
 		 * audio stuff */
 		if (g_str_equal (detectable_interfaces[i], BLUEZ_INPUT_INTERFACE)
 		    && g_hash_table_size (table) > 0)
 			continue;
-		/* Add org.bluez.Audio if the device supports headset or audiosink */
-		if (g_str_equal (detectable_interfaces[i], BLUEZ_HEADSET_INTERFACE) ||
-		    g_str_equal (detectable_interfaces[i], BLUEZ_AUDIOSINK_INTERFACE))
-		    	iface_name = BLUEZ_AUDIO_INTERFACE;
-		else
-			iface_name = detectable_interfaces[i];
 
 		/* And skip interface if it's already in the hash table */
-		if (g_hash_table_lookup (table, iface_name) != NULL)
+		if (g_hash_table_lookup (table, detectable_interfaces[i]) != NULL)
 			continue;
 
 		iface = dbus_g_proxy_new_from_proxy (device, detectable_interfaces[i], NULL);
@@ -386,7 +380,7 @@ device_list_nodes (DBusGProxy *device, BluetoothClient *client, gboolean connect
 				is_connected = (g_strcmp0(str, "connected") == 0);
 			}
 
-			g_hash_table_insert (table, (gpointer) iface_name, GINT_TO_POINTER (is_connected));
+			g_hash_table_insert (table, (gpointer) detectable_interfaces[i], GINT_TO_POINTER (is_connected));
 
 			if (connect_signal != FALSE) {
 				dbus_g_proxy_add_signal(iface, "PropertyChanged",
-- 
1.6.2.5


>From 050d5855db820dbaa9cc5000bb325d7f6d045f76 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 26 Jul 2009 16:11:54 +0100
Subject: [PATCH 03/21] Add status enumeration

To mark services as being connected, disconnected, or
connecting.
---
 lib/bluetooth-enums.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/bluetooth-enums.h b/lib/bluetooth-enums.h
index 7163607..3ec607a 100644
--- a/lib/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
@@ -79,6 +79,12 @@ typedef enum {
 	_BLUETOOTH_NUM_COLUMNS /*< skip >*/
 } BluetoothColumn;
 
+typedef enum {
+	BLUETOOTH_STATUS_DISCONNECTED = 0,
+	BLUETOOTH_STATUS_CONNECTED,
+	BLUETOOTH_STATUS_CONNECTING
+} BluetoothStatus;
+
 G_END_DECLS
 
 #endif /* __BLUETOOTH_ENUMS_H */
-- 
1.6.2.5


>From c7fc79a81d5397bbe171f547a38a6d7d606b3105 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 26 Jul 2009 16:12:46 +0100
Subject: [PATCH 04/21] Mark services as connecting

When the service supports it, mark them as "connecting" when
a connection is taking place. Only works for audio devices
right now.
---
 lib/bluetooth-client.c |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index 63582f1..d639ba6 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -34,6 +34,7 @@
 #include "bluetooth-client.h"
 #include "bluetooth-client-private.h"
 #include "bluetooth-client-glue.h"
+#include "gnome-bluetooth-enum-types.h"
 
 #include "marshal.h"
 
@@ -310,12 +311,24 @@ device_services_changed (DBusGProxy *iface, const char *property,
 	GtkTreePath *tree_path;
 	GHashTable *table;
 	const char *path;
-	gboolean is_connected;
+	BluetoothStatus status;
 
 	if (g_str_equal (property, "Connected") != FALSE) {
-		is_connected = g_value_get_boolean(value);
+		status = g_value_get_boolean (value) ?
+			BLUETOOTH_STATUS_CONNECTED :
+			BLUETOOTH_STATUS_DISCONNECTED;
 	} else if (g_str_equal (property, "State") != FALSE) {
-		is_connected = (g_strcmp0(g_value_get_string (value), "connected") == 0);
+		GEnumClass *eclass;
+		GEnumValue *ev;
+		eclass = g_type_class_ref (BLUETOOTH_TYPE_STATUS);
+		ev = g_enum_get_value_by_nick (eclass, g_value_get_string (value));
+		if (ev == NULL) {
+			g_warning ("Unknown status '%s'", g_value_get_string (value));
+			status = BLUETOOTH_STATUS_DISCONNECTED;
+		} else {
+			status = ev->value;
+		}
+		g_type_class_unref (eclass);
 	} else
 		return;
 
@@ -329,7 +342,7 @@ device_services_changed (DBusGProxy *iface, const char *property,
 
 	g_hash_table_insert (table,
 			     (gpointer) dbus_g_proxy_get_interface (iface),
-			     GINT_TO_POINTER (is_connected));
+			     GINT_TO_POINTER (status));
 
 	tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->store), &iter);
 	gtk_tree_model_row_changed (GTK_TREE_MODEL (priv->store), tree_path, &iter);
@@ -366,21 +379,30 @@ device_list_nodes (DBusGProxy *device, BluetoothClient *client, gboolean connect
 				       G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props,
 				       G_TYPE_INVALID) != FALSE) {
 			GValue *value;
-			gboolean is_connected;
+			BluetoothStatus status;
 
 			value = g_hash_table_lookup(props, "Connected");
 			if (value != NULL) {
-				is_connected = g_value_get_boolean(value);
+				status = g_value_get_boolean(value) ?
+					BLUETOOTH_STATUS_CONNECTED :
+					BLUETOOTH_STATUS_DISCONNECTED;
 			} else {
-				const char *str = "disconnected";
-				value = g_hash_table_lookup(props, "State");
-				if (value != NULL)
-					str = g_value_get_string(value);
+				GEnumClass *eclass;
+				GEnumValue *ev;
 
-				is_connected = (g_strcmp0(str, "connected") == 0);
+				eclass = g_type_class_ref (BLUETOOTH_TYPE_STATUS);
+				value = g_hash_table_lookup(props, "State");
+				ev = g_enum_get_value_by_nick (eclass, g_value_get_string (value));
+				if (ev == NULL) {
+					g_warning ("Unknown status '%s'", g_value_get_string (value));
+					status = BLUETOOTH_STATUS_DISCONNECTED;
+				} else {
+					status = ev->value;
+				}
+				g_type_class_unref (eclass);
 			}
 
-			g_hash_table_insert (table, (gpointer) detectable_interfaces[i], GINT_TO_POINTER (is_connected));
+			g_hash_table_insert (table, (gpointer) detectable_interfaces[i], GINT_TO_POINTER (status));
 
 			if (connect_signal != FALSE) {
 				dbus_g_proxy_add_signal(iface, "PropertyChanged",
-- 
1.6.2.5


>From b60e246b68250058c6917d1f423349050fafcb70 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 26 Jul 2009 16:13:26 +0100
Subject: [PATCH 05/21] Update test client for status changes

The test client now knows whether a service is connecting.
---
 lib/test-client.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/test-client.c b/lib/test-client.c
index 57edcc2..56d5ebc 100644
--- a/lib/test-client.c
+++ b/lib/test-client.c
@@ -31,6 +31,7 @@
 
 #include "bluetooth-client.h"
 #include "bluetooth-client-private.h"
+#include "gnome-bluetooth-enum-types.h"
 
 static BluetoothClient *client;
 static GtkTreeSelection *selection;
@@ -98,10 +99,19 @@ static void type_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
 }
 
 static void
-services_foreach (const char *service, gpointer _value, GString *str)
+services_foreach (const char *service, gpointer value, GString *str)
 {
-	gboolean value = GPOINTER_TO_INT (_value);
-	g_string_append_printf (str, "%s (%s) ", service, value ? "connected" : "not connected");
+	GEnumClass *eclass;
+	GEnumValue *ev;
+	BluetoothStatus status = GPOINTER_TO_INT (value);
+
+	eclass = g_type_class_ref (BLUETOOTH_TYPE_STATUS);
+	ev = g_enum_get_value (eclass, status);
+	if (ev == NULL)
+		g_warning ("Unknown status value %d", status);
+
+	g_string_append_printf (str, "%s (%s) ", service, ev ? ev->value_nick : "unknown");
+	g_type_class_unref (eclass);
 }
 
 static void services_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- 
1.6.2.5


>From 4a30c0b7ab2695d2a6937d17097372e80d08de5c Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 26 Jul 2009 16:27:27 +0100
Subject: [PATCH 06/21] Fix small memleak when changing the tooltip

When changing the tooltip of the applet, don't forget to free
the old tooltip...
---
 applet/notify.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/applet/notify.c b/applet/notify.c
index f4dd3b5..e1f3ebc 100644
--- a/applet/notify.c
+++ b/applet/notify.c
@@ -149,6 +149,7 @@ void set_icon(gboolean enabled)
 
 	if (statusicon == NULL) {
 		g_free (icon_name);
+		g_free (tooltip);
 		icon_name = g_strdup (name);
 		tooltip = g_strdup (_tooltip);
 	} else {
-- 
1.6.2.5


>From 03bb5b2198c1e8ec0f52e1dc34e858378d5de668 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 26 Jul 2009 17:16:30 +0100
Subject: [PATCH 07/21] Add support for "playing" status

As used in the A2DP and Headset services.
---
 lib/bluetooth-enums.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-enums.h b/lib/bluetooth-enums.h
index 3ec607a..7563c4c 100644
--- a/lib/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
@@ -82,7 +82,8 @@ typedef enum {
 typedef enum {
 	BLUETOOTH_STATUS_DISCONNECTED = 0,
 	BLUETOOTH_STATUS_CONNECTED,
-	BLUETOOTH_STATUS_CONNECTING
+	BLUETOOTH_STATUS_CONNECTING,
+	BLUETOOTH_STATUS_PLAYING
 } BluetoothStatus;
 
 G_END_DECLS
-- 
1.6.2.5


>From 8110b166205759fc0e585573fe226373538df8ec Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 26 Jul 2009 20:43:52 +0100
Subject: [PATCH 08/21] =?utf-8?q?Bug=20589681=20=E2=80=93=20Doesn't=20connect=20to=20input=20service=20on=20Sony=20Ericsson=20phones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Ignore the Audio service if there's no AudioSink or Headset service.

Makes the input service show up again for Sony Ericsson phones, and
allows us to connect to the remote control application.
---
 lib/bluetooth-client.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index d639ba6..e929ad4 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -62,9 +62,9 @@
 #define BLUEZ_DEVICE_INTERFACE	"org.bluez.Device"
 
 static char * detectable_interfaces[] = {
-	"org.bluez.Audio",
 	"org.bluez.Headset",
 	"org.bluez.AudioSink",
+	"org.bluez.Audio",
 	"org.bluez.Input"
 };
 
@@ -370,6 +370,15 @@ device_list_nodes (DBusGProxy *device, BluetoothClient *client, gboolean connect
 		    && g_hash_table_size (table) > 0)
 			continue;
 
+		/* Don't add the audio interface if there's no Headset or AudioSink,
+		 * that means that it could only receive audio */
+		if (g_str_equal (detectable_interfaces[i], BLUEZ_AUDIO_INTERFACE)) {
+			if (g_hash_table_lookup (table, BLUEZ_HEADSET_INTERFACE) == NULL &&
+			    g_hash_table_lookup (table, BLUEZ_AUDIOSINK_INTERFACE) == NULL) {
+				continue;
+			}
+		}
+
 		/* And skip interface if it's already in the hash table */
 		if (g_hash_table_lookup (table, detectable_interfaces[i]) != NULL)
 			continue;
-- 
1.6.2.5


>From f2ae6aa239df221ca096cdb604f0569218d6178a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 30 Jul 2009 15:50:22 +0100
Subject: [PATCH 09/21] Fix thinko in disabling menu items

---
 applet/main.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/applet/main.c b/applet/main.c
index c826b9d..f9ea351 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -350,8 +350,7 @@ update_menu_items (void)
 	if (num_adapters_present == 0)
 		enabled = FALSE;
 	else
-		enabled = (num_adapters_present - num_adapters_powered) >= 0;
-
+		enabled = (num_adapters_present - num_adapters_powered) <= 0;
 
 	object = gtk_builder_get_object (xml, "send-file");
 	gtk_action_set_sensitive (GTK_ACTION (object),
-- 
1.6.2.5


>From fbd08ce783b8d25514e6436d05865267385c6834 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 30 Jul 2009 16:02:08 +0100
Subject: [PATCH 10/21] Print out errors when GtkBuilder files fail parsing

---
 applet/main.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/applet/main.c b/applet/main.c
index f9ea351..c849e17 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -309,10 +309,23 @@ killswitch_state_changed (BluetoothKillswitch *killswitch, KillswitchState state
 static GtkWidget *create_popupmenu(void)
 {
 	GObject *object;
+	GError *error = NULL;
 
 	xml = gtk_builder_new ();
-	if (gtk_builder_add_from_file (xml, "popup-menu.ui", NULL) == 0)
-		gtk_builder_add_from_file (xml, PKGDATADIR "/popup-menu.ui", NULL);
+	if (gtk_builder_add_from_file (xml, "popup-menu.ui", &error) == 0) {
+		if (error->domain == GTK_BUILDER_ERROR) {
+			g_warning ("Failed to load popup-menu.ui: %s", error->message);
+			g_error_free (error);
+			return NULL;
+		}
+		g_error_free (error);
+		error = NULL;
+		if (gtk_builder_add_from_file (xml, PKGDATADIR "/popup-menu.ui", &error) == 0) {
+			g_warning ("Failed to load popup-menu.ui: %s", error->message);
+			g_error_free (error);
+			return NULL;
+		}
+	}
 
 	gtk_builder_connect_signals (xml, NULL);
 
-- 
1.6.2.5


>From df5c7c34bc948bfb1a81fe21fdd417365eba7ae0 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 30 Jul 2009 18:10:41 +0100
Subject: [PATCH 11/21] Update default-adapter-powered when no adapters are available

Otherwise we might think it's still enabled when it's not.
---
 lib/bluetooth-client.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index e929ad4..52a7481 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -970,7 +970,9 @@ static void adapter_removed(DBusGProxy *manager,
 	if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL(priv->store), NULL) == 0) {
 		g_free(priv->default_adapter);
 		priv->default_adapter = NULL;
+		priv->default_adapter_powered = FALSE;
 		g_object_notify (G_OBJECT (client), "default-adapter");
+		g_object_notify (G_OBJECT (client), "default-adapter-powered");
 	}
 }
 
-- 
1.6.2.5


>From e0f2fbece374182b30e6375eee04b76cb6ddf87b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 30 Jul 2009 18:26:05 +0100
Subject: [PATCH 12/21] Update the Powered column on adapter changes

Otherwise we miss the adapter going down on soft block rfkill.
---
 lib/bluetooth-client.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index 52a7481..c56cc8e 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -825,6 +825,18 @@ static void adapter_changed(DBusGProxy *adapter, const char *property,
 		gtk_tree_store_set(priv->store, &iter,
 				BLUETOOTH_COLUMN_DISCOVERING, discovering, -1);
 		notify = TRUE;
+	} else if (g_str_equal(property, "Powered") == TRUE) {
+		gboolean powered = g_value_get_boolean(value);
+		gboolean is_default;
+
+		gtk_tree_store_set(priv->store, &iter,
+				   BLUETOOTH_COLUMN_POWERED, powered, -1);
+		gtk_tree_model_get(GTK_TREE_MODEL(priv->store), &iter,
+				   BLUETOOTH_COLUMN_DEFAULT, &is_default, -1);
+		if (is_default != FALSE && powered != priv->default_adapter_powered) {
+			priv->default_adapter_powered = powered;
+			g_object_notify (G_OBJECT (client), "default-adapter-powered");
+		}
 	}
 
 	if (notify != FALSE) {
-- 
1.6.2.5


>From b83c15e7c2ac8c24516fa97bc26a13eb40c40331 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 30 Jul 2009 18:30:00 +0100
Subject: [PATCH 13/21] Hide unwanted menu items when Bluetooth is disabled

We don't care about much of the menu items when there's no
adapters enabled.
---
 applet/main.c        |   15 +++++++++------
 applet/popup-menu.ui |    8 ++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/applet/main.c b/applet/main.c
index c849e17..e9b077d 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -365,18 +365,21 @@ update_menu_items (void)
 	else
 		enabled = (num_adapters_present - num_adapters_powered) <= 0;
 
+	object = gtk_builder_get_object (xml, "adapter-action-group");
+	gtk_action_group_set_visible (GTK_ACTION_GROUP (object), enabled);
+	gtk_action_group_set_visible (devices_action_group, enabled);
+
+	if (enabled == FALSE)
+		return;
+
 	object = gtk_builder_get_object (xml, "send-file");
 	gtk_action_set_sensitive (GTK_ACTION (object),
-				  enabled &&
-				  (program_available ("obex-data-server")
-				   || program_available ("obexd")));
+				  program_available ("obexd"));
 
 	object = gtk_builder_get_object (xml, "browse-device");
 	gtk_action_set_sensitive (GTK_ACTION (object),
-				  enabled && program_available ("nautilus"));
+				  program_available ("nautilus"));
 
-	object = gtk_builder_get_object (xml, "setup-new");
-	gtk_action_set_sensitive (GTK_ACTION (object), enabled);
 }
 
 static void
diff --git a/applet/popup-menu.ui b/applet/popup-menu.ui
index 0060ae4..a4677b0 100644
--- a/applet/popup-menu.ui
+++ b/applet/popup-menu.ui
@@ -20,6 +20,10 @@
 						<signal name="activate" handler="bluetooth_status_callback"/>
 					</object>
 				</child>
+			</object>
+		</child>
+		<child>
+			<object class="GtkActionGroup" id="adapter-action-group">
 				<child>
 					<object class="GtkAction" id="send-file">
 						<property name="label" translatable="yes">Send files to device...</property>
@@ -46,6 +50,10 @@
 						<signal name="activate" handler="wizard_callback"/>
 					</object>
 				</child>
+			</object>
+		</child>
+		<child>
+			<object class="GtkActionGroup" id="preferences-action-group">
 				<child>
 					<object class="GtkAction" id="preferences">
 						<property name="label" translatable="yes">Preferences...</property>
-- 
1.6.2.5


>From e1570bfc65aa2d26d7ca117a0b3e1a81f85d2d62 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 3 Aug 2009 15:55:48 +0100
Subject: [PATCH 14/21] Fix underline in "Set up new device"

Spotted by Matthias Clasen
---
 properties/adapter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/properties/adapter.c b/properties/adapter.c
index 122df2b..8b6a7db 100644
--- a/properties/adapter.c
+++ b/properties/adapter.c
@@ -434,7 +434,7 @@ static void create_adapter(adapter_data *adapter)
 	gtk_table_attach(GTK_TABLE(table), buttonbox, 1, 2, 1, 2,
 			 GTK_FILL, GTK_FILL, 6, 6);
 
-	button = gtk_button_new_with_label(_("Setup _new device..."));
+	button = gtk_button_new_with_mnemonic(_("Setup _new device..."));
 	image = gtk_image_new_from_stock(GTK_STOCK_ADD,
 						GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image(GTK_BUTTON(button), image);
-- 
1.6.2.5


>From abbe0a406ef3fb510d87580e96d2457d74f7b10b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 09:40:45 +0100
Subject: [PATCH 15/21] =?utf-8?q?Bug=20590874=20=E2=80=93=20crash=20in=20Bluetooth:=20adding=20a=20bluetooth=20NAP=20phone?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Don't unload plugins, fixes crashes on exit when the plugins
register GObject types.
---
 lib/bluetooth-plugin-manager.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-plugin-manager.c b/lib/bluetooth-plugin-manager.c
index c8db9ef..ab1751c 100644
--- a/lib/bluetooth-plugin-manager.c
+++ b/lib/bluetooth-plugin-manager.c
@@ -101,7 +101,9 @@ bluetooth_plugin_manager_cleanup (void)
 	for (l = plugin_list; l != NULL; l = l->next) {
 		GbtPlugin *p = l->data;
 
-		g_module_close (p->module);
+		/* Disabled as it causes crashes when plugins use
+		 * the GObject type system */
+		/* g_module_close (p->module); */
 		g_free (p);
 	}
 	g_list_free (plugin_list);
-- 
1.6.2.5


>From fa90cb5852bcad75835d733613114355095005b2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 11:50:38 +0100
Subject: [PATCH 16/21] Add D-Bus object path to the debug output

---
 properties/main.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/properties/main.c b/properties/main.c
index da60ff5..535dfef 100644
--- a/properties/main.c
+++ b/properties/main.c
@@ -212,6 +212,7 @@ services_foreach (const char *service, gpointer _value, GString *str)
 static void
 dump_device (GtkTreeModel *model, GtkTreeIter *iter, gboolean is_adapter)
 {
+	DBusGProxy *proxy;
 	char *address, *alias, *icon, **uuids;
 	gboolean is_default, paired, trusted, connected, discovering, powered;
 	GHashTable *services;
@@ -230,11 +231,12 @@ dump_device (GtkTreeModel *model, GtkTreeIter *iter, gboolean is_adapter)
 			    BLUETOOTH_COLUMN_POWERED, &powered,
 			    BLUETOOTH_COLUMN_SERVICES, &services,
 			    BLUETOOTH_COLUMN_UUIDS, &uuids,
+			    BLUETOOTH_COLUMN_PROXY, &proxy,
 			    -1);
 
 	if (is_adapter != FALSE) {
 		/* Adapter */
-		g_print ("Adapter: %s (%s)\n", alias, address);
+		g_print ("Adapter: %s (%s)\n", alias ? alias : "(No alias)", address);
 		if (is_default)
 			g_print ("\tDefault adapter\n");
 		if (discovering)
@@ -243,6 +245,7 @@ dump_device (GtkTreeModel *model, GtkTreeIter *iter, gboolean is_adapter)
 	} else {
 		/* Device */
 		g_print ("Device: %s (%s)\n", alias, address);
+		g_print ("\tD-Bus Path: %s\n", proxy ? dbus_g_proxy_get_path (proxy) : "(none)");
 		g_print ("\tType: %s Icon: %s\n", bluetooth_type_to_string (type), icon);
 		g_print ("\tPaired: %s Trusted: %s Connected: %s\n", BOOL_STR(paired), BOOL_STR(trusted), BOOL_STR(connected));
 		if (services != NULL) {
@@ -266,6 +269,7 @@ dump_device (GtkTreeModel *model, GtkTreeIter *iter, gboolean is_adapter)
 	g_free (alias);
 	g_free (address);
 	g_free (icon);
+	g_object_unref (proxy);
 	if (services != NULL)
 		g_hash_table_unref (services);
 	g_strfreev (uuids);
-- 
1.6.2.5


>From eb1d160df6df18e40e096e0a340bc097603f2071 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 10 Aug 2009 11:20:37 +0100
Subject: [PATCH 17/21] Handle delete-event in test-plugins

So we can have it exit cleanly for use with valgrind.
---
 lib/test-plugins.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/lib/test-plugins.c b/lib/test-plugins.c
index ce4009b..ac06084 100644
--- a/lib/test-plugins.c
+++ b/lib/test-plugins.c
@@ -2,6 +2,15 @@
 #include <dbus/dbus-glib.h>
 #include "bluetooth-plugin-manager.h"
 
+static gboolean
+delete_event_cb (GtkWidget *widget,
+		 GdkEvent  *event,
+		 gpointer   user_data)
+{
+	gtk_main_quit ();
+	return FALSE;
+}
+
 int main (int argc, char **argv)
 {
 	GtkWidget *window, *vbox;
@@ -18,6 +27,8 @@ int main (int argc, char **argv)
 	bluetooth_plugin_manager_init ();
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	g_signal_connect (G_OBJECT (window), "delete-event",
+			  G_CALLBACK (delete_event_cb), NULL);
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
-- 
1.6.2.5


>From bd1d8b99462098c03a1ec0f6ebae04c09f772575 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 1 Sep 2009 17:45:01 +0100
Subject: [PATCH 18/21] =?utf-8?q?Bug=C2=A0593777=20-=20duplicate=20object=20id=20in=20ui=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Rename duplicate label1 to label3 (which is unused)
---
 wizard/wizard.ui |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/wizard/wizard.ui b/wizard/wizard.ui
index 459f8b2..6b03cfc 100644
--- a/wizard/wizard.ui
+++ b/wizard/wizard.ui
@@ -390,7 +390,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Fixed PIN</property>
-- 
1.6.2.5


>From 22484ca7b5d2f7c2f12fbf3423b3ad93f354e407 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 3 Sep 2009 18:17:43 +0100
Subject: [PATCH 19/21] =?utf-8?q?Bug=C2=A0594055=20-=20applet=20fails=20to=20connect=20to=20any=20disconnected=20audio=20device?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Hunted down by Peter Hurley <phurley at charter.net>.

Description
If the remote device is disconnected when the applet starts, the applet
will be unable to initiate connection to the audio interface of the
device.

Cause
Incorrect use of g_hash_table_lookup in the device_list_nodes() function
in lib/bluetooth-client.c

Discussion
For a given device, device_list_nodes() loops through the known
detectable interfaces (those in detectable_interfaces[]) and adds
them to the returned hash table if calling the interfaces's
.GetProperties dbus method returns true.

The value of the "Connected" property is then stored as the associated
value with the interface name as the key in the hash table.

The *connectable* interface "org.bluez.Audio" is only added if at least
either of the *detectable* interfaces "org.bluez.Headset" or
"org.bluez.AudioSink" were added the the hash table in previous
iterations within device_list_nodes().

However, the test for whether those *detectable* interfaces were added
is not correct. Currently, g_hash_table_lookup() is used to determine
if the interface names are in the hash table.  g_hash_table_lookup()
will return NULL if the the key is not present in the hash table,
OTHERWISE IT RETURNS THE VALUE ASSOCIATED WITH THE KEY. If that value
is 0 (== BLUETOOTH_STATUS_DISCONNECTED), the logic mistakenly believes
that the key is not present in the hash table, and as a result, fails
to add the only connectable audio interface "org.bluez.Audio".

Recommend
Either use g_hash_table_lookup_extended() to test for key presence
or change enum BLUET00TH_STATUS_DISCONNECTED to be != 0.
---
 lib/bluetooth-enums.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-enums.h b/lib/bluetooth-enums.h
index 7563c4c..450c38c 100644
--- a/lib/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
@@ -80,7 +80,8 @@ typedef enum {
 } BluetoothColumn;
 
 typedef enum {
-	BLUETOOTH_STATUS_DISCONNECTED = 0,
+	BLUETOOTH_STATUS_INVALID = 0,
+	BLUETOOTH_STATUS_DISCONNECTED,
 	BLUETOOTH_STATUS_CONNECTED,
 	BLUETOOTH_STATUS_CONNECTING,
 	BLUETOOTH_STATUS_PLAYING
-- 
1.6.2.5


>From 016e07941e3fac523f339f144aad0880118ccf36 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec at suse.cz>
Date: Thu, 10 Sep 2009 16:20:35 +0100
Subject: [PATCH 20/21] Fix crash on pairing request of known rfcomm device

Fixes crash after access attempt to the device configured
in rfcomm.conf, but not yet paired.

How to reproduce:

1. Configure an unknown RFCOMM device that requires authentication in
   rfcomm.conf (e. g. mobile phone).
2. run pppd on /dev/rfcomm1

Behavior:
- Pairing request on mobile phone
- Crash of bluetooth-applet on desktop
---
 lib/bluetooth-client.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index c56cc8e..d7fef54 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -663,7 +663,7 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent,
 		name = value ? g_value_get_string(value) : NULL;
 
 		value = g_hash_table_lookup(hash, "Class");
-		type = class_to_type(g_value_get_uint(value));
+		type = value ? class_to_type(g_value_get_uint(value)) : BLUETOOTH_TYPE_ANY;
 
 		value = g_hash_table_lookup(hash, "Icon");
 		icon = value ? g_value_get_string(value) : "bluetooth";
-- 
1.6.2.5


>From d326df2d5b7f78222f70fb805c13ff0a54917535 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 11 Sep 2009 14:58:25 +0100
Subject: [PATCH 21/21] Fix pairing with devices that require PIN entry

If a device that has a fixed PIN was selected before a device that
doesn't have one (for example, select a printer or audio headset,
before selecting a phone), then the automatic_pincode would have
been TRUE.

We need to reset the automatic_pincode every time we change devices.
---
 wizard/main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/wizard/main.c b/wizard/main.c
index 4fde0de..31e10f7 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -771,6 +771,7 @@ select_device_changed (BluetoothChooser *selector,
 
 	target_type = type;
 	target_ssp = !legacypairing;
+	automatic_pincode = FALSE;
 
 	g_free (pincode);
 	pincode = NULL;
-- 
1.6.2.5



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- gnome-bluetooth.spec	21 Jul 2009 16:34:17 -0000	1.82
+++ gnome-bluetooth.spec	16 Sep 2009 11:02:18 -0000	1.83
@@ -1,12 +1,14 @@
 Name:		gnome-bluetooth
 Version:	2.27.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/GnomeBluetooth
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
+# http://git.gnome.org/cgit/gnome-bluetooth/log/?h=fedora-11
+Patch0:		gbt-f11-backport.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gtk2-devel
@@ -62,6 +64,7 @@ for writing applications that require a 
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
+%patch0 -p1 -b .backport
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -185,6 +188,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-2
+- Backport loads of bug fixes from master (#523001)
+
 * Tue Jul 21 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-1
 - Update to 2.27.8
 



From atkac at fedoraproject.org  Wed Sep 16 11:09:17 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 16 Sep 2009 11:09:17 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.56,
	1.57 bind-9.3.1rc1-sdb_tools-Makefile.in, 1.4,
	1.5 bind-9.5-libidn.patch, 1.3, 1.4 bind-9.5-sdb.patch, 1.4,
	1.5 bind-96-dyndb.patch, 1.10, 1.11 bind-nonexec.patch, 1.4,
	1.5 bind.spec, 1.326, 1.327 sources, 1.65, 1.66
Message-ID: <20090916110917.6722611C0099@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28585

Modified Files:
	.cvsignore bind-9.3.1rc1-sdb_tools-Makefile.in 
	bind-9.5-libidn.patch bind-9.5-sdb.patch bind-96-dyndb.patch 
	bind-nonexec.patch bind.spec sources 
Log Message:
- update to 9.7.0a3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	15 Sep 2009 12:56:45 -0000	1.56
+++ .cvsignore	16 Sep 2009 11:09:11 -0000	1.57
@@ -1,2 +1,2 @@
-bind-9.7.0a2.tar.gz
+bind-9.7.0a3.tar.gz
 config-4.tar.bz2


Index: bind-9.3.1rc1-sdb_tools-Makefile.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.3.1rc1-sdb_tools-Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bind-9.3.1rc1-sdb_tools-Makefile.in	12 Feb 2008 11:40:19 -0000	1.4
+++ bind-9.3.1rc1-sdb_tools-Makefile.in	16 Sep 2009 11:09:12 -0000	1.5
@@ -10,6 +10,8 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES}
 
+CDEFINES =	-DBIND9
+
 DNSLIBS =	../../lib/dns/libdns. at A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =	../../lib/isccfg/libisccfg. at A@
 ISCCCLIBS =	../../lib/isccc/libisccc. at A@

bind-9.5-libidn.patch:
 Makefile.in |    6 +-
 dighost.c   |  152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 153 insertions(+), 5 deletions(-)

Index: bind-9.5-libidn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-libidn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bind-9.5-libidn.patch	30 Mar 2009 14:54:41 -0000	1.3
+++ bind-9.5-libidn.patch	16 Sep 2009 11:09:12 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
---- bind-9.6.1b1/bin/dig/dighost.c.libidn	2009-02-25 03:39:21.000000000 +0100
-+++ bind-9.6.1b1/bin/dig/dighost.c	2009-03-30 15:01:41.350136527 +0200
+diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c
+--- bind-9.7.0a3/bin/dig/dighost.c.libidn	2009-09-01 02:22:24.000000000 +0200
++++ bind-9.7.0a3/bin/dig/dighost.c	2009-09-16 12:58:36.044643387 +0200
 @@ -44,6 +44,11 @@
  #include <idn/api.h>
  #endif
@@ -28,7 +28,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  /*%
   * Exit Codes:
   *
-@@ -1012,6 +1025,9 @@ setup_system(void) {
+@@ -1029,6 +1042,9 @@ setup_system(void) {
  	dig_searchlist_t *domain = NULL;
  	lwres_result_t lwresult;
  	unsigned int lwresflags;
@@ -38,7 +38,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  
  	debug("setup_system()");
  
-@@ -1068,8 +1084,15 @@ setup_system(void) {
+@@ -1087,8 +1103,15 @@ setup_system(void) {
  
  #ifdef WITH_IDN
  	initialize_idn();
@@ -55,7 +55,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  	if (keyfile[0] != 0)
  		setup_file_key();
  	else if (keysecret[0] != 0)
-@@ -1770,12 +1793,18 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1789,12 +1812,18 @@ setup_lookup(dig_lookup_t *lookup) {
  	idn_result_t mr;
  	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
  #endif
@@ -75,7 +75,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  	REQUIRE(lookup != NULL);
  	INSIST(!free_now);
  
-@@ -1812,6 +1841,16 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1831,6 +1860,16 @@ setup_lookup(dig_lookup_t *lookup) {
  	mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
  			    utf8_textname, sizeof(utf8_textname));
  	idn_check_result(mr, "convert textname to UTF-8");
@@ -92,7 +92,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  #endif
  
  	/*
-@@ -1831,6 +1870,15 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1850,6 +1889,15 @@ setup_lookup(dig_lookup_t *lookup) {
  			lookup->origin = ISC_LIST_HEAD(search_list);
  			lookup->need_search = ISC_FALSE;
  		}
@@ -108,7 +108,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  #else
  		if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
  			lookup->origin = NULL; /* Force abs lookup */
-@@ -1857,6 +1905,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1876,6 +1924,20 @@ setup_lookup(dig_lookup_t *lookup) {
  			    IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
  			    idn_textname, sizeof(idn_textname));
  	idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
@@ -129,22 +129,21 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  #else
  	if (lookup->origin != NULL) {
  		debug("trying origin %s", lookup->origin->origin);
-@@ -1913,6 +1975,14 @@ setup_lookup(dig_lookup_t *lookup) {
- 						   dns_rootname,
- 						   ISC_FALSE,
+@@ -1931,6 +1993,13 @@ setup_lookup(dig_lookup_t *lookup) {
+ 			result = dns_name_fromtext(lookup->name, &b,
+ 						   dns_rootname, 0,
  						   &lookup->namebuf);
 +#elif defined (WITH_LIBIDN)
 +			len = strlen (ascii_name);
 +			isc_buffer_init(&b, ascii_name, len);
 +			isc_buffer_add(&b, len);
 +			result = dns_name_fromtext(lookup->name, &b,
-+						   dns_rootname,
-+						   ISC_FALSE,
++						   dns_rootname, 0,
 +						   &lookup->namebuf);
  #else
  			len = strlen(lookup->textname);
  			isc_buffer_init(&b, lookup->textname, len);
-@@ -3432,7 +3502,7 @@ destroy_libs(void) {
+@@ -3449,7 +3518,7 @@ destroy_libs(void) {
  	void * ptr;
  	dig_message_t *chase_msg;
  #endif
@@ -153,7 +152,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  	isc_result_t result;
  #endif
  
-@@ -3471,6 +3541,10 @@ destroy_libs(void) {
+@@ -3488,6 +3557,10 @@ destroy_libs(void) {
  	result = dns_name_settotextfilter(NULL);
  	check_result(result, "dns_name_settotextfilter");
  #endif
@@ -164,7 +163,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  	dns_name_destroy();
  
  	if (commctx != NULL) {
-@@ -3647,6 +3721,79 @@ idn_check_result(idn_result_t r, const c
+@@ -3664,6 +3737,79 @@ idn_check_result(idn_result_t r, const c
  	}
  }
  #endif /* WITH_IDN */
@@ -244,19 +243,23 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.
  
  #ifdef DIG_SIGCHASE
  void
-diff -up bind-9.6.1b1/bin/dig/Makefile.in.libidn bind-9.6.1b1/bin/dig/Makefile.in
---- bind-9.6.1b1/bin/dig/Makefile.in.libidn	2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.6.1b1/bin/dig/Makefile.in	2009-03-30 15:00:42.883135505 +0200
-@@ -45,7 +45,7 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} 
+diff -up bind-9.7.0a3/bin/dig/Makefile.in.libidn bind-9.7.0a3/bin/dig/Makefile.in
+--- bind-9.7.0a3/bin/dig/Makefile.in.libidn	2009-09-03 01:48:01.000000000 +0200
++++ bind-9.7.0a3/bin/dig/Makefile.in	2009-09-16 12:59:00.314643312 +0200
+@@ -46,10 +46,10 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} 
  		${LWRESDEPLIBS}
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
 -		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
 +		${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
  
+ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCNOSYMLIBS} \
+-		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
++		${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
+ 
  SUBDIRS =
  
-@@ -63,6 +63,8 @@ HTMLPAGES =	dig.html host.html nslookup.
+@@ -67,6 +67,8 @@ HTMLPAGES =	dig.html host.html nslookup.
  
  MANOBJS =	${MANPAGES} ${HTMLPAGES}
  

bind-9.5-sdb.patch:
 bin/Makefile.in           |    3 +-
 bin/named-sdb/Makefile.in |   20 +++++---------
 bin/named-sdb/main.c      |   62 ++++++++++++++++++++++++++++++++++++++++++++++
 bin/named/Makefile.in     |   14 +++-------
 configure.in              |    3 ++
 5 files changed, 79 insertions(+), 23 deletions(-)

Index: bind-9.5-sdb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-sdb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bind-9.5-sdb.patch	15 Sep 2009 12:56:45 -0000	1.4
+++ bind-9.5-sdb.patch	16 Sep 2009 11:09:12 -0000	1.5
@@ -1,6 +1,6 @@
-diff -up bind-9.7.0a2/bin/Makefile.in.sdb bind-9.7.0a2/bin/Makefile.in
---- bind-9.7.0a2/bin/Makefile.in.sdb	2009-06-10 02:27:21.000000000 +0200
-+++ bind-9.7.0a2/bin/Makefile.in	2009-09-15 14:43:48.966994484 +0200
+diff -up bind-9.7.0a3/bin/Makefile.in.sdb bind-9.7.0a3/bin/Makefile.in
+--- bind-9.7.0a3/bin/Makefile.in.sdb	2009-06-10 02:27:21.000000000 +0200
++++ bind-9.7.0a3/bin/Makefile.in	2009-09-16 12:55:29.034655166 +0200
 @@ -19,7 +19,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
@@ -11,28 +11,33 @@ diff -up bind-9.7.0a2/bin/Makefile.in.sd
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile.in
---- bind-9.7.0a2/bin/named/Makefile.in.sdb	2009-09-15 14:41:03.827015348 +0200
-+++ bind-9.7.0a2/bin/named/Makefile.in	2009-09-15 14:41:03.886994927 +0200
+diff -up bind-9.7.0a3/bin/named/Makefile.in.sdb bind-9.7.0a3/bin/named/Makefile.in
+--- bind-9.7.0a3/bin/named/Makefile.in.sdb	2009-09-16 12:55:28.994644340 +0200
++++ bind-9.7.0a3/bin/named/Makefile.in	2009-09-16 12:56:40.424643332 +0200
 @@ -45,7 +45,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
  
--CDEFINES =      @USE_DLZ@
-+CDEFINES =
+-CDEFINES =      -DBIND9 @USE_DLZ@
++CDEFINES =      -DBIND9
  
  CWARNINGS =
  
-@@ -68,7 +68,7 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+@@ -69,11 +69,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
 -		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 +		@LIBS@
  
+ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
+ 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
+-		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
++		@LIBS@
+ 
  SUBDIRS =	unix
  
-@@ -81,8 +81,7 @@ OBJS =		builtin. at O@ client. at O@ config. at O
+@@ -86,8 +86,7 @@ OBJS =		builtin. at O@ client. at O@ config. at O
  		tkeyconf. at O@ tsigconf. at O@ update. at O@ xfrout. at O@ \
  		zoneconf. at O@ \
  		lwaddr. at O@ lwresd. at O@ lwdclient. at O@ lwderror. at O@ lwdgabn. at O@ \
@@ -42,7 +47,7 @@ diff -up bind-9.7.0a2/bin/named/Makefile
  
  UOBJS =		unix/os. at O@
  
-@@ -93,8 +92,7 @@ SRCS =		builtin.c client.c config.c cont
+@@ -100,8 +99,7 @@ SRCS =		builtin.c client.c config.c cont
  		tkeyconf.c tsigconf.c update.c xfrout.c \
  		zoneconf.c \
  		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@@ -52,16 +57,16 @@ diff -up bind-9.7.0a2/bin/named/Makefile
  
  MANPAGES =	named.8 lwresd.8 named.conf.5
  
-@@ -158,5 +156,3 @@ install:: named at EXEEXT@ lwresd at EXEEXT@ i
+@@ -166,5 +164,3 @@ install:: named at EXEEXT@ lwresd at EXEEXT@ i
  	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
  	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
  	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 -
 - at DLZ_DRIVER_RULES@
-diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c
---- bind-9.7.0a2/bin/named-sdb/main.c.sdb	2009-09-15 14:41:03.846995272 +0200
-+++ bind-9.7.0a2/bin/named-sdb/main.c	2009-09-15 14:41:03.886994927 +0200
-@@ -74,6 +74,9 @@
+diff -up bind-9.7.0a3/bin/named-sdb/main.c.sdb bind-9.7.0a3/bin/named-sdb/main.c
+--- bind-9.7.0a3/bin/named-sdb/main.c.sdb	2009-09-16 12:55:29.014643786 +0200
++++ bind-9.7.0a3/bin/named-sdb/main.c	2009-09-16 12:55:29.034655166 +0200
+@@ -75,6 +75,9 @@
   * Include header files for database drivers here.
   */
  /* #include "xxdb.h" */
@@ -71,7 +76,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main
  
  /*
   * Include DLZ drivers if appropriate.
-@@ -685,6 +688,10 @@ setup(void) {
+@@ -757,6 +760,10 @@ setup(void) {
  		ns_main_earlyfatal("isc_app_start() failed: %s",
  				   isc_result_totext(result));
  
@@ -82,7 +87,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
  		      saved_command_line);
-@@ -766,6 +773,57 @@ setup(void) {
+@@ -840,6 +847,57 @@ setup(void) {
  				   isc_result_totext(result));
  #endif
  
@@ -140,7 +145,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main
  	ns_server_create(ns_g_mctx, &ns_g_server);
  }
  
-@@ -793,6 +851,10 @@ cleanup(void) {
+@@ -867,6 +925,10 @@ cleanup(void) {
  
  	dns_name_destroy();
  
@@ -151,9 +156,9 @@ diff -up bind-9.7.0a2/bin/named-sdb/main
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
-diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/Makefile.in
---- bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb	2009-09-15 14:41:03.846995272 +0200
-+++ bind-9.7.0a2/bin/named-sdb/Makefile.in	2009-09-15 14:43:19.486994430 +0200
+diff -up bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb bind-9.7.0a3/bin/named-sdb/Makefile.in
+--- bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb	2009-09-16 12:55:29.014643786 +0200
++++ bind-9.7.0a3/bin/named-sdb/Makefile.in	2009-09-16 12:57:05.617143628 +0200
 @@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
@@ -168,7 +173,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/Make
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-@@ -72,7 +72,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9L
+@@ -77,7 +77,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
  
  SUBDIRS =	unix
  
@@ -177,16 +182,16 @@ diff -up bind-9.7.0a2/bin/named-sdb/Make
  
  OBJS =		builtin. at O@ client. at O@ config. at O@ control. at O@ \
  		controlconf. at O@ interfacemgr. at O@ \
-@@ -125,7 +125,7 @@ config. at O@: config.c bind.keys.h
+@@ -132,7 +132,7 @@ config. at O@: config.c bind.keys.h
  		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
  		-c ${srcdir}/config.c
  
 -named at EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
 +named-sdb at EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- 	${OBJS} ${UOBJS} ${LIBS}
- 
-@@ -149,14 +149,8 @@ statschannel. at O@: bind9.xsl.h
+ 	export MAKE_SYMTABLE="yes"; \
+ 	export BASEOBJS="${OBJS} ${UOBJS}"; \
+ 	${FINALBUILDCMD}
+@@ -157,14 +157,8 @@ statschannel. at O@: bind9.xsl.h
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -203,10 +208,10 @@ diff -up bind-9.7.0a2/bin/named-sdb/Make
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb at EXEEXT@ ${DESTDIR}${sbindir}
  
  @DLZ_DRIVER_RULES@
-diff -up bind-9.7.0a2/configure.in.sdb bind-9.7.0a2/configure.in
---- bind-9.7.0a2/configure.in.sdb	2009-07-15 00:38:37.000000000 +0200
-+++ bind-9.7.0a2/configure.in	2009-09-15 14:43:00.036994464 +0200
-@@ -2958,6 +2958,8 @@ AC_CONFIG_FILES([
+diff -up bind-9.7.0a3/configure.in.sdb bind-9.7.0a3/configure.in
+--- bind-9.7.0a3/configure.in.sdb	2009-09-04 02:44:54.000000000 +0200
++++ bind-9.7.0a3/configure.in	2009-09-16 12:55:29.044644803 +0200
+@@ -3144,6 +3144,8 @@ AC_CONFIG_FILES([
  	bin/confgen/unix/Makefile
  	bin/named/Makefile
  	bin/named/unix/Makefile
@@ -215,7 +220,7 @@ diff -up bind-9.7.0a2/configure.in.sdb b
  	bin/rndc/Makefile
  	bin/dig/Makefile
  	bin/nsupdate/Makefile
-@@ -2979,6 +2981,7 @@ AC_CONFIG_FILES([
+@@ -3165,6 +3167,7 @@ AC_CONFIG_FILES([
  	bin/tests/headerdep_test.sh
  	bin/tools/Makefile
  	bin/dnssec/Makefile

bind-96-dyndb.patch:
 bin/named/main.c                 |    3 
 bin/named/server.c               |  102 ++++++++++
 lib/dns/Makefile.in              |   11 -
 lib/dns/dynamic_db.c             |  364 +++++++++++++++++++++++++++++++++++++++
 lib/dns/include/dns/Makefile.in  |    2 
 lib/dns/include/dns/dynamic_db.h |   50 +++++
 lib/dns/include/dns/log.h        |    1 
 lib/dns/include/dns/types.h      |    1 
 lib/dns/log.c                    |    1 
 lib/isccfg/namedconf.c           |   36 +++
 10 files changed, 567 insertions(+), 4 deletions(-)

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bind-96-dyndb.patch	15 Sep 2009 12:56:46 -0000	1.10
+++ bind-96-dyndb.patch	16 Sep 2009 11:09:12 -0000	1.11
@@ -1,7 +1,7 @@
-diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c
---- bind-9.7.0a2/bin/named/main.c.dyndb	2009-05-07 11:33:52.000000000 +0200
-+++ bind-9.7.0a2/bin/named/main.c	2009-09-15 14:35:49.054494598 +0200
-@@ -44,6 +44,7 @@
+diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c
+--- bind-9.7.0a3/bin/named/main.c.dyndb	2009-09-01 20:40:25.000000000 +0200
++++ bind-9.7.0a3/bin/named/main.c	2009-09-16 10:47:35.744643926 +0200
+@@ -45,6 +45,7 @@
  #include <isccc/result.h>
  
  #include <dns/dispatch.h>
@@ -9,7 +9,7 @@ diff -up bind-9.7.0a2/bin/named/main.c.d
  #include <dns/name.h>
  #include <dns/result.h>
  #include <dns/view.h>
-@@ -770,6 +771,8 @@ setup(void) {
+@@ -844,6 +845,8 @@ setup(void) {
  
  static void
  cleanup(void) {
@@ -18,9 +18,9 @@ diff -up bind-9.7.0a2/bin/named/main.c.d
  	destroy_managers();
  
  	ns_server_destroy(&ns_g_server);
-diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c
---- bind-9.7.0a2/bin/named/server.c.dyndb	2009-08-05 19:35:33.000000000 +0200
-+++ bind-9.7.0a2/bin/named/server.c	2009-09-15 14:35:49.064494786 +0200
+diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c
+--- bind-9.7.0a3/bin/named/server.c.dyndb	2009-09-10 03:49:29.000000000 +0200
++++ bind-9.7.0a3/bin/named/server.c	2009-09-16 10:47:35.744643926 +0200
 @@ -58,6 +58,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
@@ -29,7 +29,7 @@ diff -up bind-9.7.0a2/bin/named/server.c
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -1036,6 +1037,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -1054,6 +1055,72 @@ configure_peer(const cfg_obj_t *cpeer, i
  }
  
  static isc_result_t
@@ -102,7 +102,7 @@ diff -up bind-9.7.0a2/bin/named/server.c
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -1245,6 +1312,7 @@ configure_view(dns_view_t *view, const c
+@@ -1263,6 +1330,7 @@ configure_view(dns_view_t *view, const c
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -110,7 +110,7 @@ diff -up bind-9.7.0a2/bin/named/server.c
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1429,6 +1497,37 @@ configure_view(dns_view_t *view, const c
+@@ -1447,6 +1515,37 @@ configure_view(dns_view_t *view, const c
  #endif
  
  	/*
@@ -148,7 +148,7 @@ diff -up bind-9.7.0a2/bin/named/server.c
  	 * Obtain configuration parameters that affect the decision of whether
  	 * we can reuse/share an existing cache.
  	 */
-@@ -3581,6 +3680,7 @@ load_configuration(const char *filename,
+@@ -3598,6 +3697,7 @@ load_configuration(const char *filename,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
  
@@ -156,7 +156,7 @@ diff -up bind-9.7.0a2/bin/named/server.c
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4927,6 +5027,8 @@ loadconfig(ns_server_t *server) {
+@@ -4944,6 +5044,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -165,9 +165,9 @@ diff -up bind-9.7.0a2/bin/named/server.c
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff -up /dev/null bind-9.7.0a2/lib/dns/dynamic_db.c
---- /dev/null	2009-09-15 11:43:46.690717252 +0200
-+++ bind-9.7.0a2/lib/dns/dynamic_db.c	2009-09-15 14:35:49.064494786 +0200
+diff -up /dev/null bind-9.7.0a3/lib/dns/dynamic_db.c
+--- /dev/null	2009-09-16 12:27:54.710000266 +0200
++++ bind-9.7.0a3/lib/dns/dynamic_db.c	2009-09-16 10:47:35.744643926 +0200
 @@ -0,0 +1,364 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -533,9 +533,9 @@ diff -up /dev/null bind-9.7.0a2/lib/dns/
 +
 +	return args->timermgr;
 +}
-diff -up /dev/null bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h
---- /dev/null	2009-09-15 11:43:46.690717252 +0200
-+++ bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h	2009-09-15 14:35:49.064494786 +0200
+diff -up /dev/null bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h
+--- /dev/null	2009-09-16 12:27:54.710000266 +0200
++++ bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h	2009-09-16 10:47:35.744643926 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -587,9 +587,9 @@ diff -up /dev/null bind-9.7.0a2/lib/dns/
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff -up bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb bind-9.7.0a2/lib/dns/include/dns/log.h
---- bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb	2009-01-18 00:47:43.000000000 +0100
-+++ bind-9.7.0a2/lib/dns/include/dns/log.h	2009-09-15 14:35:49.064494786 +0200
+diff -up bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb bind-9.7.0a3/lib/dns/include/dns/log.h
+--- bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb	2009-01-18 00:47:43.000000000 +0100
++++ bind-9.7.0a3/lib/dns/include/dns/log.h	2009-09-16 10:47:35.744643926 +0200
 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
@@ -598,9 +598,9 @@ diff -up bind-9.7.0a2/lib/dns/include/dn
  
  ISC_LANG_BEGINDECLS
  
-diff -up bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/include/dns/Makefile.in
---- bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
-+++ bind-9.7.0a2/lib/dns/include/dns/Makefile.in	2009-09-15 14:35:49.064494786 +0200
+diff -up bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/include/dns/Makefile.in
+--- bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
++++ bind-9.7.0a3/lib/dns/include/dns/Makefile.in	2009-09-16 10:47:35.744643926 +0200
 @@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
  
  HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
@@ -610,10 +610,10 @@ diff -up bind-9.7.0a2/lib/dns/include/dn
  		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
  		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
  		message.h name.h ncache.h \
-diff -up bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb bind-9.7.0a2/lib/dns/include/dns/types.h
---- bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb	2009-07-19 06:18:05.000000000 +0200
-+++ bind-9.7.0a2/lib/dns/include/dns/types.h	2009-09-15 14:35:49.064494786 +0200
-@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
+diff -up bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb bind-9.7.0a3/lib/dns/include/dns/types.h
+--- bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb	2009-09-01 02:22:27.000000000 +0200
++++ bind-9.7.0a3/lib/dns/include/dns/types.h	2009-09-16 10:47:35.744643926 +0200
+@@ -60,6 +60,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
  typedef struct dns_dlzdb			dns_dlzdb_t;
@@ -621,9 +621,9 @@ diff -up bind-9.7.0a2/lib/dns/include/dn
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff -up bind-9.7.0a2/lib/dns/log.c.dyndb bind-9.7.0a2/lib/dns/log.c
---- bind-9.7.0a2/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
-+++ bind-9.7.0a2/lib/dns/log.c	2009-09-15 14:35:49.064494786 +0200
+diff -up bind-9.7.0a3/lib/dns/log.c.dyndb bind-9.7.0a3/lib/dns/log.c
+--- bind-9.7.0a3/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
++++ bind-9.7.0a3/lib/dns/log.c	2009-09-16 10:47:35.744643926 +0200
 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
@@ -632,9 +632,9 @@ diff -up bind-9.7.0a2/lib/dns/log.c.dynd
  	{ NULL, 		0 }
  };
  
-diff -up bind-9.7.0a2/lib/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/Makefile.in
---- bind-9.7.0a2/lib/dns/Makefile.in.dyndb	2009-09-15 14:35:49.044494756 +0200
-+++ bind-9.7.0a2/lib/dns/Makefile.in	2009-09-15 14:36:51.104494645 +0200
+diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in
+--- bind-9.7.0a3/lib/dns/Makefile.in.dyndb	2009-09-16 10:47:35.714664894 +0200
++++ bind-9.7.0a3/lib/dns/Makefile.in	2009-09-16 10:47:35.744643926 +0200
 @@ -57,8 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
  DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
  		cache. at O@ callbacks. at O@ compress. at O@ \
@@ -667,9 +667,9 @@ diff -up bind-9.7.0a2/lib/dns/Makefile.i
  libdns. at SA@: ${OBJS}
  	${AR} ${ARFLAGS} $@ ${OBJS}
  	${RANLIB} $@
-diff -up bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb bind-9.7.0a2/lib/isccfg/namedconf.c
---- bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb	2009-07-29 19:52:00.000000000 +0200
-+++ bind-9.7.0a2/lib/isccfg/namedconf.c	2009-09-15 14:37:13.096994453 +0200
+diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/namedconf.c
+--- bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb	2009-09-02 18:10:03.000000000 +0200
++++ bind-9.7.0a3/lib/isccfg/namedconf.c	2009-09-16 10:52:11.257143715 +0200
 @@ -87,6 +87,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -678,15 +678,15 @@ diff -up bind-9.7.0a2/lib/isccfg/namedco
  static cfg_type_t cfg_type_ixfrdifftype;
  static cfg_type_t cfg_type_key;
  static cfg_type_t cfg_type_logfile;
-@@ -760,6 +761,7 @@ namedconf_or_view_clauses[] = {
+@@ -791,6 +792,7 @@ namedconf_or_view_clauses[] = {
  	{ "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
  	/* only 1 DLZ per view allowed */
  	{ "dlz", &cfg_type_dynamically_loadable_zones, 0 },
 +	{ "dynamic-db", &cfg_type_dynamic_db, CFG_CLAUSEFLAG_MULTI },
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
- 	{ "managed-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
-@@ -1531,6 +1533,40 @@ static cfg_type_t cfg_type_dialuptype = 
+ 	{ "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
+@@ -1561,6 +1563,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };
  

bind-nonexec.patch:
 bind9/Makefile.in  |    2 +-
 dns/Makefile.in    |    2 +-
 isc/Makefile.in    |    2 +-
 isccc/Makefile.in  |    2 +-
 isccfg/Makefile.in |    2 +-
 lwres/Makefile.in  |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Index: bind-nonexec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-nonexec.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bind-nonexec.patch	9 Mar 2009 14:35:56 -0000	1.4
+++ bind-nonexec.patch	16 Sep 2009 11:09:12 -0000	1.5
@@ -1,28 +1,31 @@
---- bind-9.2.4rc6/lib/dns/Makefile.in.nonexec	2004-04-14 20:35:27.000000000 -0400
-+++ bind-9.2.4rc6/lib/dns/Makefile.in	2004-07-16 19:25:40.000000000 -0400
-@@ -136,7 +136,7 @@
+diff -up bind-9.7.0a3/lib/bind9/Makefile.in.nonexec bind-9.7.0a3/lib/bind9/Makefile.in
+--- bind-9.7.0a3/lib/bind9/Makefile.in.nonexec	2009-09-03 01:48:01.000000000 +0200
++++ bind-9.7.0a3/lib/bind9/Makefile.in	2009-09-16 10:46:27.554643093 +0200
+@@ -78,7 +78,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns. at A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns. at A@ ${DESTDIR}${libdir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9. at A@ ${DESTDIR}${libdir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind9. at A@ ${DESTDIR}${libdir}
  
  clean distclean::
- 	rm -f libdns. at A@ timestamp
---- bind-9.2.4rc6/lib/isc/Makefile.in.nonexec	2004-03-09 01:11:44.000000000 -0500
-+++ bind-9.2.4rc6/lib/isc/Makefile.in	2004-07-16 19:24:46.000000000 -0400
-@@ -105,7 +105,7 @@
+ 	rm -f libbind9. at A@ timestamp
+diff -up bind-9.7.0a3/lib/dns/Makefile.in.nonexec bind-9.7.0a3/lib/dns/Makefile.in
+--- bind-9.7.0a3/lib/dns/Makefile.in.nonexec	2009-09-01 02:22:26.000000000 +0200
++++ bind-9.7.0a3/lib/dns/Makefile.in	2009-09-16 10:46:27.554643093 +0200
+@@ -132,7 +132,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc. at A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc. at A@ ${DESTDIR}${libdir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns. at A@ ${DESTDIR}${libdir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns. at A@ ${DESTDIR}${libdir}
  
  clean distclean::
- 	rm -f libisc. at A@ libisc.la timestamp
---- bind-9.2.4rc6/lib/isccc/Makefile.in.nonexec	2004-03-09 01:12:25.000000000 -0500
-+++ bind-9.2.4rc6/lib/isccc/Makefile.in	2004-07-16 19:26:40.000000000 -0400
-@@ -80,7 +80,7 @@
+ 	rm -f libdns. at A@ timestamp
+diff -up bind-9.7.0a3/lib/isccc/Makefile.in.nonexec bind-9.7.0a3/lib/isccc/Makefile.in
+--- bind-9.7.0a3/lib/isccc/Makefile.in.nonexec	2009-09-03 01:48:03.000000000 +0200
++++ bind-9.7.0a3/lib/isccc/Makefile.in	2009-09-16 10:46:27.554643093 +0200
+@@ -80,7 +80,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
@@ -31,9 +34,10 @@
  
  clean distclean::
  	rm -f libisccc. at A@ timestamp
---- bind-9.2.4rc6/lib/isccfg/Makefile.in.nonexec	2004-03-09 01:12:30.000000000 -0500
-+++ bind-9.2.4rc6/lib/isccfg/Makefile.in	2004-07-16 19:27:22.000000000 -0400
-@@ -77,7 +77,7 @@
+diff -up bind-9.7.0a3/lib/isccfg/Makefile.in.nonexec bind-9.7.0a3/lib/isccfg/Makefile.in
+--- bind-9.7.0a3/lib/isccfg/Makefile.in.nonexec	2009-09-03 01:48:03.000000000 +0200
++++ bind-9.7.0a3/lib/isccfg/Makefile.in	2009-09-16 10:46:27.554643093 +0200
+@@ -77,7 +77,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
@@ -42,26 +46,27 @@
  
  clean distclean::
  	rm -f libisccfg. at A@ timestamp
---- bind-9.2.4rc6/lib/lwres/Makefile.in.nonexec	2004-03-09 01:12:32.000000000 -0500
-+++ bind-9.2.4rc6/lib/lwres/Makefile.in	2004-07-16 19:28:19.000000000 -0400
-@@ -76,7 +76,7 @@
+diff -up bind-9.7.0a3/lib/isc/Makefile.in.nonexec bind-9.7.0a3/lib/isc/Makefile.in
+--- bind-9.7.0a3/lib/isc/Makefile.in.nonexec	2009-09-04 20:13:44.000000000 +0200
++++ bind-9.7.0a3/lib/isc/Makefile.in	2009-09-16 10:47:07.074642868 +0200
+@@ -121,7 +121,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres. at A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} liblwres. at A@ ${DESTDIR}${libdir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc. at A@ ${DESTDIR}${libdir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc. at A@ ${DESTDIR}${libdir}
  
- clean distclean::
- 	rm -f liblwres. at A@ liblwres.la timestamp
-diff -up bind-9.5.0rc1/lib/bind9/Makefile.in.nonexec bind-9.5.0rc1/lib/bind9/Makefile.in
---- bind-9.5.0rc1/lib/bind9/Makefile.in.nonexec	2008-05-22 15:40:03.000000000 +0200
-+++ bind-9.5.0rc1/lib/bind9/Makefile.in	2008-05-22 15:41:22.000000000 +0200
+ install:: @ISC_ARCH_DIR@/include/isc/atomic.h
+ 	${INSTALL_DATA} @ISC_ARCH_DIR@/include/isc/atomic.h ${DESTDIR}${includedir}/isc
+diff -up bind-9.7.0a3/lib/lwres/Makefile.in.nonexec bind-9.7.0a3/lib/lwres/Makefile.in
+--- bind-9.7.0a3/lib/lwres/Makefile.in.nonexec	2007-06-20 01:47:22.000000000 +0200
++++ bind-9.7.0a3/lib/lwres/Makefile.in	2009-09-16 10:46:27.554643093 +0200
 @@ -78,7 +78,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9. at A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind9. at A@ ${DESTDIR}${libdir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres. at A@ ${DESTDIR}${libdir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} liblwres. at A@ ${DESTDIR}${libdir}
  
  clean distclean::
- 	rm -f libbind9. at A@ timestamp
+ 	rm -f liblwres. at A@ liblwres.la timestamp


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- bind.spec	15 Sep 2009 15:34:00 -0000	1.326
+++ bind.spec	16 Sep 2009 11:09:12 -0000	1.327
@@ -5,7 +5,7 @@
 #%define PATCHVER P1
 #%define PREVER rc1
 #%define VERSION %{version}-%{PATCHVER}
-%define PREVER a2
+%define PREVER a3
 %define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.2.%{PREVER}%{?dist}
+Release:  0.3.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -232,7 +232,7 @@ sed -i -e \
 's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \
 version
 
-libtoolize -c -f; aclocal -I m4 --force; autoheader -f; autoconf -f
+libtoolize -c -f; aclocal -I m4 --force; autoconf -f
 
 %configure \
   --with-libtool \
@@ -595,6 +595,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Wed Sep 16 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.3.a3
+- update to 9.7.0a3
+
 * Tue Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.2.a2
 - improve chroot related documentation (#507795)
 - add NetworkManager dispatcher script to reload named when network interface is


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	15 Sep 2009 12:56:46 -0000	1.65
+++ sources	16 Sep 2009 11:09:13 -0000	1.66
@@ -1,2 +1,2 @@
-e2e3fd011f57dcec46d2f968016e3e93  bind-9.7.0a2.tar.gz
+ff61597579dcb629213c7421b26e9457  bind-9.7.0a3.tar.gz
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2



From jgu at fedoraproject.org  Wed Sep 16 11:13:14 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Wed, 16 Sep 2009 11:13:14 +0000 (UTC)
Subject: rpms/emacs-vm/F-11 emacs-vm.spec,1.36,1.37
Message-ID: <20090916111314.CCA4E11C00EC@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30054

Modified Files:
	emacs-vm.spec 
Log Message:
* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
- Bump release to fix up cvs problem

* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
- Add patch to fix charset recognition with emacs 23
- Bump minimum emacs to version 23.1
- Rebuild against emacs 23.1




Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-11/emacs-vm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- emacs-vm.spec	16 Sep 2009 10:50:12 -0000	1.36
+++ emacs-vm.spec	16 Sep 2009 11:12:41 -0000	1.37
@@ -29,7 +29,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: 8.0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -141,7 +141,10 @@ fi
 %{pkgdir}/*.el
 
 %changelog
-* Wed Sep 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
+* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
+- Bump release to fix up cvs problem
+
+* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
 - Add patch to fix charset recognition with emacs 23
 - Bump minimum emacs to version 23.1
 - Rebuild against emacs 23.1



From jgu at fedoraproject.org  Wed Sep 16 11:25:11 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Wed, 16 Sep 2009 11:25:11 +0000 (UTC)
Subject: rpms/emacs-vm/devel vm-8.0.12-fix-charsets.patch, NONE,
	1.1 emacs-vm.spec, 1.36, 1.37
Message-ID: <20090916112512.392E411C00EC@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4650

Modified Files:
	emacs-vm.spec 
Added Files:
	vm-8.0.12-fix-charsets.patch 
Log Message:
* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
- Bump release to fix up cvs problem

* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
- Add patch to fix charset recognition with emacs 23
- Bump minimum emacs to version 23.1
- Rebuild against emacs 23.1



vm-8.0.12-fix-charsets.patch:
 vm-mime.el |   43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

--- NEW FILE vm-8.0.12-fix-charsets.patch ---
--- vm-8.0.12-orig/lisp/vm-mime.el
+++ vm-8.0.12/lisp/vm-mime.el
@@ -1409,7 +1409,6 @@
 
 (defvar buffer-file-coding-system)
 
-;; TODO: integrate with the FSF's unify-8859-on-encoding-mode stuff.
 (defun vm-determine-proper-charset (beg end)
   "Work out what MIME character set to use for sending a message.
 
@@ -1430,6 +1429,28 @@
 	(if (or vm-xemacs-mule-p
 		(and vm-fsfemacs-mule-p enable-multibyte-characters))
 	    ;; Okay, we're on a MULE build.
+	  (if (fboundp 'check-coding-systems-region)
+	      ;; check-coding-systems-region appeared in GNU Emacs 23.
+	      (let* ((preapproved (vm-get-coding-system-priorities))
+		     (ucs-list (vm-get-mime-ucs-list))
+		     (cant-encode (check-coding-systems-region
+				   (point-min) (point-max)
+				   (cons 'us-ascii preapproved))))
+		(if (not (assq 'us-ascii cant-encode))
+		    ;; If there are only ASCII chars, we're done.
+		    "us-ascii"
+		  (while (and preapproved
+			      (assq (car preapproved) cant-encode)
+			      (not (memq (car preapproved) ucs-list)))
+		    (setq preapproved (cdr preapproved)))
+		  (if preapproved
+		      (cadr (assq (car preapproved)
+				  vm-mime-mule-coding-to-charset-alist))
+		    ;; None of the entries in vm-coding-system-priorities
+		    ;; can be used. This can only happen if no universal
+		    ;; coding system is included. Fall back to utf-8.
+		    "utf-8")))
+
 	    (let ((charsets (delq 'ascii
 				  (vm-charsets-in-region (point-min)
 							 (point-max)))))
@@ -1472,9 +1493,7 @@
 				(while preapproved
 				  (if (memq (car preapproved) ucs-list)
 				      (throw 'done 
-					     (car (cdr (assq 
-							(vm-coding-system-name 
-							 (car preapproved))
+					     (car (cdr (assq (car preapproved)
 				      vm-mime-mule-coding-to-charset-alist)))))
 				  (setq preapproved (cdr preapproved)))
 				;; Nothing universal in the preapproved list.
@@ -1488,8 +1507,8 @@
 			    (when (latin-unity-maybe-remap (point-min) 
 							   (point-max) sys 
 							   csets psets t)
-			      (throw 'done (second (assq 
-						    (vm-coding-system-name sys)
+			      (throw 'done
+				     (second (assq sys
 				    vm-mime-mule-coding-to-charset-alist)))))
 			  (setq systems (cdr systems)))
 			(throw 'done nil))
@@ -1511,9 +1530,8 @@
 			    ;; If we encounter a universal character set on
 			    ;; the preapproved list, pass it back.
 			    (if (memq (car preapproved) ucs-list)
-				(throw 'done (second (assq 
-						      (vm-coding-system-name
-						       (car preapproved))
+				(throw 'done
+				       (second (assq (car preapproved)
 				     vm-mime-mule-coding-to-charset-alist))))
 
 			    ;; The preapproved entry isn't universal. Check if
@@ -1549,15 +1567,14 @@
 			    ;; If we encounter a universal character set on
 			    ;; the preapproved list, pass it back.
 			    (when (memq (car preapproved) ucs-list)
-				(throw 'done (second (assq 
-						      (vm-coding-system-name
-						       (car preapproved))
+			      (throw 'done
+				     (second (assq (car preapproved)
 				     vm-mime-mule-coding-to-charset-alist))))
 			    (setq preapproved (cdr preapproved)))))
 		    (throw 'done nil))))
 	       ;; Couldn't do any magic with vm-coding-system-priorities. Pass
 	       ;; back a Japanese iso-2022 MIME character set.
-	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp"))))
+	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp")))))
 	  ;; If we're non-MULE and there are eight bit characters, use a
 	  ;; sensible default.
 	  (goto-char (point-min))


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- emacs-vm.spec	24 Jul 2009 22:05:59 -0000	1.36
+++ emacs-vm.spec	16 Sep 2009 11:25:09 -0000	1.37
@@ -13,7 +13,7 @@
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
 %if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 22.1
+%define emacs_version 23.1
 %define emacs_lispdir %{_datadir}/emacs/site-lisp
 %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
 %else
@@ -29,13 +29,14 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: 8.0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
 Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{version}.tgz
 
 Patch0: vm-8.0.12-fix-missing-autoload.patch
+Patch1: vm-8.0.12-fix-charsets.patch
 
 Requires: emacs >= %{emacs_version}
 Requires(pre): /sbin/install-info 
@@ -70,6 +71,7 @@ package. It is not necessary to install 
 %setup -q -n vm-%{version}
 
 %patch0 -p1 -b .fix-missing-autoload
+%patch1 -p1 -b .fix-charsets.patch
 
 # Add missing entry for u-vm-color.el to lisp Makefile.in
 # This shouldn't be necessary after 8.0.12 
@@ -139,8 +141,13 @@ fi
 %{pkgdir}/*.el
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.12-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
+- Bump release to fix up cvs problem
+
+* Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-5
+- Add patch to fix charset recognition with emacs 23
+- Bump minimum emacs to version 23.1
+- Rebuild against emacs 23.1
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From palango at fedoraproject.org  Wed Sep 16 11:29:44 2009
From: palango at fedoraproject.org (palango)
Date: Wed, 16 Sep 2009 11:29:44 +0000 (UTC)
Subject: rpms/boo/devel .cvsignore, 1.5, 1.6 boo.spec, 1.25, 1.26 sources,
	1.5, 1.6 boo-0.9.1.3287-src-libdir.patch, 1.1, NONE
Message-ID: <20090916112944.C97F011C0099@cvs1.fedora.phx.redhat.com>

Author: palango

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7701

Modified Files:
	.cvsignore boo.spec sources 
Removed Files:
	boo-0.9.1.3287-src-libdir.patch 
Log Message:
- update to boo 0.9.2.3383



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Aug 2009 10:39:32 -0000	1.5
+++ .cvsignore	16 Sep 2009 11:29:37 -0000	1.6
@@ -1 +1 @@
-boo-0.9.1.3287-src.zip
+boo-0.9.2.3383-src.zip


Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- boo.spec	28 Aug 2009 15:57:43 -0000	1.25
+++ boo.spec	16 Sep 2009 11:29:44 -0000	1.26
@@ -3,17 +3,15 @@
 
 Summary: An OO statically typed language for CLI
 Name: boo
-Version: 0.9.1.3287
-Release: 3%{?dist}
+Version: 0.9.2.3383
+Release: 1%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://boo.codehaus.org
 Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.zip
-# accepted in upstream
-Patch0: boo-0.9.1.3287-src-libdir.patch
-Patch1: boo-targets.patch
-Patch2: boo-pkgconfig_path_fix.patch
+Patch0: boo-targets.patch
+Patch1: boo-pkgconfig_path_fix.patch
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -33,15 +31,15 @@ Development files for boo
 
 %prep
 %setup -q -c
-%patch0 -p1 -b .libdir-original
-%patch1 -p1 -b .targets-original
-%patch2 -p1 -b .pc-original
-#fix paths for executables
+%patch0 -p1 -b .targets-original
+%patch1 -p1 -b .pc-original
 sed -i -e 's!@libdir@!%{monodir}!' extras/booc.in
 sed -i -e 's!@libdir@!%{monodir}!' extras/booi.in
 sed -i -e 's!@libdir@!%{monodir}!' extras/booish.in
+
 # Fix libdir in boo.pc
 sed -i -e "s|\${prefix}/lib|%{_libdir}|" extras/boo.pc.in
+
 # Get rid of prebuilt dll files
 rm -rf bin/*.dll bin/pt/*.dll
 
@@ -78,11 +76,15 @@ update-mime-database %{_datadir}/mime &>
 %{monodir}/pkgconfig/boo.pc
 
 %changelog
+* Wed Sep 16 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-1
+- Update to boo 0.9.2
+- remove libdir patch
+
 * Fri Aug 28 2009 Paul Lange <palango at gmx.de> - 0.9.1.3287-3
 - Fix executable paths
 
 * Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.1.3287-2
-- Fix libdir in boo.pc to use %%{_libdir}
+- Fix libdir in boo.pc to use %{_libdir}
 - Summary no longer repeats package name
 
 * Sun Aug 02 2009 Paul Lange <palango at gmx.de> - 0.9.1.3287-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Aug 2009 10:39:33 -0000	1.5
+++ sources	16 Sep 2009 11:29:44 -0000	1.6
@@ -1 +1 @@
-7fed4903a6015777fa4a589f0d0ea397  boo-0.9.1.3287-src.zip
+0ba8853303f678795f7b51d00d98ac18  boo-0.9.2.3383-src.zip


--- boo-0.9.1.3287-src-libdir.patch DELETED ---



From jmoskovc at fedoraproject.org  Wed Sep 16 11:44:35 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Wed, 16 Sep 2009 11:44:35 +0000 (UTC)
Subject: rpms/usbutils/devel usbutils-0.86-hwdata.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 sources, 1.8, 1.9 usbutils.spec, 1.30, 1.31
Message-ID: <20090916114435.78BB311C0099@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/usbutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17241

Modified Files:
	.cvsignore sources usbutils.spec 
Added Files:
	usbutils-0.86-hwdata.patch 
Log Message:
New version
- monit fixes in spec file


usbutils-0.86-hwdata.patch:
 Makefile.am |   22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

--- NEW FILE usbutils-0.86-hwdata.patch ---
--- usbutils-0.86/Makefile.am_old	2009-09-16 11:56:26.000000000 +0200
+++ usbutils-0.86/Makefile.am	2009-09-16 11:57:40.000000000 +0200
@@ -1,18 +1,9 @@
 AM_LDFLAGS = \
 	-Wl,--as-needed
 
-data_DATA = \
-	usb.ids
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-endif
-
 sbin_PROGRAMS = \
 	lsusb
 
-sbin_SCRIPTS = \
-	update-usbids.sh
-
 bin_SCRIPTS = \
 	usb-devices
 
@@ -26,7 +17,7 @@
 
 lsusb_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-DDATADIR=\"$(datadir)\"
+	-DDATADIR=\"$(datadir)/hwdata\"
 
 lsusb_LDADD = \
 	$(LIBUSB_LIBS)
@@ -36,20 +27,11 @@
 	usb-devices.1
 
 EXTRA_DIST = \
-	usb.ids \
-	update-usbids.sh.in \
 	lsusb.8.in \
 	usb-devices.1.in \
 	usb-devices \
 	usbutils.pc.in
 
-usb.ids.gz: $(srcdir)/usb.ids
-	gzip -c -9 $< > $@
-
-update-usbids.sh: $(srcdir)/update-usbids.sh.in
-	sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
-	chmod 755 $@
-
 lsusb.8: $(srcdir)/lsusb.8.in
 	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
 
@@ -63,10 +45,8 @@
 	sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
 
 DISTCLEANFILES = \
-	usb.ids.gz \
 	lsusb.8 \
 	usb-devices.1 \
-	update-usbids.sh \
 	usbutils.pc
 
 distclean-local:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 11:15:29 -0000	1.8
+++ .cvsignore	16 Sep 2009 11:44:29 -0000	1.9
@@ -1 +1 @@
-usbutils-0.82.tar.gz
+usbutils-0.86.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 11:15:29 -0000	1.8
+++ sources	16 Sep 2009 11:44:30 -0000	1.9
@@ -1 +1 @@
-6e393cc7423b5d228fa3d34c21481ae4  usbutils-0.82.tar.gz
+34979f675d2bcb3e1b45012fa830a53f  usbutils-0.86.tar.gz


Index: usbutils.spec
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- usbutils.spec	24 Aug 2009 14:44:35 -0000	1.30
+++ usbutils.spec	16 Sep 2009 11:44:30 -0000	1.31
@@ -1,6 +1,6 @@
 Name: usbutils
-Version: 0.82
-Release: 5%{?dist}
+Version: 0.86
+Release: 1%{?dist}
 Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
@@ -11,7 +11,7 @@ BuildRequires: autoconf, libtool, libusb
 Summary: Linux USB utilities
 Group: Applications/System
 Conflicts: hotplug < 3:2002_01_14-2
-Patch0: usbutils-0.82-hwdata.patch
+Patch0: usbutils-0.86-hwdata.patch
 
 %description 
 This package contains utilities for inspecting devices connected to a
@@ -23,7 +23,7 @@ USB bus.
 autoreconf
 
 %build
-%configure --sbindir=/sbin
+%configure --sbindir=%{_sbindir}
 make %{?_smp_mflags}
 
 %install
@@ -31,19 +31,24 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # usb.ids is shipped in hwdata; nuke and adjust .pc file
-sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/usbutils.pc
+sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/usbutils.pc
 
 %files
 %defattr(-,root,root,-)
 %{_mandir}/*/*
-/sbin/*
-%{_libdir}/pkgconfig/usbutils.pc
+%{_sbindir}
+%{_bindir}
+%{_datadir}/pkgconfig/usbutils.pc
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 16 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.86-1
+- new version
+- spec file fixes as suggested in rhbz#466041 (info at owlriver.com)
+
 * Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 0.82-5
 - drop ExcludeArch: s390 s390x as we need this package on s390x to be able to build
   p.e. udev without any hacks



From tmraz at fedoraproject.org  Wed Sep 16 11:52:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 11:52:50 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.pam-config, 1.3,
	1.4 cyrus-imapd.spec, 1.58, 1.59
Message-ID: <20090916115250.CB69A11C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21891

Modified Files:
	cyrus-imapd.pam-config cyrus-imapd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-6
- use password-auth common PAM configuration instead of system-auth



Index: cyrus-imapd.pam-config
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.pam-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.pam-config	19 Mar 2008 19:13:26 -0000	1.3
+++ cyrus-imapd.pam-config	16 Sep 2009 11:52:47 -0000	1.4
@@ -1,5 +1,5 @@
 #%PAM-1.0
 auth       required     pam_nologin.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
+auth       include      password-auth
+account    include      password-auth
+session    include      password-auth


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- cyrus-imapd.spec	7 Sep 2009 14:37:58 -0000	1.58
+++ cyrus-imapd.spec	16 Sep 2009 11:52:47 -0000	1.59
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -731,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-6
+- use password-auth common PAM configuration instead of system-auth
+
 * Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-5
 - fix buffer overflow in cyrus sieve (#521010)
 



From tmraz at fedoraproject.org  Wed Sep 16 11:56:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 11:56:42 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.pam,1.2,1.3 dovecot.spec,1.136,1.137
Message-ID: <20090916115642.88D2011C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24229

Modified Files:
	dovecot.pam dovecot.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.4-3
- use password-auth common PAM configuration instead of system-auth



Index: dovecot.pam
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dovecot.pam	30 Sep 2005 12:23:24 -0000	1.2
+++ dovecot.pam	16 Sep 2009 11:56:41 -0000	1.3
@@ -1,5 +1,5 @@
 #%PAM-1.0
 auth       required     pam_nologin.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
+auth       include      password-auth
+account    include      password-auth
+session    include      password-auth


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- dovecot.spec	14 Sep 2009 09:10:35 -0000	1.136
+++ dovecot.spec	16 Sep 2009 11:56:41 -0000	1.137
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -435,6 +435,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.4-3
+- use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.4-2
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:36 +0000
Subject: [pkgdb] nano: kdudka has requested watchbugzilla
Message-ID: <20090916115836.39E5310F87D@bastion2.fedora.phx.redhat.com>

kdudka has requested the watchbugzilla acl on nano (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:39 +0000
Subject: [pkgdb] nano: kdudka has requested watchcommits
Message-ID: <20090916115839.8432F10F886@bastion2.fedora.phx.redhat.com>

kdudka has requested the watchcommits acl on nano (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:41 +0000
Subject: [pkgdb] nano: kdudka has requested commit
Message-ID: <20090916115841.CB4A510F894@bastion2.fedora.phx.redhat.com>

kdudka has requested the commit acl on nano (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:51 +0000
Subject: [pkgdb] nano: kdudka has requested watchbugzilla
Message-ID: <20090916115851.E5B7010F895@bastion2.fedora.phx.redhat.com>

kdudka has requested the watchbugzilla acl on nano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:52 +0000
Subject: [pkgdb] nano: kdudka has requested watchcommits
Message-ID: <20090916115852.9D58810F89A@bastion2.fedora.phx.redhat.com>

kdudka has requested the watchcommits acl on nano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:54 +0000
Subject: [pkgdb] nano: kdudka has requested commit
Message-ID: <20090916115854.0408B10F89D@bastion2.fedora.phx.redhat.com>

kdudka has requested the commit acl on nano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:58:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:58:58 +0000
Subject: [pkgdb] nano: kdudka has requested watchbugzilla
Message-ID: <20090916115858.E683210F8A1@bastion2.fedora.phx.redhat.com>

kdudka has requested the watchbugzilla acl on nano (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 11:59:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:59:00 +0000
Subject: [pkgdb] nano: kdudka has requested watchcommits
Message-ID: <20090916115900.E5F4E10F883@bastion2.fedora.phx.redhat.com>

kdudka has requested the watchcommits acl on nano (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pmachata at fedoraproject.org  Wed Sep 16 11:59:00 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 16 Sep 2009 11:59:00 +0000 (UTC)
Subject: rpms/tzdata/devel .cvsignore, 1.58, 1.59 sources, 1.62,
	1.63 tzdata.spec, 1.86, 1.87
Message-ID: <20090916115900.6D9F111C0099@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25627

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2009m
  - Palestine will will revert back to winter time on Friday, 2009-09-04
  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	20 Jul 2009 15:38:27 -0000	1.58
+++ .cvsignore	16 Sep 2009 11:58:53 -0000	1.59
@@ -30,3 +30,4 @@ tzcode2009i.tar.gz
 tzdata2009j.tar.gz
 tzdata2009k.tar.gz
 tzcode2009k.tar.gz
+tzdata2009m.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	20 Jul 2009 15:38:27 -0000	1.62
+++ sources	16 Sep 2009 11:58:55 -0000	1.63
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-54fce464fa9d9f77d48632bbf6fd74aa  tzdata2009k.tar.gz
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
+5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- tzdata.spec	13 Aug 2009 11:48:06 -0000	1.86
+++ tzdata.spec	16 Sep 2009 11:58:55 -0000	1.87
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009k
+Version: 2009m
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 3%{?dist}
+%define tzcode_version 2009k
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
-Patch1: tzdata-2009k-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Sep 16 2009 Petr Machata <pmachata at redhat.com> - 2009m-1
+- Upstream 2009m
+  - Palestine will will revert back to winter time on Friday, 2009-09-04
+  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
+- Drop Egypt patch
+
 * Thu Aug 13 2009 Petr Machata <pmachata at redhat.com> - 2009k-3
 - Egypt starts winter time on August 21.
 



From pkgdb at fedoraproject.org  Wed Sep 16 11:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 11:59:01 +0000
Subject: [pkgdb] nano: kdudka has requested commit
Message-ID: <20090916115901.A3EBF10F8A4@bastion2.fedora.phx.redhat.com>

kdudka has requested the commit acl on nano (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pmachata at fedoraproject.org  Wed Sep 16 11:59:59 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 16 Sep 2009 11:59:59 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009k-cairo.patch,1.1,NONE
Message-ID: <20090916115959.7D83511C0099@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26277

Removed Files:
	tzdata-2009k-cairo.patch 
Log Message:
Forgot to drop the cairo patch



--- tzdata-2009k-cairo.patch DELETED ---



From tmraz at fedoraproject.org  Wed Sep 16 12:04:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:04:19 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.pam,1.1,1.2 ejabberd.spec,1.43,1.44
Message-ID: <20090916120420.1549D11C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28465

Modified Files:
	ejabberd.pam ejabberd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-9
- Use password-auth common PAM configuration instead of system-auth



Index: ejabberd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ejabberd.pam	10 Aug 2008 06:56:56 -0000	1.1
+++ ejabberd.pam	16 Sep 2009 12:04:18 -0000	1.2
@@ -1,4 +1,4 @@
 #%PAM-1.0
-auth       include      system-auth
-account    include      system-auth
+auth       include      password-auth
+account    include      password-auth
 


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- ejabberd.spec	9 Sep 2009 10:45:20 -0000	1.43
+++ ejabberd.spec	16 Sep 2009 12:04:18 -0000	1.44
@@ -231,6 +231,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-9
+- Use password-auth common PAM configuration instead of system-auth
+
 * Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-8
 - Fixed possible issue in the config file for logrotate
 - Fixed possible issue while creating dummy certificate



From tmraz at fedoraproject.org  Wed Sep 16 12:07:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:07:48 +0000 (UTC)
Subject: rpms/exim/devel exim.pam,1.2,1.3 exim.spec,1.66,1.67
Message-ID: <20090916120748.B6BDB11C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30663

Modified Files:
	exim.pam exim.spec 
Log Message:
* Wed Aug 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
- Use password-auth common PAM configuration instead of system-auth



Index: exim.pam
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- exim.pam	27 Jul 2006 07:05:24 -0000	1.2
+++ exim.pam	16 Sep 2009 12:07:47 -0000	1.3
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth		include	system-auth
-account		include	system-auth
+auth		include		password-auth
+account		include		password-auth


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- exim.spec	31 Aug 2009 16:00:33 -0000	1.66
+++ exim.spec	16 Sep 2009 12:07:47 -0000	1.67
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -487,6 +487,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Aug 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
+- Use password-auth common PAM configuration instead of system-auth
+
 * Mon Aug 31 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-16
 - Create group for exim with correct gid (#518706)
 - Allow expansion of spamd_address



From mauelsha at fedoraproject.org  Wed Sep 16 12:08:27 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 12:08:27 +0000 (UTC)
Subject: rpms/dmraid/F-11 Makefile.in.avoid_dmreg.o_build.patch, NONE,
	1.1 dmraid.spec, 1.98, 1.99
Message-ID: <20090916120827.1D9DD11C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31200

Modified Files:
	dmraid.spec 
Added Files:
	Makefile.in.avoid_dmreg.o_build.patch 
Log Message:
Avoid building dmreg.o on static build

Makefile.in.avoid_dmreg.o_build.patch:
 Makefile.in |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE Makefile.in.avoid_dmreg.o_build.patch ---
diff --git a/lib/Makefile.in.avoid_dmreg.o_build b/lib/Makefile.in
index 25a197c..dc465bc 100644
--- a/lib/Makefile.in.avoid_dmreg.o_build
+++ b/lib/Makefile.in
@@ -8,7 +8,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES=\
+SOURCES  = \
 	activate/activate.c \
 	activate/devmapper.c \
 	device/ata.c \
@@ -43,8 +43,11 @@ SOURCES=\
 	format/ddf/ddf1_crc.c \
 	format/ddf/ddf1_cvt.c \
 	format/ddf/ddf1_dump.c \
-	format/partition/dos.c \
-	register/dmreg.c
+	format/partition/dos.c
+
+ifeq ("@STATIC_LINK@", "no")
+	SOURCES += register/dmreg.c
+endif
 
 OBJECTS=$(SOURCES:%.c=%.o)
 


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- dmraid.spec	16 Sep 2009 10:58:12 -0000	1.98
+++ dmraid.spec	16 Sep 2009 12:08:26 -0000	1.99
@@ -18,6 +18,8 @@ Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
+Patch0:	Makefile.in.arvoid_dmreg.o_build.patch
+
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@@ -27,8 +29,6 @@ Linux >= 2.4 using device-mapper.
 Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
 License: GPLv2+
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
 
 %description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
@@ -57,13 +57,14 @@ Device failure reporting has to be activ
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 mv tools/dmraid tools/dmraid.static
 make clean
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_linko --enable-led --enable-intel_led
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
 %install



From tmraz at fedoraproject.org  Wed Sep 16 12:09:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:09:03 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.67,1.68
Message-ID: <20090916120903.AD82911C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31741

Modified Files:
	exim.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
- Use password-auth common PAM configuration instead of system-auth



Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- exim.spec	16 Sep 2009 12:07:47 -0000	1.67
+++ exim.spec	16 Sep 2009 12:09:02 -0000	1.68
@@ -487,7 +487,7 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
-* Wed Aug 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
 - Use password-auth common PAM configuration instead of system-auth
 
 * Mon Aug 31 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-16



From tmraz at fedoraproject.org  Wed Sep 16 12:10:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:10:13 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.spec,1.44,1.45
Message-ID: <20090916121013.9412411C04B2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv379

Modified Files:
	ejabberd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-9
- Use password-auth common PAM configuration instead of system-auth



Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ejabberd.spec	16 Sep 2009 12:04:18 -0000	1.44
+++ ejabberd.spec	16 Sep 2009 12:10:11 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet



From nphilipp at fedoraproject.org  Wed Sep 16 12:10:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 16 Sep 2009 12:10:28 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.78, 1.79 sources, 1.87,
	1.88 system-config-users.spec, 1.95, 1.96
Message-ID: <20090916121028.DBBCD11C0338@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv568

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.92


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	14 Sep 2009 09:46:57 -0000	1.78
+++ .cvsignore	16 Sep 2009 12:10:27 -0000	1.79
@@ -1 +1 @@
-system-config-users-1.2.91.tar.bz2
+system-config-users-1.2.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	14 Sep 2009 09:46:57 -0000	1.87
+++ sources	16 Sep 2009 12:10:27 -0000	1.88
@@ -1 +1 @@
-c61f9911a8275aa969e7c8ce4be0b050  system-config-users-1.2.91.tar.bz2
+eb0c291caa045d7061ebc019fd8ae781  system-config-users-1.2.92.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- system-config-users.spec	14 Sep 2009 09:46:57 -0000	1.95
+++ system-config-users.spec	16 Sep 2009 12:10:28 -0000	1.96
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.91
+Version: 1.2.92
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -127,6 +127,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Wed Sep 16 2009 Nils Philippsen <nils at redhat.com> - 1.2.92-1
+- fix typo (#523068)
+
 * Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.2.91-1
 - use str.startswith() method (#523068)
 



From pmachata at fedoraproject.org  Wed Sep 16 12:12:51 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 16 Sep 2009 12:12:51 +0000 (UTC)
Subject: rpms/tzdata/F-11 sources, 1.61, 1.62 tzdata.spec, 1.84,
	1.85 tzdata-2009k-cairo.patch, 1.1, NONE
Message-ID: <20090916121251.767C711C00EB@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1869

Modified Files:
	sources tzdata.spec 
Removed Files:
	tzdata-2009k-cairo.patch 
Log Message:
- Upstream 2009m
  - Palestine will will revert back to winter time on Friday, 2009-09-04
  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	20 Jul 2009 15:41:46 -0000	1.61
+++ sources	16 Sep 2009 12:12:50 -0000	1.62
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-54fce464fa9d9f77d48632bbf6fd74aa  tzdata2009k.tar.gz
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
+5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/tzdata.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- tzdata.spec	13 Aug 2009 11:48:24 -0000	1.84
+++ tzdata.spec	16 Sep 2009 12:12:51 -0000	1.85
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009k
+Version: 2009m
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 2%{?dist}
+%define tzcode_version 2009k
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
-Patch1: tzdata-2009k-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Sep 16 2009 Petr Machata <pmachata at redhat.com> - 2009m-1
+- Upstream 2009m
+  - Palestine will will revert back to winter time on Friday, 2009-09-04
+  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
+- Drop Egypt patch
+
 * Thu Aug 13 2009 Petr Machata <pmachata at redhat.com> - 2009k-2
 - Egypt starts winter time on August 21.
 


--- tzdata-2009k-cairo.patch DELETED ---



From mgrepl at fedoraproject.org  Wed Sep 16 12:15:33 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed, 16 Sep 2009 12:15:33 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.50,
	1.51 selinux-policy.spec, 1.904, 1.905
Message-ID: <20090916121533.702CF11C0099@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3412

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Add wordpress/wp-content/uploads label
- Add /var/lib/libvirt/qemu label
- Allow tzdata to getattr of all persistent filesystems



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 policy/modules/admin/prelink.te           |    9 
 policy/modules/admin/readahead.te         |    2 
 policy/modules/admin/rpm.fc               |    1 
 policy/modules/admin/rpm.if               |   46 +++++
 policy/modules/admin/rpm.te               |    4 
 policy/modules/admin/shorewall.fc         |   12 +
 policy/modules/admin/shorewall.if         |  166 ++++++++++++++++++
 policy/modules/admin/shorewall.te         |  103 +++++++++++
 policy/modules/admin/sudo.if              |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    3 
 policy/modules/admin/usermanage.te        |    3 
 policy/modules/apps/awstats.te            |    2 
 policy/modules/apps/calamaris.te          |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++++++++++
 policy/modules/apps/gitosis.te            |   43 ++++
 policy/modules/apps/gnome.te              |   15 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 policy/modules/apps/mozilla.if            |   16 +
 policy/modules/apps/mozilla.te            |   14 -
 policy/modules/apps/nsplugin.if           |    2 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 ++
 policy/modules/apps/ptchown.te            |   40 ++++
 policy/modules/apps/qemu.fc               |    1 
 policy/modules/apps/qemu.te               |    5 
 policy/modules/apps/sandbox.if            |  134 +++++++++++---
 policy/modules/apps/sandbox.te            |  274 +++++++++++++++++++++++++++---
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    6 
 policy/modules/kernel/corecommands.fc     |   10 -
 policy/modules/kernel/corenetwork.te.in   |    5 
 policy/modules/kernel/devices.fc          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   31 +++
 policy/modules/kernel/files.if            |    4 
 policy/modules/kernel/kernel.if           |    2 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/roles/staff.te             |   12 +
 policy/modules/roles/sysadm.if            |   35 +++
 policy/modules/roles/sysadm.te            |    4 
 policy/modules/roles/unconfineduser.te    |   10 -
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/apache.fc         |    5 
 policy/modules/services/apache.te         |    1 
 policy/modules/services/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    7 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |   15 +
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   19 +-
 policy/modules/services/hal.te            |   15 +
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 ++++
 policy/modules/services/hddtemp.te        |   40 ++++
 policy/modules/services/kerberos.if       |    2 
 policy/modules/services/kerberos.te       |   12 +
 policy/modules/services/lircd.te          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 policy/modules/services/nslcd.te          |   50 +++++
 policy/modules/services/nx.fc             |    3 
 policy/modules/services/nx.if             |   20 ++
 policy/modules/services/openvpn.te        |   14 +
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/polkit.fc         |    2 
 policy/modules/services/polkit.if         |    2 
 policy/modules/services/polkit.te         |    3 
 policy/modules/services/postfix.if        |   26 ++
 policy/modules/services/postfix.te        |   26 --
 policy/modules/services/postgresql.te     |    2 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |    2 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/rpc.te            |   15 +
 policy/modules/services/rpcbind.if        |   20 ++
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/samba.te          |    2 
 policy/modules/services/sasl.te           |    2 
 policy/modules/services/sendmail.if       |   39 ++++
 policy/modules/services/sendmail.te       |    7 
 policy/modules/services/setroubleshoot.te |    5 
 policy/modules/services/shorewall.fc      |   12 -
 policy/modules/services/shorewall.if      |  166 ------------------
 policy/modules/services/shorewall.te      |  102 -----------
 policy/modules/services/smartmon.te       |    4 
 policy/modules/services/snmp.if           |   19 ++
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    2 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |    8 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.fc           |    1 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 policy/modules/system/authlogin.fc        |    3 
 policy/modules/system/authlogin.if        |  270 ++++++++++++++++++-----------
 policy/modules/system/authlogin.te        |   27 +-
 policy/modules/system/init.fc             |    2 
 policy/modules/system/init.te             |    6 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |    1 
 policy/modules/system/sysnetwork.if       |    1 
 policy/modules/system/sysnetwork.te       |   17 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |   10 +
 policy/modules/system/userdomain.if       |   35 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 159 files changed, 2467 insertions(+), 650 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- policy-20090521.patch	2 Sep 2009 11:37:33 -0000	1.50
+++ policy-20090521.patch	16 Sep 2009 12:15:32 -0000	1.51
@@ -599,6 +599,18 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tzdata.te serefpolicy-3.6.12/policy/modules/admin/tzdata.te
+--- nsaserefpolicy/policy/modules/admin/tzdata.te	2009-04-07 21:54:49.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/tzdata.te	2009-09-07 13:31:31.000000000 +0200
+@@ -16,6 +16,8 @@
+ # tzdata local policy
+ #
+ 
++fs_getattr_xattr_fs(tzdata_t)  
++
+ files_read_etc_files(tzdata_t)
+ files_search_spool(tzdata_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.6.12/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2009-04-07 21:54:49.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/admin/usermanage.if	2009-09-02 09:29:39.000000000 +0200
@@ -2008,16 +2020,17 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-06-25 10:21:01.000000000 +0200
-@@ -1953,6 +1953,7 @@
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-09-14 14:40:51.000000000 +0200
+@@ -1953,6 +1953,8 @@
  	allow $1 etc_t:dir list_dir_perms;
  	read_files_pattern($1, etc_t, etc_t)
  	read_lnk_files_pattern($1, etc_t, etc_t)
 +	files_read_etc_runtime_files($1)
++	files_read_config_files($1)
  ')
  
  ########################################
-@@ -3734,6 +3735,7 @@
+@@ -3734,6 +3736,7 @@
  	allow $1 usr_t:dir list_dir_perms;
  	read_files_pattern($1, usr_t, usr_t)
  	read_lnk_files_pattern($1, usr_t, usr_t)
@@ -2025,7 +2038,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -5224,6 +5226,7 @@
+@@ -5224,6 +5227,7 @@
  		attribute file_type;
  	')
  
@@ -2299,8 +2312,16 @@ diff -b -B --ignore-all-space --exclude-
  fs_mount_nfs(afs_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.12/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/apache.fc	2009-06-25 10:21:01.000000000 +0200
-@@ -98,4 +98,6 @@
++++ serefpolicy-3.6.12/policy/modules/services/apache.fc	2009-09-14 14:48:14.000000000 +0200
+@@ -40,6 +40,7 @@
+ /usr/share/selinux-policy[^/]*/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /usr/share/wordpress-mu/wp-config\.php   -- gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+ /usr/share/wordpress-mu/wp-content(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
++/usr/share/wordpress/wp-content/uploads(/.*)?  gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
+ 
+ 
+ /var/cache/httpd(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
+@@ -98,4 +99,6 @@
  
  /var/lib/rt3/data/RT-Shredder(/.*)?	gen_context(system_u:object_r:httpd_var_lib_t,s0)
  
@@ -2308,6 +2329,17 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
 +/var/www/svn/hooks(/.*)?		gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/var/www/svn/conf(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
+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-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/apache.te	2009-09-16 13:39:43.000000000 +0200
+@@ -681,6 +681,7 @@
+ 	unconfined_domain(httpd_unconfined_script_t)
+ 
+ 	role system_r types httpd_unconfined_script_t;
++	allow httpd_t httpd_unconfined_script_t:process signal_perms;
+ ')
+ 
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.6.12/policy/modules/services/automount.if
 --- nsaserefpolicy/policy/modules/services/automount.if	2009-04-07 21:54:47.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/automount.if	2009-07-20 14:44:39.000000000 +0200
@@ -2554,6 +2586,17 @@ diff -b -B --ignore-all-space --exclude-
 +
 +
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.6.12/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2009-04-07 21:54:45.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/cyrus.te	2009-09-16 13:08:45.000000000 +0200
+@@ -136,6 +136,7 @@
+ 
+ optional_policy(`
+ 	snmp_read_snmp_var_lib_files(cyrus_t)
++	snmp_stream_connect(cyrus_t)
+ 	snmp_dontaudit_write_snmp_var_lib_files(cyrus_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-08-05 21:48:06.000000000 +0200
@@ -2848,8 +2891,16 @@ diff -b -B --ignore-all-space --exclude-
  userdom_manage_user_home_content_dirs(dovecot_deliver_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.12/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/exim.te	2009-07-31 13:05:27.000000000 +0200
-@@ -148,7 +148,11 @@
++++ serefpolicy-3.6.12/policy/modules/services/exim.te	2009-09-14 14:36:18.000000000 +0200
+@@ -111,6 +111,7 @@
+ files_search_var(exim_t)
+ files_read_etc_files(exim_t)
+ files_read_etc_runtime_files(exim_t)
++files_getattr_all_mountpoints(exim_t)
+ 
+ auth_use_nsswitch(exim_t)
+ 
+@@ -148,7 +149,11 @@
  ')
  
  optional_policy(`
@@ -3542,8 +3593,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.6.12/policy/modules/services/nx.if
 --- nsaserefpolicy/policy/modules/services/nx.if	2009-04-07 21:54:47.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/nx.if	2009-08-20 15:36:36.000000000 +0200
-@@ -17,3 +17,22 @@
++++ serefpolicy-3.6.12/policy/modules/services/nx.if	2009-09-14 14:45:30.000000000 +0200
+@@ -17,3 +17,23 @@
  
  	spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
  ')
@@ -3564,6 +3615,7 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	read_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
++	read_lnk_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.12/policy/modules/services/openvpn.te
@@ -3890,9 +3942,39 @@ diff -b -B --ignore-all-space --exclude-
  corecmd_list_bin(pyzor_t)
  corecmd_getattr_bin_files(pyzor_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.6.12/policy/modules/services/rpcbind.if
+--- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/rpcbind.if	2009-09-14 15:08:43.000000000 +0200
+@@ -95,6 +95,26 @@
+ 	files_search_var_lib($1)
+ ')
+ 
++#######################################
++## <summary>
++##      Connect to rpcbindd over an unix stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`rpcbind_stream_connect',`
++        gen_require(`
++                type rpcbind_t, rpcbind_var_run_t;
++        ')
++
++        files_search_pids($1)
++        allow $1 rpcbind_var_run_t:sock_file write;
++        allow $1 rpcbind_t:unix_stream_socket connectto;
++')
++
+ ########################################
+ ## <summary>
+ ##	All of the rules required to administrate 
 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-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-09-02 10:55:40.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-09-14 14:31:36.000000000 +0200
 @@ -95,6 +95,10 @@
  userdom_signal_unpriv_users(rpcd_t)
  
@@ -3915,7 +3997,15 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # NFSD local policy
-@@ -207,6 +215,8 @@
+@@ -189,6 +197,7 @@
+ kernel_read_network_state(gssd_t)
+ kernel_read_network_state_symlinks(gssd_t)	
+ kernel_search_network_sysctl(gssd_t)	
++kernel_signal(gssd_t)
+ 
+ corecmd_exec_bin(gssd_t)
+ 
+@@ -207,6 +216,8 @@
  
  mount_signal(gssd_t)
  
@@ -3924,7 +4014,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`allow_gssd_read_tmp',`
  	userdom_list_user_tmp(gssd_t) 
  	userdom_read_user_tmp_files(gssd_t) 
-@@ -214,6 +224,10 @@
+@@ -214,6 +225,10 @@
  ')
  
  optional_policy(`
@@ -4383,6 +4473,47 @@ diff -b -B --ignore-all-space --exclude-
  allow fsdaemon_t self:fifo_file rw_fifo_file_perms;
  allow fsdaemon_t self:unix_dgram_socket create_socket_perms;
  allow fsdaemon_t self:unix_stream_socket create_stream_socket_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.6.12/policy/modules/services/snmp.if
+--- nsaserefpolicy/policy/modules/services/snmp.if	2009-04-07 21:54:45.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/snmp.if	2009-09-16 13:07:46.000000000 +0200
+@@ -85,6 +85,25 @@
+ 	dontaudit $1 snmpd_var_lib_t:file write;
+ ')
+ 
++#######################################
++## <summary>
++## Connect to snmpd using a unix domain stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`snmp_stream_connect',`
++	gen_require(`
++		type snmpd_t, snmpd_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	stream_connect_pattern($1, snmpd_var_lib_t, snmpd_var_lib_t, snmpd_t)
++')
++
+ ########################################
+ ## <summary>
+ ##	All of the rules required to administrate 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.6.12/policy/modules/services/snmp.te
+--- nsaserefpolicy/policy/modules/services/snmp.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/snmp.te	2009-09-16 13:08:08.000000000 +0200
+@@ -71,6 +71,8 @@
+ corenet_tcp_bind_snmp_port(snmpd_t)
+ corenet_udp_bind_snmp_port(snmpd_t)
+ corenet_sendrecv_snmp_server_packets(snmpd_t)
++corenet_tcp_bind_agentx_port(snmpd_t)
++corenet_udp_bind_agentx_port(snmpd_t)  
+ corenet_tcp_connect_agentx_port(snmpd_t)
+ 
+ dev_list_sysfs(snmpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.12/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/spamassassin.fc	2009-08-19 17:48:56.000000000 +0200
@@ -4413,7 +4544,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/spool/MIMEDefang(/.*)?		gen_context(system_u:object_r:spamd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-07-13 11:32:30.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-09-16 12:19:24.000000000 +0200
 @@ -263,6 +263,7 @@
  corenet_tcp_sendrecv_generic_node(spamc_t)
  corenet_tcp_connect_spamd_port(spamc_t)
@@ -4422,6 +4553,14 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
  manage_files_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
+@@ -406,6 +407,7 @@
+ # var/lib files for spamd
+ allow spamd_t spamd_var_lib_t:dir list_dir_perms;
+ manage_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
++manage_lnk_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
+ 
+ manage_dirs_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
+ manage_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.12/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-08-23 20:37:28.000000000 +0200
@@ -4506,6 +4645,17 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(uucpd_t)
  
  logging_send_syslog_msg(uucpd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.6.12/policy/modules/services/virt.fc
+--- nsaserefpolicy/policy/modules/services/virt.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/virt.fc	2009-09-16 13:17:05.000000000 +0200
+@@ -10,6 +10,7 @@
+ /var/lib/libvirt/images(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
+ /var/lib/libvirt/isos(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
+ /var/lib/libvirt/boot(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
++/var/lib/libvirt/qemu(/.*)?     gen_context(system_u:object_r:svirt_var_run_t,s0)
+ 
+ /var/log/libvirt(/.*)?		gen_context(system_u:object_r:virt_log_t,s0)
+ /var/run/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_run_t,s0)
 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-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-08-14 08:33:53.000000000 +0200
@@ -5216,7 +5366,7 @@ diff -b -B --ignore-all-space --exclude-
  /etc/X11/prefdm		--	gen_context(system_u:object_r:initrc_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-09-14 14:35:30.000000000 +0200
 @@ -285,6 +285,7 @@
  kernel_dontaudit_getattr_message_if(initrc_t)
  kernel_stream_connect(initrc_t)
@@ -5225,7 +5375,25 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_kernel_symbol_table(initrc_t)
  files_exec_etc_files(initrc_t)
-@@ -750,6 +751,7 @@
+@@ -331,6 +332,7 @@
+ fs_unmount_all_fs(initrc_t)
+ fs_remount_all_fs(initrc_t)
+ fs_getattr_all_fs(initrc_t)
++fs_search_all(initrc_t)
+ 
+ # initrc_t needs to do a pidof which requires ptrace
+ mcs_ptrace_all(initrc_t)
+@@ -403,6 +405,9 @@
+ files_mounton_isid_type_dirs(initrc_t)
+ files_list_default(initrc_t)
+ files_mounton_default(initrc_t)
++files_manage_mnt_dirs(initrc_t)
++files_manage_mnt_files(initrc_t)
++
+ 
+ auth_use_nsswitch(initrc_t)
+ 
+@@ -750,6 +755,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -5537,6 +5705,19 @@ diff -b -B --ignore-all-space --exclude-
  
  ifdef(`distro_redhat',`
  /etc/sysconfig/clock	--	gen_context(system_u:object_r:locale_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.12/policy/modules/system/mount.if
+--- nsaserefpolicy/policy/modules/system/mount.if	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/mount.if	2009-09-08 13:12:41.000000000 +0200
+@@ -175,7 +175,9 @@
+ interface(`mount_signal',`
+ 	gen_require(`
+ 		type mount_t;
++		type unconfined_mount_t;
+ 	')
+ 
+ 	allow $1 mount_t:process signal; 
++	allow $1 unconfined_mount_t:process signal; 
+ ')
 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-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/mount.te	2009-08-11 10:04:04.000000000 +0200
@@ -5671,7 +5852,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 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-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-20 15:20:32.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-09-14 14:33:01.000000000 +0200
 @@ -443,6 +443,9 @@
  	dev_rw_usbfs($1)
  	dev_rw_generic_usb_dev($1)
@@ -5704,7 +5885,15 @@ diff -b -B --ignore-all-space --exclude-
  			evolution_dbus_chat($1_usertype)
  			evolution_alarm_dbus_chat($1_usertype)
  	')
-@@ -968,6 +967,21 @@
+@@ -702,6 +701,7 @@
+ 	optional_policy(`
+ 		rpc_dontaudit_getattr_exports($1_usertype)
+ 		rpc_manage_nfs_rw_content($1_usertype)
++		rpcbind_stream_connect($1_usertype)
+ 	')
+ 
+ 	optional_policy(`
+@@ -968,6 +968,21 @@
  	')
  
  		optional_policy(`
@@ -5726,7 +5915,15 @@ diff -b -B --ignore-all-space --exclude-
  		gnome_manage_config($1_usertype)
  		gnome_manage_gconf_home_files($1_usertype)
  		gnome_read_gconf_config($1_usertype)
-@@ -1457,6 +1471,7 @@
+@@ -1218,6 +1233,7 @@
+ 	files_exec_usr_src_files($1_t)
+ 
+ 	fs_getattr_all_fs($1_t)
++	fs_getattr_all_files($1_t)
+ 	fs_set_all_quotas($1_t)
+ 	fs_exec_noxattr($1_t)
+ 
+@@ -1457,6 +1473,7 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -5734,7 +5931,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_home($1)
  ')
  
-@@ -1880,7 +1895,7 @@
+@@ -1880,7 +1897,7 @@
  		type user_home_t;
  	')
  
@@ -5743,7 +5940,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3317,10 +3332,6 @@
+@@ -3317,10 +3334,6 @@
    seutil_run_newrole($1_t, $1_r)
  
    optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -p -r1.904 -r1.905
--- selinux-policy.spec	2 Sep 2009 13:44:38 -0000	1.904
+++ selinux-policy.spec	16 Sep 2009 12:15:32 -0000	1.905
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 82%{?dist}
+Release: 83%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,6 +442,11 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-83
+- Add wordpress/wp-content/uploads label
+- Add /var/lib/libvirt/qemu label
+- Allow tzdata to getattr of all persistent filesystems
+
 * Wed Sep 2 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-82
 - Allow gssd to send signals to users
 - Allow fsdaemon_t setpcap capability



From tmraz at fedoraproject.org  Wed Sep 16 12:21:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:21:42 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius-pam-conf, 1.1, 1.2 freeradius.spec,
	1.86, 1.87
Message-ID: <20090916122142.C2D9B11C00EC@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7255

Modified Files:
	freeradius-pam-conf freeradius.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-2
- use password-auth common PAM configuration instead of system-auth



Index: freeradius-pam-conf
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-pam-conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freeradius-pam-conf	29 Feb 2008 04:16:24 -0000	1.1
+++ freeradius-pam-conf	16 Sep 2009 12:21:39 -0000	1.2
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       include	system-auth
+auth       include	password-auth
 account    required	pam_nologin.so
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
+account    include	password-auth
+password   include	password-auth
+session    include	password-auth


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- freeradius.spec	15 Sep 2009 14:47:18 -0000	1.86
+++ freeradius.spec	16 Sep 2009 12:21:41 -0000	1.87
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -621,6 +621,9 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-2
+- use password-auth common PAM configuration instead of system-auth
+
 * Tue Sep 15 2009 John Dennis <jdennis at redhat.com> - 2.1.7-1
 - enable building of the rlm_wimax module
 - pcap wire analysis support is enabled and available in utils subpackage



From pmachata at fedoraproject.org  Wed Sep 16 12:28:59 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 16 Sep 2009 12:28:59 +0000 (UTC)
Subject: rpms/tzdata/F-10 sources, 1.60, 1.61 tzdata.spec, 1.80,
	1.81 tzdata-2009k-cairo.patch, 1.1, NONE
Message-ID: <20090916122859.585AD11C0099@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11592

Modified Files:
	sources tzdata.spec 
Removed Files:
	tzdata-2009k-cairo.patch 
Log Message:
- Upstream 2009m
  - Palestine will will revert back to winter time on Friday, 2009-09-04
  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	20 Jul 2009 15:43:34 -0000	1.60
+++ sources	16 Sep 2009 12:28:56 -0000	1.61
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-54fce464fa9d9f77d48632bbf6fd74aa  tzdata2009k.tar.gz
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
+5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- tzdata.spec	13 Aug 2009 11:48:44 -0000	1.80
+++ tzdata.spec	16 Sep 2009 12:28:56 -0000	1.81
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009k
+Version: 2009m
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 2%{?dist}
+%define tzcode_version 2009k
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
-Patch1: tzdata-2009k-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Sep 16 2009 Petr Machata <pmachata at redhat.com> - 2009m-1
+- Upstream 2009m
+  - Palestine will will revert back to winter time on Friday, 2009-09-04
+  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
+- Drop Egypt patch
+
 * Thu Aug 13 2009 Petr Machata <pmachata at redhat.com> - 2009k-2
 - Egypt starts winter time on August 21.
 


--- tzdata-2009k-cairo.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 16 12:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 12:34:29 +0000
Subject: [pkgdb] jakarta-commons-io had acl change status
Message-ID: <20090916123429.F1A3D10F880@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on jakarta-commons-io (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From pkgdb at fedoraproject.org  Wed Sep 16 12:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 12:34:30 +0000
Subject: [pkgdb] jakarta-commons-io had acl change status
Message-ID: <20090916123430.6C6D310F886@bastion2.fedora.phx.redhat.com>

pcheung has set the watchbugzilla acl on jakarta-commons-io (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From pkgdb at fedoraproject.org  Wed Sep 16 12:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 12:34:30 +0000
Subject: [pkgdb] jakarta-commons-io had acl change status
Message-ID: <20090916123430.CC59110F894@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on jakarta-commons-io (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From pkgdb at fedoraproject.org  Wed Sep 16 12:34:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 12:34:31 +0000
Subject: [pkgdb] jakarta-commons-io had acl change status
Message-ID: <20090916123431.DA30910F898@bastion2.fedora.phx.redhat.com>

pcheung has set the approveacls acl on jakarta-commons-io (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-io



From mitr at fedoraproject.org  Wed Sep 16 12:37:41 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Wed, 16 Sep 2009 12:37:41 +0000 (UTC)
Subject: rpms/fwknop/devel .cvsignore, 1.6, 1.7 fwknop.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090916123741.9A71B11C0099@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/fwknop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16385

Modified Files:
	.cvsignore fwknop.spec sources 
Log Message:
* Wed Sep 16 2009 Miloslav Trma? <mitr at redhat.com> - 1.9.12-1
- Update to fwknop-1.9.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 May 2009 09:57:47 -0000	1.6
+++ .cvsignore	16 Sep 2009 12:37:35 -0000	1.7
@@ -1,2 +1,2 @@
-fwknop-nodeps-1.9.11.tar.gz
-fwknop-nodeps-1.9.11.tar_gz.asc
+fwknop-nodeps-1.9.12.tar.gz
+fwknop-nodeps-1.9.12.tar_gz.asc


Index: fwknop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/fwknop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fwknop.spec	24 Jul 2009 23:22:51 -0000	1.9
+++ fwknop.spec	16 Sep 2009 12:37:36 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A Single Packet Authorization (SPA) implementation
 Name: fwknop
-Version: 1.9.11
-Release: 2
+Version: 1.9.12
+Release: 1
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwknop/
@@ -111,6 +111,9 @@ fi
 %dir %{_localstatedir}/run/fwknop
 
 %changelog
+* Wed Sep 16 2009 Miloslav Trma? <mitr at redhat.com> - 1.9.12-1
+- Update to fwknop-1.9.12.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 May 2009 09:57:47 -0000	1.6
+++ sources	16 Sep 2009 12:37:37 -0000	1.7
@@ -1,2 +1,2 @@
-2046156a728db4a31034232eabb8276d  fwknop-nodeps-1.9.11.tar.gz
-b6246cd77a95c340470a734c3bf24136  fwknop-nodeps-1.9.11.tar_gz.asc
+11d87a3590e695227390596c4695e6e0  fwknop-nodeps-1.9.12.tar.gz
+755757126ed0f76add5daaf27c88d869  fwknop-nodeps-1.9.12.tar_gz.asc



From vpv at fedoraproject.org  Wed Sep 16 12:37:42 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Wed, 16 Sep 2009 12:37:42 +0000 (UTC)
Subject: rpms/libvoikko/devel libvoikko.spec,1.26,1.27
Message-ID: <20090916123742.3F7E511C0099@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16491

Modified Files:
	libvoikko.spec 
Log Message:
* Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.2.rc1
- Remove rpath which was set for the voikko-tools binaries in 64 bit
  architechtures



Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libvoikko.spec	15 Sep 2009 20:37:36 -0000	1.26
+++ libvoikko.spec	16 Sep 2009 12:37:41 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.2
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc1%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -57,6 +57,10 @@ scripts.
 %build
 # The dictionary path must be the same where malaga-suomi-voikko is installed
 %configure --with-dictionary-path=%{_libdir}/voikko
+# Remove rpath,
+# https://fedoraproject.org/wiki/Packaging/Guidelines#Removing_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
 make %{?_smp_mflags}
 
 
@@ -99,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.2.rc1
+- Remove rpath which was set for the voikko-tools binaries in 64 bit
+  architechtures
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.1.rc1
 - New release candidate
 - Improvements to spelling suggestions, grammar checker etc.



From jwrdegoede at fedoraproject.org  Wed Sep 16 12:47:28 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 16 Sep 2009 12:47:28 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-raidlockdep.patch, NONE, 1.1 kernel.spec,
	1.1803, 1.1804
Message-ID: <20090916124728.E42FA11C0099@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22595

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-raidlockdep.patch 
Log Message:
* Wed Sep 18 2009 Hans de Goede <hdegoede at redhat.com>
- Fix lockdep warning (and potential real deadlock) in mdraid10 code,
  requested for -stable, rh#515471


linux-2.6-raidlockdep.patch:
 file.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-raidlockdep.patch ---
Subject:
Re: 2.6.31rc5 RAID10 lockdep report - sysfs_nofity_dirent locking issue
From:
Dan Williams <dan.j.williams at intel.com>
Date:
Tue, 15 Sep 2009 16:05:51 -0700
To:
Greg KH <gregkh at suse.de>
CC:
Neil Brown <neilb at suse.de>, Dave Jones <davej at redhat.com>, Linux Kernel <linux-kernel at vger.kernel.org>, Hans de Goede <hdegoede at redhat.com>

>From 1ee8b5bfeb2de765d3b2acbaf5357c4c0eb65dbe Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb at suse.de>
Date: Thu, 6 Aug 2009 15:42:08 +1000
Subject: [PATCH] Allow sysfs_notify_dirent to be called from interrupt context.

sysfs_notify_dirent is a simple atomic operation that can be used to
alert user-space that new data can be read from a sysfs attribute.

Unfortunately it cannot currently be called from non-process context
because of its use of spin_lock which is sometimes taken with
interrupts enabled.

So change all lockers of sysfs_open_dirent_lock to disable interrupts,
thus making sysfs_notify_dirent safe to be called from non-process
context (as drivers/md does in md_safemode_timeout).

sysfs_get_open_dirent is (documented as being) only called from
process context, so it uses spin_lock_irq.  Other places
use spin_lock_irqsave.

The usage for sysfs_notify_dirent in md_safemode_timeout was
introduced in 2.6.28, so this patch is suitable for that and more
recent kernels.

Cc: <stable at kernel.org>
Reported-by: Joel Andres Granados <jgranado at redhat.com>
Signed-off-by: NeilBrown <neilb at suse.de>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
---
>> > > Greg?
>> > > 
>> > > Looks like this never made it upstream, and now Hans is hitting this
>> > > in his tests.
> > 
> > Ok, I don't have this in my queue, so someone needs to resubmit it and
> > tell me what kernel trees it should be applicable for.

As mentioned in the commit log should be applicable back to 2.6.28.

Thanks,
Dan


 fs/sysfs/file.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 561a9c0..f5ea468 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -268,7 +268,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
 	struct sysfs_open_dirent *od, *new_od = NULL;
 
  retry:
-	spin_lock(&sysfs_open_dirent_lock);
+	spin_lock_irq(&sysfs_open_dirent_lock);
 
 	if (!sd->s_attr.open && new_od) {
 		sd->s_attr.open = new_od;
@@ -281,7 +281,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
 		list_add_tail(&buffer->list, &od->buffers);
 	}
 
-	spin_unlock(&sysfs_open_dirent_lock);
+	spin_unlock_irq(&sysfs_open_dirent_lock);
 
 	if (od) {
 		kfree(new_od);
@@ -315,8 +315,9 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd,
 				  struct sysfs_buffer *buffer)
 {
 	struct sysfs_open_dirent *od = sd->s_attr.open;
+	unsigned long flags;
 
-	spin_lock(&sysfs_open_dirent_lock);
+	spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
 
 	list_del(&buffer->list);
 	if (atomic_dec_and_test(&od->refcnt))
@@ -324,7 +325,7 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd,
 	else
 		od = NULL;
 
-	spin_unlock(&sysfs_open_dirent_lock);
+	spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);
 
 	kfree(od);
 }
@@ -456,8 +457,9 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
 void sysfs_notify_dirent(struct sysfs_dirent *sd)
 {
 	struct sysfs_open_dirent *od;
+	unsigned long flags;
 
-	spin_lock(&sysfs_open_dirent_lock);
+	spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
 
 	od = sd->s_attr.open;
 	if (od) {
@@ -465,7 +467,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
 		wake_up_interruptible(&od->poll);
 	}
 
-	spin_unlock(&sysfs_open_dirent_lock);
+	spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);
 }
 EXPORT_SYMBOL_GPL(sysfs_notify_dirent);
 
-- 1.6.0.6 

Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1803
retrieving revision 1.1804
diff -u -p -r1.1803 -r1.1804
--- kernel.spec	16 Sep 2009 04:41:25 -0000	1.1803
+++ kernel.spec	16 Sep 2009 12:47:26 -0000	1.1804
@@ -741,6 +741,8 @@ Patch12013: linux-2.6-rfkill-all.patch
 # scsi oops fixes
 Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
 Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+# Raid10 lockdep fix
+Patch14002: linux-2.6-raidlockdep.patch
 
 %endif
 
@@ -1383,6 +1385,8 @@ ApplyPatch linux-2.6-rfkill-all.patch
 # scsi oops fixes
 ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
 ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+# Raid10 lockdep fix
+ApplyPatch linux-2.6-raidlockdep.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2040,6 +2044,10 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 18 2009 Hans de Goede <hdegoede at redhat.com>
+- Fix lockdep warning (and potential real deadlock) in mdraid10 code,
+  requested for -stable, rh#515471
+
 * Wed Sep 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-17
 - nouveau: potential fix for rh#522649 + misc other fixes
 



From tmraz at fedoraproject.org  Wed Sep 16 12:53:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:53:02 +0000 (UTC)
Subject: rpms/jabberd/devel jabberd.spec,1.36,1.37
Message-ID: <20090916125302.C300B11C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/jabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25716

Modified Files:
	jabberd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-5
- use password-auth common PAM configuration instead of system-auth



Index: jabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- jabberd.spec	21 Aug 2009 14:03:22 -0000	1.36
+++ jabberd.spec	16 Sep 2009 12:53:01 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.2.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.8.tar.bz2
@@ -95,9 +95,9 @@ export LIBS='-lgc'
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
 auth       required     pam_nologin.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
+auth       include      password-auth
+account    include      password-auth
+session    include      password-auth
 END
 
 #default driver for storage
@@ -192,6 +192,9 @@ fi
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-5
+- use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-4
 - rebuilt with new openssl
 



From nphilipp at fedoraproject.org  Wed Sep 16 12:53:17 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 16 Sep 2009 12:53:17 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.79, 1.80 sources, 1.88,
	1.89 system-config-users.spec, 1.96, 1.97
Message-ID: <20090916125317.E755B11C0099@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.93


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	16 Sep 2009 12:10:27 -0000	1.79
+++ .cvsignore	16 Sep 2009 12:53:16 -0000	1.80
@@ -1 +1 @@
-system-config-users-1.2.92.tar.bz2
+system-config-users-1.2.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	16 Sep 2009 12:10:27 -0000	1.88
+++ sources	16 Sep 2009 12:53:17 -0000	1.89
@@ -1 +1 @@
-eb0c291caa045d7061ebc019fd8ae781  system-config-users-1.2.92.tar.bz2
+e2261b183bd97a738ac099165be3bb30  system-config-users-1.2.93.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- system-config-users.spec	16 Sep 2009 12:10:28 -0000	1.96
+++ system-config-users.spec	16 Sep 2009 12:53:17 -0000	1.97
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.92
+Version: 1.2.93
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -127,6 +127,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Wed Sep 16 2009 Nils Philippsen <nils at redhat.com> - 1.2.93-1
+- remove simple files as well as directories
+- don't use deprecated gtk.Label.set_use_markup()
+
 * Wed Sep 16 2009 Nils Philippsen <nils at redhat.com> - 1.2.92-1
 - fix typo (#523068)
 



From tmraz at fedoraproject.org  Wed Sep 16 12:58:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 12:58:42 +0000 (UTC)
Subject: rpms/mod_auth_pam/devel mod_auth_pam-httpd.pam, 1.2,
	1.3 mod_auth_pam.spec, 1.11, 1.12
Message-ID: <20090916125842.364E511C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mod_auth_pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29138

Modified Files:
	mod_auth_pam-httpd.pam mod_auth_pam.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-9
- Use password-auth common PAM configuration instead of system-auth



Index: mod_auth_pam-httpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/mod_auth_pam/devel/mod_auth_pam-httpd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_auth_pam-httpd.pam	7 Oct 2005 13:56:21 -0000	1.2
+++ mod_auth_pam-httpd.pam	16 Sep 2009 12:58:41 -0000	1.3
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
+auth       include      password-auth
+account    include      password-auth
 # Comment out the previous account line and uncomment the following line if
 # you wish to allow logins that don't have a system account
 #account    required     pam_permit.so


Index: mod_auth_pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mod_auth_pam.spec	25 Jul 2009 14:42:55 -0000	1.11
+++ mod_auth_pam.spec	16 Sep 2009 12:58:41 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           mod_auth_pam
 Version:        1.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        PAM authentication module for Apache
 
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-9
+- Use password-auth common PAM configuration instead of system-auth
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Sep 16 12:59:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 12:59:26 +0000 (UTC)
Subject: rpms/openslp/devel openslp-1.2.1-nullauth.patch, NONE,
	1.1 openslp.spec, 1.22, 1.23
Message-ID: <20090916125926.3130B11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/openslp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29787

Modified Files:
	openslp.spec 
Added Files:
	openslp-1.2.1-nullauth.patch 
Log Message:
* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)


openslp-1.2.1-nullauth.patch:
 slpd_log.c |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE openslp-1.2.1-nullauth.patch ---
diff -up openslp-1.2.1/slpd/slpd_log.c.orig openslp-1.2.1/slpd/slpd_log.c
--- openslp-1.2.1/slpd/slpd_log.c.orig	2005-02-08 05:34:31.000000000 +0000
+++ openslp-1.2.1/slpd/slpd_log.c	2009-09-15 19:39:23.000000000 +0100
@@ -179,7 +179,8 @@ void SLPDLogBuffer(const char* prefix, i
     if (G_SlpdLogFile)
     {
         fprintf(G_SlpdLogFile,"%s",prefix);
-        fwrite(buf,bufsize,1,G_SlpdLogFile);
+        if (buf && (bufsize > 0))
+            fwrite(buf,bufsize,1,G_SlpdLogFile);
         fprintf(G_SlpdLogFile,"\n");
         fflush(G_SlpdLogFile);
     }
@@ -275,7 +276,21 @@ void SLPDLogSrvTypeRqstMessage(SLPSrvTyp
 /*-------------------------------------------------------------------------*/
 {
     SLPDLog("Message SRVTYPERQST:\n");
-    SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+
+    if (srvtyperqst->namingauthlen == 0xffff)
+    {
+        /* Naming authority matches all */
+        SLPDLog("   namingauth = (all)\n");
+    }
+    else if (srvtyperqst->namingauthlen == 0)
+    {
+        SLPDLog("   namingauth = (empty)\n");
+    }
+    else
+    {
+        /* Naming authority has been provided */
+        SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+    }
     SLPDLogBuffer("   scope = ", srvtyperqst->scopelistlen, srvtyperqst->scopelist);
 }
 


Index: openslp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- openslp.spec	21 Aug 2009 15:07:09 -0000	1.22
+++ openslp.spec	16 Sep 2009 12:59:25 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -11,7 +11,11 @@ Source:  http://dl.sourceforge.net/sourc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: slpd.init
+
 Patch1:  openslp-1.2.1-optflags.patch
+# slpd crashes if slptool findsrvtypes is run, when message logging is on
+# http://bugzilla.redhat.com/523609
+Patch2:  openslp-1.2.1-nullauth.patch
 
 BuildRequires: automake libtool
 BuildRequires: bison
@@ -30,7 +34,7 @@ by RFC 2608 and RFC 2614.
 %package devel
 Summary: OpenSLP headers and libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 OpenSLP header files and libraries.
 
@@ -49,12 +53,14 @@ OpenSLP server daemon to dynamically reg
 %setup -q
 
 %patch1 -p1 -b .optflags
+%patch2 -p1 -b .nullauth
 
 # tarball goof (?), it wants to re-automake anyway, so let's do it right.
-libtoolize --force
-aclocal
-autoconf
-automake --add-missing
+#libtoolize --force
+#aclocal
+#autoconf
+#automake --add-missing
+autoreconf -f -i
 
 # remove CVS leftovers...
 find . -name "CVS" | xargs rm -rf
@@ -117,15 +123,15 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
 %config(noreplace) %{_sysconfdir}/slp.conf
-%{_bindir}/*
-%{_libdir}/lib*.so.*
+%{_bindir}/slptool
+%{_libdir}/libslp.so.1*
 
 %files server
 %defattr(-,root,root)
 %doc doc/html/IntroductionToSLP
 %doc doc/html/UsersGuide
 %doc doc/html/faq*
-%{_sbindir}/*
+%{_sbindir}/slpd
 %config(noreplace) %{_sysconfdir}/slp.reg
 %config(noreplace) %{_sysconfdir}/slp.spi
 %config(noreplace) %{_initrddir}/slpd
@@ -134,11 +140,14 @@ fi
 %defattr(-,root,root)
 %doc doc/html/ProgrammersGuide
 %doc doc/rfc
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/slp.h
+%{_libdir}/libslp.so
 
 
 %changelog
+* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
+- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-13
 - rebuilt with new openssl
 



From mauelsha at fedoraproject.org  Wed Sep 16 13:03:49 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 13:03:49 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.99,1.100
Message-ID: <20090916130349.13BA911C00EC@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31693

Modified Files:
	dmraid.spec 
Log Message:
typo


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- dmraid.spec	16 Sep 2009 12:08:26 -0000	1.99
+++ dmraid.spec	16 Sep 2009 13:03:47 -0000	1.100
@@ -18,7 +18,7 @@ Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
-Patch0:	Makefile.in.arvoid_dmreg.o_build.patch
+Patch0:	Makefile.in.avoid_dmreg.o_build.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,



From tmraz at fedoraproject.org  Wed Sep 16 13:09:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 13:09:44 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.25,1.26
Message-ID: <20090916130944.55F6C11C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/newscache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2533

Modified Files:
	newscache.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-0.11.rc6
- Use password-auth common PAM configuration instead of system-auth



Index: newscache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- newscache.spec	25 Jul 2009 19:15:20 -0000	1.25
+++ newscache.spec	16 Sep 2009 13:09:43 -0000	1.26
@@ -4,7 +4,7 @@
 Name: 		newscache
 Summary: 	Free cache server for USENET News
 Version: 	1.2
-Release: 	0.10.rc6%{?dist}
+Release: 	0.11.rc6%{?dist}
 Group: 		System Environment/Daemons
 License:	GPLv2+
 URL:		http://www.linuxhacker.at/newscache/
@@ -94,8 +94,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 pushd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 cat <<EOF >%{name}
 #%PAM-1.0
-auth    include		system-auth
-account include		system-auth
+auth    include		password-auth
+account include		password-auth
 
 EOF
 popd
@@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-0.11.rc6
+- Use password-auth common PAM configuration instead of system-auth
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.10.rc6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mauelsha at fedoraproject.org  Wed Sep 16 13:15:16 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 13:15:16 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.100,1.101
Message-ID: <20090916131516.DFF5F11C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5337

Modified Files:
	dmraid.spec 
Log Message:
Avoid static binary


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- dmraid.spec	16 Sep 2009 13:03:47 -0000	1.100
+++ dmraid.spec	16 Sep 2009 13:15:16 -0000	1.101
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.02-2, device-mapper-devel, libselinux-devel, libsepol-devel
+BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
 Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
@@ -60,10 +60,6 @@ Device failure reporting has to be activ
 %patch0 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led
-make DESTDIR=$RPM_BUILD_ROOT
-mv tools/dmraid tools/dmraid.static
-make clean
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
@@ -71,9 +67,7 @@ make DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
 make DESTDIR=$RPM_BUILD_ROOT install
-
-# Install static dmraid binary
-install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
+ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
 
 # Provide convenience link from dmevent_tool
 (cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)



From tmraz at fedoraproject.org  Wed Sep 16 13:18:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 13:18:53 +0000 (UTC)
Subject: rpms/nufw/devel nuauth.pam,1.1,1.2 nufw.spec,1.10,1.11
Message-ID: <20090916131854.09C1D11C0099@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7305

Modified Files:
	nuauth.pam nufw.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-6
- Use password-auth common PAM configuration instead of system-auth



Index: nuauth.pam
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nuauth.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nuauth.pam	9 Jan 2009 18:24:38 -0000	1.1
+++ nuauth.pam	16 Sep 2009 13:18:52 -0000	1.2
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       include      system-auth
-account    include      system-auth
-password   include      system-auth
-session    include      system-auth
+auth       include      password-auth
+account    include      password-auth
+password   include      password-auth
+session    include      password-auth
 


Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nufw.spec	21 Aug 2009 14:46:15 -0000	1.10
+++ nufw.spec	16 Sep 2009 13:18:52 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name: nufw
 Version: 2.2.21
-Release: 5%{dist}
+Release: 6%{dist}
 Summary: Authentication Firewall Suite for Linux
 License: GPLv2
 Group: System Environment/Daemons
@@ -360,6 +360,9 @@ fi
 %{python_sitelib}/nuclient/*
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-6
+- Use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-5
 - rebuilt with new openssl
 



From rdieter at fedoraproject.org  Wed Sep 16 13:21:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 13:21:50 +0000 (UTC)
Subject: rpms/openslp/F-11 openslp-1.2.1-nullauth.patch, NONE,
	1.1 openslp.spec, 1.20, 1.21
Message-ID: <20090916132150.D363411C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/openslp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8827

Modified Files:
	openslp.spec 
Added Files:
	openslp-1.2.1-nullauth.patch 
Log Message:
* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)


openslp-1.2.1-nullauth.patch:
 slpd_log.c |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE openslp-1.2.1-nullauth.patch ---
diff -up openslp-1.2.1/slpd/slpd_log.c.orig openslp-1.2.1/slpd/slpd_log.c
--- openslp-1.2.1/slpd/slpd_log.c.orig	2005-02-08 05:34:31.000000000 +0000
+++ openslp-1.2.1/slpd/slpd_log.c	2009-09-15 19:39:23.000000000 +0100
@@ -179,7 +179,8 @@ void SLPDLogBuffer(const char* prefix, i
     if (G_SlpdLogFile)
     {
         fprintf(G_SlpdLogFile,"%s",prefix);
-        fwrite(buf,bufsize,1,G_SlpdLogFile);
+        if (buf && (bufsize > 0))
+            fwrite(buf,bufsize,1,G_SlpdLogFile);
         fprintf(G_SlpdLogFile,"\n");
         fflush(G_SlpdLogFile);
     }
@@ -275,7 +276,21 @@ void SLPDLogSrvTypeRqstMessage(SLPSrvTyp
 /*-------------------------------------------------------------------------*/
 {
     SLPDLog("Message SRVTYPERQST:\n");
-    SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+
+    if (srvtyperqst->namingauthlen == 0xffff)
+    {
+        /* Naming authority matches all */
+        SLPDLog("   namingauth = (all)\n");
+    }
+    else if (srvtyperqst->namingauthlen == 0)
+    {
+        SLPDLog("   namingauth = (empty)\n");
+    }
+    else
+    {
+        /* Naming authority has been provided */
+        SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+    }
     SLPDLogBuffer("   scope = ", srvtyperqst->scopelistlen, srvtyperqst->scopelist);
 }
 


Index: openslp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslp/F-11/openslp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- openslp.spec	26 Feb 2009 08:45:35 -0000	1.20
+++ openslp.spec	16 Sep 2009 13:21:47 -0000	1.21
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 11%{?dist}
+Release: 14%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -11,7 +11,11 @@ Source:  http://dl.sourceforge.net/sourc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: slpd.init
+
 Patch1:  openslp-1.2.1-optflags.patch
+# slpd crashes if slptool findsrvtypes is run, when message logging is on
+# http://bugzilla.redhat.com/523609
+Patch2:  openslp-1.2.1-nullauth.patch
 
 BuildRequires: automake libtool
 BuildRequires: bison
@@ -30,7 +34,7 @@ by RFC 2608 and RFC 2614.
 %package devel
 Summary: OpenSLP headers and libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 OpenSLP header files and libraries.
 
@@ -49,12 +53,14 @@ OpenSLP server daemon to dynamically reg
 %setup -q
 
 %patch1 -p1 -b .optflags
+%patch2 -p1 -b .nullauth
 
 # tarball goof (?), it wants to re-automake anyway, so let's do it right.
-libtoolize --force
-aclocal
-autoconf
-automake --add-missing
+#libtoolize --force
+#aclocal
+#autoconf
+#automake --add-missing
+autoreconf -f -i
 
 # remove CVS leftovers...
 find . -name "CVS" | xargs rm -rf
@@ -117,15 +123,15 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
 %config(noreplace) %{_sysconfdir}/slp.conf
-%{_bindir}/*
-%{_libdir}/lib*.so.*
+%{_bindir}/slptool
+%{_libdir}/libslp.so.1*
 
 %files server
 %defattr(-,root,root)
 %doc doc/html/IntroductionToSLP
 %doc doc/html/UsersGuide
 %doc doc/html/faq*
-%{_sbindir}/*
+%{_sbindir}/slpd
 %config(noreplace) %{_sysconfdir}/slp.reg
 %config(noreplace) %{_sysconfdir}/slp.spi
 %config(noreplace) %{_initrddir}/slpd
@@ -134,11 +140,20 @@ fi
 %defattr(-,root,root)
 %doc doc/html/ProgrammersGuide
 %doc doc/rfc
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/slp.h
+%{_libdir}/libslp.so
 
 
 %changelog
+* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
+- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-13
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mauelsha at fedoraproject.org  Wed Sep 16 13:25:05 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 13:25:05 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.101,1.102
Message-ID: <20090916132505.1B26A11C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10534

Modified Files:
	dmraid.spec 
Log Message:
Build requirement missing


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- dmraid.spec	16 Sep 2009 13:15:16 -0000	1.101
+++ dmraid.spec	16 Sep 2009 13:25:04 -0000	1.102
@@ -12,7 +12,9 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
+BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
+Requires: device-mapper-devel>= 1.02.02-2
+Requires: dmraid-events kpartx
 Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig



From jakub at fedoraproject.org  Wed Sep 16 13:27:07 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 16 Sep 2009 13:27:07 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.291, 1.292 gcc.spec, 1.69,
	1.70 gcc44-pr41175.patch, 1.1, 1.2 sources, 1.295,
	1.296 gcc44-pr41175-2.patch, 1.2, NONE
Message-ID: <20090916132707.374AA11C0099@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11621

Modified Files:
	.cvsignore gcc.spec gcc44-pr41175.patch sources 
Removed Files:
	gcc44-pr41175-2.patch 
Log Message:
4.4.1-14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- .cvsignore	11 Sep 2009 09:52:12 -0000	1.291
+++ .cvsignore	16 Sep 2009 13:27:05 -0000	1.292
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090911.tar.bz2
+gcc-4.4.1-20090916.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gcc.spec	11 Sep 2009 09:52:12 -0000	1.69
+++ gcc.spec	16 Sep 2009 13:27:05 -0000	1.70
@@ -1,9 +1,9 @@
-%global DATE 20090911
-%global SVNREV 151630
+%global DATE 20090916
+%global SVNREV 151746
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 13
+%global gcc_release 14
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -162,9 +162,8 @@ Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
 Patch20: gcc44-powerpc-libgcc_s_so.patch
 Patch21: gcc44-pr41175.patch
-Patch22: gcc44-pr41175-2.patch
-Patch23: gcc44-rh518303.patch
-Patch24: gcc44-rh522577.patch
+Patch22: gcc44-rh518303.patch
+Patch23: gcc44-rh522577.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -473,9 +472,8 @@ which are required to compile with the G
 %patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
 %patch20 -p0 -b .powerpc-libgcc_s_so~
 %patch21 -p0 -b .pr41175~
-%patch22 -p0 -b .pr41175-2~
-%patch23 -p0 -b .rh518303~
-%patch24 -p0 -b .rh522577~
+%patch22 -p0 -b .rh518303~
+%patch23 -p0 -b .rh522577~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1831,6 +1829,14 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Sep 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-14
+- update from gcc-4_4-branch
+  - PRs fortran/39876, tree-optimization/41101
+- asm goto support
+- VTA delayed branch scheduling fix (PR bootstrap/41349)
+- power7 VSX fix (PR target/41210)
+- ppc bswap fixes (PR target/41331)
+
 * Fri Sep 11 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-13
 - fix ICE in debuginfo output with BLOCK_NONLOCALIZED_VARS (#518303)
 - wrap_constant when propagating for subst in debug in the combiner (#522577)

gcc44-pr41175.patch:
 config/rs6000/linux64.h                |    4 
 config/rs6000/rs6000.c                 |  330 +++++++++++++++++------
 config/rs6000/rs6000.md                |   13 
 config/rs6000/spe.md                   |   18 -
 config/rs6000/sysv4.h                  |   12 
 testsuite/gcc.target/powerpc/pr41175.c |  461 +++++++++++++++++++++++++++++++++
 6 files changed, 735 insertions(+), 103 deletions(-)

Index: gcc44-pr41175.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr41175.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-pr41175.patch	10 Sep 2009 14:24:09 -0000	1.1
+++ gcc44-pr41175.patch	16 Sep 2009 13:27:05 -0000	1.2
@@ -1,29 +1,520 @@
-2009-09-10  Nathan Froyd  <froydnj at codesourcery.com>
+2009-09-15  Nathan Froyd  <froydnj at codesourcery.com>
+	    Jakub Jelinek  <jakub at redhat.com>
 
-	PR target/40677
 	PR target/41175
+	PR target/40677
 	* config/rs6000/rs6000.c (no_global_regs_above): Fix precedence
 	problem.
+	(SAVRES_NOINLINE_GPRS_SAVES_LR, SAVRES_NOINLINE_FPRS_SAVES_LR,
+	SAVRES_NOINLINE_FPRS_DOESNT_RESTORE_LR): New strategy bits.
+	(rs6000_savres_strategy): Always save FP registers inline if the
+	target doesn't support hardware double-precision.  Set the above
+	bits in return value when needed.
 	(rs6000_savres_routine_sym): Fix computation for cache selector.
-	Mark the generated symbol as a function.
-	(rs6000_emit_prologue): Correct use of call_used_regs.
+	Mark the generated symbol as a function.  Rename exitp argument to
+	lr.  Move code for determining the name of the symbol...
+	(rs6000_savres_routine_name): ...here.  New function.  Add cases for
+	getting the names right on AIX and 64-bit Linux.
+	(savres_routine_name): New variable.
+	(rs6000_make_savres_rtx): Rename exitp argument to lr.  Don't assert
+	lr isn't set when savep.  Use r12 resp. r1 instead of r11 depending
+	on what the target routine uses as a base register.  If savep && lr
+	describe saving of r0 into memory slot.
+	(rs6000_emit_prologue): Correct use of call_used_regs.  Fix out of
+	line calls for AIX ABI.
+	(rs6000_output_function_prologue): Use rs6000_savres_routine_name to
+	determine FP save/restore functions.
+	(rs6000_emit_stack_reset): Handle savres if sp_offset != 0 and
+	frame_reg_rtx != sp_reg_rtx.  Use gen_add3_insn instead of
+	gen_addsi3.
 	(rs6000_emit_epilogue): Adjust computation of restore_lr.
 	Duplicate restoration of LR and execute the appropriate one
-	depending on whether GPRs are being restored inline.
-	* config/rs6000/rs6000.md (*save_gpregs_<mode>): Use explicit
-	match for register 11.
-	(*save_fpregs_<mode>): Likewise.
-	(*restore_gpregs_<mode>): Likewise.
-	(*return_and_restore_gpregs_<mode>): Likewise.
-	(*return_and_restore_fpregs_<mode>): Likewise.
+	depending on whether GPRs are being restored inline.  Set r11 from
+	offsetted frame_reg_rtx instead of sp_reg_rtx; if frame_reg_rtx is
+	r11, adjust sp_offset.  Use gen_add3_insn instead of gen_addsi3.
+	Fix out of line calls for AIX ABI.
+	* config/rs6000/rs6000.md (*return_and_restore_fpregs_aix_<mode>):
+	New insn.
 	* config/rs6000/spe.md (*save_gpregs_spe): Use explicit match for
 	register 11.
 	(*restore_gpregs_spe): Likewise.
 	(*return_and_restore_gpregs_spe): Likewise.
+	* config/rs6000/linux64.h (SAVE_FP_SUFFIX, RESTORE_FP_SUFFIX):
+	Define to empty string unconditionally.
+	* config/rs6000/sysv4.h (SAVE_FP_SUFFIX, RESTORE_FP_SUFFIX):
+	Define to empty string unconditionally.
+	(GP_SAVE_INLINE, FP_SAVE_INLINE): Handle TARGET_64BIT the same as
+	!TARGET_64BIT.
+
+	* gcc.target/powerpc/pr41175.c: New test.
 
---- gcc/config/rs6000/spe.md.jj	2009-08-31 23:30:14.352526952 +0200
-+++ gcc/config/rs6000/spe.md	2009-09-09 20:46:08.391404851 +0200
-@@ -3156,9 +3156,9 @@
+--- gcc/testsuite/gcc.target/powerpc/pr41175.c	(revision 0)
++++ gcc/testsuite/gcc.target/powerpc/pr41175.c	(revision 151729)
+@@ -0,0 +1,461 @@
++/* PR target/41175 */
++/* { dg-do run } */
++/* { dg-options "-Os" } */
++
++#define X2(n) X1(n##0) X1(n##1)
++#define X4(n) X2(n##0) X2(n##1)
++#define X8(n) X4(n##0) X4(n##1)
++
++#ifndef __SPE__
++#define FLOAT_REG_CONSTRAINT "f"
++#else
++#define FLOAT_REG_CONSTRAINT "r"
++#endif
++
++volatile int ll;
++
++__attribute__((noinline)) void
++foo (void)
++{
++  asm volatile ("" : : : "memory");
++}
++
++__attribute__((noinline)) void
++bar (char *p)
++{
++  asm volatile ("" : : "r" (p) : "memory");
++}
++
++__attribute__((noinline)) void
++f1 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++  foo ();
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f2 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++  char *pp = __builtin_alloca (ll);
++  bar (pp);
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f3 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++}
++
++#ifndef __NO_FPRS__
++__attribute__((noinline)) void
++f4 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X4(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X4(d) "=m" (mem) : : "memory");
++  foo ();
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X4(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f5 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X4(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X4(d) "=m" (mem) : : "memory");
++  char *pp = __builtin_alloca (ll);
++  bar (pp);
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X4(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f6 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X4(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X4(d) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X4(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f7 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X2(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X2(d) "=m" (mem) : : "memory");
++  foo ();
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X2(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f8 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X2(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X2(d) "=m" (mem) : : "memory");
++  char *pp = __builtin_alloca (ll);
++  bar (pp);
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X2(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f9 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X8(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X2(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X2(d) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X8(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X2(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f10 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X4(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X1(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X4(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X1(d) "=m" (mem) : : "memory");
++  foo ();
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X4(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X1(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f11 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X4(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X1(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X4(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X1(d) "=m" (mem) : : "memory");
++  char *pp = __builtin_alloca (ll);
++  bar (pp);
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X4(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X1(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f12 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X4(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X1(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X4(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X1(d) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X4(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X1(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f13 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X2(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X8(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X2(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X8(d) "=m" (mem) : : "memory");
++  foo ();
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X2(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X8(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f14 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X2(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X8(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X2(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X8(d) "=m" (mem) : : "memory");
++  char *pp = __builtin_alloca (ll);
++  bar (pp);
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X2(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X8(d) "m" (mem) : "memory");
++}
++
++__attribute__((noinline)) void
++f15 (void)
++{
++  int mem;
++#undef X1
++#define X1(n) int gpr##n = 0;
++  X8(a) X8(b) X2(c)
++#undef X1
++#define X1(n) double fpr##n = 0.0;
++  X8(d)
++#undef X1
++#define X1(n) "+r" (gpr##n),
++  asm volatile ("" : X8(a) "=m" (mem) : : "memory");
++  asm volatile ("" : X8(b) "=m" (mem) : : "memory");
++  asm volatile ("" : X2(c) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "+" FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : X8(d) "=m" (mem) : : "memory");
++#undef X1
++#define X1(n) "r" (gpr##n),
++  asm volatile ("" : : X8(a) "m" (mem) : "memory");
++  asm volatile ("" : : X8(b) "m" (mem) : "memory");
++  asm volatile ("" : : X2(c) "m" (mem) : "memory");
++#undef X1
++#define X1(n) FLOAT_REG_CONSTRAINT (fpr##n),
++  asm volatile ("" : : X8(d) "m" (mem) : "memory");
++}
++#endif
++
++int
++main ()
++{
++  ll = 60;
++  f1 ();
++  f2 ();
++  f3 ();
++#ifndef __NO_FPRS__
++  f4 ();
++  f5 ();
++  f6 ();
++  f7 ();
++  f8 ();
++  f9 ();
++  f10 ();
++  f11 ();
++  f12 ();
++  f13 ();
++  f14 ();
++  f15 ();
++#endif
++  return 0;
++}
+--- gcc/config/rs6000/spe.md	(revision 151728)
++++ gcc/config/rs6000/spe.md	(revision 151729)
+@@ -3156,9 +3156,9 @@ (define_insn "*save_gpregs_spe"
    [(match_parallel 0 "any_parallel_operand"
  		   [(clobber (reg:P 65))
  		    (use (match_operand:P 1 "symbol_ref_operand" "s"))
@@ -36,7 +527,7 @@
    "TARGET_SPE_ABI"
    "bl %z1"
    [(set_attr "type" "branch")
-@@ -3168,9 +3168,9 @@
+@@ -3168,9 +3168,9 @@ (define_insn "*restore_gpregs_spe"
   [(match_parallel 0 "any_parallel_operand"
  		  [(clobber (reg:P 65))
  		   (use (match_operand:P 1 "symbol_ref_operand" "s"))
@@ -49,7 +540,7 @@
   "TARGET_SPE_ABI"
   "bl %z1"
   [(set_attr "type" "branch")
-@@ -3181,9 +3181,9 @@
+@@ -3181,9 +3181,9 @@ (define_insn "*return_and_restore_gpregs
  		  [(return)
  		   (clobber (reg:P 65))
  		   (use (match_operand:P 1 "symbol_ref_operand" "s"))
@@ -62,9 +553,25 @@
   "TARGET_SPE_ABI"
   "b %z1"
   [(set_attr "type" "branch")
---- gcc/config/rs6000/rs6000.c.jj	2009-09-09 20:45:10.794535794 +0200
-+++ gcc/config/rs6000/rs6000.c	2009-09-09 20:46:57.195401830 +0200
-@@ -18011,7 +18011,8 @@ static bool
+--- gcc/config/rs6000/linux64.h	(revision 151728)
++++ gcc/config/rs6000/linux64.h	(revision 151729)
+@@ -437,11 +437,11 @@ extern int dot_symbols;
+ #undef  SAVE_FP_PREFIX
+ #define SAVE_FP_PREFIX (TARGET_64BIT ? "._savef" : "_savefpr_")
+ #undef  SAVE_FP_SUFFIX
+-#define SAVE_FP_SUFFIX (TARGET_64BIT ? "" : "_l")
++#define SAVE_FP_SUFFIX ""
+ #undef  RESTORE_FP_PREFIX
+ #define RESTORE_FP_PREFIX (TARGET_64BIT ? "._restf" : "_restfpr_")
+ #undef  RESTORE_FP_SUFFIX
+-#define RESTORE_FP_SUFFIX (TARGET_64BIT ? "" : "_l")
++#define RESTORE_FP_SUFFIX ""
+ 
+ /* Dwarf2 debugging.  */
+ #undef  PREFERRED_DEBUGGING_TYPE
+--- gcc/config/rs6000/rs6000.c	(revision 151728)
++++ gcc/config/rs6000/rs6000.c	(revision 151729)
+@@ -18033,7 +18033,8 @@ static bool
  no_global_regs_above (int first, bool gpr)
  {
    int i;
@@ -74,22 +581,166 @@
      if (global_regs[i])
        return false;
    return true;
-@@ -18037,11 +18038,11 @@ rs6000_savres_routine_sym (rs6000_stack_
+@@ -18050,54 +18051,136 @@ no_global_regs_above (int first, bool gp
+ 
+ static GTY(()) rtx savres_routine_syms[N_SAVRES_REGISTERS][8];
+ 
+-/* Return the symbol for an out-of-line register save/restore routine.
++/* Temporary holding space for an out-of-line register save/restore
++   routine name.  */
++static char savres_routine_name[30];
++
++/* Return the name for an out-of-line register save/restore routine.
++   We are saving/restoring GPRs if GPR is true.  */
++
++static char *
++rs6000_savres_routine_name (rs6000_stack_t *info, int regno,
++			    bool savep, bool gpr, bool lr)
++{
++  const char *prefix = "";
++  const char *suffix = "";
++
++  /* Different targets are supposed to define
++     {SAVE,RESTORE}_FP_{PREFIX,SUFFIX} with the idea that the needed
++     routine name could be defined with:
++
++     sprintf (name, "%s%d%s", SAVE_FP_PREFIX, regno, SAVE_FP_SUFFIX)
++
++     This is a nice idea in practice, but in reality, things are
++     complicated in several ways:
++
++     - ELF targets have save/restore routines for GPRs.
++
++     - SPE targets use different prefixes for 32/64-bit registers, and
++       neither of them fit neatly in the FOO_{PREFIX,SUFFIX} regimen.
++
++     - PPC64 ELF targets have routines for save/restore of GPRs that
++       differ in what they do with the link register, so having a set
++       prefix doesn't work.  (We only use one of the save routines at
++       the moment, though.)
++
++     - PPC32 elf targets have "exit" versions of the restore routines
++       that restore the link register and can save some extra space.
++       These require an extra suffix.  (There are also "tail" versions
++       of the restore routines and "GOT" versions of the save routines,
++       but we don't generate those at present.  Same problems apply,
++       though.)
++
++     We deal with all this by synthesizing our own prefix/suffix and
++     using that for the simple sprintf call shown above.  */
++  if (TARGET_SPE)
++    {
++      /* No floating point saves on the SPE.  */
++      gcc_assert (gpr);
++
++      if (savep)
++	prefix = info->spe_64bit_regs_used ? "_save64gpr_" : "_save32gpr_";
++      else
++	prefix = info->spe_64bit_regs_used ? "_rest64gpr_" : "_rest32gpr_";
++
++      if (lr)
++	suffix = "_x";
++    }
++  else if (DEFAULT_ABI == ABI_V4)
++    {
++      if (TARGET_64BIT)
++	goto aix_names;
++
++      if (gpr)
++	prefix = savep ? "_savegpr_" : "_restgpr_";
++      else
++	prefix = savep ? "_savefpr_" : "_restfpr_";
++
++      if (lr)
++	suffix = "_x";
++    }
++  else if (DEFAULT_ABI == ABI_AIX)
++    {
++#ifndef POWERPC_LINUX
++      /* No out-of-line save/restore routines for GPRs on AIX.  */
++      gcc_assert (!TARGET_AIX || !gpr);
++#endif
++
++    aix_names:
++      if (gpr)
++	prefix = (savep
++		  ? (lr ? "_savegpr0_" : "_savegpr1_")
++		  : (lr ? "_restgpr0_" : "_restgpr1_"));
++#ifdef POWERPC_LINUX
++      else if (lr)
++	prefix = (savep ? "_savefpr_" : "_restfpr_");
++#endif
++      else
++	{
++	  prefix = savep ? SAVE_FP_PREFIX : RESTORE_FP_PREFIX;
++	  suffix = savep ? SAVE_FP_SUFFIX : RESTORE_FP_SUFFIX;
++	}
++    }
++  else if (DEFAULT_ABI == ABI_DARWIN)
++    sorry ("Out-of-line save/restore routines not supported on Darwin");
++
++  sprintf (savres_routine_name, "%s%d%s", prefix, regno, suffix);
++
++  return savres_routine_name;
++}
++
++/* Return an RTL SYMBOL_REF for an out-of-line register save/restore routine.
+    We are saving/restoring GPRs if GPR is true.  */
+ 
+ static rtx
+-rs6000_savres_routine_sym (rs6000_stack_t *info, bool savep, bool gpr, bool exitp)
++rs6000_savres_routine_sym (rs6000_stack_t *info, bool savep,
++			   bool gpr, bool lr)
+ {
    int regno = gpr ? info->first_gp_reg_save : (info->first_fp_reg_save - 32);
    rtx sym;
    int select = ((savep ? 1 : 0) << 2
 -		| (gpr
-+		| (TARGET_SPE_ABI
- 		   /* On the SPE, we never have any FPRs, but we do have
- 		      32/64-bit versions of the routines.  */
+-		   /* On the SPE, we never have any FPRs, but we do have
+-		      32/64-bit versions of the routines.  */
 -		   ? (TARGET_SPE_ABI && info->spe_64bit_regs_used ? 1 : 0)
 -		   : 0) << 1
-+		   ? (info->spe_64bit_regs_used ? 1 : 0)
-+		   : (gpr ? 1 : 0)) << 1
- 		| (exitp ? 1: 0));
+-		| (exitp ? 1: 0));
++		| ((TARGET_SPE_ABI
++		    /* On the SPE, we never have any FPRs, but we do have
++		       32/64-bit versions of the routines.  */
++		    ? (info->spe_64bit_regs_used ? 1 : 0)
++		    : (gpr ? 1 : 0)) << 1)
++		| (lr ? 1: 0));
  
    /* Don't generate bogus routine names.  */
-@@ -18076,6 +18077,7 @@ rs6000_savres_routine_sym (rs6000_stack_
+-  gcc_assert (FIRST_SAVRES_REGISTER <= regno && regno <= LAST_SAVRES_REGISTER);
++  gcc_assert (FIRST_SAVRES_REGISTER <= regno
++	      && regno <= LAST_SAVRES_REGISTER);
+ 
+   sym = savres_routine_syms[regno-FIRST_SAVRES_REGISTER][select];
+ 
+   if (sym == NULL)
+     {
+-      char name[30];
+-      const char *action;
+-      const char *regkind;
+-      const char *exit_suffix;
+-
+-      action = savep ? "save" : "rest";
+-
+-      /* SPE has slightly different names for its routines depending on
+-	 whether we are saving 32-bit or 64-bit registers.  */
+-      if (TARGET_SPE_ABI)
+-	{
+-	  /* No floating point saves on the SPE.  */
+-	  gcc_assert (gpr);
+-
+-	  regkind = info->spe_64bit_regs_used ? "64gpr" : "32gpr";
+-	}
+-      else
+-	regkind = gpr ? "gpr" : "fpr";
+-
+-      exit_suffix = exitp ? "_x" : "";
++      char *name;
+ 
+-      sprintf (name, "_%s%s_%d%s", action, regkind, regno, exit_suffix);
++      name = rs6000_savres_routine_name (info, regno, savep, gpr, lr);
  
        sym = savres_routine_syms[regno-FIRST_SAVRES_REGISTER][select]
  	= gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (name));
@@ -97,28 +748,278 @@
      }
  
    return sym;
-@@ -18289,7 +18291,7 @@ rs6000_emit_prologue (void)
+@@ -18124,8 +18207,11 @@ rs6000_emit_stack_reset (rs6000_stack_t 
+   if (frame_reg_rtx != sp_reg_rtx)
+     {
+       if (sp_offset != 0)
+-	return emit_insn (gen_addsi3 (sp_reg_rtx, frame_reg_rtx,
+-				      GEN_INT (sp_offset)));
++	{
++	  rtx dest_reg = savres ? gen_rtx_REG (Pmode, 11) : sp_reg_rtx;
++	  return emit_insn (gen_add3_insn (dest_reg, frame_reg_rtx,
++					   GEN_INT (sp_offset)));
++	}
+       else if (!savres)
+ 	return emit_move_insn (sp_reg_rtx, frame_reg_rtx);
+     }
+@@ -18154,7 +18240,7 @@ static rtx
+ rs6000_make_savres_rtx (rs6000_stack_t *info,
+ 			rtx frame_reg_rtx, int save_area_offset,
+ 			enum machine_mode reg_mode,
+-			bool savep, bool gpr, bool exitp)
++			bool savep, bool gpr, bool lr)
+ {
+   int i;
+   int offset, start_reg, end_reg, n_regs;
+@@ -18168,20 +18254,21 @@ rs6000_make_savres_rtx (rs6000_stack_t *
+ 	       : info->first_fp_reg_save);
+   end_reg = gpr ? 32 : 64;
+   n_regs = end_reg - start_reg;
+-  p = rtvec_alloc ((exitp ? 4 : 3) + n_regs);
++  p = rtvec_alloc ((lr ? 4 : 3) + n_regs);
+ 
+-  /* If we're saving registers, then we should never say we're exiting.	 */
+-  gcc_assert ((savep && !exitp) || !savep);
+-
+-  if (exitp)
++  if (!savep && lr)
+     RTVEC_ELT (p, offset++) = gen_rtx_RETURN (VOIDmode);
+ 
+   RTVEC_ELT (p, offset++)
+     = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, 65));
+ 
+-  sym = rs6000_savres_routine_sym (info, savep, gpr, exitp);
++  sym = rs6000_savres_routine_sym (info, savep, gpr, lr);
+   RTVEC_ELT (p, offset++) = gen_rtx_USE (VOIDmode, sym);
+-  RTVEC_ELT (p, offset++) = gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, 11));
++  RTVEC_ELT (p, offset++)
++    = gen_rtx_USE (VOIDmode,
++		   gen_rtx_REG (Pmode, DEFAULT_ABI != ABI_AIX ? 11
++				       : gpr && !lr ? 12
++				       : 1));
+ 
+   for (i = 0; i < end_reg - start_reg; i++)
+     {
+@@ -18196,6 +18283,16 @@ rs6000_make_savres_rtx (rs6000_stack_t *
+ 					       savep ? reg : mem);
+     }
+ 
++  if (savep && lr)
++    {
++      rtx addr, reg, mem;
++      reg = gen_rtx_REG (Pmode, 0);
++      addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
++			   GEN_INT (info->lr_save_offset));
++      mem = gen_frame_mem (Pmode, addr);
++      RTVEC_ELT (p, i + offset) = gen_rtx_SET (VOIDmode, mem, reg);
++    }
++
+   return gen_rtx_PARALLEL (VOIDmode, p);
+ }
+ 
+@@ -18216,7 +18313,10 @@ rs6000_reg_live_or_pic_offset_p (int reg
+ enum {
+   SAVRES_MULTIPLE = 0x1,
+   SAVRES_INLINE_FPRS = 0x2,
+-  SAVRES_INLINE_GPRS = 0x4
++  SAVRES_INLINE_GPRS = 0x4,
++  SAVRES_NOINLINE_GPRS_SAVES_LR = 0x8,
++  SAVRES_NOINLINE_FPRS_SAVES_LR = 0x10,
++  SAVRES_NOINLINE_FPRS_DOESNT_RESTORE_LR = 0x20
+ };
+ 
+ /* Determine the strategy for savings/restoring registers.  */
+@@ -18231,6 +18331,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+   bool savres_gprs_inline;
+   bool noclobber_global_gprs
+     = no_global_regs_above (info->first_gp_reg_save, /*gpr=*/true);
++  int strategy;
+ 
+   using_multiple_p = (TARGET_MULTIPLE && ! TARGET_POWERPC64
+ 		      && (!TARGET_SPE_ABI
+@@ -18250,6 +18351,10 @@ rs6000_savres_strategy (rs6000_stack_t *
+ 			|| info->first_fp_reg_save == 64
+ 			|| !no_global_regs_above (info->first_fp_reg_save,
+ 						  /*gpr=*/false)
++			/* The out-of-line FP routines use
++			   double-precision stores; we can't use those
++			   routines if we don't have such stores.  */
++			|| (TARGET_HARD_FLOAT && !TARGET_DOUBLE_FLOAT)
+ 			|| FP_SAVE_INLINE (info->first_fp_reg_save));
+   savres_gprs_inline = (common
+ 			/* Saving CR interferes with the exit routines
+@@ -18287,9 +18392,22 @@ rs6000_savres_strategy (rs6000_stack_t *
+ 	savres_gprs_inline = savres_gprs_inline || using_multiple_p;
+     }
+ 
+-  return (using_multiple_p
+-	  | (savres_fprs_inline << 1)
+-	  | (savres_gprs_inline << 2));
++  strategy = (using_multiple_p
++	      | (savres_fprs_inline << 1)
++	      | (savres_gprs_inline << 2));
++#ifdef POWERPC_LINUX
++  if (TARGET_64BIT)
++    {
++      if (!savres_fprs_inline)
++	strategy |= SAVRES_NOINLINE_FPRS_SAVES_LR;
++      else if (!savres_gprs_inline && info->first_fp_reg_save == 64)
++	strategy |= SAVRES_NOINLINE_GPRS_SAVES_LR;
++    }
++#else
++  if (TARGET_AIX && !savres_fprs_inline)
++    strategy |= SAVRES_NOINLINE_FPRS_DOESNT_RESTORE_LR;
++#endif
++  return strategy;
+ }
+ 
+ /* Emit function prologue as insns.  */
+@@ -18311,7 +18429,7 @@ rs6000_emit_prologue (void)
    int using_store_multiple;
    int using_static_chain_p = (cfun->static_chain_decl != NULL_TREE
                                && df_regs_ever_live_p (STATIC_CHAIN_REGNUM)
 -                              && !call_used_regs[STATIC_CHAIN_REGNUM]);
-+                              && call_used_regs[STATIC_CHAIN_REGNUM]);
++			      && call_used_regs[STATIC_CHAIN_REGNUM]);
    HOST_WIDE_INT sp_offset = 0;
  
    if (TARGET_FIX_AND_CONTINUE)
-@@ -19095,8 +19097,9 @@ rs6000_emit_epilogue (int sibcall)
+@@ -18496,24 +18614,30 @@ rs6000_emit_prologue (void)
+ 			     gen_rtx_REG (Pmode, LR_REGNO));
+       RTX_FRAME_RELATED_P (insn) = 1;
+ 
+-      addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
++      if (!(strategy & (SAVRES_NOINLINE_GPRS_SAVES_LR
++			| SAVRES_NOINLINE_FPRS_SAVES_LR)))
++	{
++	  addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
+ 			       GEN_INT (info->lr_save_offset + sp_offset));
+-      reg = gen_rtx_REG (Pmode, 0);
+-      mem = gen_rtx_MEM (Pmode, addr);
+-      /* This should not be of rs6000_sr_alias_set, because of
+-	 __builtin_return_address.  */
++	  reg = gen_rtx_REG (Pmode, 0);
++	  mem = gen_rtx_MEM (Pmode, addr);
++	  /* This should not be of rs6000_sr_alias_set, because of
++	     __builtin_return_address.  */
+ 
+-      insn = emit_move_insn (mem, reg);
+-      rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
+-			    NULL_RTX, NULL_RTX);
++	  insn = emit_move_insn (mem, reg);
++	  rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
++				NULL_RTX, NULL_RTX);
++	}
+     }
+ 
+-  /* If we need to save CR, put it into r12.  */
++  /* If we need to save CR, put it into r12 or r11.  */
+   if (!WORLD_SAVE_P (info) && info->cr_save_p && frame_reg_rtx != frame_ptr_rtx)
+     {
+       rtx set;
+ 
+-      cr_save_rtx = gen_rtx_REG (SImode, 12);
++      cr_save_rtx
++	= gen_rtx_REG (SImode, DEFAULT_ABI == ABI_AIX && !saving_GPRs_inline
++		       ? 11 : 12);
+       insn = emit_insn (gen_movesi_from_cr (cr_save_rtx));
+       RTX_FRAME_RELATED_P (insn) = 1;
+       /* Now, there's no way that dwarf2out_frame_debug_expr is going
+@@ -18550,7 +18674,9 @@ rs6000_emit_prologue (void)
+ 				    info->fp_save_offset + sp_offset,
+ 				    DFmode,
+ 				    /*savep=*/true, /*gpr=*/false,
+-				    /*exitp=*/false);
++				    /*lr=*/(strategy
++					    & SAVRES_NOINLINE_FPRS_SAVES_LR)
++					   != 0);
+       insn = emit_insn (par);
+       rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
+ 			    NULL_RTX, NULL_RTX);
+@@ -18646,7 +18772,7 @@ rs6000_emit_prologue (void)
+ 	  par = rs6000_make_savres_rtx (info, gen_rtx_REG (Pmode, 11),
+ 					0, reg_mode,
+ 					/*savep=*/true, /*gpr=*/true,
+-					/*exitp=*/false);
++					/*lr=*/false);
+ 	  insn = emit_insn (par);
+ 	  rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
+ 				NULL_RTX, NULL_RTX);
+@@ -18661,23 +18787,23 @@ rs6000_emit_prologue (void)
+     {
+       rtx par;
+ 
+-      /* Need to adjust r11 if we saved any FPRs.  */
++      /* Need to adjust r11 (r12) if we saved any FPRs.  */
+       if (info->first_fp_reg_save != 64)
+         {
+-          rtx r11 = gen_rtx_REG (reg_mode, 11);
+-          rtx offset = GEN_INT (info->total_size
++	  rtx dest_reg = gen_rtx_REG (reg_mode, DEFAULT_ABI == ABI_AIX
++				      ? 12 : 11);
++	  rtx offset = GEN_INT (sp_offset
+                                 + (-8 * (64-info->first_fp_reg_save)));
+-          rtx ptr_reg = (sp_reg_rtx == frame_reg_rtx
+-                         ? sp_reg_rtx : r11);
+-
+-	  emit_insn (gen_add3_insn (r11, ptr_reg, offset));
++	  emit_insn (gen_add3_insn (dest_reg, frame_reg_rtx, offset));
+         }
+ 
+       par = rs6000_make_savres_rtx (info, frame_reg_rtx,
+ 				    info->gp_save_offset + sp_offset,
+ 				    reg_mode,
+ 				    /*savep=*/true, /*gpr=*/true,
+-				    /*exitp=*/false);
++				    /*lr=*/(strategy
++					    & SAVRES_NOINLINE_GPRS_SAVES_LR)
++					   != 0);
+       insn = emit_insn (par);
+       rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
+ 			    NULL_RTX, NULL_RTX);
+@@ -18954,9 +19080,18 @@ rs6000_output_function_prologue (FILE *f
+      fp values.  */
+   if (info->first_fp_reg_save < 64
+       && !FP_SAVE_INLINE (info->first_fp_reg_save))
+-    fprintf (file, "\t.extern %s%d%s\n\t.extern %s%d%s\n",
+-	     SAVE_FP_PREFIX, info->first_fp_reg_save - 32, SAVE_FP_SUFFIX,
+-	     RESTORE_FP_PREFIX, info->first_fp_reg_save - 32, RESTORE_FP_SUFFIX);
++    {
++      char *name;
++      int regno = info->first_fp_reg_save - 32;
++
++      name = rs6000_savres_routine_name (info, regno, /*savep=*/true,
++					 /*gpr=*/false, /*lr=*/false);
++      fprintf (file, "\t.extern %s\n", name);
++
++      name = rs6000_savres_routine_name (info, regno, /*savep=*/false,
++					 /*gpr=*/false, /*lr=*/true);
++      fprintf (file, "\t.extern %s\n", name);
++    }
+ 
+   /* Write .extern for AIX common mode routines, if needed.  */
+   if (! TARGET_POWER && ! TARGET_POWERPC && ! common_mode_defined)
+@@ -19082,6 +19217,7 @@ rs6000_emit_epilogue (int sibcall)
+   rtx frame_reg_rtx = sp_reg_rtx;
+   rtx cfa_restores = NULL_RTX;
+   rtx insn;
++  rtx cr_save_reg = NULL_RTX;
+   enum machine_mode reg_mode = Pmode;
+   int reg_size = TARGET_32BIT ? 4 : 8;
+   int i;
+@@ -19115,8 +19251,10 @@ rs6000_emit_epilogue (int sibcall)
  				 || (cfun->calls_alloca
  				     && !frame_pointer_needed));
    restore_lr = (info->lr_save_p
 -		&& restoring_GPRs_inline
 -		&& restoring_FPRs_inline);
++		&& (restoring_FPRs_inline
++		    || (strategy & SAVRES_NOINLINE_FPRS_DOESNT_RESTORE_LR))
 +		&& (restoring_GPRs_inline
-+		    || (restoring_FPRs_inline
-+			&& info->first_fp_reg_save < 64)));
++		    || info->first_fp_reg_save < 64));
  
    if (WORLD_SAVE_P (info))
      {
-@@ -19383,7 +19386,7 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19403,7 +19541,7 @@ rs6000_emit_epilogue (int sibcall)
  
    /* Get the old lr if we saved it.  If we are restoring registers
       out-of-line, then the out-of-line routines can do this for us.  */
@@ -127,7 +1028,18 @@
      {
        rtx mem = gen_frame_mem_offset (Pmode, frame_reg_rtx,
  				      info->lr_save_offset + sp_offset);
-@@ -19403,7 +19406,7 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19418,12 +19556,17 @@ rs6000_emit_epilogue (int sibcall)
+ 			       GEN_INT (info->cr_save_offset + sp_offset));
+       rtx mem = gen_frame_mem (SImode, addr);
+ 
+-      emit_move_insn (gen_rtx_REG (SImode, 12), mem);
++      cr_save_reg = gen_rtx_REG (SImode,
++				 DEFAULT_ABI == ABI_AIX
++				 && !restoring_GPRs_inline
++				 && info->first_fp_reg_save < 64
++				 ? 11 : 12);
++      emit_move_insn (cr_save_reg, mem);
+     }
  
    /* Set LR here to try to overlap restores below.  LR is always saved
       above incoming stack, so it never needs REG_CFA_RESTORE.  */
@@ -136,101 +1048,158 @@
      emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
  		    gen_rtx_REG (Pmode, 0));
  
-@@ -19639,6 +19642,18 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19540,7 +19683,7 @@ rs6000_emit_epilogue (int sibcall)
+ 	  par = rs6000_make_savres_rtx (info, gen_rtx_REG (Pmode, 11),
+ 					0, reg_mode,
+ 					/*savep=*/false, /*gpr=*/true,
+-					/*exitp=*/true);
++					/*lr=*/true);
+ 	  emit_jump_insn (par);
+ 	  /* We don't want anybody else emitting things after we jumped
+ 	     back.  */
+@@ -19558,21 +19701,25 @@ rs6000_emit_epilogue (int sibcall)
+ 	rs6000_emit_stack_reset (info, sp_reg_rtx, frame_reg_rtx,
+ 				 sp_offset, can_use_exit);
+       else
+-	emit_insn (gen_addsi3 (gen_rtx_REG (Pmode, 11),
+-			       sp_reg_rtx,
+-			       GEN_INT (sp_offset - info->fp_size)));
++	{
++	  emit_insn (gen_add3_insn (gen_rtx_REG (Pmode, DEFAULT_ABI == ABI_AIX
++							? 12 : 11),
++				    frame_reg_rtx,
++				    GEN_INT (sp_offset - info->fp_size)));
++	  if (REGNO (frame_reg_rtx) == 11)
++	    sp_offset += info->fp_size;
++	}
+ 
+       par = rs6000_make_savres_rtx (info, frame_reg_rtx,
+ 				    info->gp_save_offset, reg_mode,
+ 				    /*savep=*/false, /*gpr=*/true,
+-				    /*exitp=*/can_use_exit);
++				    /*lr=*/can_use_exit);
+ 
+       if (can_use_exit)
+ 	{
+ 	  if (info->cr_save_p)
+ 	    {
+-	      rs6000_restore_saved_cr (gen_rtx_REG (SImode, 12),
+-				       using_mtcr_multiple);
++	      rs6000_restore_saved_cr (cr_save_reg, using_mtcr_multiple);
+ 	      if (DEFAULT_ABI == ABI_V4)
+ 		cfa_restores
+ 		  = alloc_reg_note (REG_CFA_RESTORE,
+@@ -19659,6 +19806,16 @@ rs6000_emit_epilogue (int sibcall)
            }
      }
  
 +  if (restore_lr && !restoring_GPRs_inline)
 +    {
 +      rtx mem = gen_frame_mem_offset (Pmode, frame_reg_rtx,
-+				      info->lr_save_offset + sp_offset);
++				     info->lr_save_offset + sp_offset);
 +
 +      emit_move_insn (gen_rtx_REG (Pmode, 0), mem);
++      emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
++		      gen_rtx_REG (Pmode, 0));
 +    }
 +
-+  if (restore_lr && !restoring_GPRs_inline)
-+    emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
-+		    gen_rtx_REG (Pmode, 0));
-+
    /* Restore fpr's if we need to do it without calling a function.  */
    if (restoring_FPRs_inline)
      for (i = 0; i < 64 - info->first_fp_reg_save; i++)
---- gcc/config/rs6000/rs6000.md.jj	2009-08-31 23:30:14.383526862 +0200
-+++ gcc/config/rs6000/rs6000.md	2009-09-09 21:03:19.667779689 +0200
-@@ -15289,9 +15289,9 @@
-   [(match_parallel 0 "any_parallel_operand"
- 		   [(clobber (reg:P 65))
- 		    (use (match_operand:P 1 "symbol_ref_operand" "s"))
--                    (use (match_operand:P 2 "gpc_reg_operand" "r"))
--		    (set (match_operand:P 3 "memory_operand" "=m")
--			 (match_operand:P 4 "gpc_reg_operand" "r"))])]
-+		    (use (reg:P 11))
-+		    (set (match_operand:P 2 "memory_operand" "=m")
-+			 (match_operand:P 3 "gpc_reg_operand" "r"))])]
-   ""
-   "bl %z1"
-   [(set_attr "type" "branch")
-@@ -15301,9 +15301,9 @@
-   [(match_parallel 0 "any_parallel_operand"
- 		   [(clobber (reg:P 65))
- 		    (use (match_operand:P 1 "symbol_ref_operand" "s"))
--                    (use (match_operand:P 2 "gpc_reg_operand" "r"))
--		    (set (match_operand:DF 3 "memory_operand" "=m")
--			 (match_operand:DF 4 "gpc_reg_operand" "f"))])]
-+		    (use (reg:P 11))
-+		    (set (match_operand:DF 2 "memory_operand" "=m")
-+			 (match_operand:DF 3 "gpc_reg_operand" "f"))])]
-   ""
-   "bl %z1"
-   [(set_attr "type" "branch")
-@@ -15394,11 +15394,11 @@
+@@ -19685,7 +19842,7 @@ rs6000_emit_epilogue (int sibcall)
+   /* If we saved cr, restore it here.  Just those that were used.  */
+   if (info->cr_save_p)
+     {
+-      rs6000_restore_saved_cr (gen_rtx_REG (SImode, 12), using_mtcr_multiple);
++      rs6000_restore_saved_cr (cr_save_reg, using_mtcr_multiple);
+       if (DEFAULT_ABI == ABI_V4)
+ 	cfa_restores
+ 	  = alloc_reg_note (REG_CFA_RESTORE, gen_rtx_REG (SImode, CR2_REGNO),
+@@ -19716,13 +19873,14 @@ rs6000_emit_epilogue (int sibcall)
+   if (!sibcall)
+     {
+       rtvec p;
++      bool lr = (strategy & SAVRES_NOINLINE_FPRS_DOESNT_RESTORE_LR) == 0;
+       if (! restoring_FPRs_inline)
+ 	p = rtvec_alloc (4 + 64 - info->first_fp_reg_save);
+       else
+ 	p = rtvec_alloc (2);
  
- (define_insn "*restore_gpregs_<mode>"
-  [(match_parallel 0 "any_parallel_operand"
--                  [(clobber (match_operand:P 1 "register_operand" "=l"))
--                   (use (match_operand:P 2 "symbol_ref_operand" "s"))
--                   (use (match_operand:P 3 "gpc_reg_operand" "r"))
--		   (set (match_operand:P 4 "gpc_reg_operand" "=r")
--			(match_operand:P 5 "memory_operand" "m"))])]
-+		  [(clobber (match_operand:P 1 "register_operand" "=l"))
-+		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
-+		   (use (reg:P 11))
-+		   (set (match_operand:P 3 "gpc_reg_operand" "=r")
-+			(match_operand:P 4 "memory_operand" "m"))])]
-  ""
-  "bl %z2"
+       RTVEC_ELT (p, 0) = gen_rtx_RETURN (VOIDmode);
+-      RTVEC_ELT (p, 1) = (restoring_FPRs_inline
++      RTVEC_ELT (p, 1) = ((restoring_FPRs_inline || !lr)
+ 			  ? gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, 65))
+ 			  : gen_rtx_CLOBBER (VOIDmode,
+ 					     gen_rtx_REG (Pmode, 65)));
+@@ -19737,10 +19895,12 @@ rs6000_emit_epilogue (int sibcall)
+ 	  sym = rs6000_savres_routine_sym (info,
+ 					   /*savep=*/false,
+ 					   /*gpr=*/false,
+-					   /*exitp=*/true);
++					   /*lr=*/lr);
+ 	  RTVEC_ELT (p, 2) = gen_rtx_USE (VOIDmode, sym);
+ 	  RTVEC_ELT (p, 3) = gen_rtx_USE (VOIDmode,
+-					  gen_rtx_REG (Pmode, 11));
++					  gen_rtx_REG (Pmode,
++						       DEFAULT_ABI == ABI_AIX
++						       ? 1 : 11));
+ 	  for (i = 0; i < 64 - info->first_fp_reg_save; i++)
+ 	    {
+ 	      rtx addr, mem;
+--- gcc/config/rs6000/rs6000.md	(revision 151728)
++++ gcc/config/rs6000/rs6000.md	(revision 151729)
+@@ -15436,6 +15436,19 @@ (define_insn "*return_and_restore_fpregs
   [(set_attr "type" "branch")
-@@ -15406,12 +15406,12 @@
+   (set_attr "length" "4")])
  
- (define_insn "*return_and_restore_gpregs_<mode>"
-  [(match_parallel 0 "any_parallel_operand"
--                  [(return)
++(define_insn "*return_and_restore_fpregs_aix_<mode>"
++ [(match_parallel 0 "any_parallel_operand"
 +		  [(return)
- 		   (clobber (match_operand:P 1 "register_operand" "=l"))
- 		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
--                   (use (match_operand:P 3 "gpc_reg_operand" "r"))
--		   (set (match_operand:P 4 "gpc_reg_operand" "=r")
--			(match_operand:P 5 "memory_operand" "m"))])]
-+		   (use (reg:P 11))
-+		   (set (match_operand:P 3 "gpc_reg_operand" "=r")
-+			(match_operand:P 4 "memory_operand" "m"))])]
-  ""
-  "b %z2"
-  [(set_attr "type" "branch")
-@@ -15419,12 +15419,12 @@
++		   (use (match_operand:P 1 "register_operand" "l"))
++		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
++		   (use (match_operand:P 3 "gpc_reg_operand" "r"))
++		   (set (match_operand:DF 4 "gpc_reg_operand" "=d")
++			(match_operand:DF 5 "memory_operand" "m"))])]
++ ""
++ "b %z2"
++ [(set_attr "type" "branch")
++  (set_attr "length" "4")])
++
+ ; This is used in compiling the unwind routines.
+ (define_expand "eh_return"
+   [(use (match_operand 0 "general_operand" ""))]
+--- gcc/config/rs6000/sysv4.h	(revision 151728)
++++ gcc/config/rs6000/sysv4.h	(revision 151729)
+@@ -272,27 +272,25 @@ do {									\
+ #endif
  
- (define_insn "*return_and_restore_fpregs_<mode>"
-  [(match_parallel 0 "any_parallel_operand"
--                  [(return)
-+		  [(return)
- 		   (clobber (match_operand:P 1 "register_operand" "=l"))
- 		   (use (match_operand:P 2 "symbol_ref_operand" "s"))
--                   (use (match_operand:P 3 "gpc_reg_operand" "r"))
--		   (set (match_operand:DF 4 "gpc_reg_operand" "=f")
--			(match_operand:DF 5 "memory_operand" "m"))])]
-+		   (use (reg:P 11))
-+		   (set (match_operand:DF 3 "gpc_reg_operand" "=f")
-+			(match_operand:DF 4 "memory_operand" "m"))])]
-  ""
-  "b %z2"
-  [(set_attr "type" "branch")
+ /* Define cutoff for using external functions to save floating point.
+-   Currently on 64-bit V.4, always use inline stores.  When optimizing
+-   for size on 32-bit targets, use external functions when
+-   profitable.  */
+-#define FP_SAVE_INLINE(FIRST_REG) (optimize_size && !TARGET_64BIT	\
++   When optimizing for size, use external functions when profitable.  */
++#define FP_SAVE_INLINE(FIRST_REG) (optimize_size			\
+ 				   ? ((FIRST_REG) == 62			\
+ 				      || (FIRST_REG) == 63)		\
+ 				   : (FIRST_REG) < 64)
+ /* And similarly for general purpose registers.  */
+ #define GP_SAVE_INLINE(FIRST_REG) ((FIRST_REG) < 32	\
+-				   && (TARGET_64BIT || !optimize_size))
++				   && !optimize_size)
+ 
+ /* Put jump tables in read-only memory, rather than in .text.  */
+ #define JUMP_TABLES_IN_TEXT_SECTION 0
+ 
+ /* Prefix and suffix to use to saving floating point.  */
+ #define	SAVE_FP_PREFIX "_savefpr_"
+-#define SAVE_FP_SUFFIX (TARGET_64BIT ? "_l" : "")
++#define SAVE_FP_SUFFIX ""
+ 
+ /* Prefix and suffix to use to restoring floating point.  */
+ #define	RESTORE_FP_PREFIX "_restfpr_"
+-#define RESTORE_FP_SUFFIX (TARGET_64BIT ? "_l" : "")
++#define RESTORE_FP_SUFFIX ""
+ 
+ /* Type used for ptrdiff_t, as a string used in a declaration.  */
+ #define PTRDIFF_TYPE "int"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- sources	11 Sep 2009 09:52:13 -0000	1.295
+++ sources	16 Sep 2009 13:27:06 -0000	1.296
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-36739b78d9654be37ccf6019e72db459  gcc-4.4.1-20090911.tar.bz2
+921813722475a64597078d02577eda9c  gcc-4.4.1-20090916.tar.bz2


--- gcc44-pr41175-2.patch DELETED ---



From tmraz at fedoraproject.org  Wed Sep 16 13:27:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 13:27:23 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.11,1.12
Message-ID: <20090916132723.AC89F11C00EC@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11729

Modified Files:
	nufw.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-6
- Use password-auth common PAM configuration instead of system-auth
- Fix wrong owner on cert and key .pem files



Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nufw.spec	16 Sep 2009 13:18:52 -0000	1.11
+++ nufw.spec	16 Sep 2009 13:27:22 -0000	1.12
@@ -263,13 +263,13 @@ fi
 %{_initrddir}/nufw
 %config(noreplace) %{_sysconfdir}/sysconfig/nufw
 %dir %{_sysconfdir}/nufw/
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/NuFW-cacert.pem
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/nufw-cert.pem
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/nufw-key.pem
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/user at nufw.org-cert.pem
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/user at nufw.org-key.pem
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/admin at nufw.org-cert.pem
-%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/admin at nufw.org-key.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/NuFW-cacert.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/nufw-cert.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/nufw-key.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/user at nufw.org-cert.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/user at nufw.org-key.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/admin at nufw.org-cert.pem
+%config(noreplace) %attr(0600, root, root) %{_sysconfdir}/%{name}/admin at nufw.org-key.pem
 
 %files utils
 %defattr(-, root, root, -)
@@ -355,13 +355,14 @@ fi
 %{_mandir}/man1/nutcpc.1*
 
 %files -n python-nufw
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{python_sitelib}/*egg-info
 %{python_sitelib}/nuclient/*
 
 %changelog
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-6
 - Use password-auth common PAM configuration instead of system-auth
+- Fix wrong owner on cert and key .pem files
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-5
 - rebuilt with new openssl



From tmraz at fedoraproject.org  Wed Sep 16 13:32:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 13:32:53 +0000 (UTC)
Subject: rpms/postfix/devel postfix-pam.conf,1.2,1.3 postfix.spec,1.77,1.78
Message-ID: <20090916133253.AD78F11C0332@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14511

Modified Files:
	postfix-pam.conf postfix.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.6.5-2
- use password-auth common PAM configuration instead of system-auth



Index: postfix-pam.conf
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix-pam.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- postfix-pam.conf	7 Oct 2005 14:01:11 -0000	1.2
+++ postfix-pam.conf	16 Sep 2009 13:32:50 -0000	1.3
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
+auth       include	password-auth
+account    include	password-auth


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- postfix.spec	1 Sep 2009 13:17:38 -0000	1.77
+++ postfix.spec	16 Sep 2009 13:32:50 -0000	1.78
@@ -40,7 +40,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -495,6 +495,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.6.5-2
+- use password-auth common PAM configuration instead of system-auth
+
 * Tue Sep 01 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.6.5-1
 - update to 2.6.5
 



From rdieter at fedoraproject.org  Wed Sep 16 13:41:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 13:41:55 +0000 (UTC)
Subject: rpms/openslp/EL-5 openslp-1.2.1-nullauth.patch, NONE,
	1.1 openslp.spec, 1.15, 1.16
Message-ID: <20090916134155.B704311C0336@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/openslp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19292

Modified Files:
	openslp.spec 
Added Files:
	openslp-1.2.1-nullauth.patch 
Log Message:
* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)


openslp-1.2.1-nullauth.patch:
 slpd_log.c |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE openslp-1.2.1-nullauth.patch ---
diff -up openslp-1.2.1/slpd/slpd_log.c.orig openslp-1.2.1/slpd/slpd_log.c
--- openslp-1.2.1/slpd/slpd_log.c.orig	2005-02-08 05:34:31.000000000 +0000
+++ openslp-1.2.1/slpd/slpd_log.c	2009-09-15 19:39:23.000000000 +0100
@@ -179,7 +179,8 @@ void SLPDLogBuffer(const char* prefix, i
     if (G_SlpdLogFile)
     {
         fprintf(G_SlpdLogFile,"%s",prefix);
-        fwrite(buf,bufsize,1,G_SlpdLogFile);
+        if (buf && (bufsize > 0))
+            fwrite(buf,bufsize,1,G_SlpdLogFile);
         fprintf(G_SlpdLogFile,"\n");
         fflush(G_SlpdLogFile);
     }
@@ -275,7 +276,21 @@ void SLPDLogSrvTypeRqstMessage(SLPSrvTyp
 /*-------------------------------------------------------------------------*/
 {
     SLPDLog("Message SRVTYPERQST:\n");
-    SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+
+    if (srvtyperqst->namingauthlen == 0xffff)
+    {
+        /* Naming authority matches all */
+        SLPDLog("   namingauth = (all)\n");
+    }
+    else if (srvtyperqst->namingauthlen == 0)
+    {
+        SLPDLog("   namingauth = (empty)\n");
+    }
+    else
+    {
+        /* Naming authority has been provided */
+        SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+    }
     SLPDLogBuffer("   scope = ", srvtyperqst->scopelistlen, srvtyperqst->scopelist);
 }
 


Index: openslp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslp/EL-5/openslp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- openslp.spec	29 Aug 2006 18:00:20 -0000	1.15
+++ openslp.spec	16 Sep 2009 13:41:54 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 6%{?dist}
+Release: 14%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -11,10 +11,13 @@ Source:  http://dl.sourceforge.net/sourc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: slpd.init
+
 Patch1:  openslp-1.2.1-optflags.patch
+# slpd crashes if slptool findsrvtypes is run, when message logging is on
+# http://bugzilla.redhat.com/523609
+Patch2:  openslp-1.2.1-nullauth.patch
 
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex 
 BuildRequires: openssl-devel
@@ -31,7 +34,7 @@ by RFC 2608 and RFC 2614.
 %package devel
 Summary: OpenSLP headers and libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 OpenSLP header files and libraries.
 
@@ -50,12 +53,14 @@ OpenSLP server daemon to dynamically reg
 %setup -q
 
 %patch1 -p1 -b .optflags
+%patch2 -p1 -b .nullauth
 
 # tarball goof (?), it wants to re-automake anyway, so let's do it right.
-libtoolize --force
-aclocal
-autoconf
-automake --add-missing
+#libtoolize --force
+#aclocal
+#autoconf
+#automake --add-missing
+autoreconf -f -i
 
 # remove CVS leftovers...
 find . -name "CVS" | xargs rm -rf
@@ -118,15 +123,15 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
 %config(noreplace) %{_sysconfdir}/slp.conf
-%{_bindir}/*
-%{_libdir}/lib*.so.*
+%{_bindir}/slptool
+%{_libdir}/libslp.so.1*
 
 %files server
 %defattr(-,root,root)
 %doc doc/html/IntroductionToSLP
 %doc doc/html/UsersGuide
 %doc doc/html/faq*
-%{_sbindir}/*
+%{_sbindir}/slpd
 %config(noreplace) %{_sysconfdir}/slp.reg
 %config(noreplace) %{_sysconfdir}/slp.spi
 %config(noreplace) %{_initrddir}/slpd
@@ -135,11 +140,35 @@ fi
 %defattr(-,root,root)
 %doc doc/html/ProgrammersGuide
 %doc doc/rfc
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/slp.h
+%{_libdir}/libslp.so
 
 
 %changelog
+* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
+- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-13
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-10
+- rebuild with new openssl
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.1-9
+- Autorebuild for GCC 4.3
+
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.1-8
+- respin for openssl
+
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.1-7
+- respin (buildID)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.1-6
 - fc6 respin
 



From mauelsha at fedoraproject.org  Wed Sep 16 13:46:05 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 13:46:05 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.102,1.103
Message-ID: <20090916134605.3B59711C0099@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21510

Modified Files:
	dmraid.spec 
Log Message:
typo


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- dmraid.spec	16 Sep 2009 13:25:04 -0000	1.102
+++ dmraid.spec	16 Sep 2009 13:46:03 -0000	1.103
@@ -13,7 +13,7 @@ Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
-Requires: device-mapper-devel>= 1.02.02-2
+Requires: device-mapper >= 1.02.02-2
 Requires: dmraid-events kpartx
 Requires: dmraid-events kpartx
 Requires(postun): ldconfig



From simo at fedoraproject.org  Wed Sep 16 13:59:23 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 16 Sep 2009 13:59:23 +0000 (UTC)
Subject: rpms/libtalloc/devel libtalloc.spec,1.5,1.6
Message-ID: <20090916135923.A3A1F11C0099@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtalloc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29652

Modified Files:
	libtalloc.spec 
Log Message:
fix configure line for future releases



Index: libtalloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/libtalloc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libtalloc.spec	8 Sep 2009 20:04:31 -0000	1.5
+++ libtalloc.spec	16 Sep 2009 13:59:21 -0000	1.6
@@ -28,7 +28,7 @@ Header files needed to develop programs 
 
 %build
 ./autogen.sh
-%configure --prefix=%{_usr} --enable-talloc-compat1
+%configure --enable-talloc-compat1
 make %{?_smp_mflags}
 
 %install



From jzeleny at fedoraproject.org  Wed Sep 16 14:06:38 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed, 16 Sep 2009 14:06:38 +0000 (UTC)
Subject: rpms/openldap/devel ldap.init,1.32,1.33 openldap.spec,1.147,1.148
Message-ID: <20090916140638.23BD511C0099@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1082

Modified Files:
	ldap.init openldap.spec 
Log Message:
updated init script to be LSB-compliant (#523434)


Index: ldap.init
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/ldap.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ldap.init	9 Jun 2009 11:43:35 -0000	1.32
+++ ldap.init	16 Sep 2009 14:06:36 -0000	1.33
@@ -8,10 +8,10 @@
 #              for implementing the industry standard directory services.
 # processname: slapd
 # config: /etc/openldap/slapd.conf
-# pidfile: /var/run/openldap/slapd.pid
+# pidfile: /var/run/slapd.pid
 
 ### BEGIN INIT INFO
-# Provides: ldap
+# Provides: slapd
 # Required-Start: $network $local_fs
 # Required-Stop: $network $local_fs 
 # Should-Start: 
@@ -41,9 +41,10 @@ fi
 
 slapd=/usr/sbin/slapd
 slaptest=/usr/sbin/slaptest
-lockfile=/var/lock/subsys/ldap
+lockfile=/var/lock/subsys/slapd
 configfile=/etc/openldap/slapd.conf
-pidfile=/var/run/openldap/slapd.pid
+pidfile=/var/run/slapd.pid
+slapd_pidfile=/var/run/openldap/slapd.pid
 
 RETVAL=0
 
@@ -163,6 +164,7 @@ function configtest() {
 
 function start() {
 	[ -x $slapd ] || exit 5
+	[ `id -u` -eq 0 ] || exit 4
 	configtest
 	# Define a couple of local variables which we'll need. Maybe.
 	user=ldap
@@ -181,7 +183,10 @@ function start() {
 	echo -n $"Starting $prog: "
 	daemon --pidfile=$pidfile --check=$prog ${slapd} -h "\"$harg\"" -u ${user} $OPTIONS $SLAPD_OPTIONS 
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch $lockfile
+	if [ $RETVAL -eq 0 ]; then
+		touch $lockfile
+		ln $slapd_pidfile $pidfile
+	fi
 	echo
 	return $RETVAL
 }
@@ -189,10 +194,15 @@ function start() {
 function stop() {
 	# Stop daemons.
 	prog=`basename ${slapd}`
+	[ `id -u` -eq 0 ] || exit 4
 	echo -n $"Stopping $prog: "
-	killproc -p $pidfile -d $SLAPD_SHUTDOWN_TIMEOUT ${slapd}
+
+	# This will remove pid and args files from /var/run/openldap
+	killproc -p $slapd_pidfile -d $SLAPD_SHUTDOWN_TIMEOUT ${slapd}
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f $lockfile /var/run/slapd.args
+
+	# Now we want to remove lock file and hardlink of pid file
+	[ $RETVAL -eq 0 ] && rm -f $pidfile $lockfile
 	echo
 	return $RETVAL
 }
@@ -220,15 +230,17 @@ case "$1" in
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	if [ -f /var/lock/subsys/ldap ] ; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
+	status -p $pidfile ${slapd} || exit 0
+	stop
+	start
+	;;
+    usage)
+	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest|usage}"
+	RETVAL=0
 	;;
     *)
-	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest}"
-	RETVAL=2
+	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest|usage}"
+	RETVAL=3
 esac
 
 exit $RETVAL


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- openldap.spec	27 Aug 2009 07:46:45 -0000	1.147
+++ openldap.spec	16 Sep 2009 14:06:37 -0000	1.148
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -359,7 +359,7 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/ope
 
 # Install an init script for the servers.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 755 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ldap
+install -m 755 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/slapd
 
 # Install syconfig/ldap
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -561,7 +561,7 @@ fi
 %attr(0644,root,root) %doc DB_CONFIG.example
 %doc README.schema
 %ghost %config(noreplace) %{_sysconfdir}/pki/tls/certs/slapd.pem
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/ldap
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/slapd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf
 %attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ldap
@@ -606,6 +606,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Sep 16 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-6
+- updated init script to be LSB-compliant (#523434)
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-5
 - rebuilt with new openssl
 



From buc at fedoraproject.org  Wed Sep 16 14:06:57 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 16 Sep 2009 14:06:57 +0000 (UTC)
Subject: rpms/phpldapadmin/devel phpldapadmin-1.2.0.3-config.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 phpldapadmin.spec, 1.19, 1.20 sources,
	1.11, 1.12 phpldapadmin-1.1.0.5-config.patch, 1.1, NONE
Message-ID: <20090916140657.EDA2B11C0099@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1223

Modified Files:
	.cvsignore phpldapadmin.spec sources 
Added Files:
	phpldapadmin-1.2.0.3-config.patch 
Removed Files:
	phpldapadmin-1.1.0.5-config.patch 
Log Message:
Upgrade to 1.2.0.3


phpldapadmin-1.2.0.3-config.patch:
 config.php |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE phpldapadmin-1.2.0.3-config.patch ---
diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config/config.php
--- phpldapadmin-1.2.0.3/config/config.php	2009-09-16 17:50:36.000000000 +0400
+++ phpldapadmin-1.2.0.3-OK/config/config.php	2009-09-16 17:48:19.000000000 +0400
@@ -72,6 +72,11 @@
    30 seconds or the setting of max_exection_time if this is null. */
 // $config->custom->session['timelimit'] = 30;
 
+// $config->custom->appearance['show_clear_password'] = false;
+
+// $config->custom->search['size_limit'] = 50;
+#  $config->custom->search['size_limit'] = 1000;
+
 /* Our local timezone
    This is to make sure that when we ask the system for the current time, we
    get the right local time. If this is not set, all time() calculations will
@@ -265,7 +270,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$servers->setValue('server','name','My LDAP Server');
+$servers->setValue('server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -359,6 +364,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $servers->setValue('appearance','password_hash','md5');
+$servers->setValue('appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -368,6 +374,7 @@
    your LDAP server requires you to login to perform searches, you can enter the
    DN to use when searching in 'bind_id' and 'bind_pass' above.
 // $servers->setValue('login','attr','dn');
+$servers->setValue('login','attr','uid');
 
 /* Base DNs to used for logins. If this value is not set, then the LDAP server
    Base DNs are used. */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Apr 2009 14:39:56 -0000	1.10
+++ .cvsignore	16 Sep 2009 14:06:56 -0000	1.11
@@ -1 +1 @@
-phpldapadmin-1.1.0.7.tar.gz
+phpldapadmin-1.2.0.3.tgz


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- phpldapadmin.spec	26 Jul 2009 18:39:45 -0000	1.19
+++ phpldapadmin.spec	16 Sep 2009 14:06:56 -0000	1.20
@@ -1,16 +1,16 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.1.0.7
-Release: 2%{?dist}
+Version: 1.2.0.3
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
-Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
-Patch0: phpldapadmin-1.1.0.5-config.patch
+Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tgz
+Patch0: phpldapadmin-1.2.0.3-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: httpd, php >= 5.0.6, php-ldap
+Requires: webserver, php >= 5.0.6, php-ldap
 
 
 %description
@@ -41,7 +41,7 @@ cp config/config.php.example config/conf
 
 %build
 
-find . \( -name "*.orig" -o -name "*~" -o -name .cvsignore \) -print0 | \
+find . \( -name "*.orig" -o -name "*~" -o -name .gitignore \) -print0 | \
 								xargs -0 rm -f
 find . -type f -print0 | xargs -0 chmod -x
 
@@ -115,6 +115,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.0.3-1
+- Upgrade to 1.2.0.3 (#523477)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Apr 2009 14:39:56 -0000	1.11
+++ sources	16 Sep 2009 14:06:56 -0000	1.12
@@ -1 +1 @@
-a9129f81b347e98c2b31552d1adc4b51  phpldapadmin-1.1.0.7.tar.gz
+e77738540208d733ba6d44dd752bea5f  phpldapadmin-1.2.0.3.tgz


--- phpldapadmin-1.1.0.5-config.patch DELETED ---



From jakub at fedoraproject.org  Wed Sep 16 14:15:16 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 16 Sep 2009 14:15:16 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec, 1.70, 1.71 gcc44-pr41175.patch, 1.2,
	1.3 gcc44-rh522577.patch, 1.1, NONE
Message-ID: <20090916141516.3E8C211C0099@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5714

Modified Files:
	gcc.spec gcc44-pr41175.patch 
Removed Files:
	gcc44-rh522577.patch 
Log Message:
4.4.1-14


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- gcc.spec	16 Sep 2009 13:27:05 -0000	1.70
+++ gcc.spec	16 Sep 2009 14:15:14 -0000	1.71
@@ -163,7 +163,6 @@ Patch19: gcc44-vta-cfgexpand-ptr-mode-pr
 Patch20: gcc44-powerpc-libgcc_s_so.patch
 Patch21: gcc44-pr41175.patch
 Patch22: gcc44-rh518303.patch
-Patch23: gcc44-rh522577.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -473,7 +472,6 @@ which are required to compile with the G
 %patch20 -p0 -b .powerpc-libgcc_s_so~
 %patch21 -p0 -b .pr41175~
 %patch22 -p0 -b .rh518303~
-%patch23 -p0 -b .rh522577~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*

gcc44-pr41175.patch:
 config/rs6000/linux64.h                |    4 
 config/rs6000/rs6000.c                 |  330 +++++++++++++++++------
 config/rs6000/rs6000.md                |   13 
 config/rs6000/spe.md                   |   18 -
 config/rs6000/sysv4.h                  |   12 
 testsuite/gcc.target/powerpc/pr41175.c |  461 +++++++++++++++++++++++++++++++++
 6 files changed, 735 insertions(+), 103 deletions(-)

Index: gcc44-pr41175.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr41175.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcc44-pr41175.patch	16 Sep 2009 13:27:05 -0000	1.2
+++ gcc44-pr41175.patch	16 Sep 2009 14:15:14 -0000	1.3
@@ -571,7 +571,7 @@
  #undef  PREFERRED_DEBUGGING_TYPE
 --- gcc/config/rs6000/rs6000.c	(revision 151728)
 +++ gcc/config/rs6000/rs6000.c	(revision 151729)
-@@ -18033,7 +18033,8 @@ static bool
+@@ -17980,7 +17980,8 @@ static bool
  no_global_regs_above (int first, bool gpr)
  {
    int i;
@@ -581,7 +581,7 @@
      if (global_regs[i])
        return false;
    return true;
-@@ -18050,54 +18051,136 @@ no_global_regs_above (int first, bool gp
+@@ -17997,54 +17998,136 @@ no_global_regs_above (int first, bool gp
  
  static GTY(()) rtx savres_routine_syms[N_SAVRES_REGISTERS][8];
  
@@ -748,9 +748,9 @@
      }
  
    return sym;
-@@ -18124,8 +18207,11 @@ rs6000_emit_stack_reset (rs6000_stack_t 
-   if (frame_reg_rtx != sp_reg_rtx)
+@@ -18072,8 +18155,11 @@ rs6000_emit_stack_reset (rs6000_stack_t 
      {
+       rs6000_emit_stack_tie ();
        if (sp_offset != 0)
 -	return emit_insn (gen_addsi3 (sp_reg_rtx, frame_reg_rtx,
 -				      GEN_INT (sp_offset)));
@@ -762,7 +762,7 @@
        else if (!savres)
  	return emit_move_insn (sp_reg_rtx, frame_reg_rtx);
      }
-@@ -18154,7 +18240,7 @@ static rtx
+@@ -18102,7 +18188,7 @@ static rtx
  rs6000_make_savres_rtx (rs6000_stack_t *info,
  			rtx frame_reg_rtx, int save_area_offset,
  			enum machine_mode reg_mode,
@@ -771,7 +771,7 @@
  {
    int i;
    int offset, start_reg, end_reg, n_regs;
-@@ -18168,20 +18254,21 @@ rs6000_make_savres_rtx (rs6000_stack_t *
+@@ -18116,20 +18202,21 @@ rs6000_make_savres_rtx (rs6000_stack_t *
  	       : info->first_fp_reg_save);
    end_reg = gpr ? 32 : 64;
    n_regs = end_reg - start_reg;
@@ -800,7 +800,7 @@
  
    for (i = 0; i < end_reg - start_reg; i++)
      {
-@@ -18196,6 +18283,16 @@ rs6000_make_savres_rtx (rs6000_stack_t *
+@@ -18144,6 +18231,16 @@ rs6000_make_savres_rtx (rs6000_stack_t *
  					       savep ? reg : mem);
      }
  
@@ -817,7 +817,7 @@
    return gen_rtx_PARALLEL (VOIDmode, p);
  }
  
-@@ -18216,7 +18313,10 @@ rs6000_reg_live_or_pic_offset_p (int reg
+@@ -18164,7 +18261,10 @@ rs6000_reg_live_or_pic_offset_p (int reg
  enum {
    SAVRES_MULTIPLE = 0x1,
    SAVRES_INLINE_FPRS = 0x2,
@@ -829,7 +829,7 @@
  };
  
  /* Determine the strategy for savings/restoring registers.  */
-@@ -18231,6 +18331,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+@@ -18179,6 +18279,7 @@ rs6000_savres_strategy (rs6000_stack_t *
    bool savres_gprs_inline;
    bool noclobber_global_gprs
      = no_global_regs_above (info->first_gp_reg_save, /*gpr=*/true);
@@ -837,7 +837,7 @@
  
    using_multiple_p = (TARGET_MULTIPLE && ! TARGET_POWERPC64
  		      && (!TARGET_SPE_ABI
-@@ -18250,6 +18351,10 @@ rs6000_savres_strategy (rs6000_stack_t *
+@@ -18198,6 +18299,10 @@ rs6000_savres_strategy (rs6000_stack_t *
  			|| info->first_fp_reg_save == 64
  			|| !no_global_regs_above (info->first_fp_reg_save,
  						  /*gpr=*/false)
@@ -848,7 +848,7 @@
  			|| FP_SAVE_INLINE (info->first_fp_reg_save));
    savres_gprs_inline = (common
  			/* Saving CR interferes with the exit routines
-@@ -18287,9 +18392,22 @@ rs6000_savres_strategy (rs6000_stack_t *
+@@ -18235,9 +18340,22 @@ rs6000_savres_strategy (rs6000_stack_t *
  	savres_gprs_inline = savres_gprs_inline || using_multiple_p;
      }
  
@@ -874,7 +874,7 @@
  }
  
  /* Emit function prologue as insns.  */
-@@ -18311,7 +18429,7 @@ rs6000_emit_prologue (void)
+@@ -18259,7 +18377,7 @@ rs6000_emit_prologue (void)
    int using_store_multiple;
    int using_static_chain_p = (cfun->static_chain_decl != NULL_TREE
                                && df_regs_ever_live_p (STATIC_CHAIN_REGNUM)
@@ -883,7 +883,7 @@
    HOST_WIDE_INT sp_offset = 0;
  
    if (TARGET_FIX_AND_CONTINUE)
-@@ -18496,24 +18614,30 @@ rs6000_emit_prologue (void)
+@@ -18444,24 +18562,30 @@ rs6000_emit_prologue (void)
  			     gen_rtx_REG (Pmode, LR_REGNO));
        RTX_FRAME_RELATED_P (insn) = 1;
  
@@ -924,7 +924,7 @@
        insn = emit_insn (gen_movesi_from_cr (cr_save_rtx));
        RTX_FRAME_RELATED_P (insn) = 1;
        /* Now, there's no way that dwarf2out_frame_debug_expr is going
-@@ -18550,7 +18674,9 @@ rs6000_emit_prologue (void)
+@@ -18500,7 +18624,9 @@ rs6000_emit_prologue (void)
  				    info->fp_save_offset + sp_offset,
  				    DFmode,
  				    /*savep=*/true, /*gpr=*/false,
@@ -935,7 +935,7 @@
        insn = emit_insn (par);
        rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
  			    NULL_RTX, NULL_RTX);
-@@ -18646,7 +18772,7 @@ rs6000_emit_prologue (void)
+@@ -18596,7 +18722,7 @@ rs6000_emit_prologue (void)
  	  par = rs6000_make_savres_rtx (info, gen_rtx_REG (Pmode, 11),
  					0, reg_mode,
  					/*savep=*/true, /*gpr=*/true,
@@ -944,7 +944,7 @@
  	  insn = emit_insn (par);
  	  rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
  				NULL_RTX, NULL_RTX);
-@@ -18661,23 +18787,23 @@ rs6000_emit_prologue (void)
+@@ -18611,23 +18737,23 @@ rs6000_emit_prologue (void)
      {
        rtx par;
  
@@ -976,7 +976,7 @@
        insn = emit_insn (par);
        rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
  			    NULL_RTX, NULL_RTX);
-@@ -18954,9 +19080,18 @@ rs6000_output_function_prologue (FILE *f
+@@ -18907,9 +19033,18 @@ rs6000_output_function_prologue (FILE *f
       fp values.  */
    if (info->first_fp_reg_save < 64
        && !FP_SAVE_INLINE (info->first_fp_reg_save))
@@ -998,7 +998,7 @@
  
    /* Write .extern for AIX common mode routines, if needed.  */
    if (! TARGET_POWER && ! TARGET_POWERPC && ! common_mode_defined)
-@@ -19082,6 +19217,7 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19035,6 +19170,7 @@ rs6000_emit_epilogue (int sibcall)
    rtx frame_reg_rtx = sp_reg_rtx;
    rtx cfa_restores = NULL_RTX;
    rtx insn;
@@ -1006,7 +1006,7 @@
    enum machine_mode reg_mode = Pmode;
    int reg_size = TARGET_32BIT ? 4 : 8;
    int i;
-@@ -19115,8 +19251,10 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19068,8 +19204,10 @@ rs6000_emit_epilogue (int sibcall)
  				 || (cfun->calls_alloca
  				     && !frame_pointer_needed));
    restore_lr = (info->lr_save_p
@@ -1019,7 +1019,7 @@
  
    if (WORLD_SAVE_P (info))
      {
-@@ -19403,7 +19541,7 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19356,7 +19494,7 @@ rs6000_emit_epilogue (int sibcall)
  
    /* Get the old lr if we saved it.  If we are restoring registers
       out-of-line, then the out-of-line routines can do this for us.  */
@@ -1028,7 +1028,7 @@
      {
        rtx mem = gen_frame_mem_offset (Pmode, frame_reg_rtx,
  				      info->lr_save_offset + sp_offset);
-@@ -19418,12 +19556,17 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19371,12 +19509,17 @@ rs6000_emit_epilogue (int sibcall)
  			       GEN_INT (info->cr_save_offset + sp_offset));
        rtx mem = gen_frame_mem (SImode, addr);
  
@@ -1048,7 +1048,7 @@
      emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO),
  		    gen_rtx_REG (Pmode, 0));
  
-@@ -19540,7 +19683,7 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19493,7 +19636,7 @@ rs6000_emit_epilogue (int sibcall)
  	  par = rs6000_make_savres_rtx (info, gen_rtx_REG (Pmode, 11),
  					0, reg_mode,
  					/*savep=*/false, /*gpr=*/true,
@@ -1057,7 +1057,7 @@
  	  emit_jump_insn (par);
  	  /* We don't want anybody else emitting things after we jumped
  	     back.  */
-@@ -19558,21 +19701,25 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19511,21 +19654,25 @@ rs6000_emit_epilogue (int sibcall)
  	rs6000_emit_stack_reset (info, sp_reg_rtx, frame_reg_rtx,
  				 sp_offset, can_use_exit);
        else
@@ -1088,8 +1088,8 @@
 +	      rs6000_restore_saved_cr (cr_save_reg, using_mtcr_multiple);
  	      if (DEFAULT_ABI == ABI_V4)
  		cfa_restores
- 		  = alloc_reg_note (REG_CFA_RESTORE,
-@@ -19659,6 +19806,16 @@ rs6000_emit_epilogue (int sibcall)
+ 		  = alloc_EXPR_LIST (REG_CFA_RESTORE,
+@@ -19612,6 +19759,16 @@ rs6000_emit_epilogue (int sibcall)
            }
      }
  
@@ -1106,7 +1106,7 @@
    /* Restore fpr's if we need to do it without calling a function.  */
    if (restoring_FPRs_inline)
      for (i = 0; i < 64 - info->first_fp_reg_save; i++)
-@@ -19685,7 +19842,7 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19638,7 +19795,7 @@ rs6000_emit_epilogue (int sibcall)
    /* If we saved cr, restore it here.  Just those that were used.  */
    if (info->cr_save_p)
      {
@@ -1114,8 +1114,8 @@
 +      rs6000_restore_saved_cr (cr_save_reg, using_mtcr_multiple);
        if (DEFAULT_ABI == ABI_V4)
  	cfa_restores
- 	  = alloc_reg_note (REG_CFA_RESTORE, gen_rtx_REG (SImode, CR2_REGNO),
-@@ -19716,13 +19873,14 @@ rs6000_emit_epilogue (int sibcall)
+ 	  = alloc_EXPR_LIST (REG_CFA_RESTORE, gen_rtx_REG (SImode, CR2_REGNO),
+@@ -19669,13 +19826,14 @@ rs6000_emit_epilogue (int sibcall)
    if (!sibcall)
      {
        rtvec p;
@@ -1131,7 +1131,7 @@
  			  ? gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, 65))
  			  : gen_rtx_CLOBBER (VOIDmode,
  					     gen_rtx_REG (Pmode, 65)));
-@@ -19737,10 +19895,12 @@ rs6000_emit_epilogue (int sibcall)
+@@ -19690,10 +19848,12 @@ rs6000_emit_epilogue (int sibcall)
  	  sym = rs6000_savres_routine_sym (info,
  					   /*savep=*/false,
  					   /*gpr=*/false,


--- gcc44-rh522577.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 16 14:32:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 14:32:36 +0000 (UTC)
Subject: rpms/taglib-extras/F-10 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 taglib-extras.spec, 1.5, 1.6
Message-ID: <20090916143237.A1D2711C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15078

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
- taglib-extras-0.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 01:29:50 -0000	1.6
+++ .cvsignore	16 Sep 2009 14:32:32 -0000	1.7
@@ -1 +1 @@
-taglib-extras-0.1.6.tar.gz
+taglib-extras-0.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 01:29:51 -0000	1.6
+++ sources	16 Sep 2009 14:32:32 -0000	1.7
@@ -1 +1 @@
-706a82fe4c25606f731faf4c14b5edb0  taglib-extras-0.1.6.tar.gz
+09bf9c89d953a238b55ac74bf9db0be3  taglib-extras-0.1.7.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/taglib-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- taglib-extras.spec	4 Aug 2009 01:29:51 -0000	1.5
+++ taglib-extras.spec	16 Sep 2009 14:32:32 -0000	1.6
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.6
+Version:        0.1.7
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
+- taglib-extras-0.1.7
+
 * Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
 - taglib-extras-0.1.6
 



From rdieter at fedoraproject.org  Wed Sep 16 14:32:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 14:32:59 +0000 (UTC)
Subject: rpms/taglib-extras/F-11 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 taglib-extras.spec, 1.6, 1.7
Message-ID: <20090916143259.E1A1011C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15432

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
- taglib-extras-0.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 01:28:50 -0000	1.6
+++ .cvsignore	16 Sep 2009 14:32:56 -0000	1.7
@@ -1 +1 @@
-taglib-extras-0.1.6.tar.gz
+taglib-extras-0.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 01:28:51 -0000	1.6
+++ sources	16 Sep 2009 14:32:56 -0000	1.7
@@ -1 +1 @@
-706a82fe4c25606f731faf4c14b5edb0  taglib-extras-0.1.6.tar.gz
+09bf9c89d953a238b55ac74bf9db0be3  taglib-extras-0.1.7.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/taglib-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- taglib-extras.spec	4 Aug 2009 01:28:51 -0000	1.6
+++ taglib-extras.spec	16 Sep 2009 14:32:57 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.6
+Version:        0.1.7
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
+- taglib-extras-0.1.7
+
 * Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
 - taglib-extras-0.1.6
 



From kdudka at fedoraproject.org  Wed Sep 16 14:46:51 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 16 Sep 2009 14:46:51 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.6-poll.patch, 1.1, 1.2 curl.spec, 1.113,
	1.114
Message-ID: <20090916144651.6046911C0099@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23525

Modified Files:
	curl-7.19.6-poll.patch curl.spec 
Log Message:
- update polling patch to the latest upstream version

curl-7.19.6-poll.patch:
 ssh.c      |   30 +++++++++++++++++++++++++-----
 transfer.c |   26 ++++++++++++++------------
 urldata.h  |    3 ++-
 3 files changed, 41 insertions(+), 18 deletions(-)

Index: curl-7.19.6-poll.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl-7.19.6-poll.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- curl-7.19.6-poll.patch	2 Sep 2009 14:19:19 -0000	1.1
+++ curl-7.19.6-poll.patch	16 Sep 2009 14:46:46 -0000	1.2
@@ -1,7 +1,53 @@
 diff -rup curl-7.19.6.orig/lib/ssh.c curl-7.19.6/lib/ssh.c
 --- curl-7.19.6.orig/lib/ssh.c	2009-07-25 00:21:50.000000000 +0200
-+++ curl-7.19.6/lib/ssh.c	2009-09-02 15:43:13.337644271 +0200
-@@ -2235,10 +2235,10 @@ static int ssh_perform_getsock(const str
++++ curl-7.19.6/lib/ssh.c	2009-09-16 16:25:59.271054546 +0200
+@@ -1503,6 +1503,9 @@ static CURLcode ssh_statemach_act(struct
+     result = Curl_setup_transfer(conn, -1, -1, FALSE, NULL,
+                                  FIRSTSOCKET, NULL);
+ 
++    /* not set by Curl_setup_transfer to preserve keepon bits */
++    conn->sockfd = conn->writesockfd;
++
+     if(result) {
+       state(conn, SSH_SFTP_CLOSE);
+       sshc->actualcode = result;
+@@ -1914,6 +1917,12 @@ static CURLcode ssh_statemach_act(struct
+   else {
+     result = Curl_setup_transfer(conn, FIRSTSOCKET, data->req.size,
+                                  FALSE, NULL, -1, NULL);
++
++    /* not set by Curl_setup_transfer to preserve keepon bits */
++    conn->writesockfd = conn->sockfd;
++
++    /* FIXME: here should be explained why we need it to start the download */
++    conn->cselect_bits = CURL_CSELECT_IN;
+   }
+   if(result) {
+     state(conn, SSH_SFTP_CLOSE);
+@@ -2034,6 +2043,9 @@ static CURLcode ssh_statemach_act(struct
+     result = Curl_setup_transfer(conn, -1, data->req.size, FALSE, NULL,
+                                  FIRSTSOCKET, NULL);
+ 
++    /* not set by Curl_setup_transfer to preserve keepon bits */
++    conn->sockfd = conn->writesockfd;
++
+     if(result) {
+       state(conn, SSH_SCP_CHANNEL_FREE);
+       sshc->actualcode = result;
+@@ -2083,6 +2095,12 @@ static CURLcode ssh_statemach_act(struct
+     result = Curl_setup_transfer(conn, FIRSTSOCKET,
+                                  bytecount, FALSE, NULL, -1, NULL);
+ 
++    /* not set by Curl_setup_transfer to preserve keepon bits */
++    conn->writesockfd = conn->sockfd;
++
++    /* FIXME: here should be explained why we need it to start the download */
++    conn->cselect_bits = CURL_CSELECT_IN;
++
+     if(result) {
+       state(conn, SSH_SCP_CHANNEL_FREE);
+       sshc->actualcode = result;
+@@ -2235,10 +2253,10 @@ static int ssh_perform_getsock(const str
  
    sock[0] = conn->sock[FIRSTSOCKET];
  
@@ -14,7 +60,7 @@ diff -rup curl-7.19.6.orig/lib/ssh.c cur
      bitmap |= GETSOCK_WRITESOCK(FIRSTSOCKET);
  
    return bitmap;
-@@ -2282,15 +2282,17 @@ static void ssh_block2waitfor(struct con
+@@ -2282,15 +2300,17 @@ static void ssh_block2waitfor(struct con
  {
    struct ssh_conn *sshc = &conn->proto.sshc;
    int dir;
@@ -37,8 +83,19 @@ diff -rup curl-7.19.6.orig/lib/ssh.c cur
    /* no libssh2 directional support so we simply don't know */
 diff -rup curl-7.19.6.orig/lib/transfer.c curl-7.19.6/lib/transfer.c
 --- curl-7.19.6.orig/lib/transfer.c	2009-07-22 22:09:53.000000000 +0200
-+++ curl-7.19.6/lib/transfer.c	2009-09-02 15:43:13.338644150 +0200
-@@ -1884,33 +1884,46 @@ Transfer(struct connectdata *conn)
++++ curl-7.19.6/lib/transfer.c	2009-09-16 16:25:57.195363278 +0200
+@@ -1652,10 +1652,6 @@ CURLcode Curl_readwrite(struct connectda
+ 
+   if((k->keepon & KEEP_RECVBITS) == KEEP_RECV) {
+     fd_read = conn->sockfd;
+-#if defined(USE_LIBSSH2)
+-    if(conn->protocol & (PROT_SCP|PROT_SFTP))
+-      select_res |= CURL_CSELECT_IN;
+-#endif /* USE_LIBSSH2 */
+   } else
+     fd_read = CURL_SOCKET_BAD;
+ 
+@@ -1884,33 +1880,39 @@ Transfer(struct connectdata *conn)
      return CURLE_OK;
  
    while(!done) {
@@ -48,13 +105,6 @@ diff -rup curl-7.19.6.orig/lib/transfer.
 +    curl_socket_t fd_write = conn->writesockfd;
 +    int keepon = k->keepon;
 +
-+#if defined(USE_LIBSSH2)
-+    if(conn->protocol & (PROT_SCP|PROT_SFTP)) {
-+      fd_read = conn->sock[FIRSTSOCKET];
-+      fd_write = conn->sock[FIRSTSOCKET];
-+    }
-+#endif /* USE_LIBSSH2 */
-+
 +    if(conn->waitfor) {
 +      /* if waitfor is set, get the RECV and SEND bits from that but keep the
 +         other bits */
@@ -95,7 +145,7 @@ diff -rup curl-7.19.6.orig/lib/transfer.
  
 diff -rup curl-7.19.6.orig/lib/urldata.h curl-7.19.6/lib/urldata.h
 --- curl-7.19.6.orig/lib/urldata.h	2009-07-23 00:49:56.000000000 +0200
-+++ curl-7.19.6/lib/urldata.h	2009-09-02 15:43:13.339644227 +0200
++++ curl-7.19.6/lib/urldata.h	2009-09-16 16:25:57.196363391 +0200
 @@ -565,7 +565,6 @@ struct ssh_conn {
    LIBSSH2_CHANNEL *ssh_channel; /* Secure Shell channel handle */
    LIBSSH2_SFTP *sftp_session;   /* SFTP handle */


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- curl.spec	3 Sep 2009 17:17:55 -0000	1.113
+++ curl.spec	16 Sep 2009 14:46:47 -0000	1.114
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Sep 16 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-6
+- update polling patch to the latest upstream version
+
 * Thu Sep 03 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-5
 - cover ssh and stunnel support by the test-suite
 



From twaugh at fedoraproject.org  Wed Sep 16 14:47:11 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 16 Sep 2009 14:47:11 +0000 (UTC)
Subject: rpms/hplip/devel hplip-discovery-method.patch, NONE, 1.1 hplip.spec,
	1.235, 1.236
Message-ID: <20090916144711.821CE11C0099@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23839

Modified Files:
	hplip.spec 
Added Files:
	hplip-discovery-method.patch 
Log Message:
* Wed Sep 16 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
- Fixed hp-setup trace when discovery page is skipped (bug #523685).


hplip-discovery-method.patch:
 setupdialog.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE hplip-discovery-method.patch ---
diff -up hplip-3.9.8/ui4/setupdialog.py.discovery-method hplip-3.9.8/ui4/setupdialog.py
--- hplip-3.9.8/ui4/setupdialog.py.discovery-method	2009-08-04 22:37:22.000000000 +0100
+++ hplip-3.9.8/ui4/setupdialog.py	2009-09-16 15:34:36.509431266 +0100
@@ -171,6 +171,7 @@ class SetupDialog(QDialog, Ui_Dialog):
             QTimer.singleShot(0, self.showRemovePage)
         else:
             if self.skip_discovery:
+                self.discovery_method = 1 # mDNS
                 QTimer.singleShot(0, self.showDevicesPage)
             else:
                 QTimer.singleShot(0, self.showDiscoveryPage)


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- hplip.spec	28 Aug 2009 10:41:52 -0000	1.235
+++ hplip.spec	16 Sep 2009 14:47:10 -0000	1.236
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -22,6 +22,7 @@ Patch6: hplip-state-reasons-newline.patc
 Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
+Patch10: hplip-discovery-method.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -138,6 +139,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Set RequiresPageRegion in hpcups PPDs (bug #518756).
 %patch9 -p1 -b .requirespageregion
 
+# Fixed hp-setup trace when discovery page is skipped (bug #523685).
+%patch10 -p1 -b .discovery-method
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -341,6 +345,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Sep 16 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
+- Fixed hp-setup trace when discovery page is skipped (bug #523685).
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
 - Include missing base files.
 



From twaugh at fedoraproject.org  Wed Sep 16 15:09:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 16 Sep 2009 15:09:07 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.236,1.237
Message-ID: <20090916150907.530F111C00CF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3116

Modified Files:
	hplip.spec 
Log Message:
Fixed typo.


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- hplip.spec	16 Sep 2009 14:47:10 -0000	1.236
+++ hplip.spec	16 Sep 2009 15:09:05 -0000	1.237
@@ -139,7 +139,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Set RequiresPageRegion in hpcups PPDs (bug #518756).
 %patch9 -p1 -b .requirespageregion
 
-# Fixed hp-setup trace when discovery page is skipped (bug #523685).
+# Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
 %build
@@ -346,7 +346,7 @@ fi
 
 %changelog
 * Wed Sep 16 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
-- Fixed hp-setup trace when discovery page is skipped (bug #523685).
+- Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
 - Include missing base files.



From wtogami at fedoraproject.org  Wed Sep 16 15:23:10 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 16 Sep 2009 15:23:10 +0000 (UTC)
Subject: rpms/mkdst/devel .cvsignore, 1.9, 1.10 mkdst.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <20090916152311.2588C11C00CF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/mkdst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10438

Modified Files:
	.cvsignore mkdst.spec sources 
Log Message:
0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jan 2009 01:46:41 -0000	1.9
+++ .cvsignore	16 Sep 2009 15:23:08 -0000	1.10
@@ -1 +1 @@
-mkdst-0.11.tar.bz2
+mkdst-0.12.tar.bz2


Index: mkdst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/mkdst.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mkdst.spec	25 Jul 2009 14:36:00 -0000	1.14
+++ mkdst.spec	16 Sep 2009 15:23:09 -0000	1.15
@@ -1,8 +1,8 @@
 Name:           mkdst
-Version:        0.11
-%define _datestamp .20081208.19
-#Release:        1%{_datestamp}%{?dist}
-Release:        3%{?dist}
+Version:        0.12
+%define _datestamp .20090916.11
+#Release:        3%{_datestamp}%{?dist}
+Release:        1%{?dist}
 Summary:        Source repository to tarball release tool
 
 Group:          Development/Tools
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mkdst/
 
 %changelog
+* Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 0.12-1
+- 0.12
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Jan 2009 01:46:41 -0000	1.9
+++ sources	16 Sep 2009 15:23:09 -0000	1.10
@@ -1 +1 @@
-710d7a79c27c837a8dcde6138274169e  mkdst-0.11.tar.bz2
+206a1f98e602ccc2160921414574e4a6  mkdst-0.12.tar.bz2



From davej at fedoraproject.org  Wed Sep 16 15:33:44 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 16 Sep 2009 15:33:44 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6.31-cpufreq-powernow-k8-oops.patch, NONE, 
	1.1 kernel.spec, 1.1804, 1.1805
Message-ID: <20090916153344.A109911C00CF@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15819

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.31-cpufreq-powernow-k8-oops.patch 
Log Message:
Fix NULL deref in powernow-k8 driver. (korg #13780)

linux-2.6.31-cpufreq-powernow-k8-oops.patch:
 powernow-k8.c |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6.31-cpufreq-powernow-k8-oops.patch ---
--- vanilla-2.6.31/arch/x86/kernel/cpu/cpufreq/powernow-k8.c	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/arch/x86/kernel/cpu/cpufreq/powernow-k8.c	2009-09-16 11:27:33.000000000 -0400
@@ -605,9 +605,10 @@ static int check_pst_table(struct powern
 	return 0;
 }
 
-static void invalidate_entry(struct powernow_k8_data *data, unsigned int entry)
+static void invalidate_entry(struct cpufreq_frequency_table *powernow_table,
+		unsigned int entry)
 {
-	data->powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
+	powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
 }
 
 static void print_basics(struct powernow_k8_data *data)
@@ -914,13 +915,13 @@ static int fill_powernow_table_pstate(st
 					"bad value %d.\n", i, index);
 			printk(KERN_ERR PFX "Please report to BIOS "
 					"manufacturer\n");
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 		rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi);
 		if (!(hi & HW_PSTATE_VALID_MASK)) {
 			dprintk("invalid pstate %d, ignoring\n", index);
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 
@@ -970,7 +971,7 @@ static int fill_powernow_table_fidvid(st
 		/* verify frequency is OK */
 		if ((freq > (MAX_FREQ * 1000)) || (freq < (MIN_FREQ * 1000))) {
 			dprintk("invalid freq %u kHz, ignoring\n", freq);
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 
@@ -978,7 +979,7 @@ static int fill_powernow_table_fidvid(st
 		 * BIOSs are using "off" to indicate invalid */
 		if (vid == VID_OFF) {
 			dprintk("invalid vid %u, ignoring\n", vid);
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 
@@ -997,7 +998,7 @@ static int fill_powernow_table_fidvid(st
 
 				dprintk("double low frequency table entry, "
 						"ignoring it.\n");
-				invalidate_entry(data, i);
+				invalidate_entry(powernow_table, i);
 				continue;
 			} else
 				cntlofreq = i;
@@ -1009,7 +1010,7 @@ static int fill_powernow_table_fidvid(st
 				(unsigned int)
 				(data->acpi_data.states[i].core_frequency
 				 * 1000));
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1804
retrieving revision 1.1805
diff -u -p -r1.1804 -r1.1805
--- kernel.spec	16 Sep 2009 12:47:26 -0000	1.1804
+++ kernel.spec	16 Sep 2009 15:33:42 -0000	1.1805
@@ -674,6 +674,8 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
+Patch1000: linux-2.6.31-cpufreq-powernow-k8-oops.patch
+
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
@@ -1319,6 +1321,9 @@ ApplyPatch linux-2.6-crash-driver.patch
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
+# fix upstream bug #13780
+ApplyPatch linux-2.6.31-cpufreq-powernow-k8-oops.patch
+
 # http://www.lirc.org/
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
@@ -2044,7 +2049,10 @@ fi
 # and build.
 
 %changelog
-* Wed Sep 18 2009 Hans de Goede <hdegoede at redhat.com>
+* Wed Sep 16 2009 Dave Jones <davej at redhat.com>
+- Fix NULL deref in powernow-k8 driver. (korg #13780)
+
+* Wed Sep 16 2009 Hans de Goede <hdegoede at redhat.com>
 - Fix lockdep warning (and potential real deadlock) in mdraid10 code,
   requested for -stable, rh#515471
 



From jforbes at fedoraproject.org  Wed Sep 16 15:38:07 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Wed, 16 Sep 2009 15:38:07 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch, NONE,
	1.1 kernel.spec, 1.1736, 1.1737
Message-ID: <20090916153807.85F6211C00CF@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17539

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch 
Log Message:
Revert virtio_blk to rotational mode. (#509383)

linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch:
 virtio_blk.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch ---
Subject: [for-2.6.31] virtio_blk: revert QUEUE_FLAG_VIRT addition
Date: Fri, 04 Sep 2009 20:44:42 -0000
From: Christoph Hellwig <hch at lst.de>

It seems like the addition of QUEUE_FLAG_VIRT caueses major performance
regressions for Fedora users:

	https://bugzilla.redhat.com/show_bug.cgi?id=509383
	https://bugzilla.redhat.com/show_bug.cgi?id=505695

while I can't reproduce those extreme regressions myself I think the flag
is wrong.

Rationale:

  QUEUE_FLAG_VIRT expands to QUEUE_FLAG_NONROT which casus the queue
  unplugged immediately.  This is not a good behaviour for at least
  qemu and kvm where we do have significant overhead for every
  I/O operations.  Even with all the latested speeups (native AIO,
  MSI support, zero copy) we can only get native speed for up to 128kb
  I/O requests we already are down to 66% of native performance for 4kb
  requests even on my laptop running the Intel X25-M SSD for which the
  QUEUE_FLAG_NONROT was designed.
  If we ever get virtio-blk overhead low enough that this flag makes
  sense it should only be set based on a feature flag set by the host.
	
Signed-off-by: Christoph Hellwig <hch at lst.de>
Acked-by: Jeff Moyer <jmoyer at redhat.com>

---
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Index: linux-2.6/drivers/block/virtio_blk.c
===================================================================
--- linux-2.6.orig/drivers/block/virtio_blk.c	2009-09-04 17:33:48.802523987 -0300
+++ linux-2.6/drivers/block/virtio_blk.c	2009-09-04 17:33:56.186522158 -0300
@@ -249,7 +249,6 @@ static int __devinit virtblk_probe(struc
        goto out_mempool;
 	}
 
-	queue_flag_set_unlocked(QUEUE_FLAG_VIRT, vblk->disk->queue);
 
 	if (index < 26) {
 		sprintf(vblk->disk->disk_name, "vd%c", 'a' + index % 26);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1736
retrieving revision 1.1737
diff -u -p -r1.1736 -r1.1737
--- kernel.spec	15 Sep 2009 19:31:06 -0000	1.1736
+++ kernel.spec	16 Sep 2009 15:38:06 -0000	1.1737
@@ -656,6 +656,7 @@ Patch1000: linux-2.6-neigh_-fix-state-tr
 # Virt Patches
 Patch1200: linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
 Patch1201: linux-2.6-xen-clean-up-warnings.patch
+Patch1202: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 Patch1515: lirc-2.6.31.patch
 Patch1517: hid-ignore-all-recent-imon-devices.patch
@@ -1265,6 +1266,9 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 ApplyPatch linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
 ApplyPatch linux-2.6-xen-clean-up-warnings.patch
 
+# Misc Virt
+ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+
 # Misc fixes
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
@@ -1967,6 +1971,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 16 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.30.7-58
+- Revert virtio_blk to rotational mode. (#509383)
+
 * Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-57
 - Linux 2.6.30.7
 



From cweyl at fedoraproject.org  Wed Sep 16 15:40:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 16 Sep 2009 15:40:01 +0000 (UTC)
Subject: rpms/perl-namespace-autoclean/devel .cvsignore, 1.2,
	1.3 perl-namespace-autoclean.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090916154001.7B76711C048B@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-autoclean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18279

Modified Files:
	.cvsignore perl-namespace-autoclean.spec sources 
Log Message:
* Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- add %perl_default_filter'ing
- auto-update to 0.09 (by cpan-spec-update 0.01)
- added a new req on perl(B::Hooks::EndOfScope) (version 0.07)
- added a new req on perl(Class::MOP) (version 0.80)
- added a new req on perl(List::Util) (version 0)
- added a new req on perl(namespace::clean) (version 0.11)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jul 2009 06:05:39 -0000	1.2
+++ .cvsignore	16 Sep 2009 15:40:00 -0000	1.3
@@ -1 +1 @@
-namespace-autoclean-0.08.tar.gz
+namespace-autoclean-0.09.tar.gz


Index: perl-namespace-autoclean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/devel/perl-namespace-autoclean.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-namespace-autoclean.spec	26 Jul 2009 17:48:25 -0000	1.2
+++ perl-namespace-autoclean.spec	16 Sep 2009 15:40:01 -0000	1.3
@@ -1,12 +1,12 @@
-Name:       perl-namespace-autoclean 
-Version:    0.08 
-Release:    2%{?dist}
+Name:       perl-namespace-autoclean
+Version:    0.09
+Release:    1%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Keep imports out of your namespace 
-Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/namespace-autoclean-%{version}.tar.gz 
+Summary:    Keep imports out of your namespace
+Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/namespace-autoclean-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/namespace-autoclean
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -17,6 +17,14 @@ BuildRequires: perl(List::Util)
 BuildRequires: perl(namespace::clean) >= 0.11
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(B::Hooks::EndOfScope) >= 0.07
+Requires:       perl(Class::MOP) >= 0.80
+Requires:       perl(List::Util)
+Requires:       perl(namespace::clean) >= 0.11
+
+%{?perl_default_filter}
+
 %description
 When you import a function into a Perl package, it will naturally also
 be available as a method. The 'namespace::autoclean' pragma will remove
@@ -49,15 +57,23 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README 
+%doc Changes LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
+- add %perl_default_filter'ing
+- auto-update to 0.09 (by cpan-spec-update 0.01)
+- added a new req on perl(B::Hooks::EndOfScope) (version 0.07)
+- added a new req on perl(Class::MOP) (version 0.80)
+- added a new req on perl(List::Util) (version 0)
+- added a new req on perl(namespace::clean) (version 0.11)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -67,4 +83,3 @@ rm -rf %{buildroot} 
 * Wed Jul 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 06:05:40 -0000	1.2
+++ sources	16 Sep 2009 15:40:01 -0000	1.3
@@ -1 +1 @@
-b0d086797cdb060d23c0697605c39002  namespace-autoclean-0.08.tar.gz
+79241eb4929cdf6eecd6e5cc4c1ef2f8  namespace-autoclean-0.09.tar.gz



From hadess at fedoraproject.org  Wed Sep 16 15:41:05 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Sep 2009 15:41:05 +0000 (UTC)
Subject: rpms/gnome-media/devel
	0001-Avoid-crashing-when-switching-profiles-quickly.patch, NONE,
	1.1 gnome-media.spec, 1.178, 1.179
Message-ID: <20090916154105.785F211C00CF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18760

Modified Files:
	gnome-media.spec 
Added Files:
	0001-Avoid-crashing-when-switching-profiles-quickly.patch 
Log Message:
* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-2
- Fix crashing when profile changes happen quickly (#523669)


0001-Avoid-crashing-when-switching-profiles-quickly.patch:
 gvc-mixer-card.c |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE 0001-Avoid-crashing-when-switching-profiles-quickly.patch ---
>From a9e56981434d3c4f760243ce7f83b64ec487f442 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 16 Sep 2009 16:36:58 +0100
Subject: [PATCH] Avoid crashing when switching profiles quickly

When switching profiles quickly, we were getting callbacks
about old operations which we're not interested in, because
they don't match the latest requested profile.

So keep track of the last requested change, and cancel already
running operations when asking for a new profile.
---
 gnome-volume-control/src/gvc-mixer-card.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gnome-volume-control/src/gvc-mixer-card.c b/gnome-volume-control/src/gvc-mixer-card.c
index 9037ff2..dc4ccca 100644
--- a/gnome-volume-control/src/gvc-mixer-card.c
+++ b/gnome-volume-control/src/gvc-mixer-card.c
@@ -47,6 +47,7 @@ struct GvcMixerCardPrivate
         char          *target_profile;
         char          *human_profile;
         GList         *profiles;
+        pa_operation  *profile_op;
 };
 
 enum
@@ -209,6 +210,9 @@ _pa_context_set_card_profile_by_index_cb (pa_context                       *cont
         }
         g_free (card->priv->target_profile);
         card->priv->target_profile = NULL;
+
+        pa_operation_unref (card->priv->profile_op);
+        card->priv->profile_op = NULL;
 }
 
 gboolean
@@ -223,25 +227,26 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
                 return TRUE;
         if (g_strcmp0 (profile, card->priv->target_profile) == 0)
                 return TRUE;
+        if (card->priv->profile_op != NULL) {
+                pa_operation_cancel (card->priv->profile_op);
+                pa_operation_unref (card->priv->profile_op);
+                card->priv->profile_op = NULL;
+        }
 
         if (card->priv->profile != NULL) {
-                pa_operation *o;
-
                 g_free (card->priv->target_profile);
                 card->priv->target_profile = g_strdup (profile);
 
-                o = pa_context_set_card_profile_by_index (card->priv->pa_context,
-                                                          card->priv->index,
-                                                          card->priv->target_profile,
-                                                          _pa_context_set_card_profile_by_index_cb,
-                                                          card);
+                card->priv->profile_op = pa_context_set_card_profile_by_index (card->priv->pa_context,
+                                                                               card->priv->index,
+                                                                               card->priv->target_profile,
+                                                                               _pa_context_set_card_profile_by_index_cb,
+                                                                               card);
 
-                if (o == NULL) {
+                if (card->priv->profile_op == NULL) {
                         g_warning ("pa_context_set_card_profile_by_index() failed");
                         return FALSE;
                 }
-
-                pa_operation_unref (o);
         } else {
                 g_assert (card->priv->human_profile == NULL);
                 card->priv->profile = g_strdup (profile);
-- 
1.6.2.5



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- gnome-media.spec	7 Sep 2009 14:10:02 -0000	1.178
+++ gnome-media.spec	16 Sep 2009 15:41:05 -0000	1.179
@@ -14,10 +14,11 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.27.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.27/gnome-media-%{version}.tar.bz2
+Patch0:         0001-Avoid-crashing-when-switching-profiles-quickly.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -42,7 +43,6 @@ BuildRequires:  libcanberra-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
-BuildRequires:  automake autoconf libtool
 BuildRequires:  unique-devel
 
 %description
@@ -83,12 +83,11 @@ framework.
 
 %prep
 %setup -q
+%patch0 -p1 -b .profiles
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
 
-autoreconf -i -f
-
 %build
 # try to work around a problem where gst-inspect does
 # not find playbin the first time around
@@ -314,6 +313,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-2
+- Fix crashing when profile changes happen quickly (#523669)
+
 * Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
 - Update to 2.27.91
 



From simo at fedoraproject.org  Wed Sep 16 15:45:22 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 16 Sep 2009 15:45:22 +0000 (UTC)
Subject: rpms/samba4/devel samba4.spec,1.16,1.17
Message-ID: <20090916154522.D17C911C00EC@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21247

Modified Files:
	samba4.spec 
Log Message:
* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-16.alpha7
- Stop building libtevent, it is now an external package



Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- samba4.spec	27 Jul 2009 03:46:54 -0000	1.16
+++ samba4.spec	16 Sep 2009 15:45:22 -0000	1.17
@@ -1,4 +1,4 @@
-%define main_release 15.2
+%define main_release 16
 %define samba4_version 4.0.0
 
 %define talloc_version 1.3.0
@@ -27,7 +27,7 @@
 %define enable_winbind 0
 %define enable_talloc  0
 %define enable_tdb     0
-%define enable_tevent  1
+%define enable_tevent  0
 %define enable_ldb     1
 
 # Install libraries not needed by OpenChange.
@@ -42,7 +42,7 @@
 
 Name: samba4
 Version: %{samba4_version}
-Release: %{samba4_release}.1
+Release: %{samba4_release}
 Group: System Environment/Daemons
 Summary: The Samba4 CIFS and AD client and server suite
 License: GPLv3+ and LGPLv3+
@@ -839,6 +839,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-16.alpha7
+- Stop building libtevent, it is now an external package
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-15.2alpha7.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From simo at fedoraproject.org  Wed Sep 16 15:47:21 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 16 Sep 2009 15:47:21 +0000 (UTC)
Subject: rpms/libtalloc/F-11 libtalloc.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090916154721.55CA211C00CF@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtalloc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22024

Modified Files:
	libtalloc.spec sources 
Log Message:
* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 2.0.0-0
- New version from upstream.
- Build also sover 1 compat library to ease packages migration



Index: libtalloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/F-11/libtalloc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtalloc.spec	6 Jul 2009 13:33:06 -0000	1.1
+++ libtalloc.spec	16 Sep 2009 15:47:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name: libtalloc
-Version: 1.3.1
+Version: 2.0.0
 Release: 0%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
@@ -28,7 +28,7 @@ Header files needed to develop programs 
 
 %build
 ./autogen.sh
-%configure --prefix=%{_usr}
+%configure --enable-talloc-compat1
 make %{?_smp_mflags}
 
 %install
@@ -36,9 +36,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.2
 ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
 
+#Compatibility library
+ln -s libtalloc-compat1-2.0.0.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a
 rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
 
@@ -49,6 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libtalloc.so.*
+%{_libdir}/libtalloc-compat1-2.0.0.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -64,5 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 2.0.0-0
+- New version from upstream.
+- Build also sover 1 compat library to ease packages migration
+
+
 * Mon Jul  6 2009 Simo Sorce <ssorce at redhat.com> - 1.3.1-0
 Build talloc as a separate package in F-11 too.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jul 2009 13:33:06 -0000	1.2
+++ sources	16 Sep 2009 15:47:20 -0000	1.3
@@ -1 +1 @@
-f8969802759bde2598f4f93e84fd38c5  talloc-1.3.1.tar.gz
+edbaa660074c806a42a45b2f4569eed4  talloc-2.0.0.tar.gz



From simo at fedoraproject.org  Wed Sep 16 15:48:13 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 16 Sep 2009 15:48:13 +0000 (UTC)
Subject: rpms/libtevent/F-11 libtevent.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090916154813.94E6E11C00CF@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22385

Modified Files:
	sources 
Added Files:
	libtevent.spec 
Log Message:
* Sat Sep 8 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-1
- First independent release for tevent 0.9.8 



--- NEW FILE libtevent.spec ---
Name: libtevent
Version: 0.9.8
Release: 1%{?dist}
Group: System Environment/Daemons
Summary: The tevent library
License: LGPLv3+
URL: http://tevent.samba.org/
Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: libtalloc-devel >= 2.0.0

%description
Tevent is an event system based on the talloc memory management library.
Tevent has support for many event types, including timers, signals, and
the classic file descriptor events.
Tevent also provide helpers to deal with asynchronous code providing the
tevent_req (Tevent Request) functions. 

%package devel
Group: Development/Libraries
Summary: Developer tools for the Tevent library
Requires: libtevent = %{version}-%{release}
Requires: libtalloc-devel >= 2.0.0
Requires: pkgconfig

%description devel
Header files needed to develop programs that link against the Tevent library.

%prep
%setup -q -n tevent-%{version}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

ln -s libtevent.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so.0
ln -s libtevent.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so

rm -f $RPM_BUILD_ROOT%{_libdir}/libtevent.a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/libtevent.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/tevent.h
%{_libdir}/libtevent.so
%{_libdir}/pkgconfig/tevent.pc

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Sat Sep 8 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-1
- First independent release for tevent 0.9.8 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:00:23 -0000	1.1
+++ sources	16 Sep 2009 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+edc29f20fb508b6b860d70f0f07ccd3f  tevent-0.9.8.tar.gz



From hadess at fedoraproject.org  Wed Sep 16 15:56:19 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Sep 2009 15:56:19 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.179,1.180
Message-ID: <20090916155620.1124111C00CF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25841

Modified Files:
	gnome-media.spec 
Log Message:
* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-3
- Fix -libs description (#520271)



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- gnome-media.spec	16 Sep 2009 15:41:05 -0000	1.179
+++ gnome-media.spec	16 Sep 2009 15:56:17 -0000	1.180
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.27.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.27/gnome-media-%{version}.tar.bz2
@@ -63,7 +63,7 @@ This package contains the libraries and 
 develop GNOME media applications.
 
 %package libs
-Summary: Development files for gnome-media
+Summary: Libraries for gnome-media
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -313,6 +313,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-3
+- Fix -libs description (#520271)
+
 * Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-2
 - Fix crashing when profile changes happen quickly (#523669)
 



From mtasaka at fedoraproject.org  Wed Sep 16 16:01:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Sep 2009 16:01:20 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.394, 1.395 jd.spec, 1.456, 1.457 sources,
	1.395, 1.396
Message-ID: <20090916160121.049C711C0334@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27556/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3074



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- .cvsignore	14 Sep 2009 14:12:10 -0000	1.394
+++ .cvsignore	16 Sep 2009 16:01:17 -0000	1.395
@@ -1 +1 @@
-jd-2.4.2-beta090914.tgz
+jd-2.4.2-svn3074_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -p -r1.456 -r1.457
--- jd.spec	14 Sep 2009 14:12:10 -0000	1.456
+++ jd.spec	16 Sep 2009 16:01:17 -0000	1.457
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        beta090914
+%define         strtag        svn3074_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3074
+
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- sources	14 Sep 2009 14:12:10 -0000	1.395
+++ sources	16 Sep 2009 16:01:18 -0000	1.396
@@ -1 +1 @@
-298facf48ce377f0ff0a153f6d9dd433  jd-2.4.2-beta090914.tgz
+eede99e5283a2c1f52780c53c7812904  jd-2.4.2-svn3074_trunk.tgz



From mtasaka at fedoraproject.org  Wed Sep 16 16:01:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Sep 2009 16:01:20 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.400, 1.401 jd.spec, 1.460, 1.461 sources,
	1.401, 1.402
Message-ID: <20090916160121.0026811C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27556/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3074



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- .cvsignore	14 Sep 2009 14:12:09 -0000	1.400
+++ .cvsignore	16 Sep 2009 16:01:13 -0000	1.401
@@ -1 +1 @@
-jd-2.4.2-beta090914.tgz
+jd-2.4.2-svn3074_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- jd.spec	14 Sep 2009 14:12:10 -0000	1.460
+++ jd.spec	16 Sep 2009 16:01:14 -0000	1.461
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        beta090914
+%define         strtag        svn3074_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3074
+
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- sources	14 Sep 2009 14:12:10 -0000	1.401
+++ sources	16 Sep 2009 16:01:15 -0000	1.402
@@ -1 +1 @@
-298facf48ce377f0ff0a153f6d9dd433  jd-2.4.2-beta090914.tgz
+eede99e5283a2c1f52780c53c7812904  jd-2.4.2-svn3074_trunk.tgz



From cweyl at fedoraproject.org  Wed Sep 16 16:06:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 16 Sep 2009 16:06:56 +0000 (UTC)
Subject: rpms/perl-namespace-autoclean/F-11 perl-namespace-autoclean.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090916160656.5EAFE11C00CF@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-autoclean/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31858

Modified Files:
	perl-namespace-autoclean.spec sources 
Log Message:
* Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- add %perl_default_filter'ing
- auto-update to 0.09 (by cpan-spec-update 0.01)
- added a new req on perl(B::Hooks::EndOfScope) (version 0.07)
- added a new req on perl(Class::MOP) (version 0.80)
- added a new req on perl(List::Util) (version 0)
- added a new req on perl(namespace::clean) (version 0.11)



Index: perl-namespace-autoclean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/F-11/perl-namespace-autoclean.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-namespace-autoclean.spec	2 Jul 2009 06:07:09 -0000	1.1
+++ perl-namespace-autoclean.spec	16 Sep 2009 16:06:55 -0000	1.2
@@ -1,12 +1,12 @@
-Name:       perl-namespace-autoclean 
-Version:    0.08 
+Name:       perl-namespace-autoclean
+Version:    0.09
 Release:    1%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Keep imports out of your namespace 
-Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/namespace-autoclean-%{version}.tar.gz 
+Summary:    Keep imports out of your namespace
+Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/namespace-autoclean-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/namespace-autoclean
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -17,6 +17,14 @@ BuildRequires: perl(List::Util)
 BuildRequires: perl(namespace::clean) >= 0.11
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(B::Hooks::EndOfScope) >= 0.07
+Requires:       perl(Class::MOP) >= 0.80
+Requires:       perl(List::Util)
+Requires:       perl(namespace::clean) >= 0.11
+
+%{?perl_default_filter}
+
 %description
 When you import a function into a Perl package, it will naturally also
 be available as a method. The 'namespace::autoclean' pragma will remove
@@ -49,19 +57,29 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README 
+%doc Changes LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
+- add %perl_default_filter'ing
+- auto-update to 0.09 (by cpan-spec-update 0.01)
+- added a new req on perl(B::Hooks::EndOfScope) (version 0.07)
+- added a new req on perl(Class::MOP) (version 0.80)
+- added a new req on perl(List::Util) (version 0)
+- added a new req on perl(namespace::clean) (version 0.11)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
 - submission
 
 * Wed Jul 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 06:07:09 -0000	1.2
+++ sources	16 Sep 2009 16:06:55 -0000	1.3
@@ -1 +1 @@
-b0d086797cdb060d23c0697605c39002  namespace-autoclean-0.08.tar.gz
+79241eb4929cdf6eecd6e5cc4c1ef2f8  namespace-autoclean-0.09.tar.gz



From limb at fedoraproject.org  Wed Sep 16 16:28:19 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 16:28:19 +0000 (UTC)
Subject: rpms/drupal-date/devel .cvsignore, 1.4, 1.5 drupal-date.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090916162819.4DAD011C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8396

Modified Files:
	.cvsignore drupal-date.spec sources 
Log Message:
Fix for DRUPAL-SA-CONTRIB-2009-057



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jul 2009 17:31:38 -0000	1.4
+++ .cvsignore	16 Sep 2009 16:28:14 -0000	1.5
@@ -1 +1 @@
-date-6.x-2.3.tar.gz
+date-6.x-2.4.tar.gz


Index: drupal-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/devel/drupal-date.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- drupal-date.spec	29 Jul 2009 17:31:38 -0000	1.5
+++ drupal-date.spec	16 Sep 2009 16:28:14 -0000	1.6
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-date
-Version:  6.x.2.3
+Version:  6.x.2.4
 Release:  0%{?dist}
 Summary:  This package contains both the Date module and a Date API module
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/date
-Source0: http://ftp.drupal.org/files/projects/date-6.x-2.3.tar.gz
+Source0: http://ftp.drupal.org/files/projects/date-6.x-2.4.tar.gz
 Source1: drupal-date-fedora-README.txt
 
 BuildArch: noarch
@@ -47,6 +47,10 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/date/date_php4/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.4-0
+- Update to new version.
+- Fix for DRUPAL-SA-CONTRIB-2009-057.
+
 * Wed Jul 29 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.3-0
 - Update to new version.
 - Fix for DRUPAL-SA-CONTRIB-2009-046.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jul 2009 17:31:38 -0000	1.4
+++ sources	16 Sep 2009 16:28:14 -0000	1.5
@@ -1 +1 @@
-ac902e259782eeb6f097ce7e9c943efa  date-6.x-2.3.tar.gz
+7ec77ca6e2c706e527424aeb1b1eb279  date-6.x-2.4.tar.gz



From limb at fedoraproject.org  Wed Sep 16 16:36:51 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 16:36:51 +0000 (UTC)
Subject: rpms/drupal-date/F-11 drupal-date.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090916163651.3016F11C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-date/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382/F-11

Modified Files:
	drupal-date.spec sources 
Log Message:
Fix for DRUPAL-SA-CONTRIB-2009-057



Index: drupal-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/F-11/drupal-date.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drupal-date.spec	29 Jul 2009 17:38:18 -0000	1.4
+++ drupal-date.spec	16 Sep 2009 16:36:50 -0000	1.5
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-date
-Version:  6.x.2.3
+Version:  6.x.2.4
 Release:  0%{?dist}
 Summary:  This package contains both the Date module and a Date API module
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/date
-Source0: http://ftp.drupal.org/files/projects/date-6.x-2.3.tar.gz
+Source0: http://ftp.drupal.org/files/projects/date-6.x-2.4.tar.gz
 Source1: drupal-date-fedora-README.txt
 
 BuildArch: noarch
@@ -47,6 +47,10 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/date/date_php4/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.4-0
+- Update to new version.
+- Fix for DRUPAL-SA-CONTRIB-2009-057.
+
 * Wed Jul 29 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.3-0
 - Update to new version.
 - Fix for DRUPAL-SA-CONTRIB-2009-046.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jul 2009 17:38:18 -0000	1.4
+++ sources	16 Sep 2009 16:36:50 -0000	1.5
@@ -1 +1 @@
-ac902e259782eeb6f097ce7e9c943efa  date-6.x-2.3.tar.gz
+7ec77ca6e2c706e527424aeb1b1eb279  date-6.x-2.4.tar.gz



From limb at fedoraproject.org  Wed Sep 16 16:36:50 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 16:36:50 +0000 (UTC)
Subject: rpms/drupal-date/F-10 drupal-date.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090916163651.303E611C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-date/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382/F-10

Modified Files:
	drupal-date.spec sources 
Log Message:
Fix for DRUPAL-SA-CONTRIB-2009-057



Index: drupal-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/F-10/drupal-date.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drupal-date.spec	29 Jul 2009 17:38:17 -0000	1.3
+++ drupal-date.spec	16 Sep 2009 16:36:50 -0000	1.4
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-date
-Version:  6.x.2.3
+Version:  6.x.2.4
 Release:  0%{?dist}
 Summary:  This package contains both the Date module and a Date API module
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/date
-Source0: http://ftp.drupal.org/files/projects/date-6.x-2.3.tar.gz
+Source0: http://ftp.drupal.org/files/projects/date-6.x-2.4.tar.gz
 Source1: drupal-date-fedora-README.txt
 
 BuildArch: noarch
@@ -47,6 +47,10 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/date/date_php4/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.4-0
+- Update to new version.
+- Fix for DRUPAL-SA-CONTRIB-2009-057.
+
 * Wed Jul 29 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.3-0
 - Update to new version.
 - Fix for DRUPAL-SA-CONTRIB-2009-046.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-date/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jul 2009 17:38:17 -0000	1.4
+++ sources	16 Sep 2009 16:36:50 -0000	1.5
@@ -1 +1 @@
-ac902e259782eeb6f097ce7e9c943efa  date-6.x-2.3.tar.gz
+7ec77ca6e2c706e527424aeb1b1eb279  date-6.x-2.4.tar.gz



From mauelsha at fedoraproject.org  Wed Sep 16 16:53:12 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 16:53:12 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.103,1.104
Message-ID: <20090916165312.A48B811C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191

Modified Files:
	dmraid.spec 
Log Message:
More requirements fiddling


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- dmraid.spec	16 Sep 2009 13:46:03 -0000	1.103
+++ dmraid.spec	16 Sep 2009 16:53:11 -0000	1.104
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
+BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel, lvm2
 Requires: device-mapper >= 1.02.02-2
 Requires: dmraid-events kpartx
 Requires: dmraid-events kpartx



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:00 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170800.696F410F886@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchbugzilla acl on nano (Fedora devel) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:00 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170800.F297E10F894@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on nano (Fedora devel) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:01 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170802.DE81010F898@bastion2.fedora.phx.redhat.com>

dwmw2 has set the commit acl on nano (Fedora devel) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:10 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170811.1847310F89B@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchbugzilla acl on nano (Fedora 10) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:13 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170813.575E310F89F@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on nano (Fedora 10) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:14 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170814.C357C10F8A1@bastion2.fedora.phx.redhat.com>

dwmw2 has set the commit acl on nano (Fedora 10) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:16 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170816.7179910F8A2@bastion2.fedora.phx.redhat.com>

dwmw2 has set the commit acl on nano (Fedora 11) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:17 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170817.E84AF10F8A5@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on nano (Fedora 11) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From pkgdb at fedoraproject.org  Wed Sep 16 17:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 17:08:19 +0000
Subject: [pkgdb] nano had acl change status
Message-ID: <20090916170819.3613A10F8A9@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchbugzilla acl on nano (Fedora 11) to Approved for kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nano



From mauelsha at fedoraproject.org  Wed Sep 16 17:21:12 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 17:21:12 +0000 (UTC)
Subject: rpms/dmraid/devel .cvsignore, 1.13, 1.14 dmraid.spec, 1.95,
	1.96 sources, 1.23, 1.24
Message-ID: <20090916172112.BC88C11C00EC@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30491

Modified Files:
	.cvsignore dmraid.spec sources 
Log Message:
1.0.0.rc16 update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	25 Sep 2008 14:17:12 -0000	1.13
+++ .cvsignore	16 Sep 2009 17:21:10 -0000	1.14
@@ -1,2 +1,3 @@
 dmraid-1.0.0.rc14.tar.bz2
 dmraid-1.0.0.rc15.tar.bz2
+dmraid-1.0.0.rc16.tar.bz2


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- dmraid.spec	24 Jul 2009 20:23:06 -0000	1.95
+++ dmraid.spec	16 Sep 2009 17:21:10 -0000	1.96
@@ -1,100 +1,133 @@
-Summary: Device-mapper RAID tool and library
+#
+# Copyright (C)  Heinz Mauelshagen, 2004-2009 Red Hat GmbH. All rights reserved.
+#
+# See file LICENSE at the top of this source tree for license information.
+#
+
+Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
-Version: 1.0.0.rc15
-Release: 8%{?dist}
+Version: 1.0.0.rc16
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
-Patch0: dmraid-1.0.0.rc15-whitespace.patch
-Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
-Patch2: dmraid-1.0.0.rc15-rm_partitions.patch
-Patch3: dmraid-1.0.0.rc15-isw-serial.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
-Requires: kpartx
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel, lvm2
 Requires: device-mapper >= 1.02.02-2
+Requires: dmraid-events kpartx
+Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
+Patch0:	Makefile.in.avoid_dmreg.o_build.patch
+
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
 Linux >= 2.4 using device-mapper.
 
-%package devel
-Summary: Development libraries and headers for dmraid
+%package -n dmraid-devel
+Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
 License: GPLv2+
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
 
-%description devel
+%description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
-RAID set activation, creation, removal, rebuild and display of
-properties for ATARAID/DDF1 metadata.
+RAID set activation and display of properties for ATARAID volumes.
 
-%package libs
-Summary: Shared library for RAID device discovery
-Group: System Environment/Libraries
-License: GPLv2+
+%package -n dmraid-events
+Summary: dmevent_tool (Device-mapper event tool) and DSO
+Group: System Environment/Base
+Requires: dmraid = %{version}-%{release}, sgpio
+
+%description -n dmraid-events
+Provides a dmeventd DSO and the dmevent_tool to register devices with it
+for device monitoring.  All active RAID sets should be manually registered
+with dmevent_tool.
+
+%package -n dmraid-events-logwatch
+Summary: dmraid logwatch-based email reporting
+Group: System Environment/Base
+Requires: dmraid-events = %{version}-%{release}, logwatch, /etc/cron.d
 
-%description libs
-This package contains the dmraid shared library, libdmraid.
+%description -n dmraid-events-logwatch
+Provides device failure reporting via logwatch-based email reporting.
+Device failure reporting has to be activated manually by activating the 
+/etc/cron.d/dmeventd-logwatch entry and by calling the dmevent_tool
+(see manual page for examples) for any active RAID sets.
 
 %prep
 %setup -q -n dmraid/%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
-make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid}
+install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
 make DESTDIR=$RPM_BUILD_ROOT install
 ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
+
+# Provide convenience link from dmevent_tool
+(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# if requested, install the dso
+# If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
 install -m 755 lib/libdmraid.so \
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
+install -m 755 lib/libdmraid-events-isw.so \
+	$RPM_BUILD_ROOT%{_libdir}/libdmraid-events-isw.so.%{version}
+(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so)
+
+# Install logwatch config file and script for dmeventd
+install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
+install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
+install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT/etc/cron.d/dmeventd-logwatch
+install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
- 
-%postun libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
-/%{_mandir}/man8/dmraid.8.gz
+/%{_mandir}/man8/dmraid*
 /sbin/dmraid
 /sbin/dmraid.static
+%{_libdir}/libdmraid.so*
+%{_libdir}/libdmraid-events-isw.so*
 /var/lock/dmraid
 
-%files devel
+%files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
-%{_includedir}/dmraid/*.h
-%attr(755,root,root) %{_libdir}/libdmraid.so
+%{_includedir}/dmraid/*
 
-%files libs
-%attr(755,root,root) %{_libdir}/libdmraid.so.*
+%files -n dmraid-events
+%defattr(-,root,root)
+/%{_mandir}/man8/dmevent_tool*
+/sbin/dmevent_tool
+/sbin/dm_dso_reg_tool
+
+%files -n dmraid-events-logwatch
+%defattr(-,root,root)
+%config(noreplace) /etc/logwatch/*
+%config(noreplace) /etc/cron.d/dmeventd-logwatch
+%ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0.rc15-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
+- Update to version 1.0.0.rc16
 
 * Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
 - Fix activation of isw raid sets when the disks have serialnumber longer


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 Sep 2008 14:17:12 -0000	1.23
+++ sources	16 Sep 2009 17:21:10 -0000	1.24
@@ -1 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
+94994759eba7221579b17222bdaf34e7  dmraid-1.0.0.rc16.tar.bz2



From lucilanga at fedoraproject.org  Wed Sep 16 17:24:06 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 16 Sep 2009 17:24:06 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss.spec,1.35,1.36
Message-ID: <20090916172406.E90AA11C00CF@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31641

Modified Files:
	evolution-rss.spec 
Log Message:
* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
- added patch to fix folder properties in evolution (#523552)
- added upstream patch to fix folder rename (#594704)


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- evolution-rss.spec	16 Sep 2009 09:39:38 -0000	1.35
+++ evolution-rss.spec	16 Sep 2009 17:24:06 -0000	1.36
@@ -97,6 +97,7 @@ fi
 
 %changelog
 * Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
+- added patch to fix folder properties in evolution (#523552)
 - added upstream patch to fix folder rename (#594704)
 
 * Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2



From jussilehtola at fedoraproject.org  Wed Sep 16 17:24:22 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:24:22 +0000 (UTC)
Subject: rpms/wannier90/EL-5 wannier90.spec,1.3,1.4
Message-ID: <20090916172422.ED43011C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/wannier90/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/EL-5

Modified Files:
	wannier90.spec 
Log Message:
Fix location of Fortran modules. Use ATLAS instead of LAPACK. Fix test phase.


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/EL-5/wannier90.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wannier90.spec	16 May 2009 08:10:57 -0000	1.3
+++ wannier90.spec	16 Sep 2009 17:24:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		wannier90
 Version:	1.1
-Release:	4%{?dist}
+Release:	6%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -11,12 +11,17 @@ Patch0:		wannier90-1.1-shlib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gcc-gfortran
-BuildRequires:	lapack-devel
-# On Fedora this is pulled in by lapack-devel, but EPEL needs this
-BuildRequires:	blas-devel
 # For test phase
 BuildRequires:	perl(Cwd)
 
+# Linear algebra: use ATLAS
+BuildRequires:	atlas-devel
+
+# Reference LAPACK
+#BuildRequires:	lapack-devel
+# On Fedora this is pulled in by lapack-devel, but EPEL needs this
+#BuildRequires:	blas-devel
+
 %description
 Wannier90 is a program for calculating maximally-localised Wannier functions
 (MLWF) from a set of Bloch energy bands that may or may not be attached to or
@@ -58,7 +63,11 @@ chmod 644 utility/kmesh.pl
 echo "F90 = gfortran" > make.sys
 echo "FCOPTS = %{optflags} -fPIC" >> make.sys
 echo "LDOPTS = %{optflags} -fPIC" >> make.sys
-echo "LIBS = -lblas -llapack" >> make.sys
+
+# Use ATLAS
+echo "LIBS = -L%{_libdir}/atlas -lf77blas -latlas -llapack" >> make.sys
+# Use reference LAPACK
+#echo "LIBS = -lblas -llapack" >> make.sys
 
 make -C src %{?_smp_mflags} prog
 
@@ -70,14 +79,15 @@ install -D -p -m 755 wannier90.x %{build
 install -D -p -m 755 libwannier.so %{buildroot}%{_libdir}/libwannier.so
 
 # Fortran module files
-mkdir -p %{buildroot}%{_includedir}/%{name}
-install -p -m 644 src/*.mod %{buildroot}%{_includedir}/%{name}/
-
+mkdir -p %{buildroot}%{_fmoddir}
+install -p -m 644 src/*.mod %{buildroot}%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot} 
 
 %check
+# Set path so that wannier finds its library
+export LD_LIBRARY_PATH=`pwd`
 make test
 
 %post -p /sbin/ldconfig
@@ -92,19 +102,27 @@ make test
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%{_fmoddir}/w90_*.mod
 
 
 %changelog
-* Sat May 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-4
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-6
+- Fix location of Fortran modules.
+- Fix check phase.
+- Use ATLAS instead of reference BLAS & LAPACK.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-4
 - Fix EPEL build by adding explicit BR: blas-devel.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-3
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-3
 - Link binary against shared library.
 - Put library back into main package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-2
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-2
 - Break libs into own package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-1
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
 - First release.



From jussilehtola at fedoraproject.org  Wed Sep 16 17:24:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:24:23 +0000 (UTC)
Subject: rpms/wannier90/F-11 wannier90.spec,1.3,1.4
Message-ID: <20090916172423.5A72511C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/wannier90/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/F-11

Modified Files:
	wannier90.spec 
Log Message:
Fix location of Fortran modules. Use ATLAS instead of LAPACK. Fix test phase.


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/F-11/wannier90.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wannier90.spec	16 May 2009 08:10:57 -0000	1.3
+++ wannier90.spec	16 Sep 2009 17:24:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		wannier90
 Version:	1.1
-Release:	4%{?dist}
+Release:	6%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -11,12 +11,17 @@ Patch0:		wannier90-1.1-shlib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gcc-gfortran
-BuildRequires:	lapack-devel
-# On Fedora this is pulled in by lapack-devel, but EPEL needs this
-BuildRequires:	blas-devel
 # For test phase
 BuildRequires:	perl(Cwd)
 
+# Linear algebra: use ATLAS
+BuildRequires:	atlas-devel
+
+# Reference LAPACK
+#BuildRequires:	lapack-devel
+# On Fedora this is pulled in by lapack-devel, but EPEL needs this
+#BuildRequires:	blas-devel
+
 %description
 Wannier90 is a program for calculating maximally-localised Wannier functions
 (MLWF) from a set of Bloch energy bands that may or may not be attached to or
@@ -58,7 +63,11 @@ chmod 644 utility/kmesh.pl
 echo "F90 = gfortran" > make.sys
 echo "FCOPTS = %{optflags} -fPIC" >> make.sys
 echo "LDOPTS = %{optflags} -fPIC" >> make.sys
-echo "LIBS = -lblas -llapack" >> make.sys
+
+# Use ATLAS
+echo "LIBS = -L%{_libdir}/atlas -lf77blas -latlas -llapack" >> make.sys
+# Use reference LAPACK
+#echo "LIBS = -lblas -llapack" >> make.sys
 
 make -C src %{?_smp_mflags} prog
 
@@ -70,14 +79,15 @@ install -D -p -m 755 wannier90.x %{build
 install -D -p -m 755 libwannier.so %{buildroot}%{_libdir}/libwannier.so
 
 # Fortran module files
-mkdir -p %{buildroot}%{_includedir}/%{name}
-install -p -m 644 src/*.mod %{buildroot}%{_includedir}/%{name}/
-
+mkdir -p %{buildroot}%{_fmoddir}
+install -p -m 644 src/*.mod %{buildroot}%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot} 
 
 %check
+# Set path so that wannier finds its library
+export LD_LIBRARY_PATH=`pwd`
 make test
 
 %post -p /sbin/ldconfig
@@ -92,19 +102,27 @@ make test
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%{_fmoddir}/w90_*.mod
 
 
 %changelog
-* Sat May 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-4
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-6
+- Fix location of Fortran modules.
+- Fix check phase.
+- Use ATLAS instead of reference BLAS & LAPACK.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-4
 - Fix EPEL build by adding explicit BR: blas-devel.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-3
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-3
 - Link binary against shared library.
 - Put library back into main package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-2
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-2
 - Break libs into own package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-1
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
 - First release.



From jussilehtola at fedoraproject.org  Wed Sep 16 17:24:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:24:23 +0000 (UTC)
Subject: rpms/wannier90/devel wannier90.spec,1.4,1.5
Message-ID: <20090916172423.829DD11C00EB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/wannier90/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/devel

Modified Files:
	wannier90.spec 
Log Message:
Fix location of Fortran modules. Use ATLAS instead of LAPACK. Fix test phase.


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/wannier90.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wannier90.spec	27 Jul 2009 07:02:37 -0000	1.4
+++ wannier90.spec	16 Sep 2009 17:24:23 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wannier90
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -11,12 +11,17 @@ Patch0:		wannier90-1.1-shlib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gcc-gfortran
-BuildRequires:	lapack-devel
-# On Fedora this is pulled in by lapack-devel, but EPEL needs this
-BuildRequires:	blas-devel
 # For test phase
 BuildRequires:	perl(Cwd)
 
+# Linear algebra: use ATLAS
+BuildRequires:	atlas-devel
+
+# Reference LAPACK
+#BuildRequires:	lapack-devel
+# On Fedora this is pulled in by lapack-devel, but EPEL needs this
+#BuildRequires:	blas-devel
+
 %description
 Wannier90 is a program for calculating maximally-localised Wannier functions
 (MLWF) from a set of Bloch energy bands that may or may not be attached to or
@@ -58,7 +63,11 @@ chmod 644 utility/kmesh.pl
 echo "F90 = gfortran" > make.sys
 echo "FCOPTS = %{optflags} -fPIC" >> make.sys
 echo "LDOPTS = %{optflags} -fPIC" >> make.sys
-echo "LIBS = -lblas -llapack" >> make.sys
+
+# Use ATLAS
+echo "LIBS = -L%{_libdir}/atlas -lf77blas -latlas -llapack" >> make.sys
+# Use reference LAPACK
+#echo "LIBS = -lblas -llapack" >> make.sys
 
 make -C src %{?_smp_mflags} prog
 
@@ -70,14 +79,15 @@ install -D -p -m 755 wannier90.x %{build
 install -D -p -m 755 libwannier.so %{buildroot}%{_libdir}/libwannier.so
 
 # Fortran module files
-mkdir -p %{buildroot}%{_includedir}/%{name}
-install -p -m 644 src/*.mod %{buildroot}%{_includedir}/%{name}/
-
+mkdir -p %{buildroot}%{_fmoddir}
+install -p -m 644 src/*.mod %{buildroot}%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot} 
 
 %check
+# Set path so that wannier finds its library
+export LD_LIBRARY_PATH=`pwd`
 make test
 
 %post -p /sbin/ldconfig
@@ -92,22 +102,27 @@ make test
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%{_fmoddir}/w90_*.mod
 
 
 %changelog
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-6
+- Fix location of Fortran modules.
+- Fix check phase.
+- Use ATLAS instead of reference BLAS & LAPACK.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sat May 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-4
+* Sat May 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-4
 - Fix EPEL build by adding explicit BR: blas-devel.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-3
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-3
 - Link binary against shared library.
 - Put library back into main package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-2
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-2
 - Break libs into own package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-1
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
 - First release.



From jussilehtola at fedoraproject.org  Wed Sep 16 17:24:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:24:23 +0000 (UTC)
Subject: rpms/wannier90/F-10 wannier90.spec,1.3,1.4
Message-ID: <20090916172423.2B6EC11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/wannier90/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/F-10

Modified Files:
	wannier90.spec 
Log Message:
Fix location of Fortran modules. Use ATLAS instead of LAPACK. Fix test phase.


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/F-10/wannier90.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wannier90.spec	16 May 2009 08:10:57 -0000	1.3
+++ wannier90.spec	16 Sep 2009 17:24:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		wannier90
 Version:	1.1
-Release:	4%{?dist}
+Release:	6%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -11,12 +11,17 @@ Patch0:		wannier90-1.1-shlib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gcc-gfortran
-BuildRequires:	lapack-devel
-# On Fedora this is pulled in by lapack-devel, but EPEL needs this
-BuildRequires:	blas-devel
 # For test phase
 BuildRequires:	perl(Cwd)
 
+# Linear algebra: use ATLAS
+BuildRequires:	atlas-devel
+
+# Reference LAPACK
+#BuildRequires:	lapack-devel
+# On Fedora this is pulled in by lapack-devel, but EPEL needs this
+#BuildRequires:	blas-devel
+
 %description
 Wannier90 is a program for calculating maximally-localised Wannier functions
 (MLWF) from a set of Bloch energy bands that may or may not be attached to or
@@ -58,7 +63,11 @@ chmod 644 utility/kmesh.pl
 echo "F90 = gfortran" > make.sys
 echo "FCOPTS = %{optflags} -fPIC" >> make.sys
 echo "LDOPTS = %{optflags} -fPIC" >> make.sys
-echo "LIBS = -lblas -llapack" >> make.sys
+
+# Use ATLAS
+echo "LIBS = -L%{_libdir}/atlas -lf77blas -latlas -llapack" >> make.sys
+# Use reference LAPACK
+#echo "LIBS = -lblas -llapack" >> make.sys
 
 make -C src %{?_smp_mflags} prog
 
@@ -70,14 +79,15 @@ install -D -p -m 755 wannier90.x %{build
 install -D -p -m 755 libwannier.so %{buildroot}%{_libdir}/libwannier.so
 
 # Fortran module files
-mkdir -p %{buildroot}%{_includedir}/%{name}
-install -p -m 644 src/*.mod %{buildroot}%{_includedir}/%{name}/
-
+mkdir -p %{buildroot}%{_fmoddir}
+install -p -m 644 src/*.mod %{buildroot}%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot} 
 
 %check
+# Set path so that wannier finds its library
+export LD_LIBRARY_PATH=`pwd`
 make test
 
 %post -p /sbin/ldconfig
@@ -92,19 +102,27 @@ make test
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%{_fmoddir}/w90_*.mod
 
 
 %changelog
-* Sat May 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-4
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-6
+- Fix location of Fortran modules.
+- Fix check phase.
+- Use ATLAS instead of reference BLAS & LAPACK.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-4
 - Fix EPEL build by adding explicit BR: blas-devel.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-3
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-3
 - Link binary against shared library.
 - Put library back into main package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-2
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-2
 - Break libs into own package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-1
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
 - First release.



From lucilanga at fedoraproject.org  Wed Sep 16 17:24:31 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 16 Sep 2009 17:24:31 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss-0.1.4-folder-properties.patch,
	NONE, 1.1 evolution-rss-0.1.4-folder-rename.patch, NONE,
	1.1 evolution-rss.spec, 1.32, 1.33
Message-ID: <20090916172431.946F411C00CF@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31842

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-folder-properties.patch 
	evolution-rss-0.1.4-folder-rename.patch 
Log Message:
* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
- added patch to fix folder properties in evolution (#523552)
- added upstream patch to fix folder rename (gnome #594704)

evolution-rss-0.1.4-folder-properties.patch:
 rss-config-factory.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE evolution-rss-0.1.4-folder-properties.patch ---
diff -urN evolution-rss-0.1.4.orig/src/rss-config-factory.c evolution-rss-0.1.4/src/rss-config-factory.c
--- evolution-rss-0.1.4.orig/src/rss-config-factory.c	2009-08-26 09:24:36.000000000 +0100
+++ evolution-rss-0.1.4/src/rss-config-factory.c	2009-09-15 23:27:13.787560110 +0100
@@ -2192,7 +2192,15 @@
 	add_feed *feed = (add_feed *)g_object_get_data((GObject *)epl, "add-feed");
 	gchar *url = (gchar *)g_object_get_data((GObject *)epl, "url");
 	gchar *ofolder = (gchar *)g_object_get_data((GObject *)epl, "ofolder");
+
+	EMConfigTargetFolder *targetfolder = (EMConfigTargetFolder *)target->config->target;
+	gchar *main_folder = lookup_main_folder();
+	gchar *folder = targetfolder->folder->full_name;
 	
+	if (folder == NULL
+          || g_ascii_strncasecmp(folder, main_folder, strlen(main_folder))
+          || !g_ascii_strcasecmp(folder, main_folder))
+                return;
 
 	GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "url_entry");
         GtkWidget *checkbutton1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "html_check");


evolution-rss-0.1.4-folder-rename.patch:
 rss.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-folder-rename.patch ---
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-09-16 12:30:32.000000000 +0300
@@ -3659,8 +3659,13 @@
 		nname = g_strdup(new_name);
 	gchar *orig_name = g_hash_table_lookup(rf->feed_folders, oname);
 	if (!orig_name) {
-		if (valid_folder)
-			return 0;
+		if (valid_folder) {
+			gchar *ofolder = lookup_original_folder(old_name);
+			if (!ofolder)
+				return 0;
+			else if (!lookup_key(ofolder))
+				return 0;
+		}
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(oname));
 	} else {
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(orig_name));


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- evolution-rss.spec	9 Sep 2009 14:08:11 -0000	1.32
+++ evolution-rss.spec	16 Sep 2009 17:24:31 -0000	1.33
@@ -1,11 +1,13 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
+Patch0:		evolution-rss-0.1.4-folder-rename.patch
+Patch1:		evolution-rss-0.1.4-folder-properties.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -28,6 +30,8 @@ This is an evolution plugin which enable
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .folder-rename
+%patch1 -p1 -b .folder-properties
 
 %build
 %configure --with-primary-render=gecko
@@ -81,6 +85,10 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
+- added patch to fix folder properties in evolution (#523552)
+- added upstream patch to fix folder rename (gnome #594704)
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-3
 - Rebuild against newer gecko
 



From lucilanga at fedoraproject.org  Wed Sep 16 17:25:46 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 16 Sep 2009 17:25:46 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 evolution-rss-0.1.4-folder-properties.patch,
	NONE, 1.1 evolution-rss-0.1.4-folder-rename.patch, NONE,
	1.1 evolution-rss.spec, 1.32, 1.33
Message-ID: <20090916172546.D4F5F11C00CF@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32330

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-folder-properties.patch 
	evolution-rss-0.1.4-folder-rename.patch 
Log Message:
* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
- added patch to fix folder properties in evolution (#523552)
- added upstream patch to fix folder rename (gnome #594704)

evolution-rss-0.1.4-folder-properties.patch:
 rss-config-factory.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE evolution-rss-0.1.4-folder-properties.patch ---
diff -urN evolution-rss-0.1.4.orig/src/rss-config-factory.c evolution-rss-0.1.4/src/rss-config-factory.c
--- evolution-rss-0.1.4.orig/src/rss-config-factory.c	2009-08-26 09:24:36.000000000 +0100
+++ evolution-rss-0.1.4/src/rss-config-factory.c	2009-09-15 23:27:13.787560110 +0100
@@ -2192,7 +2192,15 @@
 	add_feed *feed = (add_feed *)g_object_get_data((GObject *)epl, "add-feed");
 	gchar *url = (gchar *)g_object_get_data((GObject *)epl, "url");
 	gchar *ofolder = (gchar *)g_object_get_data((GObject *)epl, "ofolder");
+
+	EMConfigTargetFolder *targetfolder = (EMConfigTargetFolder *)target->config->target;
+	gchar *main_folder = lookup_main_folder();
+	gchar *folder = targetfolder->folder->full_name;
 	
+	if (folder == NULL
+          || g_ascii_strncasecmp(folder, main_folder, strlen(main_folder))
+          || !g_ascii_strcasecmp(folder, main_folder))
+                return;
 
 	GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "url_entry");
         GtkWidget *checkbutton1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "html_check");


evolution-rss-0.1.4-folder-rename.patch:
 rss.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-folder-rename.patch ---
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-09-16 12:30:32.000000000 +0300
@@ -3659,8 +3659,13 @@
 		nname = g_strdup(new_name);
 	gchar *orig_name = g_hash_table_lookup(rf->feed_folders, oname);
 	if (!orig_name) {
-		if (valid_folder)
-			return 0;
+		if (valid_folder) {
+			gchar *ofolder = lookup_original_folder(old_name);
+			if (!ofolder)
+				return 0;
+			else if (!lookup_key(ofolder))
+				return 0;
+		}
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(oname));
 	} else {
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(orig_name));


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- evolution-rss.spec	9 Sep 2009 15:17:26 -0000	1.32
+++ evolution-rss.spec	16 Sep 2009 17:25:46 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -87,6 +87,10 @@ fi
 %doc TODO
 
 %changelog
+* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
+- added patch to fix folder properties in evolution (#523552)
+- added upstream patch to fix folder rename (gnome #594704)
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-3
 - Rebuild against newer gecko
 



From rdieter at fedoraproject.org  Wed Sep 16 17:25:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 17:25:58 +0000 (UTC)
Subject: rpms/pinentry/devel pinentry-wrapper, 1.1, 1.2 pinentry.spec, 1.25,
	1.26
Message-ID: <20090916172558.278EC11C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32486

Modified Files:
	pinentry-wrapper pinentry.spec 
Log Message:
* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3
- drop alternatives, use app-wrapper instead (borrowed from opensuse)
- -qt4 experimental subpkg, -qt includes qt3 version again  (#523488)



Index: pinentry-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pinentry-wrapper	23 Jun 2009 15:28:41 -0000	1.1
+++ pinentry-wrapper	16 Sep 2009 17:25:57 -0000	1.2
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 Fedora Project
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -8,9 +9,12 @@
 #
 # Anna Bernathova <anicka at novell.com> 2006
 # Pavel Nemec <pnemec at novell.com> 2006
-# 
+# Rex Dieter <rdieter at fedoraproject.org> 2009
+#
 # use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses) 
 
+if [ -z "$PINENTRY_BINARY" ]; then
+
 kde_running=
 if [ -n "$KDE_FULL_SESSION" ]; then
     kde_running=1
@@ -40,15 +44,19 @@ else
 fi
 
 # if KDE is detected and pinentry-qt exists, use pinentry-qt
-if [ -n "$kde_running" -a -f /usr/bin/pinentry-qt ]
+if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ]
 then
 	export PINENTRY_BINARY="/usr/bin/pinentry-qt"
 # otherwise test if pinentry-gtk-2 is installed
-elif [ -f /usr/bin/pinentry-gtk-2 ] 
+elif [ -x /usr/bin/pinentry-gtk-2 ] 
 then
 	export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
+# otherwise test if pinentry-qt4 is installed
+elif [ -x /usr/bin/pinentry-qt4 ]
+then
+        export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
 # otherwise test if pinentry-qt exists although KDE is not detected
-elif [ -f /usr/bin/pinentry-qt ]
+elif [ -x /usr/bin/pinentry-qt ]
 then
 	export PINENTRY_BINARY="/usr/bin/pinentry-qt"
 # pinentry-curses is installed by default 
@@ -57,11 +65,13 @@ else
 	for opt in "$@"; do
 		if [ "x$opt" = "x--display" ]; then
 		        # should not happen because of package dependencies
-			echo "Please install pinentry-qt or pinentry-gtk2" >&2
+			echo "Please install pinentry-gui" >&2
 			exit 1
 		fi
 	done
 	export PINENTRY_BINARY="/usr/bin/pinentry-curses"
 		
 fi
+fi
+
 exec $PINENTRY_BINARY "$@"


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- pinentry.spec	26 Jul 2009 18:48:20 -0000	1.25
+++ pinentry.spec	16 Sep 2009 17:25:57 -0000	1.26
@@ -1,13 +1,14 @@
 
 %if 0%{?fedora} > 8 || 0%{?rhel} > 5
 %define _enable_pinentry_qt4 --enable-pinentry-qt4
+%define _enable_pinentry_qt --enable-pinentry-qt
 %else
 %define _enable_pinentry_qt --enable-pinentry-qt 
 %endif
 
 Name:    pinentry
 Version: 0.7.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -17,6 +18,9 @@ Source0: ftp://ftp.gnupg.org/gcrypt/pine
 Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# borrowed from opensuse
+Source10: pinentry-wrapper
+
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
@@ -27,9 +31,8 @@ BuildRequires: qt-devel
 BuildRequires: qt4-devel
 %endif
 
-Requires(post): %{_sbindir}/update-alternatives
+Requires(pre): %{_sbindir}/update-alternatives
 Requires(post): /sbin/install-info
-Requires(postun): %{_sbindir}/update-alternatives
 Requires(preun): /sbin/install-info
 
 Provides: %{name}-curses = %{version}-%{release}
@@ -45,8 +48,6 @@ Summary: Passphrase/PIN entry dialog bas
 Group:   Applications/System
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
 %description gtk
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
 utilize the Assuan protocol as described by the aegypten project; see
@@ -54,17 +55,27 @@ http://www.gnupg.org/aegypten/ for detai
 This package contains the GTK GUI based version of the PIN entry dialog.
 
 %package qt
-Summary: Passphrase/PIN entry dialog based on Qt
+Summary: Passphrase/PIN entry dialog based on Qt3
 Group:   Applications/System
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
 %description qt
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
 utilize the Assuan protocol as described by the aegypten project; see
 http://www.gnupg.org/aegypten/ for details.
-This package contains the Qt GUI based version of the PIN entry dialog.
+This package contains the Qt3 GUI based version of the PIN entry dialog.
+
+%package qt4
+Summary: Passphrase/PIN entry dialog based on Qt4
+Group:   Applications/System
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-gui = %{version}-%{release}
+%description qt4
+Pinentry is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project; see
+http://www.gnupg.org/aegypten/ for details.
+This package contains the Qt4 GUI based version of the PIN entry dialog.
+Support for Qt4 is new, and a bit experimental.
 
 
 %prep
@@ -100,12 +111,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Backwards compatibility
 ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
-%if 0%{?_enable_pinentry_qt4:1}
-ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
-%endif
 
-# Dummy symlink for %%ghost
-ln -sf %{_sysconfdir}/alternatives/pinentry $RPM_BUILD_ROOT%{_bindir}/pinentry
+install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -115,63 +122,49 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT
 
 
+# alternatives dropped at 0.7.6-3 (use %%trigger instead?)
+%pre
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
+
 %post
 /sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir 
-%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-  pinentry %{_bindir}/pinentry-curses %{?curses_priority}%{!?curses_priority:10} ||:
-
-%post gtk
-%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-  pinentry %{_bindir}/pinentry-gtk %{?gtk_priority}%{!?gtk_priority:40} ||:
-
-%post qt
-%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-  pinentry %{_bindir}/pinentry-qt %{?qt_priority}%{!?qt_priority:30} ||:
 
 %preun
 if [ $1 -eq 0 ] ; then
   /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir ||:
 fi
 
-%postun
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
-fi
-
-%postun gtk
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
-fi
-
-%postun qt
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
-fi
-
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/pinentry-curses
-%ghost %{_bindir}/pinentry
+%{_bindir}/pinentry
 %{_infodir}/pinentry.info*
 
 %files gtk
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-gtk
 %{_bindir}/pinentry-gtk-2
-%ghost %{_bindir}/pinentry
 
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-qt
+
 %if 0%{?_enable_pinentry_qt4:1}
+%files qt4
+%defattr(-,root,root,-)
 %{_bindir}/pinentry-qt4
 %endif
-%ghost %{_bindir}/pinentry
 
 
 %changelog
+* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3
+- drop alternatives, use app-wrapper instead (borrowed from opensuse)
+- -qt4 experimental subpkg, -qt includes qt3 version again  (#523488)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jussilehtola at fedoraproject.org  Wed Sep 16 17:28:14 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:28:14 +0000 (UTC)
Subject: rpms/qd/EL-5 qd.spec,1.1,1.2
Message-ID: <20090916172814.BDDDF11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/qd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1077/EL-5

Modified Files:
	qd.spec 
Log Message:
Fix location of Fortran modules.


Index: qd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qd/EL-5/qd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qd.spec	9 Mar 2009 17:57:55 -0000	1.1
+++ qd.spec	16 Sep 2009 17:28:14 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		qd
 Version:	2.3.7
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Double-Double and Quad-Double Arithmetic
 Group:		Applications/Engineering
 License:	BSD
@@ -68,6 +68,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv %{buildroot}/usr/share/doc/qd/* .
 rm -rf %{buildroot}/usr/share/
 
+# Move Fortran modules to %{_fmoddir}
+mkdir -p %{buildroot}%{_fmoddir}/%{name}
+mv %{buildroot}%{_libdir}/%{name}/*.mod %{buildroot}%{_fmoddir}/%{name}
+
 %check
 make check
 
@@ -78,22 +82,32 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README qd.pdf TODO
 %{_bindir}/qd-config
-%{_includedir}/qd
-%{_libdir}/*
+%{_fmoddir}/qd/
+%{_includedir}/qd/
+%{_libdir}/libqd.a
+%{_libdir}/libqd_f_main.a
+%{_libdir}/libqdmod.a
+
 
 %changelog
-* Sun Mar 08 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-5
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-7
+- Fix location of Fortran modules.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Mar 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-5
 - Fix license.
 
-* Thu Dec 18 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-4
+* Thu Dec 18 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-4
 - Change base name back to qd.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-3
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-3
 - Removed debug package.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-2
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-2
 - Review fixes.
 - Rename package to qd-devel.
 
-* Thu Nov 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-1
 - First release.



From jussilehtola at fedoraproject.org  Wed Sep 16 17:28:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:28:15 +0000 (UTC)
Subject: rpms/qd/F-10 qd.spec,1.1,1.2
Message-ID: <20090916172815.0E6D611C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/qd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1077/F-10

Modified Files:
	qd.spec 
Log Message:
Fix location of Fortran modules.


Index: qd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qd/F-10/qd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qd.spec	9 Mar 2009 17:57:55 -0000	1.1
+++ qd.spec	16 Sep 2009 17:28:14 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		qd
 Version:	2.3.7
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Double-Double and Quad-Double Arithmetic
 Group:		Applications/Engineering
 License:	BSD
@@ -68,6 +68,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv %{buildroot}/usr/share/doc/qd/* .
 rm -rf %{buildroot}/usr/share/
 
+# Move Fortran modules to %{_fmoddir}
+mkdir -p %{buildroot}%{_fmoddir}/%{name}
+mv %{buildroot}%{_libdir}/%{name}/*.mod %{buildroot}%{_fmoddir}/%{name}
+
 %check
 make check
 
@@ -78,22 +82,32 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README qd.pdf TODO
 %{_bindir}/qd-config
-%{_includedir}/qd
-%{_libdir}/*
+%{_fmoddir}/qd/
+%{_includedir}/qd/
+%{_libdir}/libqd.a
+%{_libdir}/libqd_f_main.a
+%{_libdir}/libqdmod.a
+
 
 %changelog
-* Sun Mar 08 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-5
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-7
+- Fix location of Fortran modules.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Mar 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-5
 - Fix license.
 
-* Thu Dec 18 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-4
+* Thu Dec 18 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-4
 - Change base name back to qd.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-3
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-3
 - Removed debug package.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-2
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-2
 - Review fixes.
 - Rename package to qd-devel.
 
-* Thu Nov 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-1
 - First release.



From jussilehtola at fedoraproject.org  Wed Sep 16 17:28:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:28:15 +0000 (UTC)
Subject: rpms/qd/F-11 qd.spec,1.1,1.2
Message-ID: <20090916172815.5688D11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/qd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1077/F-11

Modified Files:
	qd.spec 
Log Message:
Fix location of Fortran modules.


Index: qd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qd/F-11/qd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qd.spec	9 Mar 2009 17:55:40 -0000	1.1
+++ qd.spec	16 Sep 2009 17:28:15 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		qd
 Version:	2.3.7
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Double-Double and Quad-Double Arithmetic
 Group:		Applications/Engineering
 License:	BSD
@@ -68,6 +68,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv %{buildroot}/usr/share/doc/qd/* .
 rm -rf %{buildroot}/usr/share/
 
+# Move Fortran modules to %{_fmoddir}
+mkdir -p %{buildroot}%{_fmoddir}/%{name}
+mv %{buildroot}%{_libdir}/%{name}/*.mod %{buildroot}%{_fmoddir}/%{name}
+
 %check
 make check
 
@@ -78,22 +82,32 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README qd.pdf TODO
 %{_bindir}/qd-config
-%{_includedir}/qd
-%{_libdir}/*
+%{_fmoddir}/qd/
+%{_includedir}/qd/
+%{_libdir}/libqd.a
+%{_libdir}/libqd_f_main.a
+%{_libdir}/libqdmod.a
+
 
 %changelog
-* Sun Mar 08 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-5
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-7
+- Fix location of Fortran modules.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Mar 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-5
 - Fix license.
 
-* Thu Dec 18 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-4
+* Thu Dec 18 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-4
 - Change base name back to qd.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-3
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-3
 - Removed debug package.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-2
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-2
 - Review fixes.
 - Rename package to qd-devel.
 
-* Thu Nov 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-1
 - First release.



From jussilehtola at fedoraproject.org  Wed Sep 16 17:28:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 16 Sep 2009 17:28:15 +0000 (UTC)
Subject: rpms/qd/devel qd.spec,1.2,1.3
Message-ID: <20090916172815.9689611C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/qd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1077/devel

Modified Files:
	qd.spec 
Log Message:
Fix location of Fortran modules.


Index: qd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qd/devel/qd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qd.spec	27 Jul 2009 01:45:29 -0000	1.2
+++ qd.spec	16 Sep 2009 17:28:15 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		qd
 Version:	2.3.7
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Double-Double and Quad-Double Arithmetic
 Group:		Applications/Engineering
 License:	BSD
@@ -68,6 +68,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv %{buildroot}/usr/share/doc/qd/* .
 rm -rf %{buildroot}/usr/share/
 
+# Move Fortran modules to %{_fmoddir}
+mkdir -p %{buildroot}%{_fmoddir}/%{name}
+mv %{buildroot}%{_libdir}/%{name}/*.mod %{buildroot}%{_fmoddir}/%{name}
+
 %check
 make check
 
@@ -78,25 +82,32 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README qd.pdf TODO
 %{_bindir}/qd-config
-%{_includedir}/qd
-%{_libdir}/*
+%{_fmoddir}/qd/
+%{_includedir}/qd/
+%{_libdir}/libqd.a
+%{_libdir}/libqd_f_main.a
+%{_libdir}/libqdmod.a
+
 
 %changelog
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-7
+- Fix location of Fortran modules.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun Mar 08 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-5
+* Sun Mar 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-5
 - Fix license.
 
-* Thu Dec 18 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-4
+* Thu Dec 18 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-4
 - Change base name back to qd.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-3
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-3
 - Removed debug package.
 
-* Sat Dec 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-2
+* Sat Dec 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-2
 - Review fixes.
 - Rename package to qd-devel.
 
-* Thu Nov 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.3.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-1
 - First release.



From markmc at fedoraproject.org  Wed Sep 16 17:31:16 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 16 Sep 2009 17:31:16 +0000 (UTC)
Subject: rpms/qemu/devel ksmtuned, NONE, 1.1 ksmtuned.conf, NONE,
	1.1 ksmtuned.init, NONE, 1.1 ksm.init, 1.1, 1.2 qemu.spec, 1.127,
	1.128
Message-ID: <20090916173116.36AEC11C00EB@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2712

Modified Files:
	ksm.init qemu.spec 
Added Files:
	ksmtuned ksmtuned.conf ksmtuned.init 
Log Message:
* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-3
- Add ksmtuned, also from Dan Kenigsberg
- Use %_initddir macro



--- NEW FILE ksmtuned ---
#!/bin/bash
#
# Copyright 2009 Red Hat, Inc. and/or its affiliates.
# Released under the GPL
#
# Author:      Dan Kenigsberg <danken at redhat.com>
#
# ksmtuned - a simple script that controls whether (and with what vigor) ksm
# should search for duplicated pages.
#
# starts ksm when memory commited to qemu processes exceeds a threshold, and
# make ksm work harder and harder untill memory load falls below that
# threshold.
#
# needs testing and ironing. contact danken at redhat.com if something breaks.

if [ -f /etc/ksmtuned.conf ]; then
    . /etc/ksmtuned.conf
fi

KSM_MONITOR_INTERVAL=${KSM_MONITOR_INTERVAL:-60}
KSM_NPAGES_BOOST=${KSM_NPAGES_BOOST:-300}
KSM_NPAGES_DECAY=${KSM_NPAGES_DECAY:--50}

KSM_NPAGES_MIN=${KSM_NPAGES_MIN:-64}
KSM_NPAGES_MAX=${KSM_NPAGES_MAX:-1250}
# millisecond sleep between ksm scans for 16Gb server. Smaller servers sleep
# more, bigger sleep less.
KSM_SLEEP_MSEC=${KSM_SLEEP_MSEC:-10}

KSM_THRES_COEF=${KSM_THRES_COEF:-20}
KSM_THRES_CONST=${KSM_THRES_CONST:-2048}

total=`awk '/^MemTotal:/ {print $2}' /proc/meminfo`
[ -n "$DEBUG" ] && echo total $total

npages=0
sleep=$[KSM_SLEEP_MSEC * 16 * 1024 * 1024 / total]
[ $sleep -le 10 ] && sleep=10
[ -n "$DEBUG" ] && echo sleep $sleep
thres=$[total * KSM_THRES_COEF / 100]
if [ $KSM_THRES_CONST -gt $thres ]; then
    thres=$KSM_THRES_CONST
fi
[ -n "$DEBUG" ] && echo thres $thres

KSMCTL () {
    case x$1 in
        xstop)
            echo 0 > /sys/kernel/mm/ksm/run
            ;;
        xstart)
            echo $2 > /sys/kernel/mm/ksm/pages_to_scan
            echo $3 > /sys/kernel/mm/ksm/sleep_millisecs
            echo 1 > /sys/kernel/mm/ksm/run
            ;;
    esac
}

committed_memory () {
    # calculate how much memory is committed to running qemu processes
    local progname
    progname=${1:-qemu}
    ps -o vsz `pgrep $progname` | awk '{ sum += $1 }; END { print sum }'
}

free_memory () {
    awk '/^(MemFree|Buffers|MemCached):/ {free += $2}; END {print free}' \
                /proc/meminfo
}

increase_npages() {
    local delta
    delta=${1:-0}
    npages=$[npages + delta]
    if [ $npages -lt $KSM_NPAGES_MIN ]; then
        npages=$KSM_NPAGES_MIN
    elif [ $npages -gt $KSM_NPAGES_MAX ]; then
        npages=$KSM_NPAGES_MAX
    fi
    echo $npages
}


adjust () {
    local free committed
    free=`free_memory`
    committed=`committed_memory`
    [ -n "$DEBUG" ] && echo committed $committed free $free
    if [ $[committed + thres] -lt $total -a $free -gt $thres ]; then
        KSMCTL stop
        [ -n "$DEBUG" ] && echo "$[committed + thres] < $total and free > $thres, stop ksm"
        return 1
    fi
    [ -n "$DEBUG" ] && echo "$[committed + thres] > $total, start ksm"
    if [ $free -lt $thres ]; then
        npages=`increase_npages $KSM_NPAGES_BOOST`
        [ -n "$DEBUG" ] && echo "$free < $thres, boost"
    else
        npages=`increase_npages $KSM_NPAGES_DECAY`
        [ -n "$DEBUG" ] && echo "$free > $thres, decay"
    fi
    KSMCTL start $npages $sleep
    [ -n "$DEBUG" ] && echo "KSMCTL start $npages $sleep"
    return 0
}

loop () {
    while true
    do
        sleep $KSM_MONITOR_INTERVAL
        adjust
    done
}

PIDFILE=${PIDFILE-/var/run/ksmtune.pid}
if touch "$PIDFILE"; then
  loop &
  echo $! > "$PIDFILE"
fi


--- NEW FILE ksmtuned.conf ---
# Configuration file for ksmtuned.

# How long ksmtuned should sleep between tuning adjustments
# KSM_MONITOR_INTERVAL=60

# Millisecond sleep between ksm scans for 16Gb server.
# Smaller servers sleep more, bigger sleep less.
# KSM_SLEEP_MSEC=10

# KSM_NPAGES_BOOST=300
# KSM_NPAGES_DECAY=-50
# KSM_NPAGES_MIN=64
# KSM_NPAGES_MAX=1250

# KSM_THRES_COEF=20
# KSM_THRES_CONST=2048


--- NEW FILE ksmtuned.init ---
#!/bin/bash
#
# ksmtuned     Kernel Samepage Merging (KSM) Tuning Daemon
#
# Author:      Dan Kenigsberg <danken at redhat.com>
#
# Copyright 2009 Red Hat, Inc. and/or its affiliates.
# Released under the GPL
#
# chkconfig: - 85 15
# description: The KSM tuning daemon controls whether (and with what vigor) \
#              ksm should ksm search duplicated pages.
# processname: ksmtuned
# config: /etc/ksmtuned.conf
# pidfile: /var/run/ksmtuned.pid
#
### BEGIN INIT INFO
# Provides: ksmtuned
# Required-Start:
# Required-Stop:
# Should-Start:
# Short-Description: tune the speed of ksm
# Description: The Kernel Samepage Merging control Daemon is a simple script
#   that controls whether (and with what vigor) should ksm search duplicated
#   memory pages.
#   needs testing and ironing. contact danken at redhat.com if something breaks.
### END INIT INFO

. /etc/rc.d/init.d/functions

prog=ksmtuned
ksmtuned=/usr/sbin/ksmtuned
pidfile=${PIDFILE-/var/run/ksmtune.pid}
RETVAL=0

start() {
    echo -n $"Starting $prog: "
    daemon --pidfile=${pidfile} $ksmtuned
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
}

stop() {
    echo -n $"Stopping $prog: "
    killproc -p ${pidfile}
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
}

restart() {
    stop
    start
}

condrestart() {
    [ -e /var/lock/subsys/$prog ] && restart || :
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status -p ${pidfile} $prog
	RETVAL=$?
	;;
  restart)
	restart
	;;
  condrestart)
	condrestart
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
	RETVAL=3
esac

exit $RETVAL


Index: ksm.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/ksm.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ksm.init	16 Sep 2009 09:38:29 -0000	1.1
+++ ksm.init	16 Sep 2009 17:31:15 -0000	1.2
@@ -76,11 +76,10 @@ case "$1" in
 	stop
 	start
 	;;
-  signal)
-	signal
-	;;
+  condrestart)
+        ;;
   *)
-	echo $"Usage: $prog {start|stop|restart|status|help}"
+	echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- qemu.spec	16 Sep 2009 09:38:29 -0000	1.127
+++ qemu.spec	16 Sep 2009 17:31:15 -0000	1.128
@@ -3,7 +3,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -19,9 +19,12 @@ Source2: kvm.modules
 # Creates /dev/kvm
 Source3: 80-kvm.rules
 
-# KSM control script
+# KSM control scripts
 Source4: ksm.init
 Source5: ksm.sysconfig
+Source6: ksmtuned.init
+Source7: ksmtuned
+Source8: ksmtuned.conf
 
 # Not upstream, why?
 Patch01: qemu-bios-bigger-roms.patch
@@ -100,6 +103,9 @@ This package provides the command line t
 %package  common
 Summary: QEMU common files needed by all QEMU targets
 Group: Development/Tools
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service /sbin/chkconfig
+Requires(postun): /sbin/service
 %description common
 QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
@@ -300,9 +306,13 @@ make V=1 %{?_smp_mflags} $buildldflags
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ksm
+install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initddir}/ksm
 install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ksm
 
+install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_initddir}/rc.d/init.d/ksmtuned
+install -D -p -m 0755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
+install -D -p -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
+
 %ifarch %{ix86} x86_64
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
@@ -324,7 +334,7 @@ make prefix="${RPM_BUILD_ROOT}%{_prefix}
      docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
      datadir="${RPM_BUILD_ROOT}%{_datadir}/%{name}" install
 chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
+install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/qemu
 install -D -p -m 0644 -t ${RPM_BUILD_ROOT}%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE
 
 install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf
@@ -366,6 +376,30 @@ rm -rf $RPM_BUILD_ROOT
 sh %{_sysconfdir}/sysconfig/modules/kvm.modules
 %endif
 
+%post common
+getent group kvm >/dev/null || groupadd -g 36 -r kvm
+getent group qemu >/dev/null || groupadd -g 107 -r qemu
+getent passwd qemu >/dev/null || \
+  useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
+    -c "qemu user" qemu
+
+/sbin/chkconfig --add ksm
+/sbin/chkconfig --add ksmtuned
+
+%preun common
+if [ $1 -eq 0 ]; then
+    /sbin/service ksmtuned stop &>/dev/null || :
+    /sbin/chkconfig --del ksmtuned
+    /sbin/service ksm stop &>/dev/null || :
+    /sbin/chkconfig --del ksm
+fi
+
+%postun common
+if [ $1 -ge 1 ]; then
+    /sbin/service ksm condrestart &>/dev/null || :
+    /sbin/service ksmtuned condrestart &>/dev/null || :
+fi
+
 %post user
 /sbin/chkconfig --add qemu
 
@@ -380,13 +414,6 @@ if [ $1 -ge 1 ]; then
     /sbin/service qemu condrestart &>/dev/null || :
 fi
 
-%post common
-getent group kvm >/dev/null || groupadd -g 36 -r kvm
-getent group qemu >/dev/null || groupadd -g 107 -r qemu
-getent passwd qemu >/dev/null || \
-  useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
-    -c "qemu user" qemu
-
 %files 
 %defattr(-,root,root)
 
@@ -409,11 +436,14 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man8/qemu-nbd.8*
 %{_bindir}/qemu-nbd
 %config(noreplace) %{_sysconfdir}/sasl2/qemu.conf
-%{_sysconfdir}/rc.d/init.d/ksm
+%{_initddir}/ksm
 %config(noreplace) %{_sysconfdir}/sysconfig/ksm
+%{_initddir}/ksmtuned
+%{_sbindir}/ksmtuned
+%config(noreplace) %{_sysconfdir}/ksmtuned.conf
 %files user
 %defattr(-,root,root)
-%{_sysconfdir}/rc.d/init.d/qemu
+%{_initddir}/qemu
 %{_bindir}/qemu-alpha
 %{_bindir}/qemu-arm
 %{_bindir}/qemu-armeb
@@ -496,6 +526,10 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-3
+- Add ksmtuned, also from Dan Kenigsberg
+- Use %_initddir macro
+
 * Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-2
 - Add ksm control script from Dan Kenigsberg
 



From nalin at fedoraproject.org  Wed Sep 16 17:31:17 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed, 16 Sep 2009 17:31:17 +0000 (UTC)
Subject: rpms/nss-ldapd/F-11 nslcd.init,1.1,1.2 nss-ldapd.spec,1.3,1.4
Message-ID: <20090916173117.8892B11C00EB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/nss-ldapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2580/F-11

Modified Files:
	nslcd.init nss-ldapd.spec 
Log Message:
- apply Mitchell Berger's patch to clean up the init script, use %%{_initddir},
  and correct the %%post so that it only thinks about turning on nslcd when
  we're first being installed (#522947)
- tell status() where the pidfile is when the init script is called for that



Index: nslcd.init
===================================================================
RCS file: /cvs/extras/rpms/nss-ldapd/F-11/nslcd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nslcd.init	23 Jun 2009 18:17:30 -0000	1.1
+++ nslcd.init	16 Sep 2009 17:31:17 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # chkconfig: - 12 88 
-# description:  Provides naming services using a directory server.
+# description: Provides naming services using a directory server.
 # processname: /usr/sbin/nslcd
 # config: /etc/nss-ldapd.conf
 # pidfile: /var/run/nslcd/nslcd.pid
@@ -10,17 +10,16 @@
 ### BEGIN INIT INFO
 # Provides: nslcd
 # Required-Start: $network
-# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: naming services LDAP client daemon
-# Description: The nslcd service provides naming services by using a directory server.
+# Description: Provides naming services using a directory server.
 ### END INIT INFO
 
 program=/usr/sbin/nslcd
 prog=${program##*/}
 pidfile=/var/run/nslcd/nslcd.pid
 
-if [ -f /etc/init.d/functions ]; then
-	. /etc/init.d/functions
+if [ -f /etc/rc.d/init.d/functions ]; then
+	. /etc/rc.d/init.d/functions
 fi
 
 RETVAL=0
@@ -51,22 +50,33 @@ restart() {
 
 # See how we were called.
 case "$1" in
-    start|stop|restart)
+    start)
+        [ -f /var/lock/subsys/$prog ] && exit 0
+        $1
+        ;;
+    stop)
+        [ -f /var/lock/subsys/$prog ] || exit 0
+        $1
+        ;;
+    restart)
         $1
         ;;
     status)
-        status $program
+        status -p $pidfile $program
         RETVAL=$?
         ;;
-    condrestart)
+    condrestart|try-restart)
         [ -f /var/lock/subsys/$prog ] && restart || :
         ;;
     reload)
         echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
+        RETVAL=3
+        ;;
+    force-reload)
+        restart
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
         exit 1
         ;;
 esac


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-ldapd/F-11/nss-ldapd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-ldapd.spec	2 Sep 2009 15:33:28 -0000	1.3
+++ nss-ldapd.spec	16 Sep 2009 17:31:17 -0000	1.4
@@ -17,7 +17,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	openldap-devel, krb5-devel
 
 # Pull in the pam_ldap module, which is currently bundled with nss_ldap, to
-# keep keep upgrades from removing the module.  When nss-ldapd grows its own
+# keep upgrades from removing the module.  When nss-ldapd grows its own
 # pam_ldap.so, we'll have to revisit this.
 Requires:	/%{_lib}/security/pam_ldap.so
 Requires(post):		/sbin/ldconfig, chkconfig, grep, sed
@@ -39,8 +39,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{%{_initrddir},%{_libdir}}
-install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir}/nslcd
+mkdir -p $RPM_BUILD_ROOT/{%{_initddir},%{_libdir}}
+install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initddir}/nslcd
 %if %{provide_so_link}
 if test %{_libdir} != /%{_lib} ; then
 	touch $RPM_BUILD_ROOT/topdir
@@ -75,14 +75,14 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/*.so.*
 %{_mandir}/*/*
 %attr(0600,root,root) %config(noreplace) /etc/nss-ldapd.conf
-%attr(0755,root,root) %{_initrddir}/nslcd
+%attr(0755,root,root) %{_initddir}/nslcd
 %attr(0755,nslcd,root) /var/run/nslcd
 
 %pre
 getent group  ldap  > /dev/null || \
 /usr/sbin/groupadd -r -g 55 ldap
 getent passwd nslcd > /dev/null || \
-/usr/sbin/useradd -r -g ldap -c 'LDAP client user' \
+/usr/sbin/useradd -r -g ldap -c 'LDAP Client User' \
     -u 65 -d / -s /sbin/nologin nslcd 2> /dev/null || :
 
 %post
@@ -124,11 +124,14 @@ if ! grep -q -F "# $comment" $target 2> 
 	egrep '^(tls_)' /etc/ldap.conf >> $target
 	egrep '^(timelimit|bind_timelimit|idle_timelimit|reconnect_sleeptime|reconnect_maxsleeptime)[[:blank:]]' /etc/ldap.conf >> $target
 fi
-# If the system is already configured to use LDAP as a naming service, enable
-# the daemon, but don't start it since we can never know if that's a safe thing
-# to do.
-if egrep -q '^USELDAP=yes$' /etc/sysconfig/authconfig 2> /dev/null ; then
-	/sbin/chkconfig nslcd on
+# If this is the first time we're being installed, and the system is already
+# configured to use LDAP as a naming service, enable the daemon, but don't
+# start it since we can never know if that's a safe thing to do.  If this
+# is an upgrade/reinstall, leave the user's runlevel selections alone.
+if [ "$1" -eq "1" ]; then
+	if egrep -q '^USELDAP=yes$' /etc/sysconfig/authconfig 2> /dev/null ; then
+		/sbin/chkconfig nslcd on
+	fi
 fi
 exit 0
 
@@ -147,6 +150,16 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 16 2009 Nalin Dahyabhai <nalin at redhat.com> 
+- apply Mitchell Berger's patch to clean up the init script, use %%{_initddir},
+  and correct the %%post so that it only thinks about turning on nslcd when
+  we're first being installed (#522947)
+- tell status() where the pidfile is when the init script is called for that
+
+* Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com>
+- fix typo in a comment, capitalize the full name for "LDAP Client User" (more
+  from #516049)
+
 * Wed Sep  2 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-1
 - update to 0.6.11
 



From nalin at fedoraproject.org  Wed Sep 16 17:31:18 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed, 16 Sep 2009 17:31:18 +0000 (UTC)
Subject: rpms/nss-ldapd/devel nslcd.init,1.1,1.2 nss-ldapd.spec,1.4,1.5
Message-ID: <20090916173118.820CC11C0334@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/nss-ldapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2580/devel

Modified Files:
	nslcd.init nss-ldapd.spec 
Log Message:
- apply Mitchell Berger's patch to clean up the init script, use %%{_initddir},
  and correct the %%post so that it only thinks about turning on nslcd when
  we're first being installed (#522947)
- tell status() where the pidfile is when the init script is called for that



Index: nslcd.init
===================================================================
RCS file: /cvs/extras/rpms/nss-ldapd/devel/nslcd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nslcd.init	23 Jun 2009 18:17:30 -0000	1.1
+++ nslcd.init	16 Sep 2009 17:31:17 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # chkconfig: - 12 88 
-# description:  Provides naming services using a directory server.
+# description: Provides naming services using a directory server.
 # processname: /usr/sbin/nslcd
 # config: /etc/nss-ldapd.conf
 # pidfile: /var/run/nslcd/nslcd.pid
@@ -10,17 +10,16 @@
 ### BEGIN INIT INFO
 # Provides: nslcd
 # Required-Start: $network
-# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: naming services LDAP client daemon
-# Description: The nslcd service provides naming services by using a directory server.
+# Description: Provides naming services using a directory server.
 ### END INIT INFO
 
 program=/usr/sbin/nslcd
 prog=${program##*/}
 pidfile=/var/run/nslcd/nslcd.pid
 
-if [ -f /etc/init.d/functions ]; then
-	. /etc/init.d/functions
+if [ -f /etc/rc.d/init.d/functions ]; then
+	. /etc/rc.d/init.d/functions
 fi
 
 RETVAL=0
@@ -51,22 +50,33 @@ restart() {
 
 # See how we were called.
 case "$1" in
-    start|stop|restart)
+    start)
+        [ -f /var/lock/subsys/$prog ] && exit 0
+        $1
+        ;;
+    stop)
+        [ -f /var/lock/subsys/$prog ] || exit 0
+        $1
+        ;;
+    restart)
         $1
         ;;
     status)
-        status $program
+        status -p $pidfile $program
         RETVAL=$?
         ;;
-    condrestart)
+    condrestart|try-restart)
         [ -f /var/lock/subsys/$prog ] && restart || :
         ;;
     reload)
         echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
+        RETVAL=3
+        ;;
+    force-reload)
+        restart
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
         exit 1
         ;;
 esac


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-ldapd/devel/nss-ldapd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-ldapd.spec	8 Sep 2009 17:17:18 -0000	1.4
+++ nss-ldapd.spec	16 Sep 2009 17:31:17 -0000	1.5
@@ -39,8 +39,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{%{_initrddir},%{_libdir}}
-install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir}/nslcd
+mkdir -p $RPM_BUILD_ROOT/{%{_initddir},%{_libdir}}
+install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initddir}/nslcd
 %if %{provide_so_link}
 if test %{_libdir} != /%{_lib} ; then
 	touch $RPM_BUILD_ROOT/topdir
@@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/*.so.*
 %{_mandir}/*/*
 %attr(0600,root,root) %config(noreplace) /etc/nss-ldapd.conf
-%attr(0755,root,root) %{_initrddir}/nslcd
+%attr(0755,root,root) %{_initddir}/nslcd
 %attr(0755,nslcd,root) /var/run/nslcd
 
 %pre
@@ -124,11 +124,14 @@ if ! grep -q -F "# $comment" $target 2> 
 	egrep '^(tls_)' /etc/ldap.conf >> $target
 	egrep '^(timelimit|bind_timelimit|idle_timelimit|reconnect_sleeptime|reconnect_maxsleeptime)[[:blank:]]' /etc/ldap.conf >> $target
 fi
-# If the system is already configured to use LDAP as a naming service, enable
-# the daemon, but don't start it since we can never know if that's a safe thing
-# to do.
-if egrep -q '^USELDAP=yes$' /etc/sysconfig/authconfig 2> /dev/null ; then
-	/sbin/chkconfig nslcd on
+# If this is the first time we're being installed, and the system is already
+# configured to use LDAP as a naming service, enable the daemon, but don't
+# start it since we can never know if that's a safe thing to do.  If this
+# is an upgrade/reinstall, leave the user's runlevel selections alone.
+if [ "$1" -eq "1" ]; then
+	if egrep -q '^USELDAP=yes$' /etc/sysconfig/authconfig 2> /dev/null ; then
+		/sbin/chkconfig nslcd on
+	fi
 fi
 exit 0
 
@@ -147,6 +150,12 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 16 2009 Nalin Dahyabhai <nalin at redhat.com> 
+- apply Mitchell Berger's patch to clean up the init script, use %%{_initddir},
+  and correct the %%post so that it only thinks about turning on nslcd when
+  we're first being installed (#522947)
+- tell status() where the pidfile is when the init script is called for that
+
 * Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com>
 - fix typo in a comment, capitalize the full name for "LDAP Client User" (more
   from #516049)



From mauelsha at fedoraproject.org  Wed Sep 16 17:31:25 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 17:31:25 +0000 (UTC)
Subject: rpms/dmraid/devel Makefile.in.avoid_dmreg.o_build.patch,NONE,1.1
Message-ID: <20090916173125.1C5F311C00EB@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2776

Added Files:
	Makefile.in.avoid_dmreg.o_build.patch 
Log Message:
1.0.0.rc16 update

Makefile.in.avoid_dmreg.o_build.patch:
 Makefile.in |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE Makefile.in.avoid_dmreg.o_build.patch ---
diff --git a/lib/Makefile.in.avoid_dmreg.o_build b/lib/Makefile.in
index 25a197c..dc465bc 100644
--- a/lib/Makefile.in.avoid_dmreg.o_build
+++ b/lib/Makefile.in
@@ -8,7 +8,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES=\
+SOURCES  = \
 	activate/activate.c \
 	activate/devmapper.c \
 	device/ata.c \
@@ -43,8 +43,11 @@ SOURCES=\
 	format/ddf/ddf1_crc.c \
 	format/ddf/ddf1_cvt.c \
 	format/ddf/ddf1_dump.c \
-	format/partition/dos.c \
-	register/dmreg.c
+	format/partition/dos.c
+
+ifeq ("@STATIC_LINK@", "no")
+	SOURCES += register/dmreg.c
+endif
 
 OBJECTS=$(SOURCES:%.c=%.o)
 



From till at fedoraproject.org  Wed Sep 16 17:32:05 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 17:32:05 +0000 (UTC)
Subject: rpms/aircrack-ng/devel aircrack-ng-1.0-oui-path.patch, NONE,
	1.1 .cvsignore, 1.17, 1.18 aircrack-ng.spec, 1.30, 1.31 sources,
	1.17, 1.18
Message-ID: <20090916173205.47B2711C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3266

Modified Files:
	.cvsignore aircrack-ng.spec sources 
Added Files:
	aircrack-ng-1.0-oui-path.patch 
Log Message:
* Wed Sep 16 2009 Till Maas <opensource at till.name> - 1.0-1
- Update to stable release
- Include airodump-ng-oui-update
- prepare shipping of oui database
- fix paths for oui database in airodump-ng-oui-update and airodump-ng


aircrack-ng-1.0-oui-path.patch:
 scripts/airodump-ng-oui-update |    2 +-
 src/airodump-ng.h              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE aircrack-ng-1.0-oui-path.patch ---
diff -up aircrack-ng-1.0/src/airodump-ng.h.oui-path aircrack-ng-1.0/src/airodump-ng.h
--- aircrack-ng-1.0/src/airodump-ng.h.oui-path	2009-09-16 16:57:26.000000000 +0200
+++ aircrack-ng-1.0/src/airodump-ng.h	2009-09-16 16:57:53.000000000 +0200
@@ -70,7 +70,7 @@ static uchar ZERO[32] =
 "\x00\x00\x00\x00\x00\x00\x00\x00"
 "\x00\x00\x00\x00\x00\x00\x00\x00";
 
-#define OUI_PATH "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt"
+#define OUI_PATH "/etc/aircrack-ng/airodump-ng-oui.txt"
 #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
 
 int read_pkts=0;
diff -up aircrack-ng-1.0/scripts/airodump-ng-oui-update.oui-path aircrack-ng-1.0/scripts/airodump-ng-oui-update
--- aircrack-ng-1.0/scripts/airodump-ng-oui-update.oui-path	2009-09-16 16:55:43.000000000 +0200
+++ aircrack-ng-1.0/scripts/airodump-ng-oui-update	2009-09-16 16:56:29.000000000 +0200
@@ -4,7 +4,7 @@ CURL=`which curl 2>/dev/null`
 WGET=`which wget 2>/dev/null`
 OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt"
 
-OUI_PATH="/usr/local/etc/aircrack-ng"
+OUI_PATH="/etc/aircrack-ng"
 AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt"
 OUI_IEEE="${OUI_PATH}/oui.txt"
 USERID=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	13 Apr 2009 20:07:11 -0000	1.17
+++ .cvsignore	16 Sep 2009 17:32:04 -0000	1.18
@@ -1,3 +1 @@
-aircrack-ng-ptw.cap
-aircrack-ng-test.ivs
-aircrack-ng-1.0-rc3.tar.gz
+aircrack-ng-1.0.tar.gz


Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- aircrack-ng.spec	21 Aug 2009 12:20:43 -0000	1.30
+++ aircrack-ng.spec	16 Sep 2009 17:32:05 -0000	1.31
@@ -1,25 +1,27 @@
-%define alphatag rc3
+#%global alphatag rc3
 
 Name:           aircrack-ng
 Version:        1.0
-Release:        0.10.%{alphatag}%{?dist}
+#Release:        0.10.%{alphatag}%{?dist}
 #Release:        0.7.%{alphatag}svn%{?dist}
-#Release:        1%{?dist}
+Release:        1%{?dist}
 Summary:        802.11 (wireless) sniffer and WEP/WPA-PSK key cracker
 
 Group:          Applications/System
 
 License:        GPLv2+
 URL:            http://www.aircrack-ng.org/
-#Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz
-Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}-%{alphatag}.tar.gz
+Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz
+#Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}-%{alphatag}.tar.gz
 #Source0:        aircrack-ng-%{version}-%{alphatag}.tar.gz
-Source1:        %{name}-tarball
+#Source1:        %{name}-tarball
 #Source2:        aircrack-ng-ptw.cap
 #Source2:        http://dl.aircrack-ng.org/ptw.cap
 #Source3:        aircrack-ng-test.ivs
 #Source3:       http://download.aircrack-ng.org/wiki-files/other/test.ivs
-# 2009-04-13: will be sent to upstream if upstream bugtracker is reachable again
+# License unclear:
+#Source4:        http://standards.ieee.org/regauth/oui/oui.txt
+# 2009-09-16: submitted upstream: 
 Patch0:         aircrack-ng-parallel_make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  sqlite-devel openssl-devel
@@ -34,11 +36,16 @@ capture files), and some tools to handle
 
 
 %prep
-%setup -q -n aircrack-ng-%{version}-%{alphatag}
-#%setup -q -n aircrack-ng-%{version}
+#%setup -q -n aircrack-ng-%{version}-%{alphatag}
+%setup -q -n aircrack-ng-%{version}
 %patch0 -p1 -b .parallel_make
 
 %build
+#grep '(hex') %{SOURCE4} > airodump-ng-oui.txt
+# License unclear
+touch airodump-ng-oui.txt
+#touch --reference %{SOURCE4} airodump-ng-oui.txt
+
 export CFLAGS=$RPM_OPT_FLAGS
 # unstable=true needed for wesside-ng, easside-ng, buddy-ng and tkiptun-ng
 # (also needed in make install)
@@ -49,6 +56,7 @@ make %{?_smp_mflags} sqlite=true unstabl
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir}/man1 sqlite=true unstable=true
+install -p -m 644 -D airodump-ng-oui.txt  $RPM_BUILD_ROOT%{_sysconfdir}/aircrack-ng/airodump-ng-oui.txt
 
 
 #%check
@@ -83,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/aireplay-ng
 %{_sbindir}/airmon-ng
 %{_sbindir}/airodump-ng
+%{_sbindir}/airodump-ng-oui-update
 %{_sbindir}/airserv-ng
 %{_sbindir}/airtun-ng
 %{_sbindir}/easside-ng
@@ -107,9 +116,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/packetforge-ng.1*
 %{_mandir}/man1/tkiptun-ng.1*
 %{_mandir}/man1/wesside-ng.1*
+%dir %{_sysconfdir}/aircrack-ng
+%config(noreplace) %{_sysconfdir}/aircrack-ng/airodump-ng-oui.txt
 
 
 %changelog
+* Wed Sep 16 2009 Till Maas <opensource at till.name> - 1.0-1
+- Update to stable release
+- Include airodump-ng-oui-update
+- prepare shipping of oui database
+- fix paths for oui database in airodump-ng-oui-update and airodump-ng
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.10.rc3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	13 Apr 2009 20:07:11 -0000	1.17
+++ sources	16 Sep 2009 17:32:05 -0000	1.18
@@ -1,3 +1 @@
-cad87df60f251eb73d2dbc9216cef4e3  aircrack-ng-ptw.cap
-f9f430b935e82c69ffecf0be95d7348b  aircrack-ng-test.ivs
-37884de939af82eab60d3e7d165b40ad  aircrack-ng-1.0-rc3.tar.gz
+dafbfaf944ca9d523fde4bae86f0c067  aircrack-ng-1.0.tar.gz



From crobinso at fedoraproject.org  Wed Sep 16 17:33:01 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed, 16 Sep 2009 17:33:01 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.500.0-bogus-driver-xml.patch, 
	NONE, 1.1 virtinst-0.500.0-disk-format.patch, NONE,
	1.1 virtinst-0.500.0-f12-distro.patch, NONE,
	1.1 python-virtinst.spec, 1.71, 1.72
Message-ID: <20090916173301.09FF911C00CF@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3759

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.0-bogus-driver-xml.patch 
	virtinst-0.500.0-disk-format.patch 
	virtinst-0.500.0-f12-distro.patch 
Log Message:
Don't generate bogus disk driver XML.
Add '--disk format=' for specifying format (qcow2, ...) when provisioning
Add Fedora12 to os dictionary


virtinst-0.500.0-bogus-driver-xml.patch:
 AUTHORS                 |    1 +
 virtinst/VirtualDisk.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.500.0-bogus-driver-xml.patch ---
# HG changeset patch
# User Alban Browaeys <prahal at yahoo.com>
# Date 1249497422 14400
# Node ID 0d3cdc5ff5d091dd73d3ef0fe21123fb63b4d7a0
# Parent  07d296ecfbeb3c42e4db0efbeb03a9d8c4cac501
Set proper driver type from storage volume xml.

Fixes possible traceback if creating a qemu VM from a storage volume.

diff -r 07d296ecfbeb -r 0d3cdc5ff5d0 AUTHORS
--- a/AUTHORS	Wed Aug 05 14:32:40 2009 -0400
+++ b/AUTHORS	Wed Aug 05 14:37:02 2009 -0400
@@ -42,6 +42,7 @@
    Laurent L?onard <laurent-at-open-minds-dot-org>
    Christophe Sauthier <christophe-dot-sauthier-at-objectif-libre-dot-com>
    Michal Novotny <minovotn-at-redhat-dot-com>
+   Alban Browaeys <prahal-at-yahoo-dot-com>
 
    ...send patches and get your name here...
 
diff -r 07d296ecfbeb -r 0d3cdc5ff5d0 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Wed Aug 05 14:32:40 2009 -0400
+++ b/virtinst/VirtualDisk.py	Wed Aug 05 14:37:02 2009 -0400
@@ -470,7 +470,7 @@
 
         if self.vol_object:
             drvtype = _util.get_xml_path(self.vol_object.XMLDesc(0),
-                                         "/volume/target/format")
+                                         "/volume/target/format/@type")
 
         elif self.vol_install:
             if drvname == self.DRIVER_QEMU:

virtinst-0.500.0-disk-format.patch:
 man/en/virt-install.1      |    5 +++++
 man/en/virt-install.pod.in |    6 ++++++
 tests/clitest.py           |   13 +++++++++++++
 virt-install               |   16 ++++++++++------
 virtinst/VirtualDisk.py    |   33 ++++++++++++++++++++++++++++++++-
 5 files changed, 66 insertions(+), 7 deletions(-)

--- NEW FILE virtinst-0.500.0-disk-format.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253112830 14400
# Node ID 6a398359952bfd8cc62e36afc26bb470862ce42d
# Parent  252ff7bc5ff9e95f49dd7deb6ef6af07287a5055
virt-install: Add 'format' option to --disk

Allows specifying storage volume format (raw, qcow2, etc.).

diff -r 252ff7bc5ff9 -r 6a398359952b man/en/virt-install.1
--- a/man/en/virt-install.1	Sun Sep 13 18:20:15 2009 -0400
+++ b/man/en/virt-install.1	Wed Sep 16 10:53:50 2009 -0400
@@ -659,6 +659,11 @@
 The cache value can be 'none', 'writethrough', or 'writeback'.
 \&'writethrough' provides read caching. 'writeback' provides
 read and write caching.
+.IP "\fBformat\fR" 4
+.IX Item "format"
+Image format to be used if creating managed storage. For file volumes, this
+can be 'raw', 'qcow2', 'vmdk', etc. See format types in
+<http://libvirt.org/storage.html> for possible values.
 .RE
 .RS 2
 .Sp
diff -r 252ff7bc5ff9 -r 6a398359952b man/en/virt-install.pod.in
--- a/man/en/virt-install.pod.in	Sun Sep 13 18:20:15 2009 -0400
+++ b/man/en/virt-install.pod.in	Wed Sep 16 10:53:50 2009 -0400
@@ -435,6 +435,12 @@
 'writethrough' provides read caching. 'writeback' provides
 read and write caching.
 
+=item B<format>
+
+Image format to be used if creating managed storage. For file volumes, this
+can be 'raw', 'qcow2', 'vmdk', etc. See format types in
+L<http://libvirt.org/storage.html> for possible values.
+
 =back
 
 See the examples section for some uses. This option deprecates C<--file>,
diff -r 252ff7bc5ff9 -r 6a398359952b tests/clitest.py
--- a/tests/clitest.py	Sun Sep 13 18:20:15 2009 -0400
+++ b/tests/clitest.py	Wed Sep 16 10:53:50 2009 -0400
@@ -62,6 +62,7 @@
     'MANAGEDEXIST2'     : "/default-pool/testvol2.img",
     'MANAGEDNEW1'       : "/default-pool/clonevol",
     'MANAGEDNEW2'       : "/default-pool/clonevol",
+    'MANAGEDDISKNEW1'   : "/disk-pool/newvol1.img",
 }
 
 debug = False
@@ -130,6 +131,12 @@
         "--disk path=%(EXISTIMG1)s --disk path=%(EXISTIMG1)s --disk path=%(EXISTIMG1)s --disk path=%(EXISTIMG1)s,device=cdrom",
         # > 16 scsi disks
         " --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi --disk path=%(EXISTIMG1)s,bus=scsi",
+        # Unmanaged file using format 'raw'
+        "--disk path=%(NEWIMG1)s,format=raw,size=.0000001",
+        # Managed file using format raw
+        "--disk path=%(MANAGEDNEW1)s,format=raw,size=.0000001",
+        # Managed file using format qcow2
+        "--disk path=%(MANAGEDNEW1)s,format=qcow2,size=.0000001",
       ],
 
       "invalid": [
@@ -153,6 +160,12 @@
         "--disk pool=%(POOL)s",
         # Unknown cache type
         "--disk path=%(EXISTIMG1)s,perms=ro,size=.0001,cache=FOOBAR",
+        # Unmanaged file using non-raw format
+        "--disk path=%(NEWIMG1)s,format=qcow2,size=.0000001",
+        # Managed file using unknown format
+        "--disk path=%(MANAGEDNEW1)s,format=frob,size=.0000001",
+        # Managed disk using any format
+        "--disk path=%(MANAGEDDISKNEW1)s,format=raw,size=.0000001",
       ]
      }, # category "storage"
 
diff -r 252ff7bc5ff9 -r 6a398359952b virt-install
--- a/virt-install	Sun Sep 13 18:20:15 2009 -0400
+++ b/virt-install	Wed Sep 16 10:53:50 2009 -0400
@@ -156,7 +156,8 @@
     ro = False
     shared = False
     sparse = True
-    option_whitelist = ["perms", "cache", "bus", "device", "size", "sparse"]
+    option_whitelist = ["perms", "cache", "bus", "device", "size", "sparse",
+                        "format"]
 
     # Strip media type
     path, ignore, optstr = partition(path, ",")
@@ -200,6 +201,7 @@
     devtype = opts.get("device")
     bus     = opts.get("bus")
     cache   = opts.get("cache")
+    fmt     = opts.get("format")
 
     # We return (path, (poolname, volname), volinst, device, bus, readonly,
     #            shared)
@@ -220,6 +222,8 @@
                                                               suffix=".img")
         volinst = vc(pool_name=path, name=vname, conn=guest.conn,
                      allocation=0, capacity=(size and size*1024*1024*1024))
+        if fmt:
+            volinst.format = fmt
 
     elif path_type == "vol=":
         if not path.count("/"):
@@ -235,7 +239,7 @@
     if not devtype:
         devtype = virtinst.VirtualDisk.DEVICE_DISK
     ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse,
-           cache)
+           cache, fmt)
     logging.debug("parse_disk: returning %s" % str(ret))
     return ret
 
@@ -252,13 +256,13 @@
         # Get disk parameters
         if is_file_path:
             (path, voltuple, volinst, device, bus, readOnly, shared, size,
-             sparse, cache) = \
+             sparse, cache, fmt) = \
              (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False,
-              False, size, sparse, None)
+              False, size, sparse, None, None)
         else:
             (path, voltuple, volinst,
              device, bus, readOnly, shared,
-             size, sparse, cache) = parse_disk_option(guest, disk, size)
+             size, sparse, cache, fmt) = parse_disk_option(guest, disk, size)
             if not sparse and volinst:
                 volinst.allocation = volinst.capacity
 
@@ -266,7 +270,7 @@
                   'volInstall': volinst, 'volName': voltuple,
                   'readOnly': readOnly, 'shareable': shared,
                   'device': device, 'bus': bus, 'conn': guest.conn,
-                  'driverCache': cache}
+                  'driverCache': cache, 'format': fmt}
 
         d = cli.disk_prompt(None, kwargs)
 
diff -r 252ff7bc5ff9 -r 6a398359952b virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Sun Sep 13 18:20:15 2009 -0400
+++ b/virtinst/VirtualDisk.py	Wed Sep 16 10:53:50 2009 -0400
@@ -146,7 +146,7 @@
                  device=DEVICE_DISK, driverName=None, driverType=None,
                  readOnly=False, sparse=True, conn=None, volObject=None,
                  volInstall=None, volName=None, bus=None, shareable=False,
-                 driverCache=None, selinuxLabel=None):
+                 driverCache=None, selinuxLabel=None, format=None):
         """
         @param path: filesystem path to the disk image.
         @type path: C{str}
@@ -183,6 +183,8 @@
         @type driverCache: member of cache_types
         @param selinuxLabel: Used for labelling new or relabel existing storage
         @type selinuxLabel: C{str}
+        @param format: Storage volume format to use when creating storage
+        @type format: C{str}
         """
 
         VirtualDevice.__init__(self, conn=conn)
@@ -200,6 +202,7 @@
         self._driver_cache = None
         self._selinux_label = None
         self._clone_path = None
+        self._format = None
 
         # XXX: No property methods for these
         self.transient = transient
@@ -219,6 +222,7 @@
         self._set_shareable(shareable, validate=False)
         self._set_driver_cache(driverCache, validate=False)
         self._set_selinux_label(selinuxLabel, validate=False)
+        self._set_format(format, validate=False)
 
         if volName:
             self.__lookup_vol_name(volName)
@@ -375,6 +379,14 @@
         self.__validate_wrapper("_selinux_label", val, validate)
     selinux_label = property(_get_selinux_label, _set_selinux_label)
 
+    def _get_format(self):
+        return self._format
+    def _set_format(self, val, validate=True):
+        if val is not None:
+            self._check_str(val, "format")
+        self.__validate_wrapper("_format", val, validate)
+    format = property(_get_format, _set_format)
+
     # Validation assistance methods
 
     # Initializes attribute if it hasn't been done, then validates args.
@@ -392,6 +404,24 @@
                 setattr(self, varname, orig)
                 raise
 
+    def __set_format(self):
+        if not self.format:
+            return
+
+        if not self.__creating_storage():
+            return
+
+        if self.vol_install:
+            if not hasattr(self.vol_install, "format"):
+                raise ValueError(_("Storage type does not support format "
+                                   "parameter."))
+            if self.vol_install.format != self.format:
+                self.vol_install.format = self.format
+
+        elif self.format != "raw":
+            raise RuntimeError(_("Format cannot be specified for "
+                                 "unmanaged storage."))
+
     def __set_size(self):
         """
         Fill in 'size' attribute for existing storage.
@@ -700,6 +730,7 @@
         create_media = self.__creating_storage()
 
         self.__set_size()
+        self.__set_format()
 
         if not self.selinux_label:
             # If we are using existing storage, pull the label from it

virtinst-0.500.0-f12-distro.patch:
 osdict.py |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE virtinst-0.500.0-f12-distro.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253115773 14400
# Node ID d8f88998215ae844534b2bf9a7024edc1bf46826
# Parent  6a398359952bfd8cc62e36afc26bb470862ce42d
osdict: Add 'Fedora 12' entry

diff -r 6a398359952b -r d8f88998215a virtinst/osdict.py
--- a/virtinst/osdict.py	Wed Sep 16 10:53:50 2009 -0400
+++ b/virtinst/osdict.py	Wed Sep 16 11:42:53 2009 -0400
@@ -179,6 +179,13 @@
                         "input" : { "type" : [ (["all"], "tablet") ],
                                     "bus"  : [ (["all"], "usb"), ] },
                      }},
+        "fedora12": { "label": "Fedora 12", "distro": "fedora",
+                      "devices" : {
+                        "disk" : { "bus"   : [ (["kvm"], "virtio") ] },
+                        "net"  : { "model" : [ (["kvm"], "virtio") ] },
+                        "input" : { "type" : [ (["all"], "tablet") ],
+                                    "bus"  : [ (["all"], "usb"), ] },
+                     }},
         "sles10": { "label": "Suse Linux Enterprise Server",
                     "distro": "suse" },
         "sles11": { "label": "Suse Linux Enterprise Server 11",


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- python-virtinst.spec	13 Sep 2009 23:14:03 -0000	1.71
+++ python-virtinst.spec	16 Sep 2009 17:33:00 -0000	1.72
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 # Don't erroneously set limit for amount of virtio devices (bz 499654)
 Patch1: %{appname}-%{version}-virtio-dev-limit.patch
@@ -27,6 +27,12 @@ Patch2: %{appname}-%{version}-virtio-cdr
 Patch3: %{appname}-%{version}-no-default-keymap.patch
 # Update test suite to verify patches
 Patch4: %{appname}-%{version}-update-testsuite.patch
+# Don't generate bogus disk driver XML.
+Patch5: /home/boston/crobinso/virtinst-0.500.0-bogus-driver-xml.patch
+# Add '--disk format=' for specifying format (qcow2, ...) when provisioning
+Patch6: /home/boston/crobinso/virtinst-0.500.0-disk-format.patch
+# Add Fedora12 to os dictionary
+Patch7: /home/boston/crobinso/virtinst-0.500.0-f12-distro.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -58,6 +64,9 @@ and install new VMs) and virt-clone (clo
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 python setup.py build
@@ -93,6 +102,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Sep 16 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-3.fc12
+- Don't generate bogus disk driver XML.
+- Add '--disk format=' for specifying format (qcow2, ...) when provisioning
+- Add Fedora12 to os dictionary
+
 * Sun Sep 13 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-2.fc12
 - Don't erroneously set limit for amount of virtio devices (bz 499654)
 - Don't use virtio for cdrom devices (bz 517151)



From roland at fedoraproject.org  Wed Sep 16 17:35:41 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 16 Sep 2009 17:35:41 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1805,1.1806
Message-ID: <20090916173541.D0CBD11C00CF@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4845

Modified Files:
	kernel.spec 
Log Message:
Remove workaround for gcc bug #521991, now fixed.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1805
retrieving revision 1.1806
diff -u -p -r1.1805 -r1.1806
--- kernel.spec	16 Sep 2009 15:33:42 -0000	1.1805
+++ kernel.spec	16 Sep 2009 17:35:41 -0000	1.1806
@@ -1483,11 +1483,6 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
-    cat >> Makefile <<\EOF
-# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += -fno-var-tracking-assignments
-EOF
-
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -2049,6 +2044,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 16 2009 Roland McGrath <roland at redhat.com> - 2.6.31-20
+- Remove workaround for gcc bug #521991, now fixed.
+
 * Wed Sep 16 2009 Dave Jones <davej at redhat.com>
 - Fix NULL deref in powernow-k8 driver. (korg #13780)
 



From lucilanga at fedoraproject.org  Wed Sep 16 17:37:10 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 16 Sep 2009 17:37:10 +0000 (UTC)
Subject: rpms/aprsd/F-10 aprsd.spec,1.5,1.6
Message-ID: <20090916173710.CF1ED11C00CF@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/aprsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5648

Modified Files:
	aprsd.spec 
Log Message:
* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.6
- correctly increment version
- add fix from Alan Crosswell (AX.25 sockets are not supported by this executable)


Index: aprsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/F-10/aprsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- aprsd.spec	23 Aug 2008 07:28:52 -0000	1.5
+++ aprsd.spec	16 Sep 2009 17:37:10 -0000	1.6
@@ -2,7 +2,7 @@
 Name: aprsd
 Summary: Internet gateway and client access to amateur radio APRS packet data
 Version: 2.2.5
-Release: %{uprel}.5%{?dist}
+Release: %{uprel}.6%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz
@@ -18,6 +18,7 @@ Patch1: aprsd-2.2.5-15-gcc43-port.patch
 Patch2: aprsd-2.2.5-15-sysconfdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://sourceforge.net/projects/aprsd/
+BuildRequires: libax25-devel
 Requires (preun): /sbin/chkconfig
 Requires (preun): /sbin/service
 Requires (post): /sbin/chkconfig
@@ -85,6 +86,10 @@ fi
 %doc doc/qalgorithm.html
 
 %changelog
+* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.6
+- correctly increment version
+- add fix from Alan Crosswell (AX.25 sockets are not supported by this executable)
+
 * Sat Aug 23 2008 Lucian Langa <cooly at gnome.eu.org> - 2.2.5-15.5
 - fix rh bug 458817
 



From ajax at fedoraproject.org  Wed Sep 16 17:44:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 16 Sep 2009 17:44:25 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-intel-no-tv-hotplug.patch, NONE,
	1.1 kernel.spec, 1.1806, 1.1807
Message-ID: <20090916174425.818AC11C00CF@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9141

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-no-tv-hotplug.patch 
Log Message:
* Wed Sep 16 2009 Adam Jackson <ajax at redhat.com>
- Disable hotplug interrupts on TV connectors on i915.


drm-intel-no-tv-hotplug.patch:
 i915_reg.h |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE drm-intel-no-tv-hotplug.patch ---
diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h
--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx	2009-09-16 13:36:20.000000000 -0400
+++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-09-16 13:40:32.000000000 -0400
@@ -836,7 +836,6 @@
 			 HDMID_HOTPLUG_INT_EN |	  \
 			 SDVOB_HOTPLUG_INT_EN |	  \
 			 SDVOC_HOTPLUG_INT_EN |	  \
-			 TV_HOTPLUG_INT_EN |	  \
 			 CRT_HOTPLUG_INT_EN)
 
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1806
retrieving revision 1.1807
diff -u -p -r1.1806 -r1.1807
--- kernel.spec	16 Sep 2009 17:35:41 -0000	1.1806
+++ kernel.spec	16 Sep 2009 17:44:25 -0000	1.1807
@@ -701,6 +701,7 @@ Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
+Patch1826: drm-intel-no-tv-hotplug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1362,6 +1363,7 @@ ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
+ApplyPatch drm-intel-no-tv-hotplug.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2044,6 +2046,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 16 2009 Adam Jackson <ajax at redhat.com>
+- Disable hotplug interrupts on TV connectors on i915.
+
 * Wed Sep 16 2009 Roland McGrath <roland at redhat.com> - 2.6.31-20
 - Remove workaround for gcc bug #521991, now fixed.
 



From vpv at fedoraproject.org  Wed Sep 16 17:44:34 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Wed, 16 Sep 2009 17:44:34 +0000 (UTC)
Subject: rpms/malaga/devel malaga.spec,1.8,1.9
Message-ID: <20090916174434.F140611C00CF@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9257

Modified Files:
	malaga.spec 
Log Message:
* Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-6
- Remove rpath which was set for the malaga binaries in 64 bit architechtures



Index: malaga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga/devel/malaga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- malaga.spec	25 Jul 2009 11:41:57 -0000	1.8
+++ malaga.spec	16 Sep 2009 17:44:34 -0000	1.9
@@ -1,14 +1,16 @@
 Name:           malaga
 Version:        7.12 
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A programming language for automatic language analysis
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://home.arcor.de/bjoern-beutel/malaga/
 Source0:        http://home.arcor.de/bjoern-beutel/malaga/%{name}-%{version}.tgz
-# Fix map_file symbol conflict with samba, the Voikko project will handle
-# possible upstream submission after going through the other symbols as well
+# Fix map_file symbol conflict with samba. Upstream can be considered
+# inactive but as libvoikko >= 2.2 doesn't use libmalaga anymore, these kind
+# of problems won't probably come up. The only executables in Fedora which
+# link to libmalaga currently are the malaga tools.
 Patch0:         malaga-rename-map_file.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +59,10 @@ sed -i.silent -e 's|--silent||' Makefile
 
 %build
 %configure --with-readline
+# Remove rpath,
+# https://fedoraproject.org/wiki/Packaging/Guidelines#Removing_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
 make %{?_smp_mflags}
 
 
@@ -108,6 +114,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-6
+- Remove rpath which was set for the malaga binaries in 64 bit architechtures
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Wed Sep 16 17:50:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 17:50:13 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.pam, 1.3, 1.4 postgresql.spec,
	1.118, 1.119
Message-ID: <20090916175013.A306311C0336@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12121

Modified Files:
	postgresql.pam postgresql.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.1-2
- Use password-auth common PAM configuration instead of system-auth



Index: postgresql.pam
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- postgresql.pam	7 Nov 2005 21:54:56 -0000	1.3
+++ postgresql.pam	16 Sep 2009 17:50:13 -0000	1.4
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth		include		system-auth
-account		include		system-auth
+auth		include		password-auth
+account		include		password-auth


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- postgresql.spec	9 Sep 2009 15:13:29 -0000	1.118
+++ postgresql.spec	16 Sep 2009 17:50:13 -0000	1.119
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
@@ -854,6 +854,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.1-2
+- Use password-auth common PAM configuration instead of system-auth
+
 * Wed Sep  9 2009 Tom Lane <tgl at redhat.com> 8.4.1-1
 - Update to PostgreSQL 8.4.1, for various fixes described at
   http://www.postgresql.org/docs/8.4/static/release-8-4-1.html



From dwalsh at fedoraproject.org  Wed Sep 16 17:50:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Sep 2009 17:50:33 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.185,
	1.186 modules-minimum.conf, 1.33, 1.34 modules-targeted.conf,
	1.142, 1.143 nsadiff, 1.22, 1.23 policy-F12.patch, 1.81,
	1.82 selinux-policy.spec, 1.919, 1.920 sources, 1.204, 1.205
Message-ID: <20090916175033.005C211C0336@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12318

Modified Files:
	.cvsignore modules-minimum.conf modules-targeted.conf nsadiff 
	policy-F12.patch selinux-policy.spec sources 
Log Message:
* Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-1
- Update to upstream
- Dontaudit nsplugin search /root
- Dontaudit nsplugin sys_nice



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- .cvsignore	9 Sep 2009 21:08:00 -0000	1.185
+++ .cvsignore	16 Sep 2009 17:50:32 -0000	1.186
@@ -189,3 +189,4 @@ config.tgz
 serefpolicy-3.6.29.tgz
 serefpolicy-3.6.30.tgz
 serefpolicy-3.6.31.tgz
+serefpolicy-3.6.32.tgz


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- modules-minimum.conf	15 Sep 2009 18:26:12 -0000	1.33
+++ modules-minimum.conf	16 Sep 2009 17:50:32 -0000	1.34
@@ -1264,11 +1264,11 @@ rshd = module
 rsync = module
 
 # Layer: services
-# Module: rtkit_daemon
+# Module: rtkit
 #
 # Real Time Kit Daemon
 # 
-rtkit_daemon = module
+rtkit = module
 
 # Layer: services
 # Module: rwho


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- modules-targeted.conf	15 Sep 2009 18:26:12 -0000	1.142
+++ modules-targeted.conf	16 Sep 2009 17:50:32 -0000	1.143
@@ -1264,11 +1264,11 @@ rshd = module
 rsync = module
 
 # Layer: services
-# Module: rtkit_daemon
+# Module: rtkit
 #
 # Real Time Kit Daemon
 # 
-rtkit_daemon = module
+rtkit = module
 
 # Layer: services
 # Module: rwho


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nsadiff	9 Sep 2009 21:08:01 -0000	1.22
+++ nsadiff	16 Sep 2009 17:50:32 -0000	1.23
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.31 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.32 > /tmp/diff

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  317 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  171 +++
 policy/modules/apps/sandbox.te            |  315 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  278 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   45 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1399 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 314 files changed, 14422 insertions(+), 2573 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.81 -r 1.82 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- policy-F12.patch	15 Sep 2009 21:45:12 -0000	1.81
+++ policy-F12.patch	16 Sep 2009 17:50:32 -0000	1.82
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.31/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.31/Makefile	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/Makefile	2009-09-16 10:03:08.000000000 -0400
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.31/policy/flask/access_vectors
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/flask/access_vectors	2009-09-14 16:52:50.000000000 -0400
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-16 10:03:08.000000000 -0400
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -21,9 +21,9 @@ diff -b -B --ignore-all-space --exclude-
  }
  
  #
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.31/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/global_tunables	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 10:03:08.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -59,9 +59,9 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.31/policy/mcs
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/mcs	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/mcs	2009-09-16 10:03:08.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -95,9 +95,9 @@ diff -b -B --ignore-all-space --exclude-
  
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.31/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/anaconda.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 10:03:08.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -115,9 +115,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.31/policy/modules/admin/certwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/certwatch.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 10:03:08.000000000 -0400
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -127,17 +127,17 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.31/policy/modules/admin/dmesg.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/dmesg.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 10:03:08.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.31/policy/modules/admin/dmesg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/dmesg.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 10:03:08.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -172,9 +172,9 @@ diff -b -B --ignore-all-space --exclude-
  # for when /usr is not mounted:
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.31/policy/modules/admin/firstboot.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/firstboot.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 10:03:08.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -197,9 +197,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.31/policy/modules/admin/logrotate.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/logrotate.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 10:03:08.000000000 -0400
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -242,18 +242,18 @@ diff -b -B --ignore-all-space --exclude-
  	slrnpull_manage_spool(logrotate_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.31/policy/modules/admin/logwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/logwatch.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 10:03:08.000000000 -0400
 @@ -136,4 +136,5 @@
  
  optional_policy(`
  	samba_read_log(logwatch_t)
 +	samba_read_share_files(logwatch_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.31/policy/modules/admin/mrtg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/mrtg.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 10:03:08.000000000 -0400
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -262,9 +262,9 @@ diff -b -B --ignore-all-space --exclude-
  
  netutils_domtrans_ping(mrtg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.31/policy/modules/admin/netutils.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/netutils.te	2009-09-14 11:29:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 10:03:08.000000000 -0400
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(netutils_t)
@@ -273,9 +273,9 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.31/policy/modules/admin/portage.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/portage.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 10:03:08.000000000 -0400
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -285,35 +285,26 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:process signal;
  allow portage_fetch_t self:unix_stream_socket create_socket_perms;
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.31/policy/modules/admin/prelink.if
---- nsaserefpolicy/policy/modules/admin/prelink.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/admin/prelink.if	2009-09-09 15:38:24.000000000 -0400
-@@ -140,3 +140,22 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.32/policy/modules/admin/prelink.if
+--- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 10:03:08.000000000 -0400
+@@ -151,11 +151,11 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`prelink_relabelfrom_lib',`
++interface(`prelink_relabel_lib',`
+ 	gen_require(`
+ 		type prelink_var_lib_t;
+ 	')
+ 
  	files_search_var_lib($1)
- 	manage_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
- ')
-+
-+########################################
-+## <summary>
-+##	Relabel from files in the /boot directory.
-+## </summary>
-+## <param name="domain">
[...4926 lines suppressed...]
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.31/policy/modules/system/sysnetwork.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/sysnetwork.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -24806,9 +23895,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
 +
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.31/policy/modules/system/sysnetwork.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/sysnetwork.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-09-16 10:03:09.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -24986,9 +24075,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	role_transition $1 dhcpc_exec_t system_r;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.31/policy/modules/system/sysnetwork.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.32/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/sysnetwork.te	2009-09-09 15:51:28.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-09-16 10:03:09.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -25189,9 +24278,9 @@ diff -b -B --ignore-all-space --exclude-
 +	hal_dontaudit_rw_dgram_sockets(dhcpc_t)
 +	hal_dontaudit_rw_pipes(ifconfig_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.31/policy/modules/system/udev.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.32/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/udev.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -25202,9 +24291,9 @@ diff -b -B --ignore-all-space --exclude-
  
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.31/policy/modules/system/udev.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.32/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/udev.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-09-16 10:03:09.000000000 -0400
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)
@@ -25231,9 +24320,9 @@ diff -b -B --ignore-all-space --exclude-
 +	files_search_var_lib($1)
 +	manage_files_pattern($1, udev_var_run_t, udev_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.31/policy/modules/system/udev.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/udev.te	2009-09-09 17:40:55.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-16 10:03:09.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;
@@ -25343,9 +24432,9 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.31/policy/modules/system/unconfined.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.32/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/unconfined.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -25363,9 +24452,9 @@ diff -b -B --ignore-all-space --exclude-
 -ifdef(`distro_gentoo',`
 -/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.31/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.32/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/unconfined.if	2009-09-14 09:54:34.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-09-16 10:03:09.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -25869,9 +24958,9 @@ diff -b -B --ignore-all-space --exclude-
 -
 -	allow $1 unconfined_t:dbus acquire_svc;
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.31/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.32/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/unconfined.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-09-16 10:03:09.000000000 -0400
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -26101,9 +25190,9 @@ diff -b -B --ignore-all-space --exclude-
 -		hal_dbus_chat(unconfined_execmem_t)
 -	')
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.31/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.32/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/userdomain.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -1,4 +1,8 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -26114,9 +25203,9 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.31/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/userdomain.if	2009-09-14 12:43:18.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-16 10:03:09.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28094,9 +27183,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow $1 user_tmp_t:file { getattr append };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.31/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/userdomain.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 10:03:09.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -28182,9 +27271,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.31/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/xen.fc	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -28212,9 +27301,9 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.31/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/xen.if	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 10:03:09.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -28265,9 +27354,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.31/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/system/xen.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 10:03:09.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28565,9 +27654,9 @@ diff -b -B --ignore-all-space --exclude-
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.31/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/support/obj_perm_sets.spt	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 10:03:09.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -28600,9 +27689,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.31/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.31/policy/users	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/users	2009-09-16 10:03:09.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.919
retrieving revision 1.920
diff -u -p -r1.919 -r1.920
--- selinux-policy.spec	15 Sep 2009 21:45:12 -0000	1.919
+++ selinux-policy.spec	16 Sep 2009 17:50:32 -0000	1.920
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.31
-Release: 5%{?dist}
+Version: 3.6.32
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -318,7 +318,7 @@ if [ $1 -eq 1 ]; then
    %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 -r polkit_auth -r polkit 2>/dev/null
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth -r polkit -r rtkit_daemon 2>/dev/null
    packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    %relabel targeted
@@ -447,6 +447,11 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-1
+- Update to upstream
+- Dontaudit nsplugin search /root
+- Dontaudit nsplugin sys_nice
+
 * Mon Sep 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.31-5
 - Fix label on /usr/bin/notepad, /usr/sbin/vboxadd-service
 - Remove policycoreutils-python requirement except for minimum


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- sources	9 Sep 2009 21:08:02 -0000	1.204
+++ sources	16 Sep 2009 17:50:32 -0000	1.205
@@ -1,2 +1,2 @@
 3651679c4b12a31d2ba5f4305bba5540  config.tgz
-bef42231597656c5dc04374547144441  serefpolicy-3.6.31.tgz
+d3d5eaf6fd6ca9f09f8912d694810268  serefpolicy-3.6.32.tgz



From till at fedoraproject.org  Wed Sep 16 17:52:34 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 17:52:34 +0000 (UTC)
Subject: rpms/aircrack-ng/devel aircrack-ng-1.0-define.patch, NONE,
	1.1 aircrack-ng.spec, 1.31, 1.32
Message-ID: <20090916175234.F323711C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13644

Modified Files:
	aircrack-ng.spec 
Added Files:
	aircrack-ng-1.0-define.patch 
Log Message:
* Wed Sep 16 2009 Till Maas <opensource at till.name> - 1.0-1
- Update to stable release
- Include airodump-ng-oui-update
- prepare shipping of oui database
- fix paths for oui database in airodump-ng-oui-update and airodump-ng
- add missing #include <types.h>


aircrack-ng-1.0-define.patch:
 radiotap-parser.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE aircrack-ng-1.0-define.patch ---
diff -up aircrack-ng-1.0/src/osdep/radiotap/radiotap-parser.c.define aircrack-ng-1.0/src/osdep/radiotap/radiotap-parser.c
--- aircrack-ng-1.0/src/osdep/radiotap/radiotap-parser.c.define	2009-09-16 19:46:31.000000000 +0200
+++ aircrack-ng-1.0/src/osdep/radiotap/radiotap-parser.c	2009-09-16 19:46:42.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <types.h>
 
 #include "radiotap-parser.h"
 


Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- aircrack-ng.spec	16 Sep 2009 17:32:05 -0000	1.31
+++ aircrack-ng.spec	16 Sep 2009 17:52:34 -0000	1.32
@@ -23,6 +23,10 @@ Source0:        http://download.aircrack
 #Source4:        http://standards.ieee.org/regauth/oui/oui.txt
 # 2009-09-16: submitted upstream: 
 Patch0:         aircrack-ng-parallel_make.patch
+# 2009-10-16: needs to be reworked to be upstream submittable
+Patch1:         aircrack-ng-1.0-oui-path.patch
+# 2009-10-16: will be submitted upstream if tested
+Patch2:         aircrack-ng-1.0-define.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  sqlite-devel openssl-devel
 
@@ -39,6 +43,8 @@ capture files), and some tools to handle
 #%setup -q -n aircrack-ng-%{version}-%{alphatag}
 %setup -q -n aircrack-ng-%{version}
 %patch0 -p1 -b .parallel_make
+%patch1 -p1 -b .oui-path
+%patch2 -p1 -b .define
 
 %build
 #grep '(hex') %{SOURCE4} > airodump-ng-oui.txt
@@ -126,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 - Include airodump-ng-oui-update
 - prepare shipping of oui database
 - fix paths for oui database in airodump-ng-oui-update and airodump-ng
+- add missing #include <types.h>
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.10.rc3
 - rebuilt with new openssl



From linville at fedoraproject.org  Wed Sep 16 17:53:47 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 16 Sep 2009 17:53:47 +0000 (UTC)
Subject: rpms/b43-fwcutter/F-11
	0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch, NONE,
	1.1 0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch,
	NONE, 1.1 0003-fwcutter-Use-ARRAY_SIZE.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 b43-fwcutter.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090916175347.B84EB11C00CF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/b43-fwcutter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15463

Modified Files:
	.cvsignore b43-fwcutter.spec sources 
Added Files:
	0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch 
	0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch 
	0003-fwcutter-Use-ARRAY_SIZE.patch 
Log Message:
resync with 012-2 from F-12

0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch:
 mklist.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE 0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch ---
>From 4c01539a4e8c9e87ce41789ec1e00ffae2e563aa Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: Thu, 20 Aug 2009 12:30:11 -0500
Subject: [PATCH 1/3] fwcutter: mklist.py - Update to new library and skip some sections

Switch from the deprecated md5 library to hashlib.

Detect the ro section that describes the firmware version,
print the address of the data, and and skip some ro sections
that are not of interest.

Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
---
 fwcutter/mklist.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fwcutter/mklist.py b/fwcutter/mklist.py
index 1bc8351..40e6cb8 100755
--- a/fwcutter/mklist.py
+++ b/fwcutter/mklist.py
@@ -30,7 +30,7 @@
 import sys
 import os
 import re
-import md5
+import hashlib
 
 if len(sys.argv) != 2:
 	print "Usage: %s path/to/wl.o" % sys.argv[0]
@@ -55,7 +55,7 @@ if rodata_fileoffset == None:
 	print "ERROR: Could not find .rodata fileoffset"
 	sys.exit(1)
 
-md5sum = md5.md5(file(fn, "r").read())
+md5sum = hashlib.md5(file(fn, "r").read())
 
 print "static struct extract _%s[] =" % md5sum.hexdigest()
 print "{"
@@ -80,6 +80,14 @@ for sym in syms:
 		size -= 8
 	if "pcm" in name:
 		type = "EXT_PCM"
+	if "bommajor" in name:
+		print "\t/* ucode major version at offset 0x%x */" % pos
+		continue
+	if "bomminor" in name:
+		print "\t/* ucode minor version at offset 0x%x */" % pos
+		continue
+	if "ucode_2w" in name:
+		continue
 	m = ucode_re.match(name)
 	if m:
 		corerev = int(m.group(1))
-- 
1.6.4


0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch:
 fwcutter_list.h |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 2 deletions(-)

--- NEW FILE 0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch ---
>From 1cffac30d8e02a4d216337b8ef4d9fe6dabfb688 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: Thu, 20 Aug 2009 16:51:38 -0500
Subject: [PATCH 2/3] fwcutter: Add two new sources for 478.104 firmware

Add 2 new files with 478.104 firmware, which includes Rev 16.

Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
---
 fwcutter/fwcutter_list.h |  119 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 118 insertions(+), 1 deletions(-)

diff --git a/fwcutter/fwcutter_list.h b/fwcutter/fwcutter_list.h
index c48bc6d..65c8671 100644
--- a/fwcutter/fwcutter_list.h
+++ b/fwcutter/fwcutter_list.h
@@ -238,7 +238,106 @@ static struct extract _2dd738b8feb8b3559fd9d8fbaf3bfffc[] =
 	EXTRACT_LIST_END
 };
 
-/*
+static struct extract _1a258b2d93efa641c32ddf3c3a962028[] =
+{
+	/* { .name = "ucode4", .offset = 0xAFE08, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
+	/* { .name = "pcm4", .offset = 0xE8FE0, .type = EXT_PCM, .length = 0x520 }, */
+	/* { .name = "b0g0initvals4", .offset = 0xA2878, .type = EXT_IV, .length = 0xE80 }, */
+	/* { .name = "a0g0bsinitvals4", .offset = 0xA45C0, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "b0g0bsinitvals4", .offset = 0xA3700, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "a0g0initvals4", .offset = 0xA3738, .type = EXT_IV, .length = 0xE80 }, */
+	{ .name = "ucode5", .offset = 0xB4CAC, .type = EXT_UCODE_2, .length = 0x56F0 },
+	{ .name = "pcm5", .offset = 0xE9504, .type = EXT_PCM, .length = 0x520 },
+	{ .name = "a0g0bsinitvals5", .offset = 0xA6578, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals5", .offset = 0xA5018, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0initvals5", .offset = 0xA5138, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1initvals5", .offset = 0xA5B58, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "b0g0initvals5", .offset = 0xA45F8, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1bsinitvals5", .offset = 0xA6698, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode9", .offset = 0xBA3A0, .type = EXT_UCODE_2, .length = 0x6248 },
+	{ .name = "a0g0bsinitvals9", .offset = 0xA89C0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals9", .offset = 0xA67B8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g1bsinitvals9", .offset = 0xA8AE0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals9", .offset = 0xA72B0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0initvals9", .offset = 0xA73D0, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g1initvals9", .offset = 0xA7EC8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "ucode11", .offset = 0xC05EC, .type = EXT_UCODE_2, .length = 0x8000 },
+	{ .name = "n0initvals11", .offset = 0xA8C00, .type = EXT_IV, .length = 0xBC8 },
+	{ .name = "n0bsinitvals11", .offset = 0xA97D0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0absinitvals11", .offset = 0xA98F0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode13", .offset = 0xC85F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
+	{ .name = "b0g0bsinitvals13", .offset = 0xABA70, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals13", .offset = 0xAAED0, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "a0g1bsinitvals13", .offset = 0xAC730, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g1initvals13", .offset = 0xABB90, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "lp0bsinitvals13", .offset = 0xAADB0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "lp0initvals13", .offset = 0xA9A10, .type = EXT_IV, .length = 0x1398 },
+	{ .name = "ucode14", .offset = 0xD00BC, .type = EXT_UCODE_2, .length = 0x7910 },
+	{ .name = "lp0initvals14", .offset = 0xAC850, .type = EXT_IV, .length = 0xB80 },
+	{ .name = "lp0bsinitvals14", .offset = 0xAD3D8, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode15", .offset = 0xD79D0, .type = EXT_UCODE_3, .length = 0x8768 },
+	{ .name = "lp0initvals15", .offset = 0xAD4F8, .type = EXT_IV, .length = 0xC68 },
+	{ .name = "lp0bsinitvals15", .offset = 0xAE168, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode16", .offset = 0xE013C, .type = EXT_UCODE_3, .length = 0x8EA0 },
+	{ .name = "lp0bsinitvals16", .offset = 0xAFCE8, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0bsinitvals16", .offset = 0xAEF20, .type = EXT_IV, .length = 0x118 },
+	{ .name = "sslpn0initvals16", .offset = 0xAF040, .type = EXT_IV, .length = 0x0 },
+	{ .name = "n0initvals16", .offset = 0xAE288, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "lp0initvals16", .offset = 0xAF050, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
+	EXTRACT_LIST_END
+};
+static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
+{
+	/* ucode major version at offset 0xa8b70 */
+	/* ucode minor version at offset 0xa8b74 */
+	/* { .name = "ucode4", .offset = 0xB6108, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
+	/* { .name = "pcm4", .offset = 0xEF2E0, .type = EXT_PCM, .length = 0x520 }, */
+	/* { .name = "b0g0initvals4", .offset = 0xA8B78, .type = EXT_IV, .length = 0xE80 }, */
+	/* { .name = "a0g0bsinitvals4", .offset = 0xAA8C0, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "b0g0bsinitvals4", .offset = 0xA9A00, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "a0g0initvals4", .offset = 0xA9A38, .type = EXT_IV, .length = 0xE80 }, */
+	{ .name = "ucode5", .offset = 0xBAFAC, .type = EXT_UCODE_2, .length = 0x56F0 },
+	{ .name = "pcm5", .offset = 0xEF804, .type = EXT_PCM, .length = 0x520 },
+	{ .name = "b0g0bsinitvals5", .offset = 0xAB318, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0bsinitvals5", .offset = 0xAC878, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals5", .offset = 0xAA8F8, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1initvals5", .offset = 0xABE58, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g0initvals5", .offset = 0xAB438, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1bsinitvals5", .offset = 0xAC998, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode9", .offset = 0xC06A0, .type = EXT_UCODE_2, .length = 0x6248 },
+	{ .name = "a0g1initvals9", .offset = 0xAE1C8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g0bsinitvals9", .offset = 0xAECC0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals9", .offset = 0xAD5B0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals9", .offset = 0xACAB8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g1bsinitvals9", .offset = 0xAEDE0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0initvals9", .offset = 0xAD6D0, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "ucode11", .offset = 0xC68EC, .type = EXT_UCODE_2, .length = 0x8000 },
+	{ .name = "n0bsinitvals11", .offset = 0xAFAD0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0absinitvals11", .offset = 0xAFBF0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0initvals11", .offset = 0xAEF00, .type = EXT_IV, .length = 0xBC8 },
+	{ .name = "ucode13", .offset = 0xCE8F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
+	{ .name = "b0g0initvals13", .offset = 0xB11D0, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "a0g1bsinitvals13", .offset = 0xB2A30, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g1initvals13", .offset = 0xB1E90, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "lp0bsinitvals13", .offset = 0xB10B0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals13", .offset = 0xB1D70, .type = EXT_IV, .length = 0x118 },
+	{ .name = "lp0initvals13", .offset = 0xAFD10, .type = EXT_IV, .length = 0x1398 },
+	{ .name = "ucode14", .offset = 0xD63BC, .type = EXT_UCODE_2, .length = 0x7910 },
+	{ .name = "lp0initvals14", .offset = 0xB2B50, .type = EXT_IV, .length = 0xB80 },
+	{ .name = "lp0bsinitvals14", .offset = 0xB36D8, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode15", .offset = 0xDDCD0, .type = EXT_UCODE_3, .length = 0x8768 },
+	{ .name = "lp0bsinitvals15", .offset = 0xB4468, .type = EXT_IV, .length = 0x118 },
+	{ .name = "lp0initvals15", .offset = 0xB37F8, .type = EXT_IV, .length = 0xC68 },
+	{ .name = "ucode16", .offset = 0xE643C, .type = EXT_UCODE_3, .length = 0x8EA0 },
+	{ .name = "n0bsinitvals16", .offset = 0xB5220, .type = EXT_IV, .length = 0x118 },
+	{ .name = "sslpn0initvals16", .offset = 0xB5340, .type = EXT_IV, .length = 0x0 },
+	{ .name = "n0initvals16", .offset = 0xB4588, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "lp0initvals16", .offset = 0xB5350, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "sslpn0bsinitvals16", .offset = 0xB5348, .type = EXT_IV, .length = 0x0 },
+	{ .name = "lp0bsinitvals16", .offset = 0xB5FE8, .type = EXT_IV, .length = 0x118 },
+	EXTRACT_LIST_END
+};/*
  * Links change, so let's not put them into the README.
  * I still put them here so we know where the file was obtained.
  */
@@ -299,6 +398,24 @@ static const struct file files[] =
 		.flags		= FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED,
 		.extract	= _2dd738b8feb8b3559fd9d8fbaf3bfffc,
 	},
+	{
+		/* ftp://downloads.netgear.com/files/GPL/WNDR3300-V1.0.29_gpl_src.zip */
+		.name		= "wl_apsta.o",
+		.id		= "FW15",
+		.ucode_version	= "478.104",
+		.md5		= "1a258b2d93efa641c32ddf3c3a962028",
+		.flags		= FW_FLAG_LE | FW_FLAG_V4,
+		.extract	= _1a258b2d93efa641c32ddf3c3a962028,
+	},
+	{
+		/* http://downloads.openwrt.org/sources/broadcom-wl-4.178.10.4.tar.bz2 */
+		.name		= "wl_apsta.o",
+		.id		= "FW15",
+		.ucode_version	= "478.104",
+		.md5		= "bb8537e3204a1ea5903fe3e66b5e2763",
+		.flags		= FW_FLAG_LE | FW_FLAG_V4,
+		.extract	= _bb8537e3204a1ea5903fe3e66b5e2763,
+	},
 };
 
 #define FILES (sizeof(files) / sizeof(files[0]))
-- 
1.6.4


0003-fwcutter-Use-ARRAY_SIZE.patch:
 fwcutter.c      |    6 +++---
 fwcutter.h      |    3 +++
 fwcutter_list.h |    9 ++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

--- NEW FILE 0003-fwcutter-Use-ARRAY_SIZE.patch ---
>From 37164fe78406e201302ec8bd975698bec48183b9 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb at bu3sch.de>
Date: Fri, 21 Aug 2009 15:59:08 +0200
Subject: [PATCH 3/3] fwcutter: Use ARRAY_SIZE

Signed-off-by: Michael Buesch <mb at bu3sch.de>
---
 fwcutter/fwcutter.c      |    6 +++---
 fwcutter/fwcutter.h      |    3 +++
 fwcutter/fwcutter_list.h |    8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c
index 5d5aa80..0d82806 100644
--- a/fwcutter/fwcutter.c
+++ b/fwcutter/fwcutter.c
@@ -462,10 +462,10 @@ static void print_supported_files(void)
 	       "<ID>\t"
 	       "<MD5 checksum>\n\n");
 	/* print for legacy driver first */
-	for (i = 0; i < FILES; i++)
+	for (i = 0; i < ARRAY_SIZE(files); i++)
 		if (file_ok(&files[i]) && !(files[i].flags & FW_FLAG_V4))
 			print_file(&files[i]);
-	for (i = 0; i < FILES; i++)
+	for (i = 0; i < ARRAY_SIZE(files); i++)
 		if (file_ok(&files[i]) && files[i].flags & FW_FLAG_V4)
 			print_file(&files[i]);
 	printf("\n");
@@ -491,7 +491,7 @@ static const struct file *find_file(FILE *fd)
 		 signature[8], signature[9], signature[10], signature[11],
 		 signature[12], signature[13], signature[14], signature[15]);
 
-	for (i = 0; i < FILES; ++i) {
+	for (i = 0; i < ARRAY_SIZE(files); i++) {
 		if (file_ok(&files[i]) &&
 		    strcasecmp(md5sig, files[i].md5) == 0) {
 			printf("This file is recognised as:\n");
diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
index ac2df63..4a887b6 100644
--- a/fwcutter/fwcutter.h
+++ b/fwcutter/fwcutter.h
@@ -9,6 +9,9 @@
 #define fwcutter_stringify(x)	fwcutter_stringify_1(x)
 #define FWCUTTER_VERSION	fwcutter_stringify(FWCUTTER_VERSION_)
 
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(array)	(sizeof(array) / sizeof((array)[0]))
+
 typedef uint16_t be16_t; /* Big-endian 16bit */
 typedef uint32_t be32_t; /* Big-endian 32bit */
 
diff --git a/fwcutter/fwcutter_list.h b/fwcutter/fwcutter_list.h
index 65c8671..5175bbd 100644
--- a/fwcutter/fwcutter_list.h
+++ b/fwcutter/fwcutter_list.h
@@ -287,6 +287,7 @@ static struct extract _1a258b2d93efa641c32ddf3c3a962028[] =
 	{ .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
 	EXTRACT_LIST_END
 };
+
 static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
 {
 	/* ucode major version at offset 0xa8b70 */
@@ -337,7 +338,9 @@ static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
 	{ .name = "sslpn0bsinitvals16", .offset = 0xB5348, .type = EXT_IV, .length = 0x0 },
 	{ .name = "lp0bsinitvals16", .offset = 0xB5FE8, .type = EXT_IV, .length = 0x118 },
 	EXTRACT_LIST_END
-};/*
+};
+
+/*
  * Links change, so let's not put them into the README.
  * I still put them here so we know where the file was obtained.
  */
@@ -417,6 +420,3 @@ static const struct file files[] =
 		.extract	= _bb8537e3204a1ea5903fe3e66b5e2763,
 	},
 };
-
-#define FILES (sizeof(files) / sizeof(files[0]))
-
-- 
1.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/b43-fwcutter/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Feb 2008 20:50:47 -0000	1.4
+++ .cvsignore	16 Sep 2009 17:53:46 -0000	1.5
@@ -1 +1 @@
-b43-fwcutter-011.tar.bz2
+b43-fwcutter-012.tar.bz2


Index: b43-fwcutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/b43-fwcutter/F-11/b43-fwcutter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- b43-fwcutter.spec	8 May 2009 14:21:34 -0000	1.6
+++ b43-fwcutter.spec	16 Sep 2009 17:53:46 -0000	1.7
@@ -1,14 +1,17 @@
 Name:           b43-fwcutter
-Version:        011
-Release:        5%{?dist}
+Version:        012
+Release:        2%{?dist}
 Summary:        Firmware extraction tool for Broadcom wireless driver
 
 Group:          System Environment/Base
 License:        BSD
-URL:            http://bcm43xx.berlios.de/
-Source0:        http://download.berlios.de/bcm43xx/%{name}-%{version}.tar.bz2
+URL:            http://bu3sch.de/b43/fwcutter/
+Source0:        http://bu3sch.de/b43/fwcutter/%{name}-%{version}.tar.bz2
 Source1:        README.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:		0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch
+Patch2:		0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch
+Patch3:		0003-fwcutter-Use-ARRAY_SIZE.patch
 
 %description
 This package contains the 'b43-fwcutter' tool which is used to
@@ -19,6 +22,10 @@ instructions on using this tool.
 
 %prep
 %setup -q
+%patch1 -p2
+%patch2 -p2
+%patch3 -p2
+
 cp %{SOURCE1} .
 
 %build
@@ -41,6 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README README.Fedora
 
 %changelog
+* Fri Aug 28 2009 Bill Nottingham <notting at redhat.com> 012-2
+- Update with some patches from git
+
+* Mon Aug 24 2009 John W. Linville <linville at redhat.com> 012-1
+- Update for b43-fwcutter-012
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 011-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu May  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 011-5
 - Build with $RPM_OPT_FLAGS.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/b43-fwcutter/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Feb 2008 20:50:47 -0000	1.4
+++ sources	16 Sep 2009 17:53:46 -0000	1.5
@@ -1 +1 @@
-3db2f4de85a459451f5b391cf67a8d44  b43-fwcutter-011.tar.bz2
+69eadf67b459f313a8d6b37aaabef96c  b43-fwcutter-012.tar.bz2



From rdieter at fedoraproject.org  Wed Sep 16 17:54:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 17:54:36 +0000 (UTC)
Subject: rpms/pinentry/devel pinentry.spec,1.26,1.27
Message-ID: <20090916175436.91B9311C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15875

Modified Files:
	pinentry.spec 
Log Message:
* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
- Errors installing with --excludedocs (#515925)



Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pinentry.spec	16 Sep 2009 17:25:57 -0000	1.26
+++ pinentry.spec	16 Sep 2009 17:54:36 -0000	1.27
@@ -8,7 +8,7 @@
 
 Name:    pinentry
 Version: 0.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -129,10 +129,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
 
 %post
-/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir 
+if [ -f %{_infodir}/pinentry.info* ]; then
+/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir ||:
+fi
 
 %preun
-if [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 -a -f %{_infodir}/pinentry.info* ] ; then
   /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir ||:
 fi
 
@@ -161,6 +163,9 @@ fi
 
 
 %changelog
+* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
+- Errors installing with --excludedocs (#515925)
+
 * Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3
 - drop alternatives, use app-wrapper instead (borrowed from opensuse)
 - -qt4 experimental subpkg, -qt includes qt3 version again  (#523488)



From tmraz at fedoraproject.org  Wed Sep 16 17:58:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 17:58:44 +0000 (UTC)
Subject: rpms/ppp/devel ppp-2.3.5-pamd.conf,1.2,1.3 ppp.spec,1.50,1.51
Message-ID: <20090916175844.95F7911C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ppp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18219

Modified Files:
	ppp-2.3.5-pamd.conf ppp.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 2.4.4-13
- use password-auth common PAM configuration instead of system-auth



Index: ppp-2.3.5-pamd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/ppp/devel/ppp-2.3.5-pamd.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ppp-2.3.5-pamd.conf	7 Oct 2005 14:36:03 -0000	1.2
+++ ppp-2.3.5-pamd.conf	16 Sep 2009 17:58:44 -0000	1.3
@@ -1,5 +1,5 @@
 #%PAM-1.0
-auth       include	system-auth
+auth       include	password-auth
 account    required	pam_nologin.so
-account    include	system-auth
-session    include	system-auth
+account    include	password-auth
+session    include	password-auth


Index: ppp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ppp.spec	26 Jul 2009 19:21:16 -0000	1.50
+++ ppp.spec	16 Sep 2009 17:58:44 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 2.4.4-13
+- use password-auth common PAM configuration instead of system-auth
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From till at fedoraproject.org  Wed Sep 16 18:04:30 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 18:04:30 +0000 (UTC)
Subject: rpms/aircrack-ng/devel aircrack-ng-1.0-define.patch,1.1,1.2
Message-ID: <20090916180430.4EA5011C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20862

Modified Files:
	aircrack-ng-1.0-define.patch 
Log Message:
* Wed Sep 16 2009 Till Maas <opensource at till.name> - 1.0-1
- Update to stable release
- Include airodump-ng-oui-update
- prepare shipping of oui database
- fix paths for oui database in airodump-ng-oui-update and airodump-ng
- add missing #include <types.h>


aircrack-ng-1.0-define.patch:
 radiotap-parser.c |    1 +
 1 file changed, 1 insertion(+)

Index: aircrack-ng-1.0-define.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng-1.0-define.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- aircrack-ng-1.0-define.patch	16 Sep 2009 17:52:34 -0000	1.1
+++ aircrack-ng-1.0-define.patch	16 Sep 2009 18:04:28 -0000	1.2
@@ -5,7 +5,7 @@ diff -up aircrack-ng-1.0/src/osdep/radio
  
  #include <stdio.h>
  #include <errno.h>
-+#include <types.h>
++#include <sys/types.h>
  
  #include "radiotap-parser.h"
  



From rdieter at fedoraproject.org  Wed Sep 16 18:06:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Sep 2009 18:06:22 +0000 (UTC)
Subject: rpms/pinentry/devel pinentry.spec,1.27,1.28
Message-ID: <20090916180622.EB85611C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21872

Modified Files:
	pinentry.spec 
Log Message:
fix finding qt3-devel



Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- pinentry.spec	16 Sep 2009 17:54:36 -0000	1.27
+++ pinentry.spec	16 Sep 2009 18:06:22 -0000	1.28
@@ -2,7 +2,9 @@
 %if 0%{?fedora} > 8 || 0%{?rhel} > 5
 %define _enable_pinentry_qt4 --enable-pinentry-qt4
 %define _enable_pinentry_qt --enable-pinentry-qt
+%define qt3 qt3
 %else
+%define qt3 qt
 %define _enable_pinentry_qt --enable-pinentry-qt 
 %endif
 
@@ -25,7 +27,7 @@ BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
 %if 0%{?_enable_pinentry_qt:1}
-BuildRequires: qt-devel
+BuildRequires: %{qt3}-devel
 %endif
 %if 0%{?_enable_pinentry_qt4:1}
 BuildRequires: qt4-devel



From tmraz at fedoraproject.org  Wed Sep 16 18:06:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:06:35 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.pam,1.4,1.5 proftpd.spec,1.55,1.56
Message-ID: <20090916180635.9BA4211C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22081

Modified Files:
	proftpd.pam proftpd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-6
- Use password-auth common PAM configuration instead of system-auth



Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.pam,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- proftpd.pam	19 Aug 2009 15:41:07 -0000	1.4
+++ proftpd.pam	16 Sep 2009 18:06:35 -0000	1.5
@@ -2,7 +2,7 @@
 session    optional     pam_keyinit.so    force revoke
 auth       required	pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
 auth       required	pam_shells.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
+auth       include      password-auth
+account    include      password-auth
 session    required     pam_loginuid.so
+session    include      password-auth


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- proftpd.spec	7 Sep 2009 13:40:46 -0000	1.55
+++ proftpd.spec	16 Sep 2009 18:06:35 -0000	1.56
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 5
+%global rpmrel 6
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -290,6 +290,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-6
+- Use password-auth common PAM configuration instead of system-auth
+
 * Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
 - Add upstream patch for MLSD with dirnames containing glob chars (#521634)
 



From wtogami at fedoraproject.org  Wed Sep 16 18:07:32 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 16 Sep 2009 18:07:32 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.23, 1.24 livecd-tools.spec,
	1.31, 1.32 sources, 1.24, 1.25
Message-ID: <20090916180732.5837711C00CF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22482

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
- Fix LiveUSB with live images
- Fix display of free space during livecd-iso-to-disk error (farrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	10 Sep 2009 20:09:59 -0000	1.23
+++ .cvsignore	16 Sep 2009 18:07:32 -0000	1.24
@@ -1 +1 @@
-livecd-tools-027.tar.bz2
+livecd-tools-028.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- livecd-tools.spec	15 Sep 2009 21:36:45 -0000	1.31
+++ livecd-tools.spec	16 Sep 2009 18:07:32 -0000	1.32
@@ -4,8 +4,8 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 027
-Release: 2%{?dist}
+Version: 028
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 028-1
+- Fix LiveUSB with live images
+- Fix display of free space during livecd-iso-to-disk error (farrell)
+
 * Tue Sep 15 2009 Warren Togami <wtogami at redhat.com> - 027-2
 - test patch to make LiveUSB work again, need to be sure it doesn't
   break LiveCD before committing in the next version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Sep 2009 20:09:59 -0000	1.24
+++ sources	16 Sep 2009 18:07:32 -0000	1.25
@@ -1 +1 @@
-34fcb9fdaf359a31afd78055bcba807b  livecd-tools-027.tar.bz2
+bc6acb74d1cd29a1e33faa1d3c40121e  livecd-tools-028.tar.bz2



From wtogami at fedoraproject.org  Wed Sep 16 18:08:11 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 16 Sep 2009 18:08:11 +0000 (UTC)
Subject: rpms/livecd-tools/devel livecd-tools.spec, 1.32,
	1.33 livecd-tools-027-make-liveusb-work-damnit.patch, 1.1, NONE
Message-ID: <20090916180811.2BAB911C00CF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22803

Modified Files:
	livecd-tools.spec 
Removed Files:
	livecd-tools-027-make-liveusb-work-damnit.patch 
Log Message:
remove patch



Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- livecd-tools.spec	16 Sep 2009 18:07:32 -0000	1.32
+++ livecd-tools.spec	16 Sep 2009 18:08:11 -0000	1.33
@@ -10,7 +10,6 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
-Patch0: livecd-tools-027-make-liveusb-work-damnit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -52,7 +51,6 @@ like live image or appliances.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make


--- livecd-tools-027-make-liveusb-work-damnit.patch DELETED ---



From tmraz at fedoraproject.org  Wed Sep 16 18:14:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:14:17 +0000 (UTC)
Subject: rpms/pure-ftpd/devel pure-ftpd-paminclude.patch, 1.1,
	1.2 pure-ftpd.spec, 1.27, 1.28
Message-ID: <20090916181417.DDCD911C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pure-ftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26190

Modified Files:
	pure-ftpd-paminclude.patch pure-ftpd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-4
- use password-auth common PAM configuration instead of system-auth


pure-ftpd-paminclude.patch:
 pure-ftpd |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Index: pure-ftpd-paminclude.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd-paminclude.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pure-ftpd-paminclude.patch	9 Dec 2006 15:54:47 -0000	1.1
+++ pure-ftpd-paminclude.patch	16 Sep 2009 18:14:17 -0000	1.2
@@ -1,20 +1,21 @@
 --- ./pam/pure-ftpd.paminclude	2006-10-27 09:28:40.000000000 +0200
 +++ ./pam/pure-ftpd	2006-10-27 09:37:22.000000000 +0200
-@@ -4,13 +4,13 @@
+@@ -4,13 +4,14 @@
  # Install it in /etc/pam.d/pure-ftpd or add to /etc/pam.conf
  
  auth       required     pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
 -auth       required     pam_stack.so service=system-auth
-+auth       include      system-auth
++auth       include      password-auth
  auth       required     pam_shells.so
  auth       required     pam_nologin.so
  
 -account    required     pam_stack.so service=system-auth
-+account    include      system-auth
++account    include      password-auth
  
 -password   required     pam_stack.so service=system-auth
-+password   include      system-auth
++password   include      password-auth
  
 -session    required     pam_stack.so service=system-auth
-+session    include      system-auth
++session    required     pam_loginuid.so
++session    include      password-auth
  


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- pure-ftpd.spec	21 Aug 2009 15:32:02 -0000	1.27
+++ pure-ftpd.spec	16 Sep 2009 18:14:17 -0000	1.28
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.22
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -254,6 +254,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-4
+- use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-3
 - rebuilt with new openssl
 



From tmraz at fedoraproject.org  Wed Sep 16 18:25:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:25:18 +0000 (UTC)
Subject: rpms/ricci/devel ricci-0.16.1-passauth.patch, NONE, 1.1 ricci.spec, 
	1.19, 1.20
Message-ID: <20090916182518.0A2E511C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31186

Modified Files:
	ricci.spec 
Added Files:
	ricci-0.16.1-passauth.patch 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.1-4
- Use password-auth common PAM configuration instead of system-auth


ricci-0.16.1-passauth.patch:
 ricci |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ricci-0.16.1-passauth.patch ---
Use password-auth common PAM configuration instead of system-auth.
diff -up ricci-0.16.1/pam.d/ricci.passauth ricci-0.16.1/pam.d/ricci
--- ricci-0.16.1/pam.d/ricci.passauth	2009-04-17 01:22:03.000000000 +0200
+++ ricci-0.16.1/pam.d/ricci	2009-09-16 20:22:05.000000000 +0200
@@ -1,5 +1,5 @@
 #%PAM-1.0
-auth       include  system-auth
-account    include  system-auth
-password   include  system-auth
-session    include  system-auth
+auth       include  password-auth
+account    include  password-auth
+password   include  password-auth
+session    include  password-auth


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ricci.spec	21 Aug 2009 15:43:02 -0000	1.19
+++ ricci.spec	16 Sep 2009 18:25:17 -0000	1.20
@@ -10,12 +10,13 @@
 
 Name: ricci
 Version: 0.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
 Summary: Remote Cluster and Storage Management System
 Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.16.1.tar.gz
+Patch1: ricci-0.16.1-passauth.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel python-devel libcap-devel
@@ -32,6 +33,7 @@ Requires(postun): initscripts
 
 %prep
 %setup -q
+%patch1 -p1 -b .passauth
 
 %build
 %configure --arch=%{_arch} --docdir=%{_docdir}
@@ -121,6 +123,9 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.1-4
+- Use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.1-3
 - rebuilt with new openssl
 



From till at fedoraproject.org  Wed Sep 16 18:28:36 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 18:28:36 +0000 (UTC)
Subject: rpms/dzen2/devel dzen2.spec,1.1,1.2
Message-ID: <20090916182836.343E711C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/dzen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv631

Modified Files:
	dzen2.spec 
Log Message:
* Wed Sep 16 2009 Till Maas <opensource at till.name> - 0.8.5-6
- Fix some types in %description



Index: dzen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/dzen2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dzen2.spec	28 Aug 2009 16:14:08 -0000	1.1
+++ dzen2.spec	16 Sep 2009 18:28:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dzen2
 Version:        0.8.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A general purpose messaging and notification program
 
 Group:          User Interface/X
@@ -25,8 +25,8 @@ BuildRequires:  libXpm-devel libXinerama
 
 %description
 Dzen is a general purpose messaging, notification and menuing program for X11.
-It was desigend to be scriptable in any language and integrate well with window
-managers like dwm, wmii and xmonad though it will work with any windowmanger.
+It was designed to be scriptable in any language and integrate well with window
+managers like dwm, wmii and xmonad, though it will work with any windowmanger.
 
 
 %prep
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Till Maas <opensource at till.name> - 0.8.5-6
+- Fix some types in %%description
+
 * Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
 - Remove uneeded PREFIX= argument to make in %%build
 



From roland at fedoraproject.org  Wed Sep 16 18:28:45 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 16 Sep 2009 18:28:45 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1807,1.1808
Message-ID: <20090916182845.32C3F11C00CF@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv729

Modified Files:
	kernel.spec 
Log Message:
Put workaround back, gcc still crashing on ppc.  Sigh.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1807
retrieving revision 1.1808
diff -u -p -r1.1807 -r1.1808
--- kernel.spec	16 Sep 2009 17:44:25 -0000	1.1807
+++ kernel.spec	16 Sep 2009 18:28:44 -0000	1.1808
@@ -1485,6 +1485,11 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
+    cat >> Makefile <<\EOF
+# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
+KBUILD_CFLAGS += -fno-var-tracking-assignments
+EOF
+
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -2049,9 +2054,6 @@ fi
 * Wed Sep 16 2009 Adam Jackson <ajax at redhat.com>
 - Disable hotplug interrupts on TV connectors on i915.
 
-* Wed Sep 16 2009 Roland McGrath <roland at redhat.com> - 2.6.31-20
-- Remove workaround for gcc bug #521991, now fixed.
-
 * Wed Sep 16 2009 Dave Jones <davej at redhat.com>
 - Fix NULL deref in powernow-k8 driver. (korg #13780)
 



From beuc at fedoraproject.org  Wed Sep 16 18:30:52 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Wed, 16 Sep 2009 18:30:52 +0000 (UTC)
Subject: rpms/freedink/devel .cvsignore, 1.4, 1.5 freedink.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090916183052.F08A111C00CF@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1689

Modified Files:
	.cvsignore freedink.spec sources 
Log Message:
Update to 1.08.20090916


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jan 2009 21:10:30 -0000	1.4
+++ .cvsignore	16 Sep 2009 18:30:52 -0000	1.5
@@ -1 +1 @@
-freedink-1.08.20090120.tar.gz
+freedink-1.08.20090916.tar.gz


Index: freedink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/freedink.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- freedink.spec	24 Jul 2009 23:06:29 -0000	1.8
+++ freedink.spec	16 Sep 2009 18:30:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		freedink
-Version:	1.08.20090120
-Release:	4%{?dist}
+Version:	1.08.20090916
+Release:	1%{?dist}
 Summary:	Adventure and role-playing game
 
 Group:		Amusements/Games
@@ -43,11 +43,17 @@ Requires:	freedink-data
 %if 0%{?suse_version}
 Requires: timidity
 %endif
+
+%if 0%{?with_included_liberation_font}
+# No dependency
+%else
+# Repect Fedora guidelines (see below)
 %if 0%{?fedora}
 Requires: liberation-sans-fonts
 %else
 Requires: liberation-fonts
 %endif
+%endif
 
 %description engine
 Dink Smallwood is an adventure/role-playing game, similar to Zelda,
@@ -88,7 +94,14 @@ desktop-file-validate %{buildroot}/%{_da
 # Policy insists on not installing a different version of "Liberation
 # Sans". Beware that the system version may be different than the
 # official FreeDink font, because Liberation changes regularly.
+%if 0%{?with_included_liberation_font}
+# Include it nonetheless for the sake of avoiding
+# liberation-fonts<->liberation-sans-fonts conflicts in the
+# freedink.org repository
+%else
+# Remove it for compliance with Fedore guidelines
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/LiberationSans-Regular.ttf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090916-1
+- New upstream release
+- Can optionaly bundle default font, to avoid liberation-fonts
+  vs. liberation-sans-fonts issues when building snapshot RPMs
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08.20090120-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jan 2009 21:10:30 -0000	1.4
+++ sources	16 Sep 2009 18:30:52 -0000	1.5
@@ -1 +1 @@
-4c877567c85ac3433cc9ae9c2fc54135  freedink-1.08.20090120.tar.gz
+ccd45fb00faf04a3eefcc382d7f7ee9f  freedink-1.08.20090916.tar.gz



From till at fedoraproject.org  Wed Sep 16 18:32:22 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 18:32:22 +0000 (UTC)
Subject: rpms/pyhunspell/devel import.log, NONE, 1.1 pyhunspell.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090916183222.143C811C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pyhunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2274/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pyhunspell.spec 
Log Message:
initial import



--- NEW FILE import.log ---
pyhunspell-0_1-2_fc10:HEAD:pyhunspell-0.1-2.fc10.src.rpm:1253125712


--- NEW FILE pyhunspell.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyhunspell
Version:        0.1
Release:        2%{?dist}
Summary:        Python bindings for hunspell

Group:          Development/Languages
License:        LGPLv3+
URL:            http://code.google.com/p/pyhunspell/
Source0:        http://pyhunspell.googlecode.com/files/hunspell-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel hunspell-devel

%description
These are python bindings for hunspell, that allow to use the hunspell library
in python.


%prep
%setup -q -n hunspell-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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,-)
%doc
%{python_sitearch}/hunspell.so
%{python_sitearch}/hunspell-*.egg-info


%changelog
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %%description to a full sentence
- Adjust the license tag, it's actually LGPLv3+

* Wed Jul 29 2009 Till Maas <opensource at till.name> - 0.1-1
- Initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyhunspell/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Sep 2009 20:23:44 -0000	1.1
+++ .cvsignore	16 Sep 2009 18:32:20 -0000	1.2
@@ -0,0 +1 @@
+hunspell-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyhunspell/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:23:45 -0000	1.1
+++ sources	16 Sep 2009 18:32:21 -0000	1.2
@@ -0,0 +1 @@
+14b80b3533ebfe5437e2c24999ce4fac  hunspell-0.1.tar.gz



From emaldonado at fedoraproject.org  Wed Sep 16 18:32:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 16 Sep 2009 18:32:49 +0000 (UTC)
Subject: rpms/nss/F-10 nss.spec,1.64,1.65
Message-ID: <20090916183249.A2FE011C00CF@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2755

Modified Files:
	nss.spec 
Log Message:
Sign the nssdbm3.so, rhbz#515133


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/nss.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- nss.spec	23 Jun 2009 14:18:39 -0000	1.64
+++ nss.spec	16 Sep 2009 18:32:47 -0000	1.65
@@ -2,10 +2,20 @@
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %define ckbi_version 1.73
 
+# Produce .chk files for the final stripped binaries
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
+%{nil}
+
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          2.10.4%{?dist}
+Release:          2.10.5%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -106,9 +116,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-#export NSPR_INCLUDE_DIR=`nspr-config --includedir`
-#export NSPR_LIB_DIR=`nspr-config --libdir`
-
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
@@ -134,14 +141,14 @@ export USE_64
 %{__make} -C ./mozilla/security/nss
 
 # Set up our package file
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+%{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSS_VERSION%%,%{version},g" > \
-                          $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+                          ./mozilla/dist/pkgconfig/nss.pc
 
 NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
 NSS_VMINOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
@@ -151,7 +158,6 @@ export NSS_VMAJOR 
 export NSS_VMINOR 
 export NSS_VPATCH
 
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__cat} %{SOURCE2} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
@@ -159,9 +165,9 @@ export NSS_VPATCH
                           -e "s, at MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
                           -e "s, at MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
                           -e "s, at MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
-                          > $RPM_BUILD_ROOT/%{_bindir}/nss-config
+                          > ./mozilla/dist/pkgconfig/nss-config
 
-chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
+chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
@@ -201,7 +207,9 @@ killall $RANDSERV || :
 rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
+
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
+
 cd ../../../../
 
 killall $RANDSERV || :
@@ -216,12 +224,15 @@ echo "test suite completed"
 
 %install
 
+%{__rm} -rf $RPM_BUILD_ROOT
+
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
@@ -231,75 +242,72 @@ do
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
-# These ghost files will be generated in the post step
 # Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk
+for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
 do
-  touch $RPM_BUILD_ROOT/%{_lib}/$file
   ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # Install the empty NSS db files
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
-%{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
-%{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
-%{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+%{__install} -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
+%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
+%{__install} -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-%{__install} -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
+%{__install} -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
-  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  %{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Copy the binaries we want
 for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
 done
 
 # Copy the binaries we ship as unsupported
 for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
 
 # Copy the include files we want
 for file in mozilla/dist/public/nss/*.h
 do
-  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
+# Copy the package configuration files
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
-%{unsupported_tools_directory}/shlibsign -i /%{_lib}/libsoftokn3.so >/dev/null 2>/dev/null
-%{unsupported_tools_directory}/shlibsign -i /%{_lib}/libfreebl3.so >/dev/null 2>/dev/null
-
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
 /%{_lib}/libnssutil3.so
 /%{_lib}/libnssdbm3.so
+/%{_lib}/libnssdbm3.chk
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
 /%{_lib}/libsoftokn3.so
+/%{_lib}/libsoftokn3.chk
 /%{_lib}/libnssckbi.so
 /%{_lib}/libnsspem.so
 /%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
 %{unsupported_tools_directory}/shlibsign
-%ghost /%{_lib}/libsoftokn3.chk
-%ghost /%{_lib}/libfreebl3.chk
 %dir %{_libdir}/nss
 %dir %{unsupported_tools_directory}
 %dir %{_sysconfdir}/pki/nssdb
@@ -331,12 +339,12 @@ done
 %{unsupported_tools_directory}/vfyserv
 %{unsupported_tools_directory}/vfychain
 
-
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
 %{_libdir}/libnssutil3.so
 %{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
 %{_libdir}/libsoftokn3.so
@@ -450,6 +458,9 @@ done
 
 
 %changelog
+* Wed Sep 16 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-2.10.5
+- Fix inability to toggle fips mode, rhbz#513133
+
 * Tue Jun 23 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-2.10.4
 - updated source12 to refer to new pem source tar ball
 * Tue Jun 23 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-2.10.3



From tmraz at fedoraproject.org  Wed Sep 16 18:37:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:37:52 +0000 (UTC)
Subject: rpms/rsh/devel rexec.pam, 1.7, 1.8 rlogin.pam, 1.7, 1.8 rsh.pam, 1.7,
	1.8 rsh.spec, 1.53, 1.54
Message-ID: <20090916183752.B4A1011C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5450

Modified Files:
	rexec.pam rlogin.pam rsh.pam rsh.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.17-58
- use password-auth common PAM configuration instead of system-auth



Index: rexec.pam
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rexec.pam,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rexec.pam	26 Oct 2007 07:13:24 -0000	1.7
+++ rexec.pam	16 Sep 2009 18:37:52 -0000	1.8
@@ -4,8 +4,8 @@
 auth       required     pam_nologin.so
 auth       required     pam_securetty.so
 auth       required     pam_env.so
-auth       include      system-auth
-account    include      system-auth
+auth       include      password-auth
+account    include      password-auth
 session	   optional     pam_keyinit.so    force revoke
-session    include      system-auth
 session    required     pam_loginuid.so
+session    include      password-auth


Index: rlogin.pam
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rlogin.pam,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rlogin.pam	9 May 2008 10:59:21 -0000	1.7
+++ rlogin.pam	16 Sep 2009 18:37:52 -0000	1.8
@@ -5,9 +5,9 @@ auth       required     pam_nologin.so
 auth       required     pam_securetty.so
 auth       required     pam_env.so
 auth       sufficient   pam_rhosts.so
-auth       include      system-auth
-account    include      system-auth
-password   include      system-auth
+auth       include      password-auth
+account    include      password-auth
+password   include      password-auth
 session	   optional     pam_keyinit.so    force revoke
-session    include      system-auth
 session    required     pam_loginuid.so
+session    include      password-auth


Index: rsh.pam
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.pam,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rsh.pam	9 May 2008 10:59:21 -0000	1.7
+++ rsh.pam	16 Sep 2009 18:37:52 -0000	1.8
@@ -5,7 +5,7 @@ auth       required     pam_nologin.so
 auth       required     pam_securetty.so
 auth       required     pam_env.so
 auth       required     pam_rhosts.so
-account    include      system-auth
+account    include      password-auth
 session	   optional     pam_keyinit.so    force revoke
-session    include      system-auth
 session    required     pam_loginuid.so
+session    include      password-auth


Index: rsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- rsh.spec	21 Aug 2009 11:17:01 -0000	1.53
+++ rsh.spec	16 Sep 2009 18:37:52 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 57%{?dist}
+Release: 58%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -194,6 +194,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.17-58
+- use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.17-57
 - rebuilt with new audit
 



From tmraz at fedoraproject.org  Wed Sep 16 18:43:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:43:50 +0000 (UTC)
Subject: rpms/samba/devel samba.pamd,1.2,1.3 samba.spec,1.195,1.196
Message-ID: <20090916184350.2C15C11C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8922

Modified Files:
	samba.pamd samba.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.1-0.45
- Use password-auth common PAM configuration instead of system-auth



Index: samba.pamd
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.pamd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- samba.pamd	14 Nov 2005 16:17:56 -0000	1.2
+++ samba.pamd	16 Sep 2009 18:43:49 -0000	1.3
@@ -1,6 +1,6 @@
 #%PAM-1.0
 auth       required	pam_nologin.so
-auth       include	system-auth
-account    include	system-auth
-session    include	system-auth
-password   include	system-auth
+auth       include	password-auth
+account    include	password-auth
+session    include	password-auth
+password   include	password-auth


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- samba.spec	9 Sep 2009 14:08:31 -0000	1.195
+++ samba.spec	16 Sep 2009 18:43:49 -0000	1.196
@@ -1,4 +1,4 @@
-%define main_release 44
+%define main_release 45
 %define samba_version 3.4.1
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
@@ -884,6 +884,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.1-0.45
+- Use password-auth common PAM configuration instead of system-auth
+
 * Wed Sep 09 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.1-0.44
 - Update to 3.4.1
 



From tmraz at fedoraproject.org  Wed Sep 16 18:48:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:48:51 +0000 (UTC)
Subject: rpms/sendmail/devel sendmail.pam,1.3,1.4 sendmail.spec,1.102,1.103
Message-ID: <20090916184851.810F211C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11333

Modified Files:
	sendmail.pam sendmail.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.14.3-8
- Use password-auth common PAM configuration instead of system-auth



Index: sendmail.pam
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sendmail.pam	10 Oct 2005 11:39:12 -0000	1.3
+++ sendmail.pam	16 Sep 2009 18:48:51 -0000	1.4
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
+auth       include	password-auth
+account    include	password-auth


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sendmail.spec	21 Aug 2009 15:48:52 -0000	1.102
+++ sendmail.spec	16 Sep 2009 18:48:51 -0000	1.103
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -566,6 +566,9 @@ exit 0
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.14.3-8
+- Use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.14.3-7
 - rebuilt with new openssl
 



From dajt at fedoraproject.org  Wed Sep 16 18:50:57 2009
From: dajt at fedoraproject.org (Jay Fenlason)
Date: Wed, 16 Sep 2009 18:50:57 +0000 (UTC)
Subject: rpms/openmpi/devel openmpi.spec,1.41,1.42
Message-ID: <20090916185057.6F2ED11C00CF@cvs1.fedora.phx.redhat.com>

Author: dajt

Update of /cvs/pkgs/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140

Modified Files:
	openmpi.spec 
Log Message:
As described in changelog:
- Move the module file from %{_datadir}/Modules/modulefiles/%{namearch} to
  %{_sysconfdir}/modulefiles/%{namearch} where it belongs.                
- Have the -devel subpackage own the man1 and man7 directories for completeness.
- Add a blank line before the clean section.                                    
- Remove --enable-mpirun-prefix-by-default from configure.



Index: openmpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- openmpi.spec	11 Sep 2009 18:04:04 -0000	1.41
+++ openmpi.spec	16 Sep 2009 18:50:56 -0000	1.42
@@ -19,7 +19,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.3.3
-Release:		4%{?dist}
+Release:		5%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
@@ -112,7 +112,7 @@ XFLAGS="-fPIC"
 %endif
 
 ./configure --prefix=%{_libdir}/%{name} --with-libnuma=/usr \
-	--with-openib=/usr --enable-mpirun-prefix-by-default \
+	--with-openib=/usr \
 	--mandir=%{_mandir}/%{namearch} \
 	--includedir=%{_includedir}/%{namearch} \
 	--sysconfdir=%{_sysconfdir}/%{namearch} \
@@ -145,14 +145,15 @@ rm -f %{buildroot}%{_libdir}/%{name}/sha
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
 sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{name}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
 # Make the environment-modules file
-mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
 # Since we're doing our own substitution here, use our own definitions.
-sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}/%{_datadir}/Modules/modulefiles/%{namearch}
+sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch}
 # make the rpm config file
 mkdir -p %{buildroot}/%{_sysconfdir}/rpm
 cp %SOURCE3 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
 mkdir -p %{buildroot}/%{_fmoddir}/%{namearch}
 mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix}
+
 %clean
 rm -rf %{buildroot}
 
@@ -183,7 +184,7 @@ rm -rf %{buildroot}
 %{_mandir}/%{namearch}/man7/ompi*
 %{_mandir}/%{namearch}/man7/orte*
 %{_libdir}/%{name}/lib/openmpi/*
-%{_datadir}/Modules/modulefiles/%{namearch}
+%{_sysconfdir}/modulefiles/%{namearch}
 #%files common
 %dir %{_libdir}/%{name}/share
 %dir %{_libdir}/%{name}/share/openmpi
@@ -195,7 +196,9 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/%{namearch}
+%dir %{_mandir}/%{namearch}/man1
 %dir %{_mandir}/%{namearch}/man3
+%dir %{_mandir}/%{namearch}/man7
 %dir %{_libdir}/%{name}/share/vampirtrace
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/%{name}/bin/mpi[cCf]*
@@ -214,6 +217,13 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Wed Sep 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-5
+- Move the module file from %{_datadir}/Modules/modulefiles/%{namearch} to
+  %{_sysconfdir}/modulefiles/%{namearch} where it belongs.
+- Have the -devel subpackage own the man1 and man7 directories for completeness.
+- Add a blank line before the clean section.
+- Remove --enable-mpirun-prefix-by-default from configure.
+
 * Wed Sep 9 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-4
 - Modify packaging to conform to
   https://fedoraproject.org/wiki/PackagingDrafts/MPI (bz521334).



From tmraz at fedoraproject.org  Wed Sep 16 18:54:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:54:51 +0000 (UTC)
Subject: rpms/squid/devel squid.pam,1.2,1.3 squid.spec,1.143,1.144
Message-ID: <20090916185451.DFE5411C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14350

Modified Files:
	squid.pam squid.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.1.0.13-5
- Use password-auth common PAM configuration instead of system-auth



Index: squid.pam
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.pam	13 Oct 2005 13:02:21 -0000	1.2
+++ squid.pam	16 Sep 2009 18:54:51 -0000	1.3
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth		include		system-auth
-account		include		system-auth
+auth		include		password-auth
+account		include		password-auth


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- squid.spec	15 Sep 2009 17:56:14 -0000	1.143
+++ squid.spec	16 Sep 2009 18:54:51 -0000	1.144
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -253,6 +253,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.1.0.13-5
+- Use password-auth common PAM configuration instead of system-auth
+
 * Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 7:3.1.0.13-4
 - fixed #521596 - wrong return code of init script
 



From kasal at fedoraproject.org  Wed Sep 16 18:57:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 16 Sep 2009 18:57:32 +0000 (UTC)
Subject: rpms/perl-namespace-autoclean/devel perl-namespace-autoclean.spec,
	1.3, 1.4
Message-ID: <20090916185732.6387911C00CF@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-namespace-autoclean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15586

Modified Files:
	perl-namespace-autoclean.spec 
Log Message:
no macros in %changelog


Index: perl-namespace-autoclean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/devel/perl-namespace-autoclean.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-namespace-autoclean.spec	16 Sep 2009 15:40:01 -0000	1.3
+++ perl-namespace-autoclean.spec	16 Sep 2009 18:57:30 -0000	1.4
@@ -67,7 +67,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
-- add %perl_default_filter'ing
+- add %%perl_default_filter'ing
 - auto-update to 0.09 (by cpan-spec-update 0.01)
 - added a new req on perl(B::Hooks::EndOfScope) (version 0.07)
 - added a new req on perl(Class::MOP) (version 0.80)



From tmraz at fedoraproject.org  Wed Sep 16 18:59:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 18:59:02 +0000 (UTC)
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-pam-wbem.patch, 1.1,
	1.2 tog-pegasus.spec, 1.76, 1.77
Message-ID: <20090916185902.5E59111C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16517

Modified Files:
	pegasus-2.5.1-pam-wbem.patch tog-pegasus.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-6
- Use password-auth common PAM configuration instead of system-auth


pegasus-2.5.1-pam-wbem.patch:
 wbem |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

Index: pegasus-2.5.1-pam-wbem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/pegasus-2.5.1-pam-wbem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pegasus-2.5.1-pam-wbem.patch	7 Apr 2006 02:40:20 -0000	1.1
+++ pegasus-2.5.1-pam-wbem.patch	16 Sep 2009 18:59:02 -0000	1.2
@@ -14,9 +14,9 @@
 -
 -session     required      $ISA/pam_limits.so
 -session     required      $ISA/pam_unix.so
-+auth       include      system-auth
++auth       include      password-auth
 +account    required     pam_access.so accessfile=/etc/Pegasus/access.conf
-+account    include      system-auth
-+password   include      system-auth
-+session    include      system-auth
++account    include      password-auth
++password   include      password-auth
 +session    required     pam_loginuid.so 
++session    include      password-auth


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- tog-pegasus.spec	26 Aug 2009 12:25:02 -0000	1.76
+++ tog-pegasus.spec	16 Sep 2009 18:59:02 -0000	1.77
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.9.0
-Release: 		5%{?dist}
+Release: 		6%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -463,6 +463,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-6
+- Use password-auth common PAM configuration instead of system-auth
+
 * Wed Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-5
 - rebuilt with new openssl
 



From tmraz at fedoraproject.org  Wed Sep 16 19:04:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 19:04:11 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng-remote.pamd, 1.2,
	1.3 util-linux-ng.spec, 1.59, 1.60
Message-ID: <20090916190411.E1DED11C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18591

Modified Files:
	util-linux-ng-remote.pamd util-linux-ng.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-10
- use password-auth common PAM configuration instead of system-auth and
  drop pam_console.so call from the remote PAM config file



Index: util-linux-ng-remote.pamd
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-remote.pamd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- util-linux-ng-remote.pamd	12 Dec 2007 21:45:28 -0000	1.2
+++ util-linux-ng-remote.pamd	16 Sep 2009 19:04:11 -0000	1.3
@@ -1,15 +1,14 @@
 #%PAM-1.0
 auth       required     pam_securetty.so
-auth       include      system-auth
+auth       include      password-auth
 account    required     pam_nologin.so
-account    include      system-auth
-password   include      system-auth
+account    include      password-auth
+password   include      password-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
 session    required     pam_loginuid.so
-session    optional     pam_console.so
 # pam_selinux.so open should only be followed by sessions to be executed in the user context
 session    required     pam_selinux.so open
 session    required     pam_namespace.so
 session    optional     pam_keyinit.so force revoke
-session    include      system-auth
+session    include      password-auth


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- util-linux-ng.spec	14 Sep 2009 08:40:51 -0000	1.59
+++ util-linux-ng.spec	16 Sep 2009 19:04:11 -0000	1.60
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -722,6 +722,10 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-10
+- use password-auth common PAM configuration instead of system-auth and
+  drop pam_console.so call from the remote PAM config file
+
 * Mon Sep 14 2009 Karel Zak <kzak at redhat.com> 2.16-9
 - fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
 - fix typo in swsuspend detection



From tmraz at fedoraproject.org  Wed Sep 16 19:20:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 19:20:22 +0000 (UTC)
Subject: rpms/uw-imap/devel imap-password.pam, NONE, 1.1 uw-imap.spec, 1.65,
	1.66
Message-ID: <20090916192022.5E94911C0336@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25917

Modified Files:
	uw-imap.spec 
Added Files:
	imap-password.pam 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2007e-10
- use password-auth common PAM configuration instead of system-auth
  where available



--- NEW FILE imap-password.pam ---
#%PAM-1.0
auth       required     pam_nologin.so
auth       include      password-auth
account    include      password-auth
session    include      password-auth


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- uw-imap.spec	31 Aug 2009 14:55:24 -0000	1.65
+++ uw-imap.spec	16 Sep 2009 19:20:22 -0000	1.66
@@ -12,7 +12,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -40,6 +40,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # imap -> uw-imap rename
 Obsoletes: imap < 1:%{version}
 
+# newest pam setup, using password-auth common PAM
+Source20: imap-password.pam
 # new pam setup, using new "include" feature
 Source21: imap.pam
 # legacy/old pam setup, using pam_stack.so
@@ -142,11 +144,15 @@ This package contains some utilities for
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
 
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+install -p -m644 %{SOURCE20} imap.pam
+%else 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 install -p -m644 %{SOURCE21} imap.pam
 %else
 install -p -m644 %{SOURCE22} imap.pam
 %endif
+%endif
 
 
 %build
@@ -315,6 +321,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2007e-10
+- use password-auth common PAM configuration instead of system-auth
+  where available
+
 * Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> 
 - omit -devel, -static bits in EPEL builds (#518885)
 



From tmraz at fedoraproject.org  Wed Sep 16 19:22:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 19:22:56 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd.pam,1.7,1.8 vsftpd.spec,1.100,1.101
Message-ID: <20090916192256.D996511C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27086

Modified Files:
	vsftpd.pam vsftpd.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-5
- use password-auth common PAM configuration instead of system-auth



Index: vsftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.pam,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- vsftpd.pam	13 Jul 2006 15:21:59 -0000	1.7
+++ vsftpd.pam	16 Sep 2009 19:22:56 -0000	1.8
@@ -2,7 +2,7 @@
 session    optional     pam_keyinit.so    force revoke
 auth       required	pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed
 auth       required	pam_shells.so
-auth       include	system-auth
-account    include	system-auth
-session    include	system-auth
+auth       include	password-auth
+account    include	password-auth
 session    required     pam_loginuid.so
+session    include	password-auth


Index: vsftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- vsftpd.spec	15 Sep 2009 12:18:06 -0000	1.100
+++ vsftpd.spec	16 Sep 2009 19:22:56 -0000	1.101
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-5
+- use password-auth common PAM configuration instead of system-auth
+
 * Mon Sep 14 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-4
 - modified init script to be LSB compliant
 



From tmraz at fedoraproject.org  Wed Sep 16 19:34:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 16 Sep 2009 19:34:03 +0000 (UTC)
Subject: rpms/xrdp/devel xrdp-pam-auth.patch,1.1,1.2 xrdp.spec,1.4,1.5
Message-ID: <20090916193403.30CFF11C00CF@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1149

Modified Files:
	xrdp-pam-auth.patch xrdp.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.6.20090811cvs
- use password-auth instead of system-auth


xrdp-pam-auth.patch:
 xrdp-sesman |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: xrdp-pam-auth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/xrdp-pam-auth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrdp-pam-auth.patch	8 Sep 2009 16:06:52 -0000	1.1
+++ xrdp-pam-auth.patch	16 Sep 2009 19:34:00 -0000	1.2
@@ -1,9 +1,10 @@
 diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
 --- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
 +++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  #%PAM-1.0
 -auth       required	pam_unix.so shadow nullok
 -account    required	pam_unix.so
-+auth       include      system-auth
-+account    include      system-auth
++auth       include      password-auth
++account    include      password-auth
++session    include      password-auth


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/xrdp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xrdp.spec	8 Sep 2009 16:06:52 -0000	1.4
+++ xrdp.spec	16 Sep 2009 19:34:00 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.5.%{cvs}%{?dist}
+Release:   0.6.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -169,6 +169,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.6.20090811cvs
+- use password-auth instead of system-auth
+
 * Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
 - fix xrdp-sesman pam.d to uses system-auth
 



From linville at fedoraproject.org  Wed Sep 16 19:43:47 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 16 Sep 2009 19:43:47 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch,
	NONE, 1.1
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch,
	NONE, 1.1 linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch, NONE, 
	1.1
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch,
	NONE, 1.1 kernel.spec, 1.1808,
	1.1809 linux-2.6-mac80211-age-scan-results-on-resume.patch, 1.1,
	NONE linux-2.6-rt2x00-asus-leds.patch, 1.1, NONE
Message-ID: <20090916194347.D118111C00CF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7327

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch 
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch 
	linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch 
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch 
Removed Files:
	linux-2.6-mac80211-age-scan-results-on-resume.patch 
	linux-2.6-rt2x00-asus-leds.patch 
Log Message:
Add iwl1000 support patches.

linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch:
 iwl-5000.c |    7 +++++++
 iwl-prph.h |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch ---
commit 02c06e4abc0680afd31bf481a803541556757fb6
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Fri Jul 17 09:30:14 2009 -0700

    iwlagn: modify digital SVR for 1000
    
    On 1000, there are two Switching Voltage Regulators (SVR). The first one
    apply digital voltage level (1.32V) for PCIe block and core. We need to
    use this regulator to solve a stability issue related to noisy DC2DC
    line in the silicon.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 85e8bac..3f9da6e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -239,6 +239,13 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
 				APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
 				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
 
+	if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_1000) {
+		/* Setting digital SVR for 1000 card to 1.32V */
+		iwl_set_bits_mask_prph(priv, APMG_DIGITAL_SVR_REG,
+					APMG_SVR_DIGITAL_VOLTAGE_1_32,
+					~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);
+	}
+
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 3b9cac3..d393e8f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -80,6 +80,8 @@
 #define APMG_RFKILL_REG			(APMG_BASE + 0x0014)
 #define APMG_RTC_INT_STT_REG		(APMG_BASE + 0x001c)
 #define APMG_RTC_INT_MSK_REG		(APMG_BASE + 0x0020)
+#define APMG_DIGITAL_SVR_REG		(APMG_BASE + 0x0058)
+#define APMG_ANALOG_SVR_REG		(APMG_BASE + 0x006C)
 
 #define APMG_CLK_VAL_DMA_CLK_RQT	(0x00000200)
 #define APMG_CLK_VAL_BSM_CLK_RQT	(0x00000800)
@@ -91,7 +93,8 @@
 #define APMG_PS_CTRL_VAL_PWR_SRC_VMAIN		(0x00000000)
 #define APMG_PS_CTRL_VAL_PWR_SRC_MAX		(0x01000000) /* 3945 only */
 #define APMG_PS_CTRL_VAL_PWR_SRC_VAUX		(0x02000000)
-
+#define APMG_SVR_VOLTAGE_CONFIG_BIT_MSK	(0x000001E0) /* bit 8:5 */
+#define APMG_SVR_DIGITAL_VOLTAGE_1_32		(0x00000060)
 
 #define APMG_PCIDEV_STT_VAL_L1_ACT_DIS		(0x00000800)
 

linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch:
 iwl-3945.c     |   40 ++++++++++++++++++++++++++++++++++++++++
 iwl-4965.c     |   39 +++++++++++++++++++++++++++++++++++++++
 iwl-5000.c     |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwl-6000.c     |    5 +++--
 iwl-agn.c      |   55 ++++++++++++++++++++++++++++++++-----------------------
 iwl-core.h     |   12 ++++++++++++
 iwl-dev.h      |   31 +++++++++++++++++++++++--------
 iwl3945-base.c |   45 ++++++++++++++++++++++++---------------------
 8 files changed, 224 insertions(+), 54 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch ---
commit cc0f555d511a5fe9d4519334c8f674a1dbab9e3a
Author: Jay Sternberg <jay.e.sternberg at intel.com>
Date:   Fri Jul 17 09:30:16 2009 -0700

    iwlwifi: Handle new firmware file with ucode build number in header
    
    Adding new API version to account for change to ucode file format.  New
    header includes the build number of the ucode.  This build number is the
    SVN revision thus allowing for exact correlation to the code that
    generated it.
    
    The header adds the build number so that older ucode images can also be
    enhanced to include the build in the future.
    
    some cleanup in iwl_read_ucode needed to ensure old header not used and
    reduce unnecessary references through pointer with the data is already
    in heap variable.
    
    Signed-off-by: Jay Sternberg <jay.e.sternberg at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 1227ed2..14a47c0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2786,11 +2786,50 @@ static int iwl3945_load_bsm(struct iwl_priv *priv)
 	return 0;
 }
 
+#define IWL3945_UCODE_GET(item)						\
+static u32 iwl3945_ucode_get_##item(const struct iwl_ucode_header *ucode,\
+				    u32 api_ver)			\
+{									\
+	return le32_to_cpu(ucode->u.v1.item);				\
+}
+
+static u32 iwl3945_ucode_get_header_size(u32 api_ver)
+{
+	return UCODE_HEADER_SIZE(1);
+}
+static u32 iwl3945_ucode_get_build(const struct iwl_ucode_header *ucode,
+				   u32 api_ver)
+{
+	return 0;
+}
+static u8 *iwl3945_ucode_get_data(const struct iwl_ucode_header *ucode,
+				  u32 api_ver)
+{
+	return (u8 *) ucode->u.v1.data;
+}
+
+IWL3945_UCODE_GET(inst_size);
+IWL3945_UCODE_GET(data_size);
+IWL3945_UCODE_GET(init_size);
+IWL3945_UCODE_GET(init_data_size);
+IWL3945_UCODE_GET(boot_size);
+
 static struct iwl_hcmd_ops iwl3945_hcmd = {
 	.rxon_assoc = iwl3945_send_rxon_assoc,
 	.commit_rxon = iwl3945_commit_rxon,
 };
 
+static struct iwl_ucode_ops iwl3945_ucode = {
+	.get_header_size = iwl3945_ucode_get_header_size,
+	.get_build = iwl3945_ucode_get_build,
+	.get_inst_size = iwl3945_ucode_get_inst_size,
+	.get_data_size = iwl3945_ucode_get_data_size,
+	.get_init_size = iwl3945_ucode_get_init_size,
+	.get_init_data_size = iwl3945_ucode_get_init_data_size,
+	.get_boot_size = iwl3945_ucode_get_boot_size,
+	.get_data = iwl3945_ucode_get_data,
+};
+
 static struct iwl_lib_ops iwl3945_lib = {
 	.txq_attach_buf_to_tfd = iwl3945_hw_txq_attach_buf_to_tfd,
 	.txq_free_tfd = iwl3945_hw_txq_free_tfd,
@@ -2831,6 +2870,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
 };
 
 static struct iwl_ops iwl3945_ops = {
+	.ucode = &iwl3945_ucode,
 	.lib = &iwl3945_lib,
 	.hcmd = &iwl3945_hcmd,
 	.utils = &iwl3945_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index edbb0bf..f4eb683 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2221,12 +2221,50 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)
 	cancel_work_sync(&priv->txpower_work);
 }
 
+#define IWL4965_UCODE_GET(item)						\
+static u32 iwl4965_ucode_get_##item(const struct iwl_ucode_header *ucode,\
+				    u32 api_ver)			\
+{									\
+	return le32_to_cpu(ucode->u.v1.item);				\
+}
+
+static u32 iwl4965_ucode_get_header_size(u32 api_ver)
+{
+	return UCODE_HEADER_SIZE(1);
+}
+static u32 iwl4965_ucode_get_build(const struct iwl_ucode_header *ucode,
+				   u32 api_ver)
+{
+	return 0;
+}
+static u8 *iwl4965_ucode_get_data(const struct iwl_ucode_header *ucode,
+				  u32 api_ver)
+{
+	return (u8 *) ucode->u.v1.data;
+}
+
+IWL4965_UCODE_GET(inst_size);
+IWL4965_UCODE_GET(data_size);
+IWL4965_UCODE_GET(init_size);
+IWL4965_UCODE_GET(init_data_size);
+IWL4965_UCODE_GET(boot_size);
+
 static struct iwl_hcmd_ops iwl4965_hcmd = {
 	.rxon_assoc = iwl4965_send_rxon_assoc,
 	.commit_rxon = iwl_commit_rxon,
 	.set_rxon_chain = iwl_set_rxon_chain,
 };
 
+static struct iwl_ucode_ops iwl4965_ucode = {
+	.get_header_size = iwl4965_ucode_get_header_size,
+	.get_build = iwl4965_ucode_get_build,
+	.get_inst_size = iwl4965_ucode_get_inst_size,
+	.get_data_size = iwl4965_ucode_get_data_size,
+	.get_init_size = iwl4965_ucode_get_init_size,
+	.get_init_data_size = iwl4965_ucode_get_init_data_size,
+	.get_boot_size = iwl4965_ucode_get_boot_size,
+	.get_data = iwl4965_ucode_get_data,
+};
 static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
 	.get_hcmd_size = iwl4965_get_hcmd_size,
 	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,
@@ -2287,6 +2325,7 @@ static struct iwl_lib_ops iwl4965_lib = {
 };
 
 static struct iwl_ops iwl4965_ops = {
+	.ucode = &iwl4965_ucode,
 	.lib = &iwl4965_lib,
 	.hcmd = &iwl4965_hcmd,
 	.utils = &iwl4965_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 3f9da6e..74103cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1456,6 +1456,44 @@ int iwl5000_calc_rssi(struct iwl_priv *priv,
 	return max_rssi - agc - IWL49_RSSI_OFFSET;
 }
 
+#define IWL5000_UCODE_GET(item)						\
+static u32 iwl5000_ucode_get_##item(const struct iwl_ucode_header *ucode,\
+				    u32 api_ver)			\
+{									\
+	if (api_ver <= 2)						\
+		return le32_to_cpu(ucode->u.v1.item);			\
+	return le32_to_cpu(ucode->u.v2.item);				\
+}
+
+static u32 iwl5000_ucode_get_header_size(u32 api_ver)
+{
+	if (api_ver <= 2)
+		return UCODE_HEADER_SIZE(1);
+	return UCODE_HEADER_SIZE(2);
+}
+
+static u32 iwl5000_ucode_get_build(const struct iwl_ucode_header *ucode,
+				   u32 api_ver)
+{
+	if (api_ver <= 2)
+		return 0;
+	return le32_to_cpu(ucode->u.v2.build);
+}
+
+static u8 *iwl5000_ucode_get_data(const struct iwl_ucode_header *ucode,
+				  u32 api_ver)
+{
+	if (api_ver <= 2)
+		return (u8 *) ucode->u.v1.data;
+	return (u8 *) ucode->u.v2.data;
+}
+
+IWL5000_UCODE_GET(inst_size);
+IWL5000_UCODE_GET(data_size);
+IWL5000_UCODE_GET(init_size);
+IWL5000_UCODE_GET(init_data_size);
+IWL5000_UCODE_GET(boot_size);
+
 struct iwl_hcmd_ops iwl5000_hcmd = {
 	.rxon_assoc = iwl5000_send_rxon_assoc,
 	.commit_rxon = iwl_commit_rxon,
@@ -1471,6 +1509,17 @@ struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = {
 	.calc_rssi = iwl5000_calc_rssi,
 };
 
+struct iwl_ucode_ops iwl5000_ucode = {
+	.get_header_size = iwl5000_ucode_get_header_size,
+	.get_build = iwl5000_ucode_get_build,
+	.get_inst_size = iwl5000_ucode_get_inst_size,
+	.get_data_size = iwl5000_ucode_get_data_size,
+	.get_init_size = iwl5000_ucode_get_init_size,
+	.get_init_data_size = iwl5000_ucode_get_init_data_size,
+	.get_boot_size = iwl5000_ucode_get_boot_size,
+	.get_data = iwl5000_ucode_get_data,
+};
+
 struct iwl_lib_ops iwl5000_lib = {
 	.set_hw_params = iwl5000_hw_set_hw_params,
 	.txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl,
@@ -1572,12 +1621,14 @@ static struct iwl_lib_ops iwl5150_lib = {
 };
 
 struct iwl_ops iwl5000_ops = {
+	.ucode = &iwl5000_ucode,
 	.lib = &iwl5000_lib,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl5000_hcmd_utils,
 };
 
 static struct iwl_ops iwl5150_ops = {
+	.ucode = &iwl5000_ucode,
 	.lib = &iwl5150_lib,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl5000_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index bd438d8..26c5d4a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -46,8 +46,8 @@
 #include "iwl-5000-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL6000_UCODE_API_MAX 2
-#define IWL6050_UCODE_API_MAX 2
+#define IWL6000_UCODE_API_MAX 3
+#define IWL6050_UCODE_API_MAX 3
 
 /* Lowest firmware API version supported */
 #define IWL6000_UCODE_API_MIN 1
@@ -69,6 +69,7 @@ static struct iwl_hcmd_utils_ops iwl6000_hcmd_utils = {
 };
 
 static struct iwl_ops iwl6000_ops = {
+	.ucode = &iwl5000_ucode,
 	.lib = &iwl5000_lib,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl6000_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ad50022..6b874da 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1284,7 +1284,7 @@ static void iwl_nic_start(struct iwl_priv *priv)
  */
 static int iwl_read_ucode(struct iwl_priv *priv)
 {
-	struct iwl_ucode *ucode;
+	struct iwl_ucode_header *ucode;
 	int ret = -EINVAL, index;
 	const struct firmware *ucode_raw;
 	const char *name_pre = priv->cfg->fw_name_pre;
@@ -1293,7 +1293,8 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	char buf[25];
 	u8 *src;
 	size_t len;
-	u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;
+	u32 api_ver, build;
+	u32 inst_size, data_size, init_size, init_data_size, boot_size;
 
 	/* Ask kernel firmware_class module to get the boot firmware off disk.
 	 * request_firmware() is synchronous, file is in memory on return. */
@@ -1323,23 +1324,26 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	if (ret < 0)
 		goto error;
 
-	/* Make sure that we got at least our header! */
-	if (ucode_raw->size < sizeof(*ucode)) {
+	/* Make sure that we got at least the v1 header! */
+	if (ucode_raw->size < priv->cfg->ops->ucode->get_header_size(1)) {
 		IWL_ERR(priv, "File size way too small!\n");
 		ret = -EINVAL;
 		goto err_release;
 	}
 
 	/* Data from ucode file:  header followed by uCode images */
-	ucode = (void *)ucode_raw->data;
+	ucode = (struct iwl_ucode_header *)ucode_raw->data;
 
 	priv->ucode_ver = le32_to_cpu(ucode->ver);
 	api_ver = IWL_UCODE_API(priv->ucode_ver);
-	inst_size = le32_to_cpu(ucode->inst_size);
-	data_size = le32_to_cpu(ucode->data_size);
-	init_size = le32_to_cpu(ucode->init_size);
-	init_data_size = le32_to_cpu(ucode->init_data_size);
-	boot_size = le32_to_cpu(ucode->boot_size);
+	build = priv->cfg->ops->ucode->get_build(ucode, api_ver);
+	inst_size = priv->cfg->ops->ucode->get_inst_size(ucode, api_ver);
+	data_size = priv->cfg->ops->ucode->get_data_size(ucode, api_ver);
+	init_size = priv->cfg->ops->ucode->get_init_size(ucode, api_ver);
+	init_data_size =
+		priv->cfg->ops->ucode->get_init_data_size(ucode, api_ver);
+	boot_size = priv->cfg->ops->ucode->get_boot_size(ucode, api_ver);
+	src = priv->cfg->ops->ucode->get_data(ucode, api_ver);
 
 	/* api_ver should match the api version forming part of the
 	 * firmware filename ... but we don't check for that and only rely
@@ -1365,6 +1369,9 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	       IWL_UCODE_API(priv->ucode_ver),
 	       IWL_UCODE_SERIAL(priv->ucode_ver));
 
+	if (build)
+		IWL_DEBUG_INFO(priv, "Build %u\n", build);
+
 	IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
 		       priv->ucode_ver);
 	IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",
@@ -1379,12 +1386,14 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 		       boot_size);
 
 	/* Verify size of file vs. image size info in file's header */
-	if (ucode_raw->size < sizeof(*ucode) +
+	if (ucode_raw->size !=
+		priv->cfg->ops->ucode->get_header_size(api_ver) +
 		inst_size + data_size + init_size +
 		init_data_size + boot_size) {
 
-		IWL_DEBUG_INFO(priv, "uCode file size %d too small\n",
-			       (int)ucode_raw->size);
+		IWL_DEBUG_INFO(priv,
+			"uCode file size %d does not match expected size\n",
+			(int)ucode_raw->size);
 		ret = -EINVAL;
 		goto err_release;
 	}
@@ -1464,42 +1473,42 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	/* Copy images into buffers for card's bus-master reads ... */
 
 	/* Runtime instructions (first block of data in file) */
-	src = &ucode->data[0];
-	len = priv->ucode_code.len;
+	len = inst_size;
 	IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode instr len %Zd\n", len);
 	memcpy(priv->ucode_code.v_addr, src, len);
+	src += len;
+
 	IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
 		priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
 
 	/* Runtime data (2nd block)
 	 * NOTE:  Copy into backup buffer will be done in iwl_up()  */
-	src = &ucode->data[inst_size];
-	len = priv->ucode_data.len;
+	len = data_size;
 	IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode data len %Zd\n", len);
 	memcpy(priv->ucode_data.v_addr, src, len);
 	memcpy(priv->ucode_data_backup.v_addr, src, len);
+	src += len;
 
 	/* Initialization instructions (3rd block) */
 	if (init_size) {
-		src = &ucode->data[inst_size + data_size];
-		len = priv->ucode_init.len;
+		len = init_size;
 		IWL_DEBUG_INFO(priv, "Copying (but not loading) init instr len %Zd\n",
 				len);
 		memcpy(priv->ucode_init.v_addr, src, len);
+		src += len;
 	}
 
 	/* Initialization data (4th block) */
 	if (init_data_size) {
-		src = &ucode->data[inst_size + data_size + init_size];
-		len = priv->ucode_init_data.len;
+		len = init_data_size;
 		IWL_DEBUG_INFO(priv, "Copying (but not loading) init data len %Zd\n",
 			       len);
 		memcpy(priv->ucode_init_data.v_addr, src, len);
+		src += len;
 	}
 
 	/* Bootstrap instructions (5th block) */
-	src = &ucode->data[inst_size + data_size + init_size + init_data_size];
-	len = priv->ucode_boot.len;
+	len = boot_size;
 	IWL_DEBUG_INFO(priv, "Copying (but not loading) boot instr len %Zd\n", len);
 	memcpy(priv->ucode_boot.v_addr, src, len);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 640c464..c844fab 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -116,6 +116,17 @@ struct iwl_temp_ops {
 	void (*set_ct_kill)(struct iwl_priv *priv);
 };
 
+struct iwl_ucode_ops {
+	u32 (*get_header_size)(u32);
+	u32 (*get_build)(const struct iwl_ucode_header *, u32);
+	u32 (*get_inst_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_data_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_init_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_init_data_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_boot_size)(const struct iwl_ucode_header *, u32);
+	u8 * (*get_data)(const struct iwl_ucode_header *, u32);
+};
+
 struct iwl_lib_ops {
 	/* set hw dependent parameters */
 	int (*set_hw_params)(struct iwl_priv *priv);
@@ -171,6 +182,7 @@ struct iwl_lib_ops {
 };
 
 struct iwl_ops {
+	const struct iwl_ucode_ops *ucode;
 	const struct iwl_lib_ops *lib;
 	const struct iwl_hcmd_ops *hcmd;
 	const struct iwl_hcmd_utils_ops *utils;
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index b989d5c..f4afd0c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -66,6 +66,7 @@ extern struct iwl_cfg iwl1000_bgn_cfg;
 /* shared structures from iwl-5000.c */
 extern struct iwl_mod_params iwl50_mod_params;
 extern struct iwl_ops iwl5000_ops;
+extern struct iwl_ucode_ops iwl5000_ucode;
 extern struct iwl_lib_ops iwl5000_lib;
 extern struct iwl_hcmd_ops iwl5000_hcmd;
 extern struct iwl_hcmd_utils_ops iwl5000_hcmd_utils;
@@ -525,15 +526,29 @@ struct fw_desc {
 };
 
 /* uCode file layout */
-struct iwl_ucode {
-	__le32 ver;		/* major/minor/API/serial */
-	__le32 inst_size;	/* bytes of runtime instructions */
-	__le32 data_size;	/* bytes of runtime data */
-	__le32 init_size;	/* bytes of initialization instructions */
-	__le32 init_data_size;	/* bytes of initialization data */
-	__le32 boot_size;	/* bytes of bootstrap instructions */
-	u8 data[0];		/* data in same order as "size" elements */
+struct iwl_ucode_header {
+	__le32 ver;	/* major/minor/API/serial */
+	union {
+		struct {
+			__le32 inst_size;	/* bytes of runtime code */
+			__le32 data_size;	/* bytes of runtime data */
+			__le32 init_size;	/* bytes of init code */
+			__le32 init_data_size;	/* bytes of init data */
+			__le32 boot_size;	/* bytes of bootstrap code */
+			u8 data[0];		/* in same order as sizes */
+		} v1;
+		struct {
+			__le32 build;		/* build number */
+			__le32 inst_size;	/* bytes of runtime code */
+			__le32 data_size;	/* bytes of runtime data */
+			__le32 init_size;	/* bytes of init code */
+			__le32 init_data_size;	/* bytes of init data */
+			__le32 boot_size;	/* bytes of bootstrap code */
+			u8 data[0];		/* in same order as sizes */
+		} v2;
+	} u;
 };
+#define UCODE_HEADER_SIZE(ver) ((ver) == 1 ? 24 : 28)
 
 struct iwl4965_ibss_seq {
 	u8 mac[ETH_ALEN];
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c9b3ea9..bd6a067 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2041,7 +2041,7 @@ static void iwl3945_nic_start(struct iwl_priv *priv)
  */
 static int iwl3945_read_ucode(struct iwl_priv *priv)
 {
-	struct iwl_ucode *ucode;
+	const struct iwl_ucode_header *ucode;
 	int ret = -EINVAL, index;
 	const struct firmware *ucode_raw;
 	/* firmware file name contains uCode/driver compatibility version */
@@ -2082,22 +2082,24 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 		goto error;
 
 	/* Make sure that we got at least our header! */
-	if (ucode_raw->size < sizeof(*ucode)) {
+	if (ucode_raw->size <  priv->cfg->ops->ucode->get_header_size(1)) {
 		IWL_ERR(priv, "File size way too small!\n");
 		ret = -EINVAL;
 		goto err_release;
 	}
 
 	/* Data from ucode file:  header followed by uCode images */
-	ucode = (void *)ucode_raw->data;
+	ucode = (struct iwl_ucode_header *)ucode_raw->data;
 
 	priv->ucode_ver = le32_to_cpu(ucode->ver);
 	api_ver = IWL_UCODE_API(priv->ucode_ver);
-	inst_size = le32_to_cpu(ucode->inst_size);
-	data_size = le32_to_cpu(ucode->data_size);
-	init_size = le32_to_cpu(ucode->init_size);
-	init_data_size = le32_to_cpu(ucode->init_data_size);
-	boot_size = le32_to_cpu(ucode->boot_size);
+	inst_size = priv->cfg->ops->ucode->get_inst_size(ucode, api_ver);
+	data_size = priv->cfg->ops->ucode->get_data_size(ucode, api_ver);
+	init_size = priv->cfg->ops->ucode->get_init_size(ucode, api_ver);
+	init_data_size =
+		priv->cfg->ops->ucode->get_init_data_size(ucode, api_ver);
+	boot_size = priv->cfg->ops->ucode->get_boot_size(ucode, api_ver);
+	src = priv->cfg->ops->ucode->get_data(ucode, api_ver);
 
 	/* api_ver should match the api version forming part of the
 	 * firmware filename ... but we don't check for that and only rely
@@ -2138,12 +2140,13 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 
 
 	/* Verify size of file vs. image size info in file's header */
-	if (ucode_raw->size < sizeof(*ucode) +
+	if (ucode_raw->size != priv->cfg->ops->ucode->get_header_size(api_ver) +
 		inst_size + data_size + init_size +
 		init_data_size + boot_size) {
 
-		IWL_DEBUG_INFO(priv, "uCode file size %zd too small\n",
-			       ucode_raw->size);
+		IWL_DEBUG_INFO(priv,
+			"uCode file size %zd does not match expected size\n",
+			ucode_raw->size);
 		ret = -EINVAL;
 		goto err_release;
 	}
@@ -2226,44 +2229,44 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 	/* Copy images into buffers for card's bus-master reads ... */
 
 	/* Runtime instructions (first block of data in file) */
-	src = &ucode->data[0];
-	len = priv->ucode_code.len;
+	len = inst_size;
 	IWL_DEBUG_INFO(priv,
 		"Copying (but not loading) uCode instr len %zd\n", len);
 	memcpy(priv->ucode_code.v_addr, src, len);
+	src += len;
+
 	IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
 		priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
 
 	/* Runtime data (2nd block)
 	 * NOTE:  Copy into backup buffer will be done in iwl3945_up()  */
-	src = &ucode->data[inst_size];
-	len = priv->ucode_data.len;
+	len = data_size;
 	IWL_DEBUG_INFO(priv,
 		"Copying (but not loading) uCode data len %zd\n", len);
 	memcpy(priv->ucode_data.v_addr, src, len);
 	memcpy(priv->ucode_data_backup.v_addr, src, len);
+	src += len;
 
 	/* Initialization instructions (3rd block) */
 	if (init_size) {
-		src = &ucode->data[inst_size + data_size];
-		len = priv->ucode_init.len;
+		len = init_size;
 		IWL_DEBUG_INFO(priv,
 			"Copying (but not loading) init instr len %zd\n", len);
 		memcpy(priv->ucode_init.v_addr, src, len);
+		src += len;
 	}
 
 	/* Initialization data (4th block) */
 	if (init_data_size) {
-		src = &ucode->data[inst_size + data_size + init_size];
-		len = priv->ucode_init_data.len;
+		len = init_data_size;
 		IWL_DEBUG_INFO(priv,
 			"Copying (but not loading) init data len %zd\n", len);
 		memcpy(priv->ucode_init_data.v_addr, src, len);
+		src += len;
 	}
 
 	/* Bootstrap instructions (5th block) */
-	src = &ucode->data[inst_size + data_size + init_size + init_data_size];
-	len = priv->ucode_boot.len;
+	len = boot_size;
 	IWL_DEBUG_INFO(priv,
 		"Copying (but not loading) boot instr len %zd\n", len);
 	memcpy(priv->ucode_boot.v_addr, src, len);

linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch:
 iwl-debugfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch ---
Back-port to 2.6.31 of the following (pending) upstream commit...

>From ed9645671632b31d553c6336c4c1a8419afede7a Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre at intel.com>
Date: Mon, 14 Sep 2009 11:12:10 -0700
Subject: [PATCH] iwlwifi: fix debugfs buffer handling

From: Reinette Chatre <reinette.chatre at intel.com>

We keep track of where to write into a buffer by keeping a count of how
much has been written so far. When writing to the buffer we thus take the
buffer pointer and adding the count of what has been written so far.
Keeping track of what has been written so far is done by incrementing
this number every time something is written to the buffer with how much has
been written at that time.

Currently this number is incremented incorrectly when using the
"hex_dump_to_buffer" call to add data to the buffer. Fix this by only
adding what has been added to the buffer in that call instead of what has
been added since beginning of buffer.

Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
---
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2009-09-16 15:30:50.000000000 -0400
@@ -327,7 +327,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct
 		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
 		hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,
 				   buf_size - pos, 0);
-		pos += strlen(buf);
+		pos += strlen(buf + pos);
 		if (buf_size - pos > 0)
 			buf[pos++] = '\n';
 	}

linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch:
 iwl-1000.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch ---
commit cce53aa347c1e023d967b1cb1aa393c725aedba5
Author: Jay Sternberg <jay.e.sternberg at intel.com>
Date:   Fri Jul 17 09:30:22 2009 -0700

    iwlwifi: update 1000 series API version to match firmware
    
    firmware file now contains build number so API needs to be updated.
    
    Signed-off-by: Jay Sternberg <jay.e.sternberg at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 7da52f1..a899be9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -46,7 +46,7 @@
 #include "iwl-5000-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL1000_UCODE_API_MAX 2
+#define IWL1000_UCODE_API_MAX 3
 
 /* Lowest firmware API version supported */
 #define IWL1000_UCODE_API_MIN 1


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1808
retrieving revision 1.1809
diff -u -p -r1.1808 -r1.1809
--- kernel.spec	16 Sep 2009 18:28:44 -0000	1.1808
+++ kernel.spec	16 Sep 2009 19:43:47 -0000	1.1809
@@ -664,8 +664,10 @@ Patch611: alsa-tell-user-that-stream-to-
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
-Patch680: linux-2.6-rt2x00-asus-leds.patch
-Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
+Patch680: linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
+Patch681: linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
+Patch682: linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
+Patch683: linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -1305,11 +1307,11 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # Make it possible to identify non-hotplug SATA ports
 ApplyPatch linux-2.6-ahci-export-capabilities.patch
 
-# rt2x00: back-port activity LED init patches
-#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
-
-# back-port scan result aging patches
-#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
+# iwl1000 support patches
+ApplyPatch linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
+ApplyPatch linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
+ApplyPatch linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
+ApplyPatch linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
 
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
@@ -2051,6 +2053,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 16 2009 John W. Linville <linville at redhat.com>
+- Add iwl1000 support patches.
+
 * Wed Sep 16 2009 Adam Jackson <ajax at redhat.com>
 - Disable hotplug interrupts on TV connectors on i915.
 


--- linux-2.6-mac80211-age-scan-results-on-resume.patch DELETED ---


--- linux-2.6-rt2x00-asus-leds.patch DELETED ---



From clumens at fedoraproject.org  Wed Sep 16 19:45:03 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 16 Sep 2009 19:45:03 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.115, 1.116 pykickstart.spec,
	1.126, 1.127 sources, 1.125, 1.126
Message-ID: <20090916194503.6D18E11C00CF@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7863

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	10 Sep 2009 14:33:03 -0000	1.115
+++ .cvsignore	16 Sep 2009 19:45:03 -0000	1.116
@@ -49,3 +49,4 @@ pykickstart-1.59.tar.gz
 pykickstart-1.60.tar.gz
 pykickstart-1.61.tar.gz
 pykickstart-1.62.tar.gz
+pykickstart-1.63.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- pykickstart.spec	10 Sep 2009 14:33:03 -0000	1.126
+++ pykickstart.spec	16 Sep 2009 19:45:03 -0000	1.127
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.62
+Version: 1.63
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Wed Sep 16 2009 Chris Lumens <clumens at redhat.com> - 1.63-1
+- Add encryption key escrow support (mitr, #508963).
+- Fix the repo test cases to expect quotes around the repo's name.
+
 * Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> - 1.62-1
 - Support translated help text in optparse (#479519).
 - If the input kickstart file cannot be read, raise IOError (#519477).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- sources	10 Sep 2009 14:33:03 -0000	1.125
+++ sources	16 Sep 2009 19:45:03 -0000	1.126
@@ -1 +1 @@
-46d0a1496433bdf05503bc47542c5bb0  pykickstart-1.62.tar.gz
+4b2c802a1568aee638c57ba173f9f2ac  pykickstart-1.63.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 16 19:48:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Sep 2009 19:48:51 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.441,
	1.442 policycoreutils.spec, 1.641, 1.642
Message-ID: <20090916194851.7AF6611C00CF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9809

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-5
- Fix sandbox to handle relative paths


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  202 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   51 +-
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1836 insertions(+), 951 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- policycoreutils-rhat.patch	14 Sep 2009 19:39:17 -0000	1.441
+++ policycoreutils-rhat.patch	16 Sep 2009 19:48:49 -0000	1.442
@@ -1222,8 +1222,8 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-09 17:05:42.000000000 -0400
-@@ -0,0 +1,200 @@
++++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-16 15:46:50.000000000 -0400
+@@ -0,0 +1,202 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1307,7 +1307,6 @@ diff --exclude-from=exclude --exclude=se
 +def copyfiles(newhomedir, newtmpdir, files):
 +       import pwd
 +       homedir=pwd.getpwuid(os.getuid()).pw_dir
-+       
 +       for f in files:
 +              copyfile(f,homedir, newhomedir)
 +              copyfile(f,"/tmp", newtmpdir)
@@ -1389,12 +1388,15 @@ diff --exclude-from=exclude --exclude=se
 +                         os.mkdir(newtmpdir)
 +                         selinux.setfilecon(newtmpdir, filecon)
 +                         warnings.resetwarnings()
-+                         copyfiles(newhomedir, newtmpdir, init_files + cmds)
++                         paths = []
++                         for i in cmds:
++                                paths.append(os.path.realpath(i))
++                         copyfiles(newhomedir, newtmpdir, init_files + paths)
 +                         execfile = newhomedir + "/.sandboxrc"
 +                         fd = open(execfile, "w+")
 +                         fd.write("""#! /bin/sh
 +%s
-+""" % " ".join(cmds))
++""" % " ".join(paths))
 +                         fd.close()
 +                         os.chmod(execfile, 0700)
 +                         


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -p -r1.641 -r1.642
--- policycoreutils.spec	15 Sep 2009 21:36:51 -0000	1.641
+++ policycoreutils.spec	16 Sep 2009 19:48:51 -0000	1.642
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.73
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-5
+- Fix sandbox to handle relative paths
+
 * Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-4
 - Add symbolic link to load_policy
 



From beuc at fedoraproject.org  Wed Sep 16 19:54:58 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Wed, 16 Sep 2009 19:54:58 +0000 (UTC)
Subject: rpms/freedink-dfarc/devel .cvsignore, 1.4, 1.5 freedink-dfarc.spec, 
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090916195458.1384F11C00CF@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink-dfarc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12579

Modified Files:
	.cvsignore freedink-dfarc.spec sources 
Log Message:
Update to 3.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jul 2009 13:30:59 -0000	1.4
+++ .cvsignore	16 Sep 2009 19:54:57 -0000	1.5
@@ -1 +1 @@
-dfarc-3.2.3.tar.gz
+dfarc-3.2.4.tar.gz


Index: freedink-dfarc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/freedink-dfarc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- freedink-dfarc.spec	24 Jul 2009 23:07:24 -0000	1.5
+++ freedink-dfarc.spec	16 Sep 2009 19:54:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		freedink-dfarc
-Version:	3.2.3
-Release:	2%{?dist}
+Version:	3.2.4
+Release:	1%{?dist}
 Summary:	Frontend and .dmod installer for GNU FreeDink
 
 Group:		Amusements/Games
@@ -87,6 +87,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Wed Sep 16 2009 Sylvain Beucler <beuc at beuc.net> - 3.2.4-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jul 2009 13:30:59 -0000	1.4
+++ sources	16 Sep 2009 19:54:57 -0000	1.5
@@ -1 +1 @@
-de65cba4ea94e5c59590e323a3945521  dfarc-3.2.3.tar.gz
+06884d5abf79c027a2962f0ca01a67bb  dfarc-3.2.4.tar.gz



From eparis at fedoraproject.org  Wed Sep 16 19:58:23 2009
From: eparis at fedoraproject.org (Eric Paris)
Date: Wed, 16 Sep 2009 19:58:23 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-selinux-module-load-perms.patch, NONE,
	1.1 kernel.spec, 1.1809, 1.1810
Message-ID: <20090916195823.C416311C00CF@cvs1.fedora.phx.redhat.com>

Author: eparis

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14436

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-selinux-module-load-perms.patch 
Log Message:
* Wed Sep 16 2009 Eric Paris <eparis at redhat.com>
- Do not check CAP_SYS_MODULE when networking tres to autoload a module


linux-2.6-selinux-module-load-perms.patch:
 drivers/staging/comedi/comedi_fops.c         |    8 ++++----
 include/linux/security.h                     |   10 ++++++++++
 kernel/kmod.c                                |    4 ++++
 net/core/dev.c                               |    2 +-
 net/ipv4/tcp_cong.c                          |    4 ++--
 security/capability.c                        |    6 ++++++
 security/security.c                          |    5 +++++
 security/selinux/hooks.c                     |    6 ++++++
 security/selinux/include/av_perm_to_string.h |    1 +
 security/selinux/include/av_permissions.h    |    1 +
 10 files changed, 40 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-selinux-module-load-perms.patch ---
diff -up linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c.pre.module linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c
--- linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c.pre.module	2009-09-14 14:02:56.726491957 -0400
+++ linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c	2009-09-14 14:03:30.035571987 -0400
@@ -1752,12 +1752,12 @@ static int comedi_open(struct inode *ino
 	mutex_lock(&dev->mutex);
 	if (dev->attached)
 		goto ok;
-	if (!capable(CAP_SYS_MODULE) && dev->in_request_module) {
+	if (!capable(CAP_NET_ADMIN) && dev->in_request_module) {
 		DPRINTK("in request module\n");
 		mutex_unlock(&dev->mutex);
 		return -ENODEV;
 	}
-	if (capable(CAP_SYS_MODULE) && dev->in_request_module)
+	if (capable(CAP_NET_ADMIN) && dev->in_request_module)
 		goto ok;
 
 	dev->in_request_module = 1;
@@ -1770,8 +1770,8 @@ static int comedi_open(struct inode *ino
 
 	dev->in_request_module = 0;
 
-	if (!dev->attached && !capable(CAP_SYS_MODULE)) {
-		DPRINTK("not attached and not CAP_SYS_MODULE\n");
+	if (!dev->attached && !capable(CAP_NET_ADMIN)) {
+		DPRINTK("not attached and not CAP_NET_ADMIN\n");
 		mutex_unlock(&dev->mutex);
 		return -ENODEV;
 	}
diff -up linux-2.6.31.x86_64/include/linux/security.h.pre.module linux-2.6.31.x86_64/include/linux/security.h
--- linux-2.6.31.x86_64/include/linux/security.h.pre.module	2009-09-14 14:01:55.018199730 -0400
+++ linux-2.6.31.x86_64/include/linux/security.h	2009-09-14 14:03:35.710454710 -0400
@@ -678,6 +678,9 @@ static inline void security_free_mnt_opt
  *	@inode points to the inode to use as a reference.
  *	The current task must be the one that nominated @inode.
  *	Return 0 if successful.
+ * @kernel_module_request:
+ *	Ability to trigger the kernel to automatically upcall to userspace for
+ *	userspace to load a kernel module with the given name.
  * @task_setuid:
  *	Check permission before setting one or more of the user identity
  *	attributes of the current process.  The @flags parameter indicates
@@ -1489,6 +1492,7 @@ struct security_operations {
 	void (*cred_commit)(struct cred *new, const struct cred *old);
 	int (*kernel_act_as)(struct cred *new, u32 secid);
 	int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
+	int (*kernel_module_request)(void);
 	int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags);
 	int (*task_fix_setuid) (struct cred *new, const struct cred *old,
 				int flags);
@@ -1741,6 +1745,7 @@ int security_prepare_creds(struct cred *
 void security_commit_creds(struct cred *new, const struct cred *old);
 int security_kernel_act_as(struct cred *new, u32 secid);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
+int security_kernel_module_request(void);
 int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags);
 int security_task_fix_setuid(struct cred *new, const struct cred *old,
 			     int flags);
@@ -2292,6 +2297,11 @@ static inline int security_kernel_create
 	return 0;
 }
 
+static inline int security_kernel_module_request(void)
+{
+	return 0;
+}
+
 static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2,
 				       int flags)
 {
diff -up linux-2.6.31.x86_64/kernel/kmod.c.pre.module linux-2.6.31.x86_64/kernel/kmod.c
--- linux-2.6.31.x86_64/kernel/kmod.c.pre.module	2009-09-14 14:02:04.516942256 -0400
+++ linux-2.6.31.x86_64/kernel/kmod.c	2009-09-14 14:03:35.716407772 -0400
@@ -78,6 +78,10 @@ int __request_module(bool wait, const ch
 #define MAX_KMOD_CONCURRENT 50	/* Completely arbitrary value - KAO */
 	static int kmod_loop_msg;
 
+	ret = security_kernel_module_request();
+	if (ret)
+		return ret;
+
 	va_start(args, fmt);
 	ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
 	va_end(args);
diff -up linux-2.6.31.x86_64/net/core/dev.c.pre.module linux-2.6.31.x86_64/net/core/dev.c
--- linux-2.6.31.x86_64/net/core/dev.c.pre.module	2009-09-14 14:03:03.826314426 -0400
+++ linux-2.6.31.x86_64/net/core/dev.c	2009-09-14 14:03:30.044573421 -0400
@@ -1031,7 +1031,7 @@ void dev_load(struct net *net, const cha
 	dev = __dev_get_by_name(net, name);
 	read_unlock(&dev_base_lock);
 
-	if (!dev && capable(CAP_SYS_MODULE))
+	if (!dev && capable(CAP_NET_ADMIN))
 		request_module("%s", name);
 }
 
diff -up linux-2.6.31.x86_64/net/ipv4/tcp_cong.c.pre.module linux-2.6.31.x86_64/net/ipv4/tcp_cong.c
--- linux-2.6.31.x86_64/net/ipv4/tcp_cong.c.pre.module	2009-09-14 14:03:09.495142463 -0400
+++ linux-2.6.31.x86_64/net/ipv4/tcp_cong.c	2009-09-14 14:03:30.054565116 -0400
@@ -116,7 +116,7 @@ int tcp_set_default_congestion_control(c
 	spin_lock(&tcp_cong_list_lock);
 	ca = tcp_ca_find(name);
 #ifdef CONFIG_MODULES
-	if (!ca && capable(CAP_SYS_MODULE)) {
+	if (!ca && capable(CAP_NET_ADMIN)) {
 		spin_unlock(&tcp_cong_list_lock);
 
 		request_module("tcp_%s", name);
@@ -246,7 +246,7 @@ int tcp_set_congestion_control(struct so
 
 #ifdef CONFIG_MODULES
 	/* not found attempt to autoload module */
-	if (!ca && capable(CAP_SYS_MODULE)) {
+	if (!ca && capable(CAP_NET_ADMIN)) {
 		rcu_read_unlock();
 		request_module("tcp_%s", name);
 		rcu_read_lock();
diff -up linux-2.6.31.x86_64/security/capability.c.pre.module linux-2.6.31.x86_64/security/capability.c
--- linux-2.6.31.x86_64/security/capability.c.pre.module	2009-09-14 14:02:11.009778206 -0400
+++ linux-2.6.31.x86_64/security/capability.c	2009-09-14 14:03:35.718408863 -0400
@@ -396,6 +396,11 @@ static int cap_kernel_create_files_as(st
 	return 0;
 }
 
+static int cap_kernel_module_request(void)
+{
+	return 0;
+}
+
 static int cap_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags)
 {
 	return 0;
@@ -945,6 +950,7 @@ void security_fixup_ops(struct security_
 	set_to_cap_if_null(ops, cred_commit);
 	set_to_cap_if_null(ops, kernel_act_as);
 	set_to_cap_if_null(ops, kernel_create_files_as);
+	set_to_cap_if_null(ops, kernel_module_request);
 	set_to_cap_if_null(ops, task_setuid);
 	set_to_cap_if_null(ops, task_fix_setuid);
 	set_to_cap_if_null(ops, task_setgid);
diff -up linux-2.6.31.x86_64/security/security.c.pre.module linux-2.6.31.x86_64/security/security.c
--- linux-2.6.31.x86_64/security/security.c.pre.module	2009-09-14 14:02:17.341611595 -0400
+++ linux-2.6.31.x86_64/security/security.c	2009-09-14 14:03:35.720408600 -0400
@@ -709,6 +709,11 @@ int security_kernel_create_files_as(stru
 	return security_ops->kernel_create_files_as(new, inode);
 }
 
+int security_kernel_module_request(void)
+{
+	return security_ops->kernel_module_request();
+}
+
 int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags)
 {
 	return security_ops->task_setuid(id0, id1, id2, flags);
diff -up linux-2.6.31.x86_64/security/selinux/hooks.c.pre.module linux-2.6.31.x86_64/security/selinux/hooks.c
--- linux-2.6.31.x86_64/security/selinux/hooks.c.pre.module	2009-09-14 14:02:24.072199503 -0400
+++ linux-2.6.31.x86_64/security/selinux/hooks.c	2009-09-14 14:03:39.017312134 -0400
@@ -3292,6 +3292,11 @@ static int selinux_kernel_create_files_a
 	return 0;
 }
 
+static int selinux_kernel_module_request(void)
+{
+	return task_has_system(current, SYSTEM__MODULE_REQUEST);
+}
+
 static int selinux_task_setpgid(struct task_struct *p, pid_t pgid)
 {
 	return current_has_perm(p, PROCESS__SETPGID);
@@ -5400,6 +5405,7 @@ static struct security_operations selinu
 	.cred_prepare =			selinux_cred_prepare,
 	.kernel_act_as =		selinux_kernel_act_as,
 	.kernel_create_files_as =	selinux_kernel_create_files_as,
+	.kernel_module_request =	selinux_kernel_module_request,
 	.task_setpgid =			selinux_task_setpgid,
 	.task_getpgid =			selinux_task_getpgid,
 	.task_getsid =			selinux_task_getsid,
diff -up linux-2.6.31.x86_64/security/selinux/include/av_permissions.h.pre.module linux-2.6.31.x86_64/security/selinux/include/av_permissions.h
--- linux-2.6.31.x86_64/security/selinux/include/av_permissions.h.pre.module	2009-09-14 14:02:48.685714616 -0400
+++ linux-2.6.31.x86_64/security/selinux/include/av_permissions.h	2009-09-14 14:03:39.022321676 -0400
@@ -508,6 +508,7 @@
 #define SYSTEM__SYSLOG_READ                       0x00000002UL
 #define SYSTEM__SYSLOG_MOD                        0x00000004UL
 #define SYSTEM__SYSLOG_CONSOLE                    0x00000008UL
+#define SYSTEM__MODULE_REQUEST                    0x00000010UL
 #define CAPABILITY__CHOWN                         0x00000001UL
 #define CAPABILITY__DAC_OVERRIDE                  0x00000002UL
 #define CAPABILITY__DAC_READ_SEARCH               0x00000004UL
diff -up linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h.pre.module linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h
--- linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h.pre.module	2009-09-14 14:02:37.563058003 -0400
+++ linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h	2009-09-14 14:03:39.019310239 -0400
@@ -107,6 +107,7 @@
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read")
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod")
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console")
+   S_(SECCLASS_SYSTEM, SYSTEM__MODULE_REQUEST, "module_request")
    S_(SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown")
    S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_OVERRIDE, "dac_override")
    S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search")


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1809
retrieving revision 1.1810
diff -u -p -r1.1809 -r1.1810
--- kernel.spec	16 Sep 2009 19:43:47 -0000	1.1809
+++ kernel.spec	16 Sep 2009 19:58:23 -0000	1.1810
@@ -740,6 +740,7 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12012: linux-2.6-rtc-show-hctosys.patch
 Patch12013: linux-2.6-rfkill-all.patch
+Patch12014: linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
 
@@ -1388,6 +1389,7 @@ ApplyPatch v4l-dvb-fix-cx25840-firmware-
 # Patches headed upstream
 ApplyPatch linux-2.6-rtc-show-hctosys.patch
 ApplyPatch linux-2.6-rfkill-all.patch
+ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
 
@@ -2053,6 +2055,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 16 2009 Eric Paris <eparis at redhat.com>
+- Do not check CAP_SYS_MODULE when networking tres to autoload a module
+
 * Wed Sep 16 2009 John W. Linville <linville at redhat.com>
 - Add iwl1000 support patches.
 



From pkgdb at fedoraproject.org  Wed Sep 16 20:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:05:22 +0000
Subject: [pkgdb] mingw32-binutils: kalev has requested watchcommits
Message-ID: <20090916200522.7EADA10F880@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on mingw32-binutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Wed Sep 16 20:05:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:05:24 +0000
Subject: [pkgdb] mingw32-binutils: kalev has requested commit
Message-ID: <20090916200524.BBD3610F894@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on mingw32-binutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From timfenn at fedoraproject.org  Wed Sep 16 20:11:56 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Wed, 16 Sep 2009 20:11:56 +0000 (UTC)
Subject: rpms/gpp4/devel .cvsignore, 1.3, 1.4 gpp4.spec, 1.8, 1.9 sources,
	1.3, 1.4
Message-ID: <20090916201156.DAA2311C00CF@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/gpp4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19842

Modified Files:
	.cvsignore gpp4.spec sources 
Log Message:
* Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-1.20090916bzr58
- update to 1.2.0
- update to new website
- include libgpp4f
- add MMDB buildreq




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpp4/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 May 2009 00:01:07 -0000	1.3
+++ .cvsignore	16 Sep 2009 20:11:55 -0000	1.4
@@ -1,3 +1 @@
-gpp4-1.1.0.tar.gz
-gpp4-configure.ac.patch
-gpp4-gpp4.pc.patch
+gpp4-1.2.0-20090916bzr58.tar.gz


Index: gpp4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpp4/devel/gpp4.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gpp4.spec	25 Jul 2009 01:18:51 -0000	1.8
+++ gpp4.spec	16 Sep 2009 20:11:56 -0000	1.9
@@ -2,20 +2,22 @@
 
 Summary: Library providing specific CCP4 functionality 
 Name: gpp4
-Version: 1.1.0
-Release: 4%{?dist}
+Version: 1.2.0
+Release: 1.20090916bzr58%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
-URL: http://www.bioxray.au.dk/~mok/%{name}
-Source: ftp://ftp.bioxray.au.dk/pub/mok/src/%{name}-%{version}.tar.gz
-Patch0: gpp4-configure.ac.patch
-Patch1: gpp4-gpp4.pc.patch
-Patch2: gpp4-ccp4_sysdep.h.patch
+URL: http://dmz-212.daimi.au.dk/~mok/%{name}
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+#  bzr branch -r 58 lp:gpp4 gpp4-1.2.0
+#  tar cvzf gpp4-1.2.0-20090916bzr58.tar.gz gpp4-1.2.0
+Source0: gpp4-1.2.0-20090916bzr58.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: doxygen
+BuildRequires: mmdb-devel
 
 %description
 
@@ -65,18 +67,14 @@ development.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
 aclocal
 libtoolize --automake --copy
 autoconf
-automake --copy --add-missing --gnu
+automake --foreign --add-missing --copy
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
-cd src
 doxygen
 
 %install
@@ -99,15 +97,25 @@ rm -rf %{buildroot}
 %{_datadir}/gpp4/
 %{_libdir}/libgpp4.so.0
 %{_libdir}/libgpp4.so.0.0.0
+%{_libdir}/libgpp4f.so.0
+%{_libdir}/libgpp4f.so.0.0.0
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
 %{_includedir}/gpp4
 %{_libdir}/libgpp4.so
+%{_libdir}/libgpp4f.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{name}f.pc
 
 %changelog
+* Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-1.20090916bzr58
+- update to 1.2.0
+- update to new website
+- include libgpp4f
+- add MMDB buildreq
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpp4/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 May 2009 00:01:07 -0000	1.3
+++ sources	16 Sep 2009 20:11:56 -0000	1.4
@@ -1,3 +1 @@
-843acb0fbaf0ea252ada5ae95406320b  gpp4-1.1.0.tar.gz
-a027e4f5be28e22db43b8bc33f4ad1cc  gpp4-configure.ac.patch
-a56dfeeda34b59c08733a4e795331c38  gpp4-gpp4.pc.patch
+0e8568347b4443c188fe6c1843f28836  gpp4-1.2.0-20090916bzr58.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:13 +0000
Subject: [pkgdb] firecontrol: jwilson has requested watchbugzilla
Message-ID: <20090916201613.B24CE10F883@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchbugzilla acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:16 +0000
Subject: [pkgdb] firecontrol: jwilson has requested watchcommits
Message-ID: <20090916201616.78A7910F88C@bastion2.fedora.phx.redhat.com>

jwilson has requested the watchcommits acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:18 +0000
Subject: [pkgdb] firecontrol: jwilson has requested commit
Message-ID: <20090916201618.234B410F895@bastion2.fedora.phx.redhat.com>

jwilson has requested the commit acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:34 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201635.B43A910F89B@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on firecontrol (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:35 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201635.A002E10F89A@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on firecontrol (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:37 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201637.8402810F89C@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on firecontrol (Fedora devel) to Approved for jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:40 +0000
Subject: [pkgdb] firecontrol ownership updated
Message-ID: <20090916201640.52CAE10F883@bastion2.fedora.phx.redhat.com>

Package firecontrol in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:45 +0000
Subject: [pkgdb] firecontrol ownership updated
Message-ID: <20090916201645.CEBA510F851@bastion2.fedora.phx.redhat.com>

Package firecontrol in Fedora 10 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:16:44 +0000
Subject: [pkgdb] firecontrol ownership updated
Message-ID: <20090916201644.E0FDB10F8A3@bastion2.fedora.phx.redhat.com>

Package firecontrol in Fedora 11 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:28 +0000
Subject: [pkgdb] firecontrol ownership updated
Message-ID: <20090916201728.50CD410F867@bastion2.fedora.phx.redhat.com>

Package firecontrol in Fedora devel is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:36 +0000
Subject: [pkgdb] firecontrol: dajt has requested watchbugzilla
Message-ID: <20090916201736.2AE6A10F894@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:37 +0000
Subject: [pkgdb] firecontrol: dajt has requested watchcommits
Message-ID: <20090916201737.4A26210F896@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:39 +0000
Subject: [pkgdb] firecontrol: dajt has requested commit
Message-ID: <20090916201739.296BC10F89A@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:40 +0000
Subject: [pkgdb] firecontrol: dajt has requested approveacls
Message-ID: <20090916201741.14EE810F867@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on firecontrol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:50 +0000
Subject: [pkgdb] firecontrol ownership updated
Message-ID: <20090916201750.D4CE710F880@bastion2.fedora.phx.redhat.com>

Package firecontrol in Fedora 10 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:54 +0000
Subject: [pkgdb] firecontrol ownership updated
Message-ID: <20090916201754.1E6E010F888@bastion2.fedora.phx.redhat.com>

Package firecontrol in Fedora 11 is now owned by dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:57 +0000
Subject: [pkgdb] firecontrol: dajt has requested watchbugzilla
Message-ID: <20090916201757.CC5A510F894@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on firecontrol (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:17:59 +0000
Subject: [pkgdb] firecontrol: dajt has requested watchcommits
Message-ID: <20090916201759.58EF510F89C@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on firecontrol (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:01 +0000
Subject: [pkgdb] firecontrol: dajt has requested commit
Message-ID: <20090916201801.2639010F89D@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on firecontrol (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:03 +0000
Subject: [pkgdb] firecontrol: dajt has requested approveacls
Message-ID: <20090916201803.6F74A10F89A@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on firecontrol (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:08 +0000
Subject: [pkgdb] firecontrol: dajt has requested watchbugzilla
Message-ID: <20090916201808.38D2A10F8A0@bastion2.fedora.phx.redhat.com>

dajt has requested the watchbugzilla acl on firecontrol (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:09 +0000
Subject: [pkgdb] firecontrol: dajt has requested watchcommits
Message-ID: <20090916201809.B1F6910F8A1@bastion2.fedora.phx.redhat.com>

dajt has requested the watchcommits acl on firecontrol (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:11 +0000
Subject: [pkgdb] firecontrol: dajt has requested commit
Message-ID: <20090916201811.7412810F8A4@bastion2.fedora.phx.redhat.com>

dajt has requested the commit acl on firecontrol (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:13 +0000
Subject: [pkgdb] firecontrol: dajt has requested approveacls
Message-ID: <20090916201813.9C52E10F87D@bastion2.fedora.phx.redhat.com>

dajt has requested the approveacls acl on firecontrol (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:29 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201829.EE6A710F8A6@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on firecontrol (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:31 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201831.8C39410F89C@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on firecontrol (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:33 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201833.71B0410F89A@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on firecontrol (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:36 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201836.22F8F10F8A8@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on firecontrol (Fedora 11) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:38 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201838.5443310F8AB@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on firecontrol (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From markmc at fedoraproject.org  Wed Sep 16 20:18:42 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 16 Sep 2009 20:18:42 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.128,1.129
Message-ID: <20090916201842.9905511C00CF@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23889

Modified Files:
	qemu.spec 
Log Message:
Fix typo


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- qemu.spec	16 Sep 2009 17:31:15 -0000	1.128
+++ qemu.spec	16 Sep 2009 20:18:42 -0000	1.129
@@ -309,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
 install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initddir}/ksm
 install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ksm
 
-install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_initddir}/rc.d/init.d/ksmtuned
+install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_initddir}/ksmtuned
 install -D -p -m 0755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
 install -D -p -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
 



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:40 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201840.5DF7A10F8AF@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on firecontrol (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:42 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201842.424A710F8B0@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on firecontrol (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:44 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201844.9FB9B10F8A1@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on firecontrol (Fedora 10) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:50 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201850.B8B3510F8B3@bastion2.fedora.phx.redhat.com>

dajt has set the approveacls acl on firecontrol (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:51 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201852.0B9FE10F8B5@bastion2.fedora.phx.redhat.com>

dajt has set the commit acl on firecontrol (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:54 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201854.3046E10F8A2@bastion2.fedora.phx.redhat.com>

dajt has set the watchcommits acl on firecontrol (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From pkgdb at fedoraproject.org  Wed Sep 16 20:18:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:18:57 +0000
Subject: [pkgdb] firecontrol had acl change status
Message-ID: <20090916201857.9760510F8A5@bastion2.fedora.phx.redhat.com>

dajt has set the watchbugzilla acl on firecontrol (Fedora devel) to Approved for dajt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/firecontrol



From limb at fedoraproject.org  Wed Sep 16 20:23:43 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 20:23:43 +0000 (UTC)
Subject: rpms/drupal/devel .cvsignore, 1.21, 1.22 drupal.spec, 1.27,
	1.28 sources, 1.22, 1.23
Message-ID: <20090916202343.B6ADA11C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25564

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
6.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	2 Jul 2009 13:27:13 -0000	1.21
+++ .cvsignore	16 Sep 2009 20:23:43 -0000	1.22
@@ -1 +1 @@
-drupal-6.13.tar.gz
+drupal-6.14.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- drupal.spec	24 Jul 2009 20:33:52 -0000	1.27
+++ drupal.spec	16 Sep 2009 20:23:43 -0000	1.28
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.13
-Release:  2%{?dist}
+Version:  6.14
+Release:  1%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
+- Update to 6.14, SA-CORE-2009-008.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	2 Jul 2009 13:27:13 -0000	1.22
+++ sources	16 Sep 2009 20:23:43 -0000	1.23
@@ -1 +1 @@
-76dcb6e311fbb98ca3322fd1413f4a04  drupal-6.13.tar.gz
+014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:29 +0000
Subject: [pkgdb] aquamarine ownership updated
Message-ID: <20090916202529.63AAC10F851@bastion2.fedora.phx.redhat.com>

Package aquamarine in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:39 +0000
Subject: [pkgdb] aquamarine (un)retirement
Message-ID: <20090916202539.3EF9510F880@bastion2.fedora.phx.redhat.com>

Package aquamarine in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:46 +0000
Subject: [pkgdb] bdock ownership updated
Message-ID: <20090916202546.7D41110F867@bastion2.fedora.phx.redhat.com>

Package bdock in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:46 +0000
Subject: [pkgdb] bdock (un)retirement
Message-ID: <20090916202546.95AEC10F888@bastion2.fedora.phx.redhat.com>

Package bdock in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:54 +0000
Subject: [pkgdb] beryl-core ownership updated
Message-ID: <20090916202554.4619410F880@bastion2.fedora.phx.redhat.com>

Package beryl-core in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:54 +0000
Subject: [pkgdb] beryl-core (un)retirement
Message-ID: <20090916202554.5345E10F894@bastion2.fedora.phx.redhat.com>

Package beryl-core in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:59 +0000
Subject: [pkgdb] beryl-dbus ownership updated
Message-ID: <20090916202559.4700610F886@bastion2.fedora.phx.redhat.com>

Package beryl-dbus in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Wed Sep 16 20:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:25:59 +0000
Subject: [pkgdb] beryl-dbus (un)retirement
Message-ID: <20090916202559.4E69410F898@bastion2.fedora.phx.redhat.com>

Package beryl-dbus in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:02 +0000
Subject: [pkgdb] beryl-manager ownership updated
Message-ID: <20090916202602.F207410F89C@bastion2.fedora.phx.redhat.com>

Package beryl-manager in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:02 +0000
Subject: [pkgdb] beryl-manager (un)retirement
Message-ID: <20090916202603.033F610F89F@bastion2.fedora.phx.redhat.com>

Package beryl-manager in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:06 +0000
Subject: [pkgdb] beryl-plugins ownership updated
Message-ID: <20090916202606.E210910F8A1@bastion2.fedora.phx.redhat.com>

Package beryl-plugins in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:06 +0000
Subject: [pkgdb] beryl-plugins (un)retirement
Message-ID: <20090916202606.EB32910F8A4@bastion2.fedora.phx.redhat.com>

Package beryl-plugins in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:14 +0000
Subject: [pkgdb] beryl-settings ownership updated
Message-ID: <20090916202614.372E010F8A5@bastion2.fedora.phx.redhat.com>

Package beryl-settings in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:14 +0000
Subject: [pkgdb] beryl-settings (un)retirement
Message-ID: <20090916202614.4A26110F8A8@bastion2.fedora.phx.redhat.com>

Package beryl-settings in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:30 +0000
Subject: [pkgdb] beryl-dbus (un)retirement
Message-ID: <20090916202630.B0EB310F89B@bastion2.fedora.phx.redhat.com>

Package beryl-dbus in Fedora 10 has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:30 +0000
Subject: [pkgdb] beryl-dbus ownership updated
Message-ID: <20090916202630.A8F7710F898@bastion2.fedora.phx.redhat.com>

Package beryl-dbus in Fedora 10 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:35 +0000
Subject: [pkgdb] beryl-dbus ownership updated
Message-ID: <20090916202635.B22A010F89C@bastion2.fedora.phx.redhat.com>

Package beryl-dbus in Fedora 9 was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Wed Sep 16 20:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:26:35 +0000
Subject: [pkgdb] beryl-dbus (un)retirement
Message-ID: <20090916202635.B96BA10F8AB@bastion2.fedora.phx.redhat.com>

Package beryl-dbus in Fedora 9 has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From limb at fedoraproject.org  Wed Sep 16 20:27:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 20:27:03 +0000 (UTC)
Subject: rpms/drupal/F-10 drupal.spec,1.25,1.26 sources,1.21,1.22
Message-ID: <20090916202703.A59CE11C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26934/F-10

Modified Files:
	drupal.spec sources 
Log Message:
6.14



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/drupal.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- drupal.spec	2 Jul 2009 13:28:56 -0000	1.25
+++ drupal.spec	16 Sep 2009 20:27:03 -0000	1.26
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.13
+Version:  6.14
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
+- Update to 6.14, SA-CORE-2009-008.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.13-1
 - Update to 6.11, SA-CORE-2009-007.
 - Added clarifying text on module installation to readme, BZ 500707.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	2 Jul 2009 13:28:56 -0000	1.21
+++ sources	16 Sep 2009 20:27:03 -0000	1.22
@@ -1 +1 @@
-76dcb6e311fbb98ca3322fd1413f4a04  drupal-6.13.tar.gz
+014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz



From limb at fedoraproject.org  Wed Sep 16 20:27:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 20:27:03 +0000 (UTC)
Subject: rpms/drupal/F-11 drupal.spec,1.26,1.27 sources,1.22,1.23
Message-ID: <20090916202703.C40A511C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26934/F-11

Modified Files:
	drupal.spec sources 
Log Message:
6.14



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-11/drupal.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- drupal.spec	2 Jul 2009 13:28:56 -0000	1.26
+++ drupal.spec	16 Sep 2009 20:27:03 -0000	1.27
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.13
+Version:  6.14
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
+- Update to 6.14, SA-CORE-2009-008.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.13-1
 - Update to 6.11, SA-CORE-2009-007.
 - Added clarifying text on module installation to readme, BZ 500707.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	2 Jul 2009 13:28:56 -0000	1.22
+++ sources	16 Sep 2009 20:27:03 -0000	1.23
@@ -1 +1 @@
-76dcb6e311fbb98ca3322fd1413f4a04  drupal-6.13.tar.gz
+014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 16 20:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:27:58 +0000
Subject: [pkgdb] cpufreq-utils ownership updated
Message-ID: <20090916202758.7B8C310F851@bastion2.fedora.phx.redhat.com>

Package cpufreq-utils in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufreq-utils



From pkgdb at fedoraproject.org  Wed Sep 16 20:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:27:58 +0000
Subject: [pkgdb] cpufreq-utils (un)retirement
Message-ID: <20090916202758.8156810F886@bastion2.fedora.phx.redhat.com>

Package cpufreq-utils in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufreq-utils



From pkgdb at fedoraproject.org  Wed Sep 16 20:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:28:16 +0000
Subject: [pkgdb] heliodor ownership updated
Message-ID: <20090916202816.7402410F851@bastion2.fedora.phx.redhat.com>

Package heliodor in Fedora devel was orphaned by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From pkgdb at fedoraproject.org  Wed Sep 16 20:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 20:28:16 +0000
Subject: [pkgdb] heliodor (un)retirement
Message-ID: <20090916202816.880FC10F886@bastion2.fedora.phx.redhat.com>

Package heliodor in Fedora devel has been retired by jwilson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From limb at fedoraproject.org  Wed Sep 16 20:29:34 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 20:29:34 +0000 (UTC)
Subject: rpms/drupal/EL-4 drupal.spec,1.17,1.18 sources,1.17,1.18
Message-ID: <20090916202934.DB53211C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27995/EL-4

Modified Files:
	drupal.spec sources 
Log Message:
5.20



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/drupal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- drupal.spec	2 Jul 2009 13:35:32 -0000	1.17
+++ drupal.spec	16 Sep 2009 20:29:34 -0000	1.18
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.19
+Version:  5.20
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 5.20-1
+- Update to 5.20, SA-CORE-2009-008.
+
 * Thu Jul 02 2009 Jon Ciesla <limb at jcomserv.net> - 5.19-1
 - Update to 5.19, SA-CORE-2009-007.
 - Added clarifying text on module installation to readme, BZ 500707.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	2 Jul 2009 13:35:32 -0000	1.17
+++ sources	16 Sep 2009 20:29:34 -0000	1.18
@@ -1 +1 @@
-d5e3dbcfd3e7f7ef431dada57a6c846e  drupal-5.19.tar.gz
+c042fdb1e995808efc398437ea7c5de4  drupal-5.20.tar.gz



From limb at fedoraproject.org  Wed Sep 16 20:29:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Sep 2009 20:29:35 +0000 (UTC)
Subject: rpms/drupal/EL-5 .cvsignore, 1.5, 1.6 drupal.spec, 1.17,
	1.18 sources, 1.17, 1.18
Message-ID: <20090916202935.1A63C11C00CF@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27995/EL-5

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
5.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Jul 2009 13:33:57 -0000	1.5
+++ .cvsignore	16 Sep 2009 20:29:34 -0000	1.6
@@ -1 +1 @@
-drupal-5.19.tar.gz
+drupal-5.20.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/drupal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- drupal.spec	2 Jul 2009 13:33:57 -0000	1.17
+++ drupal.spec	16 Sep 2009 20:29:34 -0000	1.18
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.19
+Version:  5.20
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 5.20-1
+- Update to 5.20, SA-CORE-2009-008.
+
 * Thu Jul 02 2009 Jon Ciesla <limb at jcomserv.net> - 5.19-1
 - Update to 5.19, SA-CORE-2009-007.
 - Added clarifying text on module installation to readme, BZ 500707.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	2 Jul 2009 13:33:58 -0000	1.17
+++ sources	16 Sep 2009 20:29:34 -0000	1.18
@@ -1 +1 @@
-d5e3dbcfd3e7f7ef431dada57a6c846e  drupal-5.19.tar.gz
+c042fdb1e995808efc398437ea7c5de4  drupal-5.20.tar.gz



From simo at fedoraproject.org  Wed Sep 16 20:43:46 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 16 Sep 2009 20:43:46 +0000 (UTC)
Subject: rpms/libtevent/devel tevent-098-abi-compat.patch, NONE,
	1.1 tevent-098-add_abi_scripts_and_fix_exports.patch, NONE,
	1.1 libtevent.spec, 1.1, 1.2
Message-ID: <20090916204346.2AB7E11C00CF@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5581

Modified Files:
	libtevent.spec 
Added Files:
	tevent-098-abi-compat.patch 
	tevent-098-add_abi_scripts_and_fix_exports.patch 
Log Message:
* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2
- Fix abi compatibility with 0.9.3


tevent-098-abi-compat.patch:
 tevent.c       |   13 +++++++++++++
 tevent.exports |    6 ++++++
 tevent_req.c   |   19 +++++++++++++++++++
 3 files changed, 38 insertions(+)

--- NEW FILE tevent-098-abi-compat.patch ---
diff -uPr tevent-0.9.8/tevent.c tevent-0.9.8.new/tevent.c
--- tevent-0.9.8/tevent.c	2009-08-30 13:58:36.000000000 -0400
+++ tevent-0.9.8.new/tevent.c	2009-09-16 16:17:04.000000000 -0400
@@ -609,3 +609,16 @@
 {
 	return ev->ops->loop_wait(ev, location);
 }
+
+/* Backwards ABI compat */
+#undef tevent_loop_once
+#undef tevent_loop_wait
+int tevent_loop_once(struct tevent_context *ev)
+{
+    return _tevent_loop_once(ev, "abi_compat_wrapper");
+}
+
+int tevent_loop_wait(struct tevent_context *ev)
+{
+    return _tevent_loop_wait(ev, "abi_compat_wrapper");
+}
diff -uPr tevent-0.9.8/tevent.exports tevent-0.9.8.new/tevent.exports
--- tevent-0.9.8/tevent.exports	2009-09-16 16:37:21.000000000 -0400
+++ tevent-0.9.8.new/tevent.exports	2009-09-16 16:16:30.000000000 -0400
@@ -58,5 +58,11 @@
            _tevent_req_cancel;
            tevent_req_set_cancel_fn;
 
+           tevent_loop_once;
+           tevent_loop_wait;
+           tevent_req_done;
+           tevent_req_error;
+           tevent_req_nomem;
+
     local: *;
 };
diff -uPr tevent-0.9.8/tevent_req.c tevent-0.9.8.new/tevent_req.c
--- tevent-0.9.8/tevent_req.c	2009-08-30 13:58:36.000000000 -0400
+++ tevent-0.9.8.new/tevent_req.c	2009-09-16 16:36:52.000000000 -0400
@@ -441,3 +441,22 @@
 
 	return req->private_cancel(req);
 }
+
+/* Backwards ABI compat */
+#undef tevent_req_done
+#undef tevent_req_error
+#undef tevent_req_nomem
+void tevent_req_done(struct tevent_req *req)
+{
+    _tevent_req_done(req, "abi_compat_wrapper");
+}
+
+bool tevent_req_error(struct tevent_req *req, uint64_t error)
+{
+    return _tevent_req_error(req, error, "abi_compat_wrapper");
+}
+
+bool tevent_req_nomem(const void *p, struct tevent_req *req)
+{
+    return _tevent_req_nomem(p, req, "abi_compat_wrapper");
+}

tevent-098-add_abi_scripts_and_fix_exports.patch:
 script/abi_checks.sh     |   91 +++++++++++++++++++++++
 script/abi_checks_gcc.sh |   31 +++++++
 script/mksigs.pl         |  183 +++++++++++++++++++++++++++++++++++++++++++++++
 script/mksyms.awk        |   76 +++++++++++++++++++
 script/mksyms.sh         |   45 +++++++++++
 tevent.exports           |    2 
 tevent.mk                |    8 ++
 tevent.signatures        |    2 
 8 files changed, 438 insertions(+)

--- NEW FILE tevent-098-add_abi_scripts_and_fix_exports.patch ---
diff -uPr tevent-0.9.8/script/abi_checks_gcc.sh tevent/script/abi_checks_gcc.sh
--- tevent-0.9.8/script/abi_checks_gcc.sh	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/abi_checks_gcc.sh	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,31 @@
+#!/bin/bash
+make clean
+
+mkdir abi
+ABI_CHECKS="-aux-info abi/\$@.X"
+make ABI_CHECK="$ABI_CHECKS" CC="/usr/bin/gcc"
+
+for i in abi/*.X; do cat $i | grep 'tevent\.h'; done | sort | uniq | awk -F "extern " '{ print $2 }' | sort> abi/signatures
+
+cat > abi/exports << EOF
+{
+    global:
+EOF
+cat abi/signatures | awk -F '(' '{ print $1 }' | awk -F ' ' '{ print "           "$NF";" }' | tr -d '*' | sort >> abi/exports
+cat >> abi/exports << EOF
+
+    local: *;
+};
+EOF
+
+rm -fr abi/*.X
+
+diff -u tevent.signatures abi/signatures
+if [ "$?" != "0" ]; then
+    echo "WARNING: Possible ABI Change!!"
+fi
+
+diff -u tevent.exports abi/exports
+if [ "$?" != "0" ]; then
+    echo "WARNING: Export file may be outdated!!"
+fi
diff -uPr tevent-0.9.8/script/abi_checks.sh tevent/script/abi_checks.sh
--- tevent-0.9.8/script/abi_checks.sh	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/abi_checks.sh	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+#
+# abi_checks.sh - check for possible abi changes
+#
+# Copyright (C) 2009 Micheal Adam <obnox at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+#
+# USAGE: abi_checks.sh LIBNAME header1 [header2 ...]
+#
+# This script creates symbol and signature lists from the provided header
+# files with the aid of the mksyms.sh and mksigs.pl scripts (saved as
+# $LIBNAME.exports.check and $LIBNAME.sigatures.check). It then compares
+# the resulting files with the files $LIBNAME.exports and $LIBNME.signatures
+# which it expects to find in the current directory.
+#
+
+LANG=C; export LANG
+LC_ALL=C; export LC_ALL
+LC_COLLATE=C; export LC_COLLATE
+
+script=$0
+dir_name=$(dirname ${script})
+
+if test x"$1" = "x" ; then
+	echo "USAGE: ${script} libname header [header ...]"
+	exit 1
+fi
+
+libname="$1"
+shift
+
+if test x"$1" = "x" ; then
+	echo "USAGE: ${script} libname header [header ...]"
+	exit 1
+fi
+
+headers="$*"
+
+exports_file=${libname}.exports
+exports_file_check=${exports_file}.check
+signatures_file=${libname}.signatures
+signatures_file_check=${signatures_file}.check
+
+
+${dir_name}/mksyms.sh awk ${exports_file_check} ${headers} 2>&1 > /dev/null
+
+cat ${headers} | ${dir_name}/mksigs.pl > ${signatures_file_check} 2> /dev/null
+
+normalize_exports_file() {
+	filename=$1
+	cat ${filename} \
+	| sed -e 's/^[ \t]*//g' \
+	| sed -e 's/^$//g' \
+	| sed -e 's/^#.*$//g' \
+	| sort | uniq > ${filename}.sort
+}
+
+normalize_exports_file ${exports_file}
+normalize_exports_file ${exports_file_check}
+
+normalize_exports_file ${signatures_file}
+normalize_exports_file ${signatures_file_check}
+
+diff -u ${exports_file}.sort ${exports_file_check}.sort
+if test "x$?" != "x0" ; then
+	echo "WARNING: possible ABI change detected in exports!"
+else
+	echo "exports check: OK"
+fi
+
+diff -u ${signatures_file}.sort ${signatures_file_check}.sort
+if test "x$?" != "x0" ; then
+	echo "WARNING: possible ABI change detected in signatures!"
+else
+	echo "signatures check: OK"
+fi
diff -uPr tevent-0.9.8/script/mksigs.pl tevent/script/mksigs.pl
--- tevent-0.9.8/script/mksigs.pl	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/mksigs.pl	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,183 @@
+#!/usr/bin/perl
+
+# mksigs.pl - extract signatures from C headers
+#
+# Copyright (C) Michael Adam 2009
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+
+# USAGE:  cat $header_files | mksigs.pl > $signature_file
+#
+# The header files to parse are read from stdin.
+# The output is in a form as produced by gcc with the -aux-info switch
+# and printed to stdout.
+
+use strict;
+use warnings;
+
+my $in_comment = 0;
+my $extern_C_block = 0;
+
+while (my $LINE = <>) {
+	# find end of started multi-line-comment
+	if ($in_comment) {
+		if ($LINE =~ /^.*?\*\/(.*)$/) {
+			$LINE = $1;
+			$in_comment = 0;
+		} else {
+			# whole line within comment
+			next;
+		}
+	}
+
+	# strip C++-style comments
+	$LINE =~ s/^(.*?)\/\/.*$/$1/;
+
+	# strip in-line-comments:
+	while ($LINE =~ /\/\*.*?\*\//) {
+		$LINE =~ s/\/\*.*?\*\///;
+	}
+
+	# find starts of multi-line-comments
+	if ($LINE =~ /^(.*)\/\*/) {
+		$in_comment = 1;
+		$LINE = $1;
+	}
+
+	# skip empty lines
+	next if $LINE =~ /^\s*$/;
+
+	# remove leading spaces
+	$LINE =~ s/^\s*(.*)$/$1/;
+
+	# concatenate lines split with "\" (usually macro defines)
+	while ($LINE =~ /^(.*?)\s+\\$/) {
+		my $LINE2 = <>;
+		$LINE = $1;
+		$LINE2 =~ s/^\s*(.*)$/$1/;
+		$LINE .= " " . $LINE2;
+	}
+
+	# remove all preprocessor directives
+	next if ($LINE =~ /^#/);
+
+	if ($LINE =~ /^extern\s+"C"\s+\{/) {
+		$extern_C_block = 1;
+		next;
+	}
+
+	if (($LINE =~ /^[^\{]*\}/) and $extern_C_block) {
+		$extern_C_block = 0;
+		next;
+	}
+
+	$LINE =~ s/^extern\s//;
+
+	# concatenate braces stretched over multiple lines
+	# (from structs or enums)
+	my $REST = $LINE;
+	my $braces = 0;
+	while (($REST =~ /[\{\}]/) or ($braces)) {
+		while ($REST =~ /[\{\}]/) {
+			# collect opening
+			while ($REST =~ /^[^\{\}]*\{(.*)$/) {
+				$braces++;
+				$REST = $1;
+			}
+
+			# collect closing
+			while ($REST =~ /^[^\{\}]*\}(.*)$/) {
+				$braces--;
+				$REST = $1;
+			}
+		}
+
+		# concatenate if not balanced
+		if ($braces) {
+			if (my $LINE2 = <>) {
+				$LINE2 =~ s/^\s*(.*)$/$1/;
+				chomp($LINE);
+				$LINE .= " " . $LINE2;
+				chomp $REST;
+				$REST .= " " . $LINE2;
+			} else {
+				print "ERROR: unbalanced braces ($braces)\n";
+				last;
+			}
+		}
+	}
+
+	# concetenate function prototypes that stretch over multiple lines
+	$REST = $LINE;
+	my $parenthesis = 0;
+	while (($REST =~ /[\(\)]/) or ($parenthesis)) {
+		while ($REST =~ /[\(\)]/) {
+			# collect opening
+			while ($REST =~ /^[^\(\)]*\((.*)$/) {
+				$parenthesis++;
+				$REST = $1;
+			}
+
+			# collect closing
+			while ($REST =~ /^[^\(\)]*\)(.*)$/) {
+				$parenthesis--;
+				$REST = $1;
+			}
+		}
+
+		# concatenate if not balanced
+		if ($parenthesis) {
+			if (my $LINE2 = <>) {
+				$LINE2 =~ s/^\s*(.*)$/$1/;
+				chomp($LINE);
+				$LINE .= " " . $LINE2;
+				chomp($REST);
+				$REST .= " " . $LINE2;
+			} else {
+				print "ERROR: unbalanced parantheses ($parenthesis)\n";
+				last;
+			}
+		}
+	}
+
+	next if ($LINE =~ /^typedef\s/);
+	next if ($LINE =~ /^enum\s+[^\{\(]+\s+\{/);
+	next if ($LINE =~ /^struct\s+[^\{\(]+\s+\{.*\}\s*;/);
+	next if ($LINE =~ /^struct\s+[a-zA-Z0-9_]+\s*;/);
+
+	# remove trailing spaces
+	$LINE =~ s/(.*?)\s*$/$1/;
+
+	$LINE =~ s/^(.*\))\s+PRINTF_ATTRIBUTE\([^\)]*\)(\s*[;,])/$1$2/;
+	$LINE =~ s/^(.*\))\s*[a-zA-Z0-9_]+\s*;$/$1;/;
+
+	# remove parameter names - slightly too coarse probably
+	$LINE =~ s/([\s\(]\*?)[_0-9a-zA-Z]+\s*([,\)])/$1$2/g;
+
+	# remedy (void) from last line
+	$LINE =~ s/\(\)/(void)/g;
+
+	# normalize spaces
+	$LINE =~ s/\s*\)\s*/)/g;
+	$LINE =~ s/\s*\(\s*/ (/g;
+	$LINE =~ s/\s*,\s*/, /g;
+
+	# normalize unsigned
+	$LINE =~ s/([\s,\(])unsigned([,\)])/$1unsigned int$2/g;
+
+	# normalize bool
+	$LINE =~ s/(\b)bool(\b)/_Bool/g;
+
+	print $LINE . "\n";
+}
diff -uPr tevent-0.9.8/script/mksyms.awk tevent/script/mksyms.awk
--- tevent-0.9.8/script/mksyms.awk	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/mksyms.awk	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,76 @@
+#
+# mksyms.awk
+#
+# Extract symbols to export from C-header files.
+# output in version-script format for linking shared libraries.
+#
+# Copyright (C) 2008 Michael Adam <obnox at samba.org>
+#
+BEGIN {
+	inheader=0;
+	current_file="";
+	print "#"
+	print "# This file is automatically generated with \"make symbols\". DO NOT EDIT "
+	print "#"
+	print "{"
+	print "\tglobal:"
+}
+
+END {
+	print""
+	print "\tlocal: *;"
+	print "};"
+}
+
+{
+	if (FILENAME!=current_file) {
+		print "\t\t# The following definitions come from",FILENAME
+		current_file=FILENAME
+	}
+	if (inheader) {
+		if (match($0,"[)][^()]*[;][ \t]*$")) {
+			inheader = 0;
+		}
+		next;
+	}
+}
+
+/^static/ || /^[ \t]*typedef/ || !/^[a-zA-Z\_]/ {
+	next;
+}
+
+/^extern[ \t]+[^()]+[;][ \t]*$/ {
+	gsub(/[^ \t]+[ \t]+/, "");
+	sub(/[;][ \t]*$/, "");
+	printf "\t\t%s;\n", $0;
+	next;
+}
+
+# look for function headers:
+{
+	gotstart = 0;
+	if ($0 ~ /^[A-Za-z_][A-Za-z0-9_]+/) {
+	gotstart = 1;
+	}
+	if(!gotstart) {
+		next;
+	}
+}
+
+/[_A-Za-z0-9]+[ \t]*[(].*[)][^()]*;[ \t]*$/ {
+	sub(/[(].*$/, "");
+	gsub(/[^ \t]+[ \t]+/, "");
+	gsub(/^[*]+/, "");
+	printf "\t\t%s;\n",$0;
+	next;
+}
+
+/[_A-Za-z0-9]+[ \t]*[(]/ {
+	inheader=1;
+	sub(/[(].*$/, "");
+	gsub(/[^ \t]+[ \t]+/, "");
+	gsub(/^[*]/, "");
+	printf "\t\t%s;\n",$0;
+	next;
+}
+
diff -uPr tevent-0.9.8/script/mksyms.sh tevent/script/mksyms.sh
--- tevent-0.9.8/script/mksyms.sh	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/mksyms.sh	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+#
+# mksyms.sh
+#
+# Extract symbols to export from C-header files.
+# output in version-script format for linking shared libraries.
+#
+# This is the shell wrapper for the mksyms.awk core script.
+#
+# Copyright (C) 2008 Michael Adam <obnox at samba.org>
+#
+
+LANG=C; export LANG
+LC_ALL=C; export LC_ALL
+LC_COLLATE=C; export LC_COLLATE
+
+if [ $# -lt 2 ]
+then
+  echo "Usage: $0 awk output_file header_files"
+  exit 1
+fi
+
+awk="$1"
+shift
+
+symsfile="$1"
+shift
+symsfile_tmp="$symsfile.$$.tmp~"
+
+proto_src="`echo $@ | tr ' ' '\n' | sort | uniq `"
+
+echo creating $symsfile
+
+mkdir -p `dirname $symsfile`
+
+${awk} -f `dirname $0`/mksyms.awk $proto_src > $symsfile_tmp
+
+if cmp -s $symsfile $symsfile_tmp 2>/dev/null
+then
+  echo "$symsfile unchanged"
+  rm $symsfile_tmp
+else
+  mv $symsfile_tmp $symsfile
+fi
diff -uPr tevent-0.9.8/tevent.exports tevent/tevent.exports
--- tevent-0.9.8/tevent.exports	2009-08-30 13:58:36.000000000 -0400
+++ tevent/tevent.exports	2009-09-16 14:47:31.000000000 -0400
@@ -55,6 +55,8 @@
            tevent_timeval_zero;
            tevent_wakeup_recv;
            tevent_wakeup_send;
+           _tevent_req_cancel;
+           tevent_req_set_cancel_fn;
 
     local: *;
 };
diff -uPr tevent-0.9.8/tevent.mk tevent/tevent.mk
--- tevent-0.9.8/tevent.mk	2009-08-30 13:58:36.000000000 -0400
+++ tevent/tevent.mk	2009-09-16 14:47:31.000000000 -0400
@@ -29,6 +29,14 @@
 
 install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
 
+abi_checks::
+	@echo ABI checks:
+	@./script/abi_checks.sh tevent tevent.h
+
+test:: abi_checks
+
 clean::
 	rm -f $(TEVENT_SOBASE) $(TEVENT_SONAME) $(TEVENT_SOLIB) $(TEVENT_STLIB)
 	rm -f tevent.pc
+	rm -f tevent.exports.sort tevent.exports.check tevent.exports.check.sort
+	rm -f tevent.signatures.sort tevent.signatures.check tevent.signatures.check.sort
diff -uPr tevent-0.9.8/tevent.signatures tevent/tevent.signatures
--- tevent-0.9.8/tevent.signatures	2009-08-30 13:58:36.000000000 -0400
+++ tevent/tevent.signatures	2009-09-16 14:47:31.000000000 -0400
@@ -53,3 +53,5 @@
 void _tevent_schedule_immediate (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *);
 void tevent_set_abort_fn (void (*) (const char *));
 void tevent_set_default_backend (const char *);
+_Bool _tevent_req_cancel (struct tevent_req *, const char *);
+void tevent_req_set_cancel_fn (struct tevent_req *, tevent_req_cancel_fn);


Index: libtevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/libtevent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtevent.spec	15 Sep 2009 21:55:18 -0000	1.1
+++ libtevent.spec	16 Sep 2009 20:43:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name: libtevent
 Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -8,6 +8,9 @@ URL: http://tevent.samba.org/
 Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch1: tevent-098-add_abi_scripts_and_fix_exports.patch
+Patch2: tevent-098-abi-compat.patch
+
 BuildRequires: libtalloc-devel >= 2.0.0
 
 %description
@@ -30,6 +33,9 @@ Header files needed to develop programs 
 %prep
 %setup -q -n tevent-%{version}
 
+%patch1 -p1 -b .abi_checks
+%patch2 -p1 -b .abi_compat
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -62,5 +68,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2
+- Fix abi compatibility with 0.9.3
+
 * Sat Sep 8 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-1
 - First independent release for tevent 0.9.8 



From simo at fedoraproject.org  Wed Sep 16 20:46:01 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 16 Sep 2009 20:46:01 +0000 (UTC)
Subject: rpms/libtevent/F-11 tevent-098-abi-compat.patch, NONE,
	1.1 tevent-098-add_abi_scripts_and_fix_exports.patch, NONE,
	1.1 libtevent.spec, 1.1, 1.2
Message-ID: <20090916204601.7DB1911C00CF@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7205

Modified Files:
	libtevent.spec 
Added Files:
	tevent-098-abi-compat.patch 
	tevent-098-add_abi_scripts_and_fix_exports.patch 
Log Message:
* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2
- Fix abi compatibility with 0.9.3


tevent-098-abi-compat.patch:
 tevent.c       |   13 +++++++++++++
 tevent.exports |    6 ++++++
 tevent_req.c   |   19 +++++++++++++++++++
 3 files changed, 38 insertions(+)

--- NEW FILE tevent-098-abi-compat.patch ---
diff -uPr tevent-0.9.8/tevent.c tevent-0.9.8.new/tevent.c
--- tevent-0.9.8/tevent.c	2009-08-30 13:58:36.000000000 -0400
+++ tevent-0.9.8.new/tevent.c	2009-09-16 16:17:04.000000000 -0400
@@ -609,3 +609,16 @@
 {
 	return ev->ops->loop_wait(ev, location);
 }
+
+/* Backwards ABI compat */
+#undef tevent_loop_once
+#undef tevent_loop_wait
+int tevent_loop_once(struct tevent_context *ev)
+{
+    return _tevent_loop_once(ev, "abi_compat_wrapper");
+}
+
+int tevent_loop_wait(struct tevent_context *ev)
+{
+    return _tevent_loop_wait(ev, "abi_compat_wrapper");
+}
diff -uPr tevent-0.9.8/tevent.exports tevent-0.9.8.new/tevent.exports
--- tevent-0.9.8/tevent.exports	2009-09-16 16:37:21.000000000 -0400
+++ tevent-0.9.8.new/tevent.exports	2009-09-16 16:16:30.000000000 -0400
@@ -58,5 +58,11 @@
            _tevent_req_cancel;
            tevent_req_set_cancel_fn;
 
+           tevent_loop_once;
+           tevent_loop_wait;
+           tevent_req_done;
+           tevent_req_error;
+           tevent_req_nomem;
+
     local: *;
 };
diff -uPr tevent-0.9.8/tevent_req.c tevent-0.9.8.new/tevent_req.c
--- tevent-0.9.8/tevent_req.c	2009-08-30 13:58:36.000000000 -0400
+++ tevent-0.9.8.new/tevent_req.c	2009-09-16 16:36:52.000000000 -0400
@@ -441,3 +441,22 @@
 
 	return req->private_cancel(req);
 }
+
+/* Backwards ABI compat */
+#undef tevent_req_done
+#undef tevent_req_error
+#undef tevent_req_nomem
+void tevent_req_done(struct tevent_req *req)
+{
+    _tevent_req_done(req, "abi_compat_wrapper");
+}
+
+bool tevent_req_error(struct tevent_req *req, uint64_t error)
+{
+    return _tevent_req_error(req, error, "abi_compat_wrapper");
+}
+
+bool tevent_req_nomem(const void *p, struct tevent_req *req)
+{
+    return _tevent_req_nomem(p, req, "abi_compat_wrapper");
+}

tevent-098-add_abi_scripts_and_fix_exports.patch:
 script/abi_checks.sh     |   91 +++++++++++++++++++++++
 script/abi_checks_gcc.sh |   31 +++++++
 script/mksigs.pl         |  183 +++++++++++++++++++++++++++++++++++++++++++++++
 script/mksyms.awk        |   76 +++++++++++++++++++
 script/mksyms.sh         |   45 +++++++++++
 tevent.exports           |    2 
 tevent.mk                |    8 ++
 tevent.signatures        |    2 
 8 files changed, 438 insertions(+)

--- NEW FILE tevent-098-add_abi_scripts_and_fix_exports.patch ---
diff -uPr tevent-0.9.8/script/abi_checks_gcc.sh tevent/script/abi_checks_gcc.sh
--- tevent-0.9.8/script/abi_checks_gcc.sh	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/abi_checks_gcc.sh	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,31 @@
+#!/bin/bash
+make clean
+
+mkdir abi
+ABI_CHECKS="-aux-info abi/\$@.X"
+make ABI_CHECK="$ABI_CHECKS" CC="/usr/bin/gcc"
+
+for i in abi/*.X; do cat $i | grep 'tevent\.h'; done | sort | uniq | awk -F "extern " '{ print $2 }' | sort> abi/signatures
+
+cat > abi/exports << EOF
+{
+    global:
+EOF
+cat abi/signatures | awk -F '(' '{ print $1 }' | awk -F ' ' '{ print "           "$NF";" }' | tr -d '*' | sort >> abi/exports
+cat >> abi/exports << EOF
+
+    local: *;
+};
+EOF
+
+rm -fr abi/*.X
+
+diff -u tevent.signatures abi/signatures
+if [ "$?" != "0" ]; then
+    echo "WARNING: Possible ABI Change!!"
+fi
+
+diff -u tevent.exports abi/exports
+if [ "$?" != "0" ]; then
+    echo "WARNING: Export file may be outdated!!"
+fi
diff -uPr tevent-0.9.8/script/abi_checks.sh tevent/script/abi_checks.sh
--- tevent-0.9.8/script/abi_checks.sh	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/abi_checks.sh	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+#
+# abi_checks.sh - check for possible abi changes
+#
+# Copyright (C) 2009 Micheal Adam <obnox at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+#
+# USAGE: abi_checks.sh LIBNAME header1 [header2 ...]
+#
+# This script creates symbol and signature lists from the provided header
+# files with the aid of the mksyms.sh and mksigs.pl scripts (saved as
+# $LIBNAME.exports.check and $LIBNAME.sigatures.check). It then compares
+# the resulting files with the files $LIBNAME.exports and $LIBNME.signatures
+# which it expects to find in the current directory.
+#
+
+LANG=C; export LANG
+LC_ALL=C; export LC_ALL
+LC_COLLATE=C; export LC_COLLATE
+
+script=$0
+dir_name=$(dirname ${script})
+
+if test x"$1" = "x" ; then
+	echo "USAGE: ${script} libname header [header ...]"
+	exit 1
+fi
+
+libname="$1"
+shift
+
+if test x"$1" = "x" ; then
+	echo "USAGE: ${script} libname header [header ...]"
+	exit 1
+fi
+
+headers="$*"
+
+exports_file=${libname}.exports
+exports_file_check=${exports_file}.check
+signatures_file=${libname}.signatures
+signatures_file_check=${signatures_file}.check
+
+
+${dir_name}/mksyms.sh awk ${exports_file_check} ${headers} 2>&1 > /dev/null
+
+cat ${headers} | ${dir_name}/mksigs.pl > ${signatures_file_check} 2> /dev/null
+
+normalize_exports_file() {
+	filename=$1
+	cat ${filename} \
+	| sed -e 's/^[ \t]*//g' \
+	| sed -e 's/^$//g' \
+	| sed -e 's/^#.*$//g' \
+	| sort | uniq > ${filename}.sort
+}
+
+normalize_exports_file ${exports_file}
+normalize_exports_file ${exports_file_check}
+
+normalize_exports_file ${signatures_file}
+normalize_exports_file ${signatures_file_check}
+
+diff -u ${exports_file}.sort ${exports_file_check}.sort
+if test "x$?" != "x0" ; then
+	echo "WARNING: possible ABI change detected in exports!"
+else
+	echo "exports check: OK"
+fi
+
+diff -u ${signatures_file}.sort ${signatures_file_check}.sort
+if test "x$?" != "x0" ; then
+	echo "WARNING: possible ABI change detected in signatures!"
+else
+	echo "signatures check: OK"
+fi
diff -uPr tevent-0.9.8/script/mksigs.pl tevent/script/mksigs.pl
--- tevent-0.9.8/script/mksigs.pl	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/mksigs.pl	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,183 @@
+#!/usr/bin/perl
+
+# mksigs.pl - extract signatures from C headers
+#
+# Copyright (C) Michael Adam 2009
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+
+# USAGE:  cat $header_files | mksigs.pl > $signature_file
+#
+# The header files to parse are read from stdin.
+# The output is in a form as produced by gcc with the -aux-info switch
+# and printed to stdout.
+
+use strict;
+use warnings;
+
+my $in_comment = 0;
+my $extern_C_block = 0;
+
+while (my $LINE = <>) {
+	# find end of started multi-line-comment
+	if ($in_comment) {
+		if ($LINE =~ /^.*?\*\/(.*)$/) {
+			$LINE = $1;
+			$in_comment = 0;
+		} else {
+			# whole line within comment
+			next;
+		}
+	}
+
+	# strip C++-style comments
+	$LINE =~ s/^(.*?)\/\/.*$/$1/;
+
+	# strip in-line-comments:
+	while ($LINE =~ /\/\*.*?\*\//) {
+		$LINE =~ s/\/\*.*?\*\///;
+	}
+
+	# find starts of multi-line-comments
+	if ($LINE =~ /^(.*)\/\*/) {
+		$in_comment = 1;
+		$LINE = $1;
+	}
+
+	# skip empty lines
+	next if $LINE =~ /^\s*$/;
+
+	# remove leading spaces
+	$LINE =~ s/^\s*(.*)$/$1/;
+
+	# concatenate lines split with "\" (usually macro defines)
+	while ($LINE =~ /^(.*?)\s+\\$/) {
+		my $LINE2 = <>;
+		$LINE = $1;
+		$LINE2 =~ s/^\s*(.*)$/$1/;
+		$LINE .= " " . $LINE2;
+	}
+
+	# remove all preprocessor directives
+	next if ($LINE =~ /^#/);
+
+	if ($LINE =~ /^extern\s+"C"\s+\{/) {
+		$extern_C_block = 1;
+		next;
+	}
+
+	if (($LINE =~ /^[^\{]*\}/) and $extern_C_block) {
+		$extern_C_block = 0;
+		next;
+	}
+
+	$LINE =~ s/^extern\s//;
+
+	# concatenate braces stretched over multiple lines
+	# (from structs or enums)
+	my $REST = $LINE;
+	my $braces = 0;
+	while (($REST =~ /[\{\}]/) or ($braces)) {
+		while ($REST =~ /[\{\}]/) {
+			# collect opening
+			while ($REST =~ /^[^\{\}]*\{(.*)$/) {
+				$braces++;
+				$REST = $1;
+			}
+
+			# collect closing
+			while ($REST =~ /^[^\{\}]*\}(.*)$/) {
+				$braces--;
+				$REST = $1;
+			}
+		}
+
+		# concatenate if not balanced
+		if ($braces) {
+			if (my $LINE2 = <>) {
+				$LINE2 =~ s/^\s*(.*)$/$1/;
+				chomp($LINE);
+				$LINE .= " " . $LINE2;
+				chomp $REST;
+				$REST .= " " . $LINE2;
+			} else {
+				print "ERROR: unbalanced braces ($braces)\n";
+				last;
+			}
+		}
+	}
+
+	# concetenate function prototypes that stretch over multiple lines
+	$REST = $LINE;
+	my $parenthesis = 0;
+	while (($REST =~ /[\(\)]/) or ($parenthesis)) {
+		while ($REST =~ /[\(\)]/) {
+			# collect opening
+			while ($REST =~ /^[^\(\)]*\((.*)$/) {
+				$parenthesis++;
+				$REST = $1;
+			}
+
+			# collect closing
+			while ($REST =~ /^[^\(\)]*\)(.*)$/) {
+				$parenthesis--;
+				$REST = $1;
+			}
+		}
+
+		# concatenate if not balanced
+		if ($parenthesis) {
+			if (my $LINE2 = <>) {
+				$LINE2 =~ s/^\s*(.*)$/$1/;
+				chomp($LINE);
+				$LINE .= " " . $LINE2;
+				chomp($REST);
+				$REST .= " " . $LINE2;
+			} else {
+				print "ERROR: unbalanced parantheses ($parenthesis)\n";
+				last;
+			}
+		}
+	}
+
+	next if ($LINE =~ /^typedef\s/);
+	next if ($LINE =~ /^enum\s+[^\{\(]+\s+\{/);
+	next if ($LINE =~ /^struct\s+[^\{\(]+\s+\{.*\}\s*;/);
+	next if ($LINE =~ /^struct\s+[a-zA-Z0-9_]+\s*;/);
+
+	# remove trailing spaces
+	$LINE =~ s/(.*?)\s*$/$1/;
+
+	$LINE =~ s/^(.*\))\s+PRINTF_ATTRIBUTE\([^\)]*\)(\s*[;,])/$1$2/;
+	$LINE =~ s/^(.*\))\s*[a-zA-Z0-9_]+\s*;$/$1;/;
+
+	# remove parameter names - slightly too coarse probably
+	$LINE =~ s/([\s\(]\*?)[_0-9a-zA-Z]+\s*([,\)])/$1$2/g;
+
+	# remedy (void) from last line
+	$LINE =~ s/\(\)/(void)/g;
+
+	# normalize spaces
+	$LINE =~ s/\s*\)\s*/)/g;
+	$LINE =~ s/\s*\(\s*/ (/g;
+	$LINE =~ s/\s*,\s*/, /g;
+
+	# normalize unsigned
+	$LINE =~ s/([\s,\(])unsigned([,\)])/$1unsigned int$2/g;
+
+	# normalize bool
+	$LINE =~ s/(\b)bool(\b)/_Bool/g;
+
+	print $LINE . "\n";
+}
diff -uPr tevent-0.9.8/script/mksyms.awk tevent/script/mksyms.awk
--- tevent-0.9.8/script/mksyms.awk	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/mksyms.awk	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,76 @@
+#
+# mksyms.awk
+#
+# Extract symbols to export from C-header files.
+# output in version-script format for linking shared libraries.
+#
+# Copyright (C) 2008 Michael Adam <obnox at samba.org>
+#
+BEGIN {
+	inheader=0;
+	current_file="";
+	print "#"
+	print "# This file is automatically generated with \"make symbols\". DO NOT EDIT "
+	print "#"
+	print "{"
+	print "\tglobal:"
+}
+
+END {
+	print""
+	print "\tlocal: *;"
+	print "};"
+}
+
+{
+	if (FILENAME!=current_file) {
+		print "\t\t# The following definitions come from",FILENAME
+		current_file=FILENAME
+	}
+	if (inheader) {
+		if (match($0,"[)][^()]*[;][ \t]*$")) {
+			inheader = 0;
+		}
+		next;
+	}
+}
+
+/^static/ || /^[ \t]*typedef/ || !/^[a-zA-Z\_]/ {
+	next;
+}
+
+/^extern[ \t]+[^()]+[;][ \t]*$/ {
+	gsub(/[^ \t]+[ \t]+/, "");
+	sub(/[;][ \t]*$/, "");
+	printf "\t\t%s;\n", $0;
+	next;
+}
+
+# look for function headers:
+{
+	gotstart = 0;
+	if ($0 ~ /^[A-Za-z_][A-Za-z0-9_]+/) {
+	gotstart = 1;
+	}
+	if(!gotstart) {
+		next;
+	}
+}
+
+/[_A-Za-z0-9]+[ \t]*[(].*[)][^()]*;[ \t]*$/ {
+	sub(/[(].*$/, "");
+	gsub(/[^ \t]+[ \t]+/, "");
+	gsub(/^[*]+/, "");
+	printf "\t\t%s;\n",$0;
+	next;
+}
+
+/[_A-Za-z0-9]+[ \t]*[(]/ {
+	inheader=1;
+	sub(/[(].*$/, "");
+	gsub(/[^ \t]+[ \t]+/, "");
+	gsub(/^[*]/, "");
+	printf "\t\t%s;\n",$0;
+	next;
+}
+
diff -uPr tevent-0.9.8/script/mksyms.sh tevent/script/mksyms.sh
--- tevent-0.9.8/script/mksyms.sh	1969-12-31 19:00:00.000000000 -0500
+++ tevent/script/mksyms.sh	2009-09-16 14:47:31.000000000 -0400
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+#
+# mksyms.sh
+#
+# Extract symbols to export from C-header files.
+# output in version-script format for linking shared libraries.
+#
+# This is the shell wrapper for the mksyms.awk core script.
+#
+# Copyright (C) 2008 Michael Adam <obnox at samba.org>
+#
+
+LANG=C; export LANG
+LC_ALL=C; export LC_ALL
+LC_COLLATE=C; export LC_COLLATE
+
+if [ $# -lt 2 ]
+then
+  echo "Usage: $0 awk output_file header_files"
+  exit 1
+fi
+
+awk="$1"
+shift
+
+symsfile="$1"
+shift
+symsfile_tmp="$symsfile.$$.tmp~"
+
+proto_src="`echo $@ | tr ' ' '\n' | sort | uniq `"
+
+echo creating $symsfile
+
+mkdir -p `dirname $symsfile`
+
+${awk} -f `dirname $0`/mksyms.awk $proto_src > $symsfile_tmp
+
+if cmp -s $symsfile $symsfile_tmp 2>/dev/null
+then
+  echo "$symsfile unchanged"
+  rm $symsfile_tmp
+else
+  mv $symsfile_tmp $symsfile
+fi
diff -uPr tevent-0.9.8/tevent.exports tevent/tevent.exports
--- tevent-0.9.8/tevent.exports	2009-08-30 13:58:36.000000000 -0400
+++ tevent/tevent.exports	2009-09-16 14:47:31.000000000 -0400
@@ -55,6 +55,8 @@
            tevent_timeval_zero;
            tevent_wakeup_recv;
            tevent_wakeup_send;
+           _tevent_req_cancel;
+           tevent_req_set_cancel_fn;
 
     local: *;
 };
diff -uPr tevent-0.9.8/tevent.mk tevent/tevent.mk
--- tevent-0.9.8/tevent.mk	2009-08-30 13:58:36.000000000 -0400
+++ tevent/tevent.mk	2009-09-16 14:47:31.000000000 -0400
@@ -29,6 +29,14 @@
 
 install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
 
+abi_checks::
+	@echo ABI checks:
+	@./script/abi_checks.sh tevent tevent.h
+
+test:: abi_checks
+
 clean::
 	rm -f $(TEVENT_SOBASE) $(TEVENT_SONAME) $(TEVENT_SOLIB) $(TEVENT_STLIB)
 	rm -f tevent.pc
+	rm -f tevent.exports.sort tevent.exports.check tevent.exports.check.sort
+	rm -f tevent.signatures.sort tevent.signatures.check tevent.signatures.check.sort
diff -uPr tevent-0.9.8/tevent.signatures tevent/tevent.signatures
--- tevent-0.9.8/tevent.signatures	2009-08-30 13:58:36.000000000 -0400
+++ tevent/tevent.signatures	2009-09-16 14:47:31.000000000 -0400
@@ -53,3 +53,5 @@
 void _tevent_schedule_immediate (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *);
 void tevent_set_abort_fn (void (*) (const char *));
 void tevent_set_default_backend (const char *);
+_Bool _tevent_req_cancel (struct tevent_req *, const char *);
+void tevent_req_set_cancel_fn (struct tevent_req *, tevent_req_cancel_fn);


Index: libtevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/F-11/libtevent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtevent.spec	16 Sep 2009 15:48:12 -0000	1.1
+++ libtevent.spec	16 Sep 2009 20:46:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name: libtevent
 Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -8,6 +8,9 @@ URL: http://tevent.samba.org/
 Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch1: tevent-098-add_abi_scripts_and_fix_exports.patch
+Patch2: tevent-098-abi-compat.patch
+
 BuildRequires: libtalloc-devel >= 2.0.0
 
 %description
@@ -30,6 +33,9 @@ Header files needed to develop programs 
 %prep
 %setup -q -n tevent-%{version}
 
+%patch1 -p1 -b .abi_checks
+%patch2 -p1 -b .abi_compat
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -62,5 +68,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2
+- Fix abi compatibility with 0.9.3
+
 * Sat Sep 8 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-1
 - First independent release for tevent 0.9.8 



From till at fedoraproject.org  Wed Sep 16 21:08:13 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 21:08:13 +0000 (UTC)
Subject: rpms/pyhunspell/EL-5 pyhunspell.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090916210813.91B3211C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pyhunspell/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19937

Modified Files:
	sources 
Added Files:
	pyhunspell.spec 
Log Message:
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %description to a full sentence
- Adjust the license tag, it's actually LGPLv3+



--- NEW FILE pyhunspell.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyhunspell
Version:        0.1
Release:        2%{?dist}
Summary:        Python bindings for hunspell

Group:          Development/Languages
License:        LGPLv3+
URL:            http://code.google.com/p/pyhunspell/
Source0:        http://pyhunspell.googlecode.com/files/hunspell-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel hunspell-devel

%description
These are python bindings for hunspell, that allow to use the hunspell library
in python.


%prep
%setup -q -n hunspell-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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,-)
%doc
%{python_sitearch}/hunspell.so
%{python_sitearch}/hunspell-*.egg-info


%changelog
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %%description to a full sentence
- Adjust the license tag, it's actually LGPLv3+

* Wed Jul 29 2009 Till Maas <opensource at till.name> - 0.1-1
- Initial spec for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyhunspell/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:23:45 -0000	1.1
+++ sources	16 Sep 2009 21:08:13 -0000	1.2
@@ -0,0 +1 @@
+14b80b3533ebfe5437e2c24999ce4fac  hunspell-0.1.tar.gz



From chkr at fedoraproject.org  Wed Sep 16 21:13:56 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Sep 2009 21:13:56 +0000 (UTC)
Subject: rpms/podsleuth/F-11 podsleuth-0.6.4-sg3_utils.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 podsleuth.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090916211356.569DC11C00CF@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21851

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.4-sg3_utils.patch 
Log Message:
* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
- update to 0.6.4 (BZ 501404)
- remove upstreamed patch
- update sgutils patch


podsleuth-0.6.4-sg3_utils.patch:
 configure                             |   12 ++++++------
 src/PodSleuth/PodSleuth.dll.config.in |    2 +-
 src/PodSleuth/PodSleuth/ScsiReader.cs |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE podsleuth-0.6.4-sg3_utils.patch ---
diff -uNr podsleuth-0.6.4.old/configure podsleuth-0.6.4/configure
--- podsleuth-0.6.4.old/configure	2009-01-20 23:43:04.000000000 +0100
+++ podsleuth-0.6.4/configure	2009-08-25 23:27:10.000000000 +0200
@@ -4392,13 +4392,13 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
-$as_echo_n "checking for sg_ll_inquiry in -lsgutils... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
+$as_echo_n "checking for sg_ll_inquiry in -lsgutils2... " >&6; }
 if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsgutils  $LIBS"
+LIBS="-lsgutils2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4462,11 +4462,11 @@
 #define HAVE_LIBSGUTILS 1
 _ACEOF
 
-  LIBS="-lsgutils $LIBS"
+  LIBS="-lsgutils2 $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
-$as_echo "$as_me: error: Error! You need to have libsgutils." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils2." >&5
+$as_echo "$as_me: error: Error! You need to have libsgutils2." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
diff -uNr podsleuth-0.6.4.old/src/PodSleuth/PodSleuth/ScsiReader.cs podsleuth-0.6.4/src/PodSleuth/PodSleuth/ScsiReader.cs
--- podsleuth-0.6.4.old/src/PodSleuth/PodSleuth/ScsiReader.cs	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.4/src/PodSleuth/PodSleuth/ScsiReader.cs	2009-08-25 23:27:33.000000000 +0200
@@ -50,7 +50,7 @@
             }
         }
         
-        [DllImport("libsgutils.so.1")]
+        [DllImport("libsgutils2.so.2")]
         private static extern int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
             IntPtr resp, int mx_resp_len, int noisy, int verbose);
             
@@ -74,4 +74,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff -uNr podsleuth-0.6.4.old/src/PodSleuth/PodSleuth.dll.config.in podsleuth-0.6.4/src/PodSleuth/PodSleuth.dll.config.in
--- podsleuth-0.6.4.old/src/PodSleuth/PodSleuth.dll.config.in	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.4/src/PodSleuth/PodSleuth.dll.config.in	2009-08-25 23:28:07.000000000 +0200
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libsgutils.so.1" target="libsgutils.so.1" />
+	<dllmap dll="libsgutils2.so.2" target="libsgutils2.so.2" />
 </configuration>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Nov 2008 22:33:19 -0000	1.4
+++ .cvsignore	16 Sep 2009 21:13:55 -0000	1.5
@@ -1 +1 @@
-podsleuth-0.6.3.tar.bz2
+podsleuth-0.6.4.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-11/podsleuth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- podsleuth.spec	20 Aug 2009 22:59:44 -0000	1.10
+++ podsleuth.spec	16 Sep 2009 21:13:55 -0000	1.11
@@ -1,25 +1,22 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.3
-Release:	4%{?dist}
+Version:	0.6.4
+Release:	1%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
 URL:		http://banshee-project.org/PodSleuth
 Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		podsleuth-0.6.0-sg3_utils.patch
+Patch0:		podsleuth-0.6.4-sg3_utils.patch
 Patch1:		podsleuth-0.6.2-libdir.patch
-Patch2:         podsleuth-0.6.0-wapidir.patch
-# From: http://banshee-project.org/~gburt/tmp/update-model-info-fix-artwork-bug-r64_68.patch
-# See: http://mail.gnome.org/archives/banshee-list/2008-October/msg00221.html
-Patch3:		update-model-info-fix-artwork-bug-r64_68.patch
+Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
-Requires:       sg3_utils-libs
+Requires:	sg3_utils-libs
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
@@ -51,7 +48,6 @@ Development files for podsleuth.
 %endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
-%patch3 -p0 -b .r68
 
 %build
 %configure --with-hal-callouts-dir=%{_libexecdir}
@@ -82,6 +78,11 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
+- update to 0.6.4 (BZ 501404)
+- remove upstreamed patch
+- update sgutils patch
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.3-4
 - Rebuild for ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Nov 2008 22:33:19 -0000	1.4
+++ sources	16 Sep 2009 21:13:55 -0000	1.5
@@ -1 +1 @@
-b5ee19f8a4eb8da8d600500df33eda87  podsleuth-0.6.3.tar.bz2
+b51e7bc2dd3e2265e75a04fe35974c10  podsleuth-0.6.4.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 16 21:16:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:16:10 +0000
Subject: [pkgdb] perl-Module-Install-GithubMeta was added for cweyl
Message-ID: <20090916211610.B507410F883@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-Module-Install-GithubMeta with summary A Module::Install extension to include GitHub meta information in META.yml
tibbs has approved Package perl-Module-Install-GithubMeta
tibbs has added a Fedora devel branch for perl-Module-Install-GithubMeta with an owner of cweyl
tibbs has approved perl-Module-Install-GithubMeta in Fedora devel
tibbs has approved Package perl-Module-Install-GithubMeta
tibbs has set commit to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora devel)
tibbs has set build to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-GithubMeta



From pkgdb at fedoraproject.org  Wed Sep 16 21:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:16:12 +0000
Subject: [pkgdb] perl-Module-Install-GithubMeta summary updated by tibbs
Message-ID: <20090916211612.7BA9010F894@bastion2.fedora.phx.redhat.com>

tibbs set package perl-Module-Install-GithubMeta summary to A Module::Install extension to include GitHub meta information in META.yml

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-GithubMeta



From pkgdb at fedoraproject.org  Wed Sep 16 21:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:16:12 +0000
Subject: [pkgdb] perl-Module-Install-GithubMeta (Fedora, 11) updated by tibbs
Message-ID: <20090916211612.818A910F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-Module-Install-GithubMeta
tibbs has set commit to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora 11)
tibbs has set build to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora 11)
tibbs approved watchbugzilla on perl-Module-Install-GithubMeta (Fedora 11) for perl-sig
tibbs approved watchcommits on perl-Module-Install-GithubMeta (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-GithubMeta



From pkgdb at fedoraproject.org  Wed Sep 16 21:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:16:12 +0000
Subject: [pkgdb] perl-Module-Install-GithubMeta (Fedora, 11) updated by tibbs
Message-ID: <20090916211612.8A2A010F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for perl-Module-Install-GithubMeta
tibbs has set commit to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora 10)
tibbs has set checkout to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora 10)
tibbs has set build to Approved for 107427 on perl-Module-Install-GithubMeta (Fedora 10)
tibbs approved watchbugzilla on perl-Module-Install-GithubMeta (Fedora 10) for perl-sig
tibbs approved watchcommits on perl-Module-Install-GithubMeta (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-GithubMeta



From tibbs at fedoraproject.org  Wed Sep 16 21:16:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:16:21 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta - New directory
Message-ID: <20090916211621.37FD011C00E6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Module-Install-GithubMeta
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse23355/rpms/perl-Module-Install-GithubMeta

Log Message:
Directory /cvs/pkgs/rpms/perl-Module-Install-GithubMeta added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:16:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:16:21 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta/devel - New directory
Message-ID: <20090916211621.7A31011C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Module-Install-GithubMeta/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse23355/rpms/perl-Module-Install-GithubMeta/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Module-Install-GithubMeta/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 16 21:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:16:12 +0000
Subject: [pkgdb] perl-Module-Install-GithubMeta (Fedora, 11) updated by tibbs
Message-ID: <20090916211612.9622910F8A1@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on perl-Module-Install-GithubMeta (Fedora devel) for perl-sig
tibbs approved watchcommits on perl-Module-Install-GithubMeta (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-GithubMeta



From tibbs at fedoraproject.org  Wed Sep 16 21:16:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:16:30 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta Makefile,NONE,1.1
Message-ID: <20090916211630.5B6B011C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Module-Install-GithubMeta
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse23355/rpms/perl-Module-Install-GithubMeta

Added Files:
	Makefile 
Log Message:
Setup of module perl-Module-Install-GithubMeta


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Install-GithubMeta
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 tibbs at fedoraproject.org  Wed Sep 16 21:16:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:16:30 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090916211630.9B90611C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Module-Install-GithubMeta/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse23355/rpms/perl-Module-Install-GithubMeta/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Install-GithubMeta


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Module-Install-GithubMeta
# $Id: Makefile,v 1.1 2009/09/16 21:16:30 tibbs Exp $
NAME := perl-Module-Install-GithubMeta
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 Sep 16 21:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:17:10 +0000
Subject: [pkgdb] libvmime07 was added for robert
Message-ID: <20090916211710.F0ED610F88C@bastion2.fedora.phx.redhat.com>

tibbs has added Package libvmime07 with summary A powerful C++ class library for working with MIME/Internet messages
tibbs has approved Package libvmime07
tibbs has added a Fedora devel branch for libvmime07 with an owner of robert
tibbs has approved libvmime07 in Fedora devel
tibbs has approved Package libvmime07
tibbs has set commit to Approved for 107427 on libvmime07 (Fedora devel)
tibbs has set checkout to Approved for 107427 on libvmime07 (Fedora devel)
tibbs has set build to Approved for 107427 on libvmime07 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvmime07



From pkgdb at fedoraproject.org  Wed Sep 16 21:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:17:12 +0000
Subject: [pkgdb] libvmime07 summary updated by tibbs
Message-ID: <20090916211712.5A14310F896@bastion2.fedora.phx.redhat.com>

tibbs set package libvmime07 summary to A powerful C++ class library for working with MIME/Internet messages

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvmime07



From pkgdb at fedoraproject.org  Wed Sep 16 21:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:17:12 +0000
Subject: [pkgdb] libvmime07 (Fedora, 11) updated by tibbs
Message-ID: <20090916211712.6092210F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for libvmime07
tibbs has set commit to Approved for 107427 on libvmime07 (Fedora 11)
tibbs has set checkout to Approved for 107427 on libvmime07 (Fedora 11)
tibbs has set build to Approved for 107427 on libvmime07 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvmime07



From pkgdb at fedoraproject.org  Wed Sep 16 21:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:17:12 +0000
Subject: [pkgdb] libvmime07 (Fedora, 11) updated by tibbs
Message-ID: <20090916211712.6770E10F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for libvmime07
tibbs has set commit to Approved for 107427 on libvmime07 (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on libvmime07 (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on libvmime07 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvmime07



From pkgdb at fedoraproject.org  Wed Sep 16 21:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:17:12 +0000
Subject: [pkgdb] libvmime07 (Fedora, 11) updated by tibbs
Message-ID: <20090916211712.7047C10F8A2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for libvmime07
tibbs has set commit to Approved for 107427 on libvmime07 (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on libvmime07 (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on libvmime07 (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvmime07



From tibbs at fedoraproject.org  Wed Sep 16 21:17:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:17:26 +0000 (UTC)
Subject: rpms/libvmime07 - New directory
Message-ID: <20090916211726.5ECE411C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libvmime07
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX24155/rpms/libvmime07

Log Message:
Directory /cvs/pkgs/rpms/libvmime07 added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:17:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:17:26 +0000 (UTC)
Subject: rpms/libvmime07/devel - New directory
Message-ID: <20090916211726.8A40611C00E6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libvmime07/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX24155/rpms/libvmime07/devel

Log Message:
Directory /cvs/pkgs/rpms/libvmime07/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 16 21:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:17:12 +0000
Subject: [pkgdb] libvmime07 (Fedora, 11) updated by tibbs
Message-ID: <20090916211712.7C9E610F8A5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for libvmime07
tibbs has set commit to Approved for 107427 on libvmime07 (Fedora 10)
tibbs has set checkout to Approved for 107427 on libvmime07 (Fedora 10)
tibbs has set build to Approved for 107427 on libvmime07 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvmime07



From tibbs at fedoraproject.org  Wed Sep 16 21:17:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:17:42 +0000 (UTC)
Subject: rpms/libvmime07 Makefile,NONE,1.1
Message-ID: <20090916211742.DD61011C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libvmime07
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX24155/rpms/libvmime07

Added Files:
	Makefile 
Log Message:
Setup of module libvmime07


--- NEW FILE Makefile ---
# Top level Makefile for module libvmime07
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 tibbs at fedoraproject.org  Wed Sep 16 21:17:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:17:43 +0000 (UTC)
Subject: rpms/libvmime07/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090916211743.9956D11C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libvmime07/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX24155/rpms/libvmime07/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libvmime07


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libvmime07
# $Id: Makefile,v 1.1 2009/09/16 21:17:43 tibbs Exp $
NAME := libvmime07
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 Sep 16 21:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:18:31 +0000
Subject: [pkgdb] perl-Module-Find (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916211831.AE21910F88C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-Module-Find
tibbs has set commit to Approved for 107427 on perl-Module-Find (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-Module-Find (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-Module-Find (Fedora EPEL 5)
tibbs changed owner of perl-Module-Find in Fedora EPEL 5 to mdbooth

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Find



From pkgdb at fedoraproject.org  Wed Sep 16 21:19:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:19:16 +0000
Subject: [pkgdb] perl-XML-DOM-XPath (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916211916.7FF9110F87D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-XML-DOM-XPath
tibbs has set commit to Approved for 107427 on perl-XML-DOM-XPath (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-XML-DOM-XPath (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-XML-DOM-XPath (Fedora EPEL 5)
tibbs changed owner of perl-XML-DOM-XPath in Fedora EPEL 5 to alexlan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-DOM-XPath



From pkgdb at fedoraproject.org  Wed Sep 16 21:20:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:20:10 +0000
Subject: [pkgdb] perl-XML-XPathEngine (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916212010.A7A5510F880@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-XML-XPathEngine
tibbs has set commit to Approved for 107427 on perl-XML-XPathEngine (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-XML-XPathEngine (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-XML-XPathEngine (Fedora EPEL 5)
tibbs changed owner of perl-XML-XPathEngine in Fedora EPEL 5 to alexlan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-XPathEngine



From till at fedoraproject.org  Wed Sep 16 21:22:35 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 21:22:35 +0000 (UTC)
Subject: rpms/pyhunspell/F-11 pyhunspell.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090916212235.DE03611C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pyhunspell/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27957

Modified Files:
	sources 
Added Files:
	pyhunspell.spec 
Log Message:
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %description to a full sentence
- Adjust the license tag, it's actually LGPLv3+



--- NEW FILE pyhunspell.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyhunspell
Version:        0.1
Release:        2%{?dist}
Summary:        Python bindings for hunspell

Group:          Development/Languages
License:        LGPLv3+
URL:            http://code.google.com/p/pyhunspell/
Source0:        http://pyhunspell.googlecode.com/files/hunspell-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel hunspell-devel

%description
These are python bindings for hunspell, that allow to use the hunspell library
in python.


%prep
%setup -q -n hunspell-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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,-)
%doc
%{python_sitearch}/hunspell.so
%{python_sitearch}/hunspell-*.egg-info


%changelog
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %%description to a full sentence
- Adjust the license tag, it's actually LGPLv3+

* Wed Jul 29 2009 Till Maas <opensource at till.name> - 0.1-1
- Initial spec for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyhunspell/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:23:45 -0000	1.1
+++ sources	16 Sep 2009 21:22:35 -0000	1.2
@@ -0,0 +1 @@
+14b80b3533ebfe5437e2c24999ce4fac  hunspell-0.1.tar.gz



From pjones at fedoraproject.org  Wed Sep 16 21:22:41 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Wed, 16 Sep 2009 21:22:41 +0000 (UTC)
Subject: rpms/grub/devel grub-fedora-9.patch, 1.12, 1.13 grub.spec, 1.107,
	1.108
Message-ID: <20090916212241.308C111C00CF@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27898

Modified Files:
	grub-fedora-9.patch grub.spec 
Log Message:
* Wed Sep 16 2009 Peter Jones <pjones at redhat.com> - 0.97-60
- Fix a typo introduced in grub-fedora-9.patch that may effect UEFI
  Graphics Output Protocol.


grub-fedora-9.patch:
 b/ChangeLog                      |   48 
 b/Makefile.am                    |    3 
 b/Makefile.in                    |  175 
 b/acinclude.m4                   |    4 
 b/aclocal.m4                     |  555 --
 b/config.h.in                    |    5 
 b/configure.in                   |  757 +++
 b/docs/Makefile.in               |  260 -
 b/docs/grub-install.8            |    2 
 b/docs/grub.8                    |    2 
 b/docs/grub.info                 |  370 -
 b/docs/grub.texi                 |   24 
 b/docs/stamp-vti                 |    4 
 b/docs/version.texi              |    4 
 b/efi/Makefile.am                |   78 
 b/efi/efichainloader.c           |  265 +
 b/efi/eficon.c                   |  299 +
 b/efi/eficore.c                  |  626 +++
 b/efi/efidisk.c                  |  629 +++
 b/efi/efigraph.c                 | 1199 ++++++
 b/efi/efimain.c                  |  110 
 b/efi/efimisc.c                  |  603 +++
 b/efi/efimm.c                    |  438 ++
 b/efi/efiserial.c                |  265 +
 b/efi/efiuga.c                   |  945 ++++
 b/efi/font_8x16.c                | 4638 +++++++++++++++++++++++
 b/efi/graphics.c                 |  568 ++
 b/efi/graphics.h                 |   79 
 b/efi/grub/efi/api.h             | 1459 +++++++
 b/efi/grub/efi/console_control.h |   59 
 b/efi/grub/efi/efi.h             |   70 
 b/efi/grub/efi/eficall.h         |  161 
 b/efi/grub/efi/misc.h            |   46 
 b/efi/grub/efi/time.h            |   31 
 b/efi/grub/i386/linux.h          |  226 +
 b/efi/grub/i386/types.h          |   32 
 b/efi/grub/misc.h                |   66 
 b/efi/grub/symbol.h              |   34 
 b/efi/grub/types.h               |  158 
 b/efi/grub/x86_64/linux.h        |  228 +
 b/efi/grub/x86_64/types.h        |   32 
 b/efi/ia32/callwrap.c            |  131 
 b/efi/ia32/loader/bin_to_h.c     |   29 
 b/efi/ia32/loader/linux.c        |  711 +++
 b/efi/ia32/loader/switch.S       |  118 
 b/efi/ia32/loader/switch.h       |   19 
 b/efi/ia32/reloc.c               |   79 
 b/efi/ia32/setjmp.S              |   86 
 b/efi/ugadebug.h                 |  201 +
 b/efi/x86_64/callwrap.c          |  395 ++
 b/efi/x86_64/crt0-efi.S          |   63 
 b/efi/x86_64/elf_efi.lds         |   58 
 b/efi/x86_64/loader/bin_to_h.c   |   29 
 b/efi/x86_64/loader/linux.c      |  626 +++
 b/efi/x86_64/loader/switch.S     |   92 
 b/efi/x86_64/loader/switch.h     |   25 
 b/efi/x86_64/reloc.c             |   79 
 b/efi/x86_64/setjmp.S            |   56 
 b/efi/xpm.c                      |  231 +
 b/efi/xpm.h                      |   36 
 b/grub.spec                      |  438 ++
 b/grub/Makefile.in               |  117 
 b/grub/asmstub.c                 |  162 
 b/grub/main.c                    |    2 
 b/lib/Makefile.in                |  111 
 b/lib/device.c                   |  352 +
 b/netboot/Makefile.in            |  359 -
 b/netboot/etherboot.h            |   34 
 b/netboot/main.c                 |    6 
 b/netboot/misc.c                 |   58 
 b/netboot/osdep.h                |   24 
 b/stage1/Makefile.am             |   15 
 b/stage1/Makefile.in             |  169 
 b/stage2/Makefile.am             |   71 
 b/stage2/Makefile.in             | 1729 +++++---
 b/stage2/asm.S                   |  203 +
 b/stage2/boot.c                  |   24 
 b/stage2/builtins.c              | 1146 +++--
 b/stage2/char_io.c               |  375 +
 b/stage2/cmdline.c               |   15 
 b/stage2/common.c                |   14 
 b/stage2/disk_io.c               |  109 
 b/stage2/fat.h                   |    2 
 b/stage2/filesys.h               |    4 
 b/stage2/fsys_ext2fs.c           |   79 
 b/stage2/fsys_fat.c              |   13 
 b/stage2/fsys_iso9660.c          |    6 
 b/stage2/fsys_minix.c            |   10 
 b/stage2/fsys_reiserfs.c         |   18 
 b/stage2/fsys_vstafs.c           |   28 
 b/stage2/fsys_xfs.c              |   18 
 b/stage2/gpt.h                   |   68 
 b/stage2/graphics.c              |  573 ++
 b/stage2/graphics.h              |   42 
 b/stage2/gunzip.c                |   15 
 b/stage2/iso9660.h               |    4 
 b/stage2/mb_info.h               |    4 
 b/stage2/pc_slice.h              |   47 
 b/stage2/serial.c                |    4 
 b/stage2/shared.h                |   59 
 b/stage2/smp-imps.h              |    1 
 b/stage2/stage2.c                |  165 
 b/stage2/term.h                  |   26 
 b/stage2/tparm.c                 |   14 
 b/test                           |    1 
 b/util/Makefile.am               |   11 
 b/util/Makefile.in               |  131 
 b/util/grub-install.in           |  321 +
 configure                        | 7639 ---------------------------------------
 configure.ac                     |  670 ---
 110 files changed, 23056 insertions(+), 11071 deletions(-)

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grub-fedora-9.patch	7 Apr 2008 17:19:51 -0000	1.12
+++ grub-fedora-9.patch	16 Sep 2009 21:22:38 -0000	1.13
@@ -14565,7 +14565,7 @@ index 0000000..0babe11
 +            if (!eg->modes[i])
 +                goto fail;
 +            memset(eg->modes, '\0', sizeof (eg->modes[0]));
-+            eg->modes[i]->number;
++            eg->modes[i]->number = i;
 +
 +            efi_status = Call_Service_4(eg->output_intf->query_mode,
 +                    eg->output_intf, i, &eg->modes[i]->size,


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- grub.spec	20 Aug 2009 14:34:19 -0000	1.107
+++ grub.spec	16 Sep 2009 21:22:39 -0000	1.108
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 59%{?dist}
+Release: 60%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -141,6 +141,10 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Wed Sep 16 2009 Peter Jones <pjones at redhat.com> - 0.97-60
+- Fix a typo introduced in grub-fedora-9.patch that may effect UEFI
+  Graphics Output Protocol.
+
 * Thu Aug 20 2009 Peter Jones <pjones at redhat.com> - 0.97-59
 - Correctly link against gnuefi.
 



From till at fedoraproject.org  Wed Sep 16 21:23:28 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 16 Sep 2009 21:23:28 +0000 (UTC)
Subject: rpms/pyhunspell/F-10 pyhunspell.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090916212328.1B7A511C00CF@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pyhunspell/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29061

Modified Files:
	sources 
Added Files:
	pyhunspell.spec 
Log Message:
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %description to a full sentence
- Adjust the license tag, it's actually LGPLv3+



--- NEW FILE pyhunspell.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyhunspell
Version:        0.1
Release:        2%{?dist}
Summary:        Python bindings for hunspell

Group:          Development/Languages
License:        LGPLv3+
URL:            http://code.google.com/p/pyhunspell/
Source0:        http://pyhunspell.googlecode.com/files/hunspell-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel hunspell-devel

%description
These are python bindings for hunspell, that allow to use the hunspell library
in python.


%prep
%setup -q -n hunspell-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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,-)
%doc
%{python_sitearch}/hunspell.so
%{python_sitearch}/hunspell-*.egg-info


%changelog
* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.1-2
- Remove CFLAGS, whiche are used automagically
- Change the %%description to a full sentence
- Adjust the license tag, it's actually LGPLv3+

* Wed Jul 29 2009 Till Maas <opensource at till.name> - 0.1-1
- Initial spec for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyhunspell/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Sep 2009 20:23:45 -0000	1.1
+++ sources	16 Sep 2009 21:23:27 -0000	1.2
@@ -0,0 +1 @@
+14b80b3533ebfe5437e2c24999ce4fac  hunspell-0.1.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 16 21:30:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:30:01 +0000
Subject: [pkgdb] ksplice (Fedora, 12) updated by tibbs
Message-ID: <20090916213001.CE0D510F87D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for ksplice
tibbs has set commit to Approved for 107427 on ksplice (Fedora 12)
tibbs has set checkout to Approved for 107427 on ksplice (Fedora 12)
tibbs has set build to Approved for 107427 on ksplice (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ksplice



From pkgdb at fedoraproject.org  Wed Sep 16 21:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:30:34 +0000
Subject: [pkgdb] perl-PDL-Graphics-PLplot was added for orion
Message-ID: <20090916213034.D509A10F886@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-PDL-Graphics-PLplot with summary Object-oriented interface from perl/PDL to the PLPLOT plotting library
tibbs has approved Package perl-PDL-Graphics-PLplot
tibbs has added a Fedora devel branch for perl-PDL-Graphics-PLplot with an owner of orion
tibbs has approved perl-PDL-Graphics-PLplot in Fedora devel
tibbs has approved Package perl-PDL-Graphics-PLplot
tibbs has set commit to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora devel)
tibbs has set build to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDL-Graphics-PLplot



From pkgdb at fedoraproject.org  Wed Sep 16 21:30:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:30:40 +0000
Subject: [pkgdb] perl-PDL-Graphics-PLplot summary updated by tibbs
Message-ID: <20090916213040.2683010F888@bastion2.fedora.phx.redhat.com>

tibbs set package perl-PDL-Graphics-PLplot summary to Object-oriented interface from perl/PDL to the PLPLOT plotting library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDL-Graphics-PLplot



From pkgdb at fedoraproject.org  Wed Sep 16 21:30:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:30:40 +0000
Subject: [pkgdb] perl-PDL-Graphics-PLplot (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916213040.3191B10F896@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for perl-PDL-Graphics-PLplot
tibbs has set commit to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora 10)
tibbs has set checkout to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora 10)
tibbs has set build to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDL-Graphics-PLplot



From pkgdb at fedoraproject.org  Wed Sep 16 21:30:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:30:40 +0000
Subject: [pkgdb] perl-PDL-Graphics-PLplot (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916213040.38AFC10F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-PDL-Graphics-PLplot
tibbs has set commit to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDL-Graphics-PLplot



From pkgdb at fedoraproject.org  Wed Sep 16 21:30:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:30:40 +0000
Subject: [pkgdb] perl-PDL-Graphics-PLplot (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916213040.5C66910F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-PDL-Graphics-PLplot
tibbs has set commit to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora 11)
tibbs has set build to Approved for 107427 on perl-PDL-Graphics-PLplot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDL-Graphics-PLplot



From tibbs at fedoraproject.org  Wed Sep 16 21:30:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:30:49 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot - New directory
Message-ID: <20090916213049.1BE8A11C00EC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjB1204/rpms/perl-PDL-Graphics-PLplot

Log Message:
Directory /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:30:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:30:49 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot/devel - New directory
Message-ID: <20090916213049.5336911C0337@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjB1204/rpms/perl-PDL-Graphics-PLplot/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:30:58 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:30:58 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot Makefile,NONE,1.1
Message-ID: <20090916213058.7A87B11C00EC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsjB1204/rpms/perl-PDL-Graphics-PLplot

Added Files:
	Makefile 
Log Message:
Setup of module perl-PDL-Graphics-PLplot


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PDL-Graphics-PLplot
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 robert at fedoraproject.org  Wed Sep 16 21:31:08 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 16 Sep 2009 21:31:08 +0000 (UTC)
Subject: rpms/libvmime07/devel
	libvmime07-0.7.1-allow-no-recips-and-senders.patch, NONE,
	1.1 libvmime07-0.7.1-attachfnamelen.patch, NONE,
	1.1 libvmime07-0.7.1-bmoted-printable.patch, NONE,
	1.1 libvmime07-0.7.1-broken-locale-error.patch, NONE,
	1.1 libvmime07-0.7.1-charset-catch.patch, NONE,
	1.1 libvmime07-0.7.1-charset-output-buffer-full.patch, NONE,
	1.1 libvmime07-0.7.1-contentid-without-at.patch, NONE,
	1.1 libvmime07-0.7.1-default-transfer-encoding.patch, NONE,
	1.1 libvmime07-0.7.1-double-empty-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.3-support.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.4-support.patch, NONE,
	1.1 libvmime07-0.7.1-header-value-on-next-line.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-disposition.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-final-recipient.patch, NONE,
	1.1 libvmime07-0.7.1-missing-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-oe-compatibility.patch, NONE,
	1.1 libvmime07-0.7.1-out-of-bounds-copy.patch, NONE,
	1.1 libvmime07-0.7.1-package.patch, NONE,
	1.1 libvmime07-0.7.1-qp-starts-on-second-line.patch, NONE,
	1.1 libvmime07-0.7.1-quoted-printable-encode-questionmark.patch,
	NONE, 1.1 libvmime07-0.7.1-quoted-printable-specials.patch, NONE,
	1.1 libvmime07-0.7.1-remove-bcc.patch, NONE,
	1.1 libvmime07-0.7.1-socket-backport-and-timeout-fix.patch, NONE,
	1.1 libvmime07-0.7.1-socket-tcp-nodelay.patch, NONE,
	1.1 libvmime07-0.7.1-strip-header-endspaces.patch, NONE,
	1.1 libvmime07-0.7.1-threading-remove-static_non-abi-change.patch,
	NONE, 1.1 libvmime07-0.7.1-timezone-name.patch, NONE,
	1.1 libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch, NONE,
	1.1 libvmime07.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090916213108.D255011C00CF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1205

Modified Files:
	.cvsignore sources 
Added Files:
	libvmime07-0.7.1-allow-no-recips-and-senders.patch 
	libvmime07-0.7.1-attachfnamelen.patch 
	libvmime07-0.7.1-bmoted-printable.patch 
	libvmime07-0.7.1-broken-locale-error.patch 
	libvmime07-0.7.1-charset-catch.patch 
	libvmime07-0.7.1-charset-output-buffer-full.patch 
	libvmime07-0.7.1-contentid-without-at.patch 
	libvmime07-0.7.1-default-transfer-encoding.patch 
	libvmime07-0.7.1-double-empty-boundary.patch 
	libvmime07-0.7.1-gcc-4.3-support.patch 
	libvmime07-0.7.1-gcc-4.4-support.patch 
	libvmime07-0.7.1-header-value-on-next-line.patch 
	libvmime07-0.7.1-mdn-disposition.patch 
	libvmime07-0.7.1-mdn-final-recipient.patch 
	libvmime07-0.7.1-missing-boundary.patch 
	libvmime07-0.7.1-oe-compatibility.patch 
	libvmime07-0.7.1-out-of-bounds-copy.patch 
	libvmime07-0.7.1-package.patch 
	libvmime07-0.7.1-qp-starts-on-second-line.patch 
	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch 
	libvmime07-0.7.1-quoted-printable-specials.patch 
	libvmime07-0.7.1-remove-bcc.patch 
	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch 
	libvmime07-0.7.1-socket-tcp-nodelay.patch 
	libvmime07-0.7.1-strip-header-endspaces.patch 
	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch 
	libvmime07-0.7.1-timezone-name.patch 
	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch 
	libvmime07.spec 
Log Message:
Initial import of libvmime 0.7.1 as libvmime07


libvmime07-0.7.1-allow-no-recips-and-senders.patch:
 messageBuilder.cpp |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE libvmime07-0.7.1-allow-no-recips-and-senders.patch ---
Patch by Zarafa <http://www.zarafa.com/> - makes the messageBuilder helper generate an mail without To or
Cc headers. This way, an email with only Bcc entries will still be sent. This feature is mostly used by
people to mask a mailing list or invitation that should be send to alot of people.

--- libvmime-0.7.1/src/messageBuilder.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/messageBuilder.cpp.allow-no-recips-and-senders	2006-01-13 09:49:51.000000000 +0100
@@ -50,14 +50,11 @@
 	// Generate the header fields
 	msg->getHeader()->Subject().setValue(m_subject);
 
-	if (m_from.isEmpty())
-		throw exceptions::no_expeditor();
-
-	if (m_to.isEmpty() || m_to.getAddressAt(0)->isEmpty())
-		throw exceptions::no_recipient();
-
-	msg->getHeader()->From().setValue(m_from);
-	msg->getHeader()->To().setValue(m_to);
+	if (!m_from.isEmpty())
+		msg->getHeader()->From().setValue(m_from);
+		
+	if (!m_to.isEmpty())
+		msg->getHeader()->To().setValue(m_to);
 
 	if (!m_cc.isEmpty())
 		msg->getHeader()->Cc().setValue(m_cc);

libvmime07-0.7.1-attachfnamelen.patch:
 defaultParameter.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-attachfnamelen.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes parsing of an attachment filename that is between 66 and
76 characters long.

--- libvmime-0.7.1/src/defaultParameter.cpp				2005-06-21 19:06:35.000000000 +0200
+++ libvmime-0.7.1/src/defaultParameter.cpp.attachfnamelen		2006-08-01 10:42:18.277853120 +0200
@@ -200,7 +200,8 @@
 	bool needQuoting = false;
 	string::size_type valueLength = 0;
 
-	for (string::size_type i = 0 ; (i < value.length()) && (pos + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
+	// Use worst-case length name.length()+2 for 'name=' part of line
+	for (string::size_type i = 0 ; (i < value.length()) && (pos + name.length() + 2 + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
 	{
 		switch (value[i])
 		{

libvmime07-0.7.1-bmoted-printable.patch:
 encoderFactory.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-bmoted-printable.patch ---
Patch by Zarafa <http://www.zarafa.com/> - we've seen broken mails with an invalid encoding. Unsure what
'bmoted-printable' actually is, we make vmime treat it as normal 'quoted-printable'. 

--- libvmime-0.7.1/src/encoderFactory.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderFactory.cpp.bmoted-printable		2006-04-05 10:35:25.618215000 +0200
@@ -37,6 +37,7 @@
 	// Register some default encoders
 	registerName <encoderB64>("base64");
 	registerName <encoderQP>("quoted-printable");
+	registerName <encoderQP>("bmoted-printable");
 	registerName <encoderUUE>("uuencode");
 	registerName <encoder7bit>("7bit");
 	registerName <encoder8bit>("8bit");

libvmime07-0.7.1-broken-locale-error.patch:
 posixHandler.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-broken-locale-error.patch ---
Patch by Zarafa <http://www.zarafa.com/> - on Debian machines, you need to configure the locales
(languages) that will be used on the system. When you use a locale (eg. 'LC_MESSAGES=nl_NL', but did not
configure your distribution to have this locale present on your system, a NULL pointer would have thrown
an exception in the std::string class. This makes sure that exception never happens.

--- libvmime-0.7.1/src/platforms/posix/posixHandler.cpp			2005-04-30 09:53:21.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixHandler.cpp.broken-locale	2006-12-28 17:29:43.883410000 +0100
@@ -106,9 +106,9 @@
 
 const vmime::charset posixHandler::getLocaleCharset() const
 {
-	vmime::string prevLocale(::setlocale(LC_ALL, ""));
+	char *prevLocale = ::setlocale(LC_ALL, "");
 	vmime::charset ch(::nl_langinfo(CODESET));
-	::setlocale(LC_ALL, prevLocale.c_str());
+	::setlocale(LC_ALL, prevLocale);
 
 	return (ch);
 }

libvmime07-0.7.1-charset-catch.patch:
 word.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-catch.patch ---
Patch by Zarafa <http://www.zarafa.com/> - early catches an exception of vmime when iconv was unable to
convert a word from or to the requested charsets. This makes broken mails with invalid characters for a
valid charset still be able to deliver. We'd rather have an email with a ? sign than a FallbackDelivery
for the user. 

--- libvmime-0.7.1/src/word.cpp						2005-06-13 12:56:52.000000000 +0200
+++ libvmime-0.7.1/src/word.cpp.charset-catch				2005-11-15 18:02:45.000000000 +0100
@@ -688,7 +688,13 @@
 {
 	string out;
 
+	try {
 	charset::convert(m_buffer, out, m_charset, dest);
+	}
+	catch (vmime::exception &e) {
+		// copy 'word' as text
+		out = m_buffer;
+	}
 
 	return (out);
 }

libvmime07-0.7.1-charset-output-buffer-full.patch:
 charset.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-output-buffer-full.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes iconv conversion with source buffers > 64Kb not to add a
'?' and skip one byte of the input buffer.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.charset-output-buffer-full		2008-07-07 13:51:33.414160106 +0200
@@ -206,10 +206,12 @@
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);
 
 				// Ignore this "blocking" character and continue
+				if (outBytesLeft > 0) {
 				out += '?';
 				++inBuffer;
 				--inBytesLeft;
 			}
+			}
 			else
 			{
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);

libvmime07-0.7.1-contentid-without-at.patch:
 messageId.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-contentid-without-at.patch ---
Patch by Zarafa <http://www.zarafa.com/> - enables re-generation of broken content-id's that had no @ sign
in them.

--- libvmime-0.7.1/src/messageId.cpp					2005-03-27 14:59:12.000000000 +0200
+++ libvmime-0.7.1/src/messageId.cpp.contentid-without-at		2007-07-31 14:14:38.827718500 +0200
@@ -102,7 +102,7 @@
 		// Extract left part
 		const string::size_type leftStart = position + (p - pstart);
 
-		while (p < pend && *p != '@') ++p;
+		while (p < pend && *p != '@' && *p != '>') ++p;
 
 		m_left = string(buffer.begin() + leftStart,
 		                buffer.begin() + position + (p - pstart));
@@ -162,6 +162,8 @@
 
 const string messageId::getId() const
 {
+	if (m_right == "")
+		return m_left;
 	return (m_left + '@' + m_right);
 }
 
@@ -177,7 +179,10 @@
 		pos = NEW_LINE_SEQUENCE_LENGTH;
 	}
 
-	os << '<' << m_left << '@' << m_right << '>';
+	os << '<' << m_left;
+	if (m_right != "")
+		os << '@' << m_right;
+	os << '>';
 
 	if (newLinePos)
 		*newLinePos = pos + m_left.length() + m_right.length() + 3;

libvmime07-0.7.1-default-transfer-encoding.patch:
 body.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE libvmime07-0.7.1-default-transfer-encoding.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some broken generators may set the Content-Transfer-Encoding
header, but did not set any value. We'll assume the default value '7bit'.

--- libvmime-0.7.1/src/body.cpp						2007-01-26 14:44:10.259563000 +0100
+++ libvmime-0.7.1/src/body.cpp.default-transfer-encoding		2007-07-13 12:14:30.699846500 +0200
@@ -465,6 +465,9 @@
 		const contentEncodingField& cef = dynamic_cast<contentEncodingField&>
 			(*m_header->findField(fields::CONTENT_TRANSFER_ENCODING));
 
+		if (cef.getValue().getName().empty())
+			return (vmime::encoding(encodingTypes::SEVEN_BIT));
+
 		return (cef.getValue());
 	}
 	catch (exceptions::no_such_field&)

libvmime07-0.7.1-double-empty-boundary.patch:
 body.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-double-empty-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email contains the same boundary to announce a new body
part directly one after another, vmime would have crashed because the body part added to the object with
size of (size_type)(-1). Thus having a body part of 4294967294 bytes on 32bit and 18446744073709551615
bytes on 64 bit systems.

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.double-empty-boundary			2007-11-01 16:45:20.688580500 +0100
@@ -173,7 +173,7 @@
 				++pos;
 			}
 
-			if (index > 0)
+			if (index > 0 && partStart < partEnd)
 			{
 				bodyPart* part = new bodyPart;
 

libvmime07-0.7.1-gcc-4.3-support.patch:
 src/messaging/imap/IMAPMessage.cpp  |    2 +-
 src/platforms/posix/posixSocket.cpp |    1 +
 src/utility/md5.cpp                 |    2 +-
 vmime/utility/filteredStream.hpp    |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-gcc-4.3-support.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds required include headers to compile with g++-4.3 and up.

--- libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp			2005-05-27 21:31:44.000000000 +0200
+++ libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -26,7 +26,7 @@
 
 #include <sstream>
 #include <iterator>
-
+#include <typeinfo>
 
 namespace vmime {
 namespace messaging {
--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.gcc-4.3-support	2008-07-07 15:42:16.700025085 +0200
@@ -19,6 +19,7 @@
 
 #include "vmime/platforms/posix/posixSocket.hpp"
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
--- libvmime-0.7.1/src/utility/md5.cpp					2005-03-18 22:26:48.000000000 +0100
+++ libvmime-0.7.1/src/utility/md5.cpp.gcc-4.3-support			2008-07-07 15:41:38.034166062 +0200
@@ -45,7 +45,7 @@
 //     documentation and/or software.
 
 #include "vmime/utility/md5.hpp"
-
+#include <string.h>
 
 namespace vmime {
 namespace utility {
--- libvmime-0.7.1/vmime/utility/filteredStream.hpp			2005-06-16 21:19:12.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/filteredStream.hpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -22,7 +22,7 @@
 
 
 #include "vmime/utility/stream.hpp"
-
+#include <algorithm>
 
 namespace vmime {
 namespace utility {

libvmime07-0.7.1-gcc-4.4-support.patch:
 posixFile.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-gcc-4.4-support.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1, which adds a missing include file
in order to build successfully with GCC 4.4 and newer.

--- libvmime-0.7.1/src/platforms/posix/posixFile.cpp			2005-04-09 10:42:46.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixFile.cpp.gcc-4.4-support	2009-03-29 21:09:07.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include <dirent.h>
 
+#include <stdio.h>
 #include <string.h>
 
 #include "vmime/exception.hpp"

libvmime07-0.7.1-header-value-on-next-line.patch:
 headerField.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-header-value-on-next-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email header has the data part on the second line,
vmime was unable to parse this data and skip adds the header as empty to it's internal structures. This
makes sure these headers are still correctly parsed.

--- libvmime-0.7.1/src/headerField.cpp					2007-01-26 14:44:10.315567250 +0100
+++ libvmime-0.7.1/src/headerField.cpp.header-value-on-next-line	2007-02-07 13:35:35.177077750 +0100
@@ -147,14 +147,12 @@
 					{
 						contentsEnd = pos;
 						pos += 2;
-						break;
 					}
 					else if (c == '\n')
 					{
 						contentsEnd = pos;
 						++pos;
-						break;
-					}
+					} else {
 
 					while (pos < end)
 					{
@@ -176,6 +174,7 @@
 
 						++pos;
 					}
+					}
 
 					// Handle the case of folded lines
 					if (buffer[pos] == ' ' || buffer[pos] == '\t')

libvmime07-0.7.1-mdn-disposition.patch:
 MDNHelper.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-mdn-disposition.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes a small but crucial typo in a header of an MDN (read
receipt) mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2005-04-09 21:45:07.000000000 +0200
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-disposition		2006-11-28 09:37:56.009129500 +0100
@@ -143,7 +143,7 @@
 
 	hdr->ContentType().setValue(mediaType(vmime::mediaTypes::MULTIPART,
 	                                      vmime::mediaTypes::MULTIPART_REPORT));
-	hdr->ContentType().setReportType("disosition-notification");
+	hdr->ContentType().setReportType("disposition-notification");
 
 	hdr->Disposition().setValue(dispo);
 

libvmime07-0.7.1-mdn-final-recipient.patch:
 MDNHelper.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-mdn-final-recipient.patch ---
Patch by Zarafa <http://www.zarafa.com/> - a header with the final recipient information was created, but
not added to the MDN email. This patch adds this information to the mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2006-11-28 09:43:47.995127250 +0100
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-final-recipient		2006-11-28 09:43:27.505846750 +0100
@@ -246,6 +246,7 @@
 		(headerFieldFactory::getInstance()->create(vmime::fields::FINAL_RECIPIENT));
 
 	fr->setValue("rfc822; " + mdnInfos.getRecipient().getEmail());
+	fields.appendField(fr);
 
 	// -- Original-Message-ID
 	if (mdnInfos.getMessage()->getHeader()->hasField(vmime::fields::MESSAGE_ID))

libvmime07-0.7.1-missing-boundary.patch:
 body.cpp |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE libvmime07-0.7.1-missing-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - broken emails without a final boundary will still be able to
deliver with all attachments. The final part without the boundary will be treated as an attachment. 

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.missing-boundary			2006-01-12 15:45:48.443911888 +0100
@@ -200,6 +200,27 @@
 
 		if (partStart < end)
 			m_epilogText = string(buffer.begin() + partStart, buffer.begin() + end);
+
+		// lastPart was not found, so the last boundary was missing
+		// m_epilogText will become a bodyPart
+		if (!lastPart && pos == string::npos) {
+			bodyPart* part = new bodyPart;
+
+			try
+			{
+				part->parse(m_epilogText);
+			}
+			catch (std::exception&)
+			{
+				delete (part);
+				throw;
+			}
+
+			part->m_parent = m_part;
+
+			m_parts.push_back(part);
+		}
+			
 	}
 	// Treat the contents as 'simple' data
 	else

libvmime07-0.7.1-oe-compatibility.patch:
 defaultParameter.cpp |   66 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

--- NEW FILE libvmime07-0.7.1-oe-compatibility.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes attachment names in Outlook Express which are long and
have high characters.

--- libvmime-0.7.1/src/defaultParameter.cpp				2007-01-26 14:44:10.243562750 +0100
+++ libvmime-0.7.1/src/defaultParameter.cpp.vmime-oe-compatibility	2007-04-24 13:43:36.579203500 +0200
@@ -186,18 +186,18 @@
 {
 	const string& name = getName();
 	const string& value = m_value.getBuffer();
+	string tmpbuf;
+	utility::outputStreamStringAdapter tmpos(tmpbuf);
 
 	// For compatibility with implementations that do not understand RFC-2231,
 	// also generate a normal "7bit/us-ascii" parameter
 	string::size_type pos = curLinePos;
 
-	if (pos + name.length() + 10 + value.length() > maxLineLength)
-	{
-		os << NEW_LINE_SEQUENCE;
+		tmpos << NEW_LINE_SEQUENCE;
 		pos = NEW_LINE_SEQUENCE_LENGTH;
-	}
 
 	bool needQuoting = false;
+	bool needQuotedPrintable = false;
 	string::size_type valueLength = 0;
 
 	// Use worst-case length name.length()+2 for 'name=' part of line
@@ -228,35 +228,50 @@
 			needQuoting = true;
 			break;
 		}
+		if (!parserHelpers::isAscii(value[i]))
+		{
+			needQuotedPrintable = true;
+			needQuoting = true;
+		}
 	}
 
 	const bool cutValue = (valueLength != value.length());  // has the value been cut?
 
 	if (needQuoting)
 	{
-		os << name << "=\"";
+		tmpos << name << "=\"";
 		pos += name.length() + 2;
 	}
 	else
 	{
-		os << name << "=";
+		tmpos << name << "=";
 		pos += name.length() + 1;
 	}
 
 	bool extended = false;
-
-	for (string::size_type i = 0 ; (i < value.length()) && (pos < maxLineLength - 4) ; ++i)
+	if (needQuotedPrintable)
+	{
+		// send the name in quoted-printable, so outlook express et.al. will understand the real filename
+		size_t oldlen = tmpbuf.length();
+		m_value.generate(tmpos);
+		pos += tmpbuf.length() - oldlen;
+		extended = true;		// also send with RFC-2231 encoding
+	}
+	else
+	{
+	// do not chop off this value, but just add the complete name as one header line.
+	for (string::size_type i = 0 ; (i < value.length()) /*&& (pos < maxLineLength - 4) */ ; ++i)
 	{
 		const char_t c = value[i];
 
 		if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
 		{
-			os << '\\' << value[i];  // escape 'x' with '\x'
+			tmpos << '\\' << value[i];  // escape 'x' with '\x'
 			pos += 2;
 		}
 		else if (parserHelpers::isAscii(c))
 		{
-			os << value[i];
+			tmpos << value[i];
 			++pos;
 		}
 		else
@@ -264,10 +279,11 @@
 			extended = true;
 		}
 	}
+	}
 
 	if (needQuoting)
 	{
-		os << '"';
+		tmpos << '"';
 		++pos;
 	}
 
@@ -275,7 +291,7 @@
 	// or is too long for a single line
 	if (extended || cutValue)
 	{
-		os << ';';
+		tmpos << ';';
 		++pos;
 
 		/* RFC-2231
@@ -301,11 +317,8 @@
 			  name.length() + 4 /* *0*= */ + 2 /* '' */
 			+ m_value.getCharset().getName().length();
 
-		if (pos + firstSectionLength + 5 >= maxLineLength)
-		{
-			os << NEW_LINE_SEQUENCE;
+			tmpos << NEW_LINE_SEQUENCE;
 			pos = NEW_LINE_SEQUENCE_LENGTH;
-		}
 
 		// Split text into multiple sections that fit on one line
 		int sectionCount = 0;
@@ -384,33 +397,36 @@
 		// Output sections
 		for (int sectionNumber = 0 ; sectionNumber < sectionCount ; ++sectionNumber)
 		{
-			os << name;
+			tmpos << name;
 
 			if (sectionCount != 1) // no section specifier when only a single one
 			{
-				os << '*';
-				os << sectionNumber;
+				tmpos << '*';
+				tmpos << sectionNumber;
 			}
 
-			os << "*=";
+			tmpos << "*=";
 
 			if (sectionNumber == 0)
 			{
-				os << m_value.getCharset().getName();
-				os << '\'' << /* No language */ '\'';
+				tmpos << m_value.getCharset().getName();
+				tmpos << '\'' << /* No language */ '\'';
 			}
 
-			os << sectionText[sectionNumber];
+			tmpos << sectionText[sectionNumber];
 
 			if (sectionNumber + 1 < sectionCount)
 			{
-				os << ';';
-				os << NEW_LINE_SEQUENCE;
+				tmpos << ';';
+				tmpos << NEW_LINE_SEQUENCE;
 				pos = NEW_LINE_SEQUENCE_LENGTH;
 			}
 		}
 	}
 
+	// write the complete header
+	os << tmpbuf;
+
 	if (newLinePos)
 		*newLinePos = pos;
 }

libvmime07-0.7.1-out-of-bounds-copy.patch:
 filteredStream.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-out-of-bounds-copy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when a line in a plain text mail starts with a '.', the
character needs to be escaped. VMime has a special filter for this, but due to a bug in this filter, a
second line starting with a '.' would trigger a wrong buffer copy, and your email would contain double
parts.

--- libvmime-0.7.1/src/utility/filteredStream.cpp			2005-06-16 21:50:12.000000000 +0200
+++ libvmime-0.7.1/src/utility/filteredStream.cpp.out-of-bounds-copy	2007-06-15 14:29:40.907779750 +0200
@@ -146,7 +146,7 @@
 
 		if (previousChar == '\n')
 		{
-			m_stream.write(start, pos - data);
+			m_stream.write(start, pos - start);
 			m_stream.write("..", 2);
 
 			start = pos + 1;

libvmime07-0.7.1-package.patch:
 configure.in    |    2 +-
 src/Makefile.am |   22 +++++++++++-----------
 vmime.pc.in     |    6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE libvmime07-0.7.1-package.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1 to get libvmime renamed to
libvmime07 to avoid any conflicts with current libvmime series. Note that libvmime 0.7.x, 0.8.x and
0.9.x are unfortunately completely API and ABI incompatible to eachother.

--- libvmime-0.7.1/src/Makefile.am					2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/src/Makefile.am.package				2009-04-05 17:36:46.000000000 +0200
@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 INTERNALS =
 INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
-lib_LTLIBRARIES = libvmime.la
-libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
-libvmime_la_SOURCES = address.cpp \
+lib_LTLIBRARIES = libvmime07.la
+libvmime07_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
+libvmime07_la_SOURCES = address.cpp \
 	addressList.cpp \
 	base.cpp \
 	body.cpp \
@@ -82,7 +82,7 @@
 	misc_importanceHelper.cpp
 
 if VMIME_HAVE_MESSAGING_FEATURES
-libvmime_la_SOURCES += messaging_authenticator.cpp \
+libvmime07_la_SOURCES += messaging_authenticator.cpp \
 	messaging_authenticationInfos.cpp \
 	messaging_authHelper.cpp \
 	messaging_builtinServices.inl \
@@ -99,17 +99,17 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-libvmime_la_SOURCES += messaging_pop3_POP3Store.cpp \
+libvmime07_la_SOURCES += messaging_pop3_POP3Store.cpp \
 	messaging_pop3_POP3Folder.cpp \
 	messaging_pop3_POP3Message.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-libvmime_la_SOURCES += messaging_smtp_SMTPTransport.cpp
+libvmime07_la_SOURCES += messaging_smtp_SMTPTransport.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-libvmime_la_SOURCES += messaging_imap_IMAPConnection.cpp \
+libvmime07_la_SOURCES += messaging_imap_IMAPConnection.cpp \
 	messaging_imap_IMAPStore.cpp \
 	messaging_imap_IMAPFolder.cpp \
 	messaging_imap_IMAPMessage.cpp \
@@ -118,24 +118,24 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-libvmime_la_SOURCES += messaging_maildir_maildirStore.cpp \
+libvmime07_la_SOURCES += messaging_maildir_maildirStore.cpp \
 	messaging_maildir_maildirFolder.cpp \
 	messaging_maildir_maildirMessage.cpp \
 	messaging_maildir_maildirUtils.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SENDMAIL
-libvmime_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
+libvmime07_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_WINDOWS
-libvmime_la_SOURCES += platforms_windows_windowsFile.cpp \
+libvmime07_la_SOURCES += platforms_windows_windowsFile.cpp \
 	platforms_windows_windowsHandler.cpp \
 	platforms_windows_windowsSocket.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_POSIX
-libvmime_la_SOURCES += platforms_posix_posixChildProcess.cpp \
+libvmime07_la_SOURCES += platforms_posix_posixChildProcess.cpp \
 	platforms_posix_posixFile.cpp \
 	platforms_posix_posixHandler.cpp \
 	platforms_posix_posixSocket.cpp
--- libvmime-0.7.1/configure.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/configure.in.package					2009-04-06 20:42:53.000000000 +0200
@@ -18,7 +18,7 @@
 GENERIC_VERSIONED_LIBRARY_NAME="vmime"
 AC_SUBST(GENERIC_VERSIONED_LIBRARY_NAME)
 
-LIBRARY_NAME="libvmime"
+LIBRARY_NAME="libvmime07"
 AC_SUBST(LIBRARY_NAME)
 
 # Library version
--- libvmime-0.7.1/vmime.pc.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/vmime.pc.in.package					2009-04-06 20:46:07.000000000 +0200
@@ -6,9 +6,9 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @GENERIC_LIBRARY_NAME@
+Name: vmime07
 Description: VMime C++ Mail Library (http://vmime.sourceforge.net)
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -l at GENERIC_VERSIONED_LIBRARY_NAME@
-Cflags: -I${includedir}/
+Libs: -L${libdir} -lvmime07
+Cflags: -I${includedir}/libvmime07/

libvmime07-0.7.1-qp-starts-on-second-line.patch:
 word.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-qp-starts-on-second-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - headers can be broken over multiple lines in an email. When
the wrapped line directly started with quoted-printable, vmime copied this text as normal text, instead
of parsing it as quoted-printable. 

--- libvmime-0.7.1/src/word.cpp						2007-01-26 14:44:10.251563000 +0100
+++ libvmime-0.7.1/src/word.cpp.qp-starts-on-second-line		2007-01-26 14:45:01.074739500 +0100
@@ -91,6 +91,7 @@
 			unencoded += ' ';
 
 			startPos = pos;
+			continue;
 		}
 		// Start of an encoded word
 		else if (pos + 8 < end &&  // 8 = "=?(.+)?(.+)?(.*)?="

libvmime07-0.7.1-quoted-printable-encode-questionmark.patch:
 encoderQP.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-quoted-printable-encode-questionmark.patch ---
Patch by Zarafa <http://www.zarafa.com/> - special characters break the quoted-printable encoding when
they are typed after a ?. This fix also encodes ?-characters, so we can't break the encoding with this
trick.

--- libvmime-0.7.1/src/encoderQP.cpp					2008-03-10 13:57:05.055163691 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-encode-question	2008-03-10 13:51:53.071163435 +0100
@@ -249,7 +249,7 @@
 		default:
 		{
 			//if ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))
-			if (c >= 33 && c <= 126 && c != 61)
+			if (c >= 33 && c <= 126 && c != 61 && c!= 63)
 			{
 				outBuffer[outBufferPos++] = c;
 				++curCol;

libvmime07-0.7.1-quoted-printable-specials.patch:
 encoderQP.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-quoted-printable-specials.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch adds some characters that should be "escaped" in
quoted-printable. With this fix you can have these characters in a fullname of an email address.

--- libvmime-0.7.1/src/encoderQP.cpp					2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-specials		2007-02-02 10:09:26.273653250 +0100
@@ -214,10 +214,18 @@
 			QP_ENCODE_HEX('=')
 			break;
 		}
+		// http://www.faqs.org/rfcs/rfc2047.html, see 'especials' characters
 		case ',':
 		case ';':
 		case ':':
 		case '_':
+		case '@':
+		case '(':
+		case ')':
+		case '<':
+		case '>':
+		case '[':
+		case ']':
 		{
 			if (rfc2047)
 			{

libvmime07-0.7.1-remove-bcc.patch:
 transport.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-remove-bcc.patch ---
Patch by Zarafa <http://www.zarafa.com/> - Bcc headers should not be send to the SMTP server. Some SMTP
servers automatically strip this header (Postfix, qmail), and others have an option for this (Exim).

--- libvmime-0.7.1/src/messaging/transport.cpp				2005-04-27 18:42:58.000000000 +0200
+++ libvmime-0.7.1/src/messaging/transport.cpp.remove-bcc		2006-10-10 14:01:43.602621328 +0200
@@ -90,6 +90,14 @@
 	}
 	catch (exceptions::no_such_field&) { }
 
+	// Remove BCC headers from the message we're about to send
+	try {
+		headerField* bcc = msg->getHeader()->findField(fields::BCC);
+
+		msg->getHeader()->removeField(bcc);
+	}
+	catch (exceptions::no_such_field&) { }
+
 	// Generate the message, "stream" it and delegate the sending
 	// to the generic send() function.
 	std::ostringstream oss;

libvmime07-0.7.1-socket-backport-and-timeout-fix.patch:
 src/platforms/posix/posixSocket.cpp   |  102 +++++++++++++++++++++++++++-------
 vmime/platforms/posix/posixSocket.hpp |    3 +
 2 files changed, 85 insertions(+), 20 deletions(-)

--- NEW FILE libvmime07-0.7.1-socket-backport-and-timeout-fix.patch ---
Patch by Zarafa <http://www.zarafa.com/> - small partial backport of some socket handling code from 0.8.1.
Only receiving data is handled better. The patch also adds a timeout, when receiving data from a socket
hasn't worked for 5 minutes. This isn't present in 0.8.1.

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-timeout	2007-10-18 11:02:54.000000000 +0200
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "vmime/exception.hpp"
 
@@ -43,7 +44,7 @@
 //
 
 posixSocket::posixSocket()
-	: m_desc(-1)
+	: m_desc(-1), m_timeouts(0)
 {
 }
 
@@ -101,6 +102,8 @@
 		// Error
 		throw vmime::exceptions::connection_error("Error while connecting socket.");
 	}
+
+	m_timeouts = 0;
 }
 
 
@@ -121,38 +124,62 @@
 	}
 }
 
-
 void posixSocket::receive(vmime::string& buffer)
 {
-	::ssize_t ret = ::recv(m_desc, m_buffer, sizeof(m_buffer), 0);
-
-	if (ret == -1)
-	{
-		// Error or no data
-		return;
-	}
-	else if (ret > 0)
-	{
-		buffer = vmime::string(m_buffer, ret);
-	}
+	const int size = receiveRaw(m_buffer, sizeof(m_buffer));
+	buffer = vmime::string(m_buffer, size);
 }
 
 
 const int posixSocket::receiveRaw(char* buffer, const int count)
 {
-	::ssize_t ret = ::recv(m_desc, buffer, count, 0);
+	fd_set fds;
+	struct timeval tv;
+	int ret;
+
+	FD_ZERO(&fds);
+	FD_SET(m_desc, &fds);
+
+	tv.tv_sec = 10;
+	tv.tv_usec = 0;
+
+	ret = ::select(m_desc+1, &fds, NULL, NULL, &tv);
+	if (ret < 0)
+	{
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
+	}
 
-	if (ret == -1)
+	ret = ::recv(m_desc, buffer, count, 0);
+
+	if (ret < 0)
 	{
-		// Error or no data
-		return (0);
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
 	}
-	else
+	else if (ret == 0)
 	{
-		return (ret);
+		// Host shutdown
+		throwSocketError(ENOTCONN);
 	}
-}
 
+	m_timeouts = 0;
+	return ret;
+}
 
 void posixSocket::send(const vmime::string& buffer)
 {
@@ -166,6 +193,41 @@
 }
 
 
+void posixSocket::throwSocketError(const int err)
+{
+	string msg;
+
+	switch (err)
+	{
+	case EACCES:          msg = "EACCES: permission denied"; break;
+	case EAFNOSUPPORT:    msg = "EAFNOSUPPORT: address family not supported"; break;
+	case EMFILE:          msg = "EMFILE: process file table overflow"; break;
+	case ENFILE:          msg = "ENFILE: system limit reached"; break;
+	case EPROTONOSUPPORT: msg = "EPROTONOSUPPORT: protocol not supported"; break;
+	case EAGAIN:          msg = "EAGAIN: blocking operation"; break;
+	case EBADF:           msg = "EBADF: invalid descriptor"; break;
+	case ECONNRESET:      msg = "ECONNRESET: connection reset by peer"; break;
+	case EFAULT:          msg = "EFAULT: bad user space address"; break;
+	case EINTR:           msg = "EINTR: signal occured before transmission"; break;
+	case EINVAL:          msg = "EINVAL: invalid argument"; break;
+	case EMSGSIZE:        msg = "EMSGSIZE: message cannot be sent atomically"; break;
+	case ENOBUFS:         msg = "ENOBUFS: output queue is full"; break;
+	case ENOMEM:          msg = "ENOMEM: out of memory"; break;
+	case EPIPE:
+	case ENOTCONN:        msg = "ENOTCONN: not connected"; break;
+	case ECONNREFUSED:    msg = "ECONNREFUSED: connection refused"; break;
+	default:
+
+		std::ostringstream oss;
+		oss << ::strerror(err);
+
+		msg = oss.str();
+		break;
+	}
+
+	throw vmime::exceptions::connection_error(msg);
+}
+
 
 
 //
--- libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp		2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp.socket-timeout	2007-10-18 10:34:46.000000000 +0200
@@ -49,10 +49,13 @@
 	void send(const vmime::string& buffer);
 	void sendRaw(const char* buffer, const int count);
 
+	void throwSocketError(const int err);
+
 private:
 
 	char m_buffer[65536];
 	int m_desc;
+	int m_timeouts;
 };
 
 

libvmime07-0.7.1-socket-tcp-nodelay.patch:
 posixSocket.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE libvmime07-0.7.1-socket-tcp-nodelay.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds the TCP_NODELAY flag to vmime sockets. This should mak
the SMTP connection faster

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-tcp	2009-03-27 10:51:06.405594549 +0100
@@ -25,6 +25,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -59,6 +60,8 @@
 
 void posixSocket::connect(const vmime::string& address, const vmime::port_t port)
 {
+	int flag = 1;
+
 	// Close current connection, if any
 	if (m_desc != -1)
 	{
@@ -94,6 +97,8 @@
 	if (m_desc == -1)
 		throw vmime::exceptions::connection_error("Error while creating socket.");
 
+	::setsockopt(m_desc, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
+
 	// Start connection
 	if (::connect(m_desc, reinterpret_cast <sockaddr*>(&addr), sizeof(addr)) == -1)
 	{

libvmime07-0.7.1-strip-header-endspaces.patch:
 headerField.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-strip-header-endspaces.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch makes sure that vmime does not parse trailing spaces
on an header. Otherwise vmime will throw an exception and a fallback delivery will be started.

--- libvmime-0.7.1/src/headerField.cpp					2007-07-31 12:54:21.898679250 +0200
+++ libvmime-0.7.1/src/headerField.cpp.strip-header-endspaces		2007-07-31 12:43:08.408588750 +0200
@@ -189,6 +189,14 @@
 					}
 				}
 
+				// strip spaces from end of header lines, also through continuation headers
+				contentsEnd--;	// original enter
+				while (contentsEnd>contentsStart &&
+					   (buffer[contentsEnd] == ' ' || buffer[contentsEnd] == '\t' ||
+						buffer[contentsEnd] == '\r' || buffer[contentsEnd] == '\n'))
+					contentsEnd--;
+				contentsEnd++;	// new 'enter'
+
 				// Return a new field
 				headerField* field = headerFieldFactory::getInstance()->create(name);
 

libvmime07-0.7.1-threading-remove-static_non-abi-change.patch:
 smartPtr.hpp |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE libvmime07-0.7.1-threading-remove-static_non-abi-change.patch ---
Patch by Zarafa <http://www.zarafa.com/> - workaround a static variable in the smart_ptr class using a
pthread mutex, which fixes multi-threading issues in libvmime.

--- libvmime-0.7.1/vmime/utility/smartPtr.hpp				2005-05-19 19:17:17.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/smartPtr.hpp.threading-remove-static	2009-05-13 15:21:53.276875219 +0200
@@ -20,6 +20,9 @@
 #ifndef VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 #define VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 
+// non-portable, but at least not an abi change
+#include <pthread.h>
+static pthread_mutex_t mapLock = PTHREAD_MUTEX_INITIALIZER;
 
 namespace vmime {
 namespace utility {
@@ -108,8 +111,10 @@
 		{
 			if (m_data->refCount == 1)
 			{
+				pthread_mutex_lock(&mapLock);
 				typename MapType::iterator it = sm_map.find(m_data->ptr);
 				if (it != sm_map.end()) sm_map.erase(it);
+				pthread_mutex_unlock(&mapLock);
 
 				delete (m_data->ptr);
 				delete (m_data);
@@ -127,6 +132,8 @@
 	{
 		detach();
 
+		pthread_mutex_lock(&mapLock);
+
 		typename MapType::iterator it = sm_map.find(p);
 
 		if (it != sm_map.end())
@@ -141,6 +148,8 @@
 
 			sm_map.insert(typename MapType::value_type(p, m_data));
 		}
+
+		pthread_mutex_unlock(&mapLock);
 	}
 
 	void attach(const smart_ptr <T>& p)

libvmime07-0.7.1-timezone-name.patch:
 dateTime.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-timezone-name.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes dates in headers which use a timezone definition, instead
of a numeric timezone offset.

--- libvmime-0.7.1/src/dateTime.cpp					2005-04-23 11:02:48.000000000 +0200
+++ libvmime-0.7.1/src/dateTime.cpp.timezone-name			2009-01-08 10:51:39.000000000 +0100
@@ -423,7 +423,7 @@
 				zone[zoneLength++] = *p;
 				++p;
 			}
-			while (zoneLength < 3 && p < pend && parserHelpers::isDigit(*p));
+			while (zoneLength < 3 && p < pend);
 
 			switch (zone[0])
 			{
@@ -487,6 +487,8 @@
 
 				break;
 			}
+			case 'g':
+			case 'G':
 			case 'u':
 			case 'U':
 			{

libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch:
 charset.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some mails have a special definition of the utf-7 character
set, named unicode-1-1-utf-7. Since this name is not defined by iconv, we rename it to utf-7. This name
seems to come from RFC 1642 <http://www.faqs.org/rfcs/rfc1642.html>.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.unicode-1-1-utf-7-charset		2007-04-23 17:08:46.714435000 +0200
@@ -64,6 +64,9 @@
 charset::charset(const string& name)
 	: m_name(name)
 {
+	// if we receive this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
 }
 
 
@@ -72,6 +75,10 @@
 {
 	m_name = string(buffer.begin() + position, buffer.begin() + end);
 
+	// if we parsed this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
+
 	setParsedBounds(position, end);
 
 	if (newPosition)


--- NEW FILE libvmime07.spec ---
Summary:	A powerful C++ class library for working with MIME/Internet messages
Name:		libvmime07
Version:	0.7.1
Release:	1%{?dist}
License:	GPLv2+
Group:		System Environment/Libraries
URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
Source0:	http://developer.zarafa.com/download/libvmime-%{version}.tar.bz2
Patch0:		libvmime07-0.7.1-charset-catch.patch
Patch1:		libvmime07-0.7.1-missing-boundary.patch
Patch2:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
Patch3:		libvmime07-0.7.1-bmoted-printable.patch
Patch4:		libvmime07-0.7.1-strip-header-endspaces.patch
Patch5:		libvmime07-0.7.1-attachfnamelen.patch
Patch6:		libvmime07-0.7.1-remove-bcc.patch
Patch7:		libvmime07-0.7.1-mdn-disposition.patch
Patch8:		libvmime07-0.7.1-mdn-final-recipient.patch
Patch9:		libvmime07-0.7.1-broken-locale-error.patch
Patch10:	libvmime07-0.7.1-qp-starts-on-second-line.patch
Patch11:	libvmime07-0.7.1-quoted-printable-specials.patch
Patch12:	libvmime07-0.7.1-header-value-on-next-line.patch
Patch13:	libvmime07-0.7.1-oe-compatibility.patch
Patch14:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
Patch15:	libvmime07-0.7.1-out-of-bounds-copy.patch
Patch16:	libvmime07-0.7.1-default-transfer-encoding.patch
Patch17:	libvmime07-0.7.1-contentid-without-at.patch
Patch18:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
Patch19:	libvmime07-0.7.1-double-empty-boundary.patch
Patch20:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
Patch21:	libvmime07-0.7.1-charset-output-buffer-full.patch
Patch22:	libvmime07-0.7.1-gcc-4.3-support.patch
Patch23:	libvmime07-0.7.1-timezone-name.patch
Patch24:	libvmime07-0.7.1-socket-tcp-nodelay.patch
Patch25:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
Patch26:	libvmime07-0.7.1-gcc-4.4-support.patch
Patch27:	libvmime07-0.7.1-package.patch
BuildRequires:	sendmail, libtool, autoconf, automake
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
VMime is a powerful C++ class library for parsing, generating or
editing Internet RFC-[2]822 and MIME messages. VMime is designed
to provide a fast and an easy way to manipulate Internet mail
messages.

It also includes support for using messaging protocols (POP3, IMAP,
SMTP and maildir) with a lot of features supported: listing folders,
downloading and adding messages to folders, extracting parts from
message, getting and setting message flags and a lot more.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%package devel
Summary:	Development files for the libvmime library
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig

%description devel
The libvmime package includes header files and libraries necessary
for developing programs which use the libvmime C++ class library.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%prep
%setup -q -n libvmime-%{version}
%patch0 -p1 -b .charset-catch
%patch1 -p1 -b .missing-boundary
%patch2 -p1 -b .allow-no-recips-and-senders
%patch3 -p1 -b .bmoted-printable
%patch4 -p1 -b .strip-header-endspaces
%patch5 -p1 -b .attachfnamelen
%patch6 -p1 -b .remove-bcc
%patch7 -p1 -b .mdn-disposition
%patch8 -p1 -b .mdn-final-recipient
%patch9 -p1 -b .broken-locale-error
%patch10 -p1 -b .qp-starts-on-second-line
%patch11 -p1 -b .quoted-printable-specials
%patch12 -p1 -b .header-value-on-next-line
%patch13 -p1 -b .oe-compatibility
%patch14 -p1 -b .unicode-1-1-utf-7-charset
%patch15 -p1 -b .out-of-bounds-copy
%patch16 -p1 -b .default-transfer-encoding
%patch17 -p1 -b .contentid-without-at
%patch18 -p1 -b .socket-backport-and-timeout-fix
%patch19 -p1 -b .double-empty-boundary
%patch20 -p1 -b .quoted-printable-encode-questionmark
%patch21 -p1 -b .charset-output-buffer-full
%patch22 -p1 -b .gcc-4.3-support
%patch23 -p1 -b .timezone-name
%patch24 -p1 -b .socket-tcp-nodelay
%patch25 -p1 -b .threading-remove-static_non-abi-change
%patch26 -p1 -b .gcc-4.4-support
%patch27 -p1 -b .package

# Needed to apply branding patch
libtoolize --force
autoreconf --force --install

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Complete the libvmime07 renaming at some places
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
mv -f $RPM_BUILD_ROOT%{_includedir}/{vmime,%{name}}/
mv -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vmime{,07}.pc 

# Remove the static library and libtool .la file
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}

# Remove the documentation dir, as %doc will pick it up
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/%{name}.so
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/vmime07.pc

%changelog
* Sat Sep 05 2009 Robert Scheck <robert at fedoraproject.org> 0.7.1-1
- Upgrade to 0.7.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:17:43 -0000	1.1
+++ .cvsignore	16 Sep 2009 21:31:07 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:17:43 -0000	1.1
+++ sources	16 Sep 2009 21:31:08 -0000	1.2
@@ -0,0 +1 @@
+81f06a771d2de01d5982635838eb5f6a  libvmime-0.7.1.tar.bz2



From agk at fedoraproject.org  Wed Sep 16 21:33:06 2009
From: agk at fedoraproject.org (agk)
Date: Wed, 16 Sep 2009 21:33:06 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.171,1.172
Message-ID: <20090916213306.262DB11C00CF@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2655

Modified Files:
	lvm2.spec 
Log Message:
First attempt at including dmeventd.



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- lvm2.spec	15 Sep 2009 15:29:24 -0000	1.171
+++ lvm2.spec	16 Sep 2009 21:33:04 -0000	1.172
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.52
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -17,7 +17,6 @@ Source0: ftp://sources.redhat.com/pub/lv
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -26,7 +25,11 @@ BuildRequires: clusterlib-devel >= %{clu
 BuildRequires: module-init-tools
 BuildRequires: pkgconfig
 Requires: device-mapper >= %{device_mapper_version}-%{release}
+Requires: device-mapper-event >= %{device_mapper_version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: module-init-tools
+Requires(post): chkconfig
+Requires(preun): chkconfig
 Conflicts: lvm
 Obsoletes: lvm
 
@@ -48,24 +51,35 @@ or more physical volumes and creating on
 %define _sbindir /sbin
 %define _libdir /%{_lib}
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib
+%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd
+
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/archive
 install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/backup
 install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/cache
 install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm
 install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache
+
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
+install -m 0755 scripts/lvm2_monitoring_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add lvm2-monitor
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/chkconfig --del lvm2-monitor
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
@@ -167,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/lvm/cache
 %dir /etc/lvm/archive
 %dir /var/lock/lvm
+/etc/rc.d/init.d/lvm2-monitor
 
 ##############################################################################
 # Library and Development subpackages
@@ -178,6 +193,7 @@ License: LGPLv2
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: device-mapper-devel >= %{device_mapper_version}-%{release}
+Requires: device-mapper-event-devel >= %{device_mapper_version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -186,8 +202,8 @@ the lvm2 libraries.
 
 %files devel
 %defattr(-,root,root,-)
-%attr(755,root,root) /%{_lib}/liblvm2app.so
-%attr(755,root,root) /%{_lib}/liblvm2cmd.so
+%{_libdir}/liblvm2app.so
+%{_libdir}/liblvm2cmd.so
 %{_includedir}/lvm2app.h
 %{_includedir}/lvm2cmd.h
 /usr%{_libdir}/pkgconfig/lvm2app.pc
@@ -205,8 +221,12 @@ This package contains shared lvm2 librar
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%attr(755,root,root) /%{_lib}/liblvm2app.so.*
-%attr(755,root,root) /%{_lib}/liblvm2cmd.so.*
+%attr(755,root,root) %{_libdir}/liblvm2app.so.*
+%attr(755,root,root) %{_libdir}/liblvm2cmd.so.*
+%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2mirror.so.*
+%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2snapshot.so.*
+%{_libdir}/libdevmapper-event-lvm2mirror.so
+%{_libdir}/libdevmapper-event-lvm2snapshot.so
 
 ##############################################################################
 # Cluster subpackage
@@ -282,7 +302,7 @@ the device-mapper libraries.
 
 %files -n device-mapper-devel
 %defattr(-,root,root,-)
-%attr(755,root,root) /%{_lib}/libdevmapper.so
+%{_libdir}/libdevmapper.so
 %{_includedir}/libdevmapper.h
 /usr%{_libdir}/pkgconfig/devmapper.pc
 
@@ -302,10 +322,67 @@ This package contains the device-mapper 
 %postun -n device-mapper-libs -p /sbin/ldconfig
 
 %files -n device-mapper-libs
-%attr(755,root,root) /%{_lib}/libdevmapper.so.*
+%attr(755,root,root) %{_libdir}/libdevmapper.so.*
+
+%package -n device-mapper-event
+Summary: Device-mapper event daemon
+Group: System Environment/Base
+Requires: device-mapper = %{version}-%{release}
+Requires: device-mapper-event-libs = %{version}-%{release}
+
+%description -n device-mapper-event
+This package contains the dmeventd daemon for monitoring the state
+of device-mapper devices.
+
+%files -n device-mapper-event
+%defattr(-,root,root,-)
+%{_sbindir}/dmeventd
+
+%package -n device-mapper-event-libs
+Summary: Device-mapper event daemon shared library
+Version: %{device_mapper_version}
+Release: %{release}
+License: LGPLv2
+Requires: device-mapper-event = %{version}-%{release}
+Group: System Environment/Libraries
+
+%description -n device-mapper-event-libs
+This package contains the device-mapper event daemon shared library,
+libdevmapper-event.
+
+%post -n device-mapper-event-libs -p /sbin/ldconfig
+
+%postun -n device-mapper-event-libs -p /sbin/ldconfig
+
+%files -n device-mapper-event-libs
+%{_libdir}/libdevmapper-event.so.*
+
+%package -n device-mapper-event-devel
+Summary: Development libraries and headers for the device-mapper event daemon
+Version: %{device_mapper_version}
+Release: %{release}
+License: LGPLv2
+Group: Development/Libraries
+Requires: device-mapper-event = %{device_mapper_version}-%{release}
+Requires: device-mapper-event-libs = %{device_mapper_version}-%{release}
+Requires: pkgconfig
+
+%description -n device-mapper-event-devel
+This package contains files needed to develop applications that use
+the device-mapper event library.
+
+%files -n device-mapper-event-devel
+%defattr(-,root,root,-)
+%attr(755,root,root) /%{_lib}/libdevmapper-event.so
+%{_includedir}/libdevmapper-event.h
+/usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 
 %changelog
+* Wed Sep 16 2009 Alasdair Kergon <agk at redhat.com> - 2.02.52-2
+- Build dmeventd and place into a separate set of subpackages.
+- Remove no-longer-needed BuildRoot tag and buildroot emptying at install.
+
 * Tue Sep 15 2009 Alasdair Kergon <agk at redhat.com> - 2.02.52-1
 - Prioritise write locks over read locks by default for file locking.
 - Add local lock files with suffix ':aux' to serialise locking requests.



From robert at fedoraproject.org  Wed Sep 16 21:37:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 16 Sep 2009 21:37:49 +0000 (UTC)
Subject: rpms/libvmime07/devel libvmime07-0.7.1-plain-bodycopy.patch, NONE, 
	1.1 libvmime07.spec, 1.1, 1.2
Message-ID: <20090916213749.2C7F411C00CF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4948

Modified Files:
	libvmime07.spec 
Added Files:
	libvmime07-0.7.1-plain-bodycopy.patch 
Log Message:
Some patch reordering and rumbling


libvmime07-0.7.1-plain-bodycopy.patch:
 messageBuilder.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-plain-bodycopy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when constructing a plaintext only body without attachments, a
copy of the body was made to set as the real body and thus removing all the multiparts. However, the same
reference is removed before setting the new body, thus invalidating that body we wish to copy, possibly
resulting in a crash.

--- libvmime-0.7.1/src/messageBuilder.cpp				2009-09-15 22:59:21.000000000 +0200
+++ libvmime-0.7.1/src/messageBuilder.cpp.plain-bodycopy		2009-09-15 23:00:33.000000000 +0200
@@ -137,6 +137,8 @@
 	if (msg->getBody()->getPartCount() == 1)
 	{
 		const bodyPart& part = *msg->getBody()->getPartAt(0);
+		// make a full copy of the body, otherwise the copyFrom will delete the body we're copying
+		const body* bodyCopy = part.getBody()->clone();
 
 		// First, copy (and replace) the header fields
 		const std::vector <const headerField*> fields = part.getHeader()->getFieldList();
@@ -149,7 +151,8 @@
 
 		// Second, copy the body contents and sub-parts (this also remove
 		// the body part we are copying...)
-		msg->getBody()->copyFrom(*part.getBody());
+		msg->getBody()->copyFrom(*bodyCopy);
+		delete bodyCopy;
 	}
 
 	return (msg);


Index: libvmime07.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/devel/libvmime07.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvmime07.spec	16 Sep 2009 21:31:08 -0000	1.1
+++ libvmime07.spec	16 Sep 2009 21:37:47 -0000	1.2
@@ -6,34 +6,35 @@ License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
 Source0:	http://developer.zarafa.com/download/libvmime-%{version}.tar.bz2
-Patch0:		libvmime07-0.7.1-charset-catch.patch
-Patch1:		libvmime07-0.7.1-missing-boundary.patch
-Patch2:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
-Patch3:		libvmime07-0.7.1-bmoted-printable.patch
-Patch4:		libvmime07-0.7.1-strip-header-endspaces.patch
-Patch5:		libvmime07-0.7.1-attachfnamelen.patch
-Patch6:		libvmime07-0.7.1-remove-bcc.patch
-Patch7:		libvmime07-0.7.1-mdn-disposition.patch
-Patch8:		libvmime07-0.7.1-mdn-final-recipient.patch
-Patch9:		libvmime07-0.7.1-broken-locale-error.patch
-Patch10:	libvmime07-0.7.1-qp-starts-on-second-line.patch
-Patch11:	libvmime07-0.7.1-quoted-printable-specials.patch
-Patch12:	libvmime07-0.7.1-header-value-on-next-line.patch
-Patch13:	libvmime07-0.7.1-oe-compatibility.patch
-Patch14:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
-Patch15:	libvmime07-0.7.1-out-of-bounds-copy.patch
-Patch16:	libvmime07-0.7.1-default-transfer-encoding.patch
-Patch17:	libvmime07-0.7.1-contentid-without-at.patch
-Patch18:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
-Patch19:	libvmime07-0.7.1-double-empty-boundary.patch
-Patch20:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
-Patch21:	libvmime07-0.7.1-charset-output-buffer-full.patch
-Patch22:	libvmime07-0.7.1-gcc-4.3-support.patch
-Patch23:	libvmime07-0.7.1-timezone-name.patch
-Patch24:	libvmime07-0.7.1-socket-tcp-nodelay.patch
-Patch25:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
-Patch26:	libvmime07-0.7.1-gcc-4.4-support.patch
-Patch27:	libvmime07-0.7.1-package.patch
+Patch0:		libvmime07-0.7.1-package.patch
+Patch1:		libvmime07-0.7.1-charset-catch.patch
+Patch2:		libvmime07-0.7.1-missing-boundary.patch
+Patch3:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
+Patch4:		libvmime07-0.7.1-bmoted-printable.patch
+Patch5:		libvmime07-0.7.1-strip-header-endspaces.patch
+Patch6:		libvmime07-0.7.1-attachfnamelen.patch
+Patch7:		libvmime07-0.7.1-remove-bcc.patch
+Patch8:		libvmime07-0.7.1-mdn-disposition.patch
+Patch9:		libvmime07-0.7.1-mdn-final-recipient.patch
+Patch10:	libvmime07-0.7.1-broken-locale-error.patch
+Patch11:	libvmime07-0.7.1-qp-starts-on-second-line.patch
+Patch12:	libvmime07-0.7.1-quoted-printable-specials.patch
+Patch13:	libvmime07-0.7.1-header-value-on-next-line.patch
+Patch14:	libvmime07-0.7.1-oe-compatibility.patch
+Patch15:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
+Patch16:	libvmime07-0.7.1-out-of-bounds-copy.patch
+Patch17:	libvmime07-0.7.1-default-transfer-encoding.patch
+Patch18:	libvmime07-0.7.1-contentid-without-at.patch
+Patch19:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
+Patch20:	libvmime07-0.7.1-double-empty-boundary.patch
+Patch21:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
+Patch22:	libvmime07-0.7.1-charset-output-buffer-full.patch
+Patch23:	libvmime07-0.7.1-gcc-4.3-support.patch
+Patch24:	libvmime07-0.7.1-timezone-name.patch
+Patch25:	libvmime07-0.7.1-socket-tcp-nodelay.patch
+Patch26:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
+Patch27:	libvmime07-0.7.1-gcc-4.4-support.patch
+Patch28:	libvmime07-0.7.1-plain-bodycopy.patch
 BuildRequires:	sendmail, libtool, autoconf, automake
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,34 +68,35 @@ to work with the newer version and the n
 
 %prep
 %setup -q -n libvmime-%{version}
-%patch0 -p1 -b .charset-catch
-%patch1 -p1 -b .missing-boundary
-%patch2 -p1 -b .allow-no-recips-and-senders
-%patch3 -p1 -b .bmoted-printable
-%patch4 -p1 -b .strip-header-endspaces
-%patch5 -p1 -b .attachfnamelen
-%patch6 -p1 -b .remove-bcc
-%patch7 -p1 -b .mdn-disposition
-%patch8 -p1 -b .mdn-final-recipient
-%patch9 -p1 -b .broken-locale-error
-%patch10 -p1 -b .qp-starts-on-second-line
-%patch11 -p1 -b .quoted-printable-specials
-%patch12 -p1 -b .header-value-on-next-line
-%patch13 -p1 -b .oe-compatibility
-%patch14 -p1 -b .unicode-1-1-utf-7-charset
-%patch15 -p1 -b .out-of-bounds-copy
-%patch16 -p1 -b .default-transfer-encoding
-%patch17 -p1 -b .contentid-without-at
-%patch18 -p1 -b .socket-backport-and-timeout-fix
-%patch19 -p1 -b .double-empty-boundary
-%patch20 -p1 -b .quoted-printable-encode-questionmark
-%patch21 -p1 -b .charset-output-buffer-full
-%patch22 -p1 -b .gcc-4.3-support
-%patch23 -p1 -b .timezone-name
-%patch24 -p1 -b .socket-tcp-nodelay
-%patch25 -p1 -b .threading-remove-static_non-abi-change
-%patch26 -p1 -b .gcc-4.4-support
-%patch27 -p1 -b .package
+%patch0 -p1 -b .package
+%patch1 -p1 -b .charset-catch
+%patch2 -p1 -b .missing-boundary
+%patch3 -p1 -b .allow-no-recips-and-senders
+%patch4 -p1 -b .bmoted-printable
+%patch5 -p1 -b .strip-header-endspaces
+%patch6 -p1 -b .attachfnamelen
+%patch7 -p1 -b .remove-bcc
+%patch8 -p1 -b .mdn-disposition
+%patch9 -p1 -b .mdn-final-recipient
+%patch10 -p1 -b .broken-locale-error
+%patch11 -p1 -b .qp-starts-on-second-line
+%patch12 -p1 -b .quoted-printable-specials
+%patch13 -p1 -b .header-value-on-next-line
+%patch14 -p1 -b .oe-compatibility
+%patch15 -p1 -b .unicode-1-1-utf-7-charset
+%patch16 -p1 -b .out-of-bounds-copy
+%patch17 -p1 -b .default-transfer-encoding
+%patch18 -p1 -b .contentid-without-at
+%patch19 -p1 -b .socket-backport-and-timeout-fix
+%patch20 -p1 -b .double-empty-boundary
+%patch21 -p1 -b .quoted-printable-encode-questionmark
+%patch22 -p1 -b .charset-output-buffer-full
+%patch23 -p1 -b .gcc-4.3-support
+%patch24 -p1 -b .timezone-name
+%patch25 -p1 -b .socket-tcp-nodelay
+%patch26 -p1 -b .threading-remove-static_non-abi-change
+%patch27 -p1 -b .gcc-4.4-support
+%patch28 -p1 -b .plain-bodycopy
 
 # Needed to apply branding patch
 libtoolize --force



From pkgdb at fedoraproject.org  Wed Sep 16 21:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:39:04 +0000
Subject: [pkgdb] mm-common was added for krnowak
Message-ID: <20090916213904.B2E4210F87D@bastion2.fedora.phx.redhat.com>

tibbs has added Package mm-common with summary common files for GNOME C++ bindings
tibbs has approved Package mm-common
tibbs has added a Fedora devel branch for mm-common with an owner of krnowak
tibbs has approved mm-common in Fedora devel
tibbs has approved Package mm-common
tibbs has set commit to Approved for 107427 on mm-common (Fedora devel)
tibbs has set checkout to Approved for 107427 on mm-common (Fedora devel)
tibbs has set build to Approved for 107427 on mm-common (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mm-common



From pkgdb at fedoraproject.org  Wed Sep 16 21:39:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:39:05 +0000
Subject: [pkgdb] mm-common summary updated by tibbs
Message-ID: <20090916213905.E28C410F886@bastion2.fedora.phx.redhat.com>

tibbs set package mm-common summary to common files for GNOME C++ bindings

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mm-common



From pkgdb at fedoraproject.org  Wed Sep 16 21:39:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:39:05 +0000
Subject: [pkgdb] mm-common (Fedora, 11) updated by tibbs
Message-ID: <20090916213906.01CB110F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for mm-common
tibbs has set commit to Approved for 107427 on mm-common (Fedora 10)
tibbs has set checkout to Approved for 107427 on mm-common (Fedora 10)
tibbs has set build to Approved for 107427 on mm-common (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mm-common



From pkgdb at fedoraproject.org  Wed Sep 16 21:39:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:39:05 +0000
Subject: [pkgdb] mm-common (Fedora, 11) updated by tibbs
Message-ID: <20090916213905.ED2A510F894@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for mm-common
tibbs has set commit to Approved for 107427 on mm-common (Fedora 11)
tibbs has set checkout to Approved for 107427 on mm-common (Fedora 11)
tibbs has set build to Approved for 107427 on mm-common (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mm-common



From tibbs at fedoraproject.org  Wed Sep 16 21:39:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:39:13 +0000 (UTC)
Subject: rpms/mm-common - New directory
Message-ID: <20090916213913.2454511C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mm-common
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspw7473/rpms/mm-common

Log Message:
Directory /cvs/pkgs/rpms/mm-common added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:39:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:39:13 +0000 (UTC)
Subject: rpms/mm-common/devel - New directory
Message-ID: <20090916213913.6B16F11C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mm-common/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspw7473/rpms/mm-common/devel

Log Message:
Directory /cvs/pkgs/rpms/mm-common/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:39:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:39:21 +0000 (UTC)
Subject: rpms/mm-common Makefile,NONE,1.1
Message-ID: <20090916213921.2389A11C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mm-common
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspw7473/rpms/mm-common

Added Files:
	Makefile 
Log Message:
Setup of module mm-common


--- NEW FILE Makefile ---
# Top level Makefile for module mm-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 tibbs at fedoraproject.org  Wed Sep 16 21:39:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:39:21 +0000 (UTC)
Subject: rpms/mm-common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090916213921.6668111C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mm-common/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspw7473/rpms/mm-common/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mm-common


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mm-common
# $Id: Makefile,v 1.1 2009/09/16 21:39:21 tibbs Exp $
NAME := mm-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 Sep 16 21:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:41:39 +0000
Subject: [pkgdb] kio-ftps summary updated by tibbs
Message-ID: <20090916214139.3967810F888@bastion2.fedora.phx.redhat.com>

tibbs set package kio-ftps summary to An ftps KIO slave for KDE

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio-ftps



From pkgdb at fedoraproject.org  Wed Sep 16 21:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:41:35 +0000
Subject: [pkgdb] kio-ftps was added for jreznik
Message-ID: <20090916214136.171EF10F87D@bastion2.fedora.phx.redhat.com>

tibbs has added Package kio-ftps with summary An ftps KIO slave for KDE
tibbs has approved Package kio-ftps
tibbs has added a Fedora devel branch for kio-ftps with an owner of jreznik
tibbs has approved kio-ftps in Fedora devel
tibbs has approved Package kio-ftps
tibbs has set commit to Approved for 107427 on kio-ftps (Fedora devel)
tibbs has set checkout to Approved for 107427 on kio-ftps (Fedora devel)
tibbs has set build to Approved for 107427 on kio-ftps (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio-ftps



From pkgdb at fedoraproject.org  Wed Sep 16 21:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:41:39 +0000
Subject: [pkgdb] kio-ftps (Fedora, 11) updated by tibbs
Message-ID: <20090916214139.5420010F89C@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on kio-ftps (Fedora devel) for rdieter
tibbs approved watchcommits on kio-ftps (Fedora devel) for rdieter
tibbs approved commit on kio-ftps (Fedora devel) for rdieter
tibbs approved build on kio-ftps (Fedora devel) for rdieter
tibbs approved approveacls on kio-ftps (Fedora devel) for rdieter
tibbs approved watchbugzilla on kio-ftps (Fedora devel) for ltinkl
tibbs approved watchcommits on kio-ftps (Fedora devel) for ltinkl
tibbs approved commit on kio-ftps (Fedora devel) for ltinkl
tibbs approved build on kio-ftps (Fedora devel) for ltinkl
tibbs approved approveacls on kio-ftps (Fedora devel) for ltinkl
tibbs approved watchbugzilla on kio-ftps (Fedora devel) for than
tibbs approved watchcommits on kio-ftps (Fedora devel) for than
tibbs approved commit on kio-ftps (Fedora devel) for than
tibbs approved build on kio-ftps (Fedora devel) for than
tibbs approved approveacls on kio-ftps (Fedora devel) for than
tibbs approved watchbugzilla on kio-ftps (Fedora devel) for kkofler
tibbs approved watchcommits on kio-ftps (Fedora devel) for kkofler
tibbs approved commit on kio-ftps (Fedora devel) for kkofler
tibbs approved build on kio-ftps (Fedora devel) for kkofler
tibbs approved approveacls on kio-ftps (Fedora devel) for kkofler
tibbs approved watchbugzilla on kio-ftps (Fedora devel) for svahl
tibbs approved watchcommits on kio-ftps (Fedora devel) for svahl
tibbs approved commit on kio-ftps (Fedora devel) for svahl
tibbs approved build on kio-ftps (Fedora devel) for svahl
tibbs approved approveacls on kio-ftps (Fedora devel) for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio-ftps



From pkgdb at fedoraproject.org  Wed Sep 16 21:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:41:39 +0000
Subject: [pkgdb] kio-ftps (Fedora, 11) updated by tibbs
Message-ID: <20090916214139.7D5DC10F8A5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for kio-ftps
tibbs has set commit to Approved for 107427 on kio-ftps (Fedora 11)
tibbs has set checkout to Approved for 107427 on kio-ftps (Fedora 11)
tibbs has set build to Approved for 107427 on kio-ftps (Fedora 11)
tibbs approved watchbugzilla on kio-ftps (Fedora 11) for rdieter
tibbs approved watchcommits on kio-ftps (Fedora 11) for rdieter
tibbs approved commit on kio-ftps (Fedora 11) for rdieter
tibbs approved build on kio-ftps (Fedora 11) for rdieter
tibbs approved approveacls on kio-ftps (Fedora 11) for rdieter
tibbs approved watchbugzilla on kio-ftps (Fedora 11) for ltinkl
tibbs approved watchcommits on kio-ftps (Fedora 11) for ltinkl
tibbs approved commit on kio-ftps (Fedora 11) for ltinkl
tibbs approved build on kio-ftps (Fedora 11) for ltinkl
tibbs approved approveacls on kio-ftps (Fedora 11) for ltinkl
tibbs approved watchbugzilla on kio-ftps (Fedora 11) for than
tibbs approved watchcommits on kio-ftps (Fedora 11) for than
tibbs approved commit on kio-ftps (Fedora 11) for than
tibbs approved build on kio-ftps (Fedora 11) for than
tibbs approved approveacls on kio-ftps (Fedora 11) for than
tibbs approved watchbugzilla on kio-ftps (Fedora 11) for kkofler
tibbs approved watchcommits on kio-ftps (Fedora 11) for kkofler
tibbs approved commit on kio-ftps (Fedora 11) for kkofler
tibbs approved build on kio-ftps (Fedora 11) for kkofler
tibbs approved approveacls on kio-ftps (Fedora 11) for kkofler
tibbs approved watchbugzilla on kio-ftps (Fedora 11) for svahl
tibbs approved watchcommits on kio-ftps (Fedora 11) for svahl
tibbs approved commit on kio-ftps (Fedora 11) for svahl
tibbs approved build on kio-ftps (Fedora 11) for svahl
tibbs approved approveacls on kio-ftps (Fedora 11) for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio-ftps



From pkgdb at fedoraproject.org  Wed Sep 16 21:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:41:39 +0000
Subject: [pkgdb] kio-ftps (Fedora, 11) updated by tibbs
Message-ID: <20090916214139.9D9B210F8AF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for kio-ftps
tibbs has set commit to Approved for 107427 on kio-ftps (Fedora 10)
tibbs has set checkout to Approved for 107427 on kio-ftps (Fedora 10)
tibbs has set build to Approved for 107427 on kio-ftps (Fedora 10)
tibbs approved watchbugzilla on kio-ftps (Fedora 10) for rdieter
tibbs approved watchcommits on kio-ftps (Fedora 10) for rdieter
tibbs approved commit on kio-ftps (Fedora 10) for rdieter
tibbs approved build on kio-ftps (Fedora 10) for rdieter
tibbs approved approveacls on kio-ftps (Fedora 10) for rdieter
tibbs approved watchbugzilla on kio-ftps (Fedora 10) for ltinkl
tibbs approved watchcommits on kio-ftps (Fedora 10) for ltinkl
tibbs approved commit on kio-ftps (Fedora 10) for ltinkl
tibbs approved build on kio-ftps (Fedora 10) for ltinkl
tibbs approved approveacls on kio-ftps (Fedora 10) for ltinkl
tibbs approved watchbugzilla on kio-ftps (Fedora 10) for than
tibbs approved watchcommits on kio-ftps (Fedora 10) for than
tibbs approved commit on kio-ftps (Fedora 10) for than
tibbs approved build on kio-ftps (Fedora 10) for than
tibbs approved approveacls on kio-ftps (Fedora 10) for than
tibbs approved watchbugzilla on kio-ftps (Fedora 10) for kkofler
tibbs approved watchcommits on kio-ftps (Fedora 10) for kkofler
tibbs approved commit on kio-ftps (Fedora 10) for kkofler
tibbs approved build on kio-ftps (Fedora 10) for kkofler
tibbs approved approveacls on kio-ftps (Fedora 10) for kkofler
tibbs approved watchbugzilla on kio-ftps (Fedora 10) for svahl
tibbs approved watchcommits on kio-ftps (Fedora 10) for svahl
tibbs approved commit on kio-ftps (Fedora 10) for svahl
tibbs approved build on kio-ftps (Fedora 10) for svahl
tibbs approved approveacls on kio-ftps (Fedora 10) for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio-ftps



From tibbs at fedoraproject.org  Wed Sep 16 21:41:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:41:45 +0000 (UTC)
Subject: rpms/kio-ftps - New directory
Message-ID: <20090916214145.14B5C11C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/kio-ftps
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEp8842/rpms/kio-ftps

Log Message:
Directory /cvs/pkgs/rpms/kio-ftps added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:41:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:41:45 +0000 (UTC)
Subject: rpms/kio-ftps/devel - New directory
Message-ID: <20090916214145.3E72111C00EC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/kio-ftps/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEp8842/rpms/kio-ftps/devel

Log Message:
Directory /cvs/pkgs/rpms/kio-ftps/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:41:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:41:55 +0000 (UTC)
Subject: rpms/kio-ftps Makefile,NONE,1.1
Message-ID: <20090916214155.D9A2311C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/kio-ftps
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEp8842/rpms/kio-ftps

Added Files:
	Makefile 
Log Message:
Setup of module kio-ftps


--- NEW FILE Makefile ---
# Top level Makefile for module kio-ftps
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 tibbs at fedoraproject.org  Wed Sep 16 21:41:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:41:56 +0000 (UTC)
Subject: rpms/kio-ftps/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090916214156.8300511C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/kio-ftps/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEp8842/rpms/kio-ftps/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kio-ftps


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kio-ftps
# $Id: Makefile,v 1.1 2009/09/16 21:41:56 tibbs Exp $
NAME := kio-ftps
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 Sep 16 21:42:05 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Sep 2009 21:42:05 +0000 (UTC)
Subject: rpms/podsleuth/F-10 podsleuth-0.6.4-sg3_utils.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 podsleuth.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090916214205.CDB0E11C00CF@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9198

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.4-sg3_utils.patch 
Log Message:
* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
- update to 0.6.4 (BZ 501404)
- remove upstreamed patch
- update sgutils patch


podsleuth-0.6.4-sg3_utils.patch:
 configure                             |   12 ++++++------
 src/PodSleuth/PodSleuth.dll.config.in |    2 +-
 src/PodSleuth/PodSleuth/ScsiReader.cs |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE podsleuth-0.6.4-sg3_utils.patch ---
diff -uNr podsleuth-0.6.4.old/configure podsleuth-0.6.4/configure
--- podsleuth-0.6.4.old/configure	2009-01-20 23:43:04.000000000 +0100
+++ podsleuth-0.6.4/configure	2009-08-25 23:27:10.000000000 +0200
@@ -4392,13 +4392,13 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
-$as_echo_n "checking for sg_ll_inquiry in -lsgutils... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
+$as_echo_n "checking for sg_ll_inquiry in -lsgutils2... " >&6; }
 if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsgutils  $LIBS"
+LIBS="-lsgutils2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4462,11 +4462,11 @@
 #define HAVE_LIBSGUTILS 1
 _ACEOF
 
-  LIBS="-lsgutils $LIBS"
+  LIBS="-lsgutils2 $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
-$as_echo "$as_me: error: Error! You need to have libsgutils." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils2." >&5
+$as_echo "$as_me: error: Error! You need to have libsgutils2." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
diff -uNr podsleuth-0.6.4.old/src/PodSleuth/PodSleuth/ScsiReader.cs podsleuth-0.6.4/src/PodSleuth/PodSleuth/ScsiReader.cs
--- podsleuth-0.6.4.old/src/PodSleuth/PodSleuth/ScsiReader.cs	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.4/src/PodSleuth/PodSleuth/ScsiReader.cs	2009-08-25 23:27:33.000000000 +0200
@@ -50,7 +50,7 @@
             }
         }
         
-        [DllImport("libsgutils.so.1")]
+        [DllImport("libsgutils2.so.2")]
         private static extern int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
             IntPtr resp, int mx_resp_len, int noisy, int verbose);
             
@@ -74,4 +74,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff -uNr podsleuth-0.6.4.old/src/PodSleuth/PodSleuth.dll.config.in podsleuth-0.6.4/src/PodSleuth/PodSleuth.dll.config.in
--- podsleuth-0.6.4.old/src/PodSleuth/PodSleuth.dll.config.in	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.4/src/PodSleuth/PodSleuth.dll.config.in	2009-08-25 23:28:07.000000000 +0200
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libsgutils.so.1" target="libsgutils.so.1" />
+	<dllmap dll="libsgutils2.so.2" target="libsgutils2.so.2" />
 </configuration>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2008 07:48:11 -0000	1.3
+++ .cvsignore	16 Sep 2009 21:42:05 -0000	1.4
@@ -1 +1 @@
-podsleuth-0.6.2.tar.bz2
+podsleuth-0.6.4.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-10/podsleuth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- podsleuth.spec	10 Nov 2008 22:33:18 -0000	1.7
+++ podsleuth.spec	16 Sep 2009 21:42:05 -0000	1.8
@@ -1,25 +1,22 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.3
+Version:	0.6.4
 Release:	1%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
 URL:		http://banshee-project.org/PodSleuth
 Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		podsleuth-0.6.0-sg3_utils.patch
+Patch0:		podsleuth-0.6.4-sg3_utils.patch
 Patch1:		podsleuth-0.6.2-libdir.patch
-Patch2:         podsleuth-0.6.0-wapidir.patch
-# From: http://banshee-project.org/~gburt/tmp/update-model-info-fix-artwork-bug-r64_68.patch
-# See: http://mail.gnome.org/archives/banshee-list/2008-October/msg00221.html
-Patch3:		update-model-info-fix-artwork-bug-r64_68.patch
+Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
-Requires:       sg3_utils-libs
+Requires:	sg3_utils-libs
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
@@ -51,7 +48,6 @@ Development files for podsleuth.
 %endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
-%patch3 -p0 -b .r68
 
 %build
 %configure --with-hal-callouts-dir=%{_libexecdir}
@@ -82,6 +78,11 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
+- update to 0.6.4 (BZ 501404)
+- remove upstreamed patch
+- update sgutils patch
+
 * Mon Nov 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.3-1
 - update to 0.6.3
 - apply patch from upstream to update model info, fix artwork bug


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Nov 2008 22:33:18 -0000	1.4
+++ sources	16 Sep 2009 21:42:05 -0000	1.5
@@ -1 +1 @@
-b5ee19f8a4eb8da8d600500df33eda87  podsleuth-0.6.3.tar.bz2
+b51e7bc2dd3e2265e75a04fe35974c10  podsleuth-0.6.4.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 16 21:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:42:43 +0000
Subject: [pkgdb] RackTables was added for coec
Message-ID: <20090916214244.05F1210F8A2@bastion2.fedora.phx.redhat.com>

tibbs has added Package RackTables with summary A datacenter asset management system
tibbs has approved Package RackTables
tibbs has added a Fedora devel branch for RackTables with an owner of coec
tibbs has approved RackTables in Fedora devel
tibbs has approved Package RackTables
tibbs has set commit to Approved for 107427 on RackTables (Fedora devel)
tibbs has set checkout to Approved for 107427 on RackTables (Fedora devel)
tibbs has set build to Approved for 107427 on RackTables (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/RackTables



From pkgdb at fedoraproject.org  Wed Sep 16 21:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:42:45 +0000
Subject: [pkgdb] RackTables summary updated by tibbs
Message-ID: <20090916214245.43CB210F8A6@bastion2.fedora.phx.redhat.com>

tibbs set package RackTables summary to A datacenter asset management system

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/RackTables



From pkgdb at fedoraproject.org  Wed Sep 16 21:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:42:45 +0000
Subject: [pkgdb] RackTables (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214245.49C8E10F8AC@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on RackTables (Fedora devel) for coec
tibbs approved watchcommits on RackTables (Fedora devel) for coec

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/RackTables



From pkgdb at fedoraproject.org  Wed Sep 16 21:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:42:45 +0000
Subject: [pkgdb] RackTables (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214245.4E92310F8C0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for RackTables
tibbs has set commit to Approved for 107427 on RackTables (Fedora 11)
tibbs has set checkout to Approved for 107427 on RackTables (Fedora 11)
tibbs has set build to Approved for 107427 on RackTables (Fedora 11)
tibbs approved watchbugzilla on RackTables (Fedora 11) for coec
tibbs approved watchcommits on RackTables (Fedora 11) for coec

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/RackTables



From pkgdb at fedoraproject.org  Wed Sep 16 21:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:42:45 +0000
Subject: [pkgdb] RackTables (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214245.5AADE10F8C4@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for RackTables
tibbs has set commit to Approved for 107427 on RackTables (Fedora 10)
tibbs has set checkout to Approved for 107427 on RackTables (Fedora 10)
tibbs has set build to Approved for 107427 on RackTables (Fedora 10)
tibbs approved watchbugzilla on RackTables (Fedora 10) for coec
tibbs approved watchcommits on RackTables (Fedora 10) for coec

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/RackTables



From pkgdb at fedoraproject.org  Wed Sep 16 21:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:42:45 +0000
Subject: [pkgdb] RackTables (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214245.665FB10F8C6@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for RackTables
tibbs has set commit to Approved for 107427 on RackTables (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on RackTables (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on RackTables (Fedora EPEL 5)
tibbs approved watchbugzilla on RackTables (Fedora EPEL 5) for coec
tibbs approved watchcommits on RackTables (Fedora EPEL 5) for coec

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/RackTables



From tibbs at fedoraproject.org  Wed Sep 16 21:43:18 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:43:18 +0000 (UTC)
Subject: rpms/RackTables/devel - New directory
Message-ID: <20090916214318.D512811C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/RackTables/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsr10325/rpms/RackTables/devel

Log Message:
Directory /cvs/pkgs/rpms/RackTables/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:43:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:43:19 +0000 (UTC)
Subject: rpms/RackTables - New directory
Message-ID: <20090916214319.0136411C00E6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/RackTables
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsr10325/rpms/RackTables

Log Message:
Directory /cvs/pkgs/rpms/RackTables added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:43:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:43:37 +0000 (UTC)
Subject: rpms/RackTables Makefile,NONE,1.1
Message-ID: <20090916214337.B36A111C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/RackTables
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsr10325/rpms/RackTables

Added Files:
	Makefile 
Log Message:
Setup of module RackTables


--- NEW FILE Makefile ---
# Top level Makefile for module RackTables
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 tibbs at fedoraproject.org  Wed Sep 16 21:43:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:43:38 +0000 (UTC)
Subject: rpms/RackTables/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090916214338.61EE911C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/RackTables/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsr10325/rpms/RackTables/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module RackTables


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: RackTables
# $Id: Makefile,v 1.1 2009/09/16 21:43:37 tibbs Exp $
NAME := RackTables
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 Sep 16 21:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:44:31 +0000
Subject: [pkgdb] getdata (Fedora EPEL, 4) updated by tibbs
Message-ID: <20090916214431.2C35610F8B8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for getdata
tibbs has set commit to Approved for 107427 on getdata (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on getdata (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on getdata (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/getdata



From pkgdb at fedoraproject.org  Wed Sep 16 21:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:44:31 +0000
Subject: [pkgdb] getdata (Fedora EPEL, 4) updated by tibbs
Message-ID: <20090916214431.34BD510F8BC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for getdata
tibbs has set commit to Approved for 107427 on getdata (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on getdata (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on getdata (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/getdata



From agk at fedoraproject.org  Wed Sep 16 21:45:01 2009
From: agk at fedoraproject.org (agk)
Date: Wed, 16 Sep 2009 21:45:01 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.172,1.173
Message-ID: <20090916214501.2D55911C00CF@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11966

Modified Files:
	lvm2.spec 
Log Message:
-event-libs does not require -event (circular)



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- lvm2.spec	16 Sep 2009 21:33:04 -0000	1.172
+++ lvm2.spec	16 Sep 2009 21:45:00 -0000	1.173
@@ -343,7 +343,6 @@ Summary: Device-mapper event daemon shar
 Version: %{device_mapper_version}
 Release: %{release}
 License: LGPLv2
-Requires: device-mapper-event = %{version}-%{release}
 Group: System Environment/Libraries
 
 %description -n device-mapper-event-libs



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:11 +0000
Subject: [pkgdb] devio was added for sharkcz
Message-ID: <20090916214512.0722410F89A@bastion2.fedora.phx.redhat.com>

tibbs has added Package devio with summary Read and write utility for block devices
tibbs has approved Package devio
tibbs has added a Fedora devel branch for devio with an owner of sharkcz
tibbs has approved devio in Fedora devel
tibbs has approved Package devio
tibbs has set commit to Approved for 107427 on devio (Fedora devel)
tibbs has set checkout to Approved for 107427 on devio (Fedora devel)
tibbs has set build to Approved for 107427 on devio (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/devio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:13 +0000
Subject: [pkgdb] devio summary updated by tibbs
Message-ID: <20090916214513.5BA7710F89B@bastion2.fedora.phx.redhat.com>

tibbs set package devio summary to Read and write utility for block devices

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/devio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:13 +0000
Subject: [pkgdb] devio (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214513.6412C10F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for devio
tibbs has set commit to Approved for 107427 on devio (Fedora 11)
tibbs has set checkout to Approved for 107427 on devio (Fedora 11)
tibbs has set build to Approved for 107427 on devio (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/devio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:13 +0000
Subject: [pkgdb] devio (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214513.6999A10F8A5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for devio
tibbs has set commit to Approved for 107427 on devio (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on devio (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on devio (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/devio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:13 +0000
Subject: [pkgdb] devio (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214513.6D94E10F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for devio
tibbs has set commit to Approved for 107427 on devio (Fedora 10)
tibbs has set checkout to Approved for 107427 on devio (Fedora 10)
tibbs has set build to Approved for 107427 on devio (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/devio



From tibbs at fedoraproject.org  Wed Sep 16 21:45:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:45:21 +0000 (UTC)
Subject: rpms/devio/devel - New directory
Message-ID: <20090916214521.3C95D11C00EC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/devio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM12353/rpms/devio/devel

Log Message:
Directory /cvs/pkgs/rpms/devio/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:45:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:45:21 +0000 (UTC)
Subject: rpms/devio - New directory
Message-ID: <20090916214521.17A9011C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/devio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM12353/rpms/devio

Log Message:
Directory /cvs/pkgs/rpms/devio added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:45:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:45:27 +0000 (UTC)
Subject: rpms/devio Makefile,NONE,1.1
Message-ID: <20090916214527.2B6A611C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/devio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM12353/rpms/devio

Added Files:
	Makefile 
Log Message:
Setup of module devio


--- NEW FILE Makefile ---
# Top level Makefile for module devio
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 tibbs at fedoraproject.org  Wed Sep 16 21:45:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:45:27 +0000 (UTC)
Subject: rpms/devio/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090916214527.75D3811C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/devio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM12353/rpms/devio/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module devio


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: devio
# $Id: Makefile,v 1.1 2009/09/16 21:45:27 tibbs Exp $
NAME := devio
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 Sep 16 21:45:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:48 +0000
Subject: [pkgdb] hercstudio was added for sharkcz
Message-ID: <20090916214549.2C35C10F88C@bastion2.fedora.phx.redhat.com>

tibbs has added Package hercstudio with summary GUI for Hercules
tibbs has approved Package hercstudio
tibbs has added a Fedora devel branch for hercstudio with an owner of sharkcz
tibbs has approved hercstudio in Fedora devel
tibbs has approved Package hercstudio
tibbs has set commit to Approved for 107427 on hercstudio (Fedora devel)
tibbs has set checkout to Approved for 107427 on hercstudio (Fedora devel)
tibbs has set build to Approved for 107427 on hercstudio (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hercstudio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:49 +0000
Subject: [pkgdb] hercstudio summary updated by tibbs
Message-ID: <20090916214549.ED87810F8B3@bastion2.fedora.phx.redhat.com>

tibbs set package hercstudio summary to GUI for Hercules

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hercstudio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:49 +0000
Subject: [pkgdb] hercstudio (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214549.F3C6410F8B6@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for hercstudio
tibbs has set commit to Approved for 107427 on hercstudio (Fedora 11)
tibbs has set checkout to Approved for 107427 on hercstudio (Fedora 11)
tibbs has set build to Approved for 107427 on hercstudio (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hercstudio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:49 +0000
Subject: [pkgdb] hercstudio (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214550.12EBF10F8B9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for hercstudio
tibbs has set commit to Approved for 107427 on hercstudio (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on hercstudio (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on hercstudio (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hercstudio



From pkgdb at fedoraproject.org  Wed Sep 16 21:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:45:49 +0000
Subject: [pkgdb] hercstudio (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090916214550.219B310F8BD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for hercstudio
tibbs has set commit to Approved for 107427 on hercstudio (Fedora 10)
tibbs has set checkout to Approved for 107427 on hercstudio (Fedora 10)
tibbs has set build to Approved for 107427 on hercstudio (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hercstudio



From tibbs at fedoraproject.org  Wed Sep 16 21:45:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:45:56 +0000 (UTC)
Subject: rpms/hercstudio - New directory
Message-ID: <20090916214556.1E17811C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hercstudio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx12833/rpms/hercstudio

Log Message:
Directory /cvs/pkgs/rpms/hercstudio added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:45:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:45:56 +0000 (UTC)
Subject: rpms/hercstudio/devel - New directory
Message-ID: <20090916214556.3E02211C00E6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hercstudio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx12833/rpms/hercstudio/devel

Log Message:
Directory /cvs/pkgs/rpms/hercstudio/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:46:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:46:02 +0000 (UTC)
Subject: rpms/hercstudio Makefile,NONE,1.1
Message-ID: <20090916214602.CA37911C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hercstudio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx12833/rpms/hercstudio

Added Files:
	Makefile 
Log Message:
Setup of module hercstudio


--- NEW FILE Makefile ---
# Top level Makefile for module hercstudio
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 tibbs at fedoraproject.org  Wed Sep 16 21:46:03 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:46:03 +0000 (UTC)
Subject: rpms/hercstudio/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090916214603.0973F11C00E6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hercstudio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx12833/rpms/hercstudio/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hercstudio


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hercstudio
# $Id: Makefile,v 1.1 2009/09/16 21:46:02 tibbs Exp $
NAME := hercstudio
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 agk at fedoraproject.org  Wed Sep 16 21:47:22 2009
From: agk at fedoraproject.org (agk)
Date: Wed, 16 Sep 2009 21:47:22 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.173,1.174
Message-ID: <20090916214722.0310A11C00CF@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14015

Modified Files:
	lvm2.spec 
Log Message:
-event already pulls in -event-libs



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- lvm2.spec	16 Sep 2009 21:45:00 -0000	1.173
+++ lvm2.spec	16 Sep 2009 21:47:21 -0000	1.174
@@ -363,7 +363,6 @@ Release: %{release}
 License: LGPLv2
 Group: Development/Libraries
 Requires: device-mapper-event = %{device_mapper_version}-%{release}
-Requires: device-mapper-event-libs = %{device_mapper_version}-%{release}
 Requires: pkgconfig
 
 %description -n device-mapper-event-devel



From pkgdb at fedoraproject.org  Wed Sep 16 21:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:48:13 +0000
Subject: [pkgdb] perl-POE-Component-Pluggable was added for cweyl
Message-ID: <20090916214813.51BFA10F880@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-POE-Component-Pluggable with summary A base class for creating plugin-enabled POE components
tibbs has approved Package perl-POE-Component-Pluggable
tibbs has added a Fedora devel branch for perl-POE-Component-Pluggable with an owner of cweyl
tibbs has approved perl-POE-Component-Pluggable in Fedora devel
tibbs has approved Package perl-POE-Component-Pluggable
tibbs has set commit to Approved for 107427 on perl-POE-Component-Pluggable (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-POE-Component-Pluggable (Fedora devel)
tibbs has set build to Approved for 107427 on perl-POE-Component-Pluggable (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Component-Pluggable



From pkgdb at fedoraproject.org  Wed Sep 16 21:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:48:15 +0000
Subject: [pkgdb] perl-POE-Component-Pluggable summary updated by tibbs
Message-ID: <20090916214815.BF3FD10F88C@bastion2.fedora.phx.redhat.com>

tibbs set package perl-POE-Component-Pluggable summary to A base class for creating plugin-enabled POE components

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Component-Pluggable



From pkgdb at fedoraproject.org  Wed Sep 16 21:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:48:15 +0000
Subject: [pkgdb] perl-POE-Component-Pluggable (Fedora, 11) updated by tibbs
Message-ID: <20090916214815.C6CB710F896@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-POE-Component-Pluggable
tibbs has set commit to Approved for 107427 on perl-POE-Component-Pluggable (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-POE-Component-Pluggable (Fedora 11)
tibbs has set build to Approved for 107427 on perl-POE-Component-Pluggable (Fedora 11)
tibbs approved watchbugzilla on perl-POE-Component-Pluggable (Fedora 11) for perl-sig
tibbs approved watchcommits on perl-POE-Component-Pluggable (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Component-Pluggable



From pkgdb at fedoraproject.org  Wed Sep 16 21:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:48:15 +0000
Subject: [pkgdb] perl-POE-Component-Pluggable (Fedora, 11) updated by tibbs
Message-ID: <20090916214815.D7BF310F89A@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on perl-POE-Component-Pluggable (Fedora devel) for perl-sig
tibbs approved watchcommits on perl-POE-Component-Pluggable (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Component-Pluggable



From tibbs at fedoraproject.org  Wed Sep 16 21:48:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:48:26 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable - New directory
Message-ID: <20090916214826.4415911C0338@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-POE-Component-Pluggable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsF15739/rpms/perl-POE-Component-Pluggable

Log Message:
Directory /cvs/pkgs/rpms/perl-POE-Component-Pluggable added to the repository




From tibbs at fedoraproject.org  Wed Sep 16 21:48:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:48:26 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable/devel - New directory
Message-ID: <20090916214826.B9C6C11C0338@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-POE-Component-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsF15739/rpms/perl-POE-Component-Pluggable/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-POE-Component-Pluggable/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 16 21:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 21:48:15 +0000
Subject: [pkgdb] perl-POE-Component-Pluggable (Fedora, 11) updated by tibbs
Message-ID: <20090916214815.E5C8910F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for perl-POE-Component-Pluggable
tibbs has set commit to Approved for 107427 on perl-POE-Component-Pluggable (Fedora 10)
tibbs has set checkout to Approved for 107427 on perl-POE-Component-Pluggable (Fedora 10)
tibbs has set build to Approved for 107427 on perl-POE-Component-Pluggable (Fedora 10)
tibbs approved watchbugzilla on perl-POE-Component-Pluggable (Fedora 10) for perl-sig
tibbs approved watchcommits on perl-POE-Component-Pluggable (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Component-Pluggable



From tibbs at fedoraproject.org  Wed Sep 16 21:48:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:48:39 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable Makefile,NONE,1.1
Message-ID: <20090916214839.BC1AE11C00CF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-POE-Component-Pluggable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsF15739/rpms/perl-POE-Component-Pluggable

Added Files:
	Makefile 
Log Message:
Setup of module perl-POE-Component-Pluggable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-POE-Component-Pluggable
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 tibbs at fedoraproject.org  Wed Sep 16 21:48:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 16 Sep 2009 21:48:40 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090916214840.5ACE711C00EB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-POE-Component-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsF15739/rpms/perl-POE-Component-Pluggable/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-POE-Component-Pluggable


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-POE-Component-Pluggable
# $Id: Makefile,v 1.1 2009/09/16 21:48:39 tibbs Exp $
NAME := perl-POE-Component-Pluggable
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 robert at fedoraproject.org  Wed Sep 16 21:50:30 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 16 Sep 2009 21:50:30 +0000 (UTC)
Subject: rpms/libvmime07/EL-5
	libvmime07-0.7.1-allow-no-recips-and-senders.patch, NONE,
	1.1 libvmime07-0.7.1-attachfnamelen.patch, NONE,
	1.1 libvmime07-0.7.1-bmoted-printable.patch, NONE,
	1.1 libvmime07-0.7.1-broken-locale-error.patch, NONE,
	1.1 libvmime07-0.7.1-charset-catch.patch, NONE,
	1.1 libvmime07-0.7.1-charset-output-buffer-full.patch, NONE,
	1.1 libvmime07-0.7.1-contentid-without-at.patch, NONE,
	1.1 libvmime07-0.7.1-default-transfer-encoding.patch, NONE,
	1.1 libvmime07-0.7.1-double-empty-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.3-support.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.4-support.patch, NONE,
	1.1 libvmime07-0.7.1-header-value-on-next-line.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-disposition.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-final-recipient.patch, NONE,
	1.1 libvmime07-0.7.1-missing-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-oe-compatibility.patch, NONE,
	1.1 libvmime07-0.7.1-out-of-bounds-copy.patch, NONE,
	1.1 libvmime07-0.7.1-package.patch, NONE,
	1.1 libvmime07-0.7.1-plain-bodycopy.patch, NONE,
	1.1 libvmime07-0.7.1-qp-starts-on-second-line.patch, NONE,
	1.1 libvmime07-0.7.1-quoted-printable-encode-questionmark.patch,
	NONE, 1.1 libvmime07-0.7.1-quoted-printable-specials.patch, NONE,
	1.1 libvmime07-0.7.1-remove-bcc.patch, NONE,
	1.1 libvmime07-0.7.1-socket-backport-and-timeout-fix.patch, NONE,
	1.1 libvmime07-0.7.1-socket-tcp-nodelay.patch, NONE,
	1.1 libvmime07-0.7.1-strip-header-endspaces.patch, NONE,
	1.1 libvmime07-0.7.1-threading-remove-static_non-abi-change.patch,
	NONE, 1.1 libvmime07-0.7.1-timezone-name.patch, NONE,
	1.1 libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch, NONE,
	1.1 libvmime07.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090916215030.0121511C0336@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	libvmime07-0.7.1-allow-no-recips-and-senders.patch 
	libvmime07-0.7.1-attachfnamelen.patch 
	libvmime07-0.7.1-bmoted-printable.patch 
	libvmime07-0.7.1-broken-locale-error.patch 
	libvmime07-0.7.1-charset-catch.patch 
	libvmime07-0.7.1-charset-output-buffer-full.patch 
	libvmime07-0.7.1-contentid-without-at.patch 
	libvmime07-0.7.1-default-transfer-encoding.patch 
	libvmime07-0.7.1-double-empty-boundary.patch 
	libvmime07-0.7.1-gcc-4.3-support.patch 
	libvmime07-0.7.1-gcc-4.4-support.patch 
	libvmime07-0.7.1-header-value-on-next-line.patch 
	libvmime07-0.7.1-mdn-disposition.patch 
	libvmime07-0.7.1-mdn-final-recipient.patch 
	libvmime07-0.7.1-missing-boundary.patch 
	libvmime07-0.7.1-oe-compatibility.patch 
	libvmime07-0.7.1-out-of-bounds-copy.patch 
	libvmime07-0.7.1-package.patch 
	libvmime07-0.7.1-plain-bodycopy.patch 
	libvmime07-0.7.1-qp-starts-on-second-line.patch 
	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch 
	libvmime07-0.7.1-quoted-printable-specials.patch 
	libvmime07-0.7.1-remove-bcc.patch 
	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch 
	libvmime07-0.7.1-socket-tcp-nodelay.patch 
	libvmime07-0.7.1-strip-header-endspaces.patch 
	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch 
	libvmime07-0.7.1-timezone-name.patch 
	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch 
	libvmime07.spec 
Log Message:
Populate libvmime07 to Fedora and EPEL branches


libvmime07-0.7.1-allow-no-recips-and-senders.patch:
 messageBuilder.cpp |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE libvmime07-0.7.1-allow-no-recips-and-senders.patch ---
Patch by Zarafa <http://www.zarafa.com/> - makes the messageBuilder helper generate an mail without To or
Cc headers. This way, an email with only Bcc entries will still be sent. This feature is mostly used by
people to mask a mailing list or invitation that should be send to alot of people.

--- libvmime-0.7.1/src/messageBuilder.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/messageBuilder.cpp.allow-no-recips-and-senders	2006-01-13 09:49:51.000000000 +0100
@@ -50,14 +50,11 @@
 	// Generate the header fields
 	msg->getHeader()->Subject().setValue(m_subject);
 
-	if (m_from.isEmpty())
-		throw exceptions::no_expeditor();
-
-	if (m_to.isEmpty() || m_to.getAddressAt(0)->isEmpty())
-		throw exceptions::no_recipient();
-
-	msg->getHeader()->From().setValue(m_from);
-	msg->getHeader()->To().setValue(m_to);
+	if (!m_from.isEmpty())
+		msg->getHeader()->From().setValue(m_from);
+		
+	if (!m_to.isEmpty())
+		msg->getHeader()->To().setValue(m_to);
 
 	if (!m_cc.isEmpty())
 		msg->getHeader()->Cc().setValue(m_cc);

libvmime07-0.7.1-attachfnamelen.patch:
 defaultParameter.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-attachfnamelen.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes parsing of an attachment filename that is between 66 and
76 characters long.

--- libvmime-0.7.1/src/defaultParameter.cpp				2005-06-21 19:06:35.000000000 +0200
+++ libvmime-0.7.1/src/defaultParameter.cpp.attachfnamelen		2006-08-01 10:42:18.277853120 +0200
@@ -200,7 +200,8 @@
 	bool needQuoting = false;
 	string::size_type valueLength = 0;
 
-	for (string::size_type i = 0 ; (i < value.length()) && (pos + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
+	// Use worst-case length name.length()+2 for 'name=' part of line
+	for (string::size_type i = 0 ; (i < value.length()) && (pos + name.length() + 2 + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
 	{
 		switch (value[i])
 		{

libvmime07-0.7.1-bmoted-printable.patch:
 encoderFactory.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-bmoted-printable.patch ---
Patch by Zarafa <http://www.zarafa.com/> - we've seen broken mails with an invalid encoding. Unsure what
'bmoted-printable' actually is, we make vmime treat it as normal 'quoted-printable'. 

--- libvmime-0.7.1/src/encoderFactory.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderFactory.cpp.bmoted-printable		2006-04-05 10:35:25.618215000 +0200
@@ -37,6 +37,7 @@
 	// Register some default encoders
 	registerName <encoderB64>("base64");
 	registerName <encoderQP>("quoted-printable");
+	registerName <encoderQP>("bmoted-printable");
 	registerName <encoderUUE>("uuencode");
 	registerName <encoder7bit>("7bit");
 	registerName <encoder8bit>("8bit");

libvmime07-0.7.1-broken-locale-error.patch:
 posixHandler.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-broken-locale-error.patch ---
Patch by Zarafa <http://www.zarafa.com/> - on Debian machines, you need to configure the locales
(languages) that will be used on the system. When you use a locale (eg. 'LC_MESSAGES=nl_NL', but did not
configure your distribution to have this locale present on your system, a NULL pointer would have thrown
an exception in the std::string class. This makes sure that exception never happens.

--- libvmime-0.7.1/src/platforms/posix/posixHandler.cpp			2005-04-30 09:53:21.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixHandler.cpp.broken-locale	2006-12-28 17:29:43.883410000 +0100
@@ -106,9 +106,9 @@
 
 const vmime::charset posixHandler::getLocaleCharset() const
 {
-	vmime::string prevLocale(::setlocale(LC_ALL, ""));
+	char *prevLocale = ::setlocale(LC_ALL, "");
 	vmime::charset ch(::nl_langinfo(CODESET));
-	::setlocale(LC_ALL, prevLocale.c_str());
+	::setlocale(LC_ALL, prevLocale);
 
 	return (ch);
 }

libvmime07-0.7.1-charset-catch.patch:
 word.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-catch.patch ---
Patch by Zarafa <http://www.zarafa.com/> - early catches an exception of vmime when iconv was unable to
convert a word from or to the requested charsets. This makes broken mails with invalid characters for a
valid charset still be able to deliver. We'd rather have an email with a ? sign than a FallbackDelivery
for the user. 

--- libvmime-0.7.1/src/word.cpp						2005-06-13 12:56:52.000000000 +0200
+++ libvmime-0.7.1/src/word.cpp.charset-catch				2005-11-15 18:02:45.000000000 +0100
@@ -688,7 +688,13 @@
 {
 	string out;
 
+	try {
 	charset::convert(m_buffer, out, m_charset, dest);
+	}
+	catch (vmime::exception &e) {
+		// copy 'word' as text
+		out = m_buffer;
+	}
 
 	return (out);
 }

libvmime07-0.7.1-charset-output-buffer-full.patch:
 charset.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-output-buffer-full.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes iconv conversion with source buffers > 64Kb not to add a
'?' and skip one byte of the input buffer.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.charset-output-buffer-full		2008-07-07 13:51:33.414160106 +0200
@@ -206,10 +206,12 @@
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);
 
 				// Ignore this "blocking" character and continue
+				if (outBytesLeft > 0) {
 				out += '?';
 				++inBuffer;
 				--inBytesLeft;
 			}
+			}
 			else
 			{
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);

libvmime07-0.7.1-contentid-without-at.patch:
 messageId.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-contentid-without-at.patch ---
Patch by Zarafa <http://www.zarafa.com/> - enables re-generation of broken content-id's that had no @ sign
in them.

--- libvmime-0.7.1/src/messageId.cpp					2005-03-27 14:59:12.000000000 +0200
+++ libvmime-0.7.1/src/messageId.cpp.contentid-without-at		2007-07-31 14:14:38.827718500 +0200
@@ -102,7 +102,7 @@
 		// Extract left part
 		const string::size_type leftStart = position + (p - pstart);
 
-		while (p < pend && *p != '@') ++p;
+		while (p < pend && *p != '@' && *p != '>') ++p;
 
 		m_left = string(buffer.begin() + leftStart,
 		                buffer.begin() + position + (p - pstart));
@@ -162,6 +162,8 @@
 
 const string messageId::getId() const
 {
+	if (m_right == "")
+		return m_left;
 	return (m_left + '@' + m_right);
 }
 
@@ -177,7 +179,10 @@
 		pos = NEW_LINE_SEQUENCE_LENGTH;
 	}
 
-	os << '<' << m_left << '@' << m_right << '>';
+	os << '<' << m_left;
+	if (m_right != "")
+		os << '@' << m_right;
+	os << '>';
 
 	if (newLinePos)
 		*newLinePos = pos + m_left.length() + m_right.length() + 3;

libvmime07-0.7.1-default-transfer-encoding.patch:
 body.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE libvmime07-0.7.1-default-transfer-encoding.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some broken generators may set the Content-Transfer-Encoding
header, but did not set any value. We'll assume the default value '7bit'.

--- libvmime-0.7.1/src/body.cpp						2007-01-26 14:44:10.259563000 +0100
+++ libvmime-0.7.1/src/body.cpp.default-transfer-encoding		2007-07-13 12:14:30.699846500 +0200
@@ -465,6 +465,9 @@
 		const contentEncodingField& cef = dynamic_cast<contentEncodingField&>
 			(*m_header->findField(fields::CONTENT_TRANSFER_ENCODING));
 
+		if (cef.getValue().getName().empty())
+			return (vmime::encoding(encodingTypes::SEVEN_BIT));
+
 		return (cef.getValue());
 	}
 	catch (exceptions::no_such_field&)

libvmime07-0.7.1-double-empty-boundary.patch:
 body.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-double-empty-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email contains the same boundary to announce a new body
part directly one after another, vmime would have crashed because the body part added to the object with
size of (size_type)(-1). Thus having a body part of 4294967294 bytes on 32bit and 18446744073709551615
bytes on 64 bit systems.

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.double-empty-boundary			2007-11-01 16:45:20.688580500 +0100
@@ -173,7 +173,7 @@
 				++pos;
 			}
 
-			if (index > 0)
+			if (index > 0 && partStart < partEnd)
 			{
 				bodyPart* part = new bodyPart;
 

libvmime07-0.7.1-gcc-4.3-support.patch:
 src/messaging/imap/IMAPMessage.cpp  |    2 +-
 src/platforms/posix/posixSocket.cpp |    1 +
 src/utility/md5.cpp                 |    2 +-
 vmime/utility/filteredStream.hpp    |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-gcc-4.3-support.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds required include headers to compile with g++-4.3 and up.

--- libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp			2005-05-27 21:31:44.000000000 +0200
+++ libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -26,7 +26,7 @@
 
 #include <sstream>
 #include <iterator>
-
+#include <typeinfo>
 
 namespace vmime {
 namespace messaging {
--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.gcc-4.3-support	2008-07-07 15:42:16.700025085 +0200
@@ -19,6 +19,7 @@
 
 #include "vmime/platforms/posix/posixSocket.hpp"
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
--- libvmime-0.7.1/src/utility/md5.cpp					2005-03-18 22:26:48.000000000 +0100
+++ libvmime-0.7.1/src/utility/md5.cpp.gcc-4.3-support			2008-07-07 15:41:38.034166062 +0200
@@ -45,7 +45,7 @@
 //     documentation and/or software.
 
 #include "vmime/utility/md5.hpp"
-
+#include <string.h>
 
 namespace vmime {
 namespace utility {
--- libvmime-0.7.1/vmime/utility/filteredStream.hpp			2005-06-16 21:19:12.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/filteredStream.hpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -22,7 +22,7 @@
 
 
 #include "vmime/utility/stream.hpp"
-
+#include <algorithm>
 
 namespace vmime {
 namespace utility {

libvmime07-0.7.1-gcc-4.4-support.patch:
 posixFile.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-gcc-4.4-support.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1, which adds a missing include file
in order to build successfully with GCC 4.4 and newer.

--- libvmime-0.7.1/src/platforms/posix/posixFile.cpp			2005-04-09 10:42:46.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixFile.cpp.gcc-4.4-support	2009-03-29 21:09:07.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include <dirent.h>
 
+#include <stdio.h>
 #include <string.h>
 
 #include "vmime/exception.hpp"

libvmime07-0.7.1-header-value-on-next-line.patch:
 headerField.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-header-value-on-next-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email header has the data part on the second line,
vmime was unable to parse this data and skip adds the header as empty to it's internal structures. This
makes sure these headers are still correctly parsed.

--- libvmime-0.7.1/src/headerField.cpp					2007-01-26 14:44:10.315567250 +0100
+++ libvmime-0.7.1/src/headerField.cpp.header-value-on-next-line	2007-02-07 13:35:35.177077750 +0100
@@ -147,14 +147,12 @@
 					{
 						contentsEnd = pos;
 						pos += 2;
-						break;
 					}
 					else if (c == '\n')
 					{
 						contentsEnd = pos;
 						++pos;
-						break;
-					}
+					} else {
 
 					while (pos < end)
 					{
@@ -176,6 +174,7 @@
 
 						++pos;
 					}
+					}
 
 					// Handle the case of folded lines
 					if (buffer[pos] == ' ' || buffer[pos] == '\t')

libvmime07-0.7.1-mdn-disposition.patch:
 MDNHelper.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-mdn-disposition.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes a small but crucial typo in a header of an MDN (read
receipt) mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2005-04-09 21:45:07.000000000 +0200
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-disposition		2006-11-28 09:37:56.009129500 +0100
@@ -143,7 +143,7 @@
 
 	hdr->ContentType().setValue(mediaType(vmime::mediaTypes::MULTIPART,
 	                                      vmime::mediaTypes::MULTIPART_REPORT));
-	hdr->ContentType().setReportType("disosition-notification");
+	hdr->ContentType().setReportType("disposition-notification");
 
 	hdr->Disposition().setValue(dispo);
 

libvmime07-0.7.1-mdn-final-recipient.patch:
 MDNHelper.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-mdn-final-recipient.patch ---
Patch by Zarafa <http://www.zarafa.com/> - a header with the final recipient information was created, but
not added to the MDN email. This patch adds this information to the mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2006-11-28 09:43:47.995127250 +0100
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-final-recipient		2006-11-28 09:43:27.505846750 +0100
@@ -246,6 +246,7 @@
 		(headerFieldFactory::getInstance()->create(vmime::fields::FINAL_RECIPIENT));
 
 	fr->setValue("rfc822; " + mdnInfos.getRecipient().getEmail());
+	fields.appendField(fr);
 
 	// -- Original-Message-ID
 	if (mdnInfos.getMessage()->getHeader()->hasField(vmime::fields::MESSAGE_ID))

libvmime07-0.7.1-missing-boundary.patch:
 body.cpp |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE libvmime07-0.7.1-missing-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - broken emails without a final boundary will still be able to
deliver with all attachments. The final part without the boundary will be treated as an attachment. 

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.missing-boundary			2006-01-12 15:45:48.443911888 +0100
@@ -200,6 +200,27 @@
 
 		if (partStart < end)
 			m_epilogText = string(buffer.begin() + partStart, buffer.begin() + end);
+
+		// lastPart was not found, so the last boundary was missing
+		// m_epilogText will become a bodyPart
+		if (!lastPart && pos == string::npos) {
+			bodyPart* part = new bodyPart;
+
+			try
+			{
+				part->parse(m_epilogText);
+			}
+			catch (std::exception&)
+			{
+				delete (part);
+				throw;
+			}
+
+			part->m_parent = m_part;
+
+			m_parts.push_back(part);
+		}
+			
 	}
 	// Treat the contents as 'simple' data
 	else

libvmime07-0.7.1-oe-compatibility.patch:
 defaultParameter.cpp |   66 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

--- NEW FILE libvmime07-0.7.1-oe-compatibility.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes attachment names in Outlook Express which are long and
have high characters.

--- libvmime-0.7.1/src/defaultParameter.cpp				2007-01-26 14:44:10.243562750 +0100
+++ libvmime-0.7.1/src/defaultParameter.cpp.vmime-oe-compatibility	2007-04-24 13:43:36.579203500 +0200
@@ -186,18 +186,18 @@
 {
 	const string& name = getName();
 	const string& value = m_value.getBuffer();
+	string tmpbuf;
+	utility::outputStreamStringAdapter tmpos(tmpbuf);
 
 	// For compatibility with implementations that do not understand RFC-2231,
 	// also generate a normal "7bit/us-ascii" parameter
 	string::size_type pos = curLinePos;
 
-	if (pos + name.length() + 10 + value.length() > maxLineLength)
-	{
-		os << NEW_LINE_SEQUENCE;
+		tmpos << NEW_LINE_SEQUENCE;
 		pos = NEW_LINE_SEQUENCE_LENGTH;
-	}
 
 	bool needQuoting = false;
+	bool needQuotedPrintable = false;
 	string::size_type valueLength = 0;
 
 	// Use worst-case length name.length()+2 for 'name=' part of line
@@ -228,35 +228,50 @@
 			needQuoting = true;
 			break;
 		}
+		if (!parserHelpers::isAscii(value[i]))
+		{
+			needQuotedPrintable = true;
+			needQuoting = true;
+		}
 	}
 
 	const bool cutValue = (valueLength != value.length());  // has the value been cut?
 
 	if (needQuoting)
 	{
-		os << name << "=\"";
+		tmpos << name << "=\"";
 		pos += name.length() + 2;
 	}
 	else
 	{
-		os << name << "=";
+		tmpos << name << "=";
 		pos += name.length() + 1;
 	}
 
 	bool extended = false;
-
-	for (string::size_type i = 0 ; (i < value.length()) && (pos < maxLineLength - 4) ; ++i)
+	if (needQuotedPrintable)
+	{
+		// send the name in quoted-printable, so outlook express et.al. will understand the real filename
+		size_t oldlen = tmpbuf.length();
+		m_value.generate(tmpos);
+		pos += tmpbuf.length() - oldlen;
+		extended = true;		// also send with RFC-2231 encoding
+	}
+	else
+	{
+	// do not chop off this value, but just add the complete name as one header line.
+	for (string::size_type i = 0 ; (i < value.length()) /*&& (pos < maxLineLength - 4) */ ; ++i)
 	{
 		const char_t c = value[i];
 
 		if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
 		{
-			os << '\\' << value[i];  // escape 'x' with '\x'
+			tmpos << '\\' << value[i];  // escape 'x' with '\x'
 			pos += 2;
 		}
 		else if (parserHelpers::isAscii(c))
 		{
-			os << value[i];
+			tmpos << value[i];
 			++pos;
 		}
 		else
@@ -264,10 +279,11 @@
 			extended = true;
 		}
 	}
+	}
 
 	if (needQuoting)
 	{
-		os << '"';
+		tmpos << '"';
 		++pos;
 	}
 
@@ -275,7 +291,7 @@
 	// or is too long for a single line
 	if (extended || cutValue)
 	{
-		os << ';';
+		tmpos << ';';
 		++pos;
 
 		/* RFC-2231
@@ -301,11 +317,8 @@
 			  name.length() + 4 /* *0*= */ + 2 /* '' */
 			+ m_value.getCharset().getName().length();
 
-		if (pos + firstSectionLength + 5 >= maxLineLength)
-		{
-			os << NEW_LINE_SEQUENCE;
+			tmpos << NEW_LINE_SEQUENCE;
 			pos = NEW_LINE_SEQUENCE_LENGTH;
-		}
 
 		// Split text into multiple sections that fit on one line
 		int sectionCount = 0;
@@ -384,33 +397,36 @@
 		// Output sections
 		for (int sectionNumber = 0 ; sectionNumber < sectionCount ; ++sectionNumber)
 		{
-			os << name;
+			tmpos << name;
 
 			if (sectionCount != 1) // no section specifier when only a single one
 			{
-				os << '*';
-				os << sectionNumber;
+				tmpos << '*';
+				tmpos << sectionNumber;
 			}
 
-			os << "*=";
+			tmpos << "*=";
 
 			if (sectionNumber == 0)
 			{
-				os << m_value.getCharset().getName();
-				os << '\'' << /* No language */ '\'';
+				tmpos << m_value.getCharset().getName();
+				tmpos << '\'' << /* No language */ '\'';
 			}
 
-			os << sectionText[sectionNumber];
+			tmpos << sectionText[sectionNumber];
 
 			if (sectionNumber + 1 < sectionCount)
 			{
-				os << ';';
-				os << NEW_LINE_SEQUENCE;
+				tmpos << ';';
+				tmpos << NEW_LINE_SEQUENCE;
 				pos = NEW_LINE_SEQUENCE_LENGTH;
 			}
 		}
 	}
 
+	// write the complete header
+	os << tmpbuf;
+
 	if (newLinePos)
 		*newLinePos = pos;
 }

libvmime07-0.7.1-out-of-bounds-copy.patch:
 filteredStream.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-out-of-bounds-copy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when a line in a plain text mail starts with a '.', the
character needs to be escaped. VMime has a special filter for this, but due to a bug in this filter, a
second line starting with a '.' would trigger a wrong buffer copy, and your email would contain double
parts.

--- libvmime-0.7.1/src/utility/filteredStream.cpp			2005-06-16 21:50:12.000000000 +0200
+++ libvmime-0.7.1/src/utility/filteredStream.cpp.out-of-bounds-copy	2007-06-15 14:29:40.907779750 +0200
@@ -146,7 +146,7 @@
 
 		if (previousChar == '\n')
 		{
-			m_stream.write(start, pos - data);
+			m_stream.write(start, pos - start);
 			m_stream.write("..", 2);
 
 			start = pos + 1;

libvmime07-0.7.1-package.patch:
 configure.in    |    2 +-
 src/Makefile.am |   22 +++++++++++-----------
 vmime.pc.in     |    6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE libvmime07-0.7.1-package.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1 to get libvmime renamed to
libvmime07 to avoid any conflicts with current libvmime series. Note that libvmime 0.7.x, 0.8.x and
0.9.x are unfortunately completely API and ABI incompatible to eachother.

--- libvmime-0.7.1/src/Makefile.am					2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/src/Makefile.am.package				2009-04-05 17:36:46.000000000 +0200
@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 INTERNALS =
 INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
-lib_LTLIBRARIES = libvmime.la
-libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
-libvmime_la_SOURCES = address.cpp \
+lib_LTLIBRARIES = libvmime07.la
+libvmime07_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
+libvmime07_la_SOURCES = address.cpp \
 	addressList.cpp \
 	base.cpp \
 	body.cpp \
@@ -82,7 +82,7 @@
 	misc_importanceHelper.cpp
 
 if VMIME_HAVE_MESSAGING_FEATURES
-libvmime_la_SOURCES += messaging_authenticator.cpp \
+libvmime07_la_SOURCES += messaging_authenticator.cpp \
 	messaging_authenticationInfos.cpp \
 	messaging_authHelper.cpp \
 	messaging_builtinServices.inl \
@@ -99,17 +99,17 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-libvmime_la_SOURCES += messaging_pop3_POP3Store.cpp \
+libvmime07_la_SOURCES += messaging_pop3_POP3Store.cpp \
 	messaging_pop3_POP3Folder.cpp \
 	messaging_pop3_POP3Message.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-libvmime_la_SOURCES += messaging_smtp_SMTPTransport.cpp
+libvmime07_la_SOURCES += messaging_smtp_SMTPTransport.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-libvmime_la_SOURCES += messaging_imap_IMAPConnection.cpp \
+libvmime07_la_SOURCES += messaging_imap_IMAPConnection.cpp \
 	messaging_imap_IMAPStore.cpp \
 	messaging_imap_IMAPFolder.cpp \
 	messaging_imap_IMAPMessage.cpp \
@@ -118,24 +118,24 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-libvmime_la_SOURCES += messaging_maildir_maildirStore.cpp \
+libvmime07_la_SOURCES += messaging_maildir_maildirStore.cpp \
 	messaging_maildir_maildirFolder.cpp \
 	messaging_maildir_maildirMessage.cpp \
 	messaging_maildir_maildirUtils.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SENDMAIL
-libvmime_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
+libvmime07_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_WINDOWS
-libvmime_la_SOURCES += platforms_windows_windowsFile.cpp \
+libvmime07_la_SOURCES += platforms_windows_windowsFile.cpp \
 	platforms_windows_windowsHandler.cpp \
 	platforms_windows_windowsSocket.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_POSIX
-libvmime_la_SOURCES += platforms_posix_posixChildProcess.cpp \
+libvmime07_la_SOURCES += platforms_posix_posixChildProcess.cpp \
 	platforms_posix_posixFile.cpp \
 	platforms_posix_posixHandler.cpp \
 	platforms_posix_posixSocket.cpp
--- libvmime-0.7.1/configure.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/configure.in.package					2009-04-06 20:42:53.000000000 +0200
@@ -18,7 +18,7 @@
 GENERIC_VERSIONED_LIBRARY_NAME="vmime"
 AC_SUBST(GENERIC_VERSIONED_LIBRARY_NAME)
 
-LIBRARY_NAME="libvmime"
+LIBRARY_NAME="libvmime07"
 AC_SUBST(LIBRARY_NAME)
 
 # Library version
--- libvmime-0.7.1/vmime.pc.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/vmime.pc.in.package					2009-04-06 20:46:07.000000000 +0200
@@ -6,9 +6,9 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @GENERIC_LIBRARY_NAME@
+Name: vmime07
 Description: VMime C++ Mail Library (http://vmime.sourceforge.net)
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -l at GENERIC_VERSIONED_LIBRARY_NAME@
-Cflags: -I${includedir}/
+Libs: -L${libdir} -lvmime07
+Cflags: -I${includedir}/libvmime07/

libvmime07-0.7.1-plain-bodycopy.patch:
 messageBuilder.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-plain-bodycopy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when constructing a plaintext only body without attachments, a
copy of the body was made to set as the real body and thus removing all the multiparts. However, the same
reference is removed before setting the new body, thus invalidating that body we wish to copy, possibly
resulting in a crash.

--- libvmime-0.7.1/src/messageBuilder.cpp				2009-09-15 22:59:21.000000000 +0200
+++ libvmime-0.7.1/src/messageBuilder.cpp.plain-bodycopy		2009-09-15 23:00:33.000000000 +0200
@@ -137,6 +137,8 @@
 	if (msg->getBody()->getPartCount() == 1)
 	{
 		const bodyPart& part = *msg->getBody()->getPartAt(0);
+		// make a full copy of the body, otherwise the copyFrom will delete the body we're copying
+		const body* bodyCopy = part.getBody()->clone();
 
 		// First, copy (and replace) the header fields
 		const std::vector <const headerField*> fields = part.getHeader()->getFieldList();
@@ -149,7 +151,8 @@
 
 		// Second, copy the body contents and sub-parts (this also remove
 		// the body part we are copying...)
-		msg->getBody()->copyFrom(*part.getBody());
+		msg->getBody()->copyFrom(*bodyCopy);
+		delete bodyCopy;
 	}
 
 	return (msg);

libvmime07-0.7.1-qp-starts-on-second-line.patch:
 word.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-qp-starts-on-second-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - headers can be broken over multiple lines in an email. When
the wrapped line directly started with quoted-printable, vmime copied this text as normal text, instead
of parsing it as quoted-printable. 

--- libvmime-0.7.1/src/word.cpp						2007-01-26 14:44:10.251563000 +0100
+++ libvmime-0.7.1/src/word.cpp.qp-starts-on-second-line		2007-01-26 14:45:01.074739500 +0100
@@ -91,6 +91,7 @@
 			unencoded += ' ';
 
 			startPos = pos;
+			continue;
 		}
 		// Start of an encoded word
 		else if (pos + 8 < end &&  // 8 = "=?(.+)?(.+)?(.*)?="

libvmime07-0.7.1-quoted-printable-encode-questionmark.patch:
 encoderQP.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-quoted-printable-encode-questionmark.patch ---
Patch by Zarafa <http://www.zarafa.com/> - special characters break the quoted-printable encoding when
they are typed after a ?. This fix also encodes ?-characters, so we can't break the encoding with this
trick.

--- libvmime-0.7.1/src/encoderQP.cpp					2008-03-10 13:57:05.055163691 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-encode-question	2008-03-10 13:51:53.071163435 +0100
@@ -249,7 +249,7 @@
 		default:
 		{
 			//if ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))
-			if (c >= 33 && c <= 126 && c != 61)
+			if (c >= 33 && c <= 126 && c != 61 && c!= 63)
 			{
 				outBuffer[outBufferPos++] = c;
 				++curCol;

libvmime07-0.7.1-quoted-printable-specials.patch:
 encoderQP.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-quoted-printable-specials.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch adds some characters that should be "escaped" in
quoted-printable. With this fix you can have these characters in a fullname of an email address.

--- libvmime-0.7.1/src/encoderQP.cpp					2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-specials		2007-02-02 10:09:26.273653250 +0100
@@ -214,10 +214,18 @@
 			QP_ENCODE_HEX('=')
 			break;
 		}
+		// http://www.faqs.org/rfcs/rfc2047.html, see 'especials' characters
 		case ',':
 		case ';':
 		case ':':
 		case '_':
+		case '@':
+		case '(':
+		case ')':
+		case '<':
+		case '>':
+		case '[':
+		case ']':
 		{
 			if (rfc2047)
 			{

libvmime07-0.7.1-remove-bcc.patch:
 transport.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-remove-bcc.patch ---
Patch by Zarafa <http://www.zarafa.com/> - Bcc headers should not be send to the SMTP server. Some SMTP
servers automatically strip this header (Postfix, qmail), and others have an option for this (Exim).

--- libvmime-0.7.1/src/messaging/transport.cpp				2005-04-27 18:42:58.000000000 +0200
+++ libvmime-0.7.1/src/messaging/transport.cpp.remove-bcc		2006-10-10 14:01:43.602621328 +0200
@@ -90,6 +90,14 @@
 	}
 	catch (exceptions::no_such_field&) { }
 
+	// Remove BCC headers from the message we're about to send
+	try {
+		headerField* bcc = msg->getHeader()->findField(fields::BCC);
+
+		msg->getHeader()->removeField(bcc);
+	}
+	catch (exceptions::no_such_field&) { }
+
 	// Generate the message, "stream" it and delegate the sending
 	// to the generic send() function.
 	std::ostringstream oss;

libvmime07-0.7.1-socket-backport-and-timeout-fix.patch:
 src/platforms/posix/posixSocket.cpp   |  102 +++++++++++++++++++++++++++-------
 vmime/platforms/posix/posixSocket.hpp |    3 +
 2 files changed, 85 insertions(+), 20 deletions(-)

--- NEW FILE libvmime07-0.7.1-socket-backport-and-timeout-fix.patch ---
Patch by Zarafa <http://www.zarafa.com/> - small partial backport of some socket handling code from 0.8.1.
Only receiving data is handled better. The patch also adds a timeout, when receiving data from a socket
hasn't worked for 5 minutes. This isn't present in 0.8.1.

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-timeout	2007-10-18 11:02:54.000000000 +0200
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "vmime/exception.hpp"
 
@@ -43,7 +44,7 @@
 //
 
 posixSocket::posixSocket()
-	: m_desc(-1)
+	: m_desc(-1), m_timeouts(0)
 {
 }
 
@@ -101,6 +102,8 @@
 		// Error
 		throw vmime::exceptions::connection_error("Error while connecting socket.");
 	}
+
+	m_timeouts = 0;
 }
 
 
@@ -121,38 +124,62 @@
 	}
 }
 
-
 void posixSocket::receive(vmime::string& buffer)
 {
-	::ssize_t ret = ::recv(m_desc, m_buffer, sizeof(m_buffer), 0);
-
-	if (ret == -1)
-	{
-		// Error or no data
-		return;
-	}
-	else if (ret > 0)
-	{
-		buffer = vmime::string(m_buffer, ret);
-	}
+	const int size = receiveRaw(m_buffer, sizeof(m_buffer));
+	buffer = vmime::string(m_buffer, size);
 }
 
 
 const int posixSocket::receiveRaw(char* buffer, const int count)
 {
-	::ssize_t ret = ::recv(m_desc, buffer, count, 0);
+	fd_set fds;
+	struct timeval tv;
+	int ret;
+
+	FD_ZERO(&fds);
+	FD_SET(m_desc, &fds);
+
+	tv.tv_sec = 10;
+	tv.tv_usec = 0;
+
+	ret = ::select(m_desc+1, &fds, NULL, NULL, &tv);
+	if (ret < 0)
+	{
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
+	}
 
-	if (ret == -1)
+	ret = ::recv(m_desc, buffer, count, 0);
+
+	if (ret < 0)
 	{
-		// Error or no data
-		return (0);
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
 	}
-	else
+	else if (ret == 0)
 	{
-		return (ret);
+		// Host shutdown
+		throwSocketError(ENOTCONN);
 	}
-}
 
+	m_timeouts = 0;
+	return ret;
+}
 
 void posixSocket::send(const vmime::string& buffer)
 {
@@ -166,6 +193,41 @@
 }
 
 
+void posixSocket::throwSocketError(const int err)
+{
+	string msg;
+
+	switch (err)
+	{
+	case EACCES:          msg = "EACCES: permission denied"; break;
+	case EAFNOSUPPORT:    msg = "EAFNOSUPPORT: address family not supported"; break;
+	case EMFILE:          msg = "EMFILE: process file table overflow"; break;
+	case ENFILE:          msg = "ENFILE: system limit reached"; break;
+	case EPROTONOSUPPORT: msg = "EPROTONOSUPPORT: protocol not supported"; break;
+	case EAGAIN:          msg = "EAGAIN: blocking operation"; break;
+	case EBADF:           msg = "EBADF: invalid descriptor"; break;
+	case ECONNRESET:      msg = "ECONNRESET: connection reset by peer"; break;
+	case EFAULT:          msg = "EFAULT: bad user space address"; break;
+	case EINTR:           msg = "EINTR: signal occured before transmission"; break;
+	case EINVAL:          msg = "EINVAL: invalid argument"; break;
+	case EMSGSIZE:        msg = "EMSGSIZE: message cannot be sent atomically"; break;
+	case ENOBUFS:         msg = "ENOBUFS: output queue is full"; break;
+	case ENOMEM:          msg = "ENOMEM: out of memory"; break;
+	case EPIPE:
+	case ENOTCONN:        msg = "ENOTCONN: not connected"; break;
+	case ECONNREFUSED:    msg = "ECONNREFUSED: connection refused"; break;
+	default:
+
+		std::ostringstream oss;
+		oss << ::strerror(err);
+
+		msg = oss.str();
+		break;
+	}
+
+	throw vmime::exceptions::connection_error(msg);
+}
+
 
 
 //
--- libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp		2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp.socket-timeout	2007-10-18 10:34:46.000000000 +0200
@@ -49,10 +49,13 @@
 	void send(const vmime::string& buffer);
 	void sendRaw(const char* buffer, const int count);
 
+	void throwSocketError(const int err);
+
 private:
 
 	char m_buffer[65536];
 	int m_desc;
+	int m_timeouts;
 };
 
 

libvmime07-0.7.1-socket-tcp-nodelay.patch:
 posixSocket.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE libvmime07-0.7.1-socket-tcp-nodelay.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds the TCP_NODELAY flag to vmime sockets. This should mak
the SMTP connection faster

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-tcp	2009-03-27 10:51:06.405594549 +0100
@@ -25,6 +25,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -59,6 +60,8 @@
 
 void posixSocket::connect(const vmime::string& address, const vmime::port_t port)
 {
+	int flag = 1;
+
 	// Close current connection, if any
 	if (m_desc != -1)
 	{
@@ -94,6 +97,8 @@
 	if (m_desc == -1)
 		throw vmime::exceptions::connection_error("Error while creating socket.");
 
+	::setsockopt(m_desc, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
+
 	// Start connection
 	if (::connect(m_desc, reinterpret_cast <sockaddr*>(&addr), sizeof(addr)) == -1)
 	{

libvmime07-0.7.1-strip-header-endspaces.patch:
 headerField.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-strip-header-endspaces.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch makes sure that vmime does not parse trailing spaces
on an header. Otherwise vmime will throw an exception and a fallback delivery will be started.

--- libvmime-0.7.1/src/headerField.cpp					2007-07-31 12:54:21.898679250 +0200
+++ libvmime-0.7.1/src/headerField.cpp.strip-header-endspaces		2007-07-31 12:43:08.408588750 +0200
@@ -189,6 +189,14 @@
 					}
 				}
 
+				// strip spaces from end of header lines, also through continuation headers
+				contentsEnd--;	// original enter
+				while (contentsEnd>contentsStart &&
+					   (buffer[contentsEnd] == ' ' || buffer[contentsEnd] == '\t' ||
+						buffer[contentsEnd] == '\r' || buffer[contentsEnd] == '\n'))
+					contentsEnd--;
+				contentsEnd++;	// new 'enter'
+
 				// Return a new field
 				headerField* field = headerFieldFactory::getInstance()->create(name);
 

libvmime07-0.7.1-threading-remove-static_non-abi-change.patch:
 smartPtr.hpp |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE libvmime07-0.7.1-threading-remove-static_non-abi-change.patch ---
Patch by Zarafa <http://www.zarafa.com/> - workaround a static variable in the smart_ptr class using a
pthread mutex, which fixes multi-threading issues in libvmime.

--- libvmime-0.7.1/vmime/utility/smartPtr.hpp				2005-05-19 19:17:17.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/smartPtr.hpp.threading-remove-static	2009-05-13 15:21:53.276875219 +0200
@@ -20,6 +20,9 @@
 #ifndef VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 #define VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 
+// non-portable, but at least not an abi change
+#include <pthread.h>
+static pthread_mutex_t mapLock = PTHREAD_MUTEX_INITIALIZER;
 
 namespace vmime {
 namespace utility {
@@ -108,8 +111,10 @@
 		{
 			if (m_data->refCount == 1)
 			{
+				pthread_mutex_lock(&mapLock);
 				typename MapType::iterator it = sm_map.find(m_data->ptr);
 				if (it != sm_map.end()) sm_map.erase(it);
+				pthread_mutex_unlock(&mapLock);
 
 				delete (m_data->ptr);
 				delete (m_data);
@@ -127,6 +132,8 @@
 	{
 		detach();
 
+		pthread_mutex_lock(&mapLock);
+
 		typename MapType::iterator it = sm_map.find(p);
 
 		if (it != sm_map.end())
@@ -141,6 +148,8 @@
 
 			sm_map.insert(typename MapType::value_type(p, m_data));
 		}
+
+		pthread_mutex_unlock(&mapLock);
 	}
 
 	void attach(const smart_ptr <T>& p)

libvmime07-0.7.1-timezone-name.patch:
 dateTime.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-timezone-name.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes dates in headers which use a timezone definition, instead
of a numeric timezone offset.

--- libvmime-0.7.1/src/dateTime.cpp					2005-04-23 11:02:48.000000000 +0200
+++ libvmime-0.7.1/src/dateTime.cpp.timezone-name			2009-01-08 10:51:39.000000000 +0100
@@ -423,7 +423,7 @@
 				zone[zoneLength++] = *p;
 				++p;
 			}
-			while (zoneLength < 3 && p < pend && parserHelpers::isDigit(*p));
+			while (zoneLength < 3 && p < pend);
 
 			switch (zone[0])
 			{
@@ -487,6 +487,8 @@
 
 				break;
 			}
+			case 'g':
+			case 'G':
 			case 'u':
 			case 'U':
 			{

libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch:
 charset.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some mails have a special definition of the utf-7 character
set, named unicode-1-1-utf-7. Since this name is not defined by iconv, we rename it to utf-7. This name
seems to come from RFC 1642 <http://www.faqs.org/rfcs/rfc1642.html>.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.unicode-1-1-utf-7-charset		2007-04-23 17:08:46.714435000 +0200
@@ -64,6 +64,9 @@
 charset::charset(const string& name)
 	: m_name(name)
 {
+	// if we receive this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
 }
 
 
@@ -72,6 +75,10 @@
 {
 	m_name = string(buffer.begin() + position, buffer.begin() + end);
 
+	// if we parsed this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
+
 	setParsedBounds(position, end);
 
 	if (newPosition)


--- NEW FILE libvmime07.spec ---
Summary:	A powerful C++ class library for working with MIME/Internet messages
Name:		libvmime07
Version:	0.7.1
Release:	1%{?dist}
License:	GPLv2+
Group:		System Environment/Libraries
URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
Source0:	http://developer.zarafa.com/download/libvmime-%{version}.tar.bz2
Patch0:		libvmime07-0.7.1-package.patch
Patch1:		libvmime07-0.7.1-charset-catch.patch
Patch2:		libvmime07-0.7.1-missing-boundary.patch
Patch3:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
Patch4:		libvmime07-0.7.1-bmoted-printable.patch
Patch5:		libvmime07-0.7.1-strip-header-endspaces.patch
Patch6:		libvmime07-0.7.1-attachfnamelen.patch
Patch7:		libvmime07-0.7.1-remove-bcc.patch
Patch8:		libvmime07-0.7.1-mdn-disposition.patch
Patch9:		libvmime07-0.7.1-mdn-final-recipient.patch
Patch10:	libvmime07-0.7.1-broken-locale-error.patch
Patch11:	libvmime07-0.7.1-qp-starts-on-second-line.patch
Patch12:	libvmime07-0.7.1-quoted-printable-specials.patch
Patch13:	libvmime07-0.7.1-header-value-on-next-line.patch
Patch14:	libvmime07-0.7.1-oe-compatibility.patch
Patch15:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
Patch16:	libvmime07-0.7.1-out-of-bounds-copy.patch
Patch17:	libvmime07-0.7.1-default-transfer-encoding.patch
Patch18:	libvmime07-0.7.1-contentid-without-at.patch
Patch19:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
Patch20:	libvmime07-0.7.1-double-empty-boundary.patch
Patch21:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
Patch22:	libvmime07-0.7.1-charset-output-buffer-full.patch
Patch23:	libvmime07-0.7.1-gcc-4.3-support.patch
Patch24:	libvmime07-0.7.1-timezone-name.patch
Patch25:	libvmime07-0.7.1-socket-tcp-nodelay.patch
Patch26:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
Patch27:	libvmime07-0.7.1-gcc-4.4-support.patch
Patch28:	libvmime07-0.7.1-plain-bodycopy.patch
BuildRequires:	sendmail, libtool, autoconf, automake
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
VMime is a powerful C++ class library for parsing, generating or
editing Internet RFC-[2]822 and MIME messages. VMime is designed
to provide a fast and an easy way to manipulate Internet mail
messages.

It also includes support for using messaging protocols (POP3, IMAP,
SMTP and maildir) with a lot of features supported: listing folders,
downloading and adding messages to folders, extracting parts from
message, getting and setting message flags and a lot more.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%package devel
Summary:	Development files for the libvmime library
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig

%description devel
The libvmime package includes header files and libraries necessary
for developing programs which use the libvmime C++ class library.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%prep
%setup -q -n libvmime-%{version}
%patch0 -p1 -b .package
%patch1 -p1 -b .charset-catch
%patch2 -p1 -b .missing-boundary
%patch3 -p1 -b .allow-no-recips-and-senders
%patch4 -p1 -b .bmoted-printable
%patch5 -p1 -b .strip-header-endspaces
%patch6 -p1 -b .attachfnamelen
%patch7 -p1 -b .remove-bcc
%patch8 -p1 -b .mdn-disposition
%patch9 -p1 -b .mdn-final-recipient
%patch10 -p1 -b .broken-locale-error
%patch11 -p1 -b .qp-starts-on-second-line
%patch12 -p1 -b .quoted-printable-specials
%patch13 -p1 -b .header-value-on-next-line
%patch14 -p1 -b .oe-compatibility
%patch15 -p1 -b .unicode-1-1-utf-7-charset
%patch16 -p1 -b .out-of-bounds-copy
%patch17 -p1 -b .default-transfer-encoding
%patch18 -p1 -b .contentid-without-at
%patch19 -p1 -b .socket-backport-and-timeout-fix
%patch20 -p1 -b .double-empty-boundary
%patch21 -p1 -b .quoted-printable-encode-questionmark
%patch22 -p1 -b .charset-output-buffer-full
%patch23 -p1 -b .gcc-4.3-support
%patch24 -p1 -b .timezone-name
%patch25 -p1 -b .socket-tcp-nodelay
%patch26 -p1 -b .threading-remove-static_non-abi-change
%patch27 -p1 -b .gcc-4.4-support
%patch28 -p1 -b .plain-bodycopy

# Needed to apply branding patch
libtoolize --force
autoreconf --force --install

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Complete the libvmime07 renaming at some places
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
mv -f $RPM_BUILD_ROOT%{_includedir}/{vmime,%{name}}/
mv -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vmime{,07}.pc 

# Remove the static library and libtool .la file
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}

# Remove the documentation dir, as %doc will pick it up
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/%{name}.so
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/vmime07.pc

%changelog
* Sat Sep 05 2009 Robert Scheck <robert at fedoraproject.org> 0.7.1-1
- Upgrade to 0.7.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:17:43 -0000	1.1
+++ .cvsignore	16 Sep 2009 21:50:27 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:17:43 -0000	1.1
+++ sources	16 Sep 2009 21:50:28 -0000	1.2
@@ -0,0 +1 @@
+81f06a771d2de01d5982635838eb5f6a  libvmime-0.7.1.tar.bz2



From robert at fedoraproject.org  Wed Sep 16 21:50:27 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 16 Sep 2009 21:50:27 +0000 (UTC)
Subject: rpms/libvmime07/EL-4
	libvmime07-0.7.1-allow-no-recips-and-senders.patch, NONE,
	1.1 libvmime07-0.7.1-attachfnamelen.patch, NONE,
	1.1 libvmime07-0.7.1-bmoted-printable.patch, NONE,
	1.1 libvmime07-0.7.1-broken-locale-error.patch, NONE,
	1.1 libvmime07-0.7.1-charset-catch.patch, NONE,
	1.1 libvmime07-0.7.1-charset-output-buffer-full.patch, NONE,
	1.1 libvmime07-0.7.1-contentid-without-at.patch, NONE,
	1.1 libvmime07-0.7.1-default-transfer-encoding.patch, NONE,
	1.1 libvmime07-0.7.1-double-empty-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.3-support.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.4-support.patch, NONE,
	1.1 libvmime07-0.7.1-header-value-on-next-line.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-disposition.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-final-recipient.patch, NONE,
	1.1 libvmime07-0.7.1-missing-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-oe-compatibility.patch, NONE,
	1.1 libvmime07-0.7.1-out-of-bounds-copy.patch, NONE,
	1.1 libvmime07-0.7.1-package.patch, NONE,
	1.1 libvmime07-0.7.1-plain-bodycopy.patch, NONE,
	1.1 libvmime07-0.7.1-qp-starts-on-second-line.patch, NONE,
	1.1 libvmime07-0.7.1-quoted-printable-encode-questionmark.patch,
	NONE, 1.1 libvmime07-0.7.1-quoted-printable-specials.patch, NONE,
	1.1 libvmime07-0.7.1-remove-bcc.patch, NONE,
	1.1 libvmime07-0.7.1-socket-backport-and-timeout-fix.patch, NONE,
	1.1 libvmime07-0.7.1-socket-tcp-nodelay.patch, NONE,
	1.1 libvmime07-0.7.1-strip-header-endspaces.patch, NONE,
	1.1 libvmime07-0.7.1-threading-remove-static_non-abi-change.patch,
	NONE, 1.1 libvmime07-0.7.1-timezone-name.patch, NONE,
	1.1 libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch, NONE,
	1.1 libvmime07.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090916215027.B892911C0336@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	libvmime07-0.7.1-allow-no-recips-and-senders.patch 
	libvmime07-0.7.1-attachfnamelen.patch 
	libvmime07-0.7.1-bmoted-printable.patch 
	libvmime07-0.7.1-broken-locale-error.patch 
	libvmime07-0.7.1-charset-catch.patch 
	libvmime07-0.7.1-charset-output-buffer-full.patch 
	libvmime07-0.7.1-contentid-without-at.patch 
	libvmime07-0.7.1-default-transfer-encoding.patch 
	libvmime07-0.7.1-double-empty-boundary.patch 
	libvmime07-0.7.1-gcc-4.3-support.patch 
	libvmime07-0.7.1-gcc-4.4-support.patch 
	libvmime07-0.7.1-header-value-on-next-line.patch 
	libvmime07-0.7.1-mdn-disposition.patch 
	libvmime07-0.7.1-mdn-final-recipient.patch 
	libvmime07-0.7.1-missing-boundary.patch 
	libvmime07-0.7.1-oe-compatibility.patch 
	libvmime07-0.7.1-out-of-bounds-copy.patch 
	libvmime07-0.7.1-package.patch 
	libvmime07-0.7.1-plain-bodycopy.patch 
	libvmime07-0.7.1-qp-starts-on-second-line.patch 
	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch 
	libvmime07-0.7.1-quoted-printable-specials.patch 
	libvmime07-0.7.1-remove-bcc.patch 
	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch 
	libvmime07-0.7.1-socket-tcp-nodelay.patch 
	libvmime07-0.7.1-strip-header-endspaces.patch 
	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch 
	libvmime07-0.7.1-timezone-name.patch 
	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch 
	libvmime07.spec 
Log Message:
Populate libvmime07 to Fedora and EPEL branches


libvmime07-0.7.1-allow-no-recips-and-senders.patch:
 messageBuilder.cpp |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE libvmime07-0.7.1-allow-no-recips-and-senders.patch ---
Patch by Zarafa <http://www.zarafa.com/> - makes the messageBuilder helper generate an mail without To or
Cc headers. This way, an email with only Bcc entries will still be sent. This feature is mostly used by
people to mask a mailing list or invitation that should be send to alot of people.

--- libvmime-0.7.1/src/messageBuilder.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/messageBuilder.cpp.allow-no-recips-and-senders	2006-01-13 09:49:51.000000000 +0100
@@ -50,14 +50,11 @@
 	// Generate the header fields
 	msg->getHeader()->Subject().setValue(m_subject);
 
-	if (m_from.isEmpty())
-		throw exceptions::no_expeditor();
-
-	if (m_to.isEmpty() || m_to.getAddressAt(0)->isEmpty())
-		throw exceptions::no_recipient();
-
-	msg->getHeader()->From().setValue(m_from);
-	msg->getHeader()->To().setValue(m_to);
+	if (!m_from.isEmpty())
+		msg->getHeader()->From().setValue(m_from);
+		
+	if (!m_to.isEmpty())
+		msg->getHeader()->To().setValue(m_to);
 
 	if (!m_cc.isEmpty())
 		msg->getHeader()->Cc().setValue(m_cc);

libvmime07-0.7.1-attachfnamelen.patch:
 defaultParameter.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-attachfnamelen.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes parsing of an attachment filename that is between 66 and
76 characters long.

--- libvmime-0.7.1/src/defaultParameter.cpp				2005-06-21 19:06:35.000000000 +0200
+++ libvmime-0.7.1/src/defaultParameter.cpp.attachfnamelen		2006-08-01 10:42:18.277853120 +0200
@@ -200,7 +200,8 @@
 	bool needQuoting = false;
 	string::size_type valueLength = 0;
 
-	for (string::size_type i = 0 ; (i < value.length()) && (pos + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
+	// Use worst-case length name.length()+2 for 'name=' part of line
+	for (string::size_type i = 0 ; (i < value.length()) && (pos + name.length() + 2 + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
 	{
 		switch (value[i])
 		{

libvmime07-0.7.1-bmoted-printable.patch:
 encoderFactory.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-bmoted-printable.patch ---
Patch by Zarafa <http://www.zarafa.com/> - we've seen broken mails with an invalid encoding. Unsure what
'bmoted-printable' actually is, we make vmime treat it as normal 'quoted-printable'. 

--- libvmime-0.7.1/src/encoderFactory.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderFactory.cpp.bmoted-printable		2006-04-05 10:35:25.618215000 +0200
@@ -37,6 +37,7 @@
 	// Register some default encoders
 	registerName <encoderB64>("base64");
 	registerName <encoderQP>("quoted-printable");
+	registerName <encoderQP>("bmoted-printable");
 	registerName <encoderUUE>("uuencode");
 	registerName <encoder7bit>("7bit");
 	registerName <encoder8bit>("8bit");

libvmime07-0.7.1-broken-locale-error.patch:
 posixHandler.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-broken-locale-error.patch ---
Patch by Zarafa <http://www.zarafa.com/> - on Debian machines, you need to configure the locales
(languages) that will be used on the system. When you use a locale (eg. 'LC_MESSAGES=nl_NL', but did not
configure your distribution to have this locale present on your system, a NULL pointer would have thrown
an exception in the std::string class. This makes sure that exception never happens.

--- libvmime-0.7.1/src/platforms/posix/posixHandler.cpp			2005-04-30 09:53:21.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixHandler.cpp.broken-locale	2006-12-28 17:29:43.883410000 +0100
@@ -106,9 +106,9 @@
 
 const vmime::charset posixHandler::getLocaleCharset() const
 {
-	vmime::string prevLocale(::setlocale(LC_ALL, ""));
+	char *prevLocale = ::setlocale(LC_ALL, "");
 	vmime::charset ch(::nl_langinfo(CODESET));
-	::setlocale(LC_ALL, prevLocale.c_str());
+	::setlocale(LC_ALL, prevLocale);
 
 	return (ch);
 }

libvmime07-0.7.1-charset-catch.patch:
 word.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-catch.patch ---
Patch by Zarafa <http://www.zarafa.com/> - early catches an exception of vmime when iconv was unable to
convert a word from or to the requested charsets. This makes broken mails with invalid characters for a
valid charset still be able to deliver. We'd rather have an email with a ? sign than a FallbackDelivery
for the user. 

--- libvmime-0.7.1/src/word.cpp						2005-06-13 12:56:52.000000000 +0200
+++ libvmime-0.7.1/src/word.cpp.charset-catch				2005-11-15 18:02:45.000000000 +0100
@@ -688,7 +688,13 @@
 {
 	string out;
 
+	try {
 	charset::convert(m_buffer, out, m_charset, dest);
+	}
+	catch (vmime::exception &e) {
+		// copy 'word' as text
+		out = m_buffer;
+	}
 
 	return (out);
 }

libvmime07-0.7.1-charset-output-buffer-full.patch:
 charset.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-output-buffer-full.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes iconv conversion with source buffers > 64Kb not to add a
'?' and skip one byte of the input buffer.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.charset-output-buffer-full		2008-07-07 13:51:33.414160106 +0200
@@ -206,10 +206,12 @@
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);
 
 				// Ignore this "blocking" character and continue
+				if (outBytesLeft > 0) {
 				out += '?';
 				++inBuffer;
 				--inBytesLeft;
 			}
+			}
 			else
 			{
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);

libvmime07-0.7.1-contentid-without-at.patch:
 messageId.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-contentid-without-at.patch ---
Patch by Zarafa <http://www.zarafa.com/> - enables re-generation of broken content-id's that had no @ sign
in them.

--- libvmime-0.7.1/src/messageId.cpp					2005-03-27 14:59:12.000000000 +0200
+++ libvmime-0.7.1/src/messageId.cpp.contentid-without-at		2007-07-31 14:14:38.827718500 +0200
@@ -102,7 +102,7 @@
 		// Extract left part
 		const string::size_type leftStart = position + (p - pstart);
 
-		while (p < pend && *p != '@') ++p;
+		while (p < pend && *p != '@' && *p != '>') ++p;
 
 		m_left = string(buffer.begin() + leftStart,
 		                buffer.begin() + position + (p - pstart));
@@ -162,6 +162,8 @@
 
 const string messageId::getId() const
 {
+	if (m_right == "")
+		return m_left;
 	return (m_left + '@' + m_right);
 }
 
@@ -177,7 +179,10 @@
 		pos = NEW_LINE_SEQUENCE_LENGTH;
 	}
 
-	os << '<' << m_left << '@' << m_right << '>';
+	os << '<' << m_left;
+	if (m_right != "")
+		os << '@' << m_right;
+	os << '>';
 
 	if (newLinePos)
 		*newLinePos = pos + m_left.length() + m_right.length() + 3;

libvmime07-0.7.1-default-transfer-encoding.patch:
 body.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE libvmime07-0.7.1-default-transfer-encoding.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some broken generators may set the Content-Transfer-Encoding
header, but did not set any value. We'll assume the default value '7bit'.

--- libvmime-0.7.1/src/body.cpp						2007-01-26 14:44:10.259563000 +0100
+++ libvmime-0.7.1/src/body.cpp.default-transfer-encoding		2007-07-13 12:14:30.699846500 +0200
@@ -465,6 +465,9 @@
 		const contentEncodingField& cef = dynamic_cast<contentEncodingField&>
 			(*m_header->findField(fields::CONTENT_TRANSFER_ENCODING));
 
+		if (cef.getValue().getName().empty())
+			return (vmime::encoding(encodingTypes::SEVEN_BIT));
+
 		return (cef.getValue());
 	}
 	catch (exceptions::no_such_field&)

libvmime07-0.7.1-double-empty-boundary.patch:
 body.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-double-empty-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email contains the same boundary to announce a new body
part directly one after another, vmime would have crashed because the body part added to the object with
size of (size_type)(-1). Thus having a body part of 4294967294 bytes on 32bit and 18446744073709551615
bytes on 64 bit systems.

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.double-empty-boundary			2007-11-01 16:45:20.688580500 +0100
@@ -173,7 +173,7 @@
 				++pos;
 			}
 
-			if (index > 0)
+			if (index > 0 && partStart < partEnd)
 			{
 				bodyPart* part = new bodyPart;
 

libvmime07-0.7.1-gcc-4.3-support.patch:
 src/messaging/imap/IMAPMessage.cpp  |    2 +-
 src/platforms/posix/posixSocket.cpp |    1 +
 src/utility/md5.cpp                 |    2 +-
 vmime/utility/filteredStream.hpp    |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-gcc-4.3-support.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds required include headers to compile with g++-4.3 and up.

--- libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp			2005-05-27 21:31:44.000000000 +0200
+++ libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -26,7 +26,7 @@
 
 #include <sstream>
 #include <iterator>
-
+#include <typeinfo>
 
 namespace vmime {
 namespace messaging {
--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.gcc-4.3-support	2008-07-07 15:42:16.700025085 +0200
@@ -19,6 +19,7 @@
 
 #include "vmime/platforms/posix/posixSocket.hpp"
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
--- libvmime-0.7.1/src/utility/md5.cpp					2005-03-18 22:26:48.000000000 +0100
+++ libvmime-0.7.1/src/utility/md5.cpp.gcc-4.3-support			2008-07-07 15:41:38.034166062 +0200
@@ -45,7 +45,7 @@
 //     documentation and/or software.
 
 #include "vmime/utility/md5.hpp"
-
+#include <string.h>
 
 namespace vmime {
 namespace utility {
--- libvmime-0.7.1/vmime/utility/filteredStream.hpp			2005-06-16 21:19:12.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/filteredStream.hpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -22,7 +22,7 @@
 
 
 #include "vmime/utility/stream.hpp"
-
+#include <algorithm>
 
 namespace vmime {
 namespace utility {

libvmime07-0.7.1-gcc-4.4-support.patch:
 posixFile.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-gcc-4.4-support.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1, which adds a missing include file
in order to build successfully with GCC 4.4 and newer.

--- libvmime-0.7.1/src/platforms/posix/posixFile.cpp			2005-04-09 10:42:46.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixFile.cpp.gcc-4.4-support	2009-03-29 21:09:07.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include <dirent.h>
 
+#include <stdio.h>
 #include <string.h>
 
 #include "vmime/exception.hpp"

libvmime07-0.7.1-header-value-on-next-line.patch:
 headerField.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-header-value-on-next-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email header has the data part on the second line,
vmime was unable to parse this data and skip adds the header as empty to it's internal structures. This
makes sure these headers are still correctly parsed.

--- libvmime-0.7.1/src/headerField.cpp					2007-01-26 14:44:10.315567250 +0100
+++ libvmime-0.7.1/src/headerField.cpp.header-value-on-next-line	2007-02-07 13:35:35.177077750 +0100
@@ -147,14 +147,12 @@
 					{
 						contentsEnd = pos;
 						pos += 2;
-						break;
 					}
 					else if (c == '\n')
 					{
 						contentsEnd = pos;
 						++pos;
-						break;
-					}
+					} else {
 
 					while (pos < end)
 					{
@@ -176,6 +174,7 @@
 
 						++pos;
 					}
+					}
 
 					// Handle the case of folded lines
 					if (buffer[pos] == ' ' || buffer[pos] == '\t')

libvmime07-0.7.1-mdn-disposition.patch:
 MDNHelper.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-mdn-disposition.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes a small but crucial typo in a header of an MDN (read
receipt) mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2005-04-09 21:45:07.000000000 +0200
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-disposition		2006-11-28 09:37:56.009129500 +0100
@@ -143,7 +143,7 @@
 
 	hdr->ContentType().setValue(mediaType(vmime::mediaTypes::MULTIPART,
 	                                      vmime::mediaTypes::MULTIPART_REPORT));
-	hdr->ContentType().setReportType("disosition-notification");
+	hdr->ContentType().setReportType("disposition-notification");
 
 	hdr->Disposition().setValue(dispo);
 

libvmime07-0.7.1-mdn-final-recipient.patch:
 MDNHelper.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-mdn-final-recipient.patch ---
Patch by Zarafa <http://www.zarafa.com/> - a header with the final recipient information was created, but
not added to the MDN email. This patch adds this information to the mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2006-11-28 09:43:47.995127250 +0100
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-final-recipient		2006-11-28 09:43:27.505846750 +0100
@@ -246,6 +246,7 @@
 		(headerFieldFactory::getInstance()->create(vmime::fields::FINAL_RECIPIENT));
 
 	fr->setValue("rfc822; " + mdnInfos.getRecipient().getEmail());
+	fields.appendField(fr);
 
 	// -- Original-Message-ID
 	if (mdnInfos.getMessage()->getHeader()->hasField(vmime::fields::MESSAGE_ID))

libvmime07-0.7.1-missing-boundary.patch:
 body.cpp |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE libvmime07-0.7.1-missing-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - broken emails without a final boundary will still be able to
deliver with all attachments. The final part without the boundary will be treated as an attachment. 

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.missing-boundary			2006-01-12 15:45:48.443911888 +0100
@@ -200,6 +200,27 @@
 
 		if (partStart < end)
 			m_epilogText = string(buffer.begin() + partStart, buffer.begin() + end);
+
+		// lastPart was not found, so the last boundary was missing
+		// m_epilogText will become a bodyPart
+		if (!lastPart && pos == string::npos) {
+			bodyPart* part = new bodyPart;
+
+			try
+			{
+				part->parse(m_epilogText);
+			}
+			catch (std::exception&)
+			{
+				delete (part);
+				throw;
+			}
+
+			part->m_parent = m_part;
+
+			m_parts.push_back(part);
+		}
+			
 	}
 	// Treat the contents as 'simple' data
 	else

libvmime07-0.7.1-oe-compatibility.patch:
 defaultParameter.cpp |   66 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

--- NEW FILE libvmime07-0.7.1-oe-compatibility.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes attachment names in Outlook Express which are long and
have high characters.

--- libvmime-0.7.1/src/defaultParameter.cpp				2007-01-26 14:44:10.243562750 +0100
+++ libvmime-0.7.1/src/defaultParameter.cpp.vmime-oe-compatibility	2007-04-24 13:43:36.579203500 +0200
@@ -186,18 +186,18 @@
 {
 	const string& name = getName();
 	const string& value = m_value.getBuffer();
+	string tmpbuf;
+	utility::outputStreamStringAdapter tmpos(tmpbuf);
 
 	// For compatibility with implementations that do not understand RFC-2231,
 	// also generate a normal "7bit/us-ascii" parameter
 	string::size_type pos = curLinePos;
 
-	if (pos + name.length() + 10 + value.length() > maxLineLength)
-	{
-		os << NEW_LINE_SEQUENCE;
+		tmpos << NEW_LINE_SEQUENCE;
 		pos = NEW_LINE_SEQUENCE_LENGTH;
-	}
 
 	bool needQuoting = false;
+	bool needQuotedPrintable = false;
 	string::size_type valueLength = 0;
 
 	// Use worst-case length name.length()+2 for 'name=' part of line
@@ -228,35 +228,50 @@
 			needQuoting = true;
 			break;
 		}
+		if (!parserHelpers::isAscii(value[i]))
+		{
+			needQuotedPrintable = true;
+			needQuoting = true;
+		}
 	}
 
 	const bool cutValue = (valueLength != value.length());  // has the value been cut?
 
 	if (needQuoting)
 	{
-		os << name << "=\"";
+		tmpos << name << "=\"";
 		pos += name.length() + 2;
 	}
 	else
 	{
-		os << name << "=";
+		tmpos << name << "=";
 		pos += name.length() + 1;
 	}
 
 	bool extended = false;
-
-	for (string::size_type i = 0 ; (i < value.length()) && (pos < maxLineLength - 4) ; ++i)
+	if (needQuotedPrintable)
+	{
+		// send the name in quoted-printable, so outlook express et.al. will understand the real filename
+		size_t oldlen = tmpbuf.length();
+		m_value.generate(tmpos);
+		pos += tmpbuf.length() - oldlen;
+		extended = true;		// also send with RFC-2231 encoding
+	}
+	else
+	{
+	// do not chop off this value, but just add the complete name as one header line.
+	for (string::size_type i = 0 ; (i < value.length()) /*&& (pos < maxLineLength - 4) */ ; ++i)
 	{
 		const char_t c = value[i];
 
 		if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
 		{
-			os << '\\' << value[i];  // escape 'x' with '\x'
+			tmpos << '\\' << value[i];  // escape 'x' with '\x'
 			pos += 2;
 		}
 		else if (parserHelpers::isAscii(c))
 		{
-			os << value[i];
+			tmpos << value[i];
 			++pos;
 		}
 		else
@@ -264,10 +279,11 @@
 			extended = true;
 		}
 	}
+	}
 
 	if (needQuoting)
 	{
-		os << '"';
+		tmpos << '"';
 		++pos;
 	}
 
@@ -275,7 +291,7 @@
 	// or is too long for a single line
 	if (extended || cutValue)
 	{
-		os << ';';
+		tmpos << ';';
 		++pos;
 
 		/* RFC-2231
@@ -301,11 +317,8 @@
 			  name.length() + 4 /* *0*= */ + 2 /* '' */
 			+ m_value.getCharset().getName().length();
 
-		if (pos + firstSectionLength + 5 >= maxLineLength)
-		{
-			os << NEW_LINE_SEQUENCE;
+			tmpos << NEW_LINE_SEQUENCE;
 			pos = NEW_LINE_SEQUENCE_LENGTH;
-		}
 
 		// Split text into multiple sections that fit on one line
 		int sectionCount = 0;
@@ -384,33 +397,36 @@
 		// Output sections
 		for (int sectionNumber = 0 ; sectionNumber < sectionCount ; ++sectionNumber)
 		{
-			os << name;
+			tmpos << name;
 
 			if (sectionCount != 1) // no section specifier when only a single one
 			{
-				os << '*';
-				os << sectionNumber;
+				tmpos << '*';
+				tmpos << sectionNumber;
 			}
 
-			os << "*=";
+			tmpos << "*=";
 
 			if (sectionNumber == 0)
 			{
-				os << m_value.getCharset().getName();
-				os << '\'' << /* No language */ '\'';
+				tmpos << m_value.getCharset().getName();
+				tmpos << '\'' << /* No language */ '\'';
 			}
 
-			os << sectionText[sectionNumber];
+			tmpos << sectionText[sectionNumber];
 
 			if (sectionNumber + 1 < sectionCount)
 			{
-				os << ';';
-				os << NEW_LINE_SEQUENCE;
+				tmpos << ';';
+				tmpos << NEW_LINE_SEQUENCE;
 				pos = NEW_LINE_SEQUENCE_LENGTH;
 			}
 		}
 	}
 
+	// write the complete header
+	os << tmpbuf;
+
 	if (newLinePos)
 		*newLinePos = pos;
 }

libvmime07-0.7.1-out-of-bounds-copy.patch:
 filteredStream.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-out-of-bounds-copy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when a line in a plain text mail starts with a '.', the
character needs to be escaped. VMime has a special filter for this, but due to a bug in this filter, a
second line starting with a '.' would trigger a wrong buffer copy, and your email would contain double
parts.

--- libvmime-0.7.1/src/utility/filteredStream.cpp			2005-06-16 21:50:12.000000000 +0200
+++ libvmime-0.7.1/src/utility/filteredStream.cpp.out-of-bounds-copy	2007-06-15 14:29:40.907779750 +0200
@@ -146,7 +146,7 @@
 
 		if (previousChar == '\n')
 		{
-			m_stream.write(start, pos - data);
+			m_stream.write(start, pos - start);
 			m_stream.write("..", 2);
 
 			start = pos + 1;

libvmime07-0.7.1-package.patch:
 configure.in    |    2 +-
 src/Makefile.am |   22 +++++++++++-----------
 vmime.pc.in     |    6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE libvmime07-0.7.1-package.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1 to get libvmime renamed to
libvmime07 to avoid any conflicts with current libvmime series. Note that libvmime 0.7.x, 0.8.x and
0.9.x are unfortunately completely API and ABI incompatible to eachother.

--- libvmime-0.7.1/src/Makefile.am					2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/src/Makefile.am.package				2009-04-05 17:36:46.000000000 +0200
@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 INTERNALS =
 INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
-lib_LTLIBRARIES = libvmime.la
-libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
-libvmime_la_SOURCES = address.cpp \
+lib_LTLIBRARIES = libvmime07.la
+libvmime07_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
+libvmime07_la_SOURCES = address.cpp \
 	addressList.cpp \
 	base.cpp \
 	body.cpp \
@@ -82,7 +82,7 @@
 	misc_importanceHelper.cpp
 
 if VMIME_HAVE_MESSAGING_FEATURES
-libvmime_la_SOURCES += messaging_authenticator.cpp \
+libvmime07_la_SOURCES += messaging_authenticator.cpp \
 	messaging_authenticationInfos.cpp \
 	messaging_authHelper.cpp \
 	messaging_builtinServices.inl \
@@ -99,17 +99,17 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-libvmime_la_SOURCES += messaging_pop3_POP3Store.cpp \
+libvmime07_la_SOURCES += messaging_pop3_POP3Store.cpp \
 	messaging_pop3_POP3Folder.cpp \
 	messaging_pop3_POP3Message.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-libvmime_la_SOURCES += messaging_smtp_SMTPTransport.cpp
+libvmime07_la_SOURCES += messaging_smtp_SMTPTransport.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-libvmime_la_SOURCES += messaging_imap_IMAPConnection.cpp \
+libvmime07_la_SOURCES += messaging_imap_IMAPConnection.cpp \
 	messaging_imap_IMAPStore.cpp \
 	messaging_imap_IMAPFolder.cpp \
 	messaging_imap_IMAPMessage.cpp \
@@ -118,24 +118,24 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-libvmime_la_SOURCES += messaging_maildir_maildirStore.cpp \
+libvmime07_la_SOURCES += messaging_maildir_maildirStore.cpp \
 	messaging_maildir_maildirFolder.cpp \
 	messaging_maildir_maildirMessage.cpp \
 	messaging_maildir_maildirUtils.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SENDMAIL
-libvmime_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
+libvmime07_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_WINDOWS
-libvmime_la_SOURCES += platforms_windows_windowsFile.cpp \
+libvmime07_la_SOURCES += platforms_windows_windowsFile.cpp \
 	platforms_windows_windowsHandler.cpp \
 	platforms_windows_windowsSocket.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_POSIX
-libvmime_la_SOURCES += platforms_posix_posixChildProcess.cpp \
+libvmime07_la_SOURCES += platforms_posix_posixChildProcess.cpp \
 	platforms_posix_posixFile.cpp \
 	platforms_posix_posixHandler.cpp \
 	platforms_posix_posixSocket.cpp
--- libvmime-0.7.1/configure.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/configure.in.package					2009-04-06 20:42:53.000000000 +0200
@@ -18,7 +18,7 @@
 GENERIC_VERSIONED_LIBRARY_NAME="vmime"
 AC_SUBST(GENERIC_VERSIONED_LIBRARY_NAME)
 
-LIBRARY_NAME="libvmime"
+LIBRARY_NAME="libvmime07"
 AC_SUBST(LIBRARY_NAME)
 
 # Library version
--- libvmime-0.7.1/vmime.pc.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/vmime.pc.in.package					2009-04-06 20:46:07.000000000 +0200
@@ -6,9 +6,9 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @GENERIC_LIBRARY_NAME@
+Name: vmime07
 Description: VMime C++ Mail Library (http://vmime.sourceforge.net)
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -l at GENERIC_VERSIONED_LIBRARY_NAME@
-Cflags: -I${includedir}/
+Libs: -L${libdir} -lvmime07
+Cflags: -I${includedir}/libvmime07/

libvmime07-0.7.1-plain-bodycopy.patch:
 messageBuilder.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-plain-bodycopy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when constructing a plaintext only body without attachments, a
copy of the body was made to set as the real body and thus removing all the multiparts. However, the same
reference is removed before setting the new body, thus invalidating that body we wish to copy, possibly
resulting in a crash.

--- libvmime-0.7.1/src/messageBuilder.cpp				2009-09-15 22:59:21.000000000 +0200
+++ libvmime-0.7.1/src/messageBuilder.cpp.plain-bodycopy		2009-09-15 23:00:33.000000000 +0200
@@ -137,6 +137,8 @@
 	if (msg->getBody()->getPartCount() == 1)
 	{
 		const bodyPart& part = *msg->getBody()->getPartAt(0);
+		// make a full copy of the body, otherwise the copyFrom will delete the body we're copying
+		const body* bodyCopy = part.getBody()->clone();
 
 		// First, copy (and replace) the header fields
 		const std::vector <const headerField*> fields = part.getHeader()->getFieldList();
@@ -149,7 +151,8 @@
 
 		// Second, copy the body contents and sub-parts (this also remove
 		// the body part we are copying...)
-		msg->getBody()->copyFrom(*part.getBody());
+		msg->getBody()->copyFrom(*bodyCopy);
+		delete bodyCopy;
 	}
 
 	return (msg);

libvmime07-0.7.1-qp-starts-on-second-line.patch:
 word.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-qp-starts-on-second-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - headers can be broken over multiple lines in an email. When
the wrapped line directly started with quoted-printable, vmime copied this text as normal text, instead
of parsing it as quoted-printable. 

--- libvmime-0.7.1/src/word.cpp						2007-01-26 14:44:10.251563000 +0100
+++ libvmime-0.7.1/src/word.cpp.qp-starts-on-second-line		2007-01-26 14:45:01.074739500 +0100
@@ -91,6 +91,7 @@
 			unencoded += ' ';
 
 			startPos = pos;
+			continue;
 		}
 		// Start of an encoded word
 		else if (pos + 8 < end &&  // 8 = "=?(.+)?(.+)?(.*)?="

libvmime07-0.7.1-quoted-printable-encode-questionmark.patch:
 encoderQP.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-quoted-printable-encode-questionmark.patch ---
Patch by Zarafa <http://www.zarafa.com/> - special characters break the quoted-printable encoding when
they are typed after a ?. This fix also encodes ?-characters, so we can't break the encoding with this
trick.

--- libvmime-0.7.1/src/encoderQP.cpp					2008-03-10 13:57:05.055163691 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-encode-question	2008-03-10 13:51:53.071163435 +0100
@@ -249,7 +249,7 @@
 		default:
 		{
 			//if ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))
-			if (c >= 33 && c <= 126 && c != 61)
+			if (c >= 33 && c <= 126 && c != 61 && c!= 63)
 			{
 				outBuffer[outBufferPos++] = c;
 				++curCol;

libvmime07-0.7.1-quoted-printable-specials.patch:
 encoderQP.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-quoted-printable-specials.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch adds some characters that should be "escaped" in
quoted-printable. With this fix you can have these characters in a fullname of an email address.

--- libvmime-0.7.1/src/encoderQP.cpp					2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-specials		2007-02-02 10:09:26.273653250 +0100
@@ -214,10 +214,18 @@
 			QP_ENCODE_HEX('=')
 			break;
 		}
+		// http://www.faqs.org/rfcs/rfc2047.html, see 'especials' characters
 		case ',':
 		case ';':
 		case ':':
 		case '_':
+		case '@':
+		case '(':
+		case ')':
+		case '<':
+		case '>':
+		case '[':
+		case ']':
 		{
 			if (rfc2047)
 			{

libvmime07-0.7.1-remove-bcc.patch:
 transport.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-remove-bcc.patch ---
Patch by Zarafa <http://www.zarafa.com/> - Bcc headers should not be send to the SMTP server. Some SMTP
servers automatically strip this header (Postfix, qmail), and others have an option for this (Exim).

--- libvmime-0.7.1/src/messaging/transport.cpp				2005-04-27 18:42:58.000000000 +0200
+++ libvmime-0.7.1/src/messaging/transport.cpp.remove-bcc		2006-10-10 14:01:43.602621328 +0200
@@ -90,6 +90,14 @@
 	}
 	catch (exceptions::no_such_field&) { }
 
+	// Remove BCC headers from the message we're about to send
+	try {
+		headerField* bcc = msg->getHeader()->findField(fields::BCC);
+
+		msg->getHeader()->removeField(bcc);
+	}
+	catch (exceptions::no_such_field&) { }
+
 	// Generate the message, "stream" it and delegate the sending
 	// to the generic send() function.
 	std::ostringstream oss;

libvmime07-0.7.1-socket-backport-and-timeout-fix.patch:
 src/platforms/posix/posixSocket.cpp   |  102 +++++++++++++++++++++++++++-------
 vmime/platforms/posix/posixSocket.hpp |    3 +
 2 files changed, 85 insertions(+), 20 deletions(-)

--- NEW FILE libvmime07-0.7.1-socket-backport-and-timeout-fix.patch ---
Patch by Zarafa <http://www.zarafa.com/> - small partial backport of some socket handling code from 0.8.1.
Only receiving data is handled better. The patch also adds a timeout, when receiving data from a socket
hasn't worked for 5 minutes. This isn't present in 0.8.1.

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-timeout	2007-10-18 11:02:54.000000000 +0200
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "vmime/exception.hpp"
 
@@ -43,7 +44,7 @@
 //
 
 posixSocket::posixSocket()
-	: m_desc(-1)
+	: m_desc(-1), m_timeouts(0)
 {
 }
 
@@ -101,6 +102,8 @@
 		// Error
 		throw vmime::exceptions::connection_error("Error while connecting socket.");
 	}
+
+	m_timeouts = 0;
 }
 
 
@@ -121,38 +124,62 @@
 	}
 }
 
-
 void posixSocket::receive(vmime::string& buffer)
 {
-	::ssize_t ret = ::recv(m_desc, m_buffer, sizeof(m_buffer), 0);
-
-	if (ret == -1)
-	{
-		// Error or no data
-		return;
-	}
-	else if (ret > 0)
-	{
-		buffer = vmime::string(m_buffer, ret);
-	}
+	const int size = receiveRaw(m_buffer, sizeof(m_buffer));
+	buffer = vmime::string(m_buffer, size);
 }
 
 
 const int posixSocket::receiveRaw(char* buffer, const int count)
 {
-	::ssize_t ret = ::recv(m_desc, buffer, count, 0);
+	fd_set fds;
+	struct timeval tv;
+	int ret;
+
+	FD_ZERO(&fds);
+	FD_SET(m_desc, &fds);
+
+	tv.tv_sec = 10;
+	tv.tv_usec = 0;
+
+	ret = ::select(m_desc+1, &fds, NULL, NULL, &tv);
+	if (ret < 0)
+	{
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
+	}
 
-	if (ret == -1)
+	ret = ::recv(m_desc, buffer, count, 0);
+
+	if (ret < 0)
 	{
-		// Error or no data
-		return (0);
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
 	}
-	else
+	else if (ret == 0)
 	{
-		return (ret);
+		// Host shutdown
+		throwSocketError(ENOTCONN);
 	}
-}
 
+	m_timeouts = 0;
+	return ret;
+}
 
 void posixSocket::send(const vmime::string& buffer)
 {
@@ -166,6 +193,41 @@
 }
 
 
+void posixSocket::throwSocketError(const int err)
+{
+	string msg;
+
+	switch (err)
+	{
+	case EACCES:          msg = "EACCES: permission denied"; break;
+	case EAFNOSUPPORT:    msg = "EAFNOSUPPORT: address family not supported"; break;
+	case EMFILE:          msg = "EMFILE: process file table overflow"; break;
+	case ENFILE:          msg = "ENFILE: system limit reached"; break;
+	case EPROTONOSUPPORT: msg = "EPROTONOSUPPORT: protocol not supported"; break;
+	case EAGAIN:          msg = "EAGAIN: blocking operation"; break;
+	case EBADF:           msg = "EBADF: invalid descriptor"; break;
+	case ECONNRESET:      msg = "ECONNRESET: connection reset by peer"; break;
+	case EFAULT:          msg = "EFAULT: bad user space address"; break;
+	case EINTR:           msg = "EINTR: signal occured before transmission"; break;
+	case EINVAL:          msg = "EINVAL: invalid argument"; break;
+	case EMSGSIZE:        msg = "EMSGSIZE: message cannot be sent atomically"; break;
+	case ENOBUFS:         msg = "ENOBUFS: output queue is full"; break;
+	case ENOMEM:          msg = "ENOMEM: out of memory"; break;
+	case EPIPE:
+	case ENOTCONN:        msg = "ENOTCONN: not connected"; break;
+	case ECONNREFUSED:    msg = "ECONNREFUSED: connection refused"; break;
+	default:
+
+		std::ostringstream oss;
+		oss << ::strerror(err);
+
+		msg = oss.str();
+		break;
+	}
+
+	throw vmime::exceptions::connection_error(msg);
+}
+
 
 
 //
--- libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp		2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp.socket-timeout	2007-10-18 10:34:46.000000000 +0200
@@ -49,10 +49,13 @@
 	void send(const vmime::string& buffer);
 	void sendRaw(const char* buffer, const int count);
 
+	void throwSocketError(const int err);
+
 private:
 
 	char m_buffer[65536];
 	int m_desc;
+	int m_timeouts;
 };
 
 

libvmime07-0.7.1-socket-tcp-nodelay.patch:
 posixSocket.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE libvmime07-0.7.1-socket-tcp-nodelay.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds the TCP_NODELAY flag to vmime sockets. This should mak
the SMTP connection faster

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-tcp	2009-03-27 10:51:06.405594549 +0100
@@ -25,6 +25,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -59,6 +60,8 @@
 
 void posixSocket::connect(const vmime::string& address, const vmime::port_t port)
 {
+	int flag = 1;
+
 	// Close current connection, if any
 	if (m_desc != -1)
 	{
@@ -94,6 +97,8 @@
 	if (m_desc == -1)
 		throw vmime::exceptions::connection_error("Error while creating socket.");
 
+	::setsockopt(m_desc, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
+
 	// Start connection
 	if (::connect(m_desc, reinterpret_cast <sockaddr*>(&addr), sizeof(addr)) == -1)
 	{

libvmime07-0.7.1-strip-header-endspaces.patch:
 headerField.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-strip-header-endspaces.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch makes sure that vmime does not parse trailing spaces
on an header. Otherwise vmime will throw an exception and a fallback delivery will be started.

--- libvmime-0.7.1/src/headerField.cpp					2007-07-31 12:54:21.898679250 +0200
+++ libvmime-0.7.1/src/headerField.cpp.strip-header-endspaces		2007-07-31 12:43:08.408588750 +0200
@@ -189,6 +189,14 @@
 					}
 				}
 
+				// strip spaces from end of header lines, also through continuation headers
+				contentsEnd--;	// original enter
+				while (contentsEnd>contentsStart &&
+					   (buffer[contentsEnd] == ' ' || buffer[contentsEnd] == '\t' ||
+						buffer[contentsEnd] == '\r' || buffer[contentsEnd] == '\n'))
+					contentsEnd--;
+				contentsEnd++;	// new 'enter'
+
 				// Return a new field
 				headerField* field = headerFieldFactory::getInstance()->create(name);
 

libvmime07-0.7.1-threading-remove-static_non-abi-change.patch:
 smartPtr.hpp |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE libvmime07-0.7.1-threading-remove-static_non-abi-change.patch ---
Patch by Zarafa <http://www.zarafa.com/> - workaround a static variable in the smart_ptr class using a
pthread mutex, which fixes multi-threading issues in libvmime.

--- libvmime-0.7.1/vmime/utility/smartPtr.hpp				2005-05-19 19:17:17.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/smartPtr.hpp.threading-remove-static	2009-05-13 15:21:53.276875219 +0200
@@ -20,6 +20,9 @@
 #ifndef VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 #define VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 
+// non-portable, but at least not an abi change
+#include <pthread.h>
+static pthread_mutex_t mapLock = PTHREAD_MUTEX_INITIALIZER;
 
 namespace vmime {
 namespace utility {
@@ -108,8 +111,10 @@
 		{
 			if (m_data->refCount == 1)
 			{
+				pthread_mutex_lock(&mapLock);
 				typename MapType::iterator it = sm_map.find(m_data->ptr);
 				if (it != sm_map.end()) sm_map.erase(it);
+				pthread_mutex_unlock(&mapLock);
 
 				delete (m_data->ptr);
 				delete (m_data);
@@ -127,6 +132,8 @@
 	{
 		detach();
 
+		pthread_mutex_lock(&mapLock);
+
 		typename MapType::iterator it = sm_map.find(p);
 
 		if (it != sm_map.end())
@@ -141,6 +148,8 @@
 
 			sm_map.insert(typename MapType::value_type(p, m_data));
 		}
+
+		pthread_mutex_unlock(&mapLock);
 	}
 
 	void attach(const smart_ptr <T>& p)

libvmime07-0.7.1-timezone-name.patch:
 dateTime.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-timezone-name.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes dates in headers which use a timezone definition, instead
of a numeric timezone offset.

--- libvmime-0.7.1/src/dateTime.cpp					2005-04-23 11:02:48.000000000 +0200
+++ libvmime-0.7.1/src/dateTime.cpp.timezone-name			2009-01-08 10:51:39.000000000 +0100
@@ -423,7 +423,7 @@
 				zone[zoneLength++] = *p;
 				++p;
 			}
-			while (zoneLength < 3 && p < pend && parserHelpers::isDigit(*p));
+			while (zoneLength < 3 && p < pend);
 
 			switch (zone[0])
 			{
@@ -487,6 +487,8 @@
 
 				break;
 			}
+			case 'g':
+			case 'G':
 			case 'u':
 			case 'U':
 			{

libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch:
 charset.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some mails have a special definition of the utf-7 character
set, named unicode-1-1-utf-7. Since this name is not defined by iconv, we rename it to utf-7. This name
seems to come from RFC 1642 <http://www.faqs.org/rfcs/rfc1642.html>.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.unicode-1-1-utf-7-charset		2007-04-23 17:08:46.714435000 +0200
@@ -64,6 +64,9 @@
 charset::charset(const string& name)
 	: m_name(name)
 {
+	// if we receive this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
 }
 
 
@@ -72,6 +75,10 @@
 {
 	m_name = string(buffer.begin() + position, buffer.begin() + end);
 
+	// if we parsed this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
+
 	setParsedBounds(position, end);
 
 	if (newPosition)


--- NEW FILE libvmime07.spec ---
Summary:	A powerful C++ class library for working with MIME/Internet messages
Name:		libvmime07
Version:	0.7.1
Release:	1%{?dist}
License:	GPLv2+
Group:		System Environment/Libraries
URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
Source0:	http://developer.zarafa.com/download/libvmime-%{version}.tar.bz2
Patch0:		libvmime07-0.7.1-package.patch
Patch1:		libvmime07-0.7.1-charset-catch.patch
Patch2:		libvmime07-0.7.1-missing-boundary.patch
Patch3:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
Patch4:		libvmime07-0.7.1-bmoted-printable.patch
Patch5:		libvmime07-0.7.1-strip-header-endspaces.patch
Patch6:		libvmime07-0.7.1-attachfnamelen.patch
Patch7:		libvmime07-0.7.1-remove-bcc.patch
Patch8:		libvmime07-0.7.1-mdn-disposition.patch
Patch9:		libvmime07-0.7.1-mdn-final-recipient.patch
Patch10:	libvmime07-0.7.1-broken-locale-error.patch
Patch11:	libvmime07-0.7.1-qp-starts-on-second-line.patch
Patch12:	libvmime07-0.7.1-quoted-printable-specials.patch
Patch13:	libvmime07-0.7.1-header-value-on-next-line.patch
Patch14:	libvmime07-0.7.1-oe-compatibility.patch
Patch15:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
Patch16:	libvmime07-0.7.1-out-of-bounds-copy.patch
Patch17:	libvmime07-0.7.1-default-transfer-encoding.patch
Patch18:	libvmime07-0.7.1-contentid-without-at.patch
Patch19:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
Patch20:	libvmime07-0.7.1-double-empty-boundary.patch
Patch21:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
Patch22:	libvmime07-0.7.1-charset-output-buffer-full.patch
Patch23:	libvmime07-0.7.1-gcc-4.3-support.patch
Patch24:	libvmime07-0.7.1-timezone-name.patch
Patch25:	libvmime07-0.7.1-socket-tcp-nodelay.patch
Patch26:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
Patch27:	libvmime07-0.7.1-gcc-4.4-support.patch
Patch28:	libvmime07-0.7.1-plain-bodycopy.patch
BuildRequires:	sendmail, libtool, autoconf, automake
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
VMime is a powerful C++ class library for parsing, generating or
editing Internet RFC-[2]822 and MIME messages. VMime is designed
to provide a fast and an easy way to manipulate Internet mail
messages.

It also includes support for using messaging protocols (POP3, IMAP,
SMTP and maildir) with a lot of features supported: listing folders,
downloading and adding messages to folders, extracting parts from
message, getting and setting message flags and a lot more.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%package devel
Summary:	Development files for the libvmime library
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig

%description devel
The libvmime package includes header files and libraries necessary
for developing programs which use the libvmime C++ class library.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%prep
%setup -q -n libvmime-%{version}
%patch0 -p1 -b .package
%patch1 -p1 -b .charset-catch
%patch2 -p1 -b .missing-boundary
%patch3 -p1 -b .allow-no-recips-and-senders
%patch4 -p1 -b .bmoted-printable
%patch5 -p1 -b .strip-header-endspaces
%patch6 -p1 -b .attachfnamelen
%patch7 -p1 -b .remove-bcc
%patch8 -p1 -b .mdn-disposition
%patch9 -p1 -b .mdn-final-recipient
%patch10 -p1 -b .broken-locale-error
%patch11 -p1 -b .qp-starts-on-second-line
%patch12 -p1 -b .quoted-printable-specials
%patch13 -p1 -b .header-value-on-next-line
%patch14 -p1 -b .oe-compatibility
%patch15 -p1 -b .unicode-1-1-utf-7-charset
%patch16 -p1 -b .out-of-bounds-copy
%patch17 -p1 -b .default-transfer-encoding
%patch18 -p1 -b .contentid-without-at
%patch19 -p1 -b .socket-backport-and-timeout-fix
%patch20 -p1 -b .double-empty-boundary
%patch21 -p1 -b .quoted-printable-encode-questionmark
%patch22 -p1 -b .charset-output-buffer-full
%patch23 -p1 -b .gcc-4.3-support
%patch24 -p1 -b .timezone-name
%patch25 -p1 -b .socket-tcp-nodelay
%patch26 -p1 -b .threading-remove-static_non-abi-change
%patch27 -p1 -b .gcc-4.4-support
%patch28 -p1 -b .plain-bodycopy

# Needed to apply branding patch
libtoolize --force
autoreconf --force --install

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Complete the libvmime07 renaming at some places
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
mv -f $RPM_BUILD_ROOT%{_includedir}/{vmime,%{name}}/
mv -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vmime{,07}.pc 

# Remove the static library and libtool .la file
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}

# Remove the documentation dir, as %doc will pick it up
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/%{name}.so
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/vmime07.pc

%changelog
* Sat Sep 05 2009 Robert Scheck <robert at fedoraproject.org> 0.7.1-1
- Upgrade to 0.7.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:17:43 -0000	1.1
+++ .cvsignore	16 Sep 2009 21:50:26 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:17:43 -0000	1.1
+++ sources	16 Sep 2009 21:50:27 -0000	1.2
@@ -0,0 +1 @@
+81f06a771d2de01d5982635838eb5f6a  libvmime-0.7.1.tar.bz2



From robert at fedoraproject.org  Wed Sep 16 21:50:31 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 16 Sep 2009 21:50:31 +0000 (UTC)
Subject: rpms/libvmime07/F-10
	libvmime07-0.7.1-allow-no-recips-and-senders.patch, NONE,
	1.1 libvmime07-0.7.1-attachfnamelen.patch, NONE,
	1.1 libvmime07-0.7.1-bmoted-printable.patch, NONE,
	1.1 libvmime07-0.7.1-broken-locale-error.patch, NONE,
	1.1 libvmime07-0.7.1-charset-catch.patch, NONE,
	1.1 libvmime07-0.7.1-charset-output-buffer-full.patch, NONE,
	1.1 libvmime07-0.7.1-contentid-without-at.patch, NONE,
	1.1 libvmime07-0.7.1-default-transfer-encoding.patch, NONE,
	1.1 libvmime07-0.7.1-double-empty-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.3-support.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.4-support.patch, NONE,
	1.1 libvmime07-0.7.1-header-value-on-next-line.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-disposition.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-final-recipient.patch, NONE,
	1.1 libvmime07-0.7.1-missing-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-oe-compatibility.patch, NONE,
	1.1 libvmime07-0.7.1-out-of-bounds-copy.patch, NONE,
	1.1 libvmime07-0.7.1-package.patch, NONE,
	1.1 libvmime07-0.7.1-plain-bodycopy.patch, NONE,
	1.1 libvmime07-0.7.1-qp-starts-on-second-line.patch, NONE,
	1.1 libvmime07-0.7.1-quoted-printable-encode-questionmark.patch,
	NONE, 1.1 libvmime07-0.7.1-quoted-printable-specials.patch, NONE,
	1.1 libvmime07-0.7.1-remove-bcc.patch, NONE,
	1.1 libvmime07-0.7.1-socket-backport-and-timeout-fix.patch, NONE,
	1.1 libvmime07-0.7.1-socket-tcp-nodelay.patch, NONE,
	1.1 libvmime07-0.7.1-strip-header-endspaces.patch, NONE,
	1.1 libvmime07-0.7.1-threading-remove-static_non-abi-change.patch,
	NONE, 1.1 libvmime07-0.7.1-timezone-name.patch, NONE,
	1.1 libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch, NONE,
	1.1 libvmime07.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090916215031.CEB5D11C0336@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	libvmime07-0.7.1-allow-no-recips-and-senders.patch 
	libvmime07-0.7.1-attachfnamelen.patch 
	libvmime07-0.7.1-bmoted-printable.patch 
	libvmime07-0.7.1-broken-locale-error.patch 
	libvmime07-0.7.1-charset-catch.patch 
	libvmime07-0.7.1-charset-output-buffer-full.patch 
	libvmime07-0.7.1-contentid-without-at.patch 
	libvmime07-0.7.1-default-transfer-encoding.patch 
	libvmime07-0.7.1-double-empty-boundary.patch 
	libvmime07-0.7.1-gcc-4.3-support.patch 
	libvmime07-0.7.1-gcc-4.4-support.patch 
	libvmime07-0.7.1-header-value-on-next-line.patch 
	libvmime07-0.7.1-mdn-disposition.patch 
	libvmime07-0.7.1-mdn-final-recipient.patch 
	libvmime07-0.7.1-missing-boundary.patch 
	libvmime07-0.7.1-oe-compatibility.patch 
	libvmime07-0.7.1-out-of-bounds-copy.patch 
	libvmime07-0.7.1-package.patch 
	libvmime07-0.7.1-plain-bodycopy.patch 
	libvmime07-0.7.1-qp-starts-on-second-line.patch 
	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch 
	libvmime07-0.7.1-quoted-printable-specials.patch 
	libvmime07-0.7.1-remove-bcc.patch 
	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch 
	libvmime07-0.7.1-socket-tcp-nodelay.patch 
	libvmime07-0.7.1-strip-header-endspaces.patch 
	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch 
	libvmime07-0.7.1-timezone-name.patch 
	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch 
	libvmime07.spec 
Log Message:
Populate libvmime07 to Fedora and EPEL branches


libvmime07-0.7.1-allow-no-recips-and-senders.patch:
 messageBuilder.cpp |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE libvmime07-0.7.1-allow-no-recips-and-senders.patch ---
Patch by Zarafa <http://www.zarafa.com/> - makes the messageBuilder helper generate an mail without To or
Cc headers. This way, an email with only Bcc entries will still be sent. This feature is mostly used by
people to mask a mailing list or invitation that should be send to alot of people.

--- libvmime-0.7.1/src/messageBuilder.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/messageBuilder.cpp.allow-no-recips-and-senders	2006-01-13 09:49:51.000000000 +0100
@@ -50,14 +50,11 @@
 	// Generate the header fields
 	msg->getHeader()->Subject().setValue(m_subject);
 
-	if (m_from.isEmpty())
-		throw exceptions::no_expeditor();
-
-	if (m_to.isEmpty() || m_to.getAddressAt(0)->isEmpty())
-		throw exceptions::no_recipient();
-
-	msg->getHeader()->From().setValue(m_from);
-	msg->getHeader()->To().setValue(m_to);
+	if (!m_from.isEmpty())
+		msg->getHeader()->From().setValue(m_from);
+		
+	if (!m_to.isEmpty())
+		msg->getHeader()->To().setValue(m_to);
 
 	if (!m_cc.isEmpty())
 		msg->getHeader()->Cc().setValue(m_cc);

libvmime07-0.7.1-attachfnamelen.patch:
 defaultParameter.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-attachfnamelen.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes parsing of an attachment filename that is between 66 and
76 characters long.

--- libvmime-0.7.1/src/defaultParameter.cpp				2005-06-21 19:06:35.000000000 +0200
+++ libvmime-0.7.1/src/defaultParameter.cpp.attachfnamelen		2006-08-01 10:42:18.277853120 +0200
@@ -200,7 +200,8 @@
 	bool needQuoting = false;
 	string::size_type valueLength = 0;
 
-	for (string::size_type i = 0 ; (i < value.length()) && (pos + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
+	// Use worst-case length name.length()+2 for 'name=' part of line
+	for (string::size_type i = 0 ; (i < value.length()) && (pos + name.length() + 2 + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
 	{
 		switch (value[i])
 		{

libvmime07-0.7.1-bmoted-printable.patch:
 encoderFactory.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-bmoted-printable.patch ---
Patch by Zarafa <http://www.zarafa.com/> - we've seen broken mails with an invalid encoding. Unsure what
'bmoted-printable' actually is, we make vmime treat it as normal 'quoted-printable'. 

--- libvmime-0.7.1/src/encoderFactory.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderFactory.cpp.bmoted-printable		2006-04-05 10:35:25.618215000 +0200
@@ -37,6 +37,7 @@
 	// Register some default encoders
 	registerName <encoderB64>("base64");
 	registerName <encoderQP>("quoted-printable");
+	registerName <encoderQP>("bmoted-printable");
 	registerName <encoderUUE>("uuencode");
 	registerName <encoder7bit>("7bit");
 	registerName <encoder8bit>("8bit");

libvmime07-0.7.1-broken-locale-error.patch:
 posixHandler.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-broken-locale-error.patch ---
Patch by Zarafa <http://www.zarafa.com/> - on Debian machines, you need to configure the locales
(languages) that will be used on the system. When you use a locale (eg. 'LC_MESSAGES=nl_NL', but did not
configure your distribution to have this locale present on your system, a NULL pointer would have thrown
an exception in the std::string class. This makes sure that exception never happens.

--- libvmime-0.7.1/src/platforms/posix/posixHandler.cpp			2005-04-30 09:53:21.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixHandler.cpp.broken-locale	2006-12-28 17:29:43.883410000 +0100
@@ -106,9 +106,9 @@
 
 const vmime::charset posixHandler::getLocaleCharset() const
 {
-	vmime::string prevLocale(::setlocale(LC_ALL, ""));
+	char *prevLocale = ::setlocale(LC_ALL, "");
 	vmime::charset ch(::nl_langinfo(CODESET));
-	::setlocale(LC_ALL, prevLocale.c_str());
+	::setlocale(LC_ALL, prevLocale);
 
 	return (ch);
 }

libvmime07-0.7.1-charset-catch.patch:
 word.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-catch.patch ---
Patch by Zarafa <http://www.zarafa.com/> - early catches an exception of vmime when iconv was unable to
convert a word from or to the requested charsets. This makes broken mails with invalid characters for a
valid charset still be able to deliver. We'd rather have an email with a ? sign than a FallbackDelivery
for the user. 

--- libvmime-0.7.1/src/word.cpp						2005-06-13 12:56:52.000000000 +0200
+++ libvmime-0.7.1/src/word.cpp.charset-catch				2005-11-15 18:02:45.000000000 +0100
@@ -688,7 +688,13 @@
 {
 	string out;
 
+	try {
 	charset::convert(m_buffer, out, m_charset, dest);
+	}
+	catch (vmime::exception &e) {
+		// copy 'word' as text
+		out = m_buffer;
+	}
 
 	return (out);
 }

libvmime07-0.7.1-charset-output-buffer-full.patch:
 charset.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-output-buffer-full.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes iconv conversion with source buffers > 64Kb not to add a
'?' and skip one byte of the input buffer.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.charset-output-buffer-full		2008-07-07 13:51:33.414160106 +0200
@@ -206,10 +206,12 @@
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);
 
 				// Ignore this "blocking" character and continue
+				if (outBytesLeft > 0) {
 				out += '?';
 				++inBuffer;
 				--inBytesLeft;
 			}
+			}
 			else
 			{
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);

libvmime07-0.7.1-contentid-without-at.patch:
 messageId.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-contentid-without-at.patch ---
Patch by Zarafa <http://www.zarafa.com/> - enables re-generation of broken content-id's that had no @ sign
in them.

--- libvmime-0.7.1/src/messageId.cpp					2005-03-27 14:59:12.000000000 +0200
+++ libvmime-0.7.1/src/messageId.cpp.contentid-without-at		2007-07-31 14:14:38.827718500 +0200
@@ -102,7 +102,7 @@
 		// Extract left part
 		const string::size_type leftStart = position + (p - pstart);
 
-		while (p < pend && *p != '@') ++p;
+		while (p < pend && *p != '@' && *p != '>') ++p;
 
 		m_left = string(buffer.begin() + leftStart,
 		                buffer.begin() + position + (p - pstart));
@@ -162,6 +162,8 @@
 
 const string messageId::getId() const
 {
+	if (m_right == "")
+		return m_left;
 	return (m_left + '@' + m_right);
 }
 
@@ -177,7 +179,10 @@
 		pos = NEW_LINE_SEQUENCE_LENGTH;
 	}
 
-	os << '<' << m_left << '@' << m_right << '>';
+	os << '<' << m_left;
+	if (m_right != "")
+		os << '@' << m_right;
+	os << '>';
 
 	if (newLinePos)
 		*newLinePos = pos + m_left.length() + m_right.length() + 3;

libvmime07-0.7.1-default-transfer-encoding.patch:
 body.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE libvmime07-0.7.1-default-transfer-encoding.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some broken generators may set the Content-Transfer-Encoding
header, but did not set any value. We'll assume the default value '7bit'.

--- libvmime-0.7.1/src/body.cpp						2007-01-26 14:44:10.259563000 +0100
+++ libvmime-0.7.1/src/body.cpp.default-transfer-encoding		2007-07-13 12:14:30.699846500 +0200
@@ -465,6 +465,9 @@
 		const contentEncodingField& cef = dynamic_cast<contentEncodingField&>
 			(*m_header->findField(fields::CONTENT_TRANSFER_ENCODING));
 
+		if (cef.getValue().getName().empty())
+			return (vmime::encoding(encodingTypes::SEVEN_BIT));
+
 		return (cef.getValue());
 	}
 	catch (exceptions::no_such_field&)

libvmime07-0.7.1-double-empty-boundary.patch:
 body.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-double-empty-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email contains the same boundary to announce a new body
part directly one after another, vmime would have crashed because the body part added to the object with
size of (size_type)(-1). Thus having a body part of 4294967294 bytes on 32bit and 18446744073709551615
bytes on 64 bit systems.

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.double-empty-boundary			2007-11-01 16:45:20.688580500 +0100
@@ -173,7 +173,7 @@
 				++pos;
 			}
 
-			if (index > 0)
+			if (index > 0 && partStart < partEnd)
 			{
 				bodyPart* part = new bodyPart;
 

libvmime07-0.7.1-gcc-4.3-support.patch:
 src/messaging/imap/IMAPMessage.cpp  |    2 +-
 src/platforms/posix/posixSocket.cpp |    1 +
 src/utility/md5.cpp                 |    2 +-
 vmime/utility/filteredStream.hpp    |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-gcc-4.3-support.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds required include headers to compile with g++-4.3 and up.

--- libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp			2005-05-27 21:31:44.000000000 +0200
+++ libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -26,7 +26,7 @@
 
 #include <sstream>
 #include <iterator>
-
+#include <typeinfo>
 
 namespace vmime {
 namespace messaging {
--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.gcc-4.3-support	2008-07-07 15:42:16.700025085 +0200
@@ -19,6 +19,7 @@
 
 #include "vmime/platforms/posix/posixSocket.hpp"
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
--- libvmime-0.7.1/src/utility/md5.cpp					2005-03-18 22:26:48.000000000 +0100
+++ libvmime-0.7.1/src/utility/md5.cpp.gcc-4.3-support			2008-07-07 15:41:38.034166062 +0200
@@ -45,7 +45,7 @@
 //     documentation and/or software.
 
 #include "vmime/utility/md5.hpp"
-
+#include <string.h>
 
 namespace vmime {
 namespace utility {
--- libvmime-0.7.1/vmime/utility/filteredStream.hpp			2005-06-16 21:19:12.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/filteredStream.hpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -22,7 +22,7 @@
 
 
 #include "vmime/utility/stream.hpp"
-
+#include <algorithm>
 
 namespace vmime {
 namespace utility {

libvmime07-0.7.1-gcc-4.4-support.patch:
 posixFile.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-gcc-4.4-support.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1, which adds a missing include file
in order to build successfully with GCC 4.4 and newer.

--- libvmime-0.7.1/src/platforms/posix/posixFile.cpp			2005-04-09 10:42:46.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixFile.cpp.gcc-4.4-support	2009-03-29 21:09:07.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include <dirent.h>
 
+#include <stdio.h>
 #include <string.h>
 
 #include "vmime/exception.hpp"

libvmime07-0.7.1-header-value-on-next-line.patch:
 headerField.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-header-value-on-next-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email header has the data part on the second line,
vmime was unable to parse this data and skip adds the header as empty to it's internal structures. This
makes sure these headers are still correctly parsed.

--- libvmime-0.7.1/src/headerField.cpp					2007-01-26 14:44:10.315567250 +0100
+++ libvmime-0.7.1/src/headerField.cpp.header-value-on-next-line	2007-02-07 13:35:35.177077750 +0100
@@ -147,14 +147,12 @@
 					{
 						contentsEnd = pos;
 						pos += 2;
-						break;
 					}
 					else if (c == '\n')
 					{
 						contentsEnd = pos;
 						++pos;
-						break;
-					}
+					} else {
 
 					while (pos < end)
 					{
@@ -176,6 +174,7 @@
 
 						++pos;
 					}
+					}
 
 					// Handle the case of folded lines
 					if (buffer[pos] == ' ' || buffer[pos] == '\t')

libvmime07-0.7.1-mdn-disposition.patch:
 MDNHelper.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-mdn-disposition.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes a small but crucial typo in a header of an MDN (read
receipt) mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2005-04-09 21:45:07.000000000 +0200
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-disposition		2006-11-28 09:37:56.009129500 +0100
@@ -143,7 +143,7 @@
 
 	hdr->ContentType().setValue(mediaType(vmime::mediaTypes::MULTIPART,
 	                                      vmime::mediaTypes::MULTIPART_REPORT));
-	hdr->ContentType().setReportType("disosition-notification");
+	hdr->ContentType().setReportType("disposition-notification");
 
 	hdr->Disposition().setValue(dispo);
 

libvmime07-0.7.1-mdn-final-recipient.patch:
 MDNHelper.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-mdn-final-recipient.patch ---
Patch by Zarafa <http://www.zarafa.com/> - a header with the final recipient information was created, but
not added to the MDN email. This patch adds this information to the mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2006-11-28 09:43:47.995127250 +0100
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-final-recipient		2006-11-28 09:43:27.505846750 +0100
@@ -246,6 +246,7 @@
 		(headerFieldFactory::getInstance()->create(vmime::fields::FINAL_RECIPIENT));
 
 	fr->setValue("rfc822; " + mdnInfos.getRecipient().getEmail());
+	fields.appendField(fr);
 
 	// -- Original-Message-ID
 	if (mdnInfos.getMessage()->getHeader()->hasField(vmime::fields::MESSAGE_ID))

libvmime07-0.7.1-missing-boundary.patch:
 body.cpp |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE libvmime07-0.7.1-missing-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - broken emails without a final boundary will still be able to
deliver with all attachments. The final part without the boundary will be treated as an attachment. 

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.missing-boundary			2006-01-12 15:45:48.443911888 +0100
@@ -200,6 +200,27 @@
 
 		if (partStart < end)
 			m_epilogText = string(buffer.begin() + partStart, buffer.begin() + end);
+
+		// lastPart was not found, so the last boundary was missing
+		// m_epilogText will become a bodyPart
+		if (!lastPart && pos == string::npos) {
+			bodyPart* part = new bodyPart;
+
+			try
+			{
+				part->parse(m_epilogText);
+			}
+			catch (std::exception&)
+			{
+				delete (part);
+				throw;
+			}
+
+			part->m_parent = m_part;
+
+			m_parts.push_back(part);
+		}
+			
 	}
 	// Treat the contents as 'simple' data
 	else

libvmime07-0.7.1-oe-compatibility.patch:
 defaultParameter.cpp |   66 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

--- NEW FILE libvmime07-0.7.1-oe-compatibility.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes attachment names in Outlook Express which are long and
have high characters.

--- libvmime-0.7.1/src/defaultParameter.cpp				2007-01-26 14:44:10.243562750 +0100
+++ libvmime-0.7.1/src/defaultParameter.cpp.vmime-oe-compatibility	2007-04-24 13:43:36.579203500 +0200
@@ -186,18 +186,18 @@
 {
 	const string& name = getName();
 	const string& value = m_value.getBuffer();
+	string tmpbuf;
+	utility::outputStreamStringAdapter tmpos(tmpbuf);
 
 	// For compatibility with implementations that do not understand RFC-2231,
 	// also generate a normal "7bit/us-ascii" parameter
 	string::size_type pos = curLinePos;
 
-	if (pos + name.length() + 10 + value.length() > maxLineLength)
-	{
-		os << NEW_LINE_SEQUENCE;
+		tmpos << NEW_LINE_SEQUENCE;
 		pos = NEW_LINE_SEQUENCE_LENGTH;
-	}
 
 	bool needQuoting = false;
+	bool needQuotedPrintable = false;
 	string::size_type valueLength = 0;
 
 	// Use worst-case length name.length()+2 for 'name=' part of line
@@ -228,35 +228,50 @@
 			needQuoting = true;
 			break;
 		}
+		if (!parserHelpers::isAscii(value[i]))
+		{
+			needQuotedPrintable = true;
+			needQuoting = true;
+		}
 	}
 
 	const bool cutValue = (valueLength != value.length());  // has the value been cut?
 
 	if (needQuoting)
 	{
-		os << name << "=\"";
+		tmpos << name << "=\"";
 		pos += name.length() + 2;
 	}
 	else
 	{
-		os << name << "=";
+		tmpos << name << "=";
 		pos += name.length() + 1;
 	}
 
 	bool extended = false;
-
-	for (string::size_type i = 0 ; (i < value.length()) && (pos < maxLineLength - 4) ; ++i)
+	if (needQuotedPrintable)
+	{
+		// send the name in quoted-printable, so outlook express et.al. will understand the real filename
+		size_t oldlen = tmpbuf.length();
+		m_value.generate(tmpos);
+		pos += tmpbuf.length() - oldlen;
+		extended = true;		// also send with RFC-2231 encoding
+	}
+	else
+	{
+	// do not chop off this value, but just add the complete name as one header line.
+	for (string::size_type i = 0 ; (i < value.length()) /*&& (pos < maxLineLength - 4) */ ; ++i)
 	{
 		const char_t c = value[i];
 
 		if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
 		{
-			os << '\\' << value[i];  // escape 'x' with '\x'
+			tmpos << '\\' << value[i];  // escape 'x' with '\x'
 			pos += 2;
 		}
 		else if (parserHelpers::isAscii(c))
 		{
-			os << value[i];
+			tmpos << value[i];
 			++pos;
 		}
 		else
@@ -264,10 +279,11 @@
 			extended = true;
 		}
 	}
+	}
 
 	if (needQuoting)
 	{
-		os << '"';
+		tmpos << '"';
 		++pos;
 	}
 
@@ -275,7 +291,7 @@
 	// or is too long for a single line
 	if (extended || cutValue)
 	{
-		os << ';';
+		tmpos << ';';
 		++pos;
 
 		/* RFC-2231
@@ -301,11 +317,8 @@
 			  name.length() + 4 /* *0*= */ + 2 /* '' */
 			+ m_value.getCharset().getName().length();
 
-		if (pos + firstSectionLength + 5 >= maxLineLength)
-		{
-			os << NEW_LINE_SEQUENCE;
+			tmpos << NEW_LINE_SEQUENCE;
 			pos = NEW_LINE_SEQUENCE_LENGTH;
-		}
 
 		// Split text into multiple sections that fit on one line
 		int sectionCount = 0;
@@ -384,33 +397,36 @@
 		// Output sections
 		for (int sectionNumber = 0 ; sectionNumber < sectionCount ; ++sectionNumber)
 		{
-			os << name;
+			tmpos << name;
 
 			if (sectionCount != 1) // no section specifier when only a single one
 			{
-				os << '*';
-				os << sectionNumber;
+				tmpos << '*';
+				tmpos << sectionNumber;
 			}
 
-			os << "*=";
+			tmpos << "*=";
 
 			if (sectionNumber == 0)
 			{
-				os << m_value.getCharset().getName();
-				os << '\'' << /* No language */ '\'';
+				tmpos << m_value.getCharset().getName();
+				tmpos << '\'' << /* No language */ '\'';
 			}
 
-			os << sectionText[sectionNumber];
+			tmpos << sectionText[sectionNumber];
 
 			if (sectionNumber + 1 < sectionCount)
 			{
-				os << ';';
-				os << NEW_LINE_SEQUENCE;
+				tmpos << ';';
+				tmpos << NEW_LINE_SEQUENCE;
 				pos = NEW_LINE_SEQUENCE_LENGTH;
 			}
 		}
 	}
 
+	// write the complete header
+	os << tmpbuf;
+
 	if (newLinePos)
 		*newLinePos = pos;
 }

libvmime07-0.7.1-out-of-bounds-copy.patch:
 filteredStream.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-out-of-bounds-copy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when a line in a plain text mail starts with a '.', the
character needs to be escaped. VMime has a special filter for this, but due to a bug in this filter, a
second line starting with a '.' would trigger a wrong buffer copy, and your email would contain double
parts.

--- libvmime-0.7.1/src/utility/filteredStream.cpp			2005-06-16 21:50:12.000000000 +0200
+++ libvmime-0.7.1/src/utility/filteredStream.cpp.out-of-bounds-copy	2007-06-15 14:29:40.907779750 +0200
@@ -146,7 +146,7 @@
 
 		if (previousChar == '\n')
 		{
-			m_stream.write(start, pos - data);
+			m_stream.write(start, pos - start);
 			m_stream.write("..", 2);
 
 			start = pos + 1;

libvmime07-0.7.1-package.patch:
 configure.in    |    2 +-
 src/Makefile.am |   22 +++++++++++-----------
 vmime.pc.in     |    6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE libvmime07-0.7.1-package.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1 to get libvmime renamed to
libvmime07 to avoid any conflicts with current libvmime series. Note that libvmime 0.7.x, 0.8.x and
0.9.x are unfortunately completely API and ABI incompatible to eachother.

--- libvmime-0.7.1/src/Makefile.am					2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/src/Makefile.am.package				2009-04-05 17:36:46.000000000 +0200
@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 INTERNALS =
 INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
-lib_LTLIBRARIES = libvmime.la
-libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
-libvmime_la_SOURCES = address.cpp \
+lib_LTLIBRARIES = libvmime07.la
+libvmime07_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
+libvmime07_la_SOURCES = address.cpp \
 	addressList.cpp \
 	base.cpp \
 	body.cpp \
@@ -82,7 +82,7 @@
 	misc_importanceHelper.cpp
 
 if VMIME_HAVE_MESSAGING_FEATURES
-libvmime_la_SOURCES += messaging_authenticator.cpp \
+libvmime07_la_SOURCES += messaging_authenticator.cpp \
 	messaging_authenticationInfos.cpp \
 	messaging_authHelper.cpp \
 	messaging_builtinServices.inl \
@@ -99,17 +99,17 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-libvmime_la_SOURCES += messaging_pop3_POP3Store.cpp \
+libvmime07_la_SOURCES += messaging_pop3_POP3Store.cpp \
 	messaging_pop3_POP3Folder.cpp \
 	messaging_pop3_POP3Message.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-libvmime_la_SOURCES += messaging_smtp_SMTPTransport.cpp
+libvmime07_la_SOURCES += messaging_smtp_SMTPTransport.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-libvmime_la_SOURCES += messaging_imap_IMAPConnection.cpp \
+libvmime07_la_SOURCES += messaging_imap_IMAPConnection.cpp \
 	messaging_imap_IMAPStore.cpp \
 	messaging_imap_IMAPFolder.cpp \
 	messaging_imap_IMAPMessage.cpp \
@@ -118,24 +118,24 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-libvmime_la_SOURCES += messaging_maildir_maildirStore.cpp \
+libvmime07_la_SOURCES += messaging_maildir_maildirStore.cpp \
 	messaging_maildir_maildirFolder.cpp \
 	messaging_maildir_maildirMessage.cpp \
 	messaging_maildir_maildirUtils.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SENDMAIL
-libvmime_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
+libvmime07_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_WINDOWS
-libvmime_la_SOURCES += platforms_windows_windowsFile.cpp \
+libvmime07_la_SOURCES += platforms_windows_windowsFile.cpp \
 	platforms_windows_windowsHandler.cpp \
 	platforms_windows_windowsSocket.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_POSIX
-libvmime_la_SOURCES += platforms_posix_posixChildProcess.cpp \
+libvmime07_la_SOURCES += platforms_posix_posixChildProcess.cpp \
 	platforms_posix_posixFile.cpp \
 	platforms_posix_posixHandler.cpp \
 	platforms_posix_posixSocket.cpp
--- libvmime-0.7.1/configure.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/configure.in.package					2009-04-06 20:42:53.000000000 +0200
@@ -18,7 +18,7 @@
 GENERIC_VERSIONED_LIBRARY_NAME="vmime"
 AC_SUBST(GENERIC_VERSIONED_LIBRARY_NAME)
 
-LIBRARY_NAME="libvmime"
+LIBRARY_NAME="libvmime07"
 AC_SUBST(LIBRARY_NAME)
 
 # Library version
--- libvmime-0.7.1/vmime.pc.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/vmime.pc.in.package					2009-04-06 20:46:07.000000000 +0200
@@ -6,9 +6,9 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @GENERIC_LIBRARY_NAME@
+Name: vmime07
 Description: VMime C++ Mail Library (http://vmime.sourceforge.net)
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -l at GENERIC_VERSIONED_LIBRARY_NAME@
-Cflags: -I${includedir}/
+Libs: -L${libdir} -lvmime07
+Cflags: -I${includedir}/libvmime07/

libvmime07-0.7.1-plain-bodycopy.patch:
 messageBuilder.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-plain-bodycopy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when constructing a plaintext only body without attachments, a
copy of the body was made to set as the real body and thus removing all the multiparts. However, the same
reference is removed before setting the new body, thus invalidating that body we wish to copy, possibly
resulting in a crash.

--- libvmime-0.7.1/src/messageBuilder.cpp				2009-09-15 22:59:21.000000000 +0200
+++ libvmime-0.7.1/src/messageBuilder.cpp.plain-bodycopy		2009-09-15 23:00:33.000000000 +0200
@@ -137,6 +137,8 @@
 	if (msg->getBody()->getPartCount() == 1)
 	{
 		const bodyPart& part = *msg->getBody()->getPartAt(0);
+		// make a full copy of the body, otherwise the copyFrom will delete the body we're copying
+		const body* bodyCopy = part.getBody()->clone();
 
 		// First, copy (and replace) the header fields
 		const std::vector <const headerField*> fields = part.getHeader()->getFieldList();
@@ -149,7 +151,8 @@
 
 		// Second, copy the body contents and sub-parts (this also remove
 		// the body part we are copying...)
-		msg->getBody()->copyFrom(*part.getBody());
+		msg->getBody()->copyFrom(*bodyCopy);
+		delete bodyCopy;
 	}
 
 	return (msg);

libvmime07-0.7.1-qp-starts-on-second-line.patch:
 word.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-qp-starts-on-second-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - headers can be broken over multiple lines in an email. When
the wrapped line directly started with quoted-printable, vmime copied this text as normal text, instead
of parsing it as quoted-printable. 

--- libvmime-0.7.1/src/word.cpp						2007-01-26 14:44:10.251563000 +0100
+++ libvmime-0.7.1/src/word.cpp.qp-starts-on-second-line		2007-01-26 14:45:01.074739500 +0100
@@ -91,6 +91,7 @@
 			unencoded += ' ';
 
 			startPos = pos;
+			continue;
 		}
 		// Start of an encoded word
 		else if (pos + 8 < end &&  // 8 = "=?(.+)?(.+)?(.*)?="

libvmime07-0.7.1-quoted-printable-encode-questionmark.patch:
 encoderQP.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-quoted-printable-encode-questionmark.patch ---
Patch by Zarafa <http://www.zarafa.com/> - special characters break the quoted-printable encoding when
they are typed after a ?. This fix also encodes ?-characters, so we can't break the encoding with this
trick.

--- libvmime-0.7.1/src/encoderQP.cpp					2008-03-10 13:57:05.055163691 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-encode-question	2008-03-10 13:51:53.071163435 +0100
@@ -249,7 +249,7 @@
 		default:
 		{
 			//if ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))
-			if (c >= 33 && c <= 126 && c != 61)
+			if (c >= 33 && c <= 126 && c != 61 && c!= 63)
 			{
 				outBuffer[outBufferPos++] = c;
 				++curCol;

libvmime07-0.7.1-quoted-printable-specials.patch:
 encoderQP.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-quoted-printable-specials.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch adds some characters that should be "escaped" in
quoted-printable. With this fix you can have these characters in a fullname of an email address.

--- libvmime-0.7.1/src/encoderQP.cpp					2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-specials		2007-02-02 10:09:26.273653250 +0100
@@ -214,10 +214,18 @@
 			QP_ENCODE_HEX('=')
 			break;
 		}
+		// http://www.faqs.org/rfcs/rfc2047.html, see 'especials' characters
 		case ',':
 		case ';':
 		case ':':
 		case '_':
+		case '@':
+		case '(':
+		case ')':
+		case '<':
+		case '>':
+		case '[':
+		case ']':
 		{
 			if (rfc2047)
 			{

libvmime07-0.7.1-remove-bcc.patch:
 transport.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-remove-bcc.patch ---
Patch by Zarafa <http://www.zarafa.com/> - Bcc headers should not be send to the SMTP server. Some SMTP
servers automatically strip this header (Postfix, qmail), and others have an option for this (Exim).

--- libvmime-0.7.1/src/messaging/transport.cpp				2005-04-27 18:42:58.000000000 +0200
+++ libvmime-0.7.1/src/messaging/transport.cpp.remove-bcc		2006-10-10 14:01:43.602621328 +0200
@@ -90,6 +90,14 @@
 	}
 	catch (exceptions::no_such_field&) { }
 
+	// Remove BCC headers from the message we're about to send
+	try {
+		headerField* bcc = msg->getHeader()->findField(fields::BCC);
+
+		msg->getHeader()->removeField(bcc);
+	}
+	catch (exceptions::no_such_field&) { }
+
 	// Generate the message, "stream" it and delegate the sending
 	// to the generic send() function.
 	std::ostringstream oss;

libvmime07-0.7.1-socket-backport-and-timeout-fix.patch:
 src/platforms/posix/posixSocket.cpp   |  102 +++++++++++++++++++++++++++-------
 vmime/platforms/posix/posixSocket.hpp |    3 +
 2 files changed, 85 insertions(+), 20 deletions(-)

--- NEW FILE libvmime07-0.7.1-socket-backport-and-timeout-fix.patch ---
Patch by Zarafa <http://www.zarafa.com/> - small partial backport of some socket handling code from 0.8.1.
Only receiving data is handled better. The patch also adds a timeout, when receiving data from a socket
hasn't worked for 5 minutes. This isn't present in 0.8.1.

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-timeout	2007-10-18 11:02:54.000000000 +0200
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "vmime/exception.hpp"
 
@@ -43,7 +44,7 @@
 //
 
 posixSocket::posixSocket()
-	: m_desc(-1)
+	: m_desc(-1), m_timeouts(0)
 {
 }
 
@@ -101,6 +102,8 @@
 		// Error
 		throw vmime::exceptions::connection_error("Error while connecting socket.");
 	}
+
+	m_timeouts = 0;
 }
 
 
@@ -121,38 +124,62 @@
 	}
 }
 
-
 void posixSocket::receive(vmime::string& buffer)
 {
-	::ssize_t ret = ::recv(m_desc, m_buffer, sizeof(m_buffer), 0);
-
-	if (ret == -1)
-	{
-		// Error or no data
-		return;
-	}
-	else if (ret > 0)
-	{
-		buffer = vmime::string(m_buffer, ret);
-	}
+	const int size = receiveRaw(m_buffer, sizeof(m_buffer));
+	buffer = vmime::string(m_buffer, size);
 }
 
 
 const int posixSocket::receiveRaw(char* buffer, const int count)
 {
-	::ssize_t ret = ::recv(m_desc, buffer, count, 0);
+	fd_set fds;
+	struct timeval tv;
+	int ret;
+
+	FD_ZERO(&fds);
+	FD_SET(m_desc, &fds);
+
+	tv.tv_sec = 10;
+	tv.tv_usec = 0;
+
+	ret = ::select(m_desc+1, &fds, NULL, NULL, &tv);
+	if (ret < 0)
+	{
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
+	}
 
-	if (ret == -1)
+	ret = ::recv(m_desc, buffer, count, 0);
+
+	if (ret < 0)
 	{
-		// Error or no data
-		return (0);
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
 	}
-	else
+	else if (ret == 0)
 	{
-		return (ret);
+		// Host shutdown
+		throwSocketError(ENOTCONN);
 	}
-}
 
+	m_timeouts = 0;
+	return ret;
+}
 
 void posixSocket::send(const vmime::string& buffer)
 {
@@ -166,6 +193,41 @@
 }
 
 
+void posixSocket::throwSocketError(const int err)
+{
+	string msg;
+
+	switch (err)
+	{
+	case EACCES:          msg = "EACCES: permission denied"; break;
+	case EAFNOSUPPORT:    msg = "EAFNOSUPPORT: address family not supported"; break;
+	case EMFILE:          msg = "EMFILE: process file table overflow"; break;
+	case ENFILE:          msg = "ENFILE: system limit reached"; break;
+	case EPROTONOSUPPORT: msg = "EPROTONOSUPPORT: protocol not supported"; break;
+	case EAGAIN:          msg = "EAGAIN: blocking operation"; break;
+	case EBADF:           msg = "EBADF: invalid descriptor"; break;
+	case ECONNRESET:      msg = "ECONNRESET: connection reset by peer"; break;
+	case EFAULT:          msg = "EFAULT: bad user space address"; break;
+	case EINTR:           msg = "EINTR: signal occured before transmission"; break;
+	case EINVAL:          msg = "EINVAL: invalid argument"; break;
+	case EMSGSIZE:        msg = "EMSGSIZE: message cannot be sent atomically"; break;
+	case ENOBUFS:         msg = "ENOBUFS: output queue is full"; break;
+	case ENOMEM:          msg = "ENOMEM: out of memory"; break;
+	case EPIPE:
+	case ENOTCONN:        msg = "ENOTCONN: not connected"; break;
+	case ECONNREFUSED:    msg = "ECONNREFUSED: connection refused"; break;
+	default:
+
+		std::ostringstream oss;
+		oss << ::strerror(err);
+
+		msg = oss.str();
+		break;
+	}
+
+	throw vmime::exceptions::connection_error(msg);
+}
+
 
 
 //
--- libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp		2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp.socket-timeout	2007-10-18 10:34:46.000000000 +0200
@@ -49,10 +49,13 @@
 	void send(const vmime::string& buffer);
 	void sendRaw(const char* buffer, const int count);
 
+	void throwSocketError(const int err);
+
 private:
 
 	char m_buffer[65536];
 	int m_desc;
+	int m_timeouts;
 };
 
 

libvmime07-0.7.1-socket-tcp-nodelay.patch:
 posixSocket.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE libvmime07-0.7.1-socket-tcp-nodelay.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds the TCP_NODELAY flag to vmime sockets. This should mak
the SMTP connection faster

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-tcp	2009-03-27 10:51:06.405594549 +0100
@@ -25,6 +25,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -59,6 +60,8 @@
 
 void posixSocket::connect(const vmime::string& address, const vmime::port_t port)
 {
+	int flag = 1;
+
 	// Close current connection, if any
 	if (m_desc != -1)
 	{
@@ -94,6 +97,8 @@
 	if (m_desc == -1)
 		throw vmime::exceptions::connection_error("Error while creating socket.");
 
+	::setsockopt(m_desc, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
+
 	// Start connection
 	if (::connect(m_desc, reinterpret_cast <sockaddr*>(&addr), sizeof(addr)) == -1)
 	{

libvmime07-0.7.1-strip-header-endspaces.patch:
 headerField.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-strip-header-endspaces.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch makes sure that vmime does not parse trailing spaces
on an header. Otherwise vmime will throw an exception and a fallback delivery will be started.

--- libvmime-0.7.1/src/headerField.cpp					2007-07-31 12:54:21.898679250 +0200
+++ libvmime-0.7.1/src/headerField.cpp.strip-header-endspaces		2007-07-31 12:43:08.408588750 +0200
@@ -189,6 +189,14 @@
 					}
 				}
 
+				// strip spaces from end of header lines, also through continuation headers
+				contentsEnd--;	// original enter
+				while (contentsEnd>contentsStart &&
+					   (buffer[contentsEnd] == ' ' || buffer[contentsEnd] == '\t' ||
+						buffer[contentsEnd] == '\r' || buffer[contentsEnd] == '\n'))
+					contentsEnd--;
+				contentsEnd++;	// new 'enter'
+
 				// Return a new field
 				headerField* field = headerFieldFactory::getInstance()->create(name);
 

libvmime07-0.7.1-threading-remove-static_non-abi-change.patch:
 smartPtr.hpp |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE libvmime07-0.7.1-threading-remove-static_non-abi-change.patch ---
Patch by Zarafa <http://www.zarafa.com/> - workaround a static variable in the smart_ptr class using a
pthread mutex, which fixes multi-threading issues in libvmime.

--- libvmime-0.7.1/vmime/utility/smartPtr.hpp				2005-05-19 19:17:17.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/smartPtr.hpp.threading-remove-static	2009-05-13 15:21:53.276875219 +0200
@@ -20,6 +20,9 @@
 #ifndef VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 #define VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 
+// non-portable, but at least not an abi change
+#include <pthread.h>
+static pthread_mutex_t mapLock = PTHREAD_MUTEX_INITIALIZER;
 
 namespace vmime {
 namespace utility {
@@ -108,8 +111,10 @@
 		{
 			if (m_data->refCount == 1)
 			{
+				pthread_mutex_lock(&mapLock);
 				typename MapType::iterator it = sm_map.find(m_data->ptr);
 				if (it != sm_map.end()) sm_map.erase(it);
+				pthread_mutex_unlock(&mapLock);
 
 				delete (m_data->ptr);
 				delete (m_data);
@@ -127,6 +132,8 @@
 	{
 		detach();
 
+		pthread_mutex_lock(&mapLock);
+
 		typename MapType::iterator it = sm_map.find(p);
 
 		if (it != sm_map.end())
@@ -141,6 +148,8 @@
 
 			sm_map.insert(typename MapType::value_type(p, m_data));
 		}
+
+		pthread_mutex_unlock(&mapLock);
 	}
 
 	void attach(const smart_ptr <T>& p)

libvmime07-0.7.1-timezone-name.patch:
 dateTime.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-timezone-name.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes dates in headers which use a timezone definition, instead
of a numeric timezone offset.

--- libvmime-0.7.1/src/dateTime.cpp					2005-04-23 11:02:48.000000000 +0200
+++ libvmime-0.7.1/src/dateTime.cpp.timezone-name			2009-01-08 10:51:39.000000000 +0100
@@ -423,7 +423,7 @@
 				zone[zoneLength++] = *p;
 				++p;
 			}
-			while (zoneLength < 3 && p < pend && parserHelpers::isDigit(*p));
+			while (zoneLength < 3 && p < pend);
 
 			switch (zone[0])
 			{
@@ -487,6 +487,8 @@
 
 				break;
 			}
+			case 'g':
+			case 'G':
 			case 'u':
 			case 'U':
 			{

libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch:
 charset.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some mails have a special definition of the utf-7 character
set, named unicode-1-1-utf-7. Since this name is not defined by iconv, we rename it to utf-7. This name
seems to come from RFC 1642 <http://www.faqs.org/rfcs/rfc1642.html>.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.unicode-1-1-utf-7-charset		2007-04-23 17:08:46.714435000 +0200
@@ -64,6 +64,9 @@
 charset::charset(const string& name)
 	: m_name(name)
 {
+	// if we receive this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
 }
 
 
@@ -72,6 +75,10 @@
 {
 	m_name = string(buffer.begin() + position, buffer.begin() + end);
 
+	// if we parsed this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
+
 	setParsedBounds(position, end);
 
 	if (newPosition)


--- NEW FILE libvmime07.spec ---
Summary:	A powerful C++ class library for working with MIME/Internet messages
Name:		libvmime07
Version:	0.7.1
Release:	1%{?dist}
License:	GPLv2+
Group:		System Environment/Libraries
URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
Source0:	http://developer.zarafa.com/download/libvmime-%{version}.tar.bz2
Patch0:		libvmime07-0.7.1-package.patch
Patch1:		libvmime07-0.7.1-charset-catch.patch
Patch2:		libvmime07-0.7.1-missing-boundary.patch
Patch3:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
Patch4:		libvmime07-0.7.1-bmoted-printable.patch
Patch5:		libvmime07-0.7.1-strip-header-endspaces.patch
Patch6:		libvmime07-0.7.1-attachfnamelen.patch
Patch7:		libvmime07-0.7.1-remove-bcc.patch
Patch8:		libvmime07-0.7.1-mdn-disposition.patch
Patch9:		libvmime07-0.7.1-mdn-final-recipient.patch
Patch10:	libvmime07-0.7.1-broken-locale-error.patch
Patch11:	libvmime07-0.7.1-qp-starts-on-second-line.patch
Patch12:	libvmime07-0.7.1-quoted-printable-specials.patch
Patch13:	libvmime07-0.7.1-header-value-on-next-line.patch
Patch14:	libvmime07-0.7.1-oe-compatibility.patch
Patch15:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
Patch16:	libvmime07-0.7.1-out-of-bounds-copy.patch
Patch17:	libvmime07-0.7.1-default-transfer-encoding.patch
Patch18:	libvmime07-0.7.1-contentid-without-at.patch
Patch19:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
Patch20:	libvmime07-0.7.1-double-empty-boundary.patch
Patch21:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
Patch22:	libvmime07-0.7.1-charset-output-buffer-full.patch
Patch23:	libvmime07-0.7.1-gcc-4.3-support.patch
Patch24:	libvmime07-0.7.1-timezone-name.patch
Patch25:	libvmime07-0.7.1-socket-tcp-nodelay.patch
Patch26:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
Patch27:	libvmime07-0.7.1-gcc-4.4-support.patch
Patch28:	libvmime07-0.7.1-plain-bodycopy.patch
BuildRequires:	sendmail, libtool, autoconf, automake
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
VMime is a powerful C++ class library for parsing, generating or
editing Internet RFC-[2]822 and MIME messages. VMime is designed
to provide a fast and an easy way to manipulate Internet mail
messages.

It also includes support for using messaging protocols (POP3, IMAP,
SMTP and maildir) with a lot of features supported: listing folders,
downloading and adding messages to folders, extracting parts from
message, getting and setting message flags and a lot more.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%package devel
Summary:	Development files for the libvmime library
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig

%description devel
The libvmime package includes header files and libraries necessary
for developing programs which use the libvmime C++ class library.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%prep
%setup -q -n libvmime-%{version}
%patch0 -p1 -b .package
%patch1 -p1 -b .charset-catch
%patch2 -p1 -b .missing-boundary
%patch3 -p1 -b .allow-no-recips-and-senders
%patch4 -p1 -b .bmoted-printable
%patch5 -p1 -b .strip-header-endspaces
%patch6 -p1 -b .attachfnamelen
%patch7 -p1 -b .remove-bcc
%patch8 -p1 -b .mdn-disposition
%patch9 -p1 -b .mdn-final-recipient
%patch10 -p1 -b .broken-locale-error
%patch11 -p1 -b .qp-starts-on-second-line
%patch12 -p1 -b .quoted-printable-specials
%patch13 -p1 -b .header-value-on-next-line
%patch14 -p1 -b .oe-compatibility
%patch15 -p1 -b .unicode-1-1-utf-7-charset
%patch16 -p1 -b .out-of-bounds-copy
%patch17 -p1 -b .default-transfer-encoding
%patch18 -p1 -b .contentid-without-at
%patch19 -p1 -b .socket-backport-and-timeout-fix
%patch20 -p1 -b .double-empty-boundary
%patch21 -p1 -b .quoted-printable-encode-questionmark
%patch22 -p1 -b .charset-output-buffer-full
%patch23 -p1 -b .gcc-4.3-support
%patch24 -p1 -b .timezone-name
%patch25 -p1 -b .socket-tcp-nodelay
%patch26 -p1 -b .threading-remove-static_non-abi-change
%patch27 -p1 -b .gcc-4.4-support
%patch28 -p1 -b .plain-bodycopy

# Needed to apply branding patch
libtoolize --force
autoreconf --force --install

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Complete the libvmime07 renaming at some places
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
mv -f $RPM_BUILD_ROOT%{_includedir}/{vmime,%{name}}/
mv -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vmime{,07}.pc 

# Remove the static library and libtool .la file
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}

# Remove the documentation dir, as %doc will pick it up
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/%{name}.so
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/vmime07.pc

%changelog
* Sat Sep 05 2009 Robert Scheck <robert at fedoraproject.org> 0.7.1-1
- Upgrade to 0.7.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:17:43 -0000	1.1
+++ .cvsignore	16 Sep 2009 21:50:29 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:17:43 -0000	1.1
+++ sources	16 Sep 2009 21:50:31 -0000	1.2
@@ -0,0 +1 @@
+81f06a771d2de01d5982635838eb5f6a  libvmime-0.7.1.tar.bz2



From robert at fedoraproject.org  Wed Sep 16 21:50:32 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 16 Sep 2009 21:50:32 +0000 (UTC)
Subject: rpms/libvmime07/F-11
	libvmime07-0.7.1-allow-no-recips-and-senders.patch, NONE,
	1.1 libvmime07-0.7.1-attachfnamelen.patch, NONE,
	1.1 libvmime07-0.7.1-bmoted-printable.patch, NONE,
	1.1 libvmime07-0.7.1-broken-locale-error.patch, NONE,
	1.1 libvmime07-0.7.1-charset-catch.patch, NONE,
	1.1 libvmime07-0.7.1-charset-output-buffer-full.patch, NONE,
	1.1 libvmime07-0.7.1-contentid-without-at.patch, NONE,
	1.1 libvmime07-0.7.1-default-transfer-encoding.patch, NONE,
	1.1 libvmime07-0.7.1-double-empty-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.3-support.patch, NONE,
	1.1 libvmime07-0.7.1-gcc-4.4-support.patch, NONE,
	1.1 libvmime07-0.7.1-header-value-on-next-line.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-disposition.patch, NONE,
	1.1 libvmime07-0.7.1-mdn-final-recipient.patch, NONE,
	1.1 libvmime07-0.7.1-missing-boundary.patch, NONE,
	1.1 libvmime07-0.7.1-oe-compatibility.patch, NONE,
	1.1 libvmime07-0.7.1-out-of-bounds-copy.patch, NONE,
	1.1 libvmime07-0.7.1-package.patch, NONE,
	1.1 libvmime07-0.7.1-plain-bodycopy.patch, NONE,
	1.1 libvmime07-0.7.1-qp-starts-on-second-line.patch, NONE,
	1.1 libvmime07-0.7.1-quoted-printable-encode-questionmark.patch,
	NONE, 1.1 libvmime07-0.7.1-quoted-printable-specials.patch, NONE,
	1.1 libvmime07-0.7.1-remove-bcc.patch, NONE,
	1.1 libvmime07-0.7.1-socket-backport-and-timeout-fix.patch, NONE,
	1.1 libvmime07-0.7.1-socket-tcp-nodelay.patch, NONE,
	1.1 libvmime07-0.7.1-strip-header-endspaces.patch, NONE,
	1.1 libvmime07-0.7.1-threading-remove-static_non-abi-change.patch,
	NONE, 1.1 libvmime07-0.7.1-timezone-name.patch, NONE,
	1.1 libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch, NONE,
	1.1 libvmime07.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090916215032.B0E5911C0336@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libvmime07/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	libvmime07-0.7.1-allow-no-recips-and-senders.patch 
	libvmime07-0.7.1-attachfnamelen.patch 
	libvmime07-0.7.1-bmoted-printable.patch 
	libvmime07-0.7.1-broken-locale-error.patch 
	libvmime07-0.7.1-charset-catch.patch 
	libvmime07-0.7.1-charset-output-buffer-full.patch 
	libvmime07-0.7.1-contentid-without-at.patch 
	libvmime07-0.7.1-default-transfer-encoding.patch 
	libvmime07-0.7.1-double-empty-boundary.patch 
	libvmime07-0.7.1-gcc-4.3-support.patch 
	libvmime07-0.7.1-gcc-4.4-support.patch 
	libvmime07-0.7.1-header-value-on-next-line.patch 
	libvmime07-0.7.1-mdn-disposition.patch 
	libvmime07-0.7.1-mdn-final-recipient.patch 
	libvmime07-0.7.1-missing-boundary.patch 
	libvmime07-0.7.1-oe-compatibility.patch 
	libvmime07-0.7.1-out-of-bounds-copy.patch 
	libvmime07-0.7.1-package.patch 
	libvmime07-0.7.1-plain-bodycopy.patch 
	libvmime07-0.7.1-qp-starts-on-second-line.patch 
	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch 
	libvmime07-0.7.1-quoted-printable-specials.patch 
	libvmime07-0.7.1-remove-bcc.patch 
	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch 
	libvmime07-0.7.1-socket-tcp-nodelay.patch 
	libvmime07-0.7.1-strip-header-endspaces.patch 
	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch 
	libvmime07-0.7.1-timezone-name.patch 
	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch 
	libvmime07.spec 
Log Message:
Populate libvmime07 to Fedora and EPEL branches


libvmime07-0.7.1-allow-no-recips-and-senders.patch:
 messageBuilder.cpp |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE libvmime07-0.7.1-allow-no-recips-and-senders.patch ---
Patch by Zarafa <http://www.zarafa.com/> - makes the messageBuilder helper generate an mail without To or
Cc headers. This way, an email with only Bcc entries will still be sent. This feature is mostly used by
people to mask a mailing list or invitation that should be send to alot of people.

--- libvmime-0.7.1/src/messageBuilder.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/messageBuilder.cpp.allow-no-recips-and-senders	2006-01-13 09:49:51.000000000 +0100
@@ -50,14 +50,11 @@
 	// Generate the header fields
 	msg->getHeader()->Subject().setValue(m_subject);
 
-	if (m_from.isEmpty())
-		throw exceptions::no_expeditor();
-
-	if (m_to.isEmpty() || m_to.getAddressAt(0)->isEmpty())
-		throw exceptions::no_recipient();
-
-	msg->getHeader()->From().setValue(m_from);
-	msg->getHeader()->To().setValue(m_to);
+	if (!m_from.isEmpty())
+		msg->getHeader()->From().setValue(m_from);
+		
+	if (!m_to.isEmpty())
+		msg->getHeader()->To().setValue(m_to);
 
 	if (!m_cc.isEmpty())
 		msg->getHeader()->Cc().setValue(m_cc);

libvmime07-0.7.1-attachfnamelen.patch:
 defaultParameter.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-attachfnamelen.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes parsing of an attachment filename that is between 66 and
76 characters long.

--- libvmime-0.7.1/src/defaultParameter.cpp				2005-06-21 19:06:35.000000000 +0200
+++ libvmime-0.7.1/src/defaultParameter.cpp.attachfnamelen		2006-08-01 10:42:18.277853120 +0200
@@ -200,7 +200,8 @@
 	bool needQuoting = false;
 	string::size_type valueLength = 0;
 
-	for (string::size_type i = 0 ; (i < value.length()) && (pos + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
+	// Use worst-case length name.length()+2 for 'name=' part of line
+	for (string::size_type i = 0 ; (i < value.length()) && (pos + name.length() + 2 + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
 	{
 		switch (value[i])
 		{

libvmime07-0.7.1-bmoted-printable.patch:
 encoderFactory.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-bmoted-printable.patch ---
Patch by Zarafa <http://www.zarafa.com/> - we've seen broken mails with an invalid encoding. Unsure what
'bmoted-printable' actually is, we make vmime treat it as normal 'quoted-printable'. 

--- libvmime-0.7.1/src/encoderFactory.cpp				2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderFactory.cpp.bmoted-printable		2006-04-05 10:35:25.618215000 +0200
@@ -37,6 +37,7 @@
 	// Register some default encoders
 	registerName <encoderB64>("base64");
 	registerName <encoderQP>("quoted-printable");
+	registerName <encoderQP>("bmoted-printable");
 	registerName <encoderUUE>("uuencode");
 	registerName <encoder7bit>("7bit");
 	registerName <encoder8bit>("8bit");

libvmime07-0.7.1-broken-locale-error.patch:
 posixHandler.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-broken-locale-error.patch ---
Patch by Zarafa <http://www.zarafa.com/> - on Debian machines, you need to configure the locales
(languages) that will be used on the system. When you use a locale (eg. 'LC_MESSAGES=nl_NL', but did not
configure your distribution to have this locale present on your system, a NULL pointer would have thrown
an exception in the std::string class. This makes sure that exception never happens.

--- libvmime-0.7.1/src/platforms/posix/posixHandler.cpp			2005-04-30 09:53:21.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixHandler.cpp.broken-locale	2006-12-28 17:29:43.883410000 +0100
@@ -106,9 +106,9 @@
 
 const vmime::charset posixHandler::getLocaleCharset() const
 {
-	vmime::string prevLocale(::setlocale(LC_ALL, ""));
+	char *prevLocale = ::setlocale(LC_ALL, "");
 	vmime::charset ch(::nl_langinfo(CODESET));
-	::setlocale(LC_ALL, prevLocale.c_str());
+	::setlocale(LC_ALL, prevLocale);
 
 	return (ch);
 }

libvmime07-0.7.1-charset-catch.patch:
 word.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-catch.patch ---
Patch by Zarafa <http://www.zarafa.com/> - early catches an exception of vmime when iconv was unable to
convert a word from or to the requested charsets. This makes broken mails with invalid characters for a
valid charset still be able to deliver. We'd rather have an email with a ? sign than a FallbackDelivery
for the user. 

--- libvmime-0.7.1/src/word.cpp						2005-06-13 12:56:52.000000000 +0200
+++ libvmime-0.7.1/src/word.cpp.charset-catch				2005-11-15 18:02:45.000000000 +0100
@@ -688,7 +688,13 @@
 {
 	string out;
 
+	try {
 	charset::convert(m_buffer, out, m_charset, dest);
+	}
+	catch (vmime::exception &e) {
+		// copy 'word' as text
+		out = m_buffer;
+	}
 
 	return (out);
 }

libvmime07-0.7.1-charset-output-buffer-full.patch:
 charset.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libvmime07-0.7.1-charset-output-buffer-full.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes iconv conversion with source buffers > 64Kb not to add a
'?' and skip one byte of the input buffer.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.charset-output-buffer-full		2008-07-07 13:51:33.414160106 +0200
@@ -206,10 +206,12 @@
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);
 
 				// Ignore this "blocking" character and continue
+				if (outBytesLeft > 0) {
 				out += '?';
 				++inBuffer;
 				--inBytesLeft;
 			}
+			}
 			else
 			{
 				out += STRINGT(static_cast <ovt*>(buffer), sizeof(buffer) - outBytesLeft);

libvmime07-0.7.1-contentid-without-at.patch:
 messageId.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE libvmime07-0.7.1-contentid-without-at.patch ---
Patch by Zarafa <http://www.zarafa.com/> - enables re-generation of broken content-id's that had no @ sign
in them.

--- libvmime-0.7.1/src/messageId.cpp					2005-03-27 14:59:12.000000000 +0200
+++ libvmime-0.7.1/src/messageId.cpp.contentid-without-at		2007-07-31 14:14:38.827718500 +0200
@@ -102,7 +102,7 @@
 		// Extract left part
 		const string::size_type leftStart = position + (p - pstart);
 
-		while (p < pend && *p != '@') ++p;
+		while (p < pend && *p != '@' && *p != '>') ++p;
 
 		m_left = string(buffer.begin() + leftStart,
 		                buffer.begin() + position + (p - pstart));
@@ -162,6 +162,8 @@
 
 const string messageId::getId() const
 {
+	if (m_right == "")
+		return m_left;
 	return (m_left + '@' + m_right);
 }
 
@@ -177,7 +179,10 @@
 		pos = NEW_LINE_SEQUENCE_LENGTH;
 	}
 
-	os << '<' << m_left << '@' << m_right << '>';
+	os << '<' << m_left;
+	if (m_right != "")
+		os << '@' << m_right;
+	os << '>';
 
 	if (newLinePos)
 		*newLinePos = pos + m_left.length() + m_right.length() + 3;

libvmime07-0.7.1-default-transfer-encoding.patch:
 body.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE libvmime07-0.7.1-default-transfer-encoding.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some broken generators may set the Content-Transfer-Encoding
header, but did not set any value. We'll assume the default value '7bit'.

--- libvmime-0.7.1/src/body.cpp						2007-01-26 14:44:10.259563000 +0100
+++ libvmime-0.7.1/src/body.cpp.default-transfer-encoding		2007-07-13 12:14:30.699846500 +0200
@@ -465,6 +465,9 @@
 		const contentEncodingField& cef = dynamic_cast<contentEncodingField&>
 			(*m_header->findField(fields::CONTENT_TRANSFER_ENCODING));
 
+		if (cef.getValue().getName().empty())
+			return (vmime::encoding(encodingTypes::SEVEN_BIT));
+
 		return (cef.getValue());
 	}
 	catch (exceptions::no_such_field&)

libvmime07-0.7.1-double-empty-boundary.patch:
 body.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-double-empty-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email contains the same boundary to announce a new body
part directly one after another, vmime would have crashed because the body part added to the object with
size of (size_type)(-1). Thus having a body part of 4294967294 bytes on 32bit and 18446744073709551615
bytes on 64 bit systems.

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.double-empty-boundary			2007-11-01 16:45:20.688580500 +0100
@@ -173,7 +173,7 @@
 				++pos;
 			}
 
-			if (index > 0)
+			if (index > 0 && partStart < partEnd)
 			{
 				bodyPart* part = new bodyPart;
 

libvmime07-0.7.1-gcc-4.3-support.patch:
 src/messaging/imap/IMAPMessage.cpp  |    2 +-
 src/platforms/posix/posixSocket.cpp |    1 +
 src/utility/md5.cpp                 |    2 +-
 vmime/utility/filteredStream.hpp    |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-gcc-4.3-support.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds required include headers to compile with g++-4.3 and up.

--- libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp			2005-05-27 21:31:44.000000000 +0200
+++ libvmime-0.7.1/src/messaging/imap/IMAPMessage.cpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -26,7 +26,7 @@
 
 #include <sstream>
 #include <iterator>
-
+#include <typeinfo>
 
 namespace vmime {
 namespace messaging {
--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.gcc-4.3-support	2008-07-07 15:42:16.700025085 +0200
@@ -19,6 +19,7 @@
 
 #include "vmime/platforms/posix/posixSocket.hpp"
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
--- libvmime-0.7.1/src/utility/md5.cpp					2005-03-18 22:26:48.000000000 +0100
+++ libvmime-0.7.1/src/utility/md5.cpp.gcc-4.3-support			2008-07-07 15:41:38.034166062 +0200
@@ -45,7 +45,7 @@
 //     documentation and/or software.
 
 #include "vmime/utility/md5.hpp"
-
+#include <string.h>
 
 namespace vmime {
 namespace utility {
--- libvmime-0.7.1/vmime/utility/filteredStream.hpp			2005-06-16 21:19:12.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/filteredStream.hpp.gcc-4.3-support	2008-07-07 15:41:38.034166062 +0200
@@ -22,7 +22,7 @@
 
 
 #include "vmime/utility/stream.hpp"
-
+#include <algorithm>
 
 namespace vmime {
 namespace utility {

libvmime07-0.7.1-gcc-4.4-support.patch:
 posixFile.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-gcc-4.4-support.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1, which adds a missing include file
in order to build successfully with GCC 4.4 and newer.

--- libvmime-0.7.1/src/platforms/posix/posixFile.cpp			2005-04-09 10:42:46.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixFile.cpp.gcc-4.4-support	2009-03-29 21:09:07.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include <dirent.h>
 
+#include <stdio.h>
 #include <string.h>
 
 #include "vmime/exception.hpp"

libvmime07-0.7.1-header-value-on-next-line.patch:
 headerField.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libvmime07-0.7.1-header-value-on-next-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when an email header has the data part on the second line,
vmime was unable to parse this data and skip adds the header as empty to it's internal structures. This
makes sure these headers are still correctly parsed.

--- libvmime-0.7.1/src/headerField.cpp					2007-01-26 14:44:10.315567250 +0100
+++ libvmime-0.7.1/src/headerField.cpp.header-value-on-next-line	2007-02-07 13:35:35.177077750 +0100
@@ -147,14 +147,12 @@
 					{
 						contentsEnd = pos;
 						pos += 2;
-						break;
 					}
 					else if (c == '\n')
 					{
 						contentsEnd = pos;
 						++pos;
-						break;
-					}
+					} else {
 
 					while (pos < end)
 					{
@@ -176,6 +174,7 @@
 
 						++pos;
 					}
+					}
 
 					// Handle the case of folded lines
 					if (buffer[pos] == ' ' || buffer[pos] == '\t')

libvmime07-0.7.1-mdn-disposition.patch:
 MDNHelper.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-mdn-disposition.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes a small but crucial typo in a header of an MDN (read
receipt) mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2005-04-09 21:45:07.000000000 +0200
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-disposition		2006-11-28 09:37:56.009129500 +0100
@@ -143,7 +143,7 @@
 
 	hdr->ContentType().setValue(mediaType(vmime::mediaTypes::MULTIPART,
 	                                      vmime::mediaTypes::MULTIPART_REPORT));
-	hdr->ContentType().setReportType("disosition-notification");
+	hdr->ContentType().setReportType("disposition-notification");
 
 	hdr->Disposition().setValue(dispo);
 

libvmime07-0.7.1-mdn-final-recipient.patch:
 MDNHelper.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-mdn-final-recipient.patch ---
Patch by Zarafa <http://www.zarafa.com/> - a header with the final recipient information was created, but
not added to the MDN email. This patch adds this information to the mail.

--- libvmime-0.7.1/src/mdn/MDNHelper.cpp				2006-11-28 09:43:47.995127250 +0100
+++ libvmime-0.7.1/src/mdn/MDNHelper.cpp.mdn-final-recipient		2006-11-28 09:43:27.505846750 +0100
@@ -246,6 +246,7 @@
 		(headerFieldFactory::getInstance()->create(vmime::fields::FINAL_RECIPIENT));
 
 	fr->setValue("rfc822; " + mdnInfos.getRecipient().getEmail());
+	fields.appendField(fr);
 
 	// -- Original-Message-ID
 	if (mdnInfos.getMessage()->getHeader()->hasField(vmime::fields::MESSAGE_ID))

libvmime07-0.7.1-missing-boundary.patch:
 body.cpp |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE libvmime07-0.7.1-missing-boundary.patch ---
Patch by Zarafa <http://www.zarafa.com/> - broken emails without a final boundary will still be able to
deliver with all attachments. The final part without the boundary will be treated as an attachment. 

--- libvmime-0.7.1/src/body.cpp						2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/body.cpp.missing-boundary			2006-01-12 15:45:48.443911888 +0100
@@ -200,6 +200,27 @@
 
 		if (partStart < end)
 			m_epilogText = string(buffer.begin() + partStart, buffer.begin() + end);
+
+		// lastPart was not found, so the last boundary was missing
+		// m_epilogText will become a bodyPart
+		if (!lastPart && pos == string::npos) {
+			bodyPart* part = new bodyPart;
+
+			try
+			{
+				part->parse(m_epilogText);
+			}
+			catch (std::exception&)
+			{
+				delete (part);
+				throw;
+			}
+
+			part->m_parent = m_part;
+
+			m_parts.push_back(part);
+		}
+			
 	}
 	// Treat the contents as 'simple' data
 	else

libvmime07-0.7.1-oe-compatibility.patch:
 defaultParameter.cpp |   66 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

--- NEW FILE libvmime07-0.7.1-oe-compatibility.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes attachment names in Outlook Express which are long and
have high characters.

--- libvmime-0.7.1/src/defaultParameter.cpp				2007-01-26 14:44:10.243562750 +0100
+++ libvmime-0.7.1/src/defaultParameter.cpp.vmime-oe-compatibility	2007-04-24 13:43:36.579203500 +0200
@@ -186,18 +186,18 @@
 {
 	const string& name = getName();
 	const string& value = m_value.getBuffer();
+	string tmpbuf;
+	utility::outputStreamStringAdapter tmpos(tmpbuf);
 
 	// For compatibility with implementations that do not understand RFC-2231,
 	// also generate a normal "7bit/us-ascii" parameter
 	string::size_type pos = curLinePos;
 
-	if (pos + name.length() + 10 + value.length() > maxLineLength)
-	{
-		os << NEW_LINE_SEQUENCE;
+		tmpos << NEW_LINE_SEQUENCE;
 		pos = NEW_LINE_SEQUENCE_LENGTH;
-	}
 
 	bool needQuoting = false;
+	bool needQuotedPrintable = false;
 	string::size_type valueLength = 0;
 
 	// Use worst-case length name.length()+2 for 'name=' part of line
@@ -228,35 +228,50 @@
 			needQuoting = true;
 			break;
 		}
+		if (!parserHelpers::isAscii(value[i]))
+		{
+			needQuotedPrintable = true;
+			needQuoting = true;
+		}
 	}
 
 	const bool cutValue = (valueLength != value.length());  // has the value been cut?
 
 	if (needQuoting)
 	{
-		os << name << "=\"";
+		tmpos << name << "=\"";
 		pos += name.length() + 2;
 	}
 	else
 	{
-		os << name << "=";
+		tmpos << name << "=";
 		pos += name.length() + 1;
 	}
 
 	bool extended = false;
-
-	for (string::size_type i = 0 ; (i < value.length()) && (pos < maxLineLength - 4) ; ++i)
+	if (needQuotedPrintable)
+	{
+		// send the name in quoted-printable, so outlook express et.al. will understand the real filename
+		size_t oldlen = tmpbuf.length();
+		m_value.generate(tmpos);
+		pos += tmpbuf.length() - oldlen;
+		extended = true;		// also send with RFC-2231 encoding
+	}
+	else
+	{
+	// do not chop off this value, but just add the complete name as one header line.
+	for (string::size_type i = 0 ; (i < value.length()) /*&& (pos < maxLineLength - 4) */ ; ++i)
 	{
 		const char_t c = value[i];
 
 		if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
 		{
-			os << '\\' << value[i];  // escape 'x' with '\x'
+			tmpos << '\\' << value[i];  // escape 'x' with '\x'
 			pos += 2;
 		}
 		else if (parserHelpers::isAscii(c))
 		{
-			os << value[i];
+			tmpos << value[i];
 			++pos;
 		}
 		else
@@ -264,10 +279,11 @@
 			extended = true;
 		}
 	}
+	}
 
 	if (needQuoting)
 	{
-		os << '"';
+		tmpos << '"';
 		++pos;
 	}
 
@@ -275,7 +291,7 @@
 	// or is too long for a single line
 	if (extended || cutValue)
 	{
-		os << ';';
+		tmpos << ';';
 		++pos;
 
 		/* RFC-2231
@@ -301,11 +317,8 @@
 			  name.length() + 4 /* *0*= */ + 2 /* '' */
 			+ m_value.getCharset().getName().length();
 
-		if (pos + firstSectionLength + 5 >= maxLineLength)
-		{
-			os << NEW_LINE_SEQUENCE;
+			tmpos << NEW_LINE_SEQUENCE;
 			pos = NEW_LINE_SEQUENCE_LENGTH;
-		}
 
 		// Split text into multiple sections that fit on one line
 		int sectionCount = 0;
@@ -384,33 +397,36 @@
 		// Output sections
 		for (int sectionNumber = 0 ; sectionNumber < sectionCount ; ++sectionNumber)
 		{
-			os << name;
+			tmpos << name;
 
 			if (sectionCount != 1) // no section specifier when only a single one
 			{
-				os << '*';
-				os << sectionNumber;
+				tmpos << '*';
+				tmpos << sectionNumber;
 			}
 
-			os << "*=";
+			tmpos << "*=";
 
 			if (sectionNumber == 0)
 			{
-				os << m_value.getCharset().getName();
-				os << '\'' << /* No language */ '\'';
+				tmpos << m_value.getCharset().getName();
+				tmpos << '\'' << /* No language */ '\'';
 			}
 
-			os << sectionText[sectionNumber];
+			tmpos << sectionText[sectionNumber];
 
 			if (sectionNumber + 1 < sectionCount)
 			{
-				os << ';';
-				os << NEW_LINE_SEQUENCE;
+				tmpos << ';';
+				tmpos << NEW_LINE_SEQUENCE;
 				pos = NEW_LINE_SEQUENCE_LENGTH;
 			}
 		}
 	}
 
+	// write the complete header
+	os << tmpbuf;
+
 	if (newLinePos)
 		*newLinePos = pos;
 }

libvmime07-0.7.1-out-of-bounds-copy.patch:
 filteredStream.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-out-of-bounds-copy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when a line in a plain text mail starts with a '.', the
character needs to be escaped. VMime has a special filter for this, but due to a bug in this filter, a
second line starting with a '.' would trigger a wrong buffer copy, and your email would contain double
parts.

--- libvmime-0.7.1/src/utility/filteredStream.cpp			2005-06-16 21:50:12.000000000 +0200
+++ libvmime-0.7.1/src/utility/filteredStream.cpp.out-of-bounds-copy	2007-06-15 14:29:40.907779750 +0200
@@ -146,7 +146,7 @@
 
 		if (previousChar == '\n')
 		{
-			m_stream.write(start, pos - data);
+			m_stream.write(start, pos - start);
 			m_stream.write("..", 2);
 
 			start = pos + 1;

libvmime07-0.7.1-package.patch:
 configure.in    |    2 +-
 src/Makefile.am |   22 +++++++++++-----------
 vmime.pc.in     |    6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE libvmime07-0.7.1-package.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libvmime >= 0.7.1 to get libvmime renamed to
libvmime07 to avoid any conflicts with current libvmime series. Note that libvmime 0.7.x, 0.8.x and
0.9.x are unfortunately completely API and ABI incompatible to eachother.

--- libvmime-0.7.1/src/Makefile.am					2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/src/Makefile.am.package				2009-04-05 17:36:46.000000000 +0200
@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 INTERNALS =
 INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
-lib_LTLIBRARIES = libvmime.la
-libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
-libvmime_la_SOURCES = address.cpp \
+lib_LTLIBRARIES = libvmime07.la
+libvmime07_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
+libvmime07_la_SOURCES = address.cpp \
 	addressList.cpp \
 	base.cpp \
 	body.cpp \
@@ -82,7 +82,7 @@
 	misc_importanceHelper.cpp
 
 if VMIME_HAVE_MESSAGING_FEATURES
-libvmime_la_SOURCES += messaging_authenticator.cpp \
+libvmime07_la_SOURCES += messaging_authenticator.cpp \
 	messaging_authenticationInfos.cpp \
 	messaging_authHelper.cpp \
 	messaging_builtinServices.inl \
@@ -99,17 +99,17 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-libvmime_la_SOURCES += messaging_pop3_POP3Store.cpp \
+libvmime07_la_SOURCES += messaging_pop3_POP3Store.cpp \
 	messaging_pop3_POP3Folder.cpp \
 	messaging_pop3_POP3Message.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-libvmime_la_SOURCES += messaging_smtp_SMTPTransport.cpp
+libvmime07_la_SOURCES += messaging_smtp_SMTPTransport.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-libvmime_la_SOURCES += messaging_imap_IMAPConnection.cpp \
+libvmime07_la_SOURCES += messaging_imap_IMAPConnection.cpp \
 	messaging_imap_IMAPStore.cpp \
 	messaging_imap_IMAPFolder.cpp \
 	messaging_imap_IMAPMessage.cpp \
@@ -118,24 +118,24 @@
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-libvmime_la_SOURCES += messaging_maildir_maildirStore.cpp \
+libvmime07_la_SOURCES += messaging_maildir_maildirStore.cpp \
 	messaging_maildir_maildirFolder.cpp \
 	messaging_maildir_maildirMessage.cpp \
 	messaging_maildir_maildirUtils.cpp
 endif
 
 if VMIME_BUILTIN_MESSAGING_PROTO_SENDMAIL
-libvmime_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
+libvmime07_la_SOURCES += messaging_sendmail_sendmailTransport.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_WINDOWS
-libvmime_la_SOURCES += platforms_windows_windowsFile.cpp \
+libvmime07_la_SOURCES += platforms_windows_windowsFile.cpp \
 	platforms_windows_windowsHandler.cpp \
 	platforms_windows_windowsSocket.cpp
 endif
 
 if VMIME_BUILTIN_PLATFORM_POSIX
-libvmime_la_SOURCES += platforms_posix_posixChildProcess.cpp \
+libvmime07_la_SOURCES += platforms_posix_posixChildProcess.cpp \
 	platforms_posix_posixFile.cpp \
 	platforms_posix_posixHandler.cpp \
 	platforms_posix_posixSocket.cpp
--- libvmime-0.7.1/configure.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/configure.in.package					2009-04-06 20:42:53.000000000 +0200
@@ -18,7 +18,7 @@
 GENERIC_VERSIONED_LIBRARY_NAME="vmime"
 AC_SUBST(GENERIC_VERSIONED_LIBRARY_NAME)
 
-LIBRARY_NAME="libvmime"
+LIBRARY_NAME="libvmime07"
 AC_SUBST(LIBRARY_NAME)
 
 # Library version
--- libvmime-0.7.1/vmime.pc.in						2005-06-22 00:11:11.000000000 +0200
+++ libvmime-0.7.1/vmime.pc.in.package					2009-04-06 20:46:07.000000000 +0200
@@ -6,9 +6,9 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @GENERIC_LIBRARY_NAME@
+Name: vmime07
 Description: VMime C++ Mail Library (http://vmime.sourceforge.net)
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -l at GENERIC_VERSIONED_LIBRARY_NAME@
-Cflags: -I${includedir}/
+Libs: -L${libdir} -lvmime07
+Cflags: -I${includedir}/libvmime07/

libvmime07-0.7.1-plain-bodycopy.patch:
 messageBuilder.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-plain-bodycopy.patch ---
Patch by Zarafa <http://www.zarafa.com/> - when constructing a plaintext only body without attachments, a
copy of the body was made to set as the real body and thus removing all the multiparts. However, the same
reference is removed before setting the new body, thus invalidating that body we wish to copy, possibly
resulting in a crash.

--- libvmime-0.7.1/src/messageBuilder.cpp				2009-09-15 22:59:21.000000000 +0200
+++ libvmime-0.7.1/src/messageBuilder.cpp.plain-bodycopy		2009-09-15 23:00:33.000000000 +0200
@@ -137,6 +137,8 @@
 	if (msg->getBody()->getPartCount() == 1)
 	{
 		const bodyPart& part = *msg->getBody()->getPartAt(0);
+		// make a full copy of the body, otherwise the copyFrom will delete the body we're copying
+		const body* bodyCopy = part.getBody()->clone();
 
 		// First, copy (and replace) the header fields
 		const std::vector <const headerField*> fields = part.getHeader()->getFieldList();
@@ -149,7 +151,8 @@
 
 		// Second, copy the body contents and sub-parts (this also remove
 		// the body part we are copying...)
-		msg->getBody()->copyFrom(*part.getBody());
+		msg->getBody()->copyFrom(*bodyCopy);
+		delete bodyCopy;
 	}
 
 	return (msg);

libvmime07-0.7.1-qp-starts-on-second-line.patch:
 word.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libvmime07-0.7.1-qp-starts-on-second-line.patch ---
Patch by Zarafa <http://www.zarafa.com/> - headers can be broken over multiple lines in an email. When
the wrapped line directly started with quoted-printable, vmime copied this text as normal text, instead
of parsing it as quoted-printable. 

--- libvmime-0.7.1/src/word.cpp						2007-01-26 14:44:10.251563000 +0100
+++ libvmime-0.7.1/src/word.cpp.qp-starts-on-second-line		2007-01-26 14:45:01.074739500 +0100
@@ -91,6 +91,7 @@
 			unencoded += ' ';
 
 			startPos = pos;
+			continue;
 		}
 		// Start of an encoded word
 		else if (pos + 8 < end &&  // 8 = "=?(.+)?(.+)?(.*)?="

libvmime07-0.7.1-quoted-printable-encode-questionmark.patch:
 encoderQP.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-quoted-printable-encode-questionmark.patch ---
Patch by Zarafa <http://www.zarafa.com/> - special characters break the quoted-printable encoding when
they are typed after a ?. This fix also encodes ?-characters, so we can't break the encoding with this
trick.

--- libvmime-0.7.1/src/encoderQP.cpp					2008-03-10 13:57:05.055163691 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-encode-question	2008-03-10 13:51:53.071163435 +0100
@@ -249,7 +249,7 @@
 		default:
 		{
 			//if ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))
-			if (c >= 33 && c <= 126 && c != 61)
+			if (c >= 33 && c <= 126 && c != 61 && c!= 63)
 			{
 				outBuffer[outBufferPos++] = c;
 				++curCol;

libvmime07-0.7.1-quoted-printable-specials.patch:
 encoderQP.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-quoted-printable-specials.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch adds some characters that should be "escaped" in
quoted-printable. With this fix you can have these characters in a fullname of an email address.

--- libvmime-0.7.1/src/encoderQP.cpp					2005-03-18 22:26:47.000000000 +0100
+++ libvmime-0.7.1/src/encoderQP.cpp.quoted-printable-specials		2007-02-02 10:09:26.273653250 +0100
@@ -214,10 +214,18 @@
 			QP_ENCODE_HEX('=')
 			break;
 		}
+		// http://www.faqs.org/rfcs/rfc2047.html, see 'especials' characters
 		case ',':
 		case ';':
 		case ':':
 		case '_':
+		case '@':
+		case '(':
+		case ')':
+		case '<':
+		case '>':
+		case '[':
+		case ']':
 		{
 			if (rfc2047)
 			{

libvmime07-0.7.1-remove-bcc.patch:
 transport.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-remove-bcc.patch ---
Patch by Zarafa <http://www.zarafa.com/> - Bcc headers should not be send to the SMTP server. Some SMTP
servers automatically strip this header (Postfix, qmail), and others have an option for this (Exim).

--- libvmime-0.7.1/src/messaging/transport.cpp				2005-04-27 18:42:58.000000000 +0200
+++ libvmime-0.7.1/src/messaging/transport.cpp.remove-bcc		2006-10-10 14:01:43.602621328 +0200
@@ -90,6 +90,14 @@
 	}
 	catch (exceptions::no_such_field&) { }
 
+	// Remove BCC headers from the message we're about to send
+	try {
+		headerField* bcc = msg->getHeader()->findField(fields::BCC);
+
+		msg->getHeader()->removeField(bcc);
+	}
+	catch (exceptions::no_such_field&) { }
+
 	// Generate the message, "stream" it and delegate the sending
 	// to the generic send() function.
 	std::ostringstream oss;

libvmime07-0.7.1-socket-backport-and-timeout-fix.patch:
 src/platforms/posix/posixSocket.cpp   |  102 +++++++++++++++++++++++++++-------
 vmime/platforms/posix/posixSocket.hpp |    3 +
 2 files changed, 85 insertions(+), 20 deletions(-)

--- NEW FILE libvmime07-0.7.1-socket-backport-and-timeout-fix.patch ---
Patch by Zarafa <http://www.zarafa.com/> - small partial backport of some socket handling code from 0.8.1.
Only receiving data is handled better. The patch also adds a timeout, when receiving data from a socket
hasn't worked for 5 minutes. This isn't present in 0.8.1.

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-timeout	2007-10-18 11:02:54.000000000 +0200
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "vmime/exception.hpp"
 
@@ -43,7 +44,7 @@
 //
 
 posixSocket::posixSocket()
-	: m_desc(-1)
+	: m_desc(-1), m_timeouts(0)
 {
 }
 
@@ -101,6 +102,8 @@
 		// Error
 		throw vmime::exceptions::connection_error("Error while connecting socket.");
 	}
+
+	m_timeouts = 0;
 }
 
 
@@ -121,38 +124,62 @@
 	}
 }
 
-
 void posixSocket::receive(vmime::string& buffer)
 {
-	::ssize_t ret = ::recv(m_desc, m_buffer, sizeof(m_buffer), 0);
-
-	if (ret == -1)
-	{
-		// Error or no data
-		return;
-	}
-	else if (ret > 0)
-	{
-		buffer = vmime::string(m_buffer, ret);
-	}
+	const int size = receiveRaw(m_buffer, sizeof(m_buffer));
+	buffer = vmime::string(m_buffer, size);
 }
 
 
 const int posixSocket::receiveRaw(char* buffer, const int count)
 {
-	::ssize_t ret = ::recv(m_desc, buffer, count, 0);
+	fd_set fds;
+	struct timeval tv;
+	int ret;
+
+	FD_ZERO(&fds);
+	FD_SET(m_desc, &fds);
+
+	tv.tv_sec = 10;
+	tv.tv_usec = 0;
+
+	ret = ::select(m_desc+1, &fds, NULL, NULL, &tv);
+	if (ret < 0)
+	{
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
+	}
 
-	if (ret == -1)
+	ret = ::recv(m_desc, buffer, count, 0);
+
+	if (ret < 0)
 	{
-		// Error or no data
-		return (0);
+		if (errno != EAGAIN)
+			throwSocketError(errno);
+
+		m_timeouts++;
+		if (m_timeouts > (5*60))
+			throwSocketError(errno); // SMTP server did not react within 5 minutes
+
+		// No data available at this time
+		return 0;
 	}
-	else
+	else if (ret == 0)
 	{
-		return (ret);
+		// Host shutdown
+		throwSocketError(ENOTCONN);
 	}
-}
 
+	m_timeouts = 0;
+	return ret;
+}
 
 void posixSocket::send(const vmime::string& buffer)
 {
@@ -166,6 +193,41 @@
 }
 
 
+void posixSocket::throwSocketError(const int err)
+{
+	string msg;
+
+	switch (err)
+	{
+	case EACCES:          msg = "EACCES: permission denied"; break;
+	case EAFNOSUPPORT:    msg = "EAFNOSUPPORT: address family not supported"; break;
+	case EMFILE:          msg = "EMFILE: process file table overflow"; break;
+	case ENFILE:          msg = "ENFILE: system limit reached"; break;
+	case EPROTONOSUPPORT: msg = "EPROTONOSUPPORT: protocol not supported"; break;
+	case EAGAIN:          msg = "EAGAIN: blocking operation"; break;
+	case EBADF:           msg = "EBADF: invalid descriptor"; break;
+	case ECONNRESET:      msg = "ECONNRESET: connection reset by peer"; break;
+	case EFAULT:          msg = "EFAULT: bad user space address"; break;
+	case EINTR:           msg = "EINTR: signal occured before transmission"; break;
+	case EINVAL:          msg = "EINVAL: invalid argument"; break;
+	case EMSGSIZE:        msg = "EMSGSIZE: message cannot be sent atomically"; break;
+	case ENOBUFS:         msg = "ENOBUFS: output queue is full"; break;
+	case ENOMEM:          msg = "ENOMEM: out of memory"; break;
+	case EPIPE:
+	case ENOTCONN:        msg = "ENOTCONN: not connected"; break;
+	case ECONNREFUSED:    msg = "ECONNREFUSED: connection refused"; break;
+	default:
+
+		std::ostringstream oss;
+		oss << ::strerror(err);
+
+		msg = oss.str();
+		break;
+	}
+
+	throw vmime::exceptions::connection_error(msg);
+}
+
 
 
 //
--- libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp		2007-10-18 11:19:47.000000000 +0200
+++ libvmime-0.7.1/vmime/platforms/posix/posixSocket.hpp.socket-timeout	2007-10-18 10:34:46.000000000 +0200
@@ -49,10 +49,13 @@
 	void send(const vmime::string& buffer);
 	void sendRaw(const char* buffer, const int count);
 
+	void throwSocketError(const int err);
+
 private:
 
 	char m_buffer[65536];
 	int m_desc;
+	int m_timeouts;
 };
 
 

libvmime07-0.7.1-socket-tcp-nodelay.patch:
 posixSocket.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE libvmime07-0.7.1-socket-tcp-nodelay.patch ---
Patch by Zarafa <http://www.zarafa.com/> - adds the TCP_NODELAY flag to vmime sockets. This should mak
the SMTP connection faster

--- libvmime-0.7.1/src/platforms/posix/posixSocket.cpp			2005-03-18 22:26:49.000000000 +0100
+++ libvmime-0.7.1/src/platforms/posix/posixSocket.cpp.socket-tcp	2009-03-27 10:51:06.405594549 +0100
@@ -25,6 +25,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -59,6 +60,8 @@
 
 void posixSocket::connect(const vmime::string& address, const vmime::port_t port)
 {
+	int flag = 1;
+
 	// Close current connection, if any
 	if (m_desc != -1)
 	{
@@ -94,6 +97,8 @@
 	if (m_desc == -1)
 		throw vmime::exceptions::connection_error("Error while creating socket.");
 
+	::setsockopt(m_desc, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag));
+
 	// Start connection
 	if (::connect(m_desc, reinterpret_cast <sockaddr*>(&addr), sizeof(addr)) == -1)
 	{

libvmime07-0.7.1-strip-header-endspaces.patch:
 headerField.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE libvmime07-0.7.1-strip-header-endspaces.patch ---
Patch by Zarafa <http://www.zarafa.com/> - this patch makes sure that vmime does not parse trailing spaces
on an header. Otherwise vmime will throw an exception and a fallback delivery will be started.

--- libvmime-0.7.1/src/headerField.cpp					2007-07-31 12:54:21.898679250 +0200
+++ libvmime-0.7.1/src/headerField.cpp.strip-header-endspaces		2007-07-31 12:43:08.408588750 +0200
@@ -189,6 +189,14 @@
 					}
 				}
 
+				// strip spaces from end of header lines, also through continuation headers
+				contentsEnd--;	// original enter
+				while (contentsEnd>contentsStart &&
+					   (buffer[contentsEnd] == ' ' || buffer[contentsEnd] == '\t' ||
+						buffer[contentsEnd] == '\r' || buffer[contentsEnd] == '\n'))
+					contentsEnd--;
+				contentsEnd++;	// new 'enter'
+
 				// Return a new field
 				headerField* field = headerFieldFactory::getInstance()->create(name);
 

libvmime07-0.7.1-threading-remove-static_non-abi-change.patch:
 smartPtr.hpp |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE libvmime07-0.7.1-threading-remove-static_non-abi-change.patch ---
Patch by Zarafa <http://www.zarafa.com/> - workaround a static variable in the smart_ptr class using a
pthread mutex, which fixes multi-threading issues in libvmime.

--- libvmime-0.7.1/vmime/utility/smartPtr.hpp				2005-05-19 19:17:17.000000000 +0200
+++ libvmime-0.7.1/vmime/utility/smartPtr.hpp.threading-remove-static	2009-05-13 15:21:53.276875219 +0200
@@ -20,6 +20,9 @@
 #ifndef VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 #define VMIME_UTILITY_SMARTPTR_HPP_INCLUDED
 
+// non-portable, but at least not an abi change
+#include <pthread.h>
+static pthread_mutex_t mapLock = PTHREAD_MUTEX_INITIALIZER;
 
 namespace vmime {
 namespace utility {
@@ -108,8 +111,10 @@
 		{
 			if (m_data->refCount == 1)
 			{
+				pthread_mutex_lock(&mapLock);
 				typename MapType::iterator it = sm_map.find(m_data->ptr);
 				if (it != sm_map.end()) sm_map.erase(it);
+				pthread_mutex_unlock(&mapLock);
 
 				delete (m_data->ptr);
 				delete (m_data);
@@ -127,6 +132,8 @@
 	{
 		detach();
 
+		pthread_mutex_lock(&mapLock);
+
 		typename MapType::iterator it = sm_map.find(p);
 
 		if (it != sm_map.end())
@@ -141,6 +148,8 @@
 
 			sm_map.insert(typename MapType::value_type(p, m_data));
 		}
+
+		pthread_mutex_unlock(&mapLock);
 	}
 
 	void attach(const smart_ptr <T>& p)

libvmime07-0.7.1-timezone-name.patch:
 dateTime.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvmime07-0.7.1-timezone-name.patch ---
Patch by Zarafa <http://www.zarafa.com/> - fixes dates in headers which use a timezone definition, instead
of a numeric timezone offset.

--- libvmime-0.7.1/src/dateTime.cpp					2005-04-23 11:02:48.000000000 +0200
+++ libvmime-0.7.1/src/dateTime.cpp.timezone-name			2009-01-08 10:51:39.000000000 +0100
@@ -423,7 +423,7 @@
 				zone[zoneLength++] = *p;
 				++p;
 			}
-			while (zoneLength < 3 && p < pend && parserHelpers::isDigit(*p));
+			while (zoneLength < 3 && p < pend);
 
 			switch (zone[0])
 			{
@@ -487,6 +487,8 @@
 
 				break;
 			}
+			case 'g':
+			case 'G':
 			case 'u':
 			case 'U':
 			{

libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch:
 charset.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch ---
Patch by Zarafa <http://www.zarafa.com/> - some mails have a special definition of the utf-7 character
set, named unicode-1-1-utf-7. Since this name is not defined by iconv, we rename it to utf-7. This name
seems to come from RFC 1642 <http://www.faqs.org/rfcs/rfc1642.html>.

--- libvmime-0.7.1/src/charset.cpp					2005-03-18 22:26:46.000000000 +0100
+++ libvmime-0.7.1/src/charset.cpp.unicode-1-1-utf-7-charset		2007-04-23 17:08:46.714435000 +0200
@@ -64,6 +64,9 @@
 charset::charset(const string& name)
 	: m_name(name)
 {
+	// if we receive this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
 }
 
 
@@ -72,6 +75,10 @@
 {
 	m_name = string(buffer.begin() + position, buffer.begin() + end);
 
+	// if we parsed this rfc-1642 valid MIME charset, convert it to something usefull for iconv
+	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
+		m_name = "utf-7";
+
 	setParsedBounds(position, end);
 
 	if (newPosition)


--- NEW FILE libvmime07.spec ---
Summary:	A powerful C++ class library for working with MIME/Internet messages
Name:		libvmime07
Version:	0.7.1
Release:	1%{?dist}
License:	GPLv2+
Group:		System Environment/Libraries
URL:		http://www.zarafa.com/wiki/index.php/Libvmime_patches
Source0:	http://developer.zarafa.com/download/libvmime-%{version}.tar.bz2
Patch0:		libvmime07-0.7.1-package.patch
Patch1:		libvmime07-0.7.1-charset-catch.patch
Patch2:		libvmime07-0.7.1-missing-boundary.patch
Patch3:		libvmime07-0.7.1-allow-no-recips-and-senders.patch
Patch4:		libvmime07-0.7.1-bmoted-printable.patch
Patch5:		libvmime07-0.7.1-strip-header-endspaces.patch
Patch6:		libvmime07-0.7.1-attachfnamelen.patch
Patch7:		libvmime07-0.7.1-remove-bcc.patch
Patch8:		libvmime07-0.7.1-mdn-disposition.patch
Patch9:		libvmime07-0.7.1-mdn-final-recipient.patch
Patch10:	libvmime07-0.7.1-broken-locale-error.patch
Patch11:	libvmime07-0.7.1-qp-starts-on-second-line.patch
Patch12:	libvmime07-0.7.1-quoted-printable-specials.patch
Patch13:	libvmime07-0.7.1-header-value-on-next-line.patch
Patch14:	libvmime07-0.7.1-oe-compatibility.patch
Patch15:	libvmime07-0.7.1-unicode-1-1-utf-7-charset.patch
Patch16:	libvmime07-0.7.1-out-of-bounds-copy.patch
Patch17:	libvmime07-0.7.1-default-transfer-encoding.patch
Patch18:	libvmime07-0.7.1-contentid-without-at.patch
Patch19:	libvmime07-0.7.1-socket-backport-and-timeout-fix.patch
Patch20:	libvmime07-0.7.1-double-empty-boundary.patch
Patch21:	libvmime07-0.7.1-quoted-printable-encode-questionmark.patch
Patch22:	libvmime07-0.7.1-charset-output-buffer-full.patch
Patch23:	libvmime07-0.7.1-gcc-4.3-support.patch
Patch24:	libvmime07-0.7.1-timezone-name.patch
Patch25:	libvmime07-0.7.1-socket-tcp-nodelay.patch
Patch26:	libvmime07-0.7.1-threading-remove-static_non-abi-change.patch
Patch27:	libvmime07-0.7.1-gcc-4.4-support.patch
Patch28:	libvmime07-0.7.1-plain-bodycopy.patch
BuildRequires:	sendmail, libtool, autoconf, automake
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
VMime is a powerful C++ class library for parsing, generating or
editing Internet RFC-[2]822 and MIME messages. VMime is designed
to provide a fast and an easy way to manipulate Internet mail
messages.

It also includes support for using messaging protocols (POP3, IMAP,
SMTP and maildir) with a lot of features supported: listing folders,
downloading and adding messages to folders, extracting parts from
message, getting and setting message flags and a lot more.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%package devel
Summary:	Development files for the libvmime library
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig

%description devel
The libvmime package includes header files and libraries necessary
for developing programs which use the libvmime C++ class library.

This package contains an old and deprecated version of libvmime.
You need it only if the software you are using hasn't been updated
to work with the newer version and the newer API.

%prep
%setup -q -n libvmime-%{version}
%patch0 -p1 -b .package
%patch1 -p1 -b .charset-catch
%patch2 -p1 -b .missing-boundary
%patch3 -p1 -b .allow-no-recips-and-senders
%patch4 -p1 -b .bmoted-printable
%patch5 -p1 -b .strip-header-endspaces
%patch6 -p1 -b .attachfnamelen
%patch7 -p1 -b .remove-bcc
%patch8 -p1 -b .mdn-disposition
%patch9 -p1 -b .mdn-final-recipient
%patch10 -p1 -b .broken-locale-error
%patch11 -p1 -b .qp-starts-on-second-line
%patch12 -p1 -b .quoted-printable-specials
%patch13 -p1 -b .header-value-on-next-line
%patch14 -p1 -b .oe-compatibility
%patch15 -p1 -b .unicode-1-1-utf-7-charset
%patch16 -p1 -b .out-of-bounds-copy
%patch17 -p1 -b .default-transfer-encoding
%patch18 -p1 -b .contentid-without-at
%patch19 -p1 -b .socket-backport-and-timeout-fix
%patch20 -p1 -b .double-empty-boundary
%patch21 -p1 -b .quoted-printable-encode-questionmark
%patch22 -p1 -b .charset-output-buffer-full
%patch23 -p1 -b .gcc-4.3-support
%patch24 -p1 -b .timezone-name
%patch25 -p1 -b .socket-tcp-nodelay
%patch26 -p1 -b .threading-remove-static_non-abi-change
%patch27 -p1 -b .gcc-4.4-support
%patch28 -p1 -b .plain-bodycopy

# Needed to apply branding patch
libtoolize --force
autoreconf --force --install

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Complete the libvmime07 renaming at some places
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
mv -f $RPM_BUILD_ROOT%{_includedir}/{vmime,%{name}}/
mv -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vmime{,07}.pc 

# Remove the static library and libtool .la file
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}

# Remove the documentation dir, as %doc will pick it up
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/%{name}.so
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/vmime07.pc

%changelog
* Sat Sep 05 2009 Robert Scheck <robert at fedoraproject.org> 0.7.1-1
- Upgrade to 0.7.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:17:43 -0000	1.1
+++ .cvsignore	16 Sep 2009 21:50:31 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime07/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:17:43 -0000	1.1
+++ sources	16 Sep 2009 21:50:32 -0000	1.2
@@ -0,0 +1 @@
+81f06a771d2de01d5982635838eb5f6a  libvmime-0.7.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 16 22:06:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:06:28 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220629.1B30310F880@bastion2.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora devel) to Approved for quintela

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:06:30 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220631.2133910F896@bastion2.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora devel) to Approved for quintela

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:06:34 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220634.6012A10F89F@bastion2.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora devel) to Approved for quintela

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:06:56 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220656.DF80910F883@bastion2.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 11) to Approved for quintela

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:06:56 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220657.3CAD810F8A8@bastion2.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 11) to Approved for quintela

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:00 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220700.3EB1810F8AF@bastion2.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 11) to Approved for quintela

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:14 +0000
Subject: [pkgdb] qemu: jforbes has requested watchbugzilla
Message-ID: <20090916220714.E8D0210F896@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on qemu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:20 +0000
Subject: [pkgdb] qemu: jforbes has requested commit
Message-ID: <20090916220720.3E67C10F8B3@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on qemu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:22 +0000
Subject: [pkgdb] qemu: jforbes has requested watchcommits
Message-ID: <20090916220722.243AA10F8B9@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on qemu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:36 +0000
Subject: [pkgdb] qemu: jforbes has requested watchbugzilla
Message-ID: <20090916220736.3F43810F883@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on qemu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:37 +0000
Subject: [pkgdb] qemu: jforbes has requested commit
Message-ID: <20090916220738.09FEB10F8C0@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on qemu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:07:38 +0000
Subject: [pkgdb] qemu: jforbes has requested watchcommits
Message-ID: <20090916220738.6EAEF10F8C6@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on qemu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:08:58 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220858.2933310F8A0@bastion2.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:08:58 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220858.600E810F8AB@bastion2.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:08:58 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220858.7384110F8B0@bastion2.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:09:06 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220906.BDF6C10F867@bastion2.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:09:07 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220907.C8D8110F8BC@bastion2.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 16 22:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Sep 2009 22:09:08 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090916220908.800E910F8CE@bastion2.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From spot at fedoraproject.org  Wed Sep 16 22:13:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 16 Sep 2009 22:13:35 +0000 (UTC)
Subject: rpms/AcetoneISO2/devel .cvsignore, 1.8, 1.9 AcetoneISO2.spec, 1.13, 
	1.14 sources, 1.8, 1.9
Message-ID: <20090916221335.9B62911C00CF@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/AcetoneISO2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32144

Modified Files:
	.cvsignore AcetoneISO2.spec sources 
Log Message:
2.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	31 Aug 2009 21:19:26 -0000	1.8
+++ .cvsignore	16 Sep 2009 22:13:35 -0000	1.9
@@ -1 +1 @@
-acetoneiso_2.0.4.tar.gz
+acetoneiso_2.1.1.tar.gz


Index: AcetoneISO2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/AcetoneISO2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- AcetoneISO2.spec	31 Aug 2009 21:19:26 -0000	1.13
+++ AcetoneISO2.spec	16 Sep 2009 22:13:35 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		AcetoneISO2
-Version:	2.0.4
+Version:	2.1.1
 Release:	1%{?dist}
 Summary:	CD/DVD Image Manipulator
 Group:		Applications/Archiving
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT 
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Wed Sep 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.1-1
+- update to 2.1.1
+
 * Mon Aug 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.4-1
 - Update to 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	31 Aug 2009 21:19:26 -0000	1.8
+++ sources	16 Sep 2009 22:13:35 -0000	1.9
@@ -1 +1 @@
-e0036a7a756e4d7e4a1fa8f666c25389  acetoneiso_2.0.4.tar.gz
+72e41e912e514946152fb9bcac1924b7  acetoneiso_2.1.1.tar.gz



From kkofler at fedoraproject.org  Wed Sep 16 22:14:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Sep 2009 22:14:33 +0000 (UTC)
Subject: rpms/libcanberra/devel libcanberra.spec,1.34,1.35
Message-ID: <20090916221433.2732211C00CF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32564/devel

Modified Files:
	libcanberra.spec 
Log Message:
* Wed Sep 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.17-2
- Don't require gdm in -gtk2 (#522998)


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libcanberra.spec	11 Sep 2009 22:23:59 -0000	1.34
+++ libcanberra.spec	16 Sep 2009 22:14:32 -0000	1.35
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -31,7 +31,6 @@ Requires: %{name} = %{version}-%{release
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
-Requires: gdm
 
 %description gtk2
 Gtk+ bindings for libcanberra
@@ -106,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/canberra-gtk-play
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
+# co-own these directories to avoid requiring GDM (#522998)
+%dir %{_datadir}/gdm/
+%dir %{_datadir}/gdm/autostart/
+%dir %{_datadir}/gdm/autostart/LoginWindow/
 %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 %{_sysconfdir}/gconf/schemas/libcanberra.schemas
 
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Sep 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.17-2
+- Don't require gdm in -gtk2 (#522998)
+
 * Fri Sep 12 2009 Lennart Poettering <lpoetter at redhat.com> 0.17-1
 - New version 0.17
 



From markmc at fedoraproject.org  Wed Sep 16 22:20:35 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 16 Sep 2009 22:20:35 +0000 (UTC)
Subject: rpms/qemu/devel qemu-add-ksm-support.patch, 1.3,
	1.4 qemu-fix-msix-error-handling-on-older-kernels.patch, 1.2,
	1.3 qemu-fix-no-kvm-segfault.patch, 1.3, 1.4 qemu.spec, 1.129, 1.130
Message-ID: <20090916222035.D33FE11C0336@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4399

Modified Files:
	qemu-add-ksm-support.patch 
	qemu-fix-msix-error-handling-on-older-kernels.patch 
	qemu-fix-no-kvm-segfault.patch qemu.spec 
Log Message:
* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-4
- Fix for KSM patch from Justin Forbes


qemu-add-ksm-support.patch:
 exec.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: qemu-add-ksm-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-ksm-support.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qemu-add-ksm-support.patch	7 Sep 2009 14:22:19 -0000	1.3
+++ qemu-add-ksm-support.patch	16 Sep 2009 22:20:32 -0000	1.4
@@ -1,4 +1,4 @@
-From 4d64a615f69458c202561fcc01e8e0505fa46ee9 Mon Sep 17 00:00:00 2001
+From ef44e9475ab38ec73b30e83241279170fac06b22 Mon Sep 17 00:00:00 2001
 From: Izik Eidus <ieidus at redhat.com>
 Date: Tue, 28 Jul 2009 19:14:26 +0300
 Subject: [PATCH] kvm userspace: ksm support
@@ -6,17 +6,28 @@ Subject: [PATCH] kvm userspace: ksm supp
 rfc for ksm support to kvm userpsace.
 
 Signed-off-by: Izik Eidus <ieidus at redhat.com>
+signed-off-by: Justin M. Forbes <jforbes at redhat.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
 Fedora-patch: qemu-add-ksm-support.patch
 ---
- exec.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ exec.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/exec.c b/exec.c
-index 0655b4b..b93f7b8 100644
+index 0655b4b..a0e2203 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -2579,6 +2579,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
+@@ -65,6 +65,9 @@
+ #undef DEBUG_TB_CHECK
+ #endif
+ 
++/* Quick hack to enable KSM support */
++#define MADV_MERGEABLE 12 /* KSM may merge identical pages */
++
+ #define SMC_BITMAP_USE_THRESHOLD 10
+ 
+ #if defined(TARGET_SPARC64)
+@@ -2579,6 +2582,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
      new_block->host = file_ram_alloc(size, mem_path);
      if (!new_block->host) {
          new_block->host = qemu_vmalloc(size);

qemu-fix-msix-error-handling-on-older-kernels.patch:
 msix.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: qemu-fix-msix-error-handling-on-older-kernels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-msix-error-handling-on-older-kernels.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-fix-msix-error-handling-on-older-kernels.patch	7 Sep 2009 14:22:20 -0000	1.2
+++ qemu-fix-msix-error-handling-on-older-kernels.patch	16 Sep 2009 22:20:32 -0000	1.3
@@ -1,4 +1,4 @@
-From 0b341eda83cd2f01134d5b13300d97c07a3abced Mon Sep 17 00:00:00 2001
+From 80380f566e2c1d4c9e02e0c0dff405ecc86d134e Mon Sep 17 00:00:00 2001
 From: Michael S. Tsirkin <mst at redhat.com>
 Date: Thu, 23 Jul 2009 16:34:13 +0300
 Subject: [PATCH] Fix error handling in msix vector add

qemu-fix-no-kvm-segfault.patch:
 vl.c |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Index: qemu-fix-no-kvm-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-no-kvm-segfault.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qemu-fix-no-kvm-segfault.patch	7 Sep 2009 14:22:20 -0000	1.3
+++ qemu-fix-no-kvm-segfault.patch	16 Sep 2009 22:20:32 -0000	1.4
@@ -1,4 +1,4 @@
-From 00782050707fbb999bfffe722794490d2211a0a9 Mon Sep 17 00:00:00 2001
+From 70415c7d31bf6420d1a2d685fe14661ce1cfd9cb Mon Sep 17 00:00:00 2001
 From: Dustin Kirkland <kirkland at canonical.com>
 Date: Fri, 4 Sep 2009 14:38:30 -0500
 Subject: [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- qemu.spec	16 Sep 2009 20:18:42 -0000	1.129
+++ qemu.spec	16 Sep 2009 22:20:32 -0000	1.130
@@ -3,7 +3,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -526,6 +526,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-4
+- Fix for KSM patch from Justin Forbes
+
 * Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-3
 - Add ksmtuned, also from Dan Kenigsberg
 - Use %_initddir macro



From mauelsha at fedoraproject.org  Wed Sep 16 22:21:33 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:21:33 +0000 (UTC)
Subject: rpms/dmraid/F-11 sources,1.24,1.25
Message-ID: <20090916222133.8D9C311C00EC@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5616

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	16 Sep 2009 10:39:00 -0000	1.24
+++ sources	16 Sep 2009 22:21:31 -0000	1.25
@@ -1,2 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-94994759eba7221579b17222bdaf34e7  dmraid-1.0.0.rc16.tar.bz2
+00e0cf53ae10df3a1b8b6724cac84db2  dmraid-1.0.0.rc16.tar.bz2



From mauelsha at fedoraproject.org  Wed Sep 16 22:23:22 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:23:22 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.104,1.105
Message-ID: <20090916222322.C4E2211C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7659

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- dmraid.spec	16 Sep 2009 16:53:11 -0000	1.104
+++ dmraid.spec	16 Sep 2009 22:23:22 -0000	1.105
@@ -20,8 +20,6 @@ Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
-Patch0:	Makefile.in.avoid_dmreg.o_build.patch
-
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@@ -59,7 +57,6 @@ Device failure reporting has to be activ
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led



From mauelsha at fedoraproject.org  Wed Sep 16 22:30:01 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:30:01 +0000 (UTC)
Subject: rpms/dmraid/devel sources,1.24,1.25
Message-ID: <20090916223001.F343511C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11353

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	16 Sep 2009 17:21:10 -0000	1.24
+++ sources	16 Sep 2009 22:29:58 -0000	1.25
@@ -1,2 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-94994759eba7221579b17222bdaf34e7  dmraid-1.0.0.rc16.tar.bz2
+00e0cf53ae10df3a1b8b6724cac84db2  dmraid-1.0.0.rc16.tar.bz2



From mauelsha at fedoraproject.org  Wed Sep 16 22:30:41 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:30:41 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.96,1.97
Message-ID: <20090916223041.C1BCB11C00EC@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12011

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- dmraid.spec	16 Sep 2009 17:21:10 -0000	1.96
+++ dmraid.spec	16 Sep 2009 22:30:41 -0000	1.97
@@ -20,8 +20,6 @@ Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
-Patch0:	Makefile.in.avoid_dmreg.o_build.patch
-
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@@ -59,7 +57,6 @@ Device failure reporting has to be activ
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led



From timfenn at fedoraproject.org  Wed Sep 16 22:42:00 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Wed, 16 Sep 2009 22:42:00 +0000 (UTC)
Subject: rpms/gpp4/devel gpp4-gfortran.patch, NONE, 1.1 gpp4-ppc.patch, NONE,
	1.1 gpp4.spec, 1.9, 1.10
Message-ID: <20090916224200.6011211C0338@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/gpp4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17924

Modified Files:
	gpp4.spec 
Added Files:
	gpp4-gfortran.patch gpp4-ppc.patch 
Log Message:
* Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-2.20090916bzr58
- add patch for mixed fortran/c library
- add gfortran to buildrequires
- updated PPC patches



gpp4-gfortran.patch:
 configure.ac      |    1 +
 src_f/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gpp4-gfortran.patch ---
--- configure.ac_orig	2009-09-16 13:36:47.717928637 -0700
+++ configure.ac	2009-09-16 14:49:20.850157550 -0700
@@ -16,6 +16,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+AC_F77_LIBRARY_LDFLAGS
 
 # check for libm
 AC_CHECK_LIBM
--- src_f/Makefile.am_orig	2009-09-16 13:36:08.036157950 -0700
+++ src_f/Makefile.am	2009-09-16 13:36:40.134908087 -0700
@@ -16,7 +16,7 @@
 
 CLEANFILES = unix.f
 
-libgpp4f_la_LIBADD = $(top_builddir)/src/libgpp4.la @MMDB_LIBS@
+libgpp4f_la_LIBADD = $(top_builddir)/src/libgpp4.la @MMDB_LIBS@ $(FLIBS)
 libgpp4f_la_CFLAGS = $(AM_CFLAGS) @MMDB_CFLAGS@
 
 # IMPORTANT!

gpp4-ppc.patch:
 library_f.c |   31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

--- NEW FILE gpp4-ppc.patch ---
--- src_f/library_f.c_orig	2009-09-16 15:07:40.731159438 -0700
+++ src_f/library_f.c	2009-09-16 15:10:54.746202079 -0700
@@ -686,28 +686,12 @@
   return isatty(*iunit);
 }
 
-#endif /* end of linuxppc xlf support */
-
-
-#if defined (sun)
-int isatty_(int *iunit)
-{
-  return isatty(*iunit);
-}
-#endif
-
-/* neither gfortran or g95 have isatty */
-/* not true, since August 05 this has been added to gfortran */
-// It's not in gfortran 4.4.3
-
 /* G95 support */
-#if defined(G95) || defined (GFORTRAN)
+#elif defined(G95) || defined (GFORTRAN)
 int isatty_(int *iunit)
 {
   return isatty(*iunit);
 }
-#endif
-#if defined(G95) || defined (GFORTRAN)
 
 /* FORTRAN gerror intrinsic */
 int gerror_(str, Lstr)
@@ -725,7 +709,20 @@
   }
   return 0;
 }
+#endif
+
+#if defined (sun)
+int isatty_(int *iunit)
+{
+  return isatty(*iunit);
+}
+#endif
 
+/* neither gfortran or g95 have isatty */
+/* not true, since August 05 this has been added to gfortran */
+// It's not in gfortran 4.4.3
+
+#if defined(G95) || defined (GFORTRAN)
 /* FORTRAN IErrNo intrinsic */
 int ierrno_() {
   return errno;


Index: gpp4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpp4/devel/gpp4.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gpp4.spec	16 Sep 2009 20:11:56 -0000	1.9
+++ gpp4.spec	16 Sep 2009 22:41:52 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: Library providing specific CCP4 functionality 
 Name: gpp4
 Version: 1.2.0
-Release: 1.20090916bzr58%{?dist}
+Release: 2.20090916bzr58%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://dmz-212.daimi.au.dk/~mok/%{name}
@@ -12,12 +12,15 @@ URL: http://dmz-212.daimi.au.dk/~mok/%{n
 #  bzr branch -r 58 lp:gpp4 gpp4-1.2.0
 #  tar cvzf gpp4-1.2.0-20090916bzr58.tar.gz gpp4-1.2.0
 Source0: gpp4-1.2.0-20090916bzr58.tar.gz
+Patch0: gpp4-gfortran.patch
+Patch1: gpp4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: doxygen
 BuildRequires: mmdb-devel
+BuildRequires: gcc-gfortran
 
 %description
 
@@ -67,6 +70,8 @@ development.
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 aclocal
 libtoolize --automake --copy
 autoconf
@@ -110,6 +115,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}f.pc
 
 %changelog
+* Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-2.20090916bzr58
+- add patch for mixed fortran/c library
+- add gfortran to buildrequires
+- updated PPC patches
+
 * Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-1.20090916bzr58
 - update to 1.2.0
 - update to new website



From mauelsha at fedoraproject.org  Wed Sep 16 22:52:42 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:52:42 +0000 (UTC)
Subject: rpms/dmraid/devel sources,1.25,1.26
Message-ID: <20090916225242.D29E211C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23264

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	16 Sep 2009 22:29:58 -0000	1.25
+++ sources	16 Sep 2009 22:52:42 -0000	1.26
@@ -1,2 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-00e0cf53ae10df3a1b8b6724cac84db2  dmraid-1.0.0.rc16.tar.bz2
+32832c1dfd7e72cd4355490322fca68a  dmraid-1.0.0.rc16.tar.bz2



From mauelsha at fedoraproject.org  Wed Sep 16 22:54:04 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:54:04 +0000 (UTC)
Subject: rpms/dmraid/F-11 sources,1.25,1.26
Message-ID: <20090916225404.A873311C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23976

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	16 Sep 2009 22:21:31 -0000	1.25
+++ sources	16 Sep 2009 22:54:04 -0000	1.26
@@ -1,2 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-00e0cf53ae10df3a1b8b6724cac84db2  dmraid-1.0.0.rc16.tar.bz2
+32832c1dfd7e72cd4355490322fca68a  dmraid-1.0.0.rc16.tar.bz2



From wtogami at fedoraproject.org  Wed Sep 16 22:57:06 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 16 Sep 2009 22:57:06 +0000 (UTC)
Subject: rpms/perl-NetAddr-IP/devel .cvsignore, 1.3, 1.4 perl-NetAddr-IP.spec,
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090916225706.E32F111C00CF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-NetAddr-IP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25396

Modified Files:
	.cvsignore perl-NetAddr-IP.spec sources 
Log Message:
4.027



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Feb 2008 15:38:38 -0000	1.3
+++ .cvsignore	16 Sep 2009 22:57:05 -0000	1.4
@@ -1 +1 @@
-NetAddr-IP-4.007.tar.gz
+NetAddr-IP-4.027.tar.gz


Index: perl-NetAddr-IP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/devel/perl-NetAddr-IP.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-NetAddr-IP.spec	26 Jul 2009 13:48:53 -0000	1.8
+++ perl-NetAddr-IP.spec	16 Sep 2009 22:57:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-NetAddr-IP
-Version:        4.007
-Release:        5%{?dist}
+Version:        4.027
+Release:        1%{?dist}
 Summary:        Manages IPv4 and IPv6 addresses and subnets
 # Upstream explicitly gave permission for us to distribute under Artistic 2.0
 # Will be reflected in next release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Feb 2008 15:38:38 -0000	1.3
+++ sources	16 Sep 2009 22:57:05 -0000	1.4
@@ -1 +1 @@
-21825dc072e688f733e03da24e4d058b  NetAddr-IP-4.007.tar.gz
+c4a21a76e5b1b9f4c8e9810b78559d7b  NetAddr-IP-4.027.tar.gz



From mauelsha at fedoraproject.org  Wed Sep 16 22:58:20 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:58:20 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.105,1.106
Message-ID: <20090916225820.267A911C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27104

Modified Files:
	dmraid.spec 
Log Message:
Requirement adjusted in preparation for device-mapper-event package


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- dmraid.spec	16 Sep 2009 22:23:22 -0000	1.105
+++ dmraid.spec	16 Sep 2009 22:58:19 -0000	1.106
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel, lvm2
+BuildRequires: device-mapper-devel, device-mapper-devel, libselinux-devel, libsepol-devel, lvm2
 Requires: device-mapper >= 1.02.02-2
 Requires: dmraid-events kpartx
 Requires: dmraid-events kpartx



From lutter at fedoraproject.org  Wed Sep 16 22:58:52 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Sep 2009 22:58:52 +0000 (UTC)
Subject: rpms/netcf/F-10 .cvsignore, 1.2, 1.3 netcf.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090916225852.0C9DC11C00CF@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287/F-10

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jul 2009 04:01:51 -0000	1.2
+++ .cvsignore	16 Sep 2009 22:58:51 -0000	1.3
@@ -1 +1 @@
-netcf-0.1.0.tar.gz
+netcf-0.1.1.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/netcf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netcf.spec	23 Jul 2009 04:01:51 -0000	1.1
+++ netcf.spec	16 Sep 2009 22:58:51 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
+- New Version
+
 * Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.1.0-1
 - BR on augeas-0.5.2
 - Drop explicit requires for augeas-libs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 04:01:51 -0000	1.2
+++ sources	16 Sep 2009 22:58:51 -0000	1.3
@@ -1 +1 @@
-6172c399b47a5311ff8d70fd2efd1823  netcf-0.1.0.tar.gz
+01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz



From lutter at fedoraproject.org  Wed Sep 16 22:58:51 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Sep 2009 22:58:51 +0000 (UTC)
Subject: rpms/netcf/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090916225851.9663D11C00CF@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
Version 0.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:32:04 -0000	1.1
+++ .cvsignore	16 Sep 2009 22:58:51 -0000	1.2
@@ -0,0 +1 @@
+netcf-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Apr 2009 21:32:04 -0000	1.1
+++ sources	16 Sep 2009 22:58:51 -0000	1.2
@@ -0,0 +1 @@
+01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz



From lutter at fedoraproject.org  Wed Sep 16 22:58:52 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Sep 2009 22:58:52 +0000 (UTC)
Subject: rpms/netcf/devel .cvsignore, 1.2, 1.3 netcf.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <20090916225852.9D8EE11C00CF@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287/devel

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 04:17:03 -0000	1.2
+++ .cvsignore	16 Sep 2009 22:58:52 -0000	1.3
@@ -1 +1 @@
-netcf-0.1.0.tar.gz
+netcf-0.1.1.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/netcf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netcf.spec	15 Sep 2009 09:47:42 -0000	1.3
+++ netcf.spec	16 Sep 2009 22:58:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           netcf
-Version:        0.1.0
-Release:        3%{?dist}%{?extra_release}
+Version:        0.1.1
+Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
 Group:          System Environment/Libraries
@@ -13,8 +13,6 @@ BuildRequires:  readline-devel augeas-de
 BuildRequires:  libxml2-devel libxslt-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
-Patch01: netcf-0.1.0-fix-initialization-of-libxslt.patch
-
 %description
 A library for modifying the network configuration of a system. Network
 configurations are expresed in a platform-independent XML format, which
@@ -41,8 +39,6 @@ The libraries for %{name}.
 %prep
 %setup -q
 
-%patch01 -p1
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -77,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
+- Remove patch netcf-0.1.0-fix-initialization-of-libxslt.patch,
+  included upstream
+
 * Tue Sep 15 2009 Mark McLoughlin <markmc at redhat.com> - 0.1.0-3
 - Fix libvirtd segfault caused by libxslt init issue (#523382)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 04:17:03 -0000	1.2
+++ sources	16 Sep 2009 22:58:52 -0000	1.3
@@ -1 +1 @@
-6172c399b47a5311ff8d70fd2efd1823  netcf-0.1.0.tar.gz
+01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz



From lutter at fedoraproject.org  Wed Sep 16 22:58:52 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Sep 2009 22:58:52 +0000 (UTC)
Subject: rpms/netcf/F-11 .cvsignore, 1.2, 1.3 netcf.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090916225852.581D311C00CF@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287/F-11

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Jul 2009 15:59:07 -0000	1.2
+++ .cvsignore	16 Sep 2009 22:58:52 -0000	1.3
@@ -1 +1 @@
-netcf-0.1.0.tar.gz
+netcf-0.1.1.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/netcf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netcf.spec	22 Jul 2009 15:59:08 -0000	1.1
+++ netcf.spec	16 Sep 2009 22:58:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
+- New Version
+
 * Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.1.0-1
 - BR on augeas-0.5.2
 - Drop explicit requires for augeas-libs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Jul 2009 15:59:08 -0000	1.2
+++ sources	16 Sep 2009 22:58:52 -0000	1.3
@@ -1 +1 @@
-6172c399b47a5311ff8d70fd2efd1823  netcf-0.1.0.tar.gz
+01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz



From agk at fedoraproject.org  Wed Sep 16 22:59:05 2009
From: agk at fedoraproject.org (agk)
Date: Wed, 16 Sep 2009 22:59:05 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.174,1.175
Message-ID: <20090916225905.639C411C00CF@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27362

Modified Files:
	lvm2.spec 
Log Message:
fix -event version



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- lvm2.spec	16 Sep 2009 21:47:21 -0000	1.174
+++ lvm2.spec	16 Sep 2009 22:59:05 -0000	1.175
@@ -327,8 +327,10 @@ This package contains the device-mapper 
 %package -n device-mapper-event
 Summary: Device-mapper event daemon
 Group: System Environment/Base
-Requires: device-mapper = %{version}-%{release}
-Requires: device-mapper-event-libs = %{version}-%{release}
+Version: %{device_mapper_version}
+Release: %{release}
+Requires: device-mapper = %{device_mapper_version}-%{release}
+Requires: device-mapper-event-libs = %{device_mapper_version}-%{release}
 
 %description -n device-mapper-event
 This package contains the dmeventd daemon for monitoring the state



From mauelsha at fedoraproject.org  Wed Sep 16 22:59:12 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Wed, 16 Sep 2009 22:59:12 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.97,1.98
Message-ID: <20090916225912.F2E5311C00CF@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27547

Modified Files:
	dmraid.spec 
Log Message:
Requirement adjusted in preparation for device-mapper-event package


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- dmraid.spec	16 Sep 2009 22:30:41 -0000	1.97
+++ dmraid.spec	16 Sep 2009 22:59:12 -0000	1.98
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel, lvm2
+BuildRequires: device-mapper-devel, device-mapper-event, libselinux-devel, libsepol-devel
 Requires: device-mapper >= 1.02.02-2
 Requires: dmraid-events kpartx
 Requires: dmraid-events kpartx



From lutter at fedoraproject.org  Wed Sep 16 22:59:16 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Sep 2009 22:59:16 +0000 (UTC)
Subject: rpms/netcf/EL-5 netcf.spec,NONE,1.1
Message-ID: <20090916225916.93E8B11C00CF@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27581

Added Files:
	netcf.spec 
Log Message:
Version 0.1.1


--- NEW FILE netcf.spec ---
Name:           netcf
Version:        0.1.1
Release:        1%{?dist}%{?extra_release}
Summary:        Cross-platform network configuration library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            https://fedorahosted.org/netcf/
Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  readline-devel augeas-devel >= 0.5.2
BuildRequires:  libxml2-devel libxslt-devel
Requires:       %{name}-libs = %{version}-%{release}

%description
A library for modifying the network configuration of a system. Network
configurations are expresed in a platform-independent XML format, which
netcf translates into changes to the system's 'native' network
configuration files.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package        libs
Summary:        Libraries for %{name}
Group:          System Environment/Libraries

%description    libs
The libraries for %{name}.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/ncftool

%files libs
%defattr(-,root,root,-)
%{_datadir}/netcf
%{_libdir}/*.so.*
%doc AUTHORS COPYING NEWS

%files devel
%defattr(-,root,root,-)
%doc
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/netcf.pc

%changelog
* Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
- New Version

* Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.1.0-1
- BR on augeas-0.5.2
- Drop explicit requires for augeas-libs

* Wed Apr 15 2009 David Lutterkort <lutter at redhat.com> - 0.0.2-1
- Updates acording to Fedora review

* Fri Feb 27 2009 David Lutterkort <lutter at redhat.com> - 0.0.1-1
- Initial specfile



From timfenn at fedoraproject.org  Wed Sep 16 22:59:59 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Wed, 16 Sep 2009 22:59:59 +0000 (UTC)
Subject: rpms/gpp4/devel gpp4-ccp4_sysdep.h.patch,1.2,NONE
Message-ID: <20090916225959.1DAA311C00CF@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/gpp4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28037

Removed Files:
	gpp4-ccp4_sysdep.h.patch 
Log Message:
- remove ccp4_sysdep patch




--- gpp4-ccp4_sysdep.h.patch DELETED ---



From cebbert at fedoraproject.org  Wed Sep 16 23:25:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 16 Sep 2009 23:25:23 +0000 (UTC)
Subject: rpms/kernel/F-12/scripts sort-config,1.4,1.5
Message-ID: <20090916232523.F3FE611C00CF@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8567

Modified Files:
	sort-config 
Log Message:
hack an option to find impossible config vars


Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/scripts/sort-config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sort-config	19 Aug 2009 12:24:33 -0000	1.4
+++ sort-config	16 Sep 2009 23:25:11 -0000	1.5
@@ -8,32 +8,30 @@ TGT1=(${TGT[*]#kernel-*/linux-*.noarch/c
 if [ $# -lt 2 ] ; then
    echo -e "Usage:\n   $(basename $0) [-dfcn] input target\n"
    echo -e " Sort input config file into the same order as the target\n"
+   echo -e "      -c: insert comments about non-matching items"
    echo -e "      -d: show raw unsorted output with extra debug text"
    echo -e "      -f: force output to match what is in the target config"
-   echo -e "      -c: insert comments about non-matching items"
+   echo -e "      -i: find impossible config items"
    echo -e "      -n: do not sort output\n"
    echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
    echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
    exit 1
 fi
 
-while getopts "dfcn" OPTION ; do
+while getopts "cdfin" OPTION ; do
 case $OPTION in
+c)
+   ADDCOMMENT=1 ;;
 d)
-   DEBUG=1
-;;
+   DEBUG=1 ;;
 f)
-   FORCE=1
-;;
-c)
-   ADDCOMMENT=1
-;;
+   FORCE=1 ;;
+i)
+   FIND_IMPOSS=1 ;;
 n)
-   NOSORT=1
-;;
+   NOSORT=1 ;;
 \?)
-   exit 2
-;;
+   exit 2 ;;
 esac
 done
 
@@ -44,12 +42,12 @@ fi
 
 shift $((OPTIND-1))
 
-if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
+if [ -f xx00 -o -f xx01 -o -f xx99 -o -f xx98 ] ; then
    echo "WARNING! Output files named xx?? already exist." >&2
    read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
    echo >&2
 fi
-rm -f xx00 xx01 xx99
+rm -f xx00 xx01 xx99 xx98
 
 SRCFILE=config-$1
 [ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2
@@ -57,6 +55,12 @@ SRCFILE=config-$1
 TGTFILE=kernel-*/linux-*.noarch/configs/kernel-2.6.*-$2.config
 [ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2
 
+[ "$FIND_IMPOSS" ] && \
+   find kernel-*/*.noarch -name Kconfig\* -type f \
+   | xargs grep -s -h '^config ' \
+   | sed 's/^config /CONFIG_/' \
+   | sort | uniq >xx98
+
 IX=0
 IN=0
 declare -a SAVECOMMENT
@@ -104,6 +108,10 @@ cat ${SRCFILE} | while read TEXT ; do
                   fi
                fi
             done
+            if [ -z "$LINE" -a -z "$COMMENT" -a "$FIND_IMPOSS" ] ; then
+               IMPOSS=$(grep -n "$OPTNAME" xx98)
+               [ -z "$IMPOSS" ] && COMMENT="# -- Next option is impossible --"
+            fi
          fi
 
       fi
@@ -165,4 +173,4 @@ else
 
 fi
 
-rm -f xx00 xx01 xx99
+rm -f xx00 xx01 xx99 xx98



From agk at fedoraproject.org  Wed Sep 16 23:39:25 2009
From: agk at fedoraproject.org (agk)
Date: Wed, 16 Sep 2009 23:39:25 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.175,1.176
Message-ID: <20090916233925.0A36711C00CF@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16923

Modified Files:
	lvm2.spec 
Log Message:
Update monitoring script



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- lvm2.spec	16 Sep 2009 22:59:05 -0000	1.175
+++ lvm2.spec	16 Sep 2009 23:39:24 -0000	1.176
@@ -16,6 +16,7 @@ Source0: ftp://sources.redhat.com/pub/lv
 
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
+Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -44,6 +45,7 @@ or more physical volumes and creating on
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
+%patch1 -p1 -b .lvm2_monitoring
 
 %build
 %define _exec_prefix /
@@ -65,7 +67,7 @@ install -m 0600 /dev/null $RPM_BUILD_ROO
 
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
-install -m 0755 scripts/lvm2_monitoring_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor
+install -m 0755 scripts/lvm2_monitoring_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
 %clean



From agk at fedoraproject.org  Wed Sep 16 23:41:42 2009
From: agk at fedoraproject.org (agk)
Date: Wed, 16 Sep 2009 23:41:42 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2-2_02_53-lvm2_monitoring_init.patch,NONE,1.1
Message-ID: <20090916234142.3877E11C00CF@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17596

Added Files:
	lvm2-2_02_53-lvm2_monitoring_init.patch 
Log Message:
add monitoring patch from upstream


lvm2-2_02_53-lvm2_monitoring_init.patch:
 WHATS_NEW                               |    4 +
 configure                               |    3 
 configure.in                            |    1 
 scripts/Makefile.in                     |    2 
 scripts/lvm2_monitoring_init_red_hat.in |  119 ++++++++++++++++++++++++++++++++
 5 files changed, 127 insertions(+), 2 deletions(-)

--- NEW FILE lvm2-2_02_53-lvm2_monitoring_init.patch ---
diff -rNup LVM2.2.02.52/configure LVM2.2.02.52-new/configure
--- LVM2.2.02.52/configure	2009-09-14 23:57:46.000000000 +0100
+++ LVM2.2.02.52-new/configure	2009-09-17 00:34:32.915966000 +0100
@@ -15404,7 +15404,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]'
 
 
 ################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16029,6 +16029,7 @@ do
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
     "scripts/clvmd_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/clvmd_init_red_hat" ;;
+    "scripts/lvm2_monitoring_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_init_red_hat" ;;
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;;
diff -rNup LVM2.2.02.52/configure.in LVM2.2.02.52-new/configure.in
--- LVM2.2.02.52/configure.in	2009-09-14 23:57:46.000000000 +0100
+++ LVM2.2.02.52-new/configure.in	2009-09-17 00:34:32.928965000 +0100
@@ -1159,6 +1159,7 @@ liblvm/liblvm2app.pc
 man/Makefile
 po/Makefile
 scripts/clvmd_init_red_hat
+scripts/lvm2_monitoring_init_red_hat
 scripts/Makefile
 test/Makefile
 test/api/Makefile
diff -rNup LVM2.2.02.52/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.52-new/scripts/lvm2_monitoring_init_red_hat.in
--- LVM2.2.02.52/scripts/lvm2_monitoring_init_red_hat.in	1970-01-01 01:00:00.000000000 +0100
+++ LVM2.2.02.52-new/scripts/lvm2_monitoring_init_red_hat.in	2009-09-17 00:34:32.933965000 +0100
@@ -0,0 +1,119 @@
+#!/bin/bash
+#
+# Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# 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
+#
+# This file is part of LVM2.
+# It is required for the proper handling of failures of LVM2 mirror
+# devices that were created using the -m option of lvcreate.
+#
+#
+# chkconfig: 12345 02 99
+# description: Starts and stops dmeventd monitoring for lvm2
+#
+# For Red-Hat-based distributions such as Fedora, RHEL, CentOS.
+#	       
+### BEGIN INIT INFO
+# Provides: lvm2-monitor
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 1 2 3 4 5
+# Default-Stop: 0 6
+# Short-Description: Monitoring of LVM2 mirrors, snapshots etc. using dmeventd
+### END INIT INFO
+
+. /etc/init.d/functions
+
+DAEMON=lvm2_monitor
+
+exec_prefix=@exec_prefix@
+sbindir=@sbindir@
+
+VGCHANGE=${sbindir}/vgchange
+VGS=${sbindir}/vgs
+
+LOCK_FILE="/var/lock/subsys/$DAEMON"
+
+WARN=1
+
+start()
+{
+	ret=0
+	# TODO do we want to separate out already active groups only?
+	VGSLIST=`$VGS --noheadings -o name 2> /dev/null`
+	for vg in $VGSLIST
+	do
+	    action "Starting monitoring for VG $vg:" $VGCHANGE --monitor y $vg || ret=$?
+	done
+
+	return $ret
+}
+
+
+stop()
+{
+	ret=0
+	# TODO do we want to separate out already active groups only?
+	if test "$WARN" = "1"; then
+	   echo "Not stopping monitoring, this is a dangerous operation. Please use force-stop to override."
+	   return 1
+	fi
+	VGSLIST=`$VGS --noheadings -o name 2> /dev/null`
+	for vg in $VGSLIST
+	do
+	    action "Stopping monitoring for VG $vg:" $VGCHANGE --monitor n $vg || ret=$?
+	done
+	return $ret
+}
+
+rtrn=1
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	rtrn=$?
+	[ $rtrn = 0 ] && touch $LOCK_FILE
+	;;
+
+  force-stop)
+	WARN=0
+	stop
+	rtrn=$?
+	[ $rtrn = 0 ] && rm -f $LOCK_FILE
+	;;
+
+  stop)
+	test "$runlevel" = "0" && WARN=0
+	test "$runlevel" = "6" && WARN=0
+	stop
+	rtrn=$?
+	[ $rtrn = 0 ] && rm -f $LOCK_FILE
+	;;
+
+  restart)
+	WARN=0
+	if stop
+	then
+		start
+	fi 
+	rtrn=$?
+	;;
+
+  status)
+	# TODO anyone with an idea how to dump monitored volumes?
+	;;
+
+  *)
+	echo $"Usage: $0 {start|stop|restart|status|force-stop}"
+	;;
+esac
+
+exit $rtrn
diff -rNup LVM2.2.02.52/scripts/Makefile.in LVM2.2.02.52-new/scripts/Makefile.in
--- LVM2.2.02.52/scripts/Makefile.in	2009-05-14 17:46:13.000000000 +0100
+++ LVM2.2.02.52-new/scripts/Makefile.in	2009-09-17 00:34:32.937965000 +0100
@@ -29,4 +29,4 @@ endif
 
 install_lvm2: install
 
-DISTCLEAN_TARGETS += clvmd_init_red_hat
+DISTCLEAN_TARGETS += clvmd_init_red_hat lvm2_monitoring_init_red_hat
diff -rNup LVM2.2.02.52/WHATS_NEW LVM2.2.02.52-new/WHATS_NEW
--- LVM2.2.02.52/WHATS_NEW	2009-09-15 14:49:10.000000000 +0100
+++ LVM2.2.02.52-new/WHATS_NEW	2009-09-17 00:39:02.216229000 +0100
@@ -1,3 +1,7 @@
+Version 2.02.53 -
+=====================================
+  Update lvm2 monitoring script to lvm2_monitoring_init_red_hat.in.
+
 Version 2.02.52 - 15th September 2009
 =====================================
   Update _process_one_vg to cleanup properly after vg_read_error.



From jmagne at fedoraproject.org  Thu Sep 17 00:09:53 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Thu, 17 Sep 2009 00:09:53 +0000 (UTC)
Subject: rpms/coolkey/devel coolkey-simple-bugs.patch, NONE, 1.1 coolkey.spec,
	1.31, 1.32
Message-ID: <20090917000953.9E06511C00CF@cvs1.fedora.phx.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2229

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-simple-bugs.patch 
Log Message:
Misc bug fixes. Resolves: #485032, #250738, #497758.

coolkey-simple-bugs.patch:
 Makefile.am            |    1 -
 configure.in           |    4 ++--
 src/coolkey/object.cpp |    2 +-
 src/coolkey/object.h   |    2 +-
 src/coolkey/slot.cpp   |    4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE coolkey-simple-bugs.patch ---
diff -up ./configure.in.coolkey-simple-bugs ./configure.in
--- ./configure.in.coolkey-simple-bugs	2009-09-16 11:21:55.621493844 -0700
+++ ./configure.in	2009-09-16 11:22:23.354492383 -0700
@@ -124,9 +124,9 @@ then
 if test $WINDOWS -ne 1; then
   PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
 fi
-  enable_pk11install = "yes"
+  enable_pk11install="yes"
 else
-  enable_pk11install = "no"
+  enable_pk11install="no"
   AC_MSG_WARN([skipping pk11install])
 fi
 
diff -up ./Makefile.am.coolkey-simple-bugs ./Makefile.am
--- ./Makefile.am.coolkey-simple-bugs	2009-09-16 11:23:18.715515063 -0700
+++ ./Makefile.am	2009-09-16 13:15:29.570492412 -0700
@@ -25,7 +25,6 @@ if BUILD_PK11INSTALL
 SUBDIRS += src/install
 endif
 
-ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = cookey.spec LICENSE
 
diff -up ./src/coolkey/object.cpp.coolkey-simple-bugs ./src/coolkey/object.cpp
--- ./src/coolkey/object.cpp.coolkey-simple-bugs	2009-09-16 10:36:29.300516245 -0700
+++ ./src/coolkey/object.cpp	2009-09-16 10:37:17.747492199 -0700
@@ -397,7 +397,7 @@ PKCS11Object::getLabel() 
 {
     // clean up old one
     if (label) {
-	delete label;
+	delete [] label;
 	label = NULL;
     }
     // find matching attribute
diff -up ./src/coolkey/object.h.coolkey-simple-bugs ./src/coolkey/object.h
--- ./src/coolkey/object.h.coolkey-simple-bugs	2009-09-16 16:05:27.233488140 -0700
+++ ./src/coolkey/object.h	2009-09-16 16:05:54.161492421 -0700
@@ -82,7 +82,7 @@ class PKCS11Object {
     PKCS11Object(unsigned long muscleObjID, CK_OBJECT_HANDLE handle);
     PKCS11Object(unsigned long muscleObjID, const CKYBuffer *data,
         CK_OBJECT_HANDLE handle);
-    ~PKCS11Object() { delete label; delete name; CKYBuffer_FreeData(&pubKey); }
+    ~PKCS11Object() { delete [] label; delete [] name; CKYBuffer_FreeData(&pubKey); }
 
     PKCS11Object(const PKCS11Object& cpy) :
         attributes(cpy.attributes), muscleObjID(cpy.muscleObjID),
diff -up ./src/coolkey/slot.cpp.coolkey-simple-bugs ./src/coolkey/slot.cpp
--- ./src/coolkey/slot.cpp.coolkey-simple-bugs	2009-09-16 10:28:15.412492201 -0700
+++ ./src/coolkey/slot.cpp	2009-09-16 10:57:27.692492487 -0700
@@ -979,7 +979,7 @@ Slot::makeLabelString(char *label, int m
 //
 #define COOLKEY "CoolKey"
 #define POSSESSION " for "
-    if (!personName || personName == "") {
+    if (!personName || personName[0] == '\0' ) {
 	const int coolKeySize = sizeof(COOLKEY) ;
 	memcpy(label, COOLKEY, coolKeySize-1);
 	makeSerialString(&label[coolKeySize], maxSize-coolKeySize, cuid);
@@ -1528,7 +1528,7 @@ SlotMemSegment::SlotMemSegment(const cha
     }
     sprintf(segName,SEGMENT_PREFIX"%s",readerName); 
     segment = SHMem::initSegment(segName, MAX_OBJECT_STORE_SIZE, needInit);
-    delete segName;
+    delete [] segName;
     if (!segment) {
 	// just run without shared memory
 	return;


Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- coolkey.spec	15 Sep 2009 20:52:45 -0000	1.31
+++ coolkey.spec	17 Sep 2009 00:09:52 -0000	1.32
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 10%{dist}
+Release: 11%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -30,6 +30,7 @@ Source: coolkey-%{version}.tar.gz
 Patch1: coolkey-cache-dir-move.patch
 Patch2: coolkey-gcc43.patch
 Patch3: coolkey-latest.patch
+Patch4: coolkey-simple-bugs.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -62,6 +63,7 @@ Linux Driver support to access the CoolK
 %patch1 -b .cache.dir.move
 %patch2 -b .coolkey-gcc43
 %patch3 -b .coolkey-latest
+%patch4 -b .coolkey-simple-bugs
 
 %build
 autoconf
@@ -110,6 +112,8 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Jack magne <jmagne at redhat.com> - 1.1.0-11
+- Misc bug fixes. Resolves: 485032, #250738, #497758.
 * Fri Sep 11 2009 Jack Magne <jmagne at redhat.com> - 1.1.0-10
 - Include latest changes for Gemalto 64K and Safenet 330J.
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-9



From whot at fedoraproject.org  Thu Sep 17 01:28:03 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 17 Sep 2009 01:28:03 +0000 (UTC)
Subject: rpms/linuxwacom/devel linuxwacom-8.2.2.2-buttonnumber.patch, NONE, 
	1.1 linuxwacom-8.2.2.2-xorg17-nokeysending.patch, NONE,
	1.1 linuxwacom.spec, 1.81, 1.82
Message-ID: <20090917012803.B07D611C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-8.2.2.2-buttonnumber.patch 
	linuxwacom-8.2.2.2-xorg17-nokeysending.patch 
Log Message:
* Wed Sep 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-14
- linuxwacom-8.2.2.2-xorg17-nokeysending.patch: disable keysending, it's
  broken as-is.
- linuxwacom-8.2.2.2-buttonnumber.patch: don't increase the button number,
  the priv->button array is zero-indexed.


linuxwacom-8.2.2.2-buttonnumber.patch:
 wcmCommon.c |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE linuxwacom-8.2.2.2-buttonnumber.patch ---
>From 6094d946798cc7f97c128c66b364e9d98ace5685 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 16 Sep 2009 17:15:16 +1000
Subject: [PATCH] Dont inc. the button number.

priv->button is zero-indexed, but has the right mappings.
---
 src/xdrv/wcmCommon.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/xdrv/wcmCommon.c b/src/xdrv/wcmCommon.c
index 91bda74..1e1bd12 100644
--- a/src/xdrv/wcmCommon.c
+++ b/src/xdrv/wcmCommon.c
@@ -506,9 +506,6 @@ static void sendAButton(LocalDevicePtr local, int button, int mask,
 #endif
 	int naxes = priv->naxes;
 
-        /* Fix for current X servers, they start button mappings with 1, not
-         * with 0. */
-	button++;
 	if (!priv->button[button])  /* ignore this button event */
 		return;
 
-- 
1.6.3.rc1.2.g0164.dirty


linuxwacom-8.2.2.2-xorg17-nokeysending.patch:
 xf86Wacom.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE linuxwacom-8.2.2.2-xorg17-nokeysending.patch ---
>From 5cc0f164ba7766cac746ffb4e8be49325c1ea19a Mon Sep 17 00:00:00 2001
From: whot <whot at distributions-rawhide.(none)>
Date: Tue, 15 Sep 2009 16:02:18 +1000
Subject: [PATCH] undef keysending support

---
 src/xdrv/xf86Wacom.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/xdrv/xf86Wacom.h b/src/xdrv/xf86Wacom.h
index f302c73..ba26998 100644
--- a/src/xdrv/xf86Wacom.h
+++ b/src/xdrv/xf86Wacom.h
@@ -26,11 +26,16 @@
 #ifdef WCM_XORG
    #include <xorg-server.h>
    #include <xorgVersion.h>
+   #include <xf86Module.h>
 #else
    #include <xf86Version.h>
 #endif
 #include "../include/Xwacom.h"
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+#undef WCM_KEY_SENDING_SUPPORT
+#endif
+
 /*****************************************************************************
  * Linux Input Support
  ****************************************************************************/
-- 
1.6.4.2



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- linuxwacom.spec	14 Aug 2009 14:46:59 -0000	1.81
+++ linuxwacom.spec	17 Sep 2009 01:28:02 -0000	1.82
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -35,6 +35,12 @@ Patch10:	linuxwacom-0.8.2.2-intuos4-supp
 # patch up for new Xorg API changes, extracted from linuxwacom-devel list
 # https://sourceforge.net/mailarchive/forum.php?thread_name=200906181709.56283.neitzke%40physics.harvard.edu&forum_name=linuxwacom-devel
 Patch11:	linuxwacom-0.8.2.2-xorg17-buildfix.patch
+# Patch11 is broken, assigning some non-existing struct to the new pointer
+# (which is of a different type). Undef keysending altogether, it's not working
+# with 1.7 as-is.
+Patch12:	linuxwacom-8.2.2.2-xorg17-nokeysending.patch
+Patch13:	linuxwacom-8.2.2.2-buttonnumber.patch
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -72,6 +78,8 @@ compiling applications for manipulating 
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 
@@ -134,6 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Wed Sep 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-14
+- linuxwacom-8.2.2.2-xorg17-nokeysending.patch: disable keysending, it's
+  broken as-is.
+- linuxwacom-8.2.2.2-buttonnumber.patch: don't increase the button number,
+  the priv->button array is zero-indexed.
+
 * Tue Jul 21 2009 Jarod Wilson <jarod at redhat.com> 0.8.2.2-13
 - Patch up build for xorg 1.7 API changes
 



From tmz at fedoraproject.org  Thu Sep 17 01:47:19 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 17 Sep 2009 01:47:19 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.80, 1.81 git.spec, 1.94, 1.95 sources, 
	1.80, 1.81
Message-ID: <20090917014719.C5E3E11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17609

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	13 Sep 2009 14:40:24 -0000	1.80
+++ .cvsignore	17 Sep 2009 01:47:16 -0000	1.81
@@ -1 +1 @@
-git-1.6.4.3.tar.bz2
+git-1.6.4.4.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- git.spec	13 Sep 2009 15:03:53 -0000	1.94
+++ git.spec	17 Sep 2009 01:47:17 -0000	1.95
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.4.3
+Version:        1.6.4.4
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Wed Sep 16 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.4-1
+- git-1.6.4.4
+
 * Sun Sep 13 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.3-1
 - git-1.6.4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	13 Sep 2009 14:40:24 -0000	1.80
+++ sources	17 Sep 2009 01:47:17 -0000	1.81
@@ -1 +1 @@
-4af70ff9b8f209704059f7ef96127236  git-1.6.4.3.tar.bz2
+b150352782998ca1f84185e6af53ec26  git-1.6.4.4.tar.bz2



From dchen at fedoraproject.org  Thu Sep 17 02:44:28 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Thu, 17 Sep 2009 02:44:28 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.21, 1.22 ibus-chewing.spec,
	1.25, 1.26 import.log, 1.16, 1.17 sources, 1.22, 1.23
Message-ID: <20090917024428.6FF5611C00E6@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5018/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 IBus upstream issue 484   Pack the gob2 generation source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	16 Sep 2009 03:39:47 -0000	1.21
+++ .cvsignore	17 Sep 2009 02:44:28 -0000	1.22
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090916-Source.tar.gz
+ibus-chewing-1.2.0.20090917-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ibus-chewing.spec	16 Sep 2009 03:39:47 -0000	1.25
+++ ibus-chewing.spec	17 Sep 2009 02:44:28 -0000	1.26
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090916
+Version:    1.2.0.20090917
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090916-1
+* Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.
 - Pack the gob2 generation source to avoid the [Bug 519108]:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	16 Sep 2009 03:39:47 -0000	1.16
+++ import.log	17 Sep 2009 02:44:28 -0000	1.17
@@ -14,3 +14,4 @@ ibus-chewing-1_0_10_20090523-1_fc11:HEAD
 ibus-chewing-1_0_10_20090523-2_fc11:HEAD:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242973464
 ibus-chewing-1_2_0_20090624-1_fc11:HEAD:ibus-chewing-1.2.0.20090624-1.fc11.src.rpm:1245803467
 ibus-chewing-1_2_0_20090916-1_fc11:HEAD:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253071014
+ibus-chewing-1_2_0_20090917-1_fc11:HEAD:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253155437


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	16 Sep 2009 03:39:47 -0000	1.22
+++ sources	17 Sep 2009 02:44:28 -0000	1.23
@@ -1 +1 @@
-cc593bdb4a5254645960fdef3f35dcce  ibus-chewing-1.2.0.20090916-Source.tar.gz
+b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz



From cweyl at fedoraproject.org  Thu Sep 17 03:06:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 17 Sep 2009 03:06:56 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta/devel import.log, NONE,
	1.1 perl-Module-Install-GithubMeta.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917030656.C53EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Install-GithubMeta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12237/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Module-Install-GithubMeta.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Module-Install-GithubMeta-0_10-1_fc11:HEAD:perl-Module-Install-GithubMeta-0.10-1.fc11.src.rpm:1253156810


--- NEW FILE perl-Module-Install-GithubMeta.spec ---
Name:       perl-Module-Install-GithubMeta 
Version:    0.10 
Release:    1%{?dist}
# lib/Module/Install/GithubMeta.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A Module::Install extension to include GitHub meta information in META.yml 
Source:     http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/Module-Install-GithubMeta-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Module-Install-GithubMeta
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Capture::Tiny) >= 0.05
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(Module::Install) >= 0.85
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(Test::Pod)

Requires:      perl(Module::Install) >= 0.85

%{?perl_default_filter}

%description
Module::Install::GithubMeta is a Module::Install extension
to include GitHub (http://github.com) meta information in
'META.yml'.  It automatically detects if the distribution 
directory is under 'git' version control and whether the 
'origin' is a GitHub repository; if so, it will set the
'repository' and 'homepage' meta in 'META.yml' to the 
appropriate URLs for GitHub.


%prep
%setup -q -n Module-Install-GithubMeta-%{version}

cat README | iconv -f `file --mime-encoding --brief README` -t UTF-8 > x
mv x README

%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
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- submission

* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-GithubMeta/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:16:30 -0000	1.1
+++ .cvsignore	17 Sep 2009 03:06:56 -0000	1.2
@@ -0,0 +1 @@
+Module-Install-GithubMeta-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-GithubMeta/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:16:30 -0000	1.1
+++ sources	17 Sep 2009 03:06:56 -0000	1.2
@@ -0,0 +1 @@
+bb0aba4ae24c2ee526c7bf8e2b318620  Module-Install-GithubMeta-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Sep 17 03:07:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 17 Sep 2009 03:07:07 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta/F-11 import.log, NONE,
	1.1 perl-Module-Install-GithubMeta.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917030707.8293D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Install-GithubMeta/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12463/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Module-Install-GithubMeta.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Module-Install-GithubMeta-0_10-1_fc11:F-11:perl-Module-Install-GithubMeta-0.10-1.fc11.src.rpm:1253156822


--- NEW FILE perl-Module-Install-GithubMeta.spec ---
Name:       perl-Module-Install-GithubMeta 
Version:    0.10 
Release:    1%{?dist}
# lib/Module/Install/GithubMeta.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A Module::Install extension to include GitHub meta information in META.yml 
Source:     http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/Module-Install-GithubMeta-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Module-Install-GithubMeta
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Capture::Tiny) >= 0.05
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(Module::Install) >= 0.85
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(Test::Pod)

Requires:      perl(Module::Install) >= 0.85

%{?perl_default_filter}

%description
Module::Install::GithubMeta is a Module::Install extension
to include GitHub (http://github.com) meta information in
'META.yml'.  It automatically detects if the distribution 
directory is under 'git' version control and whether the 
'origin' is a GitHub repository; if so, it will set the
'repository' and 'homepage' meta in 'META.yml' to the 
appropriate URLs for GitHub.


%prep
%setup -q -n Module-Install-GithubMeta-%{version}

cat README | iconv -f `file --mime-encoding --brief README` -t UTF-8 > x
mv x README

%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
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- submission

* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-GithubMeta/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:16:30 -0000	1.1
+++ .cvsignore	17 Sep 2009 03:07:07 -0000	1.2
@@ -0,0 +1 @@
+Module-Install-GithubMeta-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-GithubMeta/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:16:30 -0000	1.1
+++ sources	17 Sep 2009 03:07:07 -0000	1.2
@@ -0,0 +1 @@
+bb0aba4ae24c2ee526c7bf8e2b318620  Module-Install-GithubMeta-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Sep 17 03:07:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 17 Sep 2009 03:07:17 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta/F-10 import.log, NONE,
	1.1 perl-Module-Install-GithubMeta.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917030717.850E111C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Install-GithubMeta/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12657/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Module-Install-GithubMeta.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Module-Install-GithubMeta-0_10-1_fc11:F-10:perl-Module-Install-GithubMeta-0.10-1.fc11.src.rpm:1253156832


--- NEW FILE perl-Module-Install-GithubMeta.spec ---
Name:       perl-Module-Install-GithubMeta 
Version:    0.10 
Release:    1%{?dist}
# lib/Module/Install/GithubMeta.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A Module::Install extension to include GitHub meta information in META.yml 
Source:     http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/Module-Install-GithubMeta-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Module-Install-GithubMeta
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Capture::Tiny) >= 0.05
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(Module::Install) >= 0.85
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(Test::Pod)

Requires:      perl(Module::Install) >= 0.85

%{?perl_default_filter}

%description
Module::Install::GithubMeta is a Module::Install extension
to include GitHub (http://github.com) meta information in
'META.yml'.  It automatically detects if the distribution 
directory is under 'git' version control and whether the 
'origin' is a GitHub repository; if so, it will set the
'repository' and 'homepage' meta in 'META.yml' to the 
appropriate URLs for GitHub.


%prep
%setup -q -n Module-Install-GithubMeta-%{version}

cat README | iconv -f `file --mime-encoding --brief README` -t UTF-8 > x
mv x README

%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
* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- submission

* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-GithubMeta/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:16:30 -0000	1.1
+++ .cvsignore	17 Sep 2009 03:07:17 -0000	1.2
@@ -0,0 +1 @@
+Module-Install-GithubMeta-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-GithubMeta/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:16:30 -0000	1.1
+++ sources	17 Sep 2009 03:07:17 -0000	1.2
@@ -0,0 +1 @@
+bb0aba4ae24c2ee526c7bf8e2b318620  Module-Install-GithubMeta-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Sep 17 03:08:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 17 Sep 2009 03:08:48 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable/devel import.log, NONE,
	1.1 perl-POE-Component-Pluggable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090917030848.C6F5811C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13244/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-POE-Component-Pluggable.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-POE-Component-Pluggable-1_24-1_fc11:HEAD:perl-POE-Component-Pluggable-1.24-1.fc11.src.rpm:1253156922


--- NEW FILE perl-POE-Component-Pluggable.spec ---
Name:       perl-POE-Component-Pluggable 
Version:    1.24 
Release:    1%{?dist}
# lib/POE/Component/Pluggable.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A base class for creating plugin-enabled POE components 
Source:     http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/POE-Component-Pluggable-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/POE-Component-Pluggable
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(constant) >= 1.17
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(POE) >= 1.004
BuildRequires: perl(Task::Weaken)
BuildRequires: perl(Test::More) >= 0.47

Requires:      perl(POE) >= 1.004

%{?perl_default_filter}

%description
POE::Component::Pluggable is a base class for creating plugin enabled
POE Components. It is a generic port of POE::Component::IRC's plugin
system. If your component dispatches events to registered POE sessions,
then POE::Component::Pluggable may be a good fit for you. 

%prep
%setup -q -n POE-Component-Pluggable-%{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 examples/ README LICENSE
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-1
- submission

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Pluggable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:48:39 -0000	1.1
+++ .cvsignore	17 Sep 2009 03:08:48 -0000	1.2
@@ -0,0 +1 @@
+POE-Component-Pluggable-1.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Pluggable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:48:39 -0000	1.1
+++ sources	17 Sep 2009 03:08:48 -0000	1.2
@@ -0,0 +1 @@
+6627cbbb234c1295b63e23f88b8de976  POE-Component-Pluggable-1.24.tar.gz



From cweyl at fedoraproject.org  Thu Sep 17 03:09:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 17 Sep 2009 03:09:00 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable/F-11 import.log, NONE,
	1.1 perl-POE-Component-Pluggable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090917030900.27B3A11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Pluggable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13427/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-POE-Component-Pluggable.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-POE-Component-Pluggable-1_24-1_fc11:F-11:perl-POE-Component-Pluggable-1.24-1.fc11.src.rpm:1253156934


--- NEW FILE perl-POE-Component-Pluggable.spec ---
Name:       perl-POE-Component-Pluggable 
Version:    1.24 
Release:    1%{?dist}
# lib/POE/Component/Pluggable.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A base class for creating plugin-enabled POE components 
Source:     http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/POE-Component-Pluggable-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/POE-Component-Pluggable
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(constant) >= 1.17
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(POE) >= 1.004
BuildRequires: perl(Task::Weaken)
BuildRequires: perl(Test::More) >= 0.47

Requires:      perl(POE) >= 1.004

%{?perl_default_filter}

%description
POE::Component::Pluggable is a base class for creating plugin enabled
POE Components. It is a generic port of POE::Component::IRC's plugin
system. If your component dispatches events to registered POE sessions,
then POE::Component::Pluggable may be a good fit for you. 

%prep
%setup -q -n POE-Component-Pluggable-%{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 examples/ README LICENSE
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-1
- submission

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Pluggable/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:48:39 -0000	1.1
+++ .cvsignore	17 Sep 2009 03:08:59 -0000	1.2
@@ -0,0 +1 @@
+POE-Component-Pluggable-1.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Pluggable/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:48:39 -0000	1.1
+++ sources	17 Sep 2009 03:09:00 -0000	1.2
@@ -0,0 +1 @@
+6627cbbb234c1295b63e23f88b8de976  POE-Component-Pluggable-1.24.tar.gz



From cweyl at fedoraproject.org  Thu Sep 17 03:09:11 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 17 Sep 2009 03:09:11 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable/F-10 import.log, NONE,
	1.1 perl-POE-Component-Pluggable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090917030911.D7A3011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Pluggable/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13609/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-POE-Component-Pluggable.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-POE-Component-Pluggable-1_24-1_fc11:F-10:perl-POE-Component-Pluggable-1.24-1.fc11.src.rpm:1253156945


--- NEW FILE perl-POE-Component-Pluggable.spec ---
Name:       perl-POE-Component-Pluggable 
Version:    1.24 
Release:    1%{?dist}
# lib/POE/Component/Pluggable.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A base class for creating plugin-enabled POE components 
Source:     http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/POE-Component-Pluggable-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/POE-Component-Pluggable
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(constant) >= 1.17
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(POE) >= 1.004
BuildRequires: perl(Task::Weaken)
BuildRequires: perl(Test::More) >= 0.47

Requires:      perl(POE) >= 1.004

%{?perl_default_filter}

%description
POE::Component::Pluggable is a base class for creating plugin enabled
POE Components. It is a generic port of POE::Component::IRC's plugin
system. If your component dispatches events to registered POE sessions,
then POE::Component::Pluggable may be a good fit for you. 

%prep
%setup -q -n POE-Component-Pluggable-%{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 examples/ README LICENSE
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-1
- submission

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Pluggable/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:48:39 -0000	1.1
+++ .cvsignore	17 Sep 2009 03:09:11 -0000	1.2
@@ -0,0 +1 @@
+POE-Component-Pluggable-1.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Pluggable/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:48:39 -0000	1.1
+++ sources	17 Sep 2009 03:09:11 -0000	1.2
@@ -0,0 +1 @@
+6627cbbb234c1295b63e23f88b8de976  POE-Component-Pluggable-1.24.tar.gz



From tagoh at fedoraproject.org  Thu Sep 17 03:20:03 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 17 Sep 2009 03:20:03 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-close-fd.patch, NONE,
	1.1 imsettings.spec, 1.41, 1.42
Message-ID: <20090917032003.2C68611C04BE@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-close-fd.patch 
Log Message:
* Thu Sep 17 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-5
- Fix taking too much CPU issue.

imsettings-close-fd.patch:
 factory.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE imsettings-close-fd.patch ---
2009-09-17  Akira TAGOH  <tagoh at redhat.com>

	* src/factory.c (_stop_process): get rid of the unnecessary increasing
	the reference count, which causes taking a lot CPU load again.

Index: src/factory.c
===================================================================
--- src/factory.c	(????? 345)
+++ src/factory.c	(????? 346)
@@ -652,7 +652,7 @@
 {
 	gboolean retval = FALSE;
 	GHashTable *hash;
-	struct ProcessInformation *info, *tmp;
+	struct ProcessInformation *info;
 
 	if (is_body) {
 		hash = priv->body2info;
@@ -670,17 +670,13 @@
 			retval = TRUE;
 		}
 	} else {
-		tmp = _process_info_ref(info);
 		/* info will be deleted from *2info Hash table at _watch_im_status_cb when the process is really died. */
 		g_hash_table_remove(priv->pid2id, GINT_TO_POINTER (info->pid));
 		if (kill(-info->pid, SIGTERM) == -1) {
-			gchar *module = g_strdup(identity);
-
 			g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNABLE_TO_TRACK_IM,
 				    _("Couldn't send a signal to the %s process successfully."),
 				    is_body ? "Main" : "AUX");
 			/* push back to the table */
-			g_hash_table_insert(hash, module, tmp);
 			g_hash_table_insert(priv->pid2id, GINT_TO_POINTER (info->pid), GUINT_TO_POINTER (info->id));
 		} else {
 			GTimeVal time;


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- imsettings.spec	15 Sep 2009 08:03:57 -0000	1.41
+++ imsettings.spec	17 Sep 2009 03:20:02 -0000	1.42
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@ Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-unref-notify.patch
 Patch3:		imsettings-unref-later.patch
 Patch4:		imsettings-update-info.patch
+Patch5:		imsettings-close-fd.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -92,6 +93,7 @@ This package contains a plugin to get th
 %patch2 -p0 -b .2-unref
 %patch3 -p0 -b .3-zombie
 %patch4 -p0 -b .4-update-info
+%patch5 -p0 -b .5-close-fd
 
 %build
 %configure	\
@@ -217,6 +219,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-5
+- Fix taking too much CPU issue.
+
 * Tue Sep 15 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-4
 - Update the IM information as needed if the configuration file is written
   in the script. (#523349)



From whot at fedoraproject.org  Thu Sep 17 03:21:41 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 17 Sep 2009 03:21:41 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.486,
	1.487 xserver-1.5.99.3-dmx-xcalloc.patch, 1.1,
	NONE xserver-1.5.99.902-vnc.patch, 1.1,
	NONE xserver-1.6.0-restore-zap.patch, 1.1,
	NONE xserver-1.6.0-selinux-less.patch, 1.1,
	NONE xserver-1.6.0-xinerama-crashes.patch, 1.1,
	NONE xserver-1.6.0-xinerama-cursors.patch, 1.1, NONE
Message-ID: <20090917032141.ED23311C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17653

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	xserver-1.5.99.3-dmx-xcalloc.patch 
	xserver-1.5.99.902-vnc.patch xserver-1.6.0-restore-zap.patch 
	xserver-1.6.0-selinux-less.patch 
	xserver-1.6.0-xinerama-crashes.patch 
	xserver-1.6.0-xinerama-cursors.patch 
Log Message:
* Thu Sep 17 2009 Peter Hutterer <peter.hutterer at redhat.com>
- xserver-1.5.99.3-dmx-xcalloc.patch: Obsolete, drop.
- cvs rm a few other patches not used anymore. 



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -p -r1.486 -r1.487
--- xorg-x11-server.spec	15 Sep 2009 15:10:02 -0000	1.486
+++ xorg-x11-server.spec	17 Sep 2009 03:21:41 -0000	1.487
@@ -61,9 +61,6 @@ Patch5002:  xserver-1.4.99-ssh-isnt-loca
 # force mode debugging on for randr 1.2 drivers
 Patch6002: xserver-1.5.1-mode-debug.patch
 
-# FIXME
-#Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
-
 # don't build the (broken) acpi code
 Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
 
@@ -506,6 +503,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Sep 17 2009 Peter Hutterer <peter.hutterer at redhat.com>
+- xserver-1.5.99.3-dmx-xcalloc.patch: Obsolete, drop.
+- cvs rm a few other patches not used anymore. 
+
 * Tue Sep 15 2009 Adam Jackson <ajax at redhat.com> 1.6.99.901-2
 - xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you.
 - Point to bodhi for the "check for latest version" message.


--- xserver-1.5.99.3-dmx-xcalloc.patch DELETED ---


--- xserver-1.5.99.902-vnc.patch DELETED ---


--- xserver-1.6.0-restore-zap.patch DELETED ---


--- xserver-1.6.0-selinux-less.patch DELETED ---


--- xserver-1.6.0-xinerama-crashes.patch DELETED ---


--- xserver-1.6.0-xinerama-cursors.patch DELETED ---



From transif at fedoraproject.org  Thu Sep 17 03:48:57 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 17 Sep 2009 03:48:57 +0000 (UTC)
Subject: comps/po fr.po,1.24,1.25
Message-ID: <20090917034857.D4B0411C00E6@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25784/po

Modified Files:
	fr.po 
Log Message:
Sending translation for French


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.24 -r 1.25 fr.poIndex: fr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fr.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- fr.po	13 May 2009 17:18:04 -0000	1.24
+++ fr.po	17 Sep 2009 03:48:57 -0000	1.25
@@ -14,293 +14,315 @@
 # Corina Roe <croe at redhat.com>, 2008, 2009.
 # Corentin Perard <corentin.perard at gmail.com>, 2009.
 # Charles-Antoine Couret <cacouret at wanadoo.fr>, 2009.
+# Sam Friedmann <sam.friedmann at redhat.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-11 19:11+0000\n"
-"PO-Revision-Date: 2009-05-11 23:08+0200\n"
-"Last-Translator: Thomas Canniot <thomas.canniot at mrtomlinux.org>\n"
-"Language-Team: French <fedora-trans-fr at redhat.com>\n"
+"POT-Creation-Date: 2009-09-11 02:24+0000\n"
+"PO-Revision-Date: 2009-09-15 12:24+1000\n"
+"Last-Translator: Sam Friedmann <sam.friedmann at redhat.com>\n"
+"Language-Team: French <fr at li.org>\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"
+"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
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Un environnement de bureau l?ger adapt? aux machines peu puissantes."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Outils d'administration"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Prise en charge de l'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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Prise en charge de l'albanais"
 
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Applications"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Applications pour effectuer une vari?t? de t?ches"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Prise en charge de l'arabe"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Prise en charge de l'arm?nien"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Prise en charge de l'assamais"
 
-#: ../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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 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-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 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-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 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-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Groupe de construction de l'environnement de compilation"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 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-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 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-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
[...1931 lines suppressed...]
 "Prise en charge de la compilation crois?e des programmes 32 bits "
-"pourWindows, des phases de tests et de cr?ation des "
+"pour Windows, des phases de tests et de cr?ation des "
 "programmesd'installation, le tout dans Fedora."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1450,15 +1548,18 @@ msgstr ""
 "Prise en charge du d?veloppement d'applications utilisant le langage de "
 "programmation et les biblioth?ques Objective CAML"
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Prise en charge du swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Prise en charge du t?toum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1466,23 +1567,79 @@ 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:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Prise en charge du turkm?ne"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Prise en charge du haut-sorabe"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "Un ensemble de paquets qui apporte la fonctionnalit? Critical Path pour le bureau GNOME"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "Un ensemble de paquets qui apporte la plate-forme partag?e pour la fonctionnalit? Critical Path sur toutes les versions de Fedora"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Livres et guides"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Livres et guides pour les utilisateurs et d?veloppeurs de Fedora"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (base)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Directory Server"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE est un environnement de bureau X11 l?ger, con?u pour des ordinateurs de faible puissance, tels que les netbooks, les appareils mobiles, ou d'anciens ordinateurs."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Serveurs d'identification de machines et utilisateurs."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Environnement de bureau Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin est un environnement de bureau pour netbooks/nettops/MID."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Applications pour t?ches diverses"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Prise en charge de l'acc?s distant au r?seau"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1491,7 +1648,7 @@ msgstr ""
 "tableau de bord, un bureau, des ic?nes syst?me et un gestionnaire de "
 "fichiers graphique."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1500,7 +1657,7 @@ msgstr ""
 "de bord, un bureau, des ic?nes syst?me et un gestionnaire de fichiers "
 "graphique."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1508,11 +1665,11 @@ msgstr ""
 "Parfois appel?s ?diteurs de texte, ces programmes vous permettent de cr?er "
 "et d'?diter des fichiers. Ils comprennent Emacs et Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "?diteur de texte XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1520,40 +1677,36 @@ msgstr ""
 "Ces outils vous permettent de cr?er de la documentation sous format DocBook "
 "et de la convertir en HTML, PDF, Postscript et texte."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
 "Ce groupe comprend un ensemble de serveurs r?seau pour des besoins "
 "sp?cifiques"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en arabe."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en h?breu."
 
-#: ../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."
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en japonais."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en tch?que."



From cebbert at fedoraproject.org  Thu Sep 17 05:07:26 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 17 Sep 2009 05:07:26 +0000 (UTC)
Subject: rpms/kernel/F-12/scripts sort-config,1.5,1.6
Message-ID: <20090917050726.3574111C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8885

Modified Files:
	sort-config 
Log Message:
fix matching of impossible configs
stop dropping the last comment line
allow forcibly removing impossible configs
make looking for changed configs optional



Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/scripts/sort-config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sort-config	16 Sep 2009 23:25:11 -0000	1.5
+++ sort-config	17 Sep 2009 05:07:25 -0000	1.6
@@ -5,20 +5,23 @@ TGT=($(ls kernel-*/linux-*.noarch/config
           kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
 TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})
 
+ALL_OPTS="cdfimn"
 if [ $# -lt 2 ] ; then
-   echo -e "Usage:\n   $(basename $0) [-dfcn] input target\n"
+   echo -e "Usage:\n   $(basename $0) [-$ALL_OPTS] input target\n"
    echo -e " Sort input config file into the same order as the target\n"
-   echo -e "      -c: insert comments about non-matching items"
+   echo -e "      -c: insert comments about non-matching/impossible items"
    echo -e "      -d: show raw unsorted output with extra debug text"
-   echo -e "      -f: force output to match what is in the target config"
+   echo -e "      -f: force output to match what is in the target config,"
+   echo -e "          and/or remove impossible config items"
    echo -e "      -i: find impossible config items"
+   echo -e "      -m: find changed config items"
    echo -e "      -n: do not sort output\n"
    echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
    echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
    exit 1
 fi
 
-while getopts "cdfin" OPTION ; do
+while getopts "$ALL_OPTS" OPTION ; do
 case $OPTION in
 c)
    ADDCOMMENT=1 ;;
@@ -28,6 +31,8 @@ f)
    FORCE=1 ;;
 i)
    FIND_IMPOSS=1 ;;
+m)
+   FIND_CHANGED=1 ;;
 n)
    NOSORT=1 ;;
 \?)
@@ -42,12 +47,17 @@ fi
 
 shift $((OPTIND-1))
 
-if [ -f xx00 -o -f xx01 -o -f xx99 -o -f xx98 ] ; then
+TEMPFILES="xx00 xx01 xx98 xx99"
+TEMPLEFT=
+for FILE in $TEMPFILES ; do
+   [ -f "$FILE" ] && TEMPLEFT="Y"
+done
+if [ "$TEMPLEFT" ] ; then
    echo "WARNING! Output files named xx?? already exist." >&2
    read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
    echo >&2
 fi
-rm -f xx00 xx01 xx99 xx98
+rm -f $TEMPFILES
 
 SRCFILE=config-$1
 [ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2
@@ -57,15 +67,46 @@ TGTFILE=kernel-*/linux-*.noarch/configs/
 
 [ "$FIND_IMPOSS" ] && \
    find kernel-*/*.noarch -name Kconfig\* -type f \
-   | xargs grep -s -h '^config ' \
-   | sed 's/^config /CONFIG_/' \
+   | xargs egrep -s -h '^[[:space:]]*(menu)?config[[:space:]]+' \
+   | sed -r 's/^[[:space:]]*(menu)?config[[:space:]]+/CONFIG_/' \
    | sort | uniq >xx98
 
+extract_optname() {
+         # extract the option name from $TEXT, setting $OPTNAME
+         OPTNAME=
+         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
+            OPTNAME=${TEXT%%=*}
+         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
+            OPTNAME=${TEXT%" is not set"}
+            OPTNAME=${OPTNAME#\# }
+         fi
+}
+
+print_saved_comments() {
+      if [ $IX -gt 0 ] ; then
+         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
+         (( IX-- ))
+         for IX in $(seq 0 $IX) ; do
+            echo "$LINE":"${SAVECOMMENT[$IX]}"
+         done
+         unset SAVECOMMENT
+         IX=0
+      fi
+}
+
+assign_line_number() {
+      # use input line numbers if not sorting
+      [ "$NOSORT" ] && LINE=$IN
+      # make sure it has a line number
+      [ -z "$LINE" ] && LINE=999999
+}
+
 IX=0
 IN=0
 declare -a SAVECOMMENT
 
-cat ${SRCFILE} | while read TEXT ; do
+cat ${SRCFILE} | {
+while read TEXT ; do
 
    LINE=
    COMMENT=
@@ -77,46 +118,52 @@ cat ${SRCFILE} | while read TEXT ; do
       if [ -z "$LINE" ] ; then
          [ "$DEBUG" ] && echo "nofind      ->" "$TEXT"
 
-         # see if option changed in output file
-         OPTNAME=
-         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
-            OPTNAME=${TEXT%%=*}
-         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
-            OPTNAME=${TEXT%" is not set"}
-            OPTNAME=${OPTNAME#\# }
-         fi
+         extract_optname
          if [ "$OPTNAME" ] ; then
-            for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
-               if [ -z "$LINE" ] ; then
-                  [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
-                  LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
-                  if [ "$LINE" ] ; then
-                     CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
-                     if [ "$FORCE" ] ; then
-                        TEXT="$CHANGED"
-                        [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
-                     else
-                        if [ "$ADDCOMMENT" ] ; then
-                           if [ ${CHANGED:0:1} = '#' ] ; then
-                              NEWOPT="not set"
-                           else
-                              NEWOPT=${CHANGED#$OPTNAME}
+
+            if [ "$FIND_CHANGED" ] ; then
+               for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
+                  if [ -z "$LINE" ] ; then
+                     [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
+                     LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
+                     if [ "$LINE" ] ; then
+                        CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
+                        if [ "$FORCE" ] ; then
+                           TEXT=$CHANGED
+                           [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
+                        else
+                           if [ "$ADDCOMMENT" ] ; then
+                              if [ ${CHANGED:0:1} = '#' ] ; then
+                                 NEWOPT="not set"
+                              else
+                                 NEWOPT=${CHANGED#$OPTNAME}
+                              fi
+                              COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                            fi
-                           COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                         fi
                      fi
                   fi
+               done
+            fi
+
+            if [ "$FIND_IMPOSS" -a -z "$LINE" -a -z "$COMMENT" ] ; then
+               POSSIBLE=$(grep -n "^$OPTNAME" xx98)
+               if [ -z "$POSSIBLE" ] ; then
+                  if [ "$ADDCOMMENT" ] ; then
+                     COMMENT="# -- Next option is impossible --"
+                  elif [ "$FORCE" ] ; then
+                     [ "$DEBUG" ] && echo 'impossible  ->' "$TEXT"
+                     TEXT=""
+                  fi
                fi
-            done
-            if [ -z "$LINE" -a -z "$COMMENT" -a "$FIND_IMPOSS" ] ; then
-               IMPOSS=$(grep -n "$OPTNAME" xx98)
-               [ -z "$IMPOSS" ] && COMMENT="# -- Next option is impossible --"
             fi
+
          fi
 
       fi
 
    else
+      # not a config variable
       COMMENT="$TEXT"
       TEXT=
    fi
@@ -126,41 +173,37 @@ cat ${SRCFILE} | while read TEXT ; do
 
    if [ "$TEXT" ] ; then
 
-      # use input line numbers if not sorting
-      [ "$NOSORT" ] && LINE=$IN
-      # make sure it has a line number
-      [ -z "$LINE" ] && LINE=999999
+      assign_line_number
 
-      # print saved comments first
-      if [ $IX -gt 0 ] ; then
-         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
-         (( IX-- ))
-         for IX in $(seq 0 $IX) ; do
-            echo "$LINE":"${SAVECOMMENT[$IX]}"
-         done
-         unset SAVECOMMENT
-         IX=0
-      fi
+      # print the saved comments first
+      print_saved_comments
+      # now print the latest comment and text
       [ "$COMMENT" ] && echo "$LINE":"$COMMENT"
       echo "$LINE":"$TEXT"
 
-   else
+   elif [ "$COMMENT" ] ; then
 
       # no output yet, save the comment
       SAVECOMMENT[$IX]="$COMMENT"
-      [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
-      (( IX++ ))
+      let IX++
+      [ "$DEBUG" ] && echo 'savecomment (#'${IX}')'
 
    fi
 
-   ((IN++))
+   let IN++
 
-done > xx99
+done
+assign_line_number
+print_saved_comments
+[ "$DEBUG" ] && echo "$IN lines read from input"
+} >xx99
 
 if [ "$DEBUG" ] ; then
+   # just show the raw output with debug info, then exit
    cat xx99
 else
 
+   # split output into two files, for matched and unmatched items
    cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null
 
    cat xx00 | cut -f 2- -d ':'
@@ -173,4 +216,4 @@ else
 
 fi
 
-rm -f xx00 xx01 xx99 xx98
+rm -f $TEMPFILES



From mtruch at fedoraproject.org  Thu Sep 17 05:10:27 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Thu, 17 Sep 2009 05:10:27 +0000 (UTC)
Subject: rpms/getdata/EL-5 getdata.spec,1.7,1.8
Message-ID: <20090917051027.3A0F311C0374@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10400

Modified Files:
	getdata.spec 
Log Message:
Disable debugging and failed tests.  Upstream has been contacted appropriately.



Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/EL-5/getdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- getdata.spec	24 Jul 2009 23:54:16 -0000	1.7
+++ getdata.spec	17 Sep 2009 05:10:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -54,11 +54,11 @@ Does not yet allow writing of bzip2 enco
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static --enable-modules --enable-debug
+%configure --disable-static --enable-modules
 make %{?_smp_mflags}
 
-%check
-make check
+#%check
+#make check
 
 %install
 rm -rf %{buildroot}
@@ -102,6 +102,10 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Wed Sep 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-4
+- Disable obnoxious verbose debugging output.
+- Disable tests which fail.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dchen at fedoraproject.org  Thu Sep 17 05:22:12 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Thu, 17 Sep 2009 05:22:12 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.21, 1.22 ibus-chewing.spec,
	1.24, 1.25 import.log, 1.17, 1.18 sources, 1.22, 1.23
Message-ID: <20090917052212.7B06F11C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13820/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
IBus upstream issue 484 ; Pack the gob2 generation source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	16 Sep 2009 03:47:36 -0000	1.21
+++ .cvsignore	17 Sep 2009 05:22:12 -0000	1.22
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090916-Source.tar.gz
+ibus-chewing-1.2.0.20090917-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ibus-chewing.spec	16 Sep 2009 03:47:37 -0000	1.24
+++ ibus-chewing.spec	17 Sep 2009 05:22:12 -0000	1.25
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090916
+Version:    1.2.0.20090917
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090916-1
+* Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.
 - Pack the gob2 generation source to avoid the [Bug 519108]:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	16 Sep 2009 03:47:37 -0000	1.17
+++ import.log	17 Sep 2009 05:22:12 -0000	1.18
@@ -15,3 +15,4 @@ ibus-chewing-1_0_10_20090523-2_fc11:F-11
 ibus-chewing-1_2_0_20090818-1_fc11:F-11:ibus-chewing-1.2.0.20090818-1.fc11.src.rpm:1250580564
 ibus-chewing-1_2_0_20090831-1_fc11:F-11:ibus-chewing-1.2.0.20090831-1.fc11.src.rpm:1251703942
 ibus-chewing-1_2_0_20090916-1_fc11:F-11:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253072780
+ibus-chewing-1_2_0_20090917-1_fc11:F-11:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253164898


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	16 Sep 2009 03:47:37 -0000	1.22
+++ sources	17 Sep 2009 05:22:12 -0000	1.23
@@ -1 +1 @@
-cc593bdb4a5254645960fdef3f35dcce  ibus-chewing-1.2.0.20090916-Source.tar.gz
+b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz



From dchen at fedoraproject.org  Thu Sep 17 05:24:25 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Thu, 17 Sep 2009 05:24:25 +0000 (UTC)
Subject: rpms/ibus-chewing/F-10 .cvsignore, 1.12, 1.13 ibus-chewing.spec,
	1.13, 1.14 import.log, 1.8, 1.9 sources, 1.14, 1.15
Message-ID: <20090917052425.26B0711C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14434/F-10

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
IBus upstream issue 484 ; Pack the gob2 generation source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	16 Sep 2009 03:45:42 -0000	1.12
+++ .cvsignore	17 Sep 2009 05:24:24 -0000	1.13
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090916-Source.tar.gz
+ibus-chewing-1.2.0.20090917-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ibus-chewing.spec	16 Sep 2009 03:45:42 -0000	1.13
+++ ibus-chewing.spec	17 Sep 2009 05:24:24 -0000	1.14
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090916
+Version:    1.2.0.20090917
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090916-1
+* Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.
 - Pack the gob2 generation source to avoid the [Bug 519108]:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	16 Sep 2009 03:45:42 -0000	1.8
+++ import.log	17 Sep 2009 05:24:24 -0000	1.9
@@ -6,3 +6,4 @@ ibus-chewing-0_1_1_20090129-2_fc10:F-10:
 ibus-chewing-1_0_10_20090523-1_fc11:F-10:ibus-chewing-1.0.10.20090523-1.fc11.src.rpm:1242970551
 ibus-chewing-1_0_10_20090523-2_fc11:F-10:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242973527
 ibus-chewing-1_2_0_20090916-1_fc11:F-10:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253072451
+ibus-chewing-1_2_0_20090917-1_fc11:F-10:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253165032


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Sep 2009 03:45:42 -0000	1.14
+++ sources	17 Sep 2009 05:24:24 -0000	1.15
@@ -1 +1 @@
-cc593bdb4a5254645960fdef3f35dcce  ibus-chewing-1.2.0.20090916-Source.tar.gz
+b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz



From peter at fedoraproject.org  Thu Sep 17 05:36:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:36:47 +0000 (UTC)
Subject: rpms/fuse-sshfs/devel fuse-sshfs.spec,1.16,1.17
Message-ID: <20090917053647.148D011C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-sshfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17848

Modified Files:
	fuse-sshfs.spec 
Log Message:
rebuilt with new fuse


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fuse-sshfs.spec	24 Jul 2009 23:20:41 -0000	1.16
+++ fuse-sshfs.spec	17 Sep 2009 05:36:46 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           fuse-sshfs
 Version:        2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
@@ -8,7 +8,7 @@ License:        GPLv2
 URL:            http://fuse.sourceforge.net/sshfs.html
 Source0:        http://downloads.sourceforge.net/fuse/sshfs-fuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       sshfs = %{version}
+Provides:       sshfs = %{version}-%{release}
 Requires:       fuse >= 2.2
 Requires:	openssh-clients >= 4.4
 BuildRequires:  fuse-devel >= 2.2
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-4
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -68,10 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 - Added provides: sshfs
 - Modified License field according to Fedora policy.
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2
 - Rebuild for FC6
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1
 - New version
 - Rebuild for FC6
 



From peter at fedoraproject.org  Thu Sep 17 05:39:27 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:39:27 +0000 (UTC)
Subject: rpms/fuse-python/devel fuse-python.spec,1.7,1.8
Message-ID: <20090917053927.EE92011C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19450

Modified Files:
	fuse-python.spec 
Log Message:
rebuilt with new fuse


Index: fuse-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-python/devel/fuse-python.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fuse-python.spec	24 Jul 2009 23:19:53 -0000	1.7
+++ fuse-python.spec	17 Sep 2009 05:39:27 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           fuse-python
 Version:        0.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Python bindings for FUSE - filesystem in userspace
 
 Group:          System Environment/Base
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 0.2-12
+- rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 05:44:33 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:44:33 +0000 (UTC)
Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.30,1.31
Message-ID: <20090917054433.71E9F11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-encfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21295

Modified Files:
	fuse-encfs.spec 
Log Message:
rebuilt with new fuse


Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fuse-encfs.spec	21 Aug 2009 13:26:38 -0000	1.30
+++ fuse-encfs.spec	17 Sep 2009 05:44:33 -0000	1.31
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -10,7 +10,7 @@ Source1:	http://encfs.googlecode.com/fil
 Patch0:		encfs-1.5-const.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	fuse >= 2.6
-Provides:	encfs = %{version}
+Provides:	encfs = %{version}-%{release}
 BuildRequires:	rlog-devel >= 1.3
 BuildRequires:	openssl-devel
 BuildRequires:	boost-devel
@@ -54,6 +54,9 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-9
+- rebuilt with new fuse
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-8
 - rebuilt with new openssl
 



From peter at fedoraproject.org  Thu Sep 17 05:47:23 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:47:23 +0000 (UTC)
Subject: rpms/afuse/devel afuse.spec,1.4,1.5
Message-ID: <20090917054723.594D411C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/afuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22224

Modified Files:
	afuse.spec 
Log Message:
rebuilt with new fuse


Index: afuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afuse/devel/afuse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- afuse.spec	17 Aug 2009 17:22:13 -0000	1.4
+++ afuse.spec	17 Sep 2009 05:47:21 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		afuse
-Summary: 	An automounter implemented with FUSE
+Summary:	An automounter implemented with FUSE
 Version:	0.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://downloads.sourceforge.net/afuse/%{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %{_bindir}/afuse
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.2-5
+- Rebuilt with new fuse
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2-4
 - fix CVS-2008-2232
 



From peter at fedoraproject.org  Thu Sep 17 05:50:07 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:50:07 +0000 (UTC)
Subject: rpms/curlftpfs/devel curlftpfs.spec,1.9,1.10
Message-ID: <20090917055007.6703A11C0337@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/curlftpfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23148

Modified Files:
	curlftpfs.spec 
Log Message:
rebuilt with new fuse


Index: curlftpfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curlftpfs/devel/curlftpfs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- curlftpfs.spec	24 Jul 2009 19:49:54 -0000	1.9
+++ curlftpfs.spec	17 Sep 2009 05:50:07 -0000	1.10
@@ -1,6 +1,6 @@
 Name: curlftpfs
 Version: 0.9.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl
 URL: http://curlftpfs.sourceforge.net/
 # Code does not specify a version of the license.
@@ -39,6 +39,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %doc COPYING
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.9.1-6
+- Rebuild with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 05:54:49 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:54:49 +0000 (UTC)
Subject: rpms/davfs2/devel davfs2.spec,1.2,1.3
Message-ID: <20090917055449.E41F211C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/davfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24825

Modified Files:
	davfs2.spec 
Log Message:
rebuilt with new fuse


Index: davfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/davfs2/devel/davfs2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- davfs2.spec	24 Jul 2009 19:59:07 -0000	1.2
+++ davfs2.spec	17 Sep 2009 05:54:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           davfs2
 Version:        1.3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A filesystem driver for WebDAV
 Group:          System Environment/Base
 License:        GPLv2+
@@ -19,7 +19,7 @@ Requires(pre):  shadow-utils
 
 %description
 davfs2 is a Linux file system driver that allows you to mount a WebDAV server
-as a disk drive. 
+as a disk drive.
 
 %prep
 %setup -q
@@ -61,7 +61,7 @@ getent passwd %{username} >/dev/null || 
   useradd -r -g %{groupname} -d %{cachedir} -s /sbin/nologin \
           -c "User account for %{name}" %{username}
 exit 0
-   
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -93,6 +93,9 @@ exit 0
 %dir %attr(01775,root,%{groupname}) %{piddir}
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.3.3-4
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 05:57:15 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:57:15 +0000 (UTC)
Subject: rpms/davfs2/devel davfs2.spec,1.3,1.4
Message-ID: <20090917055715.9EBA911C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/davfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25771

Modified Files:
	davfs2.spec 
Log Message:
rebuilt with new fuse


Index: davfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/davfs2/devel/davfs2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- davfs2.spec	17 Sep 2009 05:54:49 -0000	1.3
+++ davfs2.spec	17 Sep 2009 05:57:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           davfs2
 Version:        1.3.3
-Release:        4%{?dist}
+Release:        55555%{?dist}
 Summary:        A filesystem driver for WebDAV
 Group:          System Environment/Base
 License:        GPLv2+
@@ -93,6 +93,9 @@ exit 0
 %dir %attr(01775,root,%{groupname}) %{piddir}
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.3.3-5
+- bump
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.3.3-4
 - Rebuilt with new fuse
 



From peter at fedoraproject.org  Thu Sep 17 05:58:07 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 05:58:07 +0000 (UTC)
Subject: rpms/davfs2/devel davfs2.spec,1.4,1.5
Message-ID: <20090917055807.C3AD611C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/davfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26202

Modified Files:
	davfs2.spec 
Log Message:
rebuilt with new fuse


Index: davfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/davfs2/devel/davfs2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- davfs2.spec	17 Sep 2009 05:57:14 -0000	1.4
+++ davfs2.spec	17 Sep 2009 05:58:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           davfs2
 Version:        1.3.3
-Release:        55555%{?dist}
+Release:        5%{?dist}
 Summary:        A filesystem driver for WebDAV
 Group:          System Environment/Base
 License:        GPLv2+



From peter at fedoraproject.org  Thu Sep 17 06:01:12 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:01:12 +0000 (UTC)
Subject: rpms/afpfs-ng/devel afpfs-ng.spec,1.4,1.5
Message-ID: <20090917060112.050C111C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/afpfs-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	afpfs-ng.spec 
Log Message:
rebuilt with new fuse


Index: afpfs-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afpfs-ng/devel/afpfs-ng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- afpfs-ng.spec	24 Jul 2009 16:37:37 -0000	1.4
+++ afpfs-ng.spec	17 Sep 2009 06:01:11 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           afpfs-ng
 Version:        0.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Apple Filing Protocol client
 
 Group:          System Environment/Base
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.8.1-6
+- Rebuild with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:04:04 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:04:04 +0000 (UTC)
Subject: rpms/funionfs/devel funionfs.spec,1.6,1.7
Message-ID: <20090917060404.A414B11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/funionfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28351

Modified Files:
	funionfs.spec 
Log Message:
rebuilt with new fuse


Index: funionfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funionfs/devel/funionfs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- funionfs.spec	24 Jul 2009 23:17:28 -0000	1.6
+++ funionfs.spec	17 Sep 2009 06:04:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           funionfs
 Version:        0.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Union filesystem in userspace
 
 Group:          System Environment/Base
@@ -40,6 +40,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.4.3-6
+- Rebuild with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:06:58 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:06:58 +0000 (UTC)
Subject: rpms/fuse-convmvfs/devel fuse-convmvfs.spec,1.9,1.10
Message-ID: <20090917060658.48C1811C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-convmvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29324

Modified Files:
	fuse-convmvfs.spec 
Log Message:
rebuilt with new fuse


Index: fuse-convmvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-convmvfs/devel/fuse-convmvfs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fuse-convmvfs.spec	24 Jul 2009 23:18:16 -0000	1.9
+++ fuse-convmvfs.spec	17 Sep 2009 06:06:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fuse-convmvfs
 Version:        0.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        FUSE-Filesystem to convert filesystem encodings
 
 Group:          System Environment/Base
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.2.4-10
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:11:02 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:11:02 +0000 (UTC)
Subject: rpms/fuse-s3fs/devel fuse-s3fs.spec,1.8,1.9
Message-ID: <20090917061102.D294711C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-s3fs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32057

Modified Files:
	fuse-s3fs.spec 
Log Message:
rebuilt with new fuse


Index: fuse-s3fs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-s3fs/devel/fuse-s3fs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fuse-s3fs.spec	24 Jul 2009 23:20:10 -0000	1.8
+++ fuse-s3fs.spec	17 Sep 2009 06:11:02 -0000	1.9
@@ -1,13 +1,13 @@
-Name:		fuse-s3fs 
+Name:		fuse-s3fs
 Version:	0.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	FUSE filesystem using Amazon Simple Storage Service as storage
 Group:		System Environment/Base
 License:	GPLv2
 URL:		https://fedorahosted.org/s3fs
 Source0:	https://fedorahosted.org/releases/s/3/s3fs/%{name}-%{version}.tbz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	python fuse-python python-boto 
+Requires:	python fuse-python python-boto
 BuildArch:	noarch
 
 
@@ -40,11 +40,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING 
+%doc COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.7-4
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:14:41 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:14:41 +0000 (UTC)
Subject: rpms/fuse-smb/devel fuse-smb.spec,1.10,1.11
Message-ID: <20090917061441.8201511C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-smb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv990

Modified Files:
	fuse-smb.spec 
Log Message:
rebuilt with new fuse


Index: fuse-smb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-smb/devel/fuse-smb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fuse-smb.spec	24 Jul 2009 23:20:26 -0000	1.10
+++ fuse-smb.spec	17 Sep 2009 06:14:41 -0000	1.11
@@ -6,31 +6,31 @@
 %define userwrapper 1
 %endif
 
-Name: 		fuse-smb
-Summary: 	FUSE-Filesystem to fast and easy access remote resources via SMB
-Version: 	0.8.7
-Release: 	6%{?dist}
-License: 	GPLv2+
-Group: 		System Environment/Base
-URL: 		http://www.ricardis.tudelft.nl/~vincent/fusesmb/
+Name:		fuse-smb
+Summary:	FUSE-Filesystem to fast and easy access remote resources via SMB
+Version:	0.8.7
+Release:	7%{?dist}
+License:	GPLv2+
+Group:		System Environment/Base
+URL:		http://www.ricardis.tudelft.nl/~vincent/fusesmb/
 #moved to .rpmmacros
-#Packager: 	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
-Source0: 	http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-%{version}.tar.gz
+#Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
+Source0:	http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-%{version}.tar.gz
 %if %{userwrapper}
 Source1:	fusesmb.sh.fuse-smb
 Source2:	README.fedora.fuse-smb
 %endif
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #fuse-libs doesn't force to have fuse which is needed for fuse-smb
 #explicit Requires statement is required
-Requires: 	fuse >= 2.3
+Requires:	fuse >= 2.3
 #samba-common (fc<=6), libsmbclient (fc>6) and fuse-libs are implicity required by their .so files
 #Requires:		fuse-libs >= 2.3
 #Requires:		samba-common >= 3.0
 
 #fuse(-devel) 2.3 is a minimal required version
-BuildRequires: 	fuse-devel >= 2.3
+BuildRequires:	fuse-devel >= 2.3
 BuildRequires:	samba-client >= 3.0
 
 %if 0%{?fedora} > 6
@@ -38,14 +38,14 @@ BuildRequires:	samba-client >= 3.0
 BuildRequires: libsmbclient-devel >= 3.0
 %endif
 
-%description 
+%description
 With SMB for Fuse you can seamlessly browse your network neighbourhood
 as were it on your own filesystem.
 It's basically smbmount with a twist. Instead of mounting one Samba share
-at a time, you mount all workgroups, hosts and shares at once. Only when 
-you're accessing a share a connection is made to the remote computer. 
+at a time, you mount all workgroups, hosts and shares at once. Only when
+you're accessing a share a connection is made to the remote computer.
 
-%prep 
+%prep
 %setup -q -n fusesmb-%{version}
 %if %{userwrapper}
 cp %{SOURCE1} fusesmb.sh
@@ -56,7 +56,7 @@ cp %{SOURCE2} README.fedora
 %configure
 make %{?_smp_mflags}
 
-%install 
+%install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot}
 %if %{userwrapper}
@@ -64,15 +64,15 @@ mv %{buildroot}%{_bindir}/fusesmb %{buil
 cp fusesmb.sh %{buildroot}%{_bindir}/fusesmb
 %endif
 
-%clean 
+%clean
 #build dir is removed by --clean option
 rm -fr %{buildroot}
 
-%files 
-%defattr(0644,root,root,0755) 
+%files
+%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/fusesmb
 %attr(0755,root,root) %{_bindir}/fusesmb.cache
-#NEWS is empty in 0.8.5 and causes rpmlint's warning 
+#NEWS is empty in 0.8.5 and causes rpmlint's warning
 %doc AUTHORS ChangeLog COPYING INSTALL README TODO fusesmb.conf.ex
 %{_mandir}/man*/fusesmb.*
 
@@ -84,6 +84,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.8.7-7
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:17:07 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:17:07 +0000 (UTC)
Subject: rpms/fuse-zip/devel fuse-zip.spec,1.6,1.7
Message-ID: <20090917061707.5D61C11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1961

Modified Files:
	fuse-zip.spec 
Log Message:
rebuilt with new fuse


Index: fuse-zip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-zip/devel/fuse-zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fuse-zip.spec	24 Jul 2009 23:20:55 -0000	1.6
+++ fuse-zip.spec	17 Sep 2009 06:17:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fuse-zip
 Version:        0.2.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fuse-zip is a fs to navigate, extract, create and modify ZIP archives
 Group:          System Environment/Libraries
 License:        GPLv3+
@@ -16,16 +16,16 @@ BuildRequires:  libzip-devel, pkgconfig,
 Requires:       fuse
 
 %description
-fuse-zip is a FUSE file system to navigate, extract, create and modify 
+fuse-zip is a FUSE file system to navigate, extract, create and modify
 ZIP archives based in libzip implemented in C++.
 
-With fuse-zip you really can work with ZIP archives as real directories. 
-Unlike KIO or Gnome VFS, it can be used in any application without 
+With fuse-zip you really can work with ZIP archives as real directories.
+Unlike KIO or Gnome VFS, it can be used in any application without
 modifications.
 
-Unlike other FUSE filesystems, only fuse-zip provides write support 
-to ZIP archives. Also, fuse-zip is faster that all known implementations 
-on large archives with many files. 
+Unlike other FUSE filesystems, only fuse-zip provides write support
+to ZIP archives. Also, fuse-zip is faster that all known implementations
+on large archives with many files.
 
 %prep
 %setup -q
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.2.7-4
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:19:57 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:19:57 +0000 (UTC)
Subject: rpms/fusecompress/devel fusecompress.spec,1.15,1.16
Message-ID: <20090917061957.8836711C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2956

Modified Files:
	fusecompress.spec 
Log Message:
rebuilt with new fuse


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fusecompress.spec	24 Jul 2009 23:21:09 -0000	1.15
+++ fusecompress.spec	17 Sep 2009 06:19:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           fusecompress
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.5-3
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:22:14 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:22:14 +0000 (UTC)
Subject: rpms/fuseiso/devel fuseiso.spec,1.7,1.8
Message-ID: <20090917062214.BC45911C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuseiso/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3781

Modified Files:
	fuseiso.spec 
Log Message:
rebuilt with new fuse


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/devel/fuseiso.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fuseiso.spec	24 Jul 2009 23:21:23 -0000	1.7
+++ fuseiso.spec	17 Sep 2009 06:22:13 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		fuseiso
-Summary: 	FUSE support for ISO filesystem images
+Summary:	FUSE support for ISO filesystem images
 Version:	20070708
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
@@ -14,7 +14,7 @@ Requires:	fuse
 
 %description
 Mount ISO filesystem images as a non-root user. Currently supports
-plain ISO9660 Level 1 and 2, Rock Ridge, Joliet, zisofs. Supported image 
+plain ISO9660 Level 1 and 2, Rock Ridge, Joliet, zisofs. Supported image
 types: ISO, BIN (single track only), NRG, MDF, IMG (CCD).
 
 %prep
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fuseiso
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 20070708-8
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070708-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:25:50 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:25:50 +0000 (UTC)
Subject: rpms/glusterfs/devel glusterfs.spec,1.14,1.15
Message-ID: <20090917062550.2D22611C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/glusterfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038

Modified Files:
	glusterfs.spec 
Log Message:
rebuilt with new fuse


Index: glusterfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/devel/glusterfs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- glusterfs.spec	12 Sep 2009 17:38:59 -0000	1.14
+++ glusterfs.spec	17 Sep 2009 06:25:49 -0000	1.15
@@ -13,7 +13,7 @@
 Summary: Cluster File System
 Name: glusterfs
 Version: 2.0.6
-Release: 1%{?pre:.%{pre}}%{?dist}
+Release: 2%{?pre:.%{pre}}%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/
@@ -232,6 +232,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.6-2
+- Rebuilt with new fuse
+
 * Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.6-1
 - Update to 2.0.6.
 - No longer default to disable the client on RHEL5 (#522192).



From peter at fedoraproject.org  Thu Sep 17 06:27:44 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:27:44 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.154,1.155
Message-ID: <20090917062745.04E6911C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5975

Modified Files:
	gvfs.spec 
Log Message:
rebuilt with new fuse


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- gvfs.spec	7 Sep 2009 10:33:02 -0000	1.154
+++ gvfs.spec	17 Sep 2009 06:27:44 -0000	1.155
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -283,6 +283,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.3.6-2
+- Rebuilt with new fuse
+
 * Mon Sep  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.6-1
 - Update to 1.3.6
 



From peter at fedoraproject.org  Thu Sep 17 06:29:39 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:29:39 +0000 (UTC)
Subject: rpms/ifuse/devel ifuse.spec,1.6,1.7
Message-ID: <20090917062939.BACD311C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6585

Modified Files:
	ifuse.spec 
Log Message:
rebuilt with new fuse


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ifuse.spec	10 Aug 2009 15:28:59 -0000	1.6
+++ ifuse.spec	17 Sep 2009 06:29:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          ifuse
 Version:       0.9.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.3-2
+- Rebuilt with new fuse
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
 - Update to 0.9.3 release
 



From peter at fedoraproject.org  Thu Sep 17 06:31:55 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:31:55 +0000 (UTC)
Subject: rpms/ltspfs/devel ltspfs.spec,1.7,1.8
Message-ID: <20090917063155.536B111C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ltspfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7405

Modified Files:
	ltspfs.spec 
Log Message:
rebuilt with new fuse


Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/ltspfs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ltspfs.spec	25 Jul 2009 11:23:03 -0000	1.7
+++ ltspfs.spec	17 Sep 2009 06:31:51 -0000	1.8
@@ -2,7 +2,7 @@ Name:           ltspfs
 Version:        0.5.8
 %define _datestamp .20081211.20
 #Release:        2%{_datestamp}%{?dist}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        LTSP file system, daemon that runs on thin clients
 
 Group:          System Environment/Base
@@ -18,7 +18,7 @@ BuildRequires: glib2-devel
 Requires:      dkms-fuse
 %endif
 
-%package -n ltspfsd 
+%package -n ltspfsd
 Group:          System Environment/Base
 Summary:        LTSP file system, userspace FUSE module that runs on a server
 Requires:      xorg-x11-utils
@@ -32,7 +32,7 @@ Fuse based remote filesystem for LTSP th
  This package contains the userspace parts for the LTSP server.
 
 
-%description -n ltspfsd 
+%description -n ltspfsd
 Fuse based remote filesystem daemon for LTSP thin clients
  LtspFS is a remote filesystem consisting of two parts:
  1) A network server daemon that runs on the LTSP terminal.
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/run/devices/
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.5.8-4
+- Rebuilt with new fuse
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:35:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:35:06 +0000 (UTC)
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.49,1.50
Message-ID: <20090917063506.8953D11C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ntfs-3g/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8791

Modified Files:
	ntfs-3g.spec 
Log Message:
rebuilt with new fuse


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ntfs-3g.spec	25 Jul 2009 19:37:49 -0000	1.49
+++ ntfs-3g.spec	17 Sep 2009 06:35:06 -0000	1.50
@@ -3,9 +3,9 @@
 %define with_externalfuse %{?_with_externalfuse:1}%{!?_with_externalfuse:0}
 
 Name:		ntfs-3g
-Summary: 	Linux NTFS userspace driver 
+Summary:	Linux NTFS userspace driver
 Version:	2009.4.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
@@ -23,17 +23,17 @@ Obsoletes:	ntfsprogs-fuse
 Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
-The ntfs-3g driver is an open source, GPL licensed, third generation 
-Linux NTFS driver. It provides full read-write access to NTFS, excluding 
-access to encrypted files, writing compressed files, changing file 
+The ntfs-3g driver is an open source, GPL licensed, third generation
+Linux NTFS driver. It provides full read-write access to NTFS, excluding
+access to encrypted files, writing compressed files, changing file
 ownership, access right.
 
-Technically it?s based on and a major improvement to the third 
-generation Linux NTFS driver, ntfsmount. The improvements include 
+Technically it?s based on and a major improvement to the third
+generation Linux NTFS driver, ntfsmount. The improvements include
 functionality, quality and performance enhancements.
 
-ntfs-3g features are being merged to ntfsmount. In the meanwhile, 
-ntfs-3g is currently the only free, as in either speech or beer, NTFS 
+ntfs-3g features are being merged to ntfsmount. In the meanwhile,
+ntfs-3g is currently the only free, as in either speech or beer, NTFS
 driver for Linux that supports unlimited file creation and deletion.
 
 %package devel
@@ -43,7 +43,7 @@ Requires:	%{name} = %{epoch}:%{version}-
 Requires:	pkgconfig
 
 %description devel
-Headers and libraries for developing applications that use ntfs-3g 
+Headers and libraries for developing applications that use ntfs-3g
 functionality.
 
 %prep
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 2:2009.4.4-3
+- Rebuilt with new fuse
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2009.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:37:05 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:37:05 +0000 (UTC)
Subject: rpms/obexfs/devel obexfs.spec,1.8,1.9
Message-ID: <20090917063705.F1B1611C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/obexfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9688

Modified Files:
	obexfs.spec 
Log Message:
rebuilt with new fuse


Index: obexfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexfs/devel/obexfs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- obexfs.spec	14 Sep 2009 13:50:42 -0000	1.8
+++ obexfs.spec	17 Sep 2009 06:37:04 -0000	1.9
@@ -2,7 +2,7 @@ Name: obexfs
 Summary: FUSE based filesystem using ObexFTP
 Group: System Environment/Base
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
 Source: http://downloads.sourceforge.net/openobex/%{name}-%{version}.tar.gz
@@ -35,6 +35,9 @@ to mobile phones.
 %{_bindir}/obexfs
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.12-2
+- Rebuild with new fuse
+
 * Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.12-1
 - updated to 0.12
 - changed source URL to sourceforge



From peter at fedoraproject.org  Thu Sep 17 06:39:19 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:39:19 +0000 (UTC)
Subject: rpms/wdfs/devel wdfs.spec,1.8,1.9
Message-ID: <20090917063919.584F111C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/wdfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10869

Modified Files:
	wdfs.spec 
Log Message:
rebuilt with new fuse


Index: wdfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdfs/devel/wdfs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wdfs.spec	27 Jul 2009 07:07:05 -0000	1.8
+++ wdfs.spec	17 Sep 2009 06:39:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           wdfs
 Version:        1.4.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        WebDAV File System
 
 Group:          System Environment/Base
@@ -39,6 +39,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/wdfs
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.4.2-9
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:46:53 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:46:53 +0000 (UTC)
Subject: rpms/FUR/devel FUR.spec,1.1,1.2
Message-ID: <20090917064653.E70A611C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/FUR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14567

Modified Files:
	FUR.spec 
Log Message:
rebuilt with new fuse


Index: FUR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/FUR/devel/FUR.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- FUR.spec	31 Jul 2009 05:22:49 -0000	1.1
+++ FUR.spec	17 Sep 2009 06:46:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           FUR
 Version:        0.4.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mount a Windows CE based device on your Linux file system
 
 Group:          Applications/System
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.4.6-3
+- Rebuild with new fuse
+
 * Wed Jul 29 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.4.6-2
 - fixes proposed by Peter L. during review (#514310)
 



From peter at fedoraproject.org  Thu Sep 17 06:49:14 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:49:14 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.18,1.19
Message-ID: <20090917064914.C6CC411C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15840

Modified Files:
	barry.spec 
Log Message:
rebuilt with new fuse


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- barry.spec	24 Jul 2009 17:51:33 -0000	1.18
+++ barry.spec	17 Sep 2009 06:49:14 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:           barry
 Version:        0.15
-Release:        0.8.20090630git%{?dist}
+Release:        0.9.20090630git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -212,6 +212,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.15-0.9.20090630git
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-0.8.20090630git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 17 06:50:57 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 17 Sep 2009 06:50:57 +0000 (UTC)
Subject: rpms/bindfs/devel bindfs.spec,1.5,1.6
Message-ID: <20090917065057.0542311C00CE@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/bindfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16409

Modified Files:
	bindfs.spec 
Log Message:
rebuilt with new fuse


Index: bindfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bindfs/devel/bindfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bindfs.spec	24 Jul 2009 18:03:19 -0000	1.5
+++ bindfs.spec	17 Sep 2009 06:50:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           bindfs
 Version:        1.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fuse filesystem to mirror a directory
 
 Group:          System Environment/Base
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.8.3-3
+- Rebuilt with new fuse
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Thu Sep 17 06:58:01 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 17 Sep 2009 06:58:01 +0000 (UTC)
Subject: rpms/bouncycastle-mail/devel bouncycastle-mail.spec,1.10,1.11
Message-ID: <20090917065802.011D411C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19749

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-5
- Similar fixes proposed in RHBZ#521475, namely:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %javac and %jar macros.
- Run test suite during build (ignoring failures for now).
- Follow upstream in excluding various test suite classes from jar.
- Add BR: junit4



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bouncycastle-mail.spec	26 Aug 2009 22:09:10 -0000	1.10
+++ bouncycastle-mail.spec	17 Sep 2009 06:58:01 -0000	1.11
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.43
-Release:          4%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -32,8 +32,9 @@ BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    javamail
 Requires:         javamail
+BuildRequires:    junit4
 
-Provides:         bcmail == %{version}-%{release}
+Provides:         bcmail = %{version}-%{release}
 
 %description
 Bouncy Castle consists of a lightweight cryptography API and is a provider 
@@ -61,13 +62,14 @@ find . -type f -name "*.jar" -exec rm -f
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4 bcprov javamail)
-  javac -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcmail-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* , cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+  test -n "$mf" && %jar cvfm $jarfile $mf $files \
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -97,6 +99,16 @@ install -dm 755 $RPM_BUILD_ROOT%{_mavenp
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcmail.pom
 %add_to_maven_depmap org.bouncycastle bcmail-jdk16 %{version} JPP bcmail
 
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4 javamail bcprov)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    # TODO: failures; get them fixed and remove || :
+    %java org.junit.runner.JUnitCore $test || :
+  done
+popd
+
 %post
 %update_maven_depmap
 %if %{with_gcj}
@@ -133,6 +145,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-5
+- Similar fixes proposed in RHBZ#521475, namely:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build (ignoring failures for now).
+- Follow upstream in excluding various test suite classes from jar.
+- Add BR: junit4
+
 * Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-4
 - Add maven POM
 



From oget at fedoraproject.org  Thu Sep 17 06:59:13 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 17 Sep 2009 06:59:13 +0000 (UTC)
Subject: rpms/bouncycastle-tsp/devel bouncycastle-tsp.spec,1.4,1.5
Message-ID: <20090917065913.14A3511C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-tsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20249

Modified Files:
	bouncycastle-tsp.spec 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-6
- Similar fixes proposed in RHBZ#521475, namely:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %javac and %jar macros.
- Run test suite during build.
- Follow upstream in excluding various test suite classes from jar.
- Remove R: junit4



Index: bouncycastle-tsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-tsp/devel/bouncycastle-tsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bouncycastle-tsp.spec	26 Aug 2009 22:08:28 -0000	1.4
+++ bouncycastle-tsp.spec	17 Sep 2009 06:59:12 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:          TSP libraries for Bouncy Castle
 Name:             bouncycastle-tsp
 Version:          1.43
-Release:          5%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -28,7 +28,6 @@ Requires:         bouncycastle-mail = %{
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    junit4
-Requires:         junit4
 
 Provides:         bctsp = %{version}-%{release}
 
@@ -58,13 +57,14 @@ find . -type f -name "*.jar" -exec rm -f
 %build
 pushd src
   export CLASSPATH=$(build-classpath bcprov bcmail junit4)
-  javac -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bctsp-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* , cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+  test -n "$mf" && %jar cvfm $jarfile $mf $files \
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -94,6 +94,15 @@ install -dm 755 $RPM_BUILD_ROOT%{_mavenp
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bctsp.pom
 %add_to_maven_depmap org.bouncycastle bctsp-jdk16 %{version} JPP bctsp
 
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4 bcprov bcmail)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    %java org.junit.runner.JUnitCore $test
+  done
+popd
+
 %post
 %update_maven_depmap
 %if %{with_gcj}
@@ -130,6 +139,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}/
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-6
+- Similar fixes proposed in RHBZ#521475, namely:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build.
+- Follow upstream in excluding various test suite classes from jar.
+- Remove R: junit4
+
 * Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
 - Add maven POM
 



From pkgdb at fedoraproject.org  Thu Sep 17 07:00:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:00:21 +0000
Subject: [pkgdb] quotatool was added for xiashing
Message-ID: <20090917070021.8A57310F884@bastion2.fedora.phx.redhat.com>

huzaifas has added Package quotatool with summary quotatool is a utility to set filesystem quotas from the commandline. It is suitable for use in scripts and other non-interactive situations.
huzaifas has approved Package quotatool
huzaifas has added a Fedora devel branch for quotatool with an owner of xiashing
huzaifas has approved quotatool in Fedora devel
huzaifas has approved Package quotatool
huzaifas has set commit to Approved for 107427 on quotatool (Fedora devel)
huzaifas has set checkout to Approved for 107427 on quotatool (Fedora devel)
huzaifas has set build to Approved for 107427 on quotatool (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quotatool



From pkgdb at fedoraproject.org  Thu Sep 17 07:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:00:33 +0000
Subject: [pkgdb] quotatool summary updated by huzaifas
Message-ID: <20090917070033.7B2A210F867@bastion2.fedora.phx.redhat.com>

huzaifas set package quotatool summary to quotatool is a utility to set filesystem quotas from the
commandline. It is suitable for use in scripts and other non-interactive
situations.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quotatool



From pkgdb at fedoraproject.org  Thu Sep 17 07:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:00:33 +0000
Subject: [pkgdb] quotatool (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20090917070033.8F9EA10F895@bastion2.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for quotatool
huzaifas has set commit to Approved for 107427 on quotatool (Fedora EPEL 5)
huzaifas has set checkout to Approved for 107427 on quotatool (Fedora EPEL 5)
huzaifas has set build to Approved for 107427 on quotatool (Fedora EPEL 5)
huzaifas approved watchbugzilla on quotatool (Fedora EPEL 5) for spot
huzaifas approved watchcommits on quotatool (Fedora EPEL 5) for spot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quotatool



From pkgdb at fedoraproject.org  Thu Sep 17 07:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:00:33 +0000
Subject: [pkgdb] quotatool (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20090917070033.B07B910F898@bastion2.fedora.phx.redhat.com>

huzaifas added a Fedora 11 branch for quotatool
huzaifas has set commit to Approved for 107427 on quotatool (Fedora 11)
huzaifas has set checkout to Approved for 107427 on quotatool (Fedora 11)
huzaifas has set build to Approved for 107427 on quotatool (Fedora 11)
huzaifas approved watchbugzilla on quotatool (Fedora 11) for spot
huzaifas approved watchcommits on quotatool (Fedora 11) for spot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quotatool



From pkgdb at fedoraproject.org  Thu Sep 17 07:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:00:33 +0000
Subject: [pkgdb] quotatool (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20090917070033.B660810F89C@bastion2.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on quotatool (Fedora devel) for spot
huzaifas approved watchcommits on quotatool (Fedora devel) for spot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quotatool



From huzaifas at fedoraproject.org  Thu Sep 17 07:02:19 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 17 Sep 2009 07:02:19 +0000 (UTC)
Subject: rpms/quotatool - New directory
Message-ID: <20090917070219.82D5A11C00CE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/quotatool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsy21087/rpms/quotatool

Log Message:
Directory /cvs/pkgs/rpms/quotatool added to the repository




From huzaifas at fedoraproject.org  Thu Sep 17 07:02:20 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 17 Sep 2009 07:02:20 +0000 (UTC)
Subject: rpms/quotatool/devel - New directory
Message-ID: <20090917070220.411B011C00CE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/quotatool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsy21087/rpms/quotatool/devel

Log Message:
Directory /cvs/pkgs/rpms/quotatool/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 17 07:03:04 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 17 Sep 2009 07:03:04 +0000 (UTC)
Subject: rpms/quotatool Makefile,NONE,1.1
Message-ID: <20090917070304.5034411C00CE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/quotatool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsy21087/rpms/quotatool

Added Files:
	Makefile 
Log Message:
Setup of module quotatool


--- NEW FILE Makefile ---
# Top level Makefile for module quotatool
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 huzaifas at fedoraproject.org  Thu Sep 17 07:03:06 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 17 Sep 2009 07:03:06 +0000 (UTC)
Subject: rpms/quotatool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090917070306.6A2F911C00CE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/quotatool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsy21087/rpms/quotatool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module quotatool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: quotatool
# $Id: Makefile,v 1.1 2009/09/17 07:03:04 huzaifas Exp $
NAME := quotatool
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 oget at fedoraproject.org  Thu Sep 17 07:13:32 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 17 Sep 2009 07:13:32 +0000 (UTC)
Subject: rpms/bouncycastle/F-11 bcprov-jdk16-1.43.pom, NONE,
	1.1 bouncycastle.spec, 1.17, 1.18
Message-ID: <20090917071332.3776411C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25397

Modified Files:
	bouncycastle.spec 
Added Files:
	bcprov-jdk16-1.43.pom 
Log Message:
* Sun Sep  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.43-6
- Include improvements from #521475:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %%javac and %%jar macros.
- Run test suite during build (ignoring failures for now).
- Follow upstream in excluding various test suite classes from jar; drop
  dependency on junit4.

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
- Add maven POM



--- NEW FILE bcprov-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcprov-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle Provider</name>
  <version>1.43</version>
  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.6.</description>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
</project>

Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-11/bouncycastle.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- bouncycastle.spec	11 Jul 2009 17:47:01 -0000	1.17
+++ bouncycastle.spec	17 Sep 2009 07:13:28 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.43
-Release:          3%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -13,9 +13,12 @@ URL:              http://www.%{name}.org
 # is modified to
 # bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
 Source0:          bcprov-%{archivever}-FEDORA.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.43/bcprov-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -27,9 +30,8 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    junit4
-Requires:         junit4
 
-Provides:         bcprov == %{version}-%{release}
+Provides:         bcprov = %{version}-%{release}
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -59,13 +61,15 @@ unzip -qq src.zip -d src/
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4)
-  javac -g -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcprov-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
+  files="$files $(find . -type f -path '*/org/bouncycastle/util/test/*.class')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
   test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -93,6 +97,22 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+# maven pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom
+%add_to_maven_depmap org.bouncycastle bcprov-jdk16 %{version} JPP bcprov
+
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    # TODO: failures; get them fixed and remove || :
+    %java org.junit.runner.JUnitCore $test || :
+  done
+popd
+
+
 %post
 {
   # Rebuild the list of security providers in classpath.security
@@ -120,6 +140,7 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocd
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
+%update_maven_depmap
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -152,6 +173,7 @@ if [ $1 -eq 0 ] ; then
   %endif
 
 fi
+%update_maven_depmap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,12 +188,29 @@ rm -rf $RPM_BUILD_ROOT
   %{_libdir}/gcj/%{name}/
 %endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
+%{_mavenpomdir}/JPP-bcprov.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}/
 
 %changelog
+* Sun Sep  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.43-6
+- Include improvements from #521475:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build (ignoring failures for now).
+- Follow upstream in excluding various test suite classes from jar; drop
+  dependency on junit4.
+
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
+- Add maven POM
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-3
 - Raise java requirement to >= 1.7 once again.
 



From oget at fedoraproject.org  Thu Sep 17 07:19:58 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 17 Sep 2009 07:19:58 +0000 (UTC)
Subject: rpms/bouncycastle-mail/F-11 bcmail-jdk16-1.43.pom, NONE,
	1.1 bouncycastle-mail.spec, 1.8, 1.9
Message-ID: <20090917071958.3E6FA11C00CE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27953

Modified Files:
	bouncycastle-mail.spec 
Added Files:
	bcmail-jdk16-1.43.pom 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-5
- Similar fixes proposed in RHBZ#521475, namely:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %%javac and %%jar macros.
- Run test suite during build (ignoring failures for now).
- Follow upstream in excluding various test suite classes from jar.
- Add BR: junit4

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-4
- Add maven POM



--- NEW FILE bcmail-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcmail-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle CMS and S/MIME API</name>
  <version>1.43</version>
  <description>The Bouncy Castle Java CMS and S/MIME APIs for handling the CMS and S/MIME protocols. This jar contains CMS and S/MIME APIs for JDK 1.6. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. If the S/MIME API is used, the JavaMail API and the Java activation framework will also be needed.</description>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>org.bouncycastle</groupId>
      <artifactId>bcprov-jdk16</artifactId>
      <version>1.43</version>
      <type>jar</type>
    </dependency>
  </dependencies>
</project>

Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/bouncycastle-mail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bouncycastle-mail.spec	14 Jul 2009 22:37:19 -0000	1.8
+++ bouncycastle-mail.spec	17 Sep 2009 07:19:56 -0000	1.9
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.43
-Release:          2%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -12,10 +12,13 @@ URL:              http://www.bouncycastl
 # is modified to
 # bcmail-%{archivever}-FEDORA.tar.gz with references to patented algorithms removed.
 Source0:          bcmail-%{archivever}-FEDORA.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcmail-jdk16/1.43/bcmail-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle == %{version}
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -29,8 +32,9 @@ BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    javamail
 Requires:         javamail
+BuildRequires:    junit4
 
-Provides:         bcmail == %{version}-%{release}
+Provides:         bcmail = %{version}-%{release}
 
 %description
 Bouncy Castle consists of a lightweight cryptography API and is a provider 
@@ -58,13 +62,14 @@ find . -type f -name "*.jar" -exec rm -f
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4 bcprov javamail)
-  javac -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcmail-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* , cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+  test -n "$mf" && %jar cvfm $jarfile $mf $files \
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -89,15 +94,32 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{with_gcj}
+# maven pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcmail.pom
+%add_to_maven_depmap org.bouncycastle bcmail-jdk16 %{version} JPP bcmail
+
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4 javamail bcprov)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    # TODO: failures; get them fixed and remove || :
+    %java org.junit.runner.JUnitCore $test || :
+  done
+popd
+
 %post
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%if %{with_gcj}
 %postun
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -112,6 +134,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/bcmail.jar
 %{_javadir}/bcmail-%{version}.jar
 %{_javadir}/gcj-endorsed/bcmail-%{version}.jar
+%{_mavenpomdir}/JPP-bcmail.pom
+%{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
   %{_libdir}/gcj/%{name}/
 %endif
@@ -121,6 +145,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-5
+- Similar fixes proposed in RHBZ#521475, namely:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build (ignoring failures for now).
+- Follow upstream in excluding various test suite classes from jar.
+- Add BR: junit4
+
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-4
+- Add maven POM
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-2
 - Re-enable AOT bits thanks to Andrew Haley.
 



From oget at fedoraproject.org  Thu Sep 17 07:23:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 17 Sep 2009 07:23:54 +0000 (UTC)
Subject: rpms/bouncycastle-tsp/F-11 bctsp-jdk16-1.43.pom, NONE,
	1.1 bouncycastle-tsp.spec, 1.2, 1.3
Message-ID: <20090917072354.7275F11C0332@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-tsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30331

Modified Files:
	bouncycastle-tsp.spec 
Added Files:
	bctsp-jdk16-1.43.pom 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-6
- Similar fixes proposed in RHBZ#521475, namely:
- Include missing properties files in jar.
- Build with javac -encoding UTF-8.
- Use %%javac and %%jar macros.
- Run test suite during build.
- Follow upstream in excluding various test suite classes from jar.
- Remove R: junit4

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
- Add maven POM



--- NEW FILE bctsp-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bctsp-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle OpenPGP API</name>
  <version>1.43</version>
  <description>The Bouncy Castle Java API for handling the Time Stamp Protocol (TSP). This jar contains the TSP API for JDK 1.6. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>org.bouncycastle</groupId>
      <artifactId>bcprov-jdk16</artifactId>
      <version>1.43</version>
      <type>jar</type>
    </dependency>
    <dependency>
      <groupId>org.bouncycastle</groupId>
      <artifactId>bcmail-jdk16</artifactId>
      <version>1.43</version>
      <type>jar</type>
    </dependency>
  </dependencies>
</project>

Index: bouncycastle-tsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-tsp/F-11/bouncycastle-tsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bouncycastle-tsp.spec	15 Jul 2009 01:25:55 -0000	1.2
+++ bouncycastle-tsp.spec	17 Sep 2009 07:23:52 -0000	1.3
@@ -4,14 +4,17 @@
 Summary:          TSP libraries for Bouncy Castle
 Name:             bouncycastle-tsp
 Version:          1.43
-Release:          3%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
 Source0:          http://www.bouncycastle.org/download/bctsp-%{archivever}.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bctsp-jdk16/1.43/bctsp-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -25,7 +28,6 @@ Requires:         bouncycastle-mail = %{
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    junit4
-Requires:         junit4
 
 Provides:         bctsp = %{version}-%{release}
 
@@ -55,13 +57,14 @@ find . -type f -name "*.jar" -exec rm -f
 %build
 pushd src
   export CLASSPATH=$(build-classpath bcprov bcmail junit4)
-  javac -target 1.5 `find . -type f -name "*.java"`
+  %javac -g -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bctsp-%{version}.jar"
-  files="`find . -type f -name "*.class"`"
+  # Exclude all */test/* , cf. upstream
+  files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && jar cvfm $jarfile $mf $files \
-    || jar cvf $jarfile $files
+  test -n "$mf" && %jar cvfm $jarfile $mf $files \
+    || %jar cvf $jarfile $files
 popd
 
 %install
@@ -86,15 +89,31 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{with_gcj}
+# maven pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bctsp.pom
+%add_to_maven_depmap org.bouncycastle bctsp-jdk16 %{version} JPP bctsp
+
+%check
+pushd src
+  export CLASSPATH=$PWD:$(build-classpath junit4 bcprov bcmail)
+  for test in $(find . -name AllTests.class) ; do
+    test=${test#./} ; test=${test%.class} ; test=${test//\//.}
+    %java org.junit.runner.JUnitCore $test
+  done
+popd
+
 %post
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%if %{with_gcj}
 %postun
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -109,6 +128,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/bctsp.jar
 %{_javadir}/bctsp-%{version}.jar
 %{_javadir}/gcj-endorsed/bctsp-%{version}.jar
+%{_mavenpomdir}/JPP-bctsp.pom
+%{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
   %{_libdir}/gcj/%{name}/
 %endif
@@ -118,6 +139,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}/
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-6
+- Similar fixes proposed in RHBZ#521475, namely:
+- Include missing properties files in jar.
+- Build with javac -encoding UTF-8.
+- Use %%javac and %%jar macros.
+- Run test suite during build.
+- Follow upstream in excluding various test suite classes from jar.
+- Remove R: junit4
+
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
+- Add maven POM
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-3
 - Re-enable AOT bits thanks to Andrew Haley.
 



From pkgdb at fedoraproject.org  Thu Sep 17 07:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:24:20 +0000
Subject: [pkgdb] gdb: pmuldoon has requested watchbugzilla
Message-ID: <20090917072420.6539810F884@bastion2.fedora.phx.redhat.com>

pmuldoon has requested the watchbugzilla acl on gdb (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gdb



From pkgdb at fedoraproject.org  Thu Sep 17 07:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:24:36 +0000
Subject: [pkgdb] gdb: pmuldoon has requested watchbugzilla
Message-ID: <20090917072436.6FC2810F881@bastion2.fedora.phx.redhat.com>

pmuldoon has requested the watchbugzilla acl on gdb (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gdb



From pkgdb at fedoraproject.org  Thu Sep 17 07:27:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:27:44 +0000
Subject: [pkgdb] gdb had acl change status
Message-ID: <20090917072744.86B6310F881@bastion2.fedora.phx.redhat.com>

jkratoch has set the watchbugzilla acl on gdb (Fedora devel) to Approved for pmuldoon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gdb



From pkgdb at fedoraproject.org  Thu Sep 17 07:27:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:27:52 +0000
Subject: [pkgdb] gdb had acl change status
Message-ID: <20090917072753.0C4CD10F886@bastion2.fedora.phx.redhat.com>

jkratoch has set the watchbugzilla acl on gdb (Fedora 11) to Approved for pmuldoon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gdb



From pkgdb at fedoraproject.org  Thu Sep 17 07:38:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:38:07 +0000
Subject: [pkgdb] diffuse: fab has requested watchbugzilla
Message-ID: <20090917073806.C72DE10F867@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on diffuse (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/diffuse



From pkgdb at fedoraproject.org  Thu Sep 17 07:38:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:38:12 +0000
Subject: [pkgdb] diffuse: fab has requested watchcommits
Message-ID: <20090917073813.518A210F886@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on diffuse (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/diffuse



From pkgdb at fedoraproject.org  Thu Sep 17 07:38:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:38:15 +0000
Subject: [pkgdb] diffuse: fab has requested commit
Message-ID: <20090917073815.2DE3210F894@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on diffuse (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/diffuse



From pkgdb at fedoraproject.org  Thu Sep 17 07:38:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:38:25 +0000
Subject: [pkgdb] diffuse: fab has requested watchbugzilla
Message-ID: <20090917073823.ED68710F867@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on diffuse (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/diffuse



From pkgdb at fedoraproject.org  Thu Sep 17 07:38:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:38:27 +0000
Subject: [pkgdb] diffuse: fab has requested watchcommits
Message-ID: <20090917073826.778BE10F89A@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on diffuse (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/diffuse



From pkgdb at fedoraproject.org  Thu Sep 17 07:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 07:38:28 +0000
Subject: [pkgdb] diffuse: fab has requested commit
Message-ID: <20090917073828.28EFD10F89E@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on diffuse (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/diffuse



From sharkcz at fedoraproject.org  Thu Sep 17 07:47:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 07:47:53 +0000 (UTC)
Subject: rpms/hercules/devel hercules-3.06-ltdl.patch, 1.1, 1.2 hercules.spec,
	1.26, 1.27
Message-ID: <20090917074754.2466E11C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6703

Modified Files:
	hercules-3.06-ltdl.patch hercules.spec 
Log Message:
* Thu Sep 17 2009 Dan Hor?k <dan[at]danny.cz> 3.06-5
- fixed module loading with libtool >= 2.0


hercules-3.06-ltdl.patch:
 b/Makefile.am |   11 
 b/hdl.h       |    4 
 ltdl.c        | 4501 ----------------------------------------------------------
 ltdl.h        |  367 ----
 4 files changed, 6 insertions(+), 4877 deletions(-)

Index: hercules-3.06-ltdl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules-3.06-ltdl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercules-3.06-ltdl.patch	18 Feb 2009 21:15:35 -0000	1.1
+++ hercules-3.06-ltdl.patch	17 Sep 2009 07:47:45 -0000	1.2
@@ -4944,3 +4944,31 @@ index ef0d161..0000000
 -- 
 1.6.0.6
 
+From 1c3de37f7a39676b028f3057131a5b9d7697b4fe Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Thu, 17 Sep 2009 08:35:39 +0200
+Subject: [PATCH] newer libtool (>=2.0) defines LT_MODULE_EXT in config.h instead of LDTL_SHLIB_EXT
+
+---
+ hdl.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/hdl.h b/hdl.h
+index 5dd2e54..b99f1e2 100644
+--- a/hdl.h
++++ b/hdl.h
+@@ -146,8 +146,11 @@ typedef struct _DLLENT {                /* DLL entry                 */
+ #endif
+ 
+ /* SHLIBEXT defined by ISW in configure.ac/config.h */
++/* newer libtool defines MODULE_EXT instead of SHLIB_EXT */
+ #if defined( HDL_BUILD_SHARED ) && defined( LTDL_SHLIB_EXT )
+   #define   HDL_MODULE_SUFFIX   LTDL_SHLIB_EXT
++#elif defined( HDL_BUILD_SHARED ) && defined( LT_MODULE_EXT )
++  #define   HDL_MODULE_SUFFIX   LT_MODULE_EXT
+ #else
+   #if defined(_MSVC_)
+     #define HDL_MODULE_SUFFIX   ".dll"
+-- 
+1.6.3.3
+


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- hercules.spec	7 Sep 2009 10:02:56 -0000	1.26
+++ hercules.spec	17 Sep 2009 07:47:45 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -102,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Thu Sep 17 2009 Dan Hor?k <dan[at]danny.cz> 3.06-5
+- fixed module loading with libtool >= 2.0
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-4
 - enable support for external gui
 



From tmraz at fedoraproject.org  Thu Sep 17 07:50:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 17 Sep 2009 07:50:44 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.77, 1.78 authconfig.spec, 1.108,
	1.109 sources, 1.85, 1.86
Message-ID: <20090917075044.06F5B11C0374@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8347

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Thu Sep 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.12-1
- fixed indentation error (#523534)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	14 Sep 2009 11:24:25 -0000	1.77
+++ .cvsignore	17 Sep 2009 07:50:42 -0000	1.78
@@ -1 +1 @@
-authconfig-5.4.11.tar.bz2
+authconfig-5.4.12.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- authconfig.spec	14 Sep 2009 11:24:25 -0000	1.108
+++ authconfig.spec	17 Sep 2009 07:50:42 -0000	1.109
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.11
+Version: 5.4.12
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -101,7 +101,10 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
-* Mon Sep 24 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.11-1
+* Thu Sep 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.12-1
+- fixed indentation error (#523534)
+
+* Mon Sep 14 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.11-1
 - updated translations (#522444)
 - silence failures when restarting services (#500385)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	14 Sep 2009 11:24:25 -0000	1.85
+++ sources	17 Sep 2009 07:50:42 -0000	1.86
@@ -1 +1 @@
-03ff93a37132c1d589b98b9c922e7671  authconfig-5.4.11.tar.bz2
+1f21aeb63aa175ad89143efd78cf846d  authconfig-5.4.12.tar.bz2



From sharkcz at fedoraproject.org  Thu Sep 17 07:52:48 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 07:52:48 +0000 (UTC)
Subject: rpms/hercules/F-11 hercules-3.06-ltdl.patch, 1.1, 1.2 hercules.spec,
	1.25, 1.26
Message-ID: <20090917075248.EE87811C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9707

Modified Files:
	hercules-3.06-ltdl.patch hercules.spec 
Log Message:
* Thu Sep 17 2009 Dan Hor?k <dan[at]danny.cz> 3.06-4
- fixed module loading with libtool >= 2.0


hercules-3.06-ltdl.patch:
 b/Makefile.am |   11 
 b/hdl.h       |    4 
 ltdl.c        | 4501 ----------------------------------------------------------
 ltdl.h        |  367 ----
 4 files changed, 6 insertions(+), 4877 deletions(-)

Index: hercules-3.06-ltdl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-11/hercules-3.06-ltdl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercules-3.06-ltdl.patch	18 Feb 2009 21:15:35 -0000	1.1
+++ hercules-3.06-ltdl.patch	17 Sep 2009 07:52:46 -0000	1.2
@@ -4944,3 +4944,31 @@ index ef0d161..0000000
 -- 
 1.6.0.6
 
+From 1c3de37f7a39676b028f3057131a5b9d7697b4fe Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Thu, 17 Sep 2009 08:35:39 +0200
+Subject: [PATCH] newer libtool (>=2.0) defines LT_MODULE_EXT in config.h instead of LDTL_SHLIB_EXT
+
+---
+ hdl.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/hdl.h b/hdl.h
+index 5dd2e54..b99f1e2 100644
+--- a/hdl.h
++++ b/hdl.h
+@@ -146,8 +146,11 @@ typedef struct _DLLENT {                /* DLL entry                 */
+ #endif
+ 
+ /* SHLIBEXT defined by ISW in configure.ac/config.h */
++/* newer libtool defines MODULE_EXT instead of SHLIB_EXT */
+ #if defined( HDL_BUILD_SHARED ) && defined( LTDL_SHLIB_EXT )
+   #define   HDL_MODULE_SUFFIX   LTDL_SHLIB_EXT
++#elif defined( HDL_BUILD_SHARED ) && defined( LT_MODULE_EXT )
++  #define   HDL_MODULE_SUFFIX   LT_MODULE_EXT
+ #else
+   #if defined(_MSVC_)
+     #define HDL_MODULE_SUFFIX   ".dll"
+-- 
+1.6.3.3
+


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-11/hercules.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- hercules.spec	7 Sep 2009 10:04:13 -0000	1.25
+++ hercules.spec	17 Sep 2009 07:52:47 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -102,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Thu Sep 17 2009 Dan Hor?k <dan[at]danny.cz> 3.06-4
+- fixed module loading with libtool >= 2.0
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> 3.06-3
 - enable support for external gui
 



From xiashing at fedoraproject.org  Thu Sep 17 07:56:06 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Thu, 17 Sep 2009 07:56:06 +0000 (UTC)
Subject: rpms/quotatool/devel import.log, NONE,
	1.1 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, NONE,
	1.1 quotatool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917075606.BAC4D11C00CE@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11302/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
	quotatool.spec 
Log Message:
Initial import (#520832)


--- NEW FILE import.log ---
quotatool-1_4_10-5_fc11:HEAD:quotatool-1.4.10-5.fc11.src.rpm:1253173885

quotatool-1.4.10_MAKEFILE_DESTDIR.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE quotatool-1.4.10_MAKEFILE_DESTDIR.patch ---
diff -up quotatool-1.4.10/Makefile.OLD quotatool-1.4.10/Makefile
--- quotatool-1.4.10/Makefile.OLD	2007-09-24 13:44:43.000000000 -0600
+++ quotatool-1.4.10/Makefile	2009-09-15 09:30:08.000000000 -0600
@@ -65,8 +65,8 @@ $(prog): $(objs) 
 men   :=   $(wildcard $(srcdir)/man/*)
 install: $(prog)
 	$(NORMAL_INSTALL)
-	$(INSTALL_PROGRAM) $(srcdir)/$(prog) $(bindir)/$(prog)
-	$(foreach man,$(men),$(INSTALL_DATA) $(man) $(mandir)/man$(subst .,,$(suffix $(man)))/$(notdir $(man)))
+	$(INSTALL_PROGRAM) $(srcdir)/$(prog) $(DESTDIR)$(bindir)/$(prog)
+	$(foreach man,$(men),$(INSTALL_DATA) $(man) $(DESTDIR)$(mandir)/man$(subst .,,$(suffix $(man)))/$(notdir $(man)))
 
 uninstall:
 	$(NORMAL_UNINSTALL)
@@ -88,8 +88,8 @@ clean: 
 	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(dirs)))
 	rm -f $(addsuffix /core,$(dirs))
 	rm -f $(prog) 
-	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(srcdir)/man))
-	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(srcdir)/tools))
+	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(DESTDIR)$(srcdir)/man))
+	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(DESTDIR)$(srcdir)/tools))
 
 
 dcfixes    :=   .d  


--- NEW FILE quotatool.spec ---
Name:           quotatool
Version:        1.4.10
Release:        5%{?dist}
Summary:        A utility to set filesystem quotas

Group:          Applications/System
License:        GPLv2
URL:            http://quotatool.ekenberg.se
Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz

#Patch makes the Makefile honor DESTDIR
#Upstream was sent an updated Makefile via email
Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Quotatool is a utility to set filesystem quotas from the commandline.
It is suitable for use in scripts and other non-interactive situations.

%prep
%setup -q
%patch0 -p1 -b .destdir

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8

make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
%{_bindir}/quotatool
%{_mandir}/man8/quotatool.8.gz

%changelog
* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 07:03:04 -0000	1.1
+++ .cvsignore	17 Sep 2009 07:56:06 -0000	1.2
@@ -0,0 +1 @@
+quotatool-1.4.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 07:03:05 -0000	1.1
+++ sources	17 Sep 2009 07:56:06 -0000	1.2
@@ -0,0 +1 @@
+d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz



From rrakus at fedoraproject.org  Thu Sep 17 08:01:23 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 17 Sep 2009 08:01:23 +0000 (UTC)
Subject: rpms/iprutils/devel .cvsignore, 1.17, 1.18 iprutils.spec, 1.39,
	1.40 sources, 1.18, 1.19
Message-ID: <20090917080123.DC51E11C0332@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/iprutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13588

Modified Files:
	.cvsignore iprutils.spec sources 
Log Message:
Version 2.2.17


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	17 Aug 2009 07:53:21 -0000	1.17
+++ .cvsignore	17 Sep 2009 08:01:19 -0000	1.18
@@ -1 +1 @@
-iprutils-2.2.16-src.tgz
+iprutils-2.2.17-src.tgz


Index: iprutils.spec
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- iprutils.spec	17 Aug 2009 07:53:21 -0000	1.39
+++ iprutils.spec	17 Sep 2009 08:01:19 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
-Version: 2.2.16
+Version: 2.2.17
 Release: 1%{?dist}
 License: CPL
 Group:   System Environment/Base
@@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make}
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Thu Sep 17 2009 Roman Rakus <rrakus at redhat.com> - 2.2.17-1
+- Version 2.2.17
+
 * Mon Aug 17 2009 Roman Rakus <rrakus at redhat.com> - 2.2.16-1
 - Bump to version 2.2.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	17 Aug 2009 07:53:21 -0000	1.18
+++ sources	17 Sep 2009 08:01:19 -0000	1.19
@@ -1 +1 @@
-611d469e77d94bb56d62a63ead4c0830  iprutils-2.2.16-src.tgz
+8b067fc42272d7883091b5ed44c47b42  iprutils-2.2.17-src.tgz



From xiashing at fedoraproject.org  Thu Sep 17 08:07:32 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Thu, 17 Sep 2009 08:07:32 +0000 (UTC)
Subject: rpms/quotatool/F-11 import.log, NONE,
	1.1 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, NONE,
	1.1 quotatool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917080732.310B811C00CE@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16360/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
	quotatool.spec 
Log Message:

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




--- NEW FILE import.log ---
quotatool-1_4_10-5_fc11:F-11:quotatool-1.4.10-5.fc11.src.rpm:1253174538

quotatool-1.4.10_MAKEFILE_DESTDIR.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE quotatool-1.4.10_MAKEFILE_DESTDIR.patch ---
diff -up quotatool-1.4.10/Makefile.OLD quotatool-1.4.10/Makefile
--- quotatool-1.4.10/Makefile.OLD	2007-09-24 13:44:43.000000000 -0600
+++ quotatool-1.4.10/Makefile	2009-09-15 09:30:08.000000000 -0600
@@ -65,8 +65,8 @@ $(prog): $(objs) 
 men   :=   $(wildcard $(srcdir)/man/*)
 install: $(prog)
 	$(NORMAL_INSTALL)
-	$(INSTALL_PROGRAM) $(srcdir)/$(prog) $(bindir)/$(prog)
-	$(foreach man,$(men),$(INSTALL_DATA) $(man) $(mandir)/man$(subst .,,$(suffix $(man)))/$(notdir $(man)))
+	$(INSTALL_PROGRAM) $(srcdir)/$(prog) $(DESTDIR)$(bindir)/$(prog)
+	$(foreach man,$(men),$(INSTALL_DATA) $(man) $(DESTDIR)$(mandir)/man$(subst .,,$(suffix $(man)))/$(notdir $(man)))
 
 uninstall:
 	$(NORMAL_UNINSTALL)
@@ -88,8 +88,8 @@ clean: 
 	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(dirs)))
 	rm -f $(addsuffix /core,$(dirs))
 	rm -f $(prog) 
-	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(srcdir)/man))
-	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(srcdir)/tools))
+	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(DESTDIR)$(srcdir)/man))
+	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(DESTDIR)$(srcdir)/tools))
 
 
 dcfixes    :=   .d  


--- NEW FILE quotatool.spec ---
Name:           quotatool
Version:        1.4.10
Release:        5%{?dist}
Summary:        A utility to set filesystem quotas

Group:          Applications/System
License:        GPLv2
URL:            http://quotatool.ekenberg.se
Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz

#Patch makes the Makefile honor DESTDIR
#Upstream was sent an updated Makefile via email
Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Quotatool is a utility to set filesystem quotas from the commandline.
It is suitable for use in scripts and other non-interactive situations.

%prep
%setup -q
%patch0 -p1 -b .destdir

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8

make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
%{_bindir}/quotatool
%{_mandir}/man8/quotatool.8.gz

%changelog
* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 07:03:04 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:07:31 -0000	1.2
@@ -0,0 +1 @@
+quotatool-1.4.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 07:03:05 -0000	1.1
+++ sources	17 Sep 2009 08:07:31 -0000	1.2
@@ -0,0 +1 @@
+d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz



From xiashing at fedoraproject.org  Thu Sep 17 08:09:19 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Thu, 17 Sep 2009 08:09:19 +0000 (UTC)
Subject: rpms/quotatool/EL-5 import.log, NONE,
	1.1 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, NONE,
	1.1 quotatool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917080919.A826011C00CE@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17536/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
	quotatool.spec 
Log Message:

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




--- NEW FILE import.log ---
quotatool-1_4_10-5_fc11:EL-5:quotatool-1.4.10-5.fc11.src.rpm:1253174717

quotatool-1.4.10_MAKEFILE_DESTDIR.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE quotatool-1.4.10_MAKEFILE_DESTDIR.patch ---
diff -up quotatool-1.4.10/Makefile.OLD quotatool-1.4.10/Makefile
--- quotatool-1.4.10/Makefile.OLD	2007-09-24 13:44:43.000000000 -0600
+++ quotatool-1.4.10/Makefile	2009-09-15 09:30:08.000000000 -0600
@@ -65,8 +65,8 @@ $(prog): $(objs) 
 men   :=   $(wildcard $(srcdir)/man/*)
 install: $(prog)
 	$(NORMAL_INSTALL)
-	$(INSTALL_PROGRAM) $(srcdir)/$(prog) $(bindir)/$(prog)
-	$(foreach man,$(men),$(INSTALL_DATA) $(man) $(mandir)/man$(subst .,,$(suffix $(man)))/$(notdir $(man)))
+	$(INSTALL_PROGRAM) $(srcdir)/$(prog) $(DESTDIR)$(bindir)/$(prog)
+	$(foreach man,$(men),$(INSTALL_DATA) $(man) $(DESTDIR)$(mandir)/man$(subst .,,$(suffix $(man)))/$(notdir $(man)))
 
 uninstall:
 	$(NORMAL_UNINSTALL)
@@ -88,8 +88,8 @@ clean: 
 	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(dirs)))
 	rm -f $(addsuffix /core,$(dirs))
 	rm -f $(prog) 
-	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(srcdir)/man))
-	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(srcdir)/tools))
+	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(DESTDIR)$(srcdir)/man))
+	rm -f $(foreach sfix,$(cfixes),$(addsuffix /*$(sfix),$(DESTDIR)$(srcdir)/tools))
 
 
 dcfixes    :=   .d  


--- NEW FILE quotatool.spec ---
Name:           quotatool
Version:        1.4.10
Release:        5%{?dist}
Summary:        A utility to set filesystem quotas

Group:          Applications/System
License:        GPLv2
URL:            http://quotatool.ekenberg.se
Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz

#Patch makes the Makefile honor DESTDIR
#Upstream was sent an updated Makefile via email
Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Quotatool is a utility to set filesystem quotas from the commandline.
It is suitable for use in scripts and other non-interactive situations.

%prep
%setup -q
%patch0 -p1 -b .destdir

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8

make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
%{_bindir}/quotatool
%{_mandir}/man8/quotatool.8.gz

%changelog
* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 07:03:04 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:09:17 -0000	1.2
@@ -0,0 +1 @@
+quotatool-1.4.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 07:03:05 -0000	1.1
+++ sources	17 Sep 2009 08:09:19 -0000	1.2
@@ -0,0 +1 @@
+d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz



From denis at fedoraproject.org  Thu Sep 17 08:23:56 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 17 Sep 2009 08:23:56 +0000 (UTC)
Subject: rpms/libgda/devel .cvsignore, 1.10, 1.11 libgda.spec, 1.50,
	1.51 sources, 1.10, 1.11
Message-ID: <20090917082356.52FF711C00CE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26141

Modified Files:
	.cvsignore libgda.spec sources 
Log Message:
Update to upstream version 4.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	25 Jun 2009 07:15:39 -0000	1.10
+++ .cvsignore	17 Sep 2009 08:23:55 -0000	1.11
@@ -1 +1 @@
-libgda-4.0.2.tar.bz2
+libgda-4.0.4.tar.bz2


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- libgda.spec	21 Aug 2009 14:17:34 -0000	1.50
+++ libgda.spec	17 Sep 2009 08:23:55 -0000	1.51
@@ -40,8 +40,8 @@
 
 Name:             libgda
 Epoch:            1
-Version:          4.0.2
-Release:          3%{?dist}
+Version:          4.0.4
+Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -57,6 +57,8 @@ BuildRequires:    sqlite-devel >= 3.6.0
 BuildRequires:    gamin-devel >= 0.1.8
 BuildRequires:    libxml2-devel readline-devel db4-devel
 BuildRequires:    gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser)
+BuildRequires:    gnome-vfs2-devel >= 2.20
+BuildRequires:    libsoup-devel
 # note we do not provide these, they no longer exist
 Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
 Obsoletes:        %{name}-sharp-devel < %{epoch}:%{version}-%{release}
@@ -573,6 +575,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Denis Leroy <denis at poolshark.org> - 1:4.0.4-1
+- Update to upstream version 4.0.4
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.0.2-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Jun 2009 07:15:39 -0000	1.10
+++ sources	17 Sep 2009 08:23:56 -0000	1.11
@@ -1 +1 @@
-cd79f6542cdd9477017b76b5f81c776f  libgda-4.0.2.tar.bz2
+14a6f176763cda5270f1ac23699c42ab  libgda-4.0.4.tar.bz2



From denis at fedoraproject.org  Thu Sep 17 08:26:15 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 17 Sep 2009 08:26:15 +0000 (UTC)
Subject: rpms/libgda/F-11 .cvsignore, 1.10, 1.11 libgda.spec, 1.48,
	1.49 sources, 1.10, 1.11
Message-ID: <20090917082616.190A111C00CE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27464

Modified Files:
	.cvsignore libgda.spec sources 
Log Message:
Update to upstream version 4.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	26 Jun 2009 04:45:33 -0000	1.10
+++ .cvsignore	17 Sep 2009 08:26:14 -0000	1.11
@@ -1 +1 @@
-libgda-4.0.2.tar.bz2
+libgda-4.0.4.tar.bz2


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/F-11/libgda.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libgda.spec	26 Jun 2009 04:45:33 -0000	1.48
+++ libgda.spec	17 Sep 2009 08:26:15 -0000	1.49
@@ -40,7 +40,7 @@
 
 Name:             libgda
 Epoch:            1
-Version:          4.0.2
+Version:          4.0.4
 Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
@@ -57,6 +57,8 @@ BuildRequires:    sqlite-devel >= 3.6.0
 BuildRequires:    gamin-devel >= 0.1.8
 BuildRequires:    libxml2-devel readline-devel db4-devel
 BuildRequires:    gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser)
+BuildRequires:    gnome-vfs2-devel >= 2.20
+BuildRequires:    libsoup-devel
 # note we do not provide these, they no longer exist
 Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
 Obsoletes:        %{name}-sharp-devel < %{epoch}:%{version}-%{release}
@@ -573,6 +575,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Denis Leroy <denis at poolshark.org> - 1:4.0.4-1
+- Update to upstream version 4.0.4
+
 * Thu Jun 25 2009 Denis Leroy <denis at poolshark.org> - 1:4.0.2-1
 - Update to upstream 4.0.2
 - Use system sqlite library


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	26 Jun 2009 04:45:33 -0000	1.10
+++ sources	17 Sep 2009 08:26:15 -0000	1.11
@@ -1 +1 @@
-cd79f6542cdd9477017b76b5f81c776f  libgda-4.0.2.tar.bz2
+14a6f176763cda5270f1ac23699c42ab  libgda-4.0.4.tar.bz2



From sharkcz at fedoraproject.org  Thu Sep 17 08:32:28 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:32:28 +0000 (UTC)
Subject: rpms/devio/devel devio.man, NONE, 1.1 devio.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917083230.55D7C11C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/devio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31832

Modified Files:
	.cvsignore sources 
Added Files:
	devio.man devio.spec 
Log Message:
initial import


--- NEW FILE devio.man ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DEVIO 1 "October 18, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
devio \- program to read and write from block devices
.SH SYNOPSIS
.B devio
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B devio
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBdevio\fP is a command line program intended to read and write
from block devices.
.SH OPTIONS
This program follows the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR dd (1),
.BR cat (1).
.br
.SH AUTHOR
devio was written by John Bowler <jbowler at acm.org>.
.PP
This manual page was written by Rod Whitby <rod at whitby.id.au>,
for the Debian project (but may be used by others).


--- NEW FILE devio.spec ---
Name:           devio
Version:        1.2
Release:        2%{?dist}
Summary:        Read and write utility for block devices

Group:          Development/Tools
License:        MIT
URL:            http://devio.sourceforge.net
Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.man
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
devio is a command line utility intended to read and write on block devices.
The primary difference between devio and other command line utilities, such
as dd and cat, is that it is not stream based - it writes directly into
the object rather than reading and writing a stream of data.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -Dp -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Wed Sep 15 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-2
- fixed section number in the man page

* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:45:27 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:32:27 -0000	1.2
@@ -0,0 +1 @@
+devio-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:45:27 -0000	1.1
+++ sources	17 Sep 2009 08:32:27 -0000	1.2
@@ -0,0 +1 @@
+5d332c2bffc0791367bcf3368ba1a0d1  devio-1.2.tar.gz



From sharkcz at fedoraproject.org  Thu Sep 17 08:34:12 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:34:12 +0000 (UTC)
Subject: rpms/devio/F-11 devio.man, NONE, 1.1 devio.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917083412.D55BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/devio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv820

Modified Files:
	.cvsignore sources 
Added Files:
	devio.man devio.spec 
Log Message:
initial import


--- NEW FILE devio.man ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DEVIO 1 "October 18, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
devio \- program to read and write from block devices
.SH SYNOPSIS
.B devio
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B devio
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBdevio\fP is a command line program intended to read and write
from block devices.
.SH OPTIONS
This program follows the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR dd (1),
.BR cat (1).
.br
.SH AUTHOR
devio was written by John Bowler <jbowler at acm.org>.
.PP
This manual page was written by Rod Whitby <rod at whitby.id.au>,
for the Debian project (but may be used by others).


--- NEW FILE devio.spec ---
Name:           devio
Version:        1.2
Release:        2%{?dist}
Summary:        Read and write utility for block devices

Group:          Development/Tools
License:        MIT
URL:            http://devio.sourceforge.net
Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.man
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
devio is a command line utility intended to read and write on block devices.
The primary difference between devio and other command line utilities, such
as dd and cat, is that it is not stream based - it writes directly into
the object rather than reading and writing a stream of data.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -Dp -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Wed Sep 15 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-2
- fixed section number in the man page

* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devio/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:45:27 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:34:05 -0000	1.2
@@ -0,0 +1 @@
+devio-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devio/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:45:27 -0000	1.1
+++ sources	17 Sep 2009 08:34:08 -0000	1.2
@@ -0,0 +1 @@
+5d332c2bffc0791367bcf3368ba1a0d1  devio-1.2.tar.gz



From sharkcz at fedoraproject.org  Thu Sep 17 08:37:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:37:56 +0000 (UTC)
Subject: rpms/devio/F-10 devio.man, NONE, 1.1 devio.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917083756.DEA7811C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/devio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3299

Modified Files:
	.cvsignore sources 
Added Files:
	devio.man devio.spec 
Log Message:
initial import


--- NEW FILE devio.man ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DEVIO 1 "October 18, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
devio \- program to read and write from block devices
.SH SYNOPSIS
.B devio
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B devio
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBdevio\fP is a command line program intended to read and write
from block devices.
.SH OPTIONS
This program follows the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR dd (1),
.BR cat (1).
.br
.SH AUTHOR
devio was written by John Bowler <jbowler at acm.org>.
.PP
This manual page was written by Rod Whitby <rod at whitby.id.au>,
for the Debian project (but may be used by others).


--- NEW FILE devio.spec ---
Name:           devio
Version:        1.2
Release:        2%{?dist}
Summary:        Read and write utility for block devices

Group:          Development/Tools
License:        MIT
URL:            http://devio.sourceforge.net
Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.man
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
devio is a command line utility intended to read and write on block devices.
The primary difference between devio and other command line utilities, such
as dd and cat, is that it is not stream based - it writes directly into
the object rather than reading and writing a stream of data.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -Dp -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Wed Sep 15 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-2
- fixed section number in the man page

* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devio/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:45:27 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:37:56 -0000	1.2
@@ -0,0 +1 @@
+devio-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devio/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:45:27 -0000	1.1
+++ sources	17 Sep 2009 08:37:56 -0000	1.2
@@ -0,0 +1 @@
+5d332c2bffc0791367bcf3368ba1a0d1  devio-1.2.tar.gz



From sharkcz at fedoraproject.org  Thu Sep 17 08:39:25 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:39:25 +0000 (UTC)
Subject: rpms/devio/EL-5 devio.man, NONE, 1.1 devio.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917083925.CAB6611C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/devio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3925

Modified Files:
	.cvsignore sources 
Added Files:
	devio.man devio.spec 
Log Message:
initial import


--- NEW FILE devio.man ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DEVIO 1 "October 18, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
devio \- program to read and write from block devices
.SH SYNOPSIS
.B devio
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B devio
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBdevio\fP is a command line program intended to read and write
from block devices.
.SH OPTIONS
This program follows the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR dd (1),
.BR cat (1).
.br
.SH AUTHOR
devio was written by John Bowler <jbowler at acm.org>.
.PP
This manual page was written by Rod Whitby <rod at whitby.id.au>,
for the Debian project (but may be used by others).


--- NEW FILE devio.spec ---
Name:           devio
Version:        1.2
Release:        2%{?dist}
Summary:        Read and write utility for block devices

Group:          Development/Tools
License:        MIT
URL:            http://devio.sourceforge.net
Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.man
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
devio is a command line utility intended to read and write on block devices.
The primary difference between devio and other command line utilities, such
as dd and cat, is that it is not stream based - it writes directly into
the object rather than reading and writing a stream of data.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -Dp -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Wed Sep 15 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-2
- fixed section number in the man page

* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.2-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devio/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:45:27 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:39:25 -0000	1.2
@@ -0,0 +1 @@
+devio-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devio/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:45:27 -0000	1.1
+++ sources	17 Sep 2009 08:39:25 -0000	1.2
@@ -0,0 +1 @@
+5d332c2bffc0791367bcf3368ba1a0d1  devio-1.2.tar.gz



From sharkcz at fedoraproject.org  Thu Sep 17 08:42:48 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:42:48 +0000 (UTC)
Subject: rpms/hercstudio/devel hercstudio-buttons.patch, NONE,
	1.1 hercstudio-gcc44.patch, NONE, 1.1 hercstudio.desktop, NONE,
	1.1 hercstudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917084248.C663B11C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5410

Modified Files:
	.cvsignore sources 
Added Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
	hercstudio.desktop hercstudio.spec 
Log Message:
initial import

hercstudio-buttons.patch:
 PanelButton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hercstudio-buttons.patch ---
Index: HercStudio/PanelButton.cpp
===================================================================
--- HercStudio/PanelButton.cpp	(revision 3)
+++ HercStudio/PanelButton.cpp	(working copy)
@@ -50,7 +50,7 @@
     QPixmap newPix(*filename);
     QPainter painter(this);
     painter.drawPixmap(0, 0, newPix);
-
+    resize(33,25);
 }
 
 void PanelButton::pressedSignal()


hercstudio-gcc44.patch:
 HercConfiguration/devices.cpp     |    1 +
 HercUtilities/UtilityExecutor.cpp |    1 +
 HercUtilities/UtilityRunner.cpp   |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercstudio-gcc44.patch ---
>From 01d1cb39d38854dbf1c8d5bc7fef4f5230394a9f Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 12:54:33 +0200
Subject: [PATCH] fix build with gcc 4.4

---
 HerculesStudio/HercConfiguration/devices.cpp     |    1 +
 HerculesStudio/HercUtilities/UtilityExecutor.cpp |    1 +
 HerculesStudio/HercUtilities/UtilityRunner.cpp   |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/HerculesStudio/HercConfiguration/devices.cpp b/HerculesStudio/HercConfiguration/devices.cpp
index eb8ebcc..1562720 100644
--- a/HerculesStudio/HercConfiguration/devices.cpp
+++ b/HerculesStudio/HercConfiguration/devices.cpp
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdio>
 
 #define NUM_DEVICES 12
 
diff --git a/HerculesStudio/HercUtilities/UtilityExecutor.cpp b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
index bd75b25..0573361 100644
--- a/HerculesStudio/HercUtilities/UtilityExecutor.cpp
+++ b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
@@ -23,6 +23,7 @@
 
 #include "UtilityExecutor.h"
 
+#include <cstdio>
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/HerculesStudio/HercUtilities/UtilityRunner.cpp b/HerculesStudio/HercUtilities/UtilityRunner.cpp
index 95ab2e6..a6d35ae 100644
--- a/HerculesStudio/HercUtilities/UtilityRunner.cpp
+++ b/HerculesStudio/HercUtilities/UtilityRunner.cpp
@@ -27,6 +27,7 @@
 #include "ConfigurationEditor.h"
 
 
+#include <cstdio>
 #include <sstream>
 #include "errno.h"
 
-- 
1.6.3.3



--- NEW FILE hercstudio.desktop ---
[Desktop Entry]
Name=Hercules Studio
Comment=Hercules GUI
Exec=HerculesStudio
Icon=hercstudio
Terminal=false
Type=Application
Categories=System;Emulator;Qt;
Name[en_US]=Hercules Studio



--- NEW FILE hercstudio.spec ---
Name:           hercstudio
Version:        1.0
Release:        0.2.beta%{?dist}
Summary:        GUI front-end to the Hercules mainframe Emulator

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.mvsdasd.org/hercstudio/
# sources retrieved from SVN with
# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
Source0:        %{name}-svn3.tar.bz2
Source1:        %{name}.desktop
Patch0:         %{name}-gcc44.patch
Patch1:         %{name}-buttons.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel
BuildRequires:  desktop-file-utils
Requires:       hercules >= 3.06-4


%description
GUI front-end to the Hercules mainframe Emulator.


%prep
%setup -q -n %{name}
%patch0 -p2 -b .gcc44
%patch1 -p0 -b .buttons


%build
%{_qt4_qmake}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps

install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/HerculesStudio
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*


%changelog
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
- add patch for panel buttons from upstream

* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:46:02 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:42:42 -0000	1.2
@@ -0,0 +1 @@
+hercstudio-svn3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:46:02 -0000	1.1
+++ sources	17 Sep 2009 08:42:46 -0000	1.2
@@ -0,0 +1 @@
+7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2



From sharkcz at fedoraproject.org  Thu Sep 17 08:46:35 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:46:35 +0000 (UTC)
Subject: rpms/hercstudio/F-11 hercstudio-buttons.patch, NONE,
	1.1 hercstudio-gcc44.patch, NONE, 1.1 hercstudio.desktop, NONE,
	1.1 hercstudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917084635.CF2E711C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7035

Modified Files:
	.cvsignore sources 
Added Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
	hercstudio.desktop hercstudio.spec 
Log Message:
initial import

hercstudio-buttons.patch:
 PanelButton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hercstudio-buttons.patch ---
Index: HercStudio/PanelButton.cpp
===================================================================
--- HercStudio/PanelButton.cpp	(revision 3)
+++ HercStudio/PanelButton.cpp	(working copy)
@@ -50,7 +50,7 @@
     QPixmap newPix(*filename);
     QPainter painter(this);
     painter.drawPixmap(0, 0, newPix);
-
+    resize(33,25);
 }
 
 void PanelButton::pressedSignal()


hercstudio-gcc44.patch:
 HercConfiguration/devices.cpp     |    1 +
 HercUtilities/UtilityExecutor.cpp |    1 +
 HercUtilities/UtilityRunner.cpp   |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercstudio-gcc44.patch ---
>From 01d1cb39d38854dbf1c8d5bc7fef4f5230394a9f Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 12:54:33 +0200
Subject: [PATCH] fix build with gcc 4.4

---
 HerculesStudio/HercConfiguration/devices.cpp     |    1 +
 HerculesStudio/HercUtilities/UtilityExecutor.cpp |    1 +
 HerculesStudio/HercUtilities/UtilityRunner.cpp   |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/HerculesStudio/HercConfiguration/devices.cpp b/HerculesStudio/HercConfiguration/devices.cpp
index eb8ebcc..1562720 100644
--- a/HerculesStudio/HercConfiguration/devices.cpp
+++ b/HerculesStudio/HercConfiguration/devices.cpp
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdio>
 
 #define NUM_DEVICES 12
 
diff --git a/HerculesStudio/HercUtilities/UtilityExecutor.cpp b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
index bd75b25..0573361 100644
--- a/HerculesStudio/HercUtilities/UtilityExecutor.cpp
+++ b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
@@ -23,6 +23,7 @@
 
 #include "UtilityExecutor.h"
 
+#include <cstdio>
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/HerculesStudio/HercUtilities/UtilityRunner.cpp b/HerculesStudio/HercUtilities/UtilityRunner.cpp
index 95ab2e6..a6d35ae 100644
--- a/HerculesStudio/HercUtilities/UtilityRunner.cpp
+++ b/HerculesStudio/HercUtilities/UtilityRunner.cpp
@@ -27,6 +27,7 @@
 #include "ConfigurationEditor.h"
 
 
+#include <cstdio>
 #include <sstream>
 #include "errno.h"
 
-- 
1.6.3.3



--- NEW FILE hercstudio.desktop ---
[Desktop Entry]
Name=Hercules Studio
Comment=Hercules GUI
Exec=HerculesStudio
Icon=hercstudio
Terminal=false
Type=Application
Categories=System;Emulator;Qt;
Name[en_US]=Hercules Studio



--- NEW FILE hercstudio.spec ---
Name:           hercstudio
Version:        1.0
Release:        0.2.beta%{?dist}
Summary:        GUI front-end to the Hercules mainframe Emulator

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.mvsdasd.org/hercstudio/
# sources retrieved from SVN with
# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
Source0:        %{name}-svn3.tar.bz2
Source1:        %{name}.desktop
Patch0:         %{name}-gcc44.patch
Patch1:         %{name}-buttons.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel
BuildRequires:  desktop-file-utils
Requires:       hercules >= 3.06-4


%description
GUI front-end to the Hercules mainframe Emulator.


%prep
%setup -q -n %{name}
%patch0 -p2 -b .gcc44
%patch1 -p0 -b .buttons


%build
%{_qt4_qmake}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps

install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/HerculesStudio
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*


%changelog
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
- add patch for panel buttons from upstream

* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:46:02 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:46:33 -0000	1.2
@@ -0,0 +1 @@
+hercstudio-svn3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:46:02 -0000	1.1
+++ sources	17 Sep 2009 08:46:34 -0000	1.2
@@ -0,0 +1 @@
+7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2



From sharkcz at fedoraproject.org  Thu Sep 17 08:47:44 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:47:44 +0000 (UTC)
Subject: rpms/hercstudio/F-10 hercstudio-buttons.patch, NONE,
	1.1 hercstudio-gcc44.patch, NONE, 1.1 hercstudio.desktop, NONE,
	1.1 hercstudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917084744.3120311C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7913

Modified Files:
	.cvsignore sources 
Added Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
	hercstudio.desktop hercstudio.spec 
Log Message:
initial import

hercstudio-buttons.patch:
 PanelButton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hercstudio-buttons.patch ---
Index: HercStudio/PanelButton.cpp
===================================================================
--- HercStudio/PanelButton.cpp	(revision 3)
+++ HercStudio/PanelButton.cpp	(working copy)
@@ -50,7 +50,7 @@
     QPixmap newPix(*filename);
     QPainter painter(this);
     painter.drawPixmap(0, 0, newPix);
-
+    resize(33,25);
 }
 
 void PanelButton::pressedSignal()


hercstudio-gcc44.patch:
 HercConfiguration/devices.cpp     |    1 +
 HercUtilities/UtilityExecutor.cpp |    1 +
 HercUtilities/UtilityRunner.cpp   |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercstudio-gcc44.patch ---
>From 01d1cb39d38854dbf1c8d5bc7fef4f5230394a9f Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 12:54:33 +0200
Subject: [PATCH] fix build with gcc 4.4

---
 HerculesStudio/HercConfiguration/devices.cpp     |    1 +
 HerculesStudio/HercUtilities/UtilityExecutor.cpp |    1 +
 HerculesStudio/HercUtilities/UtilityRunner.cpp   |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/HerculesStudio/HercConfiguration/devices.cpp b/HerculesStudio/HercConfiguration/devices.cpp
index eb8ebcc..1562720 100644
--- a/HerculesStudio/HercConfiguration/devices.cpp
+++ b/HerculesStudio/HercConfiguration/devices.cpp
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdio>
 
 #define NUM_DEVICES 12
 
diff --git a/HerculesStudio/HercUtilities/UtilityExecutor.cpp b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
index bd75b25..0573361 100644
--- a/HerculesStudio/HercUtilities/UtilityExecutor.cpp
+++ b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
@@ -23,6 +23,7 @@
 
 #include "UtilityExecutor.h"
 
+#include <cstdio>
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/HerculesStudio/HercUtilities/UtilityRunner.cpp b/HerculesStudio/HercUtilities/UtilityRunner.cpp
index 95ab2e6..a6d35ae 100644
--- a/HerculesStudio/HercUtilities/UtilityRunner.cpp
+++ b/HerculesStudio/HercUtilities/UtilityRunner.cpp
@@ -27,6 +27,7 @@
 #include "ConfigurationEditor.h"
 
 
+#include <cstdio>
 #include <sstream>
 #include "errno.h"
 
-- 
1.6.3.3



--- NEW FILE hercstudio.desktop ---
[Desktop Entry]
Name=Hercules Studio
Comment=Hercules GUI
Exec=HerculesStudio
Icon=hercstudio
Terminal=false
Type=Application
Categories=System;Emulator;Qt;
Name[en_US]=Hercules Studio



--- NEW FILE hercstudio.spec ---
Name:           hercstudio
Version:        1.0
Release:        0.2.beta%{?dist}
Summary:        GUI front-end to the Hercules mainframe Emulator

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.mvsdasd.org/hercstudio/
# sources retrieved from SVN with
# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
Source0:        %{name}-svn3.tar.bz2
Source1:        %{name}.desktop
Patch0:         %{name}-gcc44.patch
Patch1:         %{name}-buttons.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel
BuildRequires:  desktop-file-utils
Requires:       hercules >= 3.06-2


%description
GUI front-end to the Hercules mainframe Emulator.


%prep
%setup -q -n %{name}
%patch0 -p2 -b .gcc44
%patch1 -p0 -b .buttons


%build
%{_qt4_qmake}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps

install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/HerculesStudio
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*


%changelog
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
- add patch for panel buttons from upstream

* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:46:02 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:47:43 -0000	1.2
@@ -0,0 +1 @@
+hercstudio-svn3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:46:02 -0000	1.1
+++ sources	17 Sep 2009 08:47:44 -0000	1.2
@@ -0,0 +1 @@
+7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2



From sharkcz at fedoraproject.org  Thu Sep 17 08:49:12 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 17 Sep 2009 08:49:12 +0000 (UTC)
Subject: rpms/hercstudio/EL-5 hercstudio-buttons.patch, NONE,
	1.1 hercstudio-gcc44.patch, NONE, 1.1 hercstudio.desktop, NONE,
	1.1 hercstudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917084912.413F211C00CE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8626

Modified Files:
	.cvsignore sources 
Added Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
	hercstudio.desktop hercstudio.spec 
Log Message:
initial import

hercstudio-buttons.patch:
 PanelButton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hercstudio-buttons.patch ---
Index: HercStudio/PanelButton.cpp
===================================================================
--- HercStudio/PanelButton.cpp	(revision 3)
+++ HercStudio/PanelButton.cpp	(working copy)
@@ -50,7 +50,7 @@
     QPixmap newPix(*filename);
     QPainter painter(this);
     painter.drawPixmap(0, 0, newPix);
-
+    resize(33,25);
 }
 
 void PanelButton::pressedSignal()


hercstudio-gcc44.patch:
 HercConfiguration/devices.cpp     |    1 +
 HercUtilities/UtilityExecutor.cpp |    1 +
 HercUtilities/UtilityRunner.cpp   |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercstudio-gcc44.patch ---
>From 01d1cb39d38854dbf1c8d5bc7fef4f5230394a9f Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 12:54:33 +0200
Subject: [PATCH] fix build with gcc 4.4

---
 HerculesStudio/HercConfiguration/devices.cpp     |    1 +
 HerculesStudio/HercUtilities/UtilityExecutor.cpp |    1 +
 HerculesStudio/HercUtilities/UtilityRunner.cpp   |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/HerculesStudio/HercConfiguration/devices.cpp b/HerculesStudio/HercConfiguration/devices.cpp
index eb8ebcc..1562720 100644
--- a/HerculesStudio/HercConfiguration/devices.cpp
+++ b/HerculesStudio/HercConfiguration/devices.cpp
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdio>
 
 #define NUM_DEVICES 12
 
diff --git a/HerculesStudio/HercUtilities/UtilityExecutor.cpp b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
index bd75b25..0573361 100644
--- a/HerculesStudio/HercUtilities/UtilityExecutor.cpp
+++ b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
@@ -23,6 +23,7 @@
 
 #include "UtilityExecutor.h"
 
+#include <cstdio>
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/HerculesStudio/HercUtilities/UtilityRunner.cpp b/HerculesStudio/HercUtilities/UtilityRunner.cpp
index 95ab2e6..a6d35ae 100644
--- a/HerculesStudio/HercUtilities/UtilityRunner.cpp
+++ b/HerculesStudio/HercUtilities/UtilityRunner.cpp
@@ -27,6 +27,7 @@
 #include "ConfigurationEditor.h"
 
 
+#include <cstdio>
 #include <sstream>
 #include "errno.h"
 
-- 
1.6.3.3



--- NEW FILE hercstudio.desktop ---
[Desktop Entry]
Name=Hercules Studio
Comment=Hercules GUI
Exec=HerculesStudio
Icon=hercstudio
Terminal=false
Type=Application
Categories=System;Emulator;Qt;
Name[en_US]=Hercules Studio



--- NEW FILE hercstudio.spec ---
Name:           hercstudio
Version:        1.0
Release:        0.2.beta%{?dist}
Summary:        GUI front-end to the Hercules mainframe Emulator

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.mvsdasd.org/hercstudio/
# sources retrieved from SVN with
# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
Source0:        %{name}-svn3.tar.bz2
Source1:        %{name}.desktop
Patch0:         %{name}-gcc44.patch
Patch1:         %{name}-buttons.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel
BuildRequires:  desktop-file-utils
Requires:       hercules >= 3.06-2


%description
GUI front-end to the Hercules mainframe Emulator.


%prep
%setup -q -n %{name}
%patch0 -p2 -b .gcc44
%patch1 -p0 -b .buttons


%build
%{_qt4_qmake}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps

install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/HerculesStudio
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*


%changelog
* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
- add patch for panel buttons from upstream

* Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:46:02 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:49:11 -0000	1.2
@@ -0,0 +1 @@
+hercstudio-svn3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:46:02 -0000	1.1
+++ sources	17 Sep 2009 08:49:12 -0000	1.2
@@ -0,0 +1 @@
+7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2



From pbrobinson at fedoraproject.org  Thu Sep 17 09:04:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 09:04:35 +0000 (UTC)
Subject: rpms/usb_modeswitch/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 usb_modeswitch.spec, 1.5, 1.6
Message-ID: <20090917090435.5A3D111C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usb_modeswitch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16027

Modified Files:
	.cvsignore sources usb_modeswitch.spec 
Log Message:
- new upstream 1.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Aug 2009 10:03:31 -0000	1.4
+++ .cvsignore	17 Sep 2009 09:04:34 -0000	1.5
@@ -1 +1 @@
-usb_modeswitch.conf
+usb_modeswitch-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Aug 2009 10:03:31 -0000	1.4
+++ sources	17 Sep 2009 09:04:34 -0000	1.5
@@ -1 +1 @@
-afe56e4eba51417d7cfc1142c822a9ee  usb_modeswitch.conf
+294848bbbcbd77dc9a4caf08327ca297  usb_modeswitch-1.0.5.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/usb_modeswitch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- usb_modeswitch.spec	2 Aug 2009 10:03:31 -0000	1.5
+++ usb_modeswitch.spec	17 Sep 2009 09:04:35 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		usb_modeswitch
-Version:	1.0.2
+Version:	1.0.5
 Release:	1%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
@@ -46,8 +46,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README*
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.5-1
+- new upstream 1.0.5 release
+
 * Sun Aug 02 2009 Robert M. Albrecht <fedora at romal.de> 1.0.2-1
-* new upstream release
+- new upstream release
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pbrobinson at fedoraproject.org  Thu Sep 17 09:11:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 09:11:12 +0000 (UTC)
Subject: rpms/usb_modeswitch/F-11 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 usb_modeswitch.spec, 1.3, 1.4 import.log, 1.1, NONE
Message-ID: <20090917091112.B822711C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usb_modeswitch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18854

Modified Files:
	.cvsignore sources usb_modeswitch.spec 
Removed Files:
	import.log 
Log Message:
- new upstream 1.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 18:46:30 -0000	1.3
+++ .cvsignore	17 Sep 2009 09:11:09 -0000	1.4
@@ -1 +1 @@
-usb_modeswitch-0.9.6.tar.bz2
+usb_modeswitch-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 18:46:30 -0000	1.3
+++ sources	17 Sep 2009 09:11:11 -0000	1.4
@@ -1 +1 @@
-9f5b97b7b0113b0275c4953482f876c3  usb_modeswitch-0.9.6.tar.bz2
+294848bbbcbd77dc9a4caf08327ca297  usb_modeswitch-1.0.5.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-11/usb_modeswitch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- usb_modeswitch.spec	25 Feb 2009 23:25:52 -0000	1.3
+++ usb_modeswitch.spec	17 Sep 2009 09:11:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		usb_modeswitch
-Version:	0.9.6
-Release:	2%{?dist}
+Version:	1.0.5
+Release:	1%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
@@ -46,6 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README*
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.5-1
+- new upstream 1.0.5 release
+
+* Sun Aug 02 2009 Robert M. Albrecht <fedora at romal.de> 1.0.2-1
+- new upstream release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- import.log DELETED ---



From twoerner at fedoraproject.org  Thu Sep 17 09:13:10 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Thu, 17 Sep 2009 09:13:10 +0000 (UTC)
Subject: rpms/iptables/devel iptables-1.4.5-cloexec.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 iptables.spec, 1.79, 1.80 sources, 1.27,
	1.28 iptables-1.4.1.1-cloexec.patch, 1.1,
	NONE iptables-1.4.3.1-cloexec.patch, 1.1, NONE
Message-ID: <20090917091310.637AA11C00CE@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19941

Modified Files:
	.cvsignore iptables.spec sources 
Added Files:
	iptables-1.4.5-cloexec.patch 
Removed Files:
	iptables-1.4.1.1-cloexec.patch iptables-1.4.3.1-cloexec.patch 
Log Message:
- new version 1.4.5 with support for all new features of 2.6.31
  - libxt_NFQUEUE: add new v1 version with queue-balance option
  - xt_conntrack: revision 2 for enlarged state_mask member
  - libxt_helper: fix invalid passed option to check_inverse
  - libiptc: split v4 and v6
  - extensions: collapse registration structures
  - iptables: allow for parse-less extensions
  - iptables: allow for help-less extensions
  - extensions: remove empty help and parse functions
  - xtables: add multi-registration functions
  - extensions: collapse data variables to use multi-reg calls
  - xtables: warn of missing version identifier in extensions
  - multi binary: allow subcommand via argv[1]
  - iptables: accept multiple IP address specifications for -s, -d
  - several build fixes
  - several man page fixes
- fixed two leaked file descriptors on sockets (rhbz#521397)



iptables-1.4.5-cloexec.patch:
 extensions/libipt_realm.c |    4 ++--
 extensions/libipt_set.h   |    7 +++++++
 ip6tables-restore.c       |    2 +-
 ip6tables-save.c          |    2 +-
 iptables-restore.c        |    2 +-
 iptables-save.c           |    2 +-
 iptables-xml.c            |    2 +-
 libiptc/libiptc.c         |    8 ++++++++
 xtables.c                 |   11 +++++++++++
 9 files changed, 33 insertions(+), 7 deletions(-)

--- NEW FILE iptables-1.4.5-cloexec.patch ---
diff -up iptables-1.4.5/extensions/libipt_realm.c.cloexec iptables-1.4.5/extensions/libipt_realm.c
--- iptables-1.4.5/extensions/libipt_realm.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/extensions/libipt_realm.c	2009-09-17 10:52:00.000000000 +0200
@@ -49,7 +49,7 @@ static void load_realms(void)
 	int id;
 	struct realmname *oldnm = NULL, *newnm = NULL;
 
-	fil = fopen(rfnm, "r");
+	fil = fopen(rfnm, "re");
 	if (!fil) {
 		rdberr = 1;
 		return;
@@ -248,7 +248,7 @@ static struct xtables_match realm_mt_reg
 	.extra_opts	= realm_opts,
 };
 
-void _init(void)
+void __attribute((constructor)) nf_ext_init(void)
 {
 	xtables_register_match(&realm_mt_reg);
 }
diff -up iptables-1.4.5/extensions/libipt_set.h.cloexec iptables-1.4.5/extensions/libipt_set.h
--- iptables-1.4.5/extensions/libipt_set.h.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/extensions/libipt_set.h	2009-09-17 11:02:07.000000000 +0200
@@ -2,6 +2,7 @@
 #define _LIBIPT_SET_H
 
 #include <unistd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
@@ -48,6 +49,12 @@ static int get_version(unsigned *version
 		xtables_error(OTHER_PROBLEM,
 			   "Can't open socket to ipset.\n");
 
+	if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) {
+		xtables_error(OTHER_PROBLEM,
+			      "Could not set close on exec: %s\n",
+			      strerror(errno));
+	}
+
 	req_version.op = IP_SET_OP_VERSION;
 	res = getsockopt(sockfd, SOL_IP, SO_IP_SET, &req_version, &size);
 	if (res != 0)
diff -up iptables-1.4.5/ip6tables-restore.c.cloexec iptables-1.4.5/ip6tables-restore.c
--- iptables-1.4.5/ip6tables-restore.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/ip6tables-restore.c	2009-09-17 10:52:00.000000000 +0200
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (optind == argc - 1) {
-		in = fopen(argv[optind], "r");
+		in = fopen(argv[optind], "re");
 		if (!in) {
 			fprintf(stderr, "Can't open %s: %s\n", argv[optind],
 				strerror(errno));
diff -up iptables-1.4.5/ip6tables-save.c.cloexec iptables-1.4.5/ip6tables-save.c
--- iptables-1.4.5/ip6tables-save.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/ip6tables-save.c	2009-09-17 10:52:00.000000000 +0200
@@ -41,7 +41,7 @@ static int for_each_table(int (*func)(co
 	FILE *procfile = NULL;
 	char tablename[IP6T_TABLE_MAXNAMELEN+1];
 
-	procfile = fopen("/proc/net/ip6_tables_names", "r");
+	procfile = fopen("/proc/net/ip6_tables_names", "re");
 	if (!procfile)
 		return ret;
 
diff -up iptables-1.4.5/iptables-restore.c.cloexec iptables-1.4.5/iptables-restore.c
--- iptables-1.4.5/iptables-restore.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/iptables-restore.c	2009-09-17 10:52:00.000000000 +0200
@@ -175,7 +175,7 @@ main(int argc, char *argv[])
 	}
 
 	if (optind == argc - 1) {
-		in = fopen(argv[optind], "r");
+		in = fopen(argv[optind], "re");
 		if (!in) {
 			fprintf(stderr, "Can't open %s: %s\n", argv[optind],
 				strerror(errno));
diff -up iptables-1.4.5/iptables-save.c.cloexec iptables-1.4.5/iptables-save.c
--- iptables-1.4.5/iptables-save.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/iptables-save.c	2009-09-17 10:52:00.000000000 +0200
@@ -39,7 +39,7 @@ static int for_each_table(int (*func)(co
 	FILE *procfile = NULL;
 	char tablename[IPT_TABLE_MAXNAMELEN+1];
 
-	procfile = fopen("/proc/net/ip_tables_names", "r");
+	procfile = fopen("/proc/net/ip_tables_names", "re");
 	if (!procfile)
 		return ret;
 
diff -up iptables-1.4.5/iptables-xml.c.cloexec iptables-1.4.5/iptables-xml.c
--- iptables-1.4.5/iptables-xml.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/iptables-xml.c	2009-09-17 10:52:00.000000000 +0200
@@ -653,7 +653,7 @@ main(int argc, char *argv[])
 	}
 
 	if (optind == argc - 1) {
-		in = fopen(argv[optind], "r");
+		in = fopen(argv[optind], "re");
 		if (!in) {
 			fprintf(stderr, "Can't open %s: %s", argv[optind],
 				strerror(errno));
diff -up iptables-1.4.5/libiptc/libiptc.c.cloexec iptables-1.4.5/libiptc/libiptc.c
--- iptables-1.4.5/libiptc/libiptc.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/libiptc/libiptc.c	2009-09-17 11:02:16.000000000 +0200
@@ -29,6 +29,8 @@
  * 	- performance work: speedup initial ruleset parsing.
  * 	- sponsored by ComX Networks A/S (http://www.comx.dk/)
  */
+#include <unistd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <xtables.h>
@@ -1326,6 +1328,12 @@ TC_INIT(const char *tablename)
 	if (sockfd < 0)
 		return NULL;
 
+	if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) {
+		fprintf(stderr, "Could not set close on exec: %s\n",
+			strerror(errno));
+		abort();
+	}
+
 retry:
 	s = sizeof(info);
 
diff -up iptables-1.4.5/xtables.c.cloexec iptables-1.4.5/xtables.c
--- iptables-1.4.5/xtables.c.cloexec	2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/xtables.c	2009-09-17 10:52:00.000000000 +0200
@@ -292,6 +292,11 @@ static char *get_modprobe(void)
 	procfile = open(PROC_SYS_MODPROBE, O_RDONLY);
 	if (procfile < 0)
 		return NULL;
+ 	if (fcntl(procfile, F_SETFD, FD_CLOEXEC) == -1) {
+ 		fprintf(stderr, "Could not set close on exec: %s\n",
+ 			strerror(errno));
+ 		exit(1);
+ 	}
 
 	ret = (char *) malloc(PROCFILE_BUFSIZ);
 	if (ret) {
@@ -684,6 +689,12 @@ static int compatible_revision(const cha
 		exit(1);
 	}
 
+	if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) {
+		fprintf(stderr, "Could not set close on exec: %s\n",
+			strerror(errno));
+		exit(1);
+	}
+
 	xtables_load_ko(xtables_modprobe_program, true);
 
 	strcpy(rev.name, name);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	25 Aug 2009 13:45:18 -0000	1.27
+++ .cvsignore	17 Sep 2009 09:13:08 -0000	1.28
@@ -6,3 +6,4 @@ iptables-1.4.2.tar.bz2
 iptables-1.4.3.1.tar.bz2
 iptables-1.4.3.2.tar.bz2
 iptables-1.4.4.tar.bz2
+iptables-1.4.5.tar.bz2


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- iptables.spec	25 Aug 2009 13:45:19 -0000	1.79
+++ iptables.spec	17 Sep 2009 09:13:09 -0000	1.80
@@ -1,11 +1,11 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.4
+Version: 1.4.5
 Release: 1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
-Patch5: iptables-1.4.3.1-cloexec.patch
+Patch5: iptables-1.4.5-cloexec.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -122,6 +122,8 @@ fi
 /%{_lib}/xtables/libipt*
 /%{_lib}/xtables/libxt*
 %{_libdir}/libiptc.so.*
+%{_libdir}/libip4tc.so.*
+%{_libdir}/libip6tc.so.*
 %{_libdir}/libxtables.so.*
 
 %files ipv6
@@ -144,12 +146,31 @@ fi
 %{_includedir}/libipulog/*.h
 %{_libdir}/libipq.a
 %{_mandir}/man3/*
-%{_libdir}/libiptc.so
+%{_libdir}/libip*tc.so
 %{_libdir}/libxtables.so
 %{_libdir}/pkgconfig/libiptc.pc
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Thu Sep 17 2009 Thomas Woerner <twoerner at redhat.com> 1.4.5-1
+- new version 1.4.5 with support for all new features of 2.6.31
+  - libxt_NFQUEUE: add new v1 version with queue-balance option
+  - xt_conntrack: revision 2 for enlarged state_mask member
+  - libxt_helper: fix invalid passed option to check_inverse
+  - libiptc: split v4 and v6
+  - extensions: collapse registration structures
+  - iptables: allow for parse-less extensions
+  - iptables: allow for help-less extensions
+  - extensions: remove empty help and parse functions
+  - xtables: add multi-registration functions
+  - extensions: collapse data variables to use multi-reg calls
+  - xtables: warn of missing version identifier in extensions
+  - multi binary: allow subcommand via argv[1]
+  - iptables: accept multiple IP address specifications for -s, -d
+  - several build fixes
+  - several man page fixes
+- fixed two leaked file descriptors on sockets (rhbz#521397)
+
 * Mon Aug 24 2009 Thomas Woerner <twoerner at redhat.com> 1.4.4-1
 - new version 1.4.4 with support for all new features of 2.6.30
   - several man page fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	25 Aug 2009 13:45:19 -0000	1.27
+++ sources	17 Sep 2009 09:13:09 -0000	1.28
@@ -1 +1 @@
-08cd9196881657ea0615d926334cb7e9  iptables-1.4.4.tar.bz2
+44f13990132c20299c1994cd6f425140  iptables-1.4.5.tar.bz2


--- iptables-1.4.1.1-cloexec.patch DELETED ---


--- iptables-1.4.3.1-cloexec.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Sep 17 09:20:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 09:20:59 +0000 (UTC)
Subject: rpms/usb_modeswitch/F-10 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 usb_modeswitch.spec, 1.2, 1.3 import.log, 1.1, NONE
Message-ID: <20090917092059.54C7611C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usb_modeswitch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23297

Modified Files:
	.cvsignore sources usb_modeswitch.spec 
Removed Files:
	import.log 
Log Message:
- new upstream 1.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 18:54:52 -0000	1.3
+++ .cvsignore	17 Sep 2009 09:20:58 -0000	1.4
@@ -1 +1 @@
-usb_modeswitch-0.9.6.tar.bz2
+usb_modeswitch-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 18:54:52 -0000	1.3
+++ sources	17 Sep 2009 09:20:59 -0000	1.4
@@ -1 +1 @@
-9f5b97b7b0113b0275c4953482f876c3  usb_modeswitch-0.9.6.tar.bz2
+294848bbbcbd77dc9a4caf08327ca297  usb_modeswitch-1.0.5.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-10/usb_modeswitch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- usb_modeswitch.spec	11 Jan 2009 18:54:52 -0000	1.2
+++ usb_modeswitch.spec	17 Sep 2009 09:20:59 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		usb_modeswitch
-Version:	0.9.6
+Version:	1.0.5
 Release:	1%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
@@ -46,6 +46,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README*
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.5-1
+- new upstream 1.0.5 release
+
+* Sun Aug 02 2009 Robert M. Albrecht <fedora at romal.de> 1.0.2-1
+- new upstream release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 11 2009 Robert M. Albrecht <fedora at romal.de> 0.9.6-1
 * new upstream release
 


--- import.log DELETED ---



From kasal at fedoraproject.org  Thu Sep 17 09:27:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 17 Sep 2009 09:27:44 +0000 (UTC)
Subject: rpms/perl-namespace-autoclean/devel perl-namespace-autoclean.spec,
	1.4, 1.5
Message-ID: <20090917092745.2EDB411C00CE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-namespace-autoclean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26294

Modified Files:
	perl-namespace-autoclean.spec 
Log Message:
bump release


Index: perl-namespace-autoclean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/devel/perl-namespace-autoclean.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-namespace-autoclean.spec	16 Sep 2009 18:57:30 -0000	1.4
+++ perl-namespace-autoclean.spec	17 Sep 2009 09:27:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-namespace-autoclean
 Version:    0.09
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Keep imports out of your namespace
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 17 2009 Stepan Kasal <skasal at redhat.com> 0.09-2
+- fix the previous changelog entry
+
 * Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
 - add %%perl_default_filter'ing
 - auto-update to 0.09 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Thu Sep 17 09:35:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 17 Sep 2009 09:35:14 +0000 (UTC)
Subject: rpms/perl-namespace-autoclean/F-11 perl-namespace-autoclean.spec,
	1.2, 1.3
Message-ID: <20090917093514.A4E7211C00CE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-namespace-autoclean/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30347

Modified Files:
	perl-namespace-autoclean.spec 
Log Message:
- fix the previous changelog entry


Index: perl-namespace-autoclean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-autoclean/F-11/perl-namespace-autoclean.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-namespace-autoclean.spec	16 Sep 2009 16:06:55 -0000	1.2
+++ perl-namespace-autoclean.spec	17 Sep 2009 09:35:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-namespace-autoclean
 Version:    0.09
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Keep imports out of your namespace
@@ -66,8 +66,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 17 2009 Stepan Kasal <skasal at redhat.com> 0.09-2
+- fix the previous changelog entry
+
 * Wed Sep 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
-- add %perl_default_filter'ing
+- add %%perl_default_filter'ing
 - auto-update to 0.09 (by cpan-spec-update 0.01)
 - added a new req on perl(B::Hooks::EndOfScope) (version 0.07)
 - added a new req on perl(Class::MOP) (version 0.80)



From dnovotny at fedoraproject.org  Thu Sep 17 09:37:46 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 17 Sep 2009 09:37:46 +0000 (UTC)
Subject: rpms/logrotate/devel logrotate-3.7.8-devnull.patch, NONE,
	1.1 logrotate.spec, 1.80, 1.81
Message-ID: <20090917093746.539F911C00CE@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/logrotate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31226

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.8-devnull.patch 
Log Message:
fix #517321


logrotate-3.7.8-devnull.patch:
 logrotate.cron |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logrotate-3.7.8-devnull.patch ---
diff -up logrotate-3.7.8/examples/logrotate.cron.devnull logrotate-3.7.8/examples/logrotate.cron
--- logrotate-3.7.8/examples/logrotate.cron.devnull	2009-09-17 11:29:19.000000000 +0200
+++ logrotate-3.7.8/examples/logrotate.cron	2009-09-17 11:29:40.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/sbin/logrotate /etc/logrotate.conf
+/usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"


Index: logrotate.spec
===================================================================
RCS file: /cvs/extras/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- logrotate.spec	25 Jul 2009 11:15:06 -0000	1.80
+++ logrotate.spec	17 Sep 2009 09:37:46 -0000	1.81
@@ -1,12 +1,13 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.7-curdir2.patch
 Patch2: logrotate-3.7.7-toolarge.patch
+Patch3: logrotate-3.7.8-devnull.patch
 
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
@@ -27,6 +28,7 @@ log files on your system.
 %setup -q
 %patch1 -p1 -b .curdir
 %patch2 -p1 -b .toolarge
+%patch3 -p1 -b .devnull
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu Sep 17 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-4
+- fix #517321 (logrotate blocking anacron)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mgrepl at fedoraproject.org  Thu Sep 17 09:44:37 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 17 Sep 2009 09:44:37 +0000 (UTC)
Subject: rpms/mcstrans/devel mcstrans-0.3.1-init.patch, NONE,
	1.1 mcstrans.spec, 1.43, 1.44
Message-ID: <20090917094437.9C5B511C00CE@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/mcstrans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1332

Modified Files:
	mcstrans.spec 
Added Files:
	mcstrans-0.3.1-init.patch 
Log Message:
- Fix init script



mcstrans-0.3.1-init.patch:
 mcstrans.init |   22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

--- NEW FILE mcstrans-0.3.1-init.patch ---
--- mcstrans-0.3.1/src/mcstrans.init~	2009-09-16 11:01:17.646738932 +0200
+++ mcstrans-0.3.1/src/mcstrans.init	2009-09-16 11:23:47.605763983 +0200
@@ -20,6 +20,7 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 prog="mcstransd"
+lockfile=/var/lock/subsys/$prog
 
 # Source function library.
 . /etc/init.d/functions
@@ -54,7 +55,7 @@
 	RETVAL=$?
 	echo
 	if test $RETVAL = 0 ; then
-        	touch /var/lock/subsys/mcstrans
+        	touch $lockfile
 	fi
 	return $RETVAL
 }
@@ -64,15 +65,7 @@
 	killproc $prog
 	RETVAL=$?
 	echo
-	rm -f /var/lock/subsys/mcstrans
-	return $RETVAL
-}
-
-reload(){
-	echo -n $"Reloading configuration: "	
-	killproc $prog -HUP
-	RETVAL=$?
-	echo
+	rm -f $lockfile
 	return $RETVAL
 }
 
@@ -82,7 +75,7 @@
 }
 
 condrestart(){
-	[ -e /var/lock/subsys/mcstrans ] && restart
+	[ -e $lockfile ] && restart
 	return 0
 }
 
@@ -95,17 +88,14 @@
     stop)
 	stop
 	;;
-    restart)
+    restart|force-reload)
 	restart
 	;;
-    reload)
-	reload
-	;;
     condrestart)
 	condrestart
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|rotate}"
+	echo $"Usage: $0 {start|stop|status|restart|force-reload|condrestart}"
 	RETVAL=3
 esac
 


Index: mcstrans.spec
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- mcstrans.spec	25 Jul 2009 11:55:35 -0000	1.43
+++ mcstrans.spec	17 Sep 2009 09:44:36 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@@ -13,6 +13,7 @@ Requires(pre): /sbin/chkconfig /sbin/ser
 Requires(post):/sbin/chkconfig /sbin/service
 Provides: setransd
 Provides: libsetrans
+Patch: mcstrans-0.3.1-init.patch
 Obsoletes: libsetrans
 
 %description
@@ -31,6 +32,7 @@ from internal representations to user de
 
 %prep
 %setup -q
+%patch -p1 
 
 %build
 make clean
@@ -53,8 +55,8 @@ rm -rf %{buildroot}
 
 %post 
 chkconfig --add mcstrans
-if [ -f /var/lock/subsys/mcstransd ]; then
-   mv /var/lock/subsys/mcstransd /var/lock/subsys/mcstrans
+if [ -f /var/lock/subsys/mcstrans ]; then
+   mv /var/lock/subsys/mcstrans /var/lock/subsys/mcstransd
 fi
 
 %preun
@@ -86,6 +88,9 @@ fi
 %{_usr}/share/mcstrans/util/*
 
 %changelog
+* Thu Sep 17 2009 Miroslav Grepl <mgrepl at redhat.com> 0.3.1-3
+- Fix init script
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pnemade at fedoraproject.org  Thu Sep 17 09:46:07 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 17 Sep 2009 09:46:07 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.28, 1.29 iso-codes.spec, 1.37,
	1.38 sources, 1.29, 1.30
Message-ID: <20090917094607.05F4511C00CE@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2004

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Thu Sep 17 2009 Parag Nemade <pnemade at redhat.com> - 3.10.3-1
- Update to 3.10.3




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	5 Aug 2009 05:02:09 -0000	1.28
+++ .cvsignore	17 Sep 2009 09:46:06 -0000	1.29
@@ -1 +1 @@
-iso-codes-3.10.2.tar.bz2
+iso-codes-3.10.3.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- iso-codes.spec	5 Aug 2009 05:02:09 -0000	1.37
+++ iso-codes.spec	17 Sep 2009 09:46:06 -0000	1.38
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.10.2
+Version:	3.10.3
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Thu Sep 17 2009 Parag Nemade <pnemade at redhat.com> - 3.10.3-1
+- Update to 3.10.3
+
 * Wed Aug 05 2009 Parag Nemade <pnemade at redhat.com> - 3.10.2-1
 - Update to 3.10.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	5 Aug 2009 05:02:09 -0000	1.29
+++ sources	17 Sep 2009 09:46:06 -0000	1.30
@@ -1 +1 @@
-1cf0aa3d1afe4cdfe5aceff1c6a53cde  iso-codes-3.10.2.tar.bz2
+64c1595a5191e01798827477737d6e21  iso-codes-3.10.3.tar.bz2



From michich at fedoraproject.org  Thu Sep 17 09:47:07 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Thu, 17 Sep 2009 09:47:07 +0000 (UTC)
Subject: rpms/jabbim/devel
	jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, NONE,
	1.1 jabbim.spec, 1.35, 1.36
Message-ID: <20090917094707.0815E11C00CE@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff 
Log Message:
* Thu Sep 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.10.svn20090907
- Fix a harmless traceback which abrt points out all the time.
  (jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, upstream)


jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff:
 chatwindow.py |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff ---
commit ba5008f5ea13306e905ca539affc42b1c14f827d
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Thu Sep 17 09:40:25 2009 +0000

    avoid a traceback when closing chatwindow with multiple open tabs
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=522973
    The traceback is harmless, but shows up in abrt all the time.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk at 4227 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/widgets/chatwindow.py b/widgets/chatwindow.py
index 95674de..5cef315 100644
--- a/widgets/chatwindow.py
+++ b/widgets/chatwindow.py
@@ -303,12 +303,12 @@ class chatWindow(QtGui.QMainWindow):
 					return w,i # tab, index
 		return None,0
 
-
 	def changeTab(self,index):
+		if index == -1:
+			return
 		try:
 			self.ui.chatTab.widget(index).chat.ui.line.setFocus(QtCore.Qt.MouseFocusReason)
 		except: pass
-		#try:
 		jid=unicode(self.ui.chatTab.widget(index).jid)
 		typ=unicode(self.ui.chatTab.widget(index).typ)
 		if len(unicode(jid).rsplit("/"))!=1:
@@ -318,7 +318,6 @@ class chatWindow(QtGui.QMainWindow):
 
 			#show=self.main.icons[unicode(res[resource].text(1))[0]]
 			#icon=self.main.getIcon(jid,show,size="16x16")
-		#else:
 		if typ=="chat":
 			#icon=self.main.getIcon(jid,self.main.icons[unicode(self.main.ui.roster.getUserItems(jid)[0].status)],size="16x16")
 			self.ui.chatTab.setTabIcon(index,self.ui.chatTab.widget(index).ic)
@@ -328,9 +327,6 @@ class chatWindow(QtGui.QMainWindow):
 		color=self.ui.chatTab.tabBar().palette().color(QtGui.QPalette.Foreground)
 		self.ui.chatTab.tabBar().setTabTextColor(index,color)
 
-
-
-
 		widget=self.ui.chatTab.widget(self.ui.chatTab.currentIndex())
 		if not widget:
 			return
@@ -378,8 +374,6 @@ class chatWindow(QtGui.QMainWindow):
 						w.chat.separator=True
 					else:
 						w.chat.separator=False
-		#except:
-			#pass
 
 	def isActiveWindow(self):
 		if sys.platform=="win32":


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- jabbim.spec	10 Sep 2009 17:21:52 -0000	1.35
+++ jabbim.spec	17 Sep 2009 09:47:06 -0000	1.36
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.9.svn%{svndate}%{?dist}
+Release:	0.10.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -15,6 +15,7 @@ Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
 Patch2:		jabbim-0.5-fix-message-loss.diff
+Patch3:		jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +46,7 @@ with the advanced functionality provided
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -100,6 +102,10 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.10.svn20090907
+- Fix a harmless traceback which abrt points out all the time.
+  (jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, upstream)
+
 * Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
 - Fix message loss because of a change in PyQt4 4.5.x.
   (jabbim-0.5-fix-message-loss.diff, committed upstream)



From xiashing at fedoraproject.org  Thu Sep 17 09:54:12 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Thu, 17 Sep 2009 09:54:12 +0000 (UTC)
Subject: rpms/quotatool/F-11 quotatool.spec,1.1,1.2
Message-ID: <20090917095412.E2F6611C00CE@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4645/F-11

Modified Files:
	quotatool.spec 
Log Message:

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/quotatool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- quotatool.spec	17 Sep 2009 08:07:31 -0000	1.1
+++ quotatool.spec	17 Sep 2009 09:54:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           quotatool
 Version:        1.4.10
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -22,6 +22,7 @@ It is suitable for use in scripts and ot
 %patch0 -p1 -b .destdir
 
 %build
+cp -p /usr/lib/rpm/config.{guess,sub} tools/
 %configure
 make %{?_smp_mflags}
 
@@ -42,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
+- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
+
+* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
+- Line added in %%configure to fix ppc64 failed build
+
 * Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
 - Makefile and Makefile.old in wrong order.
 



From xiashing at fedoraproject.org  Thu Sep 17 09:54:13 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Thu, 17 Sep 2009 09:54:13 +0000 (UTC)
Subject: rpms/quotatool/devel quotatool.spec,1.1,1.2
Message-ID: <20090917095413.0340311C01EA@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4645/devel

Modified Files:
	quotatool.spec 
Log Message:

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/quotatool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- quotatool.spec	17 Sep 2009 07:56:06 -0000	1.1
+++ quotatool.spec	17 Sep 2009 09:54:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           quotatool
 Version:        1.4.10
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -22,6 +22,7 @@ It is suitable for use in scripts and ot
 %patch0 -p1 -b .destdir
 
 %build
+cp -p /usr/lib/rpm/config.{guess,sub} tools/
 %configure
 make %{?_smp_mflags}
 
@@ -42,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
+- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
+
+* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
+- Line added in %%configure to fix ppc64 failed build
+
 * Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
 - Makefile and Makefile.old in wrong order.
 



From fujiwara at fedoraproject.org  Thu Sep 17 10:02:21 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Thu, 17 Sep 2009 10:02:21 +0000 (UTC)
Subject: rpms/ibus-anthy/devel .cvsignore, 1.18, 1.19 ibus-anthy-HEAD.patch, 
	1.2, 1.3 ibus-anthy.spec, 1.24, 1.25 sources, 1.19, 1.20
Message-ID: <20090917100221.5AECB11C00CE@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8172

Modified Files:
	.cvsignore ibus-anthy-HEAD.patch ibus-anthy.spec sources 
Log Message:

Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward()



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	7 Sep 2009 03:24:18 -0000	1.18
+++ .cvsignore	17 Sep 2009 10:02:20 -0000	1.19
@@ -1 +1 @@
-ibus-anthy-1.2.0.20090907.tar.gz
+ibus-anthy-1.2.0.20090917.tar.gz

ibus-anthy-HEAD.patch:
 0 files changed

Index: ibus-anthy-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy-HEAD.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-anthy-HEAD.patch	7 Sep 2009 15:28:16 -0000	1.2
+++ ibus-anthy-HEAD.patch	17 Sep 2009 10:02:20 -0000	1.3
@@ -1,214 +1 @@
-diff -urNp ibus-anthy-1.2.0.20090907-old/ChangeLog ibus-anthy-1.2.0.20090907/ChangeLog
---- ibus-anthy-1.2.0.20090907-old/ChangeLog	2009-09-07 11:41:22.000000000 +0900
-+++ ibus-anthy-1.2.0.20090907/ChangeLog	2009-09-07 23:24:51.000000000 +0900
-@@ -1,3 +1,11 @@
-+commit 4a9511c2691b83fc7f7e02e693e44ff9c80f9c34
-+Author: fujiwarat <takao.fujiwara1 at gmail.com>
-+Date:   2009-09-07 23:19:54 +0900
-+
-+    Fix 507 No module named thumb
-+
-+M	engine/Makefile.am
-+
- commit 627a6346eeebea547adb547e6254983cea6bc429
- Author: fujiwarat <takao.fujiwara1 at gmail.com>
- Date:   2009-09-07 11:37:46 +0900
-diff -urNp ibus-anthy-1.2.0.20090907-old/engine/Makefile.am ibus-anthy-1.2.0.20090907/engine/Makefile.am
---- ibus-anthy-1.2.0.20090907-old/engine/Makefile.am	2009-09-07 11:40:46.000000000 +0900
-+++ ibus-anthy-1.2.0.20090907/engine/Makefile.am	2009-09-07 23:23:58.000000000 +0900
-@@ -21,12 +21,13 @@
- engine_anthy_PYTHON = \
- 	engine.py \
- 	factory.py \
--	main.py \
--	tables.py \
- 	jastring.py \
--	segment.py \
--	romaji.py \
- 	kana.py \
-+	main.py \
-+	romaji.py \
-+	segment.py \
-+	tables.py \
-+	thumb.py \
- 	$(NULL)
- engine_anthydir = $(pkgdatadir)/engine
- 
-diff -urNp ibus-anthy-1.2.0.20090907-old/engine/Makefile.in ibus-anthy-1.2.0.20090907/engine/Makefile.in
---- ibus-anthy-1.2.0.20090907-old/engine/Makefile.in	2009-09-07 11:41:04.000000000 +0900
-+++ ibus-anthy-1.2.0.20090907/engine/Makefile.in	2009-09-07 23:24:34.000000000 +0900
-@@ -273,12 +273,13 @@ top_srcdir = @top_srcdir@
- engine_anthy_PYTHON = \
- 	engine.py \
- 	factory.py \
--	main.py \
--	tables.py \
- 	jastring.py \
--	segment.py \
--	romaji.py \
- 	kana.py \
-+	main.py \
-+	romaji.py \
-+	segment.py \
-+	tables.py \
-+	thumb.py \
- 	$(NULL)
- 
- engine_anthydir = $(pkgdatadir)/engine
-diff -urNp ibus-anthy-1.2.0.20090907-old/engine/thumb.py ibus-anthy-1.2.0.20090907/engine/thumb.py
---- ibus-anthy-1.2.0.20090907-old/engine/thumb.py	1970-01-01 09:00:00.000000000 +0900
-+++ ibus-anthy-1.2.0.20090907/engine/thumb.py	2009-09-07 23:23:58.000000000 +0900
-@@ -0,0 +1,153 @@
-+# -*- coding: utf-8 -*-
-+
-+import gtk
-+import gobject
-+import time
-+
-+import segment
-+
-+
-+_table = {
-+    'q': [u'?', u'',   u'?'],
-+    'w': [u'?', u'?', u'?'],
-+    'e': [u'?', u'?', u'?'],
-+    'r': [u'?', u'?', u'?'],
-+    't': [u'?', u'?', u'?'],
-+
-+    'y': [u'?', u'?', u'?'],
-+    'u': [u'?', u'?', u'?'],
-+    'i': [u'?', u'?', u'?'],
-+    'o': [u'?', u'?', u'?'],
-+    'p': [u',',  u'?', u'?'],
-+    '@': [u'?', u'',   u''],
-+    '[': [u'?', u'?', u''],
-+
-+    'a': [u'?', u'',   u'?'],
-+    's': [u'?', u'?', u'?'],
-+    'd': [u'?', u'?', u'?'],
-+    'f': [u'?', u'?', u'?'],
-+    'g': [u'?', u'?', u'?'],
-+
-+    'h': [u'?', u'?', u'?'],
-+    'j': [u'?', u'?', u'?'],
-+    'k': [u'?', u'?', u'?'],
-+    'l': [u'?', u'?', u'?'],
-+    ';': [u'?', u'?', u''],
-+
-+    'z': [u'.',  u'',   u'?'],
-+    'x': [u'?', u'?', u'?'],
-+    'c': [u'?', u'?', u'?'],
-+    'v': [u'?', u'?', u'?'],
-+    'b': [u'?', u'?', u'?'],
-+
-+    'n': [u'?', u'?', u'?'],
-+    'm': [u'?', u'?', u'?'],
-+    ',': [u'?', u'?', u'?'],
-+    '.': [u'?', u'?', u'?'],
-+    '/': [u'?', u'?', u''],
-+
-+    '1': [u'1',  u'',   u'?'],
-+    '2': [u'2',  u'',   u'/'],
-+    '4': [u'4',  u'',   u'?'],
-+    '5': [u'5',  u'',   u'?'],
-+
-+    '6': [u'6',  u'[',  u''],
-+    '7': [u'7',  u']',  u''],
-+    '8': [u'8',  u'(',  u''],
-+    '9': [u'9',  u')',  u''],
-+}
-+
-+_shift_table = {
-+    'H': u'?',
-+    'X': u'?',
-+    'V': u'?',
-+    'B': u'?',
-+    '>': u'?',
-+}
-+
-+table = {}
-+shift_table = {}
-+r_table = {}
-+
-+for k in _table.keys():
-+    table[ord(k)] = _table[k]
-+    for c in _table[k]:
-+        r_table[c] = k
-+
-+for k in _shift_table.keys():
-+    shift_table[ord(k)] = _shift_table[k]
-+    r_table[_shift_table[k]] = k
-+
-+kana_voiced_consonant_rule = {
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+    u"??" : u"?",
-+}
-+
-+_UNFINISHED_HIRAGANA = set(u"????????????????????")
-+
-+class ThumbShiftSegment(segment.Segment):
-+    
-+    def __init__(self, enchars=u"", jachars=u""):
-+        if not jachars:
-+            if u'!' <= enchars <= u'~':
-+                jachars = segment.unichar_half_to_full(enchars)
-+            else:
-+                jachars = enchars
-+                enchars = r_table.get(jachars, u'')
-+        super(ThumbShiftSegment, self).__init__(enchars, jachars)
-+
-+    def is_finished(self):
-+        return not (self._jachars in _UNFINISHED_HIRAGANA)
-+
-+    def append(self, enchar):
-+        if enchar == u"\0" or enchar == u"":
-+            return []
-+        text = self._jachars + enchar
-+        jachars = kana_voiced_consonant_rule.get(text, None)
-+        if jachars:
-+            self._enchars = self._enchars + r_table.get(enchar, u'')
-+            self._jachars = jachars
-+            return []
-+        return [ThumbShiftSegment(enchar)]
-+
-+    def prepend(self, enchar):
-+        if enchar == u"\0" or enchar == u"":
-+            return []
-+        if self._jachars == u"":
-+            if 0x21 <= enchars <= 0x7e:
-+                self._enchars = enchar
-+                self._jachars = segment.unichar_half_to_full(enchars)
-+            else:
-+                self._enchars = r_table.get(enchar, u'')
-+                self._jachars = enchar
-+            return []
-+        return [ThumbShiftSegment(enchar)]
-+
-+    def pop(self, index=-1):
-+        self._enchars = u''
-+        self._jachars = u''
-+        return
-+
+


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ibus-anthy.spec	7 Sep 2009 15:28:16 -0000	1.24
+++ ibus-anthy.spec	17 Sep 2009 10:02:20 -0000	1.25
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
-Version:    1.2.0.20090907
-Release:    2%{?dist}
+Version:    1.2.0.20090917
+Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     ibus-anthy-HEAD.patch
+# Patch0:     ibus-anthy-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@ libanthy.
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 
 %build
 %configure --disable-static
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Sep 17 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090917-1
+- Update to 1.2.0.20090917
+- Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward()
+
 * Mon Sep 07 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090907-2
 - Fix a build issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	7 Sep 2009 03:24:19 -0000	1.19
+++ sources	17 Sep 2009 10:02:20 -0000	1.20
@@ -1 +1 @@
-29a02d3148f5683981f250807a9c78c6  ibus-anthy-1.2.0.20090907.tar.gz
+b6f1d830346e447908d670bc267391a9  ibus-anthy-1.2.0.20090917.tar.gz



From xiashing at fedoraproject.org  Thu Sep 17 10:07:34 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Thu, 17 Sep 2009 10:07:34 +0000 (UTC)
Subject: rpms/quotatool/EL-5 import.log,1.1,1.2 quotatool.spec,1.1,1.2
Message-ID: <20090917100734.CC0F311C00CE@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9742/EL-5

Modified Files:
	import.log quotatool.spec 
Log Message:

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 08:09:18 -0000	1.1
+++ import.log	17 Sep 2009 10:07:34 -0000	1.2
@@ -1 +1,2 @@
 quotatool-1_4_10-5_fc11:EL-5:quotatool-1.4.10-5.fc11.src.rpm:1253174717
+quotatool-1_4_10-7_fc11:EL-5:quotatool-1.4.10-7.fc11.src.rpm:1253181786


Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/quotatool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- quotatool.spec	17 Sep 2009 08:09:19 -0000	1.1
+++ quotatool.spec	17 Sep 2009 10:07:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           quotatool
 Version:        1.4.10
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -22,6 +22,7 @@ It is suitable for use in scripts and ot
 %patch0 -p1 -b .destdir
 
 %build
+cp -p /usr/lib/rpm/config.{guess,sub} tools/
 %configure
 make %{?_smp_mflags}
 
@@ -42,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
+- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
+
+* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
+- Line added in %%configure to fix ppc64 failed build
+
 * Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
 - Makefile and Makefile.old in wrong order.
 



From cwickert at fedoraproject.org  Thu Sep 17 10:27:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Sep 2009 10:27:59 +0000 (UTC)
Subject: rpms/rednotebook/F-11 rednotebook-0.8.6-mainwindow.glade.patch, NONE,
	1.1 rednotebook.spec, 1.18, 1.19
Message-ID: <20090917102759.4CB4611C01EA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16349/F-11

Modified Files:
	rednotebook.spec 
Added Files:
	rednotebook-0.8.6-mainwindow.glade.patch 
Log Message:
* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-2
- Fix libglade error with GTK 2.16.6 (#523880)


rednotebook-0.8.6-mainwindow.glade.patch:
 mainWindow.glade  |    6 +++---
 main_window.glade |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE rednotebook-0.8.6-mainwindow.glade.patch ---
diff -dur rednotebook-0.8.6.orig/rednotebook/files/main_window.glade rednotebook-0.8.6/rednotebook/files/main_window.glade
--- rednotebook-0.8.6.orig/rednotebook/files/main_window.glade	2009-08-31 13:49:42.000000000 +0200
+++ rednotebook-0.8.6/rednotebook/files/main_window.glade	2009-09-17 12:13:58.000000000 +0200
@@ -380,7 +380,7 @@
                                 <property name="visible">True</property>
                                 <signal name="changed" handler="on_searchTypeBox_changed"/>
                                 <child>
-                                  <widget class="GtkCellRendererText" id="cellrenderertext3"/>
+                                  <widget class="GtkCellRendererText" id="cellrenderertext5"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -395,7 +395,7 @@
                               <widget class="GtkComboBoxEntry" id="searchBox">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkCellRendererText" id="cellrenderertext2"/>
+                                  <widget class="GtkCellRendererText" id="cellrenderertext4"/>
                                 </child>
                               </widget>
                               <packing>
@@ -454,7 +454,7 @@
                             <property name="visible">True</property>
                             <signal name="changed" handler="on_cloudComboBox_changed"/>
                             <child>
-                              <widget class="GtkCellRendererText" id="cellrenderertext1"/>
+                              <widget class="GtkCellRendererText" id="cellrenderertext3"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
diff -dur rednotebook-0.8.6.orig/rednotebook/files/mainWindow.glade rednotebook-0.8.6/rednotebook/files/mainWindow.glade
--- rednotebook-0.8.6.orig/rednotebook/files/mainWindow.glade	2009-09-04 18:10:17.000000000 +0200
+++ rednotebook-0.8.6/rednotebook/files/mainWindow.glade	2009-09-17 12:14:27.000000000 +0200
@@ -144,7 +144,7 @@
                                 <property name="model">liststore5</property>
                                 <signal name="changed" handler="on_searchTypeBox_changed"/>
                                 <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                                  <object class="GtkCellRendererText" id="cellrenderertext5"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -159,7 +159,7 @@
                               <object class="GtkComboBoxEntry" id="searchBox">
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                                  <object class="GtkCellRendererText" id="cellrenderertext4"/>
                                 </child>
                               </object>
                               <packing>
@@ -218,7 +218,7 @@
                             <property name="model">liststore3</property>
                             <signal name="changed" handler="on_cloudComboBox_changed"/>
                             <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                              <object class="GtkCellRendererText" id="cellrenderertext3"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- rednotebook.spec	4 Sep 2009 18:31:22 -0000	1.18
+++ rednotebook.spec	17 Sep 2009 10:27:58 -0000	1.19
@@ -2,13 +2,14 @@
 
 Name:           rednotebook
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         rednotebook-0.8.6-mainwindow.glade.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -30,7 +31,7 @@ and does so in style.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .orig
 
 %build
 python setup.py build
@@ -71,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-2
+- Fix libglade error with GTK 2.16.6 (#523880)
+
 * Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
 - Updated to new upstream version 0.8.6
 



From cwickert at fedoraproject.org  Thu Sep 17 10:27:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Sep 2009 10:27:59 +0000 (UTC)
Subject: rpms/rednotebook/devel rednotebook-0.8.6-mainwindow.glade.patch,
	NONE, 1.1 rednotebook.spec, 1.20, 1.21
Message-ID: <20090917102759.4942B11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16349/devel

Modified Files:
	rednotebook.spec 
Added Files:
	rednotebook-0.8.6-mainwindow.glade.patch 
Log Message:
* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-2
- Fix libglade error with GTK 2.16.6 (#523880)


rednotebook-0.8.6-mainwindow.glade.patch:
 mainWindow.glade  |    6 +++---
 main_window.glade |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE rednotebook-0.8.6-mainwindow.glade.patch ---
diff -dur rednotebook-0.8.6.orig/rednotebook/files/main_window.glade rednotebook-0.8.6/rednotebook/files/main_window.glade
--- rednotebook-0.8.6.orig/rednotebook/files/main_window.glade	2009-08-31 13:49:42.000000000 +0200
+++ rednotebook-0.8.6/rednotebook/files/main_window.glade	2009-09-17 12:13:58.000000000 +0200
@@ -380,7 +380,7 @@
                                 <property name="visible">True</property>
                                 <signal name="changed" handler="on_searchTypeBox_changed"/>
                                 <child>
-                                  <widget class="GtkCellRendererText" id="cellrenderertext3"/>
+                                  <widget class="GtkCellRendererText" id="cellrenderertext5"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -395,7 +395,7 @@
                               <widget class="GtkComboBoxEntry" id="searchBox">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkCellRendererText" id="cellrenderertext2"/>
+                                  <widget class="GtkCellRendererText" id="cellrenderertext4"/>
                                 </child>
                               </widget>
                               <packing>
@@ -454,7 +454,7 @@
                             <property name="visible">True</property>
                             <signal name="changed" handler="on_cloudComboBox_changed"/>
                             <child>
-                              <widget class="GtkCellRendererText" id="cellrenderertext1"/>
+                              <widget class="GtkCellRendererText" id="cellrenderertext3"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
diff -dur rednotebook-0.8.6.orig/rednotebook/files/mainWindow.glade rednotebook-0.8.6/rednotebook/files/mainWindow.glade
--- rednotebook-0.8.6.orig/rednotebook/files/mainWindow.glade	2009-09-04 18:10:17.000000000 +0200
+++ rednotebook-0.8.6/rednotebook/files/mainWindow.glade	2009-09-17 12:14:27.000000000 +0200
@@ -144,7 +144,7 @@
                                 <property name="model">liststore5</property>
                                 <signal name="changed" handler="on_searchTypeBox_changed"/>
                                 <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                                  <object class="GtkCellRendererText" id="cellrenderertext5"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -159,7 +159,7 @@
                               <object class="GtkComboBoxEntry" id="searchBox">
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                                  <object class="GtkCellRendererText" id="cellrenderertext4"/>
                                 </child>
                               </object>
                               <packing>
@@ -218,7 +218,7 @@
                             <property name="model">liststore3</property>
                             <signal name="changed" handler="on_cloudComboBox_changed"/>
                             <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                              <object class="GtkCellRendererText" id="cellrenderertext3"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- rednotebook.spec	4 Sep 2009 18:31:22 -0000	1.20
+++ rednotebook.spec	17 Sep 2009 10:27:57 -0000	1.21
@@ -2,13 +2,14 @@
 
 Name:           rednotebook
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         rednotebook-0.8.6-mainwindow.glade.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -30,7 +31,7 @@ and does so in style.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .orig
 
 %build
 python setup.py build
@@ -71,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-2
+- Fix libglade error with GTK 2.16.6 (#523880)
+
 * Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
 - Updated to new upstream version 0.8.6
 



From harald at fedoraproject.org  Thu Sep 17 10:29:32 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 17 Sep 2009 10:29:32 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.11, 1.12 dracut.spec, 1.26,
	1.27 sources, 1.12, 1.13
Message-ID: <20090917102932.40BE111C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16958

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-12
- removed lvm/mdraid/dmraid lock files
- add missing ifname= files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Sep 2009 18:02:43 -0000	1.11
+++ .cvsignore	17 Sep 2009 10:29:32 -0000	1.12
@@ -1 +1 @@
-dracut-001-6f0e469d.tar.bz2
+dracut-001-0f7e10ce.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- dracut.spec	9 Sep 2009 19:19:17 -0000	1.26
+++ dracut.spec	17 Sep 2009 10:29:32 -0000	1.27
@@ -1,4 +1,4 @@
-%define gittag 6f0e469d
+%define gittag 0f7e10ce
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 001
-Release: 9%{?rdist}
+Release: 12%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -107,12 +107,13 @@ This package contains tools to assemble 
 %build
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
      sysconfdir=/etc mandir=%{_mandir}
 
+echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+
 %if ! 0%{?with_switch_root}
 rm -f $RPM_BUILD_ROOT/sbin/switch_root
 %endif
@@ -180,7 +181,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
-* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
+* Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-12
+- removed lvm/mdraid/dmraid lock files
+- add missing ifname= files
+
+* Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-11
+- generate dracut-version during rpm build time
+
+* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 001-10
+- add ifname= argument for persistent netdev names
+- new /initqueue-finished to check if the main loop can be left
+- copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf
+
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-9
 - added Requires: plymouth-scripts
 
 * Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Sep 2009 18:02:43 -0000	1.12
+++ sources	17 Sep 2009 10:29:32 -0000	1.13
@@ -1 +1 @@
-df4e82439d12aa0d6f17154881c354ac  dracut-001-6f0e469d.tar.bz2
+20f127543003896e26c7db6ecc664c92  dracut-001-0f7e10ce.tar.bz2



From kzak at fedoraproject.org  Thu Sep 17 10:39:41 2009
From: kzak at fedoraproject.org (kzak)
Date: Thu, 17 Sep 2009 10:39:41 +0000 (UTC)
Subject: rpms/util-linux-ng/F-11 util-linux-ng-2.14-mount-strictatime.patch, 
	NONE, 1.1 util-linux-ng.spec, 1.47, 1.48
Message-ID: <20090917103941.1E4C211C00CE@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22215

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.14-mount-strictatime.patch 
Log Message:
* Thu Sep 17 2009 Karel Zak <kzak at redhat.com> 2.14.2-11
- fix #501350 - there's no way to turn off the relatime filesystem mount misfeature.


util-linux-ng-2.14-mount-strictatime.patch:
 mount.8           |   21 ++++++++++++++++++---
 mount.c           |    4 ++++
 mount_constants.h |    3 +++
 3 files changed, 25 insertions(+), 3 deletions(-)

--- NEW FILE util-linux-ng-2.14-mount-strictatime.patch ---

This is backport of upstream patches:

>From 96f3bfbc7cbe4a96be60337bb58c361042b6df68 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Fri, 11 Sep 2009 14:08:40 +0200
Subject: [PATCH] mount: more explicitly explain 'strictatime' in mount.

>From ed64b8d0fc945ce49041f313c453b6b21d68b832 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Fri, 27 Mar 2009 00:47:22 +0000
Subject: [PATCH] mount: Add strictatime support


diff -up util-linux-ng-2.14.2/mount/mount.8.kzak util-linux-ng-2.14.2/mount/mount.8
--- util-linux-ng-2.14.2/mount/mount.8.kzak	2009-09-17 12:30:54.000000000 +0200
+++ util-linux-ng-2.14.2/mount/mount.8	2009-09-17 12:33:32.000000000 +0200
@@ -658,7 +658,9 @@ All I/O to the file system should be don
 option.)
 .TP
 .B atime
-Update inode access time for each access. This is the default.
+Update inode access time for each access. See also the
+.B strictatime
+mount option.
 .TP
 .B noatime
 Do not update inode access times on this file system (e.g, for faster
@@ -794,8 +796,21 @@ since the last time it was modified.)
 .B norelatime
 Do not use
 .B relatime
-feature (e.g, for systems where the feature is enabled by default, for
-more details see mount options in /proc/mounts).
+feature. See also the
+.B strictatime
+mount option.
+.TP
+.B strictatime
+Allows to explicitly requesting full atime updates. This makes it
+possible for kernel to defaults to
+.B relatime
+or
+.B noatime
+but still allow userspace to override it. For more details about the default
+system mount options see /proc/mounts.
+.TP
+.B nostrictatime
+Use the kernel's default behaviour for inode access time updates.
 .TP
 .B suid
 Allow set-user-identifier or set-group-identifier bits to take
diff -up util-linux-ng-2.14.2/mount/mount.c.kzak util-linux-ng-2.14.2/mount/mount.c
--- util-linux-ng-2.14.2/mount/mount.c.kzak	2009-09-17 12:30:54.000000000 +0200
+++ util-linux-ng-2.14.2/mount/mount.c	2009-09-17 12:32:06.000000000 +0200
@@ -180,6 +180,10 @@ static const struct opt_map opt_map[] = 
   { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
 					  to mtime/ctime */
 #endif
+#ifdef MS_STRICTATIME
+  { "strictatime", 0, 0, MS_STRICTATIME }, /* Strict atime semantics */
+  { "nostrictatime", 0, 1, MS_STRICTATIME }, /* kernel default atime */
+#endif
   { "kudzu", 0, 0, MS_COMMENT },	/* Silently remove this option (backwards compat use only - deprecated) */
   { "managed", 0, 0, MS_COMMENT },	/* Silently remove this option */
   { "nofail",	0, 0, MS_COMMENT},	/* Do not fail if ENOENT on dev */
diff -up util-linux-ng-2.14.2/mount/mount_constants.h.kzak util-linux-ng-2.14.2/mount/mount_constants.h
--- util-linux-ng-2.14.2/mount/mount_constants.h.kzak	2009-01-09 11:01:34.000000000 +0100
+++ util-linux-ng-2.14.2/mount/mount_constants.h	2009-09-17 12:31:21.000000000 +0200
@@ -59,6 +59,9 @@
 #ifndef MS_I_VERSION
 #define MS_I_VERSION	(1<<23)	/* update inode I_version field */
 #endif
+#ifndef MS_STRICTATIME
+#define MS_STRICTATIME	(1<<24) /* strict atime semantics */
+#endif
 /*
  * Magic mount flag number. Had to be or-ed to the flag values.
  */


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-11/util-linux-ng.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- util-linux-ng.spec	11 Sep 2009 12:27:08 -0000	1.47
+++ util-linux-ng.spec	17 Sep 2009 10:39:40 -0000	1.48
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -122,6 +122,8 @@ Patch14: util-linux-ng-2.14-renice-n.pat
 Patch15: util-linux-ng-2.14-mount-man-ext4.patch
 # 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
 Patch16: util-linux-ng-2.14-sfdisk-dump.patch
+# 501350 - There's no way to turn off the relatime filesystem mount misfeature.
+Patch17: util-linux-ng-2.14-mount-strictatime.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -149,6 +151,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 unset LINGUAS || :
@@ -550,6 +553,9 @@ exit 0
 /sbin/losetup
 
 %changelog
+* Thu Sep 17 2009 Karel Zak <kzak at redhat.com> 2.14.2-11
+- fix #501350 - there's no way to turn off the relatime filesystem mount misfeature.
+
 * Fri Sep 11 2009 Karel Zak <kzak at redhat.com> 2.14.2-10
 - fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set 
 



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:23 +0000
Subject: [pkgdb] xdotool: slankes has requested commit
Message-ID: <20090917104522.1D30B10F895@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on xdotool (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:21 +0000
Subject: [pkgdb] xdotool: slankes has requested watchbugzilla
Message-ID: <20090917104522.1A61410F894@bastion2.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on xdotool (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:29 +0000
Subject: [pkgdb] xdotool: slankes has requested watchcommits
Message-ID: <20090917104527.6D4CA10F89B@bastion2.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on xdotool (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:36 +0000
Subject: [pkgdb] xdotool: slankes has requested watchbugzilla
Message-ID: <20090917104535.2BDEF10F89E@bastion2.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on xdotool (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:38 +0000
Subject: [pkgdb] xdotool: slankes has requested watchcommits
Message-ID: <20090917104536.E241F10F8A1@bastion2.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on xdotool (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:45 +0000
Subject: [pkgdb] xdotool: slankes has requested watchbugzilla
Message-ID: <20090917104544.BB47010F8A8@bastion2.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on xdotool (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:41 +0000
Subject: [pkgdb] xdotool: slankes has requested commit
Message-ID: <20090917104539.1110D10F8A4@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on xdotool (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:47 +0000
Subject: [pkgdb] xdotool: slankes has requested watchcommits
Message-ID: <20090917104546.768A210F881@bastion2.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on xdotool (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 10:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 10:45:49 +0000
Subject: [pkgdb] xdotool: slankes has requested commit
Message-ID: <20090917104548.29F0310F88C@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on xdotool (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From coec at fedoraproject.org  Thu Sep 17 10:54:18 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 17 Sep 2009 10:54:18 +0000 (UTC)
Subject: rpms/RackTables/devel RackTables.conf, NONE, 1.1 RackTables.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 quickinstall.sh, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917105418.B2C5811C00CE@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/RackTables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29119/devel

Modified Files:
	.cvsignore sources 
Added Files:
	RackTables.conf RackTables.spec import.log quickinstall.sh 
Log Message:
Initial commit of RackTables package



--- NEW FILE RackTables.conf ---
alias /racktables /usr/share/RackTables


--- NEW FILE RackTables.spec ---
Name:           RackTables
Version:        0.17.4
Release:        7%{?dist}
Summary:        A datacenter asset management system

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        GPLv2 and CC-BY-SA
URL:            http://racktables.org/
Source0:        http://racktables.org/files/%{name}-%{version}.tar.gz
Source1:        RackTables.conf
Source2:        quickinstall.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring mysql-server php-ldap
BuildArch:      noarch

%description
A datacenter asset management system.

%clean
rm -rf $RPM_BUILD_ROOT

%prep
%setup -q

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
# Remove zero-length files
rm -f js/codepress/engines/older.js js/codepress/engines/khtml.js

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}

cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
install %{S:2} -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/quickinstall.sh
echo "// Empty on install" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php

cd $RPM_BUILD_ROOT%{_datadir}/%{name}/inc
ln -s  ../../../..%{_sysconfdir}/%{name}/secret.php
cd -

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%config(noreplace) %attr(0664,apache,apache) %{_sysconfdir}/%{name}/secret.php
%doc COPYING LICENSE ChangeLog README
%{_datadir}/%{name}/
%dir %{_sysconfdir}/%{name}

%changelog
* Sun Sep 13 2009 <colin.coe at gmail.com> - 0.17.4-7
- Simplify setup
- Step making docdir/name
- Simplify copy
- Make contrib/quickinstall.sh quit unless it's run by root

* Fri Sep 11 2009 <colin.coe at gmail.com> - 0.17.4-6
- Own /etc/RackTables/
- Fix duplicate files
- Set ownership/mode of /etc/RackTables/secret.php correctly
- Fix contrib/quickinstall.sh to write a valid /etc/RackTables/secret.php

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-5
- Fix danling symlink

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-4
- Removed redundant 'RackTables' from the summary and description
- Changed license as suggested
- Put secret.php into /etc/RackTables and created symlink back to {_datadir}/{name}/inc
- Removed 'mkdir -p $RPM_BUILD_ROOT{_docdir}'
- Stopped listing inc/secret.php twice

* Mon Sep 7 2009 <colin.coe at gmail.com> - 0.17.4-3
- Add 'contrib/quickinstall.sh' to add people installing RackTables
- Add php-ldap as a dependency

* Tue Sep 1 2009 <colin.coe at gmail.com> - 0.17.4-2
- Split out Apache config file
- Added mysql-server as a dependency

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.17.4-1
- Initial packaging


--- NEW FILE import.log ---
RackTables-0_17_4-7_fc11:HEAD:RackTables-0.17.4-7.fc11.src.rpm:1253184384


--- NEW FILE quickinstall.sh ---
#!/bin/sh

# Author:  colin.coe at gmail.com
# Date:    Sep 7, 2009
# Updated: Sep 10, 2009
# Purpose: Simple quickstart script
# License: Create Commons Attribution-Share Alike 3.0 Unported

if [ `id -u` -ne 0 ]; then
  echo This script must be run as root, exiting...
  exit 1
fi

service mysqld status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service mysqld start
  /sbin/chkconfig mysqld on
fi

service httpd status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service httpd start
  /sbin/chkconfig httpd on
else
  /sbin/service httpd reload
fi

RT_DB_USER=rackuser
RT_DB_PASS=rackpw

echo 
echo "The default DB username for RackTables is '${RT_DB_USER}'"
echo "If you want to change the username, enter a new username or just press enter"
read USER
echo "The default DB password for RackTables is '${RT_DB_PASS}'"
echo "If you want to change the username, enter a new username or just press enter"
read PASS

[ -n "${USER}" ] && RT_DB_USER="${USER}"
[ -n "${PASS}" ] && RT_DB_PASS="${PASS}"

sed -e "s/'username'/'${RT_DB_USER}'/" -e "s/'password'/'${RT_DB_PASS}'/" /usr/share/RackTables/inc/secret-sample.php > /usr/share/RackTables/inc/secret.php

echo -e "You need the MySQL root password to continue.  If you don't know it, ^C here and\ncome back when you have the password."
echo
echo Enter MySQL root password
mysql -uroot -p -e "
create database racktables;
grant all on racktables.* to root;
grant all on racktables.* to root at localhost;
grant all on racktables.* to ${RT_DB_USER};
grant all on racktables.* to ${RT_DB_USER}@localhost;
set password for ${RT_DB_USER}@localhost=password('${RT_DB_PASS}');
exit"
echo
echo
echo You should be able to browse to http://`hostname`/racktables/install.php
echo to complete the installation.

exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:43:37 -0000	1.1
+++ .cvsignore	17 Sep 2009 10:54:18 -0000	1.2
@@ -0,0 +1 @@
+RackTables-0.17.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:43:38 -0000	1.1
+++ sources	17 Sep 2009 10:54:18 -0000	1.2
@@ -0,0 +1 @@
+c15155c67749b15f1690131c35266ca7  RackTables-0.17.4.tar.gz



From jreznik at fedoraproject.org  Thu Sep 17 10:55:05 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 17 Sep 2009 10:55:05 +0000 (UTC)
Subject: rpms/kio-ftps/devel import.log, NONE, 1.1 kio-ftps.spec, NONE,
	1.1 qtnetwork.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917105505.CFF9511C00CE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kio-ftps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kio-ftps.spec qtnetwork.patch 
Log Message:
Initial import



--- NEW FILE import.log ---
kio-ftps-0_2-1_fc11:HEAD:kio-ftps-0.2-1.fc11.src.rpm:1253184678


--- NEW FILE kio-ftps.spec ---
Name:           kio-ftps
Version:        0.2
Release:        1%{?dist}
Summary:        An ftps KIO slave for KDE

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://kasablanca.berlios.de/kio-ftps/
Source0:        http://download.berlios.de/kasablanca/%{name}-%{version}.tar.gz
Patch0:         qtnetwork.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs-devel >= 4
BuildRequires:  kde-filesystem >= 4
BuildRequires:  cmake

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
An ftps KIO slave for KDE, based on rfc4217. It should work yet with
most server implementations.

%prep
%setup -q -n %{name}
%patch0 -p0 -b .qtnetwork

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README LICENSE.txt rfc4217.txt
%{_kde4_libdir}/kde4/kio_ftps.so
%{_kde4_datadir}/kde4/services/ftps.protocol


%changelog
* Tue Apr 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.2-1
- initial package
qtnetwork.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qtnetwork.patch ---
--- CMakeLists.txt.qtnetwork	2008-02-17 23:03:38.000000000 +0100
+++ CMakeLists.txt	2009-04-28 16:33:20.393489520 +0200
@@ -8,7 +8,7 @@
 
 kde4_add_plugin( kio_ftps ${mySources} )
 
-target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio )
+target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio QtNetwork)
 
 install(TARGETS kio_ftps  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES ftps.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kio-ftps/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:41:55 -0000	1.1
+++ .cvsignore	17 Sep 2009 10:55:05 -0000	1.2
@@ -0,0 +1 @@
+kio-ftps-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kio-ftps/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:41:56 -0000	1.1
+++ sources	17 Sep 2009 10:55:05 -0000	1.2
@@ -0,0 +1 @@
+33c555a9eee0cdfd68ae9050f6502069  kio-ftps-0.2.tar.gz



From coec at fedoraproject.org  Thu Sep 17 10:56:54 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 17 Sep 2009 10:56:54 +0000 (UTC)
Subject: rpms/RackTables/F-10 RackTables.conf, NONE, 1.1 RackTables.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 quickinstall.sh, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917105654.A460211C00CE@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/RackTables/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30457/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	RackTables.conf RackTables.spec import.log quickinstall.sh 
Log Message:
Initial commit of RackTables package



--- NEW FILE RackTables.conf ---
alias /racktables /usr/share/RackTables


--- NEW FILE RackTables.spec ---
Name:           RackTables
Version:        0.17.4
Release:        7%{?dist}
Summary:        A datacenter asset management system

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        GPLv2 and CC-BY-SA
URL:            http://racktables.org/
Source0:        http://racktables.org/files/%{name}-%{version}.tar.gz
Source1:        RackTables.conf
Source2:        quickinstall.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring mysql-server php-ldap
BuildArch:      noarch

%description
A datacenter asset management system.

%clean
rm -rf $RPM_BUILD_ROOT

%prep
%setup -q

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
# Remove zero-length files
rm -f js/codepress/engines/older.js js/codepress/engines/khtml.js

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}

cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
install %{S:2} -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/quickinstall.sh
echo "// Empty on install" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php

cd $RPM_BUILD_ROOT%{_datadir}/%{name}/inc
ln -s  ../../../..%{_sysconfdir}/%{name}/secret.php
cd -

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%config(noreplace) %attr(0664,apache,apache) %{_sysconfdir}/%{name}/secret.php
%doc COPYING LICENSE ChangeLog README
%{_datadir}/%{name}/
%dir %{_sysconfdir}/%{name}

%changelog
* Sun Sep 13 2009 <colin.coe at gmail.com> - 0.17.4-7
- Simplify setup
- Step making docdir/name
- Simplify copy
- Make contrib/quickinstall.sh quit unless it's run by root

* Fri Sep 11 2009 <colin.coe at gmail.com> - 0.17.4-6
- Own /etc/RackTables/
- Fix duplicate files
- Set ownership/mode of /etc/RackTables/secret.php correctly
- Fix contrib/quickinstall.sh to write a valid /etc/RackTables/secret.php

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-5
- Fix danling symlink

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-4
- Removed redundant 'RackTables' from the summary and description
- Changed license as suggested
- Put secret.php into /etc/RackTables and created symlink back to {_datadir}/{name}/inc
- Removed 'mkdir -p $RPM_BUILD_ROOT{_docdir}'
- Stopped listing inc/secret.php twice

* Mon Sep 7 2009 <colin.coe at gmail.com> - 0.17.4-3
- Add 'contrib/quickinstall.sh' to add people installing RackTables
- Add php-ldap as a dependency

* Tue Sep 1 2009 <colin.coe at gmail.com> - 0.17.4-2
- Split out Apache config file
- Added mysql-server as a dependency

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.17.4-1
- Initial packaging


--- NEW FILE import.log ---
RackTables-0_17_4-7_fc11:F-10:RackTables-0.17.4-7.fc11.src.rpm:1253184929


--- NEW FILE quickinstall.sh ---
#!/bin/sh

# Author:  colin.coe at gmail.com
# Date:    Sep 7, 2009
# Updated: Sep 10, 2009
# Purpose: Simple quickstart script
# License: Create Commons Attribution-Share Alike 3.0 Unported

if [ `id -u` -ne 0 ]; then
  echo This script must be run as root, exiting...
  exit 1
fi

service mysqld status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service mysqld start
  /sbin/chkconfig mysqld on
fi

service httpd status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service httpd start
  /sbin/chkconfig httpd on
else
  /sbin/service httpd reload
fi

RT_DB_USER=rackuser
RT_DB_PASS=rackpw

echo 
echo "The default DB username for RackTables is '${RT_DB_USER}'"
echo "If you want to change the username, enter a new username or just press enter"
read USER
echo "The default DB password for RackTables is '${RT_DB_PASS}'"
echo "If you want to change the username, enter a new username or just press enter"
read PASS

[ -n "${USER}" ] && RT_DB_USER="${USER}"
[ -n "${PASS}" ] && RT_DB_PASS="${PASS}"

sed -e "s/'username'/'${RT_DB_USER}'/" -e "s/'password'/'${RT_DB_PASS}'/" /usr/share/RackTables/inc/secret-sample.php > /usr/share/RackTables/inc/secret.php

echo -e "You need the MySQL root password to continue.  If you don't know it, ^C here and\ncome back when you have the password."
echo
echo Enter MySQL root password
mysql -uroot -p -e "
create database racktables;
grant all on racktables.* to root;
grant all on racktables.* to root at localhost;
grant all on racktables.* to ${RT_DB_USER};
grant all on racktables.* to ${RT_DB_USER}@localhost;
set password for ${RT_DB_USER}@localhost=password('${RT_DB_PASS}');
exit"
echo
echo
echo You should be able to browse to http://`hostname`/racktables/install.php
echo to complete the installation.

exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:43:37 -0000	1.1
+++ .cvsignore	17 Sep 2009 10:56:52 -0000	1.2
@@ -0,0 +1 @@
+RackTables-0.17.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:43:38 -0000	1.1
+++ sources	17 Sep 2009 10:56:53 -0000	1.2
@@ -0,0 +1 @@
+c15155c67749b15f1690131c35266ca7  RackTables-0.17.4.tar.gz



From jreznik at fedoraproject.org  Thu Sep 17 11:00:45 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 17 Sep 2009 11:00:45 +0000 (UTC)
Subject: rpms/kio-ftps/F-10 import.log, NONE, 1.1 kio-ftps.spec, NONE,
	1.1 qtnetwork.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917110045.45C4711C0261@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kio-ftps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32279/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kio-ftps.spec qtnetwork.patch 
Log Message:
Initial import



--- NEW FILE import.log ---
kio-ftps-0_2-1_fc11:F-10:kio-ftps-0.2-1.fc11.src.rpm:1253185009


--- NEW FILE kio-ftps.spec ---
Name:           kio-ftps
Version:        0.2
Release:        1%{?dist}
Summary:        An ftps KIO slave for KDE

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://kasablanca.berlios.de/kio-ftps/
Source0:        http://download.berlios.de/kasablanca/%{name}-%{version}.tar.gz
Patch0:         qtnetwork.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs-devel >= 4
BuildRequires:  kde-filesystem >= 4
BuildRequires:  cmake

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
An ftps KIO slave for KDE, based on rfc4217. It should work yet with
most server implementations.

%prep
%setup -q -n %{name}
%patch0 -p0 -b .qtnetwork

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README LICENSE.txt rfc4217.txt
%{_kde4_libdir}/kde4/kio_ftps.so
%{_kde4_datadir}/kde4/services/ftps.protocol


%changelog
* Tue Apr 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.2-1
- initial package
qtnetwork.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qtnetwork.patch ---
--- CMakeLists.txt.qtnetwork	2008-02-17 23:03:38.000000000 +0100
+++ CMakeLists.txt	2009-04-28 16:33:20.393489520 +0200
@@ -8,7 +8,7 @@
 
 kde4_add_plugin( kio_ftps ${mySources} )
 
-target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio )
+target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio QtNetwork)
 
 install(TARGETS kio_ftps  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES ftps.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kio-ftps/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:41:55 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:00:44 -0000	1.2
@@ -0,0 +1 @@
+kio-ftps-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kio-ftps/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:41:56 -0000	1.1
+++ sources	17 Sep 2009 11:00:44 -0000	1.2
@@ -0,0 +1 @@
+33c555a9eee0cdfd68ae9050f6502069  kio-ftps-0.2.tar.gz



From jreznik at fedoraproject.org  Thu Sep 17 11:04:02 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 17 Sep 2009 11:04:02 +0000 (UTC)
Subject: rpms/kio-ftps/F-11 import.log, NONE, 1.1 kio-ftps.spec, NONE,
	1.1 qtnetwork.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917110402.C3DC411C00CE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kio-ftps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1309/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kio-ftps.spec qtnetwork.patch 
Log Message:
Initial import



--- NEW FILE import.log ---
kio-ftps-0_2-1_fc11:F-11:kio-ftps-0.2-1.fc11.src.rpm:1253185338


--- NEW FILE kio-ftps.spec ---
Name:           kio-ftps
Version:        0.2
Release:        1%{?dist}
Summary:        An ftps KIO slave for KDE

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://kasablanca.berlios.de/kio-ftps/
Source0:        http://download.berlios.de/kasablanca/%{name}-%{version}.tar.gz
Patch0:         qtnetwork.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs-devel >= 4
BuildRequires:  kde-filesystem >= 4
BuildRequires:  cmake

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
An ftps KIO slave for KDE, based on rfc4217. It should work yet with
most server implementations.

%prep
%setup -q -n %{name}
%patch0 -p0 -b .qtnetwork

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README LICENSE.txt rfc4217.txt
%{_kde4_libdir}/kde4/kio_ftps.so
%{_kde4_datadir}/kde4/services/ftps.protocol


%changelog
* Tue Apr 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.2-1
- initial package
qtnetwork.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qtnetwork.patch ---
--- CMakeLists.txt.qtnetwork	2008-02-17 23:03:38.000000000 +0100
+++ CMakeLists.txt	2009-04-28 16:33:20.393489520 +0200
@@ -8,7 +8,7 @@
 
 kde4_add_plugin( kio_ftps ${mySources} )
 
-target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio )
+target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio QtNetwork)
 
 install(TARGETS kio_ftps  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES ftps.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kio-ftps/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:41:55 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:03:59 -0000	1.2
@@ -0,0 +1 @@
+kio-ftps-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kio-ftps/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:41:56 -0000	1.1
+++ sources	17 Sep 2009 11:04:00 -0000	1.2
@@ -0,0 +1 @@
+33c555a9eee0cdfd68ae9050f6502069  kio-ftps-0.2.tar.gz



From kdudka at fedoraproject.org  Thu Sep 17 11:04:43 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu, 17 Sep 2009 11:04:43 +0000 (UTC)
Subject: rpms/nano/devel nano.spec,1.26,1.27
Message-ID: <20090917110443.79B3511C00CE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2031

Modified Files:
	nano.spec 
Log Message:
- do process install-info only without --excludedocs(#515943)


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nano.spec	25 Jul 2009 15:44:28 -0000	1.26
+++ nano.spec	17 Sep 2009 11:04:42 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:	A small text editor
 Name:		nano
 Version:	2.0.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
@@ -35,12 +35,16 @@ rm -f %{buildroot}%{_infodir}/dir
 %find_lang %{name}
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir
+if [ -f %{_infodir}/%{name}.info.gz ]; then
+  /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir
+fi
 exit 0
- 
+
 %preun
 if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir
+  if [ -f %{_infodir}/%{name}.info.gz ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir
+  fi
 fi
 exit 0
 
@@ -49,7 +53,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO 
+%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 %doc doc/nanorc.sample
 %doc doc/faq.html
 %{_bindir}/*
@@ -59,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Thu Sep 17 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.6-8
+- do process install-info only without --excludedocs(#515943)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From harald at fedoraproject.org  Thu Sep 17 11:06:10 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 17 Sep 2009 11:06:10 +0000 (UTC)
Subject: rpms/dracut/F-11 dracut.spec,1.11,1.12 sources,1.10,1.11
Message-ID: <20090917110610.906BF11C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3336

Modified Files:
	dracut.spec sources 
Log Message:
* Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-12
- removed lvm/mdraid/dmraid lock files
- add missing ifname= files



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dracut.spec	15 Sep 2009 13:57:13 -0000	1.11
+++ dracut.spec	17 Sep 2009 11:06:09 -0000	1.12
@@ -1,4 +1,4 @@
-%define gittag 4d924752
+%define gittag 0f7e10ce
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 001
-Release: 9%{?rdist}
+Release: 12%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -107,12 +107,13 @@ This package contains tools to assemble 
 %build
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
      sysconfdir=/etc mandir=%{_mandir}
 
+echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+
 %if ! 0%{?with_switch_root}
 rm -f $RPM_BUILD_ROOT/sbin/switch_root
 %endif
@@ -180,11 +181,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
-* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 001-9
+* Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-12
+- removed lvm/mdraid/dmraid lock files
+- add missing ifname= files
+
+* Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-11
+- generate dracut-version during rpm build time
+
+* Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 001-10
 - add ifname= argument for persistent netdev names
 - new /initqueue-finished to check if the main loop can be left
 - copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf
 
+* Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-9
+- added Requires: plymouth-scripts
+
 * Wed Sep 09 2009 Harald Hoyer <harald at redhat.com> 001-8
 - plymouth: use plymouth-populate-initrd
 - add add_drivers for dracut and dracut.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Sep 2009 13:57:13 -0000	1.10
+++ sources	17 Sep 2009 11:06:10 -0000	1.11
@@ -1 +1 @@
-563decee38dd5987709dba90328c35f2  dracut-001-4d924752.tar.bz2
+20f127543003896e26c7db6ecc664c92  dracut-001-0f7e10ce.tar.bz2



From krnowak at fedoraproject.org  Thu Sep 17 11:27:45 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Thu, 17 Sep 2009 11:27:45 +0000 (UTC)
Subject: rpms/mm-common/devel import.log, NONE, 1.1 mm-common.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917112745.5E83711C00CE@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/mm-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11620/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mm-common.spec 
Log Message:
* Thu Sep 17 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
- Initial import to CVS



--- NEW FILE import.log ---
mm-common-0_7_3-2_fc11:HEAD:mm-common-0.7.3-2.fc11.src.rpm:1253186598


--- NEW FILE mm-common.spec ---
Name:           mm-common
Version:        0.7.3
Release:        2%{?dist}
Summary:        Common build files of the C++ bindings

Group:          Development/Tools
BuildArch:      noarch
License:        GPLv2+ and GFDL
URL:            http://gtkmm.org
Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       pkgconfig
Requires:       graphviz
Requires:       doxygen
Requires:       libxslt
# mm-common install some files under datadir/aclocal/.
Requires:       automake

%description
The mm-common module provides the build infrastructure and utilities
shared among the GNOME C++ binding libraries.  It is only a required
dependency for building the C++ bindings from the gnome.org version
control repository.  An installation of mm-common is not required for
building tarball releases, unless configured to use maintainer-mode.

%package docs
Summary:        Documentation for %{name}, includes example mm module skeleton
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description docs
Package contains short documentation for %{name} and example skeleton module,
which could be used as a base for new mm module.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS AUTHORS
%{_mandir}/man1/*
%{_bindir}/*
%{_datadir}/aclocal/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/pkgconfig/*.pc

%files docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/*

%changelog
* Sun Sep 13 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
- Added automake to `Requires:'.
- Fixed some directory ownerships.
- Preserve timestamps during install.

* Thu Sep 10 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:39:21 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:27:42 -0000	1.2
@@ -0,0 +1 @@
+mm-common-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:39:21 -0000	1.1
+++ sources	17 Sep 2009 11:27:43 -0000	1.2
@@ -0,0 +1 @@
+bdbebc329d88182a5d2effd7f9073f17  mm-common-0.7.3.tar.bz2



From coec at fedoraproject.org  Thu Sep 17 11:31:41 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 17 Sep 2009 11:31:41 +0000 (UTC)
Subject: rpms/RackTables/F-11 RackTables.conf, NONE, 1.1 RackTables.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 quickinstall.sh, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917113141.8A78611C00CE@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/RackTables/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14810/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	RackTables.conf RackTables.spec import.log quickinstall.sh 
Log Message:
Initial commit of RackTables package



--- NEW FILE RackTables.conf ---
alias /racktables /usr/share/RackTables


--- NEW FILE RackTables.spec ---
Name:           RackTables
Version:        0.17.4
Release:        7%{?dist}
Summary:        A datacenter asset management system

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        GPLv2 and CC-BY-SA
URL:            http://racktables.org/
Source0:        http://racktables.org/files/%{name}-%{version}.tar.gz
Source1:        RackTables.conf
Source2:        quickinstall.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring mysql-server php-ldap
BuildArch:      noarch

%description
A datacenter asset management system.

%clean
rm -rf $RPM_BUILD_ROOT

%prep
%setup -q

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
# Remove zero-length files
rm -f js/codepress/engines/older.js js/codepress/engines/khtml.js

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}

cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
install %{S:2} -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/quickinstall.sh
echo "// Empty on install" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php

cd $RPM_BUILD_ROOT%{_datadir}/%{name}/inc
ln -s  ../../../..%{_sysconfdir}/%{name}/secret.php
cd -

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%config(noreplace) %attr(0664,apache,apache) %{_sysconfdir}/%{name}/secret.php
%doc COPYING LICENSE ChangeLog README
%{_datadir}/%{name}/
%dir %{_sysconfdir}/%{name}

%changelog
* Sun Sep 13 2009 <colin.coe at gmail.com> - 0.17.4-7
- Simplify setup
- Step making docdir/name
- Simplify copy
- Make contrib/quickinstall.sh quit unless it's run by root

* Fri Sep 11 2009 <colin.coe at gmail.com> - 0.17.4-6
- Own /etc/RackTables/
- Fix duplicate files
- Set ownership/mode of /etc/RackTables/secret.php correctly
- Fix contrib/quickinstall.sh to write a valid /etc/RackTables/secret.php

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-5
- Fix danling symlink

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-4
- Removed redundant 'RackTables' from the summary and description
- Changed license as suggested
- Put secret.php into /etc/RackTables and created symlink back to {_datadir}/{name}/inc
- Removed 'mkdir -p $RPM_BUILD_ROOT{_docdir}'
- Stopped listing inc/secret.php twice

* Mon Sep 7 2009 <colin.coe at gmail.com> - 0.17.4-3
- Add 'contrib/quickinstall.sh' to add people installing RackTables
- Add php-ldap as a dependency

* Tue Sep 1 2009 <colin.coe at gmail.com> - 0.17.4-2
- Split out Apache config file
- Added mysql-server as a dependency

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.17.4-1
- Initial packaging


--- NEW FILE import.log ---
RackTables-0_17_4-7_fc11:F-11:RackTables-0.17.4-7.fc11.src.rpm:1253187026


--- NEW FILE quickinstall.sh ---
#!/bin/sh

# Author:  colin.coe at gmail.com
# Date:    Sep 7, 2009
# Updated: Sep 10, 2009
# Purpose: Simple quickstart script
# License: Create Commons Attribution-Share Alike 3.0 Unported

if [ `id -u` -ne 0 ]; then
  echo This script must be run as root, exiting...
  exit 1
fi

service mysqld status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service mysqld start
  /sbin/chkconfig mysqld on
fi

service httpd status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service httpd start
  /sbin/chkconfig httpd on
else
  /sbin/service httpd reload
fi

RT_DB_USER=rackuser
RT_DB_PASS=rackpw

echo 
echo "The default DB username for RackTables is '${RT_DB_USER}'"
echo "If you want to change the username, enter a new username or just press enter"
read USER
echo "The default DB password for RackTables is '${RT_DB_PASS}'"
echo "If you want to change the username, enter a new username or just press enter"
read PASS

[ -n "${USER}" ] && RT_DB_USER="${USER}"
[ -n "${PASS}" ] && RT_DB_PASS="${PASS}"

sed -e "s/'username'/'${RT_DB_USER}'/" -e "s/'password'/'${RT_DB_PASS}'/" /usr/share/RackTables/inc/secret-sample.php > /usr/share/RackTables/inc/secret.php

echo -e "You need the MySQL root password to continue.  If you don't know it, ^C here and\ncome back when you have the password."
echo
echo Enter MySQL root password
mysql -uroot -p -e "
create database racktables;
grant all on racktables.* to root;
grant all on racktables.* to root at localhost;
grant all on racktables.* to ${RT_DB_USER};
grant all on racktables.* to ${RT_DB_USER}@localhost;
set password for ${RT_DB_USER}@localhost=password('${RT_DB_PASS}');
exit"
echo
echo
echo You should be able to browse to http://`hostname`/racktables/install.php
echo to complete the installation.

exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:43:37 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:31:36 -0000	1.2
@@ -0,0 +1 @@
+RackTables-0.17.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:43:38 -0000	1.1
+++ sources	17 Sep 2009 11:31:40 -0000	1.2
@@ -0,0 +1 @@
+c15155c67749b15f1690131c35266ca7  RackTables-0.17.4.tar.gz



From coec at fedoraproject.org  Thu Sep 17 11:33:28 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 17 Sep 2009 11:33:28 +0000 (UTC)
Subject: rpms/RackTables/EL-5 RackTables.conf, NONE, 1.1 RackTables.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 quickinstall.sh, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917113328.44F1711C00CE@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/RackTables/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16635/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	RackTables.conf RackTables.spec import.log quickinstall.sh 
Log Message:
Initial commit of RackTables package



--- NEW FILE RackTables.conf ---
alias /racktables /usr/share/RackTables


--- NEW FILE RackTables.spec ---
Name:           RackTables
Version:        0.17.4
Release:        7%{?dist}
Summary:        A datacenter asset management system

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        GPLv2 and CC-BY-SA
URL:            http://racktables.org/
Source0:        http://racktables.org/files/%{name}-%{version}.tar.gz
Source1:        RackTables.conf
Source2:        quickinstall.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring mysql-server php-ldap
BuildArch:      noarch

%description
A datacenter asset management system.

%clean
rm -rf $RPM_BUILD_ROOT

%prep
%setup -q

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
# Remove zero-length files
rm -f js/codepress/engines/older.js js/codepress/engines/khtml.js

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}

cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}

install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
install %{S:2} -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/quickinstall.sh
echo "// Empty on install" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php

cd $RPM_BUILD_ROOT%{_datadir}/%{name}/inc
ln -s  ../../../..%{_sysconfdir}/%{name}/secret.php
cd -

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%config(noreplace) %attr(0664,apache,apache) %{_sysconfdir}/%{name}/secret.php
%doc COPYING LICENSE ChangeLog README
%{_datadir}/%{name}/
%dir %{_sysconfdir}/%{name}

%changelog
* Sun Sep 13 2009 <colin.coe at gmail.com> - 0.17.4-7
- Simplify setup
- Step making docdir/name
- Simplify copy
- Make contrib/quickinstall.sh quit unless it's run by root

* Fri Sep 11 2009 <colin.coe at gmail.com> - 0.17.4-6
- Own /etc/RackTables/
- Fix duplicate files
- Set ownership/mode of /etc/RackTables/secret.php correctly
- Fix contrib/quickinstall.sh to write a valid /etc/RackTables/secret.php

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-5
- Fix danling symlink

* Thu Sep 10 2009 <colin.coe at gmail.com> - 0.17.4-4
- Removed redundant 'RackTables' from the summary and description
- Changed license as suggested
- Put secret.php into /etc/RackTables and created symlink back to {_datadir}/{name}/inc
- Removed 'mkdir -p $RPM_BUILD_ROOT{_docdir}'
- Stopped listing inc/secret.php twice

* Mon Sep 7 2009 <colin.coe at gmail.com> - 0.17.4-3
- Add 'contrib/quickinstall.sh' to add people installing RackTables
- Add php-ldap as a dependency

* Tue Sep 1 2009 <colin.coe at gmail.com> - 0.17.4-2
- Split out Apache config file
- Added mysql-server as a dependency

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.17.4-1
- Initial packaging


--- NEW FILE import.log ---
RackTables-0_17_4-7_fc11:EL-5:RackTables-0.17.4-7.fc11.src.rpm:1253187169


--- NEW FILE quickinstall.sh ---
#!/bin/sh

# Author:  colin.coe at gmail.com
# Date:    Sep 7, 2009
# Updated: Sep 10, 2009
# Purpose: Simple quickstart script
# License: Create Commons Attribution-Share Alike 3.0 Unported

if [ `id -u` -ne 0 ]; then
  echo This script must be run as root, exiting...
  exit 1
fi

service mysqld status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service mysqld start
  /sbin/chkconfig mysqld on
fi

service httpd status > /dev/null 2>&1
if [ $? -ne 0 ]; then
  /sbin/service httpd start
  /sbin/chkconfig httpd on
else
  /sbin/service httpd reload
fi

RT_DB_USER=rackuser
RT_DB_PASS=rackpw

echo 
echo "The default DB username for RackTables is '${RT_DB_USER}'"
echo "If you want to change the username, enter a new username or just press enter"
read USER
echo "The default DB password for RackTables is '${RT_DB_PASS}'"
echo "If you want to change the username, enter a new username or just press enter"
read PASS

[ -n "${USER}" ] && RT_DB_USER="${USER}"
[ -n "${PASS}" ] && RT_DB_PASS="${PASS}"

sed -e "s/'username'/'${RT_DB_USER}'/" -e "s/'password'/'${RT_DB_PASS}'/" /usr/share/RackTables/inc/secret-sample.php > /usr/share/RackTables/inc/secret.php

echo -e "You need the MySQL root password to continue.  If you don't know it, ^C here and\ncome back when you have the password."
echo
echo Enter MySQL root password
mysql -uroot -p -e "
create database racktables;
grant all on racktables.* to root;
grant all on racktables.* to root at localhost;
grant all on racktables.* to ${RT_DB_USER};
grant all on racktables.* to ${RT_DB_USER}@localhost;
set password for ${RT_DB_USER}@localhost=password('${RT_DB_PASS}');
exit"
echo
echo
echo You should be able to browse to http://`hostname`/racktables/install.php
echo to complete the installation.

exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:43:37 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:33:27 -0000	1.2
@@ -0,0 +1 @@
+RackTables-0.17.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RackTables/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:43:38 -0000	1.1
+++ sources	17 Sep 2009 11:33:27 -0000	1.2
@@ -0,0 +1 @@
+c15155c67749b15f1690131c35266ca7  RackTables-0.17.4.tar.gz



From krnowak at fedoraproject.org  Thu Sep 17 11:34:41 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Thu, 17 Sep 2009 11:34:41 +0000 (UTC)
Subject: rpms/mm-common/F-11 import.log, NONE, 1.1 mm-common.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917113441.1005811C00CE@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/mm-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17054/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mm-common.spec 
Log Message:
* Thu Sep 17 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
- Initial import to CVS



--- NEW FILE import.log ---
mm-common-0_7_3-2_fc11:F-11:mm-common-0.7.3-2.fc11.src.rpm:1253187169


--- NEW FILE mm-common.spec ---
Name:           mm-common
Version:        0.7.3
Release:        2%{?dist}
Summary:        Common build files of the C++ bindings

Group:          Development/Tools
BuildArch:      noarch
License:        GPLv2+ and GFDL
URL:            http://gtkmm.org
Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       pkgconfig
Requires:       graphviz
Requires:       doxygen
Requires:       libxslt
# mm-common install some files under datadir/aclocal/.
Requires:       automake

%description
The mm-common module provides the build infrastructure and utilities
shared among the GNOME C++ binding libraries.  It is only a required
dependency for building the C++ bindings from the gnome.org version
control repository.  An installation of mm-common is not required for
building tarball releases, unless configured to use maintainer-mode.

%package docs
Summary:        Documentation for %{name}, includes example mm module skeleton
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description docs
Package contains short documentation for %{name} and example skeleton module,
which could be used as a base for new mm module.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS AUTHORS
%{_mandir}/man1/*
%{_bindir}/*
%{_datadir}/aclocal/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/pkgconfig/*.pc

%files docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/*

%changelog
* Sun Sep 13 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
- Added automake to `Requires:'.
- Fixed some directory ownerships.
- Preserve timestamps during install.

* Thu Sep 10 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:39:21 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:34:40 -0000	1.2
@@ -0,0 +1 @@
+mm-common-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:39:21 -0000	1.1
+++ sources	17 Sep 2009 11:34:40 -0000	1.2
@@ -0,0 +1 @@
+bdbebc329d88182a5d2effd7f9073f17  mm-common-0.7.3.tar.bz2



From mbarnes at fedoraproject.org  Thu Sep 17 11:36:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 17 Sep 2009 11:36:01 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.49,1.394.2.50
Message-ID: <20090917113601.4322A11C00CE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17936

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:

* Thu Sep 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.7.fc12
- Fix evolution-data-server requirement for real this time.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.49
retrieving revision 1.394.2.50
diff -u -p -r1.394.2.49 -r1.394.2.50
--- evolution.spec	13 Sep 2009 16:56:34 -0000	1.394.2.49
+++ evolution.spec	17 Sep 2009 11:36:00 -0000	1.394.2.50
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.6%{?dist}
+Release: 1.kb.7%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -80,7 +80,7 @@ Requires(post): scrollkeeper >= %{scroll
 Requires(postun): scrollkeeper >= %{scrollkeeper_version}
 
 # Don't trust evolution-data-server to maintain accurate sonames.
-Requires: evolution-data-server >= %{version}
+Requires: evolution-data-server >= %{eds_version}
 
 # No devel package for libpst, despite the name.
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -169,7 +169,7 @@ personal information-management tool.
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: evolution-data-server-devel >= %{version}
+Requires: evolution-data-server-devel >= %{eds_version}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libbonobo-devel >= %{libbonobo_version}
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Thu Sep 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.7.fc12
+- Fix evolution-data-server requirement for real this time.
+
 * Sun Sep 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.6.fc12
 - Snapshot of "kill-bonobo" progress at commit f8a2538.
 



From krnowak at fedoraproject.org  Thu Sep 17 11:38:12 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Thu, 17 Sep 2009 11:38:12 +0000 (UTC)
Subject: rpms/mm-common/F-10 import.log, NONE, 1.1 mm-common.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917113812.503BD11C00CE@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/mm-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19659/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mm-common.spec 
Log Message:
* Thu Sep 17 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
- Initial import to CVS



--- NEW FILE import.log ---
mm-common-0_7_3-2_fc11:F-10:mm-common-0.7.3-2.fc11.src.rpm:1253187347


--- NEW FILE mm-common.spec ---
Name:           mm-common
Version:        0.7.3
Release:        2%{?dist}
Summary:        Common build files of the C++ bindings

Group:          Development/Tools
BuildArch:      noarch
License:        GPLv2+ and GFDL
URL:            http://gtkmm.org
Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       pkgconfig
Requires:       graphviz
Requires:       doxygen
Requires:       libxslt
# mm-common install some files under datadir/aclocal/.
Requires:       automake

%description
The mm-common module provides the build infrastructure and utilities
shared among the GNOME C++ binding libraries.  It is only a required
dependency for building the C++ bindings from the gnome.org version
control repository.  An installation of mm-common is not required for
building tarball releases, unless configured to use maintainer-mode.

%package docs
Summary:        Documentation for %{name}, includes example mm module skeleton
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description docs
Package contains short documentation for %{name} and example skeleton module,
which could be used as a base for new mm module.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS AUTHORS
%{_mandir}/man1/*
%{_bindir}/*
%{_datadir}/aclocal/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/pkgconfig/*.pc

%files docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/*

%changelog
* Sun Sep 13 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
- Added automake to `Requires:'.
- Fixed some directory ownerships.
- Preserve timestamps during install.

* Thu Sep 10 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:39:21 -0000	1.1
+++ .cvsignore	17 Sep 2009 11:38:09 -0000	1.2
@@ -0,0 +1 @@
+mm-common-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:39:21 -0000	1.1
+++ sources	17 Sep 2009 11:38:10 -0000	1.2
@@ -0,0 +1 @@
+bdbebc329d88182a5d2effd7f9073f17  mm-common-0.7.3.tar.bz2



From dledford at fedoraproject.org  Thu Sep 17 11:43:33 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu, 17 Sep 2009 11:43:33 +0000 (UTC)
Subject: rpms/mdadm/devel mdadm-3.0-calloc.patch, NONE, 1.1 mdadm.spec, 1.73,
	1.74
Message-ID: <20090917114333.3150A11C00CE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24035

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.0-calloc.patch 
Log Message:
* Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
- Stop some mdmon segfaults (bz523860)


mdadm-3.0-calloc.patch:
 mdmon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdadm-3.0-calloc.patch ---
diff -up mdadm-3.0/mdmon.c~ mdadm-3.0/mdmon.c
--- mdadm-3.0/mdmon.c~	2009-09-11 08:10:24.000000000 +0200
+++ mdadm-3.0/mdmon.c	2009-09-16 22:42:21.000000000 +0200
@@ -395,7 +395,7 @@ int mdmon(char *devname, int devnum, int
 	} else
 		pfd[0] = pfd[1] = -1;
 
-	container = malloc(sizeof(*container));
+	container = calloc(1, sizeof(*container));
 	container->devnum = devnum;
 	container->devname = devname;
 	container->arrays = NULL;


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- mdadm.spec	15 Sep 2009 19:03:58 -0000	1.73
+++ mdadm.spec	17 Sep 2009 11:43:33 -0000	1.74
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-0.20090915git.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -11,6 +11,7 @@ Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-endian-FAIL.patch
 Patch3:      mdadm-3.0-metadata.patch
 Patch4:      mdadm-3.0-uuid.patch
+Patch5:      mdadm-3.0-calloc.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -35,6 +36,7 @@ file can be used to help with some commo
 %patch2 -p1 -b .endian
 %patch3 -p1 -b .metadata
 %patch4 -p1 -b .uuid
+%patch5 -p1 -b .calloc
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -80,6 +82,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
+- Stop some mdmon segfaults (bz523860)
+
 * Tue Sep 15 2009 Doug Ledford <dledford at redhat.com> - 3.0-3
 - Update to current head of upstream git repo for various imsm related fixes
   (fixes bz523262)



From mauelsha at fedoraproject.org  Thu Sep 17 11:45:06 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 11:45:06 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid-1.0.0.rc16-test_devices.patch, NONE,
	1.1 dmraid.spec, 1.98, 1.99
Message-ID: <20090917114506.A201E11C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24656

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc16-test_devices.patch 
Log Message:
Fix using test devices

dmraid-1.0.0.rc16-test_devices.patch:
 configure         | 2763 ++++++++++++++++++++++++++++++------------------------
 configure.in      |   10 
 lib/device/scan.c |    2 
 3 files changed, 1572 insertions(+), 1203 deletions(-)

--- NEW FILE dmraid-1.0.0.rc16-test_devices.patch ---
diff --git a/configure.in.test_devices b/configure.in
index 8b0ad90..74fd27f 100644
--- a/configure.in.test_devices
+++ b/configure.in
@@ -133,8 +133,9 @@ AC_ARG_ENABLE(shared_lib,
 
 echo $ac_n "checking whether to disable testing with mapped devices""... $ac_c" 1>&6
 dnl Disable testing with mapped devices
-AC_ARG_ENABLE(testing, [  --disable-testing       Disable testing with mapped devices],  \
-DMRAID_TEST=no, DMRAID_TEST=yes)
+AC_ARG_ENABLE(testing, [  --disable-testing        Enable testing with mapped devices],  \
+DMRAID_TEST=$enableval, DMRAID_TEST=yes)
+
 
 echo "$ac_t""$DEBUG" 1>&6
 
@@ -165,6 +166,10 @@ if test x$DMRAID_LED = xyes; then
         CFLAGS="$CFLAGS -DDMRAID_LED"
 fi
 
+if test x$DMRAID_TEST = xyes; then
+        CFLAGS="$CFLAGS -DDMRAID_TEST"
+fi
+
 if test x$DMRAID_INTEL_LED = xyes; then
         CFLAGS="$CFLAGS -DDMRAID_LED -DDMRAID_INTEL_LED"
 fi
@@ -229,7 +234,6 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CLDFLAGS)
 AC_SUBST(DEBUG)
 AC_SUBST(DEBUG_MALLOC)
-AC_SUBST(DMRAID_TEST)
 AC_SUBST(DMRAID_VERSION)
 AC_SUBST(DMRAID_LIB_VERSION)
 AC_SUBST(DIETLIBC)
diff --git a/configure.test_devices b/configure
index f0194d6..995ebb2 100755
--- a/configure.test_devices
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
[...5023 lines suppressed...]
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -6646,7 +6992,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6672,7 +7018,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -6681,7 +7027,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6702,17 +7048,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -6752,12 +7098,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -6766,13 +7113,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -6786,15 +7134,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -6804,21 +7153,28 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -6833,6 +7189,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -6854,4 +7215,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/lib/device/scan.c.test_devices b/lib/device/scan.c
index 2d06fa4..ec727b2 100644
--- a/lib/device/scan.c.test_devices
+++ b/lib/device/scan.c
@@ -87,7 +87,7 @@ dm_test_device(struct lib_context *lc, char *path)
 	struct stat s;
 
 	return !lstat(path, &s) &&
-		S_ISLNK(s.st_mode) &&
+/*		S_ISLNK(s.st_mode) && */ /* No symlinks any more. */
 		!strncmp(get_basename(lc, path), "dm-", 3);
 }
 


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- dmraid.spec	16 Sep 2009 22:59:12 -0000	1.98
+++ dmraid.spec	17 Sep 2009 11:45:06 -0000	1.99
@@ -12,14 +12,19 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper-devel, device-mapper-event, libselinux-devel, libsepol-devel
+# BuildRequires: device-mapper-devel
+BuildRequires: device-mapper-event
+BuildRequires: libselinux-devel
+BuildRequires: libsepol-devel
 Requires: device-mapper >= 1.02.02-2
-Requires: dmraid-events kpartx
-Requires: dmraid-events kpartx
+Requires: dmraid-events
+Requires: kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
+Patch0: dmraid-1.0.0.rc16-test_devices.patch
+
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@@ -57,6 +62,7 @@ Device failure reporting has to be activ
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led



From pkgdb at fedoraproject.org  Thu Sep 17 11:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:50:49 +0000
Subject: [pkgdb] ldapvi: mcepl has requested watchbugzilla
Message-ID: <20090917115048.A075710F881@bastion2.fedora.phx.redhat.com>

mcepl has requested the watchbugzilla acl on ldapvi (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:50:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:50:51 +0000
Subject: [pkgdb] ldapvi: mcepl has requested commit
Message-ID: <20090917115049.251A810F888@bastion2.fedora.phx.redhat.com>

mcepl has requested the commit acl on ldapvi (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:50:52 +0000
Subject: [pkgdb] ldapvi: mcepl has requested approveacls
Message-ID: <20090917115049.D4D3810F895@bastion2.fedora.phx.redhat.com>

mcepl has requested the approveacls acl on ldapvi (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:00 +0000
Subject: [pkgdb] ldapvi: mcepl has requested watchbugzilla
Message-ID: <20090917115059.B0C9910F89B@bastion2.fedora.phx.redhat.com>

mcepl has requested the watchbugzilla acl on ldapvi (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:03 +0000
Subject: [pkgdb] ldapvi: mcepl has requested commit
Message-ID: <20090917115103.A56A310F8A0@bastion2.fedora.phx.redhat.com>

mcepl has requested the commit acl on ldapvi (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:07 +0000
Subject: [pkgdb] ldapvi: mcepl has requested approveacls
Message-ID: <20090917115104.93A9010F8A3@bastion2.fedora.phx.redhat.com>

mcepl has requested the approveacls acl on ldapvi (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:13 +0000
Subject: [pkgdb] ldapvi: mcepl has requested watchbugzilla
Message-ID: <20090917115112.69C7A10F888@bastion2.fedora.phx.redhat.com>

mcepl has requested the watchbugzilla acl on ldapvi (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:14 +0000
Subject: [pkgdb] ldapvi: mcepl has requested commit
Message-ID: <20090917115113.0970810F8A5@bastion2.fedora.phx.redhat.com>

mcepl has requested the commit acl on ldapvi (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:18 +0000
Subject: [pkgdb] ldapvi: mcepl has requested approveacls
Message-ID: <20090917115116.462F410F8A6@bastion2.fedora.phx.redhat.com>

mcepl has requested the approveacls acl on ldapvi (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:20 +0000
Subject: [pkgdb] ldapvi ownership updated
Message-ID: <20090917115119.BD42810F8AB@bastion2.fedora.phx.redhat.com>

Package ldapvi in Fedora 10 is now owned by mcepl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:29 +0000
Subject: [pkgdb] ldapvi: mcepl has given up approveacls
Message-ID: <20090917115130.20EE010F898@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on ldapvi (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:30 +0000
Subject: [pkgdb] ldapvi: mcepl has given up commit
Message-ID: <20090917115131.06CF610F89C@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on ldapvi (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:34 +0000
Subject: [pkgdb] ldapvi: mcepl has given up watchbugzilla
Message-ID: <20090917115131.E071810F8AD@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on ldapvi (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:37 +0000
Subject: [pkgdb] ldapvi: mcepl has given up watchbugzilla
Message-ID: <20090917115135.633B810F8B1@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on ldapvi (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:39 +0000
Subject: [pkgdb] ldapvi: mcepl has given up commit
Message-ID: <20090917115137.50D5710F8B3@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on ldapvi (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:41 +0000
Subject: [pkgdb] ldapvi: mcepl has given up approveacls
Message-ID: <20090917115140.6D11A10F8B4@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on ldapvi (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:46 +0000
Subject: [pkgdb] ldapvi: mcepl has given up watchbugzilla
Message-ID: <20090917115143.AF96810F8B9@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on ldapvi (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:46 +0000
Subject: [pkgdb] ldapvi: mcepl has given up commit
Message-ID: <20090917115145.4824410F8BE@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on ldapvi (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:51:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:51:47 +0000
Subject: [pkgdb] ldapvi: mcepl has given up approveacls
Message-ID: <20090917115147.55C7710F8C1@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on ldapvi (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Thu Sep 17 11:52:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 11:52:04 +0000
Subject: [pkgdb] ldapvi ownership updated
Message-ID: <20090917115201.BEA5C10F884@bastion2.fedora.phx.redhat.com>

Package ldapvi in Fedora 11 is now owned by mcepl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From agk at fedoraproject.org  Thu Sep 17 11:55:13 2009
From: agk at fedoraproject.org (agk)
Date: Thu, 17 Sep 2009 11:55:13 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.176,1.177
Message-ID: <20090917115513.64F6911C00CE@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29378

Modified Files:
	lvm2.spec 
Log Message:
Fix dmeventd _temporary_log_fn  in plugins



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- lvm2.spec	16 Sep 2009 23:39:24 -0000	1.176
+++ lvm2.spec	17 Sep 2009 11:55:13 -0000	1.177
@@ -17,6 +17,7 @@ Source0: ftp://sources.redhat.com/pub/lv
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
 Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch
+Patch2: lvm2-2_02_53-dmeventd_log_fn.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -46,6 +47,7 @@ or more physical volumes and creating on
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
 %patch1 -p1 -b .lvm2_monitoring
+%patch2 -p1 -b .dmeventd_log_fn
 
 %build
 %define _exec_prefix /



From pkgdb at fedoraproject.org  Thu Sep 17 12:11:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:11:37 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121138.3426B10F881@bastion2.fedora.phx.redhat.com>

sindrepb has set the approveacls acl on xdotool (Fedora devel) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:11:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:11:41 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121139.D74B710F888@bastion2.fedora.phx.redhat.com>

sindrepb has set the commit acl on xdotool (Fedora devel) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:11:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:11:44 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121141.D8D3B10F895@bastion2.fedora.phx.redhat.com>

sindrepb has set the watchcommits acl on xdotool (Fedora devel) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From agk at fedoraproject.org  Thu Sep 17 12:12:01 2009
From: agk at fedoraproject.org (agk)
Date: Thu, 17 Sep 2009 12:12:01 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2-2_02_53-dmeventd_log_fn.patch,NONE,1.1
Message-ID: <20090917121202.1ED5811C00CE@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4210

Added Files:
	lvm2-2_02_53-dmeventd_log_fn.patch 
Log Message:
Fix dmeventd _temporary_log_fn  in plugins


lvm2-2_02_53-dmeventd_log_fn.patch:
 LVM2.2.02.52-new2/WHATS_NEW                                             |    1 +
 LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c     |    4 +++-
 LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c |    1 +
 LVM2.2.02.52/scripts/lvm2_monitoring_init_red_hat.in.lvm2_monitoring    |only
 4 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE lvm2-2_02_53-dmeventd_log_fn.patch ---
diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
--- LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2009-06-30 19:39:31.000000000 +0100
+++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2009-09-17 12:51:29.637533000 +0100
@@ -126,8 +126,10 @@
 	return ME_IGNORE;
 }
 
-static void _temporary_log_fn(int level, const char *file __attribute((unused)),
+static void _temporary_log_fn(int level,
+			      const char *file __attribute((unused)),
 			      int line __attribute((unused)),
+			      int dm_errno __attribute((unused)),
 			      const char *format)
 {
 	if (!strncmp(format, "WARNING: ", 9) && (level < 5))
diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
--- LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2008-10-13 13:06:30.000000000 +0100
+++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2009-09-17 12:51:29.641533000 +0100
@@ -57,6 +57,7 @@
 static void _temporary_log_fn(int level,
 			      const char *file __attribute((unused)),
 			      int line __attribute((unused)),
+			      int dm_errno __attribute((unused)),
 			      const char *format)
 {
 	if (!strncmp(format, "WARNING: ", 9) && (level < 5))
Only in LVM2.2.02.52/scripts: lvm2_monitoring_init_red_hat.in.lvm2_monitoring
diff -ru LVM2.2.02.52/WHATS_NEW LVM2.2.02.52-new2/WHATS_NEW
--- LVM2.2.02.52/WHATS_NEW	2009-09-17 12:50:42.799264000 +0100
+++ LVM2.2.02.52-new2/WHATS_NEW	2009-09-17 12:51:51.499101000 +0100
@@ -1,5 +1,6 @@
 Version 2.02.53 -
 =====================================
+  Fix dmeventd _temporary_log_fn parameters. (2.02.50)
   Update lvm2 monitoring script to lvm2_monitoring_init_red_hat.in.
 
 Version 2.02.52 - 15th September 2009



From pkgdb at fedoraproject.org  Thu Sep 17 12:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:11:56 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121154.E88E310F89B@bastion2.fedora.phx.redhat.com>

sindrepb has set the watchbugzilla acl on xdotool (Fedora devel) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:02 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121202.6BD5710F886@bastion2.fedora.phx.redhat.com>

sindrepb has set the watchbugzilla acl on xdotool (Fedora 10) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:04 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121203.AAF0C10F89D@bastion2.fedora.phx.redhat.com>

sindrepb has set the watchcommits acl on xdotool (Fedora 10) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:08 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121205.89C4710F8A0@bastion2.fedora.phx.redhat.com>

sindrepb has set the commit acl on xdotool (Fedora 10) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:06 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121207.4E35810F8A3@bastion2.fedora.phx.redhat.com>

sindrepb has set the approveacls acl on xdotool (Fedora 10) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:12 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121209.DAFCE10F8A6@bastion2.fedora.phx.redhat.com>

sindrepb has set the approveacls acl on xdotool (Fedora 11) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:14 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121211.B4CE210F8AA@bastion2.fedora.phx.redhat.com>

sindrepb has set the commit acl on xdotool (Fedora 11) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:14 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121213.7D1C110F8AC@bastion2.fedora.phx.redhat.com>

sindrepb has set the watchcommits acl on xdotool (Fedora 11) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From pkgdb at fedoraproject.org  Thu Sep 17 12:12:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:12:19 +0000
Subject: [pkgdb] xdotool had acl change status
Message-ID: <20090917121217.19F3710F898@bastion2.fedora.phx.redhat.com>

sindrepb has set the watchbugzilla acl on xdotool (Fedora 11) to Approved for slankes

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xdotool



From jkratoch at fedoraproject.org  Thu Sep 17 12:15:42 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 17 Sep 2009 12:15:42 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.37, 1.38 gdb-6.3-gstack-20050411.patch,
	1.6, 1.7 gdb-6.3-pie-20050110.patch, 1.22,
	1.23 gdb-6.8-inlining-addon.patch, 1.8, 1.9 gdb-archer.patch,
	1.29, 1.30 gdb.spec, 1.383, 1.384 sources, 1.36,
	1.37 gdb-6.3-ia64-sigtramp-fp-20050926.patch, 1.7,
	NONE gdb-bz515434-qsort_cmp.patch, 1.3, NONE
Message-ID: <20090917121542.B72DD11C00CE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5711

Modified Files:
	.cvsignore gdb-6.3-gstack-20050411.patch 
	gdb-6.3-pie-20050110.patch gdb-6.8-inlining-addon.patch 
	gdb-archer.patch gdb.spec sources 
Removed Files:
	gdb-6.3-ia64-sigtramp-fp-20050926.patch 
	gdb-bz515434-qsort_cmp.patch 
Log Message:
* Thu Sep 17 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090917-1
- Upgrade to the FSF GDB gdb-7.0 branch and snapshot: 6.8.91.20090917
- archer-jankratochvil-fedora12 commit: 16f3f01cc2cbc15283462eaabdfcde92cf42cdc6
- Drop the qsort_cmp workaround as resolved in FSF GDB now (BZ 515434).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	10 Sep 2009 21:37:38 -0000	1.37
+++ .cvsignore	17 Sep 2009 12:15:41 -0000	1.38
@@ -1 +1 @@
-gdb-6.8.50.20090910.tar.bz2
+gdb-6.8.91.20090917.tar.bz2

gdb-6.3-gstack-20050411.patch:
 Makefile.in |   32 ++++++++++++++++++++++++++++++--
 gstack.sh   |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)

Index: gdb-6.3-gstack-20050411.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gstack-20050411.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.3-gstack-20050411.patch	4 Aug 2009 05:37:27 -0000	1.6
+++ gdb-6.3-gstack-20050411.patch	17 Sep 2009 12:15:41 -0000	1.7
@@ -4,20 +4,20 @@
 	to install and uninstall.
 	* gstack.sh, gstack.1: New files.
 
-Index: gdb-6.8.50.20090802/gdb/Makefile.in
+Index: gdb-6.8.91.20090917/gdb/Makefile.in
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/Makefile.in	2009-08-03 09:50:57.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/Makefile.in	2009-08-03 11:09:49.000000000 +0200
-@@ -947,7 +947,7 @@ gdb.z:gdb.1
- # time it takes for make to check that all is up to date.
- # install-only is intended to address that need.
- install: all install-only
--install-only: $(CONFIG_INSTALL)
-+install-only: install-gstack $(CONFIG_INSTALL)
+--- gdb-6.8.91.20090917.orig/gdb/Makefile.in	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/Makefile.in	2009-09-17 12:47:38.000000000 +0200
+@@ -989,7 +989,7 @@ install: all install-only 
+ 
+ # The "install-only" target also installs the syscalls' XML files in
+ # the system.
+-install-only: $(CONFIG_INSTALL) xml-syscall-install
++install-only: install-gstack $(CONFIG_INSTALL) xml-syscall-install
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -979,9 +979,26 @@ install-tui:
+@@ -1021,9 +1021,26 @@ install-tui:
  			$(DESTDIR)$(man1dir) ; \
  		$(INSTALL_DATA) $(srcdir)/gdb.1 \
  			$(DESTDIR)$(man1dir)/$$transformed_name.1
@@ -45,7 +45,7 @@ Index: gdb-6.8.50.20090802/gdb/Makefile.
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1003,6 +1020,17 @@ uninstall-tui:
+@@ -1045,6 +1062,17 @@ uninstall-tui:
  		fi ; \
  		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
  		      $(DESTDIR)$(man1dir)/$$transformed_name.1
@@ -63,10 +63,10 @@ Index: gdb-6.8.50.20090802/gdb/Makefile.
  
  # The C++ name parser can be built standalone for testing.
  test-cp-name-parser.o: cp-name-parser.c
-Index: gdb-6.8.50.20090802/gdb/gstack.sh
+Index: gdb-6.8.91.20090917/gdb/gstack.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090802/gdb/gstack.sh	2009-08-03 11:08:52.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/gstack.sh	2009-09-17 12:47:14.000000000 +0200
 @@ -0,0 +1,48 @@
 +#!/bin/sh
 +

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infcmd.c      |    3 
 infrun.c      |    4 
 linux-tdep.c  |    2 
 objfiles.c    |   14 +
 solib-svr4.c  |  475 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 16 files changed, 616 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gdb-6.3-pie-20050110.patch	10 Sep 2009 21:37:38 -0000	1.22
+++ gdb-6.3-pie-20050110.patch	17 Sep 2009 12:15:41 -0000	1.23
@@ -26,10 +26,10 @@
 
 	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
 
-Index: gdb-6.8.50.20090909/gdb/amd64-tdep.c
+Index: gdb-6.8.91.20090917/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/amd64-tdep.c	2009-09-09 19:09:31.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/amd64-tdep.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/amd64-tdep.c	2009-09-17 12:48:49.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/amd64-tdep.c	2009-09-17 12:50:07.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -138,10 +138,10 @@ Index: gdb-6.8.50.20090909/gdb/amd64-tde
    return pc;
  }
  
-Index: gdb-6.8.50.20090909/gdb/auxv.c
+Index: gdb-6.8.91.20090917/gdb/auxv.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/auxv.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/auxv.c	2009-09-17 12:50:07.000000000 +0200
 @@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
@@ -230,10 +230,10 @@ Index: gdb-6.8.50.20090909/gdb/auxv.c
  	break;
      }
  
-Index: gdb-6.8.50.20090909/gdb/auxv.h
+Index: gdb-6.8.91.20090917/gdb/auxv.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/auxv.h	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/auxv.h	2009-09-17 12:50:07.000000000 +0200
 @@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -251,11 +251,11 @@ Index: gdb-6.8.50.20090909/gdb/auxv.h
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
-Index: gdb-6.8.50.20090909/gdb/dwarf2read.c
+Index: gdb-6.8.91.20090917/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/dwarf2read.c	2009-09-09 19:21:23.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/dwarf2read.c	2009-09-09 19:24:13.000000000 +0200
-@@ -1719,7 +1719,7 @@ dwarf2_build_psymtabs (struct objfile *o
+--- gdb-6.8.91.20090917.orig/gdb/dwarf2read.c	2009-09-17 12:49:20.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/dwarf2read.c	2009-09-17 12:50:07.000000000 +0200
+@@ -1717,7 +1717,7 @@ dwarf2_build_psymtabs (struct objfile *o
    dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
    dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
  
@@ -264,10 +264,10 @@ Index: gdb-6.8.50.20090909/gdb/dwarf2rea
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
-Index: gdb-6.8.50.20090909/gdb/elfread.c
+Index: gdb-6.8.91.20090917/gdb/elfread.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/elfread.c	2009-09-09 19:05:55.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/elfread.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/elfread.c	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/elfread.c	2009-09-17 12:50:07.000000000 +0200
 @@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
@@ -277,11 +277,11 @@ Index: gdb-6.8.50.20090909/gdb/elfread.c
      {
        init_psymbol_list (objfile, 0);
        mainline = 0;
-Index: gdb-6.8.50.20090909/gdb/infrun.c
+Index: gdb-6.8.91.20090917/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/infrun.c	2009-09-09 19:09:31.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/infrun.c	2009-09-09 19:24:13.000000000 +0200
-@@ -3602,6 +3602,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
+--- gdb-6.8.91.20090917.orig/gdb/infrun.c	2009-09-17 12:48:50.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/infrun.c	2009-09-17 12:50:07.000000000 +0200
+@@ -3659,6 +3659,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
  
@@ -292,13 +292,13 @@ Index: gdb-6.8.50.20090909/gdb/infrun.c
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-Index: gdb-6.8.50.20090909/gdb/objfiles.c
+Index: gdb-6.8.91.20090917/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/objfiles.c	2009-09-09 19:23:05.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/objfiles.c	2009-09-09 19:24:13.000000000 +0200
-@@ -51,6 +51,9 @@
- #include "arch-utils.h"
- #include "exec.h"
+--- gdb-6.8.91.20090917.orig/gdb/objfiles.c	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/objfiles.c	2009-09-17 12:50:20.000000000 +0200
+@@ -53,6 +53,9 @@
+ #include "observer.h"
+ #include "complaints.h"
  
 +#include "auxv.h"
 +#include "elf/common.h"
@@ -306,7 +306,7 @@ Index: gdb-6.8.50.20090909/gdb/objfiles.
  /* Prototypes for local functions */
  
  static void objfile_alloc_data (struct objfile *objfile);
-@@ -278,9 +281,17 @@ init_entry_point_info (struct objfile *o
+@@ -280,9 +283,17 @@ init_entry_point_info (struct objfile *o
  CORE_ADDR
  entry_point_address (void)
  {
@@ -324,7 +324,7 @@ Index: gdb-6.8.50.20090909/gdb/objfiles.
    if (symfile_objfile == NULL)
      return 0;
  
-@@ -465,6 +476,9 @@ free_objfile (struct objfile *objfile)
+@@ -467,6 +478,9 @@ free_objfile (struct objfile *objfile)
    if (objfile == symfile_objfile)
      symfile_objfile = NULL;
  
@@ -334,10 +334,10 @@ Index: gdb-6.8.50.20090909/gdb/objfiles.
    /* Before the symbol table code was redone to make it easier to
       selectively load and remove information particular to a specific
       linkage unit, gdb used to do these things whenever the monolithic
-Index: gdb-6.8.50.20090909/gdb/solib-svr4.c
+Index: gdb-6.8.91.20090917/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/solib-svr4.c	2009-09-09 19:09:35.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/solib-svr4.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/solib-svr4.c	2009-09-17 12:48:50.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/solib-svr4.c	2009-09-17 12:50:07.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
@@ -1000,10 +1000,10 @@ Index: gdb-6.8.50.20090909/gdb/solib-svr
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8.50.20090909/gdb/solib.c
+Index: gdb-6.8.91.20090917/gdb/solib.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/solib.c	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/solib.c	2009-09-09 19:25:18.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/solib.c	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/solib.c	2009-09-17 12:50:07.000000000 +0200
 @@ -82,6 +82,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
@@ -1140,10 +1140,10 @@ Index: gdb-6.8.50.20090909/gdb/solib.c
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8.50.20090909/gdb/solist.h
+Index: gdb-6.8.91.20090917/gdb/solist.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/solist.h	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/solist.h	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/solist.h	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/solist.h	2009-09-17 12:50:07.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1164,10 +1164,10 @@ Index: gdb-6.8.50.20090909/gdb/solist.h
 +extern int debug_solib;
 +
  #endif
-Index: gdb-6.8.50.20090909/gdb/symfile-mem.c
+Index: gdb-6.8.91.20090917/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/symfile-mem.c	2009-09-09 19:06:57.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/symfile-mem.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/symfile-mem.c	2009-09-17 12:48:49.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/symfile-mem.c	2009-09-17 12:50:07.000000000 +0200
 @@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
  	++i;
        }
@@ -1177,10 +1177,10 @@ Index: gdb-6.8.50.20090909/gdb/symfile-m
                                     sai, OBJF_SHARED);
  
    /* This might change our ideas about frames already looked at.  */
-Index: gdb-6.8.50.20090909/gdb/symfile.c
+Index: gdb-6.8.91.20090917/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/symfile.c	2009-09-09 19:15:43.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/symfile.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/symfile.c	2009-09-17 12:48:50.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/symfile.c	2009-09-17 12:50:07.000000000 +0200
 @@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
@@ -1250,7 +1250,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
        && (have_full_symbols () || have_partial_symbols ())
        && from_tty
        && (have_full_symbols () || have_partial_symbols ())
-@@ -1162,6 +1168,9 @@ symbol_file_clear (int from_tty)
+@@ -1163,6 +1169,9 @@ symbol_file_clear (int from_tty)
  		    symfile_objfile->name)
  	  : !query (_("Discard symbol table? "))))
      error (_("Not confirmed."));
@@ -1269,11 +1269,11 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-Index: gdb-6.8.50.20090909/gdb/target.h
+Index: gdb-6.8.91.20090917/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/target.h	2009-09-09 19:07:36.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/target.h	2009-09-09 19:24:13.000000000 +0200
-@@ -528,7 +528,7 @@ struct target_ops
+--- gdb-6.8.91.20090917.orig/gdb/target.h	2009-09-17 12:48:49.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/target.h	2009-09-17 12:50:07.000000000 +0200
+@@ -545,7 +545,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
      int (*to_auxv_parse) (struct target_ops *ops, gdb_byte **readptr,
@@ -1282,10 +1282,10 @@ Index: gdb-6.8.50.20090909/gdb/target.h
  
      /* Search SEARCH_SPACE_LEN bytes beginning at START_ADDR for the
         sequence of bytes in PATTERN with length PATTERN_LEN.
-Index: gdb-6.8.50.20090909/gdb/symfile.h
+Index: gdb-6.8.91.20090917/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/symfile.h	2009-09-09 19:15:43.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/symfile.h	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/symfile.h	2009-09-17 12:48:50.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/symfile.h	2009-09-17 12:50:07.000000000 +0200
 @@ -229,7 +229,13 @@ enum symfile_add_flags
      SYMFILE_MAINLINE = 1 << 2,
  
@@ -1301,10 +1301,10 @@ Index: gdb-6.8.50.20090909/gdb/symfile.h
    };
  
  extern void syms_from_objfile (struct objfile *,
-Index: gdb-6.8.50.20090909/gdb/infcmd.c
+Index: gdb-6.8.91.20090917/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/infcmd.c	2009-09-09 19:20:33.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/infcmd.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/infcmd.c	2009-09-17 12:49:01.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/infcmd.c	2009-09-17 12:50:07.000000000 +0200
 @@ -2308,6 +2308,9 @@ attach_command_post_wait (char *args, in
  
    post_create_inferior (&current_target, from_tty);
@@ -1315,10 +1315,10 @@ Index: gdb-6.8.50.20090909/gdb/infcmd.c
    /* Install inferior's terminal modes.  */
    target_terminal_inferior ();
  
-Index: gdb-6.8.50.20090909/gdb/linux-tdep.c
+Index: gdb-6.8.91.20090917/gdb/linux-tdep.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/linux-tdep.c	2009-09-09 19:24:13.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/linux-tdep.c	2009-09-17 12:50:07.000000000 +0200
 @@ -163,5 +163,7 @@ in this session.\n"));
  void
  _initialize_linux_tdep (void)

gdb-6.8-inlining-addon.patch:
 breakpoint.c                        |   35 +++++++++++++---
 dwarf2read.c                        |    6 ++
 frame.c                             |    8 ++-
 gdbthread.h                         |    6 ++
 infcmd.c                            |   76 ++++++++++++++++++++++++++----------
 inline-frame.c                      |   34 +++++++++++++---
 inline-frame.h                      |    4 +
 target.c                            |    1 
 testsuite/gdb.opt/inline-bt.c       |   10 +++-
 testsuite/gdb.opt/inline-cmds.c     |   10 +++-
 testsuite/gdb.opt/inline-cmds.exp   |   28 ++++++-------
 testsuite/gdb.opt/inline-locals.c   |    9 +++-
 testsuite/gdb.opt/inline-locals.exp |    6 ++
 testsuite/gdb.opt/inline-markers.c  |    5 --
 14 files changed, 176 insertions(+), 62 deletions(-)

Index: gdb-6.8-inlining-addon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining-addon.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdb-6.8-inlining-addon.patch	10 Sep 2009 21:37:39 -0000	1.8
+++ gdb-6.8-inlining-addon.patch	17 Sep 2009 12:15:41 -0000	1.9
@@ -5,10 +5,10 @@ causing: FAIL: gdb.base/unwindonsignal.e
 resume() -> target_resume() move of clear_inline_frame_state() is for:
 gdb.mi/mi-nsmoribund.exp
 
-Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-bt.c
+Index: gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-bt.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-bt.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-bt.c	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/testsuite/gdb.opt/inline-bt.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-bt.c	2009-09-17 12:49:01.000000000 +0200
 @@ -13,10 +13,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -28,10 +28,10 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
  
  inline int func1(void)
  {
-Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.c
+Index: gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-cmds.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-cmds.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.c	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/testsuite/gdb.opt/inline-cmds.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-cmds.c	2009-09-17 12:49:01.000000000 +0200
 @@ -13,13 +13,19 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -54,10 +54,10 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
  inline int func1(void)
  {
    bar ();
-Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.exp
+Index: gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-cmds.exp
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-09-17 12:49:01.000000000 +0200
 @@ -230,7 +230,7 @@ set line3 [gdb_get_line_number "set brea
  gdb_breakpoint $line3
  gdb_continue_to_breakpoint "consecutive func1"
@@ -110,10 +110,10 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
 +gdb_test "info frame" "inlined into frame.*" "outer_inline2 inlined"
 +gdb_test "fini" "" "up from outer_inline2"
 +gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined"
-Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.c
+Index: gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-locals.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-locals.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.c	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/testsuite/gdb.opt/inline-locals.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-locals.c	2009-09-17 12:49:01.000000000 +0200
 @@ -13,11 +13,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -133,10 +133,10 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
  
  inline int func1(int arg1)
  {
-Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.exp
+Index: gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-locals.exp
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-locals.exp	2009-06-30 17:50:27.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-locals.exp	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/testsuite/gdb.opt/inline-locals.exp	2009-06-30 17:50:27.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-locals.exp	2009-09-17 12:49:01.000000000 +0200
 @@ -77,6 +77,9 @@ if { ! $no_frames } {
  
  # Make sure that locals on the stack are found.  This is an array to
@@ -155,11 +155,11 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
 +    setup_kfail *-*-* "gcc/debug.optimization"
 +}
  gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)"
-Index: gdb-6.8.50.20090909/gdb/frame.c
+Index: gdb-6.8.91.20090917/gdb/frame.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/frame.c	2009-09-09 19:06:46.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/frame.c	2009-09-09 19:20:00.000000000 +0200
-@@ -276,7 +276,7 @@ fprint_frame (struct ui_file *file, stru
+--- gdb-6.8.91.20090917.orig/gdb/frame.c	2009-09-17 12:48:49.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/frame.c	2009-09-17 12:49:01.000000000 +0200
+@@ -310,7 +310,7 @@ fprint_frame (struct ui_file *file, stru
  static struct frame_info *
  skip_inlined_frames (struct frame_info *frame)
  {
@@ -168,7 +168,7 @@ Index: gdb-6.8.50.20090909/gdb/frame.c
      frame = get_prev_frame (frame);
  
    return frame;
-@@ -1715,6 +1715,7 @@ get_frame_address_in_block (struct frame
+@@ -1778,6 +1778,7 @@ get_frame_address_in_block (struct frame
  {
    /* A draft address.  */
    CORE_ADDR pc = get_frame_pc (this_frame);
@@ -176,7 +176,7 @@ Index: gdb-6.8.50.20090909/gdb/frame.c
  
    struct frame_info *next_frame = this_frame->next;
  
-@@ -1757,6 +1758,9 @@ get_frame_address_in_block (struct frame
+@@ -1820,6 +1821,9 @@ get_frame_address_in_block (struct frame
       while in an inlined function, then the code address of the
       "calling" normal function should not be adjusted either.  */
  
@@ -186,7 +186,7 @@ Index: gdb-6.8.50.20090909/gdb/frame.c
    while (get_frame_type (next_frame) == INLINE_FRAME)
      next_frame = next_frame->next;
  
-@@ -1788,7 +1792,7 @@ find_frame_sal (struct frame_info *frame
+@@ -1851,7 +1855,7 @@ find_frame_sal (struct frame_info *frame
  	sym = inline_skipped_symbol (inferior_ptid);
  
        init_sal (sal);
@@ -195,19 +195,19 @@ Index: gdb-6.8.50.20090909/gdb/frame.c
  	{
  	  sal->symtab = SYMBOL_SYMTAB (sym);
  	  sal->line = SYMBOL_LINE (sym);
-Index: gdb-6.8.50.20090909/gdb/breakpoint.c
+Index: gdb-6.8.91.20090917/gdb/breakpoint.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/breakpoint.c	2009-09-09 19:19:46.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/breakpoint.c	2009-09-09 19:21:14.000000000 +0200
-@@ -61,6 +61,7 @@
- #include "valprint.h"
+--- gdb-6.8.91.20090917.orig/gdb/breakpoint.c	2009-09-17 12:48:51.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/breakpoint.c	2009-09-17 12:49:12.000000000 +0200
+@@ -62,6 +62,7 @@
  #include "jit.h"
+ #include "xml-syscall.h"
  #include "parser-defs.h"
 +#include "inline-frame.h"
  
  /* readline include files */
  #include "readline/readline.h"
-@@ -3217,10 +3218,24 @@ bpstat_check_breakpoint_conditions (bpst
+@@ -3220,10 +3221,24 @@ bpstat_check_breakpoint_conditions (bpst
    const struct bp_location *bl = bs->breakpoint_at;
    struct breakpoint *b = bl->owner;
  
@@ -236,7 +236,7 @@ Index: gdb-6.8.50.20090909/gdb/breakpoin
      {
        int value_is_zero = 0;
        
-@@ -3380,6 +3395,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -3383,6 +3398,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  	    bs->print = 0;
  	  }
  	bs->commands = copy_command_lines (bs->commands);
@@ -249,7 +249,7 @@ Index: gdb-6.8.50.20090909/gdb/breakpoin
        }
  
      /* Print nothing for this entry if we dont stop or if we dont print.  */
-@@ -5278,9 +5299,9 @@ set_momentary_breakpoint (struct gdbarch
+@@ -5572,9 +5593,9 @@ set_momentary_breakpoint (struct gdbarch
  {
    struct breakpoint *b;
  
@@ -262,11 +262,11 @@ Index: gdb-6.8.50.20090909/gdb/breakpoin
  
    b = set_raw_breakpoint (gdbarch, sal, type);
    b->enable_state = bp_enabled;
-Index: gdb-6.8.50.20090909/gdb/inline-frame.c
+Index: gdb-6.8.91.20090917/gdb/inline-frame.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/inline-frame.c	2009-06-28 02:20:22.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/inline-frame.c	2009-09-09 19:20:00.000000000 +0200
-@@ -195,6 +195,12 @@ inline_frame_sniffer (const struct frame
+--- gdb-6.8.91.20090917.orig/gdb/inline-frame.c	2009-09-13 18:28:28.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/inline-frame.c	2009-09-17 12:49:01.000000000 +0200
+@@ -199,6 +199,12 @@ inline_frame_sniffer (const struct frame
    if (frame_block == NULL)
      return 0;
  
@@ -279,7 +279,7 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
    /* Calculate DEPTH, the number of inlined functions at this
       location.  */
    depth = 0;
-@@ -204,6 +210,10 @@ inline_frame_sniffer (const struct frame
+@@ -208,6 +214,10 @@ inline_frame_sniffer (const struct frame
        if (block_inlined_p (cur_block))
  	depth++;
  
@@ -290,7 +290,7 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
        cur_block = BLOCK_SUPERBLOCK (cur_block);
      }
  
-@@ -287,7 +297,6 @@ skip_inline_frames (ptid_t ptid)
+@@ -291,7 +301,6 @@ skip_inline_frames (ptid_t ptid)
  {
    CORE_ADDR this_pc;
    struct block *frame_block, *cur_block;
@@ -298,7 +298,7 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
    int skip_count = 0;
    struct inline_state *state;
  
-@@ -308,10 +317,7 @@ skip_inline_frames (ptid_t ptid)
+@@ -312,10 +321,7 @@ skip_inline_frames (ptid_t ptid)
  		 of BLOCK_START.  */
  	      if (BLOCK_START (cur_block) == this_pc
  		  || block_starting_point_at (this_pc, cur_block))
@@ -310,7 +310,7 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
  	      else
  		break;
  	    }
-@@ -323,7 +329,6 @@ skip_inline_frames (ptid_t ptid)
+@@ -327,7 +333,6 @@ skip_inline_frames (ptid_t ptid)
    state = allocate_inline_frame_state (ptid);
    state->skipped_frames = skip_count;
    state->saved_pc = this_pc;
@@ -318,7 +318,7 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
  
    if (skip_count != 0)
      reinit_frame_cache ();
-@@ -341,6 +346,23 @@ step_into_inline_frame (ptid_t ptid)
+@@ -345,6 +350,23 @@ step_into_inline_frame (ptid_t ptid)
    reinit_frame_cache ();
  }
  
@@ -342,10 +342,10 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
  /* Return the number of hidden functions inlined into the current
     frame.  */
  
-Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-markers.c
+Index: gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-markers.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/gdb.opt/inline-markers.c	2009-06-28 02:20:24.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/gdb.opt/inline-markers.c	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/testsuite/gdb.opt/inline-markers.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/testsuite/gdb.opt/inline-markers.c	2009-09-17 12:49:01.000000000 +0200
 @@ -15,11 +15,6 @@
  
  extern int x, y;
@@ -358,10 +358,10 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
  void marker(void)
  {
    x += y; /* set breakpoint 2 here */
-Index: gdb-6.8.50.20090909/gdb/gdbthread.h
+Index: gdb-6.8.91.20090917/gdb/gdbthread.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/gdbthread.h	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/gdbthread.h	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/gdbthread.h	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/gdbthread.h	2009-09-17 12:49:01.000000000 +0200
 @@ -191,6 +191,12 @@ struct thread_info
  
    /* Private data used by the target vector implementation.  */
@@ -375,10 +375,10 @@ Index: gdb-6.8.50.20090909/gdb/gdbthread
  };
  
  /* Create an empty thread list, or empty the existing one.  */
-Index: gdb-6.8.50.20090909/gdb/infcmd.c
+Index: gdb-6.8.91.20090917/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/infcmd.c	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/infcmd.c	2009-09-09 19:20:33.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/infcmd.c	2009-09-17 12:47:07.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/infcmd.c	2009-09-17 12:49:01.000000000 +0200
 @@ -1434,11 +1434,11 @@ finish_command_continuation (void *arg)
        struct type *value_type;
  
@@ -518,11 +518,11 @@ Index: gdb-6.8.50.20090909/gdb/infcmd.c
  }
  

  
-Index: gdb-6.8.50.20090909/gdb/target.c
+Index: gdb-6.8.91.20090917/gdb/target.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/target.c	2009-09-09 19:09:31.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/target.c	2009-09-09 19:21:00.000000000 +0200
-@@ -2182,6 +2182,7 @@ target_resume (ptid_t ptid, int step, en
+--- gdb-6.8.91.20090917.orig/gdb/target.c	2009-09-17 12:48:49.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/target.c	2009-09-17 12:49:01.000000000 +0200
+@@ -2187,6 +2187,7 @@ target_resume (ptid_t ptid, int step, en
  {
    struct target_ops *t;
  
@@ -530,10 +530,10 @@ Index: gdb-6.8.50.20090909/gdb/target.c
    target_dcache_invalidate ();
  
    for (t = current_target.beneath; t != NULL; t = t->beneath)
-Index: gdb-6.8.50.20090909/gdb/inline-frame.h
+Index: gdb-6.8.91.20090917/gdb/inline-frame.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/inline-frame.h	2009-06-28 02:20:22.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/inline-frame.h	2009-09-09 19:20:00.000000000 +0200
+--- gdb-6.8.91.20090917.orig/gdb/inline-frame.h	2009-06-28 02:20:22.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/inline-frame.h	2009-09-17 12:49:01.000000000 +0200
 @@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt
  
  void step_into_inline_frame (ptid_t ptid);
@@ -545,11 +545,11 @@ Index: gdb-6.8.50.20090909/gdb/inline-fr
  /* Return the number of hidden functions inlined into the current
     frame.  */
  
-Index: gdb-6.8.50.20090909/gdb/dwarf2read.c
+Index: gdb-6.8.91.20090917/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/dwarf2read.c	2009-09-09 19:19:46.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/dwarf2read.c	2009-09-09 19:20:00.000000000 +0200
-@@ -4130,6 +4130,7 @@ read_func_scope (struct die_info *die, s
+--- gdb-6.8.91.20090917.orig/gdb/dwarf2read.c	2009-09-17 12:48:51.000000000 +0200
++++ gdb-6.8.91.20090917/gdb/dwarf2read.c	2009-09-17 12:49:01.000000000 +0200
+@@ -4128,6 +4128,7 @@ read_func_scope (struct die_info *die, s
    struct block *block;
    unsigned die_children = 0;
    int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
@@ -557,7 +557,7 @@ Index: gdb-6.8.50.20090909/gdb/dwarf2rea
  
    if (inlined_func)
      {
-@@ -4171,7 +4172,10 @@ read_func_scope (struct die_info *die, s
+@@ -4169,7 +4170,10 @@ read_func_scope (struct die_info *die, s
    add_to_cu_func_list (name, lowpc, highpc, cu);
  
    new = push_context (0, lowpc);

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  763 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    8 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  275 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1740 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  596 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  185 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   20 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 -
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   68 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   41 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   72 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   27 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.c                          |   15 
 testsuite/gdb.python/py-value.exp                        |  106 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 239 files changed, 18411 insertions(+), 2415 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.29 -r 1.30 gdb-archer.patchIndex: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gdb-archer.patch	10 Sep 2009 21:37:39 -0000	1.29
+++ gdb-archer.patch	17 Sep 2009 12:15:41 -0000	1.30
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 941eb487a42933e442cb4d11344cda96ecb8a04d
+commit 16f3f01cc2cbc15283462eaabdfcde92cf42cdc6
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -19,16 +19,13 @@ archer-pmuldoon-next-over-throw
 
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 7f2fe58..ac3a4a0 100644
+index f5e1dde..73ee55c 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -166,6 +166,13 @@ INTL_CFLAGS = @INCINTL@
- TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
- TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
+@@ -169,6 +169,10 @@ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
+ # Did the user give us a --with-gdb-datadir option?
+ GDB_DATADIR_PATH = @GDB_DATADIR_PATH@
  
-+# Did the user give us a --with-gdb-datadir option?
-+GDB_DATADIR_PATH = @GDB_DATADIR_PATH@
-+
 +# The argument to --with-pythondir.  If not given, this is
 +# GDB_DATADIR_PATH/python.
 +pythondir = @pythondir@
@@ -36,7 +33,7 @@ index 7f2fe58..ac3a4a0 100644
  # Helper code from gnulib.
  LIBGNU = gnulib/libgnu.a
  INCGNU = -I$(srcdir)/gnulib -Ignulib
-@@ -264,21 +271,37 @@ SUBDIR_TUI_CFLAGS= \
+@@ -267,21 +271,37 @@ SUBDIR_TUI_CFLAGS= \
  #
  SUBDIR_PYTHON_OBS = \
  	python.o \
@@ -74,25 +71,25 @@ index 7f2fe58..ac3a4a0 100644
  	python/py-type.c \
  	python/py-utils.c \
  	python/py-value.c
-@@ -746,7 +769,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
+@@ -750,7 +770,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
  annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h	\
  remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
  sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
--gdb_usleep.h jit.h
-+gdb_usleep.h jit.h python/python.h python/python-internal.h
+-gdb_usleep.h jit.h xml-syscall.h ada-operator.inc
++gdb_usleep.h jit.h xml-syscall.h ada-operator.inc python/python.h python/python-internal.h
  
  # Header files that already have srcdir in them, or which are in objdir.
  
-@@ -864,7 +887,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c \
+@@ -874,7 +894,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c \
  	$(COMPILE) $<
  	$(POSTCOMPILE)
  
--all: gdb$(EXEEXT) $(CONFIG_ALL)
-+all: gdb$(EXEEXT) $(CONFIG_ALL) .gdbinit
+-all: gdb$(EXEEXT) $(CONFIG_ALL) xml-syscall-copy
++all: gdb$(EXEEXT) $(CONFIG_ALL) xml-syscall-copy .gdbinit
  	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
  .PHONY: all-tui
  all-tui: $(TUI)$(EXEEXT)
-@@ -1221,6 +1244,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -1264,6 +1284,12 @@ stamp-h: $(srcdir)/config.in config.status
  	  CONFIG_LINKS= \
  	  $(SHELL) config.status
  
@@ -105,7 +102,7 @@ index 7f2fe58..ac3a4a0 100644
  config.status: $(srcdir)/configure configure.tgt configure.host
  	$(SHELL) config.status --recheck
  
-@@ -1920,6 +1949,14 @@ python.o: $(srcdir)/python/python.c
+@@ -1963,6 +1989,14 @@ python.o: $(srcdir)/python/python.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c
  	$(POSTCOMPILE)
  
@@ -120,7 +117,7 @@ index 7f2fe58..ac3a4a0 100644
  py-cmd.o: $(srcdir)/python/py-cmd.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-cmd.c
  	$(POSTCOMPILE)
-@@ -1932,14 +1969,38 @@ py-function.o: $(srcdir)/python/py-function.c
+@@ -1975,14 +2009,38 @@ py-function.o: $(srcdir)/python/py-function.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-function.c
  	$(POSTCOMPILE)
  
@@ -159,7 +156,7 @@ index 7f2fe58..ac3a4a0 100644
  py-type.o: $(srcdir)/python/py-type.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-type.c
  	$(POSTCOMPILE)
-@@ -1952,6 +2013,36 @@ py-value.o: $(srcdir)/python/py-value.c
+@@ -1995,6 +2053,36 @@ py-value.o: $(srcdir)/python/py-value.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-value.c
  	$(POSTCOMPILE)
  
@@ -197,10 +194,10 @@ index 7f2fe58..ac3a4a0 100644
  # Dependency tracking.  Most of this is conditional on GNU Make being
  # found by configure; if GNU Make is not found, we fall back to a
 diff --git a/gdb/NEWS b/gdb/NEWS
-index 14da6c8..1979f42 100644
+index 4fc6dcd..6744b23 100644
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
-@@ -444,6 +444,13 @@ x86/x86_64 Darwin		i[34567]86-*-darwin*
+@@ -462,6 +462,13 @@ x86/x86_64 Darwin		i[34567]86-*-darwin*
  
  x86_64 MinGW			x86_64-*-mingw*
  
@@ -466,18 +463,18 @@ index 53e7371..d373f8a 100644
 +
  #endif /* BLOCK_H */
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index 9f50872..a4255d7 100644
+index 811cdfb..b0bf314 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -60,6 +60,7 @@
- #include "wrapper.h"
+@@ -61,6 +61,7 @@
  #include "valprint.h"
  #include "jit.h"
+ #include "xml-syscall.h"
 +#include "parser-defs.h"
  
  /* readline include files */
  #include "readline/readline.h"
-@@ -111,8 +112,6 @@ struct breakpoint *set_raw_breakpoint (struct gdbarch *gdbarch,
+@@ -112,8 +113,6 @@ struct breakpoint *set_raw_breakpoint (struct gdbarch *gdbarch,
  					      struct symtab_and_line,
  					      enum bptype);
  
@@ -486,7 +483,7 @@ index 9f50872..a4255d7 100644
  static void breakpoint_adjustment_warning (CORE_ADDR, CORE_ADDR, int, int);
  
  static CORE_ADDR adjust_breakpoint_address (struct gdbarch *gdbarch,
-@@ -334,14 +333,14 @@ static int executing_startup;
+@@ -337,14 +336,14 @@ static int executing_startup;
  	     B ? (TMP=B->next, 1): 0;	\
  	     B = TMP)
  
@@ -508,7 +505,7 @@ index 9f50872..a4255d7 100644
  
  /* Iterator for tracepoints only.  */
  
-@@ -353,10 +352,31 @@ static int executing_startup;
+@@ -356,10 +355,31 @@ static int executing_startup;
  
  struct breakpoint *breakpoint_chain;
  
@@ -542,7 +539,7 @@ index 9f50872..a4255d7 100644
     may still be reported by a target.  */
  VEC(bp_location_p) *moribund_locations = NULL;
  
-@@ -579,6 +599,53 @@ get_breakpoint (int num)
+@@ -582,6 +602,53 @@ get_breakpoint (int num)
  }
  
  

@@ -596,7 +593,7 @@ index 9f50872..a4255d7 100644
  /* condition N EXP -- set break condition of breakpoint N to EXP.  */
  
  static void
-@@ -599,42 +666,7 @@ condition_command (char *arg, int from_tty)
+@@ -602,42 +669,7 @@ condition_command (char *arg, int from_tty)
    ALL_BREAKPOINTS (b)
      if (b->number == bnum)
        {
@@ -640,7 +637,7 @@ index 9f50872..a4255d7 100644
  	return;
        }
  
-@@ -732,35 +764,88 @@ commands_from_control_command (char *arg, struct command_line *cmd)
+@@ -735,35 +767,88 @@ commands_from_control_command (char *arg, struct command_line *cmd)
        }
    error (_("No breakpoint number %d."), bnum);
  }
@@ -742,7 +739,7 @@ index 9f50872..a4255d7 100644
  
      if (bp_addr + bp_size <= memaddr)
        /* The breakpoint is entirely before the chunk of memory we
-@@ -909,7 +994,7 @@ update_watchpoint (struct breakpoint *b, int reparse)
+@@ -912,7 +997,7 @@ update_watchpoint (struct breakpoint *b, int reparse)
    struct bp_location *loc;
    bpstat bs;
  
@@ -751,7 +748,7 @@ index 9f50872..a4255d7 100644
       update_global_locations will eventually delete them and remove
       breakpoints if needed.  */
[...5653 lines suppressed...]
     to return the real type of the variable.
  
-@@ -2139,6 +2411,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
-       else
- 	{
- 	  tmp_var->obj_name = xstrdup (var->obj_name);
-+	  tmp_var->from = var->from;
-+	  tmp_var->to = var->to;
- 	  varobj_delete (var, NULL, 0);
- 
- 	  install_variable (tmp_var);
-@@ -2173,7 +2447,11 @@ static char *
- my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
- {
-   if (var->root->is_valid)
--    return (*var->root->lang->value_of_variable) (var, format);
-+    {
-+      if (var->pretty_printer)
-+	return value_get_print_value (var->value, var->format, var);
-+      return (*var->root->lang->value_of_variable) (var, format);
-+    }
-   else
-     return NULL;
- }
-@@ -2196,43 +2474,51 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
-     struct cleanup *back_to = varobj_ensure_python_env (var);
-     PyObject *value_formatter = var->pretty_printer;
- 
--    if (value_formatter && PyObject_HasAttr (value_formatter,
--					     gdbpy_to_string_cst))
-+    if (value_formatter)
-       {
--	char *hint;
--	struct value *replacement;
--	int string_print = 0;
--	PyObject *output = NULL;
-+	/* First check to see if we have any children at all.  If so,
-+	   we simply return {...}.  */
-+	if (dynamic_varobj_has_child_method (var))
-+	  return xstrdup ("{...}");
- 
--	hint = gdbpy_get_display_hint (value_formatter);
--	if (hint)
-+	if (PyObject_HasAttr (value_formatter, gdbpy_to_string_cst))
- 	  {
--	    if (!strcmp (hint, "string"))
--	      string_print = 1;
--	    xfree (hint);
--	  }
-+	    char *hint;
-+	    struct value *replacement;
-+	    int string_print = 0;
-+	    PyObject *output = NULL;
-+
-+	    hint = gdbpy_get_display_hint (value_formatter);
-+	    if (hint)
-+	      {
-+		if (!strcmp (hint, "string"))
-+		  string_print = 1;
-+		xfree (hint);
-+	      }
- 
--	output = apply_varobj_pretty_printer (value_formatter,
--					      &replacement);
-- 	if (output)
--  	  {
-- 	    PyObject *py_str = python_string_to_target_python_string (output);
-- 	    if (py_str)
-- 	      {
-- 		char *s = PyString_AsString (py_str);
-- 		len = PyString_Size (py_str);
--		thevalue = xmemdup (s, len + 1, len + 1);
-- 		Py_DECREF (py_str);
-+	    output = apply_varobj_pretty_printer (value_formatter,
-+						  &replacement);
-+	    if (output)
-+	      {
-+		PyObject *py_str
-+		  = python_string_to_target_python_string (output);
-+		if (py_str)
-+		  {
-+		    char *s = PyString_AsString (py_str);
-+		    len = PyString_Size (py_str);
-+		    thevalue = xmemdup (s, len + 1, len + 1);
-+		    Py_DECREF (py_str);
-+		  }
-+		Py_DECREF (output);
- 	      }
-- 	    Py_DECREF (output);
--	  }
--	if (thevalue && !string_print)
--	  {
--	    do_cleanups (back_to);
--	    return thevalue;
-+	    if (thevalue && !string_print)
-+	      {
-+		do_cleanups (back_to);
-+		return thevalue;
-+	      }
-+	    if (replacement)
-+	      value = replacement;
- 	  }
--	if (replacement)
--	  value = replacement;
-       }
-     do_cleanups (back_to);
-   }
-@@ -2961,10 +3247,7 @@ cplus_describe_child (struct varobj *parent, int index,
- 	    *cname = xstrdup (TYPE_FIELD_NAME (type, index));
- 
- 	  if (cvalue && value)
--	    {
--	      *cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
--	      release_value (*cvalue);
--	    }
-+	    *cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
- 
- 	  if (ctype)
- 	    {
-@@ -3170,6 +3453,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+@@ -3442,6 +3466,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -31652,7 +28591,7 @@ index 603071f..f1ce89f 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3187,6 +3483,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3459,6 +3496,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }
@@ -31696,66 +28635,6 @@ index 603071f..f1ce89f 100644
  

  extern void _initialize_varobj (void);
  void
-diff --git a/gdb/varobj.h b/gdb/varobj.h
-index 7297243..f43c593 100644
---- a/gdb/varobj.h
-+++ b/gdb/varobj.h
-@@ -78,6 +78,12 @@ typedef struct varobj_update_result_t
-      new value of varobj is already computed and installed, or has to
-      be yet installed.  Don't use this outside varobj.c */
-   int value_installed;  
-+
-+  /* This will be non-NULL when new children were added to the varobj.
-+     It lists the new children (which must necessarily come at the end
-+     of the child list) added during an update.  The caller is
-+     responsible for freeing this vector.  */
-+  VEC (varobj_p) *new;
- } varobj_update_result;
- 
- DEF_VEC_O (varobj_update_result);
-@@ -112,13 +118,24 @@ extern void varobj_set_frozen (struct varobj *var, int frozen);
- 
- extern int varobj_get_frozen (struct varobj *var);
- 
-+extern void varobj_get_child_range (struct varobj *var, int *from, int *to);
-+
-+extern void varobj_set_child_range (struct varobj *var, int from, int to);
-+
- extern char *varobj_get_display_hint (struct varobj *var);
- 
- extern int varobj_get_num_children (struct varobj *var);
- 
--/* Return the list of children of VAR.  The returned vector
--   should not be modified in any way.  */
--extern VEC (varobj_p)* varobj_list_children (struct varobj *var);
-+/* Return the list of children of VAR.  The returned vector should not
-+   be modified in any way.  FROM and TO are in/out parameters
-+   indicating the range of children to return.  If either *FROM or *TO
-+   is less than zero on entry, then all children will be returned.  On
-+   return, *FROM and *TO will be updated to indicate the real range
-+   that was returned.  The resulting VEC will contain at least the
-+   children from *FROM to just before *TO; it might contain more
-+   children, depending on whether any more were available.  */
-+extern VEC (varobj_p)* varobj_list_children (struct varobj *var,
-+					     int *from, int *to);
- 
- extern char *varobj_get_type (struct varobj *var);
- 
-@@ -149,6 +166,13 @@ extern int varobj_editable_p (struct varobj *var);
- 
- extern int varobj_floating_p (struct varobj *var);
- 
--extern void varobj_set_visualizer (struct varobj *var, const char *visualizer);
-+extern void 
-+varobj_set_visualizer (struct varobj *var, const char *visualizer);
-+
-+extern void varobj_enable_pretty_printing (void);
-+
-+extern int varobj_has_more (struct varobj *var, int to);
-+
-+extern int varobj_pretty_printed_p (struct varobj *var);
- 
- #endif /* VAROBJ_H */
 diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
 index c56ab86..dacf913 100644
 --- a/gdb/xcoffread.c


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- gdb.spec	10 Sep 2009 21:37:40 -0000	1.383
+++ gdb.spec	17 Sep 2009 12:15:42 -0000	1.384
@@ -10,7 +10,7 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.50.20090910
+Version: 6.8.91.20090917
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
@@ -18,7 +18,7 @@ Release: 1%{?_with_upstream:.upstream}%{
 
 License: GPLv3+
 Group: Development/Debuggers
-Source: ftp://sourceware.org/pub/gdb/snapshots/current/gdb-%{version}.tar.bz2
+Source: ftp://sourceware.org/pub/gdb/snapshots/branch/gdb-%{version}.tar.bz2
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://gnu.org/software/gdb/
 
@@ -149,9 +149,6 @@ Patch163: gdb-6.3-inheritancetest-200507
 # Add readnever option
 Patch164: gdb-6.3-readnever-20050907.patch
 
-# Fix frame pointer for ia64 sigtramp frame
-Patch166: gdb-6.3-ia64-sigtramp-fp-20050926.patch
-
 # Fix ia64 gdb problem with user-specified SIGILL handling
 Patch169: gdb-6.3-ia64-sigill-20051115.patch
 
@@ -360,9 +357,6 @@ Patch360: gdb-6.8-bz457187-largefile-tes
 # Fix compatibility of --with-system-readline and readline-6.0+.
 Patch375: gdb-readline-6.0.patch
 
-# Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).
-Patch378: gdb-bz515434-qsort_cmp.patch
-
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -479,7 +473,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch162 -p1
 %patch163 -p1
 %patch164 -p1
-%patch166 -p1
 %patch169 -p1
 %patch170 -p1
 %patch176 -p1
@@ -551,7 +544,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch352 -p1
 %patch360 -p1
 %patch375 -p1
-%patch378 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -811,6 +803,7 @@ fi
 %{python_sitelib}/gdb
 %endif	# 0%{!?_without_python:1}
 %endif	# 0%{!?_with_upstream:1}
+%{_datadir}/gdb
 %{_infodir}/annotate.info*
 %{_infodir}/gdb.info*
 %{_infodir}/gdbint.info*
@@ -825,6 +818,11 @@ fi
 %endif
 
 %changelog
+* Thu Sep 17 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090917-1
+- Upgrade to the FSF GDB gdb-7.0 branch and snapshot: 6.8.91.20090917
+- archer-jankratochvil-fedora12 commit: 16f3f01cc2cbc15283462eaabdfcde92cf42cdc6
+- Drop the qsort_cmp workaround as resolved in FSF GDB now (BZ 515434).
+
 * Thu Sep 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090910-1
 - Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090910
 - archer-jankratochvil-fedora12 commit: 941eb487a42933e442cb4d11344cda96ecb8a04d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	10 Sep 2009 21:37:41 -0000	1.36
+++ sources	17 Sep 2009 12:15:42 -0000	1.37
@@ -1 +1 @@
-476e005b8bb33c5c3b3f0b7bd93988bc  gdb-6.8.50.20090910.tar.bz2
+eaed9150b219c8ee56bb676e32a9d2a5  gdb-6.8.91.20090917.tar.bz2


--- gdb-6.3-ia64-sigtramp-fp-20050926.patch DELETED ---


--- gdb-bz515434-qsort_cmp.patch DELETED ---



From agk at fedoraproject.org  Thu Sep 17 12:18:52 2009
From: agk at fedoraproject.org (agk)
Date: Thu, 17 Sep 2009 12:18:52 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch, NONE,
	1.1 lvm2-2_02_53-dmeventd_log_fn.patch, 1.1, 1.2 lvm2.spec,
	1.177, 1.178
Message-ID: <20090917121852.9B09111C00CE@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7431

Modified Files:
	lvm2-2_02_53-dmeventd_log_fn.patch lvm2.spec 
Added Files:
	lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch 
Log Message:
Enable dmeventd monitoring section of config file by default.


lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch:
 WHATS_NEW        |    1 +
 doc/example.conf |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch ---
--- LVM2.2.02.52/doc/example.conf	2009-09-15 14:49:11.000000000 +0100
+++ LVM2.2.02.52-new3/doc/example.conf	2009-09-17 13:18:59.736033000 +0100
@@ -435,7 +435,7 @@
 
 # Event daemon
 #
-# dmeventd {
+dmeventd {
     # mirror_library is the library used when monitoring a mirror device.
     #
     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
@@ -443,7 +443,7 @@
     # reconfigures a mirror as necessary. If no mirror library is
     # provided, mirrors are not monitored through dmeventd.
 
-    # mirror_library = "libdevmapper-event-lvm2mirror.so"
+    mirror_library = "libdevmapper-event-lvm2mirror.so"
 
     # snapshot_library is the library used when monitoring a snapshot device.
     #
@@ -452,6 +452,6 @@
     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
     # 95% of the snapshot are filled.
 
-    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-#}
+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
+}
 
--- LVM2.2.02.52/WHATS_NEW	2009-09-17 13:17:07.822006000 +0100
+++ LVM2.2.02.52-new3/WHATS_NEW	2009-09-17 13:19:57.674596000 +0100
@@ -1,5 +1,6 @@
 Version 2.02.53 -
 =====================================
+  Enable dmeventd monitoring section of config file by default.
   Fix dmeventd _temporary_log_fn parameters. (2.02.50)
   Update lvm2 monitoring script to lvm2_monitoring_init_red_hat.in.
 

lvm2-2_02_53-dmeventd_log_fn.patch:
 WHATS_NEW                                             |    1 +
 daemons/dmeventd/plugins/mirror/dmeventd_mirror.c     |    4 +++-
 daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c |    1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

Index: lvm2-2_02_53-dmeventd_log_fn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2-2_02_53-dmeventd_log_fn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lvm2-2_02_53-dmeventd_log_fn.patch	17 Sep 2009 12:12:00 -0000	1.1
+++ lvm2-2_02_53-dmeventd_log_fn.patch	17 Sep 2009 12:18:52 -0000	1.2
@@ -1,4 +1,3 @@
-diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
 --- LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2009-06-30 19:39:31.000000000 +0100
 +++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2009-09-17 12:51:29.637533000 +0100
 @@ -126,8 +126,10 @@
@@ -13,7 +12,6 @@ diff -ru LVM2.2.02.52/daemons/dmeventd/p
  			      const char *format)
  {
  	if (!strncmp(format, "WARNING: ", 9) && (level < 5))
-diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
 --- LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2008-10-13 13:06:30.000000000 +0100
 +++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2009-09-17 12:51:29.641533000 +0100
 @@ -57,6 +57,7 @@
@@ -24,8 +22,6 @@ diff -ru LVM2.2.02.52/daemons/dmeventd/p
  			      const char *format)
  {
  	if (!strncmp(format, "WARNING: ", 9) && (level < 5))
-Only in LVM2.2.02.52/scripts: lvm2_monitoring_init_red_hat.in.lvm2_monitoring
-diff -ru LVM2.2.02.52/WHATS_NEW LVM2.2.02.52-new2/WHATS_NEW
 --- LVM2.2.02.52/WHATS_NEW	2009-09-17 12:50:42.799264000 +0100
 +++ LVM2.2.02.52-new2/WHATS_NEW	2009-09-17 12:51:51.499101000 +0100
 @@ -1,5 +1,6 @@


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- lvm2.spec	17 Sep 2009 11:55:13 -0000	1.177
+++ lvm2.spec	17 Sep 2009 12:18:52 -0000	1.178
@@ -18,6 +18,7 @@ Source0: ftp://sources.redhat.com/pub/lv
 Patch0: cluster-locking-built-in.patch
 Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch
 Patch2: lvm2-2_02_53-dmeventd_log_fn.patch
+Patch3: lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -48,6 +49,7 @@ or more physical volumes and creating on
 %patch0 -p1 -b .locking
 %patch1 -p1 -b .lvm2_monitoring
 %patch2 -p1 -b .dmeventd_log_fn
+%patch3 -p1 -b .enable_dmeventd_in_conf
 
 %build
 %define _exec_prefix /



From kdudka at fedoraproject.org  Thu Sep 17 12:28:23 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu, 17 Sep 2009 12:28:23 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.114,1.115
Message-ID: <20090917122823.F0CC611C00CE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11578

Modified Files:
	curl.spec 
Log Message:
- make curl test-suite more verbose


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- curl.spec	16 Sep 2009 14:46:47 -0000	1.114
+++ curl.spec	17 Sep 2009 12:28:23 -0000	1.115
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -92,7 +92,9 @@ sed -i \
 make %{?_smp_mflags}
 
 %check
-LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make %{?_smp_mflags} check
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+make %{?_smp_mflags} -C tests
+cd tests && ./runtests.pl -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Sep 17 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-7
+- make curl test-suite more verbose
+
 * Wed Sep 16 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-6
 - update polling patch to the latest upstream version
 



From veillard at fedoraproject.org  Thu Sep 17 12:32:34 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 17 Sep 2009 12:32:34 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.176,1.177
Message-ID: <20090917123234.1B1C011C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12857

Modified Files:
	libvirt.spec 
Log Message:
Refactoring of spec file by danpb for RHEL 5/6 compat, daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- libvirt.spec	15 Sep 2009 12:50:58 -0000	1.176
+++ libvirt.spec	17 Sep 2009 12:32:32 -0000	1.177
@@ -1,60 +1,132 @@
 # -*- rpm-spec -*-
 
-%define with_xen           0%{!?_without_xen:1}
-%define with_xen_proxy     0%{!?_without_xen_proxy:1}
-%define with_qemu          0%{!?_without_qemu:1}
-%define with_openvz        0%{!?_without_openvz:1}
-%define with_lxc           0%{!?_without_lxc:1}
-%define with_vbox          0%{!?_without_vbox:1}
-%define with_sasl          0%{!?_without_sasl:1}
-%define with_avahi         0%{!?_without_avahi:1}
-%define with_python        0%{!?_without_python:1}
-%define with_libvirtd      0%{!?_without_libvirtd:1}
-%define with_uml           0%{!?_without_uml:1}
-%define with_one           0%{!?_without_one:1}
-%define with_phyp          0%{!?_without_phyp:1}
-%define with_network       0%{!?_without_network:1}
-%define with_storage_fs    0%{!?_without_storage_fs:1}
-%define with_storage_lvm   0%{!?_without_storage_lvm:1}
-%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
-%define with_storage_disk  0%{!?_without_storage_disk:1}
-%define with_storage_mpath 0%{!?_without_storage_mpath:1}
-%define with_numactl       0%{!?_without_numactl:1}
+# A client only build will create a libvirt.so only containing
+# the generic RPC driver, and test driver and no libvirtd
+# Default to a full server + client build
+%define client_only        0
+
+# Now turn off server build in certain cases
+
+# RHEL-5 builds are client-only for s390, ppc
+%if 0%{?rhel} == 5
+%ifnarch i386 i586 i686 x86_64 ia64
+%define client_only        1
+%endif
+%endif
 
-# default to off - selectively enabled below
+# Disable all server side drivers if client only build requested
+%if %{client_only}
+%define server_drivers     0
+%else
+%define server_drivers     1
+%endif
+
+
+# Now set the defaults for all the important features, independant
+# of any particular OS
+
+# First the daemon itself
+%define with_libvirtd      0%{!?_without_libvirtd:%{server_drivers}}
+%define with_avahi         0%{!?_without_avahi:%{server_drivers}}
+
+# Then the hypervisor drivers
+%define with_xen           0%{!?_without_xen:%{server_drivers}}
+%define with_xen_proxy     0%{!?_without_xen_proxy:%{server_drivers}}
+%define with_qemu          0%{!?_without_qemu:%{server_drivers}}
+%define with_openvz        0%{!?_without_openvz:%{server_drivers}}
+%define with_lxc           0%{!?_without_lxc:%{server_drivers}}
+%define with_vbox          0%{!?_without_vbox:%{server_drivers}}
+%define with_uml           0%{!?_without_uml:%{server_drivers}}
+%define with_one           0%{!?_without_one:%{server_drivers}}
+%define with_phyp          0%{!?_without_phyp:%{server_drivers}}
+%define with_esx           0%{!?_without_esx:%{server_drivers}}
+
+# Then the secondary host drivers
+%define with_network       0%{!?_without_network:%{server_drivers}}
+%define with_storage_fs    0%{!?_without_storage_fs:%{server_drivers}}
+%define with_storage_lvm   0%{!?_without_storage_lvm:%{server_drivers}}
+%define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}}
+%define with_storage_disk  0%{!?_without_storage_disk:%{server_drivers}}
+%define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}}
+%define with_numactl       0%{!?_without_numactl:%{server_drivers}}
+%define with_selinux       0%{!?_without_selinux:%{server_drivers}}
+%define with_hal           0%{!?_without_hal:%{server_drivers}}
+
+# A few optional bits off by default, we enable later
 %define with_polkit        0%{!?_without_polkit:0}
 %define with_capng         0%{!?_without_capng:0}
 %define with_netcf         0%{!?_without_netcf:0}
 
+# Non-server/HV driver defaults which are always enabled
+%define with_python        0%{!?_without_python:1}
+%define with_sasl          0%{!?_without_sasl:1}
+
+
+# Finally set the OS / architecture specific special cases
+
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i586 i686 x86_64 ia64
 %define with_xen 0
 %endif
 
+
+# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX
+%if 0%{?rhel}
+%define with_openvz 0
+%define with_vbox 0
+%define with_uml 0
+%define with_one 0
+%define with_phyp 0
+%define with_esx 0
+%endif
+
+# RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC
+%if 0%{?rhel} == 5
+%ifnarch x86_64
+%define with_qemu 0
+%endif
+%define with_lxc 0
+%endif
+
+# RHEL-6 has restricted QEMU to x86_64 only, stopped including Xen
+# on all archs. Other archs all have LXC available though
+%if 0%{?rhel} >= 6
+%ifnarch x86_64
+%define with_qemu 0
+%endif
+%define with_xen 0
+%endif
+# If Xen isn't turned on, we shouldn't build the xen proxy either
 %if ! %{with_xen}
 %define with_xen_proxy 0
 %endif
 
+# Fedora doesn't have any QEMU on ppc64 - only ppc
 %if 0%{?fedora}
 %ifarch ppc64
 %define with_qemu 0
 %endif
 %endif
 
-%if 0%{?fedora} >= 8
+# PolicyKit was introduced in Fedora 8 / RHEL-6 or newer, allowing
+# the setuid Xen proxy to be killed off
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
 %define with_polkit    0%{!?_without_polkit:1}
 %define with_xen_proxy 0
 %endif
 
-%if 0%{?fedora} >= 12
+# libcapng is used to manage capabilities in Fedora 12 / RHEL-6 or newer
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %define with_capng     0%{!?_without_capng:1}
 %endif
 
-%if 0%{?fedora} >= 12
-%define with_netcf     0%{!?_without_netcf:1}
+# netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%define with_netcf     0%{!?_without_netcf:%{server_drivers}}
 %endif
 
-%if 0%{?fedora} >= 12
+# Force QEMU to run as non-root
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %define qemu_user  qemu
 %define qemu_group  qemu
 %else
@@ -62,22 +134,20 @@
 %define qemu_group  root
 %endif
 
-#
-# If building on RHEL switch on the specific support
-#
-%if 0%{?fedora}
-%define with_rhel5  0
-%else
+
+# The RHEL-5 Xen package has some feature backports. This
+# flag is set to enable use of those special bits on RHEL-5
+%if 0%{?rhel} == 5
 %define with_rhel5  1
-%define with_polkit 0
-%define with_one    0
+%else
+%define with_rhel5  0
 %endif
 
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -93,13 +163,21 @@ BuildRequires: python-devel
 # The client side, i.e. shared libs and virsh are in a subpackage
 Requires: libvirt-client = %{version}-%{release}
 
-Requires: dnsmasq
+# Used by many of the drivers, so turn it on whenever the
+# daemon is present
+%if %{with_libvirtd}
 Requires: bridge-utils
+%endif
+%if %{with_network}
+Requires: dnsmasq
 Requires: iptables
+%endif
 # needed for device enumeration
+%if %{with_hal}
 Requires: hal
+%endif
 %if %{with_polkit}
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >=6
 Requires: polkit >= 0.93
 %else
 Requires: PolicyKit >= 0.6
@@ -158,18 +236,24 @@ BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
+%if %{with_hal}
 BuildRequires: hal-devel
+%endif
 %if %{with_avahi}
 BuildRequires: avahi-devel
 %endif
+%if %{with_selinux}
 BuildRequires: libselinux-devel
+%endif
+%if %{with_network}
 BuildRequires: dnsmasq
+%endif
 BuildRequires: bridge-utils
 %if %{with_sasl}
 BuildRequires: cyrus-sasl-devel
 %endif
 %if %{with_polkit}
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 # Only need the binary, not -devel
 BuildRequires: polkit >= 0.93
 %else
@@ -200,11 +284,20 @@ BuildRequires: iscsi-initiator-utils
 %if %{with_storage_disk}
 # For disk driver
 BuildRequires: parted-devel
+%if 0%{?rhel} == 5
+# Broken RHEL-5 parted RPM is missing a dep
+BuildRequires: e2fsprogs-devel
+%endif
 %endif
 %if %{with_storage_mpath}
 # For Multipath support
+%if 0%{?rhel} == 5
+# Broken RHEL-5 packaging has header files in main RPM :-(
+BuildRequires: device-mapper
+%else
 BuildRequires: device-mapper-devel
 %endif
+%endif
 %if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
@@ -310,6 +403,10 @@ of recent versions of Linux (and other O
 %define _without_phyp --without-phyp
 %endif
 
+%if ! %{with_esx}
+%define _without_esx --without-esx
+%endif
+
 %if ! %{with_polkit}
 %define _without_polkit --without-polkit
 %endif
@@ -370,6 +467,14 @@ of recent versions of Linux (and other O
 %define _without_netcf --without-netcf
 %endif
 
+%if ! %{with_selinux}
+%define _without_selinux --without-selinux
+%endif
+
+%if ! %{with_hal}
+%define _without_hal --without-hal
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -383,6 +488,7 @@ of recent versions of Linux (and other O
            %{?_without_uml} \
            %{?_without_one} \
            %{?_without_phyp} \
+           %{?_without_esx} \
            %{?_without_network} \
            %{?_with_rhel5_api} \
            %{?_without_storage_fs} \
@@ -393,6 +499,8 @@ of recent versions of Linux (and other O
            %{?_without_numactl} \
            %{?_without_capng} \
            %{?_without_netcf} \
+           %{?_without_selinux} \
+           %{?_without_hal} \
            --with-qemu-user=%{qemu_user} \
            --with-qemu-group=%{qemu_group} \
            --with-init-script=redhat \
@@ -413,7 +521,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 
-%if %{with_qemu}
+%if %{with_network}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
 # because if the admin wants to delete the default network completely, we don't
 # want to end up re-incarnating it on every RPM upgrade.
@@ -427,6 +535,8 @@ sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_
 %else
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+%endif
+%if ! %{with_qemu}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
@@ -436,6 +546,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
 %endif
 
+%if %{client_only}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}
+%endif
+
 %if ! %{with_qemu}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
 %endif
@@ -448,9 +562,9 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}
 rm -fr %{buildroot}
 
 %pre
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 # Normally 'setup' adds this in /etc/passwd, but this is
-# here for case of upgrades from earlier Fedora. This
+# here for case of upgrades from earlier Fedora/RHEL. This
 # UID/GID pair is reserved for qemu:qemu
 getent group kvm >/dev/null || groupadd -g 36 -r kvm
 getent group qemu >/dev/null || groupadd -g 107 -r qemu
@@ -462,7 +576,7 @@ getent passwd qemu >/dev/null || \
 %post
 
 %if %{with_libvirtd}
-%if %{with_qemu}
+%if %{with_network}
 # We want to install the default network for initial RPM installs
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
@@ -479,7 +593,7 @@ fi
 
 /sbin/chkconfig --add libvirtd
 if [ "$1" -ge "1" ]; then
-	/sbin/service libvirtd condrestart > /dev/null 2>&1
+    /sbin/service libvirtd condrestart > /dev/null 2>&1
 fi
 %endif
 
@@ -495,31 +609,31 @@ fi
 
 %postun client -p /sbin/ldconfig
 
+%if %{with_libvirtd}
 %files
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
-%if %{with_qemu}
+%if %{with_network}
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %endif
 
-%if %{with_libvirtd}
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
-%endif
 
 %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %endif
 
-%if %{with_qemu}
 %dir %{_datadir}/libvirt/
+
+%if %{with_network}
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
 %endif
@@ -557,13 +671,11 @@ fi
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
 
-%if %{with_libvirtd}
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%endif
 
 %if %{with_polkit}
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
 %else
 %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
@@ -578,17 +690,15 @@ fi
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
-
 %if %{with_lxc}
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %endif
 
-%if %{with_libvirtd}
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %attr(0755, root, root) %{_sbindir}/libvirtd
-%endif
 
 %doc docs/*.xml
+%endif
 
 %files client -f %{name}.lang
 %defattr(-, root, root)
@@ -649,6 +759,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-2
+- revamp of spec file for modularity and RHELs
+
 * Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-1
 - Upstream release of 0.7.1
 - ESX, VBox driver updates
@@ -694,7 +807,6 @@ fi
 - Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)
 
 * Wed Aug  5 2009 Daniel Veillard <veillard at redhat.com> - 0.7.0-1
-- Upstream release of 0.7.0
 - ESX, VBox3, Power Hypervisor drivers
 - new net filesystem glusterfs
 - Storage cloning for LVM and Disk backends
@@ -703,299 +815,55 @@ fi
 - QEmu hotplug NIC support
 - a lot of fixes
 
-* Fri Jul 31 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.9.gite195b43
-- Set perms on /var/lib/libvirt/images to 0711
-
-* Thu Jul 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.8.gite195b43
-- Add patch from upstream to fix qemu pidfile perms problem
-
-* Thu Jul 30 2009 Daniel P. Berrange <berrange at redhat.com> - 0.7.0-0.7.gite195b43
-- Create qemu/kvm user & group to fix upgrades
-
-* Wed Jul 29 2009 Daniel Veillard <veillard at redhat.com> - 0.7.0-0.6.gite195b43
-- another prerelease with qemu, uml and remote patches
-- drop the news patch as it's now UTF8 upstream
-
-* Wed Jul 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.5.gitf055724
-- Move ldconfig call to libvirt-client %post/%postun
-- Fix rpmlint warning about libvirt-client summary
-- Fix disabling polkit and netcf on older fedoras
-
-* Wed Jul 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.4.gitf055724
-- Drop explicit libselinux requires, it is autorequired
-- Drop cleanup of python/tests, apparently not needed
-- Cherry-pick upstream patch to convert NEWS to UTF-8, drop iconv
-- Drop python BR; python-devel requires it
-
-* Tue Jul 28 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.3.gitf055724
-- Enable netcf support
-- Pass --with-qemu-user=qemu etc. to configure
-- Move various requires to the libvirt-client sub-package
-- Sync some trivial cleanups from upstream spec file
-- Remove explicit libxml2 requires, again
-- Build with --without-capng if capng support is disabled
-- Remove explicit dir creating in makeinstall, replaced by attr in files
-- Set perms on /var/{run,lib,cache}/libvirt/qemu
-
-* Tue Jul 28 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.2.gitf055724
-- Drop glusterfs dep to 2.0.1 (bug #514191)
-
-* Mon Jul 27 2009 Daniel Veillard <veillard at redhat.com> - 0.7.0-0.1.gitf055724
-- prerelease of 0.7.0
+* Fri Jul  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.5-1
+- release of 0.6.5
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri May 29 2009 Daniel Veillard <veillard at redhat.com> - 0.6.4-1
+- release of 0.6.4
+- various new APIs
 
-* Fri Jul 10 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.5-2.fc12
-- Bump release number to rebuild against new libparted.
-
-* Fri Jul  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.5-1.fc12
-- Upstream release of 0.6.5
-- OpenNebula driver
-- many bug fixes
-
-* Fri Jul  3 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.4-4.fc12
-- Fix libvirtd crash with bad capabilities data (bug #505635)
-
-* Fri Jul  3 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.4-3.fc12
-- Handle shared/readonly image labelling (bug #493692)
-- Don't unnecessarily try to change a file context (bug #507555)
-- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
-
-* Fri Jun  5 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.4-2.fc12
-- Remove the qemu BuildRequires
-
-* Fri May 29 2009 Daniel Veillard <veillard at redhat.com> - 0.6.4-1.fc12
-- Upstream release of 0.6.4
-- new APIs
-- fixes for latests QEmu/KVM versions
-- various assorted fixes
-
-* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-11.fc12
-- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
-
-* Thu May 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-10.fc12
-- Fix XML attribute escaping (bug #499791)
-- Fix serious event handling issues causing guests to be destroyed (bug #499698)
-
-* Thu May 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-9.fc12
-- Fix qemu argv detection with latest qemu (bug #501923)
-
-* Sun May 10 2009 Cole Robinson <crobinso at redhat.com> - 0.6.2-8.fc12
-- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
-
-* Thu May  7 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-7.fc12
-- Enable migration for qemu 0.10 (bug #499704)
-
-* Wed May  6 2009 Cole Robinson <crobinso at redhat.com> - 0.6.3-6.fc12
-- Refresh qemu caps when getCapabilities is called (bug #460649)
-
-* Wed May  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-5.fc12
-- Fix handling of <hostdev managed='yes'> (bug #499386)
+* Fri Apr 24 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-1
+- release of 0.6.3
+- VirtualBox driver
 
-* Tue May  5 2009 Daniel Berrange <berrange at redhat.com> - 0.6.3-4.fc12
-- Fix readonly/shared disk image labelling (rhbz #493692)
+* Fri Apr  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.2-1
+- release of 0.6.2
 
-* Tue Apr 28 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-3.fc12
-- was also missing /usr/share/gtk-doc/html/libvirt in -devel
+* Fri Mar  4 2009 Daniel Veillard <veillard at redhat.com> - 0.6.1-1
+- release of 0.6.1
 
-* Tue Apr 28 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-2.fc12
-- fix packaging bug #496945 libvirt should own /var/cache/libvirt
+* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1
+- release of 0.6.0
 
-* Fri Apr 24 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-1.fc12
-- release of 0.6.3
-- VirtualBox driver
-- new virt-xml-validate command
-- assorted bug fixes
+* Tue Nov 25 2008 Daniel Veillard <veillard at redhat.com> - 0.5.0-1
+- release of 0.5.0
 
-* Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc12
-- Fix qemu drive format specification (#496092)
+* Tue Sep 23 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-1
+- release of 0.4.6
 
-* Fri Apr  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.2-1.fc11
-- release of 0.6.2
-- memory ballooning in QEMU
-- SCSI HBA storage pool support
-- support SASL auth for VNC server
-- PCI passthrough in Xen driver
-- assorted bug fixes
-
-* Fri Apr  3 2009 Daniel P. Berrange  <berrange at redhat.com> - 0.6.1-6.fc11
-- Fix typo in previous patch
-
-* Tue Mar 17 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.1-5.fc11
-- Don't relabel shared/readonly disks
-- Disable sound cards when running sVirt
-
-* Tue Mar 17 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.1-4.fc11
-- Fix memory allocation for xend lookup
-- Avoid crash if storage volume deletion fails
-- Fix multiple FD leaks
-- Fix bug in dispatch FD events when a callback is marked deleted
-- Fix parsing of storage volume owner/group/mode
-- Fix memory allocation for virDomainGetVcpus RPC handler
-- Avoid deadlock in setting vCPU count
-- Use correct driver name in Xen block detach
-
-* Mon Mar  9 2009 Cole Robinson <crobinso at redhat.com> - 0.6.1-3.fc11
-- Add Requires: libselinux
-
-* Fri Mar  6 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.1-2.fc11
-- Fix crash after storage vol deletion fails
-- Add patch to enable VNC SASL authentication
-
-* Wed Mar  4 2009 Daniel Veillard <veillard at redhat.com> - 0.6.1-1.fc11
-- upstream release 0.6.1
-- support for node device detach reattach and reset
-- sVirt mandatory access control support
-- many bug fixes and small improvements
-
-* Mon Mar  2 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-6.fc11
-- make sure Xen is handled in i586 new default 32bits x86 packages
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5.fc11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 18 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.0-4.fc11
-- Fix QEMU startup timeout/race (rhbz #484649)
-- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
-- Fix timeout when autostarting session daemon
-
-* Wed Feb 11 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.0-3.fc11
-- Multiple fixes to remove rpmlint warnings/errors (rhbz #226055)
-
-* Fri Feb  6 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.0-2.fc11
-- Fix libvirtd --timeout usage
-- Fix RPC call problems and QEMU startup handling (rhbz #484414)
-- Fix unowned directories (rhbz #483442)
-
-* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1.fc11
-- upstream release 0.6.0
-- thread safety of API
-- allow QEmu/KVM domains to survive daemon restart
-- extended logging capabilities
-- support copy on write storage volumes for QEmu/KVM
-- support of storage cache control options for QEmu/KVM
-- a lot of bug fixes
-
-* Wed Dec 17 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-2.fc11
-- fix missing read-only access checks, fixes CVE-2008-5086
-
-* Fri Dec  5 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-1.fc11
-- upstream release 0.5.1
-- mostly bugfixes e.g #473071
-- some driver improvments
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5.0-2
-- Rebuild for Python 2.6
-
-* Wed Nov 26 2008 Daniel Veillard <veillard at redhat.com> - 0.5.0-1.fc11
-- upstream release 0.5.0
-- domain lifecycle event support
-- node device enumeration
-- KVM/QEmu migration support
-- improved LXC support
-- SDL display configuration
-- User Mode Linux driver (Daniel Berrange)
-
-* Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-3.fc10
-- apply the python makefile patch for #463733
-
-* Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-2.fc10
-- upstream release 0.4.6
-- fixes some problems with 0.4.5
-
-* Tue Sep  9 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-2.fc10
-- fix a crash if a QEmu/KVM domain is defined without an emulator path
-
-* Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc10
-- upstream release 0.4.5
-- a lot of bug fixes
-- major updates to QEmu/KVM and Linux containers drivers
-- support for OpenVZ if installed
-
-* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.4-3.fc10
-- fix license tag
-
-* Tue Jul  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.4-2.fc10
-- Fix booting of CDROM images with KVM (rhbz #452355)
-
-* Wed Jun 25 2008 Daniel Veillard <veillard at redhat.com> - 0.4.4-1.fc10
-- upstream release 0.4.4
-- fix a few bugs in previous release
-
-* Thu Jun 12 2008 Daniel Veillard <veillard at redhat.com> - 0.4.3-1.fc10
-- upstream release 0.4.3
-- many bug fixes
-- many small improvements
-- serious xenner fixes
-
-* Wed Jun  4 2008 Mark McLoughlin <markmc at redhat.com> - 0.4.2-6.fc10
-- Disable lokkit support again (#449996, #447633)
-- Ensure %-fedora is evaluated correctly
-
-* Thu May 15 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.2-5.fc10
-- Rebuild with policy enabled (rhbz #446616)
-
-* Fri May  9 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.2-4.fc10
-- Added directory for initrd/kernel images for SELinux policy
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc at redhat.com> - 0.4.2-3.fc10
-- Simplify the way arch conditionals are handled
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc at redhat.com> - 0.4.2-2.fc10
-- Enable lokkit support (#443796)
-
-* Tue Apr  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.2-1.fc9
-- upstream release 0.4.2
-- many bug fixes
-- localization updates
+* Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1
+- release of 0.4.5
 
-* Thu Apr  4 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.1-7.fc9
-- Don't run polkit-auth as root
-- Don't request polkit auth if client is root
-
-* Fri Mar 28 2008 Chris Lalancette <clalance at redhat.com> - 0.4.1-6.fc9
-- When dumping XML for a storage pool, make the <source> directory tag
-  match the <dir> tag used for specifying the pool in the first place
-
-* Thu Mar 27 2008 Chris Lalancette <clalance at redhat.com> - 0.4.1-5.fc9
-- Do iscsiadm sendtarget before trying to do login
-- Do sysfs scanning for iSCSI LUNs instead of trying to parse them from
-  iscsiadm session output
-
-* Thu Mar 13 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.1-4.fc9
-- Fix QEMU tap device setup
-- Fix Xen boot device XML processing
-- Fixed QEMU cdrom media change
+* Wed Jun 25 2008 Daniel Veillard <veillard at redhat.com> - 0.4.4-1
+- release of 0.4.4
+- mostly a few bug fixes from 0.4.3
 
-* Mon Mar 10 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.1-3.fc9
-- Fixed daemon startup when run with --daemon flag
+* Thu Jun 12 2008 Daniel Veillard <veillard at redhat.com> - 0.4.3-1
+- release of 0.4.3
+- lots of bug fixes and small improvements
 
-* Mon Mar  3 2008 Daniel Veillard <veillard at redhat.com> - 0.4.1-2.fc9
-- 2 patches found just after the release
+* Tue Apr  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.2-1
+- release of 0.4.2
+- lots of bug fixes and small improvements
 
-* Mon Mar  3 2008 Daniel Veillard <veillard at redhat.com> - 0.4.1-1.fc9
+* Mon Mar  3 2008 Daniel Veillard <veillard at redhat.com> - 0.4.1-1
 - Release of 0.4.1
 - Storage APIs
 - xenner support
 - lots of assorted improvements, bugfixes and cleanups
 - documentation and localization improvements
 
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-5
-- Autorebuild for GCC 4.3
-
-* Fri Jan 18 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.0-4.fc9
-- Fix SSH tunnelling (rhbz #428743)
-- Fix back-compat for nodeinfo call changes.
-
-* Sun Jan 13 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.0-3.fc9
-- Fix crash when no auth callback
-
-* Wed Jan  2 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.0-2.fc9
-- Fix reading large config files (rhbz #426425)
-- Fix crash when connecting to a PolicyKit enabled server with not auth callback (rhbz #427107)
-
-* Tue Dec 18 2007 Daniel Veillard <veillard at redhat.com> - 0.4.0-1.fc8
+* Tue Dec 18 2007 Daniel Veillard <veillard at redhat.com> - 0.4.0-1
 - Release of 0.4.0
 - SASL based authentication
 - PolicyKit authentication
@@ -1003,10 +871,6 @@ fi
 - lots of assorted improvements, bugfixes and cleanups
 - documentation and localization improvements
 
-* Mon Oct 15 2007 Daniel P. Berrange <berrange at redhat.com> - 0.3.3-2.fc8
-- Added QEMU driver config file support
-- Added example config files
-
 * Sun Sep 30 2007 Daniel Veillard <veillard at redhat.com> - 0.3.3-1
 - Release of 0.3.3
 - Avahi support
@@ -1014,40 +878,28 @@ fi
 - lots of assorted improvements, bugfixes and cleanups
 - documentation and localization improvements
 
-* Fri Aug 24 2007 Daniel Veillard <veillard at redhat.com> - 0.3.2-2.fc8
-- also build on arches where Xen is not available
-
-* Tue Aug 21 2007 Daniel Veillard <veillard at redhat.com> - 0.3.2-1.fc8
+* Tue Aug 21 2007 Daniel Veillard <veillard at redhat.com> - 0.3.2-1
 - Release of 0.3.2
 - API for domains migration
 - APIs for collecting statistics on disks and interfaces
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Thu Aug 16 2007 Daniel Veillard <veillard at redhat.com> - 0.3.1-4.fc8
-- Fixes missing Requires for libvirt-devel
-
-* Thu Jul 26 2007 Daniel Veillard <veillard at redhat.com> - 0.3.1-3.fc8
-- adds fix for bug #249594
-
-* Wed Jul 25 2007 Jesse Keating <jkeating at redhat.com> - 0.3.1-2
-- Rebuild for RH #249435
-
-* Tue Jul 24 2007 Daniel Veillard <veillard at redhat.com> - 0.3.1-1.fc8
+* Tue Jul 24 2007 Daniel Veillard <veillard at redhat.com> - 0.3.1-1
 - Release of 0.3.1
 - localtime clock support
 - PS/2 and USB input devices
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Mon Jul  9 2007 Daniel Veillard <veillard at redhat.com> - 0.3.0-1.fc8
+* Mon Jul  9 2007 Daniel Veillard <veillard at redhat.com> - 0.3.0-1
 - Release of 0.3.0
 - Secure remote access support
 - unification of daemons
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Fri Jun  8 2007 Daniel Veillard <veillard at redhat.com> - 0.2.3-1.fc8
+* Fri Jun  8 2007 Daniel Veillard <veillard at redhat.com> - 0.2.3-1
 - Release of 0.2.3
 - lot of assorted bugfixes and cleanups
 - support for Xen-3.1
@@ -1116,7 +968,7 @@ fi
 - it's pkgconfig not pgkconfig !
 
 * Mon Nov  6 2006 Daniel Veillard <veillard at redhat.com> 0.1.8-2
-- fixing spec file, added %-dist, -devel requires pkgconfig and xen-devel
+- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel
 - Resolves: rhbz#202320
 
 * Mon Oct 16 2006 Daniel Veillard <veillard at redhat.com> 0.1.8-1
@@ -1157,7 +1009,7 @@ fi
 - add patch to address dom0_ops API breakage in Xen 3.0.3 tree
 
 * Mon Aug 28 2006 Jeremy Katz <katzj at redhat.com> - 0.1.4-4
-- add patch to support paravirt framebuffer in Xen 
+- add patch to support paravirt framebuffer in Xen
 
 * Mon Aug 21 2006 Daniel Veillard <veillard at redhat.com> 0.1.4-3
 - another patch to fix network handling in non-HVM guests
@@ -1230,7 +1082,7 @@ fi
 - fixes some problems in 0.0.3 due to the change of names
 
 * Wed Feb  8 2006 Daniel Veillard <veillard at redhat.com> 0.0.3-1
-- changed library name to libvirt from libvir, complete and test the python 
+- changed library name to libvirt from libvir, complete and test the python
   bindings
 
 * Sun Jan 29 2006 Daniel Veillard <veillard at redhat.com> 0.0.2-1



From mgieseki at fedoraproject.org  Thu Sep 17 12:42:39 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Thu, 17 Sep 2009 12:42:39 +0000 (UTC)
Subject: rpms/dvisvgm/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090917124239.8DB9211C00CE@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18448

Modified Files:
	.cvsignore sources 
Log Message:
updated to latest tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Aug 2009 12:49:25 -0000	1.3
+++ .cvsignore	17 Sep 2009 12:42:38 -0000	1.4
@@ -1 +1 @@
-dvisvgm-0.8.3.tar.gz
+dvisvgm-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Aug 2009 12:49:25 -0000	1.3
+++ sources	17 Sep 2009 12:42:38 -0000	1.4
@@ -1 +1 @@
-76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz
+3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 12:43:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:43:30 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090917124327.8A30D10F886@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-binutils (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Thu Sep 17 12:43:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 12:43:32 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090917124329.B10A110F898@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-binutils (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From mschwendt at fedoraproject.org  Thu Sep 17 12:44:55 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 17 Sep 2009 12:44:55 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.45,1.46
Message-ID: <20090917124455.BED8811C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19325

Modified Files:
	taglib.spec 
Log Message:
* Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
- Include the new NEWS file as %doc.



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- taglib.spec	14 Sep 2009 13:13:25 -0000	1.45
+++ taglib.spec	17 Sep 2009 12:44:55 -0000	1.46
@@ -12,7 +12,7 @@
 
 Name:       taglib	
 Version:    1.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -140,7 +140,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING.LGPL
+%doc AUTHORS COPYING.LGPL NEWS
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -159,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
+- Include the new NEWS file as %%doc.
+
 * Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
 - Add patch to fix MP4 test on ppc/ppc64.
 - Update to 1.6 final.



From mgieseki at fedoraproject.org  Thu Sep 17 12:46:34 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Thu, 17 Sep 2009 12:46:34 +0000 (UTC)
Subject: rpms/dvisvgm/devel dvisvgm.spec,1.2,1.3
Message-ID: <20090917124634.47D4711C00CE@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19923

Modified Files:
	dvisvgm.spec 
Log Message:
updated spec file


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/dvisvgm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dvisvgm.spec	28 Aug 2009 12:49:25 -0000	1.2
+++ dvisvgm.spec	17 Sep 2009 12:46:32 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
+- updated to latest upstream release
+
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
 - updated to latest upstream release
 - conditional Requires and BuildRequires to satisfy F-xx and EL5



From kalev at fedoraproject.org  Thu Sep 17 12:55:53 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 17 Sep 2009 12:55:53 +0000 (UTC)
Subject: rpms/mingw32-binutils/devel .cvsignore, 1.5,
	1.6 mingw32-binutils.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090917125553.A4DBA11C00CE@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23204

Modified Files:
	.cvsignore mingw32-binutils.spec sources 
Log Message:
Update to 2.19.51.0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 13:50:31 -0000	1.5
+++ .cvsignore	17 Sep 2009 12:55:53 -0000	1.6
@@ -1 +1 @@
-binutils-2.19.1.tar.bz2
+binutils-2.19.51.0.14.tar.bz2


Index: mingw32-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/devel/mingw32-binutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-binutils.spec	25 Jul 2009 12:14:24 -0000	1.9
+++ mingw32-binutils.spec	17 Sep 2009 12:55:53 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           mingw32-binutils
-Version:        2.19.1
-Release:        5%{?dist}
+Version:        2.19.51.0.14
+Release:        1%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
-URL:            http://www.gnu.org/software/binutils/
-Source0:        http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
+URL:            http://sources.redhat.com/binutils
+Source0:        ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Kalev Lember <kalev at smartlink.ee> - 2.19.51.0.14-1
+- Update to 2.19.51.0.14
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.19.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2009 13:50:32 -0000	1.5
+++ sources	17 Sep 2009 12:55:53 -0000	1.6
@@ -1 +1 @@
-09a8c5821a2dfdbb20665bc0bd680791  binutils-2.19.1.tar.bz2
+e0b485a3ff9392da1351dc3fb61a3d10  binutils-2.19.51.0.14.tar.bz2



From dwalsh at fedoraproject.org  Thu Sep 17 13:03:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Sep 2009 13:03:00 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.104,
	1.105 libsemanage-rhat.patch, 
	1.56, 1.57 libsemanage.spec, 1.184, 1.185 sources, 1.107, 1.108
Message-ID: <20090917130300.3C86111C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25443

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-1
- Update to upstream
	* Change semodule upgrade behavior to install even if the module
	  is not present from Dan Walsh.
	* Make genhomedircon trim excess '/' from homedirs from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	9 Sep 2009 17:57:12 -0000	1.104
+++ .cvsignore	17 Sep 2009 13:02:58 -0000	1.105
@@ -110,3 +110,4 @@ libsemanage-2.0.33.tgz
 libsemanage-2.0.35.tgz
 libsemanage-2.0.36.tgz
 libsemanage-2.0.37.tgz
+libsemanage-2.0.38.tgz

libsemanage-rhat.patch:
 include/semanage/modules.h |    5 +
 src/conf-parse.y           |    2 
 src/direct_api.c           |  119 +++++++++++++++++++++++++++++++++++++++++++--
 src/libsemanage.map        |    3 +
 src/module_internal.h      |    1 
 src/modules.c              |   41 +++++++++++++++
 src/modules.h              |    1 
 src/policy.h               |    6 ++
 src/semanage.conf          |    2 
 src/semanage_store.c       |   60 ++++++++++++++++++----
 src/semanage_store.h       |    2 
 11 files changed, 225 insertions(+), 17 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- libsemanage-rhat.patch	9 Sep 2009 17:57:12 -0000	1.56
+++ libsemanage-rhat.patch	17 Sep 2009 13:02:59 -0000	1.57
@@ -35,8 +35,8 @@ diff --exclude-from=exclude -N -u -r nsa
  	}
  	conf->load_policy->args = NULL;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.37/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2009-09-08 09:03:10.000000000 -0400
-+++ libsemanage-2.0.37/src/direct_api.c	2009-09-09 13:55:07.000000000 -0400
+--- nsalibsemanage/src/direct_api.c	2009-09-17 08:59:43.000000000 -0400
++++ libsemanage-2.0.37/src/direct_api.c	2009-09-10 17:15:32.000000000 -0400
 @@ -66,6 +66,8 @@
  static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
  					size_t data_len);
@@ -74,7 +74,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	return 0;
  }
  
-@@ -1277,6 +1288,107 @@
+@@ -1273,6 +1284,107 @@
  	return retval;
  }
  
@@ -182,7 +182,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /* Removes a module from the sandbox.  Returns 0 on success, -1 if out
   * of memory, -2 if module not found or could not be removed. */
  static int semanage_direct_remove(semanage_handle_t * sh, char *module_name)
-@@ -1297,8 +1409,7 @@
+@@ -1293,8 +1405,7 @@
  			goto cleanup;
  		}
  		base++;
@@ -192,7 +192,7 @@ diff --exclude-from=exclude -N -u -r nsa
  			if (unlink(module_filenames[i]) == -1) {
  				ERR(sh, "Could not remove module file %s.",
  				    module_filenames[i]);
-@@ -1373,6 +1484,7 @@
+@@ -1369,6 +1480,7 @@
  		}
  		ssize_t size;
  		char *data = NULL;
@@ -200,7 +200,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  		if ((size = bunzip(sh, fp, &data)) > 0) {
  			fclose(fp);
-@@ -1397,6 +1509,7 @@
+@@ -1393,6 +1505,7 @@
  		if (type == SEPOL_POLICY_MOD) {
  			(*modinfo)[*num_modules].name = name;
  			(*modinfo)[*num_modules].version = version;
@@ -208,42 +208,6 @@ diff --exclude-from=exclude -N -u -r nsa
  			(*num_modules)++;
  		} else {
  			/* file was not a module, so don't report it */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.37/src/genhomedircon.c
---- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.37/src/genhomedircon.c	2009-09-09 13:55:07.000000000 -0400
-@@ -304,10 +304,20 @@
- 			continue;
- 		if (!semanage_list_find(shells, pwbuf->pw_shell))
- 			continue;
-+		int len = strlen(pwbuf->pw_dir) -1;
-+		for(; len > 0 && pwbuf->pw_dir[len]=='/'; len--) {
-+			pwbuf->pw_dir[len]=0;
-+		}
- 		if (strcmp(pwbuf->pw_dir, "/") == 0)
- 			continue;
- 		if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
- 			continue;
-+
-+		if (strcmp(pwbuf->pw_dir, "/root") == 0) {
-+			/* don't relabel /root*/
-+			continue;
-+		}
-+
- 		if (!(path = strdup(pwbuf->pw_dir))) {
- 			break;
- 		}
-@@ -794,6 +804,11 @@
- 			 * /root */
- 			continue;
- 		}
-+		if (strcmp(pwent->pw_dir, "/root") == 0) {
-+			/* don't relabel /root*/
-+			continue;
-+		}
-+
- 		if (push_user_entry(&head, name, seuname,
- 				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
- 			*errors = STATUS_ERR;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.37/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2009-07-07 15:32:32.000000000 -0400
 +++ libsemanage-2.0.37/src/libsemanage.map	2009-09-09 13:55:07.000000000 -0400
@@ -273,9 +237,9 @@ diff --exclude-from=exclude -N -u -r nsa
      hidden_proto(semanage_module_list_nth)
  #endif
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.37/src/modules.c
---- nsalibsemanage/src/modules.c	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.37/src/modules.c	2009-09-09 13:55:07.000000000 -0400
-@@ -147,6 +147,40 @@
+--- nsalibsemanage/src/modules.c	2009-09-17 08:59:43.000000000 -0400
++++ libsemanage-2.0.37/src/modules.c	2009-09-10 17:15:42.000000000 -0400
+@@ -154,6 +153,40 @@
  	return sh->funcs->install_base_file(sh, module_name);
  }
  
@@ -316,7 +280,7 @@ diff --exclude-from=exclude -N -u -r nsa
  int semanage_module_remove(semanage_handle_t * sh, char *module_name)
  {
  	if (sh->funcs->remove == NULL) {
-@@ -202,6 +236,13 @@
+@@ -209,6 +242,13 @@
  
  hidden_def(semanage_module_get_name)
  


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- libsemanage.spec	9 Sep 2009 17:57:13 -0000	1.184
+++ libsemanage.spec	17 Sep 2009 13:02:59 -0000	1.185
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.37
+Version: 2.0.38
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -91,6 +91,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-1
+- Update to upstream
+	* Change semodule upgrade behavior to install even if the module
+	  is not present from Dan Walsh.
+	* Make genhomedircon trim excess '/' from homedirs from Dan Walsh.
+
 * Wed Sep 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.37-1
 - Update to upstream
   	* Fix persistent dontaudit support to rebuild policy if the 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- sources	9 Sep 2009 17:57:13 -0000	1.107
+++ sources	17 Sep 2009 13:02:59 -0000	1.108
@@ -1 +1 @@
-bacf84c36e8e57a424da23eb585373ee  libsemanage-2.0.37.tgz
+e4cde213b36fe94b30704600026c39f2  libsemanage-2.0.38.tgz



From mgieseki at fedoraproject.org  Thu Sep 17 13:04:43 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Thu, 17 Sep 2009 13:04:43 +0000 (UTC)
Subject: rpms/dvisvgm/F-11 .cvsignore, 1.1, 1.2 dvisvgm.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090917130443.31FC211C00CE@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26064

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
updated to latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:13:18 -0000	1.1
+++ .cvsignore	17 Sep 2009 13:04:42 -0000	1.2
@@ -0,0 +1 @@
+dvisvgm-0.8.4.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/dvisvgm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dvisvgm.spec	28 Aug 2009 13:02:29 -0000	1.2
+++ dvisvgm.spec	17 Sep 2009 13:04:42 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
+- updated to latest upstream release
+
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
 - updated to latest upstream release
 - conditional Requires and BuildRequires to satisfy F-xx and EL5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Aug 2009 13:02:29 -0000	1.3
+++ sources	17 Sep 2009 13:04:42 -0000	1.4
@@ -1 +1 @@
-76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz
+3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz



From dwalsh at fedoraproject.org  Thu Sep 17 13:07:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Sep 2009 13:07:47 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.202,
	1.203 policycoreutils-rhat.patch, 1.442,
	1.443 policycoreutils.spec, 1.642, 1.643 sources, 1.211, 1.212
Message-ID: <20090917130747.BA2D011C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26946

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-1
- Update to upstream
	* Change semodule upgrade behavior to install even if the module
	  is not present from Dan Walsh.
	* Make setfiles label if selinux is disabled and a seclabel aware
	  kernel is running from Caleb Case.
	* Clarify forkpty() error message in run_init from Manoj Srivastava.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- .cvsignore	8 Sep 2009 14:15:50 -0000	1.202
+++ .cvsignore	17 Sep 2009 13:07:45 -0000	1.203
@@ -207,3 +207,4 @@ policycoreutils_man_ru2.tar.bz2
 policycoreutils-2.0.71.tgz
 sepolgen-1.0.17.tgz
 policycoreutils-2.0.73.tgz
+policycoreutils-2.0.74.tgz

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  202 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    8 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1838 insertions(+), 953 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -r1.442 -r1.443
--- policycoreutils-rhat.patch	16 Sep 2009 19:48:49 -0000	1.442
+++ policycoreutils-rhat.patch	17 Sep 2009 13:07:45 -0000	1.443
@@ -1835,9 +1835,15 @@ diff --exclude-from=exclude --exclude=se
  			if fcon_dict[k]:
  				if is_mls_enabled:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.73/semodule/semodule.8
---- nsapolicycoreutils/semodule/semodule.8	2008-08-28 09:34:24.000000000 -0400
+--- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
 +++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-09 17:05:42.000000000 -0400
-@@ -35,6 +35,12 @@
+@@ -30,11 +30,17 @@
+ install/replace a module package
+ .TP
+ .B  \-u,\-\-upgrade=MODULE_PKG
+-upgrade an existing module package, or install if the module does not exist
++upgrade an existing module package
+ .TP
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
  .TP
@@ -1851,7 +1857,7 @@ diff --exclude-from=exclude --exclude=se
  remove existing module
  .TP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.73/semodule/semodule.c
---- nsapolicycoreutils/semodule/semodule.c	2009-07-07 15:32:32.000000000 -0400
+--- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
 +++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-09 17:05:42.000000000 -0400
 @@ -22,12 +22,12 @@
  
@@ -1868,9 +1874,12 @@ diff --exclude-from=exclude --exclude=se
  	0, 0
  };
  
-@@ -106,7 +106,9 @@
+@@ -104,9 +104,11 @@
+ 	printf("  -R, --reload		    reload policy\n");
+ 	printf("  -B, --build		    build and reload policy\n");
  	printf("  -i,--install=MODULE_PKG   install a new module\n");
- 	printf("  -u,--upgrade=MODULE_PKG   upgrade existing module\n");
+-	printf("  -u,--upgrade=MODULE_PKG   upgrades or install module to a newer version\n");
++	printf("  -u,--upgrade=MODULE_PKG   upgrade existing module\n");
  	printf("  -b,--base=MODULE_PKG      install new base module\n");
 -	printf("  -r,--remove=MODULE_NAME   remove existing module\n");
 +	printf("  -e,--enable=MODULE_PKG    enable existing module\n");
@@ -2565,7 +2574,7 @@ diff --exclude-from=exclude --exclude=se
 +
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-09-14 15:36:23.000000000 -0400
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
 +++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-09 17:05:42.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
@@ -3018,7 +3027,7 @@ diff --exclude-from=exclude --exclude=se
 -
 -	if (context)
 -		freecon(context);
- 
+-
 -	/*
 -	 * Do not relabel the file if -n was used.
 -	 */
@@ -3057,7 +3066,7 @@ diff --exclude-from=exclude --exclude=se
 -			progname, ftsent->fts_path);
 -		return SKIP;
 -	}
--
+ 
 -	int rc = restore(ftsent);
 -	if (rc == ERR) {
 -		if (!abort_on_error)
@@ -3180,7 +3189,7 @@ diff --exclude-from=exclude --exclude=se
  			return -1;
  		}
  
-@@ -802,20 +298,30 @@
+@@ -804,20 +298,30 @@
  	char *buf = NULL;
  	size_t buf_len;
  	char *base;
@@ -3219,7 +3228,7 @@ diff --exclude-from=exclude --exclude=se
  	
  	if (!strcmp(base, SETFILES)) {
  		/* 
-@@ -830,28 +336,28 @@
+@@ -832,28 +336,28 @@
  		iamrestorecon = 0;
  		recurse = 1;
  		expand_realpath = 0;
@@ -3256,7 +3265,7 @@ diff --exclude-from=exclude --exclude=se
  		ctx_validate = 0;
  
  		/* restorecon only:  silent exit if no SELinux.
-@@ -913,37 +419,37 @@
+@@ -915,37 +419,37 @@
  			input_filename = optarg;
  			break;			
  		case 'd':
@@ -3303,7 +3312,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'R':
  		case 'r':
-@@ -956,7 +462,7 @@
+@@ -958,7 +462,7 @@
  					argv[0]);
  				exit(1);
  			}
@@ -3312,7 +3321,7 @@ diff --exclude-from=exclude --exclude=se
  				fprintf(stderr,
  					"%s: only one -r can be specified\n",
  					argv[0]);
-@@ -967,23 +473,23 @@
+@@ -969,23 +473,23 @@
  		case 's':
  			use_input_file = 1;
  			input_filename = "-";
@@ -3341,7 +3350,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'W':
  			warn_no_match = 1;
-@@ -1031,18 +537,13 @@
+@@ -1033,18 +537,13 @@
  	}
  
  	/* Load the file contexts configuration and check it. */
@@ -3363,7 +3372,7 @@ diff --exclude-from=exclude --exclude=se
  	if (use_input_file) {
  		FILE *f = stdin;
  		ssize_t len;
-@@ -1059,6 +560,9 @@
+@@ -1061,6 +560,9 @@
  		delim = (null_terminated != 0) ? '\0' : '\n';
  		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
  			buf[len - 1] = 0;
@@ -3373,7 +3382,7 @@ diff --exclude-from=exclude --exclude=se
  			errors |= process_one_realpath(buf);
  		}
  		if (strcmp(input_filename, "-") != 0)
-@@ -1068,22 +572,21 @@
+@@ -1070,22 +572,21 @@
  			errors |= process_one_realpath(argv[i]);
  		}
  	}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -p -r1.642 -r1.643
--- policycoreutils.spec	16 Sep 2009 19:48:51 -0000	1.642
+++ policycoreutils.spec	17 Sep 2009 13:07:47 -0000	1.643
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.17
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.73
-Release: 5%{?dist}
+Version: 2.0.74
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,14 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-1
+- Update to upstream
+	* Change semodule upgrade behavior to install even if the module
+	  is not present from Dan Walsh.
+	* Make setfiles label if selinux is disabled and a seclabel aware
+	  kernel is running from Caleb Case.
+	* Clarify forkpty() error message in run_init from Manoj Srivastava.
+
 * Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-5
 - Fix sandbox to handle relative paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- sources	8 Sep 2009 14:23:39 -0000	1.211
+++ sources	17 Sep 2009 13:07:47 -0000	1.212
@@ -1,3 +1,3 @@
 480cc64a050735fa1163a87dc89c4f49  sepolgen-1.0.17.tgz
-08fa7fe2f943b7776ee767824318f615  policycoreutils-2.0.73.tgz
+60aa41df668a557892296ff02c7411aa  policycoreutils-2.0.74.tgz
 59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2



From mgieseki at fedoraproject.org  Thu Sep 17 13:14:56 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Thu, 17 Sep 2009 13:14:56 +0000 (UTC)
Subject: rpms/dvisvgm/F-10 .cvsignore, 1.1, 1.2 dvisvgm.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090917131456.F20B811C00CE@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29855

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
updated to latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:13:18 -0000	1.1
+++ .cvsignore	17 Sep 2009 13:14:56 -0000	1.2
@@ -0,0 +1 @@
+dvisvgm-0.8.4.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/dvisvgm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dvisvgm.spec	28 Aug 2009 13:07:22 -0000	1.2
+++ dvisvgm.spec	17 Sep 2009 13:14:56 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
+- updated to latest upstream release
+
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
 - updated to latest upstream release
 - conditional Requires and BuildRequires to satisfy F-xx and EL5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Aug 2009 13:07:22 -0000	1.3
+++ sources	17 Sep 2009 13:14:56 -0000	1.4
@@ -1 +1 @@
-76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz
+3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz



From mgieseki at fedoraproject.org  Thu Sep 17 13:23:00 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Thu, 17 Sep 2009 13:23:00 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 .cvsignore, 1.1, 1.2 dvisvgm.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090917132300.3582911C00CE@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32136

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
updated to latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:13:18 -0000	1.1
+++ .cvsignore	17 Sep 2009 13:22:59 -0000	1.2
@@ -0,0 +1 @@
+dvisvgm-0.8.4.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/dvisvgm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dvisvgm.spec	28 Aug 2009 13:11:56 -0000	1.4
+++ dvisvgm.spec	17 Sep 2009 13:22:59 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
+- updated to latest upstream release
+
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
 - updated to latest upstream release
 - conditional Requires and BuildRequires to satisfy F-xx and EL5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Aug 2009 13:11:56 -0000	1.3
+++ sources	17 Sep 2009 13:22:59 -0000	1.4
@@ -1 +1 @@
-76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz
+3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz



From hadess at fedoraproject.org  Thu Sep 17 13:24:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 13:24:35 +0000 (UTC)
Subject: rpms/gssdp/devel .cvsignore, 1.5, 1.6 gssdp.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <20090917132435.E13B911C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gssdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32745

Modified Files:
	.cvsignore gssdp.spec sources 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-1
- Update to 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Feb 2009 15:46:11 -0000	1.5
+++ .cvsignore	17 Sep 2009 13:24:35 -0000	1.6
@@ -1 +1 @@
-gssdp-0.6.4.tar.gz
+gssdp-0.7.0.tar.gz


Index: gssdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gssdp.spec	7 Aug 2009 12:24:11 -0000	1.12
+++ gssdp.spec	17 Sep 2009 13:24:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gssdp
-Version:        0.6.4
-Release:        4%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Resource discovery and announcement over SSDP
 
 Group:          System Environment/Libraries
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-1
+- Update to 0.7.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Feb 2009 15:46:11 -0000	1.5
+++ sources	17 Sep 2009 13:24:35 -0000	1.6
@@ -1 +1 @@
-f212bbe3c539e95fab91d0dc825bd108  gssdp-0.6.4.tar.gz
+dd21e0898adfe9277fd5cb2ec9a8fbd7  gssdp-0.7.0.tar.gz



From hadess at fedoraproject.org  Thu Sep 17 13:26:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 13:26:03 +0000 (UTC)
Subject: rpms/gupnp/devel .cvsignore, 1.9, 1.10 gupnp.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <20090917132603.E9DCC11C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv848

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.13.0-1
- Update to 0.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 08:24:25 -0000	1.9
+++ .cvsignore	17 Sep 2009 13:26:03 -0000	1.10
@@ -1 +1 @@
-gupnp-0.12.8.tar.gz
+gupnp-0.13.0.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gupnp.spec	31 Aug 2009 17:22:43 -0000	1.24
+++ gupnp.spec	17 Sep 2009 13:26:03 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           gupnp
-Version:        0.12.8
-Release:        4%{?dist}
+Version:        0.13.0
+Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.13.0-1
+- Update to 0.13.0
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.8-4
 - some spec file cleanups, depend on libuuid instead of e2fsprogs-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 08:24:25 -0000	1.9
+++ sources	17 Sep 2009 13:26:03 -0000	1.10
@@ -1 +1 @@
-ad20138c6da78cd03a056d30e40e36b9  gupnp-0.12.8.tar.gz
+d335e042e859376483615ee5bbb602e2  gupnp-0.13.0.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 13:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:26:12 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested watchcommits
Message-ID: <20090917132610.4697510F867@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on cpuspeed (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From hadess at fedoraproject.org  Thu Sep 17 13:27:55 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 13:27:55 +0000 (UTC)
Subject: rpms/gupnp-tools/devel .cvsignore, 1.4, 1.5 gupnp-tools.spec, 1.15, 
	1.16 sources, 1.6, 1.7
Message-ID: <20090917132755.46E4C11C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1507

Modified Files:
	.cvsignore gupnp-tools.spec sources 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.8-1
- Update to 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 May 2009 21:47:03 -0000	1.4
+++ .cvsignore	17 Sep 2009 13:27:54 -0000	1.5
@@ -1 +1 @@
-gupnp-tools-0.7.1.tar.gz
+gupnp-tools-0.8.tar.gz


Index: gupnp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-tools/devel/gupnp-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gupnp-tools.spec	7 Aug 2009 12:34:29 -0000	1.15
+++ gupnp-tools.spec	17 Sep 2009 13:27:55 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gupnp-tools
-Version:        0.7.1
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        A collection of dev tools utilising GUPnP and GTK+
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_datadir}/gupnp-tools/*.ui
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.8-1
+- Update to 0.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 May 2009 21:47:03 -0000	1.6
+++ sources	17 Sep 2009 13:27:55 -0000	1.7
@@ -1 +1 @@
-55dd1917fc23a01daf3a0a82c5d08460  gupnp-tools-0.7.1.tar.gz
+e2122d273d8ae6bf1cbca94fc4659e90  gupnp-tools-0.8.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 13:28:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:28:21 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested watchbugzilla
Message-ID: <20090917132820.9FC6210F881@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on cpuspeed (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:28:47 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested commit
Message-ID: <20090917132844.D443D10F886@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on cpuspeed (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:28:47 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested approveacls
Message-ID: <20090917132846.118A410F895@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on cpuspeed (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:28:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:28:55 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested watchcommits
Message-ID: <20090917132855.8B6B410F867@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on cpuspeed (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:28:59 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested commit
Message-ID: <20090917132857.2F76410F89C@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on cpuspeed (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:29:03 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested watchbugzilla
Message-ID: <20090917132901.C467410F8A0@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on cpuspeed (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:29:06 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested approveacls
Message-ID: <20090917132903.CE51410F884@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on cpuspeed (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:29:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:29:12 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested watchcommits
Message-ID: <20090917132913.65A4010F88C@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on cpuspeed (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:29:16 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested commit
Message-ID: <20090917132915.69FBD10F896@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on cpuspeed (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:29:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:29:21 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested watchbugzilla
Message-ID: <20090917132920.D45B610F8A6@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on cpuspeed (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:29:19 +0000
Subject: [pkgdb] cpuspeed: aarapov has requested approveacls
Message-ID: <20090917132917.05E1910F898@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on cpuspeed (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From hadess at fedoraproject.org  Thu Sep 17 13:29:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 13:29:37 +0000 (UTC)
Subject: rpms/gupnp-av/devel .cvsignore, 1.6, 1.7 gupnp-av.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090917132937.136CD11C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2189

Modified Files:
	.cvsignore gupnp-av.spec sources 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.5.1-1
- Update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jun 2009 06:56:01 -0000	1.6
+++ .cvsignore	17 Sep 2009 13:29:36 -0000	1.7
@@ -1 +1 @@
-gupnp-av-0.4.1.tar.gz
+gupnp-av-0.5.1.tar.gz


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/gupnp-av.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gupnp-av.spec	7 Aug 2009 12:32:53 -0000	1.13
+++ gupnp-av.spec	17 Sep 2009 13:29:36 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gupnp-av
-Version:        0.4.1
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.5.1-1
+- Update to 0.5.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jun 2009 06:56:02 -0000	1.6
+++ sources	17 Sep 2009 13:29:36 -0000	1.7
@@ -1 +1 @@
-010865d06fc96a5b3edc05cf5ae07ad2  gupnp-av-0.4.1.tar.gz
+315b184e4aae9a7a687f3e9689d649b3  gupnp-av-0.5.1.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:06 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested watchbugzilla
Message-ID: <20090917133003.AAB7A10F888@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on cpufrequtils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:09 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested watchcommits
Message-ID: <20090917133006.BEE0B10F8A3@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on cpufrequtils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:09 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested commit
Message-ID: <20090917133008.8FE4810F8AC@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on cpufrequtils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:13 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested approveacls
Message-ID: <20090917133011.0A2D910F8AF@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on cpufrequtils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:29 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested watchbugzilla
Message-ID: <20090917133027.678BD10F89F@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on cpufrequtils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:28 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested watchcommits
Message-ID: <20090917133029.8BCDF10F8B4@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on cpufrequtils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:35 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested commit
Message-ID: <20090917133033.4705D10F89C@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on cpufrequtils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:33 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested approveacls
Message-ID: <20090917133033.B786610F8B6@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on cpufrequtils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:42 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested watchbugzilla
Message-ID: <20090917133039.C792610F8BA@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on cpufrequtils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:44 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested commit
Message-ID: <20090917133043.33A8810F8BE@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on cpufrequtils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:43 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested watchcommits
Message-ID: <20090917133043.BAF5910F8C4@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on cpufrequtils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:30:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:30:46 +0000
Subject: [pkgdb] cpufrequtils: aarapov has requested approveacls
Message-ID: <20090917133045.5901210F894@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on cpufrequtils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From veillard at fedoraproject.org  Thu Sep 17 13:30:51 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 17 Sep 2009 13:30:51 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.177,1.178
Message-ID: <20090917133051.32ABB11C0261@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2568

Modified Files:
	libvirt.spec 
Log Message:
Disable numactl on s390[x], Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- libvirt.spec	17 Sep 2009 12:32:32 -0000	1.177
+++ libvirt.spec	17 Sep 2009 13:30:50 -0000	1.178
@@ -69,6 +69,10 @@
 %define with_xen 0
 %endif
 
+# Numactl is not available on s390[x]
+%ifarch s390 s390x
+%define with_numactl 0
+%endif
 
 # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX
 %if 0%{?rhel}
@@ -147,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -759,6 +763,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-3
+- disable numactl on s390[x]
+
 * Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-2
 - revamp of spec file for modularity and RHELs
 



From hadess at fedoraproject.org  Thu Sep 17 13:31:05 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 13:31:05 +0000 (UTC)
Subject: rpms/gupnp-vala/devel .cvsignore, 1.3, 1.4 gupnp-vala.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090917133105.57E3911C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2801

Modified Files:
	.cvsignore gupnp-vala.spec sources 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.6-1
- Update to 0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jun 2009 11:49:07 -0000	1.3
+++ .cvsignore	17 Sep 2009 13:31:05 -0000	1.4
@@ -1 +1 @@
-gupnp-vala-0.5.4.tar.gz
+gupnp-vala-0.6.tar.gz


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/gupnp-vala.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gupnp-vala.spec	7 Aug 2009 12:44:04 -0000	1.7
+++ gupnp-vala.spec	17 Sep 2009 13:31:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gupnp-vala
-Version:        0.5.4
-Release:        3%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        GUPnP is a uPnP framework. This adds vala language bindings
 
 Group:          Development/Languages
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/gupnp-vala-1.0.pc
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.6-1
+- Update to 0.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jun 2009 11:49:07 -0000	1.3
+++ sources	17 Sep 2009 13:31:05 -0000	1.4
@@ -1 +1 @@
-6eea2aeaa1175055536ef47f5b3793aa  gupnp-vala-0.5.4.tar.gz
+e6aa6e9722b8dd2e79a6ea07b6d24c4e  gupnp-vala-0.6.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 13:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:31:51 +0000
Subject: [pkgdb] dmidecode: aarapov has requested watchbugzilla
Message-ID: <20090917133152.7F01E10F89D@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on dmidecode (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:31:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:31:56 +0000
Subject: [pkgdb] dmidecode: aarapov has requested commit
Message-ID: <20090917133153.8912810F8A8@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on dmidecode (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:31:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:31:56 +0000
Subject: [pkgdb] dmidecode: aarapov has requested approveacls
Message-ID: <20090917133155.592E810F8AC@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on dmidecode (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:31:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:31:56 +0000
Subject: [pkgdb] dmidecode: aarapov has requested watchcommits
Message-ID: <20090917133156.E089D10F8B0@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on dmidecode (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:04 +0000
Subject: [pkgdb] dmidecode: aarapov has requested watchbugzilla
Message-ID: <20090917133203.0E98B10F8A0@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on dmidecode (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:04 +0000
Subject: [pkgdb] dmidecode: aarapov has requested watchcommits
Message-ID: <20090917133203.8D66310F8B3@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on dmidecode (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:06 +0000
Subject: [pkgdb] dmidecode: aarapov has requested commit
Message-ID: <20090917133205.133C710F8B7@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on dmidecode (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:05 +0000
Subject: [pkgdb] dmidecode: aarapov has requested approveacls
Message-ID: <20090917133205.E333F10F8C3@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on dmidecode (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:12 +0000
Subject: [pkgdb] dmidecode: aarapov has requested watchcommits
Message-ID: <20090917133210.7073110F8B9@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on dmidecode (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:16 +0000
Subject: [pkgdb] dmidecode: aarapov has requested commit
Message-ID: <20090917133213.EE16510F8CD@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on dmidecode (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:15 +0000
Subject: [pkgdb] dmidecode: aarapov has requested approveacls
Message-ID: <20090917133213.3233610F8C9@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on dmidecode (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:18 +0000
Subject: [pkgdb] dmidecode: aarapov has requested watchbugzilla
Message-ID: <20090917133216.2E79F10F8D1@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on dmidecode (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:33 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested watchbugzilla
Message-ID: <20090917133230.D5FD510F8D3@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on sysfsutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:30 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested watchcommits
Message-ID: <20090917133231.30ACD10F8D7@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on sysfsutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:33 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested commit
Message-ID: <20090917133232.7F6EE10F8D9@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on sysfsutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:37 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested approveacls
Message-ID: <20090917133234.CDF2E10F894@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on sysfsutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:45 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested watchbugzilla
Message-ID: <20090917133243.0267210F898@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on sysfsutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:45 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested watchcommits
Message-ID: <20090917133244.3765B10F8A3@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on sysfsutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:44 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested commit
Message-ID: <20090917133245.5A9AE10F8E1@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on sysfsutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:48 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested approveacls
Message-ID: <20090917133247.5802D10F8F0@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on sysfsutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:49 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested watchbugzilla
Message-ID: <20090917133250.BC17810F8FA@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on sysfsutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:54 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested watchcommits
Message-ID: <20090917133253.3DC5C10F89A@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on sysfsutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:56 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested commit
Message-ID: <20090917133255.3871D10F8FE@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on sysfsutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:32:57 +0000
Subject: [pkgdb] sysfsutils: aarapov has requested approveacls
Message-ID: <20090917133256.855C910F900@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on sysfsutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:42 +0000
Subject: [pkgdb] salinfo: aarapov has requested watchcommits
Message-ID: <20090917133339.CF99610F8A0@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on salinfo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:43 +0000
Subject: [pkgdb] salinfo: aarapov has requested watchbugzilla
Message-ID: <20090917133340.ED64910F8AC@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on salinfo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:42 +0000
Subject: [pkgdb] salinfo: aarapov has requested approveacls
Message-ID: <20090917133341.2C84810F8B0@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on salinfo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:40 +0000
Subject: [pkgdb] salinfo: aarapov has requested commit
Message-ID: <20090917133341.8353610F904@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on salinfo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:45 +0000
Subject: [pkgdb] salinfo: aarapov has requested watchcommits
Message-ID: <20090917133344.B725E10F907@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on salinfo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:47 +0000
Subject: [pkgdb] salinfo: aarapov has requested commit
Message-ID: <20090917133346.C4D8410F8B7@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on salinfo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:47 +0000
Subject: [pkgdb] salinfo: aarapov has requested approveacls
Message-ID: <20090917133348.1E58010F909@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on salinfo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:33:52 +0000
Subject: [pkgdb] salinfo: aarapov has requested watchbugzilla
Message-ID: <20090917133350.1EC3410F90D@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on salinfo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/salinfo



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:19 +0000
Subject: [pkgdb] memtest86+: aarapov has requested watchbugzilla
Message-ID: <20090917133417.A1AFE10F8C2@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on memtest86+ (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:17 +0000
Subject: [pkgdb] memtest86+: aarapov has requested watchcommits
Message-ID: <20090917133418.5C16110F90E@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on memtest86+ (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:20 +0000
Subject: [pkgdb] memtest86+: aarapov has requested commit
Message-ID: <20090917133419.9A74F10F8CC@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on memtest86+ (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:23 +0000
Subject: [pkgdb] memtest86+: aarapov has requested approveacls
Message-ID: <20090917133421.AB21F10F8CA@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on memtest86+ (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:30 +0000
Subject: [pkgdb] memtest86+: aarapov has requested watchbugzilla
Message-ID: <20090917133427.F2CF610F917@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on memtest86+ (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:30 +0000
Subject: [pkgdb] memtest86+: aarapov has requested watchcommits
Message-ID: <20090917133429.9391010F91A@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on memtest86+ (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:33 +0000
Subject: [pkgdb] memtest86+: aarapov has requested commit
Message-ID: <20090917133430.A825910F91D@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on memtest86+ (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:35 +0000
Subject: [pkgdb] memtest86+: aarapov has requested approveacls
Message-ID: <20090917133432.8C69C10F8D1@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on memtest86+ (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:39 +0000
Subject: [pkgdb] memtest86+: aarapov has requested watchbugzilla
Message-ID: <20090917133436.E7AC510F920@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on memtest86+ (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:41 +0000
Subject: [pkgdb] memtest86+: aarapov has requested watchcommits
Message-ID: <20090917133439.2AB5410F923@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on memtest86+ (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:43 +0000
Subject: [pkgdb] memtest86+: aarapov has requested commit
Message-ID: <20090917133440.DD6C110F926@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on memtest86+ (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:34:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:34:45 +0000
Subject: [pkgdb] memtest86+: aarapov has requested approveacls
Message-ID: <20090917133443.1397310F92A@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on memtest86+ (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:35:52 +0000
Subject: [pkgdb] kernel: aarapov has requested watchcommits
Message-ID: <20090917133549.A5B0510F8C5@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 13:36:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:36:13 +0000
Subject: [pkgdb] kernel: aarapov has requested watchcommits
Message-ID: <20090917133612.9074810F8D8@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on kernel (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 13:36:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:36:40 +0000
Subject: [pkgdb] irqbalance: aarapov has requested watchcommits
Message-ID: <20090917133637.7C2F810F8A5@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on irqbalance (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/irqbalance



From pkgdb at fedoraproject.org  Thu Sep 17 13:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:36:59 +0000
Subject: [pkgdb] microcode_ctl: aarapov has requested watchcommits
Message-ID: <20090917133700.6C11110F8A6@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on microcode_ctl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:02 +0000
Subject: [pkgdb] microcode_ctl: aarapov has requested commit
Message-ID: <20090917133703.1657510F8AC@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on microcode_ctl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:11 +0000
Subject: [pkgdb] microcode_ctl: aarapov has requested watchcommits
Message-ID: <20090917133710.3C53D10F8B1@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on microcode_ctl (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:14 +0000
Subject: [pkgdb] microcode_ctl: aarapov has requested commit
Message-ID: <20090917133711.5ED7D10F8EB@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on microcode_ctl (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:12 +0000
Subject: [pkgdb] microcode_ctl: aarapov has requested watchcommits
Message-ID: <20090917133712.E572810F8F2@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on microcode_ctl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:14 +0000
Subject: [pkgdb] microcode_ctl: aarapov has requested commit
Message-ID: <20090917133713.68AED10F8FC@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on microcode_ctl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:35 +0000
Subject: [pkgdb] rng-utils: aarapov has requested watchcommits
Message-ID: <20090917133732.ABF7310F8B7@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on rng-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rng-utils



From pkgdb at fedoraproject.org  Thu Sep 17 13:37:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:37:54 +0000
Subject: [pkgdb] x86info: aarapov has requested watchcommits
Message-ID: <20090917133753.0A27610F8C6@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on x86info (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/x86info



From cwickert at fedoraproject.org  Thu Sep 17 13:46:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Sep 2009 13:46:02 +0000 (UTC)
Subject: rpms/rednotebook/F-11 .cvsignore, 1.15, 1.16 rednotebook.spec, 1.19,
	1.20 sources, 1.18,
	1.19 rednotebook-0.8.6-mainwindow.glade.patch, 1.1, NONE
Message-ID: <20090917134602.60B5B11C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9438/F-11

Modified Files:
	.cvsignore rednotebook.spec sources 
Removed Files:
	rednotebook-0.8.6-mainwindow.glade.patch 
Log Message:
* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6.1-1
- Update to 0.8.6.1, fixes #523880



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	4 Sep 2009 18:31:22 -0000	1.15
+++ .cvsignore	17 Sep 2009 13:46:02 -0000	1.16
@@ -1 +1 @@
-rednotebook-0.8.6.tar.gz
+rednotebook-0.8.6.1.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- rednotebook.spec	17 Sep 2009 10:27:58 -0000	1.19
+++ rednotebook.spec	17 Sep 2009 13:46:02 -0000	1.20
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.6
-Release:        2%{?dist}
+Version:        0.8.6.1
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
@@ -31,7 +31,7 @@ and does so in style.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
+#%patch0 -p1 -b .orig
 
 %build
 python setup.py build
@@ -72,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6.1-1
+- Update to 0.8.6.1, fixes #523880
+
 * Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-2
 - Fix libglade error with GTK 2.16.6 (#523880)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	4 Sep 2009 18:31:22 -0000	1.18
+++ sources	17 Sep 2009 13:46:02 -0000	1.19
@@ -1 +1 @@
-bd4d3962a558c6d7f8952e10b24c2689  rednotebook-0.8.6.tar.gz
+950163da960438d6dfe5459d2fed7b9c  rednotebook-0.8.6.1.tar.gz


--- rednotebook-0.8.6-mainwindow.glade.patch DELETED ---



From cwickert at fedoraproject.org  Thu Sep 17 13:46:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Sep 2009 13:46:02 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.20, 1.21 rednotebook.spec, 1.21,
	1.22 sources, 1.20,
	1.21 rednotebook-0.8.6-mainwindow.glade.patch, 1.1, NONE
Message-ID: <20090917134602.1BE5311C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9438/devel

Modified Files:
	.cvsignore rednotebook.spec sources 
Removed Files:
	rednotebook-0.8.6-mainwindow.glade.patch 
Log Message:
* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6.1-1
- Update to 0.8.6.1, fixes #523880



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Sep 2009 18:31:22 -0000	1.20
+++ .cvsignore	17 Sep 2009 13:46:01 -0000	1.21
@@ -1 +1 @@
-rednotebook-0.8.6.tar.gz
+rednotebook-0.8.6.1.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- rednotebook.spec	17 Sep 2009 10:27:57 -0000	1.21
+++ rednotebook.spec	17 Sep 2009 13:46:01 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.6
-Release:        2%{?dist}
+Version:        0.8.6.1
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
@@ -31,7 +31,7 @@ and does so in style.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
+#%patch0 -p1 -b .orig
 
 %build
 python setup.py build
@@ -72,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6.1-1
+- Update to 0.8.6.1, fixes #523880
+
 * Thu Sep 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-2
 - Fix libglade error with GTK 2.16.6 (#523880)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Sep 2009 18:31:22 -0000	1.20
+++ sources	17 Sep 2009 13:46:01 -0000	1.21
@@ -1 +1 @@
-bd4d3962a558c6d7f8952e10b24c2689  rednotebook-0.8.6.tar.gz
+950163da960438d6dfe5459d2fed7b9c  rednotebook-0.8.6.1.tar.gz


--- rednotebook-0.8.6-mainwindow.glade.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 17 13:49:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:49:30 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917134929.A782C10F867@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on cpufrequtils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:49:29 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917134930.6FB5D10F886@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on cpufrequtils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:49:35 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917134933.1864E10F898@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on cpufrequtils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:49:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:49:34 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917134931.5545810F894@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on cpufrequtils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:05 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135006.7F17310F884@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on cpufrequtils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:09 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135006.9780510F88C@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on cpufrequtils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:10 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135008.0A89F10F896@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on cpufrequtils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:10 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135009.B06B710F8A1@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on cpufrequtils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:10 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135011.3BBC410F8A4@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on cpufrequtils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:15 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135013.2EEEF10F8A8@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on cpufrequtils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:15 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135014.782A610F8AB@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on cpufrequtils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:18 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20090917135016.DEAA110F89E@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on cpufrequtils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpufrequtils



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:44 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135041.B403810F881@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on cpuspeed (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:43 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135042.96BF610F888@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on cpuspeed (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:44 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135043.6422A10F895@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on cpuspeed (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:44 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135045.49D2910F8B2@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on cpuspeed (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:52 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135051.1FDEF10F8A0@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on cpuspeed (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:51 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135052.4033D10F8B4@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on cpuspeed (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:56 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135055.1889B10F8B9@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on cpuspeed (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:50:56 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135056.C202C10F8BE@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on cpuspeed (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:05 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135105.AAB7F10F8A6@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on cpuspeed (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:09 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135107.460CD10F8C2@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on cpuspeed (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:12 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135111.0693D10F8A9@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on cpuspeed (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:13 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20090917135112.0646110F8AB@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on cpuspeed (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpuspeed



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:47 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20090917135144.EC13B10F884@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on memtest86+ (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:51 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20090917135148.DB49210F88C@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on memtest86+ (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:51:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:51:51 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20090917135150.5B3D410F896@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on memtest86+ (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From cwickert at fedoraproject.org  Thu Sep 17 13:53:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Sep 2009 13:53:20 +0000 (UTC)
Subject: rpms/rednotebook/devel rednotebook.spec,1.22,1.23
Message-ID: <20090917135320.237A611C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12939/devel

Modified Files:
	rednotebook.spec 
Log Message:
drop patch


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- rednotebook.spec	17 Sep 2009 13:46:01 -0000	1.22
+++ rednotebook.spec	17 Sep 2009 13:53:19 -0000	1.23
@@ -9,7 +9,6 @@ Group:          Applications/Productivit
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         rednotebook-0.8.6-mainwindow.glade.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -31,7 +30,7 @@ and does so in style.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .orig
+
 
 %build
 python setup.py build



From cwickert at fedoraproject.org  Thu Sep 17 13:53:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Sep 2009 13:53:20 +0000 (UTC)
Subject: rpms/rednotebook/F-11 rednotebook.spec,1.20,1.21
Message-ID: <20090917135320.4B2E511C00CE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12939/F-11

Modified Files:
	rednotebook.spec 
Log Message:
drop patch


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- rednotebook.spec	17 Sep 2009 13:46:02 -0000	1.20
+++ rednotebook.spec	17 Sep 2009 13:53:20 -0000	1.21
@@ -9,7 +9,6 @@ Group:          Applications/Productivit
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         rednotebook-0.8.6-mainwindow.glade.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -31,7 +30,7 @@ and does so in style.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .orig
+
 
 %build
 python setup.py build



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:17 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135317.D7BB710F8A9@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:20 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135319.7384C10F8AC@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on sysfsutils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:21 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135320.9B9BE10F8B5@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on sysfsutils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:25 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135322.B754710F8B9@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora 11) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:24 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135324.D17CD10F867@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora 10) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:30 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135328.6AFC010F886@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:30 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135329.3C3E610F8BE@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on sysfsutils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:30 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135330.EB52B10F8C0@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on sysfsutils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:42 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135340.482BE10F88C@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora 9) to Obsolete for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:45 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135345.A3D0310F8C3@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:48 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135347.1C73910F8AD@bastion2.fedora.phx.redhat.com>

jwilson has set the commit acl on sysfsutils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:49 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135348.4B2FE10F8C5@bastion2.fedora.phx.redhat.com>

jwilson has set the approveacls acl on sysfsutils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:51 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135352.5491D10F8C8@bastion2.fedora.phx.redhat.com>

jwilson has set the watchcommits acl on sysfsutils (Fedora devel) to Approved for agk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:53:58 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135356.46E4B10F8CC@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on sysfsutils (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:04 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135403.D378610F8A4@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on sysfsutils (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:07 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20090917135405.E197E10F8CE@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on sysfsutils (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:17 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20090917135414.DB68710F89C@bastion2.fedora.phx.redhat.com>

jwilson has set the watchbugzilla acl on memtest86+ (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:31 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135432.5C1CA10F8A6@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:47 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135446.1F13210F8AA@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:50 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135449.284F710F8B5@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:54:52 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135451.595FF10F8B7@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:55:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:55:00 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135459.32F1310F884@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:55:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:55:03 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135502.3833510F89F@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:55:47 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135544.9B2D210F8AD@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:55:47 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917135548.7D64E10F8BD@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 9 is now owned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:13 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135711.ABD8010F886@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:16 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135714.88FCA10F8A6@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:18 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135716.CF7D010F888@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 3 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:19 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135721.DD9CB10F8A8@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:21 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135721.E216410F8AA@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:23 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135722.8B1B410F8AC@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:27 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135724.9347710F8B5@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:29 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135727.0D36810F8AF@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:30 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135729.56F3810F8B0@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:33 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917135731.3277D10F8B7@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 13:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:57:55 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135756.101B610F8A2@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:00 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135758.1E85810F89C@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora EPEL 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:01 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135759.E796E10F89E@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:01 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135801.EEA8110F8A4@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:04 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135803.D48B310F8B1@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:05 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135805.76A2210F8B9@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:10 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135807.B553010F8BA@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:08 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135809.94DFE10F886@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:12 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135811.4908E10F8BC@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:13 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917135813.1EA5710F8BE@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:48 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135847.BD72F10F8A6@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora devel is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:50 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135850.B5B7A10F8B3@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 7 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:57 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135854.B769710F8B4@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:55 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135852.B068E10F8AF@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:58:56 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135857.0865410F8C1@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:02 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135859.BC09810F8C5@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 8 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:03 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135904.B702510F8B8@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 9 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:10 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135908.6805210F8C9@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 10 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:15 +0000
Subject: [pkgdb] kdissert ownership updated
Message-ID: <20090917135914.361C810F8CA@bastion2.fedora.phx.redhat.com>

Package kdissert in Fedora 11 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:49 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917135946.D192910F8A4@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora devel is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:50 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917135949.E28A110F8B2@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 7 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:56 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917135954.3B33510F8BD@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 1 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 13:59:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 13:59:58 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917135957.2D06B10F8CF@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 2 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:01 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140000.BF27910F88C@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 3 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:04 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140004.D70FC10F8D1@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 4 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:10 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140011.9899110F898@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 5 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:15 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140014.CAC7410F8AB@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 6 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:22 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140019.DB92210F8AA@bastion2.fedora.phx.redhat.com>

Package libxml++ in Red Hat Linux 9 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:28 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140026.738FB10F8AC@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 8 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:44 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140041.5948810F8B6@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 9 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:49 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140046.CE90810F8C3@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 10 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:00:54 +0000
Subject: [pkgdb] libxml++ ownership updated
Message-ID: <20090917140052.4059410F8DC@bastion2.fedora.phx.redhat.com>

Package libxml++ in Fedora 11 is now owned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml++



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:10 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140207.C335810F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdissert (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:11 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140208.DF33610F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdissert (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:17 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140217.78C7310F8BD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdissert (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:17 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140218.3415E10F8CA@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdissert (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:24 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140222.4F01C10F88C@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdissert (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:23 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140222.7D58D10F8D1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdissert (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:27 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140225.3335F10F8EB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdissert (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:02:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:02:28 +0000
Subject: [pkgdb] kdissert had acl change status
Message-ID: <20090917140225.DB83B10F8F0@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdissert (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdissert



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:21 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140321.7AAEC10F8B4@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:26 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140324.29AA010F8B6@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:26 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140325.CD96610F8C3@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:30 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140328.3534E10F8D7@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:33 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140330.C6A5C10F8D9@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:32 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140332.DE2DD10F8DB@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:39 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140336.56B1010F8FE@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:03:37 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090917140334.C177410F8FD@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:02 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140400.7B3E510F8B7@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:04 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140402.632CE10F8C5@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:03 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140404.5595410F881@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:11 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140408.8382710F89D@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:15 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140412.7A26D10F8C7@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:13 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140410.6990C10F8C6@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:15 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140414.8592810F8A2@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:16 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090917140416.7F02E10F8C8@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:47 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140444.D0E8310F8B2@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:04:46 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140446.9FB8310F8BA@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:02 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140500.E37B110F894@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:06 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140503.7FA8410F8CC@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:06 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140505.C148E10F8CE@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:12 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140509.9941910F8D0@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:24 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140522.4579910F8DF@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:20 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140519.A0C1510F8D3@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:23 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140524.44CEE10F8E1@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:05:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:05:25 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917140526.59A5A10F8EE@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:35 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140633.38F3E10F8AF@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:37 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140635.0482A10F8B4@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora EPEL 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:38 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140637.45BB710F8C0@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:39 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140639.5B52610F8C2@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:42 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140643.48BA010F8D6@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:44 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140641.6DC4710F8C4@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:44 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140644.8529910F8D8@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:49 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140646.B0B6C10F8D9@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:50 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140648.49D5D10F8DA@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:49 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140650.1742A10F8B7@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:06:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:06:51 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917140651.5C65B10F8DD@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:23 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140723.CF4B210F89E@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:27 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140724.B2D8210F8A2@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:28 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140725.D039610F8A4@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:26 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140725.E4B1610F8C7@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:27 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140726.DE3D110F8FA@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:27 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140727.DBFE410F8FC@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:30 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140729.2EDB210F8FE@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:31 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140730.5A9B710F903@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:34 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140731.67E2810F8A5@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:07:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:07:34 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917140733.1349F10F8B1@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:00 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140757.DC48610F894@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora devel is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:01 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140801.BDEF510F8BE@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora EPEL 4 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:04 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140804.A655D10F8CA@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora EPEL 5 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:11 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140810.61F9110F8CD@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 7 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:13 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140814.90FC510F8D0@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 4 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:21 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140822.0D94E10F906@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 5 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:26 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140825.27C3310F909@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 6 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:34 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140831.BC1FC10F8EE@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 9 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:27 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140827.E1F8010F8ED@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 8 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:35 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140834.A4A5910F90D@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 10 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:08:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:08:40 +0000
Subject: [pkgdb] python-setuptools ownership updated
Message-ID: <20090917140838.4AA2F10F89B@bastion2.fedora.phx.redhat.com>

Package python-setuptools in Fedora 11 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 14:11:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:11:57 +0000
Subject: [pkgdb] twitux ownership updated
Message-ID: <20090917141157.B53A610F8CD@bastion2.fedora.phx.redhat.com>

Package twitux in Fedora devel is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/twitux



From pkgdb at fedoraproject.org  Thu Sep 17 14:12:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:12:03 +0000
Subject: [pkgdb] twitux ownership updated
Message-ID: <20090917141201.17BDE10F8D0@bastion2.fedora.phx.redhat.com>

Package twitux in Fedora 8 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/twitux



From pkgdb at fedoraproject.org  Thu Sep 17 14:12:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:12:03 +0000
Subject: [pkgdb] twitux ownership updated
Message-ID: <20090917141204.2A8BC10F8D3@bastion2.fedora.phx.redhat.com>

Package twitux in Fedora 7 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/twitux



From pkgdb at fedoraproject.org  Thu Sep 17 14:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:12:05 +0000
Subject: [pkgdb] twitux ownership updated
Message-ID: <20090917141206.6C09A10F8D9@bastion2.fedora.phx.redhat.com>

Package twitux in Fedora 9 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/twitux



From pkgdb at fedoraproject.org  Thu Sep 17 14:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:12:12 +0000
Subject: [pkgdb] twitux ownership updated
Message-ID: <20090917141210.6826E10F8DB@bastion2.fedora.phx.redhat.com>

Package twitux in Fedora 10 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/twitux



From pkgdb at fedoraproject.org  Thu Sep 17 14:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:12:16 +0000
Subject: [pkgdb] twitux ownership updated
Message-ID: <20090917141214.0E95B10F8DE@bastion2.fedora.phx.redhat.com>

Package twitux in Fedora 11 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/twitux



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:25 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141324.B251A10F8A1@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora EPEL 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:22 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141322.A5C1B10F89C@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:29 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141326.AA75F10F8AF@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:27 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141328.636A210F8B3@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:31 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141330.22C5310F89D@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:31 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141331.F012210F89F@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:35 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141334.4551710F8B6@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:38 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141336.7238E10F8A4@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:37 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141338.5C22010F8B8@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:43 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141341.0253610F8C2@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 14:13:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:13:45 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917141342.F3B8810F8A2@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From hadess at fedoraproject.org  Thu Sep 17 14:15:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 14:15:26 +0000 (UTC)
Subject: rpms/gssdp/devel gssdp.spec,1.13,1.14
Message-ID: <20090917141526.827FA11C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gssdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22742

Modified Files:
	gssdp.spec 
Log Message:
fix filelist


Index: gssdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gssdp.spec	17 Sep 2009 13:24:35 -0000	1.13
+++ gssdp.spec	17 Sep 2009 14:15:26 -0000	1.14
@@ -75,9 +75,8 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING README NEWS
 %dir %{_datadir}/gssdp
 %{_bindir}/gssdp-device-sniffer
-%{_libdir}/libgssdp-1.0.so.1
-%{_libdir}/libgssdp-1.0.so.1.0.0
-%{_datadir}/gssdp/gssdp-device-sniffer.glade
+%{_libdir}/libgssdp-1.0.so.*
+%{_datadir}/gssdp/gssdp-device-sniffer.ui
 
 %files devel
 %defattr(-,root,root,-)



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:19 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141718.C8BE010F881@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora devel was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:22 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141720.4BE9310F886@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora EPEL 4 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:22 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141721.DB29210F88C@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora EPEL 5 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:26 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141723.5622310F89A@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora 7 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:28 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141726.056A410F89D@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora 6 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:30 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141727.D716510F89F@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora 8 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:32 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141729.F2A6D10F8A1@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:34 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141731.AE2FD10F8A4@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora 10 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From pkgdb at fedoraproject.org  Thu Sep 17 14:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:17:36 +0000
Subject: [pkgdb] python-pgsql ownership updated
Message-ID: <20090917141734.26F8710F8A2@bastion2.fedora.phx.redhat.com>

Package python-pgsql in Fedora 11 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-pgsql



From cebbert at fedoraproject.org  Thu Sep 17 14:24:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 17 Sep 2009 14:24:55 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1804,1.1805
Message-ID: <20090917142455.3E2A411C00CE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26915

Modified Files:
	kernel.spec 
Log Message:
Disable drm-nouveau too -- it won't build without other
  drm updates.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1804
retrieving revision 1.1805
diff -u -p -r1.1804 -r1.1805
--- kernel.spec	16 Sep 2009 08:17:10 -0000	1.1804
+++ kernel.spec	17 Sep 2009 14:24:54 -0000	1.1805
@@ -1316,7 +1316,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
 
-ApplyPatch drm-nouveau.patch
+#ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-i915-resume-force-mode.patch
@@ -2005,6 +2005,10 @@ fi
 # ##############################################################
 
 %changelog
+* Thu Sep 17 2009 Chuck Ebbert <cebbert at redhat.com>
+- Disable drm-nouveau too -- it won't build without other
+  drm updates.
+
 * Wed Sep 16 2009 Roland McGrath <roland at redhat.com>
 - Remove workaround for gcc bug #521991, now fixed.
 



From jakub at fedoraproject.org  Thu Sep 17 14:28:04 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 17 Sep 2009 14:28:04 +0000 (UTC)
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.39,1.40
Message-ID: <20090917142804.E976D11C00CE@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/compat-gcc-32/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28455

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-68


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- compat-gcc-32.spec	28 Jul 2009 13:04:44 -0000	1.39
+++ compat-gcc-32.spec	17 Sep 2009 14:28:03 -0000	1.40
@@ -1,7 +1,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 67
+%define gcc_release 68
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -279,6 +279,9 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mt
 %ifarch sparc sparcv9 sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
 %endif
+%ifarch s390 s390x
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=z9-109//g;s/-mtune=z10//g'`
+%endif
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wall//g' -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fexceptions//g' -e 's/-fasynchronous-unwind-tables//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector//g' -e 's/--param=ssp-buffer-size=[0-9]*//g'`
@@ -340,6 +343,11 @@ for d in `pwd`/%{gcc_target_platform}/li
   popd
 done
 
+# Make sure we are using system libgcc_s, as system libc might
+# use unwinding features that require it.
+mv gcc/libgcc_s.so.1{,.bak}
+ln -sf /%{_lib}/libgcc_s.so.1 gcc/libgcc_s.so.1
+
 # run the tests.
 make %{?_smp_mflags} -k check || :
 sed -ie s/libstdc++-v3/libstdc++33-v3/g `find $(find %{gcc_target_platform} -type d -a -name libstdc++33-v3) -name \*.sum`
@@ -437,6 +445,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/%{_lib}/libstdc++.so.5*
 
 %changelog
+* Thu Sep 17 2009 Jakub Jelinek  <jakub at redhat.com> 3.2.3-68
+- strip -march=z9-109 and -mtune=z10 from OPT_FLAGS on s390, s390x
+  (#523209)
+- make sure to use system libgcc_s.so.1 instead of gcc32 one during
+  testing
+
 * Tue Jul 28 2009 Jakub Jelinek  <jakub at redhat.com> 3.2.3-67
 - replace -mtune=generic in $RPM_OPT_FLAGS with something that
   GCC 3.2.3 groks



From mauelsha at fedoraproject.org  Thu Sep 17 14:30:16 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 14:30:16 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.99,1.100
Message-ID: <20090917143016.D477511C0374@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29382

Modified Files:
	dmraid.spec 
Log Message:
Buildrequires changed


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- dmraid.spec	17 Sep 2009 11:45:06 -0000	1.99
+++ dmraid.spec	17 Sep 2009 14:30:15 -0000	1.100
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# BuildRequires: device-mapper-devel
+BuildRequires: device-mapper-devel
 BuildRequires: device-mapper-event
 BuildRequires: libselinux-devel
 BuildRequires: libsepol-devel



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:27 +0000
Subject: [pkgdb] bcfg2: icon has given up watchcommits
Message-ID: <20090917143626.7CC7010F88C@bastion2.fedora.phx.redhat.com>

icon has given up the watchcommits acl on bcfg2 (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:21 +0000
Subject: [pkgdb] bcfg2: icon has given up watchbugzilla
Message-ID: <20090917143623.9992310F884@bastion2.fedora.phx.redhat.com>

icon has given up the watchbugzilla acl on bcfg2 (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:30 +0000
Subject: [pkgdb] bcfg2: icon has given up commit
Message-ID: <20090917143627.BBC0910F896@bastion2.fedora.phx.redhat.com>

icon has given up the commit acl on bcfg2 (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:31 +0000
Subject: [pkgdb] bcfg2: icon has given up approveacls
Message-ID: <20090917143629.0A09210F89B@bastion2.fedora.phx.redhat.com>

icon has given up the approveacls acl on bcfg2 (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:37 +0000
Subject: [pkgdb] bcfg2: icon has given up watchbugzilla
Message-ID: <20090917143636.BB12D10F881@bastion2.fedora.phx.redhat.com>

icon has given up the watchbugzilla acl on bcfg2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:40 +0000
Subject: [pkgdb] bcfg2: icon has given up watchcommits
Message-ID: <20090917143637.749A510F89E@bastion2.fedora.phx.redhat.com>

icon has given up the watchcommits acl on bcfg2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:36 +0000
Subject: [pkgdb] bcfg2: icon has given up commit
Message-ID: <20090917143638.8EA0B10F8A1@bastion2.fedora.phx.redhat.com>

icon has given up the commit acl on bcfg2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:36:36 +0000
Subject: [pkgdb] bcfg2: icon has given up approveacls
Message-ID: <20090917143638.BCCFA10F8A4@bastion2.fedora.phx.redhat.com>

icon has given up the approveacls acl on bcfg2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bcfg2



From pkgdb at fedoraproject.org  Thu Sep 17 14:37:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:37:57 +0000
Subject: [pkgdb] python-elementtree ownership updated
Message-ID: <20090917143756.32CDC10F867@bastion2.fedora.phx.redhat.com>

Package python-elementtree in Fedora 9 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-elementtree



From pkgdb at fedoraproject.org  Thu Sep 17 14:37:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:37:58 +0000
Subject: [pkgdb] python-elementtree ownership updated
Message-ID: <20090917143800.A00D410F886@bastion2.fedora.phx.redhat.com>

Package python-elementtree in Fedora 3 is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-elementtree



From pkgdb at fedoraproject.org  Thu Sep 17 14:38:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:38:01 +0000
Subject: [pkgdb] python-elementtree ownership updated
Message-ID: <20090917143803.6757610F894@bastion2.fedora.phx.redhat.com>

Package python-elementtree in Fedora devel is now owned by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-elementtree



From markmc at fedoraproject.org  Thu Sep 17 14:47:54 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 17 Sep 2009 14:47:54 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-fix-net-hotunplug-double-free.patch, NONE,
	1.1 libvirt-fix-pci-hostdev-hotunplug-leak.patch, NONE,
	1.1 libvirt-0.6.4-svirt-sound.patch, 1.5, 1.6 libvirt.spec,
	1.178, 1.179
Message-ID: <20090917144754.2E06E11C00CE@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5711

Modified Files:
	libvirt-0.6.4-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch 
Log Message:
* Thu Sep 17 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-4%
- A couple of hot-unplug memory handling fixes (#523960)


libvirt-fix-net-hotunplug-double-free.patch:
 qemu_driver.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-fix-net-hotunplug-double-free.patch ---
>From 9b926eb4c485bd81b0b553107dbb037c2188cd23 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 17 Sep 2009 15:31:08 +0100
Subject: [PATCH] Fix net/disk hot-unplug segfault

When we hot-unplug the last device, we're currently double-freeing
the device definition.

Reported by Michal Nowak here:

  https://bugzilla.redhat.com/523960

* src/qemu_driver.c: fix double free

Fedora-patch: libvirt-fix-net-hotunplug-double-free.patch
---
 src/qemu_driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index a65334f..de31581 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5998,7 +5998,7 @@ try_command:
             /* ignore, harmless */
         }
     } else {
-        VIR_FREE(vm->def->disks[0]);
+        VIR_FREE(vm->def->disks);
         vm->def->ndisks = 0;
     }
     virDomainDiskDefFree(detach);
@@ -6100,7 +6100,7 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
             /* ignore, harmless */
         }
     } else {
-        VIR_FREE(vm->def->nets[0]);
+        VIR_FREE(vm->def->nets);
         vm->def->nnets = 0;
     }
     virDomainNetDefFree(detach);
-- 
1.6.2.5


libvirt-fix-pci-hostdev-hotunplug-leak.patch:
 qemu_driver.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE libvirt-fix-pci-hostdev-hotunplug-leak.patch ---
>From 0538387bbdb426de88b54a8c45153c5644209698 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 17 Sep 2009 15:32:45 +0100
Subject: [PATCH] Fix leak in PCI hostdev hot-unplug

* src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net
  code.

Fedora-patch: libvirt-fix-pci-hostdev-hotunplug-leak.patch
---
 src/qemu_driver.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index de31581..2ddcdc0 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -6206,14 +6206,20 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
         pciFreeDevice(conn, pci);
     }
 
-    if (i != --vm->def->nhostdevs)
-        memmove(&vm->def->hostdevs[i],
-                &vm->def->hostdevs[i+1],
-                sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
-    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
-        virReportOOMError(conn);
-        ret = -1;
+    if (vm->def->nhostdevs > 1) {
+        memmove(vm->def->hostdevs + i,
+                vm->def->hostdevs + i + 1,
+                sizeof(*vm->def->hostdevs) *
+                (vm->def->nhostdevs - (i + 1)));
+        vm->def->nhostdevs--;
+        if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
+            /* ignore, harmless */
+        }
+    } else {
+        VIR_FREE(vm->def->hostdevs);
+        vm->def->nhostdevs = 0;
     }
+    virDomainHostdevDefFree(detach);
 
     return ret;
 }
-- 
1.6.2.5


libvirt-0.6.4-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libvirt-0.6.4-svirt-sound.patch	14 Sep 2009 18:30:45 -0000	1.5
+++ libvirt-0.6.4-svirt-sound.patch	17 Sep 2009 14:47:51 -0000	1.6
@@ -1,4 +1,4 @@
-From e2106f6db9beb9f48e9f87f8a1eaba821d1a2296 Mon Sep 17 00:00:00 2001
+From 127a39777e9809053bb98a9082e27c73543ccfa2 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 17 Aug 2009 08:32:08 +0100
 Subject: [PATCH] Disable sound cards when running sVirt


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- libvirt.spec	17 Sep 2009 13:30:50 -0000	1.178
+++ libvirt.spec	17 Sep 2009 14:47:52 -0000	1.179
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -160,6 +160,10 @@ Source: http://libvirt.org/sources/libvi
 # out when SELinux enforcing (bz 486112)
 Patch00: libvirt-0.6.4-svirt-sound.patch
 
+# A couple of hot-unplug memory handling fixes (#523960)
+Patch01: libvirt-fix-net-hotunplug-double-free.patch
+Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -373,6 +377,8 @@ of recent versions of Linux (and other O
 %setup -q
 
 %patch00 -p1
+%patch01 -p1
+%patch02 -p1
 
 %build
 %if ! %{with_xen}
@@ -763,6 +769,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 17 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-4%
+- A couple of hot-unplug memory handling fixes (#523960)
+
 * Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-3
 - disable numactl on s390[x]
 



From pkgdb at fedoraproject.org  Thu Sep 17 14:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:49:32 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917144931.4005010F867@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora devel is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 14:49:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:49:47 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917144945.3F84710F894@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 11 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Thu Sep 17 14:49:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:49:46 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917144944.0019110F888@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 10 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From linville at fedoraproject.org  Thu Sep 17 14:49:58 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu, 17 Sep 2009 14:49:58 +0000 (UTC)
Subject: rpms/kernel/F-12
	linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch, NONE,
	1.1 linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch,
	NONE, 1.1
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch,
	NONE, 1.1 kernel.spec, 1.1810, 1.1811
Message-ID: <20090917144958.F372F11C00CE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6530

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch 
	linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch 
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch 
Log Message:
Add a few more iwl1000 support patches. Remove support for deprecated iwl6000 parts.

linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch:
 iwl-agn.c  |    2 +-
 iwl-scan.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch ---
commit 5bddf54962bf68002816df710348ba197d6391bb
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Fri Aug 21 13:34:25 2009 -0700

    iwlwifi: fix unloading driver while scanning
    
    If NetworkManager is busy scanning when user
    tries to unload the module, the driver can not be unloaded
    because HW still scanning.
    
    Make sure driver sends abort scan host command to uCode if it
    is in the middle of scanning during driver unload.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 533b393..00457bf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2155,7 +2155,7 @@ static void iwl_mac_stop(struct ieee80211_hw *hw)
 
 	priv->is_open = 0;
 
-	if (iwl_is_ready_rf(priv)) {
+	if (iwl_is_ready_rf(priv) || test_bit(STATUS_SCAN_HW, &priv->status)) {
 		/* stop mac, cancel any scan request and clear
 		 * RXON_FILTER_ASSOC_MSK BIT
 		 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index c4c916d..4f3a108 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -796,7 +796,8 @@ void iwl_bg_abort_scan(struct work_struct *work)
 {
 	struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);
 
-	if (!iwl_is_ready(priv))
+	if (!test_bit(STATUS_READY, &priv->status) ||
+	    !test_bit(STATUS_GEO_CONFIGURED, &priv->status))
 		return;
 
 	mutex_lock(&priv->mutex);

linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch:
 iwl-6000.c |   18 ------------------
 iwl-agn.c  |    5 -----
 iwl-dev.h  |    1 -
 3 files changed, 24 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch ---
commit a11c4d000b84f7f49ebefc018c24bbfa3c9c0f3b
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Fri Jul 31 14:28:08 2009 -0700

    iwlwifi: remove deprecated 6000 series adapters
    
    Remove the support for deprecated devices. These devices are
    engineering samples and no longer supported by the uCode.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig	2009-09-17 10:35:39.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c	2009-09-17 10:38:22.000000000 -0400
@@ -75,24 +75,6 @@ static struct iwl_ops iwl6000_ops = {
 	.utils = &iwl6000_hcmd_utils,
 };
 
-struct iwl_cfg iwl6000_2ag_cfg = {
-	.name = "6000 Series 2x2 AG",
-	.fw_name_pre = IWL6000_FW_PRE,
-	.ucode_api_max = IWL6000_UCODE_API_MAX,
-	.ucode_api_min = IWL6000_UCODE_API_MIN,
-	.sku = IWL_SKU_A|IWL_SKU_G,
-	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
-	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
-	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
-	.mod_params = &iwl50_mod_params,
-	.valid_tx_ant = ANT_BC,
-	.valid_rx_ant = ANT_BC,
-	.need_pll_cfg = false,
-	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
-	.shadow_ram_support = true,
-};
-
 struct iwl_cfg iwl6000_2agn_cfg = {
 	.name = "6000 Series 2x2 AGN",
 	.fw_name_pre = IWL6000_FW_PRE,
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig	2009-09-17 10:35:39.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-09-17 10:37:46.000000000 -0400
@@ -3172,15 +3172,10 @@ static struct pci_device_id iwl_hw_card_
 	{IWL_PCI_DEVICE(0x423C, PCI_ANY_ID, iwl5150_agn_cfg)},
 	{IWL_PCI_DEVICE(0x423D, PCI_ANY_ID, iwl5150_agn_cfg)},
 /* 6000/6050 Series */
-	{IWL_PCI_DEVICE(0x0082, 0x1102, iwl6000_2ag_cfg)},
-	{IWL_PCI_DEVICE(0x0085, 0x1112, iwl6000_2ag_cfg)},
-	{IWL_PCI_DEVICE(0x0082, 0x1122, iwl6000_2ag_cfg)},
 	{IWL_PCI_DEVICE(0x422B, PCI_ANY_ID, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x422C, PCI_ANY_ID, iwl6000_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x4238, PCI_ANY_ID, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x4239, PCI_ANY_ID, iwl6000_2agn_cfg)},
-	{IWL_PCI_DEVICE(0x0082, PCI_ANY_ID, iwl6000_2agn_cfg)},
-	{IWL_PCI_DEVICE(0x0085, PCI_ANY_ID, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x0086, PCI_ANY_ID, iwl6050_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x0087, PCI_ANY_ID, iwl6050_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0088, PCI_ANY_ID, iwl6050_3agn_cfg)},
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig	2009-09-17 10:35:39.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h	2009-09-17 10:38:00.000000000 -0400
@@ -56,7 +56,6 @@ extern struct iwl_cfg iwl5350_agn_cfg;
 extern struct iwl_cfg iwl5100_bg_cfg;
 extern struct iwl_cfg iwl5100_abg_cfg;
 extern struct iwl_cfg iwl5150_agn_cfg;
-extern struct iwl_cfg iwl6000_2ag_cfg;
 extern struct iwl_cfg iwl6000_2agn_cfg;
 extern struct iwl_cfg iwl6000_3agn_cfg;
 extern struct iwl_cfg iwl6050_2agn_cfg;

linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch:
 iwl-1000.c   |    4 -
 iwl-6000.c   |   18 ++++-
 iwl-core.h   |    4 +
 iwl-dev.h    |   12 +++
 iwl-eeprom.c |  185 +++++++++++++++++++++++++++++++++++++++++++++++------------
 iwl-eeprom.h |   10 ++-
 6 files changed, 191 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch ---
Backport of the following upstream commit...

commit 415e49936b4b29b34c2fb561eeab867d41fc43a6
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Thu Aug 13 13:30:54 2009 -0700

    iwlwifi: traverse linklist to find the valid OTP block
    
    For devices using OTP memory, EEPROM image can start from
    any one of the OTP blocks. If shadow RAM is disabled, we need to
    traverse link list to find the last valid block, then start the EEPROM
    image reading.
    
    If OTP is not full, the valid block is the block _before_ the last block
    on the link list; the last block on the link list is the empty block
    ready for next OTP refresh/update.
    
    If OTP is full, then the last block is the valid block to be used for
    configure the device.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c	2009-09-17 09:26:23.000000000 -0400
@@ -62,12 +62,14 @@ struct iwl_cfg iwl1000_bgn_cfg = {
 	.ucode_api_min = IWL1000_UCODE_API_MIN,
 	.sku = IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl5000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_A,
 	.valid_rx_ant = ANT_AB,
 	.need_pll_cfg = true,
+	.max_ll_items = OTP_MAX_LL_ITEMS_1000,
+	.shadow_ram_support = false,
 };
 
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c	2009-09-17 09:55:14.000000000 -0400
@@ -89,6 +89,8 @@ struct iwl_cfg iwl6000_2ag_cfg = {
 	.valid_tx_ant = ANT_BC,
 	.valid_rx_ant = ANT_BC,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6000_2agn_cfg = {
@@ -98,13 +100,15 @@ struct iwl_cfg iwl6000_2agn_cfg = {
 	.ucode_api_min = IWL6000_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_AB,
 	.valid_rx_ant = ANT_AB,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6050_2agn_cfg = {
@@ -114,13 +118,15 @@ struct iwl_cfg iwl6050_2agn_cfg = {
 	.ucode_api_min = IWL6050_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+ 	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_AB,
 	.valid_rx_ant = ANT_AB,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6000_3agn_cfg = {
@@ -130,13 +136,15 @@ struct iwl_cfg iwl6000_3agn_cfg = {
 	.ucode_api_min = IWL6000_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+ 	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_ABC,
 	.valid_rx_ant = ANT_ABC,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6050_3agn_cfg = {
@@ -146,13 +154,15 @@ struct iwl_cfg iwl6050_3agn_cfg = {
 	.ucode_api_min = IWL6050_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_ABC,
 	.valid_rx_ant = ANT_ABC,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h	2009-09-17 09:35:58.000000000 -0400
@@ -207,6 +207,8 @@ struct iwl_mod_params {
  * 	filename is constructed as fw_name_pre<api>.ucode.
  * @ucode_api_max: Highest version of uCode API supported by driver.
  * @ucode_api_min: Lowest version of uCode API supported by driver.
+ * @max_ll_items: max number of OTP blocks
+ * @shadow_ram_support: shadow support for OTP memory
  *
  * We enable the driver to be backward compatible wrt API version. The
  * driver specifies which APIs it supports (with @ucode_api_max being the
@@ -243,6 +245,8 @@ struct iwl_cfg {
 	u8   valid_rx_ant;
 	bool need_pll_cfg;
 	bool use_isr_legacy;
+	const u16 max_ll_items;
+	const bool shadow_ram_support;
 };
 
 /***************************
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h	2009-09-17 09:40:55.000000000 -0400
@@ -835,6 +835,18 @@ enum iwl_nvm_type {
 	NVM_DEVICE_TYPE_OTP,
 };
 
+/*
+ * Two types of OTP memory access modes
+ *   IWL_OTP_ACCESS_ABSOLUTE - absolute address mode,
+ * 			        based on physical memory addressing
+ *   IWL_OTP_ACCESS_RELATIVE - relative address mode,
+ * 			       based on logical memory addressing
+ */
+enum iwl_access_mode {
+	IWL_OTP_ACCESS_ABSOLUTE,
+	IWL_OTP_ACCESS_RELATIVE,
+};
+
 /* interrupt statistics */
 struct isr_statistics {
 	u32 hw;
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c	2009-09-17 09:37:20.000000000 -0400
@@ -152,6 +152,19 @@ int iwlcore_eeprom_verify_signature(stru
 }
 EXPORT_SYMBOL(iwlcore_eeprom_verify_signature);
 
+static void iwl_set_otp_access(struct iwl_priv *priv, enum iwl_access_mode mode)
+{
+	u32 otpgp;
+
+	otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
+	if (mode == IWL_OTP_ACCESS_ABSOLUTE)
+		iwl_clear_bit(priv, CSR_OTP_GP_REG,
+				CSR_OTP_GP_REG_OTP_ACCESS_MODE);
+	else
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
+				CSR_OTP_GP_REG_OTP_ACCESS_MODE);
+}
+
 static int iwlcore_get_nvm_type(struct iwl_priv *priv)
 {
 	u32 otpgp;
@@ -249,6 +262,124 @@ static int iwl_init_otp_access(struct iw
 	return ret;
 }
 
+static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, u16 *eeprom_data)
+{
+	int ret = 0;
+	u32 r;
+	u32 otpgp;
+
+	_iwl_write32(priv, CSR_EEPROM_REG,
+		     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+	ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,
+				  CSR_EEPROM_REG_READ_VALID_MSK,
+				  IWL_EEPROM_ACCESS_TIMEOUT);
+	if (ret < 0) {
+		IWL_ERR(priv, "Time out reading OTP[%d]\n", addr);
+		return ret;
+	}
+	r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
+	/* check for ECC errors: */
+	otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
+	if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
+		/* stop in this case */
+		/* set the uncorrectable OTP ECC bit for acknowledgement */
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
+			CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
+		IWL_ERR(priv, "Uncorrectable OTP ECC error, abort OTP read\n");
+		return -EINVAL;
+	}
+	if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
+		/* continue in this case */
+		/* set the correctable OTP ECC bit for acknowledgement */
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
+				CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
+		IWL_ERR(priv, "Correctable OTP ECC error, continue read\n");
+	}
+	*eeprom_data = le16_to_cpu((__force __le16)(r >> 16));
+	return 0;
+}
+
+/*
+ * iwl_is_otp_empty: check for empty OTP
+ */
+static bool iwl_is_otp_empty(struct iwl_priv *priv)
+{
+	u16 next_link_addr = 0, link_value;
+	bool is_empty = false;
+
+	/* locate the beginning of OTP link list */
+	if (!iwl_read_otp_word(priv, next_link_addr, &link_value)) {
+		if (!link_value) {
+			IWL_ERR(priv, "OTP is empty\n");
+			is_empty = true;
+		}
+	} else {
+		IWL_ERR(priv, "Unable to read first block of OTP list.\n");
+		is_empty = true;
+	}
+
+	return is_empty;
+}
+
+
+/*
+ * iwl_find_otp_image: find EEPROM image in OTP
+ *   finding the OTP block that contains the EEPROM image.
+ *   the last valid block on the link list (the block _before_ the last block)
+ *   is the block we should read and used to configure the device.
+ *   If all the available OTP blocks are full, the last block will be the block
+ *   we should read and used to configure the device.
+ *   only perform this operation if shadow RAM is disabled
+ */
+static int iwl_find_otp_image(struct iwl_priv *priv,
+					u16 *validblockaddr)
+{
+	u16 next_link_addr = 0, link_value = 0, valid_addr;
+	int ret = 0;
+	int usedblocks = 0;
+
+	/* set addressing mode to absolute to traverse the link list */
+	iwl_set_otp_access(priv, IWL_OTP_ACCESS_ABSOLUTE);
+
+	/* checking for empty OTP or error */
+	if (iwl_is_otp_empty(priv))
+		return -EINVAL;
+
+	/*
+	 * start traverse link list
+	 * until reach the max number of OTP blocks
+	 * different devices have different number of OTP blocks
+	 */
+	do {
+		/* save current valid block address
+		 * check for more block on the link list
+		 */
+		valid_addr = next_link_addr;
+		next_link_addr = link_value;
+		IWL_DEBUG_INFO(priv, "OTP blocks %d addr 0x%x\n",
+			       usedblocks, next_link_addr);
+		if (iwl_read_otp_word(priv, next_link_addr, &link_value))
+			return -EINVAL;
+		if (!link_value) {
+			/*
+			 * reach the end of link list,
+			 * set address point to the starting address
+			 * of the image
+			 */
+			goto done;
+		}
+		/* more in the link list, continue */
+		usedblocks++;
+	} while (usedblocks < priv->cfg->max_ll_items);
+	/* OTP full, use last block */
+	IWL_DEBUG_INFO(priv, "OTP is full, use last block\n");
+done:
+	*validblockaddr = valid_addr;
+	/* skip first 2 bytes (link list pointer) */
+	*validblockaddr += 2;
+	return ret;
+}
+
 /**
  * iwl_eeprom_init - read EEPROM contents
  *
@@ -263,14 +394,13 @@ int iwl_eeprom_init(struct iwl_priv *pri
 	int sz;
 	int ret;
 	u16 addr;
-	u32 otpgp;
+	u16 validblockaddr = 0;
+	u16 cache_addr = 0;
 
 	priv->nvm_device_type = iwlcore_get_nvm_type(priv);
 
 	/* allocate eeprom */
-	if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-		priv->cfg->eeprom_size =
-			OTP_BLOCK_SIZE * OTP_LOWER_BLOCKS_TOTAL;
+	IWL_DEBUG_INFO(priv, "NVM size = %d\n", priv->cfg->eeprom_size);
 	sz = priv->cfg->eeprom_size;
 	priv->eeprom = kzalloc(sz, GFP_KERNEL);
 	if (!priv->eeprom) {
@@ -298,46 +428,31 @@ int iwl_eeprom_init(struct iwl_priv *pri
 		if (ret) {
 			IWL_ERR(priv, "Failed to initialize OTP access.\n");
 			ret = -ENOENT;
-			goto err;
+			goto done;
 		}
 		_iwl_write32(priv, CSR_EEPROM_GP,
 			     iwl_read32(priv, CSR_EEPROM_GP) &
 			     ~CSR_EEPROM_GP_IF_OWNER_MSK);
-		/* clear */
-		_iwl_write32(priv, CSR_OTP_GP_REG,
-			     iwl_read32(priv, CSR_OTP_GP_REG) |
+
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
 			     CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
 			     CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
-
-		for (addr = 0; addr < sz; addr += sizeof(u16)) {
-			u32 r;
-
-			_iwl_write32(priv, CSR_EEPROM_REG,
-				     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-
-			ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,
-						  CSR_EEPROM_REG_READ_VALID_MSK,
-						  IWL_EEPROM_ACCESS_TIMEOUT);
-			if (ret < 0) {
-				IWL_ERR(priv, "Time out reading OTP[%d]\n", addr);
+		/* traversing the linked list if no shadow ram supported */
+		if (!priv->cfg->shadow_ram_support) {
+			if (iwl_find_otp_image(priv, &validblockaddr)) {
+				ret = -ENOENT;
 				goto done;
 			}
-			r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
-			/* check for ECC errors: */
-			otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
-			if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
-				/* stop in this case */
-				IWL_ERR(priv, "Uncorrectable OTP ECC error, Abort OTP read\n");
+		}
+		for (addr = validblockaddr; addr < validblockaddr + sz;
+		     addr += sizeof(u16)) {
+			u16 eeprom_data;
+
+			ret = iwl_read_otp_word(priv, addr, &eeprom_data);
+			if (ret)
 				goto done;
-			}
-			if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
-				/* continue in this case */
-				_iwl_write32(priv, CSR_OTP_GP_REG,
-					     iwl_read32(priv, CSR_OTP_GP_REG) |
-					     CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
-				IWL_ERR(priv, "Correctable OTP ECC error, continue read\n");
-			}
-			e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
+			e[cache_addr / 2] = eeprom_data;
+			cache_addr += sizeof(u16);
 		}
 	} else {
 		/* eeprom is an array of 16bit values */
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h	2009-09-17 09:24:20.000000000 -0400
@@ -180,8 +180,14 @@ struct iwl_eeprom_channel {
 #define EEPROM_5050_EEPROM_VERSION	(0x21E)
 
 /* OTP */
-#define OTP_LOWER_BLOCKS_TOTAL		(3)
-#define OTP_BLOCK_SIZE			(0x400)
+/* lower blocks contain EEPROM image and calibration data */
+#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */
+/* high blocks contain PAPD data */
+#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */
+#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */
+#define OTP_MAX_LL_ITEMS_1000		(3)	/* OTP blocks for 1000 */
+#define OTP_MAX_LL_ITEMS_6x00		(4)	/* OTP blocks for 6x00 */
+#define OTP_MAX_LL_ITEMS_6x50		(7)	/* OTP blocks for 6x50 */
 
 /* 2.4 GHz */
 extern const u8 iwl_eeprom_band_1[14];


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1810
retrieving revision 1.1811
diff -u -p -r1.1810 -r1.1811
--- kernel.spec	16 Sep 2009 19:58:23 -0000	1.1810
+++ kernel.spec	17 Sep 2009 14:49:58 -0000	1.1811
@@ -668,6 +668,9 @@ Patch680: linux-2.6-iwlagn-modify-digita
 Patch681: linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
 Patch682: linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
 Patch683: linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
+Patch684: linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
+Patch685: linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+Patch686: linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -1313,6 +1316,11 @@ ApplyPatch linux-2.6-iwlagn-modify-digit
 ApplyPatch linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
 ApplyPatch linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
 ApplyPatch linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
+ApplyPatch linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
+ApplyPatch linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+
+# remove support for deprecated iwl6000 parts
+ApplyPatch linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
 
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
@@ -2055,6 +2063,10 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 17 2009 John W. Linville <linville at redhat.com>
+- Add a few more iwl1000 support patches.
+- Remove support for deprecated iwl6000 parts.
+
 * Wed Sep 16 2009 Eric Paris <eparis at redhat.com>
 - Do not check CAP_SYS_MODULE when networking tres to autoload a module
 



From pkgdb at fedoraproject.org  Thu Sep 17 14:49:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:49:54 +0000
Subject: [pkgdb] system-config-network: jpopelka has requested commit
Message-ID: <20090917144955.1B49510F89A@bastion2.fedora.phx.redhat.com>

jpopelka has requested the commit acl on system-config-network (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-network



From pkgdb at fedoraproject.org  Thu Sep 17 14:50:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:50:07 +0000
Subject: [pkgdb] system-config-network: jpopelka has requested commit
Message-ID: <20090917145005.1482210F88C@bastion2.fedora.phx.redhat.com>

jpopelka has requested the commit acl on system-config-network (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-network



From markmc at fedoraproject.org  Thu Sep 17 14:51:06 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 17 Sep 2009 14:51:06 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-fix-net-hotunplug-double-free.patch, 1.1,
	1.2 libvirt-fix-pci-hostdev-hotunplug-leak.patch, 1.1,
	1.2 libvirt.spec, 1.179, 1.180
Message-ID: <20090917145106.021AA11C00CE@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6999

Modified Files:
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch libvirt.spec 
Log Message:
Got the wrong bug number

libvirt-fix-net-hotunplug-double-free.patch:
 qemu_driver.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: libvirt-fix-net-hotunplug-double-free.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-net-hotunplug-double-free.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-net-hotunplug-double-free.patch	17 Sep 2009 14:47:52 -0000	1.1
+++ libvirt-fix-net-hotunplug-double-free.patch	17 Sep 2009 14:51:05 -0000	1.2
@@ -1,4 +1,4 @@
-From 9b926eb4c485bd81b0b553107dbb037c2188cd23 Mon Sep 17 00:00:00 2001
+From 18067a3cde7183fd17eea199fac2e49edfe1cb22 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:31:08 +0100
 Subject: [PATCH] Fix net/disk hot-unplug segfault
@@ -8,7 +8,7 @@ the device definition.
 
 Reported by Michal Nowak here:
 
-  https://bugzilla.redhat.com/523960
+  https://bugzilla.redhat.com/523953
 
 * src/qemu_driver.c: fix double free
 

libvirt-fix-pci-hostdev-hotunplug-leak.patch:
 qemu_driver.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Index: libvirt-fix-pci-hostdev-hotunplug-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-pci-hostdev-hotunplug-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-pci-hostdev-hotunplug-leak.patch	17 Sep 2009 14:47:52 -0000	1.1
+++ libvirt-fix-pci-hostdev-hotunplug-leak.patch	17 Sep 2009 14:51:05 -0000	1.2
@@ -1,4 +1,4 @@
-From 0538387bbdb426de88b54a8c45153c5644209698 Mon Sep 17 00:00:00 2001
+From 9ef0cb152e92db1aa87d89529812328935c8535a Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:32:45 +0100
 Subject: [PATCH] Fix leak in PCI hostdev hot-unplug


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- libvirt.spec	17 Sep 2009 14:47:52 -0000	1.179
+++ libvirt.spec	17 Sep 2009 14:51:05 -0000	1.180
@@ -160,7 +160,7 @@ Source: http://libvirt.org/sources/libvi
 # out when SELinux enforcing (bz 486112)
 Patch00: libvirt-0.6.4-svirt-sound.patch
 
-# A couple of hot-unplug memory handling fixes (#523960)
+# A couple of hot-unplug memory handling fixes (#523953)
 Patch01: libvirt-fix-net-hotunplug-double-free.patch
 Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
 
@@ -770,7 +770,7 @@ fi
 
 %changelog
 * Thu Sep 17 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-4%
-- A couple of hot-unplug memory handling fixes (#523960)
+- A couple of hot-unplug memory handling fixes (#523953)
 
 * Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-3
 - disable numactl on s390[x]



From mauelsha at fedoraproject.org  Thu Sep 17 14:52:42 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 14:52:42 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.100,1.101
Message-ID: <20090917145242.78CB511C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7849

Modified Files:
	dmraid.spec 
Log Message:
Builrequires


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- dmraid.spec	17 Sep 2009 14:30:15 -0000	1.100
+++ dmraid.spec	17 Sep 2009 14:52:40 -0000	1.101
@@ -12,8 +12,8 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper-devel
-BuildRequires: device-mapper-event
+BuildRequires: device-mapper-devel >= 1.02.02-2
+BuildRequires: device-mapper-event-devel
 BuildRequires: libselinux-devel
 BuildRequires: libsepol-devel
 Requires: device-mapper >= 1.02.02-2
@@ -43,6 +43,7 @@ RAID set activation and display of prope
 Summary: dmevent_tool (Device-mapper event tool) and DSO
 Group: System Environment/Base
 Requires: dmraid = %{version}-%{release}, sgpio
+Requires: device-mapper-event
 
 %description -n dmraid-events
 Provides a dmeventd DSO and the dmevent_tool to register devices with it



From pkgdb at fedoraproject.org  Thu Sep 17 14:52:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:52:51 +0000
Subject: [pkgdb] system-config-network had acl change status
Message-ID: <20090917145253.751EC10F881@bastion2.fedora.phx.redhat.com>

harald has set the commit acl on system-config-network (Fedora devel) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-network



From pkgdb at fedoraproject.org  Thu Sep 17 14:53:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:53:02 +0000
Subject: [pkgdb] system-config-network had acl change status
Message-ID: <20090917145300.9CF8710F88C@bastion2.fedora.phx.redhat.com>

harald has set the commit acl on system-config-network (Fedora 10) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-network



From pkgdb at fedoraproject.org  Thu Sep 17 14:53:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:53:00 +0000
Subject: [pkgdb] system-config-network had acl change status
Message-ID: <20090917145302.DA2E910F89A@bastion2.fedora.phx.redhat.com>

harald has set the commit acl on system-config-network (Fedora 11) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-network



From pkgdb at fedoraproject.org  Thu Sep 17 14:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:53:40 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchbugzilla
Message-ID: <20090917145341.64C8E10F888@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchbugzilla acl on python-imaging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:53:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:53:46 +0000
Subject: [pkgdb] python-imaging: rrakus has requested commit
Message-ID: <20090917145344.4E23910F895@bastion2.fedora.phx.redhat.com>

rrakus has requested the commit acl on python-imaging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:53:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:53:48 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchcommits
Message-ID: <20090917145347.624C410F89C@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchcommits acl on python-imaging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:03 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchbugzilla
Message-ID: <20090917145400.BE26A10F886@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchbugzilla acl on python-imaging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:02 +0000
Subject: [pkgdb] python-imaging: rrakus has requested commit
Message-ID: <20090917145402.0CC6910F88C@bastion2.fedora.phx.redhat.com>

rrakus has requested the commit acl on python-imaging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:09 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchcommits
Message-ID: <20090917145407.61DA310F8A2@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchcommits acl on python-imaging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:09 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchbugzilla
Message-ID: <20090917145411.A3F3210F8A5@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchbugzilla acl on python-imaging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:11 +0000
Subject: [pkgdb] python-imaging: rrakus has requested commit
Message-ID: <20090917145412.B028710F8AA@bastion2.fedora.phx.redhat.com>

rrakus has requested the commit acl on python-imaging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:13 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchcommits
Message-ID: <20090917145415.D28FA10F89D@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchcommits acl on python-imaging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:38 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchcommits
Message-ID: <20090917145440.AE1B710F888@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchcommits acl on python-imaging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:40 +0000
Subject: [pkgdb] python-imaging: rrakus has requested commit
Message-ID: <20090917145441.5073D10F896@bastion2.fedora.phx.redhat.com>

rrakus has requested the commit acl on python-imaging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:43 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchbugzilla
Message-ID: <20090917145445.7A8CC10F8AF@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchbugzilla acl on python-imaging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:48 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchbugzilla
Message-ID: <20090917145449.8D26110F8A2@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchbugzilla acl on python-imaging (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:52 +0000
Subject: [pkgdb] python-imaging: rrakus has requested watchcommits
Message-ID: <20090917145450.2B9AB10F8B5@bastion2.fedora.phx.redhat.com>

rrakus has requested the watchcommits acl on python-imaging (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:54:55 +0000
Subject: [pkgdb] python-imaging: rrakus has requested commit
Message-ID: <20090917145452.BFA8410F8B9@bastion2.fedora.phx.redhat.com>

rrakus has requested the commit acl on python-imaging (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Thu Sep 17 14:56:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 14:56:27 +0000
Subject: [pkgdb] atanks ownership updated
Message-ID: <20090917145625.3381310F8A3@bastion2.fedora.phx.redhat.com>

Package atanks in Fedora 9 was orphaned by icon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/atanks



From markmc at fedoraproject.org  Thu Sep 17 14:58:56 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 17 Sep 2009 14:58:56 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.180,1.181
Message-ID: <20090917145856.1CFC011C00CE@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10728

Modified Files:
	libvirt.spec 
Log Message:
Fix typo



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- libvirt.spec	17 Sep 2009 14:51:05 -0000	1.180
+++ libvirt.spec	17 Sep 2009 14:58:55 -0000	1.181
@@ -769,7 +769,7 @@ fi
 %endif
 
 %changelog
-* Thu Sep 17 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-4%
+* Thu Sep 17 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-4
 - A couple of hot-unplug memory handling fixes (#523953)
 
 * Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> - 0.7.1-3



From pkgdb at fedoraproject.org  Thu Sep 17 15:03:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:03:50 +0000
Subject: [pkgdb] bluez-utils: aarapov has requested watchcommits
Message-ID: <20090917150350.6627110F894@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-utils



From pkgdb at fedoraproject.org  Thu Sep 17 15:03:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:03:50 +0000
Subject: [pkgdb] bluez-utils: aarapov has requested commit
Message-ID: <20090917150351.2320010F89C@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on bluez-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-utils



From pkgdb at fedoraproject.org  Thu Sep 17 15:03:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:03:54 +0000
Subject: [pkgdb] bluez-utils: aarapov has requested approveacls
Message-ID: <20090917150352.3771E10F8A2@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on bluez-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-utils



From pkgdb at fedoraproject.org  Thu Sep 17 15:03:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:03:54 +0000
Subject: [pkgdb] bluez-utils: aarapov has requested watchbugzilla
Message-ID: <20090917150352.6E52010F8A6@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-utils



From mhlavink at fedoraproject.org  Thu Sep 17 15:08:17 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 17 Sep 2009 15:08:17 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.57, 1.58 dovecot.init, 1.6,
	1.7 dovecot.spec, 1.137, 1.138 sources, 1.61, 1.62
Message-ID: <20090917150817.E7A2B11C00CE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14837

Modified Files:
	.cvsignore dovecot.init dovecot.spec sources 
Log Message:
updated to 1.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	21 Aug 2009 10:44:35 -0000	1.57
+++ .cvsignore	17 Sep 2009 15:08:17 -0000	1.58
@@ -1,4 +1,4 @@
-dovecot-1.2.4.tar.gz
+dovecot-1.2.5.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
 dovecot-1.2.4-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.init
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dovecot.init	29 Jul 2008 14:35:20 -0000	1.6
+++ dovecot.init	17 Sep 2009 15:08:17 -0000	1.7
@@ -28,7 +28,7 @@
 # Source function library.
 . /etc/init.d/functions
 
-if [ -f /etc/sysconfig/dovecot ]; then
+if [ -f /etc/sysconfig/dovecot -a $UID -eq 0 ]; then
     . /etc/sysconfig/dovecot
 fi
 
@@ -40,6 +40,7 @@ pidfile="/var/run/dovecot/master.pid"
 lockfile="/var/lock/subsys/dovecot"
 
 start() {
+	[ $UID -eq 0 ] || exit 4
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
 
@@ -51,6 +52,7 @@ start() {
 }
 
 stop() {
+	[ $UID -eq 0 ] || exit 4
 	echo -n $"Stopping $prog: "
 	killproc -p $pidfile $exec
 	RETVAL=$?
@@ -59,6 +61,7 @@ stop() {
 }
 
 reload() {
+	[ $UID -eq 0 ] || exit 4
 	echo -n $"Reloading $prog: "
 	killproc -p $pidfile $exec -HUP
 	RETVAL=$?
@@ -95,6 +98,7 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
+	[ $1 = 'usage' ] && exit 0
 	exit 2
 esac
 


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- dovecot.spec	16 Sep 2009 11:56:41 -0000	1.137
+++ dovecot.spec	17 Sep 2009 15:08:17 -0000	1.138
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.4
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.4-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -355,7 +355,7 @@ fi
 %doc %{docdir}-%{version}
 %config(noreplace) %{_sysconfdir}/dovecot.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
-%{_initrddir}/dovecot
+%{_initddir}/dovecot
 %config(noreplace) %{_sysconfdir}/pam.d/dovecot
 %dir %{ssldir}
 %dir %{ssldir}/certs
@@ -368,7 +368,6 @@ fi
 %{_sbindir}/dovecotpw
 %attr(0755,root,dovecot) %dir /var/run/dovecot
 %attr(0750,root,dovecot) %dir /var/run/dovecot/login
-#%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
 %if %{build_sieve}
@@ -435,6 +434,19 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-1
+- updated to dovecot 1.2.5
+- Authentication: DIGEST-MD5 and RPA mechanisms no longer require
+  user's login realm to be listed in auth_realms. It only made
+  configuration more difficult without really providing extra security.
+- zlib plugin: Don't allow clients to save compressed data directly.
+  This prevents users from exploiting (most of the) potential security
+  holes in zlib/bzlib.
+- fix index file handling that could have caused an assert-crash
+- IMAP: Fixes to QRESYNC extension.
+- deliver: Don't send rejects to any messages that have Auto-Submitted
+  header. This avoids emails loops.
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.4-3
 - use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	21 Aug 2009 10:44:35 -0000	1.61
+++ sources	17 Sep 2009 15:08:17 -0000	1.62
@@ -1,4 +1,4 @@
-3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
+8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
 6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From hadess at fedoraproject.org  Thu Sep 17 15:10:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 15:10:41 +0000 (UTC)
Subject: rpms/gupnp/devel gupnp.spec,1.25,1.26
Message-ID: <20090917151041.5E56111C0337@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15795

Modified Files:
	gupnp.spec 
Log Message:
fix filelist


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gupnp.spec	17 Sep 2009 13:26:03 -0000	1.25
+++ gupnp.spec	17 Sep 2009 15:10:40 -0000	1.26
@@ -71,8 +71,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_libdir}/libgupnp-1.0.so.2
-%{_libdir}/libgupnp-1.0.so.2.0.0
+%{_libdir}/libgupnp-1.0.so.*
 %{_bindir}/gupnp-binding-tool
 
 %files devel



From pkgdb at fedoraproject.org  Thu Sep 17 15:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:10:48 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917151049.5BD3710F80B@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora devel is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 15:11:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:11:06 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917151104.3E22F10F80B@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 10 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Thu Sep 17 15:11:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:11:06 +0000
Subject: [pkgdb] python-feedparser ownership updated
Message-ID: <20090917151106.4461410F886@bastion2.fedora.phx.redhat.com>

Package python-feedparser in Fedora 11 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From gerd at fedoraproject.org  Thu Sep 17 15:11:14 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Thu, 17 Sep 2009 15:11:14 +0000 (UTC)
Subject: rpms/rakudo/devel .cvsignore, 1.4, 1.5 import.log, 1.5,
	1.6 rakudo.spec, 1.8, 1.9 sources, 1.6, 1.7 rakudo.patch, 1.1, NONE
Message-ID: <20090917151114.735CB11C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15703/devel

Modified Files:
	.cvsignore import.log rakudo.spec sources 
Removed Files:
	rakudo.patch 
Log Message:
update to new rakudo release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Aug 2009 01:06:24 -0000	1.4
+++ .cvsignore	17 Sep 2009 15:11:11 -0000	1.5
@@ -1 +1 @@
-rakudo-2009-08.tar.gz
+rakudo-2009-09.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	22 Aug 2009 01:06:25 -0000	1.5
+++ import.log	17 Sep 2009 15:11:11 -0000	1.6
@@ -3,3 +3,4 @@ rakudo-0_0_2009_07_1_4_0-1_fc11:HEAD:rak
 rakudo-0_0_2009_07_1_4_0-3_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818713
 rakudo-0_0_2009_07_1_4_0-4_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-4.fc11.src.rpm:1250109284
 rakudo-0_0_2009_08_1_5_0-1_fc11:HEAD:rakudo-0.0.2009.08_1.5.0-1.fc11.src.rpm:1250903045
+rakudo-0_0_2009_09_1_6_0-1_fc11:HEAD:rakudo-0.0.2009.09_1.6.0-1.fc11.src.rpm:1253200149


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rakudo.spec	22 Aug 2009 21:09:21 -0000	1.8
+++ rakudo.spec	17 Sep 2009 15:11:12 -0000	1.9
@@ -1,22 +1,22 @@
 %global year 2009
-%global month 08
-%global parrot_version 1.5.0
+%global month 09
+%global parrot_version 1.6.0
 
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
 
-ExcludeArch:ppc
+#ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
 URL:            http://www.rakudo.org/
 
 Source0:        http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{year}-%{month}.tar.gz
-Patch0:         rakudo.patch
+#Patch0:         rakudo.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,8 +39,8 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
-%patch0 -p0
-%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
+#%patch0 -p0
+#%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
@@ -62,7 +62,7 @@ pod2man --section=1 --name=perl6 docs/ru
 
 
 %check
-%{?!_without_tests: make test}
+#%{?!_without_tests: make test}
 exit 0
 
 %clean


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2009 01:06:25 -0000	1.6
+++ sources	17 Sep 2009 15:11:12 -0000	1.7
@@ -1 +1 @@
-a69537605421d44f90a87f47d3ae443b  rakudo-2009-08.tar.gz
+2be848c361d772ae1fc696e3bc0fc9c1  rakudo-2009-09.tar.gz


--- rakudo.patch DELETED ---



From mauelsha at fedoraproject.org  Thu Sep 17 15:11:33 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 15:11:33 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid-1.0.0.rc16-test_devices.patch, NONE,
	1.1 dmraid.spec, 1.106, 1.107
Message-ID: <20090917151133.1EF8811C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16127

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc16-test_devices.patch 
Log Message:
Fix test devices access

dmraid-1.0.0.rc16-test_devices.patch:
 configure         | 2763 ++++++++++++++++++++++++++++++------------------------
 configure.in      |   10 
 lib/device/scan.c |    2 
 3 files changed, 1572 insertions(+), 1203 deletions(-)

--- NEW FILE dmraid-1.0.0.rc16-test_devices.patch ---
diff --git a/configure.in.test_devices b/configure.in
index 8b0ad90..74fd27f 100644
--- a/configure.in.test_devices
+++ b/configure.in
@@ -133,8 +133,9 @@ AC_ARG_ENABLE(shared_lib,
 
 echo $ac_n "checking whether to disable testing with mapped devices""... $ac_c" 1>&6
 dnl Disable testing with mapped devices
-AC_ARG_ENABLE(testing, [  --disable-testing       Disable testing with mapped devices],  \
-DMRAID_TEST=no, DMRAID_TEST=yes)
+AC_ARG_ENABLE(testing, [  --disable-testing        Enable testing with mapped devices],  \
+DMRAID_TEST=$enableval, DMRAID_TEST=yes)
+
 
 echo "$ac_t""$DEBUG" 1>&6
 
@@ -165,6 +166,10 @@ if test x$DMRAID_LED = xyes; then
         CFLAGS="$CFLAGS -DDMRAID_LED"
 fi
 
+if test x$DMRAID_TEST = xyes; then
+        CFLAGS="$CFLAGS -DDMRAID_TEST"
+fi
+
 if test x$DMRAID_INTEL_LED = xyes; then
         CFLAGS="$CFLAGS -DDMRAID_LED -DDMRAID_INTEL_LED"
 fi
@@ -229,7 +234,6 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CLDFLAGS)
 AC_SUBST(DEBUG)
 AC_SUBST(DEBUG_MALLOC)
-AC_SUBST(DMRAID_TEST)
 AC_SUBST(DMRAID_VERSION)
 AC_SUBST(DMRAID_LIB_VERSION)
 AC_SUBST(DIETLIBC)
diff --git a/configure.test_devices b/configure
index f0194d6..995ebb2 100755
--- a/configure.test_devices
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
[...5023 lines suppressed...]
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -6646,7 +6992,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6672,7 +7018,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -6681,7 +7027,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6702,17 +7048,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -6752,12 +7098,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -6766,13 +7113,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -6786,15 +7134,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -6804,21 +7153,28 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -6833,6 +7189,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -6854,4 +7215,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/lib/device/scan.c.test_devices b/lib/device/scan.c
index 2d06fa4..ec727b2 100644
--- a/lib/device/scan.c.test_devices
+++ b/lib/device/scan.c
@@ -87,7 +87,7 @@ dm_test_device(struct lib_context *lc, char *path)
 	struct stat s;
 
 	return !lstat(path, &s) &&
-		S_ISLNK(s.st_mode) &&
+/*		S_ISLNK(s.st_mode) && */ /* No symlinks any more. */
 		!strncmp(get_basename(lc, path), "dm-", 3);
 }
 


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- dmraid.spec	16 Sep 2009 22:58:19 -0000	1.106
+++ dmraid.spec	17 Sep 2009 15:11:30 -0000	1.107
@@ -12,14 +12,19 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper-devel, device-mapper-devel, libselinux-devel, libsepol-devel, lvm2
+BuildRequires: device-mapper-devel >= 1.02.02-2
+BuildRequires: device-mapper-event-devel
+BuildRequires: libselinux-devel
+BuildRequires: libsepol-devel
 Requires: device-mapper >= 1.02.02-2
-Requires: dmraid-events kpartx
-Requires: dmraid-events kpartx
+Requires: dmraid-events
+Requires: kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
+Patch0:	dmraid-1.0.0.rc16-test_devices.patch
+
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@@ -57,6 +62,7 @@ Device failure reporting has to be activ
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led



From pkgdb at fedoraproject.org  Thu Sep 17 15:12:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:12:25 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917151225.0ED7510F867@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora devel is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 15:12:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:12:34 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917151234.85B1110F80B@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 10 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From pkgdb at fedoraproject.org  Thu Sep 17 15:12:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:12:36 +0000
Subject: [pkgdb] gazpacho ownership updated
Message-ID: <20090917151238.3202610F867@bastion2.fedora.phx.redhat.com>

Package gazpacho in Fedora 11 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gazpacho



From wtogami at fedoraproject.org  Thu Sep 17 15:12:48 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 15:12:48 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.14,
	1.15 perl-HTML-Parser.spec, 1.36, 1.37 sources, 1.15, 1.16
Message-ID: <20090917151248.8C1F411C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16939

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
3.62



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	9 Jun 2009 05:48:15 -0000	1.14
+++ .cvsignore	17 Sep 2009 15:12:44 -0000	1.15
@@ -1 +1 @@
-HTML-Parser-3.60.tar.gz
+HTML-Parser-3.62.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- perl-HTML-Parser.spec	26 Jul 2009 06:27:10 -0000	1.36
+++ perl-HTML-Parser.spec	17 Sep 2009 15:12:46 -0000	1.37
@@ -1,8 +1,8 @@
 %define real_name HTML-Parser
 
 Name:           perl-%{real_name}
-Version:        3.60
-Release:        2%{?dist}
+Version:        3.62
+Release:        1%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
+- 3.62
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.60-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Jun 2009 05:48:16 -0000	1.15
+++ sources	17 Sep 2009 15:12:46 -0000	1.16
@@ -1 +1 @@
-fb97ea7e5bd832b079d8660732f9d8d9  HTML-Parser-3.60.tar.gz
+2aad75367af5173514f564122ba028c7  HTML-Parser-3.62.tar.gz



From hadess at fedoraproject.org  Thu Sep 17 15:12:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 15:12:51 +0000 (UTC)
Subject: rpms/gssdp/devel gssdp.spec,1.14,1.15
Message-ID: <20090917151251.B3CE711C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gssdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17098

Modified Files:
	gssdp.spec 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-2
- Remove unneeded libglade BR



Index: gssdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gssdp.spec	17 Sep 2009 14:15:26 -0000	1.14
+++ gssdp.spec	17 Sep 2009 15:12:50 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gssdp
 Version:        0.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Resource discovery and announcement over SSDP
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@ BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: gtk-doc
 BuildRequires: NetworkManager-devel
-BuildRequires: libglade2-devel
 
 Requires: dbus
 
@@ -89,6 +88,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-2
+- Remove unneeded libglade BR
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-1
 - Update to 0.7.0
 



From pkgdb at fedoraproject.org  Thu Sep 17 15:13:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:13:17 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917151318.0112A10F80B@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora devel is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 15:13:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:13:22 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917151324.A16AF10F867@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 10 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 15:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:13:27 +0000
Subject: [pkgdb] python-kiwi ownership updated
Message-ID: <20090917151327.E94EF10F80B@bastion2.fedora.phx.redhat.com>

Package python-kiwi in Fedora 11 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From pkgdb at fedoraproject.org  Thu Sep 17 15:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:14:33 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917151434.4C45C10F80B@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora devel is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 15:14:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:14:45 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917151442.7AAC110F88C@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 10 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 15:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:14:47 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917151443.7B92710F895@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora 11 is now owned by hguemar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 15:15:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:15:19 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151515.9890710F886@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:15:34 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151531.6EF9F10F89A@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for dougsland

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:15:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:15:39 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151535.A93A110F89F@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora devel) to Approved for dougsland

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:15:43 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151542.E3A7C10F888@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora devel) to Approved for sa4sa

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:15:47 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151544.69C0C10F8A6@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for sa4sa

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From mauelsha at fedoraproject.org  Thu Sep 17 15:16:05 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 15:16:05 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.101,1.102
Message-ID: <20090917151605.640AF11C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19493

Modified Files:
	dmraid.spec 
Log Message:
Try static build


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- dmraid.spec	17 Sep 2009 14:52:40 -0000	1.101
+++ dmraid.spec	17 Sep 2009 15:16:05 -0000	1.102
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -66,7 +66,11 @@ Device failure reporting has to be activ
 %patch0 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led --disable-testing
+make DESTDIR=$RPM_BUILD_ROOT
+mv tools/dmraid tools/dmraid.static
+make clean
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_linko --enable-led --enable-intel_led --disable-testing
 make DESTDIR=$RPM_BUILD_ROOT
 
 %install



From pkgdb at fedoraproject.org  Thu Sep 17 15:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:16:13 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151615.0C6B410F89D@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora 12) to Approved for dougsland

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:16:20 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151618.1730D10F8A3@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora 12) to Approved for dougsland

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:16:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:16:28 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151624.EC60A10F8B1@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora 12) to Approved for sa4sa

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Sep 17 15:16:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:16:28 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090917151627.2BA0610F894@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora 12) to Approved for sa4sa

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From mgrepl at fedoraproject.org  Thu Sep 17 15:18:28 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 17 Sep 2009 15:18:28 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.178,
	1.179 selinux-policy.spec, 1.806, 1.807
Message-ID: <20090917151828.3417611C00CE@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20274

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow spamd to read spamd_var_lib_t symlinks



policy-20080710.patch:
 Makefile                                            |   26 
 Rules.modular                                       |   18 
 config/appconfig-mcs/default_contexts               |   19 
 config/appconfig-mcs/failsafe_context               |    2 
 config/appconfig-mcs/guest_u_default_contexts       |    6 
 config/appconfig-mcs/root_default_contexts          |    8 
 config/appconfig-mcs/seusers                        |    4 
 config/appconfig-mcs/staff_u_default_contexts       |    4 
 config/appconfig-mcs/unconfined_u_default_contexts  |    2 
 config/appconfig-mcs/user_u_default_contexts        |    5 
 config/appconfig-mcs/userhelper_context             |    2 
 config/appconfig-mcs/xguest_u_default_contexts      |    7 
 config/appconfig-mls/default_contexts               |   19 
 config/appconfig-mls/guest_u_default_contexts       |    4 
 config/appconfig-mls/root_default_contexts          |   12 
 config/appconfig-mls/staff_u_default_contexts       |    2 
 config/appconfig-mls/user_u_default_contexts        |    2 
 config/appconfig-mls/xguest_u_default_contexts      |    7 
 config/appconfig-standard/guest_u_default_contexts  |    4 
 config/appconfig-standard/root_default_contexts     |    6 
 config/appconfig-standard/staff_u_default_contexts  |    2 
 config/appconfig-standard/user_u_default_contexts   |    2 
 config/appconfig-standard/xguest_u_default_contexts |    5 
 man/man8/nfs_selinux.8                              |   19 
 man/man8/samba_selinux.8                            |   12 
 policy/flask/access_vectors                         |    1 
 policy/global_tunables                              |   20 
 policy/mcs                                          |    8 
 policy/mls                                          |    9 
 policy/modules/admin/alsa.te                        |    1 
 policy/modules/admin/anaconda.te                    |    1 
 policy/modules/admin/certwatch.te                   |    4 
 policy/modules/admin/consoletype.te                 |   11 
 policy/modules/admin/kismet.if                      |    1 
 policy/modules/admin/kismet.te                      |   49 
 policy/modules/admin/logrotate.te                   |   14 
 policy/modules/admin/logwatch.te                    |   11 
 policy/modules/admin/mrtg.te                        |    1 
 policy/modules/admin/netutils.te                    |   11 
 policy/modules/admin/prelink.te                     |   18 
 policy/modules/admin/rpm.fc                         |   10 
 policy/modules/admin/rpm.if                         |  290 +++
 policy/modules/admin/rpm.te                         |   40 
 policy/modules/admin/su.if                          |   69 
 policy/modules/admin/sudo.if                        |   55 
 policy/modules/admin/tmpreaper.te                   |   24 
 policy/modules/admin/usermanage.te                  |   19 
 policy/modules/admin/vbetool.if                     |   31 
 policy/modules/admin/vbetool.te                     |    9 
 policy/modules/admin/vpn.if                         |   36 
 policy/modules/apps/awstats.te                      |    6 
 policy/modules/apps/ethereal.fc                     |    2 
 policy/modules/apps/ethereal.if                     |   54 
 policy/modules/apps/ethereal.te                     |    7 
 policy/modules/apps/games.if                        |   28 
 policy/modules/apps/gitosis.fc                      |    4 
 policy/modules/apps/gitosis.if                      |   94 
 policy/modules/apps/gitosis.te                      |   43 
 policy/modules/apps/gnome.fc                        |   14 
 policy/modules/apps/gnome.if                        |  171 +
 policy/modules/apps/gnome.te                        |   31 
 policy/modules/apps/gpg.fc                          |    8 
 policy/modules/apps/gpg.if                          |  304 ---
 policy/modules/apps/gpg.te                          |  248 ++
 policy/modules/apps/java.fc                         |   17 
 policy/modules/apps/java.if                         |  188 +
 policy/modules/apps/java.te                         |   31 
 policy/modules/apps/livecd.fc                       |    2 
 policy/modules/apps/livecd.if                       |   56 
 policy/modules/apps/livecd.te                       |   26 
 policy/modules/apps/loadkeys.te                     |    5 
 policy/modules/apps/mono.if                         |  103 +
 policy/modules/apps/mono.te                         |    6 
 policy/modules/apps/mozilla.fc                      |   13 
 policy/modules/apps/mozilla.if                      |  325 +--
 policy/modules/apps/mozilla.te                      |   19 
 policy/modules/apps/mplayer.fc                      |    8 
 policy/modules/apps/mplayer.if                      |   64 
 policy/modules/apps/mplayer.te                      |    4 
 policy/modules/apps/nsplugin.fc                     |   13 
 policy/modules/apps/nsplugin.if                     |  318 +++
 policy/modules/apps/nsplugin.te                     |  290 +++
 policy/modules/apps/openoffice.fc                   |    3 
 policy/modules/apps/openoffice.if                   |  106 +
 policy/modules/apps/openoffice.te                   |   14 
 policy/modules/apps/podsleuth.fc                    |    2 
 policy/modules/apps/podsleuth.if                    |   34 
 policy/modules/apps/podsleuth.te                    |   44 
 policy/modules/apps/ptchown.fc                      |    2 
 policy/modules/apps/ptchown.if                      |   22 
 policy/modules/apps/ptchown.te                      |   39 
 policy/modules/apps/qemu.fc                         |    5 
 policy/modules/apps/qemu.if                         |  367 +++
 policy/modules/apps/qemu.te                         |  152 +
 policy/modules/apps/sambagui.fc                     |    4 
 policy/modules/apps/sambagui.if                     |    2 
 policy/modules/apps/sambagui.te                     |   62 
 policy/modules/apps/screen.fc                       |    2 
 policy/modules/apps/screen.if                       |   24 
 policy/modules/apps/screen.te                       |    4 
 policy/modules/apps/slocate.te                      |    4 
 policy/modules/apps/thunderbird.fc                  |    2 
 policy/modules/apps/thunderbird.if                  |   34 
 policy/modules/apps/thunderbird.te                  |    4 
 policy/modules/apps/tvtime.if                       |   39 
 policy/modules/apps/tvtime.te                       |    6 
 policy/modules/apps/uml.fc                          |    2 
 policy/modules/apps/vmware.fc                       |   19 
 policy/modules/apps/vmware.if                       |   14 
 policy/modules/apps/vmware.te                       |   17 
 policy/modules/apps/webalizer.te                    |    2 
 policy/modules/apps/wine.fc                         |   23 
 policy/modules/apps/wine.if                         |   50 
 policy/modules/apps/wine.te                         |    8 
 policy/modules/apps/wireshark.if                    |    2 
 policy/modules/apps/wm.fc                           |    3 
 policy/modules/apps/wm.if                           |  178 +
 policy/modules/apps/wm.te                           |   10 
 policy/modules/kernel/.filesystem.if.swp            |binary
 policy/modules/kernel/corecommands.fc               |   47 
 policy/modules/kernel/corecommands.if               |    1 
 policy/modules/kernel/corenetwork.if.in             |   46 
 policy/modules/kernel/corenetwork.te.in             |   41 
 policy/modules/kernel/devices.fc                    |   46 
 policy/modules/kernel/devices.if                    |  541 +++++
 policy/modules/kernel/devices.te                    |   45 
 policy/modules/kernel/domain.if                     |   22 
 policy/modules/kernel/domain.te                     |   53 
 policy/modules/kernel/files.fc                      |    2 
 policy/modules/kernel/files.if                      |  304 +++
 policy/modules/kernel/files.te                      |   11 
 policy/modules/kernel/filesystem.if                 |  356 +++
 policy/modules/kernel/filesystem.te                 |   18 
 policy/modules/kernel/kernel.if                     |   42 
 policy/modules/kernel/kernel.te                     |   16 
 policy/modules/kernel/selinux.if                    |   54 
 policy/modules/kernel/selinux.te                    |    6 
 policy/modules/kernel/storage.fc                    |    2 
 policy/modules/kernel/storage.if                    |    1 
 policy/modules/kernel/terminal.if                   |    6 
 policy/modules/roles/.staff.te.swp                  |binary
 policy/modules/roles/guest.fc                       |    1 
 policy/modules/roles/guest.if                       |  161 +
 policy/modules/roles/guest.te                       |   36 
 policy/modules/roles/logadm.fc                      |    1 
 policy/modules/roles/logadm.if                      |   44 
 policy/modules/roles/logadm.te                      |   20 
 policy/modules/roles/staff.te                       |   58 
 policy/modules/roles/sysadm.if                      |  114 -
 policy/modules/roles/sysadm.te                      |   14 
 policy/modules/roles/unprivuser.if                  |  605 ++++++
 policy/modules/roles/unprivuser.te                  |   15 
 policy/modules/roles/webadm.fc                      |    1 
 policy/modules/roles/webadm.if                      |   44 
 policy/modules/roles/webadm.te                      |   65 
 policy/modules/roles/xguest.fc                      |    1 
 policy/modules/roles/xguest.if                      |  161 +
 policy/modules/roles/xguest.te                      |   87 
 policy/modules/services/aide.if                     |    6 
 policy/modules/services/amavis.if                   |   20 
 policy/modules/services/amavis.te                   |    2 
 policy/modules/services/apache.fc                   |   35 
 policy/modules/services/apache.if                   |  488 +++--
 policy/modules/services/apache.te                   |  397 +++-
 policy/modules/services/apcupsd.fc                  |    2 
 policy/modules/services/arpwatch.fc                 |    1 
 policy/modules/services/arpwatch.if                 |   42 
 policy/modules/services/arpwatch.te                 |    3 
 policy/modules/services/asterisk.fc                 |    1 
 policy/modules/services/asterisk.if                 |   53 
 policy/modules/services/asterisk.te                 |    3 
 policy/modules/services/audioentropy.fc             |    2 
 policy/modules/services/audioentropy.te             |    1 
 policy/modules/services/automount.if                |   18 
 policy/modules/services/automount.te                |    6 
 policy/modules/services/avahi.fc                    |    4 
 policy/modules/services/avahi.if                    |  132 +
 policy/modules/services/avahi.te                    |   15 
 policy/modules/services/bind.fc                     |    7 
 policy/modules/services/bind.if                     |   92 
 policy/modules/services/bind.te                     |    5 
 policy/modules/services/bitlbee.te                  |    2 
 policy/modules/services/bluetooth.fc                |    5 
 policy/modules/services/bluetooth.if                |   53 
 policy/modules/services/bluetooth.te                |   22 
 policy/modules/services/certmaster.fc               |    9 
 policy/modules/services/certmaster.if               |  128 +
 policy/modules/services/certmaster.te               |   81 
 policy/modules/services/clamav.fc                   |   12 
 policy/modules/services/clamav.if                   |  105 +
 policy/modules/services/clamav.te                   |   35 
 policy/modules/services/consolekit.fc               |    3 
 policy/modules/services/consolekit.if               |   21 
 policy/modules/services/consolekit.te               |   64 
 policy/modules/services/courier.fc                  |    2 
 policy/modules/services/courier.if                  |   19 
 policy/modules/services/courier.te                  |    4 
 policy/modules/services/cron.fc                     |   10 
 policy/modules/services/cron.if                     |  250 +-
 policy/modules/services/cron.te                     |  112 -
 policy/modules/services/cups.fc                     |   32 
 policy/modules/services/cups.if                     |  106 +
 policy/modules/services/cups.te                     |  186 +
 policy/modules/services/cvs.te                      |    1 
 policy/modules/services/cyphesis.fc                 |    5 
 policy/modules/services/cyrus.te                    |    1 
 policy/modules/services/dbus.fc                     |    3 
 policy/modules/services/dbus.if                     |  235 ++
 policy/modules/services/dbus.te                     |   57 
 policy/modules/services/dcc.fc                      |    2 
 policy/modules/services/dcc.if                      |   18 
 policy/modules/services/dcc.te                      |   62 
 policy/modules/services/dhcp.fc                     |    1 
 policy/modules/services/dhcp.if                     |   60 
 policy/modules/services/dhcp.te                     |   18 
 policy/modules/services/dnsmasq.fc                  |    3 
 policy/modules/services/dnsmasq.if                  |  174 +
 policy/modules/services/dnsmasq.te                  |   22 
 policy/modules/services/dovecot.fc                  |   12 
 policy/modules/services/dovecot.if                  |   98 +
 policy/modules/services/dovecot.te                  |   98 -
 policy/modules/services/exim.if                     |   40 
 policy/modules/services/exim.te                     |  102 -
 policy/modules/services/fail2ban.fc                 |    1 
 policy/modules/services/fail2ban.if                 |   45 
 policy/modules/services/fail2ban.te                 |   10 
 policy/modules/services/fetchmail.fc                |    2 
 policy/modules/services/fetchmail.if                |   26 
 policy/modules/services/fetchmail.te                |   10 
 policy/modules/services/ftp.te                      |   53 
 policy/modules/services/gamin.fc                    |    2 
 policy/modules/services/gamin.if                    |   57 
 policy/modules/services/gamin.te                    |   39 
 policy/modules/services/gnomeclock.fc               |    3 
 policy/modules/services/gnomeclock.if               |   75 
 policy/modules/services/gnomeclock.te               |   55 
 policy/modules/services/gpsd.fc                     |    3 
 policy/modules/services/gpsd.if                     |   89 
 policy/modules/services/gpsd.te                     |   55 
 policy/modules/services/hal.fc                      |    4 
 policy/modules/services/hal.if                      |   39 
 policy/modules/services/hal.te                      |  112 +
 policy/modules/services/inetd.fc                    |    2 
 policy/modules/services/inetd.te                    |    2 
 policy/modules/services/kerberos.fc                 |    6 
 policy/modules/services/kerberos.te                 |    3 
 policy/modules/services/kerneloops.if               |   23 
 policy/modules/services/kerneloops.te               |    6 
 policy/modules/services/ktalk.te                    |    1 
 policy/modules/services/ldap.te                     |    6 
 policy/modules/services/lircd.fc                    |    9 
 policy/modules/services/lircd.if                    |  100 +
 policy/modules/services/lircd.te                    |   70 
 policy/modules/services/lpd.fc                      |    6 
 policy/modules/services/mailman.fc                  |    1 
 policy/modules/services/mailman.if                  |   28 
 policy/modules/services/mailman.te                  |   33 
 policy/modules/services/mailscanner.fc              |    2 
 policy/modules/services/mailscanner.if              |   59 
 policy/modules/services/mailscanner.te              |    5 
 policy/modules/services/milter.fc                   |   15 
 policy/modules/services/milter.if                   |  104 +
 policy/modules/services/milter.te                   |  107 +
 policy/modules/services/mta.fc                      |   10 
 policy/modules/services/mta.if                      |   70 
 policy/modules/services/mta.te                      |   76 
 policy/modules/services/munin.fc                    |    7 
 policy/modules/services/munin.if                    |   92 
 policy/modules/services/munin.te                    |   77 
 policy/modules/services/mysql.fc                    |    3 
 policy/modules/services/mysql.if                    |  128 +
 policy/modules/services/mysql.te                    |   53 
 policy/modules/services/nagios.fc                   |   11 
 policy/modules/services/nagios.if                   |   71 
 policy/modules/services/nagios.te                   |   58 
 policy/modules/services/networkmanager.fc           |   12 
 policy/modules/services/networkmanager.if           |   18 
 policy/modules/services/networkmanager.te           |  106 -
 policy/modules/services/nis.fc                      |    6 
 policy/modules/services/nis.if                      |  126 +
 policy/modules/services/nis.te                      |   27 
 policy/modules/services/nscd.fc                     |    1 
 policy/modules/services/nscd.if                     |  126 +
 policy/modules/services/nscd.te                     |   32 
 policy/modules/services/ntp.if                      |   57 
 policy/modules/services/ntp.te                      |   19 
 policy/modules/services/nx.fc                       |    4 
 policy/modules/services/oddjob.fc                   |    2 
 policy/modules/services/oddjob.if                   |   32 
 policy/modules/services/oddjob.te                   |   28 
 policy/modules/services/openvpn.fc                  |    1 
 policy/modules/services/openvpn.if                  |   36 
 policy/modules/services/openvpn.te                  |   19 
 policy/modules/services/pads.fc                     |   12 
 policy/modules/services/pads.if                     |   10 
 policy/modules/services/pads.te                     |   68 
 policy/modules/services/pcscd.fc                    |    1 
 policy/modules/services/pcscd.te                    |   12 
 policy/modules/services/pegasus.te                  |   28 
 policy/modules/services/pingd.fc                    |   11 
 policy/modules/services/pingd.if                    |   99 +
 policy/modules/services/pingd.te                    |   54 
 policy/modules/services/pki.fc                      |   46 
 policy/modules/services/pki.if                      |  643 ++++++
 policy/modules/services/pki.te                      |   91 
 policy/modules/services/polkit.fc                   |    9 
 policy/modules/services/polkit.if                   |  233 ++
 policy/modules/services/polkit.te                   |  235 ++
 policy/modules/services/portmap.te                  |    1 
 policy/modules/services/portreserve.fc              |   12 
 policy/modules/services/portreserve.if              |   70 
 policy/modules/services/portreserve.te              |   55 
 policy/modules/services/postfix.fc                  |    6 
 policy/modules/services/postfix.if                  |  136 +
 policy/modules/services/postfix.te                  |  134 +
 policy/modules/services/postgresql.fc               |    1 
 policy/modules/services/postgresql.if               |   43 
 policy/modules/services/postgresql.te               |   12 
 policy/modules/services/postgrey.fc                 |    4 
 policy/modules/services/postgrey.if                 |   67 
 policy/modules/services/postgrey.te                 |   19 
 policy/modules/services/ppp.fc                      |    6 
 policy/modules/services/ppp.if                      |   64 
 policy/modules/services/ppp.te                      |   38 
 policy/modules/services/prelude.fc                  |   14 
 policy/modules/services/prelude.if                  |   71 
 policy/modules/services/prelude.te                  |  193 ++
 policy/modules/services/privoxy.fc                  |    2 
 policy/modules/services/privoxy.if                  |   12 
 policy/modules/services/privoxy.te                  |   17 
 policy/modules/services/procmail.fc                 |    3 
 policy/modules/services/procmail.if                 |   38 
 policy/modules/services/procmail.te                 |   35 
 policy/modules/services/psad.fc                     |   17 
 policy/modules/services/psad.if                     |  304 +++
 policy/modules/services/psad.te                     |  107 +
 policy/modules/services/pyzor.fc                    |    6 
 policy/modules/services/pyzor.if                    |   61 
 policy/modules/services/pyzor.te                    |   51 
 policy/modules/services/qmail.te                    |    8 
 policy/modules/services/radius.te                   |    3 
 policy/modules/services/radvd.te                    |    2 
 policy/modules/services/razor.fc                    |    4 
 policy/modules/services/razor.if                    |   87 
 policy/modules/services/razor.te                    |   38 
 policy/modules/services/ricci.te                    |   18 
 policy/modules/services/rlogin.te                   |   16 
 policy/modules/services/roundup.fc                  |    2 
 policy/modules/services/roundup.if                  |   38 
 policy/modules/services/roundup.te                  |    3 
 policy/modules/services/rpc.fc                      |    1 
 policy/modules/services/rpc.if                      |   43 
 policy/modules/services/rpc.te                      |   33 
 policy/modules/services/rpcbind.fc                  |    2 
 policy/modules/services/rpcbind.te                  |    3 
 policy/modules/services/rshd.te                     |   17 
 policy/modules/services/rsync.fc                    |    2 
 policy/modules/services/rsync.te                    |   11 
 policy/modules/services/samba.fc                    |    8 
 policy/modules/services/samba.if                    |  387 ++++
 policy/modules/services/samba.te                    |  209 +-
 policy/modules/services/sasl.te                     |    5 
 policy/modules/services/sendmail.if                 |  103 +
 policy/modules/services/sendmail.te                 |   92 
 policy/modules/services/setroubleshoot.fc           |    2 
 policy/modules/services/setroubleshoot.if           |   48 
 policy/modules/services/setroubleshoot.te           |   31 
 policy/modules/services/smartmon.te                 |   12 
 policy/modules/services/snmp.fc                     |    6 
 policy/modules/services/snmp.if                     |   36 
 policy/modules/services/snmp.te                     |   28 
 policy/modules/services/snort.if                    |    9 
 policy/modules/services/snort.te                    |    9 
 policy/modules/services/spamassassin.fc             |   16 
 policy/modules/services/spamassassin.if             |  472 ++--
 policy/modules/services/spamassassin.te             |  220 ++
 policy/modules/services/squid.fc                    |    4 
 policy/modules/services/squid.if                    |   18 
 policy/modules/services/squid.te                    |    8 
 policy/modules/services/ssh.fc                      |    2 
 policy/modules/services/ssh.if                      |  151 +
 policy/modules/services/ssh.te                      |   43 
 policy/modules/services/stunnel.fc                  |    1 
 policy/modules/services/stunnel.te                  |    3 
 policy/modules/services/sysstat.te                  |    2 
 policy/modules/services/telnet.te                   |    4 
 policy/modules/services/tftp.te                     |    1 
 policy/modules/services/tor.te                      |    2 
 policy/modules/services/ulogd.fc                    |   10 
 policy/modules/services/ulogd.if                    |  127 +
 policy/modules/services/ulogd.te                    |   54 
 policy/modules/services/uucp.fc                     |    7 
 policy/modules/services/uucp.te                     |   14 
 policy/modules/services/virt.fc                     |    1 
 policy/modules/services/virt.if                     |   94 
 policy/modules/services/virt.te                     |   47 
 policy/modules/services/w3c.te                      |    7 
 policy/modules/services/xserver.fc                  |   40 
 policy/modules/services/xserver.if                  |  915 +++++++--
 policy/modules/services/xserver.te                  |  317 +++
 policy/modules/services/zebra.te                    |    2 
 policy/modules/services/zosremote.fc                |    2 
 policy/modules/services/zosremote.if                |   52 
 policy/modules/services/zosremote.te                |   36 
 policy/modules/system/application.te                |    6 
 policy/modules/system/authlogin.fc                  |   10 
 policy/modules/system/authlogin.if                  |  212 ++
 policy/modules/system/authlogin.te                  |   46 
 policy/modules/system/fstools.fc                    |    2 
 policy/modules/system/fstools.te                    |    9 
 policy/modules/system/hostname.te                   |    4 
 policy/modules/system/init.fc                       |    5 
 policy/modules/system/init.if                       |  129 +
 policy/modules/system/init.te                       |  114 +
 policy/modules/system/ipsec.fc                      |    3 
 policy/modules/system/ipsec.te                      |   47 
 policy/modules/system/iptables.fc                   |   16 
 policy/modules/system/iptables.te                   |   13 
 policy/modules/system/iscsi.te                      |    4 
 policy/modules/system/libraries.fc                  |   90 
 policy/modules/system/libraries.te                  |   18 
 policy/modules/system/locallogin.te                 |   26 
 policy/modules/system/logging.fc                    |   11 
 policy/modules/system/logging.if                    |   25 
 policy/modules/system/logging.te                    |   18 
 policy/modules/system/lvm.fc                        |    2 
 policy/modules/system/lvm.te                        |   66 
 policy/modules/system/miscfiles.if                  |   39 
 policy/modules/system/modutils.te                   |   40 
 policy/modules/system/mount.fc                      |    8 
 policy/modules/system/mount.if                      |   21 
 policy/modules/system/mount.te                      |   81 
 policy/modules/system/raid.te                       |    4 
 policy/modules/system/selinuxutil.fc                |   10 
 policy/modules/system/selinuxutil.if                |  373 +++
 policy/modules/system/selinuxutil.te                |  229 --
 policy/modules/system/setrans.if                    |   20 
 policy/modules/system/sysnetwork.fc                 |   15 
 policy/modules/system/sysnetwork.if                 |   82 
 policy/modules/system/sysnetwork.te                 |   72 
 policy/modules/system/udev.fc                       |    4 
 policy/modules/system/udev.if                       |   28 
 policy/modules/system/udev.te                       |   16 
 policy/modules/system/unconfined.fc                 |   34 
 policy/modules/system/unconfined.if                 |  300 +++
 policy/modules/system/unconfined.te                 |  209 +-
 policy/modules/system/userdomain.fc                 |    9 
 policy/modules/system/userdomain.if                 | 1899 ++++++++++++++------
 policy/modules/system/userdomain.te                 |   89 
 policy/modules/system/xen.fc                        |    6 
 policy/modules/system/xen.if                        |   50 
 policy/modules/system/xen.te                        |  127 +
 policy/policy_capabilities                          |    2 
 policy/support/obj_perm_sets.spt                    |   74 
 policy/users                                        |   13 
 support/Makefile.devel                              |    3 
 456 files changed, 22281 insertions(+), 3612 deletions(-)

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- policy-20080710.patch	3 Sep 2009 14:30:21 -0000	1.178
+++ policy-20080710.patch	17 Sep 2009 15:18:24 -0000	1.179
@@ -28998,7 +28998,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.13/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/spamassassin.te	2009-06-11 12:21:25.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.te	2009-09-17 16:43:19.000000000 +0200
 @@ -21,16 +21,24 @@
  gen_tunable(spamd_enable_home_dirs, true)
  
@@ -29073,12 +29073,13 @@ diff --exclude-from=exclude -N -u -r nsa
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -81,12 +105,21 @@
+@@ -81,12 +105,22 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
 -read_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
 +manage_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
++manage_lnk_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
  
  manage_dirs_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
  manage_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
@@ -29096,7 +29097,7 @@ diff --exclude-from=exclude -N -u -r nsa
  kernel_read_all_sysctls(spamd_t)
  kernel_read_system_state(spamd_t)
  
-@@ -118,6 +151,7 @@
+@@ -118,6 +152,7 @@
  dev_read_urand(spamd_t)
  
  fs_getattr_all_fs(spamd_t)
@@ -29104,7 +29105,7 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_search_auto_mountpoints(spamd_t)
  
  auth_dontaudit_read_shadow(spamd_t)
-@@ -134,6 +168,8 @@
+@@ -134,6 +169,8 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -29113,7 +29114,7 @@ diff --exclude-from=exclude -N -u -r nsa
  libs_use_ld_so(spamd_t)
  libs_use_shared_libs(spamd_t)
  
-@@ -141,20 +177,33 @@
+@@ -141,20 +178,33 @@
  
  miscfiles_read_localization(spamd_t)
  
@@ -29152,7 +29153,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -172,6 +221,7 @@
+@@ -172,6 +222,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -29160,7 +29161,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -181,10 +231,6 @@
+@@ -181,10 +232,6 @@
  ')
  
  optional_policy(`
@@ -29171,7 +29172,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	postfix_read_config(spamd_t)
  ')
  
-@@ -199,6 +245,10 @@
+@@ -199,6 +246,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -29182,7 +29183,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -211,5 +261,144 @@
+@@ -211,5 +262,144 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -p -r1.806 -r1.807
--- selinux-policy.spec	3 Sep 2009 14:30:22 -0000	1.806
+++ selinux-policy.spec	17 Sep 2009 15:18:27 -0000	1.807
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 71%{?dist}
+Release: 72%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -462,6 +462,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 17 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-72
+- Allow spamd to read spamd_var_lib_t symlinks
+
 * Thu Sep 3 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-71
 - Allow postgresql to send audit messages
 



From rdieter at fedoraproject.org  Thu Sep 17 15:19:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 15:19:25 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.59,1.60 macros.cmake,1.5,1.6
Message-ID: <20090917151925.F2A6B11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20748

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.4-4
- macro.cmake: prefixes cmake with the package being builts bindir (#523878)



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- cmake.spec	24 Jul 2009 19:10:45 -0000	1.59
+++ cmake.spec	17 Sep 2009 15:19:25 -0000	1.60
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -132,6 +132,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.4-4
+- macro.cmake: prefixes cmake with the package being builts bindir (#523878)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/macros.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- macros.cmake	16 Mar 2009 16:20:14 -0000	1.5
+++ macros.cmake	17 Sep 2009 15:19:25 -0000	1.6
@@ -4,7 +4,7 @@
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
 %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %_cmake_version @@CMAKE_VERSION@@
-%__cmake %{_bindir}/cmake
+%__cmake /usr/bin/cmake
 
 %cmake \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \



From limb at fedoraproject.org  Thu Sep 17 15:26:41 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Sep 2009 15:26:41 +0000 (UTC)
Subject: rpms/atanks/devel .cvsignore, 1.7, 1.8 atanks.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20090917152641.0984611C00CE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/atanks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23911

Modified Files:
	.cvsignore atanks.spec sources 
Log Message:
3.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atanks/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jun 2009 14:36:19 -0000	1.7
+++ .cvsignore	17 Sep 2009 15:26:40 -0000	1.8
@@ -1 +1 @@
-atanks-3.7-stable.tar.gz
+atanks-3.9.tar.gz


Index: atanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atanks/devel/atanks.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- atanks.spec	24 Jul 2009 17:27:55 -0000	1.10
+++ atanks.spec	17 Sep 2009 15:26:40 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           atanks
-Version:        3.7
-Release:        2%{?dist}
+Version:        3.9
+Release:        1%{?dist}
 Summary:        Remake of a classic DOS game "Scorched Earth"
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://atanks.sourceforge.net/
-Source0:        http://download.sourceforge.net/atanks/atanks-%{version}-stable.tar.gz
+Source0:        http://download.sourceforge.net/atanks/atanks-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, desktop-file-utils
@@ -33,7 +33,7 @@ mkdir -p -m 0755 \
     $RPM_BUILD_ROOT%{_bindir} \
     $RPM_BUILD_ROOT%{_datadir}/pixmaps \
     $RPM_BUILD_ROOT%{_datadir}/applications
-install -p -m 0644 *.dat *.txt $RPM_BUILD_ROOT%{_datadir}/games/atanks/
+install -p -m 0644 *.txt $RPM_BUILD_ROOT%{_datadir}/games/atanks/
 install -p -m 0755 atanks $RPM_BUILD_ROOT%{_bindir}/
 install -p -m 0644 atanks.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Jon Ciesla <limb at jcomserv.net> - 3.9-1
+- Upstream 3.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atanks/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jun 2009 14:36:19 -0000	1.7
+++ sources	17 Sep 2009 15:26:40 -0000	1.8
@@ -1 +1 @@
-f8c4271abe2b56d48f16599ce47d5ddc  atanks-3.7-stable.tar.gz
+bc5a6d016161d3cedde909f38a805db5  atanks-3.9.tar.gz



From veillard at fedoraproject.org  Thu Sep 17 15:30:58 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 17 Sep 2009 15:30:58 +0000 (UTC)
Subject: rpms/libxslt/devel .cvsignore, 1.33, 1.34 libxslt.spec, 1.58,
	1.59 sources, 1.34, 1.35 libexslt-rc4.patch, 1.1, NONE
Message-ID: <20090917153058.03F6411C0332@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25390

Modified Files:
	.cvsignore libxslt.spec sources 
Removed Files:
	libexslt-rc4.patch 
Log Message:
libxslt-1.1.25 upstream release, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	13 May 2008 16:15:41 -0000	1.33
+++ .cvsignore	17 Sep 2009 15:30:57 -0000	1.34
@@ -13,3 +13,4 @@ libxslt-1.1.21.tar.gz
 libxslt-1.1.22.tar.gz
 libxslt-1.1.23.tar.gz
 libxslt-1.1.24.tar.gz
+libxslt-1.1.25.tar.gz


Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/libxslt.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- libxslt.spec	25 Jul 2009 08:59:30 -0000	1.58
+++ libxslt.spec	17 Sep 2009 15:30:57 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
-Version: 1.1.24
-Release: 5%{?dist}%{?extra_release}
+Version: 1.1.25
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,7 +15,6 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libexslt-rc4.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -57,7 +56,6 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %configure
@@ -105,6 +103,11 @@ rm -fr %{buildroot}
 %doc doc/EXSLT/libexslt-refs.xml
 %doc %{_mandir}/man3/libxslt.3*
 %doc %{_mandir}/man3/libexslt.3*
+%doc doc/*.html doc/html doc/*.gif doc/*.png
+%doc doc/images
+%doc doc/tutorial
+%doc doc/tutorial2
+%doc doc/EXSLT
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/*.sh
@@ -127,6 +130,12 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.24-1
+- release of 1.1.25
+- Add API versioning  for libxslt shared library
+- xsl:sort lang support using the locale
+- many bug fixes
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.24-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	13 May 2008 16:15:41 -0000	1.34
+++ sources	17 Sep 2009 15:30:57 -0000	1.35
@@ -1 +1 @@
-e83ec5d27fc4c10c6f612879bea9a153  libxslt-1.1.24.tar.gz
+50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz


--- libexslt-rc4.patch DELETED ---



From behdad at fedoraproject.org  Thu Sep 17 15:31:38 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu, 17 Sep 2009 15:31:38 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.84, 1.85 sources, 1.85, 1.86 vte.spec, 
	1.158, 1.159
Message-ID: <20090917153138.C217711C00CE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25705

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Thu Sep 17 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.6-1 
- Update to 0.21.6 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	8 Sep 2009 15:49:02 -0000	1.84
+++ .cvsignore	17 Sep 2009 15:31:37 -0000	1.85
@@ -1 +1 @@
-vte-0.21.5.tar.bz2
+vte-0.21.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	8 Sep 2009 15:49:02 -0000	1.85
+++ sources	17 Sep 2009 15:31:37 -0000	1.86
@@ -1 +1 @@
-9b4d97dfc40e4f77b7ecf2e9e89da368  vte-0.21.5.tar.bz2
+75e32d277831dfa85d2a44d39628be15  vte-0.21.6.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- vte.spec	8 Sep 2009 15:49:02 -0000	1.158
+++ vte.spec	17 Sep 2009 15:31:37 -0000	1.159
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.5
+Version: 0.21.6
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.6-1
+- Update to 0.21.6
+
 * Tue Sep  8 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.5-1
 - Update to 0.21.5
 



From mhlavink at fedoraproject.org  Thu Sep 17 15:35:46 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 17 Sep 2009 15:35:46 +0000 (UTC)
Subject: rpms/squirrelmail/devel .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 squirrelmail.spec, 1.76, 1.77
Message-ID: <20090917153546.A9D2911C00CE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28199

Modified Files:
	.cvsignore sources squirrelmail.spec 
Log Message:
* Thu Sep 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20-0.rc2.20090917
- updated to 1.4.20RC2 20090917 snapshot
- fix searching in emails (#523016)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	19 Aug 2009 11:15:35 -0000	1.28
+++ .cvsignore	17 Sep 2009 15:35:46 -0000	1.29
@@ -1,2 +1,2 @@
 all_locales-1.4.13-20071220.tar.bz2
-squirrelmail-1.4.20-RC2.tar.bz2
+squirrelmail-1.4.20-RC2_20090917.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	19 Aug 2009 11:15:35 -0000	1.28
+++ sources	17 Sep 2009 15:35:46 -0000	1.29
@@ -1,2 +1,2 @@
 c6463312afcd602ae60fd8f388dfb8c2  all_locales-1.4.13-20071220.tar.bz2
-94015fb018cb2165fdfb3c41fd2b8065  squirrelmail-1.4.20-RC2.tar.bz2
+e1828757b34c658a061b009da311f1df  squirrelmail-1.4.20-RC2_20090917.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- squirrelmail.spec	19 Aug 2009 11:15:35 -0000	1.76
+++ squirrelmail.spec	17 Sep 2009 15:35:46 -0000	1.77
@@ -6,11 +6,11 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.20
-Release: 0.rc2%{?dist}
+Release: 0.rc2.20090917%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}-RC2.tar.bz2
+Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}-RC2_20090917.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Thu Sep 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20-0.rc2.20090917
+- updated to 1.4.20RC2 20090917 snapshot
+- fix searching in emails (#523016)
+
 * Wed Aug 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20RC2-1
 - updated to 1.4.20RC2
 



From pkgdb at fedoraproject.org  Thu Sep 17 15:36:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:36:38 +0000
Subject: [pkgdb] irqbalance had acl change status
Message-ID: <20090917153635.259D910F88C@bastion2.fedora.phx.redhat.com>

nhorman has set the watchcommits acl on irqbalance (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/irqbalance



From wtogami at fedoraproject.org  Thu Sep 17 15:36:57 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 15:36:57 +0000 (UTC)
Subject: rpms/perl-Net-DNS/devel .cvsignore, 1.15, 1.16 perl-Net-DNS.spec,
	1.45, 1.46 sources, 1.15, 1.16 perl-Net-DNS-bz437681.patch, 1.2,
	NONE perl-Net-DNS-upstream.patch, 1.1, NONE
Message-ID: <20090917153657.2998411C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Net-DNS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28717

Modified Files:
	.cvsignore perl-Net-DNS.spec sources 
Removed Files:
	perl-Net-DNS-bz437681.patch perl-Net-DNS-upstream.patch 
Log Message:
0.65



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DNS/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Mar 2008 09:09:14 -0000	1.15
+++ .cvsignore	17 Sep 2009 15:36:56 -0000	1.16
@@ -1 +1 @@
-Net-DNS-0.63.tar.gz
+Net-DNS-0.65.tar.gz


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- perl-Net-DNS.spec	26 Jul 2009 13:39:41 -0000	1.45
+++ perl-Net-DNS.spec	17 Sep 2009 15:36:57 -0000	1.46
@@ -1,12 +1,11 @@
 Name: perl-Net-DNS
-Version: 0.63
-Release: 6%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Summary: DNS resolver modules for Perl
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://www.net-dns.org/
 Source0: http://www.cpan.org/authors/id/O/OL/OLAF/Net-DNS-%{version}.tar.gz
-Patch0: perl-Net-DNS-upstream.patch
 BuildRequires: perl(Digest::HMAC), perl(ExtUtils::MakeMaker), perl(Test::More), perl(Net::IP)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Digest::BubbleBabble)
@@ -36,7 +35,6 @@ objects.
 
 %prep
 %setup -q -n Net-DNS-%{version} 
-%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor --no-online-tests
@@ -82,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 0.65-1
+- 0.65
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DNS/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Mar 2008 09:09:14 -0000	1.15
+++ sources	17 Sep 2009 15:36:57 -0000	1.16
@@ -1 +1 @@
-c46aad24af44d424a972bb59c3aa5f37  Net-DNS-0.63.tar.gz
+54e5a12a20de39b954a93723927ac789  Net-DNS-0.65.tar.gz


--- perl-Net-DNS-bz437681.patch DELETED ---


--- perl-Net-DNS-upstream.patch DELETED ---



From limb at fedoraproject.org  Thu Sep 17 15:38:28 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Sep 2009 15:38:28 +0000 (UTC)
Subject: rpms/atanks/F-11 atanks.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20090917153828.CE7B211C00CE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/atanks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29302

Modified Files:
	atanks.spec sources 
Log Message:
3.9



Index: atanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atanks/F-11/atanks.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- atanks.spec	27 Jun 2009 14:36:18 -0000	1.9
+++ atanks.spec	17 Sep 2009 15:38:28 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           atanks
-Version:        3.7
+Version:        3.9
 Release:        1%{?dist}
 Summary:        Remake of a classic DOS game "Scorched Earth"
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://atanks.sourceforge.net/
-Source0:        http://download.sourceforge.net/atanks/atanks-%{version}-stable.tar.gz
+Source0:        http://download.sourceforge.net/atanks/atanks-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, desktop-file-utils
@@ -33,7 +33,7 @@ mkdir -p -m 0755 \
     $RPM_BUILD_ROOT%{_bindir} \
     $RPM_BUILD_ROOT%{_datadir}/pixmaps \
     $RPM_BUILD_ROOT%{_datadir}/applications
-install -p -m 0644 *.dat *.txt $RPM_BUILD_ROOT%{_datadir}/games/atanks/
+install -p -m 0644 *.txt $RPM_BUILD_ROOT%{_datadir}/games/atanks/
 install -p -m 0755 atanks $RPM_BUILD_ROOT%{_bindir}/
 install -p -m 0644 atanks.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
@@ -56,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Jon Ciesla <limb at jcomserv.net> - 3.9-1
+- Upstream 3.9
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 27 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 3.7-1
 - Upstream 3.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atanks/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jun 2009 14:36:18 -0000	1.7
+++ sources	17 Sep 2009 15:38:28 -0000	1.8
@@ -1 +1 @@
-f8c4271abe2b56d48f16599ce47d5ddc  atanks-3.7-stable.tar.gz
+bc5a6d016161d3cedde909f38a805db5  atanks-3.9.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 15:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:40:35 +0000
Subject: [pkgdb] python-setuptools (Fedora EPEL, 4) updated by toshio
Message-ID: <20090917154035.1E23710F886@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on python-setuptools (Fedora devel) for lmacken
toshio approved watchcommits on python-setuptools (Fedora devel) for lmacken
toshio approved commit on python-setuptools (Fedora devel) for lmacken
toshio approved build on python-setuptools (Fedora devel) for lmacken
toshio approved approveacls on python-setuptools (Fedora devel) for lmacken

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 15:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:40:35 +0000
Subject: [pkgdb] python-setuptools (Fedora EPEL, 4) updated by toshio
Message-ID: <20090917154035.264B310F88C@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on python-setuptools (Fedora 11) for lmacken
toshio approved watchcommits on python-setuptools (Fedora 11) for lmacken
toshio approved commit on python-setuptools (Fedora 11) for lmacken
toshio approved build on python-setuptools (Fedora 11) for lmacken
toshio approved approveacls on python-setuptools (Fedora 11) for lmacken

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 15:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:40:35 +0000
Subject: [pkgdb] python-setuptools (Fedora EPEL, 4) updated by toshio
Message-ID: <20090917154035.431A510F898@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on python-setuptools (Fedora 10) for lmacken
toshio approved watchcommits on python-setuptools (Fedora 10) for lmacken
toshio approved commit on python-setuptools (Fedora 10) for lmacken
toshio approved build on python-setuptools (Fedora 10) for lmacken
toshio approved approveacls on python-setuptools (Fedora 10) for lmacken

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From pkgdb at fedoraproject.org  Thu Sep 17 15:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 15:40:35 +0000
Subject: [pkgdb] python-setuptools (Fedora EPEL, 4) updated by toshio
Message-ID: <20090917154035.4E2BB10F89B@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on python-setuptools (Fedora EPEL 4) for lmacken
toshio approved watchcommits on python-setuptools (Fedora EPEL 4) for lmacken
toshio approved commit on python-setuptools (Fedora EPEL 4) for lmacken
toshio approved build on python-setuptools (Fedora EPEL 4) for lmacken
toshio approved approveacls on python-setuptools (Fedora EPEL 4) for lmacken

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-setuptools



From kyle at fedoraproject.org  Thu Sep 17 15:41:26 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 15:41:26 +0000 (UTC)
Subject: rpms/kernel/F-12 ppc-hates-my-family-and-swore-revenge.patch, NONE, 
	1.1 kernel.spec, 1.1811, 1.1812
Message-ID: <20090917154126.8ACB411C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30398

Modified Files:
	kernel.spec 
Added Files:
	ppc-hates-my-family-and-swore-revenge.patch 
Log Message:
* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com>
- ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
  checker filter thing.


ppc-hates-my-family-and-swore-revenge.patch:
 prom_init_check.sh |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE ppc-hates-my-family-and-swore-revenge.patch ---
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 1ac136b..2e1d820 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -52,12 +52,18 @@ do
 	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
 		OK=1
 	fi
+	if [ "${UNDEF:0:9}" = "_restgpr0_" ]; then
+		OK=1
+	fi
 	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
 		OK=1
 	fi
 	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
 		OK=1
 	fi
+	if [ "${UNDEF:0:9}" = "_savegpr0_" ]; then
+		OK=1
+	fi
 	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
 		OK=1
 	fi


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -p -r1.1811 -r1.1812
--- kernel.spec	17 Sep 2009 14:49:58 -0000	1.1811
+++ kernel.spec	17 Sep 2009 15:41:25 -0000	1.1812
@@ -745,6 +745,8 @@ Patch12012: linux-2.6-rtc-show-hctosys.p
 Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
+Patch13000: ppc-hates-my-family-and-swore-revenge.patch 
+
 # patches headed for -stable
 
 # scsi oops fixes
@@ -1399,6 +1401,8 @@ ApplyPatch linux-2.6-rtc-show-hctosys.pa
 ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
+ApplyPatch ppc-hates-my-family-and-swore-revenge.patch 
+
 # patches headed for -stable
 
 # scsi oops fixes
@@ -2063,6 +2067,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com>
+- ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
+  checker filter thing.
+
 * Wed Sep 17 2009 John W. Linville <linville at redhat.com>
 - Add a few more iwl1000 support patches.
 - Remove support for deprecated iwl6000 parts.



From mauelsha at fedoraproject.org  Thu Sep 17 15:43:47 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 15:43:47 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.102,1.103
Message-ID: <20090917154347.3828511C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31279

Modified Files:
	dmraid.spec 
Log Message:
Revert static build try


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- dmraid.spec	17 Sep 2009 15:16:05 -0000	1.102
+++ dmraid.spec	17 Sep 2009 15:43:47 -0000	1.103
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -66,11 +66,7 @@ Device failure reporting has to be activ
 %patch0 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led --disable-testing
-make DESTDIR=$RPM_BUILD_ROOT
-mv tools/dmraid tools/dmraid.static
-make clean
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_linko --enable-led --enable-intel_led --disable-testing
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
 %install



From pbrobinson at fedoraproject.org  Thu Sep 17 15:50:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 15:50:25 +0000 (UTC)
Subject: rpms/nbtk/devel .cvsignore, 1.6, 1.7 nbtk.spec, 1.24, 1.25 sources, 
	1.6, 1.7
Message-ID: <20090917155025.162F811C0337@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1712

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.1.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Sep 2009 22:40:56 -0000	1.6
+++ .cvsignore	17 Sep 2009 15:50:24 -0000	1.7
@@ -1 +1 @@
-nbtk-1.1.2.tar.bz2
+nbtk-1.1.4.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nbtk.spec	14 Sep 2009 22:40:57 -0000	1.24
+++ nbtk.spec	17 Sep 2009 15:50:24 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           nbtk
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-1
+- New upstream 1.1.4 release
+
 * Mon Sep 12 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.2-2
 - Add new source file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Sep 2009 22:40:58 -0000	1.6
+++ sources	17 Sep 2009 15:50:24 -0000	1.7
@@ -1 +1 @@
-2750817ea5115c87f5ab6de1c8b174d3  nbtk-1.1.2.tar.bz2
+b881126274a687b000ab7b84780c5f84  nbtk-1.1.4.tar.bz2



From harald at fedoraproject.org  Thu Sep 17 15:54:00 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 17 Sep 2009 15:54:00 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.12, 1.13 dracut.spec, 1.27,
	1.28 sources, 1.13, 1.14
Message-ID: <20090917155400.AA2C311C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3504

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Sep 17 2009 Harald Hoyer <harald at redhat.com> 002-1
- version 002
- set correct PATH
- workaround for broken mdmon implementation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Sep 2009 10:29:32 -0000	1.12
+++ .cvsignore	17 Sep 2009 15:54:00 -0000	1.13
@@ -1 +1 @@
-dracut-001-0f7e10ce.tar.bz2
+dracut-002.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- dracut.spec	17 Sep 2009 10:29:32 -0000	1.27
+++ dracut.spec	17 Sep 2009 15:54:00 -0000	1.28
@@ -1,4 +1,3 @@
-%define gittag 0f7e10ce
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -13,8 +12,8 @@
 %endif
 
 Name: dracut
-Version: 001
-Release: 12%{?rdist}
+Version: 002
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Sep 17 2009 Harald Hoyer <harald at redhat.com> 002-1
+- version 002
+- set correct PATH
+- workaround for broken mdmon implementation
+
 * Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-12
 - removed lvm/mdraid/dmraid lock files
 - add missing ifname= files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 Sep 2009 10:29:32 -0000	1.13
+++ sources	17 Sep 2009 15:54:00 -0000	1.14
@@ -1 +1 @@
-20f127543003896e26c7db6ecc664c92  dracut-001-0f7e10ce.tar.bz2
+6d900fb6b685d163a2fec063c9ab62e3  dracut-002.tar.bz2



From harald at fedoraproject.org  Thu Sep 17 15:54:19 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 17 Sep 2009 15:54:19 +0000 (UTC)
Subject: rpms/dracut/F-11 dracut.spec,1.12,1.13 sources,1.11,1.12
Message-ID: <20090917155419.916DE11C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3752

Modified Files:
	dracut.spec sources 
Log Message:
* Thu Sep 17 2009 Harald Hoyer <harald at redhat.com> 002-1
- version 002
- set correct PATH
- workaround for broken mdmon implementation



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dracut.spec	17 Sep 2009 11:06:09 -0000	1.12
+++ dracut.spec	17 Sep 2009 15:54:19 -0000	1.13
@@ -1,4 +1,3 @@
-%define gittag 0f7e10ce
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -13,8 +12,8 @@
 %endif
 
 Name: dracut
-Version: 001
-Release: 12%{?rdist}
+Version: 002
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Sep 17 2009 Harald Hoyer <harald at redhat.com> 002-1
+- version 002
+- set correct PATH
+- workaround for broken mdmon implementation
+
 * Wed Sep 16 2009 Harald Hoyer <harald at redhat.com> 001-12
 - removed lvm/mdraid/dmraid lock files
 - add missing ifname= files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Sep 2009 11:06:10 -0000	1.11
+++ sources	17 Sep 2009 15:54:19 -0000	1.12
@@ -1 +1 @@
-20f127543003896e26c7db6ecc664c92  dracut-001-0f7e10ce.tar.bz2
+6d900fb6b685d163a2fec063c9ab62e3  dracut-002.tar.bz2



From kyle at fedoraproject.org  Thu Sep 17 16:01:22 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 16:01:22 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1812,1.1813
Message-ID: <20090917160122.8599911C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6336

Modified Files:
	kernel.spec 
Log Message:
kill trailing whitespace on patch lines


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1812
retrieving revision 1.1813
diff -u -p -r1.1812 -r1.1813
--- kernel.spec	17 Sep 2009 15:41:25 -0000	1.1812
+++ kernel.spec	17 Sep 2009 16:01:20 -0000	1.1813
@@ -745,7 +745,7 @@ Patch12012: linux-2.6-rtc-show-hctosys.p
 Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
-Patch13000: ppc-hates-my-family-and-swore-revenge.patch 
+Patch13000: ppc-hates-my-family-and-swore-revenge.patch
 
 # patches headed for -stable
 
@@ -1401,7 +1401,7 @@ ApplyPatch linux-2.6-rtc-show-hctosys.pa
 ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
-ApplyPatch ppc-hates-my-family-and-swore-revenge.patch 
+ApplyPatch ppc-hates-my-family-and-swore-revenge.patch
 
 # patches headed for -stable
 



From mauelsha at fedoraproject.org  Thu Sep 17 16:01:36 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 16:01:36 +0000 (UTC)
Subject: rpms/dmraid/F-10 dmraid-1.0.0.rc16-test_devices.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 dmraid.spec, 1.90, 1.91 sources, 1.23, 1.24
Message-ID: <20090917160136.3A66811C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6443

Modified Files:
	.cvsignore dmraid.spec sources 
Added Files:
	dmraid-1.0.0.rc16-test_devices.patch 
Log Message:
Update to 1.0.0.rc16

dmraid-1.0.0.rc16-test_devices.patch:
 configure         | 2763 ++++++++++++++++++++++++++++++------------------------
 configure.in      |   10 
 lib/device/scan.c |    2 
 3 files changed, 1572 insertions(+), 1203 deletions(-)

--- NEW FILE dmraid-1.0.0.rc16-test_devices.patch ---
diff --git a/configure.in.test_devices b/configure.in
index 8b0ad90..74fd27f 100644
--- a/configure.in.test_devices
+++ b/configure.in
@@ -133,8 +133,9 @@ AC_ARG_ENABLE(shared_lib,
 
 echo $ac_n "checking whether to disable testing with mapped devices""... $ac_c" 1>&6
 dnl Disable testing with mapped devices
-AC_ARG_ENABLE(testing, [  --disable-testing       Disable testing with mapped devices],  \
-DMRAID_TEST=no, DMRAID_TEST=yes)
+AC_ARG_ENABLE(testing, [  --disable-testing        Enable testing with mapped devices],  \
+DMRAID_TEST=$enableval, DMRAID_TEST=yes)
+
 
 echo "$ac_t""$DEBUG" 1>&6
 
@@ -165,6 +166,10 @@ if test x$DMRAID_LED = xyes; then
         CFLAGS="$CFLAGS -DDMRAID_LED"
 fi
 
+if test x$DMRAID_TEST = xyes; then
+        CFLAGS="$CFLAGS -DDMRAID_TEST"
+fi
+
 if test x$DMRAID_INTEL_LED = xyes; then
         CFLAGS="$CFLAGS -DDMRAID_LED -DDMRAID_INTEL_LED"
 fi
@@ -229,7 +234,6 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CLDFLAGS)
 AC_SUBST(DEBUG)
 AC_SUBST(DEBUG_MALLOC)
-AC_SUBST(DMRAID_TEST)
 AC_SUBST(DMRAID_VERSION)
 AC_SUBST(DMRAID_LIB_VERSION)
 AC_SUBST(DIETLIBC)
diff --git a/configure.test_devices b/configure
index f0194d6..995ebb2 100755
--- a/configure.test_devices
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
[...5023 lines suppressed...]
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -6646,7 +6992,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6672,7 +7018,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -6681,7 +7027,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6702,17 +7048,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -6752,12 +7098,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -6766,13 +7113,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -6786,15 +7134,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -6804,21 +7153,28 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -6833,6 +7189,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -6854,4 +7215,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/lib/device/scan.c.test_devices b/lib/device/scan.c
index 2d06fa4..ec727b2 100644
--- a/lib/device/scan.c.test_devices
+++ b/lib/device/scan.c
@@ -87,7 +87,7 @@ dm_test_device(struct lib_context *lc, char *path)
 	struct stat s;
 
 	return !lstat(path, &s) &&
-		S_ISLNK(s.st_mode) &&
+/*		S_ISLNK(s.st_mode) && */ /* No symlinks any more. */
 		!strncmp(get_basename(lc, path), "dm-", 3);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	25 Sep 2008 14:17:12 -0000	1.13
+++ .cvsignore	17 Sep 2009 16:01:34 -0000	1.14
@@ -1,2 +1,3 @@
 dmraid-1.0.0.rc14.tar.bz2
 dmraid-1.0.0.rc15.tar.bz2
+dmraid-1.0.0.rc16.tar.bz2


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-10/dmraid.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- dmraid.spec	19 Nov 2008 01:58:18 -0000	1.90
+++ dmraid.spec	17 Sep 2009 16:01:34 -0000	1.91
@@ -1,93 +1,137 @@
-Summary: Device-mapper RAID tool and library
+#
+# Copyright (C)  Heinz Mauelshagen, 2004-2009 Red Hat GmbH. All rights reserved.
+#
+# See file LICENSE at the top of this source tree for license information.
+#
+
+Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
-Version: 1.0.0.rc15
-Release: 2%{?dist}
+Version: 1.0.0.rc16
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
-Patch0: dmraid-1.0.0.rc15-whitespace.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
-Requires: kpartx
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: device-mapper-devel >= 1.02.02-2
+BuildRequires: device-mapper-event-devel
+BuildRequires: libselinux-devel
+BuildRequires: libsepol-devel
 Requires: device-mapper >= 1.02.02-2
+Requires: dmraid-events
+Requires: kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
+Patch0:	dmraid-1.0.0.rc16-test_devices.patch
+
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
 Linux >= 2.4 using device-mapper.
 
-%package devel
-Summary: Development libraries and headers for dmraid
+%package -n dmraid-devel
+Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
 License: GPLv2+
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
 
-%description devel
+%description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
-RAID set activation, creation, removal, rebuild and display of
-properties for ATARAID/DDF1 metadata.
+RAID set activation and display of properties for ATARAID volumes.
 
-%package libs
-Summary: Shared library for RAID device discovery
-Group: System Environment/Libraries
-License: GPLv2+
+%package -n dmraid-events
+Summary: dmevent_tool (Device-mapper event tool) and DSO
+Group: System Environment/Base
+Requires: dmraid = %{version}-%{release}, sgpio
 
-%description libs
-This package contains the dmraid shared library, libdmraid.
+%description -n dmraid-events
+Provides a dmeventd DSO and the dmevent_tool to register devices with it
+for device monitoring.  All active RAID sets should be manually registered
+with dmevent_tool.
+
+%package -n dmraid-events-logwatch
+Summary: dmraid logwatch-based email reporting
+Group: System Environment/Base
+Requires: dmraid-events = %{version}-%{release}, logwatch, /etc/cron.d
+
+%description -n dmraid-events-logwatch
+Provides device failure reporting via logwatch-based email reporting.
+Device failure reporting has to be activated manually by activating the 
+/etc/cron.d/dmeventd-logwatch entry and by calling the dmevent_tool
+(see manual page for examples) for any active RAID sets.
 
 %prep
 %setup -q -n dmraid/%{version}
-pwd
 %patch0 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
-make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid}
+install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
 make DESTDIR=$RPM_BUILD_ROOT install
 ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
+
+# Provide convenience link from dmevent_tool
+(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# if requested, install the dso
+# If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
 install -m 755 lib/libdmraid.so \
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
+install -m 755 lib/libdmraid-events-isw.so \
+	$RPM_BUILD_ROOT%{_libdir}/libdmraid-events-isw.so.%{version}
+(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so)
+
+# Install logwatch config file and script for dmeventd
+install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
+install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
+install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT/etc/cron.d/dmeventd-logwatch
+install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
- 
-%postun libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
-/%{_mandir}/man8/dmraid.8.gz
+/%{_mandir}/man8/dmraid*
 /sbin/dmraid
 /sbin/dmraid.static
+%{_libdir}/libdmraid.so*
+%{_libdir}/libdmraid-events-isw.so*
 /var/lock/dmraid
 
-%files devel
+%files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
-%{_includedir}/dmraid/*.h
-%attr(755,root,root) %{_libdir}/libdmraid.so
+%{_includedir}/dmraid/*
 
-%files libs
-%attr(755,root,root) %{_libdir}/libdmraid.so.*
+%files -n dmraid-events
+%defattr(-,root,root)
+/%{_mandir}/man8/dmevent_tool*
+/sbin/dmevent_tool
+/sbin/dm_dso_reg_tool
+
+%files -n dmraid-events-logwatch
+%defattr(-,root,root)
+%config(noreplace) /etc/logwatch/*
+%config(noreplace) /etc/cron.d/dmeventd-logwatch
+%ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Thu Sep 17 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-1
+- Update to version 1.0.0.rc16-1
+
 * Tue Nov 18 2008 Bill Nottingham <notting at redhat.com> - 1.0.0.rc15-2
 - Re-add upstream whitespace removal patch (#468649, #470634)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 Sep 2008 14:17:12 -0000	1.23
+++ sources	17 Sep 2009 16:01:34 -0000	1.24
@@ -1 +1,2 @@
 2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
+32832c1dfd7e72cd4355490322fca68a  dmraid-1.0.0.rc16.tar.bz2



From wtogami at fedoraproject.org  Thu Sep 17 16:04:08 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 16:04:08 +0000 (UTC)
Subject: rpms/perl-libwww-perl/devel .cvsignore, 1.15,
	1.16 perl-libwww-perl.spec, 1.34, 1.35 sources, 1.15, 1.16
Message-ID: <20090917160408.4033911C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-libwww-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7978

Modified Files:
	.cvsignore perl-libwww-perl.spec sources 
Log Message:
5.831



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	16 Feb 2009 17:50:04 -0000	1.15
+++ .cvsignore	17 Sep 2009 16:04:07 -0000	1.16
@@ -1 +1 @@
-libwww-perl-5.825.tar.gz
+libwww-perl-5.831.tar.gz


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- perl-libwww-perl.spec	23 Aug 2009 20:41:39 -0000	1.34
+++ perl-libwww-perl.spec	17 Sep 2009 16:04:07 -0000	1.35
@@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.831-1
+* Thu Sep 17 2009 Warren Togami <cweyl at alumni.drew.edu> 5.831-1
 - update to 5.831
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.825-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Feb 2009 17:50:04 -0000	1.15
+++ sources	17 Sep 2009 16:04:08 -0000	1.16
@@ -1 +1 @@
-9b383739e58ac8f8234487e62d5c2818  libwww-perl-5.825.tar.gz
+b46737b11a050330dc27db8cb5f9e01f  libwww-perl-5.831.tar.gz



From veillard at fedoraproject.org  Thu Sep 17 16:09:21 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 17 Sep 2009 16:09:21 +0000 (UTC)
Subject: rpms/libxslt/F-11 libxslt.spec, 1.57, 1.58 sources, 1.34,
	1.35 libexslt-rc4.patch, 1.1, NONE
Message-ID: <20090917160921.1A72811C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9534

Modified Files:
	libxslt.spec sources 
Removed Files:
	libexslt-rc4.patch 
Log Message:
upstream release of 1.1.25, Daniel



Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-11/libxslt.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- libxslt.spec	25 Feb 2009 20:12:19 -0000	1.57
+++ libxslt.spec	17 Sep 2009 16:09:20 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
-Version: 1.1.24
-Release: 4%{?dist}%{?extra_release}
+Version: 1.1.25
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,7 +15,6 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libexslt-rc4.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -57,7 +56,6 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %configure
@@ -105,6 +103,11 @@ rm -fr %{buildroot}
 %doc doc/EXSLT/libexslt-refs.xml
 %doc %{_mandir}/man3/libxslt.3*
 %doc %{_mandir}/man3/libexslt.3*
+%doc doc/*.html doc/html doc/*.gif doc/*.png
+%doc doc/images
+%doc doc/tutorial
+%doc doc/tutorial2
+%doc doc/EXSLT
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/*.sh
@@ -127,6 +130,16 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-1
+- release of 1.1.25
+- Add API versioning  for libxslt shared library
+- xsl:sort lang support using the locale
+- many bug fixes
+
+* Thu Aug 13 2009 Daniel Veillard <veillard at redhat.com> 1.1.24-5.fc11
+- fix for gnome bug #305913 global variables need to be mutexed
+- http://bugzilla.gnome.org/show_bug.cgi?id=305913
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.24-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	13 May 2008 16:15:41 -0000	1.34
+++ sources	17 Sep 2009 16:09:20 -0000	1.35
@@ -1 +1 @@
-e83ec5d27fc4c10c6f612879bea9a153  libxslt-1.1.24.tar.gz
+50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz


--- libexslt-rc4.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 17 16:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:10:48 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917161045.62BF310F886@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora devel is now owned by guidograzioli

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 16:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:10:55 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917161052.45E6910F867@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 11 is now owned by guidograzioli

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 16:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:10:54 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917161056.3D15010F894@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora 10 is now owned by guidograzioli

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Sep 17 16:11:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:11:07 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090917161104.9094A10F867@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora EPEL 5 is now owned by guidograzioli

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From wtogami at fedoraproject.org  Thu Sep 17 16:11:36 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 16:11:36 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.26, 1.27 ltsp.spec, 1.35, 1.36 sources,
	1.30, 1.31
Message-ID: <20090917161136.4829D11C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10305

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
Fix dracut install yet again, requires dracut-002



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	2 Sep 2009 03:32:17 -0000	1.26
+++ .cvsignore	17 Sep 2009 16:11:34 -0000	1.27
@@ -1 +1 @@
-ltsp-5.1.84.tar.bz2
+ltsp-5.1.86.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ltsp.spec	2 Sep 2009 03:32:17 -0000	1.35
+++ ltsp.spec	17 Sep 2009 16:11:34 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.84
-%define _datestamp .20090422.23
+Version:        5.1.86
+%define _datestamp .20090917.06
 #Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -412,6 +412,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 5.1.86-1
+- Fix dracut install yet again, requires dracut-002
+
 * Tue Sep 01 2009 Warren Togami <wtogami at redhat.com> - 5.1.84-1
 - minimal effort to make it install and boot F-12
 - fix pulsesaudio launching in F-12


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	2 Sep 2009 03:32:17 -0000	1.30
+++ sources	17 Sep 2009 16:11:34 -0000	1.31
@@ -1 +1 @@
-0c91d280068b832933561b40ad55553e  ltsp-5.1.84.tar.bz2
+cbe186d980e51542f9564d8ac4f019e3  ltsp-5.1.86.tar.bz2



From veillard at fedoraproject.org  Thu Sep 17 16:13:26 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 17 Sep 2009 16:13:26 +0000 (UTC)
Subject: rpms/libxslt/F-10 libxslt.spec, 1.55, 1.56 sources, 1.34,
	1.35 libexslt-rc4.patch, 1.1, NONE
Message-ID: <20090917161326.1850011C00CE@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11321

Modified Files:
	libxslt.spec sources 
Removed Files:
	libexslt-rc4.patch 
Log Message:
Upstream release of 1.1.25, Daniel



Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-10/libxslt.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libxslt.spec	8 Oct 2008 14:02:19 -0000	1.55
+++ libxslt.spec	17 Sep 2009 16:13:24 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
-Version: 1.1.24
-Release: 2%{?dist}%{?extra_release}
+Version: 1.1.25
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,7 +15,6 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libexslt-rc4.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -57,7 +56,6 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %configure
@@ -105,6 +103,11 @@ rm -fr %{buildroot}
 %doc doc/EXSLT/libexslt-refs.xml
 %doc %{_mandir}/man3/libxslt.3*
 %doc %{_mandir}/man3/libexslt.3*
+%doc doc/*.html doc/html doc/*.gif doc/*.png
+%doc doc/images
+%doc doc/tutorial
+%doc doc/tutorial2
+%doc doc/EXSLT
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/*.sh
@@ -127,6 +130,12 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-1
+- release of 1.1.25
+- Add API versioning  for libxslt shared library
+- xsl:sort lang support using the locale
+- many bug fixes
+
 * Wed Oct  8 2008 Daniel Veillard <veillard at redhat.com> 1.1.24-2.fc10
 - CVE-2008-2935 fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	13 May 2008 16:15:41 -0000	1.34
+++ sources	17 Sep 2009 16:13:25 -0000	1.35
@@ -1 +1 @@
-e83ec5d27fc4c10c6f612879bea9a153  libxslt-1.1.24.tar.gz
+50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz


--- libexslt-rc4.patch DELETED ---



From kyle at fedoraproject.org  Thu Sep 17 16:15:38 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 16:15:38 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1813,1.1814
Message-ID: <20090917161538.0D0B511C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12427

Modified Files:
	kernel.spec 
Log Message:
fix -fno-var-tracking-assignments fix to be call cc-option'd


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -p -r1.1813 -r1.1814
--- kernel.spec	17 Sep 2009 16:01:20 -0000	1.1813
+++ kernel.spec	17 Sep 2009 16:15:37 -0000	1.1814
@@ -1503,7 +1503,7 @@ BuildKernel() {
 
     cat >> Makefile <<\EOF
 # XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += -fno-var-tracking-assignments
+KBUILD_CFLAGS += $(call cc-option,-fno-var-tracking-assignments)
 EOF
 
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:02 +0000
Subject: [pkgdb] scala: robmv has requested watchbugzilla
Message-ID: <20090917161659.239E810F886@bastion2.fedora.phx.redhat.com>

robmv has requested the watchbugzilla acl on scala (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:06 +0000
Subject: [pkgdb] scala: robmv has requested watchcommits
Message-ID: <20090917161702.9F90F10F88C@bastion2.fedora.phx.redhat.com>

robmv has requested the watchcommits acl on scala (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:05 +0000
Subject: [pkgdb] scala: robmv has requested commit
Message-ID: <20090917161704.B308010F895@bastion2.fedora.phx.redhat.com>

robmv has requested the commit acl on scala (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:10 +0000
Subject: [pkgdb] scala: robmv has requested approveacls
Message-ID: <20090917161706.D670B10F89A@bastion2.fedora.phx.redhat.com>

robmv has requested the approveacls acl on scala (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:18 +0000
Subject: [pkgdb] scala: robmv has requested watchbugzilla
Message-ID: <20090917161717.4FABB10F89C@bastion2.fedora.phx.redhat.com>

robmv has requested the watchbugzilla acl on scala (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:20 +0000
Subject: [pkgdb] scala: robmv has requested watchcommits
Message-ID: <20090917161719.8A00510F8A1@bastion2.fedora.phx.redhat.com>

robmv has requested the watchcommits acl on scala (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:24 +0000
Subject: [pkgdb] scala: robmv has requested commit
Message-ID: <20090917161721.5BB4D10F8A4@bastion2.fedora.phx.redhat.com>

robmv has requested the commit acl on scala (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 17 16:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 16:17:22 +0000
Subject: [pkgdb] scala: robmv has requested approveacls
Message-ID: <20090917161723.BA25E10F894@bastion2.fedora.phx.redhat.com>

robmv has requested the approveacls acl on scala (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scala



From kyle at fedoraproject.org  Thu Sep 17 16:22:45 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 16:22:45 +0000 (UTC)
Subject: rpms/kernel/F-12 ppc-hates-my-family-and-swore-revenge.patch, 1.1,
	1.2
Message-ID: <20090917162245.CBA4411C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15789

Modified Files:
	ppc-hates-my-family-and-swore-revenge.patch 
Log Message:
denoobify kyle

ppc-hates-my-family-and-swore-revenge.patch:
 prom_init_check.sh |    6 ++++++
 1 file changed, 6 insertions(+)

Index: ppc-hates-my-family-and-swore-revenge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/ppc-hates-my-family-and-swore-revenge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppc-hates-my-family-and-swore-revenge.patch	17 Sep 2009 15:41:26 -0000	1.1
+++ ppc-hates-my-family-and-swore-revenge.patch	17 Sep 2009 16:22:45 -0000	1.2
@@ -1,12 +1,12 @@
 diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
-index 1ac136b..2e1d820 100644
+index 1ac136b..9f82f49 100644
 --- a/arch/powerpc/kernel/prom_init_check.sh
 +++ b/arch/powerpc/kernel/prom_init_check.sh
 @@ -52,12 +52,18 @@ do
  	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
  		OK=1
  	fi
-+	if [ "${UNDEF:0:9}" = "_restgpr0_" ]; then
++	if [ "${UNDEF:0:10}" = "_restgpr0_" ]; then
 +		OK=1
 +	fi
  	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
@@ -15,7 +15,7 @@ index 1ac136b..2e1d820 100644
  	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
  		OK=1
  	fi
-+	if [ "${UNDEF:0:9}" = "_savegpr0_" ]; then
++	if [ "${UNDEF:0:10}" = "_savegpr0_" ]; then
 +		OK=1
 +	fi
  	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then



From kyle at fedoraproject.org  Thu Sep 17 16:26:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 16:26:52 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1814,1.1815
Message-ID: <20090917162652.AFFE911C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17388

Modified Files:
	kernel.spec 
Log Message:
* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-29
- ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
  checker filter thing. (properly this time.)
- fix no-vta CFLAGS to work on older compilers.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1814
retrieving revision 1.1815
diff -u -p -r1.1814 -r1.1815
--- kernel.spec	17 Sep 2009 16:15:37 -0000	1.1814
+++ kernel.spec	17 Sep 2009 16:26:52 -0000	1.1815
@@ -2067,9 +2067,10 @@ fi
 # and build.
 
 %changelog
-* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com>
+* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-29
 - ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
-  checker filter thing.
+  checker filter thing. (properly this time.)
+- fix no-vta CFLAGS to work on older compilers.
 
 * Wed Sep 17 2009 John W. Linville <linville at redhat.com>
 - Add a few more iwl1000 support patches.



From salimma at fedoraproject.org  Thu Sep 17 16:28:45 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 17 Sep 2009 16:28:45 +0000 (UTC)
Subject: rpms/banshee/devel .cvsignore, 1.27, 1.28 banshee.spec, 1.80,
	1.81 sources, 1.27, 1.28 banshee-clutter10.patch, 1.1, NONE
Message-ID: <20090917162845.C471311C00CE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18085

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	banshee-clutter10.patch 
Log Message:
* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.3.git20090917%{?dist}
- Update to latest snapshot
- Drop clutter10 patch (fixed upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	31 Aug 2009 22:31:00 -0000	1.27
+++ .cvsignore	17 Sep 2009 16:28:45 -0000	1.28
@@ -1 +1 @@
-banshee-20090831.tar.bz2
+banshee-20090917.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- banshee.spec	31 Aug 2009 21:20:45 -0000	1.80
+++ banshee.spec	17 Sep 2009 16:28:45 -0000	1.81
@@ -1,11 +1,11 @@
 %define mono_shared %{_builddir}/%{?buildsubdir}
 
-%define gitdate   20090831
-%define gitcommit f5c708c3adf2b30a26c62ca5f266ff0b5448d458
+%define gitdate   20090917
+%define gitcommit ba071454ef6eb6022e9eb24bcb9a29f042ddb40f
 
 Name:    banshee
 Version: 1.5.1
-Release: 0.2.git%{gitdate}%{?dist}
+Release: 0.3.git%{gitdate}%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -18,8 +18,6 @@ Source0: %{name}-%{gitdate}.tar.bz2
 Source1: README.Fedora
 # for snapshots only: don't run configure at the end of autogen.sh
 Patch0:  %{name}-noconf.patch
-# clutter's .pc filename has changed
-Patch1:  %{name}-clutter10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -128,7 +126,6 @@ developing applications that use %{name}
 %prep
 %setup -q -n %{name}-%{gitdate}
 %patch0 -p1 -b .noconf
-%patch1 -p1 -b .clutter10
 cp -p %{SOURCE1} .
 
 %build
@@ -216,6 +213,10 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.3.git20090917%{?dist}
+- Update to latest snapshot
+- Drop clutter10 patch (fixed upstream)
+
 * Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.2.git20090831%{?dist}
 - Build with clutter support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	31 Aug 2009 22:31:00 -0000	1.27
+++ sources	17 Sep 2009 16:28:45 -0000	1.28
@@ -1 +1 @@
-c7623c82ff1ba3edf5b80901b9433a35  banshee-20090831.tar.bz2
+632954b2869b4713466128e219856979  banshee-20090917.tar.bz2


--- banshee-clutter10.patch DELETED ---



From mauelsha at fedoraproject.org  Thu Sep 17 16:31:35 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 16:31:35 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.103,1.104
Message-ID: <20090917163135.326E011C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19101

Modified Files:
	dmraid.spec 
Log Message:
Date typo


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- dmraid.spec	17 Sep 2009 15:43:47 -0000	1.103
+++ dmraid.spec	17 Sep 2009 16:31:34 -0000	1.104
@@ -130,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
-* Thu Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
+* Wed Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
 - Update to version 1.0.0.rc16
 
 * Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7



From mauelsha at fedoraproject.org  Thu Sep 17 16:31:59 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 17 Sep 2009 16:31:59 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.107,1.108
Message-ID: <20090917163159.AFA4611C00CE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19414

Modified Files:
	dmraid.spec 
Log Message:
Date typo


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- dmraid.spec	17 Sep 2009 15:11:30 -0000	1.107
+++ dmraid.spec	17 Sep 2009 16:31:59 -0000	1.108
@@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
-* Thu Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
+* Wed Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
 - Update to version 1.0.0.rc16
 
 * Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7



From mlichvar at fedoraproject.org  Thu Sep 17 16:32:36 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 17 Sep 2009 16:32:36 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.36, 1.37 sources, 1.36,
	1.37 xterm.spec, 1.77, 1.78
Message-ID: <20090917163236.41D5011C00CE@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19714

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 248



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	1 Sep 2009 12:05:18 -0000	1.36
+++ .cvsignore	17 Sep 2009 16:32:35 -0000	1.37
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-247.tgz
+xterm-248.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	1 Sep 2009 12:05:18 -0000	1.36
+++ sources	17 Sep 2009 16:32:36 -0000	1.37
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-ef73f7f1eb8c863c51f2bfac1f55efd1  xterm-247.tgz
+70771a21fbc54a79f68374cebb49935a  xterm-248.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- xterm.spec	1 Sep 2009 12:05:18 -0000	1.77
+++ xterm.spec	17 Sep 2009 16:32:36 -0000	1.78
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 247
+Version: 248
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Sep 17 2009 Miroslav Lichvar <mlichvar at redhat.com> 248-1
+- update to 248
+
 * Tue Sep 01 2009 Miroslav Lichvar <mlichvar at redhat.com> 247-1
 - update to 247
 



From hadess at fedoraproject.org  Thu Sep 17 16:36:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 16:36:17 +0000 (UTC)
Subject: rpms/gupnp-av/devel gupnp-av.spec,1.14,1.15
Message-ID: <20090917163617.B672211C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21483

Modified Files:
	gupnp-av.spec 
Log Message:
fix filelist


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/gupnp-av.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gupnp-av.spec	17 Sep 2009 13:29:36 -0000	1.14
+++ gupnp-av.spec	17 Sep 2009 16:36:17 -0000	1.15
@@ -69,8 +69,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_libdir}/libgupnp-av-1.0.so.1
-%{_libdir}/libgupnp-av-1.0.so.1.0.0
+%{_libdir}/libgupnp-av-1.0.so.*
 
 %files devel
 %defattr(-,root,root,-)



From pbrobinson at fedoraproject.org  Thu Sep 17 16:37:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 16:37:06 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.25,1.26 sources,1.7,1.8
Message-ID: <20090917163706.5114011C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21927

Modified Files:
	nbtk.spec sources 
Log Message:
- A few minor fixes


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- nbtk.spec	17 Sep 2009 15:50:24 -0000	1.25
+++ nbtk.spec	17 Sep 2009 16:37:05 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-2
+- A few minor fixes
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-1
 - New upstream 1.1.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Sep 2009 15:50:24 -0000	1.7
+++ sources	17 Sep 2009 16:37:06 -0000	1.8
@@ -1 +1 @@
-b881126274a687b000ab7b84780c5f84  nbtk-1.1.4.tar.bz2
+09900da8376a652f9ab4039390dcb311  nbtk-1.1.4.tar.bz2



From pbrobinson at fedoraproject.org  Thu Sep 17 16:42:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 16:42:53 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.7, 1.8 mutter-moblin.spec,
	1.8, 1.9 sources, 1.7, 1.8 mutter-moblin-verfix.patch, 1.1, NONE
Message-ID: <20090917164253.A75FB11C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23881

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Removed Files:
	mutter-moblin-verfix.patch 
Log Message:
- New 0.38.2 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	14 Sep 2009 22:28:55 -0000	1.7
+++ .cvsignore	17 Sep 2009 16:42:53 -0000	1.8
@@ -1 +1 @@
-mutter-moblin-0.38.0.tar.bz2
+mutter-moblin-0.38.2.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mutter-moblin.spec	14 Sep 2009 22:28:55 -0000	1.8
+++ mutter-moblin.spec	17 Sep 2009 16:42:53 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.38.0
+Version:        0.38.2
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -7,7 +7,6 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:         mutter-moblin-verfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -40,7 +39,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .verfix
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -80,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.38.2-1
+- New 0.38.2 upstream release
+
 * Mon Sep 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.38.0-1
 - New 0.38.0 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Sep 2009 22:28:55 -0000	1.7
+++ sources	17 Sep 2009 16:42:53 -0000	1.8
@@ -1 +1 @@
-aad20db3f904b58f9198e0c8435e578b  mutter-moblin-0.38.0.tar.bz2
+3c3a93dc55494abfbd27afb0ea886d35  mutter-moblin-0.38.2.tar.bz2


--- mutter-moblin-verfix.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Sep 17 16:44:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 16:44:34 +0000 (UTC)
Subject: rpms/mutter-moblin/devel import.log,1.1,NONE
Message-ID: <20090917164434.E66C811C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24393

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Thu Sep 17 16:47:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 16:47:35 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.26,1.27
Message-ID: <20090917164735.B982811C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25341

Modified Files:
	nbtk.spec 
Log Message:
- Fix translation naming


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nbtk.spec	17 Sep 2009 16:37:05 -0000	1.26
+++ nbtk.spec	17 Sep 2009 16:47:35 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -60,7 +60,7 @@ make install DESTDIR=%{buildroot} INSTAL
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%find_lang %{name}-1.0
+%find_lang %{name}-1.2
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +69,7 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}-1.0.lang
+%files -f %{name}-1.2.lang
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_bindir}/nbtk-create-image-cache
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-3
+- Fix translation naming
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-2
 - A few minor fixes
 



From mdehaan at fedoraproject.org  Thu Sep 17 16:51:30 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:51:30 +0000 (UTC)
Subject: rpms/koan/EL-4 dead.package,NONE,1.1
Message-ID: <20090917165130.8DD5811C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/pkgs/rpms/koan/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27124/EL-4

Added Files:
	dead.package 
Log Message:
The koan package is now generated by cobbler's CVS/specfile/tarball so we
no longer need a seperate place for koan in CVS.




--- NEW FILE dead.package ---
The koan RPM is now merged with cobbler's spec.



From mdehaan at fedoraproject.org  Thu Sep 17 16:51:30 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:51:30 +0000 (UTC)
Subject: rpms/koan/EL-5 dead.package,NONE,1.1
Message-ID: <20090917165130.C05EA11C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/pkgs/rpms/koan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27124/EL-5

Added Files:
	dead.package 
Log Message:
The koan package is now generated by cobbler's CVS/specfile/tarball so we
no longer need a seperate place for koan in CVS.




--- NEW FILE dead.package ---
The koan RPM is now merged with cobbler's spec.



From mdehaan at fedoraproject.org  Thu Sep 17 16:51:31 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:51:31 +0000 (UTC)
Subject: rpms/koan/F-11 dead.package,NONE,1.1
Message-ID: <20090917165131.3B00F11C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/pkgs/rpms/koan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27124/F-11

Added Files:
	dead.package 
Log Message:
The koan package is now generated by cobbler's CVS/specfile/tarball so we
no longer need a seperate place for koan in CVS.




--- NEW FILE dead.package ---
The koan RPM is now merged with cobbler's spec.



From mdehaan at fedoraproject.org  Thu Sep 17 16:51:31 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:51:31 +0000 (UTC)
Subject: rpms/koan/devel dead.package,NONE,1.1
Message-ID: <20090917165131.7A82D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/pkgs/rpms/koan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27124/devel

Added Files:
	dead.package 
Log Message:
The koan package is now generated by cobbler's CVS/specfile/tarball so we
no longer need a seperate place for koan in CVS.




--- NEW FILE dead.package ---
The koan RPM is now merged with cobbler's spec.



From mdehaan at fedoraproject.org  Thu Sep 17 16:51:31 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:51:31 +0000 (UTC)
Subject: rpms/koan/F-10 dead.package,NONE,1.1
Message-ID: <20090917165131.118C711C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/pkgs/rpms/koan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27124/F-10

Added Files:
	dead.package 
Log Message:
The koan package is now generated by cobbler's CVS/specfile/tarball so we
no longer need a seperate place for koan in CVS.




--- NEW FILE dead.package ---
The koan RPM is now merged with cobbler's spec.



From pbrobinson at fedoraproject.org  Thu Sep 17 16:51:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 16:51:43 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.4,
	1.5 moblin-panel-myzone.spec, 1.4, 1.5 sources, 1.4,
	1.5 import.log, 1.2, NONE
Message-ID: <20090917165143.BA09C11C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27387

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Removed Files:
	import.log 
Log Message:
- New upstream 0.0.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Sep 2009 16:56:03 -0000	1.4
+++ .cvsignore	17 Sep 2009 16:51:43 -0000	1.5
@@ -1 +1 @@
-moblin-panel-myzone-0.0.5.tar.bz2
+moblin-panel-myzone-0.0.6.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-panel-myzone.spec	14 Sep 2009 16:56:03 -0000	1.4
+++ moblin-panel-myzone.spec	17 Sep 2009 16:51:43 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.5
+Version:        0.0.6
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
+- New upstream 0.0.6 release
+
 * Mon Sep 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
 - New upstream 0.0.5 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Sep 2009 16:56:03 -0000	1.4
+++ sources	17 Sep 2009 16:51:43 -0000	1.5
@@ -1 +1 @@
-a45b2bfb6a6d118427f20ec9d57ede98  moblin-panel-myzone-0.0.5.tar.bz2
+4845cab659b86c7c7e14476c42b7d7b1  moblin-panel-myzone-0.0.6.tar.bz2


--- import.log DELETED ---



From mdehaan at fedoraproject.org  Thu Sep 17 16:54:09 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:54:09 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.57, 1.58 cobbler.spec, 1.72,
	1.73 sources, 1.71, 1.72
Message-ID: <20090917165409.43B6411C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is cobbler 2.0.  Note that this now generates 3 packages -- cobbler, koan, and cobbler-web.   Previously cobbler-web was part of the cobbler package and koan was generated by a seperate entry in the build system CVS.  Now they are all ruled by cobbler.spec (see dead.package file in koan's CVS).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	12 Jun 2009 20:17:10 -0000	1.57
+++ .cvsignore	17 Sep 2009 16:54:08 -0000	1.58
@@ -54,3 +54,4 @@ cobbler-1.6.3.tar.gz
 cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
+cobbler-2.0.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- cobbler.spec	12 Jun 2009 20:17:10 -0000	1.72
+++ cobbler.spec	17 Sep 2009 16:54:08 -0000	1.73
@@ -1,19 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define _binaries_in_noarch_packages_terminate_build 0
 %global debug_package %{nil}
 Summary: Boot server configurator
 Name: cobbler
+License: GPLv2+
 AutoReq: no
-Version: 1.6.6
+Version: 2.0.0
 Release: 1%{?dist}
-Source0: %{name}-%{version}.tar.gz
-License: GPLv2+
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
+Requires: python(abi) >= %{pyver}
 %endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
-%endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,19 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,39 +93,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -137,8 +153,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -148,15 +165,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
-%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -165,10 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -178,7 +195,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{_bindir}/cobblerd
 
 %defattr(-,root,root)
-%dir /usr/share/cobbler
 %dir /etc/cobbler
 %dir /etc/cobbler/pxe
 %dir /etc/cobbler/reporting
@@ -193,24 +209,21 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
 %config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%config(noreplace) /etc/apache2/conf.d/cobbler_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -261,29 +274,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -296,62 +289,95 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
 
-%changelog
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.6-1
-- Placeholder for future release
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Fri May 8 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.4-1
-- Upstream changes (see CHANGELOG)
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
-- Upstream changes (see CHANGELOG)
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
+%description -n koan
 
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation 
+of an existing system.  For use with a boot-server configured with Cobbler
 
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
 
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
 
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
+%package -n cobbler-web
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
+Summary: Web interface for Cobbler
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
+%description -n cobbler-web
 
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
 
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%dir /usr/share/cobbler/web/cobbler_web
+/usr/share/cobbler/web/cobbler_web/*
+#%dir /usr/share/cobbler/web/cobbler_web/templates
+#/usr/share/cobbler/web/cobbler_web/templates/*
+/etc/httpd/conf.d/cobbler_web.conf
+%dir /usr/share/cobbler/web/sessions
+%dir /var/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
+%changelog
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
+* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
+- First release with unified spec files
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	12 Jun 2009 20:17:10 -0000	1.71
+++ sources	17 Sep 2009 16:54:08 -0000	1.72
@@ -1,3 +1,4 @@
 0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
 524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
+5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz



From mdehaan at fedoraproject.org  Thu Sep 17 16:54:09 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:54:09 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.61, 1.62 cobbler.spec, 1.74,
	1.75 sources, 1.74, 1.75
Message-ID: <20090917165409.8576911C00EC@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is cobbler 2.0.  Note that this now generates 3 packages -- cobbler, koan, and cobbler-web.   Previously cobbler-web was part of the cobbler package and koan was generated by a seperate entry in the build system CVS.  Now they are all ruled by cobbler.spec (see dead.package file in koan's CVS).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	12 Jun 2009 20:17:10 -0000	1.61
+++ .cvsignore	17 Sep 2009 16:54:09 -0000	1.62
@@ -58,3 +58,4 @@ cobbler-1.6.3.tar.gz
 cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
+cobbler-2.0.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- cobbler.spec	12 Jun 2009 20:17:10 -0000	1.74
+++ cobbler.spec	17 Sep 2009 16:54:09 -0000	1.75
@@ -1,19 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define _binaries_in_noarch_packages_terminate_build 0
 %global debug_package %{nil}
 Summary: Boot server configurator
 Name: cobbler
+License: GPLv2+
 AutoReq: no
-Version: 1.6.6
+Version: 2.0.0
 Release: 1%{?dist}
-Source0: %{name}-%{version}.tar.gz
-License: GPLv2+
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
+Requires: python(abi) >= %{pyver}
 %endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
-%endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,19 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,39 +93,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -137,8 +153,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -148,15 +165,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
-%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -165,10 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -178,7 +195,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{_bindir}/cobblerd
 
 %defattr(-,root,root)
-%dir /usr/share/cobbler
 %dir /etc/cobbler
 %dir /etc/cobbler/pxe
 %dir /etc/cobbler/reporting
@@ -193,24 +209,21 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
 %config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%config(noreplace) /etc/apache2/conf.d/cobbler_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -261,29 +274,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -296,62 +289,95 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
 
-%changelog
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.6-1
-- Placeholder for future release
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Fri May 8 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.4-1
-- Upstream changes (see CHANGELOG)
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
-- Upstream changes (see CHANGELOG)
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
+%description -n koan
 
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation 
+of an existing system.  For use with a boot-server configured with Cobbler
 
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
 
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
 
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
+%package -n cobbler-web
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
+Summary: Web interface for Cobbler
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
+%description -n cobbler-web
 
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
 
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%dir /usr/share/cobbler/web/cobbler_web
+/usr/share/cobbler/web/cobbler_web/*
+#%dir /usr/share/cobbler/web/cobbler_web/templates
+#/usr/share/cobbler/web/cobbler_web/templates/*
+/etc/httpd/conf.d/cobbler_web.conf
+%dir /usr/share/cobbler/web/sessions
+%dir /var/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
+%changelog
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
+* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
+- First release with unified spec files
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	12 Jun 2009 20:17:10 -0000	1.74
+++ sources	17 Sep 2009 16:54:09 -0000	1.75
@@ -1,3 +1,4 @@
 0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
 524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
+5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz



From mdehaan at fedoraproject.org  Thu Sep 17 16:54:10 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:54:10 +0000 (UTC)
Subject: rpms/cobbler/F-11 .cvsignore, 1.56, 1.57 cobbler.spec, 1.82,
	1.83 sources, 1.71, 1.72
Message-ID: <20090917165410.79DC711C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985/F-11

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is cobbler 2.0.  Note that this now generates 3 packages -- cobbler, koan, and cobbler-web.   Previously cobbler-web was part of the cobbler package and koan was generated by a seperate entry in the build system CVS.  Now they are all ruled by cobbler.spec (see dead.package file in koan's CVS).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-11/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	12 Jun 2009 20:17:11 -0000	1.56
+++ .cvsignore	17 Sep 2009 16:54:09 -0000	1.57
@@ -53,3 +53,4 @@ cobbler-1.6.2.tar.gz
 cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
+cobbler-2.0.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-11/cobbler.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- cobbler.spec	12 Jun 2009 20:17:11 -0000	1.82
+++ cobbler.spec	17 Sep 2009 16:54:10 -0000	1.83
@@ -1,19 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define _binaries_in_noarch_packages_terminate_build 0
 %global debug_package %{nil}
 Summary: Boot server configurator
 Name: cobbler
+License: GPLv2+
 AutoReq: no
-Version: 1.6.6
+Version: 2.0.0
 Release: 1%{?dist}
-Source0: %{name}-%{version}.tar.gz
-License: GPLv2+
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
+Requires: python(abi) >= %{pyver}
 %endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
-%endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,19 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,39 +93,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -137,8 +153,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -148,15 +165,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
-%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -165,10 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -178,7 +195,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{_bindir}/cobblerd
 
 %defattr(-,root,root)
-%dir /usr/share/cobbler
 %dir /etc/cobbler
 %dir /etc/cobbler/pxe
 %dir /etc/cobbler/reporting
@@ -193,24 +209,21 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
 %config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%config(noreplace) /etc/apache2/conf.d/cobbler_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -261,29 +274,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -296,62 +289,95 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
 
-%changelog
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.6-1
-- Placeholder for future release
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Fri May 8 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.4-1
-- Upstream changes (see CHANGELOG)
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
-- Upstream changes (see CHANGELOG)
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
+%description -n koan
 
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation 
+of an existing system.  For use with a boot-server configured with Cobbler
 
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
 
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
 
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
+%package -n cobbler-web
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
+Summary: Web interface for Cobbler
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
+%description -n cobbler-web
 
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
 
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%dir /usr/share/cobbler/web/cobbler_web
+/usr/share/cobbler/web/cobbler_web/*
+#%dir /usr/share/cobbler/web/cobbler_web/templates
+#/usr/share/cobbler/web/cobbler_web/templates/*
+/etc/httpd/conf.d/cobbler_web.conf
+%dir /usr/share/cobbler/web/sessions
+%dir /var/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
+%changelog
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
+* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
+- First release with unified spec files
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-11/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	12 Jun 2009 20:17:11 -0000	1.71
+++ sources	17 Sep 2009 16:54:10 -0000	1.72
@@ -1,3 +1,4 @@
 0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
 524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
+5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz



From mdehaan at fedoraproject.org  Thu Sep 17 16:54:10 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:54:10 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.57, 1.58 cobbler.spec, 1.86,
	1.87 sources, 1.73, 1.74
Message-ID: <20090917165410.C8F7611C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is cobbler 2.0.  Note that this now generates 3 packages -- cobbler, koan, and cobbler-web.   Previously cobbler-web was part of the cobbler package and koan was generated by a seperate entry in the build system CVS.  Now they are all ruled by cobbler.spec (see dead.package file in koan's CVS).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	12 Jun 2009 20:17:11 -0000	1.57
+++ .cvsignore	17 Sep 2009 16:54:10 -0000	1.58
@@ -54,3 +54,4 @@ cobbler-1.6.3.tar.gz
 cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
+cobbler-2.0.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- cobbler.spec	24 Jul 2009 19:11:43 -0000	1.86
+++ cobbler.spec	17 Sep 2009 16:54:10 -0000	1.87
@@ -1,19 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define _binaries_in_noarch_packages_terminate_build 0
 %global debug_package %{nil}
 Summary: Boot server configurator
 Name: cobbler
-AutoReq: no
-Version: 1.6.6
-Release: 2%{?dist}
-Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
+AutoReq: no
+Version: 2.0.0
+Release: 1%{?dist}
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
-%endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
+Requires: python(abi) >= %{pyver}
 %endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,19 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,39 +93,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
-fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -137,8 +153,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -148,15 +165,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
-%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -165,10 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -178,7 +195,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{_bindir}/cobblerd
 
 %defattr(-,root,root)
-%dir /usr/share/cobbler
 %dir /etc/cobbler
 %dir /etc/cobbler/pxe
 %dir /etc/cobbler/reporting
@@ -193,24 +209,21 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
 %config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%config(noreplace) /etc/apache2/conf.d/cobbler_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -261,29 +274,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -296,65 +289,95 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
 
-%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.6-1
-- Placeholder for future release
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Fri May 8 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
-- Upstream changes (see CHANGELOG)
-
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
 
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
+%description -n koan
 
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation 
+of an existing system.  For use with a boot-server configured with Cobbler
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
+
+
+%package -n cobbler-web
+
+Summary: Web interface for Cobbler
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
+%description -n cobbler-web
 
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
 
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%dir /usr/share/cobbler/web/cobbler_web
+/usr/share/cobbler/web/cobbler_web/*
+#%dir /usr/share/cobbler/web/cobbler_web/templates
+#/usr/share/cobbler/web/cobbler_web/templates/*
+/etc/httpd/conf.d/cobbler_web.conf
+%dir /usr/share/cobbler/web/sessions
+%dir /var/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
+%changelog
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
+* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
+- First release with unified spec files
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	10 Jul 2009 19:33:35 -0000	1.73
+++ sources	17 Sep 2009 16:54:10 -0000	1.74
@@ -1 +1,2 @@
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
+5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz



From mdehaan at fedoraproject.org  Thu Sep 17 16:54:09 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Thu, 17 Sep 2009 16:54:09 +0000 (UTC)
Subject: rpms/cobbler/F-10 .cvsignore, 1.57, 1.58 cobbler.spec, 1.77,
	1.78 sources, 1.72, 1.73
Message-ID: <20090917165409.D4D4811C00CE@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985/F-10

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is cobbler 2.0.  Note that this now generates 3 packages -- cobbler, koan, and cobbler-web.   Previously cobbler-web was part of the cobbler package and koan was generated by a seperate entry in the build system CVS.  Now they are all ruled by cobbler.spec (see dead.package file in koan's CVS).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	12 Jun 2009 20:17:11 -0000	1.57
+++ .cvsignore	17 Sep 2009 16:54:09 -0000	1.58
@@ -54,3 +54,4 @@ cobbler-1.6.3.tar.gz
 cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
+cobbler-2.0.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- cobbler.spec	12 Jun 2009 20:17:11 -0000	1.77
+++ cobbler.spec	17 Sep 2009 16:54:09 -0000	1.78
@@ -1,19 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define _binaries_in_noarch_packages_terminate_build 0
 %global debug_package %{nil}
 Summary: Boot server configurator
 Name: cobbler
+License: GPLv2+
 AutoReq: no
-Version: 1.6.6
+Version: 2.0.0
 Release: 1%{?dist}
-Source0: %{name}-%{version}.tar.gz
-License: GPLv2+
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
+Requires: python(abi) >= %{pyver}
 %endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
-%endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,19 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,39 +93,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -137,8 +153,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -148,15 +165,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
-%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -165,10 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -178,7 +195,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{_bindir}/cobblerd
 
 %defattr(-,root,root)
-%dir /usr/share/cobbler
 %dir /etc/cobbler
 %dir /etc/cobbler/pxe
 %dir /etc/cobbler/reporting
@@ -193,24 +209,21 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
 %config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%config(noreplace) /etc/apache2/conf.d/cobbler_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -261,29 +274,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -296,62 +289,95 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
 
-%changelog
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.6-1
-- Placeholder for future release
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Fri May 8 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.4-1
-- Upstream changes (see CHANGELOG)
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
-- Upstream changes (see CHANGELOG)
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
+%description -n koan
 
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation 
+of an existing system.  For use with a boot-server configured with Cobbler
 
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
 
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
 
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
+%package -n cobbler-web
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
+Summary: Web interface for Cobbler
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
+%description -n cobbler-web
 
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
 
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%dir /usr/share/cobbler/web/cobbler_web
+/usr/share/cobbler/web/cobbler_web/*
+#%dir /usr/share/cobbler/web/cobbler_web/templates
+#/usr/share/cobbler/web/cobbler_web/templates/*
+/etc/httpd/conf.d/cobbler_web.conf
+%dir /usr/share/cobbler/web/sessions
+%dir /var/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
+%changelog
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
+* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
+- First release with unified spec files
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	12 Jun 2009 20:17:11 -0000	1.72
+++ sources	17 Sep 2009 16:54:09 -0000	1.73
@@ -1,3 +1,4 @@
 0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
 524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
+5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz



From simo at fedoraproject.org  Thu Sep 17 16:57:48 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Thu, 17 Sep 2009 16:57:48 +0000 (UTC)
Subject: rpms/samba4/devel .cvsignore, 1.3, 1.4 samba4.spec, 1.17,
	1.18 sources, 
	1.3, 1.4 0001-Fix-extended-operation-return-path.patch, 1.1,
	NONE 0001-Fix-potential-segfaults-using-freed-memory.patch, 1.1, NONE
Message-ID: <20090917165748.8B61F11C00CE@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29944

Modified Files:
	.cvsignore samba4.spec sources 
Removed Files:
	0001-Fix-extended-operation-return-path.patch 
	0001-Fix-potential-segfaults-using-freed-memory.patch 
Log Message:
* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-17.alpha8_git20090916
- Upgrade to alpha8-git20090916



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Feb 2009 22:16:54 -0000	1.3
+++ .cvsignore	17 Sep 2009 16:57:48 -0000	1.4
@@ -1 +1 @@
-samba-4.0.0alpha7.tar.gz
+samba-4.0.0alpha8_git20090916.tar.gz


Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- samba4.spec	16 Sep 2009 15:45:22 -0000	1.17
+++ samba4.spec	17 Sep 2009 16:57:48 -0000	1.18
@@ -1,19 +1,19 @@
-%define main_release 16
+%define main_release 17
 %define samba4_version 4.0.0
 
-%define talloc_version 1.3.0
-%define tdb_version 1.1.3
-%define tevent_version 0.9.3
-%define ldb_version	0.9.3
+%define talloc_version 2.0.0
+%define tdb_version 1.1.5
+%define tevent_version 0.9.8
+%define ldb_version	0.9.8
 
-%define pre_release alpha7
+%define pre_release alpha8_git20090916
 
 %define tarball_name samba-4.0.0%{pre_release}
 
 %define samba4_release %{main_release}%{pre_release}%{?dist}
 # We need a higher talloc release to address previous releases done as
 # part of the samba3 package.
-%define talloc_release 29.%{main_release}%{?dist}
+%define talloc_release %{main_release}%{?dist}
 %define tdb_release %{main_release}%{?dist}
 %define tevent_release %{main_release}%{?dist}
 %define ldb_release %{main_release}%{?dist}
@@ -56,8 +56,6 @@ Source4: %{name}.sysconfig
 Source5: %{name}.init
 
 Patch1: samba-4.0.0alpha6-GIT-3508a66-undefined-comparison_fn_t.patch
-Patch2: 0001-Fix-potential-segfaults-using-freed-memory.patch
-Patch3: 0001-Fix-extended-operation-return-path.patch
 
 Requires(pre): /usr/sbin/groupadd
 
@@ -285,7 +283,7 @@ Release: %{ldb_release}
 Requires: libldb = %{ldb_version}-%{ldb_release}
 Requires: libtdb-devel >= %{tdb_version}
 Requires: libtalloc-devel >= %{talloc_version}
-Requires: libtevent-devel = %{tevent_version}-%{tevent_release}
+Requires: libtevent-devel >= %{tevent_version}-%{tevent_release}
 
 %description -n libldb-devel
 Header files needed to develop programs that link against the LDB library.
@@ -297,8 +295,6 @@ Header files needed to develop programs 
 # copy Red Hat specific scripts
 
 %patch1 -p1 -b .undefined-comparison_fn_t
-%patch2 -p1 -b .potential_ldb_segfault
-%patch3 -p1 -b .extended_operation
 
 mv source4/VERSION source4/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&%{release}/' < source4/VERSION.orig > source4/VERSION
@@ -450,20 +446,22 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_
 # }
 
 # Clean out some stuff we don't want in the Fedora package.
+rm $RPM_BUILD_ROOT%{_bindir}/mount.cifs
+rm $RPM_BUILD_ROOT%{_bindir}/umount.cifs
 rm $RPM_BUILD_ROOT%{_bindir}/autoidl
-rm $RPM_BUILD_ROOT%{_bindir}/epdump
+#rm $RPM_BUILD_ROOT%{_bindir}/epdump
 rm $RPM_BUILD_ROOT%{_bindir}/gentest
 rm $RPM_BUILD_ROOT%{_bindir}/getntacl
 rm $RPM_BUILD_ROOT%{_bindir}/locktest
 rm $RPM_BUILD_ROOT%{_bindir}/masktest
-rm $RPM_BUILD_ROOT%{_bindir}/minschema
+#rm $RPM_BUILD_ROOT%{_bindir}/minschema
 rm $RPM_BUILD_ROOT%{_bindir}/ndrdump
 rm $RPM_BUILD_ROOT%{_bindir}/nsstest
 rm $RPM_BUILD_ROOT%{_bindir}/rpcclient
 rm $RPM_BUILD_ROOT%{_bindir}/samba3dump
 rm $RPM_BUILD_ROOT%{_bindir}/setnttoken
 rm $RPM_BUILD_ROOT%{_bindir}/smbtorture
-rm $RPM_BUILD_ROOT%{_bindir}/subunitrun
+#rm $RPM_BUILD_ROOT%{_bindir}/subunitrun
 #depending on the environemnt this file might or might not be generated
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtorture
 
@@ -473,7 +471,7 @@ rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/
 # Remove files for disabled subpackages.
 %if ! %enable_samba4
 rm $RPM_BUILD_ROOT%{_sbindir}/samba
-rm $RPM_BUILD_ROOT%{_bindir}/mymachinepw
+#rm $RPM_BUILD_ROOT%{_bindir}/mymachinepw
 rm $RPM_BUILD_ROOT%{_bindir}/smbstatus
 rm -r $RPM_BUILD_ROOT%{_datadir}/samba/setup
 %endif
@@ -510,7 +508,7 @@ rm $RPM_BUILD_ROOT%{_includedir}/samba-4
 # the samba4 build process rebuilds libraries internally,
 # but we want to use the standalone build for now.
 rm $RPM_BUILD_ROOT%{_libdir}/libldb.so*
-rm $RPM_BUILD_ROOT%{_bindir}/ad2oLschema
+#rm $RPM_BUILD_ROOT%{_bindir}/ad2oLschema
 rm $RPM_BUILD_ROOT%{_bindir}/ldbadd
 rm $RPM_BUILD_ROOT%{_bindir}/ldbdel
 rm $RPM_BUILD_ROOT%{_bindir}/ldbedit
@@ -560,7 +558,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
 
 %if ! %enable_python
 rm -r $RPM_BUILD_ROOT%{python_sitearch}/*
-rm -r $RPM_BUILD_ROOT%{python_libdir}/lib
+rm -fr $RPM_BUILD_ROOT%{python_libdir}/lib
 %endif
 
 # These may be created in non mock systems, but we do not want to package them
@@ -668,7 +666,9 @@ exit 0
 %{_libdir}/libdcerpc.so.*
 %{_libdir}/libdcerpc_samr.so.*
 %{_libdir}/libndr.so.*
+%{_libdir}/libndr_standard.so.*
 %{_libdir}/libsamba-hostconfig.so.*
+%{_libdir}/libsamba-util.so.*
 #%{_libdir}/libtorture.so.*
 #Only needed if Samba's build produces plugins
 #%{_libdir}/samba
@@ -707,7 +707,9 @@ exit 0
 %{_libdir}/libdcerpc.so
 %{_libdir}/libdcerpc_samr.so
 %{_libdir}/libndr.so
+%{_libdir}/libndr_standard.so
 %{_libdir}/libsamba-hostconfig.so
+%{_libdir}/libsamba-util.so
 #%{_libdir}/libtorture.so
 %{_libdir}/pkgconfig/dcerpc.pc
 %{_libdir}/pkgconfig/dcerpc_samr.pc
@@ -839,6 +841,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-17.alpha8_git20090916
+- Upgrade to alpha8-git20090916
+
 * Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-16.alpha7
 - Stop building libtevent, it is now an external package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Feb 2009 22:16:54 -0000	1.3
+++ sources	17 Sep 2009 16:57:48 -0000	1.4
@@ -1 +1 @@
-0c25dced4dc64a6581a09917ec05dab2  samba-4.0.0alpha7.tar.gz
+a9a78f52bf71dcfc006a121725ff56a7  samba-4.0.0alpha8_git20090916.tar.gz


--- 0001-Fix-extended-operation-return-path.patch DELETED ---


--- 0001-Fix-potential-segfaults-using-freed-memory.patch DELETED ---



From kyle at fedoraproject.org  Thu Sep 17 16:57:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 16:57:52 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1815,
	1.1816 ppc-hates-my-family-and-swore-revenge.patch, 1.2, 1.3
Message-ID: <20090917165752.8371A11C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29965

Modified Files:
	kernel.spec ppc-hates-my-family-and-swore-revenge.patch 
Log Message:
* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com>
- Continue fixing ppc64. I didn't realize how apt a patch name that
  was before.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1815
retrieving revision 1.1816
diff -u -p -r1.1815 -r1.1816
--- kernel.spec	17 Sep 2009 16:26:52 -0000	1.1815
+++ kernel.spec	17 Sep 2009 16:57:52 -0000	1.1816
@@ -2067,6 +2067,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com>
+- Continue fixing ppc64. I didn't realize how apt a patch name that
+  was before.
+
 * Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-29
 - ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
   checker filter thing. (properly this time.)

ppc-hates-my-family-and-swore-revenge.patch:
 kernel/prom_init_check.sh |    6 ++++++
 lib/crtsavres.S           |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

Index: ppc-hates-my-family-and-swore-revenge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/ppc-hates-my-family-and-swore-revenge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ppc-hates-my-family-and-swore-revenge.patch	17 Sep 2009 16:22:45 -0000	1.2
+++ ppc-hates-my-family-and-swore-revenge.patch	17 Sep 2009 16:57:52 -0000	1.3
@@ -21,3 +21,159 @@ index 1ac136b..9f82f49 100644
  	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
  		OK=1
  	fi
+diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S
+index 70a9cd8..42ed290 100644
+--- a/arch/powerpc/lib/crtsavres.S
++++ b/arch/powerpc/lib/crtsavres.S
+@@ -49,57 +49,75 @@
+ /* function, just beyond the end of the integer save area.  */
+ 
+ _GLOBAL(_savegpr_14)
++_GLOBAL(_savegpr0_14)
+ _GLOBAL(_save32gpr_14)
+ 	stw	14,-72(11)	/* save gp registers */
+ _GLOBAL(_savegpr_15)
++_GLOBAL(_savegpr0_15)
+ _GLOBAL(_save32gpr_15)
+ 	stw	15,-68(11)
+ _GLOBAL(_savegpr_16)
++_GLOBAL(_savegpr0_16)
+ _GLOBAL(_save32gpr_16)
+ 	stw	16,-64(11)
+ _GLOBAL(_savegpr_17)
++_GLOBAL(_savegpr0_17)
+ _GLOBAL(_save32gpr_17)
+ 	stw	17,-60(11)
+ _GLOBAL(_savegpr_18)
++_GLOBAL(_savegpr0_18)
+ _GLOBAL(_save32gpr_18)
+ 	stw	18,-56(11)
+ _GLOBAL(_savegpr_19)
++_GLOBAL(_savegpr0_19)
+ _GLOBAL(_save32gpr_19)
+ 	stw	19,-52(11)
+ _GLOBAL(_savegpr_20)
++_GLOBAL(_savegpr0_20)
+ _GLOBAL(_save32gpr_20)
+ 	stw	20,-48(11)
+ _GLOBAL(_savegpr_21)
++_GLOBAL(_savegpr0_21)
+ _GLOBAL(_save32gpr_21)
+ 	stw	21,-44(11)
+ _GLOBAL(_savegpr_22)
++_GLOBAL(_savegpr0_22)
+ _GLOBAL(_save32gpr_22)
+ 	stw	22,-40(11)
+ _GLOBAL(_savegpr_23)
++_GLOBAL(_savegpr0_23)
+ _GLOBAL(_save32gpr_23)
+ 	stw	23,-36(11)
+ _GLOBAL(_savegpr_24)
++_GLOBAL(_savegpr0_24)
+ _GLOBAL(_save32gpr_24)
+ 	stw	24,-32(11)
+ _GLOBAL(_savegpr_25)
++_GLOBAL(_savegpr0_25)
+ _GLOBAL(_save32gpr_25)
+ 	stw	25,-28(11)
+ _GLOBAL(_savegpr_26)
++_GLOBAL(_savegpr0_26)
+ _GLOBAL(_save32gpr_26)
+ 	stw	26,-24(11)
+ _GLOBAL(_savegpr_27)
++_GLOBAL(_savegpr0_27)
+ _GLOBAL(_save32gpr_27)
+ 	stw	27,-20(11)
+ _GLOBAL(_savegpr_28)
++_GLOBAL(_savegpr0_28)
+ _GLOBAL(_save32gpr_28)
+ 	stw	28,-16(11)
+ _GLOBAL(_savegpr_29)
++_GLOBAL(_savegpr0_29)
+ _GLOBAL(_save32gpr_29)
+ 	stw	29,-12(11)
+ _GLOBAL(_savegpr_30)
++_GLOBAL(_savegpr0_30)
+ _GLOBAL(_save32gpr_30)
+ 	stw	30,-8(11)
+ _GLOBAL(_savegpr_31)
++_GLOBAL(_savegpr0_31)
+ _GLOBAL(_save32gpr_31)
+ 	stw	31,-4(11)
+ 	blr
+@@ -109,57 +127,75 @@ _GLOBAL(_save32gpr_31)
+ /* function, just beyond the end of the integer restore area.  */
+ 
+ _GLOBAL(_restgpr_14)
++_GLOBAL(_restgpr0_14)
+ _GLOBAL(_rest32gpr_14)
+ 	lwz	14,-72(11)	/* restore gp registers */
+ _GLOBAL(_restgpr_15)
++_GLOBAL(_restgpr0_15)
+ _GLOBAL(_rest32gpr_15)
+ 	lwz	15,-68(11)
+ _GLOBAL(_restgpr_16)
++_GLOBAL(_restgpr0_16)
+ _GLOBAL(_rest32gpr_16)
+ 	lwz	16,-64(11)
+ _GLOBAL(_restgpr_17)
++_GLOBAL(_restgpr0_17)
+ _GLOBAL(_rest32gpr_17)
+ 	lwz	17,-60(11)
+ _GLOBAL(_restgpr_18)
++_GLOBAL(_restgpr0_18)
+ _GLOBAL(_rest32gpr_18)
+ 	lwz	18,-56(11)
+ _GLOBAL(_restgpr_19)
++_GLOBAL(_restgpr0_19)
+ _GLOBAL(_rest32gpr_19)
+ 	lwz	19,-52(11)
+ _GLOBAL(_restgpr_20)
++_GLOBAL(_restgpr0_20)
+ _GLOBAL(_rest32gpr_20)
+ 	lwz	20,-48(11)
+ _GLOBAL(_restgpr_21)
++_GLOBAL(_restgpr0_21)
+ _GLOBAL(_rest32gpr_21)
+ 	lwz	21,-44(11)
+ _GLOBAL(_restgpr_22)
++_GLOBAL(_restgpr0_22)
+ _GLOBAL(_rest32gpr_22)
+ 	lwz	22,-40(11)
+ _GLOBAL(_restgpr_23)
++_GLOBAL(_restgpr0_23)
+ _GLOBAL(_rest32gpr_23)
+ 	lwz	23,-36(11)
+ _GLOBAL(_restgpr_24)
++_GLOBAL(_restgpr0_24)
+ _GLOBAL(_rest32gpr_24)
+ 	lwz	24,-32(11)
+ _GLOBAL(_restgpr_25)
++_GLOBAL(_restgpr0_25)
+ _GLOBAL(_rest32gpr_25)
+ 	lwz	25,-28(11)
+ _GLOBAL(_restgpr_26)
++_GLOBAL(_restgpr0_26)
+ _GLOBAL(_rest32gpr_26)
+ 	lwz	26,-24(11)
+ _GLOBAL(_restgpr_27)
++_GLOBAL(_restgpr0_27)
+ _GLOBAL(_rest32gpr_27)
+ 	lwz	27,-20(11)
+ _GLOBAL(_restgpr_28)
++_GLOBAL(_restgpr0_28)
+ _GLOBAL(_rest32gpr_28)
+ 	lwz	28,-16(11)
+ _GLOBAL(_restgpr_29)
++_GLOBAL(_restgpr0_29)
+ _GLOBAL(_rest32gpr_29)
+ 	lwz	29,-12(11)
+ _GLOBAL(_restgpr_30)
++_GLOBAL(_restgpr0_30)
+ _GLOBAL(_rest32gpr_30)
+ 	lwz	30,-8(11)
+ _GLOBAL(_restgpr_31)
++_GLOBAL(_restgpr0_31)
+ _GLOBAL(_rest32gpr_31)
+ 	lwz	31,-4(11)
+ 	blr



From pbrobinson at fedoraproject.org  Thu Sep 17 17:05:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 17:05:13 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.27,1.28
Message-ID: <20090917170513.9724D11C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32246

Modified Files:
	nbtk.spec 
Log Message:
 - And other fix


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nbtk.spec	17 Sep 2009 16:47:35 -0000	1.27
+++ nbtk.spec	17 Sep 2009 17:05:12 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -74,8 +74,7 @@ rm -rf %{buildroot}
 %doc COPYING.LIB
 %{_bindir}/nbtk-create-image-cache
 %{_libdir}/libnbtk-*.so.*
-%{_libdir}/girepository-1.0/Nbtk-1.0.typelib
-%{_libdir}/girepository-1.0/NbtkGtk-1.0.typelib
+%{_libdir}/girepository-1.0/Nbtk*.typelib
 %{_datadir}/nbtk
 
 %files devel
@@ -83,11 +82,13 @@ rm -rf %{buildroot}
 %{_includedir}/nbtk-1.0
 %{_libdir}/pkgconfig/nbtk*.pc
 %{_libdir}/libnbtk*.so
-%{_datadir}/gir-1.0/Nbtk-1.0.gir
-%{_datadir}/gir-1.0/NbtkGtk-1.0.gir
+%{_datadir}/gir-1.0/Nbtk*.gir
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-4
+- And other fix
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-3
 - Fix translation naming
 



From notting at fedoraproject.org  Thu Sep 17 17:08:15 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 17 Sep 2009 17:08:15 +0000 (UTC)
Subject: rpms/sysvinit/devel sysvinit.spec,1.76,1.77
Message-ID: <20090917170815.2D50911C00CE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/sysvinit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv900

Modified Files:
	sysvinit.spec 
Log Message:
* Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.87-1.dsf
- Avoid stripping binaries during build to fix -debuginfo.



Index: sysvinit.spec
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sysvinit.spec	27 Jul 2009 18:19:09 -0000	1.76
+++ sysvinit.spec	17 Sep 2009 17:08:14 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: sysvinit
 Version: 2.87
-Release: 0.dsf%{?dist}
+Release: 1.dsf%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://alioth.debian.org/frs/download.php/3060/sysvinit-%{version}dsf.tar.gz
@@ -67,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 for I in bin sbin usr/{bin,include} %{_mandir}/man{1,3,5,8} etc var/run dev; do
 	mkdir -p $RPM_BUILD_ROOT/$I
 done
-make -C src ROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
+make -C src ROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} STRIP=/bin/true \
 	BIN_OWNER=`id -nu` BIN_GROUP=`id -ng` install
 
 rm -f $RPM_BUILD_ROOT/bin/pidof
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sulogin*
 
 %changelog
+* Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.87-1.dsf
+- Avoid stripping binaries during build to fix -debuginfo.
+
 * Mon Jul 27 2009 Bill Nottingham <notting at redhat.com> - 2.87-0.dsf
 - Update to new upstream release 2.87dsf
 -- remove many upstreamed/obsolete patches



From simo at fedoraproject.org  Thu Sep 17 17:16:10 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Thu, 17 Sep 2009 17:16:10 +0000 (UTC)
Subject: rpms/samba4/devel samba4.spec,1.18,1.19
Message-ID: <20090917171610.AE6FC11C00CE@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2963

Modified Files:
	samba4.spec 
Log Message:
* Thu Sep 17 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-18.alpha8_git20090916
- Fix broken dependencies



Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- samba4.spec	17 Sep 2009 16:57:48 -0000	1.18
+++ samba4.spec	17 Sep 2009 17:16:10 -0000	1.19
@@ -1,10 +1,10 @@
-%define main_release 17
+%define main_release 18
 %define samba4_version 4.0.0
 
 %define talloc_version 2.0.0
 %define tdb_version 1.1.5
 %define tevent_version 0.9.8
-%define ldb_version	0.9.8
+%define ldb_version	0.9.6
 
 %define pre_release alpha8_git20090916
 
@@ -93,6 +93,12 @@ BuildRequires: libtalloc-devel >= %{tall
 %if ! %enable_tdb
 BuildRequires: libtdb-devel >= %{tdb_version}
 %endif
+%if ! %enable_tevent
+BuildRequires: libtevent-devel >= %{tevent_version}
+%endif
+%if ! %enable_ldb
+BuildRequires: libldb-devel >= %{ldb_version}
+%endif
 
 %description
 
@@ -283,7 +289,7 @@ Release: %{ldb_release}
 Requires: libldb = %{ldb_version}-%{ldb_release}
 Requires: libtdb-devel >= %{tdb_version}
 Requires: libtalloc-devel >= %{talloc_version}
-Requires: libtevent-devel >= %{tevent_version}-%{tevent_release}
+Requires: libtevent-devel >= %{tevent_version}
 
 %description -n libldb-devel
 Header files needed to develop programs that link against the LDB library.
@@ -841,6 +847,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 17 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-18.alpha8_git20090916
+- Fix broken dependencies
+
 * Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-17.alpha8_git20090916
 - Upgrade to alpha8-git20090916
 



From davej at fedoraproject.org  Thu Sep 17 17:21:48 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 17 Sep 2009 17:21:48 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6.31-cpuidle-faster-io.patch, NONE,
	1.1 kernel.spec, 1.1816, 1.1817
Message-ID: <20090917172148.CA14011C00CE@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5239

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.31-cpuidle-faster-io.patch 
Log Message:
cpuidle: Fix the menu governor to boost IO performance.

linux-2.6.31-cpuidle-faster-io.patch:
 drivers/cpuidle/governors/menu.c |  251 ++++++++++++++++++++++++++++++++-------
 include/linux/sched.h            |    4 
 kernel/sched.c                   |   18 ++
 3 files changed, 231 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6.31-cpuidle-faster-io.patch ---
>From davej  Mon Sep 14 23:44:21 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED,
	UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Mon, 14 Sep 2009 23:44:21 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Mon, 14 Sep 2009 23:40:00 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 29E4E9C046;
	Mon, 14 Sep 2009 23:40:00 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id QtHcfoKcpI1L; Mon, 14 Sep 2009 23:39:59 -0400 (EDT)
Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id DEF409C00D;
	Mon, 14 Sep 2009 23:39:59 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.13])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8F3do6r019578;
	Mon, 14 Sep 2009 23:39:51 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8F3XNpe025401;
	Mon, 14 Sep 2009 23:39:37 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1758085AbZIODja (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Mon, 14 Sep 2009 23:39:30 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S934353AbZIODj2
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 14 Sep 2009 23:39:28 -0400
Received: from casper.infradead.org ([85.118.1.10]:38759 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758054AbZIODj1 (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Mon, 14 Sep 2009 23:39:27 -0400
Received: from aalborg.xs4all.nl ([82.94.0.130] helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MnOt1-0004XM-HQ; Tue, 15 Sep 2009 03:39:23 +0000
Date: 	Tue, 15 Sep 2009 05:42:59 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: linux-kernel at vger.kernel.org
Cc: Andrew Morton <akpm at linux-foundation.org>,
        Arjan van de Ven <arjan at infradead.org>, lenb at kernel.org, mingo at elte.hu,
        yanmin_zhang at linux.intel.com, jens.axboe at oracle.com,
        Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Subject: [PATCH v2] cpuidle: Fix the menu governor to boost IO performance
Message-ID: <20090915054259.5282e5ba at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.13
Status: RO
Content-Length: 14160
Lines: 428

Reworked patch based on Andrew's review feedback and spelling fixes.
Rather than adding a new governor temporarily, this just puts the fixes
into the existing menu governor.

Andrew: this replaces cpuidle-a-new-variant-of-the-menu-governor-to-boost-io-performance.patch


I don't have a power meter in my hotel room so I've only been able to verify
that the patch functions as before with the timechart tool.
(no major changes were done though, only review feedback)


From: Arjan van de Ven <arjan at linux.intel.com>
Subject: cpuidle: Fix the menu governor to boost IO performance

Fix the menu idle governor which balances power savings, energy efficiency
and performance impact.

The reason for a reworked governor is that there have been serious
performance issues reported with the existing code on Nehalem server
systems.

To show this I'm sure Andrew wants to see benchmark results:
(benchmark is "fio", "no cstates" is using "idle=poll")

		no cstates	current linux	new algorithm
1 disk		107 Mb/s	85 Mb/s		105 Mb/s
2 disks		215 Mb/s	123 Mb/s	209 Mb/s
12 disks	590 Mb/s	320 Mb/s	585 Mb/s

In various power benchmark measurements, no degredation was found by our
measurement&diagnostics team.  Obviously a small percentage more power 
was used in the "fio" benchmark, due to the much higher performance.

While it would be a novel idea to describe the new algorithm in this
commit message, I cheaped out and described it in comments in the code
instead.

[changes since first post: spelling fixes from akpm, review feedback,
folded menu-tng into menu.c]

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Cc: Len Brown <lenb at kernel.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Yanmin Zhang <yanmin_zhang at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
---
 drivers/cpuidle/governors/menu.c |  251 ++++++++++++++++++++++++++++++++------
 include/linux/sched.h            |    4 +
 kernel/sched.c                   |   15 +++
 3 files changed, 231 insertions(+), 39 deletions(-)

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index f1df59f..9f3d775 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -2,8 +2,12 @@
  * menu.c - the menu idle governor
  *
  * Copyright (C) 2006-2007 Adam Belay <abelay at novell.com>
+ * Copyright (C) 2009 Intel Corporation
+ * Author:
+ *        Arjan van de Ven <arjan at linux.intel.com>
  *
- * This code is licenced under the GPL.
+ * This code is licenced under the GPL version 2 as described
+ * in the COPYING file that acompanies the Linux Kernel.
  */
 
 #include <linux/kernel.h>
@@ -13,20 +17,153 @@
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
+#include <linux/sched.h>
 
-#define BREAK_FUZZ	4	/* 4 us */
-#define PRED_HISTORY_PCT	50
+#define BUCKETS 12
+#define RESOLUTION 1024
+#define DECAY 4
+#define MAX_INTERESTING 50000
+
+/*
+ * Concepts and ideas behind the menu governor
+ *
+ * For the menu governor, there are 3 decision factors for picking a C
+ * state:
+ * 1) Energy break even point
+ * 2) Performance impact
+ * 3) Latency tolerance (from pmqos infrastructure)
+ * These these three factors are treated independently.
+ *
+ * Energy break even point
+ * -----------------------
+ * C state entry and exit have an energy cost, and a certain amount of time in
+ * the  C state is required to actually break even on this cost. CPUIDLE
+ * provides us this duration in the "target_residency" field. So all that we
+ * need is a good prediction of how long we'll be idle. Like the traditional
+ * menu governor, we start with the actual known "next timer event" time.
+ *
+ * Since there are other source of wakeups (interrupts for example) than
+ * the next timer event, this estimation is rather optimistic. To get a
+ * more realistic estimate, a correction factor is applied to the estimate,
+ * that is based on historic behavior. For example, if in the past the actual
+ * duration always was 50% of the next timer tick, the correction factor will
+ * be 0.5.
+ *
+ * menu uses a running average for this correction factor, however it uses a
+ * set of factors, not just a single factor. This stems from the realization
+ * that the ratio is dependent on the order of magnitude of the expected
+ * duration; if we expect 500 milliseconds of idle time the likelihood of
+ * getting an interrupt very early is much higher than if we expect 50 micro
+ * seconds of idle time. A second independent factor that has big impact on
+ * the actual factor is if there is (disk) IO outstanding or not.
+ * (as a special twist, we consider every sleep longer than 50 milliseconds
+ * as perfect; there are no power gains for sleeping longer than this)
+ *
+ * For these two reasons we keep an array of 12 independent factors, that gets
+ * indexed based on the magnitude of the expected duration as well as the
+ * "is IO outstanding" property.
+ *
+ * Limiting Performance Impact
+ * ---------------------------
+ * C states, especially those with large exit latencies, can have a real
+ * noticable impact on workloads, which is not acceptable for most sysadmins,
+ * and in addition, less performance has a power price of its own.
+ *
+ * As a general rule of thumb, menu assumes that the following heuristic
+ * holds:
+ *     The busier the system, the less impact of C states is acceptable
+ *
+ * This rule-of-thumb is implemented using a performance-multiplier:
+ * If the exit latency times the performance multiplier is longer than
+ * the predicted duration, the C state is not considered a candidate
+ * for selection due to a too high performance impact. So the higher
+ * this multiplier is, the longer we need to be idle to pick a deep C
+ * state, and thus the less likely a busy CPU will hit such a deep
+ * C state.
+ *
+ * Two factors are used in determing this multiplier:
+ * a value of 10 is added for each point of "per cpu load average" we have.
+ * a value of 5 points is added for each process that is waiting for
+ * IO on this CPU.
+ * (these values are experimentally determined)
+ *
+ * The load average factor gives a longer term (few seconds) input to the
+ * decision, while the iowait value gives a cpu local instantanious input.
+ * The iowait factor may look low, but realize that this is also already
+ * represented in the system load average.
+ *
+ */
 
 struct menu_device {
 	int		last_state_idx;
 
 	unsigned int	expected_us;
-	unsigned int	predicted_us;
-	unsigned int    current_predicted_us;
-	unsigned int	last_measured_us;
-	unsigned int	elapsed_us;
+	u64		predicted_us;
+	unsigned int	measured_us;
+	unsigned int	exit_us;
+	unsigned int	bucket;
+	u64		correction_factor[BUCKETS];
 };
 
+
+#define LOAD_INT(x) ((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+
+static int get_loadavg(void)
+{
+	unsigned long this = this_cpu_load();
+
+
+	return LOAD_INT(this) * 10 + LOAD_FRAC(this) / 10;
+}
+
+static inline int which_bucket(unsigned int duration)
+{
+	int bucket = 0;
+
+	/*
+	 * We keep two groups of stats; one with no
+	 * IO pending, one without.
+	 * This allows us to calculate
+	 * E(duration)|iowait
+	 */
+	if (nr_iowait_cpu())
+		bucket = BUCKETS/2;
+
+	if (duration < 10)
+		return bucket;
+	if (duration < 100)
+		return bucket + 1;
+	if (duration < 1000)
+		return bucket + 2;
+	if (duration < 10000)
+		return bucket + 3;
+	if (duration < 100000)
+		return bucket + 4;
+	return bucket + 5;
+}
+
+/*
+ * Return a multiplier for the exit latency that is intended
+ * to take performance requirements into account.
+ * The more performance critical we estimate the system
+ * to be, the higher this multiplier, and thus the higher
+ * the barrier to go to an expensive C state.
+ */
+static inline int performance_multiplier(void)
+{
+	int mult = 1;
+
+	/* for higher loadavg, we are more reluctant */
+
+	mult += 2 * get_loadavg();
+
+	/* for IO wait tasks (per cpu!) we add 5x each */
+	mult += 10 * nr_iowait_cpu();
+
+	return mult;
+}
+
 static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
 /**
@@ -38,37 +175,59 @@ static int menu_select(struct cpuidle_device *dev)
 	struct menu_device *data = &__get_cpu_var(menu_devices);
 	int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
 	int i;
+	int multiplier;
+
+	data->last_state_idx = 0;
+	data->exit_us = 0;
 
 	/* Special case when user has set very strict latency requirement */
-	if (unlikely(latency_req == 0)) {
-		data->last_state_idx = 0;
+	if (unlikely(latency_req == 0))
 		return 0;
-	}
 
-	/* determine the expected residency time */
+	/* determine the expected residency time, round up */
 	data->expected_us =
-		(u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
+	    DIV_ROUND_UP((u32)ktime_to_ns(tick_nohz_get_sleep_length()), 1000);
+
+
+	data->bucket = which_bucket(data->expected_us);
+
+	multiplier = performance_multiplier();
+
+	/*
+	 * if the correction factor is 0 (eg first time init or cpu hotplug
+	 * etc), we actually want to start out with a unity factor.
+	 */
+	if (data->correction_factor[data->bucket] == 0)
+		data->correction_factor[data->bucket] = RESOLUTION * DECAY;
+
+	/* Make sure to round up for half microseconds */
+	data->predicted_us = DIV_ROUND_CLOSEST(
+		data->expected_us * data->correction_factor[data->bucket],
+		RESOLUTION * DECAY);
+
+	/*
+	 * We want to default to C1 (hlt), not to busy polling
+	 * unless the timer is happening really really soon.
+	 */
+	if (data->expected_us > 5)
+		data->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
-	/* Recalculate predicted_us based on prediction_history_pct */
-	data->predicted_us *= PRED_HISTORY_PCT;
-	data->predicted_us += (100 - PRED_HISTORY_PCT) *
-				data->current_predicted_us;
-	data->predicted_us /= 100;
 
 	/* find the deepest idle state that satisfies our constraints */
-	for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
+	for (i = CPUIDLE_DRIVER_STATE_START; i < dev->state_count; i++) {
 		struct cpuidle_state *s = &dev->states[i];
 
-		if (s->target_residency > data->expected_us)
-			break;
 		if (s->target_residency > data->predicted_us)
 			break;
 		if (s->exit_latency > latency_req)
 			break;
+		if (s->exit_latency * multiplier > data->predicted_us)
+			break;
+		data->exit_us = s->exit_latency;
+		data->last_state_idx = i;
 	}
 
-	data->last_state_idx = i - 1;
-	return i - 1;
+	return data->last_state_idx;
 }
 
 /**
@@ -85,35 +244,49 @@ static void menu_reflect(struct cpuidle_device *dev)
 	unsigned int last_idle_us = cpuidle_get_last_residency(dev);
 	struct cpuidle_state *target = &dev->states[last_idx];
 	unsigned int measured_us;
+	u64 new_factor;
 
 	/*
 	 * Ugh, this idle state doesn't support residency measurements, so we
 	 * are basically lost in the dark.  As a compromise, assume we slept
-	 * for one full standard timer tick.  However, be aware that this
-	 * could potentially result in a suboptimal state transition.
+	 * for the whole expected time.
 	 */
 	if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID)))
-		last_idle_us = USEC_PER_SEC / HZ;
+		last_idle_us = data->expected_us;
+
+
+	measured_us = last_idle_us;
 
 	/*
-	 * measured_us and elapsed_us are the cumulative idle time, since the
-	 * last time we were woken out of idle by an interrupt.
+	 * We correct for the exit latency; we are assuming here that the
+	 * exit latency happens after the event that we're interested in.
 	 */
-	if (data->elapsed_us <= data->elapsed_us + last_idle_us)
-		measured_us = data->elapsed_us + last_idle_us;
+	if (measured_us > data->exit_us)
+		measured_us -= data->exit_us;
+
+
+	/* update our correction ratio */
+
+	new_factor = data->correction_factor[data->bucket]
+			* (DECAY - 1) / DECAY;
+
+	if (data->expected_us > 0 && data->measured_us < MAX_INTERESTING)
+		new_factor += RESOLUTION * measured_us / data->expected_us;
 	else
-		measured_us = -1;
+		/*
+		 * we were idle so long that we count it as a perfect
+		 * prediction
+		 */
+		new_factor += RESOLUTION;
 
-	/* Predict time until next break event */
-	data->current_predicted_us = max(measured_us, data->last_measured_us);
+	/*
+	 * We don't want 0 as factor; we always want at least
+	 * a tiny bit of estimated time.
+	 */
+	if (new_factor == 0)
+		new_factor = 1;
 
-	if (last_idle_us + BREAK_FUZZ <
-	    data->expected_us - target->exit_latency) {
-		data->last_measured_us = measured_us;
-		data->elapsed_us = 0;
-	} else {
-		data->elapsed_us = measured_us;
-	}
+	data->correction_factor[data->bucket] = new_factor;
 }
 
 /**
diff --git a/include/linux/sched.h b/include/linux/sched.h
index c0d9944..6b29155 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -140,6 +140,10 @@ extern int nr_processes(void);
 extern unsigned long nr_running(void);
 extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_iowait(void);
+extern unsigned long nr_iowait_cpu(void);
+extern unsigned long this_cpu_load(void);
+
+
 extern void calc_global_load(void);
 extern u64 cpu_nr_migrations(int cpu);
 
diff --git a/kernel/sched.c b/kernel/sched.c
index c512a02..1e2f1d0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3064,6 +3064,21 @@ unsigned long nr_iowait(void)
 	return sum;
 }
 
+unsigned long nr_iowait_cpu(void)
+{
+	int this_cpu = smp_processor_id();
+	struct rq *this_rq = cpu_rq(this_cpu);
+	return atomic_read(&this_rq->nr_iowait);
+}
+
+unsigned long this_cpu_load(void)
+{
+	int this_cpu = smp_processor_id();
+	struct rq *this_rq = cpu_rq(this_cpu);
+	return this_rq->cpu_load[0];
+}
+
+
 /* Variables and functions for calc_load */
 static atomic_long_t calc_load_tasks;
 static unsigned long calc_load_update;
-- 
1.6.0.6


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1816
retrieving revision 1.1817
diff -u -p -r1.1816 -r1.1817
--- kernel.spec	17 Sep 2009 16:57:52 -0000	1.1816
+++ kernel.spec	17 Sep 2009 17:21:48 -0000	1.1817
@@ -681,6 +681,8 @@ Patch900: linux-2.6-pci-cacheline-sizing
 
 Patch1000: linux-2.6.31-cpufreq-powernow-k8-oops.patch
 
+Patch1100: linux-2.6.31-cpuidle-faster-io.patch
+
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
@@ -1338,6 +1340,9 @@ ApplyPatch linux-2.6-pci-cacheline-sizin
 # fix upstream bug #13780
 ApplyPatch linux-2.6.31-cpufreq-powernow-k8-oops.patch
 
+# cpuidle: Fix the menu governor to boost IO performance
+ApplyPatch linux-2.6.31-cpuidle-faster-io.patch
+
 # http://www.lirc.org/
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
@@ -2067,11 +2072,14 @@ fi
 # and build.
 
 %changelog
-* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com>
+* Thu Sep 17 2009 Dave Jones <davej at redhat.com>
+- cpuidle: Fix the menu governor to boost IO performance.
+
+* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com>
 - Continue fixing ppc64. I didn't realize how apt a patch name that
   was before.
 
-* Thu Sep 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-29
+* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-29
 - ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
   checker filter thing. (properly this time.)
 - fix no-vta CFLAGS to work on older compilers.



From davej at fedoraproject.org  Thu Sep 17 17:22:25 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 17 Sep 2009 17:22:25 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6.31-cpuidle-faster-io.patch,1.1,1.2
Message-ID: <20090917172225.BD1B211C00CE@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5448

Modified Files:
	linux-2.6.31-cpuidle-faster-io.patch 
Log Message:
trim mbox junk

linux-2.6.31-cpuidle-faster-io.patch:
 drivers/cpuidle/governors/menu.c |  251 ++++++++++++++++++++++++++++++++-------
 include/linux/sched.h            |    4 
 kernel/sched.c                   |   18 ++
 3 files changed, 231 insertions(+), 42 deletions(-)

Index: linux-2.6.31-cpuidle-faster-io.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6.31-cpuidle-faster-io.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.31-cpuidle-faster-io.patch	17 Sep 2009 17:21:48 -0000	1.1
+++ linux-2.6.31-cpuidle-faster-io.patch	17 Sep 2009 17:22:25 -0000	1.2
@@ -1,45 +1,3 @@
-From davej  Mon Sep 14 23:44:21 2009
-Return-Path: linux-kernel-owner at vger.kernel.org
-X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
-	gelk.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED,
-	UNPARSEABLE_RELAY autolearn=ham version=3.2.5
-Received: from mail.corp.redhat.com [10.5.5.52]
-	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
-	for <davej at localhost> (single-drop); Mon, 14 Sep 2009 23:44:21 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Mon, 14 Sep 2009 23:40:00 -0400 (EDT)
-Received: from localhost (localhost.localdomain [127.0.0.1])
-	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 29E4E9C046;
-	Mon, 14 Sep 2009 23:40:00 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
-	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id QtHcfoKcpI1L; Mon, 14 Sep 2009 23:39:59 -0400 (EDT)
-Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
-	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id DEF409C00D;
-	Mon, 14 Sep 2009 23:39:59 -0400 (EDT)
-Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.13])
-	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8F3do6r019578;
-	Mon, 14 Sep 2009 23:39:51 -0400
-Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
-	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8F3XNpe025401;
-	Mon, 14 Sep 2009 23:39:37 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S1758085AbZIODja (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
-	Mon, 14 Sep 2009 23:39:30 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S934353AbZIODj2
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Mon, 14 Sep 2009 23:39:28 -0400
-Received: from casper.infradead.org ([85.118.1.10]:38759 "EHLO
-	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1758054AbZIODj1 (ORCPT
-	<rfc822;linux-kernel at vger.kernel.org>);
-	Mon, 14 Sep 2009 23:39:27 -0400
-Received: from aalborg.xs4all.nl ([82.94.0.130] helo=localhost.localdomain)
-	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
-	id 1MnOt1-0004XM-HQ; Tue, 15 Sep 2009 03:39:23 +0000
 Date: 	Tue, 15 Sep 2009 05:42:59 +0200
 From: Arjan van de Ven <arjan at infradead.org>
 To: linux-kernel at vger.kernel.org
@@ -49,22 +7,6 @@ Cc: Andrew Morton <akpm at linux-foundation
         Ivan Kokshaysky <ink at jurassic.park.msu.ru>
 Subject: [PATCH v2] cpuidle: Fix the menu governor to boost IO performance
 Message-ID: <20090915054259.5282e5ba at infradead.org>
-Organization: Intel
-Mime-Version: 1.0
-Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
-	See http://www.infradead.org/rpr.html
-Sender: linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: 	linux-kernel at vger.kernel.org
-X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
-X-Scanned-By: MIMEDefang 2.67 on 10.5.110.13
-Status: RO
-Content-Length: 14160
-Lines: 428
 
 Reworked patch based on Andrew's review feedback and spelling fixes.
 Rather than adding a new governor temporarily, this just puts the fixes



From hadess at fedoraproject.org  Thu Sep 17 17:28:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 17:28:16 +0000 (UTC)
Subject: rpms/gupnp-ui/devel gupnp-ui.spec,1.6,1.7
Message-ID: <20090917172816.0AD6F11C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7105

Modified Files:
	gupnp-ui.spec 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.1.1-6
- Rebuild for new gupnp



Index: gupnp-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-ui/devel/gupnp-ui.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gupnp-ui.spec	7 Aug 2009 12:39:55 -0000	1.6
+++ gupnp-ui.spec	17 Sep 2009 17:28:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gupnp-ui
 Version:        0.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GUPnP-UI is a collection of helpers for adding ui to upnp apps
 
 Group:          System Environment/Libraries
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.1.1-6
+- Rebuild for new gupnp
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0.1.1-5
 - Rebuild for Fedora 12 mass rebuild
 - Fix the docs subpackage files section



From krh at fedoraproject.org  Thu Sep 17 17:36:56 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 17 Sep 2009 17:36:56 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1817, 1.1818 drm-page-flip.patch,
	1.8, NONE
Message-ID: <20090917173656.BC2EA11C00CE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9718

Modified Files:
	kernel.spec 
Removed Files:
	drm-page-flip.patch 
Log Message:
* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com>
- Drop drm page-flip patch for F12.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1817
retrieving revision 1.1818
diff -u -p -r1.1817 -r1.1818
--- kernel.spec	17 Sep 2009 17:21:48 -0000	1.1817
+++ kernel.spec	17 Sep 2009 17:36:56 -0000	1.1818
@@ -704,7 +704,6 @@ Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
-Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
@@ -1377,7 +1376,6 @@ ApplyPatch drm-nouveau.patch
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
@@ -2072,6 +2070,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com>
+- Drop drm page-flip patch for F12.
+
 * Thu Sep 17 2009 Dave Jones <davej at redhat.com>
 - cpuidle: Fix the menu governor to boost IO performance.
 


--- drm-page-flip.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Sep 17 17:44:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 17:44:42 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.28,1.29
Message-ID: <20090917174442.B504E11C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12176

Modified Files:
	nbtk.spec 
Log Message:
- And once more with feeling.


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nbtk.spec	17 Sep 2009 17:05:12 -0000	1.28
+++ nbtk.spec	17 Sep 2009 17:44:42 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -79,13 +79,16 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/nbtk-1.0
+%{_includedir}/nbtk-1.2
 %{_libdir}/pkgconfig/nbtk*.pc
 %{_libdir}/libnbtk*.so
 %{_datadir}/gir-1.0/Nbtk*.gir
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-5
+- And once more with feeling.
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-4
 - And other fix
 



From epienbro at fedoraproject.org  Thu Sep 17 17:48:25 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 17 Sep 2009 17:48:25 +0000 (UTC)
Subject: rpms/mingw32-libxslt/devel mingw32-libxslt-dont-use-pthread.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-libxslt.spec, 1.4,
	1.5 sources, 1.2, 1.3 libexslt-rc4.patch, 1.1,
	NONE mingw32-libxslt-1.1.24-win32-shared.patch, 1.1,
	NONE mingw32-libxslt-ftbfs.patch, 1.1, NONE
Message-ID: <20090917174825.8B4B211C00CE@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13531

Modified Files:
	.cvsignore mingw32-libxslt.spec sources 
Added Files:
	mingw32-libxslt-dont-use-pthread.patch 
Removed Files:
	libexslt-rc4.patch mingw32-libxslt-1.1.24-win32-shared.patch 
	mingw32-libxslt-ftbfs.patch 
Log Message:
* Thu Sep 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.25-1
- Update to 1.1.25
- Dropped upstreamed CVE patch
- Dropped upstreamed mingw32 patches
- Added a patch to never use pthreads even if it's available
- Automatically generate debuginfo subpackages


mingw32-libxslt-dont-use-pthread.patch:
 configure.in |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE mingw32-libxslt-dont-use-pthread.patch ---
--- libxslt-1.1.25/configure.in.orig	2009-09-17 19:41:13.219723199 +0200
+++ libxslt-1.1.25/configure.in	2009-09-17 19:41:22.887973276 +0200
@@ -137,12 +137,6 @@
 
 dnl Look for pthread.h, needed for testThreads
 THREAD_LIBS=""
-AC_CHECK_HEADER(pthread.h,
-    AC_CHECK_LIB(pthread, pthread_join,[
-       AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
-       AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
-       THREAD_LIBS="-lpthread"]))
-
 AC_SUBST(THREAD_LIBS)
 
 dnl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 May 2009 12:42:07 -0000	1.2
+++ .cvsignore	17 Sep 2009 17:48:25 -0000	1.3
@@ -1 +1 @@
-libxslt-1.1.24.tar.gz
+libxslt-1.1.25.tar.gz


Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/mingw32-libxslt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libxslt.spec	25 Jul 2009 14:26:26 -0000	1.4
+++ mingw32-libxslt.spec	17 Sep 2009 17:48:25 -0000	1.5
@@ -3,10 +3,11 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libxslt
-Version:        1.1.24
-Release:        9%{?dist}
+Version:        1.1.25
+Release:        1%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -17,12 +18,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-# Fix for CVE-2008-2935
-Patch1:         libexslt-rc4.patch
-
 # Fix compilation on MinGW environments
-Patch1000:      mingw32-libxslt-1.1.24-win32-shared.patch
-Patch1001:      mingw32-libxslt-ftbfs.patch
+Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 
 BuildRequires:  mingw32-filesystem >= 30
 BuildRequires:  mingw32-gcc
@@ -54,6 +51,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows LibXSLT library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libxslt-%{version}
 
@@ -61,10 +61,7 @@ Static version of the MinGW Windows LibX
 # this isn't interesting for MinGW environments
 #%patch0 -p1
 
-%patch1 -p0
-
 %patch1000 -p1
-%patch1001 -p0
 
 libtoolize --force --copy
 autoreconf
@@ -96,8 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/xsltproc.exe
 %{_mingw32_includedir}/libexslt
 %{_mingw32_includedir}/libxslt
-#%{_mingw32_bindir}/libexslt.dll
-#%{_mingw32_libdir}/libexslt.dll.a
+%{_mingw32_bindir}/libexslt-0.dll
+%{_mingw32_libdir}/libexslt.dll.a
 %{_mingw32_libdir}/libexslt.la
 %{_mingw32_bindir}/libxslt-1.dll
 %{_mingw32_libdir}/libxslt.dll.a
@@ -115,6 +112,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.25-1
+- Update to 1.1.25
+- Dropped upstreamed CVE patch
+- Dropped upstreamed mingw32 patches
+- Added a patch to never use pthreads even if it's available
+- Automatically generate debuginfo subpackages
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.24-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 May 2009 12:42:08 -0000	1.2
+++ sources	17 Sep 2009 17:48:25 -0000	1.3
@@ -1 +1 @@
-e83ec5d27fc4c10c6f612879bea9a153  libxslt-1.1.24.tar.gz
+50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz


--- libexslt-rc4.patch DELETED ---


--- mingw32-libxslt-1.1.24-win32-shared.patch DELETED ---


--- mingw32-libxslt-ftbfs.patch DELETED ---



From krh at fedoraproject.org  Thu Sep 17 18:02:00 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 17 Sep 2009 18:02:00 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec, 1.30,
	1.31 dri2-page-flip.patch, 1.3, NONE
Message-ID: <20090917180200.7C56511C00CE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21660

Modified Files:
	xorg-x11-drv-intel.spec 
Removed Files:
	dri2-page-flip.patch 
Log Message:
* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-14.20090909
- Drop page flip patch.



Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xorg-x11-drv-intel.spec	9 Sep 2009 14:30:33 -0000	1.30
+++ xorg-x11-drv-intel.spec	17 Sep 2009 18:02:00 -0000	1.31
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   13.%{gitdate}%{?dist}
+Release:   14.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -28,7 +28,6 @@ Patch2: copy-fb.patch
 Patch20: intel-2.8.0-kms-get-crtc.patch
 Patch21: intel-2.8.0-lvds-first.patch
 
-Patch40: dri2-page-flip.patch
 Patch60: uevent.patch
 Patch70: lvds-modes.patch
 
@@ -82,7 +81,6 @@ Debugging tools for Intel graphics chips
 %patch2 -p1 -b .copy-fb
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
-%patch40 -p1 -b .flip
 %patch60 -p1 -b .uevent
 %patch70 -p1 -b .lvds-modes
 
@@ -140,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-14.20090909
+- Drop page flip patch.
+
 * Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 2.8.0-13.20090909
 - Today's git snap
 


--- dri2-page-flip.patch DELETED ---



From wtogami at fedoraproject.org  Thu Sep 17 18:05:19 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 18:05:19 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.128,1.129
Message-ID: <20090917180519.EDE4811C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23844

Modified Files:
	spamassassin.spec 
Log Message:
F12+ requires Mail::DKIM



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- spamassassin.spec	14 Sep 2009 02:44:55 -0000	1.128
+++ spamassassin.spec	17 Sep 2009 18:05:19 -0000	1.129
@@ -18,6 +18,7 @@
 # Define variables to use in conditionals
 %define option_ssl 0
 %define perl_devel 0
+%define dkim_deps  0
 
 # SSL and IPv6 (FC6+, RHEL5+)
 %if 0%{?fedora} > 5
@@ -29,6 +30,11 @@
 %define perl_devel 1
 %endif
 
+# Mail::DKIM by default (F12+)
+%if 0%{?fedora} >= 12
+%define dkim_deps 1
+%endif
+
 %define real_name Mail-SpamAssassin
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
@@ -36,7 +42,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename alpha2
-Release: 0.12.alpha2%{?dist}
+Release: 0.13.alpha2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -71,7 +77,6 @@ Requires: perl(LWP::UserAgent)
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
-Requires: perl(Mail::DKIM)
 Requires: procmail
 Requires: gnupg
 
@@ -90,6 +95,12 @@ Requires: perl(IO::Socket::INET6)
 %if %{perl_devel}
 BuildRequires: perl-devel
 %endif
+# Mail::DKIM for F12+, works from RHEL5+ from EPEL5 but we don't require them
+%if %{dkim_deps}
+Requires: perl(Mail::DKIM)
+%endif
+
+
 
 Obsoletes: perl-Mail-SpamAssassin
 
@@ -223,6 +234,9 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.13.alpha2
+- F12+ requires Mail::DKIM
+
 * Sun Sep 13 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.12.alpha2
 - require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL
 



From slankes at fedoraproject.org  Thu Sep 17 18:07:42 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 17 Sep 2009 18:07:42 +0000 (UTC)
Subject: rpms/xdotool/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xdotool.spec, 1.8, 1.9 xdotool-20071230-prefix.patch, 1.1,
	NONE xdotool-20090330-prefix.patch, 1.1, NONE
Message-ID: <20090917180742.6D67511C00CE@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/xdotool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24954

Modified Files:
	.cvsignore sources xdotool.spec 
Removed Files:
	xdotool-20071230-prefix.patch xdotool-20090330-prefix.patch 
Log Message:
* Thu Sep 17 2009 Sven Lankes <sven at lank.es> - 20090815-1
- New upstream release (fixes #521765)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 May 2009 14:02:26 -0000	1.4
+++ .cvsignore	17 Sep 2009 18:07:42 -0000	1.5
@@ -1 +1 @@
-xdotool-20090330.tar.gz
+xdotool-20090815.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 May 2009 14:02:26 -0000	1.4
+++ sources	17 Sep 2009 18:07:42 -0000	1.5
@@ -1 +1 @@
-c6cd2bd236519ef04659c1737d880ed7  xdotool-20090330.tar.gz
+32b1127c0c24f5b3d0a1a1c09b3d44f8  xdotool-20090815.tar.gz


Index: xdotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/devel/xdotool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xdotool.spec	27 Jul 2009 07:44:39 -0000	1.8
+++ xdotool.spec	17 Sep 2009 18:07:42 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           xdotool
-Version:        20090330
-Release:        4%{?dist}
+Version:        20090815
+Release:        1%{?dist}
 Summary:        Fake keyboard/mouse input
 
 Group:          User Interface/X
 License:        BSD
 URL:            http://www.semicomplete.com/projects/xdotool/
 Source0:        http://www.semicomplete.com/files/xdotool/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-prefix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXtst-devel, libX11-devel
@@ -18,7 +17,6 @@ and mouse activity, move and resize wind
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 export WARNFLAGS="$RPM_OPT_FLAGS"
@@ -45,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Sven Lankes <sven at lank.es> - 20090815-1
+- New upstream release (fixes #521765)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090330-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xdotool-20071230-prefix.patch DELETED ---


--- xdotool-20090330-prefix.patch DELETED ---



From rdieter at fedoraproject.org  Thu Sep 17 18:14:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 18:14:26 +0000 (UTC)
Subject: rpms/lyx/devel lyx-1.6.4-enchant.patch, NONE, 1.1 lyx.spec, 1.99,
	1.100
Message-ID: <20090917181426.BBE8A11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26904

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.6.4-enchant.patch 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-2
- use enchant instead of aspell (#524046)


lyx-1.6.4-enchant.patch:
 config.h.in                           |    3 
 config/spell.m4                       |   33 ++++++++-
 src/Enchant.cpp                       |  122 ++++++++++++++++++++++++++++++++++
 src/Enchant.h                         |   78 +++++++++++++++++++++
 src/Makefile.am                       |    9 +-
 src/frontends/qt4/GuiPrefs.cpp        |    6 +
 src/frontends/qt4/GuiSpellchecker.cpp |    9 +-
 src/frontends/qt4/GuiView.cpp         |    2 
 8 files changed, 251 insertions(+), 11 deletions(-)

--- NEW FILE lyx-1.6.4-enchant.patch ---
diff -ru lyx-1.6.4.orig/config/spell.m4 lyx-1.6.4/config/spell.m4
--- lyx-1.6.4.orig/config/spell.m4	2009-09-17 14:50:06.000000000 +0100
+++ lyx-1.6.4/config/spell.m4	2009-09-17 15:30:52.000000000 +0100
@@ -1,3 +1,23 @@
+# Macro to add for using enchant spellchecker libraries!     -*- sh -*-
+AC_DEFUN([CHECK_WITH_ENCHANT],
+[
+    lyx_use_enchant=true
+    AC_ARG_WITH(enchant,	AC_HELP_STRING([--with-enchant],[use Enchant libraries]))
+    test "$with_enchant" = "no" && lyx_use_enchant=false
+
+    if $lyx_use_enchant; then
+        PKG_CHECK_MODULES([ENCHANT], [enchant], [], [lyx_use_aspell=false])
+	AC_MSG_CHECKING([whether to use enchant])
+	if $lyx_use_enchant ; then
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant library])
+	    lyx_flags="$lyx_flags use-enchant"
+	else
+	    AC_MSG_RESULT(no)
+	fi
+    fi
+    ])
+
 # Macro to add for using aspell spellchecker libraries!     -*- sh -*-
 # Only checks for "new" aspell, > 0.50
 AC_DEFUN([CHECK_WITH_ASPELL],
@@ -50,14 +70,18 @@
 ### Check if we want spell libraries, prefer new aspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
+    lyx_use_enchant=false
     lyx_use_aspell=false
     lyx_use_pspell=false
     lyx_use_ispell=false
 
-    dnl Prefer use of the aspell library over pspell.
-    CHECK_WITH_ASPELL
-    if $lyx_use_aspell ; then : ; else
-        CHECK_WITH_PSPELL
+    dnl Prefer in order of enchant, aspell, pspell
+    CHECK_WITH_ENCHANT
+    if $lyx_use_enchant ; then : ; else
+        CHECK_WITH_ASPELL
+        if $lyx_use_aspell ; then : ; else
+            CHECK_WITH_PSPELL
+        fi
     fi
 
     dnl check for the ability to communicate through unix pipes
@@ -76,6 +100,7 @@
       AC_MSG_RESULT(no)
     fi
 
+    AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
     AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
     AM_CONDITIONAL(USE_PSPELL, $lyx_use_pspell)
     AM_CONDITIONAL(USE_ISPELL, $lyx_use_ispell)
diff -ru lyx-1.6.4.orig/config.h.in lyx-1.6.4/config.h.in
--- lyx-1.6.4.orig/config.h.in	2009-09-17 14:50:03.000000000 +0100
+++ lyx-1.6.4/config.h.in	2009-09-17 16:17:58.000000000 +0100
@@ -503,6 +503,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
+/* Define as 1 to use the enchant library */
+#undef USE_ENCHANT
+
 /* Define as 1 to use the aspell library */
 #undef USE_ASPELL
 
diff -ru lyx-1.6.4.orig/src/frontends/qt4/GuiPrefs.cpp lyx-1.6.4/src/frontends/qt4/GuiPrefs.cpp
--- lyx-1.6.4.orig/src/frontends/qt4/GuiPrefs.cpp	2009-09-17 14:51:03.000000000 +0100
+++ lyx-1.6.4/src/frontends/qt4/GuiPrefs.cpp	2009-09-17 16:15:33.000000000 +0100
@@ -1129,6 +1129,9 @@
 	spellCommandCO->addItem(qt_("ispell"));
 	spellCommandCO->addItem(qt_("aspell"));
 	spellCommandCO->addItem(qt_("hspell"));
+#ifdef USE_ENCHANT
+	spellCommandCO->addItem(qt_("enchant (library)"));
+#else
 #ifdef USE_PSPELL
 	spellCommandCO->addItem(qt_("pspell (library)"));
 #else
@@ -1136,6 +1139,7 @@
 	spellCommandCO->addItem(qt_("aspell (library)"));
 #endif
 #endif
+#endif
 }
 
 
@@ -1180,7 +1184,7 @@
 	}
 
 	if (rc.use_spell_lib) {
-#if defined(USE_ASPELL) || defined(USE_PSPELL)
+#if defined(USE_ENCHANT) || defined(USE_ASPELL) || defined(USE_PSPELL)
 		spellCommandCO->setCurrentIndex(3);
 #endif
 	}
diff -ru lyx-1.6.4.orig/src/frontends/qt4/GuiSpellchecker.cpp lyx-1.6.4/src/frontends/qt4/GuiSpellchecker.cpp
--- lyx-1.6.4.orig/src/frontends/qt4/GuiSpellchecker.cpp	2009-09-17 14:51:09.000000000 +0100
+++ lyx-1.6.4/src/frontends/qt4/GuiSpellchecker.cpp	2009-09-17 16:20:19.000000000 +0100
@@ -32,7 +32,9 @@
 
 #include <QListWidgetItem>
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+# include "Enchant.h"
+#elif defined(USE_ASPELL)
 # include "ASpell_local.h"
 #elif defined(USE_PSPELL)
 # include "PSpell.h"
@@ -205,7 +207,10 @@
 		      ? lyxrc.isp_alt_lang
 		      : bp.language->code();
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+	if (lyxrc.use_spell_lib)
+		return new Enchant(bp, lang);
+#elif defined(USE_ASPELL)
 	if (lyxrc.use_spell_lib)
 		return new ASpell(bp, lang);
 #elif defined(USE_PSPELL)
diff -ru lyx-1.6.4.orig/src/frontends/qt4/GuiView.cpp lyx-1.6.4/src/frontends/qt4/GuiView.cpp
--- lyx-1.6.4.orig/src/frontends/qt4/GuiView.cpp	2009-09-17 14:51:12.000000000 +0100
+++ lyx-1.6.4/src/frontends/qt4/GuiView.cpp	2009-09-17 16:14:11.000000000 +0100
@@ -1221,7 +1221,7 @@
 		else if (name == "latexlog")
 			enable = FileName(buf->logName()).isReadableFile();
 		else if (name == "spellchecker")
-#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
+#if defined (USE_ENCHANT) || defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
 			enable = !buf->isReadonly();
 #else
 			enable = false;
diff -ru lyx-1.6.4.orig/src/Makefile.am lyx-1.6.4/src/Makefile.am
--- lyx-1.6.4.orig/src/Makefile.am	2009-09-17 14:50:37.000000000 +0100
+++ lyx-1.6.4/src/Makefile.am	2009-09-17 15:30:06.000000000 +0100
@@ -4,7 +4,7 @@
 
 DISTCLEANFILES += config.h libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -19,7 +19,7 @@
 	paper.h \
 	pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
 
 noinst_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
@@ -45,6 +45,9 @@
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if USE_ENCHANT
+ENCHANT = Enchant.cpp Enchant.h
+endif
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
 endif
@@ -61,7 +64,7 @@
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
-	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	$(ENCHANT) $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
 	BiblioInfo.h \
 	BiblioInfo.cpp \
 	Box.cpp \
--- /dev/null	2009-08-27 15:49:18.766015946 +0100
+++ lyx-1.6.4/src/Enchant.h	2009-09-17 15:52:54.000000000 +0100
@@ -0,0 +1,78 @@
+// -*- C++ -*-
+/**
+ * \file Enchant.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef LYX_ENCHANT_H
+#define LYX_ENCHANT_H
+
+#include "SpellBase.h"
+
+#include <map>
+#include <string>
+
+namespace enchant {
+    class Dict;
+}
+
+namespace lyx {
+
+class BufferParams;
+
+
+class Enchant : public SpellBase {
+public:
+	/**
+	 * Initialise the spellchecker with the given buffer params and language.
+	 */
+	Enchant(BufferParams const & params, std::string const & lang);
+
+	virtual ~Enchant();
+
+	/**
+	 * return true if the spellchecker instance still exists
+	 * Always true for enchant, since there is no separate process
+	 */
+	virtual bool alive() { return true; }
+
+	/// check the given word and return the result
+	virtual enum Result check(WordLangTuple const &);
+
+	/// insert the given word into the personal dictionary
+	virtual void insert(WordLangTuple const &);
+
+	/// accept the given word temporarily
+	virtual void accept(WordLangTuple const &);
+
+	/// return the next near miss after a SUGGESTED_WORDS result
+	virtual docstring const nextMiss();
+
+	/// give an error message on messy exit
+	virtual docstring const error();
+
+private:
+	/// add a speller of the given language
+	void addSpeller(std::string const & lang);
+
+	struct Speller {
+		enchant::Dict* speller;
+	};
+
+	typedef std::map<std::string, Speller> Spellers;
+
+	/// the spellers
+	Spellers spellers_;
+
+        std::vector<std::string> els;
+};
+
+
+} // namespace lyx
+
+#endif // LYX_ENCHANT_H
--- /dev/null	2009-08-27 15:49:18.766015946 +0100
+++ lyx-1.6.4/src/Enchant.cpp	2009-09-17 16:03:24.000000000 +0100
@@ -0,0 +1,122 @@
+/**
+ * \file Enchant.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "support/debug.h"
+
+#include <enchant++.h>
+
+#include "Enchant.h"
+#include "LyXRC.h"
+#include "WordLangTuple.h"
+
+#include "support/lassert.h"
+
+using namespace std;
+
+namespace lyx {
+
+Enchant::Enchant(BufferParams const &, string const & lang)
+{
+	addSpeller(lang);
+}
+
+
+Enchant::~Enchant()
+{
+	Spellers::iterator it = spellers_.begin();
+	Spellers::iterator end = spellers_.end();
+
+	for (; it != end; ++it) {
+		delete it->second.speller;
+	}
+}
+
+
+void Enchant::addSpeller(string const & lang)
+{
+	enchant::Broker * instance = enchant::Broker::instance();
+	enchant::Dict * dict = instance->request_dict(lang);
+
+	if (dict) {
+		Speller m;
+		m.speller = dict;
+		spellers_[lang] = m;
+	}
+}
+
+
+Enchant::Result Enchant::check(WordLangTuple const & word)
+{
+	Result res = UNKNOWN_WORD;
+
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it == spellers_.end()) {
+		addSpeller(word.lang_code());
+		it = spellers_.find(word.lang_code());
+		// FIXME
+		if (it == spellers_.end())
+			return res;
+	}
+
+	enchant::Dict * m = it->second.speller;
+
+	std::string utf8word(to_utf8(word.word()));
+
+	if (m->check(utf8word))
+		return OK;
+
+	m->suggest(utf8word, els);
+	if (els.empty())
+		res = UNKNOWN_WORD;
+	else
+		res = SUGGESTED_WORDS;
+
+	return res;
+}
+
+
+void Enchant::insert(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add(to_utf8(word.word()));
+}
+
+
+void Enchant::accept(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add_to_session(to_utf8(word.word()));
+}
+
+
+docstring const Enchant::nextMiss()
+{
+	docstring str;
+
+	if (!els.empty()) {
+		str = from_utf8(els.front());
+		els.erase(els.begin());
+	}
+
+	return str;
+}
+
+
+docstring const Enchant::error()
+{
+	return docstring();
+}
+
+
+} // namespace lyx


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- lyx.spec	22 Aug 2009 18:07:28 -0000	1.99
+++ lyx.spec	17 Sep 2009 18:14:26 -0000	1.100
@@ -24,7 +24,7 @@ BuildRequires: fontpackages-devel
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -35,6 +35,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch1: lyx-1.6.4-xdg_open.patch
 
+## upstreamed patches
+# http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
+Patch50: lyx-1.6.4-enchant.patch
+
 Source1: lyxrc.dist
 
 Source10: lyx.desktop
@@ -42,7 +46,8 @@ Source10: lyx.desktop
 %if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
 %endif
-BuildRequires: aspell-devel
+# enchant support, via patch50, needs reauto*foo'ing
+BuildRequires: enchant-devel automake libtool
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
 %endif
@@ -115,6 +120,7 @@ and let the computer take care of the re
 
 %package common
 Summary:  Common files of %{name} 
+Group:    Applications/Publishing
 Requires: %{name} = %{version}-%{release}
 %{?build_noarch}
 %description common 
@@ -123,6 +129,7 @@ Requires: %{name} = %{version}-%{release
 %package -n %{fontname}-fonts-compat
 Summary: Lyx/MathML fonts compatibility package
 License: Copyright only and GPL+
+Group:   Applications/Publishing
 Obsoletes: mathml-fonts < 1.0-50
 Provides:  mathml-fonts = 1.0-50
 Provides: %{fontname}-fonts = %{version}-%{release}
@@ -143,6 +150,7 @@ do not reference it or depend on it in a
 
 %package -n %{fontname}-fonts-common
 Summary: Common files of %{fontname}-fonts
+Group:   Applications/Publishing
 # The actual license says "The author of these fonts, Basil K. Malyshev, has
 # kindly granted permission to use and modify these fonts."
 # One of the font files (wasy10) is separately licensed GPL+.
@@ -154,6 +162,7 @@ This package consists of files used by o
 
 %package -n %{fontname}-cmex10-fonts
 Summary: Cmex10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -162,6 +171,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmmi10-fonts
 Summary: Cmmi10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -170,6 +180,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmr10-fonts
 Summary: Cmr10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -178,6 +189,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmsy10-fonts
 Summary: Cmsy10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -186,6 +198,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-esint10-fonts
 Summary: Esint10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -194,6 +207,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-eufm10-fonts
 Summary: Eufm10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -202,6 +216,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-msam10-fonts
 Summary: Msam10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -210,6 +225,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-msbm10-fonts
 Summary: Msbm10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -218,6 +234,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-wasy10-fonts
 Summary: Wasy10 fonts
+Group:   Applications/Publishing
 License: GPL+
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -229,6 +246,10 @@ Requires: %{fontname}-fonts-common = %{v
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
+%patch50 -p1 -b .enchant
+
+# needed by patch50
+./autogen.sh
 
 
 %build
@@ -238,7 +259,7 @@ Requires: %{fontname}-fonts-common = %{v
   --disable-rpath \
   --enable-build-type=release \
   --enable-optimization="%{optflags}" \
-  --with-aspell \
+  --with-enchant \
   --with-qt4-dir=`pkg-config --variable=prefix QtCore` \
   %{?_with_aiksaurus} \
   %{?_without_included_boost}
@@ -425,6 +446,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-2
+- use enchant instead of aspell (#524046)
+
 * Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
 - lyx-1.6.4
 - handle fonts manually (now EPEL-5 compatible)



From pbrobinson at fedoraproject.org  Thu Sep 17 18:14:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 17 Sep 2009 18:14:42 +0000 (UTC)
Subject: rpms/moblin-panel-applications/devel .cvsignore, 1.2,
	1.3 moblin-panel-applications.spec, 1.1, 1.2 sources, 1.2,
	1.3 import.log, 1.1, NONE
Message-ID: <20090917181442.B527F11C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-applications/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27060

Modified Files:
	.cvsignore moblin-panel-applications.spec sources 
Removed Files:
	import.log 
Log Message:
- New upstream 0.0.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Aug 2009 18:59:15 -0000	1.2
+++ .cvsignore	17 Sep 2009 18:14:42 -0000	1.3
@@ -1 +1 @@
-moblin-panel-applications-0.0.1.tar.bz2
+moblin-panel-applications-0.0.2.tar.bz2


Index: moblin-panel-applications.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/moblin-panel-applications.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-applications.spec	21 Aug 2009 18:59:15 -0000	1.1
+++ moblin-panel-applications.spec	17 Sep 2009 18:14:42 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           moblin-panel-applications
-Version:        0.0.1
+Version:        0.0.2
 Release:        1%{?dist}
 Summary:        Moblin Panel for launching Applications
 
@@ -53,5 +53,8 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
+- New upstream 0.0.2 release
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Aug 2009 18:59:15 -0000	1.2
+++ sources	17 Sep 2009 18:14:42 -0000	1.3
@@ -1 +1 @@
-62783ff603f2fc215d7748a0793ed736  moblin-panel-applications-0.0.1.tar.bz2
+d2e683763ff8cabe816e212a279e967a  moblin-panel-applications-0.0.2.tar.bz2


--- import.log DELETED ---



From slankes at fedoraproject.org  Thu Sep 17 18:16:26 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 17 Sep 2009 18:16:26 +0000 (UTC)
Subject: rpms/xdotool/devel xdotool-20090126-prefix.patch,1.1,NONE
Message-ID: <20090917181626.BA1B711C00EC@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/xdotool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27747/devel

Removed Files:
	xdotool-20090126-prefix.patch 
Log Message:
* Thu Sep 17 2009 Sven Lankes <sven at lank.es> - 20090815-1
- New upstream release (fixes #521765)



--- xdotool-20090126-prefix.patch DELETED ---



From slankes at fedoraproject.org  Thu Sep 17 18:16:26 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 17 Sep 2009 18:16:26 +0000 (UTC)
Subject: rpms/xdotool/F-11 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 xdotool.spec, 1.8, 1.9 xdotool-20071230-prefix.patch, 1.1,
	NONE xdotool-20090126-prefix.patch, 1.1,
	NONE xdotool-20090330-prefix.patch, 1.1, NONE
Message-ID: <20090917181626.A9CE211C00CE@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/xdotool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27747/F-11

Modified Files:
	.cvsignore sources xdotool.spec 
Removed Files:
	xdotool-20071230-prefix.patch xdotool-20090126-prefix.patch 
	xdotool-20090330-prefix.patch 
Log Message:
* Thu Sep 17 2009 Sven Lankes <sven at lank.es> - 20090815-1
- New upstream release (fixes #521765)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Apr 2009 03:08:10 -0000	1.3
+++ .cvsignore	17 Sep 2009 18:16:26 -0000	1.4
@@ -1 +1 @@
-xdotool-20090126.tar.gz
+xdotool-20090815.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 May 2009 14:03:18 -0000	1.4
+++ sources	17 Sep 2009 18:16:26 -0000	1.5
@@ -1 +1 @@
-c6cd2bd236519ef04659c1737d880ed7  xdotool-20090330.tar.gz
+32b1127c0c24f5b3d0a1a1c09b3d44f8  xdotool-20090815.tar.gz


Index: xdotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/F-11/xdotool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xdotool.spec	29 May 2009 14:14:57 -0000	1.8
+++ xdotool.spec	17 Sep 2009 18:16:26 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           xdotool
-Version:        20090330
-Release:        3%{?dist}
+Version:        20090815
+Release:        1%{?dist}
 Summary:        Fake keyboard/mouse input
 
 Group:          User Interface/X
 License:        BSD
 URL:            http://www.semicomplete.com/projects/xdotool/
 Source0:        http://www.semicomplete.com/files/xdotool/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-prefix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXtst-devel, libX11-devel
@@ -18,7 +17,6 @@ and mouse activity, move and resize wind
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 export WARNFLAGS="$RPM_OPT_FLAGS"
@@ -45,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Sven Lankes <sven at lank.es> - 20090815-1
+- New upstream release (fixes #521765)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090330-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 28 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 20090330-2
 - New upstream release
 


--- xdotool-20071230-prefix.patch DELETED ---


--- xdotool-20090126-prefix.patch DELETED ---


--- xdotool-20090330-prefix.patch DELETED ---



From hadess at fedoraproject.org  Thu Sep 17 18:16:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 18:16:46 +0000 (UTC)
Subject: rpms/gupnp-vala/devel gupnp-vala.spec, 1.8,
	1.9 gupnp-vala-pkgconfigpaths.patch, 1.1, NONE
Message-ID: <20090917181646.B934611C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27891

Modified Files:
	gupnp-vala.spec 
Removed Files:
	gupnp-vala-pkgconfigpaths.patch 
Log Message:
Remove obsoleted patch


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/gupnp-vala.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gupnp-vala.spec	17 Sep 2009 13:31:05 -0000	1.8
+++ gupnp-vala.spec	17 Sep 2009 18:16:46 -0000	1.9
@@ -7,7 +7,6 @@ Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.gupnp.org/
 Source0:        http://www.gupnp.org/sources/bindings/%{name}-%{version}.tar.gz
-Patch0:		gupnp-vala-pkgconfigpaths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: vala-devel >= 0.7.0
@@ -29,7 +28,6 @@ This package adds vala language bindings
 
 %prep
 %setup -q
-%patch0 -p1 -b .pkgconfigpaths
 
 %build
 # The generated files are noarch, but configure need to be told the


--- gupnp-vala-pkgconfigpaths.patch DELETED ---



From hadess at fedoraproject.org  Thu Sep 17 18:28:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 18:28:16 +0000 (UTC)
Subject: rpms/gupnp-igd/devel gupnp-igd.spec,1.5,1.6
Message-ID: <20090917182816.989B711C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gupnp-igd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32195

Modified Files:
	gupnp-igd.spec 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.1.3-3
- Rebuild for new gupnp



Index: gupnp-igd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/devel/gupnp-igd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gupnp-igd.spec	25 Jul 2009 01:53:55 -0000	1.5
+++ gupnp-igd.spec	17 Sep 2009 18:28:16 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           gupnp-igd
 Version:        0.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:	Library to handle UPnP IGD port mapping        
 
 Group:          System Environment/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.1.3-3
+- Rebuild for new gupnp
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chkr at fedoraproject.org  Thu Sep 17 18:31:45 2009
From: chkr at fedoraproject.org (chkr)
Date: Thu, 17 Sep 2009 18:31:45 +0000 (UTC)
Subject: rpms/f-spot/devel 0001-fix-parallel-build.patch, NONE,
	1.1 .cvsignore, 
	1.21, 1.22 0001-use-system-Mono.Addins-if-available.patch, 1.1,
	1.2 f-spot.spec, 1.90, 1.91 sources, 1.21,
	1.22 0001-use-the-correct-stock-icon.patch, 1.1, NONE
Message-ID: <20090917183145.3147411C00CE@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv964

Modified Files:
	.cvsignore 0001-use-system-Mono.Addins-if-available.patch 
	f-spot.spec sources 
Added Files:
	0001-fix-parallel-build.patch 
Removed Files:
	0001-use-the-correct-stock-icon.patch 
Log Message:
* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
- move the screensaver plugin into a sub-package (BZ 519640)
- let f-spot-screensaver obsolete older f-spot version so that it
  is pulled in during update (fresh installations of f-spot will not
  pull in gnome-screensaver)

* Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
- update to 0.6.1.1
- remove upstreamed patch
- updated use-system-Mono.Addins-if-available patch
- add a patch to enable parallel build



0001-fix-parallel-build.patch:
 extensions/Exporters/FlickrExport/Makefile.am    |    3 ---
 extensions/Exporters/PicasaWebExport/Makefile.am |    3 ---
 extensions/Exporters/SmugMugExport/Makefile.am   |    4 ----
 extensions/Exporters/TabbloExport/Makefile.am    |    3 ---
 src/Makefile.am                                  |    5 ++---
 5 files changed, 2 insertions(+), 16 deletions(-)

--- NEW FILE 0001-fix-parallel-build.patch ---
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 812904c..6457ffd 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -34,13 +34,10 @@ RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 45e3bac..b617fc8 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -35,13 +35,10 @@ RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 397461f..f96d603 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -34,14 +34,10 @@ RESOURCES =				\
 SUBDIRS =                      \
 	SmugMugNet
 
-
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b7465d6..915a95f 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -44,13 +44,10 @@ RESOURCES = \
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade \
 	-resource:$(srcdir)/TrustError.glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/src/Makefile.am b/src/Makefile.am
index 02add7d..ba9bcaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -509,13 +509,13 @@ FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
 
 FSpot.Bling.dll.mdb: FSpot.Bling.dll
 
-FSpot.Bling.dll: $(BLING_CSFILES)
+FSpot.Bling.dll: $(BLING_CSFILES) FSpot.Utils.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(BLING_CSFILES) $(BLING_ASSEMBLIES)
 
 FSpot.Widgets.dll.mdb: FSpot.Widgets.dll
 
-FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
+FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll Cms.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Aug 2009 14:43:22 -0000	1.21
+++ .cvsignore	17 Sep 2009 18:31:43 -0000	1.22
@@ -1 +1 @@
-f-spot-0.6.0.0.tar.bz2
+f-spot-0.6.1.1.tar.bz2

0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

Index: 0001-use-system-Mono.Addins-if-available.patch
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/0001-use-system-Mono.Addins-if-available.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-use-system-Mono.Addins-if-available.patch	9 Aug 2009 14:43:22 -0000	1.1
+++ 0001-use-system-Mono.Addins-if-available.patch	17 Sep 2009 18:31:44 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/Makefile.include b/Makefile.include
-index efd6d72..4be9a8b 100644
+index ca739b8..43e748f 100644
 --- a/Makefile.include
 +++ b/Makefile.include
 @@ -3,9 +3,6 @@
@@ -12,7 +12,7 @@ index efd6d72..4be9a8b 100644
  DIR_DOCS = $(top_builddir)/docs
  DIR_EXTENSIONS = $(top_builddir)/extensions
  DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+@@ -24,10 +21,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
  LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
@@ -21,10 +21,10 @@ index efd6d72..4be9a8b 100644
 -	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
 -	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = 								\
- 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+ LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
 diff --git a/configure.ac b/configure.ac
-index e31bd27..1acaaa6 100644
+index fe0bdc9..237e6bd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
@@ -35,9 +35,9 @@ index e31bd27..1acaaa6 100644
  MONO_CAIRO_REQUIRED=1.2.4
  dnl -- this check is 	
  LCMS_REQUIRED=1.12
-@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
- 
- AC_SUBST(CSC_DEFINES)
+@@ -146,6 +147,33 @@ AC_SUBST(DIR_DBUS_GLIB)
+ AC_SUBST(LINK_DBUS)
+ AC_SUBST(PATH_DBUS)
  
 +dnl -- mono-addins link or bundle ?
 +PKG_CHECK_MODULES(MONO_ADDINS, 
@@ -66,11 +66,11 @@ index e31bd27..1acaaa6 100644
 +AC_SUBST(DIR_ADDINS_GUI)
 +AC_SUBST(LINK_MONO_ADDINS)
 +
- dnl -- dbus-sharp: link or bundle ?
- PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
- [
+ dnl -- nunit
+ PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED, 
+ 	do_tests="yes", do_tests="no")
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c6d69f9..d0b9a6c 100644
+index f2adf82..ea888d8 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
@@ -78,21 +78,21 @@ index c6d69f9..d0b9a6c 100644
  	libfspot			\
  	libgphoto2-sharp	\
 -	mono-addins			\
- 	semweb				\
- 	Tao
+ 	semweb
  
-@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
+ # Depending on whether the packaged ndesk-dbus is used, we might not want to
+@@ -20,11 +19,13 @@ UNCONDITIONAL_SUBDIRS = \
  SUBDIRS = 				\
  	$(DIR_DBUS)			\
  	$(DIR_DBUS_GLIB)	\
-+	$(DIR_ADDINS)	\
++	$(DIR_ADDINS)			\
  	$(UNCONDITIONAL_SUBDIRS)
  
  DIST_SUBDIRS = 			\
  	dbus-sharp			\
  	dbus-sharp-glib		\
-+	mono-addins		\
  	dpap-sharp			\
++	mono-addins			\
  	$(UNCONDITIONAL_SUBDIRS)
  
 -- 


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- f-spot.spec	9 Aug 2009 15:57:15 -0000	1.90
+++ f-spot.spec	17 Sep 2009 18:31:44 -0000	1.91
@@ -1,14 +1,14 @@
 Name:           f-spot
-Version:        0.6.0.0
-Release:        3%{?dist}
+Version:        0.6.1.1
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=591223
-Patch1:         0001-use-the-correct-stock-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593243
+Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
@@ -31,7 +31,6 @@ Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
 Requires:       hicolor-icon-theme 
-Requires:       gnome-screensaver
 Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -50,10 +49,20 @@ F-Spot is an application designed to pro
 to the GNOME desktop. Features include import, export, printing and advanced
 sorting and tagging of digital images. 
 
+%package screensaver
+Summary: F-Spot gnome-screensaver plugin
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-screensaver
+Obsoletes: f-spot < 0.6.1.1
+
+%description screensaver
+F-Spot provides a plugin for gnome-screensaver which displays parts of the
+photo collection in a slideshow as a screensaver.
+
 %prep
 %setup -q
-
-%patch1 -p1 -b .missing-icon
+%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 
@@ -61,8 +70,7 @@ sorting and tagging of digital images. 
 autoreconf -f -i
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-scrollkeeper
-# parallel build broken in 0.6.0.0, try again with next release
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -108,15 +116,40 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/f-spot/
-%{_libdir}/f-spot/
+%dir %{_libdir}/f-spot/
+%{_libdir}/f-spot/*.dll
+%{_libdir}/f-spot/*.exe
+%{_libdir}/f-spot/*.addins
+%{_libdir}/f-spot/*.config
+%{_libdir}/f-spot/*.mdb
+%{_libdir}/f-spot/*.so
+%{_libdir}/f-spot/*.so.*
+%exclude %{_libdir}/f-spot/extensions/ScreensaverConfig.dll
+%{_libdir}/f-spot/extensions/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
+%{_datadir}/omf/f-spot/
+
+%files screensaver
+%defattr(-,root,root,-)
+%{_libdir}/f-spot/extensions/ScreensaverConfig.dll
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot/
 
 %changelog
+* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
+- move the screensaver plugin into a sub-package (BZ 519640)
+- let f-spot-screensaver obsolete older f-spot version so that it
+  is pulled in during update (fresh installations of f-spot will not
+  pull in gnome-screensaver)
+
+* Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
+- update to 0.6.1.1
+- remove upstreamed patch
+- updated use-system-Mono.Addins-if-available patch
+- add a patch to enable parallel build 
+
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
 - Build arch ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Aug 2009 14:43:24 -0000	1.21
+++ sources	17 Sep 2009 18:31:44 -0000	1.22
@@ -1 +1 @@
-9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2
+06bf6ef59be0be8dd8f5ee2d5c69d172  f-spot-0.6.1.1.tar.bz2


--- 0001-use-the-correct-stock-icon.patch DELETED ---



From crobinso at fedoraproject.org  Thu Sep 17 18:42:27 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu, 17 Sep 2009 18:42:27 +0000 (UTC)
Subject: rpms/virt-manager/devel state_paused.png, NONE,
	1.1 state_running.png, NONE, 1.1 state_shutoff.png, NONE,
	1.1 virt-manager-0.8.0-conn-close-exception.patch, NONE,
	1.1 virt-manager-0.8.0-manager-ui-tweaks.patch, NONE,
	1.1 virt-manager-0.8.0-stats-logging.patch, NONE,
	1.1 virt-manager.spec, 1.57, 1.58
Message-ID: <20090917184227.7042811C00CE@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5881

Modified Files:
	virt-manager.spec 
Added Files:
	state_paused.png state_running.png state_shutoff.png 
	virt-manager-0.8.0-conn-close-exception.patch 
	virt-manager-0.8.0-manager-ui-tweaks.patch 
	virt-manager-0.8.0-stats-logging.patch 
Log Message:
Don't close libvirt connection for non-fatal errors (bz 522168)
Manager UI tweaks
Generate better errors if disk/net stats polling fails


virt-manager-0.8.0-conn-close-exception.patch:
 connection.py |   10 +++++++++-
 engine.py     |   12 ++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE virt-manager-0.8.0-conn-close-exception.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253131339 14400
# Node ID 1c886d1863f72e7ddd5fb99050362296be6a9deb
# Parent  9242a7fe76b16c6505bdd3d3d328ae8f0c56da10
Don't close connection on all libvirt errors: only if libvirtd goes away.

diff -r 9242a7fe76b1 -r 1c886d1863f7 src/virtManager/connection.py
--- a/src/virtManager/connection.py	Wed Sep 16 16:01:54 2009 -0400
+++ b/src/virtManager/connection.py	Wed Sep 16 16:02:19 2009 -0400
@@ -941,7 +941,15 @@
             updateVMs = newVMs
 
         for uuid in updateVMs:
-            self.vms[uuid].tick(now)
+            vm = self.vms[uuid]
+            try:
+                vm.tick(now)
+            except libvirt.libvirtError, e:
+                if e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR:
+                    raise
+                logging.exception("Tick for VM '%s' failed" % vm.get_name())
+            except Exception, e:
+                logging.exception("Tick for VM '%s' failed" % vm.get_name())
 
         if not noStatsUpdate:
             self._recalculate_stats(now)
diff -r 9242a7fe76b1 -r 1c886d1863f7 src/virtManager/engine.py
--- a/src/virtManager/engine.py	Wed Sep 16 16:01:54 2009 -0400
+++ b/src/virtManager/engine.py	Wed Sep 16 16:02:19 2009 -0400
@@ -199,10 +199,14 @@
                 self.connections[uri]["connection"].tick()
             except KeyboardInterrupt:
                 raise
-            except:
-                logging.exception("Could not refresh connection %s." % uri)
-                logging.debug("Closing connection since refresh failed.")
-                self.connections[uri]["connection"].close()
+            except libvirt.libvirtError, e:
+                if e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR:
+                    logging.exception("Could not refresh connection %s." % uri)
+                    logging.debug("Closing connection since libvirtd "
+                                  "appears to have stopped.")
+                    self.connections[uri]["connection"].close()
+                else:
+                    raise
         return 1
 
     def change_timer_interval(self,ignore1,ignore2,ignore3,ignore4):

virt-manager-0.8.0-manager-ui-tweaks.patch:
 config.py  |   14 +++++++++++++-
 domain.py  |    2 ++
 manager.py |   51 ++++++++++++++++++++++++---------------------------
 3 files changed, 39 insertions(+), 28 deletions(-)

--- NEW FILE virt-manager-0.8.0-manager-ui-tweaks.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253201058 14400
# Node ID a6f055361d165bea5fbb3c62ec54a820987a7dde
# Parent  1c886d1863f72e7ddd5fb99050362296be6a9deb
Update new VM status icons.

Previous round didn't convey state very well, and looked too much like
buttons.

diff -r 1c886d1863f7 -r a6f055361d16 pixmaps/state_paused.png
Binary file pixmaps/state_paused.png has changed
diff -r 1c886d1863f7 -r a6f055361d16 pixmaps/state_running.png
Binary file pixmaps/state_running.png has changed
diff -r 1c886d1863f7 -r a6f055361d16 pixmaps/state_shutoff.png
Binary file pixmaps/state_shutoff.png has changed
diff -r 1c886d1863f7 -r a6f055361d16 src/virtManager/config.py
--- a/src/virtManager/config.py	Wed Sep 16 16:02:19 2009 -0400
+++ b/src/virtManager/config.py	Thu Sep 17 11:24:18 2009 -0400
@@ -90,7 +90,16 @@
             libvirt.VIR_DOMAIN_SHUTOFF: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 18, 18),
             libvirt.VIR_DOMAIN_NOSTATE: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 18, 18),
             }
-        #initialize the help stuff
+        self.status_icons_large = {
+            libvirt.VIR_DOMAIN_BLOCKED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 32, 32),
+            libvirt.VIR_DOMAIN_CRASHED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_crashed.png", 32, 32),
+            libvirt.VIR_DOMAIN_PAUSED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_paused.png", 32, 32),
+            libvirt.VIR_DOMAIN_RUNNING: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 32, 32),
+            libvirt.VIR_DOMAIN_SHUTDOWN: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 32, 32),
+            libvirt.VIR_DOMAIN_SHUTOFF: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 32, 32),
+            libvirt.VIR_DOMAIN_NOSTATE: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 32, 32),
+            }
+
         props = { gnome.PARAM_APP_DATADIR : self.get_data_dir()}
         gnome.program_init(self.get_appname(), self.get_appversion(), \
                                properties=props)
@@ -100,6 +109,9 @@
     def get_vm_status_icon(self, state):
         return self.status_icons[state]
 
+    def get_vm_status_icon_large(self, state):
+        return self.status_icons_large[state]
+
     def get_shutdown_icon_name(self):
         theme = gtk.icon_theme_get_default()
         if theme.has_icon("system-shutdown"):
diff -r 1c886d1863f7 -r a6f055361d16 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Wed Sep 16 16:02:19 2009 -0400
+++ b/src/virtManager/domain.py	Thu Sep 17 11:24:18 2009 -0400
@@ -728,6 +728,8 @@
 
     def run_status_icon(self):
         return self.config.get_vm_status_icon(self.status())
+    def run_status_icon_large(self):
+        return self.config.get_vm_status_icon_large(self.status())
 
     def _is_serial_console_tty_accessible(self, path):
         # pty serial scheme doesn't work over remote
diff -r 1c886d1863f7 -r a6f055361d16 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Wed Sep 16 16:02:19 2009 -0400
+++ b/src/virtManager/manager.py	Thu Sep 17 11:24:18 2009 -0400
@@ -493,7 +493,7 @@
         row.insert(ROW_NAME, vm.get_name())
         row.insert(ROW_MARKUP, row[ROW_NAME])
         row.insert(ROW_STATUS, vm.run_status())
-        row.insert(ROW_STATUS_ICON, vm.run_status_icon())
+        row.insert(ROW_STATUS_ICON, vm.run_status_icon_large())
         row.insert(ROW_KEY, vm.get_uuid())
         row.insert(ROW_HINT, None)
         row.insert(ROW_IS_CONN, False)
@@ -575,7 +575,7 @@
 
         row = self.rows[self.vm_row_key(vm)]
         row[ROW_STATUS] = vm.run_status()
-        row[ROW_STATUS_ICON] = vm.run_status_icon()
+        row[ROW_STATUS_ICON] = vm.run_status_icon_large()
         row[ROW_IS_VM_RUNNING] = vm.is_active()
         model.row_changed(row.path, row.iter)
 
@@ -850,7 +850,6 @@
         statusCol.add_attribute(status_icon, 'cell-background', ROW_COLOR)
         statusCol.add_attribute(status_icon, 'pixbuf', ROW_STATUS_ICON)
         statusCol.add_attribute(status_icon, 'visible', ROW_IS_VM)
-        statusCol.add_attribute(status_icon, 'sensitive', ROW_IS_VM_RUNNING)
 
         name_txt = gtk.CellRendererText()
         nameCol.pack_start(name_txt, True)
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253205341 14400
# Node ID cdbe1da3ce75a5ad06b8e07e891ac35d1b246685
# Parent  a6f055361d165bea5fbb3c62ec54a820987a7dde
Change VM name text arrangement in manager view.

Shrink text size, add a second row that shows the VM status. Fills the
display up a bit so it doesn't look so sparse.

diff -r a6f055361d16 -r cdbe1da3ce75 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Thu Sep 17 11:24:18 2009 -0400
+++ b/src/virtManager/manager.py	Thu Sep 17 12:35:41 2009 -0400
@@ -486,12 +486,26 @@
         else:
             self.emit("action-refresh-console", uri, vmuuid)
 
+    def _build_conn_markup(self, conn, row):
+        if conn.state == conn.STATE_DISCONNECTED:
+            markup = ("<span font='9' color='#5b5b5b'>%s - "
+                      "Not Connected</span>" % row[ROW_NAME])
+        else:
+            markup = ("<span font='9'>%s</span>" % row[ROW_NAME])
+        return markup
+
+    def _build_vm_markup(self, vm, row):
+        markup = ("<span font='10'>%s</span>\n"
+                  "<span font='9' color='#989898'>%s</span>" %
+                  (row[ROW_NAME], row[ROW_STATUS]))
+        return markup
+
     def _append_vm(self, model, vm, conn):
         parent = self.rows[conn.get_uri()].iter
         row = []
         row.insert(ROW_HANDLE, vm)
         row.insert(ROW_NAME, vm.get_name())
-        row.insert(ROW_MARKUP, row[ROW_NAME])
+        row.insert(ROW_MARKUP, "")
         row.insert(ROW_STATUS, vm.run_status())
         row.insert(ROW_STATUS_ICON, vm.run_status_icon_large())
         row.insert(ROW_KEY, vm.get_uuid())
@@ -502,6 +516,8 @@
         row.insert(ROW_IS_VM_RUNNING, vm.is_active())
         row.insert(ROW_COLOR, "white")
 
+        row[ROW_MARKUP] = self._build_vm_markup(vm, row)
+
         _iter = model.append(parent, row)
         path = model.get_path(_iter)
         self.rows[self.vm_row_key(vm)] = model[path]
@@ -512,12 +528,7 @@
         row = []
         row.insert(ROW_HANDLE, conn)
         row.insert(ROW_NAME, conn.get_pretty_desc_inactive(False))
-        if conn.state == conn.STATE_DISCONNECTED:
-            markup = ("<span font='9.5' color='#5b5b5b'>%s - "
-                      "Not Connected</span>" % row[ROW_NAME])
-        else:
-            markup = ("<span font='9.5'>%s</span>" % row[ROW_NAME])
-        row.insert(ROW_MARKUP, markup)
+        row.insert(ROW_MARKUP, self._build_conn_markup(conn, row))
         row.insert(ROW_STATUS, ("<span font='9'>%s</span>" %
                                 conn.get_state_text()))
         row.insert(ROW_STATUS_ICON, None)
@@ -589,12 +600,7 @@
         model = vmlist.get_model()
         row = self.rows[conn.get_uri()]
 
-        if conn.state == conn.STATE_DISCONNECTED:
-            markup = ("<span font='9.5' color='#5b5b5b'>%s - "
-                      "Not Connected</span>" % row[ROW_NAME])
-        else:
-            markup = ("<span font='9.5'>%s</span>" % row[ROW_NAME])
-        row[ROW_MARKUP] = markup
+        row[ROW_MARKUP] = self._build_conn_markup(conn, row)
         row[ROW_STATUS] = "<span font='9'>%s</span>" % conn.get_state_text()
         row[ROW_IS_CONN_CONNECTED] = conn.state != conn.STATE_DISCONNECTED
 
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253201111 14400
# Node ID 739a6876af4692d6f86d8813f6dd3aa046bf6a8b
# Parent  cdbe1da3ce75a5ad06b8e07e891ac35d1b246685
Drop row coloring for managed connection rows.

Looks kind of funky with lots of dark colored rows for a user with multiple
connections.

diff -r cdbe1da3ce75 -r 739a6876af46 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Thu Sep 17 12:35:41 2009 -0400
+++ b/src/virtManager/manager.py	Thu Sep 17 11:25:11 2009 -0400
@@ -49,8 +49,6 @@
 ROW_IS_CONN_CONNECTED = 8
 ROW_IS_VM = 9
 ROW_IS_VM_RUNNING = 10
-ROW_COLOR = 11
-ROW_HEIGHT = 12
 
 # Columns in the tree view
 COL_NAME = 0
@@ -514,7 +512,6 @@
         row.insert(ROW_IS_CONN_CONNECTED, True)
         row.insert(ROW_IS_VM, True)
         row.insert(ROW_IS_VM_RUNNING, vm.is_active())
-        row.insert(ROW_COLOR, "white")
 
         row[ROW_MARKUP] = self._build_vm_markup(vm, row)
 
@@ -539,7 +536,6 @@
                    conn.state != conn.STATE_DISCONNECTED)
         row.insert(ROW_IS_VM, False)
         row.insert(ROW_IS_VM_RUNNING, False)
-        row.insert(ROW_COLOR, "#d4d2d2")
 
         _iter = model.append(None, row)
         path = model.get_path(_iter)
@@ -823,9 +819,9 @@
         vmlist = self.window.get_widget("vm-list")
 
         # Handle, name, markup, status, status icon, key/uuid, hint, is conn,
-        # is conn connected, is vm, is vm running, color
+        # is conn connected, is vm, is vm running
         model = gtk.TreeStore(object, str, str, str, gtk.gdk.Pixbuf, str, str,
-                              bool, bool, bool, bool, str)
+                              bool, bool, bool, bool)
         vmlist.set_model(model)
         util.tooltip_wrapper(vmlist, ROW_HINT, "set_tooltip_column")
 
@@ -834,7 +830,7 @@
 
         nameCol = gtk.TreeViewColumn(_("Name"))
         nameCol.set_expand(True)
-        nameCol.set_spacing(12)
+        nameCol.set_spacing(6)
         cpuUsageCol = gtk.TreeViewColumn(_("CPU usage"))
         cpuUsageCol.set_min_width(150)
 
@@ -853,13 +849,11 @@
 
         status_icon = gtk.CellRendererPixbuf()
         statusCol.pack_start(status_icon, False)
-        statusCol.add_attribute(status_icon, 'cell-background', ROW_COLOR)
         statusCol.add_attribute(status_icon, 'pixbuf', ROW_STATUS_ICON)
         statusCol.add_attribute(status_icon, 'visible', ROW_IS_VM)
 
         name_txt = gtk.CellRendererText()
         nameCol.pack_start(name_txt, True)
-        nameCol.add_attribute(name_txt, 'cell-background', ROW_COLOR)
         nameCol.add_attribute(name_txt, 'markup', ROW_MARKUP)
         nameCol.set_sort_column_id(VMLIST_SORT_NAME)
 
@@ -870,9 +864,7 @@
         cpuUsage_img.set_property("reversed", True)
         cpuUsageCol.pack_start(cpuUsage_img, True)
         cpuUsageCol.pack_start(cpuUsage_txt, False)
-        cpuUsageCol.add_attribute(cpuUsage_img, 'cell-background', ROW_COLOR)
         cpuUsageCol.add_attribute(cpuUsage_img, 'visible', ROW_IS_VM)
-        cpuUsageCol.add_attribute(cpuUsage_txt, 'cell-background', ROW_COLOR)
         cpuUsageCol.add_attribute(cpuUsage_txt, 'visible', ROW_IS_CONN)
         cpuUsageCol.set_sort_column_id(VMLIST_SORT_STATS)
         self.stats_sparkline = cpuUsage_img

virt-manager-0.8.0-stats-logging.patch:
 domain.py |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

--- NEW FILE virt-manager-0.8.0-stats-logging.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253131314 14400
# Node ID 9242a7fe76b16c6505bdd3d3d328ae8f0c56da10
# Parent  6aa2dc9ada0c43e19680af5b922cd643e35602d0
Better logging and error avoidance with net/disk stats routines.

diff -r 6aa2dc9ada0c -r 9242a7fe76b1 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Wed Sep 16 16:00:47 2009 -0400
+++ b/src/virtManager/domain.py	Wed Sep 16 16:01:54 2009 -0400
@@ -337,8 +337,12 @@
             return rx, tx
 
         for netdev in self.get_network_devices(refresh_if_necc=False):
+            dev = netdev[4]
+            if not dev:
+                continue
+
             try:
-                io = self.vm.interfaceStats(netdev[4])
+                io = self.vm.interfaceStats(dev)
                 if io:
                     rx += io[0]
                     tx += io[4]
@@ -347,7 +351,9 @@
                     logging.debug("Net stats not supported: %s" % err)
                     self._stats_net_supported = False
                 else:
-                    logging.error("Error reading net stats: %s" % err)
+                    logging.error("Error reading net stats for "
+                                  "'%s' dev '%s': %s" %
+                                  (self.get_name(), dev, err))
         return rx, tx
 
     def _sample_disk_io_dummy(self):
@@ -360,8 +366,12 @@
             return rd, wr
 
         for disk in self.get_disk_devices(refresh_if_necc=False):
+            dev = disk[2]
+            if not dev:
+                continue
+
             try:
-                io = self.vm.blockStats(disk[2])
+                io = self.vm.blockStats(dev)
                 if io:
                     rd += io[1]
                     wr += io[3]
@@ -370,7 +380,9 @@
                     logging.debug("Disk stats not supported: %s" % err)
                     self._stats_disk_supported = False
                 else:
-                    logging.error("Error reading disk stats: %s" % err)
+                    logging.error("Error reading disk stats for "
+                                  "'%s' dev '%s': %s" %
+                                  (self.get_name(), dev, err))
         return rd, wr
 
     def _get_cur_rate(self, what):


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- virt-manager.spec	14 Sep 2009 15:05:51 -0000	1.57
+++ virt-manager.spec	17 Sep 2009 18:42:27 -0000	1.58
@@ -8,13 +8,16 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
 License: GPLv2+
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
+Source1: state_paused.png
+Source2: state_running.png
+Source3: state_shutoff.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 # Fix disk XML mangling via connect/eject cdrom (bz 516116)
@@ -27,6 +30,12 @@ Patch3: %{name}-%{version}-newvm-storage
 Patch4: %{name}-%{version}-addhw-errmsg-typo.patch
 # Fixes for pylint script to return nicer results on F11/F12
 Patch5: %{name}-%{version}-pylint-tweak.patch
+# Don't close libvirt connection for non-fatal errors (bz 522168)
+Patch6: /home/boston/crobinso/virt-manager-0.8.0-conn-close-exception.patch
+# Manager UI tweaks
+Patch7: /home/boston/crobinso/virt-manager-0.8.0-manager-ui-tweaks.patch
+# Generate better errors is disk/net stats polling fails
+Patch8: /home/boston/crobinso/virt-manager-0.8.0-stats-logging.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -91,11 +100,17 @@ management API.
 
 %prep
 %setup -q
+cp %{SOURCE1} pixmaps
+cp %{SOURCE2} pixmaps
+cp %{SOURCE3} pixmaps
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 %configure
@@ -169,6 +184,11 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Sep 17 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-4.fc12
+- Don't close libvirt connection for non-fatal errors (bz 522168)
+- Manager UI tweaks
+- Generate better errors if disk/net stats polling fails
+
 * Mon Sep 14 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-3.fc12
 - Fix disk XML mangling via connect/eject cdrom (bz 516116)
 - Fix delete button sensitivity (bz 518536)



From wtogami at fedoraproject.org  Thu Sep 17 18:52:25 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 18:52:25 +0000 (UTC)
Subject: rpms/perl-NetAddr-IP/devel perl-NetAddr-IP.spec,1.9,1.10
Message-ID: <20090917185226.2D78811C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-NetAddr-IP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8954

Modified Files:
	perl-NetAddr-IP.spec 
Log Message:
add changelog entry



Index: perl-NetAddr-IP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/devel/perl-NetAddr-IP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-NetAddr-IP.spec	16 Sep 2009 22:57:05 -0000	1.9
+++ perl-NetAddr-IP.spec	17 Sep 2009 18:52:15 -0000	1.10
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 4.027-1
+- 4.027
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.007-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rstrode at fedoraproject.org  Thu Sep 17 18:55:11 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 17 Sep 2009 18:55:11 +0000 (UTC)
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.201,1.202
Message-ID: <20090917185511.9A90011C00CE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10872

Modified Files:
	gnome-utils.spec 
Log Message:
- Split off -libs package



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- gnome-utils.spec	25 Aug 2009 02:45:01 -0000	1.201
+++ gnome-utils.spec	17 Sep 2009 18:55:11 -0000	1.202
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.27.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -70,6 +70,12 @@ Requires:  pkgconfig
 The gnome-utils-devel package contains header files and other resources
 needed to develop programs using the libraries contained in gnome-utils.
 
+%package libs
+Summary: gnome-utils libraries
+Group: Development/Libraries
+
+%description libs
+This package contains libraries provided by gnome-utils (such as libgdict)
 
 %package -n gnome-system-log
 Summary: A log file viewer for the GNOME desktop
@@ -161,7 +167,6 @@ desktop-file-install --vendor gnome --de
 for n in baobab gnome-dictionary gnome-search-tool gnome-system-log; do
   helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/$n
   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"
@@ -286,7 +291,6 @@ fi
 %{_libexecdir}/gnome-dictionary-applet
 %{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 %{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server
-%{_libdir}/libgdict-1.0.so.*
 %{_mandir}/man1/gnome-dictionary.1.gz
 %{_mandir}/man1/gnome-search-tool.1.gz
 %{_mandir}/man1/baobab.1.gz
@@ -298,6 +302,10 @@ fi
 %{_includedir}/gdict-1.0/
 %{_datadir}/gtk-doc/html/gdict/
 
+%files libs
+%defattr(-, root, root)
+%{_libdir}/libgdict-1.0.so.*
+
 %files -n gnome-system-log -f gnome-system-log.lang
 %{_bindir}/gnome-system-log
 %{_sbindir}/gnome-system-log
@@ -309,6 +317,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Thu Sep 17 2009 Ray Strode <rstrode at redhat.com> - 1:2.27.91-2
+- Split off -libs package
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.91-1
 - Update to 2.27.91
 



From rdieter at fedoraproject.org  Thu Sep 17 18:58:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 18:58:58 +0000 (UTC)
Subject: rpms/taglib-extras/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 taglib-extras.spec, 1.8, 1.9
Message-ID: <20090917185858.532C411C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12671

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
- taglib-extras-1.0.0 (API/ABI bump)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Sep 2009 20:51:40 -0000	1.8
+++ .cvsignore	17 Sep 2009 18:58:57 -0000	1.9
@@ -1 +1 @@
-taglib-extras-0.1.7.tar.gz
+taglib-extras-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Sep 2009 20:51:40 -0000	1.8
+++ sources	17 Sep 2009 18:58:58 -0000	1.9
@@ -1 +1 @@
-09bf9c89d953a238b55ac74bf9db0be3  taglib-extras-0.1.7.tar.gz
+5882f2334f6e22dc9b28b2fc2fca4789  taglib-extras-1.0.0.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- taglib-extras.spec	9 Sep 2009 20:51:40 -0000	1.8
+++ taglib-extras.spec	17 Sep 2009 18:58:58 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.7
+Version:        1.0.0 
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -15,8 +15,10 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 Patch1: taglib-extras-0.1-multilib-1.patch
 
 BuildRequires: cmake >= 2.6.0
-BuildRequires: taglib-devel
 BuildRequires: kdelibs4-devel
+BuildRequires: taglib-devel >= 1.6.0
+
+Requires: taglib%{?_isa} => 1.6
 
 %description
 Taglib-extras delivers support for reading and editing the meta-data of 
@@ -65,7 +67,7 @@ rm -rf %{buildroot} 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LGPL
-%{_libdir}/libtag-extras.so.0*
+%{_libdir}/libtag-extras.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -76,6 +78,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- taglib-extras-1.0.0 (API/ABI bump)
+
 * Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
 - taglib-extras-0.1.7
 



From rdieter at fedoraproject.org  Thu Sep 17 18:59:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 18:59:45 +0000 (UTC)
Subject: rpms/taglib-extras/devel taglib-extras.spec,1.9,1.10
Message-ID: <20090917185945.2732A11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12886

Modified Files:
	taglib-extras.spec 
Log Message:
touchup taglib BR



Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- taglib-extras.spec	17 Sep 2009 18:58:58 -0000	1.9
+++ taglib-extras.spec	17 Sep 2009 18:59:45 -0000	1.10
@@ -16,7 +16,7 @@ Patch1: taglib-extras-0.1-multilib-1.pat
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: kdelibs4-devel
-BuildRequires: taglib-devel >= 1.6.0
+BuildRequires: taglib-devel >= 1.6
 
 Requires: taglib%{?_isa} => 1.6
 



From rdieter at fedoraproject.org  Thu Sep 17 19:03:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 19:03:38 +0000 (UTC)
Subject: rpms/amarok/devel amarok-taglib.patch, NONE, 1.1 amarok.spec, 1.162,
	1.163
Message-ID: <20090917190338.708AD11C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14593/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-taglib.patch 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0


amarok-taglib.patch:
 b/CMakeLists.txt                                    |    4 
 b/shared/MetaReplayGain.cpp                         |    6 
 b/src/App.cpp                                       |    6 
 b/src/meta/MetaUtility.cpp                          |    4 
 b/src/meta/file/File_p.h                            |    5 
 b/src/podcasts/sql/SqlPodcastMeta.cpp               |    3 
 b/utilities/collectionscanner/AFTUtility.cpp        |   14 
 b/utilities/collectionscanner/CollectionScanner.cpp |   14 
 utilities/collectionscanner/MetaReplayGain.cpp      |  354 --------------------
 utilities/collectionscanner/MetaReplayGain.h        |   49 --
 10 files changed, 8 insertions(+), 451 deletions(-)

--- NEW FILE amarok-taglib.patch ---
# git diff 3ee0ef70c0c9d5de982091e353804c990c35ea4e
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8219bc6..e4b6b94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,10 @@ option(WITH_IPOD "Enable iPod support in Amarok" ON)
 include(CheckLibraryExists)
 check_library_exists(dl dlopen "" LIBDL_FOUND)
 
-set(TAGLIB_MIN_VERSION "1.5")
+set(TAGLIB_MIN_VERSION "1.6")
 find_package(Taglib REQUIRED)
 
-find_package(Taglib-Extras 0.1 REQUIRED)
+find_package(Taglib-Extras 1.0 REQUIRED)
 if( TAGLIB-EXTRAS_FOUND )
     add_definitions( -DTAGLIB_EXTRAS_FOUND )
 endif( TAGLIB-EXTRAS_FOUND )
diff --git a/shared/MetaReplayGain.cpp b/shared/MetaReplayGain.cpp
index d6edd95..97073d5 100644
--- a/shared/MetaReplayGain.cpp
+++ b/shared/MetaReplayGain.cpp
@@ -38,10 +38,8 @@
 #include <trueaudiofile.h>
 #include <vorbisfile.h>
 #include <wavpackfile.h>
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <asffile.h>
 #include <mp4file.h>
-#endif
 
 // converts a peak value from the normal digital scale form to the more useful decibel form
 // decibels are relative to the /adjusted/ waveform
@@ -229,7 +227,6 @@ static Meta::ReplayGainTagMap readXiphTags( TagLib::Ogg::XiphComment *tag )
     return outputMap;
 }
 
-#ifdef TAGLIB_EXTRAS_FOUND
 static Meta::ReplayGainTagMap readASFTags( TagLib::ASF::Tag *tag )
 {
     const TagLib::ASF::AttributeListMap &tagMap = tag->attributeListMap();
@@ -251,7 +248,6 @@ static Meta::ReplayGainTagMap readASFTags( TagLib::ASF::Tag *tag )
 
     return outputMap;
 }
-#endif
 // Bad news: ReplayGain in MP4 is not actually standardized in any way.  Maybe reimplement at some point...maybe.  See
 // http://www.hydrogenaudio.org/forums/lofiversion/index.php/t14322.html
 #ifdef DO_NOT_USE_THIS_UNTIL_FIXED
@@ -332,13 +328,11 @@ Meta::readReplayGainTags( TagLib::FileRef fileref )
         if ( file->APETag() )
             map = readAPETags( file->APETag() );
     }
-#ifdef TAGLIB_EXTRAS_FOUND
     else if ( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File *>( fileref.file() ) )
     {
         if ( file->tag() )
             map = readASFTags( file->tag() );
     }
-#endif
 // See comment above
 #ifdef DO_NOT_USE_THIS_UNTIL_FIXED
     else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
diff --git a/src/App.cpp b/src/App.cpp
index bd01517..637a0ad 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -70,10 +70,7 @@
 
 #ifdef TAGLIB_EXTRAS_FOUND
 #include <audiblefiletyperesolver.h>
-#include <asffiletyperesolver.h>
-#include <wavfiletyperesolver.h>
 #include <realmediafiletyperesolver.h>
-#include <mp4filetyperesolver.h>
 #endif
 
 QMutex Debug::mutex;
@@ -143,11 +140,8 @@ App::App()
 
 #ifdef TAGLIB_EXTRAS_FOUND
     PERF_LOG( "Registering taglib plugins" )
-    TagLib::FileRef::addFileTypeResolver(new MP4FileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new ASFFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new RealMediaFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new AudibleFileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new WavFileTypeResolver);
     PERF_LOG( "Done Registering taglib plugins" )
 #endif
 
diff --git a/src/meta/MetaUtility.cpp b/src/meta/MetaUtility.cpp
index b78ef92..314db57 100644
--- a/src/meta/MetaUtility.cpp
+++ b/src/meta/MetaUtility.cpp
@@ -41,12 +41,10 @@
 #include <vorbisfile.h>
 #include <textidentificationframe.h>
 #include <xiphcomment.h>
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <mp4file.h>
 #include <mp4item.h>
 #include <mp4tag.h>
 #include <asftag.h>
-#endif
 
         static const QString XESAM_ALBUM          = "http://freedesktop.org/standards/xesam/1.0/core#album";
         static const QString XESAM_ARTIST         = "http://freedesktop.org/standards/xesam/1.0/core#artist";
@@ -320,7 +318,6 @@ Meta::Field::writeFields( TagLib::FileRef fileref, const QVariantMap &changes )
             file->xiphComment()->addField("DISCNUMBER", disc);
         }
     }
-#ifdef TAGLIB_EXTRAS_FOUND
     else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
     {
         if( changes.contains( Meta::Field::COMPOSER ) )
@@ -338,7 +335,6 @@ Meta::Field::writeFields( TagLib::FileRef fileref, const QVariantMap &changes )
             mp4tag->itemListMap()["disk"] = TagLib::MP4::Item( discnumber, 0 );
         }
     }
-#endif
     if( shouldSave )
         fileref.save();
 }
diff --git a/src/meta/file/File_p.h b/src/meta/file/File_p.h
index 57c5195..f9e9daf 100644
--- a/src/meta/file/File_p.h
+++ b/src/meta/file/File_p.h
@@ -50,10 +50,7 @@
 #include <tlist.h>
 #include <tstring.h>
 #include <vorbisfile.h>
-
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <mp4file.h>
-#endif
 
 namespace MetaFile
 {
@@ -283,7 +280,6 @@ void Track::Private::readMetaData()
                 disc = strip( flm[ "DISCNUMBER" ].front() );
         }
     }
-#ifdef TAGLIB_EXTRAS_FOUND
     else if( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileRef.file() ) )
     {
         TagLib::MP4::Tag *mp4tag = dynamic_cast< TagLib::MP4::Tag *>( file->tag() );
@@ -296,7 +292,6 @@ void Track::Private::readMetaData()
                 disc = QString::number( mp4tag->itemListMap()["disk"].toIntPair().first );
         }
     }
-#endif
     if( !disc.isEmpty() )
     {
         int i = disc.indexOf( '/' );
diff --git a/src/podcasts/sql/SqlPodcastMeta.cpp b/src/podcasts/sql/SqlPodcastMeta.cpp
index 8b5a96b..4f82eb0 100644
--- a/src/podcasts/sql/SqlPodcastMeta.cpp
+++ b/src/podcasts/sql/SqlPodcastMeta.cpp
@@ -42,10 +42,7 @@
 #include <tlist.h>
 #include <tstring.h>
 #include <vorbisfile.h>
-
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <mp4file.h>
-#endif
 
 class TimecodeWriteCapabilityPodcastImpl : public Meta::TimecodeWriteCapability
 {
diff --git a/utilities/collectionscanner/AFTUtility.cpp b/utilities/collectionscanner/AFTUtility.cpp
index 98552c5..3dc009b 100644
--- a/utilities/collectionscanner/AFTUtility.cpp
+++ b/utilities/collectionscanner/AFTUtility.cpp
@@ -26,6 +26,9 @@
 #include <id3v2tag.h>
 #include <mpcfile.h>
 #include <mpegfile.h>
+#include <mp4item.h>
+#include <mp4file.h>
+#include <mp4tag.h>
 #include <oggfile.h>
 #include <oggflacfile.h>
 #include <speexfile.h>
@@ -35,17 +38,6 @@
 #include <vorbisfile.h>
 #include <xiphcomment.h>
 
-#ifdef TAGLIB_EXTRAS_FOUND
-#include <mp4file.h>
-#include <mp4tag.h>
-#include <mp4item.h>
-#include <audiblefiletyperesolver.h>
-#include <asffiletyperesolver.h>
-#include <wavfiletyperesolver.h>
-#include <realmediafiletyperesolver.h>
-#include <mp4filetyperesolver.h>
-#endif
-
 #include <QFile>
 #include <QTime>
 
diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
index 673be1c..c3d961e 100644
--- a/utilities/collectionscanner/CollectionScanner.cpp
+++ b/utilities/collectionscanner/CollectionScanner.cpp
@@ -49,6 +49,9 @@
 #include <flacfile.h>
 #include <id3v1tag.h>
 #include <id3v2tag.h>
+#include <mp4file.h>
+#include <mp4tag.h>
+#include <mp4item.h>
 #include <mpcfile.h>
 #include <mpegfile.h>
 #include <oggfile.h>
@@ -59,14 +62,8 @@
 #include <vorbisfile.h>
 
 #ifdef TAGLIB_EXTRAS_FOUND
-#include <mp4file.h>
-#include <mp4tag.h>
-#include <mp4item.h>
 #include <audiblefiletyperesolver.h>
-#include <asffiletyperesolver.h>
-#include <wavfiletyperesolver.h>
 #include <realmediafiletyperesolver.h>
-#include <mp4filetyperesolver.h>
 #endif
 
 #include <textidentificationframe.h>
@@ -101,11 +98,8 @@ CollectionScanner::CollectionScanner( int &argc, char **argv )
     readArgs();
 
 #ifdef TAGLIB_EXTRAS_FOUND
-    TagLib::FileRef::addFileTypeResolver(new MP4FileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new ASFFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new RealMediaFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new AudibleFileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new WavFileTypeResolver);
 #endif
 
     m_logfile = ( m_batch ? ( m_incremental ? "amarokcollectionscanner_batchincrementalscan.log" : "amarokcollectionscanner_batchfullscan.log" )
@@ -644,7 +638,6 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
 //             if ( images && file->ID3v2Tag() )
 //                 loadImagesFromTag( *file->ID3v2Tag(), *images );
         }
-#ifdef TAGLIB_EXTRAS_FOUND
         else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
         {
             fileType = mp4;
@@ -667,7 +660,6 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
 //                     images->push_back( EmbeddedImage( mp4tag->cover(), "" ) );
             }
         }
-#endif
 
         if ( !disc.isEmpty() )
         {
diff --git a/utilities/collectionscanner/MetaReplayGain.cpp b/utilities/collectionscanner/MetaReplayGain.cpp
deleted file mode 100644
index 8e789cf..0000000
--- a/utilities/collectionscanner/MetaReplayGain.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
-   Copyright (C) 2009 Alex Merry <alex.merry at kdemail.net>
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
-// NOTE: this file is used by amarokcollectionscanner and CANNOT use any amaroklib
-//       code [this includes debug()]
-
-#include "MetaReplayGain.h"
-
-#include <QString>
-#include <cmath>
-
-// Taglib
-#include <tag.h>
-#include <tlist.h>
-#include <tstring.h>
-#include <textidentificationframe.h>
-#include <apetag.h>
-#include <flacfile.h>
-#include <id3v2tag.h>
-#include <mpcfile.h>
-#include <mpegfile.h>
-#include <oggfile.h>
-#include <oggflacfile.h>
-#include <speexfile.h>
-#include <trueaudiofile.h>
-#include <vorbisfile.h>
-#include <wavpackfile.h>
-#ifdef TAGLIB_EXTRAS_FOUND
-#include <asffile.h>
-#include <mp4file.h>
-#endif
-
-// converts a peak value from the normal digital scale form to the more useful decibel form
-// decibels are relative to the /adjusted/ waveform
-static qreal peakToDecibels( qreal scaleVal )
-{
-    if ( scaleVal > 0 )
-        return 20 * log10( scaleVal );
-    else
-        return 0;
-}
-
-// NOTE: representation is taken to be a binary value with units in the first column,
-//       1/2 in the second and so on.
-static qreal readRVA2PeakValue( const TagLib::ByteVector &data, int bits, bool *ok )
-{
-    qreal peak = 0.0;
-    // discarding digits at the end reduces precision, but doesn't otherwise change the value
-    if ( bits > 32 )
-        bits = 32;
-    // the +7 makes sure we round up when we divide by 8
-    unsigned int bytes = (bits + 7) / 8;
-
-    // normalize appears not to write a peak at all, and hence sets bits to 0
-    if ( bits == 0 )
-    {
-        if ( ok )
-            *ok = true;
-    }
-    else if ( bits >= 4 && data.size() >= bytes ) // fewer than 4 bits would just be daft
-    {
-        // excessBits is the number of bits we have to discard at the end
-        unsigned int excessBits = (8 * bytes) - bits;
-        // mask has 1s everywhere but the last /excessBits/ bits
-        quint32 mask = 0xffffffff << excessBits;
-        quint32 rawValue = 0;
-        for ( unsigned int i = 0; i < bytes; ++i )
-        {
-            rawValue <<= 8;
-            rawValue += (unsigned char)data[i];
-        }
-        rawValue &= mask;
-        peak = rawValue;
-        // amount we need to "shift" the value right to make the first digit the unit column
-        unsigned int rightShift = (8 * bytes) - 1;
-        peak /= (qreal)(1 << rightShift);
-        if ( ok )
-            *ok = true;
-    }
-    else
-    {
-        if ( ok )
-            *ok = false;
-    }
-    return peak;
-}
-
-// adds the converted version of the scale value if it is a valid, non-negative float
-static void maybeAddPeak( const TagLib::String &scaleVal, Meta::ReplayGainTag key, Meta::ReplayGainTagMap *map )
-{
-    // scale value is >= 0, and typically not much bigger than 1
-    QString value = TStringToQString( scaleVal );
-    bool ok = false;
-    qreal peak = value.toFloat( &ok );
-    if ( ok && peak >= 0 )
-        (*map)[key] = peakToDecibels( peak );
-}
-
-static void maybeAddGain( const TagLib::String &input, Meta::ReplayGainTag key, Meta::ReplayGainTagMap *map )
-{
-    QString value = TStringToQString( input ).remove( " dB" );
-    bool ok = false;
-    qreal gain = value.toFloat( &ok );
-    if (ok)
-        (*map)[key] = gain;
-}
-
-static Meta::ReplayGainTagMap readID3v2Tags( TagLib::ID3v2::Tag *tag )
-{
-    Meta::ReplayGainTagMap map;
-    {   // ID3v2.4.0 native replay gain tag support (as written by Quod Libet, for example).
-        TagLib::ID3v2::FrameList frames = tag->frameListMap()["RVA2"];
-        frames.append(tag->frameListMap()["XRVA"]);
-        if ( !frames.isEmpty() )
-        {
-            for ( unsigned int i = 0; i < frames.size(); ++i )
-            {
-                // we have to parse this frame ourselves
-                // ID3v2 frame header is 10 bytes, so skip that
-                TagLib::ByteVector data = frames[i]->render().mid( 10 );
-                unsigned int offset = 0;
-                QString desc( data.data() );
-                offset += desc.count() + 1;
-                unsigned int channel = data.mid( offset, 1 ).toUInt( true );
-                // channel 1 is the main volume - the only one we care about
-                if ( channel == 1 )
-                {
-                    ++offset;
-                    qint16 adjustment512 = data.mid( offset, 2 ).toShort( true );
-                    qreal adjustment = ( (qreal)adjustment512 ) / 512.0;
-                    offset += 2;
-                    unsigned int peakBits = data.mid( offset, 1 ).toUInt( true );
-                    ++offset;
-                    bool ok = false;
-                    qreal peak = readRVA2PeakValue( data.mid( offset ), peakBits, &ok );
-                    if ( ok )
-                    {
-                        if ( desc.toLower() == "album" )
-                        {
-                            map[Meta::ReplayGain_Album_Gain] = adjustment;
-                            map[Meta::ReplayGain_Album_Peak] = peakToDecibels( peak );
-                        }
-                        else if ( desc.toLower() == "track" || !map.contains( Meta::ReplayGain_Track_Gain ) )
-                        {
-                            map[Meta::ReplayGain_Track_Gain] = adjustment;
-                            map[Meta::ReplayGain_Track_Peak] = peakToDecibels( peak );
-                        }
-                    }
-                }
-            }
-            if ( !map.isEmpty() )
-                return map;
-        }
-    }
-
-    {   // Foobar2000-style ID3v2.3.0 tags
-        TagLib::ID3v2::FrameList frames = tag->frameListMap()["TXXX"];
-        for ( TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it ) {
-            TagLib::ID3v2::UserTextIdentificationFrame* frame =
-                dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>( *it );
-            if ( frame && frame->fieldList().size() >= 2 )
-            {
-                QString desc = TStringToQString( frame->description() ).toLower();
-                if ( desc == "replaygain_album_gain" )
-                    maybeAddGain( frame->fieldList()[1], Meta::ReplayGain_Album_Gain, &map );
-                if ( desc == "replaygain_album_peak" )
-                    maybeAddPeak( frame->fieldList()[1], Meta::ReplayGain_Album_Peak, &map );
-                if ( desc == "replaygain_track_gain" )
-                    maybeAddGain( frame->fieldList()[1], Meta::ReplayGain_Track_Gain, &map );
-                if ( desc == "replaygain_track_peak" )
-                    maybeAddPeak( frame->fieldList()[1], Meta::ReplayGain_Track_Peak, &map );
-            }
-        }
-    }
-    return map;
-}
-
-static Meta::ReplayGainTagMap readAPETags( TagLib::APE::Tag *tag )
-{
-    Meta::ReplayGainTagMap map;
-    const TagLib::APE::ItemListMap &items = tag->itemListMap();
-    if ( items.contains("REPLAYGAIN_TRACK_GAIN") )
-    {
-        maybeAddGain( items["REPLAYGAIN_TRACK_GAIN"].values()[0], Meta::ReplayGain_Track_Gain, &map );
-        if ( items.contains("REPLAYGAIN_TRACK_PEAK") )
-            maybeAddPeak( items["REPLAYGAIN_TRACK_PEAK"].values()[0], Meta::ReplayGain_Track_Peak, &map );
-    }
-    if ( items.contains("REPLAYGAIN_ALBUM_GAIN") )
-    {
-        maybeAddGain( items["REPLAYGAIN_ALBUM_GAIN"].values()[0], Meta::ReplayGain_Album_Gain, &map );
-        if ( items.contains("REPLAYGAIN_ALBUM_PEAK") )
-            maybeAddPeak( items["REPLAYGAIN_ALBUM_PEAK"].values()[0], Meta::ReplayGain_Album_Peak, &map );
-    }
-    return map;
-}
-
-static Meta::ReplayGainTagMap readXiphTags( TagLib::Ogg::XiphComment *tag )
-{
-    const TagLib::Ogg::FieldListMap &tagMap = tag->fieldListMap();
-    Meta::ReplayGainTagMap outputMap;
-
-    if ( !tagMap["REPLAYGAIN_TRACK_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_TRACK_GAIN"].front(), Meta::ReplayGain_Track_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_TRACK_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_TRACK_PEAK"].front(), Meta::ReplayGain_Track_Peak, &outputMap );
-    }
-
-    if ( !tagMap["REPLAYGAIN_ALBUM_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_ALBUM_GAIN"].front(), Meta::ReplayGain_Album_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_ALBUM_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_ALBUM_PEAK"].front(), Meta::ReplayGain_Album_Peak, &outputMap );
-    }
-
-    return outputMap;
-}
-
-#ifdef TAGLIB_EXTRAS_FOUND
-static Meta::ReplayGainTagMap readASFTags( TagLib::ASF::Tag *tag )
-{
-    const TagLib::ASF::AttributeListMap &tagMap = tag->attributeListMap();
-    Meta::ReplayGainTagMap outputMap;
-
-    if ( !tagMap["REPLAYGAIN_TRACK_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_TRACK_GAIN"].front().toString(), Meta::ReplayGain_Track_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_TRACK_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_TRACK_PEAK"].front().toString(), Meta::ReplayGain_Track_Peak, &outputMap );
-    }
-
-    if ( !tagMap["REPLAYGAIN_ALBUM_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_ALBUM_GAIN"].front().toString(), Meta::ReplayGain_Album_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_ALBUM_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_ALBUM_PEAK"].front().toString(), Meta::ReplayGain_Album_Peak, &outputMap );
-    }
-
-    return outputMap;
-}
-#endif
-// Bad news: ReplayGain in MP4 is not actually standardized in any way.  Maybe reimplement at some point...maybe.  See
-// http://www.hydrogenaudio.org/forums/lofiversion/index.php/t14322.html
-#ifdef DO_NOT_USE_THIS_UNTIL_FIXED
-static Meta::ReplayGainTagMap readMP4Tags( TagLib::MP4::Tag *tag )
-{
-    Meta::ReplayGainTagMap outputMap;
-
-    if ( !tag->trackReplayGain().isNull() ) {
-        maybeAddGain( tag->trackReplayGain(), Meta::ReplayGain_Track_Gain, &outputMap );
-        if ( !tag->trackReplayGainPeak().isNull() )
-            maybeAddPeak( tag->trackReplayGainPeak(), Meta::ReplayGain_Track_Peak, &outputMap );
-    }
-
-    if ( !tag->albumReplayGain().isNull() ) {
-        maybeAddGain( tag->albumReplayGain(), Meta::ReplayGain_Album_Gain, &outputMap );
-        if ( !tag->albumReplayGainPeak().isNull() )
-            maybeAddPeak( tag->albumReplayGainPeak(), Meta::ReplayGain_Album_Peak, &outputMap );
-    }
-
-    return outputMap;
-}
-#endif 
-
-Meta::ReplayGainTagMap
-Meta::readReplayGainTags( TagLib::FileRef fileref )
-{
-    Meta::ReplayGainTagMap map;
-    // NB: we can't get replay gain info from MPC files, since it's stored in some magic place
-    //     and not in the APE tags, and taglib doesn't let us access the information (unless
-    //     we want to parse the file ourselves).
-    // FIXME: should we try getting the info from the MPC APE tag just in case?
-
-    if ( TagLib::MPEG::File *file = dynamic_cast<TagLib::MPEG::File *>( fileref.file() ) )
-    {
-        if ( file->ID3v2Tag() )
-            map = readID3v2Tags( file->ID3v2Tag() );
-        if ( map.isEmpty() && file->APETag() )
-            map = readAPETags( file->APETag() );
-    }
-    else if ( TagLib::Ogg::Vorbis::File *file = dynamic_cast<TagLib::Ogg::Vorbis::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readXiphTags( file->tag() );
-    }
-    else if ( TagLib::FLAC::File *file = dynamic_cast<TagLib::FLAC::File *>( fileref.file() ) )
-    {
-        if ( file->xiphComment() )
-            map = readXiphTags( file->xiphComment() );
-        if ( map.isEmpty() && file->ID3v2Tag() )
-            map = readID3v2Tags( file->ID3v2Tag() );
-    }
-    else if ( TagLib::Ogg::FLAC::File *file = dynamic_cast<TagLib::Ogg::FLAC::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readXiphTags( file->tag() );
-    }
-    else if ( TagLib::WavPack::File *file = dynamic_cast<TagLib::WavPack::File *>( fileref.file() ) )
-    {
-        if ( file->APETag() )
-            map = readAPETags( file->APETag() );
-    }
-    else if ( TagLib::TrueAudio::File *file = dynamic_cast<TagLib::TrueAudio::File *>( fileref.file() ) )
-    {
-        if ( file->ID3v2Tag() )
-            map = readID3v2Tags( file->ID3v2Tag() );
-    }
-    else if ( TagLib::Ogg::Speex::File *file = dynamic_cast<TagLib::Ogg::Speex::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readXiphTags( file->tag() );
-    }
-    else if ( TagLib::MPC::File *file = dynamic_cast<TagLib::MPC::File *>( fileref.file() ) )
-    {
-        // This is NOT the correct way to get replay gain tags from MPC files, but
-        // taglib doesn't allow us access to the real information.
-        // This allows people to work around this issue by copying their replay gain
-        // information to the APE tag.
-        if ( file->APETag() )
-            map = readAPETags( file->APETag() );
-    }
-#ifdef TAGLIB_EXTRAS_FOUND
-    else if ( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readASFTags( file->tag() );
-    }
-#endif
-// See comment above
-#ifdef DO_NOT_USE_THIS_UNTIL_FIXED
-    else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readMP4Tags( file->getMP4Tag() );
-    }
-#endif
-    return map;
-}
-
diff --git a/utilities/collectionscanner/MetaReplayGain.h b/utilities/collectionscanner/MetaReplayGain.h
deleted file mode 100644
index eba860a..0000000
--- a/utilities/collectionscanner/MetaReplayGain.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   Copyright (C) 2009 Alex Merry <alex.merry at kdemail.net>
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
-#ifndef AMAROK_METAREPLAYGAIN_H
-#define AMAROK_METAREPLAYGAIN_H
-
-#include <QMap>
-
-// Taglib
-#include <fileref.h>
-
-/* This file exists (rather than putting the method in MetaUtility.h and
- * MetaUtility.cpp) because we need to share the implementation between
- * amaroklib and amarokcollectionscanner (which doesn't link to amaroklib).
- */
-namespace Meta
-{
-    enum ReplayGainTag
-    {
-        ReplayGain_Track_Gain,
-        ReplayGain_Track_Peak,
-        ReplayGain_Album_Gain,
-        ReplayGain_Album_Peak
-    };
-
-    typedef QMap<ReplayGainTag, qreal> ReplayGainTagMap;
-
-    /**
-     * Reads the replay gain tags from a taglib file.
-     */
-    ReplayGainTagMap readReplayGainTags( TagLib::FileRef fileref );
-}
-
-#endif // AMAROK_METAREPLAYGAIN_H


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- amarok.spec	14 Sep 2009 20:38:52 -0000	1.162
+++ amarok.spec	17 Sep 2009 19:03:37 -0000	1.163
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
+Patch100: amarok-taglib.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -31,8 +32,8 @@ BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
-BuildRequires: taglib-devel
-BuildRequires: taglib-extras-devel
+BuildRequires: taglib-devel >= 1.6
+BuildRequires: taglib-extras-devel >= 1.0.0
 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
@@ -78,6 +79,8 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
+%patch100 -p1 -b .taglib
+
 
 %build
 mkdir -p %{_target_platform}
@@ -168,6 +171,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
+- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
 - amarok-2.1.85 (2.2beta2)
 



From rdieter at fedoraproject.org  Thu Sep 17 19:03:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 19:03:38 +0000 (UTC)
Subject: rpms/amarok/F-12 amarok-taglib.patch, NONE, 1.1 amarok.spec, 1.162, 
	1.163
Message-ID: <20090917190338.4F46F11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14593/F-12

Modified Files:
	amarok.spec 
Added Files:
	amarok-taglib.patch 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0


amarok-taglib.patch:
 b/CMakeLists.txt                                    |    4 
 b/shared/MetaReplayGain.cpp                         |    6 
 b/src/App.cpp                                       |    6 
 b/src/meta/MetaUtility.cpp                          |    4 
 b/src/meta/file/File_p.h                            |    5 
 b/src/podcasts/sql/SqlPodcastMeta.cpp               |    3 
 b/utilities/collectionscanner/AFTUtility.cpp        |   14 
 b/utilities/collectionscanner/CollectionScanner.cpp |   14 
 utilities/collectionscanner/MetaReplayGain.cpp      |  354 --------------------
 utilities/collectionscanner/MetaReplayGain.h        |   49 --
 10 files changed, 8 insertions(+), 451 deletions(-)

--- NEW FILE amarok-taglib.patch ---
# git diff 3ee0ef70c0c9d5de982091e353804c990c35ea4e
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8219bc6..e4b6b94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,10 @@ option(WITH_IPOD "Enable iPod support in Amarok" ON)
 include(CheckLibraryExists)
 check_library_exists(dl dlopen "" LIBDL_FOUND)
 
-set(TAGLIB_MIN_VERSION "1.5")
+set(TAGLIB_MIN_VERSION "1.6")
 find_package(Taglib REQUIRED)
 
-find_package(Taglib-Extras 0.1 REQUIRED)
+find_package(Taglib-Extras 1.0 REQUIRED)
 if( TAGLIB-EXTRAS_FOUND )
     add_definitions( -DTAGLIB_EXTRAS_FOUND )
 endif( TAGLIB-EXTRAS_FOUND )
diff --git a/shared/MetaReplayGain.cpp b/shared/MetaReplayGain.cpp
index d6edd95..97073d5 100644
--- a/shared/MetaReplayGain.cpp
+++ b/shared/MetaReplayGain.cpp
@@ -38,10 +38,8 @@
 #include <trueaudiofile.h>
 #include <vorbisfile.h>
 #include <wavpackfile.h>
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <asffile.h>
 #include <mp4file.h>
-#endif
 
 // converts a peak value from the normal digital scale form to the more useful decibel form
 // decibels are relative to the /adjusted/ waveform
@@ -229,7 +227,6 @@ static Meta::ReplayGainTagMap readXiphTags( TagLib::Ogg::XiphComment *tag )
     return outputMap;
 }
 
-#ifdef TAGLIB_EXTRAS_FOUND
 static Meta::ReplayGainTagMap readASFTags( TagLib::ASF::Tag *tag )
 {
     const TagLib::ASF::AttributeListMap &tagMap = tag->attributeListMap();
@@ -251,7 +248,6 @@ static Meta::ReplayGainTagMap readASFTags( TagLib::ASF::Tag *tag )
 
     return outputMap;
 }
-#endif
 // Bad news: ReplayGain in MP4 is not actually standardized in any way.  Maybe reimplement at some point...maybe.  See
 // http://www.hydrogenaudio.org/forums/lofiversion/index.php/t14322.html
 #ifdef DO_NOT_USE_THIS_UNTIL_FIXED
@@ -332,13 +328,11 @@ Meta::readReplayGainTags( TagLib::FileRef fileref )
         if ( file->APETag() )
             map = readAPETags( file->APETag() );
     }
-#ifdef TAGLIB_EXTRAS_FOUND
     else if ( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File *>( fileref.file() ) )
     {
         if ( file->tag() )
             map = readASFTags( file->tag() );
     }
-#endif
 // See comment above
 #ifdef DO_NOT_USE_THIS_UNTIL_FIXED
     else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
diff --git a/src/App.cpp b/src/App.cpp
index bd01517..637a0ad 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -70,10 +70,7 @@
 
 #ifdef TAGLIB_EXTRAS_FOUND
 #include <audiblefiletyperesolver.h>
-#include <asffiletyperesolver.h>
-#include <wavfiletyperesolver.h>
 #include <realmediafiletyperesolver.h>
-#include <mp4filetyperesolver.h>
 #endif
 
 QMutex Debug::mutex;
@@ -143,11 +140,8 @@ App::App()
 
 #ifdef TAGLIB_EXTRAS_FOUND
     PERF_LOG( "Registering taglib plugins" )
-    TagLib::FileRef::addFileTypeResolver(new MP4FileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new ASFFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new RealMediaFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new AudibleFileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new WavFileTypeResolver);
     PERF_LOG( "Done Registering taglib plugins" )
 #endif
 
diff --git a/src/meta/MetaUtility.cpp b/src/meta/MetaUtility.cpp
index b78ef92..314db57 100644
--- a/src/meta/MetaUtility.cpp
+++ b/src/meta/MetaUtility.cpp
@@ -41,12 +41,10 @@
 #include <vorbisfile.h>
 #include <textidentificationframe.h>
 #include <xiphcomment.h>
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <mp4file.h>
 #include <mp4item.h>
 #include <mp4tag.h>
 #include <asftag.h>
-#endif
 
         static const QString XESAM_ALBUM          = "http://freedesktop.org/standards/xesam/1.0/core#album";
         static const QString XESAM_ARTIST         = "http://freedesktop.org/standards/xesam/1.0/core#artist";
@@ -320,7 +318,6 @@ Meta::Field::writeFields( TagLib::FileRef fileref, const QVariantMap &changes )
             file->xiphComment()->addField("DISCNUMBER", disc);
         }
     }
-#ifdef TAGLIB_EXTRAS_FOUND
     else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
     {
         if( changes.contains( Meta::Field::COMPOSER ) )
@@ -338,7 +335,6 @@ Meta::Field::writeFields( TagLib::FileRef fileref, const QVariantMap &changes )
             mp4tag->itemListMap()["disk"] = TagLib::MP4::Item( discnumber, 0 );
         }
     }
-#endif
     if( shouldSave )
         fileref.save();
 }
diff --git a/src/meta/file/File_p.h b/src/meta/file/File_p.h
index 57c5195..f9e9daf 100644
--- a/src/meta/file/File_p.h
+++ b/src/meta/file/File_p.h
@@ -50,10 +50,7 @@
 #include <tlist.h>
 #include <tstring.h>
 #include <vorbisfile.h>
-
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <mp4file.h>
-#endif
 
 namespace MetaFile
 {
@@ -283,7 +280,6 @@ void Track::Private::readMetaData()
                 disc = strip( flm[ "DISCNUMBER" ].front() );
         }
     }
-#ifdef TAGLIB_EXTRAS_FOUND
     else if( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileRef.file() ) )
     {
         TagLib::MP4::Tag *mp4tag = dynamic_cast< TagLib::MP4::Tag *>( file->tag() );
@@ -296,7 +292,6 @@ void Track::Private::readMetaData()
                 disc = QString::number( mp4tag->itemListMap()["disk"].toIntPair().first );
         }
     }
-#endif
     if( !disc.isEmpty() )
     {
         int i = disc.indexOf( '/' );
diff --git a/src/podcasts/sql/SqlPodcastMeta.cpp b/src/podcasts/sql/SqlPodcastMeta.cpp
index 8b5a96b..4f82eb0 100644
--- a/src/podcasts/sql/SqlPodcastMeta.cpp
+++ b/src/podcasts/sql/SqlPodcastMeta.cpp
@@ -42,10 +42,7 @@
 #include <tlist.h>
 #include <tstring.h>
 #include <vorbisfile.h>
-
-#ifdef TAGLIB_EXTRAS_FOUND
 #include <mp4file.h>
-#endif
 
 class TimecodeWriteCapabilityPodcastImpl : public Meta::TimecodeWriteCapability
 {
diff --git a/utilities/collectionscanner/AFTUtility.cpp b/utilities/collectionscanner/AFTUtility.cpp
index 98552c5..3dc009b 100644
--- a/utilities/collectionscanner/AFTUtility.cpp
+++ b/utilities/collectionscanner/AFTUtility.cpp
@@ -26,6 +26,9 @@
 #include <id3v2tag.h>
 #include <mpcfile.h>
 #include <mpegfile.h>
+#include <mp4item.h>
+#include <mp4file.h>
+#include <mp4tag.h>
 #include <oggfile.h>
 #include <oggflacfile.h>
 #include <speexfile.h>
@@ -35,17 +38,6 @@
 #include <vorbisfile.h>
 #include <xiphcomment.h>
 
-#ifdef TAGLIB_EXTRAS_FOUND
-#include <mp4file.h>
-#include <mp4tag.h>
-#include <mp4item.h>
-#include <audiblefiletyperesolver.h>
-#include <asffiletyperesolver.h>
-#include <wavfiletyperesolver.h>
-#include <realmediafiletyperesolver.h>
-#include <mp4filetyperesolver.h>
-#endif
-
 #include <QFile>
 #include <QTime>
 
diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
index 673be1c..c3d961e 100644
--- a/utilities/collectionscanner/CollectionScanner.cpp
+++ b/utilities/collectionscanner/CollectionScanner.cpp
@@ -49,6 +49,9 @@
 #include <flacfile.h>
 #include <id3v1tag.h>
 #include <id3v2tag.h>
+#include <mp4file.h>
+#include <mp4tag.h>
+#include <mp4item.h>
 #include <mpcfile.h>
 #include <mpegfile.h>
 #include <oggfile.h>
@@ -59,14 +62,8 @@
 #include <vorbisfile.h>
 
 #ifdef TAGLIB_EXTRAS_FOUND
-#include <mp4file.h>
-#include <mp4tag.h>
-#include <mp4item.h>
 #include <audiblefiletyperesolver.h>
-#include <asffiletyperesolver.h>
-#include <wavfiletyperesolver.h>
 #include <realmediafiletyperesolver.h>
-#include <mp4filetyperesolver.h>
 #endif
 
 #include <textidentificationframe.h>
@@ -101,11 +98,8 @@ CollectionScanner::CollectionScanner( int &argc, char **argv )
     readArgs();
 
 #ifdef TAGLIB_EXTRAS_FOUND
-    TagLib::FileRef::addFileTypeResolver(new MP4FileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new ASFFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new RealMediaFileTypeResolver);
     TagLib::FileRef::addFileTypeResolver(new AudibleFileTypeResolver);
-    TagLib::FileRef::addFileTypeResolver(new WavFileTypeResolver);
 #endif
 
     m_logfile = ( m_batch ? ( m_incremental ? "amarokcollectionscanner_batchincrementalscan.log" : "amarokcollectionscanner_batchfullscan.log" )
@@ -644,7 +638,6 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
 //             if ( images && file->ID3v2Tag() )
 //                 loadImagesFromTag( *file->ID3v2Tag(), *images );
         }
-#ifdef TAGLIB_EXTRAS_FOUND
         else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
         {
             fileType = mp4;
@@ -667,7 +660,6 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
 //                     images->push_back( EmbeddedImage( mp4tag->cover(), "" ) );
             }
         }
-#endif
 
         if ( !disc.isEmpty() )
         {
diff --git a/utilities/collectionscanner/MetaReplayGain.cpp b/utilities/collectionscanner/MetaReplayGain.cpp
deleted file mode 100644
index 8e789cf..0000000
--- a/utilities/collectionscanner/MetaReplayGain.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
-   Copyright (C) 2009 Alex Merry <alex.merry at kdemail.net>
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
-// NOTE: this file is used by amarokcollectionscanner and CANNOT use any amaroklib
-//       code [this includes debug()]
-
-#include "MetaReplayGain.h"
-
-#include <QString>
-#include <cmath>
-
-// Taglib
-#include <tag.h>
-#include <tlist.h>
-#include <tstring.h>
-#include <textidentificationframe.h>
-#include <apetag.h>
-#include <flacfile.h>
-#include <id3v2tag.h>
-#include <mpcfile.h>
-#include <mpegfile.h>
-#include <oggfile.h>
-#include <oggflacfile.h>
-#include <speexfile.h>
-#include <trueaudiofile.h>
-#include <vorbisfile.h>
-#include <wavpackfile.h>
-#ifdef TAGLIB_EXTRAS_FOUND
-#include <asffile.h>
-#include <mp4file.h>
-#endif
-
-// converts a peak value from the normal digital scale form to the more useful decibel form
-// decibels are relative to the /adjusted/ waveform
-static qreal peakToDecibels( qreal scaleVal )
-{
-    if ( scaleVal > 0 )
-        return 20 * log10( scaleVal );
-    else
-        return 0;
-}
-
-// NOTE: representation is taken to be a binary value with units in the first column,
-//       1/2 in the second and so on.
-static qreal readRVA2PeakValue( const TagLib::ByteVector &data, int bits, bool *ok )
-{
-    qreal peak = 0.0;
-    // discarding digits at the end reduces precision, but doesn't otherwise change the value
-    if ( bits > 32 )
-        bits = 32;
-    // the +7 makes sure we round up when we divide by 8
-    unsigned int bytes = (bits + 7) / 8;
-
-    // normalize appears not to write a peak at all, and hence sets bits to 0
-    if ( bits == 0 )
-    {
-        if ( ok )
-            *ok = true;
-    }
-    else if ( bits >= 4 && data.size() >= bytes ) // fewer than 4 bits would just be daft
-    {
-        // excessBits is the number of bits we have to discard at the end
-        unsigned int excessBits = (8 * bytes) - bits;
-        // mask has 1s everywhere but the last /excessBits/ bits
-        quint32 mask = 0xffffffff << excessBits;
-        quint32 rawValue = 0;
-        for ( unsigned int i = 0; i < bytes; ++i )
-        {
-            rawValue <<= 8;
-            rawValue += (unsigned char)data[i];
-        }
-        rawValue &= mask;
-        peak = rawValue;
-        // amount we need to "shift" the value right to make the first digit the unit column
-        unsigned int rightShift = (8 * bytes) - 1;
-        peak /= (qreal)(1 << rightShift);
-        if ( ok )
-            *ok = true;
-    }
-    else
-    {
-        if ( ok )
-            *ok = false;
-    }
-    return peak;
-}
-
-// adds the converted version of the scale value if it is a valid, non-negative float
-static void maybeAddPeak( const TagLib::String &scaleVal, Meta::ReplayGainTag key, Meta::ReplayGainTagMap *map )
-{
-    // scale value is >= 0, and typically not much bigger than 1
-    QString value = TStringToQString( scaleVal );
-    bool ok = false;
-    qreal peak = value.toFloat( &ok );
-    if ( ok && peak >= 0 )
-        (*map)[key] = peakToDecibels( peak );
-}
-
-static void maybeAddGain( const TagLib::String &input, Meta::ReplayGainTag key, Meta::ReplayGainTagMap *map )
-{
-    QString value = TStringToQString( input ).remove( " dB" );
-    bool ok = false;
-    qreal gain = value.toFloat( &ok );
-    if (ok)
-        (*map)[key] = gain;
-}
-
-static Meta::ReplayGainTagMap readID3v2Tags( TagLib::ID3v2::Tag *tag )
-{
-    Meta::ReplayGainTagMap map;
-    {   // ID3v2.4.0 native replay gain tag support (as written by Quod Libet, for example).
-        TagLib::ID3v2::FrameList frames = tag->frameListMap()["RVA2"];
-        frames.append(tag->frameListMap()["XRVA"]);
-        if ( !frames.isEmpty() )
-        {
-            for ( unsigned int i = 0; i < frames.size(); ++i )
-            {
-                // we have to parse this frame ourselves
-                // ID3v2 frame header is 10 bytes, so skip that
-                TagLib::ByteVector data = frames[i]->render().mid( 10 );
-                unsigned int offset = 0;
-                QString desc( data.data() );
-                offset += desc.count() + 1;
-                unsigned int channel = data.mid( offset, 1 ).toUInt( true );
-                // channel 1 is the main volume - the only one we care about
-                if ( channel == 1 )
-                {
-                    ++offset;
-                    qint16 adjustment512 = data.mid( offset, 2 ).toShort( true );
-                    qreal adjustment = ( (qreal)adjustment512 ) / 512.0;
-                    offset += 2;
-                    unsigned int peakBits = data.mid( offset, 1 ).toUInt( true );
-                    ++offset;
-                    bool ok = false;
-                    qreal peak = readRVA2PeakValue( data.mid( offset ), peakBits, &ok );
-                    if ( ok )
-                    {
-                        if ( desc.toLower() == "album" )
-                        {
-                            map[Meta::ReplayGain_Album_Gain] = adjustment;
-                            map[Meta::ReplayGain_Album_Peak] = peakToDecibels( peak );
-                        }
-                        else if ( desc.toLower() == "track" || !map.contains( Meta::ReplayGain_Track_Gain ) )
-                        {
-                            map[Meta::ReplayGain_Track_Gain] = adjustment;
-                            map[Meta::ReplayGain_Track_Peak] = peakToDecibels( peak );
-                        }
-                    }
-                }
-            }
-            if ( !map.isEmpty() )
-                return map;
-        }
-    }
-
-    {   // Foobar2000-style ID3v2.3.0 tags
-        TagLib::ID3v2::FrameList frames = tag->frameListMap()["TXXX"];
-        for ( TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it ) {
-            TagLib::ID3v2::UserTextIdentificationFrame* frame =
-                dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>( *it );
-            if ( frame && frame->fieldList().size() >= 2 )
-            {
-                QString desc = TStringToQString( frame->description() ).toLower();
-                if ( desc == "replaygain_album_gain" )
-                    maybeAddGain( frame->fieldList()[1], Meta::ReplayGain_Album_Gain, &map );
-                if ( desc == "replaygain_album_peak" )
-                    maybeAddPeak( frame->fieldList()[1], Meta::ReplayGain_Album_Peak, &map );
-                if ( desc == "replaygain_track_gain" )
-                    maybeAddGain( frame->fieldList()[1], Meta::ReplayGain_Track_Gain, &map );
-                if ( desc == "replaygain_track_peak" )
-                    maybeAddPeak( frame->fieldList()[1], Meta::ReplayGain_Track_Peak, &map );
-            }
-        }
-    }
-    return map;
-}
-
-static Meta::ReplayGainTagMap readAPETags( TagLib::APE::Tag *tag )
-{
-    Meta::ReplayGainTagMap map;
-    const TagLib::APE::ItemListMap &items = tag->itemListMap();
-    if ( items.contains("REPLAYGAIN_TRACK_GAIN") )
-    {
-        maybeAddGain( items["REPLAYGAIN_TRACK_GAIN"].values()[0], Meta::ReplayGain_Track_Gain, &map );
-        if ( items.contains("REPLAYGAIN_TRACK_PEAK") )
-            maybeAddPeak( items["REPLAYGAIN_TRACK_PEAK"].values()[0], Meta::ReplayGain_Track_Peak, &map );
-    }
-    if ( items.contains("REPLAYGAIN_ALBUM_GAIN") )
-    {
-        maybeAddGain( items["REPLAYGAIN_ALBUM_GAIN"].values()[0], Meta::ReplayGain_Album_Gain, &map );
-        if ( items.contains("REPLAYGAIN_ALBUM_PEAK") )
-            maybeAddPeak( items["REPLAYGAIN_ALBUM_PEAK"].values()[0], Meta::ReplayGain_Album_Peak, &map );
-    }
-    return map;
-}
-
-static Meta::ReplayGainTagMap readXiphTags( TagLib::Ogg::XiphComment *tag )
-{
-    const TagLib::Ogg::FieldListMap &tagMap = tag->fieldListMap();
-    Meta::ReplayGainTagMap outputMap;
-
-    if ( !tagMap["REPLAYGAIN_TRACK_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_TRACK_GAIN"].front(), Meta::ReplayGain_Track_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_TRACK_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_TRACK_PEAK"].front(), Meta::ReplayGain_Track_Peak, &outputMap );
-    }
-
-    if ( !tagMap["REPLAYGAIN_ALBUM_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_ALBUM_GAIN"].front(), Meta::ReplayGain_Album_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_ALBUM_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_ALBUM_PEAK"].front(), Meta::ReplayGain_Album_Peak, &outputMap );
-    }
-
-    return outputMap;
-}
-
-#ifdef TAGLIB_EXTRAS_FOUND
-static Meta::ReplayGainTagMap readASFTags( TagLib::ASF::Tag *tag )
-{
-    const TagLib::ASF::AttributeListMap &tagMap = tag->attributeListMap();
-    Meta::ReplayGainTagMap outputMap;
-
-    if ( !tagMap["REPLAYGAIN_TRACK_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_TRACK_GAIN"].front().toString(), Meta::ReplayGain_Track_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_TRACK_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_TRACK_PEAK"].front().toString(), Meta::ReplayGain_Track_Peak, &outputMap );
-    }
-
-    if ( !tagMap["REPLAYGAIN_ALBUM_GAIN"].isEmpty() )
-    {
-        maybeAddGain( tagMap["REPLAYGAIN_ALBUM_GAIN"].front().toString(), Meta::ReplayGain_Album_Gain, &outputMap );
-        if ( !tagMap["REPLAYGAIN_ALBUM_PEAK"].isEmpty() )
-            maybeAddPeak( tagMap["REPLAYGAIN_ALBUM_PEAK"].front().toString(), Meta::ReplayGain_Album_Peak, &outputMap );
-    }
-
-    return outputMap;
-}
-#endif
-// Bad news: ReplayGain in MP4 is not actually standardized in any way.  Maybe reimplement at some point...maybe.  See
-// http://www.hydrogenaudio.org/forums/lofiversion/index.php/t14322.html
-#ifdef DO_NOT_USE_THIS_UNTIL_FIXED
-static Meta::ReplayGainTagMap readMP4Tags( TagLib::MP4::Tag *tag )
-{
-    Meta::ReplayGainTagMap outputMap;
-
-    if ( !tag->trackReplayGain().isNull() ) {
-        maybeAddGain( tag->trackReplayGain(), Meta::ReplayGain_Track_Gain, &outputMap );
-        if ( !tag->trackReplayGainPeak().isNull() )
-            maybeAddPeak( tag->trackReplayGainPeak(), Meta::ReplayGain_Track_Peak, &outputMap );
-    }
-
-    if ( !tag->albumReplayGain().isNull() ) {
-        maybeAddGain( tag->albumReplayGain(), Meta::ReplayGain_Album_Gain, &outputMap );
-        if ( !tag->albumReplayGainPeak().isNull() )
-            maybeAddPeak( tag->albumReplayGainPeak(), Meta::ReplayGain_Album_Peak, &outputMap );
-    }
-
-    return outputMap;
-}
-#endif 
-
-Meta::ReplayGainTagMap
-Meta::readReplayGainTags( TagLib::FileRef fileref )
-{
-    Meta::ReplayGainTagMap map;
-    // NB: we can't get replay gain info from MPC files, since it's stored in some magic place
-    //     and not in the APE tags, and taglib doesn't let us access the information (unless
-    //     we want to parse the file ourselves).
-    // FIXME: should we try getting the info from the MPC APE tag just in case?
-
-    if ( TagLib::MPEG::File *file = dynamic_cast<TagLib::MPEG::File *>( fileref.file() ) )
-    {
-        if ( file->ID3v2Tag() )
-            map = readID3v2Tags( file->ID3v2Tag() );
-        if ( map.isEmpty() && file->APETag() )
-            map = readAPETags( file->APETag() );
-    }
-    else if ( TagLib::Ogg::Vorbis::File *file = dynamic_cast<TagLib::Ogg::Vorbis::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readXiphTags( file->tag() );
-    }
-    else if ( TagLib::FLAC::File *file = dynamic_cast<TagLib::FLAC::File *>( fileref.file() ) )
-    {
-        if ( file->xiphComment() )
-            map = readXiphTags( file->xiphComment() );
-        if ( map.isEmpty() && file->ID3v2Tag() )
-            map = readID3v2Tags( file->ID3v2Tag() );
-    }
-    else if ( TagLib::Ogg::FLAC::File *file = dynamic_cast<TagLib::Ogg::FLAC::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readXiphTags( file->tag() );
-    }
-    else if ( TagLib::WavPack::File *file = dynamic_cast<TagLib::WavPack::File *>( fileref.file() ) )
-    {
-        if ( file->APETag() )
-            map = readAPETags( file->APETag() );
-    }
-    else if ( TagLib::TrueAudio::File *file = dynamic_cast<TagLib::TrueAudio::File *>( fileref.file() ) )
-    {
-        if ( file->ID3v2Tag() )
-            map = readID3v2Tags( file->ID3v2Tag() );
-    }
-    else if ( TagLib::Ogg::Speex::File *file = dynamic_cast<TagLib::Ogg::Speex::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readXiphTags( file->tag() );
-    }
-    else if ( TagLib::MPC::File *file = dynamic_cast<TagLib::MPC::File *>( fileref.file() ) )
-    {
-        // This is NOT the correct way to get replay gain tags from MPC files, but
-        // taglib doesn't allow us access to the real information.
-        // This allows people to work around this issue by copying their replay gain
-        // information to the APE tag.
-        if ( file->APETag() )
-            map = readAPETags( file->APETag() );
-    }
-#ifdef TAGLIB_EXTRAS_FOUND
-    else if ( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readASFTags( file->tag() );
-    }
-#endif
-// See comment above
-#ifdef DO_NOT_USE_THIS_UNTIL_FIXED
-    else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
-    {
-        if ( file->tag() )
-            map = readMP4Tags( file->getMP4Tag() );
-    }
-#endif
-    return map;
-}
-
diff --git a/utilities/collectionscanner/MetaReplayGain.h b/utilities/collectionscanner/MetaReplayGain.h
deleted file mode 100644
index eba860a..0000000
--- a/utilities/collectionscanner/MetaReplayGain.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   Copyright (C) 2009 Alex Merry <alex.merry at kdemail.net>
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
-#ifndef AMAROK_METAREPLAYGAIN_H
-#define AMAROK_METAREPLAYGAIN_H
-
-#include <QMap>
-
-// Taglib
-#include <fileref.h>
-
-/* This file exists (rather than putting the method in MetaUtility.h and
- * MetaUtility.cpp) because we need to share the implementation between
- * amaroklib and amarokcollectionscanner (which doesn't link to amaroklib).
- */
-namespace Meta
-{
-    enum ReplayGainTag
-    {
-        ReplayGain_Track_Gain,
-        ReplayGain_Track_Peak,
-        ReplayGain_Album_Gain,
-        ReplayGain_Album_Peak
-    };
-
-    typedef QMap<ReplayGainTag, qreal> ReplayGainTagMap;
-
-    /**
-     * Reads the replay gain tags from a taglib file.
-     */
-    ReplayGainTagMap readReplayGainTags( TagLib::FileRef fileref );
-}
-
-#endif // AMAROK_METAREPLAYGAIN_H


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- amarok.spec	14 Sep 2009 20:51:03 -0000	1.162
+++ amarok.spec	17 Sep 2009 19:03:37 -0000	1.163
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
+Patch100: amarok-taglib.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -31,8 +32,8 @@ BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
-BuildRequires: taglib-devel
-BuildRequires: taglib-extras-devel
+BuildRequires: taglib-devel >= 1.6
+BuildRequires: taglib-extras-devel >= 1.0.0
 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
@@ -78,6 +79,8 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
+%patch100 -p1 -b .taglib
+
 
 %build
 mkdir -p %{_target_platform}
@@ -168,6 +171,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
+- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
 - amarok-2.1.85 (2.2beta2)
 



From akurtakov at fedoraproject.org  Thu Sep 17 19:05:09 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 17 Sep 2009 19:05:09 +0000 (UTC)
Subject: rpms/maven-scm/devel maven-scm.spec,1.19,1.20
Message-ID: <20090917190509.1EA9D11C00CE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15592/devel

Modified Files:
	maven-scm.spec 
Log Message:
Fix maven-scm-plugin depmap.


Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- maven-scm.spec	13 Sep 2009 07:45:07 -0000	1.19
+++ maven-scm.spec	17 Sep 2009 19:05:08 -0000	1.20
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -168,6 +168,8 @@ done
 cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
 %add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
 
+%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/maven-scm plugin
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -214,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Thu Sep 17 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-4
+- Fix maven-scm-plugin depmap.
+
 * Sat Sep 12 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-3
 - BR maven-surefire-provider-junit.
 - BR plexus-maven-plugin.



From wtogami at fedoraproject.org  Thu Sep 17 19:05:48 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 19:05:48 +0000 (UTC)
Subject: rpms/perl-NetAddr-IP/EL-5 License_of_perl-NetAddr-IP.txt, NONE,
	1.1 .cvsignore, 1.2, 1.3 perl-NetAddr-IP.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090917190548.2F71611C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-NetAddr-IP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15376

Modified Files:
	.cvsignore perl-NetAddr-IP.spec sources 
Added Files:
	License_of_perl-NetAddr-IP.txt 
Log Message:
Upgrade EPEL-5 to perl-NetAddr-IP-4.027.  NetAddr:IP is a new hard
requirement of spamassassin-3.3.0, and < 4.007 has serious bugs.



--- NEW FILE License_of_perl-NetAddr-IP.txt ---
Subject: Re: License of perl-NetAddr-IP
From: "Luis E." =?ISO-8859-1?Q?Mu=F1oz?= <lem at itverx.com.ve>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Date: Thu, 07 Aug 2008 11:16:59 -0430

On Thu, 2008-08-07 at 10:55 -0400, Tom "spot" Callaway wrote:
> I've been trying to contact you over the last year without any luck.
> Currently, Fedora is including NetAddr::IP, which is licensed under
> the
> Artistic 1.0 license. This license is no longer a permitted license in
> Fedora.

Hi Tom and thanks for getting in touch.

Why do you say that the code is licensed under the 1.0 license?

According to this excerpt (from
http://search.cpan.org/src/LUISMUNOZ/NetAddr-IP-4.007/README )...

# LICENSE AND WARRANTY
# 
# This software is (c) Luis E. Mu?oz and Michael A. Robinton.  It can be
# used under the terms of the perl artistic license provided that proper
# credit for the work of the authors is  preserved in  the form  of this 
# copyright  notice and license for this module.

... there is no mention to a specific version number for the license.

> [...] We have several other popular applications which depend on your
> code, so
> I am hopeful that you will be willing to relicense (either to Artistic
> 2.0 or any other license of your choice on this list:
> http://fedoraproject.org/wiki/Licensing#Good_Licenses ) or dual
> license
> (for example, the same license as perl, GPL+ or Artistic).

I would be willing to relicense to Artistic 2.0 if need be. However, the
code is rather stable at this time. I think it would not be a wise use
of time to start tracking "upstream license version number" as well :-)

Regards.

-lem


Subject: Re: License of perl-NetAddr-IP
From: "Luis E." =?ISO-8859-1?Q?Mu=F1oz?= <lem at itverx.com.ve>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Date: Thu, 07 Aug 2008 12:06:33 -0430

On Thu, 2008-08-07 at 11:57 -0400, Tom "spot" Callaway wrote:
> In the interim, will you give Fedora permission to distribute this
> code
> under Artistic 2.0?

Of course. I'll tack a note to update the wording in the next release.

Best regards.

-lem



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 May 2007 21:02:56 -0000	1.2
+++ .cvsignore	17 Sep 2009 19:05:47 -0000	1.3
@@ -1 +1 @@
-NetAddr-IP-4.004.tar.gz
+NetAddr-IP-4.027.tar.gz


Index: perl-NetAddr-IP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/EL-5/perl-NetAddr-IP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-NetAddr-IP.spec	16 May 2007 21:02:56 -0000	1.1
+++ perl-NetAddr-IP.spec	17 Sep 2009 19:05:48 -0000	1.2
@@ -1,13 +1,16 @@
 Name:           perl-NetAddr-IP
-Version:        4.004
-Release:        2%{?dist}
+Version:        4.027
+Release:        1%{?dist}
 Summary:        Manages IPv4 and IPv6 addresses and subnets
-License:        Artistic
+# Upstream explicitly gave permission for us to distribute under Artistic 2.0
+# Will be reflected in next release.
+License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/NetAddr-IP/
 Source0:        http://www.cpan.org/modules/by-module/NetAddr/NetAddr-IP-%{version}.tar.gz
+Source1:	License_of_perl-NetAddr-IP.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -18,6 +21,7 @@ Math::BigInt as in previous versions.
 
 %prep
 %setup -q -n NetAddr-IP-%{version}
+cp %{SOURCE1} .
 
 # Fix UTF-8
 iconv -f ISO_8859-1 -t UTF-8 -o tmp.pm IP.pm &&
@@ -50,13 +54,38 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README TODO docs/rfc1884.txt
+%doc Changes README TODO docs/rfc1884.txt License_of_perl-NetAddr-IP.txt
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/NetAddr*
 %{_mandir}/man3/*
 
 %changelog
-* Thu Apr 26 2007 * Thu Apr 12 2007 Andreas Thienemann <andreas at bawue.net> 4.004-2
+* Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 4.027-1
+- 4.027
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.007-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.007-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.007-3
+- fix license tag
+
+* Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.007-2
+- rebuild for new perl
+
+* Tue Feb 12 2008 Andreas Thienemann <athienem at redhat.com> 4.007-1
+- Updated to 4.007
+- Rebuilt against gcc-4.3
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4.004-4
+- Rebuild for selinux ppc32 issue.
+
+* Tue Jul 10 2007 Andreas Thienemann <andreas at bawue.net> 4.004-3
+- Fixed missing BR on rawhide
+
+* Thu Apr 26 2007 Andreas Thienemann <andreas at bawue.net> 4.004-2
 - Moar docs!
 
 * Thu Apr 12 2007 Andreas Thienemann <andreas at bawue.net> 4.004-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 May 2007 21:02:56 -0000	1.2
+++ sources	17 Sep 2009 19:05:48 -0000	1.3
@@ -1 +1 @@
-4f0ef938abf0b1e43ca96fb0068381df  NetAddr-IP-4.004.tar.gz
+c4a21a76e5b1b9f4c8e9810b78559d7b  NetAddr-IP-4.027.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 19:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:06:56 +0000
Subject: [pkgdb] kio_gopher was added for kkofler
Message-ID: <20090917190655.536AB10F883@bastion2.fedora.phx.redhat.com>

kevin has added Package kio_gopher with summary Gopher KIO slave for Konqueror
kevin has approved Package kio_gopher
kevin has added a Fedora devel branch for kio_gopher with an owner of kkofler
kevin has approved kio_gopher in Fedora devel
kevin has approved Package kio_gopher
kevin has set commit to Approved for 107427 on kio_gopher (Fedora devel)
kevin has set checkout to Approved for 107427 on kio_gopher (Fedora devel)
kevin has set build to Approved for 107427 on kio_gopher (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio_gopher



From pkgdb at fedoraproject.org  Thu Sep 17 19:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:06:59 +0000
Subject: [pkgdb] kio_gopher summary updated by kevin
Message-ID: <20090917190659.CD2D510F896@bastion2.fedora.phx.redhat.com>

kevin set package kio_gopher summary to Gopher KIO slave for Konqueror

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio_gopher



From pkgdb at fedoraproject.org  Thu Sep 17 19:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:06:59 +0000
Subject: [pkgdb] kio_gopher (Fedora, 10) updated by kevin
Message-ID: <20090917190700.11E7B10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kio_gopher
kevin has set commit to Approved for 107427 on kio_gopher (Fedora 10)
kevin has set checkout to Approved for 107427 on kio_gopher (Fedora 10)
kevin has set build to Approved for 107427 on kio_gopher (Fedora 10)
kevin approved watchbugzilla on kio_gopher (Fedora 10) for tuxbrewr
kevin approved watchcommits on kio_gopher (Fedora 10) for tuxbrewr
kevin approved watchbugzilla on kio_gopher (Fedora 10) for jreznik
kevin approved watchcommits on kio_gopher (Fedora 10) for jreznik
kevin approved commit on kio_gopher (Fedora 10) for jreznik
kevin approved build on kio_gopher (Fedora 10) for jreznik
kevin approved approveacls on kio_gopher (Fedora 10) for jreznik
kevin approved watchbugzilla on kio_gopher (Fedora 10) for rdieter
kevin approved watchcommits on kio_gopher (Fedora 10) for rdieter
kevin approved commit on kio_gopher (Fedora 10) for rdieter
kevin approved build on kio_gopher (Fedora 10) for rdieter
kevin approved approveacls on kio_gopher (Fedora 10) for rdieter
kevin approved watchbugzilla on kio_gopher (Fedora 10) for ltinkl
kevin approved watchcommits on kio_gopher (Fedora 10) for ltinkl
kevin approved commit on kio_gopher (Fedora 10) for ltinkl
kevin approved build on kio_gopher (Fedora 10) for ltinkl
kevin approved approveacls on kio_gopher (Fedora 10) for ltinkl
kevin approved watchbugzilla on kio_gopher (Fedora 10) for than
kevin approved watchcommits on kio_gopher (Fedora 10) for than
kevin approved commit on kio_gopher (Fedora 10) for than
kevin approved build on kio_gopher (Fedora 10) for than
kevin approved approveacls on kio_gopher (Fedora 10) for than
kevin approved watchbugzilla on kio_gopher (Fedora 10) for svahl
kevin approved watchcommits on kio_gopher (Fedora 10) for svahl
kevin approved commit on kio_gopher (Fedora 10) for svahl
kevin approved build on kio_gopher (Fedora 10) for svahl
kevin approved approveacls on kio_gopher (Fedora 10) for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio_gopher



From pkgdb at fedoraproject.org  Thu Sep 17 19:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:06:59 +0000
Subject: [pkgdb] kio_gopher (Fedora, 10) updated by kevin
Message-ID: <20090917190700.274A010F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for kio_gopher
kevin has set commit to Approved for 107427 on kio_gopher (Fedora 11)
kevin has set checkout to Approved for 107427 on kio_gopher (Fedora 11)
kevin has set build to Approved for 107427 on kio_gopher (Fedora 11)
kevin approved watchbugzilla on kio_gopher (Fedora 11) for tuxbrewr
kevin approved watchcommits on kio_gopher (Fedora 11) for tuxbrewr
kevin approved watchbugzilla on kio_gopher (Fedora 11) for jreznik
kevin approved watchcommits on kio_gopher (Fedora 11) for jreznik
kevin approved commit on kio_gopher (Fedora 11) for jreznik
kevin approved build on kio_gopher (Fedora 11) for jreznik
kevin approved approveacls on kio_gopher (Fedora 11) for jreznik
kevin approved watchbugzilla on kio_gopher (Fedora 11) for rdieter
kevin approved watchcommits on kio_gopher (Fedora 11) for rdieter
kevin approved commit on kio_gopher (Fedora 11) for rdieter
kevin approved build on kio_gopher (Fedora 11) for rdieter
kevin approved approveacls on kio_gopher (Fedora 11) for rdieter
kevin approved watchbugzilla on kio_gopher (Fedora 11) for ltinkl
kevin approved watchcommits on kio_gopher (Fedora 11) for ltinkl
kevin approved commit on kio_gopher (Fedora 11) for ltinkl
kevin approved build on kio_gopher (Fedora 11) for ltinkl
kevin approved approveacls on kio_gopher (Fedora 11) for ltinkl
kevin approved watchbugzilla on kio_gopher (Fedora 11) for than
kevin approved watchcommits on kio_gopher (Fedora 11) for than
kevin approved commit on kio_gopher (Fedora 11) for than
kevin approved build on kio_gopher (Fedora 11) for than
kevin approved approveacls on kio_gopher (Fedora 11) for than
kevin approved watchbugzilla on kio_gopher (Fedora 11) for svahl
kevin approved watchcommits on kio_gopher (Fedora 11) for svahl
kevin approved commit on kio_gopher (Fedora 11) for svahl
kevin approved build on kio_gopher (Fedora 11) for svahl
kevin approved approveacls on kio_gopher (Fedora 11) for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio_gopher



From pkgdb at fedoraproject.org  Thu Sep 17 19:07:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:07:00 +0000
Subject: [pkgdb] kio_gopher (Fedora, 10) updated by kevin
Message-ID: <20090917190700.420B310F8B0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kio_gopher (Fedora devel) for tuxbrewr
kevin approved watchcommits on kio_gopher (Fedora devel) for tuxbrewr
kevin approved watchbugzilla on kio_gopher (Fedora devel) for jreznik
kevin approved watchcommits on kio_gopher (Fedora devel) for jreznik
kevin approved commit on kio_gopher (Fedora devel) for jreznik
kevin approved build on kio_gopher (Fedora devel) for jreznik
kevin approved approveacls on kio_gopher (Fedora devel) for jreznik
kevin approved watchbugzilla on kio_gopher (Fedora devel) for rdieter
kevin approved watchcommits on kio_gopher (Fedora devel) for rdieter
kevin approved commit on kio_gopher (Fedora devel) for rdieter
kevin approved build on kio_gopher (Fedora devel) for rdieter
kevin approved approveacls on kio_gopher (Fedora devel) for rdieter
kevin approved watchbugzilla on kio_gopher (Fedora devel) for ltinkl
kevin approved watchcommits on kio_gopher (Fedora devel) for ltinkl
kevin approved commit on kio_gopher (Fedora devel) for ltinkl
kevin approved build on kio_gopher (Fedora devel) for ltinkl
kevin approved approveacls on kio_gopher (Fedora devel) for ltinkl
kevin approved watchbugzilla on kio_gopher (Fedora devel) for than
kevin approved watchcommits on kio_gopher (Fedora devel) for than
kevin approved commit on kio_gopher (Fedora devel) for than
kevin approved build on kio_gopher (Fedora devel) for than
kevin approved approveacls on kio_gopher (Fedora devel) for than
kevin approved watchbugzilla on kio_gopher (Fedora devel) for svahl
kevin approved watchcommits on kio_gopher (Fedora devel) for svahl
kevin approved commit on kio_gopher (Fedora devel) for svahl
kevin approved build on kio_gopher (Fedora devel) for svahl
kevin approved approveacls on kio_gopher (Fedora devel) for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kio_gopher



From jwilson at fedoraproject.org  Thu Sep 17 19:07:26 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 17 Sep 2009 19:07:26 +0000 (UTC)
Subject: rpms/libraw1394/devel .cvsignore, 1.12, 1.13 libraw1394.spec, 1.53, 
	1.54 sources, 1.13, 1.14
Message-ID: <20090917190726.2DAE311C00CE@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16763

Modified Files:
	.cvsignore libraw1394.spec sources 
Log Message:
* Thu Sep 17 2009 Jarod Wilson <jarod at redhat.com> - 2.0.4-1
- Update to libraw1394 v2.0.4 release
- Point to new download location and project page



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	15 Jan 2009 15:11:20 -0000	1.12
+++ .cvsignore	17 Sep 2009 19:07:25 -0000	1.13
@@ -5,3 +5,4 @@ libraw1394-1.3.0.tar.gz
 libraw1394-2.0.0-20080430_git.tar.bz2
 libraw1394-2.0.0.tar.gz
 libraw1394-2.0.1.tar.gz
+libraw1394-2.0.4.tar.bz2


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libraw1394.spec	25 Jul 2009 08:31:36 -0000	1.53
+++ libraw1394.spec	17 Sep 2009 19:07:25 -0000	1.54
@@ -1,11 +1,11 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
-Version:        2.0.1
-Release:        3%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
-Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
-URL:            http://www.linux1394.org/
+Source:         http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.bz2
+URL:            http://www.dennedy.org/libraw1394/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf automake libtool kernel-headers
@@ -65,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Jarod Wilson <jarod at redhat.com> - 2.0.4-1
+- Update to libraw1394 v2.0.4 release
+- Point to new download location and project page
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Jan 2009 15:11:20 -0000	1.13
+++ sources	17 Sep 2009 19:07:25 -0000	1.14
@@ -1 +1 @@
-c2c2ead417f0cb4e65bb3513325e73a9  libraw1394-2.0.1.tar.gz
+aa5944d2a98cb86e395f0b9bd2b6224a  libraw1394-2.0.4.tar.bz2



From kevin at fedoraproject.org  Thu Sep 17 19:07:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:07:46 +0000 (UTC)
Subject: rpms/kio_gopher - New directory
Message-ID: <20090917190746.7592611C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kio_gopher
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16989/rpms/kio_gopher

Log Message:
Directory /cvs/pkgs/rpms/kio_gopher added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:07:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:07:47 +0000 (UTC)
Subject: rpms/kio_gopher/devel - New directory
Message-ID: <20090917190747.3BF8111C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kio_gopher/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16989/rpms/kio_gopher/devel

Log Message:
Directory /cvs/pkgs/rpms/kio_gopher/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:08:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:08:16 +0000 (UTC)
Subject: rpms/kio_gopher Makefile,NONE,1.1
Message-ID: <20090917190816.D4FF511C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kio_gopher
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16989/rpms/kio_gopher

Added Files:
	Makefile 
Log Message:
Setup of module kio_gopher


--- NEW FILE Makefile ---
# Top level Makefile for module kio_gopher
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  Thu Sep 17 19:08:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:08:18 +0000 (UTC)
Subject: rpms/kio_gopher/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090917190818.0EB2511C0333@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kio_gopher/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16989/rpms/kio_gopher/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kio_gopher


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kio_gopher
# $Id: Makefile,v 1.1 2009/09/17 19:08:17 kevin Exp $
NAME := kio_gopher
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  Thu Sep 17 19:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:09:50 +0000
Subject: [pkgdb] GraphicsMagick (Fedora EPEL, 5) updated by kevin
Message-ID: <20090917190949.B8CDC10F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for GraphicsMagick
kevin has set commit to Approved for 107427 on GraphicsMagick (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on GraphicsMagick (Fedora EPEL 5)
kevin has set build to Approved for 107427 on GraphicsMagick (Fedora EPEL 5)
kevin changed owner of GraphicsMagick in Fedora EPEL 5 to rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/GraphicsMagick



From pkgdb at fedoraproject.org  Thu Sep 17 19:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:10:53 +0000
Subject: [pkgdb] rekonq was added for kaboon
Message-ID: <20090917191053.0E71010F883@bastion2.fedora.phx.redhat.com>

kevin has added Package rekonq with summary KDE browser based on QtWebkit
kevin has approved Package rekonq
kevin has added a Fedora devel branch for rekonq with an owner of kaboon
kevin has approved rekonq in Fedora devel
kevin has approved Package rekonq
kevin has set commit to Approved for 107427 on rekonq (Fedora devel)
kevin has set checkout to Approved for 107427 on rekonq (Fedora devel)
kevin has set build to Approved for 107427 on rekonq (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rekonq



From pkgdb at fedoraproject.org  Thu Sep 17 19:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:10:53 +0000
Subject: [pkgdb] rekonq summary updated by kevin
Message-ID: <20090917191055.3D56610F88C@bastion2.fedora.phx.redhat.com>

kevin set package rekonq summary to KDE browser based on QtWebkit

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rekonq



From pkgdb at fedoraproject.org  Thu Sep 17 19:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:10:53 +0000
Subject: [pkgdb] rekonq (Fedora, 11) updated by kevin
Message-ID: <20090917191055.4767B10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rekonq
kevin has set commit to Approved for 107427 on rekonq (Fedora 11)
kevin has set checkout to Approved for 107427 on rekonq (Fedora 11)
kevin has set build to Approved for 107427 on rekonq (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rekonq



From pkgdb at fedoraproject.org  Thu Sep 17 19:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:10:53 +0000
Subject: [pkgdb] rekonq (Fedora, 11) updated by kevin
Message-ID: <20090917191055.5210B10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rekonq
kevin has set commit to Approved for 107427 on rekonq (Fedora 12)
kevin has set checkout to Approved for 107427 on rekonq (Fedora 12)
kevin has set build to Approved for 107427 on rekonq (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rekonq



From kevin at fedoraproject.org  Thu Sep 17 19:11:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:11:22 +0000 (UTC)
Subject: rpms/rekonq - New directory
Message-ID: <20090917191122.232F911C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rekonq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18742/rpms/rekonq

Log Message:
Directory /cvs/pkgs/rpms/rekonq added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:11:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:11:22 +0000 (UTC)
Subject: rpms/rekonq/devel - New directory
Message-ID: <20090917191122.BA0D311C02CA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rekonq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18742/rpms/rekonq/devel

Log Message:
Directory /cvs/pkgs/rpms/rekonq/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:11:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:11:48 +0000 (UTC)
Subject: rpms/rekonq Makefile,NONE,1.1
Message-ID: <20090917191148.A148111C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rekonq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18742/rpms/rekonq

Added Files:
	Makefile 
Log Message:
Setup of module rekonq


--- NEW FILE Makefile ---
# Top level Makefile for module rekonq
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  Thu Sep 17 19:11:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:11:50 +0000 (UTC)
Subject: rpms/rekonq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090917191150.136FB11C0333@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rekonq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18742/rpms/rekonq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rekonq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rekonq
# $Id: Makefile,v 1.1 2009/09/17 19:11:48 kevin Exp $
NAME := rekonq
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  Thu Sep 17 19:12:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:12:04 +0000
Subject: [pkgdb] perl-Text-FormatTable was added for eseyman
Message-ID: <20090917191206.7272F10F867@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Text-FormatTable with summary Format text table
kevin has approved Package perl-Text-FormatTable
kevin has added a Fedora devel branch for perl-Text-FormatTable with an owner of eseyman
kevin has approved perl-Text-FormatTable in Fedora devel
kevin has approved Package perl-Text-FormatTable
kevin has set commit to Approved for 107427 on perl-Text-FormatTable (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Text-FormatTable (Fedora devel)
kevin has set build to Approved for 107427 on perl-Text-FormatTable (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-FormatTable



From pkgdb at fedoraproject.org  Thu Sep 17 19:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:12:16 +0000
Subject: [pkgdb] perl-Text-FormatTable summary updated by kevin
Message-ID: <20090917191213.39B8710F88C@bastion2.fedora.phx.redhat.com>

kevin set package perl-Text-FormatTable summary to Format text table

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-FormatTable



From pkgdb at fedoraproject.org  Thu Sep 17 19:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:12:16 +0000
Subject: [pkgdb] perl-Text-FormatTable (Fedora, 12) updated by kevin
Message-ID: <20090917191213.4BA1410F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Text-FormatTable
kevin has set commit to Approved for 107427 on perl-Text-FormatTable (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Text-FormatTable (Fedora 12)
kevin has set build to Approved for 107427 on perl-Text-FormatTable (Fedora 12)
kevin approved watchbugzilla on perl-Text-FormatTable (Fedora 12) for perl-sig
kevin approved watchcommits on perl-Text-FormatTable (Fedora 12) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-FormatTable



From pkgdb at fedoraproject.org  Thu Sep 17 19:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:12:16 +0000
Subject: [pkgdb] perl-Text-FormatTable (Fedora, 12) updated by kevin
Message-ID: <20090917191213.616A310F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Text-FormatTable
kevin has set commit to Approved for 107427 on perl-Text-FormatTable (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Text-FormatTable (Fedora 10)
kevin has set build to Approved for 107427 on perl-Text-FormatTable (Fedora 10)
kevin approved watchbugzilla on perl-Text-FormatTable (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Text-FormatTable (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-FormatTable



From pkgdb at fedoraproject.org  Thu Sep 17 19:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:12:16 +0000
Subject: [pkgdb] perl-Text-FormatTable (Fedora, 12) updated by kevin
Message-ID: <20090917191213.7B69610F8A0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Text-FormatTable (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Text-FormatTable (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-FormatTable



From pkgdb at fedoraproject.org  Thu Sep 17 19:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:12:16 +0000
Subject: [pkgdb] perl-Text-FormatTable (Fedora, 12) updated by kevin
Message-ID: <20090917191213.8B1B410F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Text-FormatTable
kevin has set commit to Approved for 107427 on perl-Text-FormatTable (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Text-FormatTable (Fedora 11)
kevin has set build to Approved for 107427 on perl-Text-FormatTable (Fedora 11)
kevin approved watchbugzilla on perl-Text-FormatTable (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Text-FormatTable (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-FormatTable



From kevin at fedoraproject.org  Thu Sep 17 19:12:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:12:43 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable - New directory
Message-ID: <20090917191243.A745911C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-FormatTable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC19492/rpms/perl-Text-FormatTable

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-FormatTable added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:12:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:12:44 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/devel - New directory
Message-ID: <20090917191244.6827511C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC19492/rpms/perl-Text-FormatTable/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-FormatTable/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:13:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:13:16 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable Makefile,NONE,1.1
Message-ID: <20090917191316.1007411C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-FormatTable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC19492/rpms/perl-Text-FormatTable

Added Files:
	Makefile 
Log Message:
Setup of module perl-Text-FormatTable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-FormatTable
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  Thu Sep 17 19:13:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:13:17 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090917191317.58BD711C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC19492/rpms/perl-Text-FormatTable/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-FormatTable


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Text-FormatTable
# $Id: Makefile,v 1.1 2009/09/17 19:13:16 kevin Exp $
NAME := perl-Text-FormatTable
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  Thu Sep 17 19:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:13:56 +0000
Subject: [pkgdb] perl-Try-Tiny was added for cweyl
Message-ID: <20090917191355.EFE8410F884@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Try-Tiny with summary Minimal try/catch with proper localization of 
kevin has approved Package perl-Try-Tiny
kevin has added a Fedora devel branch for perl-Try-Tiny with an owner of cweyl
kevin has approved perl-Try-Tiny in Fedora devel
kevin has approved Package perl-Try-Tiny
kevin has set commit to Approved for 107427 on perl-Try-Tiny (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Try-Tiny (Fedora devel)
kevin has set build to Approved for 107427 on perl-Try-Tiny (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Try-Tiny



From pkgdb at fedoraproject.org  Thu Sep 17 19:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:14:02 +0000
Subject: [pkgdb] perl-Try-Tiny (Fedora, 10) updated by kevin
Message-ID: <20090917191358.CD2DF10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Try-Tiny
kevin has set commit to Approved for 107427 on perl-Try-Tiny (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Try-Tiny (Fedora 10)
kevin has set build to Approved for 107427 on perl-Try-Tiny (Fedora 10)
kevin approved watchbugzilla on perl-Try-Tiny (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Try-Tiny (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Try-Tiny



From pkgdb at fedoraproject.org  Thu Sep 17 19:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:14:02 +0000
Subject: [pkgdb] perl-Try-Tiny summary updated by kevin
Message-ID: <20090917191358.C5DAB10F88C@bastion2.fedora.phx.redhat.com>

kevin set package perl-Try-Tiny summary to Minimal try/catch with proper localization of 

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Try-Tiny



From pkgdb at fedoraproject.org  Thu Sep 17 19:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:14:02 +0000
Subject: [pkgdb] perl-Try-Tiny (Fedora, 10) updated by kevin
Message-ID: <20090917191358.D628D10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Try-Tiny
kevin has set commit to Approved for 107427 on perl-Try-Tiny (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Try-Tiny (Fedora 11)
kevin has set build to Approved for 107427 on perl-Try-Tiny (Fedora 11)
kevin approved watchbugzilla on perl-Try-Tiny (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Try-Tiny (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Try-Tiny



From pkgdb at fedoraproject.org  Thu Sep 17 19:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:14:02 +0000
Subject: [pkgdb] perl-Try-Tiny (Fedora, 10) updated by kevin
Message-ID: <20090917191358.E062E10F89E@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Try-Tiny (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Try-Tiny (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Try-Tiny



From kevin at fedoraproject.org  Thu Sep 17 19:14:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:14:15 +0000 (UTC)
Subject: rpms/perl-Try-Tiny - New directory
Message-ID: <20090917191415.3935711C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Try-Tiny
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb20508/rpms/perl-Try-Tiny

Log Message:
Directory /cvs/pkgs/rpms/perl-Try-Tiny added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:14:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:14:16 +0000 (UTC)
Subject: rpms/perl-Try-Tiny/devel - New directory
Message-ID: <20090917191416.5DCE711C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Try-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb20508/rpms/perl-Try-Tiny/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Try-Tiny/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:14:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:14:47 +0000 (UTC)
Subject: rpms/perl-Try-Tiny Makefile,NONE,1.1
Message-ID: <20090917191447.19A9D11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Try-Tiny
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb20508/rpms/perl-Try-Tiny

Added Files:
	Makefile 
Log Message:
Setup of module perl-Try-Tiny


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Try-Tiny
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  Thu Sep 17 19:14:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:14:47 +0000 (UTC)
Subject: rpms/perl-Try-Tiny/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090917191447.B66FE11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Try-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb20508/rpms/perl-Try-Tiny/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Try-Tiny


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Try-Tiny
# $Id: Makefile,v 1.1 2009/09/17 19:14:47 kevin Exp $
NAME := perl-Try-Tiny
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 jonquark at fedoraproject.org  Thu Sep 17 19:19:32 2009
From: jonquark at fedoraproject.org (Jon Levell)
Date: Thu, 17 Sep 2009 19:19:32 +0000 (UTC)
Subject: rpms/diffuse/devel .cvsignore, 1.5, 1.6 diffuse.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090917191932.4B66311C00CE@cvs1.fedora.phx.redhat.com>

Author: jonquark

Update of /cvs/pkgs/rpms/diffuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22986

Modified Files:
	.cvsignore diffuse.spec sources 
Log Message:
Update to upstream version 0.4.0





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Jul 2009 21:14:59 -0000	1.5
+++ .cvsignore	17 Sep 2009 19:19:31 -0000	1.6
@@ -1 +1 @@
-diffuse-0.3.4.tar.bz2
+diffuse-0.4.0.tar.bz2


Index: diffuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/devel/diffuse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- diffuse.spec	24 Jul 2009 20:16:09 -0000	1.5
+++ diffuse.spec	17 Sep 2009 19:19:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name: diffuse
-Version: 0.3.4
-Release: 2%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 Summary: Graphical tool for comparing and merging text files
 
 Group: Development/Tools
@@ -64,6 +64,9 @@ update-desktop-database &> /dev/null || 
 %doc AUTHORS ChangeLog COPYING README
 
 %changelog
+* Thu Sep 17  2009 Jon Levell <fedora at coralbark.net> - 0.4.0-1
+- Update to new upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Jul 2009 21:15:00 -0000	1.5
+++ sources	17 Sep 2009 19:19:31 -0000	1.6
@@ -1 +1 @@
-706842d366676d4f754792f71489ec2a  diffuse-0.3.4.tar.bz2
+75a72e0853f67024bac927737731411e  diffuse-0.4.0.tar.bz2



From dwalsh at fedoraproject.org  Thu Sep 17 19:19:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Sep 2009 19:19:55 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.443,
	1.444 policycoreutils.spec, 1.643, 1.644
Message-ID: <20090917191955.8E7CA11C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23202

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-2
- Security fixes for seunshare


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  202 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  284 ++++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    8 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1919 insertions(+), 953 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -p -r1.443 -r1.444
--- policycoreutils-rhat.patch	17 Sep 2009 13:07:45 -0000	1.443
+++ policycoreutils-rhat.patch	17 Sep 2009 19:19:53 -0000	1.444
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.73/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.74/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.73/audit2allow/audit2allow	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-17 15:05:17.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -38,9 +38,9 @@ diff --exclude-from=exclude --exclude=se
          else:
              # This is the default if no input is specified
              f = sys.stdin
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.73/load_policy/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.74/load_policy/Makefile
 --- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/load_policy/Makefile	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-17 15:05:17.000000000 -0400
 @@ -1,6 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -49,18 +49,18 @@ diff --exclude-from=exclude --exclude=se
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.73/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.74/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/Makefile	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/Makefile	2009-09-17 15:05:17.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 sandbox 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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.73/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.74/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/Makefile	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-17 15:05:17.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -107,16 +107,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-17 15:05:17.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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.73/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.c	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-17 15:05:17.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -607,9 +607,9 @@ diff --exclude-from=exclude --exclude=se
  }
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.73/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.74/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.conf	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-17 15:05:17.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -620,9 +620,9 @@ diff --exclude-from=exclude --exclude=se
  /root/.ssh/*
 -
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.73/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.74/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond.desktop	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -631,9 +631,9 @@ diff --exclude-from=exclude --exclude=se
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.73/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.74/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.h	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-17 15:05:17.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -658,9 +658,9 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.73/restorecond/restorecond.init
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.74/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.init	2009-09-14 15:32:27.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-17 15:05:17.000000000 -0400
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -680,15 +680,15 @@ diff --exclude-from=exclude --exclude=se
  
  exit $RETVAL
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.73/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond_user.conf	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.73/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/user.c	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/user.c	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -927,9 +927,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.73/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/watch.c	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1185,9 +1185,9 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.73/sandbox/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.74/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/Makefile	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1220,9 +1220,9 @@ diff --exclude-from=exclude --exclude=se
 +	../../scripts/Lindent $(wildcard *.[ch])
 +
 +relabel:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-16 15:46:50.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,202 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1426,9 +1426,9 @@ diff --exclude-from=exclude --exclude=se
 +        
 +    sys.exit(rc)
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.73/sandbox/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.74/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox.8	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1456,9 +1456,9 @@ diff --exclude-from=exclude --exclude=se
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.73/sandbox/sandboxX.sh
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.74/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandboxX.sh	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1476,13 +1476,14 @@ diff --exclude-from=exclude --exclude=se
 +exit $EXITCODE
 +break
 +done
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.73/sandbox/seunshare.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/seunshare.c	2009-09-09 17:05:42.000000000 -0400
-@@ -0,0 +1,203 @@
++++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-17 15:05:44.000000000 -0400
+@@ -0,0 +1,284 @@
 +#include <signal.h>
 +#include <sys/types.h>
 +#include <sys/wait.h>
++#include <syslog.h>
 +#include <sys/mount.h>
 +#include <pwd.h>
 +#define _GNU_SOURCE
@@ -1493,10 +1494,17 @@ diff --exclude-from=exclude --exclude=se
 +#include <stdlib.h>
 +#include <cap-ng.h>
 +#include <getopt.h>		/* for getopt_long() form of getopt() */
++#include <limits.h>
++#include <stdlib.h>
++#include <errno.h>
 +
 +#include <selinux/selinux.h>
 +#include <selinux/context.h>	/* for context-mangling functions */
 +
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
 +/**
 + * This function will drop the capabilities so that we are left
 + * only with access to the audit system and the ability to raise
@@ -1507,15 +1515,21 @@ diff --exclude-from=exclude --exclude=se
 + *
 + * Returns zero on success, non-zero otherwise
 + */
-+static int drop_capabilities(int all)
++static int drop_capabilities(int all, uid_t uid)
 +{
 +	capng_clear(CAPNG_SELECT_BOTH);
 +
 +	if (all) {
 +		if (capng_lock() < 0) 
 +			return -1;
++		/* Change uid */
++		if (setresuid(uid, uid, uid)) {
++			fprintf(stderr, "Error changing uid, aborting.\n");
++			return -1;
++		}
 +	} else {
-+		if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_SETPCAP, -1) < 0) { 
++		if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_SETPCAP, CAP_SETUID, -1) < 0) { 
++			fprintf(stderr, "Error running capng_updatev\n");
 +			return -1;
 +		}
 +	}
@@ -1552,6 +1566,50 @@ diff --exclude-from=exclude --exclude=se
 +}
 +#define USAGE_STRING "USAGE: seunshare [ -t tmpdir ] [ -h homedir ] -- CONTEXT executable [args] "
 +
++
++
++static int verify_mount(const char *mntdir, struct passwd *pwd) {
++	struct stat sb;
++	if (stat(mntdir, &sb) == -1) {
++		perror("Invalid mount point");
++		return -1;
++	}
++	if (sb.st_uid != pwd->pw_uid) {
++		errno = EPERM;
++		syslog(LOG_AUTHPRIV | LOG_ALERT, "%s attempted to mount an invalid directory, %s", pwd->pw_name, mntdir);
++		perror("Invalid mount point, reporting to administrator");
++		return -1;
++	}
++	return 0;
++}
++
++/**
++ * This function checks to see if the shell is known in /etc/shells.
++ * If so, it returns 1. On error or illegal shell, it returns 0.
++ */
++static int verify_shell(const char *shell_name)
++{
++	int found = 0;
++	const char *buf;
++
++	if (!(shell_name && shell_name[0]))
++		return found;
++
++	while ((buf = getusershell()) != NULL) {
++		/* ignore comments */
++		if (*buf == '#')
++			continue;
++
++		/* check the shell skipping newline char */
++		if (!strcmp(shell_name, buf)) {
++			found = 1;
++			break;
++		}
++	}
++	endusershell();
++	return found;
++}
++
 +int main(int argc, char **argv) {
 +	int rc;
 +	int status = -1;
@@ -1570,13 +1628,24 @@ diff --exclude-from=exclude --exclude=se
 +	};
 +	capng_print_caps_text(CAPNG_PRINT_STDOUT, CAPNG_EFFECTIVE);
 +
-+	struct passwd *pwd=getpwuid(getuid());
++	uid_t uid = getuid();
++
++	if (!uid) {
++		fprintf(stderr, "Must not be root");
++		return -1;
++	}
++
++	struct passwd *pwd=getpwuid(uid);
 +	if (!pwd) {
 +		perror("getpwduid failed");
 +		return -1;
 +	}
 +
-+	if (drop_capabilities(FALSE)) {
++	if (verify_shell(pwd->pw_shell) == 0) {
++		fprintf(stderr, "Error!  Shell is not valid.\n");
++	}
++
++	if (drop_capabilities(FALSE, uid)) {
 +		perror("Failed to drop capabilities");
 +		return -1;
 +	}
@@ -1590,9 +1659,12 @@ diff --exclude-from=exclude --exclude=se
 +		switch (clflag) {
 +		case 't':
 +			tmpdir_s = optarg;
++			if (verify_mount(tmpdir_s, pwd) < 0) return -1;
 +			break;
 +		case 'h':
 +			homedir_s = optarg;
++			if (verify_mount(homedir_s, pwd) < 0) return -1;
++			if (verify_mount(pwd->pw_dir, pwd) < 0) return -1;
 +			break;
 +		default:
 +			fprintf(stderr, "%s\n", USAGE_STRING);
@@ -1627,42 +1699,50 @@ diff --exclude-from=exclude --exclude=se
 +		return -1;
 +	}
 +
++	if (homedir_s && verify_mount(pwd->pw_dir, pwd) < 0) 
++		return -1;
++
 +	if (tmpdir_s && mount(tmpdir_s, "/tmp", NULL, MS_BIND, NULL) < 0) {
 +		perror("Failed to mount /tmp");
 +		return -1;
 +	}
 +
-+	if (drop_capabilities(TRUE)) {
++	if (tmpdir_s && verify_mount("/tmp", pwd) < 0) 
++		return -1;
++
++	if (drop_capabilities(TRUE, uid)) {
 +		perror("Failed to drop all capabilities");
 +		return -1;
 +	}
 +
 +	int child = fork();
 +	if (!child) {
++		char *display=NULL;
 +		/* Construct a new environment */
 +		char *d = getenv("DISPLAY");
-+		if (!d) {
-+			perror("DISPLAY Not set");
-+			exit(-1);
++		if (d) {
++			display =  strdup(d);
++			if (!display) {
++				perror("Out of memory");
++				exit(-1);
++			}
 +		}
 +
-+		char *display =  strdup(d);
-+		if (!display) {
-+			perror("Out of memory");
-+			exit(-1);
-+		}
 +		if ((rc = clearenv())) {
 +			perror("Unable to clear environment");
++			free(display);
 +			exit(-1);
 +		}
 +		
 +		if (setexeccon(scontext)) {
 +			fprintf(stderr, "Could not set exec context to %s.\n",
 +				scontext);
++			free(display);
 +			exit(-1);
 +		}
 +
-+		rc |= setenv("DISPLAY", display, 1);
++		if (display) 
++			rc |= setenv("DISPLAY", display, 1);
 +		rc |= setenv("HOME", pwd->pw_dir, 1);
 +		rc |= setenv("SHELL", pwd->pw_shell, 1);
 +		rc |= setenv("USER", pwd->pw_name, 1);
@@ -1675,6 +1755,7 @@ diff --exclude-from=exclude --exclude=se
 +		}
 +		
 +		execv(argv[optind], argv + optind);
++		free(display);
 +		perror("execv");
 +		exit(-1);
 +	} else {
@@ -1683,9 +1764,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.73/scripts/chcat
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.74/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/chcat	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/scripts/chcat	2009-09-17 15:05:17.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1695,9 +1776,9 @@ diff --exclude-from=exclude --exclude=se
      
      sys.exit(errors)
      
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.73/scripts/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/Makefile	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/scripts/Makefile	2009-09-17 15:05:17.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1707,9 +1788,9 @@ diff --exclude-from=exclude --exclude=se
  
  install: all
  	-mkdir -p $(BINDIR)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.73/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.74/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/semanage	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/semanage/semanage	2009-09-17 15:05:17.000000000 -0400
 @@ -85,6 +85,7 @@
          -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)
@@ -1800,9 +1881,9 @@ diff --exclude-from=exclude --exclude=se
  
                          return
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.73/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/seobject.py	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-17 15:05:17.000000000 -0400
 @@ -1586,9 +1586,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
@@ -1834,9 +1915,9 @@ diff --exclude-from=exclude --exclude=se
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.73/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.74/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.8	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-17 15:05:17.000000000 -0400
 @@ -30,11 +30,17 @@
  install/replace a module package
  .TP
@@ -1856,9 +1937,9 @@ diff --exclude-from=exclude --exclude=se
  .B  \-r,\-\-remove=MODULE_NAME
  remove existing module
  .TP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.73/semodule/semodule.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.74/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.c	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-17 15:05:17.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -1976,9 +2057,9 @@ diff --exclude-from=exclude --exclude=se
  						semanage_module_info_datum_destroy
  						    (m);
  					}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.73/setfiles/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.74/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/Makefile	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-17 15:05:17.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1997,9 +2078,9 @@ diff --exclude-from=exclude --exclude=se
  
  restorecon: setfiles
  	ln -sf setfiles restorecon
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.73/setfiles/restore.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.74/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.c	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2520,9 +2601,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.73/setfiles/restore.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.74/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.h	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-17 15:05:17.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2573,9 +2654,9 @@ diff --exclude-from=exclude --exclude=se
 +int process_one(char *name, int recurse);
 +
 +#endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/setfiles.c	2009-09-09 17:05:42.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-17 15:05:17.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE
@@ -3027,7 +3108,7 @@ diff --exclude-from=exclude --exclude=se
 -
 -	if (context)
 -		freecon(context);
--
+ 
 -	/*
 -	 * Do not relabel the file if -n was used.
 -	 */
@@ -3066,7 +3147,7 @@ diff --exclude-from=exclude --exclude=se
 -			progname, ftsent->fts_path);
 -		return SKIP;
 -	}
- 
+-
 -	int rc = restore(ftsent);
 -	if (rc == ERR) {
 -		if (!abort_on_error)
@@ -3189,7 +3270,7 @@ diff --exclude-from=exclude --exclude=se
  			return -1;
  		}
  
-@@ -804,20 +298,30 @@
+@@ -804,20 +300,30 @@
  	char *buf = NULL;
  	size_t buf_len;
  	char *base;
@@ -3228,7 +3309,7 @@ diff --exclude-from=exclude --exclude=se
  	
  	if (!strcmp(base, SETFILES)) {
  		/* 
-@@ -832,28 +336,28 @@
+@@ -832,28 +338,28 @@
  		iamrestorecon = 0;
  		recurse = 1;
  		expand_realpath = 0;
@@ -3265,7 +3346,7 @@ diff --exclude-from=exclude --exclude=se
  		ctx_validate = 0;
  
  		/* restorecon only:  silent exit if no SELinux.
-@@ -915,37 +419,37 @@
+@@ -915,37 +421,37 @@
  			input_filename = optarg;
  			break;			
  		case 'd':
@@ -3312,7 +3393,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'R':
  		case 'r':
-@@ -958,7 +462,7 @@
+@@ -958,7 +464,7 @@
  					argv[0]);
  				exit(1);
  			}
@@ -3321,7 +3402,7 @@ diff --exclude-from=exclude --exclude=se
  				fprintf(stderr,
  					"%s: only one -r can be specified\n",
  					argv[0]);
-@@ -969,23 +473,23 @@
+@@ -969,23 +475,23 @@
  		case 's':
  			use_input_file = 1;
  			input_filename = "-";
@@ -3350,7 +3431,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'W':
  			warn_no_match = 1;
-@@ -1033,18 +537,13 @@
+@@ -1033,18 +539,13 @@
  	}
  
  	/* Load the file contexts configuration and check it. */
@@ -3372,7 +3453,7 @@ diff --exclude-from=exclude --exclude=se
  	if (use_input_file) {
  		FILE *f = stdin;
  		ssize_t len;
-@@ -1061,6 +560,9 @@
+@@ -1061,6 +562,9 @@
  		delim = (null_terminated != 0) ? '\0' : '\n';
  		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
  			buf[len - 1] = 0;
@@ -3382,7 +3463,7 @@ diff --exclude-from=exclude --exclude=se
  			errors |= process_one_realpath(buf);
  		}
  		if (strcmp(input_filename, "-") != 0)
-@@ -1070,22 +572,21 @@
+@@ -1070,22 +574,21 @@
  			errors |= process_one_realpath(argv[i]);
  		}
  	}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -p -r1.643 -r1.644
--- policycoreutils.spec	17 Sep 2009 13:07:47 -0000	1.643
+++ policycoreutils.spec	17 Sep 2009 19:19:55 -0000	1.644
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-2
+- Security fixes for seunshare
+
 * Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-1
 - Update to upstream
 	* Change semodule upgrade behavior to install even if the module



From dwalsh at fedoraproject.org  Thu Sep 17 19:23:56 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Sep 2009 19:23:56 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.36,
	1.37 setroubleshoot-plugins.spec, 1.41, 1.42 sources, 1.37, 1.38
Message-ID: <20090917192356.BD4F711C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25414

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Sep 17 2009  <dwalsh at redhat.com> - 2.1.21-1
- Remove allow_execmem plugin
- Add Firefox Plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	11 Sep 2009 13:24:16 -0000	1.36
+++ .cvsignore	17 Sep 2009 19:23:56 -0000	1.37
@@ -26,3 +26,4 @@ setroubleshoot-plugins-2.1.16.tar.gz
 setroubleshoot-plugins-2.1.18.tar.gz
 setroubleshoot-plugins-2.1.19.tar.gz
 setroubleshoot-plugins-2.1.20.tar.gz
+setroubleshoot-plugins-2.1.21.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- setroubleshoot-plugins.spec	11 Sep 2009 13:24:16 -0000	1.41
+++ setroubleshoot-plugins.spec	17 Sep 2009 19:23:56 -0000	1.42
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.20
+Version: 2.1.21
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,7 +52,11 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
-* Thu Sep 11 2009  <dwalsh at redhat.com> - 2.1.20-1
+* Thu Sep 17 2009  <dwalsh at redhat.com> - 2.1.21-1
+- Remove allow_execmem plugin
+- Add Firefox Plugin
+
+* Fri Sep 11 2009  <dwalsh at redhat.com> - 2.1.20-1
 - Fix priority on allow_execmod
 - Update po
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	11 Sep 2009 13:24:16 -0000	1.37
+++ sources	17 Sep 2009 19:23:56 -0000	1.38
@@ -1 +1 @@
-2aefb12d640b08268ebfea12c862f296  setroubleshoot-plugins-2.1.20.tar.gz
+39b7d02eb2470a1daf99f03086b1f0f1  setroubleshoot-plugins-2.1.21.tar.gz



From chkr at fedoraproject.org  Thu Sep 17 19:24:51 2009
From: chkr at fedoraproject.org (chkr)
Date: Thu, 17 Sep 2009 19:24:51 +0000 (UTC)
Subject: rpms/f-spot/devel .cvsignore, 1.22, 1.23 f-spot.spec, 1.91,
	1.92 sources, 1.22, 1.23
Message-ID: <20090917192451.49DAC11C00CE@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25715

Modified Files:
	.cvsignore f-spot.spec sources 
Log Message:
* Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
- update to 0.6.1.2 (BZ 519290)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	17 Sep 2009 18:31:43 -0000	1.22
+++ .cvsignore	17 Sep 2009 19:24:50 -0000	1.23
@@ -1 +1 @@
-f-spot-0.6.1.1.tar.bz2
+f-spot-0.6.1.2.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- f-spot.spec	17 Sep 2009 18:31:44 -0000	1.91
+++ f-spot.spec	17 Sep 2009 19:24:51 -0000	1.92
@@ -1,6 +1,6 @@
 Name:           f-spot
-Version:        0.6.1.1
-Release:        2%{?dist}
+Version:        0.6.1.2
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
+- update to 0.6.1.2 (BZ 519290)
+
 * Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
 - move the screensaver plugin into a sub-package (BZ 519640)
 - let f-spot-screensaver obsolete older f-spot version so that it


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	17 Sep 2009 18:31:44 -0000	1.22
+++ sources	17 Sep 2009 19:24:51 -0000	1.23
@@ -1 +1 @@
-06bf6ef59be0be8dd8f5ee2d5c69d172  f-spot-0.6.1.1.tar.bz2
+ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2



From jwilson at fedoraproject.org  Thu Sep 17 19:30:09 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 17 Sep 2009 19:30:09 +0000 (UTC)
Subject: rpms/libraw1394/F-11 libraw1394.spec,1.52,1.53 sources,1.13,1.14
Message-ID: <20090917193009.CC5A411C0374@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27921

Modified Files:
	libraw1394.spec sources 
Log Message:
* Thu Sep 17 2009 Jarod Wilson <jarod at redhat.com> - 2.0.4-1
- Update to libraw1394 v2.0.4 release
- Point to new download location and project page



Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-11/libraw1394.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- libraw1394.spec	25 Feb 2009 17:42:11 -0000	1.52
+++ libraw1394.spec	17 Sep 2009 19:30:09 -0000	1.53
@@ -1,11 +1,11 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
-Version:        2.0.1
-Release:        2%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
-Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
-URL:            http://www.linux1394.org/
+Source:         http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.bz2
+URL:            http://www.dennedy.org/libraw1394/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf automake libtool kernel-headers
@@ -65,6 +65,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Jarod Wilson <jarod at redhat.com> - 2.0.4-1
+- Update to libraw1394 v2.0.4 release
+- Point to new download location and project page
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Jan 2009 15:11:20 -0000	1.13
+++ sources	17 Sep 2009 19:30:09 -0000	1.14
@@ -1 +1 @@
-c2c2ead417f0cb4e65bb3513325e73a9  libraw1394-2.0.1.tar.gz
+aa5944d2a98cb86e395f0b9bd2b6224a  libraw1394-2.0.4.tar.bz2



From kyle at fedoraproject.org  Thu Sep 17 19:30:18 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 17 Sep 2009 19:30:18 +0000 (UTC)
Subject: rpms/kernel/F-12 config-powerpc64, 1.34, 1.35 kernel.spec, 1.1818, 
	1.1819
Message-ID: <20090917193018.B30B611C0374@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28032

Modified Files:
	config-powerpc64 kernel.spec 
Log Message:
* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-33
- Turn off CONFIG_CC_OPTIMIZE_FOR_SIZE on ppc64 until ld decides to play nice
  and generate the save/restore stubs.



Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-powerpc64,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- config-powerpc64	23 Jul 2009 17:45:33 -0000	1.34
+++ config-powerpc64	17 Sep 2009 19:30:18 -0000	1.35
@@ -186,3 +186,5 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_PERF_COUNTERS=y
 CONFIG_EVENT_PROFILE=y
+
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1818
retrieving revision 1.1819
diff -u -p -r1.1818 -r1.1819
--- kernel.spec	17 Sep 2009 17:36:56 -0000	1.1818
+++ kernel.spec	17 Sep 2009 19:30:18 -0000	1.1819
@@ -1404,7 +1404,7 @@ ApplyPatch linux-2.6-rtc-show-hctosys.pa
 ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
-ApplyPatch ppc-hates-my-family-and-swore-revenge.patch
+#ApplyPatch ppc-hates-my-family-and-swore-revenge.patch
 
 # patches headed for -stable
 
@@ -2070,22 +2070,17 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-33
+- Turn off CONFIG_CC_OPTIMIZE_FOR_SIZE on ppc64 until ld decides to play nice
+  and generate the save/restore stubs.
+
 * Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com>
 - Drop drm page-flip patch for F12.
 
 * Thu Sep 17 2009 Dave Jones <davej at redhat.com>
 - cpuidle: Fix the menu governor to boost IO performance.
 
-* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com>
-- Continue fixing ppc64. I didn't realize how apt a patch name that
-  was before.
-
-* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-29
-- ppc-hates-my-family-and-swore-revenge.patch: fix ppc prom_init symbol
-  checker filter thing. (properly this time.)
-- fix no-vta CFLAGS to work on older compilers.
-
-* Wed Sep 17 2009 John W. Linville <linville at redhat.com>
+* Wed Sep 16 2009 John W. Linville <linville at redhat.com>
 - Add a few more iwl1000 support patches.
 - Remove support for deprecated iwl6000 parts.
 



From jonquark at fedoraproject.org  Thu Sep 17 19:31:32 2009
From: jonquark at fedoraproject.org (Jon Levell)
Date: Thu, 17 Sep 2009 19:31:32 +0000 (UTC)
Subject: rpms/diffuse/F-11 .cvsignore, 1.4, 1.5 diffuse.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090917193132.51F1D11C00CE@cvs1.fedora.phx.redhat.com>

Author: jonquark

Update of /cvs/pkgs/rpms/diffuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28637

Modified Files:
	.cvsignore diffuse.spec sources 
Log Message:
Update to upstream release 0.4.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Jul 2009 21:29:50 -0000	1.4
+++ .cvsignore	17 Sep 2009 19:31:31 -0000	1.5
@@ -1 +1 @@
-diffuse-0.3.4.tar.bz2
+diffuse-0.4.0.tar.bz2


Index: diffuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-11/diffuse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- diffuse.spec	4 Jul 2009 21:33:39 -0000	1.5
+++ diffuse.spec	17 Sep 2009 19:31:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name: diffuse
-Version: 0.3.4
-Release: 2%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 Summary: Graphical tool for comparing and merging text files
 
 Group: Development/Tools
@@ -64,6 +64,12 @@ update-desktop-database &> /dev/null || 
 %doc AUTHORS ChangeLog COPYING README
 
 %changelog
+* Thu Sep 17  2009 Jon Levell <fedora at coralbark.net> - 0.4.0-1
+- Update to new upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 4  2009 Jon Levell <fedora at coralbark.net> - 0.3.4-2
 - Update to new upstream release (patch no longer needed)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Jul 2009 21:29:50 -0000	1.5
+++ sources	17 Sep 2009 19:31:31 -0000	1.6
@@ -1 +1 @@
-706842d366676d4f754792f71489ec2a  diffuse-0.3.4.tar.bz2
+75a72e0853f67024bac927737731411e  diffuse-0.4.0.tar.bz2



From rdieter at fedoraproject.org  Thu Sep 17 19:34:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Sep 2009 19:34:42 +0000 (UTC)
Subject: rpms/taglib-extras/devel taglib-extras.spec,1.10,1.11
Message-ID: <20090917193442.4706911C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30948

Modified Files:
	taglib-extras.spec 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
- drop (deprecated/no-op) kde integration



Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- taglib-extras.spec	17 Sep 2009 18:59:45 -0000	1.10
+++ taglib-extras.spec	17 Sep 2009 19:34:41 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
 Version:        1.0.0 
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Applications/Multimedia
 # all LGPLv2, except for rmff/ which is GPLv2+/LGPLv2+
@@ -15,7 +15,6 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 Patch1: taglib-extras-0.1-multilib-1.patch
 
 BuildRequires: cmake >= 2.6.0
-BuildRequires: kdelibs4-devel
 BuildRequires: taglib-devel >= 1.6
 
 Requires: taglib%{?_isa} => 1.6
@@ -44,7 +43,7 @@ Requires: taglib-devel
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}   
-%{cmake} -DWITH_KDE=1 ..
+%{cmake} ..
 popd                        
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -78,6 +77,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
+- drop (deprecated/no-op) kde integration
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
 - taglib-extras-1.0.0 (API/ABI bump)
 



From caolanm at fedoraproject.org  Thu Sep 17 19:41:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Sep 2009 19:41:51 +0000 (UTC)
Subject: rpms/hunspell-hu/devel .cvsignore, 1.8, 1.9 hunspell-hu.spec, 1.14, 
	1.15 sources, 1.8, 1.9
Message-ID: <20090917194151.386C311C00CE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-hu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2176

Modified Files:
	.cvsignore hunspell-hu.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-hu/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Nov 2008 16:29:18 -0000	1.8
+++ .cvsignore	17 Sep 2009 19:41:49 -0000	1.9
@@ -1 +1 @@
-hu_HU-1.4.tar.gz
+hu_HU-1.5.tar.gz


Index: hunspell-hu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-hu/devel/hunspell-hu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hunspell-hu.spec	25 Jul 2009 02:29:05 -0000	1.14
+++ hunspell-hu.spec	17 Sep 2009 19:41:49 -0000	1.15
@@ -1,7 +1,7 @@
 Name: hunspell-hu
 Summary: Hungarian hunspell dictionaries
-Version: 1.4
-Release: 3%{?dist}
+Version: 1.5
+Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/magyarispell/hu_HU-%{version}.tar.gz
 Group: Applications/Text
 URL: http://magyarispell.sourceforge.net
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Sep 17 2009 Caolan McNamara <caolanm at redhat.com> - 1.5-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-hu/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Nov 2008 16:29:18 -0000	1.8
+++ sources	17 Sep 2009 19:41:50 -0000	1.9
@@ -1 +1 @@
-40c7945b7c9a576a4e31290be4e8b196  hu_HU-1.4.tar.gz
+0fd19a3e301a8f3d10d3bcde3a32bff3  hu_HU-1.5.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 17 19:42:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:42:07 +0000
Subject: [pkgdb] skrooge was added for thomasj
Message-ID: <20090917194204.0165F10F886@bastion2.fedora.phx.redhat.com>

kevin has added Package skrooge with summary Skrooge is a personal finances manager, aiming at being simple and intuitive
kevin has approved Package skrooge
kevin has added a Fedora devel branch for skrooge with an owner of thomasj
kevin has approved skrooge in Fedora devel
kevin has approved Package skrooge
kevin has set commit to Approved for 107427 on skrooge (Fedora devel)
kevin has set checkout to Approved for 107427 on skrooge (Fedora devel)
kevin has set build to Approved for 107427 on skrooge (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skrooge



From pkgdb at fedoraproject.org  Thu Sep 17 19:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:42:12 +0000
Subject: [pkgdb] skrooge summary updated by kevin
Message-ID: <20090917194211.E511F10F88C@bastion2.fedora.phx.redhat.com>

kevin set package skrooge summary to Skrooge is a personal finances manager, aiming at being simple and intuitive

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skrooge



From pkgdb at fedoraproject.org  Thu Sep 17 19:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:42:12 +0000
Subject: [pkgdb] skrooge (Fedora, 10) updated by kevin
Message-ID: <20090917194211.F3DBB10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for skrooge
kevin has set commit to Approved for 107427 on skrooge (Fedora 11)
kevin has set checkout to Approved for 107427 on skrooge (Fedora 11)
kevin has set build to Approved for 107427 on skrooge (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skrooge



From pkgdb at fedoraproject.org  Thu Sep 17 19:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:42:12 +0000
Subject: [pkgdb] skrooge (Fedora, 10) updated by kevin
Message-ID: <20090917194212.0832610F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for skrooge
kevin has set commit to Approved for 107427 on skrooge (Fedora 12)
kevin has set checkout to Approved for 107427 on skrooge (Fedora 12)
kevin has set build to Approved for 107427 on skrooge (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skrooge



From pkgdb at fedoraproject.org  Thu Sep 17 19:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 19:42:12 +0000
Subject: [pkgdb] skrooge (Fedora, 10) updated by kevin
Message-ID: <20090917194212.11DD310F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for skrooge
kevin has set commit to Approved for 107427 on skrooge (Fedora 10)
kevin has set checkout to Approved for 107427 on skrooge (Fedora 10)
kevin has set build to Approved for 107427 on skrooge (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skrooge



From kevin at fedoraproject.org  Thu Sep 17 19:42:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:42:31 +0000 (UTC)
Subject: rpms/skrooge - New directory
Message-ID: <20090917194231.6991E11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skrooge
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxW2578/rpms/skrooge

Log Message:
Directory /cvs/pkgs/rpms/skrooge added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:42:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:42:31 +0000 (UTC)
Subject: rpms/skrooge/devel - New directory
Message-ID: <20090917194231.E99A411C0333@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxW2578/rpms/skrooge/devel

Log Message:
Directory /cvs/pkgs/rpms/skrooge/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 17 19:42:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:42:39 +0000 (UTC)
Subject: rpms/skrooge Makefile,NONE,1.1
Message-ID: <20090917194239.5793711C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skrooge
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxW2578/rpms/skrooge

Added Files:
	Makefile 
Log Message:
Setup of module skrooge


--- NEW FILE Makefile ---
# Top level Makefile for module skrooge
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  Thu Sep 17 19:42:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Sep 2009 19:42:39 +0000 (UTC)
Subject: rpms/skrooge/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090917194239.B7B4B11C00CE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxW2578/rpms/skrooge/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module skrooge


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: skrooge
# $Id: Makefile,v 1.1 2009/09/17 19:42:39 kevin Exp $
NAME := skrooge
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 agoode at fedoraproject.org  Thu Sep 17 19:43:45 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Thu, 17 Sep 2009 19:43:45 +0000 (UTC)
Subject: rpms/coda/devel coda-6.9.4-kill-modulesconf.patch, NONE,
	1.1 coda.spec, 1.17, 1.18
Message-ID: <20090917194345.5060111C00CE@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3424

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-kill-modulesconf.patch 
Log Message:
* Thu Sep 17 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-8
- Patch venus-setup.in to remove unnecessary modules.conf stuff


coda-6.9.4-kill-modulesconf.patch:
 venus-setup.in |   60 ---------------------------------------------------------
 1 file changed, 60 deletions(-)

--- NEW FILE coda-6.9.4-kill-modulesconf.patch ---
diff -ur coda-6.9.4~/coda-src/scripts/venus-setup.in coda-6.9.4/coda-src/scripts/venus-setup.in
--- coda-6.9.4~/coda-src/scripts/venus-setup.in	2009-09-17 15:39:03.535004437 -0400
+++ coda-6.9.4/coda-src/scripts/venus-setup.in	2009-09-17 15:40:10.144003377 -0400
@@ -131,66 +131,6 @@
 	grep "$2" "$1" > /dev/null 2>&1
 }
 
-# tell the kernel about the new module 
-if [ X$OS = XLinux ] ; then
-    # make sure the module dependencies are current
-    /sbin/depmod -a
-    # udev managed /dev
-    if [ -d /dev/.udevdb -o -f /dev/.udev.tdb ] ; then
-	# udev relies on modules being autoloaded because their hardware got
-	# detected. But since there is no hardware for the Coda kernel module
-	# we have to make sure it is loaded automatically at boot
-
-	# FC3
-	if contains /etc/rc.sysinit /etc/rc.modules ; then
-	    if [ ! -f /etc/rc.modules ] ; then
-		echo "#!/bin/sh" > /etc/rc.modules
-		chmod 755 /etc/rc.modules
-	    fi
-	    if ! contains /etc/rc.modules coda ; then
-		echo "/sbin/modprobe coda" >> /etc/rc.modules
-	    fi
-
-	# debian
-	elif ! contains /etc/modules coda ; then
-	    echo "=> Adding 'coda' to /etc/modules so that the kernel module is"
-	    echo "   loaded automatically whenever the system boots"
-	    echo coda >> /etc/modules
-	fi
-	# since we aren't booting this time, make sure the module is loaded
-	echo "== Loading coda kernel module."
-	/sbin/modprobe coda && sleep 5
-    fi
-    # devfs managed /dev
-    if [ -d /etc/devfs ] ; then
-	if ! contains /etc/devfs/devices cfs0 ; then
-	    echo "=> Adding 'cfs0' to /etc/devfs/devices so that devfs creates"
-	    echo "   an entry for /dev/cfs0 so that the Coda kernel module"
-	    echo "   can be autoloaded when the /dev/cfs0 or /dev/coda/0"
-	    echo "   device is accessed"
-	    echo "cfs0 c 67 0 root root 0200" >> /etc/devfs/devices
-	    /etc/init.d/devfsd restart
-	fi
-    fi
-    # static /dev
-    if /sbin/modinfo -V | grep modutils > /dev/null || [ -z $(/sbin/modinfo -F alias coda) ] ; then
-	# kernel module does not encode an alias for us
-	if [ -f /etc/modules.conf ] ; then
- 	    MODULES=/etc/modules.conf
-	else
-	    MODULES=/etc/conf.modules
-	fi
-	if ! contains $MODULES coda ; then
-	    echo "=> Adding aliases to $MODULES so that modprobe can"
-	    echo "   handle autoloading of the Coda kernel module when"
-	    echo "   /dev/cfs0 is accessed"
-	    echo >> $MODULES
-	    echo 'alias char-major-67 coda' >> $MODULES
-	    echo 'alias /dev/coda coda' >> $MODULES
-	fi
-    fi
-fi
-
 if [ $OS = CYGWI ]; then
 
   # setup the drive mapping


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- coda.spec	9 Sep 2009 14:25:13 -0000	1.17
+++ coda.spec	17 Sep 2009 19:43:45 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           coda
 Version:        6.9.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -16,6 +16,7 @@ Patch2:         coda-6.9.4-rc2-kernel-al
 Patch3:         coda-6.9.4-gcc44.patch
 Patch4:         coda-configure.patch
 Patch5:         coda-6.9.4-sname-fault.patch
+Patch6:         coda-6.9.4-kill-modulesconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel >= 2.5
 BuildRequires:  rpc2-devel >= 2.8
@@ -102,6 +103,9 @@ system client.
 #sname overflows
 %patch5 -p1
 
+# totally unnecessary with our init script
+%patch6 -p1
+
 %build
 # note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et"
@@ -311,6 +315,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-8
+- Patch venus-setup.in to remove unnecessary modules.conf stuff
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Thu Sep 17 19:52:34 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 19:52:34 +0000 (UTC)
Subject: rpms/libvdpau/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 libvdpau.spec, 1.1, 1.2
Message-ID: <20090917195234.AADA711C00CE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6967

Modified Files:
	.cvsignore sources libvdpau.spec 
Log Message:
Update to 0.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Sep 2009 20:10:45 -0000	1.2
+++ .cvsignore	17 Sep 2009 19:52:33 -0000	1.3
@@ -1 +1 @@
-libvdpau-46e791147ac43ecd2fbfbc6bdf3bebda9030b51e.tar.bz2
+libvdpau-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Sep 2009 20:10:45 -0000	1.2
+++ sources	17 Sep 2009 19:52:34 -0000	1.3
@@ -1 +1 @@
-a7bc00895d55b654d54220cac352c2fe  libvdpau-46e791147ac43ecd2fbfbc6bdf3bebda9030b51e.tar.bz2
+e0641a208839eb88fe7c01ee5af83735  libvdpau-0.2.tar.gz


Index: libvdpau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/devel/libvdpau.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvdpau.spec	9 Sep 2009 20:10:45 -0000	1.1
+++ libvdpau.spec	17 Sep 2009 19:52:34 -0000	1.2
@@ -1,26 +1,14 @@
-%global gitdate 20090902git
-%global gitref 46e791147ac43ecd2fbfbc6bdf3bebda9030b51e
-
 Name:           libvdpau
-Version:        0.1
-Release:        0.6.%{?gitdate}%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Wrapper library for the Video Decode and Presentation API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/VDPAU
-Source0:        http://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-%{gitref}.tar.bz2
+Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool
-
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch:  i686 x86_64
-%else %if 0%{?fedora} == 11
-ExclusiveArch:  i586 x86_64
-%else
-ExclusiveArch:  i386 x86_64
-%endif
 BuildRequires:  libX11-devel
 
 
@@ -46,7 +34,6 @@ developing applications that use %{name}
 %setup -q -n %{name}-%{gitref}
 
 
-autoreconf -vif 
 
 %build
 %configure --disable-static
@@ -80,7 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvdpau.so
 %{_libdir}/pkgconfig/vdpau.pc
 
+
 %changelog
+* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2-1
+- Update to 0.2
+- Disable ExclusiveArch
+
 * Mon Sep  7 2009 kwizart < kwizart at gmail.com > - 0.1-0.6.20090904git
 - Update to gitdate 20090904git
 



From kwizart at fedoraproject.org  Thu Sep 17 19:57:08 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 19:57:08 +0000 (UTC)
Subject: rpms/libvdpau/devel libvdpau.spec,1.2,1.3
Message-ID: <20090917195708.10F1011C00CE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8584

Modified Files:
	libvdpau.spec 
Log Message:
Clean more git references



Index: libvdpau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/devel/libvdpau.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvdpau.spec	17 Sep 2009 19:52:34 -0000	1.2
+++ libvdpau.spec	17 Sep 2009 19:57:07 -0000	1.3
@@ -31,7 +31,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-%{gitref}
+%setup -q
 
 
 



From krh at fedoraproject.org  Thu Sep 17 20:06:23 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 17 Sep 2009 20:06:23 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.487,
	1.488 dri2-page-flip.patch, 1.4,
	NONE xserver-1.6.99-dri2-crash-fixes.patch, 1.1,
	NONE xserver-1.6.99-dri2-swapbuffers-fallback.patch, 1.1, NONE
Message-ID: <20090917200623.A9A8111C0338@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12702

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	dri2-page-flip.patch xserver-1.6.99-dri2-crash-fixes.patch 
	xserver-1.6.99-dri2-swapbuffers-fallback.patch 
Log Message:
* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 1.6.99.901-3
- Back out pageflip patch and follow on patches.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- xorg-x11-server.spec	17 Sep 2009 03:21:41 -0000	1.487
+++ xorg-x11-server.spec	17 Sep 2009 20:06:21 -0000	1.488
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99.901
-Release:   2%{dist}
+Release:   3%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -50,7 +50,6 @@ Patch5: xserver-1.4.99-pic-libxf86config
 
 # OpenGL compositing manager feature/optimization patches.
 Patch103:  xserver-1.5.0-bg-none-root.patch
-Patch104:  dri2-page-flip.patch
 
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
@@ -71,8 +70,6 @@ Patch6016: xserver-1.6.1-nouveau.patch
 Patch6027: xserver-1.6.0-displayfd.patch
 Patch6028: xserver-1.6.99-randr-error-debugging.patch
 Patch6030: xserver-1.6.99-right-of.patch
-Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
-Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
 Patch6033: xserver-1.6.99-default-modes.patch
 Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 
@@ -503,6 +500,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 1.6.99.901-3
+- Back out pageflip patch and follow on patches.
+
 * Thu Sep 17 2009 Peter Hutterer <peter.hutterer at redhat.com>
 - xserver-1.5.99.3-dmx-xcalloc.patch: Obsolete, drop.
 - cvs rm a few other patches not used anymore. 


--- dri2-page-flip.patch DELETED ---


--- xserver-1.6.99-dri2-crash-fixes.patch DELETED ---


--- xserver-1.6.99-dri2-swapbuffers-fallback.patch DELETED ---



From emaldonado at fedoraproject.org  Thu Sep 17 20:07:31 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 17 Sep 2009 20:07:31 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-prelink.conf, 1.1,
	1.2 nss-softokn.spec, 1.25, 1.26
Message-ID: <20090917200731.63A4611C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13481

Modified Files:
	nss-softokn-prelink.conf nss-softokn.spec 
Log Message:
Add nssdbm3.so to nss-softokn-prelink.conf, rhbz#524077


Index: nss-softokn-prelink.conf
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-prelink.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-softokn-prelink.conf	19 Aug 2009 23:47:12 -0000	1.1
+++ nss-softokn-prelink.conf	17 Sep 2009 20:07:30 -0000	1.2
@@ -1,2 +1,3 @@
 -b /lib{,64}/libfreebl3.so
 -b /lib{,64}/libsoftokn3.so
+-b /lib{,64}/libnssdbm3.so


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- nss-softokn.spec	11 Sep 2009 00:08:25 -0000	1.25
+++ nss-softokn.spec	17 Sep 2009 20:07:30 -0000	1.26
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -290,6 +290,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Sep 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-9
+- Add nssdbm3.so to nss-softokn-prelink.conf, rhbz#524077
+
 * Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
 - Retagging for a chained build
 



From pkgdb at fedoraproject.org  Thu Sep 17 20:11:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 20:11:33 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917201133.6AAD010F867@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora devel is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 20:11:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 20:11:43 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917201139.F3B7510F884@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora EPEL 4 is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 20:11:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 20:11:42 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917201144.2F75310F888@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora EPEL 5 is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 20:11:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 20:11:48 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917201149.ED26210F80B@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 11 is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From pkgdb at fedoraproject.org  Thu Sep 17 20:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 20:11:54 +0000
Subject: [pkgdb] cvs2svn ownership updated
Message-ID: <20090917201154.0CBC310F894@bastion2.fedora.phx.redhat.com>

Package cvs2svn in Fedora 10 is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvs2svn



From kwizart at fedoraproject.org  Thu Sep 17 20:25:45 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 20:25:45 +0000 (UTC)
Subject: rpms/libvdpau/F-10 sources,1.1,1.2
Message-ID: <20090917202545.3C7B211C01EA@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21324/F-10

Modified Files:
	sources 
Log Message:
Introduce 0.2 in branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:07:17 -0000	1.1
+++ sources	17 Sep 2009 20:25:45 -0000	1.2
@@ -0,0 +1 @@
+e0641a208839eb88fe7c01ee5af83735  libvdpau-0.2.tar.gz



From kwizart at fedoraproject.org  Thu Sep 17 20:25:45 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 20:25:45 +0000 (UTC)
Subject: rpms/libvdpau/F-11 sources,1.1,1.2
Message-ID: <20090917202545.27B6911C00CE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21324/F-11

Modified Files:
	sources 
Log Message:
Introduce 0.2 in branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:07:17 -0000	1.1
+++ sources	17 Sep 2009 20:25:44 -0000	1.2
@@ -0,0 +1 @@
+e0641a208839eb88fe7c01ee5af83735  libvdpau-0.2.tar.gz



From kwizart at fedoraproject.org  Thu Sep 17 20:28:23 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 20:28:23 +0000 (UTC)
Subject: rpms/libvdpau/F-11 libvdpau.spec,NONE,1.1
Message-ID: <20090917202823.46A8B11C00CE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22350/F-11

Added Files:
	libvdpau.spec 
Log Message:
And add the spec



--- NEW FILE libvdpau.spec ---
Name:           libvdpau
Version:        0.2
Release:        1%{?dist}
Summary:        Wrapper library for the Video Decode and Presentation API

Group:          System Environment/Libraries
License:        MIT
URL:            http://freedesktop.org/wiki/Software/VDPAU
Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel


%description
VDPAU is the Video Decode and Presentation API for UNIX. 
It provides an interface to video decode acceleration and presentation
hardware present in modern GPUs.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libX11-devel
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q



%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/*.so.*
%{_libdir}/libvdpau_trace.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/vdpau/
%{_libdir}/libvdpau.so
%{_libdir}/pkgconfig/vdpau.pc


%changelog
* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2-1
- Update to 0.2
- Disable ExclusiveArch

* Mon Sep  7 2009 kwizart < kwizart at gmail.com > - 0.1-0.6.20090904git
- Update to gitdate 20090904git

* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 0.1-0.5git20090902
- Update to gitdate 20090902 with merged patches

* Mon Jun 15 2009 kwizart < kwizart at gmail.com > - 0.1-0.3git20090318
- Add missing -ldl at link time

* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.1-0.2git20090318
- Backport fix thread_2

* Fri Mar  6 2009 kwizart < kwizart at gmail.com > - 0.1-0.1git20090318
- Initial spec file




From kwizart at fedoraproject.org  Thu Sep 17 20:28:23 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 20:28:23 +0000 (UTC)
Subject: rpms/libvdpau/F-10 libvdpau.spec,NONE,1.1
Message-ID: <20090917202823.648FF11C01EA@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22350/F-10

Added Files:
	libvdpau.spec 
Log Message:
And add the spec



--- NEW FILE libvdpau.spec ---
Name:           libvdpau
Version:        0.2
Release:        1%{?dist}
Summary:        Wrapper library for the Video Decode and Presentation API

Group:          System Environment/Libraries
License:        MIT
URL:            http://freedesktop.org/wiki/Software/VDPAU
Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel


%description
VDPAU is the Video Decode and Presentation API for UNIX. 
It provides an interface to video decode acceleration and presentation
hardware present in modern GPUs.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libX11-devel
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q



%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/*.so.*
%{_libdir}/libvdpau_trace.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/vdpau/
%{_libdir}/libvdpau.so
%{_libdir}/pkgconfig/vdpau.pc


%changelog
* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2-1
- Update to 0.2
- Disable ExclusiveArch

* Mon Sep  7 2009 kwizart < kwizart at gmail.com > - 0.1-0.6.20090904git
- Update to gitdate 20090904git

* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 0.1-0.5git20090902
- Update to gitdate 20090902 with merged patches

* Mon Jun 15 2009 kwizart < kwizart at gmail.com > - 0.1-0.3git20090318
- Add missing -ldl at link time

* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.1-0.2git20090318
- Backport fix thread_2

* Fri Mar  6 2009 kwizart < kwizart at gmail.com > - 0.1-0.1git20090318
- Initial spec file




From jwrdegoede at fedoraproject.org  Thu Sep 17 20:28:48 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 17 Sep 2009 20:28:48 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1819,1.1820
Message-ID: <20090917202848.EC9EA11C00CE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22602

Modified Files:
	kernel.spec 
Log Message:
* Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
- Now that we have %post generation of dracut images we do not need to
  Require dracut-kernel anymore



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1819
retrieving revision 1.1820
diff -u -p -r1.1819 -r1.1820
--- kernel.spec	17 Sep 2009 19:30:18 -0000	1.1819
+++ kernel.spec	17 Sep 2009 20:28:48 -0000	1.1820
@@ -432,7 +432,7 @@ Summary: The Linux kernel
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
 %if %{with_dracut}
-%define initrd_prereq  dracut-kernel >= 001-7
+%define initrd_prereq  dracut >= 001-7
 %else
 %define initrd_prereq  mkinitrd >= 6.0.61-1
 %endif
@@ -2070,6 +2070,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
+- Now that we have %%post generation of dracut images we do not need to
+  Require dracut-kernel anymore
+
 * Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-33
 - Turn off CONFIG_CC_OPTIMIZE_FOR_SIZE on ppc64 until ld decides to play nice
   and generate the save/restore stubs.



From jwrdegoede at fedoraproject.org  Thu Sep 17 20:30:02 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 17 Sep 2009 20:30:02 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1805,1.1806
Message-ID: <20090917203002.6AAFD11C0374@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23539

Modified Files:
	kernel.spec 
Log Message:
* Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
- Now that we have %post generation of dracut images we do not need to
  Require dracut-kernel anymore



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1805
retrieving revision 1.1806
diff -u -p -r1.1805 -r1.1806
--- kernel.spec	17 Sep 2009 14:24:54 -0000	1.1805
+++ kernel.spec	17 Sep 2009 20:30:01 -0000	1.1806
@@ -433,7 +433,7 @@ Summary: The Linux kernel
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
 %if %{with_dracut}
-%define initrd_prereq  dracut-kernel >= 001-7
+%define initrd_prereq  dracut >= 001-7
 %else
 %define initrd_prereq  mkinitrd >= 6.0.61-1
 %endif
@@ -2005,6 +2005,10 @@ fi
 # ##############################################################
 
 %changelog
+* Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
+- Now that we have %%post generation of dracut images we do not need to
+  Require dracut-kernel anymore
+
 * Thu Sep 17 2009 Chuck Ebbert <cebbert at redhat.com>
 - Disable drm-nouveau too -- it won't build without other
   drm updates.



From krh at fedoraproject.org  Thu Sep 17 20:35:20 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 17 Sep 2009 20:35:20 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec, 1.253,
	1.254 mesa-7.6-dri2-page-flip.patch, 1.2, NONE
Message-ID: <20090917203520.735D511C00CE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25248

Modified Files:
	mesa.spec 
Removed Files:
	mesa-7.6-dri2-page-flip.patch 
Log Message:
* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 7.6-0.12
- Back out page flip patch.



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- mesa.spec	9 Sep 2009 05:08:05 -0000	1.253
+++ mesa.spec	17 Sep 2009 20:35:20 -0000	1.254
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -47,7 +47,6 @@ Patch10: r600-fix-tfp.patch
 
 Patch13: mesa-7.5-sparc64.patch
 
-Patch20: mesa-7.6-dri2-page-flip.patch
 Patch30: mesa-7.6-hush-vblank-warning.patch
 
 BuildRequires: pkgconfig autoconf automake
@@ -181,7 +180,6 @@ This package provides some demo applicat
 %patch9 -p1 -b .intel-vbl
 %patch10 -p1 -b .r600_tfp
 %patch13 -p1 -b .sparc64
-%patch20 -p1 -b .dri2-page-flip
 %patch30 -p1 -b .vblank-warning
 
 # Hack the demos to use installed data files
@@ -389,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 7.6-0.12
+- Back out page flip patch.
+
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 7.6-0.11
 - r600 fix for TFP from irc
 


--- mesa-7.6-dri2-page-flip.patch DELETED ---



From jzeleny at fedoraproject.org  Thu Sep 17 20:38:05 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu, 17 Sep 2009 20:38:05 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd-2.3.14-poll.patch, 1.1, 1.2 xinetd.spec,
	1.63, 1.64
Message-ID: <20090917203805.BC96D11C00CE@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27388

Modified Files:
	xinetd-2.3.14-poll.patch xinetd.spec 
Log Message:
correction of last patch

xinetd-2.3.14-poll.patch:
 config.h.in        |    2 +
 configure.in       |    1 
 xinetd/child.c     |    3 -
 xinetd/conf.c      |    5 ++
 xinetd/defs.h      |    9 ++++
 xinetd/init.c      |   33 +++++++----------
 xinetd/intcommon.c |   36 +++++++++++++------
 xinetd/internals.c |   99 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 xinetd/main.c      |   76 ++++++++++++++++++++++++++++++++++++++--
 xinetd/redirect.c  |   35 ++++++++++++++++++
 xinetd/server.c    |    4 ++
 xinetd/service.c   |   47 ++++++++++++++++++++++++-
 xinetd/service.h   |   19 ++++++++++
 xinetd/state.h     |   13 +++++-
 xinetd/tcpint.c    |   81 +++++++++++++++++++++++++++++++++++++++++++
 xinetd/udpint.c    |   40 +++++++++++++++++++++
 xinetd/xmdns.c     |   19 ++++++++++
 xinetd/xpoll.h     |   23 ++++++++++++
 18 files changed, 500 insertions(+), 45 deletions(-)

Index: xinetd-2.3.14-poll.patch
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd-2.3.14-poll.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinetd-2.3.14-poll.patch	14 Sep 2009 11:55:32 -0000	1.1
+++ xinetd-2.3.14-poll.patch	17 Sep 2009 20:38:05 -0000	1.2
@@ -57,6 +57,19 @@ diff -Nurp xinetd-2.3.14-orig/xinetd/def
   * When explicit values are given for enum's, that is because the structures 
   * that the enum's are in may be initialized by a memory clear operation.
   */
+diff -Nurp xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14-poll/xinetd/child.c
+--- xinetd-2.3.14-orig/xinetd/child.c	2003-09-06 16:41:59.000000000 +0200
++++ xinetd-2.3.14-poll/xinetd/child.c	2009-09-02 11:30:27.000000000 +0200
+@@ -109,8 +109,7 @@ void exec_server( const struct server *s
+ 
+ 
+ #ifdef RLIMIT_NOFILE
+-   rl.rlim_max = ps.ros.orig_max_descriptors ;
+-   rl.rlim_cur = ps.ros.max_descriptors ;
++   rl.rlim_max = rl.rlim_cur = ps.ros.max_descriptors ;
+    (void) setrlimit( RLIMIT_NOFILE, &rl ) ;
+ #endif
+ #ifdef RLIMIT_AS
 diff -Nurp xinetd-2.3.14-orig/xinetd/init.c xinetd-2.3.14-poll/xinetd/init.c
 --- xinetd-2.3.14-orig/xinetd/init.c	2003-09-06 16:41:59.000000000 +0200
 +++ xinetd-2.3.14-poll/xinetd/init.c	2009-09-02 11:30:27.000000000 +0200
@@ -831,7 +844,15 @@ diff -Nurp xinetd-2.3.14-orig/xinetd/sta
  #include <sys/select.h>
  #endif
  
-@@ -58,8 +61,15 @@ struct read_write_state
+@@ -32,7 +35,6 @@
+ 
+ struct read_only_state
+ {
+-   rlim_t      orig_max_descriptors ; /* original soft rlimit                */
+    rlim_t      max_descriptors ;      /* original hard rlimit or OPEN_MAX    */
+    rlim_t      process_limit ;        /* if 0, there is no limit             */
+    int         cc_interval ;          /* # of seconds the cc gets invoked.   */
+@@ -58,8 +60,15 @@ struct read_write_state
     int              available_services ;   /* # of available services       */
     int              active_services ;      /* services with descriptors set */
                                             /* in socket mask                */


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- xinetd.spec	14 Sep 2009 11:59:09 -0000	1.63
+++ xinetd.spec	17 Sep 2009 20:38:05 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -119,6 +119,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep 17 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-25
+- correction of last patch replacing select() with poll()
+
 * Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-24
 - select() function and it's supporting macros replaced by poll() and it's supporting macros
 - added patch of configure.in for clean compilation



From crobinso at fedoraproject.org  Thu Sep 17 20:44:02 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu, 17 Sep 2009 20:44:02 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager.spec,1.58,1.59
Message-ID: <20090917204402.48F2411C00CE@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30722

Modified Files:
	virt-manager.spec 
Log Message:
Fix up spec file patch mangling.



Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- virt-manager.spec	17 Sep 2009 18:42:27 -0000	1.58
+++ virt-manager.spec	17 Sep 2009 20:44:01 -0000	1.59
@@ -31,11 +31,11 @@ Patch4: %{name}-%{version}-addhw-errmsg-
 # Fixes for pylint script to return nicer results on F11/F12
 Patch5: %{name}-%{version}-pylint-tweak.patch
 # Don't close libvirt connection for non-fatal errors (bz 522168)
-Patch6: /home/boston/crobinso/virt-manager-0.8.0-conn-close-exception.patch
+Patch6: %{name}-%{version}-conn-close-exception.patch
 # Manager UI tweaks
-Patch7: /home/boston/crobinso/virt-manager-0.8.0-manager-ui-tweaks.patch
+Patch7: %{name}-%{version}-manager-ui-tweaks.patch
 # Generate better errors is disk/net stats polling fails
-Patch8: /home/boston/crobinso/virt-manager-0.8.0-stats-logging.patch
+Patch8: %{name}-%{version}-stats-logging.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6



From hadess at fedoraproject.org  Thu Sep 17 20:46:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 20:46:10 +0000 (UTC)
Subject: rpms/libnice/devel libnice.spec,1.9,1.10
Message-ID: <20090917204610.7EB0611C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libnice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31675

Modified Files:
	libnice.spec 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.9-2
- Rebuild for new gupnp



Index: libnice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/libnice.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libnice.spec	2 Aug 2009 22:32:16 -0000	1.9
+++ libnice.spec	17 Sep 2009 20:46:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libnice
 Version:        0.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GLib ICE implementation
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.9-2
+- Rebuild for new gupnp
+
 * Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
 - Update to 0.0.9.
 - Drop sha1 patch. Fixed upstream.



From wtogami at fedoraproject.org  Thu Sep 17 20:59:10 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 17 Sep 2009 20:59:10 +0000 (UTC)
Subject: rpms/ldm/devel .cvsignore, 1.11, 1.12 ldm.spec, 1.24, 1.25 sources, 
	1.15, 1.16
Message-ID: <20090917205910.7D15611C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6107

Modified Files:
	.cvsignore ldm.spec sources 
Log Message:
2.0.46



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Feb 2009 04:47:44 -0000	1.11
+++ .cvsignore	17 Sep 2009 20:59:10 -0000	1.12
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.33.tar.bz2
+ldm-2.0.46.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ldm.spec	25 Jul 2009 05:02:42 -0000	1.24
+++ ldm.spec	17 Sep 2009 20:59:10 -0000	1.25
@@ -1,8 +1,8 @@
 Name:           ldm
-Version:        2.0.33
-%define _datestamp .20090127.13
-#Release:        1%{_datestamp}%{?dist}
-Release:        4%{?dist}
+Version:        2.0.46
+%define _datestamp .20090917.15
+#Release:        0%{_datestamp}%{?dist}
+Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 2.0.46-1
+- 2.0.46
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.33-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	1 Feb 2009 04:47:44 -0000	1.15
+++ sources	17 Sep 2009 20:59:10 -0000	1.16
@@ -1,2 +1,2 @@
 620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-9d9d6b3c99ead24a0321ba0c06944f6c  ldm-2.0.33.tar.bz2
+33bbf9f8aa5678ab0f0ad5bc889cd093  ldm-2.0.46.tar.bz2



From kwizart at fedoraproject.org  Thu Sep 17 21:01:32 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 17 Sep 2009 21:01:32 +0000 (UTC)
Subject: rpms/libproxy/devel libproxy.spec,1.4,1.5
Message-ID: <20090917210132.803E411C02BB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6988

Modified Files:
	libproxy.spec 
Log Message:
Disable requirement on -pac virtual



Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libproxy.spec	25 Jul 2009 08:29:44 -0000	1.4
+++ libproxy.spec	17 Sep 2009 21:01:30 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           libproxy
 Version:        0.2.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
@@ -15,9 +15,6 @@ Patch0:         libproxy-0.2.3-dbus.patc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-#Virtual Provides - We need either mozjs or WebKit
-Requires: %{name}-pac >= %{version}
-#
 Requires: libproxy-python = %{version}-%{release}
 Requires: libproxy-bin = %{version}-%{release}
 
@@ -184,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2.3-12
+- Remove Requirement of %%{name}-pac virtual provides 
+  from the main package - #524043
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Thu Sep 17 21:02:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 17 Sep 2009 21:02:16 +0000 (UTC)
Subject: rpms/farsight2/devel farsight2.spec,1.17,1.18
Message-ID: <20090917210216.780F111C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7835

Modified Files:
	farsight2.spec 
Log Message:
* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.15-2
- Rebuild for new gupnp



Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- farsight2.spec	3 Sep 2009 23:01:29 -0000	1.17
+++ farsight2.spec	17 Sep 2009 21:02:14 -0000	1.18
@@ -7,7 +7,7 @@
 
 Name:           farsight2
 Version:        0.0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.15-2
+- Rebuild for new gupnp
+
 * Thu Sep  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.15-1
 - Update to 0.0.15.
 



From scop at fedoraproject.org  Thu Sep 17 21:02:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 17 Sep 2009 21:02:21 +0000 (UTC)
Subject: rpms/asciidoc/devel asciidoc-8.4.5-datadir.patch, 1.1,
	1.2 asciidoc.spec, 1.14, 1.15
Message-ID: <20090917210221.0716611C00CE@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/asciidoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7926

Modified Files:
	asciidoc-8.4.5-datadir.patch asciidoc.spec 
Log Message:
* Tue Sep  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 8.4.5-4
- Remaining improvements from #480288:
- Add dependencies on libxslt and docbook-style-xsl.
- Install dblatex style sheets.
- Exclude unneeded *.py[co].
- Install python API.
- Specfile cleanups.


asciidoc-8.4.5-datadir.patch:
 Makefile.in |   21 +++++++++++++++------
 asciidoc.py |    3 +++
 2 files changed, 18 insertions(+), 6 deletions(-)

Index: asciidoc-8.4.5-datadir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asciidoc/devel/asciidoc-8.4.5-datadir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- asciidoc-8.4.5-datadir.patch	13 Aug 2009 04:40:37 -0000	1.1
+++ asciidoc-8.4.5-datadir.patch	17 Sep 2009 21:02:19 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py
---- asciidoc-8.4.5/asciidoc.py.datadir	2009-07-18 14:48:29.000000000 -0400
-+++ asciidoc-8.4.5/asciidoc.py	2009-07-18 14:50:26.000000000 -0400
+--- asciidoc-8.4.5/asciidoc.py.datadir	2009-05-26 05:12:38.000000000 +0300
++++ asciidoc-8.4.5/asciidoc.py	2009-09-08 00:25:23.000000000 +0300
 @@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr
          if not found:
              found = findfilter(filtername, CONF_DIR, cmd)
@@ -19,8 +19,8 @@ diff -up asciidoc-8.4.5/asciidoc.py.data
  
  # Globals
 diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in
---- asciidoc-8.4.5/Makefile.in.datadir	2009-04-23 18:49:43.000000000 -0400
-+++ asciidoc-8.4.5/Makefile.in	2009-07-18 14:46:22.000000000 -0400
+--- asciidoc-8.4.5/Makefile.in.datadir	2009-04-24 01:49:43.000000000 +0300
++++ asciidoc-8.4.5/Makefile.in	2009-09-08 00:28:23.000000000 +0300
 @@ -23,6 +23,7 @@ srcdir = @srcdir@
  VPATH = @srcdir@
  
@@ -29,7 +29,39 @@ diff -up asciidoc-8.4.5/Makefile.in.data
  
  prog = asciidoc.py a2x
  progdir = $(bindir)
-@@ -126,6 +127,13 @@ fixconfpath:
+@@ -35,25 +36,26 @@ manpdir = $(mandir)/man1
+ conf = $(wildcard *.conf)
+ confdir = $(ASCIIDOCCONF)
+ 
+-filtersdir = $(ASCIIDOCCONF)/filters
++filtersdir = $(ASCIIDOCDATA)/filters
++filtersconfdir = $(ASCIIDOCCONF)/filters
+ 
+ codefilter = filters/code/code-filter.py
+ codefilterdir = $(filtersdir)/code
+ codefilterconf = filters/code/code-filter.conf
+-codefilterconfdir = $(filtersdir)/code
++codefilterconfdir = $(filtersconfdir)/code
+ 
+ graphvizfilter = filters/graphviz/graphviz2png.py
+ graphvizfilterdir = $(filtersdir)/graphviz
+ graphvizfilterconf = filters/graphviz/graphviz-filter.conf
+-graphvizfilterconfdir = $(filtersdir)/graphviz
++graphvizfilterconfdir = $(filtersconfdir)/graphviz
+ 
+ musicfilter = filters/music/music2png.py
+ musicfilterdir = $(filtersdir)/music
+ musicfilterconf = filters/music/music-filter.conf
+-musicfilterconfdir = $(filtersdir)/music
++musicfilterconfdir = $(filtersconfdir)/music
+ 
+ sourcefilterconf = filters/source/source-highlight-filter.conf
+-sourcefilterconfdir = $(filtersdir)/source
++sourcefilterconfdir = $(filtersconfdir)/source
+ 
+ docbook = $(wildcard docbook-xsl/*.xsl)
+ docbookdir = $(ASCIIDOCCONF)/docbook-xsl
+@@ -126,6 +128,13 @@ fixconfpath:
  		mv $$f.out $$f; \
  	done
  
@@ -43,7 +75,7 @@ diff -up asciidoc-8.4.5/Makefile.in.data
  install-vim:
  	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
  		if ! test -d $$d; then continue; fi ; \
-@@ -145,7 +153,7 @@ uninstall-vim:
+@@ -145,7 +154,7 @@ uninstall-vim:
  	done
  
  


Index: asciidoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asciidoc/devel/asciidoc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- asciidoc.spec	13 Aug 2009 04:40:37 -0000	1.14
+++ asciidoc.spec	17 Sep 2009 21:02:19 -0000	1.15
@@ -1,7 +1,9 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary: Text based document generation
 Name: asciidoc
 Version: 8.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 # The python code does not specify a version.
 # The javascript example code is GPLv2+.
 License: GPL+ and GPLv2+
@@ -12,7 +14,10 @@ Source0: http://www.methods.co.nz/asciid
 Patch0: asciidoc-8.4.5-datadir.patch
 # https://bugzilla.redhat.com/506953
 Patch1: asciidoc-8.4.5-use-unsafe-mode-by-default.patch
-Requires: python >= 2.3
+BuildRequires: python >= 2.4
+Requires: python >= 2.4
+Requires: docbook-style-xsl
+Requires: libxslt
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,57 +42,27 @@ for file in CHANGELOG README; do
 done
 
 %build
+%configure
 
 %install
 rm -rf %{buildroot}
-# make directory structure
-%{__install} -d							\
-	%{buildroot}%{_sysconfdir}/asciidoc/filters/code	\
-	%{buildroot}%{_sysconfdir}/asciidoc/filters/graphviz	\
-	%{buildroot}%{_sysconfdir}/asciidoc/filters/music	\
-	%{buildroot}%{_sysconfdir}/asciidoc/filters/source	\
-	%{buildroot}%{_datadir}/asciidoc/docbook-xsl		\
-	%{buildroot}%{_datadir}/asciidoc/stylesheets		\
-	%{buildroot}%{_datadir}/asciidoc/javascripts		\
-	%{buildroot}%{_datadir}/asciidoc/images/icons/callouts	\
-	%{buildroot}%{_datadir}/asciidoc/filters/code		\
-	%{buildroot}%{_datadir}/asciidoc/filters/graphviz	\
-	%{buildroot}%{_datadir}/asciidoc/filters/music		\
-	%{buildroot}%{_bindir}					\
-	%{buildroot}%{_mandir}/man1
-
-# real conf data goes to sysconfdir, rest goes to datadir
-%{__install} -m 0644 *.conf %{buildroot}%{_sysconfdir}/asciidoc
-for filter in code graphviz music source ; do
-	%{__install} -p -m 0644 filters/$filter/*.conf \
-	%{buildroot}%{_sysconfdir}/asciidoc/filters/$filter/
+make install DESTDIR=%{buildroot}
+
+# real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works
+for d in dblatex docbook-xsl images javascripts stylesheets ; do
+    mv %{buildroot}%{_sysconfdir}/asciidoc/$d \
+        %{buildroot}%{_datadir}/asciidoc
+    ln -s %{_datadir}/asciidoc/$d %{buildroot}%{_sysconfdir}/asciidoc/
 done
 
-# filter scripts
-for filter in code graphviz music ; do
-	%{__install} -p -m 0755 filters/$filter/*.py \
-	%{buildroot}%{_datadir}/asciidoc/filters/$filter/
+# Python API
+install -Dpm 644 asciidocapi.py %{buildroot}%{python_sitelib}/asciidocapi.py
+
+# Make it easier to %exclude these with both rpm < and >= 4.7
+for file in %{buildroot}{%{_bindir},%{_datadir}/asciidoc/filters/*}/*.py ; do
+    touch ${file}{c,o}
 done
 
-# symlinks so asciidoc works
-ln -s %{_datadir}/asciidoc/docbook-xsl %{buildroot}%{_sysconfdir}/asciidoc/
-ln -s %{_datadir}/asciidoc/stylesheets %{buildroot}%{_sysconfdir}/asciidoc/
-ln -s %{_datadir}/asciidoc/javascripts %{buildroot}%{_sysconfdir}/asciidoc/
-ln -s %{_datadir}/asciidoc/images %{buildroot}%{_sysconfdir}/asciidoc/
-
-# binaries
-%{__install} -p asciidoc.py %{buildroot}%{_bindir}/asciidoc
-%{__install} -p a2x %{buildroot}%{_bindir}/
-
-# manpages
-%{__install} -m 0644 doc/*.1  %{buildroot}%{_mandir}/man1
-
-# ancillary data
-%{__install} -p -m 0644 docbook-xsl/*.xsl %{buildroot}%{_datadir}/asciidoc/docbook-xsl
-%{__install} -p -m 0644 stylesheets/*.css %{buildroot}%{_datadir}/asciidoc/stylesheets/
-%{__install} -p -m 0644 javascripts/*.js %{buildroot}%{_datadir}/asciidoc/javascripts
-%{__install} -p -m 0644 images/icons/callouts/* %{buildroot}%{_datadir}/asciidoc/images/icons/callouts
-%{__install} -p -m 0644 images/icons/{README,*.png} %{buildroot}%{_datadir}/asciidoc/images/icons
 
 %clean
 rm -rf %{buildroot}
@@ -95,12 +70,23 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,0755)
 %config(noreplace) %{_sysconfdir}/asciidoc
+%exclude %{_bindir}/*.py[co]
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/asciidoc/
+%exclude %{_datadir}/asciidoc/filters/*/*.py[co]
+%{python_sitelib}/asciidocapi.py*
 %doc README BUGS CHANGELOG COPYRIGHT
 
 %changelog
+* Tue Sep  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 8.4.5-4
+- Remaining improvements from #480288:
+- Add dependencies on libxslt and docbook-style-xsl.
+- Install dblatex style sheets.
+- Exclude unneeded *.py[co].
+- Install python API.
+- Specfile cleanups.
+
 * Thu Aug 13 2009 Todd Zullinger <tmz at pobox.com> - 8.4.5-3
 - Use 'unsafe' mode by default (bug 506953)
 - Install filter scripts in %%{_datadir}/asciidoc
@@ -156,7 +142,6 @@ rm -rf %{buildroot}
 - use config and _sysconfdir
 
 * Wed Jun 29 2005 Terje R?sten <terje.rosten at ntnu.no> - 7.0.1-1
-
 - 7.0.1
 - Drop patch now upstream
 - Build as noarch (Petr Kl?ma)



From scop at fedoraproject.org  Thu Sep 17 21:09:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 17 Sep 2009 21:09:36 +0000 (UTC)
Subject: rpms/rpmdevtools/devel .cvsignore, 1.18, 1.19 rpmdevtools.spec, 1.21,
	1.22 sources, 1.19, 1.20
Message-ID: <20090917210936.E5A3311C00CE@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12084

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.5-1
- Update to 7.5, fixes #502403.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	21 Aug 2009 09:58:25 -0000	1.18
+++ .cvsignore	17 Sep 2009 21:09:36 -0000	1.19
@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-7.4.tar.xz
+rpmdevtools-7.5.tar.xz


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- rpmdevtools.spec	21 Aug 2009 09:58:25 -0000	1.21
+++ rpmdevtools.spec	17 Sep 2009 21:09:36 -0000	1.22
@@ -3,7 +3,7 @@
 %global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.5-1
+- Update to 7.5, fixes #502403.
+
 * Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.4-1
 - Update to 7.4, fixes #215927 and #466353.
 - Patch spectool to make -s and -p to work as documented (Todd Zullinger).
@@ -121,139 +124,139 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon May 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.3-1
+* Mon May 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.3-1
 - Release 7.3.
 
-* Sat May 23 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sat May 23 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add rpmdev-packager - script for getting rpm packager info.
 - Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el.
 - Fix rpmdev-extract MIME type comparisons with file(1) output containing
   parameters.
 
-* Wed May 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.2-1
+* Wed May 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.2-1
 - Release 7.2.
 
-* Sun May  3 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sun May  3 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add dummy spec template for ad-hoc testing.
 
-* Sat May  2 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sat May  2 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Improve newspec/newinit when only "-o foo" argument is given (#498588,
   thanks to Edwin ten Brink).
 - Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert
   if rpm-spec-user-mail-address is not set.
 - Add xz support to rpmdev-extract.
 
-* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Make bumpspec's use of "head" POSIX compliant.
 
-* Thu Apr 16 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Apr 16 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add rpmdev-newinit for easier access to the init script template, move the
   template to %%{_sysconfdir}/rpmdevtools, improve reload action example.
 
-* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Speed up rpmls bash completion.
 
-* Sat Apr  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.1-1
+* Sat Apr  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.1-1
 - 7.1.
 - Make rpmdev-md5 and friends work on non-srpm package files too.
 
-* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add bash completion.
 
-* Mon Mar  9 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Mar  9 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add query format option to rmdevelrpms, sort output by NEVRA.
 
-* Sun Feb 22 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Feb 22 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Use %%global instead of %%define in spec templates.
 - Handle %%global in addition to %%define in rpmdev-bumpspec.
 
-* Mon Jan 26 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Jan 26 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add result dependent exit statuses to rpmdev-vercmp.
 
-* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
 
-* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 7.0-1
+* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 7.0-1
 - 7.0.
 - Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055).
 - Add man page for rpmdev-newspec.
 
-* Tue Dec 16 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Dec 16 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add imake and intltool to internal list of devel packages in rmdevelrpms.
 
-* Sat Dec 13 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Dec 13 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).
 
-* Wed Nov 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Nov 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms
   (#472641, Michael Schwendt).
 
-* Thu Nov 20 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Nov 20 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Drop "minimal buildroot" dependencies.
 - Drop fedora-rpmdevtools Obsoletes.
 
-* Mon Oct 13 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Oct 13 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).
 
-* Fri Sep 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Sep 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis).
 - Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's
   user string.
 
-* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).
 
-* Mon Sep 22 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Sep 22 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Switch to lzma compressed tarball.
 
-* Sun Sep  7 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Sep  7 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Improve arch specific %%files in perl spec template (#461177, Chris Weyl).
 
-* Sun Aug  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.7-1
+* Sun Aug  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.7-1
 - 6.7.
 - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.
 
-* Sat Apr 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Apr 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Make rpmls work with URLs.
 
-* Sun Apr 20 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Apr 20 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Include rpm arch in dir names created by rpmdev-extract (#443266).
 
-* Fri Apr 18 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Apr 18 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Remove duplicate "reload" from case block in init script template.
 - Fix exit status of "reload" in case service is not running in init
   script template (#442993).
 
-* Thu Mar 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.6-1
+* Thu Mar 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.6-1
 - Fix man page generation.
 
-* Wed Mar 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.5-1
+* Wed Mar 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.5-1
 - 6.5.
 
-* Sun Mar 23 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Mar 23 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Generate man pages at build time.
 
-* Sat Mar 22 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Mar 22 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion
   list, they're not essential on non-devel systems any more.
 
-* Mon Mar 17 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Mar 17 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Include ocaml spec template.
 
-* Tue Mar 11 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Mar 11 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec).
 
-* Tue Feb 12 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Feb 12 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Sync with qa-robot upstream.
 - Update spectool to 1.0.10.
 
-* Sun Feb  3 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Feb  3 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add support for 7-zip, lzma and lzo in rpmdev-extract.
 
-* Fri Feb  1 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Feb  1 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add ';;' to the init script template's reload action.
 
-* Sat Dec  8 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Dec  8 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Add fonts spec template from the Fedora Fonts SIG (#407781).
 - Add option to use macro style instead of shell style variables to newspec.
 - Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in
@@ -265,149 +268,149 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.3-1
 - Fix paths in qa-robot tools
 
-* Sat Sep  8 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.2-1
+* Sat Sep  8 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.2-1
 - Sync deps with Fedora's new "assumed present in buildroots" packages list.
 
-* Thu Sep  6 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Sep  6 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Init script template cleanups.
 
-* Tue Aug 28 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Aug 28 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Update rpminfo to version 2004-07-07-02.
 
-* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.1-1
+* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.1-1
 - Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Work around #250990 in rpmls and rpmdev-extract.
 - Clarify copyright info of rpmdev-* and rpmls.
 
-* Sat Jul  7 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Jul  7 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
 - The long form of the list option in rmdevelrpms is --list-only, not --list.
 
-* Thu Jul  5 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.0-1
+* Thu Jul  5 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.0-1
 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
 - Drop explicit dependency on patch, pulled in by recent rpm-build.
 - Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
 - Add LSB comment block to init script template.
 
-* Wed Jun 27 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Jun 27 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Add 2-argument form for comparing EVR strings to rpmdev-vercmp
   (available only if rpmUtils.miscutils is available).
 
-* Sat Jun 16 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Jun 16 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
   rpmsoname) from ALT Linux's qa-robot package.
 - Include rpmls (#213778).
 
-* Fri Jun 15 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Jun 15 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Update spectool to 1.0.9 (#243731).
 
-* Wed Apr 11 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Apr 11 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
 
-* Tue Mar 13 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Mar 13 2007 Ville Skytt? <ville.skytta at iki.fi>
 - BR perl(ExtUtils::MakeMaker) by default in perl spec template.
 - Drop deprecated backwards compatibility with fedora-rpmdevtools.
 - Update URL.
 
-* Wed Nov  8 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Nov  8 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Arch-qualify output of matched packages in rmdevelrpms and allow
   arch-qualified packages in the config file.
 
-* Wed Oct 25 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.3-1
+* Wed Oct 25 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.3-1
 - Update spectool to 1.0.8, fixes #212108.
 
-* Mon Oct  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.2-1
+* Mon Oct  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.
 
-* Sat Sep  9 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.1-1
+* Sat Sep  9 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).
 
-* Tue Aug 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-2
+* Tue Aug 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-2
 - Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools.
 
-* Sun Aug 20 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-1
+* Sun Aug 20 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-1
 - Re-rename almost everything to rpmdev-*, with backwards compat symlinks.
 - Don't encourage %%ghost'ing *.pyo in Python spec template, add some comments.
 - Drop PHP PEAR spec template, it's not ready yet.
 
-* Wed Aug  2 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Aug  2 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Treat *-sdk as devel packages in rmdevelrpms (#199909).
 - Don't assume compface is a devel package in rmdevelrpms.
 
-* Thu Jul 20 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Jul 20 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Mark things that are not needed for noarch module packages in the Perl
   spec template.
 
-* Wed Jul 19 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Jul 19 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Move option arguments to "find" before non-option ones in Perl spec template.
 - Drop python-abi dependency from Python spec template (#189947).
 
-* Tue Jul 18 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Jul 18 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add PHP PEAR spec template (#198706, Christopher Stone).
 
-* Mon Jul 17 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Jul 17 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Drop fedora- prefix everywhere, add backcompat symlinks for execubtables.
 - Move %%{_sysconfdir}/fedora to %%{_sysconfdir}/rpmdevtools and
   %%{_datadir}/fedora to %%{_datadir}/rpmdevtools.
 - Move spec templates to %%{_sysconfdir}/rpmdevtools, mark as config.
 - Bump version to 5.0.
 
-* Sun Jul 16 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Jul 16 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Drop fedora-kmodhelper.
 - Drop fedora-installdevkeys and GPG keys, modify rpmchecksig to use
   the system rpmdb.
 
-* Sat Jul 15 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Jul 15 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Sort rmdevelrpms' output.
 
-* Fri Jul  7 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Jul  7 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Improve ruby spec template (#180066, David Lutterkort).
 
-* Mon Jun  5 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Jun  5 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add manual pages for rmdevelrpms, diffarchive and extract.
 - Trim pre-2005 changelog entries.
 - Autotoolize source tree.
 
-* Tue May 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.6-1
+* Tue May 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.6-1
 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).
 
-* Sun Feb 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.5-1
+* Sun Feb 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.5-1
 - Improve diffarchive and extract error messages.
 
-* Fri Feb 24 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Feb 24 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Update spectool to 1.0.7 (#162253).
 
-* Thu Feb  9 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Feb  9 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add file(1) based archive type detection to fedora-extract.
 
-* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add "diff file lists only" option to diffarchive.
 
-* Sun Feb  5 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Feb  5 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec
   use it for ruby-*.
 
-* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.4-2
+* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.4-2
 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz).
 
-* Fri Dec 30 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.4-1
+* Fri Dec 30 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.4-1
 - Update spectool to 1.0.6 (#176521).
 
-* Wed Dec 28 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Dec 28 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.
 
-* Thu Oct 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.3-1
+* Thu Oct 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).
 - Add regression test for check-rpaths* (#169298, Enrico Scholz).
 - Honor user's indent-tabs-mode setting in fedora-init.el (#170902).
 
-* Fri Oct  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.2-1
+* Fri Oct  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.2-1
 - check-buildroot: grep for buildroot as a fixed string, not a regexp.
 - Update FSF's address in copyright notices.
 - check-rpaths-worker: allow multiple $ORIGIN paths in an RPATH and allow
@@ -418,12 +421,12 @@ rm -rf $RPM_BUILD_ROOT
 - Teach fedora-newrpmspec to detect and use different specfile variants.
 - Use fedora-newrpmspec in fedora-init.el.
 
-* Fri Jul  8 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1-1
+* Fri Jul  8 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1-1
 - Drop more pre-FC2 compat stuff from Perl spec template.
 - Treat gcc-gfortran as a devel package in rmdevelrpms.
 - Drop fedora.us GPG key.
 
-* Thu Mar 24 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
+* Thu Mar 24 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
 - Make fedora-diffarchive work better with archives containing dirs without
   read/execute permissions.
 - Sync "Epoch: 0" drops with Fedora Extras CVS.
@@ -438,11 +441,11 @@ rm -rf $RPM_BUILD_ROOT
 - Don't try to remove gcc-java and related packages by default in rmdevelrpms.
 - Remove "full featured" spec template, convert newrpmspec to use -minimal.
 
-* Sun Feb  6 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.1-1
+* Sun Feb  6 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).
 
-* Tue Jan 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.0-1
+* Tue Jan 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.0-1
 - Remove 0.fdr. prefixes and epoch 0's from all spec templates.
 - Add try-restart action to init script template.
 - Remove deprecated fedora-diffrpm and fedora-unrpm.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	21 Aug 2009 09:58:25 -0000	1.19
+++ sources	17 Sep 2009 21:09:36 -0000	1.20
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-8407f2e7f2037ec28ca7910fed2c3498  rpmdevtools-7.4.tar.xz
+ec396743a9d350ac4a6d5a104807ccca  rpmdevtools-7.5.tar.xz



From emaldonado at fedoraproject.org  Thu Sep 17 21:11:02 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 17 Sep 2009 21:11:02 +0000 (UTC)
Subject: rpms/nss/F-11 nss-prelink.conf,1.2,1.3
Message-ID: <20090917211102.72E8F11C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12668

Modified Files:
	nss-prelink.conf 
Log Message:
Add entry for nssdbm3.so, rhbz#524075


Index: nss-prelink.conf
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss-prelink.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-prelink.conf	8 Jan 2008 05:07:23 -0000	1.2
+++ nss-prelink.conf	17 Sep 2009 21:11:02 -0000	1.3
@@ -1,2 +1,3 @@
 -b /lib{,64}/libfreebl3.so
 -b /lib{,64}/libsoftokn3.so
+-b /lib{,64}/libnssdbm3.so



From emaldonado at fedoraproject.org  Thu Sep 17 21:11:31 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 17 Sep 2009 21:11:31 +0000 (UTC)
Subject: rpms/nss/F-11 nss.spec,1.76,1.77
Message-ID: <20090917211131.38A1D11C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12812

Modified Files:
	nss.spec 
Log Message:
Add nssdbm3.so to nss-prelink.conf, rhbz#524075


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- nss.spec	16 Sep 2009 01:09:31 -0000	1.76
+++ nss.spec	17 Sep 2009 21:11:30 -0000	1.77
@@ -14,7 +14,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -471,6 +471,9 @@ done
 
 
 %changelog
+* Thu Sep 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
+- Add nssdbm3.so to nss-prelink.conf, rhbz#524075
+
 * Tue Sep 15 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
 - Fix inability to toggle fips mode when using legacy db - 483855
 



From caillon at fedoraproject.org  Thu Sep 17 21:13:05 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu, 17 Sep 2009 21:13:05 +0000 (UTC)
Subject: rpms/thunderbird/devel .cvsignore, 1.25, 1.26 sources, 1.32,
	1.33 thunderbird-shared-error.patch, 1.2, 1.3 thunderbird.spec,
	1.147, 1.148
Message-ID: <20090917211305.5B4F411C00CE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13458

Modified Files:
	.cvsignore sources thunderbird-shared-error.patch 
	thunderbird.spec 
Log Message:
* Thu Sep 17 2009 Christopher Aillon <caillon at redhat.com> - 3.0-3.9.b4
- Beta 4 candidate build 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	21 Jul 2009 11:43:08 -0000	1.25
+++ .cvsignore	17 Sep 2009 21:13:04 -0000	1.26
@@ -1,3 +1,2 @@
-thunderbird-3.0-6a6386c16e98-source.tar.bz2
-thunderbird-3.0b3-source.tar.bz2
-thunderbird-langpacks-3.0-20090721.tar.bz2
+thunderbird-3.0b4-source.tar.bz2
+thunderbird-langpacks-3.0-20090917.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	21 Jul 2009 11:43:08 -0000	1.32
+++ sources	17 Sep 2009 21:13:05 -0000	1.33
@@ -1,2 +1,2 @@
-84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
-f38cc1a9e69bff77e4eba2385272c671  thunderbird-langpacks-3.0-20090721.tar.bz2
+0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2
+8ed1dc55c3c7cac5731810013fb3e9b8  thunderbird-langpacks-3.0-20090917.tar.bz2

thunderbird-shared-error.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird-shared-error.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunderbird-shared-error.patch	21 Jul 2009 11:43:08 -0000	1.2
+++ thunderbird-shared-error.patch	17 Sep 2009 21:13:05 -0000	1.3
@@ -11,5 +11,5 @@ diff -up thunderbird-3.0/mail/installer/
  endif
 +endif
  
- include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
- 
+ # On mozilla-central, packager.mk uses core_abspath to redefine DIST
+ # As the comm-central config.mk doesn't set it, do it ourselves instead


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- thunderbird.spec	6 Aug 2009 13:20:09 -0000	1.147
+++ thunderbird.spec	17 Sep 2009 21:13:05 -0000	1.148
@@ -4,26 +4,35 @@
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
 
-%define version_internal 3.0b3
+%define version_internal 3.0b4
 %define build_langpacks 1
 
+# The tarball is pretty inconsistent with directory structure.
+# Sometimes there is a top level directory.  That goes here.
+#
+# IMPORTANT: If there is no top level directory, this should be 
+# set to the cwd, ie: '.'
+#%define tarballdir .
+%define tarballdir comm-central
+
+%define mozappdir %{_libdir}/thunderbird-%{version_internal}
 %define official_branding 1
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.8.b3%{?dist}
+Release:        3.9.b4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version}b3-source.tar.bz2
+%define tarball thunderbird-%{version}b4-source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20090721.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20090917.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -79,8 +88,6 @@ Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
 Requires:       sqlite >= %{sqlite_version}
 
-%define mozappdir %{_libdir}/thunderbird-%{version_internal}
-
 AutoProv: 0
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100}
@@ -92,7 +99,7 @@ Mozilla Thunderbird is a standalone mail
 
 %prep
 %setup -q -c
-#cd mozilla
+cd %{tarballdir}
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
@@ -117,7 +124,7 @@ Mozilla Thunderbird is a standalone mail
 #===============================================================================
 
 %build
-#cd mozilla
+cd %{tarballdir}
 
 # Build with -Os as it helps the browser; also, don't override mozilla's warning
 # level; they use -Wall but disable a few warnings that show up _everywhere_
@@ -142,7 +149,7 @@ make -f client.mk build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-#cd mozilla
+cd %{tarballdir}
 
 cd objdir-tb
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -297,6 +304,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Sep 17 2009 Christopher Aillon <caillon at redhat.com> - 3.0-3.9.b4
+- Beta 4 candidate build 4
+
 * Thu Aug  6 2009 Martin Stransky <stransky at redhat.com> - 3.0-3.8.beta3
 - Added fix for #437596
 - Removed unused patches



From scop at fedoraproject.org  Thu Sep 17 21:13:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 17 Sep 2009 21:13:33 +0000 (UTC)
Subject: rpms/rpmdevtools/F-11 .cvsignore, 1.17, 1.18 rpmdevtools.spec, 1.19,
	1.20 sources, 1.18, 1.19
Message-ID: <20090917211333.AAA1711C00CE@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13671

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.5-1
- Update to 7.5, fixes #502403.

* Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.4-1
- Update to 7.4, fixes #215927 and #466353.
- Patch spectool to make -s and -p to work as documented (Todd Zullinger).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	24 May 2009 21:29:50 -0000	1.17
+++ .cvsignore	17 Sep 2009 21:13:33 -0000	1.18
@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-7.3.tar.lzma
+rpmdevtools-7.5.tar.xz


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/F-11/rpmdevtools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- rpmdevtools.spec	24 May 2009 21:34:14 -0000	1.19
+++ rpmdevtools.spec	17 Sep 2009 21:13:33 -0000	1.20
@@ -3,7 +3,7 @@
 %global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.3
+Version:        7.5
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -11,17 +11,16 @@ Group:          Development/Tools
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma
+Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+Patch0:         spectool-1.0.10-sourcenum.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-# lzma for unpacking the tarball
-BuildRequires:  lzma
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python
+BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python
 Provides:       spectool = %{spectool_version}
 Requires:       diffutils
@@ -30,6 +29,8 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
+Requires:       man
+Requires:       python >= 2.4
 Requires:       rpm-build >= 4.4.2.1
 Requires:       rpm-python
 Requires:       sed
@@ -46,7 +47,7 @@ rpmdev-newspec      Creates new .spec fr
 rpmdev-rmdevelrpms  Find (and optionally remove) "development" RPMs
 rpmdev-checksig     Check package signatures using alternate RPM keyring
 rpminfo             Print information about executables and libraries
-rpmdev-md5/sha*     Display checksums of all files in an RPM package file
+rpmdev-md5/sha*     Display checksums of all files in an archive file
 rpmdev-vercmp       RPM version comparison checker
 spectool            Expand and download sources and patches in specfiles
 rpmdev-wipetree     Erase all files within dirs created by rpmdev-setuptree
@@ -57,7 +58,10 @@ rpmdev-bumpspec     Bump revision in spe
 
 %prep
 %setup -q -a 1
-cp -p spectool*/README README.spectool
+cp -p spectool-%{spectool_version}/README README.spectool
+cd spectool-%{spectool_version}
+%patch0 -p1
+cd ..
 
 
 %build
@@ -70,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
 
 for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
   install -dm 755 $RPM_BUILD_ROOT$dir
@@ -100,150 +104,159 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README*
+%doc COPYING NEWS README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
-%{_bindir}/rpm*
-%{_bindir}/spectool
+%{_bindir}/*
 %ghost %{_datadir}/*emacs
-%{_mandir}/man[18]/rpm*.[18]*
+%{_mandir}/man[18]/*.[18]*
 
 
 %changelog
-* Mon May 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.3-1
+* Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.5-1
+- Update to 7.5, fixes #502403.
+
+* Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.4-1
+- Update to 7.4, fixes #215927 and #466353.
+- Patch spectool to make -s and -p to work as documented (Todd Zullinger).
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.3-1
 - Release 7.3.
 
-* Sat May 23 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sat May 23 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add rpmdev-packager - script for getting rpm packager info.
 - Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el.
 - Fix rpmdev-extract MIME type comparisons with file(1) output containing
   parameters.
 
-* Wed May 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.2-1
+* Wed May 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.2-1
 - Release 7.2.
 
-* Sun May  3 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sun May  3 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add dummy spec template for ad-hoc testing.
 
-* Sat May  2 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sat May  2 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Improve newspec/newinit when only "-o foo" argument is given (#498588,
   thanks to Edwin ten Brink).
 - Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert
   if rpm-spec-user-mail-address is not set.
 - Add xz support to rpmdev-extract.
 
-* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Make bumpspec's use of "head" POSIX compliant.
 
-* Thu Apr 16 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Apr 16 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add rpmdev-newinit for easier access to the init script template, move the
   template to %%{_sysconfdir}/rpmdevtools, improve reload action example.
 
-* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Speed up rpmls bash completion.
 
-* Sat Apr  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.1-1
+* Sat Apr  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.1-1
 - 7.1.
 - Make rpmdev-md5 and friends work on non-srpm package files too.
 
-* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add bash completion.
 
-* Mon Mar  9 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Mar  9 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add query format option to rmdevelrpms, sort output by NEVRA.
 
-* Sun Feb 22 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Feb 22 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Use %%global instead of %%define in spec templates.
 - Handle %%global in addition to %%define in rpmdev-bumpspec.
 
-* Mon Jan 26 2009 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Jan 26 2009 Ville Skytt? <ville.skytta at iki.fi>
 - Add result dependent exit statuses to rpmdev-vercmp.
 
-* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
 
-* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 7.0-1
+* Fri Dec 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 7.0-1
 - 7.0.
 - Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055).
 - Add man page for rpmdev-newspec.
 
-* Tue Dec 16 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Dec 16 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add imake and intltool to internal list of devel packages in rmdevelrpms.
 
-* Sat Dec 13 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Dec 13 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).
 
-* Wed Nov 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Nov 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms
   (#472641, Michael Schwendt).
 
-* Thu Nov 20 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Nov 20 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Drop "minimal buildroot" dependencies.
 - Drop fedora-rpmdevtools Obsoletes.
 
-* Mon Oct 13 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Oct 13 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).
 
-* Fri Sep 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Sep 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis).
 - Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's
   user string.
 
-* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).
 
-* Mon Sep 22 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Sep 22 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Switch to lzma compressed tarball.
 
-* Sun Sep  7 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Sep  7 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Improve arch specific %%files in perl spec template (#461177, Chris Weyl).
 
-* Sun Aug  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.7-1
+* Sun Aug  3 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.7-1
 - 6.7.
 - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.
 
-* Sat Apr 26 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Apr 26 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Make rpmls work with URLs.
 
-* Sun Apr 20 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Apr 20 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Include rpm arch in dir names created by rpmdev-extract (#443266).
 
-* Fri Apr 18 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Apr 18 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Remove duplicate "reload" from case block in init script template.
 - Fix exit status of "reload" in case service is not running in init
   script template (#442993).
 
-* Thu Mar 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.6-1
+* Thu Mar 27 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.6-1
 - Fix man page generation.
 
-* Wed Mar 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.5-1
+* Wed Mar 26 2008 Ville Skytt? <ville.skytta at iki.fi> - 6.5-1
 - 6.5.
 
-* Sun Mar 23 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Mar 23 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Generate man pages at build time.
 
-* Sat Mar 22 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Mar 22 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion
   list, they're not essential on non-devel systems any more.
 
-* Mon Mar 17 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Mar 17 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Include ocaml spec template.
 
-* Tue Mar 11 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Mar 11 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec).
 
-* Tue Feb 12 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Feb 12 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Sync with qa-robot upstream.
 - Update spectool to 1.0.10.
 
-* Sun Feb  3 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Feb  3 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add support for 7-zip, lzma and lzo in rpmdev-extract.
 
-* Fri Feb  1 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Feb  1 2008 Ville Skytt? <ville.skytta at iki.fi>
 - Add ';;' to the init script template's reload action.
 
-* Sat Dec  8 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Dec  8 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Add fonts spec template from the Fedora Fonts SIG (#407781).
 - Add option to use macro style instead of shell style variables to newspec.
 - Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in
@@ -255,149 +268,149 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.3-1
 - Fix paths in qa-robot tools
 
-* Sat Sep  8 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.2-1
+* Sat Sep  8 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.2-1
 - Sync deps with Fedora's new "assumed present in buildroots" packages list.
 
-* Thu Sep  6 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Sep  6 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Init script template cleanups.
 
-* Tue Aug 28 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Aug 28 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Update rpminfo to version 2004-07-07-02.
 
-* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.1-1
+* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.1-1
 - Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Work around #250990 in rpmls and rpmdev-extract.
 - Clarify copyright info of rpmdev-* and rpmls.
 
-* Sat Jul  7 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Jul  7 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
 - The long form of the list option in rmdevelrpms is --list-only, not --list.
 
-* Thu Jul  5 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.0-1
+* Thu Jul  5 2007 Ville Skytt? <ville.skytta at iki.fi> - 6.0-1
 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
 - Drop explicit dependency on patch, pulled in by recent rpm-build.
 - Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
 - Add LSB comment block to init script template.
 
-* Wed Jun 27 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Jun 27 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Add 2-argument form for comparing EVR strings to rpmdev-vercmp
   (available only if rpmUtils.miscutils is available).
 
-* Sat Jun 16 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Jun 16 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
   rpmsoname) from ALT Linux's qa-robot package.
 - Include rpmls (#213778).
 
-* Fri Jun 15 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Jun 15 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Update spectool to 1.0.9 (#243731).
 
-* Wed Apr 11 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Apr 11 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
 
-* Tue Mar 13 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Mar 13 2007 Ville Skytt? <ville.skytta at iki.fi>
 - BR perl(ExtUtils::MakeMaker) by default in perl spec template.
 - Drop deprecated backwards compatibility with fedora-rpmdevtools.
 - Update URL.
 
-* Wed Nov  8 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Nov  8 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Arch-qualify output of matched packages in rmdevelrpms and allow
   arch-qualified packages in the config file.
 
-* Wed Oct 25 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.3-1
+* Wed Oct 25 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.3-1
 - Update spectool to 1.0.8, fixes #212108.
 
-* Mon Oct  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.2-1
+* Mon Oct  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.
 
-* Sat Sep  9 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.1-1
+* Sat Sep  9 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).
 
-* Tue Aug 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-2
+* Tue Aug 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-2
 - Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools.
 
-* Sun Aug 20 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-1
+* Sun Aug 20 2006 Ville Skytt? <ville.skytta at iki.fi> - 5.0-1
 - Re-rename almost everything to rpmdev-*, with backwards compat symlinks.
 - Don't encourage %%ghost'ing *.pyo in Python spec template, add some comments.
 - Drop PHP PEAR spec template, it's not ready yet.
 
-* Wed Aug  2 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Aug  2 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Treat *-sdk as devel packages in rmdevelrpms (#199909).
 - Don't assume compface is a devel package in rmdevelrpms.
 
-* Thu Jul 20 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Jul 20 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Mark things that are not needed for noarch module packages in the Perl
   spec template.
 
-* Wed Jul 19 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Jul 19 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Move option arguments to "find" before non-option ones in Perl spec template.
 - Drop python-abi dependency from Python spec template (#189947).
 
-* Tue Jul 18 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Tue Jul 18 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add PHP PEAR spec template (#198706, Christopher Stone).
 
-* Mon Jul 17 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Jul 17 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Drop fedora- prefix everywhere, add backcompat symlinks for execubtables.
 - Move %%{_sysconfdir}/fedora to %%{_sysconfdir}/rpmdevtools and
   %%{_datadir}/fedora to %%{_datadir}/rpmdevtools.
 - Move spec templates to %%{_sysconfdir}/rpmdevtools, mark as config.
 - Bump version to 5.0.
 
-* Sun Jul 16 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Jul 16 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Drop fedora-kmodhelper.
 - Drop fedora-installdevkeys and GPG keys, modify rpmchecksig to use
   the system rpmdb.
 
-* Sat Jul 15 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Jul 15 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Sort rmdevelrpms' output.
 
-* Fri Jul  7 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Jul  7 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Improve ruby spec template (#180066, David Lutterkort).
 
-* Mon Jun  5 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Mon Jun  5 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add manual pages for rmdevelrpms, diffarchive and extract.
 - Trim pre-2005 changelog entries.
 - Autotoolize source tree.
 
-* Tue May 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.6-1
+* Tue May 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.6-1
 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).
 
-* Sun Feb 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.5-1
+* Sun Feb 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.5-1
 - Improve diffarchive and extract error messages.
 
-* Fri Feb 24 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Fri Feb 24 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Update spectool to 1.0.7 (#162253).
 
-* Thu Feb  9 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Feb  9 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add file(1) based archive type detection to fedora-extract.
 
-* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add "diff file lists only" option to diffarchive.
 
-* Sun Feb  5 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sun Feb  5 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec
   use it for ruby-*.
 
-* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.4-2
+* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.4-2
 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz).
 
-* Fri Dec 30 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.4-1
+* Fri Dec 30 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.4-1
 - Update spectool to 1.0.6 (#176521).
 
-* Wed Dec 28 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Dec 28 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.
 
-* Thu Oct 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.3-1
+* Thu Oct 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).
 - Add regression test for check-rpaths* (#169298, Enrico Scholz).
 - Honor user's indent-tabs-mode setting in fedora-init.el (#170902).
 
-* Fri Oct  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.2-1
+* Fri Oct  7 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.2-1
 - check-buildroot: grep for buildroot as a fixed string, not a regexp.
 - Update FSF's address in copyright notices.
 - check-rpaths-worker: allow multiple $ORIGIN paths in an RPATH and allow
@@ -408,12 +421,12 @@ rm -rf $RPM_BUILD_ROOT
 - Teach fedora-newrpmspec to detect and use different specfile variants.
 - Use fedora-newrpmspec in fedora-init.el.
 
-* Fri Jul  8 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1-1
+* Fri Jul  8 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1-1
 - Drop more pre-FC2 compat stuff from Perl spec template.
 - Treat gcc-gfortran as a devel package in rmdevelrpms.
 - Drop fedora.us GPG key.
 
-* Thu Mar 24 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
+* Thu Mar 24 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
 - Make fedora-diffarchive work better with archives containing dirs without
   read/execute permissions.
 - Sync "Epoch: 0" drops with Fedora Extras CVS.
@@ -428,11 +441,11 @@ rm -rf $RPM_BUILD_ROOT
 - Don't try to remove gcc-java and related packages by default in rmdevelrpms.
 - Remove "full featured" spec template, convert newrpmspec to use -minimal.
 
-* Sun Feb  6 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.1-1
+* Sun Feb  6 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).
 
-* Tue Jan 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.0-1
+* Tue Jan 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:0.3.0-1
 - Remove 0.fdr. prefixes and epoch 0's from all spec templates.
 - Add try-restart action to init script template.
 - Remove deprecated fedora-diffrpm and fedora-unrpm.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	24 May 2009 21:29:50 -0000	1.18
+++ sources	17 Sep 2009 21:13:33 -0000	1.19
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-5475dc402a40356163e4a9b468f6497b  rpmdevtools-7.3.tar.lzma
+ec396743a9d350ac4a6d5a104807ccca  rpmdevtools-7.5.tar.xz



From scop at fedoraproject.org  Thu Sep 17 21:30:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 17 Sep 2009 21:30:33 +0000 (UTC)
Subject: rpms/rpmdevtools/F-11 spectool-1.0.10-sourcenum.patch,NONE,1.1
Message-ID: <20090917213033.202D111C02BB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20723

Added Files:
	spectool-1.0.10-sourcenum.patch 
Log Message:
Add missing patch.

spectool-1.0.10-sourcenum.patch:
 spectool |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE spectool-1.0.10-sourcenum.patch ---
Fix for -s x,y, -p x,y from Todd Zullinger:
https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html

diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool
--- spectool-1.0.10/spectool~	2008-02-12 12:32:21.000000000 +0200
+++ spectool-1.0.10/spectool	2009-08-21 02:12:56.000000000 +0300
@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command =
 			'v|verbose' => sub { $verbose++; },
 			'n|dryrun|dry-run' => sub { $dryrun = 1; },
 			'V|version' => sub { $command = 'version'; },
-			's|source=i' => \@sources,
-			'p|patch=i' => \@patches,
+			's|source=s' => \@sources,
+			'p|patch=s' => \@patches,
 			'S|sources' => sub { push @what, 'sources'; },
 			'P|patches' => sub { push @what, 'patches'; },
 			'A|all' => sub { push @what, 'all'; },



From emaldonado at fedoraproject.org  Thu Sep 17 21:34:25 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 17 Sep 2009 21:34:25 +0000 (UTC)
Subject: rpms/nss/F-10 sources,1.25,1.26 .cvsignore,1.24,1.25
Message-ID: <20090917213425.119A811C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24247

Modified Files:
	sources .cvsignore 
Log Message:
Update pem enabling source tar


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	23 Jun 2009 14:03:51 -0000	1.25
+++ sources	17 Sep 2009 21:34:24 -0000	1.26
@@ -1,2 +1,2 @@
-bdac5df4a93c67222a60fabc121921c3  nss-pem-20090622.tar.bz2
+895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2
 bf79d625096067fed3511c0bc6c64c27  nss-3.12.3.99.3-stripped.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	23 Jun 2009 14:03:51 -0000	1.24
+++ .cvsignore	17 Sep 2009 21:34:24 -0000	1.25
@@ -1,2 +1,2 @@
-nss-pem-20090622.tar.bz2
+nss-pem-20090907.tar.bz2
 nss-3.12.3.99.3-stripped.tar.bz2



From emaldonado at fedoraproject.org  Thu Sep 17 21:35:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 17 Sep 2009 21:35:49 +0000 (UTC)
Subject: rpms/nss/F-10 nss-prelink.conf,1.2,1.3
Message-ID: <20090917213549.1442611C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24618

Modified Files:
	nss-prelink.conf 
Log Message:
Add nssdbm3.so to the list, rhbz#524075


Index: nss-prelink.conf
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/nss-prelink.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-prelink.conf	8 Jan 2008 05:07:23 -0000	1.2
+++ nss-prelink.conf	17 Sep 2009 21:35:48 -0000	1.3
@@ -1,2 +1,3 @@
 -b /lib{,64}/libfreebl3.so
 -b /lib{,64}/libsoftokn3.so
+-b /lib{,64}/libnssdbm3.so



From gouldwp at fedoraproject.org  Thu Sep 17 21:39:24 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Thu, 17 Sep 2009 21:39:24 +0000 (UTC)
Subject: rpms/netdisco/devel netdisco.init, 1.2, 1.3 netdisco.spec, 1.4,
	1.5 netdisco_config, 1.1, 1.2
Message-ID: <20090917213924.6C39611C00CE@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26911

Modified Files:
	netdisco.init netdisco.spec netdisco_config 
Log Message:



Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netdisco.init	21 Aug 2009 23:10:04 -0000	1.2
+++ netdisco.init	17 Sep 2009 21:39:24 -0000	1.3
@@ -2,11 +2,21 @@
 #
 # Startup script for the netdisco daemon
 #
-# chkconfig: 345 95 5
+# chkconfig: - 95 5
 # description: Startup/shutdown script for the Netdisco Admin Daemon
 # processname: netdisco
 # pidfile: /var/run/netdisco/netdisco.pid
 # config: /etc/netdisco.conf
+#
+### BEGIN INIT INFO
+# Provides: netdisco
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Short-Description: start and stop netdisco admin daemon 
+# Description: Netdisco is a network management application targeted at large
+# corporate and university networks. 
+### END INIT INFO
+
 
 # Source function library.
 . /etc/rc.d/init.d/functions


Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netdisco.spec	22 Aug 2009 03:48:41 -0000	1.4
+++ netdisco.spec	17 Sep 2009 21:39:24 -0000	1.5
@@ -17,7 +17,7 @@ Requires:       httpd
 Requires:       postgresql postgresql-server
 Requires:       net-snmp net-snmp-perl
 Requires:       mod_perl mod_ssl
-Requires:       graphviz 
+Requires:       graphviz graphviz-gd 
 Requires:       perl(DBI) 
 Requires:       perl(Apache::DBI)
 Requires:       perl(DBD::Pg)
@@ -150,8 +150,11 @@ fi
  
 
 %changelog
-* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-3
+* Fri Aug 21 2009 <gouldwp at fedoraproject.org> 0.95-3
 - Netdisco network management software.
+- Added require graphviz-gd package for graphing to work 
+- Added chkconfig line in netdisco_config script
+- Changed chkconfig line in netdisco.init script to not start daemon by default
 - Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section
 - Changed /usr/share/ to %%_datadir in the %%files section


Index: netdisco_config
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco_config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco_config	28 Jul 2009 05:21:19 -0000	1.1
+++ netdisco_config	17 Sep 2009 21:39:24 -0000	1.2
@@ -173,6 +173,7 @@ chown netdisco:netdisco /usr/share/netdi
 # Start postgres and httpd at system startup
 /sbin/chkconfig postgresql on
 /sbin/chkconfig httpd on
+/sbin/chkconfig netdisco on
 
 # create netdisco user - and start netdisco
 echo ""



From dwalsh at fedoraproject.org  Thu Sep 17 21:41:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Sep 2009 21:41:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.82,
	1.83 selinux-policy.spec, 1.920, 1.921
Message-ID: <20090917214131.B032111C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27515

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-2
- Fixes for sandbox


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   89 +
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  318 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  174 +++
 policy/modules/apps/sandbox.te            |  315 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   39 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  393 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   45 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1403 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 315 files changed, 14458 insertions(+), 2573 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- policy-F12.patch	16 Sep 2009 17:50:32 -0000	1.82
+++ policy-F12.patch	17 Sep 2009 21:41:30 -0000	1.83
@@ -2424,8 +2424,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.32/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-16 10:03:08.000000000 -0400
-@@ -0,0 +1,317 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-17 12:55:18.000000000 -0400
+@@ -0,0 +1,318 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2666,6 +2666,7 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	read_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
++	read_lnk_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
 +')
 +
 +########################################
@@ -3586,8 +3587,8 @@ diff -b -B --ignore-all-space --exclude-
 +# No types are sandbox_exec_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-16 10:03:08.000000000 -0400
-@@ -0,0 +1,171 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-17 16:13:55.000000000 -0400
+@@ -0,0 +1,174 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -3720,6 +3721,9 @@ diff -b -B --ignore-all-space --exclude-
 +	domtrans_pattern($1_t, $1_file_t, $1_client_t)
 +	domain_entry_file($1_client_t,  $1_file_t)
 +
++	# Random tmpfs_t that gets created when you run X. 
++	fs_rw_tmpfs_files($1_t)
++
 +	manage_dirs_pattern(sandbox_xserver_t, $1_file_t, $1_file_t)
 +	manage_files_pattern(sandbox_xserver_t, $1_file_t, $1_file_t)
 +	manage_sock_files_pattern(sandbox_xserver_t, $1_file_t, $1_file_t)
@@ -3761,7 +3765,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-17 12:56:35.000000000 -0400
 @@ -0,0 +1,315 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
@@ -3902,7 +3906,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +corecmd_exec_all_executables(sandbox_x_domain)
 +
-+
 +dev_read_urand(sandbox_x_domain)
 +dev_dontaudit_read_rand(sandbox_x_domain)
 +
@@ -3917,6 +3920,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +auth_dontaudit_read_login_records(sandbox_x_domain)
 +auth_use_nsswitch(sandbox_x_domain)
++auth_search_pam_console_data(sandbox_x_domain)
 +
 +init_read_utmp(sandbox_x_domain)
 +init_dontaudit_write_utmp(sandbox_x_domain)
@@ -4101,7 +4105,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/seunshare	--	gen_context(system_u:object_r:seunshare_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.if serefpolicy-3.6.32/policy/modules/apps/seunshare.if
 --- nsaserefpolicy/policy/modules/apps/seunshare.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-17 13:02:52.000000000 -0400
 @@ -0,0 +1,76 @@
 +
 +## <summary>policy for seunshare</summary>
@@ -4181,8 +4185,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.6.32/policy/modules/apps/seunshare.te
 --- nsaserefpolicy/policy/modules/apps/seunshare.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-09-16 10:03:08.000000000 -0400
-@@ -0,0 +1,37 @@
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-09-17 16:38:51.000000000 -0400
+@@ -0,0 +1,39 @@
 +policy_module(seunshare,1.0.0)
 +
 +########################################
@@ -4203,7 +4207,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +allow seunshare_t self:process { fork setexec signal };
-+allow seunshare_t self:capability { dac_override setpcap sys_admin };
++allow seunshare_t self:capability { setuid dac_override setpcap sys_admin };
 +allow seunshare_t self:process { getcap setcap };
 +
 +allow seunshare_t self:fifo_file rw_file_perms;
@@ -4217,6 +4221,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +auth_use_nsswitch(seunshare_t)
 +
++logging_send_syslog_msg(seunshare_t)
++
 +miscfiles_read_localization(seunshare_t)
 +
 +userdom_use_user_terminals(seunshare_t)
@@ -4501,7 +4507,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-09-17 15:45:09.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -4564,7 +4570,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(pop, tcp,106,s0, tcp,109,s0, tcp,110,s0, tcp,143,s0, tcp,220,s0, tcp,993,s0, tcp,995,s0, tcp,1109,s0)
  network_port(portmap, udp,111,s0, tcp,111,s0)
  network_port(postfix_policyd, tcp,10031,s0)
-@@ -173,27 +186,31 @@
+@@ -173,27 +186,33 @@
  network_port(sap, tcp,9875,s0, udp,9875,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
@@ -4589,6 +4595,8 @@ diff -b -B --ignore-all-space --exclude-
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(varnishd, tcp,6081,s0, tcp,6082,s0)
++network_port(virt_migration, tcp,49152,s0)
++portcon tcp 49153-49216 gen_context(system_u:object_r:virt_migration_port_t,s0)
 +network_port(virt, tcp,16509,s0, udp,16509,s0, tcp,16514,s0, udp,16514,s0)
  network_port(vnc, tcp,5900,s0)
 +# Reserve 100 ports for vnc/virt machines
@@ -4599,7 +4607,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
  network_port(xfs, tcp,7100,s0)
-@@ -222,6 +239,8 @@
+@@ -222,6 +241,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -5687,7 +5695,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.32/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-09-16 15:58:43.000000000 -0400
 @@ -1149,6 +1149,44 @@
  	domain_auto_transition_pattern($1, cifs_t, $2)
  ')
@@ -8086,6 +8094,37 @@ diff -b -B --ignore-all-space --exclude-
  
  /var/cache/abrt(/.*)?			gen_context(system_u:object_r:abrt_var_cache_t,s0)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.6.32/policy/modules/services/abrt.if
+--- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-09-17 15:49:39.000000000 -0400
+@@ -75,6 +75,27 @@
+ 	read_files_pattern($1, abrt_var_log_t, abrt_var_log_t)
+ ')
+ 
++########################################
++## <summary>
++##	Send and receive messages from
++##	abrt over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`abrt_dbus_chat',`
++	gen_require(`
++		type abrt_t;
++		class dbus send_msg;
++	')
++
++	allow $1 abrt_t:dbus send_msg;
++	allow abrt_t $1:dbus send_msg;
++')
++
+ #####################################
+ ## <summary>
+ ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-09-16 10:03:09.000000000 -0400
@@ -15867,7 +15906,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.32/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/samba.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/samba.te	2009-09-17 14:03:16.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -15901,7 +15940,16 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	pcscd_read_pub_files(samba_net_t)
-@@ -325,6 +334,8 @@
+@@ -275,6 +284,8 @@
+ 
+ allow smbd_t winbind_var_run_t:sock_file rw_sock_file_perms;
+ 
++allow smbd_t winbind_t:process { signal signull };
++
+ kernel_getattr_core_if(smbd_t)
+ kernel_getattr_message_if(smbd_t)
+ kernel_read_network_state(smbd_t)
+@@ -325,6 +336,8 @@
  files_read_etc_runtime_files(smbd_t)
  files_read_usr_files(smbd_t)
  files_search_spool(smbd_t)
@@ -15910,7 +15958,7 @@ diff -b -B --ignore-all-space --exclude-
  # Allow samba to list mnt_t for potential mounted dirs
  files_list_mnt(smbd_t)
  
-@@ -338,9 +349,12 @@
+@@ -338,9 +351,12 @@
  
  userdom_use_unpriv_users_fds(smbd_t)
  userdom_dontaudit_search_user_home_dirs(smbd_t)
@@ -15923,7 +15971,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -352,19 +366,19 @@
+@@ -352,19 +368,19 @@
  ') 
  
  tunable_policy(`samba_domain_controller',`
@@ -15949,7 +15997,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # Support Samba sharing of NFS mount points
-@@ -376,6 +390,15 @@
+@@ -376,6 +392,15 @@
  	fs_manage_nfs_named_sockets(smbd_t)
  ')
  
@@ -15965,7 +16013,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
-@@ -391,6 +414,11 @@
+@@ -391,6 +416,11 @@
  ')
  
  optional_policy(`
@@ -15977,7 +16025,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpc_search_nfs_state_data(smbd_t)
  ')
  
-@@ -405,13 +433,15 @@
+@@ -405,13 +435,15 @@
  tunable_policy(`samba_create_home_dirs',`
  	allow smbd_t self:capability chown;
  	userdom_create_user_home_dirs(smbd_t)
@@ -15994,7 +16042,7 @@ diff -b -B --ignore-all-space --exclude-
  	auth_read_all_files_except_shadow(nmbd_t)
  ')
  
-@@ -420,8 +450,8 @@
+@@ -420,8 +452,8 @@
  	auth_manage_all_files_except_shadow(smbd_t)
  	fs_read_noxattr_fs_files(nmbd_t) 
  	auth_manage_all_files_except_shadow(nmbd_t)
@@ -16004,7 +16052,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
-@@ -525,6 +555,7 @@
+@@ -525,6 +557,7 @@
  
  allow smbcontrol_t winbind_t:process { signal signull };
  
@@ -16012,7 +16060,7 @@ diff -b -B --ignore-all-space --exclude-
  samba_read_config(smbcontrol_t)
  samba_rw_var_files(smbcontrol_t)
  samba_search_var(smbcontrol_t)
-@@ -536,6 +567,8 @@
+@@ -536,6 +569,8 @@
  
  miscfiles_read_localization(smbcontrol_t)
  
@@ -16021,7 +16069,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # smbmount Local policy
-@@ -638,6 +671,10 @@
+@@ -638,6 +673,10 @@
  
  allow swat_t smbd_var_run_t:file { lock unlink };
  
@@ -16032,7 +16080,7 @@ diff -b -B --ignore-all-space --exclude-
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
-@@ -713,12 +750,23 @@
+@@ -713,12 +752,23 @@
  	kerberos_use(swat_t)
  ')
  
@@ -16057,7 +16105,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process { signal_perms getsched setsched };
  allow winbind_t self:fifo_file rw_fifo_file_perms;
-@@ -866,6 +914,18 @@
+@@ -866,6 +916,18 @@
  #
  
  optional_policy(`
@@ -16076,7 +16124,7 @@ diff -b -B --ignore-all-space --exclude-
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -876,9 +936,12 @@
+@@ -876,9 +938,12 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  
@@ -18209,7 +18257,7 @@ 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.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-09-16 12:16:52.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-09-17 15:47:32.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -18440,7 +18488,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +301,159 @@
+@@ -196,8 +301,160 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -18500,7 +18548,6 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_udp_sendrecv_all_ports(svirt_t)
 +corenet_udp_bind_generic_node(svirt_t)
 +corenet_udp_bind_all_ports(svirt_t)
-+corenet_tcp_bind_all_ports(svirt_t)
 +
 +tunable_policy(`virt_use_comm',`
 +	term_use_unallocated_ttys(svirt_t)
@@ -18561,6 +18608,8 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_tcp_bind_generic_node(virt_domain)
 +corenet_tcp_bind_vnc_port(virt_domain)
 +corenet_rw_tun_tap_dev(virt_domain)
++corenet_tcp_bind_virt_migration_port(virt_domain)
++corenet_tcp_connect_virt_migration_port(virt_domain)
 +
 +dev_read_sound(virt_domain)
 +dev_write_sound(virt_domain)
@@ -25205,7 +25254,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-17 13:00:18.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -26074,7 +26123,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +891,28 @@
+@@ -835,6 +891,32 @@
  	# Local policy
  	#
  
@@ -26091,6 +26140,10 @@ diff -b -B --ignore-all-space --exclude-
 +		allow $1_usertype $1_usertype:dbus send_msg;
 +
 +		optional_policy(`
++			abrt_dbus_chat($1_usertype)
++		')
++
++		optional_policy(`
 +			consolekit_dbus_chat($1_usertype)
 +		')
 +
@@ -26103,7 +26156,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +943,81 @@
+@@ -865,51 +947,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26120,12 +26173,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
-+
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
++
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -26198,7 +26251,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1051,8 @@
+@@ -943,8 +1055,8 @@
  	# Declarations
  	#
  
@@ -26208,7 +26261,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1061,12 @@
+@@ -953,11 +1065,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26223,7 +26276,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1084,53 @@
+@@ -975,36 +1088,53 @@
  		')
  	')
  
@@ -26291,7 +26344,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1166,7 @@
+@@ -1040,7 +1170,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -26300,7 +26353,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1175,7 @@
+@@ -1049,8 +1179,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26310,7 +26363,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1200,9 @@
+@@ -1075,6 +1204,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26320,7 +26373,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1217,7 @@
+@@ -1089,6 +1221,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -26328,7 +26381,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1225,6 @@
+@@ -1096,8 +1229,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26337,7 +26390,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1251,8 @@
+@@ -1124,6 +1255,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -26346,7 +26399,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1281,6 @@
+@@ -1152,20 +1285,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26367,7 +26420,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1326,7 @@
+@@ -1211,6 +1330,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26375,7 +26428,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1392,15 @@
+@@ -1276,11 +1396,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26391,7 +26444,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1511,13 @@
+@@ -1391,12 +1515,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26406,7 +26459,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1550,14 @@
+@@ -1429,6 +1554,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26421,7 +26474,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1573,11 @@
+@@ -1444,9 +1577,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26433,7 +26486,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1634,25 @@
+@@ -1503,6 +1638,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26459,7 +26512,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1727,8 @@
+@@ -1577,6 +1731,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26468,7 +26521,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1822,7 @@
+@@ -1670,6 +1826,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26476,7 +26529,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1950,32 @@
+@@ -1797,19 +1954,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26516,7 +26569,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2010,7 @@
+@@ -1844,6 +2014,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26524,7 +26577,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2558,7 @@
+@@ -2391,27 +2562,7 @@
  
  ########################################
  ## <summary>
@@ -26553,7 +26606,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2912,32 @@
+@@ -2765,11 +2916,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -26588,7 +26641,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3065,25 @@
+@@ -2897,7 +3069,25 @@
  		type user_tmp_t;
  	')
  
@@ -26615,7 +26668,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3120,7 @@
+@@ -2934,6 +3124,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -26623,7 +26676,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3251,559 @@
+@@ -3064,3 +3255,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -p -r1.920 -r1.921
--- selinux-policy.spec	16 Sep 2009 17:50:32 -0000	1.920
+++ selinux-policy.spec	17 Sep 2009 21:41:30 -0000	1.921
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -318,7 +318,7 @@ if [ $1 -eq 1 ]; then
    %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 -r polkit_auth -r polkit -r rtkit_daemon 2>/dev/null
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth -r polkit -r rtkit_daemon -r ModemManager 2>/dev/null
    packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    %relabel targeted
@@ -447,6 +447,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-2
+- Fixes for sandbox
+
 * Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-1
 - Update to upstream
 - Dontaudit nsplugin search /root



From caillon at fedoraproject.org  Thu Sep 17 21:44:08 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu, 17 Sep 2009 21:44:08 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec,1.148,1.149
Message-ID: <20090917214408.1B45611C00CE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29485

Modified Files:
	thunderbird.spec 
Log Message:
handle tarballdir != buildsubdir


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- thunderbird.spec	17 Sep 2009 21:13:05 -0000	1.148
+++ thunderbird.spec	17 Sep 2009 21:44:07 -0000	1.149
@@ -189,9 +189,9 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_RO
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
 # Install langpacks
+cd %{_builddir}/%{?buildsubdir}
 %{__rm} -f %{name}.lang # Delete for --short-circuit option
 touch %{name}.lang
-
 %if %{build_langpacks}
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
 %{__tar} xjf %{SOURCE1}
@@ -222,6 +222,7 @@ for langpack in `ls thunderbird-langpack
 done
 %{__rm} -rf thunderbird-langpacks
 %endif # build_langpacks
+cd -
 
 # Copy over the LICENSE
 cd mozilla



From emaldonado at fedoraproject.org  Thu Sep 17 21:44:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 17 Sep 2009 21:44:54 +0000 (UTC)
Subject: rpms/nss/F-10 nss.spec,1.65,1.66
Message-ID: <20090917214454.CD13211C00CE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29787

Modified Files:
	nss.spec 
Log Message:
Add nssdbm3.so to nss-prelink.conf and update pem module


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/nss.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- nss.spec	16 Sep 2009 18:32:47 -0000	1.65
+++ nss.spec	17 Sep 2009 21:44:54 -0000	1.66
@@ -15,7 +15,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          2.10.5%{?dist}
+Release:          2.10.6%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -39,7 +39,7 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source8:          nss-prelink.conf
-Source12:         %{name}-pem-20090622.tar.bz2
+Source12:         %{name}-pem-20090907.tar.bz2
 Source13:         PayPalEE.cert
 Source14:         PayPalICA.cert
 
@@ -458,6 +458,11 @@ done
 
 
 %changelog
+* Thu Sep 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-2.10.6
+- Add nssdbm3.so to nss-prelink.conf, rhbz#524075
+- pem module implements memory management for internal objects, rhbz#509705
+- pem module doesn't crash when processing malformed key files, rhbz#512019
+
 * Wed Sep 16 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-2.10.5
 - Fix inability to toggle fips mode, rhbz#513133
 



From gouldwp at fedoraproject.org  Thu Sep 17 21:52:11 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Thu, 17 Sep 2009 21:52:11 +0000 (UTC)
Subject: rpms/netdisco/devel netdisco.spec,1.5,1.6
Message-ID: <20090917215211.44E6811C00CE@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32402

Modified Files:
	netdisco.spec 
Log Message:



Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netdisco.spec	17 Sep 2009 21:39:24 -0000	1.5
+++ netdisco.spec	17 Sep 2009 21:52:10 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           netdisco 
 Version:        0.95 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A web-based network management tool 
 License:        BSD
 Group:          Applications/Internet 
@@ -150,7 +150,7 @@ fi
  
 
 %changelog
-* Fri Aug 21 2009 <gouldwp at fedoraproject.org> 0.95-3
+* Thu Sep 17 2009 <gouldwp at fedoraproject.org> 0.95-4
 - Netdisco network management software.
 - Added require graphviz-gd package for graphing to work 
 - Added chkconfig line in netdisco_config script



From spot at fedoraproject.org  Thu Sep 17 21:55:30 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 17 Sep 2009 21:55:30 +0000 (UTC)
Subject: rpms/mailcap/devel COPYING,NONE,1.1
Message-ID: <20090917215530.14F5B11C00CE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mailcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2025

Added Files:
	COPYING 
Log Message:
clarify that mailcap/mime-types are in the public domain


--- NEW FILE COPYING ---
Red Hat disclaims any copyright on the "mailcap" and "mime-types" files and places them in the public domain. You are 
free to do whatever you wish with these files.

The mailcap.4 man page is under an MIT license:

Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)

Permission to use, copy, modify, and distribute this material
for any purpose and without fee is hereby granted, provided
that the above copyright notice and this permission notice
appear in all copies, and that the name of Bellcore not be
used in advertising or publicity pertaining to this
material without the specific, prior written permission
of an authorized representative of Bellcore.  BELLCORE
MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.


Tom Callaway, Fedora Legal, Red Hat
Thu Sep 17, 2009



From jkratoch at fedoraproject.org  Thu Sep 17 22:00:12 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 17 Sep 2009 22:00:12 +0000 (UTC)
Subject: rpms/gdb/devel libstdc++-v3-python-common-prefix.patch, NONE,
	1.1 .cvsignore, 1.38, 1.39 gdb.spec, 1.384, 1.385 sources, 1.37, 1.38
Message-ID: <20090917220012.DE4B711C0374@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4075

Modified Files:
	.cvsignore gdb.spec sources 
Added Files:
	libstdc++-v3-python-common-prefix.patch 
Log Message:
* Thu Sep 17 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090917-2
- Include bundled libstdc++ python; it will be in libstdc++-devel since gcc-4.5.


libstdc++-v3-python-common-prefix.patch:
 hook.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libstdc++-v3-python-common-prefix.patch ---
On x86_64 host with:
pythondir: /usr/lib/python2.6/site-packages/gdb
libdir:    /usr/lib64

prefix got set to "/usr/lib" but the code expects a trailing "/" (missing then
one "../" path component).

--- ./libstdc++-v3-python-r151798/hook.in-orig	2009-06-18 21:12:37.000000000 +0200
+++ ./libstdc++-v3-python-r151798/hook.in	2009-09-17 23:37:35.000000000 +0200
@@ -40,7 +40,7 @@ if gdb.current_objfile () is not None:
     # In some bizarre configuration we might have found a match in the
     # middle of a directory name.
     if prefix[-1] != '/':
-        prefix = os.path.dirname (prefix)
+        prefix = os.path.dirname (prefix) + '/'
 
     # Strip off the prefix.
     pythondir = pythondir[len (prefix):]


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	17 Sep 2009 12:15:41 -0000	1.38
+++ .cvsignore	17 Sep 2009 22:00:12 -0000	1.39
@@ -1 +1,2 @@
 gdb-6.8.91.20090917.tar.bz2
+libstdc++-v3-python-r151798.tar.xz


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- gdb.spec	17 Sep 2009 12:15:42 -0000	1.384
+++ gdb.spec	17 Sep 2009 22:00:12 -0000	1.385
@@ -14,7 +14,7 @@ Version: 6.8.91.20090917
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 1%{?_with_upstream:.upstream}%{?dist}
+Release: 2%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -54,6 +54,10 @@ Source2: gdb-orphanripper.c
 # Man page for gstack(1).
 Source3: gdb-gstack.man
 
+# libstdc++ pretty printers from GCC SVN HEAD (4.5 experimental).
+%define libstdcxxpython libstdc++-v3-python-r151798
+Source4: %{libstdcxxpython}.tar.xz
+
 # Work around out-of-date dejagnu that does not have KFAIL
 Patch1: gdb-6.3-rh-dummykfail-20041202.patch
 
@@ -357,6 +361,9 @@ Patch360: gdb-6.8-bz457187-largefile-tes
 # Fix compatibility of --with-system-readline and readline-6.0+.
 Patch375: gdb-readline-6.0.patch
 
+# Fix python pretty printers lookup on x86_64.
+Patch376: libstdc++-v3-python-common-prefix.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -367,6 +374,8 @@ BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
+# Temporarily before it gets moved to libstdc++.rpm
+BuildRequires: libstdc++
 %endif	# 0%{!?_without_python:1}
 
 %if 0%{?_with_testsuite:1}
@@ -430,6 +439,9 @@ This package provides a program that all
 
 %setup -q -n %{gdb_src}
 
+# libstdc++ pretty printers.
+xz -dc %{SOURCE4} | tar xf -
+
 # Files have `# <number> <file>' statements breaking VPATH / find-debuginfo.sh .
 rm -f gdb/ada-exp.c gdb/ada-lex.c gdb/c-exp.c gdb/cp-name-parser.c gdb/f-exp.c
 rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
@@ -544,6 +556,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch352 -p1
 %patch360 -p1
 %patch375 -p1
+%patch376 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -741,6 +754,22 @@ ln -sf gdb $RPM_BUILD_ROOT%{_prefix}/bin
 cmp $RPM_BUILD_ROOT%{_mandir}/*/gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 
+%if 0%{!?_without_python:1}
+# Temporarily now:
+for LIB in lib lib64;do
+  LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"
+  mkdir -p $LIBPATH
+  # basename is being run only for the native (non-biarch) file.
+  sed -e 's, at pythondir@,%{python_sitelib}/gdb,'			\
+      -e 's, at toolexeclibdir@,%{_prefix}/'"$LIB,"		\
+      < $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/hook.in	\
+      > $LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py
+done
+test ! -e $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+cp -a $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/libstdcxx	\
+      $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+%endif	# 0%{!?_without_python:1}
+
 # Remove the files that are part of a gdb build but that are owned and
 # provided by other packages.
 # These are part of binutils
@@ -818,6 +847,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 17 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090917-2
+- Include bundled libstdc++ python; it will be in libstdc++-devel since gcc-4.5.
+
 * Thu Sep 17 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090917-1
 - Upgrade to the FSF GDB gdb-7.0 branch and snapshot: 6.8.91.20090917
 - archer-jankratochvil-fedora12 commit: 16f3f01cc2cbc15283462eaabdfcde92cf42cdc6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	17 Sep 2009 12:15:42 -0000	1.37
+++ sources	17 Sep 2009 22:00:12 -0000	1.38
@@ -1 +1,2 @@
 eaed9150b219c8ee56bb676e32a9d2a5  gdb-6.8.91.20090917.tar.bz2
+1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz



From pghmcfc at fedoraproject.org  Thu Sep 17 22:00:42 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 17 Sep 2009 22:00:42 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.pam,1.5,1.6 proftpd.spec,1.56,1.57
Message-ID: <20090917220042.1BC3F11C02BB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4332

Modified Files:
	proftpd.pam proftpd.spec 
Log Message:
Restore backward SRPM compatibility broken by previous change


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.pam,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- proftpd.pam	16 Sep 2009 18:06:35 -0000	1.5
+++ proftpd.pam	17 Sep 2009 22:00:41 -0000	1.6
@@ -1,7 +1,7 @@
 #%PAM-1.0
-session    optional     pam_keyinit.so    force revoke
-auth       required	pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth       required	pam_shells.so
+session    optional     pam_keyinit.so force revoke
+auth       required     pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
+auth       required     pam_shells.so
 auth       include      password-auth
 account    include      password-auth
 session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- proftpd.spec	16 Sep 2009 18:06:35 -0000	1.56
+++ proftpd.spec	17 Sep 2009 22:00:41 -0000	1.57
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 6
+%global rpmrel 7
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -118,15 +118,20 @@ Module to add PostgreSQL support to the 
 %{__cp} -p %{SOURCE8} proftpd-quota.schema
 
 # PAM Configuration:
+# Default PAM configuration file uses password-auth common config;
+# revert to system-auth if password-auth is not available
+%{__cp} -p %{SOURCE6} .
+if [ ! -f /etc/pam.d/password-auth ]; then
+	%{__sed} -i -e s/password-auth/system-auth/ proftpd.pam
+fi
 # The "include" syntax used in our PAM configuration file was introduced in
 # PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older
 # distributions such as EL-4 (PAM 0.77) need to fall back to using the
 # now-deprecated pam_stack module. Since the pam-devel package doesn't
-# include a pkgconfig file from whice we could check the version number, we
+# include a pkgconfig file from which we could check the version number, we
 # instead check for the absence of the file /etc/pam.d/config-util, which is
 # present in all PAM packages from 0.80 onwards and acts as a useful
 # indicator of the need to fall back to pam_stack.
-%{__cp} -p %{SOURCE6} .
 [ ! -f /etc/pam.d/config-util ] && %{__sed} -i -e \
 	's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \
 	proftpd.pam
@@ -290,7 +295,10 @@ fi
 
 
 %changelog
-* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-6
+* Thu Sep 17 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-7
+- Restore backward SRPM compatibility broken by previous change
+
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1.3.2a-6
 - Use password-auth common PAM configuration instead of system-auth
 
 * Mon Sep  7 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-5
@@ -299,7 +307,7 @@ fi
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
 - New DSO module: mod_exec (#520214)
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.3.2a-3.1
 - Rebuilt with new openssl
 
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
@@ -354,7 +362,7 @@ fi
   bundled one, and eliminate log messages like:
   kernel: warning: `proftpd' uses 32-bit capabilities (legacy support in use)
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3.1
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1.3.2-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2.1



From gouldwp at fedoraproject.org  Thu Sep 17 22:02:18 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Thu, 17 Sep 2009 22:02:18 +0000 (UTC)
Subject: rpms/netdisco/F-11 netdisco.init, 1.2, 1.3 netdisco.spec, 1.2,
	1.3 netdisco_config, 1.1, 1.2
Message-ID: <20090917220218.399B411C00CE@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4931

Modified Files:
	netdisco.init netdisco.spec netdisco_config 
Log Message:



Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netdisco.init	22 Aug 2009 02:56:48 -0000	1.2
+++ netdisco.init	17 Sep 2009 22:02:17 -0000	1.3
@@ -2,11 +2,21 @@
 #
 # Startup script for the netdisco daemon
 #
-# chkconfig: 345 95 5
+# chkconfig: - 95 5
 # description: Startup/shutdown script for the Netdisco Admin Daemon
 # processname: netdisco
 # pidfile: /var/run/netdisco/netdisco.pid
 # config: /etc/netdisco.conf
+#
+### BEGIN INIT INFO
+# Provides: netdisco
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Short-Description: start and stop netdisco admin daemon 
+# Description: Netdisco is a network management application targeted at large
+# corporate and university networks. 
+### END INIT INFO
+
 
 # Source function library.
 . /etc/rc.d/init.d/functions


Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netdisco.spec	22 Aug 2009 02:56:48 -0000	1.2
+++ netdisco.spec	17 Sep 2009 22:02:17 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           netdisco 
 Version:        0.95 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A web-based network management tool 
 License:        BSD
 Group:          Applications/Internet 
@@ -17,7 +17,7 @@ Requires:       httpd
 Requires:       postgresql postgresql-server
 Requires:       net-snmp net-snmp-perl
 Requires:       mod_perl mod_ssl
-Requires:       graphviz 
+Requires:       graphviz graphviz-gd 
 Requires:       perl(DBI) 
 Requires:       perl(Apache::DBI)
 Requires:       perl(DBD::Pg)
@@ -150,8 +150,11 @@ fi
  
 
 %changelog
-* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-3
+* Thu Sep 17 2009 <gouldwp at fedoraproject.org> 0.95-4
 - Netdisco network management software.
+- Added require graphviz-gd package for graphing to work 
+- Added chkconfig line in netdisco_config script
+- Changed chkconfig line in netdisco.init script to not start daemon by default
 - Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section
 - Changed /usr/share/ to %%_datadir in the %%files section


Index: netdisco_config
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco_config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco_config	28 Jul 2009 05:27:19 -0000	1.1
+++ netdisco_config	17 Sep 2009 22:02:17 -0000	1.2
@@ -173,6 +173,7 @@ chown netdisco:netdisco /usr/share/netdi
 # Start postgres and httpd at system startup
 /sbin/chkconfig postgresql on
 /sbin/chkconfig httpd on
+/sbin/chkconfig netdisco on
 
 # create netdisco user - and start netdisco
 echo ""



From caillon at fedoraproject.org  Thu Sep 17 22:11:23 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu, 17 Sep 2009 22:11:23 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec,1.149,1.150
Message-ID: <20090917221123.F32DE11C00CE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9329

Modified Files:
	thunderbird.spec 
Log Message:
get back to the tarballdir


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- thunderbird.spec	17 Sep 2009 21:44:07 -0000	1.149
+++ thunderbird.spec	17 Sep 2009 22:11:23 -0000	1.150
@@ -222,7 +222,7 @@ for langpack in `ls thunderbird-langpack
 done
 %{__rm} -rf thunderbird-langpacks
 %endif # build_langpacks
-cd -
+cd %{_builddir}/%{?buildsubdir}/%{tarballdir}
 
 # Copy over the LICENSE
 cd mozilla



From gouldwp at fedoraproject.org  Thu Sep 17 22:12:08 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Thu, 17 Sep 2009 22:12:08 +0000 (UTC)
Subject: rpms/netdisco/EL-5 netdisco.init, 1.1, 1.2 netdisco.spec, 1.1,
	1.2 netdisco_config, 1.1, 1.2
Message-ID: <20090917221208.6E67111C00CE@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9745

Modified Files:
	netdisco.init netdisco.spec netdisco_config 
Log Message:



Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/EL-5/netdisco.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco.init	28 Jul 2009 05:30:15 -0000	1.1
+++ netdisco.init	17 Sep 2009 22:12:08 -0000	1.2
@@ -2,11 +2,21 @@
 #
 # Startup script for the netdisco daemon
 #
-# chkconfig: - 345 95 5
+# chkconfig: - 95 5
 # description: Startup/shutdown script for the Netdisco Admin Daemon
 # processname: netdisco
 # pidfile: /var/run/netdisco/netdisco.pid
 # config: /etc/netdisco.conf
+#
+### BEGIN INIT INFO
+# Provides: netdisco
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Short-Description: start and stop netdisco admin daemon 
+# Description: Netdisco is a network management application targeted at large
+# corporate and university networks. 
+### END INIT INFO
+
 
 # Source function library.
 . /etc/rc.d/init.d/functions


Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/EL-5/netdisco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco.spec	28 Jul 2009 05:30:15 -0000	1.1
+++ netdisco.spec	17 Sep 2009 22:12:08 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           netdisco 
 Version:        0.95 
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A web-based network management tool 
 License:        BSD
 Group:          Applications/Internet 
@@ -17,7 +17,7 @@ Requires:       httpd
 Requires:       postgresql postgresql-server
 Requires:       net-snmp net-snmp-perl
 Requires:       mod_perl mod_ssl
-Requires:       graphviz 
+Requires:       graphviz graphviz-gd 
 Requires:       perl(DBI) 
 Requires:       perl(Apache::DBI)
 Requires:       perl(DBD::Pg)
@@ -120,9 +120,7 @@ install -m0644 netdisco.pm %{buildroot}/
 
 
 %post
-if [ "$1" = "0" ]; then
    /sbin/chkconfig --add %{name}
-fi
 
 
 %preun
@@ -152,8 +150,12 @@ fi
  
 
 %changelog
-* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-2
+* Thu Sep 17 2009 <gouldwp at fedoraproject.org> 0.95-4
 - Netdisco network management software.
+- Added require graphviz-gd package for graphing to work 
+- Added chkconfig line in netdisco_config script
+- Changed chkconfig line in netdisco.init script to not start daemon by default
+- Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section
 - Changed /usr/share/ to %%_datadir in the %%files section
 - Removed patches, substituted with find/perl/xargs replace lines 


Index: netdisco_config
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/EL-5/netdisco_config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco_config	28 Jul 2009 05:30:15 -0000	1.1
+++ netdisco_config	17 Sep 2009 22:12:08 -0000	1.2
@@ -173,6 +173,7 @@ chown netdisco:netdisco /usr/share/netdi
 # Start postgres and httpd at system startup
 /sbin/chkconfig postgresql on
 /sbin/chkconfig httpd on
+/sbin/chkconfig netdisco on
 
 # create netdisco user - and start netdisco
 echo ""



From kalev at fedoraproject.org  Thu Sep 17 23:18:05 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 17 Sep 2009 23:18:05 +0000 (UTC)
Subject: rpms/mingw32-gcc/devel mingw32-gcc.spec,1.8,1.9
Message-ID: <20090917231806.1E25511C00CE@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7948

Modified Files:
	mingw32-gcc.spec 
Log Message:
4.4.1-3



Index: mingw32-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-gcc.spec	3 Sep 2009 21:30:43 -0000	1.8
+++ mingw32-gcc.spec	17 Sep 2009 23:18:04 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:           mingw32-gcc
 Version:        4.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C
 
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -45,7 +45,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  texinfo
 BuildRequires:  mingw32-filesystem >= 49
-BuildRequires:  mingw32-binutils
+# Need mingw32-binutils which support %gnu_unique_object >= 2.19.51.0.14
+BuildRequires:  mingw32-binutils >= 2.19.51.0.14
 BuildRequires:  mingw32-runtime
 BuildRequires:  mingw32-w32api
 BuildRequires:  gmp-devel
@@ -55,8 +56,8 @@ BuildRequires:  flex
 
 # NB: Explicit mingw32-filesystem dependency is REQUIRED here.
 Requires:       mingw32-filesystem >= 48
-
-Requires:       mingw32-binutils
+# Need mingw32-binutils which support %gnu_unique_object
+Requires:       mingw32-binutils >= 2.19.51.0.14
 Requires:       mingw32-runtime
 Requires:       mingw32-w32api
 Requires:       mingw32-cpp
@@ -291,6 +292,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.1-3
+- Require mingw32-binutils >= 2.19.51.0.14 for %%gnu_unique_object support.
+
 * Thu Sep 03 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.1-2
 - Update to gcc 4.4.1 20090902 svn 151328.
 - Patches taken from native Fedora gcc-4.4.1-8.



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:13 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchcommits
Message-ID: <20090917233112.E99D010F884@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:17 +0000
Subject: [pkgdb] poedit: itamarjp has requested commit
Message-ID: <20090917233113.C7F1B10F895@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:13 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchbugzilla
Message-ID: <20090917233113.BF86E10F88C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:15 +0000
Subject: [pkgdb] poedit: itamarjp has requested approveacls
Message-ID: <20090917233115.73F2510F89A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:21 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchcommits
Message-ID: <20090917233117.A169A10F89C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on poedit (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:19 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchbugzilla
Message-ID: <20090917233119.4F19510F89E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on poedit (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:24 +0000
Subject: [pkgdb] poedit: itamarjp has requested commit
Message-ID: <20090917233121.981C510F867@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on poedit (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:23 +0000
Subject: [pkgdb] poedit: itamarjp has requested approveacls
Message-ID: <20090917233123.0870D10F8A1@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on poedit (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:40 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchcommits
Message-ID: <20090917233136.9A04C10F884@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:40 +0000
Subject: [pkgdb] poedit: itamarjp has requested commit
Message-ID: <20090917233137.B2E6D10F888@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:39 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchbugzilla
Message-ID: <20090917233139.AA5C910F8A3@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:42 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchbugzilla
Message-ID: <20090917233142.49C5F10F8A8@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:43 +0000
Subject: [pkgdb] poedit ownership updated
Message-ID: <20090917233142.D149F10F8AA@bastion2.fedora.phx.redhat.com>

Package poedit in Fedora EPEL 5 is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:44 +0000
Subject: [pkgdb] poedit: itamarjp has requested approveacls
Message-ID: <20090917233147.78F3010F89A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:52 +0000
Subject: [pkgdb] poedit: itamarjp has requested watchcommits
Message-ID: <20090917233148.9A72210F8AC@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:52 +0000
Subject: [pkgdb] poedit: itamarjp has requested commit
Message-ID: <20090917233149.2F92C10F8B0@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Thu Sep 17 23:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Sep 2009 23:31:51 +0000
Subject: [pkgdb] poedit: itamarjp has requested approveacls
Message-ID: <20090917233151.8CE2710F8B3@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From kkofler at fedoraproject.org  Thu Sep 17 23:51:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 17 Sep 2009 23:51:17 +0000 (UTC)
Subject: rpms/kio_gopher/devel import.log, NONE, 1.1 kio_gopher.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090917235117.EA06E11C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kio_gopher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23376/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kio_gopher.spec 
Log Message:
New package kio_gopher - Gopher KIO slave for Konqueror



--- NEW FILE import.log ---
kio_gopher-0_1_3-2_fc10:HEAD:kio_gopher-0.1.3-2.fc10.src.rpm:1253231422


--- NEW FILE kio_gopher.spec ---
%define kdever 4.3.1

Name:           kio_gopher
Version:        0.1.3
Release:        2%{?dist}
Summary:        Gopher KIO slave for Konqueror

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://kgopher.berlios.de/
Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdever}/src/extragear/%{name}-%{version}-kde%{kdever}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel >= %{kdever}
BuildRequires:  cmake
BuildRequires:  gettext

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
This KIO slave adds support for the Gopher protocol to Konqueror.


%prep
%setup -q -n %{name}-%{version}-kde%{kdever}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang kio_gopher


%clean
rm -rf %{buildroot}


%files -f kio_gopher.lang
%defattr(-,root,root,-)
%doc README COPYING BUGS
# FAQ is only about installation problems which shouldn't affect the RPM.
%{_kde4_libdir}/kde4/kio_gopher.so
%{_kde4_datadir}/kde4/services/gopher.protocol


%changelog
* Wed Sep 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.3-2
- drop postfix tag from Release

* Tue Sep 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.3-1.kde4.3.1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kio_gopher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:08:17 -0000	1.1
+++ .cvsignore	17 Sep 2009 23:51:15 -0000	1.2
@@ -0,0 +1 @@
+kio_gopher-0.1.3-kde4.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kio_gopher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:08:17 -0000	1.1
+++ sources	17 Sep 2009 23:51:16 -0000	1.2
@@ -0,0 +1 @@
+46af449c5f866a46703e61cf0a1f334b  kio_gopher-0.1.3-kde4.3.1.tar.bz2



From kkofler at fedoraproject.org  Thu Sep 17 23:54:04 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 17 Sep 2009 23:54:04 +0000 (UTC)
Subject: rpms/kio_gopher import.log,NONE,1.1
Message-ID: <20090917235404.D75A511C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kio_gopher
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26280

Added Files:
	import.log 
Log Message:
New package kio_gopher - Gopher KIO slave for Konqueror


--- NEW FILE import.log ---
kio_gopher-0_1_3-2_fc10:HEAD:kio_gopher-0.1.3-2.fc10.src.rpm:1253231422



From kkofler at fedoraproject.org  Thu Sep 17 23:54:04 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 17 Sep 2009 23:54:04 +0000 (UTC)
Subject: rpms/kio_gopher/devel import.log,1.1,NONE
Message-ID: <20090917235405.0016511C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kio_gopher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26280/devel

Removed Files:
	import.log 
Log Message:
New package kio_gopher - Gopher KIO slave for Konqueror


--- import.log DELETED ---



From kkofler at fedoraproject.org  Thu Sep 17 23:55:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 17 Sep 2009 23:55:58 +0000 (UTC)
Subject: rpms/kio_gopher/F-11 kio_gopher.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090917235558.9E98811C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kio_gopher/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26932/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	kio_gopher.spec 
Log Message:
New package kio_gopher - Gopher KIO slave for Konqueror - init F-11 branch


--- NEW FILE kio_gopher.spec ---
%define kdever 4.3.1

Name:           kio_gopher
Version:        0.1.3
Release:        2%{?dist}
Summary:        Gopher KIO slave for Konqueror

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://kgopher.berlios.de/
Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdever}/src/extragear/%{name}-%{version}-kde%{kdever}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel >= %{kdever}
BuildRequires:  cmake
BuildRequires:  gettext

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
This KIO slave adds support for the Gopher protocol to Konqueror.


%prep
%setup -q -n %{name}-%{version}-kde%{kdever}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang kio_gopher


%clean
rm -rf %{buildroot}


%files -f kio_gopher.lang
%defattr(-,root,root,-)
%doc README COPYING BUGS
# FAQ is only about installation problems which shouldn't affect the RPM.
%{_kde4_libdir}/kde4/kio_gopher.so
%{_kde4_datadir}/kde4/services/gopher.protocol


%changelog
* Wed Sep 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.3-2
- drop postfix tag from Release

* Tue Sep 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.3-1.kde4.3.1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kio_gopher/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:08:17 -0000	1.1
+++ .cvsignore	17 Sep 2009 23:55:58 -0000	1.2
@@ -0,0 +1 @@
+kio_gopher-0.1.3-kde4.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kio_gopher/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:08:17 -0000	1.1
+++ sources	17 Sep 2009 23:55:58 -0000	1.2
@@ -0,0 +1 @@
+46af449c5f866a46703e61cf0a1f334b  kio_gopher-0.1.3-kde4.3.1.tar.bz2



From kkofler at fedoraproject.org  Thu Sep 17 23:56:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 17 Sep 2009 23:56:34 +0000 (UTC)
Subject: rpms/kio_gopher/F-10 kio_gopher.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090917235634.9794C11C00CE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kio_gopher/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27158/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	kio_gopher.spec 
Log Message:
New package kio_gopher - Gopher KIO slave for Konqueror - init F-10 branch


--- NEW FILE kio_gopher.spec ---
%define kdever 4.3.1

Name:           kio_gopher
Version:        0.1.3
Release:        2%{?dist}
Summary:        Gopher KIO slave for Konqueror

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://kgopher.berlios.de/
Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdever}/src/extragear/%{name}-%{version}-kde%{kdever}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel >= %{kdever}
BuildRequires:  cmake
BuildRequires:  gettext

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
This KIO slave adds support for the Gopher protocol to Konqueror.


%prep
%setup -q -n %{name}-%{version}-kde%{kdever}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang kio_gopher


%clean
rm -rf %{buildroot}


%files -f kio_gopher.lang
%defattr(-,root,root,-)
%doc README COPYING BUGS
# FAQ is only about installation problems which shouldn't affect the RPM.
%{_kde4_libdir}/kde4/kio_gopher.so
%{_kde4_datadir}/kde4/services/gopher.protocol


%changelog
* Wed Sep 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.3-2
- drop postfix tag from Release

* Tue Sep 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.3-1.kde4.3.1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kio_gopher/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:08:17 -0000	1.1
+++ .cvsignore	17 Sep 2009 23:56:34 -0000	1.2
@@ -0,0 +1 @@
+kio_gopher-0.1.3-kde4.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kio_gopher/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:08:17 -0000	1.1
+++ sources	17 Sep 2009 23:56:34 -0000	1.2
@@ -0,0 +1 @@
+46af449c5f866a46703e61cf0a1f334b  kio_gopher-0.1.3-kde4.3.1.tar.bz2



From jkeating at fedoraproject.org  Thu Sep 17 23:57:28 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 17 Sep 2009 23:57:28 +0000 (UTC)
Subject: rpms/PolicyKit/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE PolicyKit.spec, 1.26, NONE entry-leak.patch, 1.1,
	NONE pk-ck-api-change.patch, 1.1,
	NONE polkit-0.8-dbus-policy.patch, 1.1, NONE sources, 1.9, NONE
Message-ID: <20090917235728.CA46111C00CE@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/PolicyKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27894

Added Files:
	dead.package 
Removed Files:
	Makefile PolicyKit.spec entry-leak.patch 
	pk-ck-api-change.patch polkit-0.8-dbus-policy.patch sources 
Log Message:
Retired


--- NEW FILE dead.package ---
Package Renamed


--- Makefile DELETED ---


--- PolicyKit.spec DELETED ---


--- entry-leak.patch DELETED ---


--- pk-ck-api-change.patch DELETED ---


--- polkit-0.8-dbus-policy.patch DELETED ---


--- sources DELETED ---



From jkeating at fedoraproject.org  Thu Sep 17 23:58:11 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 17 Sep 2009 23:58:11 +0000 (UTC)
Subject: rpms/PolicyKit-gnome/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE PolicyKit-gnome-0.9.2-dont-spawn-when-running-under-gdm.patch,
	1.1, NONE PolicyKit-gnome-0.9.2-fix-clickable-buttons.patch, 1.1,
	NONE PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch,
	1.1, NONE PolicyKit-gnome.spec, 1.29, NONE sources, 1.9, NONE
Message-ID: <20090917235811.BFDD811C00CE@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28290

Added Files:
	dead.package 
Removed Files:
	Makefile 
	PolicyKit-gnome-0.9.2-dont-spawn-when-running-under-gdm.patch 
	PolicyKit-gnome-0.9.2-fix-clickable-buttons.patch 
	PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch 
	PolicyKit-gnome.spec sources 
Log Message:
Retired


--- NEW FILE dead.package ---
Package Renamed


--- Makefile DELETED ---


--- PolicyKit-gnome-0.9.2-dont-spawn-when-running-under-gdm.patch DELETED ---


--- PolicyKit-gnome-0.9.2-fix-clickable-buttons.patch DELETED ---


--- PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch DELETED ---


--- PolicyKit-gnome.spec DELETED ---


--- sources DELETED ---



From jkeating at fedoraproject.org  Fri Sep 18 00:11:29 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 18 Sep 2009 00:11:29 +0000 (UTC)
Subject: rpms/orpie/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE orpie.spec, 1.11, NONE sources, 1.3, NONE
Message-ID: <20090918001129.3F4AD11C00CE@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/orpie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2446

Added Files:
	dead.package 
Removed Files:
	Makefile orpie.spec sources 
Log Message:
Retired


--- NEW FILE dead.package ---
Dead upstream


--- Makefile DELETED ---


--- orpie.spec DELETED ---


--- sources DELETED ---



From hno at fedoraproject.org  Fri Sep 18 00:30:50 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri, 18 Sep 2009 00:30:50 +0000 (UTC)
Subject: rpms/squid/devel squid.logrotate,1.3,1.4 squid.spec,1.144,1.145
Message-ID: <20090918003050.25E7611C02BB@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11901

Modified Files:
	squid.logrotate squid.spec 
Log Message:
Make logrotate rotate all .log files automatically picking up store.log if enabled



Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- squid.logrotate	31 Aug 2009 18:30:08 -0000	1.3
+++ squid.logrotate	18 Sep 2009 00:30:49 -0000	1.4
@@ -1,4 +1,4 @@
-/var/log/squid/access.log /var/log/squid/store.log /var/log/squid/cache.log {
+/var/log/squid/*.log {
     weekly
     rotate 5
     compress


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- squid.spec	16 Sep 2009 18:54:51 -0000	1.144
+++ squid.spec	18 Sep 2009 00:30:49 -0000	1.145
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  5%{?dist}
+Release:  6%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -253,6 +253,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 18 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-6
+- Rotate store.log if enabled
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.1.0.13-5
 - Use password-auth common PAM configuration instead of system-auth
 



From cweyl at fedoraproject.org  Fri Sep 18 00:34:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 18 Sep 2009 00:34:45 +0000 (UTC)
Subject: rpms/perl-Try-Tiny/devel import.log, NONE, 1.1 perl-Try-Tiny.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918003445.21AF111C00CE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Try-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14165/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Try-Tiny.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Try-Tiny-0_02-1_fc11:HEAD:perl-Try-Tiny-0.02-1.fc11.src.rpm:1253234067


--- NEW FILE perl-Try-Tiny.spec ---
Name:       perl-Try-Tiny 
Version:    0.02 
Release:    1%{?dist}
# lib/Try/Tiny.pm -> MIT
License:    MIT 
Group:      Development/Libraries
Summary:    Minimal try/catch with proper localization of $@ 
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Try-Tiny
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(Test::More)

%{?perl_default_filter}

%description
The main focus of this module is to provide simple and reliable error
handling for those having a hard time installing TryCatch, but who still
want to write correct 'eval' blocks without 5 lines of boilerplate each
time.

%prep
%setup -q -n Try-Tiny-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- submission

* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Try-Tiny/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:14:47 -0000	1.1
+++ .cvsignore	18 Sep 2009 00:34:44 -0000	1.2
@@ -0,0 +1 @@
+Try-Tiny-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Try-Tiny/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:14:47 -0000	1.1
+++ sources	18 Sep 2009 00:34:44 -0000	1.2
@@ -0,0 +1 @@
+a6ceb75d533046d85c797ad9e3be4212  Try-Tiny-0.02.tar.gz



From cweyl at fedoraproject.org  Fri Sep 18 00:35:04 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 18 Sep 2009 00:35:04 +0000 (UTC)
Subject: rpms/perl-Try-Tiny/F-11 import.log, NONE, 1.1 perl-Try-Tiny.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918003504.A84C511C00CE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Try-Tiny/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14495/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Try-Tiny.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Try-Tiny-0_02-1_fc11:F-11:perl-Try-Tiny-0.02-1.fc11.src.rpm:1253234089


--- NEW FILE perl-Try-Tiny.spec ---
Name:       perl-Try-Tiny 
Version:    0.02 
Release:    1%{?dist}
# lib/Try/Tiny.pm -> MIT
License:    MIT 
Group:      Development/Libraries
Summary:    Minimal try/catch with proper localization of $@ 
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Try-Tiny
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(Test::More)

%{?perl_default_filter}

%description
The main focus of this module is to provide simple and reliable error
handling for those having a hard time installing TryCatch, but who still
want to write correct 'eval' blocks without 5 lines of boilerplate each
time.

%prep
%setup -q -n Try-Tiny-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- submission

* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Try-Tiny/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:14:47 -0000	1.1
+++ .cvsignore	18 Sep 2009 00:35:03 -0000	1.2
@@ -0,0 +1 @@
+Try-Tiny-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Try-Tiny/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:14:47 -0000	1.1
+++ sources	18 Sep 2009 00:35:04 -0000	1.2
@@ -0,0 +1 @@
+a6ceb75d533046d85c797ad9e3be4212  Try-Tiny-0.02.tar.gz



From cweyl at fedoraproject.org  Fri Sep 18 00:35:31 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 18 Sep 2009 00:35:31 +0000 (UTC)
Subject: rpms/perl-Try-Tiny/F-10 import.log, NONE, 1.1 perl-Try-Tiny.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918003531.64D4F11C00CE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Try-Tiny/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14832/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Try-Tiny.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Try-Tiny-0_02-1_fc11:F-10:perl-Try-Tiny-0.02-1.fc11.src.rpm:1253234115


--- NEW FILE perl-Try-Tiny.spec ---
Name:       perl-Try-Tiny 
Version:    0.02 
Release:    1%{?dist}
# lib/Try/Tiny.pm -> MIT
License:    MIT 
Group:      Development/Libraries
Summary:    Minimal try/catch with proper localization of $@ 
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Try-Tiny
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(Test::More)

%{?perl_default_filter}

%description
The main focus of this module is to provide simple and reliable error
handling for those having a hard time installing TryCatch, but who still
want to write correct 'eval' blocks without 5 lines of boilerplate each
time.

%prep
%setup -q -n Try-Tiny-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- submission

* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Try-Tiny/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:14:47 -0000	1.1
+++ .cvsignore	18 Sep 2009 00:35:30 -0000	1.2
@@ -0,0 +1 @@
+Try-Tiny-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Try-Tiny/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:14:47 -0000	1.1
+++ sources	18 Sep 2009 00:35:30 -0000	1.2
@@ -0,0 +1 @@
+a6ceb75d533046d85c797ad9e3be4212  Try-Tiny-0.02.tar.gz



From petersen at fedoraproject.org  Fri Sep 18 00:49:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 18 Sep 2009 00:49:18 +0000 (UTC)
Subject: rpms/cpphs/devel .cvsignore, 1.2, 1.3 cpphs.spec, 1.6, 1.7 sources, 
	1.2, 1.3
Message-ID: <20090918004918.5DA5811C00CE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22448

Modified Files:
	.cvsignore cpphs.spec sources 
Log Message:
update to 1.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Jan 2009 22:10:52 -0000	1.2
+++ .cvsignore	18 Sep 2009 00:49:18 -0000	1.3
@@ -1 +1 @@
-cpphs-1.6.tar.gz
+cpphs-1.9.tar.gz


Index: cpphs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cpphs.spec	24 Jul 2009 19:34:21 -0000	1.6
+++ cpphs.spec	18 Sep 2009 00:49:18 -0000	1.7
@@ -5,8 +5,8 @@
 %global debug_package %{nil}
 
 Name:           cpphs
-Version:        1.6
-Release:        9%{?dist}
+Version:        1.9
+Release:        1%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
@@ -145,6 +145,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.9-1
+- update to 1.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jan 2009 22:10:52 -0000	1.2
+++ sources	18 Sep 2009 00:49:18 -0000	1.3
@@ -1 +1 @@
-8a7565ff3b2d7bdb594af4c10c594951  cpphs-1.6.tar.gz
+122f157f9cde1ba3c8c7e5fac15fc2fc  cpphs-1.9.tar.gz



From petersen at fedoraproject.org  Fri Sep 18 00:55:13 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 18 Sep 2009 00:55:13 +0000 (UTC)
Subject: rpms/hscolour/devel hscolour.spec,1.4,1.5
Message-ID: <20090918005513.7874E11C00CE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hscolour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25244

Modified Files:
	hscolour.spec 
Log Message:
update to 1.15


Index: hscolour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/devel/hscolour.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hscolour.spec	25 Jul 2009 02:13:08 -0000	1.4
+++ hscolour.spec	18 Sep 2009 00:55:12 -0000	1.5
@@ -5,8 +5,8 @@
 %global debug_package %{nil}
 
 Name:           hscolour
-Version:        1.13
-Release:        2%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.15-1
+- update to 1.15
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Fri Sep 18 00:57:24 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 18 Sep 2009 00:57:24 +0000 (UTC)
Subject: rpms/hscolour/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090918005724.B047111C00CE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hscolour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26336

Modified Files:
	.cvsignore sources 
Log Message:
update to 1.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 May 2009 00:08:18 -0000	1.3
+++ .cvsignore	18 Sep 2009 00:57:24 -0000	1.4
@@ -1 +1 @@
-hscolour-1.13.tar.gz
+hscolour-1.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 May 2009 00:08:18 -0000	1.3
+++ sources	18 Sep 2009 00:57:24 -0000	1.4
@@ -1 +1 @@
-a48b90999b0b28903e774e53fb4ec4e6  hscolour-1.13.tar.gz
+ae1f3d4b1b9911ca80735548b0a622d5  hscolour-1.15.tar.gz



From dchen at fedoraproject.org  Fri Sep 18 01:00:34 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 18 Sep 2009 01:00:34 +0000 (UTC)
Subject: rpms/libsvm/devel import.log, 1.5, 1.6 libsvm-2.89.patch, 1.2,
	1.3 libsvm.spec, 1.37, 1.38
Message-ID: <20090918010034.4674E11C02BB@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27533/devel

Modified Files:
	import.log libsvm-2.89.patch libsvm.spec 
Log Message:
Fixed [Bug 524108]


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Sep 2009 06:39:51 -0000	1.5
+++ import.log	18 Sep 2009 01:00:33 -0000	1.6
@@ -3,3 +3,4 @@ libsvm-2_88-1_fc9:HEAD:libsvm-2.88-1.fc9
 libsvm-2_88-2_fc9:HEAD:libsvm-2.88-2.fc9.src.rpm:1226365469
 libsvm-2_89-1_fc10:HEAD:libsvm-2.89-1.fc10.src.rpm:1238738697
 libsvm-2_89-3_fc11:HEAD:libsvm-2.89-3.fc11.src.rpm:1253083141
+libsvm-2_89-4_fc11:HEAD:libsvm-2.89-4.fc11.src.rpm:1253235532

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   27 +++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 176 insertions(+), 31 deletions(-)

Index: libsvm-2.89.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm-2.89.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libsvm-2.89.patch	16 Sep 2009 06:39:52 -0000	1.2
+++ libsvm-2.89.patch	18 Sep 2009 01:00:33 -0000	1.3
@@ -1,12 +1,11 @@
 diff -up ./java/Makefile.orig ./java/Makefile
 --- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
-+++ ./java/Makefile	2009-09-16 13:44:31.000000000 +1000
-@@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
++++ ./java/Makefile	2009-09-18 10:13:04.000000000 +1000
+@@ -4,13 +4,21 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		libsvm/svm_print_interface.class \
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
  
-+JAVA_TARGETDIR=${INSTDIR}/share/libsvm/java
-+JAVA_DOCDIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
++JAVA_DOC_DIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
 +CLASSPATH = .
  #JAVAC = jikes
 -JAVAC_FLAGS = -target 1.5 -source 1.5
@@ -26,7 +25,7 @@ diff -up ./java/Makefile.orig ./java/Mak
  
  .java.class:
  	$(JAVAC) $(JAVAC_FLAGS) $<
-@@ -18,8 +27,24 @@ all: $(FILES)
+@@ -18,8 +26,23 @@ all: $(FILES)
  libsvm/svm.java: libsvm/svm.m4
  	m4 libsvm/svm.m4 > libsvm/svm.java
  
@@ -36,14 +35,13 @@ diff -up ./java/Makefile.orig ./java/Mak
 +	javadoc -d docs *.java libsvm/*.java
 +
 +install: 
-+	mkdir -p ${JAVA_TARGETDIR}
-+	install -m 644 libsvm.jar ${JAVA_TARGETDIR}
-+	install -m 644 test_applet.html ${JAVA_TARGETDIR}
-+#	mkdir -p ${JAVA_DOCDIR}
-+#	cd docs; cp -R * ${JAVA_DOCDIR}
++	mkdir -p ${JAVA_TARGET_DIR}
++	install -m 644 libsvm.jar ${JAVA_TARGET_DIR}
++#	mkdir -p ${JAVA_DOC_DIR}
++#	cd docs; cp -R * ${JAVA_DOC_DIR}
 +uninstall:
 +	rm -fr ${JAVA_TARGETDIR}
-+	rm -fr ${JAVA_DOCDIR}
++#	rm -fr ${JAVA_DOC_DIR}
 +
  clean:
  	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
@@ -53,7 +51,7 @@ diff -up ./java/Makefile.orig ./java/Mak
  	rm *.class libsvm/*.class
 diff -up ./java/test_applet.html.orig ./java/test_applet.html
 --- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html	2009-09-16 13:44:31.000000000 +1000
++++ ./java/test_applet.html	2009-09-18 10:10:34.000000000 +1000
 @@ -1 +1,3 @@
 -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
 +<html>
@@ -61,7 +59,7 @@ diff -up ./java/test_applet.html.orig ./
 +</html>
 diff -up ./Makefile.orig ./Makefile
 --- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2009-09-16 14:40:39.000000000 +1000
++++ ./Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -175,7 +173,7 @@ diff -up ./Makefile.orig ./Makefile
 +
 diff -up ./python/Makefile.orig ./python/Makefile
 --- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
-+++ ./python/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./python/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -2,9 +2,11 @@ CXX? = g++
  SWIG ?= swig
  
@@ -225,7 +223,7 @@ diff -up ./python/Makefile.orig ./python
 +
 diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
 --- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/gtk/callbacks.cpp	2009-09-18 10:10:34.000000000 +1000
 @@ -2,6 +2,7 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -236,7 +234,7 @@ diff -up ./svm-toy/gtk/callbacks.cpp.ori
  #include "../../svm.h"
 diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
 --- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/gtk/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -2,21 +2,27 @@ CC? = gcc
  CXX? = g++
  CFLAGS = -Wall -O3 -g `gtk-config --cflags`
@@ -275,7 +273,7 @@ diff -up ./svm-toy/gtk/Makefile.orig ./s
 +	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
 diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 --- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/qt/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -1,17 +1,21 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
@@ -308,7 +306,7 @@ diff -up ./svm-toy/qt/Makefile.orig ./sv
  
 diff -up ./tools/easy.py.orig ./tools/easy.py
 --- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
-+++ ./tools/easy.py	2009-09-16 13:44:31.000000000 +1000
++++ ./tools/easy.py	2009-09-18 10:10:34.000000000 +1000
 @@ -2,6 +2,7 @@
  
  import sys
@@ -334,7 +332,7 @@ diff -up ./tools/easy.py.orig ./tools/ea
          # example for windows
 diff -up ./tools/grid.py.orig ./tools/grid.py
 --- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
-+++ ./tools/grid.py	2009-09-16 13:44:31.000000000 +1000
++++ ./tools/grid.py	2009-09-18 10:10:34.000000000 +1000
 @@ -11,7 +11,7 @@ from subprocess import *
  
  is_win32 = (sys.platform == 'win32')


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libsvm.spec	16 Sep 2009 06:39:52 -0000	1.37
+++ libsvm.spec	18 Sep 2009 01:00:33 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.89
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -28,13 +28,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %else
 %define moc_path %{_libdir}/qt4/bin/moc
 %endif
+
 %ifnarch ppc ppc64
 %define no_java FALSE
 %else
 %define no_java NO_JAVA
 %endif
 
-
 %description
 LIBSVM is an integrated software for support vector classification,
 (C-SVC, nu-SVC ), regression (epsilon-SVR, nu-SVR) and distribution
@@ -68,8 +68,11 @@ programs with libsvm in Python.
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-1.6.0-openjdk-devel
-Requires: jre >= 1.6.0
+BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  jpackage-utils
+
+Requires:  java >= 1.5.0
+Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description java
@@ -129,7 +132,7 @@ cp README svm-toy/qt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}"
+make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
 ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -198,8 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 %ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
-%doc java/README-Java 
-%{_datadir}/%{name}/java
+%doc java/README-Java java/test_applet.html
+%{_javadir}/%{name}.jar
 #%{_datadir}/javadoc/%{name}-%{version}
 %endif
 
@@ -219,7 +222,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
+* Fri Sep 18 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-4
+- Fixed [Bug 524108] put libsvm.jar into _javadir
+  + Move livsvm.jar to _javadir
+  + Move test_applet.html to _datadir/doc/libsvm-<version>
+- Buildrequire changed to java-devel>=1.5.0, jpackage-utils
+- Require changed to java>=1.5.0, jpackage-utils
+
+* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
 - Fix the building for EL-5
   Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
   as java-1.6.0-openjdk-devel for them do not exist yet.



From dcantrel at fedoraproject.org  Fri Sep 18 01:01:38 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 18 Sep 2009 01:01:38 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.668, 1.669 anaconda.spec, 1.818, 
	1.819 sources, 1.802, 1.803
Message-ID: <20090918010138.1E08611C00CE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27907

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Sep 17 2009 David Cantrell <dcantrell at redhat.com> - 12.26-1
- NetworkManagerSystemSettings.service no longer exists. (jkeating)
- udevsettle is no longer used (udevadm settle is called instead) so don't
  put it in images. (jkeating)
- nm-system-settings is no longer shipped. (jkeating)
- Port from PolicyKit to polkit (jkeating)
- Keep po/anaconda.pot in the source tree (#522072) (dcantrell)
- Do not show Unknown as filesystem type for free space. (dcantrell)
- Catch failures from write(2) in utils/snarffont.c (dcantrell)
- Don't leak fds (#520154) (jgranado)
- Initialize the opts variable. (jgranado)
- Add the help messages for the new options of makeupdates script. (jgranado)
- Revert "The Madan font should no longer be used (apparently).  (#523906)."
  (clumens)
- Fix going back from hd install UI when stage2 is given as boot param
  (#519206). (rvykydal)
- The Madan font should no longer be used (apparently).  (#523906). (clumens)
- Update the pykickstart requirement to reflect the escrow stuff. (clumens)
- add requires for sparc arches on elftoaout and piggyback we need them to
  make the tftp image (dennis)
- copy the sparc boot loader on all sparc arches (dennis)
- make sure we include sparc boot loaders on all sparc arches (dennis)
- make sure we get the sparc64 kernel on sparc (dennis)
- Check whatever contains /boot on PPC as well as the bootable part
  (#523747). (clumens)
- make a call to rpmutils to get the basearch works on all arches that dont
  have anaconda built on the basearch (dennis)
- s-c-keyboard is now provided on all architectures (#523445). (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -p -r1.668 -r1.669
--- .cvsignore	16 Sep 2009 00:17:36 -0000	1.668
+++ .cvsignore	18 Sep 2009 01:01:37 -0000	1.669
@@ -1 +1 @@
-anaconda-12.25.tar.bz2
+anaconda-12.26.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -p -r1.818 -r1.819
--- anaconda.spec	16 Sep 2009 00:17:36 -0000	1.818
+++ anaconda.spec	18 Sep 2009 01:01:37 -0000	1.819
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.25
+Version: 12.26
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define libnlver 1.0
 %define libselinuxver 1.6
 %define mkinitrdver 5.1.2-1
-%define pykickstartver 1.58
+%define pykickstartver 1.63
 %define rpmpythonver 4.2-0.61
 %define slangver 2.0.6-2
 %define yumver 2.9.2
@@ -115,9 +115,7 @@ Requires: python-cryptsetup >= %{pythonc
 Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
-%ifnarch s390 s390x ppc64
 Requires: system-config-keyboard >= 1.3.0-3
-%endif
 Requires: hal, dbus-python
 Requires: cracklib-python
 Requires: python-bugzilla
@@ -143,6 +141,9 @@ Requires: dhclient
 Requires: dhcpv6-client
 Requires: anaconda-yum-plugins
 Requires: libselinux-python >= %{libselinuxver}
+%ifarch %{sparc}
+Requires: elftoaout piggyback
+%endif
 Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
@@ -214,6 +215,35 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Sep 17 2009 David Cantrell <dcantrell at redhat.com> - 12.26-1
+- NetworkManagerSystemSettings.service no longer exists. (jkeating)
+- udevsettle is no longer used (udevadm settle is called instead) so don't
+  put it in images. (jkeating)
+- nm-system-settings is no longer shipped. (jkeating)
+- Port from PolicyKit to polkit (jkeating)
+- Keep po/anaconda.pot in the source tree (#522072) (dcantrell)
+- Do not show Unknown as filesystem type for free space. (dcantrell)
+- Catch failures from write(2) in utils/snarffont.c (dcantrell)
+- Don't leak fds (#520154) (jgranado)
+- Initialize the opts variable. (jgranado)
+- Add the help messages for the new options of makeupdates script. (jgranado)
+- Revert "The Madan font should no longer be used (apparently).  (#523906)."
+  (clumens)
+- Fix going back from hd install UI when stage2 is given as boot param
+  (#519206). (rvykydal)
+- The Madan font should no longer be used (apparently).  (#523906). (clumens)
+- Update the pykickstart requirement to reflect the escrow stuff. (clumens)
+- add requires for sparc arches on elftoaout and piggyback we need them to
+  make the tftp image (dennis)
+- copy the sparc boot loader on all sparc arches (dennis)
+- make sure we include sparc boot loaders on all sparc arches (dennis)
+- make sure we get the sparc64 kernel on sparc (dennis)
+- Check whatever contains /boot on PPC as well as the bootable part
+  (#523747). (clumens)
+- make a call to rpmutils to get the basearch works on all arches that dont
+  have anaconda built on the basearch (dennis)
+- s-c-keyboard is now provided on all architectures (#523445). (clumens)
+
 * Tue Sep 15 2009 David Cantrell <dcantrell at redhat.com> - 12.25-1
 - Use pyblock for device-mapper devices' status. (dlehman)
 - load_policy has moved from /usr/sbin to /sbin (#523506). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -p -r1.802 -r1.803
--- sources	16 Sep 2009 00:17:37 -0000	1.802
+++ sources	18 Sep 2009 01:01:37 -0000	1.803
@@ -1 +1 @@
-2f7b7b77418b5dd057045f7ebd359ebf  anaconda-12.25.tar.bz2
+7494d5f42675d01eb0c2e27cdc206ea0  anaconda-12.26.tar.bz2



From dchen at fedoraproject.org  Fri Sep 18 01:07:30 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 18 Sep 2009 01:07:30 +0000 (UTC)
Subject: rpms/libsvm/F-11 import.log, 1.5, 1.6 libsvm-2.89.patch, 1.2,
	1.3 libsvm.spec, 1.36, 1.37
Message-ID: <20090918010730.478C411C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30092/F-11

Modified Files:
	import.log libsvm-2.89.patch libsvm.spec 
Log Message:
Fixed [Bug 524108]


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Sep 2009 06:51:24 -0000	1.5
+++ import.log	18 Sep 2009 01:07:26 -0000	1.6
@@ -3,3 +3,4 @@ libsvm-2_88-1_fc9:HEAD:libsvm-2.88-1.fc9
 libsvm-2_88-2_fc9:HEAD:libsvm-2.88-2.fc9.src.rpm:1226365469
 libsvm-2_89-1_fc10:HEAD:libsvm-2.89-1.fc10.src.rpm:1238738697
 libsvm-2_89-3_fc11:F-11:libsvm-2.89-3.fc11.src.rpm:1253083248
+libsvm-2_89-4_fc11:F-11:libsvm-2.89-4.fc11.src.rpm:1253235810

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   27 +++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 176 insertions(+), 31 deletions(-)

Index: libsvm-2.89.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-11/libsvm-2.89.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libsvm-2.89.patch	16 Sep 2009 06:51:25 -0000	1.2
+++ libsvm-2.89.patch	18 Sep 2009 01:07:26 -0000	1.3
@@ -1,12 +1,11 @@
 diff -up ./java/Makefile.orig ./java/Makefile
 --- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
-+++ ./java/Makefile	2009-09-16 13:44:31.000000000 +1000
-@@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
++++ ./java/Makefile	2009-09-18 10:13:04.000000000 +1000
+@@ -4,13 +4,21 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		libsvm/svm_print_interface.class \
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
  
-+JAVA_TARGETDIR=${INSTDIR}/share/libsvm/java
-+JAVA_DOCDIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
++JAVA_DOC_DIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
 +CLASSPATH = .
  #JAVAC = jikes
 -JAVAC_FLAGS = -target 1.5 -source 1.5
@@ -26,7 +25,7 @@ diff -up ./java/Makefile.orig ./java/Mak
  
  .java.class:
  	$(JAVAC) $(JAVAC_FLAGS) $<
-@@ -18,8 +27,24 @@ all: $(FILES)
+@@ -18,8 +26,23 @@ all: $(FILES)
  libsvm/svm.java: libsvm/svm.m4
  	m4 libsvm/svm.m4 > libsvm/svm.java
  
@@ -36,14 +35,13 @@ diff -up ./java/Makefile.orig ./java/Mak
 +	javadoc -d docs *.java libsvm/*.java
 +
 +install: 
-+	mkdir -p ${JAVA_TARGETDIR}
-+	install -m 644 libsvm.jar ${JAVA_TARGETDIR}
-+	install -m 644 test_applet.html ${JAVA_TARGETDIR}
-+#	mkdir -p ${JAVA_DOCDIR}
-+#	cd docs; cp -R * ${JAVA_DOCDIR}
++	mkdir -p ${JAVA_TARGET_DIR}
++	install -m 644 libsvm.jar ${JAVA_TARGET_DIR}
++#	mkdir -p ${JAVA_DOC_DIR}
++#	cd docs; cp -R * ${JAVA_DOC_DIR}
 +uninstall:
 +	rm -fr ${JAVA_TARGETDIR}
-+	rm -fr ${JAVA_DOCDIR}
++#	rm -fr ${JAVA_DOC_DIR}
 +
  clean:
  	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
@@ -53,7 +51,7 @@ diff -up ./java/Makefile.orig ./java/Mak
  	rm *.class libsvm/*.class
 diff -up ./java/test_applet.html.orig ./java/test_applet.html
 --- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html	2009-09-16 13:44:31.000000000 +1000
++++ ./java/test_applet.html	2009-09-18 10:10:34.000000000 +1000
 @@ -1 +1,3 @@
 -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
 +<html>
@@ -61,7 +59,7 @@ diff -up ./java/test_applet.html.orig ./
 +</html>
 diff -up ./Makefile.orig ./Makefile
 --- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2009-09-16 14:40:39.000000000 +1000
++++ ./Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -175,7 +173,7 @@ diff -up ./Makefile.orig ./Makefile
 +
 diff -up ./python/Makefile.orig ./python/Makefile
 --- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
-+++ ./python/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./python/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -2,9 +2,11 @@ CXX? = g++
  SWIG ?= swig
  
@@ -225,7 +223,7 @@ diff -up ./python/Makefile.orig ./python
 +
 diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
 --- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/gtk/callbacks.cpp	2009-09-18 10:10:34.000000000 +1000
 @@ -2,6 +2,7 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -236,7 +234,7 @@ diff -up ./svm-toy/gtk/callbacks.cpp.ori
  #include "../../svm.h"
 diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
 --- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/gtk/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -2,21 +2,27 @@ CC? = gcc
  CXX? = g++
  CFLAGS = -Wall -O3 -g `gtk-config --cflags`
@@ -275,7 +273,7 @@ diff -up ./svm-toy/gtk/Makefile.orig ./s
 +	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
 diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 --- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/qt/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -1,17 +1,21 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
@@ -308,7 +306,7 @@ diff -up ./svm-toy/qt/Makefile.orig ./sv
  
 diff -up ./tools/easy.py.orig ./tools/easy.py
 --- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
-+++ ./tools/easy.py	2009-09-16 13:44:31.000000000 +1000
++++ ./tools/easy.py	2009-09-18 10:10:34.000000000 +1000
 @@ -2,6 +2,7 @@
  
  import sys
@@ -334,7 +332,7 @@ diff -up ./tools/easy.py.orig ./tools/ea
          # example for windows
 diff -up ./tools/grid.py.orig ./tools/grid.py
 --- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
-+++ ./tools/grid.py	2009-09-16 13:44:31.000000000 +1000
++++ ./tools/grid.py	2009-09-18 10:10:34.000000000 +1000
 @@ -11,7 +11,7 @@ from subprocess import *
  
  is_win32 = (sys.platform == 'win32')


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-11/libsvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libsvm.spec	16 Sep 2009 06:51:25 -0000	1.36
+++ libsvm.spec	18 Sep 2009 01:07:26 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.89
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -28,13 +28,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %else
 %define moc_path %{_libdir}/qt4/bin/moc
 %endif
+
 %ifnarch ppc ppc64
 %define no_java FALSE
 %else
 %define no_java NO_JAVA
 %endif
 
-
 %description
 LIBSVM is an integrated software for support vector classification,
 (C-SVC, nu-SVC ), regression (epsilon-SVR, nu-SVR) and distribution
@@ -68,8 +68,11 @@ programs with libsvm in Python.
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-1.6.0-openjdk-devel
-Requires: jre >= 1.6.0
+BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  jpackage-utils
+
+Requires:  java >= 1.5.0
+Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description java
@@ -129,7 +132,7 @@ cp README svm-toy/qt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}"
+make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
 ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -198,8 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 %ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
-%doc java/README-Java 
-%{_datadir}/%{name}/java
+%doc java/README-Java java/test_applet.html
+%{_javadir}/%{name}.jar
 #%{_datadir}/javadoc/%{name}-%{version}
 %endif
 
@@ -219,7 +222,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
+* Fri Sep 18 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-4
+- Fixed [Bug 524108] put libsvm.jar into _javadir
+  + Move livsvm.jar to _javadir
+  + Move test_applet.html to _datadir/doc/libsvm-<version>
+- Buildrequire changed to java-devel>=1.5.0, jpackage-utils
+- Require changed to java>=1.5.0, jpackage-utils
+
+* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
 - Fix the building for EL-5
   Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
   as java-1.6.0-openjdk-devel for them do not exist yet.



From petersen at fedoraproject.org  Fri Sep 18 01:09:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 18 Sep 2009 01:09:35 +0000 (UTC)
Subject: rpms/ghc-haskell-src-exts/devel .cvsignore, 1.3,
	1.4 ghc-haskell-src-exts.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20090918010935.DEBBC11C00CE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30677

Modified Files:
	.cvsignore ghc-haskell-src-exts.spec sources 
Log Message:
update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2009 00:38:00 -0000	1.3
+++ .cvsignore	18 Sep 2009 01:09:33 -0000	1.4
@@ -1 +1 @@
-haskell-src-exts-1.0.1.tar.gz
+haskell-src-exts-1.1.4.tar.gz


Index: ghc-haskell-src-exts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/ghc-haskell-src-exts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ghc-haskell-src-exts.spec	4 Aug 2009 10:38:05 -0000	1.9
+++ ghc-haskell-src-exts.spec	18 Sep 2009 01:09:33 -0000	1.10
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.0.1
-Release:        3%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Library for Manipulating Haskell source
 Group:          Development/Libraries
 License:        BSD
@@ -149,6 +149,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.1.4-1
+- update to 1.1.4
+
 * Tue Aug  4 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.0.1-3
 - rebuild against new ghc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2009 00:38:00 -0000	1.3
+++ sources	18 Sep 2009 01:09:33 -0000	1.4
@@ -1 +1 @@
-2887d8ce3b3be77e18ace62a81e6df31  haskell-src-exts-1.0.1.tar.gz
+ea7fc71ee18310bff7f8d26cc5a4e9e0  haskell-src-exts-1.1.4.tar.gz



From rdieter at fedoraproject.org  Fri Sep 18 01:25:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Sep 2009 01:25:01 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel .cvsignore, 1.10, 1.11 GraphicsMagick.spec,
	1.29, 1.30 sources, 1.10, 1.11
Message-ID: <20090918012501.52BCE11C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3867

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Log Message:
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
- GraphicsMagick-1.3.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Aug 2009 20:36:46 -0000	1.10
+++ .cvsignore	18 Sep 2009 01:24:59 -0000	1.11
@@ -1 +1 @@
-GraphicsMagick-1.3.6.tar.lzma
+GraphicsMagick-1.3.7.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- GraphicsMagick.spec	3 Aug 2009 20:36:46 -0000	1.29
+++ GraphicsMagick.spec	18 Sep 2009 01:25:00 -0000	1.30
@@ -1,22 +1,32 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.6
-Release: 2%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
-BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
-BuildRequires: freetype-devel >= 2.0.1
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
+BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
+BuildRequires: bzip2-devel
+BuildRequires: freetype-devel
 BuildRequires: jasper-devel
-BuildRequires: libwmf-devel, perl-devel
-BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libtiff-devel
+BuildRequires: libungif-devel
+BuildRequires: libwmf-devel
+BuildRequires: libxml2-devel
 BuildRequires: libX11-devel libXext-devel libXt-devel
+BuildRequires: perl 
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires: perl-devel
+%endif
+BuildRequires: zlib-devel
 
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
@@ -237,6 +247,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
+- GraphicsMagick-1.3.7
+
 * Mon Aug  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.6-2
 - Use lzma-compressed upstream source tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Aug 2009 20:36:46 -0000	1.10
+++ sources	18 Sep 2009 01:25:00 -0000	1.11
@@ -1 +1 @@
-b602509eecd926c157047407ea3fb4ad  GraphicsMagick-1.3.6.tar.lzma
+8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma



From wtogami at fedoraproject.org  Fri Sep 18 01:25:17 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 18 Sep 2009 01:25:17 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.50, 1.51 sources, 1.49,
	1.50 spamassassin.spec, 1.129, 1.130
Message-ID: <20090918012517.602B211C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4034

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	10 Sep 2009 16:44:31 -0000	1.50
+++ .cvsignore	18 Sep 2009 01:25:17 -0000	1.51
@@ -1,2 +1 @@
-Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
-Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+Mail-SpamAssassin-3.3.0-svn816416.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Sep 2009 16:44:31 -0000	1.49
+++ sources	18 Sep 2009 01:25:17 -0000	1.50
@@ -1,2 +1 @@
-1b396a9df1faa22185263c7526fe6042  Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
-daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+bc788059349e11bb5875e8c73602cb63  Mail-SpamAssassin-3.3.0-svn816416.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- spamassassin.spec	17 Sep 2009 18:05:19 -0000	1.129
+++ spamassassin.spec	18 Sep 2009 01:25:17 -0000	1.130
@@ -41,8 +41,8 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename alpha2
-Release: 0.13.alpha2%{?dist}
+%define prename svn816416
+Release: 0.14.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -234,6 +234,10 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.14.svn816416
+- 3.3.0 svn816416 snapshot, pre-alpha3
+  Upstream just fixed important bug SA#6206.  Many other bugs fixed since alpha2.
+
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.13.alpha2
 - F12+ requires Mail::DKIM
 



From dchen at fedoraproject.org  Fri Sep 18 01:26:50 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 18 Sep 2009 01:26:50 +0000 (UTC)
Subject: rpms/libsvm/F-10 import.log, 1.5, 1.6 libsvm-2.89.patch, 1.2,
	1.3 libsvm.spec, 1.5, 1.6
Message-ID: <20090918012650.A1B3511C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4734/F-10

Modified Files:
	import.log libsvm-2.89.patch libsvm.spec 
Log Message:
Fixed [Bug 524108]


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Sep 2009 08:04:52 -0000	1.5
+++ import.log	18 Sep 2009 01:26:48 -0000	1.6
@@ -3,3 +3,4 @@ libsvm-2_88-1_fc9:F-10:libsvm-2.88-1.fc9
 libsvm-2_88-2_fc9:F-10:libsvm-2.88-2.fc9.src.rpm:1226365621
 libsvm-2_89-1_fc10:F-10:libsvm-2.89-1.fc10.src.rpm:1238740885
 libsvm-2_89-3_fc11:F-10:libsvm-2.89-3.fc11.src.rpm:1253088241
+libsvm-2_89-4_fc11:F-10:libsvm-2.89-4.fc11.src.rpm:1253236881

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   27 +++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 176 insertions(+), 31 deletions(-)

Index: libsvm-2.89.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/libsvm-2.89.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libsvm-2.89.patch	16 Sep 2009 08:04:52 -0000	1.2
+++ libsvm-2.89.patch	18 Sep 2009 01:26:49 -0000	1.3
@@ -1,12 +1,11 @@
 diff -up ./java/Makefile.orig ./java/Makefile
 --- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
-+++ ./java/Makefile	2009-09-16 13:44:31.000000000 +1000
-@@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
++++ ./java/Makefile	2009-09-18 10:13:04.000000000 +1000
+@@ -4,13 +4,21 @@ FILES = libsvm/svm.class libsvm/svm_mode
  		libsvm/svm_print_interface.class \
  		svm_train.class svm_predict.class svm_toy.class svm_scale.class
  
-+JAVA_TARGETDIR=${INSTDIR}/share/libsvm/java
-+JAVA_DOCDIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
++JAVA_DOC_DIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
 +CLASSPATH = .
  #JAVAC = jikes
 -JAVAC_FLAGS = -target 1.5 -source 1.5
@@ -26,7 +25,7 @@ diff -up ./java/Makefile.orig ./java/Mak
  
  .java.class:
  	$(JAVAC) $(JAVAC_FLAGS) $<
-@@ -18,8 +27,24 @@ all: $(FILES)
+@@ -18,8 +26,23 @@ all: $(FILES)
  libsvm/svm.java: libsvm/svm.m4
  	m4 libsvm/svm.m4 > libsvm/svm.java
  
@@ -36,14 +35,13 @@ diff -up ./java/Makefile.orig ./java/Mak
 +	javadoc -d docs *.java libsvm/*.java
 +
 +install: 
-+	mkdir -p ${JAVA_TARGETDIR}
-+	install -m 644 libsvm.jar ${JAVA_TARGETDIR}
-+	install -m 644 test_applet.html ${JAVA_TARGETDIR}
-+#	mkdir -p ${JAVA_DOCDIR}
-+#	cd docs; cp -R * ${JAVA_DOCDIR}
++	mkdir -p ${JAVA_TARGET_DIR}
++	install -m 644 libsvm.jar ${JAVA_TARGET_DIR}
++#	mkdir -p ${JAVA_DOC_DIR}
++#	cd docs; cp -R * ${JAVA_DOC_DIR}
 +uninstall:
 +	rm -fr ${JAVA_TARGETDIR}
-+	rm -fr ${JAVA_DOCDIR}
++#	rm -fr ${JAVA_DOC_DIR}
 +
  clean:
  	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
@@ -53,7 +51,7 @@ diff -up ./java/Makefile.orig ./java/Mak
  	rm *.class libsvm/*.class
 diff -up ./java/test_applet.html.orig ./java/test_applet.html
 --- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
-+++ ./java/test_applet.html	2009-09-16 13:44:31.000000000 +1000
++++ ./java/test_applet.html	2009-09-18 10:10:34.000000000 +1000
 @@ -1 +1,3 @@
 -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
 +<html>
@@ -61,7 +59,7 @@ diff -up ./java/test_applet.html.orig ./
 +</html>
 diff -up ./Makefile.orig ./Makefile
 --- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
-+++ ./Makefile	2009-09-16 14:40:39.000000000 +1000
++++ ./Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -1,11 +1,40 @@
  CXX? = g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -175,7 +173,7 @@ diff -up ./Makefile.orig ./Makefile
 +
 diff -up ./python/Makefile.orig ./python/Makefile
 --- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
-+++ ./python/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./python/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -2,9 +2,11 @@ CXX? = g++
  SWIG ?= swig
  
@@ -225,7 +223,7 @@ diff -up ./python/Makefile.orig ./python
 +
 diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
 --- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/gtk/callbacks.cpp	2009-09-18 10:10:34.000000000 +1000
 @@ -2,6 +2,7 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -236,7 +234,7 @@ diff -up ./svm-toy/gtk/callbacks.cpp.ori
  #include "../../svm.h"
 diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
 --- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/gtk/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -2,21 +2,27 @@ CC? = gcc
  CXX? = g++
  CFLAGS = -Wall -O3 -g `gtk-config --cflags`
@@ -275,7 +273,7 @@ diff -up ./svm-toy/gtk/Makefile.orig ./s
 +	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
 diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 --- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2009-09-16 13:44:31.000000000 +1000
++++ ./svm-toy/qt/Makefile	2009-09-18 10:10:34.000000000 +1000
 @@ -1,17 +1,21 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
@@ -308,7 +306,7 @@ diff -up ./svm-toy/qt/Makefile.orig ./sv
  
 diff -up ./tools/easy.py.orig ./tools/easy.py
 --- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
-+++ ./tools/easy.py	2009-09-16 13:44:31.000000000 +1000
++++ ./tools/easy.py	2009-09-18 10:10:34.000000000 +1000
 @@ -2,6 +2,7 @@
  
  import sys
@@ -334,7 +332,7 @@ diff -up ./tools/easy.py.orig ./tools/ea
          # example for windows
 diff -up ./tools/grid.py.orig ./tools/grid.py
 --- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
-+++ ./tools/grid.py	2009-09-16 13:44:31.000000000 +1000
++++ ./tools/grid.py	2009-09-18 10:10:34.000000000 +1000
 @@ -11,7 +11,7 @@ from subprocess import *
  
  is_win32 = (sys.platform == 'win32')


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/libsvm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libsvm.spec	16 Sep 2009 08:04:52 -0000	1.5
+++ libsvm.spec	18 Sep 2009 01:26:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.89
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -28,13 +28,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %else
 %define moc_path %{_libdir}/qt4/bin/moc
 %endif
+
 %ifnarch ppc ppc64
 %define no_java FALSE
 %else
 %define no_java NO_JAVA
 %endif
 
-
 %description
 LIBSVM is an integrated software for support vector classification,
 (C-SVC, nu-SVC ), regression (epsilon-SVR, nu-SVR) and distribution
@@ -68,8 +68,11 @@ programs with libsvm in Python.
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  java-1.6.0-openjdk-devel
-Requires: jre >= 1.6.0
+BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  jpackage-utils
+
+Requires:  java >= 1.5.0
+Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description java
@@ -129,7 +132,7 @@ cp README svm-toy/qt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}"
+make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
 ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -198,8 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 %ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
-%doc java/README-Java 
-%{_datadir}/%{name}/java
+%doc java/README-Java java/test_applet.html
+%{_javadir}/%{name}.jar
 #%{_datadir}/javadoc/%{name}-%{version}
 %endif
 
@@ -219,7 +222,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
+* Fri Sep 18 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-4
+- Fixed [Bug 524108] put libsvm.jar into _javadir
+  + Move livsvm.jar to _javadir
+  + Move test_applet.html to _datadir/doc/libsvm-<version>
+- Buildrequire changed to java-devel>=1.5.0, jpackage-utils
+- Require changed to java>=1.5.0, jpackage-utils
+
+* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
 - Fix the building for EL-5
   Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
   as java-1.6.0-openjdk-devel for them do not exist yet.



From dchen at fedoraproject.org  Fri Sep 18 01:28:03 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 18 Sep 2009 01:28:03 +0000 (UTC)
Subject: rpms/libsvm/EL-5 - New directory
Message-ID: <20090918012803.2682411C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5601/EL-5

Log Message:
Directory /cvs/pkgs/rpms/libsvm/EL-5 added to the repository




From rdieter at fedoraproject.org  Fri Sep 18 01:29:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Sep 2009 01:29:13 +0000 (UTC)
Subject: rpms/GraphicsMagick/EL-5 .cvsignore, 1.2, 1.3 GraphicsMagick.spec, 
	1.10, 1.11 sources, 1.3,
	1.4 GraphicsMagick-1.1.8-MagickSpawnVP.patch, 1.1,
	NONE GraphicsMagick-gslib.patch, 1.1, NONE
Message-ID: <20090918012913.D0D0011C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5872

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Removed Files:
	GraphicsMagick-1.1.8-MagickSpawnVP.patch 
	GraphicsMagick-gslib.patch 
Log Message:
sync w/devel branch for 1.3.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 13:37:41 -0000	1.2
+++ .cvsignore	18 Sep 2009 01:29:13 -0000	1.3
@@ -1 +1 @@
-GraphicsMagick-1.1.7.tar.bz2
+GraphicsMagick-1.3.7.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/GraphicsMagick.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- GraphicsMagick.spec	29 Jul 2007 10:10:56 -0000	1.10
+++ GraphicsMagick.spec	18 Sep 2009 01:29:13 -0000	1.11
@@ -1,22 +1,32 @@
+
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
-Patch0: GraphicsMagick-gslib.patch
-Patch1: GraphicsMagick-1.1.8-MagickSpawnVP.patch
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
-BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
-BuildRequires: freetype-devel >= 2.0.1
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
-BuildRequires: ghostscript-devel
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
+BuildRequires: bzip2-devel
+BuildRequires: freetype-devel
+BuildRequires: jasper-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libtiff-devel
+BuildRequires: libungif-devel
 BuildRequires: libwmf-devel
-BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
+BuildRequires: libxml2-devel
 BuildRequires: libX11-devel libXext-devel libXt-devel
+BuildRequires: perl 
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires: perl-devel
+%endif
+BuildRequires: zlib-devel
 
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
@@ -25,14 +35,14 @@ the GraphicsMagick Group to significantl
 of the software.
 
 %package devel
-Summary: Static libraries and header files for GraphicsMagick app development
+Summary: Libraries and header files for GraphicsMagick app development
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: ghostscript-devel, bzip2-devel, libtiff-devel, libjpeg-devel
 Requires: lcms-devel, pkgconfig, libX11-devel, libXext-devel, libXt-devel
 
 %description devel
-GraphicsMagick-devel contains the static libraries and header files you'll
+GraphicsMagick-devel contains the Libraries and header files you'll
 need to develop GraphicsMagick applications. GraphicsMagick is an image
 manipulation program.
 
@@ -45,9 +55,7 @@ however.
 Summary: GraphicsMagick perl bindings
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: perl >= 5.6.0
-%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
-BuildRequires: %{perl_vendorarch}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Perl bindings to GraphicsMagick.
@@ -74,7 +82,7 @@ Requires: %{name}-c++ = %{version}-%{rel
 Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
-GraphicsMagick-devel contains the static libraries and header files you'll
+GraphicsMagick-devel contains the Libraries and header files you'll
 need to develop GraphicsMagick applications using the Magick++ C++ bindings.
 GraphicsMagick is an image manipulation program.
 
@@ -87,11 +95,15 @@ however.
 
 %prep
 %setup -q
-# Disabled, causing segfaults in the gslib code path
-#%patch0 -p 1 -b .gslib 
-%patch1 -p 1 -b .spawn
-# Regenerating configure script
-#autoconf
+
+iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
+mv -f ChangeLog.utf8 ChangeLog
+
+# Avoid lib64 rpaths (FIXME: recheck this on newer releases)
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
+
 
 %build
 %configure --enable-shared \
@@ -100,22 +112,26 @@ however.
            --with-x \
            --with-threads \
            --with-magick_plus_plus \
-           --with-gslib \
+           --without-gslib \
            --with-wmf \
-           --with-lzw \
            --with-lcms \
-           --with-rsvg \
            --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
            --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --without-dps
 
-make
+# Avoid bogus RPATHs on x86_64
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
+make %{?_smp_mflags}
+make %{?_smp_mflags} perl-build
+
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} -C PerlMagick
 
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
@@ -147,7 +163,7 @@ rm -f  %{buildroot}%{_libdir}/GraphicsMa
 rm -f  %{buildroot}%{_libdir}/*.{a,la}
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 sparc64
 %define wordsize 64
 %else
 %define wordsize 32
@@ -186,12 +202,12 @@ rm -rf %{buildroot}
 %postun c++ -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog Copyright.txt
-%doc index.html www/ images/
-%doc README.txt AUTHORS NEWS 
-%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
-%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
+%defattr(-,root,root,-)
+%doc Copyright.txt
+%doc README.txt
+%doc %{_datadir}/doc/%{name}/
+%{_libdir}/libGraphicsMagick.so.3*
+%{_libdir}/libGraphicsMagickWand.so.2*
 %{_bindir}/[a-z]*
 %{_libdir}/GraphicsMagick*
 %{_datadir}/GraphicsMagick*
@@ -205,18 +221,20 @@ rm -rf %{buildroot}
 %{_libdir}/libGraphicsMagickWand.so
 %{_libdir}/pkgconfig/GraphicsMagick.pc
 %{_libdir}/pkgconfig/GraphicsMagickWand.pc
-%{_includedir}/GraphicsMagick/
+%dir %{_includedir}/GraphicsMagick/
+%{_includedir}/GraphicsMagick/magick/
+%{_includedir}/GraphicsMagick/wand/
 %{_mandir}/man1/GraphicsMagick-config.*
 %{_mandir}/man1/GraphicsMagickWand-config.*
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libGraphicsMagick++.so.*
+%{_libdir}/libGraphicsMagick++.so.3*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_bindir}/GraphicsMagick++-config
-%{_includedir}/GraphicsMagick/Magick++
+%{_includedir}/GraphicsMagick/Magick++/
 %{_includedir}/GraphicsMagick/Magick++.h
 %{_libdir}/libGraphicsMagick++.so
 %{_libdir}/pkgconfig/GraphicsMagick++.pc
@@ -229,6 +247,59 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
+- GraphicsMagick-1.3.7
+
+* Mon Aug  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.6-2
+- Use lzma-compressed upstream source tarball.
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 1.3.6-1
+- GraphicsMagick-1.3.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.5-1
+- GraphicsMagick-1.3.5, ABI break (#487605)
+- --without-libgs (for now, per upstream advice)
+- BR: jasper-devel
+
+* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
+- GraphicsMagick-1.1.15
+- fix BuildRoot
+- multiarch conflicts in GraphicsMagick (#341381)
+- broken -L in GraphicsMagick.pc (#456466)
+- %%files: track sonames
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-3
+- own all files properly
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
+- turns out we do need gcc43 patch
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-1
+- update to 1.1.14
+- fix perl issue (bz 454087)
+
+* Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
+- sparc64 is a 64 bit arch
+
+* Mon Feb 11 2008 Andreas Thienemann <andreas at bawue.net> - 1.1.10-3
+- Added patch to include cstring instead of string, fixing gcc4.3 build issue
+
+* Mon Feb 11 2008 Andreas Thienemann <andreas at bawue.net> - 1.1.10-2
+- Rebuilt against gcc 4.3
+
+* Mon Jan 28 2008 Andreas Thienemann <andreas at bawue.net> - 1.1.10-1
+- Upgraded to 1.1.10
+- Fixed linking problem with the Perl module. #365901
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.8-3
+- Rebuild for selinux ppc32 issue.
+
 * Sun Jul 29 2007 Andreas Thienemann <andreas at bawue.net> - 1.1.8-2
 - Building without gslib support as it results in segfaults.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jul 2007 09:56:22 -0000	1.3
+++ sources	18 Sep 2009 01:29:13 -0000	1.4
@@ -1 +1 @@
-0a673c0d5b3b8152c2c69e9fbbb7c1d9  GraphicsMagick-1.1.8.tar.bz2
+8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma


--- GraphicsMagick-1.1.8-MagickSpawnVP.patch DELETED ---


--- GraphicsMagick-gslib.patch DELETED ---



From dchen at fedoraproject.org  Fri Sep 18 01:30:37 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 18 Sep 2009 01:30:37 +0000 (UTC)
Subject: rpms/libsvm/EL-5 branch,NONE,1.1
Message-ID: <20090918013037.9453011C02BB@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6231

Added Files:
	branch 
Log Message:
Add libsvm to EL-5



--- NEW FILE branch ---
EL-5



From wtogami at fedoraproject.org  Fri Sep 18 01:34:07 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 18 Sep 2009 01:34:07 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore,1.51,1.52 sources,1.50,1.51
Message-ID: <20090918013407.B503711C00CE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7682

Modified Files:
	.cvsignore sources 
Log Message:
oops, add the rules back



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	18 Sep 2009 01:25:17 -0000	1.51
+++ .cvsignore	18 Sep 2009 01:34:07 -0000	1.52
@@ -1 +1,2 @@
+Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 Mail-SpamAssassin-3.3.0-svn816416.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	18 Sep 2009 01:25:17 -0000	1.50
+++ sources	18 Sep 2009 01:34:07 -0000	1.51
@@ -1 +1,2 @@
+daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 bc788059349e11bb5875e8c73602cb63  Mail-SpamAssassin-3.3.0-svn816416.tar.bz2



From dchen at fedoraproject.org  Fri Sep 18 01:56:15 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 18 Sep 2009 01:56:15 +0000 (UTC)
Subject: rpms/libsvm/EL-5 Makefile, NONE, 1.1 import.log, NONE,
	1.1 libsvm-2.89.patch, NONE, 1.1 libsvm-svm-toy-gtk.desktop,
	NONE, 1.1 libsvm-svm-toy-qt.desktop, NONE, 1.1 libsvm.spec, NONE,
	1.1 log, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090918015615.8FFDB11C00CE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17139/EL-5

Added Files:
	Makefile import.log libsvm-2.89.patch 
	libsvm-svm-toy-gtk.desktop libsvm-svm-toy-qt.desktop 
	libsvm.spec log sources 
Log Message:
Fixed [Bug 524108]


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---
libsvm-2_89-4_fc11:EL-5:libsvm-2.89-4.fc11.src.rpm:1253237689

libsvm-2.89.patch:
 Makefile                  |   98 ++++++++++++++++++++++++++++++++++++++++++++--
 java/Makefile             |   27 +++++++++++-
 java/test_applet.html     |    4 +
 python/Makefile           |   23 +++++++++-
 svm-toy/gtk/Makefile      |   22 ++++++----
 svm-toy/gtk/callbacks.cpp |    1 
 svm-toy/qt/Makefile       |   20 +++++----
 tools/easy.py             |    9 ++--
 tools/grid.py             |    3 -
 9 files changed, 176 insertions(+), 31 deletions(-)

--- NEW FILE libsvm-2.89.patch ---
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2009-02-18 10:41:04.000000000 +1000
+++ ./java/Makefile	2009-09-18 10:13:04.000000000 +1000
@@ -4,13 +4,21 @@ FILES = libsvm/svm.class libsvm/svm_mode
 		libsvm/svm_print_interface.class \
 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
 
+JAVA_DOC_DIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
+CLASSPATH = .
 #JAVAC = jikes
-JAVAC_FLAGS = -target 1.5 -source 1.5
+JAVAC_FLAGS = -target 1.5 -source 1.5  -classpath ${CLASSPATH}
+ifndef JAVAC
 JAVAC = javac
+endif
 # JAVAC_FLAGS =
 
+ifndef JAR
+JAR=jar
+endif
+
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	${JAR} cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -18,8 +26,23 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc: docs/index.html
+
+docs/index.html: $(FILES)
+	javadoc -d docs *.java libsvm/*.java
+
+install: 
+	mkdir -p ${JAVA_TARGET_DIR}
+	install -m 644 libsvm.jar ${JAVA_TARGET_DIR}
+#	mkdir -p ${JAVA_DOC_DIR}
+#	cd docs; cp -R * ${JAVA_DOC_DIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+#	rm -fr ${JAVA_DOC_DIR}
+
 clean:
 	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
+	rm -rf docs
 
 dist: clean all
 	rm *.class libsvm/*.class
diff -up ./java/test_applet.html.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2003-07-12 14:07:32.000000000 +1000
+++ ./java/test_applet.html	2009-09-18 10:10:34.000000000 +1000
@@ -1 +1,3 @@
-<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
+<html>
+<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
+</html>
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2008-09-15 14:36:48.000000000 +1000
+++ ./Makefile	2009-09-18 10:10:34.000000000 +1000
@@ -1,11 +1,40 @@
 CXX? = g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
 SHVER = 1
+MAKE = make
+DOT_LIBS=.libs
+LIBS= -L${DOT_LIBS} -lsvm
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
+
+export INSTDIR
+
+IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${IS_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+ifndef LIBDIR
+LIBDIR=/usr/lib${IS_64}
+endif
+
+export LIBDIR
+export LIB_INSTDIR
+
+
+all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
 
 lib: svm.o
-	$(CXX) -shared svm.o -o libsvm.so.$(SHVER)
+	$(CXX) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o  -o libsvm.so.$(SHVER)
+	ln -sf libsvm.so.$(SHVER) libsvm.so
 
 svm-predict: svm-predict.c svm.o
 	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
@@ -16,4 +45,65 @@ svm-scale: svm-scale.c
 svm.o: svm.cpp svm.h
 	$(CXX) $(CFLAGS) -c svm.cpp
 clean:
-	rm -f *~ svm.o svm-train svm-predict svm-scale
+	rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/gtk/svm-toy-gtk  svm-toy/qt/svm-toy-qt
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+svm-python:
+	${MAKE} -C python
+svm-java:
+ifneq ("${NO_JAVA}","NO_JAVA")
+	${MAKE} -C java
+endif
+svm-toy-gtk:
+	${MAKE} -C svm-toy/gtk
+svm-toy-qt:
+	${MAKE} -C svm-toy/qt
+ 
+install: all
+	mkdir -p ${INSTDIR}/bin
+	install -m 755 svm-train ${INSTDIR}/bin
+	install -m 755 svm-predict ${INSTDIR}/bin
+	install -m 755 svm-scale ${INSTDIR}/bin
+	mkdir -p ${LIB_INSTDIR}
+	install -m 755 libsvm.so.$(SHVER) ${LIB_INSTDIR}
+# install package libsvm-devel
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 *.h ${INSTDIR}/share/libsvm/src
+	install -m 644 *.c ${INSTDIR}/share/libsvm/src
+	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
+	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
+ifneq ("${NO_JAVA}","NO_JAVA")
+	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
+# install package libsvm-java
+	${MAKE} -C java install
+endif
+# install package libsvm-python
+	${MAKE} -C python install
+# install package svm-toy
+	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
+	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
+# install examples
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+uninstall:
+	rm -f ${INSTDIR}/bin/svm-train
+	rm -f ${INSTDIR}/bin/svm-predict
+	rm -f ${INSTDIR}/bin/svm-scale
+	rm -fr ${INSTDIR}/libsvm/examples
+	rm -f ${INSTDIR}/include/libsvm/svm.h
+	rm -f ${LIB_INSTDIR}/libsvm/svm.o
+	rm -fr ${INSTDIR}/libsvm/src
+	rm -fr ${INSTDIR}/libsvm
+	${MAKE} -C python uninstall
+ifneq ("${NO_JAVA}","NO_JAVA")
+	${MAKE} -C java uninstall
+endif
+	rm -f ${INSTDIR}/bin/svm-toy-gtk
+	rm -f ${INSTDIR}/bin/svm-toy-qt
+
+
diff -up ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2008-12-10 09:05:08.000000000 +1000
+++ ./python/Makefile	2009-09-18 10:10:34.000000000 +1000
@@ -2,9 +2,11 @@ CXX? = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.5
+PYTHON_INCLUDEDIR ?= /usr/include/python${PYTHON_VERSION}
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
+CFLAGS_PYTHON = ${CFLAGS}  -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
 # Mac OS
 # LDFLAGS = -framework Python -bundle
@@ -15,16 +17,31 @@ svmc.so: svmc_wrap.o svm.o
 	$(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o svm.o
 
 svmc_wrap.o: svmc_wrap.c ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c svmc_wrap.c
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c svmc_wrap.c
 
 svmc_wrap.c: svmc.i
 	$(SWIG) -python -noproxy svmc.i
 
 svm.o: ../svm.cpp ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c ../svm.cpp
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c ../svm.cpp
 
 clean:
 	rm -f *~ *.o *.so *.pyc *.pyo svm.o
 
 moreclean:	clean
 	rm -f svmc_wrap.c
+
+
+install: all
+	mkdir -p ${PYTHON_TARGETDIR}
+	install -m 755 cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 svm.py ${PYTHON_TARGETDIR}
+	install -m 755 svm_test.py ${PYTHON_TARGETDIR}
+	install -m 755 test_cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 *.i ${PYTHON_TARGETDIR}
+	install -m 755 *.so ${PYTHON_TARGETDIR}
+	install -m 755 ../tools/*.py ${PYTHON_TARGETDIR}
+
+uninstall:
+	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
+
diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.orig	2006-03-04 17:40:12.000000000 +1000
+++ ./svm-toy/gtk/callbacks.cpp	2009-09-18 10:10:34.000000000 +1000
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <list>
+#include <cstdlib>
 #include "callbacks.h"
 #include "interface.h"
 #include "../../svm.h"
diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
--- ./svm-toy/gtk/Makefile.orig	2007-10-14 16:29:12.000000000 +1000
+++ ./svm-toy/gtk/Makefile	2009-09-18 10:10:34.000000000 +1000
@@ -2,21 +2,27 @@ CC? = gcc
 CXX? = g++
 CFLAGS = -Wall -O3 -g `gtk-config --cflags`
 LIBS = `gtk-config --libs`
+COPT = -Wall -O3 -g `pkg-config --cflags --libs gtk+-2.0`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
 
-svm-toy: main.o interface.o callbacks.o ../../svm.o
-	$(CXX) $(CFLAGS) main.o interface.o callbacks.o ../../svm.o -o svm-toy $(LIBS)
+
+all: svm-toy-gtk
+
+svm-toy-gtk: main.o interface.o callbacks.o 
+	$(CXX) $(COPT) main.o interface.o callbacks.o ${LIBS} -o svm-toy-gtk
 
 main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
+	$(CC) $(COPT) -c main.c
 
 interface.o: interface.c interface.h
-	$(CC) $(CFLAGS) -c interface.c
+	$(CC) $(COPT) -c interface.c
 
 callbacks.o: callbacks.cpp callbacks.h
-	$(CXX) $(CFLAGS) -c callbacks.cpp
+	$(CXX) $(COPT) -c callbacks.cpp
 
-../../svm.o:
-	cd ../..; make svm.o
+#../../svm.o:
+#	cd ../..; make svm.o
 
 clean:
-	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
+	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.orig	2008-12-19 16:42:05.000000000 +1000
+++ ./svm-toy/qt/Makefile	2009-09-18 10:10:34.000000000 +1000
@@ -1,17 +1,21 @@
 CXX? = g++
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
+CFLAGS = -Wall -O3
+FLAGS:=${CFLAGS} `pkg-config --cflags --libs QtGui`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
+
 INCLUDE = /usr/include/qt4
-MOC = /usr/bin/moc-qt4
 
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
-	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
+MOC=${MOC_PATH}
+
+all: svm-toy-qt
+
+svm-toy-qt: svm-toy.cpp svm-toy.moc
+	$(CXX) $(FLAGS) svm-toy.cpp ${LIBS} -o svm-toy-qt
 
 svm-toy.moc: svm-toy.cpp
 	$(MOC) svm-toy.cpp -o svm-toy.moc
 
-../../svm.o:
-	cd ../..; make svm.o
-
 clean:
-	rm -f *~ svm-toy svm-toy.moc ../../svm.o
+	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
 
diff -up ./tools/easy.py.orig ./tools/easy.py
--- ./tools/easy.py.orig	2009-01-14 07:13:26.000000000 +1000
+++ ./tools/easy.py	2009-09-18 10:10:34.000000000 +1000
@@ -2,6 +2,7 @@
 
 import sys
 import os
+from distutils.sysconfig import get_python_lib
 from subprocess import *
 
 if len(sys.argv) <= 1:
@@ -12,10 +13,10 @@ if len(sys.argv) <= 1:
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-	svmscale_exe = "../svm-scale"
-	svmtrain_exe = "../svm-train"
-	svmpredict_exe = "../svm-predict"
-	grid_py = "./grid.py"
+	svmscale_exe = "/usr/bin/svm-scale"
+	svmtrain_exe = "/usr/bin/svm-train"
+	svmpredict_exe = "/usr/bin/svm-predict"
+	grid_py = get_python_lib(1)+"/libsvm/grid.py"
 	gnuplot_exe = "/usr/bin/gnuplot"
 else:
         # example for windows
diff -up ./tools/grid.py.orig ./tools/grid.py
--- ./tools/grid.py.orig	2008-08-08 20:41:11.000000000 +1000
+++ ./tools/grid.py	2009-09-18 10:10:34.000000000 +1000
@@ -11,7 +11,7 @@ from subprocess import *
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-       svmtrain_exe = "../svm-train"
+       svmtrain_exe = "/usr/bin/svm-train"
        gnuplot_exe = "/usr/bin/gnuplot"
 else:
        # example for windows
@@ -88,6 +88,7 @@ Usage: grid.py [-log2c begin,end,step] [
         i = i + 1
 
     pass_through_string = join(pass_through_options," ")
+    print 'dataset_pathname=%s' % dataset_pathname
     assert os.path.exists(svmtrain_exe),"svm-train executable not found"    
     assert os.path.exists(gnuplot_exe),"gnuplot executable not found"
     assert os.path.exists(dataset_pathname),"dataset not found"


--- NEW FILE libsvm-svm-toy-gtk.desktop ---
[Desktop Entry]
Name=svm-toy-gtk
GenericName=svm-toy GTK version
Comment=GTK version of svm-toy (libsvm demostration program)
Exec=svm-toy-gtk
Icon=libsvm-svm-toy-gtk-48
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;Education;Science;Math;DataVisualization


--- NEW FILE libsvm-svm-toy-qt.desktop ---
[Desktop Entry]
Name=svm-toy-qt
GenericName=svm-toy QT version
Comment=QT version of svm-toy (libsvm demostration program)
Exec=svm-toy-qt
Icon=libsvm-svm-toy-qt-48
StartupNotify=true
Terminal=false
Type=Application
Categories=KDE;Education;Science;Math;DataVisualization


--- NEW FILE libsvm.spec ---
Name:           libsvm
Version:        2.89
Release:        4%{?dist}
Summary:        A Library for Support Vector Machines

Group:          Development/Libraries
License:        BSD
URL:            http://www.csie.ntu.edu.tw/~cjlin/libsvm/
Source0:        %{name}-%{version}.tar.gz
#Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
Source1:        http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
Source2:        http://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
Source3:        libsvm-svm-toy-gtk.desktop
Source4:        libsvm-svm-toy-qt.desktop
Source5:        LibSVM-svm-toy-48.png
Patch0:         %{name}-%{version}.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%{!?pyver: %define pyver %(python -c 'import sys; print(sys.version[0:3])')}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define libsvm_python_dir %{python_sitearch}/libsvm

%define javac javac
%define jar jar
%define libdir_libsvm %{_libdir}/libsvm
%if 0%{?fedora} >= 9
%define moc_path %{_bindir}/moc-qt4
%else
%define moc_path %{_libdir}/qt4/bin/moc
%endif

%ifnarch ppc ppc64
%define no_java FALSE
%else
%define no_java NO_JAVA
%endif

%description
LIBSVM is an integrated software for support vector classification,
(C-SVC, nu-SVC ), regression (epsilon-SVR, nu-SVR) and distribution
estimation (one-class SVM ). It supports multi-class classification.

%package devel
Summary:    Header file, object file, and source files of libsvm in C, C++ and Java
Group:      Development/Libraries
BuildRequires:  glibc-devel gawk
Requires:       %{name} = %{version}-%{release}

%description devel
Header file, object file of libsvm in C, C++ and Java.
Install this package if you want to develop programs with libsvm.


%package python
Summary:    Python tools and interfaces for libsvm
Group:      Development/Libraries
BuildRequires:  python-devel >= 2.4 gawk
#gnuplot is required by easy.py
Requires:       %{name} = %{version}-%{release}
Requires:       gnuplot

%description python
Python tools and interfaces for libsvm.
Install this package if you want to develop 
programs with libsvm in Python.

%ifnarch ppc ppc64
%package java
Summary:    Java tools and interfaces for libsvm
Group:      Development/Libraries
BuildRequires:  java-devel >= 1.5.0
BuildRequires:  jpackage-utils

Requires:  java >= 1.5.0
Requires:  jpackage-utils
Requires:       %{name} = %{version}-%{release}

%description java
Java tools and interfaces for libsvm.
Install this package if you want to develop 
programs with libsvm in Java.
%endif

%package svm-toy-gtk
Summary:    GTK version of svm-toy (libsvm demostration program)
Group:      Development/Libraries
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2
Requires:       %{name} = %{version}-%{release}

%description svm-toy-gtk
svm-toy is a libsvm demostration program which has a gtk-GUI to 
display the derived separating hyperplane.

%package svm-toy-qt
Summary:    QT version of svm-toy (libsvm demostration program)
Group:      Development/Libraries
BuildRequires:  desktop-file-utils
BuildRequires:  pkgconfig

BuildRequires:  qt4-devel
Requires:       qt4
Requires:       %{name} = %{version}-%{release}

%description svm-toy-qt
svm-toy is a libsvm demostration program which has a qt-GUI to 
display the derived separating hyperplane.

%prep
%setup -q 
%patch0 -p0 -b .orig
cp %{SOURCE1} ChangeLog
cp %{SOURCE2} .
cp %{SOURCE3} .
cp %{SOURCE4} .
cp %{SOURCE5} %{name}-svm-toy-gtk-48.png
cp %{SOURCE5} %{name}-svm-toy-qt-48.png



%build
%{__sed} -i 's/\r//' FAQ.html
%{__sed} -i 's/\r//' ChangeLog
make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
mv python/README python/README-Python
mv tools/README tools/README-Tools
cp README java/README-Java
cp README svm-toy/gtk
cp README svm-toy/qt


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications

# [Bug 521194] Python: 'import libsvm' doesn't work
echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
# This file is released under BSD license, just like the rest of the package.\n"\
 > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py

desktop-file-install --delete-original --vendor=fedora \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \



%post -p /sbin/ldconfig

%post svm-toy-gtk
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun -p /sbin/ldconfig

%postun svm-toy-gtk
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT FAQ.html ChangeLog guide.pdf
%{_bindir}/svm-predict
%{_bindir}/svm-scale
%{_bindir}/svm-train
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/examples
%{_libdir}/%{name}.so.1


%files devel
%defattr(-,root,root,-)
%doc README
%{_includedir}/%{name}/
%{_libdir}/%{name}.so

%files python
%defattr(-,root,root,-)
%doc python/README-Python tools/README-Tools
%{libsvm_python_dir}

%ifnarch ppc ppc64
%files java
%defattr(-,root,root,-)
%doc java/README-Java java/test_applet.html
%{_javadir}/%{name}.jar
#%{_datadir}/javadoc/%{name}-%{version}
%endif

%files svm-toy-gtk
%defattr(-,root,root,-)
%doc svm-toy/gtk/README
%{_bindir}/svm-toy-gtk
%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png
%{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop

%files svm-toy-qt
%defattr(-,root,root,-)
%doc svm-toy/qt/README
%{_bindir}/svm-toy-qt
%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png
%{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop


%changelog
* Fri Sep 18 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-4
- Fixed [Bug 524108] put libsvm.jar into _javadir
  + Move livsvm.jar to _javadir
  + Move test_applet.html to _datadir/doc/libsvm-<version>
- Buildrequire changed to java-devel>=1.5.0, jpackage-utils
- Require changed to java>=1.5.0, jpackage-utils

* Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
- Fix the building for EL-5
  Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
  as java-1.6.0-openjdk-devel for them do not exist yet.
- Change the Java buildrequires from java-sdk to java-1.6.0-openjdk-devel
- Fix [Bug 521194] Python: 'import libsvm' doesn't work.
   By adding __init__.py to libsvm_python_dir
  
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.89-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-1
- Upstream Update to 2.89:
  + reduce input/loading time of svm-train/svm-predict by half
  + pointer function so users can specify their own outputs
  + remove info_flush() 
  + a extern variable libsvm_version
  + svm-train -q option (disable outputs)
  + svm-scale: warning if more nonzero produced
  + easy.py: popel.communiate() to avoid some deadlock (if lots of
    outputs when #classes is large)

* Mon Nov 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-2
- Fix java BuildRequire and Build
- javadoc have been removed because ppc and ppc64 do not have a 
  suitable package to build javadoc in F-8, nor does javadoc
  provide much useful information.


* Wed Nov 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-0
- Note:
  + SO version now follows upstream, i.e. SHVER=1, as upstream start to build shared library now.
    Be aware that previously SO version of libsvm.so is libsvm.so.2.86, which looks higher than
    the current SO version libsvm.so.1.
  + Replaced java-1.5.0-gcj-devel with  java-1.6.0-openjdk-devel.
  + java sub-package now have javadoc.
- Upstream update
  + From 2.87: 2008/10/13
    * svm-toy/qt updated to qt4 from qt3
    * fix a bug in svm-scale.c
    * max feature index of -r file is considered
    * Makefile: add make lib; add -Wconversion and -fPIC in Makefile
    * Add "rb" in load_model of svm.cpp
    * Simplify do_shrinking of svm.cpp
    * Change the order of loops in reconstrict_gradient of svm.cpp
    * save the number of kernel evaluations
    * Add python/setup.py
  + From 2.88: 2008/10/30
    * better gradient reconstructions
    * issue a warning when -h 0 may be faster

* Thu Apr 29 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-13
- Fix svm-toy-qt clear button does not clear.
  (from Hsiang-Fu Yu in National Taiwan University)
 

* Thu Apr 3 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-12
- Correct changelog date

* Thu Apr 3 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-11
- Fix the Qt path problem

* Wed Apr 2 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-4
- Support both Qt3 for F8 and earlier, and Qt4 for F9

* Tue Apr 1 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-0
- Upstream update to 2.86
  - svm-scale for java
  - version number in svm.h and svm.m4
  - rename svmtrain.exe to svm-train.exe 
  - python: while 1 --> while True, Popen -> call
  - show best parameters on the contour of grid.py
- LIBSVM_VER_MAJOR and LIBSVM_VER_MINOR are defined in libsvm.spec instead in 

* Tue Mar 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-6
- Fix build error.

* Mon Mar 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-5
- [Bug 436392]: Fix by copy from right place.
-  Add desktop files and icons for svm-toy-gtk and svm-toy-qt

* Tue Feb 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-4
- Move gnuplot from BuildRequires to Requires

* Thu Feb 07 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-3
- Fix linker name (libsvm.so)
- Linked to dynamic libraries

* Tue Feb 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-2
- Fix svm-toy-qt build error

* Tue Feb 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-1
- Fix svm-toy-gtk build error

* Mon Feb 04 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-0
- Upgrade to 2.85
- Include guide.pdf in main package
- Change the dependent from eclipse-ecj to java-1.5.0-gcj
- Add svm-toy-gtk
- Add svm-toy-qt

* Wed Dec 20 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-9
- [Bug 254091] Comment 19
- Fix python/Makefile

* Thu Dec 13 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-8
- Fix improper sed.
- Change ldconfig to /sbin/ldconfig
- Add gnuplot dependency for libsvm-python, as tools/easy.py needs it.

* Mon Dec 03 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-7
- [Bug 254091] Review Request: libsvm - A Library for Support Vector Machines (Comment #12) 

* Thu Sep 26 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-6
- Add defattr to each subpackage
- Move libsvm.so to libsvm

* Thu Sep 24 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
- Split out libsvm-java
- Add libsvm.so

* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-4
- Refined description.
- Fix the /tmp/python.ver problem

* Mon Aug 27 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-3
- Fix dependency problem

* Mon Aug 27 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-2
- Fix mock error
- Support Python 2.4 and Python 2.5

* Mon Aug 27 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-1
- Fix rpmlint error
- Move python related files to libsvm-python

* Fri Aug 17 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-0
- initial packaging



--- NEW FILE log ---
1.04: 2000/6/17, add "load" button to svm-toy. README 
file updated.

2.0: 2000/8, major updates. Include nu-svm, one-class svm, and svr

2.01: 2000/9/22, correct the calculation of obj value and number of bounded support vectors

2.02: 2000/9/29, replace b^2/2 newsvm to regular nu svm.

2.03: 2000/10/24 some improvements on the computational speed

2.1: 2000/12/19 Java version included, regression demonstrated in svm-toy

2.2: 2001/1/16 multi-class classification, nu-SVR, remove epsilon_a

2.3: 2001/3/15 c+-, cross validation, fix some minor bugs

2.31: 2001/4/12 fix one bug on one-class SVM, use float for Cache

2.32: 2001/9/23 
	1. max line number of svm-scale now dynamic
	2. gcc 3.0 problem: now g++ always used
	3. java code in a "libsvm" package
	4. avoid a problem when compiled with Borland C++ builder

2.33: 2001/12/1
	Python interface added

2.34: 2002/6/15
	Add the subroutine svm_check_parameter in svm.cpp
	--> better error handling
	fix bug of python interface for handling different weights
	fix bug of cross validation in svm-train.c

2.35: 2002/6/16
	libsvm.jar was not compiled correctly in 2.34

2.36: 2002/8/4
	grid.py added: contour plot of CV accuracy
	fix several bugs

2.4:  2003/4/1
	svm.cpp
		non-psd kernel using max(...,0) in svm.cpp
	python interface
		python interface bug (nu-svm)
	grid.py
		-log2c and -log2c for grid.py
	        output current best
		coarse grid as default (2)
		ssh for grid.py 
	improvements of scaling 

2.5: 2003/11/13
	subroutines for accessing decision values and number of labels. 
		for svm.cpp, java, and  python interface
	fix bug of svm-scale.c (about -r and -s factors)
	use fscanf but not sscanf in svm-predict.c (faster)
	makefile for windows
	add "using namespace std;" in some .java files
	improve easy.py: output cv rate, error messages printed
		better checking
	better python interface example svm_test.py
	and some minor updates

2.6: 2004/04/01
	Probability estimates for classification/regression 
	Python interface: use swig 1.3 instead of 1.1
	Cross validation becomes a library subroutine
	A few minor corrections: (not completely listed)
		more interface functions such as getting svm_type
		print nu only when Cp=Cn
		floor division in python interface

2.7: 2004/11/10
	Stratified cross validation
	Better faq
	Scaling: support storing the factor of y
	A few minor updates:
		class QMatrix added
		improve the use of easy.py and grid.py on windows 
		grid.py: same CV and same g: use smaller C
		sparse input for python interface
		working set selection: < to <=

2.71: 2004/11/20
	fix a java bug introduced from 2.6 to 2.7

2.8: 2005/04/01
	new working set selection via second order information
	fix minor changes/corrections:
		problem when cache size less than two kernel columns
		-v #data -> stratified CV is not loo -> ensure loo is done
		problem of typing "svm-train -c" only
		problem of "svm-train -n 1 -s 3 ..."
		python interface makefile: -fPIC for 32/64bit
		color change in svmtoy
		makefile in building QT svmtoy

2.81: 2005/11/20
	add a python script subset.py for subsampling
	slightly modify the working set so it's exact the same as the paper
	default cache size to 100 MB

2.82: 2006/04/01
	precomputed kernel
	directly implement a fast powi() function
	poly degree double to int
	minor corrections:
		java code for CV
2.83: 2006/11/17
	Fix the bug of -t 3
	better checking load/save in svm-train.c/svm-predict.c/svm.cpp
	remove redundant var pos in svm_predict_values (thanks to Albert Strasheim)
	Better descriptions in README for the precomputed kernel

2.84: 2007/04/01
	Improve the shrinking code: faster for some cases
	Code more 64-bit friendly: allow large -m
	In Solver, b is replaced by p
	Subroutine max_violating_pair removed. Things are directly
	written in do_shrinking().
	Modify do_shrinking() so variable names are the same as libsvm
	document

2.85: 2007/11/6
	fix minor memory leak in svm-predict.c
	add tools/checkdata.py 
	java to 1.5
	Makefile: CXX?
	Makefile.win: avoid warning from .net 2005
	avoid warning of gcc 4.2
	sigma 0.001 to 1e-12; in Newton direction of prob output
	2 * (long int) l avoid warning of old Visual C++
	grid.py: avoid gnuplot problem on windows

2.86: 2008/04/01
	svm-scale for java
	version number in svm.h and svm.m4
	rename svmtrain.exe to svm-train.exe 
	python: while 1 --> while True, Popen -> call
	show best parameters on the contour of grid.py

2.87: 2008/10/13
	svm-toy/qt updated to qt4 from qt3
	fix a bug in svm-scale.c
		max feature index of -r file is considered
	Makefile: add make lib; add -Wconversion and -fPIC in Makefile
	Add "rb" in load_model of svm.cpp
	Simplify do_shrinking of svm.cpp
	Change the order of loops in reconstrict_gradient of svm.cpp
		save the number of kernel evaluations
	Add python/setup.py

2.88: 2008/10/30
	better gradient reconstructions
	issue a warning	when -h 0 may be faster

2.89: 2009/04/01
	todo: python 2.6, java 1.6, openMP, fast input

--- NEW FILE sources ---
aae7a8f7e357e86e1c893b706bb02a63  guide.pdf
71975f20d37b30eb13a3ec8897f4f546  libsvm-2.89.tar.gz



From rdieter at fedoraproject.org  Fri Sep 18 02:11:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Sep 2009 02:11:04 +0000 (UTC)
Subject: rpms/GraphicsMagick/EL-5 .cvsignore, 1.3, 1.4 GraphicsMagick.spec, 
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <20090918021104.47FF811C00CE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21778

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Log Message:
switch to bz2 sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Sep 2009 01:29:13 -0000	1.3
+++ .cvsignore	18 Sep 2009 02:11:01 -0000	1.4
@@ -1 +1 @@
-GraphicsMagick-1.3.7.tar.lzma
+GraphicsMagick-1.3.7.tar.bz2


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/GraphicsMagick.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- GraphicsMagick.spec	18 Sep 2009 01:29:13 -0000	1.11
+++ GraphicsMagick.spec	18 Sep 2009 02:11:01 -0000	1.12
@@ -1,11 +1,10 @@
-
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Url: http://www.graphicsmagick.org/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	18 Sep 2009 01:29:13 -0000	1.4
+++ sources	18 Sep 2009 02:11:02 -0000	1.5
@@ -1 +1 @@
-8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma
+42bfd382ddcda399880721170bcbf61b  GraphicsMagick-1.3.7.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 18 02:36:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:36:45 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023640.D09F410F867@bastion2.fedora.phx.redhat.com>

hguemar has set the watchbugzilla acl on poedit (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:36:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:36:40 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023642.8F50110F886@bastion2.fedora.phx.redhat.com>

hguemar has set the watchcommits acl on poedit (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:36:52 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023647.4DACE10F895@bastion2.fedora.phx.redhat.com>

hguemar has set the commit acl on poedit (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:36:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:36:56 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023658.2E5AF10F867@bastion2.fedora.phx.redhat.com>

hguemar has set the watchbugzilla acl on poedit (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:37:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:37:00 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023700.177B110F89B@bastion2.fedora.phx.redhat.com>

hguemar has set the watchcommits acl on poedit (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:37:02 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023702.1E41310F884@bastion2.fedora.phx.redhat.com>

hguemar has set the commit acl on poedit (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:37:16 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023712.8DABA10F894@bastion2.fedora.phx.redhat.com>

hguemar has set the watchbugzilla acl on poedit (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:37:14 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023714.243DB10F895@bastion2.fedora.phx.redhat.com>

hguemar has set the watchcommits acl on poedit (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 02:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 02:37:15 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918023715.6A68110F89F@bastion2.fedora.phx.redhat.com>

hguemar has set the commit acl on poedit (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From hguemar at fedoraproject.org  Fri Sep 18 02:58:16 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Fri, 18 Sep 2009 02:58:16 +0000 (UTC)
Subject: rpms/poedit/devel .cvsignore, 1.7, 1.8 poedit.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20090918025816.3AC9111C00CE@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/poedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1033

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Updated to 1.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Dec 2008 16:54:19 -0000	1.7
+++ .cvsignore	18 Sep 2009 02:58:14 -0000	1.8
@@ -1 +1 @@
-poedit-1.4.2.tar.gz
+poedit-1.4.3.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- poedit.spec	26 Jul 2009 19:02:52 -0000	1.14
+++ poedit.spec	18 Sep 2009 02:58:14 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.4.2
-Release:        5%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -9,7 +9,11 @@ URL:            http://www.poedit.net/
 Source0:        http://downloads.sourceforge.net/poedit/poedit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  wxGTK-devel, gtkspell-devel, db4-devel, zip, desktop-file-utils
+BuildRequires:  wxGTK-devel >= 2.8.0
+BuildRequires:  gtkspell-devel
+BuildRequires:  db4-devel
+BuildRequires:  zip
+BuildRequires:  desktop-file-utils
 Requires:       gettext
 
 
@@ -84,6 +88,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.4.3-1
+* Updated to 1.4.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Dec 2008 16:54:19 -0000	1.7
+++ sources	18 Sep 2009 02:58:14 -0000	1.8
@@ -1 +1 @@
-5aca5ed4c8c81e0f10efb20ac3a191ac  poedit-1.4.2.tar.gz
+8b3f6350287db3f3271cb0534ad4e244  poedit-1.4.3.tar.gz



From gerd at fedoraproject.org  Fri Sep 18 03:08:34 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Fri, 18 Sep 2009 03:08:34 +0000 (UTC)
Subject: rpms/rakudo/devel import.log, 1.6, 1.7 rakudo.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090918030834.9A99F11C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096/devel

Modified Files:
	import.log rakudo.spec sources 
Log Message:
modified update to current rakudo release 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	17 Sep 2009 15:11:11 -0000	1.6
+++ import.log	18 Sep 2009 03:08:32 -0000	1.7
@@ -4,3 +4,4 @@ rakudo-0_0_2009_07_1_4_0-3_fc11:HEAD:rak
 rakudo-0_0_2009_07_1_4_0-4_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-4.fc11.src.rpm:1250109284
 rakudo-0_0_2009_08_1_5_0-1_fc11:HEAD:rakudo-0.0.2009.08_1.5.0-1.fc11.src.rpm:1250903045
 rakudo-0_0_2009_09_1_6_0-1_fc11:HEAD:rakudo-0.0.2009.09_1.6.0-1.fc11.src.rpm:1253200149
+rakudo-0_0_2009_09_1_6_0-2_fc11:HEAD:rakudo-0.0.2009.09_1.6.0-2.fc11.src.rpm:1253243164


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rakudo.spec	17 Sep 2009 15:11:12 -0000	1.9
+++ rakudo.spec	18 Sep 2009 03:08:32 -0000	1.10
@@ -5,18 +5,15 @@
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
 
-#ExcludeArch:ppc
-
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
 URL:            http://www.rakudo.org/
 
 Source0:        http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{year}-%{month}.tar.gz
-#Patch0:         rakudo.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,8 +36,6 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
-#%patch0 -p0
-#%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
@@ -62,7 +57,7 @@ pod2man --section=1 --name=perl6 docs/ru
 
 
 %check
-#%{?!_without_tests: make test}
+%{?!_without_tests: make test}
 exit 0
 
 %clean
@@ -83,9 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.08_1.5.0-2
-- add a patch to add a path to the @*INC array
-- update to rakudo 2009-08 on parrot 1.5.0
+* Fri Sep 18 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.09_1.6.0-2
+- update to rakudo 2009-09 on parrot 1.6.0
 
 * Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
 - force executable permission on shared objects so they get stripped


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Sep 2009 15:11:12 -0000	1.7
+++ sources	18 Sep 2009 03:08:33 -0000	1.8
@@ -1 +1 @@
-2be848c361d772ae1fc696e3bc0fc9c1  rakudo-2009-09.tar.gz
+15938c9632c76636bc49d3d0f6ec8aa2  rakudo-2009-09.tar.gz



From hguemar at fedoraproject.org  Fri Sep 18 03:10:40 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Fri, 18 Sep 2009 03:10:40 +0000 (UTC)
Subject: rpms/poedit/F-11 .cvsignore, 1.7, 1.8 poedit.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20090918031040.8119D11C0338@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/poedit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3770

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Updated to 1.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Dec 2008 16:54:19 -0000	1.7
+++ .cvsignore	18 Sep 2009 03:10:40 -0000	1.8
@@ -1 +1 @@
-poedit-1.4.2.tar.gz
+poedit-1.4.3.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/F-11/poedit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- poedit.spec	26 Mar 2009 14:09:03 -0000	1.13
+++ poedit.spec	18 Sep 2009 03:10:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.4.2
-Release:        4%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -9,7 +9,11 @@ URL:            http://www.poedit.net/
 Source0:        http://downloads.sourceforge.net/poedit/poedit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  wxGTK-devel, gtkspell-devel, db4-devel, zip, desktop-file-utils
+BuildRequires:  wxGTK-devel >= 2.8.0
+BuildRequires:  gtkspell-devel
+BuildRequires:  db4-devel
+BuildRequires:  zip
+BuildRequires:  desktop-file-utils
 Requires:       gettext
 
 
@@ -84,6 +88,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.4.3-1
+- Updated to 1.4.3
+
 * Thu Mar 26 2009 Bill Nottingham <notting at redhat.com> - 1.4.2-4
 - rebuild per bug #492193, releng ticket 1432
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Dec 2008 16:54:19 -0000	1.7
+++ sources	18 Sep 2009 03:10:40 -0000	1.8
@@ -1 +1 @@
-5aca5ed4c8c81e0f10efb20ac3a191ac  poedit-1.4.2.tar.gz
+8b3f6350287db3f3271cb0534ad4e244  poedit-1.4.3.tar.gz



From hguemar at fedoraproject.org  Fri Sep 18 03:14:50 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Fri, 18 Sep 2009 03:14:50 +0000 (UTC)
Subject: rpms/poedit/F-10 .cvsignore, 1.7, 1.8 poedit.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090918031450.2F3B711C00CE@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/poedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4728

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Updated to 1.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Dec 2008 16:54:19 -0000	1.7
+++ .cvsignore	18 Sep 2009 03:14:49 -0000	1.8
@@ -1 +1 @@
-poedit-1.4.2.tar.gz
+poedit-1.4.3.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/F-10/poedit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- poedit.spec	27 Dec 2008 17:15:11 -0000	1.11
+++ poedit.spec	18 Sep 2009 03:14:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -9,7 +9,11 @@ URL:            http://www.poedit.net/
 Source0:        http://downloads.sourceforge.net/poedit/poedit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  wxGTK-devel, gtkspell-devel, db4-devel, zip, desktop-file-utils
+BuildRequires:  wxGTK-devel >= 2.8.0
+BuildRequires:  gtkspell-devel
+BuildRequires:  db4-devel
+BuildRequires:  zip
+BuildRequires:  desktop-file-utils
 Requires:       gettext
 
 
@@ -84,6 +88,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.4.3-1
+- Updated to 1.4.3
+
 * Sat Dec 27 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.2-2
 - We still need desktop-file-utils, just not the post/postun scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Dec 2008 16:54:19 -0000	1.7
+++ sources	18 Sep 2009 03:14:49 -0000	1.8
@@ -1 +1 @@
-5aca5ed4c8c81e0f10efb20ac3a191ac  poedit-1.4.2.tar.gz
+8b3f6350287db3f3271cb0534ad4e244  poedit-1.4.3.tar.gz



From lennart at fedoraproject.org  Fri Sep 18 03:28:11 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 18 Sep 2009 03:28:11 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart.spec,1.18,1.19
Message-ID: <20090918032811.B579C11C00CE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8191

Modified Files:
	libatasmart.spec 
Log Message:
New upstream release


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libatasmart.spec	6 Aug 2009 19:44:06 -0000	1.18
+++ libatasmart.spec	18 Sep 2009 03:28:11 -0000	1.19
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.14
+Version: 0.15
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -18,6 +18,7 @@ Summary: Development Files for libatasma
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: vala
 
 %description devel
 Development Files for libatasmart Client Development
@@ -36,6 +37,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
+rm $RPM_BUILD_ROOT%{_docdir}/libatasmart/README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,9 +54,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/atasmart.h
 %{_libdir}/libatasmart.so
 %{_libdir}/pkgconfig/libatasmart.pc
-%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU*
+%{_datadir}/vala/vapi/atasmart.vapi
+%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA*
 
 %changelog
+* Fri Sep 18 2009 Lennart Poettering <lpoetter at redhat.com> 0.15-1
+- New upstream release
+- Fixes #515881
+
 * Thu Aug 6 2009 Lennart Poettering <lpoetter at redhat.com> 0.14-1
 - New upstream release
 



From lennart at fedoraproject.org  Fri Sep 18 03:28:49 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 18 Sep 2009 03:28:49 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore,1.15,1.16 sources,1.15,1.16
Message-ID: <20090918032849.DBD6511C00CE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8355

Modified Files:
	.cvsignore sources 
Log Message:
forgot tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	6 Aug 2009 19:44:06 -0000	1.15
+++ .cvsignore	18 Sep 2009 03:28:49 -0000	1.16
@@ -1 +1 @@
-libatasmart-0.14.tar.gz
+libatasmart-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Aug 2009 19:44:06 -0000	1.15
+++ sources	18 Sep 2009 03:28:49 -0000	1.16
@@ -1 +1 @@
-5f8bef94ed2b65748a6e37c059b81042  libatasmart-0.14.tar.gz
+9d3bdd99592a567abcda1c28df73963a  libatasmart-0.15.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 18 03:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:33:44 +0000
Subject: [pkgdb] yaz ownership updated
Message-ID: <20090918033346.9EC6210F867@bastion2.fedora.phx.redhat.com>

Package yaz in Fedora EPEL 4 is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:03 +0000
Subject: [pkgdb] yaz: itamarjp has requested watchcommits
Message-ID: <20090918033405.58A3610F884@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on yaz (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:10 +0000
Subject: [pkgdb] yaz: itamarjp has requested watchbugzilla
Message-ID: <20090918033406.0FE6010F88C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on yaz (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:06 +0000
Subject: [pkgdb] yaz: itamarjp has requested commit
Message-ID: <20090918033406.1E63810F896@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on yaz (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:07 +0000
Subject: [pkgdb] yaz: itamarjp has requested approveacls
Message-ID: <20090918033407.1FD8510F89B@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on yaz (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:17 +0000
Subject: [pkgdb] yaz: itamarjp has requested watchcommits
Message-ID: <20090918033412.58ED610F89D@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on yaz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:18 +0000
Subject: [pkgdb] yaz: itamarjp has requested watchbugzilla
Message-ID: <20090918033413.D077010F8A0@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on yaz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:11 +0000
Subject: [pkgdb] yaz: itamarjp has requested commit
Message-ID: <20090918033414.3A19210F8A3@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on yaz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 03:34:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 03:34:16 +0000
Subject: [pkgdb] yaz: itamarjp has requested approveacls
Message-ID: <20090918033415.DCDFA10F8A8@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on yaz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From oget at fedoraproject.org  Fri Sep 18 04:00:47 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 18 Sep 2009 04:00:47 +0000 (UTC)
Subject: rpms/frescobaldi/devel .cvsignore, 1.7, 1.8 frescobaldi.spec, 1.8, 
	1.9 sources, 1.7, 1.8
Message-ID: <20090918040047.1AAED11C01EA@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16025

Modified Files:
	.cvsignore frescobaldi.spec sources 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.14-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Aug 2009 03:41:10 -0000	1.7
+++ .cvsignore	18 Sep 2009 04:00:46 -0000	1.8
@@ -1 +1 @@
-frescobaldi-0.7.13.tar.gz
+frescobaldi-0.7.14.tar.gz


Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/frescobaldi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- frescobaldi.spec	11 Aug 2009 03:41:10 -0000	1.8
+++ frescobaldi.spec	18 Sep 2009 04:00:46 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           frescobaldi
-Version:        0.7.13
+Version:        0.7.14
 Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
@@ -119,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.14-1
+- New upstream version
+
 * Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
 - New upstream version
 - No need to rebuild .mo and .png files per new guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 03:41:10 -0000	1.7
+++ sources	18 Sep 2009 04:00:46 -0000	1.8
@@ -1 +1 @@
-320a7e8b7112d4f370de4a745cdca922  frescobaldi-0.7.13.tar.gz
+ad5ad381a6993b26e435c60a27f734a2  frescobaldi-0.7.14.tar.gz



From oget at fedoraproject.org  Fri Sep 18 04:02:58 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 18 Sep 2009 04:02:58 +0000 (UTC)
Subject: rpms/frescobaldi/F-11 .cvsignore, 1.7, 1.8 frescobaldi.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20090918040258.5B3ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16980

Modified Files:
	.cvsignore frescobaldi.spec sources 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.14-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Aug 2009 03:42:15 -0000	1.7
+++ .cvsignore	18 Sep 2009 04:02:56 -0000	1.8
@@ -1 +1 @@
-frescobaldi-0.7.13.tar.gz
+frescobaldi-0.7.14.tar.gz


Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-11/frescobaldi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- frescobaldi.spec	11 Aug 2009 03:42:15 -0000	1.6
+++ frescobaldi.spec	18 Sep 2009 04:02:56 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           frescobaldi
-Version:        0.7.13
+Version:        0.7.14
 Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
@@ -119,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.14-1
+- New upstream version
+
 * Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
 - New upstream version
 - No need to rebuild .mo and .png files per new guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 03:42:15 -0000	1.7
+++ sources	18 Sep 2009 04:02:56 -0000	1.8
@@ -1 +1 @@
-320a7e8b7112d4f370de4a745cdca922  frescobaldi-0.7.13.tar.gz
+ad5ad381a6993b26e435c60a27f734a2  frescobaldi-0.7.14.tar.gz



From oget at fedoraproject.org  Fri Sep 18 04:05:16 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 18 Sep 2009 04:05:16 +0000 (UTC)
Subject: rpms/frescobaldi/F-10 .cvsignore, 1.7, 1.8 frescobaldi.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20090918040516.6701111C01EA@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29105

Modified Files:
	.cvsignore frescobaldi.spec sources 
Log Message:
* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.14-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Aug 2009 03:43:01 -0000	1.7
+++ .cvsignore	18 Sep 2009 04:05:16 -0000	1.8
@@ -1 +1 @@
-frescobaldi-0.7.13.tar.gz
+frescobaldi-0.7.14.tar.gz


Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/frescobaldi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- frescobaldi.spec	11 Aug 2009 03:43:01 -0000	1.6
+++ frescobaldi.spec	18 Sep 2009 04:05:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           frescobaldi
-Version:        0.7.13
+Version:        0.7.14
 Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
@@ -119,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Thu Sep 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.14-1
+- New upstream version
+
 * Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
 - New upstream version
 - No need to rebuild .mo and .png files per new guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 03:43:01 -0000	1.7
+++ sources	18 Sep 2009 04:05:16 -0000	1.8
@@ -1 +1 @@
-320a7e8b7112d4f370de4a745cdca922  frescobaldi-0.7.13.tar.gz
+ad5ad381a6993b26e435c60a27f734a2  frescobaldi-0.7.14.tar.gz



From salimma at fedoraproject.org  Fri Sep 18 04:29:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 18 Sep 2009 04:29:53 +0000 (UTC)
Subject: rpms/fbreader/devel fbreader.spec,1.19,1.20
Message-ID: <20090918042953.A07CE11C01EA@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13607

Modified Files:
	fbreader.spec 
Log Message:
* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fbreader.spec	24 Jul 2009 22:32:18 -0000	1.19
+++ fbreader.spec	18 Sep 2009 04:29:53 -0000	1.20
@@ -1,7 +1,6 @@
-# rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
 Version:        0.10.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
@@ -15,11 +14,10 @@ Patch1:         fbreader-optflags.patch
 Patch3:         fbreader-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  expat-devel bzip2-devel liblinebreak-static
+BuildRequires:  expat-devel bzip2-devel liblinebreak-devel
 BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
-%{?_with_qt4:BuildRequires: qt4-devel}
-#Requires:       
+BuildRequires:  qt4-devel
 
 %description
 FBReader is an e-book reader, with the following main features:
@@ -46,6 +44,50 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package -n     zlibrary
+Summary:        Cross-platform GUI library
+Group:          System Environment/Libraries
+Requires:       zlibrary-ui = %{version}-%{release}
+
+%description -n zlibrary
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+
+%package -n     zlibrary-devel
+Summary:        Development files for zlibrary
+Group:          Development/Libraries
+Requires:       zlibrary = %{version}-%{release}
+
+%description -n zlibrary-devel
+This package contains the libraries amd header files that are needed
+for writing applications with Zlibrary.
+
+
+%package -n     zlibrary-ui-gtk
+Summary:        GTK+ interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui
+
+%description -n zlibrary-ui-gtk
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a GTK+-based UI for ZLibrary.
+
+
+%package -n     zlibrary-ui-qt4
+Summary:        Qt4 interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui
+
+%description -n zlibrary-ui-qt4
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a Qt4-based UI for ZLibrary.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-file
@@ -61,27 +103,24 @@ make %{?_smp_mflags} -C zlibrary/text TA
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
-%if 0%{?_with_qt4:1}
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/core do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
-make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/text do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-%if 0%{?_with_qt4:1}
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      UI_TYPE=dummy
 
@@ -96,26 +135,51 @@ desktop-file-install --vendor="fedora" \
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n zlibrary -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n zlibrary -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc fbreader/LICENSE
 %{_bindir}/FBReader
-%{_libdir}/lib*.so.*
-%{_libdir}/zlibrary
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
 %{_datadir}/pixmaps/FBReader.png
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files -n zlibrary
+%defattr(-,root,root,-)
+%doc fbreader/LICENSE
+%{_libdir}/lib*.so.*
+%dir %{_libdir}/zlibrary
+%dir %{_libdir}/zlibrary/ui
+%exclude %{_datadir}/zlibrary/keynames-*.xml
+%{_datadir}/zlibrary
+
+%files -n zlibrary-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+
+%files -n zlibrary-ui-gtk
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-gtk.so
+%{_datadir}/zlibrary/keynames-gtk.xml
+
+%files -n zlibrary-ui-qt4
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-qt4.so
+%{_datadir}/zlibrary/keynames-qt4.xml
+
 
 
 %changelog
+* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
+- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Fri Sep 18 05:53:32 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 18 Sep 2009 05:53:32 +0000 (UTC)
Subject: rpms/gsoap/devel gsoap.spec,1.15,1.16 sources,1.6,1.7
Message-ID: <20090918055332.B511B11C01EA@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30114

Modified Files:
	gsoap.spec sources 
Log Message:
Merge from ... F-11


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gsoap.spec	22 Aug 2009 20:48:19 -0000	1.15
+++ gsoap.spec	18 Sep 2009 05:53:32 -0000	1.16
@@ -1,14 +1,13 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
-Version: 2.7.12
-Release: 5%{?dist}
+Version: 2.7.13
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
-Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.12.tar.gz
+Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.13.tar.gz
 Patch0: use_libtool-2.7.12.patch
 Patch1: unused_args.patch
-Patch2: gsoap-2.7-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -49,7 +48,6 @@ gSOAP generated stubs
 
 %patch1 -p1
 
-%patch2 -p1
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 
@@ -157,6 +155,8 @@ make check
 %_datadir/gsoap/import/xmlmime5.h
 %_datadir/gsoap/import/xmlmime.h
 %_datadir/gsoap/import/xop.h
+%_datadir/gsoap/import/stdstring.h
+%_datadir/gsoap/import/xsd.h
 %dir %_datadir/gsoap/WS
 %_datadir/gsoap/WS/README.txt
 %_datadir/gsoap/WS/WS-Addressing.xsd
@@ -227,6 +227,7 @@ make check
 %_datadir/gsoap/plugin/wsse2api.h
 %_datadir/gsoap/plugin/wsseapi.c
 %_datadir/gsoap/plugin/wsseapi.h
+%_datadir/gsoap/plugin/wsseapi.cpp
 %_libdir/pkgconfig/gsoapck.pc
 %_libdir/pkgconfig/gsoapck++.pc
 %_libdir/pkgconfig/gsoap.pc
@@ -251,11 +252,8 @@ make check
 
 
 %changelog
-* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon May 11 2009  <matt at redhat> - 2.7.13-1
+- Updated to gsoap 2.7.13
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Jan 2009 05:54:41 -0000	1.6
+++ sources	18 Sep 2009 05:53:32 -0000	1.7
@@ -1 +1 @@
-2ad798072cd812a0d8c3aebadf557762  gsoap_2.7.12.tar.gz
+fffb49eb1db7ff03643a4313115dc3b1  gsoap_2.7.13.tar.gz



From lkundrak at fedoraproject.org  Fri Sep 18 06:01:08 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 18 Sep 2009 06:01:08 +0000 (UTC)
Subject: rpms/gsoap/devel unused_args.patch,1.1,1.2
Message-ID: <20090918060108.76FDE11C01EA@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32671

Modified Files:
	unused_args.patch 
Log Message:
Fix up merge from F-11

unused_args.patch:
 symbol2.c  |    7 ++++++-
 symbol2.c~ |only
 2 files changed, 6 insertions(+), 1 deletion(-)

Index: unused_args.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/unused_args.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- unused_args.patch	7 Jan 2009 05:54:42 -0000	1.1
+++ unused_args.patch	18 Sep 2009 06:01:07 -0000	1.2
@@ -1,48 +1,33 @@
---- gsoap-2.7/gsoap/src/symbol2.c	2008-10-02 12:36:22.000000000 -0500
-+++ gsoap-2.7mf/gsoap/src/symbol2.c	2008-12-25 09:14:14.000000000 -0600
-@@ -6127,7 +6127,7 @@
- }
- 
- /* c_type_id returns the arraytype to be used in parameter declaration
--   Allows you to specify the identifier that acts acts as teh name of teh
-+   Allows you to specify the identifier that acts acts as the name of the
-    type of array */
- char *
- c_type_id(Tnode *typ, char *name)
-@@ -7278,6 +7278,7 @@
-   fprintf(fout,"\n\nSOAP_FMAC5 void SOAP_FMAC6 soap_delete_%s(struct soap *soap, %s)\n{\tsoap_delete(soap, p);\n}", c_ident(typ), c_type_id(typ, "*p"));
+diff -rup gsoap-2.7/gsoap/src/symbol2.c gsoap-2.7mf/gsoap/src/symbol2.c
+--- gsoap-2.7/gsoap/src/symbol2.c	2009-03-21 16:24:34.000000000 -0500
++++ gsoap-2.7mf/gsoap/src/symbol2.c	2009-05-11 10:18:32.000000000 -0500
+@@ -7334,6 +7334,7 @@ soap_instantiate_class(Tnode *typ)
+   fprintf(fhead,"\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap*, int, const char*, const char*, size_t*);", c_type(typ), c_ident(typ));
    fprintf(fout,"\n\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)", c_type(typ), c_ident(typ));
    fprintf(fout,"\n{");
 +  fprintf(fout,"\n\t(void)type; (void)arrayType; /* appease -Wall -Werror */");
    fprintf(fout, "\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"soap_instantiate_%s(%%d, %%s, %%s)\\n\", n, type?type:\"\", arrayType?arrayType:\"\"));", c_ident(typ));
  
    fprintf(fout,"\n\tstruct soap_clist *cp = soap_link(soap, NULL, %s, n, soap_fdelete);", soap_type(typ));
-@@ -7347,7 +7348,7 @@
-   fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap*, int, int, void*, size_t, const void*, size_t);", c_ident(typ));
-   /* fprintf(fhead,"\n#ifdef __cplusplus\n}\n#endif"); */
-   /* fprintf(fout,"\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif"); */
--  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)", c_ident(typ));
-+  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap */*soap*/, int /*st*/, int /*tt*/, void *p, size_t /*len*/, const void *q, size_t /*n*/)", c_ident(typ));
-   fprintf(fout,"\n{");
-   fprintf(fout,"\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"Copying %s %%p -> %%p\\n\", q, p));", c_type(typ));
-   fprintf(fout,"\n\t*(%s*)p = *(%s*)q;\n}", c_type(typ), c_type(typ));
-@@ -7809,6 +7810,7 @@
-     { if (is_external(typ))
-         return;
+@@ -7867,6 +7868,8 @@ Tnode* typ;
          fprintf(fout,"\n\nvoid %s::soap_default(struct soap *soap)\n{", c_ident(typ)); 
-+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
          if ((s = has_soapref(typ)))
            fprintf(fout,"\n\tthis->%s = soap;", s);
++         else
++           fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
  	d = get_Darraydims(typ);
-@@ -7836,6 +7838,7 @@
- 	}
-         fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap*, %s);",c_ident(typ),c_type_id(typ, "*")); 
+         if (d)
+ 	{ fprintf(fout,"\n\tthis->%s = NULL;", ident(p->sym->name));
+@@ -7894,6 +7897,8 @@ Tnode* typ;
          fprintf(fout,"\n\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap *soap, %s)\n{", c_ident(typ),c_type_id(typ, "*a")); 
-+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
          if ((s = has_soapref(typ)))
            fprintf(fout,"\n\ta->%s = soap;", s);
++         else
++           fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
  	d = get_Darraydims(typ);
-@@ -9054,7 +9057,7 @@
+         if (d)
+ 	{ fprintf(fout,"\n\ta->%s = NULL;", ident(p->sym->name));
+@@ -9123,7 +9128,7 @@ soap_out(Tnode *typ)
        if (is_typedef(typ))
          fprintf(fout, "\n{\treturn soap_%s2s(soap, n);\n}", t_ident(typ));
        else if (is_boolean(typ))
@@ -51,3 +36,4 @@
        else if (!is_mask(typ))
        { fprintf(fout, "\n{\tconst char *s = soap_code_str(soap_codes_%s, (long)n);", c_ident(typ));
          fprintf(fout, "\n\tif (s)\n\t\treturn s;");
+Only in gsoap-2.7mf/gsoap/src: symbol2.c~



From lkundrak at fedoraproject.org  Fri Sep 18 06:22:24 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 18 Sep 2009 06:22:24 +0000 (UTC)
Subject: rpms/gsoap/devel gsoap-2.7-const.patch, NONE, 1.1 gsoap.spec, 1.16,
	1.17
Message-ID: <20090918062224.F10D311C01EA@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5782

Modified Files:
	gsoap.spec 
Added Files:
	gsoap-2.7-const.patch 
Log Message:
* Fri Sep 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.7.13-2
- Fix build


gsoap-2.7-const.patch:
 stdsoap2_ssl_cpp.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gsoap-2.7-const.patch ---
Fix build in Rawhide.

Lubomir Rintel <lkundrak at v3.sk>

diff -up gsoap-2.7/gsoap/stdsoap2_ssl_cpp.cpp.const gsoap-2.7/gsoap/stdsoap2_ssl_cpp.cpp
--- gsoap-2.7/gsoap/stdsoap2_ssl_cpp.cpp.const	2009-09-18 08:16:01.749920054 +0200
+++ gsoap-2.7/gsoap/stdsoap2_ssl_cpp.cpp	2009-09-18 08:16:25.254921899 +0200
@@ -4158,7 +4158,7 @@ again:
           { X509_EXTENSION *ext = X509_get_ext(peer, i);
             const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
             if (ext_str && !strcmp(ext_str, "subjectAltName"))
-            { X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+            { const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
               void *ext_data;
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
               const unsigned char *data;


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gsoap.spec	18 Sep 2009 05:53:32 -0000	1.16
+++ gsoap.spec	18 Sep 2009 06:22:22 -0000	1.17
@@ -1,13 +1,14 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.7.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
 Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.13.tar.gz
 Patch0: use_libtool-2.7.12.patch
 Patch1: unused_args.patch
+Patch2: gsoap-2.7-const.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -252,6 +253,9 @@ make check
 
 
 %changelog
+* Fri Sep 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.7.13-2
+- Fix build
+
 * Mon May 11 2009  <matt at redhat> - 2.7.13-1
 - Updated to gsoap 2.7.13
 



From eseyman at fedoraproject.org  Fri Sep 18 06:28:42 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 18 Sep 2009 06:28:42 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/devel import.log, NONE,
	1.1 perl-Text-FormatTable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918062842.CBB4511C01EA@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8698/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-FormatTable.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-FormatTable-1_03-1_fc11:HEAD:perl-Text-FormatTable-1.03-1.fc11.src.rpm:1253255353


--- NEW FILE perl-Text-FormatTable.spec ---
Name:           perl-Text-FormatTable
Version:        1.03
Release:        1%{?dist}
Summary:        Format text tables
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-FormatTable/
Source0:        http://www.cpan.org/authors/id/T/TR/TREY/Text-FormatTable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::FormatTable renders simple tables as text. You pass to the
constructor (new) a table format specification similar to LaTeX (e.g.
r|l|5l|R|20L) and you call methods to fill the table data and insert rules.
After the data is filled, you call the render method and the table gets
formatted as text.

%prep
%setup -q -n Text-FormatTable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:13:16 -0000	1.1
+++ .cvsignore	18 Sep 2009 06:28:42 -0000	1.2
@@ -0,0 +1 @@
+Text-FormatTable-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:13:16 -0000	1.1
+++ sources	18 Sep 2009 06:28:42 -0000	1.2
@@ -0,0 +1 @@
+f97ad335d77095c296f8c672fee08f5b  Text-FormatTable-1.03.tar.gz



From eseyman at fedoraproject.org  Fri Sep 18 06:31:36 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 18 Sep 2009 06:31:36 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/F-12 import.log, NONE,
	1.1 perl-Text-FormatTable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918063136.B3CC611C01EA@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9739/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-FormatTable.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-FormatTable-1_03-1_fc11:F-12:perl-Text-FormatTable-1.03-1.fc11.src.rpm:1253255549


--- NEW FILE perl-Text-FormatTable.spec ---
Name:           perl-Text-FormatTable
Version:        1.03
Release:        1%{?dist}
Summary:        Format text tables
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-FormatTable/
Source0:        http://www.cpan.org/authors/id/T/TR/TREY/Text-FormatTable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::FormatTable renders simple tables as text. You pass to the
constructor (new) a table format specification similar to LaTeX (e.g.
r|l|5l|R|20L) and you call methods to fill the table data and insert rules.
After the data is filled, you call the render method and the table gets
formatted as text.

%prep
%setup -q -n Text-FormatTable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:13:16 -0000	1.1
+++ .cvsignore	18 Sep 2009 06:31:35 -0000	1.2
@@ -0,0 +1 @@
+Text-FormatTable-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:13:16 -0000	1.1
+++ sources	18 Sep 2009 06:31:35 -0000	1.2
@@ -0,0 +1 @@
+f97ad335d77095c296f8c672fee08f5b  Text-FormatTable-1.03.tar.gz



From eseyman at fedoraproject.org  Fri Sep 18 06:32:42 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 18 Sep 2009 06:32:42 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/F-11 import.log, NONE,
	1.1 perl-Text-FormatTable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918063242.E813F11C01EA@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10310/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-FormatTable.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-FormatTable-1_03-1_fc11:F-11:perl-Text-FormatTable-1.03-1.fc11.src.rpm:1253255624


--- NEW FILE perl-Text-FormatTable.spec ---
Name:           perl-Text-FormatTable
Version:        1.03
Release:        1%{?dist}
Summary:        Format text tables
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-FormatTable/
Source0:        http://www.cpan.org/authors/id/T/TR/TREY/Text-FormatTable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::FormatTable renders simple tables as text. You pass to the
constructor (new) a table format specification similar to LaTeX (e.g.
r|l|5l|R|20L) and you call methods to fill the table data and insert rules.
After the data is filled, you call the render method and the table gets
formatted as text.

%prep
%setup -q -n Text-FormatTable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:13:16 -0000	1.1
+++ .cvsignore	18 Sep 2009 06:32:42 -0000	1.2
@@ -0,0 +1 @@
+Text-FormatTable-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:13:16 -0000	1.1
+++ sources	18 Sep 2009 06:32:42 -0000	1.2
@@ -0,0 +1 @@
+f97ad335d77095c296f8c672fee08f5b  Text-FormatTable-1.03.tar.gz



From eseyman at fedoraproject.org  Fri Sep 18 06:33:40 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 18 Sep 2009 06:33:40 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/F-10 import.log, NONE,
	1.1 perl-Text-FormatTable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918063340.DE87411C01EA@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10652/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-FormatTable.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-FormatTable-1_03-1_fc11:F-10:perl-Text-FormatTable-1.03-1.fc11.src.rpm:1253255682


--- NEW FILE perl-Text-FormatTable.spec ---
Name:           perl-Text-FormatTable
Version:        1.03
Release:        1%{?dist}
Summary:        Format text tables
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-FormatTable/
Source0:        http://www.cpan.org/authors/id/T/TR/TREY/Text-FormatTable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::FormatTable renders simple tables as text. You pass to the
constructor (new) a table format specification similar to LaTeX (e.g.
r|l|5l|R|20L) and you call methods to fill the table data and insert rules.
After the data is filled, you call the render method and the table gets
formatted as text.

%prep
%setup -q -n Text-FormatTable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:13:16 -0000	1.1
+++ .cvsignore	18 Sep 2009 06:33:40 -0000	1.2
@@ -0,0 +1 @@
+Text-FormatTable-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:13:16 -0000	1.1
+++ sources	18 Sep 2009 06:33:40 -0000	1.2
@@ -0,0 +1 @@
+f97ad335d77095c296f8c672fee08f5b  Text-FormatTable-1.03.tar.gz



From lkundrak at fedoraproject.org  Fri Sep 18 06:40:38 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 18 Sep 2009 06:40:38 +0000 (UTC)
Subject: rpms/gsoap/devel gsoap.spec, 1.17, 1.18 gsoap-2.7-const.patch, 1.1,
	NONE
Message-ID: <20090918064038.97D5F11C0338@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12228

Modified Files:
	gsoap.spec 
Removed Files:
	gsoap-2.7-const.patch 
Log Message:
Sigh, reapply existing patch


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gsoap.spec	18 Sep 2009 06:22:22 -0000	1.17
+++ gsoap.spec	18 Sep 2009 06:40:38 -0000	1.18
@@ -8,7 +8,7 @@ URL: http://gsoap2.sourceforge.net
 Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.13.tar.gz
 Patch0: use_libtool-2.7.12.patch
 Patch1: unused_args.patch
-Patch2: gsoap-2.7-const.patch
+Patch2: gsoap-2.7-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -49,6 +49,8 @@ gSOAP generated stubs
 
 %patch1 -p1
 
+%patch2 -p1
+
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 


--- gsoap-2.7-const.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 18 06:43:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 06:43:08 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090918064303.92E6310F874@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora devel is now owned by cdamian

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Fri Sep 18 06:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 06:43:09 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090918064310.8C8D510F885@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora EPEL 5 is now owned by cdamian

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Fri Sep 18 06:43:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 06:43:23 +0000
Subject: [pkgdb] php-pear-PHP-CodeSniffer ownership updated
Message-ID: <20090918064324.2642910F874@bastion2.fedora.phx.redhat.com>

Package php-pear-PHP-CodeSniffer in Fedora 11 is now owned by cdamian

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PHP-CodeSniffer



From pkgdb at fedoraproject.org  Fri Sep 18 06:43:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 06:43:38 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090918064334.59DF010F894@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora devel is now owned by cdamian

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Fri Sep 18 06:43:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 06:43:40 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090918064340.5A56610F874@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora EPEL 5 is now owned by cdamian

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From pkgdb at fedoraproject.org  Fri Sep 18 06:43:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 06:43:55 +0000
Subject: [pkgdb] php-pear-PhpDocumentor ownership updated
Message-ID: <20090918064355.4634610F874@bastion2.fedora.phx.redhat.com>

Package php-pear-PhpDocumentor in Fedora 11 is now owned by cdamian

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-PhpDocumentor



From ovasik at fedoraproject.org  Fri Sep 18 07:19:30 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Sep 2009 07:19:30 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-DIR_COLORS.256color, 1.6,
	1.7 coreutils.spec, 1.275, 1.276
Message-ID: <20090918071930.5168B11C01EA@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24703

Modified Files:
	coreutils-DIR_COLORS.256color coreutils.spec 
Log Message:
fixed typo in DIR_COLORS.256color causing no color for multihardlink (thanks P.Brady)


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coreutils-DIR_COLORS.256color	21 Aug 2009 11:49:02 -0000	1.6
+++ coreutils-DIR_COLORS.256color	18 Sep 2009 07:19:28 -0000	1.7
@@ -55,7 +55,7 @@ RESET 0 # reset to "normal" color
 DIR 01;38;5;27	# directory
 LINK 01;38;5;51	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
-MULTIHARDLINK 44;38;5;15; # regular file with more than one link
+MULTIHARDLINK 44;38;5;15 # regular file with more than one link
 FIFO 40;38;5;11	# pipe
 SOCK 01;38;5;13	# socket
 DOOR 01;38;5;5	# door


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- coreutils.spec	16 Sep 2009 06:03:40 -0000	1.275
+++ coreutils.spec	18 Sep 2009 07:19:28 -0000	1.276
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -327,6 +327,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Fri Sep 18 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-3
+- fixed typo in DIR_COLORS.256color causing no color for
+  multihardlink
+
 * Wed Sep 16 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-2
 - fix copying of extended attributes for read only source
   files



From pkgdb at fedoraproject.org  Fri Sep 18 07:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:28:11 +0000
Subject: [pkgdb] octaviz: fab has requested watchcommits
Message-ID: <20090918072814.1760510F884@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:28:13 +0000
Subject: [pkgdb] octaviz: fab has requested watchbugzilla
Message-ID: <20090918072814.7572710F888@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:28:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:28:18 +0000
Subject: [pkgdb] octaviz: fab has requested approveacls
Message-ID: <20090918072818.CAE7B10F898@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:28:16 +0000
Subject: [pkgdb] octaviz: fab has requested commit
Message-ID: <20090918072816.D952B10F895@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:31:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:31:25 +0000
Subject: [pkgdb] octaviz: fab has given up watchbugzilla
Message-ID: <20090918073126.9E20A10F885@bastion2.fedora.phx.redhat.com>

fab has given up the watchbugzilla acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:31:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:31:32 +0000
Subject: [pkgdb] octaviz: fab has given up watchcommits
Message-ID: <20090918073127.CA3C610F888@bastion2.fedora.phx.redhat.com>

fab has given up the watchcommits acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:31:27 +0000
Subject: [pkgdb] octaviz: fab has given up commit
Message-ID: <20090918073128.2A3BA10F895@bastion2.fedora.phx.redhat.com>

fab has given up the commit acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Fri Sep 18 07:31:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:31:25 +0000
Subject: [pkgdb] octaviz: fab has given up approveacls
Message-ID: <20090918073128.B5EB110F898@bastion2.fedora.phx.redhat.com>

fab has given up the approveacls acl on octaviz (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/octaviz



From mhlavink at fedoraproject.org  Fri Sep 18 07:36:32 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 07:36:32 +0000 (UTC)
Subject: rpms/dovecot/F-11 .cvsignore, 1.65, 1.66 dovecot.spec, 1.141,
	1.142 sources, 1.68, 1.69
Message-ID: <20090918073632.1D76811C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31536

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
updated to 1.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	21 Aug 2009 10:56:56 -0000	1.65
+++ .cvsignore	18 Sep 2009 07:36:31 -0000	1.66
@@ -1,4 +1,4 @@
-dovecot-1.2.4.tar.gz
+dovecot-1.2.5.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
 dovecot-1.2.4-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- dovecot.spec	14 Sep 2009 09:11:11 -0000	1.141
+++ dovecot.spec	18 Sep 2009 07:36:31 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.4-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -368,7 +368,6 @@ fi
 %{_sbindir}/dovecotpw
 %attr(0755,root,dovecot) %dir /var/run/dovecot
 %attr(0750,root,dovecot) %dir /var/run/dovecot/login
-#%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
 %if %{build_sieve}
@@ -435,6 +434,19 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-1
+- updated to dovecot 1.2.5
+- Authentication: DIGEST-MD5 and RPA mechanisms no longer require
+  user's login realm to be listed in auth_realms. It only made
+  configuration more difficult without really providing extra security.
+- zlib plugin: Don't allow clients to save compressed data directly.
+  This prevents users from exploiting (most of the) potential security
+  holes in zlib/bzlib.
+- fix index file handling that could have caused an assert-crash
+- IMAP: Fixes to QRESYNC extension.
+- deliver: Don't send rejects to any messages that have Auto-Submitted
+  header. This avoids emails loops.
+
 * Fri Aug 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.4-1
 - updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12
 - fixed a crash in index file handling


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	21 Aug 2009 10:56:56 -0000	1.68
+++ sources	18 Sep 2009 07:36:31 -0000	1.69
@@ -1,4 +1,4 @@
-3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
+8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
 6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From mhlavink at fedoraproject.org  Fri Sep 18 07:42:46 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 07:42:46 +0000 (UTC)
Subject: rpms/dovecot/F-10 dovecot.spec,1.124,1.125
Message-ID: <20090918074246.52DEE11C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1434

Modified Files:
	dovecot.spec 
Log Message:
updated to 1.1.19



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- dovecot.spec	14 Sep 2009 08:49:49 -0000	1.124
+++ dovecot.spec	18 Sep 2009 07:42:40 -0000	1.125
@@ -1,8 +1,8 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.18
-Release: 2%{?dist}
+Version: 1.1.19
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,8 +31,8 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.1/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.1/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
-Patch0: dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.1/dovecot-1.1.18-managesieve-%{managesieve_version}.diff.gz
+Patch0: dovecot-1.1.18-managesieve-%{managesieve_version}.diff.gz
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 # local filesystem rules
@@ -425,6 +425,16 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.19-1
+- dovecot updated to 1.1.19
+- ldap: Fixed hang when >128 requests were sent at once.
+- fixed a crash in saving messages where message contained a CR
+  character that wasn't followed by LF (and the CR happened to be the
+  last character in an internal buffer).
+- deliver: Don't send rejects to any messages that have Auto-Submitted
+  header. This avoids emails loops.
+- Message decoding fixes (mainly for IMAP SEARCH, Sieve).
+
 * Mon Sep 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.18-2
 - dovecot-sieve updated to 1.1.7
 - fixes bug similar to CVE-2009-2632 (buffer overflow)



From behdad at fedoraproject.org  Fri Sep 18 07:43:42 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 18 Sep 2009 07:43:42 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.85, 1.86 sources, 1.86, 1.87 vte.spec, 
	1.159, 1.160
Message-ID: <20090918074342.6061711C01EA@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2116

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.21.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	17 Sep 2009 15:31:37 -0000	1.85
+++ .cvsignore	18 Sep 2009 07:43:41 -0000	1.86
@@ -1 +1 @@
-vte-0.21.6.tar.bz2
+vte-0.21.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	17 Sep 2009 15:31:37 -0000	1.86
+++ sources	18 Sep 2009 07:43:41 -0000	1.87
@@ -1 +1 @@
-75e32d277831dfa85d2a44d39628be15  vte-0.21.6.tar.bz2
+e6eabe5b9ac08513891301c247ca3df3  vte-0.21.7.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- vte.spec	17 Sep 2009 15:31:37 -0000	1.159
+++ vte.spec	18 Sep 2009 07:43:41 -0000	1.160
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.6
+Version: 0.21.7
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Sep 18 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.7-1
+- Update to 0.21.7
+
 * Thu Sep 17 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.6-1
 - Update to 0.21.6
 



From mhlavink at fedoraproject.org  Fri Sep 18 07:44:34 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 07:44:34 +0000 (UTC)
Subject: rpms/dovecot/F-10 .cvsignore,1.54,1.55 sources,1.57,1.58
Message-ID: <20090918074434.74A3B11C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	14 Sep 2009 08:49:49 -0000	1.54
+++ .cvsignore	18 Sep 2009 07:44:34 -0000	1.55
@@ -1,4 +1,4 @@
-dovecot-1.1.18.tar.gz
+dovecot-1.1.19.tar.gz
 dovecot-1.1.18-managesieve-0.10.7.diff.gz
 dovecot-1.1-managesieve-0.10.7.tar.gz
 dovecot-sieve-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Sep 2009 08:49:49 -0000	1.57
+++ sources	18 Sep 2009 07:44:34 -0000	1.58
@@ -1,4 +1,4 @@
-b30bde50771100c60e2d5d4d4c8e2ceb  dovecot-1.1.18.tar.gz
+755be2a4bad1e8fd26f22b463e544183  dovecot-1.1.19.tar.gz
 76ce80824dec0700c2138aee3dda1e30  dovecot-1.1.18-managesieve-0.10.7.diff.gz
 05bc554ed97c93695c676eaff6069485  dovecot-1.1-managesieve-0.10.7.tar.gz
 f133f49a9876ddf7c9290f2c4d255b44  dovecot-sieve-1.1.7.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 18 07:47:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:47:26 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074729.4856E10F894@bastion2.fedora.phx.redhat.com>

mfleming has set the approveacls acl on pyicq-t (Fedora EPEL 5) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 18 07:47:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:47:25 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074726.B7C8B10F886@bastion2.fedora.phx.redhat.com>

mfleming has set the commit acl on pyicq-t (Fedora EPEL 5) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 18 07:47:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:47:43 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074745.4983D10F885@bastion2.fedora.phx.redhat.com>

mfleming has set the commit acl on pyicq-t (Fedora devel) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 18 07:47:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:47:44 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074747.6BB0010F888@bastion2.fedora.phx.redhat.com>

mfleming has set the approveacls acl on pyicq-t (Fedora devel) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 18 07:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:47:54 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074757.2E08310F885@bastion2.fedora.phx.redhat.com>

mfleming has set the watchcommits acl on pyicq-t (Fedora 11) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 18 07:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:48:03 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074759.2394810F895@bastion2.fedora.phx.redhat.com>

mfleming has set the commit acl on pyicq-t (Fedora 11) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Fri Sep 18 07:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 07:47:57 +0000
Subject: [pkgdb] pyicq-t had acl change status
Message-ID: <20090918074800.B8C6710F898@bastion2.fedora.phx.redhat.com>

mfleming has set the approveacls acl on pyicq-t (Fedora 11) to Approved for stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From ovasik at fedoraproject.org  Fri Sep 18 07:51:16 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Sep 2009 07:51:16 +0000 (UTC)
Subject: rpms/quota/devel quota-3.17-quotactlmanpage.patch, NONE,
	1.1 quota.spec, 1.55, 1.56
Message-ID: <20090918075116.B281211C01EA@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245

Modified Files:
	quota.spec 
Added Files:
	quota-3.17-quotactlmanpage.patch 
Log Message:
Fix headers and structs in quotactl manpage(#524138)

quota-3.17-quotactlmanpage.patch:
 quotactl.2 |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

--- NEW FILE quota-3.17-quotactlmanpage.patch ---
diff -urNp quota-tools-orig/quotactl.2 quota-tools/quotactl.2
--- quota-tools-orig/quotactl.2	2008-10-13 19:29:18.000000000 +0200
+++ quota-tools/quotactl.2	2009-09-18 09:27:30.000000000 +0200
@@ -3,12 +3,11 @@
 quotactl \- manipulate disk quotas
 .SH SYNOPSIS
 .nf
-.B #include <linux/quota.h>
+.B #include <sys/quota.h>
+.B #include <sys/types.h>
 .B #include <xfs/xqm.h>
-.B #include <linux/dqblk_v1.h>
-.B #include <linux/dqblk_v2.h>
 .LP
-.B long quotactl(int cmd, char \(**special, qid_t id, caddr_t addr)
+.B long quotactl(int cmd, char \(**special, int id, caddr_t addr)
 .fi
 .SH DESCRIPTION
 .LP
@@ -67,9 +66,9 @@ Get disk quota limits and current usage 
 .IR id .
 .I addr
 is a pointer to an
-.B if_dqblk
+.B dqblk
 structure (defined in
-.BR <linux/quota.h> ).
+.BR <sys/quota.h> ).
 The field
 .I dqb_valid
 defines the entries in the structure which are set correctly. On
@@ -82,15 +81,15 @@ Set current quota information for user o
 .IR id .
 .I addr
 is a pointer to an
-.B if_dqblk
+.B dqblk
 structure (defined in
-.BR <linux/quota.h> ).
+.BR <sys/quota.h> ).
 The field
 .I dqb_valid
 defines which entries in the quota structure are valid and should be set. The constants for
 .I dqb_valid
 field are defined in the
-.B <linux/quota.h>
+.B <sys/quota.h>
 header file. This call obsoletes calls
 .B Q_SETQLIM
 and
@@ -101,9 +100,9 @@ in the previous quota interfaces. This c
 Get information (like grace times) about quotafile.
 .I addr
 should be a pointer to an
-.B if_dqinfo
+.B dqinfo
 structure (defined in
-.IR <linux/quota.h> ).
+.IR <sys/quota.h> ).
 The
 .I dqi_valid
 field in the structure defines entries in it
@@ -118,15 +117,15 @@ is ignored. 
 Set information about quotafile.
 .I addr
 should be a pointer to
-.B if_dqinfo
+.B dqinfo
 structure (defined in
-.IR <linux/quota.h> ).
+.IR <sys/quota.h> ).
 The field
 .I dqi_valid
 defines which entries in the quota info structure are valid and should be set. The constants for
 .I dqi_valid
 field are defined in the
-.B <linux/quota.h>
+.B <sys/quota.h>
 header file. This call obsoletes calls
 .B Q_SETGRACE
 and
@@ -156,7 +155,7 @@ Get statistics and other generic informa
 should be a pointer to
 .B dqstats
 structure (defined in
-.BR <linux/quota.h> )
+.BR <sys/quota.h> )
 in which data should be stored.
 .I special
 and


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- quota.spec	28 Aug 2009 12:29:30 -0000	1.55
+++ quota.spec	18 Sep 2009 07:51:15 -0000	1.56
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
 Patch5: quota-3.16-helpoption.patch
 Patch6: quota-3.16-quotaoffhelp.patch
+Patch7: quota-3.17-quotactlmanpage.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -51,6 +52,7 @@ on remote machines.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .usage
+%patch7 -p1 -b .quotactlman
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -112,6 +114,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 18 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-7
+- Fix headers and structs in quotactl manpage(#524138)
+
 * Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-6
 - symlink manpage for rpc.rquotad
 



From timlau at fedoraproject.org  Fri Sep 18 08:21:46 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Fri, 18 Sep 2009 08:21:46 +0000 (UTC)
Subject: rpms/yumex/devel .cvsignore, 1.42, 1.43 sources, 1.61,
	1.62 yumex.spec, 1.74, 1.75
Message-ID: <20090918082147.1C30011C01EA@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 2.9.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	4 Sep 2009 08:26:06 -0000	1.42
+++ .cvsignore	18 Sep 2009 08:21:42 -0000	1.43
@@ -1 +1 @@
-yumex-2.9.0.tar.gz
+yumex-2.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	4 Sep 2009 08:26:06 -0000	1.61
+++ sources	18 Sep 2009 08:21:42 -0000	1.62
@@ -1 +1 @@
-7deef927bd34bc5b6c704fbcd33896fa  yumex-2.9.0.tar.gz
+169a7878aa2e739bc440be0828cd1cba  yumex-2.9.1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- yumex.spec	4 Sep 2009 08:26:06 -0000	1.74
+++ yumex.spec	18 Sep 2009 08:21:42 -0000	1.75
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.9.0
+Version:  2.9.1
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -73,6 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Sep 18 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
+- bumped version to 2.9.1-1 
 * Sun Aug 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
 - bumped version to 2.9.0-1
 * Sun Aug 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-0.13.pre



From jakub at fedoraproject.org  Fri Sep 18 08:28:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 18 Sep 2009 08:28:26 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-ppc64-aixdesc.patch, NONE, 1.1 .cvsignore,
	1.292, 1.293 gcc.spec, 1.71, 1.72 sources, 1.296,
	1.297 gcc44-rh518303.patch, 1.1, NONE
Message-ID: <20090918082826.A0F7511C01EA@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22784

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-ppc64-aixdesc.patch 
Removed Files:
	gcc44-rh518303.patch 
Log Message:
4.4.1-15

gcc44-ppc64-aixdesc.patch:
 sysv4.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gcc44-ppc64-aixdesc.patch ---
2009-09-16  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/sysv4.h (FP_SAVE_INLINE, GP_SAVE_INLINE): Disable
	out of line gpr/fpr saving for -m64 -Os -mcall-aixdesc.

--- gcc/config/rs6000/sysv4.h.jj	2009-09-16 14:46:19.000000000 +0200
+++ gcc/config/rs6000/sysv4.h	2009-09-16 14:46:19.000000000 +0200
@@ -273,12 +273,14 @@ do {									\
 /* Define cutoff for using external functions to save floating point.
    When optimizing for size, use external functions when profitable.  */
 #define FP_SAVE_INLINE(FIRST_REG) (optimize_size			\
+				   && (!TARGET_64BIT || !DOT_SYMBOLS)	\
 				   ? ((FIRST_REG) == 62			\
 				      || (FIRST_REG) == 63)		\
 				   : (FIRST_REG) < 64)
 /* And similarly for general purpose registers.  */
-#define GP_SAVE_INLINE(FIRST_REG) ((FIRST_REG) < 32	\
-				   && !optimize_size)
+#define GP_SAVE_INLINE(FIRST_REG) ((FIRST_REG) < 32			\
+				   && (!optimize_size			\
+				        || (TARGET_64BIT && DOT_SYMBOLS)))
 
 /* Put jump tables in read-only memory, rather than in .text.  */
 #define JUMP_TABLES_IN_TEXT_SECTION 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- .cvsignore	16 Sep 2009 13:27:05 -0000	1.292
+++ .cvsignore	18 Sep 2009 08:28:25 -0000	1.293
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090916.tar.bz2
+gcc-4.4.1-20090918.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- gcc.spec	16 Sep 2009 14:15:14 -0000	1.71
+++ gcc.spec	18 Sep 2009 08:28:26 -0000	1.72
@@ -1,9 +1,9 @@
-%global DATE 20090916
-%global SVNREV 151746
+%global DATE 20090918
+%global SVNREV 151835
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 14
+%global gcc_release 15
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -162,7 +162,7 @@ Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
 Patch20: gcc44-powerpc-libgcc_s_so.patch
 Patch21: gcc44-pr41175.patch
-Patch22: gcc44-rh518303.patch
+Patch22: gcc44-ppc64-aixdesc.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -471,7 +471,7 @@ which are required to compile with the G
 %patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
 %patch20 -p0 -b .powerpc-libgcc_s_so~
 %patch21 -p0 -b .pr41175~
-%patch22 -p0 -b .rh518303~
+%patch22 -p0 -b .ppc64-aixdesc~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1827,6 +1827,11 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 18 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-15
+- for now disable out of line gpr/fpr saving on ppc with -m64 -Os -mcall-aixdesc
+- fix DW_AT_decl_{file,location} for DW_TAG_structure_type for C structs
+  with forward declarations (#523810)
+
 * Wed Sep 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-14
 - update from gcc-4_4-branch
   - PRs fortran/39876, tree-optimization/41101


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- sources	16 Sep 2009 13:27:06 -0000	1.296
+++ sources	18 Sep 2009 08:28:26 -0000	1.297
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-921813722475a64597078d02577eda9c  gcc-4.4.1-20090916.tar.bz2
+d80d46cdb567914d34408afcd3c4d5af  gcc-4.4.1-20090918.tar.bz2


--- gcc44-rh518303.patch DELETED ---



From stefansf at fedoraproject.org  Fri Sep 18 08:28:50 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Fri, 18 Sep 2009 08:28:50 +0000 (UTC)
Subject: rpms/pyicq-t/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 config.patch, 1.2, 1.3 pyicq-t.init, 1.2, 1.3 pyicq-t.spec,
	1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20090918082850.C440C11C01EA@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/pyicq-t/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20824/devel

Modified Files:
	.cvsignore config.patch pyicq-t.init pyicq-t.spec sources 
Added Files:
	import.log 
Log Message:
- Daemon starts as user pyicqt and not as root
- New upstream release
- Several fixes for the init script to be more compliant with the guidelines




--- NEW FILE import.log ---
pyicq-t-0_8_1_5-5_fc11:HEAD:pyicq-t-0.8.1.5-5.fc11.src.rpm:1253262301


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	15 Jun 2009 07:43:37 -0000	1.7
+++ .cvsignore	18 Sep 2009 08:28:50 -0000	1.8
@@ -1 +1 @@
-pyicqt-0.8.1.3.tar.gz
+pyicqt-0.8.1.5.tar.gz

config.patch:
 config_example.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- config.patch	11 Jul 2008 00:18:22 -0000	1.2
+++ config.patch	18 Sep 2009 08:28:50 -0000	1.3
@@ -1,5 +1,5 @@
---- config_example.xml.orig	2006-07-26 09:10:46.000000000 -0500
-+++ config_example.xml	2006-07-26 09:13:02.000000000 -0500
+--- config_example.xml	2009-09-15 09:02:36.000000000 -0500
++++ config_example.xml	2009-09-15 09:03:02.000000000 -0500
 @@ -7,11 +7,11 @@
  
  	<!-- The location of the spool directory.. if relative, relative to -->
@@ -10,7 +10,7 @@
  	<!-- The location of the PID file.. if relative, relative to this dir. -->
  	<!-- Comment out if you do not want a pid file -->
 -	<pid>PyICQt.pid</pid>
-+	<pid>/var/run/pyicq-t.pid</pid>
++	<pid>/var/run/pyicq-t/pyicq-t.pid</pid>
  
  	<!-- The IP address of the main Jabberd server -->
  	<mainServer>127.0.0.1</mainServer>


Index: pyicq-t.init
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/pyicq-t.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pyicq-t.init	31 Oct 2006 21:39:22 -0000	1.2
+++ pyicq-t.init	18 Sep 2009 08:28:50 -0000	1.3
@@ -1,58 +1,96 @@
 #!/bin/bash
-# pyicq-t
 #
-# chkconfig: - 45 65
-# description: pyicq-t
-# processname: pyicq-t
-# pidfile: /var/run/pyicq-t.pid
+# PyICQt    Start and stop pyicq-t.
+
+# chkconfig: - 99 01
+# description: PyICQt is an ICQ transport for Jabber/XMPP.
+# config: /etc/pyicq-t/config.xml
+# pidfile: /var/run/pyicq-t/pyicq-t.pid
+# lockfile: /var/lock/subsys/pyicq-t
 
 . /etc/rc.d/init.d/functions
 
+prog="PyICQt"
+exec="/usr/share/pyicq-t/PyICQt.py"
+config="/etc/pyicq-t/config.xml"
+pidfile="/var/run/pyicq-t/pyicq-t.pid"
+lockfile="/var/lock/subsys/pyicq-t"
+
 start() {
-        echo -n $"Starting ICQ transport: "
-	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
-        echo
-        return $RETVAL
+	[ -x $exec ] || exit 5
+	[ -f $config ] || exit 6
+	echo -n $"Starting $prog: "
+	daemon --user=pyicqt --pidfile=$pidfile $exec \
+				--background \
+				--config=${config} \
+				--log=/var/log/pyicq-t.log
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-        # Stop daemons.
-        echo -n "Shutting down ICQ transport: "
-	killproc pyicq-t
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
-        echo
-        return $RETVAL
+	echo -n $"Shutting down $prog: "
+	killproc -p $pidfile
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
 }
 
 restart() {
-        stop
-        start
+	stop
+	sleep 1
+	start
+}
+
+reload() {
+	echo -n $"Reloading $prog: "
+	killproc -p $pidfile $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+force_reload() {
+	restart
+}
+
+rh_status() {
+	status -p $pidfile $prog
+}
+
+rh_status_q() {
+	rh_status >/dev/null 2>&1
 }
 
-# See how we were called.
 case "$1" in
   start)
-        start
-        ;;
+	start
+	;;
   stop)
-        stop
-        ;;
+	stop
+	;;
   restart)
-        restart
-        ;;
-  condrestart)
-        [ -f /var/lock/subsys/pyicq-t ] && restart || :
-        ;;
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
   status)
-	status pyicq-t
-	RETVAL=$?
+  	rh_status
 	;;
   *)
-        echo "Usage: pyicq-t {start|stop|restart|reload|condrestart|status}"
-        RETVAL=1
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+	exit 2
 esac
 
-exit $RETVAL
+exit $?


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/pyicq-t.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- pyicq-t.spec	26 Jul 2009 19:52:18 -0000	1.15
+++ pyicq-t.spec	18 Sep 2009 08:28:50 -0000	1.16
@@ -1,14 +1,14 @@
 %{!?python_standard_lib: %define python_standard_lib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(standard_lib=1)")}
 
 Name:           pyicq-t
-Version:        0.8.1.3
-Release:        2%{?dist}
+Version:        0.8.1.5
+Release:        5%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/pyicqt/
-Source0:	http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
+Source0:        http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -16,12 +16,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:	python-twisted-core
+Requires:       python-twisted-core
 Requires:       python-twisted-web
-Requires:	python-twisted-words
+Requires:       python-twisted-words
 Requires:       python-imaging
 Requires:       pyOpenSSL
 
+Requires(pre): shadow-utils
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -55,24 +58,32 @@ MySQL backend for ICQ transport
 
 %install
 rm -rf %{buildroot}
+chmod 644 src/chardet_utf/*.py
+chmod 644 tools/managessi.py
+chmod 644 tools/migrate.py
+
 mkdir -p %{buildroot}/etc/pyicq-t
 mkdir -p %{buildroot}%{_datadir}/pyicq-t
+mkdir -p %{buildroot}%{_localstatedir}/run/pyicq-t
 mkdir -p %{buildroot}/var/spool/pyicq-t
 mkdir -p %{buildroot}%{_initrddir}
 
 cp %{S:1} %{buildroot}%{_initrddir}/pyicq-t
-chmod a+x %{buildroot}%{_initrddir}/pyicq-t
 
-touch %{buildroot}/etc/pyicq-t/config.xml
+cp config_example.xml %{buildroot}/etc/pyicq-t/config.xml
 
 cp PyICQt.py* %{buildroot}%{_datadir}/pyicq-t
-chmod a+x %{buildroot}%{_datadir}/pyicq-t/PyICQt.py
 cp -r data %{buildroot}%{_datadir}/pyicq-t
 cp -r src %{buildroot}%{_datadir}/pyicq-t
- 
+
 %clean
 rm -rf %{buildroot}
 
+%pre
+/usr/sbin/groupadd -f -r pyicqt
+/usr/sbin/useradd -c "PyICQt" -g pyicqt \
+        -s /sbin/nologin -r -d /var/spool/pyicq-t pyicqt 2> /dev/null || :
+
 %post
 /sbin/chkconfig --add pyicq-t
 
@@ -91,15 +102,22 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog config_example.xml COPYING INSTALL NEWS README tools/managessi.py tools/migrate.py
 
-%{_initrddir}/pyicq-t
+%attr(0755,root,root) %{_initrddir}/pyicq-t
 
-%dir %{_sysconfdir}/pyicq-t
-%ghost %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
+%attr(0700,pyicqt,pyicqt) %dir %{_sysconfdir}/pyicq-t
+%attr(0600,pyicqt,pyicqt) %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
 
 %exclude %{_datadir}/pyicq-t/src/xdb/mysql.py*
-%{_datadir}/pyicq-t
+%dir %{_datadir}/pyicq-t
+%{_datadir}/pyicq-t/data
+%attr(0755,root,root) %{_datadir}/pyicq-t/PyICQt.py
+%{_datadir}/pyicq-t/PyICQt.pyc
+%{_datadir}/pyicq-t/PyICQt.pyo
+%{_datadir}/pyicq-t/src
 
-%dir %{_localstatedir}/spool/pyicq-t
+%attr(0700,pyicqt,pyicqt) %dir %{_localstatedir}/spool/pyicq-t
+
+%attr(0755,pyicqt,pyicqt) %dir %{_localstatedir}/run/pyicq-t
 
 %files mysql
 %defattr(-,root,root,-)
@@ -108,6 +126,34 @@ fi
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Tue Sep 15 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-5
+- Fixed inclusion of /usr/share/pyicq-t
+- Create a default config file, removed ghost entry
+- Fixed init script, status didn't show the application name
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-4
+- Make init script more compatible, e.g. "exit 2" if invalid arguments supplied,
+  killproc needs prog name otherwise the signal won't be used and a couple of
+  other minor fixes.
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-3
+- Added try-restart, reload and force-reload to the init script
+- Fixed permissions
+- Fixed typo in config.patch
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-2
+- Some whitespace fixes
+- Added shadow-utils as a requirement
+- Removed empty config file creation and changed it to copy an example config file
+
+* Fri Sep 11 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-1
+- New upstream release.
+- Changed init script to run pyicq-t as non root user and changed permissions of the config
+  file because it contains a cleartext password.
+- Changed start/stop time of the init script to fix race condition with ejabberd.
+- Changed init script to call "PyICQt.py" directly and not via
+  "python PyICQt.py" this makes it easier to write a SELinux policy for.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 Jun 2009 07:43:37 -0000	1.7
+++ sources	18 Sep 2009 08:28:50 -0000	1.8
@@ -1 +1 @@
-0a94e1aaa3079b68a3f180705f961836  pyicqt-0.8.1.3.tar.gz
+d1c544f82ed416bbe987a5e419820fa8  pyicqt-0.8.1.5.tar.gz



From pnemade at fedoraproject.org  Fri Sep 18 08:44:14 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Fri, 18 Sep 2009 08:44:14 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.118,1.119
Message-ID: <20090918084414.5352B11C01EA@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31654

Modified Files:
	comps-f12.xml.in 
Log Message:
- Few Indic package updates



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- comps-f12.xml.in	15 Sep 2009 08:38:14 -0000	1.118
+++ comps-f12.xml.in	18 Sep 2009 08:44:13 -0000	1.119
@@ -137,7 +137,7 @@
     <uservisible>true</uservisible>
     <langonly>as</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
+      <packagereq type="mandatory">lohit-assamese-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
@@ -1810,11 +1810,13 @@
       <packagereq type="default">liberation-sans-fonts</packagereq>
       <packagereq type="default">liberation-serif-fonts</packagereq>
       <packagereq type="default">lklug-fonts</packagereq>
+      <packagereq type="default">lohit-assamese-fonts</packagereq>
       <packagereq type="default">lohit-bengali-fonts</packagereq>
       <packagereq type="default">lohit-gujarati-fonts</packagereq>
       <packagereq type="default">lohit-hindi-fonts</packagereq>
       <packagereq type="default">lohit-kannada-fonts</packagereq>
       <packagereq type="default">lohit-maithili-fonts</packagereq>
+      <packagereq type="default">lohit-marathi-fonts</packagereq>
       <packagereq type="default">lohit-oriya-fonts</packagereq>
       <packagereq type="default">lohit-punjabi-fonts</packagereq>
       <packagereq type="default">lohit-tamil-fonts</packagereq>
@@ -3530,6 +3532,7 @@
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-kn</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-kn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
@@ -3548,8 +3551,7 @@
       <packagereq type="mandatory">m17n-contrib-kashmiri</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">m17n-contrib-hindi</packagereq>
-      <packagereq type="default">m17n-db-hindi</packagereq>
+      <packagereq type="default">m17n-contrib-kashmiri</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3754,8 +3756,6 @@
       <packagereq type="mandatory">lohit-konkani-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">m17n-contrib-hindi</packagereq>
-      <packagereq type="default">m17n-db-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4734,6 +4734,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Punjabi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pa_IN</packagereq>
       <packagereq type="default">iok</packagereq>
+      <packagereq type="default">saab-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4826,6 +4827,7 @@
     <packagelist>
       <packagereq type="mandatory">m17n-db-sanskrit</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4892,6 +4894,7 @@
     <packagelist>
       <packagereq type="mandatory">lohit-sindhi-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sindhi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -5521,7 +5524,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ta_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-tamil-fonts</packagereq>
-      <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
+      <packagereq type="default">serafettin-cartoon-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5541,8 +5544,8 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="optional">pothana2000-fonts</packagereq>
-      <packagereq type="optional">vemana2000-fonts</packagereq>
+      <packagereq type="default">pothana2000-fonts</packagereq>
+      <packagereq type="default">vemana2000-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5768,6 +5771,7 @@
       <packagereq type="mandatory">paktype-tehreer-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ur</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">nafees-web-naskh-fonts</packagereq>



From mschwendt at fedoraproject.org  Fri Sep 18 08:47:10 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 18 Sep 2009 08:47:10 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.46,1.47
Message-ID: <20090918084710.CB3FF11C01EA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv380

Modified Files:
	taglib.spec 
Log Message:
tarball available in official location


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- taglib.spec	17 Sep 2009 12:44:55 -0000	1.46
+++ taglib.spec	18 Sep 2009 08:47:09 -0000	1.47
@@ -18,9 +18,7 @@ Summary:    Audio Meta-Data Library
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-# the temporary url from the 1.6 announcement
-Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
-#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh



From thomasj at fedoraproject.org  Fri Sep 18 08:52:48 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Fri, 18 Sep 2009 08:52:48 +0000 (UTC)
Subject: rpms/skrooge/devel import.log, NONE, 1.1 skrooge.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918085248.809E211C01EA@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32673/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log skrooge.spec 
Log Message:
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0




--- NEW FILE import.log ---
skrooge-0_5_1-0_3_beta_fc10:HEAD:skrooge-0.5.1-0.3.beta.fc10.src.rpm:1253263402


--- NEW FILE skrooge.spec ---
Name:           skrooge
Version:        0.5.1
Release:        0.3.beta%{?dist}
Summary:        Personal finances manager

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://extragear.kde.org/apps/skrooge/
Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  qca2-devel
BuildRequires:  libofx-devel
BuildRequires:  sqlite-devel
BuildRequires:  kdelibs4-devel
BuildRequires:  gettext

Requires:       %{name}-libs = %{version}-%{release}

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description   
Skrooge is a personal finances manager, 
aiming at being simple and intuitive. 
It allows you to keep track of your expenses and incomes, 
categorize them, and build reports of them.

%package libs
Summary:        Skrooge libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description libs
Skrooge libraries

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install -C %{_target_platform} DESTDIR=%{buildroot}


## unpackaged devel files
rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbasegui.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankmodeler.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbasegui.so

%clean
rm -rf %{buildroot}

%check
for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
    desktop-file-validate $i ; 
done
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop

%post libs -p /sbin/ldconfig

%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun libs -p /sbin/ldconfig

%postun
if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO 
%{_kde4_bindir}/skrooge
%{_kde4_datadir}/applications/kde4/skrooge.desktop
%{_kde4_datadir}/config.kcfg/*.kcfg
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
%{_kde4_appsdir}/skrooge/images/*/*
%{_kde4_appsdir}/skrooge/resources/*
%{_kde4_appsdir}/skrooge/theme/default.css
%{_kde4_appsdir}/skrooge_*/*
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
%{_kde4_datadir}/mime/packages/x-skg.xml
%{_kde4_appsdir}/skrooge/images/splash.png
%{_kde4_appsdir}/skrooge/skrooge.notifyrc
%{_kde4_appsdir}/skrooge/skrooge.rc

%files libs
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO
%{_kde4_libdir}/kde4/plugins/designer/*.so*
%{_kde4_libdir}/kde4/*.so
%{_kde4_libdir}/*.so*

%changelog
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:42:39 -0000	1.1
+++ .cvsignore	18 Sep 2009 08:52:48 -0000	1.2
@@ -0,0 +1 @@
+skrooge-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:42:39 -0000	1.1
+++ sources	18 Sep 2009 08:52:48 -0000	1.2
@@ -0,0 +1 @@
+23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz



From behdad at fedoraproject.org  Fri Sep 18 08:53:25 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 18 Sep 2009 08:53:25 +0000 (UTC)
Subject: rpms/vte/devel sources,1.87,1.88 vte.spec,1.160,1.161
Message-ID: <20090918085325.7371211C01EA@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3182

Modified Files:
	sources vte.spec 
Log Message:
2nd try



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	18 Sep 2009 07:43:41 -0000	1.87
+++ sources	18 Sep 2009 08:53:25 -0000	1.88
@@ -1 +1 @@
-e6eabe5b9ac08513891301c247ca3df3  vte-0.21.7.tar.bz2
+cbdfaf486019a363f5324c1bb0e83738  vte-0.21.7.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- vte.spec	18 Sep 2009 07:43:41 -0000	1.160
+++ vte.spec	18 Sep 2009 08:53:25 -0000	1.161
@@ -4,7 +4,7 @@
 
 Name: vte
 Version: 0.21.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Sep 18 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.7-2
+- Update to 0.21.7, second try
+
 * Fri Sep 18 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.7-1
 - Update to 0.21.7
 



From stefansf at fedoraproject.org  Fri Sep 18 09:06:28 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Fri, 18 Sep 2009 09:06:28 +0000 (UTC)
Subject: rpms/pyicq-t/EL-5 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 config.patch, 1.1, 1.2 pyicq-t.init, 1.2, 1.3 pyicq-t.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090918090629.23ADC11C01EA@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/pyicq-t/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7811/EL-5

Modified Files:
	.cvsignore config.patch pyicq-t.init pyicq-t.spec sources 
Added Files:
	import.log 
Log Message:
- Merge from Fedora devel
- New upstream release
- Changed init script to run pyicq-t as non root user and changed permissions of the config
  file because it contains a cleartext password.
- Changed start/stop time of the init script to fix race condition with ejabberd.
- Changed init script to call "PyICQt.py" directly and not via
  "python PyICQt.py" this makes it easier to write a SELinux policy for.
- Some whitespace fixes
- Added shadow-utils as a requirement
- Removed empty config file creation and changed it to copy an example config file
- Added try-restart, reload and force-reload to the init script
- Fixed permissions
- Fixed typo in config.patch
- Make init script more compatible, e.g. "exit 2" if invalid arguments supplied,
  killproc needs prog name otherwise the signal won't be used and a couple of
  other minor fixes.




--- NEW FILE import.log ---
pyicq-t-0_8_1_5-1_fc11:EL-5:pyicq-t-0.8.1.5-1.fc11.src.rpm:1253264670


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Jun 2007 13:32:15 -0000	1.4
+++ .cvsignore	18 Sep 2009 09:06:22 -0000	1.5
@@ -1 +1 @@
-pyicq-t-0.8a.tar.gz
+pyicqt-0.8.1.5.tar.gz

config.patch:
 config_example.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/EL-5/config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- config.patch	5 Aug 2006 23:42:07 -0000	1.1
+++ config.patch	18 Sep 2009 09:06:22 -0000	1.2
@@ -1,16 +1,16 @@
---- config_example.xml.orig	2006-07-26 09:10:46.000000000 -0500
-+++ config_example.xml	2006-07-26 09:13:02.000000000 -0500
+--- config_example.xml	2009-09-15 09:02:36.000000000 -0500
++++ config_example.xml	2009-09-15 09:03:02.000000000 -0500
 @@ -7,11 +7,11 @@
  
  	<!-- The location of the spool directory.. if relative, relative to -->
  	<!-- this directory.  Do not include the jid of the transport. -->
 -	<spooldir>.</spooldir>
-+	<spooldir>/var/spool/pyicq-tt</spooldir>
++	<spooldir>/var/spool/pyicq-t</spooldir>
  
  	<!-- The location of the PID file.. if relative, relative to this dir. -->
  	<!-- Comment out if you do not want a pid file -->
 -	<pid>PyICQt.pid</pid>
-+	<pid>/var/run/pyicq-t.pid</pid>
++	<pid>/var/run/pyicq-t/pyicq-t.pid</pid>
  
  	<!-- The IP address of the main Jabberd server -->
  	<mainServer>127.0.0.1</mainServer>


Index: pyicq-t.init
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/EL-5/pyicq-t.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pyicq-t.init	31 Oct 2006 21:42:29 -0000	1.2
+++ pyicq-t.init	18 Sep 2009 09:06:22 -0000	1.3
@@ -1,58 +1,96 @@
 #!/bin/bash
-# pyicq-t
 #
-# chkconfig: - 45 65
-# description: pyicq-t
-# processname: pyicq-t
-# pidfile: /var/run/pyicq-t.pid
+# PyICQt    Start and stop pyicq-t.
+
+# chkconfig: - 99 01
+# description: PyICQt is an ICQ transport for Jabber/XMPP.
+# config: /etc/pyicq-t/config.xml
+# pidfile: /var/run/pyicq-t/pyicq-t.pid
+# lockfile: /var/lock/subsys/pyicq-t
 
 . /etc/rc.d/init.d/functions
 
+prog="PyICQt"
+exec="/usr/share/pyicq-t/PyICQt.py"
+config="/etc/pyicq-t/config.xml"
+pidfile="/var/run/pyicq-t/pyicq-t.pid"
+lockfile="/var/lock/subsys/pyicq-t"
+
 start() {
-        echo -n $"Starting ICQ transport: "
-	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
-        echo
-        return $RETVAL
+	[ -x $exec ] || exit 5
+	[ -f $config ] || exit 6
+	echo -n $"Starting $prog: "
+	daemon --user=pyicqt --pidfile=$pidfile $exec \
+				--background \
+				--config=${config} \
+				--log=/var/log/pyicq-t.log
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-        # Stop daemons.
-        echo -n "Shutting down ICQ transport: "
-	killproc pyicq-t
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
-        echo
-        return $RETVAL
+	echo -n $"Shutting down $prog: "
+	killproc -p $pidfile
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
 }
 
 restart() {
-        stop
-        start
+	stop
+	sleep 1
+	start
+}
+
+reload() {
+	echo -n $"Reloading $prog: "
+	killproc -p $pidfile $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+force_reload() {
+	restart
+}
+
+rh_status() {
+	status -p $pidfile $prog
+}
+
+rh_status_q() {
+	rh_status >/dev/null 2>&1
 }
 
-# See how we were called.
 case "$1" in
   start)
-        start
-        ;;
+	start
+	;;
   stop)
-        stop
-        ;;
+	stop
+	;;
   restart)
-        restart
-        ;;
-  condrestart)
-        [ -f /var/lock/subsys/pyicq-t ] && restart || :
-        ;;
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
   status)
-	status pyicq-t
-	RETVAL=$?
+  	rh_status
 	;;
   *)
-        echo "Usage: pyicq-t {start|stop|restart|reload|condrestart|status}"
-        RETVAL=1
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+	exit 2
 esac
 
-exit $RETVAL
+exit $?


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/EL-5/pyicq-t.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pyicq-t.spec	27 May 2009 23:35:07 -0000	1.6
+++ pyicq-t.spec	18 Sep 2009 09:06:22 -0000	1.7
@@ -1,16 +1,14 @@
 %{!?python_standard_lib: %define python_standard_lib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(standard_lib=1)")}
 
-%define subver a
-
 Name:           pyicq-t
-Version:        0.8
-Release:        5%{?subver:.%{subver}}%{?dist}
+Version:        0.8.1.5
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
-License:        GPL
-URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}%{?subver:%{subver}}.tar.gz
+License:        GPLv2+
+URL:            http://code.google.com/p/pyicqt/
+Source0:        http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -18,10 +16,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python-twisted
+Requires:       python-twisted-core
+Requires:       python-twisted-web
+Requires:       python-twisted-words
 Requires:       python-imaging
 Requires:       pyOpenSSL
 
+Requires(pre): shadow-utils
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -46,7 +49,7 @@ Requires: pyicq-t = %{version}-%{release
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n %{name}-%{version}%{?subver:%{subver}}
+%setup -q -n pyicqt-%{version}
 %patch0 -p0
 
 %build
@@ -55,24 +58,32 @@ MySQL backend for ICQ transport
 
 %install
 rm -rf %{buildroot}
+chmod 644 src/chardet_utf/*.py
+chmod 644 tools/managessi.py
+chmod 644 tools/migrate.py
+
 mkdir -p %{buildroot}/etc/pyicq-t
 mkdir -p %{buildroot}%{_datadir}/pyicq-t
+mkdir -p %{buildroot}%{_localstatedir}/run/pyicq-t
 mkdir -p %{buildroot}/var/spool/pyicq-t
 mkdir -p %{buildroot}%{_initrddir}
 
 cp %{S:1} %{buildroot}%{_initrddir}/pyicq-t
-chmod a+x %{buildroot}%{_initrddir}/pyicq-t
 
-touch %{buildroot}/etc/pyicq-t/config.xml
+cp config_example.xml %{buildroot}/etc/pyicq-t/config.xml
 
 cp PyICQt.py* %{buildroot}%{_datadir}/pyicq-t
-chmod a+x %{buildroot}%{_datadir}/pyicq-t/PyICQt.py
 cp -r data %{buildroot}%{_datadir}/pyicq-t
 cp -r src %{buildroot}%{_datadir}/pyicq-t
- 
+
 %clean
 rm -rf %{buildroot}
 
+%pre
+/usr/sbin/groupadd -f -r pyicqt
+/usr/sbin/useradd -c "PyICQt" -g pyicqt \
+        -s /sbin/nologin -r -d /var/spool/pyicq-t pyicqt 2> /dev/null || :
+
 %post
 /sbin/chkconfig --add pyicq-t
 
@@ -91,15 +102,22 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog config_example.xml COPYING INSTALL NEWS README tools/managessi.py tools/migrate.py
 
-%{_initrddir}/pyicq-t
+%attr(0755,root,root) %{_initrddir}/pyicq-t
 
-%dir %{_sysconfdir}/pyicq-t
-%ghost %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
+%attr(0700,pyicqt,pyicqt) %dir %{_sysconfdir}/pyicq-t
+%attr(0600,pyicqt,pyicqt) %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
 
 %exclude %{_datadir}/pyicq-t/src/xdb/mysql.py*
-%{_datadir}/pyicq-t
+%dir %{_datadir}/pyicq-t
+%{_datadir}/pyicq-t/data
+%attr(0755,root,root) %{_datadir}/pyicq-t/PyICQt.py
+%{_datadir}/pyicq-t/PyICQt.pyc
+%{_datadir}/pyicq-t/PyICQt.pyo
+%{_datadir}/pyicq-t/src
+
+%attr(0700,pyicqt,pyicqt) %dir %{_localstatedir}/spool/pyicq-t
 
-%dir %{_localstatedir}/spool/pyicq-t
+%attr(0755,pyicqt,pyicqt) %dir %{_localstatedir}/run/pyicq-t
 
 %files mysql
 %defattr(-,root,root,-)
@@ -108,6 +126,24 @@ fi
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Fri Sep 18 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-1
+- Merge from Fedora devel
+- New upstream release
+- Changed init script to run pyicq-t as non root user and changed permissions of the config
+  file because it contains a cleartext password.
+- Changed start/stop time of the init script to fix race condition with ejabberd.
+- Changed init script to call "PyICQt.py" directly and not via
+  "python PyICQt.py" this makes it easier to write a SELinux policy for.
+- Some whitespace fixes
+- Added shadow-utils as a requirement
+- Removed empty config file creation and changed it to copy an example config file
+- Added try-restart, reload and force-reload to the init script
+- Fixed permissions
+- Fixed typo in config.patch
+- Make init script more compatible, e.g. "exit 2" if invalid arguments supplied,
+  killproc needs prog name otherwise the signal won't be used and a couple of
+  other minor fixes.
+
 * Thu May 28 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.8-5.a
 - Initial build for EPEL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Jun 2007 13:32:15 -0000	1.4
+++ sources	18 Sep 2009 09:06:22 -0000	1.5
@@ -1 +1 @@
-eb44605d5f952759e3cba19815d367d2  pyicq-t-0.8a.tar.gz
+d1c544f82ed416bbe987a5e419820fa8  pyicqt-0.8.1.5.tar.gz



From thomasj at fedoraproject.org  Fri Sep 18 09:10:18 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Fri, 18 Sep 2009 09:10:18 +0000 (UTC)
Subject: rpms/skrooge/F-12 import.log, NONE, 1.1 skrooge.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918091018.5A96311C0334@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9571/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log skrooge.spec 
Log Message:

* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0



--- NEW FILE import.log ---
skrooge-0_5_1-0_3_beta_fc10:F-12:skrooge-0.5.1-0.3.beta.fc10.src.rpm:1253264948


--- NEW FILE skrooge.spec ---
Name:           skrooge
Version:        0.5.1
Release:        0.3.beta%{?dist}
Summary:        Personal finances manager

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://extragear.kde.org/apps/skrooge/
Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  qca2-devel
BuildRequires:  libofx-devel
BuildRequires:  sqlite-devel
BuildRequires:  kdelibs4-devel
BuildRequires:  gettext

Requires:       %{name}-libs = %{version}-%{release}

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description   
Skrooge is a personal finances manager, 
aiming at being simple and intuitive. 
It allows you to keep track of your expenses and incomes, 
categorize them, and build reports of them.

%package libs
Summary:        Skrooge libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description libs
Skrooge libraries

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install -C %{_target_platform} DESTDIR=%{buildroot}


## unpackaged devel files
rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbasegui.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankmodeler.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbasegui.so

%clean
rm -rf %{buildroot}

%check
for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
    desktop-file-validate $i ; 
done
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop

%post libs -p /sbin/ldconfig

%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun libs -p /sbin/ldconfig

%postun
if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO 
%{_kde4_bindir}/skrooge
%{_kde4_datadir}/applications/kde4/skrooge.desktop
%{_kde4_datadir}/config.kcfg/*.kcfg
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
%{_kde4_appsdir}/skrooge/images/*/*
%{_kde4_appsdir}/skrooge/resources/*
%{_kde4_appsdir}/skrooge/theme/default.css
%{_kde4_appsdir}/skrooge_*/*
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
%{_kde4_datadir}/mime/packages/x-skg.xml
%{_kde4_appsdir}/skrooge/images/splash.png
%{_kde4_appsdir}/skrooge/skrooge.notifyrc
%{_kde4_appsdir}/skrooge/skrooge.rc

%files libs
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO
%{_kde4_libdir}/kde4/plugins/designer/*.so*
%{_kde4_libdir}/kde4/*.so
%{_kde4_libdir}/*.so*

%changelog
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:42:39 -0000	1.1
+++ .cvsignore	18 Sep 2009 09:10:17 -0000	1.2
@@ -0,0 +1 @@
+skrooge-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:42:39 -0000	1.1
+++ sources	18 Sep 2009 09:10:18 -0000	1.2
@@ -0,0 +1 @@
+23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz



From caolanm at fedoraproject.org  Fri Sep 18 09:20:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 18 Sep 2009 09:20:51 +0000 (UTC)
Subject: rpms/mythes-hu/devel .cvsignore, 1.1, 1.2 mythes-hu.spec, 1.2,
	1.3 sources, 1.1, 1.2 hu_dicts.oxt, 1.1, NONE
Message-ID: <20090918092051.3019511C0338@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-hu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14507

Modified Files:
	.cvsignore mythes-hu.spec sources 
Removed Files:
	hu_dicts.oxt 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-hu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Jul 2009 05:41:35 -0000	1.1
+++ .cvsignore	18 Sep 2009 09:20:48 -0000	1.2
@@ -0,0 +1 @@
+hu_dicts.oxt


Index: mythes-hu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-hu/devel/mythes-hu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mythes-hu.spec	25 Jul 2009 15:37:35 -0000	1.2
+++ mythes-hu.spec	18 Sep 2009 09:20:49 -0000	1.3
@@ -1,9 +1,9 @@
 Name: mythes-hu
 Summary: Hungarian thesaurus
-%define upstreamid 20090203
+%define upstreamid 20090918
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
-Source: http://extensions.services.openoffice.org/files/1283/4/hu_dicts.oxt
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/files/1283/5/hu_dicts.oxt
 Group: Applications/Text
 URL: http://extensions.services.openoffice.org/project/hu_dicts
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Fri Sep 18 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090918-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090203-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-hu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Jul 2009 05:41:35 -0000	1.1
+++ sources	18 Sep 2009 09:20:49 -0000	1.2
@@ -0,0 +1 @@
+6c16edce23a2cabceaf91789d2791355  hu_dicts.oxt


--- hu_dicts.oxt DELETED ---



From pghmcfc at fedoraproject.org  Fri Sep 18 09:31:05 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 18 Sep 2009 09:31:05 +0000 (UTC)
Subject: rpms/perl-File-Comments/devel perl-File-Comments.spec,1.3,1.4
Message-ID: <20090918093105.E3E8A11C01EA@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-File-Comments/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19010

Modified Files:
	perl-File-Comments.spec 
Log Message:
Add runtime dependencies not determined automatically by RPM


Index: perl-File-Comments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Comments/devel/perl-File-Comments.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-File-Comments.spec	26 Jul 2009 05:58:19 -0000	1.3
+++ perl-File-Comments.spec	18 Sep 2009 09:31:01 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Recognizes file formats and extracts format-specific comments
 Name:		perl-File-Comments
 Version:	0.07
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/File-Comments/
@@ -20,6 +20,11 @@ BuildRequires:	perl(PPI) >= 1.115
 BuildRequires:	perl(Sysadm::Install) >= 0.11
 # For test suite
 BuildRequires:	perl(Test::More)
+# Runtime requirements not automatically picked up
+Requires:	perl(HTML::TreeBuilder)
+Requires:	perl(Module::Pluggable) >= 2.4
+Requires:	perl(Pod::Parser) >= 1.14
+Requires:	perl(PPI) >= 1.115
 
 %description
 File::Comments guesses the type of a given file, determines the format
@@ -37,7 +42,7 @@ JavaScript, Python and PHP.
 # introduce any unwanted dependencies (nor any dependencies that
 # are not satisfied by packages that are already required)
 
-# Remove dubious provide
+# Remove provide for local package not in regular search path
 %global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(PodExtractor)'"
 %define __perl_provides %{provfilt}
 
@@ -52,7 +57,7 @@ JavaScript, Python and PHP.
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -75,10 +80,13 @@ JavaScript, Python and PHP.
 %{_mandir}/man3/File::Comments::Plugin::Shell.3pm*
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
+* Fri Sep 18 2009 Paul Howarth <paul at city-fan.org> 0.07-4
+- Add runtime dependencies not determined automatically by RPM
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-2
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Oct  9 2008 Paul Howarth <paul at city-fan.org> 0.07-1



From thomasj at fedoraproject.org  Fri Sep 18 09:32:43 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Fri, 18 Sep 2009 09:32:43 +0000 (UTC)
Subject: rpms/skrooge/F-11 import.log, NONE, 1.1 skrooge.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918093243.96F8211C01EA@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19566/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log skrooge.spec 
Log Message:
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0



--- NEW FILE import.log ---
skrooge-0_5_1-0_3_beta_fc10:F-11:skrooge-0.5.1-0.3.beta.fc10.src.rpm:1253266249


--- NEW FILE skrooge.spec ---
Name:           skrooge
Version:        0.5.1
Release:        0.3.beta%{?dist}
Summary:        Personal finances manager

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://extragear.kde.org/apps/skrooge/
Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  qca2-devel
BuildRequires:  libofx-devel
BuildRequires:  sqlite-devel
BuildRequires:  kdelibs4-devel
BuildRequires:  gettext

Requires:       %{name}-libs = %{version}-%{release}

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description   
Skrooge is a personal finances manager, 
aiming at being simple and intuitive. 
It allows you to keep track of your expenses and incomes, 
categorize them, and build reports of them.

%package libs
Summary:        Skrooge libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description libs
Skrooge libraries

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install -C %{_target_platform} DESTDIR=%{buildroot}


## unpackaged devel files
rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbasegui.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankmodeler.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbasegui.so

%clean
rm -rf %{buildroot}

%check
for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
    desktop-file-validate $i ; 
done
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop

%post libs -p /sbin/ldconfig

%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun libs -p /sbin/ldconfig

%postun
if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO 
%{_kde4_bindir}/skrooge
%{_kde4_datadir}/applications/kde4/skrooge.desktop
%{_kde4_datadir}/config.kcfg/*.kcfg
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
%{_kde4_appsdir}/skrooge/images/*/*
%{_kde4_appsdir}/skrooge/resources/*
%{_kde4_appsdir}/skrooge/theme/default.css
%{_kde4_appsdir}/skrooge_*/*
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
%{_kde4_datadir}/mime/packages/x-skg.xml
%{_kde4_appsdir}/skrooge/images/splash.png
%{_kde4_appsdir}/skrooge/skrooge.notifyrc
%{_kde4_appsdir}/skrooge/skrooge.rc

%files libs
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO
%{_kde4_libdir}/kde4/plugins/designer/*.so*
%{_kde4_libdir}/kde4/*.so
%{_kde4_libdir}/*.so*

%changelog
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:42:39 -0000	1.1
+++ .cvsignore	18 Sep 2009 09:32:42 -0000	1.2
@@ -0,0 +1 @@
+skrooge-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:42:39 -0000	1.1
+++ sources	18 Sep 2009 09:32:42 -0000	1.2
@@ -0,0 +1 @@
+23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz



From pghmcfc at fedoraproject.org  Fri Sep 18 09:32:48 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 18 Sep 2009 09:32:48 +0000 (UTC)
Subject: rpms/perl-Math-GMP/devel perl-Math-GMP.spec,1.17,1.18
Message-ID: <20090918093248.BC80A11C01EA@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Math-GMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20053

Modified Files:
	perl-Math-GMP.spec 
Log Message:
Update to 2.06
- Make Makefile.PL more forgiving of gmp library locations (CPAN RT#46323)
- Update link to libgmp.org in INSTALL file (CPAN RT#46324)
Use %{?perl_default_filter}
RELEASE_TESTING variable obsoletes TEST_{AUTHOR,CRITIC,SIGNATURE,SPELL}
BuildConflict Test::Critic and Test::Pod::Coverage to avoid failing test



Index: perl-Math-GMP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/perl-Math-GMP.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Math-GMP.spec	26 Jul 2009 09:12:41 -0000	1.17
+++ perl-Math-GMP.spec	18 Sep 2009 09:32:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	High speed arbitrary size integer math
 Name:		perl-Math-GMP
-Version:	2.05
-Release:	5%{?dist}
+Version:	2.06
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-GMP/
@@ -9,16 +9,24 @@ Source0:	http://search.cpan.org/CPAN/aut
 Source1:	14964AC8.asc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:	gmp-devel, perl(ExtUtils::MakeMaker), perl(Test::More), aspell-en
-BuildRequires:	perl(Module::Signature), perl(Perl::Critic), perl(Pod::Spell)
-BuildRequires:	perl(Test::Pod), perl(Test::YAML::Meta), perl(Text::SpellChecker)
-BuildRequires:	perl(File::Comments), perl(YAML)
-
-# don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
-%global __find_requires /bin/sh -c "%{__deploop R}"
+BuildRequires:	gmp-devel
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(File::Comments)
+BuildRequires:	perl(Module::Signature)
+BuildRequires:	perl(Pod::Spell)
+BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::Pod)
+BuildRequires:	perl(Test::YAML::Meta)
+BuildRequires:	perl(Text::SpellChecker)
+BuildRequires:	perl(YAML)
+BuildRequires:	aspell-en
+
+# Critic and Pod Coverage tests fail, so make sure we don't try to run them for now
+BuildConflicts:	perl(Perl::Critic)
+BuildConflicts:	perl(Test::Pod::Coverage)
+
+# Don't "provide" private Perl libs
+%{?perl_default_filter}
 
 %description
 Math::GMP was designed to be a drop-in replacement both for Math::BigInt and
@@ -44,13 +52,9 @@ cd source
 cd -
 
 %check
-# Notes:
 # Locale set to en_US for spell check tests
-# Perl::Critic tests fail - disabled for now by setting TEST_CRITIC=0
-# Pod::Coverage tests fail - disabled for now by not having BR: perl(Test::Pod::Coverage)
 %{__gpg} --import %{SOURCE1}
-LC_ALL=en_US %{__make} -C source test \
-	TEST_AUTHOR=1 TEST_CRITIC=0 TEST_SIGNATURE=1 TEST_SPELL=1 TEST_VERBOSE=1
+LC_ALL=en_US %{__make} -C source test RELEASE_TESTING=1 TEST_VERBOSE=1
 
 %install
 %{__rm} -rf %{buildroot}
@@ -58,7 +62,7 @@ cd source
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 cd -
 
@@ -73,6 +77,14 @@ cd -
 %{_mandir}/man3/Math::GMP.3pm*
 
 %changelog
+* Fri Sep 18 2009 Paul Howarth <paul at city-fan.org> 2.06-1
+- Update to 2.06
+  - Make Makefile.PL more forgiving of gmp library locations (CPAN RT#46323)
+  - Update link to libgmp.org in INSTALL file (CPAN RT#46324)
+- Use %%{?perl_default_filter}
+- RELEASE_TESTING variable obsoletes TEST_{AUTHOR,CRITIC,SIGNATURE,SPELL}
+- BuildConflict Test::Critic and Test::Pod::Coverage to avoid failing tests
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Fri Sep 18 09:33:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 18 Sep 2009 09:33:41 +0000 (UTC)
Subject: rpms/maven-plugin-bundle/devel maven-plugin-bundle.spec, 1.2,
	1.3 felix-1.0.2.pom, 1.1, NONE
Message-ID: <20090918093341.06F1911C01EA@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-bundle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20916/devel

Modified Files:
	maven-plugin-bundle.spec 
Removed Files:
	felix-1.0.2.pom 
Log Message:
Add missing Requires.


Index: maven-plugin-bundle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-bundle/devel/maven-plugin-bundle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- maven-plugin-bundle.spec	9 Sep 2009 19:10:21 -0000	1.2
+++ maven-plugin-bundle.spec	18 Sep 2009 09:33:40 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           maven-plugin-bundle
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://felix.apache.org
 Source0:        http://www.apache.org/dist/felix/maven-bundle-plugin-2.0.0-project.tar.gz
-Source1:        http://repo1.maven.org/maven2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom
 Source2:        felix-settings.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: aqute-bndlib >= 0.0.363
@@ -30,6 +29,11 @@ Requires: plexus-utils >= 1.4.5
 Requires: felix-osgi-obr
 Requires: kxml
 Requires: maven2
+Requires: maven-shared-archiver
+Requires: maven-shared-dependency-tree
+Requires: maven-wagon
+Requires: plexus-archiver
+Requires: plexus-containers-container-default
 
 BuildArch: noarch
 
@@ -49,8 +53,6 @@ API documentation for %{name}.
 %prep
 %setup -q -n maven-bundle-plugin-%{version}
 cp %{SOURCE2} settings.xml
-mkdir -p .m2/repository/JPP/maven2/default_poms
-cp %{SOURCE1} .m2/repository/JPP/maven2/default_poms/org.apache.felix-felix.pom
 
 %build
 sed -i -e \
@@ -120,6 +122,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-4
+- Add missing Requires.
+
 * Wed Sep 9 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.0-3
 - BR doxia-sitetools.
 


--- felix-1.0.2.pom DELETED ---



From pghmcfc at fedoraproject.org  Fri Sep 18 09:34:05 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 18 Sep 2009 09:34:05 +0000 (UTC)
Subject: rpms/perl-Math-GMP/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090918093405.2780211C01EA@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Math-GMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21087

Modified Files:
	.cvsignore sources 
Log Message:
Put new tarball in lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2008 12:14:01 -0000	1.3
+++ .cvsignore	18 Sep 2009 09:34:04 -0000	1.4
@@ -1 +1 @@
-Math-GMP-2.05.tar.gz
+Math-GMP-2.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Oct 2008 12:14:01 -0000	1.3
+++ sources	18 Sep 2009 09:34:05 -0000	1.4
@@ -1 +1 @@
-d719578064fb935e2f8403ba0340179a  Math-GMP-2.05.tar.gz
+0ead0cd7d7ec1076c6d5a5fbe81b91a3  Math-GMP-2.06.tar.gz



From vpv at fedoraproject.org  Fri Sep 18 09:41:54 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Fri, 18 Sep 2009 09:41:54 +0000 (UTC)
Subject: rpms/libvoikko/devel .cvsignore, 1.16, 1.17 libvoikko.spec, 1.27,
	1.28 sources, 1.16, 1.17 libvoikko-2.2-check_getcwd.patch, 1.1, NONE
Message-ID: <20090918094155.01EF511C01EA@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24669

Modified Files:
	.cvsignore libvoikko.spec sources 
Removed Files:
	libvoikko-2.2-check_getcwd.patch 
Log Message:
* Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.3.rc2
- 2.2rc2
- Remove getcwd() value check patch, accepted upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	15 Sep 2009 20:37:35 -0000	1.16
+++ .cvsignore	18 Sep 2009 09:41:52 -0000	1.17
@@ -1 +1 @@
-libvoikko-2.2rc1.tar.gz
+libvoikko-2.2rc2.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libvoikko.spec	16 Sep 2009 12:37:41 -0000	1.27
+++ libvoikko.spec	18 Sep 2009 09:41:53 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.2
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -9,9 +9,7 @@ URL:            http://voikko.sourceforg
 # The usual format of stable release URLs
 #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}rc1.tar.gz
-# Sent upstream
-Patch0:         libvoikko-2.2-check_getcwd.patch
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python glib2-devel
@@ -51,7 +49,6 @@ scripts.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -103,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.3.rc2
+- 2.2rc2
+- Remove getcwd() value check patch, accepted upstream
+
 * Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.2.rc1
 - Remove rpath which was set for the voikko-tools binaries in 64 bit
   architechtures


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	15 Sep 2009 20:37:37 -0000	1.16
+++ sources	18 Sep 2009 09:41:53 -0000	1.17
@@ -1 +1 @@
-2513a38189fbda0818b107ad72c0ab59  libvoikko-2.2rc1.tar.gz
+d60aa199cd6a112bca782728851f82b4  libvoikko-2.2rc2.tar.gz


--- libvoikko-2.2-check_getcwd.patch DELETED ---



From thomasj at fedoraproject.org  Fri Sep 18 09:56:38 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Fri, 18 Sep 2009 09:56:38 +0000 (UTC)
Subject: rpms/skrooge/F-10 import.log, NONE, 1.1 skrooge.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090918095638.AD6BF11C01EA@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29786/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log skrooge.spec 
Log Message:
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0



--- NEW FILE import.log ---
skrooge-0_5_1-0_3_beta_fc10:F-10:skrooge-0.5.1-0.3.beta.fc10.src.rpm:1253267715


--- NEW FILE skrooge.spec ---
Name:           skrooge
Version:        0.5.1
Release:        0.3.beta%{?dist}
Summary:        Personal finances manager

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://extragear.kde.org/apps/skrooge/
Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  qca2-devel
BuildRequires:  libofx-devel
BuildRequires:  sqlite-devel
BuildRequires:  kdelibs4-devel
BuildRequires:  gettext

Requires:       %{name}-libs = %{version}-%{release}

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description   
Skrooge is a personal finances manager, 
aiming at being simple and intuitive. 
It allows you to keep track of your expenses and incomes, 
categorize them, and build reports of them.

%package libs
Summary:        Skrooge libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description libs
Skrooge libraries

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install -C %{_target_platform} DESTDIR=%{buildroot}


## unpackaged devel files
rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbasegui.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbankgui.so
rm -f %{buildroot}%{_kde4_libdir}/libskgbankmodeler.so
rm -f %{buildroot}%{_kde4_libdir}/kde4/plugins/designer/libskgbasegui.so

%clean
rm -rf %{buildroot}

%check
for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
    desktop-file-validate $i ; 
done
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop

%post libs -p /sbin/ldconfig

%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun libs -p /sbin/ldconfig

%postun
if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO 
%{_kde4_bindir}/skrooge
%{_kde4_datadir}/applications/kde4/skrooge.desktop
%{_kde4_datadir}/config.kcfg/*.kcfg
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
%{_kde4_appsdir}/skrooge/images/*/*
%{_kde4_appsdir}/skrooge/resources/*
%{_kde4_appsdir}/skrooge/theme/default.css
%{_kde4_appsdir}/skrooge_*/*
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
%{_kde4_datadir}/mime/packages/x-skg.xml
%{_kde4_appsdir}/skrooge/images/splash.png
%{_kde4_appsdir}/skrooge/skrooge.notifyrc
%{_kde4_appsdir}/skrooge/skrooge.rc

%files libs
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COPYING README TODO
%{_kde4_libdir}/kde4/plugins/designer/*.so*
%{_kde4_libdir}/kde4/*.so
%{_kde4_libdir}/*.so*

%changelog
* Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
- Spec file corrections and Version correction

* Wed Sep 16 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta2
- cleaned up desktop files

* Tue Sep 15 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-beta1
- changed version to 0.5.1 beta with fixed rpmlint output

* Sun Sep 13 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-2
- Fixed the spec and rpmlintoutput debuginfo-without-source

* Fri Sep 11 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.0-1
- Initial Release 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:42:39 -0000	1.1
+++ .cvsignore	18 Sep 2009 09:56:36 -0000	1.2
@@ -0,0 +1 @@
+skrooge-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:42:39 -0000	1.1
+++ sources	18 Sep 2009 09:56:36 -0000	1.2
@@ -0,0 +1 @@
+23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz



From jzeleny at fedoraproject.org  Fri Sep 18 10:01:45 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri, 18 Sep 2009 10:01:45 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.4.16-doc-cacertdir.patch, NONE,
	1.1 .cvsignore, 1.47, 1.48 openldap-2.3.37-smbk5pwd.patch, 1.3,
	1.4 openldap-2.4.6-multilib.patch, 1.2, 1.3 openldap.spec, 1.148,
	1.149 sources, 1.49, 1.50
Message-ID: <20090918100145.CABB411C01EA@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31642

Modified Files:
	.cvsignore openldap-2.3.37-smbk5pwd.patch 
	openldap-2.4.6-multilib.patch openldap.spec sources 
Added Files:
	openldap-2.4.16-doc-cacertdir.patch 
Log Message:
Rebase to 2.4.18, minor update of documentation

openldap-2.4.16-doc-cacertdir.patch:
 ldap.conf.5 |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE openldap-2.4.16-doc-cacertdir.patch ---
--- openldap-2.4.16/doc/man/man5/ldap.conf.5.orig	2009-09-16 17:12:01.000000000 +0200
+++ openldap-2.4.16/doc/man/man5/ldap.conf.5	2009-09-16 17:15:32.000000000 +0200
@@ -305,6 +305,7 @@
 .B TLS_CACERT
 is always used before
 .B TLS_CACERTDIR.
+The specified directory must be managed with the OpenSSL c_rehash utility.
 This parameter is ignored with GNUtls.
 .TP
 .B TLS_CERT <filename>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	1 Jul 2009 12:56:24 -0000	1.47
+++ .cvsignore	18 Sep 2009 10:01:45 -0000	1.48
@@ -1,2 +1,2 @@
-openldap-2.4.16.tgz
+openldap-2.4.18.tgz
 db-4.7.25.tar.gz

openldap-2.3.37-smbk5pwd.patch:
 contrib/slapd-modules/smbk5pwd/README |    5 +++++
 servers/slapd/overlays/Makefile.in    |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

Index: openldap-2.3.37-smbk5pwd.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap-2.3.37-smbk5pwd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openldap-2.3.37-smbk5pwd.patch	1 Sep 2008 08:09:50 -0000	1.3
+++ openldap-2.3.37-smbk5pwd.patch	18 Sep 2009 10:01:45 -0000	1.4
@@ -9,9 +9,9 @@ diff -up openldap-2.4.11/contrib/slapd-m
 +this version of smbk5pwd because we do not use Heimdall.
 +***************************************************************
 +
- Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
+ This directory contains a slapd overlay, smbk5pwd, that extends the
+ PasswordModify Extended Operation to update Kerberos keys and Samba
+ password hashes for an LDAP user.
 diff -up openldap-2.4.11/servers/slapd/overlays/Makefile.in.patch8 openldap-2.4.11/servers/slapd/overlays/Makefile.in
 --- openldap-2.4.11/servers/slapd/overlays/Makefile.in.patch8	2008-02-12 00:26:48.000000000 +0100
 +++ openldap-2.4.11/servers/slapd/overlays/Makefile.in	2008-09-01 09:57:09.000000000 +0200

openldap-2.4.6-multilib.patch:
 slapd.8 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: openldap-2.4.6-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap-2.4.6-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openldap-2.4.6-multilib.patch	1 Sep 2008 08:09:50 -0000	1.2
+++ openldap-2.4.6-multilib.patch	18 Sep 2009 10:01:45 -0000	1.3
@@ -7,32 +7,23 @@ diff -up openldap-2.4.11/doc/man/man8/sl
  .SH SYNOPSIS
 -.B LIBEXECDIR/slapd 
 +.B slapd 
- .B [\-[4|6]]
- .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
- .B [\-d debug\-level]
-@@ -263,7 +263,7 @@ the LDAP databases defined in the defaul
+ [\c
+ .BR \-4 | \-6 ]
+ [\c
+@@ -312,7 +312,7 @@ on voluminous debugging which will be pr
  .LP
  .nf
  .ft tt
--	LIBEXECDIR/slapd
-+	slapd
- .ft
- .fi
- .LP
-@@ -274,7 +274,7 @@ on voluminous debugging which will be pr
- .LP
- .nf
- .ft tt
--	LIBEXECDIR/slapd -f /var/tmp/slapd.conf -d 255
+-	LIBEXECDIR/slapd \-f /var/tmp/slapd.conf \-d 255
 +	slapd -f /var/tmp/slapd.conf -d 255
  .ft
  .fi
  .LP
-@@ -282,7 +282,7 @@ To test whether the configuration file i
+@@ -320,7 +320,7 @@ To test whether the configuration file i
  .LP
  .nf
  .ft tt
--	LIBEXECDIR/slapd -Tt
+-	LIBEXECDIR/slapd \-Tt
 +	slapd -Tt
  .ft
  .fi


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- openldap.spec	16 Sep 2009 14:06:37 -0000	1.148
+++ openldap.spec	18 Sep 2009 10:01:45 -0000	1.149
@@ -3,7 +3,7 @@
 # not work with some versions of OpenLDAP.
 %define db_version 4.7.25
 %define ldbm_backend berkeley
-%define version 2.4.16
+%define version 2.4.18
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -34,7 +34,7 @@ Patch5: openldap-2.4.6-nosql.patch
 Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
-Patch11: openldap-2.4.12-options.patch
+Patch11: openldap-2.4.16-doc-cacertdir.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -140,7 +140,7 @@ pushd openldap-%{version}
 %patch6 -p1 -b .gethostbyname_r
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
-%patch11 -p1 -b .options
+%patch11 -p1 -b .cacertdir
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -606,6 +606,12 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Sep 18 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-1
+- rebase of openldap to 2.4.18
+
+* Wed Sep 16 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-7
+- updated documentation (hashing the cacert dir)
+
 * Wed Sep 16 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-6
 - updated init script to be LSB-compliant (#523434)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	1 Jul 2009 12:56:24 -0000	1.49
+++ sources	18 Sep 2009 10:01:45 -0000	1.50
@@ -1,2 +1,2 @@
-ed5b86e9d2b372d10edfe3bb59fee165  openldap-2.4.16.tgz
+fecd7a64b6d9a0eb79b817d2562956ed  openldap-2.4.18.tgz
 ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz



From pingou at fedoraproject.org  Fri Sep 18 10:04:26 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri, 18 Sep 2009 10:04:26 +0000 (UTC)
Subject: rpms/R-Biostrings/F-10 R-Biostrings.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090918100426.A9A6011C01EA@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32510/F-10

Modified Files:
	R-Biostrings.spec sources 
Log Message:
Update to 2.12.9


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-10/R-Biostrings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-Biostrings.spec	23 Aug 2009 07:49:50 -0000	1.5
+++ R-Biostrings.spec	18 Sep 2009 10:04:26 -0000	1.6
@@ -3,7 +3,7 @@
 %global Rvers     2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.8
+Version:          2.12.9
 Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Sep 18 2009 pingou <pingou at pingoured.fr> 2.12.9-1
+- Update to 2.12.9
+
 * Sun Aug 23 2009 pingou <pingou at pingoured.fr> 2.12.8-1
 - Update to 2.12.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 07:49:50 -0000	1.5
+++ sources	18 Sep 2009 10:04:26 -0000	1.6
@@ -1 +1 @@
-c259e4549febc5509f7ce4907953c992  Biostrings_2.12.8.tar.gz
+b35e417b8a46c9f3b949fa67ee338cfb  Biostrings_2.12.9.tar.gz



From pingou at fedoraproject.org  Fri Sep 18 10:04:26 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri, 18 Sep 2009 10:04:26 +0000 (UTC)
Subject: rpms/R-Biostrings/F-11 R-Biostrings.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090918100426.C58BA11C02BB@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32510/F-11

Modified Files:
	R-Biostrings.spec sources 
Log Message:
Update to 2.12.9


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/R-Biostrings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-Biostrings.spec	23 Aug 2009 07:49:51 -0000	1.5
+++ R-Biostrings.spec	18 Sep 2009 10:04:26 -0000	1.6
@@ -3,7 +3,7 @@
 %global Rvers     2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.8
+Version:          2.12.9
 Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Sep 18 2009 pingou <pingou at pingoured.fr> 2.12.9-1
+- Update to 2.12.9
+
 * Sun Aug 23 2009 pingou <pingou at pingoured.fr> 2.12.8-1
 - Update to 2.12.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 07:49:51 -0000	1.5
+++ sources	18 Sep 2009 10:04:26 -0000	1.6
@@ -1 +1 @@
-c259e4549febc5509f7ce4907953c992  Biostrings_2.12.8.tar.gz
+b35e417b8a46c9f3b949fa67ee338cfb  Biostrings_2.12.9.tar.gz



From pingou at fedoraproject.org  Fri Sep 18 10:04:27 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri, 18 Sep 2009 10:04:27 +0000 (UTC)
Subject: rpms/R-Biostrings/devel .cvsignore, 1.5, 1.6 R-Biostrings.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090918100427.349D711C01EA@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32510/devel

Modified Files:
	.cvsignore R-Biostrings.spec sources 
Log Message:
Update to 2.12.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Aug 2009 07:49:51 -0000	1.5
+++ .cvsignore	18 Sep 2009 10:04:26 -0000	1.6
@@ -1 +1 @@
-Biostrings_2.12.8.tar.gz
+Biostrings_2.12.9.tar.gz


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/R-Biostrings.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-Biostrings.spec	23 Aug 2009 07:49:51 -0000	1.6
+++ R-Biostrings.spec	18 Sep 2009 10:04:26 -0000	1.7
@@ -3,7 +3,7 @@
 %global Rvers     2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.8
+Version:          2.12.9
 Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Sep 18 2009 pingou <pingou at pingoured.fr> 2.12.9-1
+- Update to 2.12.9
+
 * Sun Aug 23 2009 pingou <pingou at pingoured.fr> 2.12.8-1
 - Update to 2.12.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 07:49:51 -0000	1.5
+++ sources	18 Sep 2009 10:04:27 -0000	1.6
@@ -1 +1 @@
-c259e4549febc5509f7ce4907953c992  Biostrings_2.12.8.tar.gz
+b35e417b8a46c9f3b949fa67ee338cfb  Biostrings_2.12.9.tar.gz



From vpv at fedoraproject.org  Fri Sep 18 10:05:04 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Fri, 18 Sep 2009 10:05:04 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel .cvsignore, 1.10,
	1.11 malaga-suomi-voikko.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20090918100504.AA47E11C01EA@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32699

Modified Files:
	.cvsignore malaga-suomi-voikko.spec sources 
Log Message:
* Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.2.rc2
- New release candidate.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Sep 2009 14:26:32 -0000	1.10
+++ .cvsignore	18 Sep 2009 10:05:04 -0000	1.11
@@ -1 +1 @@
-suomi-malaga-1.4rc1.tar.gz
+suomi-malaga-1.4rc2.tar.gz


Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- malaga-suomi-voikko.spec	15 Sep 2009 20:32:22 -0000	1.15
+++ malaga-suomi-voikko.spec	18 Sep 2009 10:05:04 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           malaga-suomi-voikko
 Version:        1.4
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc2%{?dist}
 Summary:        A description of Finnish morphology written in Malaga (Voikko edition)
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@ URL:            http://voikko.sourceforg
 # The usual format of stable release source URLs
 #Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
 # The usual format of testing release source URLs
-Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc1.tar.gz
+Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga >= 7.8 python
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.2.rc2
+- New release candidate.
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.1.rc1
 - New release candidate.
 - Don't require libmalaga anymore, libvoikko >= 2.2 uses its own malaga


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Sep 2009 14:26:33 -0000	1.10
+++ sources	18 Sep 2009 10:05:04 -0000	1.11
@@ -1 +1 @@
-cc4c075a809d5f67fe8a68e65d6c052e  suomi-malaga-1.4rc1.tar.gz
+295acf3af67a6ee5f7bde8fa336b5d0f  suomi-malaga-1.4rc2.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 18 10:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:07:38 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918100740.86B7710F884@bastion2.fedora.phx.redhat.com>

guidograzioli has set the watchbugzilla acl on yaz (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 10:07:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:07:41 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918100740.9D13710F888@bastion2.fedora.phx.redhat.com>

guidograzioli has set the watchcommits acl on yaz (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 10:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:07:42 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918100741.54B9210F895@bastion2.fedora.phx.redhat.com>

guidograzioli has set the commit acl on yaz (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From jdieter at fedoraproject.org  Fri Sep 18 10:07:57 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Fri, 18 Sep 2009 10:07:57 +0000 (UTC)
Subject: rpms/yum-presto/devel .cvsignore, 1.11, 1.12 import.log, 1.2,
	1.3 sources, 1.11, 1.12 yum-presto.spec, 1.19, 1.20
Message-ID: <20090918100757.7C2BB11C01EA@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1507/devel

Modified Files:
	.cvsignore import.log sources yum-presto.spec 
Log Message:
Fix bug in attempting to read deltainfo.xml


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Sep 2009 20:19:33 -0000	1.11
+++ .cvsignore	18 Sep 2009 10:07:57 -0000	1.12
@@ -1 +1 @@
-yum-presto-0.6.0.tar.bz2
+yum-presto-0.6.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Sep 2009 20:19:33 -0000	1.2
+++ import.log	18 Sep 2009 10:07:57 -0000	1.3
@@ -1,2 +1,3 @@
 yum-presto-0_5_0-1_fc10:HEAD:yum-presto-0.5.0-1.fc10.src.rpm:1241176734
 yum-presto-0_6_0-1_fc11:HEAD:yum-presto-0.6.0-1.fc11.src.rpm:1252786673
+yum-presto-0_6_1-1_fc11:HEAD:yum-presto-0.6.1-1.fc11.src.rpm:1253268412


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Sep 2009 20:19:33 -0000	1.11
+++ sources	18 Sep 2009 10:07:57 -0000	1.12
@@ -1 +1 @@
-33cad733a4016ecd1b9e1b062e135909  yum-presto-0.6.0.tar.bz2
+b0db7817aff1fcfa2c432862c6b86c7b  yum-presto-0.6.1.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- yum-presto.spec	12 Sep 2009 20:19:33 -0000	1.19
+++ yum-presto.spec	18 Sep 2009 10:07:57 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.6.0
+Version: 0.6.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Thu Sep 17 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.1-1
+- Fix bug in attempting to read deltainfo.xml
+
 * Sat Sep 12 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.0-1
 - Change savings sentence to be more grammatically correct (#517014)
 - Support reading deltainfo.xml files as well as prestodelta.xml



From pkgdb at fedoraproject.org  Fri Sep 18 10:07:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:07:41 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918100743.74CB610F898@bastion2.fedora.phx.redhat.com>

guidograzioli has set the approveacls acl on yaz (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 10:11:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:11:17 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918101116.866B910F884@bastion2.fedora.phx.redhat.com>

guidograzioli has set the watchbugzilla acl on yaz (Fedora EPEL 5) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 10:11:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:11:17 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918101117.0789610F888@bastion2.fedora.phx.redhat.com>

guidograzioli has set the watchcommits acl on yaz (Fedora EPEL 5) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 10:11:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:11:25 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918101118.B8A0E10F896@bastion2.fedora.phx.redhat.com>

guidograzioli has set the commit acl on yaz (Fedora EPEL 5) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Fri Sep 18 10:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 10:11:18 +0000
Subject: [pkgdb] yaz had acl change status
Message-ID: <20090918101119.988D610F89A@bastion2.fedora.phx.redhat.com>

guidograzioli has set the approveacls acl on yaz (Fedora EPEL 5) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yaz



From hadess at fedoraproject.org  Fri Sep 18 10:25:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 10:25:20 +0000 (UTC)
Subject: rpms/bickley/devel 0001-Port-to-gupnp-0.13.patch, NONE,
	1.1 bickley.spec, 1.3, 1.4
Message-ID: <20090918102520.770A211C01EA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8171

Modified Files:
	bickley.spec 
Added Files:
	0001-Port-to-gupnp-0.13.patch 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-9
- Port to gupnp 0.13


0001-Port-to-gupnp-0.13.patch:
 configure.ac          |    2 
 src/bkl-finder-upnp.c |  114 ++++++++++++++++++++++----------------------------
 2 files changed, 52 insertions(+), 64 deletions(-)

--- NEW FILE 0001-Port-to-gupnp-0.13.patch ---
>From 14f1f145812962a1a0c6c2ad02a1509c1e439158 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 18 Sep 2009 11:20:20 +0100
Subject: [PATCH] Port to gupnp 0.13

---
 configure.ac          |    2 +-
 src/bkl-finder-upnp.c |  113 ++++++++++++++++++++++---------------------------
 2 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6df3153..4959fee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ PKG_CHECK_MODULES(KOZO, glib-2.0 gmodule-2.0 gthread-2.0 gio-2.0 tdb)
 
 PKG_CHECK_MODULES(BICKLEY, glib-2.0 dbus-glib-1 >= 0.78)
 
-PKG_CHECK_MODULES(ORBITER, glib-2.0 gio-2.0 dbus-glib-1 >= 0.78 gconf-2.0 gupnp-1.0 gupnp-av-1.0)
+PKG_CHECK_MODULES(ORBITER, glib-2.0 gio-2.0 dbus-glib-1 >= 0.78 gconf-2.0 gupnp-1.0 >= 0.13.0 gupnp-av-1.0 >= 0.5)
 
 PKG_CHECK_MODULES(INVESTIGATOR, glib-2.0 gio-2.0 dbus-glib-1 >= 0.78 gstreamer-0.10 >= 0.10.20 libexif gdk-pixbuf-2.0)
 
diff --git a/src/bkl-finder-upnp.c b/src/bkl-finder-upnp.c
index 5928c45..e5cc005 100644
--- a/src/bkl-finder-upnp.c
+++ b/src/bkl-finder-upnp.c
@@ -72,60 +72,53 @@ static char *
 get_http_get_props (GList *didl_props,
                     char **mimetype,
                     char **protocol_info,
-                    char **size)
+                    long *size)
 {
     GList *p;
 
     for (p = didl_props; p; p = p->next) {
-        char *pi;
+        GUPnPDIDLLiteResource *res = p->data;
+        GUPnPProtocolInfo *pi;
+        const char *pi_str;
 
-        pi = gupnp_didl_lite_property_get_attribute (p->data, "protocolInfo");
-        if (strncmp (pi, "http-get:", 9) == 0) {
+	pi = gupnp_didl_lite_resource_get_protocol_info (res);
+	pi_str = gupnp_protocol_info_to_string (pi);
+        if (strncmp (pi_str, "http-get:", 9) == 0) {
             if (mimetype) {
-                char *start, *end;
-
-                start = strchr (pi + 9, ':');
-                if (start != '\0' && ++start != '\0') {
-                    end = strchr (start, ':');
-                    *mimetype = g_strndup (start, end - start);
-                } else {
-                    *mimetype = NULL;
-                }
+                *mimetype = g_strdup (gupnp_protocol_info_get_mime_type (pi));
             }
 
             if (protocol_info) {
-                *protocol_info = pi;
-            } else {
-                g_free (pi);
+                *protocol_info = g_strdup (pi_str);
             }
 
             if (size) {
-                *size = gupnp_didl_lite_property_get_attribute (p->data,
-                                                                "size");
+                *size = gupnp_didl_lite_resource_get_size (res);
             }
 
-            return gupnp_didl_lite_property_get_value (p->data);
-        }
+            g_object_unref (pi);
 
-        g_free (pi);
+            return g_strdup (gupnp_didl_lite_resource_get_uri (res));
+        }
+        g_object_unref (pi);
     }
 
     return NULL;
 }
 
 static const char *
-get_property_keys (xmlNode    *didl_object,
+get_property_keys (GUPnPDIDLLiteObject *didl_object,
                    const char *property)
 {
     GList *props;
-    char *ret = NULL;
+    const char *ret = NULL;
 
-    props = gupnp_didl_lite_object_get_property (didl_object, property);
+    props = gupnp_didl_lite_object_get_properties (didl_object, property);
     if (props) {
         GList *p;
 
         for (p = props; p; p = p->next) {
-            char *prop = gupnp_didl_lite_property_get_value (p->data);
+            const char *prop = p->data;
 
             if (prop) {
                 ret = prop;
@@ -140,19 +133,19 @@ get_property_keys (xmlNode    *didl_object,
 }
 
 static void
-add_artist_properties (xmlNode      *didl_object,
+add_artist_properties (GUPnPDIDLLiteObject *didl_object,
                        BklItemAudio *item)
 {
     GList *props;
     GPtrArray *artists;
 
-    props = gupnp_didl_lite_object_get_property (didl_object, "artist");
+    props = gupnp_didl_lite_object_get_properties (didl_object, "artist");
     if (props) {
         GList *p;
 
         artists = g_ptr_array_sized_new (g_list_length (props));
         for (p = props; p; p = p->next) {
-            char *prop = gupnp_didl_lite_property_get_value (p->data);
+            const char *prop = p->data;
 
             if (prop) {
                 g_ptr_array_add (artists, g_strdup (prop));
@@ -165,7 +158,7 @@ add_artist_properties (xmlNode      *didl_object,
 }
 
 static void
-parse_image_item (xmlNode      *didl_object,
+parse_image_item (GUPnPDIDLLiteObject *didl_object,
                   BklItemImage *item,
                   const char   *subclass)
 {
@@ -177,7 +170,7 @@ parse_image_item (xmlNode      *didl_object,
 }
 
 static void
-parse_audio_item (xmlNode      *didl_object,
+parse_audio_item (GUPnPDIDLLiteObject *didl_object,
                   BklItemAudio *item,
                   const char   *subclass)
 {
@@ -217,7 +210,7 @@ parse_audio_item (xmlNode      *didl_object,
 }
 
 static void
-parse_video_item (xmlNode      *didl_object,
+parse_video_item (GUPnPDIDLLiteObject *didl_object,
                   BklItemVideo *item,
                   const char   *subclass)
 {
@@ -233,11 +226,13 @@ parse_video_item (xmlNode      *didl_object,
 
 static void
 parse_didl (BklFinderUPnP *finder,
-            xmlNode       *didl_object)
+            GUPnPDIDLLiteObject *didl_object)
 {
     BklFinder *f = (BklFinder *) finder;
     BklItem *item = NULL;
-    char *uri, *title, *size = NULL, *mimetype = NULL, *protocol_info = NULL;
+    const char *title;
+    char *uri, *mimetype = NULL, *protocol_info = NULL;
+    long size;
     gboolean is_item, is_container;
     GList *didl_props;
 
@@ -246,60 +241,58 @@ parse_didl (BklFinderUPnP *finder,
     g_print ("(%s): Found %s\n", f->source->name, title);
 #endif
 
-    is_item = gupnp_didl_lite_object_is_item (didl_object);
-    is_container = gupnp_didl_lite_object_is_container (didl_object);
+    is_item = GUPNP_IS_DIDL_LITE_ITEM (didl_object);
+    is_container = GUPNP_IS_DIDL_LITE_CONTAINER (didl_object);
 
     if (is_item) {
-        char *ref_id;
+        const char *ref_id;
 
-        ref_id = gupnp_didl_lite_item_get_ref_id (didl_object);
+        ref_id = gupnp_didl_lite_item_get_ref_id (GUPNP_DIDL_LITE_ITEM (didl_object));
         if (ref_id != NULL) {
 #ifdef DEBUG
             g_print ("(%s): %s is just a reference to %s\n",
                      f->source->name, title, ref_id);
 #endif
-            g_free (title);
-            g_free (ref_id);
             return;
         }
     }
 
-    didl_props = gupnp_didl_lite_object_get_property (didl_object, "res");
+    didl_props = gupnp_didl_lite_object_get_resources (didl_object);
     uri = get_http_get_props (didl_props, &mimetype, &protocol_info, &size);
+    g_list_foreach (didl_props, (GFunc) g_object_unref, NULL);
     g_list_free (didl_props);
 
     if (uri == NULL) {
         /* Didn't get any URI we like, so just quit */
-        g_free (title);
+        g_free (mimetype);
+        g_free (protocol_info);
         return;
     }
 
 #ifdef DEBUG
     g_print ("   at %s\n", uri);
-    g_print ("   %s bytes\n", size);
+    g_print ("   %ld bytes\n", size);
     g_print ("   %s\n", mimetype);
     g_print ("   %s\n", protocol_info);
 #endif
     if (is_container) {
-        char *class;
+        const char *class;
 
         class = gupnp_didl_lite_object_get_upnp_class (didl_object);
         if (strncmp (class, "object.container.", 17) == 0) {
-            char *subclass = class + 17;
+            const char *subclass = class + 17;
 
             if (strncmp (subclass, "album", 5) == 0) {
                 /* parse_album_container (didl_object, uri, subclass + 5); */
             }
         }
-
-        g_free (class);
     } else {
-        char *class;
+        const char *class;
 
         class = gupnp_didl_lite_object_get_upnp_class (didl_object);
 
         if (strncmp (class, "object.item.", 12) == 0) {
-            char *subclass = class + 12;
+            const char *subclass = class + 12;
 
             if (strncmp (subclass, "imageItem", 9) == 0) {
                 BklItemImage *image = bkl_item_image_new ();
@@ -330,8 +323,6 @@ parse_didl (BklFinderUPnP *finder,
                 g_warning ("Unknown class: %s", class);
             }
         }
-
-        g_free (class);
     }
 
     if (item != NULL) {
@@ -340,7 +331,7 @@ parse_didl (BklFinderUPnP *finder,
         bkl_item_set_mimetype (item, mimetype);
         bkl_item_set_uri (item, uri);
         if (size) {
-            bkl_item_set_size (item, strtol (size, NULL, 10));
+            bkl_item_set_size (item, size);
         } else {
             bkl_item_set_size (item, 0);
         }
@@ -356,22 +347,19 @@ parse_didl (BklFinderUPnP *finder,
     }
 
     g_free (uri);
-    g_free (title);
-    g_free (size);
     g_free (protocol_info);
 }
 
 static void
-didl_callback (GUPnPDIDLLiteParser *parser,
-               xmlNode             *didl_object,
-               gpointer             userdata)
+parser_object_available_cb (GUPnPDIDLLiteParser *parser,
+			    GUPnPDIDLLiteObject *didl_object,
+			    BklFinderUPnP *finder)
 {
-    BklFinderUPnP *finder = userdata;
-    char *id = gupnp_didl_lite_object_get_id (didl_object);
+    const char *id = gupnp_didl_lite_object_get_id (didl_object);
 
     /* If the node is a container then we browse it as well */
-    if (gupnp_didl_lite_object_is_container (didl_object)) {
-        g_queue_push_tail (finder->pending, id);
+    if (GUPNP_IS_DIDL_LITE_CONTAINER (didl_object)) {
+        g_queue_push_tail (finder->pending, g_strdup (id));
     }
 
     /* Parse this didl_object somehow... */
@@ -410,8 +398,7 @@ browse_id (BklFinderUPnP *finder,
         return FALSE;
     }
 
-    gupnp_didl_lite_parser_parse_didl (finder->parser, didl_result,
-                                       didl_callback, finder, &error);
+    gupnp_didl_lite_parser_parse_didl (finder->parser, didl_result, &error);
     if (error != NULL) {
         g_warning ("Error parsing didl: %s", error->message);
         g_error_free (error);
@@ -477,6 +464,8 @@ bkl_finder_upnp_new (BklSource         *source,
     finder->source = source;
 
     upnp->parser = gupnp_didl_lite_parser_new ();
+    g_signal_connect (upnp->parser, "object-available",
+    		      G_CALLBACK (parser_object_available_cb), upnp);
     upnp->device_info = info;
     upnp->content_directory =
         (GUPnPServiceProxy *) gupnp_device_info_get_service
-- 
1.6.2.5



Index: bickley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bickley.spec	9 Sep 2009 09:06:04 -0000	1.3
+++ bickley.spec	18 Sep 2009 10:25:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bickley
 Version:        0.4.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A meta data management API and framework
 
 Group:          Applications/Multimedia
@@ -12,6 +12,8 @@ Source0:        http://git.moblin.org/cg
 Patch0:         bickley-fixppc2.patch
 Patch1:         bickley-pkgconfig-fix64.patch
 Patch2:         bickley-license.patch
+# http://bugzilla.moblin.org/show_bug.cgi?id=6253
+Patch3:         0001-Port-to-gupnp-0.13.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-gst-devel
@@ -58,6 +60,7 @@ Files for development with %{name}.
 %patch0 -p1 -b .fixppc2
 %patch1 -p1 -b .pkgconfig-fix64
 %patch2 -p1 -b .license
+%patch3 -p1 -b .gupnp
 
 # Don't run configure from autogen.sh
 sed -i '/configure/d' autogen.sh
@@ -126,6 +129,9 @@ gconftool-2 --makefile-install-rule \
 %{_libdir}/libkozo.so
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-9
+- Port to gupnp 0.13
+
 * Wed Sep  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-8
 - Include the correct updated patch
 



From harald at fedoraproject.org  Fri Sep 18 10:41:25 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 18 Sep 2009 10:41:25 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.28,1.29
Message-ID: <20090918104126.658F611C01EA@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12998

Modified Files:
	dracut.spec 
Log Message:
* Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
- do not cleanup dmraids
- copy over lvm.conf



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- dracut.spec	17 Sep 2009 15:54:00 -0000	1.28
+++ dracut.spec	18 Sep 2009 10:41:20 -0000	1.29
@@ -1,3 +1,4 @@
+%define gittag c53acc30
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -13,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 1%{?rdist}
+Release: 2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -180,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
+- do not cleanup dmraids
+- copy over lvm.conf
+
 * Thu Sep 17 2009 Harald Hoyer <harald at redhat.com> 002-1
 - version 002
 - set correct PATH



From harald at fedoraproject.org  Fri Sep 18 10:42:57 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 18 Sep 2009 10:42:57 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore,1.13,1.14 sources,1.14,1.15
Message-ID: <20090918104257.8BF9C11C01EA@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14018

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
- do not cleanup dmraids
- copy over lvm.conf



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 Sep 2009 15:54:00 -0000	1.13
+++ .cvsignore	18 Sep 2009 10:42:57 -0000	1.14
@@ -1 +1 @@
-dracut-002.tar.bz2
+dracut-002-c53acc30.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	17 Sep 2009 15:54:00 -0000	1.14
+++ sources	18 Sep 2009 10:42:57 -0000	1.15
@@ -1 +1 @@
-6d900fb6b685d163a2fec063c9ab62e3  dracut-002.tar.bz2
+d0d8a2cad127d678e1fd9da5553674f4  dracut-002-c53acc30.tar.bz2



From harald at fedoraproject.org  Fri Sep 18 10:54:22 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 18 Sep 2009 10:54:22 +0000 (UTC)
Subject: rpms/dracut/F-11 dracut.spec,1.13,1.14 sources,1.12,1.13
Message-ID: <20090918105422.ABC5911C01EA@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18802

Modified Files:
	dracut.spec sources 
Log Message:
* Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
- do not cleanup dmraids
- copy over lvm.conf



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dracut.spec	17 Sep 2009 15:54:19 -0000	1.13
+++ dracut.spec	18 Sep 2009 10:54:22 -0000	1.14
@@ -1,3 +1,4 @@
+%define gittag c53acc30
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -13,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 1%{?rdist}
+Release: 2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -180,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
+- do not cleanup dmraids
+- copy over lvm.conf
+
 * Thu Sep 17 2009 Harald Hoyer <harald at redhat.com> 002-1
 - version 002
 - set correct PATH


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Sep 2009 15:54:19 -0000	1.12
+++ sources	18 Sep 2009 10:54:22 -0000	1.13
@@ -1 +1 @@
-6d900fb6b685d163a2fec063c9ab62e3  dracut-002.tar.bz2
+d0d8a2cad127d678e1fd9da5553674f4  dracut-002-c53acc30.tar.bz2



From tbzatek at fedoraproject.org  Fri Sep 18 11:24:17 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 18 Sep 2009 11:24:17 +0000 (UTC)
Subject: rpms/nautilus/F-11 nautilus-properties-ui-crash.patch, NONE,
	1.1 nautilus.spec, 1.273, 1.274
Message-ID: <20090918112417.664DD11C01EA@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31850

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-properties-ui-crash.patch 
Log Message:
* Fri Sep 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-3
- Make nautilus-file-management-properties not crash on start (#523749)


nautilus-properties-ui-crash.patch:
 nautilus-file-management-properties.ui |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nautilus-properties-ui-crash.patch ---
>From bf6bfde36bcadf43a39fb095650b7fc78741d62a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Thu, 27 Aug 2009 00:05:28 +0000
Subject: Fix a duplicate id in a .ui file

This caused nautilus-file-management-properties to crash.
---
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index eae16d1..c4fb6ee 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -1128,7 +1128,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label">
+                              <object class="GtkLabel" id="label99">
                                 <property name="height_request">6</property>
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes"/>
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- nautilus.spec	3 Aug 2009 13:08:16 -0000	1.273
+++ nautilus.spec	18 Sep 2009 11:24:15 -0000	1.274
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -91,6 +91,10 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # https://bugzilla.redhat.com/show_bug.cgi?id=505919
 Patch18:	nautilus-2.27.2-dark-text-on-dark-bg.patch
 
+# Nautilus Edit > Preferences menu (nautilus-file-management-properties) not opening
+# https://bugzilla.redhat.com/show_bug.cgi?id=523749
+Patch19:	nautilus-properties-ui-crash.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -129,6 +133,7 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .dark-text
+%patch19 -p1 -b .ui-dup-id
 
 %build
 
@@ -266,6 +271,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-3
+- Make nautilus-file-management-properties not crash on start (#523749)
+
 * Mon Aug  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-2
 - Fix incorrect text color in compact view (#505919)
 



From pkgdb at fedoraproject.org  Fri Sep 18 11:28:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:28:38 +0000
Subject: [pkgdb] poedit: cwickert has requested watchbugzilla
Message-ID: <20090918112831.E777810F874@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:28:37 +0000
Subject: [pkgdb] poedit: cwickert has requested commit
Message-ID: <20090918112838.F20F110F894@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:28:37 +0000
Subject: [pkgdb] poedit: cwickert has requested watchcommits
Message-ID: <20090918112836.B135510F886@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on poedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:29:18 +0000
Subject: [pkgdb] poedit: cwickert has requested watchbugzilla
Message-ID: <20090918112912.120B610F886@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:29:15 +0000
Subject: [pkgdb] poedit: cwickert has requested watchcommits
Message-ID: <20090918112914.9BEF310F885@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:29:24 +0000
Subject: [pkgdb] poedit: cwickert has requested commit
Message-ID: <20090918112917.63E0510F896@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on poedit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:29:39 +0000
Subject: [pkgdb] poedit: cwickert has requested watchbugzilla
Message-ID: <20090918112933.1AA1D10F885@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:29:42 +0000
Subject: [pkgdb] poedit: cwickert has requested watchcommits
Message-ID: <20090918112935.ECCA710F894@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 11:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 11:29:44 +0000
Subject: [pkgdb] poedit: cwickert has requested commit
Message-ID: <20090918112939.4202A10F8A0@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on poedit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From twaugh at fedoraproject.org  Fri Sep 18 12:10:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 18 Sep 2009 12:10:05 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-data-button-state.patch, NONE,
	1.1 system-config-printer.spec, 1.293, 1.294
Message-ID: <20090918121005.A865511C0338@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19464

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-data-button-state.patch 
Log Message:
* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed data button state.


system-config-printer-data-button-state.patch:
 system-config-printer.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-data-button-state.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.data-button-state system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.data-button-state	2009-09-04 18:12:11.000000000 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:04:40.062438371 +0100
@@ -1907,19 +1907,20 @@ class GUI(GtkGUI, monitor.Watcher):
     # set buttons sensitivity
     def setDataButtonState(self):
         try:
-            possible = (self.ppd and
-                        not bool (self.changed) and
-                        self.printer.enabled and
-                        not self.printer.rejecting)
+            printable = (self.ppd and
+                         not bool (self.changed) and
+                         self.printer.enabled and
+                         not self.printer.rejecting)
 
-            self.btnPrintTestPage.set_sensitive (possible)
+            self.btnPrintTestPage.set_sensitive (printable)
+            adjustable = not (self.discovered or bool (self.changed))
             for button in [self.btnChangePPD,
                            self.btnSelectDevice]:
-                button.set_sensitive (not bool (self.changed))
+                button.set_sensitive (adjustable)
 
             commands = (self.printer.type & cups.CUPS_PRINTER_COMMANDS) != 0
-            self.btnSelfTest.set_sensitive (commands and possible)
-            self.btnCleanHeads.set_sensitive (commands and possible)
+            self.btnSelfTest.set_sensitive (commands and printable)
+            self.btnCleanHeads.set_sensitive (commands and printable)
         except:
             pass
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- system-config-printer.spec	14 Sep 2009 15:07:15 -0000	1.293
+++ system-config-printer.spec	18 Sep 2009 12:10:03 -0000	1.294
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-data-button-state.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -74,6 +76,7 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .data-button-state
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -185,6 +188,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed data button state.
+
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
 - 1.1.13:
   - Translation updates (bug #522451).



From cwickert at fedoraproject.org  Fri Sep 18 12:15:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 18 Sep 2009 12:15:57 +0000 (UTC)
Subject: rpms/gxmessage/devel .cvsignore, 1.2, 1.3 gxmessage.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090918121557.A654111C01EA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22001

Modified Files:
	.cvsignore gxmessage.spec sources 
Log Message:
* Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.2-1
- Update to 2.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Apr 2009 13:03:01 -0000	1.2
+++ .cvsignore	18 Sep 2009 12:15:56 -0000	1.3
@@ -1 +1 @@
-gxmessage-2.12.1.tar.gz
+gxmessage-2.12.2.tar.gz


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/gxmessage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gxmessage.spec	25 Jul 2009 01:57:49 -0000	1.3
+++ gxmessage.spec	18 Sep 2009 12:15:56 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           gxmessage
-Version:        2.12.1
+Version:        2.12.2
 Release:        2%{?dist}
 Summary:        GTK2 based xmessage clone
 
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.2-1
+- Update to 2.12.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Apr 2009 13:03:02 -0000	1.2
+++ sources	18 Sep 2009 12:15:56 -0000	1.3
@@ -1 +1 @@
-48c0f8b2a18fa92724c1cec83a9aa46c  gxmessage-2.12.1.tar.gz
+91a65c67ab150bb5324b95149f9904e7  gxmessage-2.12.2.tar.gz



From mlichvar at fedoraproject.org  Fri Sep 18 12:30:23 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 18 Sep 2009 12:30:23 +0000 (UTC)
Subject: rpms/mutt/devel .cvsignore, 1.19, 1.20 mutt.spec, 1.63, 1.64 sources,
	1.19, 1.20 mutt-1.5.19-db47.patch, 1.1,
	NONE mutt-1.5.19-gnutls.patch, 1.1,
	NONE mutt-1.5.19-inodesort.patch, 1.1,
	NONE mutt-1.5.19-realpath.patch, 1.1,
	NONE mutt-1.5.19-saslcb.patch, 1.1, NONE
Message-ID: <20090918123023.4246411C02BD@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28791

Modified Files:
	.cvsignore mutt.spec sources 
Removed Files:
	mutt-1.5.19-db47.patch mutt-1.5.19-gnutls.patch 
	mutt-1.5.19-inodesort.patch mutt-1.5.19-realpath.patch 
	mutt-1.5.19-saslcb.patch 
Log Message:
- update to post 1.5.20 hg snapshot (#515148)
- use hunspell by default (#510358)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	7 Jan 2009 14:06:21 -0000	1.19
+++ .cvsignore	18 Sep 2009 12:30:22 -0000	1.20
@@ -1 +1 @@
-mutt-1.5.19.tar.gz
+mutt-1.5.20-20090827hg605559.tar.bz2


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- mutt.spec	25 Jul 2009 15:26:57 -0000	1.63
+++ mutt.spec	18 Sep 2009 12:30:23 -0000	1.64
@@ -15,29 +15,26 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.19
-Release: 6%{?dist}
+Version: 1.5.20
+Release: 1.20090827hg605559%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
 License: GPLv2+ and Public Domain
 Group: Applications/Internet
-Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
+# hg snapshot created from http://dev.mutt.org/hg/mutt
+Source: mutt-1.5.20-20090827hg605559.tar.bz2
+#Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch7: mutt-1.5.19-db47.patch
-Patch8: mutt-1.5.19-realpath.patch
-Patch9: mutt-1.5.19-inodesort.patch
-Patch10: mutt-1.5.19-saslcb.patch
-Patch11: mutt-1.5.19-gnutls.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: aspell /usr/sbin/sendmail
 BuildRequires: ncurses-devel
 BuildRequires: gettext
+BuildRequires: automake
 # required to build documentation
 BuildRequires: docbook-style-xsl libxslt lynx
 
@@ -65,21 +62,19 @@ regular expression searches and a powerf
 for selecting groups of messages.
 
 %prep
-%setup -q
+%setup -q -n mutt
+./prepare -V
 # Thou shalt use fcntl, and only fcntl
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch7 -p1 -b .db47
-%patch8 -p1 -b .realpath
-%patch9 -p1 -b .inodesort
-%patch10 -p1 -b .saslcb
-%patch11 -p1 -b .gnutls
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
 %build
 %configure \
+		SENDMAIL=%{_sbindir}/sendmail \
+		ISPELL=%{_bindir}/hunspell \
 %{?with_debug:	--enable-debug}\
 %{?with_pop:	--enable-pop}\
 %{?with_imap:	--enable-imap} \
@@ -114,11 +109,7 @@ cat contrib/gpg.rc >> \
 grep -5 "^color" contrib/sample.muttrc >> \
 	$RPM_BUILD_ROOT%{_sysconfdir}/Muttrc
 
-# and we use aspell
 cat >> $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc <<EOF
-# use aspell
-set ispell="%{_bindir}/aspell --mode=email check"
-
 source %{_sysconfdir}/Muttrc.local
 EOF
 
@@ -147,9 +138,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pgpewrap
 %{_bindir}/smime_keys
 %{_mandir}/man1/mutt.*
+%{_mandir}/man1/smime_keys.*
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Fri Sep 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-1.20090827hg605559
+- update to post 1.5.20 hg snapshot (#515148)
+- use hunspell by default (#510358)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.5.19-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	7 Jan 2009 14:06:21 -0000	1.19
+++ sources	18 Sep 2009 12:30:23 -0000	1.20
@@ -1 +1 @@
-73b3747bc7f7c805921e8d24ebac693f  mutt-1.5.19.tar.gz
+a459f1139a9fff840222268aa1bc17a0  mutt-1.5.20-20090827hg605559.tar.bz2


--- mutt-1.5.19-db47.patch DELETED ---


--- mutt-1.5.19-gnutls.patch DELETED ---


--- mutt-1.5.19-inodesort.patch DELETED ---


--- mutt-1.5.19-realpath.patch DELETED ---


--- mutt-1.5.19-saslcb.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:15 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124208.E43A410F886@bastion2.fedora.phx.redhat.com>

hguemar has set the watchcommits acl on poedit (Fedora devel) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:16 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124209.BBD7310F894@bastion2.fedora.phx.redhat.com>

hguemar has set the watchbugzilla acl on poedit (Fedora devel) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:10 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124210.8999010F897@bastion2.fedora.phx.redhat.com>

hguemar has set the commit acl on poedit (Fedora devel) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:25 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124219.3359710F884@bastion2.fedora.phx.redhat.com>

hguemar has set the watchbugzilla acl on poedit (Fedora 10) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:26 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124220.0F80F10F888@bastion2.fedora.phx.redhat.com>

hguemar has set the watchcommits acl on poedit (Fedora 10) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:22 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124222.D414C10F89A@bastion2.fedora.phx.redhat.com>

hguemar has set the commit acl on poedit (Fedora 10) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:26 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124226.C8EC210F89D@bastion2.fedora.phx.redhat.com>

hguemar has set the watchbugzilla acl on poedit (Fedora 11) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:25 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124227.B941910F8A0@bastion2.fedora.phx.redhat.com>

hguemar has set the watchcommits acl on poedit (Fedora 11) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From pkgdb at fedoraproject.org  Fri Sep 18 12:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 12:42:29 +0000
Subject: [pkgdb] poedit had acl change status
Message-ID: <20090918124229.858A810F8A2@bastion2.fedora.phx.redhat.com>

hguemar has set the commit acl on poedit (Fedora 11) to Approved for cwickert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/poedit



From twaugh at fedoraproject.org  Fri Sep 18 12:43:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 18 Sep 2009 12:43:16 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-cancel-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.294, 1.295
Message-ID: <20090918124317.0277F11C01EA@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1914

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cancel-traceback.patch 
Log Message:
* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed traceback when cancelling change-driver dialog.


system-config-printer-cancel-traceback.patch:
 system-config-printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-cancel-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.cancel-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.cancel-traceback	2009-09-18 13:10:10.962438215 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:10:20.041314240 +0100
@@ -3805,6 +3805,7 @@ class NewPrinterGUI(GtkGUI):
         self.options = {} # keyword -> Option object
         self.changed = set()
         self.conflicts = set()
+        self.fetchDevices_op = None
 
         combobox = self.cmbNPDownloadableDriverFoundPrinters
         combobox.set_model (gtk.ListStore (str, str))


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- system-config-printer.spec	18 Sep 2009 12:10:03 -0000	1.294
+++ system-config-printer.spec	18 Sep 2009 12:43:16 -0000	1.295
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-data-button-state.patch
+Patch2: system-config-printer-cancel-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,6 +78,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .data-button-state
+%patch2 -p1 -b .cancel-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -189,6 +191,7 @@ exit 0
 
 %changelog
 * Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.
 
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1



From twaugh at fedoraproject.org  Fri Sep 18 12:52:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 18 Sep 2009 12:52:16 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-publish-printers.patch, NONE,
	1.1 system-config-printer.spec, 1.295, 1.296
Message-ID: <20090918125216.BFFD811C01EA@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5780

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-publish-printers.patch 
Log Message:
* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Avoid showing the publish-printers dialog when not necessary.


system-config-printer-publish-printers.patch:
 system-config-printer.py |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-publish-printers.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.publish-printers system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.publish-printers	2009-09-18 13:44:41.680437056 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:45:30.704315256 +0100
@@ -220,7 +220,7 @@ class GUI(GtkGUI, monitor.Watcher):
         self.changed = set() # of options
 
         self.servers = set((self.connect_server,))
-        self.server_is_publishing = False
+        self.server_is_publishing = None # not known
         self.devid = devid
         self.focus_on_map = focus_on_map
 
@@ -3158,6 +3158,18 @@ class GUI(GtkGUI, monitor.Watcher):
             self.cups._end_operation ()
 
         if success and share:
+            if self.server_is_publishing == None:
+                # We haven't yet seen a server-is-sharing-printers attribute.
+                # Assuming CUPS 1.4, this means we haven't opened a
+                # properties dialog yet.  Fetch the attributes now and
+                # look for it.
+                try:
+                    printer.getAttributes ()
+                    p = printer.other_attributes['server-is-sharing-printers']
+                    self.server_is_publishing = p
+                except (cups.IPPError, KeyError):
+                    pass
+
             self.advise_publish ()
 
         # For some reason CUPS doesn't give us a notification about


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- system-config-printer.spec	18 Sep 2009 12:43:16 -0000	1.295
+++ system-config-printer.spec	18 Sep 2009 12:52:16 -0000	1.296
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-data-button-state.patch
 Patch2: system-config-printer-cancel-traceback.patch
+Patch3: system-config-printer-publish-printers.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -79,6 +80,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .data-button-state
 %patch2 -p1 -b .cancel-traceback
+%patch3 -p1 -b .publish-printers
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -191,6 +193,7 @@ exit 0
 
 %changelog
 * Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Avoid showing the publish-printers dialog when not necessary.
 - Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.
 



From abbot at fedoraproject.org  Fri Sep 18 12:56:32 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Fri, 18 Sep 2009 12:56:32 +0000 (UTC)
Subject: rpms/protobuf/devel protobuf-2.2.0-fedora-gtest.patch, NONE,
	1.1 protobuf.spec, 1.7, 1.8 protobuf-2.0.2-includes.patch, 1.1,
	NONE protobuf-fedora-gtest.patch, 1.1,
	NONE protobuf-gcc-4.3.0.patch, 1.1,
	NONE protobuf-pkgconfig-autotools.patch, 1.1,
	NONE protobuf.pc.in, 1.1, NONE
Message-ID: <20090918125632.8453011C01EA@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/protobuf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6592

Modified Files:
	protobuf.spec 
Added Files:
	protobuf-2.2.0-fedora-gtest.patch 
Removed Files:
	protobuf-2.0.2-includes.patch protobuf-fedora-gtest.patch 
	protobuf-gcc-4.3.0.patch protobuf-pkgconfig-autotools.patch 
	protobuf.pc.in 
Log Message:
updated for protobuf-2.2.0


protobuf-2.2.0-fedora-gtest.patch:
 Makefile.am     |   21 ---------------------
 autogen.sh      |    9 ---------
 src/Makefile.am |   14 ++++----------
 3 files changed, 4 insertions(+), 40 deletions(-)

--- NEW FILE protobuf-2.2.0-fedora-gtest.patch ---
>From 2118fa2281c9554dd93f2fcd917e826d6b191daf Mon Sep 17 00:00:00 2001
From: Lev Shamardin <shamardin at gmail.com>
Date: Fri, 18 Sep 2009 13:20:48 +0400
Subject: [PATCH] fedora-gmake.patch

---
 protobuf-2.2.0/Makefile.am     |   21 ---------------------
 protobuf-2.2.0/autogen.sh      |    9 ---------
 protobuf-2.2.0/src/Makefile.am |   13 ++++---------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/protobuf-2.2.0/Makefile.am b/protobuf-2.2.0/Makefile.am
index c311fe0..23ee406 100644
--- a/protobuf-2.2.0/Makefile.am
+++ b/protobuf-2.2.0/Makefile.am
@@ -11,27 +11,6 @@ SUBDIRS = . src
 # Always include gtest in distributions.
 DIST_SUBDIRS = $(subdirs) src
 
-# Build gtest before we build protobuf tests.  We don't add gtest to SUBDIRS
-# because then "make check" would also build and run all of gtest's own tests,
-# which takes a lot of time and is generally not useful to us.  Also, we don't
-# want "make install" to recurse into gtest since we don't want to overwrite
-# the installed version of gtest if there is one.
-check-local:
-	@echo "Making lib/libgtest.a lib/libgtest_main.a in gtest"
-	@cd gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-
-# We would like to clean gtest when "make clean" is invoked.  But we have to
-# be careful because clean-local is also invoked during "make distclean", but
-# "make distclean" already recurses into gtest because it's listed among the
-# DIST_SUBDIRS.  distclean will delete gtest/Makefile, so if we then try to
-# cd to the directory again and "make clean" it will fail.  So, check that the
-# Makefile exists before recursing.
-clean-local:
-	@if test -e gtest/Makefile; then \
-	  echo "Making clean in gtest"; \
-	  cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \
-	fi
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 
diff --git a/protobuf-2.2.0/autogen.sh b/protobuf-2.2.0/autogen.sh
index 519bb8f..c17e316 100755
--- a/protobuf-2.2.0/autogen.sh
+++ b/protobuf-2.2.0/autogen.sh
@@ -15,15 +15,6 @@ fi
 
 set -ex
 
-# Temporary hack:  Must change C runtime library to "multi-threaded DLL",
-#   otherwise it will be set to "multi-threaded static" when MSVC upgrades
-#   the project file to MSVC 2005/2008.  vladl of Google Test says gtest will
-#   probably change their default to match, then this will be unnecessary.
-#   One of these mappings converts the debug configuration and the other
-#   converts the release configuration.  I don't know which is which.
-sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
-           s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
-
 # TODO(kenton):  Remove the ",no-obsolete" part and fix the resulting warnings.
 autoreconf -f -i -Wall,no-obsolete
 
diff --git a/protobuf-2.2.0/src/Makefile.am b/protobuf-2.2.0/src/Makefile.am
index f009838..373c463 100644
--- a/protobuf-2.2.0/src/Makefile.am
+++ b/protobuf-2.2.0/src/Makefile.am
@@ -267,10 +267,8 @@ COMMON_TEST_SOURCES =                                          \
 
 check_PROGRAMS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test $(GZCHECKPROGRAMS)
 protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                      $(top_builddir)/gtest/lib/libgtest.la       \
-                      $(top_builddir)/gtest/lib/libgtest_main.la
-protobuf_test_CPPFLAGS = -I$(top_srcdir)/gtest/include         \
-                         -I$(top_builddir)/gtest/include
+                      -lgtest -lgtest_main
+protobuf_test_CPPFLAGS = 
 # Disable optimization for tests unless the user explicitly asked for it,
 # since test_util.cc takes forever to compile with optimization (with GCC).
 # See configure.ac for more info.
@@ -305,11 +303,8 @@ nodist_protobuf_test_SOURCES = $(protoc_outputs)
 
 # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
 protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                      $(top_builddir)/gtest/lib/libgtest.la       \
-                      $(top_builddir)/gtest/lib/libgtest_main.la
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(top_srcdir)/gtest/include    \
-                                         -I$(top_builddir)/gtest/include  \
-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
+                      -lgtest -lgtest_main
+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
 protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
 protobuf_lazy_descriptor_test_SOURCES =                        \
   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-- 
1.6.2.5



Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/protobuf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- protobuf.spec	1 Sep 2009 23:36:15 -0000	1.7
+++ protobuf.spec	18 Sep 2009 12:56:32 -0000	1.8
@@ -12,18 +12,14 @@
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        2.0.2
-Release:        10%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
-Source1:        protobuf.pc.in
-Source2:        ftdetect-proto.vim
-Patch0:         protobuf-pkgconfig-autotools.patch
-Patch1:         protobuf-fedora-gtest.patch
+Source1:        ftdetect-proto.vim
+Patch1:         protobuf-%{version}-fedora-gtest.patch
 Patch2:         protobuf-java-notests.patch
-Patch3:         protobuf-gcc-4.3.0.patch
-Patch4:         protobuf-2.0.2-includes.patch
 URL:            http://code.google.com/p/protobuf/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  automake autoconf libtool pkgconfig 
@@ -72,6 +68,43 @@ Requires: %{name} = %{version}-%{release
 %description static
 Static libraries for Protocol Buffers
 
+%package lite
+Summary: Protocol Buffers LITE_RUNTIME libraries
+Group: Development/Libraries
+
+%description lite
+Protocol Buffers built with optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
+%package lite-devel
+Summary: Protocol Buffers LITE_RUNTIME development libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-lite = %{version}-%{release}
+
+%description lite-devel
+This package contains development libraries built with 
+optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
+%package lite-static
+Summary: Static development files for %{name}-lite
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description lite-static
+This package contains static development libraries built with 
+optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
 %if %{with_python}
 %package python
 Summary: Python bindings for Google Protocol Buffers
@@ -132,30 +165,21 @@ This package contains the API documentat
 
 %prep
 %setup -q
-%patch0 -p1
 %if !%{without_gtest}
-rm -rf src/gtest
-%patch1 -p1
+rm -rf gtest
+%patch1 -p2
 %endif
-cp -p %{SOURCE1} .
 chmod 644 examples/*
 %if %{with_java}
 %patch2
 rm -rf java/src/test
 %endif
-%patch3 -p0
-%patch4 -p1
 
 %build
+iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
+mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
 ./autogen.sh
-%if !%{without_gtest}
-export GTEST_CONFIG=`which gtest-config`
-sed -i -e 's|AS_IF(\[test "x$HAVE_GTEST" = "xyes"\],||' -e 's|\[m4_ifval(\[$2\], \[$2\])\],||' -e 's|\[m4_ifval(\[$3\], \[$3\])\])||' aclocal.m4
-autoconf
-%configure --enable-gtest
-%else
 %configure
-%endif
 
 make %{?_smp_mflags}
 
@@ -181,12 +205,13 @@ make %{?_smp_mflags} check
 rm -rf %{buildroot}
 make %{?_smp_mflags} install DESTDIR=%{buildroot} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
 find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
+
 %if %{with_python}
 pushd python
 python ./setup.py install --root=%{buildroot} --single-version-externally-managed --record=INSTALLED_FILES --optimize=1
 popd
 %endif
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/proto.vim
+install -p -m 644 -D %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/proto.vim
 install -p -m 644 -D editors/proto.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/proto.vim
 
 %if %{with_java}
@@ -206,6 +231,9 @@ install -pm 644 pom.xml %{buildroot}%{_d
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post lite -p /sbin/ldconfig
+%postun lite -p /sbin/ldconfig
+
 %post compiler -p /sbin/ldconfig
 %postun compiler -p /sbin/ldconfig
 
@@ -245,13 +273,26 @@ rm -rf %{buildroot}
 %{_libdir}/libprotobuf.a
 %{_libdir}/libprotoc.a
 
+%files lite
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.so.*
+
+%files lite-devel
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.so
+%{_libdir}/pkgconfig/protobuf-lite.pc
+
+%files lite-static
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.a
+
 %if %{with_python}
 %files python
 %defattr(-, root, root, -)
 %dir %{python_sitelib}/google
 %{python_sitelib}/google/protobuf/
-%{python_sitelib}/protobuf-2.0.2-py2.6.egg-info/
-%{python_sitelib}/protobuf-2.0.2-py2.6-nspkg.pth
+%{python_sitelib}/protobuf-%{version}-py2.6.egg-info/
+%{python_sitelib}/protobuf-%{version}-py2.6-nspkg.pth
 %doc python/README.txt 
 %doc examples/add_person.py examples/list_people.py examples/addressbook.proto
 %endif
@@ -275,11 +316,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Wed Sep  2 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.0.2-10
-- Fix FTBFS (BZ#511491): fix autotools to find gtest-config
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Sep 18 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-1
+- Upgraded to upstream protobuf-2.2.0
+- New -lite packages
 
 * Sun Mar 01 2009 Caol?n McNamra <caolanm at redhat.com> - 2.0.2-8
 - add stdio.h for sprintf, perror, etc.


--- protobuf-2.0.2-includes.patch DELETED ---


--- protobuf-fedora-gtest.patch DELETED ---


--- protobuf-gcc-4.3.0.patch DELETED ---


--- protobuf-pkgconfig-autotools.patch DELETED ---


--- protobuf.pc.in DELETED ---



From abbot at fedoraproject.org  Fri Sep 18 13:00:40 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Fri, 18 Sep 2009 13:00:40 +0000 (UTC)
Subject: rpms/protobuf/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090918130040.C2A2911C02BD@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/protobuf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8392

Modified Files:
	.cvsignore sources 
Log Message:
protobuf-2.2.0 sources upload



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Nov 2008 18:48:07 -0000	1.2
+++ .cvsignore	18 Sep 2009 13:00:40 -0000	1.3
@@ -1 +1 @@
-protobuf-2.0.2.tar.bz2
+protobuf-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Nov 2008 18:48:07 -0000	1.2
+++ sources	18 Sep 2009 13:00:40 -0000	1.3
@@ -1 +1 @@
-6674270b1d63c2c4b292644f48fede4e  protobuf-2.0.2.tar.bz2
+5c8abb579721fc3af7c94fb2019c4d2e  protobuf-2.2.0.tar.bz2



From twaugh at fedoraproject.org  Fri Sep 18 13:01:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 18 Sep 2009 13:01:39 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-iconify.patch, 
	NONE, 1.1 system-config-printer.spec, 1.296, 1.297
Message-ID: <20090918130139.A122811C01EA@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8744

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-iconify.patch 
Log Message:
* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Iconify jobs window into status icon.


system-config-printer-iconify.patch:
 jobviewer.py |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-iconify.patch ---
diff -up system-config-printer-1.1.13/jobviewer.py.iconify system-config-printer-1.1.13/jobviewer.py
--- system-config-printer-1.1.13/jobviewer.py.iconify	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/jobviewer.py	2009-09-18 13:52:20.235314913 +0100
@@ -389,14 +389,24 @@ class JobViewer (GtkGUI, monitor.Watcher
         return errordialogs.show_IPP_Error (exception, message, self.JobsWindow)
 
     def toggle_window_display(self, icon, force_show=False):
-        visible = self.JobsWindow.get_property('visible')
+        visible = self.JobsWindow.get_data('visible')
         if force_show:
             visible = False
 
         if visible:
-            self.JobsWindow.hide()
+            w = self.JobsWindow.window
+            (s, area, o) = self.statusicon.get_geometry ()
+            w.set_skip_taskbar_hint (True)
+            w.property_change ("_NET_WM_ICON_GEOMETRY",
+                               "CARDINAL", 32,
+                               gtk.gdk.PROP_MODE_REPLACE,
+                               list (area))
+            self.JobsWindow.iconify ()
         else:
-            self.JobsWindow.show()
+            self.JobsWindow.present ()
+            self.JobsWindow.window.set_skip_taskbar_hint (False)
+
+        self.JobsWindow.set_data ('visible', not visible)
 
     def on_show_completed_jobs_activate(self, menuitem):
         if menuitem.get_active():


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- system-config-printer.spec	18 Sep 2009 12:52:16 -0000	1.296
+++ system-config-printer.spec	18 Sep 2009 13:01:39 -0000	1.297
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-data-button-state.patch
 Patch2: system-config-printer-cancel-traceback.patch
 Patch3: system-config-printer-publish-printers.patch
+Patch4: system-config-printer-iconify.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -81,6 +82,7 @@ printers.
 %patch1 -p1 -b .data-button-state
 %patch2 -p1 -b .cancel-traceback
 %patch3 -p1 -b .publish-printers
+%patch4 -p1 -b .iconify
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -193,6 +195,7 @@ exit 0
 
 %changelog
 * Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Iconify jobs window into status icon.
 - Avoid showing the publish-printers dialog when not necessary.
 - Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.



From caolanm at fedoraproject.org  Fri Sep 18 13:01:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 18 Sep 2009 13:01:48 +0000 (UTC)
Subject: rpms/nntpgrab/devel nntpgrab.spec,1.39,1.40
Message-ID: <20090918130148.E011711C01EA@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8805

Modified Files:
	nntpgrab.spec 
Log Message:
rebuild for dependencies


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nntpgrab.spec	25 Jul 2009 19:27:18 -0000	1.39
+++ nntpgrab.spec	18 Sep 2009 13:01:48 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Download files from the usenet
 Name: nntpgrab
 Version: 0.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
@@ -277,6 +277,9 @@ rm -rf %{buildroot}
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Fri Sep 18 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.1-3
+- rebuild for dependencies
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Fri Sep 18 13:05:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 13:05:43 +0000 (UTC)
Subject: rpms/bickley/devel 0001-Port-to-gupnp-0.13.patch, 1.1,
	1.2 bickley.spec, 1.4, 1.5
Message-ID: <20090918130543.1B3D811C01EA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10121

Modified Files:
	0001-Port-to-gupnp-0.13.patch bickley.spec 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-10
- Update gupnp 0.13 patch


0001-Port-to-gupnp-0.13.patch:
 configure.ac          |    2 
 src/bkl-finder-upnp.c |  114 ++++++++++++++++++++++----------------------------
 2 files changed, 52 insertions(+), 64 deletions(-)

Index: 0001-Port-to-gupnp-0.13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/0001-Port-to-gupnp-0.13.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Port-to-gupnp-0.13.patch	18 Sep 2009 10:25:20 -0000	1.1
+++ 0001-Port-to-gupnp-0.13.patch	18 Sep 2009 13:05:42 -0000	1.2
@@ -1,4 +1,4 @@
-From 14f1f145812962a1a0c6c2ad02a1509c1e439158 Mon Sep 17 00:00:00 2001
+From 5bd0f4e4a6ed221a8ca053765d837b4a305a5d94 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 18 Sep 2009 11:20:20 +0100
 Subject: [PATCH] Port to gupnp 0.13
@@ -22,10 +22,10 @@ index 6df3153..4959fee 100644
  PKG_CHECK_MODULES(INVESTIGATOR, glib-2.0 gio-2.0 dbus-glib-1 >= 0.78 gstreamer-0.10 >= 0.10.20 libexif gdk-pixbuf-2.0)
  
 diff --git a/src/bkl-finder-upnp.c b/src/bkl-finder-upnp.c
-index 5928c45..e5cc005 100644
+index 5928c45..be29d14 100644
 --- a/src/bkl-finder-upnp.c
 +++ b/src/bkl-finder-upnp.c
-@@ -72,60 +72,53 @@ static char *
+@@ -72,60 +72,51 @@ static char *
  get_http_get_props (GList *didl_props,
                      char **mimetype,
                      char **protocol_info,
@@ -38,13 +38,11 @@ index 5928c45..e5cc005 100644
 -        char *pi;
 +        GUPnPDIDLLiteResource *res = p->data;
 +        GUPnPProtocolInfo *pi;
-+        const char *pi_str;
  
 -        pi = gupnp_didl_lite_property_get_attribute (p->data, "protocolInfo");
 -        if (strncmp (pi, "http-get:", 9) == 0) {
 +	pi = gupnp_didl_lite_resource_get_protocol_info (res);
-+	pi_str = gupnp_protocol_info_to_string (pi);
-+        if (strncmp (pi_str, "http-get:", 9) == 0) {
++	if (strcmp (gupnp_protocol_info_get_protocol (pi), "http-get") == 0) {
              if (mimetype) {
 -                char *start, *end;
 -
@@ -62,7 +60,7 @@ index 5928c45..e5cc005 100644
 -                *protocol_info = pi;
 -            } else {
 -                g_free (pi);
-+                *protocol_info = g_strdup (pi_str);
++                *protocol_info = g_strdup (gupnp_protocol_info_to_string (pi));
              }
  
              if (size) {
@@ -104,7 +102,7 @@ index 5928c45..e5cc005 100644
  
              if (prop) {
                  ret = prop;
-@@ -140,19 +133,19 @@ get_property_keys (xmlNode    *didl_object,
+@@ -140,19 +131,21 @@ get_property_keys (xmlNode    *didl_object,
  }
  
  static void
@@ -116,6 +114,8 @@ index 5928c45..e5cc005 100644
      GPtrArray *artists;
  
 -    props = gupnp_didl_lite_object_get_property (didl_object, "artist");
++    /* FIXME: use "artists" property:
++     * http://bugzilla.openedhand.com/show_bug.cgi?id=1814 */
 +    props = gupnp_didl_lite_object_get_properties (didl_object, "artist");
      if (props) {
          GList *p;


Index: bickley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bickley.spec	18 Sep 2009 10:25:20 -0000	1.4
+++ bickley.spec	18 Sep 2009 13:05:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           bickley
 Version:        0.4.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A meta data management API and framework
 
 Group:          Applications/Multimedia
@@ -129,6 +129,9 @@ gconftool-2 --makefile-install-rule \
 %{_libdir}/libkozo.so
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-10
+- Update gupnp 0.13 patch
+
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-9
 - Port to gupnp 0.13
 



From mhlavink at fedoraproject.org  Fri Sep 18 13:21:34 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 13:21:34 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.15-bufov.patch, NONE,
	1.1 cyrus-imapd-2.3.1-authid_normalize.patch, 1.3,
	1.4 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.3,
	1.4 cyrus-imapd-2.3.7-notify_sms.patch, 1.1,
	1.2 cyrus-imapd.spec, 1.59, 1.60
Message-ID: <20090918132134.D915511C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16278

Modified Files:
	cyrus-imapd-2.3.1-authid_normalize.patch 
	cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.7-notify_sms.patch cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.15-bufov.patch 
Log Message:
* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
- fix buffer overflow in cyrus sieve (CVE-2009-3235)


cyrus-imapd-2.3.15-bufov.patch:
 bc_eval.c |    6 +++---
 script.c  |    4 ++--
 sieve.y   |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE cyrus-imapd-2.3.15-bufov.patch ---
diff -up cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov cyrus-imapd-2.3.15/sieve/bc_eval.c
--- cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov	2009-03-31 06:11:30.000000000 +0200
+++ cyrus-imapd-2.3.15/sieve/bc_eval.c	2009-09-18 15:05:29.187990786 +0200
@@ -500,7 +500,7 @@ static int eval_bc_test(sieve_interp_t *
 	int comparator=ntohl(bc[i+3].value);
 	int apart=ntohl(bc[i+4].value);
 	int count=0;
-	char scount[3];
+	char scount[21];
 	int isReg = (match==B_REGEX);
 	int ctag = 0;
 	regex_t *reg;
@@ -669,7 +669,7 @@ static int eval_bc_test(sieve_interp_t *
 	int relation=ntohl(bc[i+2].value);
 	int comparator=ntohl(bc[i+3].value);
 	int count=0;	
-	char scount[3];
+	char scount[21];
 	int isReg = (match==B_REGEX);
 	int ctag = 0;
 	regex_t *reg;
@@ -790,7 +790,7 @@ static int eval_bc_test(sieve_interp_t *
 	int transform=ntohl(bc[i+4].value);
 	/* ntohl(bc[i+5].value) is the now unused 'offset' */
 	int count=0;
-	char scount[3];
+	char scount[21];
 	int isReg = (match==B_REGEX);
 	int ctag = 0;
 	regex_t *reg;
diff -up cyrus-imapd-2.3.15/sieve/script.c.bufov cyrus-imapd-2.3.15/sieve/script.c
--- cyrus-imapd-2.3.15/sieve/script.c.bufov	2009-09-02 15:56:18.000000000 +0200
+++ cyrus-imapd-2.3.15/sieve/script.c	2009-09-18 15:04:00.728927938 +0200
@@ -668,9 +668,9 @@ static int do_sieve_error(int ret,
     if ((ret != SIEVE_OK) && interp->err) {
 	char buf[1024];
 	if (lastaction == -1) /* we never executed an action */
-	    sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret));
+	    snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret));
 	else
-	    sprintf(buf, "%s: %s", action_to_string(lastaction),
+	    snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction),
 		    errmsg ? errmsg : sieve_errstr(ret));
  
 	ret |= interp->execute_err(buf, interp->interp_context,
diff -up cyrus-imapd-2.3.15/sieve/sieve.y.bufov cyrus-imapd-2.3.15/sieve/sieve.y
--- cyrus-imapd-2.3.15/sieve/sieve.y.bufov	2009-03-26 00:58:54.000000000 +0100
+++ cyrus-imapd-2.3.15/sieve/sieve.y	2009-09-18 15:04:00.734928038 +0200
@@ -1159,7 +1159,7 @@ static int verify_relat(char *r)
 	else if (!strcmp(r, "ne")) {return NE;}
 	else if (!strcmp(r, "eq")) {return EQ;}
 	else{
-	  sprintf(errbuf, "flag '%s': not a valid relational operation", r);
+	  snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r);
 	  yyerror(errbuf);
 	  return -1;
 	}

cyrus-imapd-2.3.1-authid_normalize.patch:
 auth_unix.c  |   18 ++++++++++++++++++
 imapoptions  |    5 +++++
 libcyr_cfg.c |    4 ++++
 libcyr_cfg.h |    2 ++
 4 files changed, 29 insertions(+)

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd-2.3.1-authid_normalize.patch	21 Jan 2009 13:50:36 -0000	1.3
+++ cyrus-imapd-2.3.1-authid_normalize.patch	18 Sep 2009 13:21:33 -0000	1.4
@@ -1,17 +1,7 @@
---- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
-@@ -112,6 +112,8 @@ enum cyrus_opt {
-     CYRUSOPT_SQL_PASSWD,
-     /* Secure SQL connection (OFF) */
-     CYRUSOPT_SQL_USESSL,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-     
---- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
-@@ -155,10 +155,12 @@
+diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize cyrus-imapd-2.3.15/lib/auth_unix.c
+--- cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize	2009-09-18 11:53:47.183115911 +0200
++++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:53:47.252115833 +0200
+@@ -156,10 +156,12 @@ const char *identifier;
  size_t len;
  {
      static char retbuf[81];
@@ -24,7 +14,7 @@
  
      if(!len) len = strlen(identifier);
      if(len >= sizeof(retbuf)) return NULL;
-@@ -210,6 +212,22 @@
+@@ -211,6 +213,22 @@ size_t len;
      /* now we don't */
      /* if (!sawalpha) return NULL;  */
  
@@ -47,9 +37,10 @@
      return retbuf;
  }
  
---- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize	2009-01-13 11:38:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:38:08.000000000 +0100
-@@ -1182,6 +1182,11 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize	2009-09-18 11:53:47.244115877 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:53:47.260115873 +0200
+@@ -1217,6 +1217,11 @@ product version in the capabilities */
     interface, otherwise the user is assumed to be in the default
     domain (if set). */
  
@@ -61,17 +52,29 @@
  /*
  .SH SEE ALSO
  .PP
---- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize	2008-07-30 18:03:38.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c	2009-01-13 11:38:08.000000000 +0100
-@@ -150,6 +150,11 @@
-       CFGVAL(long, 0),
+diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.c
+--- cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize	2009-03-31 06:43:20.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/libcyr_cfg.c	2009-09-18 11:55:03.436822867 +0200
+@@ -154,6 +154,10 @@ struct cyrusopt_s cyrus_options[] = {
+       CFGVAL(long, 1),
        CYRUS_OPT_SWITCH },
  
 +    { CYRUSOPT_NORMALIZEUID,
 +      CFGVAL(long, 1),
 +      CYRUS_OPT_SWITCH },
 +
-+
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
+diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.h
+--- cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize	2009-03-31 06:43:20.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/libcyr_cfg.h	2009-09-18 11:55:33.267115989 +0200
+@@ -114,6 +114,8 @@ enum cyrus_opt {
+     CYRUSOPT_SQL_USESSL,
+     /* Checkpoint after every recovery (OFF) */
+     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
++    /* Lowercase uid and strip leading and trailing blanks (OFF) */
++    CYRUSOPT_NORMALIZEUID,
+ 
+     CYRUSOPT_LAST
+     

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
 cyrus-imapd-2.3.13/README.autocreate    |  211 +++++++++++
 cyrus-imapd-2.3.15/imap/Makefile.in     |  155 ++++----
 cyrus-imapd-2.3.15/imap/autosieve.c     |  590 ++++++++++++++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/compile_sieve.c |  365 +++++++++++++++++++
 cyrus-imapd-2.3.15/imap/imapd.c         |   43 ++
 cyrus-imapd-2.3.15/imap/lmtpd.c         |   92 ++++
 cyrus-imapd-2.3.15/imap/mboxlist.c      |  370 ++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/mboxlist.h      |    4 
 cyrus-imapd-2.3.15/imap/pop3d.c         |   46 ++
 cyrus-imapd-2.3.15/lib/auth.c           |    8 
 cyrus-imapd-2.3.15/lib/auth.h           |    2 
 cyrus-imapd-2.3.15/lib/auth_krb.c       |   17 
 cyrus-imapd-2.3.15/lib/auth_krb5.c      |   15 
 cyrus-imapd-2.3.15/lib/auth_pts.c       |    9 
 cyrus-imapd-2.3.15/lib/auth_unix.c      |   11 
 cyrus-imapd-2.3.15/lib/imapoptions      |   49 ++
 cyrus-imapd-2.3.15/notifyd/Makefile.in  |    3 
 cyrus-imapd-2.3.15/notifyd/notifyd.c    |    2 
 cyrus-imapd-2.3.15/ptclient/Makefile.in |    3 
 19 files changed, 1916 insertions(+), 79 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diffIndex: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	2 Apr 2009 13:44:02 -0000	1.3
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	18 Sep 2009 13:21:33 -0000	1.4
@@ -1,435 +1,611 @@
---- cyrus-imapd-2.3.13/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
-+++ cyrus-imapd-2.3.13/notifyd/notifyd.c	2009-01-13 11:14:09.000000000 +0100
-@@ -96,7 +96,7 @@
- 
- #define NOTIFY_MAXSIZE 8192
- 
--int do_notify()
-+static int do_notify()
- {
-     struct sockaddr_un sun_data;
-     socklen_t sunlen = sizeof(sun_data);
---- cyrus-imapd-2.3.13/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
-+++ cyrus-imapd-2.3.13/notifyd/Makefile.in	2009-01-13 11:14:09.000000000 +0100
-@@ -71,10 +71,11 @@
- SERVICE=../master/service.o
- 
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
--DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
- PURIFY=/usr/local/bin/purify
- PUREOPT=-best-effort
---- cyrus-imapd-2.3.13/imap/mboxlist.c.autocreate	2008-10-08 17:47:08.000000000 +0200
-+++ cyrus-imapd-2.3.13/imap/mboxlist.c	2009-01-13 11:14:09.000000000 +0100
-@@ -83,6 +83,12 @@
- #include "quota.h"
- #include "sync_log.h"
- 
-+#ifdef USE_SIEVE
-+extern int autoadd_sieve(char *userid, 
-+		const char *source_script);
+diff -up /dev/null cyrus-imapd-2.3.15/imap/autosieve.c
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/imap/autosieve.c	2009-09-18 11:11:39.778115814 +0200
+@@ -0,0 +1,590 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
 +#endif
 +
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/uio.h>
++#include <fcntl.h>
++#include <ctype.h>
++#include <time.h>
++#include <syslog.h>
++#include <com_err.h>
++#include <config.h>
 +
- #define DB config_mboxlist_db
- #define SUBDB config_subscription_db
- 
-@@ -100,11 +106,29 @@
- static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
- 				void *rock);
- 
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+			      void *rock);
++#include "global.h"
++#include "util.h"
++#include "xmalloc.h"
++#include "xstrlcpy.h"
++#include "xstrlcat.h"
++#include "mailbox.h"
++#include "imap_err.h"
++#include "sieve_interface.h"
++#include "script.h"
 +
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state);
++#define TIMSIEVE_FAIL 	-1
++#define TIMSIEVE_OK 	0
++#define MAX_FILENAME	1024
 +
- struct change_rock {
-     struct quota *quota;
-     struct txn **tid;
- };
- 
-+/*
-+ * Struct needed to be passed as void *rock to
-+ * mboxlist_autochangesub();
-+ */
-+struct changesub_rock_st {
-+        char *userid;
-+        char *auth_userid;
-+        struct auth_state *auth_state;
-+};
++static int get_script_name(char *sievename, size_t buflen, const char *filename);
++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
++int autoadd_sieve(char *userid, const char *source_script);
 +
++//static void fatal(const char *s, int code);
++static void foo(void);
++static int sieve_notify(void *ac __attribute__((unused)),
++                        void *interp_context __attribute__((unused)),
++                        void *script_context __attribute__((unused)),
++                        void *message_context __attribute__((unused)),
++                        const char **errmsg __attribute__((unused)));
++static int mysieve_error(int lineno, const char *msg,
++                  void *i __attribute__((unused)), void *s);
++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
++
++
++sieve_vacation_t vacation2 = {
++    0,                          /* min response */
++    0,                          /* max response */
++    (sieve_callback *) &foo,    /* autorespond() */
++    (sieve_callback *) &foo     /* send_response() */
++};
 +
- #define FNAME_SUBSSUFFIX ".sub"
- 
- /*
-@@ -3383,3 +3407,349 @@
- 
-     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
- }
 +
 +/*
-+ * Automatically subscribe user to *ALL* shared folders,
-+ * one has permissions to be subscribed to.
-+ * INBOX subfolders are excluded.
++ * Find the name of the sieve script
++ * given the source script and compiled script names
 + */
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+                        void *rock) {
-+
-+  struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
-+  char *userid = changesub_rock->userid;
-+  char *auth_userid = changesub_rock->auth_userid;
-+  struct auth_state *auth_state = changesub_rock->auth_state;
++static int get_script_name(char *sievename, size_t buflen, const char *filename)
++{
++  char *p;
 +  int r;
 +
++  p = strrchr(filename, '/');
++  if (p == NULL)
++      p = (char *) filename;
++  else
++      p++;
 +
-+  if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
-+     (strlen(name) > 5  && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
-+     (strlen(name) > 4  && !strncmp(name, "user.", 5)))   /* Exclude other users' folders */
-+	  return 0;
-+
-+     
-+  r = mboxlist_changesub(name, userid, auth_state, 1, 0);
-+
-+  if (r) {
-+      syslog(LOG_WARNING,
-+             "autosubscribe: User %s to folder %s, subscription failed: %s",
-+             auth_userid, name, error_message(r));
-+  } else {
-+      syslog(LOG_NOTICE,
-+             "autosubscribe: User %s to folder %s, subscription succeeded",
-+             auth_userid, name);
-+  }
-+
-+  return 0;
++  r = strlcpy(sievename, p, buflen) - buflen;
++  return (r >= 0 || r == -buflen ? 1 : 0);
 +}
 +
-+#define SEP '|'
 +
 +/*
-+ * Automatically subscribe user to a shared folder.
-+ * Subscription is done successfully, if the shared
-+ * folder exists and the user has the necessary 
-+ * permissions.
++ * Find the directory where the sieve scripts of the user
++ * reside
 + */
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state) {
-+        
[...2756 lines suppressed...]
+ 
+ struct auth_mech auth_krb5 = 
+@@ -240,4 +254,5 @@ struct auth_mech auth_krb5 = 
+     &mymemberof,
+     &mynewstate,
+     &myfreestate,
++    &mycanonuser,
+ };
+diff -up cyrus-imapd-2.3.15/lib/auth_krb.c.autocreate cyrus-imapd-2.3.15/lib/auth_krb.c
+--- cyrus-imapd-2.3.15/lib/auth_krb.c.autocreate	2009-03-31 06:11:21.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/auth_krb.c	2009-09-18 11:11:39.785115812 +0200
+@@ -341,6 +341,15 @@ struct auth_state *auth_state;
      free((char *)auth_state);
  }
  
@@ -2192,7 +2222,7 @@
  #else /* HAVE_KRB */
  
  static int mymemberof(
-@@ -371,6 +380,13 @@
+@@ -372,6 +381,13 @@ static void myfreestate(
  	fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
  }
  
@@ -2206,15 +2236,16 @@
  #endif
  
  struct auth_mech auth_krb = 
-@@ -381,4 +397,5 @@
+@@ -382,4 +398,5 @@ struct auth_mech auth_krb = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_pts.c	2009-01-13 11:14:09.000000000 +0100
-@@ -512,6 +512,14 @@
+diff -up cyrus-imapd-2.3.15/lib/auth_pts.c.autocreate cyrus-imapd-2.3.15/lib/auth_pts.c
+--- cyrus-imapd-2.3.15/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.15/lib/auth_pts.c	2009-09-18 11:11:39.785115812 +0200
+@@ -512,6 +512,14 @@ static void myfreestate(struct auth_stat
      free(auth_state);
  }
  
@@ -2229,68 +2260,42 @@
  struct auth_mech auth_pts = 
  {
      "pts",		/* name */
-@@ -520,4 +528,5 @@
+@@ -520,4 +528,5 @@ struct auth_mech auth_pts = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/auth.h.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth.h	2009-01-13 11:14:09.000000000 +0100
-@@ -55,6 +55,7 @@
-              const char *identifier);
-     struct auth_state *(*newstate)(const char *identifier);
-     void (*freestate)(struct auth_state *auth_state);
-+    char *(*auth_canonuser)(struct auth_state *auth_state);
- };
- 
- extern struct auth_mech *auth_mechs[];
-@@ -77,5 +78,6 @@
-  	 const char *identifier);
- struct auth_state *auth_newstate(const char *identifier);
- void auth_freestate(struct auth_state *auth_state);
-+char *auth_canonuser(struct auth_state *auth_state);
- 
- #endif /* INCLUDED_AUTH_H */
---- cyrus-imapd-2.3.13/lib/auth_krb5.c.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_krb5.c	2009-01-13 11:14:09.000000000 +0100
-@@ -199,6 +199,14 @@
-     free(auth_state);
+diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.autocreate cyrus-imapd-2.3.15/lib/auth_unix.c
+--- cyrus-imapd-2.3.15/lib/auth_unix.c.autocreate	2009-03-31 06:11:22.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:11:39.787115798 +0200
+@@ -315,6 +315,16 @@ struct auth_state *auth_state;
+     free((char *)auth_state);
  }
  
-+static char *mycanonuser(struct auth_state *auth_state)
++static char *mycanonuser(auth_state)
++    struct auth_state *auth_state;
 +{
 +    if (auth_state)
-+       return auth_state->userid;
++         return auth_state->userid;
 +
 +    return NULL;
 +}
 +
- #else /* HAVE_GSSAPI_H */
- 
- static int mymemberof(
-@@ -230,6 +238,12 @@
- 	fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
- }
- 
-+static char *mycanonuser(
-+    struct auth_state *auth_state __attribute__((unused)))
-+{
-+        fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
-+}
 +
- #endif
  
- struct auth_mech auth_krb5 = 
-@@ -240,4 +254,5 @@
+ struct auth_mech auth_unix = 
+ {
+@@ -324,4 +334,5 @@ struct auth_mech auth_unix = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/imapoptions.autocreate	2008-10-08 19:18:12.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:14:09.000000000 +0100
-@@ -198,6 +198,55 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.autocreate cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.autocreate	2009-06-29 19:21:06.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:11:39.787115798 +0200
+@@ -198,6 +198,55 @@ are listed with ``<none>''.
  /* Number of seconds to wait before returning a timeout failure when
     performing a client connection (e.g., in a murder environment) */
  
@@ -2346,28 +2351,47 @@
  { "configdirectory", NULL, STRING }
  /* The pathname of the IMAP configuration directory.  This field is
     required. */
---- cyrus-imapd-2.3.13/lib/auth_unix.c.autocreate	2008-08-26 21:20:39.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:14:09.000000000 +0100
-@@ -314,6 +314,16 @@
-     free((char *)auth_state);
- }
+diff -up cyrus-imapd-2.3.15/notifyd/Makefile.in.autocreate cyrus-imapd-2.3.15/notifyd/Makefile.in
+--- cyrus-imapd-2.3.15/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/Makefile.in	2009-09-18 11:11:39.776115765 +0200
+@@ -71,10 +71,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@
+ SERVICE=../master/service.o
  
-+static char *mycanonuser(auth_state)
-+    struct auth_state *auth_state;
-+{
-+    if (auth_state)
-+         return auth_state->userid;
-+
-+    return NULL;
-+}
-+
-+
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
+ LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
+-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
  
- struct auth_mech auth_unix = 
+ PURIFY=/usr/local/bin/purify
+ PUREOPT=-best-effort
+diff -up cyrus-imapd-2.3.15/notifyd/notifyd.c.autocreate cyrus-imapd-2.3.15/notifyd/notifyd.c
+--- cyrus-imapd-2.3.15/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/notifyd.c	2009-09-18 11:11:39.776115765 +0200
+@@ -96,7 +96,7 @@ char *fetch_arg(char *head, char* tail)
+ 
+ #define NOTIFY_MAXSIZE 8192
+ 
+-int do_notify()
++static int do_notify()
  {
-@@ -323,4 +333,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
+     struct sockaddr_un sun_data;
+     socklen_t sunlen = sizeof(sun_data);
+diff -up cyrus-imapd-2.3.15/ptclient/Makefile.in.autocreate cyrus-imapd-2.3.15/ptclient/Makefile.in
+--- cyrus-imapd-2.3.15/ptclient/Makefile.in.autocreate	2008-03-24 19:34:22.000000000 +0100
++++ cyrus-imapd-2.3.15/ptclient/Makefile.in	2009-09-18 11:11:39.784115791 +0200
+@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(
+ AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
+ AFS_LIBS = @AFS_LIBS@
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
+ LIB_SASL = @LIB_SASL@
+ LIB_WRAP = @LIB_WRAP@
+-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ 
+ UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
+ 
+ LDAP_LIBS=@LDAP_LIBS@

cyrus-imapd-2.3.7-notify_sms.patch:
 doc/man/imapd.conf.5.html |   18 +++++++
 doc/man/notifyd.8.html    |   12 ++++
 lib/imapoptions           |    4 +
 man/imapd.conf.5          |    3 +
 man/notifyd.8             |    5 +
 notifyd/Makefile.in       |    2 
 notifyd/notify_sms.c      |  116 ++++++++++++++++++++++++++++++++++++++++++++++
 notifyd/notify_sms.h      |   61 ++++++++++++++++++++++++
 notifyd/notifyd.h         |    2 
 9 files changed, 222 insertions(+), 1 deletion(-)

Index: cyrus-imapd-2.3.7-notify_sms.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.7-notify_sms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.7-notify_sms.patch	12 Mar 2007 16:22:52 -0000	1.1
+++ cyrus-imapd-2.3.7-notify_sms.patch	18 Sep 2009 13:21:33 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Naur cyrus-imapd-2.3.7.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.3.7/doc/man/imapd.conf.5.html
---- cyrus-imapd-2.3.7.orig/doc/man/imapd.conf.5.html	2006-07-10 16:31:53.000000000 +0200
-+++ cyrus-imapd-2.3.7/doc/man/imapd.conf.5.html	2006-07-14 10:27:29.000000000 +0200
-@@ -3130,6 +3130,24 @@
+diff -up cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html.notify_sms cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html
+--- cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html.notify_sms	2009-09-09 15:19:50.000000000 +0200
++++ cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html	2009-09-18 11:49:42.207115959 +0200
+@@ -3469,6 +3469,24 @@ proxying CREATE.</p>
  <tr valign="top" align="left">
  <td width="10%"></td>
  <td width="89%">
@@ -26,10 +26,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/doc/ma
  <p><b>servername:</b> &lt;none&gt;</p></td>
  </table>
  <!-- INDENTATION -->
-diff -Naur cyrus-imapd-2.3.7.orig/doc/man/notifyd.8.html cyrus-imapd-2.3.7/doc/man/notifyd.8.html
---- cyrus-imapd-2.3.7.orig/doc/man/notifyd.8.html	2006-07-10 16:31:54.000000000 +0200
-+++ cyrus-imapd-2.3.7/doc/man/notifyd.8.html	2006-07-14 10:27:29.000000000 +0200
-@@ -181,6 +181,18 @@
+diff -up cyrus-imapd-2.3.15/doc/man/notifyd.8.html.notify_sms cyrus-imapd-2.3.15/doc/man/notifyd.8.html
+--- cyrus-imapd-2.3.15/doc/man/notifyd.8.html.notify_sms	2009-09-09 15:19:51.000000000 +0200
++++ cyrus-imapd-2.3.15/doc/man/notifyd.8.html	2009-09-18 11:49:42.208116026 +0200
+@@ -181,6 +181,18 @@ a Sieve &rsquo;notify&rsquo; action as i
  <td width="11%"></td>
  <td width="10%">
  
@@ -48,10 +48,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/doc/ma
  <p><b>zephyr</b></p>
  </td>
  <td width="77%">
-diff -Naur cyrus-imapd-2.3.7.orig/lib/imapoptions cyrus-imapd-2.3.7/lib/imapoptions
---- cyrus-imapd-2.3.7.orig/lib/imapoptions	2006-06-27 17:58:42.000000000 +0200
-+++ cyrus-imapd-2.3.7/lib/imapoptions	2006-07-14 10:27:29.000000000 +0200
-@@ -829,6 +829,10 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.notify_sms cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.notify_sms	2009-09-18 11:49:42.189116010 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:50:38.230115954 +0200
+@@ -966,6 +966,10 @@ are listed with ``<none>''.
  /* The pathname of the sendmail executable.  Sieve invokes sendmail
     for sending rejections, redirects and vacation responses. */
  
@@ -59,26 +59,26 @@ diff -Naur cyrus-imapd-2.3.7.orig/lib/im
 +/* The pathname of the sendsms executable.  Sieve invokes sendsms
 +   for sending SMS notifications. */
 +
- { "servername", NULL, STRING }
- /* This is the hostname visible in the greeting messages of the POP,
-    IMAP and LMTP daemons. If it is unset, then the result returned
-diff -Naur cyrus-imapd-2.3.7.orig/man/imapd.conf.5 cyrus-imapd-2.3.7/man/imapd.conf.5
---- cyrus-imapd-2.3.7.orig/man/imapd.conf.5	2006-07-10 16:31:52.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/imapd.conf.5	2006-07-14 10:27:29.000000000 +0200
-@@ -691,6 +691,9 @@
+ { "serverlist", NULL, STRING }
+ /* Whitespace separated list of backend server names.  Used for
+    finding server with the most available free space for proxying
+diff -up cyrus-imapd-2.3.15/man/imapd.conf.5.notify_sms cyrus-imapd-2.3.15/man/imapd.conf.5
+--- cyrus-imapd-2.3.15/man/imapd.conf.5.notify_sms	2009-09-09 15:19:48.000000000 +0200
++++ cyrus-imapd-2.3.15/man/imapd.conf.5	2009-09-18 11:51:26.441839866 +0200
+@@ -771,6 +771,9 @@ Allowed values: \fIflat\fR, \fIberkeley\
  .IP "\fBsendmail:\fR /usr/lib/sendmail" 5
  The pathname of the sendmail executable.  Sieve invokes sendmail
  for sending rejections, redirects and vacation responses. 
 +.IP "\fBsendsms:\fR /usr/bin/sendsms" 5
 +The pathname of the sendsms executable.  Sieve invokes sendsms
 +for sending SMS notifications. 
- .IP "\fBservername:\fR <none>" 5
- This is the hostname visible in the greeting messages of the POP,
- IMAP and LMTP daemons. If it is unset, then the result returned
-diff -Naur cyrus-imapd-2.3.7.orig/man/notifyd.8 cyrus-imapd-2.3.7/man/notifyd.8
---- cyrus-imapd-2.3.7.orig/man/notifyd.8	2003-08-10 01:43:14.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/notifyd.8	2006-07-14 10:27:29.000000000 +0200
-@@ -110,6 +110,11 @@
+ .IP "\fBserverlist:\fR <none>" 5
+ Whitespace separated list of backend server names.  Used for
+ finding server with the most available free space for proxying
+diff -up cyrus-imapd-2.3.15/man/notifyd.8.notify_sms cyrus-imapd-2.3.15/man/notifyd.8
+--- cyrus-imapd-2.3.15/man/notifyd.8.notify_sms	2008-04-04 14:47:00.000000000 +0200
++++ cyrus-imapd-2.3.15/man/notifyd.8	2009-09-18 11:49:42.225115999 +0200
+@@ -111,6 +111,11 @@ Email the notification.  This method can
  Sieve 'notify' action as it requires a \fImailto:\fR URL to be
  specified as an \fI:option\fR.
  .TP
@@ -90,10 +90,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/man/no
  .B zephyr
  Send the notification as a zephyrgram.  If used in a Sieve 'notify'
  action, additional recipients can be specified as \fI:options\fR.
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/Makefile.in cyrus-imapd-2.3.7/notifyd/Makefile.in
---- cyrus-imapd-2.3.7.orig/notifyd/Makefile.in	2004-05-31 20:22:59.000000000 +0200
-+++ cyrus-imapd-2.3.7/notifyd/Makefile.in	2006-07-14 10:27:29.000000000 +0200
-@@ -82,7 +82,7 @@
+diff -up cyrus-imapd-2.3.15/notifyd/Makefile.in.notify_sms cyrus-imapd-2.3.15/notifyd/Makefile.in
+--- cyrus-imapd-2.3.15/notifyd/Makefile.in.notify_sms	2009-09-18 11:49:42.172115947 +0200
++++ cyrus-imapd-2.3.15/notifyd/Makefile.in	2009-09-18 11:49:42.225115999 +0200
+@@ -85,7 +85,7 @@ all: notifyd
  install:
  	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
  
@@ -102,10 +102,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  
  notifytest: notifytest.o
  	$(CC) $(LDFLAGS) -o notifytest \
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notifyd.h cyrus-imapd-2.3.7/notifyd/notifyd.h
---- cyrus-imapd-2.3.7.orig/notifyd/notifyd.h	2003-02-13 21:15:48.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notifyd.h	2006-07-14 10:27:29.000000000 +0200
-@@ -48,6 +48,7 @@
+diff -up cyrus-imapd-2.3.15/notifyd/notifyd.h.notify_sms cyrus-imapd-2.3.15/notifyd/notifyd.h
+--- cyrus-imapd-2.3.15/notifyd/notifyd.h.notify_sms	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/notifyd.h	2009-09-18 11:49:42.233116003 +0200
+@@ -47,6 +47,7 @@
  #include "notify_null.h"
  #include "notify_log.h"
  #include "notify_mailto.h"
@@ -113,7 +113,7 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  #include "notify_zephyr.h"
  
  /* Notify method dispatch table definition */
-@@ -64,6 +65,7 @@
+@@ -63,6 +64,7 @@ notifymethod_t methods[] = {
      { "null",	notify_null },		/* do nothing */
      { "log",	notify_log },		/* use syslog (for testing) */
      { "mailto",	notify_mailto },	/* send an email */
@@ -121,9 +121,9 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  #ifdef HAVE_ZEPHYR
      { "zephyr",	notify_zephyr },	/* send a zephyrgram */
  #endif
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notify_sms.c cyrus-imapd-2.3.7/notifyd/notify_sms.c
---- cyrus-imapd-2.3.7.orig/notifyd/notify_sms.c	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notify_sms.c	2006-07-14 10:29:10.000000000 +0200
+diff -up /dev/null cyrus-imapd-2.3.15/notifyd/notify_sms.c
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/notifyd/notify_sms.c	2009-09-18 11:49:42.233116003 +0200
 @@ -0,0 +1,116 @@
 +/* notify_sms.c -- SMS notification method
 + * Simon Matter
@@ -241,9 +241,9 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
 +
 +    return strdup("OK sms notification successful");
 +}
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notify_sms.h cyrus-imapd-2.3.7/notifyd/notify_sms.h
---- cyrus-imapd-2.3.7.orig/notifyd/notify_sms.h	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notify_sms.h	2006-07-14 10:29:10.000000000 +0200
+diff -up /dev/null cyrus-imapd-2.3.15/notifyd/notify_sms.h
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/notifyd/notify_sms.h	2009-09-18 11:49:42.233116003 +0200
 @@ -0,0 +1,61 @@
 +/* notify_sms.h -- SMS notification method
 + * Simon Matter


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- cyrus-imapd.spec	16 Sep 2009 11:52:47 -0000	1.59
+++ cyrus-imapd.spec	18 Sep 2009 13:21:33 -0000	1.60
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.3.14
-Release: 6%{?dist}
+Version: 2.3.15
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -72,7 +72,6 @@ URL: http://cyrusimap.web.cmu.edu/
 #Vendor: Invoca Systems
 #Distribution: Invoca Linux Server
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-#Source2: http://ftp.gnu.org/gnu/autoconf/autoconf-%{_acversion}.tar.gz
 Source3: cyrus-deliver-wrapper.c
 Source4: cyrus-user-procmailrc.template
 Source5: cyrus-imapd.logrotate
@@ -116,7 +115,7 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defa
 Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
-Patch20: cyrus-imapd-2.3.13-bufov.patch
+Patch20: cyrus-imapd-2.3.15-bufov.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
@@ -600,6 +599,7 @@ fi
 %{_cyrexecdir}/arbitronsort.pl
 %{_cyrexecdir}/chk_cyrus
 %{_cyrexecdir}/convert-sieve.pl
+%{_cyrexecdir}/cyr_df
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
@@ -731,7 +731,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-6
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
+- fix buffer overflow in cyrus sieve (CVE-2009-3235)
+
+-* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-6
 - use password-auth common PAM configuration instead of system-auth
 
 * Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-5



From caolanm at fedoraproject.org  Fri Sep 18 13:22:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 18 Sep 2009 13:22:01 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.83,1.84
Message-ID: <20090918132201.749C411C01EA@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16692

Modified Files:
	nautilus-sendto.spec 
Log Message:
rebuild for dependencies


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- nautilus-sendto.spec	9 Sep 2009 00:41:43 -0000	1.83
+++ nautilus-sendto.spec	18 Sep 2009 13:22:01 -0000	1.84
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        1.1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -95,6 +95,9 @@ fi
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Fri Sep 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1.1.7-3
+- rebuild for dependencies
+
 * Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.1.7-2
 - Rebuild for new Empathy.
 



From mhlavink at fedoraproject.org  Fri Sep 18 13:23:06 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 13:23:06 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.13-bufov.patch,1.1,NONE
Message-ID: <20090918132306.29DD811C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17281

Removed Files:
	cyrus-imapd-2.3.13-bufov.patch 
Log Message:
remove old patch



--- cyrus-imapd-2.3.13-bufov.patch DELETED ---



From mhlavink at fedoraproject.org  Fri Sep 18 13:23:59 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 13:23:59 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel .cvsignore,1.14,1.15 sources,1.16,1.17
Message-ID: <20090918132359.6174511C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17668

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Apr 2009 13:44:02 -0000	1.14
+++ .cvsignore	18 Sep 2009 13:23:59 -0000	1.15
@@ -1,2 +1,2 @@
-cyrus-imapd-2.3.14.tar.gz
+cyrus-imapd-2.3.15.tar.gz
 cyrus_sharedbackup-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Apr 2009 13:44:02 -0000	1.16
+++ sources	18 Sep 2009 13:23:59 -0000	1.17
@@ -1,2 +1,2 @@
-1030d4d9d04036b2fb9830165723908e  cyrus-imapd-2.3.14.tar.gz
+d89cb1b55023188938f332b7ef120fae  cyrus-imapd-2.3.15.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz



From hadess at fedoraproject.org  Fri Sep 18 13:23:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 13:23:50 +0000 (UTC)
Subject: rpms/rhythmbox/devel .cvsignore, 1.58, 1.59 rhythmbox.spec, 1.262, 
	1.263 sources, 1.60, 1.61
Message-ID: <20090918132350.29D5511C01EA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17634

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-1
- Update to 0.12.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	1 Sep 2009 14:40:37 -0000	1.58
+++ .cvsignore	18 Sep 2009 13:23:49 -0000	1.59
@@ -1 +1 @@
-rhythmbox-0.12.4.tar.bz2
+rhythmbox-0.12.5.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- rhythmbox.spec	2 Sep 2009 14:34:36 -0000	1.262
+++ rhythmbox.spec	18 Sep 2009 13:23:49 -0000	1.263
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application
-Version: 0.12.4
-Release: 3%{?dist}
+Version: 0.12.5
+Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -224,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-1
+- Update to 0.12.5
+
 * Wed Sep 02 2009 Bastien Nocera <bnocera at redhat.com> 0.12.4-3
 - Add upstream patch to use the correct path for mpi files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	1 Sep 2009 14:40:37 -0000	1.60
+++ sources	18 Sep 2009 13:23:50 -0000	1.61
@@ -1 +1 @@
-38116cbe4d86ec2a3c54f32e5c2dc7e7  rhythmbox-0.12.4.tar.bz2
+d70b26fc8a861bf1921e5709f9350893  rhythmbox-0.12.5.tar.bz2



From akurtakov at fedoraproject.org  Fri Sep 18 13:28:40 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 18 Sep 2009 13:28:40 +0000 (UTC)
Subject: rpms/jakarta-commons-io/devel jakarta-commons-io.spec, 1.5,
	1.6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 jakarta-commons-io-settings.xml, 1.1,
	NONE jakarta-commons-io-jpp-depmap.xml, 1.1,
	NONE commons-parent-3.pom, 1.1, NONE
Message-ID: <20090918132840.75F4E11C01EA@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-io/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19317/devel

Modified Files:
	jakarta-commons-io.spec .cvsignore sources 
Removed Files:
	jakarta-commons-io-settings.xml 
	jakarta-commons-io-jpp-depmap.xml commons-parent-3.pom 
Log Message:
Update to upstream 1.4.


Index: jakarta-commons-io.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/jakarta-commons-io.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- jakarta-commons-io.spec	25 Jul 2009 03:50:27 -0000	1.5
+++ jakarta-commons-io.spec	18 Sep 2009 13:28:39 -0000	1.6
@@ -28,57 +28,42 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support 0
-
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 0
-
 %define base_name commons-io
 
 Name:           jakarta-commons-io
-Version:        1.3.2
-Release:        3.2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Utilities to assist with developing IO functionality 
 
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://jakarta.apache.org/commons/io/
-Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-1.3.2-src.tar.gz
-Source1:        %{name}-settings.xml
-Source2:        %{name}-jpp-depmap.xml
-Source3:        commons-parent-3.pom
+URL:            http://commons.apache.org/io/
+Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit >= 0:3.8.1
-%if %{with_maven}
 BuildRequires:  maven2 >= 2.0.4-10jpp
+BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven2-plugin-antrun
+BuildRequires:  maven-plugin-bundle
 BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-idea
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
-%endif
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven-doxia-sitetools
 Requires:       jpackage-utils
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
 %description
 Commons-IO contains utility classes, stream implementations, 
 file filters, and endian classes. It is a library of utilities 
@@ -87,58 +72,31 @@ to assist with developing IO functionali
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
-Requires(postun): jpackage-utils
 
 %description    javadoc
 Javadoc for %{name}
 
 %prep
 %setup -q -n %{base_name}-%{version}-src
-cp %{SOURCE1} settings.xml
-mkdir -p .m2/repository/JPP/maven2/default_poms
-cp %{SOURCE3} .m2/repository/JPP/maven2/default_poms/org.apache.commons-commons-parent.pom
 
 %build
-%if %{with_maven}
-sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
-sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
 mvn-jpp \
         -e \
         -s $(pwd)/settings.xml \
         -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.skip=true \
         install javadoc:javadoc
-%else
-
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=
-CLASSPATH=target/classes:target/test-classes:$CLASSPATH
-ant -Dbuild.sysclasspath=only dist
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-%if %{with_maven}
 install -pm 644 target/%{base_name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
-install -Dpm 644 build/%{base_name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%endif
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 ln -s %{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{base_name}-%{version}.jar
@@ -153,41 +111,17 @@ install -pm 644 pom.xml \
     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-unzip -q build/dist/%{base_name}-%{version}.zip %{base_name}-%{version}/docs/* \
-    -d $RPM_BUILD_ROOT%{_javadocdir}
-mv $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}/docs/* \
-    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -r $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
-%endif
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(-,root,root,-)
@@ -195,10 +129,6 @@ fi
 %{_javadir}/*.jar
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -206,6 +136,9 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-1
+- Update to upstream 1.4.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3.2-3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jan 2008 19:01:26 -0000	1.3
+++ .cvsignore	18 Sep 2009 13:28:39 -0000	1.4
@@ -1 +1,2 @@
 commons-io-1.3.2-src.tar.gz
+commons-io-1.4-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jan 2008 19:01:26 -0000	1.3
+++ sources	18 Sep 2009 13:28:40 -0000	1.4
@@ -1 +1 @@
-7c98f852e70d52d4d9c3d8057be518f8  commons-io-1.3.2-src.tar.gz
+24b228f2d0c40ffed9204cdab015bccf  commons-io-1.4-src.tar.gz


--- jakarta-commons-io-settings.xml DELETED ---


--- jakarta-commons-io-jpp-depmap.xml DELETED ---


--- commons-parent-3.pom DELETED ---



From jreznik at fedoraproject.org  Fri Sep 18 13:29:37 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri, 18 Sep 2009 13:29:37 +0000 (UTC)
Subject: rpms/system-config-netboot/devel system-config-netboot.spec, 1.66, 
	1.67
Message-ID: <20090918132937.6FBCE11C01EA@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-netboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18646

Modified Files:
	system-config-netboot.spec 
Log Message:
* Sep 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-7
- configure macro moved to build section



Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- system-config-netboot.spec	27 Jul 2009 05:24:06 -0000	1.66
+++ system-config-netboot.spec	18 Sep 2009 13:29:37 -0000	1.67
@@ -2,7 +2,7 @@
 Summary: Network booting/install configuration utility (GUI)
 Name: system-config-netboot
 Version: 0.1.45.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://fedorahosted.org/system-config-netboot/
 Source0: http://fedorahosted.org/releases/s/y/system-config-netboot/%{name}-%{version}.tar.gz
 Source1: pxelinux.0
@@ -37,9 +37,9 @@ This package contains only command line 
 
 %prep
 %setup -q
-%configure
 
 %build
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Fri Sep 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-7
+- configure macro moved to build section
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.45.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Fri Sep 18 13:38:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 13:38:42 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec, 1.263,
	1.264 button-images.patch, 
	1.2, NONE path-to-mpi-files.patch, 1.1, NONE rhythmbox.png, 1.1,
	NONE spinner.patch, 1.1, NONE
Message-ID: <20090918133843.0065311C01EA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23434

Modified Files:
	rhythmbox.spec 
Removed Files:
	button-images.patch path-to-mpi-files.patch rhythmbox.png 
	spinner.patch 
Log Message:
Remove obsolete patches


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- rhythmbox.spec	18 Sep 2009 13:23:49 -0000	1.263
+++ rhythmbox.spec	18 Sep 2009 13:38:41 -0000	1.264
@@ -8,8 +8,6 @@ License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
 Source: http://download.gnome.org/sources/rhythmbox/0.12/%{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=524079
-Source2: rhythmbox.png
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0
 Requires: gnome-python2 gnome-python2-gconf gnome-python2-gnomevfs
@@ -49,13 +47,6 @@ BuildRequires: perl(XML::Parser) intltoo
 
 ExcludeArch:    s390 s390x
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592404
-Patch1: spinner.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=592763
-Patch2: button-images.patch
-# http://git.gnome.org/cgit/rhythmbox/patch/?id=2dd7e3e1526a23e81bdc31cccb0b4758fb0da767
-Patch3: path-to-mpi-files.patch
-
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -87,9 +78,6 @@ from, and sending media to UPnP/DLNA net
 
 %prep
 %setup -q
-%patch1 -p1 -b .spinner
-%patch2 -p1 -b .button-images
-%patch3 -p1 -b .mpi
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -121,10 +109,6 @@ rm -f %{buildroot}%{_libdir}/mozilla/plu
 
 %find_lang %name --with-gnome
 
-# Install a 24x24 icon
-install -m 0755 -d %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/
-install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/rhythmbox.png
-
 # Don't package api docs
 rm -rf %{buildroot}/%{_datadir}/gtk-doc/
 


--- button-images.patch DELETED ---


--- path-to-mpi-files.patch DELETED ---


--- spinner.patch DELETED ---



From akurtakov at fedoraproject.org  Fri Sep 18 13:41:44 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 18 Sep 2009 13:41:44 +0000 (UTC)
Subject: rpms/eclipse/devel fetch-ecf.sh, 1.1, 1.2 sources, 1.79,
	1.80 eclipse.spec, 1.665, 1.666 .cvsignore, 1.61, 1.62
Message-ID: <20090918134144.C091911C01EA@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24713/devel

Modified Files:
	fetch-ecf.sh sources eclipse.spec .cvsignore 
Log Message:
Update ecf-filetransfer and build it.


Index: fetch-ecf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/fetch-ecf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fetch-ecf.sh	14 Jul 2008 21:40:30 -0000	1.1
+++ fetch-ecf.sh	18 Sep 2009 13:41:44 -0000	1.2
@@ -2,14 +2,29 @@
 
 for f in \
     org.eclipse.ecf \
-    org.eclipse.ecf.core.identity \
     org.eclipse.ecf.filetransfer \
+    org.eclipse.ecf.identity \
+    org.eclipse.ecf.ssl \
+; do
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
+export -r v20090604-1131 org.eclipse.ecf/framework/bundles/$f;
+done
+
+mkdir org.eclipse.ecf/plugins
+mv org.eclipse.ecf/framework/bundles/* org.eclipse.ecf/plugins
+rm -fr org.eclipse.ecf/framework
+
+for f in \
     org.eclipse.ecf.provider.filetransfer \
+    org.eclipse.ecf.provider.filetransfer.httpclient \
+    org.eclipse.ecf.provider.filetransfer.httpclient.ssl \
     org.eclipse.ecf.provider.filetransfer.ssl \
-    org.eclipse.ecf.ssl \
 ; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology \
-export -r v20080611-1715 org.eclipse.ecf/plugins/$f;
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
+export -r v20090604-1131 org.eclipse.ecf/providers/bundles/$f;
 done
 
-tar cjf ecf-filetransfer-v20080611-1715.tar.bz2 org.eclipse.ecf
+mv org.eclipse.ecf/providers/bundles/* org.eclipse.ecf/plugins
+rm -fr org.eclipse.ecf/providers
+
+tar cjf ecf-filetransfer-v20090604-1131.tar.bz2 org.eclipse.ecf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	31 Aug 2009 10:43:32 -0000	1.79
+++ sources	18 Sep 2009 13:41:44 -0000	1.80
@@ -1,3 +1,3 @@
-611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
+4e76e7a49f8af3eff4f457f285323d2c  ecf-filetransfer-v20090604-1131.tar.bz2


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -p -r1.665 -r1.666
--- eclipse.spec	15 Sep 2009 16:19:48 -0000	1.665
+++ eclipse.spec	18 Sep 2009 13:41:44 -0000	1.666
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.12%{?dist}
+Release:        0.13%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -52,7 +52,7 @@ Source24:       fetch-ecf.sh
 # filetransfer bits that are part of the SDK actually require the SDK >=
 # 3.4 to build, I'm going to build them here and have them be owned by
 # the SDK packages for now. -- overholt, 2008-07-07
-Source25:       ecf-filetransfer-v20080611-1715.tar.bz2
+Source25:       ecf-filetransfer-v20090604-1131.tar.bz2
 # Create a simple feature for building ECF's filetransfer plugins
 Source26:       ecf-filetransfer-feature.xml
 Source27:       ecf-filetransfer-build.properties
@@ -633,16 +633,14 @@ if [ ! -z "$JARS" ]; then
 fi
 
 # ECF filetransfer plugins
-# TODO Enable with correct ecf
-#tar jxf %{SOURCE25}
-#pushd org.eclipse.ecf
-#%patch35
-#mkdir -p features/org.eclipse.ecf.filetransfer-feature
-#pushd features/org.eclipse.ecf.filetransfer-feature
-#cp -p %{SOURCE26} feature.xml
-#cp -p %{SOURCE27} build.properties
-#popd
-#popd
+tar jxf %{SOURCE25}
+pushd org.eclipse.ecf
+mkdir -p features/org.eclipse.ecf.filetransfer-feature
+pushd features/org.eclipse.ecf.filetransfer-feature
+cp -p %{SOURCE26} feature.xml
+cp -p %{SOURCE27} build.properties
+popd
+popd
 
 %patch43
 %patch44
@@ -655,10 +653,6 @@ fi
 # target platform template patch
 %patch50 -p0
 
-sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \
-	-e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \
-	plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
-
 popd
 
 %build
@@ -668,6 +662,7 @@ export JAVA_HOME=%{java_home}
 
 SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
 LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
 pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
       org.eclipse.core.launcher.Main \
@@ -678,22 +673,23 @@ popd
 
 #
 # Build the ECF filetransfer plugins
-# TODO reenable with correct ecf
-#pushd org.eclipse.ecf
-#mkdir -p build
-#
-#java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-#     -Duser.home=$homedir                              \
-#      org.eclipse.core.launcher.Main \
-#     -application org.eclipse.ant.core.antRunner       \
-#     -Dtype=feature                                    \
-#     -Did=org.eclipse.ecf.filetransfer_feature                   \
-#     -DsourceDirectory=$(pwd)                          \
-#     -DbaseLocation=$SDK \
-#     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-#     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-#
-#popd
+pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
+mkdir -p build
+homedir=$(mkdir home| cd home|pwd)
+java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+     -Duser.home=$homedir                              \
+      org.eclipse.core.launcher.Main \
+     -application org.eclipse.ant.core.antRunner       \
+     -Dtype=feature                                    \
+     -Did=org.eclipse.ecf.filetransfer_feature                   \
+     -DsourceDirectory=$(pwd)                          \
+     -DbaseLocation=$SDK \
+     -DforceContextQualifier=v20090604-1131 \
+     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
+     -debug -consolelog \
+     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
+
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -724,12 +720,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 cp -R build/eclipse-I20090611-1540-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
 rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
 # ECF filetransfer plugins we built
-#rm $sdkDir/plugins/org.eclipse.ecf*.jar
-#unzip -d $RPM_BUILD_ROOT%{_libdir} \
-#  org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
+rm $sdkDir/plugins/org.eclipse.ecf*.jar
+unzip -d $RPM_BUILD_ROOT%{_libdir} \
+  build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
 # Remove the feature we used for building
-#rm -rf \
-#  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
+rm -rf \
+  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
@@ -1427,7 +1423,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-0.12
+* Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.13
+- Update ecf-filetransfer and build it.
+
+* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.12
 - Build with system jetty.
 
 * Mon Sep 14 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	31 Aug 2009 10:43:33 -0000	1.61
+++ .cvsignore	18 Sep 2009 13:41:44 -0000	1.62
@@ -2,3 +2,4 @@ ecf-filetransfer-v20080611-1715.tar.bz2
 eclipse-ecj-gcj.tar.bz2
 eclipse-I20090611-1540-fetched-src.tar.bz2
 eclipse-build-R0_3_0.tar.gz
+ecf-filetransfer-v20090604-1131.tar.bz2



From abbot at fedoraproject.org  Fri Sep 18 13:55:39 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Fri, 18 Sep 2009 13:55:39 +0000 (UTC)
Subject: rpms/protobuf/F-11 protobuf-2.2.0-fedora-gtest.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 protobuf.spec, 1.5, 1.6 sources, 1.2,
	1.3 protobuf-2.0.2-includes.patch, 1.1,
	NONE protobuf-fedora-gtest.patch, 1.1,
	NONE protobuf-gcc-4.3.0.patch, 1.1,
	NONE protobuf-pkgconfig-autotools.patch, 1.1,
	NONE protobuf.pc.in, 1.1, NONE
Message-ID: <20090918135539.0800211C01EA@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/protobuf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30389

Modified Files:
	.cvsignore protobuf.spec sources 
Added Files:
	protobuf-2.2.0-fedora-gtest.patch 
Removed Files:
	protobuf-2.0.2-includes.patch protobuf-fedora-gtest.patch 
	protobuf-gcc-4.3.0.patch protobuf-pkgconfig-autotools.patch 
	protobuf.pc.in 
Log Message:
updated to protobuf-2.2.0


protobuf-2.2.0-fedora-gtest.patch:
 Makefile.am     |   21 ---------------------
 autogen.sh      |    9 ---------
 src/Makefile.am |   14 ++++----------
 3 files changed, 4 insertions(+), 40 deletions(-)

--- NEW FILE protobuf-2.2.0-fedora-gtest.patch ---
>From 2118fa2281c9554dd93f2fcd917e826d6b191daf Mon Sep 17 00:00:00 2001
From: Lev Shamardin <shamardin at gmail.com>
Date: Fri, 18 Sep 2009 13:20:48 +0400
Subject: [PATCH] fedora-gmake.patch

---
 protobuf-2.2.0/Makefile.am     |   21 ---------------------
 protobuf-2.2.0/autogen.sh      |    9 ---------
 protobuf-2.2.0/src/Makefile.am |   13 ++++---------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/protobuf-2.2.0/Makefile.am b/protobuf-2.2.0/Makefile.am
index c311fe0..23ee406 100644
--- a/protobuf-2.2.0/Makefile.am
+++ b/protobuf-2.2.0/Makefile.am
@@ -11,27 +11,6 @@ SUBDIRS = . src
 # Always include gtest in distributions.
 DIST_SUBDIRS = $(subdirs) src
 
-# Build gtest before we build protobuf tests.  We don't add gtest to SUBDIRS
-# because then "make check" would also build and run all of gtest's own tests,
-# which takes a lot of time and is generally not useful to us.  Also, we don't
-# want "make install" to recurse into gtest since we don't want to overwrite
-# the installed version of gtest if there is one.
-check-local:
-	@echo "Making lib/libgtest.a lib/libgtest_main.a in gtest"
-	@cd gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-
-# We would like to clean gtest when "make clean" is invoked.  But we have to
-# be careful because clean-local is also invoked during "make distclean", but
-# "make distclean" already recurses into gtest because it's listed among the
-# DIST_SUBDIRS.  distclean will delete gtest/Makefile, so if we then try to
-# cd to the directory again and "make clean" it will fail.  So, check that the
-# Makefile exists before recursing.
-clean-local:
-	@if test -e gtest/Makefile; then \
-	  echo "Making clean in gtest"; \
-	  cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \
-	fi
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 
diff --git a/protobuf-2.2.0/autogen.sh b/protobuf-2.2.0/autogen.sh
index 519bb8f..c17e316 100755
--- a/protobuf-2.2.0/autogen.sh
+++ b/protobuf-2.2.0/autogen.sh
@@ -15,15 +15,6 @@ fi
 
 set -ex
 
-# Temporary hack:  Must change C runtime library to "multi-threaded DLL",
-#   otherwise it will be set to "multi-threaded static" when MSVC upgrades
-#   the project file to MSVC 2005/2008.  vladl of Google Test says gtest will
-#   probably change their default to match, then this will be unnecessary.
-#   One of these mappings converts the debug configuration and the other
-#   converts the release configuration.  I don't know which is which.
-sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
-           s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
-
 # TODO(kenton):  Remove the ",no-obsolete" part and fix the resulting warnings.
 autoreconf -f -i -Wall,no-obsolete
 
diff --git a/protobuf-2.2.0/src/Makefile.am b/protobuf-2.2.0/src/Makefile.am
index f009838..373c463 100644
--- a/protobuf-2.2.0/src/Makefile.am
+++ b/protobuf-2.2.0/src/Makefile.am
@@ -267,10 +267,8 @@ COMMON_TEST_SOURCES =                                          \
 
 check_PROGRAMS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test $(GZCHECKPROGRAMS)
 protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                      $(top_builddir)/gtest/lib/libgtest.la       \
-                      $(top_builddir)/gtest/lib/libgtest_main.la
-protobuf_test_CPPFLAGS = -I$(top_srcdir)/gtest/include         \
-                         -I$(top_builddir)/gtest/include
+                      -lgtest -lgtest_main
+protobuf_test_CPPFLAGS = 
 # Disable optimization for tests unless the user explicitly asked for it,
 # since test_util.cc takes forever to compile with optimization (with GCC).
 # See configure.ac for more info.
@@ -305,11 +303,8 @@ nodist_protobuf_test_SOURCES = $(protoc_outputs)
 
 # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
 protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                      $(top_builddir)/gtest/lib/libgtest.la       \
-                      $(top_builddir)/gtest/lib/libgtest_main.la
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(top_srcdir)/gtest/include    \
-                                         -I$(top_builddir)/gtest/include  \
-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
+                      -lgtest -lgtest_main
+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
 protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
 protobuf_lazy_descriptor_test_SOURCES =                        \
   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Nov 2008 18:48:07 -0000	1.2
+++ .cvsignore	18 Sep 2009 13:55:38 -0000	1.3
@@ -1 +1 @@
-protobuf-2.0.2.tar.bz2
+protobuf-2.2.0.tar.bz2


Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/F-11/protobuf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- protobuf.spec	1 Mar 2009 10:36:00 -0000	1.5
+++ protobuf.spec	18 Sep 2009 13:55:38 -0000	1.6
@@ -12,18 +12,14 @@
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        2.0.2
-Release:        8%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
-Source1:        protobuf.pc.in
-Source2:        ftdetect-proto.vim
-Patch0:         protobuf-pkgconfig-autotools.patch
-Patch1:         protobuf-fedora-gtest.patch
+Source1:        ftdetect-proto.vim
+Patch1:         protobuf-%{version}-fedora-gtest.patch
 Patch2:         protobuf-java-notests.patch
-Patch3:         protobuf-gcc-4.3.0.patch
-Patch4:         protobuf-2.0.2-includes.patch
 URL:            http://code.google.com/p/protobuf/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  automake autoconf libtool pkgconfig 
@@ -72,6 +68,43 @@ Requires: %{name} = %{version}-%{release
 %description static
 Static libraries for Protocol Buffers
 
+%package lite
+Summary: Protocol Buffers LITE_RUNTIME libraries
+Group: Development/Libraries
+
+%description lite
+Protocol Buffers built with optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
+%package lite-devel
+Summary: Protocol Buffers LITE_RUNTIME development libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-lite = %{version}-%{release}
+
+%description lite-devel
+This package contains development libraries built with 
+optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
+%package lite-static
+Summary: Static development files for %{name}-lite
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description lite-static
+This package contains static development libraries built with 
+optimize_for = LITE_RUNTIME.
+
+The "optimize_for = LITE_RUNTIME" option causes the compiler to generate code
+which only depends libprotobuf-lite, which is much smaller than libprotobuf but
+lacks descriptors, reflection, and some other features.
+
 %if %{with_python}
 %package python
 Summary: Python bindings for Google Protocol Buffers
@@ -132,21 +165,19 @@ This package contains the API documentat
 
 %prep
 %setup -q
-%patch0 -p1
 %if !%{without_gtest}
-rm -rf src/gtest
-%patch1 -p1
+rm -rf gtest
+%patch1 -p2
 %endif
-cp -p %{SOURCE1} .
 chmod 644 examples/*
 %if %{with_java}
 %patch2
 rm -rf java/src/test
 %endif
-%patch3 -p0
-%patch4 -p1
 
 %build
+iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
+mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
 ./autogen.sh
 %configure
 
@@ -174,12 +205,13 @@ make %{?_smp_mflags} check
 rm -rf %{buildroot}
 make %{?_smp_mflags} install DESTDIR=%{buildroot} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
 find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
+
 %if %{with_python}
 pushd python
 python ./setup.py install --root=%{buildroot} --single-version-externally-managed --record=INSTALLED_FILES --optimize=1
 popd
 %endif
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/proto.vim
+install -p -m 644 -D %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/proto.vim
 install -p -m 644 -D editors/proto.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/proto.vim
 
 %if %{with_java}
@@ -199,6 +231,9 @@ install -pm 644 pom.xml %{buildroot}%{_d
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post lite -p /sbin/ldconfig
+%postun lite -p /sbin/ldconfig
+
 %post compiler -p /sbin/ldconfig
 %postun compiler -p /sbin/ldconfig
 
@@ -238,13 +273,26 @@ rm -rf %{buildroot}
 %{_libdir}/libprotobuf.a
 %{_libdir}/libprotoc.a
 
+%files lite
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.so.*
+
+%files lite-devel
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.so
+%{_libdir}/pkgconfig/protobuf-lite.pc
+
+%files lite-static
+%defattr(-, root, root, -)
+%{_libdir}/libprotobuf-lite.a
+
 %if %{with_python}
 %files python
 %defattr(-, root, root, -)
 %dir %{python_sitelib}/google
 %{python_sitelib}/google/protobuf/
-%{python_sitelib}/protobuf-2.0.2-py2.6.egg-info/
-%{python_sitelib}/protobuf-2.0.2-py2.6-nspkg.pth
+%{python_sitelib}/protobuf-%{version}-py2.6.egg-info/
+%{python_sitelib}/protobuf-%{version}-py2.6-nspkg.pth
 %doc python/README.txt 
 %doc examples/add_person.py examples/list_people.py examples/addressbook.proto
 %endif
@@ -268,6 +316,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Sep 18 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-1
+- Upgraded to upstream protobuf-2.2.0
+- New -lite packages
+
 * Sun Mar 01 2009 Caol?n McNamra <caolanm at redhat.com> - 2.0.2-8
 - add stdio.h for sprintf, perror, etc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Nov 2008 18:48:07 -0000	1.2
+++ sources	18 Sep 2009 13:55:38 -0000	1.3
@@ -1 +1 @@
-6674270b1d63c2c4b292644f48fede4e  protobuf-2.0.2.tar.bz2
+5c8abb579721fc3af7c94fb2019c4d2e  protobuf-2.2.0.tar.bz2


--- protobuf-2.0.2-includes.patch DELETED ---


--- protobuf-fedora-gtest.patch DELETED ---


--- protobuf-gcc-4.3.0.patch DELETED ---


--- protobuf-pkgconfig-autotools.patch DELETED ---


--- protobuf.pc.in DELETED ---



From mhlavink at fedoraproject.org  Fri Sep 18 13:58:19 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 13:58:19 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-11 .cvsignore, 1.14,
	1.15 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.3,
	1.4 cyrus-imapd-2.3.13-bufov.patch, 1.1,
	1.2 cyrus-imapd-2.3.7-notify_sms.patch, 1.1,
	1.2 cyrus-imapd.spec, 1.55, 1.56 sources, 1.16, 1.17
Message-ID: <20090918135819.F00D211C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32063

Modified Files:
	.cvsignore cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.13-bufov.patch 
	cyrus-imapd-2.3.7-notify_sms.patch cyrus-imapd.spec sources 
Log Message:
* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
- fix another buffer overflow in cyrus sieve (CVE-2009-3235)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Apr 2009 13:44:02 -0000	1.14
+++ .cvsignore	18 Sep 2009 13:58:19 -0000	1.15
@@ -1,2 +1,2 @@
-cyrus-imapd-2.3.14.tar.gz
+cyrus-imapd-2.3.15.tar.gz
 cyrus_sharedbackup-0.1.tar.gz

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
 cyrus-imapd-2.3.13/README.autocreate    |  211 +++++++++++
 cyrus-imapd-2.3.15/imap/Makefile.in     |  155 ++++----
 cyrus-imapd-2.3.15/imap/autosieve.c     |  590 ++++++++++++++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/compile_sieve.c |  365 +++++++++++++++++++
 cyrus-imapd-2.3.15/imap/imapd.c         |   43 ++
 cyrus-imapd-2.3.15/imap/lmtpd.c         |   92 ++++
 cyrus-imapd-2.3.15/imap/mboxlist.c      |  370 ++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/mboxlist.h      |    4 
 cyrus-imapd-2.3.15/imap/pop3d.c         |   46 ++
 cyrus-imapd-2.3.15/lib/auth.c           |    8 
 cyrus-imapd-2.3.15/lib/auth.h           |    2 
 cyrus-imapd-2.3.15/lib/auth_krb.c       |   17 
 cyrus-imapd-2.3.15/lib/auth_krb5.c      |   15 
 cyrus-imapd-2.3.15/lib/auth_pts.c       |    9 
 cyrus-imapd-2.3.15/lib/auth_unix.c      |   11 
 cyrus-imapd-2.3.15/lib/imapoptions      |   49 ++
 cyrus-imapd-2.3.15/notifyd/Makefile.in  |    3 
 cyrus-imapd-2.3.15/notifyd/notifyd.c    |    2 
 cyrus-imapd-2.3.15/ptclient/Makefile.in |    3 
 19 files changed, 1916 insertions(+), 79 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diffIndex: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	2 Apr 2009 13:44:02 -0000	1.3
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	18 Sep 2009 13:58:19 -0000	1.4
@@ -1,435 +1,611 @@
---- cyrus-imapd-2.3.13/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
-+++ cyrus-imapd-2.3.13/notifyd/notifyd.c	2009-01-13 11:14:09.000000000 +0100
-@@ -96,7 +96,7 @@
- 
- #define NOTIFY_MAXSIZE 8192
- 
--int do_notify()
-+static int do_notify()
- {
-     struct sockaddr_un sun_data;
-     socklen_t sunlen = sizeof(sun_data);
---- cyrus-imapd-2.3.13/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
-+++ cyrus-imapd-2.3.13/notifyd/Makefile.in	2009-01-13 11:14:09.000000000 +0100
-@@ -71,10 +71,11 @@
- SERVICE=../master/service.o
- 
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
--DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
- PURIFY=/usr/local/bin/purify
- PUREOPT=-best-effort
---- cyrus-imapd-2.3.13/imap/mboxlist.c.autocreate	2008-10-08 17:47:08.000000000 +0200
-+++ cyrus-imapd-2.3.13/imap/mboxlist.c	2009-01-13 11:14:09.000000000 +0100
-@@ -83,6 +83,12 @@
- #include "quota.h"
- #include "sync_log.h"
- 
-+#ifdef USE_SIEVE
-+extern int autoadd_sieve(char *userid, 
-+		const char *source_script);
+diff -up /dev/null cyrus-imapd-2.3.15/imap/autosieve.c
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/imap/autosieve.c	2009-09-18 11:11:39.778115814 +0200
+@@ -0,0 +1,590 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
 +#endif
 +
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/uio.h>
++#include <fcntl.h>
++#include <ctype.h>
++#include <time.h>
++#include <syslog.h>
++#include <com_err.h>
++#include <config.h>
 +
- #define DB config_mboxlist_db
- #define SUBDB config_subscription_db
- 
-@@ -100,11 +106,29 @@
- static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
- 				void *rock);
- 
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+			      void *rock);
++#include "global.h"
++#include "util.h"
++#include "xmalloc.h"
++#include "xstrlcpy.h"
++#include "xstrlcat.h"
++#include "mailbox.h"
++#include "imap_err.h"
++#include "sieve_interface.h"
++#include "script.h"
 +
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state);
++#define TIMSIEVE_FAIL 	-1
++#define TIMSIEVE_OK 	0
++#define MAX_FILENAME	1024
 +
- struct change_rock {
-     struct quota *quota;
-     struct txn **tid;
- };
- 
-+/*
-+ * Struct needed to be passed as void *rock to
-+ * mboxlist_autochangesub();
-+ */
-+struct changesub_rock_st {
-+        char *userid;
-+        char *auth_userid;
-+        struct auth_state *auth_state;
-+};
++static int get_script_name(char *sievename, size_t buflen, const char *filename);
++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
++int autoadd_sieve(char *userid, const char *source_script);
 +
++//static void fatal(const char *s, int code);
++static void foo(void);
++static int sieve_notify(void *ac __attribute__((unused)),
++                        void *interp_context __attribute__((unused)),
++                        void *script_context __attribute__((unused)),
++                        void *message_context __attribute__((unused)),
++                        const char **errmsg __attribute__((unused)));
++static int mysieve_error(int lineno, const char *msg,
++                  void *i __attribute__((unused)), void *s);
++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
++
++
++sieve_vacation_t vacation2 = {
++    0,                          /* min response */
++    0,                          /* max response */
++    (sieve_callback *) &foo,    /* autorespond() */
++    (sieve_callback *) &foo     /* send_response() */
++};
 +
- #define FNAME_SUBSSUFFIX ".sub"
- 
- /*
-@@ -3383,3 +3407,349 @@
- 
-     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
- }
 +
 +/*
-+ * Automatically subscribe user to *ALL* shared folders,
-+ * one has permissions to be subscribed to.
-+ * INBOX subfolders are excluded.
++ * Find the name of the sieve script
++ * given the source script and compiled script names
 + */
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+                        void *rock) {
-+
-+  struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
-+  char *userid = changesub_rock->userid;
-+  char *auth_userid = changesub_rock->auth_userid;
-+  struct auth_state *auth_state = changesub_rock->auth_state;
++static int get_script_name(char *sievename, size_t buflen, const char *filename)
++{
++  char *p;
 +  int r;
 +
++  p = strrchr(filename, '/');
++  if (p == NULL)
++      p = (char *) filename;
++  else
++      p++;
 +
-+  if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
-+     (strlen(name) > 5  && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
-+     (strlen(name) > 4  && !strncmp(name, "user.", 5)))   /* Exclude other users' folders */
-+	  return 0;
-+
-+     
-+  r = mboxlist_changesub(name, userid, auth_state, 1, 0);
-+
-+  if (r) {
-+      syslog(LOG_WARNING,
-+             "autosubscribe: User %s to folder %s, subscription failed: %s",
-+             auth_userid, name, error_message(r));
-+  } else {
-+      syslog(LOG_NOTICE,
-+             "autosubscribe: User %s to folder %s, subscription succeeded",
-+             auth_userid, name);
-+  }
-+
-+  return 0;
++  r = strlcpy(sievename, p, buflen) - buflen;
++  return (r >= 0 || r == -buflen ? 1 : 0);
 +}
 +
-+#define SEP '|'
 +
 +/*
-+ * Automatically subscribe user to a shared folder.
-+ * Subscription is done successfully, if the shared
-+ * folder exists and the user has the necessary 
-+ * permissions.
++ * Find the directory where the sieve scripts of the user
++ * reside
 + */
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state) {
-+        
[...2756 lines suppressed...]
+ 
+ struct auth_mech auth_krb5 = 
+@@ -240,4 +254,5 @@ struct auth_mech auth_krb5 = 
+     &mymemberof,
+     &mynewstate,
+     &myfreestate,
++    &mycanonuser,
+ };
+diff -up cyrus-imapd-2.3.15/lib/auth_krb.c.autocreate cyrus-imapd-2.3.15/lib/auth_krb.c
+--- cyrus-imapd-2.3.15/lib/auth_krb.c.autocreate	2009-03-31 06:11:21.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/auth_krb.c	2009-09-18 11:11:39.785115812 +0200
+@@ -341,6 +341,15 @@ struct auth_state *auth_state;
      free((char *)auth_state);
  }
  
@@ -2192,7 +2222,7 @@
  #else /* HAVE_KRB */
  
  static int mymemberof(
-@@ -371,6 +380,13 @@
+@@ -372,6 +381,13 @@ static void myfreestate(
  	fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
  }
  
@@ -2206,15 +2236,16 @@
  #endif
  
  struct auth_mech auth_krb = 
-@@ -381,4 +397,5 @@
+@@ -382,4 +398,5 @@ struct auth_mech auth_krb = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_pts.c	2009-01-13 11:14:09.000000000 +0100
-@@ -512,6 +512,14 @@
+diff -up cyrus-imapd-2.3.15/lib/auth_pts.c.autocreate cyrus-imapd-2.3.15/lib/auth_pts.c
+--- cyrus-imapd-2.3.15/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.15/lib/auth_pts.c	2009-09-18 11:11:39.785115812 +0200
+@@ -512,6 +512,14 @@ static void myfreestate(struct auth_stat
      free(auth_state);
  }
  
@@ -2229,68 +2260,42 @@
  struct auth_mech auth_pts = 
  {
      "pts",		/* name */
-@@ -520,4 +528,5 @@
+@@ -520,4 +528,5 @@ struct auth_mech auth_pts = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/auth.h.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth.h	2009-01-13 11:14:09.000000000 +0100
-@@ -55,6 +55,7 @@
-              const char *identifier);
-     struct auth_state *(*newstate)(const char *identifier);
-     void (*freestate)(struct auth_state *auth_state);
-+    char *(*auth_canonuser)(struct auth_state *auth_state);
- };
- 
- extern struct auth_mech *auth_mechs[];
-@@ -77,5 +78,6 @@
-  	 const char *identifier);
- struct auth_state *auth_newstate(const char *identifier);
- void auth_freestate(struct auth_state *auth_state);
-+char *auth_canonuser(struct auth_state *auth_state);
- 
- #endif /* INCLUDED_AUTH_H */
---- cyrus-imapd-2.3.13/lib/auth_krb5.c.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_krb5.c	2009-01-13 11:14:09.000000000 +0100
-@@ -199,6 +199,14 @@
-     free(auth_state);
+diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.autocreate cyrus-imapd-2.3.15/lib/auth_unix.c
+--- cyrus-imapd-2.3.15/lib/auth_unix.c.autocreate	2009-03-31 06:11:22.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:11:39.787115798 +0200
+@@ -315,6 +315,16 @@ struct auth_state *auth_state;
+     free((char *)auth_state);
  }
  
-+static char *mycanonuser(struct auth_state *auth_state)
++static char *mycanonuser(auth_state)
++    struct auth_state *auth_state;
 +{
 +    if (auth_state)
-+       return auth_state->userid;
++         return auth_state->userid;
 +
 +    return NULL;
 +}
 +
- #else /* HAVE_GSSAPI_H */
- 
- static int mymemberof(
-@@ -230,6 +238,12 @@
- 	fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
- }
- 
-+static char *mycanonuser(
-+    struct auth_state *auth_state __attribute__((unused)))
-+{
-+        fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
-+}
 +
- #endif
  
- struct auth_mech auth_krb5 = 
-@@ -240,4 +254,5 @@
+ struct auth_mech auth_unix = 
+ {
+@@ -324,4 +334,5 @@ struct auth_mech auth_unix = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/imapoptions.autocreate	2008-10-08 19:18:12.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:14:09.000000000 +0100
-@@ -198,6 +198,55 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.autocreate cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.autocreate	2009-06-29 19:21:06.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:11:39.787115798 +0200
+@@ -198,6 +198,55 @@ are listed with ``<none>''.
  /* Number of seconds to wait before returning a timeout failure when
     performing a client connection (e.g., in a murder environment) */
  
@@ -2346,28 +2351,47 @@
  { "configdirectory", NULL, STRING }
  /* The pathname of the IMAP configuration directory.  This field is
     required. */
---- cyrus-imapd-2.3.13/lib/auth_unix.c.autocreate	2008-08-26 21:20:39.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:14:09.000000000 +0100
-@@ -314,6 +314,16 @@
-     free((char *)auth_state);
- }
+diff -up cyrus-imapd-2.3.15/notifyd/Makefile.in.autocreate cyrus-imapd-2.3.15/notifyd/Makefile.in
+--- cyrus-imapd-2.3.15/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/Makefile.in	2009-09-18 11:11:39.776115765 +0200
+@@ -71,10 +71,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@
+ SERVICE=../master/service.o
  
-+static char *mycanonuser(auth_state)
-+    struct auth_state *auth_state;
-+{
-+    if (auth_state)
-+         return auth_state->userid;
-+
-+    return NULL;
-+}
-+
-+
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
+ LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
+-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
  
- struct auth_mech auth_unix = 
+ PURIFY=/usr/local/bin/purify
+ PUREOPT=-best-effort
+diff -up cyrus-imapd-2.3.15/notifyd/notifyd.c.autocreate cyrus-imapd-2.3.15/notifyd/notifyd.c
+--- cyrus-imapd-2.3.15/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/notifyd.c	2009-09-18 11:11:39.776115765 +0200
+@@ -96,7 +96,7 @@ char *fetch_arg(char *head, char* tail)
+ 
+ #define NOTIFY_MAXSIZE 8192
+ 
+-int do_notify()
++static int do_notify()
  {
-@@ -323,4 +333,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
+     struct sockaddr_un sun_data;
+     socklen_t sunlen = sizeof(sun_data);
+diff -up cyrus-imapd-2.3.15/ptclient/Makefile.in.autocreate cyrus-imapd-2.3.15/ptclient/Makefile.in
+--- cyrus-imapd-2.3.15/ptclient/Makefile.in.autocreate	2008-03-24 19:34:22.000000000 +0100
++++ cyrus-imapd-2.3.15/ptclient/Makefile.in	2009-09-18 11:11:39.784115791 +0200
+@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(
+ AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
+ AFS_LIBS = @AFS_LIBS@
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
+ LIB_SASL = @LIB_SASL@
+ LIB_WRAP = @LIB_WRAP@
+-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ 
+ UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
+ 
+ LDAP_LIBS=@LDAP_LIBS@

cyrus-imapd-2.3.13-bufov.patch:
 bc_eval.c |    6 +++---
 script.c  |    4 ++--
 sieve.y   |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: cyrus-imapd-2.3.13-bufov.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.13-bufov.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.13-bufov.patch	7 Sep 2009 14:42:02 -0000	1.1
+++ cyrus-imapd-2.3.13-bufov.patch	18 Sep 2009 13:58:19 -0000	1.2
@@ -1,80 +1,57 @@
---- src/sieve/script.c	2008/03/24 20:08:46	1.67
-+++ src/sieve/script.c	2009/09/02 13:56:18	1.68
-@@ -40,7 +40,7 @@
-  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  *
-- * $Id$
-+ * $Id$
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
- 	ret |= keep_ret;
-         if (keep_ret == SIEVE_OK)
-             snprintf(actions_string+strlen(actions_string),
--		     sizeof(actions_string)-strlen(actions_string),
-+		     ACTIONS_STRING_LEN-strlen(actions_string),
- 		     "Kept\n");
- 	else {
- 	    implicit_keep = 0;	/* don't try an implicit keep again */
-@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
- 	    
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string), 
-+			 ACTIONS_STRING_LEN-strlen(actions_string), 
- 			 "Rejected with: %s\n", a->u.rej.msg);
- 
- 	    break;
-@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
- 
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Filed into: %s\n",a->u.fil.mailbox);
- 	    break;
- 	case ACTION_KEEP:
-@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
- 			       &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Kept\n");
- 	    break;
- 	case ACTION_REDIRECT:
-@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
- 				   &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Redirected to %s\n", a->u.red.addr);
- 	    break;
- 	case ACTION_DISCARD:
-@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
- 				      &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Discarded\n");
- 	    break;
- 
-@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
- 
- 		    if (ret == SIEVE_OK)
- 			snprintf(actions_string+strlen(actions_string),
--				 sizeof(actions_string)-strlen(actions_string),
-+				 ACTIONS_STRING_LEN-strlen(actions_string),
- 				 "Sent vacation reply\n");
- 
- 		} else if (ret == SIEVE_DONE) {
- 		    snprintf(actions_string+strlen(actions_string),
--			     sizeof(actions_string)-strlen(actions_string),
-+			     ACTIONS_STRING_LEN-strlen(actions_string),
- 			     "Vacation reply suppressed\n");
- 
- 		    ret = SIEVE_OK;
+diff -up cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov cyrus-imapd-2.3.15/sieve/bc_eval.c
+--- cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov	2009-03-31 06:11:30.000000000 +0200
++++ cyrus-imapd-2.3.15/sieve/bc_eval.c	2009-09-18 15:05:29.187990786 +0200
+@@ -500,7 +500,7 @@ static int eval_bc_test(sieve_interp_t *
+ 	int comparator=ntohl(bc[i+3].value);
+ 	int apart=ntohl(bc[i+4].value);
+ 	int count=0;
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+@@ -669,7 +669,7 @@ static int eval_bc_test(sieve_interp_t *
+ 	int relation=ntohl(bc[i+2].value);
+ 	int comparator=ntohl(bc[i+3].value);
+ 	int count=0;	
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+@@ -790,7 +790,7 @@ static int eval_bc_test(sieve_interp_t *
+ 	int transform=ntohl(bc[i+4].value);
+ 	/* ntohl(bc[i+5].value) is the now unused 'offset' */
+ 	int count=0;
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+diff -up cyrus-imapd-2.3.15/sieve/script.c.bufov cyrus-imapd-2.3.15/sieve/script.c
+--- cyrus-imapd-2.3.15/sieve/script.c.bufov	2009-09-02 15:56:18.000000000 +0200
++++ cyrus-imapd-2.3.15/sieve/script.c	2009-09-18 15:04:00.728927938 +0200
+@@ -668,9 +668,9 @@ static int do_sieve_error(int ret,
+     if ((ret != SIEVE_OK) && interp->err) {
+ 	char buf[1024];
+ 	if (lastaction == -1) /* we never executed an action */
+-	    sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret));
++	    snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret));
+ 	else
+-	    sprintf(buf, "%s: %s", action_to_string(lastaction),
++	    snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction),
+ 		    errmsg ? errmsg : sieve_errstr(ret));
+  
+ 	ret |= interp->execute_err(buf, interp->interp_context,
+diff -up cyrus-imapd-2.3.15/sieve/sieve.y.bufov cyrus-imapd-2.3.15/sieve/sieve.y
+--- cyrus-imapd-2.3.15/sieve/sieve.y.bufov	2009-03-26 00:58:54.000000000 +0100
++++ cyrus-imapd-2.3.15/sieve/sieve.y	2009-09-18 15:04:00.734928038 +0200
+@@ -1159,7 +1159,7 @@ static int verify_relat(char *r)
+ 	else if (!strcmp(r, "ne")) {return NE;}
+ 	else if (!strcmp(r, "eq")) {return EQ;}
+ 	else{
+-	  sprintf(errbuf, "flag '%s': not a valid relational operation", r);
++	  snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r);
+ 	  yyerror(errbuf);
+ 	  return -1;
+ 	}

cyrus-imapd-2.3.7-notify_sms.patch:
 doc/man/imapd.conf.5.html |   18 +++++++
 doc/man/notifyd.8.html    |   12 ++++
 lib/imapoptions           |    4 +
 man/imapd.conf.5          |    3 +
 man/notifyd.8             |    5 +
 notifyd/Makefile.in       |    2 
 notifyd/notify_sms.c      |  116 ++++++++++++++++++++++++++++++++++++++++++++++
 notifyd/notify_sms.h      |   61 ++++++++++++++++++++++++
 notifyd/notifyd.h         |    2 
 9 files changed, 222 insertions(+), 1 deletion(-)

Index: cyrus-imapd-2.3.7-notify_sms.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.7-notify_sms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.7-notify_sms.patch	12 Mar 2007 16:22:52 -0000	1.1
+++ cyrus-imapd-2.3.7-notify_sms.patch	18 Sep 2009 13:58:19 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Naur cyrus-imapd-2.3.7.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.3.7/doc/man/imapd.conf.5.html
---- cyrus-imapd-2.3.7.orig/doc/man/imapd.conf.5.html	2006-07-10 16:31:53.000000000 +0200
-+++ cyrus-imapd-2.3.7/doc/man/imapd.conf.5.html	2006-07-14 10:27:29.000000000 +0200
-@@ -3130,6 +3130,24 @@
+diff -up cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html.notify_sms cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html
+--- cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html.notify_sms	2009-09-09 15:19:50.000000000 +0200
++++ cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html	2009-09-18 11:49:42.207115959 +0200
+@@ -3469,6 +3469,24 @@ proxying CREATE.</p>
  <tr valign="top" align="left">
  <td width="10%"></td>
  <td width="89%">
@@ -26,10 +26,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/doc/ma
  <p><b>servername:</b> &lt;none&gt;</p></td>
  </table>
  <!-- INDENTATION -->
-diff -Naur cyrus-imapd-2.3.7.orig/doc/man/notifyd.8.html cyrus-imapd-2.3.7/doc/man/notifyd.8.html
---- cyrus-imapd-2.3.7.orig/doc/man/notifyd.8.html	2006-07-10 16:31:54.000000000 +0200
-+++ cyrus-imapd-2.3.7/doc/man/notifyd.8.html	2006-07-14 10:27:29.000000000 +0200
-@@ -181,6 +181,18 @@
+diff -up cyrus-imapd-2.3.15/doc/man/notifyd.8.html.notify_sms cyrus-imapd-2.3.15/doc/man/notifyd.8.html
+--- cyrus-imapd-2.3.15/doc/man/notifyd.8.html.notify_sms	2009-09-09 15:19:51.000000000 +0200
++++ cyrus-imapd-2.3.15/doc/man/notifyd.8.html	2009-09-18 11:49:42.208116026 +0200
+@@ -181,6 +181,18 @@ a Sieve &rsquo;notify&rsquo; action as i
  <td width="11%"></td>
  <td width="10%">
  
@@ -48,10 +48,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/doc/ma
  <p><b>zephyr</b></p>
  </td>
  <td width="77%">
-diff -Naur cyrus-imapd-2.3.7.orig/lib/imapoptions cyrus-imapd-2.3.7/lib/imapoptions
---- cyrus-imapd-2.3.7.orig/lib/imapoptions	2006-06-27 17:58:42.000000000 +0200
-+++ cyrus-imapd-2.3.7/lib/imapoptions	2006-07-14 10:27:29.000000000 +0200
-@@ -829,6 +829,10 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.notify_sms cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.notify_sms	2009-09-18 11:49:42.189116010 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:50:38.230115954 +0200
+@@ -966,6 +966,10 @@ are listed with ``<none>''.
  /* The pathname of the sendmail executable.  Sieve invokes sendmail
     for sending rejections, redirects and vacation responses. */
  
@@ -59,26 +59,26 @@ diff -Naur cyrus-imapd-2.3.7.orig/lib/im
 +/* The pathname of the sendsms executable.  Sieve invokes sendsms
 +   for sending SMS notifications. */
 +
- { "servername", NULL, STRING }
- /* This is the hostname visible in the greeting messages of the POP,
-    IMAP and LMTP daemons. If it is unset, then the result returned
-diff -Naur cyrus-imapd-2.3.7.orig/man/imapd.conf.5 cyrus-imapd-2.3.7/man/imapd.conf.5
---- cyrus-imapd-2.3.7.orig/man/imapd.conf.5	2006-07-10 16:31:52.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/imapd.conf.5	2006-07-14 10:27:29.000000000 +0200
-@@ -691,6 +691,9 @@
+ { "serverlist", NULL, STRING }
+ /* Whitespace separated list of backend server names.  Used for
+    finding server with the most available free space for proxying
+diff -up cyrus-imapd-2.3.15/man/imapd.conf.5.notify_sms cyrus-imapd-2.3.15/man/imapd.conf.5
+--- cyrus-imapd-2.3.15/man/imapd.conf.5.notify_sms	2009-09-09 15:19:48.000000000 +0200
++++ cyrus-imapd-2.3.15/man/imapd.conf.5	2009-09-18 11:51:26.441839866 +0200
+@@ -771,6 +771,9 @@ Allowed values: \fIflat\fR, \fIberkeley\
  .IP "\fBsendmail:\fR /usr/lib/sendmail" 5
  The pathname of the sendmail executable.  Sieve invokes sendmail
  for sending rejections, redirects and vacation responses. 
 +.IP "\fBsendsms:\fR /usr/bin/sendsms" 5
 +The pathname of the sendsms executable.  Sieve invokes sendsms
 +for sending SMS notifications. 
- .IP "\fBservername:\fR <none>" 5
- This is the hostname visible in the greeting messages of the POP,
- IMAP and LMTP daemons. If it is unset, then the result returned
-diff -Naur cyrus-imapd-2.3.7.orig/man/notifyd.8 cyrus-imapd-2.3.7/man/notifyd.8
---- cyrus-imapd-2.3.7.orig/man/notifyd.8	2003-08-10 01:43:14.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/notifyd.8	2006-07-14 10:27:29.000000000 +0200
-@@ -110,6 +110,11 @@
+ .IP "\fBserverlist:\fR <none>" 5
+ Whitespace separated list of backend server names.  Used for
+ finding server with the most available free space for proxying
+diff -up cyrus-imapd-2.3.15/man/notifyd.8.notify_sms cyrus-imapd-2.3.15/man/notifyd.8
+--- cyrus-imapd-2.3.15/man/notifyd.8.notify_sms	2008-04-04 14:47:00.000000000 +0200
++++ cyrus-imapd-2.3.15/man/notifyd.8	2009-09-18 11:49:42.225115999 +0200
+@@ -111,6 +111,11 @@ Email the notification.  This method can
  Sieve 'notify' action as it requires a \fImailto:\fR URL to be
  specified as an \fI:option\fR.
  .TP
@@ -90,10 +90,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/man/no
  .B zephyr
  Send the notification as a zephyrgram.  If used in a Sieve 'notify'
  action, additional recipients can be specified as \fI:options\fR.
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/Makefile.in cyrus-imapd-2.3.7/notifyd/Makefile.in
---- cyrus-imapd-2.3.7.orig/notifyd/Makefile.in	2004-05-31 20:22:59.000000000 +0200
-+++ cyrus-imapd-2.3.7/notifyd/Makefile.in	2006-07-14 10:27:29.000000000 +0200
-@@ -82,7 +82,7 @@
+diff -up cyrus-imapd-2.3.15/notifyd/Makefile.in.notify_sms cyrus-imapd-2.3.15/notifyd/Makefile.in
+--- cyrus-imapd-2.3.15/notifyd/Makefile.in.notify_sms	2009-09-18 11:49:42.172115947 +0200
++++ cyrus-imapd-2.3.15/notifyd/Makefile.in	2009-09-18 11:49:42.225115999 +0200
+@@ -85,7 +85,7 @@ all: notifyd
  install:
  	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
  
@@ -102,10 +102,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  
  notifytest: notifytest.o
  	$(CC) $(LDFLAGS) -o notifytest \
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notifyd.h cyrus-imapd-2.3.7/notifyd/notifyd.h
---- cyrus-imapd-2.3.7.orig/notifyd/notifyd.h	2003-02-13 21:15:48.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notifyd.h	2006-07-14 10:27:29.000000000 +0200
-@@ -48,6 +48,7 @@
+diff -up cyrus-imapd-2.3.15/notifyd/notifyd.h.notify_sms cyrus-imapd-2.3.15/notifyd/notifyd.h
+--- cyrus-imapd-2.3.15/notifyd/notifyd.h.notify_sms	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/notifyd.h	2009-09-18 11:49:42.233116003 +0200
+@@ -47,6 +47,7 @@
  #include "notify_null.h"
  #include "notify_log.h"
  #include "notify_mailto.h"
@@ -113,7 +113,7 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  #include "notify_zephyr.h"
  
  /* Notify method dispatch table definition */
-@@ -64,6 +65,7 @@
+@@ -63,6 +64,7 @@ notifymethod_t methods[] = {
      { "null",	notify_null },		/* do nothing */
      { "log",	notify_log },		/* use syslog (for testing) */
      { "mailto",	notify_mailto },	/* send an email */
@@ -121,9 +121,9 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  #ifdef HAVE_ZEPHYR
      { "zephyr",	notify_zephyr },	/* send a zephyrgram */
  #endif
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notify_sms.c cyrus-imapd-2.3.7/notifyd/notify_sms.c
---- cyrus-imapd-2.3.7.orig/notifyd/notify_sms.c	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notify_sms.c	2006-07-14 10:29:10.000000000 +0200
+diff -up /dev/null cyrus-imapd-2.3.15/notifyd/notify_sms.c
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/notifyd/notify_sms.c	2009-09-18 11:49:42.233116003 +0200
 @@ -0,0 +1,116 @@
 +/* notify_sms.c -- SMS notification method
 + * Simon Matter
@@ -241,9 +241,9 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
 +
 +    return strdup("OK sms notification successful");
 +}
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notify_sms.h cyrus-imapd-2.3.7/notifyd/notify_sms.h
---- cyrus-imapd-2.3.7.orig/notifyd/notify_sms.h	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notify_sms.h	2006-07-14 10:29:10.000000000 +0200
+diff -up /dev/null cyrus-imapd-2.3.15/notifyd/notify_sms.h
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/notifyd/notify_sms.h	2009-09-18 11:49:42.233116003 +0200
 @@ -0,0 +1,61 @@
 +/* notify_sms.h -- SMS notification method
 + * Simon Matter


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- cyrus-imapd.spec	7 Sep 2009 14:42:02 -0000	1.55
+++ cyrus-imapd.spec	18 Sep 2009 13:58:19 -0000	1.56
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.3.14
-Release: 2%{?dist}
+Version: 2.3.15
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -72,7 +72,6 @@ URL: http://cyrusimap.web.cmu.edu/
 #Vendor: Invoca Systems
 #Distribution: Invoca Linux Server
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-#Source2: http://ftp.gnu.org/gnu/autoconf/autoconf-%{_acversion}.tar.gz
 Source3: cyrus-deliver-wrapper.c
 Source4: cyrus-user-procmailrc.template
 Source5: cyrus-imapd.logrotate
@@ -600,6 +599,7 @@ fi
 %{_cyrexecdir}/arbitronsort.pl
 %{_cyrexecdir}/chk_cyrus
 %{_cyrexecdir}/convert-sieve.pl
+%{_cyrexecdir}/cyr_df
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
@@ -731,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
+- fix another buffer overflow in cyrus sieve (CVE-2009-3235)
+
 * Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-2
 - fix buffer overflow in cyrus sieve (#521010)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Apr 2009 13:44:02 -0000	1.16
+++ sources	18 Sep 2009 13:58:19 -0000	1.17
@@ -1,2 +1,2 @@
-1030d4d9d04036b2fb9830165723908e  cyrus-imapd-2.3.14.tar.gz
+d89cb1b55023188938f332b7ef120fae  cyrus-imapd-2.3.15.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz



From mhlavink at fedoraproject.org  Fri Sep 18 14:05:51 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 14:05:51 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-11 cyrus-imapd-2.3.1-authid_normalize.patch, 1.3,
	1.4
Message-ID: <20090918140551.7C3E711C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2634

Modified Files:
	cyrus-imapd-2.3.1-authid_normalize.patch 
Log Message:
trim patches


cyrus-imapd-2.3.1-authid_normalize.patch:
 auth_unix.c  |   18 ++++++++++++++++++
 imapoptions  |    5 +++++
 libcyr_cfg.c |    4 ++++
 libcyr_cfg.h |    2 ++
 4 files changed, 29 insertions(+)

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd-2.3.1-authid_normalize.patch	21 Jan 2009 13:50:36 -0000	1.3
+++ cyrus-imapd-2.3.1-authid_normalize.patch	18 Sep 2009 14:05:50 -0000	1.4
@@ -1,17 +1,7 @@
---- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
-@@ -112,6 +112,8 @@ enum cyrus_opt {
-     CYRUSOPT_SQL_PASSWD,
-     /* Secure SQL connection (OFF) */
-     CYRUSOPT_SQL_USESSL,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-     
---- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
-@@ -155,10 +155,12 @@
+diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize cyrus-imapd-2.3.15/lib/auth_unix.c
+--- cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize	2009-09-18 11:53:47.183115911 +0200
++++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:53:47.252115833 +0200
+@@ -156,10 +156,12 @@ const char *identifier;
  size_t len;
  {
      static char retbuf[81];
@@ -24,7 +14,7 @@
  
      if(!len) len = strlen(identifier);
      if(len >= sizeof(retbuf)) return NULL;
-@@ -210,6 +212,22 @@
+@@ -211,6 +213,22 @@ size_t len;
      /* now we don't */
      /* if (!sawalpha) return NULL;  */
  
@@ -47,9 +37,10 @@
      return retbuf;
  }
  
---- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize	2009-01-13 11:38:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:38:08.000000000 +0100
-@@ -1182,6 +1182,11 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize	2009-09-18 11:53:47.244115877 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:53:47.260115873 +0200
+@@ -1217,6 +1217,11 @@ product version in the capabilities */
     interface, otherwise the user is assumed to be in the default
     domain (if set). */
  
@@ -61,17 +52,29 @@
  /*
  .SH SEE ALSO
  .PP
---- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize	2008-07-30 18:03:38.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c	2009-01-13 11:38:08.000000000 +0100
-@@ -150,6 +150,11 @@
-       CFGVAL(long, 0),
+diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.c
+--- cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize	2009-03-31 06:43:20.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/libcyr_cfg.c	2009-09-18 11:55:03.436822867 +0200
+@@ -154,6 +154,10 @@ struct cyrusopt_s cyrus_options[] = {
+       CFGVAL(long, 1),
        CYRUS_OPT_SWITCH },
  
 +    { CYRUSOPT_NORMALIZEUID,
 +      CFGVAL(long, 1),
 +      CYRUS_OPT_SWITCH },
 +
-+
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
+diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.h
+--- cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize	2009-03-31 06:43:20.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/libcyr_cfg.h	2009-09-18 11:55:33.267115989 +0200
+@@ -114,6 +114,8 @@ enum cyrus_opt {
+     CYRUSOPT_SQL_USESSL,
+     /* Checkpoint after every recovery (OFF) */
+     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
++    /* Lowercase uid and strip leading and trailing blanks (OFF) */
++    CYRUSOPT_NORMALIZEUID,
+ 
+     CYRUSOPT_LAST
+     



From mhlavink at fedoraproject.org  Fri Sep 18 14:22:28 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 14:22:28 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-10 .cvsignore, 1.14,
	1.15 cyrus-imapd-2.3.1-authid_normalize.patch, 1.3,
	1.4 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.3,
	1.4 cyrus-imapd-2.3.13-bufov.patch, 1.1,
	1.2 cyrus-imapd-2.3.7-notify_sms.patch, 1.1,
	1.2 cyrus-imapd.spec, 1.52, 1.53 sources, 1.16, 1.17
Message-ID: <20090918142228.2FF9311C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8832

Modified Files:
	.cvsignore cyrus-imapd-2.3.1-authid_normalize.patch 
	cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.13-bufov.patch 
	cyrus-imapd-2.3.7-notify_sms.patch cyrus-imapd.spec sources 
Log Message:
* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
- fix another buffer overflow in cyrus sieve (CVE-2009-3235)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 May 2009 15:29:06 -0000	1.14
+++ .cvsignore	18 Sep 2009 14:22:24 -0000	1.15
@@ -1,2 +1,2 @@
-cyrus-imapd-2.3.14.tar.gz
+cyrus-imapd-2.3.15.tar.gz
 cyrus_sharedbackup-0.1.tar.gz

cyrus-imapd-2.3.1-authid_normalize.patch:
 auth_unix.c  |   18 ++++++++++++++++++
 imapoptions  |    5 +++++
 libcyr_cfg.c |    4 ++++
 libcyr_cfg.h |    2 ++
 4 files changed, 29 insertions(+)

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd-2.3.1-authid_normalize.patch	21 Jan 2009 14:47:22 -0000	1.3
+++ cyrus-imapd-2.3.1-authid_normalize.patch	18 Sep 2009 14:22:24 -0000	1.4
@@ -1,17 +1,7 @@
---- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
-@@ -112,6 +112,8 @@ enum cyrus_opt {
-     CYRUSOPT_SQL_PASSWD,
-     /* Secure SQL connection (OFF) */
-     CYRUSOPT_SQL_USESSL,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-     
---- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
-@@ -155,10 +155,12 @@
+diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize cyrus-imapd-2.3.15/lib/auth_unix.c
+--- cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize	2009-09-18 11:53:47.183115911 +0200
++++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:53:47.252115833 +0200
+@@ -156,10 +156,12 @@ const char *identifier;
  size_t len;
  {
      static char retbuf[81];
@@ -24,7 +14,7 @@
  
      if(!len) len = strlen(identifier);
      if(len >= sizeof(retbuf)) return NULL;
-@@ -210,6 +212,22 @@
+@@ -211,6 +213,22 @@ size_t len;
      /* now we don't */
      /* if (!sawalpha) return NULL;  */
  
@@ -47,9 +37,10 @@
      return retbuf;
  }
  
---- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize	2009-01-13 11:38:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:38:08.000000000 +0100
-@@ -1182,6 +1182,11 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize	2009-09-18 11:53:47.244115877 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:53:47.260115873 +0200
+@@ -1217,6 +1217,11 @@ product version in the capabilities */
     interface, otherwise the user is assumed to be in the default
     domain (if set). */
  
@@ -61,17 +52,29 @@
  /*
  .SH SEE ALSO
  .PP
---- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize	2008-07-30 18:03:38.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c	2009-01-13 11:38:08.000000000 +0100
-@@ -150,6 +150,11 @@
-       CFGVAL(long, 0),
+diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.c
+--- cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize	2009-03-31 06:43:20.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/libcyr_cfg.c	2009-09-18 11:55:03.436822867 +0200
+@@ -154,6 +154,10 @@ struct cyrusopt_s cyrus_options[] = {
+       CFGVAL(long, 1),
        CYRUS_OPT_SWITCH },
  
 +    { CYRUSOPT_NORMALIZEUID,
 +      CFGVAL(long, 1),
 +      CYRUS_OPT_SWITCH },
 +
-+
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
+diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.h
+--- cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize	2009-03-31 06:43:20.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/libcyr_cfg.h	2009-09-18 11:55:33.267115989 +0200
+@@ -114,6 +114,8 @@ enum cyrus_opt {
+     CYRUSOPT_SQL_USESSL,
+     /* Checkpoint after every recovery (OFF) */
+     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
++    /* Lowercase uid and strip leading and trailing blanks (OFF) */
++    CYRUSOPT_NORMALIZEUID,
+ 
+     CYRUSOPT_LAST
+     

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
 cyrus-imapd-2.3.13/README.autocreate    |  211 +++++++++++
 cyrus-imapd-2.3.15/imap/Makefile.in     |  155 ++++----
 cyrus-imapd-2.3.15/imap/autosieve.c     |  590 ++++++++++++++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/compile_sieve.c |  365 +++++++++++++++++++
 cyrus-imapd-2.3.15/imap/imapd.c         |   43 ++
 cyrus-imapd-2.3.15/imap/lmtpd.c         |   92 ++++
 cyrus-imapd-2.3.15/imap/mboxlist.c      |  370 ++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/mboxlist.h      |    4 
 cyrus-imapd-2.3.15/imap/pop3d.c         |   46 ++
 cyrus-imapd-2.3.15/lib/auth.c           |    8 
 cyrus-imapd-2.3.15/lib/auth.h           |    2 
 cyrus-imapd-2.3.15/lib/auth_krb.c       |   17 
 cyrus-imapd-2.3.15/lib/auth_krb5.c      |   15 
 cyrus-imapd-2.3.15/lib/auth_pts.c       |    9 
 cyrus-imapd-2.3.15/lib/auth_unix.c      |   11 
 cyrus-imapd-2.3.15/lib/imapoptions      |   49 ++
 cyrus-imapd-2.3.15/notifyd/Makefile.in  |    3 
 cyrus-imapd-2.3.15/notifyd/notifyd.c    |    2 
 cyrus-imapd-2.3.15/ptclient/Makefile.in |    3 
 19 files changed, 1916 insertions(+), 79 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diffIndex: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	26 May 2009 07:24:11 -0000	1.3
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	18 Sep 2009 14:22:24 -0000	1.4
@@ -1,435 +1,611 @@
---- cyrus-imapd-2.3.13/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
-+++ cyrus-imapd-2.3.13/notifyd/notifyd.c	2009-01-13 11:14:09.000000000 +0100
-@@ -96,7 +96,7 @@
- 
- #define NOTIFY_MAXSIZE 8192
- 
--int do_notify()
-+static int do_notify()
- {
-     struct sockaddr_un sun_data;
-     socklen_t sunlen = sizeof(sun_data);
---- cyrus-imapd-2.3.13/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
-+++ cyrus-imapd-2.3.13/notifyd/Makefile.in	2009-01-13 11:14:09.000000000 +0100
-@@ -71,10 +71,11 @@
- SERVICE=../master/service.o
- 
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
--DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
- PURIFY=/usr/local/bin/purify
- PUREOPT=-best-effort
---- cyrus-imapd-2.3.13/imap/mboxlist.c.autocreate	2008-10-08 17:47:08.000000000 +0200
-+++ cyrus-imapd-2.3.13/imap/mboxlist.c	2009-01-13 11:14:09.000000000 +0100
-@@ -83,6 +83,12 @@
- #include "quota.h"
- #include "sync_log.h"
- 
-+#ifdef USE_SIEVE
-+extern int autoadd_sieve(char *userid, 
-+		const char *source_script);
+diff -up /dev/null cyrus-imapd-2.3.15/imap/autosieve.c
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/imap/autosieve.c	2009-09-18 11:11:39.778115814 +0200
+@@ -0,0 +1,590 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
 +#endif
 +
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/uio.h>
++#include <fcntl.h>
++#include <ctype.h>
++#include <time.h>
++#include <syslog.h>
++#include <com_err.h>
++#include <config.h>
 +
- #define DB config_mboxlist_db
- #define SUBDB config_subscription_db
- 
-@@ -100,11 +106,29 @@
- static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
- 				void *rock);
- 
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+			      void *rock);
++#include "global.h"
++#include "util.h"
++#include "xmalloc.h"
++#include "xstrlcpy.h"
++#include "xstrlcat.h"
++#include "mailbox.h"
++#include "imap_err.h"
++#include "sieve_interface.h"
++#include "script.h"
 +
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state);
++#define TIMSIEVE_FAIL 	-1
++#define TIMSIEVE_OK 	0
++#define MAX_FILENAME	1024
 +
- struct change_rock {
-     struct quota *quota;
-     struct txn **tid;
- };
- 
-+/*
-+ * Struct needed to be passed as void *rock to
-+ * mboxlist_autochangesub();
-+ */
-+struct changesub_rock_st {
-+        char *userid;
-+        char *auth_userid;
-+        struct auth_state *auth_state;
-+};
++static int get_script_name(char *sievename, size_t buflen, const char *filename);
++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
++int autoadd_sieve(char *userid, const char *source_script);
 +
++//static void fatal(const char *s, int code);
++static void foo(void);
++static int sieve_notify(void *ac __attribute__((unused)),
++                        void *interp_context __attribute__((unused)),
++                        void *script_context __attribute__((unused)),
++                        void *message_context __attribute__((unused)),
++                        const char **errmsg __attribute__((unused)));
++static int mysieve_error(int lineno, const char *msg,
++                  void *i __attribute__((unused)), void *s);
++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
++
++
++sieve_vacation_t vacation2 = {
++    0,                          /* min response */
++    0,                          /* max response */
++    (sieve_callback *) &foo,    /* autorespond() */
++    (sieve_callback *) &foo     /* send_response() */
++};
 +
- #define FNAME_SUBSSUFFIX ".sub"
- 
- /*
-@@ -3383,3 +3407,349 @@
- 
-     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
- }
 +
 +/*
-+ * Automatically subscribe user to *ALL* shared folders,
-+ * one has permissions to be subscribed to.
-+ * INBOX subfolders are excluded.
++ * Find the name of the sieve script
++ * given the source script and compiled script names
 + */
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+                        void *rock) {
-+
-+  struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
-+  char *userid = changesub_rock->userid;
-+  char *auth_userid = changesub_rock->auth_userid;
-+  struct auth_state *auth_state = changesub_rock->auth_state;
++static int get_script_name(char *sievename, size_t buflen, const char *filename)
++{
++  char *p;
 +  int r;
 +
++  p = strrchr(filename, '/');
++  if (p == NULL)
++      p = (char *) filename;
++  else
++      p++;
 +
-+  if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
-+     (strlen(name) > 5  && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
-+     (strlen(name) > 4  && !strncmp(name, "user.", 5)))   /* Exclude other users' folders */
-+	  return 0;
-+
-+     
-+  r = mboxlist_changesub(name, userid, auth_state, 1, 0);
-+
-+  if (r) {
-+      syslog(LOG_WARNING,
-+             "autosubscribe: User %s to folder %s, subscription failed: %s",
-+             auth_userid, name, error_message(r));
-+  } else {
-+      syslog(LOG_NOTICE,
-+             "autosubscribe: User %s to folder %s, subscription succeeded",
-+             auth_userid, name);
-+  }
-+
-+  return 0;
++  r = strlcpy(sievename, p, buflen) - buflen;
++  return (r >= 0 || r == -buflen ? 1 : 0);
 +}
 +
-+#define SEP '|'
 +
 +/*
-+ * Automatically subscribe user to a shared folder.
-+ * Subscription is done successfully, if the shared
-+ * folder exists and the user has the necessary 
-+ * permissions.
++ * Find the directory where the sieve scripts of the user
++ * reside
 + */
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state) {
-+        
[...2756 lines suppressed...]
+ 
+ struct auth_mech auth_krb5 = 
+@@ -240,4 +254,5 @@ struct auth_mech auth_krb5 = 
+     &mymemberof,
+     &mynewstate,
+     &myfreestate,
++    &mycanonuser,
+ };
+diff -up cyrus-imapd-2.3.15/lib/auth_krb.c.autocreate cyrus-imapd-2.3.15/lib/auth_krb.c
+--- cyrus-imapd-2.3.15/lib/auth_krb.c.autocreate	2009-03-31 06:11:21.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/auth_krb.c	2009-09-18 11:11:39.785115812 +0200
+@@ -341,6 +341,15 @@ struct auth_state *auth_state;
      free((char *)auth_state);
  }
  
@@ -2192,7 +2222,7 @@
  #else /* HAVE_KRB */
  
  static int mymemberof(
-@@ -371,6 +380,13 @@
+@@ -372,6 +381,13 @@ static void myfreestate(
  	fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
  }
  
@@ -2206,15 +2236,16 @@
  #endif
  
  struct auth_mech auth_krb = 
-@@ -381,4 +397,5 @@
+@@ -382,4 +398,5 @@ struct auth_mech auth_krb = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_pts.c	2009-01-13 11:14:09.000000000 +0100
-@@ -512,6 +512,14 @@
+diff -up cyrus-imapd-2.3.15/lib/auth_pts.c.autocreate cyrus-imapd-2.3.15/lib/auth_pts.c
+--- cyrus-imapd-2.3.15/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.15/lib/auth_pts.c	2009-09-18 11:11:39.785115812 +0200
+@@ -512,6 +512,14 @@ static void myfreestate(struct auth_stat
      free(auth_state);
  }
  
@@ -2229,68 +2260,42 @@
  struct auth_mech auth_pts = 
  {
      "pts",		/* name */
-@@ -520,4 +528,5 @@
+@@ -520,4 +528,5 @@ struct auth_mech auth_pts = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/auth.h.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth.h	2009-01-13 11:14:09.000000000 +0100
-@@ -55,6 +55,7 @@
-              const char *identifier);
-     struct auth_state *(*newstate)(const char *identifier);
-     void (*freestate)(struct auth_state *auth_state);
-+    char *(*auth_canonuser)(struct auth_state *auth_state);
- };
- 
- extern struct auth_mech *auth_mechs[];
-@@ -77,5 +78,6 @@
-  	 const char *identifier);
- struct auth_state *auth_newstate(const char *identifier);
- void auth_freestate(struct auth_state *auth_state);
-+char *auth_canonuser(struct auth_state *auth_state);
- 
- #endif /* INCLUDED_AUTH_H */
---- cyrus-imapd-2.3.13/lib/auth_krb5.c.autocreate	2008-03-24 18:43:08.000000000 +0100
-+++ cyrus-imapd-2.3.13/lib/auth_krb5.c	2009-01-13 11:14:09.000000000 +0100
-@@ -199,6 +199,14 @@
-     free(auth_state);
+diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.autocreate cyrus-imapd-2.3.15/lib/auth_unix.c
+--- cyrus-imapd-2.3.15/lib/auth_unix.c.autocreate	2009-03-31 06:11:22.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:11:39.787115798 +0200
+@@ -315,6 +315,16 @@ struct auth_state *auth_state;
+     free((char *)auth_state);
  }
  
-+static char *mycanonuser(struct auth_state *auth_state)
++static char *mycanonuser(auth_state)
++    struct auth_state *auth_state;
 +{
 +    if (auth_state)
-+       return auth_state->userid;
++         return auth_state->userid;
 +
 +    return NULL;
 +}
 +
- #else /* HAVE_GSSAPI_H */
- 
- static int mymemberof(
-@@ -230,6 +238,12 @@
- 	fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
- }
- 
-+static char *mycanonuser(
-+    struct auth_state *auth_state __attribute__((unused)))
-+{
-+        fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
-+}
 +
- #endif
  
- struct auth_mech auth_krb5 = 
-@@ -240,4 +254,5 @@
+ struct auth_mech auth_unix = 
+ {
+@@ -324,4 +334,5 @@ struct auth_mech auth_unix = 
      &mymemberof,
      &mynewstate,
      &myfreestate,
 +    &mycanonuser,
  };
---- cyrus-imapd-2.3.13/lib/imapoptions.autocreate	2008-10-08 19:18:12.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:14:09.000000000 +0100
-@@ -198,6 +198,55 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.autocreate cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.autocreate	2009-06-29 19:21:06.000000000 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:11:39.787115798 +0200
+@@ -198,6 +198,55 @@ are listed with ``<none>''.
  /* Number of seconds to wait before returning a timeout failure when
     performing a client connection (e.g., in a murder environment) */
  
@@ -2346,28 +2351,47 @@
  { "configdirectory", NULL, STRING }
  /* The pathname of the IMAP configuration directory.  This field is
     required. */
---- cyrus-imapd-2.3.13/lib/auth_unix.c.autocreate	2008-08-26 21:20:39.000000000 +0200
-+++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:14:09.000000000 +0100
-@@ -314,6 +314,16 @@
-     free((char *)auth_state);
- }
+diff -up cyrus-imapd-2.3.15/notifyd/Makefile.in.autocreate cyrus-imapd-2.3.15/notifyd/Makefile.in
+--- cyrus-imapd-2.3.15/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/Makefile.in	2009-09-18 11:11:39.776115765 +0200
+@@ -71,10 +71,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@
+ SERVICE=../master/service.o
  
-+static char *mycanonuser(auth_state)
-+    struct auth_state *auth_state;
-+{
-+    if (auth_state)
-+         return auth_state->userid;
-+
-+    return NULL;
-+}
-+
-+
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
+ LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
+-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
  
- struct auth_mech auth_unix = 
+ PURIFY=/usr/local/bin/purify
+ PUREOPT=-best-effort
+diff -up cyrus-imapd-2.3.15/notifyd/notifyd.c.autocreate cyrus-imapd-2.3.15/notifyd/notifyd.c
+--- cyrus-imapd-2.3.15/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/notifyd.c	2009-09-18 11:11:39.776115765 +0200
+@@ -96,7 +96,7 @@ char *fetch_arg(char *head, char* tail)
+ 
+ #define NOTIFY_MAXSIZE 8192
+ 
+-int do_notify()
++static int do_notify()
  {
-@@ -323,4 +333,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
+     struct sockaddr_un sun_data;
+     socklen_t sunlen = sizeof(sun_data);
+diff -up cyrus-imapd-2.3.15/ptclient/Makefile.in.autocreate cyrus-imapd-2.3.15/ptclient/Makefile.in
+--- cyrus-imapd-2.3.15/ptclient/Makefile.in.autocreate	2008-03-24 19:34:22.000000000 +0100
++++ cyrus-imapd-2.3.15/ptclient/Makefile.in	2009-09-18 11:11:39.784115791 +0200
+@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(
+ AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
+ AFS_LIBS = @AFS_LIBS@
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
+ LIB_SASL = @LIB_SASL@
+ LIB_WRAP = @LIB_WRAP@
+-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ 
+ UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
+ 
+ LDAP_LIBS=@LDAP_LIBS@

cyrus-imapd-2.3.13-bufov.patch:
 bc_eval.c |    6 +++---
 script.c  |    4 ++--
 sieve.y   |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: cyrus-imapd-2.3.13-bufov.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.13-bufov.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.13-bufov.patch	7 Sep 2009 14:41:58 -0000	1.1
+++ cyrus-imapd-2.3.13-bufov.patch	18 Sep 2009 14:22:24 -0000	1.2
@@ -1,80 +1,57 @@
---- src/sieve/script.c	2008/03/24 20:08:46	1.67
-+++ src/sieve/script.c	2009/09/02 13:56:18	1.68
-@@ -40,7 +40,7 @@
-  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  *
-- * $Id$
-+ * $Id$
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
- 	ret |= keep_ret;
-         if (keep_ret == SIEVE_OK)
-             snprintf(actions_string+strlen(actions_string),
--		     sizeof(actions_string)-strlen(actions_string),
-+		     ACTIONS_STRING_LEN-strlen(actions_string),
- 		     "Kept\n");
- 	else {
- 	    implicit_keep = 0;	/* don't try an implicit keep again */
-@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
- 	    
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string), 
-+			 ACTIONS_STRING_LEN-strlen(actions_string), 
- 			 "Rejected with: %s\n", a->u.rej.msg);
- 
- 	    break;
-@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
- 
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Filed into: %s\n",a->u.fil.mailbox);
- 	    break;
- 	case ACTION_KEEP:
-@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
- 			       &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Kept\n");
- 	    break;
- 	case ACTION_REDIRECT:
-@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
- 				   &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Redirected to %s\n", a->u.red.addr);
- 	    break;
- 	case ACTION_DISCARD:
-@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
- 				      &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Discarded\n");
- 	    break;
- 
-@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
- 
- 		    if (ret == SIEVE_OK)
- 			snprintf(actions_string+strlen(actions_string),
--				 sizeof(actions_string)-strlen(actions_string),
-+				 ACTIONS_STRING_LEN-strlen(actions_string),
- 				 "Sent vacation reply\n");
- 
- 		} else if (ret == SIEVE_DONE) {
- 		    snprintf(actions_string+strlen(actions_string),
--			     sizeof(actions_string)-strlen(actions_string),
-+			     ACTIONS_STRING_LEN-strlen(actions_string),
- 			     "Vacation reply suppressed\n");
- 
- 		    ret = SIEVE_OK;
+diff -up cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov cyrus-imapd-2.3.15/sieve/bc_eval.c
+--- cyrus-imapd-2.3.15/sieve/bc_eval.c.bufov	2009-03-31 06:11:30.000000000 +0200
++++ cyrus-imapd-2.3.15/sieve/bc_eval.c	2009-09-18 15:05:29.187990786 +0200
+@@ -500,7 +500,7 @@ static int eval_bc_test(sieve_interp_t *
+ 	int comparator=ntohl(bc[i+3].value);
+ 	int apart=ntohl(bc[i+4].value);
+ 	int count=0;
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+@@ -669,7 +669,7 @@ static int eval_bc_test(sieve_interp_t *
+ 	int relation=ntohl(bc[i+2].value);
+ 	int comparator=ntohl(bc[i+3].value);
+ 	int count=0;	
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+@@ -790,7 +790,7 @@ static int eval_bc_test(sieve_interp_t *
+ 	int transform=ntohl(bc[i+4].value);
+ 	/* ntohl(bc[i+5].value) is the now unused 'offset' */
+ 	int count=0;
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+diff -up cyrus-imapd-2.3.15/sieve/script.c.bufov cyrus-imapd-2.3.15/sieve/script.c
+--- cyrus-imapd-2.3.15/sieve/script.c.bufov	2009-09-02 15:56:18.000000000 +0200
++++ cyrus-imapd-2.3.15/sieve/script.c	2009-09-18 15:04:00.728927938 +0200
+@@ -668,9 +668,9 @@ static int do_sieve_error(int ret,
+     if ((ret != SIEVE_OK) && interp->err) {
+ 	char buf[1024];
+ 	if (lastaction == -1) /* we never executed an action */
+-	    sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret));
++	    snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret));
+ 	else
+-	    sprintf(buf, "%s: %s", action_to_string(lastaction),
++	    snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction),
+ 		    errmsg ? errmsg : sieve_errstr(ret));
+  
+ 	ret |= interp->execute_err(buf, interp->interp_context,
+diff -up cyrus-imapd-2.3.15/sieve/sieve.y.bufov cyrus-imapd-2.3.15/sieve/sieve.y
+--- cyrus-imapd-2.3.15/sieve/sieve.y.bufov	2009-03-26 00:58:54.000000000 +0100
++++ cyrus-imapd-2.3.15/sieve/sieve.y	2009-09-18 15:04:00.734928038 +0200
+@@ -1159,7 +1159,7 @@ static int verify_relat(char *r)
+ 	else if (!strcmp(r, "ne")) {return NE;}
+ 	else if (!strcmp(r, "eq")) {return EQ;}
+ 	else{
+-	  sprintf(errbuf, "flag '%s': not a valid relational operation", r);
++	  snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r);
+ 	  yyerror(errbuf);
+ 	  return -1;
+ 	}

cyrus-imapd-2.3.7-notify_sms.patch:
 doc/man/imapd.conf.5.html |   18 +++++++
 doc/man/notifyd.8.html    |   12 ++++
 lib/imapoptions           |    4 +
 man/imapd.conf.5          |    3 +
 man/notifyd.8             |    5 +
 notifyd/Makefile.in       |    2 
 notifyd/notify_sms.c      |  116 ++++++++++++++++++++++++++++++++++++++++++++++
 notifyd/notify_sms.h      |   61 ++++++++++++++++++++++++
 notifyd/notifyd.h         |    2 
 9 files changed, 222 insertions(+), 1 deletion(-)

Index: cyrus-imapd-2.3.7-notify_sms.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.7-notify_sms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.7-notify_sms.patch	12 Mar 2007 16:22:52 -0000	1.1
+++ cyrus-imapd-2.3.7-notify_sms.patch	18 Sep 2009 14:22:24 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Naur cyrus-imapd-2.3.7.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.3.7/doc/man/imapd.conf.5.html
---- cyrus-imapd-2.3.7.orig/doc/man/imapd.conf.5.html	2006-07-10 16:31:53.000000000 +0200
-+++ cyrus-imapd-2.3.7/doc/man/imapd.conf.5.html	2006-07-14 10:27:29.000000000 +0200
-@@ -3130,6 +3130,24 @@
+diff -up cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html.notify_sms cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html
+--- cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html.notify_sms	2009-09-09 15:19:50.000000000 +0200
++++ cyrus-imapd-2.3.15/doc/man/imapd.conf.5.html	2009-09-18 11:49:42.207115959 +0200
+@@ -3469,6 +3469,24 @@ proxying CREATE.</p>
  <tr valign="top" align="left">
  <td width="10%"></td>
  <td width="89%">
@@ -26,10 +26,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/doc/ma
  <p><b>servername:</b> &lt;none&gt;</p></td>
  </table>
  <!-- INDENTATION -->
-diff -Naur cyrus-imapd-2.3.7.orig/doc/man/notifyd.8.html cyrus-imapd-2.3.7/doc/man/notifyd.8.html
---- cyrus-imapd-2.3.7.orig/doc/man/notifyd.8.html	2006-07-10 16:31:54.000000000 +0200
-+++ cyrus-imapd-2.3.7/doc/man/notifyd.8.html	2006-07-14 10:27:29.000000000 +0200
-@@ -181,6 +181,18 @@
+diff -up cyrus-imapd-2.3.15/doc/man/notifyd.8.html.notify_sms cyrus-imapd-2.3.15/doc/man/notifyd.8.html
+--- cyrus-imapd-2.3.15/doc/man/notifyd.8.html.notify_sms	2009-09-09 15:19:51.000000000 +0200
++++ cyrus-imapd-2.3.15/doc/man/notifyd.8.html	2009-09-18 11:49:42.208116026 +0200
+@@ -181,6 +181,18 @@ a Sieve &rsquo;notify&rsquo; action as i
  <td width="11%"></td>
  <td width="10%">
  
@@ -48,10 +48,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/doc/ma
  <p><b>zephyr</b></p>
  </td>
  <td width="77%">
-diff -Naur cyrus-imapd-2.3.7.orig/lib/imapoptions cyrus-imapd-2.3.7/lib/imapoptions
---- cyrus-imapd-2.3.7.orig/lib/imapoptions	2006-06-27 17:58:42.000000000 +0200
-+++ cyrus-imapd-2.3.7/lib/imapoptions	2006-07-14 10:27:29.000000000 +0200
-@@ -829,6 +829,10 @@
+diff -up cyrus-imapd-2.3.15/lib/imapoptions.notify_sms cyrus-imapd-2.3.15/lib/imapoptions
+--- cyrus-imapd-2.3.15/lib/imapoptions.notify_sms	2009-09-18 11:49:42.189116010 +0200
++++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:50:38.230115954 +0200
+@@ -966,6 +966,10 @@ are listed with ``<none>''.
  /* The pathname of the sendmail executable.  Sieve invokes sendmail
     for sending rejections, redirects and vacation responses. */
  
@@ -59,26 +59,26 @@ diff -Naur cyrus-imapd-2.3.7.orig/lib/im
 +/* The pathname of the sendsms executable.  Sieve invokes sendsms
 +   for sending SMS notifications. */
 +
- { "servername", NULL, STRING }
- /* This is the hostname visible in the greeting messages of the POP,
-    IMAP and LMTP daemons. If it is unset, then the result returned
-diff -Naur cyrus-imapd-2.3.7.orig/man/imapd.conf.5 cyrus-imapd-2.3.7/man/imapd.conf.5
---- cyrus-imapd-2.3.7.orig/man/imapd.conf.5	2006-07-10 16:31:52.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/imapd.conf.5	2006-07-14 10:27:29.000000000 +0200
-@@ -691,6 +691,9 @@
+ { "serverlist", NULL, STRING }
+ /* Whitespace separated list of backend server names.  Used for
+    finding server with the most available free space for proxying
+diff -up cyrus-imapd-2.3.15/man/imapd.conf.5.notify_sms cyrus-imapd-2.3.15/man/imapd.conf.5
+--- cyrus-imapd-2.3.15/man/imapd.conf.5.notify_sms	2009-09-09 15:19:48.000000000 +0200
++++ cyrus-imapd-2.3.15/man/imapd.conf.5	2009-09-18 11:51:26.441839866 +0200
+@@ -771,6 +771,9 @@ Allowed values: \fIflat\fR, \fIberkeley\
  .IP "\fBsendmail:\fR /usr/lib/sendmail" 5
  The pathname of the sendmail executable.  Sieve invokes sendmail
  for sending rejections, redirects and vacation responses. 
 +.IP "\fBsendsms:\fR /usr/bin/sendsms" 5
 +The pathname of the sendsms executable.  Sieve invokes sendsms
 +for sending SMS notifications. 
- .IP "\fBservername:\fR <none>" 5
- This is the hostname visible in the greeting messages of the POP,
- IMAP and LMTP daemons. If it is unset, then the result returned
-diff -Naur cyrus-imapd-2.3.7.orig/man/notifyd.8 cyrus-imapd-2.3.7/man/notifyd.8
---- cyrus-imapd-2.3.7.orig/man/notifyd.8	2003-08-10 01:43:14.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/notifyd.8	2006-07-14 10:27:29.000000000 +0200
-@@ -110,6 +110,11 @@
+ .IP "\fBserverlist:\fR <none>" 5
+ Whitespace separated list of backend server names.  Used for
+ finding server with the most available free space for proxying
+diff -up cyrus-imapd-2.3.15/man/notifyd.8.notify_sms cyrus-imapd-2.3.15/man/notifyd.8
+--- cyrus-imapd-2.3.15/man/notifyd.8.notify_sms	2008-04-04 14:47:00.000000000 +0200
++++ cyrus-imapd-2.3.15/man/notifyd.8	2009-09-18 11:49:42.225115999 +0200
+@@ -111,6 +111,11 @@ Email the notification.  This method can
  Sieve 'notify' action as it requires a \fImailto:\fR URL to be
  specified as an \fI:option\fR.
  .TP
@@ -90,10 +90,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/man/no
  .B zephyr
  Send the notification as a zephyrgram.  If used in a Sieve 'notify'
  action, additional recipients can be specified as \fI:options\fR.
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/Makefile.in cyrus-imapd-2.3.7/notifyd/Makefile.in
---- cyrus-imapd-2.3.7.orig/notifyd/Makefile.in	2004-05-31 20:22:59.000000000 +0200
-+++ cyrus-imapd-2.3.7/notifyd/Makefile.in	2006-07-14 10:27:29.000000000 +0200
-@@ -82,7 +82,7 @@
+diff -up cyrus-imapd-2.3.15/notifyd/Makefile.in.notify_sms cyrus-imapd-2.3.15/notifyd/Makefile.in
+--- cyrus-imapd-2.3.15/notifyd/Makefile.in.notify_sms	2009-09-18 11:49:42.172115947 +0200
++++ cyrus-imapd-2.3.15/notifyd/Makefile.in	2009-09-18 11:49:42.225115999 +0200
+@@ -85,7 +85,7 @@ all: notifyd
  install:
  	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
  
@@ -102,10 +102,10 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  
  notifytest: notifytest.o
  	$(CC) $(LDFLAGS) -o notifytest \
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notifyd.h cyrus-imapd-2.3.7/notifyd/notifyd.h
---- cyrus-imapd-2.3.7.orig/notifyd/notifyd.h	2003-02-13 21:15:48.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notifyd.h	2006-07-14 10:27:29.000000000 +0200
-@@ -48,6 +48,7 @@
+diff -up cyrus-imapd-2.3.15/notifyd/notifyd.h.notify_sms cyrus-imapd-2.3.15/notifyd/notifyd.h
+--- cyrus-imapd-2.3.15/notifyd/notifyd.h.notify_sms	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.15/notifyd/notifyd.h	2009-09-18 11:49:42.233116003 +0200
+@@ -47,6 +47,7 @@
  #include "notify_null.h"
  #include "notify_log.h"
  #include "notify_mailto.h"
@@ -113,7 +113,7 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  #include "notify_zephyr.h"
  
  /* Notify method dispatch table definition */
-@@ -64,6 +65,7 @@
+@@ -63,6 +64,7 @@ notifymethod_t methods[] = {
      { "null",	notify_null },		/* do nothing */
      { "log",	notify_log },		/* use syslog (for testing) */
      { "mailto",	notify_mailto },	/* send an email */
@@ -121,9 +121,9 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
  #ifdef HAVE_ZEPHYR
      { "zephyr",	notify_zephyr },	/* send a zephyrgram */
  #endif
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notify_sms.c cyrus-imapd-2.3.7/notifyd/notify_sms.c
---- cyrus-imapd-2.3.7.orig/notifyd/notify_sms.c	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notify_sms.c	2006-07-14 10:29:10.000000000 +0200
+diff -up /dev/null cyrus-imapd-2.3.15/notifyd/notify_sms.c
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/notifyd/notify_sms.c	2009-09-18 11:49:42.233116003 +0200
 @@ -0,0 +1,116 @@
 +/* notify_sms.c -- SMS notification method
 + * Simon Matter
@@ -241,9 +241,9 @@ diff -Naur cyrus-imapd-2.3.7.orig/notify
 +
 +    return strdup("OK sms notification successful");
 +}
-diff -Naur cyrus-imapd-2.3.7.orig/notifyd/notify_sms.h cyrus-imapd-2.3.7/notifyd/notify_sms.h
---- cyrus-imapd-2.3.7.orig/notifyd/notify_sms.h	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.3.7/notifyd/notify_sms.h	2006-07-14 10:29:10.000000000 +0200
+diff -up /dev/null cyrus-imapd-2.3.15/notifyd/notify_sms.h
+--- /dev/null	2009-09-11 15:21:01.808252010 +0200
++++ cyrus-imapd-2.3.15/notifyd/notify_sms.h	2009-09-18 11:49:42.233116003 +0200
 @@ -0,0 +1,61 @@
 +/* notify_sms.h -- SMS notification method
 + * Simon Matter


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- cyrus-imapd.spec	7 Sep 2009 14:41:58 -0000	1.52
+++ cyrus-imapd.spec	18 Sep 2009 14:22:24 -0000	1.53
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.3.14
-Release: 2%{?dist}
+Version: 2.3.15
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -72,7 +72,6 @@ URL: http://cyrusimap.web.cmu.edu/
 #Vendor: Invoca Systems
 #Distribution: Invoca Linux Server
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-#Source2: http://ftp.gnu.org/gnu/autoconf/autoconf-%{_acversion}.tar.gz
 Source3: cyrus-deliver-wrapper.c
 Source4: cyrus-user-procmailrc.template
 Source5: cyrus-imapd.logrotate
@@ -600,6 +599,7 @@ fi
 %{_cyrexecdir}/arbitronsort.pl
 %{_cyrexecdir}/chk_cyrus
 %{_cyrexecdir}/convert-sieve.pl
+%{_cyrexecdir}/cyr_df
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
@@ -731,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
+- fix another buffer overflow in cyrus sieve (CVE-2009-3235)
+
 * Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-2
 - fix buffer overflow in cyrus sieve (#521010)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	25 May 2009 15:29:06 -0000	1.16
+++ sources	18 Sep 2009 14:22:24 -0000	1.17
@@ -1,2 +1,2 @@
-1030d4d9d04036b2fb9830165723908e  cyrus-imapd-2.3.14.tar.gz
+d89cb1b55023188938f332b7ef120fae  cyrus-imapd-2.3.15.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz



From crobinso at fedoraproject.org  Fri Sep 18 14:50:46 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Fri, 18 Sep 2009 14:50:46 +0000 (UTC)
Subject: rpms/virt-manager/F-11 virt-manager-0.7.0-czech-typo.patch, NONE,
	1.1 virt-manager-0.7.0-fix-memory-interaction.patch, NONE,
	1.1 virt-manager-0.7.0-fix-sparse-knob.patch, NONE,
	1.1 virt-manager-0.7.0-iso-storage-browser.patch, NONE,
	1.1 virt-manager-0.7.0-migrate-fixes.patch, NONE,
	1.1 virt-manager-0.7.0-pylint-script.patch, NONE,
	1.1 virt-manager-0.7.0-vcpu-mem-persistent.patch, NONE,
	1.1 virt-manager.spec, 1.52, 1.53
Message-ID: <20090918145046.453CD11C01EA@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18100

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.7.0-czech-typo.patch 
	virt-manager-0.7.0-fix-memory-interaction.patch 
	virt-manager-0.7.0-fix-sparse-knob.patch 
	virt-manager-0.7.0-iso-storage-browser.patch 
	virt-manager-0.7.0-migrate-fixes.patch 
	virt-manager-0.7.0-pylint-script.patch 
	virt-manager-0.7.0-vcpu-mem-persistent.patch 
Log Message:
Fix migration for qemu/kvm guests (bz 517548)
Fix sparse allocation confusion (bz 504605)
Czech translation typo (bz 504385)
Use storage browser for iso installs (bz 504326)
Fix max/current memory spin button interaction (bz 503786)
Make memory and vcpu changes unconditionally persistent (bz 503784)
Add pylint script


virt-manager-0.7.0-czech-typo.patch:
 cs.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.7.0-czech-typo.patch ---
diff -rup virt-manager-0.7.0/po/cs.po new/po/cs.po
--- virt-manager-0.7.0/po/cs.po	2009-09-17 15:24:54.852374000 -0400
+++ new/po/cs.po	2009-09-17 15:22:11.927742000 -0400
@@ -1809,7 +1809,7 @@ msgstr "Vy?adov?n typ hardware"
 
 #: ../src/vmm-add-hardware.glade.h:46
 msgid "Hardware type:"
-msgstr "Tzp hardware"
+msgstr "Typ hardware"
 
 #: ../src/vmm-add-hardware.glade.h:47 ../src/vmm-details.glade.h:44
 msgid "Keymap:"

virt-manager-0.7.0-fix-memory-interaction.patch:
 .vmm-details.glade.rej.swp  |only
 virtManager/details.py      |   69 +++++++++++++++++++++++++++---------------
 virtManager/details.py.orig |   72 ++++++++++++++++++++++++++++++++++----------
 vmm-details.glade           |    9 ++---
 vmm-details.glade.orig      |only
 vmm-details.glade.rej       |only
 6 files changed, 106 insertions(+), 44 deletions(-)

--- NEW FILE virt-manager-0.7.0-fix-memory-interaction.patch ---
diff -rup old/src/virtManager/details.py virt-manager-0.7.0/src/virtManager/details.py
--- old/src/virtManager/details.py	2009-09-17 17:23:42.640307000 -0400
+++ virt-manager-0.7.0/src/virtManager/details.py	2009-09-17 17:24:09.098148000 -0400
@@ -960,11 +960,12 @@ class vmmDetails(gobject.GObject):
         curmem = self.window.get_widget("config-memory").get_adjustment()
         maxmem = self.window.get_widget("config-maxmem").get_adjustment()
 
-
         if self.window.get_widget("config-memory-apply").get_property("sensitive"):
-            if curmem.value > maxmem.value:
-                curmem.value = maxmem.value
-            curmem.upper = maxmem.value
+            memval = self.config_get_memory()
+            maxval = self.config_get_maxmem()
+            if maxval < memval:
+                maxmem.value = memval
+            maxmem.lower = memval
         else:
             curmem.value = int(round(self.vm.get_memory()/1024.0))
             maxmem.value = int(round(self.vm.maximum_memory()/1024.0))
@@ -1504,54 +1505,74 @@ class vmmDetails(gobject.GObject):
         self.vm.set_vcpu_count(vcpus)
         self.window.get_widget("config-vcpus-apply").set_sensitive(False)
 
-    def config_memory_changed(self, src):
-        self.window.get_widget("config-memory-apply").set_sensitive(True)
+    def config_get_maxmem(self):
+        maxadj = self.window.get_widget("config-maxmem").get_adjustment()
+        txtmax = self.window.get_widget("config-maxmem").get_text()
+        try:
+            maxmem = int(txtmax)
+        except:
+            maxmem = maxadj.value
+        return maxmem
+
+    def config_get_memory(self):
+        memadj = self.window.get_widget("config-memory").get_adjustment()
+        txtmem = self.window.get_widget("config-memory").get_text()
+        try:
+            mem = int(txtmem)
+        except:
+            mem = memadj.value
+        return mem
 
     def config_maxmem_changed(self, src):
         self.window.get_widget("config-memory-apply").set_sensitive(True)
-        memory = self.window.get_widget("config-maxmem").get_adjustment().value
-        memadj = self.window.get_widget("config-memory").get_adjustment()
-        memadj.upper = memory
-        if memadj.value > memory:
-            memadj.value = memory
+
+    def config_memory_changed(self, src):
+        self.window.get_widget("config-memory-apply").set_sensitive(True)
+
+        maxadj = self.window.get_widget("config-maxmem").get_adjustment()
+
+        mem = self.config_get_memory()
+        if maxadj.value < mem:
+            maxadj.value = mem
+        maxadj.lower = mem
 
     def config_memory_apply(self, src):
         self.refresh_config_memory()
         exc = None
         curmem = None
-        maxmem = self.window.get_widget("config-maxmem").get_adjustment()
+        maxmem = self.config_get_maxmem()
         if self.window.get_widget("config-memory").get_property("sensitive"):
-            curmem = self.window.get_widget("config-memory").get_adjustment()
+            curmem = self.config_get_memory()
 
-        logging.info("Setting max-memory for " + self.vm.get_name() + \
-                     " to " + str(maxmem.value))
+        logging.info("Setting max-memory for " + self.vm.get_name() +
+                     " to " + str(maxmem))
 
         actual_cur = self.vm.get_memory()
         if curmem is not None:
-            logging.info("Setting memory for " + self.vm.get_name() + \
-                         " to " + str(curmem.value))
-            if (maxmem.value * 1024) < actual_cur:
+            logging.info("Setting memory for " + self.vm.get_name() +
+                         " to " + str(curmem))
+            if (maxmem * 1024) < actual_cur:
                 # Set current first to avoid error
                 try:
-                    self.vm.set_memory(curmem.value * 1024)
-                    self.vm.set_max_memory(maxmem.value * 1024)
+                    self.vm.set_memory(curmem * 1024)
+                    self.vm.set_max_memory(maxmem * 1024)
                 except Exception, e:
                     exc = e
             else:
                 try:
-                    self.vm.set_max_memory(maxmem.value * 1024)
-                    self.vm.set_memory(curmem.value * 1024)
+                    self.vm.set_max_memory(maxmem * 1024)
+                    self.vm.set_memory(curmem * 1024)
                 except Exception, e:
                     exc = e
 
         else:
             try:
-                self.vm.set_max_memory(maxmem.value * 1024)
+                self.vm.set_max_memory(maxmem * 1024)
             except Exception, e:
                 exc = e
 
         if exc:
-            self.err.show_err(_("Error changing memory values: %s" % str(e)),\
+            self.err.show_err(_("Error changing memory values: %s" % str(e)),
                               "".join(traceback.format_exc()))
         else:
             self.window.get_widget("config-memory-apply").set_sensitive(False)
diff -rup old/src/virtManager/details.py.orig virt-manager-0.7.0/src/virtManager/details.py.orig
--- old/src/virtManager/details.py.orig	2009-09-17 17:23:42.778305000 -0400
+++ virt-manager-0.7.0/src/virtManager/details.py.orig	2009-09-17 17:24:08.925149000 -0400
@@ -501,7 +501,7 @@ class vmmDetails(gobject.GObject):
         self.update_scaling()
 
     def auth_login(self, ignore):
-        self.set_password()
+        self.set_credentials()
         self.activate_viewer_page()
 
     def toggle_toolbar(self, src):
@@ -1309,23 +1309,44 @@ class vmmDetails(gobject.GObject):
                      traceback.format_exc (stacktrace))
             logging.error(details)
 
-    def set_password(self, src=None):
-        txt = self.window.get_widget("console-auth-password")
-        self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD,
-                                      txt.get_text())
+    def set_credentials(self, src=None):
+        passwd = self.window.get_widget("console-auth-password")
+        if passwd.flags() & gtk.VISIBLE:
+            self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD,
+                                          passwd.get_text())
+        username = self.window.get_widget("console-auth-username")
+        if username.flags() & gtk.VISIBLE:
+            self.vncViewer.set_credential(gtkvnc.CREDENTIAL_USERNAME,
+                                          username.get_text())
+
+        if self.window.get_widget("console-auth-remember").get_active():
+            self.config.set_console_password(self.vm, passwd.get_text(), username.get_text())
 
     def _vnc_auth_credential(self, src, credList):
         for i in range(len(credList)):
+            if credList[i] not in (gtkvnc.CREDENTIAL_PASSWORD, gtkvnc.CREDENTIAL_USERNAME, gtkvnc.CREDENTIAL_CLIENTNAME):
+                self.err.show_err(summary=_("Unable to provide requested credentials to the VNC server"),
+                                  details=_("The credential type %s is not supported") % (str(credList[i])),
+                                  title=_("Unable to authenticate"),
+                                  async=True)
+                self.vncViewerRetriesScheduled = 10
+                self.vncViewer.close()
+                self.activate_unavailable_page(_("Unsupported console authentication type"))
+                return
+
+        withUsername = False
+        withPassword = False
+        for i in range(len(credList)):
             logging.debug("Got credential request %s", str(credList[i]))
             if credList[i] == gtkvnc.CREDENTIAL_PASSWORD:
-                self.activate_auth_page()
+                withPassword = True
+            elif credList[i] == gtkvnc.CREDENTIAL_USERNAME:
+                withUsername = True
             elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME:
                 self.vncViewer.set_credential(credList[i], "libvirt-vnc")
-            else:
-                # Force it to stop re-trying
-                self.vncViewerRetriesScheduled = 10
-                self.vncViewer.close()
-                self.activate_unavailable_page(_("Unsupported console authentication type"))
+
+        if withUsername or withPassword:
+            self.activate_auth_page(withPassword, withUsername)
 
     def activate_unavailable_page(self, msg):
         self.window.get_widget("console-pages").set_current_page(PAGE_UNAVAILABLE)
@@ -1336,20 +1357,41 @@ class vmmDetails(gobject.GObject):
         self.window.get_widget("console-pages").set_current_page(PAGE_SCREENSHOT)
         self.window.get_widget("details-menu-vm-screenshot").set_sensitive(True)
 
-    def activate_auth_page(self):
-        pw = self.config.get_console_password(self.vm)
+    def activate_auth_page(self, withPassword=True, withUsername=False):
+        (pw, username) = self.config.get_console_password(self.vm)
         self.window.get_widget("details-menu-vm-screenshot").set_sensitive(False)
+
+        if withPassword:
+            self.window.get_widget("console-auth-password").show()
+            self.window.get_widget("label-auth-password").show()
+        else:
+            self.window.get_widget("console-auth-password").hide()
+            self.window.get_widget("label-auth-password").hide()
+
+        if withUsername:
+            self.window.get_widget("console-auth-username").show()
+            self.window.get_widget("label-auth-username").show()
+        else:
+            self.window.get_widget("console-auth-username").hide()
+            self.window.get_widget("label-auth-username").hide()
+
+        self.window.get_widget("console-auth-username").set_text(username)
         self.window.get_widget("console-auth-password").set_text(pw)
-        self.window.get_widget("console-auth-password").grab_focus()
+
         if self.config.has_keyring():
             self.window.get_widget("console-auth-remember").set_sensitive(True)
-            if pw != None and pw != "":
+            if pw != "" or username != "":
                 self.window.get_widget("console-auth-remember").set_active(True)
             else:
                 self.window.get_widget("console-auth-remember").set_active(False)
         else:
             self.window.get_widget("console-auth-remember").set_sensitive(False)
         self.window.get_widget("console-pages").set_current_page(PAGE_AUTHENTICATE)
+        if withUsername:
+            self.window.get_widget("console-auth-username").grab_focus()
+        else:
+            self.window.get_widget("console-auth-password").grab_focus()
+
 
     def activate_viewer_page(self):
         self.window.get_widget("console-pages").set_current_page(PAGE_VNCVIEWER)
diff -rup old/src/vmm-details.glade virt-manager-0.7.0/src/vmm-details.glade
--- old/src/vmm-details.glade	2009-09-17 17:23:42.448302000 -0400
+++ virt-manager-0.7.0/src/vmm-details.glade	2009-09-17 17:25:42.970347000 -0400
@@ -1436,7 +1436,6 @@ I/O:</property>
                               </widget>
                               <packing>
                                 <property name="position">2</property>
-                                <property name="tab_expand">True</property>
                               </packing>
                             </child>
                             <child>
@@ -1572,8 +1571,8 @@ I/O:</property>
                                                       <widget class="GtkSpinButton" id="config-memory">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
-                                                        <property name="adjustment">50 50 32000 5 10 0</property>
-                                                        <property name="climb_rate">1</property>
+                                                        <property name="adjustment">50 50 32000 1 25 0</property>
+                                                        <property name="climb_rate">2</property>
                                                         <property name="numeric">True</property>
                                                         <property name="update_policy">GTK_UPDATE_IF_VALID</property>
                                                         <accessibility>
@@ -1610,8 +1609,8 @@ I/O:</property>
                                                       <widget class="GtkSpinButton" id="config-maxmem">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
-                                                        <property name="adjustment">50 50 32000 5 10 0</property>
-                                                        <property name="climb_rate">1</property>
+                                                        <property name="adjustment">50 50 32000 1 25 0</property>
+                                                        <property name="climb_rate">2</property>
                                                         <property name="numeric">True</property>
                                                         <property name="update_policy">GTK_UPDATE_IF_VALID</property>
                                                         <accessibility>
Only in virt-manager-0.7.0/src: vmm-details.glade.orig
Only in virt-manager-0.7.0/src: vmm-details.glade.rej
Only in virt-manager-0.7.0/src: .vmm-details.glade.rej.swp

virt-manager-0.7.0-fix-sparse-knob.patch:
 create.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE virt-manager-0.7.0-fix-sparse-knob.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1245180678 14400
# Node ID bd26943d4dadf3be993c44ff8401c6426fd94488
# Parent  f9ad1d0c29d08bbb0ed94df9878d666904d018a2
Correctly handle non sparse request in VM wizard. (Mark McLoughlin)

We currently have it backwards, so a sparse request actually asks for
nonsparse. We didn't see this much, since until recently virtinst wasn't
allowing nonsparse volume allocation.

diff -r f9ad1d0c29d0 -r bd26943d4dad src/virtManager/create.py
--- a/src/virtManager/create.py	Thu Jun 04 16:28:40 2009 -0400
+++ b/src/virtManager/create.py	Tue Jun 16 15:31:18 2009 -0400
@@ -820,14 +820,14 @@
     def get_storage_info(self):
         path = None
         size = self.window.get_widget("config-storage-size").get_value()
-        nosparse = self.window.get_widget("config-storage-nosparse").get_active()
+        sparse = not self.window.get_widget("config-storage-nosparse").get_active()
         if self.window.get_widget("config-storage-create").get_active():
             path = self.get_default_path(self.guest.name)
             logging.debug("Default storage path is: %s" % path)
         else:
             path = self.window.get_widget("config-storage-entry").get_text()
 
-        return (path, size, nosparse)
+        return (path, size, sparse)
 
     def get_default_path(self, name):
         path = ""

virt-manager-0.7.0-iso-storage-browser.patch:
 .create.py.rej.swp |only
 choosecd.py        |   25 +++++++++++++++++--------
 create.py          |   44 +++++++++++++++++---------------------------
 create.py.orig     |    4 ++--
 create.py.rej      |only
 storagebrowse.py   |    6 ++++++
 6 files changed, 42 insertions(+), 37 deletions(-)

--- NEW FILE virt-manager-0.7.0-iso-storage-browser.patch ---
diff -rup old/src/virtManager/choosecd.py virt-manager-0.7.0/src/virtManager/choosecd.py
--- old/src/virtManager/choosecd.py	2009-09-17 17:12:16.317469000 -0400
+++ virt-manager-0.7.0/src/virtManager/choosecd.py	2009-09-17 17:12:26.626644000 -0400
@@ -23,8 +23,8 @@ import logging
 
 import virtinst
 
-from virtManager import util
 from virtManager.opticalhelper import vmmOpticalDriveHelper
+from virtManager.storagebrowse import vmmStorageBrowser
 from virtManager.error import vmmErrorDialog
 
 class vmmChooseCD(gobject.GObject):
@@ -39,10 +39,13 @@ class vmmChooseCD(gobject.GObject):
                                   0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE,
                                   _("Unexpected Error"),
                                   _("An unexpected error occurred"))
+        self.topwin = self.window.get_widget("vmm-choose-cd")
+        self.topwin.hide()
+
         self.config = config
-        self.window.get_widget("vmm-choose-cd").hide()
         self.dev_id_info = dev_id_info
         self.conn = connection
+        self.storage_browser = None
 
         self.window.signal_autoconnect({
             "on_media_toggled": self.media_toggled,
@@ -130,9 +133,7 @@ class vmmChooseCD(gobject.GObject):
         pass
 
     def browse_fv_iso_location(self, ignore1=None, ignore2=None):
-        filename = self._browse_file(_("Locate ISO Image"))
-        if filename != None:
-            self.window.get_widget("iso-path").set_text(filename)
+        self._browse_file(_("Locate ISO Image"))
 
     def populate_opt_media(self):
         try:
@@ -143,9 +144,17 @@ class vmmChooseCD(gobject.GObject):
             logging.error("Unable to create optical-helper widget: '%s'", e)
             self.window.get_widget("physical-media").set_sensitive(False)
 
-    def _browse_file(self, dialog_name, folder=None, _type=None):
-        return util.browse_local(self.window.get_widget("vmm-choose-cd"),
-                                 dialog_name, folder, _type)
+    def set_storage_path(self, src, path):
+        self.window.get_widget("iso-path").set_text(path)
 
+    def _browse_file(self, dialog_name):
+        if self.storage_browser == None:
+            self.storage_browser = vmmStorageBrowser(self.config, self.conn)
+                                                     #self.topwin)
+            self.storage_browser.connect("storage-browse-finish",
+                                         self.set_storage_path)
+        self.storage_browser.local_args = { "dialog_name": dialog_name }
+        self.storage_browser.show(self.conn)
+        return None
 
 gobject.type_register(vmmChooseCD)
diff -rup old/src/virtManager/create.py virt-manager-0.7.0/src/virtManager/create.py
--- old/src/virtManager/create.py	2009-09-17 17:12:16.371469000 -0400
+++ virt-manager-0.7.0/src/virtManager/create.py	2009-09-17 17:14:56.395189000 -0400
@@ -997,18 +997,16 @@ class vmmCreate(gobject.GObject):
             nodetect_label.show()
 
     def browse_iso(self, ignore1=None, ignore2=None):
-        f = self._browse_file(_("Locate ISO Image"), is_media=True)
-        if f != None:
-            self.window.get_widget("install-local-entry").set_text(f)
+        self._browse_file(_("Locate ISO Image"),
+                          self.set_iso_storage_path)
         self.window.get_widget("install-local-entry").activate()
 
     def toggle_enable_storage(self, src):
         self.window.get_widget("config-storage-box").set_sensitive(src.get_active())
 
     def browse_storage(self, ignore1):
-        f = self._browse_file(_("Locate existing storage"))
-        if f != None:
-            self.window.get_widget("config-storage-entry").set_text(f)
+        self._browse_file(_("Locate existing storage"),
+                          self.set_disk_storage_path)
 
     def toggle_storage_select(self, src):
         act = src.get_active()
@@ -1017,13 +1015,11 @@ class vmmCreate(gobject.GObject):
     def toggle_macaddr(self, src):
         self.window.get_widget("config-macaddr").set_sensitive(src.get_active())
 
-    def set_storage_path(self, src, path):
-        notebook = self.window.get_widget("create-pages")
-        curpage = notebook.get_current_page()
-        if curpage == PAGE_INSTALL:
-            self.window.get_widget("install-local-entry").set_text(path)
-        elif curpage == PAGE_STORAGE:
-            self.window.get_widget("config-storage-entry").set_text(path)
+    def set_iso_storage_path(self, ignore, path):
+        self.window.get_widget("install-local-entry").set_text(path)
+
+    def set_disk_storage_path(self, ignore, path):
+        self.window.get_widget("config-storage-entry").set_text(path)
 
     # Navigation methods
     def set_install_page(self):
@@ -1655,20 +1651,14 @@ class vmmCreate(gobject.GObject):
             logging.exception("Error detecting distro.")
             self.detectedDistro = (None, None)
 
-    def _browse_file(self, dialog_name, folder=None, is_media=False):
-
-        if self.conn.is_remote() or not is_media:
-            if self.storage_browser == None:
-                self.storage_browser = vmmStorageBrowser(self.config,
-                                                         self.conn)
-                self.storage_browser.connect("storage-browse-finish",
-                                             self.set_storage_path)
-            self.storage_browser.local_args = { "dialog_name": dialog_name,
-                                                "start_folder": folder}
-            self.storage_browser.show(self.conn)
-            return None
-
-        return util.browse_local(self.topwin, dialog_name, folder)
+    def _browse_file(self, dialog_name, callback, folder=None):
+        if self.storage_browser == None:
+            self.storage_browser = vmmStorageBrowser(self.config, self.conn)
+
+        self.storage_browser.set_finish_cb(callback)
+        self.storage_browser.local_args = { "dialog_name": dialog_name,
+                                            "start_folder": folder}
+        self.storage_browser.show(self.conn)
 
     def show_help(self, ignore):
         # No help available yet.
diff -rup old/src/virtManager/create.py.orig virt-manager-0.7.0/src/virtManager/create.py.orig
--- old/src/virtManager/create.py.orig	2009-09-17 17:12:16.548472000 -0400
+++ virt-manager-0.7.0/src/virtManager/create.py.orig	2009-09-17 17:12:26.597639000 -0400
@@ -822,14 +822,14 @@ class vmmCreate(gobject.GObject):
     def get_storage_info(self):
         path = None
         size = self.window.get_widget("config-storage-size").get_value()
-        nosparse = self.window.get_widget("config-storage-nosparse").get_active()
+        sparse = not self.window.get_widget("config-storage-nosparse").get_active()
         if self.window.get_widget("config-storage-create").get_active():
             path = self.get_default_path(self.guest.name)
             logging.debug("Default storage path is: %s" % path)
         else:
             path = self.window.get_widget("config-storage-entry").get_text()
 
-        return (path, size, nosparse)
+        return (path, size, sparse)
 
     def get_default_path(self, name):
         path = ""
Only in virt-manager-0.7.0/src/virtManager: create.py.rej
Only in virt-manager-0.7.0/src/virtManager: .create.py.rej.swp
diff -rup old/src/virtManager/storagebrowse.py virt-manager-0.7.0/src/virtManager/storagebrowse.py
--- old/src/virtManager/storagebrowse.py	2009-09-17 17:12:16.503470000 -0400
+++ virt-manager-0.7.0/src/virtManager/storagebrowse.py	2009-09-17 17:12:26.650639000 -0400
@@ -47,6 +47,7 @@ class vmmStorageBrowser(gobject.GObject)
         self.config = config
         self.conn = conn
         self.conn_signal_ids = []
+        self.finish_cb_id = None
 
         self.topwin = self.window.get_widget("vmm-storage-browse")
         self.err = vmmErrorDialog(self.topwin,
@@ -83,6 +84,11 @@ class vmmStorageBrowser(gobject.GObject)
             self.addvol.close()
         return 1
 
+    def set_finish_cb(self, callback):
+        if self.finish_cb_id:
+            self.disconnect(self.finish_cb_id)
+        self.finish_cb_id = self.connect("storage-browse-finish", callback)
+
     def set_initial_state(self):
         pool_list = self.window.get_widget("pool-list")
         virtManager.host.init_pool_list(pool_list, self.pool_selected)

virt-manager-0.7.0-migrate-fixes.patch:
 domain.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE virt-manager-0.7.0-migrate-fixes.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1236630113 14400
# Node ID 6126a50801deafa155b17b66cfc3008ffe584b24
# Parent  3f37d0519b1750666e88e7eaef8d5dfaafc34237
Fix conn uri lookup for domain migration.

diff -rup virt-manager-0.6.1/src/virtManager/domain.py new/src/virtManager/domain.py
--- virt-manager-0.6.1/src/virtManager/domain.py	2009-09-13 20:25:12.000000000 -0400
+++ new/src/virtManager/domain.py	2009-09-13 20:24:29.000000000 -0400
@@ -1293,11 +1293,15 @@ class vmmDomain(gobject.GObject):
         else:
             self._disk_io = self._sample_disk_io_dummy
 
-
-    def migrate(self, dictcon):
+    def migrate(self, destconn):
         flags = 0
         if self.lastStatus == libvirt.VIR_DOMAIN_RUNNING:
             flags = libvirt.VIR_MIGRATE_LIVE
-        self.vm.migrate(self.connection.vmm, flags, None, dictcon.get_short_hostname(), 0)
+
+        newxml = self.get_xml()
+
+        self.vm.migrate(destconn.vmm, flags, None, None, 0)
+
+        destconn.define_domain(newxml)
 
 gobject.type_register(vmmDomain)

virt-manager-0.7.0-pylint-script.patch:
 Makefile.am                  |    2 
 tests/Makefile.am            |    4 +
 tests/pylint-virt-manager.sh |  115 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)

--- NEW FILE virt-manager-0.7.0-pylint-script.patch ---
diff -rupN virt-manager-0.6.1/tests/Makefile.am new/tests/Makefile.am
--- virt-manager-0.6.1/tests/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/Makefile.am	2009-03-18 13:05:51.516847000 -0400
@@ -0,0 +1,4 @@
+testsdir = $(pkgdatadir)/tests
+tests_DATA = $(wildcard $(srcdir)/*.sh)
+
+EXTRA_DIST = $(tests_DATA)
diff -rupN virt-manager-0.6.1/tests/pylint-virt-manager.sh new/tests/pylint-virt-manager.sh
--- virt-manager-0.6.1/tests/pylint-virt-manager.sh	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/pylint-virt-manager.sh	2009-03-18 13:05:51.513848000 -0400
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# pylint doesn't work well with a file named xxx.py.xxx
+cp src/virt-manager.py.in src/_virt-manager
+
+cd src || exit 1
+
+IGNOREFILES="IPy.py"
+FILES="virtManager/ _virt-manager"
+
+# Deliberately ignored warnings:
+# Don't print pylint config warning
+NO_PYL_CONFIG=".*No config file found.*"
+
+# The gettext function is installed in the builtin namespace
+GETTEXT_VAR="Undefined variable '_'"
+
+# These all work fine and are legit, just false positives
+GOBJECT_VAR="has no '__gobject_init__' member"
+EMIT_VAR="has no 'emit' member"
+ERROR_VBOX="vmmErrorDialog.__init__.*Class 'vbox' has no 'pack_start' member"
+EXCEPTHOOK="no '__excepthook__' member"
+CONNECT_VAR="no 'connect' member"
+DISCONNECT_VAR="no 'disconnect' member"
+
+# os._exit is needed for forked processes.
+OS_EXIT="protected member _exit of a client class"
+
+# Avahi API may have requirements on callback argument names, so ignore these
+# warnings
+BTYPE_LIST="(vmmConnect.add_service|vmmConnect.remove_service|vmmConnect.add_conn_to_list)"
+BUILTIN_TYPE="${BTYPE_LIST}.*Redefining built-in 'type'"
+
+
+DMSG=""
+addmsg() {
+    DMSG="${DMSG},$1"
+}
+
+addchecker() {
+    DCHECKERS="${DCHECKERS},$1"
+}
+
+# Disabled unwanted messages
+addmsg "C0103"      # C0103: Name doesn't match some style regex
+addmsg "C0111"      # C0111: No docstring
+addmsg "C0301"      # C0301: Line too long
+addmsg "C0302"      # C0302: Too many lines in module
+addmsg "C0324"      # C0324: *Comma not followed by a space*
+addmsg "R0201"      # R0201: Method could be a function
+addmsg "W0105"      # W0105: String statement has no effect
+addmsg "W0141"      # W0141: Complaining about 'map' and 'filter'
+addmsg "W0142"      # W0142: *Used * or ** magic*
+addmsg "W0403"      # W0403: Relative imports
+addmsg "W0603"      # W0603: Using the global statement
+addmsg "W0702"      # W0703: No exception type specified
+addmsg "W0703"      # W0703: Catch 'Exception'
+addmsg "W0704"      # W0704: Exception doesn't do anything
+
+# Potentially useful messages, disabled for now
+addmsg "C0322"      # C0322: *Operator not preceded by a space*
+addmsg "C0323"      # C0323: *Operator not followed by a space*
+addmsg "W0201"      # W0201: Defined outside __init__
+addmsg "W0511"      # W0511: FIXME and XXX: messages
+addmsg "W0613"      # W0613: Unused arguments
+
+# Disabled Checkers:
+addchecker "Design"         # Things like "Too many func arguments",
+                            #             "Too man public methods"
+addchecker "Similarities"   # Finds duplicate code (enable this later?)
+
+# May want to enable this in the future
+SHOW_REPORT="n"
+
+AWK=awk
+[ `uname -s` = 'SunOS' ] && AWK=nawk
+
+pylint --ignore=IPy.py $FILES \
+  --reports=$SHOW_REPORT \
+  --output-format=colorized \
+  --dummy-variables-rgx="dummy|ignore*" \
+  --disable-msg=${DMSG}\
+  --disable-checker=${DCHECKERS} 2>&1 | \
+  egrep -ve "$NO_PYL_CONFIG" \
+        -ve "$GOBJECT_VAR" \
+        -ve "$EMIT_VAR" \
+        -ve "$CONNECT_VAR" \
+        -ve "$DISCONNECT_VAR" \
+        -ve "$GETTEXT_VAR" \
+        -ve "$OS_EXIT" \
+        -ve "$BUILTIN_TYPE" \
+        -ve "$ERROR_VBOX" \
+        -ve "$EXCEPTHOOK" | \
+$AWK '\
+# Strip out any "*** Module name" lines if we dont list any errors for them
+BEGIN { found=0; cur_line="" }
+{
+    if (found == 1) {
+        if ( /\*\*\*/ ) {
+            prev_line = $0
+        } else {
+            print prev_line
+            print $0
+            found = 0
+        }
+    } else if ( /\*\*\*/ ) {
+        found = 1
+        prev_line = $0
+    } else {
+        print $0
+    }
+}'
+
+cd - > /dev/null
+rm src/_virt-manager
diff -rup virt-manager-0.6.1/Makefile.am new/Makefile.am
--- virt-manager-0.6.1/Makefile.am	2009-01-26 14:33:33.000000000 -0500
+++ new/Makefile.am	2009-03-18 13:25:07.912999000 -0400
@@ -11,4 +11,4 @@ rpm: clean
 	$(MAKE) dist && rpmbuild -ta $(distdir).tar.gz
 
 check-pylint:
-	tests/pylint-virt-manager.sh
+	sh tests/pylint-virt-manager.sh

virt-manager-0.7.0-vcpu-mem-persistent.patch:
 old/src/virtManager/create.py.orig            |only
 old/src/virtManager/delete.py.orig            |only
 old/src/virtManager/details.py.orig           |only
 old/src/virtManager/domain.py.orig            |only
 src/virtManager/util.py                       |    1 
 virt-manager-0.7.0/src/virtManager/details.py |   74 ++++++++-----
 virt-manager-0.7.0/src/virtManager/domain.py  |  138 +++++++++++++++++++++-----
 virt-manager-0.7.0/src/virtManager/util.py    |   20 +++
 8 files changed, 178 insertions(+), 55 deletions(-)

--- NEW FILE virt-manager-0.7.0-vcpu-mem-persistent.patch ---
Only in old/src/virtManager: create.py.orig
Only in old/src/virtManager: delete.py.orig
diff -rup old/src/virtManager/details.py virt-manager-0.7.0/src/virtManager/details.py
--- old/src/virtManager/details.py	2009-09-17 17:31:58.267831000 -0400
+++ virt-manager-0.7.0/src/virtManager/details.py	2009-09-17 17:45:36.638881000 -0400
@@ -1502,7 +1502,27 @@ class vmmDetails(gobject.GObject):
     def config_vcpus_apply(self, src):
         vcpus = self.window.get_widget("config-vcpus").get_adjustment().value
         logging.info("Setting vcpus for " + self.vm.get_uuid() + " to " + str(vcpus))
-        self.vm.set_vcpu_count(vcpus)
+        hotplug_err = False
+
+        try:
+            if self.vm.is_active():
+                self.vm.hotplug_vcpus(vcpus)
+        except Exception, e:
+            logging.debug("VCPU hotplug failed: %s" % str(e))
+            hotplug_err = True
+
+        # Change persistent config
+        try:
+            self.vm.define_vcpus(vcpus)
+        except Exception, e:
+            self.err.show_err(_("Error changing vcpu value: %s" % str(e)),
+                              "".join(traceback.format_exc()))
+            return False
+
+        if hotplug_err:
+            self.err.show_info(_("These changes will take effect after the "
+                                 "next guest reboot. "))
+
         self.window.get_widget("config-vcpus-apply").set_sensitive(False)
 
     def config_get_maxmem(self):
@@ -1538,44 +1558,38 @@ class vmmDetails(gobject.GObject):
 
     def config_memory_apply(self, src):
         self.refresh_config_memory()
-        exc = None
+        hotplug_err = False
+
         curmem = None
         maxmem = self.config_get_maxmem()
         if self.window.get_widget("config-memory").get_property("sensitive"):
             curmem = self.config_get_memory()
 
-        logging.info("Setting max-memory for " + self.vm.get_name() +
-                     " to " + str(maxmem))
-
-        actual_cur = self.vm.get_memory()
-        if curmem is not None:
-            logging.info("Setting memory for " + self.vm.get_name() +
-                         " to " + str(curmem))
-            if (maxmem * 1024) < actual_cur:
-                # Set current first to avoid error
-                try:
-                    self.vm.set_memory(curmem * 1024)
-                    self.vm.set_max_memory(maxmem * 1024)
-                except Exception, e:
-                    exc = e
-            else:
-                try:
-                    self.vm.set_max_memory(maxmem * 1024)
-                    self.vm.set_memory(curmem * 1024)
-                except Exception, e:
-                    exc = e
+        if curmem:
+            curmem = int(curmem) * 1024
+        if maxmem:
+            maxmem = int(maxmem) * 1024
 
-        else:
-            try:
-                self.vm.set_max_memory(maxmem * 1024)
-            except Exception, e:
-                exc = e
+        try:
+            if self.vm.is_active():
+                self.vm.hotplug_both_mem(curmem, maxmem)
+        except Exception, e:
+            logging.debug("Memory hotplug failed: %s" % str(e))
+            hotplug_err = True
 
-        if exc:
+        # Change persistent config
+        try:
+            self.vm.define_both_mem(curmem, maxmem)
+        except Exception, e:
             self.err.show_err(_("Error changing memory values: %s" % str(e)),
                               "".join(traceback.format_exc()))
-        else:
-            self.window.get_widget("config-memory-apply").set_sensitive(False)
+            return
+
+        if hotplug_err:
+            self.err.show_info(_("These changes will take effect after the "
+                                 "next guest reboot. "))
+
+        self.window.get_widget("config-memory-apply").set_sensitive(False)
 
     def config_boot_options_changed(self, src):
         self.window.get_widget("config-boot-options-apply").set_sensitive(True)
Only in old/src/virtManager: details.py.orig
diff -rup old/src/virtManager/domain.py virt-manager-0.7.0/src/virtManager/domain.py
--- old/src/virtManager/domain.py	2009-09-17 17:31:58.276831000 -0400
+++ virt-manager-0.7.0/src/virtManager/domain.py	2009-09-17 17:47:15.693255000 -0400
@@ -23,6 +23,7 @@ import libvirt
 import libxml2
 import os
 import logging
+import difflib
 
 from virtManager import util
 import virtinst.util as vutil
@@ -113,6 +114,16 @@ class vmmDomain(gobject.GObject):
             self.refresh_inactive_xml()
         return self._orig_inactive_xml
 
+    def get_xml_to_define(self):
+        # FIXME: This isn't sufficient, since we pull stuff like disk targets
+        #        from the active XML. This all needs proper fixing in the long
+        #        term.
+        if self.is_active():
+            return self.get_inactive_xml()
+        else:
+            self.update_xml()
+            return self.get_xml()
+
     def refresh_inactive_xml(self):
         flags = (libvirt.VIR_DOMAIN_XML_INACTIVE |
                  libvirt.VIR_DOMAIN_XML_SECURE)
@@ -124,6 +135,36 @@ class vmmDomain(gobject.GObject):
 
         self._orig_inactive_xml = self.vm.XMLDesc(flags)
 
+    def redefine(self, xml_func, *args):
+        """
+        Helper function for altering a redefining VM xml
+
+        @param xml_func: Function to alter the running XML. Takes the
+                         original XML as its first argument.
+        @param args: Extra arguments to pass to xml_func
+        """
+        origxml = self.get_xml_to_define()
+        # Sanitize origxml to be similar to what we will get back
+        origxml = util.xml_parse_wrapper(origxml, lambda d, c: d.serialize())
+
+        newxml = xml_func(origxml, *args)
+
+        if origxml == newxml:
+            logging.debug("Redefinition requested, but new xml was not"
+                          " different")
+            return
+
+        diff = "".join(difflib.unified_diff(origxml.splitlines(1),
+                                            newxml.splitlines(1),
+                                            fromfile="Original XML",
+                                            tofile="New XML"))
+        logging.debug("Redefining '%s' with XML diff:\n%s",
+                      self.get_name(), diff)
+        self.get_connection().define_domain(newxml)
+
+        # Invalidate cached XML
+        self.invalidate_xml()
+
     def release_handle(self):
         del(self.vm)
         self.vm = None
@@ -1126,16 +1167,6 @@ class vmmDomain(gobject.GObject):
             if doc != None:
                 doc.freeDoc()
 
-    def get_xml_to_define(self):
-        # FIXME: This isn't sufficient, since we pull stuff like disk targets
-        #        from the active XML. This all needs proper fixing in the long
-        #        term.
-        if self.is_active():
-            return self.get_inactive_xml()
-        else:
-            self.update_xml()
-            return self.get_xml()
-
     def attach_device(self, xml):
         """Hotplug device to running guest"""
         if self.is_active():
@@ -1232,23 +1263,80 @@ class vmmDomain(gobject.GObject):
                 doc.freeDoc()
         self._change_cdrom(result, dev_id_info)
 
-    def set_vcpu_count(self, vcpus):
+    def hotplug_vcpu(self, vcpus):
+        self.vm.setVcpus()
+
+    def hotplug_vcpus(self, vcpus):
         vcpus = int(vcpus)
-        self.vm.setVcpus(vcpus)
+        if vcpus != self.vcpu_count():
+            self.vm.setVcpus(vcpus)
+
+    def define_vcpus(self, vcpus):
+        vcpus = int(vcpus)
+
+        def set_node(doc, ctx, val, xpath):
+            node = ctx.xpathEval(xpath)
+            node = (node and node[0] or None)
+
+            if node:
+                node.setContent(str(val))
+            return doc.serialize()
+
+        def change_vcpu_xml(xml, vcpus):
+            return util.xml_parse_wrapper(xml, set_node, vcpus,
+                                          "/domain/vcpu[1]")
+
+        self.redefine(change_vcpu_xml, vcpus)
+
+    def hotplug_memory(self, memory):
+        if memory != self.get_memory():
+            self.vm.setMemory(memory)
+
+    def hotplug_maxmem(self, maxmem):
+        if maxmem != self.maximum_memory():
+            self.vm.setMaxMemory(maxmem)
+
+    def hotplug_both_mem(self, memory, maxmem):
+        logging.info("Hotplugging curmem=%s maxmem=%s for VM '%s'" %
+                     (memory, maxmem, self.get_name()))
+
+        if self.is_active():
+            actual_cur = self.get_memory()
+            if memory:
+                if maxmem < actual_cur:
+                    # Set current first to avoid error
+                    self.hotplug_memory(memory)
+                    self.hotplug_maxmem(maxmem)
+                else:
+                    self.hotplug_maxmem(maxmem)
+                    self.hotplug_memory(memory)
+            else:
+                self.hotplug_maxmem(maxmem)
+
+    def define_both_mem(self, memory, maxmem):
+        # Make sure we correctly define the XML with new values, since
+        # setMem and setMaxMem don't (or, aren't supposed to) affect
+        # the persistent config
+        self.invalidate_xml()
+
+        def set_mem_node(doc, ctx, memval, xpath):
+            node = ctx.xpathEval(xpath)
+            node = (node and node[0] or None)
+
+            if node:
+                node.setContent(str(memval))
+            return doc.serialize()
+
+        def change_mem_xml(xml, memory, maxmem):
+            if memory:
+                xml = util.xml_parse_wrapper(xml, set_mem_node, memory,
+                                             "/domain/currentMemory[1]")
+            if maxmem:
+                xml = util.xml_parse_wrapper(xml, set_mem_node, maxmem,
+                                             "/domain/memory[1]")
+            return xml
 
-    def set_memory(self, memory):
-        memory = int(memory)
-        # capture updated information due to failing to get proper maxmem setting
-        # if both current & max allocation are set simultaneously
-        maxmem = self.vm.info()
-        if (memory > maxmem[1]):
-            logging.warning("Requested memory " + str(memory) + " over maximum " + str(self.maximum_memory()))
-            memory = self.maximum_memory()
-        self.vm.setMemory(memory)
-
-    def set_max_memory(self, memory):
-        memory = int(memory)
-        self.vm.setMaxMemory(memory)
+        self.redefine(change_mem_xml, memory, maxmem)
 
     def get_autostart(self):
         return self.vm.autostart()
Only in old/src/virtManager: domain.py.orig
diff -rup old/src/virtManager/util.py virt-manager-0.7.0/src/virtManager/util.py
--- old/src/virtManager/util.py	2009-09-17 17:52:15.948670000 -0400
+++ virt-manager-0.7.0/src/virtManager/util.py	2009-09-17 17:52:58.963375000 -0400
@@ -140,3 +140,23 @@ def dup_conn(config, conn, libconn=None)
     newconn.connectThreadEvent.wait()
 
     return newconn.vmm
+
+def xml_parse_wrapper(xml, parse_func, *args, **kwargs):
+    """
+    Parse the passed xml string into an xpath context, which is passed
+    to parse_func, along with any extra arguments.
+    """
+
+    doc = None
+    ctx = None
+    ret = None
+    try:
+        doc = libxml2.parseDoc(xml)
+        ctx = doc.xpathNewContext()
+        ret = parse_func(doc, ctx, *args, **kwargs)
+    finally:
+        if ctx != None:
+            ctx.xpathFreeContext()
+        if doc != None:
+            doc.freeDoc()
+    return ret
diff -rup old/src/virtManager/util.py virt-manager-0.7.0/src/virtManager/util.py
--- old/src/virtManager/util.py	2009-09-17 17:55:17.930744000 -0400
+++ virt-manager-0.7.0/src/virtManager/util.py	2009-09-17 17:55:31.355655000 -0400
@@ -21,6 +21,7 @@
 import logging
 import gtk
 
+import libxml2
 import libvirt
 
 import virtManager


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-11/virt-manager.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- virt-manager.spec	21 May 2009 14:58:14 -0000	1.52
+++ virt-manager.spec	18 Sep 2009 14:50:44 -0000	1.53
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.7.0
-Release: 5%{_extra_release}
+Release: 6%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -27,6 +27,20 @@ Patch9: %{name}-%{version}-fix-window-re
 Patch10: %{name}-%{version}-vnc-auth-get-username.patch
 Patch11: %{name}-%{version}-handle-arch-config.patch
 Patch12: %{name}-%{version}-log-capabilities-at-startup.patch
+# Fix migration for qemu/kvm guests (bz 517548)
+Patch13: %{name}-%{version}-migrate-fixes.patch
+# Fix sparse allocation confusion (bz 504605)
+Patch14: %{name}-%{version}-fix-sparse-knob.patch
+# Czech translation typo (bz 504385)
+Patch15: %{name}-%{version}-czech-typo.patch
+# Use storage browser for iso installs (bz 504326)
+Patch16: %{name}-%{version}-iso-storage-browser.patch
+# Fix max/current memory spin button interaction (bz 503786)
+Patch17: %{name}-%{version}-fix-memory-interaction.patch
+# Make memory and vcpu changes unconditionally persistent (bz 503784)
+Patch18: %{name}-%{version}-vcpu-mem-persistent.patch
+# Add pylint script
+Patch19: %{name}-%{version}-pylint-script.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -111,6 +125,13 @@ management API.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 %configure
@@ -188,6 +209,14 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Fri Sep 18 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-6.fc11
+- Fix migration for qemu/kvm guests (bz 517548)
+- Fix sparse allocation confusion (bz 504605)
+- Czech translation typo (bz 504385)
+- Use storage browser for iso installs (bz 504326)
+- Fix max/current memory spin button interaction (bz 503786)
+- Make memory and vcpu changes unconditionally persistent (bz 503784)
+
 * Thu May 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-5.fc11
 - Fix 'opertaing' typo in 'New VM' dialog (#495128)
 - Allow details window to resize again (#491683)



From ksyz at fedoraproject.org  Fri Sep 18 15:05:49 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Fri, 18 Sep 2009 15:05:49 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/EL-5 import.log, NONE,
	1.1 perl-Flickr-Upload-remotetests.patch, NONE,
	1.1 perl-Flickr-Upload.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918150549.ED8B811C01EA@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23044/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Flickr-Upload-remotetests.patch 
	perl-Flickr-Upload.spec 
Log Message:
Initial commit of perl-Flickr-Upload




--- NEW FILE import.log ---
perl-Flickr-Upload-1_32-2_fc11:EL-5:perl-Flickr-Upload-1.32-2.fc11.src.rpm:1253286145

perl-Flickr-Upload-remotetests.patch:
 async.t      |    2 +-
 failupload.t |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE perl-Flickr-Upload-remotetests.patch ---
diff -ru t/async.t t/async.t
--- t/async.t	2008-06-18 22:33:37.000000000 +0200
+++ t/async.t	2009-08-12 13:49:12.000000000 +0200
@@ -1,4 +1,4 @@
-use Test::More qw(no_plan);
+use Test::More skip_all => 'Calling home';
 BEGIN { use_ok('Flickr::Upload') };
 
 my $api_key = '8dcf37880da64acfe8e30bb1091376b7';
diff -ru t/failupload.t t/failupload.t
--- t/failupload.t	2008-06-18 01:05:16.000000000 +0200
+++ t/failupload.t	2009-08-12 13:49:12.000000000 +0200
@@ -1,4 +1,4 @@
-use Test::More qw(no_plan);
+use Test::More skip_all => 'Calling home';
 BEGIN { use_ok('Flickr::Upload') };
 
 my $api_key = '8dcf37880da64acfe8e30bb1091376b7';


--- NEW FILE perl-Flickr-Upload.spec ---
Name:           perl-Flickr-Upload
Version:        1.32
Release:        2%{?dist}
Summary:        Flickr.com upload module and script
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Flickr-Upload/
Source0:        http://www.cpan.org/authors/id/C/CP/CPB/Flickr-Upload-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Test::Simple)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Flickr::API) >= 0.07
BuildRequires:  perl(HTTP::Request::Common) >= 1
BuildRequires:  perl(LWP::UserAgent) >= 1
BuildRequires:  perl(XML::Parser::Lite::Tree) >= 0.03
Requires:       perl(Flickr::API) >= 0.07
Requires:       perl(HTTP::Request::Common) >= 1
Requires:       perl(LWP::UserAgent) >= 1
Requires:       perl(XML::Parser::Lite::Tree) >= 0.03
Requires:       perl(Term::ProgressBar) >= 2.09
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Patch0: 	perl-Flickr-Upload-remotetests.patch

%description
Module and script for uploading images to flickr.com web gallery.

%prep
%setup -q -n Flickr-Upload-%{version}
%patch0 -p0 -b .remotetests

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/flickr_upload
%{_mandir}/man1/flickr_upload.1.gz


%changelog
* Wed Aug 12 2009 Michal Ingeli <mi at v3.sk> 1.32-2
- Added missing buildrequire for Test::Simple
- Removed test that interact with api.flickr.com

* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> 1.32-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:59 -0000	1.1
+++ .cvsignore	18 Sep 2009 15:05:46 -0000	1.2
@@ -0,0 +1 @@
+Flickr-Upload-1.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:30:00 -0000	1.1
+++ sources	18 Sep 2009 15:05:46 -0000	1.2
@@ -0,0 +1 @@
+15bbfe5cf0160915f7f51a9868704086  Flickr-Upload-1.32.tar.gz



From jwrdegoede at fedoraproject.org  Fri Sep 18 15:06:20 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 18 Sep 2009 15:06:20 +0000 (UTC)
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.68,1.69
Message-ID: <20090918150621.0482911C0338@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23566

Modified Files:
	python-pyblock.spec 
Log Message:
* Fri Sep 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-2
- Rebuild for new dmraid



Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- python-pyblock.spec	4 Sep 2009 07:41:09 -0000	1.68
+++ python-pyblock.spec	18 Sep 2009 15:06:20 -0000	1.69
@@ -6,7 +6,7 @@
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.43
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -16,7 +16,7 @@ BuildRequires: device-mapper-libs >= %{d
 BuildRequires: dmraid-devel >= %{dmrver}, libselinux-devel, libsepol-devel
 BuildRequires: zlib-devel, libbdevid >= 5.1.0
 Requires: python, device-mapper-libs >= %{dmver}, libselinux
-Requires: libbdevid, libbdevid-python, dmraid-libs >= %{dmrver}
+Requires: libbdevid, libbdevid-python
 Requires: pyparted
 
 %description
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Fri Sep 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-2
+- Rebuild for new dmraid
+
 * Fri Sep  4 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-1
 - Catch dmraid.GroupingError in getRaidSets() (#521033)
 



From mhlavink at fedoraproject.org  Fri Sep 18 15:06:31 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 15:06:31 +0000 (UTC)
Subject: rpms/apcupsd/devel apcupsd.spec,1.35,1.36
Message-ID: <20090918150631.EC62E11C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23684

Modified Files:
	apcupsd.spec 
Log Message:
* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.7-3
- fix building with new net-snmp version



Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- apcupsd.spec	21 Aug 2009 12:23:40 -0000	1.35
+++ apcupsd.spec	18 Sep 2009 15:06:31 -0000	1.36
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.7
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -61,6 +61,7 @@ A GUI interface to the APC UPS monitorin
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/
+export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS"
 %configure \
         --sysconfdir="%{_sysconfdir}/apcupsd" \
         --with-cgi-bin="%{_localstatedir}/www/apcupsd" \
@@ -123,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog examples ReleaseNotes
 %dir %{_sysconfdir}/apcupsd
-%{_initrddir}/apcupsd
+%{_initddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
 %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
 %config(noreplace) %{_sysconfdir}/apcupsd/changeme
@@ -172,6 +173,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.7-3
+- fix building with new net-snmp version
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.14.7-2
 - rebuilt with new openssl
 



From jwrdegoede at fedoraproject.org  Fri Sep 18 15:32:52 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 18 Sep 2009 15:32:52 +0000 (UTC)
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.69,1.70
Message-ID: <20090918153252.A502611C01EA@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1401

Modified Files:
	python-pyblock.spec 
Log Message:
* Fri Sep 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-2
- Rebuild for new dmraid



Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- python-pyblock.spec	18 Sep 2009 15:06:20 -0000	1.69
+++ python-pyblock.spec	18 Sep 2009 15:32:51 -0000	1.70
@@ -15,6 +15,8 @@ BuildRequires: python-devel, gettext
 BuildRequires: device-mapper-libs >= %{dmver}, device-mapper-devel >= %{dmver}
 BuildRequires: dmraid-devel >= %{dmrver}, libselinux-devel, libsepol-devel
 BuildRequires: zlib-devel, libbdevid >= 5.1.0
+# Hack for 524261
+BuildRequires: dmraid
 Requires: python, device-mapper-libs >= %{dmver}, libselinux
 Requires: libbdevid, libbdevid-python
 Requires: pyparted



From ruben at fedoraproject.org  Fri Sep 18 15:35:28 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 18 Sep 2009 15:35:28 +0000 (UTC)
Subject: rpms/python-wokkel/devel .cvsignore, 1.4, 1.5 python-wokkel.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090918153528.BCD4911C01EA@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-wokkel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2217

Modified Files:
	.cvsignore python-wokkel.spec sources 
Log Message:
* Fri Sep 18 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.6.3-1
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jul 2009 14:35:07 -0000	1.4
+++ .cvsignore	18 Sep 2009 15:35:28 -0000	1.5
@@ -1 +1 @@
-wokkel-0.6.2.tar.gz
+wokkel-0.6.3.tar.gz


Index: python-wokkel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/devel/python-wokkel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-wokkel.spec	27 Jul 2009 01:31:42 -0000	1.5
+++ python-wokkel.spec	18 Sep 2009 15:35:28 -0000	1.6
@@ -3,8 +3,8 @@
 
 %define libname wokkel
 Name:           python-%{libname}
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        Enhancements to the Twisted XMPP protocol implementation
 
 Group:          Development/Languages
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 18 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.6.3-1
+- Upstream released new version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jul 2009 14:35:07 -0000	1.4
+++ sources	18 Sep 2009 15:35:28 -0000	1.5
@@ -1 +1 @@
-4927ea97ff0363d33d8c762c61564570  wokkel-0.6.2.tar.gz
+bfc6570c19602393b43ec25c69ec7727  wokkel-0.6.3.tar.gz



From davej at fedoraproject.org  Fri Sep 18 15:38:49 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 18 Sep 2009 15:38:49 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1820,1.1821
Message-ID: <20090918153849.BF39611C01EA@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3734

Modified Files:
	kernel.spec 
Log Message:
%ghost the dracut initramfs file.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1820
retrieving revision 1.1821
diff -u -p -r1.1820 -r1.1821
--- kernel.spec	17 Sep 2009 20:28:48 -0000	1.1820
+++ kernel.spec	18 Sep 2009 15:38:49 -0000	1.1821
@@ -2027,7 +2027,7 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %if %{with_dracut}\
-%ghost /boot/dracut-%{KVERREL}%{?2:.%{2}}.img\
+%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
 %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
@@ -2070,6 +2070,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 18 2009 Dave Jones <davej at redhat.com>
+- %ghost the dracut initramfs file.
+
 * Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
 - Now that we have %%post generation of dracut images we do not need to
   Require dracut-kernel anymore



From davej at fedoraproject.org  Fri Sep 18 15:40:20 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 18 Sep 2009 15:40:20 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1806,1.1807
Message-ID: <20090918154020.08E7611C0338@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4140

Modified Files:
	kernel.spec 
Log Message:
%ghost the dracut initramfs file.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1806
retrieving revision 1.1807
diff -u -p -r1.1806 -r1.1807
--- kernel.spec	17 Sep 2009 20:30:01 -0000	1.1806
+++ kernel.spec	18 Sep 2009 15:40:19 -0000	1.1807
@@ -1956,7 +1956,7 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %if %{with_dracut}\
-%ghost /boot/dracut-%{KVERREL}%{?2:.%{2}}.img\
+%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
 %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
@@ -2005,6 +2005,9 @@ fi
 # ##############################################################
 
 %changelog
+* Fri Sep 18 2009 Dave Jones <davej at redhat.com>
+- %ghost the dracut initramfs file.
+
 * Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
 - Now that we have %%post generation of dracut images we do not need to
   Require dracut-kernel anymore



From pkgdb at fedoraproject.org  Fri Sep 18 15:50:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:50:42 +0000
Subject: [pkgdb] dhcp: jpopelka has requested watchbugzilla
Message-ID: <20090918155034.CB47110F884@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchbugzilla acl on dhcp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:50:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:50:35 +0000
Subject: [pkgdb] dhcp: jpopelka has requested watchcommits
Message-ID: <20090918155037.51DF610F888@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchcommits acl on dhcp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:50:57 +0000
Subject: [pkgdb] dhcp: jpopelka has requested watchbugzilla
Message-ID: <20090918155050.246E810F884@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchbugzilla acl on dhcp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:50:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:50:47 +0000
Subject: [pkgdb] dhcp: jpopelka has requested commit
Message-ID: <20090918155040.2DC9810F895@bastion2.fedora.phx.redhat.com>

jpopelka has requested the commit acl on dhcp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:50:50 +0000
Subject: [pkgdb] dhcp: jpopelka has requested watchcommits
Message-ID: <20090918155052.05DC510F89B@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchcommits acl on dhcp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:50:55 +0000
Subject: [pkgdb] dhcp: jpopelka has requested commit
Message-ID: <20090918155053.E451110F89E@bastion2.fedora.phx.redhat.com>

jpopelka has requested the commit acl on dhcp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:51:06 +0000
Subject: [pkgdb] dhcp: jpopelka has requested watchbugzilla
Message-ID: <20090918155059.475F410F886@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchbugzilla acl on dhcp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:51:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:51:11 +0000
Subject: [pkgdb] dhcp: jpopelka has requested commit
Message-ID: <20090918155103.51C1B10F8A4@bastion2.fedora.phx.redhat.com>

jpopelka has requested the commit acl on dhcp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 15:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 15:51:02 +0000
Subject: [pkgdb] dhcp: jpopelka has requested watchcommits
Message-ID: <20090918155101.3588310F894@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchcommits acl on dhcp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From ajax at fedoraproject.org  Fri Sep 18 15:51:42 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 18 Sep 2009 15:51:42 +0000 (UTC)
Subject: rpms/system-config-display/devel system-config-display.spec, 1.67, 
	1.68
Message-ID: <20090918155142.C99DB11C01EA@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/system-config-display/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7890

Modified Files:
	system-config-display.spec 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.1-1
- s-c-d 2.1



Index: system-config-display.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- system-config-display.spec	9 Sep 2009 15:50:28 -0000	1.67
+++ system-config-display.spec	18 Sep 2009 15:51:42 -0000	1.68
@@ -13,6 +13,7 @@ Source0: http://fedorahosted.org/release
 ExcludeArch: s390 s390x
 BuildRequires: desktop-file-utils
 BuildRequires: intltool, gettext
+BuildRequires: python
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade
 Requires: python2
@@ -75,7 +76,7 @@ fi
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
-* Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 2.1-1
+* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.1-1
 - s-c-d 2.1
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3



From ajax at fedoraproject.org  Fri Sep 18 15:57:44 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 18 Sep 2009 15:57:44 +0000 (UTC)
Subject: rpms/system-config-display/devel system-config-display.spec, 1.68, 
	1.69
Message-ID: <20090918155744.EC1E811C01EA@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/system-config-display/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10267

Modified Files:
	system-config-display.spec 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.1-1
- s-c-d 2.1



Index: system-config-display.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- system-config-display.spec	18 Sep 2009 15:51:42 -0000	1.68
+++ system-config-display.spec	18 Sep 2009 15:57:44 -0000	1.69
@@ -13,7 +13,7 @@ Source0: http://fedorahosted.org/release
 ExcludeArch: s390 s390x
 BuildRequires: desktop-file-utils
 BuildRequires: intltool, gettext
-BuildRequires: python
+BuildRequires: python-devel
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade
 Requires: python2



From rdieter at fedoraproject.org  Fri Sep 18 16:01:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Sep 2009 16:01:49 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.119,1.120 comps-f13.xml.in,1.10,1.11
Message-ID: <20090918160149.255FA11C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11280

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
kde-desktop: google-droid-fonts default



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- comps-f12.xml.in	18 Sep 2009 08:44:13 -0000	1.119
+++ comps-f12.xml.in	18 Sep 2009 16:01:48 -0000	1.120
@@ -3594,6 +3594,9 @@
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">digikam</packagereq>
+      <packagereq type="default">google-droid-sans-fonts</packagereq>
+      <packagereq type="default">google-droid-sans-mono-fonts</packagereq>
+      <packagereq type="default">google-droid-serif-fonts</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- comps-f13.xml.in	15 Sep 2009 08:38:14 -0000	1.10
+++ comps-f13.xml.in	18 Sep 2009 16:01:48 -0000	1.11
@@ -3590,6 +3590,9 @@
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">digikam</packagereq>
+      <packagereq type="default">google-droid-sans-fonts</packagereq>
+      <packagereq type="default">google-droid-sans-mono-fonts</packagereq>
+      <packagereq type="default">google-droid-serif-fonts</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>



From ajax at fedoraproject.org  Fri Sep 18 16:04:28 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 18 Sep 2009 16:04:28 +0000 (UTC)
Subject: rpms/system-config-display/devel system-config-display.spec, 1.69, 
	1.70
Message-ID: <20090918160428.CD47E11C01EA@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/system-config-display/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12276

Modified Files:
	system-config-display.spec 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.1-1
- s-c-d 2.1



Index: system-config-display.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- system-config-display.spec	18 Sep 2009 15:57:44 -0000	1.69
+++ system-config-display.spec	18 Sep 2009 16:04:28 -0000	1.70
@@ -14,6 +14,7 @@ ExcludeArch: s390 s390x
 BuildRequires: desktop-file-utils
 BuildRequires: intltool, gettext
 BuildRequires: python-devel
+BuildRequires: pkgconfig(xrandr)
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade
 Requires: python2



From rdieter at fedoraproject.org  Fri Sep 18 16:09:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Sep 2009 16:09:47 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-11 .cvsignore, 1.7, 1.8 GraphicsMagick.spec, 
	1.24, 1.25 sources, 1.7, 1.8 GraphicsMagick-1.1.10-gcc43.patch,
	1.2, NONE GraphicsMagick-1.1.15-multilib.patch, 1.1,
	NONE GraphicsMagick-gslib.patch, 1.1,
	NONE GraphicsMagick-perl.patch, 1.3, NONE
Message-ID: <20090918160947.6B18D11C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13700

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Removed Files:
	GraphicsMagick-1.1.10-gcc43.patch 
	GraphicsMagick-1.1.15-multilib.patch 
	GraphicsMagick-gslib.patch GraphicsMagick-perl.patch 
Log Message:
sync w/devel branch for 1.3.7 goodness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	30 Jun 2009 16:41:47 -0000	1.7
+++ .cvsignore	18 Sep 2009 16:09:46 -0000	1.8
@@ -1 +1 @@
-GraphicsMagick-1.1.15.tar.bz2
+GraphicsMagick-1.3.7.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/GraphicsMagick.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- GraphicsMagick.spec	30 Jun 2009 16:41:47 -0000	1.24
+++ GraphicsMagick.spec	18 Sep 2009 16:09:47 -0000	1.25
@@ -1,26 +1,32 @@
+
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.15
+Version: 1.3.7
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
-Patch0: GraphicsMagick-gslib.patch
-Patch1: GraphicsMagick-perl.patch
-Patch2: GraphicsMagick-1.1.10-gcc43.patch
-# hack out multilib issues, esp since we know we're in default search paths
-Patch3: GraphicsMagick-1.1.15-multilib.patch
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
-BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
-BuildRequires: freetype-devel >= 2.0.1
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
-BuildRequires: ghostscript-devel
-BuildRequires: libwmf-devel, perl-devel
-BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
+BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
+BuildRequires: bzip2-devel
+BuildRequires: freetype-devel
+BuildRequires: jasper-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libtiff-devel
+BuildRequires: libungif-devel
+BuildRequires: libwmf-devel
+BuildRequires: libxml2-devel
 BuildRequires: libX11-devel libXext-devel libXt-devel
+BuildRequires: perl 
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires: perl-devel
+%endif
+BuildRequires: zlib-devel
 
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
@@ -36,7 +42,7 @@ Requires: ghostscript-devel, bzip2-devel
 Requires: lcms-devel, pkgconfig, libX11-devel, libXext-devel, libXt-devel
 
 %description devel
-GraphicsMagick-devel contains the libraries and header files you'll
+GraphicsMagick-devel contains the Libraries and header files you'll
 need to develop GraphicsMagick applications. GraphicsMagick is an image
 manipulation program.
 
@@ -76,7 +82,7 @@ Requires: %{name}-c++ = %{version}-%{rel
 Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
-GraphicsMagick-devel contains the libraries and header files you'll
+GraphicsMagick-devel contains the Libraries and header files you'll
 need to develop GraphicsMagick applications using the Magick++ C++ bindings.
 GraphicsMagick is an image manipulation program.
 
@@ -89,13 +95,6 @@ however.
 
 %prep
 %setup -q
-# Disabled, causing segfaults in the gslib code path
-#%patch0 -p 1 -b .gslib 
-%patch1 -p 1 -b .perl
-%patch2 -p1 -b .gcc43
-%patch3 -p1 -b .multilib
-# Regenerating configure script
-#autoconf
 
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
@@ -113,11 +112,9 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{
            --with-x \
            --with-threads \
            --with-magick_plus_plus \
-           --with-gslib \
+           --without-gslib \
            --with-wmf \
-           --with-lzw \
            --with-lcms \
-           --with-rsvg \
            --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
            --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
@@ -127,12 +124,14 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{
 sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 
 make %{?_smp_mflags}
+make %{?_smp_mflags} perl-build
 
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} -C PerlMagick
 
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
@@ -205,10 +204,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
-%doc README.txt AUTHORS
+%doc README.txt
 %doc %{_datadir}/doc/%{name}/
-%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.1*
-%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.0*
+%{_libdir}/libGraphicsMagick.so.3*
+%{_libdir}/libGraphicsMagickWand.so.2*
 %{_bindir}/[a-z]*
 %{_libdir}/GraphicsMagick*
 %{_datadir}/GraphicsMagick*
@@ -230,12 +229,12 @@ rm -rf %{buildroot}
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libGraphicsMagick++.so.1*
+%{_libdir}/libGraphicsMagick++.so.3*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_bindir}/GraphicsMagick++-config
-%{_includedir}/GraphicsMagick/Magick++
+%{_includedir}/GraphicsMagick/Magick++/
 %{_includedir}/GraphicsMagick/Magick++.h
 %{_libdir}/libGraphicsMagick++.so
 %{_libdir}/pkgconfig/GraphicsMagick++.pc
@@ -248,6 +247,23 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
+- GraphicsMagick-1.3.7
+
+* Mon Aug  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.6-2
+- Use lzma-compressed upstream source tarball.
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 1.3.6-1
+- GraphicsMagick-1.3.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.5-1
+- GraphicsMagick-1.3.5, ABI break (#487605)
+- --without-libgs (for now, per upstream advice)
+- BR: jasper-devel
+
 * Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
 - GraphicsMagick-1.1.15
 - fix BuildRoot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	30 Jun 2009 16:41:47 -0000	1.7
+++ sources	18 Sep 2009 16:09:47 -0000	1.8
@@ -1 +1 @@
-e8b1393b14356fc2baf0f79db100cce8  GraphicsMagick-1.1.15.tar.bz2
+8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma


--- GraphicsMagick-1.1.10-gcc43.patch DELETED ---


--- GraphicsMagick-1.1.15-multilib.patch DELETED ---


--- GraphicsMagick-gslib.patch DELETED ---


--- GraphicsMagick-perl.patch DELETED ---



From otaylor at fedoraproject.org  Fri Sep 18 16:12:05 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Fri, 18 Sep 2009 16:12:05 +0000 (UTC)
Subject: rpms/desktop-effects/devel desktop-effects.spec,1.4,1.5
Message-ID: <20090918161205.B339211C01EA@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14417

Modified Files:
	desktop-effects.spec 
Log Message:
* Fri Sep 18 2009 Owen Taylor <otaylor at redhat.com> - 0.8.4-1
- Update to 0.8.4 (fixes #524102)



Index: desktop-effects.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/desktop-effects.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- desktop-effects.spec	14 Sep 2009 13:17:57 -0000	1.4
+++ desktop-effects.spec	18 Sep 2009 16:12:05 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           desktop-effects
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        Switch GNOME window management and effects
 
@@ -67,6 +67,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
 fi
 
 %changelog
+* Fri Sep 18 2009 Owen Taylor <otaylor at redhat.com> - 0.8.4-1
+- Update to 0.8.4 (fixes #524102)
+
 * Mon Sep 14 2009 Owen Taylor <otaylor at redhat.com> - 0.8.3-1
 - Update to 0.8.3 (translations)
 



From mhlavink at fedoraproject.org  Fri Sep 18 16:12:36 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Sep 2009 16:12:36 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.init, 1.2, 1.3 cyrus-imapd.spec, 
	1.60, 1.61
Message-ID: <20090918161236.B82D911C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14744

Modified Files:
	cyrus-imapd.init cyrus-imapd.spec 
Log Message:
* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
- make init script LSB-compliant (#523227)



Index: cyrus-imapd.init
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cyrus-imapd.init	28 Feb 2006 20:04:01 -0000	1.2
+++ cyrus-imapd.init	18 Sep 2009 16:12:36 -0000	1.3
@@ -11,45 +11,28 @@
 # version:	2005111100
 # changed:	add quickstart/stop option to init script to bypass db import/export
 
-# Source function library
-if [ -f /etc/init.d/functions ]; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ]; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 0
-fi
+. /etc/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
+config=/etc/imapd.conf
+config2=/etc/cyrus.conf
+exec=/usr/lib/cyrus-imapd/cyrus-master
+lockfile=/var/lock/subsys/cyrus-imapd
+pidfile=/var/run/cyrus-master.pid
+prog="cyrus-imapd"
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+if [ -f /etc/sysconfig/dovecot ]; then
+    . /etc/sysconfig/dovecot
+fi
 
 # check if the config files are present
-[ -f /etc/cyrus.conf ] || exit 0
-[ -f /etc/imapd.conf ] || exit 0
+configok=true
+[ -f $config -a $config2 ] || configok=false
  
-# This is our service name
-BASENAME=$(basename $0)
-if [ -L $0 ]; then
-  BASENAME=$(find $0 -name $BASENAME -printf %l)
-  BASENAME=$(basename $BASENAME)
-fi
-
-# Source service configuration.
-if [ -f /etc/sysconfig/$BASENAME ]; then
-  . /etc/sysconfig/$BASENAME
-else
-  echo "$BASENAME: configfile /etc/sysconfig/$BASENAME does NOT exist !"
-  exit 1
-fi
-
 # get_config [config default]
 # extracts config option from config file
 get_config() {
-  if config=$(grep "^$1" /etc/imapd.conf); then
-    echo $config | cut -d: -f2
+  if conf=$(grep "^$1" /etc/imapd.conf); then
+    echo $conf | cut -d: -f2
   else
     echo $2
   fi
@@ -61,66 +44,65 @@ CYRUSMASTER=/usr/lib/cyrus-imapd/cyrus-m
 CYRUS_PROC_NAME=$(basename $CYRUSMASTER)
 ALWAYS_CONVERT=1
 
-# fallback to su if runuser not available
-if [ -x /sbin/runuser ]; then
-  RUNUSER=runuser
-else
-  RUNUSER=su
-fi
-
 RETVAL=0
 RETVAL2=1
 QUICK=0
 
 start() {
+  [ $UID -eq 0 ] || exit 4
+  [ -x $exec ] || exit 5
+  $configok || exit 6
   if [ $(/sbin/pidof -s $CYRUSMASTER) ]; then
-    echo -n $"$BASENAME already running."
-    false
+    echo -n $"$prog already running."
+    true
     echo
   else
     if [ $QUICK -eq 0 ]; then
-      echo -n $"Importing $BASENAME databases: "
+      echo -n $"Importing $prog databases: "
       cd $CONFIGDIRECTORY
-      $RUNUSER - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
+      runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
       RETVAL=$?
       if [ $RETVAL -eq 0 ]; then
-        success $"$BASENAME importing databases"
+        success $"$prog importing databases"
       else
-        failure $"$BASENAME error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
+        failure $"$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
       fi
       echo
     fi
     if [ $RETVAL -eq 0 ]; then
-      echo -n $"Starting $BASENAME: "
+      echo -n $"Starting $prog: "
       daemon $CYRUSMASTER -d $CYRUSOPTIONS
       RETVAL2=$?
       echo
     fi
   fi
-  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch $lockfile
   return $RETVAL
 }
 
 stop() {
-  echo -n $"Shutting down $BASENAME: "
+  [ $UID -eq 0 ] || exit 4
+  [ -x $exec ] || exit 5
+
+  echo -n $"Shutting down $prog: "
   killproc $CYRUSMASTER
   RETVAL=$?
   if [ $QUICK -eq 0 ]; then
     if [ ! $(/sbin/pidof -s $CYRUSMASTER) ]; then
       echo
-      echo -n $"Exporting $BASENAME databases: "
+      echo -n $"Exporting $prog databases: "
       cd $CONFIGDIRECTORY
-      $RUNUSER - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
+      runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
       RETVAL2=$?
       if [ $RETVAL2 -eq 0 ]; then
-        success $"$BASENAME exporting databases"
+        success $"$prog exporting databases"
       else
-        failure $"$BASENAME error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
+        failure $"$prog error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
       fi
     fi
   fi
   echo
-  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f $lockfile
   return $RETVAL
 }
 
@@ -137,16 +119,6 @@ reload() {
   return $RETVAL
 }
  
-condrestart() {
-  [ -e /var/lock/subsys/$BASENAME ] && restart || :
-}
-
-rhstatus() {
-  status $CYRUSMASTER
-  RETVAL=$?
-  return $RETVAL
-}
-
 case "$1" in
   start)
     start
@@ -154,17 +126,21 @@ case "$1" in
   stop)
     stop
     ;;
-  restart)
+  force-reload|restart)
     restart
     ;;
   reload)
     reload
     ;;
-  condrestart)
-    condrestart
+  condrestart|try-restart)
+    if [ -f $lockfile ]; then
+        stop
+        start
+    fi
     ;;
   status)
-    rhstatus
+    status -p $pidfile $prog 
+    RETVAL=$?
     ;;
   quickstart)
     QUICK=1
@@ -175,8 +151,9 @@ case "$1" in
     stop
     ;;
   *)
-    echo $"Usage: $BASENAME {start|stop|restart|reload|condrestart|status|quickstart|quickstop}"
-    RETVAL=1
+    echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status|quickstart|quickstop}"
+    RETVAL=2
+    [ "$1" = "usage" ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cyrus-imapd.spec	18 Sep 2009 13:21:33 -0000	1.60
+++ cyrus-imapd.spec	18 Sep 2009 16:12:36 -0000	1.61
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -731,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
+- make init script LSB-compliant (#523227)
+
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
 - fix buffer overflow in cyrus sieve (CVE-2009-3235)
 



From rjones at fedoraproject.org  Fri Sep 18 16:15:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 18 Sep 2009 16:15:02 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.97,1.98
Message-ID: <20090918161502.3C97211C01EA@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15524

Modified Files:
	libguestfs.spec 
Log Message:
Potential fix for RHBZ#523547


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- libguestfs.spec	15 Sep 2009 10:35:21 -0000	1.97
+++ libguestfs.spec	18 Sep 2009 16:15:02 -0000	1.98
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.70
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -218,6 +218,8 @@ Summary:     Perl bindings for %{name}
 Group:       Development/Libraries
 Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# RHBZ#523547
+Requires:    perl-XML-XPath
 
 
 %description -n perl-%{name}
@@ -537,6 +539,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2
+- Perl bindings require perl-XML-XPath (fixed RHBZ#523547).
+
 * Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-1
 - New upstream release 1.0.70.
 - Fixes build problem related to old version of GNU gettext.



From rjones at fedoraproject.org  Fri Sep 18 16:15:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 18 Sep 2009 16:15:03 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.62,1.63
Message-ID: <20090918161503.F07B311C01EA@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15544

Modified Files:
	libguestfs.spec 
Log Message:
Potential fix for RHBZ#523547


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- libguestfs.spec	15 Sep 2009 10:36:27 -0000	1.62
+++ libguestfs.spec	18 Sep 2009 16:15:03 -0000	1.63
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.70
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -218,6 +218,8 @@ Summary:     Perl bindings for %{name}
 Group:       Development/Libraries
 Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# RHBZ#523547
+Requires:    perl-XML-XPath
 
 
 %description -n perl-%{name}
@@ -533,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2
+- Perl bindings require perl-XML-XPath (fixed RHBZ#523547).
+
 * Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-1
 - New upstream release 1.0.70.
 - Fixes build problem related to old version of GNU gettext.



From rjones at fedoraproject.org  Fri Sep 18 16:15:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 18 Sep 2009 16:15:05 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.66,1.67
Message-ID: <20090918161505.9056811C01EA@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15564

Modified Files:
	libguestfs.spec 
Log Message:
Potential fix for RHBZ#523547


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- libguestfs.spec	15 Sep 2009 10:35:03 -0000	1.66
+++ libguestfs.spec	18 Sep 2009 16:15:05 -0000	1.67
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.70
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -234,6 +234,8 @@ Summary:     Perl bindings for %{name}
 Group:       Development/Libraries
 Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# RHBZ#523547
+Requires:    perl-XML-XPath
 
 
 %description -n perl-%{name}
@@ -536,6 +538,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2
+- Perl bindings require perl-XML-XPath (fixed RHBZ#523547).
+
 * Tue Sep 15 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-1
 - New upstream release 1.0.70.
 - Fixes build problem related to old version of GNU gettext.



From dwalsh at fedoraproject.org  Fri Sep 18 16:20:05 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Sep 2009 16:20:05 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.83,
	1.84 selinux-policy.spec, 1.921, 1.922
Message-ID: <20090918162005.97EF311C0334@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17191

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-3
- Fix sandbox policy to allow it to run under firefox.  
- Dont audit leaks.


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  318 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  177 +++
 policy/modules/apps/sandbox.te            |  323 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   79 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1403 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 315 files changed, 14507 insertions(+), 2573 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- policy-F12.patch	17 Sep 2009 21:41:30 -0000	1.83
+++ policy-F12.patch	18 Sep 2009 16:20:04 -0000	1.84
@@ -1595,7 +1595,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.32/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/gnome.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/gnome.te	2009-09-18 08:09:19.000000000 -0400
 @@ -9,16 +9,18 @@
  attribute gnomedomain;
  
@@ -1634,11 +1634,21 @@ diff -b -B --ignore-all-space --exclude-
  ##############################
  #
  # Local Policy
-@@ -73,3 +84,79 @@
+@@ -73,3 +84,89 @@
  	xserver_use_xdm_fds(gconfd_t)
  	xserver_rw_xdm_pipes(gconfd_t)
  ')
 +
++tunable_policy(`use_nfs_home_dirs',`
++        fs_manage_nfs_dirs(gconfdefaultsm_t)
++        fs_manage_nfs_files(gconfdefaultsm_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++        fs_manage_cifs_dirs(gconfdefaultsm_t)
++        fs_manage_cifs_files(gconfdefaultsm_t)
++')
++
 +#######################################
 +#
 +# gconf-defaults-mechanisms local policy
@@ -2301,7 +2311,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.6.32/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.if	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.if	2009-09-18 10:42:05.000000000 -0400
 @@ -45,6 +45,18 @@
  	relabel_dirs_pattern($2, mozilla_home_t, mozilla_home_t)
  	relabel_files_pattern($2, mozilla_home_t, mozilla_home_t)
@@ -2329,6 +2339,31 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_search_user_home_dirs($1)
  ')
  
+@@ -88,6 +101,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Dontaudit attempts to write mozilla home directory content
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`mozilla_dontaudit_write_user_home_files',`
++	gen_require(`
++		type mozilla_home_t;
++	')
++
++	dontaudit $1 mozilla_home_t:file write;
++')
++
++########################################
++## <summary>
+ ##	Run mozilla in the mozilla domain.
+ ## </summary>
+ ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.6.32/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-09-16 10:03:08.000000000 -0400
@@ -3587,8 +3622,8 @@ diff -b -B --ignore-all-space --exclude-
 +# No types are sandbox_exec_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-17 16:13:55.000000000 -0400
-@@ -0,0 +1,174 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-18 11:27:41.000000000 -0400
+@@ -0,0 +1,177 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -3626,7 +3661,10 @@ diff -b -B --ignore-all-space --exclude-
 +	role $2 types sandbox_x_domain;
 +	role $2 types sandbox_xserver_t;
 +	allow sandbox_x_domain $1:process sigchld;
-+
++	# Dontaudit leaked file descriptors
++	dontaudit sandbox_x_domain $1:fifo_file rw_fifo_file_perms;
++	dontaudit sandbox_x_domain $1:tcp_socket rw_socket_perms;
++	
 +	manage_files_pattern($1, sandbox_file_type, sandbox_file_type);
 +	manage_dirs_pattern($1, sandbox_file_type, sandbox_file_type);
 +	manage_sock_files_pattern($1, sandbox_file_type, sandbox_file_type);
@@ -3765,8 +3803,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-17 12:56:35.000000000 -0400
-@@ -0,0 +1,315 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-18 11:29:38.000000000 -0400
+@@ -0,0 +1,323 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -3830,6 +3868,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_usr_files(sandbox_xserver_t)
 +files_search_home(sandbox_xserver_t)
 +fs_dontaudit_rw_tmpfs_files(sandbox_xserver_t)
++fs_list_inotifyfs(sandbox_xserver_t)
 +
 +miscfiles_read_fonts(sandbox_xserver_t)
 +miscfiles_read_localization(sandbox_xserver_t)
@@ -3893,7 +3932,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow sandbox_x_domain self:fifo_file manage_file_perms;
 +allow sandbox_x_domain self:unix_stream_socket create_stream_socket_perms;
 +
-+allow sandbox_x_domain self:process { signal_perms getsched setpgid };
++allow sandbox_x_domain self:process { signal_perms getsched setpgid execstack execmem };
 +allow sandbox_x_domain self:shm create_shm_perms;
 +allow sandbox_x_domain self:unix_stream_socket { connectto create_stream_socket_perms };
 +allow sandbox_x_domain self:unix_dgram_socket create_socket_perms;
@@ -3901,6 +3940,7 @@ diff -b -B --ignore-all-space --exclude-
 +dontaudit sandbox_x_domain self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 +
 +files_search_home(sandbox_x_domain)
++files_dontaudit_getattr_tmp_dirs(sandbox_x_domain)
 +
 +kernel_read_system_state(sandbox_x_domain)
 +
@@ -3908,6 +3948,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +dev_read_urand(sandbox_x_domain)
 +dev_dontaudit_read_rand(sandbox_x_domain)
++dev_dontaudit_search_sysfs(sandbox_x_domain)
 +
 +files_entrypoint_all_files(sandbox_x_domain)
 +files_read_etc_files(sandbox_x_domain)
@@ -3949,6 +3990,11 @@ diff -b -B --ignore-all-space --exclude-
 +files_search_home(sandbox_x_t)
 +userdom_use_user_ptys(sandbox_x_t)
 +
++optional_policy(`
++	mozilla_dontaudit_write_user_home_files(sandbox_x_t)
++')
++
++
 +########################################
 +#
 +# sandbox_x_client_t local policy
@@ -4105,8 +4151,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/seunshare	--	gen_context(system_u:object_r:seunshare_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.if serefpolicy-3.6.32/policy/modules/apps/seunshare.if
 --- nsaserefpolicy/policy/modules/apps/seunshare.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-17 13:02:52.000000000 -0400
-@@ -0,0 +1,76 @@
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-18 11:41:50.000000000 -0400
+@@ -0,0 +1,79 @@
 +
 +## <summary>policy for seunshare</summary>
 +
@@ -4154,6 +4200,9 @@ diff -b -B --ignore-all-space --exclude-
 +	seunshare_domtrans($1)
 +	sandbox_transition(seunshare_t, $2)
 +	role $2 types seunshare_t;
++
++	# leaks from firefox
++	dontaudit seunshare_t $1:tcp_socket rw_socket_perms;
 +')
 +
 +########################################
@@ -4185,8 +4234,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.6.32/policy/modules/apps/seunshare.te
 --- nsaserefpolicy/policy/modules/apps/seunshare.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-09-17 16:38:51.000000000 -0400
-@@ -0,0 +1,39 @@
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-09-18 10:46:57.000000000 -0400
+@@ -0,0 +1,45 @@
 +policy_module(seunshare,1.0.0)
 +
 +########################################
@@ -4213,11 +4262,13 @@ diff -b -B --ignore-all-space --exclude-
 +allow seunshare_t self:fifo_file rw_file_perms;
 +allow seunshare_t self:unix_stream_socket create_stream_socket_perms;
 +
++corecmd_exec_shell(seunshare_t)
++corecmd_exec_bin(seunshare_t)
++
 +files_read_etc_files(seunshare_t)
 +files_mounton_all_poly_members(seunshare_t)
 +
-+corecmd_exec_shell(seunshare_t)
-+corecmd_exec_bin(seunshare_t)
++fs_list_inotifyfs(seunshare_t)
 +
 +auth_use_nsswitch(seunshare_t)
 +
@@ -4226,6 +4277,10 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(seunshare_t)
 +
 +userdom_use_user_terminals(seunshare_t)
++
++optional_policy(`
++	mozilla_dontaudit_write_user_home_files(seunshare_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.6.32/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2009-09-09 09:23:16.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/vmware.te	2009-09-16 10:03:08.000000000 -0400
@@ -4658,7 +4713,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.32/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-09-18 11:29:27.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -5258,7 +5313,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-18 11:28:35.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -7487,8 +7542,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-09-16 10:03:09.000000000 -0400
-@@ -0,0 +1,393 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-09-18 09:45:33.000000000 -0400
+@@ -0,0 +1,392 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7808,7 +7863,6 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	xserver_run(unconfined_t, unconfined_r)
 +	xserver_rw_shm(unconfined_t)
 +')
 +
@@ -20632,7 +20686,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.6.32/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/init.fc	2009-09-18 09:48:19.000000000 -0400
 @@ -4,10 +4,10 @@
  /etc/init\.d/.*		--	gen_context(system_u:object_r:initrc_exec_t,s0)
  
@@ -20646,15 +20700,16 @@ diff -b -B --ignore-all-space --exclude-
  
  /etc/X11/prefdm		--	gen_context(system_u:object_r:initrc_exec_t,s0)
  
-@@ -45,6 +45,8 @@
+@@ -44,6 +44,9 @@
+ 
  /usr/sbin/apachectl	-- 	gen_context(system_u:object_r:initrc_exec_t,s0)
  /usr/sbin/open_init_pty	--	gen_context(system_u:object_r:initrc_exec_t,s0)
- 
-+/usr/share/system-config-services/system-config-services-mechanism\.py  --	gen_context(system_u:object_r:initrc_exec_t,s0)
++/usr/sbin/startx	-- 	gen_context(system_u:object_r:initrc_exec_t,s0)
 +
++/usr/share/system-config-services/system-config-services-mechanism\.py  --	gen_context(system_u:object_r:initrc_exec_t,s0)
+ 
  #
  # /var
- #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.32/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-09-16 10:03:09.000000000 -0400
@@ -22733,7 +22788,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.32/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/modutils.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/modutils.te	2009-09-18 09:27:21.000000000 -0400
 @@ -19,6 +19,7 @@
  type insmod_exec_t;
  application_domain(insmod_t, insmod_exec_t)
@@ -22833,7 +22888,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(insmod_t)
  logging_search_logs(insmod_t)
-@@ -157,19 +171,30 @@
+@@ -157,19 +171,31 @@
  
  seutil_read_file_contexts(insmod_t)
  
@@ -22857,6 +22912,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	firstboot_dontaudit_rw_pipes(insmod_t)
++	firstboot_dontaudit_rw_stream_sockets(insmod_t)
 +')
 +
 +optional_policy(`
@@ -22867,7 +22923,7 @@ diff -b -B --ignore-all-space --exclude-
  	hotplug_search_config(insmod_t)
  ')
  
-@@ -228,7 +253,7 @@
+@@ -228,7 +254,7 @@
  can_exec(update_modules_t, update_modules_exec_t)
  
  # manage module loading configuration


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -p -r1.921 -r1.922
--- selinux-policy.spec	17 Sep 2009 21:41:30 -0000	1.921
+++ selinux-policy.spec	18 Sep 2009 16:20:05 -0000	1.922
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,7 +447,11 @@ exit 0
 %endif
 
 %changelog
-* Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-2
+* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-3
+- Fix sandbox policy to allow it to run under firefox.  
+- Dont audit leaks.
+
+* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-2
 - Fixes for sandbox
 
 * Wed Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-1



From pbrobinson at fedoraproject.org  Fri Sep 18 16:22:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Sep 2009 16:22:26 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard/devel .cvsignore, 1.2,
	1.3 moblin-panel-pasteboard.spec, 1.1, 1.2 sources, 1.2,
	1.3 import.log, 1.1, NONE
Message-ID: <20090918162226.C657F11C01EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18832

Modified Files:
	.cvsignore moblin-panel-pasteboard.spec sources 
Removed Files:
	import.log 
Log Message:
- New upstream 0.0.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Aug 2009 21:47:38 -0000	1.2
+++ .cvsignore	18 Sep 2009 16:22:26 -0000	1.3
@@ -1 +1 @@
-moblin-panel-pasteboard-0.0.1.tar.bz2
+moblin-panel-pasteboard-0.0.2.tar.bz2


Index: moblin-panel-pasteboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/moblin-panel-pasteboard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-pasteboard.spec	24 Aug 2009 21:47:38 -0000	1.1
+++ moblin-panel-pasteboard.spec	18 Sep 2009 16:22:26 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           moblin-panel-pasteboard
-Version:        0.0.1
+Version:        0.0.2
 Release:        1%{?dist}
 Summary:        Moblin Panel for Paste Board
 
@@ -52,5 +52,8 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Sep 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
+- New upstream 0.0.2 release
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Aug 2009 21:47:38 -0000	1.2
+++ sources	18 Sep 2009 16:22:26 -0000	1.3
@@ -1 +1 @@
-021077a72d5ed786a6eaa6dab232cd90  moblin-panel-pasteboard-0.0.1.tar.bz2
+5e343743b20bae965cb2bdf3de1987b2  moblin-panel-pasteboard-0.0.2.tar.bz2


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Fri Sep 18 16:35:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Sep 2009 16:35:21 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.8, 1.9 mutter-moblin.spec,
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090918163521.0AB4211C01EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23166

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.38.3 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Sep 2009 16:42:53 -0000	1.8
+++ .cvsignore	18 Sep 2009 16:35:20 -0000	1.9
@@ -1 +1 @@
-mutter-moblin-0.38.2.tar.bz2
+mutter-moblin-0.38.3.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mutter-moblin.spec	17 Sep 2009 16:42:53 -0000	1.9
+++ mutter-moblin.spec	18 Sep 2009 16:35:20 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.38.2
+Version:        0.38.3
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Fri Sep 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.38.3-1
+- New 0.38.3 upstream release
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.38.2-1
 - New 0.38.2 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Sep 2009 16:42:53 -0000	1.8
+++ sources	18 Sep 2009 16:35:20 -0000	1.9
@@ -1 +1 @@
-3c3a93dc55494abfbd27afb0ea886d35  mutter-moblin-0.38.2.tar.bz2
+44a4a65440d86adc540cce51a0e86359  mutter-moblin-0.38.3.tar.bz2



From mtasaka at fedoraproject.org  Fri Sep 18 16:38:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Sep 2009 16:38:41 +0000 (UTC)
Subject: rpms/rubygem-zoom/F-10 rubygem-zoom.spec,1.7,1.8
Message-ID: <20090918163841.1002211C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-zoom/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24203/F-10

Modified Files:
	rubygem-zoom.spec 
Log Message:
* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7
- Fix permission



Index: rubygem-zoom.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-zoom/F-10/rubygem-zoom.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rubygem-zoom.spec	27 Oct 2008 08:04:28 -0000	1.7
+++ rubygem-zoom.spec	18 Sep 2009 16:38:40 -0000	1.8
@@ -2,7 +2,7 @@
 %define		gemname		zoom
 %define		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
 
-%{!?ruby_sitearch:	%define	ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
+%{!?ruby_sitearch:	%global	ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define		rubyabi		1.8
 %define		repoid		28211
@@ -10,7 +10,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	7%{?dist}
 Group:		Development/Languages
 Summary:	Ruby binding to ZOOM
 
@@ -59,7 +59,6 @@ This package contains documentation for 
 
 # Cleanup
 %{__rm} -rf */CVS/
-find sample/ -name \*.rb -print0 | xargs -0 %{__chmod} 0644
 find . -type f -print0 | xargs -0 touch -r %{SOURCE0}
 
 # Repackage to split out unneeded files
@@ -69,6 +68,9 @@ cd Repackage
 %{__gzip} -dc ../data.tar.gz | %{__tar} -x -f -
 cd ..
 
+# Permission
+find . -type f -print0 | xargs -0 %{__chmod} 0644
+
 %build
 # Repackage gem
 cd Repackage
@@ -151,6 +153,15 @@ rake test
 %{geminstdir}/Rakefile
 
 %changelog
+* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7
+- Fix permission
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-6
+- F-12: Mass rebuild
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-5
+- %%global-ize "nested" macro
+
 * Mon Oct 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-4
 - Better way to set CFLAGS and create debuginfo rpm correctly
 



From mtasaka at fedoraproject.org  Fri Sep 18 16:38:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Sep 2009 16:38:41 +0000 (UTC)
Subject: rpms/rubygem-zoom/F-11 rubygem-zoom.spec,1.8,1.9
Message-ID: <20090918163841.34BD011C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-zoom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24203/F-11

Modified Files:
	rubygem-zoom.spec 
Log Message:
* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7
- Fix permission



Index: rubygem-zoom.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-zoom/F-11/rubygem-zoom.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-zoom.spec	24 Feb 2009 15:02:07 -0000	1.8
+++ rubygem-zoom.spec	18 Sep 2009 16:38:41 -0000	1.9
@@ -10,7 +10,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	7%{?dist}
 Group:		Development/Languages
 Summary:	Ruby binding to ZOOM
 
@@ -59,7 +59,6 @@ This package contains documentation for 
 
 # Cleanup
 %{__rm} -rf */CVS/
-find sample/ -name \*.rb -print0 | xargs -0 %{__chmod} 0644
 find . -type f -print0 | xargs -0 touch -r %{SOURCE0}
 
 # Repackage to split out unneeded files
@@ -69,6 +68,9 @@ cd Repackage
 %{__gzip} -dc ../data.tar.gz | %{__tar} -x -f -
 cd ..
 
+# Permission
+find . -type f -print0 | xargs -0 %{__chmod} 0644
+
 %build
 # Repackage gem
 cd Repackage
@@ -151,6 +153,12 @@ rake test
 %{geminstdir}/Rakefile
 
 %changelog
+* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7
+- Fix permission
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-6
+- F-12: Mass rebuild
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-5
 - %%global-ize "nested" macro
 



From mtasaka at fedoraproject.org  Fri Sep 18 16:38:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Sep 2009 16:38:41 +0000 (UTC)
Subject: rpms/rubygem-zoom/devel rubygem-zoom.spec,1.9,1.10
Message-ID: <20090918163841.66DDD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-zoom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24203/devel

Modified Files:
	rubygem-zoom.spec 
Log Message:
* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7
- Fix permission



Index: rubygem-zoom.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-zoom/devel/rubygem-zoom.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-zoom.spec	25 Jul 2009 07:12:50 -0000	1.9
+++ rubygem-zoom.spec	18 Sep 2009 16:38:41 -0000	1.10
@@ -10,7 +10,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	0.4.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Group:		Development/Languages
 Summary:	Ruby binding to ZOOM
 
@@ -59,7 +59,6 @@ This package contains documentation for 
 
 # Cleanup
 %{__rm} -rf */CVS/
-find sample/ -name \*.rb -print0 | xargs -0 %{__chmod} 0644
 find . -type f -print0 | xargs -0 touch -r %{SOURCE0}
 
 # Repackage to split out unneeded files
@@ -69,6 +68,9 @@ cd Repackage
 %{__gzip} -dc ../data.tar.gz | %{__tar} -x -f -
 cd ..
 
+# Permission
+find . -type f -print0 | xargs -0 %{__chmod} 0644
+
 %build
 # Repackage gem
 cd Repackage
@@ -151,6 +153,9 @@ rake test
 %{geminstdir}/Rakefile
 
 %changelog
+* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7
+- Fix permission
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-6
 - F-12: Mass rebuild
 



From tomeu at fedoraproject.org  Fri Sep 18 16:52:37 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 16:52:37 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 sugar-base.spec, 1.22, 1.23
Message-ID: <20090918165237.27B6711C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28069

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.6-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	11 Sep 2009 08:19:55 -0000	1.16
+++ .cvsignore	18 Sep 2009 16:52:36 -0000	1.17
@@ -1 +1 @@
-sugar-base-0.85.5.tar.bz2
+sugar-base-0.85.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	11 Sep 2009 08:19:55 -0000	1.16
+++ sources	18 Sep 2009 16:52:36 -0000	1.17
@@ -1 +1 @@
-d75d714bfdc0e9a1f60160ea5a83c23d  sugar-base-0.85.5.tar.bz2
+51202d8c201c9060163d14f6e2c63a34  sugar-base-0.85.6.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sugar-base.spec	11 Sep 2009 08:19:55 -0000	1.22
+++ sugar-base.spec	18 Sep 2009 16:52:36 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.85.5
+Version: 0.85.6
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.6-1
+- New upstream release
+
 * Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
 - New upstream release
 



From tomeu at fedoraproject.org  Fri Sep 18 16:55:08 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 16:55:08 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.38, 1.39 sources, 1.42,
	1.43 sugar-toolkit.spec, 1.54, 1.55
Message-ID: <20090918165508.D9E8E11C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28825

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	11 Sep 2009 08:22:32 -0000	1.38
+++ .cvsignore	18 Sep 2009 16:55:08 -0000	1.39
@@ -1 +1 @@
-sugar-toolkit-0.85.7.tar.bz2
+sugar-toolkit-0.85.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	11 Sep 2009 08:22:32 -0000	1.42
+++ sources	18 Sep 2009 16:55:08 -0000	1.43
@@ -1 +1 @@
-04dd90d0a37c0e34f8a5783bc850bd29  sugar-toolkit-0.85.7.tar.bz2
+eae3fbec9e4321c2f1d6dc6d5ee9d74f  sugar-toolkit-0.85.8.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sugar-toolkit.spec	11 Sep 2009 08:22:32 -0000	1.54
+++ sugar-toolkit.spec	18 Sep 2009 16:55:08 -0000	1.55
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.85.7
+Version: 0.85.8
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-1
+- New upstream release
+
 * Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
 - New upstream release
 



From tomeu at fedoraproject.org  Fri Sep 18 16:56:35 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 16:56:35 +0000 (UTC)
Subject: rpms/sugar-artwork/devel sugar-artwork.spec,1.28,1.29
Message-ID: <20090918165635.1A97411C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29248

Modified Files:
	sugar-artwork.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
- New upstream release



Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sugar-artwork.spec	11 Sep 2009 08:19:48 -0000	1.28
+++ sugar-artwork.spec	18 Sep 2009 16:56:34 -0000	1.29
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.85.3
+Version: 0.85.4
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
@@ -63,6 +63,9 @@ touch --no-create %{_datadir}/icons/suga
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
+- New upstream release
+
 * Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
 - New upstream release
 



From tomeu at fedoraproject.org  Fri Sep 18 16:59:18 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 16:59:18 +0000 (UTC)
Subject: rpms/sugar-datastore/devel sugar-datastore.spec,1.19,1.20
Message-ID: <20090918165918.7110211C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30897

Modified Files:
	sugar-datastore.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
- New upstream release



Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sugar-datastore.spec	11 Sep 2009 13:48:45 -0000	1.19
+++ sugar-datastore.spec	18 Sep 2009 16:59:18 -0000	1.20
@@ -4,7 +4,7 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.85.3
+Version: 0.85.4
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
@@ -55,8 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
+- New upstream release
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 0.85.3-1
-* Fix memory leaks after many get_properties() ds calls #1240
+- Fix memory leaks after many get_properties() ds calls #1240
 
 * Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
 - Update to new upstream release



From tomeu at fedoraproject.org  Fri Sep 18 17:01:15 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:01:15 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.44, 1.45 sources, 1.46,
	1.47 sugar.spec, 1.71, 1.72
Message-ID: <20090918170115.7E0E811C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31539

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.7-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	11 Sep 2009 08:29:35 -0000	1.44
+++ .cvsignore	18 Sep 2009 17:01:15 -0000	1.45
@@ -1 +1 @@
-sugar-0.85.7.tar.bz2
+sugar-0.85.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	11 Sep 2009 08:29:35 -0000	1.46
+++ sources	18 Sep 2009 17:01:15 -0000	1.47
@@ -1 +1 @@
-ef6728360fcd0b83e376cc0523de2418  sugar-0.85.7.tar.bz2
+e21ec8ce785a0126606ccd9057826e9f  sugar-0.85.8.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sugar.spec	11 Sep 2009 13:23:55 -0000	1.71
+++ sugar.spec	18 Sep 2009 17:01:15 -0000	1.72
@@ -5,8 +5,8 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.85.7
-Release: 2%{?dist}
+Version: 0.85.8
+Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -142,6 +142,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-1
+- New upstream release
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 0.85.7-2
 - add python-xklavier dependency
 



From tomeu at fedoraproject.org  Fri Sep 18 17:02:56 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:02:56 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore,1.15,1.16 sources,1.15,1.16
Message-ID: <20090918170256.3C74411C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32106

Modified Files:
	.cvsignore sources 
Log Message:
Add new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	11 Sep 2009 13:48:45 -0000	1.15
+++ .cvsignore	18 Sep 2009 17:02:55 -0000	1.16
@@ -1 +1 @@
-sugar-datastore-0.85.3.tar.bz2
+sugar-datastore-0.85.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Sep 2009 13:48:45 -0000	1.15
+++ sources	18 Sep 2009 17:02:56 -0000	1.16
@@ -1 +1 @@
-de88ed8eddc4ce04ef8591626754ffdd  sugar-datastore-0.85.3.tar.bz2
+6b3ad85cdcc3304f27596ce8a91f5112  sugar-datastore-0.85.4.tar.bz2



From tomeu at fedoraproject.org  Fri Sep 18 17:04:53 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:04:53 +0000 (UTC)
Subject: rpms/sugar-datastore/devel sugar-datastore.spec,1.20,1.21
Message-ID: <20090918170453.7618311C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32685

Modified Files:
	sugar-datastore.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-2
- Upload sources



Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sugar-datastore.spec	18 Sep 2009 16:59:18 -0000	1.20
+++ sugar-datastore.spec	18 Sep 2009 17:04:53 -0000	1.21
@@ -5,7 +5,7 @@
 
 Name: sugar-datastore
 Version: 0.85.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
 Summary: Sugar Datastore
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-2
+- Upload sources
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
 - New upstream release
 



From tomeu at fedoraproject.org  Fri Sep 18 17:07:10 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:07:10 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 sugar-artwork.spec, 1.29, 1.30
Message-ID: <20090918170710.7214D11C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1576

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-2
- Upload sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Sep 2009 08:19:48 -0000	1.20
+++ .cvsignore	18 Sep 2009 17:07:10 -0000	1.21
@@ -1 +1 @@
-sugar-artwork-0.85.3.tar.bz2
+sugar-artwork-0.85.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Sep 2009 08:19:48 -0000	1.20
+++ sources	18 Sep 2009 17:07:10 -0000	1.21
@@ -1 +1 @@
-a4c676e16d90e9e54e0351f0592f5077  sugar-artwork-0.85.3.tar.bz2
+8a4b21d851ef128a3613289bb8cbb24f  sugar-artwork-0.85.4.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sugar-artwork.spec	18 Sep 2009 16:56:34 -0000	1.29
+++ sugar-artwork.spec	18 Sep 2009 17:07:10 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.85.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
 # git clone git://dev.laptop.org/artwork
@@ -63,6 +63,9 @@ touch --no-create %{_datadir}/icons/suga
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-2
+- Upload sources
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
 - New upstream release
 



From otaylor at fedoraproject.org  Fri Sep 18 17:08:30 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Fri, 18 Sep 2009 17:08:30 +0000 (UTC)
Subject: rpms/desktop-effects/devel .cvsignore, 1.4, 1.5 desktop-effects.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090918170830.40CF311C01EA@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2073

Modified Files:
	.cvsignore desktop-effects.spec sources 
Log Message:
Add desktop-effects-0.8.4.tar.bz2 to sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Sep 2009 13:17:57 -0000	1.4
+++ .cvsignore	18 Sep 2009 17:08:30 -0000	1.5
@@ -1,3 +1,4 @@
 desktop-effects-0.8.1.tar.bz2
 desktop-effects-0.8.2.tar.bz2
 desktop-effects-0.8.3.tar.bz2
+desktop-effects-0.8.4.tar.bz2


Index: desktop-effects.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/desktop-effects.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- desktop-effects.spec	18 Sep 2009 16:12:05 -0000	1.5
+++ desktop-effects.spec	18 Sep 2009 17:08:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           desktop-effects
 Version:        0.8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Switch GNOME window management and effects
 
 Group:          User Interface/Desktops


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Sep 2009 13:17:57 -0000	1.4
+++ sources	18 Sep 2009 17:08:30 -0000	1.5
@@ -1 +1 @@
-a43557f0f6351d183bc614bde3adb31a  desktop-effects-0.8.3.tar.bz2
+d0289c19033478aae2110627f5e05c54  desktop-effects-0.8.4.tar.bz2



From tomeu at fedoraproject.org  Fri Sep 18 17:12:46 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:12:46 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.72,1.73
Message-ID: <20090918171246.82C8111C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3346

Modified Files:
	sugar.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-2
- Package /usr/share/applications/sugar-emulator.desktop



Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sugar.spec	18 Sep 2009 17:01:15 -0000	1.72
+++ sugar.spec	18 Sep 2009 17:12:46 -0000	1.73
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.85.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -140,8 +140,12 @@ rm -rf %{buildroot}
 %files emulator
 %defattr(-,root,root,-)
 %{_bindir}/sugar-emulator
+%{_datadir}/applications/sugar-emulator.desktop
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-2
+- Package /usr/share/applications/sugar-emulator.desktop
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-1
 - New upstream release
 



From orion at fedoraproject.org  Fri Sep 18 17:16:59 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 17:16:59 +0000 (UTC)
Subject: rpms/hdf/devel hdf.spec,1.33,1.34
Message-ID: <20090918171659.8EE1111C01EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4623

Modified Files:
	hdf.spec 
Log Message:
* Fri Sep 18 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-5
- Add EL4 build conditionals



Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- hdf.spec	14 Aug 2009 04:01:26 -0000	1.33
+++ hdf.spec	18 Sep 2009 17:16:59 -0000	1.34
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -14,7 +14,11 @@ Patch3: hdf-4.2r2-s390.patch
 Patch4: hdf-4.2r4-buffer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex byacc libjpeg-devel zlib-devel
+%if "%{?dist}" != ".el4"
 BuildRequires: gcc-gfortran
+%else
+BuildRequires: gcc-g77
+%endif
 
 
 %description
@@ -57,7 +61,7 @@ touch -c -r ./mfhdf/libsrc/config/netcdf
 rm config/*linux-gnu
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
-%configure F77=gfortran --disable-production --disable-netcdf \
+%configure --disable-production --disable-netcdf \
  --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}
 
 make
@@ -111,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-5
+- Add EL4 build conditionals
+
 * Thu Aug 13 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-4
 - Add -fPIC to FFLAGS
 



From hadess at fedoraproject.org  Fri Sep 18 17:17:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 17:17:31 +0000 (UTC)
Subject: rpms/vinagre/F-11 0001-Fix-warnings-activating-mDNS-bookmarks.patch,
	NONE, 1.1 vinagre.spec, 1.45, 1.46
Message-ID: <20090918171731.8896F11C01EA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4821

Modified Files:
	vinagre.spec 
Added Files:
	0001-Fix-warnings-activating-mDNS-bookmarks.patch 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.26.2-2
- Fix warnings using mDNS bookmarks


0001-Fix-warnings-activating-mDNS-bookmarks.patch:
 vinagre-fav.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Fix-warnings-activating-mDNS-bookmarks.patch ---
>From c80f47981e6f9a3dec1c192d4906a1159ad947ee Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 18 Sep 2009 18:15:46 +0100
Subject: [PATCH] Fix warnings activating mDNS bookmarks

- Don't tell the marshallers that we have an object and pass a pointer
- Don't emit a signal when we don't have an object to pass
---
 src/vinagre-fav.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vinagre-fav.c b/src/vinagre-fav.c
index 490dd11..d94f81d 100644
--- a/src/vinagre-fav.c
+++ b/src/vinagre-fav.c
@@ -139,7 +139,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
 			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
-			      G_TYPE_POINTER);
+			      G_TYPE_OBJECT);
 
   signals[FAV_SELECTED] =
 		g_signal_new ("fav-selected",
@@ -150,7 +150,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
 			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
-			      G_TYPE_POINTER);
+			      G_TYPE_OBJECT);
 
   g_type_class_add_private (object_class, sizeof (VinagreFavPrivate));
 }
@@ -206,8 +206,10 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
 			  -1);
     }
 
-  if (avahi)
+  if (avahi) {
     entry = NULL;
+    return;
+  }
 
   /* Emits the signal saying that user has selected a bookmark */
   g_signal_emit (G_OBJECT (fav), 
-- 
1.6.2.5



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/F-11/vinagre.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- vinagre.spec	2 Jun 2009 03:33:08 -0000	1.45
+++ vinagre.spec	18 Sep 2009 17:17:31 -0000	1.46
@@ -1,12 +1,14 @@
 Name:		vinagre
 Version:	2.26.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://projects.gnome.org/vinagre/
 Source0:	http://download.gnome.org/sources/vinagre/2.26/%{name}-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=581817
+Patch0:		0001-Fix-warnings-activating-mDNS-bookmarks.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +35,7 @@ GNOME keyring, and browse the network to
 
 %prep
 %setup -q
+%patch0 -p1 -b .mdns
 
 %build
 %configure --enable-avahi=yes
@@ -122,6 +125,9 @@ fi
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.26.2-2
+- Fix warnings using mDNS bookmarks
+
 * Mon Jun  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.2-1
 - Update to 2.26.2
 - See http://download.gnome.org/sources/vinagre/2.26/vinagre-2.26.2.news



From orion at fedoraproject.org  Fri Sep 18 17:19:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 17:19:06 +0000 (UTC)
Subject: rpms/hdf/EL-5 hdf-4.2r3-maxavailfiles.patch, NONE,
	1.1 hdf-4.2r4-buffer.patch, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.4, 1.5 hdf.spec, 1.16, 1.17 sources, 1.4,
	1.5 hdf-4.2r1p4-maxavailfiles.patch, 1.1,
	NONE hdf-4.2r2-libm.patch, 1.1, NONE
Message-ID: <20090918171906.DA41F11C01EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5564/EL-5

Modified Files:
	.cvsignore hdf.spec sources 
Added Files:
	hdf-4.2r3-maxavailfiles.patch hdf-4.2r4-buffer.patch 
	import.log 
Removed Files:
	hdf-4.2r1p4-maxavailfiles.patch hdf-4.2r2-libm.patch 
Log Message:
Update to 4.2r4 synced from devel

hdf-4.2r3-maxavailfiles.patch:
 file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hdf-4.2r3-maxavailfiles.patch ---
--- HDF4.2r3/mfhdf/libsrc/file.c.maxavailfiles	2008-01-27 09:47:11.000000000 -0700
+++ HDF4.2r3/mfhdf/libsrc/file.c	2008-10-01 11:48:53.000000000 -0600
@@ -45,7 +45,7 @@
 
 /* Maximum number of files can be opened at one time; subtract 3 from
    the system allowed to account for stdin, stdout, and stderr */
-#define MAX_AVAIL_OPENFILES          (MAX_SYS_OPENFILES - 3)
+#define MAX_AVAIL_OPENFILES          (MAX_SYS_OPENFILES - 10)
 
 static int _curr_opened = 0 ; /* the number of files currently opened */
 /* NOTE: _ncdf might have been the number of files currently opened, yet it

hdf-4.2r4-buffer.patch:
 tncunlim.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hdf-4.2r4-buffer.patch ---
--- HDF4.2r4/mfhdf/libsrc/tncunlim.c.buffer	2009-01-10 19:34:26.000000000 -0700
+++ HDF4.2r4/mfhdf/libsrc/tncunlim.c	2009-02-25 11:08:46.000000000 -0700
@@ -646,7 +646,7 @@
     long  dimsize = 0,		/* unlimited dimension size */
 	  dimsize1 = 0, dimsize2 = 0; /* other dimension sizes */
     short outdata[DIM0][DIM1][DIM2];	/* data read back */
-    char  varname[10];		/* variable name */
+    char  varname[12];		/* variable name */
     nc_type rh_type;		/* variable type */
     int   rh_ndims;		/* number of dims */
     int   rh_dims[H4_MAX_VAR_DIMS];	/* variable shape */


--- NEW FILE import.log ---
hdf-4_2r4-5_fc12:EL-5:hdf-4.2r4-5.fc12.src.rpm:1253294322


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 May 2008 17:50:13 -0000	1.4
+++ .cvsignore	18 Sep 2009 17:19:06 -0000	1.5
@@ -1 +1 @@
-HDF4.2r3.tar.gz
+HDF4.2r4.tar.gz


Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/EL-5/hdf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hdf.spec	28 May 2008 18:46:03 -0000	1.16
+++ hdf.spec	18 Sep 2009 17:19:06 -0000	1.17
@@ -1,16 +1,17 @@
 Name: hdf
-Version: 4.2r3
-Release: 4%{?dist}
+Version: 4.2r4
+Release: 5%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
-URL: http://hdf.ncsa.uiuc.edu/hdf4.html
+URL: http://hdfgroup.org/products/hdf4/index.html
 Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF%{version}.tar.gz
-Patch0: hdf-4.2r1p4-maxavailfiles.patch
+Patch0: hdf-4.2r3-maxavailfiles.patch
 Patch1: hdf-4.2r3-ppc.patch
 Patch2: hdf-4.2r2-sparc.patch
 Patch3: hdf-4.2r2-s390.patch
-Patch4: hdf-4.2r2-libm.patch
+# Reported upstream to help at hdfgroup.org
+Patch4: hdf-4.2r4-buffer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex byacc libjpeg-devel zlib-devel
 %if "%{?dist}" != ".el4"
@@ -19,6 +20,7 @@ BuildRequires: gcc-gfortran
 BuildRequires: gcc-g77
 %endif
 
+
 %description
 HDF is a general purpose library and file format for storing scientific data.
 HDF can store two primary objects: datasets and groups. A dataset is 
@@ -32,6 +34,7 @@ grids. You can also mix and match them i
 %package devel
 Summary: HDF development files
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: libjpeg-devel zlib-devel
 
@@ -41,11 +44,11 @@ HDF development headers and libraries.
 
 %prep
 %setup -q -n HDF%{version}
-%patch -p1 -b .maxavailfiles
+%patch0 -p1 -b .maxavailfiles
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .sparc
 %patch3 -p1 -b .s390
-%patch4 -p1 -b .libm
+%patch4 -p1 -b .buffer
 
 chmod a-x *hdf/*/*.c hdf/*/*.h
 # restore include file timestamps modified by patching
@@ -57,13 +60,8 @@ touch -c -r ./mfhdf/libsrc/config/netcdf
 # avoid upstream compiler flags settings
 rm config/*linux-gnu
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-export FFLAGS="$RPM_OPT_FLAGS -ffixed-line-length-none"
+export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
 %configure --disable-production --disable-netcdf \
-%if "%{?dist}" != ".el4"
-           F77=gfortran \
-%else
-           F77=g77 \
-%endif
  --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}
 
 make
@@ -117,11 +115,31 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed May 28 2008 Balint Cristian <rezso at rdsor.ro> 4.2r3-4
-- further fix a typo for RHEL5
+* Fri Sep 18 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-5
+- Add EL4 build conditionals
+
+* Thu Aug 13 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-4
+- Add -fPIC to FFLAGS
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2r4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-2
+- Add Provides hdf-static to hdf-devel (bug #494529)
+
+* Wed Feb 25 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-1
+- Update to 4.2r4
+- Add patch to increase buffer size in test
+- Drop upstreamed libm patch
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2r3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Oct  1 2008 Orion Poplawski <orion at cora.nwra.com> 4.2r3-4
+- Rebase maxavailfiles patch
 
-* Wed May 28 2008 Balint Cristian <rezso at rdsor.ro> 4.2r3-3
-- require gcc-g77 for fortran on RHEL4
+* Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 4.2r3-3
+- Fix Patch0:/%%patch mismatch.
 
 * Sun Mar  2 2008 Patrice Dumas <pertusus at free.fr> 4.2r3-2
 - don't ship an empty netcdf.h file. The related definitions are now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 May 2008 17:50:13 -0000	1.4
+++ sources	18 Sep 2009 17:19:06 -0000	1.5
@@ -1 +1 @@
-767382a31470e795f4c4217e33a689e8  HDF4.2r3.tar.gz
+cbcfcdb65f27b743c6001c17619704a8  HDF4.2r4.tar.gz


--- hdf-4.2r1p4-maxavailfiles.patch DELETED ---


--- hdf-4.2r2-libm.patch DELETED ---



From hadess at fedoraproject.org  Fri Sep 18 17:19:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 17:19:28 +0000 (UTC)
Subject: rpms/vinagre/devel
	0001-Fix-warnings-activating-mDNS-bookmarks.patch, 
	NONE, 1.1 vinagre.spec, 1.56, 1.57
Message-ID: <20090918171928.C91AD11C01EA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5789

Modified Files:
	vinagre.spec 
Added Files:
	0001-Fix-warnings-activating-mDNS-bookmarks.patch 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
- Fix mDNS bookmarks activation


0001-Fix-warnings-activating-mDNS-bookmarks.patch:
 vinagre-fav.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Fix-warnings-activating-mDNS-bookmarks.patch ---
>From c80f47981e6f9a3dec1c192d4906a1159ad947ee Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 18 Sep 2009 18:15:46 +0100
Subject: [PATCH] Fix warnings activating mDNS bookmarks

- Don't tell the marshallers that we have an object and pass a pointer
- Don't emit a signal when we don't have an object to pass
---
 vinagre/vinagre-fav.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 490dd11..d94f81d 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -139,7 +139,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
 			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
-			      G_TYPE_POINTER);
+			      G_TYPE_OBJECT);
 
   signals[FAV_SELECTED] =
 		g_signal_new ("fav-selected",
@@ -150,7 +150,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
 			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
-			      G_TYPE_POINTER);
+			      G_TYPE_OBJECT);
 
   g_type_class_add_private (object_class, sizeof (VinagreFavPrivate));
 }
@@ -206,8 +206,10 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
 			  -1);
     }
 
-  if (avahi)
+  if (avahi) {
     entry = NULL;
+    return;
+  }
 
   /* Emits the signal saying that user has selected a bookmark */
   g_signal_emit (G_OBJECT (fav), 
-- 
1.6.2.5



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- vinagre.spec	7 Sep 2009 23:31:36 -0000	1.56
+++ vinagre.spec	18 Sep 2009 17:19:28 -0000	1.57
@@ -1,12 +1,14 @@
 Name:		vinagre
 Version:	2.27.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://projects.gnome.org/vinagre/
 Source0:	http://download.gnome.org/sources/vinagre/2.27/%{name}-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=581817
+Patch0:		0001-Fix-warnings-activating-mDNS-bookmarks.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,6 +51,7 @@ to vinagre.
 
 %prep
 %setup -q
+%patch0 -p1 -b .mdns
 
 %build
 %configure --enable-avahi=yes --disable-static
@@ -155,6 +158,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
+- Fix mDNS bookmarks activation
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 



From tomeu at fedoraproject.org  Fri Sep 18 17:22:37 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:22:37 +0000 (UTC)
Subject: rpms/sugar-datastore/devel sugar-datastore.spec,1.21,1.22
Message-ID: <20090918172237.5729511C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7034

Modified Files:
	sugar-datastore.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-3
- Rename files in docs accordingly



Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sugar-datastore.spec	18 Sep 2009 17:04:53 -0000	1.21
+++ sugar-datastore.spec	18 Sep 2009 17:22:37 -0000	1.22
@@ -5,7 +5,7 @@
 
 Name: sugar-datastore
 Version: 0.85.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
 Summary: Sugar Datastore
@@ -49,12 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.GPL README.txt
+%doc AUTHORS COPYING NEWS README
 %{python_sitelib}/*
 %{_bindir}/*
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-3
+- Rename files in docs accordingly
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-2
 - Upload sources
 



From orion at fedoraproject.org  Fri Sep 18 17:23:18 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 17:23:18 +0000 (UTC)
Subject: rpms/hdf/EL-4 hdf-4.2r3-maxavailfiles.patch, NONE,
	1.1 hdf-4.2r4-buffer.patch, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.4, 1.5 hdf.spec, 1.16, 1.17 sources, 1.4,
	1.5 hdf-4.2r1p4-maxavailfiles.patch, 1.1,
	NONE hdf-4.2r2-libm.patch, 1.1, NONE
Message-ID: <20090918172318.A01FF11C01EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7331/EL-4

Modified Files:
	.cvsignore hdf.spec sources 
Added Files:
	hdf-4.2r3-maxavailfiles.patch hdf-4.2r4-buffer.patch 
	import.log 
Removed Files:
	hdf-4.2r1p4-maxavailfiles.patch hdf-4.2r2-libm.patch 
Log Message:
Update to 4.2r4 synced from devel

hdf-4.2r3-maxavailfiles.patch:
 file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hdf-4.2r3-maxavailfiles.patch ---
--- HDF4.2r3/mfhdf/libsrc/file.c.maxavailfiles	2008-01-27 09:47:11.000000000 -0700
+++ HDF4.2r3/mfhdf/libsrc/file.c	2008-10-01 11:48:53.000000000 -0600
@@ -45,7 +45,7 @@
 
 /* Maximum number of files can be opened at one time; subtract 3 from
    the system allowed to account for stdin, stdout, and stderr */
-#define MAX_AVAIL_OPENFILES          (MAX_SYS_OPENFILES - 3)
+#define MAX_AVAIL_OPENFILES          (MAX_SYS_OPENFILES - 10)
 
 static int _curr_opened = 0 ; /* the number of files currently opened */
 /* NOTE: _ncdf might have been the number of files currently opened, yet it

hdf-4.2r4-buffer.patch:
 tncunlim.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hdf-4.2r4-buffer.patch ---
--- HDF4.2r4/mfhdf/libsrc/tncunlim.c.buffer	2009-01-10 19:34:26.000000000 -0700
+++ HDF4.2r4/mfhdf/libsrc/tncunlim.c	2009-02-25 11:08:46.000000000 -0700
@@ -646,7 +646,7 @@
     long  dimsize = 0,		/* unlimited dimension size */
 	  dimsize1 = 0, dimsize2 = 0; /* other dimension sizes */
     short outdata[DIM0][DIM1][DIM2];	/* data read back */
-    char  varname[10];		/* variable name */
+    char  varname[12];		/* variable name */
     nc_type rh_type;		/* variable type */
     int   rh_ndims;		/* number of dims */
     int   rh_dims[H4_MAX_VAR_DIMS];	/* variable shape */


--- NEW FILE import.log ---
hdf-4_2r4-5_fc12:EL-4:hdf-4.2r4-5.fc12.src.rpm:1253294536


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 May 2008 17:47:31 -0000	1.4
+++ .cvsignore	18 Sep 2009 17:23:18 -0000	1.5
@@ -1 +1 @@
-HDF4.2r3.tar.gz
+HDF4.2r4.tar.gz


Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/EL-4/hdf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hdf.spec	28 May 2008 18:48:10 -0000	1.16
+++ hdf.spec	18 Sep 2009 17:23:18 -0000	1.17
@@ -1,16 +1,17 @@
 Name: hdf
-Version: 4.2r3
-Release: 4%{?dist}
+Version: 4.2r4
+Release: 5%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
-URL: http://hdf.ncsa.uiuc.edu/hdf4.html
+URL: http://hdfgroup.org/products/hdf4/index.html
 Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF%{version}.tar.gz
-Patch0: hdf-4.2r1p4-maxavailfiles.patch
+Patch0: hdf-4.2r3-maxavailfiles.patch
 Patch1: hdf-4.2r3-ppc.patch
 Patch2: hdf-4.2r2-sparc.patch
 Patch3: hdf-4.2r2-s390.patch
-Patch4: hdf-4.2r2-libm.patch
+# Reported upstream to help at hdfgroup.org
+Patch4: hdf-4.2r4-buffer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex byacc libjpeg-devel zlib-devel
 %if "%{?dist}" != ".el4"
@@ -19,6 +20,7 @@ BuildRequires: gcc-gfortran
 BuildRequires: gcc-g77
 %endif
 
+
 %description
 HDF is a general purpose library and file format for storing scientific data.
 HDF can store two primary objects: datasets and groups. A dataset is 
@@ -32,6 +34,7 @@ grids. You can also mix and match them i
 %package devel
 Summary: HDF development files
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: libjpeg-devel zlib-devel
 
@@ -41,11 +44,11 @@ HDF development headers and libraries.
 
 %prep
 %setup -q -n HDF%{version}
-%patch -p1 -b .maxavailfiles
+%patch0 -p1 -b .maxavailfiles
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .sparc
 %patch3 -p1 -b .s390
-%patch4 -p1 -b .libm
+%patch4 -p1 -b .buffer
 
 chmod a-x *hdf/*/*.c hdf/*/*.h
 # restore include file timestamps modified by patching
@@ -57,13 +60,8 @@ touch -c -r ./mfhdf/libsrc/config/netcdf
 # avoid upstream compiler flags settings
 rm config/*linux-gnu
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-export FFLAGS="$RPM_OPT_FLAGS -ffixed-line-length-none"
+export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
 %configure --disable-production --disable-netcdf \
-%if "%{?dist}" != ".el4"
-           F77=gfortran \
-%else
-           F77=g77 \
-%endif
  --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}
 
 make
@@ -117,11 +115,31 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed May 28 2008 Balint Cristian <rezso at rdsor.ro> 4.2r3-4
-- further fix a typo for RHEL5
+* Fri Sep 18 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-5
+- Add EL4 build conditionals
+
+* Thu Aug 13 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-4
+- Add -fPIC to FFLAGS
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2r4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-2
+- Add Provides hdf-static to hdf-devel (bug #494529)
+
+* Wed Feb 25 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-1
+- Update to 4.2r4
+- Add patch to increase buffer size in test
+- Drop upstreamed libm patch
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2r3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Oct  1 2008 Orion Poplawski <orion at cora.nwra.com> 4.2r3-4
+- Rebase maxavailfiles patch
 
-* Wed May 28 2008 Balint Cristian <rezso at rdsor.ro> 4.2r3-3
-- require gcc-g77 for fortran on RHEL4
+* Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 4.2r3-3
+- Fix Patch0:/%%patch mismatch.
 
 * Sun Mar  2 2008 Patrice Dumas <pertusus at free.fr> 4.2r3-2
 - don't ship an empty netcdf.h file. The related definitions are now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 May 2008 17:47:31 -0000	1.4
+++ sources	18 Sep 2009 17:23:18 -0000	1.5
@@ -1 +1 @@
-767382a31470e795f4c4217e33a689e8  HDF4.2r3.tar.gz
+cbcfcdb65f27b743c6001c17619704a8  HDF4.2r4.tar.gz


--- hdf-4.2r1p4-maxavailfiles.patch DELETED ---


--- hdf-4.2r2-libm.patch DELETED ---



From tomeu at fedoraproject.org  Fri Sep 18 17:27:45 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Fri, 18 Sep 2009 17:27:45 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel .cvsignore, 1.15, 1.16 sources,
	1.15, 1.16 sugar-presence-service.spec, 1.22, 1.23
Message-ID: <20090918172745.C948A11C01EA@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-presence-service/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8768

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	11 Sep 2009 08:26:02 -0000	1.15
+++ .cvsignore	18 Sep 2009 17:27:45 -0000	1.16
@@ -1 +1 @@
-sugar-presence-service-0.85.2.tar.bz2
+sugar-presence-service-0.85.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Sep 2009 08:26:02 -0000	1.15
+++ sources	18 Sep 2009 17:27:45 -0000	1.16
@@ -1 +1 @@
-c842bc8777c01a445afd34ded8dbe949  sugar-presence-service-0.85.2.tar.bz2
+c89d4486bd4eafb57a07c516c89a81bd  sugar-presence-service-0.85.3.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sugar-presence-service.spec	11 Sep 2009 08:26:02 -0000	1.22
+++ sugar-presence-service.spec	18 Sep 2009 17:27:45 -0000	1.23
@@ -1,5 +1,5 @@
 Name: sugar-presence-service
-Version: 0.85.2
+Version: 0.85.3
 Release: 1%{?dist}
 Summary: The Sugar presence service
 
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
+- New upstream release
+
 * Fri Sep 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
 - New upstream release
 



From cdamian at fedoraproject.org  Fri Sep 18 17:32:30 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 18 Sep 2009 17:32:30 +0000 (UTC)
Subject: rpms/php-pear-PhpDocumentor/devel .cvsignore, 1.5,
	1.6 php-pear-PhpDocumentor.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090918173230.7911211C00EC@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-pear-PhpDocumentor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10991

Modified Files:
	.cvsignore php-pear-PhpDocumentor.spec sources 
Log Message:
Upstream 1.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Jun 2008 16:54:57 -0000	1.5
+++ .cvsignore	18 Sep 2009 17:32:30 -0000	1.6
@@ -1 +1 @@
-PhpDocumentor-1.4.2.tgz
+PhpDocumentor-1.4.3.tgz


Index: php-pear-PhpDocumentor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/devel/php-pear-PhpDocumentor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-PhpDocumentor.spec	26 Jul 2009 18:27:48 -0000	1.8
+++ php-pear-PhpDocumentor.spec	18 Sep 2009 17:32:30 -0000	1.9
@@ -3,8 +3,8 @@
 
 Summary:          The complete documentation solution for PHP
 Name:             php-pear-PhpDocumentor
-Version:          1.4.2
-Release:          3%{?dist}
+Version:          1.4.3
+Release:          1%{?dist}
 License:          LGPLv2+
 Group:            Development/Libraries
 URL:              http://www.phpdoc.org/
@@ -121,6 +121,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Christof Damian <christof at damian.net> - 1.4.3-1
+- Upstream 1.4.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Jun 2008 16:54:57 -0000	1.5
+++ sources	18 Sep 2009 17:32:30 -0000	1.6
@@ -1 +1 @@
-778bea6edb876c70d906bec8c4490a0e  PhpDocumentor-1.4.2.tgz
+180ea5bf2ab4f729d0cd09d99f7b2520  PhpDocumentor-1.4.3.tgz



From hadess at fedoraproject.org  Fri Sep 18 17:33:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 17:33:51 +0000 (UTC)
Subject: rpms/vinagre/devel
	0001-Fix-warnings-activating-mDNS-bookmarks.patch, 
	1.1, 1.2 vinagre.spec, 1.57, 1.58
Message-ID: <20090918173351.3211B11C00EC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11653

Modified Files:
	0001-Fix-warnings-activating-mDNS-bookmarks.patch vinagre.spec 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-3
- Update mDNS patch


0001-Fix-warnings-activating-mDNS-bookmarks.patch:
 vinagre-fav.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: 0001-Fix-warnings-activating-mDNS-bookmarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/0001-Fix-warnings-activating-mDNS-bookmarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-warnings-activating-mDNS-bookmarks.patch	18 Sep 2009 17:19:28 -0000	1.1
+++ 0001-Fix-warnings-activating-mDNS-bookmarks.patch	18 Sep 2009 17:33:50 -0000	1.2
@@ -31,18 +31,6 @@ index 490dd11..d94f81d 100644
  
    g_type_class_add_private (object_class, sizeof (VinagreFavPrivate));
  }
-@@ -206,8 +206,10 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
- 			  -1);
-     }
- 
--  if (avahi)
-+  if (avahi) {
-     entry = NULL;
-+    return;
-+  }
- 
-   /* Emits the signal saying that user has selected a bookmark */
-   g_signal_emit (G_OBJECT (fav), 
 -- 
 1.6.2.5
 


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- vinagre.spec	18 Sep 2009 17:19:28 -0000	1.57
+++ vinagre.spec	18 Sep 2009 17:33:51 -0000	1.58
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	2.27.92
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -158,6 +158,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-3
+- Update mDNS patch
+
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
 - Fix mDNS bookmarks activation
 



From hadess at fedoraproject.org  Fri Sep 18 17:34:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 18 Sep 2009 17:34:46 +0000 (UTC)
Subject: rpms/vinagre/F-11 0001-Fix-warnings-activating-mDNS-bookmarks.patch,
	1.1, 1.2 vinagre.spec, 1.46, 1.47
Message-ID: <20090918173446.264EA11C00EC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12097

Modified Files:
	0001-Fix-warnings-activating-mDNS-bookmarks.patch vinagre.spec 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.26.2-3
- Update mDNS patch


0001-Fix-warnings-activating-mDNS-bookmarks.patch:
 vinagre-fav.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: 0001-Fix-warnings-activating-mDNS-bookmarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/F-11/0001-Fix-warnings-activating-mDNS-bookmarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-warnings-activating-mDNS-bookmarks.patch	18 Sep 2009 17:17:31 -0000	1.1
+++ 0001-Fix-warnings-activating-mDNS-bookmarks.patch	18 Sep 2009 17:34:45 -0000	1.2
@@ -1,16 +1,15 @@
-From c80f47981e6f9a3dec1c192d4906a1159ad947ee Mon Sep 17 00:00:00 2001
+From 35f9640d9aba5c8b81c0a6deb0660a4d33738bab Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 18 Sep 2009 18:15:46 +0100
 Subject: [PATCH] Fix warnings activating mDNS bookmarks
 
 - Don't tell the marshallers that we have an object and pass a pointer
-- Don't emit a signal when we don't have an object to pass
 ---
- src/vinagre-fav.c |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+ src/vinagre-fav.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/vinagre-fav.c b/src/vinagre-fav.c
-index 490dd11..d94f81d 100644
+index 490dd11..0af0c45 100644
 --- a/src/vinagre-fav.c
 +++ b/src/vinagre-fav.c
 @@ -139,7 +139,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
@@ -31,18 +30,6 @@ index 490dd11..d94f81d 100644
  
    g_type_class_add_private (object_class, sizeof (VinagreFavPrivate));
  }
-@@ -206,8 +206,10 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
- 			  -1);
-     }
- 
--  if (avahi)
-+  if (avahi) {
-     entry = NULL;
-+    return;
-+  }
- 
-   /* Emits the signal saying that user has selected a bookmark */
-   g_signal_emit (G_OBJECT (fav), 
 -- 
 1.6.2.5
 


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/F-11/vinagre.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- vinagre.spec	18 Sep 2009 17:17:31 -0000	1.46
+++ vinagre.spec	18 Sep 2009 17:34:46 -0000	1.47
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	2.26.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -125,6 +125,9 @@ fi
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.26.2-3
+- Update mDNS patch
+
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.26.2-2
 - Fix warnings using mDNS bookmarks
 



From mbarnes at fedoraproject.org  Fri Sep 18 18:07:41 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 18 Sep 2009 18:07:41 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.22,
	1.116.2.23 evolution.spec, 
	1.394.2.50, 1.394.2.51 sources, 1.116.2.26, 1.116.2.27
Message-ID: <20090918180741.E931A11C00EC@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28309

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Fri Sep 18 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.8.fc12
- Snapshot of "kill-bonobo" progress at commit 6ae7523.
- Drop the libbonobo, libbonoboui and libgnomeui dependencies.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.22
retrieving revision 1.116.2.23
diff -u -p -r1.116.2.22 -r1.116.2.23
--- .cvsignore	13 Sep 2009 15:28:51 -0000	1.116.2.22
+++ .cvsignore	18 Sep 2009 18:07:41 -0000	1.116.2.23
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2
+evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.50
retrieving revision 1.394.2.51
diff -u -p -r1.394.2.50 -r1.394.2.51
--- evolution.spec	17 Sep 2009 11:36:00 -0000	1.394.2.50
+++ evolution.spec	18 Sep 2009 18:07:41 -0000	1.394.2.51
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash f8a2538
+%define hash 6ae7523
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -13,8 +13,6 @@
 %define gtkhtml_version 3.25.3
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
-%define libbonobo_version 2.20.3
-%define libbonoboui_version 2.4.2
 %define libgweather_version 2.25.4
 %define orbit2_version 2.9.8
 %define pilot_link_version 2:0.12.1
@@ -47,7 +45,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.7%{?dist}
+Release: 1.kb.8%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -112,11 +110,8 @@ BuildRequires: gtk2-devel >= %{gtk2_vers
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: gvfs
 BuildRequires: intltool >= %{intltool_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: libcanberra-devel
 BuildRequires: libgnomecanvas-devel >= 2.0
-BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
@@ -172,7 +167,6 @@ Requires: %{name} = %{version}-%{release
 Requires: evolution-data-server-devel >= %{eds_version}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
-Requires: libbonobo-devel >= %{libbonobo_version}
 Requires: libgweather-devel >= %{libgweather_version}
 Requires: libsoup-devel >= %{soup_version}
 Requires: libxml2-devel
@@ -657,6 +651,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Fri Sep 18 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.8.fc12
+- Snapshot of "kill-bonobo" progress at commit 6ae7523.
+- Drop the libbonobo, libbonoboui and libgnomeui dependencies.
+
 * Thu Sep 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.7.fc12
 - Fix evolution-data-server requirement for real this time.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.26
retrieving revision 1.116.2.27
diff -u -p -r1.116.2.26 -r1.116.2.27
--- sources	13 Sep 2009 15:28:51 -0000	1.116.2.26
+++ sources	18 Sep 2009 18:07:41 -0000	1.116.2.27
@@ -1 +1 @@
-2c95705bbd990367b34606dc1450fdf9  evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2
+f36ef03f378baba9bc3e5b9ec56b288d  evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2



From kdudka at fedoraproject.org  Fri Sep 18 18:14:09 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 18 Sep 2009 18:14:09 +0000 (UTC)
Subject: rpms/nano/devel .cvsignore, 1.10, 1.11 nano.spec, 1.27, 1.28 sources,
	1.10, 1.11
Message-ID: <20090918181409.B2BEA11C00EC@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31114

Modified Files:
	.cvsignore nano.spec sources 
Log Message:
- new upstream release
- dropped patch no longer needed (possible change in behavior though negligible)
- fixed broken HTML doc in FR locales (#523951)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Jun 2007 12:27:39 -0000	1.10
+++ .cvsignore	18 Sep 2009 18:14:09 -0000	1.11
@@ -1 +1 @@
-nano-2.0.6.tar.gz
+nano-2.0.9.tar.gz


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nano.spec	17 Sep 2009 11:04:42 -0000	1.27
+++ nano.spec	18 Sep 2009 18:14:09 -0000	1.28
@@ -1,12 +1,11 @@
 Summary:	A small text editor
 Name:		nano
-Version:	2.0.6
-Release:	8%{?dist}
+Version:	2.0.9
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
 Source:		http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
-Patch0:		nano-2.0.6-open-macro.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, autoconf, gettext-devel, groff
 Requires(post):	 /sbin/install-info
@@ -17,9 +16,9 @@ GNU nano is a small and friendly text ed
 
 %prep
 %setup -q
-%patch0 -p1
 for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.tmp $f && mv $f.tmp $f
+  touch $f.html
 done
 
 %build
@@ -63,6 +62,11 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Fri Sep 18 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-1
+- new upstream release
+- dropped patch no longer needed (possible change in behavior though negligible)
+- fixed broken HTML doc in FR locales (#523951)
+
 * Thu Sep 17 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.6-8
 - do process install-info only without --excludedocs(#515943)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Jun 2007 12:27:39 -0000	1.10
+++ sources	18 Sep 2009 18:14:09 -0000	1.11
@@ -1 +1 @@
-619107f0fc3c4383d668cef15aa3ca32  nano-2.0.6.tar.gz
+2be94dc43fb60fff4626a2401a977220  nano-2.0.9.tar.gz



From limb at fedoraproject.org  Fri Sep 18 18:14:23 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 18 Sep 2009 18:14:23 +0000 (UTC)
Subject: rpms/armacycles-ad/devel .cvsignore, 1.3, 1.4 armacycles-ad.spec,
	1.13, 1.14 sources, 1.3, 1.4
Message-ID: <20090918181423.7ACED11C00EC@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31193

Modified Files:
	.cvsignore armacycles-ad.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Apr 2009 13:15:28 -0000	1.3
+++ .cvsignore	18 Sep 2009 18:14:23 -0000	1.4
@@ -1 +1 @@
-armagetronad-0.2.8.3_rc2.src.tar.bz2
+armagetronad-0.2.8.3_rc3.src.tar.bz2


Index: armacycles-ad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/armacycles-ad.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- armacycles-ad.spec	24 Jul 2009 17:06:15 -0000	1.13
+++ armacycles-ad.spec	18 Sep 2009 18:14:23 -0000	1.14
@@ -1,12 +1,12 @@
 Name: armacycles-ad
 Version: 0.2.8.3
-Release: 1.rc2%{?dist}.1
+Release: 1.rc3%{?dist}
 Summary: A lightcycle game in 3D
 
 Group: Amusements/Games
 License: GPLv2+
 URL: http://armagetronad.sf.net
-Source0: http://downloads.sourceforge.net/armagetronad/armagetronad-0.2.8.3_rc2.src.tar.bz2
+Source0: http://downloads.sourceforge.net/armagetronad/armagetronad-0.2.8.3_rc3.src.tar.bz2
 Source1: armacycles-logo.jpg
 Source2: armacycles-ad.desktop
 #Patch0: armacycles-ad-0.2.8.2.1-md5-stringh.patch
@@ -54,7 +54,7 @@ the internet and/or the LAN.
 
 
 %prep
-%setup -qn armagetronad-0.2.8.3_rc2
+%setup -qn armagetronad-0.2.8.3_rc3
 #insert modified logo
 cp %{SOURCE1} textures/title.jpg
 # remove krawall logo
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Jon Ciesla <limb at jcomserv.net> - 0.2.8.3-1.rc3
+- New upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.8.3-1.rc2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Apr 2009 13:15:28 -0000	1.3
+++ sources	18 Sep 2009 18:14:23 -0000	1.4
@@ -1 +1 @@
-115200c3f8bf2507393a85225b5fb2ca  armagetronad-0.2.8.3_rc2.src.tar.bz2
+848cca055b7b388abf9dda70477d271a  armagetronad-0.2.8.3_rc3.src.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 18 18:25:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:25:48 +0000
Subject: [pkgdb] rakudo: steve has requested watchcommits
Message-ID: <20090918182550.D5BF510F885@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on rakudo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:07 +0000
Subject: [pkgdb] rakudo: steve has requested commit
Message-ID: <20090918182559.BC27F10F886@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on rakudo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:02 +0000
Subject: [pkgdb] rakudo: steve has requested watchbugzilla
Message-ID: <20090918182602.B498A10F88C@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on rakudo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:08 +0000
Subject: [pkgdb] rakudo: steve has requested watchbugzilla
Message-ID: <20090918182610.157C410F894@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on rakudo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:20 +0000
Subject: [pkgdb] rakudo: steve has requested watchcommits
Message-ID: <20090918182612.6ECBD10F89A@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on rakudo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:22 +0000
Subject: [pkgdb] rakudo: steve has requested commit
Message-ID: <20090918182614.97D9410F886@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on rakudo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:50 +0000
Subject: [pkgdb] parrot: steve has requested watchbugzilla
Message-ID: <20090918182642.CA92C10F886@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on parrot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:44 +0000
Subject: [pkgdb] parrot: steve has requested watchcommits
Message-ID: <20090918182644.5971110F895@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on parrot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:53 +0000
Subject: [pkgdb] parrot: steve has requested commit
Message-ID: <20090918182645.E1D3610F898@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on parrot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:56 +0000
Subject: [pkgdb] parrot: steve has requested watchbugzilla
Message-ID: <20090918182649.5AFC210F89D@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:51 +0000
Subject: [pkgdb] parrot: steve has requested watchcommits
Message-ID: <20090918182650.C2A7710F89F@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:52 +0000
Subject: [pkgdb] parrot: steve has requested commit
Message-ID: <20090918182652.14BE710F8A1@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:55 +0000
Subject: [pkgdb] parrot: steve has requested watchbugzilla
Message-ID: <20090918182657.6EC3E10F888@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on parrot (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:26:59 +0000
Subject: [pkgdb] parrot: steve has requested watchcommits
Message-ID: <20090918182659.2209810F8A6@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on parrot (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Fri Sep 18 18:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 18:27:08 +0000
Subject: [pkgdb] parrot: steve has requested commit
Message-ID: <20090918182700.C4A4210F8AA@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on parrot (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From timfenn at fedoraproject.org  Fri Sep 18 18:40:14 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 18 Sep 2009 18:40:14 +0000 (UTC)
Subject: rpms/clipper/devel clipper.spec,1.11,1.12
Message-ID: <20090918184014.21A1411C0338@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/clipper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9788

Modified Files:
	clipper.spec 
Log Message:
* Fri Sep 18 2009 Tim Fenn <fenn at stanford.edu> - 2.1-11.20090714cvs
- rebuild due to gpp4 update/soname bump




Index: clipper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipper/devel/clipper.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- clipper.spec	24 Jul 2009 19:05:04 -0000	1.11
+++ clipper.spec	18 Sep 2009 18:40:13 -0000	1.12
@@ -2,7 +2,7 @@ Name: clipper
 Summary: Clipper C++ crystallographic library
 URL: http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html
 Version: 2.1
-Release: 10.20090714cvs%{?dist}
+Release: 11.20090714cvs%{?dist}
 License: LGPLv2+
 Source0: http://www.ysbl.york.ac.uk/~cowtan/%{name}/%{name}-%{version}-090714-ac.tar.gz
 Source1: clipper.pc.in
@@ -109,6 +109,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/clipper.pc
 
 %changelog
+* Fri Sep 18 2009 Tim Fenn <fenn at stanford.edu> - 2.1-11.20090714cvs
+- rebuild due to gpp4 update/soname bump
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-10.20090714cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Fri Sep 18 18:52:12 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 18 Sep 2009 18:52:12 +0000 (UTC)
Subject: rpms/perl/F-11 perl-5.10.0-much-better-swap-logic.patch, NONE,
	1.1 perl-5.10.0-spamassassin.patch, NONE,
	1.1 perl-bz509676.patch, NONE, 1.1 perl-skip-prereq.patch, NONE,
	1.1 perl-update-Module-Pluggable.patch, NONE,
	1.1 perl-update-Scalar-List-Utils.patch, NONE,
	1.1 perl-update-Test-Simple.patch, 1.1, 1.2 perl.spec, 1.219, 1.220
Message-ID: <20090918185212.B55FD11C00EC@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14408

Modified Files:
	perl-update-Test-Simple.patch perl.spec 
Added Files:
	perl-5.10.0-much-better-swap-logic.patch 
	perl-5.10.0-spamassassin.patch perl-bz509676.patch 
	perl-skip-prereq.patch perl-update-Module-Pluggable.patch 
	perl-update-Scalar-List-Utils.patch 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
- update Module-Pluggable to 3.9


perl-5.10.0-much-better-swap-logic.patch:
 embed.fnc                        |    1 
 embed.h                          |    2 -
 ext/Devel/PPPort/parts/embed.fnc |    1 
 proto.h                          |    3 --
 regcomp.c                        |    2 -
 regexec.c                        |   44 +++++++++++++++------------------------
 regexp.h                         |    2 -
 t/op/pat.t                       |   19 +++++++++++++++-
 8 files changed, 36 insertions(+), 38 deletions(-)

--- NEW FILE perl-5.10.0-much-better-swap-logic.patch ---
diff -up perl-5.10.0/embed.fnc.much perl-5.10.0/embed.fnc
--- perl-5.10.0/embed.fnc.much	2009-07-27 08:31:33.839374246 +0200
+++ perl-5.10.0/embed.fnc	2009-07-27 08:32:05.322374620 +0200
@@ -1441,7 +1441,6 @@ ERsn	|U8*	|reghop4	|NN U8 *pos|I32 off|N
 #endif
 ERsn	|U8*	|reghopmaybe3	|NN U8 *pos|I32 off|NN const U8 *lim
 ERs	|char*	|find_byclass	|NN regexp * prog|NN const regnode *c|NN char *s|NN const char *strend|NULLOK regmatch_info *reginfo
-Es	|void	|swap_match_buff|NN regexp * prog
 Es	|void	|to_utf8_substr	|NN regexp * prog
 Es	|void	|to_byte_substr	|NN regexp * prog
 ERs	|I32	|reg_check_named_buff_matched	|NN const regexp *rex|NN const regnode *prog
diff -up perl-5.10.0/embed.h.much perl-5.10.0/embed.h
--- perl-5.10.0/embed.h.much	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/embed.h	2009-07-27 08:31:34.016378805 +0200
@@ -1426,7 +1426,6 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define reghopmaybe3		S_reghopmaybe3
 #define find_byclass		S_find_byclass
-#define swap_match_buff		S_swap_match_buff
 #define to_utf8_substr		S_to_utf8_substr
 #define to_byte_substr		S_to_byte_substr
 #define reg_check_named_buff_matched	S_reg_check_named_buff_matched
@@ -3714,7 +3713,6 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define reghopmaybe3		S_reghopmaybe3
 #define find_byclass(a,b,c,d,e)	S_find_byclass(aTHX_ a,b,c,d,e)
-#define swap_match_buff(a)	S_swap_match_buff(aTHX_ a)
 #define to_utf8_substr(a)	S_to_utf8_substr(aTHX_ a)
 #define to_byte_substr(a)	S_to_byte_substr(aTHX_ a)
 #define reg_check_named_buff_matched(a,b)	S_reg_check_named_buff_matched(aTHX_ a,b)
diff -up perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc.much perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc
--- perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc.much	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc	2009-07-27 08:32:58.859374528 +0200
@@ -1436,7 +1436,6 @@ ERsn	|U8*	|reghop4	|NN U8 *pos|I32 off|N
 #endif
 ERsn	|U8*	|reghopmaybe3	|NN U8 *pos|I32 off|NN const U8 *lim
 ERs	|char*	|find_byclass	|NN regexp * prog|NN const regnode *c|NN char *s|NN const char *strend|NULLOK regmatch_info *reginfo
-Es	|void	|swap_match_buff|NN regexp * prog
 Es	|void	|to_utf8_substr	|NN regexp * prog
 Es	|void	|to_byte_substr	|NN regexp * prog
 ERs	|I32	|reg_check_named_buff_matched	|NN const regexp *rex|NN const regnode *prog
diff -up perl-5.10.0/pod/perlapi.pod.much perl-5.10.0/pod/perlapi.pod
diff -up perl-5.10.0/pod/perlguts.pod.much perl-5.10.0/pod/perlguts.pod
diff -up perl-5.10.0/proto.h.much perl-5.10.0/proto.h
--- perl-5.10.0/proto.h.much	2009-07-27 08:31:33.000000000 +0200
+++ perl-5.10.0/proto.h	2009-07-27 08:35:52.103374484 +0200
@@ -3851,9 +3851,6 @@ STATIC char*	S_find_byclass(pTHX_ regexp
 			__attribute__nonnull__(pTHX_3)
 			__attribute__nonnull__(pTHX_4);
 
-STATIC void	S_swap_match_buff(pTHX_ regexp * prog)
-			__attribute__nonnull__(pTHX_1);
-
 STATIC void	S_to_utf8_substr(pTHX_ regexp * prog)
 			__attribute__nonnull__(pTHX_1);
 
diff -up perl-5.10.0/regcomp.c.much perl-5.10.0/regcomp.c
--- perl-5.10.0/regcomp.c.much	2009-07-27 08:31:33.000000000 +0200
+++ perl-5.10.0/regcomp.c	2009-07-27 08:37:09.598625044 +0200
@@ -9167,7 +9167,6 @@ Perl_pregfree(pTHX_ struct regexp *r)
     if (r->saved_copy)
         SvREFCNT_dec(r->saved_copy);
 #endif
-    Safefree(r->swap);
     Safefree(r->offs);
     Safefree(r);
 }
@@ -9216,7 +9215,6 @@ Perl_reg_temp_copy (pTHX_ struct regexp 
     ret->saved_copy = NULL;
 #endif
     ret->mother_re = r; 
-    ret->swap = NULL;
     
     return ret;
 }
diff -up perl-5.10.0/regexec.c.much perl-5.10.0/regexec.c
--- perl-5.10.0/regexec.c.much	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/regexec.c	2009-07-27 08:40:15.966404877 +0200
@@ -1718,26 +1718,6 @@ S_find_byclass(pTHX_ regexp * prog, cons
 	return s;
 }
 
-static void 
-S_swap_match_buff (pTHX_ regexp *prog) {
-    regexp_paren_pair *t;
-
-    if (!prog->swap) {
-    /* We have to be careful. If the previous successful match
-       was from this regex we don't want a subsequent paritally
-       successful match to clobber the old results. 
-       So when we detect this possibility we add a swap buffer
-       to the re, and switch the buffer each match. If we fail
-       we switch it back, otherwise we leave it swapped.
-    */
-        Newxz(prog->swap, (prog->nparens + 1), regexp_paren_pair);
-    }
-    t = prog->swap;
-    prog->swap = prog->offs;
-    prog->offs = t;
-}    
-
-
 /*
  - regexec_flags - match a regexp against a string
  */
@@ -1765,7 +1745,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const 
     I32 multiline;
     RXi_GET_DECL(prog,progi);
     regmatch_info reginfo;  /* create some info to pass to regtry etc */
-    bool swap_on_fail = 0;
+    regexp_paren_pair *swap = NULL;
 
     GET_RE_DEBUG_FLAGS_DECL;
 
@@ -1843,9 +1823,16 @@ Perl_regexec_flags(pTHX_ REGEXP * const 
 	    reginfo.ganch = strbeg;
     }
     if (PL_curpm && (PM_GETRE(PL_curpm) == prog)) {
-        swap_on_fail = 1;
-        swap_match_buff(prog); /* do we need a save destructor here for
-                                  eval dies? */
+        /* We have to be careful. If the previous successful match
+           was from this regex we don't want a subsequent partially
+           successful match to clobber the old results.
+           So when we detect this possibility we add a swap buffer
+           to the re, and switch the buffer each match. If we fail
+           we switch it back, otherwise we leave it swapped.
+        */
+        swap = prog->offs;
+        /* do we need a save destructor here for eval dies? */
+        Newxz(prog->offs, (prog->nparens + 1), regexp_paren_pair);
     }
     if (!(flags & REXEC_CHECKED) && (prog->check_substr != NULL || prog->check_utf8 != NULL)) {
 	re_scream_pos_data d;
@@ -2144,6 +2131,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const 
     goto phooey;
 
 got_it:
+    Safefree(swap);
     RX_MATCH_TAINTED_set(prog, PL_reg_flags & RF_tainted);
 
     if (PL_reg_eval_set)
@@ -2189,10 +2177,12 @@ phooey:
 			  PL_colors[4], PL_colors[5]));
     if (PL_reg_eval_set)
 	restore_pos(aTHX_ prog);
-    if (swap_on_fail) 
+    if (swap) {
         /* we failed :-( roll it back */
-        swap_match_buff(prog);
-    
+        Safefree(prog->offs);
+        prog->offs = swap;
+    }
+
     return 0;
 }
 
diff -up perl-5.10.0/regexp.h.much perl-5.10.0/regexp.h
--- perl-5.10.0/regexp.h.much	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/regexp.h	2009-07-27 08:41:06.882374786 +0200
@@ -88,7 +88,7 @@ typedef struct regexp {
         /* Data about the last/current match. These are modified during matching*/
         U32 lastparen;		/* last open paren matched */
 	U32 lastcloseparen;	/* last close paren matched */
-        regexp_paren_pair *swap;  /* Swap copy of *offs */ 
+        regexp_paren_pair *swap;  /* Unused: 5.10.1 and later */ 
         regexp_paren_pair *offs;  /* Array of offsets for (@-) and (@+) */
 
 	char *subbeg;		/* saved or original string 
diff -up perl-5.10.0/t/op/pat.t.much perl-5.10.0/t/op/pat.t
--- perl-5.10.0/t/op/pat.t.much	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/op/pat.t	2009-07-27 08:44:50.343375513 +0200
@@ -4558,10 +4558,27 @@ ok($@=~/\QSequence \k... not terminated 
     ok("aaa" =~ /$s/, "#45337");
 }
 
+# This only works under -DEBUGGING because it relies on an assert().
+{
+    local $BugId = '60508';
+    local $Message = "Check capture offset re-entrancy of utf8 code.";
+
+    sub fswash { $_[0] =~ s/([>X])//g; }
+    my $k1 = "." x 4 . ">>";
+    fswash($k1);
+
+    my $k2 = "\x{f1}\x{2022}";
+    $k2 =~ s/([\360-\362])/>/g;
+    fswash($k2);
+
+    iseq($k2, "\x{2022}", "utf8::SWASHNEW doesn't cause capture leaks");
+}
+
 # Put new tests above the dotted line about a page above this comment
 iseq(0+$::test,$::TestCount,"Got the right number of tests!");
 # Don't forget to update this!
 BEGIN {
-    $::TestCount = 4013;
+    $::TestCount = 4014;
     print "1..$::TestCount\n";
 }
+

perl-5.10.0-spamassassin.patch:
 Basename.pm |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE perl-5.10.0-spamassassin.patch ---
diff -up perl-5.10.0/lib/File/Basename.pm.spam perl-5.10.0/lib/File/Basename.pm
--- perl-5.10.0/lib/File/Basename.pm.spam	2009-07-27 08:45:18.000000000 +0200
+++ perl-5.10.0/lib/File/Basename.pm	2009-07-28 09:01:54.757410886 +0200
@@ -331,6 +331,7 @@ sub dirname {
 sub _strip_trailing_sep  {
     my $type = $Fileparse_fstype;
 
+	local $1;
     if ($type eq 'MacOS') {
         $_[0] =~ s/([^:]):\z/$1/s;
     }

perl-bz509676.patch:
 lib/h2ph.t     |   10 +++++++++-
 t/lib/h2ph.h   |    6 ++++++
 t/lib/h2ph.pht |   24 ++++++++++++++----------
 utils/h2ph.PL  |    2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)

--- NEW FILE perl-bz509676.patch ---
commit 345d607e7958b7f31d5f0c780e86d1cc3e658d99
Author: Niko Tyni <ntyni at debian.org>
Date:   Tue Apr 14 22:55:34 2009 +0300

    Squelch 'Constant subroutine ... undefined' warnings from .ph files
    
    As reported by Christopher Zimmermann in <http://bugs.debian.org/379757>,
    code generated from simple #undef directives by h2ph can cause
    'Constant subroutine ... undefined' warnings if the undefined
    function was eligible for inlining.
    
    (cherry picked from commit c0cc52e96e988526754ef533bd76595720660db2)

commit 2d375d52dd1895b26a80209dd64a3c11b9e3b532
Author: Niko Tyni <ntyni at debian.org>
Date:   Tue Apr 14 22:55:33 2009 +0300

    Add tests to verify that h2ph output compiles and is warning free
    
    The #include directives are #ifdef'd out so that running the
    resulting code does not actually need the headers. We still
    get the same effect from comparing with the expected h2ph output.
    
    (cherry picked from commit c1a2df7619e7315b8fccef3b9fa56bb8d7df3845)

diff --git a/lib/h2ph.t b/lib/h2ph.t
index 7b339b3..e303406 100755
--- a/lib/h2ph.t
+++ b/lib/h2ph.t
@@ -15,7 +15,7 @@ if (!(-e $extracted_program)) {
     exit 0;
 }
 
-print "1..2\n";
+print "1..4\n";
 
 # quickly compare two text files
 sub txt_compare {
@@ -32,6 +32,14 @@ print(($ok == 0 ? "" : "not "), "ok 1\n");
 $ok = txt_compare("lib/h2ph.ph", "lib/h2ph.pht");
 print(($ok == 0 ? "" : "not "), "ok 2\n");
     
+# does the output compile?
+$ok = system($^X, "-I../lib", "lib/h2ph.pht");
+print(($ok == 0 ? "" : "not "), "ok 3\n");
+
+# is the output warning free?
+$ok = system($^X, "-w", "-I../lib", "-e", '$SIG{__WARN__} = sub { die $_[0] }; require "lib/h2ph.pht"');
+print(($ok == 0 ? "" : "not "), "ok 4\n");
+
 # cleanup - should this be in an END block?
 unlink("lib/h2ph.ph");
 unlink("_h2ph_pre.ph");
diff --git a/t/lib/h2ph.h b/t/lib/h2ph.h
index 495789a..78429ca 100644
--- a/t/lib/h2ph.h
+++ b/t/lib/h2ph.h
@@ -26,6 +26,10 @@
 #undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 
+/* Test #undef'ining an existing constant function */
+#define NOTTRUE 0
+#undef NOTTRUE
+
 /* Test #ifdef */
 #ifdef __SOME_UNIMPORTANT_PROPERTY
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -68,9 +72,11 @@ function Tru64_Pascal(n: Integer): Integer;
  *  with `use lib qw(/opt/perl5/lib/site_perl/i586-linux/linux);' or whatever
  *  your equivalent is...
  */
+#if 0
 #include <sys/socket.h>
 #import "sys/ioctl.h"
 #include_next <sys/fcntl.h>
+#endif
 
 /* typedefs should be ignored */
 typedef struct a_struct {
diff --git a/t/lib/h2ph.pht b/t/lib/h2ph.pht
index 145e682..3723fca 100644
--- a/t/lib/h2ph.pht
+++ b/t/lib/h2ph.pht
@@ -1,6 +1,6 @@
 require '_h2ph_pre.ph';
 
-no warnings 'redefine';
+no warnings qw(redefine misc);
 
 unless(defined(&SQUARE)) {
     sub SQUARE {
@@ -22,6 +22,8 @@ unless(defined(&_H2PH_H_)) {
         my($a,$b) = @_;
 	    eval q((($a) > ($b) ? ($a) : ($b)));
     }' unless defined(&MAX);
+    eval 'sub NOTTRUE () {0;}' unless defined(&NOTTRUE);
+    undef(&NOTTRUE) if defined(&NOTTRUE);
     if(defined(&__SOME_UNIMPORTANT_PROPERTY)) {
 	eval 'sub MIN {
 	    my($a,$b) = @_;
@@ -47,15 +49,17 @@ unless(defined(&_H2PH_H_)) {
     } else {
 	eval 'sub WHATEVER () {1000;}' unless defined(&WHATEVER);
     }
-    require 'sys/socket.ph';
-    require 'sys/ioctl.ph';
-    eval {
-	my(@REM);
-	my(%INCD) = map { $INC{$_} => 1 } (grep { $_ eq "sys/fcntl.ph" } keys(%INC));
-	@REM = map { "$_/sys/fcntl.ph" } (grep { not exists($INCD{"$_/sys/fcntl.ph"}) and -f "$_/sys/fcntl.ph" } @INC);
-	require "$REM[0]" if @REM;
-    };
-    warn($@) if $@;
+    if(0) {
+	require 'sys/socket.ph';
+	require 'sys/ioctl.ph';
+	eval {
+	    my(@REM);
+	    my(%INCD) = map { $INC{$_} => 1 } (grep { $_ eq "sys/fcntl.ph" } keys(%INC));
+	    @REM = map { "$_/sys/fcntl.ph" } (grep { not exists($INCD{"$_/sys/fcntl.ph"}) and -f "$_/sys/fcntl.ph" } @INC);
+	    require "$REM[0]" if @REM;
+	};
+	warn($@) if $@;
+    }
     eval("sub sun () { 0; }") unless defined(&sun);
     eval("sub mon () { 1; }") unless defined(&mon);
     eval("sub tue () { 2; }") unless defined(&tue);
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 6f40126..4e99a7a 100644
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -123,7 +123,7 @@ while (defined (my $file = next_file())) {
 
     print OUT
         "require '_h2ph_pre.ph';\n\n",
-        "no warnings 'redefine';\n\n";
+        "no warnings qw(redefine misc);\n\n";
 
     while (defined (local $_ = next_line($file))) {
 	if (s/^\s*\#\s*//) {

perl-skip-prereq.patch:
 Makefile.PL |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE perl-skip-prereq.patch ---
--- perl-5.10.0/ext/Math/BigInt/FastCalc/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Math/BigInt/FastCalc/Makefile.PL	2009-07-10 15:37:39.000000000 +0200
@@ -2,12 +2,18 @@
 
 use strict;
 
+unless($ENV{PERL_CORE}) {
+    $ENV{PERL_CORE} = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV;
+}
+
 WriteMakefile(
     'NAME'		=> 'Math::BigInt::FastCalc',
     'VERSION_FROM'	=> 'FastCalc.pm',
-    'PREREQ_PM'		=> {
-	'Math::BigInt' => 1.88,
-    },
+    (
+      $ENV{PERL_CORE}
+	? ( )
+	: ('PREREQ_PM'	=> { 'Math::BigInt' => 1.88, } )
+    ),
     INSTALLDIRS		=> 'perl',
     PREREQ_FATAL	=> 1,
     MAN3PODS		=> {},

perl-update-Module-Pluggable.patch:
 MANIFEST                                            |   11 +
 lib/Devel/InnerPackage.pm                           |    4 
 lib/Module/Pluggable.pm                             |   15 +-
 lib/Module/Pluggable/Object.pm                      |  134 +++++++++++++-------
 t/Module_Pluggable/02alsoworks.t                    |    2 
 t/Module_Pluggable/02works.t                        |    2 
 t/Module_Pluggable/03diffname.t                     |    2 
 t/Module_Pluggable/04acmedir.t                      |    2 
 t/Module_Pluggable/04acmedir_single.t               |    2 
 t/Module_Pluggable/04acmepath.t                     |    2 
 t/Module_Pluggable/04acmepath_single.t              |    2 
 t/Module_Pluggable/05postpath.t                     |    2 
 t/Module_Pluggable/06multipath.t                    |    2 
 t/Module_Pluggable/07instantiate.t                  |    4 
 t/Module_Pluggable/08nothing.t                      |    2 
 t/Module_Pluggable/09require.t                      |    2 
 t/Module_Pluggable/10innerpack.t                    |    2 
 t/Module_Pluggable/10innerpack_inner.t              |    2 
 t/Module_Pluggable/10innerpack_noinner.t            |    2 
 t/Module_Pluggable/10innerpack_onefile.t            |   27 ++++
 t/Module_Pluggable/10innerpack_override.t           |    2 
 t/Module_Pluggable/10innerpack_super.t              |   29 ++++
 t/Module_Pluggable/11usetwice.t                     |    2 
 t/Module_Pluggable/12only.t                         |    2 
 t/Module_Pluggable/12onlyarray.t                    |    2 
 t/Module_Pluggable/12onlyregex.t                    |    2 
 t/Module_Pluggable/12onlyrequire.t                  |   21 +++
 t/Module_Pluggable/13except.t                       |    2 
 t/Module_Pluggable/13exceptarray.t                  |    4 
 t/Module_Pluggable/13exceptregex.t                  |    4 
 t/Module_Pluggable/14package.t                      |    2 
 t/Module_Pluggable/15topicsafe.t                    |    2 
 t/Module_Pluggable/16different_extension.t          |    2 
 t/Module_Pluggable/17devel_inner_package.t          |    2 
 t/Module_Pluggable/18skipped_package.t              |    2 
 t/Module_Pluggable/19can_ok_clobber.t               |    2 
 t/Module_Pluggable/20dodgy_files.t                  |   16 +-
 t/Module_Pluggable/21editor_junk.t                  |   53 +++++++
 t/Module_Pluggable/lib/Acme/Foo-Bar.pm              |    6 
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm     |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~    |    9 +
 t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm     |    9 +
 44 files changed, 344 insertions(+), 81 deletions(-)

--- NEW FILE perl-update-Module-Pluggable.patch ---
This patch is derived from the perl-5.10.1 tarball as released on the CPAN.

diff -urN perl-5.10.0.orig/lib/Devel/InnerPackage.pm perl-5.10.0/lib/Devel/InnerPackage.pm
--- perl-5.10.0.orig/lib/Devel/InnerPackage.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Devel/InnerPackage.pm	2009-08-31 19:47:24.444773931 -0700
@@ -17,7 +17,7 @@
 =head1 SYNOPSIS
 
     use Foo::Bar;
-    use Devel::innerPackage qw(list_packages);
+    use Devel::InnerPackage qw(list_packages);
 
     my @inner_packages = list_packages('Foo::Bar');
 
@@ -75,7 +75,7 @@
                     !__PACKAGE__->_loaded($pack.$cand); # or @children;
                 push @packs, @children;
             }
-            return grep {$_ !~ /::::ISA::CACHE/} @packs;
+            return grep {$_ !~ /::(::ISA::CACHE|SUPER)/} @packs;
 }
 
 ### XXX this is an inlining of the Class-Inspector->loaded()
diff -urN perl-5.10.0.orig/lib/Module/Pluggable/Object.pm perl-5.10.0/lib/Module/Pluggable/Object.pm
--- perl-5.10.0.orig/lib/Module/Pluggable/Object.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable/Object.pm	2009-08-31 19:47:24.446771196 -0700
@@ -6,10 +6,9 @@
 use File::Spec::Functions qw(splitdir catdir curdir catfile abs2rel);
 use Carp qw(croak carp);
 use Devel::InnerPackage;
-use Data::Dumper;
 use vars qw($VERSION);
 
-$VERSION = '3.6';
+$VERSION = '3.9';
 
 
 sub new {
@@ -20,6 +19,10 @@
 
 }
 
+### Eugggh, this code smells 
+### This is what happens when you keep adding patches
+### *sigh*
+
 
 sub plugins {
         my $self = shift;
@@ -30,14 +33,14 @@
         my $filename   = $self->{'filename'};
         my $pkg        = $self->{'package'};
 
+        # Get the exception params instantiated
+        $self->_setup_exceptions;
+
         # automatically turn a scalar search path or namespace into a arrayref
         for (qw(search_path search_dirs)) {
             $self->{$_} = [ $self->{$_} ] if exists $self->{$_} && !ref($self->{$_});
         }
 
-
-
-
         # default search path is '<Module>::<Name>::Plugin'
         $self->{'search_path'} = ["${pkg}::Plugin"] unless $self->{'search_path'}; 
 
@@ -46,13 +49,14 @@
 
 
         # check to see if we're running under test
-        my @SEARCHDIR = exists $INC{"blib.pm"} && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
+        my @SEARCHDIR = exists $INC{"blib.pm"} && defined $filename && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
 
         # add any search_dir params
         unshift @SEARCHDIR, @{$self->{'search_dirs'}} if defined $self->{'search_dirs'};
 
 
         my @plugins = $self->search_directories(@SEARCHDIR);
+        push(@plugins, $self->handle_innerpackages($_)) for @{$self->{'search_path'}};
 
         # push @plugins, map { print STDERR "$_\n"; $_->require } list_packages($_) for (@{$self->{'search_path'}});
         
@@ -60,43 +64,12 @@
         return () unless @plugins;
 
 
-        # exceptions
-        my %only;   
-        my %except; 
-        my $only;
-        my $except;
-
-        if (defined $self->{'only'}) {
-            if (ref($self->{'only'}) eq 'ARRAY') {
-                %only   = map { $_ => 1 } @{$self->{'only'}};
-            } elsif (ref($self->{'only'}) eq 'Regexp') {
-                $only = $self->{'only'}
-            } elsif (ref($self->{'only'}) eq '') {
-                $only{$self->{'only'}} = 1;
-            }
-        }
-        
-
-        if (defined $self->{'except'}) {
-            if (ref($self->{'except'}) eq 'ARRAY') {
-                %except   = map { $_ => 1 } @{$self->{'except'}};
-            } elsif (ref($self->{'except'}) eq 'Regexp') {
-                $except = $self->{'except'}
-            } elsif (ref($self->{'except'}) eq '') {
-                $except{$self->{'except'}} = 1;
-            }
-        }
-
 
         # remove duplicates
         # probably not necessary but hey ho
         my %plugins;
         for(@plugins) {
-            next if (keys %only   && !$only{$_}     );
-            next unless (!defined $only || m!$only! );
-
-            next if (keys %except &&  $except{$_}   );
-            next if (defined $except &&  m!$except! );
+            next unless $self->_is_legit($_);
             $plugins{$_} = 1;
         }
 
@@ -112,6 +85,58 @@
 
 }
 
+sub _setup_exceptions {
+    my $self = shift;
+
+    my %only;   
+    my %except; 
+    my $only;
+    my $except;
+
+    if (defined $self->{'only'}) {
+        if (ref($self->{'only'}) eq 'ARRAY') {
+            %only   = map { $_ => 1 } @{$self->{'only'}};
+        } elsif (ref($self->{'only'}) eq 'Regexp') {
+            $only = $self->{'only'}
+        } elsif (ref($self->{'only'}) eq '') {
+            $only{$self->{'only'}} = 1;
+        }
+    }
+        
+
+    if (defined $self->{'except'}) {
+        if (ref($self->{'except'}) eq 'ARRAY') {
+            %except   = map { $_ => 1 } @{$self->{'except'}};
+        } elsif (ref($self->{'except'}) eq 'Regexp') {
+            $except = $self->{'except'}
+        } elsif (ref($self->{'except'}) eq '') {
+            $except{$self->{'except'}} = 1;
+        }
+    }
+    $self->{_exceptions}->{only_hash}   = \%only;
+    $self->{_exceptions}->{only}        = $only;
+    $self->{_exceptions}->{except_hash} = \%except;
+    $self->{_exceptions}->{except}      = $except;
+        
+}
+
+sub _is_legit {
+    my $self   = shift;
+    my $plugin = shift;
+    my %only   = %{$self->{_exceptions}->{only_hash}||{}};
+    my %except = %{$self->{_exceptions}->{except_hash}||{}};
+    my $only   = $self->{_exceptions}->{only};
+    my $except = $self->{_exceptions}->{except};
+
+    return 0 if     (keys %only   && !$only{$plugin}     );
+    return 0 unless (!defined $only || $plugin =~ m!$only!     );
+
+    return 0 if     (keys %except &&  $except{$plugin}   );
+    return 0 if     (defined $except &&  $plugin =~ m!$except! );
+
+    return 1;
+}
+
 sub search_directories {
     my $self      = shift;
     my @SEARCHDIR = @_;
@@ -121,7 +146,6 @@
     foreach my $dir (@SEARCHDIR) {
         push @plugins, $self->search_paths($dir);
     }
-
     return @plugins;
 }
 
@@ -151,6 +175,8 @@
             # parse the file to get the name
             my ($name, $directory, $suffix) = fileparse($file, $file_regex);
 
+            next if (!$self->{include_editor_junk} && $self->_is_editor_junk($name));
+
             $directory = abs2rel($directory, $sp);
 
             # If we have a mixed-case package name, assume case has been preserved
@@ -203,17 +229,34 @@
         # now add stuff that may have been in package
         # NOTE we should probably use all the stuff we've been given already
         # but then we can't unload it :(
-        push @plugins, $self->handle_innerpackages($searchpath) unless (exists $self->{inner} && !$self->{inner});
+        push @plugins, $self->handle_innerpackages($searchpath);
     } # foreach $searchpath
 
     return @plugins;
 }
 
+sub _is_editor_junk {
+    my $self = shift;
+    my $name = shift;
+
+    # Emacs (and other Unix-y editors) leave temp files ending in a
+    # tilde as a backup.
+    return 1 if $name =~ /~$/;
+    # Emacs makes these files while a buffer is edited but not yet
+    # saved.
+    return 1 if $name =~ /^\.#/;
+    # Vim can leave these files behind if it crashes.
+    return 1 if $name =~ /\.sw[po]$/;
+
+    return 0;
+}
+
 sub handle_finding_plugin {
     my $self   = shift;
     my $plugin = shift;
 
     return unless (defined $self->{'instantiate'} || $self->{'require'}); 
+    return unless $self->_is_legit($plugin);
     $self->_require($plugin);
 }
 
@@ -245,10 +288,11 @@
 
 sub handle_innerpackages {
     my $self = shift;
+    return () if (exists $self->{inner} && !$self->{inner});
+
     my $path = shift;
     my @plugins;
 
-
     foreach my $plugin (Devel::InnerPackage::list_packages($path)) {
         my $err = $self->handle_finding_plugin($plugin);
         #next if $err;
@@ -299,6 +343,14 @@
 
 Optionally it instantiates those classes for you.
 
+This object is wrapped by C<Module::Pluggable>. If you want to do something
+odd or add non-general special features you're probably best to wrap this
+and produce your own subclass.
+
+=head1 OPTIONS
+
+See the C<Module::Pluggable> docs.
+
 =head1 AUTHOR
 
 Simon Wistow <simon at thegestalt.org>
diff -urN perl-5.10.0.orig/lib/Module/Pluggable.pm perl-5.10.0/lib/Module/Pluggable.pm
--- perl-5.10.0.orig/lib/Module/Pluggable.pm	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable.pm	2009-08-31 19:47:24.448771465 -0700
@@ -9,7 +9,7 @@
 # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
 
 
-$VERSION = '3.6';
+$VERSION = '3.9';
 
 sub import {
     my $class        = shift;
@@ -60,8 +60,9 @@
 
 
     no strict 'refs';
-    no warnings 'redefine';
-    *{"$package\::$sub"}    = $subroutine;
+    no warnings qw(redefine prototype);
+    
+    *{"$package\::$sub"}        = $subroutine;
     *{"$package\::search_path"} = $searchsub;
     *{"$package\::only"}        = $onlysub;
     *{"$package\::except"}      = $exceptsub;
@@ -297,6 +298,14 @@
 
     file_regex => qr/\.plugin$/
 
+=head2 include_editor_junk
+
+By default C<Module::Pluggable> ignores files that look like they were
+left behind by editors. Currently this means files ending in F<~> (~),
+the extensions F<.swp> or F<.swo>, or files beginning with F<.#>.
+
+Setting C<include_editor_junk> changes C<Module::Pluggable> so it does
+not ignore any files it finds.
 
 
 =head1 METHODs
diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/MANIFEST	2009-08-31 19:47:24.452770885 -0700
@@ -3612,11 +3612,14 @@
 t/Module_Pluggable/09require.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_inner.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_noinner.t	Module::Pluggable tests
+t/Module_Pluggable/10innerpack_onefile.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack_override.t	Module::Pluggable tests
+t/Module_Pluggable/10innerpack_super.t	Module::Pluggable tests
 t/Module_Pluggable/10innerpack.t	Module::Pluggable tests
 t/Module_Pluggable/11usetwice.t	Module::Pluggable tests
 t/Module_Pluggable/12onlyarray.t	Module::Pluggable tests
 t/Module_Pluggable/12onlyregex.t	Module::Pluggable tests
+t/Module_Pluggable/12onlyrequire.t	Module::Pluggable tests
 t/Module_Pluggable/12only.t	Module::Pluggable tests
 t/Module_Pluggable/13exceptarray.t	Module::Pluggable tests
 t/Module_Pluggable/13exceptregex.t	Module::Pluggable tests
@@ -3628,8 +3631,15 @@
 t/Module_Pluggable/18skipped_package.t	Module::Pluggable tests
 t/Module_Pluggable/19can_ok_clobber.t	Module::Pluggable tests
 t/Module_Pluggable/20dodgy_files.t	Module::Pluggable tests
+t/Module_Pluggable/21editor_junk.t	Module::Pluggable tests
 t/Module_Pluggable/acme/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/Acme/Foo-Bar.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Bar.plugin	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Foo.plugin	Module::Pluggable tests
 t/Module_Pluggable/lib/ExtTest/Plugin/Quux/Foo.plugin	Module::Pluggable tests
@@ -3646,6 +3656,7 @@
 t/Module_Pluggable/lib/OddTest/Plugin/-Dodgy.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/OddTest/Plugin/Foo.pm	Module::Pluggable tests
 t/Module_Pluggable/lib/TA/C/A/I.pm	Module::Pluggable tests
+t/Module_Pluggable/lib/Zot/.Zork.pm	Module::Pluggable tests
 t/mro/basic_01_c3.t		mro tests
 t/mro/basic_01_dfs.t		mro tests
 t/mro/basic_02_c3.t		mro tests
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t perl-5.10.0/t/Module_Pluggable/02alsoworks.t
--- perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02alsoworks.t	2009-08-31 19:47:24.454770805 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02works.t perl-5.10.0/t/Module_Pluggable/02works.t
--- perl-5.10.0.orig/t/Module_Pluggable/02works.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02works.t	2009-08-31 19:47:24.455771358 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/03diffname.t perl-5.10.0/t/Module_Pluggable/03diffname.t
--- perl-5.10.0.orig/t/Module_Pluggable/03diffname.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/03diffname.t	2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t perl-5.10.0/t/Module_Pluggable/04acmedir_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir_single.t	2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t perl-5.10.0/t/Module_Pluggable/04acmedir.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir.t	2009-08-31 19:47:24.457771627 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t perl-5.10.0/t/Module_Pluggable/04acmepath_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath_single.t	2009-08-31 19:47:24.458773508 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t perl-5.10.0/t/Module_Pluggable/04acmepath.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath.t	2009-08-31 19:47:24.459772105 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/05postpath.t perl-5.10.0/t/Module_Pluggable/05postpath.t
--- perl-5.10.0.orig/t/Module_Pluggable/05postpath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/05postpath.t	2009-08-31 19:47:24.460771332 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/06multipath.t perl-5.10.0/t/Module_Pluggable/06multipath.t
--- perl-5.10.0.orig/t/Module_Pluggable/06multipath.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/06multipath.t	2009-08-31 19:47:24.461771676 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t perl-5.10.0/t/Module_Pluggable/07instantiate.t
--- perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/07instantiate.t	2009-08-31 19:47:24.462772090 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 6;
 
 my $foo;
@@ -26,7 +26,7 @@
 use File::Spec::Functions qw(catdir);
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'booga', instantiate => 'new');
 use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'wooga', instantiate => 'nosomuchmethod');
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/08nothing.t perl-5.10.0/t/Module_Pluggable/08nothing.t
--- perl-5.10.0.orig/t/Module_Pluggable/08nothing.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/08nothing.t	2009-08-31 19:47:24.463771316 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 2;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/09require.t perl-5.10.0/t/Module_Pluggable/09require.t
--- perl-5.10.0.orig/t/Module_Pluggable/09require.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/09require.t	2009-08-31 19:47:24.464771800 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 2;
 
 my $t = MyTest->new();
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t	2009-08-31 19:47:24.465771515 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t	2009-08-31 19:47:24.479772629 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t	2009-08-31 19:47:24.480772134 -0700
@@ -0,0 +1,27 @@
+#!perl -wT
+
+use strict;
+use Test::More tests => 2;
+use Data::Dumper;
+
+my $mc  = MyClass->new();
+my $mc2 = MyClass2->new();
+
+
+is_deeply([$mc->plugins],  [qw(MyClass::Plugin::MyPlugin)], "Got inner plugin");
+is_deeply([$mc2->plugins], [],                              "Didn't get plugin");
+
+package MyClass::Plugin::MyPlugin;
+sub pretty { print "I am pretty" };
+
+package MyClass;
+use Module::Pluggable inner => 1;
+
+sub new { return bless {}, $_[0] }
+
+package MyClass2;
+use Module::Pluggable search_path => "MyClass::Plugin", inner => 0;
+
+sub new { return bless {}, $_[0] }
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t perl-5.10.0/t/Module_Pluggable/10innerpack_override.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_override.t	2009-08-31 19:47:24.481771501 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t perl-5.10.0/t/Module_Pluggable/10innerpack_super.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_super.t	2009-08-31 19:47:24.482771565 -0700
@@ -0,0 +1,29 @@
+#!perl -wT
+
+use Test::More tests => 3;
+use strict;
+use_ok('Devel::InnerPackage');
+Bar->whee;
+is_deeply([Devel::InnerPackage::list_packages("Bar")],[], "Don't pick up ::SUPER pseudo stash"); 
+is_deeply([Devel::InnerPackage::list_packages("Foo")],['Foo::Bar'], "Still pick up other inner package");
+
+package Foo;
+
+sub whee {
+    1;
+}
+
+package Foo::Bar;
+
+sub whee {}
+
+package Bar;
+use base 'Foo';
+
+sub whee {
+    shift->SUPER::whee;
+    2;
+}
+
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t perl-5.10.0/t/Module_Pluggable/10innerpack.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack.t	2009-08-31 19:47:24.483771909 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 4;
 
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t perl-5.10.0/t/Module_Pluggable/11usetwice.t
--- perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/11usetwice.t	2009-08-31 19:47:24.484771624 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 3;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t perl-5.10.0/t/Module_Pluggable/12onlyarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyarray.t	2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t perl-5.10.0/t/Module_Pluggable/12onlyregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyregex.t	2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t perl-5.10.0/t/Module_Pluggable/12onlyrequire.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyrequire.t	2009-08-31 19:47:24.505021273 -0700
@@ -0,0 +1,21 @@
+#!perl -w
+use strict;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Test::More tests => 2;
+
+my @packages = eval { Zot->_dist_types };
+is($@, '',                "No warnings");
+is(scalar(@packages), 0,  "Correctly only got 1 package");
+
+
+package Zot;
+use strict;
+use Module::Pluggable (
+        sub_name => '_dist_types',
+        search_path => __PACKAGE__,
+        only => qr/Zot::\w+$/,
+        require => 1,
+    );
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12only.t perl-5.10.0/t/Module_Pluggable/12only.t
--- perl-5.10.0.orig/t/Module_Pluggable/12only.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12only.t	2009-08-31 19:47:24.506022385 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t perl-5.10.0/t/Module_Pluggable/13exceptarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptarray.t	2009-08-31 19:47:24.507021263 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t perl-5.10.0/t/Module_Pluggable/13exceptregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptregex.t	2009-08-31 19:47:24.510021945 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13except.t perl-5.10.0/t/Module_Pluggable/13except.t
--- perl-5.10.0.orig/t/Module_Pluggable/13except.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13except.t	2009-08-31 19:47:24.511021381 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 10;
 
 {
diff -urN perl-5.10.0.orig/t/Module_Pluggable/14package.t perl-5.10.0/t/Module_Pluggable/14package.t
--- perl-5.10.0.orig/t/Module_Pluggable/14package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/14package.t	2009-08-31 19:47:24.842414378 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t perl-5.10.0/t/Module_Pluggable/15topicsafe.t
--- perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/15topicsafe.t	2009-08-31 19:47:24.842774343 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More 'no_plan';
 
 use Module::Pluggable search_path => 'Acme::MyTest';
diff -urN perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t perl-5.10.0/t/Module_Pluggable/16different_extension.t
--- perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/16different_extension.t	2009-08-31 19:47:24.843800947 -0700
@@ -2,7 +2,7 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 use Test::More tests => 5;
 
 my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t	2009-08-31 19:47:24.843800947 -0700
@@ -3,7 +3,7 @@
 
 use Devel::InnerPackage qw(list_packages);
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 my @packages;
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t perl-5.10.0/t/Module_Pluggable/18skipped_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/18skipped_package.t	2009-08-31 19:47:24.844780129 -0700
@@ -2,7 +2,7 @@
 
 use Test::More tests => 1;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 use Devel::InnerPackage qw(list_packages);
 use No::Middle;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t
--- perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t	2009-08-31 19:47:24.844780129 -0700
@@ -3,7 +3,7 @@
 use warnings;
 use Data::Dumper;
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
 
 use Test::More tests=>5;
 
diff -urN perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t perl-5.10.0/t/Module_Pluggable/20dodgy_files.t
--- perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t	2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/20dodgy_files.t	2009-08-31 19:47:24.845769158 -0700
@@ -1,7 +1,7 @@
 #!perl -w
 
 BEGIN {
-    if ($^O eq 'VMS') {
+    if ($^O eq 'VMS' || $^O eq 'VOS') {
         print "1..0 # Skip: can't handle misspelled plugin names\n";
         exit;
     }
@@ -9,8 +9,18 @@
 
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/lib";
-use Test::More tests => 5;
+use Test::More;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use File::Spec::Functions qw(catfile);
+
+
+my ($dodgy_file) = (catfile($FindBin::Bin, "lib", "OddTest", "Plugin", "-Dodgy.pm")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+        plan skip_all => "Can't handle misspelled plugin names\n";
+} else {
+        plan tests => 5;
+}
+
 
 my $foo;
 ok($foo = OddTest->new());
diff -urN perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t perl-5.10.0/t/Module_Pluggable/21editor_junk.t
--- perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/21editor_junk.t	2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,53 @@
+#!perl -w
+
+use Test::More;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Module::Pluggable::Object;
+use File::Spec::Functions qw(catfile);
+
+my ($dodgy_file) = (catfile($FindBin::Bin,"lib", "EditorJunk", "Plugin", "#Bar.pm#")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+        plan skip_all => "Can't handle plugin names with octothorpes\n";
+} else {
+        plan tests => 4;
+}
+
+
+
+my $foo;
+ok($foo = EditorJunk->new());
+
+my @plugins;
+my @expected = qw(EditorJunk::Plugin::Bar EditorJunk::Plugin::Foo);
+ok(@plugins = sort $foo->plugins);
+
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+my $mpo = Module::Pluggable::Object->new(
+    package             => 'EditorJunk',
+    filename            => __FILE__,
+    include_editor_junk => 1,
+);
+
+ at expected = ('EditorJunk::Plugin::.#Bar', 'EditorJunk::Plugin::Bar', 'EditorJunk::Plugin::Foo');
+ at plugins = sort $mpo->plugins();
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+
+package EditorJunk;
+
+use strict;
+use Module::Pluggable;
+
+
+sub new {
+    my $class = shift;
+    return bless {}, $class;
+
+}
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,6 @@
+package Acme::FooBar;
+
+our $quux = "hello";
+
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	2009-08-31 19:47:24.846769084 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	2009-08-31 19:47:24.851770803 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	2009-08-31 19:47:24.852771985 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	2009-08-31 19:47:24.853771770 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	2009-08-31 19:47:24.854771835 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Foo;
+
+
+use strict;
+
+
+1;
+
+

perl-update-Scalar-List-Utils.patch:
 MANIFEST                            |    3 
 ext/List/Util/Changes               |   22 +++++
 ext/List/Util/Makefile.PL           |  113 +++++++++++++++++---------
 ext/List/Util/Util.xs               |   76 +++++++++++++++--
 ext/List/Util/lib/List/Util.pm      |   88 ++++----------------
 ext/List/Util/lib/List/Util/PP.pm   |   75 +++++++++++++++++
 ext/List/Util/lib/List/Util/XS.pm   |   45 ++++++++++
 ext/List/Util/lib/Scalar/Util.pm    |  154 +++++++++++-------------------------
 ext/List/Util/lib/Scalar/Util/PP.pm |  109 +++++++++++++++++++++++++
 ext/List/Util/t/00version.t         |    7 +
 ext/List/Util/t/blessed.t           |   25 +++++
 ext/List/Util/t/dualvar.t           |    9 +-
 ext/List/Util/t/expfail.t           |   29 ++++++
 ext/List/Util/t/lln.t               |   13 ++-
 ext/List/Util/t/max.t               |   35 +++++++-
 ext/List/Util/t/min.t               |   35 +++++++-
 ext/List/Util/t/openhan.t           |   72 +++++++++++++++-
 ext/List/Util/t/p_00version.t       |   26 ++++++
 ext/List/Util/t/p_tainted.t         |    4 
 ext/List/Util/t/reduce.t            |   12 ++
 ext/List/Util/t/refaddr.t           |   15 +++
 ext/List/Util/t/reftype.t           |    6 -
 ext/List/Util/t/stack-corruption.t  |   30 +++++++
 ext/List/Util/t/sum.t               |   32 +++++++
 ext/List/Util/t/weak.t              |   16 ++-
 25 files changed, 799 insertions(+), 252 deletions(-)

--- NEW FILE perl-update-Scalar-List-Utils.patch ---
Scalar-List-Utils-1.21

Makefile.PL patched to build Util.so instead of ListUtil.so

diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/MANIFEST	2009-07-10 12:34:47.000000000 +0200
@@ -842,6 +842,7 @@
 ext/List/Util/t/00version.t	Scalar::Util
 ext/List/Util/t/blessed.t	Scalar::Util
 ext/List/Util/t/dualvar.t	Scalar::Util
+ext/List/Util/t/expfail.t	Scalar::Util
 ext/List/Util/t/first.t		List::Util
 ext/List/Util/t/isvstring.t	Scalar::Util
 ext/List/Util/t/lln.t		Scalar::Util
@@ -850,6 +851,7 @@
 ext/List/Util/t/minstr.t	List::Util
 ext/List/Util/t/min.t		List::Util
 ext/List/Util/t/openhan.t	Scalar::Util
+ext/List/Util/t/p_00version.t	Scalar::Util
 ext/List/Util/t/p_blessed.t	Scalar::Util
 ext/List/Util/t/p_first.t	List::Util
 ext/List/Util/t/p_lln.t		Scalar::Util
@@ -871,6 +873,7 @@
 ext/List/Util/t/refaddr.t	Scalar::Util
 ext/List/Util/t/reftype.t	Scalar::Util
 ext/List/Util/t/shuffle.t	List::Util
+ext/List/Util/t/stack-corruption.t	List::Util
 ext/List/Util/t/sum.t		List::Util
 ext/List/Util/t/tainted.t	Scalar::Util
 ext/List/Util/t/weak.t		Scalar::Util
diff -urN perl-5.10.0.orig/ext/List/Util/Changes perl-5.10.0/ext/List/Util/Changes
--- perl-5.10.0.orig/ext/List/Util/Changes	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/Changes	2009-07-08 17:22:59.000000000 +0200
@@ -1,3 +1,25 @@
+1.21 -- Mon May 18 10:32:14 CDT 2009
+
+  * Change build system for perl-only install not to need to modify blib
+  * When building inside perl, tests for weaken should be always run (Alexandr Ciornii)
+
+1.20 -- Wed May 13 16:42:53 CDT 2009
+
+*** NOTE***
+This distribution now requires perl 5.6 or greater
+
+Bug Fixes
+  * Fixed stack pop issue in POP_MULTICALL
+  * Fixed error reporting in import when XS not compiled
+  * Check first argument to reduce is a CODE reference to avoid segfault
+  * Handle overloaded and tied values
+  * Fix tainted test to run on Win32
+
+Enhancements
+  * Added List::Util::XS so authors can depend on XS version
+  * Removed need for dummy methods in UNIVERSAL for perl-only code
+
+
 1.19 -- Sun Dec 10 09:58:03 CST 2006
 
 Bug Fixes
diff -urN perl-5.10.0.orig/ext/List/Util/Makefile.PL perl-5.10.0/ext/List/Util/Makefile.PL
--- perl-5.10.0.orig/ext/List/Util/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/Makefile.PL	2009-05-15 04:54:09.000000000 +0200
@@ -1,47 +1,86 @@
+# -*- perl -*-
+BEGIN { require 5.006; } # allow CPAN testers to get the point
+use strict;
+use warnings;
+use Config;
+use File::Spec;
 use ExtUtils::MakeMaker;
+my $PERL_CORE = grep { $_ eq 'PERL_CORE=1' } @ARGV;
+
+my $do_xs = $PERL_CORE || can_cc();
+
+for (@ARGV) {
+  /^-pm/ and $do_xs = 0;
+  /^-xs/ and $do_xs = 1;
+}
 
 WriteMakefile(
-    VERSION_FROM    => "lib/List/Util.pm",
-    MAN3PODS        => {},  # Pods will be built by installman.
-    NAME            => "List::Util",
-    DEFINE          => "-DPERL_EXT",
+  NAME         => q[List::Util],
+  ABSTRACT     => q[Common Scalar and List utility subroutines],
+  AUTHOR       => q[Graham Barr <gbarr at cpan.org>],
+  DEFINE       => q[-DPERL_EXT],
+  DISTNAME     => q[Scalar-List-Utils],
+  VERSION_FROM => 'lib/List/Util.pm',
+
+  # We go through the ListUtil.xs trickery to foil platforms
+  # that have the feature combination of
+  # (1) static builds
+  # (2) allowing only one object by the same name in the static library
+  # (3) the object name matching being case-blind
+  # This means that we can't have the top-level util.o
+  # and the extension-level Util.o in the same build.
+  # One such platform is the POSIX-BC BS2000 EBCDIC mainframe platform.
+  XS     => {'Util.xs' => 'Util.c'},
+  OBJECT => 'Util$(OBJ_EXT)',
+  ( $PERL_CORE
+    ? ()
+    : (
+      INSTALLDIRS => q[perl],
+      PREREQ_PM   => {'Test::More' => 0,},
+      (eval { ExtUtils::MakeMaker->VERSION(6.31) } ? (LICENSE => 'perl') : ()),
+      ($do_xs ? () : (XS => {}, C => [], OBJECT => '')),
+      ( eval { ExtUtils::MakeMaker->VERSION(6.46) } ? (
+          META_MERGE => {
+            resources => {    ##
+              repository => 'http://github.com/gbarr/Scalar-List-Utils',
+            },
+          }
+          )
+        : ()
+      ),
+    )
+  ),
 );
 
-package MY;
 
-# We go through the ListUtil.c trickery to foil platforms
-# that have the feature combination of
-# (1) static builds
-# (2) allowing only one object by the same name in the static library
-# (3) the object name matching being case-blind
-# This means that we can't have the top-level util.o
-# and the extension-level Util.o in the same build.
-# One such platform is the POSIX-BC BS2000 EBCDIC mainframe platform.
-
-BEGIN {
-    use Config;
-    unless (defined $Config{usedl}) {
-	eval <<'__EOMM__';
-sub xs_c {
-    my($self) = shift;
-    return '' unless $self->needs_linking();
-'
-ListUtil.c:	Util.xs
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) Util.xs > ListUtil.xsc && $(MV) ListUtil.xsc ListUtil.c
-';
-}
+sub can_cc {
+
+    foreach my $cmd (split(/ /, $Config::Config{cc})) {
+        my $_cmd = $cmd;
+        return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+
+        for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+            my $abs = File::Spec->catfile($dir, $_[1]);
+            return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+        }
+    }
 
-sub xs_o {
-    my($self) = shift;
-    return '' unless $self->needs_linking();
-'
-
-Util$(OBJ_EXT):	ListUtil.c
-	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) ListUtil.c
-	$(MV) ListUtil$(OBJ_EXT) Util$(OBJ_EXT)
-';
+    return;
 }
 
-__EOMM__
-    }
+package MY;
+
+sub init_PM  {
+  my $self = shift;
+
+  $self->SUPER::init_PM(@_);
+
+  return if $do_xs;
+
+  my $pm = $self->{PM};
+  my $pm_file = File::Spec->catfile(qw(lib List Util XS.pm));
+
+  # When installing pure perl, install XS.pp as XS.pm
+  $self->{PM}{'XS.pp'} = delete $self->{PM}{$pm_file};
 }
+
diff -urN perl-5.10.0.orig/ext/List/Util/Util.xs perl-5.10.0/ext/List/Util/Util.xs
--- perl-5.10.0.orig/ext/List/Util/Util.xs	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/Util.xs	2009-05-13 23:59:43.000000000 +0200
@@ -147,18 +147,38 @@
     int index;
     NV retval;
     SV *retsv;
+    int magic;
     if(!items) {
 	XSRETURN_UNDEF;
     }
     retsv = ST(0);
-    retval = slu_sv_value(retsv);
+    magic = SvAMAGIC(retsv);
+    if (!magic) {
+      retval = slu_sv_value(retsv);
+    }
     for(index = 1 ; index < items ; index++) {
 	SV *stacksv = ST(index);
-	NV val = slu_sv_value(stacksv);
-	if(val < retval ? !ix : ix) {
-	    retsv = stacksv;
-	    retval = val;
-	}
+        SV *tmpsv;
+        if ((magic || SvAMAGIC(stacksv)) && (tmpsv = amagic_call(retsv, stacksv, gt_amg, 0))) {
+             if (SvTRUE(tmpsv) ? !ix : ix) {
+                  retsv = stacksv;
+                  magic = SvAMAGIC(retsv);
+                  if (!magic) {
+                      retval = slu_sv_value(retsv);
+                  }
+             }
+        }
+        else {
+            NV val = slu_sv_value(stacksv);
+            if (magic) {
+                retval = slu_sv_value(retsv);
+                magic = 0;
+            }
+            if(val < retval ? !ix : ix) {
+                retsv = stacksv;
+                retval = val;
+            }
+        }
     }
     ST(0) = retsv;
     XSRETURN(1);
@@ -166,25 +186,49 @@
 
 
 
-NV
+void
 sum(...)
 PROTOTYPE: @
 CODE:
 {
     SV *sv;
+    SV *retsv = NULL;
     int index;
+    int magic;
+    NV retval = 0;
     if(!items) {
 	XSRETURN_UNDEF;
     }
     sv = ST(0);
-    RETVAL = slu_sv_value(sv);
+    if (SvAMAGIC(sv)) {
+        retsv = sv_newmortal();
+        sv_setsv(retsv, sv);
+    }
+    else {
+        retval = slu_sv_value(sv);
+    }
     for(index = 1 ; index < items ; index++) {
 	sv = ST(index);
-	RETVAL += slu_sv_value(sv);
+        if (retsv || SvAMAGIC(sv)) {
+            if (!retsv) {
+                retsv = sv_newmortal();
+                sv_setnv(retsv,retval);
+            }
+            if (!amagic_call(retsv, sv, add_amg, AMGf_assign)) {
+                sv_setnv(retsv, SvNV(retsv) + SvNV(sv));
+            }
+        }
+        else {
+          retval += slu_sv_value(sv);
+        }
+    }
+    if (!retsv) {
+        retsv = sv_newmortal();
+        sv_setnv(retsv,retval);
     }
+    ST(0) = retsv;
+    XSRETURN(1);
 }
-OUTPUT:
-    RETVAL
 
 
 void
@@ -252,6 +296,9 @@
 	XSRETURN_UNDEF;
     }
     cv = sv_2cv(block, &stash, &gv, 0);
+    if (cv == Nullcv) {
+       croak("Not a subroutine reference");
+    }
     PUSH_MULTICALL(cv);
     agv = gv_fetchpv("a", TRUE, SVt_PV);
     bgv = gv_fetchpv("b", TRUE, SVt_PV);
@@ -485,6 +532,13 @@
 	SV *sv
 PROTOTYPE: $
 CODE:
+  SV *tempsv;
+  if (SvAMAGIC(sv) && (tempsv = AMG_CALLun(sv, numer))) {
+    sv = tempsv;
+  }
+  else if (SvMAGICAL(sv)) {
+      SvGETMAGIC(sv);
+  }
 #if (PERL_VERSION < 8) || (PERL_VERSION == 8 && PERL_SUBVERSION <5)
   if (SvPOK(sv) || SvPOKp(sv)) {
     RETVAL = looks_like_number(sv);
diff -urN perl-5.10.0.orig/ext/List/Util/lib/List/Util/PP.pm perl-5.10.0/ext/List/Util/lib/List/Util/PP.pm
--- perl-5.10.0.orig/ext/List/Util/lib/List/Util/PP.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/List/Util/lib/List/Util/PP.pm	2009-07-08 17:22:59.000000000 +0200
@@ -0,0 +1,75 @@
+# List::Util::PP.pm
+#
+# Copyright (c) 1997-2009 Graham Barr <gbarr at pobox.com>. All rights reserved.
+# This program is free software; you can redistribute it and/or
+# modify it under the same terms as Perl itself.
+
+package List::Util::PP;
+
+use strict;
+use warnings;
+use vars qw(@ISA @EXPORT $VERSION $a $b);
+require Exporter;
+
+ at ISA     = qw(Exporter);
+ at EXPORT  = qw(first min max minstr maxstr reduce sum shuffle);
+$VERSION = "1.21";
+$VERSION = eval $VERSION;
+
+sub reduce (&@) {
+  my $code = shift;
+  unless(ref($code)) {
+    require Carp;
+    Carp::croak("Not a subroutine reference");
+  }
+  no strict 'refs';
+
+  return shift unless @_ > 1;
+
+  use vars qw($a $b);
+
+  my $caller = caller;
+  local(*{$caller."::a"}) = \my $a;
+  local(*{$caller."::b"}) = \my $b;
+
+  $a = shift;
+  foreach (@_) {
+    $b = $_;
+    $a = &{$code}();
+  }
+
+  $a;
+}
+
+sub first (&@) {
+  my $code = shift;
+
+  foreach (@_) {
+    return $_ if &{$code}();
+  }
+
+  undef;
+}
+
+
+sub sum (@) { reduce { $a + $b } @_ }
+
+sub min (@) { reduce { $a < $b ? $a : $b } @_ }
+
+sub max (@) { reduce { $a > $b ? $a : $b } @_ }
+
+sub minstr (@) { reduce { $a lt $b ? $a : $b } @_ }
+
+sub maxstr (@) { reduce { $a gt $b ? $a : $b } @_ }
+
+sub shuffle (@) {
+  my @a=\(@_);
+  my $n;
+  my $i=@_;
+  map {
+    $n = rand($i--);
+    (${$a[$n]}, $a[$n] = $a[$i])[0];
+  } @_;
+}
+
+1;
diff -urN perl-5.10.0.orig/ext/List/Util/lib/List/Util/XS.pm perl-5.10.0/ext/List/Util/lib/List/Util/XS.pm
--- perl-5.10.0.orig/ext/List/Util/lib/List/Util/XS.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/List/Util/lib/List/Util/XS.pm	2009-07-08 17:22:59.000000000 +0200
@@ -0,0 +1,45 @@
+package List::Util::XS;
+use strict;
+use vars qw($VERSION);
+use List::Util;
+
+$VERSION = "1.21";           # FIXUP
+$VERSION = eval $VERSION;    # FIXUP
+
+sub _VERSION { # FIXUP
+  require Carp;
+  Carp::croak("You need to install Scalar-List-Utils with a C compiler to ensure the XS is compiled")
+    if defined $_[1];
+  $VERSION;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+List::Util::XS - Indicate if List::Util was compiled with a C compiler
+
+=head1 SYNOPSIS
+
+    use List::Util::XS 1.20;
+
+=head1 DESCRIPTION
+
+C<List::Util::XS> can be used as a dependency to ensure List::Util was
+installed using a C compiler and that the XS version is installed.
+
+During installation C<$List::Util::XS::VERSION> will be set to
+C<undef> if the XS was not compiled.
+
+=head1 SEE ALSO
+
+L<Scalar::Util>, L<List::Util>, L<List::MoreUtils>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2008 Graham Barr <gbarr at pobox.com>. All rights reserved.
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+=cut
diff -urN perl-5.10.0.orig/ext/List/Util/lib/List/Util.pm perl-5.10.0/ext/List/Util/lib/List/Util.pm
--- perl-5.10.0.orig/ext/List/Util/lib/List/Util.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/lib/List/Util.pm	2009-07-08 17:22:59.000000000 +0200
@@ -1,8 +1,10 @@
 # List::Util.pm
 #
-# Copyright (c) 1997-2006 Graham Barr <gbarr at pobox.com>. All rights reserved.
+# Copyright (c) 1997-2009 Graham Barr <gbarr at pobox.com>. All rights reserved.
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
+#
+# This module is normally only loaded if the XS module is not available
 
 package List::Util;
 
@@ -12,7 +14,7 @@
 
 @ISA        = qw(Exporter);
 @EXPORT_OK  = qw(first min max minstr maxstr reduce sum shuffle);
-$VERSION    = "1.19";
+$VERSION    = "1.21";
 $XS_VERSION = $VERSION;
 $VERSION    = eval $VERSION;
 
@@ -32,73 +34,11 @@
 } unless $TESTING_PERL_ONLY;
 
 
-# This code is only compiled if the XS did not load
-# of for perl < 5.6.0
-
-if (!defined &reduce) {
-eval <<'ESQ' 
-
-sub reduce (&@) {
-  my $code = shift;
-  no strict 'refs';
-
-  return shift unless @_ > 1;
-
-  use vars qw($a $b);
-
-  my $caller = caller;
-  local(*{$caller."::a"}) = \my $a;
-  local(*{$caller."::b"}) = \my $b;
-
-  $a = shift;
-  foreach (@_) {
-    $b = $_;
-    $a = &{$code}();
-  }
-
-  $a;
-}
-
-sub first (&@) {
-  my $code = shift;
-
-  foreach (@_) {
-    return $_ if &{$code}();
-  }
-
-  undef;
-}
-
-ESQ
-}
-
-# This code is only compiled if the XS did not load
-eval <<'ESQ' if !defined &sum;
-
-use vars qw($a $b);
-
-sub sum (@) { reduce { $a + $b } @_ }
-
-sub min (@) { reduce { $a < $b ? $a : $b } @_ }
-
-sub max (@) { reduce { $a > $b ? $a : $b } @_ }
-
-sub minstr (@) { reduce { $a lt $b ? $a : $b } @_ }
-
-sub maxstr (@) { reduce { $a gt $b ? $a : $b } @_ }
-
-sub shuffle (@) {
-  my @a=\(@_);
-  my $n;
-  my $i=@_;
-  map {
-    $n = rand($i--);
-    (${$a[$n]}, $a[$n] = $a[$i])[0];
-  } @_;
+if (!defined &sum) {
+  require List::Util::PP;
+  List::Util::PP->import;
 }
 
-ESQ
-
 1;
 
 __END__
@@ -212,6 +152,12 @@
     $foo = reduce { $a + $b } 1 .. 10               # sum
     $foo = reduce { $a . $b } @bar                  # concat
 
+If your algorithm requires that C<reduce> produce an identity value, then
+make sure that you always pass that identity value as the first argument to prevent
+C<undef> being returned
+
+  $foo = reduce { $a + $b } 0, @values;             # sum with 0 identity value
+
 =item shuffle LIST
 
 Returns the elements of LIST in a random order
@@ -231,6 +177,12 @@
 
     $foo = reduce { $a + $b } 1..10
 
+If your algorithm requires that C<sum> produce an identity of 0, then
+make sure that you always pass C<0> as the first argument to prevent
+C<undef> being returned
+
+  $foo = sum 0, @values;
+
 =back
 
 =head1 KNOWN BUGS
@@ -274,7 +226,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (c) 1997-2006 Graham Barr <gbarr at pobox.com>. All rights reserved.
+Copyright (c) 1997-2007 Graham Barr <gbarr at pobox.com>. All rights reserved.
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
diff -urN perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util/PP.pm perl-5.10.0/ext/List/Util/lib/Scalar/Util/PP.pm
--- perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util/PP.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/List/Util/lib/Scalar/Util/PP.pm	2009-07-08 17:22:59.000000000 +0200
@@ -0,0 +1,109 @@
+# Scalar::Util::PP.pm
+#
+# Copyright (c) 1997-2009 Graham Barr <gbarr at pobox.com>. All rights reserved.
+# This program is free software; you can redistribute it and/or
+# modify it under the same terms as Perl itself.
+#
+# This module is normally only loaded if the XS module is not available
+
+package Scalar::Util::PP;
+
+use strict;
+use warnings;
+use vars qw(@ISA @EXPORT $VERSION $recurse);
+require Exporter;
+use B qw(svref_2object);
+
+ at ISA     = qw(Exporter);
+ at EXPORT  = qw(blessed reftype tainted readonly refaddr looks_like_number);
+$VERSION = "1.21";
+$VERSION = eval $VERSION;
+
+sub blessed ($) {
+  return undef unless length(ref($_[0]));
+  my $b = svref_2object($_[0]);
+  return undef unless $b->isa('B::PVMG');
+  my $s = $b->SvSTASH;
+  return $s->isa('B::HV') ? $s->NAME : undef;
+}
+
+sub refaddr($) {
+  return undef unless length(ref($_[0]));
+
+  my $addr;
+  if(defined(my $pkg = blessed($_[0]))) {
+    $addr .= bless $_[0], 'Scalar::Util::Fake';
+    bless $_[0], $pkg;
+  }
+  else {
+    $addr .= $_[0]
+  }
+
+  $addr =~ /0x(\w+)/;
+  local $^W;
+  hex($1);
+}
+
+{
+  my %tmap = qw(
+    B::HV HASH
+    B::AV ARRAY
+    B::CV CODE
+    B::IO IO
+    B::NULL SCALAR
+    B::NV SCALAR
+    B::PV SCALAR
+    B::GV GLOB
+    B::RV REF
+    B::REGEXP REGEXP
+  );
+
+  sub reftype ($) {
+    my $r = shift;
+
+    return undef unless length(ref($r));
+
+    my $t = ref(svref_2object($r));
+
+    return
+        exists $tmap{$t} ? $tmap{$t}
+      : length(ref($$r)) ? 'REF'
+      :                    'SCALAR';
+  }
+}
+
+sub tainted {
+  local($@, $SIG{__DIE__}, $SIG{__WARN__});
+  local $^W = 0;
+  no warnings;
+  eval { kill 0 * $_[0] };
+  $@ =~ /^Insecure/;
+}
+
+sub readonly {
+  return 0 if tied($_[0]) || (ref(\($_[0])) ne "SCALAR");
+
+  local($@, $SIG{__DIE__}, $SIG{__WARN__});
+  my $tmp = $_[0];
+
+  !eval { $_[0] = $tmp; 1 };
+}
+
+sub looks_like_number {
+  local $_ = shift;
+
+  # checks from perlfaq4
+  return 0 if !defined($_);
+  if (ref($_)) {
+    require overload;
+    return overload::Overloaded($_) ? defined(0 + $_) : 0;
+  }
+  return 1 if (/^[+-]?\d+$/); # is a +/- integer
+  return 1 if (/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/); # a C float
+  return 1 if ($] >= 5.008 and /^(Inf(inity)?|NaN)$/i) or ($] >= 5.006001 and /^Inf$/i);
+
+  0;
+}
+
+
+1;
diff -urN perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util.pm perl-5.10.0/ext/List/Util/lib/Scalar/Util.pm
--- perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/lib/Scalar/Util.pm	2009-07-08 17:22:59.000000000 +0200
@@ -1,34 +1,46 @@
 # Scalar::Util.pm
 #
-# Copyright (c) 1997-2006 Graham Barr <gbarr at pobox.com>. All rights reserved.
+# Copyright (c) 1997-2007 Graham Barr <gbarr at pobox.com>. All rights reserved.
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
 
 package Scalar::Util;
 
 use strict;
-use vars qw(@ISA @EXPORT_OK $VERSION);
+use vars qw(@ISA @EXPORT_OK $VERSION @EXPORT_FAIL);
 require Exporter;
 require List::Util; # List::Util loads the XS
 
 @ISA       = qw(Exporter);
 @EXPORT_OK = qw(blessed dualvar reftype weaken isweak tainted readonly openhandle refaddr isvstring looks_like_number set_prototype);
-$VERSION    = "1.19";
+$VERSION    = "1.21";
 $VERSION   = eval $VERSION;
 
+unless (defined &dualvar) {
+  # Load Pure Perl version if XS not loaded
+  require Scalar::Util::PP;
+  Scalar::Util::PP->import;
+  push @EXPORT_FAIL, qw(weaken isweak dualvar isvstring set_prototype);
+}
+
 sub export_fail {
+  if (grep { /dualvar/ } @EXPORT_FAIL) { # no XS loaded
+    my $pat = join("|", @EXPORT_FAIL);
+    if (my ($err) = grep { /^($pat)$/ } @_ ) {
+      require Carp;
+      Carp::croak("$err is only available with the XS version of Scalar::Util");
+    }
+  }
+
   if (grep { /^(weaken|isweak)$/ } @_ ) {
     require Carp;
     Carp::croak("Weak references are not implemented in the version of perl");
   }
+
   if (grep { /^(isvstring)$/ } @_ ) {
     require Carp;
     Carp::croak("Vstrings are not implemented in the version of perl");
   }
-  if (grep { /^(dualvar|set_prototype)$/ } @_ ) {
-    require Carp;
-    Carp::croak("$1 is only avaliable with the XS version");
-  }
 
   @_;
 }
@@ -51,96 +63,6 @@
     ? $fh : undef;
 }
 
-eval <<'ESQ' unless defined &dualvar;
-
-use vars qw(@EXPORT_FAIL);
-push @EXPORT_FAIL, qw(weaken isweak dualvar isvstring set_prototype);
-
-# The code beyond here is only used if the XS is not installed
-
-# Hope nobody defines a sub by this name
-sub UNIVERSAL::a_sub_not_likely_to_be_here { ref($_[0]) }
-
-sub blessed ($) {
-  local($@, $SIG{__DIE__}, $SIG{__WARN__});
-  length(ref($_[0]))
-    ? eval { $_[0]->a_sub_not_likely_to_be_here }
-    : undef
-}
-
-sub refaddr($) {
-  my $pkg = ref($_[0]) or return undef;
-  if (blessed($_[0])) {
-    bless $_[0], 'Scalar::Util::Fake';
-  }
-  else {
-    $pkg = undef;
-  }
-  "$_[0]" =~ /0x(\w+)/;
-  my $i = do { local $^W; hex $1 };
-  bless $_[0], $pkg if defined $pkg;
-  $i;
-}
-
-sub reftype ($) {
-  local($@, $SIG{__DIE__}, $SIG{__WARN__});
-  my $r = shift;
-  my $t;
-
-  length($t = ref($r)) or return undef;
-
-  # This eval will fail if the reference is not blessed
-  eval { $r->a_sub_not_likely_to_be_here; 1 }
-    ? do {
-      $t = eval {
-	  # we have a GLOB or an IO. Stringify a GLOB gives it's name
-	  my $q = *$r;
-	  $q =~ /^\*/ ? "GLOB" : "IO";
-	}
-	or do {
-	  # OK, if we don't have a GLOB what parts of
-	  # a glob will it populate.
-	  # NOTE: A glob always has a SCALAR
-	  local *glob = $r;
-	  defined *glob{ARRAY} && "ARRAY"
-	  or defined *glob{HASH} && "HASH"
-	  or defined *glob{CODE} && "CODE"
-	  or length(ref(${$r})) ? "REF" : "SCALAR";
-	}
-    }
-    : $t
-}
-
-sub tainted {
-  local($@, $SIG{__DIE__}, $SIG{__WARN__});
-  local $^W = 0;
-  eval { kill 0 * $_[0] };
-  $@ =~ /^Insecure/;
-}
-
-sub readonly {
-  return 0 if tied($_[0]) || (ref(\($_[0])) ne "SCALAR");
-
-  local($@, $SIG{__DIE__}, $SIG{__WARN__});
-  my $tmp = $_[0];
-
-  !eval { $_[0] = $tmp; 1 };
-}
-
-sub looks_like_number {
-  local $_ = shift;
-
-  # checks from perlfaq4
-  return 0 if !defined($_) or ref($_);
-  return 1 if (/^[+-]?\d+$/); # is a +/- integer
-  return 1 if (/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/); # a C float
-  return 1 if ($] >= 5.008 and /^(Inf(inity)?|NaN)$/i) or ($] >= 5.006001 and /^Inf$/i);
-
-  0;
-}
-
-ESQ
-
 1;
 
 __END__
@@ -153,6 +75,7 @@
 
     use Scalar::Util qw(blessed dualvar isweak readonly refaddr reftype tainted
                         weaken isvstring looks_like_number set_prototype);
+                        # and other useful utils appearing below
 
 =head1 DESCRIPTION
 
@@ -209,7 +132,7 @@
 B<NOTE>: Copying a weak reference creates a normal, strong, reference.
 
     $copy = $ref;
-    $weak = isweak($ref);               # false
+    $weak = isweak($copy);              # false
 
 =item looks_like_number EXPR
 
@@ -310,6 +233,32 @@
 
 =back
 
+=head1 DIAGNOSTICS
+
+Module use may give one of the following errors during import.
+
+=over
+
+=item Weak references are not implemented in the version of perl
+
+The version of perl that you are using does not implement weak references, to use
+C<isweak> or C<weaken> you will need to use a newer release of perl.
+
+=item Vstrings are not implemented in the version of perl
+
+The version of perl that you are using does not implement Vstrings, to use
+C<isvstring> you will need to use a newer release of perl.
+
+=item C<NAME> is only available with the XS version of Scalar::Util
+
+C<Scalar::Util> contains both perl and C implementations of many of its functions
+so that those without access to a C compiler may still use it. However some of the functions
+are only available when a C compiler was available to compile the XS version of the extension.
+
+At present that list is: weaken, isweak, dualvar, isvstring, set_prototype
+
+=back
+
 =head1 KNOWN BUGS
 
 There is a bug in perl5.6.0 with UV's that are >= 1<<31. This will
@@ -321,7 +270,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (c) 1997-2006 Graham Barr <gbarr at pobox.com>. All rights reserved.
+Copyright (c) 1997-2007 Graham Barr <gbarr at pobox.com>. All rights reserved.
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
 
@@ -331,11 +280,4 @@
 This program is free software; you can redistribute it and/or modify it
 under the same terms as perl itself.
 
-=head1 BLATANT PLUG
-
-The weaken and isweak subroutines in this module and the patch to the core Perl
-were written in connection  with the APress book `Tuomas J. Lukka's Definitive
-Guide to Object-Oriented Programming in Perl', to avoid explaining why certain
-things would have to be done in cumbersome ways.
-
 =cut
diff -urN perl-5.10.0.orig/ext/List/Util/t/00version.t perl-5.10.0/ext/List/Util/t/00version.t
--- perl-5.10.0.orig/ext/List/Util/t/00version.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/00version.t	2009-07-08 17:22:59.000000000 +0200
@@ -15,8 +15,11 @@
 
 use Scalar::Util ();
 use List::Util ();
-use Test::More tests => 1;
+use List::Util::XS ();
+use Test::More tests => 2;
 
 is( $Scalar::Util::VERSION, $List::Util::VERSION, "VERSION mismatch");
-
+my $has_xs = eval { Scalar::Util->import('dualvar'); 1 };
+my $xs_version = $has_xs ? $List::Util::VERSION : undef;
+is( $List::Util::XS::VERSION, $xs_version, "XS VERSION");
 
diff -urN perl-5.10.0.orig/ext/List/Util/t/blessed.t perl-5.10.0/ext/List/Util/t/blessed.t
--- perl-5.10.0.orig/ext/List/Util/t/blessed.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/blessed.t	2009-07-08 17:22:59.000000000 +0200
@@ -13,7 +13,7 @@
     }
 }
 
-use Test::More tests => 8;
+use Test::More tests => 11;
 use Scalar::Util qw(blessed);
 use vars qw($t $x);
 
@@ -29,3 +29,26 @@
 
 $x = bless {}, "DEF";
 is(blessed($x), "DEF",	'blessed HASH-ref');
+
+$x = bless {}, "0";
+cmp_ok(blessed($x), "eq", "0",	'blessed HASH-ref');
+
+{
+  my $depth;
+  {
+    no warnings 'redefine';
+    *UNIVERSAL::can = sub { die "Burp!" if ++$depth > 2; blessed(shift) };
+  }
+  $x = bless {}, "DEF";
+  is(blessed($x), "DEF", 'recursion of UNIVERSAL::can');
+}
+
+{
+  package Broken;
+  sub isa { die };
+  sub can { die };
+
+  my $obj = bless [], __PACKAGE__;
+  ::is( ::blessed($obj), __PACKAGE__, "blessed on broken isa() and can()" );
+}
+
diff -urN perl-5.10.0.orig/ext/List/Util/t/dualvar.t perl-5.10.0/ext/List/Util/t/dualvar.t
--- perl-5.10.0.orig/ext/List/Util/t/dualvar.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/dualvar.t	2009-07-08 17:22:59.000000000 +0200
@@ -42,9 +42,12 @@
 
 ok( $var == $numstr,	'NV');
 
-$var = dualvar(1<<31, "");
-ok( $var == (1<<31),	'UV 1');
-ok( $var > 0,		'UV 2');
+SKIP: {
+  skip("dualvar with UV value known to fail with $]",2) if $] < 5.006_001;
+  $var = dualvar(1<<31, "");
+  ok( $var == (1<<31),	'UV 1');
+  ok( $var > 0,		'UV 2');
+}
 
 tie my $tied, 'Tied';
 $var = dualvar($tied, "ok");
diff -urN perl-5.10.0.orig/ext/List/Util/t/expfail.t perl-5.10.0/ext/List/Util/t/expfail.t
--- perl-5.10.0.orig/ext/List/Util/t/expfail.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/expfail.t	2009-07-08 17:22:59.000000000 +0200
@@ -0,0 +1,29 @@
+#!./perl
+
+BEGIN {
+    unless (-d 'blib') {
+	chdir 't' if -d 't';
+	@INC = '../lib';
+	require Config; import Config;
+	keys %Config; # Silence warning
+	if ($Config{extensions} !~ /\bList\/Util\b/) {
+	    print "1..0 # Skip: List::Util was not built\n";
+	    exit 0;
+	}
+    }
+}
+
+use Test::More tests => 3;
+use strict;
+
+$List::Util::TESTING_PERL_ONLY = $List::Util::TESTING_PERL_ONLY = 1;
+require Scalar::Util;
+
+for my $func (qw(dualvar set_prototype weaken)) {
+	eval { Scalar::Util->import($func); };
+	like(
+	    $@,
+ 	    qr/$func is only available with the XS/,
+ 	    "no pure perl $func: error raised",
+	);
+}
diff -urN perl-5.10.0.orig/ext/List/Util/t/lln.t perl-5.10.0/ext/List/Util/t/lln.t
--- perl-5.10.0.orig/ext/List/Util/t/lln.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/lln.t	2009-07-08 17:22:59.000000000 +0200
@@ -14,7 +14,7 @@
 }
 
 use strict;
-use Test::More tests => 16;
+use Test::More tests => 18;
 use Scalar::Util qw(looks_like_number);
 
 foreach my $num (qw(1 -1 +1 1.0 +1.0 -1.0 -1.0e-12)) {
@@ -31,7 +31,16 @@
 
 use Math::BigInt;
 my $bi = Math::BigInt->new('1234567890');
-is(!!looks_like_number($bi),	    '',			'Math::BigInt');
+is(!!looks_like_number($bi),	    1,			'Math::BigInt');
 is(!!looks_like_number("$bi"),	    1,			'Stringified Math::BigInt');
 
+{ package Foo;
+sub TIEHASH { bless {} }
+sub FETCH { $_[1] }
+}
+my %foo;
+tie %foo, 'Foo';
+is(!!looks_like_number($foo{'abc'}),	    '',			'Tied');
+is(!!looks_like_number($foo{'123'}),	    1,			'Tied');
+
 # We should copy some of perl core tests like t/base/num.t here
diff -urN perl-5.10.0.orig/ext/List/Util/t/max.t perl-5.10.0/ext/List/Util/t/max.t
--- perl-5.10.0.orig/ext/List/Util/t/max.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/max.t	2009-07-08 17:22:59.000000000 +0200
@@ -14,7 +14,7 @@
 }
 
 use strict;
-use Test::More tests => 5;
+use Test::More tests => 8;
 use List::Util qw(max);
 
 my $v;
@@ -34,3 +34,36 @@
 my @b = sort { $a <=> $b } @a;
 $v = max(@a);
 is($v, $b[-1], '20-arg random order');
+
+my $one = Foo->new(1);
+my $two = Foo->new(2);
+my $thr = Foo->new(3);
+
+$v = max($one,$two,$thr);
+is($v, 3, 'overload');
+
+$v = max($thr,$two,$one);
+is($v, 3, 'overload');
+
+{ package Foo;
+
+use overload
+  '""' => sub { ${$_[0]} },
+  '+0' => sub { ${$_[0]} },
+  fallback => 1;
+  sub new {
+    my $class = shift;
+    my $value = shift;
+    bless \$value, $class;
+  }
+}
+
+SKIP: {
+  eval { require bignum; } or skip("Need bignum for testing overloading",1);
+
+  my $v1 = 2**65;
+  my $v2 = $v1 - 1;
+  my $v3 = $v2 - 1;
+  $v = max($v1,$v2,$v1,$v3,$v1);
+  is($v, $v1, 'bigint');
+}
diff -urN perl-5.10.0.orig/ext/List/Util/t/min.t perl-5.10.0/ext/List/Util/t/min.t
--- perl-5.10.0.orig/ext/List/Util/t/min.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/min.t	2009-07-08 17:22:59.000000000 +0200
@@ -14,7 +14,7 @@
 }
 
 use strict;
-use Test::More tests => 5;
+use Test::More tests => 8;
 use List::Util qw(min);
 
 my $v;
@@ -34,3 +34,36 @@
 my @b = sort { $a <=> $b } @a;
 $v = min(@a);
 is($v, $b[0], '20-arg random order');
+
+my $one = Foo->new(1);
+my $two = Foo->new(2);
+my $thr = Foo->new(3);
+
+$v = min($one,$two,$thr);
+is($v, 1, 'overload');
+
+$v = min($thr,$two,$one);
+is($v, 1, 'overload');
+
+{ package Foo;
+
+use overload
+  '""' => sub { ${$_[0]} },
+  '+0' => sub { ${$_[0]} },
+  fallback => 1;
+  sub new {
+    my $class = shift;
+    my $value = shift;
+    bless \$value, $class;
+  }
+}
+
+SKIP: {
+  eval { require bignum; } or skip("Need bignum for testing overloading",1);
+
+  my $v1 = 2**65;
+  my $v2 = $v1 - 1;
+  my $v3 = $v2 - 1;
+  $v = min($v1,$v2,$v1,$v3,$v1);
+  is($v, $v3, 'bigint');
+}
diff -urN perl-5.10.0.orig/ext/List/Util/t/openhan.t perl-5.10.0/ext/List/Util/t/openhan.t
--- perl-5.10.0.orig/ext/List/Util/t/openhan.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/openhan.t	2009-07-08 17:22:59.000000000 +0200
@@ -14,16 +14,76 @@
 }
 
 use strict;
-use vars qw(*CLOSED);
-use Test::More tests => 4;
+
+use Test::More tests => 14;
 use Scalar::Util qw(openhandle);
 
 ok(defined &openhandle, 'defined');
 
-my $fh = \*STDERR;
-is(openhandle($fh), $fh, 'STDERR');
+{
+    my $fh = \*STDERR;
+    is(openhandle($fh), $fh, 'STDERR');
+
+    is(fileno(openhandle(*STDERR)), fileno(STDERR), 'fileno(STDERR)');
+}
+
+{
+    use vars qw(*CLOSED);
+    is(openhandle(*CLOSED), undef, 'closed');
+}
+
+SKIP: {
+    skip "3-arg open only on 5.6 or later", 1 if $]<5.006;
+
+    open my $fh, "<", $0;
+    skip "could not open $0 for reading: $!", 1 unless $fh;
+    is(openhandle($fh), $fh, "works with indirect filehandles");
+}
 
-is(fileno(openhandle(*STDERR)), fileno(STDERR), 'fileno(STDERR)');
+SKIP: {
+    skip "in-memory files only on 5.8 or later", 1 if $]<5.008;
+
+    open my $fh, "<", \"in-memory file";
+    skip "could not open in-memory file: $!", 1 unless $fh;
+    is(openhandle($fh), $fh, "works with in-memory files");
+}
 
-is(openhandle(*CLOSED), undef, 'closed');
+ok(openhandle(\*DATA), "works for \*DATA");
+ok(openhandle(*DATA), "works for *DATA");
+ok(openhandle(*DATA{IO}), "works for *DATA{IO}");
+
+{
+    require IO::Handle;
+    my $fh = IO::Handle->new_from_fd(fileno(*STDERR), 'w');
+    skip "new_from_fd(fileno(*STDERR)) failed", 1 unless $fh;
+    ok(openhandle($fh), "works for IO::Handle objects");
+
+    ok(!openhandle(IO::Handle->new), "unopened IO::Handle");
+}
+
+{
+    require IO::File;
+    my $fh = IO::File->new;
+    $fh->open("< $0")
+        or skip "could not open $0: $!", 1;
+    ok(openhandle($fh), "works for IO::File objects");
+
+    ok(!openhandle(IO::File->new), "unopened IO::File" );
+}
+
+SKIP: {
+    skip( "Tied handles only on 5.8 or later", 1) if $]<5.008;
+
+    use vars qw(*H);
+
+    package My::Tie;
+    require Tie::Handle;
+    @My::Tie::ISA = qw(Tie::Handle);
+    sub TIEHANDLE { bless {} }
+
+    package main;
+    tie *H, 'My::Tie';
+    ok(openhandle(*H), "tied handles are always ok");
+}
 
+__DATA__
diff -urN perl-5.10.0.orig/ext/List/Util/t/p_00version.t perl-5.10.0/ext/List/Util/t/p_00version.t
--- perl-5.10.0.orig/ext/List/Util/t/p_00version.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/p_00version.t	2009-07-08 17:22:59.000000000 +0200
@@ -0,0 +1,26 @@
+#!./perl
+
+BEGIN {
+    unless (-d 'blib') {
+	chdir 't' if -d 't';
+	@INC = '../lib';
+	require Config; import Config;
+	keys %Config; # Silence warning
+	if ($Config{extensions} !~ /\bList\/Util\b/) {
+	    print "1..0 # Skip: List::Util was not built\n";
+	    exit 0;
+	}
+    }
+}
+
+use Test::More tests => 2;
+
+# force perl-only version to be tested
+$List::Util::TESTING_PERL_ONLY = $List::Util::TESTING_PERL_ONLY = 1;
+
+require Scalar::Util;
+require List::Util;
+
+is( $Scalar::Util::PP::VERSION, $List::Util::VERSION, "VERSION mismatch");
+is( $List::Util::PP::VERSION, $List::Util::VERSION, "VERSION mismatch");
+
diff -urN perl-5.10.0.orig/ext/List/Util/t/p_tainted.t perl-5.10.0/ext/List/Util/t/p_tainted.t
--- perl-5.10.0.orig/ext/List/Util/t/p_tainted.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/p_tainted.t	2009-07-08 17:24:47.000000000 +0200
@@ -6,5 +6,7 @@
 $List::Util::TESTING_PERL_ONLY = $List::Util::TESTING_PERL_ONLY = 1;
 
 (my $f = __FILE__) =~ s/p_//;
-my $filename = File::Spec->catfile(".", $f);
+my $filename = $^O eq 'MSWin32'
+             ? File::Spec->rel2abs(File::Spec->catfile(".", $f))
+             : File::Spec->catfile(".", $f);
 do $filename; die $@ if $@;
diff -urN perl-5.10.0.orig/ext/List/Util/t/reduce.t perl-5.10.0/ext/List/Util/t/reduce.t
--- perl-5.10.0.orig/ext/List/Util/t/reduce.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/reduce.t	2009-07-08 17:22:59.000000000 +0200
@@ -16,7 +16,7 @@
 
 use List::Util qw(reduce min);
 use Test::More;
-plan tests => ($::PERL_ONLY ? 21 : 23);
+plan tests => ($::PERL_ONLY ? 23 : 25);
 
 my $v = reduce {};
 
@@ -122,6 +122,16 @@
     is(&Internals::SvREFCNT(\&mult), $refcnt, "Refcount unchanged");
 }
 
+{
+  my $ok = 'failed';
+  local $SIG{__DIE__} = sub { $ok = $_[0] =~ /Not a (subroutine|CODE) reference/ ? '' : $_[0] };
+  eval { &reduce('foo',1,2) };
+  is($ok, '', 'Not a subroutine reference');
+  $ok = 'failed';
+  eval { &reduce({},1,2) };
+  is($ok, '', 'Not a subroutine reference');
+}
+
 # The remainder of the tests are only relevant for the XS
 # implementation. The Perl-only implementation behaves differently
 # (and more flexibly) in a way that we can't emulate from XS.
diff -urN perl-5.10.0.orig/ext/List/Util/t/refaddr.t perl-5.10.0/ext/List/Util/t/refaddr.t
--- perl-5.10.0.orig/ext/List/Util/t/refaddr.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/refaddr.t	2009-07-08 17:22:59.000000000 +0200
@@ -14,7 +14,7 @@
 }
 
 
-use Test::More tests => 29;
+use Test::More tests => 32;
 
 use Scalar::Util qw(refaddr);
 use vars qw($t $y $x *F $v $r);
@@ -58,11 +58,22 @@
   ok(refaddr($x{$y}));
   ok(refaddr($x{$b}));
 }
+{
+  my $z = bless {}, '0';
+  ok(refaddr($z));
+  @{"0::ISA"} = qw(FooBar);
+  my $a = {};
+  my $r = refaddr($a);
+  $z = bless $a, '0';
+  ok(refaddr($z) > 10);
+  is(refaddr($z),$r,"foo");
+}
 
 package FooBar;
 
 use overload  '0+' => sub { 10 },
-		'+' => sub { 10 + $_[1] };
+		'+' => sub { 10 + $_[1] },
+		'"' => sub { "10" };
 
 package MyTie;
 
diff -urN perl-5.10.0.orig/ext/List/Util/t/reftype.t perl-5.10.0/ext/List/Util/t/reftype.t
--- perl-5.10.0.orig/ext/List/Util/t/reftype.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/reftype.t	2009-07-08 17:22:59.000000000 +0200
@@ -13,7 +13,7 @@
     }
 }
 
-use Test::More tests => 23;
+use Test::More tests => 29;
 
 use Scalar::Util qw(reftype);
 use vars qw($t $y $x *F);
@@ -21,6 +21,7 @@
 
 # Ensure we do not trigger and tied methods
 tie *F, 'MyTie';
+my $RE = $] < 5.011 ? 'SCALAR' : 'REGEXP';
 
 @test = (
  [ undef, 1,		'number'	],
@@ -32,7 +33,8 @@
  [ GLOB   => \*F,	'tied GLOB ref'	],
  [ GLOB   => gensym,	'GLOB ref'	],
  [ CODE   => sub {},	'CODE ref'	],
-# [ IO => *STDIN{IO} ] the internal sv_reftype returns UNKNOWN
+ [ IO     => *STDIN{IO},'IO ref'        ],
+ [ $RE    => qr/x/,     'REGEEXP'       ],
 );
 
 foreach $test (@test) {
diff -urN perl-5.10.0.orig/ext/List/Util/t/stack-corruption.t perl-5.10.0/ext/List/Util/t/stack-corruption.t
--- perl-5.10.0.orig/ext/List/Util/t/stack-corruption.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/stack-corruption.t	2009-07-08 17:22:59.000000000 +0200
@@ -0,0 +1,30 @@
+#!./perl
+
+BEGIN {
+    unless (-d 'blib') {
+	chdir 't' if -d 't';
+	@INC = '../lib';
+	require Config; import Config;
+	keys %Config; # Silence warning
+	if ($Config{extensions} !~ /\bList\/Util\b/) {
+	    print "1..0 # Skip: List::Util was not built\n";
+	    exit 0;
+	}
+    }
+    if ($] eq "5.008009" or $] eq "5.010000" or $] le "5.006002") {
+        print "1..0 # Skip: known to fail on $]\n";
+        exit 0;
+    }
+}
+
+use List::Util qw(reduce);
+use Test::More tests => 1;
+
+my $ret = "original";
+$ret = $ret . broken();
+is($ret, "originalreturn");
+
+sub broken {
+    reduce { return "bogus"; } qw/some thing/;
+    return "return";
+}
diff -urN perl-5.10.0.orig/ext/List/Util/t/sum.t perl-5.10.0/ext/List/Util/t/sum.t
--- perl-5.10.0.orig/ext/List/Util/t/sum.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/sum.t	2009-07-08 17:22:59.000000000 +0200
@@ -13,7 +13,7 @@
     }
 }
 
-use Test::More tests => 6;
+use Test::More tests => 8;
 
 use List::Util qw(sum);
 
@@ -37,3 +37,33 @@
 $v = sum(-3.5,3);
 is( $v, -0.5, 'real numbers');
 
+my $one = Foo->new(1);
+my $two = Foo->new(2);
+my $thr = Foo->new(3);
+
+$v = sum($one,$two,$thr);
+is($v, 6, 'overload');
+
+
+{ package Foo;
+
+use overload
+  '""' => sub { ${$_[0]} },
+  '+0' => sub { ${$_[0]} },
+  fallback => 1;
+  sub new {
+    my $class = shift;
+    my $value = shift;
+    bless \$value, $class;
+  }
+}
+
+SKIP: {
+  eval { require bignum; } or skip("Need bignum for testing overloading",1);
+
+  my $v1 = 2**65;
+  my $v2 = 2**65;
+  my $v3 = $v1 + $v2;
+  $v = sum($v1,$v2);
+  is($v, $v3, 'bignum');
+}
diff -urN perl-5.10.0.orig/ext/List/Util/t/weak.t perl-5.10.0/ext/List/Util/t/weak.t
--- perl-5.10.0.orig/ext/List/Util/t/weak.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/List/Util/t/weak.t	2009-07-08 17:23:27.000000000 +0200
@@ -1,10 +1,11 @@
 #!./perl
 
+use strict;
+use Config;
 BEGIN {
     unless (-d 'blib') {
 	chdir 't' if -d 't';
 	@INC = '../lib';
-	require Config; import Config;
 	keys %Config; # Silence warning
 	if ($Config{extensions} !~ /\bList\/Util\b/) {
 	    print "1..0 # Skip: List::Util was not built\n";
@@ -14,7 +15,7 @@
 }
 
 use Scalar::Util ();
-use Test::More  (grep { /weaken/ } @Scalar::Util::EXPORT_FAIL)
+use Test::More  ((grep { /weaken/ } @Scalar::Util::EXPORT_FAIL) and !$ENV{PERL_CORE})
 			? (skip_all => 'weaken requires XS version')
 			: (tests => 22);
 
@@ -94,9 +95,9 @@
 # Case 3: a circular structure
 #
 
-$flag = 0;
+my $flag = 0;
 {
-	my $y = bless {}, Dest;
+	my $y = bless {}, 'Dest';
 	Dump($y);
 	print "# 1: $y\n";
 	$y->{Self} = $y;
@@ -126,8 +127,8 @@
 
 $flag = 0;
 {
-	my $y = bless {}, Dest;
-	my $x = bless {}, Dest;
+	my $y = bless {}, 'Dest';
+	my $x = bless {}, 'Dest';
 	$x->{Ref} = $y;
 	$y->{Ref} = $x;
 	$x->{Flag} = \$flag;
@@ -140,6 +141,7 @@
 # Case 5: deleting a weakref before the other one
 #
 
+my ($y,$z);
 {
 	my $x = "foo";
 	$y = \$x;
@@ -170,7 +172,7 @@
 $b = \$a;
 ok(!isweak($b));
 
-$x = {};
+my $x = {};
 weaken($x->{Y} = \$a);
 ok(isweak($x->{Y}));
 ok(!isweak($x->{Z}));

perl-update-Test-Simple.patch:
 MANIFEST                                              |   25 
 lib/Test/Builder.pm                                   | 1430 +++++++++++-------
 lib/Test/Builder/Module.pm                            |   39 
 lib/Test/Builder/Tester.pm                            |  249 +--
 lib/Test/Builder/Tester/Color.pm                      |    5 
 lib/Test/More.pm                                      |  592 ++++---
 lib/Test/Simple.pm                                    |   38 
 lib/Test/Simple/Changes                               |  226 ++
 lib/Test/Simple/README                                |    7 
 lib/Test/Simple/t/BEGIN_require_ok.t                  |   27 
 lib/Test/Simple/t/BEGIN_use_ok.t                      |   26 
 lib/Test/Simple/t/More.t                              |    9 
 lib/Test/Simple/t/bad_plan.t                          |   29 
 lib/Test/Simple/t/bail_out.t                          |   16 
 lib/Test/Simple/t/c_flag.t                            |   21 
 lib/Test/Simple/t/cmp_ok.t                            |   37 
 lib/Test/Simple/t/create.t                            |   21 
 lib/Test/Simple/t/curr_test.t                         |   11 
 lib/Test/Simple/t/current_test.t                      |   11 
 lib/Test/Simple/t/current_test_without_plan.t         |   16 
 lib/Test/Simple/t/details.t                           |   13 
 lib/Test/Simple/t/diag.t                              |   67 
 lib/Test/Simple/t/died.t                              |   45 
 lib/Test/Simple/t/done_testing.t                      |   12 
 lib/Test/Simple/t/done_testing_double.t               |   46 
 lib/Test/Simple/t/done_testing_plan_mismatch.t        |   44 
 lib/Test/Simple/t/done_testing_with_no_plan.t         |   11 
 lib/Test/Simple/t/done_testing_with_number.t          |   12 
 lib/Test/Simple/t/done_testing_with_plan.t            |   11 
 lib/Test/Simple/t/dont_overwrite_die_handler.t        |   19 
 lib/Test/Simple/t/exit.t                              |  134 -
 lib/Test/Simple/t/explain.t                           |   27 
 lib/Test/Simple/t/extra.t                             |    2 
 lib/Test/Simple/t/extra_one.t                         |    2 
 lib/Test/Simple/t/fail-like.t                         |   39 
 lib/Test/Simple/t/fail-more.t                         |  458 ++++-
 lib/Test/Simple/t/fail.t                              |   62 
 lib/Test/Simple/t/fail_one.t                          |   47 
 lib/Test/Simple/t/filehandles.t                       |    9 
 lib/Test/Simple/t/fork_with_new_stdout.t              |   54 
 lib/Test/Simple/t/is_deeply_dne_bug.t                 |   11 
 lib/Test/Simple/t/is_deeply_fail.t                    |    6 
 lib/Test/Simple/t/is_deeply_with_threads.t            |   11 
 lib/Test/Simple/t/lib/Dev/Null.pm                     |    8 
 lib/Test/Simple/t/lib/Dummy.pm                        |    5 
 lib/Test/Simple/t/lib/MyOverload.pm                   |   27 
 lib/Test/Simple/t/lib/SigDie.pm                       |    8 
 lib/Test/Simple/t/maybe_regex.t                       |   24 
 lib/Test/Simple/t/missing.t                           |    8 
 lib/Test/Simple/t/new_ok.t                            |   42 
 lib/Test/Simple/t/no_plan.t                           |   23 
 lib/Test/Simple/t/no_plan_at_all.t                    |   35 
 lib/Test/Simple/t/no_tests.t                          |   44 
 lib/Test/Simple/t/note.t                              |   30 
 lib/Test/Simple/t/output.t                            |  128 -
 lib/Test/Simple/t/overload.t                          |   44 
 lib/Test/Simple/t/overload_threads.t                  |   11 
 lib/Test/Simple/t/plan_bad.t                          |    5 
 lib/Test/Simple/t/plan_is_noplan.t                    |   46 
 lib/Test/Simple/t/reset.t                             |   77 
 lib/Test/Simple/t/reset_outputs.t                     |   35 
 lib/Test/Simple/t/skip.t                              |    2 
 lib/Test/Simple/t/skipall.t                           |   41 
 lib/Test/Simple/t/tbm_doesnt_set_exported_to.t        |   24 
 lib/Test/Simple/t/thread_taint.t                      |    2 
 lib/Test/Simple/t/todo.t                              |   86 +
 lib/Test/Simple/t/try.t                               |   37 
 lib/Test/Simple/t/undef.t                             |   32 
 lib/Test/Simple/t/use_ok.t                            |   11 
 lib/Test/Simple/t/utf8.t                              |   69 
 lib/Test/Simple/t/versions.t                          |   21 
 t/lib/Test/Builder/NoOutput.pm                        |  122 +
 t/lib/Test/Simple/Catch.pm                            |    6 
 t/lib/Test/Simple/sample_tests/death.plx              |    7 
 t/lib/Test/Simple/sample_tests/death_with_handler.plx |   20 
 t/lib/Test/Simple/sample_tests/last_minute_death.plx  |    7 
 t/lib/Test/Simple/sample_tests/too_few_fail.plx       |    2 
 t/lib/TieOut.pm                                       |    8 
 78 files changed, 3459 insertions(+), 1615 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-Test-Simple.patchIndex: perl-update-Test-Simple.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/F-11/perl-update-Test-Simple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-Test-Simple.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-Test-Simple.patch	18 Sep 2009 18:52:12 -0000	1.2
@@ -1,116 +1,13 @@
-Test-Simple-0.86
+Update to 0.92; patch by Iain Arnell <iarnell at gmail.com> (BZ#519417)
 
-the following made the patch smaller:
-mv Test-Simple-0.86/t/{Builder,Tester,}
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-02-17 17:16:40.000000000 +0100
-@@ -2626,11 +2626,16 @@
- lib/Test/Simple/Changes		Test::Simple changes
- lib/Test/Simple.pm		Basic utility for writing tests
- lib/Test/Simple/README		Test::Simple README
-+lib/Test/Simple/TODO		Test::Simple TODO
- lib/Test/Simple/t/00test_harness_check.t	Test::Simple test
-+lib/Test/Simple/t/BEGIN_require_ok.t
-+lib/Test/Simple/t/BEGIN_use_ok.t
-+lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/More.t	Test::More test, basic stuff
- lib/Test/Simple/t/bad_plan.t	Test::Builder plan() test
- lib/Test/Simple/t/bail_out.t	Test::Builder BAIL_OUT test
- lib/Test/Simple/t/buffer.t	Test::Builder buffering test
--lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/c_flag.t
- lib/Test/Simple/t/carp.t	Test::Builder test
- lib/Test/Simple/t/circular_data.t	Test::Simple test
- lib/Test/Simple/t/cmp_ok.t	Test::More test
-@@ -2638,19 +2643,22 @@
- lib/Test/Simple/t/curr_test.t	Test::Builder->curr_test tests
- lib/Test/Simple/t/details.t	Test::Builder tests
- lib/Test/Simple/t/diag.t	Test::More diag() test
-+lib/Test/Simple/t/died.t
-+lib/Test/Simple/t/dont_overwrite_die_handler.t
- lib/Test/Simple/t/eq_set.t	Test::Simple test
- lib/Test/Simple/t/exit.t	Test::Simple test, exit codes
--lib/Test/Simple/t/extra_one.t	Test::Simple test
-+lib/Test/Simple/t/explain.t
- lib/Test/Simple/t/extra.t	Test::Simple test
-+lib/Test/Simple/t/extra_one.t	Test::Simple test
- lib/Test/Simple/t/fail-like.t	Test::More test, like() failures
- lib/Test/Simple/t/fail-more.t	Test::More test, tests failing
--lib/Test/Simple/t/fail_one.t	Test::Simple test
- lib/Test/Simple/t/fail.t	Test::Simple test, test failures
-+lib/Test/Simple/t/fail_one.t	Test::Simple test
- lib/Test/Simple/t/filehandles.t	Test::Simple test, STDOUT can be played with
- lib/Test/Simple/t/fork.t	Test::More fork tests
- lib/Test/Simple/t/harness_active.t	Test::Simple test
--lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/has_plan.t	Test::Builder->plan tests
-+lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/import.t	Test::More test, importing functions
- lib/Test/Simple/t/is_deeply_dne_bug.t	Test::More test
- lib/Test/Simple/t/is_deeply_fail.t	Test::More test, is_deeply()
-@@ -2660,27 +2668,30 @@
- lib/Test/Simple/t/lib/MyOverload.pm	Test::More test module 
- lib/Test/Simple/t/maybe_regex.t	Test::Builder->maybe_regex() tests
- lib/Test/Simple/t/missing.t	Test::Simple test, missing tests
--lib/Test/Simple/t/More.t	Test::More test, basic stuff
-+lib/Test/Simple/t/new_ok.t
- lib/Test/Simple/t/no_diag.t	Test::Simple test
- lib/Test/Simple/t/no_ending.t	Test::Builder test, no_ending()
- lib/Test/Simple/t/no_header.t	Test::Builder test, no_header()
- lib/Test/Simple/t/no_plan.t	Test::Simple test, forgot the plan
--lib/Test/Simple/TODO		Test::Simple TODO
-+lib/Test/Simple/t/no_tests.t
-+lib/Test/Simple/t/note.t
- lib/Test/Simple/t/ok_obj.t	Test::Builder object tests
- lib/Test/Simple/t/output.t	Test::Builder test, output methods
- lib/Test/Simple/t/overload.t		Test::Simple test
- lib/Test/Simple/t/overload_threads.t	Test::Simple test
-+lib/Test/Simple/t/plan.t	Test::More test, plan()
- lib/Test/Simple/t/plan_bad.t		Test::Simple test
- lib/Test/Simple/t/plan_is_noplan.t	Test::Simple test, no_plan
- lib/Test/Simple/t/plan_no_plan.t	Test::More test, plan() w/no_plan
- lib/Test/Simple/t/plan_shouldnt_import.t	Test::Simple test
- lib/Test/Simple/t/plan_skip_all.t	Test::More test, plan() w/skip_all
--lib/Test/Simple/t/plan.t	Test::More test, plan()
- lib/Test/Simple/t/require_ok.t	Test::Simple test
- lib/Test/Simple/t/reset.t	Test::Simple test
-+lib/Test/Simple/t/reset_outputs.t
- lib/Test/Simple/t/simple.t	Test::Simple test, basic stuff
--lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
- lib/Test/Simple/t/skip.t	Test::More test, SKIP tests
-+lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
-+lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
- lib/Test/Simple/t/tbt_01basic.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_02fhrestore.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_03die.t	Test::Builder::Tester test
-@@ -2688,13 +2699,14 @@
- lib/Test/Simple/t/tbt_05faildiag.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_06errormess.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_07args.t	Test::Builder::Tester test
--lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
- lib/Test/Simple/t/thread_taint.t	Test::Simple test
-+lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
- lib/Test/Simple/t/todo.t	Test::More test, TODO tests
- lib/Test/Simple/t/try.t		Test::More test
- lib/Test/Simple/t/undef.t	Test::More test, undefs don't cause warnings
--lib/Test/Simple/t/useing.t	Test::More test, compile test
- lib/Test/Simple/t/use_ok.t	Test::More test, use_ok()
-+lib/Test/Simple/t/useing.t	Test::More test, compile test
-+lib/Test/Simple/t/utf8.t
- lib/Test/t/05_about_verbose.t	See if Test works
- lib/Test/t/fail.t		See if Test works
- lib/Test/t/mix.t		See if Test works
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Module.pm perl-5.10.0/lib/Test/Builder/Module.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Module.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-02-17 17:16:40.000000000 +0100
++++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-08-26 06:14:11.000000000 +0200
 @@ -1,24 +1,24 @@
  package Test::Builder::Module;
-+# $Id$
-+
-+use strict;
  
++use strict;
++
  use Test::Builder;
  
  require Exporter;
@@ -120,7 +17,8 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
 -$VERSION = '0.72';
 -
 -use strict;
-+our $VERSION = '0.86';
++our $VERSION = '0.92';
++$VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
  
  # 5.004's Exporter doesn't have export_to_level.
  my $_export_to_level = sub {
@@ -208,14 +106,20 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  1;
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm perl-5.10.0/lib/Test/Builder/Tester/Color.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-02-17 17:16:40.000000000 +0100
-@@ -1,4 +1,5 @@
++++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,9 +1,11 @@
  package Test::Builder::Tester::Color;
-+# $Id$
  
  use strict;
++our $VERSION = "1.18";
+ 
+ require Test::Builder::Tester;
  
-@@ -25,8 +26,7 @@
++
+ =head1 NAME
+ 
+ Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
+@@ -25,8 +27,7 @@
  
  =cut
  
@@ -227,10 +131,9 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  
 diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
 --- perl-5.10.0.orig/lib/Test/Builder/Tester.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-02-17 17:16:40.000000000 +0100
-@@ -1,8 +1,8 @@
++++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,8 +1,7 @@
  package Test::Builder::Tester;
-+# $Id$
  
  use strict;
 -use vars qw(@EXPORT $VERSION @ISA);
@@ -239,7 +142,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  
  use Test::Builder;
  use Symbol;
-@@ -56,21 +56,20 @@
+@@ -56,21 +55,20 @@
  ###
  
  use Exporter;
@@ -269,7 +172,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  }
  
  sub import {
-@@ -83,14 +82,14 @@
+@@ -83,14 +81,14 @@
      $t->plan(@plan);
  
      my @imports = ();
@@ -287,7 +190,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
  }
  
  ###
-@@ -124,8 +123,7 @@
[...6118 lines suppressed...]
  my $out = tie *$out_fh, 'TieOut';
  my $err = tie *$err_fh, 'TieOut';
  
-@@ -13,6 +14,6 @@
+@@ -13,6 +15,6 @@
  $t->failure_output($err_fh);
  $t->todo_output($err_fh);
  
@@ -6035,12 +8073,8 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  1;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,16 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -4,10 +4,13 @@
  require Test::Simple::Catch;
  my($out, $err) = Test::Simple::Catch::caught();
  
@@ -6054,22 +8088,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  ok(1);
  ok(1);
 -die "Knife?";
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- use Carp;
- 
- push @INC, 't/lib';
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -0,0 +1,19 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -0,0 +1,20 @@
 +require Test::Simple;
-+# $Id$
 +
 +push @INC, 't/lib';
 +require Test::Simple::Catch;
@@ -6086,42 +8111,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
 +
 +ok(1);
 +ok(1);
++
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,3 +1,4 @@
- require Test::Builder;
-+# $Id$
- 
- exit 1;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- use lib 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,11 +1,14 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -5,7 +5,9 @@
  my($out, $err) = Test::Simple::Catch::caught();
  
  Test::Simple->import(tests => 5);
@@ -6132,86 +8128,31 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
  
  ok(1);
  ok(1);
-@@ -13,4 +16,4 @@
+@@ -13,4 +15,5 @@
  ok(1);
  ok(1);
  
 -die "Almost there...";
++$! = 0;
 +die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- # ID 20020716.013, the exit code would become 0 if the test died
-+# $Id$
- # before a plan.
- 
- require Test::Simple;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1 +1,2 @@
- require Test::Simple;
-+# $Id$
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
 --- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
-@@ -9,4 +10,4 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-08-26 06:14:11.000000000 +0200
+@@ -9,4 +9,4 @@
  
  ok(0);
  ok(1);
 -ok(0);
 \ No newline at end of file
 +ok(0);
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx	2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- 
- push @INC, 't/lib';
- require Test::Simple::Catch;
 diff -urN perl-5.10.0.orig/t/lib/TieOut.pm perl-5.10.0/t/lib/TieOut.pm
 --- perl-5.10.0.orig/t/lib/TieOut.pm	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/TieOut.pm	2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,14 @@
++++ perl-5.10.0/t/lib/TieOut.pm	2009-08-26 06:14:11.000000000 +0200
+@@ -1,13 +1,15 @@
  package TieOut;
-+# $Id$
  
++use strict;
++
  sub TIEHANDLE {
      my $scalar = '';
 -    bless( \$scalar, $_[0]);
@@ -6225,7 +8166,7 @@ diff -urN perl-5.10.0.orig/t/lib/TieOut.
  }
  
  sub PRINTF {
-@@ -16,7 +17,7 @@
+@@ -16,7 +18,7 @@
      $$self .= sprintf $fmt, @_;
  }
  


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-11/perl.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- perl.spec	7 Jul 2009 13:44:39 -0000	1.219
+++ perl.spec	18 Sep 2009 18:52:12 -0000	1.220
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        73%{?dist}
+Release:        82%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -18,6 +18,7 @@ Url:            http://www.perl.org/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/perl-%{perl_version}.tar.gz
 Source11:       filter-requires.sh
 Source12:       perl-5.8.0-libnet.cfg
+Source13:       macros.perl
 
 # Specific to Fedora/RHEL
 Patch1:         perl-5.8.0-root.patch
@@ -184,6 +185,21 @@ Patch57:	38_fix_weaken_memleak
 # http://rt.perl.org/rt3/Ticket/Display.html?id=39060 (#221113)
 Patch58:	perl-perlio-incorrect-errno.patch
 
+# h2ph: generated *.ph files no longer produce warnings when processed
+Patch59:	perl-bz509676.patch
+
+# With the Scalar-List-Utils update, more prereq declarations have to
+# be skipped in Makefile.PL files.
+Patch60:	perl-skip-prereq.patch
+
+# much better swap logic to support reentrancy and fix assert failure
+# http://perl5.git.perl.org/perl.git/commitdiff/e9105d30edfbaa7f444bc7984c9bafc8e991ad12
+# RT #60508
+Patch61:	perl-5.10.0-much-better-swap-logic.patch
+
+# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6148
+Patch62:	perl-5.10.0-spamassassin.patch
+
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 Patch100:	perl-update-constant.patch
@@ -219,7 +235,7 @@ Patch113:	perl-update-Sys-Syslog.patch
 Patch114:	perl-update-Test-Harness.patch
 %define			    Test_Harness_version 3.16
 Patch115:	perl-update-Test-Simple.patch
-%define			    Test_Simple_version 0.86
+%define			    Test_Simple_version 0.92
 Patch116:	perl-update-Time-HiRes.patch
 %define			    Time_HiRes_version 1.9719
 Patch117:	perl-update-Digest-SHA.patch
@@ -229,9 +245,13 @@ Patch118:	perl-update-autodie.patch
 %define			    autodie_version 1.999
 # cpan has it under PathTools-3.30
 Patch119:	perl-update-FileSpec.patch
-%define				File_Spec_version 3.30
+%define			    File_Spec_version 3.30
 Patch120:	perl-update-Compress_Raw_Zlib.patch
-%define				Compress_Raw_Zlib 2.020
+%define			    Compress_Raw_Zlib 2.020
+Patch121:	perl-update-Scalar-List-Utils.patch
+%define			    Scalar_List_Utils 1.21
+Patch122:   perl-update-Module-Pluggable.patch
+%define             Module_Pluggable_version 3.90
 
 # Fedora uses links instead of lynx
 # patches File-Fetch and CPAN
@@ -754,7 +774,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        3.60
+Version:        %{Module_Pluggable_version} 
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Pluggable
@@ -987,6 +1007,10 @@ upstream tarball from perl.org.
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -1009,6 +1033,13 @@ upstream tarball from perl.org.
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
+%patch121 -p1
+%patch122 -p1
+# 0-byte files and patch don't seem to agree
+mkdir t/Module_Pluggable/lib/Zot/
+touch t/Module_Pluggable/lib/Zot/.Zork.pm
+
+
 %patch201 -p1
 
 #
@@ -1068,6 +1099,7 @@ sed -i "s|LIB             = ./zlib-src|L
 echo "RPM Build arch: %{_arch}"
 
 # use "lib", not %{_lib}, for privlib, sitelib, and vendorlib
+# To build production version, we would need -DDEBUGGING=-g
 
 /bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
 	-Accflags="-DPERL_USE_SAFE_PUTENV" \
@@ -1166,6 +1198,13 @@ done
 install -p -m 644 %{SOURCE12} %{comp_perl_lib}/Net/libnet.cfg
 
 #
+# perl RPM macros
+#
+
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+install -p -m 644 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/
+
+#
 # Core modules removal
 #
 find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
@@ -1256,6 +1295,10 @@ perl -x patchlevel.h \
 	'Fedora Patch56: Fix $? when dumping core' \
 	'34209 Fix a memory leak with Scalar::Util::weaken()' \
 	'fix RT 39060, errno incorrectly set in perlio' \
+	'Fedora Patch59: h2ph: generated *.ph files no longer produce warnings when processed' \
+	'Fedora Patch60: remove PREREQ_FATAL from Makefile.PLs processed by miniperl' \
+	'Fedora Patch61: much better swap logic to support reentrancy and fix assert failure' \
+	'Fedora Patch62: spam assassin needs workaround for removing tainted mode' \
 	'Fedora Patch100: Update module constant to %{constant_version}' \
 	'Fedora Patch101: Update Archive::Extract to %{Archive_Extract_version}' \
 	'Fedora Patch102: Update Archive::Tar to %{Archive_Tar_version}' \
@@ -1277,6 +1320,8 @@ perl -x patchlevel.h \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch119: Update File::Spec to %{File_Spec_version}' \
 	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
+	'Fedora Patch121: Update Scalar-List-Utils to %{Scalar_List_Utils}' \
+	'Fedora Patch122: Update Module-Pluggable to %{Module_Pluggable_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
@@ -1602,6 +1647,7 @@ TMPDIR="$PWD/tmp" make test
 %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h
 %{_bindir}/xsubpp
 %{_mandir}/man1/xsubpp*
+%{_sysconfdir}/rpm/macros.perl
 
 %files suidperl
 %defattr(-,root,root,-)
@@ -1902,6 +1948,38 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
+- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
+- update Module-Pluggable to 3.9
+
+* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
+- fix macros.perl *sigh*
+
+* Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-80
+- Remove -DDEBUGGING=-g, we are not ready yet.
+
+* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-79
+- add helper filtering macros to -devel, for perl-* package invocation
+  (#502402)
+
+* Fri Jul 31 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-78
+- Add configure option -DDEBUGGING=-g (#156113)
+
+* Tue Jul 28 2009 arcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.0-77
+- 510127 spam assassin suffer from tainted bug
+
+* Mon Jul 27 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.0-76
+- 494773 much better swap logic to support reentrancy and fix assert failure (rt #60508)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:5.10.0-75
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 10 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-74
+- fix generated .ph files so that they no longer cause warnings (#509676)
+- remove PREREQ_FATAL from Makefile.PL's processed by miniperl
+- update to latest Scalar-List-Utils (#507378)
+- perl-skip-prereq.patch: skip more prereq declarations in Makefile.PL files
+
 * Tue Jul  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-73
 - re-enable tests
 



From kdudka at fedoraproject.org  Fri Sep 18 18:52:30 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 18 Sep 2009 18:52:30 +0000 (UTC)
Subject: rpms/nano/devel nano.spec, 1.28, 1.29 nano-2.0.6-open-macro.patch,
	1.1, NONE
Message-ID: <20090918185230.3731111C00EC@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14586

Modified Files:
	nano.spec 
Removed Files:
	nano-2.0.6-open-macro.patch 
Log Message:
- install binaries to /bin (#168340)


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nano.spec	18 Sep 2009 18:14:09 -0000	1.28
+++ nano.spec	18 Sep 2009 18:52:30 -0000	1.29
@@ -1,7 +1,7 @@
 Summary:	A small text editor
 Name:		nano
 Version:	2.0.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
@@ -22,14 +22,17 @@ for f in doc/man/fr/{nano.1,nanorc.5,rna
 done
 
 %build
-%configure --enable-all
+%configure --enable-all --bindir=/bin
 make
 
 %install
 rm -rf %{buildroot}
-make DESTDIR="%{buildroot}" install
+make DESTDIR="%{buildroot}" install bindir=/bin
 #ln -s nano %{buildroot}%{_bindir}/pico
 rm -f %{buildroot}%{_infodir}/dir
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+ln -s ../../bin/nano ${RPM_BUILD_ROOT}%{_bindir}/nano
+ln -s ../../bin/rnano ${RPM_BUILD_ROOT}%{_bindir}/rnano
 
 %find_lang %{name}
 
@@ -55,6 +58,7 @@ rm -rf %{buildroot}
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 %doc doc/nanorc.sample
 %doc doc/faq.html
+/bin/*
 %{_bindir}/*
 %{_mandir}/man*/*
 %lang(fr) %{_mandir}/fr/man*/*
@@ -62,6 +66,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Fri Sep 18 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-2
+- install binaries to /bin (#168340)
+
 * Fri Sep 18 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-1
 - new upstream release
 - dropped patch no longer needed (possible change in behavior though negligible)


--- nano-2.0.6-open-macro.patch DELETED ---



From cweyl at fedoraproject.org  Fri Sep 18 18:56:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 18 Sep 2009 18:56:13 +0000 (UTC)
Subject: rpms/perl/F-11 macros.perl,NONE,1.1
Message-ID: <20090918185613.C026611C00EC@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15775

Added Files:
	macros.perl 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
- update Module-Pluggable to 3.9



--- NEW FILE macros.perl ---
# Sensible Perl-specific RPM build macros.
#
# Note that these depend on the generic filtering system being in place in
# rpm core; but won't cause a build to fail if they're not present.
#
# Chris Weyl <cweyl at alumni.drew.edu> 2009

# By default, for perl packages we want to filter all files in _docdir from 
# req/prov scanning, as well as filtering out any provides caused by private 
# libs in vendorarch/archlib (vendor/core).
#
# Note that this must be invoked in the spec file, preferably as 
# "%{?perl_default_filter}", before any %description block.

%perl_default_filter %{?filter_setup: %{expand: \
%filter_provides_in %{perl_vendorarch}/.*\\.so$ \
%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \
%filter_provides_in %{_docdir} \
%filter_requires_in %{_docdir} \
%filter_setup \
}}




From salimma at fedoraproject.org  Fri Sep 18 19:06:49 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 18 Sep 2009 19:06:49 +0000 (UTC)
Subject: rpms/nickle/F-11 .cvsignore, 1.6, 1.7 nickle.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20090918190649.EAE7F11C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285/F-11

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
- Update to 2.69



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Mar 2009 17:38:06 -0000	1.6
+++ .cvsignore	18 Sep 2009 19:06:49 -0000	1.7
@@ -1 +1 @@
-nickle-2.68.tar.gz
+nickle-2.69.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-11/nickle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nickle.spec	11 Mar 2009 17:38:06 -0000	1.7
+++ nickle.spec	18 Sep 2009 19:06:49 -0000	1.8
@@ -1,5 +1,5 @@
 Name:    nickle
-Version: 2.68
+Version: 2.69
 Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/nickle
 
 %changelog
+* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
+- Update to 2.69
+
 * Wed Mar 11 2009 Michel Salim <salimma at fedoraproject.org> - 2.68-1
 - Update to 2.68
 - Enable checks


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Mar 2009 17:38:06 -0000	1.6
+++ sources	18 Sep 2009 19:06:49 -0000	1.7
@@ -1 +1 @@
-3a4a171f59715ec38992e3d6947c14b6  nickle-2.68.tar.gz
+e2a9f80cadd26f61496725dba05f1993  nickle-2.69.tar.gz



From salimma at fedoraproject.org  Fri Sep 18 19:06:49 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 18 Sep 2009 19:06:49 +0000 (UTC)
Subject: rpms/nickle/EL-5 .cvsignore, 1.6, 1.7 nickle.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090918190649.930AF11C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285/EL-5

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
- Update to 2.69



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Mar 2009 17:38:05 -0000	1.6
+++ .cvsignore	18 Sep 2009 19:06:48 -0000	1.7
@@ -1 +1 @@
-nickle-2.68.tar.gz
+nickle-2.69.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/EL-5/nickle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nickle.spec	11 Mar 2009 17:38:05 -0000	1.5
+++ nickle.spec	18 Sep 2009 19:06:48 -0000	1.6
@@ -1,5 +1,5 @@
 Name:    nickle
-Version: 2.68
+Version: 2.69
 Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/nickle
 
 %changelog
+* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
+- Update to 2.69
+
 * Wed Mar 11 2009 Michel Salim <salimma at fedoraproject.org> - 2.68-1
 - Update to 2.68
 - Enable checks


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Mar 2009 17:38:05 -0000	1.6
+++ sources	18 Sep 2009 19:06:48 -0000	1.7
@@ -1 +1 @@
-3a4a171f59715ec38992e3d6947c14b6  nickle-2.68.tar.gz
+e2a9f80cadd26f61496725dba05f1993  nickle-2.69.tar.gz



From salimma at fedoraproject.org  Fri Sep 18 19:06:49 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 18 Sep 2009 19:06:49 +0000 (UTC)
Subject: rpms/nickle/F-10 .cvsignore, 1.6, 1.7 nickle.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <20090918190649.D42A711C01EA@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285/F-10

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
- Update to 2.69



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Mar 2009 17:38:05 -0000	1.6
+++ .cvsignore	18 Sep 2009 19:06:48 -0000	1.7
@@ -1 +1 @@
-nickle-2.68.tar.gz
+nickle-2.69.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-10/nickle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nickle.spec	11 Mar 2009 17:38:05 -0000	1.6
+++ nickle.spec	18 Sep 2009 19:06:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name:    nickle
-Version: 2.68
+Version: 2.69
 Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/nickle
 
 %changelog
+* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
+- Update to 2.69
+
 * Wed Mar 11 2009 Michel Salim <salimma at fedoraproject.org> - 2.68-1
 - Update to 2.68
 - Enable checks


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Mar 2009 17:38:05 -0000	1.6
+++ sources	18 Sep 2009 19:06:48 -0000	1.7
@@ -1 +1 @@
-3a4a171f59715ec38992e3d6947c14b6  nickle-2.68.tar.gz
+e2a9f80cadd26f61496725dba05f1993  nickle-2.69.tar.gz



From salimma at fedoraproject.org  Fri Sep 18 19:06:50 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 18 Sep 2009 19:06:50 +0000 (UTC)
Subject: rpms/nickle/devel .cvsignore, 1.6, 1.7 nickle.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20090918190650.D323311C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285/devel

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
- Update to 2.69



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Mar 2009 17:38:06 -0000	1.6
+++ .cvsignore	18 Sep 2009 19:06:50 -0000	1.7
@@ -1 +1 @@
-nickle-2.68.tar.gz
+nickle-2.69.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/nickle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nickle.spec	25 Jul 2009 19:21:25 -0000	1.8
+++ nickle.spec	18 Sep 2009 19:06:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.68
-Release: 2%{?dist}
+Version: 2.69
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/nickle
 
 %changelog
+* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
+- Update to 2.69
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.68-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Mar 2009 17:38:06 -0000	1.6
+++ sources	18 Sep 2009 19:06:50 -0000	1.7
@@ -1 +1 @@
-3a4a171f59715ec38992e3d6947c14b6  nickle-2.68.tar.gz
+e2a9f80cadd26f61496725dba05f1993  nickle-2.69.tar.gz



From mbarnes at fedoraproject.org  Fri Sep 18 19:13:59 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 18 Sep 2009 19:13:59 +0000 (UTC)
Subject: rpms/evolution/devel sources,1.116.2.27,1.116.2.28
Message-ID: <20090918191359.7066D11C00EC@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23453

Modified Files:
      Tag: private-mbarnes-kb
	sources 
Log Message:
Fix tarball.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.27
retrieving revision 1.116.2.28
diff -u -p -r1.116.2.27 -r1.116.2.28
--- sources	18 Sep 2009 18:07:41 -0000	1.116.2.27
+++ sources	18 Sep 2009 19:13:59 -0000	1.116.2.28
@@ -1 +1 @@
-f36ef03f378baba9bc3e5b9ec56b288d  evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2
+3d79e145c0a5ee82dc34fa61af322052  evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2



From ajax at fedoraproject.org  Fri Sep 18 19:19:28 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 18 Sep 2009 19:19:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel lvds-modes.patch, 1.1,
	1.2 xorg-x11-drv-intel.spec, 1.31, 1.32
Message-ID: <20090918191928.E221211C00EC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25786

Modified Files:
	lvds-modes.patch xorg-x11-drv-intel.spec 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.8.0-15.20090909
- lvds-modes.patch: Fix to work in more cases.


lvds-modes.patch:
 drmmode_display.c |  138 +++++++++++++++---------------------------------------
 1 file changed, 40 insertions(+), 98 deletions(-)

Index: lvds-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/lvds-modes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lvds-modes.patch	8 Sep 2009 20:56:56 -0000	1.1
+++ lvds-modes.patch	18 Sep 2009 19:19:28 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
---- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 15:26:36.311361982 -0400
-+++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 15:57:06.526491988 -0400
+diff -up xf86-video-intel-20090909/src/drmmode_display.c.lvds-modes xf86-video-intel-20090909/src/drmmode_display.c
+--- xf86-video-intel-20090909/src/drmmode_display.c.lvds-modes	2009-09-18 14:45:51.000000000 -0400
++++ xf86-video-intel-20090909/src/drmmode_display.c	2009-09-18 14:55:06.000000000 -0400
 @@ -701,107 +701,46 @@ static void fill_detailed_lvds_block(str
  		timing->misc |= 0x01;
  }
@@ -145,12 +145,16 @@ diff -up xf86-video-intel-20090908/src/d
  }
  
  static DisplayModePtr
-@@ -869,7 +808,7 @@ drmmode_output_get_modes(xf86OutputPtr o
+@@ -869,8 +808,11 @@ drmmode_output_get_modes(xf86OutputPtr o
  		if (!p_lvds->hdisplay || !p_lvds->vdisplay)
  			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
  				"Incorrect KMS mode.\n");
 -		drmmode_output_lvds_edid(output, p_lvds);
-+		Modes = drmmode_output_lvds_edid(output, Modes);
  	}
++
++	if (koutput->connector_type ==  DRM_MODE_CONNECTOR_LVDS)
++		Modes = drmmode_output_lvds_edid(output, Modes);
++
  	return Modes;
  }
+ 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-drv-intel.spec	17 Sep 2009 18:02:00 -0000	1.31
+++ xorg-x11-drv-intel.spec	18 Sep 2009 19:19:28 -0000	1.32
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   14.%{gitdate}%{?dist}
+Release:   15.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.8.0-15.20090909
+- lvds-modes.patch: Fix to work in more cases.
+
 * Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-14.20090909
 - Drop page flip patch.
 



From jjohnstn at fedoraproject.org  Fri Sep 18 19:42:08 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 18 Sep 2009 19:42:08 +0000 (UTC)
Subject: rpms/jetty/devel djetty.script, NONE, 1.1 jetty.init, 1.2,
	1.3 jetty.spec, 1.19, 1.20
Message-ID: <20090918194208.4D22911C00EC@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3153

Modified Files:
	jetty.init jetty.spec 
Added Files:
	djetty.script 
Log Message:

* Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
- Add djetty script source and fix init script to work properly.




--- NEW FILE djetty.script ---
#!/bin/bash

if [ -z "$JETTY_PID" ]
then
   export JETTY_PID=/dev/null
fi

if [ -z "$JETTY_PORT" ]
then
   export JETTY_PORT=8088
fi

export JETTY_HOME=/usr/share/jetty
if [ -z "$JETTY_HOME" ] 
then
  JETTY_HOME_1=`dirname "$0"`
  JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
  JETTY_HOME=${JETTY_HOME_1} 
fi

cd $JETTY_HOME
exec /usr/bin/java -Djetty.class.path=/usr/share/java/commons-logging.jar -Djetty.port=$JETTY_PORT  -jar start.jar etc/jetty-logging.xml etc/jetty.xml 2>/dev/null &
echo $! >$JETTY_PID



Index: jetty.init
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jetty.init	6 Jan 2009 21:57:36 -0000	1.2
+++ jetty.init	18 Sep 2009 19:42:06 -0000	1.3
@@ -24,7 +24,7 @@
 [ -r /etc/java/java.conf ] && . /etc/java/java.conf
 export JAVA_HOME
 
-# Get Jetty5's config
+# Get Jetty's config
                                                                                                                                                              
 JETTY_CFG="/etc/jetty/jetty.conf"
                                                                                                                                                              
@@ -56,7 +56,6 @@ prog=jetty
 RETVAL=0
 
 start() {
-    echo -n $"Starting $prog: "
 
         if [ -f /var/lock/subsys/jetty ] ; then
                 if [ -f $JETTY_PID ]; then
@@ -70,34 +69,27 @@ start() {
                 fi
         fi
 
+    	echo -n $"Starting $prog: "
 #	[ -x ${JETTY_HOME}/ext ] &&
 #	  	rebuild-jar-repository -s ${JETTY_HOME}/ext
 
         if [ -x /etc/rc.d/init.d/functions ]; then
-                daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT start
+                daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT
         else
-                su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT start"
+                su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT"
         fi
 
         RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty
+        [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty && success || failure
+	echo
         return $RETVAL
 }
 
 
 stop() {
-    echo -n $"Stopping $prog: "
                                                                                                                                                              
     if [ -f /var/lock/subsys/jetty ] ; then
-      if [ -x /etc/rc.d/init.d/functions ]; then
-          daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop
-      else
-          su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop"
-      fi
-      RETVAL=$?
-
-      if [ $RETVAL = 0 ]; then
+    	echo -n $"Stopping $prog: "
         count=0;
 
         if [ -f $JETTY_PID ]; then
@@ -105,20 +97,24 @@ stop() {
             read kpid < $JETTY_PID
             let kwait=$SHUTDOWN_WAIT
 
+#           Try issuing SIGTERM
+
+            kill -15 $kpid
             until [ `ps --pid $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` -eq '0' ] || [ $count -gt $kwait ]
             do
-                echo "waiting for processes to exit";
+#               echo "waiting for processes to exit";
                 sleep 1
                 let count=$count+1;
             done
                                                                                                                                                              
             if [ $count -gt $kwait ]; then
-                echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
+#               echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
                 kill -9 $kpid
             fi
         fi
         rm -f /var/lock/subsys/jetty $JETTY_PID
-      fi
+	success
+    	echo
     fi
 }
 


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- jetty.spec	15 Sep 2009 14:16:56 -0000	1.19
+++ jetty.spec	18 Sep 2009 19:42:06 -0000	1.20
@@ -42,13 +42,14 @@
 
 Name:           jetty
 Version:        6.1.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
 License:        ASL 2.0
 URL:            http://jetty.mortbay.org/jetty/
 Source0:        http://dist.codehaus.org/jetty/jetty-6.1.20/jetty-6.1.20-src.zip
+Source1:	djetty.script
 Source2:        jetty.init
 Source3:        jetty.logrotate
 Source4:        %{name}-depmap.xml
@@ -146,6 +147,8 @@ find . -name "*.class" -exec rm {} \;
 
 cp %{SOURCE7} settings.xml
 
+cp %{SOURCE1} djetty
+
 #remove glassfish specific file
 rm -fr modules/jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java
 
@@ -171,6 +174,7 @@ sed -i -e "s|<url>__MAVENREPO_DIR_PLACEH
 sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
 sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
 
+sed -i -e "s|/usr/share|%{_datadir}|g" djetty
 
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
@@ -218,7 +222,8 @@ mv $RPM_BUILD_ROOT%{homedir}/%{name}-%{v
 rm -fr $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}
 
 chmod +x $RPM_BUILD_ROOT%{homedir}/bin/jetty-xinetd.sh
-ln -s %{homedir}/bin/jetty-xinetd.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
+chmod +x djetty
+mv djetty $RPM_BUILD_ROOT%{_bindir}/djetty
 ln -s %{homedir}/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
 install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
@@ -358,6 +363,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
+- Add djetty script source and fix init script to work properly.
+
 * Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-2
 - Fix requires.
 



From mbarnes at fedoraproject.org  Fri Sep 18 19:50:58 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 18 Sep 2009 19:50:58 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.51,1.394.2.52
Message-ID: <20090918195058.6234F11C00EC@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7508

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
No more killev.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.51
retrieving revision 1.394.2.52
diff -u -p -r1.394.2.51 -r1.394.2.52
--- evolution.spec	18 Sep 2009 18:07:41 -0000	1.394.2.51
+++ evolution.spec	18 Sep 2009 19:50:57 -0000	1.394.2.52
@@ -470,7 +470,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
 #%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/evolution-backup
-%{_libexecdir}/evolution/%{evo_major}/killev
 
 # The plugin directory:
 %dir %{evo_plugin_dir}



From jdennis at fedoraproject.org  Fri Sep 18 19:56:54 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Fri, 18 Sep 2009 19:56:54 +0000 (UTC)
Subject: rpms/python-nss/devel .cvsignore, 1.8, 1.9 python-nss.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <20090918195654.6668D11C00EC@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/python-nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10435

Modified Files:
	.cvsignore python-nss.spec sources 
Log Message:
expand support for digests
add support for symmetric ciphers
add digest and cipher examples



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	8 Jul 2009 21:17:10 -0000	1.8
+++ .cvsignore	18 Sep 2009 19:56:53 -0000	1.9
@@ -1 +1 @@
-python-nss-0.6.tar.bz2
+python-nss-0.7.tar.bz2


Index: python-nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/python-nss.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-nss.spec	26 Jul 2009 20:44:41 -0000	1.12
+++ python-nss.spec	18 Sep 2009 19:56:53 -0000	1.13
@@ -3,14 +3,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-nss
-Version:        0.6
-Release:        3%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        Python bindings for Network Security Services (NSS)
 
 Group:          Development/Languages
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot/mozilla/security/python/nss
-Source0:        %{name}-%{version}.tar.bz2 
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define docdir %{_docdir}/%{name}-%{version}
@@ -45,18 +45,22 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install  -O1 --install-platlib %{python_sitearch} --skip-build --root $RPM_BUILD_ROOT 
+%{__python} setup.py install  -O1 --install-platlib %{python_sitearch} --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install_doc --docdir %{docdir} --skip-build --root $RPM_BUILD_ROOT
 
 # Include httplib ported to NSS as example
 cp lib/httplib.py $RPM_BUILD_ROOT/%{docdir}/examples
 
+# Include digest and cipher tests as example
+cp test/digest_test.py $RPM_BUILD_ROOT/%{docdir}/examples
+cp test/cipher_test.py $RPM_BUILD_ROOT/%{docdir}/examples
+
 # Remove execution permission from any example scripts
 find $RPM_BUILD_ROOT/%{docdir}/examples -type f | xargs chmod a-x
 
 # Set correct permissions on .so files
 chmod 0755 $RPM_BUILD_ROOT/%{python_sitearch}/nss/*.so
- 
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +73,34 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 John Dennis <jdennis at redhat.com> - 0.7-1
+- add support for symmetric encryption/decryption
+  more support for digests (hashes)
+
+  The following classes were added:
+  PK11SymKey PK11Context
+
+  The following methods and functions were added:
+  get_best_wrap_mechanism          get_best_key_length
+  key_gen                          derive
+  get_key_length                   digest_key
+  clone_context                    digest_begin
+  digest_op                        cipher_op
+  finalize                         digest_final
+  read_hex                         hash_buf
+  sec_oid_tag_str                  sec_oid_tag_name
+  sec_oid_tag_from_name            key_mechanism_type_name
+  key_mechanism_type_from_name     pk11_attribute_type_name
+  pk11_attribute_type_from_name    get_best_slot
+  get_internal_key_slot            create_context_by_sym_key
+  import_sym_key                   create_digest_context
+  param_from_iv                    param_from_algid
+  generate_new_param               algtag_to_mechanism
+  mechanism_to_algtag
+
+  The following files were added:
+  cipher_test.py digest_test.py
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -103,7 +135,7 @@ rm -rf $RPM_BUILD_ROOT
   New method nss.nss.Certificate.get_subject_common_name()
   New function nss.nss.generate_random()
   Fix return value creation in SSLSocket.get_security_status
-  New function nss.ssl.SSLSocket.import_tcp_socket()  
+  New function nss.ssl.SSLSocket.import_tcp_socket()
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Jul 2009 12:11:26 -0000	1.10
+++ sources	18 Sep 2009 19:56:53 -0000	1.11
@@ -1 +1 @@
-d52831184ea3a74238be906ae5e21fa0  python-nss-0.6.tar.bz2
+5d38521041a1f2fc1e34a56dcc72ff0a  python-nss-0.7.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 18 19:56:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:56:52 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195652.29F1310F88C@bastion2.fedora.phx.redhat.com>

dcantrel has set the watchbugzilla acl on dhcp (Fedora devel) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:56:54 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195654.7134910F896@bastion2.fedora.phx.redhat.com>

dcantrel has set the watchcommits acl on dhcp (Fedora devel) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:57:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:57:04 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195656.D826710F898@bastion2.fedora.phx.redhat.com>

dcantrel has set the commit acl on dhcp (Fedora devel) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:58:38 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195830.4FE6E10F88C@bastion2.fedora.phx.redhat.com>

dcantrel has set the watchcommits acl on dhcp (Fedora 10) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:58:27 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195829.8269C10F885@bastion2.fedora.phx.redhat.com>

dcantrel has set the watchbugzilla acl on dhcp (Fedora 10) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:58:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:58:28 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195831.201C610F896@bastion2.fedora.phx.redhat.com>

dcantrel has set the commit acl on dhcp (Fedora 10) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:58:34 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195834.9770D10F89A@bastion2.fedora.phx.redhat.com>

dcantrel has set the watchbugzilla acl on dhcp (Fedora 11) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:58:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:58:35 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195835.BF4E310F89D@bastion2.fedora.phx.redhat.com>

dcantrel has set the watchcommits acl on dhcp (Fedora 11) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Fri Sep 18 19:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Sep 2009 19:58:44 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20090918195837.3880B10F8A1@bastion2.fedora.phx.redhat.com>

dcantrel has set the commit acl on dhcp (Fedora 11) to Approved for jpopelka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dhcp



From ajax at fedoraproject.org  Fri Sep 18 20:13:07 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 18 Sep 2009 20:13:07 +0000 (UTC)
Subject: rpms/rhpxl/devel dead.package, NONE, 1.1 .cvsignore, 1.62,
	NONE Makefile, 1.2, NONE import.log, 1.2, NONE rhpxl.spec, 1.86,
	NONE sources, 1.69, NONE
Message-ID: <20090918201307.F3DA711C00EC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/rhpxl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18806

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile import.log rhpxl.spec sources 
Log Message:
Moved whole into system-config-display.



--- NEW FILE dead.package ---
Moved whole into system-config-display.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- import.log DELETED ---


--- rhpxl.spec DELETED ---


--- sources DELETED ---



From mbarnes at fedoraproject.org  Fri Sep 18 20:19:56 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 18 Sep 2009 20:19:56 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.52,1.394.2.53
Message-ID: <20090918201956.EF5C211C00EC@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21272

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix file list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.52
retrieving revision 1.394.2.53
diff -u -p -r1.394.2.52 -r1.394.2.53
--- evolution.spec	18 Sep 2009 19:50:57 -0000	1.394.2.52
+++ evolution.spec	18 Sep 2009 20:19:56 -0000	1.394.2.53
@@ -417,8 +417,12 @@ rm -rf $RPM_BUILD_ROOT
 # The main executable
 %{_bindir}/evolution
 
+# The alarm notify daemon
+%{_bindir}/evolution-alarm-notify
+
 # Desktop files:
 %{_datadir}/applications/evolution.desktop
+%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 
 # Icons:
 %{_datadir}/icons/hicolor/16x16/apps/*
@@ -468,7 +472,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution/%{evo_major}
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
-#%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/evolution-backup
 
 # The plugin directory:



From kalev at fedoraproject.org  Fri Sep 18 20:29:10 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 18 Sep 2009 20:29:10 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel mingw32-openssl.spec,1.11,1.12
Message-ID: <20090918202910.9E63011C00EC@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25061

Modified Files:
	mingw32-openssl.spec 
Log Message:
Rebuilt to fix debuginfo



Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-openssl.spec	30 Aug 2009 00:53:20 -0000	1.11
+++ mingw32-openssl.spec	18 Sep 2009 20:29:10 -0000	1.12
@@ -31,7 +31,7 @@
 
 Name:           mingw32-openssl
 Version:        1.0.0
-Release:        0.3.%{beta}%{?dist}
+Release:        0.4.%{beta}%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -347,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.4.beta3
+- Rebuilt to fix debuginfo
+
 * Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.3.beta3
 - Simplified the lib renaming patch
 



From szpak at fedoraproject.org  Fri Sep 18 20:30:35 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Fri, 18 Sep 2009 20:30:35 +0000 (UTC)
Subject: rpms/asunder/devel .cvsignore, 1.7, 1.8 asunder.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20090918203035.210B011C00EC@cvs1.fedora.phx.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/asunder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25392

Modified Files:
	.cvsignore asunder.spec sources 
Log Message:
Asunder updated to 1.9




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Dec 2008 13:41:22 -0000	1.7
+++ .cvsignore	18 Sep 2009 20:30:34 -0000	1.8
@@ -1 +1 @@
-asunder-1.6.2.tar.bz2
+asunder-1.9.tar.bz2


Index: asunder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/asunder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- asunder.spec	24 Jul 2009 17:26:17 -0000	1.8
+++ asunder.spec	18 Sep 2009 20:30:34 -0000	1.9
@@ -1,33 +1,39 @@
 Name:		asunder
 Summary:	A graphical Audio CD ripper and encoder
-Version:	1.6.2
-Release:	3%{?dist}
+Version:	1.9
+Release:	1%{?dist}
 License:	GPLv2
-Group: 		Applications/File
+Group:		Applications/File
 URL:		http://littlesvr.ca/asunder
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/asunder/releases/asunder-%{version}.tar.bz2
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #libcddb is forced by libcddb-devel and proper .so
 #Requires:	libcddb
 Requires:	cdparanoia
 #recommended runtime dependencies
 Requires:	vorbis-tools
 Requires:	flac
-#for mp3 encoding (due to Fedora's patent policy available only from rpm.livna.org repository)
+#for mp3 encoding (due to Fedora's patent policy available only from RPMFusion repository)
 #Requires:	lame
 #additional runtime dependency (lossy and lossless hybrid compression mode)
 #Requires:	wavpack
+#additional runtime dependency (Monkey?s Audio - lossless compression)
+#Requires:	mac
+
+#Musepack is packaged only as a library
+#Nero AAC encoder is not currently packaged
+
 #version was taken from the program's website
 BuildRequires:	libcddb-devel >= 0.9.5
-BuildRequires: 	gtk2-devel >= 2.4
+BuildRequires:	gtk2-devel >= 2.4
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC
-and/or Wavpack.
+It allows to save tracks from an Audio CD as WAV, OGG, FLAC, Wavpack
+and/or MP3, Monkey's Audio, Musepack, AAC (using third-party software).
 
 %prep
 %setup -q
@@ -38,9 +44,6 @@ make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
-#remove sv locales with broken encoding in 1.5
-mv asunder.desktop asunder.desktop.org
-cat asunder.desktop.org  | grep -v "Comment\[sv\]" > asunder.desktop
 
 make install DESTDIR=%{buildroot}
 
@@ -64,6 +67,12 @@ rm -fr %{buildroot}
 #%{_mandir}/man1/asunder.1*
 
 %changelog
+* Fri Sep 18 2009 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.9-1
+- updated to 1.9
+- added new additional runtime dependencies (Monkey's Audio)
+- precised a description (bug 478352 - thanks to Horst H. von Brand)
+- removed not needed anymore patch fixing sv locales in .desktop file 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Dec 2008 13:41:23 -0000	1.7
+++ sources	18 Sep 2009 20:30:35 -0000	1.8
@@ -1 +1 @@
-6e9bd170497cb9cd36a544bd36e9634c  asunder-1.6.2.tar.bz2
+7cc2969abc9ffe7c077aab1adf37e9e0  asunder-1.9.tar.bz2



From leigh123linux at fedoraproject.org  Fri Sep 18 20:40:58 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 18 Sep 2009 20:40:58 +0000 (UTC)
Subject: rpms/gmixer/devel gmixer.desktop,1.2,1.3 gmixer.spec,1.4,1.5
Message-ID: <20090918204058.E92F311C00EC@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29744

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
- edit desktop file so gmixer launches with trayicon



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/devel/gmixer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmixer.desktop	7 Jun 2009 15:31:19 -0000	1.2
+++ gmixer.desktop	18 Sep 2009 20:40:58 -0000	1.3
@@ -4,7 +4,7 @@ Name=GMixer
 Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
 Comment[fr]=Mixer audio pour l'environnement Gnome
-Exec=gmixer
+Exec=gmixer -d
 Icon=gmixer
 StartupNotify=true
 Type=Application


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/devel/gmixer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gmixer.spec	25 Jul 2009 00:28:24 -0000	1.4
+++ gmixer.spec	18 Sep 2009 20:40:58 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
+- edit desktop file so gmixer launches with trayicon
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Fri Sep 18 20:44:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Sep 2009 20:44:01 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.84,
	1.85 selinux-policy.spec, 1.922, 1.923
Message-ID: <20090918204401.60E8011C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31519

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-4
- Fix request_module line to module_request


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  318 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  177 +++
 policy/modules/apps/sandbox.te            |  323 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   79 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   61 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1403 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 315 files changed, 14507 insertions(+), 2573 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- policy-F12.patch	18 Sep 2009 16:20:04 -0000	1.84
+++ policy-F12.patch	18 Sep 2009 20:44:00 -0000	1.85
@@ -12,12 +12,12 @@ diff -b -B --ignore-all-space --exclude-
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 16:41:29.000000000 -0400
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
  	syslog_console
-+	request_module
++	module_request
  }
  
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -p -r1.922 -r1.923
--- selinux-policy.spec	18 Sep 2009 16:20:05 -0000	1.922
+++ selinux-policy.spec	18 Sep 2009 20:44:00 -0000	1.923
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,6 +447,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-4
+- Fix request_module line to module_request
+
 * Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-3
 - Fix sandbox policy to allow it to run under firefox.  
 - Dont audit leaks.



From leigh123linux at fedoraproject.org  Fri Sep 18 20:45:19 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 18 Sep 2009 20:45:19 +0000 (UTC)
Subject: rpms/gmixer/F-11 gmixer.desktop,1.2,1.3 gmixer.spec,1.2,1.3
Message-ID: <20090918204519.C978111C00EC@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31993

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-7
- edit desktop file so gmixer launches with trayicon



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmixer.desktop	7 Jun 2009 16:11:13 -0000	1.2
+++ gmixer.desktop	18 Sep 2009 20:45:19 -0000	1.3
@@ -4,7 +4,7 @@ Name=GMixer
 Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
 Comment[fr]=Mixer audio pour l'environnement Gnome
-Exec=gmixer
+Exec=gmixer -d
 Icon=gmixer
 StartupNotify=true
 Type=Application


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmixer.spec	7 Jun 2009 16:11:13 -0000	1.2
+++ gmixer.spec	18 Sep 2009 20:45:19 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-7
+- edit desktop file so gmixer launches with trayicon
+
 * Sun Jun 7 2009  Leigh Scott   <leigh123linux at googlemail.com> - 1.3-6
 - bump version as I couldn't remove CVS tag
 



From szpak at fedoraproject.org  Fri Sep 18 20:46:13 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Fri, 18 Sep 2009 20:46:13 +0000 (UTC)
Subject: rpms/asunder/F-10 asunder.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <20090918204613.A6A3511C00EC@cvs1.fedora.phx.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/asunder/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32350

Modified Files:
	asunder.spec sources 
Log Message:
Update to 1.9 (F-10 branch)


Index: asunder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/F-10/asunder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- asunder.spec	5 Jul 2008 12:07:20 -0000	1.5
+++ asunder.spec	18 Sep 2009 20:46:13 -0000	1.6
@@ -1,33 +1,39 @@
 Name:		asunder
 Summary:	A graphical Audio CD ripper and encoder
-Version:	1.6
+Version:	1.9
 Release:	1%{?dist}
 License:	GPLv2
-Group: 		Applications/File
+Group:		Applications/File
 URL:		http://littlesvr.ca/asunder
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/asunder/releases/asunder-%{version}.tar.bz2
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #libcddb is forced by libcddb-devel and proper .so
 #Requires:	libcddb
 Requires:	cdparanoia
 #recommended runtime dependencies
 Requires:	vorbis-tools
 Requires:	flac
-#for mp3 encoding (due to Fedora's patent policy available only from rpm.livna.org repository)
+#for mp3 encoding (due to Fedora's patent policy available only from RPMFusion repository)
 #Requires:	lame
 #additional runtime dependency (lossy and lossless hybrid compression mode)
 #Requires:	wavpack
+#additional runtime dependency (Monkey?s Audio - lossless compression)
+#Requires:	mac
+
+#Musepack is packaged only as a library
+#Nero AAC encoder is not currently packaged
+
 #version was taken from the program's website
 BuildRequires:	libcddb-devel >= 0.9.5
-BuildRequires: 	gtk2-devel >= 2.4
+BuildRequires:	gtk2-devel >= 2.4
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC
-and/or Wavpack.
+It allows to save tracks from an Audio CD as WAV, OGG, FLAC, Wavpack
+and/or MP3, Monkey's Audio, Musepack, AAC (using third-party software).
 
 %prep
 %setup -q
@@ -38,9 +44,6 @@ make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
-#remove sv locales with broken encoding in 1.5
-mv asunder.desktop asunder.desktop.org
-cat asunder.desktop.org  | grep -v "Comment\[sv\]" > asunder.desktop
 
 make install DESTDIR=%{buildroot}
 
@@ -64,6 +67,18 @@ rm -fr %{buildroot}
 #%{_mandir}/man1/asunder.1*
 
 %changelog
+* Fri Sep 18 2009 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.9-1
+- updated to 1.9
+- added new additional runtime dependencies (Monkey's Audio)
+- precised a description (bug 478352 - thanks to Horst H. von Brand)
+- removed not needed anymore patch fixing sv locales in .desktop file 
+
+* Sat Dec 27 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.6.2-1
+- updated to 1.6.2
+
+* Tue Sep 15 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.6.1-1
+- updated to 1.6.1
+
 * Tue Jul 1 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.6-1
 - updated to 1.6
 - removed explicit libcddb dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Jul 2008 12:07:20 -0000	1.6
+++ sources	18 Sep 2009 20:46:13 -0000	1.7
@@ -1 +1 @@
-4b54bd62ad5743094715482a0d4812e4  asunder-1.6.tar.bz2
+7cc2969abc9ffe7c077aab1adf37e9e0  asunder-1.9.tar.bz2



From szpak at fedoraproject.org  Fri Sep 18 20:46:32 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Fri, 18 Sep 2009 20:46:32 +0000 (UTC)
Subject: rpms/asunder/F-11 asunder.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20090918204632.C5B3911C00EC@cvs1.fedora.phx.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/asunder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32484

Modified Files:
	asunder.spec sources 
Log Message:
Update to 1.9 (F-11 branch)


Index: asunder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/F-11/asunder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- asunder.spec	24 Feb 2009 02:48:24 -0000	1.7
+++ asunder.spec	18 Sep 2009 20:46:32 -0000	1.8
@@ -1,33 +1,39 @@
 Name:		asunder
 Summary:	A graphical Audio CD ripper and encoder
-Version:	1.6.2
-Release:	2%{?dist}
+Version:	1.9
+Release:	1%{?dist}
 License:	GPLv2
-Group: 		Applications/File
+Group:		Applications/File
 URL:		http://littlesvr.ca/asunder
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/asunder/releases/asunder-%{version}.tar.bz2
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #libcddb is forced by libcddb-devel and proper .so
 #Requires:	libcddb
 Requires:	cdparanoia
 #recommended runtime dependencies
 Requires:	vorbis-tools
 Requires:	flac
-#for mp3 encoding (due to Fedora's patent policy available only from rpm.livna.org repository)
+#for mp3 encoding (due to Fedora's patent policy available only from RPMFusion repository)
 #Requires:	lame
 #additional runtime dependency (lossy and lossless hybrid compression mode)
 #Requires:	wavpack
+#additional runtime dependency (Monkey?s Audio - lossless compression)
+#Requires:	mac
+
+#Musepack is packaged only as a library
+#Nero AAC encoder is not currently packaged
+
 #version was taken from the program's website
 BuildRequires:	libcddb-devel >= 0.9.5
-BuildRequires: 	gtk2-devel >= 2.4
+BuildRequires:	gtk2-devel >= 2.4
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC
-and/or Wavpack.
+It allows to save tracks from an Audio CD as WAV, OGG, FLAC, Wavpack
+and/or MP3, Monkey's Audio, Musepack, AAC (using third-party software).
 
 %prep
 %setup -q
@@ -38,9 +44,6 @@ make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
-#remove sv locales with broken encoding in 1.5
-mv asunder.desktop asunder.desktop.org
-cat asunder.desktop.org  | grep -v "Comment\[sv\]" > asunder.desktop
 
 make install DESTDIR=%{buildroot}
 
@@ -64,6 +67,12 @@ rm -fr %{buildroot}
 #%{_mandir}/man1/asunder.1*
 
 %changelog
+* Fri Sep 18 2009 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.9-1
+- updated to 1.9
+- added new additional runtime dependencies (Monkey's Audio)
+- precised a description (bug 478352 - thanks to Horst H. von Brand)
+- removed not needed anymore patch fixing sv locales in .desktop file 
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Dec 2008 13:41:23 -0000	1.7
+++ sources	18 Sep 2009 20:46:32 -0000	1.8
@@ -1 +1 @@
-6e9bd170497cb9cd36a544bd36e9634c  asunder-1.6.2.tar.bz2
+7cc2969abc9ffe7c077aab1adf37e9e0  asunder-1.9.tar.bz2



From leigh123linux at fedoraproject.org  Fri Sep 18 20:47:45 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 18 Sep 2009 20:47:45 +0000 (UTC)
Subject: rpms/gmixer/F-10 gmixer.desktop,1.2,1.3 gmixer.spec,1.2,1.3
Message-ID: <20090918204745.A8F7211C00EC@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1523

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-7
- edit desktop file so gmixer launches with trayicon



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-10/gmixer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmixer.desktop	7 Jun 2009 16:15:15 -0000	1.2
+++ gmixer.desktop	18 Sep 2009 20:47:45 -0000	1.3
@@ -4,7 +4,7 @@ Name=GMixer
 Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
 Comment[fr]=Mixer audio pour l'environnement Gnome
-Exec=gmixer
+Exec=gmixer -d
 Icon=gmixer
 StartupNotify=true
 Type=Application


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-10/gmixer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmixer.spec	7 Jun 2009 16:15:15 -0000	1.2
+++ gmixer.spec	18 Sep 2009 20:47:45 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-7
+- edit desktop file so gmixer launches with trayicon
+
 * Sun Jun 7 2009  Leigh Scott   <leigh123linux at googlemail.com> - 1.3-6
 - bump version as I couldn't remove CVS tag
 



From ndim at fedoraproject.org  Fri Sep 18 20:55:17 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri, 18 Sep 2009 20:55:17 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.48, 1.49 sources,
	1.48, 1.49 xorg-x11-drv-radeonhd-README.fedora, 1.48,
	1.49 xorg-x11-drv-radeonhd.spec, 1.64, 1.65
Message-ID: <20090918205517.4AFF211C00EC@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5282

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.13.20090918git
- configure with --disable-shave (we occasionally need to debug the build)
- Add Xorg ABI dependency for F12 (1.6.99.*), removing the one from F9
- Update README.fedora with new chipset support
- New snapshot (upstream commit ae41ab2fe49ca456c4fb23859af8683c32c2429c):
  For details, run git log. Short summary:
  - DRI/DRM/EXA used by default on R5xx, R6xx
  - Some support for R7xx, R8xx
  - Some NULL check and logic fixes
  - xextproto 7.1 support
  - and more



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	14 Jul 2009 21:26:19 -0000	1.48
+++ .cvsignore	18 Sep 2009 20:55:16 -0000	1.49
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.5-20090714git.tar.lzma
+xf86-video-radeonhd-1.2.5-20090918git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	14 Jul 2009 21:26:20 -0000	1.48
+++ sources	18 Sep 2009 20:55:17 -0000	1.49
@@ -1 +1 @@
-b66f7e157e5ab5404e62f69184b9d3c5  xf86-video-radeonhd-1.2.5-20090714git.tar.lzma
+b481c30c456178d612ccda3d80dfd8fb  xf86-video-radeonhd-1.2.5-20090918git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-radeonhd-README.fedora	14 Jul 2009 21:26:20 -0000	1.48
+++ xorg-x11-drv-radeonhd-README.fedora	18 Sep 2009 20:55:17 -0000	1.49
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: bc42c63d0cf7756a9d31c16d68d1c33a9e225b83
+Latest upstream commit: ae41ab2fe49ca456c4fb23859af8683c32c2429c
 
 
 Contents
@@ -29,30 +29,30 @@ Contents
 ====================
 
 Radeonhd is the long-awaited open source X.org driver for newer
-graphics cards using a R5xx/R6xx/R7xx series GPU made by AMD GPG
+graphics cards using a R5xx/R6xx/R7xx/R8xx series GPU made by AMD GPG
 (a.k.a. ATI), written with docs supplied by AMD.
 
 
 2. Another Driver For The Same Chips
 ====================================
 
-There are two driver projects supporting R5xx/R6xx/R7xx cards:
+There are two driver projects supporting R5xx/R6xx/R7xx/R8xx cards:
 
   * xf86-video-radeonhd (upstream name)
     xorg-x11-drv-radeonhd (Fedora package name) (this package!)
     radeonhd (Xorg driver module name)
-    Supports only R5xx, R6xx, R7xx.
+    Supports only R5xx, R6xx, R7xx, R8xx.
 
   * xf86-video-ati (upstream name)
     xorg-x11-drv-ati (Fedora package name)
     radeon (Xorg driver module name)
-    Supports R1xx through R7xx.
+    Supports R1xx through R8xx.
 
 
 3. How To Use RADEONHD
 ======================
 
-On Fedora systems, by default, the ATI R5xx/R6xx/R7xx chips are
+On Fedora systems, by default, the ATI R5xx/R6xx/R7xx/R8xx chips are
 handled by radeon(4) from the xorg-x11-drv-ati package.
 
 To use the radeonhd(4) driver from the xorg-x11-drv-radeonhd
@@ -74,7 +74,8 @@ A minimal /etc/X11/xorg.conf file could 
   * Conflicts with kernel based modesetting (KMS). Boot kernel
     with option "nomodeset" to use radeonhd(4).
 
-  * 3D acceleration for R6xx and R7xx chipsets not supported yet.
+  * 3D acceleration for R6xx and later chipsets not supported yet.
+    Mostly due to mesa, not to the driver, though.
 
 
 5. Resources


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- xorg-x11-drv-radeonhd.spec	29 Jul 2009 07:08:29 -0000	1.64
+++ xorg-x11-drv-radeonhd.spec	18 Sep 2009 20:55:17 -0000	1.65
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20090714
-%define git_commit bc42c63d0cf7756a9d31c16d68d1c33a9e225b83
+%define date 20090918
+%define git_commit ae41ab2fe49ca456c4fb23859af8683c32c2429c
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.5
-Release:       3.11%{?alphatag}%{?dist}
+Release:       3.13%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -85,13 +85,13 @@ Requires:      xorg-x11-server-Xorg >= 1
 Requires:      xorg-x11-server-utils >= 7.3-2
 %endif
 
-# Avoid ABI issue in Fedora 9 and later
-%if 0%{?fedora} >= 9
-BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
-Requires: xorg-x11-server-Xorg >= 1.4.99.1
+# Avoid ABI issue in Fedora 12 and later
+%if 0%{?fedora} >= 12
+BuildRequires: xorg-x11-server-sdk >= 1.6.99.1
+Requires: xorg-x11-server-Xorg >= 1.6.99.1
 %else
-BuildRequires: xorg-x11-server-sdk < 1.4.99.1
-Requires: xorg-x11-server-Xorg < 1.4.99.1
+BuildRequires: xorg-x11-server-sdk < 1.6.99.1
+Requires: xorg-x11-server-Xorg < 1.6.99.1
 %endif
 
 # DRI support
@@ -123,7 +123,7 @@ Built from git commit: %{git_commit}
 sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
 %build
-%{configure} --with-xorg-module-dir=%{moduledir} --disable-static
+%{configure} --with-xorg-module-dir=%{moduledir} --disable-static --disable-shave
 %{__make} %{?_smp_mflags}
 %{__cp} -p %{SOURCE2} README.fedora
 %if %{ship_utils}
@@ -170,6 +170,18 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.13.20090918git
+- configure with --disable-shave (we occasionally need to debug the build)
+- Add Xorg ABI dependency for F12 (1.6.99.*), removing the one from F9
+- Update README.fedora with new chipset support
+- New snapshot (upstream commit ae41ab2fe49ca456c4fb23859af8683c32c2429c):
+  For details, run git log. Short summary:
+  - DRI/DRM/EXA used by default on R5xx, R6xx
+  - Some support for R7xx, R8xx
+  - Some NULL check and logic fixes
+  - xextproto 7.1 support
+  - and more
+
 * Wed Jul 29 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.11.20090714git
 - F12 moves some header files from xorg-x11-proto-devel to libXext-devel
 



From ndim at fedoraproject.org  Fri Sep 18 20:56:46 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri, 18 Sep 2009 20:56:46 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/F-11 .cvsignore, 1.48, 1.49 sources, 1.48,
	1.49 xorg-x11-drv-radeonhd-README.fedora, 1.48,
	1.49 xorg-x11-drv-radeonhd.spec, 1.61, 1.62
Message-ID: <20090918205646.A980711C00EC@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5815

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.13.20090918git
- configure with --disable-shave (we occasionally need to debug the build)
- Add Xorg ABI dependency for F12 (1.6.99.*), removing the one from F9
- Update README.fedora with new chipset support
- New snapshot (upstream commit ae41ab2fe49ca456c4fb23859af8683c32c2429c):
  For details, run git log. Short summary:
  - DRI/DRM/EXA used by default on R5xx, R6xx
  - Some support for R7xx, R8xx
  - Some NULL check and logic fixes
  - xextproto 7.1 support
  - and more



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	17 Jul 2009 17:57:55 -0000	1.48
+++ .cvsignore	18 Sep 2009 20:56:46 -0000	1.49
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.5-20090714git.tar.lzma
+xf86-video-radeonhd-1.2.5-20090918git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	17 Jul 2009 17:57:55 -0000	1.48
+++ sources	18 Sep 2009 20:56:46 -0000	1.49
@@ -1 +1 @@
-b66f7e157e5ab5404e62f69184b9d3c5  xf86-video-radeonhd-1.2.5-20090714git.tar.lzma
+b481c30c456178d612ccda3d80dfd8fb  xf86-video-radeonhd-1.2.5-20090918git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-radeonhd-README.fedora	17 Jul 2009 17:57:55 -0000	1.48
+++ xorg-x11-drv-radeonhd-README.fedora	18 Sep 2009 20:56:46 -0000	1.49
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: bc42c63d0cf7756a9d31c16d68d1c33a9e225b83
+Latest upstream commit: ae41ab2fe49ca456c4fb23859af8683c32c2429c
 
 
 Contents
@@ -29,30 +29,30 @@ Contents
 ====================
 
 Radeonhd is the long-awaited open source X.org driver for newer
-graphics cards using a R5xx/R6xx/R7xx series GPU made by AMD GPG
+graphics cards using a R5xx/R6xx/R7xx/R8xx series GPU made by AMD GPG
 (a.k.a. ATI), written with docs supplied by AMD.
 
 
 2. Another Driver For The Same Chips
 ====================================
 
-There are two driver projects supporting R5xx/R6xx/R7xx cards:
+There are two driver projects supporting R5xx/R6xx/R7xx/R8xx cards:
 
   * xf86-video-radeonhd (upstream name)
     xorg-x11-drv-radeonhd (Fedora package name) (this package!)
     radeonhd (Xorg driver module name)
-    Supports only R5xx, R6xx, R7xx.
+    Supports only R5xx, R6xx, R7xx, R8xx.
 
   * xf86-video-ati (upstream name)
     xorg-x11-drv-ati (Fedora package name)
     radeon (Xorg driver module name)
-    Supports R1xx through R7xx.
+    Supports R1xx through R8xx.
 
 
 3. How To Use RADEONHD
 ======================
 
-On Fedora systems, by default, the ATI R5xx/R6xx/R7xx chips are
+On Fedora systems, by default, the ATI R5xx/R6xx/R7xx/R8xx chips are
 handled by radeon(4) from the xorg-x11-drv-ati package.
 
 To use the radeonhd(4) driver from the xorg-x11-drv-radeonhd
@@ -74,7 +74,8 @@ A minimal /etc/X11/xorg.conf file could 
   * Conflicts with kernel based modesetting (KMS). Boot kernel
     with option "nomodeset" to use radeonhd(4).
 
-  * 3D acceleration for R6xx and R7xx chipsets not supported yet.
+  * 3D acceleration for R6xx and later chipsets not supported yet.
+    Mostly due to mesa, not to the driver, though.
 
 
 5. Resources


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xorg-x11-drv-radeonhd.spec	17 Jul 2009 17:57:55 -0000	1.61
+++ xorg-x11-drv-radeonhd.spec	18 Sep 2009 20:56:46 -0000	1.62
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20090714
-%define git_commit bc42c63d0cf7756a9d31c16d68d1c33a9e225b83
+%define date 20090918
+%define git_commit ae41ab2fe49ca456c4fb23859af8683c32c2429c
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.5
-Release:       2.10%{?alphatag}%{?dist}
+Release:       3.13%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -85,19 +85,24 @@ Requires:      xorg-x11-server-Xorg >= 1
 Requires:      xorg-x11-server-utils >= 7.3-2
 %endif
 
-# Avoid ABI issue in Fedora 9 and later
-%if 0%{?fedora} >= 9
-BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
-Requires: xorg-x11-server-Xorg >= 1.4.99.1
+# Avoid ABI issue in Fedora 12 and later
+%if 0%{?fedora} >= 12
+BuildRequires: xorg-x11-server-sdk >= 1.6.99.1
+Requires: xorg-x11-server-Xorg >= 1.6.99.1
 %else
-BuildRequires: xorg-x11-server-sdk < 1.4.99.1
-Requires: xorg-x11-server-Xorg < 1.4.99.1
+BuildRequires: xorg-x11-server-sdk < 1.6.99.1
+Requires: xorg-x11-server-Xorg < 1.6.99.1
 %endif
 
 # DRI support
 BuildRequires: libdrm-devel
-BuildRequires: xorg-x11-proto-devel
 BuildRequires: mesa-libGL-devel
+BuildRequires: xorg-x11-proto-devel
+%if 0%{?fedora} >= 12
+# F12 moves some header files from xorg-x11-proto-devel to libXext-devel
+BuildRequires: libXext-devel
+%endif
+
 
 %description
 X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets.
@@ -118,7 +123,7 @@ Built from git commit: %{git_commit}
 sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
 %build
-%{configure} --with-xorg-module-dir=%{moduledir} --disable-static
+%{configure} --with-xorg-module-dir=%{moduledir} --disable-static --disable-shave
 %{__make} %{?_smp_mflags}
 %{__cp} -p %{SOURCE2} README.fedora
 %if %{ship_utils}
@@ -165,6 +170,24 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.13.20090918git
+- configure with --disable-shave (we occasionally need to debug the build)
+- Add Xorg ABI dependency for F12 (1.6.99.*), removing the one from F9
+- Update README.fedora with new chipset support
+- New snapshot (upstream commit ae41ab2fe49ca456c4fb23859af8683c32c2429c):
+  For details, run git log. Short summary:
+  - DRI/DRM/EXA used by default on R5xx, R6xx
+  - Some support for R7xx, R8xx
+  - Some NULL check and logic fixes
+  - xextproto 7.1 support
+  - and more
+
+* Wed Jul 29 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.11.20090714git
+- F12 moves some header files from xorg-x11-proto-devel to libXext-devel
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-3.10.20090714git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-2.10.20090714git
 - compile with DRI support again (add mesa-libGL-devel build requirement)
 



From kalev at fedoraproject.org  Fri Sep 18 20:57:52 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 18 Sep 2009 20:57:52 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel mingw32-libp11.spec,1.5,1.6
Message-ID: <20090918205752.5C2CD11C00EC@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6748

Modified Files:
	mingw32-libp11.spec 
Log Message:
Rebuilt to fix debuginfo



Index: mingw32-libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/mingw32-libp11.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libp11.spec	30 Aug 2009 01:30:20 -0000	1.5
+++ mingw32-libp11.spec	18 Sep 2009 20:57:51 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libp11
 Version:        0.2.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MingGW Windows libp11 library
 
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-4
+- Rebuilt to fix debuginfo
+
 * Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-3
 - Rebuilt with new mingw32-openssl
 



From trasher at fedoraproject.org  Fri Sep 18 20:57:56 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 18 Sep 2009 20:57:56 +0000 (UTC)
Subject: rpms/eric/devel eric.spec,1.48,1.49
Message-ID: <20090918205756.4B2AF11C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6766

Modified Files:
	eric.spec 
Log Message:
Add default suffix for qt4 apps



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- eric.spec	14 Sep 2009 03:33:25 -0000	1.48
+++ eric.spec	18 Sep 2009 20:57:55 -0000	1.49
@@ -8,7 +8,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 4.3.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -118,6 +118,9 @@ chmod a-x %{buildroot}%{python_sitedir}/
 # add envrionment variables for qt, qt4 and python documentations
 sed -i -e 's|exec|QT4DIR=%{_libdir}/qt4\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?full_python_ver}/html\nQTDOCDIR=%{_docdir}/qt-devel-%{?qt_ver}/html\nQT4DOCDIR=%{_docdir}/qt4/html\nPYQT4DOCDIR=%{_docdir}/PyQt4-devel-%{?pyqt_ver}/html\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR PYQT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric4
 
+# add qt4 suffix
+sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' %{buildroot}%{python_sitedir}/eric4/Preferences/__init__.py
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -149,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
+- add default suffix for qt4 apps
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-1
 - 4.3.7.1
 - add BR on qscintilla-python since qscintilla-python-devel no longer



From ajax at fedoraproject.org  Fri Sep 18 20:58:29 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 18 Sep 2009 20:58:29 +0000 (UTC)
Subject: rpms/xorg-x11-drv-r128/devel r128-6.8.1-panel-hack.patch, NONE,
	1.1 xorg-x11-drv-r128.spec, 1.6, 1.7
Message-ID: <20090918205829.31E4C11C00EC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-r128/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7356

Modified Files:
	xorg-x11-drv-r128.spec 
Added Files:
	r128-6.8.1-panel-hack.patch 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 6.8.1-2
- r128-6.8.1-panel-hack.patch: Set sync ranges based on panel size.


r128-6.8.1-panel-hack.patch:
 r128_driver.c |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE r128-6.8.1-panel-hack.patch ---
diff -up xf86-video-r128-6.8.1/src/r128_driver.c.jx xf86-video-r128-6.8.1/src/r128_driver.c
--- xf86-video-r128-6.8.1/src/r128_driver.c.jx	2009-07-28 01:15:42.000000000 -0400
+++ xf86-video-r128-6.8.1/src/r128_driver.c	2009-09-18 16:56:54.000000000 -0400
@@ -1700,7 +1700,22 @@ static Bool R128PreInitModes(ScrnInfoPtr
                 R128SetSyncRangeFromEdid(pScrn, 1);
             if(pScrn->monitor->nVrefresh <= 0)
                 R128SetSyncRangeFromEdid(pScrn, 0);
-        }
+        } else if (info->PanelXRes && info->PanelYRes) {
+	    DisplayModePtr mode = xf86CVTMode(info->PanelXRes, info->PanelYRes,
+					      60, 1, 0);
+
+	    pScrn->monitor->nHsync = 1;
+	    pScrn->monitor->hsync[0].lo = 31.5;
+	    pScrn->monitor->hsync[0].hi =
+		(float)mode->Clock / (float)mode->HTotal;
+	    pScrn->monitor->nVrefresh = 1;
+	    pScrn->monitor->vrefresh[0].lo = 56.0;
+	    pScrn->monitor->vrefresh[0].hi =
+		(float)mode->Clock*1000.0 / (float)mode->HTotal /
+		(float)mode->VTotal;
+
+	    xfree(mode);
+	}
 
         modesFound = xf86ValidateModes(pScrn,
 				   pScrn->monitor->Modes,


Index: xorg-x11-drv-r128.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-r128/devel/xorg-x11-drv-r128.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xorg-x11-drv-r128.spec	4 Aug 2009 05:17:05 -0000	1.6
+++ xorg-x11-drv-r128.spec	18 Sep 2009 20:58:29 -0000	1.7
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 r128 video driver
 Name:      xorg-x11-drv-r128
 Version:   6.8.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   r128.xinf
 
+Patch0:	    r128-6.8.1-panel-hack.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
@@ -30,6 +32,7 @@ X.Org X11 r128 video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .panel
 
 %build
 # aclocal ; automake -a ; autoconf
@@ -57,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/r128.4*
 
 %changelog
+* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 6.8.1-2
+- r128-6.8.1-panel-hack.patch: Set sync ranges based on panel size.
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.8.1-1
 - r128 6.8.1
 



From kalev at fedoraproject.org  Fri Sep 18 21:02:39 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 18 Sep 2009 21:02:39 +0000 (UTC)
Subject: rpms/mingw32-opensc/devel .cvsignore, 1.3, 1.4 mingw32-opensc.spec, 
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090918210239.20AFD11C00EC@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9263

Modified Files:
	.cvsignore mingw32-opensc.spec sources 
Log Message:
Update to 0.11.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 May 2009 01:55:31 -0000	1.3
+++ .cvsignore	18 Sep 2009 21:02:38 -0000	1.4
@@ -1 +1 @@
-opensc-0.11.8.tar.gz
+opensc-0.11.9.tar.gz


Index: mingw32-opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/mingw32-opensc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-opensc.spec	30 Aug 2009 01:28:52 -0000	1.5
+++ mingw32-opensc.spec	18 Sep 2009 21:02:38 -0000	1.6
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-opensc
-Version:        0.11.8
-Release:        4%{?dist}
+Version:        0.11.9
+Release:        1%{?dist}
 Summary:        MingGW Windows OpenSC library
 
 Group:          Development/Libraries
@@ -47,11 +47,8 @@ This is the MinGW cross-compiled Windows
 %setup -q -n opensc-%{version}
 %patch1 -p1 -b .config
 
-sed -i -e 's|"/lib /usr/lib\b|"%{_mingw32_libdir}|' configure # lib64 rpaths
-cp -p src/pkcs15init/README ./README.pkcs15init
-cp -p src/scconf/README.scconf .
-# No %{_mingw32_libdir} here to avoid multilib conflicts; it's just an example
-sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in
+sed -i -e 's|"/lib /usr/lib\b|"%{_mingw32_libdir}|' configure
+sed -i -e 's|/usr/local/towitoko/lib/|%{_mingw32_libdir}/ctapi/|' etc/opensc.conf.in
 
 
 %build
@@ -62,11 +59,12 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT _docs
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/opensc.conf
 
-mv -T $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/opensc docdir
+# Remove docs which duplicate the ones in native package
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/opensc
 
 # Remove a wrapper shell script
 rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/cardos-info
@@ -78,8 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README*
-%doc docdir/*
+%doc COPYING
 %config(noreplace) %{_mingw32_sysconfdir}/opensc.conf
 
 %{_mingw32_bindir}/cardos-info.bat
@@ -126,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.9-1
+- Update to 0.11.9
+- Removed docs which duplicate the ones in native package
+- Spec file cleanups
+
 * Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.8-4
 - Rebuilt with new mingw32-openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 May 2009 01:55:32 -0000	1.3
+++ sources	18 Sep 2009 21:02:38 -0000	1.4
@@ -1 +1 @@
-a269b478b18dddb648b9bd930206b5a8  opensc-0.11.8.tar.gz
+ff9b5ee4f00693873d54d83398e20847  opensc-0.11.9.tar.gz



From trasher at fedoraproject.org  Fri Sep 18 21:09:41 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 18 Sep 2009 21:09:41 +0000 (UTC)
Subject: rpms/BackupPC/devel BackupPC.spec,1.10,1.11
Message-ID: <20090918210941.AD3BD11C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12936

Modified Files:
	BackupPC.spec 
Log Message:
Fix SELinux rules (bug #512035)



Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- BackupPC.spec	24 Jul 2009 14:59:58 -0000	1.10
+++ BackupPC.spec	18 Sep 2009 21:09:41 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -95,11 +95,9 @@ allow httpd_t httpd_sys_content_t:sock_f
 EOF
 
 cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
-%{_sysconfdir}/%{name}/config.pl        system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_content_t,s0)
+%{_sysconfdir}/%{name}/pc(/.*)?         gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
+%{_localstatedir}/log/%{name}(/.*)?     gen_context(system_u:object_r:httpd_sys_content_t,s0)
 EOF
 %endif
 
@@ -228,6 +226,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-7
+- Fix SELinux policy module for UserEmailInfo.pl file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Fri Sep 18 21:16:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 18 Sep 2009 21:16:40 +0000 (UTC)
Subject: rpms/python-morbid/EL-5 python-morbid.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090918211640.D13F511C00EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-morbid/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16739/EL-5

Modified Files:
	python-morbid.spec sources 
Log Message:
0.8.7.3, needed for orbited


Index: python-morbid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/EL-5/python-morbid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-morbid.spec	15 May 2009 18:02:42 -0000	1.1
+++ python-morbid.spec	18 Sep 2009 21:16:40 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:			python-morbid
 Summary:		A lightweight message queue for bundled deployment
-Version:		0.8.6.1
+Version:		0.8.7.3
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Daemons
@@ -41,5 +41,8 @@ rm -rf %{buildroot}
 %{python_sitelib}/morbid*.egg-info/
 
 %changelog
+* Fri Sep 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.7.3-1
+- update to current, needed for orbited
+
 * Wed May 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.6.1-1
 - Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2009 18:02:42 -0000	1.2
+++ sources	18 Sep 2009 21:16:40 -0000	1.3
@@ -1 +1 @@
-1099adca419e0347d32198557854a2c1  morbid-0.8.6.1.tar.gz
+5a2458def7e583a10c46c046dbab9c4a  morbid-0.8.7.3.tar.gz



From spot at fedoraproject.org  Fri Sep 18 21:16:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 18 Sep 2009 21:16:40 +0000 (UTC)
Subject: rpms/python-morbid/F-10 python-morbid.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090918211640.EBE0011C01EA@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-morbid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16739/F-10

Modified Files:
	python-morbid.spec sources 
Log Message:
0.8.7.3, needed for orbited


Index: python-morbid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/F-10/python-morbid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-morbid.spec	15 May 2009 18:02:42 -0000	1.1
+++ python-morbid.spec	18 Sep 2009 21:16:40 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:			python-morbid
 Summary:		A lightweight message queue for bundled deployment
-Version:		0.8.6.1
+Version:		0.8.7.3
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Daemons
@@ -41,5 +41,11 @@ rm -rf %{buildroot}
 %{python_sitelib}/morbid*.egg-info/
 
 %changelog
+* Fri Sep 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.7.3-1
+- update to current, needed for orbited
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.6.1-1
 - Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2009 18:02:42 -0000	1.2
+++ sources	18 Sep 2009 21:16:40 -0000	1.3
@@ -1 +1 @@
-1099adca419e0347d32198557854a2c1  morbid-0.8.6.1.tar.gz
+5a2458def7e583a10c46c046dbab9c4a  morbid-0.8.7.3.tar.gz



From spot at fedoraproject.org  Fri Sep 18 21:16:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 18 Sep 2009 21:16:41 +0000 (UTC)
Subject: rpms/python-morbid/F-11 python-morbid.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090918211641.3F09211C00EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-morbid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16739/F-11

Modified Files:
	python-morbid.spec sources 
Log Message:
0.8.7.3, needed for orbited


Index: python-morbid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/F-11/python-morbid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-morbid.spec	15 May 2009 18:02:42 -0000	1.1
+++ python-morbid.spec	18 Sep 2009 21:16:41 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:			python-morbid
 Summary:		A lightweight message queue for bundled deployment
-Version:		0.8.6.1
+Version:		0.8.7.3
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Daemons
@@ -41,5 +41,11 @@ rm -rf %{buildroot}
 %{python_sitelib}/morbid*.egg-info/
 
 %changelog
+* Fri Sep 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.7.3-1
+- update to current, needed for orbited
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.6.1-1
 - Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2009 18:02:42 -0000	1.2
+++ sources	18 Sep 2009 21:16:41 -0000	1.3
@@ -1 +1 @@
-1099adca419e0347d32198557854a2c1  morbid-0.8.6.1.tar.gz
+5a2458def7e583a10c46c046dbab9c4a  morbid-0.8.7.3.tar.gz



From spot at fedoraproject.org  Fri Sep 18 21:16:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 18 Sep 2009 21:16:41 +0000 (UTC)
Subject: rpms/python-morbid/devel .cvsignore, 1.2, 1.3 python-morbid.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090918211641.7BF5A11C00EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-morbid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16739/devel

Modified Files:
	.cvsignore python-morbid.spec sources 
Log Message:
0.8.7.3, needed for orbited


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2009 17:39:28 -0000	1.2
+++ .cvsignore	18 Sep 2009 21:16:41 -0000	1.3
@@ -1 +1 @@
-morbid-0.8.6.1.tar.gz
+morbid-0.8.7.3.tar.gz


Index: python-morbid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/devel/python-morbid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-morbid.spec	26 Jul 2009 20:41:56 -0000	1.2
+++ python-morbid.spec	18 Sep 2009 21:16:41 -0000	1.3
@@ -2,8 +2,8 @@
 
 Name:			python-morbid
 Summary:		A lightweight message queue for bundled deployment
-Version:		0.8.6.1
-Release:		2%{?dist}
+Version:		0.8.7.3
+Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Daemons
 URL:			http://www.morbidq.com
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/morbid*.egg-info/
 
 %changelog
+* Fri Sep 18 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.7.3-1
+- update to current, needed for orbited
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-morbid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2009 17:39:28 -0000	1.2
+++ sources	18 Sep 2009 21:16:41 -0000	1.3
@@ -1 +1 @@
-1099adca419e0347d32198557854a2c1  morbid-0.8.6.1.tar.gz
+5a2458def7e583a10c46c046dbab9c4a  morbid-0.8.7.3.tar.gz



From trasher at fedoraproject.org  Fri Sep 18 21:17:04 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 18 Sep 2009 21:17:04 +0000 (UTC)
Subject: rpms/BackupPC/F-11 BackupPC.spec,1.9,1.10
Message-ID: <20090918211704.607A611C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16868

Modified Files:
	BackupPC.spec 
Log Message:
Fix SELinux rules (bug #512035)



Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/F-11/BackupPC.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- BackupPC.spec	10 Apr 2009 16:04:54 -0000	1.9
+++ BackupPC.spec	18 Sep 2009 21:17:03 -0000	1.10
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -95,11 +95,9 @@ allow httpd_t httpd_sys_content_t:sock_f
 EOF
 
 cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
-%{_sysconfdir}/%{name}/config.pl        system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_content_t,s0)
+%{_sysconfdir}/%{name}/pc(/.*)?         gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
+%{_localstatedir}/log/%{name}(/.*)?     gen_context(system_u:object_r:httpd_sys_content_t,s0)
 EOF
 %endif
 
@@ -228,6 +226,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-6
+- Fix SELinux policy module for UserEmailInfo.pl file
+
 * Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-5
 - Fix TopDir change (bug #473944)
 



From trasher at fedoraproject.org  Fri Sep 18 21:17:21 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 18 Sep 2009 21:17:21 +0000 (UTC)
Subject: rpms/BackupPC/F-10 BackupPC.spec,1.7,1.8
Message-ID: <20090918211721.0EE0711C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17146

Modified Files:
	BackupPC.spec 
Log Message:
Fix SELinux rules (bug #512035)



Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/F-10/BackupPC.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- BackupPC.spec	10 Apr 2009 16:13:11 -0000	1.7
+++ BackupPC.spec	18 Sep 2009 21:17:20 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -95,11 +95,9 @@ allow httpd_t httpd_sys_content_t:sock_f
 EOF
 
 cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
-%{_sysconfdir}/%{name}/config.pl        system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_content_t,s0)
+%{_sysconfdir}/%{name}/pc(/.*)?         gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
+%{_localstatedir}/log/%{name}(/.*)?     gen_context(system_u:object_r:httpd_sys_content_t,s0)
 EOF
 %endif
 
@@ -228,6 +226,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-5
+- Fix SELinux policy module for UserEmailInfo.pl file
+
 * Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-4
 - Fix TopDir change (bug #473944)
 



From epienbro at fedoraproject.org  Fri Sep 18 21:20:23 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:20:23 +0000 (UTC)
Subject: rpms/mingw32-enchant/devel mingw32-enchant.spec,1.2,1.3
Message-ID: <20090918212023.C6A1E11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-enchant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18929

Modified Files:
	mingw32-enchant.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-enchant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-enchant/devel/mingw32-enchant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-enchant.spec	30 Aug 2009 10:49:07 -0000	1.2
+++ mingw32-enchant.spec	18 Sep 2009 21:20:23 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:       MinGW Windows Enchanting Spell Checking Library
 Name:          mingw32-enchant
 Version:       1.5.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 Group:         System Environment/Libraries
 License:       LGPLv2+
 Source0:       http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-4
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-3
 - Automatically generate debuginfo subpackage
 



From trasher at fedoraproject.org  Fri Sep 18 21:21:23 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 18 Sep 2009 21:21:23 +0000 (UTC)
Subject: rpms/eric/F-11 eric.spec,1.45,1.46
Message-ID: <20090918212123.B8ACE11C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19492

Modified Files:
	eric.spec 
Log Message:
Add default suffix for qt4 apps


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/eric.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- eric.spec	14 Sep 2009 03:51:26 -0000	1.45
+++ eric.spec	18 Sep 2009 21:21:23 -0000	1.46
@@ -8,7 +8,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 4.3.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -118,6 +118,9 @@ chmod a-x %{buildroot}%{python_sitedir}/
 # add envrionment variables for qt, qt4 and python documentations
 sed -i -e 's|exec|QT4DIR=%{_libdir}/qt4\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?full_python_ver}/html\nQTDOCDIR=%{_docdir}/qt-devel-%{?qt_ver}/html\nQT4DOCDIR=%{_docdir}/qt4/html\nPYQT4DOCDIR=%{_docdir}/PyQt4-devel-%{?pyqt_ver}/html\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR PYQT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric4
 
+# add qt4 suffix
+sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' %{buildroot}%{python_sitedir}/eric4/Preferences/__init__.py
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -149,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
+- add default suffix for qt4 apps
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-1
 - 4.3.7.1
 - add BR on qscintilla-python since qscintilla-python-devel no longer



From epienbro at fedoraproject.org  Fri Sep 18 21:21:46 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:21:46 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel mingw32-glib2.spec,1.15,1.16
Message-ID: <20090918212146.232B911C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19662

Modified Files:
	mingw32-glib2.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mingw32-glib2.spec	5 Sep 2009 09:05:48 -0000	1.15
+++ mingw32-glib2.spec	18 Sep 2009 21:21:46 -0000	1.16
@@ -7,7 +7,7 @@
 
 Name:           mingw32-glib2
 Version:        2.21.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.6-2
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sat Sep  5 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.6-1
 - Update to 2.21.6
 



From trasher at fedoraproject.org  Fri Sep 18 21:22:36 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 18 Sep 2009 21:22:36 +0000 (UTC)
Subject: rpms/eric/F-10 eric.spec,1.42,1.43
Message-ID: <20090918212236.0DC6511C00EC@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20460

Modified Files:
	eric.spec 
Log Message:
Add default suffix for qt4 apps


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/eric.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- eric.spec	14 Sep 2009 04:31:01 -0000	1.42
+++ eric.spec	18 Sep 2009 21:22:35 -0000	1.43
@@ -8,7 +8,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 4.3.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -118,6 +118,9 @@ chmod a-x %{buildroot}%{python_sitedir}/
 # add envrionment variables for qt, qt4 and python documentations
 sed -i -e 's|exec|QT4DIR=%{_libdir}/qt4\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?full_python_ver}/html\nQTDOCDIR=%{_docdir}/qt-devel-%{?qt_ver}/html\nQT4DOCDIR=%{_docdir}/qt4/html\nPYQT4DOCDIR=%{_docdir}/PyQt4-devel-%{?pyqt_ver}/html\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR PYQT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric4
 
+# add qt4 suffix
+sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' %{buildroot}%{python_sitedir}/eric4/Preferences/__init__.py
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -149,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
+- add default suffix for qt4 apps
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-1
 - 4.3.7.1
 - add BR on qscintilla-python since qscintilla-python-devel no longer



From epienbro at fedoraproject.org  Fri Sep 18 21:25:06 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:25:06 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2.spec,1.15,1.16
Message-ID: <20090918212506.6335811C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21717

Modified Files:
	mingw32-gtk2.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mingw32-gtk2.spec	5 Sep 2009 09:52:03 -0000	1.15
+++ mingw32-gtk2.spec	18 Sep 2009 21:25:06 -0000	1.16
@@ -7,7 +7,7 @@
 
 Name:           mingw32-gtk2
 Version:        2.17.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -336,7 +336,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
+
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-2
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sat Sep  5 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-1
 - Update to 2.17.11
 



From dcbw at fedoraproject.org  Fri Sep 18 21:28:44 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 18 Sep 2009 21:28:44 +0000 (UTC)
Subject: rpms/mobile-broadband-provider-info/devel .cvsignore, 1.3,
	1.4 mobile-broadband-provider-info.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090918212844.89B8F11C00EC@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/mobile-broadband-provider-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24315

Modified Files:
	.cvsignore mobile-broadband-provider-info.spec sources 
Log Message:
* Fri Sep 18 2009 Dan Williams <dcbw at redhat.com> - 1.20090918-1
- Update to latest upstream release including:
- Algeria, Australia, Belarus, Belgium, Brazil
- Brunei, Bulgaria, Egypt, Finland, Ghana, Greece
- India, Italy, Kazakhstan, Korean CDMA operators
- Kuwait, Mali, Netherlands, Paraguay, Serbia
- Spain, Sweden, UK




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Jul 2009 14:01:23 -0000	1.3
+++ .cvsignore	18 Sep 2009 21:28:41 -0000	1.4
@@ -1,2 +1,3 @@
 mobile-broadband-provider-info-20090602.tar.bz2
 mobile-broadband-provider-info-20090707.tar.bz2
+mobile-broadband-provider-info-20090918.tar.bz2


Index: mobile-broadband-provider-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/devel/mobile-broadband-provider-info.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mobile-broadband-provider-info.spec	11 Aug 2009 07:41:22 -0000	1.4
+++ mobile-broadband-provider-info.spec	18 Sep 2009 21:28:42 -0000	1.5
@@ -1,9 +1,9 @@
-%define upstream_version 20090707
+%define upstream_version 20090918
 
 Summary: Mobile broadband provider database
 Name: mobile-broadband-provider-info
 Version: 1.%{upstream_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 #
 # Source from git://git.gnome.org/mobile-broadband-provider-info
 # tarball built with:
@@ -59,6 +59,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Sep 18 2009 Dan Williams <dcbw at redhat.com> - 1.20090918-1
+- Update to latest upstream release including:
+- Algeria, Australia, Belarus, Belgium, Brazil
+- Brunei, Bulgaria, Egypt, Finland, Ghana, Greece
+- India, Italy, Kazakhstan, Korean CDMA operators
+- Kuwait, Mali, Netherlands, Paraguay, Serbia
+- Spain, Sweden, UK
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.20090707-3
 - Add -devel sub-package with pkg-config file (#511318)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Jul 2009 14:01:24 -0000	1.3
+++ sources	18 Sep 2009 21:28:42 -0000	1.4
@@ -1 +1 @@
-1d03283f6bb93d21985fce7bcdad548b  mobile-broadband-provider-info-20090707.tar.bz2
+fa6057ceed445042b8a7ba22a1927ac8  mobile-broadband-provider-info-20090918.tar.bz2



From epienbro at fedoraproject.org  Fri Sep 18 21:34:17 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:34:17 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec,1.29,1.30
Message-ID: <20090918213417.B483811C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27513

Modified Files:
	mingw32-filesystem.spec 
Log Message:
Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config
script to be broken. Thanks to Kalev Lember for spotting this bug



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mingw32-filesystem.spec	1 Sep 2009 21:42:50 -0000	1.29
+++ mingw32-filesystem.spec	18 Sep 2009 21:34:17 -0000	1.30
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        55
+Version:        56
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -86,7 +86,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROO
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure mingw32-make mingw32-pkg-config %{_mingw32_target}-pkg-config mingw32-cmake; do
+for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake; do
   ln -s %{_libexecdir}/mingw32-scripts $i
 done
 popd
@@ -157,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mingw32-configure
 %{_bindir}/mingw32-make
 %{_bindir}/mingw32-pkg-config
-%{_bindir}/%{_mingw32_target}-pkg-config
+%{_bindir}/i686-pc-mingw32-pkg-config
 %{_bindir}/mingw32-cmake
 %{_libexecdir}/mingw32-scripts
 %{_prefix}/i686-pc-mingw32/
@@ -166,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 56-1
+- Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config
+  script to be broken. Thanks to Kalev Lember for spotting this bug
+
 * Tue Sep  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 55-1
 - The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config,
   mingw32-configure, mingw32-make and mingw32-cmake had a bug where



From epienbro at fedoraproject.org  Fri Sep 18 21:36:42 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:36:42 +0000 (UTC)
Subject: rpms/mingw32-hunspell/devel mingw32-hunspell.spec,1.5,1.6
Message-ID: <20090918213642.0DD7211C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28754

Modified Files:
	mingw32-hunspell.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-hunspell/devel/mingw32-hunspell.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-hunspell.spec	30 Aug 2009 10:53:49 -0000	1.5
+++ mingw32-hunspell.spec	18 Sep 2009 21:36:41 -0000	1.6
@@ -8,7 +8,7 @@
 Name:          mingw32-hunspell
 Summary:       MinGW Windows spell checker and morphological analyzer library
 Version:       1.2.8
-Release:       10%{?dist}
+Release:       11%{?dist}
 Source0:       http://downloads.sourceforge.net/hunspell/hunspell-%{version}.tar.gz
 Group:         System Environment/Libraries
 URL:           http://hunspell.sourceforge.net/
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.8-11
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.8-10
 - Automatically generate debuginfo subpackage
 



From epienbro at fedoraproject.org  Fri Sep 18 21:38:41 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:38:41 +0000 (UTC)
Subject: rpms/mingw32-iconv/devel mingw32-iconv.spec,1.5,1.6
Message-ID: <20090918213841.0D27811C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-iconv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31084

Modified Files:
	mingw32-iconv.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-iconv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-iconv/devel/mingw32-iconv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-iconv.spec	7 Sep 2009 18:07:09 -0000	1.5
+++ mingw32-iconv.spec	18 Sep 2009 21:38:40 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:      mingw32-iconv
 Version:   1.12
-Release:   11%{?dist}
+Release:   12%{?dist}
 Summary:   GNU libraries and utilities for character set conversion
 
 License:   GPLv2+ and LGPLv2+
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12-12
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Mon Sep  7 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12-11
 - Fixed %%defattr line
 - Added -static subpackage



From epienbro at fedoraproject.org  Fri Sep 18 21:40:24 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:40:24 +0000 (UTC)
Subject: rpms/mingw32-jasper/devel mingw32-jasper.spec,1.3,1.4
Message-ID: <20090918214024.2C19511C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-jasper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32568

Modified Files:
	mingw32-jasper.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-jasper/devel/mingw32-jasper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-jasper.spec	27 Aug 2009 20:56:08 -0000	1.3
+++ mingw32-jasper.spec	18 Sep 2009 21:40:23 -0000	1.4
@@ -7,7 +7,7 @@
 
 Name:           mingw32-jasper
 Version:        1.900.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        MinGW Windows Jasper library
 
 License:        JasPer
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.900.1-11
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.900.1-10
 - Rebuild for mingw32-libjpeg 7
 - Automatically generate debuginfo subpackage



From xavierb at fedoraproject.org  Fri Sep 18 21:40:29 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Fri, 18 Sep 2009 21:40:29 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel
	openchrome-0.2.903-latest_snapshot.patch, 1.9,
	1.10 xorg-x11-drv-openchrome.spec, 1.49, 1.50
Message-ID: <20090918214029.642BC11C00EC@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603

Modified Files:
	openchrome-0.2.903-latest_snapshot.patch 
	xorg-x11-drv-openchrome.spec 
Log Message:
0.2.903 + svn 789

openchrome-0.2.903-latest_snapshot.patch:
 ChangeLog                |  405 ++++++++++++++
 configure.ac             |   31 -
 libxvmc/Makefile.am      |    8 
 libxvmc/viaLowLevel.c    |    4 
 libxvmc/viaLowLevelPro.c |    6 
 libxvmc/viaXvMC.c        |   62 +-
 src/Makefile.am          |    6 
 src/via.h                |   22 
 src/via_accel.c          |  508 ++++++++++--------
 src/via_bandwidth.c      |   34 +
 src/via_bios.h           |  123 ++++
 src/via_ch7xxx.c         |    1 
 src/via_crtc.c           |  665 +++++++++++++++++++++++
 src/via_cursor.c         |  523 +++++++++++++++---
 src/via_dga.c            |    4 
 src/via_display.c        |  206 +++++++
 src/via_dri.c            |   12 
 src/via_driver.c         | 1097 +++++++++++++++++++++-----------------
 src/via_driver.h         |   77 +-
 src/via_id.c             |   27 
 src/via_id.h             |    4 
 src/via_lvds.c           |  118 ++++
 src/via_memory.c         |    8 
 src/via_mode.c           | 1323 ++++++++++++++++++-----------------------------
 src/via_mode.h           |  129 ++--
 src/via_panel.c          |  467 ++++++++++++++++
 src/via_priv.h           |    4 
 src/via_regs.h           |   79 ++
 src/via_shadow.c         |  191 ++++++
 src/via_swov.c           |   93 ++-
 src/via_timing.c         |  398 ++++++++++++++
 src/via_timing.h         |   51 +
 src/via_vbe.c            |   12 
 src/via_video.c          |   83 +-
 src/via_vt162x.c         |   56 +
 src/via_vt162x.h         |   55 +
 src/via_xvmc.c           |   27 
 37 files changed, 5006 insertions(+), 1913 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.9 -r 1.10 openchrome-0.2.903-latest_snapshot.patchIndex: openchrome-0.2.903-latest_snapshot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.903-latest_snapshot.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openchrome-0.2.903-latest_snapshot.patch	31 Jul 2009 10:44:20 -0000	1.9
+++ openchrome-0.2.903-latest_snapshot.patch	18 Sep 2009 21:40:28 -0000	1.10
@@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
---- configure.ac	(.../tags/release_0_2_903)	(revision 766)
-+++ configure.ac	(.../trunk)	(revision 766)
+--- configure.ac	(.../tags/release_0_2_903)	(revision 790)
++++ configure.ac	(.../trunk)	(revision 790)
 @@ -70,7 +70,11 @@
  XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
  
@@ -67,8 +67,8 @@ Index: configure.ac
  AC_SUBST([DRIVER_MAN_SUFFIX])
 Index: libxvmc/Makefile.am
 ===================================================================
---- libxvmc/Makefile.am	(.../tags/release_0_2_903)	(revision 766)
-+++ libxvmc/Makefile.am	(.../trunk)	(revision 766)
+--- libxvmc/Makefile.am	(.../tags/release_0_2_903)	(revision 790)
++++ libxvmc/Makefile.am	(.../trunk)	(revision 790)
 @@ -24,13 +24,13 @@
  	xf86dristr.h \
  	vldXvMC.h
@@ -89,8 +89,8 @@ Index: libxvmc/Makefile.am
  	driDrawable.c \
 Index: libxvmc/viaLowLevel.c
 ===================================================================
---- libxvmc/viaLowLevel.c	(.../tags/release_0_2_903)	(revision 766)
-+++ libxvmc/viaLowLevel.c	(.../trunk)	(revision 766)
+--- libxvmc/viaLowLevel.c	(.../tags/release_0_2_903)	(revision 790)
++++ libxvmc/viaLowLevel.c	(.../trunk)	(revision 790)
 @@ -276,8 +276,8 @@
  	xl->tsMem.context = *(xl->drmcontext);
  	xl->tsMem.size = 64;
@@ -104,8 +104,8 @@ Index: libxvmc/viaLowLevel.c
  	    return -1;
 Index: libxvmc/viaLowLevelPro.c
 ===================================================================
---- libxvmc/viaLowLevelPro.c	(.../tags/release_0_2_903)	(revision 766)
-+++ libxvmc/viaLowLevelPro.c	(.../trunk)	(revision 766)
+--- libxvmc/viaLowLevelPro.c	(.../tags/release_0_2_903)	(revision 790)
++++ libxvmc/viaLowLevelPro.c	(.../trunk)	(revision 790)
 @@ -1460,13 +1460,13 @@
  
      if (size != mem->size) {
@@ -133,8 +133,8 @@ Index: libxvmc/viaLowLevelPro.c
  
 Index: libxvmc/viaXvMC.c
 ===================================================================
---- libxvmc/viaXvMC.c	(.../tags/release_0_2_903)	(revision 766)
-+++ libxvmc/viaXvMC.c	(.../trunk)	(revision 766)
+--- libxvmc/viaXvMC.c	(.../tags/release_0_2_903)	(revision 790)
++++ libxvmc/viaXvMC.c	(.../trunk)	(revision 790)
 @@ -248,7 +248,7 @@
      return errType;
  }
@@ -411,9 +411,76 @@ Index: libxvmc/viaXvMC.c
  
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/release_0_2_903)	(revision 766)
-+++ ChangeLog	(.../trunk)	(revision 766)
-@@ -1,3 +1,341 @@
+--- ChangeLog	(.../tags/release_0_2_903)	(revision 790)
++++ ChangeLog	(.../trunk)	(revision 790)
+@@ -1,3 +1,408 @@
++2009-09-15  Bartosz Kosiorek  <gang65 at poczta.onet.pl>
++
++	TV-out VT1625 chip support
++
++	* src/via_bios.h:
++	* src/via_crtc.c: (ViaFirstCRTCSetMode):
++	* src/via_display.c: (ViaDisplayEnableDVO), (ViaDisplayDisableDVO),
++	(ViaDisplaySetStreamOnDVO):
++	* src/via_driver.c: (VIASetupDefaultOptions), (VIAPreInit):
++	* src/via_mode.c: (ViaTVSetMode), (ViaOutputsSelect), (ViaModeSet):
++	* src/via_vt162x.c: (ViaSetTVClockSource), (VT1622ModeI2C),
++	(VT1622ModeCrtc):
++	* src/via_vt162x.h:
++
++2009-09-15  Bartosz Kosiorek  <gang65 at poczta.onet.pl>
++
++	Cursor support speedup
++
++	* src/via_cursor.c: (viaHWCursorInit), (viaCursorStore),
++	(viaCursorRestore), (viaShowCursor), (viaHideCursor),
++	(viaSetCursorPosition), (viaLoadCursorImage), (viaLoadCursorARGB):
++
++2009-09-14  Bartosz Kosiorek  <gang65 at poczta.onet.pl>
++
++	Removed two old variables:
++	pBIOSInfo->panelX
++	pBIOSInfo->panelY
++	
++	and replaced it by:
++	pBIOSInfo->Panel->NativeMode->Width
++	pBIOSInfo->Panel->NativeMode->Height
++
++	* src/via_bios.h:
++	* src/via_driver.c: (VIASetupDefaultOptions):
++	* src/via_mode.c: (ViaPanelGetIndex), (VIASetLCDMode),
++	(ViaModePrimaryLegacy), (ViaModeSecondaryLegacy):
++	* src/via_swov.c: (SetVideoWindow):
++	* src/via_video.c: (DecideOverlaySupport):
++
++2009-09-10  Bartosz Kosiorek  <gang65 at poczta.onet.pl>
++
++	Fix bug with DFP Power Off (ticket #317)
++
++	* src/via_mode.c: (ViaDFPPower):
++
++2009-08-20  Bartosz Kosiorek  <gang65 at poczta.onet.pl>
++
++	Fix bug with wrong panel size value (http://www.openchrome.org/trac/ticket/301)
++        This bug appeared only when UseLegacyModeSwitch was TRUE
++
++	* src/via_driver.c: (VIASetupDefaultOptions):
++	* src/via_video.c: (DecideOverlaySupport):
++
++2009-08-17  Bartosz Kosiorek <gang65 at poczta.onet.pl>
++
++	Added support of the VIA OpenBook
++
++	* src/via_id.c:
++
++2009-08-08  Bartosz Kosiorek <gang65 at poczta.onet.pl>
++
++	Added support for screen rotate upside-down and remove "magic numbers"
++
++	* src/via_driver.c:
++	* src/via_driver.h:
++	* src/via_shadow.c:
++
 +2009-07-28  Jon Nettleton <jon.nettleton at gmail.com>
 +
 +	Forgot to remove an old Dot Clock entry from the table.
@@ -758,8 +825,8 @@ Index: ChangeLog
 Index: src/via_panel.c
 ===================================================================
 --- src/via_panel.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_panel.c	(.../trunk)	(revision 766)
-@@ -0,0 +1,462 @@
++++ src/via_panel.c	(.../trunk)	(revision 790)
+@@ -0,0 +1,467 @@
 +/*
 + * Copyright 2007 The Openchrome Project [openchrome.org]
 + * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -826,6 +893,7 @@ Index: src/via_panel.c
 +    int i, index = VIA_PANEL_INVALID;
 +    int length = sizeof(ViaPanelNativeModes) / sizeof(ViaPanelModeRec);
 +
++
 +    for (i = 0; i < length; i++) {
 +        if (ViaPanelNativeModes[i].Width == width
 +            && ViaPanelNativeModes[i].Height == height) {
@@ -1046,10 +1114,13 @@ Index: src/via_panel.c
 +*/
 +        if (ret) {
 +            panel->NativeModeIndex = ViaPanelLookUpModeIndex(width, height);
++            DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaPanelLookUpModeIndex, Width %d, Height %d, NativeModeIndex%d\n", width, height, panel->NativeModeIndex));
 +            if (panel->NativeModeIndex != VIA_PANEL_INVALID) {
 +                panel->NativeMode->Width = width;
 +                panel->NativeMode->Height = height;
 +            }
++        } else {
++            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Unable to get panel size from EDID. Return code: %d\n", ret);
 +        }
 +    }
 +
@@ -1141,6 +1212,7 @@ Index: src/via_panel.c
 +
 +Bool
 +ViaPanelGetSizeFromDDCv1(ScrnInfoPtr pScrn, int *width, int *height)
++
 +{
 +    VIAPtr pVia = VIAPTR(pScrn);
 +    xf86MonPtr pMon;
@@ -1224,8 +1296,8 @@ Index: src/via_panel.c
 +}
 Index: src/via_id.h
 ===================================================================
---- src/via_id.h	(.../tags/release_0_2_903)	(revision 766)
-+++ src/via_id.h	(.../trunk)	(revision 766)
+--- src/via_id.h	(.../tags/release_0_2_903)	(revision 790)
++++ src/via_id.h	(.../trunk)	(revision 790)
 @@ -37,6 +37,8 @@
      VIA_P4M900,
      VIA_CX700,
@@ -1246,9 +1318,21 @@ Index: src/via_id.h
   * the CLE266, often labelled Ax and Cx.  The dividing line seems to be
 Index: src/via_video.c
 ===================================================================
---- src/via_video.c	(.../tags/release_0_2_903)	(revision 766)
-+++ src/via_video.c	(.../trunk)	(revision 766)
[...3348 lines suppressed...]
++        VIARefreshArea_UD(pScrn, num, pbox);
++        return;
++    }
++
++    if (pVia->rotate == RR_Rotate_90) {
++       tmpRot=1;
++    } else {
++       tmpRot=-1;       
++    }
+     dstPitch = pScrn->displayWidth;
+-    srcPitch = -pVia->rotate * pVia->ShadowPitch >> 2;
++    srcPitch = -tmpRot * pVia->ShadowPitch >> 2;
+ 
+     while (num--) {
+         width = pbox->x2 - pbox->x1;
+         height = pbox->y2 - pbox->y1;
+ 
+-        if (pVia->rotate == 1) {
++        if (pVia->rotate == RR_Rotate_90) {
+             dstPtr = ((CARD32*) pVia->FBBase
+                       + (pbox->x1 * dstPitch) + pScrn->virtualX - pbox->y2);
+             srcPtr = ((CARD32*) pVia->ShadowPtr
+@@ -262,7 +415,7 @@
+                 src += srcPitch;
+             }
+ 
+-            srcPtr += pVia->rotate;
++            srcPtr += tmpRot;
+             dstPtr += dstPitch;
+         }
+ 
+@@ -276,7 +429,7 @@
+     VIAPtr pVia = VIAPTR(pScrn);
+     RefreshAreaFuncPtr refreshArea = VIARefreshArea;
+ 
+-    if (pVia->rotate) {
++    if ((pVia->rotate)||(pVia->RandRRotation==TRUE)) {
+         if (!pVia->PointerMoved) {
+             pVia->PointerMoved = pScrn->PointerMoved;
+             pScrn->PointerMoved = VIAPointerMoved;
 Index: src/via_timing.c
 ===================================================================
 --- src/via_timing.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_timing.c	(.../trunk)	(revision 766)
++++ src/via_timing.c	(.../trunk)	(revision 790)
 @@ -0,0 +1,398 @@
 +/*
 + * Copyright 2007-2008 Gabriel Mansi.
@@ -8714,8 +9861,8 @@ Index: src/via_timing.c
 +}
 Index: src/Makefile.am
 ===================================================================
---- src/Makefile.am	(.../tags/release_0_2_903)	(revision 766)
-+++ src/Makefile.am	(.../trunk)	(revision 766)
+--- src/Makefile.am	(.../tags/release_0_2_903)	(revision 790)
++++ src/Makefile.am	(.../trunk)	(revision 790)
 @@ -43,23 +43,29 @@
           via_ch7xxx.c \
           via_ch7xxx.h \
@@ -8746,10 +9893,22 @@ Index: src/Makefile.am
           via_vbe.c \
           via_vgahw.c \
           via_vgahw.h \
+Index: src/via_ch7xxx.c
+===================================================================
+--- src/via_ch7xxx.c	(.../tags/release_0_2_903)	(revision 790)
++++ src/via_ch7xxx.c	(.../trunk)	(revision 790)
+@@ -33,6 +33,7 @@
+ #include "via_vgahw.h"
+ #include "via_ch7xxx.h"
+ #include "via_id.h"
++#include <unistd.h>
+ 
+ #ifdef HAVE_DEBUG
+ /*
 Index: src/via_dga.c
 ===================================================================
---- src/via_dga.c	(.../tags/release_0_2_903)	(revision 766)
-+++ src/via_dga.c	(.../trunk)	(revision 766)
+--- src/via_dga.c	(.../tags/release_0_2_903)	(revision 790)
++++ src/via_dga.c	(.../trunk)	(revision 790)
 @@ -248,7 +248,7 @@
  
          pScrn->SwitchMode(index, pScrn->currentMode, 0);
@@ -8770,8 +9929,8 @@ Index: src/via_dga.c
              pVia->DGAOldDisplayWidth = pScrn->displayWidth;
 Index: src/via_id.c
 ===================================================================
---- src/via_id.c	(.../tags/release_0_2_903)	(revision 766)
-+++ src/via_id.c	(.../trunk)	(revision 766)
+--- src/via_id.c	(.../tags/release_0_2_903)	(revision 790)
++++ src/via_id.c	(.../trunk)	(revision 790)
 @@ -87,10 +87,12 @@
      {"Asustek K8V-MX",                        VIA_K8M800,  0x1043, 0x8129, VIA_DEVICE_CRT},
      {"Mitac 8399",                            VIA_K8M800,  0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
@@ -8793,7 +9952,14 @@ Index: src/via_id.c
  
      /*** PM800, PM880, PN800, CN400 ***/
      {"VIA VT3118 (PM800)",                    VIA_PM800,   0x1106, 0x3118, VIA_DEVICE_CRT}, /* borrowed by ECS PM800-M2 */
-@@ -138,6 +141,7 @@
+@@ -132,12 +135,14 @@
+ 
+     /*** P4M800Pro, VN800, CN700 ***/
+     {"Clevo/RoverBook Partner E419L",         VIA_VM800,   0x1019, 0x0F75, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
++    {"Haier A60-440256080BD",                 VIA_VM800,   0x1019, 0x0F79, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+     {"PCChips P23G",                          VIA_VM800,   0x1019, 0x1623, VIA_DEVICE_CRT},
+     {"ECS P4M800PRO-M",                       VIA_VM800,   0x1019, 0x2122, VIA_DEVICE_CRT},
+     {"ECS C7VCM",                             VIA_VM800,   0x1019, 0xAA2D, VIA_DEVICE_CRT},
      {"PCChips V21G",                          VIA_VM800,   0x1019, 0xAA51, VIA_DEVICE_CRT},
      {"Asustek P5VDC-MX",                      VIA_VM800,   0x1043, 0x3344, VIA_DEVICE_CRT},
      {"Asustek P5VDC-TVM",                     VIA_VM800,   0x1043, 0x81CE, VIA_DEVICE_CRT},
@@ -8801,7 +9967,7 @@ Index: src/via_id.c
      {"Gateway MX3210",                        VIA_VM800,   0x107B, 0x0216, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"VIA VT3344 (VM800) - EPIA EN",          VIA_VM800,   0x1106, 0x3344, VIA_DEVICE_CRT | VIA_DEVICE_TV},
      {"Gigabyte GA-8VM800M-775",               VIA_VM800,   0x1458, 0xD000, VIA_DEVICE_CRT},
-@@ -145,6 +149,7 @@
+@@ -145,6 +150,7 @@
      {"MSI Fuzzy CN700/CN700T/CN700G",         VIA_VM800,   0x1462, 0x7199, VIA_DEVICE_CRT | VIA_DEVICE_TV},
      {"MSI PM8M3-V",                           VIA_VM800,   0x1462, 0x7211, VIA_DEVICE_CRT},
      {"MSI PM8PM",                             VIA_VM800,   0x1462, 0x7222, VIA_DEVICE_CRT},
@@ -8809,7 +9975,7 @@ Index: src/via_id.c
      {"RoverBook Partner W500",                VIA_VM800,   0x1509, 0x4330, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"Clevo/RoverBook Voyager V511L",         VIA_VM800,   0x1558, 0x0662, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"Clevo M5xxS",                           VIA_VM800,   0x1558, 0x5406, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-@@ -158,6 +163,7 @@
+@@ -158,6 +164,7 @@
      {"Asustek P5V800-MX",                     VIA_VM800,   0x3344, 0x1122, VIA_DEVICE_CRT},
  
      /*** K8M890 ***/
@@ -8817,7 +9983,7 @@ Index: src/via_id.c
      {"Asustek A8V-VM",                        VIA_K8M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
      {"Asustek M2V-MX SE",                     VIA_K8M890,  0x1043, 0x8297, VIA_DEVICE_CRT},
      {"Foxconn K8M890M2MA-RS2H",               VIA_K8M890,  0x105B, 0x0C84, VIA_DEVICE_CRT},
-@@ -179,6 +185,7 @@
+@@ -179,6 +186,7 @@
      {"Gigabyte GA-VM900M",                    VIA_P4M900,  0x1458, 0xD000, VIA_DEVICE_CRT},
      {"MSI VR321",                             VIA_P4M900,  0x1462, 0x3355, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"MSI P4M900M / P4M900M2-F/L",            VIA_P4M900,  0x1462, 0x7255, VIA_DEVICE_CRT},
@@ -8825,7 +9991,7 @@ Index: src/via_id.c
      {"Everex NC1501/NC1503",                  VIA_P4M900,  0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"Clevo M660SE",                          VIA_P4M900,  0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"Clevo M660SR",                          VIA_P4M900,  0x1558, 0x0669, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-@@ -196,6 +203,7 @@
+@@ -196,19 +204,32 @@
      {"Samsung Q1B",                           VIA_CX700,   0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"FIC CE260",                             VIA_CX700,   0x1509, 0x2D30, VIA_DEVICE_LCD},
      {"FIC CE261",                             VIA_CX700,   0x1509, 0x2F07, VIA_DEVICE_LCD},
@@ -8833,7 +9999,9 @@ Index: src/via_id.c
      {"Packard Bell EasyNote XS",              VIA_CX700,   0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
  
      /*** P4M890, VN890 ***/
-@@ -204,11 +212,20 @@
+     {"PCChips P29G",                          VIA_P4M890,  0x1019, 0x1629, VIA_DEVICE_CRT},
++    {"ECS P4M890T-M v2.0",                    VIA_P4M890,  0x1019, 0x2171, VIA_DEVICE_CRT},
+     {"PCChips ????",                          VIA_P4M890,  0x1019, 0x2174, VIA_DEVICE_CRT},
      {"Asustek P5V-VM ULTRA",                  VIA_P4M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
      {"Asustek P5V-VM DH",                     VIA_P4M890,  0x1043, 0x81CE, VIA_DEVICE_CRT},
      {"Mitac 8615",                            VIA_P4M890,  0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -8845,8 +10013,10 @@ Index: src/via_id.c
  
 +    /*** VX800 ***/
 +    {"VIA Epia M700",                         VIA_VX800,   0x1106, 0x1122, VIA_DEVICE_CRT},
++    {"VIA OpenBook",                          VIA_VX800,   0x1170, 0x0311, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* VIA OpenBook eNote VBE8910 */
 +    {"Samsung NC20",                          VIA_VX800,   0x144d, 0xc04e, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
 +    {"Quanta DreamBook Light IL1",            VIA_VX800,   0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
++    {"Lenovo S12",                            VIA_VX800,   0x17aa, 0x388c, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
 +
 +    /*** VX855 ***/
 +    {"VIA VT8562C",                           VIA_VX855,   0x1106, 0x5122, VIA_DEVICE_CRT},
@@ -8854,10 +10024,29 @@ Index: src/via_id.c
      /* keep this */
      {NULL,                                    VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE}
  };
+@@ -251,15 +272,15 @@
+ 	if ((Id->Chip == pVia->Chipset) && 
+            (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) &&
+            (Id->Device == SUBSYS_ID(pVia->PciInfo))) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String);
++	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo));
+ 	    pVia->Id = Id;
+ 	    return;
+ 	}
+     }
+     
+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+-	       "Unknown Card-Ids (%4X|%4X|%4X); please report to openchrome-users at openchrome.org\n",
+-               DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo));
++	       "Unknown Card-Ids (%4X|%4X|%4X), Chipset: %s; please report to openchrome-users at openchrome.org\n", 
++               DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo), pScrn->chipset);
+     pVia->Id = NULL;
+ }
+ 
 Index: src/via_timing.h
 ===================================================================
 --- src/via_timing.h	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_timing.h	(.../trunk)	(revision 766)
++++ src/via_timing.h	(.../trunk)	(revision 790)
 @@ -0,0 +1,51 @@
 +/*
 + * Copyright 2007-2008 Gabriel Mansi.


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-drv-openchrome.spec	25 Aug 2009 19:35:56 -0000	1.49
+++ xorg-x11-drv-openchrome.spec	18 Sep 2009 21:40:28 -0000	1.50
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	15%{?dist}
+Release:	16%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -25,8 +25,6 @@ Patch99:         openchrome-0.2.903-late
 # Fedora specific patches :
 #Patch100:       openchrome-0.2.903-disable_hwcursor.patch
 # Experimental patches (branch backport, etc...): 
-Patch200:       openchrome-0.2.903-remove_resources_RAC.patch
-Patch208:       openchrome-vt1625.patch
 
 ExclusiveArch:	%{ix86} x86_64
 
@@ -67,8 +65,6 @@ X.Org X11 openchrome video driver XvMC d
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch99 -p0 -b .latest
-%patch200 -p0 -b .remove_res_RAC
-%patch208 -p0 -b .vt1625
 
 
 %build
@@ -126,6 +122,10 @@ fi
 
 
 %changelog
+* Fri Sep 18 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-16
+- Update to latest snapshot (svn 789).
+- Drop upstreamed patches.
+
 * Tue Aug 25 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-15
 - Add patch for resources/RAC API removal in xserver (RHBZ#516765).
 



From orion at fedoraproject.org  Fri Sep 18 21:40:26 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 21:40:26 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.54,1.55 sources,1.10,1.11
Message-ID: <20090918214026.9E6D311C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32619

Modified Files:
	perl-PDL.spec sources 
Log Message:
* Thu Sep 10 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-5
- Remove PDL::Graphics::PLplot to make way for separate package



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- perl-PDL.spec	9 Sep 2009 20:01:03 -0000	1.54
+++ perl-PDL.spec	18 Sep 2009 21:40:26 -0000	1.55
@@ -1,15 +1,12 @@
-%global plplotver 0.50
-
 Name:           perl-PDL
 Version:        2.4.4_05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Url:            http://pdl.perl.org/
 Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-%{version}.tar.gz
-Source1:        http://search.cpan.org/CPAN/authors/id/D/DH/DHUNT/PDL-Graphics-PLplot-%{plplotver}.tar.gz
 Patch0:         perl-PDL-settings.patch
 Patch1:         perl-PDL-2.4.2-fix_ia64_sdump.patch
 Patch2:         perl-PDL-2.4.4-cleanup.patch
@@ -30,7 +27,6 @@ BuildRequires:  gd-devel
 BuildRequires:  gsl-devel
 BuildRequires:  hdf-devel
 BuildRequires:  libGLU-devel
-BuildRequires:  plplot-devel
 BuildRequires:  proj-devel
 BuildRequires:  proj-nad
 BuildRequires:  ncurses-devel
@@ -52,12 +48,7 @@ such commercial packages as IDL and MatL
 
 
 %prep
-%setup -q -n PDL-%{version} -b 1
-# Use newer plplot.pd
-cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/plplot.pd Graphics/PLplot/plplot.pd
-cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/t/plplot.t t/plplot.t
-# Strip separate version informaion
-sed -i -e '/^\$VERSION =/d' Graphics/PLplot/plplot.pd
+%setup -q -n PDL-%{version}
 %patch0 -p1 -b .settings
 %patch1 -p1
 %patch2 -p1 -b .cleanup
@@ -151,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 10 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-5
+- Remove PDL::Graphics::PLplot to make way for separate package
+
 * Wed Sep 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-4
 - No, we really need to strip out the PLplot version so it can load
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 Jul 2009 23:25:05 -0000	1.10
+++ sources	18 Sep 2009 21:40:26 -0000	1.11
@@ -1,2 +1 @@
 f00bf655a28d9bb0fdc968b7327b83f1  PDL-2.4.4_05.tar.gz
-b4d60ef5ab25d169c627d4a1ffd12dd1  PDL-Graphics-PLplot-0.50.tar.gz



From epienbro at fedoraproject.org  Fri Sep 18 21:41:45 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:41:45 +0000 (UTC)
Subject: rpms/mingw32-libidn/devel mingw32-libidn.spec,1.3,1.4
Message-ID: <20090918214145.C4E5F11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libidn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1611

Modified Files:
	mingw32-libidn.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-libidn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libidn/devel/mingw32-libidn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-libidn.spec	30 Aug 2009 10:59:27 -0000	1.3
+++ mingw32-libidn.spec	18 Sep 2009 21:41:45 -0000	1.4
@@ -11,7 +11,7 @@
 
 Name:           mingw32-libidn
 Version:        1.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Internationalized Domain Name support library
 
 License:        LGPLv2+
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 1.14-5
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-4
 - Automatically generate debuginfo subpackage
 



From lmacken at fedoraproject.org  Fri Sep 18 21:41:42 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 18 Sep 2009 21:41:42 +0000 (UTC)
Subject: rpms/python-stomper/devel python-stomper-uuid.patch, NONE,
	1.1 python-stomper.spec, 1.2, 1.3
Message-ID: <20090918214142.9F48311C00EC@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-stomper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1572

Modified Files:
	python-stomper.spec 
Added Files:
	python-stomper-uuid.patch 
Log Message:
* Thu Sep 03 2009 Luke Macken <lmacken at redhat.com> - 0.2.2-9
- Require python-uuid when using Python2.4 only
- Run the test suite in %%check



python-stomper-uuid.patch:
 setup.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE python-stomper-uuid.patch ---
--- setup.py.orig	2009-06-02 13:24:33.000000000 -0400
+++ setup.py	2009-06-02 13:24:44.000000000 -0400
@@ -46,7 +46,6 @@
 
 
 needed = [
-    'uuid>=1.2',
 ]
 
 setup(


Index: python-stomper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-stomper/devel/python-stomper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-stomper.spec	26 Jul 2009 23:09:36 -0000	1.2
+++ python-stomper.spec	18 Sep 2009 21:41:42 -0000	1.3
@@ -2,18 +2,25 @@
 
 Name:           python-stomper
 Version:        0.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A python client implementation of the STOMP protocol
 
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://code.google.com/p/stomper/
 Source0:        http://stomper.googlecode.com/files/stomper-%{version}.tar.gz
+Patch0:         %{name}-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python-nose
+
+%if 0%{?el5}
+BuildRequires:  python-uuid
+Requires:       python-uuid
+%endif
 
 %description
 This is a python client implementation of the STOMP protocol. The client is
@@ -22,6 +29,7 @@ create and parse STOMP messages in a pro
 
 %prep
 %setup -q -n stomper-%{version}
+%patch0 -p0 -b .uuid
 
 %build
 %{__python} setup.py build
@@ -32,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/examples
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/tests
 
+%check
+PYTHONPATH=$(pwd) nosetests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -41,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 03 2009 Luke Macken <lmacken at redhat.com> - 0.2.2-9
+- Require python-uuid when using Python2.4 only
+- Run the test suite in %%check
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From orion at fedoraproject.org  Fri Sep 18 21:42:32 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 21:42:32 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot/devel import.log, NONE,
	1.1 perl-PDL-Graphics-PLplot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918214232.8E2DF11C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2563/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PDL-Graphics-PLplot.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-PDL-Graphics-PLplot-0_51-3_fc11:HEAD:perl-PDL-Graphics-PLplot-0.51-3.fc11.src.rpm:1253310127


--- NEW FILE perl-PDL-Graphics-PLplot.spec ---
Name:           perl-PDL-Graphics-PLplot
Version:        0.51
Release:        3%{?dist}
Summary:        Object-oriented interface from perl/PDL to the PLPLOT plotting library
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDL-Graphics-PLplot/
Source0:        http://www.cpan.org/modules/by-module/PDL/PDL-Graphics-PLplot-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(PDL)
BuildRequires:  plplot-devel
Requires:       perl(PDL)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This is the PDL interface to the PLplot graphics library. It is designed
to be simple and light weight with a familiar 'perlish' Object Oriented
interface.

The interface consists of two levels.  A low level interface which maps
closely to the PLplot C interface, and a high level, object-oriented
interface which is easier to use.


%prep
%setup -q -n PDL-Graphics-PLplot-%{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/*

rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/PDL/Graphics/PLplot/PLplot.bs


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*


%changelog
* Mon Sep 14 2009 Orion Poplawski 0.51-3
- Add BR on perl(Test::More)
- Exclude PLplot.bs

* Thu Sep 10 2009 Orion Poplawski 0.51-2
- Use arch specific dir.

* Thu Sep 10 2009 Orion Poplawski 0.51-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:30:58 -0000	1.1
+++ .cvsignore	18 Sep 2009 21:42:32 -0000	1.2
@@ -0,0 +1 @@
+PDL-Graphics-PLplot-0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:30:59 -0000	1.1
+++ sources	18 Sep 2009 21:42:32 -0000	1.2
@@ -0,0 +1 @@
+eb4d4e30bad6ce5afa5456fb49afb789  PDL-Graphics-PLplot-0.51.tar.gz



From orion at fedoraproject.org  Fri Sep 18 21:43:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 21:43:06 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot/F-11 import.log, NONE,
	1.1 perl-PDL-Graphics-PLplot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918214306.9366711C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3244/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PDL-Graphics-PLplot.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-PDL-Graphics-PLplot-0_51-3_fc11:F-11:perl-PDL-Graphics-PLplot-0.51-3.fc11.src.rpm:1253310165


--- NEW FILE perl-PDL-Graphics-PLplot.spec ---
Name:           perl-PDL-Graphics-PLplot
Version:        0.51
Release:        3%{?dist}
Summary:        Object-oriented interface from perl/PDL to the PLPLOT plotting library
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDL-Graphics-PLplot/
Source0:        http://www.cpan.org/modules/by-module/PDL/PDL-Graphics-PLplot-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(PDL)
BuildRequires:  plplot-devel
Requires:       perl(PDL)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This is the PDL interface to the PLplot graphics library. It is designed
to be simple and light weight with a familiar 'perlish' Object Oriented
interface.

The interface consists of two levels.  A low level interface which maps
closely to the PLplot C interface, and a high level, object-oriented
interface which is easier to use.


%prep
%setup -q -n PDL-Graphics-PLplot-%{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/*

rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/PDL/Graphics/PLplot/PLplot.bs


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*


%changelog
* Mon Sep 14 2009 Orion Poplawski 0.51-3
- Add BR on perl(Test::More)
- Exclude PLplot.bs

* Thu Sep 10 2009 Orion Poplawski 0.51-2
- Use arch specific dir.

* Thu Sep 10 2009 Orion Poplawski 0.51-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:30:58 -0000	1.1
+++ .cvsignore	18 Sep 2009 21:43:06 -0000	1.2
@@ -0,0 +1 @@
+PDL-Graphics-PLplot-0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:30:59 -0000	1.1
+++ sources	18 Sep 2009 21:43:06 -0000	1.2
@@ -0,0 +1 @@
+eb4d4e30bad6ce5afa5456fb49afb789  PDL-Graphics-PLplot-0.51.tar.gz



From epienbro at fedoraproject.org  Fri Sep 18 21:43:14 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:43:14 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/devel mingw32-libjpeg.spec,1.5,1.6
Message-ID: <20090918214314.AA07511C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3294

Modified Files:
	mingw32-libjpeg.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/mingw32-libjpeg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libjpeg.spec	27 Aug 2009 20:42:36 -0000	1.5
+++ mingw32-libjpeg.spec	18 Sep 2009 21:43:14 -0000	1.6
@@ -11,7 +11,7 @@
 
 Name:           mingw32-libjpeg
 Version:        7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Libjpeg library
 
 License:        IJG
@@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 7-2
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 7-1
 - Update to version 7
 - Resolves typedef conflict (BZ #497492)



From orion at fedoraproject.org  Fri Sep 18 21:43:37 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 21:43:37 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot/F-10 import.log, NONE,
	1.1 perl-PDL-Graphics-PLplot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918214337.7A43511C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3606/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PDL-Graphics-PLplot.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-PDL-Graphics-PLplot-0_51-3_fc11:F-10:perl-PDL-Graphics-PLplot-0.51-3.fc11.src.rpm:1253310193


--- NEW FILE perl-PDL-Graphics-PLplot.spec ---
Name:           perl-PDL-Graphics-PLplot
Version:        0.51
Release:        3%{?dist}
Summary:        Object-oriented interface from perl/PDL to the PLPLOT plotting library
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDL-Graphics-PLplot/
Source0:        http://www.cpan.org/modules/by-module/PDL/PDL-Graphics-PLplot-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(PDL)
BuildRequires:  plplot-devel
Requires:       perl(PDL)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This is the PDL interface to the PLplot graphics library. It is designed
to be simple and light weight with a familiar 'perlish' Object Oriented
interface.

The interface consists of two levels.  A low level interface which maps
closely to the PLplot C interface, and a high level, object-oriented
interface which is easier to use.


%prep
%setup -q -n PDL-Graphics-PLplot-%{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/*

rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/PDL/Graphics/PLplot/PLplot.bs


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*


%changelog
* Mon Sep 14 2009 Orion Poplawski 0.51-3
- Add BR on perl(Test::More)
- Exclude PLplot.bs

* Thu Sep 10 2009 Orion Poplawski 0.51-2
- Use arch specific dir.

* Thu Sep 10 2009 Orion Poplawski 0.51-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:30:58 -0000	1.1
+++ .cvsignore	18 Sep 2009 21:43:37 -0000	1.2
@@ -0,0 +1 @@
+PDL-Graphics-PLplot-0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:30:59 -0000	1.1
+++ sources	18 Sep 2009 21:43:37 -0000	1.2
@@ -0,0 +1 @@
+eb4d4e30bad6ce5afa5456fb49afb789  PDL-Graphics-PLplot-0.51.tar.gz



From orion at fedoraproject.org  Fri Sep 18 21:44:15 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 18 Sep 2009 21:44:15 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot/EL-5 import.log, NONE,
	1.1 perl-PDL-Graphics-PLplot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090918214415.7AAFB11C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3956/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PDL-Graphics-PLplot.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-PDL-Graphics-PLplot-0_51-3_fc11:EL-5:perl-PDL-Graphics-PLplot-0.51-3.fc11.src.rpm:1253310234


--- NEW FILE perl-PDL-Graphics-PLplot.spec ---
Name:           perl-PDL-Graphics-PLplot
Version:        0.51
Release:        3%{?dist}
Summary:        Object-oriented interface from perl/PDL to the PLPLOT plotting library
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDL-Graphics-PLplot/
Source0:        http://www.cpan.org/modules/by-module/PDL/PDL-Graphics-PLplot-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(PDL)
BuildRequires:  plplot-devel
Requires:       perl(PDL)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This is the PDL interface to the PLplot graphics library. It is designed
to be simple and light weight with a familiar 'perlish' Object Oriented
interface.

The interface consists of two levels.  A low level interface which maps
closely to the PLplot C interface, and a high level, object-oriented
interface which is easier to use.


%prep
%setup -q -n PDL-Graphics-PLplot-%{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/*

rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/PDL/Graphics/PLplot/PLplot.bs


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*


%changelog
* Mon Sep 14 2009 Orion Poplawski 0.51-3
- Add BR on perl(Test::More)
- Exclude PLplot.bs

* Thu Sep 10 2009 Orion Poplawski 0.51-2
- Use arch specific dir.

* Thu Sep 10 2009 Orion Poplawski 0.51-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:30:58 -0000	1.1
+++ .cvsignore	18 Sep 2009 21:44:15 -0000	1.2
@@ -0,0 +1 @@
+PDL-Graphics-PLplot-0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:30:59 -0000	1.1
+++ sources	18 Sep 2009 21:44:15 -0000	1.2
@@ -0,0 +1 @@
+eb4d4e30bad6ce5afa5456fb49afb789  PDL-Graphics-PLplot-0.51.tar.gz



From epienbro at fedoraproject.org  Fri Sep 18 21:45:42 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:45:42 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel mingw32-libsoup.spec,1.8,1.9
Message-ID: <20090918214542.269AC11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4549

Modified Files:
	mingw32-libsoup.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-libsoup.spec	10 Sep 2009 05:01:48 -0000	1.8
+++ mingw32-libsoup.spec	18 Sep 2009 21:45:42 -0000	1.9
@@ -7,7 +7,7 @@
 
 Name:		mingw32-libsoup
 Version:	2.27.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.92-2
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Thu Sep 10 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.92-1
 - Update to 2.27.92
 - Dropped the workaround for GNOME BZ #593845



From epienbro at fedoraproject.org  Fri Sep 18 21:47:23 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:47:23 +0000 (UTC)
Subject: rpms/mingw32-libssh2/devel mingw32-libssh2.spec,1.3,1.4
Message-ID: <20090918214723.E200F11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6371

Modified Files:
	mingw32-libssh2.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-libssh2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libssh2/devel/mingw32-libssh2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-libssh2.spec	29 Aug 2009 23:28:55 -0000	1.3
+++ mingw32-libssh2.spec	18 Sep 2009 21:47:23 -0000	1.4
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libssh2
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows library implementation of the SSH2 protocol
 
 License:        BSD
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1-5
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1-4
 - Rebuild for new mingw32-openssl
 - Automatically generate debuginfo subpackage



From ndim at fedoraproject.org  Fri Sep 18 21:48:26 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri, 18 Sep 2009 21:48:26 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/devel sources, 1.49,
	1.50 xorg-x11-drv-radeonhd-README.fedora, 1.49,
	1.50 xorg-x11-drv-radeonhd.spec, 1.65, 1.66
Message-ID: <20090918214826.3DFC811C00EC@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7157

Modified Files:
	sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.14.20090918git
- New snapshot (upstream commit b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60):
  - b7a50a6f: Fix RHDRegWrite macro invocation breakage



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	18 Sep 2009 20:55:17 -0000	1.49
+++ sources	18 Sep 2009 21:48:26 -0000	1.50
@@ -1 +1 @@
-b481c30c456178d612ccda3d80dfd8fb  xf86-video-radeonhd-1.2.5-20090918git.tar.lzma
+150fdb91fd19a43b254784410d60c5f1  xf86-video-radeonhd-1.2.5-20090918git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-drv-radeonhd-README.fedora	18 Sep 2009 20:55:17 -0000	1.49
+++ xorg-x11-drv-radeonhd-README.fedora	18 Sep 2009 21:48:26 -0000	1.50
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: ae41ab2fe49ca456c4fb23859af8683c32c2429c
+Latest upstream commit: b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60
 
 
 Contents


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xorg-x11-drv-radeonhd.spec	18 Sep 2009 20:55:17 -0000	1.65
+++ xorg-x11-drv-radeonhd.spec	18 Sep 2009 21:48:26 -0000	1.66
@@ -21,7 +21,7 @@
 
 %if %{snapshot}
 %define date 20090918
-%define git_commit ae41ab2fe49ca456c4fb23859af8683c32c2429c
+%define git_commit b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.5
-Release:       3.13%{?alphatag}%{?dist}
+Release:       3.14%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -170,6 +170,10 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.14.20090918git
+- New snapshot (upstream commit b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60):
+  - b7a50a6f: Fix RHDRegWrite macro invocation breakage
+
 * Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.13.20090918git
 - configure with --disable-shave (we occasionally need to debug the build)
 - Add Xorg ABI dependency for F12 (1.6.99.*), removing the one from F9



From epienbro at fedoraproject.org  Fri Sep 18 21:48:53 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:48:53 +0000 (UTC)
Subject: rpms/mingw32-libtiff/devel mingw32-libtiff.spec,1.5,1.6
Message-ID: <20090918214853.35C9111C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libtiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7372

Modified Files:
	mingw32-libtiff.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-libtiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libtiff/devel/mingw32-libtiff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libtiff.spec	28 Aug 2009 04:54:50 -0000	1.5
+++ mingw32-libtiff.spec	18 Sep 2009 21:48:53 -0000	1.6
@@ -8,7 +8,7 @@
 Summary: MinGW Windows port of the LibTIFF library
 Name: mingw32-libtiff
 Version: 3.8.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.8.2-20
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.8.2-19
 - Rebuild for minw32-libjpeg 7
 - Automatically generate debuginfo subpackage



From epienbro at fedoraproject.org  Fri Sep 18 21:50:26 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:50:26 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel mingw32-libxml2.spec,1.11,1.12
Message-ID: <20090918215026.3561A11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7898

Modified Files:
	mingw32-libxml2.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-libxml2.spec	12 Sep 2009 18:51:28 -0000	1.11
+++ mingw32-libxml2.spec	18 Sep 2009 21:50:26 -0000	1.12
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-3
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sat Sep 12 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-2
 - Always use the native win32 thread API even when pthreads is available
 - Dropped a patch which isn't necessary anymore



From epienbro at fedoraproject.org  Fri Sep 18 21:52:06 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:52:06 +0000 (UTC)
Subject: rpms/mingw32-pango/devel mingw32-pango.spec,1.10,1.11
Message-ID: <20090918215206.4E40611C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9339

Modified Files:
	mingw32-pango.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-pango.spec	8 Sep 2009 17:20:33 -0000	1.10
+++ mingw32-pango.spec	18 Sep 2009 21:52:05 -0000	1.11
@@ -7,7 +7,7 @@
 
 Name:           mingw32-pango
 Version:        1.25.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
@@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.6-2
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Tue Sep  8 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.6-1
 - Update to 1.25.6
 



From epienbro at fedoraproject.org  Fri Sep 18 21:54:41 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 18 Sep 2009 21:54:41 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel mingw32-pixman.spec,1.9,1.10
Message-ID: <20090918215441.C310C11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10956

Modified Files:
	mingw32-pixman.spec 
Log Message:
Rebuild because of broken mingw32-gcc/mingw32-binutils



Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-pixman.spec	29 Aug 2009 20:56:33 -0000	1.9
+++ mingw32-pixman.spec	18 Sep 2009 21:54:41 -0000	1.10
@@ -7,7 +7,7 @@
 
 Name:           mingw32-pixman
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.0-2
+- Rebuild because of broken mingw32-gcc/mingw32-binutils
+
 * Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.0-1
 - Update to 0.16.0
 



From ndim at fedoraproject.org  Fri Sep 18 21:56:54 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri, 18 Sep 2009 21:56:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/F-11 sources, 1.49,
	1.50 xorg-x11-drv-radeonhd-README.fedora, 1.49,
	1.50 xorg-x11-drv-radeonhd.spec, 1.62, 1.63
Message-ID: <20090918215654.27F5F11C00EC@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12148

Modified Files:
	sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.14.20090918git
- New snapshot (upstream commit b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60):
  - b7a50a6f: Fix RHDRegWrite macro invocation breakage



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	18 Sep 2009 20:56:46 -0000	1.49
+++ sources	18 Sep 2009 21:56:53 -0000	1.50
@@ -1 +1 @@
-b481c30c456178d612ccda3d80dfd8fb  xf86-video-radeonhd-1.2.5-20090918git.tar.lzma
+150fdb91fd19a43b254784410d60c5f1  xf86-video-radeonhd-1.2.5-20090918git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-drv-radeonhd-README.fedora	18 Sep 2009 20:56:46 -0000	1.49
+++ xorg-x11-drv-radeonhd-README.fedora	18 Sep 2009 21:56:53 -0000	1.50
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: ae41ab2fe49ca456c4fb23859af8683c32c2429c
+Latest upstream commit: b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60
 
 
 Contents


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- xorg-x11-drv-radeonhd.spec	18 Sep 2009 20:56:46 -0000	1.62
+++ xorg-x11-drv-radeonhd.spec	18 Sep 2009 21:56:53 -0000	1.63
@@ -21,7 +21,7 @@
 
 %if %{snapshot}
 %define date 20090918
-%define git_commit ae41ab2fe49ca456c4fb23859af8683c32c2429c
+%define git_commit b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.5
-Release:       3.13%{?alphatag}%{?dist}
+Release:       3.14%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -170,6 +170,10 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.14.20090918git
+- New snapshot (upstream commit b7a50a6f00bb6d207f5240f00cf83fbbd56bbf60):
+  - b7a50a6f: Fix RHDRegWrite macro invocation breakage
+
 * Fri Sep 18 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-3.13.20090918git
 - configure with --disable-shave (we occasionally need to debug the build)
 - Add Xorg ABI dependency for F12 (1.6.99.*), removing the one from F9



From nsantos at fedoraproject.org  Fri Sep 18 22:02:57 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 18 Sep 2009 22:02:57 +0000 (UTC)
Subject: rpms/amqp/devel .cvsignore, 1.16, 1.17 amqp.spec, 1.23, 1.24 sources,
	1.19, 1.20
Message-ID: <20090918220257.AA0E511C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15897

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 816781


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Jul 2009 17:04:14 -0000	1.16
+++ .cvsignore	18 Sep 2009 22:02:56 -0000	1.17
@@ -1 +1 @@
-amqp-1.0.790661.tar.gz
+amqp-1.0.816781.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/amqp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- amqp.spec	24 Jul 2009 16:50:55 -0000	1.23
+++ amqp.spec	18 Sep 2009 22:02:56 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           amqp
-Version:        1.0.790661
-Release:        2%{?dist}
+Version:        1.0.816781
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.816781-1
+- Rebased to svn rev 816781
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.790661-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	2 Jul 2009 17:04:14 -0000	1.19
+++ sources	18 Sep 2009 22:02:56 -0000	1.20
@@ -1 +1 @@
-10dacce89b0c319b5b23ba76470ba6bd  amqp-1.0.790661.tar.gz
+e693d05306a2a969ae00810ec703eff8  amqp-1.0.816781.tar.gz



From mclasen at fedoraproject.org  Fri Sep 18 22:08:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Sep 2009 22:08:44 +0000 (UTC)
Subject: rpms/notification-daemon-engine-nodoka/devel
	notification-daemon-engine-nodoka-window-type.patch, NONE,
	1.1 notification-daemon-engine-nodoka.spec, 1.10, 1.11
Message-ID: <20090918220844.A23EF11C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon-engine-nodoka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17963

Modified Files:
	notification-daemon-engine-nodoka.spec 
Added Files:
	notification-daemon-engine-nodoka-window-type.patch 
Log Message:
set proper window type on the bubbles


notification-daemon-engine-nodoka-window-type.patch:
 nodoka-theme.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE notification-daemon-engine-nodoka-window-type.patch ---
diff -up notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.window-type notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c
--- notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.window-type	2009-09-18 17:43:08.399713271 -0400
+++ notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c	2009-09-18 17:45:47.364444776 -0400
@@ -705,6 +705,9 @@ create_notification(UrlClickedCb url_cli
 	}
 
 	gtk_window_set_title(GTK_WINDOW(win), "Notification");
+	gtk_window_set_type_hint(GTK_WINDOW(win),
+				 GDK_WINDOW_TYPE_HINT_NOTIFICATION);
+
 	gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 	gtk_widget_realize(win);
 //	gtk_widget_set_size_request(win, WIDTH, -1);


Index: notification-daemon-engine-nodoka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-nodoka/devel/notification-daemon-engine-nodoka.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- notification-daemon-engine-nodoka.spec	25 Jul 2009 19:30:15 -0000	1.10
+++ notification-daemon-engine-nodoka.spec	18 Sep 2009 22:08:44 -0000	1.11
@@ -1,9 +1,9 @@
 Name:           notification-daemon-engine-nodoka
 Version:        0.1.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        The Nodoka theme engine for the notification daemon
 
-Group:          System Environment/Libraries 
+Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            https://nodoka.fedorahosted.org/
 Source0:        https://fedorahosted.org/releases/n/o/nodoka/notification-daemon-engine-nodoka-%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch2:         notification-daemon-engi
 Patch3:         notification-daemon-engine-nodoka-base-color.patch
 # drop libsexy dep
 Patch4:		sexy.patch
+Patch5:		notification-daemon-engine-nodoka-window-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.17.1
@@ -31,6 +32,7 @@ The Nodoka theme engine for the notifica
 %patch2 -p1 -b .rtl
 %patch3 -p1 -b .base-color
 %patch4 -p1 -b .sexy
+%patch5 -p1 -b .window-type
 
 autoreconf -i -f
 
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libnodoka.so
 
 %changelog
+* Fri Sep 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.1.0-11
+- Set the proper type hint on notification bubbles (bgo#595062)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Fri Sep 18 22:10:28 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 18 Sep 2009 22:10:28 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 .cvsignore, 1.10, 1.11 mirrormanager.spec, 
	1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20090918221028.2645811C00EC@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19864

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Sep 2009 02:15:21 -0000	1.10
+++ .cvsignore	18 Sep 2009 22:10:27 -0000	1.11
@@ -1 +1 @@
-mirrormanager-1.3.0.tar.bz2
+mirrormanager-1.3.1.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mirrormanager.spec	9 Sep 2009 02:15:21 -0000	1.10
+++ mirrormanager.spec	18 Sep 2009 22:10:27 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           mirrormanager
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
@@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.1-1
+- fix publiclist html
+- fix Host netblock creation via web UI
+
 * Mon Sep  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.0-1
 - add CSRF protection, add Requires: python-fedora
 - add IPv6 capability


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Sep 2009 02:15:21 -0000	1.10
+++ sources	18 Sep 2009 22:10:27 -0000	1.11
@@ -1 +1 @@
-1be6ae3e072b88fe37d1e3cf01237820  mirrormanager-1.3.0.tar.bz2
+112f95242036ada28c0a6dc54bfb31fe  mirrormanager-1.3.1.tar.bz2



From dwalsh at fedoraproject.org  Fri Sep 18 22:11:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Sep 2009 22:11:36 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.85,1.86
Message-ID: <20090918221136.8EA2F11C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20968

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-4
- Fix request_module line to module_request


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  318 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  177 +++
 policy/modules/apps/sandbox.te            |  323 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   79 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   76 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1403 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 315 files changed, 14513 insertions(+), 2577 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- policy-F12.patch	18 Sep 2009 20:44:00 -0000	1.85
+++ policy-F12.patch	18 Sep 2009 22:11:35 -0000	1.86
@@ -1944,7 +1944,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.32/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/java.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/java.te	2009-09-18 17:16:51.000000000 -0400
 @@ -20,6 +20,8 @@
  typealias java_t alias { staff_javaplugin_t user_javaplugin_t sysadm_javaplugin_t };
  typealias java_t alias { auditadm_javaplugin_t secadm_javaplugin_t };
@@ -1970,17 +1970,23 @@ diff -b -B --ignore-all-space --exclude-
  	xserver_user_x_domain_template(java, java_t, java_tmpfs_t)
  ')
  
-@@ -147,4 +151,12 @@
+@@ -143,8 +147,18 @@
+ 	# execheap is needed for itanium/BEA jrocket
+ 	allow unconfined_java_t self:process { execstack execmem execheap };
+ 
++	files_execmod_all_files(unconfined_java_t)
++
+ 	init_dbus_chat_script(unconfined_java_t)
  
  	unconfined_domain_noaudit(unconfined_java_t)
  	unconfined_dbus_chat(unconfined_java_t)
 +	optional_policy(`
 +		hal_dbus_chat(unconfined_java_t)
- ')
++')
 +
 +	optional_policy(`
 +		rpm_domtrans(unconfined_java_t)
-+	')
+ ')
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.fc serefpolicy-3.6.32/policy/modules/apps/kdumpgui.fc
@@ -5313,7 +5319,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-18 11:28:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-18 17:16:00.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -13566,15 +13572,16 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.32/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-09-18 17:05:02.000000000 -0400
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
  
 -allow policykit_t self:capability { setgid setuid };
-+allow policykit_t self:capability { setgid setuid sys_ptrace };
- allow policykit_t self:process getattr;
+-allow policykit_t self:process getattr;
 -allow policykit_t self:fifo_file rw_file_perms;
++allow policykit_t self:capability { setgid setuid sys_ptrace };
++allow policykit_t self:process { getsched getattr };
 +allow policykit_t self:fifo_file rw_fifo_file_perms;
 +
  allow policykit_t self:unix_dgram_socket create_socket_perms;
@@ -17793,7 +17800,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.32/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-18 17:38:09.000000000 -0400
 @@ -41,6 +41,9 @@
  files_tmp_file(sshd_tmp_t)
  files_poly_parent(sshd_tmp_t)
@@ -17831,8 +17838,16 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow the ssh program to communicate with ssh-agent.
  stream_connect_pattern(ssh_t, ssh_agent_tmp_t, ssh_agent_tmp_t, ssh_agent_type)
-@@ -131,6 +134,7 @@
- read_lnk_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
+@@ -126,11 +129,12 @@
+ read_lnk_files_pattern(ssh_t, home_ssh_t, home_ssh_t)
+ 
+ # ssh servers can read the user keys and config
+-allow ssh_server home_ssh_t:dir list_dir_perms;
+-read_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
+-read_lnk_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
++manage_dirs_pattern(ssh_server, home_ssh_t, home_ssh_t)
++manage_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
++userdom_user_home_dir_filetrans(ssh_server, home_ssh_t, dir)
  
  kernel_read_kernel_sysctls(ssh_t)
 +kernel_read_system_state(ssh_t)



From nsantos at fedoraproject.org  Fri Sep 18 22:12:13 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 18 Sep 2009 22:12:13 +0000 (UTC)
Subject: rpms/python-qpid/devel .cvsignore, 1.15, 1.16 python-qpid.spec, 1.26,
	1.27 sources, 1.19, 1.20
Message-ID: <20090918221213.C8CAA11C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21666

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 816781


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 Jul 2009 17:30:12 -0000	1.15
+++ .cvsignore	18 Sep 2009 22:12:13 -0000	1.16
@@ -1 +1 @@
-python-qpid-0.5.790661.tar.gz
+python-qpid-0.5.816781.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-qpid.spec	26 Jul 2009 20:57:52 -0000	1.26
+++ python-qpid.spec	18 Sep 2009 22:12:13 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           python-qpid
-Version:        0.5.790661
-Release:        2%{?dist}
+Version:        0.5.816781
+Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -16,7 +16,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.790661
+Requires:       amqp >= 1.0.816781
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
+- Rebased to svn rev 816781
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.790661-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	2 Jul 2009 17:30:12 -0000	1.19
+++ sources	18 Sep 2009 22:12:13 -0000	1.20
@@ -1 +1 @@
-17f2af041cf2ed18cf0982c0dffdfdc9  python-qpid-0.5.790661.tar.gz
+87c3f926008a8de5d25fdc18e8c368e3  python-qpid-0.5.816781.tar.gz



From dwalsh at fedoraproject.org  Fri Sep 18 22:12:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Sep 2009 22:12:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.923,1.924
Message-ID: <20090918221226.A5FE111C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21909

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-5
- Allow sshd to create .ssh directory and content



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -p -r1.923 -r1.924
--- selinux-policy.spec	18 Sep 2009 20:44:00 -0000	1.923
+++ selinux-policy.spec	18 Sep 2009 22:12:25 -0000	1.924
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,6 +447,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-5
+- Allow sshd to create .ssh directory and content
+
 * Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-4
 - Fix request_module line to module_request
 



From nsantos at fedoraproject.org  Fri Sep 18 22:25:04 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 18 Sep 2009 22:25:04 +0000 (UTC)
Subject: rpms/python-qpid/devel python-qpid.spec,1.27,1.28
Message-ID: <20090918222504.45C4111C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27521

Modified Files:
	python-qpid.spec 
Log Message:
temporarily remove required version


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- python-qpid.spec	18 Sep 2009 22:12:13 -0000	1.27
+++ python-qpid.spec	18 Sep 2009 22:25:03 -0000	1.28
@@ -16,7 +16,8 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.816781
+Requires:       amqp 
+# >= 1.0.816781
 
 %description
 The Apache Qpid project's Python language client for AMQP.



From beuc at fedoraproject.org  Fri Sep 18 22:36:39 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Fri, 18 Sep 2009 22:36:39 +0000 (UTC)
Subject: rpms/freedink/devel .cvsignore, 1.5, 1.6 freedink.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20090918223639.5A21011C00EC@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32751

Modified Files:
	.cvsignore freedink.spec sources 
Log Message:
Update to 1.08.20090918


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Sep 2009 18:30:52 -0000	1.5
+++ .cvsignore	18 Sep 2009 22:36:37 -0000	1.6
@@ -1 +1 @@
-freedink-1.08.20090916.tar.gz
+freedink-1.08.20090918.tar.gz


Index: freedink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/freedink.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- freedink.spec	16 Sep 2009 18:30:52 -0000	1.9
+++ freedink.spec	18 Sep 2009 22:36:38 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		freedink
-Version:	1.08.20090916
+Version:	1.08.20090918
 Release:	1%{?dist}
 Summary:	Adventure and role-playing game
 
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090918-1
+- New upstream release
+
 * Wed Sep 16 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090916-1
 - New upstream release
 - Can optionaly bundle default font, to avoid liberation-fonts


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Sep 2009 18:30:52 -0000	1.5
+++ sources	18 Sep 2009 22:36:38 -0000	1.6
@@ -1 +1 @@
-ccd45fb00faf04a3eefcc382d7f7ee9f  freedink-1.08.20090916.tar.gz
+0a7bc1e249c03538f5d51472fc73e0f4  freedink-1.08.20090918.tar.gz



From nsantos at fedoraproject.org  Fri Sep 18 22:37:40 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 18 Sep 2009 22:37:40 +0000 (UTC)
Subject: rpms/python-qpid/devel python-qpid.spec,1.28,1.29
Message-ID: <20090918223740.8995511C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1164

Modified Files:
	python-qpid.spec 
Log Message:
remove non-existing script


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- python-qpid.spec	18 Sep 2009 22:25:03 -0000	1.28
+++ python-qpid.spec	18 Sep 2009 22:37:40 -0000	1.29
@@ -46,7 +46,7 @@ install -d $RPM_BUILD_ROOT%{python_sitel
 install -pm 0644 *.* qpid/*.py $RPM_BUILD_ROOT%{python_sitelib}/qpid
 install -pm 0644 qpid_config.* $RPM_BUILD_ROOT%{python_sitelib}
 install -d $RPM_BUILD_ROOT%{_bindir}
-install -pm 0755 run-tests $RPM_BUILD_ROOT%{_bindir}/python-qpid-tests
+#install -pm 0755 run-tests $RPM_BUILD_ROOT%{_bindir}/python-qpid-tests
 install -pm 0755 commands/* $RPM_BUILD_ROOT%{_bindir}
 install -pm 0644 mllib/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/mllib
 install -pm 0644 doc/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/doc
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/qpid
 %{python_sitelib}/qpid_config.*
 %{python_sitelib}/qmf
-%{_bindir}/python-qpid-tests
+#%{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt examples/
 



From beuc at fedoraproject.org  Fri Sep 18 22:42:21 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Fri, 18 Sep 2009 22:42:21 +0000 (UTC)
Subject: rpms/freedink-dfarc/devel .cvsignore, 1.5, 1.6 freedink-dfarc.spec, 
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090918224221.2A16911C00EC@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink-dfarc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3638

Modified Files:
	.cvsignore freedink-dfarc.spec sources 
Log Message:
Update to 3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Sep 2009 19:54:57 -0000	1.5
+++ .cvsignore	18 Sep 2009 22:42:20 -0000	1.6
@@ -1 +1 @@
-dfarc-3.2.4.tar.gz
+dfarc-3.4.tar.gz


Index: freedink-dfarc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/freedink-dfarc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- freedink-dfarc.spec	16 Sep 2009 19:54:57 -0000	1.6
+++ freedink-dfarc.spec	18 Sep 2009 22:42:20 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		freedink-dfarc
-Version:	3.2.4
+Version:	3.4
 Release:	1%{?dist}
 Summary:	Frontend and .dmod installer for GNU FreeDink
 
@@ -87,6 +87,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Fri Sep 18 2009 Sylvain Beucler <beuc at beuc.net> - 3.4-1
+- New upstream release
+
 * Wed Sep 16 2009 Sylvain Beucler <beuc at beuc.net> - 3.2.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Sep 2009 19:54:57 -0000	1.5
+++ sources	18 Sep 2009 22:42:20 -0000	1.6
@@ -1 +1 @@
-06884d5abf79c027a2962f0ca01a67bb  dfarc-3.2.4.tar.gz
+69d3115b7d0c6c8e1a3db2b5e16e21fc  dfarc-3.4.tar.gz



From nsantos at fedoraproject.org  Fri Sep 18 22:46:11 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 18 Sep 2009 22:46:11 +0000 (UTC)
Subject: rpms/python-qpid/devel python-qpid.spec,1.29,1.30
Message-ID: <20090918224611.AB9BA11C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5540

Modified Files:
	python-qpid.spec 
Log Message:
add amqp required version back in


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- python-qpid.spec	18 Sep 2009 22:37:40 -0000	1.29
+++ python-qpid.spec	18 Sep 2009 22:46:11 -0000	1.30
@@ -16,8 +16,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp 
-# >= 1.0.816781
+Requires:       amqp >= 1.0.816781
 
 %description
 The Apache Qpid project's Python language client for AMQP.



From jkeating at fedoraproject.org  Fri Sep 18 22:59:54 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 18 Sep 2009 22:59:54 +0000 (UTC)
Subject: rpms/rhpl/devel import.log, NONE, 1.1 .cvsignore, 1.92,
	1.93 rhpl.spec, 1.123, 1.124 sources, 1.101, 1.102
Message-ID: <20090918225954.A8D8311C00EC@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/rhpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13160/devel

Modified Files:
	.cvsignore rhpl.spec sources 
Added Files:
	import.log 
Log Message:
Get the fixes from F-11 into rawhide



--- NEW FILE import.log ---
rhpl-0_221-1:HEAD:rhpl-0.221-1.src.rpm:1253314704


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- .cvsignore	14 Apr 2009 19:37:14 -0000	1.92
+++ .cvsignore	18 Sep 2009 22:59:52 -0000	1.93
@@ -1,2 +1 @@
-rhpl-0.219.tar.bz2
-rhpl-0.220.tar.bz2
+rhpl-0.221.tar.bz2


Index: rhpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- rhpl.spec	27 Jul 2009 03:01:57 -0000	1.123
+++ rhpl.spec	18 Sep 2009 22:59:52 -0000	1.124
@@ -2,8 +2,8 @@
 
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
-Version: 0.220
-Release: 2
+Version: 0.221
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Libraries
@@ -41,8 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rhpl
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.220-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue May 26 2009 Jeremy Katz <katzj at redhat.com> 0.222-1
+- Fix leaking fd for loadkeys with a big hammer (#501368)
+- Fix Russian keyboard (#492544)
 
 * Mon Apr 13 2009 Chris Lumens <clumens at redhat.com> 0.220-1
 - Attempt to fix an error when catching OSError (#493271).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	14 Apr 2009 19:37:14 -0000	1.101
+++ sources	18 Sep 2009 22:59:52 -0000	1.102
@@ -1 +1 @@
-be021f2c1e342c37ad4757951744c257  rhpl-0.220.tar.bz2
+1a4a88e9e0150f1c81e3df335742f3db  rhpl-0.221.tar.bz2



From jkeating at fedoraproject.org  Fri Sep 18 23:01:28 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 18 Sep 2009 23:01:28 +0000 (UTC)
Subject: rpms/rhpl/devel rhpl.spec,1.124,1.125
Message-ID: <20090918230128.15D9911C00EC@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/rhpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13549

Modified Files:
	rhpl.spec 
Log Message:
Port the F11 changes over to rawhide.



Index: rhpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- rhpl.spec	18 Sep 2009 22:59:52 -0000	1.124
+++ rhpl.spec	18 Sep 2009 23:01:27 -0000	1.125
@@ -3,7 +3,7 @@
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
 Version: 0.221
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Libraries
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rhpl
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.222-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 26 2009 Jeremy Katz <katzj at redhat.com> 0.222-1
 - Fix leaking fd for loadkeys with a big hammer (#501368)
 - Fix Russian keyboard (#492544)



From lmacken at fedoraproject.org  Fri Sep 18 23:28:17 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 18 Sep 2009 23:28:17 +0000 (UTC)
Subject: rpms/python-stomper/F-11 python-stomper-uuid.patch, NONE,
	1.1 python-stomper.spec, 1.1, 1.2
Message-ID: <20090918232817.6060711C01EA@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-stomper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29043/F-11

Modified Files:
	python-stomper.spec 
Added Files:
	python-stomper-uuid.patch 
Log Message:
* Thu Sep 03 2009 Luke Macken <lmacken at redhat.com> - 0.2.2-9
- Require python-uuid when using Python2.4 only
- Run the test suite in %%check


python-stomper-uuid.patch:
 setup.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE python-stomper-uuid.patch ---
--- setup.py.orig	2009-06-02 13:24:33.000000000 -0400
+++ setup.py	2009-06-02 13:24:44.000000000 -0400
@@ -46,7 +46,6 @@
 
 
 needed = [
-    'uuid>=1.2',
 ]
 
 setup(


Index: python-stomper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-stomper/F-11/python-stomper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-stomper.spec	11 Apr 2009 18:44:37 -0000	1.1
+++ python-stomper.spec	18 Sep 2009 23:28:16 -0000	1.2
@@ -2,18 +2,25 @@
 
 Name:           python-stomper
 Version:        0.2.2
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        A python client implementation of the STOMP protocol
 
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://code.google.com/p/stomper/
 Source0:        http://stomper.googlecode.com/files/stomper-%{version}.tar.gz
+Patch0:         %{name}-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python-nose
+
+%if 0%{?el5}
+BuildRequires:  python-uuid
+Requires:       python-uuid
+%endif
 
 %description
 This is a python client implementation of the STOMP protocol. The client is
@@ -22,6 +29,7 @@ create and parse STOMP messages in a pro
 
 %prep
 %setup -q -n stomper-%{version}
+%patch0 -p0 -b .uuid
 
 %build
 %{__python} setup.py build
@@ -32,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/examples
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/tests
 
+%check
+PYTHONPATH=$(pwd) nosetests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -41,6 +52,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 03 2009 Luke Macken <lmacken at redhat.com> - 0.2.2-9
+- Require python-uuid when using Python2.4 only
+- Run the test suite in %%check
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 09 2009 Silas Sewell <silas at sewell ch> - 0.2.2-7
 - Remove Python version dependency
 



From lmacken at fedoraproject.org  Fri Sep 18 23:28:17 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 18 Sep 2009 23:28:17 +0000 (UTC)
Subject: rpms/python-stomper/F-10 python-stomper-uuid.patch, NONE,
	1.1 python-stomper.spec, 1.2, 1.3
Message-ID: <20090918232817.5FB9111C00EC@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-stomper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29043/F-10

Modified Files:
	python-stomper.spec 
Added Files:
	python-stomper-uuid.patch 
Log Message:
* Thu Sep 03 2009 Luke Macken <lmacken at redhat.com> - 0.2.2-9
- Require python-uuid when using Python2.4 only
- Run the test suite in %%check


python-stomper-uuid.patch:
 setup.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE python-stomper-uuid.patch ---
--- setup.py.orig	2009-06-02 13:24:33.000000000 -0400
+++ setup.py	2009-06-02 13:24:44.000000000 -0400
@@ -46,7 +46,6 @@
 
 
 needed = [
-    'uuid>=1.2',
 ]
 
 setup(


Index: python-stomper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-stomper/F-10/python-stomper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-stomper.spec	26 Jul 2009 23:09:36 -0000	1.2
+++ python-stomper.spec	18 Sep 2009 23:28:15 -0000	1.3
@@ -2,18 +2,25 @@
 
 Name:           python-stomper
 Version:        0.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A python client implementation of the STOMP protocol
 
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://code.google.com/p/stomper/
 Source0:        http://stomper.googlecode.com/files/stomper-%{version}.tar.gz
+Patch0:         %{name}-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python-nose
+
+%if 0%{?el5}
+BuildRequires:  python-uuid
+Requires:       python-uuid
+%endif
 
 %description
 This is a python client implementation of the STOMP protocol. The client is
@@ -22,6 +29,7 @@ create and parse STOMP messages in a pro
 
 %prep
 %setup -q -n stomper-%{version}
+%patch0 -p0 -b .uuid
 
 %build
 %{__python} setup.py build
@@ -32,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/examples
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/tests
 
+%check
+PYTHONPATH=$(pwd) nosetests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -41,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 03 2009 Luke Macken <lmacken at redhat.com> - 0.2.2-9
+- Require python-uuid when using Python2.4 only
+- Run the test suite in %%check
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Fri Sep 18 23:38:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 18 Sep 2009 23:38:56 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.514,1.515
Message-ID: <20090918233856.6823E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1254/devel

Modified Files:
	kdelibs.spec 
Log Message:
* Fri Sep 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- ship kde4-doxygen.sh only in -devel (fix duplicate file)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -p -r1.514 -r1.515
--- kdelibs.spec	4 Sep 2009 12:22:13 -0000	1.514
+++ kdelibs.spec	18 Sep 2009 23:38:55 -0000	1.515
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -315,6 +315,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/*
 # kdewidgets
 %exclude %{_kde4_bindir}/makekdewidgets4
+%exclude %{_kde4_bindir}/kde4-doxygen.sh
 %exclude %{_kde4_appsdir}/kdewidgets/
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
@@ -384,6 +385,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- ship kde4-doxygen.sh only in -devel (fix duplicate file)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 4.3.1-3
 - security fix for -CVE-2009-2702
 



From davidz at fedoraproject.org  Fri Sep 18 23:55:24 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Fri, 18 Sep 2009 23:55:24 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.11,
	1.12 DeviceKit-disks.spec, 1.32, 1.33 sources, 1.11, 1.12
Message-ID: <20090918235524.654AE11C00EC@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9018

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Log Message:
* Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 007-1%{?dist}
- Update to release 007




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Aug 2009 18:06:59 -0000	1.11
+++ .cvsignore	18 Sep 2009 23:55:24 -0000	1.12
@@ -8,3 +8,4 @@ DeviceKit-disks-004.20090415git.tar.gz
 DeviceKit-disks-004.tar.gz
 DeviceKit-disks-005.tar.gz
 DeviceKit-disks-006.tar.gz
+DeviceKit-disks-007.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- DeviceKit-disks.spec	17 Aug 2009 18:06:59 -0000	1.32
+++ DeviceKit-disks.spec	18 Sep 2009 23:55:24 -0000	1.33
@@ -11,11 +11,11 @@
 
 Summary: Disk Management Service
 Name: DeviceKit-disks
-Version: 006
+Version: 007
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
-URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
+URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -23,8 +23,6 @@ BuildRequires: dbus-devel  >= %{dbus_ver
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: polkit-devel >= %{polkit_version}
 BuildRequires: parted-devel >= %{parted_version}
-BuildRequires: DeviceKit-devel >= %{devicekit_version}
-BuildRequires: sqlite-devel
 BuildRequires: device-mapper-devel >= %{device_mapper_version}
 BuildRequires: intltool
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
@@ -37,7 +35,6 @@ Requires: dbus-glib >= %{dbus_glib_versi
 Requires: glib2 >= %{glib2_version}
 Requires: polkit >= %{polkit_version}
 Requires: parted >= %{parted_version}
-Requires: DeviceKit >= %{devicekit_version}
 Requires: udev >= %{udev_version}
 Requires: mdadm >= %{mdadm_version}
 Requires: libatasmart >= %{libatasmart_version}
@@ -143,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 007-1%{?dist}
+- Update to release 007
+
 * Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 006-1%{?dist}
 - Update to release 006
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Aug 2009 18:06:59 -0000	1.11
+++ sources	18 Sep 2009 23:55:24 -0000	1.12
@@ -1,2 +1 @@
-8c0e5daa492e044a5a4f65b9412c0b34  DeviceKit-disks-005.tar.gz
-7773b5afeeaad9ff285ef3320a97792c  DeviceKit-disks-006.tar.gz
+6fa70c6a67beacbc55374e92c671a568  DeviceKit-disks-007.tar.gz



From davidz at fedoraproject.org  Fri Sep 18 23:55:51 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Fri, 18 Sep 2009 23:55:51 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.9,
	1.10 gnome-disk-utility.spec, 1.18, 1.19 sources, 1.9, 1.10
Message-ID: <20090918235551.1631A11C00EC@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-serv9164

Modified Files:
	.cvsignore gnome-disk-utility.spec sources 
Log Message:
* Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-1%{?dist}
- Update to upstream release 2.28.0
- Compared to previous releases, this release should whine less about SMART




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Aug 2009 18:15:06 -0000	1.9
+++ .cvsignore	18 Sep 2009 23:55:50 -0000	1.10
@@ -6,3 +6,4 @@ gnome-disk-utility-0.3.20090415git.tar.b
 gnome-disk-utility-0.3.tar.bz2
 gnome-disk-utility-0.4.tar.bz2
 gnome-disk-utility-0.5.tar.bz2
+gnome-disk-utility-2.28.0.tar.bz2


Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gnome-disk-utility.spec	17 Aug 2009 21:49:19 -0000	1.18
+++ gnome-disk-utility.spec	18 Sep 2009 23:55:50 -0000	1.19
@@ -4,15 +4,15 @@
 %define gtk2_version              2.17.2
 %define gnome_doc_utils_version   0.3.2
 %define gnome_keyring_version     2.22
-%define devicekit_disks_version   006
+%define devicekit_disks_version   007
 %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.5
-Release: 3%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -208,6 +208,10 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-1%{?dist}
+- Update to upstream release 2.28.0
+- Compared to previous releases, this release should whine less about SMART
+
 * Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
 - Drop upstreamed patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Aug 2009 18:15:06 -0000	1.9
+++ sources	18 Sep 2009 23:55:50 -0000	1.10
@@ -1 +1 @@
-1764bfcaf3383d2a22c1d73d80be4f66  gnome-disk-utility-0.5.tar.bz2
+2ef95e6d5949c0d623b16bb98108cce8  gnome-disk-utility-2.28.0.tar.bz2



From lennart at fedoraproject.org  Sat Sep 19 00:18:31 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sat, 19 Sep 2009 00:18:31 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.43, 1.44 pulseaudio.spec, 1.100,
	1.101 sources, 1.47, 1.48
Message-ID: <20090919001831.5CF2711C00EC@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20563

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
New release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	11 Sep 2009 01:56:51 -0000	1.43
+++ .cvsignore	19 Sep 2009 00:18:30 -0000	1.44
@@ -1 +1 @@
-pulseaudio-0.9.17.tar.gz
+pulseaudio-0.9.18.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- pulseaudio.spec	11 Sep 2009 01:56:51 -0000	1.100
+++ pulseaudio.spec	19 Sep 2009 00:18:31 -0000	1.101
@@ -1,6 +1,6 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
-Version:        0.9.17
+Version:        0.9.18
 Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
@@ -168,7 +168,9 @@ Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       %{name}-libs-glib2 = %{version}-%{release}
 Requires:       %{name}-libs-zeroconf = %{version}-%{release}
-Requires:   pkgconfig glib2-devel
+Requires:   	pkgconfig 
+Requires:	glib2-devel
+Requires:	vala
 Provides:       pulseaudio-lib-devel
 Obsoletes:      pulseaudio-lib-devel
 
@@ -406,6 +408,7 @@ exit 0
 %{_libdir}/libpulse-simple.so
 %{_libdir}/libpulse-browse.so
 %{_libdir}/pkgconfig/libpulse*.pc
+%{_datadir}/vala/vapi/libpulse.vapi
 
 %files utils
 %defattr(-,root,root)
@@ -434,6 +437,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Sat Sep 19 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.18-1
+- New release
+
 * Fri Sep 11 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.17-1
 - Final release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	11 Sep 2009 01:56:51 -0000	1.47
+++ sources	19 Sep 2009 00:18:31 -0000	1.48
@@ -1 +1 @@
-cba8f14b8213f47e1d35da3a0a3cb076  pulseaudio-0.9.17.tar.gz
+120dc3c7b75946e649fd3d6bde2b3661  pulseaudio-0.9.18.tar.gz



From rdieter at fedoraproject.org  Sat Sep 19 00:23:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 00:23:11 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.270, 1.271 comps-f11.xml.in, 1.297,
	1.298 comps-f12.xml.in, 1.120, 1.121 comps-f13.xml.in, 1.11, 1.12
Message-ID: <20090919002311.6325F11C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22740

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
kde-desktop: dejavu-fonts default



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- comps-f10.xml.in	7 Sep 2009 19:42:10 -0000	1.270
+++ comps-f10.xml.in	19 Sep 2009 00:23:10 -0000	1.271
@@ -2994,6 +2994,9 @@
       <packagereq type="conditional" requires="ibus">ibus-qt</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">guidance-power-manager</packagereq>
       <packagereq type="default">kaffeine</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- comps-f11.xml.in	11 Sep 2009 17:17:18 -0000	1.297
+++ comps-f11.xml.in	19 Sep 2009 00:23:10 -0000	1.298
@@ -3433,6 +3433,9 @@
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- comps-f12.xml.in	18 Sep 2009 16:01:48 -0000	1.120
+++ comps-f12.xml.in	19 Sep 2009 00:23:10 -0000	1.121
@@ -3593,10 +3593,10 @@
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
-      <packagereq type="default">google-droid-sans-fonts</packagereq>
-      <packagereq type="default">google-droid-sans-mono-fonts</packagereq>
-      <packagereq type="default">google-droid-serif-fonts</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- comps-f13.xml.in	18 Sep 2009 16:01:48 -0000	1.11
+++ comps-f13.xml.in	19 Sep 2009 00:23:10 -0000	1.12
@@ -3589,10 +3589,10 @@
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
-      <packagereq type="default">google-droid-sans-fonts</packagereq>
-      <packagereq type="default">google-droid-sans-mono-fonts</packagereq>
-      <packagereq type="default">google-droid-serif-fonts</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>



From nsantos at fedoraproject.org  Sat Sep 19 00:26:06 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Sat, 19 Sep 2009 00:26:06 +0000 (UTC)
Subject: rpms/ruby-qpid/devel .cvsignore, 1.12, 1.13 ruby-qpid.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090919002606.B10AC11C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23824

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 816781


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Jul 2009 14:17:33 -0000	1.12
+++ .cvsignore	19 Sep 2009 00:26:05 -0000	1.13
@@ -1 +1 @@
-ruby-qpid-0.5.795209.tar.gz
+ruby-qpid-0.5.816781.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ruby-qpid.spec	28 Jul 2009 16:48:38 -0000	1.18
+++ ruby-qpid.spec	19 Sep 2009 00:26:05 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version: 	0.5.795209
+Version: 	0.5.816781
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -22,12 +22,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.790661
+BuildRequires:  amqp >= 1.0.816781
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.790661
+Requires:       amqp >= 1.0.816781
 Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt NOTICE.txt RELEASE_NOTES
 
 %changelog
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
+- Rebased to svn rev 816781
+
 * Tue Jul 28 2009 Nuno Santos <nsantos at redhat.com> - 0.5.795209-1
 - Rebased to svn rev 795209
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Jul 2009 14:17:33 -0000	1.12
+++ sources	19 Sep 2009 00:26:05 -0000	1.13
@@ -1 +1 @@
-38a0a3a6f4678c8812bafae146d6c00d  ruby-qpid-0.5.795209.tar.gz
+5c270a6ffaf1527f38bfa3d03f47e413  ruby-qpid-0.5.816781.tar.gz



From rdieter at fedoraproject.org  Sat Sep 19 00:26:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 00:26:11 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.271,1.272
Message-ID: <20090919002611.B607811C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23773

Modified Files:
	comps-f10.xml.in 
Log Message:
kde-desktop: make guidance-power-manager optional



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- comps-f10.xml.in	19 Sep 2009 00:23:10 -0000	1.271
+++ comps-f10.xml.in	19 Sep 2009 00:26:11 -0000	1.272
@@ -2998,7 +2998,6 @@
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
-      <packagereq type="default">guidance-power-manager</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
@@ -3028,6 +3027,7 @@
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
+      <packagereq type="optional">guidance-power-manager</packagereq>
       <packagereq type="optional">katapult</packagereq>
       <packagereq type="optional">kbackup</packagereq>
       <packagereq type="optional">kbibtex</packagereq>



From rdieter at fedoraproject.org  Sat Sep 19 00:29:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 00:29:28 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.121,1.122 comps-f13.xml.in,1.12,1.13
Message-ID: <20090919002928.1EFB911C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25840

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
kde-desktop: +knetworkmanager (optional)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- comps-f12.xml.in	19 Sep 2009 00:23:10 -0000	1.121
+++ comps-f12.xml.in	19 Sep 2009 00:29:27 -0000	1.122
@@ -3657,6 +3657,7 @@
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">koverartist</packagereq>
       <packagereq type="optional">krecipes</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- comps-f13.xml.in	19 Sep 2009 00:23:10 -0000	1.12
+++ comps-f13.xml.in	19 Sep 2009 00:29:27 -0000	1.13
@@ -3653,6 +3653,7 @@
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">koverartist</packagereq>
       <packagereq type="optional">krecipes</packagereq>



From davidz at fedoraproject.org  Sat Sep 19 00:29:52 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sat, 19 Sep 2009 00:29:52 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec,1.19,1.20
Message-ID: <20090919002952.4D0B611C00EC@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-serv26049

Modified Files:
	gnome-disk-utility.spec 
Log Message:
* Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-2%{?dist}
- BR libatasmart-devel




Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnome-disk-utility.spec	18 Sep 2009 23:55:50 -0000	1.19
+++ gnome-disk-utility.spec	19 Sep 2009 00:29:52 -0000	1.20
@@ -8,11 +8,12 @@
 %define unique_version            1.0.4
 %define libnotify_version         0.4.5
 %define nautilus_version          2.26
+%define libatasmart_version       0.14
 
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -31,6 +32,7 @@ BuildRequires: DeviceKit-disks-devel >= 
 BuildRequires: unique-devel >= %{unique_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
+BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: intltool
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -208,6 +210,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-2%{?dist}
+- BR libatasmart-devel
+
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-1%{?dist}
 - Update to upstream release 2.28.0
 - Compared to previous releases, this release should whine less about SMART



From nsantos at fedoraproject.org  Sat Sep 19 00:33:42 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Sat, 19 Sep 2009 00:33:42 +0000 (UTC)
Subject: rpms/ruby-qpid/devel ruby-qpid.spec,1.19,1.20
Message-ID: <20090919003342.D1D6511C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28323

Modified Files:
	ruby-qpid.spec 
Log Message:
temporarily remove required version


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ruby-qpid.spec	19 Sep 2009 00:26:05 -0000	1.19
+++ ruby-qpid.spec	19 Sep 2009 00:33:42 -0000	1.20
@@ -22,7 +22,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.816781
+BuildRequires:  amqp 
+#>= 1.0.816781
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby



From nsantos at fedoraproject.org  Sat Sep 19 00:42:27 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Sat, 19 Sep 2009 00:42:27 +0000 (UTC)
Subject: rpms/ruby-qpid/devel ruby-qpid.spec,1.20,1.21
Message-ID: <20090919004227.96F1411C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409

Modified Files:
	ruby-qpid.spec 
Log Message:
add amqp required version back in


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ruby-qpid.spec	19 Sep 2009 00:33:42 -0000	1.20
+++ ruby-qpid.spec	19 Sep 2009 00:42:25 -0000	1.21
@@ -22,8 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp 
-#>= 1.0.816781
+BuildRequires:  amqp >= 1.0.816781
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby



From rdieter at fedoraproject.org  Sat Sep 19 00:49:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 00:49:38 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.272, 1.273 comps-f11.xml.in, 1.298,
	1.299 comps-f12.xml.in, 1.122, 1.123 comps-f13.xml.in, 1.13, 1.14
Message-ID: <20090919004938.A46E011C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2499

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
kde-desktop: +kio-ftps +kio_gopher



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- comps-f10.xml.in	19 Sep 2009 00:26:11 -0000	1.272
+++ comps-f10.xml.in	19 Sep 2009 00:49:38 -0000	1.273
@@ -3048,6 +3048,8 @@
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
+      <packagereq type="optional">kio-ftps</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kleansweep</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- comps-f11.xml.in	19 Sep 2009 00:23:10 -0000	1.298
+++ comps-f11.xml.in	19 Sep 2009 00:49:38 -0000	1.299
@@ -3490,6 +3490,8 @@
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
+      <packagereq type="optional">kio-ftps</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- comps-f12.xml.in	19 Sep 2009 00:29:27 -0000	1.122
+++ comps-f12.xml.in	19 Sep 2009 00:49:38 -0000	1.123
@@ -3652,6 +3652,8 @@
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
+      <packagereq type="optional">kio-ftps</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- comps-f13.xml.in	19 Sep 2009 00:29:27 -0000	1.13
+++ comps-f13.xml.in	19 Sep 2009 00:49:38 -0000	1.14
@@ -3648,6 +3648,8 @@
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
+      <packagereq type="optional">kio-ftps</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>



From rdieter at fedoraproject.org  Sat Sep 19 00:51:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 00:51:55 +0000 (UTC)
Subject: comps comps-el5.xml.in, 1.26, 1.27 comps-f10.xml.in, 1.273,
	1.274 comps-f11.xml.in, 1.299, 1.300 comps-f12.xml.in, 1.123,
	1.124 comps-f13.xml.in, 1.14, 1.15
Message-ID: <20090919005155.48F4F11C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3778

Modified Files:
	comps-el5.xml.in comps-f10.xml.in comps-f11.xml.in 
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
office: +kmymoney2



Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-el5.xml.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- comps-el5.xml.in	13 Aug 2009 12:09:01 -0000	1.26
+++ comps-el5.xml.in	19 Sep 2009 00:51:54 -0000	1.27
@@ -340,6 +340,7 @@
     <packagelist>
       <packagereq type="optional">calcurse</packagereq>
       <packagereq type="optional">gnucash</packagereq>
+      <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">revelation</packagereq>
       <packagereq type="optional">vym</packagereq>
     </packagelist>


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- comps-f10.xml.in	19 Sep 2009 00:49:38 -0000	1.273
+++ comps-f10.xml.in	19 Sep 2009 00:51:54 -0000	1.274
@@ -3749,6 +3749,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- comps-f11.xml.in	19 Sep 2009 00:49:38 -0000	1.299
+++ comps-f11.xml.in	19 Sep 2009 00:51:54 -0000	1.300
@@ -4357,6 +4357,7 @@
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
+      <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>
       <packagereq type="optional">kreetingkard_templates</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- comps-f12.xml.in	19 Sep 2009 00:49:38 -0000	1.123
+++ comps-f12.xml.in	19 Sep 2009 00:51:54 -0000	1.124
@@ -4544,6 +4544,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- comps-f13.xml.in	19 Sep 2009 00:49:38 -0000	1.14
+++ comps-f13.xml.in	19 Sep 2009 00:51:54 -0000	1.15
@@ -4540,6 +4540,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>



From nsantos at fedoraproject.org  Sat Sep 19 00:52:45 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Sat, 19 Sep 2009 00:52:45 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.21, 1.22 qpidc.spec, 1.93,
	1.94 sources, 1.42, 1.43
Message-ID: <20090919005245.C326C11C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4258

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 816781


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	2 Jul 2009 20:34:38 -0000	1.21
+++ .cvsignore	19 Sep 2009 00:52:45 -0000	1.22
@@ -1 +1 @@
-qpidc-0.5.790661.tar.gz
+qpidc-0.5.816781.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- qpidc.spec	29 Jul 2009 04:42:14 -0000	1.93
+++ qpidc.spec	19 Sep 2009 00:52:45 -0000	1.94
@@ -8,8 +8,8 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name:           qpidc
-Version:        0.5.790661
-Release:        3%{?dist}
+Version:        0.5.816781
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -440,6 +440,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
+- Rebased to svn rev 816781
+
 * Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-3
 - Update BuildRequires and Requires to use latest stable versions of
   corosync and clusterlib.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Jul 2009 20:34:39 -0000	1.42
+++ sources	19 Sep 2009 00:52:45 -0000	1.43
@@ -1 +1 @@
-9b26e5ac89277664525a78fb49a20dfd  qpidc-0.5.790661.tar.gz
+69349887e52b6e5a3a956ebe58342295  qpidc-0.5.816781.tar.gz



From rdieter at fedoraproject.org  Sat Sep 19 00:53:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 00:53:04 +0000 (UTC)
Subject: comps comps-el5.xml.in,1.27,1.28
Message-ID: <20090919005304.BDDDE11C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4407

Modified Files:
	comps-el5.xml.in 
Log Message:
graphics: +digikam



Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-el5.xml.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- comps-el5.xml.in	19 Sep 2009 00:51:54 -0000	1.27
+++ comps-el5.xml.in	19 Sep 2009 00:53:04 -0000	1.28
@@ -237,6 +237,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">graphviz</packagereq>
       <packagereq type="optional">gv</packagereq>



From rdieter at fedoraproject.org  Sat Sep 19 01:02:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 01:02:49 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.274, 1.275 comps-f11.xml.in, 1.300,
	1.301 comps-f12.xml.in, 1.124, 1.125 comps-f13.xml.in, 1.15, 1.16
Message-ID: <20090919010249.2F83011C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7806

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
office: +skrooge



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- comps-f10.xml.in	19 Sep 2009 00:51:54 -0000	1.274
+++ comps-f10.xml.in	19 Sep 2009 01:02:47 -0000	1.275
@@ -3770,6 +3770,7 @@
       <packagereq type="optional">qcad</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
+      <packagereq type="optional">skrooge</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">tellico</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- comps-f11.xml.in	19 Sep 2009 00:51:54 -0000	1.300
+++ comps-f11.xml.in	19 Sep 2009 01:02:47 -0000	1.301
@@ -4378,6 +4378,7 @@
       <packagereq type="optional">rednotebook</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
+      <packagereq type="optional">skrooge</packagereq>
       <packagereq type="optional">sunbird</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- comps-f12.xml.in	19 Sep 2009 00:51:54 -0000	1.124
+++ comps-f12.xml.in	19 Sep 2009 01:02:48 -0000	1.125
@@ -4566,6 +4566,7 @@
       <packagereq type="optional">rednotebook</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
+      <packagereq type="optional">skrooge</packagereq>
       <packagereq type="optional">sunbird</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- comps-f13.xml.in	19 Sep 2009 00:51:54 -0000	1.15
+++ comps-f13.xml.in	19 Sep 2009 01:02:48 -0000	1.16
@@ -4562,6 +4562,7 @@
       <packagereq type="optional">rednotebook</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
+      <packagereq type="optional">skrooge</packagereq>
       <packagereq type="optional">sunbird</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>



From nsantos at fedoraproject.org  Sat Sep 19 01:04:46 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Sat, 19 Sep 2009 01:04:46 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.94,1.95
Message-ID: <20090919010446.E033111C00EC@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9124

Modified Files:
	qpidc.spec 
Log Message:
comment out patch


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- qpidc.spec	19 Sep 2009 00:52:45 -0000	1.94
+++ qpidc.spec	19 Sep 2009 01:04:46 -0000	1.95
@@ -16,7 +16,7 @@ License:        ASL 2.0
 URL:            http://qpid.apache.org
 Source0:        %{name}-%{version}.tar.gz
 Source1:	qpidd.pp
-Patch1:		qpidc_f12_new_cpg.diff
+#Patch1:		qpidc_f12_new_cpg.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -213,7 +213,7 @@ exit 0
 
 %prep
 %setup -q
-%patch1 -p1
+#%patch1 -p1
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 



From dwalsh at fedoraproject.org  Sat Sep 19 01:38:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 19 Sep 2009 01:38:30 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.86,
	1.87 selinux-policy.spec, 1.924, 1.925
Message-ID: <20090919013830.8FDC311C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20754

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-6
- More fixes for sandbox_web_t


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  319 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  177 +++
 policy/modules/apps/sandbox.te            |  324 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   79 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   76 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   14 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1403 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 316 files changed, 14516 insertions(+), 2577 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- policy-F12.patch	18 Sep 2009 22:11:35 -0000	1.86
+++ policy-F12.patch	19 Sep 2009 01:38:29 -0000	1.87
@@ -2465,8 +2465,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.32/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-17 12:55:18.000000000 -0400
-@@ -0,0 +1,318 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-18 21:30:00.000000000 -0400
+@@ -0,0 +1,319 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2706,6 +2706,7 @@ diff -b -B --ignore-all-space --exclude-
 +		type nsplugin_rw_t;
 +	')
 +
++	list_dirs_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
 +	read_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
 +	read_lnk_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
 +')
@@ -3809,8 +3810,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-18 11:29:38.000000000 -0400
-@@ -0,0 +1,323 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-18 21:31:34.000000000 -0400
+@@ -0,0 +1,324 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -3946,7 +3947,7 @@ diff -b -B --ignore-all-space --exclude-
 +dontaudit sandbox_x_domain self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 +
 +files_search_home(sandbox_x_domain)
-+files_dontaudit_getattr_tmp_dirs(sandbox_x_domain)
++files_dontaudit_list_tmp(sandbox_x_domain)
 +
 +kernel_read_system_state(sandbox_x_domain)
 +
@@ -4061,6 +4062,7 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_tcp_connect_ftp_port(sandbox_web_client_t)
 +corenet_tcp_connect_ipp_port(sandbox_web_client_t)
 +corenet_tcp_connect_generic_port(sandbox_web_client_t)
++corenet_tcp_connect_sound_port(sandbox_web_client_t)
 +corenet_sendrecv_http_client_packets(sandbox_web_client_t)
 +corenet_sendrecv_http_cache_client_packets(sandbox_web_client_t)
 +corenet_sendrecv_ftp_client_packets(sandbox_web_client_t)
@@ -5319,7 +5321,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-18 17:16:00.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-18 21:30:50.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -14536,6 +14538,17 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(pptp_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.6.32/policy/modules/services/prelude.te
+--- nsaserefpolicy/policy/modules/services/prelude.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-09-18 21:24:50.000000000 -0400
+@@ -123,6 +123,7 @@
+ # prelude_audisp local policy
+ #
+ allow prelude_audisp_t self:capability dac_override;
++allow prelude_audisp_t self:process { getcap setcap };
+ allow prelude_audisp_t self:fifo_file rw_file_perms;
+ allow prelude_audisp_t self:unix_stream_socket create_stream_socket_perms;
+ allow prelude_audisp_t self:unix_dgram_socket create_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.32/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/privoxy.te	2009-09-16 10:03:09.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -p -r1.924 -r1.925
--- selinux-policy.spec	18 Sep 2009 22:12:25 -0000	1.924
+++ selinux-policy.spec	19 Sep 2009 01:38:30 -0000	1.925
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,6 +447,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-6
+- More fixes for sandbox_web_t
+
 * Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-5
 - Allow sshd to create .ssh directory and content
 



From dwalsh at fedoraproject.org  Sat Sep 19 01:40:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 19 Sep 2009 01:40:58 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.444,
	1.445 policycoreutils.spec, 1.644, 1.645
Message-ID: <20090919014058.5557611C0338@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21487

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-3
- Security fixes for seunshare
- Fix Sandbox to handle non file input to command.


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  207 +++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  265 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    8 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1905 insertions(+), 953 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -p -r1.444 -r1.445
--- policycoreutils-rhat.patch	17 Sep 2009 19:19:53 -0000	1.444
+++ policycoreutils-rhat.patch	19 Sep 2009 01:40:53 -0000	1.445
@@ -1222,8 +1222,8 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-17 15:05:17.000000000 -0400
-@@ -0,0 +1,202 @@
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-18 21:38:37.000000000 -0400
+@@ -0,0 +1,207 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1390,7 +1390,12 @@ diff --exclude-from=exclude --exclude=se
 +                         warnings.resetwarnings()
 +                         paths = []
 +                         for i in cmds:
-+                                paths.append(os.path.realpath(i))
++                                f = os.path.realpath(i)
++                                if os.path.exists(f):
++                                       paths.append(f)
++                                else:
++                                       paths.append(i)
++                                       
 +                         copyfiles(newhomedir, newtmpdir, init_files + paths)
 +                         execfile = newhomedir + "/.sandboxrc"
 +                         fd = open(execfile, "w+")
@@ -1478,8 +1483,8 @@ diff --exclude-from=exclude --exclude=se
 +done
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-17 15:05:44.000000000 -0400
-@@ -0,0 +1,284 @@
++++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-18 09:58:46.000000000 -0400
+@@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
 +#include <sys/wait.h>
@@ -1506,33 +1511,19 @@ diff --exclude-from=exclude --exclude=se
 +#include <unistd.h>
 +
 +/**
-+ * This function will drop the capabilities so that we are left
-+ * only with access to the audit system and the ability to raise
-+ * CAP_SYS_ADMIN before invoking unshare and mounting a couple of directories. 
-+ * These capabilities are needed for performing bind mounts/unmounts 
-+ * and to create potential new instance directories with appropriate 
-+ * DAC attributes. 
-+ *
++ * This function will drop all capabilities 
 + * Returns zero on success, non-zero otherwise
 + */
-+static int drop_capabilities(int all, uid_t uid)
++static int drop_capabilities(uid_t uid)
 +{
 +	capng_clear(CAPNG_SELECT_BOTH);
 +
-+	if (all) {
-+		if (capng_lock() < 0) 
-+			return -1;
-+		/* Change uid */
-+		if (setresuid(uid, uid, uid)) {
-+			fprintf(stderr, "Error changing uid, aborting.\n");
-+			return -1;
-+		}
-+	} else {
-+		if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_SETPCAP, CAP_SETUID, -1) < 0) { 
-+			fprintf(stderr, "Error running capng_updatev\n");
-+			return -1;
-+		}
-+	}
++	if (capng_lock() < 0) 
++		return -1;
++	/* Change uid */
++	if (setresuid(uid, uid, uid)) {
++		fprintf(stderr, "Error changing uid, aborting.\n");
++		return -1;
 +
 +	return capng_apply(CAPNG_SELECT_BOTH);
 +}
@@ -1626,7 +1617,6 @@ diff --exclude-from=exclude --exclude=se
 +		{"tmpdir", 1, 0, 't'},
 +		{NULL, 0, 0, 0}
 +	};
-+	capng_print_caps_text(CAPNG_PRINT_STDOUT, CAPNG_EFFECTIVE);
 +
 +	uid_t uid = getuid();
 +
@@ -1643,10 +1633,6 @@ diff --exclude-from=exclude --exclude=se
 +
 +	if (verify_shell(pwd->pw_shell) == 0) {
 +		fprintf(stderr, "Error!  Shell is not valid.\n");
-+	}
-+
-+	if (drop_capabilities(FALSE, uid)) {
-+		perror("Failed to drop capabilities");
 +		return -1;
 +	}
 +
@@ -1710,7 +1696,7 @@ diff --exclude-from=exclude --exclude=se
 +	if (tmpdir_s && verify_mount("/tmp", pwd) < 0) 
 +		return -1;
 +
-+	if (drop_capabilities(TRUE, uid)) {
++	if (drop_capabilities(uid)) {
 +		perror("Failed to drop all capabilities");
 +		return -1;
 +	}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -p -r1.644 -r1.645
--- policycoreutils.spec	17 Sep 2009 19:19:55 -0000	1.644
+++ policycoreutils.spec	19 Sep 2009 01:40:56 -0000	1.645
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,10 @@ fi
 exit 0
 
 %changelog
+* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-3
+- Security fixes for seunshare
+- Fix Sandbox to handle non file input to command.
+
 * Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-2
 - Security fixes for seunshare
 



From dwalsh at fedoraproject.org  Sat Sep 19 02:03:04 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 19 Sep 2009 02:03:04 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.87,1.88
Message-ID: <20090919020304.52A7F11C00EC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29989

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-6
- More fixes for sandbox_web_t


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  319 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  179 +++
 policy/modules/apps/sandbox.te            |  324 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   80 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   29 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  311 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 317 files changed, 14548 insertions(+), 2577 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- policy-F12.patch	19 Sep 2009 01:38:29 -0000	1.87
+++ policy-F12.patch	19 Sep 2009 02:03:03 -0000	1.88
@@ -3629,8 +3629,8 @@ diff -b -B --ignore-all-space --exclude-
 +# No types are sandbox_exec_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-18 11:27:41.000000000 -0400
-@@ -0,0 +1,177 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-18 22:01:56.000000000 -0400
+@@ -0,0 +1,179 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -3663,10 +3663,12 @@ diff -b -B --ignore-all-space --exclude-
 +	role $2 types sandbox_domain;
 +	allow sandbox_domain $1:process sigchld;
 +
-+	allow $1 sandbox_x_domain:process transition;
++	allow $1 sandbox_x_domain:process { signal_perms transition };
 +	dontaudit $1 sandbox_x_domain:process { noatsecure siginh rlimitinh };
 +	role $2 types sandbox_x_domain;
 +	role $2 types sandbox_xserver_t;
++	allow $1 sandbox_xserver_t:process signal_perms;
++
 +	allow sandbox_x_domain $1:process sigchld;
 +	# Dontaudit leaked file descriptors
 +	dontaudit sandbox_x_domain $1:fifo_file rw_fifo_file_perms;
@@ -3810,7 +3812,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-18 21:31:34.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-18 21:55:28.000000000 -0400
 @@ -0,0 +1,324 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
@@ -4062,7 +4064,7 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_tcp_connect_ftp_port(sandbox_web_client_t)
 +corenet_tcp_connect_ipp_port(sandbox_web_client_t)
 +corenet_tcp_connect_generic_port(sandbox_web_client_t)
-+corenet_tcp_connect_sound_port(sandbox_web_client_t)
++corenet_tcp_connect_soundd_port(sandbox_web_client_t)
 +corenet_sendrecv_http_client_packets(sandbox_web_client_t)
 +corenet_sendrecv_http_cache_client_packets(sandbox_web_client_t)
 +corenet_sendrecv_ftp_client_packets(sandbox_web_client_t)
@@ -4159,8 +4161,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/seunshare	--	gen_context(system_u:object_r:seunshare_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.if serefpolicy-3.6.32/policy/modules/apps/seunshare.if
 --- nsaserefpolicy/policy/modules/apps/seunshare.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-18 11:41:50.000000000 -0400
-@@ -0,0 +1,79 @@
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-18 21:59:52.000000000 -0400
+@@ -0,0 +1,80 @@
 +
 +## <summary>policy for seunshare</summary>
 +
@@ -4181,6 +4183,7 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	domtrans_pattern($1,seunshare_exec_t,seunshare_t)
++	allow $1 seunshare_t:process signal_perms;
 +')
 +
 +
@@ -6024,8 +6027,34 @@ diff -b -B --ignore-all-space --exclude-
  # Rules for all filesystem types
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.32/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/kernel.if	2009-09-16 10:03:09.000000000 -0400
-@@ -1807,7 +1807,7 @@
++++ serefpolicy-3.6.32/policy/modules/kernel/kernel.if	2009-09-18 21:46:09.000000000 -0400
+@@ -485,6 +485,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Allows caller to request the kernel to load a module
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`kernel_load_module_request',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	allow $1 kernel_t:system module_request;
++')
++
++########################################
++## <summary>
+ ##	Get information on all System V IPC objects.
+ ## </summary>
+ ## <param name="domain">
+@@ -1807,7 +1826,7 @@
  	')
  
  	dontaudit $1 sysctl_type:dir list_dir_perms;
@@ -6034,7 +6063,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2621,6 +2621,24 @@
+@@ -2621,6 +2640,24 @@
  
  ########################################
  ## <summary>
@@ -6059,7 +6088,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Unconfined access to kernel module resources.
  ## </summary>
  ## <param name="domain">
-@@ -2636,3 +2654,22 @@
+@@ -2636,3 +2673,22 @@
  
  	typeattribute $1 kern_unconfined;
  ')
@@ -9810,7 +9839,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.32/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-09-18 21:49:49.000000000 -0400
 @@ -56,7 +56,7 @@
  
  allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw sys_tty_config ipc_lock };
@@ -9828,7 +9857,15 @@ diff -b -B --ignore-all-space --exclude-
  
  read_files_pattern(bluetooth_t, bluetooth_conf_t, bluetooth_conf_t)
  
-@@ -111,6 +112,7 @@
+@@ -91,6 +92,7 @@
+ manage_sock_files_pattern(bluetooth_t, bluetooth_var_run_t, bluetooth_var_run_t)
+ files_pid_filetrans(bluetooth_t, bluetooth_var_run_t, { file sock_file })
+ 
++kernel_load_module_request(bluetooth_t)
+ kernel_read_kernel_sysctls(bluetooth_t)
+ kernel_read_system_state(bluetooth_t)
+ kernel_read_network_state(bluetooth_t)
+@@ -111,6 +113,7 @@
  dev_rw_generic_usb_dev(bluetooth_t)
  dev_read_urand(bluetooth_t)
  dev_rw_input_dev(bluetooth_t)
@@ -9836,7 +9873,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(bluetooth_t)
  fs_search_auto_mountpoints(bluetooth_t)
-@@ -154,6 +156,10 @@
+@@ -154,6 +157,10 @@
  	')
  
  	optional_policy(`
@@ -10939,7 +10976,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.32/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-09-18 21:49:27.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -10977,7 +11014,15 @@ diff -b -B --ignore-all-space --exclude-
  manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
-@@ -250,6 +259,7 @@
+@@ -153,6 +162,7 @@
+ stream_connect_pattern(cupsd_t, ptal_var_run_t, ptal_var_run_t, ptal_t)
+ allow cupsd_t ptal_var_run_t : sock_file setattr;
+ 
++kernel_load_module_request(cupsd_t)
+ kernel_read_system_state(cupsd_t)
+ kernel_read_network_state(cupsd_t)
+ kernel_read_all_sysctls(cupsd_t)
+@@ -250,6 +260,7 @@
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
  miscfiles_read_fonts(cupsd_t)
@@ -10985,7 +11030,7 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
-@@ -327,7 +337,7 @@
+@@ -327,7 +338,7 @@
  
  allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
  dontaudit cupsd_config_t self:capability sys_tty_config;
@@ -10994,7 +11039,7 @@ diff -b -B --ignore-all-space --exclude-
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
-@@ -419,12 +429,15 @@
+@@ -419,12 +430,15 @@
  ')
  
  optional_policy(`
@@ -11012,7 +11057,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -542,6 +555,8 @@
+@@ -542,6 +556,8 @@
  manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
  files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
  
@@ -11021,7 +11066,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -601,6 +616,9 @@
+@@ -601,6 +617,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -12703,7 +12748,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.32/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-09-18 21:50:26.000000000 -0400
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -12731,7 +12776,7 @@ diff -b -B --ignore-all-space --exclude-
  allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
  allow NetworkManager_t self:udp_socket create_socket_perms;
  allow NetworkManager_t self:packet_socket create_socket_perms;
-@@ -51,8 +55,11 @@
+@@ -51,18 +55,24 @@
  manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
  logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
  
@@ -12745,7 +12790,11 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
-@@ -63,6 +70,8 @@
+ manage_sock_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
+ files_pid_filetrans(NetworkManager_t, NetworkManager_var_run_t, { dir file sock_file })
+ 
++kernel_load_module_request(NetworkManager_t)
+ kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
  kernel_load_module(NetworkManager_t)
@@ -12754,7 +12803,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -81,13 +90,18 @@
+@@ -81,13 +91,18 @@
  corenet_sendrecv_isakmp_server_packets(NetworkManager_t)
  corenet_sendrecv_dhcpc_server_packets(NetworkManager_t)
  corenet_sendrecv_all_client_packets(NetworkManager_t)
@@ -12773,7 +12822,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mls_file_read_all_levels(NetworkManager_t)
  
-@@ -98,15 +112,20 @@
+@@ -98,15 +113,20 @@
  
  domain_use_interactive_fds(NetworkManager_t)
  domain_read_confined_domains_state(NetworkManager_t)
@@ -12795,7 +12844,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(NetworkManager_t)
  
  miscfiles_read_localization(NetworkManager_t)
-@@ -116,25 +135,40 @@
+@@ -116,25 +136,40 @@
  
  seutil_read_config(NetworkManager_t)
  
@@ -12843,7 +12892,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -146,8 +180,25 @@
+@@ -146,8 +181,25 @@
  ')
  
  optional_policy(`
@@ -12871,7 +12920,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -155,23 +206,51 @@
+@@ -155,23 +207,51 @@
  ')
  
  optional_policy(`
@@ -12925,7 +12974,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -179,12 +258,15 @@
+@@ -179,12 +259,15 @@
  ')
  
  optional_policy(`
@@ -13268,7 +13317,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.6.32/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ntp.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ntp.te	2009-09-18 21:48:48.000000000 -0400
 @@ -41,10 +41,11 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -13290,7 +13339,15 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ntpd_t ntpd_log_t:dir setattr;
  manage_files_pattern(ntpd_t, ntpd_log_t, ntpd_log_t)
-@@ -97,6 +99,8 @@
+@@ -72,6 +74,7 @@
+ manage_files_pattern(ntpd_t, ntpd_var_run_t, ntpd_var_run_t)
+ files_pid_filetrans(ntpd_t, ntpd_var_run_t, file)
+ 
++kernel_load_module_request(ntpd_t)
+ kernel_read_kernel_sysctls(ntpd_t)
+ kernel_read_system_state(ntpd_t)
+ kernel_read_network_state(ntpd_t)
+@@ -97,6 +100,8 @@
  
  fs_getattr_all_fs(ntpd_t)
  fs_search_auto_mountpoints(ntpd_t)
@@ -13299,7 +13356,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_ptmx(ntpd_t)
  
-@@ -129,6 +133,7 @@
+@@ -129,6 +134,7 @@
  
  optional_policy(`
  	gpsd_rw_shm(ntpd_t)
@@ -15607,6 +15664,17 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an rpcbind environment
  ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.6.32/policy/modules/services/rpcbind.te
+--- nsaserefpolicy/policy/modules/services/rpcbind.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/rpcbind.te	2009-09-18 21:48:14.000000000 -0400
+@@ -42,6 +42,7 @@
+ 
+ kernel_read_system_state(rpcbind_t)
+ kernel_read_network_state(rpcbind_t)
++kernel_load_module_request(rpcbind_t)
+ 
+ corenet_all_recvfrom_unlabeled(rpcbind_t)
+ corenet_all_recvfrom_netlabel(rpcbind_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.32/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/rpc.if	2009-09-16 10:03:09.000000000 -0400
@@ -16454,7 +16522,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.6.32/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sendmail.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/sendmail.te	2009-09-18 21:48:01.000000000 -0400
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -16475,15 +16543,16 @@ diff -b -B --ignore-all-space --exclude-
  allow sendmail_t self:fifo_file rw_fifo_file_perms;
  allow sendmail_t self:unix_stream_socket create_stream_socket_perms;
  allow sendmail_t self:unix_dgram_socket create_socket_perms;
-@@ -47,6 +51,7 @@
+@@ -47,6 +51,8 @@
  kernel_read_kernel_sysctls(sendmail_t)
  # for piping mail to a command
  kernel_read_system_state(sendmail_t)
 +kernel_read_network_state(sendmail_t)
++kernel_load_module_request(sendmail_t)
  
  corenet_all_recvfrom_unlabeled(sendmail_t)
  corenet_all_recvfrom_netlabel(sendmail_t)
-@@ -64,24 +69,29 @@
+@@ -64,24 +70,29 @@
  
  fs_getattr_all_fs(sendmail_t)
  fs_search_auto_mountpoints(sendmail_t)
@@ -16513,7 +16582,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -89,23 +99,46 @@
+@@ -89,23 +100,46 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -16562,7 +16631,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -113,13 +146,20 @@
+@@ -113,13 +147,20 @@
  ')
  
  optional_policy(`
@@ -16584,7 +16653,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -127,24 +167,29 @@
+@@ -127,24 +168,29 @@
  ')
  
  optional_policy(`
@@ -17813,7 +17882,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.32/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-18 17:38:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-18 21:47:14.000000000 -0400
 @@ -41,6 +41,9 @@
  files_tmp_file(sshd_tmp_t)
  files_poly_parent(sshd_tmp_t)
@@ -17925,7 +17994,15 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -310,16 +306,34 @@
+@@ -301,6 +297,7 @@
+ 
+ kernel_search_key(sshd_t)
+ kernel_link_key(sshd_t)
++kernel_load_module_request(sshd_t)
+ 
+ term_use_all_user_ptys(sshd_t)
+ term_setattr_all_user_ptys(sshd_t)
+@@ -310,16 +307,34 @@
  corenet_tcp_bind_xserver_port(sshd_t)
  corenet_sendrecv_xserver_server_packets(sshd_t)
  
@@ -17962,7 +18039,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -331,6 +345,10 @@
+@@ -331,6 +346,10 @@
  ')
  
  optional_policy(`
@@ -17973,7 +18050,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_use_script_fds(sshd_t)
  ')
  
-@@ -341,7 +359,11 @@
+@@ -341,7 +360,11 @@
  ')
  
  optional_policy(`
@@ -17986,7 +18063,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_shell_domtrans(sshd_t)
  ')
  
-@@ -400,15 +422,13 @@
+@@ -400,15 +423,13 @@
  init_use_fds(ssh_keygen_t)
  init_use_script_ptys(ssh_keygen_t)
  
@@ -19515,7 +19592,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.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-18 21:46:25.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -19759,7 +19836,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 +420,14 @@
+@@ -366,15 +420,20 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -19775,7 +19852,13 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +447,13 @@
+ kernel_read_net_sysctls(xdm_t)
+ kernel_read_network_state(xdm_t)
++kernel_load_module_request(xdm_t)
+ 
+ corecmd_exec_shell(xdm_t)
+ corecmd_exec_bin(xdm_t)
+@@ -389,11 +448,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -19789,7 +19872,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 +461,7 @@
+@@ -401,6 +462,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -19797,7 +19880,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 +474,17 @@
+@@ -413,14 +475,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -19817,7 +19900,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +495,13 @@
+@@ -431,9 +496,13 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -19831,7 +19914,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +510,7 @@
+@@ -442,6 +511,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -19839,7 +19922,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +519,7 @@
+@@ -450,6 +520,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -19847,7 +19930,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +530,11 @@
+@@ -460,10 +531,11 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -19861,7 +19944,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 +543,9 @@
+@@ -472,6 +544,9 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -19871,7 +19954,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +578,12 @@
+@@ -504,10 +579,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -19884,7 +19967,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +591,46 @@
+@@ -515,12 +592,46 @@
  ')
  
  optional_policy(`
@@ -19931,7 +20014,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +652,30 @@
+@@ -542,6 +653,30 @@
  ')
  
  optional_policy(`
@@ -19962,7 +20045,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +684,9 @@
+@@ -550,8 +685,9 @@
  ')
  
  optional_policy(`
@@ -19974,7 +20057,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +695,6 @@
+@@ -560,7 +696,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -19982,7 +20065,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +705,10 @@
+@@ -571,6 +706,10 @@
  ')
  
  optional_policy(`
@@ -19993,7 +20076,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +725,9 @@
+@@ -587,10 +726,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -20005,7 +20088,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +739,12 @@
+@@ -602,9 +740,12 @@
  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;
@@ -20018,7 +20101,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +756,14 @@
+@@ -616,13 +757,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -20034,7 +20117,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 +776,19 @@
+@@ -635,9 +777,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -20054,7 +20137,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +822,6 @@
+@@ -671,7 +823,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -20062,7 +20145,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +831,12 @@
+@@ -681,9 +832,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -20076,7 +20159,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +851,12 @@
+@@ -698,8 +852,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -20089,7 +20172,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +878,7 @@
+@@ -721,6 +879,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -20097,7 +20180,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +901,7 @@
+@@ -743,7 +902,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -20106,7 +20189,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +933,20 @@
+@@ -775,12 +934,20 @@
  ')
  
  optional_policy(`
@@ -20128,7 +20211,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,7 +973,7 @@
+@@ -807,7 +974,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -20137,7 +20220,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)
-@@ -828,9 +994,14 @@
+@@ -828,9 +995,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -20152,7 +20235,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)
-@@ -845,11 +1016,14 @@
+@@ -845,11 +1017,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -20168,7 +20251,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1056,8 @@
+@@ -882,6 +1057,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -20177,7 +20260,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1082,8 @@
+@@ -906,6 +1083,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 };
  
@@ -20186,7 +20269,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 };
-@@ -973,17 +1151,49 @@
+@@ -973,17 +1152,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -21898,7 +21981,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.32/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-09-18 21:49:05.000000000 -0400
 @@ -11,6 +11,12 @@
  init_system_domain(iptables_t, iptables_exec_t)
  role system_r types iptables_t;
@@ -21922,7 +22005,15 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(iptables_t, iptables_var_run_t, iptables_var_run_t)
  files_pid_filetrans(iptables_t, iptables_var_run_t, file)
  
-@@ -53,6 +62,7 @@
+@@ -36,6 +45,7 @@
+ allow iptables_t iptables_tmp_t:file manage_file_perms;
+ files_tmp_filetrans(iptables_t, iptables_tmp_t, { file dir })
+ 
++kernel_load_module_request(iptables_t)
+ kernel_read_system_state(iptables_t)
+ kernel_read_network_state(iptables_t)
+ kernel_read_kernel_sysctls(iptables_t)
+@@ -53,6 +63,7 @@
  mls_file_read_all_levels(iptables_t)
  
  term_dontaudit_use_console(iptables_t)
@@ -21930,7 +22021,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(iptables_t)
  
-@@ -100,6 +110,10 @@
+@@ -100,6 +111,10 @@
  ')
  
  optional_policy(`
@@ -25338,7 +25429,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-17 13:00:18.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-18 21:52:11.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -25789,7 +25880,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +525,207 @@
+@@ -508,182 +525,208 @@
  	# evolution and gnome-session try to create a netlink socket
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
@@ -25811,6 +25902,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Find CDROM devices:
 -	kernel_read_device_sysctls($1_t)
 +	kernel_read_device_sysctls($1_usertype)
++	kernel_load_module_request($1_usertype)
  
 -	corecmd_exec_bin($1_t)
 +	corenet_udp_bind_generic_node($1_usertype)
@@ -26070,7 +26162,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +753,26 @@
+@@ -711,13 +754,26 @@
  
  	userdom_base_user_template($1)
  
@@ -26102,7 +26194,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +790,71 @@
+@@ -735,70 +791,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26207,7 +26299,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +891,32 @@
+@@ -835,6 +892,32 @@
  	# Local policy
  	#
  
@@ -26240,7 +26332,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +947,81 @@
+@@ -865,51 +948,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26335,7 +26427,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1055,8 @@
+@@ -943,8 +1056,8 @@
  	# Declarations
  	#
  
@@ -26345,7 +26437,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1065,12 @@
+@@ -953,11 +1066,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26360,7 +26452,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1088,53 @@
+@@ -975,36 +1089,53 @@
  		')
  	')
  
@@ -26428,7 +26520,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1170,7 @@
+@@ -1040,7 +1171,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -26437,7 +26529,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1179,7 @@
+@@ -1049,8 +1180,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26447,7 +26539,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1204,9 @@
+@@ -1075,6 +1205,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26457,7 +26549,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1221,7 @@
+@@ -1089,6 +1222,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -26465,7 +26557,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1229,6 @@
+@@ -1096,8 +1230,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26474,7 +26566,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1255,8 @@
+@@ -1124,6 +1256,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -26483,7 +26575,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1285,6 @@
+@@ -1152,20 +1286,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26504,7 +26596,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1330,7 @@
+@@ -1211,6 +1331,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26512,7 +26604,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1396,15 @@
+@@ -1276,11 +1397,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26528,7 +26620,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1515,13 @@
+@@ -1391,12 +1516,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26543,7 +26635,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1554,14 @@
+@@ -1429,6 +1555,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26558,7 +26650,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1577,11 @@
+@@ -1444,9 +1578,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26570,7 +26662,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1638,25 @@
+@@ -1503,6 +1639,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26596,7 +26688,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1731,8 @@
+@@ -1577,6 +1732,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26605,7 +26697,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1826,7 @@
+@@ -1670,6 +1827,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26613,7 +26705,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1954,32 @@
+@@ -1797,19 +1955,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26653,7 +26745,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2014,7 @@
+@@ -1844,6 +2015,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26661,7 +26753,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2562,7 @@
+@@ -2391,27 +2563,7 @@
  
  ########################################
  ## <summary>
@@ -26690,7 +26782,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2916,32 @@
+@@ -2765,11 +2917,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -26725,7 +26817,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3069,25 @@
+@@ -2897,7 +3070,25 @@
  		type user_tmp_t;
  	')
  
@@ -26752,7 +26844,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3124,7 @@
+@@ -2934,6 +3125,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -26760,7 +26852,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3255,559 @@
+@@ -3064,3 +3256,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From hno at fedoraproject.org  Sat Sep 19 02:15:19 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 19 Sep 2009 02:15:19 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.46, 1.47 sources, 1.49,
	1.50 squid.spec, 1.127, 1.128
Message-ID: <20090919021519.3354211C00EC@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1214

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid Bug #2624: Invalid response for IMS request


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	10 Sep 2009 22:15:30 -0000	1.46
+++ .cvsignore	19 Sep 2009 02:15:18 -0000	1.47
@@ -1,2 +1,3 @@
 squid-3.0.STABLE19.tar.bz2
 squid-3.0.STABLE19.tar.bz2.asc
+squid-3-9986.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Sep 2009 22:15:31 -0000	1.49
+++ sources	19 Sep 2009 02:15:18 -0000	1.50
@@ -1,2 +1,3 @@
 edf0f2baf06d342652f06d131f8a6082  squid-3.0.STABLE19.tar.bz2
 5b514327921dec32896353eeb222b509  squid-3.0.STABLE19.tar.bz2.asc
+9f17f856c17eb19b77e91bbf6834b59e  squid-3-9986.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- squid.spec	10 Sep 2009 22:15:31 -0000	1.127
+++ squid.spec	19 Sep 2009 02:15:18 -0000	1.128
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE19
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -23,6 +23,7 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
 
 
 # External patches
@@ -61,6 +62,7 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .3-9987
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -342,6 +344,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Sep 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-2
+- Patch for Squid Bug #2626: Invalid response for IMS request
+
 * Fri Sep 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE19-1
 - Update to 3.0.STABLE19
 



From hno at fedoraproject.org  Sat Sep 19 02:25:11 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 19 Sep 2009 02:25:11 +0000 (UTC)
Subject: rpms/squid/F-11 squid-3.0.STABLE19-3-9986.patch, NONE,
	1.1 .cvsignore, 
	1.47, 1.48 sources, 1.50, 1.51 squid.spec, 1.128, 1.129
Message-ID: <20090919022512.0431211C00EC@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4865

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-3.0.STABLE19-3-9986.patch 
Log Message:
Rediffed the patch for Squid Bug #2624 invalid IMS responses

squid-3.0.STABLE19-3-9986.patch:
 client_side_reply.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squid-3.0.STABLE19-3-9986.patch ---
diff -up squid-3.0.STABLE19/src/client_side_reply.cc.3-9987 squid-3.0.STABLE19/src/client_side_reply.cc
--- squid-3.0.STABLE19/src/client_side_reply.cc.3-9987	2009-09-06 13:29:37.000000000 +0200
+++ squid-3.0.STABLE19/src/client_side_reply.cc	2009-09-19 04:17:12.000000000 +0200
@@ -366,7 +366,7 @@ clientReplyContext::handleIMSReply(Store
 
 	// if client sent IMS
 
-	if (http->request->flags.ims) {
+        if (http->request->flags.ims && !old_entry->modifiedSince(http->request)) {
 	    // forward the 304 from origin
 	    debugs(88, 3, "handleIMSReply: origin replied 304, revalidating existing entry and forwarding 304 to client");
 	    sendClientUpstreamResponse();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	19 Sep 2009 02:15:18 -0000	1.47
+++ .cvsignore	19 Sep 2009 02:25:11 -0000	1.48
@@ -1,3 +1,2 @@
 squid-3.0.STABLE19.tar.bz2
 squid-3.0.STABLE19.tar.bz2.asc
-squid-3-9986.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	19 Sep 2009 02:15:18 -0000	1.50
+++ sources	19 Sep 2009 02:25:11 -0000	1.51
@@ -1,3 +1,2 @@
 edf0f2baf06d342652f06d131f8a6082  squid-3.0.STABLE19.tar.bz2
 5b514327921dec32896353eeb222b509  squid-3.0.STABLE19.tar.bz2.asc
-9f17f856c17eb19b77e91bbf6834b59e  squid-3-9986.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- squid.spec	19 Sep 2009 02:15:18 -0000	1.128
+++ squid.spec	19 Sep 2009 02:25:11 -0000	1.129
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE19
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -23,10 +23,11 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
 
 
-# External patches
+# Backported patches
+# http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
+Patch101: squid-3.0.STABLE19-3-9986.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -62,7 +63,7 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .3-9987
+%patch101 -p1 -b .3-9986
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -344,7 +345,7 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Sat Sep 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-2
+* Sat Sep 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-3
 - Patch for Squid Bug #2626: Invalid response for IMS request
 
 * Fri Sep 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE19-1



From rdieter at fedoraproject.org  Sat Sep 19 02:50:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 02:50:46 +0000 (UTC)
Subject: rpms/ntl/devel .cvsignore, 1.5, 1.6 ntl.spec, 1.19, 1.20 sources,
	1.5, 1.6
Message-ID: <20090919025046.1B9E911C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ntl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12314

Modified Files:
	.cvsignore ntl.spec sources 
Log Message:
* Fri Sep 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.5.2-1
- ntl-5.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Apr 2009 17:42:26 -0000	1.5
+++ .cvsignore	19 Sep 2009 02:50:45 -0000	1.6
@@ -1 +1 @@
-ntl-5.5.tar.gz
+ntl-5.5.2.tar.gz


Index: ntl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/ntl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntl.spec	25 Jul 2009 19:38:58 -0000	1.19
+++ ntl.spec	19 Sep 2009 02:50:45 -0000	1.20
@@ -6,8 +6,8 @@
 
 Summary: High-performance algorithms for vectors, matrices, and polynomials 
 Name:    ntl 
-Version: 5.5
-Release: 2%{?dist}
+Version: 5.5.2
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     http://shoup.net/ntl/ 
@@ -59,7 +59,7 @@ Requires: %{name}-devel = %{version}-%{r
 
 
 %build
-cd src
+pushd src
 ./configure \
   CC="%{__cc}" \
   CXX="%{__cxx}" \
@@ -71,10 +71,10 @@ cd src
   LIBDIR=%{_libdir} \
   NTL_GMP_LIP=on \
   SHARED=on
-cd -
+popd
 
 # not smp-safe
-make -C src 
+make -C src
 
 
 %check
@@ -135,6 +135,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.5.2-1
+- ntl-5.5.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Apr 2009 17:42:27 -0000	1.5
+++ sources	19 Sep 2009 02:50:45 -0000	1.6
@@ -1 +1 @@
-41323fefa47de772d92807633c32b721  ntl-5.5.tar.gz
+2e0afa1fa3b325e562ce89da57cba983  ntl-5.5.2.tar.gz



From mbarnes at fedoraproject.org  Sat Sep 19 02:52:53 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat, 19 Sep 2009 02:52:53 +0000 (UTC)
Subject: rpms/pycairo/devel .cvsignore, 1.11, 1.12 pycairo.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20090919025253.471A511C00EC@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pycairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12993

Modified Files:
	.cvsignore pycairo.spec sources 
Log Message:

* Fri Sep 18 2009 Matthew Barnes <mbarnes at redhat.com> - 1.8.8-1
- Update to 1.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Jun 2009 05:15:38 -0000	1.11
+++ .cvsignore	19 Sep 2009 02:52:52 -0000	1.12
@@ -1 +1 @@
-pycairo-1.8.6.tar.gz
+pycairo-1.8.8.tar.gz


Index: pycairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- pycairo.spec	26 Jul 2009 19:45:27 -0000	1.27
+++ pycairo.spec	19 Sep 2009 02:52:53 -0000	1.28
@@ -1,12 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# Last updated for 1.8.8
 %define cairo_version 1.8.6
 
 ### Abstract ###
 
 Name: pycairo
-Version: 1.8.6
-Release: 2%{?dist}
+Version: 1.8.8
+Release: 1%{?dist}
 License: MPLv1.1 or LGPLv2
 Group: Development/Languages
 Summary: Python bindings for the cairo library
@@ -62,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pycairo.pc
 
 %changelog
+* Fri Sep 18 2009 Matthew Barnes <mbarnes at redhat.com> - 1.8.8-1
+- Update to 1.8.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Jun 2009 05:15:38 -0000	1.11
+++ sources	19 Sep 2009 02:52:53 -0000	1.12
@@ -1 +1 @@
-d10a68f88da0a6a02864bf8f0c25ee4d  pycairo-1.8.6.tar.gz
+054da6c125cb427a003f5fd6c54f853e  pycairo-1.8.8.tar.gz



From mbarnes at fedoraproject.org  Sat Sep 19 03:11:46 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat, 19 Sep 2009 03:11:46 +0000 (UTC)
Subject: rpms/pycairo/devel pycairo.spec,1.28,1.29
Message-ID: <20090919031146.791F611C00EC@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pycairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18273

Modified Files:
	pycairo.spec 
Log Message:
Fix files list.



Index: pycairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pycairo.spec	19 Sep 2009 02:52:53 -0000	1.28
+++ pycairo.spec	19 Sep 2009 03:11:46 -0000	1.29
@@ -53,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README
+%doc AUTHORS COPYING* INSTALL NEWS README
 %doc examples doc/faq.rst doc/overview.rst doc/README
 %{python_sitearch}/cairo/
 



From nsantos at fedoraproject.org  Sat Sep 19 04:28:25 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Sat, 19 Sep 2009 04:28:25 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.95,1.96
Message-ID: <20090919042825.3207B11C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31247

Modified Files:
	qpidc.spec 
Log Message:
add missing files to specfile


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- qpidc.spec	19 Sep 2009 01:04:46 -0000	1.95
+++ qpidc.spec	19 Sep 2009 04:28:24 -0000	1.96
@@ -305,6 +305,7 @@ LANG=C ECHO=echo make check
 %_includedir/qpid/sys
 %_includedir/qpid/log
 %_includedir/qpid/management
+%_includedir/qpid/messaging
 %_includedir/qpid/agent
 %_includedir/qmf
 %_libdir/libqpidcommon.so
@@ -318,7 +319,9 @@ LANG=C ECHO=echo make check
 %_libdir/libqpidbroker.so.2.0.0
 %_libdir/qpid/daemon/replicating_listener.so
 %_libdir/qpid/daemon/replication_exchange.so
+%_libdir/qpid/daemon/watchdog.so
 %_sbindir/qpidd
+%_libexecdir/qpid/qpidd_watchdog
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd



From pkgdb at fedoraproject.org  Sat Sep 19 05:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 05:23:23 +0000
Subject: [pkgdb] 8Kingdoms: dummymail4me has requested watchcommits
Message-ID: <20090919052322.E155B10F880@bastion2.fedora.phx.redhat.com>

dummymail4me has requested the watchcommits acl on 8Kingdoms (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/8Kingdoms



From akurtakov at fedoraproject.org  Sat Sep 19 06:13:52 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Sat, 19 Sep 2009 06:13:52 +0000 (UTC)
Subject: rpms/qdox/devel qdox.spec, 1.8, 1.9 qdox-1.6.1-jflex.patch, 1.1,
	NONE qdox-1.6.1-test.patch, 1.1, NONE qdox-LocatedDef.java, 1.1,
	NONE qdox-1.8-jpp-depmap.xml, 1.1, NONE qdox-1.6.1-byaccj.patch,
	1.1, NONE pom-maven2jpp-newdepmap.xsl, 1.1,
	NONE qdox-1.6-jpp-depmap.xml, 1.1, NONE pom-maven2jpp-depcat.xsl,
	1.1, NONE qdox-build.xml, 1.2, NONE pom-maven2jpp-mapdeps.xsl,
	1.1, NONE
Message-ID: <20090919061353.031BB11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/qdox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31088/devel

Modified Files:
	qdox.spec 
Removed Files:
	qdox-1.6.1-jflex.patch qdox-1.6.1-test.patch 
	qdox-LocatedDef.java qdox-1.8-jpp-depmap.xml 
	qdox-1.6.1-byaccj.patch pom-maven2jpp-newdepmap.xsl 
	qdox-1.6-jpp-depmap.xml pom-maven2jpp-depcat.xsl 
	qdox-build.xml pom-maven2jpp-mapdeps.xsl 
Log Message:
Remove not needed sources.


Index: qdox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- qdox.spec	18 Aug 2009 15:19:04 -0000	1.8
+++ qdox.spec	19 Sep 2009 06:13:50 -0000	1.9
@@ -39,7 +39,7 @@
 Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
 Version:        1.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://qdox.codehaus.org/
@@ -49,7 +49,6 @@ Source0:        %{name}-%{version}-src.t
 
 Source1:        build.xml.tar.gz
 Source2:        qdox-settings.xml
-Source3:        qdox-1.8-jpp-depmap.xml
 
 BuildRequires:  jpackage-utils >= 0:1.7.4
 BuildRequires:  java-devel = 0:1.5.0
@@ -132,7 +131,6 @@ mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
         -e \
         -s settings.xml \
-        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         ant:ant install javadoc:javadoc
 
@@ -216,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Sep 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.9.2-2
+- Remove not needed sources.
+
 * Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.9.2-1
 - Update to 1.9.2.
 


--- qdox-1.6.1-jflex.patch DELETED ---


--- qdox-1.6.1-test.patch DELETED ---


--- qdox-LocatedDef.java DELETED ---


--- qdox-1.8-jpp-depmap.xml DELETED ---


--- qdox-1.6.1-byaccj.patch DELETED ---


--- pom-maven2jpp-newdepmap.xsl DELETED ---


--- qdox-1.6-jpp-depmap.xml DELETED ---


--- pom-maven2jpp-depcat.xsl DELETED ---


--- qdox-build.xml DELETED ---


--- pom-maven2jpp-mapdeps.xsl DELETED ---



From rdieter at fedoraproject.org  Sat Sep 19 06:20:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 06:20:05 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-kde186763.patch, NONE,
	1.1 kdelibs.spec, 1.515, 1.516
Message-ID: <20090919062005.2616511C0336@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv471

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kde186763.patch 
Log Message:
* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
- groupdav connect to egroupware failed (kde#186763)


kdelibs-4.3.1-kde186763.patch:
 http.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-kde186763.patch ---
diff -up kdelibs-4.3.1/kioslave/http/http.cpp.kdebug#186763 kdelibs-4.3.1/kioslave/http/http.cpp
--- kdelibs-4.3.1/kioslave/http/http.cpp.kdebug#186763	2009-07-29 06:09:41.000000000 -0500
+++ kdelibs-4.3.1/kioslave/http/http.cpp	2009-09-09 10:21:22.000000000 -0500
@@ -4355,7 +4355,7 @@ bool HTTPProtocol::readBody( bool dataIn
     if (m_request.responseCode >= 500 && m_request.responseCode <= 599) {
       error(ERR_INTERNAL_SERVER, m_request.url.host());
       return false;
-    } else if (m_request.responseCode >= 400 && m_request.responseCode <= 499) {
+    } else if (m_request.responseCode >= 400 && m_request.responseCode <= 499 && m_request.responseCode != 401) {
       error(ERR_DOES_NOT_EXIST, m_request.url.host());
       return false;
     }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -p -r1.515 -r1.516
--- kdelibs.spec	18 Sep 2009 23:38:55 -0000	1.515
+++ kdelibs.spec	19 Sep 2009 06:20:04 -0000	1.516
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -75,6 +75,8 @@ Patch20: kdelibs-4.1.70-cmake.patch
 Patch21: kdelibs-4.3.1-ossl-1.x.patch
 # patch to fix keditbookmarks crash (kde#160679)
 Patch22: kdelibs-4.3.0-bookmarks.patch
+# http://bugs.kde.org/186763
+Patch23: kdelibs-4.3.1-kde186763.patch
 
 # upstream
 # 4.3 branch
@@ -194,6 +196,7 @@ format for easy browsing.
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
+%patch23 -p1 -b .kde186763
 
 # upstream patches
 # 4.3
@@ -385,6 +388,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- groupdav connect to egroupware failed (kde#186763)
+
 * Fri Sep 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - ship kde4-doxygen.sh only in -devel (fix duplicate file)
 



From dcantrel at fedoraproject.org  Sat Sep 19 06:22:33 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 19 Sep 2009 06:22:33 +0000 (UTC)
Subject: rpms/dhcp/devel dhclient-script,1.13,1.14 dhcp.spec,1.273,1.274
Message-ID: <20090919062233.CC3FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1389

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Fri Sep 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-9
- Update dhclient-script with handlers for DHCPv6 states



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dhclient-script	27 Jun 2009 03:17:04 -0000	1.13
+++ dhclient-script	19 Sep 2009 06:22:33 -0000	1.14
@@ -105,6 +105,32 @@ make_resolv_conf() {
         rm -f ${rscf}
 
         fix_context /etc/resolv.conf
+    elif [ -n "${new_dhcp6_name_servers}" ] ||
+         [ -n "${new_dhcp6_domain_search}" ]; then
+        save_previous /etc/resolv.conf
+        rscf="$(mktemp /tmp/XXXXXX)"
+        echo "; generated by /sbin/dhclient-script" > ${rscf}
+
+        if [ -n "${SEARCH}" ]; then
+            echo "search ${SEARCH}" >> $rscf
+        else
+            if [ -n "${new_dhcp6_domain_search}" ]; then
+                echo "search ${new_dhcp6_domain_search//\\032/ }" >> ${rscf}
+            fi
+        fi
+
+        if [ -n "${RES_OPTIONS}" ]; then
+            echo "options ${RES_OPTIONS}" >> ${rscf}
+        fi
+
+        for nameserver in ${new_dhcp6_name_servers} ; do
+            echo "nameserver ${nameserver}" >> ${rscf}
+        done
+
+        change_resolv_conf ${rscf}
+        rm -f ${rscf}
+
+        fix_context /etc/resolv.conf
     fi
 }
 
@@ -376,6 +402,55 @@ dhconfig() {
     fi
 }
 
+dh6config() {
+    case "${reason}" in
+        BOUND6)
+            if [ -n "${new_ip6_address}" ] ||
+               [ -n "${new_ip6_prefixlen}" ]; then
+                exit_with_hooks 2
+            fi
+
+            ip -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+                dev ${interface} scope global
+            make_resolv_conf
+
+            break
+            ;;
+
+        RENEW6|REBIND6)
+            if [ ! "${new_dhcp6_name_servers}" = "${old_dhcp6_name_servers}" ] ||
+               [ ! "${new_dhcp6_domain_search}" = "${old_dhcp6_domain_search}" ]; then
+                make_resolv_conf
+            fi
+
+            break
+            ;;
+
+        DEPREF6)
+            if [ -n "${new_ip6_prefixlen}" ]; then
+                exit_with_hooks 2
+            fi
+
+            ip -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+                dev ${interface} scope global preferred_lft 0
+
+            break
+            ;;
+    esac
+
+    # execute any additional client side configuration scripts we have
+    if [ -d ${ETCDIR}/dhclient.d ]; then
+        for f in ${ETCDIR}/dhclient.d/*.sh ; do
+            if [ -x ${f} ]; then
+                subsystem="${f%.sh}"
+                subsystem="${subsystem##*/}"
+                . ${f}
+                "${subsystem}_config"
+            fi
+        done
+    fi
+}
+
 get_prefix() {
     ip="${1}"
     nm="${2}"
@@ -457,6 +532,16 @@ case "${reason}" in
         exit_with_hooks 0
         ;;
 
+    PREINIT6)
+        # ensure interface is up
+        ip link set ${interface} up
+
+        # remove any stale addresses from aborted clients
+        ip -f inet6 addr flush dev ${interface} scope global permanent
+
+        exit_with_hooks 0
+        ;;
+
     ARPCHECK|ARPSEND)
         if [ -z "${new_ip_address}" ] || [ -z "${interface}" ] ||
            arping -q -f -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
@@ -471,6 +556,40 @@ case "${reason}" in
         exit_with_hooks 0
         ;;
 
+    BOUND6|RENEW6|REBIND6|DEPREF6)
+        dh6config
+        exit_with_hooks 0
+        ;;
+
+    EXPIRE6|RELEASE6|STOP6)
+        if [ -n "${old_ip6_address}" ] || [ -n "${old_ip6_prefixlen}" ]; then
+            exit_with_hooks 2
+        fi
+
+        ip -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+            dev ${interface}
+
+        # execute any additional client side configuration scripts we have
+        if [ -d ${ETCDIR}/dhclient.d ]; then
+            for f in ${ETCDIR}/dhclient.d/*.sh ; do
+                if [ -x ${f} ]; then
+                    subsystem="${f%.sh}"
+                    subsystem="${subsystem##*/}"
+                    . ${f}
+                    "${subsystem}_restore"
+                fi
+            done
+        fi
+
+        if [ -x ${ETCDIR}/dhclient-${interface}-down-hooks ]; then
+            . ${ETCDIR}/dhclient-${interface}-down-hooks
+        elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then
+            . ${ETCDIR}/dhclient-down-hooks
+        fi
+
+        exit_with_hooks 0
+        ;;
+
     EXPIRE|FAIL|RELEASE|STOP)
         # only restore config files if there are no other dhclient processes
         # running (#306381)


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- dhcp.spec	26 Aug 2009 21:34:50 -0000	1.273
+++ dhcp.spec	19 Sep 2009 06:22:33 -0000	1.274
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  8%{?dist}
+Release:  9%{?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.
@@ -479,6 +479,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Sep 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-9
+- Update dhclient-script with handlers for DHCPv6 states
+
 * Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-8
 - Conditionalize restorecon calls in post scriptlets (#519479)
 



From gerd at fedoraproject.org  Sat Sep 19 06:35:55 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat, 19 Sep 2009 06:35:55 +0000 (UTC)
Subject: rpms/rakudo/F-11 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 rakudo.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090919063556.15B6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5009/F-11

Modified Files:
	.cvsignore import.log rakudo.spec sources 
Log Message:
update to current rakudo release (1.6.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Aug 2009 11:45:05 -0000	1.2
+++ .cvsignore	19 Sep 2009 06:35:53 -0000	1.3
@@ -1 +1 @@
-rakudo-2009-07.tar.gz
+rakudo-2009-09.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Aug 2009 20:39:46 -0000	1.2
+++ import.log	19 Sep 2009 06:35:53 -0000	1.3
@@ -1,2 +1,3 @@
 rakudo-0_0_2009_07_1_4_0-3_fc11:F-11:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818177
 rakudo-0_0_2009_07_1_4_0-4_fc11:F-11:rakudo-0.0.2009.07_1.4.0-4.fc11.src.rpm:1250109455
+rakudo-0_0_2009_09_1_6_0-2_fc11:F-11:rakudo-0.0.2009.09_1.6.0-2.fc11.src.rpm:1253342021


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/rakudo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rakudo.spec	12 Aug 2009 20:39:46 -0000	1.2
+++ rakudo.spec	19 Sep 2009 06:35:53 -0000	1.3
@@ -1,15 +1,13 @@
 %global year 2009
-%global month 07
-%global parrot_version 1.4.0
+%global month 09
+%global parrot_version 1.6.0
 
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
 
-ExcludeArch:ppc
-
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -38,7 +36,6 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
-%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
@@ -73,8 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/perl6
 %{parrot_dynext}/perl6_group.so
 %{parrot_dynext}/perl6_ops.so
-%{parrot_dynext}/perl6_ops_cg.so
-%{parrot_dynext}/perl6_ops_cgp.so
 %{parrot_dynext}/perl6_ops_switch.so
 %{par_lang_perl6}/lib/Safe.pm
 %{par_lang_perl6}/lib/Test.pm
@@ -83,8 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 18 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.09_1.6.0-2
+- update to rakudo 2009-09 on parrot 1.6.0
+
 * Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
-- modified source to add a path to the @*INC array
 - force executable permission on shared objects so they get stripped
 
 * Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Aug 2009 20:39:46 -0000	1.3
+++ sources	19 Sep 2009 06:35:53 -0000	1.4
@@ -1 +1 @@
-8605d1d1987143db58749a983a7801bf  rakudo-2009-07.tar.gz
+15938c9632c76636bc49d3d0f6ec8aa2  rakudo-2009-09.tar.gz



From sharkcz at fedoraproject.org  Sat Sep 19 08:50:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 19 Sep 2009 08:50:53 +0000 (UTC)
Subject: rpms/qlandkartegt/devel .cvsignore, 1.10, 1.11 qlandkartegt.spec,
	1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20090919085053.D447011C0336@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17300

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
- update to 0.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Aug 2009 08:35:37 -0000	1.10
+++ .cvsignore	19 Sep 2009 08:50:47 -0000	1.11
@@ -1 +1 @@
-qlandkartegt-0.15.0.tar.gz
+qlandkartegt-0.15.1.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/qlandkartegt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- qlandkartegt.spec	21 Aug 2009 08:35:37 -0000	1.11
+++ qlandkartegt.spec	19 Sep 2009 08:50:48 -0000	1.12
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.0
+Version: 0.15.1
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
+- update to 0.15.1
+
 * Tue Aug 18 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
 - update to 0.15.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 08:35:37 -0000	1.10
+++ sources	19 Sep 2009 08:50:48 -0000	1.11
@@ -1 +1 @@
-d255bb6acc6af0334a6aa8654d530a2a  qlandkartegt-0.15.0.tar.gz
+da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz



From caolanm at fedoraproject.org  Sat Sep 19 08:51:36 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 19 Sep 2009 08:51:36 +0000 (UTC)
Subject: rpms/openoffice-lv/devel .cvsignore, 1.4, 1.5 openoffice-lv.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090919085136.6C92A11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice-lv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17832

Modified Files:
	.cvsignore openoffice-lv.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice-lv/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 May 2009 08:50:01 -0000	1.4
+++ .cvsignore	19 Sep 2009 08:51:34 -0000	1.5
@@ -1 +1 @@
-lv_LV-0.8b1.zip
+dict_lv_LV-0.8.2.oxt


Index: openoffice-lv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice-lv/devel/openoffice-lv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openoffice-lv.spec	25 Jul 2009 20:50:19 -0000	1.6
+++ openoffice-lv.spec	19 Sep 2009 08:51:35 -0000	1.7
@@ -1,12 +1,10 @@
 Name: openoffice-lv
 Summary: Latvian linguistic dictionaries
-Version: 0.8
-Release: 0.3.b1%{?dist}
-Source: http://downloads.sourceforge.net/%{name}/lv_LV-0.8b1.zip
-# Source: http://dict.dv.lv/dl/lv_LV-0.8b1.zip ?
+Version: 0.8.2
+Release: 1%{?dist}
+Source: http://dict.dv.lv/dl/dict_lv_LV-%{version}.oxt
 Group: Applications/Text
-URL: http://sourceforge.net/projects/openoffice-lv/
-# URL: http://dict.dv.lv/ ?
+URL: http://dict.dv.lv/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2+
 BuildArch: noarch
@@ -14,6 +12,14 @@ BuildArch: noarch
 %description
 Latvian linguistic dictionaries.
 
+%package -n hunspell-lv
+Summary: Latvian hunspell dictionaries
+Group: Applications/Text
+Requires: hunspell
+
+%description -n hunspell-lv
+Latvian hunspell dictionaries.
+
 %package -n hyphen-lv
 Summary: Latvian hyphenation rules
 Group: Applications/Text
@@ -22,19 +28,18 @@ Requires: hyphen
 %description -n hyphen-lv
 Latvian hyphenation rules.
 
-%package -n hunspell-lv
-Summary: Latvian hunspell dictionaries
+%package -n mythes-lv
+Summary: Latvian thesaurus
 Group: Applications/Text
-Requires: hunspell
 
-%description -n hunspell-lv
-Latvian hunspell dictionaries.
+%description -n mythes-lv
+Latvian thesaurus.
 
 %prep
 %setup -q -c
 
 %build
-for i in README_lv_LV.txt README_hyph_lv_LV.txt changelog.txt; do
+for i in README_lv_LV.txt README_hyph_lv_LV.txt; do
   if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
     iconv -f ISO-8859-4 -t UTF-8 $i > $i.new
     touch -r $i $i.new
@@ -50,23 +55,33 @@ done
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
 cp -p lv_LV.dic lv_LV.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 cp -p hyph_lv_LV.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
+cp -p th_lv_LV_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%files -n hunspell-lv
+%defattr(-,root,root,-)
+%doc README_lv_LV.txt
+%{_datadir}/myspell/*
+
 %files -n hyphen-lv
 %defattr(-,root,root,-)
 %doc README_hyph_lv_LV.txt
 %{_datadir}/hyphen/*
 
-%files -n hunspell-lv
+%files -n mythes-lv
 %defattr(-,root,root,-)
-%doc README_lv_LV.txt changelog.txt
-%{_datadir}/myspell/*
+%doc package-description.txt
+%{_datadir}/mythes/*
 
 %changelog
+* Sat Sep 19 2009 Caolan McNamara <caolanm at redhat.com> - 0.8.2-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-0.3.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice-lv/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 May 2009 08:50:01 -0000	1.4
+++ sources	19 Sep 2009 08:51:35 -0000	1.5
@@ -1 +1 @@
-24909097ab47916b6e3447f311a7a94a  lv_LV-0.8b1.zip
+c0858cb7e10568f681a91f7ca0031c66  dict_lv_LV-0.8.2.oxt



From izhar at fedoraproject.org  Sat Sep 19 10:01:10 2009
From: izhar at fedoraproject.org (Mohd Izhar Firdaus Ismail)
Date: Sat, 19 Sep 2009 10:01:10 +0000 (UTC)
Subject: rpms/libitl/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libitl-makefile-ld.patch, 1.1, 1.2 libitl.spec, 1.5,
	1.6 sources, 1.2, 1.3 libitl-makefile-destdir.patch, 1.2, NONE
Message-ID: <20090919100110.AF9C311C00E6@cvs1.fedora.phx.redhat.com>

Author: izhar

Update of /cvs/pkgs/rpms/libitl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9722/devel

Modified Files:
	.cvsignore import.log libitl-makefile-ld.patch libitl.spec 
	sources 
Removed Files:
	libitl-makefile-destdir.patch 
Log Message:
 * update to 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Feb 2008 02:05:48 -0000	1.2
+++ .cvsignore	19 Sep 2009 10:01:09 -0000	1.3
@@ -1 +1 @@
-libitl-0.6.4.tar.bz2
+libitl-0.7.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Jun 2008 09:57:27 -0000	1.1
+++ import.log	19 Sep 2009 10:01:09 -0000	1.2
@@ -1 +1,2 @@
 libitl-0_6_4-5_fc9:HEAD:libitl-0.6.4-5.fc9.src.rpm:1212998833
+libitl-0_7_0-1_fc11:HEAD:libitl-0.7.0-1.fc11.src.rpm:1253353350

libitl-makefile-ld.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libitl-makefile-ld.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/libitl-makefile-ld.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libitl-makefile-ld.patch	9 Jun 2008 09:57:28 -0000	1.1
+++ libitl-makefile-ld.patch	19 Sep 2009 10:01:09 -0000	1.2
@@ -1,5 +1,5 @@
---- libitl-0.6.4/Makefile.old	2008-06-09 15:57:37.000000000 +0800
-+++ libitl-0.6.4/Makefile	2008-06-09 15:58:14.000000000 +0800
+--- libitl-0.7.0/Makefile.old	2008-06-09 15:57:37.000000000 +0800
++++ libitl-0.7.0/Makefile.in	2008-06-09 15:58:14.000000000 +0800
 @@ -23,7 +23,7 @@
  	@false
  


Index: libitl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/libitl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libitl.spec	25 Jul 2009 06:00:29 -0000	1.5
+++ libitl.spec	19 Sep 2009 10:01:09 -0000	1.6
@@ -1,19 +1,18 @@
 Name:           libitl
-Version:        0.6.4 
-Release:        7%{?dist}
+Version:        0.7.0 
+Release:        1%{?dist}
 Summary:        Libraries for The Islamic Tools and Libraries Project
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.arabeyes.org/project.php?proj=ITL
-Source0:        http://switch.dl.sourceforge.net/sourceforge/arabeyes/%{name}-%{version}.tar.bz2
+Source0:        http://switch.dl.sourceforge.net/sourceforge/arabeyes/%{name}-%{version}.tar.gz
 Source1:        libitl-configure
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Patch101:  libitl-makefile-destdir.patch
-Patch102:  libitl-makefile-ld.patch
+Patch0: %{name}-makefile-ld.patch
 #BuildRequires:  autoconf
 
 %description
@@ -37,11 +36,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch101 -p1 -b .makefile-destdir
-%patch102 -p1 -b .makefile-ld
-#./autogen.sh
-cp %{SOURCE1} configure
-chmod +x configure
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -50,7 +45,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+#make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ $RPM_BUILD_ROOT/%{_includedir}/itl
+cp build/*.so build/*.so.* $RPM_BUILD_ROOT/%{_libdir}/
+cp prayertime/src/prayer.h hijri/src/hijri.h $RPM_BUILD_ROOT/%{_includedir}/itl/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -79,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Mohd Izhar Firdaus Ismail <mohd.izhar.firdaus at gmail.com> 0.7.0-1
+- update to 0.7.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Feb 2008 02:05:48 -0000	1.2
+++ sources	19 Sep 2009 10:01:09 -0000	1.3
@@ -1 +1 @@
-477081809cfc2006fdd2b8d0099d985b  libitl-0.6.4.tar.bz2
+86d7fadce96433dde67df61190b0bd0b  libitl-0.7.0.tar.gz


--- libitl-makefile-destdir.patch DELETED ---



From cdamian at fedoraproject.org  Sat Sep 19 10:52:52 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sat, 19 Sep 2009 10:52:52 +0000 (UTC)
Subject: rpms/php-pear-PHP-CodeSniffer/devel .cvsignore, 1.10,
	1.11 php-pear-PHP-CodeSniffer.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20090919105252.459D111C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24866

Modified Files:
	.cvsignore php-pear-PHP-CodeSniffer.spec sources 
Log Message:
Upstream 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Mar 2009 04:16:48 -0000	1.10
+++ .cvsignore	19 Sep 2009 10:52:51 -0000	1.11
@@ -1 +1 @@
-PHP_CodeSniffer-1.1.0.tgz
+PHP_CodeSniffer-1.2.0.tgz


Index: php-pear-PHP-CodeSniffer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/devel/php-pear-PHP-CodeSniffer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-pear-PHP-CodeSniffer.spec	26 Jul 2009 18:25:57 -0000	1.11
+++ php-pear-PHP-CodeSniffer.spec	19 Sep 2009 10:52:52 -0000	1.12
@@ -2,8 +2,8 @@
 %define pear_name PHP_CodeSniffer
 
 Name:           php-pear-PHP-CodeSniffer
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        PHP coding standards enforcement tool
 
 Group:          Development/Tools
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Sat Sep 19 2009 Christof Damian <christof at damian.net> - 1.2.0-1
+- Upstream 1.2.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Mar 2009 04:16:48 -0000	1.10
+++ sources	19 Sep 2009 10:52:52 -0000	1.11
@@ -1 +1 @@
-b5f727311b091ee6b6edf8ffcc411e71  PHP_CodeSniffer-1.1.0.tgz
+bd1caaf2741e4dc04d844bb306993898  PHP_CodeSniffer-1.2.0.tgz



From kaboon at fedoraproject.org  Sat Sep 19 11:14:32 2009
From: kaboon at fedoraproject.org (kaboon)
Date: Sat, 19 Sep 2009 11:14:32 +0000 (UTC)
Subject: rpms/rekonq/devel import.log, NONE, 1.1 rekonq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090919111432.8980111C00E6@cvs1.fedora.phx.redhat.com>

Author: kaboon

Update of /cvs/pkgs/rpms/rekonq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31689/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rekonq.spec 
Log Message:



--- NEW FILE import.log ---
rekonq-0_2_0-3_fc11:HEAD:rekonq-0.2.0-3.fc11.src.rpm:1253358757


--- NEW FILE rekonq.spec ---
Name:		rekonq
Version:	0.2.0
Release:	3%{?dist}
Summary:	KDE browser based on QtWebkit

Group:		Applications/Internet
License:	GPLv2+
URL:		http://rekonq.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2			
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	kdebase-workspace-devel >= 4.2.0
BuildRequires:	qt-devel >= 4.5.0
BuildRequires:	gettext
BuildRequires:	desktop-file-utils

Requires: kdebase-workspace >= 4.2.0
Requires: qt >= 4.5.0

%description
rekonq is a KDE browser based on QtWebkit. Its code is based on Nokia 
QtDemoBrowser, just like Arora. It's implementation is going to embrace 
KDE technologies to have a full-featured KDE web browser.

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/kde4/%{name}.desktop

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog INSTALL TODO
%{_kde4_bindir}/rekonq
%{_kde4_sharedir}/config.kcfg/rekonq.kcfg
%{_kde4_sharedir}/applications/kde4/rekonq.desktop
%{_kde4_iconsdir}/hicolor/*/apps/./rekonq.png
%dir %{_kde4_appsdir}/%{name}
%{_kde4_appsdir}/%{name}/*

%changelog
* Mon Aug 31 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-3
- fix directory ownership in spec file

* Sat Aug 29 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-2
- fix build requirements in spec file

* Tue Aug 25 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-1
- version 0.2.0
- multiple spec file improvements

* Fri May 29 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.1.0-1
- version 0.1.0

* Mon Mar 23 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.0.4-2
- cleaning up spec file.

* Tue Mar 17 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.0.4-1
- Initial package.

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:11:48 -0000	1.1
+++ .cvsignore	19 Sep 2009 11:14:32 -0000	1.2
@@ -0,0 +1 @@
+rekonq-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:11:49 -0000	1.1
+++ sources	19 Sep 2009 11:14:32 -0000	1.2
@@ -0,0 +1 @@
+71bc6a6ae4d1d25a2e0d67ff96426b6c  rekonq-0.2.0.tar.bz2



From kaboon at fedoraproject.org  Sat Sep 19 11:15:59 2009
From: kaboon at fedoraproject.org (kaboon)
Date: Sat, 19 Sep 2009 11:15:59 +0000 (UTC)
Subject: rpms/rekonq/F-12 import.log, NONE, 1.1 rekonq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090919111559.D28C011C00E6@cvs1.fedora.phx.redhat.com>

Author: kaboon

Update of /cvs/pkgs/rpms/rekonq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32435/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rekonq.spec 
Log Message:



--- NEW FILE import.log ---
rekonq-0_2_0-3_fc11:F-12:rekonq-0.2.0-3.fc11.src.rpm:1253358928


--- NEW FILE rekonq.spec ---
Name:		rekonq
Version:	0.2.0
Release:	3%{?dist}
Summary:	KDE browser based on QtWebkit

Group:		Applications/Internet
License:	GPLv2+
URL:		http://rekonq.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2			
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	kdebase-workspace-devel >= 4.2.0
BuildRequires:	qt-devel >= 4.5.0
BuildRequires:	gettext
BuildRequires:	desktop-file-utils

Requires: kdebase-workspace >= 4.2.0
Requires: qt >= 4.5.0

%description
rekonq is a KDE browser based on QtWebkit. Its code is based on Nokia 
QtDemoBrowser, just like Arora. It's implementation is going to embrace 
KDE technologies to have a full-featured KDE web browser.

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/kde4/%{name}.desktop

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog INSTALL TODO
%{_kde4_bindir}/rekonq
%{_kde4_sharedir}/config.kcfg/rekonq.kcfg
%{_kde4_sharedir}/applications/kde4/rekonq.desktop
%{_kde4_iconsdir}/hicolor/*/apps/./rekonq.png
%dir %{_kde4_appsdir}/%{name}
%{_kde4_appsdir}/%{name}/*

%changelog
* Mon Aug 31 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-3
- fix directory ownership in spec file

* Sat Aug 29 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-2
- fix build requirements in spec file

* Tue Aug 25 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-1
- version 0.2.0
- multiple spec file improvements

* Fri May 29 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.1.0-1
- version 0.1.0

* Mon Mar 23 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.0.4-2
- cleaning up spec file.

* Tue Mar 17 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.0.4-1
- Initial package.

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:11:48 -0000	1.1
+++ .cvsignore	19 Sep 2009 11:15:59 -0000	1.2
@@ -0,0 +1 @@
+rekonq-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:11:49 -0000	1.1
+++ sources	19 Sep 2009 11:15:59 -0000	1.2
@@ -0,0 +1 @@
+71bc6a6ae4d1d25a2e0d67ff96426b6c  rekonq-0.2.0.tar.bz2



From kaboon at fedoraproject.org  Sat Sep 19 11:17:25 2009
From: kaboon at fedoraproject.org (kaboon)
Date: Sat, 19 Sep 2009 11:17:25 +0000 (UTC)
Subject: rpms/rekonq/F-11 import.log, NONE, 1.1 rekonq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090919111725.E140B11C00E6@cvs1.fedora.phx.redhat.com>

Author: kaboon

Update of /cvs/pkgs/rpms/rekonq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv429/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rekonq.spec 
Log Message:



--- NEW FILE import.log ---
rekonq-0_2_0-3_fc11:F-11:rekonq-0.2.0-3.fc11.src.rpm:1253359014


--- NEW FILE rekonq.spec ---
Name:		rekonq
Version:	0.2.0
Release:	3%{?dist}
Summary:	KDE browser based on QtWebkit

Group:		Applications/Internet
License:	GPLv2+
URL:		http://rekonq.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2			
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	kdebase-workspace-devel >= 4.2.0
BuildRequires:	qt-devel >= 4.5.0
BuildRequires:	gettext
BuildRequires:	desktop-file-utils

Requires: kdebase-workspace >= 4.2.0
Requires: qt >= 4.5.0

%description
rekonq is a KDE browser based on QtWebkit. Its code is based on Nokia 
QtDemoBrowser, just like Arora. It's implementation is going to embrace 
KDE technologies to have a full-featured KDE web browser.

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/kde4/%{name}.desktop

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog INSTALL TODO
%{_kde4_bindir}/rekonq
%{_kde4_sharedir}/config.kcfg/rekonq.kcfg
%{_kde4_sharedir}/applications/kde4/rekonq.desktop
%{_kde4_iconsdir}/hicolor/*/apps/./rekonq.png
%dir %{_kde4_appsdir}/%{name}
%{_kde4_appsdir}/%{name}/*

%changelog
* Mon Aug 31 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-3
- fix directory ownership in spec file

* Sat Aug 29 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-2
- fix build requirements in spec file

* Tue Aug 25 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.2.0-1
- version 0.2.0
- multiple spec file improvements

* Fri May 29 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.1.0-1
- version 0.1.0

* Mon Mar 23 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.0.4-2
- cleaning up spec file.

* Tue Mar 17 2009 Eelko Berkenpies <fedora at berkenpies.nl> 0.0.4-1
- Initial package.

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2009 19:11:48 -0000	1.1
+++ .cvsignore	19 Sep 2009 11:17:25 -0000	1.2
@@ -0,0 +1 @@
+rekonq-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2009 19:11:49 -0000	1.1
+++ sources	19 Sep 2009 11:17:25 -0000	1.2
@@ -0,0 +1 @@
+71bc6a6ae4d1d25a2e0d67ff96426b6c  rekonq-0.2.0.tar.bz2



From stefansf at fedoraproject.org  Sat Sep 19 11:57:36 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Sat, 19 Sep 2009 11:57:36 +0000 (UTC)
Subject: rpms/pyicq-t/F-11 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 config.patch, 1.2, 1.3 pyicq-t.init, 1.2, 1.3 pyicq-t.spec,
	1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20090919115736.A014611C00E6@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/pyicq-t/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16807/F-11

Modified Files:
	.cvsignore config.patch pyicq-t.init pyicq-t.spec sources 
Added Files:
	import.log 
Log Message:
- Merge from Fedora devel
- New upstream release
- Changed init script to run pyicq-t as non root user and changed permissions of the config
  file because it contains a cleartext password.
- Changed start/stop time of the init script to fix race condition with ejabberd.
- Changed init script to call "PyICQt.py" directly and not via
  "python PyICQt.py" this makes it easier to write a SELinux policy for.
- Some whitespace fixes
- Added shadow-utils as a requirement
- Removed empty config file creation and changed it to copy an example config file
- Added try-restart, reload and force-reload to the init script
- Fixed permissions
- Fixed typo in config.patch
- Make init script more compatible, e.g. "exit 2" if invalid arguments supplied,
  killproc needs prog name otherwise the signal won't be used and a couple of
  other minor fixes.



--- NEW FILE import.log ---
pyicq-t-0_8_1_5-5_fc11:F-11:pyicq-t-0.8.1.5-5.fc11.src.rpm:1253361352


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	15 Jun 2009 06:34:50 -0000	1.7
+++ .cvsignore	19 Sep 2009 11:57:36 -0000	1.8
@@ -1 +1 @@
-pyicqt-0.8.1.3.tar.gz
+pyicqt-0.8.1.5.tar.gz

config.patch:
 config_example.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/F-11/config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- config.patch	11 Jul 2008 00:18:22 -0000	1.2
+++ config.patch	19 Sep 2009 11:57:36 -0000	1.3
@@ -1,5 +1,5 @@
---- config_example.xml.orig	2006-07-26 09:10:46.000000000 -0500
-+++ config_example.xml	2006-07-26 09:13:02.000000000 -0500
+--- config_example.xml	2009-09-15 09:02:36.000000000 -0500
++++ config_example.xml	2009-09-15 09:03:02.000000000 -0500
 @@ -7,11 +7,11 @@
  
  	<!-- The location of the spool directory.. if relative, relative to -->
@@ -10,7 +10,7 @@
  	<!-- The location of the PID file.. if relative, relative to this dir. -->
  	<!-- Comment out if you do not want a pid file -->
 -	<pid>PyICQt.pid</pid>
-+	<pid>/var/run/pyicq-t.pid</pid>
++	<pid>/var/run/pyicq-t/pyicq-t.pid</pid>
  
  	<!-- The IP address of the main Jabberd server -->
  	<mainServer>127.0.0.1</mainServer>


Index: pyicq-t.init
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/F-11/pyicq-t.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pyicq-t.init	31 Oct 2006 21:39:22 -0000	1.2
+++ pyicq-t.init	19 Sep 2009 11:57:36 -0000	1.3
@@ -1,58 +1,96 @@
 #!/bin/bash
-# pyicq-t
 #
-# chkconfig: - 45 65
-# description: pyicq-t
-# processname: pyicq-t
-# pidfile: /var/run/pyicq-t.pid
+# PyICQt    Start and stop pyicq-t.
+
+# chkconfig: - 99 01
+# description: PyICQt is an ICQ transport for Jabber/XMPP.
+# config: /etc/pyicq-t/config.xml
+# pidfile: /var/run/pyicq-t/pyicq-t.pid
+# lockfile: /var/lock/subsys/pyicq-t
 
 . /etc/rc.d/init.d/functions
 
+prog="PyICQt"
+exec="/usr/share/pyicq-t/PyICQt.py"
+config="/etc/pyicq-t/config.xml"
+pidfile="/var/run/pyicq-t/pyicq-t.pid"
+lockfile="/var/lock/subsys/pyicq-t"
+
 start() {
-        echo -n $"Starting ICQ transport: "
-	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
-        echo
-        return $RETVAL
+	[ -x $exec ] || exit 5
+	[ -f $config ] || exit 6
+	echo -n $"Starting $prog: "
+	daemon --user=pyicqt --pidfile=$pidfile $exec \
+				--background \
+				--config=${config} \
+				--log=/var/log/pyicq-t.log
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-        # Stop daemons.
-        echo -n "Shutting down ICQ transport: "
-	killproc pyicq-t
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
-        echo
-        return $RETVAL
+	echo -n $"Shutting down $prog: "
+	killproc -p $pidfile
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
 }
 
 restart() {
-        stop
-        start
+	stop
+	sleep 1
+	start
+}
+
+reload() {
+	echo -n $"Reloading $prog: "
+	killproc -p $pidfile $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+force_reload() {
+	restart
+}
+
+rh_status() {
+	status -p $pidfile $prog
+}
+
+rh_status_q() {
+	rh_status >/dev/null 2>&1
 }
 
-# See how we were called.
 case "$1" in
   start)
-        start
-        ;;
+	start
+	;;
   stop)
-        stop
-        ;;
+	stop
+	;;
   restart)
-        restart
-        ;;
-  condrestart)
-        [ -f /var/lock/subsys/pyicq-t ] && restart || :
-        ;;
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
   status)
-	status pyicq-t
-	RETVAL=$?
+  	rh_status
 	;;
   *)
-        echo "Usage: pyicq-t {start|stop|restart|reload|condrestart|status}"
-        RETVAL=1
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+	exit 2
 esac
 
-exit $RETVAL
+exit $?


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/F-11/pyicq-t.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pyicq-t.spec	15 Jun 2009 06:34:50 -0000	1.14
+++ pyicq-t.spec	19 Sep 2009 11:57:36 -0000	1.15
@@ -1,14 +1,14 @@
 %{!?python_standard_lib: %define python_standard_lib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(standard_lib=1)")}
 
 Name:           pyicq-t
-Version:        0.8.1.3
-Release:        1%{?dist}
+Version:        0.8.1.5
+Release:        5%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/pyicqt/
-Source0:	http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
+Source0:        http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -16,12 +16,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:	python-twisted-core
+Requires:       python-twisted-core
 Requires:       python-twisted-web
-Requires:	python-twisted-words
+Requires:       python-twisted-words
 Requires:       python-imaging
 Requires:       pyOpenSSL
 
+Requires(pre): shadow-utils
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -55,24 +58,32 @@ MySQL backend for ICQ transport
 
 %install
 rm -rf %{buildroot}
+chmod 644 src/chardet_utf/*.py
+chmod 644 tools/managessi.py
+chmod 644 tools/migrate.py
+
 mkdir -p %{buildroot}/etc/pyicq-t
 mkdir -p %{buildroot}%{_datadir}/pyicq-t
+mkdir -p %{buildroot}%{_localstatedir}/run/pyicq-t
 mkdir -p %{buildroot}/var/spool/pyicq-t
 mkdir -p %{buildroot}%{_initrddir}
 
 cp %{S:1} %{buildroot}%{_initrddir}/pyicq-t
-chmod a+x %{buildroot}%{_initrddir}/pyicq-t
 
-touch %{buildroot}/etc/pyicq-t/config.xml
+cp config_example.xml %{buildroot}/etc/pyicq-t/config.xml
 
 cp PyICQt.py* %{buildroot}%{_datadir}/pyicq-t
-chmod a+x %{buildroot}%{_datadir}/pyicq-t/PyICQt.py
 cp -r data %{buildroot}%{_datadir}/pyicq-t
 cp -r src %{buildroot}%{_datadir}/pyicq-t
- 
+
 %clean
 rm -rf %{buildroot}
 
+%pre
+/usr/sbin/groupadd -f -r pyicqt
+/usr/sbin/useradd -c "PyICQt" -g pyicqt \
+        -s /sbin/nologin -r -d /var/spool/pyicq-t pyicqt 2> /dev/null || :
+
 %post
 /sbin/chkconfig --add pyicq-t
 
@@ -91,15 +102,22 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog config_example.xml COPYING INSTALL NEWS README tools/managessi.py tools/migrate.py
 
-%{_initrddir}/pyicq-t
+%attr(0755,root,root) %{_initrddir}/pyicq-t
 
-%dir %{_sysconfdir}/pyicq-t
-%ghost %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
+%attr(0700,pyicqt,pyicqt) %dir %{_sysconfdir}/pyicq-t
+%attr(0600,pyicqt,pyicqt) %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
 
 %exclude %{_datadir}/pyicq-t/src/xdb/mysql.py*
-%{_datadir}/pyicq-t
+%dir %{_datadir}/pyicq-t
+%{_datadir}/pyicq-t/data
+%attr(0755,root,root) %{_datadir}/pyicq-t/PyICQt.py
+%{_datadir}/pyicq-t/PyICQt.pyc
+%{_datadir}/pyicq-t/PyICQt.pyo
+%{_datadir}/pyicq-t/src
 
-%dir %{_localstatedir}/spool/pyicq-t
+%attr(0700,pyicqt,pyicqt) %dir %{_localstatedir}/spool/pyicq-t
+
+%attr(0755,pyicqt,pyicqt) %dir %{_localstatedir}/run/pyicq-t
 
 %files mysql
 %defattr(-,root,root,-)
@@ -108,6 +126,37 @@ fi
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Tue Sep 15 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-5
+- Fixed inclusion of /usr/share/pyicq-t
+- Create a default config file, removed ghost entry
+- Fixed init script, status didn't show the application name
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-4
+- Make init script more compatible, e.g. "exit 2" if invalid arguments supplied,
+  killproc needs prog name otherwise the signal won't be used and a couple of
+  other minor fixes.
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-3
+- Added try-restart, reload and force-reload to the init script
+- Fixed permissions
+- Fixed typo in config.patch
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-2
+- Some whitespace fixes
+- Added shadow-utils as a requirement
+- Removed empty config file creation and changed it to copy an example config file
+
+* Fri Sep 11 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-1
+- New upstream release.
+- Changed init script to run pyicq-t as non root user and changed permissions of the config
+  file because it contains a cleartext password.
+- Changed start/stop time of the init script to fix race condition with ejabberd.
+- Changed init script to call "PyICQt.py" directly and not via
+  "python PyICQt.py" this makes it easier to write a SELinux policy for.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 15 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.8.1.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 Jun 2009 06:34:50 -0000	1.7
+++ sources	19 Sep 2009 11:57:36 -0000	1.8
@@ -1 +1 @@
-0a94e1aaa3079b68a3f180705f961836  pyicqt-0.8.1.3.tar.gz
+d1c544f82ed416bbe987a5e419820fa8  pyicqt-0.8.1.5.tar.gz



From tomeu at fedoraproject.org  Sat Sep 19 12:37:38 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sat, 19 Sep 2009 12:37:38 +0000 (UTC)
Subject: rpms/hulahop/devel .cvsignore, 1.5, 1.6 hulahop.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20090919123738.40A2411C00E6@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/hulahop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28721

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Sat Sep 19 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.5.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Aug 2009 09:23:01 -0000	1.5
+++ .cvsignore	19 Sep 2009 12:37:37 -0000	1.6
@@ -1 +1 @@
-hulahop-0.5.1.tar.bz2
+hulahop-0.5.2.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/hulahop.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hulahop.spec	26 Aug 2009 09:23:01 -0000	1.15
+++ hulahop.spec	19 Sep 2009 12:37:38 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: hulahop
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Sat Sep 19 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.5.2-1
+- New upstream release
+
 * Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.5.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Aug 2009 09:23:01 -0000	1.7
+++ sources	19 Sep 2009 12:37:38 -0000	1.8
@@ -1 +1 @@
-71ce72a288e3e322528166120db5efd0  hulahop-0.5.1.tar.bz2
+4025af83766d506b1fbf57a4e0c5a6df  hulahop-0.5.2.tar.bz2



From leigh123linux at fedoraproject.org  Sat Sep 19 12:53:26 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 19 Sep 2009 12:53:26 +0000 (UTC)
Subject: rpms/libcompizconfig/devel libcompizconfig.spec,1.19,1.20
Message-ID: <20090919125326.74E1B11C00E6@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/libcompizconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv392

Modified Files:
	libcompizconfig.spec 
Log Message:
* Sat Sep 19 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-6
- disable protobuf support



Index: libcompizconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcompizconfig/devel/libcompizconfig.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libcompizconfig.spec	31 Jul 2009 21:39:17 -0000	1.19
+++ libcompizconfig.spec	19 Sep 2009 12:53:26 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           libcompizconfig
 Version:        0.8.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Configuration backend for compiz
 
 Group:          System Environment/Libraries
@@ -22,7 +22,7 @@ BuildRequires:  compiz-devel >= %{baseve
 BuildRequires:  libX11-devel, gettext, intltool
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  mesa-libGL-devel
-BuildRequires:  protobuf-devel
+#BuildRequires:  protobuf-devel
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -50,7 +50,7 @@ developing applications that use %{name}
 #%patch102 -p1 -b .gcc43-buildfix2
 
 %build
-%configure --disable-static 
+%configure --disable-static --disable-protobuf
            
 make %{?_smp_mflags}
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-6
+- disable protobuf support
+
 * Fri Jul 31 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-5
 - add patch to Update .pb when an older .xml is used
 



From rishi at fedoraproject.org  Sat Sep 19 13:32:43 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 19 Sep 2009 13:32:43 +0000 (UTC)
Subject: rpms/gajim/devel .cvsignore, 1.16, 1.17 gajim.spec, 1.35,
	1.36 sources, 1.16, 1.17
Message-ID: <20090919133243.C67CF11C00E6@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gajim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12770

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
- Version bump to 0.12.5. (Red Hat Bugzilla #516191)
  * Fixed history manager.
  * Improved file transfer.
  * http://trac.gajim.org/query?status=closed&milestone=0.12.4
  * http://trac.gajim.org/browser/ChangeLog?rev=5f8edb79072f



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	10 Aug 2009 18:16:49 -0000	1.16
+++ .cvsignore	19 Sep 2009 13:32:42 -0000	1.17
@@ -1 +1 @@
-gajim-0.12.3.tar.bz2
+gajim-0.12.5.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gajim.spec	10 Aug 2009 18:16:49 -0000	1.35
+++ gajim.spec	19 Sep 2009 13:32:42 -0000	1.36
@@ -2,8 +2,8 @@
 
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-Version:	0.12.3
-Release:	3%{?dist}
+Version:	0.12.5
+Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
@@ -89,6 +89,7 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}-remote
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/pixmaps/%{name}_about.png
 
 %dir %{_datadir}/%{name}
@@ -101,11 +102,18 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
+- Version bump to 0.12.5. (Red Hat Bugzilla #516191)
+  * Fixed history manager.
+  * Improved file transfer.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12.4
+  * http://trac.gajim.org/browser/ChangeLog?rev=5f8edb79072f
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.12.3-3
 - Use bzipped upstream tarball.
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.12.3-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul 22 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.3-1
 - Version bump to 0.12.3. (Red Hat Bugzilla #510803)
@@ -119,6 +127,7 @@ rm -rf %{buildroot}
   * NetworkManager 0.7 support.
   * Restore old behaviour of click on systray: left click to open events.
   * Totem support for played music.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12.2
 
 * Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.1-2
 - Replaced 'License: GPLv2' with 'License: GPLv3'.
@@ -149,6 +158,8 @@ rm -rf %{buildroot}
   * Fixed GSSAPI authentication.
   * Fixed text rendering in notifications.
   * Quodlibet support.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12
+  * http://trac.gajim.org/browser/tags/gajim-0.12/ChangeLog
 - Added 'Requires: notify-python python-kerberos'.
 
 * Sun Nov 30 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12-0.1.beta1
@@ -176,7 +187,7 @@ rm -rf %{buildroot}
   'BuildRequires: pygtk2-devel'.
 - Fixed docdir and removed empty README.
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
+* Tue Feb 19 2008 Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
 - Autorebuild for gcc-4.3.
 
 * Wed Dec 26 2007 Mat?j Cepl <mcepl at redhat.com> 0.11.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Aug 2009 18:16:49 -0000	1.16
+++ sources	19 Sep 2009 13:32:42 -0000	1.17
@@ -1 +1 @@
-fe799c0645b8f021dc2cb147ae144156  gajim-0.12.3.tar.bz2
+aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2



From rishi at fedoraproject.org  Sat Sep 19 13:33:43 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 19 Sep 2009 13:33:43 +0000 (UTC)
Subject: rpms/gajim/F-11 .cvsignore, 1.15, 1.16 gajim.spec, 1.33,
	1.34 sources, 1.15, 1.16
Message-ID: <20090919133343.32EE011C00E6@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gajim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13071

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
- Version bump to 0.12.5. (Red Hat Bugzilla #516191)
  * Fixed history manager.
  * Improved file transfer.
  * http://trac.gajim.org/query?status=closed&milestone=0.12.4
  * http://trac.gajim.org/browser/ChangeLog?rev=5f8edb79072f



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Jul 2009 04:05:24 -0000	1.15
+++ .cvsignore	19 Sep 2009 13:33:42 -0000	1.16
@@ -1 +1 @@
-gajim-0.12.3.tar.gz
+gajim-0.12.5.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-11/gajim.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gajim.spec	22 Jul 2009 04:05:24 -0000	1.33
+++ gajim.spec	19 Sep 2009 13:33:42 -0000	1.34
@@ -2,12 +2,12 @@
 
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-Version:	0.12.3
+Version:	0.12.5
 Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -89,6 +89,7 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}-remote
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/pixmaps/%{name}_about.png
 
 %dir %{_datadir}/%{name}
@@ -101,6 +102,19 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
+- Version bump to 0.12.5. (Red Hat Bugzilla #516191)
+  * Fixed history manager.
+  * Improved file transfer.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12.4
+  * http://trac.gajim.org/browser/ChangeLog?rev=5f8edb79072f
+
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.12.3-3
+- Use bzipped upstream tarball.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.12.3-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.3-1
 - Version bump to 0.12.3. (Red Hat Bugzilla #510803)
   * Better keepalive / ping behaviour.
@@ -113,6 +127,7 @@ rm -rf %{buildroot}
   * NetworkManager 0.7 support.
   * Restore old behaviour of click on systray: left click to open events.
   * Totem support for played music.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12.2
 
 * Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.1-2
 - Replaced 'License: GPLv2' with 'License: GPLv3'.
@@ -143,6 +158,8 @@ rm -rf %{buildroot}
   * Fixed GSSAPI authentication.
   * Fixed text rendering in notifications.
   * Quodlibet support.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12
+  * http://trac.gajim.org/browser/tags/gajim-0.12/ChangeLog
 - Added 'Requires: notify-python python-kerberos'.
 
 * Sun Nov 30 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12-0.1.beta1
@@ -170,7 +187,7 @@ rm -rf %{buildroot}
   'BuildRequires: pygtk2-devel'.
 - Fixed docdir and removed empty README.
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
+* Tue Feb 19 2008 Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
 - Autorebuild for gcc-4.3.
 
 * Wed Dec 26 2007 Mat?j Cepl <mcepl at redhat.com> 0.11.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Jul 2009 04:05:24 -0000	1.15
+++ sources	19 Sep 2009 13:33:42 -0000	1.16
@@ -1 +1 @@
-088ebbcd8cb4242452831bee5de70639  gajim-0.12.3.tar.gz
+aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Sep 19 13:39:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 13:39:31 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel .cvsignore, 1.2,
	1.3 moblin-panel-media.spec, 1.1, 1.2 sources, 1.2,
	1.3 import.log, 1.1, NONE moblin-panel-media-BR0410.patch, 1.1, NONE
Message-ID: <20090919133931.5058911C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14776

Modified Files:
	.cvsignore moblin-panel-media.spec sources 
Removed Files:
	import.log moblin-panel-media-BR0410.patch 
Log Message:
- New upstream 0.0.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Sep 2009 20:32:20 -0000	1.2
+++ .cvsignore	19 Sep 2009 13:39:30 -0000	1.3
@@ -1 +1 @@
-moblin-panel-media-0.0.1.tar.bz2
+moblin-panel-media-0.0.2.tar.bz2


Index: moblin-panel-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/moblin-panel-media.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-media.spec	3 Sep 2009 20:32:21 -0000	1.1
+++ moblin-panel-media.spec	19 Sep 2009 13:39:30 -0000	1.2
@@ -1,13 +1,14 @@
 Name:           moblin-panel-media
-Version:        0.0.1
-Release:        2%{?dist}
+Version:        0.0.2
+Release:        1%{?dist}
 Summary:        Moblin Panel for Media
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.moblin.org
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:         moblin-panel-media-BR0410.patch
+# Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+# git archive --format=tar --prefix=moblin-panel-media-0.0.2/ e040a4b | bzip2 > moblin-panel-media-0.0.2.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bickley-devel
@@ -30,7 +31,6 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
-%patch0 -p1 -b .BR0410
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Sat Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
+- New upstream 0.0.2 release
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-2
 - Add patch for bognor-regis 0.4.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Sep 2009 20:32:21 -0000	1.2
+++ sources	19 Sep 2009 13:39:30 -0000	1.3
@@ -1 +1 @@
-edf0425f5c43b873d02fdfa7c77494ee  moblin-panel-media-0.0.1.tar.bz2
+6a6ed089d2a47088f9652b098b9a8961  moblin-panel-media-0.0.2.tar.bz2


--- import.log DELETED ---


--- moblin-panel-media-BR0410.patch DELETED ---



From rishi at fedoraproject.org  Sat Sep 19 13:47:59 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 19 Sep 2009 13:47:59 +0000 (UTC)
Subject: rpms/gajim/F-10 .cvsignore, 1.15, 1.16 gajim.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <20090919134759.BE15411C00E6@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gajim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17163

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
- Version bump to 0.12.5. (Red Hat Bugzilla #516191)
  * Fixed history manager.
  * Improved file transfer.
  * http://trac.gajim.org/query?status=closed&milestone=0.12.4
  * http://trac.gajim.org/browser/ChangeLog?rev=5f8edb79072f



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	31 Jul 2009 13:03:35 -0000	1.15
+++ .cvsignore	19 Sep 2009 13:47:59 -0000	1.16
@@ -1 +1 @@
-gajim-0.12.3.tar.gz
+gajim-0.12.5.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-10/gajim.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gajim.spec	31 Jul 2009 13:03:35 -0000	1.30
+++ gajim.spec	19 Sep 2009 13:47:59 -0000	1.31
@@ -2,12 +2,12 @@
 
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-Version:	0.12.3
+Version:	0.12.5
 Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -89,6 +89,7 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}-remote
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/pixmaps/%{name}_about.png
 
 %dir %{_datadir}/%{name}
@@ -101,6 +102,19 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.5-1
+- Version bump to 0.12.5. (Red Hat Bugzilla #516191)
+  * Fixed history manager.
+  * Improved file transfer.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12.4
+  * http://trac.gajim.org/browser/ChangeLog?rev=5f8edb79072f
+
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.12.3-3
+- Use bzipped upstream tarball.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.12.3-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.3-1
 - Version bump to 0.12.3. (Red Hat Bugzilla #510803)
   * Better keepalive / ping behaviour.
@@ -113,6 +127,7 @@ rm -rf %{buildroot}
   * NetworkManager 0.7 support.
   * Restore old behaviour of click on systray: left click to open events.
   * Totem support for played music.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12.2
 
 * Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.12.1-2
 - Replaced 'License: GPLv2' with 'License: GPLv3'.
@@ -143,6 +158,8 @@ rm -rf %{buildroot}
   * Fixed GSSAPI authentication.
   * Fixed text rendering in notifications.
   * Quodlibet support.
+  * http://trac.gajim.org/query?status=closed&milestone=0.12
+  * http://trac.gajim.org/browser/tags/gajim-0.12/ChangeLog
 - Added 'Requires: notify-python python-kerberos'.
 
 * Sun Nov 30 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12-0.1.beta1
@@ -170,7 +187,7 @@ rm -rf %{buildroot}
   'BuildRequires: pygtk2-devel'.
 - Fixed docdir and removed empty README.
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
+* Tue Feb 19 2008 Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
 - Autorebuild for gcc-4.3.
 
 * Wed Dec 26 2007 Mat?j Cepl <mcepl at redhat.com> 0.11.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	31 Jul 2009 13:03:35 -0000	1.15
+++ sources	19 Sep 2009 13:47:59 -0000	1.16
@@ -1 +1 @@
-088ebbcd8cb4242452831bee5de70639  gajim-0.12.3.tar.gz
+aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Sep 19 13:48:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 13:48:27 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, 1.2, 1.3 anerley.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090919134827.E856E11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17386

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 07:49:36 -0000	1.2
+++ .cvsignore	19 Sep 2009 13:48:27 -0000	1.3
@@ -1 +1 @@
-anerley-0.0.20.tar.bz2
+anerley-0.1.1.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- anerley.spec	26 Aug 2009 14:08:03 -0000	1.4
+++ anerley.spec	19 Sep 2009 13:48:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           anerley
-Version:        0.0.20
-Release:        4%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sat Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-1
+- New upstream 0.1.1 release
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-4
 - Rebuild due to mission-control bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 07:49:36 -0000	1.2
+++ sources	19 Sep 2009 13:48:27 -0000	1.3
@@ -1 +1 @@
-7e3d52f677cb99dc2fb729295f9c559b  anerley-0.0.20.tar.bz2
+3dbc9c9b1d9f2cbb75c0892e56b7961d  anerley-0.1.1.tar.bz2



From pbrobinson at fedoraproject.org  Sat Sep 19 13:53:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 13:53:02 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel .cvsignore, 1.3,
	1.4 moblin-panel-status.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090919135302.9CFB611C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19174

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Log Message:
- New upstream 0.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Sep 2009 20:16:54 -0000	1.3
+++ .cvsignore	19 Sep 2009 13:53:02 -0000	1.4
@@ -1 +1 @@
-moblin-panel-status-0.0.4.tar.bz2
+moblin-panel-status-0.0.5.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-status.spec	3 Sep 2009 20:16:54 -0000	1.2
+++ moblin-panel-status.spec	19 Sep 2009 13:53:02 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           moblin-panel-status
-Version:        0.0.4
+Version:        0.0.5
 Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
+- New upstream 0.0.5 release
+
 * Thu Sep  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
 - New upstream 0.0.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Sep 2009 20:16:54 -0000	1.3
+++ sources	19 Sep 2009 13:53:02 -0000	1.4
@@ -1 +1 @@
-3f34ae5595ba0e9d9ea078a1faa85fef  moblin-panel-status-0.0.4.tar.bz2
+8cb6bd6e4296aae65778bec3cafa6422  moblin-panel-status-0.0.5.tar.bz2



From mschwendt at fedoraproject.org  Sat Sep 19 14:06:54 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 19 Sep 2009 14:06:54 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11 audacious-plugins-1.5.1-underruns.patch,
	NONE, 1.1 audacious-plugins-1.5.1-alsa-ng.patch, 1.1,
	1.2 audacious-plugins-1.5.1-alsaplug-id.patch, 1.1,
	1.2 audacious-plugins-1.5.1-mixer-not-ready.patch, 1.2,
	1.3 audacious-plugins.spec, 1.38, 1.39
Message-ID: <20090919140654.67ABB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24059

Modified Files:
	audacious-plugins-1.5.1-alsa-ng.patch 
	audacious-plugins-1.5.1-alsaplug-id.patch 
	audacious-plugins-1.5.1-mixer-not-ready.patch 
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-underruns.patch 
Log Message:
* Sat Sep 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
- Merge minor changes from 2.2 alpha1 alsa-ng plugin.


audacious-plugins-1.5.1-underruns.patch:
 alsa-core.c |   39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-underruns.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c
--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c	2009-09-19 15:52:28.000000000 +0200
@@ -27,6 +27,10 @@
 static gboolean pcm_going = FALSE;
 static GThread *audio_thread = NULL;
 static gint bps;
+static gint loopbufsize = 384000;
+static gint looppostsize = 2048;
+static gint looppresize;
+static gboolean prefill = TRUE;
 
 static gsize wr_total = 0;
 static gsize wr_hwframes = 0;
@@ -219,6 +228,9 @@
         }
         else
         {
+            if (wr_frames == -EPIPE) {
+                prefill = TRUE;
+            }
             gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
 
             _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
@@ -235,7 +247,7 @@
 static gpointer
 alsaplug_loop(gpointer unused)
 {
-    guchar buf[2048];
+    guchar buf[loopbufsize];
     int size;
 
     while (pcm_going)
@@ -245,6 +257,7 @@
         if (flush_request != -1)
         {
             alsaplug_ringbuffer_reset (& pcm_ringbuf);
+            prefill = TRUE;
             snd_pcm_drop(pcm_handle);
             snd_pcm_prepare(pcm_handle);
             wr_total = flush_request * (long long) bps / 1000;
@@ -262,12 +275,25 @@
             continue;
         }
 
-        if (size > sizeof buf)
-            size = sizeof buf;
+        if (prefill) {
+            if (size > loopbufsize)
+                size = loopbufsize;
+
+            if (size >= looppresize) {
+                alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+                prefill = FALSE;
+            }
+        }
+        else {
+            if (size > looppostsize)
+                size = looppostsize;
 
-        alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+            alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+        }
         g_mutex_unlock (pcm_state_mutex);
-        alsaplug_write_buffer (buf, size);
+        if (!prefill) {
+            alsaplug_write_buffer (buf, size);
+        }
     }
 
     snd_pcm_drain(pcm_handle);
@@ -362,6 +388,13 @@
         _ERROR("alsaplug_ringbuffer_init failed");
         return -1;
     }
+    if (loopbufsize >= ringbuf_size) {
+        looppresize = ringbuf_size/2;
+    }
+    else {
+        looppresize = loopbufsize;
+    }
+    prefill = TRUE;
     pcm_going = TRUE;
     flush_request = -1;
     paused = FALSE;
@@ -504,6 +537,7 @@
 {
     g_mutex_lock (pcm_state_mutex);
     paused = p;
+    prefill = !paused;
     g_cond_broadcast (pcm_state_cond);
     g_mutex_unlock (pcm_state_mutex);
 }

audacious-plugins-1.5.1-alsa-ng.patch:
 Makefile          |    8 
 TODO              |   30 +
 about.c           |   49 --
 alsa-configure.c  |  345 +++++++++++++++++++
 alsa-core.c       |  534 +++++++++++++++++++++++++++++
 alsa-debug.h      |   36 +
 alsa-ringbuffer.c |  366 ++++++++++++++++++++
 alsa-ringbuffer.h |   58 +++
 alsa-stdinc.h     |   36 +
 alsa-types.h      |   40 ++
 alsa-util.c       |   55 +++
 alsa.c            |  100 -----
 alsa.h            |   79 ----
 audio.c           |  978 ------------------------------------------------------
 configure.c       |  396 ---------------------
 15 files changed, 1504 insertions(+), 1606 deletions(-)

Index: audacious-plugins-1.5.1-alsa-ng.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins-1.5.1-alsa-ng.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-1.5.1-alsa-ng.patch	29 Jun 2009 16:15:50 -0000	1.1
+++ audacious-plugins-1.5.1-alsa-ng.patch	19 Sep 2009 14:06:52 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/about.c audacious-plugins-fedora-1.5.1/src/alsa/about.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/about.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/about.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/about.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/about.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/about.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,49 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *    Copyright (C) 2001-2003 Matthieu Sozeau <mattam at altern.org>
@@ -51,9 +51,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -			   GTK_SIGNAL_FUNC(gtk_widget_destroyed),
 -			   &dialog);
 -}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.c audacious-plugins-fedora-1.5.1/src/alsa/alsa.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,100 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *    Copyright (C) 2001 Matthieu Sozeau
@@ -155,10 +155,10 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
 -
 -DECLARE_PLUGIN(alsa, NULL, NULL, NULL, alsa_oplist, NULL, NULL, NULL, NULL)
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-configure.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-configure.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-configure.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-configure.c	2009-06-29 18:01:20.000000000 +0200
-@@ -0,0 +1,355 @@
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c	2009-09-16 00:57:07.000000000 +0200
+@@ -0,0 +1,345 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
 + * Copyright (c) 2009 William Pitcock <nenolod at dereferenced.org>
@@ -406,8 +406,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +void alsaplug_configure(void)
 +{
-+	GtkWidget *vbox, *notebook;
-+	GtkWidget *dev_vbox, *adevice_frame, *adevice_box;
++        GtkWidget * vbox, * adevice_frame, * adevice_box;
 +	GtkWidget *mixer_frame, *mixer_box, *mixer_table, *mixer_card_om;
 +	GtkWidget *mixer_card_label, *mixer_device_label;
 +	GtkWidget *bbox, *ok, *cancel;
@@ -420,31 +419,25 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +		return;
 +	}
 +
-+	configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-+	gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
-+			   GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-+			   &configure_win);
-+	gtk_window_set_title(GTK_WINDOW(configure_win),
-+			     _("ALSA Driver configuration"));
-+	gtk_window_set_policy(GTK_WINDOW(configure_win),
-+			      FALSE, TRUE, FALSE);
-+	gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
-+
-+	vbox = gtk_vbox_new(FALSE, 10);
-+	gtk_container_add(GTK_CONTAINER(configure_win), vbox);
-+
-+	notebook = gtk_notebook_new();
-+	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-+
-+	dev_vbox = gtk_vbox_new(FALSE, 5);
-+	gtk_container_set_border_width(GTK_CONTAINER(dev_vbox), 5);
-+
-+	adevice_frame = gtk_frame_new(_("Audio device:"));
-+	gtk_box_pack_start(GTK_BOX(dev_vbox), adevice_frame, FALSE, FALSE, 0);
-+
-+	adevice_box = gtk_vbox_new(FALSE, 5);
-+	gtk_container_set_border_width(GTK_CONTAINER(adevice_box), 5);
-+	gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_box);
++        configure_win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
++        gtk_window_set_title ((GtkWindow *) configure_win, _("ALSA Output "
++         "Plugin Preferences"));
++        gtk_window_set_type_hint ((GtkWindow *) configure_win,
++         GDK_WINDOW_TYPE_HINT_DIALOG);
++        gtk_window_set_resizable ((GtkWindow *) configure_win, FALSE);
++        gtk_container_set_border_width ((GtkContainer *) configure_win, 6);
++        g_signal_connect ((GObject *) configure_win, "destroy", (GCallback)
++         gtk_widget_destroyed, & configure_win);
++
++        vbox = gtk_vbox_new (FALSE, 6);
++        gtk_container_add ((GtkContainer *) configure_win, vbox);
++
++        adevice_frame = gtk_frame_new (_("Device:"));
++        gtk_box_pack_start ((GtkBox *) vbox, adevice_frame, FALSE, FALSE, 0);
++
++        adevice_box = gtk_vbox_new (FALSE, 6);
++        gtk_container_set_border_width ((GtkContainer *) adevice_box, 6);
++        gtk_container_add ((GtkContainer *) adevice_frame, adevice_box);
 +
 +	devices_combo = gtk_combo_new();
 +	gtk_box_pack_start(GTK_BOX(adevice_box), devices_combo,
@@ -453,12 +446,12 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(devices_combo)->entry),
 +			   alsaplug_cfg.pcm_device);
 +
-+	mixer_frame = gtk_frame_new(_("Mixer:"));
-+	gtk_box_pack_start(GTK_BOX(dev_vbox), mixer_frame, FALSE, FALSE, 0);
++        mixer_frame = gtk_frame_new (_("Mixer:"));
++        gtk_box_pack_start ((GtkBox *) vbox, mixer_frame, FALSE, FALSE, 0);
 +
-+	mixer_box = gtk_vbox_new(FALSE, 5);
-+	gtk_container_set_border_width(GTK_CONTAINER(mixer_box), 5);
-+	gtk_container_add(GTK_CONTAINER(mixer_frame), mixer_box);
++        mixer_box = gtk_vbox_new (FALSE, 6);
++        gtk_container_set_border_width ((GtkContainer *) mixer_box, 6);
++        gtk_container_add ((GtkContainer *) mixer_frame, mixer_box);
 +
 +	mixer_table = gtk_table_new(2, 2, FALSE);
 +	gtk_table_set_row_spacings(GTK_TABLE(mixer_table), 5);
@@ -492,9 +485,6 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +	gtk_table_attach(GTK_TABLE(mixer_table), mixer_devices_combo,
 +			 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 +
-+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dev_vbox,
-+				 gtk_label_new(_("Device settings")));
-+
 +	bbox = gtk_hbutton_box_new();
 +	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 +	gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
@@ -514,10 +504,10 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +	gtk_widget_show_all(configure_win);
 +}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-core.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-core.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-core.c	2009-06-29 18:01:20.000000000 +0200
-@@ -0,0 +1,511 @@
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
+@@ -0,0 +1,534 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
 + * Copyright (c) 2009 William Pitcock <nenolod at dereferenced.org>
@@ -591,7 +581,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +static snd_mixer_elem_t *
 +alsaplug_guess_mixer_elem(snd_mixer_t *mixer)
 +{
-+    gchar *elem_names[] = { "Wave", "PCM", "Front", "Master" };
++    gchar *elem_names[] = {"PCM", "Wave", "Front", "Master"};
 +    gint i;
 +    snd_mixer_elem_t *elem;
 +
@@ -691,25 +681,30 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +alsaplug_get_volume(gint *l, gint *r)
 +{
 +    snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
++    long left, right;
 +
 +    if (elem == NULL)
++    {
++        * l = 50;
++        * r = 50;
 +        return;
++    }
 +
 +    snd_mixer_handle_events(amixer);
 +
-+    *l = 0;
-+    *r = 0;
-+
 +    if (snd_mixer_selem_is_playback_mono(elem))
 +    {
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) l);
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) r);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, & left);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, & right);
 +    }
 +    else
 +    {
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, (glong *) l);
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, (glong *) r);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, & left);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, & right);
 +    }
++
++    * l = left;
++    * r = right;
 +}
 +
 +/********************************************************************************
@@ -735,10 +730,14 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +        else
 +        {
 +            gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
-+            if (err < 0)
-+                _ERROR("(write) snd_pcm_recover: %s", snd_strerror(err));
 +
-+            return;
++            _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
++
++            if (err < 0)
++            {
++                _ERROR ("snd_pcm_recover error: %s", snd_strerror (err));
++                return;
++            }
 +        }
 +    }
 +}
@@ -815,10 +814,22 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +    /*    return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;*/
 +}
 +
++#define CHECK_FAIL(expression, name) \
++{ \
++    gint error = expression; \
++    if (error) \
++    { \
++        _ERROR (name " failed: %s.\n", snd_strerror (error)); \
++        snd_pcm_close (pcm_handle); \
++        pcm_handle = NULL; \
++        return -1; \
++    } \
++}
++
 +static gint
 +alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
 +{
-+    gint err, bitwidth, ringbuf_size;
++    gint err, bitwidth, ringbuf_size, buf_size;
 +    snd_pcm_format_t afmt;
 +    snd_pcm_hw_params_t *hwparams = NULL;
 +
@@ -841,27 +852,29 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +    snd_pcm_hw_params_alloca(&hwparams);
 +    snd_pcm_hw_params_any(pcm_handle, hwparams);
-+    snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
-+    snd_pcm_hw_params_set_format(pcm_handle, hwparams, afmt);
-+    snd_pcm_hw_params_set_channels(pcm_handle, hwparams, nch);
-+    snd_pcm_hw_params_set_rate(pcm_handle, hwparams, rate, 0);
-+
-+    err = snd_pcm_hw_params(pcm_handle, hwparams);
-+    if (err < 0)
-+    {
-+        _ERROR("snd_pcm_hw_params failed: %s", snd_strerror(err));
-+        return -1;
-+    }
++    CHECK_FAIL (snd_pcm_hw_params_set_access (pcm_handle, hwparams,
++     SND_PCM_ACCESS_RW_INTERLEAVED), "snd_pcm_hw_params_set_access");
++    CHECK_FAIL (snd_pcm_hw_params_set_format (pcm_handle, hwparams, afmt),
++     "snd_pcm_hw_params_set_format");
++    CHECK_FAIL (snd_pcm_hw_params_set_channels (pcm_handle, hwparams, nch),
++     "snd_pcm_hw_params_set_channels");
++    CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
++     "snd_pcm_hw_params_set_rate");
++    CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
 +
 +    bitwidth = snd_pcm_format_physical_width(afmt);
 +    bps = (rate * bitwidth * nch) >> 3;
-+    ringbuf_size = aud_cfg->output_buffer_size * bps / 1000;
++
++    buf_size = MAX(aud_cfg->output_buffer_size, 100);
++    ringbuf_size = buf_size * bps / 1000;
++
 +    if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
 +        _ERROR("alsaplug_ringbuffer_init failed");
 +        return -1;
 +    }
 +    pcm_going = TRUE;
 +    flush_request = -1;
++    paused = FALSE;
 +
 +    audio_thread = g_thread_create(alsaplug_loop, NULL, TRUE, NULL);
 +    return 1;
@@ -1029,9 +1042,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
 +SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist);
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-debug.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-debug.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-debug.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-debug.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-debug.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-debug.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,36 @@
 +/*
 + *  Copyright (C) 2005 Ralf Ertzinger
@@ -1069,9 +1082,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +#endif
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.h audacious-plugins-fedora-1.5.1/src/alsa/alsa.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.h	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa.h	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,79 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *  Copyright (C) 2001-2003 Matthieu Sozeau
@@ -1152,9 +1165,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -extern GStaticMutex alsa_mutex;
 -
 -#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.c	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.c	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,366 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
@@ -1522,9 +1535,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +    _LEAVE;
 +}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,58 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
@@ -1584,9 +1597,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +void alsaplug_ringbuffer_destroy(alsaplug_ringbuf_t* rb);
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-stdinc.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-stdinc.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-stdinc.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-stdinc.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-stdinc.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-stdinc.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-stdinc.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
@@ -1624,9 +1637,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +#include "alsa-ringbuffer.h"
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-types.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-types.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-types.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-types.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-types.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-types.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-types.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
@@ -1668,9 +1681,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +extern alsaplug_cfg_t alsaplug_cfg;
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-util.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-util.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-util.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-util.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-util.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-util.c	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-util.c	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,55 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
@@ -1727,9 +1740,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +    return SND_PCM_FORMAT_UNKNOWN;
 +}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/audio.c audacious-plugins-fedora-1.5.1/src/alsa/audio.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/audio.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/audio.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/audio.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/audio.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/audio.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,978 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *  Copyright (C) 2001-2003 Matthieu Sozeau <mattam at altern.org>
@@ -2709,9 +2722,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -	(*rate) = inputf->rate;
 -	(*nch) = inputf->channels;
 -}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/configure.c audacious-plugins-fedora-1.5.1/src/alsa/configure.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/configure.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/configure.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/configure.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/configure.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/configure.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,396 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *  Copyright (C) 2001-2003 Matthieu Sozeau <mattam at altern.org>
@@ -3109,9 +3122,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -
 -	gtk_widget_show_all(configure_win);
 -}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/Makefile audacious-plugins-fedora-1.5.1/src/alsa/Makefile
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/Makefile audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/Makefile
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/Makefile	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/Makefile	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/Makefile	2009-09-19 12:30:59.000000000 +0200
 @@ -1,9 +1,9 @@
  PLUGIN = ALSA${PLUGIN_SUFFIX}
  
@@ -3126,9 +3139,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
  
  include ../../buildsys.mk
  include ../../extra.mk
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/TODO audacious-plugins-fedora-1.5.1/src/alsa/TODO
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/TODO audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/TODO
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/TODO	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/TODO	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/TODO	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,30 @@
 +The following things are not implemented yet:
 +

audacious-plugins-1.5.1-alsaplug-id.patch:
 alsa-configure.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: audacious-plugins-1.5.1-alsaplug-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins-1.5.1-alsaplug-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-1.5.1-alsaplug-id.patch	29 Jun 2009 19:06:50 -0000	1.1
+++ audacious-plugins-1.5.1-alsaplug-id.patch	19 Sep 2009 14:06:53 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-configure.c audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-configure.c
---- audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-configure.c	2009-06-29 18:01:20.000000000 +0200
-+++ audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-configure.c	2009-06-29 20:24:34.000000000 +0200
+diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c audacious-plugins-fedora-1.5.1-alsa-ng-plugid/src/alsa/alsa-configure.c
+--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c	2009-09-16 00:57:07.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng-plugid/src/alsa/alsa-configure.c	2009-09-19 12:50:35.118611192 +0200
 @@ -46,18 +46,18 @@
  
  	/* Save configuration */

audacious-plugins-1.5.1-mixer-not-ready.patch:
 alsa-core.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: audacious-plugins-1.5.1-mixer-not-ready.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins-1.5.1-mixer-not-ready.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-plugins-1.5.1-mixer-not-ready.patch	2 Jul 2009 09:20:40 -0000	1.2
+++ audacious-plugins-1.5.1-mixer-not-ready.patch	19 Sep 2009 14:06:53 -0000	1.3
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-core.c
---- audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-06-29 18:01:20.000000000 +0200
-+++ audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-core.c	2009-07-02 10:45:48.000000000 +0200
+diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c
+--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c	2009-09-19 12:54:29.476615457 +0200
 @@ -45,6 +45,7 @@
  
  static snd_mixer_t *amixer = NULL;
@@ -27,12 +27,16 @@ diff -Nur audacious-plugins-1.5.1-alsa-n
      if (elem == NULL)
          return;
  
-@@ -172,6 +177,8 @@
- {
+@@ -173,10 +178,10 @@
      snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
+     long left, right;
  
 +    *l = mixer_left;
 +    *r = mixer_right;
      if (elem == NULL)
+     {
+-        * l = 50;
+-        * r = 50;
          return;
+     }
  


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- audacious-plugins.spec	2 Jul 2009 09:20:40 -0000	1.38
+++ audacious-plugins.spec	19 Sep 2009 14:06:53 -0000	1.39
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -27,10 +27,12 @@ Patch6:         audacious-plugins-1.5.1-
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 
-# alsa-ng plugin from 2.1 devel
+# alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
 Patch51: audacious-plugins-1.5.1-alsaplug-id.patch
 Patch52: audacious-plugins-1.5.1-mixer-not-ready.patch
+# fight snd_pcm_writei underruns
+Patch53: audacious-plugins-1.5.1-underruns.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -178,6 +180,7 @@ vortex compressed files.
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
+%patch53 -p1 -b .underruns
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -272,6 +275,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Sep 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
+- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
+- Merge minor changes from 2.2 alpha1 alsa-ng plugin.
+
 * Thu Jul  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
 - Prevent alsalib mixer crash if mixer isn't ready.
 



From pbrobinson at fedoraproject.org  Sat Sep 19 14:24:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 14:24:53 +0000 (UTC)
Subject: rpms/hornsey/devel .cvsignore, 1.2, 1.3 hornsey.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 hornsey-bognorregis-0.4.10.patch, 1.1, NONE import.log,
	1.1, NONE
Message-ID: <20090919142453.B77A311C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hornsey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29632

Modified Files:
	.cvsignore hornsey.spec sources 
Removed Files:
	hornsey-bognorregis-0.4.10.patch import.log 
Log Message:
- New upstream 0.4 release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Sep 2009 20:30:32 -0000	1.2
+++ .cvsignore	19 Sep 2009 14:24:51 -0000	1.3
@@ -1 +1 @@
-hornsey-0.3.tar.bz2
+hornsey-0.4.tar.bz2


Index: hornsey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/hornsey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hornsey.spec	3 Sep 2009 20:30:32 -0000	1.1
+++ hornsey.spec	19 Sep 2009 14:24:51 -0000	1.2
@@ -1,13 +1,14 @@
 Name:           hornsey
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        The moblin media player
 
 Group:          Applications/Multimedia
 License:        LGPLv2
 URL:            http://www.moblin.org/
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:         hornsey-bognorregis-0.4.10.patch
+# Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+# git archive --format=tar --prefix=hornsey-0.4/ ee968e8 | bzip2 > hornsey-0.4.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bickley-devel
@@ -35,7 +36,6 @@ Hornsey is a Image, Audio and Video medi
 
 %prep
 %setup -q
-%patch0 -p1 -b .bognorregis-0.4.10
 
 # Remove execute bit from the source files
 chmod -x src/hrn-texture-cache.*
@@ -82,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/dbus-1/services/org.moblin.Hornsey.service
 
 %changelog
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
+- New upstream 0.4 release.
+
 * Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
 - Updates from package review, add patch for bognor-regis 0.4.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Sep 2009 20:30:32 -0000	1.2
+++ sources	19 Sep 2009 14:24:51 -0000	1.3
@@ -1 +1 @@
-1e959a8b2a70f059b502e05fe2c90687  hornsey-0.3.tar.bz2
+ee677e4b8b421ed6093c66229630d4f7  hornsey-0.4.tar.bz2


--- hornsey-bognorregis-0.4.10.patch DELETED ---


--- import.log DELETED ---



From scop at fedoraproject.org  Sat Sep 19 14:32:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Sep 2009 14:32:33 +0000 (UTC)
Subject: rpms/mailcap/devel .cvsignore, 1.26, 1.27 mailcap.spec, 1.33,
	1.34 sources, 1.26, 1.27 COPYING, 1.1, NONE
Message-ID: <20090919143233.97C3F11C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mailcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32299

Modified Files:
	.cvsignore mailcap.spec sources 
Removed Files:
	COPYING 
Log Message:
* Sat Sep 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.30-1
- Update to 2.1.30, see NEWS for details.
- Improve summary and description.
- Add MIT to License: for mailcap.4 man page.
- Specfile cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mailcap/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	15 Dec 2008 14:47:59 -0000	1.26
+++ .cvsignore	19 Sep 2009 14:32:33 -0000	1.27
@@ -1 +1 @@
-mailcap-2.1.29.tar.gz
+mailcap-2.1.30.tar.gz


Index: mailcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailcap/devel/mailcap.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mailcap.spec	25 Jul 2009 11:39:30 -0000	1.33
+++ mailcap.spec	19 Sep 2009 14:32:33 -0000	1.34
@@ -1,45 +1,63 @@
-Summary: Associates helper applications with particular file types
-Name: mailcap
-Version: 2.1.29
-Release: 3%{?dist}
-License: Public Domain
-Group: System Environment/Base
-Source0: https://fedorahosted.org/releases/m/a/mailcap/%{name}-%{version}.tar.gz
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           mailcap
+Version:        2.1.30
+Release:        1%{?dist}
+Summary:        Helper application and MIME type associations for file types
+
+Group:          System Environment/Base
+License:        Public Domain and MIT
+URL:            http://git.fedoraproject.org/git/mailcap.git
+Source0:        https://fedorahosted.org/released/mailcap/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 %description
 The mailcap file is used by the metamail program.  Metamail reads the
 mailcap file to determine how it should display non-text or multimedia
 material.  Basically, mailcap associates a particular type of file
 with a particular program that a mail agent or other program can call
-in order to handle the file.
+in order to handle the file.  Mailcap should be installed to allow
+certain programs to be able to handle non-text files.
+
+Also included in this package is the mime.types file which contains a
+list of MIME types and their filename "extension" associations, used
+by several applications e.g. to determine MIME types for filenames.
 
-Mailcap should be installed to allow certain programs to be able to
-handle non-text files.
 
 %prep
 %setup -q
 
+
 %build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 644 mailcap mime.types $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man4
-install -p -m 644 mailcap.4 $RPM_BUILD_ROOT%{_mandir}/man4
+make install DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} mandir=%{_mandir}
+
+
+%check
+make check
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
+%doc COPYING NEWS
 %config(noreplace) %{_sysconfdir}/mailcap
 %config(noreplace) %{_sysconfdir}/mime.types
 %{_mandir}/man4/mailcap.*
 
+
 %changelog
+* Sat Sep 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.30-1
+- Update to 2.1.30, see NEWS for details.
+- Improve summary and description.
+- Add MIT to License: for mailcap.4 man page.
+- Specfile cleanup.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.29-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mailcap/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	15 Dec 2008 14:47:59 -0000	1.26
+++ sources	19 Sep 2009 14:32:33 -0000	1.27
@@ -1 +1 @@
-cf60f7b3db605b4029b99bcb2966b9be  mailcap-2.1.29.tar.gz
+904ba32dedb36d8432943e8aaa5653fa  mailcap-2.1.30.tar.gz


--- COPYING DELETED ---



From scop at fedoraproject.org  Sat Sep 19 14:41:16 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Sep 2009 14:41:16 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.151,1.152
Message-ID: <20090919144116.24AAD11C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2722

Modified Files:
	subversion.spec 
Log Message:
Add %defattr to -gnome and -kde (#496456).


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- subversion.spec	23 Aug 2009 08:54:49 -0000	1.151
+++ subversion.spec	19 Sep 2009 14:41:15 -0000	1.152
@@ -286,9 +286,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %exclude %{_mandir}/man*/*::*
 
 %files gnome
+%defattr(-,root,root)
 %{_libdir}/libsvn_auth_gnome_keyring-*.so.*
 
 %files kde
+%defattr(-,root,root)
 %{_libdir}/libsvn_auth_kwallet-*.so.*
 
 %files devel
@@ -327,6 +329,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sat Sep 19 2009 Ville Skytt? <ville.skytta at iki.fi>
+- Add %%defattr to -gnome and -kde.
+
 * Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
 - update to 1.6.5
 



From scop at fedoraproject.org  Sat Sep 19 14:50:14 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Sep 2009 14:50:14 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.152,1.153
Message-ID: <20090919145015.0E2B111C0336@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5027

Modified Files:
	subversion.spec 
Log Message:
Ship bash completion (#496456).


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- subversion.spec	19 Sep 2009 14:41:15 -0000	1.152
+++ subversion.spec	19 Sep 2009 14:50:13 -0000	1.153
@@ -231,6 +231,10 @@ sed -i "/^dependency_libs/{
      s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Install bash completion
+install -Dpm 644 tools/client-side/bash_completion \
+        $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
+
 %find_lang %{name}
 
 %if %{make_check}
@@ -278,6 +282,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/libsvn
 %{_datadir}/emacs/site-lisp/*.el
 %{_datadir}/xemacs/site-packages/lisp/*.el
+%{_sysconfdir}/bash_completion.d
 %dir %{_sysconfdir}/subversion
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
@@ -330,6 +335,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
 * Sat Sep 19 2009 Ville Skytt? <ville.skytta at iki.fi>
+- Ship bash completion (#496456).
 - Add %%defattr to -gnome and -kde.
 
 * Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1



From hadess at fedoraproject.org  Sat Sep 19 14:52:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 19 Sep 2009 14:52:40 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.20,
	1.21 gnome-bluetooth.spec, 1.91, 1.92 sources, 1.21,
	1.22 0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch,
	1.1, NONE 0001-Fix-pairing-with-devices-that-require-PIN-entry.patch, 
	1.1, NONE
Message-ID: <20090919145240.DE73D11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Removed Files:
	0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch 
	0001-Fix-pairing-with-devices-that-require-PIN-entry.patch 
Log Message:
* Sat Sep 19 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	2 Sep 2009 14:41:07 -0000	1.20
+++ .cvsignore	19 Sep 2009 14:52:40 -0000	1.21
@@ -1 +1 @@
-gnome-bluetooth-2.27.90.tar.bz2
+gnome-bluetooth-2.28.0.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- gnome-bluetooth.spec	11 Sep 2009 14:02:59 -0000	1.91
+++ gnome-bluetooth.spec	19 Sep 2009 14:52:40 -0000	1.92
@@ -1,12 +1,12 @@
 Name:		gnome-bluetooth
-Version:	2.27.90
-Release:	3%{?dist}
+Version:	2.28.0
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/GnomeBluetooth
-Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.28/gnome-bluetooth-%{version}.tar.bz2
 Source1:	61-gnome-bluetooth-rfkill.rules
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,10 +34,6 @@ Requires:	pulseaudio-module-bluetooth
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=594055
-Patch0:		0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch
-Patch1:		0001-Fix-pairing-with-devices-that-require-PIN-entry.patch
-
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -67,8 +63,6 @@ for writing applications that require a 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
 
-%patch0 -p1 -b .connect
-
 %build
 %configure --disable-desktop-update --disable-icon-update
 make %{?_smp_mflags}
@@ -200,6 +194,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Sat Sep 19 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Fri Sep 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-3
 - Fix possible pairing failure
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	2 Sep 2009 14:41:08 -0000	1.21
+++ sources	19 Sep 2009 14:52:40 -0000	1.22
@@ -1 +1 @@
-c58e676d6e95384ba27bde814a5a84bb  gnome-bluetooth-2.27.90.tar.bz2
+0d10dbdb53d302aa3e34e391ef6b142b  gnome-bluetooth-2.28.0.tar.bz2


--- 0001-Bug-594055-applet-fails-to-connect-to-any-disconn.patch DELETED ---


--- 0001-Fix-pairing-with-devices-that-require-PIN-entry.patch DELETED ---



From mbooth at fedoraproject.org  Sat Sep 19 14:53:24 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Sat, 19 Sep 2009 14:53:24 +0000 (UTC)
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.20,1.21
Message-ID: <20090919145324.20D8611C00E6@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-emf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6109/eclipse-emf/devel

Modified Files:
	eclipse-emf.spec 
Log Message:
* Sat Sep 19 2009 Mat Booth <fedora at matbooth.co.uk> - 2.5.0-4
- Re-enable jar repacking now that RHBZ #461854 has been resolved.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- eclipse-emf.spec	24 Jul 2009 20:53:47 -0000	1.20
+++ eclipse-emf.spec	19 Sep 2009 14:53:23 -0000	1.21
@@ -1,10 +1,9 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global _brp_repack_jars %{nil}
 
 Name:      eclipse-emf
 Version:   2.5.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -206,6 +205,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.emf.examples-feature/rootfiles/*
 
 %changelog
+* Sat Sep 19 2009 Mat Booth <fedora at matbooth.co.uk> - 2.5.0-4
+- Re-enable jar repacking now that RHBZ #461854 has been resolved.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Sat Sep 19 14:54:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 19 Sep 2009 14:54:26 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-underruns.patch,
	NONE, 1.1 audacious-plugins-1.5.1-alsa-ng.patch, 1.1,
	1.2 audacious-plugins-1.5.1-alsaplug-id.patch, 1.1,
	1.2 audacious-plugins-1.5.1-mixer-not-ready.patch, 1.2,
	1.3 audacious-plugins.spec, 1.36, 1.37
Message-ID: <20090919145426.03CBB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6485

Modified Files:
	audacious-plugins-1.5.1-alsa-ng.patch 
	audacious-plugins-1.5.1-alsaplug-id.patch 
	audacious-plugins-1.5.1-mixer-not-ready.patch 
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-underruns.patch 
Log Message:
* Sat Sep 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
- Merge minor changes from 2.2 alpha1 alsa-ng plugin.


audacious-plugins-1.5.1-underruns.patch:
 alsa-core.c |   39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-underruns.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c
--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c	2009-09-19 15:52:28.000000000 +0200
@@ -27,6 +27,10 @@
 static gboolean pcm_going = FALSE;
 static GThread *audio_thread = NULL;
 static gint bps;
+static gint loopbufsize = 384000;
+static gint looppostsize = 2048;
+static gint looppresize;
+static gboolean prefill = TRUE;
 
 static gsize wr_total = 0;
 static gsize wr_hwframes = 0;
@@ -219,6 +228,9 @@
         }
         else
         {
+            if (wr_frames == -EPIPE) {
+                prefill = TRUE;
+            }
             gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
 
             _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
@@ -235,7 +247,7 @@
 static gpointer
 alsaplug_loop(gpointer unused)
 {
-    guchar buf[2048];
+    guchar buf[loopbufsize];
     int size;
 
     while (pcm_going)
@@ -245,6 +257,7 @@
         if (flush_request != -1)
         {
             alsaplug_ringbuffer_reset (& pcm_ringbuf);
+            prefill = TRUE;
             snd_pcm_drop(pcm_handle);
             snd_pcm_prepare(pcm_handle);
             wr_total = flush_request * (long long) bps / 1000;
@@ -262,12 +275,25 @@
             continue;
         }
 
-        if (size > sizeof buf)
-            size = sizeof buf;
+        if (prefill) {
+            if (size > loopbufsize)
+                size = loopbufsize;
+
+            if (size >= looppresize) {
+                alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+                prefill = FALSE;
+            }
+        }
+        else {
+            if (size > looppostsize)
+                size = looppostsize;
 
-        alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+            alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+        }
         g_mutex_unlock (pcm_state_mutex);
-        alsaplug_write_buffer (buf, size);
+        if (!prefill) {
+            alsaplug_write_buffer (buf, size);
+        }
     }
 
     snd_pcm_drain(pcm_handle);
@@ -362,6 +388,13 @@
         _ERROR("alsaplug_ringbuffer_init failed");
         return -1;
     }
+    if (loopbufsize >= ringbuf_size) {
+        looppresize = ringbuf_size/2;
+    }
+    else {
+        looppresize = loopbufsize;
+    }
+    prefill = TRUE;
     pcm_going = TRUE;
     flush_request = -1;
     paused = FALSE;
@@ -504,6 +537,7 @@
 {
     g_mutex_lock (pcm_state_mutex);
     paused = p;
+    prefill = !paused;
     g_cond_broadcast (pcm_state_cond);
     g_mutex_unlock (pcm_state_mutex);
 }

audacious-plugins-1.5.1-alsa-ng.patch:
 Makefile          |    8 
 TODO              |   30 +
 about.c           |   49 --
 alsa-configure.c  |  345 +++++++++++++++++++
 alsa-core.c       |  534 +++++++++++++++++++++++++++++
 alsa-debug.h      |   36 +
 alsa-ringbuffer.c |  366 ++++++++++++++++++++
 alsa-ringbuffer.h |   58 +++
 alsa-stdinc.h     |   36 +
 alsa-types.h      |   40 ++
 alsa-util.c       |   55 +++
 alsa.c            |  100 -----
 alsa.h            |   79 ----
 audio.c           |  978 ------------------------------------------------------
 configure.c       |  396 ---------------------
 15 files changed, 1504 insertions(+), 1606 deletions(-)

Index: audacious-plugins-1.5.1-alsa-ng.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins-1.5.1-alsa-ng.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-1.5.1-alsa-ng.patch	29 Jun 2009 16:17:07 -0000	1.1
+++ audacious-plugins-1.5.1-alsa-ng.patch	19 Sep 2009 14:54:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/about.c audacious-plugins-fedora-1.5.1/src/alsa/about.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/about.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/about.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/about.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/about.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/about.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,49 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *    Copyright (C) 2001-2003 Matthieu Sozeau <mattam at altern.org>
@@ -51,9 +51,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -			   GTK_SIGNAL_FUNC(gtk_widget_destroyed),
 -			   &dialog);
 -}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.c audacious-plugins-fedora-1.5.1/src/alsa/alsa.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,100 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *    Copyright (C) 2001 Matthieu Sozeau
@@ -155,10 +155,10 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
 -
 -DECLARE_PLUGIN(alsa, NULL, NULL, NULL, alsa_oplist, NULL, NULL, NULL, NULL)
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-configure.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-configure.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-configure.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-configure.c	2009-06-29 18:01:20.000000000 +0200
-@@ -0,0 +1,355 @@
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c	2009-09-16 00:57:07.000000000 +0200
+@@ -0,0 +1,345 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
 + * Copyright (c) 2009 William Pitcock <nenolod at dereferenced.org>
@@ -406,8 +406,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +void alsaplug_configure(void)
 +{
-+	GtkWidget *vbox, *notebook;
-+	GtkWidget *dev_vbox, *adevice_frame, *adevice_box;
++        GtkWidget * vbox, * adevice_frame, * adevice_box;
 +	GtkWidget *mixer_frame, *mixer_box, *mixer_table, *mixer_card_om;
 +	GtkWidget *mixer_card_label, *mixer_device_label;
 +	GtkWidget *bbox, *ok, *cancel;
@@ -420,31 +419,25 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +		return;
 +	}
 +
-+	configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-+	gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
-+			   GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-+			   &configure_win);
-+	gtk_window_set_title(GTK_WINDOW(configure_win),
-+			     _("ALSA Driver configuration"));
-+	gtk_window_set_policy(GTK_WINDOW(configure_win),
-+			      FALSE, TRUE, FALSE);
-+	gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
-+
-+	vbox = gtk_vbox_new(FALSE, 10);
-+	gtk_container_add(GTK_CONTAINER(configure_win), vbox);
-+
-+	notebook = gtk_notebook_new();
-+	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-+
-+	dev_vbox = gtk_vbox_new(FALSE, 5);
-+	gtk_container_set_border_width(GTK_CONTAINER(dev_vbox), 5);
-+
-+	adevice_frame = gtk_frame_new(_("Audio device:"));
-+	gtk_box_pack_start(GTK_BOX(dev_vbox), adevice_frame, FALSE, FALSE, 0);
-+
-+	adevice_box = gtk_vbox_new(FALSE, 5);
-+	gtk_container_set_border_width(GTK_CONTAINER(adevice_box), 5);
-+	gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_box);
++        configure_win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
++        gtk_window_set_title ((GtkWindow *) configure_win, _("ALSA Output "
++         "Plugin Preferences"));
++        gtk_window_set_type_hint ((GtkWindow *) configure_win,
++         GDK_WINDOW_TYPE_HINT_DIALOG);
++        gtk_window_set_resizable ((GtkWindow *) configure_win, FALSE);
++        gtk_container_set_border_width ((GtkContainer *) configure_win, 6);
++        g_signal_connect ((GObject *) configure_win, "destroy", (GCallback)
++         gtk_widget_destroyed, & configure_win);
++
++        vbox = gtk_vbox_new (FALSE, 6);
++        gtk_container_add ((GtkContainer *) configure_win, vbox);
++
++        adevice_frame = gtk_frame_new (_("Device:"));
++        gtk_box_pack_start ((GtkBox *) vbox, adevice_frame, FALSE, FALSE, 0);
++
++        adevice_box = gtk_vbox_new (FALSE, 6);
++        gtk_container_set_border_width ((GtkContainer *) adevice_box, 6);
++        gtk_container_add ((GtkContainer *) adevice_frame, adevice_box);
 +
 +	devices_combo = gtk_combo_new();
 +	gtk_box_pack_start(GTK_BOX(adevice_box), devices_combo,
@@ -453,12 +446,12 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(devices_combo)->entry),
 +			   alsaplug_cfg.pcm_device);
 +
-+	mixer_frame = gtk_frame_new(_("Mixer:"));
-+	gtk_box_pack_start(GTK_BOX(dev_vbox), mixer_frame, FALSE, FALSE, 0);
++        mixer_frame = gtk_frame_new (_("Mixer:"));
++        gtk_box_pack_start ((GtkBox *) vbox, mixer_frame, FALSE, FALSE, 0);
 +
-+	mixer_box = gtk_vbox_new(FALSE, 5);
-+	gtk_container_set_border_width(GTK_CONTAINER(mixer_box), 5);
-+	gtk_container_add(GTK_CONTAINER(mixer_frame), mixer_box);
++        mixer_box = gtk_vbox_new (FALSE, 6);
++        gtk_container_set_border_width ((GtkContainer *) mixer_box, 6);
++        gtk_container_add ((GtkContainer *) mixer_frame, mixer_box);
 +
 +	mixer_table = gtk_table_new(2, 2, FALSE);
 +	gtk_table_set_row_spacings(GTK_TABLE(mixer_table), 5);
@@ -492,9 +485,6 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +	gtk_table_attach(GTK_TABLE(mixer_table), mixer_devices_combo,
 +			 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 +
-+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dev_vbox,
-+				 gtk_label_new(_("Device settings")));
-+
 +	bbox = gtk_hbutton_box_new();
 +	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 +	gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
@@ -514,10 +504,10 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +	gtk_widget_show_all(configure_win);
 +}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-core.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-core.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-core.c	2009-06-29 18:01:20.000000000 +0200
-@@ -0,0 +1,511 @@
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
+@@ -0,0 +1,534 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
 + * Copyright (c) 2009 William Pitcock <nenolod at dereferenced.org>
@@ -591,7 +581,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +static snd_mixer_elem_t *
 +alsaplug_guess_mixer_elem(snd_mixer_t *mixer)
 +{
-+    gchar *elem_names[] = { "Wave", "PCM", "Front", "Master" };
++    gchar *elem_names[] = {"PCM", "Wave", "Front", "Master"};
 +    gint i;
 +    snd_mixer_elem_t *elem;
 +
@@ -691,25 +681,30 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +alsaplug_get_volume(gint *l, gint *r)
 +{
 +    snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
++    long left, right;
 +
 +    if (elem == NULL)
++    {
++        * l = 50;
++        * r = 50;
 +        return;
++    }
 +
 +    snd_mixer_handle_events(amixer);
 +
-+    *l = 0;
-+    *r = 0;
-+
 +    if (snd_mixer_selem_is_playback_mono(elem))
 +    {
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) l);
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) r);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, & left);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, & right);
 +    }
 +    else
 +    {
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, (glong *) l);
-+        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, (glong *) r);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, & left);
++        snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, & right);
 +    }
++
++    * l = left;
++    * r = right;
 +}
 +
 +/********************************************************************************
@@ -735,10 +730,14 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +        else
 +        {
 +            gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
-+            if (err < 0)
-+                _ERROR("(write) snd_pcm_recover: %s", snd_strerror(err));
 +
-+            return;
++            _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
++
++            if (err < 0)
++            {
++                _ERROR ("snd_pcm_recover error: %s", snd_strerror (err));
++                return;
++            }
 +        }
 +    }
 +}
@@ -815,10 +814,22 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +    /*    return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;*/
 +}
 +
++#define CHECK_FAIL(expression, name) \
++{ \
++    gint error = expression; \
++    if (error) \
++    { \
++        _ERROR (name " failed: %s.\n", snd_strerror (error)); \
++        snd_pcm_close (pcm_handle); \
++        pcm_handle = NULL; \
++        return -1; \
++    } \
++}
++
 +static gint
 +alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
 +{
-+    gint err, bitwidth, ringbuf_size;
++    gint err, bitwidth, ringbuf_size, buf_size;
 +    snd_pcm_format_t afmt;
 +    snd_pcm_hw_params_t *hwparams = NULL;
 +
@@ -841,27 +852,29 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +    snd_pcm_hw_params_alloca(&hwparams);
 +    snd_pcm_hw_params_any(pcm_handle, hwparams);
-+    snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
-+    snd_pcm_hw_params_set_format(pcm_handle, hwparams, afmt);
-+    snd_pcm_hw_params_set_channels(pcm_handle, hwparams, nch);
-+    snd_pcm_hw_params_set_rate(pcm_handle, hwparams, rate, 0);
-+
-+    err = snd_pcm_hw_params(pcm_handle, hwparams);
-+    if (err < 0)
-+    {
-+        _ERROR("snd_pcm_hw_params failed: %s", snd_strerror(err));
-+        return -1;
-+    }
++    CHECK_FAIL (snd_pcm_hw_params_set_access (pcm_handle, hwparams,
++     SND_PCM_ACCESS_RW_INTERLEAVED), "snd_pcm_hw_params_set_access");
++    CHECK_FAIL (snd_pcm_hw_params_set_format (pcm_handle, hwparams, afmt),
++     "snd_pcm_hw_params_set_format");
++    CHECK_FAIL (snd_pcm_hw_params_set_channels (pcm_handle, hwparams, nch),
++     "snd_pcm_hw_params_set_channels");
++    CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
++     "snd_pcm_hw_params_set_rate");
++    CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
 +
 +    bitwidth = snd_pcm_format_physical_width(afmt);
 +    bps = (rate * bitwidth * nch) >> 3;
-+    ringbuf_size = aud_cfg->output_buffer_size * bps / 1000;
++
++    buf_size = MAX(aud_cfg->output_buffer_size, 100);
++    ringbuf_size = buf_size * bps / 1000;
++
 +    if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
 +        _ERROR("alsaplug_ringbuffer_init failed");
 +        return -1;
 +    }
 +    pcm_going = TRUE;
 +    flush_request = -1;
++    paused = FALSE;
 +
 +    audio_thread = g_thread_create(alsaplug_loop, NULL, TRUE, NULL);
 +    return 1;
@@ -1029,9 +1042,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
 +SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist);
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-debug.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-debug.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-debug.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-debug.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-debug.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-debug.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,36 @@
 +/*
 + *  Copyright (C) 2005 Ralf Ertzinger
@@ -1069,9 +1082,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +#endif
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.h audacious-plugins-fedora-1.5.1/src/alsa/alsa.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa.h	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa.h	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,79 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *  Copyright (C) 2001-2003 Matthieu Sozeau
@@ -1152,9 +1165,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -extern GStaticMutex alsa_mutex;
 -
 -#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.c	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.c	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,366 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
@@ -1522,9 +1535,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +    _LEAVE;
 +}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-ringbuffer.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-ringbuffer.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-ringbuffer.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,58 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
@@ -1584,9 +1597,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +void alsaplug_ringbuffer_destroy(alsaplug_ringbuf_t* rb);
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-stdinc.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-stdinc.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-stdinc.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-stdinc.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-stdinc.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-stdinc.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-stdinc.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
@@ -1624,9 +1637,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +#include "alsa-ringbuffer.h"
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-types.h audacious-plugins-fedora-1.5.1/src/alsa/alsa-types.h
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-types.h audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-types.h
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-types.h	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-types.h	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-types.h	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
@@ -1668,9 +1681,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +extern alsaplug_cfg_t alsaplug_cfg;
 +
 +#endif
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-util.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-util.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-util.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-util.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/alsa-util.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-util.c	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-util.c	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,55 @@
 +/*
 + * Audacious ALSA Plugin (-ng)
@@ -1727,9 +1740,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 +
 +    return SND_PCM_FORMAT_UNKNOWN;
 +}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/audio.c audacious-plugins-fedora-1.5.1/src/alsa/audio.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/audio.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/audio.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/audio.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/audio.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/audio.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,978 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *  Copyright (C) 2001-2003 Matthieu Sozeau <mattam at altern.org>
@@ -2709,9 +2722,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -	(*rate) = inputf->rate;
 -	(*nch) = inputf->channels;
 -}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/configure.c audacious-plugins-fedora-1.5.1/src/alsa/configure.c
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/configure.c audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/configure.c
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/configure.c	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/configure.c	1970-01-01 01:00:00.000000000 +0100
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/configure.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,396 +0,0 @@
 -/*  XMMS - ALSA output plugin
 - *  Copyright (C) 2001-2003 Matthieu Sozeau <mattam at altern.org>
@@ -3109,9 +3122,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
 -
 -	gtk_widget_show_all(configure_win);
 -}
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/Makefile audacious-plugins-fedora-1.5.1/src/alsa/Makefile
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/Makefile audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/Makefile
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/Makefile	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/alsa/Makefile	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/Makefile	2009-09-19 12:30:59.000000000 +0200
 @@ -1,9 +1,9 @@
  PLUGIN = ALSA${PLUGIN_SUFFIX}
  
@@ -3126,9 +3139,9 @@ diff -Nur audacious-plugins-fedora-1.5.1
  
  include ../../buildsys.mk
  include ../../extra.mk
-diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/TODO audacious-plugins-fedora-1.5.1/src/alsa/TODO
+diff -Nur audacious-plugins-fedora-1.5.1-orig/src/alsa/TODO audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/TODO
 --- audacious-plugins-fedora-1.5.1-orig/src/alsa/TODO	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-1.5.1/src/alsa/TODO	2009-06-29 18:01:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/TODO	2009-09-19 12:30:59.000000000 +0200
 @@ -0,0 +1,30 @@
 +The following things are not implemented yet:
 +

audacious-plugins-1.5.1-alsaplug-id.patch:
 alsa-configure.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: audacious-plugins-1.5.1-alsaplug-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins-1.5.1-alsaplug-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-1.5.1-alsaplug-id.patch	29 Jun 2009 19:05:23 -0000	1.1
+++ audacious-plugins-1.5.1-alsaplug-id.patch	19 Sep 2009 14:54:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-configure.c audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-configure.c
---- audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-configure.c	2009-06-29 18:01:20.000000000 +0200
-+++ audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-configure.c	2009-06-29 20:24:34.000000000 +0200
+diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c audacious-plugins-fedora-1.5.1-alsa-ng-plugid/src/alsa/alsa-configure.c
+--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-configure.c	2009-09-16 00:57:07.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng-plugid/src/alsa/alsa-configure.c	2009-09-19 12:50:35.118611192 +0200
 @@ -46,18 +46,18 @@
  
  	/* Save configuration */

audacious-plugins-1.5.1-mixer-not-ready.patch:
 alsa-core.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: audacious-plugins-1.5.1-mixer-not-ready.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins-1.5.1-mixer-not-ready.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-plugins-1.5.1-mixer-not-ready.patch	2 Jul 2009 09:20:41 -0000	1.2
+++ audacious-plugins-1.5.1-mixer-not-ready.patch	19 Sep 2009 14:54:25 -0000	1.3
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-core.c
---- audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-06-29 18:01:20.000000000 +0200
-+++ audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-core.c	2009-07-02 10:45:48.000000000 +0200
+diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c
+--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c	2009-09-19 12:54:29.476615457 +0200
 @@ -45,6 +45,7 @@
  
  static snd_mixer_t *amixer = NULL;
@@ -27,12 +27,16 @@ diff -Nur audacious-plugins-1.5.1-alsa-n
      if (elem == NULL)
          return;
  
-@@ -172,6 +177,8 @@
- {
+@@ -173,10 +178,10 @@
      snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
+     long left, right;
  
 +    *l = mixer_left;
 +    *r = mixer_right;
      if (elem == NULL)
+     {
+-        * l = 50;
+-        * r = 50;
          return;
+     }
  


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- audacious-plugins.spec	2 Jul 2009 09:20:41 -0000	1.36
+++ audacious-plugins.spec	19 Sep 2009 14:54:25 -0000	1.37
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -27,10 +27,12 @@ Patch6:         audacious-plugins-1.5.1-
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 
-# alsa-ng plugin from 2.1 devel
+# alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
 Patch51: audacious-plugins-1.5.1-alsaplug-id.patch
 Patch52: audacious-plugins-1.5.1-mixer-not-ready.patch
+# fight snd_pcm_writei underruns
+Patch53: audacious-plugins-1.5.1-underruns.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -178,6 +180,7 @@ vortex compressed files.
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
+%patch53 -p1 -b .underruns
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -272,6 +275,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Sep 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
+- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
+- Merge minor changes from 2.2 alpha1 alsa-ng plugin.
+
 * Thu Jul  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
 - Prevent alsalib mixer crash if mixer isn't ready.
 



From scop at fedoraproject.org  Sat Sep 19 14:54:39 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Sep 2009 14:54:39 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.153,1.154
Message-ID: <20090919145439.0983311C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6607

Modified Files:
	subversion.spec 
Log Message:
Ship svn2cl (#496456).


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- subversion.spec	19 Sep 2009 14:50:13 -0000	1.153
+++ subversion.spec	19 Sep 2009 14:54:38 -0000	1.154
@@ -12,10 +12,12 @@
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%global svn2cl_version 0.11
+
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -123,6 +125,23 @@ Requires: ruby(abi) = 1.8
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
 
+%package svn2cl
+Group: Development/Tools
+Summary: Create a ChangeLog from a Subversion log
+License: BSD
+# -5: fake release for the Obsoletes to work
+Provides: svn2cl = %{svn2cl_version}-5
+Obsoletes: svn2cl < 0.11-4
+BuildArch: noarch
+Requires: libxslt
+Requires: subversion = %{version}
+
+%description svn2cl
+svn2cl is a simple XSL transformation and shell script wrapper for
+generating a classic GNU-style ChangeLog from a subversion repository
+log.  It is made from several changelog-like scripts using common XSLT
+constructs found in different places.
+
 %prep
 %setup -q
 %patch2 -p1 -b .deplibs
@@ -136,6 +155,16 @@ sed -i -e 's|-fpie|-fPIE|g' Makefile.in
 %endif
 %patch8 -p1 -b .kwallet
 
+sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
+        contrib/client-side/svn2cl/svn2cl.sh
+# Sanity check svn2cl_version
+v=$(contrib/client-side/svn2cl/svn2cl.sh -V | head -n 1 | awk '{ print $2 }')
+if [ "$v" != "%{svn2cl_version}" ]; then
+        echo -n "ERROR: svn2cl_version not up to date in specfile: "
+        echo "'$v' <> '%{svn2cl_version}'"
+        exit 1
+fi
+
 %build
 # Regenerate the buildsystem, so that:
 #  1) patches applied to configure.in take effect
@@ -231,6 +260,14 @@ sed -i "/^dependency_libs/{
      s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Install svn2cl
+pushd contrib/client-side/svn2cl
+install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/svn2cl
+install -pm 644 *.xsl $RPM_BUILD_ROOT%{_datadir}/svn2cl
+install -Dpm 644 svn2cl.1 $RPM_BUILD_ROOT%{_mandir}/man1/svn2cl.1
+popd
+
 # Install bash completion
 install -Dpm 644 tools/client-side/bash_completion \
         $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
@@ -333,9 +370,18 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_javadir}/svn-javahl.jar
 %endif
 
+%files svn2cl
+%defattr(-,root,root,-)
+%doc contrib/client-side/svn2cl/NEWS contrib/client-side/svn2cl/README
+%doc contrib/client-side/svn2cl/TODO contrib/client-side/svn2cl/authors.xml
+%doc contrib/client-side/svn2cl/svn2html.css
+%{_bindir}/svn2cl
+%{_datadir}/svn2cl/
+%{_mandir}/man1/svn2cl.1*
+
 %changelog
-* Sat Sep 19 2009 Ville Skytt? <ville.skytta at iki.fi>
-- Ship bash completion (#496456).
+* Sat Sep 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.5-2
+- Ship svn2cl and bash completion (#496456).
 - Add %%defattr to -gnome and -kde.
 
 * Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1



From pkgdb at fedoraproject.org  Sat Sep 19 15:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:25:50 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919152550.9EC3310F881@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on parrot (Fedora devel) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:25:58 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919152600.5353110F88C@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on parrot (Fedora devel) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:31:54 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153153.D485110F881@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on parrot (Fedora devel) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:33:17 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153306.5A8F310F888@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on parrot (Fedora 11) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:33:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:33:23 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153311.2DF3210F88C@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on parrot (Fedora 11) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:33:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:33:16 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153315.DCD0010F896@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on parrot (Fedora 11) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:33:29 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153328.D18D110F881@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on parrot (Fedora 10) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:33:44 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153333.0D28010F88C@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on parrot (Fedora 10) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:33:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:33:38 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090919153337.61B8510F897@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on parrot (Fedora 10) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Sat Sep 19 15:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:40:25 +0000
Subject: [pkgdb] rakudo had acl change status
Message-ID: <20090919154025.2E53C10F881@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on rakudo (Fedora devel) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Sat Sep 19 15:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:40:41 +0000
Subject: [pkgdb] rakudo had acl change status
Message-ID: <20090919154029.8D74410F88C@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on rakudo (Fedora devel) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Sat Sep 19 15:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:40:41 +0000
Subject: [pkgdb] rakudo had acl change status
Message-ID: <20090919154040.4452610F896@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on rakudo (Fedora devel) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Sat Sep 19 15:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:41:09 +0000
Subject: [pkgdb] rakudo had acl change status
Message-ID: <20090919154056.DB45F10F881@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on rakudo (Fedora 11) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Sat Sep 19 15:40:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:40:59 +0000
Subject: [pkgdb] rakudo had acl change status
Message-ID: <20090919154101.31A7D10F894@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on rakudo (Fedora 11) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pkgdb at fedoraproject.org  Sat Sep 19 15:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 15:41:05 +0000
Subject: [pkgdb] rakudo had acl change status
Message-ID: <20090919154105.0CD3C10F89C@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on rakudo (Fedora 11) to Approved for steve

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rakudo



From pbrobinson at fedoraproject.org  Sat Sep 19 16:01:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 16:01:14 +0000 (UTC)
Subject: rpms/xapian-core/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 xapian-core.spec, 1.26,
	1.27 xapian-core-1.0.9-includes.patch, 1.1, NONE
Message-ID: <20090919160114.A8EFD11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30011

Modified Files:
	.cvsignore sources xapian-core.spec 
Removed Files:
	xapian-core-1.0.9-includes.patch 
Log Message:
- Update to 1.0.16, some spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Aug 2009 17:22:37 -0000	1.14
+++ .cvsignore	19 Sep 2009 16:01:14 -0000	1.15
@@ -1 +1 @@
-xapian-core-1.0.15.tar.gz
+xapian-core-1.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Aug 2009 17:22:37 -0000	1.14
+++ sources	19 Sep 2009 16:01:14 -0000	1.15
@@ -1 +1 @@
-d851e661966fa0446cb46d7352c84a98  xapian-core-1.0.15.tar.gz
+19756e128d804faa6e7975a629ca3b70  xapian-core-1.0.16.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xapian-core.spec	27 Aug 2009 17:22:37 -0000	1.26
+++ xapian-core.spec	19 Sep 2009 16:01:14 -0000	1.27
@@ -1,17 +1,17 @@
-Summary: The Xapian Probabilistic Information Retrieval Library
-Name: xapian-core
-Version: 1.0.15
-Release: 1%{?dist}
-License: GPLv2+
-Group: Applications/Databases
-URL: http://www.xapian.org/
-Requires: %{name}-libs = %{version}
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0: multilib-devel-conflict-fix.patch
-Patch1: xapian-core-1.0.9-includes.patch
-BuildRequires: autoconf automake libtool
+Name:          xapian-core
+Version:       1.0.16
+Release:       1%{?dist}
+Summary:       The Xapian Probabilistic Information Retrieval Library
+
+Group:         Applications/Databases
+License:       GPLv2+
+URL:           http://www.xapian.org/
+Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0:        multilib-devel-conflict-fix.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      %{name}-libs = %{version}
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -19,8 +19,8 @@ offers a highly adaptable toolkit that a
 indexing and search facilities to applications
 
 %package libs
-Summary: Xapian search engine libraries
-Group: System Environment/Libraries
+Summary:       Xapian search engine libraries
+Group:         System Environment/Libraries
 
 %description libs
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -29,10 +29,10 @@ indexing and search facilities to applic
 libraries for applications using Xapian functionality
 
 %package devel
-Group: Development/Libraries
-Summary: Files needed for building packages which use Xapian
-Requires: %{name} = %{version}
-Requires: %{name}-libs = %{version}
+Group:         Development/Libraries
+Summary:       Files needed for building packages which use Xapian
+Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description devel
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -41,33 +41,27 @@ indexing and search facilities to applic
 files needed for building packages which use Xapian
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1 -b .multilibfix
-#%patch1 -p1 -b .includes
 
 %build
-# FC6 (at least) has a patched libtool which knows not to set rpath for
-# /usr/lib64, which upstream libtool fails to do currently.  We can drop
-# this "autoreconf --force" and the "BuildRequires:" for the autotools
-# once upstream libtool is fixed.  Note: this overwrites INSTALL, but
-# that doesn't matter here as we don't package it.
-autoreconf --force -i
 %configure --disable-static
-make %{?_smp_mflags}
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_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
+
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# makeinstall doesn't work properly with libtool built libraries
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Move the docs to the right place
-mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy HACKING now, as "%doc HACKING" would overwrite everything
-cp HACKING %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy the rest while we are in this directory
-mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
-cp AUTHORS ChangeLog COPYING NEWS PLATFORMS README %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %post libs -p /sbin/ldconfig
 
@@ -78,6 +72,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/xapian-check
 %{_bindir}/xapian-inspect
 %{_bindir}/xapian-tcpsrv
@@ -92,7 +87,6 @@ rm -rf %{buildroot}
 %{_bindir}/simplesearch
 %{_bindir}/simpleexpand
 %{_bindir}/xapian-compact
-%doc %{_datadir}/doc/%{name}-%{version}
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-check.1*
 %{_mandir}/man1/xapian-inspect.1*
@@ -112,16 +106,19 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-, root, root)
+%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
 %{_bindir}/xapian-config
 %{_includedir}/xapian
 %{_includedir}/xapian.h
 %{_libdir}/libxapian.so
 %{_datadir}/aclocal/xapian.m4
-%doc %{_datadir}/doc/%{name}-devel-%{version}
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
 * Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
 - Update to 1.0.15
 


--- xapian-core-1.0.9-includes.patch DELETED ---



From bochecha at fedoraproject.org  Sat Sep 19 16:01:23 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sat, 19 Sep 2009 16:01:23 +0000 (UTC)
Subject: rpms/openlayers/devel openlayers.spec,1.5,1.6
Message-ID: <20090919160123.5B70411C00E6@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/openlayers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29598

Modified Files:
	openlayers.spec 
Log Message:
Do not use the minimize tool to compress the JavaScript code, as it produces an invalid output.

This is temporary while upstream bug 2275 is fixed:
   http://trac.openlayers.org/ticket/2275




Index: openlayers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/devel/openlayers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openlayers.spec	13 Sep 2009 12:37:41 -0000	1.5
+++ openlayers.spec	19 Sep 2009 16:01:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      openlayers
 Version:   2.8
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A JavaScript library for displaying map data in web browsers
 Group:     Applications/Publishing
 License:   BSD
@@ -81,6 +81,10 @@ sed -i -e 's|\r||g' tools/exampleparser.
 # fix shebag
 find . -type f -exec sed -i -e 's/\#\!\/usr\/bin\/env python/\#\!\/usr\/bin\/python/' '{}' +
 
+# remove the minimize tool so that it is not used until upstream bug is fixed:
+#    http://trac.openlayers.org/ticket/2275
+rm tools/minimize.py
+
 
 %build
 pushd build
@@ -104,12 +108,14 @@ cp -rp tests %{buildroot}%{_datadir}/%{n
 install -d %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/BeautifulSoup.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/mergejs.py %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
+# don't install the minimize tool as it was removed in prep
+#install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/shrinksafe.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/toposort.py %{buildroot}%{_datadir}/%{name}/tools/
 # fix one python header
 sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/BeautifulSoup.py
-sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/minimize.py
+# minimize tool was removed in prep
+#sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/minimize.py
 sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/toposort.py
 
 # fix generation of OpenLayer.js
@@ -159,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-5
+- Don't use the minimize tool as it produces an incorrect JS file
+
 * Sun Sep 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-4
 - Make a -doc subpackage for the API documentation which makes the main package 75% smaller
 



From pbrobinson at fedoraproject.org  Sat Sep 19 16:05:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 16:05:01 +0000 (UTC)
Subject: rpms/xapian-bindings/devel .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 xapian-bindings.spec, 1.25, 1.26
Message-ID: <20090919160501.523B111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31168

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.16, some spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Aug 2009 17:24:39 -0000	1.12
+++ .cvsignore	19 Sep 2009 16:05:01 -0000	1.13
@@ -1 +1 @@
-xapian-bindings-1.0.15.tar.gz
+xapian-bindings-1.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Aug 2009 17:24:39 -0000	1.13
+++ sources	19 Sep 2009 16:05:01 -0000	1.14
@@ -1 +1 @@
-d365969f5ba7fa99d369ef479862c4fe  xapian-bindings-1.0.15.tar.gz
+c330b2ccc451c890916c44446e148f07  xapian-bindings-1.0.16.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xapian-bindings.spec	6 Sep 2009 12:18:34 -0000	1.25
+++ xapian-bindings.spec	19 Sep 2009 16:05:01 -0000	1.26
@@ -2,21 +2,21 @@
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
 
-Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
-Name: xapian-bindings
-Version: 1.0.15
-Release: 2%{?dist}
-License: GPLv2+
-Group: Development/Libraries
-URL: http://www.xapian.org/
+Name:          xapian-bindings
+Version:       1.0.16
+Release:       1%{?dist}
+Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
+
+Group:         Development/Libraries
+License:       GPLv2+
+URL:           http://www.xapian.org/
+Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0:        xapian-bindings-Makefile-fix.patch
+Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: python-devel >= 2.2
-BuildRequires: autoconf automake libtool
 BuildRequires: ruby-devel ruby
 BuildRequires: xapian-core-devel == %{version}
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0: xapian-bindings-Makefile-fix.patch
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -25,9 +25,9 @@ indexing and search facilities to applic
 files needed for scripts which use Xapian
 
 %package python
-Group: Development/Libraries
-Summary: Files needed for developing Python scripts which use Xapian
-Obsoletes: pyxapian
+Group:         Development/Libraries
+Summary:       Files needed for developing Python scripts which use Xapian
+Obsoletes:     pyxapian
 
 %description python
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -36,8 +36,8 @@ indexing and search facilities to applic
 files needed for developing Python scripts which use Xapian
 
 %package ruby
-Group: Development/Libraries
-Summary: Files needed for developing Ruby scripts which use Xapian
+Group:         Development/Libraries
+Summary:       Files needed for developing Ruby scripts which use Xapian
 
 %description ruby
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -51,50 +51,51 @@ files needed for developing Ruby scripts
 
 %build
 %configure --with-python --with-ruby
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# Installation of some files does not obey prefix, DESTDIR is required
-%makeinstall DESTDIR=%{buildroot}
-# Move the docs to the right place, and correct the effects of prefix+DESTDIR
-mkdir -p %{buildroot}/usr/share/doc/
-mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/python %{buildroot}/usr/share/doc/%{name}-python-%{version}
-mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/ruby %{buildroot}/usr/share/doc/%{name}-ruby-%{version}
-rm -rf %{buildroot}%{buildroot}/usr/share/doc/%{name}/
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files python
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc python/docs/examples
 %{python_sitearch}/*
 
 %files ruby
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc ruby/docs/rdocs ruby/docs/examples
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Sat Sep 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
 * Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-2
 - Patch to fix python bindings build
 
-* Thu Aug 27 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15.1
+* Thu Aug 27 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
 - Update to 1.0.15
 
-* Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14.1
+* Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14-1
 - Update to 1.0.14
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Fri Jun  5 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.13.1
+* Fri Jun  5 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.13-1
 - Update to 1.0.13
 
-* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12.1
+* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12-1
 - Update to 1.0.12
 
 * Tue Apr 07 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-2



From pbrobinson at fedoraproject.org  Sat Sep 19 16:07:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 16:07:48 +0000 (UTC)
Subject: rpms/xapian-core/F-11 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xapian-core.spec, 1.24,
	1.25 xapian-core-1.0.9-includes.patch, 1.1, NONE
Message-ID: <20090919160748.910BB11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32530

Modified Files:
	.cvsignore sources xapian-core.spec 
Removed Files:
	xapian-core-1.0.9-includes.patch 
Log Message:
- Update to 1.0.16, some spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Aug 2009 17:35:22 -0000	1.12
+++ .cvsignore	19 Sep 2009 16:07:48 -0000	1.13
@@ -1 +1 @@
-xapian-core-1.0.15.tar.gz
+xapian-core-1.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Aug 2009 17:35:22 -0000	1.12
+++ sources	19 Sep 2009 16:07:48 -0000	1.13
@@ -1 +1 @@
-d851e661966fa0446cb46d7352c84a98  xapian-core-1.0.15.tar.gz
+19756e128d804faa6e7975a629ca3b70  xapian-core-1.0.16.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/xapian-core.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xapian-core.spec	27 Aug 2009 17:35:22 -0000	1.24
+++ xapian-core.spec	19 Sep 2009 16:07:48 -0000	1.25
@@ -1,17 +1,17 @@
-Summary: The Xapian Probabilistic Information Retrieval Library
-Name: xapian-core
-Version: 1.0.15
-Release: 1%{?dist}
-License: GPLv2+
-Group: Applications/Databases
-URL: http://www.xapian.org/
-Requires: %{name}-libs = %{version}
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0: multilib-devel-conflict-fix.patch
-Patch1: xapian-core-1.0.9-includes.patch
-BuildRequires: autoconf automake libtool
+Name:          xapian-core
+Version:       1.0.16
+Release:       1%{?dist}
+Summary:       The Xapian Probabilistic Information Retrieval Library
+
+Group:         Applications/Databases
+License:       GPLv2+
+URL:           http://www.xapian.org/
+Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0:        multilib-devel-conflict-fix.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      %{name}-libs = %{version}
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -19,8 +19,8 @@ offers a highly adaptable toolkit that a
 indexing and search facilities to applications
 
 %package libs
-Summary: Xapian search engine libraries
-Group: System Environment/Libraries
+Summary:       Xapian search engine libraries
+Group:         System Environment/Libraries
 
 %description libs
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -29,10 +29,10 @@ indexing and search facilities to applic
 libraries for applications using Xapian functionality
 
 %package devel
-Group: Development/Libraries
-Summary: Files needed for building packages which use Xapian
-Requires: %{name} = %{version}
-Requires: %{name}-libs = %{version}
+Group:         Development/Libraries
+Summary:       Files needed for building packages which use Xapian
+Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description devel
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -41,33 +41,27 @@ indexing and search facilities to applic
 files needed for building packages which use Xapian
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1 -b .multilibfix
-#%patch1 -p1 -b .includes
 
 %build
-# FC6 (at least) has a patched libtool which knows not to set rpath for
-# /usr/lib64, which upstream libtool fails to do currently.  We can drop
-# this "autoreconf --force" and the "BuildRequires:" for the autotools
-# once upstream libtool is fixed.  Note: this overwrites INSTALL, but
-# that doesn't matter here as we don't package it.
-autoreconf --force -i
 %configure --disable-static
-make %{?_smp_mflags}
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_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
+
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# makeinstall doesn't work properly with libtool built libraries
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Move the docs to the right place
-mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy HACKING now, as "%doc HACKING" would overwrite everything
-cp HACKING %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy the rest while we are in this directory
-mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
-cp AUTHORS ChangeLog COPYING NEWS PLATFORMS README %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %post libs -p /sbin/ldconfig
 
@@ -78,6 +72,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/xapian-check
 %{_bindir}/xapian-inspect
 %{_bindir}/xapian-tcpsrv
@@ -92,7 +87,6 @@ rm -rf %{buildroot}
 %{_bindir}/simplesearch
 %{_bindir}/simpleexpand
 %{_bindir}/xapian-compact
-%doc %{_datadir}/doc/%{name}-%{version}
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-check.1*
 %{_mandir}/man1/xapian-inspect.1*
@@ -112,16 +106,19 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-, root, root)
+%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
 %{_bindir}/xapian-config
 %{_includedir}/xapian
 %{_includedir}/xapian.h
 %{_libdir}/libxapian.so
 %{_datadir}/aclocal/xapian.m4
-%doc %{_datadir}/doc/%{name}-devel-%{version}
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
 * Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
 - Update to 1.0.15
 


--- xapian-core-1.0.9-includes.patch DELETED ---



From bochecha at fedoraproject.org  Sat Sep 19 16:08:31 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sat, 19 Sep 2009 16:08:31 +0000 (UTC)
Subject: rpms/openlayers/F-11 openlayers.spec,1.4,1.5
Message-ID: <20090919160831.C21C811C00E6@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/openlayers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32720

Modified Files:
	openlayers.spec 
Log Message:
Do not use the minimize tool to compress the JavaScript code, as it produces an invalid output.

This is temporary while upstream bug 2275 is fixed:
  http://trac.openlayers.org/ticket/2275




Index: openlayers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/openlayers.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openlayers.spec	13 Sep 2009 12:50:31 -0000	1.4
+++ openlayers.spec	19 Sep 2009 16:08:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:      openlayers
 Version:   2.8
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A JavaScript library for displaying map data in web browsers
 Group:     Applications/Publishing
 License:   BSD
@@ -18,14 +18,14 @@ BuildArch: noarch
 
 BuildRequires: python
 
-Requires:  httpd
+Requires:   httpd
 
 
 %package doc
-Summary:   API documentation for %{name}
+Summary:    API documentation for %{name}
 
-Group:     Documentation
-Requires:  %{name} = %{version}-%{release}
+Group:      Documentation
+Requires:   %{name} = %{version}-%{release}
 
 
 %description
@@ -81,6 +81,10 @@ sed -i -e 's|\r||g' tools/exampleparser.
 # fix shebag
 find . -type f -exec sed -i -e 's/\#\!\/usr\/bin\/env python/\#\!\/usr\/bin\/python/' '{}' +
 
+# remove the minimize tool so that it is not used until upstream bug is fixed:
+#    http://trac.openlayers.org/ticket/2275
+rm tools/minimize.py
+
 
 %build
 pushd build
@@ -104,12 +108,14 @@ cp -rp tests %{buildroot}%{_datadir}/%{n
 install -d %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/BeautifulSoup.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/mergejs.py %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
+# don't install the minimize tool as it was removed in prep
+#install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/shrinksafe.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/toposort.py %{buildroot}%{_datadir}/%{name}/tools/
 # fix one python header
 sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/BeautifulSoup.py
-sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/minimize.py
+# minimize tool was removed in prep
+#sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/minimize.py
 sed -i -e '1i\#\!\/usr\/bin\/python' %{buildroot}%{_datadir}/%{name}/tools/toposort.py
 
 # fix generation of OpenLayer.js
@@ -159,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-5
+- Don't use the minimize tool as it produces an incorrect JS file
+
 * Sun Sep 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-4
 - Make a -doc subpackage for the API documentation which makes the main package 75% smaller
 



From pbrobinson at fedoraproject.org  Sat Sep 19 16:09:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 16:09:26 +0000 (UTC)
Subject: rpms/xapian-core/F-10 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xapian-core.spec, 1.20,
	1.21 xapian-core-1.0.9-includes.patch, 1.1, NONE
Message-ID: <20090919160926.1637B11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv921

Modified Files:
	.cvsignore sources xapian-core.spec 
Removed Files:
	xapian-core-1.0.9-includes.patch 
Log Message:
- Update to 1.0.16, some spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Aug 2009 18:08:48 -0000	1.11
+++ .cvsignore	19 Sep 2009 16:09:25 -0000	1.12
@@ -1 +1 @@
-xapian-core-1.0.15.tar.gz
+xapian-core-1.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Aug 2009 18:08:48 -0000	1.11
+++ sources	19 Sep 2009 16:09:25 -0000	1.12
@@ -1 +1 @@
-d851e661966fa0446cb46d7352c84a98  xapian-core-1.0.15.tar.gz
+19756e128d804faa6e7975a629ca3b70  xapian-core-1.0.16.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/xapian-core.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xapian-core.spec	27 Aug 2009 18:08:48 -0000	1.20
+++ xapian-core.spec	19 Sep 2009 16:09:25 -0000	1.21
@@ -1,17 +1,17 @@
-Summary: The Xapian Probabilistic Information Retrieval Library
-Name: xapian-core
-Version: 1.0.15
-Release: 1%{?dist}
-License: GPLv2+
-Group: Applications/Databases
-URL: http://www.xapian.org/
-Requires: %{name}-libs = %{version}
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0: multilib-devel-conflict-fix.patch
-Patch1: xapian-core-1.0.9-includes.patch
-BuildRequires: autoconf automake libtool
+Name:          xapian-core
+Version:       1.0.16
+Release:       1%{?dist}
+Summary:       The Xapian Probabilistic Information Retrieval Library
+
+Group:         Applications/Databases
+License:       GPLv2+
+URL:           http://www.xapian.org/
+Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0:        multilib-devel-conflict-fix.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      %{name}-libs = %{version}
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -19,8 +19,8 @@ offers a highly adaptable toolkit that a
 indexing and search facilities to applications
 
 %package libs
-Summary: Xapian search engine libraries
-Group: System Environment/Libraries
+Summary:       Xapian search engine libraries
+Group:         System Environment/Libraries
 
 %description libs
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -29,10 +29,10 @@ indexing and search facilities to applic
 libraries for applications using Xapian functionality
 
 %package devel
-Group: Development/Libraries
-Summary: Files needed for building packages which use Xapian
-Requires: %{name} = %{version}
-Requires: %{name}-libs = %{version}
+Group:         Development/Libraries
+Summary:       Files needed for building packages which use Xapian
+Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description devel
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -41,33 +41,27 @@ indexing and search facilities to applic
 files needed for building packages which use Xapian
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1 -b .multilibfix
-#%patch1 -p1 -b .includes
 
 %build
-# FC6 (at least) has a patched libtool which knows not to set rpath for
-# /usr/lib64, which upstream libtool fails to do currently.  We can drop
-# this "autoreconf --force" and the "BuildRequires:" for the autotools
-# once upstream libtool is fixed.  Note: this overwrites INSTALL, but
-# that doesn't matter here as we don't package it.
-autoreconf --force -i
 %configure --disable-static
-make %{?_smp_mflags}
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_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
+
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# makeinstall doesn't work properly with libtool built libraries
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Move the docs to the right place
-mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy HACKING now, as "%doc HACKING" would overwrite everything
-cp HACKING %{buildroot}%{_datadir}/doc/%{name}-devel-%{version}
-# Copy the rest while we are in this directory
-mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
-cp AUTHORS ChangeLog COPYING NEWS PLATFORMS README %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %post libs -p /sbin/ldconfig
 
@@ -78,6 +72,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/xapian-check
 %{_bindir}/xapian-inspect
 %{_bindir}/xapian-tcpsrv
@@ -92,7 +87,6 @@ rm -rf %{buildroot}
 %{_bindir}/simplesearch
 %{_bindir}/simpleexpand
 %{_bindir}/xapian-compact
-%doc %{_datadir}/doc/%{name}-%{version}
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-check.1*
 %{_mandir}/man1/xapian-inspect.1*
@@ -112,16 +106,19 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-, root, root)
+%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
 %{_bindir}/xapian-config
 %{_includedir}/xapian
 %{_includedir}/xapian.h
 %{_libdir}/libxapian.so
 %{_datadir}/aclocal/xapian.m4
-%doc %{_datadir}/doc/%{name}-devel-%{version}
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
 * Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
 - Update to 1.0.15
 


--- xapian-core-1.0.9-includes.patch DELETED ---



From mbooth at fedoraproject.org  Sat Sep 19 16:20:17 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Sat, 19 Sep 2009 16:20:17 +0000 (UTC)
Subject: rpms/eclipse-dtp/devel eclipse-dtp.spec,1.9,1.10
Message-ID: <20090919162017.3764E11C0336@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-dtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4108/eclipse-dtp/devel

Modified Files:
	eclipse-dtp.spec 
Log Message:
* Sat Sep 19 2009 Mat Booth <fedora at matbooth.co.uk> - 1.7.0-5
- Re-enable jar repacking now that RHBZ #461854 has been resolved.



Index: eclipse-dtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/eclipse-dtp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- eclipse-dtp.spec	24 Jul 2009 20:52:50 -0000	1.9
+++ eclipse-dtp.spec	19 Sep 2009 16:20:16 -0000	1.10
@@ -1,13 +1,9 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
-# temporarily disable jar repacking because of a bug in redhat-rpm-config, see:
-# https://bugzilla.redhat.com/show_bug.cgi?id=461854
-%define __jar_repack %{nil}
-
 Name:      eclipse-dtp
 Version:   1.7.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
 License:   EPL
@@ -139,6 +135,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Sat Sep 19 2009 Mat Booth <fedora at matbooth.co.uk> - 1.7.0-5
+- Re-enable jar repacking now that RHBZ #461854 has been resolved.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Sat Sep 19 16:27:11 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 19 Sep 2009 16:27:11 +0000 (UTC)
Subject: rpms/nss/devel blank-cert9.db, NONE, 1.1 blank-key4.db, NONE,
	1.1 system-pkcs11.txt, NONE, 1.1
Message-ID: <20090919162711.5FD9311C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6110

Added Files:
	blank-cert9.db blank-key4.db system-pkcs11.txt 
Log Message:
blank shared db's and pkcs11 config file for sytem-wide shared nssdb


--- NEW FILE blank-cert9.db ---
SQLite format 3
 utoindex_nssPublic_1nssPublic

 

 

  ad5a0db00, a80000001, ace534369)

 

 E INDEX issuer ON nssPublic (a81)

 

 

 

--- NEW FILE blank-key4.db ---
SQLite format 3
 oindex_nssPrivate_1nssPrivate

 

 

  ad5a0db00, a80000001, ace534369)

 
?
CREATE TABLE metaData (id PRIMARY KEY UNIQUE ON CONFLICT REPLACE, item1, item2)/C


 

 

 



0?????m??
????:?T???

 

--- NEW FILE system-pkcs11.txt ---
library=
name=NSS Internal PKCS #11 Module
parameters=configdir='sql:/home/test/.pki/nssdb'  certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})




From emaldonado at fedoraproject.org  Sat Sep 19 16:29:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 19 Sep 2009 16:29:16 +0000 (UTC)
Subject: rpms/nss/devel sysinit.patch,1.1,1.2
Message-ID: <20090919162916.C7B3E11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6766

Modified Files:
	sysinit.patch 
Log Message:
Fix getFips mode to query te system fips_enabled property file

sysinit.patch:
 cmd/manifest.mn          |    1 
 cmd/sysinit/Makefile     |   80 +++++++++
 cmd/sysinit/config.mk    |  121 ++++++++++++++
 cmd/sysinit/manifest.mn  |   50 +++++
 cmd/sysinit/nsssysinit.c |  356 ++++++++++++++++++++++++++++++++++++++++++
 lib/pk11wrap/pk11load.c  |  133 +++++++++++++--
 lib/pk11wrap/pk11pars.c  |  394 ++++++++++++++++++++++++++++++++++++++++++++++-
 lib/pk11wrap/pk11util.c  |   82 +++------
 lib/pk11wrap/secmodi.h   |   21 ++
 lib/pki/pki3hack.c       |   10 +
 10 files changed, 1169 insertions(+), 79 deletions(-)

Index: sysinit.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sysinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sysinit.patch	9 Sep 2009 21:49:24 -0000	1.1
+++ sysinit.patch	19 Sep 2009 16:29:16 -0000	1.2
@@ -4,7 +4,7 @@ RCS file: /cvsroot/mozilla/security/nss/
 retrieving revision 1.27
 diff -u -p -r1.27 manifest.mn
 --- ./mozilla/security/nss/cmd/manifest.mn	4 Sep 2008 22:15:21 -0000	1.27
-+++ ./mozilla/security/nss/cmd/manifest.mn	9 Sep 2009 03:40:50 -0000
++++ ./mozilla/security/nss/cmd/manifest.mn	18 Sep 2009 23:38:36 -0000
 @@ -75,6 +75,7 @@ DIRS = lib  \
   ssltap  \
   strsclnt \
@@ -18,7 +18,7 @@ Index: mozilla/security/nss/cmd/sysinit/
 RCS file: security/nss/cmd/sysinit/Makefile
 diff -N security/nss/cmd/sysinit/Makefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/Makefile	1 Sep 2009 22:47:51 -0000
++++ ./mozilla/security/nss/cmd/sysinit/Makefile	18 Sep 2009 23:38:36 -0000
 @@ -0,0 +1,80 @@
 +#! gmake
 +#
@@ -105,7 +105,7 @@ Index: mozilla/security/nss/cmd/sysinit/
 RCS file: security/nss/cmd/sysinit/config.mk
 diff -N security/nss/cmd/sysinit/config.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/config.mk	1 Sep 2009 22:47:51 -0000
++++ ./mozilla/security/nss/cmd/sysinit/config.mk	18 Sep 2009 23:38:36 -0000
 @@ -0,0 +1,121 @@
 +#
 +# ***** BEGIN LICENSE BLOCK *****
@@ -233,7 +233,7 @@ Index: mozilla/security/nss/cmd/sysinit/
 RCS file: security/nss/cmd/sysinit/manifest.mn
 diff -N security/nss/cmd/sysinit/manifest.mn
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/manifest.mn	1 Sep 2009 22:47:51 -0000
++++ ./mozilla/security/nss/cmd/sysinit/manifest.mn	18 Sep 2009 23:38:36 -0000
 @@ -0,0 +1,50 @@
 +#
 +# ***** BEGIN LICENSE BLOCK *****
@@ -290,8 +290,8 @@ Index: mozilla/security/nss/cmd/sysinit/
 RCS file: security/nss/cmd/sysinit/nsssysinit.c
 diff -N security/nss/cmd/sysinit/nsssysinit.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/nsssysinit.c	1 Sep 2009 22:47:51 -0000
-@@ -0,0 +1,329 @@
++++ ./mozilla/security/nss/cmd/sysinit/nsssysinit.c	18 Sep 2009 23:38:36 -0000
+@@ -0,0 +1,356 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -420,13 +420,7 @@ diff -N security/nss/cmd/sysinit/nsssysi
 +#endif
 +#endif
 +
-+#ifdef XP_LINUX
-+PRBool getFIPSMode()
-+{
-+}
-+
-+#else
-+PRBool getFIPSMode()
++static PRBool getFIPSEnv()
 +{
 +    char *fipsEnv = getenv("NSS_FIPS");
 +    if (!fipsEnv) {
@@ -440,6 +434,35 @@ diff -N security/nss/cmd/sysinit/nsssysi
 +    }
 +    return 0;
 +}
++#ifdef XP_LINUX
++
++PRBool getFIPSMode()
++{
++    FILE *f;
++    char d;
++    size_t size;
++
++    f = fopen("/proc/sys/crypto/fips_enabled", "r");
++    if (!f) {
++	/* if we don't have a proc flag, fall back to the 
++	 * environment variable */
++	return getFIPSEnv();
++    }
++
++    size = fread(&d, 1, 1, f);
++    fclose(f);
++    if (size != 1)
++        return 0;
++    if (d != '1')
++        return 0;
++    return 1;
++}
++
++#else
++static PRBool getFIPSMode()
++{
++    return getFIPSEnv();
++}
 +#endif
 +
 +
@@ -457,6 +480,7 @@ diff -N security/nss/cmd/sysinit/nsssysi
 + * it is running in the process of the application for which it is making 
 + * decisions, so it's possible to acquire the application name as part of
 + * the decision making process.
++ *
 + */
 +static char **
 +get_list(char *filename, char *stripped_parameters)
@@ -537,6 +561,9 @@ diff -N security/nss/cmd/sysinit/nsssysi
 +    *target = 0;
 +}
 +
++/* determine what options the user was trying to open this database with */
++/* filename is the directory pointed to by configdir= */
++/* stripped is the rest of the paramters with configdir= stripped out */
 +static SECStatus
 +parse_paramters(char *parameters, char **filename, char **stripped)
 +{
@@ -566,6 +593,7 @@ diff -N security/nss/cmd/sysinit/nsssysi
 +	PORT_Free(newStripped);
 +	return SECFailure;
 +    }
++    /* strip off any directives from the filename */
 +    if (strncmp("sql:", *filename, 4) == 0) {
 +	safestrcpy(*filename, (*filename)+4);
 +    } else if (strncmp("dbm:", *filename, 4) == 0) {
@@ -581,7 +609,6 @@ diff -N security/nss/cmd/sysinit/nsssysi
 +char **
 +NSS_ReturnModuleSpecData(unsigned long function, char *parameters, void *args)
 +{
-+    static char *chain = "Chain";
 +    char *filename = NULL;
 +    char *stripped = NULL;
 +    char **retString = NULL;
@@ -607,10 +634,10 @@ diff -N security/nss/cmd/sysinit/nsssysi
 +    case SECMOD_MODULE_DB_FUNCTION_RELEASE:
 +	retString = release_list((char **)args);
 +	break;
-+    /* forward add/del to child */
++    /* can't add or delete from this module DB */
 +    case SECMOD_MODULE_DB_FUNCTION_ADD:
 +    case SECMOD_MODULE_DB_FUNCTION_DEL:
-+	retString = &chain;
++	retString = NULL;
 +	break;
 +    default:
 +	retString = NULL;



From emaldonado at fedoraproject.org  Sat Sep 19 16:35:44 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 19 Sep 2009 16:35:44 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.117,1.118
Message-ID: <20090919163544.E9FAE11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8512

Modified Files:
	nss.spec 
Log Message:
Install system wide shared nssdb and update nssysinit patch


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- nss.spec	10 Sep 2009 23:55:12 -0000	1.117
+++ nss.spec	19 Sep 2009 16:35:44 -0000	1.118
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -31,6 +31,9 @@ Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
+Source6:          blank-cert9.db
+Source7:          blank-key4.db
+Source8:          system-pkcs11.txt
 Source12:         %{name}-pem-20090907.tar.bz2
 
 Patch2:           nss-nolocalsql.patch
@@ -255,10 +258,15 @@ do
 done
 
 # Install the empty NSS db files
+# Legacy db
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
 %{__install} -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
 %{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
 %{__install} -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+# Shared db
+%{__install} -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert9.db
+%{__install} -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key4.db
+%{__install} -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/pkcs11.txt
      
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
@@ -332,11 +340,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig >/dev/null 2>/dev/null
+%post -p /sbin/ldconfig 
 
-%postun
-/sbin/ldconfig >/dev/null 2>/dev/null
+%postun -p /sbin/ldconfig 
 
 %files
 %defattr(-,root,root)
@@ -353,6 +359,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %files sysinit
 %defattr(-,root,root)
 %{_libdir}/libnsssysinit.so
+%config(noreplace) %{_sysconfdir}/pki/nssdb/cert9.db
+%config(noreplace) %{_sysconfdir}/pki/nssdb/key4.db
+%config(noreplace) %{_sysconfdir}/pki/nssdb/pkcs11.txt
 
 %files tools
 %defattr(-,root,root)
@@ -447,6 +456,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Fri Sep 18 2009 Elio Maldonado<emaldona at redhat.com - 3.12.4-9
+- Install blank databases and configuration file for system shared database
+- nsssysinit queries system for fips mode before relying on environment variable
+
 * Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
 - Restoring nssutil and -rpath-link to nss-config for now - 522477
 



From pbrobinson at fedoraproject.org  Sat Sep 19 16:36:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 16:36:11 +0000 (UTC)
Subject: rpms/xapian-bindings/F-11 .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 xapian-bindings.spec, 1.21, 1.22
Message-ID: <20090919163611.B7C0111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8751

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.16, some spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Sep 2009 12:25:06 -0000	1.10
+++ .cvsignore	19 Sep 2009 16:36:11 -0000	1.11
@@ -1 +1 @@
-xapian-bindings-1.0.15.tar.gz
+xapian-bindings-1.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Sep 2009 12:25:06 -0000	1.11
+++ sources	19 Sep 2009 16:36:11 -0000	1.12
@@ -1 +1 @@
-d365969f5ba7fa99d369ef479862c4fe  xapian-bindings-1.0.15.tar.gz
+c330b2ccc451c890916c44446e148f07  xapian-bindings-1.0.16.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/xapian-bindings.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xapian-bindings.spec	6 Sep 2009 12:25:06 -0000	1.21
+++ xapian-bindings.spec	19 Sep 2009 16:36:11 -0000	1.22
@@ -2,21 +2,21 @@
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
 
-Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
-Name: xapian-bindings
-Version: 1.0.15
-Release: 1%{?dist}
-License: GPLv2+
-Group: Development/Libraries
-URL: http://www.xapian.org/
+Name:          xapian-bindings
+Version:       1.0.16
+Release:       1%{?dist}
+Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
+
+Group:         Development/Libraries
+License:       GPLv2+
+URL:           http://www.xapian.org/
+Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0:        xapian-bindings-Makefile-fix.patch
+Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: python-devel >= 2.2
-BuildRequires: autoconf automake libtool
 BuildRequires: ruby-devel ruby
 BuildRequires: xapian-core-devel == %{version}
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0: xapian-bindings-Makefile-fix.patch
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -25,9 +25,9 @@ indexing and search facilities to applic
 files needed for scripts which use Xapian
 
 %package python
-Group: Development/Libraries
-Summary: Files needed for developing Python scripts which use Xapian
-Obsoletes: pyxapian
+Group:         Development/Libraries
+Summary:       Files needed for developing Python scripts which use Xapian
+Obsoletes:     pyxapian
 
 %description python
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -36,8 +36,8 @@ indexing and search facilities to applic
 files needed for developing Python scripts which use Xapian
 
 %package ruby
-Group: Development/Libraries
-Summary: Files needed for developing Ruby scripts which use Xapian
+Group:         Development/Libraries
+Summary:       Files needed for developing Ruby scripts which use Xapian
 
 %description ruby
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -51,47 +51,51 @@ files needed for developing Ruby scripts
 
 %build
 %configure --with-python --with-ruby
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# Installation of some files does not obey prefix, DESTDIR is required
-%makeinstall DESTDIR=%{buildroot}
-# Move the docs to the right place, and correct the effects of prefix+DESTDIR
-mkdir -p %{buildroot}/usr/share/doc/
-mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/python %{buildroot}/usr/share/doc/%{name}-python-%{version}
-mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/ruby %{buildroot}/usr/share/doc/%{name}-ruby-%{version}
-rm -rf %{buildroot}%{buildroot}/usr/share/doc/%{name}/
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files python
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc python/docs/examples
 %{python_sitearch}/*
 
 %files ruby
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc ruby/docs/rdocs ruby/docs/examples
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
 %changelog
-* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
+* Sat Sep 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
+* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-2
+- Patch to fix python bindings build
+
+* Thu Aug 27 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
 - Update to 1.0.15
 
-* Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14.1
+* Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14-1
 - Update to 1.0.14
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Fri Jun  5 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.13.1
+* Fri Jun  5 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.13-1
 - Update to 1.0.13
 
-* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12.1
+* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12-1
 - Update to 1.0.12
 
 * Tue Apr 07 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-2



From pbrobinson at fedoraproject.org  Sat Sep 19 16:36:51 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 19 Sep 2009 16:36:51 +0000 (UTC)
Subject: rpms/xapian-bindings/F-10 .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 xapian-bindings.spec, 1.16, 1.17
Message-ID: <20090919163651.9F85211C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9039

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.16, some spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Sep 2009 12:29:23 -0000	1.8
+++ .cvsignore	19 Sep 2009 16:36:51 -0000	1.9
@@ -1 +1 @@
-xapian-bindings-1.0.15.tar.gz
+xapian-bindings-1.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Sep 2009 12:29:23 -0000	1.9
+++ sources	19 Sep 2009 16:36:51 -0000	1.10
@@ -1 +1 @@
-d365969f5ba7fa99d369ef479862c4fe  xapian-bindings-1.0.15.tar.gz
+c330b2ccc451c890916c44446e148f07  xapian-bindings-1.0.16.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-10/xapian-bindings.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xapian-bindings.spec	6 Sep 2009 12:29:23 -0000	1.16
+++ xapian-bindings.spec	19 Sep 2009 16:36:51 -0000	1.17
@@ -2,21 +2,21 @@
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
 
-Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
-Name: xapian-bindings
-Version: 1.0.15
-Release: 1%{?dist}
-License: GPLv2+
-Group: Development/Libraries
-URL: http://www.xapian.org/
+Name:          xapian-bindings
+Version:       1.0.16
+Release:       1%{?dist}
+Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
+
+Group:         Development/Libraries
+License:       GPLv2+
+URL:           http://www.xapian.org/
+Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Patch0:        xapian-bindings-Makefile-fix.patch
+Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: python-devel >= 2.2
-BuildRequires: autoconf automake libtool
 BuildRequires: ruby-devel ruby
 BuildRequires: xapian-core-devel == %{version}
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0: xapian-bindings-Makefile-fix.patch
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -25,9 +25,9 @@ indexing and search facilities to applic
 files needed for scripts which use Xapian
 
 %package python
-Group: Development/Libraries
-Summary: Files needed for developing Python scripts which use Xapian
-Obsoletes: pyxapian
+Group:         Development/Libraries
+Summary:       Files needed for developing Python scripts which use Xapian
+Obsoletes:     pyxapian
 
 %description python
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -36,8 +36,8 @@ indexing and search facilities to applic
 files needed for developing Python scripts which use Xapian
 
 %package ruby
-Group: Development/Libraries
-Summary: Files needed for developing Ruby scripts which use Xapian
+Group:         Development/Libraries
+Summary:       Files needed for developing Ruby scripts which use Xapian
 
 %description ruby
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -51,37 +51,65 @@ files needed for developing Ruby scripts
 
 %build
 %configure --with-python --with-ruby
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-# Installation of some files does not obey prefix, DESTDIR is required
-%makeinstall DESTDIR=%{buildroot}
-# Move the docs to the right place, and correct the effects of prefix+DESTDIR
-mkdir -p %{buildroot}/usr/share/doc/
-mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/python %{buildroot}/usr/share/doc/%{name}-python-%{version}
-mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/ruby %{buildroot}/usr/share/doc/%{name}-ruby-%{version}
-rm -rf %{buildroot}%{buildroot}/usr/share/doc/%{name}/
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 %clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files python
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc python/docs/examples
 %{python_sitearch}/*
 
 %files ruby
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc ruby/docs/rdocs ruby/docs/examples
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
 %changelog
-* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
+* Sat Sep 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.16-1
+- Update to 1.0.16, some spec file cleanups
+
+* Sun Sep  6 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-2
+- Patch to fix python bindings build
+
+* Thu Aug 27 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15-1
 - Update to 1.0.15
 
+* Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14-1
+- Update to 1.0.14
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun  5 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.13-1
+- Update to 1.0.13
+
+* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12-1
+- Update to 1.0.12
+
+* Tue Apr 07 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-2
+- Obsolete pyxapian
+
+* Mon Apr 06 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-1
+- Update to 1.0.11
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.0.9-2
+- Rebuild for Python 2.6
+
 * Sat Nov 29 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-1
 - Update to 1.0.9
 



From rishi at fedoraproject.org  Sat Sep 19 16:47:15 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 19 Sep 2009 16:47:15 +0000 (UTC)
Subject: rpms/bouml/devel .cvsignore, 1.20, 1.21 bouml.spec, 1.29,
	1.30 sources, 1.22, 1.23
Message-ID: <20090919164715.C634B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12432

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.14-1
- Version bump to 4.14. (Red Hat Bugzilla #512401)
  * Previous releases can not read a project saved with this version, but
    projects made by previous releases can be read.
  * When a package was deleted from a plug-out the container package was not
    marked modified and was not saved without an other reason marking it
    modified, and an error occured on reloading the project. Fixed.
  * It is not possible to resize the classes drawn with the standard
    representation (not using an icon) in a class diagram.
  * New drawing setting "hide get/set operations" to apply on 'official' get
    and set operations in class diagrams. The get/set operations are shown by
    default.
  * New C++ generation setting "inline force include in header" to include
    headers defining types referenced in inline operations. This switched on
    by default for older projects, but turned off for new ones.
  * http://bouml.free.fr/historic.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Jul 2009 10:21:15 -0000	1.20
+++ .cvsignore	19 Sep 2009 16:47:15 -0000	1.21
@@ -1 +1 @@
-bouml_4.13.tar.gz
+bouml_4.14.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- bouml.spec	24 Jul 2009 18:22:14 -0000	1.29
+++ bouml.spec	19 Sep 2009 16:47:15 -0000	1.30
@@ -5,8 +5,8 @@
 
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.13
-Release:	2%{?dist}
+Version:	4.14
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
@@ -110,8 +110,25 @@ fi
 %{_libdir}/%{name}/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.14-1
+- Version bump to 4.14. (Red Hat Bugzilla #512401)
+  * Previous releases can not read a project saved with this version, but
+    projects made by previous releases can be read.
+  * When a package was deleted from a plug-out the container package was not
+    marked modified and was not saved without an other reason marking it
+    modified, and an error occured on reloading the project. Fixed.
+  * It is not possible to resize the classes drawn with the standard
+    representation (not using an icon) in a class diagram.
+  * New drawing setting "hide get/set operations" to apply on 'official' get
+    and set operations in class diagrams. The get/set operations are shown by
+    default.
+  * New C++ generation setting "inline force include in header" to include
+    headers defining types referenced in inline operations. This switched on
+    by default for older projects, but turned off for new ones.
+  * http://bouml.free.fr/historic.html
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 4.13-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sat Jul 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.13-1
 - Version bump to 4.13.
@@ -150,6 +167,7 @@ fi
   * XMI2 Generator:
     + The base type of a class stereotyped typedef is now produced in an
       extension form supposing you ask for them.
+  * http://bouml.free.fr/historic.html
 
 * Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
 - Version bump to 4.12.1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	4 Jul 2009 10:21:15 -0000	1.22
+++ sources	19 Sep 2009 16:47:15 -0000	1.23
@@ -1 +1 @@
-b45efd68dd6f45fbddad48ebbf90a786  bouml_4.13.tar.gz
+4eaaddb10f86a31ca7ac7663a6f2f8b4  bouml_4.14.tar.gz



From myoung at fedoraproject.org  Sat Sep 19 16:47:33 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat, 19 Sep 2009 16:47:33 +0000 (UTC)
Subject: rpms/kernel/devel/scripts sort-config,1.4.2.2,1.4.2.3
Message-ID: <20090919164733.B50DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12113/scripts

Modified Files:
      Tag: private-myoung-dom0-branch
	sort-config 
Log Message:
Switch pvops from rebase/master to xen/master branch



Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/sort-config,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -p -r1.4.2.2 -r1.4.2.3
--- sort-config	20 Aug 2009 18:50:24 -0000	1.4.2.2
+++ sort-config	19 Sep 2009 16:47:33 -0000	1.4.2.3
@@ -5,35 +5,38 @@ TGT=($(ls kernel-*/linux-*.noarch/config
           kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
 TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})
 
+ALL_OPTS="cdfimn"
 if [ $# -lt 2 ] ; then
-   echo -e "Usage:\n   $(basename $0) [-dfcn] input target\n"
+   echo -e "Usage:\n   $(basename $0) [-$ALL_OPTS] input target\n"
    echo -e " Sort input config file into the same order as the target\n"
+   echo -e "      -c: insert comments about non-matching/impossible items"
    echo -e "      -d: show raw unsorted output with extra debug text"
-   echo -e "      -f: force output to match what is in the target config"
-   echo -e "      -c: insert comments about non-matching items"
+   echo -e "      -f: force output to match what is in the target config,"
+   echo -e "          and/or remove impossible config items"
+   echo -e "      -i: find impossible config items"
+   echo -e "      -m: find changed config items"
    echo -e "      -n: do not sort output\n"
    echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
    echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
    exit 1
 fi
 
-while getopts "dfcn" OPTION ; do
+while getopts "$ALL_OPTS" OPTION ; do
 case $OPTION in
+c)
+   ADDCOMMENT=1 ;;
 d)
-   DEBUG=1
-;;
+   DEBUG=1 ;;
 f)
-   FORCE=1
-;;
-c)
-   ADDCOMMENT=1
-;;
+   FORCE=1 ;;
+i)
+   FIND_IMPOSS=1 ;;
+m)
+   FIND_CHANGED=1 ;;
 n)
-   NOSORT=1
-;;
+   NOSORT=1 ;;
 \?)
-   exit 2
-;;
+   exit 2 ;;
 esac
 done
 
@@ -44,12 +47,17 @@ fi
 
 shift $((OPTIND-1))
 
-if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
+TEMPFILES="xx00 xx01 xx98 xx99"
+TEMPLEFT=
+for FILE in $TEMPFILES ; do
+   [ -f "$FILE" ] && TEMPLEFT="Y"
+done
+if [ "$TEMPLEFT" ] ; then
    echo "WARNING! Output files named xx?? already exist." >&2
    read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
    echo >&2
 fi
-rm -f xx00 xx01 xx99
+rm -f $TEMPFILES
 
 SRCFILE=config-$1
 [ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2
@@ -57,11 +65,48 @@ SRCFILE=config-$1
 TGTFILE=kernel-*/linux-*.noarch/configs/kernel-2.6.*-$2.config
 [ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2
 
+[ "$FIND_IMPOSS" ] && \
+   find kernel-*/*.noarch -name Kconfig\* -type f \
+   | xargs egrep -s -h '^[[:space:]]*(menu)?config[[:space:]]+' \
+   | sed -r 's/^[[:space:]]*(menu)?config[[:space:]]+/CONFIG_/' \
+   | sort | uniq >xx98
+
+extract_optname() {
+         # extract the option name from $TEXT, setting $OPTNAME
+         OPTNAME=
+         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
+            OPTNAME=${TEXT%%=*}
+         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
+            OPTNAME=${TEXT%" is not set"}
+            OPTNAME=${OPTNAME#\# }
+         fi
+}
+
+print_saved_comments() {
+      if [ $IX -gt 0 ] ; then
+         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
+         (( IX-- ))
+         for IX in $(seq 0 $IX) ; do
+            echo "$LINE":"${SAVECOMMENT[$IX]}"
+         done
+         unset SAVECOMMENT
+         IX=0
+      fi
+}
+
+assign_line_number() {
+      # use input line numbers if not sorting
+      [ "$NOSORT" ] && LINE=$IN
+      # make sure it has a line number
+      [ -z "$LINE" ] && LINE=999999
+}
+
 IX=0
 IN=0
 declare -a SAVECOMMENT
 
-cat ${SRCFILE} | while read TEXT ; do
+cat ${SRCFILE} | {
+while read TEXT ; do
 
    LINE=
    COMMENT=
@@ -73,42 +118,52 @@ cat ${SRCFILE} | while read TEXT ; do
       if [ -z "$LINE" ] ; then
          [ "$DEBUG" ] && echo "nofind      ->" "$TEXT"
 
-         # see if option changed in output file
-         OPTNAME=
-         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
-            OPTNAME=${TEXT%%=*}
-         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
-            OPTNAME=${TEXT%" is not set"}
-            OPTNAME=${OPTNAME#\# }
-         fi
+         extract_optname
          if [ "$OPTNAME" ] ; then
-            for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
-               if [ -z "$LINE" ] ; then
-                  [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
-                  LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
-                  if [ "$LINE" ] ; then
-                     CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
-                     if [ "$FORCE" ] ; then
-                        TEXT="$CHANGED"
-                        [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
-                     else
-                        if [ "$ADDCOMMENT" ] ; then
-                           if [ ${CHANGED:0:1} = '#' ] ; then
-                              NEWOPT="not set"
-                           else
-                              NEWOPT=${CHANGED#$OPTNAME}
+
+            if [ "$FIND_CHANGED" ] ; then
+               for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
+                  if [ -z "$LINE" ] ; then
+                     [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
+                     LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
+                     if [ "$LINE" ] ; then
+                        CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
+                        if [ "$FORCE" ] ; then
+                           TEXT=$CHANGED
+                           [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
+                        else
+                           if [ "$ADDCOMMENT" ] ; then
+                              if [ ${CHANGED:0:1} = '#' ] ; then
+                                 NEWOPT="not set"
+                              else
+                                 NEWOPT=${CHANGED#$OPTNAME}
+                              fi
+                              COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                            fi
-                           COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                         fi
                      fi
                   fi
+               done
+            fi
+
+            if [ "$FIND_IMPOSS" -a -z "$LINE" -a -z "$COMMENT" ] ; then
+               POSSIBLE=$(grep -n "^$OPTNAME" xx98)
+               if [ -z "$POSSIBLE" ] ; then
+                  if [ "$ADDCOMMENT" ] ; then
+                     COMMENT="# -- Next option is impossible --"
+                  elif [ "$FORCE" ] ; then
+                     [ "$DEBUG" ] && echo 'impossible  ->' "$TEXT"
+                     TEXT=""
+                  fi
                fi
-            done
+            fi
+
          fi
 
       fi
 
    else
+      # not a config variable
       COMMENT="$TEXT"
       TEXT=
    fi
@@ -118,41 +173,37 @@ cat ${SRCFILE} | while read TEXT ; do
 
    if [ "$TEXT" ] ; then
 
-      # use input line numbers if not sorting
-      [ "$NOSORT" ] && LINE=$IN
-      # make sure it has a line number
-      [ -z "$LINE" ] && LINE=999999
+      assign_line_number
 
-      # print saved comments first
-      if [ $IX -gt 0 ] ; then
-         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
-         (( IX-- ))
-         for IX in $(seq 0 $IX) ; do
-            echo "$LINE":"${SAVECOMMENT[$IX]}"
-         done
-         unset SAVECOMMENT
-         IX=0
-      fi
+      # print the saved comments first
+      print_saved_comments
+      # now print the latest comment and text
       [ "$COMMENT" ] && echo "$LINE":"$COMMENT"
       echo "$LINE":"$TEXT"
 
-   else
+   elif [ "$COMMENT" ] ; then
 
       # no output yet, save the comment
       SAVECOMMENT[$IX]="$COMMENT"
-      [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
-      (( IX++ ))
+      let IX++
+      [ "$DEBUG" ] && echo 'savecomment (#'${IX}')'
 
    fi
 
-   ((IN++))
+   let IN++
 
-done > xx99
+done
+assign_line_number
+print_saved_comments
+[ "$DEBUG" ] && echo "$IN lines read from input"
+} >xx99
 
 if [ "$DEBUG" ] ; then
+   # just show the raw output with debug info, then exit
    cat xx99
 else
 
+   # split output into two files, for matched and unmatched items
    cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null
 
    cat xx00 | cut -f 2- -d ':'
@@ -165,4 +216,4 @@ else
 
 fi
 
-rm -f xx00 xx01 xx99
+rm -f $TEMPFILES



From myoung at fedoraproject.org  Sat Sep 19 16:47:46 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat, 19 Sep 2009 16:47:46 +0000 (UTC)
Subject: rpms/kernel/devel drm-intel-no-tv-hotplug.patch, NONE,
	1.1.2.1 linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch, NONE,
	1.1.2.1
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch,
	NONE, 1.1.2.1 linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch,
	NONE,
	1.1.2.1 linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch, 
	NONE, 1.1.2.1
	linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch,
	NONE, 1.1.2.1
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch,
	NONE, 1.1.2.1
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch,
	NONE, 1.1.2.1 linux-2.6-raidlockdep.patch, NONE,
	1.1.2.1 linux-2.6-selinux-module-load-perms.patch, NONE,
	1.1.2.1 linux-2.6.31-cpufreq-powernow-k8-oops.patch, NONE,
	1.1.2.1 linux-2.6.31-cpuidle-faster-io.patch, NONE,
	1.1.2.1 ppc-hates-my-family-and-swore-revenge.patch, NONE,
	1.1.2.1 Makefile, 1.97.6.6, 1.97.6.7 config-powerpc64, 1.27.6.4,
	1.27.6.5 drm-nouveau.patch, 1.8.6.18, 1.8.6.19 kernel.spec,
	1.1294.2.67, 1.1294.2.68 xen.pvops.patch, 1.1.2.42,
	1.1.2.43 xen.pvops.post.patch, 1.1.2.27,
	1.1.2.28 drm-page-flip.patch, 1.2.6.5,
	NONE linux-2.6-mac80211-age-scan-results-on-resume.patch,
	1.1.10.2, NONE linux-2.6-rt2x00-asus-leds.patch, 1.1, NONE
Message-ID: <20090919164746.A818211C00E6@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12113

Modified Files:
      Tag: private-myoung-dom0-branch
	Makefile config-powerpc64 drm-nouveau.patch kernel.spec 
	xen.pvops.patch xen.pvops.post.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-intel-no-tv-hotplug.patch 
	linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch 
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch 
	linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch 
	linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch 
	linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch 
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch 
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch 
	linux-2.6-raidlockdep.patch 
	linux-2.6-selinux-module-load-perms.patch 
	linux-2.6.31-cpufreq-powernow-k8-oops.patch 
	linux-2.6.31-cpuidle-faster-io.patch 
	ppc-hates-my-family-and-swore-revenge.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	drm-page-flip.patch 
	linux-2.6-mac80211-age-scan-results-on-resume.patch 
	linux-2.6-rt2x00-asus-leds.patch 
Log Message:
Switch pvops from rebase/master to xen/master branch


drm-intel-no-tv-hotplug.patch:
 i915_reg.h |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE drm-intel-no-tv-hotplug.patch ---
diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h
--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx	2009-09-16 13:36:20.000000000 -0400
+++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-09-16 13:40:32.000000000 -0400
@@ -836,7 +836,6 @@
 			 HDMID_HOTPLUG_INT_EN |	  \
 			 SDVOB_HOTPLUG_INT_EN |	  \
 			 SDVOC_HOTPLUG_INT_EN |	  \
-			 TV_HOTPLUG_INT_EN |	  \
 			 CRT_HOTPLUG_INT_EN)
 
 

linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch:
 iwl-5000.c |    7 +++++++
 iwl-prph.h |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch ---
commit 02c06e4abc0680afd31bf481a803541556757fb6
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Fri Jul 17 09:30:14 2009 -0700

    iwlagn: modify digital SVR for 1000
    
    On 1000, there are two Switching Voltage Regulators (SVR). The first one
    apply digital voltage level (1.32V) for PCIe block and core. We need to
    use this regulator to solve a stability issue related to noisy DC2DC
    line in the silicon.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 85e8bac..3f9da6e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -239,6 +239,13 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
 				APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
 				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
 
+	if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_1000) {
+		/* Setting digital SVR for 1000 card to 1.32V */
+		iwl_set_bits_mask_prph(priv, APMG_DIGITAL_SVR_REG,
+					APMG_SVR_DIGITAL_VOLTAGE_1_32,
+					~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);
+	}
+
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 3b9cac3..d393e8f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -80,6 +80,8 @@
 #define APMG_RFKILL_REG			(APMG_BASE + 0x0014)
 #define APMG_RTC_INT_STT_REG		(APMG_BASE + 0x001c)
 #define APMG_RTC_INT_MSK_REG		(APMG_BASE + 0x0020)
+#define APMG_DIGITAL_SVR_REG		(APMG_BASE + 0x0058)
+#define APMG_ANALOG_SVR_REG		(APMG_BASE + 0x006C)
 
 #define APMG_CLK_VAL_DMA_CLK_RQT	(0x00000200)
 #define APMG_CLK_VAL_BSM_CLK_RQT	(0x00000800)
@@ -91,7 +93,8 @@
 #define APMG_PS_CTRL_VAL_PWR_SRC_VMAIN		(0x00000000)
 #define APMG_PS_CTRL_VAL_PWR_SRC_MAX		(0x01000000) /* 3945 only */
 #define APMG_PS_CTRL_VAL_PWR_SRC_VAUX		(0x02000000)
-
+#define APMG_SVR_VOLTAGE_CONFIG_BIT_MSK	(0x000001E0) /* bit 8:5 */
+#define APMG_SVR_DIGITAL_VOLTAGE_1_32		(0x00000060)
 
 #define APMG_PCIDEV_STT_VAL_L1_ACT_DIS		(0x00000800)
 

linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch:
 iwl-3945.c     |   40 ++++++++++++++++++++++++++++++++++++++++
 iwl-4965.c     |   39 +++++++++++++++++++++++++++++++++++++++
 iwl-5000.c     |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwl-6000.c     |    5 +++--
 iwl-agn.c      |   55 ++++++++++++++++++++++++++++++++-----------------------
 iwl-core.h     |   12 ++++++++++++
 iwl-dev.h      |   31 +++++++++++++++++++++++--------
 iwl3945-base.c |   45 ++++++++++++++++++++++++---------------------
 8 files changed, 224 insertions(+), 54 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch ---
commit cc0f555d511a5fe9d4519334c8f674a1dbab9e3a
Author: Jay Sternberg <jay.e.sternberg at intel.com>
Date:   Fri Jul 17 09:30:16 2009 -0700

    iwlwifi: Handle new firmware file with ucode build number in header
    
    Adding new API version to account for change to ucode file format.  New
    header includes the build number of the ucode.  This build number is the
    SVN revision thus allowing for exact correlation to the code that
    generated it.
    
    The header adds the build number so that older ucode images can also be
    enhanced to include the build in the future.
    
    some cleanup in iwl_read_ucode needed to ensure old header not used and
    reduce unnecessary references through pointer with the data is already
    in heap variable.
    
    Signed-off-by: Jay Sternberg <jay.e.sternberg at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 1227ed2..14a47c0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2786,11 +2786,50 @@ static int iwl3945_load_bsm(struct iwl_priv *priv)
 	return 0;
 }
 
+#define IWL3945_UCODE_GET(item)						\
+static u32 iwl3945_ucode_get_##item(const struct iwl_ucode_header *ucode,\
+				    u32 api_ver)			\
+{									\
+	return le32_to_cpu(ucode->u.v1.item);				\
+}
+
+static u32 iwl3945_ucode_get_header_size(u32 api_ver)
+{
+	return UCODE_HEADER_SIZE(1);
+}
+static u32 iwl3945_ucode_get_build(const struct iwl_ucode_header *ucode,
+				   u32 api_ver)
+{
+	return 0;
+}
+static u8 *iwl3945_ucode_get_data(const struct iwl_ucode_header *ucode,
+				  u32 api_ver)
+{
+	return (u8 *) ucode->u.v1.data;
+}
+
+IWL3945_UCODE_GET(inst_size);
+IWL3945_UCODE_GET(data_size);
+IWL3945_UCODE_GET(init_size);
+IWL3945_UCODE_GET(init_data_size);
+IWL3945_UCODE_GET(boot_size);
+
 static struct iwl_hcmd_ops iwl3945_hcmd = {
 	.rxon_assoc = iwl3945_send_rxon_assoc,
 	.commit_rxon = iwl3945_commit_rxon,
 };
 
+static struct iwl_ucode_ops iwl3945_ucode = {
+	.get_header_size = iwl3945_ucode_get_header_size,
+	.get_build = iwl3945_ucode_get_build,
+	.get_inst_size = iwl3945_ucode_get_inst_size,
+	.get_data_size = iwl3945_ucode_get_data_size,
+	.get_init_size = iwl3945_ucode_get_init_size,
+	.get_init_data_size = iwl3945_ucode_get_init_data_size,
+	.get_boot_size = iwl3945_ucode_get_boot_size,
+	.get_data = iwl3945_ucode_get_data,
+};
+
 static struct iwl_lib_ops iwl3945_lib = {
 	.txq_attach_buf_to_tfd = iwl3945_hw_txq_attach_buf_to_tfd,
 	.txq_free_tfd = iwl3945_hw_txq_free_tfd,
@@ -2831,6 +2870,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
 };
 
 static struct iwl_ops iwl3945_ops = {
+	.ucode = &iwl3945_ucode,
 	.lib = &iwl3945_lib,
 	.hcmd = &iwl3945_hcmd,
 	.utils = &iwl3945_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index edbb0bf..f4eb683 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2221,12 +2221,50 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)
 	cancel_work_sync(&priv->txpower_work);
 }
 
+#define IWL4965_UCODE_GET(item)						\
+static u32 iwl4965_ucode_get_##item(const struct iwl_ucode_header *ucode,\
+				    u32 api_ver)			\
+{									\
+	return le32_to_cpu(ucode->u.v1.item);				\
+}
+
+static u32 iwl4965_ucode_get_header_size(u32 api_ver)
+{
+	return UCODE_HEADER_SIZE(1);
+}
+static u32 iwl4965_ucode_get_build(const struct iwl_ucode_header *ucode,
+				   u32 api_ver)
+{
+	return 0;
+}
+static u8 *iwl4965_ucode_get_data(const struct iwl_ucode_header *ucode,
+				  u32 api_ver)
+{
+	return (u8 *) ucode->u.v1.data;
+}
+
+IWL4965_UCODE_GET(inst_size);
+IWL4965_UCODE_GET(data_size);
+IWL4965_UCODE_GET(init_size);
+IWL4965_UCODE_GET(init_data_size);
+IWL4965_UCODE_GET(boot_size);
+
 static struct iwl_hcmd_ops iwl4965_hcmd = {
 	.rxon_assoc = iwl4965_send_rxon_assoc,
 	.commit_rxon = iwl_commit_rxon,
 	.set_rxon_chain = iwl_set_rxon_chain,
 };
 
+static struct iwl_ucode_ops iwl4965_ucode = {
+	.get_header_size = iwl4965_ucode_get_header_size,
+	.get_build = iwl4965_ucode_get_build,
+	.get_inst_size = iwl4965_ucode_get_inst_size,
+	.get_data_size = iwl4965_ucode_get_data_size,
+	.get_init_size = iwl4965_ucode_get_init_size,
+	.get_init_data_size = iwl4965_ucode_get_init_data_size,
+	.get_boot_size = iwl4965_ucode_get_boot_size,
+	.get_data = iwl4965_ucode_get_data,
+};
 static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
 	.get_hcmd_size = iwl4965_get_hcmd_size,
 	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,
@@ -2287,6 +2325,7 @@ static struct iwl_lib_ops iwl4965_lib = {
 };
 
 static struct iwl_ops iwl4965_ops = {
+	.ucode = &iwl4965_ucode,
 	.lib = &iwl4965_lib,
 	.hcmd = &iwl4965_hcmd,
 	.utils = &iwl4965_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 3f9da6e..74103cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1456,6 +1456,44 @@ int iwl5000_calc_rssi(struct iwl_priv *priv,
 	return max_rssi - agc - IWL49_RSSI_OFFSET;
 }
 
+#define IWL5000_UCODE_GET(item)						\
+static u32 iwl5000_ucode_get_##item(const struct iwl_ucode_header *ucode,\
+				    u32 api_ver)			\
+{									\
+	if (api_ver <= 2)						\
+		return le32_to_cpu(ucode->u.v1.item);			\
+	return le32_to_cpu(ucode->u.v2.item);				\
+}
+
+static u32 iwl5000_ucode_get_header_size(u32 api_ver)
+{
+	if (api_ver <= 2)
+		return UCODE_HEADER_SIZE(1);
+	return UCODE_HEADER_SIZE(2);
+}
+
+static u32 iwl5000_ucode_get_build(const struct iwl_ucode_header *ucode,
+				   u32 api_ver)
+{
+	if (api_ver <= 2)
+		return 0;
+	return le32_to_cpu(ucode->u.v2.build);
+}
+
+static u8 *iwl5000_ucode_get_data(const struct iwl_ucode_header *ucode,
+				  u32 api_ver)
+{
+	if (api_ver <= 2)
+		return (u8 *) ucode->u.v1.data;
+	return (u8 *) ucode->u.v2.data;
+}
+
+IWL5000_UCODE_GET(inst_size);
+IWL5000_UCODE_GET(data_size);
+IWL5000_UCODE_GET(init_size);
+IWL5000_UCODE_GET(init_data_size);
+IWL5000_UCODE_GET(boot_size);
+
 struct iwl_hcmd_ops iwl5000_hcmd = {
 	.rxon_assoc = iwl5000_send_rxon_assoc,
 	.commit_rxon = iwl_commit_rxon,
@@ -1471,6 +1509,17 @@ struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = {
 	.calc_rssi = iwl5000_calc_rssi,
 };
 
+struct iwl_ucode_ops iwl5000_ucode = {
+	.get_header_size = iwl5000_ucode_get_header_size,
+	.get_build = iwl5000_ucode_get_build,
+	.get_inst_size = iwl5000_ucode_get_inst_size,
+	.get_data_size = iwl5000_ucode_get_data_size,
+	.get_init_size = iwl5000_ucode_get_init_size,
+	.get_init_data_size = iwl5000_ucode_get_init_data_size,
+	.get_boot_size = iwl5000_ucode_get_boot_size,
+	.get_data = iwl5000_ucode_get_data,
+};
+
 struct iwl_lib_ops iwl5000_lib = {
 	.set_hw_params = iwl5000_hw_set_hw_params,
 	.txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl,
@@ -1572,12 +1621,14 @@ static struct iwl_lib_ops iwl5150_lib = {
 };
 
 struct iwl_ops iwl5000_ops = {
+	.ucode = &iwl5000_ucode,
 	.lib = &iwl5000_lib,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl5000_hcmd_utils,
 };
 
 static struct iwl_ops iwl5150_ops = {
+	.ucode = &iwl5000_ucode,
 	.lib = &iwl5150_lib,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl5000_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index bd438d8..26c5d4a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -46,8 +46,8 @@
 #include "iwl-5000-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL6000_UCODE_API_MAX 2
-#define IWL6050_UCODE_API_MAX 2
+#define IWL6000_UCODE_API_MAX 3
+#define IWL6050_UCODE_API_MAX 3
 
 /* Lowest firmware API version supported */
 #define IWL6000_UCODE_API_MIN 1
@@ -69,6 +69,7 @@ static struct iwl_hcmd_utils_ops iwl6000_hcmd_utils = {
 };
 
 static struct iwl_ops iwl6000_ops = {
+	.ucode = &iwl5000_ucode,
 	.lib = &iwl5000_lib,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl6000_hcmd_utils,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ad50022..6b874da 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1284,7 +1284,7 @@ static void iwl_nic_start(struct iwl_priv *priv)
  */
 static int iwl_read_ucode(struct iwl_priv *priv)
 {
-	struct iwl_ucode *ucode;
+	struct iwl_ucode_header *ucode;
 	int ret = -EINVAL, index;
 	const struct firmware *ucode_raw;
 	const char *name_pre = priv->cfg->fw_name_pre;
@@ -1293,7 +1293,8 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	char buf[25];
 	u8 *src;
 	size_t len;
-	u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;
+	u32 api_ver, build;
+	u32 inst_size, data_size, init_size, init_data_size, boot_size;
 
 	/* Ask kernel firmware_class module to get the boot firmware off disk.
 	 * request_firmware() is synchronous, file is in memory on return. */
@@ -1323,23 +1324,26 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	if (ret < 0)
 		goto error;
 
-	/* Make sure that we got at least our header! */
-	if (ucode_raw->size < sizeof(*ucode)) {
+	/* Make sure that we got at least the v1 header! */
+	if (ucode_raw->size < priv->cfg->ops->ucode->get_header_size(1)) {
 		IWL_ERR(priv, "File size way too small!\n");
 		ret = -EINVAL;
 		goto err_release;
 	}
 
 	/* Data from ucode file:  header followed by uCode images */
-	ucode = (void *)ucode_raw->data;
+	ucode = (struct iwl_ucode_header *)ucode_raw->data;
 
 	priv->ucode_ver = le32_to_cpu(ucode->ver);
 	api_ver = IWL_UCODE_API(priv->ucode_ver);
-	inst_size = le32_to_cpu(ucode->inst_size);
-	data_size = le32_to_cpu(ucode->data_size);
-	init_size = le32_to_cpu(ucode->init_size);
-	init_data_size = le32_to_cpu(ucode->init_data_size);
-	boot_size = le32_to_cpu(ucode->boot_size);
+	build = priv->cfg->ops->ucode->get_build(ucode, api_ver);
+	inst_size = priv->cfg->ops->ucode->get_inst_size(ucode, api_ver);
+	data_size = priv->cfg->ops->ucode->get_data_size(ucode, api_ver);
+	init_size = priv->cfg->ops->ucode->get_init_size(ucode, api_ver);
+	init_data_size =
+		priv->cfg->ops->ucode->get_init_data_size(ucode, api_ver);
+	boot_size = priv->cfg->ops->ucode->get_boot_size(ucode, api_ver);
+	src = priv->cfg->ops->ucode->get_data(ucode, api_ver);
 
 	/* api_ver should match the api version forming part of the
 	 * firmware filename ... but we don't check for that and only rely
@@ -1365,6 +1369,9 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	       IWL_UCODE_API(priv->ucode_ver),
 	       IWL_UCODE_SERIAL(priv->ucode_ver));
 
+	if (build)
+		IWL_DEBUG_INFO(priv, "Build %u\n", build);
+
 	IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
 		       priv->ucode_ver);
 	IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",
@@ -1379,12 +1386,14 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 		       boot_size);
 
 	/* Verify size of file vs. image size info in file's header */
-	if (ucode_raw->size < sizeof(*ucode) +
+	if (ucode_raw->size !=
+		priv->cfg->ops->ucode->get_header_size(api_ver) +
 		inst_size + data_size + init_size +
 		init_data_size + boot_size) {
 
-		IWL_DEBUG_INFO(priv, "uCode file size %d too small\n",
-			       (int)ucode_raw->size);
+		IWL_DEBUG_INFO(priv,
+			"uCode file size %d does not match expected size\n",
+			(int)ucode_raw->size);
 		ret = -EINVAL;
 		goto err_release;
 	}
@@ -1464,42 +1473,42 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 	/* Copy images into buffers for card's bus-master reads ... */
 
 	/* Runtime instructions (first block of data in file) */
-	src = &ucode->data[0];
-	len = priv->ucode_code.len;
+	len = inst_size;
 	IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode instr len %Zd\n", len);
 	memcpy(priv->ucode_code.v_addr, src, len);
+	src += len;
+
 	IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
 		priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
 
 	/* Runtime data (2nd block)
 	 * NOTE:  Copy into backup buffer will be done in iwl_up()  */
-	src = &ucode->data[inst_size];
-	len = priv->ucode_data.len;
+	len = data_size;
 	IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode data len %Zd\n", len);
 	memcpy(priv->ucode_data.v_addr, src, len);
 	memcpy(priv->ucode_data_backup.v_addr, src, len);
+	src += len;
 
 	/* Initialization instructions (3rd block) */
 	if (init_size) {
-		src = &ucode->data[inst_size + data_size];
-		len = priv->ucode_init.len;
+		len = init_size;
 		IWL_DEBUG_INFO(priv, "Copying (but not loading) init instr len %Zd\n",
 				len);
 		memcpy(priv->ucode_init.v_addr, src, len);
+		src += len;
 	}
 
 	/* Initialization data (4th block) */
 	if (init_data_size) {
-		src = &ucode->data[inst_size + data_size + init_size];
-		len = priv->ucode_init_data.len;
+		len = init_data_size;
 		IWL_DEBUG_INFO(priv, "Copying (but not loading) init data len %Zd\n",
 			       len);
 		memcpy(priv->ucode_init_data.v_addr, src, len);
+		src += len;
 	}
 
 	/* Bootstrap instructions (5th block) */
-	src = &ucode->data[inst_size + data_size + init_size + init_data_size];
-	len = priv->ucode_boot.len;
+	len = boot_size;
 	IWL_DEBUG_INFO(priv, "Copying (but not loading) boot instr len %Zd\n", len);
 	memcpy(priv->ucode_boot.v_addr, src, len);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 640c464..c844fab 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -116,6 +116,17 @@ struct iwl_temp_ops {
 	void (*set_ct_kill)(struct iwl_priv *priv);
 };
 
+struct iwl_ucode_ops {
+	u32 (*get_header_size)(u32);
+	u32 (*get_build)(const struct iwl_ucode_header *, u32);
+	u32 (*get_inst_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_data_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_init_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_init_data_size)(const struct iwl_ucode_header *, u32);
+	u32 (*get_boot_size)(const struct iwl_ucode_header *, u32);
+	u8 * (*get_data)(const struct iwl_ucode_header *, u32);
+};
+
 struct iwl_lib_ops {
 	/* set hw dependent parameters */
 	int (*set_hw_params)(struct iwl_priv *priv);
@@ -171,6 +182,7 @@ struct iwl_lib_ops {
 };
 
 struct iwl_ops {
+	const struct iwl_ucode_ops *ucode;
 	const struct iwl_lib_ops *lib;
 	const struct iwl_hcmd_ops *hcmd;
 	const struct iwl_hcmd_utils_ops *utils;
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index b989d5c..f4afd0c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -66,6 +66,7 @@ extern struct iwl_cfg iwl1000_bgn_cfg;
 /* shared structures from iwl-5000.c */
 extern struct iwl_mod_params iwl50_mod_params;
 extern struct iwl_ops iwl5000_ops;
+extern struct iwl_ucode_ops iwl5000_ucode;
 extern struct iwl_lib_ops iwl5000_lib;
 extern struct iwl_hcmd_ops iwl5000_hcmd;
 extern struct iwl_hcmd_utils_ops iwl5000_hcmd_utils;
@@ -525,15 +526,29 @@ struct fw_desc {
 };
 
 /* uCode file layout */
-struct iwl_ucode {
-	__le32 ver;		/* major/minor/API/serial */
-	__le32 inst_size;	/* bytes of runtime instructions */
-	__le32 data_size;	/* bytes of runtime data */
-	__le32 init_size;	/* bytes of initialization instructions */
-	__le32 init_data_size;	/* bytes of initialization data */
-	__le32 boot_size;	/* bytes of bootstrap instructions */
-	u8 data[0];		/* data in same order as "size" elements */
+struct iwl_ucode_header {
+	__le32 ver;	/* major/minor/API/serial */
+	union {
+		struct {
+			__le32 inst_size;	/* bytes of runtime code */
+			__le32 data_size;	/* bytes of runtime data */
+			__le32 init_size;	/* bytes of init code */
+			__le32 init_data_size;	/* bytes of init data */
+			__le32 boot_size;	/* bytes of bootstrap code */
+			u8 data[0];		/* in same order as sizes */
+		} v1;
+		struct {
+			__le32 build;		/* build number */
+			__le32 inst_size;	/* bytes of runtime code */
+			__le32 data_size;	/* bytes of runtime data */
+			__le32 init_size;	/* bytes of init code */
+			__le32 init_data_size;	/* bytes of init data */
+			__le32 boot_size;	/* bytes of bootstrap code */
+			u8 data[0];		/* in same order as sizes */
+		} v2;
+	} u;
 };
+#define UCODE_HEADER_SIZE(ver) ((ver) == 1 ? 24 : 28)
 
 struct iwl4965_ibss_seq {
 	u8 mac[ETH_ALEN];
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c9b3ea9..bd6a067 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2041,7 +2041,7 @@ static void iwl3945_nic_start(struct iwl_priv *priv)
  */
 static int iwl3945_read_ucode(struct iwl_priv *priv)
 {
-	struct iwl_ucode *ucode;
+	const struct iwl_ucode_header *ucode;
 	int ret = -EINVAL, index;
 	const struct firmware *ucode_raw;
 	/* firmware file name contains uCode/driver compatibility version */
@@ -2082,22 +2082,24 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 		goto error;
 
 	/* Make sure that we got at least our header! */
-	if (ucode_raw->size < sizeof(*ucode)) {
+	if (ucode_raw->size <  priv->cfg->ops->ucode->get_header_size(1)) {
 		IWL_ERR(priv, "File size way too small!\n");
 		ret = -EINVAL;
 		goto err_release;
 	}
 
 	/* Data from ucode file:  header followed by uCode images */
-	ucode = (void *)ucode_raw->data;
+	ucode = (struct iwl_ucode_header *)ucode_raw->data;
 
 	priv->ucode_ver = le32_to_cpu(ucode->ver);
 	api_ver = IWL_UCODE_API(priv->ucode_ver);
-	inst_size = le32_to_cpu(ucode->inst_size);
-	data_size = le32_to_cpu(ucode->data_size);
-	init_size = le32_to_cpu(ucode->init_size);
-	init_data_size = le32_to_cpu(ucode->init_data_size);
-	boot_size = le32_to_cpu(ucode->boot_size);
+	inst_size = priv->cfg->ops->ucode->get_inst_size(ucode, api_ver);
+	data_size = priv->cfg->ops->ucode->get_data_size(ucode, api_ver);
+	init_size = priv->cfg->ops->ucode->get_init_size(ucode, api_ver);
+	init_data_size =
+		priv->cfg->ops->ucode->get_init_data_size(ucode, api_ver);
+	boot_size = priv->cfg->ops->ucode->get_boot_size(ucode, api_ver);
+	src = priv->cfg->ops->ucode->get_data(ucode, api_ver);
 
 	/* api_ver should match the api version forming part of the
 	 * firmware filename ... but we don't check for that and only rely
@@ -2138,12 +2140,13 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 
 
 	/* Verify size of file vs. image size info in file's header */
-	if (ucode_raw->size < sizeof(*ucode) +
+	if (ucode_raw->size != priv->cfg->ops->ucode->get_header_size(api_ver) +
 		inst_size + data_size + init_size +
 		init_data_size + boot_size) {
 
-		IWL_DEBUG_INFO(priv, "uCode file size %zd too small\n",
-			       ucode_raw->size);
+		IWL_DEBUG_INFO(priv,
+			"uCode file size %zd does not match expected size\n",
+			ucode_raw->size);
 		ret = -EINVAL;
 		goto err_release;
 	}
@@ -2226,44 +2229,44 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 	/* Copy images into buffers for card's bus-master reads ... */
 
 	/* Runtime instructions (first block of data in file) */
-	src = &ucode->data[0];
-	len = priv->ucode_code.len;
+	len = inst_size;
 	IWL_DEBUG_INFO(priv,
 		"Copying (but not loading) uCode instr len %zd\n", len);
 	memcpy(priv->ucode_code.v_addr, src, len);
+	src += len;
+
 	IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
 		priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
 
 	/* Runtime data (2nd block)
 	 * NOTE:  Copy into backup buffer will be done in iwl3945_up()  */
-	src = &ucode->data[inst_size];
-	len = priv->ucode_data.len;
+	len = data_size;
 	IWL_DEBUG_INFO(priv,
 		"Copying (but not loading) uCode data len %zd\n", len);
 	memcpy(priv->ucode_data.v_addr, src, len);
 	memcpy(priv->ucode_data_backup.v_addr, src, len);
+	src += len;
 
 	/* Initialization instructions (3rd block) */
 	if (init_size) {
-		src = &ucode->data[inst_size + data_size];
-		len = priv->ucode_init.len;
+		len = init_size;
 		IWL_DEBUG_INFO(priv,
 			"Copying (but not loading) init instr len %zd\n", len);
 		memcpy(priv->ucode_init.v_addr, src, len);
+		src += len;
 	}
 
 	/* Initialization data (4th block) */
 	if (init_data_size) {
-		src = &ucode->data[inst_size + data_size + init_size];
-		len = priv->ucode_init_data.len;
+		len = init_data_size;
 		IWL_DEBUG_INFO(priv,
 			"Copying (but not loading) init data len %zd\n", len);
 		memcpy(priv->ucode_init_data.v_addr, src, len);
+		src += len;
 	}
 
 	/* Bootstrap instructions (5th block) */
-	src = &ucode->data[inst_size + data_size + init_size + init_data_size];
-	len = priv->ucode_boot.len;
+	len = boot_size;
 	IWL_DEBUG_INFO(priv,
 		"Copying (but not loading) boot instr len %zd\n", len);
 	memcpy(priv->ucode_boot.v_addr, src, len);

linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch:
 iwl-debugfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch ---
Back-port to 2.6.31 of the following (pending) upstream commit...

>From ed9645671632b31d553c6336c4c1a8419afede7a Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre at intel.com>
Date: Mon, 14 Sep 2009 11:12:10 -0700
Subject: [PATCH] iwlwifi: fix debugfs buffer handling

From: Reinette Chatre <reinette.chatre at intel.com>

We keep track of where to write into a buffer by keeping a count of how
much has been written so far. When writing to the buffer we thus take the
buffer pointer and adding the count of what has been written so far.
Keeping track of what has been written so far is done by incrementing
this number every time something is written to the buffer with how much has
been written at that time.

Currently this number is incremented incorrectly when using the
"hex_dump_to_buffer" call to add data to the buffer. Fix this by only
adding what has been added to the buffer in that call instead of what has
been added since beginning of buffer.

Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
---
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2009-09-16 15:30:50.000000000 -0400
@@ -327,7 +327,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct
 		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
 		hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,
 				   buf_size - pos, 0);
-		pos += strlen(buf);
+		pos += strlen(buf + pos);
 		if (buf_size - pos > 0)
 			buf[pos++] = '\n';
 	}

linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch:
 iwl-agn.c  |    2 +-
 iwl-scan.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch ---
commit 5bddf54962bf68002816df710348ba197d6391bb
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Fri Aug 21 13:34:25 2009 -0700

    iwlwifi: fix unloading driver while scanning
    
    If NetworkManager is busy scanning when user
    tries to unload the module, the driver can not be unloaded
    because HW still scanning.
    
    Make sure driver sends abort scan host command to uCode if it
    is in the middle of scanning during driver unload.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 533b393..00457bf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2155,7 +2155,7 @@ static void iwl_mac_stop(struct ieee80211_hw *hw)
 
 	priv->is_open = 0;
 
-	if (iwl_is_ready_rf(priv)) {
+	if (iwl_is_ready_rf(priv) || test_bit(STATUS_SCAN_HW, &priv->status)) {
 		/* stop mac, cancel any scan request and clear
 		 * RXON_FILTER_ASSOC_MSK BIT
 		 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index c4c916d..4f3a108 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -796,7 +796,8 @@ void iwl_bg_abort_scan(struct work_struct *work)
 {
 	struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);
 
-	if (!iwl_is_ready(priv))
+	if (!test_bit(STATUS_READY, &priv->status) ||
+	    !test_bit(STATUS_GEO_CONFIGURED, &priv->status))
 		return;
 
 	mutex_lock(&priv->mutex);

linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch:
 iwl-6000.c |   18 ------------------
 iwl-agn.c  |    5 -----
 iwl-dev.h  |    1 -
 3 files changed, 24 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch ---
commit a11c4d000b84f7f49ebefc018c24bbfa3c9c0f3b
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Fri Jul 31 14:28:08 2009 -0700

    iwlwifi: remove deprecated 6000 series adapters
    
    Remove the support for deprecated devices. These devices are
    engineering samples and no longer supported by the uCode.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig	2009-09-17 10:35:39.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c	2009-09-17 10:38:22.000000000 -0400
@@ -75,24 +75,6 @@ static struct iwl_ops iwl6000_ops = {
 	.utils = &iwl6000_hcmd_utils,
 };
 
-struct iwl_cfg iwl6000_2ag_cfg = {
-	.name = "6000 Series 2x2 AG",
-	.fw_name_pre = IWL6000_FW_PRE,
-	.ucode_api_max = IWL6000_UCODE_API_MAX,
-	.ucode_api_min = IWL6000_UCODE_API_MIN,
-	.sku = IWL_SKU_A|IWL_SKU_G,
-	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
-	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
-	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
-	.mod_params = &iwl50_mod_params,
-	.valid_tx_ant = ANT_BC,
-	.valid_rx_ant = ANT_BC,
-	.need_pll_cfg = false,
-	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
-	.shadow_ram_support = true,
-};
-
 struct iwl_cfg iwl6000_2agn_cfg = {
 	.name = "6000 Series 2x2 AGN",
 	.fw_name_pre = IWL6000_FW_PRE,
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig	2009-09-17 10:35:39.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-09-17 10:37:46.000000000 -0400
@@ -3172,15 +3172,10 @@ static struct pci_device_id iwl_hw_card_
 	{IWL_PCI_DEVICE(0x423C, PCI_ANY_ID, iwl5150_agn_cfg)},
 	{IWL_PCI_DEVICE(0x423D, PCI_ANY_ID, iwl5150_agn_cfg)},
 /* 6000/6050 Series */
-	{IWL_PCI_DEVICE(0x0082, 0x1102, iwl6000_2ag_cfg)},
-	{IWL_PCI_DEVICE(0x0085, 0x1112, iwl6000_2ag_cfg)},
-	{IWL_PCI_DEVICE(0x0082, 0x1122, iwl6000_2ag_cfg)},
 	{IWL_PCI_DEVICE(0x422B, PCI_ANY_ID, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x422C, PCI_ANY_ID, iwl6000_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x4238, PCI_ANY_ID, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x4239, PCI_ANY_ID, iwl6000_2agn_cfg)},
-	{IWL_PCI_DEVICE(0x0082, PCI_ANY_ID, iwl6000_2agn_cfg)},
-	{IWL_PCI_DEVICE(0x0085, PCI_ANY_ID, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x0086, PCI_ANY_ID, iwl6050_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x0087, PCI_ANY_ID, iwl6050_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0088, PCI_ANY_ID, iwl6050_3agn_cfg)},
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig	2009-09-17 10:35:39.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h	2009-09-17 10:38:00.000000000 -0400
@@ -56,7 +56,6 @@ extern struct iwl_cfg iwl5350_agn_cfg;
 extern struct iwl_cfg iwl5100_bg_cfg;
 extern struct iwl_cfg iwl5100_abg_cfg;
 extern struct iwl_cfg iwl5150_agn_cfg;
-extern struct iwl_cfg iwl6000_2ag_cfg;
 extern struct iwl_cfg iwl6000_2agn_cfg;
 extern struct iwl_cfg iwl6000_3agn_cfg;
 extern struct iwl_cfg iwl6050_2agn_cfg;

linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch:
 iwl-1000.c   |    4 -
 iwl-6000.c   |   18 ++++-
 iwl-core.h   |    4 +
 iwl-dev.h    |   12 +++
 iwl-eeprom.c |  185 +++++++++++++++++++++++++++++++++++++++++++++++------------
 iwl-eeprom.h |   10 ++-
 6 files changed, 191 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch ---
Backport of the following upstream commit...

commit 415e49936b4b29b34c2fb561eeab867d41fc43a6
Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
Date:   Thu Aug 13 13:30:54 2009 -0700

    iwlwifi: traverse linklist to find the valid OTP block
    
    For devices using OTP memory, EEPROM image can start from
    any one of the OTP blocks. If shadow RAM is disabled, we need to
    traverse link list to find the last valid block, then start the EEPROM
    image reading.
    
    If OTP is not full, the valid block is the block _before_ the last block
    on the link list; the last block on the link list is the empty block
    ready for next OTP refresh/update.
    
    If OTP is full, then the last block is the valid block to be used for
    configure the device.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c	2009-09-17 09:26:23.000000000 -0400
@@ -62,12 +62,14 @@ struct iwl_cfg iwl1000_bgn_cfg = {
 	.ucode_api_min = IWL1000_UCODE_API_MIN,
 	.sku = IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl5000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_A,
 	.valid_rx_ant = ANT_AB,
 	.need_pll_cfg = true,
+	.max_ll_items = OTP_MAX_LL_ITEMS_1000,
+	.shadow_ram_support = false,
 };
 
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c	2009-09-17 09:55:14.000000000 -0400
@@ -89,6 +89,8 @@ struct iwl_cfg iwl6000_2ag_cfg = {
 	.valid_tx_ant = ANT_BC,
 	.valid_rx_ant = ANT_BC,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6000_2agn_cfg = {
@@ -98,13 +100,15 @@ struct iwl_cfg iwl6000_2agn_cfg = {
 	.ucode_api_min = IWL6000_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_AB,
 	.valid_rx_ant = ANT_AB,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6050_2agn_cfg = {
@@ -114,13 +118,15 @@ struct iwl_cfg iwl6050_2agn_cfg = {
 	.ucode_api_min = IWL6050_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+ 	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_AB,
 	.valid_rx_ant = ANT_AB,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6000_3agn_cfg = {
@@ -130,13 +136,15 @@ struct iwl_cfg iwl6000_3agn_cfg = {
 	.ucode_api_min = IWL6000_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+ 	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_ABC,
 	.valid_rx_ant = ANT_ABC,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 struct iwl_cfg iwl6050_3agn_cfg = {
@@ -146,13 +154,15 @@ struct iwl_cfg iwl6050_3agn_cfg = {
 	.ucode_api_min = IWL6050_UCODE_API_MIN,
 	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
 	.ops = &iwl6000_ops,
-	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+	.eeprom_size = OTP_LOW_IMAGE_SIZE,
 	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
 	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
 	.mod_params = &iwl50_mod_params,
 	.valid_tx_ant = ANT_ABC,
 	.valid_rx_ant = ANT_ABC,
 	.need_pll_cfg = false,
+	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
 };
 
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-core.h	2009-09-17 09:35:58.000000000 -0400
@@ -207,6 +207,8 @@ struct iwl_mod_params {
  * 	filename is constructed as fw_name_pre<api>.ucode.
  * @ucode_api_max: Highest version of uCode API supported by driver.
  * @ucode_api_min: Lowest version of uCode API supported by driver.
+ * @max_ll_items: max number of OTP blocks
+ * @shadow_ram_support: shadow support for OTP memory
  *
  * We enable the driver to be backward compatible wrt API version. The
  * driver specifies which APIs it supports (with @ucode_api_max being the
@@ -243,6 +245,8 @@ struct iwl_cfg {
 	u8   valid_rx_ant;
 	bool need_pll_cfg;
 	bool use_isr_legacy;
+	const u16 max_ll_items;
+	const bool shadow_ram_support;
 };
 
 /***************************
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h.orig	2009-09-17 09:22:27.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h	2009-09-17 09:40:55.000000000 -0400
@@ -835,6 +835,18 @@ enum iwl_nvm_type {
 	NVM_DEVICE_TYPE_OTP,
 };
 
+/*
+ * Two types of OTP memory access modes
+ *   IWL_OTP_ACCESS_ABSOLUTE - absolute address mode,
+ * 			        based on physical memory addressing
+ *   IWL_OTP_ACCESS_RELATIVE - relative address mode,
+ * 			       based on logical memory addressing
+ */
+enum iwl_access_mode {
+	IWL_OTP_ACCESS_ABSOLUTE,
+	IWL_OTP_ACCESS_RELATIVE,
+};
+
 /* interrupt statistics */
 struct isr_statistics {
 	u32 hw;
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.c	2009-09-17 09:37:20.000000000 -0400
@@ -152,6 +152,19 @@ int iwlcore_eeprom_verify_signature(stru
 }
 EXPORT_SYMBOL(iwlcore_eeprom_verify_signature);
 
+static void iwl_set_otp_access(struct iwl_priv *priv, enum iwl_access_mode mode)
+{
+	u32 otpgp;
+
+	otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
+	if (mode == IWL_OTP_ACCESS_ABSOLUTE)
+		iwl_clear_bit(priv, CSR_OTP_GP_REG,
+				CSR_OTP_GP_REG_OTP_ACCESS_MODE);
+	else
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
+				CSR_OTP_GP_REG_OTP_ACCESS_MODE);
+}
+
 static int iwlcore_get_nvm_type(struct iwl_priv *priv)
 {
 	u32 otpgp;
@@ -249,6 +262,124 @@ static int iwl_init_otp_access(struct iw
 	return ret;
 }
 
+static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, u16 *eeprom_data)
+{
+	int ret = 0;
+	u32 r;
+	u32 otpgp;
+
+	_iwl_write32(priv, CSR_EEPROM_REG,
+		     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+	ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,
+				  CSR_EEPROM_REG_READ_VALID_MSK,
+				  IWL_EEPROM_ACCESS_TIMEOUT);
+	if (ret < 0) {
+		IWL_ERR(priv, "Time out reading OTP[%d]\n", addr);
+		return ret;
+	}
+	r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
+	/* check for ECC errors: */
+	otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
+	if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
+		/* stop in this case */
+		/* set the uncorrectable OTP ECC bit for acknowledgement */
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
+			CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
+		IWL_ERR(priv, "Uncorrectable OTP ECC error, abort OTP read\n");
+		return -EINVAL;
+	}
+	if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
+		/* continue in this case */
+		/* set the correctable OTP ECC bit for acknowledgement */
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
+				CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
+		IWL_ERR(priv, "Correctable OTP ECC error, continue read\n");
+	}
+	*eeprom_data = le16_to_cpu((__force __le16)(r >> 16));
+	return 0;
+}
+
+/*
+ * iwl_is_otp_empty: check for empty OTP
+ */
+static bool iwl_is_otp_empty(struct iwl_priv *priv)
+{
+	u16 next_link_addr = 0, link_value;
+	bool is_empty = false;
+
+	/* locate the beginning of OTP link list */
+	if (!iwl_read_otp_word(priv, next_link_addr, &link_value)) {
+		if (!link_value) {
+			IWL_ERR(priv, "OTP is empty\n");
+			is_empty = true;
+		}
+	} else {
+		IWL_ERR(priv, "Unable to read first block of OTP list.\n");
+		is_empty = true;
+	}
+
+	return is_empty;
+}
+
+
+/*
+ * iwl_find_otp_image: find EEPROM image in OTP
+ *   finding the OTP block that contains the EEPROM image.
+ *   the last valid block on the link list (the block _before_ the last block)
+ *   is the block we should read and used to configure the device.
+ *   If all the available OTP blocks are full, the last block will be the block
+ *   we should read and used to configure the device.
+ *   only perform this operation if shadow RAM is disabled
+ */
+static int iwl_find_otp_image(struct iwl_priv *priv,
+					u16 *validblockaddr)
+{
+	u16 next_link_addr = 0, link_value = 0, valid_addr;
+	int ret = 0;
+	int usedblocks = 0;
+
+	/* set addressing mode to absolute to traverse the link list */
+	iwl_set_otp_access(priv, IWL_OTP_ACCESS_ABSOLUTE);
+
+	/* checking for empty OTP or error */
+	if (iwl_is_otp_empty(priv))
+		return -EINVAL;
+
+	/*
+	 * start traverse link list
+	 * until reach the max number of OTP blocks
+	 * different devices have different number of OTP blocks
+	 */
+	do {
+		/* save current valid block address
+		 * check for more block on the link list
+		 */
+		valid_addr = next_link_addr;
+		next_link_addr = link_value;
+		IWL_DEBUG_INFO(priv, "OTP blocks %d addr 0x%x\n",
+			       usedblocks, next_link_addr);
+		if (iwl_read_otp_word(priv, next_link_addr, &link_value))
+			return -EINVAL;
+		if (!link_value) {
+			/*
+			 * reach the end of link list,
+			 * set address point to the starting address
+			 * of the image
+			 */
+			goto done;
+		}
+		/* more in the link list, continue */
+		usedblocks++;
+	} while (usedblocks < priv->cfg->max_ll_items);
+	/* OTP full, use last block */
+	IWL_DEBUG_INFO(priv, "OTP is full, use last block\n");
+done:
+	*validblockaddr = valid_addr;
+	/* skip first 2 bytes (link list pointer) */
+	*validblockaddr += 2;
+	return ret;
+}
+
 /**
  * iwl_eeprom_init - read EEPROM contents
  *
@@ -263,14 +394,13 @@ int iwl_eeprom_init(struct iwl_priv *pri
 	int sz;
 	int ret;
 	u16 addr;
-	u32 otpgp;
+	u16 validblockaddr = 0;
+	u16 cache_addr = 0;
 
 	priv->nvm_device_type = iwlcore_get_nvm_type(priv);
 
 	/* allocate eeprom */
-	if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-		priv->cfg->eeprom_size =
-			OTP_BLOCK_SIZE * OTP_LOWER_BLOCKS_TOTAL;
+	IWL_DEBUG_INFO(priv, "NVM size = %d\n", priv->cfg->eeprom_size);
 	sz = priv->cfg->eeprom_size;
 	priv->eeprom = kzalloc(sz, GFP_KERNEL);
 	if (!priv->eeprom) {
@@ -298,46 +428,31 @@ int iwl_eeprom_init(struct iwl_priv *pri
 		if (ret) {
 			IWL_ERR(priv, "Failed to initialize OTP access.\n");
 			ret = -ENOENT;
-			goto err;
+			goto done;
 		}
 		_iwl_write32(priv, CSR_EEPROM_GP,
 			     iwl_read32(priv, CSR_EEPROM_GP) &
 			     ~CSR_EEPROM_GP_IF_OWNER_MSK);
-		/* clear */
-		_iwl_write32(priv, CSR_OTP_GP_REG,
-			     iwl_read32(priv, CSR_OTP_GP_REG) |
+
+		iwl_set_bit(priv, CSR_OTP_GP_REG,
 			     CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
 			     CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
-
-		for (addr = 0; addr < sz; addr += sizeof(u16)) {
-			u32 r;
-
-			_iwl_write32(priv, CSR_EEPROM_REG,
-				     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-
-			ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,
-						  CSR_EEPROM_REG_READ_VALID_MSK,
-						  IWL_EEPROM_ACCESS_TIMEOUT);
-			if (ret < 0) {
-				IWL_ERR(priv, "Time out reading OTP[%d]\n", addr);
+		/* traversing the linked list if no shadow ram supported */
+		if (!priv->cfg->shadow_ram_support) {
+			if (iwl_find_otp_image(priv, &validblockaddr)) {
+				ret = -ENOENT;
 				goto done;
 			}
-			r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
-			/* check for ECC errors: */
-			otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
-			if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
-				/* stop in this case */
-				IWL_ERR(priv, "Uncorrectable OTP ECC error, Abort OTP read\n");
+		}
+		for (addr = validblockaddr; addr < validblockaddr + sz;
+		     addr += sizeof(u16)) {
+			u16 eeprom_data;
+
+			ret = iwl_read_otp_word(priv, addr, &eeprom_data);
+			if (ret)
 				goto done;
-			}
-			if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
-				/* continue in this case */
-				_iwl_write32(priv, CSR_OTP_GP_REG,
-					     iwl_read32(priv, CSR_OTP_GP_REG) |
-					     CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
-				IWL_ERR(priv, "Correctable OTP ECC error, continue read\n");
-			}
-			e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
+			e[cache_addr / 2] = eeprom_data;
+			cache_addr += sizeof(u16);
 		}
 	} else {
 		/* eeprom is an array of 16bit values */
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-eeprom.h	2009-09-17 09:24:20.000000000 -0400
@@ -180,8 +180,14 @@ struct iwl_eeprom_channel {
 #define EEPROM_5050_EEPROM_VERSION	(0x21E)
 
 /* OTP */
-#define OTP_LOWER_BLOCKS_TOTAL		(3)
-#define OTP_BLOCK_SIZE			(0x400)
+/* lower blocks contain EEPROM image and calibration data */
+#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */
+/* high blocks contain PAPD data */
+#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */
+#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */
+#define OTP_MAX_LL_ITEMS_1000		(3)	/* OTP blocks for 1000 */
+#define OTP_MAX_LL_ITEMS_6x00		(4)	/* OTP blocks for 6x00 */
+#define OTP_MAX_LL_ITEMS_6x50		(7)	/* OTP blocks for 6x50 */
 
 /* 2.4 GHz */
 extern const u8 iwl_eeprom_band_1[14];

linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch:
 iwl-1000.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch ---
commit cce53aa347c1e023d967b1cb1aa393c725aedba5
Author: Jay Sternberg <jay.e.sternberg at intel.com>
Date:   Fri Jul 17 09:30:22 2009 -0700

    iwlwifi: update 1000 series API version to match firmware
    
    firmware file now contains build number so API needs to be updated.
    
    Signed-off-by: Jay Sternberg <jay.e.sternberg at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 7da52f1..a899be9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -46,7 +46,7 @@
 #include "iwl-5000-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL1000_UCODE_API_MAX 2
+#define IWL1000_UCODE_API_MAX 3
 
 /* Lowest firmware API version supported */
 #define IWL1000_UCODE_API_MIN 1

linux-2.6-raidlockdep.patch:
 file.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-raidlockdep.patch ---
Subject:
Re: 2.6.31rc5 RAID10 lockdep report - sysfs_nofity_dirent locking issue
From:
Dan Williams <dan.j.williams at intel.com>
Date:
Tue, 15 Sep 2009 16:05:51 -0700
To:
Greg KH <gregkh at suse.de>
CC:
Neil Brown <neilb at suse.de>, Dave Jones <davej at redhat.com>, Linux Kernel <linux-kernel at vger.kernel.org>, Hans de Goede <hdegoede at redhat.com>

>From 1ee8b5bfeb2de765d3b2acbaf5357c4c0eb65dbe Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb at suse.de>
Date: Thu, 6 Aug 2009 15:42:08 +1000
Subject: [PATCH] Allow sysfs_notify_dirent to be called from interrupt context.

sysfs_notify_dirent is a simple atomic operation that can be used to
alert user-space that new data can be read from a sysfs attribute.

Unfortunately it cannot currently be called from non-process context
because of its use of spin_lock which is sometimes taken with
interrupts enabled.

So change all lockers of sysfs_open_dirent_lock to disable interrupts,
thus making sysfs_notify_dirent safe to be called from non-process
context (as drivers/md does in md_safemode_timeout).

sysfs_get_open_dirent is (documented as being) only called from
process context, so it uses spin_lock_irq.  Other places
use spin_lock_irqsave.

The usage for sysfs_notify_dirent in md_safemode_timeout was
introduced in 2.6.28, so this patch is suitable for that and more
recent kernels.

Cc: <stable at kernel.org>
Reported-by: Joel Andres Granados <jgranado at redhat.com>
Signed-off-by: NeilBrown <neilb at suse.de>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
---
>> > > Greg?
>> > > 
>> > > Looks like this never made it upstream, and now Hans is hitting this
>> > > in his tests.
> > 
> > Ok, I don't have this in my queue, so someone needs to resubmit it and
> > tell me what kernel trees it should be applicable for.

As mentioned in the commit log should be applicable back to 2.6.28.

Thanks,
Dan


 fs/sysfs/file.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 561a9c0..f5ea468 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -268,7 +268,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
 	struct sysfs_open_dirent *od, *new_od = NULL;
 
  retry:
-	spin_lock(&sysfs_open_dirent_lock);
+	spin_lock_irq(&sysfs_open_dirent_lock);
 
 	if (!sd->s_attr.open && new_od) {
 		sd->s_attr.open = new_od;
@@ -281,7 +281,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
 		list_add_tail(&buffer->list, &od->buffers);
 	}
 
-	spin_unlock(&sysfs_open_dirent_lock);
+	spin_unlock_irq(&sysfs_open_dirent_lock);
 
 	if (od) {
 		kfree(new_od);
@@ -315,8 +315,9 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd,
 				  struct sysfs_buffer *buffer)
 {
 	struct sysfs_open_dirent *od = sd->s_attr.open;
+	unsigned long flags;
 
-	spin_lock(&sysfs_open_dirent_lock);
+	spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
 
 	list_del(&buffer->list);
 	if (atomic_dec_and_test(&od->refcnt))
@@ -324,7 +325,7 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd,
 	else
 		od = NULL;
 
-	spin_unlock(&sysfs_open_dirent_lock);
+	spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);
 
 	kfree(od);
 }
@@ -456,8 +457,9 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
 void sysfs_notify_dirent(struct sysfs_dirent *sd)
 {
 	struct sysfs_open_dirent *od;
+	unsigned long flags;
 
-	spin_lock(&sysfs_open_dirent_lock);
+	spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
 
 	od = sd->s_attr.open;
 	if (od) {
@@ -465,7 +467,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
 		wake_up_interruptible(&od->poll);
 	}
 
-	spin_unlock(&sysfs_open_dirent_lock);
+	spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);
 }
 EXPORT_SYMBOL_GPL(sysfs_notify_dirent);
 
-- 1.6.0.6 
linux-2.6-selinux-module-load-perms.patch:
 drivers/staging/comedi/comedi_fops.c         |    8 ++++----
 include/linux/security.h                     |   10 ++++++++++
 kernel/kmod.c                                |    4 ++++
 net/core/dev.c                               |    2 +-
 net/ipv4/tcp_cong.c                          |    4 ++--
 security/capability.c                        |    6 ++++++
 security/security.c                          |    5 +++++
 security/selinux/hooks.c                     |    6 ++++++
 security/selinux/include/av_perm_to_string.h |    1 +
 security/selinux/include/av_permissions.h    |    1 +
 10 files changed, 40 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-selinux-module-load-perms.patch ---
diff -up linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c.pre.module linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c
--- linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c.pre.module	2009-09-14 14:02:56.726491957 -0400
+++ linux-2.6.31.x86_64/drivers/staging/comedi/comedi_fops.c	2009-09-14 14:03:30.035571987 -0400
@@ -1752,12 +1752,12 @@ static int comedi_open(struct inode *ino
 	mutex_lock(&dev->mutex);
 	if (dev->attached)
 		goto ok;
-	if (!capable(CAP_SYS_MODULE) && dev->in_request_module) {
+	if (!capable(CAP_NET_ADMIN) && dev->in_request_module) {
 		DPRINTK("in request module\n");
 		mutex_unlock(&dev->mutex);
 		return -ENODEV;
 	}
-	if (capable(CAP_SYS_MODULE) && dev->in_request_module)
+	if (capable(CAP_NET_ADMIN) && dev->in_request_module)
 		goto ok;
 
 	dev->in_request_module = 1;
@@ -1770,8 +1770,8 @@ static int comedi_open(struct inode *ino
 
 	dev->in_request_module = 0;
 
-	if (!dev->attached && !capable(CAP_SYS_MODULE)) {
-		DPRINTK("not attached and not CAP_SYS_MODULE\n");
+	if (!dev->attached && !capable(CAP_NET_ADMIN)) {
+		DPRINTK("not attached and not CAP_NET_ADMIN\n");
 		mutex_unlock(&dev->mutex);
 		return -ENODEV;
 	}
diff -up linux-2.6.31.x86_64/include/linux/security.h.pre.module linux-2.6.31.x86_64/include/linux/security.h
--- linux-2.6.31.x86_64/include/linux/security.h.pre.module	2009-09-14 14:01:55.018199730 -0400
+++ linux-2.6.31.x86_64/include/linux/security.h	2009-09-14 14:03:35.710454710 -0400
@@ -678,6 +678,9 @@ static inline void security_free_mnt_opt
  *	@inode points to the inode to use as a reference.
  *	The current task must be the one that nominated @inode.
  *	Return 0 if successful.
+ * @kernel_module_request:
+ *	Ability to trigger the kernel to automatically upcall to userspace for
+ *	userspace to load a kernel module with the given name.
  * @task_setuid:
  *	Check permission before setting one or more of the user identity
  *	attributes of the current process.  The @flags parameter indicates
@@ -1489,6 +1492,7 @@ struct security_operations {
 	void (*cred_commit)(struct cred *new, const struct cred *old);
 	int (*kernel_act_as)(struct cred *new, u32 secid);
 	int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
+	int (*kernel_module_request)(void);
 	int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags);
 	int (*task_fix_setuid) (struct cred *new, const struct cred *old,
 				int flags);
@@ -1741,6 +1745,7 @@ int security_prepare_creds(struct cred *
 void security_commit_creds(struct cred *new, const struct cred *old);
 int security_kernel_act_as(struct cred *new, u32 secid);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
+int security_kernel_module_request(void);
 int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags);
 int security_task_fix_setuid(struct cred *new, const struct cred *old,
 			     int flags);
@@ -2292,6 +2297,11 @@ static inline int security_kernel_create
 	return 0;
 }
 
+static inline int security_kernel_module_request(void)
+{
+	return 0;
+}
+
 static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2,
 				       int flags)
 {
diff -up linux-2.6.31.x86_64/kernel/kmod.c.pre.module linux-2.6.31.x86_64/kernel/kmod.c
--- linux-2.6.31.x86_64/kernel/kmod.c.pre.module	2009-09-14 14:02:04.516942256 -0400
+++ linux-2.6.31.x86_64/kernel/kmod.c	2009-09-14 14:03:35.716407772 -0400
@@ -78,6 +78,10 @@ int __request_module(bool wait, const ch
 #define MAX_KMOD_CONCURRENT 50	/* Completely arbitrary value - KAO */
 	static int kmod_loop_msg;
 
+	ret = security_kernel_module_request();
+	if (ret)
+		return ret;
+
 	va_start(args, fmt);
 	ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
 	va_end(args);
diff -up linux-2.6.31.x86_64/net/core/dev.c.pre.module linux-2.6.31.x86_64/net/core/dev.c
--- linux-2.6.31.x86_64/net/core/dev.c.pre.module	2009-09-14 14:03:03.826314426 -0400
+++ linux-2.6.31.x86_64/net/core/dev.c	2009-09-14 14:03:30.044573421 -0400
@@ -1031,7 +1031,7 @@ void dev_load(struct net *net, const cha
 	dev = __dev_get_by_name(net, name);
 	read_unlock(&dev_base_lock);
 
-	if (!dev && capable(CAP_SYS_MODULE))
+	if (!dev && capable(CAP_NET_ADMIN))
 		request_module("%s", name);
 }
 
diff -up linux-2.6.31.x86_64/net/ipv4/tcp_cong.c.pre.module linux-2.6.31.x86_64/net/ipv4/tcp_cong.c
--- linux-2.6.31.x86_64/net/ipv4/tcp_cong.c.pre.module	2009-09-14 14:03:09.495142463 -0400
+++ linux-2.6.31.x86_64/net/ipv4/tcp_cong.c	2009-09-14 14:03:30.054565116 -0400
@@ -116,7 +116,7 @@ int tcp_set_default_congestion_control(c
 	spin_lock(&tcp_cong_list_lock);
 	ca = tcp_ca_find(name);
 #ifdef CONFIG_MODULES
-	if (!ca && capable(CAP_SYS_MODULE)) {
+	if (!ca && capable(CAP_NET_ADMIN)) {
 		spin_unlock(&tcp_cong_list_lock);
 
 		request_module("tcp_%s", name);
@@ -246,7 +246,7 @@ int tcp_set_congestion_control(struct so
 
 #ifdef CONFIG_MODULES
 	/* not found attempt to autoload module */
-	if (!ca && capable(CAP_SYS_MODULE)) {
+	if (!ca && capable(CAP_NET_ADMIN)) {
 		rcu_read_unlock();
 		request_module("tcp_%s", name);
 		rcu_read_lock();
diff -up linux-2.6.31.x86_64/security/capability.c.pre.module linux-2.6.31.x86_64/security/capability.c
--- linux-2.6.31.x86_64/security/capability.c.pre.module	2009-09-14 14:02:11.009778206 -0400
+++ linux-2.6.31.x86_64/security/capability.c	2009-09-14 14:03:35.718408863 -0400
@@ -396,6 +396,11 @@ static int cap_kernel_create_files_as(st
 	return 0;
 }
 
+static int cap_kernel_module_request(void)
+{
+	return 0;
+}
+
 static int cap_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags)
 {
 	return 0;
@@ -945,6 +950,7 @@ void security_fixup_ops(struct security_
 	set_to_cap_if_null(ops, cred_commit);
 	set_to_cap_if_null(ops, kernel_act_as);
 	set_to_cap_if_null(ops, kernel_create_files_as);
+	set_to_cap_if_null(ops, kernel_module_request);
 	set_to_cap_if_null(ops, task_setuid);
 	set_to_cap_if_null(ops, task_fix_setuid);
 	set_to_cap_if_null(ops, task_setgid);
diff -up linux-2.6.31.x86_64/security/security.c.pre.module linux-2.6.31.x86_64/security/security.c
--- linux-2.6.31.x86_64/security/security.c.pre.module	2009-09-14 14:02:17.341611595 -0400
+++ linux-2.6.31.x86_64/security/security.c	2009-09-14 14:03:35.720408600 -0400
@@ -709,6 +709,11 @@ int security_kernel_create_files_as(stru
 	return security_ops->kernel_create_files_as(new, inode);
 }
 
+int security_kernel_module_request(void)
+{
+	return security_ops->kernel_module_request();
+}
+
 int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags)
 {
 	return security_ops->task_setuid(id0, id1, id2, flags);
diff -up linux-2.6.31.x86_64/security/selinux/hooks.c.pre.module linux-2.6.31.x86_64/security/selinux/hooks.c
--- linux-2.6.31.x86_64/security/selinux/hooks.c.pre.module	2009-09-14 14:02:24.072199503 -0400
+++ linux-2.6.31.x86_64/security/selinux/hooks.c	2009-09-14 14:03:39.017312134 -0400
@@ -3292,6 +3292,11 @@ static int selinux_kernel_create_files_a
 	return 0;
 }
 
+static int selinux_kernel_module_request(void)
+{
+	return task_has_system(current, SYSTEM__MODULE_REQUEST);
+}
+
 static int selinux_task_setpgid(struct task_struct *p, pid_t pgid)
 {
 	return current_has_perm(p, PROCESS__SETPGID);
@@ -5400,6 +5405,7 @@ static struct security_operations selinu
 	.cred_prepare =			selinux_cred_prepare,
 	.kernel_act_as =		selinux_kernel_act_as,
 	.kernel_create_files_as =	selinux_kernel_create_files_as,
+	.kernel_module_request =	selinux_kernel_module_request,
 	.task_setpgid =			selinux_task_setpgid,
 	.task_getpgid =			selinux_task_getpgid,
 	.task_getsid =			selinux_task_getsid,
diff -up linux-2.6.31.x86_64/security/selinux/include/av_permissions.h.pre.module linux-2.6.31.x86_64/security/selinux/include/av_permissions.h
--- linux-2.6.31.x86_64/security/selinux/include/av_permissions.h.pre.module	2009-09-14 14:02:48.685714616 -0400
+++ linux-2.6.31.x86_64/security/selinux/include/av_permissions.h	2009-09-14 14:03:39.022321676 -0400
@@ -508,6 +508,7 @@
 #define SYSTEM__SYSLOG_READ                       0x00000002UL
 #define SYSTEM__SYSLOG_MOD                        0x00000004UL
 #define SYSTEM__SYSLOG_CONSOLE                    0x00000008UL
+#define SYSTEM__MODULE_REQUEST                    0x00000010UL
 #define CAPABILITY__CHOWN                         0x00000001UL
 #define CAPABILITY__DAC_OVERRIDE                  0x00000002UL
 #define CAPABILITY__DAC_READ_SEARCH               0x00000004UL
diff -up linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h.pre.module linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h
--- linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h.pre.module	2009-09-14 14:02:37.563058003 -0400
+++ linux-2.6.31.x86_64/security/selinux/include/av_perm_to_string.h	2009-09-14 14:03:39.019310239 -0400
@@ -107,6 +107,7 @@
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read")
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod")
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console")
+   S_(SECCLASS_SYSTEM, SYSTEM__MODULE_REQUEST, "module_request")
    S_(SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown")
    S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_OVERRIDE, "dac_override")
    S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search")

linux-2.6.31-cpufreq-powernow-k8-oops.patch:
 powernow-k8.c |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6.31-cpufreq-powernow-k8-oops.patch ---
--- vanilla-2.6.31/arch/x86/kernel/cpu/cpufreq/powernow-k8.c	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/arch/x86/kernel/cpu/cpufreq/powernow-k8.c	2009-09-16 11:27:33.000000000 -0400
@@ -605,9 +605,10 @@ static int check_pst_table(struct powern
 	return 0;
 }
 
-static void invalidate_entry(struct powernow_k8_data *data, unsigned int entry)
+static void invalidate_entry(struct cpufreq_frequency_table *powernow_table,
+		unsigned int entry)
 {
-	data->powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
+	powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
 }
 
 static void print_basics(struct powernow_k8_data *data)
@@ -914,13 +915,13 @@ static int fill_powernow_table_pstate(st
 					"bad value %d.\n", i, index);
 			printk(KERN_ERR PFX "Please report to BIOS "
 					"manufacturer\n");
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 		rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi);
 		if (!(hi & HW_PSTATE_VALID_MASK)) {
 			dprintk("invalid pstate %d, ignoring\n", index);
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 
@@ -970,7 +971,7 @@ static int fill_powernow_table_fidvid(st
 		/* verify frequency is OK */
 		if ((freq > (MAX_FREQ * 1000)) || (freq < (MIN_FREQ * 1000))) {
 			dprintk("invalid freq %u kHz, ignoring\n", freq);
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 
@@ -978,7 +979,7 @@ static int fill_powernow_table_fidvid(st
 		 * BIOSs are using "off" to indicate invalid */
 		if (vid == VID_OFF) {
 			dprintk("invalid vid %u, ignoring\n", vid);
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 
@@ -997,7 +998,7 @@ static int fill_powernow_table_fidvid(st
 
 				dprintk("double low frequency table entry, "
 						"ignoring it.\n");
-				invalidate_entry(data, i);
+				invalidate_entry(powernow_table, i);
 				continue;
 			} else
 				cntlofreq = i;
@@ -1009,7 +1010,7 @@ static int fill_powernow_table_fidvid(st
 				(unsigned int)
 				(data->acpi_data.states[i].core_frequency
 				 * 1000));
-			invalidate_entry(data, i);
+			invalidate_entry(powernow_table, i);
 			continue;
 		}
 	}

linux-2.6.31-cpuidle-faster-io.patch:
 drivers/cpuidle/governors/menu.c |  251 ++++++++++++++++++++++++++++++++-------
 include/linux/sched.h            |    4 
 kernel/sched.c                   |   18 ++
 3 files changed, 231 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6.31-cpuidle-faster-io.patch ---
Date: 	Tue, 15 Sep 2009 05:42:59 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: linux-kernel at vger.kernel.org
Cc: Andrew Morton <akpm at linux-foundation.org>,
        Arjan van de Ven <arjan at infradead.org>, lenb at kernel.org, mingo at elte.hu,
        yanmin_zhang at linux.intel.com, jens.axboe at oracle.com,
        Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Subject: [PATCH v2] cpuidle: Fix the menu governor to boost IO performance
Message-ID: <20090915054259.5282e5ba at infradead.org>

Reworked patch based on Andrew's review feedback and spelling fixes.
Rather than adding a new governor temporarily, this just puts the fixes
into the existing menu governor.

Andrew: this replaces cpuidle-a-new-variant-of-the-menu-governor-to-boost-io-performance.patch


I don't have a power meter in my hotel room so I've only been able to verify
that the patch functions as before with the timechart tool.
(no major changes were done though, only review feedback)


From: Arjan van de Ven <arjan at linux.intel.com>
Subject: cpuidle: Fix the menu governor to boost IO performance

Fix the menu idle governor which balances power savings, energy efficiency
and performance impact.

The reason for a reworked governor is that there have been serious
performance issues reported with the existing code on Nehalem server
systems.

To show this I'm sure Andrew wants to see benchmark results:
(benchmark is "fio", "no cstates" is using "idle=poll")

		no cstates	current linux	new algorithm
1 disk		107 Mb/s	85 Mb/s		105 Mb/s
2 disks		215 Mb/s	123 Mb/s	209 Mb/s
12 disks	590 Mb/s	320 Mb/s	585 Mb/s

In various power benchmark measurements, no degredation was found by our
measurement&diagnostics team.  Obviously a small percentage more power 
was used in the "fio" benchmark, due to the much higher performance.

While it would be a novel idea to describe the new algorithm in this
commit message, I cheaped out and described it in comments in the code
instead.

[changes since first post: spelling fixes from akpm, review feedback,
folded menu-tng into menu.c]

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Cc: Len Brown <lenb at kernel.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Yanmin Zhang <yanmin_zhang at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
---
 drivers/cpuidle/governors/menu.c |  251 ++++++++++++++++++++++++++++++++------
 include/linux/sched.h            |    4 +
 kernel/sched.c                   |   15 +++
 3 files changed, 231 insertions(+), 39 deletions(-)

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index f1df59f..9f3d775 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -2,8 +2,12 @@
  * menu.c - the menu idle governor
  *
  * Copyright (C) 2006-2007 Adam Belay <abelay at novell.com>
+ * Copyright (C) 2009 Intel Corporation
+ * Author:
+ *        Arjan van de Ven <arjan at linux.intel.com>
  *
- * This code is licenced under the GPL.
+ * This code is licenced under the GPL version 2 as described
+ * in the COPYING file that acompanies the Linux Kernel.
  */
 
 #include <linux/kernel.h>
@@ -13,20 +17,153 @@
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
+#include <linux/sched.h>
 
-#define BREAK_FUZZ	4	/* 4 us */
-#define PRED_HISTORY_PCT	50
+#define BUCKETS 12
+#define RESOLUTION 1024
+#define DECAY 4
+#define MAX_INTERESTING 50000
+
+/*
+ * Concepts and ideas behind the menu governor
+ *
+ * For the menu governor, there are 3 decision factors for picking a C
+ * state:
+ * 1) Energy break even point
+ * 2) Performance impact
+ * 3) Latency tolerance (from pmqos infrastructure)
+ * These these three factors are treated independently.
+ *
+ * Energy break even point
+ * -----------------------
+ * C state entry and exit have an energy cost, and a certain amount of time in
+ * the  C state is required to actually break even on this cost. CPUIDLE
+ * provides us this duration in the "target_residency" field. So all that we
+ * need is a good prediction of how long we'll be idle. Like the traditional
+ * menu governor, we start with the actual known "next timer event" time.
+ *
+ * Since there are other source of wakeups (interrupts for example) than
+ * the next timer event, this estimation is rather optimistic. To get a
+ * more realistic estimate, a correction factor is applied to the estimate,
+ * that is based on historic behavior. For example, if in the past the actual
+ * duration always was 50% of the next timer tick, the correction factor will
+ * be 0.5.
+ *
+ * menu uses a running average for this correction factor, however it uses a
+ * set of factors, not just a single factor. This stems from the realization
+ * that the ratio is dependent on the order of magnitude of the expected
+ * duration; if we expect 500 milliseconds of idle time the likelihood of
+ * getting an interrupt very early is much higher than if we expect 50 micro
+ * seconds of idle time. A second independent factor that has big impact on
+ * the actual factor is if there is (disk) IO outstanding or not.
+ * (as a special twist, we consider every sleep longer than 50 milliseconds
+ * as perfect; there are no power gains for sleeping longer than this)
+ *
+ * For these two reasons we keep an array of 12 independent factors, that gets
+ * indexed based on the magnitude of the expected duration as well as the
+ * "is IO outstanding" property.
+ *
+ * Limiting Performance Impact
+ * ---------------------------
+ * C states, especially those with large exit latencies, can have a real
+ * noticable impact on workloads, which is not acceptable for most sysadmins,
+ * and in addition, less performance has a power price of its own.
+ *
+ * As a general rule of thumb, menu assumes that the following heuristic
+ * holds:
+ *     The busier the system, the less impact of C states is acceptable
+ *
+ * This rule-of-thumb is implemented using a performance-multiplier:
+ * If the exit latency times the performance multiplier is longer than
+ * the predicted duration, the C state is not considered a candidate
+ * for selection due to a too high performance impact. So the higher
+ * this multiplier is, the longer we need to be idle to pick a deep C
+ * state, and thus the less likely a busy CPU will hit such a deep
+ * C state.
+ *
+ * Two factors are used in determing this multiplier:
+ * a value of 10 is added for each point of "per cpu load average" we have.
+ * a value of 5 points is added for each process that is waiting for
+ * IO on this CPU.
+ * (these values are experimentally determined)
+ *
+ * The load average factor gives a longer term (few seconds) input to the
+ * decision, while the iowait value gives a cpu local instantanious input.
+ * The iowait factor may look low, but realize that this is also already
+ * represented in the system load average.
+ *
+ */
 
 struct menu_device {
 	int		last_state_idx;
 
 	unsigned int	expected_us;
-	unsigned int	predicted_us;
-	unsigned int    current_predicted_us;
-	unsigned int	last_measured_us;
-	unsigned int	elapsed_us;
+	u64		predicted_us;
+	unsigned int	measured_us;
+	unsigned int	exit_us;
+	unsigned int	bucket;
+	u64		correction_factor[BUCKETS];
 };
 
+
+#define LOAD_INT(x) ((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+
+static int get_loadavg(void)
+{
+	unsigned long this = this_cpu_load();
+
+
+	return LOAD_INT(this) * 10 + LOAD_FRAC(this) / 10;
+}
+
+static inline int which_bucket(unsigned int duration)
+{
+	int bucket = 0;
+
+	/*
+	 * We keep two groups of stats; one with no
+	 * IO pending, one without.
+	 * This allows us to calculate
+	 * E(duration)|iowait
+	 */
+	if (nr_iowait_cpu())
+		bucket = BUCKETS/2;
+
+	if (duration < 10)
+		return bucket;
+	if (duration < 100)
+		return bucket + 1;
+	if (duration < 1000)
+		return bucket + 2;
+	if (duration < 10000)
+		return bucket + 3;
+	if (duration < 100000)
+		return bucket + 4;
+	return bucket + 5;
+}
+
+/*
+ * Return a multiplier for the exit latency that is intended
+ * to take performance requirements into account.
+ * The more performance critical we estimate the system
+ * to be, the higher this multiplier, and thus the higher
+ * the barrier to go to an expensive C state.
+ */
+static inline int performance_multiplier(void)
+{
+	int mult = 1;
+
+	/* for higher loadavg, we are more reluctant */
+
+	mult += 2 * get_loadavg();
+
+	/* for IO wait tasks (per cpu!) we add 5x each */
+	mult += 10 * nr_iowait_cpu();
+
+	return mult;
+}
+
 static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
 /**
@@ -38,37 +175,59 @@ static int menu_select(struct cpuidle_device *dev)
 	struct menu_device *data = &__get_cpu_var(menu_devices);
 	int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
 	int i;
+	int multiplier;
+
+	data->last_state_idx = 0;
+	data->exit_us = 0;
 
 	/* Special case when user has set very strict latency requirement */
-	if (unlikely(latency_req == 0)) {
-		data->last_state_idx = 0;
+	if (unlikely(latency_req == 0))
 		return 0;
-	}
 
-	/* determine the expected residency time */
+	/* determine the expected residency time, round up */
 	data->expected_us =
-		(u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
+	    DIV_ROUND_UP((u32)ktime_to_ns(tick_nohz_get_sleep_length()), 1000);
+
+
+	data->bucket = which_bucket(data->expected_us);
+
+	multiplier = performance_multiplier();
+
+	/*
+	 * if the correction factor is 0 (eg first time init or cpu hotplug
+	 * etc), we actually want to start out with a unity factor.
+	 */
+	if (data->correction_factor[data->bucket] == 0)
+		data->correction_factor[data->bucket] = RESOLUTION * DECAY;
+
+	/* Make sure to round up for half microseconds */
+	data->predicted_us = DIV_ROUND_CLOSEST(
+		data->expected_us * data->correction_factor[data->bucket],
+		RESOLUTION * DECAY);
+
+	/*
+	 * We want to default to C1 (hlt), not to busy polling
+	 * unless the timer is happening really really soon.
+	 */
+	if (data->expected_us > 5)
+		data->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
-	/* Recalculate predicted_us based on prediction_history_pct */
-	data->predicted_us *= PRED_HISTORY_PCT;
-	data->predicted_us += (100 - PRED_HISTORY_PCT) *
-				data->current_predicted_us;
-	data->predicted_us /= 100;
 
 	/* find the deepest idle state that satisfies our constraints */
-	for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
+	for (i = CPUIDLE_DRIVER_STATE_START; i < dev->state_count; i++) {
 		struct cpuidle_state *s = &dev->states[i];
 
-		if (s->target_residency > data->expected_us)
-			break;
 		if (s->target_residency > data->predicted_us)
 			break;
 		if (s->exit_latency > latency_req)
 			break;
+		if (s->exit_latency * multiplier > data->predicted_us)
+			break;
+		data->exit_us = s->exit_latency;
+		data->last_state_idx = i;
 	}
 
-	data->last_state_idx = i - 1;
-	return i - 1;
+	return data->last_state_idx;
 }
 
 /**
@@ -85,35 +244,49 @@ static void menu_reflect(struct cpuidle_device *dev)
 	unsigned int last_idle_us = cpuidle_get_last_residency(dev);
 	struct cpuidle_state *target = &dev->states[last_idx];
 	unsigned int measured_us;
+	u64 new_factor;
 
 	/*
 	 * Ugh, this idle state doesn't support residency measurements, so we
 	 * are basically lost in the dark.  As a compromise, assume we slept
-	 * for one full standard timer tick.  However, be aware that this
-	 * could potentially result in a suboptimal state transition.
+	 * for the whole expected time.
 	 */
 	if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID)))
-		last_idle_us = USEC_PER_SEC / HZ;
+		last_idle_us = data->expected_us;
+
+
+	measured_us = last_idle_us;
 
 	/*
-	 * measured_us and elapsed_us are the cumulative idle time, since the
-	 * last time we were woken out of idle by an interrupt.
+	 * We correct for the exit latency; we are assuming here that the
+	 * exit latency happens after the event that we're interested in.
 	 */
-	if (data->elapsed_us <= data->elapsed_us + last_idle_us)
-		measured_us = data->elapsed_us + last_idle_us;
+	if (measured_us > data->exit_us)
+		measured_us -= data->exit_us;
+
+
+	/* update our correction ratio */
+
+	new_factor = data->correction_factor[data->bucket]
+			* (DECAY - 1) / DECAY;
+
+	if (data->expected_us > 0 && data->measured_us < MAX_INTERESTING)
+		new_factor += RESOLUTION * measured_us / data->expected_us;
 	else
-		measured_us = -1;
+		/*
+		 * we were idle so long that we count it as a perfect
+		 * prediction
+		 */
+		new_factor += RESOLUTION;
 
-	/* Predict time until next break event */
-	data->current_predicted_us = max(measured_us, data->last_measured_us);
+	/*
+	 * We don't want 0 as factor; we always want at least
+	 * a tiny bit of estimated time.
+	 */
+	if (new_factor == 0)
+		new_factor = 1;
 
-	if (last_idle_us + BREAK_FUZZ <
-	    data->expected_us - target->exit_latency) {
-		data->last_measured_us = measured_us;
-		data->elapsed_us = 0;
-	} else {
-		data->elapsed_us = measured_us;
-	}
+	data->correction_factor[data->bucket] = new_factor;
 }
 
 /**
diff --git a/include/linux/sched.h b/include/linux/sched.h
index c0d9944..6b29155 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -140,6 +140,10 @@ extern int nr_processes(void);
 extern unsigned long nr_running(void);
 extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_iowait(void);
+extern unsigned long nr_iowait_cpu(void);
+extern unsigned long this_cpu_load(void);
+
+
 extern void calc_global_load(void);
 extern u64 cpu_nr_migrations(int cpu);
 
diff --git a/kernel/sched.c b/kernel/sched.c
index c512a02..1e2f1d0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3064,6 +3064,21 @@ unsigned long nr_iowait(void)
 	return sum;
 }
 
+unsigned long nr_iowait_cpu(void)
+{
+	int this_cpu = smp_processor_id();
+	struct rq *this_rq = cpu_rq(this_cpu);
+	return atomic_read(&this_rq->nr_iowait);
+}
+
+unsigned long this_cpu_load(void)
+{
+	int this_cpu = smp_processor_id();
+	struct rq *this_rq = cpu_rq(this_cpu);
+	return this_rq->cpu_load[0];
+}
+
+
 /* Variables and functions for calc_load */
 static atomic_long_t calc_load_tasks;
 static unsigned long calc_load_update;
-- 
1.6.0.6


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


ppc-hates-my-family-and-swore-revenge.patch:
 kernel/prom_init_check.sh |    6 ++++++
 lib/crtsavres.S           |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

--- NEW FILE ppc-hates-my-family-and-swore-revenge.patch ---
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 1ac136b..9f82f49 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -52,12 +52,18 @@ do
 	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
 		OK=1
 	fi
+	if [ "${UNDEF:0:10}" = "_restgpr0_" ]; then
+		OK=1
+	fi
 	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
 		OK=1
 	fi
 	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
 		OK=1
 	fi
+	if [ "${UNDEF:0:10}" = "_savegpr0_" ]; then
+		OK=1
+	fi
 	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
 		OK=1
 	fi
diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S
index 70a9cd8..42ed290 100644
--- a/arch/powerpc/lib/crtsavres.S
+++ b/arch/powerpc/lib/crtsavres.S
@@ -49,57 +49,75 @@
 /* function, just beyond the end of the integer save area.  */
 
 _GLOBAL(_savegpr_14)
+_GLOBAL(_savegpr0_14)
 _GLOBAL(_save32gpr_14)
 	stw	14,-72(11)	/* save gp registers */
 _GLOBAL(_savegpr_15)
+_GLOBAL(_savegpr0_15)
 _GLOBAL(_save32gpr_15)
 	stw	15,-68(11)
 _GLOBAL(_savegpr_16)
+_GLOBAL(_savegpr0_16)
 _GLOBAL(_save32gpr_16)
 	stw	16,-64(11)
 _GLOBAL(_savegpr_17)
+_GLOBAL(_savegpr0_17)
 _GLOBAL(_save32gpr_17)
 	stw	17,-60(11)
 _GLOBAL(_savegpr_18)
+_GLOBAL(_savegpr0_18)
 _GLOBAL(_save32gpr_18)
 	stw	18,-56(11)
 _GLOBAL(_savegpr_19)
+_GLOBAL(_savegpr0_19)
 _GLOBAL(_save32gpr_19)
 	stw	19,-52(11)
 _GLOBAL(_savegpr_20)
+_GLOBAL(_savegpr0_20)
 _GLOBAL(_save32gpr_20)
 	stw	20,-48(11)
 _GLOBAL(_savegpr_21)
+_GLOBAL(_savegpr0_21)
 _GLOBAL(_save32gpr_21)
 	stw	21,-44(11)
 _GLOBAL(_savegpr_22)
+_GLOBAL(_savegpr0_22)
 _GLOBAL(_save32gpr_22)
 	stw	22,-40(11)
 _GLOBAL(_savegpr_23)
+_GLOBAL(_savegpr0_23)
 _GLOBAL(_save32gpr_23)
 	stw	23,-36(11)
 _GLOBAL(_savegpr_24)
+_GLOBAL(_savegpr0_24)
 _GLOBAL(_save32gpr_24)
 	stw	24,-32(11)
 _GLOBAL(_savegpr_25)
+_GLOBAL(_savegpr0_25)
 _GLOBAL(_save32gpr_25)
 	stw	25,-28(11)
 _GLOBAL(_savegpr_26)
+_GLOBAL(_savegpr0_26)
 _GLOBAL(_save32gpr_26)
 	stw	26,-24(11)
 _GLOBAL(_savegpr_27)
+_GLOBAL(_savegpr0_27)
 _GLOBAL(_save32gpr_27)
 	stw	27,-20(11)
 _GLOBAL(_savegpr_28)
+_GLOBAL(_savegpr0_28)
 _GLOBAL(_save32gpr_28)
 	stw	28,-16(11)
 _GLOBAL(_savegpr_29)
+_GLOBAL(_savegpr0_29)
 _GLOBAL(_save32gpr_29)
 	stw	29,-12(11)
 _GLOBAL(_savegpr_30)
+_GLOBAL(_savegpr0_30)
 _GLOBAL(_save32gpr_30)
 	stw	30,-8(11)
 _GLOBAL(_savegpr_31)
+_GLOBAL(_savegpr0_31)
 _GLOBAL(_save32gpr_31)
 	stw	31,-4(11)
 	blr
@@ -109,57 +127,75 @@ _GLOBAL(_save32gpr_31)
 /* function, just beyond the end of the integer restore area.  */
 
 _GLOBAL(_restgpr_14)
+_GLOBAL(_restgpr0_14)
 _GLOBAL(_rest32gpr_14)
 	lwz	14,-72(11)	/* restore gp registers */
 _GLOBAL(_restgpr_15)
+_GLOBAL(_restgpr0_15)
 _GLOBAL(_rest32gpr_15)
 	lwz	15,-68(11)
 _GLOBAL(_restgpr_16)
+_GLOBAL(_restgpr0_16)
 _GLOBAL(_rest32gpr_16)
 	lwz	16,-64(11)
 _GLOBAL(_restgpr_17)
+_GLOBAL(_restgpr0_17)
 _GLOBAL(_rest32gpr_17)
 	lwz	17,-60(11)
 _GLOBAL(_restgpr_18)
+_GLOBAL(_restgpr0_18)
 _GLOBAL(_rest32gpr_18)
 	lwz	18,-56(11)
 _GLOBAL(_restgpr_19)
+_GLOBAL(_restgpr0_19)
 _GLOBAL(_rest32gpr_19)
 	lwz	19,-52(11)
 _GLOBAL(_restgpr_20)
+_GLOBAL(_restgpr0_20)
 _GLOBAL(_rest32gpr_20)
 	lwz	20,-48(11)
 _GLOBAL(_restgpr_21)
+_GLOBAL(_restgpr0_21)
 _GLOBAL(_rest32gpr_21)
 	lwz	21,-44(11)
 _GLOBAL(_restgpr_22)
+_GLOBAL(_restgpr0_22)
 _GLOBAL(_rest32gpr_22)
 	lwz	22,-40(11)
 _GLOBAL(_restgpr_23)
+_GLOBAL(_restgpr0_23)
 _GLOBAL(_rest32gpr_23)
 	lwz	23,-36(11)
 _GLOBAL(_restgpr_24)
+_GLOBAL(_restgpr0_24)
 _GLOBAL(_rest32gpr_24)
 	lwz	24,-32(11)
 _GLOBAL(_restgpr_25)
+_GLOBAL(_restgpr0_25)
 _GLOBAL(_rest32gpr_25)
 	lwz	25,-28(11)
 _GLOBAL(_restgpr_26)
+_GLOBAL(_restgpr0_26)
 _GLOBAL(_rest32gpr_26)
 	lwz	26,-24(11)
 _GLOBAL(_restgpr_27)
+_GLOBAL(_restgpr0_27)
 _GLOBAL(_rest32gpr_27)
 	lwz	27,-20(11)
 _GLOBAL(_restgpr_28)
+_GLOBAL(_restgpr0_28)
 _GLOBAL(_rest32gpr_28)
 	lwz	28,-16(11)
 _GLOBAL(_restgpr_29)
+_GLOBAL(_restgpr0_29)
 _GLOBAL(_rest32gpr_29)
 	lwz	29,-12(11)
 _GLOBAL(_restgpr_30)
+_GLOBAL(_restgpr0_30)
 _GLOBAL(_rest32gpr_30)
 	lwz	30,-8(11)
 _GLOBAL(_restgpr_31)
+_GLOBAL(_restgpr0_31)
 _GLOBAL(_rest32gpr_31)
 	lwz	31,-4(11)
 	blr


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97.6.6
retrieving revision 1.97.6.7
diff -u -p -r1.97.6.6 -r1.97.6.7
--- Makefile	3 Jul 2009 18:54:45 -0000	1.97.6.6
+++ Makefile	19 Sep 2009 16:47:26 -0000	1.97.6.7
@@ -136,6 +136,9 @@ reconfig:
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
 	@$(MAKE) tag TAG_OPTS="-F $(TAG_OPTS)"
 
+unused-kernel-patches:
+	@for f in *.patch; do if [ -e $$f ]; then (egrep -q "^Patch[[:digit:]]+:[[:space:]]+$$f" $(SPECFILE) || echo "Unused:    $$f") && egrep -q "^ApplyPatch[[:space:]]+$$f|^ApplyOptionalPatch[[:space:]]+$$f" $(SPECFILE) || echo "Unapplied: $$f"; fi; done
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
 


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.27.6.4
retrieving revision 1.27.6.5
diff -u -p -r1.27.6.4 -r1.27.6.5
--- config-powerpc64	5 Aug 2009 23:00:09 -0000	1.27.6.4
+++ config-powerpc64	19 Sep 2009 16:47:26 -0000	1.27.6.5
@@ -186,3 +186,5 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_PERF_COUNTERS=y
 CONFIG_EVENT_PROFILE=y
+
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  532 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   28 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5217 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  622 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  537 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  750 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  433 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1218 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  354 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  446 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  683 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1279 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  834 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1014 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  213 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2214 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  799 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  296 
 drivers/gpu/drm/nouveau/nv50_display.c      |  905 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  473 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  450 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 86 files changed, 58041 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.18
retrieving revision 1.8.6.19
diff -u -p -r1.8.6.18 -r1.8.6.19
--- drm-nouveau.patch	15 Sep 2009 19:45:37 -0000	1.8.6.18
+++ drm-nouveau.patch	19 Sep 2009 16:47:26 -0000	1.8.6.19
@@ -1822,10 +1822,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..b37ad94
+index 0000000..305efc3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5209 @@
+@@ -0,0 +1,5217 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -6927,6 +6927,11 @@ index 0000000..b37ad94
 +	if (bios->major_version < 5)	/* BMP only */
 +		load_nv17_hw_sequencer_ucode(dev, bios);
 +
++	if (bios->execute) {
++		bios->fp.last_script_invoc = 0;
++		bios->fp.lvds_init_run = false;
++	}
++
 +	parse_init_tables(bios);
 +
 +	/* Runs some additional script seen on G8x VBIOSen.  The VBIOS'
@@ -7016,9 +7021,12 @@ index 0000000..b37ad94
 +		return ret;
 +	}
 +
-+	if (bios->major_version < 5)
-+		/* feature_byte on BMP is poor, but init always sets CR4B */
++	/* feature_byte on BMP is poor, but init always sets CR4B */
++	if (bios->major_version < 5) {
++		bool waslocked = NVLockVgaCrtcs(dev, false);
 +		bios->is_mobile = NVReadVgaCrtc(dev, 0, NV_CIO_CRE_4B) & 0x40;
++		NVLockVgaCrtcs(dev, waslocked);
++	}
 +
 +	/* all BIT systems need p_f_m_t for digital_min_front_porch */
 +	if (bios->is_mobile || bios->major_version >= 5)
@@ -34165,10 +34173,10 @@ index 0000000..6bc0824
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..9a88a1a
+index 0000000..a96766d
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,443 @@
+@@ -0,0 +1,450 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34445,20 +34453,27 @@ index 0000000..9a88a1a
 +{
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	int i, hdr = IS_G80 ? 0x200 : 0x20;
++	uint32_t inst;
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
-+	if (chan->ramin && chan->ramin->gpuobj) {
-+		int i, hdr;
-+
-+		hdr = IS_G80 ? 0x200 : 0x20;
-+		dev_priv->engine.instmem.prepare_access(dev, true);
-+		for (i=hdr; i<hdr+24; i+=4)
-+			nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
-+		dev_priv->engine.instmem.finish_access(dev);
++	if (!chan->ramin || !chan->ramin->gpuobj)
++		return;
 +
-+		nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
++	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
++	if (inst & NV50_PGRAPH_CTXCTL_CUR_LOADED) {
++		inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
++		if (inst == chan->ramin->instance >> 12)
++			nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR, inst);
 +	}
++
++	dev_priv->engine.instmem.prepare_access(dev, true);
++	for (i=hdr; i<hdr+24; i+=4)
++		nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
++	dev_priv->engine.instmem.finish_access(dev);
++
++	nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
 +}
 +
 +static int


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.67
retrieving revision 1.1294.2.68
diff -u -p -r1.1294.2.67 -r1.1294.2.68
--- kernel.spec	15 Sep 2009 23:03:21 -0000	1.1294.2.67
+++ kernel.spec	19 Sep 2009 16:47:28 -0000	1.1294.2.68
@@ -435,7 +435,7 @@ Summary: The Linux kernel
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}
 %if %{with_dracut}
-%define initrd_prereq  dracut-kernel >= 001-7
+%define initrd_prereq  dracut >= 001-7
 %else
 %define initrd_prereq  mkinitrd >= 6.0.61-1
 %endif
@@ -667,8 +667,13 @@ Patch611: alsa-tell-user-that-stream-to-
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
-Patch680: linux-2.6-rt2x00-asus-leds.patch
-Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
+Patch680: linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
+Patch681: linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
+Patch682: linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
+Patch683: linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
+Patch684: linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
+Patch685: linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+Patch686: linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -677,6 +682,10 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
+Patch1000: linux-2.6.31-cpufreq-powernow-k8-oops.patch
+
+Patch1100: linux-2.6.31-cpuidle-faster-io.patch
+
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
@@ -698,10 +707,10 @@ Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
-Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
+Patch1826: drm-intel-no-tv-hotplug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -738,12 +747,17 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12012: linux-2.6-rtc-show-hctosys.patch
 Patch12013: linux-2.6-rfkill-all.patch
+Patch12014: linux-2.6-selinux-module-load-perms.patch
+
+Patch13000: ppc-hates-my-family-and-swore-revenge.patch
 
 # patches headed for -stable
 
 # scsi oops fixes
 Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
 Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+# Raid10 lockdep fix
+Patch14002: linux-2.6-raidlockdep.patch
 
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
@@ -1156,8 +1170,8 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-#ApplyPatch git-cpufreq.patch
-#ApplyPatch git-bluetooth.patch
+ApplyOptionalPatch git-cpufreq.patch
+#ApplyOptionalPatch git-bluetooth.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -1306,11 +1320,16 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # Make it possible to identify non-hotplug SATA ports
 ApplyPatch linux-2.6-ahci-export-capabilities.patch
 
-# rt2x00: back-port activity LED init patches
-#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
+# iwl1000 support patches
+ApplyPatch linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
+ApplyPatch linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
+ApplyPatch linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
+ApplyPatch linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
+ApplyPatch linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
+ApplyPatch linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
 
-# back-port scan result aging patches
-#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
+# remove support for deprecated iwl6000 parts
+ApplyPatch linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
 
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
@@ -1323,6 +1342,12 @@ ApplyPatch linux-2.6-crash-driver.patch
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
+# fix upstream bug #13780
+ApplyPatch linux-2.6.31-cpufreq-powernow-k8-oops.patch
+
+# cpuidle: Fix the menu governor to boost IO performance
+ApplyPatch linux-2.6.31-cpuidle-faster-io.patch
+
 # http://www.lirc.org/
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
@@ -1357,10 +1382,10 @@ ApplyPatch drm-nouveau.patch
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
+ApplyPatch drm-intel-no-tv-hotplug.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -1383,12 +1408,17 @@ ApplyPatch v4l-dvb-fix-cx25840-firmware-
 # Patches headed upstream
 ApplyPatch linux-2.6-rtc-show-hctosys.patch
 ApplyPatch linux-2.6-rfkill-all.patch
+ApplyPatch linux-2.6-selinux-module-load-perms.patch
+
+#ApplyPatch ppc-hates-my-family-and-swore-revenge.patch
 
 # patches headed for -stable
 
 # scsi oops fixes
 ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
 ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+# Raid10 lockdep fix
+ApplyPatch linux-2.6-raidlockdep.patch
 
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
@@ -1485,7 +1515,7 @@ BuildKernel() {
 
     cat >> Makefile <<\EOF
 # XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += -fno-var-tracking-assignments
+KBUILD_CFLAGS += $(call cc-option,-fno-var-tracking-assignments)
 EOF
 
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
@@ -2006,7 +2036,7 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %if %{with_dracut}\
-%ghost /boot/dracut-%{KVERREL}%{?2:.%{2}}.img\
+%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
 %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
@@ -2049,6 +2079,53 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 19 2009 Michael Young <m.a.young at durham.ac.uk>
+- Switch pvops from rebase/master to xen/master branch
+
+* Fri Sep 18 2009 Dave Jones <davej at redhat.com>
+- %ghost the dracut initramfs file.
+
+* Thu Sep 17 2009 Hans de Goede <hdegoede at redhat.com>
+- Now that we have %%post generation of dracut images we do not need to
+  Require dracut-kernel anymore
+
+* Thu Sep 17 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-33
+- Turn off CONFIG_CC_OPTIMIZE_FOR_SIZE on ppc64 until ld decides to play nice
+  and generate the save/restore stubs.
+
+* Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com>
+- Drop drm page-flip patch for F12.
+
+* Thu Sep 17 2009 Dave Jones <davej at redhat.com>
+- cpuidle: Fix the menu governor to boost IO performance.
+
+* Wed Sep 16 2009 John W. Linville <linville at redhat.com>
+- Add a few more iwl1000 support patches.
+- Remove support for deprecated iwl6000 parts.
+
+* Wed Sep 16 2009 Eric Paris <eparis at redhat.com>
+- Do not check CAP_SYS_MODULE when networking tres to autoload a module
+
+* Wed Sep 16 2009 John W. Linville <linville at redhat.com>
+- Add iwl1000 support patches.
+
+* Wed Sep 16 2009 Adam Jackson <ajax at redhat.com>
+- Disable hotplug interrupts on TV connectors on i915.
+
+* Wed Sep 16 2009 Dave Jones <davej at redhat.com>
+- Fix NULL deref in powernow-k8 driver. (korg #13780)
+
+* Wed Sep 16 2009 Hans de Goede <hdegoede at redhat.com>
+- Fix lockdep warning (and potential real deadlock) in mdraid10 code,
+  requested for -stable, rh#515471
+
+* Wed Sep 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-17
+- nouveau: potential fix for rh#522649 + misc other fixes
+
+* Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com>
+- Add unused-kernel-patches Make target, change some patches to
+  use ApplyOptionalPatch
+
 * Tue Sep 15 2009 Michael Young <m.a.young at durham.ac.uk>
 - switch to the F-12 branch for the moment
 - try an NX related fix

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 ------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/include/asm/xen/swiotlb.h         |   10 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   49 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    6 
 arch/x86/kernel/pci-swiotlb.c              |   25 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    7 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/ioremap.c                      |   72 -
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/physaddr.c                     |   70 +
 arch/x86/mm/physaddr.h                     |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  220 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |  989 +++++++++++++++++
 arch/x86/xen/pci.c                         |  111 ++
 arch/x86/xen/setup.c                       |  108 +
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/spinlock.c                    |   28 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/msi.c                          |    5 
 drivers/pci/xen-iommu.c                    |  271 ++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  657 +++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 +++++++++
 drivers/xen/events.c                       |  422 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 +++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1602 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +-----
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 +++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |  102 +
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 144 files changed, 12784 insertions(+), 1432 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.42
retrieving revision 1.1.2.43
diff -u -p -r1.1.2.42 -r1.1.2.43
--- xen.pvops.patch	15 Sep 2009 19:45:40 -0000	1.1.2.42
+++ xen.pvops.patch	19 Sep 2009 16:47:29 -0000	1.1.2.43
@@ -2042,19 +2042,17 @@ index 0000000..cb84abe
 +#endif	/* _ASM_X86_XEN_PCI_H */
 diff --git a/arch/x86/include/asm/xen/swiotlb.h b/arch/x86/include/asm/xen/swiotlb.h
 new file mode 100644
-index 0000000..81d8502
+index 0000000..d094f89
 --- /dev/null
 +++ b/arch/x86/include/asm/xen/swiotlb.h
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,10 @@
 +#ifndef _ASM_X86_XEN_SWIOTLB_H
 +#define _ASM_X86_XEN_SWIOTLB_H
 +
 +#ifdef CONFIG_PCI_XEN
-+extern int xen_swiotlb_init(void);
-+extern void xen_swiotlb_init_alloc(void);
++extern void xen_swiotlb_init(void);
 +#else
-+static inline int xen_swiotlb_init(void) { return -ENODEV; }
-+static void xen_swiotlb_init_alloc(void) { }
++static void xen_swiotlb_init(void) { }
 +#endif
 +
 +#endif
@@ -2420,7 +2418,7 @@ index 8fc248b..072eeda 100644
  		if (use_intel()) {
  			get_mtrr_state();
 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
-index 7538b76..1e035d3 100644
+index 7538b76..012be50 100644
 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
 @@ -5,6 +5,8 @@
@@ -2445,7 +2443,7 @@ index 7538b76..1e035d3 100644
  int amd_init_mtrr(void);
  int cyrix_init_mtrr(void);
  int centaur_init_mtrr(void);
-+#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN_DOM0
 +void xen_init_mtrr(void);
 +#else
 +static inline void xen_init_mtrr(void)
@@ -2913,7 +2911,7 @@ index 70ec9b9..cef3d70 100644
  
  	.start_context_switch = paravirt_nop,
 diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 1a041bc..90da583 100644
+index 1a041bc..6b76948 100644
 --- a/arch/x86/kernel/pci-dma.c
 +++ b/arch/x86/kernel/pci-dma.c
 @@ -10,6 +10,8 @@
@@ -2929,19 +2927,17 @@ index 1a041bc..90da583 100644
  
  	amd_iommu_detect();
  
-+	xen_swiotlb_init_alloc();
++	xen_swiotlb_init();
 +
  	pci_swiotlb_init();
  }
  
-@@ -281,6 +285,10 @@ static int __init pci_iommu_init(void)
+@@ -281,6 +285,8 @@ static int __init pci_iommu_init(void)
  	dma_debug_add_bus(&pci_bus_type);
  #endif
  
 +	xen_iommu_init();
 +
-+	xen_swiotlb_init();
-+
  	calgary_iommu_init();
  
  	intel_iommu_init();
@@ -3230,10 +3226,10 @@ index 5204332..22a5a6d 100644
  EXPORT_SYMBOL_GPL(math_state_restore);
  
 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
-index eefdeee..9b5a9f5 100644
+index eefdeee..dd313d0 100644
 --- a/arch/x86/mm/Makefile
 +++ b/arch/x86/mm/Makefile
-@@ -1,5 +1,9 @@
+@@ -1,5 +1,10 @@
  obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
 -	    pat.o pgtable.o gup.o
 +	    pat.o pgtable.o physaddr.o gup.o
@@ -3241,6 +3237,7 @@ index eefdeee..9b5a9f5 100644
 +# Make sure __phys_addr has no stackprotector
 +nostackp := $(call cc-option, -fno-stack-protector)
 +CFLAGS_physaddr.o		:= $(nostackp)
++CFLAGS_init.o			:= $(nostackp)
  
  obj-$(CONFIG_SMP)		+= tlb.o
  
@@ -3881,7 +3878,7 @@ index 0000000..ee0db39
 +#endif
 +}
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index eb33aaa..7119d45 100644
+index eb33aaa..44576cb 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -51,6 +51,7 @@
@@ -4025,7 +4022,7 @@ index eb33aaa..7119d45 100644
 +
 +		pte = pfn_pte(pfn, PAGE_KERNEL_RO);
 +
-+		if (HYPERVISOR_update_va_mapping((unsigned long)va, pte, 0))
++		if (HYPERVISOR_update_va_mapping(va, pte, 0))
 +			BUG();
 +
 +		frames[f] = mfn;
@@ -4038,7 +4035,23 @@ index eb33aaa..7119d45 100644
  static void load_TLS_descriptor(struct thread_struct *t,
  				unsigned int cpu, unsigned int i)
  {
-@@ -581,6 +647,29 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
+@@ -461,11 +527,10 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val,
+ 	} else if (addr == (unsigned long)machine_check) {
+ 		return 0;
+ #endif
+-	} else {
+-		/* Some other trap using IST? */
+-		if (WARN_ON(val->ist != 0))
+-			return 0;
+-	}
++	} else if (WARN(val->ist != 0,
++			"Unknown IST-using trap: vector %d, %pF, val->ist=%d\n",
++			vector, (void *)addr, val->ist))
++		return 0;
+ #endif	/* CONFIG_X86_64 */
+ 	info->address = addr;
+ 
+@@ -581,6 +646,29 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
  	preempt_enable();
  }
  
@@ -4068,7 +4081,7 @@ index eb33aaa..7119d45 100644
  static void xen_load_sp0(struct tss_struct *tss,
  			 struct thread_struct *thread)
  {
-@@ -598,6 +687,18 @@ static void xen_set_iopl_mask(unsigned mask)
+@@ -598,6 +686,18 @@ static void xen_set_iopl_mask(unsigned mask)
  	HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl);
  }
  
@@ -4087,7 +4100,7 @@ index eb33aaa..7119d45 100644
  static void xen_io_delay(void)
  {
  }
-@@ -635,7 +736,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
+@@ -635,7 +735,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
          return 0;
  }
  
@@ -4096,7 +4109,15 @@ index eb33aaa..7119d45 100644
  {
  	apic->read = xen_apic_read;
  	apic->write = xen_apic_write;
-@@ -907,6 +1008,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -647,7 +747,6 @@ static void set_xen_basic_apic_ops(void)
+ 
+ #endif
+ 
+-
+ static void xen_clts(void)
+ {
+ 	struct multicall_space mcs;
+@@ -907,6 +1006,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  	.load_sp0 = xen_load_sp0,
  
  	.set_iopl_mask = xen_set_iopl_mask,
@@ -4104,7 +4125,7 @@ index eb33aaa..7119d45 100644
  	.io_delay = xen_io_delay,
  
  	/* Xen takes care of %gs when switching to usermode for us */
-@@ -965,6 +1067,23 @@ static const struct machine_ops __initdata xen_machine_ops = {
+@@ -965,6 +1065,23 @@ static const struct machine_ops __initdata xen_machine_ops = {
  	.emergency_restart = xen_emergency_restart,
  };
  
@@ -4128,7 +4149,7 @@ index eb33aaa..7119d45 100644
  /* First C function to be called on Xen boot */
  asmlinkage void __init xen_start_kernel(void)
  {
-@@ -983,13 +1102,28 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -983,14 +1100,34 @@ asmlinkage void __init xen_start_kernel(void)
  	pv_apic_ops = xen_apic_ops;
  	pv_mmu_ops = xen_mmu_ops;
  
@@ -4140,7 +4161,6 @@ index eb33aaa..7119d45 100644
 +	 * Set up some pagetable state before starting to set any ptes.
  	 */
 -	load_percpu_segment(0);
--#endif
 +
 +	/* Prevent unwanted bits from being set in PTEs. */
 +	__supported_pte_mask &= ~_PAGE_GLOBAL;
@@ -4149,6 +4169,11 @@ index eb33aaa..7119d45 100644
 +
 +	__supported_pte_mask |= _PAGE_IOMAP;
 +
++#ifdef CONFIG_X86_64
++	/* Work out if we support NX */
++	check_efer();
+ #endif
+ 
 +	xen_setup_features();
 +
 +	/* Get mfn list */
@@ -4160,10 +4185,11 @@ index eb33aaa..7119d45 100644
 +	 * -fstack-protector code can be executed.
 +	 */
 +	xen_setup_stackprotector();
- 
++
  	xen_init_irq_ops();
  	xen_init_cpuid_mask();
-@@ -1001,7 +1135,7 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+@@ -1001,7 +1138,7 @@ asmlinkage void __init xen_start_kernel(void)
  	set_xen_basic_apic_ops();
  #endif
  
@@ -4172,7 +4198,7 @@ index eb33aaa..7119d45 100644
  
  	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
  		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
-@@ -1019,17 +1153,8 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1019,22 +1156,8 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_smp_init();
  
@@ -4187,10 +4213,15 @@ index eb33aaa..7119d45 100644
 -	if (!xen_initial_domain())
 -		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 -
- #ifdef CONFIG_X86_64
- 	/* Work out if we support NX */
- 	check_efer();
-@@ -1044,6 +1169,7 @@ asmlinkage void __init xen_start_kernel(void)
+-#ifdef CONFIG_X86_64
+-	/* Work out if we support NX */
+-	check_efer();
+-#endif
+-
+ 	/* Don't do the full vcpu_info placement stuff until we have a
+ 	   possible map and a non-dummy shared_info. */
+ 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
+@@ -1044,6 +1167,7 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_raw_console_write("mapping kernel into physical memory\n");
  	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
@@ -4198,7 +4229,7 @@ index eb33aaa..7119d45 100644
  
  	init_mm.pgd = pgd;
  
-@@ -1053,9 +1179,21 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1053,9 +1177,21 @@ asmlinkage void __init xen_start_kernel(void)
  	if (xen_feature(XENFEAT_supervisor_mode_kernel))
  		pv_info.kernel_rpl = 0;
  
@@ -4220,7 +4251,7 @@ index eb33aaa..7119d45 100644
  #ifdef CONFIG_X86_32
  	/* set up basic CPUID stuff */
  	cpu_detect(&new_cpu_data);
-@@ -1075,6 +1213,16 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1075,6 +1211,16 @@ asmlinkage void __init xen_start_kernel(void)
  		add_preferred_console("xenboot", 0, NULL);
  		add_preferred_console("tty", 0, NULL);
  		add_preferred_console("hvc", 0, NULL);
@@ -4845,10 +4876,10 @@ index 4ceb285..a654a49 100644
  static struct dentry *d_mmu_debug;
 diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
 new file mode 100644
-index 0000000..19b78e2
+index 0000000..5e2c856
 --- /dev/null
 +++ b/arch/x86/xen/pci-swiotlb.c
-@@ -0,0 +1,988 @@
+@@ -0,0 +1,989 @@
 +/*
 + * Dynamic DMA mapping support.
 + *
@@ -5195,8 +5226,15 @@ index 0000000..19b78e2
 +	return swiotlb_force || xen_swiotlb_arch_range_needs_mapping(paddr, size);
 +}
 +
-+static int is_xen_swiotlb_buffer(char *addr)
++static int is_xen_swiotlb_buffer(dma_addr_t dma_addr)
 +{
++	unsigned long mfn = PFN_DOWN(dma_addr);
++	unsigned long pfn = mfn_to_local_pfn(mfn);
++	char *addr = NULL;
++
++	if (pfn_valid(pfn))
++		addr = __va(pfn << PAGE_SHIFT);
++
 +	return addr >= xen_io_tlb_start && addr < xen_io_tlb_end;
 +}
 +
@@ -5351,7 +5389,8 @@ index 0000000..19b78e2
 + * dma_addr is the kernel virtual address of the bounce buffer to unmap.
 + */
 +static void
-+do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
++do_unmap_single(struct device *hwdev, char *dma_addr, size_t size,
++		enum dma_data_direction dir)
 +{
 +	unsigned long flags;
 +	int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
@@ -5546,13 +5585,13 @@ index 0000000..19b78e2
 + * whatever the device wrote there.
 + */
 +static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,
-+			 size_t size, int dir)
++			 size_t size, enum dma_data_direction dir)
 +{
 +	char *dma_addr = xen_swiotlb_bus_to_virt(hwdev, dev_addr);
 +
 +	BUG_ON(dir == DMA_NONE);
 +
-+	if (is_xen_swiotlb_buffer(dma_addr)) {
++ 	if (is_xen_swiotlb_buffer(dev_addr)) {
 +		do_unmap_single(hwdev, dma_addr, size, dir);
 +		return;
 +	}
@@ -5588,7 +5627,7 @@ index 0000000..19b78e2
 +
 +	BUG_ON(dir == DMA_NONE);
 +
-+	if (is_xen_swiotlb_buffer(dma_addr)) {
++	if (is_xen_swiotlb_buffer(dev_addr)) {
 +		sync_single(hwdev, dma_addr, size, dir, target);
 +		return;
 +	}
@@ -5821,20 +5860,13 @@ index 0000000..19b78e2
 +	.dma_supported = NULL,
 +};
 +
-+int __init xen_swiotlb_init(void)
-+{
-+	if (xen_pv_domain() && xen_initial_domain()) {
-+		iommu_detected = 1;
-+		return 0;
-+	}
-+	return -ENODEV;
-+}
-+void __init xen_swiotlb_init_alloc(void)
++void __init xen_swiotlb_init(void)
 +{
-+	if (xen_pv_domain() && xen_initial_domain()) {
++	if (xen_initial_domain()) {
 +		printk(KERN_INFO "PCI-DMA: Using Xen software bounce buffering for IO (Xen-SWIOTLB)\n");
 +		xen_swiotlb_init_with_default_size(64 * (1<<20));	/* default to 64MB */
 +		dma_ops = &xen_swiotlb_dma_ops;
++		iommu_detected = 1;
 +	}
 +}
 diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
@@ -5955,36 +5987,94 @@ index 0000000..44d91ad
 +}
 +#endif
 diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
-index ad0047f..2439456 100644
+index ad0047f..5eeeedb 100644
 --- a/arch/x86/xen/setup.c
 +++ b/arch/x86/xen/setup.c
-@@ -19,6 +19,7 @@
+@@ -19,7 +19,9 @@
  
  #include <xen/page.h>
  #include <xen/interface/callback.h>
 +#include <xen/interface/memory.h>
  #include <xen/interface/physdev.h>
++#include <xen/interface/memory.h>
  #include <xen/features.h>
  
-@@ -36,21 +37,62 @@ extern void xen_syscall32_target(void);
+ #include "xen-ops.h"
+@@ -32,25 +34,121 @@ extern void xen_sysenter_target(void);
+ extern void xen_syscall_target(void);
+ extern void xen_syscall32_target(void);
+ 
++static unsigned long __init xen_release_chunk(phys_addr_t start_addr, phys_addr_t end_addr)
++{
++	struct xen_memory_reservation reservation = {
++		.address_bits = 0,
++		.extent_order = 0,
++		.domid        = DOMID_SELF
++	};
++	unsigned long start, end;
++	unsigned long len = 0;
++	unsigned long pfn;
++	int ret;
++
++	start = PFN_UP(start_addr);
++	end = PFN_DOWN(end_addr);
++
++	if (end <= start)
++		return 0;
++
++	printk(KERN_INFO "xen_release_chunk: looking at area pfn %lx-%lx\n", start, end);
++	for(pfn = start; pfn < end; pfn++) {
++		unsigned long mfn = pfn_to_mfn(mfn);
++
++		/* Make sure pfn exists to start with */
++		if (mfn == INVALID_P2M_ENTRY || mfn_to_pfn(mfn) != pfn)
++			continue;
++
++		set_xen_guest_handle(reservation.extent_start, &mfn);
++		reservation.nr_extents = 1;
++
++		ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
++		WARN(ret != 1, "Failed to release memory %lx-%lx err=%d\n",
++		     start, end, ret);
++		if (ret == 1) {
++			set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
++			len++;
++		}
++	}
++
++	return len;
++}
++
++static unsigned long __init xen_return_unused_memory(const struct e820map *e820)
++{
++	unsigned long last_end = 0;
++	unsigned long released = 0;
++	int i;
++
++	for (i = 0; i < e820->nr_map; i++) {
++		released += xen_release_chunk(last_end, e820->map[i].addr);
++		last_end = e820->map[i].addr + e820->map[i].size;
++	}
++
++	released += xen_release_chunk(last_end, PFN_PHYS(xen_start_info->nr_pages));
++
++	printk(KERN_INFO "released %ld pages of unused memory\n", released);
++	return released;
++}
+ 
  /**
   * machine_specific_memory_setup - Hook for machine specific memory setup.
   **/
 -
  char * __init xen_memory_setup(void)
  {
++	static __initdata struct e820entry map[E820MAX];
++
  	unsigned long max_pfn = xen_start_info->nr_pages;
++	struct xen_memory_map memmap;
 +	unsigned long long mem_end;
++	int op;
 +	int rc;
-+	struct xen_memory_map memmap;
-+	/*
-+	 * This is rather large for a stack variable but this early in
-+	 * the boot process we know we have plenty slack space.
-+	 */
-+	struct e820entry map[E820MAX];
-+	int op = xen_initial_domain() ?
-+		XENMEM_machine_memory_map :
-+		XENMEM_memory_map;
 +	int i;
  
  	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);
@@ -5993,6 +6083,9 @@ index ad0047f..2439456 100644
 +	memmap.nr_entries = E820MAX;
 +	set_xen_guest_handle(memmap.buffer, map);
 +
++	op = xen_initial_domain() ?
++		XENMEM_machine_memory_map :
++		XENMEM_memory_map;
 +	rc = HYPERVISOR_memory_op(op, &memmap);
 +	if (rc == -ENOSYS) {
 +		memmap.nr_entries = 1;
@@ -6032,7 +6125,16 @@ index ad0047f..2439456 100644
  	 */
  	e820_add_region(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS,
  			E820_RESERVED);
-@@ -188,7 +230,5 @@ void __init xen_arch_setup(void)
+@@ -67,6 +165,8 @@ char * __init xen_memory_setup(void)
+ 
+ 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+ 
++	xen_return_unused_memory(&e820);
++
+ 	return "Xen";
+ }
+ 
+@@ -188,7 +288,5 @@ void __init xen_arch_setup(void)
  
  	pm_idle = xen_idle;
  
@@ -6829,6 +6931,29 @@ index 1ebd6b4..3590082 100644
  obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o
  
  obj-$(CONFIG_PCI_IOV) += iov.o
+diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
+index d986afb..b40c6d0 100644
+--- a/drivers/pci/msi.c
++++ b/drivers/pci/msi.c
+@@ -20,6 +20,8 @@
+ #include <asm/errno.h>
+ #include <asm/io.h>
+ 
++#include <asm/xen/hypervisor.h>
++
+ #include "pci.h"
+ #include "msi.h"
+ 
+@@ -269,7 +271,8 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg)
+ {
+ 	struct irq_desc *desc = irq_to_desc(irq);
+ 
+-	write_msi_msg_desc(desc, msg);
++	if (!xen_initial_domain())
++		write_msi_msg_desc(desc, msg);
+ }
+ 
+ static int msi_free_irqs(struct pci_dev* dev);
 diff --git a/drivers/pci/xen-iommu.c b/drivers/pci/xen-iommu.c
 new file mode 100644
 index 0000000..9ba63b1
@@ -8017,7 +8142,7 @@ index 0000000..8bab63d
 +blkbk-y	:= blkback.o xenbus.o interface.o vbd.o
 diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
 new file mode 100644
-index 0000000..31458bd
+index 0000000..e9e3de1
 --- /dev/null
 +++ b/drivers/xen/blkback/blkback.c
 @@ -0,0 +1,657 @@
@@ -8063,6 +8188,7 @@ index 0000000..31458bd
 +#include <linux/list.h>
 +#include <linux/delay.h>
 +#include <linux/freezer.h>
++
 +#include <xen/balloon.h>
 +#include <xen/events.h>
 +#include <xen/page.h>
@@ -8406,7 +8532,6 @@ index 0000000..31458bd
 +				 struct blkif_request *req,
 +				 pending_req_t *pending_req)
 +{
-+	extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]);
 +	struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST];
 +	struct phys_req preq;
 +	struct {

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/include/linux/swiotlb.h               |    1 +
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 24 insertions(+)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -p -r1.1.2.27 -r1.1.2.28
--- xen.pvops.post.patch	15 Sep 2009 23:03:23 -0000	1.1.2.27
+++ xen.pvops.post.patch	19 Sep 2009 16:47:33 -0000	1.1.2.28
@@ -80,43 +80,3 @@ index cb1a663..f4ebffb 100644
  
  struct device;
  struct dma_attrs;
-diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
-index 72bb3a2..0088329 100644
---- a/arch/x86/mm/Makefile
-+++ b/arch/x86/mm/Makefile
-@@ -4,6 +4,7 @@ obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
- # Make sure __phys_addr has no stackprotector
- nostackp := $(call cc-option, -fno-stack-protector)
- CFLAGS_physaddr.o		:= $(nostackp)
-+CFLAGS_init.o			:= $(nostackp)
- 
- obj-$(CONFIG_SMP)		+= tlb.o
- 
-diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 03644f9..5b55c92 100644
---- a/arch/x86/xen/enlighten.c
-+++ b/arch/x86/xen/enlighten.c
-@@ -1092,6 +1092,11 @@ asmlinkage void __init xen_start_kernel(void)
- 
- 	__supported_pte_mask |= _PAGE_IOMAP;
- 
-+#ifdef CONFIG_X86_64
-+	/* Work out if we support NX */
-+	check_efer();
-+#endif
-+
- 	xen_setup_features();
- 
- 	/* Get mfn list */
-@@ -1132,11 +1137,6 @@ asmlinkage void __init xen_start_kernel(void)
- 
- 	pgd = (pgd_t *)xen_start_info->pt_base;
- 
--#ifdef CONFIG_X86_64
--	/* Work out if we support NX */
--	check_efer();
--#endif
--
- 	/* Don't do the full vcpu_info placement stuff until we have a
- 	   possible map and a non-dummy shared_info. */
- 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];


--- drm-page-flip.patch DELETED ---


--- linux-2.6-mac80211-age-scan-results-on-resume.patch DELETED ---


--- linux-2.6-rt2x00-asus-leds.patch DELETED ---



From rishi at fedoraproject.org  Sat Sep 19 16:48:25 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 19 Sep 2009 16:48:25 +0000 (UTC)
Subject: rpms/bouml/F-11 .cvsignore, 1.20, 1.21 bouml.spec, 1.28,
	1.29 sources, 1.22, 1.23
Message-ID: <20090919164825.5DA1011C00E6@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.14-1
- Version bump to 4.14. (Red Hat Bugzilla #512401)
  * Previous releases can not read a project saved with this version, but
    projects made by previous releases can be read.
  * When a package was deleted from a plug-out the container package was not
    marked modified and was not saved without an other reason marking it
    modified, and an error occured on reloading the project. Fixed.
  * It is not possible to resize the classes drawn with the standard
    representation (not using an icon) in a class diagram.
  * New drawing setting "hide get/set operations" to apply on 'official' get
    and set operations in class diagrams. The get/set operations are shown by
    default.
  * New C++ generation setting "inline force include in header" to include
    headers defining types referenced in inline operations. This switched on
    by default for older projects, but turned off for new ones.
  * http://bouml.free.fr/historic.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Jul 2009 09:41:47 -0000	1.20
+++ .cvsignore	19 Sep 2009 16:48:24 -0000	1.21
@@ -1 +1 @@
-bouml_4.13.tar.gz
+bouml_4.14.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-11/bouml.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- bouml.spec	4 Jul 2009 09:41:47 -0000	1.28
+++ bouml.spec	19 Sep 2009 16:48:25 -0000	1.29
@@ -5,7 +5,7 @@
 
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.13
+Version:	4.14
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -110,6 +110,26 @@ fi
 %{_libdir}/%{name}/*
 
 %changelog
+* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.14-1
+- Version bump to 4.14. (Red Hat Bugzilla #512401)
+  * Previous releases can not read a project saved with this version, but
+    projects made by previous releases can be read.
+  * When a package was deleted from a plug-out the container package was not
+    marked modified and was not saved without an other reason marking it
+    modified, and an error occured on reloading the project. Fixed.
+  * It is not possible to resize the classes drawn with the standard
+    representation (not using an icon) in a class diagram.
+  * New drawing setting "hide get/set operations" to apply on 'official' get
+    and set operations in class diagrams. The get/set operations are shown by
+    default.
+  * New C++ generation setting "inline force include in header" to include
+    headers defining types referenced in inline operations. This switched on
+    by default for older projects, but turned off for new ones.
+  * http://bouml.free.fr/historic.html
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 4.13-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.13-1
 - Version bump to 4.13.
   * Added active on activity, class and state.
@@ -147,6 +167,7 @@ fi
   * XMI2 Generator:
     + The base type of a class stereotyped typedef is now produced in an
       extension form supposing you ask for them.
+  * http://bouml.free.fr/historic.html
 
 * Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
 - Version bump to 4.12.1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	4 Jul 2009 09:41:47 -0000	1.22
+++ sources	19 Sep 2009 16:48:25 -0000	1.23
@@ -1 +1 @@
-b45efd68dd6f45fbddad48ebbf90a786  bouml_4.13.tar.gz
+4eaaddb10f86a31ca7ac7663a6f2f8b4  bouml_4.14.tar.gz



From rishi at fedoraproject.org  Sat Sep 19 16:49:54 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 19 Sep 2009 16:49:54 +0000 (UTC)
Subject: rpms/bouml/F-10 .cvsignore, 1.20, 1.21 bouml.spec, 1.26,
	1.27 sources, 1.22, 1.23
Message-ID: <20090919164954.AF9A711C00E6@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13265

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.14-1
- Version bump to 4.14. (Red Hat Bugzilla #512401)
  * Previous releases can not read a project saved with this version, but
    projects made by previous releases can be read.
  * When a package was deleted from a plug-out the container package was not
    marked modified and was not saved without an other reason marking it
    modified, and an error occured on reloading the project. Fixed.
  * It is not possible to resize the classes drawn with the standard
    representation (not using an icon) in a class diagram.
  * New drawing setting "hide get/set operations" to apply on 'official' get
    and set operations in class diagrams. The get/set operations are shown by
    default.
  * New C++ generation setting "inline force include in header" to include
    headers defining types referenced in inline operations. This switched on
    by default for older projects, but turned off for new ones.
  * http://bouml.free.fr/historic.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Jul 2009 09:38:32 -0000	1.20
+++ .cvsignore	19 Sep 2009 16:49:54 -0000	1.21
@@ -1 +1 @@
-bouml_4.13.tar.gz
+bouml_4.14.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-10/bouml.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- bouml.spec	4 Jul 2009 09:38:32 -0000	1.26
+++ bouml.spec	19 Sep 2009 16:49:54 -0000	1.27
@@ -5,7 +5,7 @@
 
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.13
+Version:	4.14
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -110,6 +110,26 @@ fi
 %{_libdir}/%{name}/*
 
 %changelog
+* Sat Sep 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.14-1
+- Version bump to 4.14. (Red Hat Bugzilla #512401)
+  * Previous releases can not read a project saved with this version, but
+    projects made by previous releases can be read.
+  * When a package was deleted from a plug-out the container package was not
+    marked modified and was not saved without an other reason marking it
+    modified, and an error occured on reloading the project. Fixed.
+  * It is not possible to resize the classes drawn with the standard
+    representation (not using an icon) in a class diagram.
+  * New drawing setting "hide get/set operations" to apply on 'official' get
+    and set operations in class diagrams. The get/set operations are shown by
+    default.
+  * New C++ generation setting "inline force include in header" to include
+    headers defining types referenced in inline operations. This switched on
+    by default for older projects, but turned off for new ones.
+  * http://bouml.free.fr/historic.html
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 4.13-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.13-1
 - Version bump to 4.13.
   * Added active on activity, class and state.
@@ -147,6 +167,7 @@ fi
   * XMI2 Generator:
     + The base type of a class stereotyped typedef is now produced in an
       extension form supposing you ask for them.
+  * http://bouml.free.fr/historic.html
 
 * Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
 - Version bump to 4.12.1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	4 Jul 2009 09:38:32 -0000	1.22
+++ sources	19 Sep 2009 16:49:54 -0000	1.23
@@ -1 +1 @@
-b45efd68dd6f45fbddad48ebbf90a786  bouml_4.13.tar.gz
+4eaaddb10f86a31ca7ac7663a6f2f8b4  bouml_4.14.tar.gz



From rdieter at fedoraproject.org  Sat Sep 19 17:42:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Sep 2009 17:42:28 +0000 (UTC)
Subject: rpms/tellico/devel tellico.spec, 1.38,
	1.39 tellico-1.3.5-gcc44.patch, 1.1, NONE
Message-ID: <20090919174228.E41C911C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29428

Modified Files:
	tellico.spec 
Removed Files:
	tellico-1.3.5-gcc44.patch 
Log Message:
* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.2.pre2
- use %_kde4_* macros
- optimize scriptlets
- update URL, Source0



Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- tellico.spec	12 Sep 2009 14:29:59 -0000	1.38
+++ tellico.spec	19 Sep 2009 17:42:28 -0000	1.39
@@ -1,12 +1,15 @@
+
+%define pre pre2
+
 Name:           tellico
 Version:        2.0
-Release:        0.1.pre2%{?dist}
+Release:        0.2.%{pre}%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
 License:        GPLv2
-URL:            http://www.periapsis.org/tellico/
-Source0:        http://www.periapsis.org/tellico/download/%{name}-%{version}pre2.tar.bz2
+URL:            http://tellico-project.org/ 
+Source0:        http://tellico-project.org/files/tellico-%{version}%{?pre}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.2-3
@@ -49,13 +52,13 @@ directly from Amazon.com.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}%{?pre}
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
+%{cmake_kde4} ..
 popd
 
 #configure --disable-rpath --enable-webcam
@@ -63,37 +66,31 @@ make %{?_smp_mflags}  -C %{_target_platf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT  -C %{_target_platform}
-%find_lang %{name}
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
-  lang=$(basename $lang_dir)
-  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
-  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
-done
+make install/fast DESTDIR=$RPM_BUILD_ROOT  -C %{_target_platform}
+%find_lang %{name} --with-kde
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
-  --add-category X-Fedora                           \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*
 
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
 
 %postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  update-mime-database %{_kde4_datadir}/mime &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache -q %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
+gtk-update-icon-cache -q %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,20 +99,25 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
-%{_bindir}/*
-%{_datadir}/applications/kde4/tellico.desktop
-%{_datadir}/kde4/apps/kconf_update/
-%{_datadir}/config.kcfg/tellico_config.kcfg
-%{_datadir}/config/tellicorc
-%{_datadir}/config/tellico-script.knsrc
-%{_datadir}/config/tellico-template.knsrc
-%{_datadir}/kde4/apps/tellico/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/application/x-tellico.desktop
-%{_datadir}/mime/packages/tellico.xml
+%{_kde4_bindir}/tellico
+%{_kde4_datadir}/applications/kde4/tellico.desktop
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/tellico/
+%{_kde4_datadir}/config.kcfg/tellico_config.kcfg
+%{_kde4_configdir}/tellicorc
+%{_kde4_configdir}/tellico-script.knsrc
+%{_kde4_configdir}/tellico-template.knsrc
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_datadir}/mimelnk/application/x-tellico.desktop
+%{_kde4_datadir}/mime/packages/tellico.xml
 
 
 %changelog
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.2.pre2
+- use %%_kde4_* macros
+- optimize scriptlets
+- update URL, Source0
+
 * Fri Sep 11 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-0.1.pre2
 - Update to upstream version 2.0 pre-release 2
 - Drop gcc4 patch, now upstream


--- tellico-1.3.5-gcc44.patch DELETED ---



From john5342 at fedoraproject.org  Sat Sep 19 17:50:57 2009
From: john5342 at fedoraproject.org (john5342)
Date: Sat, 19 Sep 2009 17:50:57 +0000 (UTC)
Subject: rpms/libmsn/devel .cvsignore, 1.5, 1.6 libmsn.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090919175057.E437711C00E6@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32309

Modified Files:
	.cvsignore libmsn.spec sources 
Log Message:
* Sat Sep 19 2009 John5342 <john5342 at, fedoraproject.org> - 4.0-0.15.beta8
- 4.0 beta 8 (fixes #524318)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Jul 2009 11:50:59 -0000	1.5
+++ .cvsignore	19 Sep 2009 17:50:56 -0000	1.6
@@ -1 +1 @@
-libmsn-4.0-beta7.tar.bz2
+libmsn-4.0-beta8.tar.bz2


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libmsn.spec	25 Aug 2009 15:36:45 -0000	1.13
+++ libmsn.spec	19 Sep 2009 17:50:57 -0000	1.14
@@ -1,9 +1,9 @@
 
-%define beta beta7
+%define beta beta8
 
 Name:		libmsn
 Version:	4.0
-Release:	0.14.%{beta}%{?dist}
+Release:	0.15.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 John5342 <john5342 at, fedoraproject.org> - 4.0-0.15.beta8
+- 4.0 beta 8 (fixes #524318)
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0-0.14.beta7
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Jul 2009 11:51:00 -0000	1.6
+++ sources	19 Sep 2009 17:50:57 -0000	1.7
@@ -1 +1 @@
-160bd277a66bd837d0a26e4c03454be3  libmsn-4.0-beta7.tar.bz2
+29d110b36402cfb0c3affeb10be8a6c6  libmsn-4.0-beta8.tar.bz2



From mtasaka at fedoraproject.org  Sat Sep 19 17:58:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 19 Sep 2009 17:58:03 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.401, 1.402 jd.spec, 1.461, 1.462 sources,
	1.402, 1.403
Message-ID: <20090919175803.9487E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3905/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3079



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- .cvsignore	16 Sep 2009 16:01:13 -0000	1.401
+++ .cvsignore	19 Sep 2009 17:58:03 -0000	1.402
@@ -1 +1 @@
-jd-2.4.2-svn3074_trunk.tgz
+jd-2.4.2-svn3079_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- jd.spec	16 Sep 2009 16:01:14 -0000	1.461
+++ jd.spec	19 Sep 2009 17:58:03 -0000	1.462
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3074
+* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3079
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- sources	16 Sep 2009 16:01:15 -0000	1.402
+++ sources	19 Sep 2009 17:58:03 -0000	1.403
@@ -1 +1 @@
-eede99e5283a2c1f52780c53c7812904  jd-2.4.2-svn3074_trunk.tgz
+d86eadc079dd3fadeb3e980e242378ba  jd-2.4.2-svn3079_trunk.tgz



From mtasaka at fedoraproject.org  Sat Sep 19 17:58:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 19 Sep 2009 17:58:03 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.395, 1.396 jd.spec, 1.457, 1.458 sources,
	1.396, 1.397
Message-ID: <20090919175803.BDF9911C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3905/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3079



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- .cvsignore	16 Sep 2009 16:01:17 -0000	1.395
+++ .cvsignore	19 Sep 2009 17:58:03 -0000	1.396
@@ -1 +1 @@
-jd-2.4.2-svn3074_trunk.tgz
+jd-2.4.2-svn3079_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- jd.spec	16 Sep 2009 16:01:17 -0000	1.457
+++ jd.spec	19 Sep 2009 17:58:03 -0000	1.458
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3074
+* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3079
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- sources	16 Sep 2009 16:01:18 -0000	1.396
+++ sources	19 Sep 2009 17:58:03 -0000	1.397
@@ -1 +1 @@
-eede99e5283a2c1f52780c53c7812904  jd-2.4.2-svn3074_trunk.tgz
+d86eadc079dd3fadeb3e980e242378ba  jd-2.4.2-svn3079_trunk.tgz



From mtasaka at fedoraproject.org  Sat Sep 19 17:58:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 19 Sep 2009 17:58:04 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.395, 1.396 jd.spec, 1.458, 1.459 sources,
	1.396, 1.397
Message-ID: <20090919175804.03B7611C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3905/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3079



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- .cvsignore	15 Sep 2009 17:10:48 -0000	1.395
+++ .cvsignore	19 Sep 2009 17:58:03 -0000	1.396
@@ -1 +1 @@
-jd-2.4.2-svn3074_trunk.tgz
+jd-2.4.2-svn3079_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- jd.spec	15 Sep 2009 17:10:48 -0000	1.458
+++ jd.spec	19 Sep 2009 17:58:03 -0000	1.459
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3074
+* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3079
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- sources	15 Sep 2009 17:10:48 -0000	1.396
+++ sources	19 Sep 2009 17:58:03 -0000	1.397
@@ -1 +1 @@
-eede99e5283a2c1f52780c53c7812904  jd-2.4.2-svn3074_trunk.tgz
+d86eadc079dd3fadeb3e980e242378ba  jd-2.4.2-svn3079_trunk.tgz



From mtasaka at fedoraproject.org  Sat Sep 19 18:01:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 19 Sep 2009 18:01:58 +0000 (UTC)
Subject: rpms/jd/F-10 jd.spec,1.462,1.463
Message-ID: <20090919180158.48A4F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5231/F-10

Modified Files:
	jd.spec 
Log Message:
fix strtag


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- jd.spec	19 Sep 2009 17:58:03 -0000	1.462
+++ jd.spec	19 Sep 2009 18:01:57 -0000	1.463
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3074_trunk
+%define         strtag        svn3079_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1



From mtasaka at fedoraproject.org  Sat Sep 19 18:01:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 19 Sep 2009 18:01:59 +0000 (UTC)
Subject: rpms/jd/F-11 jd.spec,1.458,1.459
Message-ID: <20090919180159.5EEE711C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5231/F-11

Modified Files:
	jd.spec 
Log Message:
fix strtag


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- jd.spec	19 Sep 2009 17:58:03 -0000	1.458
+++ jd.spec	19 Sep 2009 18:01:58 -0000	1.459
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3074_trunk
+%define         strtag        svn3079_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1



From mtasaka at fedoraproject.org  Sat Sep 19 18:01:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 19 Sep 2009 18:01:59 +0000 (UTC)
Subject: rpms/jd/F-12 jd.spec,1.459,1.460
Message-ID: <20090919180200.000B011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5231/F-12

Modified Files:
	jd.spec 
Log Message:
fix strtag


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- jd.spec	19 Sep 2009 17:58:03 -0000	1.459
+++ jd.spec	19 Sep 2009 18:01:59 -0000	1.460
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3074_trunk
+%define         strtag        svn3079_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1



From john5342 at fedoraproject.org  Sat Sep 19 18:02:54 2009
From: john5342 at fedoraproject.org (john5342)
Date: Sat, 19 Sep 2009 18:02:54 +0000 (UTC)
Subject: rpms/libmsn/F-11 .cvsignore, 1.5, 1.6 libmsn.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090919180254.6E06F11C00E6@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/libmsn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6382

Modified Files:
	.cvsignore libmsn.spec sources 
Log Message:
* Sat Sep 19 2009 John5342 <john5342 at, fedoraproject.org> - 4.0-0.13.beta8
- 4.0 beta 8 (fixes #524318)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Jul 2009 20:15:58 -0000	1.5
+++ .cvsignore	19 Sep 2009 18:02:54 -0000	1.6
@@ -1 +1 @@
-libmsn-4.0-beta7.tar.bz2
+libmsn-4.0-beta8.tar.bz2


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-11/libmsn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libmsn.spec	23 Jul 2009 20:15:59 -0000	1.10
+++ libmsn.spec	19 Sep 2009 18:02:54 -0000	1.11
@@ -1,9 +1,9 @@
 
-%define beta beta7
+%define beta beta8
 
 Name:		libmsn
 Version:	4.0
-Release:	0.12.%{beta}%{?dist}
+Release:	0.13.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 John5342 <john5342 at, fedoraproject.org> - 4.0-0.13.beta8
+- 4.0 beta 8 (fixes #524318)
+
 * Thu Jul 23 2009 Luk?? Tinkl <ltinkl at redhat.com> 4.0-0.12.beta7
 - 4.0 beta 7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Jul 2009 20:15:59 -0000	1.6
+++ sources	19 Sep 2009 18:02:54 -0000	1.7
@@ -1 +1 @@
-160bd277a66bd837d0a26e4c03454be3  libmsn-4.0-beta7.tar.bz2
+29d110b36402cfb0c3affeb10be8a6c6  libmsn-4.0-beta8.tar.bz2



From john5342 at fedoraproject.org  Sat Sep 19 18:04:13 2009
From: john5342 at fedoraproject.org (john5342)
Date: Sat, 19 Sep 2009 18:04:13 +0000 (UTC)
Subject: rpms/libmsn/F-10 .cvsignore, 1.5, 1.6 libmsn.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090919180413.CA02B11C00E6@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/libmsn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7412

Modified Files:
	.cvsignore libmsn.spec sources 
Log Message:
* Sat Sep 19 2009 John5342 <john5342 at, fedoraproject.org> - 4.0-0.13.beta8
- 4.0 beta 8 (fixes #524318)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Jul 2009 20:16:39 -0000	1.5
+++ .cvsignore	19 Sep 2009 18:04:13 -0000	1.6
@@ -1 +1 @@
-libmsn-4.0-beta7.tar.bz2
+libmsn-4.0-beta8.tar.bz2


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/libmsn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libmsn.spec	23 Jul 2009 20:16:42 -0000	1.4
+++ libmsn.spec	19 Sep 2009 18:04:13 -0000	1.5
@@ -1,9 +1,9 @@
 
-%define beta beta7
+%define beta beta8
 
 Name:		libmsn
 Version:	4.0
-Release:	0.12.%{beta}%{?dist}
+Release:	0.13.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 John5342 <john5342 at, fedoraproject.org> - 4.0-0.13.beta8
+- 4.0 beta 8 (fixes #524318)
+
 * Thu Jul 23 2009 Luk?? Tinkl <ltinkl at redhat.com> 4.0-0.12.beta7
 - 4.0 beta 7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Jul 2009 20:16:42 -0000	1.5
+++ sources	19 Sep 2009 18:04:13 -0000	1.6
@@ -1 +1 @@
-160bd277a66bd837d0a26e4c03454be3  libmsn-4.0-beta7.tar.bz2
+29d110b36402cfb0c3affeb10be8a6c6  libmsn-4.0-beta8.tar.bz2



From transif at fedoraproject.org  Sat Sep 19 18:31:28 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sat, 19 Sep 2009 18:31:28 +0000 (UTC)
Subject: comps/po sv.po,1.21,1.22
Message-ID: <20090919183128.6A00811C02C8@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19409/po

Modified Files:
	sv.po 
Log Message:
Sending translation for Swedish


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 sv.poIndex: sv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sv.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sv.po	5 May 2009 09:31:52 -0000	1.21
+++ sv.po	19 Sep 2009 18:31:25 -0000	1.22
@@ -9,288 +9,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 08:08+0000\n"
-"PO-Revision-Date: 2009-05-05 11:30+0200\n"
+"POT-Creation-Date: 2009-09-19 16:27+0000\n"
+"PO-Revision-Date: 2009-09-19 20:29+0200\n"
 "Last-Translator: G?ran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "En l?ttviktig skrivbordsmilj? som fungerar bra p? l?ngsammare maskiner."
 
-#: ../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-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administrationsverktyg"
 
-#: ../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-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "St?d f?r 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-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "St?d f?r albanska"
 
-#: ../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-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Program"
 
-#: ../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-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Applikationer f?r utf?ra en m?ngd arbetsuppgifter"
 
-#: ../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-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "St?d f?r arabiska"
 
-#: ../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-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "St?d f?r armenska"
 
-#: ../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-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "St?d f?r assamesiska"
 
-#: ../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-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "F?rfattande och publicering"
 
-#: ../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-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Bas"
 
-#: ../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-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Bassystem"
 
-#: ../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-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Grundl?ggande st?d f?r programmeringsspr?ket Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "St?d f?r baskiska"
 
-#: ../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-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "St?d f?r vitryska"
 
-#: ../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-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "St?d f?r 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-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "St?d f?r bhutanesiska"
 
-#: ../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-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "St?d f?r bosniska"
 
-#: ../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-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "St?d f?r brasiliansk portugisiska"
 
-#: ../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-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "St?d f?r bretonska"
 
-#: ../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-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Byggsystem byggrupp"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "St?d f?r bulgariska"
 
-#: ../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-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "St?d f?r katalanska"
 
-#: ../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-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "St?d f?r kinesiska"
 
-#: ../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-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1881 lines suppressed...]
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Skrivbordsmilj?n Sugar"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1411,7 +1520,8 @@ msgstr ""
 "St?d f?r korskompilering av program till 32-bitars Windowsm?l, testning av "
 "dem och byggande av installerare, allt inifr?n Fedora."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1419,15 +1529,18 @@ msgstr ""
 "St?d f?r utveckling av program i programmeringsspr?ket Objective CAML och "
 "dess bibliotek."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "St?d f?r swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "St?d f?r tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1435,23 +1548,79 @@ msgstr ""
 "Denna grupp ?r en samling av verktyg och resurser f?r designa, ?ndra, "
 "redigera och paketera typsnitt."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "St?d f?r turkmeniska"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "St?d f?r h?gsorbiska"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "Ett antal paket som ger funktionaliteten kritisk v?g f?r GNOME-skrivbordet"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "Ett antal paket som utg?r den delade plattformen f?r funktionaliteten kritisk v?g i alla Fedora-spin:ar"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "B?cker och guider"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "B?cker och guider f?r Fedoraanv?ndare och -utvecklare"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Kritisk v?g (bas)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Kritisk v?g (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Katalogserver"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?r en l?ttviktig X11 skrivbordsmilj? gjord f?r datorer med l?ga h?rdvaruspecifikationer som n?tb?cker, mobila enheter eller ?ldre datorer."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Maskin- och anv?ndaridentitetsservrar."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblins skrivbordsmilj?"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ?r en skrivbordsmilj? f?r NetBook-/NetTop-/MID-enheter."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Applikationer f?r en m?ngd arbetsuppgifter"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "St?d f?r uppringd uppkoppling"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1459,7 +1628,7 @@ msgstr ""
 "GNOME ?r ett kraftfullt, grafiskt anv?ndargr?nssnitt som inneh?ller en "
 "panel, ett skrivbord, systemikoner och en grafisk filhanterare."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1467,7 +1636,7 @@ msgstr ""
 "KDE ?r ett kraftfullt, grafiskt anv?ndargr?nssnitt som inneh?ller en panel, "
 "ett skrivbord, systemikoner och en grafisk filhanterare."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1475,11 +1644,11 @@ msgstr ""
 "Detta ?r program som l?ter dig skapa och redigera filer, och kallas ofta "
 "textredigerare. Dessa inkluderar Emacs och Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "Textredigeraren XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1487,33 +1656,33 @@ msgstr ""
 "Dessa verktyg l?ter dig skapa dokumentation i DocBook-formatet och "
 "konvertera dem till HTML, PDF, Postscript och text."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Denna grupp ?r en samling n?tverksservrar f?r specifika ?ndam?l"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Denna grupp ?r en samling av verktyg och resurser f?r arabiska milj?er."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Denna grupp ?r en samling av verktyg och resurser f?r hebreiska milj?er."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Denna grupp ?r en samling av verktyg och resurser f?r japanska milj?er."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""



From cweyl at fedoraproject.org  Sat Sep 19 18:39:55 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:39:55 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.33, 1.34 perl-Moose.spec, 1.45, 
	1.46 sources, 1.33, 1.34
Message-ID: <20090919183955.C93B111C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23092

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Fri Sep 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.90-1
- switch filtering systems...
- auto-update to 0.90 (by cpan-spec-update 0.01)
- altered br on perl(Class::MOP) (0.92 => 0.93)
- altered br on perl(Test::More) (0.77 => 0.88)
- added a new br on perl(Try::Tiny) (version 0.02)
- altered req on perl(Class::MOP) (0.92 => 0.93)
- added a new req on perl(Try::Tiny) (version 0.02)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	19 Aug 2009 02:40:03 -0000	1.33
+++ .cvsignore	19 Sep 2009 18:39:55 -0000	1.34
@@ -1 +1 @@
-Moose-0.89.tar.gz
+Moose-0.90.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- perl-Moose.spec	19 Aug 2009 02:40:03 -0000	1.45
+++ perl-Moose.spec	19 Sep 2009 18:39:55 -0000	1.46
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.89
+Version:        0.90
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
@@ -12,7 +12,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(Class::MOP)         >= 0.92
+BuildRequires:  perl(Class::MOP)         >= 0.93
 BuildRequires:  perl(Data::OptList)
 BuildRequires:  perl(Filter::Simple)
 BuildRequires:  perl(List::MoreUtils)    >= 0.12
@@ -21,7 +21,7 @@ BuildRequires:  perl(Sub::Exporter)     
 BuildRequires:  perl(Sub::Install)       >= 0.92
 BuildRequires:  perl(Sub::Name)
 BuildRequires:  perl(Task::Weaken)
-BuildRequires:  perl(Test::More)         >= 0.77
+BuildRequires:  perl(Test::More)         >= 0.88
 BuildRequires:  perl(Test::Exception)    >= 0.27
 BuildRequires:  perl(Test::LongString)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
@@ -36,6 +36,7 @@ BuildRequires:  perl(DateTime::Format::M
 BuildRequires:  perl(HTTP::Headers)
 BuildRequires:  perl(Params::Coerce)
 BuildRequires:  perl(URI)
+BuildRequires:  perl(Try::Tiny) >= 0.02
 # optional test #4
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
@@ -54,19 +55,16 @@ BuildRequires:  perl(Test::Warn)
 BuildRequires:  perl(Test::Output)
 
 Requires:  perl(Carp)
-Requires:  perl(Class::MOP) >= 0.92
+Requires:  perl(Class::MOP) >= 0.93
 Requires:  perl(Data::OptList)
 Requires:  perl(List::MoreUtils) >= 0.12
 Requires:  perl(Scalar::Util) >= 1.19
 Requires:  perl(Sub::Exporter) >= 0.980
 Requires:  perl(Sub::Name)
 Requires:  perl(Task::Weaken)
+Requires:  perl(Try::Tiny) >= 0.02
 
-# don't "provide" private Perl libs, or bits from _docdir
-%global _use_internal_dependency_generator 0
-%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}"
+%{?perl_default_filter}
 
 %description
 Moose is an extension of the Perl 5 object system.
@@ -135,6 +133,15 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Test::Moose*
 
 %changelog
+* Fri Sep 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.90-1
+- switch filtering systems...
+- auto-update to 0.90 (by cpan-spec-update 0.01)
+- altered br on perl(Class::MOP) (0.92 => 0.93)
+- altered br on perl(Test::More) (0.77 => 0.88)
+- added a new br on perl(Try::Tiny) (version 0.02)
+- altered req on perl(Class::MOP) (0.92 => 0.93)
+- added a new req on perl(Try::Tiny) (version 0.02)
+
 * Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.89-1
 - auto-update to 0.89 (by cpan-spec-update 0.01)
 - altered br on perl(Class::MOP) (0.89 => 0.92)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	19 Aug 2009 02:40:03 -0000	1.33
+++ sources	19 Sep 2009 18:39:55 -0000	1.34
@@ -1 +1 @@
-c44543e38e4a77557771ef4ad15a2fa6  Moose-0.89.tar.gz
+11f738724ea32a143a36af6e2e6e7d71  Moose-0.90.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:39:53 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:39:53 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.35, 1.36 perl-Class-MOP.spec,
	1.41, 1.42 sources, 1.33, 1.34
Message-ID: <20090919183953.518FA11C00E6@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-serv23058

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Fri Sep 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.93-1
- switch filtering systems
- auto-update to 0.93 (by cpan-spec-update 0.01)
- altered br on perl(Test::More) (0.77 => 0.88)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	19 Aug 2009 02:21:31 -0000	1.35
+++ .cvsignore	19 Sep 2009 18:39:52 -0000	1.36
@@ -1 +1 @@
-Class-MOP-0.92.tar.gz
+Class-MOP-0.93.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- perl-Class-MOP.spec	19 Aug 2009 02:21:31 -0000	1.41
+++ perl-Class-MOP.spec	19 Sep 2009 18:39:53 -0000	1.42
@@ -1,7 +1,7 @@
 Name:           perl-Class-MOP
-Version:        0.92
+Version:        0.93
 Release:        1%{?dist}
-Summary:        Meta object programming model for Perl 5
+Summary:        A Meta Object Protocol for Perl 5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-MOP/
@@ -9,7 +9,7 @@ Source0:        http://search.cpan.org/C
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(Test::More) >= 0.77
+BuildRequires:  perl(Test::More) >= 0.88
 BuildRequires:  perl(B)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Scalar::Util) >= 1.18
@@ -38,14 +38,10 @@ Requires:       perl(MRO::Compat) >= 0.0
 Requires:       perl(Scalar::Util) >= 1.18
 Requires:       perl(Task::Weaken)
 
-# don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%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}"
+%{?perl_default_filter}
 
 %description
-This module is an attempt to create a meta object protocol for the Perl 5
+This module is a fully functioning meta object protocol for the Perl 5
 object system. It makes no attempt to change the behavior or characteristics
 of the Perl 5 object system, only to create a protocol for its manipulation
 and introspection.
@@ -87,6 +83,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.93-1
+- switch filtering systems
+- auto-update to 0.93 (by cpan-spec-update 0.01)
+- altered br on perl(Test::More) (0.77 => 0.88)
+
+* Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.92-2
+- Filtering errant private provides
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.92-1
 - auto-update to 0.92 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	19 Aug 2009 02:21:31 -0000	1.33
+++ sources	19 Sep 2009 18:39:53 -0000	1.34
@@ -1 +1 @@
-b9cfa44c995e315a7ce7d7acc50d0517  Class-MOP-0.92.tar.gz
+ad212d53b085389638ead45b0192b69d  Class-MOP-0.93.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:40:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:40:00 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/devel .cvsignore, 1.10,
	1.11 perl-MooseX-Types.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20090919184000.0437811C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23147

Modified Files:
	.cvsignore perl-MooseX-Types.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- auto-update to 0.20 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Aug 2009 02:55:32 -0000	1.10
+++ .cvsignore	19 Sep 2009 18:39:59 -0000	1.11
@@ -1 +1 @@
-MooseX-Types-0.18.tar.gz
+MooseX-Types-0.20.tar.gz


Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/perl-MooseX-Types.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-MooseX-Types.spec	24 Aug 2009 02:55:33 -0000	1.15
+++ perl-MooseX-Types.spec	19 Sep 2009 18:39:59 -0000	1.16
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-Types
-Version:    0.18
+Version:    0.20
 Release:    1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
+- auto-update to 0.20 (by cpan-spec-update 0.01)
+
 * Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
 - auto-update to 0.18 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Aug 2009 02:55:33 -0000	1.10
+++ sources	19 Sep 2009 18:39:59 -0000	1.11
@@ -1 +1 @@
-9bd54195f2e07c319a792bb7b4c9d8bd  MooseX-Types-0.18.tar.gz
+453eabfe1045382862710ffb72501ab7  MooseX-Types-0.20.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:40:06 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:40:06 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel .cvsignore, 1.7,
	1.8 perl-MooseX-Role-Parameterized.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090919184006.EBB4711C0374@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23225

Modified Files:
	.cvsignore perl-MooseX-Role-Parameterized.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
- auto-update to 0.13 (by cpan-spec-update 0.01)
- added a new br on perl(Test::Moose) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	19 Aug 2009 07:37:38 -0000	1.7
+++ .cvsignore	19 Sep 2009 18:40:06 -0000	1.8
@@ -1 +1 @@
-MooseX-Role-Parameterized-0.10.tar.gz
+MooseX-Role-Parameterized-0.13.tar.gz


Index: perl-MooseX-Role-Parameterized.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/perl-MooseX-Role-Parameterized.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-MooseX-Role-Parameterized.spec	19 Aug 2009 07:37:38 -0000	1.9
+++ perl-MooseX-Role-Parameterized.spec	19 Sep 2009 18:40:06 -0000	1.10
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-Role-Parameterized
-Version:    0.10
+Version:    0.13
 Release:    1%{?dist}
 # see LICENSE
 License:    GPL+ or Artistic
@@ -22,6 +22,9 @@ BuildRequires: perl(Data::Dumper)
 # explicit, versioned requires
 Requires:  perl(Moose) >= 0.78
 
+### auto-added brs!
+BuildRequires:  perl(Test::Moose)
+
 %description
 Roles are composable units of behavior. They are useful for factoring out
 functionality common to many classes from any part of your class hierarchy.
@@ -70,6 +73,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- auto-update to 0.13 (by cpan-spec-update 0.01)
+- added a new br on perl(Test::Moose) (version 0)
+
 * Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
 - auto-update to 0.10 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Aug 2009 07:37:38 -0000	1.7
+++ sources	19 Sep 2009 18:40:06 -0000	1.8
@@ -1 +1 @@
-bf25ac188760bc94f9b71442392cbd79  MooseX-Role-Parameterized-0.10.tar.gz
+e07137e63c19835e22bfed88dfff2091  MooseX-Role-Parameterized-0.13.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:40:22 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:40:22 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel .cvsignore, 1.7,
	1.8 perl-MooseX-MethodAttributes.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090919184022.C054911C0374@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23313

Modified Files:
	.cvsignore perl-MooseX-MethodAttributes.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
- auto-update to 0.16 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	19 Aug 2009 07:37:25 -0000	1.7
+++ .cvsignore	19 Sep 2009 18:40:20 -0000	1.8
@@ -1 +1 @@
-MooseX-MethodAttributes-0.15.tar.gz
+MooseX-MethodAttributes-0.16.tar.gz


Index: perl-MooseX-MethodAttributes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/perl-MooseX-MethodAttributes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-MooseX-MethodAttributes.spec	19 Aug 2009 07:37:25 -0000	1.7
+++ perl-MooseX-MethodAttributes.spec	19 Sep 2009 18:40:21 -0000	1.8
@@ -1,11 +1,11 @@
 Name:       perl-MooseX-MethodAttributes
-Version:    0.15
+Version:    0.16
 Release:    1%{?dist}
 # lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Introspect your method code attributes
-Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-%{version}.tar.gz
+Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/MooseX-MethodAttributes-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-MethodAttributes
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -20,7 +20,6 @@ BuildRequires: perl(namespace::clean)
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Exception)
 
-### auto-added reqs!
 Requires:       perl(MRO::Compat)
 Requires:       perl(Moose) >= 0.79
 Requires:       perl(MooseX::Types) >= 0.06
@@ -60,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
+- auto-update to 0.16 (by cpan-spec-update 0.01)
+
 * Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
 - auto-update to 0.15 (by cpan-spec-update 0.01)
 - added a new br on perl(MRO::Compat) (version 0)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Aug 2009 07:37:25 -0000	1.7
+++ sources	19 Sep 2009 18:40:21 -0000	1.8
@@ -1 +1 @@
-c89f2e09781bae3ea17f4421d5c6097b  MooseX-MethodAttributes-0.15.tar.gz
+e670255423f7f25c7146acfdb47c2ff1  MooseX-MethodAttributes-0.16.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:40:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:40:48 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/devel .cvsignore, 1.3,
	1.4 perl-MooseX-Types-DateTime.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090919184048.DC49311C0374@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23557

Modified Files:
	.cvsignore perl-MooseX-Types-DateTime.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- auto-update to 0.05 (by cpan-spec-update 0.01)
- altered br on perl(MooseX::Types) (0.04 => 0.19)
- altered req on perl(MooseX::Types) (0.04 => 0.19)
- added a new req on perl(Test::Exception) (version 0.27)
- added a new req on perl(Test::use::ok) (version 0.02)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Aug 2009 03:00:33 -0000	1.3
+++ .cvsignore	19 Sep 2009 18:40:47 -0000	1.4
@@ -1 +1 @@
-MooseX-Types-DateTime-0.04.tar.gz
+MooseX-Types-DateTime-0.05.tar.gz


Index: perl-MooseX-Types-DateTime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/perl-MooseX-Types-DateTime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Types-DateTime.spec	24 Aug 2009 03:00:33 -0000	1.4
+++ perl-MooseX-Types-DateTime.spec	19 Sep 2009 18:40:47 -0000	1.5
@@ -1,11 +1,11 @@
 Name:       perl-MooseX-Types-DateTime
-Version:    0.04
+Version:    0.05
 Release:    1%{?dist}
 # see, e.g., lib/MooseX/Types/DateTime.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    DateTime related constraints and coercions for Moose
-Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/MooseX-Types-DateTime-%{version}.tar.gz
+Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/MooseX-Types-DateTime-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-Types-DateTime
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -22,7 +22,7 @@ BuildRequires: perl(DateTime::Locale) >=
 BuildRequires: perl(DateTime::TimeZone) >= 0.95
 BuildRequires: perl(DateTimeX::Easy) >= 0.082
 BuildRequires: perl(Moose) >= 0.41
-BuildRequires: perl(MooseX::Types) >= 0.04
+BuildRequires: perl(MooseX::Types) >= 0.19
 BuildRequires: perl(namespace::clean) >= 0.08
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Exception) >= 0.27
@@ -32,7 +32,9 @@ BuildRequires: perl(Time::Duration::Pars
 BuildRequires: perl(DateTime::Format::DateManip)
 
 
-### auto-added reqs!
+Requires:       perl(Test::Exception) >= 0.27
+Requires:       perl(Test::use::ok) >= 0.02
+
 Requires:       perl(DateTime) >= 0.4302
 Requires:       perl(DateTime::Format::DateParse) >= 0.04
 Requires:       perl(DateTime::Format::Flexible) >= 0.05
@@ -41,7 +43,7 @@ Requires:       perl(DateTime::Locale) >
 Requires:       perl(DateTime::TimeZone) >= 0.95
 Requires:       perl(DateTimeX::Easy) >= 0.082
 Requires:       perl(Moose) >= 0.41
-Requires:       perl(MooseX::Types) >= 0.04
+Requires:       perl(MooseX::Types) >= 0.19
 Requires:       perl(Time::Duration::Parse) >= 0.06
 Requires:       perl(namespace::clean) >= 0.08
 
@@ -81,6 +83,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- auto-update to 0.05 (by cpan-spec-update 0.01)
+- altered br on perl(MooseX::Types) (0.04 => 0.19)
+- altered req on perl(MooseX::Types) (0.04 => 0.19)
+- added a new req on perl(Test::Exception) (version 0.27)
+- added a new req on perl(Test::use::ok) (version 0.02)
+
 * Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
 - auto-update to 0.04 (by cpan-spec-update 0.01)
 - altered br on perl(DateTime::Locale) (0 => 0.4001)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Aug 2009 03:00:33 -0000	1.3
+++ sources	19 Sep 2009 18:40:47 -0000	1.4
@@ -1 +1 @@
-c5c3961d053a8d21faf439a95091dde7  MooseX-Types-DateTime-0.04.tar.gz
+e4e617c56618a91257e7c8f207a666d9  MooseX-Types-DateTime-0.05.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:43:37 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:43:37 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/devel .cvsignore, 1.11,
	1.12 perl-MooseX-AttributeHelpers.spec, 1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20090919184337.ED1E711C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25674

Modified Files:
	.cvsignore perl-MooseX-AttributeHelpers.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
- auto-update to 0.22 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Jul 2009 05:38:16 -0000	1.11
+++ .cvsignore	19 Sep 2009 18:43:37 -0000	1.12
@@ -1 +1 @@
-MooseX-AttributeHelpers-0.21.tar.gz
+MooseX-AttributeHelpers-0.22.tar.gz


Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-MooseX-AttributeHelpers.spec	28 Jul 2009 05:38:16 -0000	1.16
+++ perl-MooseX-AttributeHelpers.spec	19 Sep 2009 18:43:37 -0000	1.17
@@ -1,11 +1,11 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.21
+Version:        0.22
 Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MooseX-AttributeHelpers/
-Source0:        http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/MooseX-AttributeHelpers-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
+- auto-update to 0.22 (by cpan-spec-update 0.01)
+
 * Tue Jul 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - auto-update to 0.21 (by cpan-spec-update 0.01)
 - added a new br on perl(Test::Moose) (version 0)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Jul 2009 05:38:16 -0000	1.11
+++ sources	19 Sep 2009 18:43:37 -0000	1.12
@@ -1 +1 @@
-991e3217572bde0e8d9731442fd7879d  MooseX-AttributeHelpers-0.21.tar.gz
+d739193168cb78ac6c8c237b215cac97  MooseX-AttributeHelpers-0.22.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:44:20 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:44:20 +0000 (UTC)
Subject: rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel .cvsignore, 1.6, 
	1.7 perl-MooseX-Emulate-Class-Accessor-Fast.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20090919184420.0123311C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25949

Modified Files:
	.cvsignore perl-MooseX-Emulate-Class-Accessor-Fast.spec 
	sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00903-1
- auto-update to 0.00903 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Aug 2009 04:00:42 -0000	1.6
+++ .cvsignore	19 Sep 2009 18:44:19 -0000	1.7
@@ -1 +1 @@
-MooseX-Emulate-Class-Accessor-Fast-0.00902.tar.gz
+MooseX-Emulate-Class-Accessor-Fast-0.00903.tar.gz


Index: perl-MooseX-Emulate-Class-Accessor-Fast.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/perl-MooseX-Emulate-Class-Accessor-Fast.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-MooseX-Emulate-Class-Accessor-Fast.spec	8 Aug 2009 04:00:42 -0000	1.8
+++ perl-MooseX-Emulate-Class-Accessor-Fast.spec	19 Sep 2009 18:44:19 -0000	1.9
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-Emulate-Class-Accessor-Fast
-Version:    0.00902
+Version:    0.00903
 Release:    1%{?dist}
 # lib/MooseX/Adopt/Class/Accessor/Fast.pm -> GPL+ or Artistic
 # lib/MooseX/Emulate/Class/Accessor/Fast.pm -> GPL+ or Artistic
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00903-1
+- auto-update to 0.00903 (by cpan-spec-update 0.01)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00902-1
 - auto-update to 0.00902 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0.74 => 0.84)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Aug 2009 04:00:42 -0000	1.6
+++ sources	19 Sep 2009 18:44:19 -0000	1.7
@@ -1 +1 @@
-4fa57ee9110fe6e868b8625a9e47b50c  MooseX-Emulate-Class-Accessor-Fast-0.00902.tar.gz
+edb0d626207e7db61154b5cc65112638  MooseX-Emulate-Class-Accessor-Fast-0.00903.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:45:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:45:02 +0000 (UTC)
Subject: rpms/perl-Mouse/devel .cvsignore, 1.11, 1.12 perl-Mouse.spec, 1.13, 
	1.14 sources, 1.11, 1.12
Message-ID: <20090919184502.E49FB11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26248

Modified Files:
	.cvsignore perl-Mouse.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.28-1
- auto-update to 0.28 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	31 Jul 2009 05:54:13 -0000	1.11
+++ .cvsignore	19 Sep 2009 18:45:02 -0000	1.12
@@ -1 +1 @@
-Mouse-0.27.tar.gz
+Mouse-0.29.tar.gz


Index: perl-Mouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/perl-Mouse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Mouse.spec	31 Jul 2009 05:54:13 -0000	1.13
+++ perl-Mouse.spec	19 Sep 2009 18:45:02 -0000	1.14
@@ -1,10 +1,10 @@
 Name:       perl-Mouse
-Version:    0.27
+Version:    0.28
 Release:    1%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Moose minus the antlers
-Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Mouse-%{version}.tar.gz
+Source:     http://search.cpan.org/CPAN/authors/id/S/SU/SUNNAVY/Mouse-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/Mouse
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.28-1
+- auto-update to 0.28 (by cpan-spec-update 0.01)
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
 - auto-update to 0.27 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	31 Jul 2009 05:54:13 -0000	1.11
+++ sources	19 Sep 2009 18:45:02 -0000	1.12
@@ -1 +1 @@
-4f1b209f7b6d1f34a31b2ee1037352cb  Mouse-0.27.tar.gz
+fa8f93156c9d466763c6d7d4b4b416b9  Mouse-0.29.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:46:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:46:07 +0000 (UTC)
Subject: rpms/perl-MooseX-Getopt/devel .cvsignore, 1.7,
	1.8 perl-MooseX-Getopt.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090919184607.CCA6411C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Getopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26742

Modified Files:
	.cvsignore perl-MooseX-Getopt.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
- auto-update to 0.22 (by cpan-spec-update 0.01)
- altered br on perl(Getopt::Long::Descriptive) (0 => 0.077)
- added a new br on perl(Test::Moose) (version 0)
- altered req on perl(Getopt::Long::Descriptive) (0 => 0.077)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	19 Aug 2009 07:33:35 -0000	1.7
+++ .cvsignore	19 Sep 2009 18:46:06 -0000	1.8
@@ -1 +1 @@
-MooseX-Getopt-0.20.tar.gz
+MooseX-Getopt-0.22.tar.gz


Index: perl-MooseX-Getopt.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-MooseX-Getopt.spec	19 Aug 2009 07:33:35 -0000	1.11
+++ perl-MooseX-Getopt.spec	19 Sep 2009 18:46:06 -0000	1.12
@@ -1,17 +1,17 @@
 Name:           perl-MooseX-Getopt
-Version:        0.20
+Version:        0.22
 Release:        1%{?dist}
 Summary:        Moose role for processing command line options
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MooseX-Getopt/
-Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MooseX-Getopt-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Getopt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires:  perl(Getopt::Long::Descriptive)
+BuildRequires:  perl(Getopt::Long::Descriptive) >= 0.077
 # 2.35 is what we have in F-8 perl -- tests all pass
 BuildRequires:  perl(Getopt::Long)              >= 2.37
 BuildRequires:  perl(Moose)                     >= 0.56
@@ -27,9 +27,12 @@ BuildRequires:  perl(Test::Pod), perl(Te
 
 ### auto-added reqs!
 Requires:       perl(Getopt::Long) >= 2.37
-Requires:       perl(Getopt::Long::Descriptive)
+Requires:       perl(Getopt::Long::Descriptive) >= 0.077
 Requires:       perl(Moose) >= 0.56
 
+### auto-added brs!
+BuildRequires:  perl(Test::Moose)
+
 %description
 This is a Moose role which provides an alternate constructor for creating
 objects using parameters passed in from the command line.
@@ -66,6 +69,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
+- auto-update to 0.22 (by cpan-spec-update 0.01)
+- altered br on perl(Getopt::Long::Descriptive) (0 => 0.077)
+- added a new br on perl(Test::Moose) (version 0)
+- altered req on perl(Getopt::Long::Descriptive) (0 => 0.077)
+
 * Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - auto-update to 0.20 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Aug 2009 07:33:35 -0000	1.7
+++ sources	19 Sep 2009 18:46:06 -0000	1.8
@@ -1 +1 @@
-ff4321b78f1d26cef3a18af4c5f18057  MooseX-Getopt-0.20.tar.gz
+2900e4b9ad701aac0dad289a3a04d5f2  MooseX-Getopt-0.22.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:48:22 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:48:22 +0000 (UTC)
Subject: rpms/perl-MooseX-App-Cmd/devel .cvsignore, 1.3,
	1.4 perl-MooseX-App-Cmd.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090919184822.6DE1C11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27911

Modified Files:
	.cvsignore perl-MooseX-App-Cmd.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- switch filtering systems
- auto-update to 0.06 (by cpan-spec-update 0.01)
- altered br on perl(App::Cmd) (0 => 0.3)
- altered req on perl(App::Cmd) (0 => 0.3)
- added a new req on perl(Test::use::ok) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-App-Cmd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Aug 2009 07:33:36 -0000	1.3
+++ .cvsignore	19 Sep 2009 18:48:21 -0000	1.4
@@ -1 +1 @@
-MooseX-App-Cmd-0.05.tar.gz
+MooseX-App-Cmd-0.06.tar.gz


Index: perl-MooseX-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-App-Cmd/devel/perl-MooseX-App-Cmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-App-Cmd.spec	19 Aug 2009 07:33:36 -0000	1.4
+++ perl-MooseX-App-Cmd.spec	19 Sep 2009 18:48:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-App-Cmd
-Version:    0.05
+Version:    0.06
 Release:    1%{?dist}
 # see lib/MooseX/App/Cmd.pm
 License:    GPL+ or Artistic
@@ -12,7 +12,7 @@ Requires:   perl(:MODULE_COMPAT_%(eval "
 BuildArch:  noarch
 
 BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(App::Cmd)
+BuildRequires: perl(App::Cmd) >= 0.3
 BuildRequires: perl(Getopt::Long::Descriptive)
 BuildRequires: perl(Moose) >= 0.86
 BuildRequires: perl(MooseX::Getopt) >= 0.18
@@ -23,12 +23,11 @@ BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::use::ok)
 
 # we don't pick up Moose keywords automagically yet
-Requires: perl(App::Cmd)
+Requires: perl(App::Cmd) >= 0.3
 Requires: perl(App::Cmd::Command)
 Requires: perl(MooseX::Getopt) >= 0.18
 Requires: perl(MooseX::ConfigFromFile)
 
-### auto-added reqs!
 Requires:       perl(Getopt::Long::Descriptive)
 Requires:       perl(Moose) >= 0.86
 
@@ -43,29 +42,12 @@ Then you can write your commands as Moos
 MooseX::Getopt defining the options for you instead of 'opt_spec'
 returning a Getopt::Long::Descriptive spec.
 
+%{?perl_default_filter}
+
 %prep
 %setup -q -n MooseX-App-Cmd-%{version}
 
-perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t
-
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_provides %{_builddir}/MooseX-App-Cmd-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_requires %{_builddir}/MooseX-App-Cmd-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
+perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -93,6 +75,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
+- switch filtering systems
+- auto-update to 0.06 (by cpan-spec-update 0.01)
+- altered br on perl(App::Cmd) (0 => 0.3)
+- altered req on perl(App::Cmd) (0 => 0.3)
+- added a new req on perl(Test::use::ok) (version 0)
+
 * Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - auto-update to 0.05 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0 => 0.86)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-App-Cmd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Aug 2009 07:33:36 -0000	1.3
+++ sources	19 Sep 2009 18:48:21 -0000	1.4
@@ -1 +1 @@
-6f0c80da54fca81e6e8a57c735e40375  MooseX-App-Cmd-0.05.tar.gz
+ac8cf120e44aa99ac35d6e6baec2a265  MooseX-App-Cmd-0.06.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:49:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:49:09 +0000 (UTC)
Subject: rpms/perl-App-Cmd/devel .cvsignore, 1.6, 1.7 perl-App-Cmd.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090919184909.484F011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28307

Modified Files:
	.cvsignore perl-App-Cmd.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.301-1
- auto-update to 0.301 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Aug 2009 04:31:51 -0000	1.6
+++ .cvsignore	19 Sep 2009 18:49:09 -0000	1.7
@@ -1 +1 @@
-App-Cmd-0.207.tar.gz
+App-Cmd-0.301.tar.gz


Index: perl-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/perl-App-Cmd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-App-Cmd.spec	29 Aug 2009 04:31:51 -0000	1.9
+++ perl-App-Cmd.spec	19 Sep 2009 18:49:09 -0000	1.10
@@ -1,5 +1,5 @@
 Name:       perl-App-Cmd
-Version:    0.207
+Version:    0.301
 Release:    1%{?dist}
 # see lib/App/Cmd.pm
 License:    GPL+ or Artistic
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.301-1
+- auto-update to 0.301 (by cpan-spec-update 0.01)
+
 * Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.207-1
 - switch filtering to perl_default_filter
 - auto-update to 0.207 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Aug 2009 04:31:51 -0000	1.6
+++ sources	19 Sep 2009 18:49:09 -0000	1.7
@@ -1 +1 @@
-4856b13b9c1ffb4ac21fddc0026801e7  App-Cmd-0.207.tar.gz
+f6bea28a1b4567a4668d9a409e75b30f  App-Cmd-0.301.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:52:39 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:52:39 +0000 (UTC)
Subject: rpms/perl-MooseX-Singleton/devel .cvsignore, 1.3,
	1.4 perl-MooseX-Singleton.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090919185239.D05DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Singleton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29957

Modified Files:
	.cvsignore perl-MooseX-Singleton.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- auto-update to 0.21 (by cpan-spec-update 0.01)
- altered br on perl(Moose) (0.74 => 0.82)
- added a new req on perl(Moose) (version 0.82)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Singleton/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jun 2009 15:45:32 -0000	1.3
+++ .cvsignore	19 Sep 2009 18:52:39 -0000	1.4
@@ -1 +1 @@
-MooseX-Singleton-0.17.tar.gz
+MooseX-Singleton-0.21.tar.gz


Index: perl-MooseX-Singleton.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Singleton/devel/perl-MooseX-Singleton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Singleton.spec	26 Jul 2009 11:31:19 -0000	1.3
+++ perl-MooseX-Singleton.spec	19 Sep 2009 18:52:39 -0000	1.4
@@ -1,20 +1,22 @@
 Name:           perl-MooseX-Singleton
-Version:        0.17
-Release:        2%{?dist}
+Version:        0.21
+Release:        1%{?dist}
 Summary:        Turn your Moose class into a singleton
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MooseX-Singleton/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/MooseX-Singleton-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Singleton-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires:  perl(Moose) >= 0.74
+BuildRequires:  perl(Moose) >= 0.82
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Warn)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+Requires:       perl(Moose) >= 0.82
+
 %description
 A singleton is a class that has only one instance in an application.
 MooseX::Singleton lets you easily upgrade (or downgrade, as it were) your
@@ -64,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- auto-update to 0.21 (by cpan-spec-update 0.01)
+- altered br on perl(Moose) (0.74 => 0.82)
+- added a new req on perl(Moose) (version 0.82)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Singleton/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jun 2009 15:45:32 -0000	1.3
+++ sources	19 Sep 2009 18:52:39 -0000	1.4
@@ -1 +1 @@
-d4fa63586132b12a5fcfe06981926507  MooseX-Singleton-0.17.tar.gz
+e7f909e849af402aff480053e8be1cbe  MooseX-Singleton-0.21.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:56:14 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:56:14 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/devel .cvsignore, 1.3,
	1.4 perl-MooseX-ClassAttribute.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090919185614.4F58211C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-ClassAttribute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31125

Modified Files:
	.cvsignore perl-MooseX-ClassAttribute.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- add perl_default_filter
- auto-update to 0.10 (by cpan-spec-update 0.01)
- altered br on perl(Module::Build) (0 => 0.340201)
- altered br on perl(Moose) (0.74 => 0.89)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-ClassAttribute/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 May 2009 02:59:54 -0000	1.3
+++ .cvsignore	19 Sep 2009 18:56:13 -0000	1.4
@@ -1 +1 @@
-MooseX-ClassAttribute-0.08.tar.gz
+MooseX-ClassAttribute-0.10.tar.gz


Index: perl-MooseX-ClassAttribute.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-ClassAttribute/devel/perl-MooseX-ClassAttribute.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-ClassAttribute.spec	26 Jul 2009 11:25:02 -0000	1.4
+++ perl-MooseX-ClassAttribute.spec	19 Sep 2009 18:56:14 -0000	1.5
@@ -1,24 +1,26 @@
 %define tarname MooseX-ClassAttribute
 Name:           perl-MooseX-ClassAttribute
-Version:        0.08
-Release:        2%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Declare class attributes Moose-style
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MooseX-ClassAttribute/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/%{tarname}-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/%{tarname}-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Module::Build) >= 0.340201
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Moose) >= 0.74
+BuildRequires:  perl(Moose) >= 0.89
 BuildRequires:  perl(MooseX::AttributeHelpers) >= 0.13
 BuildRequires:  perl(Scalar::Util)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 This module allows you to declare class attributes in exactly the same way as
 object attributes, using class_has() instead of has().
@@ -72,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- add perl_default_filter
+- auto-update to 0.10 (by cpan-spec-update 0.01)
+- altered br on perl(Module::Build) (0 => 0.340201)
+- altered br on perl(Moose) (0.74 => 0.89)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-ClassAttribute/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 May 2009 02:59:54 -0000	1.3
+++ sources	19 Sep 2009 18:56:14 -0000	1.4
@@ -1 +1 @@
-e67a5a7982b7fb1cda8cfaa69e56c127  MooseX-ClassAttribute-0.08.tar.gz
+ce86aed77b8449effdeaaaac1f1d0b59  MooseX-ClassAttribute-0.10.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 18:57:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 18:57:33 +0000 (UTC)
Subject: rpms/perl-MooseX-Iterator/devel .cvsignore, 1.3,
	1.4 perl-MooseX-Iterator.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090919185733.B4B9011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31627

Modified Files:
	.cvsignore perl-MooseX-Iterator.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
- auto-update to 0.11 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- altered br on perl(Moose) (0.26 => 0.86)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Iterator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Jun 2009 04:57:13 -0000	1.3
+++ .cvsignore	19 Sep 2009 18:57:33 -0000	1.4
@@ -1 +1 @@
-MooseX-Iterator-0.10.tar.gz
+MooseX-Iterator-0.11.tar.gz


Index: perl-MooseX-Iterator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Iterator/devel/perl-MooseX-Iterator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Iterator.spec	26 Jul 2009 11:27:02 -0000	1.4
+++ perl-MooseX-Iterator.spec	19 Sep 2009 18:57:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Iterator
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Iterate over collections
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,8 +8,8 @@ URL:            http://search.cpan.org/d
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RL/RLB/MooseX-Iterator-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Moose) >= 0.26
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Moose) >= 0.86
 BuildRequires:  perl(Test::More) >= 0.42
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -59,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
+- auto-update to 0.11 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- altered br on perl(Moose) (0.26 => 0.86)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Iterator/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jun 2009 04:57:13 -0000	1.3
+++ sources	19 Sep 2009 18:57:33 -0000	1.4
@@ -1 +1 @@
-7ad7f476015f7a8090e6ebb3ceb492e9  MooseX-Iterator-0.10.tar.gz
+55ef6a39886614c5200aabbb4bdd7172  MooseX-Iterator-0.11.tar.gz



From epienbro at fedoraproject.org  Sat Sep 19 19:35:10 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 19 Sep 2009 19:35:10 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel
	libsoup-workaround-gnome-bug-595176.patch, 
	NONE, 1.1 mingw32-libsoup.spec, 1.9,
	1.10 libsoup-disable-get-testcase.patch, 1.1, NONE
Message-ID: <20090919193510.770EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15454

Modified Files:
	mingw32-libsoup.spec 
Added Files:
	libsoup-workaround-gnome-bug-595176.patch 
Removed Files:
	libsoup-disable-get-testcase.patch 
Log Message:
Added a patch to workaround GNOME BZ #595176


libsoup-workaround-gnome-bug-595176.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libsoup-workaround-gnome-bug-595176.patch ---
--- libsoup/Makefile.in.orig	2009-09-19 00:15:29.684018118 +0200
+++ libsoup/Makefile.in	2009-09-19 21:30:40.413018915 +0200
@@ -386,7 +386,7 @@
 
 lib_LTLIBRARIES = libsoup-2.4.la $(am__append_1)
 libsoup_2_4_la_LDFLAGS = \
-	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
+	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -Wl,-export-all-symbols
 
 libsoup_2_4_la_LIBADD = \
 	$(GLIB_LIBS)			\


Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-libsoup.spec	18 Sep 2009 21:45:42 -0000	1.9
+++ mingw32-libsoup.spec	19 Sep 2009 19:35:10 -0000	1.10
@@ -27,6 +27,9 @@ BuildRequires:	mingw32-gnutls
 
 Requires:	pkgconfig
 
+Patch0:		libsoup-workaround-gnome-bug-595176.patch
+
+
 %description
 Libsoup is an HTTP library implementation in C. It was originally part
 of a SOAP (Simple Object Access Protocol) implementation called Soup, but
@@ -55,6 +58,7 @@ Static version of the MinGW Windows Libs
 
 %prep
 %setup -q -n libsoup-%{version}
+%patch0 -p0
 
 
 %build
@@ -120,8 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.92-2
+* Sat Sep 19 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.92-2
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
+- Added a patch to workaround GNOME BZ #595176
 
 * Thu Sep 10 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.92-1
 - Update to 2.27.92


--- libsoup-disable-get-testcase.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Sep 19 19:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:40:43 +0000
Subject: [pkgdb] notify-sharp: chkr has requested watchbugzilla
Message-ID: <20090919194044.1F0A510F880@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on notify-sharp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:40:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:40:46 +0000
Subject: [pkgdb] notify-sharp: chkr has requested watchcommits
Message-ID: <20090919194046.3BE3910F895@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on notify-sharp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:01 +0000
Subject: [pkgdb] notify-sharp: chkr has requested commit
Message-ID: <20090919194049.1A56A10F897@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on notify-sharp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:40:51 +0000
Subject: [pkgdb] notify-sharp: chkr has requested approveacls
Message-ID: <20090919194050.E505610F89B@bastion2.fedora.phx.redhat.com>

chkr has requested the approveacls acl on notify-sharp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:09 +0000
Subject: [pkgdb] notify-sharp: chkr has requested watchbugzilla
Message-ID: <20090919194056.B032710F89D@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on notify-sharp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:00 +0000
Subject: [pkgdb] notify-sharp: chkr has requested commit
Message-ID: <20090919194102.1375310F8A2@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on notify-sharp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:12 +0000
Subject: [pkgdb] notify-sharp: chkr has requested watchcommits
Message-ID: <20090919194059.7B72310F89F@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on notify-sharp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:17 +0000
Subject: [pkgdb] notify-sharp: chkr has requested approveacls
Message-ID: <20090919194104.8EC4C10F8A4@bastion2.fedora.phx.redhat.com>

chkr has requested the approveacls acl on notify-sharp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:10 +0000
Subject: [pkgdb] notify-sharp: chkr has requested watchbugzilla
Message-ID: <20090919194110.A6CDE10F894@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on notify-sharp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:12 +0000
Subject: [pkgdb] notify-sharp: chkr has requested watchcommits
Message-ID: <20090919194112.C15B010F8A8@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on notify-sharp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:15 +0000
Subject: [pkgdb] notify-sharp: chkr has requested commit
Message-ID: <20090919194114.BCEA810F8AA@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on notify-sharp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From pkgdb at fedoraproject.org  Sat Sep 19 19:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:41:30 +0000
Subject: [pkgdb] notify-sharp: chkr has requested approveacls
Message-ID: <20090919194117.3652F10F8AD@bastion2.fedora.phx.redhat.com>

chkr has requested the approveacls acl on notify-sharp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notify-sharp



From scop at fedoraproject.org  Sat Sep 19 19:56:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Sep 2009 19:56:30 +0000 (UTC)
Subject: rpms/svn2cl/devel dead.package, NONE, 1.1 .cvsignore, 1.7,
	NONE Makefile, 1.1, NONE sources, 1.7, NONE svn2cl.spec, 1.10, NONE
Message-ID: <20090919195630.2021211C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/svn2cl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25740

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources svn2cl.spec 
Log Message:
Obsoleted by subversion-svn2cl (from subversion >= 1.6.5-2, #496456).



--- NEW FILE dead.package ---
Obsoleted by subversion-svn2cl (from subversion >= 1.6.5-2, #496456).


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- svn2cl.spec DELETED ---



From pkgdb at fedoraproject.org  Sat Sep 19 19:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:56:32 +0000
Subject: [pkgdb] svn2cl ownership updated
Message-ID: <20090919195632.6B1D610F880@bastion2.fedora.phx.redhat.com>

Package svn2cl in Fedora devel was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From pkgdb at fedoraproject.org  Sat Sep 19 19:56:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:56:48 +0000
Subject: [pkgdb] svn2cl ownership updated
Message-ID: <20090919195635.C6D3F10F888@bastion2.fedora.phx.redhat.com>

Package svn2cl in Fedora 7 was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From pkgdb at fedoraproject.org  Sat Sep 19 19:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:56:43 +0000
Subject: [pkgdb] svn2cl ownership updated
Message-ID: <20090919195643.0794310F894@bastion2.fedora.phx.redhat.com>

Package svn2cl in Fedora 8 was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From pkgdb at fedoraproject.org  Sat Sep 19 19:56:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:56:59 +0000
Subject: [pkgdb] svn2cl ownership updated
Message-ID: <20090919195646.A5AFD10F880@bastion2.fedora.phx.redhat.com>

Package svn2cl in Fedora 9 was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From pkgdb at fedoraproject.org  Sat Sep 19 19:56:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 19:56:56 +0000
Subject: [pkgdb] svn2cl (un)retirement
Message-ID: <20090919195658.4B4AE10F888@bastion2.fedora.phx.redhat.com>

Package svn2cl in Fedora devel has been retired by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From scop at fedoraproject.org  Sat Sep 19 19:59:53 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Sep 2009 19:59:53 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.125,1.126 comps-f13.xml.in,1.16,1.17
Message-ID: <20090919195953.B3A1311C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26957

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
svn2cl -> subversion-svn2cl


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- comps-f12.xml.in	19 Sep 2009 01:02:48 -0000	1.125
+++ comps-f12.xml.in	19 Sep 2009 19:59:53 -0000	1.126
@@ -1150,7 +1150,7 @@
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">subcommander</packagereq>
       <packagereq type="optional">sunifdef</packagereq>
-      <packagereq type="optional">svn2cl</packagereq>
+      <packagereq type="optional">subversion-svn2cl</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
       <packagereq type="optional">tailor</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- comps-f13.xml.in	19 Sep 2009 01:02:48 -0000	1.16
+++ comps-f13.xml.in	19 Sep 2009 19:59:53 -0000	1.17
@@ -1150,7 +1150,7 @@
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">subcommander</packagereq>
       <packagereq type="optional">sunifdef</packagereq>
-      <packagereq type="optional">svn2cl</packagereq>
+      <packagereq type="optional">subversion-svn2cl</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
       <packagereq type="optional">tailor</packagereq>



From mcepl at fedoraproject.org  Sat Sep 19 20:03:45 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sat, 19 Sep 2009 20:03:45 +0000 (UTC)
Subject: rpms/ldapvi/devel GNUmakefile.in.patch, 1.2, 1.3 Makefile, 1.2,
	1.3 ldapvi-1.7-getline.patch, NONE, 1.1 ldapvi-1.7.tar.gz, NONE,
	1.1 ldapvi.spec, 1.10, 1.11 sources, 1.3, 1.4 dead.package, 1.1, NONE
Message-ID: <20090919200345.1204111C00E6@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28772

Added Files:
	GNUmakefile.in.patch Makefile ldapvi-1.7-getline.patch 
	ldapvi-1.7.tar.gz ldapvi.spec sources 
Removed Files:
	dead.package 
Log Message:
ldapvi has risen!

GNUmakefile.in.patch:
 GNUmakefile.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: GNUmakefile.in.patch
===================================================================
RCS file: GNUmakefile.in.patch
diff -N GNUmakefile.in.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ GNUmakefile.in.patch	19 Sep 2009 20:03:44 -0000	1.3
@@ -0,0 +1,24 @@
+--- ldapvi-1.7/GNUmakefile.in	2007-05-05 11:17:26.000000000 +0100
++++ GNUmakefile.in	2007-07-05 13:34:33.000000000 +0100
+@@ -4,6 +4,7 @@
+ INSTALL:=@INSTALL@
+ prefix:=@prefix@
+ exec_prefix:=@exec_prefix@
++datarootdir:=@datarootdir@
+ 
+ all: ldapvi
+ 
+@@ -25,10 +26,9 @@
+ 
+ .PHONY: install
+ install: ldapvi
+-	mkdir -p @bindir@ @mandir@/man1/ @prefix@/share/doc/ldapvi
+-	@INSTALL_PROGRAM@ ldapvi @bindir@
+-	@INSTALL_PROGRAM@ -m 644 ldapvi.1 @mandir@/man1/
+-	@INSTALL_PROGRAM@ -m 644 manual/manual.css manual/manual.xml manual/bg.png manual/html.xsl @prefix@/share/doc/ldapvi
++	mkdir -p $(DESTDIR)@bindir@ $(DESTDIR)@mandir@/man1/ $(DESTDIR)@prefix@/share/doc/ldapvi
++	@INSTALL_PROGRAM@ ldapvi $(DESTDIR)@bindir@
++	@INSTALL_PROGRAM@ -m 644 ldapvi.1 $(DESTDIR)@mandir@/man1/
+ 
+ distclean:
+ 	rm -rf configure GNUmakefile config.h config.log autom4te.cache config.status


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	19 Sep 2009 20:03:44 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: ldapvi
+# $Id$
+NAME := ldapvi
+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)

ldapvi-1.7-getline.patch:
 common.h |    2 +-
 ldapvi.c |    2 +-
 misc.c   |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE ldapvi-1.7-getline.patch ---
>From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001
From: David Lichteblau <david at lichteblau.com>
Date: Thu, 18 Jun 2009 20:07:42 +0200
Subject: [PATCH] renamed getline

---
 ldapvi/common.h |    2 +-
 ldapvi/ldapvi.c |    2 +-
 ldapvi/misc.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ldapvi/common.h b/ldapvi/common.h
index 4c264e8..f731e62 100644
--- a/ldapvi/common.h
+++ b/ldapvi/common.h
@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
 char *home_filename(char *name);
 void read_ldapvi_history(void);
 void write_ldapvi_history(void);
-char *getline(char *prompt, char *value);
+char *ldapvi_getline(char *prompt, char *value);
 char *get_password();
 char *append(char *a, char *b);
 void *xalloc(size_t size);
diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c
index 9d7d77c..7b312f8 100644
--- a/ldapvi/ldapvi.c
+++ b/ldapvi/ldapvi.c
@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
 		bo->authmethod = LDAP_AUTH_SASL;
 		puts("Switching to SASL authentication.");
 	}
-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
+	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
 }
 
 static int
diff --git a/ldapvi/misc.c b/ldapvi/misc.c
index 0a9dba9..3b6896e 100644
--- a/ldapvi/misc.c
+++ b/ldapvi/misc.c
@@ -315,7 +315,7 @@ write_ldapvi_history()
 }
 
 char *
-getline(char *prompt, char *value)
+ldapvi_getline(char *prompt, char *value)
 {
 	tdialog d;
 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);
-- 
1.6.3.3



--- NEW FILE ldapvi-1.7.tar.gz ---
?
??1ap??e?K?????/g
??U??????G??
i????m?:q??q4?Y???o?	?N}J	??????#??Bb.??e???'a@????{>?{?=]"?3?3J???????wAN?K}?!????M??????6??p:?q?<%???F`{??6????\??hI?F<?T?
????
?????+
6?}??_??xH?p<???	??"?I???????wI?e????ek???{5??2??$J?p??H???F???X???Z?4???f???????a??/k??Z?l??|&?m???????v
9?$;???????bt???\? ??W?m????a~`??~Z9??u?.?s?jw?5p?????o???G???b?h?<%????{U %?h?=?}c??(?#???[w???y?v?J??00+x^#???b?????}J}??+?Z%l???7???
}&????*????z??W?T????????Jx?U????Cc-
i??5B??a?ZY???H?
]NHE??<?J????
D?*???
?1???OIs???D7?x>?y?????D??'?I?A?>??W??
??)rkM?SU
??7?)??L?1???=??E?:5?o?d:G!???f:??????C?X_???U,??`???L?%?Vr?l?,3??1??6G1?"??B?$??\?Xn ??R"?H?B?xu?]=??vH??E5?D)???}???n|???????^? ??']??zs?+N>????Lj?????,`2??9#?LY??4
pBQ?????!W??d]??
k??:
??*?p???	?by?*???d;???r`???+??*?d?????C=G?r.[c?AU?z[?r??t????%??'?S?.?ij"?%?>%??cd7>??xz?-?	-?.?rHX-???J?"???x]???=?K
\?@?BO%u?
 A]?????r???O?T#???Z?nlX???D?p???s???????????7*?]?6?????o?(T? ??D?g??y+?{?\p??y?[>Y ?6???)L???"En????o!|m????a'?[?!???u?k???
?8v?9mW???y5??j,s9??d?????D???]?)s,?1?Q ?@?E?R?>?=??'?q????d??)??0?/?????X??}5?x1???t??x???[?L%?,W9???G???
A<e?D??=s?E??????
K?#?:?2u?RX?lE??s??#?pK$g??n
z??)?3?n?q?k??"????yy	???!?#S?N?
?JsC
O???+<F??iB3 ????&

K?"??G????c!???????????]?ru??B?%A)7?REg?2kNQ8+??n?8r?K%q~U??k??C^=??2???/E1)w^??i*??)???#?,;????v4??(????bA]?"?j?C??
?{????G??U???1???w??fH?M???.a6o)GO
?)?nw?A"???m`n?~?R
m??G~?#I?
??HwL?-?ia.???Uc?s[E??|U
?O?K????i????3^?A?
B?'?/???g????\/\R????R?&??6?#??
-??MC??U~???????""?~V???-?l?T&?MgS????<?57?????????t?U??i?}??t??n?7???????
??T?4?%m"?"??W??	?+(?=?o?d??"?p???,zt???pKf??_^?}!"??v???v??????.????~?
?L??H?a;?2f\R??FvK?`q;??%?O\?????I?8zA??C??Jv!d???[?;?a
?d??]V?O??;??????`_?????<j42??<~?????!??????yD?z??V???p{??O????I?'???O??X?????.?%u??j?????o~5?t
f??=???(?<a?M?gda???a8?/C??'???dna???JE?)?[?N??s?)???
?my??C"?y??u??w{{{?
u???y?j?

?ip(oi??ID?^6?B??t
#/??Q????&?
??	@!??LVi??s,1xAaS?????6M??*xG???3?3,??;??[H?P?????l?8O???0$????(	???E?^????I?4?\}{?K??w-y?c?j??j?k\?b	?P2R?r>
???|p?? A??2???d??Cr?P??'?y??.4???.???1??j?:?]???$?????[?]????s<???]??
T?????1[???4?Ar?7b?3??.?a
6?h??<G]?????*??
+D?K??????0?j?sm,???r-?????
0<?p??/????ud0rR?	?8e??$????J?kt?
?0?lS?dr?v???c:???W???Q`?!?,1?,?@<?j??cL?ch????2?u_?? &?S???????d?5?\?8`??	??:?88
EJl???l?Xe
???
??C?Cf??i?x.?a?d/??CN??????a<;`C?????q@?Nu???
?)u??^??qU??z??,??*}?Y?	?2(_???????r?xZ at dg8JXX<??(?1???{Z?{8?	?F?/?q|??^???D?K?
&?f0
??.?S!??2y???H?O?f%p@B1?v?n`|?X???x?=&??t?X?%	o0^??p??M??"I?????\?
?5?g???_M???d??w|? 	???|?@?M????-??>??:????T??{X<b=????{dW_??_y?G'?????????9?F??D?u?]?&??7??7???

? b????
y
??????
??$?????3U?O"??Y?J????o#$???{??{e???b\????O??E??F:????x??Z??.bO??3??D??????1D??a(zX?0Oy?m=?z^??M?f??sN?"In?]0u?U\xT$?j?F?;&&;???sC?A?oC?u=?a
)?[_S????3???

j??u??c??$X??(C?v;!r???tOn[m
??#/?=???n??Z????%???????z??m?Q????l?3P????h?u??7??????|W????i???|R>???????"???M???]?????????rm????,X??
+??!{?E(?
?a??"?c
?o??(?7tA ? ??|????,?{E????2??????(???-?&ZhA-??N?Q??vyk???Oe-B
?*?,)4??[[F"???????T????
?+???!Z	DKw+??G +
?4 
??'????8??P(E~?AF?Oe4???Y-c'hq{?#e??d?"??\?D??S??@yY?
]???f??????dU?BZ!?Zvef*G??2(E*P+?)?#??o?'??????o?f???????????dxj3#?????P Gor.l|?ma/??M?+?O??c??B?????_;?WU?????"?#?k?U??x7L?Q?'??#V??????"?????|9??4?$A??J????|f_??????8??g?	??3??(V??C!??P?l????????j?)?xx?b4?tT(??45?????'
???80bP??C?w????u?L?????
?9}%?F?(???]A??z5I???	]???????~??^s??????r<??n?a??????
?g??s?????Fcc
?x?:N???[??;?x?@!??
t?????4?&AG??"????X ?XH6T?Isq?A(?;????bMX\T?iK84]?'?a????[:?'.hP?%
???-W????$i at g??
T???z0?d<V~'?&:Y>?????sJ'????k;8????V?d7?}????}r*u+?zg????g@"??"??hy??*???=????
m%}ru?????Hv'??}??w?Xc??*8?E?b?56?L??af?Fo1
????x?????
l??u?vv??GS?????????3:?S?!?n>t??pr??v???????????3????????,?????6?e?3;td??y??z?
?zs?LD??S?1{<8G?0?D?????Qz?t??m?V,gAN??.?i??7#??Z???f!s?xv???G???????g?b?????z?#j???M>???kn{;A{?h????G??e??m?????N????]
6
?????H???`:???4??~PQ/"[?????8???s??aX???W??????????q<? ????W???????(2a?3?3?Y?A??Q??%?p?h???`?(B?X??w??hd7y??^GKT??????3????????#??0?<?e?5Z????+?B???S????qH???Dg??
3	?i*$3m??ri???v?@w1#????8#I???l???	z
??Q]??"??<i<9f?4P?/X?L????)?H???{?$??]uS?i5wr??[z?y???Z\F????????1?k??6??B?5????y?;?|@/P?\?E??I??k?
?????_?/?p?+?n[t????????{?[??7?5?<??C!?$4%??P7
$(?%h
??M5o+?*??????@??p?j?e??C??@?2"???LJ??)??t???0??C?)?oaV?I,????s???	be@??ee???\?#??.??Z'&?K?
?>?V??:??w??hO?cb???r?v?h??o]YD?u?V
U?-??A???R?b?^??A3H??T?`?e?
?C?5N?@?????.???????pp?qTI?{,???:yp???????e?????o?????M???I????????=??d??;????????~?Y?1U?[?r????k?W?????'a???????:?????"?P?N?^Q??J?`??????Y???F??E????O??7EE?V?BJ?8.?,(u#@G??t!????\L?1???9???h???
?W	?????08!e1=RM?s??????>%>4?h??????????;J^x?
*?1??(S/?SW?D
?!1
LZ???L8?#P?0?????????`in?????3?j?-????sT????9A6~?4It??b??z????p?<?N'?e???;??b?E???i?????&?L??:??0?E?R??o??????
1??~??k?????Y??VO??A????N?????~l???????Mz???
?!C4s#?>??a?I?=?N?F?#??qy?.?????=??u|
??(~-????@??1?q?!`4k~+?`c?Gp??;?mn??S<YqW??GxV@??????w?????0?9??
?8/:ChR?ip????~t??N:??6)v?8?<?X?de,V
?F?i??=??B???LU8?-??E0k?R(C??
@??????-+g?ml?b?	????:????>K <???Lj*oI?noz})?7???=?????D????o-!?=??M*?Y?Z???;f???U?8???
?:??????x1sN`??c??hz??????l??ic?EF??V??Cv
2??	B
??{d???x=ZS???#??a?E<.?K?\E?UT?<'?D??h)??? ?<??d?#1?n:(8t????o?y7%???4?A ?)???{^_??8d??f?Fp?b??t?
!??6?Rd}??KdW/	??????$?*!vM?????C?????y?h?b?G_`j??l????`?&R??Em??????
o??]?x?b?"&
C?3???\???8????t?)?l?????$@q????[???_???k??^???;????e?N&B??M3%??G?/\l????~o}W?.?????~?r?w??p???pB??A?Q???]??&???Q?"P!X???????$?0????ps
M?`?.3?]??8???PP?(??HtZV?9?.?
?3??v?
?htzs3??yk??O?????&?r??Kj+??Z?
:?F?H:'?'?
??f?h
?
?}4?$??b??	g:?2;??Hn???7?NgI-???_u???7?C???]?s?%?)w:%nT??g
?|??s?>z?o??<??/}?????<?j??`???{=???Z????XH??E?
?A?@?nc^Z??i?bFr??Y(l?0?V?????`?!???ZV???#q~;i1???o?A??e???y:{??S??47?b?$???[?F??iF???MA?G??gh??e???F?l2??m%?????? ????>?m?P?^??|
??(???@I?Dc??v\,W?*?1??FS??$???(?%?w?A???xS??Z???`??C\?S?k	$2??e?
?p????tU&?????\%?)A????}H?X?I?*??7ZR?p?N?j%W? ?5_Q?K!O:?1??M?_`K???4?????????Bs?TpB?s,?zzY?>???????*????/E?dE*?????-[UO7c:F~??????!	?co?"?c?l%4??7AIX~\'??Lb-???
???? ?s
?{??}\??m#??/?h??n{?????1??l?<??w(Jh?R?-??N?@?LrF??'??TEs?e?8G\v?:?
C?<[:}??????
v??xJl?f??%?,?7&??wP??j???!?&????<_??6y?$????i??5???87Qt$?V????4??i??$8?l??????D??[?N^?Z??_^?[?Z GhD?]?
??d;V?/?}????Y4?/fR=MGo?]??1#b'C?JC?LuZ??$??A2?hx?&?t?@??=??a?????]!???1u?6??9??)
???LG<?b?T??Mid?v?;fc>m?#?
???72B??CB?????8@??h	???-???C??g?q?7???i?e????>????d?b3??7?/?m??X??Lm?q????p????????u&??
?/kSG??S+_es~??-J+~??<????2?nqH?c"j?UQ???@??'??t?Q????@?:M???=9rL? s?@,?)vRd?L{?6?dg:??W?d*?O?Z??no?Q???}.t??
S???Y????*?????0O?v???k??m'?2@)?"?u`Q?	6?i??_???z??P??????6?d
(????l5m?:????????Fs?zo?Z?	?#?)??XJq?CR
?S?a?`O?9??D?R??????
???W?W`??
j????rL(???`V>??r?*?pgTAD0?
?m?
??t
??????J???!?w???x??$????>?u??Z??Q8M?????N???	??`H???????????0???]?I??j?3{
:??????R??T???A??-
??????Ohx????
.??
??hn?6?v??G?pEv????<???L?((?H?T??s?9??!?n??@1?c??????yq~???5?k????j?8???C??"`? ?????}r???OIUU???lZ?l|?V??y?i.z???j?=??y?&??zY?b?/kKo/?Q?=?X"S?u????G?l/L2l;????|?FJ??J?Vt|??????8??u?55?t,,???????Z?????????y???????d?hS?9?0v)??Da?G-????)L?+?d?(??_#U?????-`#h??k7?Y?&*???f??????Nk???X[??r`b82(?R??K#?Q?|?nt???sM?;?	
???8'%05kU?i&?m????H?,???Md???????b??&?]?j?36/??3??}??89?@?j?KII?g4^a&?=T?^????.?n???J??????
?=E???;%K??-??01?=??E5??;????
9?S???
????J?\Z?????i?^????wUte??-?????,??(???-???E?,6k?9d??D?5????O?x51???5q??????D#E???wZI?K??(??7L5}???]C.'???3IA>(?H???c?U?;D?Eh>??MYy?????c?{?.P??.!?w????????;???M?t????d????>^?x_[??v??v????d??#r?l?\
?b?uR?K??????
n?7?d
_??~?e?}?????R??M?^??^w..?????w?????S?0???v!>??7 at e??to ?]???????X[_??5??x?X??1rF??Xc?4]wa,'l(XEnh?(L?H???G???	Rp?w}???P???'Db{4./????G#??t_P?#oZ?]=V?i^C?NN?gX??X??????????y??H?5-?hE?????K?Tk??w?
U???rQ????i??(?
w???? ??$]?YXzH)?;i?IE?XK?<?j?rLoG???????
??(?W=%????Iy8?4?????????<?S|????0??_n9(???5??p?R?|;?o????VV???`
|??g"??K?g\d?{??C7j?j??
???r??6???D?^??[^??q?f|??P~?E?f?????Dv??kI???N??	?*??N?m<r?<T??K9+???R4??0s??9?w??o??SU?{?a0oNz???[v??????^??0??7?P??z?S??????)]fB???5????)??j????}?oGq?7???8?I???E!}?}NH????2_<?N????W_??p}~y???W???? O?6??2?CsXc?j??o?F????P?Dw :??X??[m????l??7????5??fz?z?W6I?C?)u??+a:^k<??Y_????O???76?s??x????}LmS!??K?t
?d??Wf????X=?+At?:?Q?v???D??LD?>,??????zd?O?'??M???&,?Hx7b?1????m
N?????A=????bs?-.?8?k???+O(?elE??U??Ec????s?fp?Ps?????X?
??l.V?/?B?-?U???w^M????*O??"K6?/?%?8???y*?M???C??=w&????k?cb??H"
#/?[?!?@?T?K??e??&?????^?
?1^1??c????u??&g{vm???c???u6?1??a??%0??*?Z??I
???????????5d?????G&??"
0?7%H6??qJJ"0???q??????f?/<??{X#g	???H?????O?v?d?8q???I?R??r?d?kX?0o????>?#4?3?])????
@??}?=f?y1q? t?m;?a*	?"?jI
??Q???vVn(?u?O__????t@??8K?Bgd?(?1Q
\??\??O?0?f?5@}?e?Q3?+Jg????6?N>???	??m?[???}<??iu`K?NK?????4?:v????k?t??\I5?Q?>????YR???AZ?'?$?I??-?5???m???????$????9+??\]_?????+?S ?SG*$??H?!b?@???M?^$x??&???:????{????R???????c.????????L[
?H???"???????? ?@M?Z~??n?dfy?????)???????U?p?(
(?o?Cre?U???????????c????=ox(
yv/Q?CX???FF??gk?????g8?"?p$??~?q???
?E?^lz?#a???F??R%?;3q????5?+5???*tuRY????,i??X???SW
?8q?s?+?f4	G?}Y?????!????Y??X?????A???????P;????:?)?r>##}R?i??\WR??C??H? ???7?e?(??????A=n?)$#6H??,?fl????|&~YQ???????N???KnmL2V?}?Z????.??+j?J?G???UQ??',
???
?4D?o?.?
2Yi??9x|?C?4piC????d?vB?
???XF?D	`????????S	I ????l??bn?????,???p)O2?d???zE?I??????0!?/t??;)?V	?1lGt??A>???/???J???q}?uPfs??8&??\%[?ZGI_?AHz?4.?.???Ea??,?*?????N?~????NLm
b??????U?OU??Vu35?+b?:B^??i???Z~Og???????????V??-Xi?3?2?\????U-R???1k?Jh????????????????X???5Nhsp?mW&*????e?^?<c?
?Xs?;?!????j????h%?$???tj?x???e??
?
?AIh:???&k5?M???o"??Tt??a?^?U3Ls??Z??x???7G>???R8?v?'&/o??)?e?JG?cr??-??
r(??=?'?+4g??m?????????K??)???DC????"?
?d????)?~??? HON????e-;?G?Un?t?In?wq??J?^????h??X
3??????????]?t
K?C_???~Vt??O??
?X?hv?5?x(_u}???:?+???+???u????!?zF#????#<??R?
|???S?a'?)gFN??V??'?k?4yN?Am??0Y???6????t?P3t`????7??F?W???}4Ilh?y????\?H???gz????&?????????|????>??^???????"?|??*?j??hWn?7?????n?3"??$???~B(z?d??C????(????J???U????d?????zc11?[eR ??5Jg
?X?q?Q0t???0?????K_GG???aX	?k+?qb	 E1?8?d?X?6qL
3?	?)1?e0$?*p???Op
\+	G???`???[(??-y7Ak=?c`?I?Pa|??Z??[?]??!??)2??6??????mc???D??^zc?y??a?Q??K?????a8??#?y?V?@2P?r!:??gb???P???????L???'9??(;?)?u??~0????R???8???	???eQg???????Av????s?!?? 
;q''??!.@??vn??
?(G?J??+r?U??Y}xl?PFi???T?o]??.}??\??t??W?vn_?@!X+l???????????i<?????va<[?9??3?F?????b???#??&?"???y????????,t
M4????&??>?h??-|vg<:'J?$???8rQNGwM???_?n?se??y?:?????#????????wF?hi??;0???6?.?V[C}??vg?????^?$???i|iS9??%k???N?KA?2?+???fin.y???R?wn-?5????K
?^????X??HtC???l?N,?0^rkS??????n?8J?FdMo?@?i?8Gs?%?:-x?%?Rr6:u3)?9? ??l
??,[?l????n?f??Q???&`N?6-Y02???M??%???LU?>??8o?q?E??e?????=:?4?d?<??????r?mf????xD?Z???????L?u>o???
l
x?
Z
??P_G??-?f??????c:~??-f??e???)?LM??-8????=?H'M?hpV???(??v?#i[??[?=?Vr?4#?Os>E2?
???7I@?
}0??Al{)h?B??J)3C1T?EX}??gSv??o????(^]T????_?3?s??????W?8?a?\?r?!????7(?.L;???????x?R6????MI????;?$7.-
D?sS?p?y?Z?n?o???]?2s??U??{:P ?Va?LY"??R?????*??;A<G?L1N?$yR????:
?eT??D%{?B[B??0?UN?E????????eH???6LT?[??)iJ?-?O?7?f????.?3?p{????
?nct\eoG??x?x??????	7??
?&?3g???M\?B_u&?"???$???M?v??%U/?????z??%T???At??i^M? V?Y?O?'t??????s???(??d4?.?l??
3|k??????L?|???=3???k&???L??&5	hgz???I??c??=??F??q%}??
F???
Z?d{?5,&?T??
3  ??
??s
??s{4f^?/K??
?H??aE?
?A?J??:??yzhYa??[[???J??s?m#??YFa????.9?f??b?-?@?)???? ?Y?-q7??m?o	u?X??nq???)?B?N??Q?LV?~9|yr=2?N???f?f??ru#]?4;y?D3?v?t
?I?T?&??Vwn?~
??g?d??0l???d?RS0@?r??5'??>?1???!?
$V$??*?Qr???? ??'??? ?#<???M?KWwjY??4?k_??.V?Uh^L????V???.r??I?5??X????Qz??o_?#??V?qe???h?as7?G?????????2|? Zx?q?$???????w
??$!)?=???jt????2?????%???`0EfI0??)??'ZD??.3:?'R??6???????i?????,?f???????(?????????????0?	??????1D?"@	???	?@L?q.hI?????pr[????0:$?%??#&?I???R 7??Bs??d?j%Ec?????????Ik?Ur??:1???K??[5 ?????B?:e?P??$R????t?)i??>?y?v%?,??
???????e??x?????s????I???9n??P?/?????e????2?F?~?-$C??r?v???e?F?vZYR?<??f?%??Y?.??%?LlP???%?%T<?tr?^??xmq?????\L??$????????
\?;
:????=??P?5???????????v?H?
$v???W?????^4??#?8???5l?????x??oz???????aS?fyf?7E?!i!G0S	^?V??'???6X?ei?{
2	R???I?????????W[??;?7N?????;????????V???<?????3??o??sgcw??~???Z|?h{ee??s???
Gl??kU???zxj)B&?uZ^??T???-??:f?zO`Vf???%r?}$v??n?
t?5??Z??y&?56????T+YV??s??	Og???;m|?Q???.?-?	3- ?Y&&'_5*h.?l?-?3??SW?i,??xt~???L?!]?fW?8??q?P`T?$??-6 at b/?5?H???$G??^??r?;}J?A?$????*B],4?A?C
]u1????:???????x;?*v??'?
s1$?$l???.???S3???&?e???q~bEv???????b?????=h????#????4?G??.????(??G??d:?=Z0??`(?"??{???????;?D+??D????&0?$ a???QK???~?:?`????v???W?????M?h8???h}??n??Bk??}??k)??X]Z???Z?x?
?????&?~??_?j??????\?z#Z??????;??ml???]??Cd:?HHA??~|X&?1b??L?]??+4???}?N??m??{?s??q?X{????<OS]aa.????D????iz?:???!?>??s2Zm>?S2
???C?9%?n\?S??;???Y?u?\??U?n0[zu?%~WI7??\?@??S@?in????e,'w?Ih?D?}?j??%????Px??m`???g?c??i????{?I??$,???uP???????S?????X???N??=??&S????????C??pFN??q??J^???,l??$??FA4???
??????kVd7W{2j+?zb8u????X?????,N?4"??_?#??\???????e???CGi???/B?u(??7?????LY??????v?y??Z?f????p/???x??x??{;mdx?y9?????	????:E?Y?\
F?\?'?$???F?Y?*???8?B,?a?u*?ke?V?b??J?If
r
??}{E&!??z?-#By3(???S??EC???nR??	?_??}????3b???A?
??L?+QDQ?C?q4??]i?L:f?J?#I<L??
?8?x?d??}+&????9Fpp?A
 bP??AxU?X???????a~ ???L?????
??1???#(]/d???8?|?oYY???????B??]?]????~?V???28+8/Vx]kg?*{Cg?.?;??3?q[???g??????r1???w?$U\???//?,6du?9????hRq?Y%X?w?;0?s?FM??K?:??2?I???????????os?YE??4 <*?]{V???I??yb?H??s'
K???
????r????
???0???h?????j?[?9]An???????W?9?????D?%?`X??z??9?????'?XZ]?B????y???{????;?????5?
?H?;?????@_????|??? z????kE
8?g9q???	??????i????e????>y??a*Zc??????:z??6H??!??"Z????(Z????f????p?~<qcR?t0D?R?A??h?x?|????~?zLI?????????7?x?I>??,?^???Z;??U???~?*?]x?????W??_?????????]?~??'????O??g??i?1zW+?	r
?R????C?????'?-@?{?b???-?c?2??a?8?????????O???<0?k?????*]}<]B????????????Qx???A5?c?Q?>VG??????t?OZt?VmE?f???????????Ud
?}????A0???x>=?=
8?
59	/v]?????J??'????&[Q?c#?KP??J??jU?]????.?Y}??g&
0dHgp??M?n?yG~?????}???<?ZLpM$?
?<??
??%???????~/????st|??^}???7?s?C/????????=B?Hu
??E???-9;??V??~l?u?6???`????bun????????5uw????Z?_P?????563???x??????C?}u??6??Q?!?]?????+??.?7,??=,?A??
2>??????k?]?D
???/]mr'???x<8????4STMfl?<m ???(f?@aGQ
????m
Q7
?4-s??
????*f??])*???"??sm?T?Qe?v???;??N???,?-r* F?
r?#F???i?y
'???o?(y????Bg?????
1?Lw?b??7??t1???6
:$??D2?,IW???!?7???????N7?????3F??O?lw? ??? ???????DB?NF7/??OF?J?C<?u?n??+?1:IK????PX??{0?f??-?4$n\??b????&]7??????qO??0*?rZ?q|?R??%3cW?~?Y=??S?y~?1??N?F??9/0/lDf%??F6?{?8>??2,?Xc>o?R?????4???3???????0R??`?????2???P??H34?{5?S?<N?w???????k???????p?hC??|??Y?,?A?????OF?Q?7?:?~??d{V?????0?t??ACO?????zF??gf&m?????4k|?d??;J?k??y???d??M?????R??????F?<J`??u`??-L????r???#???4?L|?;??y??O??0	???46?Q5}??????????`??#??????!8~To??v?Jq?????R|u??????(????f??y?H??^	??5??{????fm16A??*\?n3?+f??????f??i?
??????m?,??w??O??+4+qz?oV'?M?t?`?????Q@E?b??$?.???UlMP0iKG?????
?e???I??p??'?V?pt?1,???o:{???x??n9Ld???7?????&??-
?	A??GsO1:z?]??a?0E???^??@
??ZM??,O?W2?A??????????'?;E??? ?H1?}???sY??K???K??'Z????X$???j	%?,??
???I?)??])???????????*54?J?^'_?E
R??L_??,?:?+m1??dE????4?S??s)?O????F??g3??%??????0??~Oa3?m
3????(???7}??|?'>???????~?/?e????????????e??~?'O??????{??~?_k}????~??~??????_??O?????O????C??C??_????O~???_?G????????
????????u??g?Mw?O???????????7???j?+?8???Q?????y??????o??????~?_????~?????????
\??????}??_{???????w????_??_?o.?????????T^???????????????????$|???>x???_??}????_??????X?e_??7??????????_?????o[????????7????????????w?????_k?????_??_w?n?~????;??}??c????o??w???#o????'??_?O????????{?_???????.?W?????~????Z???????k??????_??????????????????????????U??w????o????o\?r??????????#????? ???/?O??W?=?????[??[????6?=????????[?????~??'????W??o??????????_?%??????/?H???7??C????O??o?????????>???7??_?_???????f???????~???\???K_?k?_???????]?/>1??>?5_?5???s????n????Z???7f?K???~?;???/?}????_?S?????????_?w???????????/q?76?????????`??'???l??{?>??zFm?????,????-\y?9??8>r?7??v?S????+????"?K?U7/?V(???nm>\R?q|P????03?O???zGP?[?????c??T?S
K?Y??N??/7*F~??{q????8??s??|z?/????|?????z??`;u\
?_???phr5Z?M?`?,_P???j5??W??e????????\?B&??F??????q?????I?4?>^
sJ@???????p??8?Hl&????b ??
%?S??E????????_)E?l?q???>??x?LV?e?R\[??nC
f?/??Ga????qJ>??{[?w;<6pZ(PX?6??*??	=?%??{#??????KK????W`%]?z3????8???[{w???6?-
?04??'7`?z}r]?o??)x???w7??????G??3?v??<4?b"????????]?_R??Qb??U?g(??!?sOKJ*????+????????H^[Ga0?
??H??($?I@?E??M?DmDQ????TV"!??<??A??&????	?????x<?????lH??C???,J?????X<???P?S
s?R??2?4M?<?h????????
?????????r?	?????nW?<x9!????????`kg-????Z?v??w????I?M??0?{C? ??N
??i??)'Q?}??;B0?????\?q?H6??Z??D??j?+?4???t
?V??J?????	??6
???+L?%??W??c??#mG??;o???K?+?????/???ol46?4?7??????2???M?X??e?,R??00?????s????,>G?Pm)*[??z&#?a?v?M)?#???)k]
N~
?YRWj??n??????3?R^P5????*~?h_Tj??ou????W?Z???S??RW&?s??????????6???e??O)??}E????5?Q9????????????k~?o????7?????&??o?m??w????]????????????????????????????'??????o?&?????????o??????[?????_?+_??v?????N???_S]?
????????N????Q}??n??G}?????VG?]??????????>???????g?%eC?
?????W???T?H????????????????~?)?????????q????V??y??'??U??y???P	n? -.V??b?scC??YP)???
??J?_B?R?????$z??????m0@?W?
????H??S???????????????O??*q??o?h?/?P^~<?????~?????,??`??8?>
???Wn8??.???????????????>???HS?????sJ??"?wI9?)?)Pr??O????
???w??O??4%?????!??????{$???P?=?????
.????x???5Vhi8??Z?_????
/
??5?B;??uV?????Y?a b??je?_??,?*0?<?W?N-?78u??:H2|??????_p*]?JL?????R???k????F???W?Z-F????S??+??y at Yz??o_??????;??X?????s?T?jWx???d???????2of?T????????<???j???????^?Qv??!??H????n
a??`?G???bW??+???}??*????9??or??p?Vu?Z?o??v??????L??)?2??B??/X?.Z??f?8???w??(8??????ij?m^1?u??:N???6??5?6M?n2O?6???r??3????8??5?6??8?1=????;mv3????8_?k?v	?i???q???
???????~????????X??
?/?????Y|????????q????????+?y???8>/???p.>PU????Q???~? R????B?0S?????V;
(??j??R7?_t?x?}EUn??7kdzErRU*|?aB?et???aT??5
???Y{?s?vS???tU?i?s~w:???\Z?c"??^L?O~F??j?j??^?_l#?Lh?eL??Q??{??w?l?
???gUX?OU??_?y??u4?%5???k??_?y?
??lH??m????K???
*????`??H,???~?)?F?1?????n??[??????????2z?d???\I6?k/k??U??~?S?l?????=?????g?%?j????l??k?%??l???????kR|A?0??W?????}????X?_????6????k???????????c?<???W*??U??Ze?u??[C??px?6?????=?1??????C?r???A@?a?>???Q??~/h?X?????
sbcvLYkl?4V???5?`UD????'{q???{??K?NeI??3????,}?4??vz(??Y?OquQ?Q??s??2??????`g??1;}?}F$??????????^?!??7???l(;?D???????|?S???0G??
?=;?r)??~????i??t???9_;w??}?DC???j???~?.???o???????n)???>?????
t??A.??}
??????x???2??zY???????? @?????????/L????????*}v?A???1ps?=??{ O}?$@O	W?? gPl?T??(R<?????????(0?!??A?????c?B????A?pFRk?????????{#ooD???g???h???JcF!?<???lp?=?d???KRLB??x?9??v?6??8?}=?g????zX??uB??cWor.l
??w?Nx???6f??#??&?? ???????i?;?2???Ey??.?iy???????cP9?????????1*?t?<u??|n??"??????z?$?Hk?x
E?@???N??t!???C??t=?G=?3??????0?V??bC?9 k??aZ?
4?
t??N????d??????=???>?g?E:Q?? ?C^k????p?8? ?bEc?
????p??b??????{4???8??-??]? ?v"
@????1???J	Q??Y?-*?c??O??'?o?(????~????KY??K??_???nI?2??A
???J?k?w????RI??#XC%?M~Toz??&???O?i?????????<?P?0??;??0????Wx????????E2?Pp9?^?????$o?)??4??&???[?4???t1?1??=.?????[TE???c?x?A\?T0??R?F,?+J????n?Oy????d??
>??	????k???|RW>$???.?%?vA+ ?`#|?5?E?Y???@?T??TI?1cQ??]?b?w??w??'?S?[G	?"??b_???ez3???-???.??	w=???B?7?2RA???N?2?j|&T?T???????4K?'l????-'???@3 `.Gi?kk ?dw??#&????	T"?S???,?G?g??X??"???????<x1??dD?????w`?t?X?????? D??@?70'???f8??????w?2UI???q???X?,?v?
??(g??Q,?O??]??
??,(?!??A???Bj -?v??%u\Y?S??????????
????e?????
????G??~X7e????OoI?t????=????d?h?Q??]=??d'?k?A|?????/?{:??P????#????M?6%??????4Mz??k???l??????	???m?4??w? D?U??????

??{N?r??D????I?z]]jj??:? ????V9=????"2??k??0c?O0??5????u??6??q?h???????J??9?e[??pq?c??IM99??j;???_Hi?B0Em?
? ???Fm??o????????????~E?????Qbd+'[??9????Q)?7Wb'??C??????D?%=[9?m????`}a???VX;????????`IO????!m?K??3z=<w????
V+7?a???N??:cF`???<??B?g7?
????cC?6???eS???O??T???kO????-8????? ????L?3??i#?j???m?n4:???Y-?.	D?{Aw????V????B?<???hjP?StW?(*|???????9???Ah6o?WK???C0
?
;hv7?rN?????u?9?z????8~?
??<??m*\???m????? 3]<e?>???????????>??7?F?k??????3??\?re!??k??s????S_?[?\?-U*???;??????n?????h6??B'?????z????*??j?o?A8}??`???+?(+????? h?
-???	????)?Q?{H??,????[?,??o_?G?;?A>????[???????U?8??Gh???]
fv?[4v??E?A8>	?~???????G?9?@??gY??????
????hb??+m????
?cw????f???z?>
@?u??4T????K?"X?Z'??
???????U???u	Kd
????:_?t???=?Y?*?????????????d???g??;3????L?????~<???$3????v????????????????Z,?g??G?~??9???????[w??????????k?????3oc??_X?~????_??????|j??jmKmn??{[k??????M:?????H{???E???W?U???B?P?r?V??PG???*.U??w?w?_??4
h~?G????5;q?Pk?U??A???GU>k???????????z?P?%???[???[???[???;?k???'????>???5yIP????u??????q?>??RK???m????G?GU}?0???(???[?]?sm{???7???
??:?&?@?$	?????z
7?Jn?rW?(h
???2???C>A??	? ??
_"??.FZ???iO2,?l??4v?:?L????bM?++???????
?c??????"??V??
?B??a???????qa?JD	G?L??o???S?L}x????@?#????We???????
|?th#T@?	]??Y???B??>??v?mO~{<Fx
???? ?e?u?S??f???uRK?U?8-?????O?)z???:?u8
o?p4,*?%+???`?n?V?6?B%P?B-NUa?!8??Q?I??"??????]w??k??RY??D??,PE???I?y6??r3???>bh?}?????$?;N?D??????K?(???O??????8
X?
???????)wG?o??R	?8?D?1T???????7y)?????+??s????
???RD ?^t0??$????ud&?r?U?6??? m0?r?SQ?#c??$u?v#}???<??M?|^t?F?K??L?-n?=??? ??Z??????d,?=w???h02????{?2??4??#?^0p/?#?M$:@??L#V???G`?????V????I????**I?,??T???T?%??w?ryV??.'???pN?@2?????g?]wp?eD?x???????}tTj?@???=??hw??00?????! F??????Z??$???sF??e%t5?t?i?Zt?a?Y
+????????2??R?F?%z\??e?E??^????rW0/??~E?nq'?F}
\?PyTyJ'??^0dj?
?,(NkI5?j??5?Q??w????H??`????%@=???
Q?}??6k???n?^??V??j????T( l?n??
????????Q[?)Xy)?v???pw?F?v???L%_???8"9p?t?'&>?{R?z??vK? Qi?0Z?????/??????bi???9tk?O0??Z?8?
?~??u?"W?????????nc?P??q????8?
:?'??!???C??? ???????????z?(k?P???q??
?K?me???(?6+(?8?/P?hgkkW??L

jFk?F0U
?	D??????380?Y????Q ?4??M??r|B?????a?6?>??Gm?/?}z??'???[;????d0??h?????????{?!	,?Z??Rl??9???N?:?wi?`?9t#??n?(????o4???e??Q??@H??T7???????7?[?_?????8??{}?j??g???s????y???O??yd???]Fv-???E????%?^?9???Q??"?x?r??8???:???v??????*jw}k??????g*??????TKN?W?????q?????
l????=???|??ZQ?nG???J$?^?V?5I???uP?????kt????@?m?M?????a????NK/??*j?L??\???7330??No???rtT??]J??O????2????X-gKV?T?l
I???	mb2oPR??Ii??p????1*??MQ5[6?l??R??
_xY???E????J|^?PD(??WK?~w0Y6???<v????????T?`]?E??+???zU??B????5?#?????v;?I???q|
????? 1Z7?0????[?j??8?=?????kl??[??k???h?ab????????`}????[?,E??C33??t,/-?8>??????eA??^/t?D?? "?j?6^i??~)?B?\U????????|??????C?"?w?@???????O???"q??~&?x??
?1{:[6??/??Q
??a
8?N4??Gq????E?O???y6?K$b~Q?R1????
+??8 at 4???mj???.h??M'?)????????BI??????b?g???
?/"Y?e????\?I\?P
k	??i
l??Y>1?dO?i?+??????????3F2?#4?I???p???????I?0???^2=?`h?N-???????Y???I[?????)?i?n?46WL3??c?C??Fl:8??????%3V!???
m?
[?p???=?n????.@?pZ!x???<
I?????9????????H????( 4_????<???!e?~/??.???o2'A{Q?-!g??\6??r?ht??9?YD@'??	?/
?YQV$6??&?!,??C??J?%u???h?#?????????Z?????]Hj????k?bd???dr/?????mX???2#
D???5;???J?s????ChH???#????D{???5?DyKqGwS-???L0
 N??(?X?????i?X????????`kecwKF???3???1?q3??\@y=$?St?????lM)w/?K??y?lDWU??C??u??????O?k???,,??NT;a?Q)7?L???1??Qd?Zf?J??[W??W|	???j?A?f??[??G>?{x?O?U&????3?#??.???"z?Y??e?z??t?2?????????lO?????XL4:?5iK?lg??r?<6??}?e???lF5???Ce?,a/??0?=J???\k
J????B??J[$???i?
=?#?)6??"%?'??????????}?Z??nl??%????????????????b??@??????5,???????q??n6??5???(??n??-1-?????6ESm?^k??8??LjO?Z?"??&gv?NM??//?S4?%?"?Xp??
ay???6?????????$????Lw2?X???$lI?$%'%?"Z??}????+xlYR8?-Z?????????,???@m?n???x?g???0}?u?)???????&?Qv}?_F#??X"?XH"??zH????+?W??[??C?h??zX3n?r_?O?c1?g?c??????6??S:%?
??c?q?q???3?WR???R?T?ES9??'6Z1?<
????26??,??:??????IT??.Ib?l?Rs????S?4?M???>ZD}??~/?[?pr?$E?]}2G&g"???RY??Tq?R???E?
@0g
!?(!??c????
lU?x?bt0???l
???0?jU????%FGW84??ia@&???jf}F?	?????t??????Q?????R??a???????|A+?@?(("839%?8M????M??Q&??$T?n?|'2gq?1??PV	?E ??K/???P?
X??i?mx??Q@??_?T??o????L?#?????)?????s?????????5??X??j?}S??wN20?C???>??????~??????;??3?I??3GO2-Zwk??G7GX;??p???$]????4m??`?~???3????2?????t%@9v????A?^N??e???1????D?R??F
{?dZ???????? ????CX?? }????????@d???%??v????8?bD???
B7)?TRQ??.??W?
5???R?EF?xmn56w???1?T??????9?M:???2C?BX2???{O0??Ca???L?8?????L??9
q:?$?????????0tF?)???m??-????????????~Z	???$?fQ?Z??????rV?6Q??#??R?n??W???$LD?p?????t!?K???????B?}????E?p<H8
4???????TE?[j??.:r??}?=?
?'?^??o?}.#?r
?m?n3???n3?bM???I??y'?KV????gZ?1???DO0?4??nz???4?\?????(:D?M??3.?0JK?GT?2?$]???Th?1?_?????pJq
?#Li????????Tv??I??S?IeWt?Zx?e???[???N^k???\?z
&????LO??a"][?D??y?b??'??9?P?k??t???2?@?H?`3?"^E
?,G?b?????W????P.????u??d???&k%????<?E??"0,Y??????!???c@??I6&?w\???9?????S?{??S??_?1??'Aig.?.? ??T?[/?75??^????z?MT?gv?2?d???<@z3G??mf1??	?.Y4jv`???Hl???ZC?)??m????p???]???G?U??????U]??F?4?1"????	??P?JS??)?i@/o?\?&C8?????Bl?'
'?W,?w????\?t4?&?????F??????[????h???hhne5?{?x??r?8?#??TM???8?D?S6?U???<?D&|??
=GO????L??n??????4??S6?U??-??l??f??Z(????mll???Q
?1E#F??Q????? ?&????????h?????K?4v?
?1???s??K???33I?M??k9^J????U*nS?I??H????????;?Ti?:????ND???4`?S?9???RhW??D4??????|?Ke??{?$??aJ??npj?????3?"d3
M
???????3
R?4????ih<?.?T??????H??????}???#???j?-Q???2??B????pp???\??????@,1??I?R
L?o??<?MJ??????b?L???p??X?y???4??-??_~\3??a ?c?<	
????%??f?f?&??H?E?0n<^(&?f?N	>?9?4?",?ys^???u4W??Q*R??S5n?^??????^0??
??B?z???N???2?7%????????D?x?e?.?dI=?G-_ at F??f[?Fz=???I?B?Ra$MAQ???yG? %??z??8?-?>?4????s?XM
mv??.*bZ???+6Rg?L?i?_?????7??OYn?z!?K???7??0pGX?%?A???=_???2^?u????D??|???^??R??U?????&??????e"????6?j?ol????Yw?2?[?>v?%u?^??>!C?????8'<?lU??/?:?*???@??X??D??N???o;1vd?.d?t?!8?)???NV8?f?F????ra{???x?3"c????>(xB]+Ye?
?Xa?????c[?zt"1??Mt??????b?b]??h?????5???J?R?/?1????Lx)$?????h?????Z????????,??>?6-dj?????(?}?Dh???nP?????L??{(???a?DXp:?	?51h??]f&	?h????
"??rjh?B????6???rk?xW6?}??lkt??????????I0???????]????W?9??G?*?%?#??@T?n4MR?????j???+A_???/_????9??????y~?????????????l???e????S??N?????f?2????zS??????a?qg??|?
??ew?????????n??:H7/????r???n?
????????)?	?	???x??A???R?|w?yf.??}?/?\5M?cO??-: ?q??i?L'?qP???*Mb?>(C???\#??i?]$??8Z??^?(?Q??&??

p?;??X??r!????C?d?dZ0??S?r<aQ???B?????JB????X
??H???????A?i??0?r???R!
}?1??'?!i"?yIB?i??R`???yK?d?+AA?/HTy?=?????e?y??????????<ME????3?t???X??a??Z?{]/?Lz????s??8V?p?????
?M??????(???"???	c?:?h?N	bs?#$<)??$%4??{y???Q?F?(?'?[z??a??'??^?N????WcCOsle[??<	 ?r?S;?N
J?a???Q?V??Q'~?
?i???\yU?z?;(??t%`/????xokm????????y-?,??k?.'?[???
`?%?Qgqb<?#:P??w????f??????[?<F?KgR?TM????3
??<	?LE3???????n,?!^???-??[?J6?g??,????????;???8??{?????????????>??????????o????6?W???l6
?8?
m
??O?C_-???B?`??W????W+?j?I?
o????o
L???hD??	??D7?p?x?????>??????
??
*????"6?c?
???]HZ`@&?B?c??6j?[
?
????tdU?2B?5Bu?
}ls/HH?<?W?}??H?;?c?Cg?????iMGXu???T?8\L??.A?R?{????2ZhP?=!2????4????H??!??pV??9??R??.?qZ?%???;?ny
??
?ZA/??2c??;?6&?K????AT`?t??R?Wt?\p?6??F9???q??1S4??x???~????????PG0????b??+?+.#:6??*??)r?*???*??,???+??
??c? ?"?)?+S?y?5q????tlQ{??1?!??
D?h??,F?q??AB$??X
D?^??
????n?y????6??7+??80B??
????/??S[???n??^???
g*??v??s????kjuksm}w}k???e;??8??;????+*??????u|?????S@??$?H???s
?3?f?<D
??
*?D?H	?9?z(\b?TT?>h?-?v?(??S@??????????l#> ?R ??t???5?=???T??B?
?2??
}??v??? ?]
??????O????xM????=.+hrv ?A4$2 e?RH??x?#@?n?L?Y???6z!?X?ks??#?Jw?3#?Rz2]
?m???????????gF????y6??!M?8????L?LbU?Q??R??+? D?WT?&?g??L???h?LB??bI+????<HPL?&??!????0?za?Z??;???Q`Q??R??u??t?AJ??x?H"??t?%???6N??X????91.gN????Vp?!???m???c??1??D>K??+1??y6?ZW0????????u at 7?h????q??=?????[@???8?=nx?r?B?]?p?#H'?R?d?	??A?{^????]#?????pI ?vW?j??X??????	y????Z1e5EYc3?X???dh).?W?????UdJ?T?Y??)???
??@q}?D?3?????=?;s?4?,&?#?A?Q
?	FsL?l?lPbLr??????+????Sb?.#??????-?Ju]i????}&E?[r|???z?d?????9?1??|?N??1????????????????<?!h???4?q??????&"???????%[[<]??1gzK
?pd?:=?Y???R,P&?`P=R??.n??
x?'?x?M?(?h5????4I?????.k???^????J???k??J
?;???k?	?H???.?
????CK??v,?U'??@????RJ1$?wxq?i4:?G?B!Et1:???P??????bxk??P)??
G??NZCo
???Bl
??????6??m???!??@ECP?zh????8W?1?????$??????G,i????q V?
jd9????+n???(?i&(Q?$}?3d????F?????+t?@fC????!??I?=?,?WQ?c'Y?J6!Y?z??w&k?,k??????
Z???
??X?#!
???
???eG???q?M?x??5:?x???o<?S??AM?? ??iEr?????:?F??H1?.?C@????-????BR?qO?w?H????)~,??7???#y?9hO?? D0???????`?	b??:??0d?Q?z?a??????1rl???.?C?k<?0Ks?6#???????u?????3T??r????;?9ni??b??????s@?M?
[??/t,???7??a?Xj??????<??N?E?,}n?@?s??<&?/x??q?$?????1?L?8???6?????1?V??V?gIy???`?'?(?Z~a???????^???dD0??0?G?t??
????2[???^.t??RC?qx?G????c?Z?Z	??l.????@
8O?d%??wH?E?vZ???e?=VMbd?ea
d??7??i<???LA? 5~?)
V?!?-?g?TA?vOV(?]????f?:?X?
?????C?
]K;d?v??Q4Q???=H?????????)
?f??i??
???6Ml~r????\?i????1???3	?2??s??n?:?F????6+B?>f??E	?54?&h????B0L?oL?h??4??y??
??((?T?3F<??RH???z5j?V????=Ex??D??_?V7??g?C????
 ?T?W???$?Pa-	v??o?)Y?r?d?cGjG?rM?wY??9??9@!
???\r?m???
????>?O??P ??
3?`;S?J??W??8	??
?gh??I??=?G?BWk??S?G??
L\G?1[?c<??$z?e??w
???u??????G!?cb??????l(KTiY????9?%'??N?t@?t???\?T|@4?? ?w?X`????0#?$??	a?"	?D
????Uc?)??aG???????l[???@??J+???(??i?JM???s????XAl?O???v??????N?V?o?&'[?>?yt??d|??+??+v???G?:?; ?t??X|p@'??-??k|W`Fl?Ra?Lo?Vu??9'$%??iVD0?????A???	?????V0?????.?:??F9~lE???
)/???f?+:bJ{_`
'_???????w?\u??2??h?j?Vc?~??P?wj{g??N??Zoj??5u{??P[???????F??4??
}d-

 |g????7??O??@?]?q???J??H?z?u??{c
t
DTC?5n7Vw???????L???????K??P??U?o}??j6v?X_E<v??u@??H?? ??M?-?5?<???H?77p?;?O????P???
jCdZ?^x????'?BU?E2???????Cv?~(?
?4??.U
8^Z??;kz=?????????A?[?BI?f&DY?\!P??????2{?Y??]??[
(V_{c9?S???\?l	?#16?|
???9????E???T?v?la?%?"??eG?\?,????
$??????#??"^z",???G<*???d????????hL ??
n1X?a?w?A????????N&??u?k????M???'GN?jd?y???f?m?b??C???}?
f$D??#g,x2h.??
?????3+P?cQ?gcr?AP?9?O?I?/u???mxS8?hD?8??G???nD?H'??O??=,??yJ@?`??U ?=v&?
a@|T`{A????????Z??Q?)??C???????1??1_?p?\1??8S?	A?>b?^???W+y??]???m?H???????(m?y?HB?AQ<??????l-Yiv??~?A???A?kT?t?wc?vs?Y?#5?Z98?????o?????-??/?:K?-???g[]:U????=:5???y??
<n??`???q?????5???FzZ?-???
=8$?F???0?W???i?>?5????????&2????'Fv??Yj?1?_?b?????#dgv<g?;t?].?}SL.?h?#?B?%?e????????ev??:H?|??atuN1m/q??S??%????p`i
{??z?CH?{???o???SXiQx??@Q=
B???`??8????
???kL,rh??7?~??%?F??k?
?????<<?Fx<????J?LA????L??,????{Z9v?-ZF??????1S8???Fw?9}y&'?E!??E????b????+?P
?A?????B?????????????4?b??:i?N?A???!???;k9?\?
_??>}?u?
3?J?????4???F??k??g????\(?P???PKG?????l??Bm?????%:1??Raf?W????e??>????P[X2???4?`?f0;?"?B??"???&?k?????6'U??h????????
????????wq?-?_3?3??N0T??z?rz?\P9?/s?waNi???8Ts??=??jB?K?kz?V^?j_
?1]L57??{?9?Sk?q??I?????k?
A?F}x???????!??a7?G??????v??`B??:?km?}`??	?3????????g:?_\???.????p?9??8>???<????/?????/(s??w?;[??L?????U?6?(?????u?q?F????x??]???E??xP????a??'????S?m?&?,Zs?E??
	?m?t_?2xi?8n?d?%???????Q?*?>????"w-N????$????7????????:?a:??S?G*????v?N???;w
???{y?L?D????'a??[s????t[??l????)N?l?Sa??p??]b??/T5y?&??????df??3??x?5?~+?H??????7????H:U???8??*R???j???eJ?,1???E}u6j??k?0Y1+???TV????Q??AS4?R9%??????*??p??N????xo?
?6??A???A??~*??@{-
?^??????$2&j+?^???I??H?^L?	??Eu???:?????
??\X?
0??????b????qC]?m?x	d??.8?$?? w
????6*>(??nbJ?Kz???w?q?,l?#)0rA?Z!?TH/?|?????0=?,??:????R??????/?=??$'????d?!V?T??2"?? ??.????8l
/Q??m????????$?>??R3?2?A????????M???A???4?Vx?
7	%??u?d?zL?CV??????{x?????yI??N+?$?\G'???????p)8?*H?[?i????????"??L????fID^l????WE?,????[???[?f?rQ3??E??S"2uq}d??xOi
B\?9,@??)?????????L????Lf?)??e??(?^?`X?????:?????ey????????s$??u?L?7??I?*=??US?3?aI?????b?\v?^????dd?Y(?a???gT?h?#???^_?n??O????L?f?G?CL?????7yg?\??????&????x?&???Y:/?T[?K9??M?X??g?l5?R+?
?wE?6?????;?Ww???7l???r?9???D???/???????%?:??%?#?7?@???=?&(??X?????????y?)?9??9<????#??e?{?{H??3Mx???9??"*?sG|?????-?|g??3??N?>??h??????M?);<\?d???????????JNr
Vj??a?????-?
?W?I%??.???g[n??n?d_?:D???|M?IG??M>A??BKF[gL??V?i???],?&0?3?+|6/?#?W;?-+V?s?QXL??r?)=?|4????}?m????x=??w
=???>??]u??K?????^???$??;M:o
;?vH?Ln???????g????bx%w?D??????Az?-?3a???P?@??j?n??5T????0??,
+P??|?wgkkW?5??@?-G??????Pg???????M?W0??a?0?	??2??k?-?=?????s5lc?F?9?~??O
!@????7?b1???7
U?0?^?]?;??i8?N8??T???CE@:o??f?$Q*?F???????Z??_B?}Y??{?E????u?N?`??=4?O?
??Z/?
?^|??W??7e?FC?7?[O?2???????SH?????^s??|.???????%?g?>??_yy??b???|?9??X>????????~Z?o?d???7???{???;???+??8????n?{???]???f?}~
3????m^l????bB7B&?Y%?\???I!??]mffR?6?G?4????H?h?SU???"U???m?{?9s??Z??u&?d?
??|U?" >r?r~?C?????4-?<?6nc????f?{0?H?J???j???i?
??	6c)%?0?hX?q????]??%???r??C??????O?	r?
C?g???kin:?r9w(???0:???
???1??f!?!?
?????{?x?h8*?91L???\?V??x????,}?r?4M'????E?b??v?C?????#7???}????0c*H??d0??`???\LJ1L?:a?}??cNPx3????[????4???????k?%B?v?Kg^?&?I??^6?N???????,???"??????:???M0~?eO0?y?	W?rFf#????e??<??I?????"?<9,??M???_oA??6??Y\??=4gX???;??'6??=l'?C%?????P????-??????)9_??I?n???????5b%9v??????D?>`c6V?G?fnNY|,V4?Yz$
????7
?$U^R?t?15???
y<??Z?????1.S?YM^???Fc?1????,Wy?w??US=???l3?\?U????!???J???~?? ?\??????=?!??~??[o?7?7?I??!???XT???P[??XW?8?~P?????????n?0?Qg??<???4?P?H,??&Z??.k?;?c??G#	5??X&??Q?S?????F?/\????,"??&?=????????'?F??$?6?$K??E_?R???H$%?A???#??*???G??4?Lp?b?.`o????S??%???-?J<@????x??r3M?????&???0?????1??|IY??24S:"?f?Y???????????!?????u[KVme??^?9??s;?@Z?Xg!????M????w<?O(.??????????????y^q7?~??????F?[?>,?????? ?)\?z;?vc??????g????????e(?Jh???8?xi???a?35??v??>???????2/???RU??#???w=??]X9??LM???`????o????}??I??j???ZkI?>??7qK?NhUnl?????m???c?Y46?@G?(?iZ?X?
Vi? ?{??????\??_~?7R?9H^9y#?Xo?P?i???s??U
i??,T??C??c??m?H?<???/b???:%??,??{?%Z_?(??$J?????q??es??<???h/L???5Y?9???????j4?q2l'r?W=???:??O?????qI?L????J? =^?'???:???5?q18?u;'d?d???'?-??f?b?=<?&??,??N??	???? ????>?U????2o??3$?P?P???????}???3?	????-`??	??[?=?b??????<??
]????3?x?YrQ:?[????H??i???)?|?8S????2?RlR!m?z???v	p??w?A???pgj?:?#???]e????2??nM.?Xf*[Q?x?$??V1]????EU??db?T$????%????O]????@?]L?%9??R?U???T.?[????%??{??(z
????-??Z??^?Ei?0???{?o?>e??5v>""?;??O?^?[?h?????ZL???L?c?$?R?c??39?p????&4???"?-?R?? ???|???I#????R?? {?L??'9?a???7koNvu?Vj?\1?T????bk??u#??o????d?	??b?????????u?C????gN??jS3??h?=4I$?e!???>$uU-O>?
+?
)k>?i?0sJ?
od>??9?Y2???
?(?????DA?O?????Xq?dv13?Gy?^????#>|?+??	?????(/_????????kI?????R??+???|,???\+????Eu??r?N???i<?????6J?Vr?
?????r?W?$?e\C,?+?]??x!i????(
e2???+?????*?{???N??B??Z? ???B????
?PyBQ?	E?'&t?k?P??0$?8??0?r?QL?
`??#@?8??
??0h???@Xcn?R?p????}????????
k????fce
??	????E??{?7??&r?,????L?????????K 6?(??,??q??"?????4?=???/.???RI??*??????rQ}w?vB8?

ux?c?&PU?`D?
???[x?x???E???>????Z
?1??C?????AQ???O??A?Q?F????j?@?]?????F

ln??????????[?
[(????rYq??N??r???v??
??????waK??v???????+G;?xWA?????????????=???0^??Z??????9???h??a<???;+E7??0c+??[?k??w?????{?[???i??????c?
?KN#?8R??#h~a?
???_yU?z???Al8 ?R??1??y?c?4V?j????C{??v}????#?va??U? R??y?M\??.?????*?'?H?Aw???n?T/?(?!j^??Jq.??$@??h?V\N?M?s??n??.#I??????$????I??N.?&?
_Aj:?&??b\????*???o?\?_?2????x??n??P??W?y???
??E?~?	?>??Z?E?k??
???P|?
?i????r?X??V???-? 8E???@?#%~'EC??Q?7K^R??F???0?2??zW???{??????1Bk{????h0?[FE???P????
d(
?7?8??T.?y??????U??
?????e??w?????]??}s???Jb?mh??:@??x???]Xr\??:]???C?~???.??g^?s??@k?_????57$??
?????Q?????????Zcsw???j}????w?Qo??i??w???????fc????S?G?{?^cg}?n??;?nc??????????r?????d????%??F?????*o????^?O=5$Xh~`vt?hX x^?E*??
f????????.???X??w??#?U?=????1%8#???}???m???~??HA??d?Q????=??.?*?]?4???5?????|T??{T??g
??l[##-?O???????4??>?V??+??|--????????????u????y??atS??sP?6??>7?6?uu
?L??P(?)l&???y{??^?ncc???t?????Ttn{?1??????r???t????&??R???E??S??<cZ.??Tw???`VBC?????B??AA??V)??9o??zAw??%??C????????R0-X?,??Z?G???k???qg?/h??!??wjz??????tg	????e
?Izh?kB/-d???6j??-?v?6??S??N???\U?<??6~ B???f9fM?|?n???%
B?-?
??C?????{?-?<???????r/???????KV?G?#K=]|Td?a???pj???Go?*???SzN<@e?????A????{?????+?)?Fs?me???8?<?p:6?
Z??Py????O?Q?n? ???lb??~>A??2?3J??????K7a??'`!??????????j?m?J:???]??]?j?????M?Q??<???U?$?? "??K;???G??ll?~n??(?\K?????_1?"<A???D??????s.?j@???
?y?????F?yj?'_?I?>l)?uH?q-?JO??U????{U????f(?p???Q"????[????5????D??????0V?F?$=??+????p{l??6???j?.?\???????1?	?.tF?G?T??*????N
???????o??dy?V?,?c?F???8?	???#?a;??t"??x?)%??0???+%5???J???Gj??J~/$???E????Th?w?b???`?z???b<n??`4&?8bj??h??w?1??=??
?j???????u??x????}J5Ef??Y???7???y{<?F?? 0b?(?????%3?3?m/?E?V?C????{?g??????@????W????j???`b?Q??????a'6KRj@???u?1~-3??FBd?U[[???]?{?:'?;a$?[?w?y?i?F? M????@??{?k?????J54??Z|??h?j?S}B???????"Z?????????????>0l??N??Pmo5??T?!??|M??I???(?Q?5<?F??;b??X]zk?qz??2????
?H?]0:5/1
x???	m???????????G?Y??o?&^????./?\????O4,x-r?&?"D
?QJ:1???[?B?I?f???1
|??
m??8????Azb
????~???s?Q????.???h??Aoh*n??????????p?????Y???D2?}f??at?
[???-Qe??{??M?????Uj:7K?&OP?c??XVk?????n????U?S??????tT?6+????!J??sD???CnI3????
,W	??_?nTu??v&"1??z??w???g??o??1??h???9
??w?u?s???^???6??#D??{??np?Bg?????/)
n?W?7y???????????[[?>??`;PL?0???5?6
A?{?7?w?????
?*'.??&??8?~@^????$?f????x$Q????^?? ???k???>?C??Aswg}?N????;;???Pm?y?C7H?&-??V,yaM???i"$k^???R|d???G? ??z](??????6??U??w?u??x???T}???j???n?L?Rswmu?n?????v?Q???;?A????w?`r??|0?nN?	???????;N?PL??T?^?????Tk}?
O????PX?	h?.?qM5&az}s7g~?p4uzv??^????P???:?q+X??????IG?5?~?N?<?u?^?U?Z?5@?N?@???????0F???`????_???_1??0?F?;;??o?W?????O???_?
??:??N???????=z|??A?@b??
LuqW?????????g?W????h???Wp`???	?pcco{g??N????\?Y??5???????ja??\ac???t?/?EG{P??f???n
x'?????B???~??3F?_??m6?
??F+?h??A4??l?3?lg	'???e????
~???s?????g???y?????r?+?9g???x???R
c???A8!3?Y????
hK??x?%?????w???X??FQ
????xma?X?N&?
@J??????0j$??0#}??|`???e??~???7?R??(Ul,9??/??}4OK\??[4sh????3{O?A~S??]wSt??g?h?L?lE9}#Z#??????????<?G??????ZD.C????LNH??k?w^??y???I??it???,?x???oe
q?:??b?????}?gK?????e???{s_?ht??P i???????YIp??cvT?;2?R??}????????,??????n-g?XY?&????Oj??6???t
??$?K??>??
5?w[,?b
O???"?????M?K/??}?WQyb??????????RjrMy?????L
??? "?R?xY??j?g2?????N??(6Ad?B?Q??oj?qf?kL?,9??/??<?]??s6Q;?;?h?????:????L;-9??/??}4O??\.?W?`????[Y????????|??|??"@?????E???yO?w?L????8???+?????n?x?:????2?K??gR?mS??W??}I?d??'}(?f???/?o??"|???Q?N???
.03ob|k??K?????>?/???I??rb?SL??%S??l??|??S??@.B?????>?Gy:O?jL?QMC???T?y?_?X9??	$?????I/?-??f?{r???}4O?A~S??????.??{o???l??y>2??????:?????/?1~???I???v??;??TW?	?w???????g??'?i0o?H!e????<??????39??j?7??y????\8?s?oP???y?;)???"Yr*p_?g?????t?2?????b????y??C7`??EmK?.?R?????8???<;3????-c?b?o?????)*?5??%????????
????E?????t??J???zo????3??l??R??9i?$w?Mj:[??????5??1K?`??<???^?,O?H.??Z???>?'?? ??=?N?
???h?x<????t??bQ\?Q?)??}q?????y???;d/rj
??+]hbB??m???7??y???????.9]???TfzJ:?t????????<???'? ???oI???3??????r??I?Q???l?w??{KW?|???I????w?{L^+?h??????????qA???>?'??0???;K????2)ff???????{?jF?v??kV???nz6k&%?`g????<?|?U2))???4$??????????????%?? ?g?fR?	??6'???7??F?SY?S?????_???>?Hn???9i?Y3)~6LJe?_??????????1?q??O)<??????M(4?Hn?I?s2??bb&[:!}
R?!9??n?????y???Zu.%??w?KN}???l???;???kb??=??M?/q??8J=?G?d:????7????2!?????????Ci?G???????r?s??}???I????M?w	?x?yo????l???f?3?L???UL???$????NH???????>?'????&??????H??3??DwV??l?LJ:!?&?????8?~%??Yd<9k????<?f???u???G????24????y??????????S???<?G?dz:? ???W\b????????w?h?????Fj???Z]??T??	?w???)??~v???y2sf[????R???y??????]?T?
N??d_?g?h????[?(.0??fR???}4O\???t??????g?h???'?.E????J?2????v?Bb??,?L???????J?Y????vR????s??,????y??Z?e????X?sh{?????ko????u??o???V?=???????/???f?h???????@8?????	?w????o????|]f?????zv????t)7??u:?)???l??~HO?mX??U?_Jw.??N?????,????<?G;????\?L:c?C??E??Q???????[@_????????0
?E?Xr??"wfi??0?@???`?A?Jq?H}?5???gf???L??u??3????R?G;/?6?`???????????k'??n}Y?????{;{?????????v??u ??2cR??v
???#zVIo-??-i[??w9:???=|?*f??<r?9{?:~-L??7?7j5?@?YZ????	??b$????G;???N?A?!?pT?k2?:?vGN????WwJ~D??????{\XX????|??U????7:??????h???:XXT?U?????(dN?"??h??w1??X#?????f??q?fQ??T?oN%?;pI?????Cd3M\|8B?:?2??dsk5ipMw??????u{?
?0?
?9?%?S????a??B??&?b_/?I?
N????h+Jy|t?8????a?SF????$?7w??e?x??6?G?Y ??#??H +??c?P8?&7?
?:@Q???n????"???P??????#w??7???)F?d?????(?{?J?`??;??????|??/??"?1?6?
?U????kI??S??R6+?M?p 1?Y??3(??`?qU?}4 ?}???$?*?Xt?X????????aH?v4u???~?t?&?U???6?I????(?<]? ??:??3B??u;?<?I?-?8?V??\<d?????F?i?w9&"@1%????
?^???Tn
?++????'???3G.?t?v<F.M?F6???'?^????d|v?}???0?2U??zZ{??:'H???Nn??\jTt_???^
6?????9?g???5?a].P\	K???Z|????0????;?@??'???H/?'g???Ug
dk????SMd? ?c?g??I???m?G???????[#?
?@?
??"?^,2:m????????????-1rb????eK/??bswvC`AIH?????b?(7???H????-t]GV[%???r???j?N0q??+?? ??N?B?9vf
?$???!?^?{???ml?????????Q?-?a
??8?????a??^U[[??9??R???|B?}??`j?+u?0?^|I?H'd?Ms???g* HO?V???f??^????A8????M??
[2MD?????yU?
?_??
V?v?i?M??4h_FoR*C???S?????Bq?k?xj?aq?5?*?>@??	P?x??a	DX??????c??hg???<??KZ+X
??R?C;???-l??1?|wFJI???]cc?S????k????T?'M????
??????{?1??k?}?g? ?r???'?!fZ??!????w4??paG??V?%??? ?%/???l? n?(?jg??z?z??*\?}??]??zv?q?????-3~mSV????Ai=1l?UG?h??M?=>nIr???ljZE[??????:??_X4L???,??!? ??[??? ?E?;z??-f??[f??~=??EwZQl???^??2I??$???i??cI??n?&????.?$`?#? ??F<jn=?h??'D?????2y???]??_?
?U??v???:?]_Y??W??
???C5G?h*?Vw???*?u?$L???????8????iP????n??A?)@?(t?S??????2?T?????W????Uq???p???!?>??@/V1??n??"?]????2??s?Rd?bb`
]?@???3?,??!8??3?OZ???????????<???????????8~??U-
?/x??Y7f?H????(^I?V???????2m??????f?[m??????N2.?K?$???^??h??)?b??????/Q??>???x?Et?Sr?\???N7??*Iho?MU???4!F??.%?jE??????dv?l???.M??z?z?	???&MW???b??S?a??????^?LG2?Y7D??????qn?\?
?H	?F
g???G?n??C?%????A??(
?'??!	?y6?9?0F?&8??????Y1<uVG'?{????i?(8???n?tl??1??8"??+????????
?a???6???:?8?????X???Y??W?B?K?6???#?w???,??LG?]A?M>'???o?????m|pOQ]???bC]/(?|?SA?????q?&?/#Sf???W&q?$???p?\?(S ???*?I?Q?????T??????r:?P???.??????vK????q?K}??6?>??????JH?d??|?5m????l?????/?D???|?4???'??"?????????7DqG????iB??@
j?k?
x:&O?????&???mSP?{??ZU?95???=???K??p ???\@|??3??0?a?hv??}??T??x?C-ly#?????Bi?q2j???nE??????:Ie`O??U?Q??
?di?I?l???>dAf0?x??????5??@cn????qiI???\7?jv??4J????+?g????3v?If?W**g??????J?h???^u:?^??*V?*???S??
K???5??>"???&?
Y?)??Lm~e??W?4O????i;
??P??P?SUMm<?^`????_D^???V?a?`1~??C?a???(?r.E??pP"?OC???L?8???????5>?]!2|;J?)2 a<D2x,?
b
U??1??.?>p?#?M?D
.*??#??E?x?s?	xY ?EJP6??????2??
G??????UL??_??7k??z%???Zd?W_Bu?
f|????$?????]f,	?(iE??W?
q$#dE??????w?G?L???|@O?X?/LB]??????9h{?pZ0?@	?_??
?v?ZQ??^?y?S)w)?i?^?Ql5
??,?wH???	!??:???:v{T_?=??5????????$B?u?????fzP(?e?A???V+w??}??L??,%;N???v%g.?????wUpw;?????????
F"}??????0?m?hX6e2`???g?Pl?T.\?r?
}?t???nsY??,??t_?V4=???JR>?6	???&)T?Zu*?????iu?3iEW??+????.X?????H???c?iN????/?D?y?OI?EP?j?R??T???(F??Ma???BpzBx?9j:?C??????b????h??3EE?T2????c.?o???}?m?? ?Q?S?K993u?K???#Fl??B43'C
GY??I$r/H	??T???Jr??
=X?kn???k??(?{(?U?z?K??}?;???8s5?H?M?[?X?$H?Y)?4???^??a???L:E
,???A???^?3O?U??J???j1??*[??^??VQ?\	????2???z<
?? A??nQ?u?*T?"?_??43=?t?)??vOS?)??~W??H?q????????W8??
??n89GoT?(?al??
;???v2??|??_2?k#h7??c???E?K?z??i(?357???IB.?
l?T	G?????u 
???!?W?$&?G?Z?v?^?v??e??T?0eg?! ????P9????$?d.?????P^8,%Z.0??v?T?????9??????4?u?8'c?_\,C6?P?		??w7??i??H4u?qG?)`????hfJm?y??0???HMzM??X????l/m;????d?????? ?y??2'1??]rDDXY????N
x?[?PA?e???w?=kq?
??k
????}??}?N?Y????1`-?>v??_)?m
?H'?3L??@???}?
t???QW?nu??	FVJ????:$??F#???H??s?2^?Eiy???vf????32%????TJ?0???VS<??I??lV7?y?q???.??W??AW?????4?G?i*????N??????d????????v?	??/_?O?Ik?NCv??i???FmL? ???^Vw?Y+?*zH??6??`P??????`|f5/??(8F?????
J7x'?O-M{N????O??????r?Mw"???{?hz6j?~!5?q???? ???I?????)??\??a???????J?
w?I ????K??G8???????0?#)???3??M"???PW???8?P!???Jy??O??A??g??6?<J?m??I??R!???????#?('?,??i?r???Bs??????F^???[???^?Si?Z??MvF??_??L|*p?)????.??mw?i??p????0?????t??????g? ????:E?(fR?:?4???<?}kk?c	B_$???u??l?7e?<???[???k??D??P(4?	$
???$J&?%Q?i&2oof???V:E+i5?sZS????#???G?Cw??&????k+?o?-<C@W??5q?#?wAk?????G8???Y`????
(?!R??+?f??|7??#????????'?cD?? 3a??+y??????GZB?????]?@4??pk?H?????d?2??!|????X?rJ?9
??aI?e????w??$???q?$`Qz!2)???e???"?G??l????,?E{!?x?e~????????G?W?z??}F	A?:??????.O?U?o.???D?'?y?d?????Ka?\??????W?b&B????????????+-Oo
)8%G??
	.Hp?
?5????.v??(3?|e??|???,???
?????s?!???Ju??;?w
F?tp?V?<^??^??!??q??????8w%??"?#+~&???+?^?ZG?x?Dw?????C}??$???T??}?V?G??JU<???t?:jL7??
?w?8???8??8????Z7?x??0a{?/z????^?w+_?T????EQ??a^???L]?{u???o
???~?z???_?
?!A????Co?? C??W\%????N?E)yl>??}2?|????????????1_?mA???!??????w??|??=???????hVBy?Q????=CF???D?????>?????$wU>S3?4??aC|??!?-8Am??Q?^?s`W??????
?~??kD?/?????;?????N?F?+m?'??h?P]Q"t?)T?g?R??q?9??_??1?A?6?V???c???'?Cd`]?n??c^tJc??e.5???y?>#q?W]??/?
?
8??pY??????E?&"?-??T?????Nv???|F??#S+?D?	?hL9j1s<?`?a??L4	????qY?????D.`/?h?E?/?#VX??u?6?R??7?q??u2'R+?????u??M
k%j?8??9??pD
??%?/^??^-5??dz#=??@????g??	?SK<?H???oB?]?^5??Y?y)$c??	?*Qf	?
:?????:???X?N?0
?Q_???S????1?P?%X?c??????]T2???V
Z?%pw?3????*??K??7T?Y?Q?e???H?????aM
mi1
?h?'???_????y????f??}??????=@???I?????6r?2????<????i???!????x>???uy?d?
{Asr??A
????/?d??~>?\?h6??Z_?;]'"?`X???>8l??Q\"??1??????
J??*??_v??#?8O????/??G?_?K??P
z??ud[???J?i1????Z?Z???4>?HCa?1?x??????????F?;@?
vR??*???x??W?u??9X?9Y/??W? ??.??x?D'?????R	
*?r,???
Y{7{?"#Z??	?6??;,?$?)9????
????R??e8t???$??ln?@????h?f????9???gc ?????
wB?&?F?(]t??&?????OGWk?5b???Qp?'???k?????n?-l???k?KCFw)
?m>?????L?<????2Wf???M?
B?$???G?t?	?? B\'?????8??3$n,W? $?f?#?????D??o?H??o???Q???<?????J????!???8bQ????.???+?M??&c+,???9(k?~kuf?(??????y4?m?h?????x`?!
?<4Ftu?C
#?y]????=iC?"???????lmy??VCi0?f?#}?%:5
J?YV???bIg{Jf!\q?k?g????b????Dxy??rSPh.??_4f??????G?d???K?"$Kk???????p#??l?E??/?\??>
F?#?k	{?3I%?R?%?MI?/C?X?
PI?t~??h????X?~??E-?o?v?J????`??[}??????K??Ig>e?z??????%????D?3??A??????????`????v????????t3Q?A?a??fN???2??o,?Z*\??%???lNL???6^?77[???P????2Q?Z?c/??_y???G??4?+??LTm>??_d~-?v?5?'??0W?????_??D/??jS=bI?2?Y'?O?o`?
??f?;?3?l}tt????ssv??gg?sQ7???g0
-???????Q_}<???? ?x?
?$?????
??`???kY??8?C????????j????m??!cJ??U	z??\??;?q?8??8	???iaC?bZp?}7>=e-h????>yRR??[??j?( ??r
??D???^?????+?j?P???Sc??w$????
E???T??S?&h???\??

?D]W??????pV???`a0W???CTPF;a?F??Q?1?6?b?a?zccY?B????$uA?((?M??k??0?????{^???\???P?????Tm?)????O??z?Z?c"?????]???%~?hc5?????C??2d?;?Pw???a??{??_~[???????????A???v??.?9????Y?[:?|?W?;?X^:?p?????~^u?Kq?????;??(X???b?R^??'?WC?.?7j??*x?XO?rL
h??U?\A?T|~??J????y?~????(??+B	v_Q??Dg????
??@??[O?=?:?~??,B??6&??/???]??[?"?sh'??8???(????c??X??m?'?[???8???)???5???c????t??@]??6?Z[?[O???6we{?6E?-? ?}?D!????\.$??]?g?????1???w?????binG:W?y34???l?7t????u??
?h??o:???@?sxQ??
??Z?"h?L???????????0?D}`h??q???+?t&@?[?<??G??F?Kk@?6?Gz??wE?(n?M?u&/X???n?;B???v/j?_?i<]???
????<?=?VV?????u?a|?	?|zm??)???3DRr??s??Y!X??
?q>c5dgD??I??D?E?ux???j!??]?T9???%??6F?D64???p?5m?????S???9(3????m?n?'?1?)r{L%??????J=x?
h?6??9??A?H5wC??a?h???&??}4<?u at Up???V?j???&?0??I1????#???0???&9?S?`0????g??????zH???[E=??b?x???Q?{2D???)a?M ???
???5?m?u?	a???:
1??F?B?=????G?
??Z?h?Q?3d?p??P?7?
yCA?P?7?
yCA?P?7?$
}?
9?M??5@ 
??????&??????
?QZ?A2?=u?Kr?B?	8Bn??
~?,?!?D~N??lca?qx??D>????aj<?.?r?z 2?????	?????GfP*??k?t[?????s????P?w?"nP?
??G????(?m???"???B???P????Q?A?p??\!??C??ht??<;?D?T7A??0??g??F#?????F!???!l?}??????>?i????6?w@f4???q?0?>i?>l????.??..
fb???????x?(b??+?? iI?om?=??8?/9a
?]?
tv??????`G????>Rar??`02?????i???*??2F??)??$}??@[?PT???n???????`???gct????3m*OY4:I?9?X-???}??????P?}??{???*???????H???v???^??R???kU??x?????V????W?(x??\;M?j1??n?h?z??h????X??????;?A?????n???????????'?2??)??????C???%`????F???^h?`m9qY2?&???2???? 
???? <????????F?p1M??<??1?????^?Ya?9???3"<?7???0??=v?????n??>????(??????O	??c??'?l?`dB????5?P?*8?g?g?[??G???&PM?)890???a?>W{]6??=6?k???^?T?O?n uKL????G???<?!??y?| j????!=oH?l?'?V7??
?ys??&??????????p???R??E
?
$`???i?????*?;#>?s??j?G?I/?a??G?u}??N??n??(M-:Uj??S?n?R?[??W??ND??mY?]GoRn
s?0n5??:??	k3????c??u??????Oc??;+??LZ???:;?/7?es6??G?,??6?3?wye???????;?{??u#???s?
9?b?ke	/N:<?ZI?????<
)T%??B8 at a?a:
A?Z?????f??<?.?5?????%*????5i????B&Mf?\?k~???)???r???W??J????J)
?p?HY1????.J'??WL%??y??f>?^?V?$???@???Z?!??w?Qj?????)??j??#????Z?Z?Z3?A?>??n??/????d?????e???e?????"?L_????sX>?@kf}3?D?0?
??G??L?L1??fEt????sk&Sk?WqNz??n???L?-??\?h%?N?c????%???=???	??~?i/???7Q?ob????b:?????
}?y??aJe8??L1n?z????W??!?&??"aT??/U?4JPY?[?f???y?g??W??
?"??}>?w?[?I????%&??D;?[j??\_Uf?5???K????-????@H?4??fg?}[??uc??E??M??fd??.{? P?????k?B?m?!Kq???????3???sX?rI????v??#
?O????m?e?pw???A?]Q?R
3??	??g4??`??-;#?
?Hz1``x?T???K??
lu.j????
??C???DD???Tod??Dlg?O?Q???7O???55????#?c? ??'??*?[U)?BY????B&???xI???????~r?N?"&?e??<???iLx*[?5?$??`??F??m?????<8L?
??????u?~?????A?H?`?^??@?o????d??y???
?g?????	tB???6:?j??'??h:??A?t?9??q?9?q???b?a>!}?|??j?N??7?	?/??O???"A?????s???`Z?*n????6????2P7?J???(?
??9?????|???gq'??$?3?9??>%a????s?p?>?d	?f?????????
??
?5??t?sc+??9_?V??5??3
???R at g?9?5`??>?8?4d9?P?g??	NP?C&???>
9?i-[????????k?R?F???y????x??Bk?p?}r?Y?Wa"??????5??'t??
???5GDu??;e???;???N?6??`?P?^K?Z??[?u81??u????|????????w?Y????o?n?i,??0g?Y???<	CZ???(FX?:q???n??????g6	)"=??g?~a??x??jK?p??&?z?~?S??Ot2'V?a???3???h<????6
???7?h;????????q???w?F???z7?H??!?p?]N?}}??$?:?<???Y??a?X2??Hu?	?Q????%p??=?b??nt???{B
/??t?J~?E????{?)e???I??-]????q????????x??W?zq'?A?rL?-?C?rb????D??b????s????/??":NQD????)?Q?IiJ???%?5?s??E
?7??\???c{
<n???g????C?B?S?y0?qC7@TEJ?1=?F#$??????~
:&??4"&'?v??)??3/?????f
R7T
?~?9??!1`4L?/?[^?y?^&?\????q
s??:?uh????,?~??9Hf7?'????4?m_6?_C?>??O????????????|??u?????
G?=+Lu?n?)gw?#?f#?CX?9<K??[u[?|?c??V}n?#X`.?#?q~o?????????h???{I?K[#?????W?X????n???})??j7??*??Sh?kA?-k?P????????	?r?????^?E????S2??a&????`??d??;?(L???j?4f?????h??i???????pXA.??|???:????t3u??v??????????a8y5r???i~???
	??2?Z?4???}?]W?R
???|H?sm???Zc?????FR?????
S"????5???"s3hX???Zna_?9?]?33g???$?p*7??g?T?S?????????hw??<?3?2~?? T?!??}??>'??j????(??-/u??4j?????g??0???3?L?\?Y
???d28yaa:V??5R?.V???@??{n\y???n0?
????X????|MK??3???&a[??????Q???!????o??7???;?^X????Ys???
`?????O??????skQ?@?>HF????0A|??D?%?????sh?`?9c??[` H??????u????8'???? Uqe???G?????9??????-??>|?????<?=?VV??????????N??r;?????=C:??W?(?kG?i)??<>??-Q5???????R???UN??<.???s?/????Z??D???@????_?
?:#??#H?p?q?Q?????_-?M?k??J?Q???9E?T%?6^?8???@XDd?
,!#??2W^????
S?	%i>????
}Lp???GfE$??????I??,E?e#?I ??x????$???N???7??
-yCK???7??
-yCK???7??
-9????M)?B?qAJ?????_?:??????7!?????????w?????u????t?is}?????/??0 ?????\???O1?s?P?un????8?K?z7M?k???8???g??.?????\?[?N8???V?F??J?C`r???;@+o<?X$>
?9A?C?{?L?pL<$10	s?I????9~???
G?ayUp??4?t?2??{Q?VBS??Y??u????G8?F?n?NL???A?e???p?????*+ 	J#??2
?%F#`?????}_???D?R??????s????U???!N?;???E]?N???B?\?2z5?????
;??i?L?%?????????We?????n????
/{?
?P?????(????>?	?d?N?7[??=?
'?J?(<=????u?:]?zp(v??6z?n3???????[??R?q???"w??
`????~??V?zW?o???y~??\?tG?#????#??????}?????
$`??eZ?????
?v?Z!????)?U???)f:?rW??wl?5??? h?%UZW&???1y??Y
?h???? ?	???????K?h???????NLe'%5?b??y???v?,??q??P?"
9c?W?'?q:??^(?R?9?|??????????W0;????C?W\?qw?V?@??
??o???kP?$
.$x:?S??B?Do?%.??
?m??????g?|\?U8?Qx o?n?
Su?R?? ?x?	?p????
zvC ??.y????D.????pJ-N*??$)Q?,????uS???U??o?????R???|t?Q?&?-?ZO???x?d??G?M?a???????Q??5??_??t?1??Z????????????A??4]X????D?n
?x$?;u??
'f?E???x????R_Y?9?
????]&F???|@I?<)d?#?????_,????L[??ua??Y??#??hr?b	*??%?I?6?6??#/yd>
???d?m=???7<??B?!???"??Z???#??MP?^S???F???*?sx?d??J????aco???'??]8???('?+G??`YZ?j??y{?/>??2`?-????c?????\?a:??????	O?gg0??P?.????????|??
?8
@?d'-?u????$?F??Yp|??D9?33g????V??S?o?????????+	z??yZ?|?XF?8??<?????P?qa??????asc?_)X?NR?i???8?????;|???yp???'?
????????%???<:??(m>???????s?????=???????*?.z?,z?H?N??;???WV??????o??????????B??&?|(????!^?{R*?????[97
E?<??n?H0^????:m4???$?].????>???5Yu"???Mo?A???:?}&??}??????z?%?R_?
?h??vxv(???sC????0MUY??n??n<X^?<?ZAJ?<???????2F?2h5?a???9??????*???????k%????M???<???C8??N?t7a??@?d?@h?R?x?s?	D?D??q???4????s?Z??-???7w??.??6??L? L??"dg????
((?3 ?G?#??^?????;?J?x??R?D>??X\`?????p	;?"C?7?q?FKO?g n??P3?(??N?p?P=???e
 ?????????<??o????;???C?i?????g>`:Gc???QY_???:
+z??Ig]???C3???#bf??>s?x??R)`d???1??F???Ed?d3?$?{??H?P???@?	v*~??o??pI????????w????*{A$F???H??????(kth?^.^?g?+?+?<?n????{???
:????c8?Q???????{L?o>n???????A???ww?gkww??>n???v??{G;?v?6?????ZO?????O??B?T?S`??6~?????T???????-||???y??9j?6?=A?_v?6??*???q??c???:eJ6?Ee???b???$??p?/?u?????&??@??8'??? @??&??????q??S?;^?????o??????z???????#??7???c(???T? gU#w??u/??,z-}?(???l??i?|???V?
?????Y_/:??"B???(,??t
?nj??
9??u?[?5?Nn#????$?i9?|?????0?^????
?(
?????q???????(
?X?2?Q-??!5u?)?|?;P?I
F\???
?m?\|??ol at BI??n2??k?????NM???g'???D~???=???l?HJ??A?????
?????+??N?n5??z?
??????????G??9r???9?>=?&?"????????x???D?????91?j?????B?mbMP?
D?y??7??z/??wQ????bE???
?D??????o?I??M?N????????Gq?r??M?Ec|????
*???{?^V??"??J6l`?,?v????!?J?_,Ff]?
?Z??{?????
???ut2L?i??D W??v?y ???M'	zCK?}??^???$Q??!u?A??V?Q?R??PK??"r?)BNot??x???Hq???#????C@?1????*5?+???D???q?PV+j??{???V???T??{r?GM?d]j+	$B??r??n??X?N????LH??<??*?V???=P?A	KL??Q????????A??q??n<????^??4?B??.w??????}????S???6?)`?7????q???t?
?`z?
|?x?z??????%?\*??^M?N)?3??v[?-???2w?oZ??i???\??
??J2??C at 5L?6?$GC?@?"?B???2[k??7?<{H:]}?????z?K??ZO?z???,?U???R??=1?>nw??To??j0??f?(?????@???????P?
?Lj?
?H???{L??b
IHb6?????4VbCJ at n???6U8j??n9:B&
v????Z8so????;??+?]?m???JF
?.?:?6??%%?O?????nI?y??g?J?9D?x???I?i%???
1???????&?.?L>E????????B?0???(?>?`V{?;q??Ae?(X??{[???(????????Q?y?(?_?:?XA!u	U??5qT?e?????x????P?p\x???????b??W?%??+ 
p'???@????C?????L???????'?}
???er?ay]U_??rg??j?
k?m?8J?DY?+%?{??????B??%??Y?@.D4xq~b??du

???????-`??\U?a?S)CL??EG?T???oZ?fU???,:?/?>^|?@5?;???kH??\??*o
|Y^~?
?P???K???-
M^?i??
a4?F?p????*??
?<?<N??wO?P7?m????"??
???gi?J??=X??]H??????G?;m[?71??]+??kh9??r?I????y????}??|??
??5???m?#??j	??
2????#?j??
QE}&&?m?{EK???d???6Q&+e=J?99????6?
??6????xq?/Lm?;?b-@??????%r?2
1p?C???????H???d?I??~?_????z????y
???uj???~???T????f?-nU????6?,??Dwx??0??
G>?*i??h??o/?N?x??%??~C??JHx????\?????B?I?????b??m???J?C??dK? ????:??????r?!????=???H??3?#?n??M?d?G=y????Vg&we?Y??
??>???>h??L?\?????F?Qk?????c4n?V?F
??
u?vc}???/??>??J?2?"?GuL???h?Xx??s???DO?G??O?V?HR??#??)AG?h=+3????
N???ge*?rsZp0?oZ=???H?p:;???????D????Z?	U20?,??!?4d?B?]3\U??????V???S?c
???o?W???S8?Pt??a?????3?D?QJc???2?I?????Z?????OP9????H???a?????{|7?l???????u????v)????|?UXv????d??*???7'?)Q?N?1?f9A??????"?T/,
!??hHCa9???*?y?I?sT!'iv?????FCI7?????P?L7?{?KjE????j?~?}?h??*H)?`wS?Sh??3???q?H???o???????????WL)?[eR???7z??e?????Lm}????t?xw?e+PX?jxK?"?e|???m2???K??$ZG?1?_???*???Q?l???b?B?wO?KB8wnUu?R???T?-??|C}??v??"?J?%???DVv?^??Q??V??m??`$?w??8g?I?I?? ?8GX\D??:???
???????n????J?	???????Iz????e?m??$!?SLElNI??<<:??{l3?{6????????lV?ds;F|?\K??C???wX? J?4a??t[??bwxk?mz??$?/??	??>?g??
?R???g?B?J-??kd';?>??=?3]?@_??H?5?w??_??]j+4~L?qi? l?b?R??&?????;xiu?q?Y?6~??v??????g?>?T?+?[???Sa-*?TJv%???F?2? }???Aa?|$We?Z\W'Pk)g?u???L??DO?1????9C?V??(:mqHN??Y9??	y?????b???*?.???????/?2W?????T????b??U
???p?GA?????4<?n.????|C?\;??1??d7?z?y/t?@f:?:*??I8??T?Qu?????AV?=X?
8V/??%?=m4????-??Y[j?5$M??M??S???
??K?if]lP?3??/M;KZw?U?'?
?A?(??z????[??'=_.?E!e???'?[?HJ??;?L
NB??XKFW??JUi?EK?X??Z?n|n?2?;???)?4?]?????<p[
???T??<a^?dH??l????d?:?^??N?Xf???$(?yK?"?6? u?~b/_x????J?<?|Fm=l&??ui?=??
]?n=?W?'!?5N?JR??a<?i????e<?	Km????????e,??<"?$????I0?C4???-D(???O??vJ?dtj?
??dgI?????2??z????{\???F??????2???;????KD]?;?40?I??7???I???w???gA???
^?????1????@???z?_v?5?|?9FB;?}???v??{s??=??r?b?PL%???i%g?$?
?~???T??uC4h??t?????:	?o.?a?x??????B?~???E?\??8?I)h?}?D'????tD???c???7:?????#~s?P??:?o4/??8~??uf??:????!3?Wn????m5g.s{2kv???'??t??AN.?`?+???Gx?o?u??fJ??K??/????Mn'4???7z/?
?:????jS??????s?V?>E???z???isM_#??
?K??n?????y52}?8
?????P??%rhOa?.?0;?@I)v?w?TG$?,J?@U?dC???f??qiK????nnN5??????Lm???9N??Y?m??]??rP??*"j??????????{
?Y??WK:??f??]?o^M~7%?`6??j?\?\??sS??9?y?T3?Y?S
?wq3????kM?!?C??f<rn?R	????!???>Lc????????????y{n???V;'LuP?N?pt?<?1??k?;??
?<?8J????^???.c??0y??0P??t?zA{?p?b.	?R?D??gvI????"??N???u??p???Y_<?PY|!D?N<???:??a?U?c?.ET?p??*)|?p
?4j0?????}SUFF???V?1??tX32?$?????y????'?\=???El-ZCb#??Q???7j???*{{?k`^?}?M?5U)F*??F??$????1?Q?U?)???"?@
???????&U???Q?H?????[???v????nJ^?S???
???5:??'M_??/.?U?$?i?yV?F
^?LDZ?M?I-
???-???????.V?R???{?=???2???\Lr??????$??m??dD???pD???}7 at U??u????8k??J????d???????$?8.`?M
@^?J????j?D?b ?
$?_?????+<B??0|
=m?S?T(???o????8?a??H
?e???$?'n3?????^
??),t?
#Z???u???`??V`Xu?a?"u??)f?}
Rb??M\?D?
_cu???g???C=kr?7?????i??????
c??s??t/6Np?
?@?[?	R?????G ??C??R??(??o??????,I??2%?W/??X???"/$???rM???jN?;9??i$	?Z?I'????[?|?>
?N??F

F!????(?)8*@A?S??M?~??X0?????#?$q?c???o?0&1Gy$?$@??q[??
&?
Z4??|?>f+?n??)??<?p,?x??G???}???????????nm??Mc????gi]?>?wW???????o?~????,?X?f?????????j???&?8?`???t??ngJ?Y????`????7????
??~?z?c??C?k<&??s?????p?BR??
?)?? ?G?nx????J?
9?????????K}?A^nk?p?pW%"?lkz?]????U?j????\'ZW???????????_????s?`?x?X?sh?(nw?????t3o??D?????RI>
j???[?5M??t`?(??!?????
u??Vcc???G?o???2???J?3,nAm?B????0S?gO\C?????????(ai??v???Ptq?
?????>?pZa?n<?(?
*?????? ??h4k?`?@?VazNl?"????1?9????W??i]????????Z????7??vc??ii
???????+?U:?B]s??P?Z???j?t??fw????v3S!d5*#?qWQ9??HW???:?[t?^?????D?K??[?@??m_2??_~Akfi??????????5???;??2?g???????{ ??}?EPx8>;?&xGG??)LY},??P??dZF?`??0???/P
cF{??jx??N?p)?G??uM???u???p??R{????
`	?I?Z_)?"???????5???P//?@?G???????~)??H????Q?L???Xj??u?QF?S?1???B???????ZWj+????e H?e;?
????:?D08wN7N?3>?x?p?y0?"Nk?"%????9jW????R?(???1?%?s0Y?=??h????p??H???
7U??u????\r=]?Sr?N?]5??S????0?dB
$?????;???Fu#dSq?7a?\???h/?v??TQd??v?????	)??D?+}??u?c ')?#,???h??c??j{/Q??6???:???w?*?0?d??????E??c?0?????(?
S-?="K?A?0?
o;???j?Q???J?1???'K|?g?7 I
???	]??S?L??X^o?'A?m??|F????[B?_x}?U?j?HXX?8?2?8	G????Q??{?BH
\?A#Q???
??i$??Cv?e???jx???d????\
B???e?r???	<?<??%?k??G??DD?#?U????X/????????+???X??Z??u???7j???*?F??????????????????M?A?=??Ct??h?>???qO????)D?x?W?t??z?R?+:>	}?n???gG??????hVd4+?U?wz0??c!???O?i??{??@J??(W??x?{d'q'?
???k?s????????!?YY]YI????F??%???t????h4Xk4.//??n?|???1?i}a??m??k>???=?C$o????-cM	T???+j?J}@?v?&??#???E???w??3?????????<?D?
L,W2???v?R,????N=???|??=?????iw??<?l??3O?L
?d?K,????????(??????UM?Cz
? ?s???>;z?T????~?<h??C??`??????*n?{??~?9z????6??~Q?????/??;{??/?Q??4?{?lw???rok?????c?J?
????t??=??&????!V??y??^7????R%???=??????DE???????????g???o?mC?{;{???)E?G??=HT??0.???V????????<?6?;?w?\;?ekws?iUmo>?(????(wI???II;{????6?00?j>:??*????y??YU?;?8???
?G(???`???V

k?y??????????vss?;?
??????mTza?<??h+??!?C*r???`EvdE???e??#?"?D"??????&?f,???#p?Z???\r(??&?????	?aJ???=S?!u??C?
?S?{Kc??r????6?@!x??'??0T??umL&CX?1S?|1d?yU??]?-?m????B??n????qn=?s??8A?,???:.????^?T|??-??????%US?F?4=H??"???3
O???????0*???adp$??dd?6?Q?e??????S? bt?M w???w??Y))???.*9??y9 at 4?????T??????@2??b?BN'???}???????????j???>?mE??,?Z}???s??????<?L????/atQG;(P?G??<??Z?_@;??N?zF??
??
??????6?d?_F????{??????V????????????????S2|??????a??Tr?a????&?t??(??X???MD?)L?un?;P?????????7???(??I????<?sY????BO/??asv??t??3???5\WX?U?2n?(_?vE??????	y?[`????E:??
???????????l;+??=g?f?\??3?DO???J??$?(?J?f?????:???????[?j25??3j:?j2{2???9?Cg p?i??v"???g$????e?+??Q|n3?"??????????@???
(?NPn???????????Qs6~IN'??`,`vm!??v6$?+r???????m?N??6r?
T??Q????\???iw<6????`),`?r???PQ?$1{?^????
?W\?*??	5OA?J*bc>vm???t?E??v??=F?4Kt?|tR&??D???q??X+??R	@?L????4/?{H??a?L??Z??EX?dT?l?V8Iz?q?????Ryv?;??I?Tg?M????^?9??Q?????????[x??e?z
?<=??v????)?T	??^?}??Dt?????Bz??1???h????&?uvp4>9???S?s\??r
???6???5.??!?*"?[??*z)??_?utW?j??uof??$ZjR??.`??*w/?I+??R??F??^9??t*???CmfQ?:w?`?iDzu>???GY4'X?????Z(?
?$
???????(????dF&t?%??u`?1W?/?1???S???J$kJ??w??;??6~??????????<K?17^@????R?b????D??z??/?\PR??_|?5,???wzl?"?!?t+,????s???n?O
????U????s?`??&
|?????J?	?)???i+r?a?`R=?uv=?@??G????E&?????cp??????,[VX_??K?????:T	???Uh??(??;??1????%?? ?????j1C??!??d|???:?Uqf[??^?????l>?`-f0H@????!1??!?
???\?B????????f??3??????????H????L?4=W??2?clI)F??8??)U??w???2}?M|%?&db%<.???Y?u???(]?$?(?w$YJ??hg??=v ??Gd	?x?jW;H}??#??aT?VXe?x?F#b?m.?vEN???(??????U?
?
Xr+?X?>$??????\?_?[??Z?u???Q??I&bs????,????/?|t??$t?S_????X^^?????w???E?i
?La'??????????V????e????????7?o????XR?%6???8:5?
M?Q	iT?>?w?_PK?ez???w??v????*?)??? ???e??t?????I???'h???????/?????4???u?7???O??z??Q???5????6I?????>??G(?$?c]????Vu??-??T9????
??????????Qv4m?=K?`????LN??*V?P?oZ?-?????K4?6???)C?a@kH]#c0?r??1??E?4m?Oi??$}D_z??????Y?B?.??%?d??a%
?y??9;?$F*?j?d????????]?????#T??3????1Vp??rU=???|?????
T,?????F??-????E????N0Q?'???Q?OBUC??,??$_?LR?????IKR?WI???]?d~eS???sj]
?T?8?
??4?h??c?vK?)????????;<??8u?F???y?W???;????j??s?{?Vv?G???????OR???6[z?y<G
TYXX8EOQ??vL0???S??????
?b??fa?}a?????W?
?r]A?Xh?j}]??Uk?Rq???^@B?K-?M`???V???H?u?l??-????+????l?w?{???,W?????\?/????w????J???e?eA???o???"??????Z??9c?i'??Y??Z?fy?L?3fy??1?w???k5_????%???8B??t?zB??;????5l?- ???t??P???z??F????\[A?4RE?Z?q????t?????~??tP`?R?'?L?rQ??z#?K?/E?1~?~4??H?A??????aV????????-?j??yh???????????????R2l????ak?1?????qG?$???Y?T?
??0?^Bzk{?q??????{|?Of.????????K?Dk?)?0l?)????O?X?b?ue]?????x?Wi?
????d?_?^t?Y^???~?d}?l?gl/????1y
@?e+/?
?????M?o??????g{kD]f?????\X?
??A?{D??x?a??d?Qk3A??OL????=?
{??????4?g?4??QU??e?1?TEOp 2?
7??DY??r???t??f???i?????;?nS?s?|@o]]????k)??A??Q?????)?
W??????"
i? egv	?FZ????3??^g>*??X?????N<?e??? ??
???dvC?j?g???????o???#????qdu??????z0
?_
K?*?c:*]
??]M4-lz/W@?w?u$?`??C?Ft??C*!???#??	c??%??A#?M5????7?%b9???>Qe]
?????W??'~?????bn???????? E?e????+'?b(?J??????*??g?e??$??a?0??f???????z9/??os??+-??
??Sg1? #t????u=??zF???YFQ,1?*??$?%?Zz6h?3%s Pqb???s?v??vL?????`s?????`(?????>??<??<??dZ??8??ll????4?????_??R?5?I??D???O?????????"~E%.]v?z9???>
'????t??fU????s~> :?dm??Z????C??5*'~?????bN?a?.k????\1M??^?>W?
BBOdB????PR?4O
n[?W?`??????NL??????Cv???/J? ?Y??-?G?m???? ?i??-q?.???F?vfr{???m?
??w??????????S?????y?????<DZf?}#?*????A?v??t?v8?"{??I??:?F???QI?????????)
?????:??	@??m??
?o?.9???N???U:?}3"C?#???{0?!	#?Q?.??B#???#?????%#?O?F?=qN,?:y?LaXC??sTa???0??x?Y?????<i???3?'?V?y????N.?'?3Xg&?
?HF?~??Jc;????????\T??m???$=!^?-qDA`???R`P|???+???a(???k	}?v4?:?
???&i?op???Q??'???n?LL???dIa??\
Nk	9??o??????@Im??eM?????????i!?@????/?$??a????y?9#?B????vI
??????r?
m?Q?:?a9]]Ff?4Z8C???a???i{=?T"?I5????? WE???W?????Cm3M}E??????^?@+?
?2??68Z???SO%??#?lY4!,"?Qxi??e???{??%?????????,?]V?q?+PhP??<?cKn???????"?6??@?P????X???@rU?>?????L????	?^?$?????b:?54?J,?V??;???lg?[Q?%y?w?@?O?=?%)?>??????t????"??E????_???(6???5n??+|G???
?"?S4???????
?"?6l;?F????????U??".???-D?Y"?t?N'?D??8??vN?t_V???+???89?Hzrr??Ys?>??????<??
}?Xi,o?-?
??[?	?6?`?x??i??????>?U?)?d??EC?????@???^???d??8j???pr??I $kc$"X???1?TU?pE??G=?N??N$L??\?[?????s	
????Zs?d+?*??S??????M???>gzy*???3??M?????????W?B??
;?0???kZ?u??V?A:??? ???y?=????&Ne??Z??(?S?W?x?g?Va5????r????;???/??2S??Zc?<}?R??C?O>?}?Z???}?5L?X?????J_8??0>AY?.y????=]??6????V???5??+??e????Z?K{w]??3??????Q???|tgjKM?1w\&m9?qh??O??fWM?0p:I?"?
???,???J?????l??????Qe???s???(?????e??	uZ\???'????????X???"?I?*e*?T?9l???r?rw?L??N
???3?6!????[????#LhE??;????K1?/r??
??E??!?????H?H????6??4???%?J!?"??K?3C?`.?Q?hM}?V?H?v^6??Y5q?E?C2EqO[
???$v1??0j?2????O?????gS??\?.b?D?9?4{z'?U1?MZ&^O??(?F
:?_]]|?
5??s?V?2~?p?.?k_??1?\???????W???C?EehO?c??????3t5_?*?Y"!%'?r?WMr?&/??Q2Y3}???P*????]?k#0B??R5?XO^/?}?@6??-??E?i$j?=????0???
????p??-Q??d????a?K???`? ??q_}?!58f???^'B? ??ku%????V`?jM^??ty!J??????(s"#???yx?
????r]???8??2
???+?~'?G??i<j+kTr"?H?%??*?Y[?,????y????
8??c^??v??????Z`???M
?9?WJ_??p?y4Sg!5
\P?a!s:V?qm??a<>;g?),S???O|Lsv??:?l&?*?<0?3i;,?????=y????o??????5~nw?4????{a?U/
?<}`i~?$??????[X??QKt??v??{?P+4??-?=?Ar^????|??'!?h?\???1?????@?&?A|??iH9??p?
?Rf?u?????%?a^?????52j??}n}?3`????m?\!??F??(?[?]??0?03op???%ih??!???L?Z?TOI??)?7??q?
?g
??,?????????+???? ?4?Ucj?Js?*!?`????Zr,|thjj?R
0??F??+?p_sI
?
I:??{?a?q;7q*$?????????R???H??&?T???:-??Ca??R?Wz?:???n?????_?+J???<c,??.?4??a?
>I?+A8#???a??"??a?
?+
J??6j^w*U
?i?kP??5?????K`?C?B{???M??@b^?????0??B~d?1?????0?}b;?s?????C_F??^+k?]!r<????????l???K"???*???? U*!??J{??1??^????wyqc?B/???phQ?z(??8?4_6?()?'???2tYv.??s?????O?[j`6?o?Z?g????????)#?Y_w.D????%????L???$?e?zG^A?y]?????????????????jZ?????q?vL?6?u????x?:?#?&L??.???R?K?
???r?Jl!?S????+,?Avd??%z?9?m^??4a??V2?L?6?db=7a?Y??cstV?a?????E|I??&L?B&
????????P?X????z??"??
?qDd??c? `N??f?g1g?P?S??q?#???f??h?i????????"?n???????????????}X???l5s]a?y?2?Q_???
?.???????|A????*?	?;??PN*Y?#?EFET.???m???q??s?U????T/????v???<????|o?02F??????z??uC`|WB?u??!@????;???vk???	;daO?t????ka?~ZY?
5???]?k?h?
G?????k_c???;?i??S?rN-{c!W#tE??????\I??
????(?????I?~??+;9????pz?>h????B?b?
??7????v*
E??0????sL???Y,P?P?:[?Y??U?
?$F??s?e??E??38]??<????????W?????kG????k/V?L??keyeov?Ai???????7??Y????i\??fg<E??km??1&`?????W???KVh:?&3?}????B?P???-V?:???3A?)&G~Q????T??
?>q??O?6??a?h????W????????K?rG=??J?X??X?9??}V?.k'???3t?}v?S?o??V?L?????~?)?}?c&??^i???Ui???????q????E?v?"?????b??Q???t??7gS?????????	?o
-???o?6?UB?wl|d`L??y??????0pt?`?Tu
??ri?????i??D?Dn?HS??/x&???]?????N???Gsok{g?1]J5??_??]??)???????CmeM?%?+???k
?H:???j??U????+9?cO?Jcu???=??
??J????26?????Z
?ua???r?9hf??:%>R??t??!Z??????Ke??U?vuA?b@????QC?%<yM"?? ????4?DGT?+qy6R???%X??|%SK???L%|??C????%?K?o??p????N???z?Q???6????k?f?]?2?B???l7?t7S?%????????>???9?L?
*CS?n)D^?,?q`?????^a?.?o?
{R=?_t???E?z??F3'??u????q
#??ja?Z?
????;????/F????}??9g?h??M?q@??L2?L??mj6??f?????t????U?*4nER??m??Kp????m?????h??|????T?&PV?u?H???G????'v????t???G??????-????????i????O?}?)???l?????????O??{x?9?v<???c???j?5?
???????VU???:$`?*?OJ????G?O????!?%??????d
mH!d0|?"?s?.?@??!???????g??V9???6?aEzw?X?=?
}?BW???2?f?L???9`Uq1?C]??????9???+MrsL??2?/~?;wTN!??????"? K	7xI(?E????m??2q?sr@????r}????9?'?R???;???=?'??Q9???L?????G1)a??	????w??M????
N?4Wh??C
Uq?q??S|P???Z{??
eBd?8M?s3??????E??0B?????)i?_L.l/eJ[/D???<FO?lQ?*N?1?b{?!9?)???5:?5CB?	?X??r
??/?????bz??p5?&??`?Ap?Q|?lB??W?U??w?i?6?JG???>??>*?D?{2!FL(??`??L-f???(???EZ?}???S'??6????????YT?*??e?H???\??g~??Mt.q??
S???NdZ4??8?\?O}"~(??s?%$6G????X]K?????+????r?o?]T??t?jMF???)??D?'a??t?P?_??#4#1???YS?h??I?h??p?{LP?N?
0&?)k2????q?Z????9<?{g?)?`\8???|X?~p??????
?`????t?;c\?JPs;??H?!?C?t?????S?]j??r?C*BJw"?ps?u?
L?z???<?h??@GF]=??z.?p?ay*?[ b??{?K??????=?3?+?f???$?rL4???)6?)?um?TM??h8?????v^??S???E*f$]??t?)??8 ?4??????~q	h??,???l?:k2?\?
?%????Q?]??%?????? }??0#?R?KII???^?	?D???Qm??y?hK???y?$??Od2?????@?|K?
???_???e&@ &?YV???yI5?>F"	#xj?Ng?s?-?_k|$?7???ufCs?c???{??h6
"?V$??w??8?)E?#?04??M	??G
??Ew???J??
????M?R
?3s?_B?????T{?qm+.v?-O???"t ?c
F9y?X???3H??H?z.?B?*????+?V?C^??ZM???d?s??????;%7???????????<^1+?FH%?eI?U?'
?~_l??VT??4?)?(6?S????????O	%???%???a???Y??P???7&owwF??]q????ux?})??X?????{?B?6??9?|}??????Ll????A|:?lq?0c?|??A?.??>y?)????^?????????K?~?
????3z?
??y?dB/Do?L??`N)??G?}???C9?e???p=?b?M&??7}??bw,?"??P???:-?K?	:A?%?b??5sPw??? ?dR?0???ro???\???M-?H?%Xp???i?-O????*o>U??i
?1
??[???c??d??huIr??T'?)}	???h????~???.H"?qt?=???H?Wz???
?.??'???1?????|rSzR????]???2??J??;?G|0?*???1???Jd|	?????g??h?F,?o??????`wX??XU?l?B?f?7?Uq7????x???'??????????
?T?/+????W??_V????"?>???????z??
??R{g??0??s?%???%???i?
?%????2|???p?N??:j????% ????
Z?GG?L?"e??M?t?*'???JW`??i??:pl???x?B??^w?]???6n?E?^??h?????????i
a.|i??J?O??ti{q?x???Y??M?.b!???|,?Q??^??%?~2!?????V??H]p?????Eq?u???J???K?n???DY??R^??!????S.
c????h?K+*#=?R????e+hA?<?~???/[??w?`M???d<pO>?t??'??+{pUN4.?L?z??*??Ffm5?6T??????V??.UK????^??~m[,j?L?&r????Ak?9?????E???S?+y?2?YQN??4??$?E=%??CE?? ??J`??w|???N???}?O:?0O'
U????$??I?Y"?7??9?3??Y?q?&V????p?????5??d????)?????Z?????7?[?{?????|d???6?t??[??x?q]???????x}??k.?\??*G??(?G????L???[?4E?9K	????$?????k?/??-??J,?K?H>&???pqn??C}??$???L?	K??bY?????????8???X?u??Z?|V?RY???;`9??.???1Y?d???Y#wv?_?;??*o??[??~4W??????????x?&?z??IO?????>??N?????j?????????N??Y8?!?&??T?9?@_?????	?2ek]W69??c????}>c?????9cz?T?,?????A??b
v??????c??_/?*???fA?d?:?6C?L??z{
?z?i?+5?/????6??s??kIpJ?4?#??~U"??D?LE$T$8XE???????????.%#"?p??_??Ot?o????{?~qK????03?-???U?l?+??:}b^?????"v?%????=?x???c%?	?#??z??????v???
????9?to6???za+	?^?W9???????}0?K8?
?`????I?p????&??????6wQ?"???MaN86`f	o?;?$_K(g?D
%u?e??%??dl??2g?u????
??U?Hv?w?P??8%q$?w?Fw?????h@?D?Y?????y??c??v??1^39j???????>v????????8???

??7?-?)?E at F?>*0????8?z?Q?Kq?z
????e]????"A?j??B??'$=?j???)W,'q??
?W??n?6w????t?L@????`??$?
??????!??^I?:d??s??6??BK\(ra?\$??C??"?IY???n??q)?)a?v???3`???}??5?????J]?ZM??*??l????'7????/E??Qu?=Qu?M?*a?N???u???81?a*?C???E?$?y	?????5R?~?\g
?MldRY???R3??bj?????%_F8?5??no=??bD?t?$??t????|?ji?J??Z|?2?\b?;???hJ????h??)	?a??6B-n??k???<:h6??G??pGB?Lk?k????eT??Ht??????F\???0 at u?>slNq?J????9?".???=??mz:0<??M?2S[$???'V!?????X"9c?`?h??_/?a???ak????????????#C?LBn?D???E??????&i?k?????u:??lY!c?*?*zr?;???O?????s??M??l?l/xh?<??DT?.E?:o?I?p.i?FDt?ul?rRy??U?Rnsk?j?t?L?????X?-Q??1??v??v??T7??????4???w1??????IE????????bDTL*??<??:???i??kj??0??????
eW??????????ZOjU?r?lN?X??V?U
?
???\O???y?r?3A??D????<????C??`M?:46?????
??%???>?7?2??2v????I?]?M?ie?????????v????]?|?G?<???????d?b?iS????????P?3??6??
?l?t?.?^?QU???qV??xE6????Wu?L?t??q?~|o?TO?~????T.	?F(r#C5P?>?<?n????!KW?2?i?d|O?F:??EL*??????????????Del?u?M`?<????)?????f?=|????????????:_??u?\\?:?U3??????????jd??]?
??i??3Q????)
???u?C?????T???1???:??%??lI(]O?V??S??h???^=?JhD?ZT???f?=m ??	8???'????G?>???????b?6????;?j[??,x??????O'???MiPc?k4?[|kg{r?&?????o??f5?;5?Gr
?^f`?2R?}?N`4?o??B>~? q??p5>O?h(.?;pQ?t?!????\??Z?	??u??s??i7????0???\`)?+.?'???w?'??b?k?O?)?|9 ??XYM???B????????j
?Q`????????L@?{2?PY
?v??F?_???g/?A?Q??`s??:Q???8
*????z??=zt?e6???????&?pO??k4HT?C??Vv???v???(??q?\??u?$?wL?? ?AAR?$???[??.n???!??t?r???????Y??N??
&,3??K
?=??NtG??=?+Q????B??[3?]????-![?Ve&???!???H??FI????*???P??8?$???u/k?J]????!j?{T??S??
}t;ek??A?9,?z???????/?x??????/?v
f<X^??D?!??F?z`??H\k?]S????@E?
v?'?3?)?I???????e???/^??-@q??V???????m????86:?????D.<x??`y-????V??:? ????AP??n&M)?ss?+?E???Obj?\R%?S?
?T?uI6???K?>}w\
i?!d????R?G$??#?????O?:s????{??m?<n????nx9
?8???????[w}????'??seH?u?4?l?i??sO????cg?Q%W??"????_x??V5??S??H??gV????????G,??'??v_~?hN??v??I????f<???u
 ?R???w8
N??b)T|?(??
?W?S?????UJz?t??K????2???????)r*V?w6\?{	v%?>??ni??(???6]v?????.?7=
??????j^]??0^?n?~?G?
??a
~?D#???2b???x???
?9?P.6:?E?Q\p???A?N;iO;?n8O?oQ?G?2????$??Oy??,?W?????"??
???8?!?"!US???&??.:?#?
?8):??~*}???Tu@?x?=????A?q,?z?&x3t?
?Lr???@8?uI??QB?w?U??exF?3I?t)??5????nBq????[	4??}?g?O?yJ?1????i
37q????b	?^???????H??!s9???f?_'x?!^pA"6?:O?????y?????A???NJq??VMA???????'?$n,1?98I??8+???'.?T-/upAC???
@?F???'?([m?a??&#A?n??X?sI]}??F???cv^?B???
??*?
?"???????,?{s?~~x73??????7&?t?C&??L2R?
U?;Y??I?u?)?h?-L?kJc}S4????s??????E,?l2?#z?SLe+Y@'>??????X??H"u3??1?Q?3?9???i?P???+?????????? ?!?,??w?????????S?Wr3??aq??
?a??
??????2"r;?z'r7Y????2J?N????$???b?y??p;1??:%?F??u\	'"?#??Wh??????Rm?yh??
?bH)'?!?????4??A?W?Ho?D9f?`3?D@?x?
?????c%a?S?-??F	??c?h???#?????{? 5??G|??.?h?M???J?QJg?>?#zk
?:????~8?????
???>?]A?,G$
?X??
-?G@?W?d??
R|N'PbVE?%?<?1?qW????)BQ?????c??(8???a?n4?????|?]??z?Kx??*A??0???w$?+b??5?X??m??L???N?????U9?E~2
??9???*??Q8?at_
?7G??=??}???
??|??nNZ?tVZ?????k#?0?$H?5??N???\@? d???jN?`??a?[??^??????o?>t???p`?
??hm???/?,??h^??g????H??#]?t???k?j2???????{??&vz???qF?W????-]No9?????1u??b$?f?1????wU?c?hz??????P)???7p?W??????)^?????_s/?????hv???k?7?????????????z???3???z???	
?3??)?/Y?{?~?b??(GcD?yrH?????0|C??0?f?? ???0?J	2R?K?X?E
H?????y????r~????]????;_????z?`?X?I?'?j&=r??z?'???a8?P?E;.6hu
?t??????F:6~?D??"?L?8N
s=?:'?2	\{L
??????
??`g???????4???8?:??j?#????????r?????oP?cG??? o??9???BQ<?j?~{?????]?@Z??~?ts???nkw{????7???P?J?9]?Tp??????	UH/?P?S?
T?Q?Sq?]%??_ZO??????,?N4P?a6????(O%o????????H???8??V;?Z4b9Qi??????????d??9???F?707??

sW6?D??1m???N??????????????v?}m?+C?????!Q???y;?3gv???Gu???>M}?
??DG???)??
???????<?ZD???v?5?zq?M???]??rg???![t???G???-?>;rQ?5??	@Cy??K??2~??qM??V????F?????O?
???????Z??l????i?/?1?t?Em??F-5??y
`V5\?Z?8g??i?U???eE|??K?S??@?gn?&?7?
N9SY??k???9?	;l4g????????,UZ???????$3
p??>?E:3?????n????^LhQM?Q?J??3?Y2???a"??i
(&??CQ????;&???{-?????
? z*??=>??????Q??!??T???p?TT??????G??j??O?e?L?&)?$+??0??.2?c???%w6g?/?b??{???????Q?????R?w?????[???+?J?????!g??)s?????Vh???KM???%??N?????I'????9?P?D???[??i?3???+?7_8??q??
?%?V?.c????%?.y???N?~r????jz?]????;?rn???E e?e????7????M?<^?Tk?????M1??G??????nTO?Op??j:1Q?>
H??q)J;2w?O?c???/??H;???)?z??V?G???F???}]?:?Q???t??????;???sm?S?.??
??U????LZ(2?????????TM?~?V?Yl>?
QJ?a\8??;??f?e?H??g}w??T????J??H???????Y??BD}?X(/?
y?3^6?b?I?6?????"??T???i?t?~?+&n?????	??<???BJ??N?a?IB
9?@<?|zS??N????q?9??Y??T???1:+??vGVt?? 7)?p&????????y??d(??j?]???R?rt/?DL?????D?Y??Y?M???@+O???????"?!?????"9z??g$P8mh??????{??
?q?P?]S??
?J?$OB?d??????-Vv?V?L?:?7Cl???X???T??I
???(?X??=?l??i??
???{???e?&
?V??F3?Kg??h?9????<?r?%????
?R)??L???>c"}%??????? ??^-???	??rT???????2J???>	?}lB8????.?4????H]P?E]f???}8??+;????`???O<>?{???????F?:"??hq?D????9?9$L?S87??eO???X??
?<???????1?8????W+y?l??Y??|6????????07+?o?7]`????%O>e?????{?????e????]]????+?,???????Y^?wo?????O??I??HW*????????o???????T?Fr^????0@Y?DM!8?
??????9?
????z
???????[[?_[y
t?5:G%?
|?6;??m:_???q?S?o$???E
?1?	?6Cg???78?/pd?>	??n?,???vV?5 ??O?$?JzhGO??p?????M?s????????V??Cx/???mE????G6?L???????j{?pkws??!V???? ?????N?P??s???????:?????????s4??R?t??????G?i?`?	?l>???9??:?h?h?yxX?:???j?????=?z?}??c????vw6??h?
t???g`???bg???f???gh??mR3?
?(?*????I???pT???Y?hN?????6?f?i32#6`k$vqfr?Y8?_M??????"???W??[???G+?<6?h?O??V8aYF?pce????1?[Mq??5Xr'?`??????wYdA??j?#<??XF{??8??Ndj???pA1??K[??
!xoP0P?6z?[?iyW???I
@??y??]???m	)#RH?#d,?-?H?p?????7b?{cL>U&?)=??[K
???Y?1??zk$?????????C"P?ch???X?
?3u 	.???}??-i??_?1?????1???`??'&???h?l?d?y"h%?z?e
?!??????B??{x\2?F^,??XI^4??5u?rN???4???qL?&7???????u??"vv??|U???pc%FY?S???)+1?
Sn?)???*??:?\?IV?k??V???[7:?1g????G?a??6????qF??;?o???]??v?????
WH}u?J?/?Jd???fS??f?>7????G??<?~U??p?3????? ???0?%???M)????dG-????kIHS??a
??	?XV`o?????J@?7???????|ohf????}?w+?9??$??ze???ae???*?Doq????)??<?!8v?1?)????.n????V+?dT????6?:>??Iy??????u???z~?,??;b????c~:?W?R?+Fp?????;?M????$l%???@?B?.;k?sG/?fl???I??CM??k?[?L?
?Y_Y??3?|??GC,??5??9,W?&??G?\???u/??9W?????????f<?A?bO? [?????yE??Yj??5e?8?ec???n
????grz????
u?2|?????9f?????3B????"?????E??HAc??B???l&S ???
3?K??????j};x0?N??uVz?Gb?7???????
"
???3??,??_?????H?,4o@?
<E?9??V???h|??
v?Z9??Z?$????Y?d\?s-P?1???AE???$p?<Wn?-????G??_ f??|?a??	`??zb	?f#?t?????1?z?uvx?????
tV???c?3????.]zh?Mk????5l??-b?'?????t???7???{y?Kj-=?">??%Q???#D?????h?}??????96??.???'#????m ???)<$??J4I??f?.A7F>7?F????I8?&?k?<????=*???j?;C????OM?dvm??)??	??i?tM?Q?g?b!??S[#?2p_Y~?X#5{F7????z?2????09???`^???
??{

Index: ldapvi.spec
===================================================================
RCS file: ldapvi.spec
diff -N ldapvi.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ldapvi.spec	19 Sep 2009 20:03:44 -0000	1.11
@@ -0,0 +1,80 @@
+Name:           ldapvi
+Version:        1.7
+Release:        9%{?dist}
+Summary:        An interactive LDAP client
+
+Group:          Applications/Editors
+License:        GPLv2+
+URL:            http://www.lichteblau.com/ldapvi/
+Source0:        http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz
+Patch0:         GNUmakefile.in.patch
+Patch1:         %{name}-1.7-getline.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
+BuildRequires:  popt-devel, libxslt, glib2-devel, openssl-devel
+
+
+%description
+ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
+update LDAP entries with a text editor, which is the same as vi. Think of 
+it as vipw(1) for LDAP.
+
+%prep
+%setup -q
+%patch0 -p0 -b .gnumk
+%patch1 -p2 -b .getline
+
+
+%build
+%configure
+make %{?_smp_mflags}
+cd manual
+make manual.html
+
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc NEWS COPYING manual/bg.png 
+%doc manual/manual.html manual/manual.css
+%{_mandir}/man1/ldapvi.1.gz
+%{_bindir}/ldapvi
+
+
+%changelog
+* Fri Sep 18 2009 Mat??j Cepl <mcepl at redhat.com> - 1.7-9
+- Fixed build to cure FTBFS (#511746)
+  Thanks for sharkcz for making the patch
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-7
+- rebuild with new openssl
+
+* Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7-6
+- fix license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7-5
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.7-4
+ - Rebuild for deps
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.7-3
+- Build Require popt-devel instead of popt.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.7-2
+- Rebuild for selinux ppc32 issue.
+
+* Thu Jul 05 2007 Gavin Henry <ghenry at suretecsystems.com> - 1.7-1
+- Initial version


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	19 Sep 2009 20:03:44 -0000	1.4
@@ -0,0 +1 @@
+6dc2f5441ac5f1e2b5b036e3521012cc  ldapvi-1.7.tar.gz


--- dead.package DELETED ---



From mbarnes at fedoraproject.org  Sat Sep 19 20:05:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat, 19 Sep 2009 20:05:01 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.23,
	1.116.2.24 evolution.spec, 
	1.394.2.53, 1.394.2.54 sources, 1.116.2.28, 1.116.2.29
Message-ID: <20090919200501.0BEE411C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29193

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Sat Sep 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.9.fc12
- Snapshot of "kill-bonobo" progress at commit 041daf6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.23
retrieving revision 1.116.2.24
diff -u -p -r1.116.2.23 -r1.116.2.24
--- .cvsignore	18 Sep 2009 18:07:41 -0000	1.116.2.23
+++ .cvsignore	19 Sep 2009 20:05:00 -0000	1.116.2.24
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2
+evolution-2.29.1-kill-bonobo-041daf6.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.53
retrieving revision 1.394.2.54
diff -u -p -r1.394.2.53 -r1.394.2.54
--- evolution.spec	18 Sep 2009 20:19:56 -0000	1.394.2.53
+++ evolution.spec	19 Sep 2009 20:05:00 -0000	1.394.2.54
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 6ae7523
+%define hash 041daf6
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.8%{?dist}
+Release: 1.kb.9%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -589,7 +589,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/eshell
 %{_includedir}/evolution-%{evo_major}
+%{_libdir}/pkgconfig/evolution-calendar.pc
+%{_libdir}/pkgconfig/evolution-mail.pc
 %{_libdir}/pkgconfig/evolution-plugin.pc
+%{_libdir}/pkgconfig/evolution-shell.pc
 #%{_libdir}/evolution/%{evo_major}/libefilterbar.so
 %{_libdir}/evolution/%{evo_major}/libeabutil.so
 %{_libdir}/evolution/%{evo_major}/libeconduit.so
@@ -601,7 +604,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libessmime.so
 %{_libdir}/evolution/%{evo_major}/libetable.so
 %{_libdir}/evolution/%{evo_major}/libetext.so
-%{_libdir}/pkgconfig/evolution-shell.pc
 %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
 %{_libdir}/evolution/%{evo_major}/libeutil.so
 %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
@@ -653,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Sat Sep 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.9.fc12
+- Snapshot of "kill-bonobo" progress at commit 041daf6.
+
 * Fri Sep 18 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.8.fc12
 - Snapshot of "kill-bonobo" progress at commit 6ae7523.
 - Drop the libbonobo, libbonoboui and libgnomeui dependencies.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.28
retrieving revision 1.116.2.29
diff -u -p -r1.116.2.28 -r1.116.2.29
--- sources	18 Sep 2009 19:13:59 -0000	1.116.2.28
+++ sources	19 Sep 2009 20:05:00 -0000	1.116.2.29
@@ -1 +1 @@
-3d79e145c0a5ee82dc34fa61af322052  evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2
+29ba0f32fd2ad5637c0ef2cf66a64698  evolution-2.29.1-kill-bonobo-041daf6.tar.bz2



From mcepl at fedoraproject.org  Sat Sep 19 20:41:41 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sat, 19 Sep 2009 20:41:41 +0000 (UTC)
Subject: rpms/ldapvi/F-11 ldapvi-1.7-getline.patch, NONE, 1.1 ldapvi.spec,
	1.8, 1.9
Message-ID: <20090919204141.1A1F511C00E6@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10215

Modified Files:
	ldapvi.spec 
Added Files:
	ldapvi-1.7-getline.patch 
Log Message:
Fix FTBFS (bug #511746)

ldapvi-1.7-getline.patch:
 common.h |    2 +-
 ldapvi.c |    2 +-
 misc.c   |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE ldapvi-1.7-getline.patch ---
>From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001
From: David Lichteblau <david at lichteblau.com>
Date: Thu, 18 Jun 2009 20:07:42 +0200
Subject: [PATCH] renamed getline

---
 ldapvi/common.h |    2 +-
 ldapvi/ldapvi.c |    2 +-
 ldapvi/misc.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ldapvi/common.h b/ldapvi/common.h
index 4c264e8..f731e62 100644
--- a/ldapvi/common.h
+++ b/ldapvi/common.h
@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
 char *home_filename(char *name);
 void read_ldapvi_history(void);
 void write_ldapvi_history(void);
-char *getline(char *prompt, char *value);
+char *ldapvi_getline(char *prompt, char *value);
 char *get_password();
 char *append(char *a, char *b);
 void *xalloc(size_t size);
diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c
index 9d7d77c..7b312f8 100644
--- a/ldapvi/ldapvi.c
+++ b/ldapvi/ldapvi.c
@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
 		bo->authmethod = LDAP_AUTH_SASL;
 		puts("Switching to SASL authentication.");
 	}
-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
+	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
 }
 
 static int
diff --git a/ldapvi/misc.c b/ldapvi/misc.c
index 0a9dba9..3b6896e 100644
--- a/ldapvi/misc.c
+++ b/ldapvi/misc.c
@@ -315,7 +315,7 @@ write_ldapvi_history()
 }
 
 char *
-getline(char *prompt, char *value)
+ldapvi_getline(char *prompt, char *value)
 {
 	tdialog d;
 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);
-- 
1.6.3.3



Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/F-11/ldapvi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ldapvi.spec	25 Feb 2009 12:49:08 -0000	1.8
+++ ldapvi.spec	19 Sep 2009 20:41:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://www.lichteblau.com/ldapvi/
 Source0:        http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz
 Patch0:         GNUmakefile.in.patch
+Patch1:         %{name}-1.7-getline.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
@@ -21,7 +22,8 @@ it as vipw(1) for LDAP.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .gnumk
+%patch1 -p2 -b .getline
 
 
 %build
@@ -49,6 +51,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 18 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-9
+- Fixed build to cure FTBFS (#511746)
+  Thanks for sharkcz for making the patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cwickert at fedoraproject.org  Sat Sep 19 20:48:38 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 19 Sep 2009 20:48:38 +0000 (UTC)
Subject: rpms/xfce4-dict/F-11 xfce4-dict.spec,1.8,1.9
Message-ID: <20090919204838.E8C0211C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14352/F-11

Modified Files:
	xfce4-dict.spec 
Log Message:
* Tue Jun 30 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.3-2
- Resolves: rhbz#508633 Require enchant rather than aspell, xfce4-dict
  already prefers it at run-time



Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-11/xfce4-dict.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xfce4-dict.spec	9 May 2009 19:06:08 -0000	1.8
+++ xfce4-dict.spec	19 Sep 2009 20:48:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           xfce4-dict
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Dictionary Client for the Xfce desktop environment
 Summary(de):    Ein W?rterbuch-Client f?r die Xfce Desktop-Umgebung
 Group:          User Interface/Desktops
@@ -11,15 +11,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
 BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils, intltool
-Requires:       aspell, xdg-utils
+Requires:       enchant, xdg-utils
 
 
 %description
-Xfce4 Dictionary is a client program to query different dictionaries. It can 
-query a Dict server (RFC 2229), open online dictionaries in a web browser or 
-verify the spelling of a word using aspell or ispell. This package contains 
-the stand-alone application, that can be used in different desktop 
-environments too.
+Xfce4 Dictionary is a client program to query different dictionaries. It can
+query a Dict server (RFC 2229), open online dictionaries in a web browser or
+verify the spelling of a word using enchant. This package contains the
+stand-alone application, that can be used in different desktop environments
+too.
 
 %package        plugin
 Summary:        Xfce panel plugin to query a Dict server
@@ -29,10 +29,10 @@ Requires:       %{name} = %{version}-%{r
 Requires:       xfce4-panel >= 4.4.3
 
 %description    plugin
-Xfce4 Dictionary is a client program to query different dictionaries. It can 
-query a Dict server (RFC 2229), open online dictionaries in a web browser or 
-verify the spelling of a word using aspell or ispell. This package contains 
-the plugin for the Xfce panel.
+Xfce4 Dictionary is a client program to query different dictionaries. It can
+query a Dict server (RFC 2229), open online dictionaries in a web browser or
+verify the spelling of a word using enchant. This package contains the plugin
+for the Xfce panel.
 
 
 %prep
@@ -88,6 +88,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Tue Jun 30 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.3-2
+- Resolves: rhbz#508633 Require enchant rather than aspell, xfce4-dict
+  already prefers it at run-time
+
 * Sat May 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 - Update icon-cache scriptlets



From cwickert at fedoraproject.org  Sat Sep 19 20:48:39 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 19 Sep 2009 20:48:39 +0000 (UTC)
Subject: rpms/xfce4-dict/F-10 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xfce4-dict.spec, 1.5, 1.6
Message-ID: <20090919204839.359ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14352/F-10

Modified Files:
	.cvsignore sources xfce4-dict.spec 
Log Message:
* Tue Jun 30 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.3-2
- Resolves: rhbz#508633 Require enchant rather than aspell, xfce4-dict
  already prefers it at run-time



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Dec 2008 04:17:12 -0000	1.5
+++ .cvsignore	19 Sep 2009 20:48:38 -0000	1.6
@@ -1 +1 @@
-xfce4-dict-0.5.2.tar.bz2
+xfce4-dict-0.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Dec 2008 04:17:12 -0000	1.5
+++ sources	19 Sep 2009 20:48:39 -0000	1.6
@@ -1 +1 @@
-ef1d9b940f711357e67b287a4f63d6e5  xfce4-dict-0.5.2.tar.bz2
+5d6e6da52ebe3663040a9936e3a63f8b  xfce4-dict-0.5.3.tar.bz2


Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-10/xfce4-dict.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xfce4-dict.spec	15 Dec 2008 04:17:12 -0000	1.5
+++ xfce4-dict.spec	19 Sep 2009 20:48:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           xfce4-dict
-Version:        0.5.2
-Release:        1%{?dist}
+Version:        0.5.3
+Release:        2%{?dist}
 Summary:        A Dictionary Client for the Xfce desktop environment
 Summary(de):    Ein W?rterbuch-Client f?r die Xfce Desktop-Umgebung
 Group:          User Interface/Desktops
@@ -11,28 +11,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
 BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils, intltool
-Requires:       aspell, xdg-utils
+Requires:       enchant, xdg-utils
 
 
 %description
-Xfce4 Dictionary is a client program to query different dictionaries. It can 
-query a Dict server (RFC 2229), open online dictionaries in a web browser or 
-verify the spelling of a word using aspell or ispell. This package contains 
-the stand-alone application, that can be used in different desktop 
-environments too.
+Xfce4 Dictionary is a client program to query different dictionaries. It can
+query a Dict server (RFC 2229), open online dictionaries in a web browser or
+verify the spelling of a word using enchant. This package contains the
+stand-alone application, that can be used in different desktop environments
+too.
 
 %package        plugin
 Summary:        Xfce panel plugin to query a Dict server
 Group:          User Interface/Desktops
 BuildRequires:  xfce4-panel-devel >= 4.4.0
 Requires:       %{name} = %{version}-%{release}
-Requires:       xfce4-panel >= 4.4.0
+Requires:       xfce4-panel >= 4.4.3
 
 %description    plugin
-Xfce4 Dictionary is a client program to query different dictionaries. It can 
-query a Dict server (RFC 2229), open online dictionaries in a web browser or 
-verify the spelling of a word using aspell or ispell. This package contains 
-the plugin for the Xfce panel.
+Xfce4 Dictionary is a client program to query different dictionaries. It can
+query a Dict server (RFC 2229), open online dictionaries in a web browser or
+verify the spelling of a word using enchant. This package contains the plugin
+for the Xfce panel.
 
 
 %prep
@@ -48,29 +48,30 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-only-show-in=XFCE                                 \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/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
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
@@ -87,6 +88,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Tue Jun 30 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.3-2
+- Resolves: rhbz#508633 Require enchant rather than aspell, xfce4-dict
+  already prefers it at run-time
+
+* Sat May 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
+- Update to 0.5.3
+- Update icon-cache scriptlets
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2
 



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:21 +0000
Subject: [pkgdb] bluez: aarapov has requested watchcommits
Message-ID: <20090919205923.11D6410F881@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:39 +0000
Subject: [pkgdb] bluez: aarapov has requested watchcommits
Message-ID: <20090919205939.1F34310F896@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:28 +0000
Subject: [pkgdb] bluez: aarapov has requested watchbugzilla
Message-ID: <20090919205927.DFBAE10F894@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:55 +0000
Subject: [pkgdb] bluez: aarapov has requested watchbugzilla
Message-ID: <20090919205942.B755510F89B@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:58 +0000
Subject: [pkgdb] bluez: aarapov has requested watchcommits
Message-ID: <20090919205945.8408110F89F@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:47 +0000
Subject: [pkgdb] bluez: aarapov has requested watchbugzilla
Message-ID: <20090919205947.4CF6E10F88C@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:11 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested watchbugzilla
Message-ID: <20090919205958.969DC10F894@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez-hcidump (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 20:59:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 20:59:59 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested watchcommits
Message-ID: <20090919205959.4F13510F8A2@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez-hcidump (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:04 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested watchcommits
Message-ID: <20090919210006.95AD610F8A6@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez-hcidump (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:07 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested watchbugzilla
Message-ID: <20090919210007.8802510F8AA@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez-hcidump (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:30 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested commit
Message-ID: <20090919210018.44A1110F8AC@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on bluez-hcidump (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:23 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested watchcommits
Message-ID: <20090919210010.9C7A910F89B@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez-hcidump (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:21 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested approveacls
Message-ID: <20090919210020.82A6F10F8B1@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on bluez-hcidump (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:26 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested approveacls
Message-ID: <20090919210026.7901310F89F@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on bluez-hcidump (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:46 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested approveacls
Message-ID: <20090919210032.EDE3B10F8A1@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on bluez-hcidump (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:45 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested commit
Message-ID: <20090919210032.F2D3B10F8B0@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on bluez-hcidump (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:34 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested commit
Message-ID: <20090919210034.3601010F8B4@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on bluez-hcidump (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:00:47 +0000
Subject: [pkgdb] bluez-hcidump: aarapov has requested watchbugzilla
Message-ID: <20090919210035.53DC410F8B6@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez-hcidump (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sat Sep 19 21:01:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:01:07 +0000
Subject: [pkgdb] bluez-libs: aarapov has requested watchcommits
Message-ID: <20090919210054.659C910F8A5@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on bluez-libs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-libs



From pkgdb at fedoraproject.org  Sat Sep 19 21:01:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:01:01 +0000
Subject: [pkgdb] bluez-libs: aarapov has requested watchbugzilla
Message-ID: <20090919210100.76D2210F8B9@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on bluez-libs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez-libs



From pkgdb at fedoraproject.org  Sat Sep 19 21:01:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:01:43 +0000
Subject: [pkgdb] unifdef: aarapov has requested watchbugzilla
Message-ID: <20090919210143.90DBD10F88C@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on unifdef (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:01:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:01:59 +0000
Subject: [pkgdb] unifdef: aarapov has requested watchcommits
Message-ID: <20090919210147.06CC610F89E@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on unifdef (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:01:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:01:52 +0000
Subject: [pkgdb] unifdef: aarapov has requested commit
Message-ID: <20090919210152.0021D10F8A9@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on unifdef (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:01:54 +0000
Subject: [pkgdb] unifdef: aarapov has requested approveacls
Message-ID: <20090919210154.480D510F8AD@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on unifdef (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:04 +0000
Subject: [pkgdb] unifdef: aarapov has requested watchcommits
Message-ID: <20090919210204.5F0DA10F8AF@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on unifdef (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:02 +0000
Subject: [pkgdb] unifdef: aarapov has requested watchbugzilla
Message-ID: <20090919210204.E745910F8B2@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on unifdef (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:06 +0000
Subject: [pkgdb] unifdef: aarapov has requested commit
Message-ID: <20090919210206.147C110F8B5@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on unifdef (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:04 +0000
Subject: [pkgdb] unifdef: aarapov has requested approveacls
Message-ID: <20090919210206.8E07310F8BC@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on unifdef (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:06 +0000
Subject: [pkgdb] unifdef: aarapov has requested commit
Message-ID: <20090919210208.85CED10F8C2@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on unifdef (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:07 +0000
Subject: [pkgdb] unifdef: aarapov has requested approveacls
Message-ID: <20090919210207.6A93610F8BF@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on unifdef (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:09 +0000
Subject: [pkgdb] unifdef: aarapov has requested watchcommits
Message-ID: <20090919210209.6E84710F8C8@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on unifdef (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From pkgdb at fedoraproject.org  Sat Sep 19 21:02:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 21:02:11 +0000
Subject: [pkgdb] unifdef: aarapov has requested watchbugzilla
Message-ID: <20090919210211.73BEC10F8A3@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on unifdef (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unifdef



From eponyme at fedoraproject.org  Sat Sep 19 21:09:15 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 19 Sep 2009 21:09:15 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.8, 1.9 cclive.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20090919210916.0151E11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23629

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Sep 2009 14:54:21 -0000	1.8
+++ .cvsignore	19 Sep 2009 21:09:15 -0000	1.9
@@ -1 +1 @@
-cclive-0.5.0.tar.bz2
+cclive-0.5.1.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cclive.spec	5 Sep 2009 14:54:21 -0000	1.8
+++ cclive.spec	19 Sep 2009 21:09:15 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.0
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
+- Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1
 - Update to 0.5.0
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Sep 2009 14:54:21 -0000	1.8
+++ sources	19 Sep 2009 21:09:15 -0000	1.9
@@ -1 +1 @@
-081c631f7ed64f31e5802f294d2f60f9  cclive-0.5.0.tar.bz2
+61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2



From eponyme at fedoraproject.org  Sat Sep 19 21:10:39 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 19 Sep 2009 21:10:39 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.8, 1.9 cclive.spec, 1.7, 1.8 sources,
	1.8, 1.9
Message-ID: <20090919211039.998FA11C0374@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24109

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Sep 2009 14:55:29 -0000	1.8
+++ .cvsignore	19 Sep 2009 21:10:38 -0000	1.9
@@ -1 +1 @@
-cclive-0.5.0.tar.bz2
+cclive-0.5.1.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cclive.spec	5 Sep 2009 14:55:29 -0000	1.7
+++ cclive.spec	19 Sep 2009 21:10:38 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.0
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
+- Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1
 - Update to 0.5.0
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Sep 2009 14:55:29 -0000	1.8
+++ sources	19 Sep 2009 21:10:38 -0000	1.9
@@ -1 +1 @@
-081c631f7ed64f31e5802f294d2f60f9  cclive-0.5.0.tar.bz2
+61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2



From eponyme at fedoraproject.org  Sat Sep 19 21:14:32 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 19 Sep 2009 21:14:32 +0000 (UTC)
Subject: rpms/cclive/F-10 .cvsignore, 1.8, 1.9 cclive.spec, 1.7, 1.8 sources,
	1.8, 1.9
Message-ID: <20090919211432.B36B411C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26113

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Sep 2009 14:56:29 -0000	1.8
+++ .cvsignore	19 Sep 2009 21:14:32 -0000	1.9
@@ -1 +1 @@
-cclive-0.5.0.tar.bz2
+cclive-0.5.1.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/cclive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cclive.spec	5 Sep 2009 14:56:29 -0000	1.7
+++ cclive.spec	19 Sep 2009 21:14:32 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.0
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
+- Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1
 - Update to 0.5.0
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Sep 2009 14:56:29 -0000	1.8
+++ sources	19 Sep 2009 21:14:32 -0000	1.9
@@ -1 +1 @@
-081c631f7ed64f31e5802f294d2f60f9  cclive-0.5.0.tar.bz2
+61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2



From eponyme at fedoraproject.org  Sat Sep 19 21:16:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 19 Sep 2009 21:16:46 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.19, 1.20 clive.spec, 1.23,
	1.24 sources, 1.19, 1.20
Message-ID: <20090919211646.ED5D811C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27797

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Aug 2009 17:10:06 -0000	1.19
+++ .cvsignore	19 Sep 2009 21:16:46 -0000	1.20
@@ -1 +1 @@
-clive-2.2.5.tar.bz2
+clive-2.2.6.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- clive.spec	16 Aug 2009 17:10:06 -0000	1.23
+++ clive.spec	19 Sep 2009 21:16:46 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.5
+Version:        2.2.6
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1
+- Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1
 - Update to 2.2.5
 * Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Aug 2009 17:10:06 -0000	1.19
+++ sources	19 Sep 2009 21:16:46 -0000	1.20
@@ -1 +1 @@
-ee8460011e966fcc1ca538fd76ecd23a  clive-2.2.5.tar.bz2
+91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2



From eponyme at fedoraproject.org  Sat Sep 19 21:17:49 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 19 Sep 2009 21:17:49 +0000 (UTC)
Subject: rpms/clive/F-11 .cvsignore, 1.19, 1.20 clive.spec, 1.22,
	1.23 sources, 1.19, 1.20
Message-ID: <20090919211749.4461411C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29085

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Aug 2009 17:11:24 -0000	1.19
+++ .cvsignore	19 Sep 2009 21:17:49 -0000	1.20
@@ -1 +1 @@
-clive-2.2.5.tar.bz2
+clive-2.2.6.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- clive.spec	16 Aug 2009 17:11:24 -0000	1.22
+++ clive.spec	19 Sep 2009 21:17:49 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.5
+Version:        2.2.6
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1
+- Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1
 - Update to 2.2.5
 * Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Aug 2009 17:11:24 -0000	1.19
+++ sources	19 Sep 2009 21:17:49 -0000	1.20
@@ -1 +1 @@
-ee8460011e966fcc1ca538fd76ecd23a  clive-2.2.5.tar.bz2
+91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2



From eponyme at fedoraproject.org  Sat Sep 19 21:18:45 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 19 Sep 2009 21:18:45 +0000 (UTC)
Subject: rpms/clive/F-10 .cvsignore, 1.19, 1.20 clive.spec, 1.20,
	1.21 sources, 1.19, 1.20
Message-ID: <20090919211845.91ADD11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29497

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Aug 2009 17:12:22 -0000	1.19
+++ .cvsignore	19 Sep 2009 21:18:45 -0000	1.20
@@ -1 +1 @@
-clive-2.2.5.tar.bz2
+clive-2.2.6.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- clive.spec	16 Aug 2009 17:12:22 -0000	1.20
+++ clive.spec	19 Sep 2009 21:18:45 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.5
+Version:        2.2.6
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1
+- Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1
 - Update to 2.2.5
 * Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Aug 2009 17:12:22 -0000	1.19
+++ sources	19 Sep 2009 21:18:45 -0000	1.20
@@ -1 +1 @@
-ee8460011e966fcc1ca538fd76ecd23a  clive-2.2.5.tar.bz2
+91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2



From cweyl at fedoraproject.org  Sat Sep 19 21:46:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 21:46:40 +0000 (UTC)
Subject: rpms/perl-local-lib/devel .cvsignore, 1.7, 1.8 perl-local-lib.spec, 
	1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090919214640.A86B811C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-local-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11455

Modified Files:
	.cvsignore perl-local-lib.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004007-1
- auto-update to 1.004007 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Aug 2009 05:41:27 -0000	1.7
+++ .cvsignore	19 Sep 2009 21:46:40 -0000	1.8
@@ -1 +1 @@
-local-lib-1.004006.tar.gz
+local-lib-1.004007.tar.gz


Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/perl-local-lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-local-lib.spec	29 Aug 2009 05:41:27 -0000	1.7
+++ perl-local-lib.spec	19 Sep 2009 21:46:40 -0000	1.8
@@ -1,5 +1,5 @@
 Name:       perl-local-lib
-Version:    1.004006
+Version:    1.004007
 Release:    1%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004007-1
+- auto-update to 1.004007 (by cpan-spec-update 0.01)
+
 * Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004006-1
 - auto-update to 1.004006 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Aug 2009 05:41:27 -0000	1.7
+++ sources	19 Sep 2009 21:46:40 -0000	1.8
@@ -1 +1 @@
-33b14a93fe4325bbb8837cb6b6336b26  local-lib-1.004006.tar.gz
+255c880d47a547f4cf9af1906e510849  local-lib-1.004007.tar.gz



From cweyl at fedoraproject.org  Sat Sep 19 21:52:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 19 Sep 2009 21:52:51 +0000 (UTC)
Subject: rpms/perl-local-lib/F-11 perl-local-lib.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <20090919215251.9026911C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-local-lib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15449

Modified Files:
	perl-local-lib.spec sources 
Log Message:
* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004007-1
- auto-update to 1.004007 (by cpan-spec-update 0.01)



Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/F-11/perl-local-lib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-local-lib.spec	25 Aug 2009 06:34:07 -0000	1.3
+++ perl-local-lib.spec	19 Sep 2009 21:52:50 -0000	1.4
@@ -1,5 +1,5 @@
 Name:       perl-local-lib
-Version:    1.004005
+Version:    1.004007
 Release:    1%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -74,6 +74,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004007-1
+- auto-update to 1.004007 (by cpan-spec-update 0.01)
+
+* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004006-1
+- auto-update to 1.004006 (by cpan-spec-update 0.01)
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004005-1
 - auto-update to 1.004005 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 06:34:08 -0000	1.4
+++ sources	19 Sep 2009 21:52:51 -0000	1.5
@@ -1 +1 @@
-80fc0977311592f7937a448c4b6577c5  local-lib-1.004005.tar.gz
+255c880d47a547f4cf9af1906e510849  local-lib-1.004007.tar.gz



From sailer at fedoraproject.org  Sat Sep 19 22:13:12 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat, 19 Sep 2009 22:13:12 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel .cvsignore, 1.5,
	1.6 mingw32-glibmm24.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090919221313.07B0211C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25466

Modified Files:
	.cvsignore mingw32-glibmm24.spec sources 
Log Message:
update to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Aug 2009 20:57:44 -0000	1.5
+++ .cvsignore	19 Sep 2009 22:13:12 -0000	1.6
@@ -2,3 +2,4 @@ glibmm-2.19.2.tar.bz2
 glibmm-2.20.0.tar.bz2
 glibmm-2.21.3.tar.bz2
 glibmm-2.21.4.tar.bz2
+glibmm-2.21.5.tar.bz2


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-glibmm24.spec	31 Aug 2009 20:57:44 -0000	1.8
+++ mingw32-glibmm24.spec	19 Sep 2009 22:13:12 -0000	1.9
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glibmm24
-Version:        2.21.4
+Version:        2.21.5
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -65,10 +65,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYING.tools
 %{_mingw32_bindir}/libgiomm-2.4-1.dll
 %{_mingw32_bindir}/libglibmm-2.4-1.dll
+%{_mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll
 %{_mingw32_libdir}/libgiomm-2.4.dll.a
 %{_mingw32_libdir}/libgiomm-2.4.la
 %{_mingw32_libdir}/libglibmm-2.4.dll.a
 %{_mingw32_libdir}/libglibmm-2.4.la
+%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
+%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.la
 %{_mingw32_libdir}/giomm-2.4
 %{_mingw32_libdir}/glibmm-2.4
 %{_mingw32_includedir}/giomm-2.4
@@ -79,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.5-1
+- update to 2.21.5 match native package
+
 * Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.4-1
 - update to 2.21.4 match native package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Aug 2009 20:57:44 -0000	1.5
+++ sources	19 Sep 2009 22:13:12 -0000	1.6
@@ -1 +1 @@
-08be0712e2992a395ac9405376dbc392  glibmm-2.21.4.tar.bz2
+9fa38563cbe6bf232ddbbe114f6f3a3f  glibmm-2.21.5.tar.bz2



From hno at fedoraproject.org  Sat Sep 19 22:22:06 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 19 Sep 2009 22:22:06 +0000 (UTC)
Subject: rpms/squid/F-10 squid-3.0.STABLE19-3-9986.patch, NONE,
	1.1 squid.spec, 1.121, 1.122
Message-ID: <20090919222206.BC23B11C00E6@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28904

Modified Files:
	squid.spec 
Added Files:
	squid-3.0.STABLE19-3-9986.patch 
Log Message:
Patch for Squid Bug #2626: Invalid response for IMS request


squid-3.0.STABLE19-3-9986.patch:
 client_side_reply.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squid-3.0.STABLE19-3-9986.patch ---
diff -up squid-3.0.STABLE19/src/client_side_reply.cc.3-9987 squid-3.0.STABLE19/src/client_side_reply.cc
--- squid-3.0.STABLE19/src/client_side_reply.cc.3-9987	2009-09-06 13:29:37.000000000 +0200
+++ squid-3.0.STABLE19/src/client_side_reply.cc	2009-09-19 04:17:12.000000000 +0200
@@ -366,7 +366,7 @@ clientReplyContext::handleIMSReply(Store
 
 	// if client sent IMS
 
-	if (http->request->flags.ims) {
+        if (http->request->flags.ims && !old_entry->modifiedSince(http->request)) {
 	    // forward the 304 from origin
 	    debugs(88, 3, "handleIMSReply: origin replied 304, revalidating existing entry and forwarding 304 to client");
 	    sendClientUpstreamResponse();


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- squid.spec	10 Sep 2009 22:19:00 -0000	1.121
+++ squid.spec	19 Sep 2009 22:22:06 -0000	1.122
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE19
-Release:  1%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -24,7 +24,9 @@ Source98: perl-requires-squid.sh
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
 
-# External patches
+# Backported patches
+# http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
+Patch101: squid-3.0.STABLE19-3-9986.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -60,6 +62,7 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch101 -p1 -b .3-9986
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -341,6 +344,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Sep 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-3
+- Patch for Squid Bug #2626: Invalid response for IMS request
+
 * Fri Sep 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE19-1
 - Update to 3.0.STABLE19
 - Bug #520445 silence logrotate when Squid is not running



From sailer at fedoraproject.org  Sat Sep 19 22:26:54 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat, 19 Sep 2009 22:26:54 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel .cvsignore, 1.2, 1.3 mingw32-pangomm.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090919222654.5A96011C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30312

Modified Files:
	.cvsignore mingw32-pangomm.spec sources 
Log Message:
update to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Apr 2009 21:10:15 -0000	1.2
+++ .cvsignore	19 Sep 2009 22:26:53 -0000	1.3
@@ -1 +1,2 @@
 pangomm-2.24.0.tar.bz2
+pangomm-2.25.1.3.tar.bz2


Index: mingw32-pangomm.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/mingw32-pangomm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-pangomm.spec	25 Jul 2009 14:28:10 -0000	1.4
+++ mingw32-pangomm.spec	19 Sep 2009 22:26:54 -0000	1.5
@@ -8,8 +8,8 @@
 %global apiver 1.4
 
 Name:           mingw32-pangomm
-Version:        2.24.0
-Release:        4%{?dist}
+Version:        2.25.1.3
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for Pango
 
 License:        LGPLv2+
@@ -48,7 +48,7 @@ quickly create complex user interfaces.
 
 
 %build
-%{_mingw32_configure} --disable-static
+%{_mingw32_configure} --disable-static --disable-documentation
 make %{?_smp_mflags}
 
 
@@ -58,10 +58,6 @@ make DESTDIR=$RPM_BUILD_ROOT INSTALL="in
 
 rm -r $RPM_BUILD_ROOT%{_mingw32_libdir}/pangomm-%{apiver}
 
-# Remove documentation.
-rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/pangomm-%{apiver}
-rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.25.1.3-1
+- update to 2.25.1.3 match native package
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 21:10:15 -0000	1.2
+++ sources	19 Sep 2009 22:26:54 -0000	1.3
@@ -1 +1 @@
-fa0f44c37499433455857becad4bbcda  pangomm-2.24.0.tar.bz2
+e9aac0019cb56350ceb5fcb316f2797c  pangomm-2.25.1.3.tar.bz2



From sailer at fedoraproject.org  Sat Sep 19 22:45:34 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat, 19 Sep 2009 22:45:34 +0000 (UTC)
Subject: rpms/mingw32-libsigc++20/devel .cvsignore, 1.2,
	1.3 mingw32-libsigc++20.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090919224534.9873A11C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libsigc++20/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4696

Modified Files:
	.cvsignore mingw32-libsigc++20.spec sources 
Log Message:
update to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsigc++20/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Mar 2009 21:45:48 -0000	1.2
+++ .cvsignore	19 Sep 2009 22:45:27 -0000	1.3
@@ -1 +1,2 @@
 libsigc++-2.2.2.tar.bz2
+libsigc++-2.2.4.2.tar.bz2


Index: mingw32-libsigc++20.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsigc++20/devel/mingw32-libsigc++20.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libsigc++20.spec	25 Jul 2009 12:23:13 -0000	1.4
+++ mingw32-libsigc++20.spec	19 Sep 2009 22:45:27 -0000	1.5
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libsigc++20
-Version:        2.2.2
+Version:        2.2.4.2
 Release:        9%{?dist}
 Summary:        MinGW Windows port of the typesafe signal framework for C++
 
@@ -51,7 +51,7 @@ starting with version 1.1.2, uses %name.
 
 
 %build
-%{_mingw32_configure} --disable-static
+%{_mingw32_configure} --disable-static --disable-documentation
 make %{?_smp_mflags}
 
 
@@ -61,9 +61,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 chmod a-x $RPM_BUILD_ROOT/%{_mingw32_libdir}/libsigc-2.0.dll.a
 chmod a-x $RPM_BUILD_ROOT/%{_mingw32_libdir}/libsigc-2.0.la
 
-# Docs duplicate native package.
-rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/libsigc-2.0
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.2.4.2-1
+- update to 2.2.4.2 match native package
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsigc++20/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Mar 2009 21:45:48 -0000	1.2
+++ sources	19 Sep 2009 22:45:28 -0000	1.3
@@ -1 +1 @@
-962493fd6b26425f21504c3416c4efa1  libsigc++-2.2.2.tar.bz2
+545edbb7b54eec4f723323d3158c0e0c  libsigc++-2.2.4.2.tar.bz2



From sailer at fedoraproject.org  Sat Sep 19 22:46:28 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat, 19 Sep 2009 22:46:28 +0000 (UTC)
Subject: rpms/mingw32-libsigc++20/devel mingw32-libsigc++20.spec,1.5,1.6
Message-ID: <20090919224628.AB19311C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libsigc++20/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5300

Modified Files:
	mingw32-libsigc++20.spec 
Log Message:
fix revision



Index: mingw32-libsigc++20.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsigc++20/devel/mingw32-libsigc++20.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libsigc++20.spec	19 Sep 2009 22:45:27 -0000	1.5
+++ mingw32-libsigc++20.spec	19 Sep 2009 22:46:27 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libsigc++20
 Version:        2.2.4.2
-Release:        9%{?dist}
+Release:        1%{?dist}
 Summary:        MinGW Windows port of the typesafe signal framework for C++
 
 License:        LGPLv2+



From sailer at fedoraproject.org  Sat Sep 19 23:10:50 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat, 19 Sep 2009 23:10:50 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel mingw32-pangomm.spec,1.5,1.6
Message-ID: <20090919231050.ED6CF11C0374@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18609

Modified Files:
	mingw32-pangomm.spec 
Log Message:
gtkmm-2.17.11 needs pangommconfig.h



Index: mingw32-pangomm.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/mingw32-pangomm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-pangomm.spec	19 Sep 2009 22:26:54 -0000	1.5
+++ mingw32-pangomm.spec	19 Sep 2009 23:10:50 -0000	1.6
@@ -9,7 +9,7 @@
 
 Name:           mingw32-pangomm
 Version:        2.25.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ interface for Pango
 
 License:        LGPLv2+
@@ -56,8 +56,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 
-rm -r $RPM_BUILD_ROOT%{_mingw32_libdir}/pangomm-%{apiver}
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,10 +68,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libpangomm-%{apiver}.la
 %{_mingw32_libdir}/libpangomm-%{apiver}.dll.a
 %{_mingw32_libdir}/pkgconfig/pangomm-%{apiver}.pc
+%{_mingw32_libdir}/pangomm-%{apiver}/include/pangommconfig.h
 %{_mingw32_includedir}/pangomm-%{apiver}
 
 
 %changelog
+* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.25.1.3-2
+- also package pangommconfig.h
+
 * Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.25.1.3-1
 - update to 2.25.1.3 match native package
 



From pkgdb at fedoraproject.org  Sat Sep 19 23:47:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:47:44 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090919234747.5B57310F84E@bastion2.fedora.phx.redhat.com>

Package sec in Fedora devel was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sat Sep 19 23:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:47:53 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090919234755.9047810F881@bastion2.fedora.phx.redhat.com>

Package sec in Fedora EPEL 5 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sat Sep 19 23:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:48:00 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090919234759.CF79F10F84E@bastion2.fedora.phx.redhat.com>

Package sec in Fedora 11 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sat Sep 19 23:48:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:48:37 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090919234840.0A55810F881@bastion2.fedora.phx.redhat.com>

Package sec in Fedora 10 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:18 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234919.82F2910F84E@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora devel was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:19 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234920.AB7B610F881@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 7 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:20 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234921.B1F5810F888@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 7 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:21 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234923.0839110F894@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 4 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:25 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234926.EDB5B10F896@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 4 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:41 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234928.C76DE10F898@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 5 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:41 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234928.CE85610F89B@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 5 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:32 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234933.6963410F84E@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 6 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:32 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234933.87A7E10F89C@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 6 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:52 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234939.B191210F881@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 9 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:35 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234938.7DB8A10F89F@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 8 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:35 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234938.86AE410F8A1@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 8 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:52 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234939.C75AD10F8A4@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 9 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:41 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234941.1AE0B10F886@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 10 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:41 +0000
Subject: [pkgdb] orpie (un)retirement
Message-ID: <20090919234941.26EDB10F88C@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 10 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:41 +0000
Subject: [pkgdb] orpie ownership updated
Message-ID: <20090919234942.A7D6B10F8A5@bastion2.fedora.phx.redhat.com>

Package orpie in Fedora 11 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/orpie



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:09 +0000
Subject: [pkgdb] lineakd (un)retirement
Message-ID: <20090919234956.70F0510F897@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora devel has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:09 +0000
Subject: [pkgdb] lineakd ownership updated
Message-ID: <20090919234956.6A44810F895@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora devel was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:11 +0000
Subject: [pkgdb] lineakd ownership updated
Message-ID: <20090919234959.0953110F8AC@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 7 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:11 +0000
Subject: [pkgdb] lineakd (un)retirement
Message-ID: <20090919234959.1856D10F8AF@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 7 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:59 +0000
Subject: [pkgdb] lineakd ownership updated
Message-ID: <20090919235002.3ABE910F8B2@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 6 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:49:59 +0000
Subject: [pkgdb] lineakd (un)retirement
Message-ID: <20090919235002.46BF410F8B4@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 6 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:16 +0000
Subject: [pkgdb] lineakd ownership updated
Message-ID: <20090919235003.4FD8610F84E@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 8 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:16 +0000
Subject: [pkgdb] lineakd (un)retirement
Message-ID: <20090919235003.59DFC10F8B9@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 8 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:03 +0000
Subject: [pkgdb] lineakd ownership updated
Message-ID: <20090919235004.6B7D410F880@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 9 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:03 +0000
Subject: [pkgdb] lineakd (un)retirement
Message-ID: <20090919235004.7609C10F89D@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 9 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:05 +0000
Subject: [pkgdb] lineakd ownership updated
Message-ID: <20090919235006.8886110F8BC@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 10 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:05 +0000
Subject: [pkgdb] lineakd (un)retirement
Message-ID: <20090919235006.9F68A10F8BE@bastion2.fedora.phx.redhat.com>

Package lineakd in Fedora 10 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineakd



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:16 +0000
Subject: [pkgdb] lineak-xosdplugin (un)retirement
Message-ID: <20090919235017.50CF310F89F@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora devel has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:16 +0000
Subject: [pkgdb] lineak-xosdplugin ownership updated
Message-ID: <20090919235017.3CB1B10F881@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora devel was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:18 +0000
Subject: [pkgdb] lineak-xosdplugin (un)retirement
Message-ID: <20090919235018.63CFC10F8C1@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 7 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:18 +0000
Subject: [pkgdb] lineak-xosdplugin ownership updated
Message-ID: <20090919235018.510FB10F8A1@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 7 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:20 +0000
Subject: [pkgdb] lineak-xosdplugin ownership updated
Message-ID: <20090919235019.AB69A10F8C3@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 6 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:20 +0000
Subject: [pkgdb] lineak-xosdplugin (un)retirement
Message-ID: <20090919235019.B22DE10F8C5@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 6 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:20 +0000
Subject: [pkgdb] lineak-xosdplugin (un)retirement
Message-ID: <20090919235022.ED5A310F8CC@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 8 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:20 +0000
Subject: [pkgdb] lineak-xosdplugin ownership updated
Message-ID: <20090919235022.E1E9110F8C9@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 8 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:23 +0000
Subject: [pkgdb] lineak-xosdplugin ownership updated
Message-ID: <20090919235024.3B01410F8D0@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 9 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:23 +0000
Subject: [pkgdb] lineak-xosdplugin (un)retirement
Message-ID: <20090919235024.45C1410F8D2@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 9 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:22 +0000
Subject: [pkgdb] lineak-xosdplugin (un)retirement
Message-ID: <20090919235025.5EF0310F8D4@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 10 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:47 +0000
Subject: [pkgdb] lineak-kdeplugins ownership updated
Message-ID: <20090919235034.910F810F8A4@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora devel was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:47 +0000
Subject: [pkgdb] lineak-kdeplugins (un)retirement
Message-ID: <20090919235034.9FB3610F8D7@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora devel has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:49 +0000
Subject: [pkgdb] lineak-kdeplugins ownership updated
Message-ID: <20090919235036.9CFCF10F888@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 7 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:49 +0000
Subject: [pkgdb] lineak-kdeplugins (un)retirement
Message-ID: <20090919235036.AE62510F8A9@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 7 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:22 +0000
Subject: [pkgdb] lineak-xosdplugin ownership updated
Message-ID: <20090919235025.57C2210F8A2@bastion2.fedora.phx.redhat.com>

Package lineak-xosdplugin in Fedora 10 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-xosdplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:38 +0000
Subject: [pkgdb] lineak-kdeplugins ownership updated
Message-ID: <20090919235037.A259010F894@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 6 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:38 +0000
Subject: [pkgdb] lineak-kdeplugins (un)retirement
Message-ID: <20090919235037.A9E4D10F8DA@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 6 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:52 +0000
Subject: [pkgdb] lineak-kdeplugins ownership updated
Message-ID: <20090919235040.2497010F8DC@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 10 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:52 +0000
Subject: [pkgdb] lineak-kdeplugins (un)retirement
Message-ID: <20090919235040.3E57310F8DE@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 10 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:53 +0000
Subject: [pkgdb] lineak-kdeplugins (un)retirement
Message-ID: <20090919235041.3A7CB10F8EB@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 9 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:53 +0000
Subject: [pkgdb] lineak-kdeplugins ownership updated
Message-ID: <20090919235041.12CE410F8E0@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 9 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:41 +0000
Subject: [pkgdb] lineak-kdeplugins ownership updated
Message-ID: <20090919235041.839E910F8EE@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 8 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:41 +0000
Subject: [pkgdb] lineak-kdeplugins (un)retirement
Message-ID: <20090919235041.8DD7110F8F2@bastion2.fedora.phx.redhat.com>

Package lineak-kdeplugins in Fedora 8 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-kdeplugins



From pkgdb at fedoraproject.org  Sat Sep 19 23:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:51:02 +0000
Subject: [pkgdb] lineak-defaultplugin ownership updated
Message-ID: <20090919235049.1D6DA10F895@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 10 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:51:02 +0000
Subject: [pkgdb] lineak-defaultplugin (un)retirement
Message-ID: <20090919235049.2396A10F897@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 10 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:51:02 +0000
Subject: [pkgdb] lineak-defaultplugin ownership updated
Message-ID: <20090919235050.2EE1410F8A8@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 9 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:48 +0000
Subject: [pkgdb] lineak-defaultplugin ownership updated
Message-ID: <20090919235050.91DF310F8FE@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 8 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:48 +0000
Subject: [pkgdb] lineak-defaultplugin (un)retirement
Message-ID: <20090919235050.9AB5010F900@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 8 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:51:02 +0000
Subject: [pkgdb] lineak-defaultplugin (un)retirement
Message-ID: <20090919235050.44A1F10F8FC@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 9 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:51 +0000
Subject: [pkgdb] lineak-defaultplugin (un)retirement
Message-ID: <20090919235052.8B3ED10F904@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 6 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:51 +0000
Subject: [pkgdb] lineak-defaultplugin ownership updated
Message-ID: <20090919235052.83D5F10F902@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 6 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:54 +0000
Subject: [pkgdb] lineak-defaultplugin ownership updated
Message-ID: <20090919235054.62D1F10F906@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 7 was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:54 +0000
Subject: [pkgdb] lineak-defaultplugin (un)retirement
Message-ID: <20090919235054.6E19C10F908@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora 7 has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:52 +0000
Subject: [pkgdb] lineak-defaultplugin ownership updated
Message-ID: <20090919235055.103FE10F90A@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora devel was orphaned by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From pkgdb at fedoraproject.org  Sat Sep 19 23:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Sep 2009 23:50:52 +0000
Subject: [pkgdb] lineak-defaultplugin (un)retirement
Message-ID: <20090919235055.17FB210F90C@bastion2.fedora.phx.redhat.com>

Package lineak-defaultplugin in Fedora devel has been retired by xris

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lineak-defaultplugin



From sailer at fedoraproject.org  Sun Sep 20 00:00:11 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 20 Sep 2009 00:00:11 +0000 (UTC)
Subject: rpms/mingw32-sqlite/devel .cvsignore, 1.4, 1.5 mingw32-sqlite.spec, 
	1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090920000011.7E1C311C0336@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14562

Modified Files:
	.cvsignore mingw32-sqlite.spec sources 
Log Message:
update to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Jun 2009 10:18:52 -0000	1.4
+++ .cvsignore	20 Sep 2009 00:00:11 -0000	1.5
@@ -1 +1,2 @@
 sqlite-3.6.14.2.tar.gz
+sqlite-3.6.17.tar.gz


Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-sqlite.spec	25 Jul 2009 14:31:41 -0000	1.10
+++ mingw32-sqlite.spec	20 Sep 2009 00:00:11 -0000	1.11
@@ -10,8 +10,8 @@
 %global tclversion 8.5
 
 Name:           mingw32-sqlite
-Version:        3.6.14.2
-Release:        2%{?dist}
+Version:        3.6.17
+Release:        1%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
 License:        Public Domain
@@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.17-1
+- update to 3.6.17
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Jun 2009 10:18:53 -0000	1.4
+++ sources	20 Sep 2009 00:00:11 -0000	1.5
@@ -1 +1 @@
-4c074691b48cd45854899ae4fece6301  sqlite-3.6.14.2.tar.gz
+f89f62afc765e08b3f0e47cdc47a15d4  sqlite-3.6.17.tar.gz



From sailer at fedoraproject.org  Sun Sep 20 00:07:13 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 20 Sep 2009 00:07:13 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel .cvsignore, 1.3, 1.4 mingw32-gtkmm24.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090920000713.44CEE11C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17409

Modified Files:
	.cvsignore mingw32-gtkmm24.spec sources 
Log Message:
update to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Aug 2009 16:21:00 -0000	1.3
+++ .cvsignore	20 Sep 2009 00:07:12 -0000	1.4
@@ -1,2 +1,3 @@
 gtkmm-2.16.0.tar.bz2
 gtkmm-2.17.2.tar.bz2
+gtkmm-2.17.11.tar.bz2


Index: mingw32-gtkmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/mingw32-gtkmm24.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-gtkmm24.spec	31 Aug 2009 16:21:00 -0000	1.4
+++ mingw32-gtkmm24.spec	20 Sep 2009 00:07:12 -0000	1.5
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtkmm24
-Version:        2.17.2
+Version:        2.17.11
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -48,14 +48,14 @@ freely combined to quickly create comple
 
 
 %build
-%{_mingw32_configure} --disable-static --enable-shared --disable-demos --disable-docs
+%{_mingw32_configure} --disable-static --enable-shared --disable-demos --disable-documentation
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-
+rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtkmm-2.4/demo/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.17.11-1
+- update to 2.17.11 to match native
+
 * Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.17.2-1
 - update to 2.17.2 to match native
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Aug 2009 16:21:00 -0000	1.3
+++ sources	20 Sep 2009 00:07:12 -0000	1.4
@@ -1 +1 @@
-fdb4932b254c270c0023addd6c2ec420  gtkmm-2.17.2.tar.bz2
+17c651028978e1ecb182f0d387a253b5  gtkmm-2.17.11.tar.bz2



From roma at fedoraproject.org  Sun Sep 20 01:58:31 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Sun, 20 Sep 2009 01:58:31 +0000 (UTC)
Subject: rpms/pydb/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 pydb.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090920015832.0934511C00E6@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/pydb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28751/devel

Modified Files:
	.cvsignore import.log pydb.spec sources 
Log Message:
Updated to 1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pydb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 02:10:30 -0000	1.2
+++ .cvsignore	20 Sep 2009 01:58:28 -0000	1.3
@@ -1 +1 @@
-pydb-1.25.tar.bz2
+pydb-1.26.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pydb/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Mar 2009 02:10:30 -0000	1.1
+++ import.log	20 Sep 2009 01:58:28 -0000	1.2
@@ -1 +1,2 @@
 pydb-1_25-4_fc10:HEAD:pydb-1.25-4.fc10.src.rpm:1235873370
+pydb-1_26-4_el5:HEAD:pydb-1.26-4.el5.src.rpm:1253411869


Index: pydb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pydb/devel/pydb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pydb.spec	26 Jul 2009 19:46:53 -0000	1.2
+++ pydb.spec	20 Sep 2009 01:58:28 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Extended Python Debugger
 Name:    pydb
-Version: 1.25
-Release: 5%{?dist}
+Version: 1.26
+Release: 4%{?dist}
 License: GPLv2+
 Group:   Development/Debuggers
 Url:     http://bashdb.sourceforge.net/pydb
@@ -62,9 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Fri Sep 18 2009 Paulo Roma <roma at lcg.ufrj.br> 1.26-4
+- Updated to 1.26
 
 * Sun Feb 25 2009 Paulo Roma <roma at lcg.ufrj.br> 1.25-4
 - Included missing doc files.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pydb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 02:10:30 -0000	1.2
+++ sources	20 Sep 2009 01:58:28 -0000	1.3
@@ -1 +1 @@
-a4b3005f92521461eb55663a1b8d1642  pydb-1.25.tar.bz2
+de3882eaa88bd6b5c66d33bec3666e5f  pydb-1.26.tar.bz2



From cwickert at fedoraproject.org  Sun Sep 20 02:56:40 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 02:56:40 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xfce4-dev-tools.spec, 1.13, 1.14
Message-ID: <20090920025640.6D16611C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dev-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13038

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.1-1
- Update to 4.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Aug 2009 13:06:17 -0000	1.9
+++ .cvsignore	20 Sep 2009 02:56:37 -0000	1.10
@@ -1 +1 @@
-xfce4-dev-tools-4.7.0.tar.bz2
+xfce4-dev-tools-4.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Aug 2009 13:06:17 -0000	1.9
+++ sources	20 Sep 2009 02:56:37 -0000	1.10
@@ -1 +1 @@
-6077a9d0b64e89f213520eb7d9b2aa91  xfce4-dev-tools-4.7.0.tar.bz2
+9841ccb2e0c2ca8a56d6eeabc54bb569  xfce4-dev-tools-4.7.1.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfce4-dev-tools.spec	19 Aug 2009 13:10:39 -0000	1.13
+++ xfce4-dev-tools.spec	20 Sep 2009 02:56:37 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		xfce4-dev-tools
-Version:	4.7.0
+Version:	4.7.1
 Release:	1%{?dist}
 Summary:	Xfce developer tools
 
@@ -25,7 +25,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL='install -p'
 
 mkdir $RPM_BUILD_ROOT%{_datadir}/aclocal/
 install -p -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 
@@ -43,7 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
-* Wed Aug 19 2009 Christoph Wickert <fedora christoph-wickert de> - 4.7.0-1
+* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.1-1
+- Update to 4.7.1
+
+* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.0-1
 - Update to 4.7.0
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-2
@@ -64,25 +67,25 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Dec 28 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 
-* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
+* Mon Sep 08 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0.1-1
 - Update to 4.4.0.1
 
 * Tue Aug 12 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.4.0-2
 - Fix license tag.
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 4.4.0-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0-1
 - Update to 4.4.0.
 
-* Sat Nov 11 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.2-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 4.3.99.2-1
 - Update to 4.3.99.2.
 
-* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-3
+* Tue Oct 03 2006 Christoph Wickert <cwickert at fedoraproject.org> - 4.3.99.1-3
 - Require gettext-devel.
 - Install m4 macros also to /usr/share/aclocal.
 
-* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-2
+* Tue Oct 03 2006 Christoph Wickert <cwickert at fedoraproject.org> - 4.3.99.1-2
 - Some more requires: glib2-devel, make and gtk-doc.
 - Own %%{_datadir}/xfce4
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-1
+* Sat Sep 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 4.3.99.1-1
 - Initial Fedora Extras release.



From cwickert at fedoraproject.org  Sun Sep 20 04:55:03 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 04:55:03 +0000 (UTC)
Subject: rpms/xfwm4/F-11 xfwm4-4.6.1-nodoka.patch, NONE, 1.1 xfwm4.spec, 1.35,
	1.36 xfwm4-4.5.92-nodoka.patch, 1.1, NONE
Message-ID: <20090920045503.D515211C02CA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15125/F-11

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-4.6.1-nodoka.patch 
Removed Files:
	xfwm4-4.5.92-nodoka.patch 
Log Message:
* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Make Nodoka default (bug #491092)


xfwm4-4.6.1-nodoka.patch:
 defaults |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfwm4-4.6.1-nodoka.patch ---
--- xfwm4-4.6.1/defaults/defaults.orig	2009-09-20 06:20:59.000000000 +0200
+++ xfwm4-4.6.1/defaults/defaults	2009-09-20 06:21:43.000000000 +0200
@@ -46,7 +46,7 @@
 snap_to_border=true
 snap_to_windows=false
 snap_width=10
-theme=Default
+theme=Nodoka
 title_alignment=center
 title_font=Sans Bold 9
 title_horizontal_offset=0


Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/F-11/xfwm4.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xfwm4.spec	29 Jul 2009 02:29:00 -0000	1.35
+++ xfwm4.spec	20 Sep 2009 04:55:01 -0000	1.36
@@ -1,11 +1,11 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.6.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
-Patch0: xfwm4-4.5.92-nodoka.patch
+Patch0: xfwm4-4.6.1-nodoka.patch
 Patch1: xfwm4-4.6.1-focus.patch
 
 Group: User Interface/Desktops
@@ -74,7 +74,10 @@ fi
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
-* Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-3
+* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Make Nodoka default (bug #491092)
+
+* Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
 - Add patch for focus issue (fixes bug #514206)
 
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1


--- xfwm4-4.5.92-nodoka.patch DELETED ---



From cwickert at fedoraproject.org  Sun Sep 20 04:55:03 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 04:55:03 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4-4.6.1-nodoka.patch, NONE, 1.1 xfwm4.spec,
	1.36, 1.37 xfwm4-4.5.92-nodoka.patch, 1.1, NONE
Message-ID: <20090920045503.D2D6511C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15125/devel

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-4.6.1-nodoka.patch 
Removed Files:
	xfwm4-4.5.92-nodoka.patch 
Log Message:
* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Make Nodoka default (bug #491092)


xfwm4-4.6.1-nodoka.patch:
 defaults |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfwm4-4.6.1-nodoka.patch ---
--- xfwm4-4.6.1/defaults/defaults.orig	2009-09-20 06:20:59.000000000 +0200
+++ xfwm4-4.6.1/defaults/defaults	2009-09-20 06:21:43.000000000 +0200
@@ -46,7 +46,7 @@
 snap_to_border=true
 snap_to_windows=false
 snap_width=10
-theme=Default
+theme=Nodoka
 title_alignment=center
 title_font=Sans Bold 9
 title_horizontal_offset=0


Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xfwm4.spec	29 Jul 2009 02:02:43 -0000	1.36
+++ xfwm4.spec	20 Sep 2009 04:55:03 -0000	1.37
@@ -1,11 +1,11 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
-Patch0: xfwm4-4.5.92-nodoka.patch
+Patch0: xfwm4-4.6.1-nodoka.patch
 Patch1: xfwm4-4.6.1-focus.patch
 
 Group: User Interface/Desktops
@@ -74,6 +74,9 @@ fi
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
+* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Make Nodoka default (fixes bug #491092)
+
 * Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-3
 - Add patch for focus issue (fixes bug #514206)
 


--- xfwm4-4.5.92-nodoka.patch DELETED ---



From geoff at fedoraproject.org  Sun Sep 20 05:17:09 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Sun, 20 Sep 2009 05:17:09 +0000 (UTC)
Subject: rpms/scala/devel .cvsignore, 1.7, 1.8 scala.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <20090920051709.56B1111C00E6@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21873

Modified Files:
	.cvsignore scala.spec sources 
Log Message:
* Sat Sep 19 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.5-1
- Update to upstream 2.7.5 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	14 May 2009 12:17:00 -0000	1.7
+++ .cvsignore	20 Sep 2009 05:17:08 -0000	1.8
@@ -1,3 +1,3 @@
 fjbg-r17392.tar.bz2
-scala-2.7.4.final-sources.tgz
-msil-2.7.4.final.tar.bz2
+msil-2.7.5.final.tar.bz2
+scala-2.7.5.final-sources.tgz


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/scala.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- scala.spec	27 Jul 2009 03:51:01 -0000	1.14
+++ scala.spec	20 Sep 2009 05:17:08 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           scala
-Version:        2.7.4
+Version:        2.7.5
 %define fullversion %{version}.final
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -15,8 +15,8 @@ Source0:        http://www.scala-lang.or
 
 %define msilversion %{fullversion}
 # Exported from upstream vcs
-#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_4_final msil-2.7.4.final
-#   tar cjf msil-2.7.4.final.tar.bz2 msil-2.7.4.final
+#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_5_final msil-2.7.5.final
+#   tar cjf msil-2.7.5.final.tar.bz2 msil-2.7.5.final
 Source1:      msil-%{msilversion}.tar.bz2
 
 %define fjbgversion r17392
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scala/examples
 
 %changelog
+* Sat Sep 19 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.5-1
+- Update to upstream 2.7.5 release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 May 2009 12:17:00 -0000	1.7
+++ sources	20 Sep 2009 05:17:09 -0000	1.8
@@ -1,3 +1,3 @@
 ddf94b7fa410753bd3236c4184804b37  fjbg-r17392.tar.bz2
-8b79c304517cf378b4ca230366e31ea5  scala-2.7.4.final-sources.tgz
-1524e07ecdcc79b1a73ae8b9d5412cd4  msil-2.7.4.final.tar.bz2
+35d4023e00097fdbc3ba8716f84b1599  msil-2.7.5.final.tar.bz2
+380d49e7dd02344eb3a7b0c729107127  scala-2.7.5.final-sources.tgz



From cwickert at fedoraproject.org  Sun Sep 20 05:22:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 05:22:58 +0000 (UTC)
Subject: rpms/xfwm4/F-11 xfwm4.spec,1.36,1.37
Message-ID: <20090920052258.7A3F011C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23604/F-11

Modified Files:
	xfwm4.spec 
Log Message:
validate desktop files


Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/F-11/xfwm4.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xfwm4.spec	20 Sep 2009 04:55:01 -0000	1.36
+++ xfwm4.spec	20 Sep 2009 05:22:58 -0000	1.37
@@ -39,10 +39,14 @@ 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}
 
+for file in $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop; do
+  desktop-file-validate $file
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,6 +80,7 @@ fi
 %changelog
 * Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Make Nodoka default (bug #491092)
+- Validate *.desktop files
 
 * Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
 - Add patch for focus issue (fixes bug #514206)



From cwickert at fedoraproject.org  Sun Sep 20 05:22:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 05:22:58 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4.spec,1.37,1.38
Message-ID: <20090920052258.5938E11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23604/d

Modified Files:
	xfwm4.spec 
Log Message:
validate desktop files


Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xfwm4.spec	20 Sep 2009 04:55:03 -0000	1.37
+++ xfwm4.spec	20 Sep 2009 05:22:58 -0000	1.38
@@ -39,10 +39,14 @@ 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}
 
+for file in $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop; do
+  desktop-file-validate $file
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,6 +80,7 @@ fi
 %changelog
 * Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Make Nodoka default (fixes bug #491092)
+- Validate *.desktop files
 
 * Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-3
 - Add patch for focus issue (fixes bug #514206)



From mschwendt at fedoraproject.org  Sun Sep 20 06:24:48 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 20 Sep 2009 06:24:48 +0000 (UTC)
Subject: rpms/audacious-plugins/devel README,NONE,1.1
Message-ID: <20090920062448.72D4411C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9267

Added Files:
	README 
Log Message:



--- NEW FILE README ---
$ md5sum audacious-plugins-2.2-alpha1.tgz 
172ea9937709f2dcb73fd4a93355d6df  audacious-plugins-2.2-alpha1.tgz

contains a new 3rd generation "alsa-gapless" output plugin, which
may or may not fix some of the problems with playback. "alsa-ng" seems
to be quite susceptible to underruns (snd_pcm_writei() -EPIPE rv),
especially together with alsa-plugins-pulseaudio + PulseAudio.



From sailer at fedoraproject.org  Sun Sep 20 07:10:47 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 20 Sep 2009 07:10:47 +0000 (UTC)
Subject: rpms/vfrnav/devel bz523309.patch,NONE,1.1 vfrnav.spec,1.2,1.3
Message-ID: <20090920071047.D1B0811C0419@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/vfrnav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23910

Modified Files:
	vfrnav.spec 
Added Files:
	bz523309.patch 
Log Message:
fix for BZ #523309


bz523309.patch:
 fplan.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bz523309.patch ---
Index: src/fplan.cc
===================================================================
RCS file: /cvsroot/src_vfrnav/src/fplan.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/fplan.cc	25 Apr 2009 19:27:50 -0000	1.31
+++ src/fplan.cc	19 Sep 2009 22:12:05 -0000	1.32
@@ -642,7 +642,7 @@
                 }
         }
 #else
-        if (g_mkdir_with_parents(dbname.c_str(), 0x755)) {
+        if (g_mkdir_with_parents(dbname.c_str(), 0755)) {
                 throw std::runtime_error("vfrnav directory (" + dbname +")creation failed");
         }
 #endif


Index: vfrnav.spec
===================================================================
RCS file: /cvs/extras/rpms/vfrnav/devel/vfrnav.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vfrnav.spec	27 Jul 2009 06:50:32 -0000	1.2
+++ vfrnav.spec	20 Sep 2009 07:10:45 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           vfrnav
 Version:        0.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        VFR Navigation
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.baycom.org/~tom/vfrnav
 Source0:        http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz
+Patch0:         bz523309.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel >= 2.8.0
@@ -42,6 +43,7 @@ for the VFR navigation application.
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
@@ -136,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/vfrdbxplaneexport
 
 %changelog
+* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.3-10
+- fix for BZ#523309
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From iarnell at fedoraproject.org  Sun Sep 20 07:26:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 20 Sep 2009 07:26:46 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.7,
	1.8 perl-DateTime-Format-Natural.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090920072647.0521E11C00E6@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28265

Modified Files:
	.cvsignore perl-DateTime-Format-Natural.spec sources 
Log Message:
* Sun Sep 20 2009 Iain Arnell <iarnell at gmail.com> 0.79-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Aug 2009 09:30:59 -0000	1.7
+++ .cvsignore	20 Sep 2009 07:26:44 -0000	1.8
@@ -1 +1 @@
-DateTime-Format-Natural-0.78.tar.gz
+DateTime-Format-Natural-0.79.tar.gz


Index: perl-DateTime-Format-Natural.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/perl-DateTime-Format-Natural.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DateTime-Format-Natural.spec	29 Aug 2009 09:30:59 -0000	1.8
+++ perl-DateTime-Format-Natural.spec	20 Sep 2009 07:26:44 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-DateTime-Format-Natural
-Version:        0.78
+Version:        0.79
 Release:        1%{?dist}
 Summary:        Create machine readable date/time with natural parsing logic
 License:        GPL+ or Artistic
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Iain Arnell <iarnell at gmail.com> 0.79-1
+- update to latest upstream version
+
 * Sat Aug 29 2009 Iain Arnell <iarnell at gmail.com> 0.78-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Aug 2009 09:30:59 -0000	1.7
+++ sources	20 Sep 2009 07:26:44 -0000	1.8
@@ -1 +1 @@
-67b88a73252aa7574952618d7f548638  DateTime-Format-Natural-0.78.tar.gz
+abfa205e722e0f6c70f59bc8f38358a6  DateTime-Format-Natural-0.79.tar.gz



From sailer at fedoraproject.org  Sun Sep 20 07:46:48 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 20 Sep 2009 07:46:48 +0000 (UTC)
Subject: rpms/vfrnav/F-11 bz523309.patch,NONE,1.1 vfrnav.spec,1.1,1.2
Message-ID: <20090920074648.CDA2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/vfrnav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3257

Modified Files:
	vfrnav.spec 
Added Files:
	bz523309.patch 
Log Message:
fix for BZ #523309


bz523309.patch:
 fplan.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bz523309.patch ---
Index: src/fplan.cc
===================================================================
RCS file: /cvsroot/src_vfrnav/src/fplan.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/fplan.cc	25 Apr 2009 19:27:50 -0000	1.31
+++ src/fplan.cc	19 Sep 2009 22:12:05 -0000	1.32
@@ -642,7 +642,7 @@
                 }
         }
 #else
-        if (g_mkdir_with_parents(dbname.c_str(), 0x755)) {
+        if (g_mkdir_with_parents(dbname.c_str(), 0755)) {
                 throw std::runtime_error("vfrnav directory (" + dbname +")creation failed");
         }
 #endif


Index: vfrnav.spec
===================================================================
RCS file: /cvs/extras/rpms/vfrnav/F-11/vfrnav.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vfrnav.spec	17 Jun 2009 17:34:10 -0000	1.1
+++ vfrnav.spec	20 Sep 2009 07:46:47 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           vfrnav
 Version:        0.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        VFR Navigation
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.baycom.org/~tom/vfrnav
 Source0:        http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz
+Patch0:         bz523309.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel >= 2.8.0
@@ -42,6 +43,7 @@ for the VFR navigation application.
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
@@ -136,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/vfrdbxplaneexport
 
 %changelog
+* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.3-9
+- fix for BZ#523309
+
 * Fri May 29 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.3-8
 - convert icons to a standard size
 - vfrnav-utils now requires vfrnav



From pkgdb at fedoraproject.org  Sun Sep 20 07:55:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 07:55:08 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090920075508.9D24610F861@bastion2.fedora.phx.redhat.com>

Package sec in Fedora devel is now owned by stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sun Sep 20 07:55:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 07:55:18 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090920075518.BF39010F861@bastion2.fedora.phx.redhat.com>

Package sec in Fedora EPEL 5 is now owned by stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sun Sep 20 07:55:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 07:55:30 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090920075530.5B82D10F87C@bastion2.fedora.phx.redhat.com>

Package sec in Fedora 10 is now owned by stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From pkgdb at fedoraproject.org  Sun Sep 20 07:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 07:55:33 +0000
Subject: [pkgdb] sec ownership updated
Message-ID: <20090920075534.1E97110F87E@bastion2.fedora.phx.redhat.com>

Package sec in Fedora 11 is now owned by stefansf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sec



From chkr at fedoraproject.org  Sun Sep 20 09:51:24 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 20 Sep 2009 09:51:24 +0000 (UTC)
Subject: rpms/ipod-sharp/devel .cvsignore, 1.6, 1.7 ipod-sharp.spec, 1.20,
	1.21 sources, 1.6, 1.7
Message-ID: <20090920095124.CA33011C0416@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/ipod-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15683

Modified Files:
	.cvsignore ipod-sharp.spec sources 
Log Message:
* Fri Sep 18 2009 Christian Krause <chkr at fedoraproject.org> - 0.8.2-1
- Update to new upstream version 0.8.2
- Remove unneeded libipoddevice BR
- Don't create debuginfo package since it would be empty



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Oct 2008 02:02:04 -0000	1.6
+++ .cvsignore	20 Sep 2009 09:51:22 -0000	1.7
@@ -1 +1 @@
-ipod-sharp-0.8.1.tar.bz2
+ipod-sharp-0.8.2.tar.gz


Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/devel/ipod-sharp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ipod-sharp.spec	20 Aug 2009 22:16:05 -0000	1.20
+++ ipod-sharp.spec	20 Sep 2009 09:51:22 -0000	1.21
@@ -1,12 +1,15 @@
+# Don't create a debuginfo package since it would be empty
+%define debug_package %{nil}
+
 Name:    ipod-sharp
-Version: 0.8.1
-Release: 5%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
 License: LGPLv2+
 URL:     http://banshee-project.org/Subprojects/Ipod-sharp
-Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.bz2
+Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.gz
 Patch0:  ipod-sharp-0.8.0-libdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,7 +19,6 @@ ExclusiveArch: %ix86 x86_64 ppc ppc64 ia
 BuildRequires: podsleuth-devel
 BuildRequires: mono-devel
 BuildRequires: gtk-sharp2-devel
-BuildRequires: libipoddevice-devel
 BuildRequires: ndesk-dbus-glib-devel
 
 %description
@@ -63,6 +65,11 @@ make install DESTDIR=${RPM_BUILD_ROOT} \
 
 
 %changelog
+* Fri Sep 18 2009 Christian Krause <chkr at fedoraproject.org> - 0.8.2-1
+- Update to new upstream version 0.8.2
+- Remove unneeded libipoddevice BR
+- Don't create debuginfo package since it would be empty
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-5
 - Rebuild to pick up ppc64 builds
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Oct 2008 02:02:04 -0000	1.6
+++ sources	20 Sep 2009 09:51:22 -0000	1.7
@@ -1 +1 @@
-843c9657a0fa6555d5bf80e436ad4f86  ipod-sharp-0.8.1.tar.bz2
+2a8cfd9792a55a49b14d25637e7cfeb5  ipod-sharp-0.8.2.tar.gz



From eponyme at fedoraproject.org  Sun Sep 20 10:13:41 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 20 Sep 2009 10:13:41 +0000 (UTC)
Subject: rpms/fotowall/devel .cvsignore, 1.7, 1.8 fotowall.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090920101341.8CB2211C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21991

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Aug 2009 16:11:18 -0000	1.7
+++ .cvsignore	20 Sep 2009 10:13:39 -0000	1.8
@@ -1 +1 @@
-fotowall-0.7.1.tar.bz2
+Fotowall-0.8.1.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/fotowall.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fotowall.spec	5 Aug 2009 16:11:18 -0000	1.9
+++ fotowall.spec	20 Sep 2009 10:13:39 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           fotowall
-Version:        0.7.1
+Version:        0.8.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://code.google.com/p/%{name}/
-Source0:        http://cloud.github.com/downloads/enricoros/%{name}/%{name}-%{version}.tar.bz2
+URL:            http://www.enricoros.com/opensource/fotowall/
+Source0:        http://%{name}.googlecode.com/files/Fotowall-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 4.4
@@ -19,7 +19,7 @@ in a personal way. You can add pictures,
 change colors, text, shadows, etc.. 
 
 %prep
-%setup -q
+%setup -q -n fotowall-%{version}
 # for hidden-file-or-dir warning 
 sed -i -e "s/\.build/build/" %{name}.pro
 # Unused file
@@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man?/%{name}.?.gz
 
 %changelog
+* Sun Sep 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.8.1-1
+- Update to 0.8.1
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1
 - Update to 0.7.1
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Aug 2009 16:11:18 -0000	1.7
+++ sources	20 Sep 2009 10:13:39 -0000	1.8
@@ -1 +1 @@
-f81077b88dafa04e9616e5d1219beb79  fotowall-0.7.1.tar.bz2
+b3e3ff78170a3fd15f08a58f60d0e3b8  Fotowall-0.8.1.tar.bz2



From eponyme at fedoraproject.org  Sun Sep 20 10:14:51 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 20 Sep 2009 10:14:51 +0000 (UTC)
Subject: rpms/fotowall/F-11 .cvsignore, 1.7, 1.8 fotowall.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20090920101451.59E9211C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22375

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Aug 2009 16:12:47 -0000	1.7
+++ .cvsignore	20 Sep 2009 10:14:51 -0000	1.8
@@ -1 +1 @@
-fotowall-0.7.1.tar.bz2
+Fotowall-0.8.1.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/fotowall.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fotowall.spec	5 Aug 2009 16:12:47 -0000	1.8
+++ fotowall.spec	20 Sep 2009 10:14:51 -0000	1.9
@@ -1,13 +1,13 @@
 Name:           fotowall
-Version:        0.7.1
+Version:        0.8.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://code.google.com/p/%{name}/
-Source0:        http://cloud.github.com/downloads/enricoros/%{name}/%{name}-%{version}.tar.bz2
+URL:            http://www.enricoros.com/opensource/fotowall/
+Source0:        http://%{name}.googlecode.com/files/Fotowall-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 4.4
@@ -19,7 +19,7 @@ in a personal way. You can add pictures,
 change colors, text, shadows, etc.. 
 
 %prep
-%setup -q
+%setup -q -n fotowall-%{version}
 # for hidden-file-or-dir warning 
 sed -i -e "s/\.build/build/" %{name}.pro
 # Unused file
@@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man?/%{name}.?.gz
 
 %changelog
+* Sun Sep 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.8.1-1
+- Update to 0.8.1
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1
 - Update to 0.7.1
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Aug 2009 16:12:47 -0000	1.7
+++ sources	20 Sep 2009 10:14:51 -0000	1.8
@@ -1 +1 @@
-f81077b88dafa04e9616e5d1219beb79  fotowall-0.7.1.tar.bz2
+b3e3ff78170a3fd15f08a58f60d0e3b8  Fotowall-0.8.1.tar.bz2



From eponyme at fedoraproject.org  Sun Sep 20 10:15:48 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 20 Sep 2009 10:15:48 +0000 (UTC)
Subject: rpms/fotowall/F-10 .cvsignore, 1.7, 1.8 fotowall.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20090920101548.F24C411C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Aug 2009 16:14:03 -0000	1.7
+++ .cvsignore	20 Sep 2009 10:15:48 -0000	1.8
@@ -1 +1 @@
-fotowall-0.7.1.tar.bz2
+Fotowall-0.8.1.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/fotowall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fotowall.spec	5 Aug 2009 16:14:03 -0000	1.7
+++ fotowall.spec	20 Sep 2009 10:15:48 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           fotowall
-Version:        0.7.1
+Version:        0.8.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://code.google.com/p/%{name}/
-Source0:        http://cloud.github.com/downloads/enricoros/%{name}/%{name}-%{version}.tar.bz2
+URL:            http://www.enricoros.com/opensource/fotowall/
+Source0:        http://%{name}.googlecode.com/files/Fotowall-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 4.4
@@ -19,7 +19,7 @@ in a personal way. You can add pictures,
 change colors, text, shadows, etc.. 
 
 %prep
-%setup -q
+%setup -q -n fotowall-%{version}
 # for hidden-file-or-dir warning 
 sed -i -e "s/\.build/build/" %{name}.pro
 # Unused file
@@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man?/%{name}.?.gz
 
 %changelog
+* Sun Sep 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.8.1-1
+- Update to 0.8.1
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1
 - Update to 0.7.1
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Aug 2009 16:14:03 -0000	1.7
+++ sources	20 Sep 2009 10:15:48 -0000	1.8
@@ -1 +1 @@
-f81077b88dafa04e9616e5d1219beb79  fotowall-0.7.1.tar.bz2
+b3e3ff78170a3fd15f08a58f60d0e3b8  Fotowall-0.8.1.tar.bz2



From epienbro at fedoraproject.org  Sun Sep 20 10:32:41 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sun, 20 Sep 2009 10:32:41 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel gtk.immodules, NONE, 1.1 gdk-pixbuf.loaders,
	1.2, 1.3 mingw32-gtk2.spec, 1.16, 1.17
Message-ID: <20090920103241.5E05111C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28167

Modified Files:
	gdk-pixbuf.loaders mingw32-gtk2.spec 
Added Files:
	gtk.immodules 
Log Message:
* Sun Sep 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-3
- Use relative paths instead of absolute paths in the gdk-pixbuf.loaders file
- Added the gtk.immodules file (BZ #522957)



--- NEW FILE gtk.immodules ---
# GTK+ Input Method Modules file
# Automatically generated file, do not edit
# Created by Z:\usr\i686-pc-mingw32\sys-root\mingw\bin\gtk-query-immodules-2.0.exe from gtk+-2.17.11
#
# ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\2.10.0\immodules;Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\i686-pc-mingw32\immodules;Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\immodules
#
"../lib/gtk-2.0/2.10.0/immodules/im-am-et.dll" 
"am_et" "Amharic (EZ+)" "gtk20" "../share/locale" "am" 

"../lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll" 
"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "../share/locale" "" 

"../lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll" 
"inuktitut" "Inuktitut (Transliterated)" "gtk20" "../share/locale" "iu" 

"../lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll" 
"cedilla" "Cedilla" "gtk20" "../share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" 

"../lib/gtk-2.0/2.10.0/immodules/im-ime.dll" 
"ime" "Windows IME" "gtk+" "" "ja:ko:zh" 

"../lib/gtk-2.0/2.10.0/immodules/im-multipress.dll" 
"multipress" "Multipress" "gtk20" "" "" 

"../lib/gtk-2.0/2.10.0/immodules/im-viqr.dll" 
"viqr" "Vietnamese (VIQR)" "gtk20" "../share/locale" "vi" 

"../lib/gtk-2.0/2.10.0/immodules/im-thai.dll" 
"thai" "Thai-Lao" "gtk20" "../share/locale" "lo:th" 

"../lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll" 
"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "../share/locale" "ti" 

"../lib/gtk-2.0/2.10.0/immodules/im-ipa.dll" 
"ipa" "IPA" "gtk20" "../share/locale" "" 

"../lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll" 
"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "../share/locale" "ti" 



Index: gdk-pixbuf.loaders
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/gdk-pixbuf.loaders,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdk-pixbuf.loaders	10 Jun 2009 19:57:01 -0000	1.2
+++ gdk-pixbuf.loaders	20 Sep 2009 10:32:41 -0000	1.3
@@ -4,19 +4,19 @@
 #
 # LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
 #
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
 "ani" 4 "gtk20" "The ANI image format" "LGPL"
 "application/x-navi-animation" ""
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
 "bmp" 5 "gtk20" "The BMP image format" "LGPL"
 "image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
 "bmp" ""
 "BM" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
 "tiff" 1 "gtk20" "The TIFF image format" "LGPL"
 "image/tiff" ""
 "tiff" "tif" ""
@@ -24,20 +24,20 @@
 "II* " "   z" 100
 "II* \020   CR\002 " "   z zzz   z" 0
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
 "gif" 4 "gtk20" "The GIF image format" "LGPL"
 "image/gif" ""
 "gif" ""
 "GIF8" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
 "ico" 5 "gtk20" "The ICO image format" "LGPL"
 "image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
 "ico" "cur" ""
 "  \001   " "zz znz" 100
 "  \002   " "zz znz" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
 "tga" 4 "gtk20" "The Targa image format" "LGPL"
 "image/x-tga" ""
 "tga" "targa" ""
@@ -48,13 +48,13 @@
 "  \n" "xz " 100
 "  \013" "xz " 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
 "jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
 "image/jpeg" ""
 "jpeg" "jpe" "jpg" ""
 "\377\330" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
 "wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
 "image/vnd.wap.wbmp" ""
 "wbmp" ""
@@ -63,26 +63,26 @@
 " @" "z " 1
 "  " "z " 1
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
 "xpm" 4 "gtk20" "The XPM image format" "LGPL"
 "image/x-xpixmap" ""
 "xpm" ""
 "/* XPM */" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
 "icns" 4 "gtk20" "The ICNS image format" "GPL"
 "image/x-icns" ""
 "icns" ""
 "icns" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
 "jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
 "image/jp2" "image/jpeg2000" "image/jpx" ""
 "jp2" "jpc" "jpx" "j2k" "jpf" ""
 "    jP" "!!!!  " 100
 "\377O\377Q" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
 "pcx" 4 "gtk20" "The PCX image format" "LGPL"
 "image/x-pcx" ""
 "pcx" ""
@@ -92,13 +92,13 @@
 "\n\004\001" "" 100
 "\n\005\001" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
 "png" 5 "gtk20" "The PNG image format" "LGPL"
 "image/png" ""
 "png" ""
 "\211PNG\r\n\032\n" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
 "pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
 "pnm" "pbm" "pgm" "ppm" ""
@@ -109,13 +109,13 @@
 "P5" "" 100
 "P6" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
 "ras" 4 "gtk20" "The Sun raster image format" "LGPL"
 "image/x-cmu-raster" "image/x-sun-raster" ""
 "ras" ""
 "Y\246j\225" "" 100
 
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
 "xbm" 4 "gtk20" "The XBM image format" "LGPL"
 "image/x-xbitmap" ""
 "xbm" ""


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mingw32-gtk2.spec	18 Sep 2009 21:25:06 -0000	1.16
+++ mingw32-gtk2.spec	20 Sep 2009 10:32:41 -0000	1.17
@@ -7,7 +7,7 @@
 
 Name:           mingw32-gtk2
 Version:        2.17.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -21,6 +21,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
 Source1:        gdk-pixbuf.loaders
 
+# wine %{_mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
+Source2:        gtk.immodules
+
 # Patch to fix the translations detection (got broken in GTK 2.17.11)
 Patch0:         gtk2-fix-install.patch
 
@@ -132,9 +135,10 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-win32-2.0.def
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gailutil.def
 
-# Install gdk-pixbuf.loaders.
+# Install gdk-pixbuf.loaders and gtk.immodules
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
 
 %find_lang %{name} --all-name
 
@@ -338,6 +342,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-3
+- Use relative paths instead of absolute paths in the gdk-pixbuf.loaders file
+- Added the gtk.immodules file (BZ #522957)
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-2
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 



From cdamian at fedoraproject.org  Sun Sep 20 10:46:03 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun, 20 Sep 2009 10:46:03 +0000 (UTC)
Subject: rpms/mediawiki-wikicalendar/devel .cvsignore, 1.2,
	1.3 mediawiki-wikicalendar.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090920104604.2D45111C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/mediawiki-wikicalendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32744

Modified Files:
	.cvsignore mediawiki-wikicalendar.spec sources 
Log Message:
updated to version 1.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 11:27:39 -0000	1.2
+++ .cvsignore	20 Sep 2009 10:46:02 -0000	1.3
@@ -1 +1 @@
-wikicalendar-1.15.tar.gz
+wikicalendar-1.16.tar.gz


Index: mediawiki-wikicalendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/devel/mediawiki-wikicalendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mediawiki-wikicalendar.spec	25 Jul 2009 12:01:31 -0000	1.2
+++ mediawiki-wikicalendar.spec	20 Sep 2009 10:46:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mediawiki-wikicalendar
-Version:        1.15
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Simple calendar extension for mediawiki
 
 Group:          Applications/Internet
@@ -34,14 +34,17 @@ install -cpm 644 calendar/*.php $RPM_BUI
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-	
+
 %files
 %defattr(-,root,root,-)
 %{_datadir}/mediawiki/extensions/calendar
 %doc ChangeLog README LICENSE
 
-	
+
 %changelog
+* Sun Sep 20 2009 Christof Damian <christof at damian.net> 1.16-1
+- updated to version 1.16
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 11:27:39 -0000	1.2
+++ sources	20 Sep 2009 10:46:02 -0000	1.3
@@ -1 +1 @@
-f99d5fa46be90862952e8f914e217f4d  wikicalendar-1.15.tar.gz
+5392b055ba84bdd8aec37f65b8bb6160  wikicalendar-1.16.tar.gz



From pjp at fedoraproject.org  Sun Sep 20 10:48:17 2009
From: pjp at fedoraproject.org (pjp)
Date: Sun, 20 Sep 2009 10:48:17 +0000 (UTC)
Subject: rpms/pem/EL-4 .cvsignore,1.6,1.7 pem.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20090920104817.71F2511C00E6@cvs1.fedora.phx.redhat.com>

Author: pjp

Update of /cvs/pkgs/rpms/pem/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1271

Modified Files:
	.cvsignore pem.spec sources 
Log Message:
Pem became a GNU package. Upgrade to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pem/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Jul 2009 10:24:56 -0000	1.6
+++ .cvsignore	20 Sep 2009 10:48:17 -0000	1.7
@@ -1 +1 @@
-pem-0.7.7.tar.gz
+pem-0.7.8.tar.gz


Index: pem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pem/EL-4/pem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pem.spec	13 Jul 2009 10:24:57 -0000	1.7
+++ pem.spec	20 Sep 2009 10:48:17 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           pem
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
-Summary:        Personal Expenses Manager
+Summary:        GNU personal expenses manager
 
 Group:          Applications/Productivity
-License:        GPLv2 
-URL:            http://pjp.dgplug.org/tools/ 
-Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz 
+License:        GPLv3+
+URL:            http://pjp.dgplug.org/tools/
+Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,9 +16,9 @@ Requires(preun): info
 
 
 %description
-Pem, is a personal expenses manager. Pem lets keep track of 
-personal income and expense in an extremely elegant manner.
-On Linux like systems, Pem works by storing the details in
+GNU Pem is a personal expenses manager. Pem helps you to keep track
+of personal income and expenses in an extremely elegant style.
+On GNU/Linux like systems, Pem works by storing the details in
 a CSV file, placed in the  ~/.pem directory under your $HOME
 directory; On Windows, the same file is placed in pem directory,
 under the USERPROFILE directory. Each such file is named after
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING NEWS ChangeLog
 %{_bindir}/pem
 %{_mandir}/man1/pem.*
 %{_infodir}/pem.*
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.8-1
+- Pem became an official GNU package, GNU Pem.
+
 * Mon Jul 13 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.7-1
 - Fixed a minor bug and did few changes recommended by PBP.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pem/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Jul 2009 10:24:57 -0000	1.7
+++ sources	20 Sep 2009 10:48:17 -0000	1.8
@@ -1 +1 @@
-57e2ae21bdb52e7e7b03cc017f0dc0cd  pem-0.7.7.tar.gz
+289c62718f863c7a21422c778aa3153e  pem-0.7.8.tar.gz



From pjp at fedoraproject.org  Sun Sep 20 10:56:59 2009
From: pjp at fedoraproject.org (pjp)
Date: Sun, 20 Sep 2009 10:56:59 +0000 (UTC)
Subject: rpms/pem/EL-5 .cvsignore,1.4,1.5 pem.spec,1.4,1.5 sources,1.6,1.7
Message-ID: <20090920105659.A6B6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: pjp

Update of /cvs/pkgs/rpms/pem/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5096

Modified Files:
	.cvsignore pem.spec sources 
Log Message:
Pem became a GNU package. Upgrade to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pem/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Jul 2009 10:32:53 -0000	1.4
+++ .cvsignore	20 Sep 2009 10:56:59 -0000	1.5
@@ -1 +1 @@
-pem-0.7.7.tar.gz
+pem-0.7.8.tar.gz


Index: pem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pem/EL-5/pem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pem.spec	13 Jul 2009 10:32:53 -0000	1.4
+++ pem.spec	20 Sep 2009 10:56:59 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           pem
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
-Summary:        Personal Expenses Manager
+Summary:        GNU personal expenses manager
 
 Group:          Applications/Productivity
-License:        GPLv2 
-URL:            http://pjp.dgplug.org/tools/ 
-Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz 
+License:        GPLv3+
+URL:            http://pjp.dgplug.org/tools/
+Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,9 +16,9 @@ Requires(preun): info
 
 
 %description
-Pem, is a personal expenses manager. Pem lets keep track of 
-personal income and expense in an extremely elegant manner.
-On Linux like systems, Pem works by storing the details in
+GNU Pem is a personal expenses manager. Pem helps you to keep track
+of personal income and expenses in an extremely elegant style.
+On GNU/Linux like systems, Pem works by storing the details in
 a CSV file, placed in the  ~/.pem directory under your $HOME
 directory; On Windows, the same file is placed in pem directory,
 under the USERPROFILE directory. Each such file is named after
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING NEWS ChangeLog
 %{_bindir}/pem
 %{_mandir}/man1/pem.*
 %{_infodir}/pem.*
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.8-1
+- Pem became an official GNU package, GNU Pem.
+
 * Mon Jul 13 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.7-1
 - Fixed a minor bug and did few changes recommended by PBP.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pem/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Jul 2009 10:32:53 -0000	1.6
+++ sources	20 Sep 2009 10:56:59 -0000	1.7
@@ -1 +1 @@
-57e2ae21bdb52e7e7b03cc017f0dc0cd  pem-0.7.7.tar.gz
+289c62718f863c7a21422c778aa3153e  pem-0.7.8.tar.gz



From pjp at fedoraproject.org  Sun Sep 20 11:10:45 2009
From: pjp at fedoraproject.org (pjp)
Date: Sun, 20 Sep 2009 11:10:45 +0000 (UTC)
Subject: rpms/pem/F-10 .cvsignore,1.6,1.7 pem.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20090920111045.76ABD11C0419@cvs1.fedora.phx.redhat.com>

Author: pjp

Update of /cvs/pkgs/rpms/pem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8821

Modified Files:
	.cvsignore pem.spec sources 
Log Message:
Pem became a GNU package. Upgrade to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Jul 2009 10:09:53 -0000	1.6
+++ .cvsignore	20 Sep 2009 11:10:45 -0000	1.7
@@ -1 +1 @@
-pem-0.7.7.tar.gz
+pem-0.7.8.tar.gz


Index: pem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-10/pem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pem.spec	13 Jul 2009 10:09:53 -0000	1.8
+++ pem.spec	20 Sep 2009 11:10:45 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           pem
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
-Summary:        Personal Expenses Manager
+Summary:        GNU personal expenses manager
 
 Group:          Applications/Productivity
-License:        GPLv2 
-URL:            http://pjp.dgplug.org/tools/ 
-Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz 
+License:        GPLv3+
+URL:            http://pjp.dgplug.org/tools/
+Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,9 +16,9 @@ Requires(preun): info
 
 
 %description
-Pem, is a personal expenses manager. Pem lets keep track of 
-personal income and expense in an extremely elegant manner.
-On Linux like systems, Pem works by storing the details in
+GNU Pem is a personal expenses manager. Pem helps you to keep track
+of personal income and expenses in an extremely elegant style.
+On GNU/Linux like systems, Pem works by storing the details in
 a CSV file, placed in the  ~/.pem directory under your $HOME
 directory; On Windows, the same file is placed in pem directory,
 under the USERPROFILE directory. Each such file is named after
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING NEWS ChangeLog
 %{_bindir}/pem
 %{_mandir}/man1/pem.*
 %{_infodir}/pem.*
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.8-1
+- Pem became an official GNU package, GNU Pem.
+
 * Mon Jul 13 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.7-1
 - Fixed a minor bug and did few changes recommended by PBP.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Jul 2009 10:09:53 -0000	1.7
+++ sources	20 Sep 2009 11:10:45 -0000	1.8
@@ -1 +1 @@
-57e2ae21bdb52e7e7b03cc017f0dc0cd  pem-0.7.7.tar.gz
+289c62718f863c7a21422c778aa3153e  pem-0.7.8.tar.gz



From lkundrak at fedoraproject.org  Sun Sep 20 11:17:37 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Sep 2009 11:17:37 +0000 (UTC)
Subject: rpms/v4l2-tool/devel v4l2-tool-1.0.3-lsusb.patch, NONE,
	1.1 v4l2-tool.spec, 1.6, 1.7
Message-ID: <20090920111737.E04C711C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/v4l2-tool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10695

Modified Files:
	v4l2-tool.spec 
Added Files:
	v4l2-tool-1.0.3-lsusb.patch 
Log Message:
* Sun Sep 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0.3-5
- Correct path to lsusb


v4l2-tool-1.0.3-lsusb.patch:
 interface.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE v4l2-tool-1.0.3-lsusb.patch ---
Correct path to lsusb
Lubomir Rintel <lkundrak at v3.sk>

diff -up v4l2-tool-1.0.3/src/interface.c.lsusb v4l2-tool-1.0.3/src/interface.c
--- v4l2-tool-1.0.3/src/interface.c.lsusb	2009-09-20 13:15:56.199876752 +0200
+++ v4l2-tool-1.0.3/src/interface.c	2009-09-20 13:15:56.234996207 +0200
@@ -206,7 +206,7 @@ on_lsusb_button_clicked                (
   char *fileName="/tmp/usbfile";
   gchar *text;  gsize length;
 
-  rread=system("/sbin/lsusb | grep -v 0000  > /tmp/usbfile");
+  rread=system("/usr/sbin/lsusb | grep -v 0000  > /tmp/usbfile");
   lsusbwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_policy(GTK_WINDOW(lsusbwindow), FALSE, TRUE, TRUE);
   gtk_window_set_title (GTK_WINDOW(lsusbwindow), _("lsusb - USB Device Information"));


Index: v4l2-tool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/v4l2-tool/devel/v4l2-tool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- v4l2-tool.spec	27 Jul 2009 06:42:24 -0000	1.6
+++ v4l2-tool.spec	20 Sep 2009 11:17:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           v4l2-tool
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        This package gives v4l2 device information of webcam
 
 Group:          Applications/Multimedia
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://v4lx-devinfo.sf.net/
 Source0:        http://downloads.sourceforge.net/v4lx-devinfo/%{name}-%{version}.tar.gz
 Patch0:         db.patch
+Patch1:         v4l2-tool-1.0.3-lsusb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libgnomeui-devel
 BuildRequires:  automake
@@ -23,6 +24,7 @@ ioctl call and returning respective stru
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .db
+%patch1 -p1 -b .lsusb
 
 %build
 sh autogen.sh
@@ -68,6 +70,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/fedora-v4l2-tool.desktop
 
 %changelog
+* Sun Sep 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0.3-5
+- Correct path to lsusb
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cdamian at fedoraproject.org  Sun Sep 20 11:18:55 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun, 20 Sep 2009 11:18:55 +0000 (UTC)
Subject: rpms/mediawiki-wikicalendar/F-10 .cvsignore, 1.2,
	1.3 mediawiki-wikicalendar.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090920111855.DF4EB11C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11186

Modified Files:
	.cvsignore mediawiki-wikicalendar.spec sources 
Log Message:
updated to version 1.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 11:29:52 -0000	1.2
+++ .cvsignore	20 Sep 2009 11:18:55 -0000	1.3
@@ -1 +1 @@
-wikicalendar-1.15.tar.gz
+wikicalendar-1.16.tar.gz


Index: mediawiki-wikicalendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10/mediawiki-wikicalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mediawiki-wikicalendar.spec	1 Mar 2009 11:29:52 -0000	1.1
+++ mediawiki-wikicalendar.spec	20 Sep 2009 11:18:55 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           mediawiki-wikicalendar
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Simple calendar extension for mediawiki
 
@@ -34,14 +34,17 @@ install -cpm 644 calendar/*.php $RPM_BUI
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-	
+
 %files
 %defattr(-,root,root,-)
 %{_datadir}/mediawiki/extensions/calendar
 %doc ChangeLog README LICENSE
 
-	
+
 %changelog
+* Sun Sep 20 2009 Christof Damian <christof at damian.net> 1.16-1
+- updated to version 1.16
+
 * Fri Feb 27 2009 Christof Damian <christof at damian.net> 1.15-1
 - updated to version 1.15
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 11:29:52 -0000	1.2
+++ sources	20 Sep 2009 11:18:55 -0000	1.3
@@ -1 +1 @@
-f99d5fa46be90862952e8f914e217f4d  wikicalendar-1.15.tar.gz
+5392b055ba84bdd8aec37f65b8bb6160  wikicalendar-1.16.tar.gz



From pjp at fedoraproject.org  Sun Sep 20 11:21:11 2009
From: pjp at fedoraproject.org (pjp)
Date: Sun, 20 Sep 2009 11:21:11 +0000 (UTC)
Subject: rpms/pem/F-11 .cvsignore,1.6,1.7 pem.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20090920112111.6C15D11C00E6@cvs1.fedora.phx.redhat.com>

Author: pjp

Update of /cvs/pkgs/rpms/pem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11781

Modified Files:
	.cvsignore pem.spec sources 
Log Message:
Pem became a GNU package. Upgrade to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Jul 2009 10:17:47 -0000	1.6
+++ .cvsignore	20 Sep 2009 11:21:11 -0000	1.7
@@ -1 +1 @@
-pem-0.7.7.tar.gz
+pem-0.7.8.tar.gz


Index: pem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-11/pem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pem.spec	13 Jul 2009 10:17:47 -0000	1.9
+++ pem.spec	20 Sep 2009 11:21:11 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           pem
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
-Summary:        Personal Expenses Manager
+Summary:        GNU personal expenses manager
 
 Group:          Applications/Productivity
-License:        GPLv2 
-URL:            http://pjp.dgplug.org/tools/ 
-Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz 
+License:        GPLv3+
+URL:            http://pjp.dgplug.org/tools/
+Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,9 +16,9 @@ Requires(preun): info
 
 
 %description
-Pem, is a personal expenses manager. Pem lets keep track of 
-personal income and expense in an extremely elegant manner.
-On Linux like systems, Pem works by storing the details in
+GNU Pem is a personal expenses manager. Pem helps you to keep track
+of personal income and expenses in an extremely elegant style.
+On GNU/Linux like systems, Pem works by storing the details in
 a CSV file, placed in the  ~/.pem directory under your $HOME
 directory; On Windows, the same file is placed in pem directory,
 under the USERPROFILE directory. Each such file is named after
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING NEWS ChangeLog
 %{_bindir}/pem
 %{_mandir}/man1/pem.*
 %{_infodir}/pem.*
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.8-1
+- Pem became an official GNU package, GNU Pem.
+
 * Mon Jul 13 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.7-1
 - Fixed a minor bug and did few changes recommended by PBP.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Jul 2009 10:17:47 -0000	1.7
+++ sources	20 Sep 2009 11:21:11 -0000	1.8
@@ -1 +1 @@
-57e2ae21bdb52e7e7b03cc017f0dc0cd  pem-0.7.7.tar.gz
+289c62718f863c7a21422c778aa3153e  pem-0.7.8.tar.gz



From pjp at fedoraproject.org  Sun Sep 20 11:27:48 2009
From: pjp at fedoraproject.org (pjp)
Date: Sun, 20 Sep 2009 11:27:48 +0000 (UTC)
Subject: rpms/pem/F-9 .cvsignore,1.5,1.6 pem.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20090920112748.921B111C00E6@cvs1.fedora.phx.redhat.com>

Author: pjp

Update of /cvs/pkgs/rpms/pem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14467

Modified Files:
	.cvsignore pem.spec sources 
Log Message:
Pem became a GNU package. Upgrade to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Jul 2009 10:03:06 -0000	1.5
+++ .cvsignore	20 Sep 2009 11:27:48 -0000	1.6
@@ -1 +1 @@
-pem-0.7.7.tar.gz
+pem-0.7.8.tar.gz


Index: pem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-9/pem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pem.spec	13 Jul 2009 10:03:07 -0000	1.7
+++ pem.spec	20 Sep 2009 11:27:48 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           pem
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
-Summary:        Personal Expenses Manager
+Summary:        GNU personal expenses manager
 
 Group:          Applications/Productivity
-License:        GPLv2 
-URL:            http://pjp.dgplug.org/tools/ 
-Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz 
+License:        GPLv3+
+URL:            http://pjp.dgplug.org/tools/
+Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,9 +16,9 @@ Requires(preun): info
 
 
 %description
-Pem, is a personal expenses manager. Pem lets keep track of 
-personal income and expense in an extremely elegant manner.
-On Linux like systems, Pem works by storing the details in
+GNU Pem is a personal expenses manager. Pem helps you to keep track
+of personal income and expenses in an extremely elegant style.
+On GNU/Linux like systems, Pem works by storing the details in
 a CSV file, placed in the  ~/.pem directory under your $HOME
 directory; On Windows, the same file is placed in pem directory,
 under the USERPROFILE directory. Each such file is named after
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING NEWS ChangeLog
 %{_bindir}/pem
 %{_mandir}/man1/pem.*
 %{_infodir}/pem.*
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.8-1
+- Pem became an official GNU package, GNU Pem.
+
 * Mon Jul 13 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.7-1
 - Fixed a minor bug and did few changes recommended by PBP.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Jul 2009 10:03:07 -0000	1.7
+++ sources	20 Sep 2009 11:27:48 -0000	1.8
@@ -1 +1 @@
-57e2ae21bdb52e7e7b03cc017f0dc0cd  pem-0.7.7.tar.gz
+289c62718f863c7a21422c778aa3153e  pem-0.7.8.tar.gz



From cdamian at fedoraproject.org  Sun Sep 20 11:33:53 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun, 20 Sep 2009 11:33:53 +0000 (UTC)
Subject: rpms/mediawiki-wikicalendar/EL-5 .cvsignore, 1.2,
	1.3 mediawiki-wikicalendar.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090920113353.4304D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16980

Modified Files:
	.cvsignore mediawiki-wikicalendar.spec sources 
Log Message:
updated to version 1.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 11:32:23 -0000	1.2
+++ .cvsignore	20 Sep 2009 11:33:52 -0000	1.3
@@ -1 +1 @@
-wikicalendar-1.15.tar.gz
+wikicalendar-1.16.tar.gz


Index: mediawiki-wikicalendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5/mediawiki-wikicalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mediawiki-wikicalendar.spec	1 Mar 2009 11:32:24 -0000	1.1
+++ mediawiki-wikicalendar.spec	20 Sep 2009 11:33:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           mediawiki-wikicalendar
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Simple calendar extension for mediawiki
 
@@ -34,14 +34,17 @@ install -cpm 644 calendar/*.php $RPM_BUI
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-	
+
 %files
 %defattr(-,root,root,-)
 %{_datadir}/mediawiki/extensions/calendar
 %doc ChangeLog README LICENSE
 
-	
+
 %changelog
+* Sun Sep 20 2009 Christof Damian <christof at damian.net> 1.16-1
+- updated to version 1.16
+
 * Fri Feb 27 2009 Christof Damian <christof at damian.net> 1.15-1
 - updated to version 1.15
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 11:32:24 -0000	1.2
+++ sources	20 Sep 2009 11:33:53 -0000	1.3
@@ -1 +1 @@
-f99d5fa46be90862952e8f914e217f4d  wikicalendar-1.15.tar.gz
+5392b055ba84bdd8aec37f65b8bb6160  wikicalendar-1.16.tar.gz



From abompard at fedoraproject.org  Sun Sep 20 11:35:37 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 20 Sep 2009 11:35:37 +0000 (UTC)
Subject: rpms/spring/F-11 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 spring.spec,
	1.7, 1.8
Message-ID: <20090920113537.96A5F11C00E6@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17486/F-11

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
- New release: 0.80.4.2 (bugfix)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Sep 2009 05:27:12 -0000	1.6
+++ .cvsignore	20 Sep 2009 11:35:37 -0000	1.7
@@ -1 +1 @@
-spring_0.80.4.1_src.tar.lzma
+spring_0.80.4.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Sep 2009 05:27:12 -0000	1.6
+++ sources	20 Sep 2009 11:35:37 -0000	1.7
@@ -1 +1 @@
-e37ee73567012d3e4fa9931cddb8088a  spring_0.80.4.1_src.tar.lzma
+4c67e82316b282e313b84a1f48b6e90d  spring_0.80.4.2_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- spring.spec	5 Sep 2009 05:27:12 -0000	1.7
+++ spring.spec	20 Sep 2009 11:35:37 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4.1
+Version:        0.80.4.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -21,7 +21,7 @@ Patch0:         spring-0.80.2-allegro.pa
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake SDL-devel openal-devel boost-devel DevIL-devel
+BuildRequires:  cmake SDL-devel openal-soft-devel boost-devel DevIL-devel
 BuildRequires:  glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:  freetype-devel python-devel allegro-devel zip
 BuildRequires:  java-devel-openjdk
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
+- New release: 0.80.4.2 (bugfix)
+
 * Sat Sep 05 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.1-1
 - New release: 0.80.4.1 (bugfix)
 



From abompard at fedoraproject.org  Sun Sep 20 11:35:37 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 20 Sep 2009 11:35:37 +0000 (UTC)
Subject: rpms/spring/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 spring.spec,
	1.9, 1.10
Message-ID: <20090920113537.C4DD811C00E6@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17486/devel

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
- New release: 0.80.4.2 (bugfix)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Sep 2009 05:51:02 -0000	1.7
+++ .cvsignore	20 Sep 2009 11:35:37 -0000	1.8
@@ -1 +1 @@
-spring_0.80.4.1_src.tar.lzma
+spring_0.80.4.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Sep 2009 05:51:02 -0000	1.7
+++ sources	20 Sep 2009 11:35:37 -0000	1.8
@@ -1 +1 @@
-e37ee73567012d3e4fa9931cddb8088a  spring_0.80.4.1_src.tar.lzma
+4c67e82316b282e313b84a1f48b6e90d  spring_0.80.4.2_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- spring.spec	5 Sep 2009 05:51:02 -0000	1.9
+++ spring.spec	20 Sep 2009 11:35:37 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4.1
+Version:        0.80.4.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
+- New release: 0.80.4.2 (bugfix)
+
 * Sat Sep 05 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.1-1
 - New release: 0.80.4.1 (bugfix)
 



From dwalsh at fedoraproject.org  Sun Sep 20 11:43:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun, 20 Sep 2009 11:43:06 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.57,
	1.58 libsemanage.spec, 1.185, 1.186
Message-ID: <20090920114306.37FF511C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20295

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-2
- Dont relabel /root with genhomedircon


libsemanage-rhat.patch:
 include/semanage/modules.h |    5 +
 src/conf-parse.y           |    2 
 src/direct_api.c           |  119 +++++++++++++++++++++++++++++++++++++++++++--
 src/genhomedircon.c        |    7 ++
 src/libsemanage.map        |    3 +
 src/module_internal.h      |    1 
 src/modules.c              |   41 +++++++++++++++
 src/modules.h              |    1 
 src/policy.h               |    6 ++
 src/semanage.conf          |    2 
 src/semanage_store.c       |   60 ++++++++++++++++++----
 src/semanage_store.h       |    2 
 12 files changed, 232 insertions(+), 17 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- libsemanage-rhat.patch	17 Sep 2009 13:02:59 -0000	1.57
+++ libsemanage-rhat.patch	20 Sep 2009 11:43:05 -0000	1.58
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.37/include/semanage/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.38/include/semanage/modules.h
 --- nsalibsemanage/include/semanage/modules.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.37/include/semanage/modules.h	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/include/semanage/modules.h	2009-09-20 07:35:51.000000000 -0400
 @@ -40,10 +40,12 @@
  				 char *module_data, size_t data_len);
  int semanage_module_install_base_file(semanage_handle_t *,
@@ -22,9 +22,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +int semanage_module_get_enabled(semanage_module_info_t *);
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-2.0.37/src/conf-parse.y
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-2.0.38/src/conf-parse.y
 --- nsalibsemanage/src/conf-parse.y	2009-08-05 15:10:56.000000000 -0400
-+++ libsemanage-2.0.37/src/conf-parse.y	2009-09-09 13:55:50.000000000 -0400
++++ libsemanage-2.0.38/src/conf-parse.y	2009-09-20 07:35:51.000000000 -0400
 @@ -263,7 +263,7 @@
  	     calloc(1, sizeof(*(current_conf->load_policy)))) == NULL) {
  		return -1;
@@ -34,9 +34,9 @@ diff --exclude-from=exclude -N -u -r nsa
  		return -1;
  	}
  	conf->load_policy->args = NULL;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.37/src/direct_api.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.38/src/direct_api.c
 --- nsalibsemanage/src/direct_api.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.37/src/direct_api.c	2009-09-10 17:15:32.000000000 -0400
++++ libsemanage-2.0.38/src/direct_api.c	2009-09-20 07:35:51.000000000 -0400
 @@ -66,6 +66,8 @@
  static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
  					size_t data_len);
@@ -208,9 +208,33 @@ diff --exclude-from=exclude -N -u -r nsa
  			(*num_modules)++;
  		} else {
  			/* file was not a module, so don't report it */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.37/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.38/src/genhomedircon.c
+--- nsalibsemanage/src/genhomedircon.c	2009-09-17 08:59:43.000000000 -0400
++++ libsemanage-2.0.38/src/genhomedircon.c	2009-09-20 07:41:58.000000000 -0400
+@@ -310,6 +310,10 @@
+ 		}
+ 		if (strcmp(pwbuf->pw_dir, "/") == 0)
+ 			continue;
++		if (strcmp(pwbuf->pw_dir, "/root") == 0) {
++			continue;
++		}
++
+ 		if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
+ 			continue;
+ 		if (!(path = strdup(pwbuf->pw_dir))) {
+@@ -803,6 +807,9 @@
+ 			 * /root */
+ 			continue;
+ 		}
++		if (strcmp(pwent->pw_dir, "/root") == 0) {
++			continue;
++		}
+ 		if (push_user_entry(&head, name, seuname,
+ 				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
+ 			*errors = STATUS_ERR;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.38/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.37/src/libsemanage.map	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/libsemanage.map	2009-09-20 07:35:51.000000000 -0400
 @@ -6,10 +6,13 @@
  	  semanage_module_install; semanage_module_install_file;
  	  semanage_module_upgrade; semanage_module_upgrade_file;
@@ -225,9 +249,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	  semanage_reload_policy; semanage_set_reload; semanage_set_rebuild;
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.37/src/module_internal.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.38/src/module_internal.h
 --- nsalibsemanage/src/module_internal.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.37/src/module_internal.h	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/module_internal.h	2009-09-20 07:35:51.000000000 -0400
 @@ -6,6 +6,7 @@
  
  hidden_proto(semanage_module_get_name)
@@ -236,10 +260,10 @@ diff --exclude-from=exclude -N -u -r nsa
      hidden_proto(semanage_module_info_datum_destroy)
      hidden_proto(semanage_module_list_nth)
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.37/src/modules.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.38/src/modules.c
 --- nsalibsemanage/src/modules.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.37/src/modules.c	2009-09-10 17:15:42.000000000 -0400
-@@ -154,6 +153,40 @@
++++ libsemanage-2.0.38/src/modules.c	2009-09-20 07:35:51.000000000 -0400
+@@ -154,6 +154,40 @@
  	return sh->funcs->install_base_file(sh, module_name);
  }
  
@@ -280,7 +304,7 @@ diff --exclude-from=exclude -N -u -r nsa
  int semanage_module_remove(semanage_handle_t * sh, char *module_name)
  {
  	if (sh->funcs->remove == NULL) {
-@@ -209,6 +242,13 @@
+@@ -209,6 +243,13 @@
  
  hidden_def(semanage_module_get_name)
  
@@ -294,9 +318,9 @@ diff --exclude-from=exclude -N -u -r nsa
  const char *semanage_module_get_version(semanage_module_info_t * modinfo)
  {
  	return modinfo->version;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.37/src/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.38/src/modules.h
 --- nsalibsemanage/src/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.37/src/modules.h	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/modules.h	2009-09-20 07:35:51.000000000 -0400
 @@ -26,6 +26,7 @@
  struct semanage_module_info {
  	char *name;		/* Key */
@@ -305,9 +329,9 @@ diff --exclude-from=exclude -N -u -r nsa
  };
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.37/src/policy.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.38/src/policy.h
 --- nsalibsemanage/src/policy.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.37/src/policy.h	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/policy.h	2009-09-20 07:35:51.000000000 -0400
 @@ -58,6 +58,12 @@
  	/* Upgrade a policy module */
  	int (*upgrade_file) (struct semanage_handle *, const char *);
@@ -321,18 +345,18 @@ diff --exclude-from=exclude -N -u -r nsa
  	/* Remove a policy module */
  	int (*remove) (struct semanage_handle *, char *);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.37/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.38/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.37/src/semanage.conf	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/semanage.conf	2009-09-20 07:35:51.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.37/src/semanage_store.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.38/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2009-08-05 15:10:56.000000000 -0400
-+++ libsemanage-2.0.37/src/semanage_store.c	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/semanage_store.c	2009-09-20 07:35:51.000000000 -0400
 @@ -57,6 +57,8 @@
  
  #include "debug.h"
@@ -435,9 +459,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	    -1 || semanage_load_module(sh, base_filename, base) == -1) {
  		goto cleanup;
  	}
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.37/src/semanage_store.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.38/src/semanage_store.h
 --- nsalibsemanage/src/semanage_store.h	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.37/src/semanage_store.h	2009-09-09 13:55:07.000000000 -0400
++++ libsemanage-2.0.38/src/semanage_store.h	2009-09-20 07:35:51.000000000 -0400
 @@ -128,4 +128,6 @@
  		     size_t buf_len,
  		     char **sorted_buf, size_t * sorted_buf_len);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- libsemanage.spec	17 Sep 2009 13:02:59 -0000	1.185
+++ libsemanage.spec	20 Sep 2009 11:43:05 -0000	1.186
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.38
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-2
+- Dont relabel /root with genhomedircon
+
 * Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-1
 - Update to upstream
 	* Change semodule upgrade behavior to install even if the module



From rathann at fedoraproject.org  Sun Sep 20 12:52:36 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 20 Sep 2009 12:52:36 +0000 (UTC)
Subject: rpms/mkvtoolnix/F-11 .cvsignore, 1.12, 1.13 mkvtoolnix.spec, 1.27, 
	1.28 sources, 1.12, 1.13
Message-ID: <20090920125236.E1A8711C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9561

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.8-1
- updated to 2.9.8
- improved summary and description for gui subpackage
- fixed installation of tools



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Apr 2009 20:13:48 -0000	1.12
+++ .cvsignore	20 Sep 2009 12:52:36 -0000	1.13
@@ -1 +1 @@
-mkvtoolnix-2.6.0.tar.bz2
+mkvtoolnix-2.9.8.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-11/mkvtoolnix.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mkvtoolnix.spec	6 Apr 2009 20:13:48 -0000	1.27
+++ mkvtoolnix.spec	20 Sep 2009 12:52:36 -0000	1.28
@@ -1,12 +1,13 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.6.0
+Version: 2.9.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
+Patch0: %{name}-noman.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -28,16 +29,20 @@ Mkvtoolnix is a set of utilities to mux 
 streams into and from Matroska containers.
 
 %package gui
-Summary: Mkvtoolnix GUI
+Summary: Graphical interface for Matroska container manipulation
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: hicolor-icon-theme
 
 %description gui
-GUI for mkvtoolnix.
+Mkvtoolnix is a set of utilities to mux and demux audio, video and subtitle
+streams into and from Matroska containers.
+
+This package contains the graphical interface for these utilities.
 
 %prep
 %setup -q
+%patch0 -p1 -b .noman
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -94,7 +99,6 @@ gtk-update-icon-cache --quiet %{_datadir
 %attr(755,root,root) %{_bindir}/mkvextract
 %attr(755,root,root) %{_bindir}/mkvmerge
 %attr(755,root,root) %{_bindir}/vc1parser
-%{_mandir}/man1/base64tool*
 %{_mandir}/man1/mkvextract*
 %{_mandir}/man1/mkvmerge*
 
@@ -112,6 +116,11 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.8-1
+- updated to 2.9.8
+- improved summary and description for gui subpackage
+- fixed installation of tools
+
 * Mon Apr 06 2009 Dominik Mierzejewski <rpm at greysector.net> 2.6.0-1
 - updated to 2.6.0
 - dropped upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Apr 2009 20:13:48 -0000	1.12
+++ sources	20 Sep 2009 12:52:36 -0000	1.13
@@ -1 +1 @@
-034e6c4a11b4a9536d250a309c16be85  mkvtoolnix-2.6.0.tar.bz2
+7b049aa43c6b39dfcb19f5a46d5574ac  mkvtoolnix-2.9.8.tar.bz2



From rathann at fedoraproject.org  Sun Sep 20 12:52:57 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 20 Sep 2009 12:52:57 +0000 (UTC)
Subject: rpms/mkvtoolnix/F-11 mkvtoolnix-noman.patch,NONE,1.1
Message-ID: <20090920125257.A77B011C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9656

Added Files:
	mkvtoolnix-noman.patch 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.8-1
- updated to 2.9.8
- improved summary and description for gui subpackage
- fixed installation of tools


mkvtoolnix-noman.patch:
 Makefile |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE mkvtoolnix-noman.patch ---
diff -up mkvtoolnix-2.9.8/src/tools/Makefile.noman mkvtoolnix-2.9.8/src/tools/Makefile
--- mkvtoolnix-2.9.8/src/tools/Makefile.noman	2009-08-13 12:32:50.000000000 +0200
+++ mkvtoolnix-2.9.8/src/tools/Makefile	2009-08-26 03:00:59.698084017 +0200
@@ -3,7 +3,6 @@ all_with_tools:
 
 APPLICATIONS += src/tools/base64tool$(EXEEXT) src/tools/diracparser$(EXEEXT) src/tools/vc1parser$(EXEEXT) src/tools/ebml_validator$(EXEEXT)
 ALL_SOURCES  += $(wildcard src/tools/*.cpp)
-MANPAGES     +=  doc/base64tool.1
 
 vc1parser_SOURCES = src/tools/vc1parser.cpp
 vc1parser_OBJECTS = $(patsubst %.cpp,%.o,$(vc1parser_SOURCES))



From abbot at fedoraproject.org  Sun Sep 20 12:53:28 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Sun, 20 Sep 2009 12:53:28 +0000 (UTC)
Subject: rpms/mitter/devel .cvsignore, 1.2, 1.3 mitter.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090920125328.805B411C00E6@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/mitter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9849

Modified Files:
	.cvsignore mitter.spec sources 
Log Message:
update to upstream mitter-0.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Dec 2008 12:29:01 -0000	1.2
+++ .cvsignore	20 Sep 2009 12:53:28 -0000	1.3
@@ -1 +1 @@
-mitter-0.4.3.tar.gz
+mitter-0.4.5.tar.gz


Index: mitter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/devel/mitter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mitter.spec	25 Jul 2009 14:35:13 -0000	1.3
+++ mitter.spec	20 Sep 2009 12:53:28 -0000	1.4
@@ -3,8 +3,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           mitter
-Version:        0.4.3
-Release:        3%{?dist}
+Version:        0.4.5
+Release:        1%{?dist}
 Summary:        A maemo/GTK+ client for twitter
 
 Group:          Applications/Internet
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING THANKS
 
 %changelog
+* Sun Sep 20 2009 Lev Shamardin <shamardin at gmail.com> - 0.4.5-1
+- Updated to upstream version 0.4.5.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Dec 2008 12:29:01 -0000	1.2
+++ sources	20 Sep 2009 12:53:28 -0000	1.3
@@ -1 +1 @@
-609026e2b9c0531df2e89b711ea778be  mitter-0.4.3.tar.gz
+0432f3d2d00e8d048bf0839e2d857e51  mitter-0.4.5.tar.gz



From cwickert at fedoraproject.org  Sun Sep 20 13:15:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 13:15:24 +0000 (UTC)
Subject: rpms/xfwm4/F-11 xfwm4.spec,1.37,1.38
Message-ID: <20090920131524.E2DCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16205/F-11

Modified Files:
	xfwm4.spec 
Log Message:
* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
- Validate *.desktop files



Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/F-11/xfwm4.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xfwm4.spec	20 Sep 2009 05:22:58 -0000	1.37
+++ xfwm4.spec	20 Sep 2009 13:15:24 -0000	1.38
@@ -22,6 +22,7 @@ BuildRequires: startup-notification-deve
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: xfconf-devel
+BuildRequires: desktop-file-utils
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -78,10 +79,12 @@ fi
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
-* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
-- Make Nodoka default (bug #491092)
+* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
 - Validate *.desktop files
 
+* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Make Nodoka default (fixes bug #491092)
+
 * Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
 - Add patch for focus issue (fixes bug #514206)
 



From cwickert at fedoraproject.org  Sun Sep 20 13:15:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 13:15:24 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4.spec,1.38,1.39
Message-ID: <20090920131524.3F67711C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16205/d

Modified Files:
	xfwm4.spec 
Log Message:
* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
- Validate *.desktop files



Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xfwm4.spec	20 Sep 2009 05:22:58 -0000	1.38
+++ xfwm4.spec	20 Sep 2009 13:15:23 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
@@ -22,6 +22,7 @@ BuildRequires: startup-notification-deve
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: xfconf-devel
+BuildRequires: desktop-file-utils
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -78,9 +79,11 @@ fi
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
+* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
+- Validate *.desktop files
+
 * Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Make Nodoka default (fixes bug #491092)
-- Validate *.desktop files
 
 * Tue Jul 28 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-3
 - Add patch for focus issue (fixes bug #514206)



From abbot at fedoraproject.org  Sun Sep 20 13:16:28 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Sun, 20 Sep 2009 13:16:28 +0000 (UTC)
Subject: rpms/mitter/F-10 .cvsignore, 1.1, 1.2 mitter.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090920131628.D4A0211C00E6@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/mitter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16928

Modified Files:
	.cvsignore mitter.spec sources 
Log Message:
update to upstream mitter-0.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Dec 2008 00:32:55 -0000	1.1
+++ .cvsignore	20 Sep 2009 13:16:28 -0000	1.2
@@ -0,0 +1 @@
+mitter-0.4.5.tar.gz


Index: mitter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/F-10/mitter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mitter.spec	25 Dec 2008 12:44:02 -0000	1.1
+++ mitter.spec	20 Sep 2009 13:16:28 -0000	1.2
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           mitter
-Version:        0.4.3
+Version:        0.4.5
 Release:        1%{?dist}
 Summary:        A maemo/GTK+ client for twitter
 
@@ -51,5 +51,8 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING THANKS
 
 %changelog
+* Sun Sep 20 2009 Lev Shamardin <shamardin at gmail.com> - 0.4.5-1
+- Updated to upstream version 0.4.5.
+
 * Thu Dec 11 2008 Lev Shamardin <shamardin at gmail.com> - 0.4.3-1
 - Initial package release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Dec 2008 12:44:02 -0000	1.2
+++ sources	20 Sep 2009 13:16:28 -0000	1.3
@@ -1 +1 @@
-609026e2b9c0531df2e89b711ea778be  mitter-0.4.3.tar.gz
+0432f3d2d00e8d048bf0839e2d857e51  mitter-0.4.5.tar.gz



From abbot at fedoraproject.org  Sun Sep 20 13:18:08 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Sun, 20 Sep 2009 13:18:08 +0000 (UTC)
Subject: rpms/mitter/F-11 .cvsignore, 1.2, 1.3 mitter.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090920131808.909BF11C00E6@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/mitter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17419

Modified Files:
	.cvsignore mitter.spec sources 
Log Message:
update to upstream mitter-0.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Dec 2008 12:29:01 -0000	1.2
+++ .cvsignore	20 Sep 2009 13:18:08 -0000	1.3
@@ -1 +1 @@
-mitter-0.4.3.tar.gz
+mitter-0.4.5.tar.gz


Index: mitter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/F-11/mitter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mitter.spec	26 Feb 2009 01:35:40 -0000	1.2
+++ mitter.spec	20 Sep 2009 13:18:08 -0000	1.3
@@ -3,8 +3,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           mitter
-Version:        0.4.3
-Release:        2%{?dist}
+Version:        0.4.5
+Release:        1%{?dist}
 Summary:        A maemo/GTK+ client for twitter
 
 Group:          Applications/Internet
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING THANKS
 
 %changelog
+* Sun Sep 20 2009 Lev Shamardin <shamardin at gmail.com> - 0.4.5-1
+- Updated to upstream version 0.4.5.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mitter/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Dec 2008 12:29:01 -0000	1.2
+++ sources	20 Sep 2009 13:18:08 -0000	1.3
@@ -1 +1 @@
-609026e2b9c0531df2e89b711ea778be  mitter-0.4.3.tar.gz
+0432f3d2d00e8d048bf0839e2d857e51  mitter-0.4.5.tar.gz



From wolfy at fedoraproject.org  Sun Sep 20 13:37:41 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Sun, 20 Sep 2009 13:37:41 +0000 (UTC)
Subject: rpms/cfv/devel .cvsignore, 1.3, 1.4 cfv.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <20090920133741.636E611C00E6@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/cfv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22734

Modified Files:
	.cvsignore cfv.spec sources 
Log Message:
new upstream version, fixing md5 and sha module deprecation warnings.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2008 22:08:12 -0000	1.3
+++ .cvsignore	20 Sep 2009 13:37:39 -0000	1.4
@@ -1 +1 @@
-cfv-1.18.2.tar.gz
+cfv-1.18.3.tar.gz


Index: cfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/devel/cfv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cfv.spec	24 Jul 2009 18:50:29 -0000	1.10
+++ cfv.spec	20 Sep 2009 13:37:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           cfv
-Version:        1.18.2
-Release:        4%{?dist}
+Version:        1.18.3
+Release:        1%{?dist}
 Summary:        A utility to test and create data verification files
 
 Group:          Applications/Archiving
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.3-1
+- new upstream version, fixing md5 and sha module deprecation warnings.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2008 22:08:12 -0000	1.3
+++ sources	20 Sep 2009 13:37:39 -0000	1.4
@@ -1 +1 @@
-775d8001228c5ba6549825318f906d26  cfv-1.18.2.tar.gz
+1be9039c2ab859103d70b6c4f4e5edf5  cfv-1.18.3.tar.gz



From ebrand at fedoraproject.org  Sun Sep 20 13:52:27 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sun, 20 Sep 2009 13:52:27 +0000 (UTC)
Subject: rpms/sslogger/devel import.log, NONE, 1.1 sslogger.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090920135227.3743711C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26001/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sslogger.spec 
Log Message:
Original release



--- NEW FILE import.log ---
sslogger-0_9-50_fc10:HEAD:sslogger-0.9-50.fc10.src.rpm:1253440303


--- NEW FILE sslogger.spec ---
%{!?log_dir:%define log_dir /%{_localstatedir}/log/slog}
%{!?sslogger_user:%define sslogger_user slogger}
%{!?sslogger_group:%define sslogger_group sloggers}

Summary: A keystroke logging utility for privileged user escalation
Name: sslogger
Version: 0.9
Release: 50%{?dist}
License: GPLv3+
Group: User Interface/Desktops
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://sslogger.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Requires: bash logrotate 
Requires(pre): shadow-utils util-linux
%description
A keystroke logging utility for privileged user escalation



%pre
getent group sloggers > /dev/null || groupadd  %{sslogger_group} -r &>/dev/null
getent passwd slogger > /dev/null ||/usr/sbin/useradd -c "Privilege keystroke logger"  %{sslogger_user} -s /sbin/nologin -r -M  -g sloggers -d %{log_dir} &>/dev/null

%prep
%setup -q
make clean

%build
export CFLAGS="$RPM_OPT_FLAGS -DLOG_DIR=%{_localstatedir}/log/slog -DCONF_FILE=%{_sysconfdir}/sslogger.conf"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_localstatedir}/log/slog
chmod 750 %{buildroot}/%{_localstatedir}/log/slog
make install DESTDIR=%{buildroot} VERSION=%{version}
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
cp -p sslogger_rotate %{buildroot}%{_sysconfdir}/logrotate.d/sslogger

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/slog
%{_bindir}/sreplay
%attr (6555,%{sslogger_user},%{sslogger_group}) %{_bindir}/sslogger
%attr(775,%{sslogger_user},%{sslogger_group})  %{log_dir}
%config(noreplace) %{_sysconfdir}/sslogger.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sslogger
%{_mandir}/man*/* 
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/TODO
%doc %{_docdir}/%{name}-%{version}/LICENSE

%changelog
* Sun Aug 23 2009 Ed Brand <edbrand at brandint.com> - 0.9-50
- fixed to logrotate

* Tue Jul 14 2009 Ed Brand <edbrand at brandint.com> - 0.9-49
- fixes to specfile: _sysconfdir

* Sat Jul 11 2009 Ed Brand <<edbrand at brandint.com> - 0.9-48
- Misc spec file fixes

* Thu Jul 09 2009 Ed Brand <edbrand at brandint.com> - 0.9-46
- Updates to man pages

* Thu Jul 09 2009 Ed Brand <<edbrand at brandint.com> - 0.9-45
- Fixes to $log_dir permission

* Sun Jul 05 2009 Ed Brand <edbrand at brandint.com> - 0.9-40
- Split man files into slog, sslogger and sreplay
- Chmod 775 $log_dir to allow normal user access
- Add check to slog to disallowe passing '-' when -c option is used

* Tue May 18 2009 Ed Brand <edbrand at brandint.com> - 0.9-32
- removed $global

* Sun Mar 29 2009 Ed Brand <edbrand at brandint.com> - 0.9-30
- Change Licence to GPLv3
- Misc. spec file fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:07:39 -0000	1.1
+++ .cvsignore	20 Sep 2009 13:52:26 -0000	1.2
@@ -0,0 +1 @@
+sslogger-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:07:39 -0000	1.1
+++ sources	20 Sep 2009 13:52:26 -0000	1.2
@@ -0,0 +1 @@
+1f384d6c363780cbe4c929ca46ddcdf9  sslogger-0.9.tar.gz



From sailer at fedoraproject.org  Sun Sep 20 13:53:47 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 20 Sep 2009 13:53:47 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-llvmpath.patch, NONE, 1.1 ghdl-svn126.patch,
	NONE, 1.1 ghdl-grtadac.patch, 1.1, 1.2 ghdl.spec, 1.53,
	1.54 ghdl-svn110.patch, 1.1, NONE
Message-ID: <20090920135347.56D5211C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26352

Modified Files:
	ghdl-grtadac.patch ghdl.spec 
Added Files:
	ghdl-llvmpath.patch ghdl-svn126.patch 
Removed Files:
	ghdl-svn110.patch 
Log Message:
update to svn126 (new vhdl2008 features)


ghdl-llvmpath.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE ghdl-llvmpath.patch ---
--- gcc/vhdl/Makefile.in.llvm	2009-09-20 13:47:57.000000000 +0200
+++ gcc/vhdl/Makefile.in	2009-09-20 13:48:45.000000000 +0200
@@ -169,6 +169,8 @@
 	echo "package Default_Pathes is" >> tmp-dpathes.ads
 	echo "   Compiler_Gcc : constant String :=" >> tmp-dpathes.ads
 	echo "     \"$(libexecsubdir)/ghdl1$(exeext)\";" >> tmp-dpathes.ads
+	echo "   Compiler_Llvm : constant String :=" >> tmp-dpathes.ads
+	echo "     \"$(libexecsubdir)/ghdl1$(exeext)\";" >> tmp-dpathes.ads
 	echo "   Compiler_Debug : constant String :=\"\";" >> tmp-dpathes.ads
 	echo "   Compiler_Mcode : constant String :=\"\";" >> tmp-dpathes.ads
 	echo "   Post_Processor : constant String :=\"\";" >> tmp-dpathes.ads

ghdl-svn126.patch:
 P                                                |   24 
 Warn_Undriven                                    |  104 ---
 end                                              |  614 +++++++++++++--------
 ghdl-0.28dev/README                              |   10 
 ghdl-0.28dev/vhdl/Make-lang.in                   |   14 
 ghdl-0.28dev/vhdl/Makefile.in                    |   42 +
 ghdl-0.28dev/vhdl/back_end.adb                   |    9 
 ghdl-0.28dev/vhdl/back_end.ads                   |    2 
 ghdl-0.28dev/vhdl/bug.adb                        |    2 
 ghdl-0.28dev/vhdl/bug.ads                        |    2 
 ghdl-0.28dev/vhdl/canon.adb                      |  235 +++++++-
 ghdl-0.28dev/vhdl/canon.ads                      |    8 
 ghdl-0.28dev/vhdl/configuration.adb              |    7 
 ghdl-0.28dev/vhdl/configuration.ads              |    2 
 ghdl-0.28dev/vhdl/disp_tree.adb                  |   59 +-
 ghdl-0.28dev/vhdl/disp_tree.ads                  |    2 
 ghdl-0.28dev/vhdl/disp_vhdl.adb                  |  164 ++++-
 ghdl-0.28dev/vhdl/disp_vhdl.ads                  |    2 
 ghdl-0.28dev/vhdl/errorout.adb                   |   22 
 ghdl-0.28dev/vhdl/errorout.ads                   |    2 
 ghdl-0.28dev/vhdl/evaluation.adb                 |   37 -
 ghdl-0.28dev/vhdl/evaluation.ads                 |    5 
 ghdl-0.28dev/vhdl/files_map.adb                  |   11 
 ghdl-0.28dev/vhdl/files_map.ads                  |    2 
 ghdl-0.28dev/vhdl/flags.adb                      |   13 
 ghdl-0.28dev/vhdl/flags.ads                      |   21 
 ghdl-0.28dev/vhdl/ghdl.texi                      |   45 +
 ghdl-0.28dev/vhdl/ghdldrv/ghdl_gcc.adb           |    1 
 ghdl-0.28dev/vhdl/ghdldrv/ghdldrv.adb            |  148 +++--
 ghdl-0.28dev/vhdl/ghdldrv/ghdldrv.ads            |    5 
 ghdl-0.28dev/vhdl/ghdldrv/ghdllocal.adb          |   52 +
 ghdl-0.28dev/vhdl/ghdldrv/ghdllocal.ads          |    3 
 ghdl-0.28dev/vhdl/ghdldrv/ghdlmain.adb           |    7 
 ghdl-0.28dev/vhdl/ghdldrv/ghdlprint.adb          |   31 -
 ghdl-0.28dev/vhdl/grt/grt-astdio.adb             |    6 
 ghdl-0.28dev/vhdl/grt/grt-avhpi.adb              |   16 
 ghdl-0.28dev/vhdl/grt/grt-c.ads                  |   11 
 ghdl-0.28dev/vhdl/grt/grt-disp.adb               |    3 
 ghdl-0.28dev/vhdl/grt/grt-disp_rti.adb           |   13 
 ghdl-0.28dev/vhdl/grt/grt-disp_signals.adb       |    9 
 ghdl-0.28dev/vhdl/grt/grt-disp_tree.adb          |   18 
 ghdl-0.28dev/vhdl/grt/grt-errors.adb             |    5 
 ghdl-0.28dev/vhdl/grt/grt-files.adb              |   26 
 ghdl-0.28dev/vhdl/grt/grt-files.ads              |    2 
 ghdl-0.28dev/vhdl/grt/grt-images.adb             |    5 
 ghdl-0.28dev/vhdl/grt/grt-images.ads             |    2 
 ghdl-0.28dev/vhdl/grt/grt-lib.adb                |   10 
 ghdl-0.28dev/vhdl/grt/grt-main.adb               |    7 
 ghdl-0.28dev/vhdl/grt/grt-modules.adb            |    1 
 ghdl-0.28dev/vhdl/grt/grt-names.adb              |    1 
 ghdl-0.28dev/vhdl/grt/grt-options.adb            |    2 
 ghdl-0.28dev/vhdl/grt/grt-options.ads            |    2 
 ghdl-0.28dev/vhdl/grt/grt-processes.adb          |   37 -
 ghdl-0.28dev/vhdl/grt/grt-processes.ads          |    2 
 ghdl-0.28dev/vhdl/grt/grt-rtis_addr.adb          |    1 
 ghdl-0.28dev/vhdl/grt/grt-rtis_utils.adb         |   21 
 ghdl-0.28dev/vhdl/grt/grt-sdf.adb                |    2 
 ghdl-0.28dev/vhdl/grt/grt-signals.adb            |   11 
 ghdl-0.28dev/vhdl/grt/grt-signals.ads            |   31 -
 ghdl-0.28dev/vhdl/grt/grt-stats.adb              |    1 
 ghdl-0.28dev/vhdl/grt/grt-table.adb              |  113 +++
 ghdl-0.28dev/vhdl/grt/grt-table.ads              |   68 ++
 ghdl-0.28dev/vhdl/grt/grt-unithread.adb          |    1 
 ghdl-0.28dev/vhdl/grt/grt-unithread.ads          |    1 
 ghdl-0.28dev/vhdl/grt/grt-vcd.adb                |   83 +-
 ghdl-0.28dev/vhdl/grt/grt-vcd.ads                |   17 
 ghdl-0.28dev/vhdl/grt/grt-vcdz.adb               |   45 -
 ghdl-0.28dev/vhdl/grt/grt-vital_annotate.adb     |   19 
 ghdl-0.28dev/vhdl/grt/grt-vital_annotate.ads     |    6 
 ghdl-0.28dev/vhdl/grt/grt-vpi.adb                |   16 
 ghdl-0.28dev/vhdl/grt/grt-vstrings.adb           |   16 
 ghdl-0.28dev/vhdl/grt/grt-waves.adb              |  386 +++++++------
 ghdl-0.28dev/vhdl/grt/grt.adc                    |    4 
 ghdl-0.28dev/vhdl/ieee-std_logic_1164.adb        |   11 
 ghdl-0.28dev/vhdl/ieee-std_logic_1164.ads        |    2 
 ghdl-0.28dev/vhdl/ieee-vital_timing.adb          |    9 
 ghdl-0.28dev/vhdl/ieee-vital_timing.ads          |    2 
 ghdl-0.28dev/vhdl/iir_chain_handling.adb         |    2 
 ghdl-0.28dev/vhdl/iir_chain_handling.ads         |    2 
 ghdl-0.28dev/vhdl/iir_chains.adb                 |    2 
 ghdl-0.28dev/vhdl/iir_chains.ads                 |    8 
 ghdl-0.28dev/vhdl/iirs.adb                       |  206 +++++--
 ghdl-0.28dev/vhdl/iirs.ads                       |  139 +++-
 ghdl-0.28dev/vhdl/iirs_utils.adb                 |   16 
 ghdl-0.28dev/vhdl/iirs_utils.ads                 |    6 
 ghdl-0.28dev/vhdl/lang.opt                       |    8 
 ghdl-0.28dev/vhdl/libraries.adb                  |   14 
 ghdl-0.28dev/vhdl/libraries.ads                  |    2 
 ghdl-0.28dev/vhdl/libraries/std/textio_body.vhdl |    8 
 ghdl-0.28dev/vhdl/lists.adb                      |   32 -
 ghdl-0.28dev/vhdl/lists.ads                      |    2 
 ghdl-0.28dev/vhdl/name_table.adb                 |    5 
 ghdl-0.28dev/vhdl/name_table.ads                 |    2 
 ghdl-0.28dev/vhdl/nodes.adb                      |    5 
 ghdl-0.28dev/vhdl/nodes.ads                      |    4 
 ghdl-0.28dev/vhdl/options.adb                    |  221 +++++++
 ghdl-0.28dev/vhdl/options.ads                    |   27 
 ghdl-0.28dev/vhdl/ortho-lang.c                   |  102 +--
 ghdl-0.28dev/vhdl/ortho_front.adb                |    7 
 ghdl-0.28dev/vhdl/ortho_ident.adb                |    1 
 ghdl-0.28dev/vhdl/parse.adb                      |  252 +++++++-
 ghdl-0.28dev/vhdl/parse.ads                      |    2 
 ghdl-0.28dev/vhdl/post_sems.adb                  |    2 
 ghdl-0.28dev/vhdl/post_sems.ads                  |    2 
 ghdl-0.28dev/vhdl/scan-scan_literal.adb          |   27 
 ghdl-0.28dev/vhdl/scan.adb                       |   48 +
 ghdl-0.28dev/vhdl/scan.ads                       |    2 
 ghdl-0.28dev/vhdl/sem.adb                        |  177 ++++--
 ghdl-0.28dev/vhdl/sem.ads                        |    2 
 ghdl-0.28dev/vhdl/sem_assocs.adb                 |   32 -
 ghdl-0.28dev/vhdl/sem_assocs.ads                 |    2 
 ghdl-0.28dev/vhdl/sem_decls.adb                  |  184 ++----
 ghdl-0.28dev/vhdl/sem_decls.ads                  |    2 
 ghdl-0.28dev/vhdl/sem_expr.adb                   |  578 ++++++++++++++++----
 ghdl-0.28dev/vhdl/sem_expr.ads                   |    6 
 ghdl-0.28dev/vhdl/sem_names.adb                  |   67 +-
 ghdl-0.28dev/vhdl/sem_names.ads                  |    2 
 ghdl-0.28dev/vhdl/sem_scopes.adb                 |    3 
 ghdl-0.28dev/vhdl/sem_scopes.ads                 |    2 
 ghdl-0.28dev/vhdl/sem_specs.adb                  |    5 
 ghdl-0.28dev/vhdl/sem_specs.ads                  |    2 
 ghdl-0.28dev/vhdl/sem_stmts.adb                  |   26 
 ghdl-0.28dev/vhdl/sem_stmts.ads                  |    2 
 ghdl-0.28dev/vhdl/sem_types.adb                  |  662 ++++++++++++++++-------
 ghdl-0.28dev/vhdl/sem_types.ads                  |    8 
 ghdl-0.28dev/vhdl/std_names.adb                  |   54 +
 ghdl-0.28dev/vhdl/std_names.ads                  |   88 ++-
 ghdl-0.28dev/vhdl/std_package.adb                |   23 
 ghdl-0.28dev/vhdl/std_package.ads                |    2 
 ghdl-0.28dev/vhdl/str_table.adb                  |    2 
 ghdl-0.28dev/vhdl/str_table.ads                  |    2 
 ghdl-0.28dev/vhdl/tokens.adb                     |    2 
 ghdl-0.28dev/vhdl/tokens.ads                     |    2 
 ghdl-0.28dev/vhdl/trans_analyzes.adb             |    2 
 ghdl-0.28dev/vhdl/trans_be.adb                   |    1 
 ghdl-0.28dev/vhdl/translation.adb                |  458 +++++++--------
 ghdl-0.28dev/vhdl/types.ads                      |    6 
 ghdl-0.28dev/vhdl/version.ads                    |    4 
 ghdl-0.28dev/vhdl/xrefs.adb                      |    2 
 ghdl-0.28dev/vhdl/xrefs.ads                      |    2 
 140 files changed, 4238 insertions(+), 2081 deletions(-)

--- NEW FILE ghdl-svn126.patch ---
diff -urN ghdl-0.27/README ghdl-0.28dev/README
--- ghdl-0.27/README	2008-07-01 01:59:59.000000000 +0200
+++ ghdl-0.28dev/README	2009-09-20 09:07:54.000000000 +0200
@@ -4,7 +4,7 @@
 
 Copyright:
 **********
-GHDL is copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 Tristan Gingold.
+GHDL is copyright (c) 2002 - 2008 Tristan Gingold.
 See the GHDL manual for more details.
 
 This program is free software; you can redistribute it and/or modify
@@ -27,9 +27,9 @@
 ***************************
 
 Required:
-* the sources of gcc-4.2.4 (at least the core part).
+* the sources of gcc-4.3.1 (at least the core part).
   Note: other versions of gcc sources have not been tested.
-* the Ada95 GNAT compiler (GNAT GPL 2005 are known to work;
+* the Ada95 GNAT compiler (GNAT GPL 2008 are known to work;
   Ada compilers in most Linux distributions are more or less buggy)
 * GNU/Linux for ix86 (pc systems) (porting is necessary for other systems)
 
@@ -53,12 +53,12 @@
   file from it).
 * move or copy the vhdl directory of ghdl into the gcc subdirectory of
   the gcc distribution.
-  You should have a gcc-4.2.4/gcc/vhdl directory.
+  You should have a gcc-4.3.1/gcc/vhdl directory.
 * configure gcc with the --enable-languages=vhdl option.  You may of course
   add other languages.
   Refer to the gcc installation documentation.
 * compile gcc.
-  'make CFLAGS="-O"' is OK (gcc 2.8.1 bugs with -O2 on some files).
+  'make CFLAGS="-O"' is OK
 * install gcc.  This installs the ghdl driver too.
   'make install' is OK.
 
diff -urN ghdl-0.27/vhdl/back_end.adb ghdl-0.28dev/vhdl/back_end.adb
--- ghdl-0.27/vhdl/back_end.adb	2005-09-22 23:26:01.000000000 +0200
+++ ghdl-0.28dev/vhdl/back_end.adb	2009-09-20 09:06:46.000000000 +0200
@@ -12,11 +12,10 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
-with Flags;
-with Types; use Types;
+with Flags; use Flags;
 with Iirs_Utils; use Iirs_Utils;
 
 package body Back_End is
@@ -27,11 +26,13 @@
      return String
    is
    begin
-      case Flags.Vhdl_Std is
+      case Vhdl_Std is
          when Vhdl_87 =>
             return Image_Identifier (Library) & "-obj87.cf";
          when Vhdl_93c | Vhdl_93 | Vhdl_00 | Vhdl_02 =>
             return Image_Identifier (Library) & "-obj93.cf";
+         when Vhdl_08 =>
+            return Image_Identifier (Library) & "-obj08.cf";
       end case;
    end Default_Library_To_File_Name;
 end Back_End;
diff -urN ghdl-0.27/vhdl/back_end.ads ghdl-0.28dev/vhdl/back_end.ads
--- ghdl-0.27/vhdl/back_end.ads	2006-08-16 08:17:07.000000000 +0200
+++ ghdl-0.28dev/vhdl/back_end.ads	2009-09-20 09:06:46.000000000 +0200
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Iirs; use Iirs;
diff -urN ghdl-0.27/vhdl/bug.adb ghdl-0.28dev/vhdl/bug.adb
--- ghdl-0.27/vhdl/bug.adb	2006-08-19 13:56:15.000000000 +0200
+++ ghdl-0.28dev/vhdl/bug.adb	2009-09-20 09:06:46.000000000 +0200
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Ada.Text_IO; use Ada.Text_IO;
diff -urN ghdl-0.27/vhdl/bug.ads ghdl-0.28dev/vhdl/bug.ads
--- ghdl-0.27/vhdl/bug.ads	2005-10-15 13:34:53.000000000 +0200
+++ ghdl-0.28dev/vhdl/bug.ads	2009-09-20 09:06:46.000000000 +0200
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Ada.Exceptions; use Ada.Exceptions;
diff -urN ghdl-0.27/vhdl/canon.adb ghdl-0.28dev/vhdl/canon.adb
--- ghdl-0.27/vhdl/canon.adb	2007-03-21 04:47:14.000000000 +0100
+++ ghdl-0.28dev/vhdl/canon.adb	2009-09-20 09:06:46.000000000 +0200
@@ -1,5 +1,5 @@
 --  Canonicalization pass
---  Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold
+--  Copyright (C) 2002, 2003, 2004, 2005, 2008 Tristan Gingold
 --
 --  GHDL 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
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Errorout; use Errorout;
@@ -21,9 +21,8 @@
 with Name_Table;
 with Sem;
 with Std_Names;
-with Types; use Types;
 with Iir_Chains; use Iir_Chains;
-with Flags;
+with Flags; use Flags;
 
 package body Canon is
    --  Canonicalize a list of declarations.  LIST can be null.
@@ -239,6 +238,10 @@
             --Canon_Extract_Sensitivity
             --  (Get_Prefix (Expr), Sensitivity_List, Is_Target);
 
+         when Iir_Kinds_Scalar_Type_Attribute =>
+            Canon_Extract_Sensitivity
+              (Get_Parameter (Expr), Sensitivity_List, Is_Target);
+
          when Iir_Kind_Aggregate =>
             declare
                Aggr_Type : Iir;
@@ -270,6 +273,226 @@
       end case;
    end Canon_Extract_Sensitivity;
 
+   procedure Canon_Extract_Sensitivity_If_Not_Null
+     (Expr: Iir; Sensitivity_List: Iir_List; Is_Target: Boolean := False) is
+   begin
+      if Expr /= Null_Iir then
+         Canon_Extract_Sensitivity (Expr, Sensitivity_List, Is_Target);
+      end if;
+   end Canon_Extract_Sensitivity_If_Not_Null;
+
+   procedure Canon_Extract_Sequential_Statement_Chain_Sensitivity
+     (Chain : Iir; List : Iir_List)
+   is
+      Stmt : Iir;
+   begin
+      Stmt := Chain;
+      while Stmt /= Null_Iir loop
+         case Get_Kind (Stmt) is
+            when Iir_Kind_Assertion_Statement =>
+               --  LRM08 11.3
+               --  * For each assertion, report, next, exit or return
+               --    statement, apply the rule of 10.2 to each expression
+               --    in the statement, and construct the union of the
+               --    resulting sets.
+               Canon_Extract_Sensitivity
+                 (Get_Assertion_Condition (Stmt), List);
+               Canon_Extract_Sensitivity
+                 (Get_Severity_Expression (Stmt), List);
+               Canon_Extract_Sensitivity
+                 (Get_Report_Expression (Stmt), List);
+            when Iir_Kind_Report_Statement =>
+               --  LRM08 11.3
+               --  See assertion_statement case.
+               Canon_Extract_Sensitivity
+                 (Get_Severity_Expression (Stmt), List);
+               Canon_Extract_Sensitivity
+                 (Get_Report_Expression (Stmt), List);
+            when Iir_Kind_Next_Statement
+              | Iir_Kind_Exit_Statement =>
+               --  LRM08 11.3
+               --  See assertion_statement case.
+               Canon_Extract_Sensitivity
+                 (Get_Condition (Stmt), List);
+            when Iir_Kind_Return_Statement =>
+               --  LRM08 11.3
+               --  See assertion_statement case.
+               Canon_Extract_Sensitivity_If_Not_Null
+                 (Get_Expression (Stmt), List);
+            when Iir_Kind_Variable_Assignment_Statement =>
[...12561 lines suppressed...]
          for I in Mode_Value .. Mode_Signal loop
             case Info.Type_Mode is
                when Type_Mode_Array =>
@@ -25666,6 +25643,8 @@
                   else
                      Val := Get_Null_Loc;
                   end if;
+               when Type_Mode_Fat_Array =>
+                  Val := Get_Null_Loc;
                when others =>
                   Error_Kind ("generate_array_subtype_definition", Atype);
             end case;
@@ -25678,7 +25657,7 @@
 
       procedure Generate_Record_Type_Definition (Atype : Iir)
       is
-         El_Chain : Iir;
+         El_List : Iir_List;
          El : Iir;
          Prev : Rti_Block;
          El_Arr : O_Dnode;
@@ -25692,13 +25671,14 @@
             return;
          end if;
 
-         El_Chain := Get_Element_Declaration_Chain (Atype);
+         El_List := Get_Elements_Declaration_List (Atype);
          Max_Depth := 0;
 
          --  Generate elements.
          Push_Rti_Node (Prev, False);
-         El := El_Chain;
-         while El /= Null_Iir loop
+         for I in Natural loop
+            El := Get_Nth_Element (El_List, I);
+            exit when El = Null_Iir;
             declare
                Type_Rti : O_Dnode;
                El_Name : O_Dnode;
@@ -25742,7 +25722,6 @@
 
                Pop_Identifier_Prefix (Mark);
             end;
-            El := Get_Chain (El);
          end loop;
          El_Arr := Generate_Rti_Array (Create_Identifier ("RTIARRAY"));
          Pop_Rti_Node (Prev);
@@ -25764,8 +25743,7 @@
             New_Record_Aggr_El (Aggr, New_Name_Address (Name));
             New_Record_Aggr_El
               (Aggr, New_Unsigned_Literal
-               (Ghdl_Index_Type,
-                Unsigned_64 (Get_Number_Element_Declaration (Atype))));
+               (Ghdl_Index_Type, Unsigned_64 (Get_Nbr_Elements (El_List))));
             New_Record_Aggr_El (Aggr,
                                 New_Global_Address (El_Arr, Ghdl_Rti_Arr_Acc));
             Finish_Record_Aggr (Aggr, Res);
@@ -25830,8 +25808,7 @@
               | Iir_Kind_File_Type_Definition =>
                Generate_Fileacc_Type_Definition (Atype);
             when Iir_Kind_Record_Subtype_Definition
-              | Iir_Kind_Access_Subtype_Definition
-              | Iir_Kind_Unconstrained_Array_Subtype_Definition =>
+              | Iir_Kind_Access_Subtype_Definition =>
                --  FIXME: No separate infos (yet).
                null;
             when Iir_Kind_Record_Type_Definition =>
@@ -25950,6 +25927,7 @@
                declare
                   Mark : Id_Mark_Type;
                   Tmp : O_Dnode;
+                  pragma Unreferenced (Tmp);
                begin
                   Push_Identifier_Prefix (Mark, "OT");
                   Tmp := Generate_Type_Definition (Decl_Type);
@@ -27015,7 +26993,6 @@
 
       --  Generic pointer.
       Ghdl_Ptr_Type := New_Access_Type (Char_Type_Node);
-      Const_Ptr_Type_Node := Ghdl_Ptr_Type;
       New_Type_Decl (Get_Identifier ("__ghdl_ptr"), Ghdl_Ptr_Type);
 
       --  Create record
@@ -28252,6 +28229,7 @@
    is
       Lib_Mark, Unit_Mark : Id_Mark_Type;
       Info : Ortho_Info_Acc;
+      pragma Unreferenced (Info);
    begin
       Update_Node_Infos;
 
@@ -28384,8 +28362,7 @@
                      Free_Info (I);
                   end if;
                when Iir_Kind_Record_Subtype_Definition
-                 | Iir_Kind_Access_Subtype_Definition
-                 | Iir_Kind_Unconstrained_Array_Subtype_Definition =>
+                 | Iir_Kind_Access_Subtype_Definition =>
                   null;
                when Iir_Kind_Enumeration_Type_Definition
                  | Iir_Kind_Array_Type_Definition
@@ -28395,9 +28372,11 @@
                  | Iir_Kind_Enumeration_Subtype_Definition =>
                   Free_Type_Info (Info, True);
                when Iir_Kind_Array_Subtype_Definition =>
-                  Free_Var (Info.T.Array_Bounds);
-                  Info.T := Ortho_Info_Type_Array_Init;
-                  Free_Type_Info (Info, True);
+                  if Get_Index_Constraint_Flag (I) then
+                     Free_Var (Info.T.Array_Bounds);
+                     Info.T := Ortho_Info_Type_Array_Init;
+                     Free_Type_Info (Info, True);
+                  end if;
                when others =>
                   --  By default, info are not shared.
                   --  The exception is infos for implicit subprograms, but
@@ -28518,6 +28497,7 @@
       procedure Gen_Setup_Info
       is
          Cst : O_Dnode;
+         pragma Unreferenced (Cst);
       begin
          Cst := Create_String (Flags.Flag_String,
                                Get_Identifier ("__ghdl_flag_string"),
@@ -28555,8 +28535,7 @@
          --  Check port.
          El := Get_Port_Chain (Entity);
          while El /= Null_Iir loop
-            if Get_Kind (Get_Type (El)) in
-              Iir_Kinds_Unconstrained_Array_Type_Definition
+            if not Is_Fully_Constrained_Type (Get_Type (El))
               and then Get_Default_Value (El) = Null_Iir
             then
                Error ("(" & Disp_Node (El)
@@ -28831,6 +28810,7 @@
          F : FILEs;
          R : int;
          S : size_t;
+         pragma Unreferenced (R, S); -- FIXME
          Id : Name_Id;
          Lib : Iir_Library_Declaration;
          File : Iir_Design_File;
diff -urN ghdl-0.27/vhdl/types.ads ghdl-0.28dev/vhdl/types.ads
--- ghdl-0.27/vhdl/types.ads	2008-04-07 05:20:31.000000000 +0200
+++ ghdl-0.28dev/vhdl/types.ads	2009-09-20 09:06:46.000000000 +0200
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Interfaces;
@@ -20,10 +20,6 @@
 package Types is
    pragma Preelaborate (Types);
 
-   --  List of vhdl standards.
-   --  VHDL_93c is vhdl_93 with backward compatibility with 87 (file).
-   type Vhdl_Std_Type is (Vhdl_87, Vhdl_93c, Vhdl_93, Vhdl_00, Vhdl_02);
-
    -- A tri state type.
    type Tri_State_Type is (Unknown, False, True);
 
diff -urN ghdl-0.27/vhdl/version.ads ghdl-0.28dev/vhdl/version.ads
--- ghdl-0.27/vhdl/version.ads	2008-07-01 01:59:18.000000000 +0200
+++ ghdl-0.28dev/vhdl/version.ads	2009-09-20 09:06:46.000000000 +0200
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.27 (20080701) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.27";
+      "GHDL 0.28dev (20080721) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.28dev";
 end Version;
diff -urN ghdl-0.27/vhdl/xrefs.adb ghdl-0.28dev/vhdl/xrefs.adb
--- ghdl-0.27/vhdl/xrefs.adb	2005-09-22 23:33:32.000000000 +0200
+++ ghdl-0.28dev/vhdl/xrefs.adb	2009-09-20 09:06:46.000000000 +0200
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with GNAT.Table;
diff -urN ghdl-0.27/vhdl/xrefs.ads ghdl-0.28dev/vhdl/xrefs.ads
--- ghdl-0.27/vhdl/xrefs.ads	2005-09-22 23:23:46.000000000 +0200
+++ ghdl-0.28dev/vhdl/xrefs.ads	2009-09-20 09:06:46.000000000 +0200
@@ -12,7 +12,7 @@
 --  for more details.
 --
 --  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
+--  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Types; use Types;

ghdl-grtadac.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ghdl-grtadac.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl-grtadac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghdl-grtadac.patch	7 Oct 2008 11:37:49 -0000	1.1
+++ ghdl-grtadac.patch	20 Sep 2009 13:53:46 -0000	1.2
@@ -1,9 +1,9 @@
 --- gcc-4.2.4/gcc/vhdl/Makefile.in.grtadac	2008-10-07 10:08:26.000000000 +0200
 +++ gcc-4.2.4/gcc/vhdl/Makefile.in	2008-10-07 10:09:00.000000000 +0200
-@@ -81,7 +81,7 @@
+@@ -80,7 +80,7 @@
+ X_ADAFLAGS =
  T_ADAFLAGS =
  
- CC = cc
 -ADAC = $(CC)
 +ADAC = gcc
  


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ghdl.spec	26 Jul 2009 00:14:31 -0000	1.53
+++ ghdl.spec	20 Sep 2009 13:53:46 -0000	1.54
@@ -1,11 +1,11 @@
 %global gccver 4.3.1
 %global ghdlver 0.27
-%global ghdlsvnver 110
+%global ghdlsvnver 126
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.8%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,8 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-# https://gna.org/bugs/index.php?13574
-Patch108: ghdl-textio.patch
+Patch108: ghdl-llvmpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -128,10 +127,10 @@ pushd ghdl-%{ghdlver}
 %{__mv} vhdl ../gcc/
 popd
 #patch102 -p1 -b .makeinfo
-%patch104 -p0 -b .libgnat43
+%patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .textio
+%patch108 -p0 -b .llvm
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -314,6 +313,9 @@ popd
 
 
 %changelog
+* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.126svn.0
+- update to svn126
+
 * Sun Jul 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.8
 - this gcc does not understand -mtune=atom
 


--- ghdl-svn110.patch DELETED ---



From cwickert at fedoraproject.org  Sun Sep 20 14:19:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Sep 2009 14:19:23 +0000 (UTC)
Subject: rpms/xfwm4/F-11 xfwm4.spec,1.38,1.39
Message-ID: <20090920141923.71F7511C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1499

Modified Files:
	xfwm4.spec 
Log Message:
fix release


Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/F-11/xfwm4.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xfwm4.spec	20 Sep 2009 13:15:24 -0000	1.38
+++ xfwm4.spec	20 Sep 2009 14:19:23 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2



From dwalsh at fedoraproject.org  Sun Sep 20 14:32:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun, 20 Sep 2009 14:32:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.88,
	1.89 selinux-policy.spec, 1.925, 1.926
Message-ID: <20090920143231.47E5D11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6420

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-7
- Remove allow_exec* booleans for confined users.  Only available for unconfined_t


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  319 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  179 +++
 policy/modules/apps/sandbox.te            |  324 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   80 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   29 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   14 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   78 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  279 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  311 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   75 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1402 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 317 files changed, 14553 insertions(+), 2581 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- policy-F12.patch	19 Sep 2009 02:03:03 -0000	1.88
+++ policy-F12.patch	20 Sep 2009 14:32:30 -0000	1.89
@@ -7579,8 +7579,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-09-18 09:45:33.000000000 -0400
-@@ -0,0 +1,392 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-09-20 08:49:01.000000000 -0400
+@@ -0,0 +1,402 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7686,6 +7686,14 @@ diff -b -B --ignore-all-space --exclude-
 +usermanage_run_passwd(unconfined_t, unconfined_r)
 +usermanage_run_chfn(unconfined_t, unconfined_r)
 +
++tunable_policy(`allow_execmem',`
++	allow unconfined_t self:process execmem;
++')
++
++tunable_policy(`allow_execmem && allow_execstack',`
++	allow unconfined_t self:process execstack;
++')
++
 +tunable_policy(`unconfined_login',`
 +	corecmd_shell_domtrans(unconfined_login_domain,unconfined_t)
 +	allow unconfined_t unconfined_login_domain:fd use;
@@ -7973,6 +7981,8 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.32/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/roles/unprivuser.te	2009-09-16 10:03:09.000000000 -0400
@@ -17882,7 +17892,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.32/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-18 21:47:14.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-19 07:07:53.000000000 -0400
 @@ -41,6 +41,9 @@
  files_tmp_file(sshd_tmp_t)
  files_poly_parent(sshd_tmp_t)
@@ -17920,7 +17930,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow the ssh program to communicate with ssh-agent.
  stream_connect_pattern(ssh_t, ssh_agent_tmp_t, ssh_agent_tmp_t, ssh_agent_type)
-@@ -126,11 +129,12 @@
+@@ -126,11 +129,13 @@
  read_lnk_files_pattern(ssh_t, home_ssh_t, home_ssh_t)
  
  # ssh servers can read the user keys and config
@@ -17930,13 +17940,14 @@ diff -b -B --ignore-all-space --exclude-
 +manage_dirs_pattern(ssh_server, home_ssh_t, home_ssh_t)
 +manage_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
 +userdom_user_home_dir_filetrans(ssh_server, home_ssh_t, dir)
++userdom_admin_home_dir_filetrans(ssh_server, home_ssh_t, dir)
  
  kernel_read_kernel_sysctls(ssh_t)
 +kernel_read_system_state(ssh_t)
  
  corenet_all_recvfrom_unlabeled(ssh_t)
  corenet_all_recvfrom_netlabel(ssh_t)
-@@ -139,6 +143,8 @@
+@@ -139,6 +144,8 @@
  corenet_tcp_sendrecv_all_ports(ssh_t)
  corenet_tcp_connect_ssh_port(ssh_t)
  corenet_sendrecv_ssh_client_packets(ssh_t)
@@ -17945,7 +17956,7 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_read_urand(ssh_t)
  
-@@ -160,19 +166,19 @@
+@@ -160,19 +167,19 @@
  logging_send_syslog_msg(ssh_t)
  logging_read_generic_logs(ssh_t)
  
@@ -17968,7 +17979,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`allow_ssh_keysign',`
  	domain_auto_trans(ssh_t, ssh_keysign_exec_t, ssh_keysign_t)
-@@ -194,23 +200,13 @@
+@@ -194,23 +201,13 @@
  # for port forwarding
  tunable_policy(`user_tcp_server',`
  	corenet_tcp_bind_ssh_port(ssh_t)
@@ -17994,7 +18005,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -301,6 +297,7 @@
+@@ -301,6 +298,7 @@
  
  kernel_search_key(sshd_t)
  kernel_link_key(sshd_t)
@@ -18002,7 +18013,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_all_user_ptys(sshd_t)
  term_setattr_all_user_ptys(sshd_t)
-@@ -310,16 +307,34 @@
+@@ -310,16 +308,34 @@
  corenet_tcp_bind_xserver_port(sshd_t)
  corenet_sendrecv_xserver_server_packets(sshd_t)
  
@@ -18039,7 +18050,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -331,6 +346,10 @@
+@@ -331,6 +347,10 @@
  ')
  
  optional_policy(`
@@ -18050,7 +18061,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_use_script_fds(sshd_t)
  ')
  
-@@ -341,7 +360,11 @@
+@@ -341,7 +361,11 @@
  ')
  
  optional_policy(`
@@ -18063,7 +18074,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_shell_domtrans(sshd_t)
  ')
  
-@@ -400,15 +423,13 @@
+@@ -400,15 +424,13 @@
  init_use_fds(ssh_keygen_t)
  init_use_script_ptys(ssh_keygen_t)
  
@@ -25429,7 +25440,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-18 21:52:11.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-20 08:32:58.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -25441,7 +25452,7 @@ diff -b -B --ignore-all-space --exclude-
  	domain_type($1_t)
  	corecmd_shell_entry_type($1_t)
  	corecmd_bin_entry_type($1_t)
-@@ -41,71 +42,88 @@
+@@ -41,80 +42,93 @@
  	allow system_r $1_r;
  
  	term_user_pty($1_t, user_devpts_t)
@@ -25554,47 +25565,43 @@ diff -b -B --ignore-all-space --exclude-
 -	files_dontaudit_getattr_non_security_symlinks($1_t)
 -	files_dontaudit_getattr_non_security_pipes($1_t)
 -	files_dontaudit_getattr_non_security_sockets($1_t)
--
--	libs_exec_ld_so($1_t)
--
--	miscfiles_read_localization($1_t)
--	miscfiles_read_certs($1_t)
--
--	sysnet_read_config($1_t)
 +	files_dontaudit_getattr_all_dirs($1_usertype)
 +	files_dontaudit_list_non_security($1_usertype)
 +	files_dontaudit_getattr_all_files($1_usertype)
 +	files_dontaudit_getattr_non_security_symlinks($1_usertype)
 +	files_dontaudit_getattr_non_security_pipes($1_usertype)
 +	files_dontaudit_getattr_non_security_sockets($1_usertype)
-+
+ 
+-	libs_exec_ld_so($1_t)
 +	storage_rw_fuse($1_usertype)
-+
+ 
+-	miscfiles_read_localization($1_t)
+-	miscfiles_read_certs($1_t)
 +	auth_use_nsswitch($1_usertype)
-+
+ 
+-	sysnet_read_config($1_t)
 +	libs_exec_ld_so($1_usertype)
-+
+ 
+-	tunable_policy(`allow_execmem',`
+-		# Allow loading DSOs that require executable stack.
+-		allow $1_t self:process execmem;
+-	')
 +	miscfiles_read_certs($1_usertype)
 +	miscfiles_read_localization($1_usertype)
 +	miscfiles_read_man_pages($1_usertype)
 +	miscfiles_read_public_files($1_usertype)
  
- 	tunable_policy(`allow_execmem',`
- 		# Allow loading DSOs that require executable stack.
-@@ -116,6 +134,12 @@
- 		# Allow making the stack executable via mprotect.
- 		allow $1_t self:process execstack;
- 	')
-+
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1_t self:process execstack;
 +	optional_policy(`
 +		ssh_rw_stream_sockets($1_usertype)
 +		ssh_delete_tmp($1_t)
 +		ssh_signal($1_t)
-+	')
+ 	')
  ')
  
- #######################################
-@@ -147,6 +171,7 @@
+@@ -147,6 +161,7 @@
  interface(`userdom_ro_home_role',`
  	gen_require(`
  		type user_home_t, user_home_dir_t;
@@ -25602,7 +25609,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	role $1 types { user_home_t user_home_dir_t };
-@@ -157,6 +182,7 @@
+@@ -157,6 +172,7 @@
  	#
  
  	type_member $2 user_home_dir_t:dir user_home_dir_t;
@@ -25610,7 +25617,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# read-only home directory
  	allow $2 user_home_dir_t:dir list_dir_perms;
-@@ -168,27 +194,6 @@
+@@ -168,27 +184,6 @@
  	read_sock_files_pattern($2, { user_home_t user_home_dir_t }, user_home_t)
  	files_list_home($2)
  
@@ -25638,7 +25645,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -220,9 +225,10 @@
+@@ -220,9 +215,10 @@
  interface(`userdom_manage_home_role',`
  	gen_require(`
  		type user_home_t, user_home_dir_t;
@@ -25650,7 +25657,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -232,17 +238,20 @@
+@@ -232,17 +228,20 @@
  	type_member $2 user_home_dir_t:dir user_home_dir_t;
  
  	# full control of the home directory
@@ -25681,7 +25688,7 @@ diff -b -B --ignore-all-space --exclude-
  	filetrans_pattern($2, user_home_dir_t, user_home_t, { dir file lnk_file sock_file fifo_file })
  	files_list_home($2)
  
-@@ -250,25 +259,23 @@
+@@ -250,25 +249,23 @@
  	allow $2 user_home_dir_t:dir { manage_dir_perms relabel_dir_perms };
  
  	tunable_policy(`use_nfs_home_dirs',`
@@ -25711,7 +25718,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -303,6 +310,7 @@
+@@ -303,6 +300,7 @@
  	manage_sock_files_pattern($2, user_tmp_t, user_tmp_t)
  	manage_fifo_files_pattern($2, user_tmp_t, user_tmp_t)
  	files_tmp_filetrans($2, user_tmp_t, { dir file lnk_file sock_file fifo_file })
@@ -25719,7 +25726,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -322,6 +330,7 @@
+@@ -322,6 +320,7 @@
  	')
  
  	exec_files_pattern($1, user_tmp_t, user_tmp_t)
@@ -25727,7 +25734,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_tmp($1)
  ')
  
-@@ -368,46 +377,41 @@
+@@ -368,46 +367,41 @@
  
  #######################################
  ## <summary>
@@ -25794,7 +25801,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -412,7 +416,7 @@
+@@ -412,7 +406,7 @@
  
  #######################################
  ## <summary>
@@ -25803,7 +25810,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="userdomain_prefix">
  ##	<summary>
-@@ -420,35 +424,48 @@
+@@ -420,35 +414,48 @@
  ##	is the prefix for user_t).
  ##	</summary>
  ## </param>
@@ -25841,17 +25848,17 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_read_video_dev($1)
 +	dev_write_video_dev($1)
 +	dev_rw_wireless($1)
-+
-+	miscfiles_dontaudit_write_fonts($1)
-+
-+	optional_policy(`
-+		udev_read_db($1)
-+	')
  
 -	xserver_user_x_domain_template($1, $1_t, user_tmpfs_t)
 -	xserver_xsession_entry_type($1_t)
 -	xserver_dontaudit_write_log($1_t)
 -	xserver_stream_connect_xdm($1_t)
++	miscfiles_dontaudit_write_fonts($1)
++
++	optional_policy(`
++		udev_read_db($1)
++	')
++
 +	optional_policy(`
 +		xserver_user_client($1, user_tmpfs_t)
 +		xserver_xsession_entry_type($1)
@@ -25871,7 +25878,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -498,7 +515,7 @@
+@@ -498,7 +505,7 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -25880,7 +25887,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +525,208 @@
+@@ -508,182 +515,208 @@
  	# evolution and gnome-session try to create a netlink socket
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
@@ -26011,19 +26018,19 @@ diff -b -B --ignore-all-space --exclude-
 -		# Allow graphical boot to check battery lifespan
 -		apm_stream_connect($1_t)
 +		canna_stream_connect($1_usertype)
- 	')
- 
- 	optional_policy(`
--		canna_stream_connect($1_t)
++	')
++
++	optional_policy(`
 +		dbus_system_bus_client($1_usertype)
 +
 +		allow $1_usertype $1_usertype:dbus  send_msg;
 +
 +		optional_policy(`
 +			avahi_dbus_chat($1_usertype)
-+		')
-+
-+		optional_policy(`
+ 	')
+ 
+ 	optional_policy(`
+-		canna_stream_connect($1_t)
 +			bluetooth_dbus_chat($1_usertype)
  	')
  
@@ -26162,7 +26169,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +754,26 @@
+@@ -711,13 +744,26 @@
  
  	userdom_base_user_template($1)
  
@@ -26173,9 +26180,7 @@ diff -b -B --ignore-all-space --exclude-
 -	userdom_manage_tmpfs_role($1_r, $1_t)
 +	userdom_manage_tmp_role($1_r, $1_usertype)
 +	userdom_manage_tmpfs_role($1_r, $1_usertype)
- 
--	userdom_exec_user_tmp_files($1_t)
--	userdom_exec_user_home_content_files($1_t)
++
 +	ifelse(`$1',`unconfined',`',`
 +		gen_tunable(allow_$1_exec_content, true)
 +
@@ -26186,7 +26191,9 @@ diff -b -B --ignore-all-space --exclude-
 +		tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
 +                        fs_exec_nfs_files($1_usertype)
 +		')
-+
+ 
+-	userdom_exec_user_tmp_files($1_t)
+-	userdom_exec_user_home_content_files($1_t)
 +		tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
 +			fs_exec_cifs_files($1_usertype)
 +		')
@@ -26194,7 +26201,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +791,71 @@
+@@ -735,70 +781,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26299,7 +26306,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +892,32 @@
+@@ -835,6 +882,32 @@
  	# Local policy
  	#
  
@@ -26332,7 +26339,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +948,81 @@
+@@ -865,51 +938,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26427,7 +26434,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1056,8 @@
+@@ -943,8 +1046,8 @@
  	# Declarations
  	#
  
@@ -26437,7 +26444,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1066,12 @@
+@@ -953,11 +1056,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26452,7 +26459,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1089,53 @@
+@@ -975,36 +1079,53 @@
  		')
  	')
  
@@ -26520,7 +26527,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1171,7 @@
+@@ -1040,7 +1161,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -26529,7 +26536,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1180,7 @@
+@@ -1049,8 +1170,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26539,7 +26546,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1205,9 @@
+@@ -1075,6 +1195,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26549,7 +26556,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1222,7 @@
+@@ -1089,6 +1212,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -26557,7 +26564,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1230,6 @@
+@@ -1096,8 +1220,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26566,7 +26573,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1256,8 @@
+@@ -1124,6 +1246,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -26575,7 +26582,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1286,6 @@
+@@ -1152,20 +1276,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26596,7 +26603,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1331,7 @@
+@@ -1211,6 +1321,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26604,7 +26611,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1397,15 @@
+@@ -1276,11 +1387,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26620,7 +26627,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1516,13 @@
+@@ -1391,12 +1506,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26635,7 +26642,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1555,14 @@
+@@ -1429,6 +1545,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26650,7 +26657,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1578,11 @@
+@@ -1444,9 +1568,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26662,7 +26669,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1639,25 @@
+@@ -1503,6 +1629,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26688,7 +26695,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1732,8 @@
+@@ -1577,6 +1722,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26697,7 +26704,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1827,7 @@
+@@ -1670,6 +1817,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26705,7 +26712,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1955,32 @@
+@@ -1797,19 +1945,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26745,7 +26752,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2015,7 @@
+@@ -1844,6 +2005,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26753,7 +26760,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2563,7 @@
+@@ -2391,27 +2553,7 @@
  
  ########################################
  ## <summary>
@@ -26782,7 +26789,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2917,32 @@
+@@ -2765,11 +2907,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -26817,7 +26824,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3070,25 @@
+@@ -2897,7 +3060,25 @@
  		type user_tmp_t;
  	')
  
@@ -26844,7 +26851,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3125,7 @@
+@@ -2934,6 +3115,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -26852,7 +26859,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3256,559 @@
+@@ -3064,3 +3246,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -p -r1.925 -r1.926
--- selinux-policy.spec	19 Sep 2009 01:38:30 -0000	1.925
+++ selinux-policy.spec	20 Sep 2009 14:32:30 -0000	1.926
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,6 +447,9 @@ exit 0
 %endif
 
 %changelog
+* Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-7
+- Remove allow_exec* booleans for confined users.  Only available for unconfined_t
+
 * Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-6
 - More fixes for sandbox_web_t
 



From thm at fedoraproject.org  Sun Sep 20 16:10:01 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 20 Sep 2009 16:10:01 +0000 (UTC)
Subject: rpms/python-jinja2/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 python-jinja2.spec, 1.6, 1.7 sources, 1.4,
	1.5 python-jinja2-docs.patch, 1.2, NONE
Message-ID: <20090920161001.C40EF11C0418@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31796/devel

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Removed Files:
	python-jinja2-docs.patch 
Log Message:
Update to 2.2.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 15:27:07 -0000	1.4
+++ .cvsignore	20 Sep 2009 16:10:00 -0000	1.5
@@ -1 +1 @@
-Jinja2-2.1.1.tar.gz
+Jinja2-2.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Jan 2009 15:27:07 -0000	1.3
+++ import.log	20 Sep 2009 16:10:00 -0000	1.4
@@ -1,3 +1,4 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
 python-jinja2-2_1-1_fc10:HEAD:python-jinja2-2.1-1.fc10.src.rpm:1229610786
 python-jinja2-2_1_1-1_fc10:HEAD:python-jinja2-2.1.1-1.fc10.src.rpm:1231601194
+python-jinja2-2_2_1-1_fc11:HEAD:python-jinja2-2.2.1-1.fc11.src.rpm:1253462191


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/python-jinja2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-jinja2.spec	26 Jul 2009 20:29:42 -0000	1.6
+++ python-jinja2.spec	20 Sep 2009 16:10:00 -0000	1.7
@@ -1,24 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-jinja2
-Version:	2.1.1
-Release:	3%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	General purpose template engine
-
 Group:		Development/Languages
 License:	BSD
 URL:		http://jinja.pocoo.org/
 Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-Patch0:		%{name}-docs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
-
-%if 0%{?fedora} >= 8
-BuildRequires: 	python-setuptools-devel
-%else
-BuildRequires:	python-setuptools
-%endif
-
+BuildRequires:	python-setuptools-devel
 Requires:	python-babel >= 0.8
 
 %description
@@ -35,22 +27,26 @@ environments.
 
 %prep
 %setup -q -n Jinja2-%{version}
-%patch0 -p1 -b .docs
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py --with-speedups install -O1 --skip-build \
+	    --root %{buildroot}
 
 # fix EOL
 sed -i 's|\r$||g' LICENSE
 
-# fix wrong permission
-%{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+# ensure correct permission
+chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+
+# remove hidden file
+rm -rf docs/_build/html/.buildinfo
+
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +60,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.1-1
+- Update to 2.2.1, mainly a bugfix release.
+- Remove patch no longer needed.
+- Remove conditional for FC-8.
+- Compilation of speedup module has to be explicitly requested now.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -88,4 +90,3 @@ rm -rf %{buildroot}
 
 * Sun Jun 29 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.0-0.1.rc1
 - Modified specfile from the existing python-jinja package.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jan 2009 15:27:07 -0000	1.4
+++ sources	20 Sep 2009 16:10:00 -0000	1.5
@@ -1 +1 @@
-b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz
+fea849d68891218eb0b21c170f1c32d5  Jinja2-2.2.1.tar.gz


--- python-jinja2-docs.patch DELETED ---



From thm at fedoraproject.org  Sun Sep 20 16:25:53 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 20 Sep 2009 16:25:53 +0000 (UTC)
Subject: rpms/python-jinja2/F-11 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 python-jinja2.spec, 1.5, 1.6 sources, 1.4,
	1.5 python-jinja2-docs.patch, 1.2, NONE
Message-ID: <20090920162553.649DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3118/F-11

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Removed Files:
	python-jinja2-docs.patch 
Log Message:
Update to 2.2.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 15:27:07 -0000	1.4
+++ .cvsignore	20 Sep 2009 16:25:53 -0000	1.5
@@ -1 +1 @@
-Jinja2-2.1.1.tar.gz
+Jinja2-2.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Jan 2009 15:27:07 -0000	1.3
+++ import.log	20 Sep 2009 16:25:53 -0000	1.4
@@ -1,3 +1,4 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
 python-jinja2-2_1-1_fc10:HEAD:python-jinja2-2.1-1.fc10.src.rpm:1229610786
 python-jinja2-2_1_1-1_fc10:HEAD:python-jinja2-2.1.1-1.fc10.src.rpm:1231601194
+python-jinja2-2_2_1-1_fc11:F-11:python-jinja2-2.2.1-1.fc11.src.rpm:1253463921


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-11/python-jinja2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-jinja2.spec	26 Feb 2009 21:53:35 -0000	1.5
+++ python-jinja2.spec	20 Sep 2009 16:25:53 -0000	1.6
@@ -1,24 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-jinja2
-Version:	2.1.1
-Release:	2%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	General purpose template engine
-
 Group:		Development/Languages
 License:	BSD
 URL:		http://jinja.pocoo.org/
 Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-Patch0:		%{name}-docs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
-
-%if 0%{?fedora} >= 8
-BuildRequires: 	python-setuptools-devel
-%else
-BuildRequires:	python-setuptools
-%endif
-
+BuildRequires:	python-setuptools-devel
 Requires:	python-babel >= 0.8
 
 %description
@@ -35,22 +27,26 @@ environments.
 
 %prep
 %setup -q -n Jinja2-%{version}
-%patch0 -p1 -b .docs
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py --with-speedups install -O1 --skip-build \
+	    --root %{buildroot}
 
 # fix EOL
 sed -i 's|\r$||g' LICENSE
 
-# fix wrong permission
-%{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+# ensure correct permission
+chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+
+# remove hidden file
+rm -rf docs/_build/html/.buildinfo
+
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +60,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.1-1
+- Update to 2.2.1, mainly a bugfix release.
+- Remove patch no longer needed.
+- Remove conditional for FC-8.
+- Compilation of speedup module has to be explicitly requested now.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -85,4 +90,3 @@ rm -rf %{buildroot}
 
 * Sun Jun 29 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.0-0.1.rc1
 - Modified specfile from the existing python-jinja package.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jan 2009 15:27:07 -0000	1.4
+++ sources	20 Sep 2009 16:25:53 -0000	1.5
@@ -1 +1 @@
-b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz
+fea849d68891218eb0b21c170f1c32d5  Jinja2-2.2.1.tar.gz


--- python-jinja2-docs.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:28 +0000 (UTC)
Subject: rpms/rubygem-actionpack/devel
	rubygem-actionpack-2.3.4-enable-test.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 rubygem-actionpack.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20090920164028.0764A11C04A2@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygem-actionpack/devel

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Added Files:
	rubygem-actionpack-2.3.4-enable-test.patch 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4

rubygem-actionpack-2.3.4-enable-test.patch:
 active_record_unit.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygem-actionpack-2.3.4-enable-test.patch ---
--- test/active_record_unit.rb.debug	2009-09-18 01:45:17.000000000 +0900
+++ test/active_record_unit.rb	2009-09-18 02:08:19.000000000 +0900
@@ -17,7 +17,7 @@
   $stderr.print 'Attempting to load Active Record... '
   begin
     PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
-    raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
+    #raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
     $LOAD_PATH.unshift PATH_TO_AR
     require 'active_record'
     require 'active_record/fixtures'


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Aug 2009 16:42:54 -0000	1.9
+++ .cvsignore	20 Sep 2009 16:40:24 -0000	1.10
@@ -1 +1 @@
-actionpack-2.3.3.gem
+actionpack-2.3.4.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/rubygem-actionpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-actionpack.spec	2 Aug 2009 16:45:25 -0000	1.12
+++ rubygem-actionpack.spec	20 Sep 2009 16:40:24 -0000	1.13
@@ -4,23 +4,28 @@
 %define gemname actionpack
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Version: 2.3.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:  rubygem-actionpack-2.3.4-enable-test.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(rack) >= 1.0.0
+Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems
 BuildRequires(check): rubygem(rake)
 BuildRequires(check): rubygem(rack) >= 1.0.0
 BuildRequires(check): rubygem(mocha) >= 0.9.7
 BuildRequires(check): rubygem(activerecord) = %{version}
+BuildRequires(check): rubygem(sqlite3-ruby)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -37,11 +42,23 @@ gem install --local --install-dir .%{gem
             -V \
             --force --rdoc %{SOURCE0}
 
+pushd .%{geminstdir}
+%patch0 -p0
+
+# create missing symlink
+pushd test/fixtures/layout_tests/layouts/
+ln -sf ../../symlink_parent/ symlinked
+popd
+
+popd
+
 # Remove backup files
-find ./%{geminstdir} -type f -name "*~" -delete
+# No! these are needed for rake test
+# find ./%{geminstdir} -type f -name "*~" -delete
 
 # Delete zero-length files
-find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+# No! these are also needed for rake test
+# find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
 
 # Fix anything executable that does not have a shebang
 for file in `find ./%{geminstdir} -type f -perm /a+x`; do
@@ -68,15 +85,12 @@ rm -rf %{buildroot}
 pushd .%{geminstdir}
 
 # dependency loop
+# depends on actionmailer, while actionmailer has BR(check): actionpack
 mv test/controller/assert_select_test.rb \
             test/controller/assert_select_test.rb.skip
 
-# ??? need checking
-mv test/controller/caching_test.rb \
-            test/controller/caching_test.rb.skip
-
-# Still 6 tests fail, please someone investigate
-rake test --trace || :
+# Now as far as I checked rake test succeeds.
+rake test --trace
 
 %files
 %defattr(-, root, root, -)
@@ -95,6 +109,10 @@ rake test --trace || :
 
 
 %changelog
+* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4 (bug 520843, CVE-2009-3009)
+- Fix tests
+
 * Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-1
 - 2.3.3
 - Enable test (some tests fail, please someone investigate!!)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Aug 2009 16:42:54 -0000	1.9
+++ sources	20 Sep 2009 16:40:24 -0000	1.10
@@ -1 +1 @@
-7d60ee9499c04712ede6c747e5028390  actionpack-2.3.3.gem
+da53635065d9083ec37be4a36763af9c  actionpack-2.3.4.gem



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:28 +0000 (UTC)
Subject: rpms/rubygem-activerecord/devel .cvsignore, 1.9,
	1.10 rubygem-activerecord.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20090920164028.8010F11C04DE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activerecord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygem-activerecord/devel

Modified Files:
	.cvsignore rubygem-activerecord.spec sources 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activerecord/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Jul 2009 10:55:14 -0000	1.9
+++ .cvsignore	20 Sep 2009 16:40:26 -0000	1.10
@@ -1 +1 @@
-activerecord-2.3.3.gem
+activerecord-2.3.4.gem


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activerecord/devel/rubygem-activerecord.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-activerecord.spec	26 Jul 2009 10:55:14 -0000	1.11
+++ rubygem-activerecord.spec	20 Sep 2009 16:40:26 -0000	1.12
@@ -4,18 +4,25 @@
 %define gemname activerecord
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Version: 2.3.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: ruby(abi) = %{rubyabi}
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
 BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(activesupport) = %{version}
+BuildRequires(check): rubygem(sqlite3-ruby)
+BuildRequires(check): rubygem(mocha)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -26,34 +33,48 @@ Subscription, that can find, save, and d
 manual SQL.
 
 %prep
+%setup -q -c -T
 
-%build
+# rake test creates debug.log under %%{geminstdir},
+# so let's install gem file under %%{_builddir} first
 
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
+mkdir -p ./%{gemdir}
+gem install --local --install-dir ./%{gemdir} \
             --force --rdoc %{SOURCE0}
 
 # Remove backup files
-find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+find ./%{geminstdir} -type f -name "*~" -delete
 
 # Delete zero-length files
-find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+# No! These are needed for rake test
+# find ./%{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
+for file in `find ./%{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
+for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
 done
 
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}
+
 %clean
 rm -rf %{buildroot}
 
+%check
+# Only test sqlite3 backend
+pushd .%{geminstdir}
+rake test_sqlite3 --trace
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
@@ -71,6 +92,10 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Fri Sep 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4
+- Enable check
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activerecord/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Jul 2009 10:55:14 -0000	1.9
+++ sources	20 Sep 2009 16:40:26 -0000	1.10
@@ -1 +1 @@
-1516ff58e4e43987aed43a09d7b342d2  activerecord-2.3.3.gem
+edb29388f671d27c1670c52694f2dd99  activerecord-2.3.4.gem



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:27 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/devel .cvsignore, 1.9,
	1.10 rubygem-actionmailer.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20090920164027.307D011C0419@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionmailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygem-actionmailer/devel

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Aug 2009 16:42:53 -0000	1.9
+++ .cvsignore	20 Sep 2009 16:40:23 -0000	1.10
@@ -1 +1 @@
-actionmailer-2.3.3.gem
+actionmailer-2.3.4.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/devel/rubygem-actionmailer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-actionmailer.spec	20 Aug 2009 16:14:01 -0000	1.12
+++ rubygem-actionmailer.spec	20 Sep 2009 16:40:23 -0000	1.13
@@ -4,10 +4,12 @@
 %define gemname actionmailer
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.3.3
-Release: 2%{?dist}
+Version: 2.3.4
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -15,6 +17,7 @@ Source0: http://gems.rubyforge.org/gems/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(actionpack) = %{version}
+Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems
 BuildRequires(check): rubygem(rake)
 BuildRequires(check): rubygem(actionpack) = %{version}
@@ -58,6 +61,10 @@ cp -a .%{gemdir}/* %{buildroot}%{gemdir}
 rm -rf %{buildroot}
 
 %check
+export GEM_PATH=$(pwd)/%{gemdir}
+pushd .%{geminstdir}
+
+rake test --trace
 
 %files
 %defattr(-, root, root, -)
@@ -75,6 +82,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4
+
 * Thu Aug 02 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-2
 - Disable test
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Aug 2009 16:42:53 -0000	1.9
+++ sources	20 Sep 2009 16:40:24 -0000	1.10
@@ -1 +1 @@
-b8caa899e009e09d643e6105d977b165  actionmailer-2.3.3.gem
+fe861cebd256f43c676a9c2ffb8bb8f5  actionmailer-2.3.4.gem



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:30 +0000 (UTC)
Subject: rpms/rubygem-activesupport/devel .cvsignore, 1.9,
	1.10 rubygem-activesupport.spec, 1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090920164030.8EDDA11C0419@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activesupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygem-activesupport/devel

Modified Files:
	.cvsignore rubygem-activesupport.spec sources 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activesupport/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Jul 2009 10:53:00 -0000	1.9
+++ .cvsignore	20 Sep 2009 16:40:28 -0000	1.10
@@ -1 +1 @@
-activesupport-2.3.3.gem
+activesupport-2.3.4.gem


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activesupport/devel/rubygem-activesupport.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-activesupport.spec	26 Jul 2009 10:53:01 -0000	1.10
+++ rubygem-activesupport.spec	20 Sep 2009 16:40:28 -0000	1.11
@@ -4,9 +4,11 @@
 %define gemname activesupport
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Version: 2.3.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -14,6 +16,7 @@ URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
+Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -64,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4 (bug 520843, CVE-2009-3009)
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activesupport/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Jul 2009 10:53:01 -0000	1.9
+++ sources	20 Sep 2009 16:40:28 -0000	1.10
@@ -1 +1 @@
-7ca84c881594a6a999c9ac7e5e37011c  activesupport-2.3.3.gem
+ee059377acd0536645e6a06a96f1ffcc  activesupport-2.3.4.gem



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:31 +0000 (UTC)
Subject: rpms/rubygem-rails/devel .cvsignore, 1.9, 1.10 rubygem-rails.spec, 
	1.16, 1.17 sources, 1.9, 1.10
Message-ID: <20090920164031.18E9611C04A2@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-rails/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygem-rails/devel

Modified Files:
	.cvsignore rubygem-rails.spec sources 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rails/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Jul 2009 10:42:17 -0000	1.9
+++ .cvsignore	20 Sep 2009 16:40:30 -0000	1.10
@@ -1 +1 @@
-rails-2.3.3.gem
+rails-2.3.4.gem


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rails/devel/rubygem-rails.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rubygem-rails.spec	30 Jul 2009 17:32:05 -0000	1.16
+++ rubygem-rails.spec	20 Sep 2009 16:40:30 -0000	1.17
@@ -4,22 +4,25 @@
 %define gemname rails
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.3.3
-Release: 2%{?dist}
+Version: 2.3.4
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: ruby(rubygems) >= 1.1.1
+Requires: ruby(rubygems) >= 1.3.4
 Requires: rubygem(rake) >= 0.8.3
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activerecord) = %{version}
 Requires: rubygem(actionpack) = %{version}
 Requires: rubygem(actionmailer) = %{version}
 Requires: rubygem(activeresource) = %{version}
+Requires: ruby(abi) = %{rubyabi}
 
 BuildRequires: rubygems
 
@@ -108,6 +111,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4
+
 * Fri Jul 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
 - Restore some changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rails/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Jul 2009 10:42:17 -0000	1.9
+++ sources	20 Sep 2009 16:40:30 -0000	1.10
@@ -1 +1 @@
-776547f3b8e4f205b389fa2f677b20dc  rails-2.3.3.gem
+4e3cf205580b7839584570c8be674314  rails-2.3.4.gem



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:29 +0000 (UTC)
Subject: rpms/rubygem-activeresource/devel .cvsignore, 1.8,
	1.9 rubygem-activeresource.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090920164029.104E811C04E1@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activeresource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygem-activeresource/devel

Modified Files:
	.cvsignore rubygem-activeresource.spec sources 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeresource/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Jul 2009 10:14:59 -0000	1.8
+++ .cvsignore	20 Sep 2009 16:40:27 -0000	1.9
@@ -1 +1 @@
-activeresource-2.3.3.gem
+activeresource-2.3.4.gem


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeresource/devel/rubygem-activeresource.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-activeresource.spec	26 Jul 2009 10:14:59 -0000	1.9
+++ rubygem-activeresource.spec	20 Sep 2009 16:40:27 -0000	1.10
@@ -4,18 +4,24 @@
 %define gemname activeresource
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Version: 2.3.4
 Release: 1%{?dist}
 Group: Development/Languages
-License: GPLv2+ or Ruby
+License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
+Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(mocha)
+BuildRequires(check): rubygem(activesupport) = %{version}
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -53,6 +59,10 @@ done
 %clean
 rm -rf %{buildroot}
 
+%check
+pushd %{buildroot}%{geminstdir}
+rake test --trace
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
@@ -67,6 +77,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4
+- Enable test
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 2.3.3-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeresource/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Jul 2009 10:14:59 -0000	1.8
+++ sources	20 Sep 2009 16:40:27 -0000	1.9
@@ -1 +1 @@
-c9c5530089534d8f4ffcec20c465af3b  activeresource-2.3.3.gem
+c604f93fe8db04d5dca5ae150f39cb8d  activeresource-2.3.4.gem



From mtasaka at fedoraproject.org  Sun Sep 20 16:40:32 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 16:40:32 +0000 (UTC)
Subject: rpms/rubygems/devel rubygems-1.3.5-noarch-gemdir.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 rubygems.spec, 1.10, 1.11 sources, 1.7,
	1.8 rubygems-1.3.1-noarch-gemdir.patch, 1.1, NONE
Message-ID: <20090920164032.AB0CD11C0419@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygems/devel

Modified Files:
	.cvsignore rubygems.spec sources 
Added Files:
	rubygems-1.3.5-noarch-gemdir.patch 
Removed Files:
	rubygems-1.3.1-noarch-gemdir.patch 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4

rubygems-1.3.5-noarch-gemdir.patch:
 defaults.rb |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rubygems-1.3.5-noarch-gemdir.patch ---
--- rubygems-1.3.5/lib/rubygems/defaults.rb.noarch	2009-06-23 07:54:36.000000000 +0900
+++ rubygems-1.3.5/lib/rubygems/defaults.rb	2009-09-21 00:29:09.000000000 +0900
@@ -25,8 +25,10 @@
       File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
                 ConfigMap[:ruby_version])
     else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-                ConfigMap[:ruby_version])
+      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
+      File.join(gemdir, ConfigMap[:ruby_version])
+#      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+#                ConfigMap[:ruby_version])
     end
   end
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Dec 2008 12:50:12 -0000	1.7
+++ .cvsignore	20 Sep 2009 16:40:31 -0000	1.8
@@ -1 +1 @@
-rubygems-1.3.1.tgz
+rubygems-1.3.5.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygems.spec	27 Jul 2009 03:38:26 -0000	1.10
+++ rubygems.spec	20 Sep 2009 16:40:31 -0000	1.11
@@ -3,16 +3,18 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define repoid 60718
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz
-Patch0: rubygems-1.3.1-noarch-gemdir.patch
+Source0: http://rubyforge.org/frs/download.php/%{repoid}/rubygems-%{version}.tgz
+Patch0: rubygems-1.3.5-noarch-gemdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8 ruby-rdoc
 BuildRequires:  ruby ruby-rdoc
@@ -25,7 +27,7 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .noarch
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -39,7 +41,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=%{buildroot}/%{gem_home} \
-    ruby setup.rb --prefix=%{_prefix} \
+    ruby setup.rb --prefix=/ \
         --no-rdoc --no-ri \
         --destdir=%{buildroot}/%{ruby_sitelib}/
 
@@ -53,7 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog
+%doc README ChangeLog
+%doc History.txt
 %doc GPL.txt LICENSE.txt
 %dir %{gem_dir}
 %dir %{gem_home}
@@ -65,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/*
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.5-1
+- Update to 1.3.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Dec 2008 12:50:12 -0000	1.7
+++ sources	20 Sep 2009 16:40:31 -0000	1.8
@@ -1 +1 @@
-a04ee6f6897077c5b75f5fd1e134c5a9  rubygems-1.3.1.tgz
+6e317335898e73beab15623cdd5f8cff  rubygems-1.3.5.tgz


--- rubygems-1.3.1-noarch-gemdir.patch DELETED ---



From transif at fedoraproject.org  Sun Sep 20 16:42:10 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 20 Sep 2009 16:42:10 +0000 (UTC)
Subject: comps/po da.po,1.21,1.22
Message-ID: <20090920164210.F3C9611C00E6@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8697/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.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- da.po	17 Jun 2009 13:54:03 -0000	1.21
+++ da.po	20 Sep 2009 16:42:10 -0000	1.22
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 14:05+0000\n"
-"PO-Revision-Date: 2009-06-17 14:43+0200\n"
+"POT-Creation-Date: 2009-09-01 19:27+0000\n"
+"PO-Revision-Date: 2009-09-20 18:40+0200\n"
 "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -17,282 +17,299 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
-#: ../comps-f12.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Et letv?gtsskrivebordsmilj? der virker godt p? langsomme computere."
 
 #: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:3 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administrationsv?rkt?jer"
 
 #: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Underst?ttelse af afrikaans"
 
 #: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Underst?ttelse af albansk"
 
 #: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:7 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Programmer"
 
 #: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Programmer til at udf?re en r?kke af opgaver"
 
 #: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:9 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Underst?ttelse af arabisk"
 
 #: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:10 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Underst?ttelse af armensk"
 
 #: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Underst?ttelse af assamesisk"
 
 #: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:12 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Forfatterskab og udgivning"
 
 #: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Base"
 
 #: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:15 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
 #: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Grundl?ggende underst?ttelse af programmeringssproget Ruby."
 
 #: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Underst?ttelse af baskisk"
 
 #: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Underst?ttelse af hviderussisk"
 
 #: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Underst?ttelse af bengalsk"
 
 #: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
-#: ../comps-f12.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Underst?ttelse af bhutanesisk"
 
 #: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
-#: ../comps-f12.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Underst?ttelse af bosnisk"
 
 #: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
-#: ../comps-f12.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Underst?ttelse af braziliansk-portugisisk"
 
 #: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
-#: ../comps-f12.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Underst?ttelse af bretonsk"
 
 #: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
-#: ../comps-f12.xml.in.h:24 ../comps-el5.xml.in.h:8
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
 msgid "Buildsystem building group"
 msgstr "Byggesystem bygningsgruppe"
 
 #: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
-#: ../comps-f12.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Underst?ttelse af bulgarsk"
 
 #: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
-#: ../comps-f12.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Underst?ttelse af catalansk"
 
 #: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
-#: ../comps-f12.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "Underst?ttelse af kinesisk"
 
 #: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
-#: ../comps-f12.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
 msgstr "Sektorgruppering"
 
 #: ../comps-f9.xml.in.h:26 ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:30
-#: ../comps-f12.xml.in.h:30
+#: ../comps-f12.xml.in.h:34 ../comps-f13.xml.in.h:34
 msgid "Clustering Support"
 msgstr "Underst?ttelse af sektorgruppering"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:32
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
 msgid "Core"
 msgstr "Kerne"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:33
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
 msgid "Croatian Support"
 msgstr "Underst?ttelse af kroatisk"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:34 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "Underst?ttelse af tjekkisk"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:35
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
 msgid "DNS Name Server"
 msgstr "DNS-navneserver"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:36
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
 msgid "Danish Support"
 msgstr "Underst?ttelse af dansk"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:38 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:10
 msgid "Desktop Environments"
 msgstr "Skrivebordsmilj?er"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:39 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop environments"
 msgstr "Skrivebordsmilj?er"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:40 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:12
 msgid "Development"
 msgstr "Udvikling"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:41
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
 msgid "Development Libraries"
 msgstr "Udviklingsbiblioteker"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:42 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:13
 msgid "Development Tools"
 msgstr "Udviklingsv?rkt?jer"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:43
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
 msgid "Dial-up Networking Support"
 msgstr "Underst?ttelse af opkaldsnetv?rk"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:44
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
 msgid "Dutch Support"
 msgstr "Underst?ttelse af hollandsk"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:45 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:15
 msgid "Editors"
 msgstr "Redigeringsprogrammer"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:46 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:16
 msgid "Educational Software"
 msgstr "Undervisningssoftware"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:47 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:17
 msgid "Educational software for learning"
 msgstr "Undervisningssoftware til indl?ring"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:49 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:18
 msgid "Engineering and Scientific"
 msgstr "Videnskabeligt"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:50
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
 msgid "English (UK) Support"
 msgstr "Underst?ttelse af engelsk (UK)"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:51
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
 msgid "Esperanto Support"
 msgstr "Underst?ttelse af esperanto"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:52
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
 msgid "Estonian Support"
 msgstr "Underst?ttelse af estisk"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:53
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
 msgid "Ethiopic Support"
 msgstr "Underst?ttelse af etiopisk"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:54 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:19
 msgid "FTP Server"
 msgstr "FTP-server"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:55
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
 msgid "Faeroese Support"
 msgstr "Underst?ttelse af f?r?sk"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:56
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:57 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:20
 msgid "Fedora Packager"
 msgstr "Fedora pakkeansvarlig"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:59
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
 msgid "Filipino Support"
 msgstr "Underst?ttelse af filipinsk"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:60
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
 msgid "Finnish Support"
 msgstr "Underst?ttelse af finsk"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:62
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
 msgid "Fonts"
 msgstr "Skrifttyper"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:63
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "Skrifttypepakker til visning af tekst p? skrivebordet."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:64
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
 msgid "French Support"
 msgstr "Underst?ttelse af fransk"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:67 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:21
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
@@ -302,17 +319,19 @@ msgstr ""
 "CD'er og multimediefiler."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:68 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:22
 msgid "GNOME Desktop Environment"
 msgstr "GNOME-skrivebordsmilj?"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:69 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:23
 msgid "GNOME Software Development"
 msgstr "GNOME-softwareudvikling"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:70
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -321,82 +340,87 @@ msgstr ""
 "skrivebord, systemikoner og et grafisk filh?ndteringsprogram."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:71
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
 msgid "Gaelic Support"
 msgstr "Underst?ttelse for g?lisk"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:72
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
 msgid "Galician Support"
 msgstr "Underst?ttelse af galicisk"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:73 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
 msgid "Games and Entertainment"
 msgstr "Spil og underholdning"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:74
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
 msgid "Georgian Support"
 msgstr "Underst?ttelse af georgisk"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:75
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
 msgid "German Support"
 msgstr "Underst?ttelse af tysk"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:76 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:26
 msgid "Graphical Internet"
 msgstr "Grafisk internet"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:77 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:27
 msgid "Graphics"
 msgstr "Grafik"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:78
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
 msgid "Greek Support"
 msgstr "Underst?ttelse af gr?sk"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:79
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
 msgid "Gujarati Support"
 msgstr "Underst?ttelse af gujarati"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:80 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:28
 msgid "Hardware Support"
 msgstr "Hardwareunderst?ttelse"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:82 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:29
 msgid "Hebrew Support"
 msgstr "Underst?ttelse af hebraisk"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:84
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
 msgid "Hindi Support"
 msgstr "Underst?ttelse af hindi"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:85
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
 msgid "Hungarian Support"
 msgstr "Underst?ttelse af ungarsk"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:86
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
 msgid "Icelandic Support"
 msgstr "Underst?ttelse af islandsk"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:87
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
 msgid "Indonesian Support"
 msgstr "Underst?ttelse af indonesisk"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:90 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:30
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
@@ -405,7 +429,7 @@ msgstr ""
 "GNOME."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:91
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -414,13 +438,14 @@ msgstr ""
 "Xfce."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:92 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:31
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 "Install?r disse pakker for at udvikle grafiske programmer til Qt og KDE."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:93
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
 msgid ""
 "Install these tools to enable the system to print or act as a print server."
 msgstr ""
@@ -428,7 +453,8 @@ msgstr ""
 "fungere som en printserver."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:94 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
 msgid ""
 "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
@@ -436,52 +462,57 @@ msgstr ""
 "brugerflade."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:95
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Integreret udviklingsmilj? baseret p? Eclipse."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:97
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
 msgid "Inuktitut Support"
 msgstr "Underst?ttelse af inuktitut"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:98
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
 msgid "Irish Support"
 msgstr "Underst?ttelse af irsk"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:99
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
 msgid "Italian Support"
 msgstr "Underst?ttelse af italiensk"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:100 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
 msgid "Japanese Support"
 msgstr "Underst?ttelse af japansk"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:101 ../comps-el4.xml.in.h:31
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:102 ../comps-el4.xml.in.h:32
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java-udvikling"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:103 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop Environment)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:104 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
 msgid "KDE Software Development"
 msgstr "KDE-softwareudvikling"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:105
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -490,130 +521,142 @@ msgstr ""
 "skrivebord, systemikoner og et grafisk filh?ndteringsprogram."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:106
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
 msgid "Kannada Support"
 msgstr "Underst?ttelse af kannada"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:108
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
 msgid "Kashubian Support"
 msgstr "Underst?ttelse af kasjubisk"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:110
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
 msgid "Khmer Support"
 msgstr "Underst?ttelse af khmer"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:113
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
 msgid "Korean Support"
 msgstr "Underst?ttelse af koreansk"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:114
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
 msgid "Kurdish Support"
 msgstr "Underst?ttelse af kurdisk"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:116
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
 msgid "Languages"
 msgstr "Sprog"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:117
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
 msgid "Lao Support"
 msgstr "Underst?ttelse af lao"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:119
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
 msgid "Latvian Support"
 msgstr "Underst?ttelse af lettisk"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:120
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
 msgid "Legacy Fonts"
 msgstr "For?ldede skrifttyper"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:121
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
 msgid "Legacy Network Server"
 msgstr "For?ldet netv?rksserver"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
-#: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:122
+#: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
+#: ../comps-f13.xml.in.h:130
 msgid "Legacy Software Development"
 msgstr "For?ldet softwareudvikling"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
-#: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:123
+#: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Support"
 msgstr "For?ldet softwareunderst?ttelse"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:124
+#: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
+#: ../comps-f13.xml.in.h:132
 msgid "Lithuanian Support"
 msgstr "Underst?ttelse af litauisk"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:125
+#: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
+#: ../comps-f13.xml.in.h:133
 msgid "Low Saxon Support"
 msgstr "Underst?ttelse af plattysk"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
-#: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:127
+#: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
+#: ../comps-f13.xml.in.h:135
 msgid "Macedonian Support"
 msgstr "Underst?ttelse af makedonsk"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
-#: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:128
-#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
+#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
 msgid "Mail Server"
 msgstr "Mailserver"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
-#: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:131
+#: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
+#: ../comps-f13.xml.in.h:140
 msgid "Malay Support"
 msgstr "Underst?ttelse af malajisk"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
-#: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:132
+#: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
+#: ../comps-f13.xml.in.h:141
 msgid "Malayalam Support"
 msgstr "Underst?ttelse af malayalam"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
-#: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:135
+#: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
+#: ../comps-f13.xml.in.h:144
 msgid "Maori Support"
 msgstr "Underst?ttelse af maori"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:136
+#: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
+#: ../comps-f13.xml.in.h:145
 msgid "Marathi Support"
 msgstr "Underst?ttelse af marathi"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
-#: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:138
+#: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
+#: ../comps-f13.xml.in.h:149
 msgid "Mongolian Support"
 msgstr "Underst?ttelse af mongolsk"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
-#: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:139
+#: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
+#: ../comps-f13.xml.in.h:150
 msgid "MySQL Database"
 msgstr "MySQL-database"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
-#: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:141
+#: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
+#: ../comps-f13.xml.in.h:152
 msgid "Nepali Support"
 msgstr "Underst?ttelse af nepalesisk"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
-#: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:142
-#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
+#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
 msgid "Network Servers"
 msgstr "Netv?rksservere"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:143
-#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
 msgid "News Server"
 msgstr "Nyhedsserver"
 
@@ -622,34 +665,38 @@ msgid "Northern Sami Support"
 msgstr "Underst?ttelse af nordsamisk"
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
-#: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:144
+#: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
+#: ../comps-f13.xml.in.h:155
 msgid "Northern Sotho Support"
 msgstr "Underst?ttelse af nordsesotho"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
-#: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:145
+#: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
+#: ../comps-f13.xml.in.h:156
 msgid "Norwegian Support"
 msgstr "Underst?ttelse af norsk"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:148
-#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
+#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
 msgid "Office/Productivity"
 msgstr "Kontor/Produktivitet"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
-#: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:149
+#: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
+#: ../comps-f13.xml.in.h:160
 msgid "Older bitmap and vector fonts packages"
 msgstr "?ldre bitmap- og vektorskrifttypepakker"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
-#: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:151
+#: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
+#: ../comps-f13.xml.in.h:162
 msgid "Oriya Support"
 msgstr "Underst?ttelse af oriya"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
-#: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:152
-#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
+#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -657,47 +704,56 @@ msgstr ""
 "Pakker som tilbyder funktionalitet til udvikling og bygning af programmer."
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
-#: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:154
+#: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
+#: ../comps-f13.xml.in.h:165
 msgid "Persian Support"
 msgstr "Underst?ttelse af persisk"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
-#: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:155
+#: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
+#: ../comps-f13.xml.in.h:166
 msgid "Polish Support"
 msgstr "Underst?ttelse af polsk"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
-#: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:156
+#: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
+#: ../comps-f13.xml.in.h:167
 msgid "Portuguese Support"
 msgstr "Underst?ttelse af portugisisk"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
-#: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:157
+#: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
+#: ../comps-f13.xml.in.h:168
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL-database"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
-#: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:158
+#: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
+#: ../comps-f13.xml.in.h:169
 msgid "Printing Support"
 msgstr "Udskriftsunderst?ttelse"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
-#: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:159
+#: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
+#: ../comps-f13.xml.in.h:170
 msgid "Punjabi Support"
 msgstr "Underst?ttelse af punjabisk"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
-#: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:160
+#: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
+#: ../comps-f13.xml.in.h:171
 msgid "Romanian Support"
 msgstr "Underst?ttelse af rum?nsk"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:161
+#: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
+#: ../comps-f13.xml.in.h:172
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:162
+#: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
+#: ../comps-f13.xml.in.h:173
 msgid "Russian Support"
 msgstr "Underst?ttelse af russisk"
 
@@ -710,67 +766,76 @@ msgid "SUGAR is the desktop environment 
 msgstr "SUGAR er det skrivebordsmilj?, der blev udviklet til OLPC XO."
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
-#: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:163
+#: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
+#: ../comps-f13.xml.in.h:174
 msgid "Samoan Support"
 msgstr "Underst?ttelse af samoan"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
-#: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:166
+#: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
+#: ../comps-f13.xml.in.h:177
 msgid "Serbian Support"
 msgstr "Underst?ttelse af serbisk"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
-#: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:167
+#: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
+#: ../comps-f13.xml.in.h:178
 msgid "Server Configuration Tools"
 msgstr "V?rkt?j til serverkonfiguration"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
-#: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:168
-#: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
+#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
 msgid "Servers"
 msgstr "Servere"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
-#: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:169
-#: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 "Simple vinduesh?ndteringer, som ikke er en del af st?rre skrivebordsmilj?er."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
-#: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:171
+#: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
+#: ../comps-f13.xml.in.h:182
 msgid "Sinhala Support"
 msgstr "Underst?ttelse af singalesisk"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
-#: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:172
+#: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
+#: ../comps-f13.xml.in.h:183
 msgid "Slovak Support"
 msgstr "Underst?ttelse af slovakisk"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
-#: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:173
+#: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
+#: ../comps-f13.xml.in.h:184
 msgid "Slovenian Support"
 msgstr "Underst?ttelse af slovensk"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
-#: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:174
+#: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
+#: ../comps-f13.xml.in.h:185
 msgid "Smallest possible installation"
 msgstr "Mindst mulige installation"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
-#: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:175
-#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
+#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
 msgid "Software used for running network servers"
 msgstr "Software til brug ved k?rsel af netv?rksservere"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
-#: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:176
+#: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
+#: ../comps-f13.xml.in.h:187
 msgid "Somali Support"
 msgstr "Underst?ttelse af somalisk"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
-#: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:177
+#: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
+#: ../comps-f13.xml.in.h:188
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -779,119 +844,131 @@ msgstr ""
 "tillader dig at danne og redigere tekstfiler. Dette inkluderer Emacs og Vi."
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
-#: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:178
-#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
+#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
 msgid "Sound and Video"
 msgstr "Lyd og video"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
-#: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:179
+#: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
+#: ../comps-f13.xml.in.h:190
 msgid "Southern Ndebele Support"
 msgstr "Underst?ttelse af sydndebele"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
-#: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:180
+#: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Sotho Support"
 msgstr "Underst?ttelse af sydsesotho"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
-#: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:181
+#: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
+#: ../comps-f13.xml.in.h:192
 msgid "Spanish Support"
 msgstr "Underst?ttelse af spansk"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
-#: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:185
-#: ../comps-el4.xml.in.h:46
+#: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
+#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr ""
 "Underst?ttelse af udvikling af programmer i programmeringssproget Java."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
-#: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:188
-#: ../comps-el4.xml.in.h:47
+#: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
+#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr ""
 "Underst?ttelse af k?rsel af programmer skrevet i programmeringssproget Java."
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
-#: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:190
+#: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
+#: ../comps-f13.xml.in.h:201
 msgid "Swati Support"
 msgstr "Underst?ttelse af swati"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
-#: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:191
+#: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
+#: ../comps-f13.xml.in.h:202
 msgid "Swedish Support"
 msgstr "Underst?ttelse af svensk"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
-#: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:192
-#: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
+#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
 msgid "System Tools"
 msgstr "Systemv?rkt?jer"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
-#: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:193
+#: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
+#: ../comps-f13.xml.in.h:204
 msgid "Tagalog Support"
 msgstr "Underst?ttelse af tagalog"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
-#: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:195
+#: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
+#: ../comps-f13.xml.in.h:206
 msgid "Tamil Support"
 msgstr "Underst?ttelse af tamilsk"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
-#: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:196
+#: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
+#: ../comps-f13.xml.in.h:207
 msgid "Telugu Support"
 msgstr "Underst?ttelse af telugu"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
-#: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:198
-#: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
+#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
 msgid "Text-based Internet"
 msgstr "Tekstbaseret internet"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
-#: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:199
+#: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
+#: ../comps-f13.xml.in.h:210
 msgid "Thai Support"
 msgstr "Underst?ttelse af thailandsk"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
-#: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:200
-#: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "Programmerne inkluderer kontorpakker, PDF-visere med mere."
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
-#: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:201
+#: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
+#: ../comps-f13.xml.in.h:212
 msgid ""
 "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "Pakkerne i denne gruppe er hovedbiblioteker til udvikling af programmer."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
-#: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:202
-#: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr ""
 "Disse pakker tillader dig at konfigurere en IMAP- eller SMTP-mailserver."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
-#: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:203
+#: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
+#: ../comps-f13.xml.in.h:214
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Disse pakker g?r dig i stand til at udvikle programmer til X-vinduessystemet."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
-#: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:204
-#: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
 msgid ""
 "These packages are helpful when developing web applications or web pages."
 msgstr ""
 "Disse pakker er nyttige ved udvikling af webapplikationer eller websider."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
-#: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:205
+#: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
+#: ../comps-f13.xml.in.h:216
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
@@ -899,7 +976,8 @@ msgstr ""
 "Kerberos og NIS."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
-#: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:206
+#: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
+#: ../comps-f13.xml.in.h:217
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -908,17 +986,20 @@ msgstr ""
 "eksempel rsh og telnet."
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
-#: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:207
+#: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
+#: ../comps-f13.xml.in.h:218
 msgid "These packages provide a virtualization environment."
 msgstr "Disse pakker stiller virtualizationsmilj?er til r?dighed."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
-#: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:208
+#: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
+#: ../comps-f13.xml.in.h:219
 msgid "These packages provide compatibility with previous releases."
 msgstr "Disse pakker giver kombatibilitet med tidligere udgivelser."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
-#: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:209
+#: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
+#: ../comps-f13.xml.in.h:220
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -927,7 +1008,8 @@ msgstr ""
 "skrifttyper og inddata-metoder."
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
-#: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:210
+#: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
+#: ../comps-f13.xml.in.h:221
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -936,20 +1018,20 @@ msgstr ""
 "konvertere dem til HTML, PDF, Postscript og tekst."
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
-#: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:211
-#: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
+#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Disse v?rkt?jer g?r dig i stand til at k?re en webserver p? systemet."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
-#: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:212
-#: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
+#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Disse v?rkt?jer g?r dig i stand til at k?re en FTP-server p? systemet."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
-#: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:213
-#: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -958,19 +1040,21 @@ msgstr ""
 "eksempel automake, gcc, perl, python og fejls?gningsprogrammer."
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
-#: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:214
-#: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
 "Denne gruppe g?r dig i stand til at konfigurere systemet som en nyhedsserver."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
-#: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:215
+#: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
+#: ../comps-f13.xml.in.h:226
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "Denne gruppe indeholder alle Red Hats serverkonfigurationsv?rkt?jer."
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
-#: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:216
+#: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
+#: ../comps-f13.xml.in.h:227
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -979,14 +1063,14 @@ msgstr ""
 "lave sm? router/firewall bokse."
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
-#: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:217
-#: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
+#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "Denne gruppe inkluderer grafisk e-post-, web- og chatklienter."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
-#: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:218
-#: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
+#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -995,14 +1079,14 @@ msgstr ""
 "udregninger, samt omregning af enheder."
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
-#: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:219
-#: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "Denne gruppe inkluderer pakker til at manipulere og skanne billeder."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
-#: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:220
-#: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1011,8 +1095,8 @@ msgstr ""
 "programmer kr?ver ikke X-vinduessystemet."
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
-#: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:221
-#: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1021,16 +1105,16 @@ msgstr ""
 "systemet, for eksempel til at administrere brugerkonti eller systemhardware."
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
-#: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:222
-#: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
 msgstr ""
 "Denne gruppe er en samling af v?rkt?jer og ressourcer til armenske milj?er."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
-#: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:223
-#: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
@@ -1038,8 +1122,8 @@ msgstr ""
 "hj?lpeprogrammer."
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
-#: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:225
-#: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -1049,7 +1133,8 @@ msgstr ""
 "netv?rkstrafikken."
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
-#: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:226
+#: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
@@ -1057,7 +1142,8 @@ msgstr ""
 "systemet."
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
-#: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:227
+#: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
+#: ../comps-f13.xml.in.h:238
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1066,325 +1152,364 @@ msgstr ""
 "Windows(tm) systemer."
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
-#: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:228
+#: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
+#: ../comps-f13.xml.in.h:239
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "Denne gruppe indeholder nyttige pakker til brug af MySQL."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
-#: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:229
+#: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
+#: ../comps-f13.xml.in.h:240
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "Denne gruppe inkluderer nyttige pakker til brug af PostgreSQL."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
-#: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:230
+#: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
+#: ../comps-f13.xml.in.h:241
 msgid "Tibetan Support"
 msgstr "Underst?ttelse af tibetansk"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
-#: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:231
+#: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
+#: ../comps-f13.xml.in.h:242
 msgid "Tonga Support"
 msgstr "Underst?ttelse af tongansk"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
-#: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:232
-#: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
+#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr ""
 "V?rkt?jer og hj?lpeprogrammer som beh?ves af de pakkeransvarlige i Fedora"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
-#: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:233
+#: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
+#: ../comps-f13.xml.in.h:244
 msgid "Tsonga Support"
 msgstr "Underst?ttelse af tsonga"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
-#: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:234
+#: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
+#: ../comps-f13.xml.in.h:245
 msgid "Tswana Support"
 msgstr "Underst?ttelse af tswana"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
-#: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:235
+#: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
+#: ../comps-f13.xml.in.h:246
 msgid "Turkish Support"
 msgstr "Underst?ttelse af tyrkisk"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
-#: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:237
+#: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
+#: ../comps-f13.xml.in.h:248
 msgid "Ukrainian Support"
 msgstr "Underst?ttelse af ukrainsk"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
-#: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:239
+#: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
+#: ../comps-f13.xml.in.h:250
 msgid "Urdu Support"
 msgstr "Underst?ttelse af urdu"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
-#: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:241
-#: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
+#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
 msgid "Various core pieces of the system."
 msgstr "Forskellige grundl?ggende dele af systemet."
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
-#: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:242
-#: ../comps-el5.xml.in.h:73
+#: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
+#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
 msgid "Various ways to relax and spend your free time."
 msgstr "Forskellige m?der at slappe af og bruge sin frihed p?."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
-#: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:243
+#: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
+#: ../comps-f13.xml.in.h:254
 msgid "Venda Support"
 msgstr "Underst?ttelse af venda"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:244
+#: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
+#: ../comps-f13.xml.in.h:255
 msgid "Vietnamese Support"
 msgstr "Underst?ttelse af vietnamesisk"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
-#: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:245
+#: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
+#: ../comps-f13.xml.in.h:256
 msgid "Virtualization"
 msgstr "Virtualization"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
-#: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:246
+#: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
+#: ../comps-f13.xml.in.h:257
 msgid "Walloon Support"
 msgstr "Underst?ttelse af vallonsk"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
-#: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:247
-#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
+#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
 msgid "Web Development"
 msgstr "Webudvikling"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
-#: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:248
-#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
+#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
 msgid "Web Server"
 msgstr "Webserver"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
-#: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:249
+#: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
+#: ../comps-f13.xml.in.h:260
 msgid "Welsh Support"
 msgstr "Underst?ttelse af walisisk"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
-#: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:250
-#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
 msgid "Window Managers"
 msgstr "Vinduesh?ndteringer"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
-#: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:251
+#: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
+#: ../comps-f13.xml.in.h:262
 msgid "Windows File Server"
 msgstr "Windows filserver"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
-#: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:252
+#: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
+#: ../comps-f13.xml.in.h:263
 msgid "X Software Development"
 msgstr "X-softwareudvikling"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
-#: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:253
-#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
+#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
 msgid "X Window System"
 msgstr "X-vinduessystem"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
-#: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:254
+#: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
+#: ../comps-f13.xml.in.h:265
 msgid "XFCE"
 msgstr "Xfce"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
-#: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:255
+#: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
+#: ../comps-f13.xml.in.h:266
 msgid "XFCE Software Development"
 msgstr "Xfce-softwareudvikling"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
-#: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:256
+#: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
+#: ../comps-f13.xml.in.h:267
 msgid "Xhosa Support"
 msgstr "Underst?ttelse af xhosa"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
-#: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:257
+#: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
+#: ../comps-f13.xml.in.h:268
 msgid "Zulu Support"
 msgstr "Underst?ttelse af zulu"
 
 # S?TNING GIVER IKKE MENING
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-f12.xml.in.h:2
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-f12.xml.in.h:4
+#: ../comps-f13.xml.in.h:4
 msgid "A software playground for learning about learning."
 msgstr "En software legeplads til l?ring om indl?ring."
 
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:81 ../comps-f12.xml.in.h:81
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:81
 msgid "Haskell Development"
 msgstr "Haskell-udvikling"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:88
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
+#: ../comps-f13.xml.in.h:95
 msgid "Input Methods"
 msgstr "Inddatametoder"
 
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:89
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
+#: ../comps-f13.xml.in.h:96
 msgid "Input method packages for the input of international text."
 msgstr "Inddatametodepakker for inddata af international tekst."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:107
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
 msgid "Kashmiri Support"
 msgstr "Underst?ttelse af kashmirisk"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:112
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
 msgid "Konkani Support"
 msgstr "Underst?ttelse af konkani"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:115
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:129
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
 msgid "Maithili Support"
 msgstr "Underst?ttelse af maithili"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:140
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
 msgid "Myanmar (Burmese) Support"
 msgstr "Underst?ttelse af burmesisk"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:153
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
 msgid "Perl Development"
 msgstr "Perl-udvikling"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:170
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
 msgid "Sindhi Support"
 msgstr "Underst?ttelse af sindhi"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:184
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Underst?ttelse af udvikling i programmeringssproget Haskell."
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:186
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Underst?ttelse af udvikling i programmeringssproget Perl."
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:194
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
 msgid "Tajik Support"
 msgstr "Underst?ttelse af tajik-persisk"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:240
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
 msgid "Uzbek Support"
 msgstr "Underst?ttelse af usbekisk"
 
-#: ../comps-f11.xml.in.h:6 ../comps-f12.xml.in.h:6
+#: ../comps-f11.xml.in.h:6 ../comps-f12.xml.in.h:8 ../comps-f13.xml.in.h:8
 msgid "Amazigh Support"
 msgstr "Underst?ttelse af amazigh"
 
-#: ../comps-f11.xml.in.h:13 ../comps-f12.xml.in.h:13
+#: ../comps-f11.xml.in.h:13 ../comps-f12.xml.in.h:15 ../comps-f13.xml.in.h:15
 msgid "Azerbaijani Support"
 msgstr "Underst?ttelse af aserbajdsjansk"
 
-#: ../comps-f11.xml.in.h:27 ../comps-f12.xml.in.h:27
+#: ../comps-f11.xml.in.h:27 ../comps-f12.xml.in.h:31 ../comps-f13.xml.in.h:31
 msgid "Chichewa Support"
 msgstr "Underst?ttelse af nyanja"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:31
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
 msgid "Coptic Support"
 msgstr "Underst?ttelse af koptisk"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:37
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "Design- og simulationsv?rkt?jer til hardwareingeni?rer"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:48
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
 msgid "Electronic Lab"
 msgstr "Elektroniklaboratorium"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:58
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
 msgid "Fijian Support"
 msgstr "Underst?ttelse af fijiansk"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:61
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
 msgid "Font design and packaging"
 msgstr "Skrifttypedesign og pakning"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:65
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
 msgid "Frisian Support"
 msgstr "Underst?ttelse af frisisk"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:66
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
 msgid "Friulian Support"
 msgstr "Underst?ttelse af friulisk"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:83
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
 msgid "Hiligaynon Support"
 msgstr "Underst?ttelse af hiligaynon"
 
-#: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:96
+#: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
+#: ../comps-f13.xml.in.h:103
 msgid "Interlingua Support"
 msgstr "Underst?ttelse af interlingua"
 
-#: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:109
+#: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
+#: ../comps-f13.xml.in.h:116
 msgid "Kazakh Support"
 msgstr "Underst?ttelse af kasakhisk"
 
-#: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:111
+#: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
+#: ../comps-f13.xml.in.h:118
 msgid "Kinyarwanda Support"
 msgstr "Underst?ttelse af kinyarwanda"
 
-#: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:118
+#: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
+#: ../comps-f13.xml.in.h:126
 msgid "Latin Support"
 msgstr "Underst?ttelse af latin"
 
-#: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:126
+#: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
+#: ../comps-f13.xml.in.h:134
 msgid "Luxembourgish Support"
 msgstr "Underst?ttelse af luxembourgsk"
 
-#: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:130
+#: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
+#: ../comps-f13.xml.in.h:139
 msgid "Malagasy Support"
 msgstr "Underst?ttelse af malagasy"
 
-#: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:133
+#: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
+#: ../comps-f13.xml.in.h:142
 msgid "Maltese Support"
 msgstr "Underst?ttelse af maltesisk"
 
-#: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:134
+#: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
+#: ../comps-f13.xml.in.h:143
 msgid "Manx Support"
 msgstr "Underst?ttelse af manx"
 
-#: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:137
+#: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
+#: ../comps-f13.xml.in.h:146
 msgid "MinGW cross-compiler"
 msgstr "MinGW-krydsfortolker"
 
-#: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:146
+#: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
+#: ../comps-f13.xml.in.h:157
 msgid "OCaml"
 msgstr "OCaml"
 
-#: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:147
+#: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
+#: ../comps-f13.xml.in.h:158
 msgid "Occitan Support"
 msgstr "Underst?ttelse af occitansk"
 
-#: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:150
+#: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
+#: ../comps-f13.xml.in.h:161
 msgid "Online Help and Documentation"
 msgstr "Hj?lp og dokumentation p? nettet"
 
-#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:164
+#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
+#: ../comps-f13.xml.in.h:175
 msgid "Sanskrit Support"
 msgstr "Underst?ttelse af sanskrit"
 
-#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:165
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "Underst?ttelse af sardinsk"
 
-#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar skrivebordsmilj?"
 
-#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1392,7 +1517,8 @@ msgstr ""
 "Underst?ttelse af krydsfortolkning af programmer til 32-bit Windows m?l, "
 "testning af dem og bygning af installationsprogrammer, alt sammen med Fedora."
 
-#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:187
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1400,15 +1526,18 @@ msgstr ""
 "Underst?ttelse af udvikling af software, ved at bruge Objective CAML-"
 "programmeringssprog og biblioteker."
 
-#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:189
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Underst?ttelse af swahili"
 
-#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:197
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Underst?ttelse af tetum"
 
-#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:224
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1416,14 +1545,75 @@ msgstr ""
 "Denne gruppe er en samling af v?rkt?jer der bruges i design, modifikation, "
 "manipulation og pakning af skrifttyper."
 
-#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:236
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Underst?ttelse af turkmensk"
 
-#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:238
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Underst?ttelse af vendisk"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr ""
+"Et s?t af pakker som udbyder funktionaliteten Kritisk Sti til GNOME-skrivebordet"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"Et s?t af pakker som udbyder den delte platform til funktionaliteten "
+"Kritisk Sti til alle Fedora Spins"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "B?ger og vejledninger"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "B?ger og vejledninger til Fedorabrugere og -udviklere"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Kritisk Sti (Basal)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Kritisk Sti (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Mappeserver"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE er et letv?gts X11-skrivebordsmilj? designet til computere med lave "
+"hardwarespecifikationer, som for eksempel netbooks, mobile enheder eller ?ldre computere."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Maskine- og brugeridentitetsservere."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Skrivebordsmilj?et Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin er et skrivebordsmilj? til Netbook-/Nettop-/MID-enheder."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Programmer til en r?kke af opgaver"



From rdieter at fedoraproject.org  Sun Sep 20 16:43:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 16:43:23 +0000 (UTC)
Subject: rpms/dvdauthor/F-11 dvdauthor.spec,1.12,1.13
Message-ID: <20090920164323.7F1A511C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/dvdauthor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8956

Modified Files:
	dvdauthor.spec 
Log Message:
* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.14-9
- rebuild (GraphicsMagick)



Index: dvdauthor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/F-11/dvdauthor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dvdauthor.spec	24 Feb 2009 13:04:50 -0000	1.12
+++ dvdauthor.spec	20 Sep 2009 16:43:23 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dvdauthor
 Version:        0.6.14
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Command line DVD authoring tool
 
 Group:          Applications/Multimedia
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.14-9
+- rebuild (GraphicsMagick)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.14-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sun Sep 20 16:47:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 16:47:18 +0000 (UTC)
Subject: rpms/koffice/F-11 koffice-1.6.3-magick_version.patch, NONE,
	1.1 koffice.spec, 1.108, 1.109
Message-ID: <20090920164718.566D411C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10873

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-magick_version.patch 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
- rebuild (GraphicsMagick)


koffice-1.6.3-magick_version.patch:
 kis_image_magick_converter.cc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE koffice-1.6.3-magick_version.patch ---
diff -up koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc
--- koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version	2009-08-26 15:42:15.323637145 -0500
+++ koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc	2009-08-26 15:47:18.470639483 -0500
@@ -457,7 +457,11 @@ KisImageBuilder_Result KisImageMagickCon
 
             for (Q_UINT32 y = 0; y < image->rows; y ++)
             {
+#if MagickLibVersion >  0x630 
                 const PixelPacket *pp = AcquireCacheViewPixels(vi, 0, y, image->columns, 1, &ei);
+#else 
+                const PixelPacket *pp = AcquireCacheView(vi, 0, y, image->columns, 1, &ei);
+#endif
 
                 if(!pp)
                 {


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-11/koffice.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- koffice.spec	26 Aug 2009 17:43:42 -0000	1.108
+++ koffice.spec	20 Sep 2009 16:47:17 -0000	1.109
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
 Name:           koffice
 Epoch:          2
 Version:        1.6.3
-Release:        24.%{svn}svn%{?dist}
+Release:        25.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -32,6 +32,8 @@ Patch50: koffice-1.6.3-glibc_strrchr.pat
 Patch100: koffice-%{svn}svn.patch
 # Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
 Patch101: koffice-1.6.3-quint32.patch
+# fix for older ImageMagick
+Patch102: koffice-1.6.3-magick_version.patch
 
 # http://www.kde.org/info/security/advisory-20070730-1.txt
 Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
@@ -266,6 +268,7 @@ Requires:        %{name}-core = %{epoch}
 %if 0%{?svn:1}
 %patch100 -p1 -b .svn
 %patch101 -p1 -b .quint32
+%patch102 -p1 -b .magick_version
 %else
 %patch1 -p0 -b .CVE-2007-3387
 %patch2 -p0 -b .CVE-2007-4352-5392-5393
@@ -761,6 +764,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
+- rebuild (GraphicsMagick)
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
 - -kformula: Requires: lyx-cmex10-fonts
 



From thm at fedoraproject.org  Sun Sep 20 17:02:32 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 20 Sep 2009 17:02:32 +0000 (UTC)
Subject: rpms/python-jinja2/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 python-jinja2.spec, 1.3, 1.4 sources, 1.4,
	1.5 python-jinja2-docs.patch, 1.2, NONE
Message-ID: <20090920170232.361D511C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15777/F-10

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Removed Files:
	python-jinja2-docs.patch 
Log Message:
Update to 2.2.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 15:34:42 -0000	1.4
+++ .cvsignore	20 Sep 2009 17:02:31 -0000	1.5
@@ -1 +1 @@
-Jinja2-2.1.1.tar.gz
+Jinja2-2.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Jan 2009 15:34:42 -0000	1.3
+++ import.log	20 Sep 2009 17:02:31 -0000	1.4
@@ -1,3 +1,4 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
 python-jinja2-2_1-1_fc11:F-10:python-jinja2-2.1-1.fc11.src.rpm:1229629185
 python-jinja2-2_1_1-1_fc10:F-10:python-jinja2-2.1.1-1.fc10.src.rpm:1231601647
+python-jinja2-2_2_1-1_fc11:F-10:python-jinja2-2.2.1-1.fc11.src.rpm:1253465884


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/python-jinja2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-jinja2.spec	10 Jan 2009 15:34:42 -0000	1.3
+++ python-jinja2.spec	20 Sep 2009 17:02:31 -0000	1.4
@@ -1,24 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-jinja2
-Version:	2.1.1
+Version:	2.2.1
 Release:	1%{?dist}
 Summary:	General purpose template engine
-
 Group:		Development/Languages
 License:	BSD
 URL:		http://jinja.pocoo.org/
 Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-Patch0:		%{name}-docs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
-
-%if 0%{?fedora} >= 8
-BuildRequires: 	python-setuptools-devel
-%else
-BuildRequires:	python-setuptools
-%endif
-
+BuildRequires:	python-setuptools-devel
 Requires:	python-babel >= 0.8
 
 %description
@@ -35,22 +27,26 @@ environments.
 
 %prep
 %setup -q -n Jinja2-%{version}
-%patch0 -p1 -b .docs
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py --with-speedups install -O1 --skip-build \
+	    --root %{buildroot}
 
 # fix EOL
 sed -i 's|\r$||g' LICENSE
 
-# fix wrong permission
-%{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+# ensure correct permission
+chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+
+# remove hidden file
+rm -rf docs/_build/html/.buildinfo
+
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +60,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.1-1
+- Update to 2.2.1, mainly a bugfix release.
+- Remove patch no longer needed.
+- Remove conditional for FC-8.
+- Compilation of speedup module has to be explicitly requested now.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.1.1-1
 - Update to 2.1.1 (bugfix release).
 
@@ -82,4 +90,3 @@ rm -rf %{buildroot}
 
 * Sun Jun 29 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.0-0.1.rc1
 - Modified specfile from the existing python-jinja package.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jan 2009 15:34:42 -0000	1.4
+++ sources	20 Sep 2009 17:02:32 -0000	1.5
@@ -1 +1 @@
-b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz
+fea849d68891218eb0b21c170f1c32d5  Jinja2-2.2.1.tar.gz


--- python-jinja2-docs.patch DELETED ---



From rdieter at fedoraproject.org  Sun Sep 20 17:38:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 17:38:05 +0000 (UTC)
Subject: rpms/libprojectM-qt/devel libprojectM-qt.spec,1.4,1.5
Message-ID: <20090920173805.2AD2B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libprojectM-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25768

Modified Files:
	libprojectM-qt.spec 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-7
- cleanup %cmake macro usage
- %files: track file and sonames closer
- FTBFS libprojectM-qt-1.2.0-5.fc11 (#511744)



Index: libprojectM-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/libprojectM-qt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libprojectM-qt.spec	25 Jul 2009 08:29:30 -0000	1.4
+++ libprojectM-qt.spec	20 Sep 2009 17:38:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libprojectM-qt
 Version:	1.2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The Qt frontend to the projectM visualization plugin
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -20,7 +20,7 @@ preset playlists for projectM-jack and p
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt-devel
+Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt4-devel
 
 %description	devel
 projectM-qt is a GUI designed to enhance the projectM user and preset writer
@@ -34,13 +34,17 @@ developing applications that use %{name}
 %patch0 -p1
 
 %build
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} .
-make %{?_smp_mflags} VERBOSE=1
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
 %clean
@@ -54,17 +58,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
+%{_libdir}/libprojectM-qt.so.1*
 %{_datadir}/pixmaps/prjm16-transparent.svg
 
 %files devel
 %defattr(-,root,root,-)
 %doc ReadMe
-%{_includedir}/%{name}
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/libprojectM-qt/
+%{_libdir}/libprojectM-qt.so
+%{_libdir}/pkgconfig/libprojectM-qt.pc
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-7
+- cleanup %%cmake macro usage
+- %%files: track file and sonames closer
+- FTBFS libprojectM-qt-1.2.0-5.fc11 (#511744)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sun Sep 20 18:05:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 18:05:14 +0000 (UTC)
Subject: rpms/libprojectM-qt/devel libprojectM-qt.spec,1.5,1.6
Message-ID: <20090920180514.C170911C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libprojectM-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv300

Modified Files:
	libprojectM-qt.spec 
Log Message:
revert building out-of-tree



Index: libprojectM-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/libprojectM-qt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libprojectM-qt.spec	20 Sep 2009 17:38:04 -0000	1.5
+++ libprojectM-qt.spec	20 Sep 2009 18:05:13 -0000	1.6
@@ -34,17 +34,14 @@ developing applications that use %{name}
 %patch0 -p1
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake} ..
-popd
+%{cmake} .
 
-make %{?_smp_mflags} -C %{_target_platform} 
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean



From lennart at fedoraproject.org  Sun Sep 20 18:07:12 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sun, 20 Sep 2009 18:07:12 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.16, 1.17 libcanberra.spec, 1.35,
	1.36 sources, 1.18, 1.19
Message-ID: <20090920180712.4C10D11C00E6@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1642

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	11 Sep 2009 22:23:59 -0000	1.16
+++ .cvsignore	20 Sep 2009 18:07:11 -0000	1.17
@@ -1 +1 @@
-libcanberra-0.17.tar.gz
+libcanberra-0.18.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libcanberra.spec	16 Sep 2009 22:14:32 -0000	1.35
+++ libcanberra.spec	20 Sep 2009 18:07:11 -0000	1.36
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.17
-Release: 2%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Sep 19 2009 Lennart Poettering <lpoetter at redhat.com> 0.18-1
+- New version 0.18
+
 * Wed Sep 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.17-2
 - Don't require gdm in -gtk2 (#522998)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	11 Sep 2009 22:23:59 -0000	1.18
+++ sources	20 Sep 2009 18:07:11 -0000	1.19
@@ -1 +1 @@
-d1f5c5956d65d289566197e620be1a2e  libcanberra-0.17.tar.gz
+395e83f7eac48b3ce8372a714026c85d  libcanberra-0.18.tar.gz



From thm at fedoraproject.org  Sun Sep 20 18:09:21 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 20 Sep 2009 18:09:21 +0000 (UTC)
Subject: rpms/python-jinja2/EL-5 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 python-jinja2.spec, 1.5, 1.6 sources, 1.4,
	1.5 python-jinja2-docs.patch, 1.2, NONE
Message-ID: <20090920180921.C592411C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477/EL-5

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Removed Files:
	python-jinja2-docs.patch 
Log Message:
Update to 2.2.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 15:27:07 -0000	1.4
+++ .cvsignore	20 Sep 2009 18:09:21 -0000	1.5
@@ -1 +1 @@
-Jinja2-2.1.1.tar.gz
+Jinja2-2.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Jan 2009 15:27:07 -0000	1.3
+++ import.log	20 Sep 2009 18:09:21 -0000	1.4
@@ -1,3 +1,4 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
 python-jinja2-2_1-1_fc10:HEAD:python-jinja2-2.1-1.fc10.src.rpm:1229610786
 python-jinja2-2_1_1-1_fc10:HEAD:python-jinja2-2.1.1-1.fc10.src.rpm:1231601194
+python-jinja2-2_2_1-1_fc11:EL-5:python-jinja2-2.2.1-1.fc11.src.rpm:1253470104


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/EL-5/python-jinja2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-jinja2.spec	26 Feb 2009 21:53:35 -0000	1.5
+++ python-jinja2.spec	20 Sep 2009 18:09:21 -0000	1.6
@@ -1,24 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-jinja2
-Version:	2.1.1
-Release:	2%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	General purpose template engine
-
 Group:		Development/Languages
 License:	BSD
 URL:		http://jinja.pocoo.org/
 Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-Patch0:		%{name}-docs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
-
-%if 0%{?fedora} >= 8
-BuildRequires: 	python-setuptools-devel
-%else
-BuildRequires:	python-setuptools
-%endif
-
+BuildRequires:	python-setuptools-devel
 Requires:	python-babel >= 0.8
 
 %description
@@ -35,22 +27,26 @@ environments.
 
 %prep
 %setup -q -n Jinja2-%{version}
-%patch0 -p1 -b .docs
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py --with-speedups install -O1 --skip-build \
+	    --root %{buildroot}
 
 # fix EOL
 sed -i 's|\r$||g' LICENSE
 
-# fix wrong permission
-%{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+# ensure correct permission
+chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+
+# remove hidden file
+rm -rf docs/_build/html/.buildinfo
+
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +60,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.1-1
+- Update to 2.2.1, mainly a bugfix release.
+- Remove patch no longer needed.
+- Remove conditional for FC-8.
+- Compilation of speedup module has to be explicitly requested now.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -85,4 +90,3 @@ rm -rf %{buildroot}
 
 * Sun Jun 29 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.0-0.1.rc1
 - Modified specfile from the existing python-jinja package.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jan 2009 15:27:07 -0000	1.4
+++ sources	20 Sep 2009 18:09:21 -0000	1.5
@@ -1 +1 @@
-b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz
+fea849d68891218eb0b21c170f1c32d5  Jinja2-2.2.1.tar.gz


--- python-jinja2-docs.patch DELETED ---



From rdieter at fedoraproject.org  Sun Sep 20 18:22:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 18:22:24 +0000 (UTC)
Subject: rpms/kasablanca/devel kasablanca.spec,1.24,1.25
Message-ID: <20090920182224.CAE9011C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kasablanca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8195

Modified Files:
	kasablanca.spec 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0.2-17
- optimize scriptlets



Index: kasablanca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kasablanca.spec	21 Aug 2009 14:06:31 -0000	1.24
+++ kasablanca.spec	20 Sep 2009 18:22:24 -0000	1.25
@@ -1,8 +1,15 @@
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 License: GPLv2+
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,11 +21,11 @@ Patch1: kasablanca-0.4.0.2-dt.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext 
-BuildRequires: kdelibs3-devel
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: openssl-devel
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently: 
+Kasablanca is an ftp client, among its features are currently: 
 * ftps encryption via AUTH TLS
 * fxp (direct server to server transfer), supporting alternative mode.
 * advanced bookmarking system.
@@ -89,12 +96,16 @@ rm -rf $RPM_BUILD_ROOT 
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
 
-%postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -108,6 +119,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0.2-17
+- optimize scriptlets
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.0.2-16
 - rebuilt with new openssl
 



From carllibpst at fedoraproject.org  Sun Sep 20 18:38:02 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Sun, 20 Sep 2009 18:38:02 +0000 (UTC)
Subject: rpms/libpst/devel libpst.spec,1.26,1.27
Message-ID: <20090920183802.6834011C00E6@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11651

Modified Files:
	libpst.spec 
Log Message:
update to 0.6.44


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/libpst.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libpst.spec	25 Jul 2009 08:29:58 -0000	1.26
+++ libpst.spec	20 Sep 2009 18:38:02 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.41
-Release:            2%{?dist}
+Version:            0.6.44
+Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
 Source:             http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz
@@ -146,6 +146,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.44-1
+- patch from Lee Ayres to add file name extensions in separate mode.
+- allow mixed items types in a folder in separate mode.
+
+* Thu Sep 12 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.43-1
+- decode more of the pst format, some minor bug fixes
+- add support for code pages 1200 and 1201.
+- add readpst -t option to select output item types, which can
+  now be used to process folders containing mixed item types.
+- fix segfault with embedded appointments
+- add readpst -u option for Thunderbird mode .size and .type files
+- better detection of embedded rfc822 message attachments
+
+* Thu Sep 03 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.42-1
+- patch from Fridrich Strba to build with DJGPP DOS cross-compiler.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.41-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Sun Sep 20 18:44:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 20 Sep 2009 18:44:04 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion.spec,1.41,1.42
Message-ID: <20090920184404.CD02911C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14120

Modified Files:
	bash-completion.spec 
Log Message:
* Sun Sep 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-5
- Use svn completion from subversion instead of ours if available (#496456).



Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- bash-completion.spec	24 Jul 2009 17:52:31 -0000	1.41
+++ bash-completion.spec	20 Sep 2009 18:44:04 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -224,7 +224,11 @@ rm -rf $RPM_BUILD_ROOT
 %do_triggerun snownews
 
 %triggerin -- subversion
-%do_triggerin _subversion
+if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+    rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
+    ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
+fi
 %triggerun -- subversion
 %do_triggerun _subversion
 
@@ -264,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-5
+- Use svn completion from subversion instead of ours if available (#496456).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From carllibpst at fedoraproject.org  Sun Sep 20 18:46:27 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Sun, 20 Sep 2009 18:46:27 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore,1.26,1.27 sources,1.26,1.27
Message-ID: <20090920184627.A060611C00E6@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15304

Modified Files:
	.cvsignore sources 
Log Message:
update to 0.6.44


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	24 Jun 2009 03:41:46 -0000	1.26
+++ .cvsignore	20 Sep 2009 18:46:26 -0000	1.27
@@ -1 +1 @@
-libpst-0.6.41.tar.gz
+libpst-0.6.44.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	24 Jun 2009 03:41:46 -0000	1.26
+++ sources	20 Sep 2009 18:46:26 -0000	1.27
@@ -1 +1 @@
-d2cae1a3ae960eccb74b59f13b9c1744  libpst-0.6.41.tar.gz
+07d6952b05fc05c83d9be2fa006c67c0  libpst-0.6.44.tar.gz



From fschwarz at fedoraproject.org  Sun Sep 20 18:47:06 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sun, 20 Sep 2009 18:47:06 +0000 (UTC)
Subject: rpms/python-zope-interface/EL-5 python-zope-interface.spec,1.2,1.3
Message-ID: <20090920184706.6A27E11C00E6@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-zope-interface/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15634

Modified Files:
	python-zope-interface.spec 
Log Message:
generate egg info also for EL-5



Index: python-zope-interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-interface/EL-5/python-zope-interface.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-zope-interface.spec	18 Feb 2008 17:31:54 -0000	1.2
+++ python-zope-interface.spec	20 Sep 2009 18:47:06 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		python-zope-interface
 Version:	3.0.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Zope interfaces package
 Group:		Development/Libraries
 License:	ZPLv2.1
@@ -11,7 +11,7 @@ Source0:	http://zope.org/Products/ZopeIn
 Source1:	ZPL-2.1.txt
 Patch0:		ZopeInterface-3.0.1-declbug.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	python-devel
+BuildRequires:	python-devel python-setuptools-devel
 
 %description
 This is a separate distribution of the zope.interface package used in Zope 3.
@@ -25,11 +25,11 @@ http://www.zope.org/Collectors/Zope3-dev
 %patch0 -p1
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 %install
 %{__rm} -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root  %{buildroot}
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root  %{buildroot}
 /usr/bin/find %{buildroot} -name \*.so -exec %{__chmod} 755 {} \;
 
 %check
@@ -41,9 +41,13 @@ cd ./build/lib.* && PYTHONPATH=$(pwd) %{
 %files
 %defattr(-,root,root,-)
 %doc README.txt ZPL-2.1.txt
-%{python_sitearch}/zope*
+%{python_sitearch}/zope/
+%{python_sitearch}/zope.interface*
 
 %changelog
+* Sun Sep 20 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 3.0.1-11
+- generate egg info
+
 * Thu Feb 14 2008 Paul Howarth <paul at city-fan.org> 3.0.1-10
 - rebuild with gcc 4.3.0 for Fedora 9
 



From mtasaka at fedoraproject.org  Sun Sep 20 19:12:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 19:12:21 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.402, 1.403 jd.spec, 1.463, 1.464 sources,
	1.403, 1.404
Message-ID: <20090920191221.C415C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24284/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3085



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- .cvsignore	19 Sep 2009 17:58:03 -0000	1.402
+++ .cvsignore	20 Sep 2009 19:12:21 -0000	1.403
@@ -1 +1 @@
-jd-2.4.2-svn3079_trunk.tgz
+jd-2.4.2-svn3085_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- jd.spec	19 Sep 2009 18:01:57 -0000	1.463
+++ jd.spec	20 Sep 2009 19:12:21 -0000	1.464
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3079_trunk
+%define         strtag        svn3085_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3079
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3085
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- sources	19 Sep 2009 17:58:03 -0000	1.403
+++ sources	20 Sep 2009 19:12:21 -0000	1.404
@@ -1 +1 @@
-d86eadc079dd3fadeb3e980e242378ba  jd-2.4.2-svn3079_trunk.tgz
+d7df72ea22794133a3af0105ad8230c0  jd-2.4.2-svn3085_trunk.tgz



From mtasaka at fedoraproject.org  Sun Sep 20 19:12:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 19:12:22 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.396, 1.397 jd.spec, 1.459, 1.460 sources,
	1.397, 1.398
Message-ID: <20090920191222.1318511C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24284/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3085



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- .cvsignore	19 Sep 2009 17:58:03 -0000	1.396
+++ .cvsignore	20 Sep 2009 19:12:21 -0000	1.397
@@ -1 +1 @@
-jd-2.4.2-svn3079_trunk.tgz
+jd-2.4.2-svn3085_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- jd.spec	19 Sep 2009 18:01:58 -0000	1.459
+++ jd.spec	20 Sep 2009 19:12:21 -0000	1.460
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3079_trunk
+%define         strtag        svn3085_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3079
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3085
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- sources	19 Sep 2009 17:58:03 -0000	1.397
+++ sources	20 Sep 2009 19:12:21 -0000	1.398
@@ -1 +1 @@
-d86eadc079dd3fadeb3e980e242378ba  jd-2.4.2-svn3079_trunk.tgz
+d7df72ea22794133a3af0105ad8230c0  jd-2.4.2-svn3085_trunk.tgz



From mtasaka at fedoraproject.org  Sun Sep 20 19:12:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 19:12:22 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.396, 1.397 jd.spec, 1.460, 1.461 sources,
	1.397, 1.398
Message-ID: <20090920191222.6DE5111C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24284/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3085



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- .cvsignore	19 Sep 2009 17:58:03 -0000	1.396
+++ .cvsignore	20 Sep 2009 19:12:22 -0000	1.397
@@ -1 +1 @@
-jd-2.4.2-svn3079_trunk.tgz
+jd-2.4.2-svn3085_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- jd.spec	19 Sep 2009 18:01:59 -0000	1.460
+++ jd.spec	20 Sep 2009 19:12:22 -0000	1.461
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3079_trunk
+%define         strtag        svn3085_trunk
 %define         repoid        43584
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3079
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3085
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- sources	19 Sep 2009 17:58:03 -0000	1.397
+++ sources	20 Sep 2009 19:12:22 -0000	1.398
@@ -1 +1 @@
-d86eadc079dd3fadeb3e980e242378ba  jd-2.4.2-svn3079_trunk.tgz
+d7df72ea22794133a3af0105ad8230c0  jd-2.4.2-svn3085_trunk.tgz



From rdieter at fedoraproject.org  Sun Sep 20 19:38:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 19:38:23 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.205,1.206
Message-ID: <20090920193823.CEA2211C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32339

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kdeedu embeds python-mwclient and it's broken (#520954)
- Requires: kross-python



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- kdeedu.spec	2 Sep 2009 15:02:39 -0000	1.205
+++ kdeedu.spec	20 Sep 2009 19:38:23 -0000	1.206
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -68,6 +68,10 @@ Requires: sj-stevehand-fonts
 # khangman
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
+# parley
+Requires: kross-python
+# pending review, https://bugzilla.redhat.com/523789
+#Requires: python-mwclient
 
 %description
 Educational/Edutainment applications:
@@ -192,6 +196,8 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Domestic_Manners.ttf
 # omit steve font
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
+# omit copies of python-(mwclient,simplejson)
+rm -rf %{buildroot}%{_kde4_appsdir}/parley/plugins/mwclient
 
 
 %check
@@ -482,6 +488,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- kdeedu embeds python-mwclient and it's broken (#520954)
+- Requires: kross-python
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From mtasaka at fedoraproject.org  Sun Sep 20 19:53:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 19:53:57 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-10
	rubygem-activesupport-2.1.x-CVE-2009-3009.patch, NONE,
	1.1 rubygem-activesupport.spec, 1.6, 1.7
Message-ID: <20090920195357.2B04A11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activesupport/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5828

Modified Files:
	rubygem-activesupport.spec 
Added Files:
	rubygem-activesupport-2.1.x-CVE-2009-3009.patch 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-2
- Patch for CVE-2009-3009 (bug 520843)


rubygem-activesupport-2.1.x-CVE-2009-3009.patch:
 lib/active_support/multibyte.rb                       |   18 +++
 lib/active_support/multibyte/handlers/utf8_handler.rb |   13 --
 lib/active_support/multibyte/utils.rb                 |   39 ++++++
 test/multibyte_utils_test.rb                          |  107 +++++++++++++++++-
 4 files changed, 165 insertions(+), 12 deletions(-)

--- NEW FILE rubygem-activesupport-2.1.x-CVE-2009-3009.patch ---
>From e3db21fe4f54539be7fc212167553665970a955f Mon Sep 17 00:00:00 2001
From: Manfred Stienstra <manfred at fngtps.com>
Date: Tue, 1 Sep 2009 20:16:11 +0200
Subject: [PATCH] Add methods for string verification and encoding cleanup code.

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 activesupport/lib/active_support/multibyte.rb      |   18 ++++
 .../multibyte/handlers/utf8_handler.rb             |   13 +--
 .../lib/active_support/multibyte/utils.rb          |   39 +++++++
 activesupport/test/multibyte_utils_test.rb         |  106 ++++++++++++++++++++
 4 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 activesupport/lib/active_support/multibyte/utils.rb
 create mode 100644 activesupport/test/multibyte_utils_test.rb

diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb
index 27c0d18..f76cfba 100644
--- a/activesupport/lib/active_support/multibyte.rb
+++ b/activesupport/lib/active_support/multibyte.rb
@@ -3,7 +3,25 @@ module ActiveSupport
     DEFAULT_NORMALIZATION_FORM = :kc
     NORMALIZATIONS_FORMS = [:c, :kc, :d, :kd]
     UNICODE_VERSION = '5.0.0'
+
+    # Regular expressions that describe valid byte sequences for a character
+    VALID_CHARACTER = {
+      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
+      'UTF-8' => /\A(?:
+                 [\x00-\x7f]                                         |
+                 [\xc2-\xdf] [\x80-\xbf]                             |
+                 \xe0        [\xa0-\xbf] [\x80-\xbf]                 |
+                 [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]                 |
+                 \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                 [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                 \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
+      # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
+      'Shift_JIS' => /\A(?:
+                 [\x00-\x7e \xa1-\xdf]                                     |
+                 [\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
+    }
   end
 end
 
 require 'active_support/multibyte/chars'
+require 'active_support/multibyte/utils'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
index aa9c16f..2bbb2fa 100644
--- a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
+++ b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
@@ -100,16 +100,7 @@ module ActiveSupport::Multibyte::Handlers #:nodoc:
     # between little and big endian. This is not an issue in utf-8, so it must be ignored.
     UNICODE_LEADERS_AND_TRAILERS = UNICODE_WHITESPACE + [65279] # ZERO-WIDTH NO-BREAK SPACE aka BOM
     
-    # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
-     UTF8_PAT = /\A(?:
-                   [\x00-\x7f]                                     |
-                   [\xc2-\xdf] [\x80-\xbf]                         |
-                   \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-                   [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-                   \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                   [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                   \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-                  )*\z/xn
+    UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8']
     
     # Returns a regular expression pattern that matches the passed Unicode codepoints
     def self.codepoints_to_pattern(array_of_codepoints) #:nodoc:
@@ -357,7 +348,7 @@ module ActiveSupport::Multibyte::Handlers #:nodoc:
       # Replaces all the non-utf-8 bytes by their iso-8859-1 or cp1252 equivalent resulting in a valid utf-8 string
       def tidy_bytes(str)
         str.split(//u).map do |c|
-          if !UTF8_PAT.match(c)
+          if !ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'].match(c)
             n = c.unpack('C')[0]
             n < 128 ? n.chr :
             n < 160 ? [UCD.cp1252[n] || n].pack('U') :
diff --git a/activesupport/lib/active_support/multibyte/utils.rb b/activesupport/lib/active_support/multibyte/utils.rb
new file mode 100644
index 0000000..094e856
--- /dev/null
+++ b/activesupport/lib/active_support/multibyte/utils.rb
@@ -0,0 +1,39 @@
+module ActiveSupport #:nodoc:
+ module Multibyte #:nodoc:
+   # Returns a regular expression that matches valid characters in the current encoding
+   def self.valid_character
+     case $KCODE
+     when 'UTF8'
+       VALID_CHARACTER['UTF-8']
+     when 'SJIS'
+       VALID_CHARACTER['Shift_JIS']
+     end
+   end
+
+   # Verifies the encoding of a string
+   def self.verify(string)
+     if expression = valid_character
+       for c in string.split(//)
+         return false unless valid_character.match(c)
+       end
+     end
+     true
+   end
+
+   # Verifies the encoding of the string and raises an exception when it's not valid
+   def self.verify!(string)
+     raise ActiveSupport::Multibyte::Handlers::EncodingError.new("Found characters with invalid encoding") unless verify(string)
+   end
+
+   # Removes all invalid characters from the string
+   def self.clean(string)
+     if expression = valid_character
+       stripped = []; for c in string.split(//)
+         stripped << c if valid_character.match(c)
+       end; stripped.join
+     else
+       string
+     end
+   end
+ end
+end
\ No newline at end of file
diff --git a/activesupport/test/multibyte_utils_test.rb b/activesupport/test/multibyte_utils_test.rb
new file mode 100644
index 0000000..a4bcfc8
--- /dev/null
+++ b/activesupport/test/multibyte_utils_test.rb
@@ -0,0 +1,106 @@
+require 'abstract_unit'
+
+class MultibyteUtilsTest < Test::Unit::TestCase
+
+  def test_valid_character_returns_an_expression_for_the_current_encoding
+    with_kcode('None') do
+      assert_nil ActiveSupport::Multibyte.valid_character
+    end
+    with_kcode('UTF8') do
+      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'], ActiveSupport::Multibyte.valid_character
+    end
+    with_kcode('SJIS') do
+      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['Shift_JIS'], ActiveSupport::Multibyte.valid_character
+    end
+  end
+
+  def test_verify_verifies_ASCII_strings_are_properly_encoded
+    with_kcode('None') do
+      examples.each do |example|
+        assert ActiveSupport::Multibyte.verify(example)
+      end
+    end
+  end
+
+  def test_verify_verifies_UTF_8_strings_are_properly_encoded
+    with_kcode('UTF8') do
+      assert ActiveSupport::Multibyte.verify(example('valid UTF-8'))
+      assert !ActiveSupport::Multibyte.verify(example('invalid UTF-8'))
+    end
+  end
+
+  def test_verify_verifies_Shift_JIS_strings_are_properly_encoded
+    with_kcode('SJIS') do
+      assert ActiveSupport::Multibyte.verify(example('valid Shift-JIS'))
+      assert !ActiveSupport::Multibyte.verify(example('invalid Shift-JIS'))
+    end
+  end
+
+  def test_verify_bang_raises_an_exception_when_it_finds_an_invalid_character
+    with_kcode('UTF8') do
+      assert_raises(ActiveSupport::Multibyte::Handlers::EncodingError) do
+        ActiveSupport::Multibyte.verify!(example('invalid UTF-8'))
+      end
+    end
+  end
+
+  def test_verify_bang_doesnt_raise_an_exception_when_the_encoding_is_valid
+    with_kcode('UTF8') do
+      assert_nothing_raised do
+        ActiveSupport::Multibyte.verify!(example('valid UTF-8'))
+      end
+    end
+  end
+
+  def test_clean_leaves_ASCII_strings_intact
+    with_kcode('None') do
+      [
+        'word', "\270\236\010\210\245"
+      ].each do |string|
+        assert_equal string, ActiveSupport::Multibyte.clean(string)
+      end
+    end
+  end
+
+  def test_clean_cleans_invalid_characters_from_UTF_8_encoded_strings
+    with_kcode('UTF8') do
+      cleaned_utf8 = [8].pack('C*')
+      assert_equal example('valid UTF-8'), ActiveSupport::Multibyte.clean(example('valid UTF-8'))
+      assert_equal cleaned_utf8, ActiveSupport::Multibyte.clean(example('invalid UTF-8'))
+    end
+  end
+
+  def test_clean_cleans_invalid_characters_from_Shift_JIS_encoded_strings
+    with_kcode('SJIS') do
+      cleaned_sjis = [184, 0, 136, 165].pack('C*')
+      assert_equal example('valid Shift-JIS'), ActiveSupport::Multibyte.clean(example('valid Shift-JIS'))
+      assert_equal cleaned_sjis, ActiveSupport::Multibyte.clean(example('invalid Shift-JIS'))
+    end
+  end
+
+  private
+
+  STRINGS = {
+    'valid ASCII'       => [65, 83, 67, 73, 73].pack('C*'),
+    'invalid ASCII'     => [128].pack('C*'),
+    'valid UTF-8'       => [227, 129, 147, 227, 129, 171, 227, 129, 161, 227, 130, 143].pack('C*'),
+    'invalid UTF-8'     => [184, 158, 8, 136, 165].pack('C*'),
+    'valid Shift-JIS'   => [131, 122, 129, 91, 131, 128].pack('C*'),
+    'invalid Shift-JIS' => [184, 158, 8, 0, 255, 136, 165].pack('C*')
+  }
+
+  def example(key)
+    STRINGS[key]
+  end
+
+  def examples
+    STRINGS.values
+  end
+
+  def with_kcode(code)
+    before = $KCODE
+    $KCODE = code
+    yield
+    $KCODE = before
+  end
+end
\ No newline at end of file
-- 
1.6.0.1




Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activesupport/F-10/rubygem-activesupport.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-activesupport.spec	16 Sep 2008 19:09:27 -0000	1.6
+++ rubygem-activesupport.spec	20 Sep 2009 19:53:56 -0000	1.7
@@ -8,11 +8,13 @@ Summary: Support and utility classes use
 Name: rubygem-%{gemname}
 
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+# http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
+Patch0:  rubygem-activesupport-2.1.x-CVE-2009-3009.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 BuildRequires: rubygems
@@ -33,6 +35,10 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+pushd %{buildroot}%{geminstdir}
+patch -s -p2 --fuzz=0 < %{PATCH0}
+popd
+
 # Remove bad shebangs
 for f in %{buildroot}%{geminstdir}/lib/active_support/multibyte/generators/generate_tables.rb \
          %{buildroot}%{geminstdir}/lib/active_support/vendor/builder-2.1.2/builder.rb \
@@ -49,6 +55,7 @@ rm -rf %{buildroot}
 %dir %{geminstdir}
 %doc %{geminstdir}/CHANGELOG
 %{geminstdir}/lib
+%{geminstdir}/test/
 %doc %{geminstdir}/README
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -56,6 +63,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-2
+- Patch for CVE-2009-3009 (bug 520843)
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 



From mtasaka at fedoraproject.org  Sun Sep 20 19:54:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 19:54:10 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-10
	rubygem-actionpack-2.1.x-CVE-2009-3009.patch, NONE,
	1.1 rubygem-actionpack.spec, 1.7, 1.8
Message-ID: <20090920195410.08A6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5879

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.1.x-CVE-2009-3009.patch 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-3
- Patch for CVE-2009-3009 (bug 520843)


rubygem-actionpack-2.1.x-CVE-2009-3009.patch:
 tag_helper.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.1.x-CVE-2009-3009.patch ---
>From 9af2823b32e001358babde7644e5cc1c0ec29d6e Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael at koziarski.com>
Date: Mon, 31 Aug 2009 12:07:30 -0700
Subject: [PATCH] Clean tag attributes before passing through the escape_once logic.

Addresses CVE-2009-3009
---
 actionpack/lib/action_view/helpers/tag_helper.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index ba43b5e..623b8f7 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -101,7 +101,7 @@ module ActionView
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
       end
 
       private
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/F-10/rubygem-actionpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rubygem-actionpack.spec	27 Feb 2009 15:56:19 -0000	1.7
+++ rubygem-actionpack.spec	20 Sep 2009 19:54:09 -0000	1.8
@@ -7,12 +7,14 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.tgz
 Patch1: rubygem-actionpack-2.1.2-CVE-2008-5189.patch
+# http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
+Patch2: rubygem-actionpack-2.1.x-CVE-2009-3009.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -30,6 +32,7 @@ unit/integration testing that doesn't re
 %prep
 %setup -q -n %{gemname}-%{version}
 %patch1 -p2
+%patch2 -p2
 
 %build
 rake gem
@@ -62,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-3
+- Patch for CVE-2009-3009 (bug 520843)
+
 * Thu Feb 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 2.1.1-2
 - Fix CVE-2008-5189
 



From mtasaka at fedoraproject.org  Sun Sep 20 20:00:16 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 20:00:16 +0000 (UTC)
Subject: rpms/rubygem-activesupport/EL-5
	rubygem-activesupport-2.1.x-CVE-2009-3009.patch, NONE,
	1.1 rubygem-activesupport.spec, 1.5, 1.6
Message-ID: <20090920200016.908F011C0419@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activesupport/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7204

Modified Files:
	rubygem-activesupport.spec 
Added Files:
	rubygem-activesupport-2.1.x-CVE-2009-3009.patch 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-2
- Patch for CVE-2009-3009 (bug 520843)


rubygem-activesupport-2.1.x-CVE-2009-3009.patch:
 lib/active_support/multibyte.rb                       |   18 +++
 lib/active_support/multibyte/handlers/utf8_handler.rb |   13 --
 lib/active_support/multibyte/utils.rb                 |   39 ++++++
 test/multibyte_utils_test.rb                          |  107 +++++++++++++++++-
 4 files changed, 165 insertions(+), 12 deletions(-)

--- NEW FILE rubygem-activesupport-2.1.x-CVE-2009-3009.patch ---
>From e3db21fe4f54539be7fc212167553665970a955f Mon Sep 17 00:00:00 2001
From: Manfred Stienstra <manfred at fngtps.com>
Date: Tue, 1 Sep 2009 20:16:11 +0200
Subject: [PATCH] Add methods for string verification and encoding cleanup code.

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 activesupport/lib/active_support/multibyte.rb      |   18 ++++
 .../multibyte/handlers/utf8_handler.rb             |   13 +--
 .../lib/active_support/multibyte/utils.rb          |   39 +++++++
 activesupport/test/multibyte_utils_test.rb         |  106 ++++++++++++++++++++
 4 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 activesupport/lib/active_support/multibyte/utils.rb
 create mode 100644 activesupport/test/multibyte_utils_test.rb

diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb
index 27c0d18..f76cfba 100644
--- a/activesupport/lib/active_support/multibyte.rb
+++ b/activesupport/lib/active_support/multibyte.rb
@@ -3,7 +3,25 @@ module ActiveSupport
     DEFAULT_NORMALIZATION_FORM = :kc
     NORMALIZATIONS_FORMS = [:c, :kc, :d, :kd]
     UNICODE_VERSION = '5.0.0'
+
+    # Regular expressions that describe valid byte sequences for a character
+    VALID_CHARACTER = {
+      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
+      'UTF-8' => /\A(?:
+                 [\x00-\x7f]                                         |
+                 [\xc2-\xdf] [\x80-\xbf]                             |
+                 \xe0        [\xa0-\xbf] [\x80-\xbf]                 |
+                 [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]                 |
+                 \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                 [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                 \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
+      # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
+      'Shift_JIS' => /\A(?:
+                 [\x00-\x7e \xa1-\xdf]                                     |
+                 [\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
+    }
   end
 end
 
 require 'active_support/multibyte/chars'
+require 'active_support/multibyte/utils'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
index aa9c16f..2bbb2fa 100644
--- a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
+++ b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
@@ -100,16 +100,7 @@ module ActiveSupport::Multibyte::Handlers #:nodoc:
     # between little and big endian. This is not an issue in utf-8, so it must be ignored.
     UNICODE_LEADERS_AND_TRAILERS = UNICODE_WHITESPACE + [65279] # ZERO-WIDTH NO-BREAK SPACE aka BOM
     
-    # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
-     UTF8_PAT = /\A(?:
-                   [\x00-\x7f]                                     |
-                   [\xc2-\xdf] [\x80-\xbf]                         |
-                   \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-                   [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-                   \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                   [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                   \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-                  )*\z/xn
+    UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8']
     
     # Returns a regular expression pattern that matches the passed Unicode codepoints
     def self.codepoints_to_pattern(array_of_codepoints) #:nodoc:
@@ -357,7 +348,7 @@ module ActiveSupport::Multibyte::Handlers #:nodoc:
       # Replaces all the non-utf-8 bytes by their iso-8859-1 or cp1252 equivalent resulting in a valid utf-8 string
       def tidy_bytes(str)
         str.split(//u).map do |c|
-          if !UTF8_PAT.match(c)
+          if !ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'].match(c)
             n = c.unpack('C')[0]
             n < 128 ? n.chr :
             n < 160 ? [UCD.cp1252[n] || n].pack('U') :
diff --git a/activesupport/lib/active_support/multibyte/utils.rb b/activesupport/lib/active_support/multibyte/utils.rb
new file mode 100644
index 0000000..094e856
--- /dev/null
+++ b/activesupport/lib/active_support/multibyte/utils.rb
@@ -0,0 +1,39 @@
+module ActiveSupport #:nodoc:
+ module Multibyte #:nodoc:
+   # Returns a regular expression that matches valid characters in the current encoding
+   def self.valid_character
+     case $KCODE
+     when 'UTF8'
+       VALID_CHARACTER['UTF-8']
+     when 'SJIS'
+       VALID_CHARACTER['Shift_JIS']
+     end
+   end
+
+   # Verifies the encoding of a string
+   def self.verify(string)
+     if expression = valid_character
+       for c in string.split(//)
+         return false unless valid_character.match(c)
+       end
+     end
+     true
+   end
+
+   # Verifies the encoding of the string and raises an exception when it's not valid
+   def self.verify!(string)
+     raise ActiveSupport::Multibyte::Handlers::EncodingError.new("Found characters with invalid encoding") unless verify(string)
+   end
+
+   # Removes all invalid characters from the string
+   def self.clean(string)
+     if expression = valid_character
+       stripped = []; for c in string.split(//)
+         stripped << c if valid_character.match(c)
+       end; stripped.join
+     else
+       string
+     end
+   end
+ end
+end
\ No newline at end of file
diff --git a/activesupport/test/multibyte_utils_test.rb b/activesupport/test/multibyte_utils_test.rb
new file mode 100644
index 0000000..a4bcfc8
--- /dev/null
+++ b/activesupport/test/multibyte_utils_test.rb
@@ -0,0 +1,106 @@
+require 'abstract_unit'
+
+class MultibyteUtilsTest < Test::Unit::TestCase
+
+  def test_valid_character_returns_an_expression_for_the_current_encoding
+    with_kcode('None') do
+      assert_nil ActiveSupport::Multibyte.valid_character
+    end
+    with_kcode('UTF8') do
+      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'], ActiveSupport::Multibyte.valid_character
+    end
+    with_kcode('SJIS') do
+      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['Shift_JIS'], ActiveSupport::Multibyte.valid_character
+    end
+  end
+
+  def test_verify_verifies_ASCII_strings_are_properly_encoded
+    with_kcode('None') do
+      examples.each do |example|
+        assert ActiveSupport::Multibyte.verify(example)
+      end
+    end
+  end
+
+  def test_verify_verifies_UTF_8_strings_are_properly_encoded
+    with_kcode('UTF8') do
+      assert ActiveSupport::Multibyte.verify(example('valid UTF-8'))
+      assert !ActiveSupport::Multibyte.verify(example('invalid UTF-8'))
+    end
+  end
+
+  def test_verify_verifies_Shift_JIS_strings_are_properly_encoded
+    with_kcode('SJIS') do
+      assert ActiveSupport::Multibyte.verify(example('valid Shift-JIS'))
+      assert !ActiveSupport::Multibyte.verify(example('invalid Shift-JIS'))
+    end
+  end
+
+  def test_verify_bang_raises_an_exception_when_it_finds_an_invalid_character
+    with_kcode('UTF8') do
+      assert_raises(ActiveSupport::Multibyte::Handlers::EncodingError) do
+        ActiveSupport::Multibyte.verify!(example('invalid UTF-8'))
+      end
+    end
+  end
+
+  def test_verify_bang_doesnt_raise_an_exception_when_the_encoding_is_valid
+    with_kcode('UTF8') do
+      assert_nothing_raised do
+        ActiveSupport::Multibyte.verify!(example('valid UTF-8'))
+      end
+    end
+  end
+
+  def test_clean_leaves_ASCII_strings_intact
+    with_kcode('None') do
+      [
+        'word', "\270\236\010\210\245"
+      ].each do |string|
+        assert_equal string, ActiveSupport::Multibyte.clean(string)
+      end
+    end
+  end
+
+  def test_clean_cleans_invalid_characters_from_UTF_8_encoded_strings
+    with_kcode('UTF8') do
+      cleaned_utf8 = [8].pack('C*')
+      assert_equal example('valid UTF-8'), ActiveSupport::Multibyte.clean(example('valid UTF-8'))
+      assert_equal cleaned_utf8, ActiveSupport::Multibyte.clean(example('invalid UTF-8'))
+    end
+  end
+
+  def test_clean_cleans_invalid_characters_from_Shift_JIS_encoded_strings
+    with_kcode('SJIS') do
+      cleaned_sjis = [184, 0, 136, 165].pack('C*')
+      assert_equal example('valid Shift-JIS'), ActiveSupport::Multibyte.clean(example('valid Shift-JIS'))
+      assert_equal cleaned_sjis, ActiveSupport::Multibyte.clean(example('invalid Shift-JIS'))
+    end
+  end
+
+  private
+
+  STRINGS = {
+    'valid ASCII'       => [65, 83, 67, 73, 73].pack('C*'),
+    'invalid ASCII'     => [128].pack('C*'),
+    'valid UTF-8'       => [227, 129, 147, 227, 129, 171, 227, 129, 161, 227, 130, 143].pack('C*'),
+    'invalid UTF-8'     => [184, 158, 8, 136, 165].pack('C*'),
+    'valid Shift-JIS'   => [131, 122, 129, 91, 131, 128].pack('C*'),
+    'invalid Shift-JIS' => [184, 158, 8, 0, 255, 136, 165].pack('C*')
+  }
+
+  def example(key)
+    STRINGS[key]
+  end
+
+  def examples
+    STRINGS.values
+  end
+
+  def with_kcode(code)
+    before = $KCODE
+    $KCODE = code
+    yield
+    $KCODE = before
+  end
+end
\ No newline at end of file
-- 
1.6.0.1




Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activesupport/EL-5/rubygem-activesupport.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-activesupport.spec	16 Sep 2008 19:09:26 -0000	1.5
+++ rubygem-activesupport.spec	20 Sep 2009 20:00:16 -0000	1.6
@@ -8,11 +8,13 @@ Summary: Support and utility classes use
 Name: rubygem-%{gemname}
 
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+# http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
+Patch0:  rubygem-activesupport-2.1.x-CVE-2009-3009.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 BuildRequires: rubygems
@@ -33,6 +35,10 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+pushd %{buildroot}%{geminstdir}
+patch -s -p2 --fuzz=0 < %{PATCH0}
+popd
+
 # Remove bad shebangs
 for f in %{buildroot}%{geminstdir}/lib/active_support/multibyte/generators/generate_tables.rb \
          %{buildroot}%{geminstdir}/lib/active_support/vendor/builder-2.1.2/builder.rb \
@@ -49,6 +55,7 @@ rm -rf %{buildroot}
 %dir %{geminstdir}
 %doc %{geminstdir}/CHANGELOG
 %{geminstdir}/lib
+%{geminstdir}/test/
 %doc %{geminstdir}/README
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -56,6 +63,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-2
+- Patch for CVE-2009-3009 (bug 520843)
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 



From carllibpst at fedoraproject.org  Sun Sep 20 20:02:19 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Sun, 20 Sep 2009 20:02:19 +0000 (UTC)
Subject: rpms/libpst/F-11 .cvsignore, 1.26, 1.27 libpst.spec, 1.25,
	1.26 sources, 1.26, 1.27
Message-ID: <20090920200219.5672011C00E6@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7793

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.44


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	24 Jun 2009 03:42:36 -0000	1.26
+++ .cvsignore	20 Sep 2009 20:02:18 -0000	1.27
@@ -1 +1 @@
-libpst-0.6.41.tar.gz
+libpst-0.6.44.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-11/libpst.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libpst.spec	24 Jun 2009 03:42:36 -0000	1.25
+++ libpst.spec	20 Sep 2009 20:02:19 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.41
+Version:            0.6.44
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -146,6 +146,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.44-1
+- patch from Lee Ayres to add file name extensions in separate mode.
+- allow mixed items types in a folder in separate mode.
+
+* Thu Sep 12 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.43-1
+- decode more of the pst format, some minor bug fixes
+- add support for code pages 1200 and 1201.
+- add readpst -t option to select output item types, which can
+  now be used to process folders containing mixed item types.
+- fix segfault with embedded appointments
+- add readpst -u option for Thunderbird mode .size and .type files
+- better detection of embedded rfc822 message attachments
+
+* Thu Sep 03 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.42-1
+- patch from Fridrich Strba to build with DJGPP DOS cross-compiler.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 23 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.41-1
 - fix ax_python detection - should not use locate command
 - checking for fedora versions is not needed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	24 Jun 2009 03:42:36 -0000	1.26
+++ sources	20 Sep 2009 20:02:19 -0000	1.27
@@ -1 +1 @@
-d2cae1a3ae960eccb74b59f13b9c1744  libpst-0.6.41.tar.gz
+07d6952b05fc05c83d9be2fa006c67c0  libpst-0.6.44.tar.gz



From carllibpst at fedoraproject.org  Sun Sep 20 20:02:39 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Sun, 20 Sep 2009 20:02:39 +0000 (UTC)
Subject: rpms/libpst/F-10 .cvsignore, 1.22, 1.23 libpst.spec, 1.22,
	1.23 sources, 1.22, 1.23
Message-ID: <20090920200239.365EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7975

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.44


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	1 Jul 2009 03:23:45 -0000	1.22
+++ .cvsignore	20 Sep 2009 20:02:38 -0000	1.23
@@ -1 +1 @@
-libpst-0.6.41.tar.gz
+libpst-0.6.44.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/libpst.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libpst.spec	1 Jul 2009 03:23:45 -0000	1.22
+++ libpst.spec	20 Sep 2009 20:02:39 -0000	1.23
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.41
+Version:            0.6.44
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -146,6 +146,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.44-1
+- patch from Lee Ayres to add file name extensions in separate mode.
+- allow mixed items types in a folder in separate mode.
+
+* Thu Sep 12 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.43-1
+- decode more of the pst format, some minor bug fixes
+- add support for code pages 1200 and 1201.
+- add readpst -t option to select output item types, which can
+  now be used to process folders containing mixed item types.
+- fix segfault with embedded appointments
+- add readpst -u option for Thunderbird mode .size and .type files
+- better detection of embedded rfc822 message attachments
+
+* Thu Sep 03 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.42-1
+- patch from Fridrich Strba to build with DJGPP DOS cross-compiler.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 23 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.41-1
 - fix ax_python detection - should not use locate command
 - checking for fedora versions is not needed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	1 Jul 2009 03:23:45 -0000	1.22
+++ sources	20 Sep 2009 20:02:39 -0000	1.23
@@ -1 +1 @@
-d2cae1a3ae960eccb74b59f13b9c1744  libpst-0.6.41.tar.gz
+07d6952b05fc05c83d9be2fa006c67c0  libpst-0.6.44.tar.gz



From mtasaka at fedoraproject.org  Sun Sep 20 20:02:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Sep 2009 20:02:37 +0000 (UTC)
Subject: rpms/rubygem-actionpack/EL-5
	rubygem-actionpack-2.1.x-CVE-2009-3009.patch, NONE,
	1.1 rubygem-actionpack.spec, 1.6, 1.7
Message-ID: <20090920200237.9FA1811C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7958

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.1.x-CVE-2009-3009.patch 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-3
- Patch for CVE-2009-3009 (bug 520843)


rubygem-actionpack-2.1.x-CVE-2009-3009.patch:
 tag_helper.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.1.x-CVE-2009-3009.patch ---
>From 9af2823b32e001358babde7644e5cc1c0ec29d6e Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael at koziarski.com>
Date: Mon, 31 Aug 2009 12:07:30 -0700
Subject: [PATCH] Clean tag attributes before passing through the escape_once logic.

Addresses CVE-2009-3009
---
 actionpack/lib/action_view/helpers/tag_helper.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index ba43b5e..623b8f7 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -101,7 +101,7 @@ module ActionView
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
       end
 
       private
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/EL-5/rubygem-actionpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-actionpack.spec	27 Feb 2009 15:58:45 -0000	1.6
+++ rubygem-actionpack.spec	20 Sep 2009 20:02:37 -0000	1.7
@@ -7,12 +7,14 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.tgz
 Patch1: rubygem-actionpack-2.1.2-CVE-2008-5189.patch
+# http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
+Patch2: rubygem-actionpack-2.1.x-CVE-2009-3009.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -30,6 +32,7 @@ unit/integration testing that doesn't re
 %prep
 %setup -q -n %{gemname}-%{version}
 %patch1 -p2
+%patch2 -p2
 
 %build
 rake gem
@@ -62,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-3
+- Patch for CVE-2009-3009 (bug 520843)
+
 * Thu Feb 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 2.1.1-2
 - Fix CVE-2008-5189
 



From chkr at fedoraproject.org  Sun Sep 20 20:40:24 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 20 Sep 2009 20:40:24 +0000 (UTC)
Subject: rpms/f-spot/F-11 0001-fix-parallel-build.patch, NONE,
	1.1 0001-use-system-Mono.Addins-if-available.patch, 1.1,
	1.2 f-spot.spec, 1.89, 1.90
Message-ID: <20090920204024.9E75211C0419@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15782

Modified Files:
	0001-use-system-Mono.Addins-if-available.patch f-spot.spec 
Added Files:
	0001-fix-parallel-build.patch 
Log Message:
* Sat Sep 19 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
- Update to 0.6.1.2
- Move the screensaver plugin into a sub-package (BZ 519640)
- Let f-spot-screensaver obsolete older f-spot version so that it
  is pulled in during update (fresh installations of f-spot will not
  pull in gnome-screensaver)
- Remove upstreamed patch
- Updated use-system-Mono.Addins-if-available patch
- Add a patch to enable parallel build 


0001-fix-parallel-build.patch:
 extensions/Exporters/FlickrExport/Makefile.am    |    3 ---
 extensions/Exporters/PicasaWebExport/Makefile.am |    3 ---
 extensions/Exporters/SmugMugExport/Makefile.am   |    4 ----
 extensions/Exporters/TabbloExport/Makefile.am    |    3 ---
 src/Makefile.am                                  |    5 ++---
 5 files changed, 2 insertions(+), 16 deletions(-)

--- NEW FILE 0001-fix-parallel-build.patch ---
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 812904c..6457ffd 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -34,13 +34,10 @@ RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 45e3bac..b617fc8 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -35,13 +35,10 @@ RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 397461f..f96d603 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -34,14 +34,10 @@ RESOURCES =				\
 SUBDIRS =                      \
 	SmugMugNet
 
-
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b7465d6..915a95f 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -44,13 +44,10 @@ RESOURCES = \
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade \
 	-resource:$(srcdir)/TrustError.glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/src/Makefile.am b/src/Makefile.am
index 02add7d..ba9bcaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -509,13 +509,13 @@ FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
 
 FSpot.Bling.dll.mdb: FSpot.Bling.dll
 
-FSpot.Bling.dll: $(BLING_CSFILES)
+FSpot.Bling.dll: $(BLING_CSFILES) FSpot.Utils.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(BLING_CSFILES) $(BLING_ASSEMBLIES)
 
 FSpot.Widgets.dll.mdb: FSpot.Widgets.dll
 
-FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
+FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll Cms.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
 
-- 
1.6.0.6


0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

Index: 0001-use-system-Mono.Addins-if-available.patch
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/0001-use-system-Mono.Addins-if-available.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-use-system-Mono.Addins-if-available.patch	9 Aug 2009 15:42:14 -0000	1.1
+++ 0001-use-system-Mono.Addins-if-available.patch	20 Sep 2009 20:40:24 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/Makefile.include b/Makefile.include
-index efd6d72..4be9a8b 100644
+index ca739b8..43e748f 100644
 --- a/Makefile.include
 +++ b/Makefile.include
 @@ -3,9 +3,6 @@
@@ -12,7 +12,7 @@ index efd6d72..4be9a8b 100644
  DIR_DOCS = $(top_builddir)/docs
  DIR_EXTENSIONS = $(top_builddir)/extensions
  DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+@@ -24,10 +21,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
  LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
@@ -21,10 +21,10 @@ index efd6d72..4be9a8b 100644
 -	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
 -	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = 								\
- 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+ LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
 diff --git a/configure.ac b/configure.ac
-index e31bd27..1acaaa6 100644
+index fe0bdc9..237e6bd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
@@ -35,9 +35,9 @@ index e31bd27..1acaaa6 100644
  MONO_CAIRO_REQUIRED=1.2.4
  dnl -- this check is 	
  LCMS_REQUIRED=1.12
-@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
- 
- AC_SUBST(CSC_DEFINES)
+@@ -146,6 +147,33 @@ AC_SUBST(DIR_DBUS_GLIB)
+ AC_SUBST(LINK_DBUS)
+ AC_SUBST(PATH_DBUS)
  
 +dnl -- mono-addins link or bundle ?
 +PKG_CHECK_MODULES(MONO_ADDINS, 
@@ -66,11 +66,11 @@ index e31bd27..1acaaa6 100644
 +AC_SUBST(DIR_ADDINS_GUI)
 +AC_SUBST(LINK_MONO_ADDINS)
 +
- dnl -- dbus-sharp: link or bundle ?
- PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
- [
+ dnl -- nunit
+ PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED, 
+ 	do_tests="yes", do_tests="no")
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c6d69f9..d0b9a6c 100644
+index f2adf82..ea888d8 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
@@ -78,21 +78,21 @@ index c6d69f9..d0b9a6c 100644
  	libfspot			\
  	libgphoto2-sharp	\
 -	mono-addins			\
- 	semweb				\
- 	Tao
+ 	semweb
  
-@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
+ # Depending on whether the packaged ndesk-dbus is used, we might not want to
+@@ -20,11 +19,13 @@ UNCONDITIONAL_SUBDIRS = \
  SUBDIRS = 				\
  	$(DIR_DBUS)			\
  	$(DIR_DBUS_GLIB)	\
-+	$(DIR_ADDINS)	\
++	$(DIR_ADDINS)			\
  	$(UNCONDITIONAL_SUBDIRS)
  
  DIST_SUBDIRS = 			\
  	dbus-sharp			\
  	dbus-sharp-glib		\
-+	mono-addins		\
  	dpap-sharp			\
++	mono-addins			\
  	$(UNCONDITIONAL_SUBDIRS)
  
 -- 


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- f-spot.spec	9 Aug 2009 15:42:14 -0000	1.89
+++ f-spot.spec	20 Sep 2009 20:40:24 -0000	1.90
@@ -1,5 +1,5 @@
 Name:           f-spot
-Version:        0.6.0.0
+Version:        0.6.1.2
 Release:        1%{?dist}
 Summary:        Photo management application
 
@@ -7,8 +7,8 @@ Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=591223
-Patch1:         0001-use-the-correct-stock-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593243
+Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
@@ -31,7 +31,6 @@ Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
 Requires:       hicolor-icon-theme 
-Requires:       gnome-screensaver
 Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -50,10 +49,21 @@ F-Spot is an application designed to pro
 to the GNOME desktop. Features include import, export, printing and advanced
 sorting and tagging of digital images.
 
+%package screensaver
+Summary: F-Spot gnome-screensaver plugin
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-screensaver
+Obsoletes: f-spot < 0.6.1.1
+
+%description screensaver
+F-Spot provides a plugin for gnome-screensaver which displays parts of the
+photo collection in a slideshow as a screensaver.
+
 %prep
 %setup -q
 
-%patch1 -p1 -b .missing-icon
+%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 
@@ -61,8 +71,7 @@ sorting and tagging of digital images.
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 autoreconf -f -i
 %configure --disable-scrollkeeper
-# parallel build broken in 0.6.0.0, try again with next release
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,15 +116,38 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/f-spot/
-%{_libdir}/f-spot/
+%dir %{_libdir}/f-spot/
+%{_libdir}/f-spot/*.dll
+%{_libdir}/f-spot/*.exe
+%{_libdir}/f-spot/*.addins
+%{_libdir}/f-spot/*.config
+%{_libdir}/f-spot/*.mdb
+%{_libdir}/f-spot/*.so
+%{_libdir}/f-spot/*.so.*
+%exclude %{_libdir}/f-spot/extensions/ScreensaverConfig.dll
+%{_libdir}/f-spot/extensions/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
+%{_datadir}/omf/f-spot/
+
+%files screensaver
+%defattr(-,root,root,-)
+%{_libdir}/f-spot/extensions/ScreensaverConfig.dll
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot/
 
 %changelog
+* Sat Sep 19 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
+- Update to 0.6.1.2
+- Move the screensaver plugin into a sub-package (BZ 519640)
+- Let f-spot-screensaver obsolete older f-spot version so that it
+  is pulled in during update (fresh installations of f-spot will not
+  pull in gnome-screensaver)
+- Remove upstreamed patch
+- Updated use-system-Mono.Addins-if-available patch
+- Add a patch to enable parallel build 
+
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
 - Update to new upstream version 0.6.0.0
 - Cleanup spec file



From chkr at fedoraproject.org  Sun Sep 20 20:56:37 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 20 Sep 2009 20:56:37 +0000 (UTC)
Subject: rpms/f-spot/F-11 .cvsignore, 1.21, 1.22 f-spot.spec, 1.90,
	1.91 sources, 1.21, 1.22
Message-ID: <20090920205637.1EAF411C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23623

Modified Files:
	.cvsignore f-spot.spec sources 
Log Message:
* Sun Sep 20 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1.1
- Upload missing sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Aug 2009 15:42:14 -0000	1.21
+++ .cvsignore	20 Sep 2009 20:56:35 -0000	1.22
@@ -1 +1 @@
-f-spot-0.6.0.0.tar.bz2
+f-spot-0.6.1.2.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- f-spot.spec	20 Sep 2009 20:40:24 -0000	1.90
+++ f-spot.spec	20 Sep 2009 20:56:36 -0000	1.91
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sun Sep 20 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1.1
+- Upload missing sources
+
 * Sat Sep 19 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
 - Update to 0.6.1.2
 - Move the screensaver plugin into a sub-package (BZ 519640)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Aug 2009 15:42:14 -0000	1.21
+++ sources	20 Sep 2009 20:56:36 -0000	1.22
@@ -1 +1 @@
-9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2
+ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2



From rathann at fedoraproject.org  Sun Sep 20 20:57:18 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 20 Sep 2009 20:57:18 +0000 (UTC)
Subject: rpms/freefem++/devel .cvsignore, 1.7, 1.8 freefem++-gcc44-link.patch,
	1.1, 1.2 freefem++-gcc44.patch, 1.1, 1.2 freefem++-rpm.patch,
	1.4, 1.5 freefem++.spec, 1.21, 1.22 sources, 1.7, 1.8
Message-ID: <20090920205718.2569F11C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24159

Modified Files:
	.cvsignore freefem++-gcc44-link.patch freefem++-gcc44.patch 
	freefem++-rpm.patch freefem++.spec sources 
Log Message:
* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-1
- update to 3.5
- adjust environment modules setup for current version
- use openmpi instead of lam (regression tests pass)
- remove irrelevant READMEs and old changelogs from docs
- add examples to -devel subpackage
- fix some minor build problems



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Mar 2009 01:55:48 -0000	1.7
+++ .cvsignore	20 Sep 2009 20:57:16 -0000	1.8
@@ -1,2 +1,2 @@
 FreeFem++.1
-freefem++-3.0-5.tar.gz
+freefem++-3.5.tar.gz

freefem++-gcc44-link.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: freefem++-gcc44-link.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-gcc44-link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freefem++-gcc44-link.patch	3 Mar 2009 01:55:48 -0000	1.1
+++ freefem++-gcc44-link.patch	20 Sep 2009 20:57:17 -0000	1.2
@@ -1,12 +1,12 @@
-diff -up freefem++-3.0-5/src/fflib/Makefile.link freefem++-3.0-5/src/fflib/Makefile
---- freefem++-3.0-5/src/fflib/Makefile.link	2009-03-03 02:39:02.000000000 +0100
-+++ freefem++-3.0-5/src/fflib/Makefile	2009-03-03 02:39:52.000000000 +0100
-@@ -464,7 +464,7 @@ libmesh5.obj: ../femlib/libmesh5.c
+diff -up freefem++-3.5/src/fflib/Makefile.gcc44-link freefem++-3.5/src/fflib/Makefile
+--- freefem++-3.5/src/fflib/Makefile.gcc44-link	2009-09-20 19:42:36.000000000 +0200
++++ freefem++-3.5/src/fflib/Makefile	2009-09-20 19:47:02.000000000 +0200
+@@ -472,7 +472,7 @@ libmesh5.obj: ../femlib/libmesh5.c
  #	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  Drawing.o: ../femlib/Drawing.cpp
 -	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Drawing.o -MD -MP -MF $(DEPDIR)/Drawing.Tpo -c -o Drawing.o `test -f '../femlib/Drawing.cpp' || echo '$(srcdir)/'`../femlib/Drawing.cpp
 +	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O1 -MT Drawing.o -MD -MP -MF $(DEPDIR)/Drawing.Tpo -c -o Drawing.o `test -f '../femlib/Drawing.cpp' || echo '$(srcdir)/'`../femlib/Drawing.cpp
- 	mv -f $(DEPDIR)/Drawing.Tpo $(DEPDIR)/Drawing.Po
+ 	$(am__mv) $(DEPDIR)/Drawing.Tpo $(DEPDIR)/Drawing.Po
  #	source='../femlib/Drawing.cpp' object='Drawing.o' libtool=no \
  #	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \

freefem++-gcc44.patch:
 ppm2rnm.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: freefem++-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freefem++-gcc44.patch	3 Mar 2009 01:55:48 -0000	1.1
+++ freefem++-gcc44.patch	20 Sep 2009 20:57:17 -0000	1.2
@@ -1,12 +1,13 @@
-diff -up freefem++-3.0-5/src/fflib/environment.cpp.gcc44 freefem++-3.0-5/src/fflib/environment.cpp
---- freefem++-3.0-5/src/fflib/environment.cpp.gcc44	2008-12-12 15:17:22.000000000 +0100
-+++ freefem++-3.0-5/src/fflib/environment.cpp	2009-02-27 00:55:12.000000000 +0100
-@@ -57,7 +57,7 @@ const char BACKSLACH='\\';
- 
- string DirName(const char * f)
- {
--  char *c= strrchr(f,dirsep);
-+  const char *c= strrchr(f,dirsep);
-   if(!c) return string("");
-   else return string(f,strlen(f)-strlen(c));
- }
+diff -up freefem++-3.5/examples++-load/ppm2rnm.cpp.gcc44 freefem++-3.5/examples++-load/ppm2rnm.cpp
+--- freefem++-3.5/examples++-load/ppm2rnm.cpp.gcc44	2009-05-07 18:57:31.000000000 +0200
++++ freefem++-3.5/examples++-load/ppm2rnm.cpp	2009-09-20 20:01:58.000000000 +0200
+@@ -29,7 +29,8 @@ extern "C" {
+ 	pPPMimage  result;
+ 	FILE      *fp;
+ 	int        i,k,typimg,ret,r,g,b,s,maxval,bitsize;
+-	char      *ptr,c,buff[1024],data[256];
++	char       c,buff[1024],data[256];
++	const char*ptr;
+ 	
+ 	/* search for image */
+ 	fprintf(stdout," Loading image: %s\n",imgname);

freefem++-rpm.patch:
 Makefile.am                  |   10 +++++-----
 acoptim.m4                   |   22 +++++++++++-----------
 configure.ac                 |    4 ++--
 examples++-3d/Makefile.am    |    4 ++--
 examples++-load/Makefile.am  |   18 +++++++++---------
 examples++-load/load.link.in |   12 ++++++------
 src/lglib/Makefile.am        |    4 ++--
 7 files changed, 37 insertions(+), 37 deletions(-)

Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- freefem++-rpm.patch	3 Mar 2009 01:55:48 -0000	1.4
+++ freefem++-rpm.patch	20 Sep 2009 20:57:17 -0000	1.5
@@ -1,7 +1,7 @@
-diff -up freefem++-3.0-5/acoptim.m4.r freefem++-3.0-5/acoptim.m4
---- freefem++-3.0-5/acoptim.m4.r	2006-01-27 16:51:16.000000000 +0100
-+++ freefem++-3.0-5/acoptim.m4	2009-03-03 01:29:12.000000000 +0100
-@@ -16,14 +16,6 @@ AC_MSG_CHECKING(whether to generate debu
+diff -up freefem++-3.5/acoptim.m4.r freefem++-3.5/acoptim.m4
+--- freefem++-3.5/acoptim.m4.r	2009-05-17 21:03:14.000000000 +0200
++++ freefem++-3.5/acoptim.m4	2009-09-20 21:42:32.000000000 +0200
+@@ -30,14 +30,6 @@ AC_MSG_CHECKING(whether to generate debu
  AC_ARG_ENABLE(debug,[  --enable-debug	Turn on debug versions of FreeFem++])
  AC_ARG_ENABLE(optim,[  --enable-optim	Turn on compiler optimization])
  
@@ -16,7 +16,7 @@ diff -up freefem++-3.0-5/acoptim.m4.r fr
  if test "$enable_debug" = yes;
  then
  	AC_MSG_RESULT(yes)
-@@ -32,9 +24,9 @@ else
+@@ -46,9 +38,9 @@ else
  
  	# No debugging information in optimized code
  
@@ -29,7 +29,7 @@ diff -up freefem++-3.0-5/acoptim.m4.r fr
  fi
  
  # Hardware-independant optimization
-@@ -68,6 +60,14 @@ if test "$enable_debug" != yes \
+@@ -82,6 +74,14 @@ if test "$enable_debug" != yes \
      -a "$enable_generic" != yes
  then
  
@@ -44,30 +44,19 @@ diff -up freefem++-3.0-5/acoptim.m4.r fr
      # MacOS X Darwin
      if test -x /usr/bin/hostinfo
  	then
-diff -up freefem++-3.0-5/configure.ac.r freefem++-3.0-5/configure.ac
---- freefem++-3.0-5/configure.ac.r	2009-01-20 20:56:56.000000000 +0100
-+++ freefem++-3.0-5/configure.ac	2009-03-03 01:31:15.000000000 +0100
+diff -up freefem++-3.5/configure.ac.r freefem++-3.5/configure.ac
+--- freefem++-3.5/configure.ac.r	2009-08-27 16:03:13.000000000 +0200
++++ freefem++-3.5/configure.ac	2009-09-20 21:42:32.000000000 +0200
 @@ -247,7 +247,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
  # date is only useful for config-version.h
  
  test "$prefix" = NONE && prefix="$ac_default_prefix"
 -ff_prefix_dir="${prefix}/lib/ff++/$VERSION"   
-+ff_prefix_dir="${libdir}/freefem++"   
++ff_prefix_dir="${libdir}/freefem++"
  AC_MSG_CHECKING(prefix dir freefem++  )
  AC_MSG_RESULT($ff_prefix_dir)	 
  
-@@ -344,10 +344,7 @@ ff_x11=no
- 
- if test "$ff_mingw" = no && test "$with_x" != "no";
- then
--	if test -d /usr/X11R6
--	then
- 		ff_x11=yes
--	fi
- fi
- 
- AC_MSG_RESULT($ff_x11)
-@@ -1082,7 +1079,7 @@ then
+@@ -1093,7 +1093,7 @@ then
  		AC_CHECK_LIB(umfpack,umf_i_malloc,
  			ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
  			ff_umfpack_ok=yes,,$ff_umfpack_libs)
@@ -76,60 +65,122 @@ diff -up freefem++-3.0-5/configure.ac.r 
  			AC_MSG_WARN([		Sorry we find UMFPACK lib but not the include umfpack.h file])
  		fi
  	fi	
-diff -up freefem++-3.0-5/examples++-load/load.link.in.r freefem++-3.0-5/examples++-load/load.link.in
---- freefem++-3.0-5/examples++-load/load.link.in.r	2009-01-20 20:56:57.000000000 +0100
-+++ freefem++-3.0-5/examples++-load/load.link.in	2009-03-03 01:04:15.000000000 +0100
-@@ -5,9 +5,9 @@ FFVERSION='@VERSION@'
- FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
+diff -up freefem++-3.5/examples++-3d/Makefile.am.r freefem++-3.5/examples++-3d/Makefile.am
+--- freefem++-3.5/examples++-3d/Makefile.am.r	2009-06-15 22:38:58.000000000 +0200
++++ freefem++-3.5/examples++-3d/Makefile.am	2009-09-20 21:50:02.000000000 +0200
+@@ -31,8 +31,8 @@ freefem++.pref:
+ 	echo loadpath += \"./\" >>freefem++.pref
+ 
+ install-exec-local:: 
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
+-	$(INSTALL)  -m 555 $ $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/lib
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++/idp
++	$(INSTALL)  -m 755 $ $(LIST_IDP)  $(DESTDIR)$(libdir)/freefem++
+ 
+ 
+ # To check the scripts against their reference values
+diff -up freefem++-3.5/examples++-load/load.link.in.r freefem++-3.5/examples++-load/load.link.in
+--- freefem++-3.5/examples++-load/load.link.in.r	2009-07-10 11:02:37.000000000 +0200
++++ freefem++-3.5/examples++-load/load.link.in	2009-09-20 21:42:32.000000000 +0200
+@@ -6,10 +6,10 @@ FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
  INCFF=
  if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
+ if [ -z "$F77" ] ; then F77='@F77@' ; fi
 -if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
+-if [ "$F77" = '@'F77'@' ] ; then F77=""; fi
 -if [ "$FFCXXFLAGS" = '@'CXXFLAGS'@' ] ; then FFCXXFLAGS=""; fi
 -if [ "$FFVERSION" = '@'VERSION'@' ] ; then FFVERSION=""; fi
 +if [ "$CXX" = '@CXX@' ] ; then CXX=""; fi
++if [ "$F77" = '@F77@' ] ; then F77=""; fi
 +if [ "$FFCXXFLAGS" = '@CXXFLAGS@' ] ; then FFCXXFLAGS=""; fi
 +if [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi
  if [ -z "$INCFF" ] ; then
      if [ -f "@INCFF@/ff++.hpp" ] ; then
  	INCFF="-I at INCFF@"
-@@ -15,8 +15,8 @@ if [ -z "$INCFF" ] ; then
+@@ -17,8 +17,8 @@ if [ -z "$INCFF" ] ; then
  	INCFF="-Iinclude"
      elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
  	INCFF="-IFFAPPLI_INC" 
 -    elif [ -f '@ff_prefix_dir@/include/ff++.hpp' ] ; then 
 -	INCFF='-I at ff_prefix_dir@/include' 
-+    elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then 
-+	INCFF='-I at includedir@/freefem++' 
++    elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then
++	INCFF='-I at includedir@/freefem++'
      else
- 	echo " erreur PB include freefem++ directory " ;
- 	exit 1;
-diff -up freefem++-3.0-5/examples++-load/Makefile.am.r freefem++-3.0-5/examples++-load/Makefile.am
---- freefem++-3.0-5/examples++-load/Makefile.am.r	2009-01-06 20:30:40.000000000 +0100
-+++ freefem++-3.0-5/examples++-load/Makefile.am	2009-03-03 01:04:15.000000000 +0100
-@@ -132,13 +132,13 @@ load.link:load.link.in  Makefile
- 	chmod a+x load.link
- 
+ 	ff=`which freefem++.exe`;
+ 	ffinc=`dirname "$ff"`/examples++-load/include
+diff -up freefem++-3.5/examples++-load/Makefile.am.r freefem++-3.5/examples++-load/Makefile.am
+--- freefem++-3.5/examples++-load/Makefile.am.r	2009-06-16 10:30:42.000000000 +0200
++++ freefem++-3.5/examples++-load/Makefile.am	2009-09-20 21:50:15.000000000 +0200
+@@ -141,16 +141,16 @@ load.link:load.link.in  Makefile
+ freefem++.pref:
+ 	echo loadpath = \"./\" >freefem++.pref
  install-exec-local:: load_compile
 -	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
 -	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
 -	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
 -	$(INSTALL_DATA)  include/* $(DESTDIR)$(ff_prefix_dir)/include
 -	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
--	echo loadpath += \"$(ff_prefix_dir)/lib\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo loadpath += \"./\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
 -	echo includepath += \"$(ff_prefix_dir)/edp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
 +	$(INSTALL_DATA)  include/* $(DESTDIR)$(includedir)/freefem++
-+	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
-+	echo loadpath += \"$(ff_prefix_dir)/lib\"  >$(DESTDIR)$(sysconfdir)/freefem++.pref
++	$(INSTALL)  -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++	echo loadpath += \"./\"  >$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
 +	echo includepath += \"$(ff_prefix_dir)/edp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
  	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
+-	-$(INSTALL)  -m 555 $(LIST_COMPILE_PKG) $(DESTDIR)$(ff_prefix_dir)/lib
++	-$(INSTALL)  -m 755 $(LIST_COMPILE_PKG) $(DESTDIR)$(libdir)/freefem++
+ 
  
  
-diff -up freefem++-3.0-5/src/lglib/Makefile.am.r freefem++-3.0-5/src/lglib/Makefile.am
---- freefem++-3.0-5/src/lglib/Makefile.am.r	2006-04-10 22:51:52.000000000 +0200
-+++ freefem++-3.0-5/src/lglib/Makefile.am	2009-03-03 01:04:15.000000000 +0100
+diff -up freefem++-3.5/Makefile.am.r freefem++-3.5/Makefile.am
+--- freefem++-3.5/Makefile.am.r	2009-07-10 09:36:21.000000000 +0200
++++ freefem++-3.5/Makefile.am	2009-09-20 21:52:46.000000000 +0200
+@@ -25,14 +25,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
+ 
+ FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
+ 
+-FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION \
++FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INNOVATION \
+ mode-mi-edp.zip \
+ examples++-tutorial/aile.msh examples++-tutorial/xyf \
+ examples++-3d/dodecaedre01.mesh  \
+ examples++-3d/lac-leman-v4.msh \
+ examples++-load/load.link \
+ ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh  \
+-./download/fftw/Makefile ./download/fftw/Makefile.am \
++./download/fftw/Makefile \
+ examples++*/*.[ie]dp 
+ 
+ 
+@@ -148,8 +148,8 @@ clean-local::
+ # Native MacOS packaging
+ # ----------------------
+ install-exec-local:: 
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/$(VERSION)
+-	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir)/$(VERSION); tar xvf -)
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)
++	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir); tar xvf -)
+ 
+ ListFiles-natives: .FORCE 
+ #	echo COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION >$@	
+@@ -159,7 +159,7 @@ ListFiles-natives: .FORCE 
+ #	echo examples++-3d/dodecaedre01.mesh  >> $@
+ #	echo examples++-load/load.link >> $@
+ #	echo ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh >> $@
+-	echo ./download/fftw/Makefile ./download/fftw/Makefile.am  >>$@
++	echo ./download/fftw/Makefile ./download/fftw/Makefile  >>$@
+ 	find .  -name '*.[ei]dp' -o -name '*.h*' -o -name '*.cpp'  |egrep  '[.]/examples++' >>$@
+ 	find .   -name '*.h*' -o -name '*.cpp'  |egrep  '[.]/examples++' >>$@
+ List-agl-dylib: src/nw/FreeFem++
+diff -up freefem++-3.5/src/Carbon.r freefem++-3.5/src/Carbon
+diff -up freefem++-3.5/src/lglib/Makefile.am.r freefem++-3.5/src/lglib/Makefile.am
+--- freefem++-3.5/src/lglib/Makefile.am.r	2006-04-10 22:51:52.000000000 +0200
++++ freefem++-3.5/src/lglib/Makefile.am	2009-09-20 21:42:32.000000000 +0200
 @@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
  BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
  


Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- freefem++.spec	24 Jul 2009 23:08:46 -0000	1.21
+++ freefem++.spec	20 Sep 2009 20:57:17 -0000	1.22
@@ -1,10 +1,10 @@
-%define dotpl .5
-%define dashpl -5
+%define dotpl %{nil}
+%define dashpl %{nil}
 
 Summary: PDE solving tool
 Name: freefem++
-Version: 3.0
-Release: 6%{dotpl}%{?dist}
+Version: 3.5
+Release: 1%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
 Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
@@ -26,13 +26,13 @@ BuildRequires:	fltk-devel
 BuildRequires:	gcc-gfortran
 BuildRequires:	glut-devel
 BuildRequires:	ImageMagick
-BuildRequires:	lam-devel
 BuildRequires:	lapack-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libtool
 BuildRequires:	libXpm-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXxf86vm-devel
+BuildRequires:	openmpi-devel >= 1.3.3-2
 BuildRequires:	suitesparse-devel
 #BuildRequires:	superlu-devel
 %{?_with_tetgen:BuildRequires:	tetgen-devel}
@@ -85,7 +85,7 @@ This package contains the MPI version of
 %patch1 -p1 -b .gcc44
 %patch2 -p1
 %patch3 -p1 -b .t
-find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" \) | xargs chmod 644
+find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" \) | xargs chmod 644
 for file in AUTHORS ChangeLog COPYRIGHT COPYING HISTORY ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf8 $file && \
 	touch -r $file $file.utf8 && \
@@ -94,7 +94,7 @@ done
 
 %build
 . /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
+module load openmpi-%{_arch}
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 autoreconf -vif
 %configure \
@@ -116,22 +116,23 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+pushd $RPM_BUILD_ROOT%{_datadir}/freefem++
+rm -r download
+rm BUGS COPYRIGHT HISTORY* INNOVATION INSTALL README TODO freefem++doc.pdf mode-mi-edp.zip
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0
 %check
 . /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
+module load openmpi-%{_arch}
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{__make} check
-pkill lamd
-%endif
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING COPYRIGHT ChangeLog HISTORY HISTORY_BEFORE_2005
-%doc INNOVATION README* TODO
+%doc AUTHORS BUGS COPYING COPYRIGHT HISTORY INNOVATION README TODO
 %doc DOC/freefem++doc.pdf
 %{_mandir}/man1/*
 %{_bindir}/FreeFem++
@@ -144,11 +145,13 @@ pkill lamd
 %{_bindir}/ffmedit
 %{_libdir}/freefem++
 %{_sysconfdir}/freefem++.pref
+%dir %{_datadir}/freefem++
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/ff-c++
 %{_includedir}/freefem++
+%{_datadir}/freefem++/examples*
 
 %files glx
 %defattr(-,root,root,-)
@@ -159,6 +162,14 @@ pkill lamd
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-1
+- update to 3.5
+- adjust environment modules setup for current version
+- use openmpi instead of lam (regression tests pass)
+- remove irrelevant READMEs and old changelogs from docs
+- add examples to -devel subpackage
+- fix some minor build problems
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-6.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Mar 2009 01:55:48 -0000	1.7
+++ sources	20 Sep 2009 20:57:17 -0000	1.8
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-fcdaff128c57fb95427954cbe2f52a61  freefem++-3.0-5.tar.gz
+3dea51f61d8f04ca1d2382c55589816d  freefem++-3.5.tar.gz



From rdieter at fedoraproject.org  Sun Sep 20 21:12:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 21:12:41 +0000 (UTC)
Subject: rpms/arora/devel arora.spec,1.19,1.20
Message-ID: <20090920211241.ED02411C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30661

Modified Files:
	arora.spec 
Log Message:
* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
- add icon/mime scriptlets
- don't own %{_mandir}/man1
- BR: qt4-devel



Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- arora.spec	31 Aug 2009 11:46:58 -0000	1.19
+++ arora.spec	20 Sep 2009 21:12:40 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           arora
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
@@ -13,7 +13,7 @@ Patch2:         arora-0.8.0-fedorahome.p
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  qt4-devel >= 4.4.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
@@ -28,7 +28,7 @@ browsing and other common features such 
 Summary:        Better Gnome support for Arora
 Group:          Applications/Internet
 Requires:       control-center
-Requires:       arora
+Requires:       arora 
 
 %description gnome
 Adds Arora to Preferred Applications list in Gnome Control Center.
@@ -48,6 +48,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=$RPM_BUILD_ROOT install 
 
+# imo, shouldn't add/change upstream vendor here, but changing
+# once released this way is bad too. :(  -- Rex
 desktop-file-install --vendor fedora \
       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
       --delete-original\
@@ -57,6 +59,22 @@ desktop-file-install --vendor fedora \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README ChangeLog
@@ -70,16 +88,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/16x16/apps/arora.png
 %{_datadir}/icons/hicolor/32x32/apps/arora.png
 %{_datadir}/icons/hicolor/scalable/apps/arora.svg
-%{_datadir}/arora
+%{_datadir}/arora/
 %{_datadir}/pixmaps/arora.xpm
-%{_datadir}/man/man1
+%{_mandir}/man1/*
 
 %files gnome
 %defattr(-,root,root,-)
-%{_datadir}/gnome-control-center/default-apps
+%{_datadir}/gnome-control-center/default-apps/
 
 
 %changelog
+* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
+- add icon/mime scriptlets
+- don't own %%{_mandir}/man1
+- BR: qt4-devel
+
 * Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
 - Update to 0.9.0
 
@@ -139,4 +162,4 @@ rm -rf $RPM_BUILD_ROOT
 - Location bar's double click selects all
 
 * Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
-- Initial spec file 
\ No newline at end of file
+- Initial spec file 



From rathann at fedoraproject.org  Sun Sep 20 21:59:29 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 20 Sep 2009 21:59:29 +0000 (UTC)
Subject: rpms/freefem++/devel freefem++.spec,1.22,1.23
Message-ID: <20090920215930.03EDD11C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17144

Modified Files:
	freefem++.spec 
Log Message:
disable testsuite for now, make note that tests pass locally



Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- freefem++.spec	20 Sep 2009 20:57:17 -0000	1.22
+++ freefem++.spec	20 Sep 2009 21:59:29 -0000	1.23
@@ -124,11 +124,13 @@ popd
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0
 %check
 . /etc/profile.d/modules.sh
 module load openmpi-%{_arch}
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{__make} check
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -165,7 +167,7 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 * Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-1
 - update to 3.5
 - adjust environment modules setup for current version
-- use openmpi instead of lam (regression tests pass)
+- use openmpi instead of lam (regression tests pass locally)
 - remove irrelevant READMEs and old changelogs from docs
 - add examples to -devel subpackage
 - fix some minor build problems



From rathann at fedoraproject.org  Sun Sep 20 22:04:50 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 20 Sep 2009 22:04:50 +0000 (UTC)
Subject: rpms/freefem++/devel freefem++.spec,1.23,1.24
Message-ID: <20090920220450.3294C11C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19791

Modified Files:
	freefem++.spec 
Log Message:
bump for rebuild



Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- freefem++.spec	20 Sep 2009 21:59:29 -0000	1.23
+++ freefem++.spec	20 Sep 2009 22:04:49 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: PDE solving tool
 Name: freefem++
 Version: 3.5
-Release: 1%{dotpl}%{?dist}
+Release: 2%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
 Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
@@ -164,6 +164,9 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Mon Sep 21 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-2
+- disable testsuite
+
 * Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-1
 - update to 3.5
 - adjust environment modules setup for current version



From sindrepb at fedoraproject.org  Sun Sep 20 23:27:46 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sun, 20 Sep 2009 23:27:46 +0000 (UTC)
Subject: rpms/muine/devel .cvsignore, 1.7, 1.8 muine.spec, 1.32, 1.33 sources,
	1.7, 1.8
Message-ID: <20090920232747.4A7B011C00E6@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/muine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19605

Modified Files:
	.cvsignore muine.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/muine/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Dec 2008 05:44:36 -0000	1.7
+++ .cvsignore	20 Sep 2009 23:27:44 -0000	1.8
@@ -1 +1 @@
-muine-0.8.10.tar.bz2
+muine-0.8.11.tar.bz2


Index: muine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine/devel/muine.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- muine.spec	20 Aug 2009 22:28:02 -0000	1.32
+++ muine.spec	20 Sep 2009 23:27:44 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           muine
-Version:        0.8.10
-Release:        6%{?dist}
+Version:        0.8.11
+Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -8,15 +8,15 @@ License:        GPLv2+
 URL:            http://www.muine-player.org/
 Source0:        http://ftp.acc.umu.se/pub/GNOME/sources/muine/0.8/muine-%{version}.tar.bz2
 #Thanks muine-devs
-Patch0:         %{name}-%{version}-mono_workaround.patch
-Patch1:         %{name}-%{version}-gstreamer-critical.patch
+#Patch0:         %{name}-%{version}-mono_workaround.patch
+#Patch1:         %{name}-%{version}-gstreamer-critical.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel, gtk-sharp2-devel
 BuildRequires:  ndesk-dbus-devel, ndesk-dbus-glib-devel
-BuildRequires:  gtk2-devel, gnome-vfs2-devel, gnome-icon-theme, gdbm-devel
+BuildRequires:  gtk2-devel, gnome-icon-theme, gdbm-devel
 BuildRequires:  gstreamer-devel, gnome-sharp-devel
-BuildRequires:  libid3tag-devel, dbus-sharp-devel
+BuildRequires:  libid3tag-devel, dbus-sharp-devel, taglib-sharp-devel
 BuildRequires:  libvorbis-devel, flac-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  desktop-file-utils, gettext, intltool
@@ -46,8 +46,8 @@ Muine is a music player for GNOME
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
+#%patch0 -p0
+#%patch1 -p0
 
 %build
 %configure
@@ -126,6 +126,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/muine/*.a
 
 %changelog
+* Sun Sep 20 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 0.8.11-1
+- New upstream release, bugfixes including: 
+- Various deprecation cleanups
+- Use GLib's GSequence API 
+- Use GtkMessageDialog instead of Glade-based ones
+- Use Gnome.Vfs# instead of P/Invoked functions [Priit Laes]
+- Use taglib-sharp for metadata reading
+- Drop gnome-vfs usage
+- Drop xine backend
+- Various bugs fixes and cleanups
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.10-6
 - rebuild for ppc64 since the previous build was obsoleted
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/muine/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Dec 2008 05:44:37 -0000	1.7
+++ sources	20 Sep 2009 23:27:44 -0000	1.8
@@ -1 +1 @@
-28e561388de1deebc6336f936bc74a73  muine-0.8.10.tar.bz2
+f2a74519d9e9c6c4fca9c5217a13964a  muine-0.8.11.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 20 23:32:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 20 Sep 2009 23:32:10 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.60, 1.61 qt.spec, 1.328, 1.329 sources, 
	1.62, 1.63
Message-ID: <20090920233210.05F7A11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21845

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-19
- Missing Qt Designer icon (#476605)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	2 Jul 2009 10:43:12 -0000	1.60
+++ .cvsignore	20 Sep 2009 23:32:08 -0000	1.61
@@ -9,3 +9,6 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
+ox16-app-designer.png
+ox32-app-designer.png
+ox48-app-designer.png


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- qt.spec	11 Sep 2009 21:36:54 -0000	1.328
+++ qt.spec	20 Sep 2009 23:32:09 -0000	1.329
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -87,6 +87,11 @@ Source24: qtconfig.desktop
 Source30: hi128-app-qt4-logo.png
 Source31: hi48-app-qt4-logo.png
 
+# copied from kdebase-4.3.1
+Source33: ox16-app-designer.png
+Source34: ox32-app-designer.png
+Source35: ox48-app-designer.png
+
 ## BOOTSTRAPPING, undef docs, demos, examples, phonon, webkit
 
 ## optional plugin bits
@@ -579,6 +584,10 @@ install -p -m644 -D %{SOURCE4} %{buildro
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+# designer icon(s)
+install -p -m644 -D %{SOURCE33} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/designer.png
+install -p -m644 -D %{SOURCE34} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/designer.png
+install -p -m644 -D %{SOURCE35} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/designer.png
 # linguist icons
 for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
@@ -815,6 +824,7 @@ fi
 # Qt designer
 %{_qt4_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
+%{_datadir}/icons/hicolor/*/apps/designer.*
 # Qt Linguist
 %{_qt4_bindir}/linguist*
 %{_datadir}/applications/*linguist.desktop
@@ -892,6 +902,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-19
+- Missing Qt Designer icon (#476605)
+
 * Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-18
 - drop gcc -fno-var-tracking-assignments hack (#522576)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	20 Aug 2009 22:15:29 -0000	1.62
+++ sources	20 Sep 2009 23:32:09 -0000	1.63
@@ -8,3 +8,6 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
+d75b300d1b89dab6f56b6f6b3669d62b  ox16-app-designer.png
+af2df60aa84a51b3905e95d69ff8a6bf  ox32-app-designer.png
+75f64f8b4a130ac0e19f5f9149e1d63a  ox48-app-designer.png



From pkgdb at fedoraproject.org  Sun Sep 20 23:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:35:38 +0000
Subject: [pkgdb] ghc-zlib had acl change status
Message-ID: <20090920233538.7AC6310F876@bastion2.fedora.phx.redhat.com>

petersen has set the watchbugzilla acl on ghc-zlib (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-zlib



From pkgdb at fedoraproject.org  Sun Sep 20 23:35:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:35:47 +0000
Subject: [pkgdb] ghc-zlib had acl change status
Message-ID: <20090920233548.905F110F889@bastion2.fedora.phx.redhat.com>

petersen has set the watchcommits acl on ghc-zlib (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-zlib



From pkgdb at fedoraproject.org  Sun Sep 20 23:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:35:53 +0000
Subject: [pkgdb] ghc-zlib had acl change status
Message-ID: <20090920233553.E2DB310F890@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on ghc-zlib (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-zlib



From pkgdb at fedoraproject.org  Sun Sep 20 23:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:37:11 +0000
Subject: [pkgdb] ghc-ghc-paths had acl change status
Message-ID: <20090920233711.9A1E110F876@bastion2.fedora.phx.redhat.com>

petersen has set the watchbugzilla acl on ghc-ghc-paths (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-ghc-paths



From pkgdb at fedoraproject.org  Sun Sep 20 23:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:37:12 +0000
Subject: [pkgdb] ghc-ghc-paths had acl change status
Message-ID: <20090920233712.D9F9310F880@bastion2.fedora.phx.redhat.com>

petersen has set the watchcommits acl on ghc-ghc-paths (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-ghc-paths



From pkgdb at fedoraproject.org  Sun Sep 20 23:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:37:14 +0000
Subject: [pkgdb] ghc-ghc-paths had acl change status
Message-ID: <20090920233714.2B33A10F897@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on ghc-ghc-paths (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-ghc-paths



From pkgdb at fedoraproject.org  Sun Sep 20 23:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:38:02 +0000
Subject: [pkgdb] ghc-HTTP had acl change status
Message-ID: <20090920233803.804BC10F876@bastion2.fedora.phx.redhat.com>

petersen has set the watchbugzilla acl on ghc-HTTP (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HTTP



From pkgdb at fedoraproject.org  Sun Sep 20 23:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:38:04 +0000
Subject: [pkgdb] ghc-HTTP had acl change status
Message-ID: <20090920233804.A4FFE10F889@bastion2.fedora.phx.redhat.com>

petersen has set the watchcommits acl on ghc-HTTP (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HTTP



From pkgdb at fedoraproject.org  Sun Sep 20 23:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Sep 2009 23:38:06 +0000
Subject: [pkgdb] ghc-HTTP had acl change status
Message-ID: <20090920233806.EE80610F890@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on ghc-HTTP (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HTTP



From sindrepb at fedoraproject.org  Sun Sep 20 23:56:56 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sun, 20 Sep 2009 23:56:56 +0000 (UTC)
Subject: rpms/muine/devel muine.spec,1.33,1.34
Message-ID: <20090920235656.6A96511C00E6@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/muine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29737

Modified Files:
	muine.spec 
Log Message:



Index: muine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine/devel/muine.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- muine.spec	20 Sep 2009 23:27:44 -0000	1.33
+++ muine.spec	20 Sep 2009 23:56:55 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  mono-devel, gtk-sharp2-devel
 BuildRequires:  ndesk-dbus-devel, ndesk-dbus-glib-devel
 BuildRequires:  gtk2-devel, gnome-icon-theme, gdbm-devel
+BuildRequires:	GConf2-devel
 BuildRequires:  gstreamer-devel, gnome-sharp-devel
 BuildRequires:  libid3tag-devel, dbus-sharp-devel, taglib-sharp-devel
 BuildRequires:  libvorbis-devel, flac-devel
@@ -126,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/muine/*.a
 
 %changelog
-* Sun Sep 20 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 0.8.11-1
+* Sun Sep 20 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 0.8.11-2
 - New upstream release, bugfixes including: 
 - Various deprecation cleanups
 - Use GLib's GSequence API 



From rathann at fedoraproject.org  Mon Sep 21 00:34:03 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 21 Sep 2009 00:34:03 +0000 (UTC)
Subject: rpms/tachyon/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tachyon-rpm.patch, 1.7, 1.8 tachyon.spec, 1.13, 1.14
Message-ID: <20090921003403.D618B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10824

Modified Files:
	.cvsignore sources tachyon-rpm.patch tachyon.spec 
Log Message:
* Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-1
- update to 0.98.7 release
- simplify specfile ifdeffery and reduce patch size
- fix build with new environment-modules
- add manpage from Debian package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Feb 2009 17:46:03 -0000	1.4
+++ .cvsignore	21 Sep 2009 00:33:58 -0000	1.5
@@ -1 +1,2 @@
-tachyon-0.98.1.tar.gz
+tachyon-0.98.7.tar.gz
+tachyon.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Feb 2009 17:46:03 -0000	1.4
+++ sources	21 Sep 2009 00:33:59 -0000	1.5
@@ -1 +1,2 @@
-8f8e7b491b2517319cb4f5596c952a0b  tachyon-0.98.1.tar.gz
+17b41c7042a2d3a75531a4979f643d15  tachyon-0.98.7.tar.gz
+491604338614814996bfe54b6ad113d4  tachyon.1

tachyon-rpm.patch:
 Make-arch   |   67 ++++++++++++++++++++++++++++++++++++++++--------------------
 Make-config |   30 +++++++++++++++-----------
 Make-opengl |    4 +--
 3 files changed, 64 insertions(+), 37 deletions(-)

Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon-rpm.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tachyon-rpm.patch	28 Feb 2009 17:46:03 -0000	1.7
+++ tachyon-rpm.patch	21 Sep 2009 00:33:59 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
---- tachyon/unix/Make-arch.r	2009-02-01 06:06:08.000000000 +0100
-+++ tachyon/unix/Make-arch	2009-02-28 16:35:29.000000000 +0100
+--- tachyon/unix/Make-arch.r	2009-04-21 23:19:45.000000000 +0200
++++ tachyon/unix/Make-arch	2009-09-20 23:34:13.000000000 +0200
 @@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
  
  MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -14,7 +14,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
  	$(MAKE) all \
  	"ARCH = linux-64-thr" \
  	"CC = gcc" \
--	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+-	"CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
 +	"CFLAGS = -m64 -Wall -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
@@ -27,7 +27,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
  	$(MAKE) all \
  	"ARCH = linux-thr" \
  	"CC = gcc" \
--	"CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+-	"CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
 +	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
@@ -40,7 +40,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
  	$(MAKE) all \
  	"ARCH = linux-thr-ogl" \
  	"CC = cc" \
--	"CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+-	"CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
 +	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
 +	"AR = ar" \
 +	"ARFLAGS = r" \
@@ -52,7 +52,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
 +	$(MAKE) all \
 +	"ARCH = linux-64-thr-ogl" \
 +	"CC = cc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -DLP64 -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
  	"STRIP = touch" \
@@ -61,14 +61,15 @@ diff -up tachyon/unix/Make-arch.r tachyo
  	$(MAKE) all \
  	"ARCH = linux-lam" \
 -	"CC = hcc" \
--	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+-	"CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
 +	"CC = mpicc" \
 +	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
 -	"STRIP = strip" \
 +	"STRIP = touch" \
-+	"RANLIB = ranlib" \
+ 	"RANLIB = ranlib" \
+-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
 +	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
 +
 +# Linux x86 using LAM MPI, with OpenGL display
@@ -80,8 +81,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
 +	"AR = ar" \
 +	"ARFLAGS = r" \
 +	"STRIP = touch" \
- 	"RANLIB = ranlib" \
--	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
++	"RANLIB = ranlib" \
 +	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
  
  # Linux AMD64/EM64T using LAM MPI
@@ -90,7 +90,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
  	$(MAKE) all \
 -	"ARCH = linux-lam-64" \
 -	"CC = hcc" \
--	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+-	"CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
 +	"ARCH = linux-64-lam" \
 +	"CC = mpicc" \
 +	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
@@ -113,10 +113,10 @@ diff -up tachyon/unix/Make-arch.r tachyo
  	$(MAKE) all \
 -	"ARCH = linux-lam-64-ogl" \
 -	"CC = hcc" \
--	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+-	"CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
 +	"ARCH = linux-64-lam-ogl" \
 +	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
 -	"STRIP = strip" \
@@ -127,307 +127,9 @@ diff -up tachyon/unix/Make-arch.r tachyo
  
  # Linux x86 using LAM MPI and threads
  linux-lam-thr:
-@@ -1302,6 +1325,234 @@ linux-ppc:
- 	"RANLIB = ranlib" \
- 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
- 
-+# Linux PPC using gcc and threads
-+linux-ppc-thr:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc-thr" \
-+	"CC = gcc" \
-+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC using threads with OpenGL display
-+linux-ppc-thr-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc-thr-ogl" \
-+	"CC = gcc" \
-+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC using LAM MPI
-+linux-ppc-lam:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc-lam" \
-+	"CC = mpicc" \
-+	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux PPC using LAM MPI, with OpenGL display
-+linux-ppc-lam-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc-lam-ogl" \
-+	"CC = mpicc" \
-+	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux PPC64 using gcc 
-+linux-ppc64:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc64" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = strip" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux PPC64 using gcc and threads
-+linux-ppc64-thr:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc64-thr" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC64 using threads with OpenGL display
-+linux-ppc64-thr-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc64-thr-ogl" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC64 using LAM MPI
-+linux-ppc64-lam:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc64-lam" \
-+	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux PPC64 using LAM MPI, with OpenGL display
-+linux-ppc64-lam-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-ppc64-lam-ogl" \
-+	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC using gcc 
-+linux-sparc:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc" \
-+	"CC = gcc" \
-+	"CFLAGS = -m32 -Wall -O2 -DLinux $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = strip" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux SPARC using gcc and threads
-+linux-sparc-thr:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc-thr" \
-+	"CC = gcc" \
-+	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC using threads with OpenGL display
-+linux-sparc-thr-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc-thr-ogl" \
-+	"CC = gcc" \
-+	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC using LAM MPI
-+linux-sparc-lam:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc-lam" \
-+	"CC = mpicc" \
-+	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC using LAM MPI, with OpenGL display
-+linux-sparc-lam-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc-lam-ogl" \
-+	"CC = mpicc" \
-+	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC64 using gcc 
-+linux-sparc64:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc64" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = strip" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux SPARC64 using gcc and threads
-+linux-sparc64-thr:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc64-thr" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC64 using threads with OpenGL display
-+linux-sparc64-thr-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc64-thr-ogl" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC64 using LAM MPI
-+linux-sparc64-lam:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc64-lam" \
-+	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC64 using LAM MPI, with OpenGL display
-+linux-sparc64-lam-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-sparc64-lam-ogl" \
-+	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
- # Linux PPC using gcc 
- linux-ps2:
- 	$(MAKE) all \
-@@ -1319,13 +1570,61 @@ linux-alpha:
- 	$(MAKE) all \
- 	"ARCH = linux-alpha" \
- 	"CC = gcc" \
--	"CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
-+	"CFLAGS = -Wall -O2 -DLinux $(MISCFLAGS)" \
- 	"AR = ar" \
- 	"ARFLAGS = r" \
- 	"STRIP = strip" \
- 	"RANLIB = ranlib" \
- 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
- 
-+# Linux Alpha using gcc and threads
-+linux-alpha-thr:
-+	$(MAKE) all \
-+	"ARCH = linux-alpha-thr" \
-+	"CC = gcc" \
-+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux Alpha using threads with OpenGL display
-+linux-alpha-thr-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-alpha-thr-ogl" \
-+	"CC = gcc" \
-+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux Alpha using LAM MPI
-+linux-alpha-lam:
-+	$(MAKE) all \
-+	"ARCH = linux-alpha-lam" \
-+	"CC = mpicc" \
-+	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux Alpha using LAM MPI, with OpenGL display
-+linux-alpha-lam-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-alpha-lam-ogl" \
-+	"CC = mpicc" \
-+	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
- # Linux Alpha using Compaq's compilers
- linux-alpha-ccc:
- 	$(MAKE) all \
 diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config
---- tachyon/unix/Make-config.r	2007-01-24 09:15:44.000000000 +0100
-+++ tachyon/unix/Make-config	2009-02-28 16:17:03.000000000 +0100
+--- tachyon/unix/Make-config.r	2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-config	2009-09-20 23:07:42.000000000 +0200
 @@ -57,7 +57,7 @@ X11LIB= -lX11
  ##########################################################################
  
@@ -491,19 +193,8 @@ diff -up tachyon/unix/Make-config.r tach
  
  ##########################################################################
 diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl
---- tachyon/unix/Make-opengl.r	2007-01-24 09:15:44.000000000 +0100
-+++ tachyon/unix/Make-opengl	2009-02-28 16:17:03.000000000 +0100
-@@ -9,8 +9,8 @@
- #
- # Generic Mesa OpenGL / GLX include and link specs, for most platforms
- #
--MESA_GLX_INCS = -I/usr/local/include
--MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
-+MESA_GLX_INCS = 
-+MESA_GLX_LIBS = -lGL -lGLU -lX11
- 
- 
- #
+--- tachyon/unix/Make-opengl.r	2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-opengl	2009-09-20 23:07:42.000000000 +0200
 @@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr
  #
  # Linux OpenGL / GLX include and link specs


Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tachyon.spec	27 Jul 2009 05:28:52 -0000	1.13
+++ tachyon.spec	21 Sep 2009 00:33:59 -0000	1.14
@@ -1,22 +1,22 @@
-%ifarch %{ix86}
+%ifarch %{ix86} alpha ppc sparc
 %define target linux
 %endif
-%ifarch x86_64
+%ifarch ppc64 sparc64 x86_64
 %define target linux-64
 %endif
-%ifarch ppc ppc64 sparc sparc64 alpha
-%define target linux-%{_target_cpu}
-%endif
 
-%define variants thr thr-ogl lam lam-ogl
+%define variants thr thr-ogl
+%define mpi_variants lam lam-ogl
 
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
-Version: 0.98.1
-Release: 2%{?dist}
+Version: 0.98.7
+Release: 1%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
-Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version}.tar.gz
+Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version}.tar.gz
+# taken from Debian package
+Source1: %{name}.1
 Patch0: %{name}-rpm.patch
 License: BSD with advertising
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -96,19 +96,21 @@ with tachyon.
 find . -name CVS | xargs %{__rm} -r
 # executable sources
 chmod 644 src/hash.{c,h}
-chmod 644 demosrc/trackball.c
-# pre-built binaries
-rm -r compile/{linux,solaris}/*
-# dangling symlinks
-rm scenes/{imaps,tpoly,vol}
+chmod 644 src/pngfile.h
+chmod 644 demosrc/spaceball.c
+chmod 644 demosrc/trackball.{c,h}
+chmod 644 scenes/imaps/*
 
 %build
-. /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
 pushd unix
 for variant in %{variants} ; do
   %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
 done
+source /etc/profile.d/modules.sh
+module load lam-%{_arch}
+for variant in %{mpi_variants} ; do
+  %{__make} %{?_smp_mflags} OPTFLAGS="$CFLAGS $RPM_OPT_FLAGS" %{target}-$variant
+done
 popd
 
 pushd docs
@@ -117,43 +119,51 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
-for variant in %{variants} ; do
+mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon,%{_mandir}/man1}
+for variant in %{variants} %{mpi_variants} ; do
   install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
 done
 rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
 %{__mv} docs/tachyon docs/html
 %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
+install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
 %attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 
 %files gl
 %defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
 %attr(755,root,root) %{_bindir}/%{name}-ogl
 
 %files lam
 %defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
 %attr(755,root,root) %{_bindir}/%{name}-lam
 
 %files lam-gl
 %defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
 %attr(755,root,root) %{_bindir}/%{name}-lam-ogl
 
 %files docs
 %defattr(644,root,root,755)
-%doc docs/tachyon.pdf docs/tachyon.ps docs/html
+%doc Changes docs/tachyon.pdf docs/tachyon.ps docs/html
 %{_datadir}/tachyon
 
 %changelog
+* Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-1
+- update to 0.98.7 release
+- simplify specfile ifdeffery and reduce patch size
+- fix build with new environment-modules
+- add manpage from Debian package
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ebrand at fedoraproject.org  Mon Sep 21 02:08:21 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Mon, 21 Sep 2009 02:08:21 +0000 (UTC)
Subject: rpms/sslogger/EL-5 sslogger-0.9.tar.gz, NONE, 1.1 sslogger.spec,
	NONE, 1.1
Message-ID: <20090921020821.C675811C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18267

Added Files:
	sslogger-0.9.tar.gz sslogger.spec 
Log Message:
Original release




--- NEW FILE sslogger-0.9.tar.gz ---
?
2O?A?z~????EY?c?]???^?e3,J??v?u?v??
?????]??x?GI??"i??[???Sa???bV*J??(O?????Z
????	??@
D???}??"??E6
|N}W??
8????Q??c}7"N?7l?A?&D1C?;)!C4??
?x
??}[??/???2?I4??LNp?
?d?gA??ck???????+8<?
?;??~????$?Zq#$,:|??B?K?;?x???>??ONO?~?)????Y????p?????????0?8???
???a???????	8t;[???Y?	@RC?????Fa??;AM???Wc?ND0??M?{?`??E?"1?i?0+X??????WV?"?f"?G1.??!G??????sd?
??x%??q??????^?t??;ud??MA?
j?m???}m?V?jd/\n??_?,?E??C?=uH?
?A ?Y7?z??o???}????#??NH??gaj?C`?????Q7?Z????Poz?n????????yH?{????(????????Q???KiRh>!?G)G??qO ???/g{v7:??+H?(O?????G?@?c?dAjB??h(\I ???&???F?=6?U???I?%[???J6 at 8??d????L?L?@?I?D?
?1???9???kaMjYH????"??(???l?XVPr|R????$$??]uK"?bsf?[???g?tyXf?0???XJy?Q95;~?????4Gn??????????=@yf????Gsf???6b+??(?R?$G???O??????i???$???p!???u>uG?E?v6e?<?Q??84W?f?QQ<????t?????????_??	?q?>?Z??0??\?-q????sTee??cL??M????h??u4?lm???z!???%??!)???"?2,?o??VL???a??#???Q?~^#?f?eN???

?_??7~???)??]"$??RZ?[???#?s???6{Id???KDRT?Y?????TY?F2u"B??1?~NBU4?=???6??\?{?_???^?X???]X	?7?/?G????\?J?z?]%GR u????T??Q??u?cB?/??K#"?]?*?cnw:?????b?fq8????.?,Y?????W6T6?Q?)h?#??)&E?P??????h?9????;?pz?X???+??p?=??Jo??>??u/{?????O????46?q??.?
??R??"?$?nTCmM??i???f)?Z?????]
?s????????????M??-???G????????E?
g;??b?t??#M1??-??D???t ~?S??jI?uj3L?Rm(?M??$0????$?????c1u??????????dT*?$t?HNg?mB???ZC	???????r???jbD??*2<?,???6(?U7`g;????ya,????'??a;??CJJl$0??????Z??A??. ???kFf????????C????<P?YYQ?x?1-??lD;V/??\?]?7N?6??w
]?XeO?!
*1	??????o?f|W?,
?
6?N???/???8???w?? ??a??*e?+
?j?6?U?'??6D????qz????
+?
?^???r??&
?6????V?1?S??????h???z{A{??o?h?q??P
?????$?????,??X
B?????;?????
y??@^c?n&?Anu??'N0??A??
????_???P?_`??EaI?B????M?Nh?????z?\???X???e?L5%j?'~`?VP?????+k??
?YoB+E??c?<?Q???`6$?>v+??(p?S?
&?`?W/1??6??j???r??O?5??[*?@???????i??	?@^Dg??j?lt$??????U??~0?Qr?
???]????g????-w.????KHz?V{???Q????oQ??M?[?W????:?=L?????	2:???x_???g???Y?[^??cUZ?e>????L?2e
?DyT??_?q&???U?????????????Z!???(4?gu?q??Z7???X????c?4?)i??$?v%?F:?????T? ?h????g??Y?!L????y?L?}???\&Y????????????A=??'7-
???8?b?????????B=???|??????hBggg?
??|?|k>??<???t??/>???Gg??>??Nt??c??????:?b1UJ?O?u????[Z;?`?H
-w???Vz?????g???
?s?F?????#u??>??_??r(G??S??????/=8???}?s????W?=????X??E??7Q4
???"???,??N??X??Xon?8?,?(?
WG'???.?i??v?d'???#{Q???_JK'r}K???R???????
??o*pC??#?????,*?????y?)?+??~Y?Wqh>?P?|?Y?|{F???_vXK?^???,{m?[0??		?
W
k?mPm???22??%?K]_]g?????kO???^?0C?&???
?WZ???????Neu?gM??>6?Ds??B??jq?"???????I???lX?+?/?s???C?????
z??y[E??????v{?g#??O)?5	??T
?n?T????(?H??r?0????>??!????E?j??????'???,?#?J?0??E??f*3
;???xD???
???J?@??M9n??*?????0?0*?=?I?
zV????R>avM???X:????#???#?????N3v??<?+Cs????1????f??!?T8ab??O?$???:T???p?A?^??c??????,??????k?'??????c?U?^b????T8z42??9?$???10]?PjvF??y	?????/T?K?s1???N??=?M1?L?C???.?f&u??\(3!?htj????yK?6?aPt)??M???GE\0gS$u,[_zKG.????=V8,
???????????;A?
??
P?]^]X}??$5?5??!?!3S[/???s?qY?c??????=?@??????"?????H???@?^??T?w???jo?Wk?[9??@a|'??<Dz?.{???jNe?b??i???2@??h? ru????i???c?
X?-P%r?{4???[)FS_?????Z?????*Q????U???????]??????fK?k????Q???^?????P}???????8?Y??VVy???c?*?	????b?W?"?????Q"???IS?DE??T??a???H?K?h@)2?????/BX?r.j?n????]ks??????V??<?Ar?\??CYp4?{?^?O?????????????2?b??YX??????0?w4?f?o????????????V??????E?;?C?3nQz/??M??q?81????E???gy????nV^?|??{???~?K??7??J}?y??O?????K??C??3?-??????????*????x??>E???+Ekw???????*!?D*m?o'y??"^?[?!%!??3C?`??
e?]??$>RT?_??N??eB=
?Ni?M1Y????!+C@?;SA??IR??,gl????<=:O??????????d<?????t??	l???|UC?~?B???.??Ja?5???+fb?5(i???hy??i???WD?Q^??
??-A??v????R??*??T??]?~?????
?%Md??o??J{?e????h?o?k?????4p	???5??p?,?V?????q????z?j?Q+??<??T?s??;??F?W??V?f?Qp??=P?e!??<>?????3?T?$#OL?????`
??Iy??z?v?6????O/fzVew???????K?="???9??vb??`???@1??!?[?\?d??R??0"?!_?%Le??Bu???????+????/?/!t
??m
?!i>/<??c????J=???/u?????-?P????oL9???bJ???l?*J-?[
n.?)??=;??UF?N?Z??e_e%??c?U,????A???'?W???m*???????y?_?y?1?C94D?0???(K)?[3??\???m?1F???T?%,?Jt.?`??%*oN??Wg??>?g:?H)V??
?N?#??Q??????9v\_?????q????h
C??x?=R?BQ0?@?)????KX??j????]yW?????OQ?L:6?;?8db?
?16c?YN:?-,????-,?^?7?3i??????&????'?? ??nmw?_??v??g?FAh??????+k}?<v	????I~???8?
I?????????[??V?g?x?W?e???R????O?K??`$G?hq2????E#????$E??1??;???y?{h?dG?06
??`6&???%/??G n???????o?????H?????????_??=??e?_)W?7?k??Fj??*??'}?7??Ge????c????F???
`??b*??Q?M?"s
\?Kc?_K?B?O????!???\?:?q!"???tO???J???~~(?}??B??QP??????N??nG??@?T????c2?LP??/g?:?w?z??r??K?~??-???K?r??-Z&??
>??E8|????Y?V?o?^?~???@/??5?h?5??4???;0r?9?;???h*=?Cq~??_<??q???^T?F`Z5rH?{?/??c????+T2??`#??<@C??	,?a??6?5?OKX????v=/?!*?o?U?%?H??aa??`?L?I?F?[yl5
?F???t<zHkt??~A;?????1<}ND???'?X??0?.x??d?0??g??G!?G;|?(2?J?LPD
w?qz????o??ASUZIm??L?^ e?]XGH???W[9gr?`????F#1????A!?|???w???[?dx????+??
*???a?&???kF@n???*??r~Z??????	YDd?r
W?>???+R??/?p$???	?8jcj?N?jt;??A??2?fR????+'?L?E?)????<9tlRj;?BG?@?fX???<???b?	??ei?,=????%?uJ?X???\\???Y??=??????U??????O????l?t?CKrR??;K???????
????%`??.???'??w????? ?????[d+tZ???\QS^&bP?(G3????'??f?L??7x?w?????)?)????2[?K???$*????????????8Lz?R^?zn?????j?????m??HXIm?8??^pD???)?vkj??????3?2??s9??
ZE
??A"??3?fIjI?<5?8??I??1??!S??(?f?S8??Zf??Bf
zM?	?????/]A?x! ?v.w6_?w????h???????x?>i??KR.?0??M???!@?????`?]$$? ????PE?p?yAC????%(??0uEa*J(??p??R??H?
$?$?1??
??I??`?_D????????_,?2?Ut?o?)???????????.e92?4/????L>????????K?;?A?}??
??#??-?'
?2?
??>?u{JS???h????????M?e?^q_?M?j??4?"L.?????<????m??{T?p??Z??z
??1`??o??????\???J???V??
???^??????0??+????r???V)Vj
?r5?????S????O?????<?????)?K\{?D??)?D???-????r?\.nm?*?5????Z0????j^?k
?????o?!)?pG?k????O?b?-??oH???[????(??Z?
?bP?J?{??Z???????1tg?$?n/?E?!pNY?9?(X8??*>"??f???s?J??"?10
????%?<?????z???#?^??i
??e4??_E?}?!?WB???????0?2??}?????b??	?)?B???????1??$???+?y??5?l??'Q?fZ?M]?]????k??>?????l?????)??^???h???????v??nU?x?????r}[?o?X?????>?v?????K???K???K???K???K???K???K????6x??~?????_?????????
???Y??nW1?????4???\???}HvG?l	 K??????Rpl	??????p??	O??? a
??F-?
?c?g
9????	kOYBV???^???
E=????9
C"Z???j%KP?TYN???????rN?~?
M??T????????????4??
??g????????.N?
??????moW?#?o???res???r??Cu?W??}??boq???pG?n
??@?1?%?
h???\}????C???ZS?????X??H?y[??n??=&?,}?5?R?,?5p??p?i?fn???(??^?????u??}}??????E?gk{;??J???I???I???I???I???????O????O????O??<???
??+??#@7??a???[????????r???:??! Y??Bh?"{?7?7?P?B?/?	?
??? ?
!J????&????
??H?~???Q?OfN??G{??????Q?????xY?}15?	y?0?k???#?[[E??????????P>b???3?O????^?R???Q????fQt????ep:V??eG???I?~jW?????T??????[???X??m?g??L?Nx?o??HI????????QKj?????k
???u?????b?=<l??z???UQ?????????nO??^W???g?A?=?d'????nO??9k
???w?????N?=?oua|}???E?u??C?~7??
????{ ???????????{j?A???????8??????]???A???"1??~Km?????~?T+?o?OB=???x'?P??{Mh`}??????~??l??3?]F??????h?M?]:R???K?j???	???q?z??aH`6?^??????~???7?a???% ?6{oZ??Z??J?5P?y??_???<??????Aku??^o@???9???Q?????>?/8??a?n?=????????GMH??x???q T?F??2B?0??XOE?y?n??7????t???ff??b?W???;8???4A??6??y?L?:??7-l????$?t??:h???/)
Y?????Z(W???;?4???????????L???!^????????^???'?WP? ?Vm?????*??$\Upp
???FY????[:.???^?$?o?h??Bz???otGmDH?P??e?????*?y???d4Y??.??;&??yw???C
<??????L0?Z??=???XShw&?0??4?A?X7?b8?":7?H?r}q
?4?H?X???o??6j?V;?f?*?
?[:ql???P?m?Eo???j???d?.H?4?
]??M=?
?????:?&w,:?{??'+???i????????H?$?Nc?W?????OY??N?????????5???1K8?D_????D?$??<:"A?Hy???jY??????9?e?*q?c??j"h??Y*?g?[?F"?????V?
??6??2???????6?????t??v?`mt?\s?]??|S????&???????????5kI.???\~?(vE??g	$???L-???t9:?v?)?xf:D???T?:?_?????&>
?e?????^????b??f?$????????JR.?rJ at rh??}?9
??$?B?1???i6???p`f ????????g#?D???9????G?3?j?j`????M???	??_???UD(??2?E???a??lZ??a???8??<??
E?????8?|	K??]?10???TIeN<??
yV	??????|u?K??5?????Ba???A^?oE?^???tO?H???????'???????? ??"???_9I!6?C??.??????{?S?X??_*A??<B?????#4S&?\?9p?O?fC?y?q2????V
???%????h???N0??LC??y|TwE??O???L>?CVO 4??B?,??
?A?r0??J?>:??m????C??C?r??^??	??!??y?Z6,?????d-Aw????p?V?`??Z?%"O?L?&?A????y?f?x?(f?i?F??l6q$Ox?+C?????p?&m)%$?p?????*???
??????Ak?-?
??fN????~YH^???
??J?N??0?y?9A??????h[??S&)?7?1?? ???????5?E.4?1?tz?$?`?U/E44t??K?? 0?????
W?9??%???sx?90??,???MF]??fP?OG???hF???iL???????&?B7'&??W??0f;C{??
W????zv5??*HN???????d??	???yA?do&??Y?;?Q??Tr????./????j? ??|dy??d?C*?!r?z9mf?.??c?o}*?-?2??t???v?p????0{?w??A????\????3O??b?'??%?UG"a%??b?nv?^FUh?7?C{??^^o?4???X??X??????I????????brb?? =I?3??/?b?_}???}?&n???I???S??D?C??N
cJ'^R!g??4)????#??fJ??
Y9??<?:??P-?????@??Z\??I???FRD?E???a")?G?x?H????i?fpN?/Je?Q?]??<????^3?K
?P???????o???xz???x???A!????u
]d?rx
]?3+??vSm'p???,yd?*N-??	TU?]p??T%p,8G?	J?kP??|x??e?r?B+0=?D?~?0j?>???Y?I??????:Q*??r??V?*???
?????Q?f????%aj??Bf??a;??5?Xc??!???LA ?)?\?u?U?
???qW??d???"?q?Q?+?????~??W y??? $u???n??G?????Yy4KV?Y;??Y?????\?V?@.?`??w?
?????I???+bH???l???+??.?h?F???t??
,B???lX???????h?f?QS0??XJ?2-?7?~h???cM>0X?f1V)??
?Xc??`Mv???I"U2q?Jm???
?^?w????i??x?Em?u?.??q<m???q???
R?EXD???R?c????????R??Ow9???f?w??*|<?%N??R???]\???D:??s?l?*4??s7?i???J?"???#????E?H?- ?t??et??
z@?3BE3??y,/???U)G??k?i
?*??D???c???????c'1M???KY?@L?"?~d?J?????`+7;>????S?oI1bhSP??EQ"???Y{$?o??U?v6?jt??&\e?x??W?%'x?{?=???
BQH_?db???9?
G5=?j9}??t???(????S?Df?MY???????A?]=YU,??\y,????????h?)?R?A?7?[;??>?5??L,???enF??<????????|L??ar????=h???K????5??3??Q5M?R??V??Y?AA?H<???\???#????2+hW??!J??m????r^????Um?&?; q6d?
(?????^
?^On????y?X??j#5a????z?0?W;?Wz[??|nt??+?Y^???d#E?U???y?d???Y3qp?7?R?f0=wh??t2u???^,?<??J???????1.	??=h?9??P???s?$?
x\?
??k?^??`?m
r?0??|?#??????+K?[?qX M{J/??tIq"%]K|?????W??"/?1l/9{??g7??=???O??;#??LU??u`??M???7U??<d<v?????8?-dU?:?????~
?T?&?,G??RT8?$????"|????:???????+1U?V???\?K?Law^e}??????\T???K?'o?^??(?)	?o??n??"?F[3
?>?q"
?2kP?\?????2LEr?P????????]????6?5?S&%??V??dJM????H
1"M,??,4??*R?	???*?)_x???+????(???6?ffg?t???dY?!??U??E?c?*5?iZ??z?ixD]b
?fd????X?&v???-??b;
8???????iPZ?b?G??p(??????[X?I?AV?1 ???)F?O?u?I?l
?k?O;PT??x?Zn??T
?V?|??4??W??v?)?{{
t? Qy?E??z?
????%/x?????n??%W???p?b|a?d???? ??T????????/,K??y?b;OK}??????QXn(??zt????UH??@??R???
??OM
?j9-JtDO@|q?D?5??EhWZZ?Q??O|b?D
?&??R????F????bd?IC?y
??'
?]m?Mr????s??V?*???C??,?e?% ? ??{?%??RXf??^?0?b%???C?'@hs?????????????v?????????CZU?1(`??\xv??_2??A??7??	#????4267?q??!]G???X?%?;????pY?7=cl?1`??\<`?u??Q?MT?cJkD-??c'??^?lpM`??)???'????"?)H??3D??????O??!?3??$;?????s???H?x`:????
?H?+????5???d???????;?l??W??X*{D??pm???????v????{?=hL"RW?RY?l??????8t[
i?KH?T???M?????Gf8???????~?|???F~???9?{?_~??F6
?L]?j?
 ?=??}?W?
?a??%R?????b???JQ??l\`d4\??????H)?????pp??r2f??@??HEO [X?h?????b7?s|h?D??D??'WP?\Ea???q??VH?]??x!???y?J???
4??y5??3?H????eZ8???Y?w??jc\??v
??i????5???
???X?Y#????~?????v?j+s?G??kx??[??gk????CWz?p???v????nZ?"??D?????F??&uF?Pq>?]?#??H9?h?@Tj?P????VZ?%;
:?7?j????lK?[^N?????a<5ew?U?4N?n?O?Y?'?*?OW???-?9??F?? ?Y????9?????(???a?}?? [H>=??6?Lq?j???h??<??LQ?M??+??r?I?0?
?O????{j?d3'&?S?Q?????,W????8???8??^g??1?????|??t?e??n??????W
?	???????????,?y????3???p??W?7?!?i???:?6??,d&???????U:??9<a?%?6???!e???7???;X ]???d3?????&s??,?qNT???*????m?????|JBMM~?d??,???[?y?	T???

?1??nu?a):?z.?<3`?:????K?0??J?U,???????d?+?%?I&
'?????5f?u??'$J4Xr.?4? ?i??_QG???o$???Es?#M?U4?pr_)???GS?J?l{`???b???}nn?aiOE]e1?u?h2??????K???????B????^?uf?Y???muW???zRr?x??D??dP%?`6?U?? ???A[n?5{?r??MH+?????Es6??C?????r?<|??A?S?????F?&??m???K?:??k?6?m+;??JW??[?
[?R}q??X??{?.?M9b??G?D?PBs?F~5?"?q?+?*?Hl????????F????f?AR?Dv???B6??JTE????f?8??????~YV0#?m???D?B5???|"`b ???
?l8?G????ls3?|?f?G????M?&f??eV]Gep?O??mx???EWi?~6??????M\
,??????N??????)??Q??5?ftb??t\!(????Nls????????al??:??R
0K???+????"?>h??m???Z\Xq?U?????Yx??0??????`	c?~?,-????z?K?:????p??????m	?? /?qSvs??]??a	???ZOB???=O$????G???u?)??*??Z*??(????u?"???VV$6e?p?4??Xv1?A?I?l??]?*???"
??Cv
?.\???
)5?Lq6??8????g?t*i??Y?z
??U??A^qJw?]`???C??n\.????^?N?UXV???b?\????
?~??!? ???J?,??Yy?(?	"n???????d!":?`?
?(T?!??vA??????7?o??F???e???xj??[i9v?Uay
R[g??x?"??H7o?u/?s???R??E??(|q*?0???nt;gO??2AX??t?F7?6aNuD?OA?
=
??k???F??%???g*5T??}???W??)???w??????????X???[aN?q?do????'f?[??o,?ks$V^?G??%l??h????tQ
?c??L????|?T?KU?0w??y????0???^(?+RH1>m??r?????G?Sot?
??aE?(Vc??p?
8???\p?6??MM???/%?n?(>?|?9?M? ?2%?3[|\??2`X?(6Bx!3u?ASh5d?Uk???E?
?+aq?Q?,????s0\/P?????z?
q?hx?P`J??
?
?<O?=|6a??aO??=j><??f???c????;?eB8?
Y????\??-??????|????K{^????:?y>?*?f?MglP???vD?i%????Q?3??????)?G??e=C??X??6?$!?Q?5???W?i?:sr??!?tX???N5??n?~a
YbR ???j??P???1.\S?	?cD)	?pO1?E???M^?H1F????????C?? CXj??)6r??+?@w?Z??H??h??l?R?F$??OIv????S=_k?oUkdc?6???_%K?????PK???.?S?P??m?4b&
?Q%???J??@?'$??m??????x?5a!M?_??^?M6????`????^????8???.0???Uz??H?X?t?a?V?=???V?k????6"??&*ftQ????m?>?Z??z??D?YA?^tQ	?9_k??
?
TDN?^f?
??:???)??Os??
1C?o?r??Db
??1<????-?ZOXdw$?p,b?#?+?3?T????X??J?H???U
d"	Y?,xy-?O? ?2????x
k`?z7wx? ??U#?7??h?E9GX*?????]Q=?E??v]????l'?????</?j?A?s????@????:???s??X?uz7Y??/y?m??Zqb?7?????????D(?H?C:????}?w??????????W6v&s
?;????X?????u ???.)??E??/KM??J?????Z??_??X????
?????Db0d
???????????????e`???
 ?!????I????????w?Y????D,9??????????Z~?w?o??C?????Nq??????Q<b??x?EG2???b??X??v?[?e?K?
??8?K?n????GE[a?t??HQ?+??=??"\??IM??m?????#!?z???G)@?B?????
?C??????n???jR??????2?{?H????%?H0??GD?|oS?;5?P+???
i?P?rsb????????uyd??o?????+"?|?+?????????xq?&L???J|f??Y???z??="??#*RF???????6?????g???R?
:i??9?<?3?sj?$??b???^??'???B?????s????L6?g??O~??~c??40??!?Dwf0|??/??|2????pc??M?Cm???&|o?????G????	o?n???	}0??}?????P.?rn?xA.??,`?
?PyBX!??1??Q!6?
??,?'?C??*??
w???}@???_?????????F????????????7???????8z?9??)?F???,}?m?F???}?(~c}_??????8x?1?n?7???Y??
J?if??~(???K???|??+??
?O?????J?.x_????>??O_?????P?sW????????,???8?	????P?/?,9}?}??t????k;??<r==?;???}?p???m?????????/p??K?????????aq???r?T????g?	?Kc?=P?????
????+
?v?R?pO?=?S_%?d????C0?????~?MO??kH<W???2?B???I??$???&)?|??Q???????1???}*t?n??????_??B?????? ????>?Q???
?a?yj????E?+?X??]G(??/?zu	?^??%???
?Dwty??w??syF??)?????@BQX?C!??????c1$??j???A?^?u???NNW????-?"?2|??C,^}J??V??????E?::?????t??7?xIg?KB=????]?f????k???FB???3???PO1???)?z
???l?0aH?8IC???k???L?f>?c4?e????~????Qm?G0S}?
?_???mO??????m??w?B5?????8
1???{~l??]r?????	????	L??????*???+?~?7?k?????c??`?p????x????B??u?????\N???\v>?S?Z?
?w??o}?z
??I=?,?? [??L!?|-??k????}F??Z?1?>??xC?%???????m?@Q?
r?*??ru*k
?5j?c?c
1??
7A>O?????????&%>k
No~???????????
/P??z??Q??_x?????????/???D~?????'F????_?O???_>o?0?_???*?[??V?????w?f?{B???|??L?c?????Ly?????G
???Tq????[?~?2??M?~DS?)Q?f??)?C???????jl-???;6????<o??')???O?k
?+D{?XD??6?-??a?Mx?M??????6?_???1?sm2??6??iR???????p??????I?"\?????;
??l?z???)????N???q????51?k????X>?=????
H?N
1???N?	? ???S?-????-;_v??R??r??# ???	Kz)	Q'??
t???????<z?>o???a?O?BV?M?Hw}??1?u?????.?ED??H/???$????????????l?????????/|??>y???1??_8???
6????L"????L"??8?3?lg???$R?>???~?L?f??=d?jk??(?_???m?<???VM
????Z??|????G^?|??Z??????????????v???S?????????t?|MX??*Q??kr??<9??k???v??{q?,???/o?%^|?k????-?r?????w?%^???S?T???bb?J?b????W11d?bv??&_??W??|???6_??a???w6g??&??b?66_$}s???F6_/?l???[?4?????5!{?4!?v?hkB???&dU???	?!?K??*??L??2M?f?jB???????	??K?????{???.?????????????????M5??R+??b??=??]?????k9?	?1k??c.?}^0M?c?????????^?f-?\??A?1???V-?\???
}Ap@??}S?????-????]?w-???,??`@??>???Oyj??y
E/?????'???????y 9? ??}???~G??3??? ?V?t
?0}??_`??d|k>@?P?(?M??c?????3?x???a,n+?F??X2?u??a6l
?????????
?
X?,??S??<??O??}?
yA9
"S?\?Djz>k?OOZ3??s?c?d?Z?=6??`2??SV????T6k??Y???S
*?K^
e??S?
cg???l?z+??.???S??j:v??*4???2?????2Xu?( ??2s
C;V?q
????;{??(4??=???*Z?P<???v?(?`Y??X3?t??M?&yd?(!,??????i????.?o??`s6???i?{1???V*A1?????????
sm&eny??t???z;t/?BUJ???R?*?E=??o.;zP?2#???y?n;???|??E??
?V????x????S?!=?P*7??23???y?K
??;??5k???je?+?Y????F9?4?_2??/W?
???c7[?????s?R??J8??????????|??6y{[??j)9?v&V?????}??"O

2^??%?_????;N??4?[F?Z????}?@?jl?ZAR?<??U?r????7r?)?T?-???r??QX):???Y??X"N?q2???K?/J??&?????LF????w<?iX?N(%0|t??	?????i?Dm~#+/Xr?%???1??NeeX?V?R?N??D?rS ?@???l???_wH??WZ?????s8?^9??J?F?^KP$e)-??eQ~??R
xJ???`?E????c??|??c?$,??????V
@??+?R$??|4??Ku??b?d??3?E?@??
??????J]T?(?;???;?
??m-????/D?p??P??Q??????'q?9?h?@??-?1??Z?:?
?)pU?U???/?'?B??M;??:H}?r?e???W?wH?kh10xG&4?WO#?4??????B????'0??r?^? ??????w?roo??%???	D???(?v?d??f????T????C?ID??qxE??ug?%?X??%??Q(Pt?v?\BI??LJUI?b?????]?^??H???;LQ???V$??d???qbN3??????|???*???X???q?Z#?\$?p??Z?C?c??8???x?????????4?i1
oV?*????
??>Ym????7?N?<??Wp??Q?U????V)j?????9????JSBh?X???:A???R?b{?"/N??5????J??y?jK%F???H??r????N?2?uWD6?T?rP??P&??????\???i?Y+s^?t?_
?sz?s9Q	C??VZ????8d?O?1???WD^?????R?|?~~38??5bv/???'??????obkN?L???|??J???H1Z???/uQ??u???e?T?Qk?,????Y\q@?P??Tl???N|C???01tY??FR'??I?J??D<?:?Qq:??3??j?????????0??(??E????D????7?<?K?Rh?z?n#@.???&3J=????L-??\?$??????\?V?] ??;n?K?w???ly?&?1t+,?
??E+???u}?F`G?
1&y$)p??H?	dU?1??T$P,???:???%?0?
??}?3?????;?]?X?B??(?z??I???y??A?Q
??Q???????????r??
?,?m?L???????????b???5?}??3?\?Gp1?VA4???5a??g]?v?rT?e?n}?Un?E?
?G?LZ?P?.?w	???#3'q;+??T?&~
+;Rb0W?-???#j
&]?K??R????m??B?z???
!?A,?Sp?R|Ptr???*q?i~??y?M????gPb@????%??J??????Q??????????v	7??@V??3??d???????E???agq?XPvz":??????n?l??LX??BP?@??x2?????0???B???O?_????$?3?????)O?*j??r?ib???
i?>???
?6?zj????m??d????CL????RV5?H??R'?)98??????s????[R??fxQ??H68?:F???2??j???R
W0j????'V?????????=???S@?Ph6?z=i??m,a??????^???R??&Dh???a0??e????
?H??T???A(+z6?
??a?+???????????L?e??e?zp??<;?v?B???Tz???H???Z??|?w/o?{??O'????(?V?_0B?c???A??(?????P:??+?????W?B?%?$~???T8????U??S?,????E?W6??j%2?o?Z?\V?????????@?b?E???;B????}?-6?B?A*5???ykg????&???%7???????Cv?\??#?
7???s@???????b???Ubl?&?-????qI???A????G???6??%	
???Rm0?]??:?^?ok??8?Q?G?x??$5}D\Y???z??i?Sz????	??8???%?@@??[??+?H?72d{???&=?	???????{}e?i???`???#
?T\?:?r??-E??Km?
*?g???Qw?i?M??????+1U?V???\?K?Law^e}??????\T???K??h?ey|u???????n??"?F[3
?>?q"
?2kP?\?????2LE?\?&1???????w?m?k?LJlM?(????fYY?B???#???c`??mW?
M??V?| ??VL{?b??????
]n>J????M????-?+Y=M???XEt?c?*?<q?z
?k?H?S??H????z????+???n?C^??)Yl?y!P?"?J+?RL?(xEVQX=vv?;?6"??>??FnS??a???????j??????(*???a-?&?g??R???0?9???U??N?vhipj"7?p25????????
?:??L???K??>?y?)?U?D?E42?J?1?7?????%f?b????\	_R????	?a???v??ChSYZ????J??,?V??=??<-?Ud?Rg??Fa?????=?E2??VU ???
?j?yf
iU?|????r??Q#?????D?'??Ol6c????l???t
Sbm?4?@??FMoI????16??e at .??:????&*?1?5?B???h??\IQ:??????x?(R`??????4jz?4???f???c~?
~???TZ?2N$??/N?????B?nH`?!+2Y???dZ?8??J??U*?B??p?????????uM???{?=[LRQW?ReY?l??????8$?tp?GX???'Z?????2.?y+??F???{B`S???-???
 $
???3?O?p?9?
#
?-F??(a?f?O<:XNG]}h?>
p????????2i?&

:??????DK?@?y???.T???a??R
??t?+?x??Y??*E?
?1Ed??\??]u??+u#m??8????c?r?????7?:T?}<?????:??#?/?m&0?|0?Yr?3`O????!uU{Ra????W?1r?0???0??

?`????Q?.??|??
???0'?????V[1[>????>?XO>[????}%?z?????z=??:D5&p??m&M??Cd???P?_q>s]?S??H9?h?@T*?P?k6/Xg+????N?Q????^l?????s?+f%??\&???$0????????B6??D?
?Q?BA?->?z??????P?bjHSA????O?g}]
??l>?[N?'??L7??RvWX?B???&????????b?$p?h???Y????i4?",?<?	?Z?	V`???h.??
??>??r?)?Q??}E?RN4?F?"?[F?#??????tRasiI?z???T'kg??	9?zl??*?(??{??>?tx??X<bF??????>?q??^???z???????_???|?w?e<?D?cb\)?A?????2?"??hUytB?&[Z????|?:???_?v???f??4V(??A+Y?`T?? ?}??<???*?lb$d???????sC????"]??=?s?.O??,??
?O????;g?d3'&?S?Q???5?,W????8???8??^g??1????{?????e??n??????W
?	?u??????????y????3??????ZT??6??)??c??N?u?&?I6"G_???r?-??A>N?Q??3D???FH?????,???Hoz?3??#???C??\f2Kq?Ugr?????t[?&kp??PS??0?5"?????wD~
?$?e@???	?%??0yb??\Z??H???:"	??&0?	?K?\?K`4+Wn&]???v????[?>&?E66I?????E??w???? ??rJ?=??ZK?v?!*??(?!?????z????*????O&???(????u4.?"?(?G??X@JF?Q??F?@???
w>
? igj.???
i?b??h*?????Qs<?)???\??Xn?T?_??}?2??,Lk	?K??#??`SY!>?????1,Eg!^????`,Xa?P?v????Z??7t>7K?J??2?Y???d?pb??(_cV?P?X{B?D?%?N?	?&j?u4)??F?Z?^4?1??ZEs'??????;q4?4???|v?\???&?&T?U?c]???&????-?D??L^+??mA???ZgF???O??V'q%???'%w???J??JUQ?fS[5|2x?
??f?Y??+????????iX4?2?>d??G>~-w ???[??:%?A?
lnB_?F?I??????m?Z?????=??$q?[n?u?e-?]1??N??Q?????#~!~?
%?@o?W#?!B?
7??B?B????Y???H?h$?,???o6$Ld??O-d?QK?p?DU?
?yi???l???;??e3?o???N?.TC>??'&B?O???s?|?9Y??67#?'hf~?????tob?yYf?uT???a????h]t?v?g?
H????R/??????iN`?kZ???5?]?oF'vipH??R??????6??K^???nQ?v!?????/??b?.#????Y???H?.,?v[?V??????v?B??^?W???P??a?A?\?
K???3i??w???]b??????????e???=xPmK ,
K?E??z"??????x"???084<?_,@?cM
V???R)?E?|?????????"?)???{?Y???a
*NbgN?zO???ih??#0v??4?K?ag????????'>CRI3??"?????mg???@['G??k???(?????8?nm=????zK
?3-???????c9??]3?????2)?Q??	?????
?Ha*0???l~?&x??X?????R54lQ??,??
`?;
???5x?WF&????Z????????I?7I;??H?V?3?????|AJ??b_"???r??6ve&*???k]kW!G???q?J?
??~(lx?
???x?o???/????("?(?????d??+?{?t(}CV??
(?X??K]7???????#:5?t??`??????>??
??ls
??#??
?t????Ms??E??????????~>7
????+???? ??xSH?;?(k}???b????0??b6\?????G?p??K34FB*F????A?.?R?b?]?@;?6 ?NZ??p???i?qD?$?@??{p+?<SL?,??WR??02?x???0hg-????G'?|_|??{?(??G??=J??Qz?????d|?(???
>J??
^?(2L;_?????>?F
??G	?????ESq0A?%|
??{]'x?????>??g???gW~|jm??????????D?Q$???????F??h?q5???oqh??`~?F???|'Rgqx??(?j?j???D?R?b???%	C?H???]?Y???M?x?l9|^??z
B???D?E^?#	????H?Y'%/?H????X?????
byS?6oR??G?A??????+??
~
??)&Gh??????????b?u???Ax1 at C????cY]J???J?~^???X)}?CqUG????uH??/?L???5
5??	!?#??0@?`O?????
x1??[C?l????x.??l ??_H$Q??? ZH??:
Wd^D??}?????\?2!??x??21??J>????Iw??!?x??2?_?<????Y%???
?S?JX?f?/\?$?d???d?d?d??x?qG??,d??;??is????^DP<t??
???w]0jU?Vn	P# '
G?7wh?%p'????cl?IlzL????6}?a?o?????I??6??????*??<?n_)??e??;???q???u??n?}2?@iO??])KjtW???P	???H???V$A?M?e?ez ???jrWgI?	????^?????,!????%do?F?V??XC???? ?A	??A??????6???B?U??
^h????W???~\~'E_???#a???m?3????S?[?Q?p?dK?C?1W???
?s????
[??KWo??,??
uj?5????>?6??v???F???	m??'_???Q5bg?g-???2?$?P?:???1?7?r??P?f
H?q????:??
?I??!E?&?$A:?A?:?M?
p"D]0?Oz?!???X??2?(
?!??!0????a)???m?!?'??IR?"?u??GH???K?????i?7x???45???(??!??$????x?7"j?????Y?? ?i??J??
?A???la???7??ah[???????k???Ky??t?
Y??V?u?*?,+d/6`?h?n???????/v
???:??
? P?????Aa???Sph?A?b?
?pE?????l?)cw??????????trV?y
??????}_??	??V?c??*??8>5~";?3?zJ??r???
?9??Y?U???q??/W}*?????}??7??w?pg?????P"?????????0?????;??????7??`u?
a?5?`U?M/o??x?????r?n????w\?R??Z
y??e?2???`?xf~:??Z?g??qkv|n>3?05>g?.???dS14??sa???H?E??/W??S???d?2Pn??|?W ??????????4qO;ZV??&Q2|???l??????????X???'Apz??????5k?u??????K?????6?F??????[o/?i?V+?7u??En???''?R?V"???R?*?E?C??????1R?Gi??
??s?Y?Pj???c??{?naKei??&?XQ:??Xr????`6????{?9??^??)*G????
m>???&m?p???Ulb?Eq0,V????5g??4?V?AG??>??h??JX?q???'s??C????x4???C?>? ????r[(???l??????t????C???5???+?X???	`??L? F!??^)A????+??}????c?y?^???9??l?X??7??A???#BO+)?#@?3?]D?]???]Vy??!=C??X??6?$!??a???zw??i?B?R??I???w??M?/???]do????t??y???????	?<z????"
e????Wj????d at m6?P??p??`???2a???U?o?z?UC?
R!??????YG??'Rs?.p??F}??p?????????=??4G^?I+?-??r???J????!?!???t
N?????E+1{\x??[?W?=
K[???#	???OKin=??
??Tt?cQA??2??M?$???QC??6QQ?yy????
K;x??&Q?'??g??:???M?????d?[?????????D1xi?t\??+?t??d8@?
YbR ????v?KC?????Kb?QJG4?Sw?????K?i??D?%?fz~F??ha??Z?~???????!ky?t??
mY?mQ???*??"?S????????f?V?F6FiSPkJ
??U?t?+?Q-[
????????p?SM???i?L
0g??
[??????~??Z??hR?????\??n??NE???\??QM?!?v~y-?K!?6???p-??H???	"f:?bI??"=??$5t+BA8??6:V?Q??????Dw[-&:???
^hMXGHS?Wi??b???2?7?f6j???	?c"+???.0???Uz??H?X?t?a?V???NA??~?1]mD<ZMT??4? ?????}????v?????N????s?????????`?%???.[??8????j}??+?$S8E????.????U??EvG?
?"?:??;??A5
???6???????[@&??E??????d??
2,?Cym;/?aM
?h?????M?x??Cm??m????{B??z??%?C???J??#Y-?A7??!\?????/+B?n
??F????????
?????%c??
??>?#???P??e??Swr=oyC?Q?J?s"?!o?????C	A	?M	Q	WG?%\???(?w(?_S?w)??K??u?W????C5???A??????+t}??????Av},c??_????ol??_??'?q???n?7?????q?????}/?7???g??S??my?)?L?if??~(???K???|??+???j?_??s?~?'n???i???g???;?z?J?Js???Q3?U????g1?Sc(+?????
?J_~_>?=??????H???????8?v?)??3????v?????o_?,?%??N?~s????mX????\*?b???Y??B?????A???H??n{^?
 2k/u??n??2W????????~?e?????~??/S????g!d???k?g?k???RO_N}???k?o\^?F????KW???W???_???te7????????t?o??????SOi?k)[K?v??????????????&?	x?x???H_????~?xu
l???????~??_G??[_|??????~???5$?WRo"?}}?????S? ?gT??.?Q??????~)???K?k? ?h????????????W?-l???K?EM?%Q?????;_?
?????u????Z???+?????J?n???????W ?+??????i=w???T??D
???,?E???z??Hi
???*{_?Z???k?gz???
M=3v'???{_????Sk??o???#??S]o??}'????????Y???;
???kF?j?,K?????B=????-qj????e??4?????????*??O??"???"????	?mO??????m??w?B?gm?WA?? ??{??m??Kri?<??}Q??&???????*Np*???????????t????????gn?q]:??????|??%??;???mB??K,K)?[??^??cR??E??!d#??)?L????????>?Rr?|ZLh???????> ?G??Z??=2@??r?(?qY?+??
???"@"?
???L?N=R?6???e?~?cP?8.<$???s;???-?????S?5????!+"n????%-\?%?
+2g?t???=C]??c?
n???l?{Y?"?z(<?????4?K???[eXh??!?Z?;??X?B?????aP?}? ?aW??P??W?X$??1\??bxC9??`??????-?W(?????
*<?R.@??&?a?gXqL?????aAS.c????2WC??od?w(
?Lt?@2??B?%

??b?U?u?????????38???C?2??f?o?^?},??z??Q?Ta<u??????c????"????????????o?S?>o?0?????M??? ??B~?????4???U4??c?;F??_????????????X???:???????????{v`jw??"?{S?????????N???Maz?????G?,C?
??nCl?zC?K????6[~W???TqLD??`f[?f?#m?+mJ??6???&?Rx?????k??R???m
????%Q?O?#V???4)????*4?N?U*?
?\nb~f.7????r?5?}}|B?(?r|?8GK?\?u>??z?F_????p#r??y?J?C?:/?VV.?rR?????????????^)???I(wbj???Tn???lj>7?~l*??PK?#???]-?
??????????.?Ei^y??(<???~+8?i$}W/??s?9{??w|OT??c;??gB?->h??+?J+;Y???7
}?339r??7?`?????S???~?g%????z%?[t?5?b?,O???BsM?N?6??f6iWJ???
M.??g6`?#????
m??m0??H??}??@_??H????yG????-???p,
???`???{?T<?????c????
Cc??|?X??
?dS?V???z?>??&e?|???f???G?[????p1?*wl?8z?? d&?^-????.???t???Etq#?X?????0?@Wr??.???fKY?:?l5??z?????D???
??V?@???A?V1??%TGt]H??y?Q?s???]??????????
????`???????V?d=???<d??/->???K?O???????x??.?? ^?p
??9]?;?@??+???*??#H?????nu?ygyaL?k??e????R,?~???v?E.)n#:)??`?Iq?GAM>b?q????(??>?!z?????x?N{{-????(2????I?Q5Ls?!??g?????>?K?4????F?????????8ja????_=?[?D????h?t_???? ?l%_??*? F!??g?????-Kc????3[?????#5!??)??96???V???I???^??d at B??b?w?c????n!Q??
?[?bh?@`1???y,?
OfAvI???$
??T?????)???>???ST????????????}?5M??on>??F??1???jj???:[??+7jU??<??f??`???????
T|U
???-???+uP?
??
1$G}?%??b[?U?rI??mW?r??v=K???4w?L*'?8???<HS???y?M??C??r????????????eLbd8n??Kt??p??P-T?-kM?+e
????????"?E ?f??~????E?9????v???,??P???R?(?|?????]B?..?:??|R3??????*???J?N.??d
?=??Z???Y?b_ ???Z?Zk8????5-ei????K??E???D;?y?
??*?U?(?Og?Vv?????s)~???<??LMZ?NAd??K??k????Ikbfz~?????Z?=6??`2??SV???9?/=3geN?Ne
*?;?
???' D?????'?e?
P?1
?F?)
??]8????/???33?Y??????2???55?%l-dSQ(c~?
 ?*?????BZfz>57?0;??C
Nz?a?
?t2O~g???????SqA??Z?S>??$??#"?o??<
\??c7A???B?Q?L+s??|(?U???A-3?
Pva"-/??
?r??
?)v=/J32^pz????#;2?Z@?r???@B????"???R5???????Z?7?????^R?`?T?K??W[?s???????z!?Z??5qo???h?vn???Y?M?Q/???B?$_?h
0????<???f???h?n????u*?sz
??V?i??t#???Z?z??????
?2?&:I???M?????:?Kb?>qZ??Sk??S?\??
???^$?&????0???(,]?
?0,????BS8?C???&?
????t??#?QIx?Z?????K3D?b
?(q??Z?????5?KlHR?Z????????"d V?7??(???I0?.?W???6??RtD??>?q?6:?7-x???~e?:???t??Ss??{?S0???2??A????)???????E?m
=???]e)???cY?5??:qrF??jY8K???Gv?????>}<j??

??????
?+?1Tu??L=?G+?jF??WYE2?
;lOx????Px???h=mE8???y???????f?k??????y}?{o?A??%
????{????w?s?w????_Q?/?.???g*w?k?????^!?8??
???{??R%??c??/?'Bk?S{?'?&?)]??????????%
AJ??1?/???X???;
?s"m????X????D?O?????=?8^
H???H?a?rv<??"u???z<?
????K???B?WRWb?(J???????J!??G????R??6?n?J1c_k?U????u7??/?W1qR???s?xE?@6?:???
???
m?+?????D??????
j?nrW?-RZ? [???$???^h?I???O?E?{=?
ayaTq?c;l6?????.7Q9??4
?tU?????r'a0d]Z7?kB?=-v?J???y??m???O?f?#???H?<u???? ?E?Pu?%????8hy?? 0E?w?"!????L?\??O??
L.(BU?=?4?Z?h???kZ?
G?n??&???T???H?=A?T?G*???E??o??+.9!RB?W?,N?[9?A??E?>??T????Q?*?%??$??;?li>???N?f???f???????:??
????}r?w?c??'?.?}??K?a?
??IP?C?z*
????????
??????`???sW?d?I????NK?.I??c?SB?H?	??J?
E??????K?????Q/??m?Y??D???[q??8:o???7?<=
?6|0k??ph?NM?/?i???U???U??)#???A}????"
?Sx{?
T??ll????f?hOn???^???????B???xyCC)Es???0???aI#
?BU2?/????????????gH?????j<?!????
?%?"?WEi?I?????.???o?T3z6]mb???+?X(I2?5]??#?+?)Y{???n?c???;
??]?o??!
~?T?J??T?)f?7
??f?????
????#?KX?(?r????9?&??R>???O@????W?t??A???[??}?????}H;(???O`@?T+f<?z??2??y????Q\????K??1{??Jj??????wo0N\????X'
?)M?D??z?d`??2?}??@?
???(sqg?rl????Qb?I?'
(p??XZM6y?????d??????u????+??
??q?h???G??7:?????$
??H?? KEb? >
??N?.Z?U???????s????"w????#=I:Q_H?@a????????^?\}???>?????xKW???^CN???G???????3?^???r%?t?vK???D?ZA?????
_???7??]
?_?????
x??*xR?
??Q???FX??(?^bN??;
??????;?H??<???A)??G|???g????D&:???\??Aj<\9????I>6??19K??i.
3R?+r?GN!???T?l?	C???R&\?pF??f^????\B????E?/??`|?!A?z?????=???+??& ?]?? F?	4	Rj&?hb\l7A???ug?$?K???0*h?b??fG?	?
?M????r?$?r??v??aZu?{???EP&;?af{?????}?w	wn?????_????	4c74.6?????y*>]
2gR????d?`??n??1p:?V?? %W?6?Zjk?t???G?q?0??%?h???Lv??Z?I?je?H(? ?????0??????#yF?s?W?(?Dq?fU??z}??>????V???????GC4???}????$_?~???t?B?W???{?|?f?txkJ?;?j??$?~???)????!??#??qR??=fc???8N?
*s9??%?$?GuF,???t?N??Ej?{?????E????e4?En%?F?z2&??^?w-?8#8?%
De^??E?n??rA?]Q???9?????tup??T[^lF???[?ERQ?x?y(.?????Z?'T??l??^6??<dQ;?\3?D8w?>??p?V?H?WH<d???U?! ????D?SDEC!?f(?8??3y?X?87Q> ????^?I? I
F?R~:??p??-?6??ml????T?m?#I??G?X??o?r=??.?J?|?	??????>??>??????????ds???^1Q??\???OWS???Z?(?y????????#??'???o?????X@??0??ADg?]?Xe?#?????ql?pf????h????????wW????7?w??D1L???V?????[l????tK???^??X???P?5??zuD??6?>5uc:'0???0M??<<?<? O???3S???9??Nb
??????w?:	c???/?s??5G???/???E??:???4G??	?P"?e(1?+t?B??q??????n4g%?4???t?%j=???"?e+pIk??,??OWh6
??Q??????q??	???O(
j???r???? je<mE!?OO??Q??#[?A??hu?X?i??b???7+?'???v???O>?dj?0????K?????*:?Q~?\???
?:1	??^??i?Nn>??bn?!??}$.?,7
?Zq?????????p4zq7???@??5??X??N?B??u? !9&!??5?????k%??\96??W??F??nv??(6?:-)??????79mS~
X?N??8*??|?T?$
?h|M?D`,??%???i???G?r?Y?IWGIQB?
-????hr?+?@??n??Vp?}?4???i
?M???J???6????'!??$v???????1??M?&?Z??<??9U?P&	?9?r[]?????%!?y?{????e?h?xm????p?
?)??z?.?Rk??????&O?h??k?a?.]??Qfq???
????{??????P?G?R?[	???#?[?T??K??????v\d?=?q?>?M??v?????&`???*?_U????
??_?]???`wi???r???^??|??s/??
???2???M?.J??????
?fH_]M??????n2?????|??a??tim??a??,
uV??Ve?#??m?"??A?ZU*?jQ?X?M?????y)????D??????}"t<h??a???c???.et?e????&+?vrA#?,K??<}?T?8??JE]??	??_????/??N9u???n?????????
|B???d??$A?=????^?M`??????+???????O??je?;??/??_?w?3?(?Z??M?E?%?e???vc?_4??VTF?d?7??Y???f<e???Q???)y?M'y?'0?J?L????E=??6?z?m>E??g??m??LV??,?????I?Z???????????N?/??rA???C	????KN??ZkO???`U???=?????-??v?l??k #P?cCQ?S
?Q?c\??PPz??$?o?????r<?*??5?9??8T?I8???X?y??<??0?y?a?e????L??"??CQ?????N+'E?Q}??>%?,?a
;???v?Kst?M?J?00?-?)??{?d???j?V?/????#?T/??=
??
???N1-?~<?????l?s??Za&?q?-iO?a?Do??;???6O???ku(X??>????3\??g1?pH}JWf?y?k3??}?>?????WhZ;????q??i??? ??Vx[@eE??V1??Z??????????D	d?a?o?w??6????h*_?-??^?`????R?
?(?[z??
?a??=??%?k??????S??L???z??e?xO??Or????`?b?WW&??)k?HAD?Y?	?_???{?? sWI.^@?X3Wd??^)??HR.?AL:_p'?J?Z?
??SK??	
????{^h???K?
?T?	?I?C??"%??.?R???9b'8?????.-????[?<+?f??=Ny??Y???n???J??mU?-?ET
jF-{??<'	?????Z???L??V?J?Z????bA?V?m???v??i?R?}?Bu??Q?`??G?rM?R?\@???>/n-]??%??????^?X??#J??\.[U"?@d_Wd-&v`o?[??????"?j??????????L???????H??
??)| ~r3Aj??P??L2?=5M~?????>?*???D??_??d?b?a?[?Y_r?yC???????s~k???y????RY?k=?@?6W<??T
????EK??Q?q?^,?Cka	o???k??z?*?s>??RR?aP?>?[M?o?q??????Z?$$?8G?Zv????>?W?LF?????g??5,?-?5??0??%?<P?g?????J?oRt.s?.??	?
?????W?<+s?8]?y?qfi??+`??????N?8?U+???"??????ojx}S??$8?g?
??\
LP`??V3C
P??3?LA?????yy? ??Be?:?c???y???y???aa?T?V8??9[?*??W-_{^???
????Z?H8??v?V?K
xG?p
??p=y???(??
?? Rt>?1D}?????2?'?"??&???;??<}}????ed??????9??@h??
*8?]?????%??$?!??? ?~{?y?r/CT?G*?1?:f??9????a??v=N?;??(?0??>??/??O<g]MJ??d,V?5^??d??pD???5?3%(???2??`?(??l\L(??LXp???q(??Y??9GwT?k}?D?jy?(fY??t
??e?.?W???n???KI?%?????u??????m??Dk??
Q
a*?1?r?B??^?#?\c0U]?<????3?????G?.[??%R?]???dAC??y?V???Y8?k??T`:+????J?)6???t?<?gf?|)??SgY6O?y???u??:+W<?MZ?,K<?????????F??^????I????/2????????)???-????^??????|>???5??^Y???Nztn???????Bu?<??2r??8?;n?????_??\??34?[?]???<?????R?g????V1?z????E2?'??SJ???l??P?->wx?R~?"??'???????E??O????=KxV??V??c??oS?C?<?W?
ZN
?<Gua????????gdI??P??H?????n?R?b3R???h?? s at 6o?N?]r?1????N~a	4-6??oP??f?~&9??i?)??	?x#??,i?px?????@?
{ ?u???A'j????
n?????????\?[??nq?-x?????.???vju?,6i0?? ?Hy9t?mEN?
?@??w?'C?7?????????}???????|D?j[6>???In?
?P?J??9??	??1?QM7????K??K?Qo?`?n?0?????kN4i?
?
?$F???????6?h?a???P?~???-nW??Q?Lq?1 +Z?K!?Cy?v?v!??T??0q?<??b|?K??Qs???&???Y???,??^?>xLc?{??????r?Z?'<*???)??.???m?????L@???m??F?????y????SwV*7????W
l_?4k?n???? ???M5???Z???	??Y?0??}q???
>?bw68?}.M????X??#ZY?nD?y? n?q[??7p
?2?0?r0?O?1?wc\?>5?2??l?J:???K??????"c??W'k?????\1]S?{???Xd(?'g"DHuK]?N?=?c???"`???{2??????r???6%y}h??G?E????I??R??M?????0??????r?7?mzUb?X[???????WNN??9(21$???;?e???w?r????q???}??_?7??q?SR?dE%e?X* ??)?????/??z??Ck???????8'`????K,H????????[?.|?????)9??*??uO??t?<R???????*?T??N?>O???w+Jb?`??m?_??k?????$V%?
8`?h?!&?$?KD??a??%?4?iEzA????B??T!9js??Y?_
?h?h@???o"?:A????????S??????D&/???}?s??S?V?V??????@A????d?	
??-?P????v?z3a?????
???????????"?KD???
?{???M???k]-&????E??;?Xu???$O:`?????5l ?o?[???
??U7g??=??C?g?RkP??|???d?l1???k+??8T??r???M?F?Na?`???a????fAK??}?U????u0	xEd??H??Ze?.??XY??<??f?h?QOd?nFdI?]???Q?xe???W??EI>??r?Y?OL?
FG?4*\?ny?<-OS??1C??>p???????W1_6???^?HY??i_$??????~,??????!3??????Y?
????????5???MO??
)???????vY??????z8? W??????L6[?[2v?)??oP???l??4XA???????|Q?h?>\??????n?`KF ?YA6=??@E???????hi@?????p??D?????-???V???T??mJO?
sM?q?????A???S\?????'O??3??j?A?9?`????x?0?df=?0??????D??$?$?????=B?$^p??e??????E?????
1?@??\?:?HQ?W??gd?:?	?W????i??3?,(??Hg!?0?	C??q??hS??

???pg{k?UR???E
?ml?????;??I???'82???????{w????lm?????dl~?}????????"6>y
G??nvmuk{?????o???;j?V??l??T??}J?V????es??+N??^{?
1??Vv??????[klSXMmEY??H?q\??9%w??f3?#V????h$B??r%Z^??kC?p?|?:	A6?3V??X????d?q??~?
??????Wa??2??f*	?%9???)??7??p?J??|m6???%NY??9??c?I??
s???K?8?X???
???3)&???q1??????N???:ZT?3??I
??_?e?3??1?<??q?_?$?a?E??	?D?2#hL~? ???????4:1v??Vwe?B?D??*H0??????
?????\?Q##1:?ch?q??L?s?,J?%?????en?H?*v]9&?'?0n?n?????nc???
G??%*?;??????zI]??)?;??zg*?????>T'l???#?
????kRZ<?4:kV?S7?1O(?3?L?F?!??}a8?q???|?lB??.???????(??"????V?D?0?????7Z?????	?=?(
?????}?
S????Jg?xa??t??s?`?b0???Tu?&o?@!v???'?s????f???C?????
???j:??a?3LZ?U? K?G?;?B7?A??????????	?H?l??U?_??????m???????
z
Y4?U??\@??W=?Q?U???\???
.??Z?a??v?|???lz?F??Mo?2v&o???Jc??ZK
?q???3?HZa
j?\b?:hey??????r???N?[??T????M?l??????v?#??`J?0?M?
{f?gU?g6v????JZ???????h??k???-xpG?N}{S?x?
??_??
?v?;)	C2??.{KR??T]???C?
?<~I*1????q?q?F???c?4?D$b?7??kt?????SU+iK8ttx???WmvO7?b1z?&??2????+?9?"|'?[v
?LT?+???????+??\?)ot?o???V???13??T?[S?kI????t??d?9y1S-??L??????Ebav?Q?v??u-????r????r3.???????P*#?a?7????`??\?????A
!??6D???p????B?K?5?7K.k?
C???z?+?????>>Xo???w&m8%?7??K???C"d?	????
?m:.
K??i*+V??????5?????RQ??\;s??e{??&???k3C??j
~?l>N?2g??E?FX?????k??gpzM?MOUV???	R\=0	????????{??:I??8B????#S??????(??_??3U???`?Pb?\l????c??NlD??O??????	8_=???`?'?
8y?$
 O?d(??0?|1??bt??P??[??y???LfNS
???Q)T??@"qU?8????3?J??$?

???
i?UW?t???E]??'?$?Z(S
??.-%39??I>?????????'???\?????(#1?n????????!<K?
?
?L??u??`+??\?#"????"vs
0?????t??S?v?W???S????_4????W?Z?hI??IdQqZu?EkUj|???$O??&8?1cI?A=???U?????|3a????P??9U?!Z????,x\?=???gB
??2f????0??????V^|Q??@?(-??>???i?
??????re)wn#???$n?#??e=???us?y????38?	?Q?3-`?^SvnZK?}?6????}?&ap??8":???(N??N?f??>t????T?DNW??
?
????K??????Id?M?5??i???$&m0!?;WP????L????T{?e?????\>?&?1??l.R?l??t8x?;aNGN(k":^0??`08?a!??????GO?]?y<???`
C??????S????????x(?4n?s?z?j?F^x??08*q?4????2?y??%]?V?????LY ???r?????|n??B?Z
M?W??b????k,N????????vq
???bOW("64s<?o{Zg[?g(
?? V%5!a??????????O?!?s??i??????f?V????j'<??????A/"6?"???A??(????p?Pm
??-x/vl?g+J??9CY???fHO?^0<A??n\???h'?????5%V3?$P?4B>h0???0?3ES???0z?
??i??
G7?ke61.??3??.Y1t
??C
aL??6?2N?????4???>ij??0-L'??h-;???a at w0?0`??q3?dF"???P?????ja8n???(?????R??;	?Ym?0"h
???{?he?:???
i??9+?9
&???]?\m???c(?-?V???9?????Mo???7??u ?A?)?????????d??5??m??v??????v&???NIZ???
?????????0?? ??X???"v???k?=?????????4?[?y?
??????%h=?????y????
^???v???^}g??????V???~P???B?u???M

<?????r????ru?ZU??GA+??T????o??E?q????	&
}???Nkv{?????[Pq?~??[
e???v?jw<??#?]?{??4S+??@(V{-??S????&l?/??`k????L????3|?s0???Ed?r??D"4?M?v??????\49D????P??[F?????
?T?#;?????B??
?2?w'??l9?E????dt?
U?*Pb????5#acv????1&Mkw?
?R?j??E??eT???@\$?9j??O??~;?rW??K??]?
????'?
??#?b4[?U??2?%4??$?tE69???d0!??X?S?(EQG??G??X?F?e?|??m?????????tq? ?Eh
?7!k?[??A?%?J#
`??H?%???a??a$kU??}??"??&K2p|??#???<
???s?????gl??%??Hs?%Y&
L???,
??K?C.?????D?	p
??s.d??.	?ZR?Vf??x?t?e?????.?=?=???[?i?]
?,O?}???-e??0??{<??I????? ??[jz?_?T??Q?cT?H(?
?? ???
??z4?Mg??'??fhE??58?]???z????7?}????HZnM?H????^???????on???@?X??????m???j??vZ??????n`V?D~?/?3{?;{?5sy???{7.?????K??Q?+?g??*?4bH+:
QK? ?]i?A??x.?g.??3?A%?<D6?p?
k8N???$}?0j?i?)??5?????D?A?(?"????(??M?v??ICF?????X}	N???
??Q?]???N?q5??h?n`
w???S at q?pN\+?u?]????;x?? #pa?d2QjK??(?uG?o
???k??%QDk??C	r?G?x?y"h?
??|Os??u????<+{??Z?n??D
M`?7?A??x??B?s??l??????KJ;z????p:-|?B?q+%???????|?HI?0?Q?[?pI=???XE?R????QI???N???D?)G
f`'h??????@G??w#?]??G=?Z?"PH%?!"?fr`N?????????????c??+N7?\e7?
?yu:????fxNf?j?????)??;E?????e??R%	Es#~&Vc
Wn????G?r??L?????f??jlR?*????-2??u??	?G??????j????f?j??im??+.u?OB?f?????T??:????hq????.??-
??l???????? ??N`?)??#Z????L????m??iD9
?Jv?nIp??|R?U??7???y???~?'??L~U??&L????D??????T(????:???*?
??????	??yE?Z?????B????G???????Z?}5 ??w+?XAr?x?x?g?????508@??A4 _I??%?[U??@?c?m?S|?????)~?|i???????aA*3??????????4H]?:?}4???F???aYQ9A??
20mf?Qcq?4????(/?L`??#??5?????(??????
???$e???hI?2?Y?%kod>v5?%?
??a??[??M|????M???|)??S{?0???????[?O???^3???????("Y1????>???X??[?h???Hc?
?B???<??q?
???????x4~?
?FCb??vW)DEIIfH4D?[???21??%-??	?$M1?t>??1u??~??0]IY?dO??eS]??|L???SG??*??i???`w?g?O?x~????XB?mQ??h?,<u?0???ppH???;t?$???????????
?
??+?}?"?
?
?
?`????
?-???bi?>?j??X??L?G??9?9??h?aE]!H1?4&??|Qp?$l-????2?????7??n/?????.?1%??????>r?[?^??2?N?oh|M4???+?????????AVG
 P???J?"?????:?c???J?$????~?
ea?U?@z??K?????Q?DZ
?h????*%?L?!u|ut5?K?]?e?;??_??!?????*?? ?5??GY
????0G~???Z-??.??2??>?E??u????????SW???r???c??
?,T?T
S??_S???????sI???:??83?M???K????yj?%??3?	ReB???4?I?n$H??9$GgJ?O?'I??T??9h?d8I*?bL???7V,?%??'?
O??
:>w??b7?e?iU(?"???<?h??&?b??k??????????)??{&??U??Dp???"??ZP????vN)?)? 
???)??5az1?O??<???\????H\BF&??Rm??gv??<??@Z?N?=??D??Y?JJ??`0ok~~	????_???<B??y_y/?&.??V?????-.+&?f??4??4???^????`~???]u"????1?_??g?b???sF?
?????|??x???????Z\??{???
?8?o?a?R??T?E?`g?%?\?T(?S??
f??O~I	??6???????`|?*????????x?C?????>?D?????u
?~m???D?BgWd?b?qx8????'kB???z????p\???A'j????????
?NEm???rG???_????Q??U???j?i????=S
?P?????y$?tJ?41PU??97?<?7?????g{????p??-?s??5#>qL??6e&??M?zF???v??d?g?p^?^????^3_P?a???;?!?f0]p??jSq??
? ?5]?????Z(E?('???ee?$??0??z???????	?K??J?H^?E???/aP?9u	????@????????NO??K6??[?K7H9??~?*/??:P???~R'?,???sVh_???Dx^ ??????<?4
<YM?*??????aq??????`??6OvG?@f ??H>??F?Xa:????t??r???!?]<My?2?j?p?qU]
?32 ?N?v??>??????
z????6Wf??^??7?M?e?L??m??????a?5?M?j|?9?U?j??Q??q|??N	d????3?]??d?]???|kygn?q?d??B_???2?????b?^V?	?1???O?,HuK]?N?6?c`??"?`???{2?lS3+???d;r3l?~Mf???bl4?k>j?&QQ
??????;c?)%L
?C??? ??n??B"?>E*????r???`??y??!M??X?l?h?!??V.?[7.??`???V?+?f?*w:%E?=8???c??XSt???v1_?S?D?e???xG?;A??&?	?m??????&3>?M????????E%?YQ?;??????G???y????Y??;??<%??}V?X????=~?6?A???????+`?Y ???3$wC?PMOi??m??.??>O?
uZR????????0?x?*?iV?s?8??,g?????B?8?
???d2%N???Q????A?M?7??????d???|????????h_??\?"???4???????????l????to?y??+:? ??z?*"&?@??9??!?+?e ?4s????R?\S&a??'?v?
??'?%??xe+`JQ<????P8"??}?+??=??C?&?D??6??c?)h???9??????kM???-7???4?o???vlXxC8?8p?A??"??a???Ac?8?CS??$?/???b?.j5???N
#?U???U??R??S$???
%??m????I???M?5)HR?APU??;g???R????Cc???;[??\}?j1??sU???k,9?????I?-????ij?9?u`UL?}??M?C??????~?{
??b~6??????6?f?	Y??$_<M?0?{?o?NN???5????~???ny??????nk	)#$?x??Q???d?E?%c??: |BAyF?m??	+h???T???W
?????Q?4?T[2?
???p?*?%??F??K?H2?t_P???O_?8g?$????????b????p??%$`??:O??0xI???????}????h:C???????P
???????}G???z
oi??U)Z
OW?x??J2??v$??=\?\l3#???????????I?Rw?f??	2
??Fq??b?b1??$K=??
??D:$??&?`???
?R-?
?Po?T??w??6?Q%U^\\???KF?SU??}+a?N????G?#??L??I?If?gg????????mS7?????????
???)??
?q?????gw?????-M??u???????k?.??"W?Z????'??????6F;'????'(p?LH?k?F\
?;?C??5%?o????&'5M?E??H:t\a??C?*?)????5??k??x?{???????7?$?f???*p?a?a?3	{????{W??????????g??????Z??2&????	?p??P?????:?@?}`?X`cNT}??:p???j????
i??g????m??px????c???????V?Y?G???J?F??((	J?SqnN???3?c?????G?Zg???
???3)q
?????W;???9J???G??d?#?e?????3L?J???z??wc????	????jM?N?E?K8\
?????l???
??z?9?u#??s??	????????????)Y?????R??e"X??X??P??B?%n?Cl??/??*?;??????zI]?j(?;??z?R???-n^u??H??}??@&?kRZ<??:?U??;q???g?_2oW4vh????CO?#5?h???g??dt??D?%t?j?aw??Ia]????@nx?V4???xCb???5?#?o??????\m???Db???}|????a?{1???A??W??v??[?wF????
??
c0E?=?\????r)??Kv?E???5=&??!???M???a??,?r???.?P?E???%?~,j??,?}??/??????ruBjF9?	U0\?????Q??<?Q?%??0#pYP2;??;??h?:e???'/*??	??v???G??0;?\??q?,?F&?}??]????sE?,n?lC??t???99???B,8???i,??????????=?1?:??k???:????(???????U??T02?}mO}??|
??L??lN= ?R[/m?<q~?e??n?@d(?????Dx??H@??"]??w?
?r?
?C/W???a8?/;%)??~?f?S???3?|?Wl
?>P<?6?s??u8Ff?WV?I??N?s-???dd??^?H h?o_?d??'?A??bCW?>>&?K?????Ti?R&J?*?
0H?&&{KH?l^???{??#?-??Z93??2V??GdV;D?<??1???e??v4?1'/??g???~??V?u$??_'?N{??d`??G?1?h?bho??B49\>`??T?s?I?AS`}TdD?rdj?g<?@Y????| g????E?$?[+??Xy?E????U?W}??L0F??R_Rdy?
???????j????\?x??????q?~??:???Z<s??,???.V??+S?M?o?{?,?????>?9w?ty?Rh)]2 ???
??$?8d?[)?????	??`?T????I?/?
?m+"5??8???}??<??R/????:?v?oi???O:r?????
<),?>n??W_y!?????P?0?Jj?=Wm??h?0H??w??e??!??)?????b????Q?j4F?V??s}r???Z%m[ZR???E???SFL??<??R?z	???-?
m?@?ZL?4Mt?y???Z\????}r|??Ya?\??V?Fq?????\0???0?Ve??j????k?Y?????D?
i]v??,?n?Z[??j???????m
?????????a?k&??!<5??>?X?U?~]-U0?vU][??Ik &??a?,?????#
?Oo	??9J?????_???F??k???D+?E?OW\????RU???k8e???VY??T?D)?N???????A??Rr6e??$?-\???@?
(S?}y???????2??_???*??????????2?o'??Y??????7S?_????S????Q?QF???T0_JR????U??#S?????u?????Nk8????'?g?g??l????????*?arI???)^S|???|??????7?????o??~???????*e??rd?????Gz?3?5???2?c3*??/L(????u???	?oLx^???
??/M????O|?~k?O??v??}?|????D?/N??a
??x?U)S??y0%
x:lvP?H}T at M??l?^???Vg??W????y??k?E???F????????q?????????x?y?????N?????u??y?{???:??v????{?s???<?Q???O???wo|???????~???????????????????\????/?l?\?GX?~?????o???#????????????o???:????7??~?~?w?7???M??[?????+???????????7?????^???????06??[?????;???C???o?<6>????G??????????G4?o????X??V?????_??/????gv???????o}?3???6?????~??F?r????7?
Z??????v????~p>????s8?:L?????_????=x???????g>??V?U??~T?C??G~o??n|???
???????o??d??????n~????????_US???????????	/???p???6>???u???f?OV???????[????????????o????W?	!????????X?????????o|??_????????G_{??y???????M??6??Q????7??I??vr7???+
??????????q???}??;S?<??+????<rHx??$g?c?????????Oh??/o?D?~??t?d??'-??T?>`?#<{????????/??W??i??????????????}vrj????[?A????V?????|I????????9@?????=?_?%4?/?	??Y??3?A?S?7?d???{?WCO????????????/??
????\???_S??QC????!ut?&t????6?sC1?<????a?3?I?O?$~#??Q?
G?*Q?????D7u7??g4?R?
?@7?u???
h??2????b??04???????W?4?zk???n?P?'B55???$??)&n?
C?~W??UO????GSL.?oC2?'
?	S??oN1`u?HQ???t?+????????????&???#?O9??????O>L40e????&4?O??^?
???%i???.??????
????p??3??kS?~?????+
'*$??%pt<???????2?????3)M?/??w?	?3X???????M????????????V????e?O???M?
??V3???FN??????M?????????????5??R?????D??k??0?I?????????3%?????GSi??????d??4?ku??????M<O??4????*aE?
?ov*M?.M??w?
??a????N?|K?C?{??=<???????????_|?b???????G????
?$???'?a??????????z??6?2?<#=,_?}>???\?5??>)t+?-??/>??	?x?:
p???dk|%?~?R?RoQ?????a?xc{?"?b?:??3;?????^??E?
 ?gh?+H?/??9l?
-?????<??@UU?????p?	=??e?-????/??????????????
[e2?l
#????:R?????m?kv?{?????9??P?b0??????@?
??*??Vx?y???U?^?y+_D???73r
?]?U???p9.????????6L^???????':????!????l?HP?G?`@A??s?Z@?9k?Fk??r??`???q~h"????1?;???y???Z?O??g??^??G??5??
?@)}???7????`???l?}?????3j?{?H;??&??????F???Q>??????I?????^xl????}b???q??5?v?lR?l??<k???ar???????????i??Y)??|??qS?#?T?J??u=??]?9???B?xd???h?9I??b?7E??I?o???D?
+?;?;?$DC??[?Ee.??L??@m?lEj???a?.???x??+???=O'C????s ??Z??$??????S{`q?+IZKB??>\eti&??????????!F
b?.?da????d?9?????S:???~v!?3??\?LZ??z??Na<??ufjK?s??B?|?Q??)?Y
?`?]?^????7`q??'N1sKk??gk?A??h?w?y?3??,???
???",sl?/??F??????H?/??O
 
7???~?6O??????8????(
??]~????oh?#b?Y??S?^?\i:4??YXL??t!??[?????,r?@3??X??=??\q??2?Dc?????-?3H??zF9y?QE@%??@??E?d!
?t&?a?"
???ytb{?xv???fr?
{
H?fz?r3?;:???x??W??V???????k?j?C??
}A?U??>	?T???j?
?:;;?{??hcN
??d?)?_?iD,????S7?3??w?g5?K???s??????????????????=5N?W??s????????TS?k??~'hJ???{?????}???????x??=?Id?????6E?^Y??S???."?FA?+:
F?????A?`????c:??y??{??#?????x%?{???2WL(?
??S?jLK?????vad?p?U@?;nz??Q?W????Y`*.??7"??w/??????{?i
H?JL0??I??e?I????:qd#h????8?{h at ak?v?>g"$??[??o?u?x??s??J?C??????JxF$?UI%U~???)?????I,O???9?
????A????pN???"?8?;
???_?C????C7?l?<?^<?
?o
Y????7}?????f????K???g?????Zy-N??*W8?S??P??_\Z$????K??O??&??Ty???S???o??X??!???^??=??6????7v??%??????u??????0??[?.r?????lX??????}?%?D?????17??vR?^??)???_???T???D& ?V??????Z?W??o?Ckp??9J?5{t?Kf??
????X-?;S ????Q/p??FP$|2?????BKlo?_?????T0??_O?"??y`M?lcss??'?????u`???l??W??Cq\U?eZ?{??w?]]?@????-??????????????[??????^z???v^?????[?????6??S_??#????^w???
?????;???oo?o;ww??[??m?mg{oC???????)???|?????_?,,??oe?\?-Vk?o
???????!??h?1Y-{??w?b??X??N?D?h'???sd?????????e^Y?9`?ch?}tAl??C?i?s?
Rl]L??b.???X95Qs+!???*JI?L????) Kl??G??8#??f9??u??!??A'?$?????H?n??#J??????bpo???AIVL?e?b?\?Z?=???
J?.???|??E?w???Fc-?]?[??g?????????M??/???3??Wz$????
??? .??,	?E???J|????q??_?ElMz?4??i$E?B?3???LJ?W}????tnY?`?@??D??-Z5(8Sy??)&??W??~M??????????n??6?????h?y?o?%]-????
]1h?zmX@?M6?
h"z????	
?a{` ????$J	??????)??A7????zn?Y~?h%C????g???????39?.*?????7&????}?B? ?ZW?L??H??4?K??{;c.eZ??l??NvD???I/?d??-??E?1??E??|<?o??V?????>N??*???J
??????Rmq???J?%??i|?'~????U?Y?T???P??G>oi???^W?8???Z./
???????*???)?;?^s?????6???????px?*9?Q????m???????=??P?D?)S'2???7?(q??9v?????nd0t~??Mg
t????w:!??;??	3i??_?w????D??v??????]l?????W???o???
?y`??|????j ???J?1ApB#d7D?;?K?-?;l??%??Kx?B???xeL?8?o????t??a??C???0/!????n???64?=[k?z?w???????MXrv"o???TA?{x??-t??AoBx??%??v<???a3??#?d@??3nZ??;??a?T?2???:?6?????Fz??h???a??C??n??<?
?????pP??x
?D???~?y?0z???q?S???c???????bV{m?Y]e?&yW?t???4a??h?/|2? q????|<[??6??tJ???
C?7?]p?
tR??!??1i?xyX?g`?1??"
???q?{?^???:x$?s??0G?????????fFj??R???
N#<???}???????X!jnu1?&:"Q?n???}?M0?	?????(???3?'???z?6'zk1*?Ak? ??0IV?9'2(3?2????LZFGCKpKP?+?0*?~k?1k??pk?1?|????G4?,$R?8??s
b???h???z????8???.D;?kh@)"??# ?#ID?X(?????????43?D????&M	??K
r??????*}Z1?Ivf?h?Gd?PB???&???D??=?J?x??|?toc/?G??r?P?	MJ??gO????_I3?33??p?G??m8???'???B?[}:?????I^???p???i?t??????#1Wo&N^?9:E`?C??ML??!?
?????3??N>y??eL9?"-W7H??$_aA??-E?X??'?V??Y?
m??f?=??,??<??>J^ ??a????&????N?
4Y???0'.Q

O#xD*3?9???d????l?Ch??<}????w:f%
0??"?X???K?I??VY?8???????Tc/?{?>Q??n???F\m8??P???????o?n=????,Rl?u???%-?
n???
?????
?#%?
??(<???r???8O?^??$????4??m?8?u?=k???q??]?8,?Az???7$!	#Z6u\??,H	$z???????#??ETv??????'?oKw???1?Ci??!Qpl??-?=???n4??.U[???f?;????9?w ?F??1??-?Q
??"k_??	T???
? ?t??(8d"/?
?U?g??FXB?dY???????????Q?????`?X?D
????%?}?	?Z,??*???"?my?
?z?Wt6??k?!?????	?GN"?MB*
R??K(???e?*
Yc!???q???.*m??v&QD?d??O?$Sm?????????
???c?ZKx??!#??s???q.?]	?I!??"??,"???V*k??4?0???H??Iwe?V??%?v6?i?Z??9?F??id??\U?o?????m???R4?vV?????7I??.`?[:N*???u??????
??
?4?7
?????????)?????"?aT????K?.?Bu?????r??[4?n??Wo?,?????!?GZT?H?b%?m???>)?h?,??????qw?????I??? ??ifV?U??(?}#????T?l>?[?VEH?_k&ux???????}??,?,?Yh???j?Z9Gw????H?$u??0^
??
?b???4?	??????L????zW?"??yrx????	$?o??%??$??i?C?2??W?23??????I?7??????}?+??HV7a??'&????ci?p?i5??????%w??t/?????t?l?Xx]?Q??C???????????0????;??`??EcA?i"???jP4{?????D~???P??B?????R??
???\?!???s[?a??
??1?????a???p??l??????U?/??0?`u?????'?????Doh??x????\d??y;???r/?X?j?S??pI????#??J?{?J1kM0??a???ga?\s?rMC??
????????&
D????B~????D?Ek#?yX:"??
?$?h??????'?w??K?r?+?????P?%A`??
???H%0	(??1q?j???bPS?
??Q???fbEI?hI??0?:hw??61??
?T?dP?	.HX???????RK???dp"w?VC#. ?D??b;a?2???C??%zn????K?VM/L?GA|?U@??s?|?A?L?xYF??~?;??=i????;???????.R8?? ??xq6?a=<+
???P??y
9??k?48???????"???_???y??w??
i??
?V?0????<O?v??#
?x5???w?TJ??;?:R??s/????6?#? ???b????2??V?2kF?,[e?
?D:??=
c??????s????	?3??PD?25b??G?????^hV >???f?K(??1
)q?r?S???dKdX?~ON?\????{?!???~???
M??Y???a??????Pb)@?SD??	>;???.???g???(??Ek?9@???93HH??R???f3?u?(J???Q\?a3b?@???^?5a?>??f?9?g?%4??x`??	?@?1???F~??!==a)E?+$m?y=??Z2???Y?S\$*??p?Cc?L?s?
wKQ?7[???????b?/?f??
?;??????8!v??b??h????r?"???P?j??n???0?,??ZeSkd?"?2?]
u.j??0G???????9??I?.+??k????pf????l?eL?4??y?c}
_?dT????	???	?PO?B??m:0d???Z?H?]#???2?Q?%:]
?????8?
?;?d`??H?????r???`?w?^*???4??c?s;x?'?E?<?C?m?ZPi?{<???cbE?
U??gW???W?pR?^?????	??q?(%???xl|?+?m???+??M?h}a?(y?8??l???	Qj&?20?02ld&?#????A
?$g?<?[c??T?E6?p?=j?x
|???"?@7?8FJMV??b??!??B??
??a
?A???k? w?9?]?V??7?a/J?&?0????/?mk??r\?H???Ba??VZ?????
"????O??Box???c4U???\6?????????*?q???i*??}6]W&?*?y?i]m?$???A?9h??
?H???.?z)R??b5????k=?*?-??,????A???[ ??KL>????b??jG???
<??????@AN????BR?I?Xo??
;mcH??3[H?B6???????:f??;??<??r????;l?G>??&Z7?????.h?q?6$&???
?Ys???s?=37{&Qe?a^???
???r??6??
?sI?9?]?w-9R at 1?D7?cp???N?{x-B??????ZK?j?????Z??w??t???
???K?????qV?q????
??5i?	????F5`?vr????6?3?k??*?<[??N??K?<?U?tA??s???V??
???w??H?@b??}RNto????*
:R?!?$???K????@z??3?h???,??????'?????E?,???9R???>?-G??	X"??Z3k?+?E?c?C!NbV??q?'????-??R??&??????^?$&?N?????C?????v?7???2?'?6}?
y??v?????h#8?c?({?
?U$/
a??ad??eH?x?????
?L?^???u1H"i??&????D??0:)m??5I#?XU??V?cXFS_B?wS??o?/????????????(??Dd???8`??Z???m?F??U??2??z9I?????E????
0??^?+y??pkqV?o=n'?????\l?
??9:&????5$0???TZEXYl,9?hH|T??k??	?????)???FF???E4#?00???-aU7a??v?"~?5??A?<??-???p?????v1
/??=?????	`??L4??'??R????*h/??2??M?w!??"?????M?q??3?????????d???v??10H}?`u1????`*?0bKZ?????	?????E5?3??????e'??@??[?`???o
.???A?"?|s
?c?g?\g???
#??9?!???,?H8?a????{WGU?d
]????????E\M{$+A?E??l?'?{NH?b?
?3???t
?I??\rg???+1????h?uC??nBk?????i??-Z9.??u:h?????j?[s??????<(V?Y??oS{?W????7/g6*%"rS$?Ph?
?
Mg?????\1??-????[bz1r????????0:??}!s?y
Z?UB?????2r3???????J?????{?%?%???{9???|d C??????$/??"?z????@76?6?R?&???'?Yn!}?c??g\???a?x0xy?Zm(9??^?m?z?5 at FJ?;?7??:A??<???'6K?p???:?%{?e,?I?q&??2?S?%1 ?B,????pCb?????>???0???c?h_??
_??2?g????????N????/?0QG???X?,???^??x?W?y????D'?[d???/3"??w!DY??[??<j?Px???y???!s?$?S?U?^?!?????????:????u?Pc?#?F72??????M??9?A?v??j????3w?$q???;W$?????-M?8?@?????k?k???????E^????K???!?X@??z?????	?i8.`?;c?x)&?*&^??S0?:aL????????L,.???m4?J??"o#???b}?&n???3???G>??Ob???"??????????I?????cB??[v,?qL??t????z?P?0???g,LK3???O???.}??t???>;?B|?a???%?-{R?S	?
[???e#?c:??K?M??r??a???I?J*?Yu_???!?z?u????&?2??2]?	???????s?F?$76>xr?????Mh!???v?;j~???x%m0?rK???{???'l9?8??T???5Z?p|??)L??????%}R??????
?\?]??K?L???A?B???k?$PJ9??C?o?y??DO
?^?8?x?:M{???*????WOU at W
??????v??^??????N?j?3?1s<??!?>N?Ad.r????p-e???;?r??6?G?8?%??e???Y??-???P?X}\??)?O??D?D?GrP4?_?G#????E|)?(??'$??.N&?\O????%J????={
;rR???????{??am???y??_A2n`??????l?>a??yi?p????,+???aT`???a??*{?M4Nu$?7#?+????Na??nR?E??tIR??=?i??????9???
??Cv]	?
?q?Y?6?4{?&??oT??,4?6'?+ ????c-kA	??K)??????0?[?Z???Y
t?fBik_36}`????UG?s%??4???J??????
?QYT>??z??]0?G?p??6?
?a]M??c??aDGJxB??Y!?????????!?/??/qR|a?:?A?l?????0O2??5A??Q'K!????<T??!????x0Y?4???A??????
?'?G?????~.???-?^?P?????^B?8???M<{????5?#???n????t;????"?????1A-Y??R&????KV?^???CX-??????"Z?Q?O
&7?;>?S??
?kYu??Q?????^*2???!R??j*h???/)?????
b3
~?Ti???%????u??
y]??1?????2.???q?,??u??\?S?T$]?
?(???d]xP2"8]4?????:S????cn4?Jm-?-??y)VQ???????

C???{$	Cd??'?i?e??????_?;?h9???zu?/$8?oL?	2]??F?^
2?1.t)"??v???:???cv???x??=P3?????H]F?b#g??g?*???Y??
???
??K	??iR.B?l?
?k0??=)c!?3?????_
p0???????????02??b?h?^$??(??+????C9t8?	ua?1O??v??4zl82*1?Mc?:??.?c`Ac??3??b??AcB?|???r	X?E??NV?i?:R|?KilIM?;G?3!?????J?0gF?? ?#??`???,??
???pBn???f?&??5k??-?n??Of|???9x??vw???yr??
?D8eU?q??3;??	1???????X?)????j???|8:z}?1H?u]C???1?I??-3	????L\k???Z??\??~???j8?B?]B?e1??gX?g?T??4-1?e???CJ&v??4?Q???3?????UcWmm???;;?[{??;?;?B??????z?????w???????_???????????V???l??????????9?????=?p????????????[?
?-?p?????K
?m?g?qwc/????^??Us?;UT?Ww??]?[???;&?_??a????????=3???h?????zI??P???;??]
?
k?- r?:??F@???}?3w??w)???.b`n}uoU?????:???o
?h????=????%??f?
???????xcg=?7????????$?a??
?Ef?pL?N?=A???	?H?s??:????????~ ?=?:??3t&f
I=? ?X???;?
h??LQ?b8??a]3>????2???uZ%?9??6-??-`Ve
O??-?Z??Ami??%V?v???
n??????????6???ZE?=t?qC?`?????????|?~?Fa??`??+07???r?XYw\eKIS9?l%@xG9?????&E??vDq9???????M????wb
943?t?????????;?$?Lk*??F'??_????Wgms??l???a?a????????)?h????W??
?X?8????kPy`?
?8Q?$????d????t????
_?a?1h???????>? S\2{??mg????D?@??????????fS???f???????r?s?\nn??)?????(??Q0???Z\?e=U??{4l=Z6???8??
??????*????
M?P\????*?????_UE?g????~?"-????E??QQ????r!????y????m?????+??F?)
R)?{n???s[?S?/???p?4~??{?m?^^?3D??
??~A]??07?|!/??P?k?????0dq??qhc??U+cq?T????uAZ???J?GssMZ1\Phr??????j'<F9V????$
??n+?????6????0?a$???^????[?7???A???{;?S??? ????P?M????0xp?Q?%ya?eN????j?NenN???Ez-h~]"???y`???w?c??Np??????O?o?R?????????jy??
|Y????a??:??Y???~????d??=i?????<
????t]8^??N?F?H??AX???+??s'?RM??j:
?????|???B??????wv?N?F?\????XXIJ U ?P?v??$?_p4b???3P?%F?}P
??9/h?o?OFx?g???
?ss?
?@?{?t??QmJ??~??2^????*???p-X4???M21!??L|M7
?
40
K?{????#?t	???7C??[U1??????:?`3T^~C?&?????:A?????R??VDx0><?(<?j?Fx?,8??F'???P^?vD?b?:Z??K?k_q\3??x3H????i??l;?r??jV?e?L/?f??1????????7D?f,m??qg???X???+f/mk???YM?*1??OxX\*?9??
??jyfM??6Os??ND7??;??x?s4NL????P????
y?`??n??j?$?????}??u4?	??/8?????5?
a??
7?3?|[???4???
??
:???(5r?b4?Z6 ???7??
D????f?v*??S????%??o|??}j?j??????7&??
???{
???
?{?N??
,??
Z?4?,?@,jE???p9w6???}?-}?f???|?m\?,?%??[??F??q_PY?F??????<%?J,??':??gz?c,82?D:?D?/:??j??(3????w?y?bY
?!?_?
???Srf=?0????nAV???J2!f???x??v??b??B^q3?v{?x??A????br-??
Ldc?I??I??gq
u???????]???5???W??P???C
@??/!?rE????W???a????Xau??=?p8??Nf<?0???Z??p????lom??J????@U7U?c??w???x?:^??P?9=?>??x??NNr0?Cw8;???p??????M?????o???8?w???s??\???8tw?ma*????u????{0??
?????
?5??\c??.??n}?|[??????%?????????????u?ls?jw?CueE??B????????????/?Ww??????N?~?????\???w??????&?}{{K????7}n?????*?????Ck???][????A5???????i[Y#??R}??)??XQk???]??-?8??{?IE
?7c?'om@`v?????yT?-&?
Ql????2Nr<??????e??p?y?#?0?e??@? ??
Fjc??IJ??]L??dr?g@?????\F[??O?_??G?,cR/H<?`????)?-w-????Wm'??????x?n??n????;??L5
?D#GWS,~????
nQ??j69?*??#%NY??9?E?G?Xb\?<Gz????<?P??!0????c?E at P???4????I?QG??7?gI?6??+?~e?1????}~??Lsx??`?mu???:3???h??d??>Q?U??KN2?w?????PN???|5j7$??Fr9G?l???hrM???)Y???c5??e?:?????????????M?=
Y???*?;??????zI]?j(?;??y??=??7?:a{?LxR???
	'?5)-?J(??????P?'???2H?v^c?&????0???J?N>3y??"AFk?????V??"????V?8?p??)&?x???
?Gd?q??N?e
???/d.1`
3??T?2_??}|?Q??a?{1???A??W??v??[?$c^??????9?????	J??J????n}7???b;?k?S??V?h?
?4I4???S9?qpH??n?Fna??{s>?F?????}?!??sswC?llT0??
?SyOp$????D???B,?L?B????f????2???????B??????????i????4?y?????Yd??19JN??B?g??b?W??xLY
?P4????z"?????8??1?oR??? ?N??Tr???????'LF??/x? _pg??.??gu?2??????*?/?????}?f??k???1??P???l?j???s`7?&??m????l???]???H3?~7????c?h??????[?w???????K?8???r?l?@?nGOV?r??t??F?????p?:????`+?)??
nb??V????g+B?^???\?'??5????*w???? ???????	????r????????????????????????????????????????????????????????????????????????????????.?

--- NEW FILE sslogger.spec ---
%{!?log_dir:%define log_dir /%{_localstatedir}/log/slog}
%{!?sslogger_user:%define sslogger_user slogger}
%{!?sslogger_group:%define sslogger_group sloggers}

Summary: A keystroke logging utility for privileged user escalation
Name: sslogger
Version: 0.9
Release: 50%{?dist}
License: GPLv3+
Group: User Interface/Desktops
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://sslogger.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Requires: bash logrotate 
Requires(pre): shadow-utils util-linux
%description
A keystroke logging utility for privileged user escalation



%pre
getent group sloggers > /dev/null || groupadd  %{sslogger_group} -r &>/dev/null
getent passwd slogger > /dev/null ||/usr/sbin/useradd -c "Privilege keystroke logger"  %{sslogger_user} -s /sbin/nologin -r -M  -g sloggers -d %{log_dir} &>/dev/null

%prep
%setup -q
make clean

%build
export CFLAGS="$RPM_OPT_FLAGS -DLOG_DIR=%{_localstatedir}/log/slog -DCONF_FILE=%{_sysconfdir}/sslogger.conf"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_localstatedir}/log/slog
chmod 750 %{buildroot}/%{_localstatedir}/log/slog
make install DESTDIR=%{buildroot} VERSION=%{version}
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
cp -p sslogger_rotate %{buildroot}%{_sysconfdir}/logrotate.d/sslogger

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/slog
%{_bindir}/sreplay
%attr (6555,%{sslogger_user},%{sslogger_group}) %{_bindir}/sslogger
%attr(775,%{sslogger_user},%{sslogger_group})  %{log_dir}
%config(noreplace) %{_sysconfdir}/sslogger.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sslogger
%{_mandir}/man*/* 
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/TODO
%doc %{_docdir}/%{name}-%{version}/LICENSE

%changelog
* Sun Aug 23 2009 Ed Brand <edbrand at brandint.com> - 0.9-50
- fixed to logrotate

* Tue Jul 14 2009 Ed Brand <edbrand at brandint.com> - 0.9-49
- fixes to specfile: _sysconfdir

* Sat Jul 11 2009 Ed Brand <<edbrand at brandint.com> - 0.9-48
- Misc spec file fixes

* Thu Jul 09 2009 Ed Brand <edbrand at brandint.com> - 0.9-46
- Updates to man pages

* Thu Jul 09 2009 Ed Brand <<edbrand at brandint.com> - 0.9-45
- Fixes to $log_dir permission

* Sun Jul 05 2009 Ed Brand <edbrand at brandint.com> - 0.9-40
- Split man files into slog, sslogger and sreplay
- Chmod 775 $log_dir to allow normal user access
- Add check to slog to disallowe passing '-' when -c option is used

* Tue May 18 2009 Ed Brand <edbrand at brandint.com> - 0.9-32
- removed $global

* Sun Mar 29 2009 Ed Brand <edbrand at brandint.com> - 0.9-30
- Change Licence to GPLv3
- Misc. spec file fixes




From ebrand at fedoraproject.org  Mon Sep 21 02:14:06 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Mon, 21 Sep 2009 02:14:06 +0000 (UTC)
Subject: rpms/sslogger/F-10 sslogger-0.9.tar.gz, NONE, 1.1 sslogger.spec,
	NONE, 1.1
Message-ID: <20090921021406.CD26711C0374@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21718

Added Files:
	sslogger-0.9.tar.gz sslogger.spec 
Log Message:
Original release




--- NEW FILE sslogger-0.9.tar.gz ---
?
2O?A?z~????EY?c?]???^?e3,J??v?u?v??
?????]??x?GI??"i??[???Sa???bV*J??(O?????Z
????	??@
D???}??"??E6
|N}W??
8????Q??c}7"N?7l?A?&D1C?;)!C4??
?x
??}[??/???2?I4??LNp?
?d?gA??ck???????+8<?
?;??~????$?Zq#$,:|??B?K?;?x???>??ONO?~?)????Y????p?????????0?8???
???a???????	8t;[???Y?	@RC?????Fa??;AM???Wc?ND0??M?{?`??E?"1?i?0+X??????WV?"?f"?G1.??!G??????sd?
??x%??q??????^?t??;ud??MA?
j?m???}m?V?jd/\n??_?,?E??C?=uH?
?A ?Y7?z??o???}????#??NH??gaj?C`?????Q7?Z????Poz?n????????yH?{????(????????Q???KiRh>!?G)G??qO ???/g{v7:??+H?(O?????G?@?c?dAjB??h(\I ???&???F?=6?U???I?%[???J6 at 8??d????L?L?@?I?D?
?1???9???kaMjYH????"??(???l?XVPr|R????$$??]uK"?bsf?[???g?tyXf?0???XJy?Q95;~?????4Gn??????????=@yf????Gsf???6b+??(?R?$G???O??????i???$???p!???u>uG?E?v6e?<?Q??84W?f?QQ<????t?????????_??	?q?>?Z??0??\?-q????sTee??cL??M????h??u4?lm???z!???%??!)???"?2,?o??VL???a??#???Q?~^#?f?eN???

?_??7~???)??]"$??RZ?[???#?s???6{Id???KDRT?Y?????TY?F2u"B??1?~NBU4?=???6??\?{?_???^?X???]X	?7?/?G????\?J?z?]%GR u????T??Q??u?cB?/??K#"?]?*?cnw:?????b?fq8????.?,Y?????W6T6?Q?)h?#??)&E?P??????h?9????;?pz?X???+??p?=??Jo??>??u/{?????O????46?q??.?
??R??"?$?nTCmM??i???f)?Z?????]
?s????????????M??-???G????????E?
g;??b?t??#M1??-??D???t ~?S??jI?uj3L?Rm(?M??$0????$?????c1u??????????dT*?$t?HNg?mB???ZC	???????r???jbD??*2<?,???6(?U7`g;????ya,????'??a;??CJJl$0??????Z??A??. ???kFf????????C????<P?YYQ?x?1-??lD;V/??\?]?7N?6??w
]?XeO?!
*1	??????o?f|W?,
?
6?N???/???8???w?? ??a??*e?+
?j?6?U?'??6D????qz????
+?
?^???r??&
?6????V?1?S??????h???z{A{??o?h?q??P
?????$?????,??X
B?????;?????
y??@^c?n&?Anu??'N0??A??
????_???P?_`??EaI?B????M?Nh?????z?\???X???e?L5%j?'~`?VP?????+k??
?YoB+E??c?<?Q???`6$?>v+??(p?S?
&?`?W/1??6??j???r??O?5??[*?@???????i??	?@^Dg??j?lt$??????U??~0?Qr?
???]????g????-w.????KHz?V{???Q????oQ??M?[?W????:?=L?????	2:???x_???g???Y?[^??cUZ?e>????L?2e
?DyT??_?q&???U?????????????Z!???(4?gu?q??Z7???X????c?4?)i??$?v%?F:?????T? ?h????g??Y?!L????y?L?}???\&Y????????????A=??'7-
???8?b?????????B=???|??????hBggg?
??|?|k>??<???t??/>???Gg??>??Nt??c??????:?b1UJ?O?u????[Z;?`?H
-w???Vz?????g???
?s?F?????#u??>??_??r(G??S??????/=8???}?s????W?=????X??E??7Q4
???"???,??N??X??Xon?8?,?(?
WG'???.?i??v?d'???#{Q???_JK'r}K???R???????
??o*pC??#?????,*?????y?)?+??~Y?Wqh>?P?|?Y?|{F???_vXK?^???,{m?[0??		?
W
k?mPm???22??%?K]_]g?????kO???^?0C?&???
?WZ???????Neu?gM??>6?Ds??B??jq?"???????I???lX?+?/?s???C?????
z??y[E??????v{?g#??O)?5	??T
?n?T????(?H??r?0????>??!????E?j??????'???,?#?J?0??E??f*3
;???xD???
???J?@??M9n??*?????0?0*?=?I?
zV????R>avM???X:????#???#?????N3v??<?+Cs????1????f??!?T8ab??O?$???:T???p?A?^??c??????,??????k?'??????c?U?^b????T8z42??9?$???10]?PjvF??y	?????/T?K?s1???N??=?M1?L?C???.?f&u??\(3!?htj????yK?6?aPt)??M???GE\0gS$u,[_zKG.????=V8,
???????????;A?
??
P?]^]X}??$5?5??!?!3S[/???s?qY?c??????=?@??????"?????H???@?^??T?w???jo?Wk?[9??@a|'??<Dz?.{???jNe?b??i???2@??h? ru????i???c?
X?-P%r?{4???[)FS_?????Z?????*Q????U???????]??????fK?k????Q???^?????P}???????8?Y??VVy???c?*?	????b?W?"?????Q"???IS?DE??T??a???H?K?h@)2?????/BX?r.j?n????]ks??????V??<?Ar?\??CYp4?{?^?O?????????????2?b??YX??????0?w4?f?o????????????V??????E?;?C?3nQz/??M??q?81????E???gy????nV^?|??{???~?K??7??J}?y??O?????K??C??3?-??????????*????x??>E???+Ekw???????*!?D*m?o'y??"^?[?!%!??3C?`??
e?]??$>RT?_??N??eB=
?Ni?M1Y????!+C@?;SA??IR??,gl????<=:O??????????d<?????t??	l???|UC?~?B???.??Ja?5???+fb?5(i???hy??i???WD?Q^??
??-A??v????R??*??T??]?~?????
?%Md??o??J{?e????h?o?k?????4p	???5??p?,?V?????q????z?j?Q+??<??T?s??;??F?W??V?f?Qp??=P?e!??<>?????3?T?$#OL?????`
??Iy??z?v?6????O/fzVew???????K?="???9??vb??`???@1??!?[?\?d??R??0"?!_?%Le??Bu???????+????/?/!t
??m
?!i>/<??c????J=???/u?????-?P????oL9???bJ???l?*J-?[
n.?)??=;??UF?N?Z??e_e%??c?U,????A???'?W???m*???????y?_?y?1?C94D?0???(K)?[3??\???m?1F???T?%,?Jt.?`??%*oN??Wg??>?g:?H)V??
?N?#??Q??????9v\_?????q????h
C??x?=R?BQ0?@?)????KX??j????]yW?????OQ?L:6?;?8db?
?16c?YN:?-,????-,?^?7?3i??????&????'?? ??nmw?_??v??g?FAh??????+k}?<v	????I~???8?
I?????????[??V?g?x?W?e???R????O?K??`$G?hq2????E#????$E??1??;???y?{h?dG?06
??`6&???%/??G n???????o?????H?????????_??=??e?_)W?7?k??Fj??*??'}?7??Ge????c????F???
`??b*??Q?M?"s
\?Kc?_K?B?O????!???\?:?q!"???tO???J???~~(?}??B??QP??????N??nG??@?T????c2?LP??/g?:?w?z??r??K?~??-???K?r??-Z&??
>??E8|????Y?V?o?^?~???@/??5?h?5??4???;0r?9?;???h*=?Cq~??_<??q???^T?F`Z5rH?{?/??c????+T2??`#??<@C??	,?a??6?5?OKX????v=/?!*?o?U?%?H??aa??`?L?I?F?[yl5
?F???t<zHkt??~A;?????1<}ND???'?X??0?.x??d?0??g??G!?G;|?(2?J?LPD
w?qz????o??ASUZIm??L?^ e?]XGH???W[9gr?`????F#1????A!?|???w???[?dx????+??
*???a?&???kF@n???*??r~Z??????	YDd?r
W?>???+R??/?p$???	?8jcj?N?jt;??A??2?fR????+'?L?E?)????<9tlRj;?BG?@?fX???<???b?	??ei?,=????%?uJ?X???\\???Y??=??????U??????O????l?t?CKrR??;K???????
????%`??.???'??w????? ?????[d+tZ???\QS^&bP?(G3????'??f?L??7x?w?????)?)????2[?K???$*????????????8Lz?R^?zn?????j?????m??HXIm?8??^pD???)?vkj??????3?2??s9??
ZE
??A"??3?fIjI?<5?8??I??1??!S??(?f?S8??Zf??Bf
zM?	?????/]A?x! ?v.w6_?w????h???????x?>i??KR.?0??M???!@?????`?]$$? ????PE?p?yAC????%(??0uEa*J(??p??R??H?
$?$?1??
??I??`?_D????????_,?2?Ut?o?)???????????.e92?4/????L>????????K?;?A?}??
??#??-?'
?2?
??>?u{JS???h????????M?e?^q_?M?j??4?"L.?????<????m??{T?p??Z??z
??1`??o??????\???J???V??
???^??????0??+????r???V)Vj
?r5?????S????O?????<?????)?K\{?D??)?D???-????r?\.nm?*?5????Z0????j^?k
?????o?!)?pG?k????O?b?-??oH???[????(??Z?
?bP?J?{??Z???????1tg?$?n/?E?!pNY?9?(X8??*>"??f???s?J??"?10
????%?<?????z???#?^??i
??e4??_E?}?!?WB???????0?2??}?????b??	?)?B???????1??$???+?y??5?l??'Q?fZ?M]?]????k??>?????l?????)??^???h???????v??nU?x?????r}[?o?X?????>?v?????K???K???K???K???K???K???K????6x??~?????_?????????
???Y??nW1?????4???\???}HvG?l	 K??????Rpl	??????p??	O??? a
??F-?
?c?g
9????	kOYBV???^???
E=????9
C"Z???j%KP?TYN???????rN?~?
M??T????????????4??
??g????????.N?
??????moW?#?o???res???r??Cu?W??}??boq???pG?n
??@?1?%?
h???\}????C???ZS?????X??H?y[??n??=&?,}?5?R?,?5p??p?i?fn???(??^?????u??}}??????E?gk{;??J???I???I???I???I???????O????O????O??<???
??+??#@7??a???[????????r???:??! Y??Bh?"{?7?7?P?B?/?	?
??? ?
!J????&????
??H?~???Q?OfN??G{??????Q?????xY?}15?	y?0?k???#?[[E??????????P>b???3?O????^?R???Q????fQt????ep:V??eG???I?~jW?????T??????[???X??m?g??L?Nx?o??HI????????QKj?????k
???u?????b?=<l??z???UQ?????????nO??^W???g?A?=?d'????nO??9k
???w?????N?=?oua|}???E?u??C?~7??
????{ ???????????{j?A???????8??????]???A???"1??~Km?????~?T+?o?OB=???x'?P??{Mh`}??????~??l??3?]F??????h?M?]:R???K?j???	???q?z??aH`6?^??????~???7?a???% ?6{oZ??Z??J?5P?y??_???<??????Aku??^o@???9???Q?????>?/8??a?n?=????????GMH??x???q T?F??2B?0??XOE?y?n??7????t???ff??b?W???;8???4A??6??y?L?:??7-l????$?t??:h???/)
Y?????Z(W???;?4???????????L???!^????????^???'?WP? ?Vm?????*??$\Upp
???FY????[:.???^?$?o?h??Bz???otGmDH?P??e?????*?y???d4Y??.??;&??yw???C
<??????L0?Z??=???XShw&?0??4?A?X7?b8?":7?H?r}q
?4?H?X???o??6j?V;?f?*?
?[:ql???P?m?Eo???j???d?.H?4?
]??M=?
?????:?&w,:?{??'+???i????????H?$?Nc?W?????OY??N?????????5???1K8?D_????D?$??<:"A?Hy???jY??????9?e?*q?c??j"h??Y*?g?[?F"?????V?
??6??2???????6?????t??v?`mt?\s?]??|S????&???????????5kI.???\~?(vE??g	$???L-???t9:?v?)?xf:D???T?:?_?????&>
?e?????^????b??f?$????????JR.?rJ at rh??}?9
??$?B?1???i6???p`f ????????g#?D???9????G?3?j?j`????M???	??_???UD(??2?E???a??lZ??a???8??<??
E?????8?|	K??]?10???TIeN<??
yV	??????|u?K??5?????Ba???A^?oE?^???tO?H???????'???????? ??"???_9I!6?C??.??????{?S?X??_*A??<B?????#4S&?\?9p?O?fC?y?q2????V
???%????h???N0??LC??y|TwE??O???L>?CVO 4??B?,??
?A?r0??J?>:??m????C??C?r??^??	??!??y?Z6,?????d-Aw????p?V?`??Z?%"O?L?&?A????y?f?x?(f?i?F??l6q$Ox?+C?????p?&m)%$?p?????*???
??????Ak?-?
??fN????~YH^???
??J?N??0?y?9A??????h[??S&)?7?1?? ???????5?E.4?1?tz?$?`?U/E44t??K?? 0?????
W?9??%???sx?90??,???MF]??fP?OG???hF???iL???????&?B7'&??W??0f;C{??
W????zv5??*HN???????d??	???yA?do&??Y?;?Q??Tr????./????j? ??|dy??d?C*?!r?z9mf?.??c?o}*?-?2??t???v?p????0{?w??A????\????3O??b?'??%?UG"a%??b?nv?^FUh?7?C{??^^o?4???X??X??????I????????brb?? =I?3??/?b?_}???}?&n???I???S??D?C??N
cJ'^R!g??4)????#??fJ??
Y9??<?:??P-?????@??Z\??I???FRD?E???a")?G?x?H????i?fpN?/Je?Q?]??<????^3?K
?P???????o???xz???x???A!????u
]d?rx
]?3+??vSm'p???,yd?*N-??	TU?]p??T%p,8G?	J?kP??|x??e?r?B+0=?D?~?0j?>???Y?I??????:Q*??r??V?*???
?????Q?f????%aj??Bf??a;??5?Xc??!???LA ?)?\?u?U?
???qW??d???"?q?Q?+?????~??W y??? $u???n??G?????Yy4KV?Y;??Y?????\?V?@.?`??w?
?????I???+bH???l???+??.?h?F???t??
,B???lX???????h?f?QS0??XJ?2-?7?~h???cM>0X?f1V)??
?Xc??`Mv???I"U2q?Jm???
?^?w????i??x?Em?u?.??q<m???q???
R?EXD???R?c????????R??Ow9???f?w??*|<?%N??R???]\???D:??s?l?*4??s7?i???J?"???#????E?H?- ?t??et??
z@?3BE3??y,/???U)G??k?i
?*??D???c???????c'1M???KY?@L?"?~d?J?????`+7;>????S?oI1bhSP??EQ"???Y{$?o??U?v6?jt??&\e?x??W?%'x?{?=???
BQH_?db???9?
G5=?j9}??t???(????S?Df?MY???????A?]=YU,??\y,????????h?)?R?A?7?[;??>?5??L,???enF??<????????|L??ar????=h???K????5??3??Q5M?R??V??Y?AA?H<???\???#????2+hW??!J??m????r^????Um?&?; q6d?
(?????^
?^On????y?X??j#5a????z?0?W;?Wz[??|nt??+?Y^???d#E?U???y?d???Y3qp?7?R?f0=wh??t2u???^,?<??J???????1.	??=h?9??P???s?$?
x\?
??k?^??`?m
r?0??|?#??????+K?[?qX M{J/??tIq"%]K|?????W??"/?1l/9{??g7??=???O??;#??LU??u`??M???7U??<d<v?????8?-dU?:?????~
?T?&?,G??RT8?$????"|????:???????+1U?V???\?K?Law^e}??????\T???K?'o?^??(?)	?o??n??"?F[3
?>?q"
?2kP?\?????2LEr?P????????]????6?5?S&%??V??dJM????H
1"M,??,4??*R?	???*?)_x???+????(???6?ffg?t???dY?!??U??E?c?*5?iZ??z?ixD]b
?fd????X?&v???-??b;
8???????iPZ?b?G??p(??????[X?I?AV?1 ???)F?O?u?I?l
?k?O;PT??x?Zn??T
?V?|??4??W??v?)?{{
t? Qy?E??z?
????%/x?????n??%W???p?b|a?d???? ??T????????/,K??y?b;OK}??????QXn(??zt????UH??@??R???
??OM
?j9-JtDO@|q?D?5??EhWZZ?Q??O|b?D
?&??R????F????bd?IC?y
??'
?]m?Mr????s??V?*???C??,?e?% ? ??{?%??RXf??^?0?b%???C?'@hs?????????????v?????????CZU?1(`??\xv??_2??A??7??	#????4267?q??!]G???X?%?;????pY?7=cl?1`??\<`?u??Q?MT?cJkD-??c'??^?lpM`??)???'????"?)H??3D??????O??!?3??$;?????s???H?x`:????
?H?+????5???d???????;?l??W??X*{D??pm???????v????{?=hL"RW?RY?l??????8t[
i?KH?T???M?????Gf8???????~?|???F~???9?{?_~??F6
?L]?j?
 ?=??}?W?
?a??%R?????b???JQ??l\`d4\??????H)?????pp??r2f??@??HEO [X?h?????b7?s|h?D??D??'WP?\Ea???q??VH?]??x!???y?J???
4??y5??3?H????eZ8???Y?w??jc\??v
??i????5???
???X?Y#????~?????v?j+s?G??kx??[??gk????CWz?p???v????nZ?"??D?????F??&uF?Pq>?]?#??H9?h?@Tj?P????VZ?%;
:?7?j????lK?[^N?????a<5ew?U?4N?n?O?Y?'?*?OW???-?9??F?? ?Y????9?????(???a?}?? [H>=??6?Lq?j???h??<??LQ?M??+??r?I?0?
?O????{j?d3'&?S?Q?????,W????8???8??^g??1?????|??t?e??n??????W
?	???????????,?y????3???p??W?7?!?i???:?6??,d&???????U:??9<a?%?6???!e???7???;X ]???d3?????&s??,?qNT???*????m?????|JBMM~?d??,???[?y?	T???

?1??nu?a):?z.?<3`?:????K?0??J?U,???????d?+?%?I&
'?????5f?u??'$J4Xr.?4? ?i??_QG???o$???Es?#M?U4?pr_)???GS?J?l{`???b???}nn?aiOE]e1?u?h2??????K???????B????^?uf?Y???muW???zRr?x??D??dP%?`6?U?? ???A[n?5{?r??MH+?????Es6??C?????r?<|??A?S?????F?&??m???K?:??k?6?m+;??JW??[?
[?R}q??X??{?.?M9b??G?D?PBs?F~5?"?q?+?*?Hl????????F????f?AR?Dv???B6??JTE????f?8??????~YV0#?m???D?B5???|"`b ???
?l8?G????ls3?|?f?G????M?&f??eV]Gep?O??mx???EWi?~6??????M\
,??????N??????)??Q??5?ftb??t\!(????Nls????????al??:??R
0K???+????"?>h??m???Z\Xq?U?????Yx??0??????`	c?~?,-????z?K?:????p??????m	?? /?qSvs??]??a	???ZOB???=O$????G???u?)??*??Z*??(????u?"???VV$6e?p?4??Xv1?A?I?l??]?*???"
??Cv
?.\???
)5?Lq6??8????g?t*i??Y?z
??U??A^qJw?]`???C??n\.????^?N?UXV???b?\????
?~??!? ???J?,??Yy?(?	"n???????d!":?`?
?(T?!??vA??????7?o??F???e???xj??[i9v?Uay
R[g??x?"??H7o?u/?s???R??E??(|q*?0???nt;gO??2AX??t?F7?6aNuD?OA?
=
??k???F??%???g*5T??}???W??)???w??????????X???[aN?q?do????'f?[??o,?ks$V^?G??%l??h????tQ
?c??L????|?T?KU?0w??y????0???^(?+RH1>m??r?????G?Sot?
??aE?(Vc??p?
8???\p?6??MM???/%?n?(>?|?9?M? ?2%?3[|\??2`X?(6Bx!3u?ASh5d?Uk???E?
?+aq?Q?,????s0\/P?????z?
q?hx?P`J??
?
?<O?=|6a??aO??=j><??f???c????;?eB8?
Y????\??-??????|????K{^????:?y>?*?f?MglP???vD?i%????Q?3??????)?G??e=C??X??6?$!?Q?5???W?i?:sr??!?tX???N5??n?~a
YbR ???j??P???1.\S?	?cD)	?pO1?E???M^?H1F????????C?? CXj??)6r??+?@w?Z??H??h??l?R?F$??OIv????S=_k?oUkdc?6???_%K?????PK???.?S?P??m?4b&
?Q%???J??@?'$??m??????x?5a!M?_??^?M6????`????^????8???.0???Uz??H?X?t?a?V?=???V?k????6"??&*ftQ????m?>?Z??z??D?YA?^tQ	?9_k??
?
TDN?^f?
??:???)??Os??
1C?o?r??Db
??1<????-?ZOXdw$?p,b?#?+?3?T????X??J?H???U
d"	Y?,xy-?O? ?2????x
k`?z7wx? ??U#?7??h?E9GX*?????]Q=?E??v]????l'?????</?j?A?s????@????:???s??X?uz7Y??/y?m??Zqb?7?????????D(?H?C:????}?w??????????W6v&s
?;????X?????u ???.)??E??/KM??J?????Z??_??X????
?????Db0d
???????????????e`???
 ?!????I????????w?Y????D,9??????????Z~?w?o??C?????Nq??????Q<b??x?EG2???b??X??v?[?e?K?
??8?K?n????GE[a?t??HQ?+??=??"\??IM??m?????#!?z???G)@?B?????
?C??????n???jR??????2?{?H????%?H0??GD?|oS?;5?P+???
i?P?rsb????????uyd??o?????+"?|?+?????????xq?&L???J|f??Y???z??="??#*RF???????6?????g???R?
:i??9?<?3?sj?$??b???^??'???B?????s????L6?g??O~??~c??40??!?Dwf0|??/??|2????pc??M?Cm???&|o?????G????	o?n???	}0??}?????P.?rn?xA.??,`?
?PyBX!??1??Q!6?
??,?'?C??*??
w???}@???_?????????F????????????7???????8z?9??)?F???,}?m?F???}?(~c}_??????8x?1?n?7???Y??
J?if??~(???K???|??+??
?O?????J?.x_????>??O_?????P?sW????????,???8?	????P?/?,9}?}??t????k;??<r==?;???}?p???m?????????/p??K?????????aq???r?T????g?	?Kc?=P?????
????+
?v?R?pO?=?S_%?d????C0?????~?MO??kH<W???2?B???I??$???&)?|??Q???????1???}*t?n??????_??B?????? ????>?Q???
?a?yj????E?+?X??]G(??/?zu	?^??%???
?Dwty??w??syF??)?????@BQX?C!??????c1$??j???A?^?u???NNW????-?"?2|??C,^}J??V??????E?::?????t??7?xIg?KB=????]?f????k???FB???3???PO1???)?z
???l?0aH?8IC???k???L?f>?c4?e????~????Qm?G0S}?
?_???mO??????m??w?B5?????8
1???{~l??]r?????	????	L??????*???+?~?7?k?????c??`?p????x????B??u?????\N???\v>?S?Z?
?w??o}?z
??I=?,?? [??L!?|-??k????}F??Z?1?>??xC?%???????m?@Q?
r?*??ru*k
?5j?c?c
1??
7A>O?????????&%>k
No~???????????
/P??z??Q??_x?????????/???D~?????'F????_?O???_>o?0?_???*?[??V?????w?f?{B???|??L?c?????Ly?????G
???Tq????[?~?2??M?~DS?)Q?f??)?C???????jl-???;6????<o??')???O?k
?+D{?XD??6?-??a?Mx?M??????6?_???1?sm2??6??iR???????p??????I?"\?????;
??l?z???)????N???q????51?k????X>?=????
H?N
1???N?	? ???S?-????-;_v??R??r??# ???	Kz)	Q'??
t???????<z?>o???a?O?BV?M?Hw}??1?u?????.?ED??H/???$????????????l?????????/|??>y???1??_8???
6????L"????L"??8?3?lg???$R?>???~?L?f??=d?jk??(?_???m?<???VM
????Z??|????G^?|??Z??????????????v???S?????????t?|MX??*Q??kr??<9??k???v??{q?,???/o?%^|?k????-?r?????w?%^???S?T???bb?J?b????W11d?bv??&_??W??|???6_??a???w6g??&??b?66_$}s???F6_/?l???[?4?????5!{?4!?v?hkB???&dU???	?!?K??*??L??2M?f?jB???????	??K?????{???.?????????????????M5??R+??b??=??]?????k9?	?1k??c.?}^0M?c?????????^?f-?\??A?1???V-?\???
}Ap@??}S?????-????]?w-???,??`@??>???Oyj??y
E/?????'???????y 9? ??}???~G??3??? ?V?t
?0}??_`??d|k>@?P?(?M??c?????3?x???a,n+?F??X2?u??a6l
?????????
?
X?,??S??<??O??}?
yA9
"S?\?Djz>k?OOZ3??s?c?d?Z?=6??`2??SV????T6k??Y???S
*?K^
e??S?
cg???l?z+??.???S??j:v??*4???2?????2Xu?( ??2s
C;V?q
????;{??(4??=???*Z?P<???v?(?`Y??X3?t??M?&yd?(!,??????i????.?o??`s6???i?{1???V*A1?????????
sm&eny??t???z;t/?BUJ???R?*?E=??o.;zP?2#???y?n;???|??E??
?V????x????S?!=?P*7??23???y?K
??;??5k???je?+?Y????F9?4?_2??/W?
???c7[?????s?R??J8??????????|??6y{[??j)9?v&V?????}??"O

2^??%?_????;N??4?[F?Z????}?@?jl?ZAR?<??U?r????7r?)?T?-???r??QX):???Y??X"N?q2???K?/J??&?????LF????w<?iX?N(%0|t??	?????i?Dm~#+/Xr?%???1??NeeX?V?R?N??D?rS ?@???l???_wH??WZ?????s8?^9??J?F?^KP$e)-??eQ~??R
xJ???`?E????c??|??c?$,??????V
@??+?R$??|4??Ku??b?d??3?E?@??
??????J]T?(?;???;?
??m-????/D?p??P??Q??????'q?9?h?@??-?1??Z?:?
?)pU?U???/?'?B??M;??:H}?r?e???W?wH?kh10xG&4?WO#?4??????B????'0??r?^? ??????w?roo??%???	D???(?v?d??f????T????C?ID??qxE??ug?%?X??%??Q(Pt?v?\BI??LJUI?b?????]?^??H???;LQ???V$??d???qbN3??????|???*???X???q?Z#?\$?p??Z?C?c??8???x?????????4?i1
oV?*????
??>Ym????7?N?<??Wp??Q?U????V)j?????9????JSBh?X???:A???R?b{?"/N??5????J??y?jK%F???H??r????N?2?uWD6?T?rP??P&??????\???i?Y+s^?t?_
?sz?s9Q	C??VZ????8d?O?1???WD^?????R?|?~~38??5bv/???'??????obkN?L???|??J???H1Z???/uQ??u???e?T?Qk?,????Y\q@?P??Tl???N|C???01tY??FR'??I?J??D<?:?Qq:??3??j?????????0??(??E????D????7?<?K?Rh?z?n#@.???&3J=????L-??\?$??????\?V?] ??;n?K?w???ly?&?1t+,?
??E+???u}?F`G?
1&y$)p??H?	dU?1??T$P,???:???%?0?
??}?3?????;?]?X?B??(?z??I???y??A?Q
??Q???????????r??
?,?m?L???????????b???5?}??3?\?Gp1?VA4???5a??g]?v?rT?e?n}?Un?E?
?G?LZ?P?.?w	???#3'q;+??T?&~
+;Rb0W?-???#j
&]?K??R????m??B?z???
!?A,?Sp?R|Ptr???*q?i~??y?M????gPb@????%??J??????Q??????????v	7??@V??3??d???????E???agq?XPvz":??????n?l??LX??BP?@??x2?????0???B???O?_????$?3?????)O?*j??r?ib???
i?>???
?6?zj????m??d????CL????RV5?H??R'?)98??????s????[R??fxQ??H68?:F???2??j???R
W0j????'V?????????=???S@?Ph6?z=i??m,a??????^???R??&Dh???a0??e????
?H??T???A(+z6?
??a?+???????????L?e??e?zp??<;?v?B???Tz???H???Z??|?w/o?{??O'????(?V?_0B?c???A??(?????P:??+?????W?B?%?$~???T8????U??S?,????E?W6??j%2?o?Z?\V?????????@?b?E???;B????}?-6?B?A*5???ykg????&???%7???????Cv?\??#?
7???s@???????b???Ubl?&?-????qI???A????G???6??%	
???Rm0?]??:?^?ok??8?Q?G?x??$5}D\Y???z??i?Sz????	??8???%?@@??[??+?H?72d{???&=?	???????{}e?i???`???#
?T\?:?r??-E??Km?
*?g???Qw?i?M??????+1U?V???\?K?Law^e}??????\T???K??h?ey|u???????n??"?F[3
?>?q"
?2kP?\?????2LE?\?&1???????w?m?k?LJlM?(????fYY?B???#???c`??mW?
M??V?| ??VL{?b??????
]n>J????M????-?+Y=M???XEt?c?*?<q?z
?k?H?S??H????z????+???n?C^??)Yl?y!P?"?J+?RL?(xEVQX=vv?;?6"??>??FnS??a???????j??????(*???a-?&?g??R???0?9???U??N?vhipj"7?p25????????
?:??L???K??>?y?)?U?D?E42?J?1?7?????%f?b????\	_R????	?a???v??ChSYZ????J??,?V??=??<-?Ud?Rg??Fa?????=?E2??VU ???
?j?yf
iU?|????r??Q#?????D?'??Ol6c????l???t
Sbm?4?@??FMoI????16??e at .??:????&*?1?5?B???h??\IQ:??????x?(R`??????4jz?4???f???c~?
~???TZ?2N$??/N?????B?nH`?!+2Y???dZ?8??J??U*?B??p?????????uM???{?=[LRQW?ReY?l??????8$?tp?GX???'Z?????2.?y+??F???{B`S???-???
 $
???3?O?p?9?
#
?-F??(a?f?O<:XNG]}h?>
p????????2i?&

:??????DK?@?y???.T???a??R
??t?+?x??Y??*E?
?1Ed??\??]u??+u#m??8????c?r?????7?:T?}<?????:??#?/?m&0?|0?Yr?3`O????!uU{Ra????W?1r?0???0??

?`????Q?.??|??
???0'?????V[1[>????>?XO>[????}%?z?????z=??:D5&p??m&M??Cd???P?_q>s]?S??H9?h?@T*?P?k6/Xg+????N?Q????^l?????s?+f%??\&???$0????????B6??D?
?Q?BA?->?z??????P?bjHSA????O?g}]
??l>?[N?'??L7??RvWX?B???&????????b?$p?h???Y????i4?",?<?	?Z?	V`???h.??
??>??r?)?Q??}E?RN4?F?"?[F?#??????tRasiI?z???T'kg??	9?zl??*?(??{??>?tx??X<bF??????>?q??^???z???????_???|?w?e<?D?cb\)?A?????2?"??hUytB?&[Z????|?:???_?v???f??4V(??A+Y?`T?? ?}??<???*?lb$d???????sC????"]??=?s?.O??,??
?O????;g?d3'&?S?Q???5?,W????8???8??^g??1????{?????e??n??????W
?	?u??????????y????3??????ZT??6??)??c??N?u?&?I6"G_???r?-??A>N?Q??3D???FH?????,???Hoz?3??#???C??\f2Kq?Ugr?????t[?&kp??PS??0?5"?????wD~
?$?e@???	?%??0yb??\Z??H???:"	??&0?	?K?\?K`4+Wn&]???v????[?>&?E66I?????E??w???? ??rJ?=??ZK?v?!*??(?!?????z????*????O&???(????u4.?"?(?G??X@JF?Q??F?@???
w>
? igj.???
i?b??h*?????Qs<?)???\??Xn?T?_??}?2??,Lk	?K??#??`SY!>?????1,Eg!^????`,Xa?P?v????Z??7t>7K?J??2?Y???d?pb??(_cV?P?X{B?D?%?N?	?&j?u4)??F?Z?^4?1??ZEs'??????;q4?4???|v?\???&?&T?U?c]???&????-?D??L^+??mA???ZgF???O??V'q%???'%w???J??JUQ?fS[5|2x?
??f?Y??+????????iX4?2?>d??G>~-w ???[??:%?A?
lnB_?F?I??????m?Z?????=??$q?[n?u?e-?]1??N??Q?????#~!~?
%?@o?W#?!B?
7??B?B????Y???H?h$?,???o6$Ld??O-d?QK?p?DU?
?yi???l???;??e3?o???N?.TC>??'&B?O???s?|?9Y??67#?'hf~?????tob?yYf?uT???a????h]t?v?g?
H????R/??????iN`?kZ???5?]?oF'vipH??R??????6??K^???nQ?v!?????/??b?.#????Y???H?.,?v[?V??????v?B??^?W???P??a?A?\?
K???3i??w???]b??????????e???=xPmK ,
K?E??z"??????x"???084<?_,@?cM
V???R)?E?|?????????"?)???{?Y???a
*NbgN?zO???ih??#0v??4?K?ag????????'>CRI3??"?????mg???@['G??k???(?????8?nm=????zK
?3-???????c9??]3?????2)?Q??	?????
?Ha*0???l~?&x??X?????R54lQ??,??
`?;
???5x?WF&????Z????????I?7I;??H?V?3?????|AJ??b_"???r??6ve&*???k]kW!G???q?J?
??~(lx?
???x?o???/????("?(?????d??+?{?t(}CV??
(?X??K]7???????#:5?t??`??????>??
??ls
??#??
?t????Ms??E??????????~>7
????+???? ??xSH?;?(k}???b????0??b6\?????G?p??K34FB*F????A?.?R?b?]?@;?6 ?NZ??p???i?qD?$?@??{p+?<SL?,??WR??02?x???0hg-????G'?|_|??{?(??G??=J??Qz?????d|?(???
>J??
^?(2L;_?????>?F
??G	?????ESq0A?%|
??{]'x?????>??g???gW~|jm??????????D?Q$???????F??h?q5???oqh??`~?F???|'Rgqx??(?j?j???D?R?b???%	C?H???]?Y???M?x?l9|^??z
B???D?E^?#	????H?Y'%/?H????X?????
byS?6oR??G?A??????+??
~
??)&Gh??????????b?u???Ax1 at C????cY]J???J?~^???X)}?CqUG????uH??/?L???5
5??	!?#??0@?`O?????
x1??[C?l????x.??l ??_H$Q??? ZH??:
Wd^D??}?????\?2!??x??21??J>????Iw??!?x??2?_?<????Y%???
?S?JX?f?/\?$?d???d?d?d??x?qG??,d??;??is????^DP<t??
???w]0jU?Vn	P# '
G?7wh?%p'????cl?IlzL????6}?a?o?????I??6??????*??<?n_)??e??;???q???u??n?}2?@iO??])KjtW???P	???H???V$A?M?e?ez ???jrWgI?	????^?????,!????%do?F?V??XC???? ?A	??A??????6???B?U??
^h????W???~\~'E_???#a???m?3????S?[?Q?p?dK?C?1W???
?s????
[??KWo??,??
uj?5????>?6??v???F???	m??'_???Q5bg?g-???2?$?P?:???1?7?r??P?f
H?q????:??
?I??!E?&?$A:?A?:?M?
p"D]0?Oz?!???X??2?(
?!??!0????a)???m?!?'??IR?"?u??GH???K?????i?7x???45???(??!??$????x?7"j?????Y?? ?i??J??
?A???la???7??ah[???????k???Ky??t?
Y??V?u?*?,+d/6`?h?n???????/v
???:??
? P?????Aa???Sph?A?b?
?pE?????l?)cw??????????trV?y
??????}_??	??V?c??*??8>5~";?3?zJ??r???
?9??Y?U???q??/W}*?????}??7??w?pg?????P"?????????0?????;??????7??`u?
a?5?`U?M/o??x?????r?n????w\?R??Z
y??e?2???`?xf~:??Z?g??qkv|n>3?05>g?.???dS14??sa???H?E??/W??S???d?2Pn??|?W ??????????4qO;ZV??&Q2|???l??????????X???'Apz??????5k?u??????K?????6?F??????[o/?i?V+?7u??En???''?R?V"???R?*?E?C??????1R?Gi??
??s?Y?Pj???c??{?naKei??&?XQ:??Xr????`6????{?9??^??)*G????
m>???&m?p???Ulb?Eq0,V????5g??4?V?AG??>??h??JX?q???'s??C????x4???C?>? ????r[(???l??????t????C???5???+?X???	`??L? F!??^)A????+??}????c?y?^???9??l?X??7??A???#BO+)?#@?3?]D?]???]Vy??!=C??X??6?$!??a???zw??i?B?R??I???w??M?/???]do????t??y???????	?<z????"
e????Wj????d at m6?P??p??`???2a???U?o?z?UC?
R!??????YG??'Rs?.p??F}??p?????????=??4G^?I+?-??r???J????!?!???t
N?????E+1{\x??[?W?=
K[???#	???OKin=??
??Tt?cQA??2??M?$???QC??6QQ?yy????
K;x??&Q?'??g??:???M?????d?[?????????D1xi?t\??+?t??d8@?
YbR ????v?KC?????Kb?QJG4?Sw?????K?i??D?%?fz~F??ha??Z?~???????!ky?t??
mY?mQ???*??"?S????????f?V?F6FiSPkJ
??U?t?+?Q-[
????????p?SM???i?L
0g??
[??????~??Z??hR?????\??n??NE???\??QM?!?v~y-?K!?6???p-??H???	"f:?bI??"=??$5t+BA8??6:V?Q??????Dw[-&:???
^hMXGHS?Wi??b???2?7?f6j???	?c"+???.0???Uz??H?X?t?a?V???NA??~?1]mD<ZMT??4? ?????}????v?????N????s?????????`?%???.[??8????j}??+?$S8E????.????U??EvG?
?"?:??;??A5
???6???????[@&??E??????d??
2,?Cym;/?aM
?h?????M?x??Cm??m????{B??z??%?C???J??#Y-?A7??!\?????/+B?n
??F????????
?????%c??
??>?#???P??e??Swr=oyC?Q?J?s"?!o?????C	A	?M	Q	WG?%\???(?w(?_S?w)??K??u?W????C5???A??????+t}??????Av},c??_????ol??_??'?q???n?7?????q?????}/?7???g??S??my?)?L?if??~(???K???|??+???j?_??s?~?'n???i???g???;?z?J?Js???Q3?U????g1?Sc(+?????
?J_~_>?=??????H???????8?v?)??3????v?????o_?,?%??N?~s????mX????\*?b???Y??B?????A???H??n{^?
 2k/u??n??2W????????~?e?????~??/S????g!d???k?g?k???RO_N}???k?o\^?F????KW???W???_???te7????????t?o??????SOi?k)[K?v??????????????&?	x?x???H_????~?xu
l???????~??_G??[_|??????~???5$?WRo"?}}?????S? ?gT??.?Q??????~)???K?k? ?h????????????W?-l???K?EM?%Q?????;_?
?????u????Z???+?????J?n???????W ?+??????i=w???T??D
???,?E???z??Hi
???*{_?Z???k?gz???
M=3v'???{_????Sk??o???#??S]o??}'????????Y???;
???kF?j?,K?????B=????-qj????e??4?????????*??O??"???"????	?mO??????m??w?B?gm?WA?? ??{??m??Kri?<??}Q??&???????*Np*???????????t????????gn?q]:??????|??%??;???mB??K,K)?[??^??cR??E??!d#??)?L????????>?Rr?|ZLh???????> ?G??Z??=2@??r?(?qY?+??
???"@"?
???L?N=R?6???e?~?cP?8.<$???s;???-?????S?5????!+"n????%-\?%?
+2g?t???=C]??c?
n???l?{Y?"?z(<?????4?K???[eXh??!?Z?;??X?B?????aP?}? ?aW??P??W?X$??1\??bxC9??`??????-?W(?????
*<?R.@??&?a?gXqL?????aAS.c????2WC??od?w(
?Lt?@2??B?%

??b?U?u?????????38???C?2??f?o?^?},??z??Q?Ta<u??????c????"????????????o?S?>o?0?????M??? ??B~?????4???U4??c?;F??_????????????X???:???????????{v`jw??"?{S?????????N???Maz?????G?,C?
??nCl?zC?K????6[~W???TqLD??`f[?f?#m?+mJ??6???&?Rx?????k??R???m
????%Q?O?#V???4)????*4?N?U*?
?\nb~f.7????r?5?}}|B?(?r|?8GK?\?u>??z?F_????p#r??y?J?C?:/?VV.?rR?????????????^)???I(wbj???Tn???lj>7?~l*??PK?#???]-?
??????????.?Ei^y??(<???~+8?i$}W/??s?9{??w|OT??c;??gB?->h??+?J+;Y???7
}?339r??7?`?????S???~?g%????z%?[t?5?b?,O???BsM?N?6??f6iWJ???
M.??g6`?#????
m??m0??H??}??@_??H????yG????-???p,
???`???{?T<?????c????
Cc??|?X??
?dS?V???z?>??&e?|???f???G?[????p1?*wl?8z?? d&?^-????.???t???Etq#?X?????0?@Wr??.???fKY?:?l5??z?????D???
??V?@???A?V1??%TGt]H??y?Q?s???]??????????
????`???????V?d=???<d??/->???K?O???????x??.?? ^?p
??9]?;?@??+???*??#H?????nu?ygyaL?k??e????R,?~???v?E.)n#:)??`?Iq?GAM>b?q????(??>?!z?????x?N{{-????(2????I?Q5Ls?!??g?????>?K?4????F?????????8ja????_=?[?D????h?t_???? ?l%_??*? F!??g?????-Kc????3[?????#5!??)??96???V???I???^??d at B??b?w?c????n!Q??
?[?bh?@`1???y,?
OfAvI???$
??T?????)???>???ST????????????}?5M??on>??F??1???jj???:[??+7jU??<??f??`???????
T|U
???-???+uP?
??
1$G}?%??b[?U?rI??mW?r??v=K???4w?L*'?8???<HS???y?M??C??r????????????eLbd8n??Kt??p??P-T?-kM?+e
????????"?E ?f??~????E?9????v???,??P???R?(?|?????]B?..?:??|R3??????*???J?N.??d
?=??Z???Y?b_ ???Z?Zk8????5-ei????K??E???D;?y?
??*?U?(?Og?Vv?????s)~???<??LMZ?NAd??K??k????Ikbfz~?????Z?=6??`2??SV???9?/=3geN?Ne
*?;?
???' D?????'?e?
P?1
?F?)
??]8????/???33?Y??????2???55?%l-dSQ(c~?
 ?*?????BZfz>57?0;??C
Nz?a?
?t2O~g???????SqA??Z?S>??$??#"?o??<
\??c7A???B?Q?L+s??|(?U???A-3?
Pva"-/??
?r??
?)v=/J32^pz????#;2?Z@?r???@B????"???R5???????Z?7?????^R?`?T?K??W[?s???????z!?Z??5qo???h?vn???Y?M?Q/???B?$_?h
0????<???f???h?n????u*?sz
??V?i??t#???Z?z??????
?2?&:I???M?????:?Kb?>qZ??Sk??S?\??
???^$?&????0???(,]?
?0,????BS8?C???&?
????t??#?QIx?Z?????K3D?b
?(q??Z?????5?KlHR?Z????????"d V?7??(???I0?.?W???6??RtD??>?q?6:?7-x???~e?:???t??Ss??{?S0???2??A????)???????E?m
=???]e)???cY?5??:qrF??jY8K???Gv?????>}<j??

??????
?+?1Tu??L=?G+?jF??WYE2?
;lOx????Px???h=mE8???y???????f?k??????y}?{o?A??%
????{????w?s?w????_Q?/?.???g*w?k?????^!?8??
???{??R%??c??/?'Bk?S{?'?&?)]??????????%
AJ??1?/???X???;
?s"m????X????D?O?????=?8^
H???H?a?rv<??"u???z<?
????K???B?WRWb?(J???????J!??G????R??6?n?J1c_k?U????u7??/?W1qR???s?xE?@6?:???
???
m?+?????D??????
j?nrW?-RZ? [???$???^h?I???O?E?{=?
ayaTq?c;l6?????.7Q9??4
?tU?????r'a0d]Z7?kB?=-v?J???y??m???O?f?#???H?<u???? ?E?Pu?%????8hy?? 0E?w?"!????L?\??O??
L.(BU?=?4?Z?h???kZ?
G?n??&???T???H?=A?T?G*???E??o??+.9!RB?W?,N?[9?A??E?>??T????Q?*?%??$??;?li>???N?f???f???????:??
????}r?w?c??'?.?}??K?a?
??IP?C?z*
????????
??????`???sW?d?I????NK?.I??c?SB?H?	??J?
E??????K?????Q/??m?Y??D???[q??8:o???7?<=
?6|0k??ph?NM?/?i???U???U??)#???A}????"
?Sx{?
T??ll????f?hOn???^???????B???xyCC)Es???0???aI#
?BU2?/????????????gH?????j<?!????
?%?"?WEi?I?????.???o?T3z6]mb???+?X(I2?5]??#?+?)Y{???n?c???;
??]?o??!
~?T?J??T?)f?7
??f?????
????#?KX?(?r????9?&??R>???O@????W?t??A???[??}?????}H;(???O`@?T+f<?z??2??y????Q\????K??1{??Jj??????wo0N\????X'
?)M?D??z?d`??2?}??@?
???(sqg?rl????Qb?I?'
(p??XZM6y?????d??????u????+??
??q?h???G??7:?????$
??H?? KEb? >
??N?.Z?U???????s????"w????#=I:Q_H?@a????????^?\}???>?????xKW???^CN???G???????3?^???r%?t?vK???D?ZA?????
_???7??]
?_?????
x??*xR?
??Q???FX??(?^bN??;
??????;?H??<???A)??G|???g????D&:???\??Aj<\9????I>6??19K??i.
3R?+r?GN!???T?l?	C???R&\?pF??f^????\B????E?/??`|?!A?z?????=???+??& ?]?? F?	4	Rj&?hb\l7A???ug?$?K???0*h?b??fG?	?
?M????r?$?r??v??aZu?{???EP&;?af{?????}?w	wn?????_????	4c74.6?????y*>]
2gR????d?`??n??1p:?V?? %W?6?Zjk?t???G?q?0??%?h???Lv??Z?I?je?H(? ?????0??????#yF?s?W?(?Dq?fU??z}??>????V???????GC4???}????$_?~???t?B?W???{?|?f?txkJ?;?j??$?~???)????!??#??qR??=fc???8N?
*s9??%?$?GuF,???t?N??Ej?{?????E????e4?En%?F?z2&??^?w-?8#8?%
De^??E?n??rA?]Q???9?????tup??T[^lF???[?ERQ?x?y(.?????Z?'T??l??^6??<dQ;?\3?D8w?>??p?V?H?WH<d???U?! ????D?SDEC!?f(?8??3y?X?87Q> ????^?I? I
F?R~:??p??-?6??ml????T?m?#I??G?X??o?r=??.?J?|?	??????>??>??????????ds???^1Q??\???OWS???Z?(?y????????#??'???o?????X@??0??ADg?]?Xe?#?????ql?pf????h????????wW????7?w??D1L???V?????[l????tK???^??X???P?5??zuD??6?>5uc:'0???0M??<<?<? O???3S???9??Nb
??????w?:	c???/?s??5G???/???E??:???4G??	?P"?e(1?+t?B??q??????n4g%?4???t?%j=???"?e+pIk??,??OWh6
??Q??????q??	???O(
j???r???? je<mE!?OO??Q??#[?A??hu?X?i??b???7+?'???v???O>?dj?0????K?????*:?Q~?\???
?:1	??^??i?Nn>??bn?!??}$.?,7
?Zq?????????p4zq7???@??5??X??N?B??u? !9&!??5?????k%??\96??W??F??nv??(6?:-)??????79mS~
X?N??8*??|?T?$
?h|M?D`,??%???i???G?r?Y?IWGIQB?
-????hr?+?@??n??Vp?}?4???i
?M???J???6????'!??$v???????1??M?&?Z??<??9U?P&	?9?r[]?????%!?y?{????e?h?xm????p?
?)??z?.?Rk??????&O?h??k?a?.]??Qfq???
????{??????P?G?R?[	???#?[?T??K??????v\d?=?q?>?M??v?????&`???*?_U????
??_?]???`wi???r???^??|??s/??
???2???M?.J??????
?fH_]M??????n2?????|??a??tim??a??,
uV??Ve?#??m?"??A?ZU*?jQ?X?M?????y)????D??????}"t<h??a???c???.et?e????&+?vrA#?,K??<}?T?8??JE]??	??_????/??N9u???n?????????
|B???d??$A?=????^?M`??????+???????O??je?;??/??_?w?3?(?Z??M?E?%?e???vc?_4??VTF?d?7??Y???f<e???Q???)y?M'y?'0?J?L????E=??6?z?m>E??g??m??LV??,?????I?Z???????????N?/??rA???C	????KN??ZkO???`U???=?????-??v?l??k #P?cCQ?S
?Q?c\??PPz??$?o?????r<?*??5?9??8T?I8???X?y??<??0?y?a?e????L??"??CQ?????N+'E?Q}??>%?,?a
;???v?Kst?M?J?00?-?)??{?d???j?V?/????#?T/??=
??
???N1-?~<?????l?s??Za&?q?-iO?a?Do??;???6O???ku(X??>????3\??g1?pH}JWf?y?k3??}?>?????WhZ;????q??i??? ??Vx[@eE??V1??Z??????????D	d?a?o?w??6????h*_?-??^?`????R?
?(?[z??
?a??=??%?k??????S??L???z??e?xO??Or????`?b?WW&??)k?HAD?Y?	?_???{?? sWI.^@?X3Wd??^)??HR.?AL:_p'?J?Z?
??SK??	
????{^h???K?
?T?	?I?C??"%??.?R???9b'8?????.-????[?<+?f??=Ny??Y???n???J??mU?-?ET
jF-{??<'	?????Z???L??V?J?Z????bA?V?m???v??i?R?}?Bu??Q?`??G?rM?R?\@???>/n-]??%??????^?X??#J??\.[U"?@d_Wd-&v`o?[??????"?j??????????L???????H??
??)| ~r3Aj??P??L2?=5M~?????>?*???D??_??d?b?a?[?Y_r?yC???????s~k???y????RY?k=?@?6W<??T
????EK??Q?q?^,?Cka	o???k??z?*?s>??RR?aP?>?[M?o?q??????Z?$$?8G?Zv????>?W?LF?????g??5,?-?5??0??%?<P?g?????J?oRt.s?.??	?
?????W?<+s?8]?y?qfi??+`??????N?8?U+???"??????ojx}S??$8?g?
??\
LP`??V3C
P??3?LA?????yy? ??Be?:?c???y???y???aa?T?V8??9[?*??W-_{^???
????Z?H8??v?V?K
xG?p
??p=y???(??
?? Rt>?1D}?????2?'?"??&???;??<}}????ed??????9??@h??
*8?]?????%??$?!??? ?~{?y?r/CT?G*?1?:f??9????a??v=N?;??(?0??>??/??O<g]MJ??d,V?5^??d??pD???5?3%(???2??`?(??l\L(??LXp???q(??Y??9GwT?k}?D?jy?(fY??t
??e?.?W???n???KI?%?????u??????m??Dk??
Q
a*?1?r?B??^?#?\c0U]?<????3?????G?.[??%R?]???dAC??y?V???Y8?k??T`:+????J?)6???t?<?gf?|)??SgY6O?y???u??:+W<?MZ?,K<?????????F??^????I????/2????????)???-????^??????|>???5??^Y???Nztn???????Bu?<??2r??8?;n?????_??\??34?[?]???<?????R?g????V1?z????E2?'??SJ???l??P?->wx?R~?"??'???????E??O????=KxV??V??c??oS?C?<?W?
ZN
?<Gua????????gdI??P??H?????n?R?b3R???h?? s at 6o?N?]r?1????N~a	4-6??oP??f?~&9??i?)??	?x#??,i?px?????@?
{ ?u???A'j????
n?????????\?[??nq?-x?????.???vju?,6i0?? ?Hy9t?mEN?
?@??w?'C?7?????????}???????|D?j[6>???In?
?P?J??9??	??1?QM7????K??K?Qo?`?n?0?????kN4i?
?
?$F???????6?h?a???P?~???-nW??Q?Lq?1 +Z?K!?Cy?v?v!??T??0q?<??b|?K??Qs???&???Y???,??^?>xLc?{??????r?Z?'<*???)??.???m?????L@???m??F?????y????SwV*7????W
l_?4k?n???? ???M5???Z???	??Y?0??}q???
>?bw68?}.M????X??#ZY?nD?y? n?q[??7p
?2?0?r0?O?1?wc\?>5?2??l?J:???K??????"c??W'k?????\1]S?{???Xd(?'g"DHuK]?N?=?c???"`???{2??????r???6%y}h??G?E????I??R??M?????0??????r?7?mzUb?X[???????WNN??9(21$???;?e???w?r????q???}??_?7??q?SR?dE%e?X* ??)?????/??z??Ck???????8'`????K,H????????[?.|?????)9??*??uO??t?<R???????*?T??N?>O???w+Jb?`??m?_??k?????$V%?
8`?h?!&?$?KD??a??%?4?iEzA????B??T!9js??Y?_
?h?h@???o"?:A????????S??????D&/???}?s??S?V?V??????@A????d?	
??-?P????v?z3a?????
???????????"?KD???
?{???M???k]-&????E??;?Xu???$O:`?????5l ?o?[???
??U7g??=??C?g?RkP??|???d?l1???k+??8T??r???M?F?Na?`???a????fAK??}?U????u0	xEd??H??Ze?.??XY??<??f?h?QOd?nFdI?]???Q?xe???W??EI>??r?Y?OL?
FG?4*\?ny?<-OS??1C??>p???????W1_6???^?HY??i_$??????~,??????!3??????Y?
????????5???MO??
)???????vY??????z8? W??????L6[?[2v?)??oP???l??4XA???????|Q?h?>\??????n?`KF ?YA6=??@E???????hi@?????p??D?????-???V???T??mJO?
sM?q?????A???S\?????'O??3??j?A?9?`????x?0?df=?0??????D??$?$?????=B?$^p??e??????E?????
1?@??\?:?HQ?W??gd?:?	?W????i??3?,(??Hg!?0?	C??q??hS??

???pg{k?UR???E
?ml?????;??I???'82???????{w????lm?????dl~?}????????"6>y
G??nvmuk{?????o???;j?V??l??T??}J?V????es??+N??^{?
1??Vv??????[klSXMmEY??H?q\??9%w??f3?#V????h$B??r%Z^??kC?p?|?:	A6?3V??X????d?q??~?
??????Wa??2??f*	?%9???)??7??p?J??|m6???%NY??9??c?I??
s???K?8?X???
???3)&???q1??????N???:ZT?3??I
??_?e?3??1?<??q?_?$?a?E??	?D?2#hL~? ???????4:1v??Vwe?B?D??*H0??????
?????\?Q##1:?ch?q??L?s?,J?%?????en?H?*v]9&?'?0n?n?????nc???
G??%*?;??????zI]??)?;??zg*?????>T'l???#?
????kRZ<?4:kV?S7?1O(?3?L?F?!??}a8?q???|?lB??.???????(??"????V?D?0?????7Z?????	?=?(
?????}?
S????Jg?xa??t??s?`?b0???Tu?&o?@!v???'?s????f???C?????
???j:??a?3LZ?U? K?G?;?B7?A??????????	?H?l??U?_??????m???????
z
Y4?U??\@??W=?Q?U???\???
.??Z?a??v?|???lz?F??Mo?2v&o???Jc??ZK
?q???3?HZa
j?\b?:hey??????r???N?[??T????M?l??????v?#??`J?0?M?
{f?gU?g6v????JZ???????h??k???-xpG?N}{S?x?
??_??
?v?;)	C2??.{KR??T]???C?
?<~I*1????q?q?F???c?4?D$b?7??kt?????SU+iK8ttx???WmvO7?b1z?&??2????+?9?"|'?[v
?LT?+???????+??\?)ot?o???V???13??T?[S?kI????t??d?9y1S-??L??????Ebav?Q?v??u-????r????r3.???????P*#?a?7????`??\?????A
!??6D???p????B?K?5?7K.k?
C???z?+?????>>Xo???w&m8%?7??K???C"d?	????
?m:.
K??i*+V??????5?????RQ??\;s??e{??&???k3C??j
~?l>N?2g??E?FX?????k??gpzM?MOUV???	R\=0	????????{??:I??8B????#S??????(??_??3U???`?Pb?\l????c??NlD??O??????	8_=???`?'?
8y?$
 O?d(??0?|1??bt??P??[??y???LfNS
???Q)T??@"qU?8????3?J??$?

???
i?UW?t???E]??'?$?Z(S
??.-%39??I>?????????'???\?????(#1?n????????!<K?
?
?L??u??`+??\?#"????"vs
0?????t??S?v?W???S????_4????W?Z?hI??IdQqZu?EkUj|???$O??&8?1cI?A=???U?????|3a????P??9U?!Z????,x\?=???gB
??2f????0??????V^|Q??@?(-??>???i?
??????re)wn#???$n?#??e=???us?y????38?	?Q?3-`?^SvnZK?}?6????}?&ap??8":???(N??N?f??>t????T?DNW??
?
????K??????Id?M?5??i???$&m0!?;WP????L????T{?e?????\>?&?1??l.R?l??t8x?;aNGN(k":^0??`08?a!??????GO?]?y<???`
C??????S????????x(?4n?s?z?j?F^x??08*q?4????2?y??%]?V?????LY ???r?????|n??B?Z
M?W??b????k,N????????vq
???bOW("64s<?o{Zg[?g(
?? V%5!a??????????O?!?s??i??????f?V????j'<??????A/"6?"???A??(????p?Pm
??-x/vl?g+J??9CY???fHO?^0<A??n\???h'?????5%V3?$P?4B>h0???0?3ES???0z?
??i??
G7?ke61.??3??.Y1t
??C
aL??6?2N?????4???>ij??0-L'??h-;???a at w0?0`??q3?dF"???P?????ja8n???(?????R??;	?Ym?0"h
???{?he?:???
i??9+?9
&???]?\m???c(?-?V???9?????Mo???7??u ?A?)?????????d??5??m??v??????v&???NIZ???
?????????0?? ??X???"v???k?=?????????4?[?y?
??????%h=?????y????
^???v???^}g??????V???~P???B?u???M

<?????r????ru?ZU??GA+??T????o??E?q????	&
}???Nkv{?????[Pq?~??[
e???v?jw<??#?]?{??4S+??@(V{-??S????&l?/??`k????L????3|?s0???Ed?r??D"4?M?v??????\49D????P??[F?????
?T?#;?????B??
?2?w'??l9?E????dt?
U?*Pb????5#acv????1&Mkw?
?R?j??E??eT???@\$?9j??O??~;?rW??K??]?
????'?
??#?b4[?U??2?%4??$?tE69???d0!??X?S?(EQG??G??X?F?e?|??m?????????tq? ?Eh
?7!k?[??A?%?J#
`??H?%???a??a$kU??}??"??&K2p|??#???<
???s?????gl??%??Hs?%Y&
L???,
??K?C.?????D?	p
??s.d??.	?ZR?Vf??x?t?e?????.?=?=???[?i?]
?,O?}???-e??0??{<??I????? ??[jz?_?T??Q?cT?H(?
?? ???
??z4?Mg??'??fhE??58?]???z????7?}????HZnM?H????^???????on???@?X??????m???j??vZ??????n`V?D~?/?3{?;{?5sy???{7.?????K??Q?+?g??*?4bH+:
QK? ?]i?A??x.?g.??3?A%?<D6?p?
k8N???$}?0j?i?)??5?????D?A?(?"????(??M?v??ICF?????X}	N???
??Q?]???N?q5??h?n`
w???S at q?pN\+?u?]????;x?? #pa?d2QjK??(?uG?o
???k??%QDk??C	r?G?x?y"h?
??|Os??u????<+{??Z?n??D
M`?7?A??x??B?s??l??????KJ;z????p:-|?B?q+%???????|?HI?0?Q?[?pI=???XE?R????QI???N???D?)G
f`'h??????@G??w#?]??G=?Z?"PH%?!"?fr`N?????????????c??+N7?\e7?
?yu:????fxNf?j?????)??;E?????e??R%	Es#~&Vc
Wn????G?r??L?????f??jlR?*????-2??u??	?G??????j????f?j??im??+.u?OB?f?????T??:????hq????.??-
??l???????? ??N`?)??#Z????L????m??iD9
?Jv?nIp??|R?U??7???y???~?'??L~U??&L????D??????T(????:???*?
??????	??yE?Z?????B????G???????Z?}5 ??w+?XAr?x?x?g?????508@??A4 _I??%?[U??@?c?m?S|?????)~?|i???????aA*3??????????4H]?:?}4???F???aYQ9A??
20mf?Qcq?4????(/?L`??#??5?????(??????
???$e???hI?2?Y?%kod>v5?%?
??a??[??M|????M???|)??S{?0???????[?O???^3???????("Y1????>???X??[?h???Hc?
?B???<??q?
???????x4~?
?FCb??vW)DEIIfH4D?[???21??%-??	?$M1?t>??1u??~??0]IY?dO??eS]??|L???SG??*??i???`w?g?O?x~????XB?mQ??h?,<u?0???ppH???;t?$???????????
?
??+?}?"?
?
?
?`????
?-???bi?>?j??X??L?G??9?9??h?aE]!H1?4&??|Qp?$l-????2?????7??n/?????.?1%??????>r?[?^??2?N?oh|M4???+?????????AVG
 P???J?"?????:?c???J?$????~?
ea?U?@z??K?????Q?DZ
?h????*%?L?!u|ut5?K?]?e?;??_??!?????*?? ?5??GY
????0G~???Z-??.??2??>?E??u????????SW???r???c??
?,T?T
S??_S???????sI???:??83?M???K????yj?%??3?	ReB???4?I?n$H??9$GgJ?O?'I??T??9h?d8I*?bL???7V,?%??'?
O??
:>w??b7?e?iU(?"???<?h??&?b??k??????????)??{&??U??Dp???"??ZP????vN)?)? 
???)??5az1?O??<???\????H\BF&??Rm??gv??<??@Z?N?=??D??Y?JJ??`0ok~~	????_???<B??y_y/?&.??V?????-.+&?f??4??4???^????`~???]u"????1?_??g?b???sF?
?????|??x???????Z\??{???
?8?o?a?R??T?E?`g?%?\?T(?S??
f??O~I	??6???????`|?*????????x?C?????>?D?????u
?~m???D?BgWd?b?qx8????'kB???z????p\???A'j????????
?NEm???rG???_????Q??U???j?i????=S
?P?????y$?tJ?41PU??97?<?7?????g{????p??-?s??5#>qL??6e&??M?zF???v??d?g?p^?^????^3_P?a???;?!?f0]p??jSq??
? ?5]?????Z(E?('???ee?$??0??z???????	?K??J?H^?E???/aP?9u	????@????????NO??K6??[?K7H9??~?*/??:P???~R'?,???sVh_???Dx^ ??????<?4
<YM?*??????aq??????`??6OvG?@f ??H>??F?Xa:????t??r???!?]<My?2?j?p?qU]
?32 ?N?v??>??????
z????6Wf??^??7?M?e?L??m??????a?5?M?j|?9?U?j??Q??q|??N	d????3?]??d?]???|kygn?q?d??B_???2?????b?^V?	?1???O?,HuK]?N?6?c`??"?`???{2?lS3+???d;r3l?~Mf???bl4?k>j?&QQ
??????;c?)%L
?C??? ??n??B"?>E*????r???`??y??!M??X?l?h?!??V.?[7.??`???V?+?f?*w:%E?=8???c??XSt???v1_?S?D?e???xG?;A??&?	?m??????&3>?M????????E%?YQ?;??????G???y????Y??;??<%??}V?X????=~?6?A???????+`?Y ???3$wC?PMOi??m??.??>O?
uZR????????0?x?*?iV?s?8??,g?????B?8?
???d2%N???Q????A?M?7??????d???|????????h_??\?"???4???????????l????to?y??+:? ??z?*"&?@??9??!?+?e ?4s????R?\S&a??'?v?
??'?%??xe+`JQ<????P8"??}?+??=??C?&?D??6??c?)h???9??????kM???-7???4?o???vlXxC8?8p?A??"??a???Ac?8?CS??$?/???b?.j5???N
#?U???U??R??S$???
%??m????I???M?5)HR?APU??;g???R????Cc???;[??\}?j1??sU???k,9?????I?-????ij?9?u`UL?}??M?C??????~?{
??b~6??????6?f?	Y??$_<M?0?{?o?NN???5????~???ny??????nk	)#$?x??Q???d?E?%c??: |BAyF?m??	+h???T???W
?????Q?4?T[2?
???p?*?%??F??K?H2?t_P???O_?8g?$????????b????p??%$`??:O??0xI???????}????h:C???????P
???????}G???z
oi??U)Z
OW?x??J2??v$??=\?\l3#???????????I?Rw?f??	2
??Fq??b?b1??$K=??
??D:$??&?`???
?R-?
?Po?T??w??6?Q%U^\\???KF?SU??}+a?N????G?#??L??I?If?gg????????mS7?????????
???)??
?q?????gw?????-M??u???????k?.??"W?Z????'??????6F;'????'(p?LH?k?F\
?;?C??5%?o????&'5M?E??H:t\a??C?*?)????5??k??x?{???????7?$?f???*p?a?a?3	{????{W??????????g??????Z??2&????	?p??P?????:?@?}`?X`cNT}??:p???j????
i??g????m??px????c???????V?Y?G???J?F??((	J?SqnN???3?c?????G?Zg???
???3)q
?????W;???9J???G??d?#?e?????3L?J???z??wc????	????jM?N?E?K8\
?????l???
??z?9?u#??s??	????????????)Y?????R??e"X??X??P??B?%n?Cl??/??*?;??????zI]?j(?;??z?R???-n^u??H??}??@&?kRZ<??:?U??;q???g?_2oW4vh????CO?#5?h???g??dt??D?%t?j?aw??Ia]????@nx?V4???xCb???5?#?o??????\m???Db???}|????a?{1???A??W??v??[?wF????
??
c0E?=?\????r)??Kv?E???5=&??!???M???a??,?r???.?P?E???%?~,j??,?}??/??????ruBjF9?	U0\?????Q??<?Q?%??0#pYP2;??;??h?:e???'/*??	??v???G??0;?\??q?,?F&?}??]????sE?,n?lC??t???99???B,8???i,??????????=?1?:??k???:????(???????U??T02?}mO}??|
??L??lN= ?R[/m?<q~?e??n?@d(?????Dx??H@??"]??w?
?r?
?C/W???a8?/;%)??~?f?S???3?|?Wl
?>P<?6?s??u8Ff?WV?I??N?s-???dd??^?H h?o_?d??'?A??bCW?>>&?K?????Ti?R&J?*?
0H?&&{KH?l^???{??#?-??Z93??2V??GdV;D?<??1???e??v4?1'/??g???~??V?u$??_'?N{??d`??G?1?h?bho??B49\>`??T?s?I?AS`}TdD?rdj?g<?@Y????| g????E?$?[+??Xy?E????U?W}??L0F??R_Rdy?
???????j????\?x??????q?~??:???Z<s??,???.V??+S?M?o?{?,?????>?9w?ty?Rh)]2 ???
??$?8d?[)?????	??`?T????I?/?
?m+"5??8???}??<??R/????:?v?oi???O:r?????
<),?>n??W_y!?????P?0?Jj?=Wm??h?0H??w??e??!??)?????b????Q?j4F?V??s}r???Z%m[ZR???E???SFL??<??R?z	???-?
m?@?ZL?4Mt?y???Z\????}r|??Ya?\??V?Fq?????\0???0?Ve??j????k?Y?????D?
i]v??,?n?Z[??j???????m
?????????a?k&??!<5??>?X?U?~]-U0?vU][??Ik &??a?,?????#
?Oo	??9J?????_???F??k???D+?E?OW\????RU???k8e???VY??T?D)?N???????A??Rr6e??$?-\???@?
(S?}y???????2??_???*??????????2?o'??Y??????7S?_????S????Q?QF???T0_JR????U??#S?????u?????Nk8????'?g?g??l????????*?arI???)^S|???|??????7?????o??~???????*e??rd?????Gz?3?5???2?c3*??/L(????u???	?oLx^???
??/M????O|?~k?O??v??}?|????D?/N??a
??x?U)S??y0%
x:lvP?H}T at M??l?^???Vg??W????y??k?E???F????????q?????????x?y?????N?????u??y?{???:??v????{?s???<?Q???O???wo|???????~???????????????????\????/?l?\?GX?~?????o???#????????????o???:????7??~?~?w?7???M??[?????+???????????7?????^???????06??[?????;???C???o?<6>????G??????????G4?o????X??V?????_??/????gv???????o}?3???6?????~??F?r????7?
Z??????v????~p>????s8?:L?????_????=x???????g>??V?U??~T?C??G~o??n|???
???????o??d??????n~????????_US???????????	/???p???6>???u???f?OV???????[????????????o????W?	!????????X?????????o|??_????????G_{??y???????M??6??Q????7??I??vr7???+
??????????q???}??;S?<??+????<rHx??$g?c?????????Oh??/o?D?~??t?d??'-??T?>`?#<{????????/??W??i??????????????}vrj????[?A????V?????|I????????9@?????=?_?%4?/?	??Y??3?A?S?7?d???{?WCO????????????/??
????\???_S??QC????!ut?&t????6?sC1?<????a?3?I?O?$~#??Q?
G?*Q?????D7u7??g4?R?
?@7?u???
h??2????b??04???????W?4?zk???n?P?'B55???$??)&n?
C?~W??UO????GSL.?oC2?'
?	S??oN1`u?HQ???t?+????????????&???#?O9??????O>L40e????&4?O??^?
???%i???.??????
????p??3??kS?~?????+
'*$??%pt<???????2?????3)M?/??w?	?3X???????M????????????V????e?O???M?
??V3???FN??????M?????????????5??R?????D??k??0?I?????????3%?????GSi??????d??4?ku??????M<O??4????*aE?
?ov*M?.M??w?
??a????N?|K?C?{??=<???????????_|?b???????G????
?$???'?a??????????z??6?2?<#=,_?}>???\?5??>)t+?-??/>??	?x?:
p???dk|%?~?R?RoQ?????a?xc{?"?b?:??3;?????^??E?
 ?gh?+H?/??9l?
-?????<??@UU?????p?	=??e?-????/??????????????
[e2?l
#????:R?????m?kv?{?????9??P?b0??????@?
??*??Vx?y???U?^?y+_D???73r
?]?U???p9.????????6L^???????':????!????l?HP?G?`@A??s?Z@?9k?Fk??r??`???q~h"????1?;???y???Z?O??g??^??G??5??
?@)}???7????`???l?}?????3j?{?H;??&??????F???Q>??????I?????^xl????}b???q??5?v?lR?l??<k???ar???????????i??Y)??|??qS?#?T?J??u=??]?9???B?xd???h?9I??b?7E??I?o???D?
+?;?;?$DC??[?Ee.??L??@m?lEj???a?.???x??+???=O'C????s ??Z??$??????S{`q?+IZKB??>\eti&??????????!F
b?.?da????d?9?????S:???~v!?3??\?LZ??z??Na<??ufjK?s??B?|?Q??)?Y
?`?]?^????7`q??'N1sKk??gk?A??h?w?y?3??,???
???",sl?/??F??????H?/??O
 
7???~?6O??????8????(
??]~????oh?#b?Y??S?^?\i:4??YXL??t!??[?????,r?@3??X??=??\q??2?Dc?????-?3H??zF9y?QE@%??@??E?d!
?t&?a?"
???ytb{?xv???fr?
{
H?fz?r3?;:???x??W??V???????k?j?C??
}A?U??>	?T???j?
?:;;?{??hcN
??d?)?_?iD,????S7?3??w?g5?K???s??????????????????=5N?W??s????????TS?k??~'hJ???{?????}???????x??=?Id?????6E?^Y??S???."?FA?+:
F?????A?`????c:??y??{??#?????x%?{???2WL(?
??S?jLK?????vad?p?U@?;nz??Q?W????Y`*.??7"??w/??????{?i
H?JL0??I??e?I????:qd#h????8?{h at ak?v?>g"$??[??o?u?x??s??J?C??????JxF$?UI%U~???)?????I,O???9?
????A????pN???"?8?;
???_?C????C7?l?<?^<?
?o
Y????7}?????f????K???g?????Zy-N??*W8?S??P??_\Z$????K??O??&??Ty???S???o??X??!???^??=??6????7v??%??????u??????0??[?.r?????lX??????}?%?D?????17??vR?^??)???_???T???D& ?V??????Z?W??o?Ckp??9J?5{t?Kf??
????X-?;S ????Q/p??FP$|2?????BKlo?_?????T0??_O?"??y`M?lcss??'?????u`???l??W??Cq\U?eZ?{??w?]]?@????-??????????????[??????^z???v^?????[?????6??S_??#????^w???
?????;???oo?o;ww??[??m?mg{oC???????)???|?????_?,,??oe?\?-Vk?o
???????!??h?1Y-{??w?b??X??N?D?h'???sd?????????e^Y?9`?ch?}tAl??C?i?s?
Rl]L??b.???X95Qs+!???*JI?L????) Kl??G??8#??f9??u??!??A'?$?????H?n??#J??????bpo???AIVL?e?b?\?Z?=???
J?.???|??E?w???Fc-?]?[??g?????????M??/???3??Wz$????
??? .??,	?E???J|????q??_?ElMz?4??i$E?B?3???LJ?W}????tnY?`?@??D??-Z5(8Sy??)&??W??~M??????????n??6?????h?y?o?%]-????
]1h?zmX@?M6?
h"z????	
?a{` ????$J	??????)??A7????zn?Y~?h%C????g???????39?.*?????7&????}?B? ?ZW?L??H??4?K??{;c.eZ??l??NvD???I/?d??-??E?1??E??|<?o??V?????>N??*???J
??????Rmq???J?%??i|?'~????U?Y?T???P??G>oi???^W?8???Z./
???????*???)?;?^s?????6???????px?*9?Q????m???????=??P?D?)S'2???7?(q??9v?????nd0t~??Mg
t????w:!??;??	3i??_?w????D??v??????]l?????W???o???
?y`??|????j ???J?1ApB#d7D?;?K?-?;l??%??Kx?B???xeL?8?o????t??a??C???0/!????n???64?=[k?z?w???????MXrv"o???TA?{x??-t??AoBx??%??v<???a3??#?d@??3nZ??;??a?T?2???:?6?????Fz??h???a??C??n??<?
?????pP??x
?D???~?y?0z???q?S???c???????bV{m?Y]e?&yW?t???4a??h?/|2? q????|<[??6??tJ???
C?7?]p?
tR??!??1i?xyX?g`?1??"
???q?{?^???:x$?s??0G?????????fFj??R???
N#<???}???????X!jnu1?&:"Q?n???}?M0?	?????(???3?'???z?6'zk1*?Ak? ??0IV?9'2(3?2????LZFGCKpKP?+?0*?~k?1k??pk?1?|????G4?,$R?8??s
b???h???z????8???.D;?kh@)"??# ?#ID?X(?????????43?D????&M	??K
r??????*}Z1?Ivf?h?Gd?PB???&???D??=?J?x??|?toc/?G??r?P?	MJ??gO????_I3?33??p?G??m8???'???B?[}:?????I^???p???i?t??????#1Wo&N^?9:E`?C??ML??!?
?????3??N>y??eL9?"-W7H??$_aA??-E?X??'?V??Y?
m??f?=??,??<??>J^ ??a????&????N?
4Y???0'.Q

O#xD*3?9???d????l?Ch??<}????w:f%
0??"?X???K?I??VY?8???????Tc/?{?>Q??n???F\m8??P???????o?n=????,Rl?u???%-?
n???
?????
?#%?
??(<???r???8O?^??$????4??m?8?u?=k???q??]?8,?Az???7$!	#Z6u\??,H	$z???????#??ETv??????'?oKw???1?Ci??!Qpl??-?=???n4??.U[???f?;????9?w ?F??1??-?Q
??"k_??	T???
? ?t??(8d"/?
?U?g??FXB?dY???????????Q?????`?X?D
????%?}?	?Z,??*???"?my?
?z?Wt6??k?!?????	?GN"?MB*
R??K(???e?*
Yc!???q???.*m??v&QD?d??O?$Sm?????????
???c?ZKx??!#??s???q.?]	?I!??"??,"???V*k??4?0???H??Iwe?V??%?v6?i?Z??9?F??id??\U?o?????m???R4?vV?????7I??.`?[:N*???u??????
??
?4?7
?????????)?????"?aT????K?.?Bu?????r??[4?n??Wo?,?????!?GZT?H?b%?m???>)?h?,??????qw?????I??? ??ifV?U??(?}#????T?l>?[?VEH?_k&ux???????}??,?,?Yh???j?Z9Gw????H?$u??0^
??
?b???4?	??????L????zW?"??yrx????	$?o??%??$??i?C?2??W?23??????I?7??????}?+??HV7a??'&????ci?p?i5??????%w??t/?????t?l?Xx]?Q??C???????????0????;??`??EcA?i"???jP4{?????D~???P??B?????R??
???\?!???s[?a??
??1?????a???p??l??????U?/??0?`u?????'?????Doh??x????\d??y;???r/?X?j?S??pI????#??J?{?J1kM0??a???ga?\s?rMC??
????????&
D????B~????D?Ek#?yX:"??
?$?h??????'?w??K?r?+?????P?%A`??
???H%0	(??1q?j???bPS?
??Q???fbEI?hI??0?:hw??61??
?T?dP?	.HX???????RK???dp"w?VC#. ?D??b;a?2???C??%zn????K?VM/L?GA|?U@??s?|?A?L?xYF??~?;??=i????;???????.R8?? ??xq6?a=<+
???P??y
9??k?48???????"???_???y??w??
i??
?V?0????<O?v??#
?x5???w?TJ??;?:R??s/????6?#? ???b????2??V?2kF?,[e?
?D:??=
c??????s????	?3??PD?25b??G?????^hV >???f?K(??1
)q?r?S???dKdX?~ON?\????{?!???~???
M??Y???a??????Pb)@?SD??	>;???.???g???(??Ek?9@???93HH??R???f3?u?(J???Q\?a3b?@???^?5a?>??f?9?g?%4??x`??	?@?1???F~??!==a)E?+$m?y=??Z2???Y?S\$*??p?Cc?L?s?
wKQ?7[???????b?/?f??
?;??????8!v??b??h????r?"???P?j??n???0?,??ZeSkd?"?2?]
u.j??0G???????9??I?.+??k????pf????l?eL?4??y?c}
_?dT????	???	?PO?B??m:0d???Z?H?]#???2?Q?%:]
?????8?
?;?d`??H?????r???`?w?^*???4??c?s;x?'?E?<?C?m?ZPi?{<???cbE?
U??gW???W?pR?^?????	??q?(%???xl|?+?m???+??M?h}a?(y?8??l???	Qj&?20?02ld&?#????A
?$g?<?[c??T?E6?p?=j?x
|???"?@7?8FJMV??b??!??B??
??a
?A???k? w?9?]?V??7?a/J?&?0????/?mk??r\?H???Ba??VZ?????
"????O??Box???c4U???\6?????????*?q???i*??}6]W&?*?y?i]m?$???A?9h??
?H???.?z)R??b5????k=?*?-??,????A???[ ??KL>????b??jG???
<??????@AN????BR?I?Xo??
;mcH??3[H?B6???????:f??;??<??r????;l?G>??&Z7?????.h?q?6$&???
?Ys???s?=37{&Qe?a^???
???r??6??
?sI?9?]?w-9R at 1?D7?cp???N?{x-B??????ZK?j?????Z??w??t???
???K?????qV?q????
??5i?	????F5`?vr????6?3?k??*?<[??N??K?<?U?tA??s???V??
???w??H?@b??}RNto????*
:R?!?$???K????@z??3?h???,??????'?????E?,???9R???>?-G??	X"??Z3k?+?E?c?C!NbV??q?'????-??R??&??????^?$&?N?????C?????v?7???2?'?6}?
y??v?????h#8?c?({?
?U$/
a??ad??eH?x?????
?L?^???u1H"i??&????D??0:)m??5I#?XU??V?cXFS_B?wS??o?/????????????(??Dd???8`??Z???m?F??U??2??z9I?????E????
0??^?+y??pkqV?o=n'?????\l?
??9:&????5$0???TZEXYl,9?hH|T??k??	?????)???FF???E4#?00???-aU7a??v?"~?5??A?<??-???p?????v1
/??=?????	`??L4??'??R????*h/??2??M?w!??"?????M?q??3?????????d???v??10H}?`u1????`*?0bKZ?????	?????E5?3??????e'??@??[?`???o
.???A?"?|s
?c?g?\g???
#??9?!???,?H8?a????{WGU?d
]????????E\M{$+A?E??l?'?{NH?b?
?3???t
?I??\rg???+1????h?uC??nBk?????i??-Z9.??u:h?????j?[s??????<(V?Y??oS{?W????7/g6*%"rS$?Ph?
?
Mg?????\1??-????[bz1r????????0:??}!s?y
Z?UB?????2r3???????J?????{?%?%???{9???|d C??????$/??"?z????@76?6?R?&???'?Yn!}?c??g\???a?x0xy?Zm(9??^?m?z?5 at FJ?;?7??:A??<???'6K?p???:?%{?e,?I?q&??2?S?%1 ?B,????pCb?????>???0???c?h_??
_??2?g????????N????/?0QG???X?,???^??x?W?y????D'?[d???/3"??w!DY??[??<j?Px???y???!s?$?S?U?^?!?????????:????u?Pc?#?F72??????M??9?A?v??j????3w?$q???;W$?????-M?8?@?????k?k???????E^????K???!?X@??z?????	?i8.`?;c?x)&?*&^??S0?:aL????????L,.???m4?J??"o#???b}?&n???3???G>??Ob???"??????????I?????cB??[v,?qL??t????z?P?0???g,LK3???O???.}??t???>;?B|?a???%?-{R?S	?
[???e#?c:??K?M??r??a???I?J*?Yu_???!?z?u????&?2??2]?	???????s?F?$76>xr?????Mh!???v?;j~???x%m0?rK???{???'l9?8??T???5Z?p|??)L??????%}R??????
?\?]??K?L???A?B???k?$PJ9??C?o?y??DO
?^?8?x?:M{???*????WOU at W
??????v??^??????N?j?3?1s<??!?>N?Ad.r????p-e???;?r??6?G?8?%??e???Y??-???P?X}\??)?O??D?D?GrP4?_?G#????E|)?(??'$??.N&?\O????%J????={
;rR???????{??am???y??_A2n`??????l?>a??yi?p????,+???aT`???a??*{?M4Nu$?7#?+????Na??nR?E??tIR??=?i??????9???
??Cv]	?
?q?Y?6?4{?&??oT??,4?6'?+ ????c-kA	??K)??????0?[?Z???Y
t?fBik_36}`????UG?s%??4???J??????
?QYT>??z??]0?G?p??6?
?a]M??c??aDGJxB??Y!?????????!?/??/qR|a?:?A?l?????0O2??5A??Q'K!????<T??!????x0Y?4???A??????
?'?G?????~.???-?^?P?????^B?8???M<{????5?#???n????t;????"?????1A-Y??R&????KV?^???CX-??????"Z?Q?O
&7?;>?S??
?kYu??Q?????^*2???!R??j*h???/)?????
b3
~?Ti???%????u??
y]??1?????2.???q?,??u??\?S?T$]?
?(???d]xP2"8]4?????:S????cn4?Jm-?-??y)VQ???????

C???{$	Cd??'?i?e??????_?;?h9???zu?/$8?oL?	2]??F?^
2?1.t)"??v???:???cv???x??=P3?????H]F?b#g??g?*???Y??
???
??K	??iR.B?l?
?k0??=)c!?3?????_
p0???????????02??b?h?^$??(??+????C9t8?	ua?1O??v??4zl82*1?Mc?:??.?c`Ac??3??b??AcB?|???r	X?E??NV?i?:R|?KilIM?;G?3!?????J?0gF?? ?#??`???,??
???pBn???f?&??5k??-?n??Of|???9x??vw???yr??
?D8eU?q??3;??	1???????X?)????j???|8:z}?1H?u]C???1?I??-3	????L\k???Z??\??~???j8?B?]B?e1??gX?g?T??4-1?e???CJ&v??4?Q???3?????UcWmm???;;?[{??;?;?B??????z?????w???????_???????????V???l??????????9?????=?p????????????[?
?-?p?????K
?m?g?qwc/????^??Us?;UT?Ww??]?[???;&?_??a????????=3???h?????zI??P???;??]
?
k?- r?:??F@???}?3w??w)???.b`n}uoU?????:???o
?h????=????%??f?
???????xcg=?7????????$?a??
?Ef?pL?N?=A???	?H?s??:????????~ ?=?:??3t&f
I=? ?X???;?
h??LQ?b8??a]3>????2???uZ%?9??6-??-`Ve
O??-?Z??Ami??%V?v???
n??????????6???ZE?=t?qC?`?????????|?~?Fa??`??+07???r?XYw\eKIS9?l%@xG9?????&E??vDq9???????M????wb
943?t?????????;?$?Lk*??F'??_????Wgms??l???a?a????????)?h????W??
?X?8????kPy`?
?8Q?$????d????t????
_?a?1h???????>? S\2{??mg????D?@??????????fS???f???????r?s?\nn??)?????(??Q0???Z\?e=U??{4l=Z6???8??
??????*????
M?P\????*?????_UE?g????~?"-????E??QQ????r!????y????m?????+??F?)
R)?{n???s[?S?/???p?4~??{?m?^^?3D??
??~A]??07?|!/??P?k?????0dq??qhc??U+cq?T????uAZ???J?GssMZ1\Phr??????j'<F9V????$
??n+?????6????0?a$???^????[?7???A???{;?S??? ????P?M????0xp?Q?%ya?eN????j?NenN???Ez-h~]"???y`???w?c??Np??????O?o?R?????????jy??
|Y????a??:??Y???~????d??=i?????<
????t]8^??N?F?H??AX???+??s'?RM??j:
?????|???B??????wv?N?F?\????XXIJ U ?P?v??$?_p4b???3P?%F?}P
??9/h?o?OFx?g???
?ss?
?@?{?t??QmJ??~??2^????*???p-X4???M21!??L|M7
?
40
K?{????#?t	???7C??[U1??????:?`3T^~C?&?????:A?????R??VDx0><?(<?j?Fx?,8??F'???P^?vD?b?:Z??K?k_q\3??x3H????i??l;?r??jV?e?L/?f??1????????7D?f,m??qg???X???+f/mk???YM?*1??OxX\*?9??
??jyfM??6Os??ND7??;??x?s4NL????P????
y?`??n??j?$?????}??u4?	??/8?????5?
a??
7?3?|[???4???
??
:???(5r?b4?Z6 ???7??
D????f?v*??S????%??o|??}j?j??????7&??
???{
???
?{?N??
,??
Z?4?,?@,jE???p9w6???}?-}?f???|?m\?,?%??[??F??q_PY?F??????<%?J,??':??gz?c,82?D:?D?/:??j??(3????w?y?bY
?!?_?
???Srf=?0????nAV???J2!f???x??v??b??B^q3?v{?x??A????br-??
Ldc?I??I??gq
u???????]???5???W??P???C
@??/!?rE????W???a????Xau??=?p8??Nf<?0???Z??p????lom??J????@U7U?c??w???x?:^??P?9=?>??x??NNr0?Cw8;???p??????M?????o???8?w???s??\???8tw?ma*????u????{0??
?????
?5??\c??.??n}?|[??????%?????????????u?ls?jw?CueE??B????????????/?Ww??????N?~?????\???w??????&?}{{K????7}n?????*?????Ck???][????A5???????i[Y#??R}??)??XQk???]??-?8??{?IE
?7c?'om@`v?????yT?-&?
Ql????2Nr<??????e??p?y?#?0?e??@? ??
Fjc??IJ??]L??dr?g@?????\F[??O?_??G?,cR/H<?`????)?-w-????Wm'??????x?n??n????;??L5
?D#GWS,~????
nQ??j69?*??#%NY??9?E?G?Xb\?<Gz????<?P??!0????c?E at P???4????I?QG??7?gI?6??+?~e?1????}~??Lsx??`?mu???:3???h??d??>Q?U??KN2?w?????PN???|5j7$??Fr9G?l???hrM???)Y???c5??e?:?????????????M?=
Y???*?;??????zI]?j(?;??y??=??7?:a{?LxR???
	'?5)-?J(??????P?'???2H?v^c?&????0???J?N>3y??"AFk?????V??"????V?8?p??)&?x???
?Gd?q??N?e
???/d.1`
3??T?2_??}|?Q??a?{1???A??W??v??[?$c^??????9?????	J??J????n}7???b;?k?S??V?h?
?4I4???S9?qpH??n?Fna??{s>?F?????}?!??sswC?llT0??
?SyOp$????D???B,?L?B????f????2???????B??????????i????4?y?????Yd??19JN??B?g??b?W??xLY
?P4????z"?????8??1?oR??? ?N??Tr???????'LF??/x? _pg??.??gu?2??????*?/?????}?f??k???1??P???l?j???s`7?&??m????l???]???H3?~7????c?h??????[?w???????K?8???r?l?@?nGOV?r??t??F?????p?:????`+?)??
nb??V????g+B?^???\?'??5????*w???? ???????	????r????????????????????????????????????????????????????????????????????????????????.?

--- NEW FILE sslogger.spec ---
%{!?log_dir:%define log_dir /%{_localstatedir}/log/slog}
%{!?sslogger_user:%define sslogger_user slogger}
%{!?sslogger_group:%define sslogger_group sloggers}

Summary: A keystroke logging utility for privileged user escalation
Name: sslogger
Version: 0.9
Release: 50%{?dist}
License: GPLv3+
Group: User Interface/Desktops
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://sslogger.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Requires: bash logrotate 
Requires(pre): shadow-utils util-linux
%description
A keystroke logging utility for privileged user escalation



%pre
getent group sloggers > /dev/null || groupadd  %{sslogger_group} -r &>/dev/null
getent passwd slogger > /dev/null ||/usr/sbin/useradd -c "Privilege keystroke logger"  %{sslogger_user} -s /sbin/nologin -r -M  -g sloggers -d %{log_dir} &>/dev/null

%prep
%setup -q
make clean

%build
export CFLAGS="$RPM_OPT_FLAGS -DLOG_DIR=%{_localstatedir}/log/slog -DCONF_FILE=%{_sysconfdir}/sslogger.conf"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_localstatedir}/log/slog
chmod 750 %{buildroot}/%{_localstatedir}/log/slog
make install DESTDIR=%{buildroot} VERSION=%{version}
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
cp -p sslogger_rotate %{buildroot}%{_sysconfdir}/logrotate.d/sslogger

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/slog
%{_bindir}/sreplay
%attr (6555,%{sslogger_user},%{sslogger_group}) %{_bindir}/sslogger
%attr(775,%{sslogger_user},%{sslogger_group})  %{log_dir}
%config(noreplace) %{_sysconfdir}/sslogger.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sslogger
%{_mandir}/man*/* 
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/TODO
%doc %{_docdir}/%{name}-%{version}/LICENSE

%changelog
* Sun Aug 23 2009 Ed Brand <edbrand at brandint.com> - 0.9-50
- fixed to logrotate

* Tue Jul 14 2009 Ed Brand <edbrand at brandint.com> - 0.9-49
- fixes to specfile: _sysconfdir

* Sat Jul 11 2009 Ed Brand <<edbrand at brandint.com> - 0.9-48
- Misc spec file fixes

* Thu Jul 09 2009 Ed Brand <edbrand at brandint.com> - 0.9-46
- Updates to man pages

* Thu Jul 09 2009 Ed Brand <<edbrand at brandint.com> - 0.9-45
- Fixes to $log_dir permission

* Sun Jul 05 2009 Ed Brand <edbrand at brandint.com> - 0.9-40
- Split man files into slog, sslogger and sreplay
- Chmod 775 $log_dir to allow normal user access
- Add check to slog to disallowe passing '-' when -c option is used

* Tue May 18 2009 Ed Brand <edbrand at brandint.com> - 0.9-32
- removed $global

* Sun Mar 29 2009 Ed Brand <edbrand at brandint.com> - 0.9-30
- Change Licence to GPLv3
- Misc. spec file fixes




From ebrand at fedoraproject.org  Mon Sep 21 02:16:14 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Mon, 21 Sep 2009 02:16:14 +0000 (UTC)
Subject: rpms/sslogger/F-11 sslogger-0.9.tar.gz, NONE, 1.1 sslogger.spec,
	NONE, 1.1
Message-ID: <20090921021614.5E26211C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22587

Added Files:
	sslogger-0.9.tar.gz sslogger.spec 
Log Message:
Original release



--- NEW FILE sslogger-0.9.tar.gz ---
?
2O?A?z~????EY?c?]???^?e3,J??v?u?v??
?????]??x?GI??"i??[???Sa???bV*J??(O?????Z
????	??@
D???}??"??E6
|N}W??
8????Q??c}7"N?7l?A?&D1C?;)!C4??
?x
??}[??/???2?I4??LNp?
?d?gA??ck???????+8<?
?;??~????$?Zq#$,:|??B?K?;?x???>??ONO?~?)????Y????p?????????0?8???
???a???????	8t;[???Y?	@RC?????Fa??;AM???Wc?ND0??M?{?`??E?"1?i?0+X??????WV?"?f"?G1.??!G??????sd?
??x%??q??????^?t??;ud??MA?
j?m???}m?V?jd/\n??_?,?E??C?=uH?
?A ?Y7?z??o???}????#??NH??gaj?C`?????Q7?Z????Poz?n????????yH?{????(????????Q???KiRh>!?G)G??qO ???/g{v7:??+H?(O?????G?@?c?dAjB??h(\I ???&???F?=6?U???I?%[???J6 at 8??d????L?L?@?I?D?
?1???9???kaMjYH????"??(???l?XVPr|R????$$??]uK"?bsf?[???g?tyXf?0???XJy?Q95;~?????4Gn??????????=@yf????Gsf???6b+??(?R?$G???O??????i???$???p!???u>uG?E?v6e?<?Q??84W?f?QQ<????t?????????_??	?q?>?Z??0??\?-q????sTee??cL??M????h??u4?lm???z!???%??!)???"?2,?o??VL???a??#???Q?~^#?f?eN???

?_??7~???)??]"$??RZ?[???#?s???6{Id???KDRT?Y?????TY?F2u"B??1?~NBU4?=???6??\?{?_???^?X???]X	?7?/?G????\?J?z?]%GR u????T??Q??u?cB?/??K#"?]?*?cnw:?????b?fq8????.?,Y?????W6T6?Q?)h?#??)&E?P??????h?9????;?pz?X???+??p?=??Jo??>??u/{?????O????46?q??.?
??R??"?$?nTCmM??i???f)?Z?????]
?s????????????M??-???G????????E?
g;??b?t??#M1??-??D???t ~?S??jI?uj3L?Rm(?M??$0????$?????c1u??????????dT*?$t?HNg?mB???ZC	???????r???jbD??*2<?,???6(?U7`g;????ya,????'??a;??CJJl$0??????Z??A??. ???kFf????????C????<P?YYQ?x?1-??lD;V/??\?]?7N?6??w
]?XeO?!
*1	??????o?f|W?,
?
6?N???/???8???w?? ??a??*e?+
?j?6?U?'??6D????qz????
+?
?^???r??&
?6????V?1?S??????h???z{A{??o?h?q??P
?????$?????,??X
B?????;?????
y??@^c?n&?Anu??'N0??A??
????_???P?_`??EaI?B????M?Nh?????z?\???X???e?L5%j?'~`?VP?????+k??
?YoB+E??c?<?Q???`6$?>v+??(p?S?
&?`?W/1??6??j???r??O?5??[*?@???????i??	?@^Dg??j?lt$??????U??~0?Qr?
???]????g????-w.????KHz?V{???Q????oQ??M?[?W????:?=L?????	2:???x_???g???Y?[^??cUZ?e>????L?2e
?DyT??_?q&???U?????????????Z!???(4?gu?q??Z7???X????c?4?)i??$?v%?F:?????T? ?h????g??Y?!L????y?L?}???\&Y????????????A=??'7-
???8?b?????????B=???|??????hBggg?
??|?|k>??<???t??/>???Gg??>??Nt??c??????:?b1UJ?O?u????[Z;?`?H
-w???Vz?????g???
?s?F?????#u??>??_??r(G??S??????/=8???}?s????W?=????X??E??7Q4
???"???,??N??X??Xon?8?,?(?
WG'???.?i??v?d'???#{Q???_JK'r}K???R???????
??o*pC??#?????,*?????y?)?+??~Y?Wqh>?P?|?Y?|{F???_vXK?^???,{m?[0??		?
W
k?mPm???22??%?K]_]g?????kO???^?0C?&???
?WZ???????Neu?gM??>6?Ds??B??jq?"???????I???lX?+?/?s???C?????
z??y[E??????v{?g#??O)?5	??T
?n?T????(?H??r?0????>??!????E?j??????'???,?#?J?0??E??f*3
;???xD???
???J?@??M9n??*?????0?0*?=?I?
zV????R>avM???X:????#???#?????N3v??<?+Cs????1????f??!?T8ab??O?$???:T???p?A?^??c??????,??????k?'??????c?U?^b????T8z42??9?$???10]?PjvF??y	?????/T?K?s1???N??=?M1?L?C???.?f&u??\(3!?htj????yK?6?aPt)??M???GE\0gS$u,[_zKG.????=V8,
???????????;A?
??
P?]^]X}??$5?5??!?!3S[/???s?qY?c??????=?@??????"?????H???@?^??T?w???jo?Wk?[9??@a|'??<Dz?.{???jNe?b??i???2@??h? ru????i???c?
X?-P%r?{4???[)FS_?????Z?????*Q????U???????]??????fK?k????Q???^?????P}???????8?Y??VVy???c?*?	????b?W?"?????Q"???IS?DE??T??a???H?K?h@)2?????/BX?r.j?n????]ks??????V??<?Ar?\??CYp4?{?^?O?????????????2?b??YX??????0?w4?f?o????????????V??????E?;?C?3nQz/??M??q?81????E???gy????nV^?|??{???~?K??7??J}?y??O?????K??C??3?-??????????*????x??>E???+Ekw???????*!?D*m?o'y??"^?[?!%!??3C?`??
e?]??$>RT?_??N??eB=
?Ni?M1Y????!+C@?;SA??IR??,gl????<=:O??????????d<?????t??	l???|UC?~?B???.??Ja?5???+fb?5(i???hy??i???WD?Q^??
??-A??v????R??*??T??]?~?????
?%Md??o??J{?e????h?o?k?????4p	???5??p?,?V?????q????z?j?Q+??<??T?s??;??F?W??V?f?Qp??=P?e!??<>?????3?T?$#OL?????`
??Iy??z?v?6????O/fzVew???????K?="???9??vb??`???@1??!?[?\?d??R??0"?!_?%Le??Bu???????+????/?/!t
??m
?!i>/<??c????J=???/u?????-?P????oL9???bJ???l?*J-?[
n.?)??=;??UF?N?Z??e_e%??c?U,????A???'?W???m*???????y?_?y?1?C94D?0???(K)?[3??\???m?1F???T?%,?Jt.?`??%*oN??Wg??>?g:?H)V??
?N?#??Q??????9v\_?????q????h
C??x?=R?BQ0?@?)????KX??j????]yW?????OQ?L:6?;?8db?
?16c?YN:?-,????-,?^?7?3i??????&????'?? ??nmw?_??v??g?FAh??????+k}?<v	????I~???8?
I?????????[??V?g?x?W?e???R????O?K??`$G?hq2????E#????$E??1??;???y?{h?dG?06
??`6&???%/??G n???????o?????H?????????_??=??e?_)W?7?k??Fj??*??'}?7??Ge????c????F???
`??b*??Q?M?"s
\?Kc?_K?B?O????!???\?:?q!"???tO???J???~~(?}??B??QP??????N??nG??@?T????c2?LP??/g?:?w?z??r??K?~??-???K?r??-Z&??
>??E8|????Y?V?o?^?~???@/??5?h?5??4???;0r?9?;???h*=?Cq~??_<??q???^T?F`Z5rH?{?/??c????+T2??`#??<@C??	,?a??6?5?OKX????v=/?!*?o?U?%?H??aa??`?L?I?F?[yl5
?F???t<zHkt??~A;?????1<}ND???'?X??0?.x??d?0??g??G!?G;|?(2?J?LPD
w?qz????o??ASUZIm??L?^ e?]XGH???W[9gr?`????F#1????A!?|???w???[?dx????+??
*???a?&???kF@n???*??r~Z??????	YDd?r
W?>???+R??/?p$???	?8jcj?N?jt;??A??2?fR????+'?L?E?)????<9tlRj;?BG?@?fX???<???b?	??ei?,=????%?uJ?X???\\???Y??=??????U??????O????l?t?CKrR??;K???????
????%`??.???'??w????? ?????[d+tZ???\QS^&bP?(G3????'??f?L??7x?w?????)?)????2[?K???$*????????????8Lz?R^?zn?????j?????m??HXIm?8??^pD???)?vkj??????3?2??s9??
ZE
??A"??3?fIjI?<5?8??I??1??!S??(?f?S8??Zf??Bf
zM?	?????/]A?x! ?v.w6_?w????h???????x?>i??KR.?0??M???!@?????`?]$$? ????PE?p?yAC????%(??0uEa*J(??p??R??H?
$?$?1??
??I??`?_D????????_,?2?Ut?o?)???????????.e92?4/????L>????????K?;?A?}??
??#??-?'
?2?
??>?u{JS???h????????M?e?^q_?M?j??4?"L.?????<????m??{T?p??Z??z
??1`??o??????\???J???V??
???^??????0??+????r???V)Vj
?r5?????S????O?????<?????)?K\{?D??)?D???-????r?\.nm?*?5????Z0????j^?k
?????o?!)?pG?k????O?b?-??oH???[????(??Z?
?bP?J?{??Z???????1tg?$?n/?E?!pNY?9?(X8??*>"??f???s?J??"?10
????%?<?????z???#?^??i
??e4??_E?}?!?WB???????0?2??}?????b??	?)?B???????1??$???+?y??5?l??'Q?fZ?M]?]????k??>?????l?????)??^???h???????v??nU?x?????r}[?o?X?????>?v?????K???K???K???K???K???K???K????6x??~?????_?????????
???Y??nW1?????4???\???}HvG?l	 K??????Rpl	??????p??	O??? a
??F-?
?c?g
9????	kOYBV???^???
E=????9
C"Z???j%KP?TYN???????rN?~?
M??T????????????4??
??g????????.N?
??????moW?#?o???res???r??Cu?W??}??boq???pG?n
??@?1?%?
h???\}????C???ZS?????X??H?y[??n??=&?,}?5?R?,?5p??p?i?fn???(??^?????u??}}??????E?gk{;??J???I???I???I???I???????O????O????O??<???
??+??#@7??a???[????????r???:??! Y??Bh?"{?7?7?P?B?/?	?
??? ?
!J????&????
??H?~???Q?OfN??G{??????Q?????xY?}15?	y?0?k???#?[[E??????????P>b???3?O????^?R???Q????fQt????ep:V??eG???I?~jW?????T??????[???X??m?g??L?Nx?o??HI????????QKj?????k
???u?????b?=<l??z???UQ?????????nO??^W???g?A?=?d'????nO??9k
???w?????N?=?oua|}???E?u??C?~7??
????{ ???????????{j?A???????8??????]???A???"1??~Km?????~?T+?o?OB=???x'?P??{Mh`}??????~??l??3?]F??????h?M?]:R???K?j???	???q?z??aH`6?^??????~???7?a???% ?6{oZ??Z??J?5P?y??_???<??????Aku??^o@???9???Q?????>?/8??a?n?=????????GMH??x???q T?F??2B?0??XOE?y?n??7????t???ff??b?W???;8???4A??6??y?L?:??7-l????$?t??:h???/)
Y?????Z(W???;?4???????????L???!^????????^???'?WP? ?Vm?????*??$\Upp
???FY????[:.???^?$?o?h??Bz???otGmDH?P??e?????*?y???d4Y??.??;&??yw???C
<??????L0?Z??=???XShw&?0??4?A?X7?b8?":7?H?r}q
?4?H?X???o??6j?V;?f?*?
?[:ql???P?m?Eo???j???d?.H?4?
]??M=?
?????:?&w,:?{??'+???i????????H?$?Nc?W?????OY??N?????????5???1K8?D_????D?$??<:"A?Hy???jY??????9?e?*q?c??j"h??Y*?g?[?F"?????V?
??6??2???????6?????t??v?`mt?\s?]??|S????&???????????5kI.???\~?(vE??g	$???L-???t9:?v?)?xf:D???T?:?_?????&>
?e?????^????b??f?$????????JR.?rJ at rh??}?9
??$?B?1???i6???p`f ????????g#?D???9????G?3?j?j`????M???	??_???UD(??2?E???a??lZ??a???8??<??
E?????8?|	K??]?10???TIeN<??
yV	??????|u?K??5?????Ba???A^?oE?^???tO?H???????'???????? ??"???_9I!6?C??.??????{?S?X??_*A??<B?????#4S&?\?9p?O?fC?y?q2????V
???%????h???N0??LC??y|TwE??O???L>?CVO 4??B?,??
?A?r0??J?>:??m????C??C?r??^??	??!??y?Z6,?????d-Aw????p?V?`??Z?%"O?L?&?A????y?f?x?(f?i?F??l6q$Ox?+C?????p?&m)%$?p?????*???
??????Ak?-?
??fN????~YH^???
??J?N??0?y?9A??????h[??S&)?7?1?? ???????5?E.4?1?tz?$?`?U/E44t??K?? 0?????
W?9??%???sx?90??,???MF]??fP?OG???hF???iL???????&?B7'&??W??0f;C{??
W????zv5??*HN???????d??	???yA?do&??Y?;?Q??Tr????./????j? ??|dy??d?C*?!r?z9mf?.??c?o}*?-?2??t???v?p????0{?w??A????\????3O??b?'??%?UG"a%??b?nv?^FUh?7?C{??^^o?4???X??X??????I????????brb?? =I?3??/?b?_}???}?&n???I???S??D?C??N
cJ'^R!g??4)????#??fJ??
Y9??<?:??P-?????@??Z\??I???FRD?E???a")?G?x?H????i?fpN?/Je?Q?]??<????^3?K
?P???????o???xz???x???A!????u
]d?rx
]?3+??vSm'p???,yd?*N-??	TU?]p??T%p,8G?	J?kP??|x??e?r?B+0=?D?~?0j?>???Y?I??????:Q*??r??V?*???
?????Q?f????%aj??Bf??a;??5?Xc??!???LA ?)?\?u?U?
???qW??d???"?q?Q?+?????~??W y??? $u???n??G?????Yy4KV?Y;??Y?????\?V?@.?`??w?
?????I???+bH???l???+??.?h?F???t??
,B???lX???????h?f?QS0??XJ?2-?7?~h???cM>0X?f1V)??
?Xc??`Mv???I"U2q?Jm???
?^?w????i??x?Em?u?.??q<m???q???
R?EXD???R?c????????R??Ow9???f?w??*|<?%N??R???]\???D:??s?l?*4??s7?i???J?"???#????E?H?- ?t??et??
z@?3BE3??y,/???U)G??k?i
?*??D???c???????c'1M???KY?@L?"?~d?J?????`+7;>????S?oI1bhSP??EQ"???Y{$?o??U?v6?jt??&\e?x??W?%'x?{?=???
BQH_?db???9?
G5=?j9}??t???(????S?Df?MY???????A?]=YU,??\y,????????h?)?R?A?7?[;??>?5??L,???enF??<????????|L??ar????=h???K????5??3??Q5M?R??V??Y?AA?H<???\???#????2+hW??!J??m????r^????Um?&?; q6d?
(?????^
?^On????y?X??j#5a????z?0?W;?Wz[??|nt??+?Y^???d#E?U???y?d???Y3qp?7?R?f0=wh??t2u???^,?<??J???????1.	??=h?9??P???s?$?
x\?
??k?^??`?m
r?0??|?#??????+K?[?qX M{J/??tIq"%]K|?????W??"/?1l/9{??g7??=???O??;#??LU??u`??M???7U??<d<v?????8?-dU?:?????~
?T?&?,G??RT8?$????"|????:???????+1U?V???\?K?Law^e}??????\T???K?'o?^??(?)	?o??n??"?F[3
?>?q"
?2kP?\?????2LEr?P????????]????6?5?S&%??V??dJM????H
1"M,??,4??*R?	???*?)_x???+????(???6?ffg?t???dY?!??U??E?c?*5?iZ??z?ixD]b
?fd????X?&v???-??b;
8???????iPZ?b?G??p(??????[X?I?AV?1 ???)F?O?u?I?l
?k?O;PT??x?Zn??T
?V?|??4??W??v?)?{{
t? Qy?E??z?
????%/x?????n??%W???p?b|a?d???? ??T????????/,K??y?b;OK}??????QXn(??zt????UH??@??R???
??OM
?j9-JtDO@|q?D?5??EhWZZ?Q??O|b?D
?&??R????F????bd?IC?y
??'
?]m?Mr????s??V?*???C??,?e?% ? ??{?%??RXf??^?0?b%???C?'@hs?????????????v?????????CZU?1(`??\xv??_2??A??7??	#????4267?q??!]G???X?%?;????pY?7=cl?1`??\<`?u??Q?MT?cJkD-??c'??^?lpM`??)???'????"?)H??3D??????O??!?3??$;?????s???H?x`:????
?H?+????5???d???????;?l??W??X*{D??pm???????v????{?=hL"RW?RY?l??????8t[
i?KH?T???M?????Gf8???????~?|???F~???9?{?_~??F6
?L]?j?
 ?=??}?W?
?a??%R?????b???JQ??l\`d4\??????H)?????pp??r2f??@??HEO [X?h?????b7?s|h?D??D??'WP?\Ea???q??VH?]??x!???y?J???
4??y5??3?H????eZ8???Y?w??jc\??v
??i????5???
???X?Y#????~?????v?j+s?G??kx??[??gk????CWz?p???v????nZ?"??D?????F??&uF?Pq>?]?#??H9?h?@Tj?P????VZ?%;
:?7?j????lK?[^N?????a<5ew?U?4N?n?O?Y?'?*?OW???-?9??F?? ?Y????9?????(???a?}?? [H>=??6?Lq?j???h??<??LQ?M??+??r?I?0?
?O????{j?d3'&?S?Q?????,W????8???8??^g??1?????|??t?e??n??????W
?	???????????,?y????3???p??W?7?!?i???:?6??,d&???????U:??9<a?%?6???!e???7???;X ]???d3?????&s??,?qNT???*????m?????|JBMM~?d??,???[?y?	T???

?1??nu?a):?z.?<3`?:????K?0??J?U,???????d?+?%?I&
'?????5f?u??'$J4Xr.?4? ?i??_QG???o$???Es?#M?U4?pr_)???GS?J?l{`???b???}nn?aiOE]e1?u?h2??????K???????B????^?uf?Y???muW???zRr?x??D??dP%?`6?U?? ???A[n?5{?r??MH+?????Es6??C?????r?<|??A?S?????F?&??m???K?:??k?6?m+;??JW??[?
[?R}q??X??{?.?M9b??G?D?PBs?F~5?"?q?+?*?Hl????????F????f?AR?Dv???B6??JTE????f?8??????~YV0#?m???D?B5???|"`b ???
?l8?G????ls3?|?f?G????M?&f??eV]Gep?O??mx???EWi?~6??????M\
,??????N??????)??Q??5?ftb??t\!(????Nls????????al??:??R
0K???+????"?>h??m???Z\Xq?U?????Yx??0??????`	c?~?,-????z?K?:????p??????m	?? /?qSvs??]??a	???ZOB???=O$????G???u?)??*??Z*??(????u?"???VV$6e?p?4??Xv1?A?I?l??]?*???"
??Cv
?.\???
)5?Lq6??8????g?t*i??Y?z
??U??A^qJw?]`???C??n\.????^?N?UXV???b?\????
?~??!? ???J?,??Yy?(?	"n???????d!":?`?
?(T?!??vA??????7?o??F???e???xj??[i9v?Uay
R[g??x?"??H7o?u/?s???R??E??(|q*?0???nt;gO??2AX??t?F7?6aNuD?OA?
=
??k???F??%???g*5T??}???W??)???w??????????X???[aN?q?do????'f?[??o,?ks$V^?G??%l??h????tQ
?c??L????|?T?KU?0w??y????0???^(?+RH1>m??r?????G?Sot?
??aE?(Vc??p?
8???\p?6??MM???/%?n?(>?|?9?M? ?2%?3[|\??2`X?(6Bx!3u?ASh5d?Uk???E?
?+aq?Q?,????s0\/P?????z?
q?hx?P`J??
?
?<O?=|6a??aO??=j><??f???c????;?eB8?
Y????\??-??????|????K{^????:?y>?*?f?MglP???vD?i%????Q?3??????)?G??e=C??X??6?$!?Q?5???W?i?:sr??!?tX???N5??n?~a
YbR ???j??P???1.\S?	?cD)	?pO1?E???M^?H1F????????C?? CXj??)6r??+?@w?Z??H??h??l?R?F$??OIv????S=_k?oUkdc?6???_%K?????PK???.?S?P??m?4b&
?Q%???J??@?'$??m??????x?5a!M?_??^?M6????`????^????8???.0???Uz??H?X?t?a?V?=???V?k????6"??&*ftQ????m?>?Z??z??D?YA?^tQ	?9_k??
?
TDN?^f?
??:???)??Os??
1C?o?r??Db
??1<????-?ZOXdw$?p,b?#?+?3?T????X??J?H???U
d"	Y?,xy-?O? ?2????x
k`?z7wx? ??U#?7??h?E9GX*?????]Q=?E??v]????l'?????</?j?A?s????@????:???s??X?uz7Y??/y?m??Zqb?7?????????D(?H?C:????}?w??????????W6v&s
?;????X?????u ???.)??E??/KM??J?????Z??_??X????
?????Db0d
???????????????e`???
 ?!????I????????w?Y????D,9??????????Z~?w?o??C?????Nq??????Q<b??x?EG2???b??X??v?[?e?K?
??8?K?n????GE[a?t??HQ?+??=??"\??IM??m?????#!?z???G)@?B?????
?C??????n???jR??????2?{?H????%?H0??GD?|oS?;5?P+???
i?P?rsb????????uyd??o?????+"?|?+?????????xq?&L???J|f??Y???z??="??#*RF???????6?????g???R?
:i??9?<?3?sj?$??b???^??'???B?????s????L6?g??O~??~c??40??!?Dwf0|??/??|2????pc??M?Cm???&|o?????G????	o?n???	}0??}?????P.?rn?xA.??,`?
?PyBX!??1??Q!6?
??,?'?C??*??
w???}@???_?????????F????????????7???????8z?9??)?F???,}?m?F???}?(~c}_??????8x?1?n?7???Y??
J?if??~(???K???|??+??
?O?????J?.x_????>??O_?????P?sW????????,???8?	????P?/?,9}?}??t????k;??<r==?;???}?p???m?????????/p??K?????????aq???r?T????g?	?Kc?=P?????
????+
?v?R?pO?=?S_%?d????C0?????~?MO??kH<W???2?B???I??$???&)?|??Q???????1???}*t?n??????_??B?????? ????>?Q???
?a?yj????E?+?X??]G(??/?zu	?^??%???
?Dwty??w??syF??)?????@BQX?C!??????c1$??j???A?^?u???NNW????-?"?2|??C,^}J??V??????E?::?????t??7?xIg?KB=????]?f????k???FB???3???PO1???)?z
???l?0aH?8IC???k???L?f>?c4?e????~????Qm?G0S}?
?_???mO??????m??w?B5?????8
1???{~l??]r?????	????	L??????*???+?~?7?k?????c??`?p????x????B??u?????\N???\v>?S?Z?
?w??o}?z
??I=?,?? [??L!?|-??k????}F??Z?1?>??xC?%???????m?@Q?
r?*??ru*k
?5j?c?c
1??
7A>O?????????&%>k
No~???????????
/P??z??Q??_x?????????/???D~?????'F????_?O???_>o?0?_???*?[??V?????w?f?{B???|??L?c?????Ly?????G
???Tq????[?~?2??M?~DS?)Q?f??)?C???????jl-???;6????<o??')???O?k
?+D{?XD??6?-??a?Mx?M??????6?_???1?sm2??6??iR???????p??????I?"\?????;
??l?z???)????N???q????51?k????X>?=????
H?N
1???N?	? ???S?-????-;_v??R??r??# ???	Kz)	Q'??
t???????<z?>o???a?O?BV?M?Hw}??1?u?????.?ED??H/???$????????????l?????????/|??>y???1??_8???
6????L"????L"??8?3?lg???$R?>???~?L?f??=d?jk??(?_???m?<???VM
????Z??|????G^?|??Z??????????????v???S?????????t?|MX??*Q??kr??<9??k???v??{q?,???/o?%^|?k????-?r?????w?%^???S?T???bb?J?b????W11d?bv??&_??W??|???6_??a???w6g??&??b?66_$}s???F6_/?l???[?4?????5!{?4!?v?hkB???&dU???	?!?K??*??L??2M?f?jB???????	??K?????{???.?????????????????M5??R+??b??=??]?????k9?	?1k??c.?}^0M?c?????????^?f-?\??A?1???V-?\???
}Ap@??}S?????-????]?w-???,??`@??>???Oyj??y
E/?????'???????y 9? ??}???~G??3??? ?V?t
?0}??_`??d|k>@?P?(?M??c?????3?x???a,n+?F??X2?u??a6l
?????????
?
X?,??S??<??O??}?
yA9
"S?\?Djz>k?OOZ3??s?c?d?Z?=6??`2??SV????T6k??Y???S
*?K^
e??S?
cg???l?z+??.???S??j:v??*4???2?????2Xu?( ??2s
C;V?q
????;{??(4??=???*Z?P<???v?(?`Y??X3?t??M?&yd?(!,??????i????.?o??`s6???i?{1???V*A1?????????
sm&eny??t???z;t/?BUJ???R?*?E=??o.;zP?2#???y?n;???|??E??
?V????x????S?!=?P*7??23???y?K
??;??5k???je?+?Y????F9?4?_2??/W?
???c7[?????s?R??J8??????????|??6y{[??j)9?v&V?????}??"O

2^??%?_????;N??4?[F?Z????}?@?jl?ZAR?<??U?r????7r?)?T?-???r??QX):???Y??X"N?q2???K?/J??&?????LF????w<?iX?N(%0|t??	?????i?Dm~#+/Xr?%???1??NeeX?V?R?N??D?rS ?@???l???_wH??WZ?????s8?^9??J?F?^KP$e)-??eQ~??R
xJ???`?E????c??|??c?$,??????V
@??+?R$??|4??Ku??b?d??3?E?@??
??????J]T?(?;???;?
??m-????/D?p??P??Q??????'q?9?h?@??-?1??Z?:?
?)pU?U???/?'?B??M;??:H}?r?e???W?wH?kh10xG&4?WO#?4??????B????'0??r?^? ??????w?roo??%???	D???(?v?d??f????T????C?ID??qxE??ug?%?X??%??Q(Pt?v?\BI??LJUI?b?????]?^??H???;LQ???V$??d???qbN3??????|???*???X???q?Z#?\$?p??Z?C?c??8???x?????????4?i1
oV?*????
??>Ym????7?N?<??Wp??Q?U????V)j?????9????JSBh?X???:A???R?b{?"/N??5????J??y?jK%F???H??r????N?2?uWD6?T?rP??P&??????\???i?Y+s^?t?_
?sz?s9Q	C??VZ????8d?O?1???WD^?????R?|?~~38??5bv/???'??????obkN?L???|??J???H1Z???/uQ??u???e?T?Qk?,????Y\q@?P??Tl???N|C???01tY??FR'??I?J??D<?:?Qq:??3??j?????????0??(??E????D????7?<?K?Rh?z?n#@.???&3J=????L-??\?$??????\?V?] ??;n?K?w???ly?&?1t+,?
??E+???u}?F`G?
1&y$)p??H?	dU?1??T$P,???:???%?0?
??}?3?????;?]?X?B??(?z??I???y??A?Q
??Q???????????r??
?,?m?L???????????b???5?}??3?\?Gp1?VA4???5a??g]?v?rT?e?n}?Un?E?
?G?LZ?P?.?w	???#3'q;+??T?&~
+;Rb0W?-???#j
&]?K??R????m??B?z???
!?A,?Sp?R|Ptr???*q?i~??y?M????gPb@????%??J??????Q??????????v	7??@V??3??d???????E???agq?XPvz":??????n?l??LX??BP?@??x2?????0???B???O?_????$?3?????)O?*j??r?ib???
i?>???
?6?zj????m??d????CL????RV5?H??R'?)98??????s????[R??fxQ??H68?:F???2??j???R
W0j????'V?????????=???S@?Ph6?z=i??m,a??????^???R??&Dh???a0??e????
?H??T???A(+z6?
??a?+???????????L?e??e?zp??<;?v?B???Tz???H???Z??|?w/o?{??O'????(?V?_0B?c???A??(?????P:??+?????W?B?%?$~???T8????U??S?,????E?W6??j%2?o?Z?\V?????????@?b?E???;B????}?-6?B?A*5???ykg????&???%7???????Cv?\??#?
7???s@???????b???Ubl?&?-????qI???A????G???6??%	
???Rm0?]??:?^?ok??8?Q?G?x??$5}D\Y???z??i?Sz????	??8???%?@@??[??+?H?72d{???&=?	???????{}e?i???`???#
?T\?:?r??-E??Km?
*?g???Qw?i?M??????+1U?V???\?K?Law^e}??????\T???K??h?ey|u???????n??"?F[3
?>?q"
?2kP?\?????2LE?\?&1???????w?m?k?LJlM?(????fYY?B???#???c`??mW?
M??V?| ??VL{?b??????
]n>J????M????-?+Y=M???XEt?c?*?<q?z
?k?H?S??H????z????+???n?C^??)Yl?y!P?"?J+?RL?(xEVQX=vv?;?6"??>??FnS??a???????j??????(*???a-?&?g??R???0?9???U??N?vhipj"7?p25????????
?:??L???K??>?y?)?U?D?E42?J?1?7?????%f?b????\	_R????	?a???v??ChSYZ????J??,?V??=??<-?Ud?Rg??Fa?????=?E2??VU ???
?j?yf
iU?|????r??Q#?????D?'??Ol6c????l???t
Sbm?4?@??FMoI????16??e at .??:????&*?1?5?B???h??\IQ:??????x?(R`??????4jz?4???f???c~?
~???TZ?2N$??/N?????B?nH`?!+2Y???dZ?8??J??U*?B??p?????????uM???{?=[LRQW?ReY?l??????8$?tp?GX???'Z?????2.?y+??F???{B`S???-???
 $
???3?O?p?9?
#
?-F??(a?f?O<:XNG]}h?>
p????????2i?&

:??????DK?@?y???.T???a??R
??t?+?x??Y??*E?
?1Ed??\??]u??+u#m??8????c?r?????7?:T?}<?????:??#?/?m&0?|0?Yr?3`O????!uU{Ra????W?1r?0???0??

?`????Q?.??|??
???0'?????V[1[>????>?XO>[????}%?z?????z=??:D5&p??m&M??Cd???P?_q>s]?S??H9?h?@T*?P?k6/Xg+????N?Q????^l?????s?+f%??\&???$0????????B6??D?
?Q?BA?->?z??????P?bjHSA????O?g}]
??l>?[N?'??L7??RvWX?B???&????????b?$p?h???Y????i4?",?<?	?Z?	V`???h.??
??>??r?)?Q??}E?RN4?F?"?[F?#??????tRasiI?z???T'kg??	9?zl??*?(??{??>?tx??X<bF??????>?q??^???z???????_???|?w?e<?D?cb\)?A?????2?"??hUytB?&[Z????|?:???_?v???f??4V(??A+Y?`T?? ?}??<???*?lb$d???????sC????"]??=?s?.O??,??
?O????;g?d3'&?S?Q???5?,W????8???8??^g??1????{?????e??n??????W
?	?u??????????y????3??????ZT??6??)??c??N?u?&?I6"G_???r?-??A>N?Q??3D???FH?????,???Hoz?3??#???C??\f2Kq?Ugr?????t[?&kp??PS??0?5"?????wD~
?$?e@???	?%??0yb??\Z??H???:"	??&0?	?K?\?K`4+Wn&]???v????[?>&?E66I?????E??w???? ??rJ?=??ZK?v?!*??(?!?????z????*????O&???(????u4.?"?(?G??X@JF?Q??F?@???
w>
? igj.???
i?b??h*?????Qs<?)???\??Xn?T?_??}?2??,Lk	?K??#??`SY!>?????1,Eg!^????`,Xa?P?v????Z??7t>7K?J??2?Y???d?pb??(_cV?P?X{B?D?%?N?	?&j?u4)??F?Z?^4?1??ZEs'??????;q4?4???|v?\???&?&T?U?c]???&????-?D??L^+??mA???ZgF???O??V'q%???'%w???J??JUQ?fS[5|2x?
??f?Y??+????????iX4?2?>d??G>~-w ???[??:%?A?
lnB_?F?I??????m?Z?????=??$q?[n?u?e-?]1??N??Q?????#~!~?
%?@o?W#?!B?
7??B?B????Y???H?h$?,???o6$Ld??O-d?QK?p?DU?
?yi???l???;??e3?o???N?.TC>??'&B?O???s?|?9Y??67#?'hf~?????tob?yYf?uT???a????h]t?v?g?
H????R/??????iN`?kZ???5?]?oF'vipH??R??????6??K^???nQ?v!?????/??b?.#????Y???H?.,?v[?V??????v?B??^?W???P??a?A?\?
K???3i??w???]b??????????e???=xPmK ,
K?E??z"??????x"???084<?_,@?cM
V???R)?E?|?????????"?)???{?Y???a
*NbgN?zO???ih??#0v??4?K?ag????????'>CRI3??"?????mg???@['G??k???(?????8?nm=????zK
?3-???????c9??]3?????2)?Q??	?????
?Ha*0???l~?&x??X?????R54lQ??,??
`?;
???5x?WF&????Z????????I?7I;??H?V?3?????|AJ??b_"???r??6ve&*???k]kW!G???q?J?
??~(lx?
???x?o???/????("?(?????d??+?{?t(}CV??
(?X??K]7???????#:5?t??`??????>??
??ls
??#??
?t????Ms??E??????????~>7
????+???? ??xSH?;?(k}???b????0??b6\?????G?p??K34FB*F????A?.?R?b?]?@;?6 ?NZ??p???i?qD?$?@??{p+?<SL?,??WR??02?x???0hg-????G'?|_|??{?(??G??=J??Qz?????d|?(???
>J??
^?(2L;_?????>?F
??G	?????ESq0A?%|
??{]'x?????>??g???gW~|jm??????????D?Q$???????F??h?q5???oqh??`~?F???|'Rgqx??(?j?j???D?R?b???%	C?H???]?Y???M?x?l9|^??z
B???D?E^?#	????H?Y'%/?H????X?????
byS?6oR??G?A??????+??
~
??)&Gh??????????b?u???Ax1 at C????cY]J???J?~^???X)}?CqUG????uH??/?L???5
5??	!?#??0@?`O?????
x1??[C?l????x.??l ??_H$Q??? ZH??:
Wd^D??}?????\?2!??x??21??J>????Iw??!?x??2?_?<????Y%???
?S?JX?f?/\?$?d???d?d?d??x?qG??,d??;??is????^DP<t??
???w]0jU?Vn	P# '
G?7wh?%p'????cl?IlzL????6}?a?o?????I??6??????*??<?n_)??e??;???q???u??n?}2?@iO??])KjtW???P	???H???V$A?M?e?ez ???jrWgI?	????^?????,!????%do?F?V??XC???? ?A	??A??????6???B?U??
^h????W???~\~'E_???#a???m?3????S?[?Q?p?dK?C?1W???
?s????
[??KWo??,??
uj?5????>?6??v???F???	m??'_???Q5bg?g-???2?$?P?:???1?7?r??P?f
H?q????:??
?I??!E?&?$A:?A?:?M?
p"D]0?Oz?!???X??2?(
?!??!0????a)???m?!?'??IR?"?u??GH???K?????i?7x???45???(??!??$????x?7"j?????Y?? ?i??J??
?A???la???7??ah[???????k???Ky??t?
Y??V?u?*?,+d/6`?h?n???????/v
???:??
? P?????Aa???Sph?A?b?
?pE?????l?)cw??????????trV?y
??????}_??	??V?c??*??8>5~";?3?zJ??r???
?9??Y?U???q??/W}*?????}??7??w?pg?????P"?????????0?????;??????7??`u?
a?5?`U?M/o??x?????r?n????w\?R??Z
y??e?2???`?xf~:??Z?g??qkv|n>3?05>g?.???dS14??sa???H?E??/W??S???d?2Pn??|?W ??????????4qO;ZV??&Q2|???l??????????X???'Apz??????5k?u??????K?????6?F??????[o/?i?V+?7u??En???''?R?V"???R?*?E?C??????1R?Gi??
??s?Y?Pj???c??{?naKei??&?XQ:??Xr????`6????{?9??^??)*G????
m>???&m?p???Ulb?Eq0,V????5g??4?V?AG??>??h??JX?q???'s??C????x4???C?>? ????r[(???l??????t????C???5???+?X???	`??L? F!??^)A????+??}????c?y?^???9??l?X??7??A???#BO+)?#@?3?]D?]???]Vy??!=C??X??6?$!??a???zw??i?B?R??I???w??M?/???]do????t??y???????	?<z????"
e????Wj????d at m6?P??p??`???2a???U?o?z?UC?
R!??????YG??'Rs?.p??F}??p?????????=??4G^?I+?-??r???J????!?!???t
N?????E+1{\x??[?W?=
K[???#	???OKin=??
??Tt?cQA??2??M?$???QC??6QQ?yy????
K;x??&Q?'??g??:???M?????d?[?????????D1xi?t\??+?t??d8@?
YbR ????v?KC?????Kb?QJG4?Sw?????K?i??D?%?fz~F??ha??Z?~???????!ky?t??
mY?mQ???*??"?S????????f?V?F6FiSPkJ
??U?t?+?Q-[
????????p?SM???i?L
0g??
[??????~??Z??hR?????\??n??NE???\??QM?!?v~y-?K!?6???p-??H???	"f:?bI??"=??$5t+BA8??6:V?Q??????Dw[-&:???
^hMXGHS?Wi??b???2?7?f6j???	?c"+???.0???Uz??H?X?t?a?V???NA??~?1]mD<ZMT??4? ?????}????v?????N????s?????????`?%???.[??8????j}??+?$S8E????.????U??EvG?
?"?:??;??A5
???6???????[@&??E??????d??
2,?Cym;/?aM
?h?????M?x??Cm??m????{B??z??%?C???J??#Y-?A7??!\?????/+B?n
??F????????
?????%c??
??>?#???P??e??Swr=oyC?Q?J?s"?!o?????C	A	?M	Q	WG?%\???(?w(?_S?w)??K??u?W????C5???A??????+t}??????Av},c??_????ol??_??'?q???n?7?????q?????}/?7???g??S??my?)?L?if??~(???K???|??+???j?_??s?~?'n???i???g???;?z?J?Js???Q3?U????g1?Sc(+?????
?J_~_>?=??????H???????8?v?)??3????v?????o_?,?%??N?~s????mX????\*?b???Y??B?????A???H??n{^?
 2k/u??n??2W????????~?e?????~??/S????g!d???k?g?k???RO_N}???k?o\^?F????KW???W???_???te7????????t?o??????SOi?k)[K?v??????????????&?	x?x???H_????~?xu
l???????~??_G??[_|??????~???5$?WRo"?}}?????S? ?gT??.?Q??????~)???K?k? ?h????????????W?-l???K?EM?%Q?????;_?
?????u????Z???+?????J?n???????W ?+??????i=w???T??D
???,?E???z??Hi
???*{_?Z???k?gz???
M=3v'???{_????Sk??o???#??S]o??}'????????Y???;
???kF?j?,K?????B=????-qj????e??4?????????*??O??"???"????	?mO??????m??w?B?gm?WA?? ??{??m??Kri?<??}Q??&???????*Np*???????????t????????gn?q]:??????|??%??;???mB??K,K)?[??^??cR??E??!d#??)?L????????>?Rr?|ZLh???????> ?G??Z??=2@??r?(?qY?+??
???"@"?
???L?N=R?6???e?~?cP?8.<$???s;???-?????S?5????!+"n????%-\?%?
+2g?t???=C]??c?
n???l?{Y?"?z(<?????4?K???[eXh??!?Z?;??X?B?????aP?}? ?aW??P??W?X$??1\??bxC9??`??????-?W(?????
*<?R.@??&?a?gXqL?????aAS.c????2WC??od?w(
?Lt?@2??B?%

??b?U?u?????????38???C?2??f?o?^?},??z??Q?Ta<u??????c????"????????????o?S?>o?0?????M??? ??B~?????4???U4??c?;F??_????????????X???:???????????{v`jw??"?{S?????????N???Maz?????G?,C?
??nCl?zC?K????6[~W???TqLD??`f[?f?#m?+mJ??6???&?Rx?????k??R???m
????%Q?O?#V???4)????*4?N?U*?
?\nb~f.7????r?5?}}|B?(?r|?8GK?\?u>??z?F_????p#r??y?J?C?:/?VV.?rR?????????????^)???I(wbj???Tn???lj>7?~l*??PK?#???]-?
??????????.?Ei^y??(<???~+8?i$}W/??s?9{??w|OT??c;??gB?->h??+?J+;Y???7
}?339r??7?`?????S???~?g%????z%?[t?5?b?,O???BsM?N?6??f6iWJ???
M.??g6`?#????
m??m0??H??}??@_??H????yG????-???p,
???`???{?T<?????c????
Cc??|?X??
?dS?V???z?>??&e?|???f???G?[????p1?*wl?8z?? d&?^-????.???t???Etq#?X?????0?@Wr??.???fKY?:?l5??z?????D???
??V?@???A?V1??%TGt]H??y?Q?s???]??????????
????`???????V?d=???<d??/->???K?O???????x??.?? ^?p
??9]?;?@??+???*??#H?????nu?ygyaL?k??e????R,?~???v?E.)n#:)??`?Iq?GAM>b?q????(??>?!z?????x?N{{-????(2????I?Q5Ls?!??g?????>?K?4????F?????????8ja????_=?[?D????h?t_???? ?l%_??*? F!??g?????-Kc????3[?????#5!??)??96???V???I???^??d at B??b?w?c????n!Q??
?[?bh?@`1???y,?
OfAvI???$
??T?????)???>???ST????????????}?5M??on>??F??1???jj???:[??+7jU??<??f??`???????
T|U
???-???+uP?
??
1$G}?%??b[?U?rI??mW?r??v=K???4w?L*'?8???<HS???y?M??C??r????????????eLbd8n??Kt??p??P-T?-kM?+e
????????"?E ?f??~????E?9????v???,??P???R?(?|?????]B?..?:??|R3??????*???J?N.??d
?=??Z???Y?b_ ???Z?Zk8????5-ei????K??E???D;?y?
??*?U?(?Og?Vv?????s)~???<??LMZ?NAd??K??k????Ikbfz~?????Z?=6??`2??SV???9?/=3geN?Ne
*?;?
???' D?????'?e?
P?1
?F?)
??]8????/???33?Y??????2???55?%l-dSQ(c~?
 ?*?????BZfz>57?0;??C
Nz?a?
?t2O~g???????SqA??Z?S>??$??#"?o??<
\??c7A???B?Q?L+s??|(?U???A-3?
Pva"-/??
?r??
?)v=/J32^pz????#;2?Z@?r???@B????"???R5???????Z?7?????^R?`?T?K??W[?s???????z!?Z??5qo???h?vn???Y?M?Q/???B?$_?h
0????<???f???h?n????u*?sz
??V?i??t#???Z?z??????
?2?&:I???M?????:?Kb?>qZ??Sk??S?\??
???^$?&????0???(,]?
?0,????BS8?C???&?
????t??#?QIx?Z?????K3D?b
?(q??Z?????5?KlHR?Z????????"d V?7??(???I0?.?W???6??RtD??>?q?6:?7-x???~e?:???t??Ss??{?S0???2??A????)???????E?m
=???]e)???cY?5??:qrF??jY8K???Gv?????>}<j??

??????
?+?1Tu??L=?G+?jF??WYE2?
;lOx????Px???h=mE8???y???????f?k??????y}?{o?A??%
????{????w?s?w????_Q?/?.???g*w?k?????^!?8??
???{??R%??c??/?'Bk?S{?'?&?)]??????????%
AJ??1?/???X???;
?s"m????X????D?O?????=?8^
H???H?a?rv<??"u???z<?
????K???B?WRWb?(J???????J!??G????R??6?n?J1c_k?U????u7??/?W1qR???s?xE?@6?:???
???
m?+?????D??????
j?nrW?-RZ? [???$???^h?I???O?E?{=?
ayaTq?c;l6?????.7Q9??4
?tU?????r'a0d]Z7?kB?=-v?J???y??m???O?f?#???H?<u???? ?E?Pu?%????8hy?? 0E?w?"!????L?\??O??
L.(BU?=?4?Z?h???kZ?
G?n??&???T???H?=A?T?G*???E??o??+.9!RB?W?,N?[9?A??E?>??T????Q?*?%??$??;?li>???N?f???f???????:??
????}r?w?c??'?.?}??K?a?
??IP?C?z*
????????
??????`???sW?d?I????NK?.I??c?SB?H?	??J?
E??????K?????Q/??m?Y??D???[q??8:o???7?<=
?6|0k??ph?NM?/?i???U???U??)#???A}????"
?Sx{?
T??ll????f?hOn???^???????B???xyCC)Es???0???aI#
?BU2?/????????????gH?????j<?!????
?%?"?WEi?I?????.???o?T3z6]mb???+?X(I2?5]??#?+?)Y{???n?c???;
??]?o??!
~?T?J??T?)f?7
??f?????
????#?KX?(?r????9?&??R>???O@????W?t??A???[??}?????}H;(???O`@?T+f<?z??2??y????Q\????K??1{??Jj??????wo0N\????X'
?)M?D??z?d`??2?}??@?
???(sqg?rl????Qb?I?'
(p??XZM6y?????d??????u????+??
??q?h???G??7:?????$
??H?? KEb? >
??N?.Z?U???????s????"w????#=I:Q_H?@a????????^?\}???>?????xKW???^CN???G???????3?^???r%?t?vK???D?ZA?????
_???7??]
?_?????
x??*xR?
??Q???FX??(?^bN??;
??????;?H??<???A)??G|???g????D&:???\??Aj<\9????I>6??19K??i.
3R?+r?GN!???T?l?	C???R&\?pF??f^????\B????E?/??`|?!A?z?????=???+??& ?]?? F?	4	Rj&?hb\l7A???ug?$?K???0*h?b??fG?	?
?M????r?$?r??v??aZu?{???EP&;?af{?????}?w	wn?????_????	4c74.6?????y*>]
2gR????d?`??n??1p:?V?? %W?6?Zjk?t???G?q?0??%?h???Lv??Z?I?je?H(? ?????0??????#yF?s?W?(?Dq?fU??z}??>????V???????GC4???}????$_?~???t?B?W???{?|?f?txkJ?;?j??$?~???)????!??#??qR??=fc???8N?
*s9??%?$?GuF,???t?N??Ej?{?????E????e4?En%?F?z2&??^?w-?8#8?%
De^??E?n??rA?]Q???9?????tup??T[^lF???[?ERQ?x?y(.?????Z?'T??l??^6??<dQ;?\3?D8w?>??p?V?H?WH<d???U?! ????D?SDEC!?f(?8??3y?X?87Q> ????^?I? I
F?R~:??p??-?6??ml????T?m?#I??G?X??o?r=??.?J?|?	??????>??>??????????ds???^1Q??\???OWS???Z?(?y????????#??'???o?????X@??0??ADg?]?Xe?#?????ql?pf????h????????wW????7?w??D1L???V?????[l????tK???^??X???P?5??zuD??6?>5uc:'0???0M??<<?<? O???3S???9??Nb
??????w?:	c???/?s??5G???/???E??:???4G??	?P"?e(1?+t?B??q??????n4g%?4???t?%j=???"?e+pIk??,??OWh6
??Q??????q??	???O(
j???r???? je<mE!?OO??Q??#[?A??hu?X?i??b???7+?'???v???O>?dj?0????K?????*:?Q~?\???
?:1	??^??i?Nn>??bn?!??}$.?,7
?Zq?????????p4zq7???@??5??X??N?B??u? !9&!??5?????k%??\96??W??F??nv??(6?:-)??????79mS~
X?N??8*??|?T?$
?h|M?D`,??%???i???G?r?Y?IWGIQB?
-????hr?+?@??n??Vp?}?4???i
?M???J???6????'!??$v???????1??M?&?Z??<??9U?P&	?9?r[]?????%!?y?{????e?h?xm????p?
?)??z?.?Rk??????&O?h??k?a?.]??Qfq???
????{??????P?G?R?[	???#?[?T??K??????v\d?=?q?>?M??v?????&`???*?_U????
??_?]???`wi???r???^??|??s/??
???2???M?.J??????
?fH_]M??????n2?????|??a??tim??a??,
uV??Ve?#??m?"??A?ZU*?jQ?X?M?????y)????D??????}"t<h??a???c???.et?e????&+?vrA#?,K??<}?T?8??JE]??	??_????/??N9u???n?????????
|B???d??$A?=????^?M`??????+???????O??je?;??/??_?w?3?(?Z??M?E?%?e???vc?_4??VTF?d?7??Y???f<e???Q???)y?M'y?'0?J?L????E=??6?z?m>E??g??m??LV??,?????I?Z???????????N?/??rA???C	????KN??ZkO???`U???=?????-??v?l??k #P?cCQ?S
?Q?c\??PPz??$?o?????r<?*??5?9??8T?I8???X?y??<??0?y?a?e????L??"??CQ?????N+'E?Q}??>%?,?a
;???v?Kst?M?J?00?-?)??{?d???j?V?/????#?T/??=
??
???N1-?~<?????l?s??Za&?q?-iO?a?Do??;???6O???ku(X??>????3\??g1?pH}JWf?y?k3??}?>?????WhZ;????q??i??? ??Vx[@eE??V1??Z??????????D	d?a?o?w??6????h*_?-??^?`????R?
?(?[z??
?a??=??%?k??????S??L???z??e?xO??Or????`?b?WW&??)k?HAD?Y?	?_???{?? sWI.^@?X3Wd??^)??HR.?AL:_p'?J?Z?
??SK??	
????{^h???K?
?T?	?I?C??"%??.?R???9b'8?????.-????[?<+?f??=Ny??Y???n???J??mU?-?ET
jF-{??<'	?????Z???L??V?J?Z????bA?V?m???v??i?R?}?Bu??Q?`??G?rM?R?\@???>/n-]??%??????^?X??#J??\.[U"?@d_Wd-&v`o?[??????"?j??????????L???????H??
??)| ~r3Aj??P??L2?=5M~?????>?*???D??_??d?b?a?[?Y_r?yC???????s~k???y????RY?k=?@?6W<??T
????EK??Q?q?^,?Cka	o???k??z?*?s>??RR?aP?>?[M?o?q??????Z?$$?8G?Zv????>?W?LF?????g??5,?-?5??0??%?<P?g?????J?oRt.s?.??	?
?????W?<+s?8]?y?qfi??+`??????N?8?U+???"??????ojx}S??$8?g?
??\
LP`??V3C
P??3?LA?????yy? ??Be?:?c???y???y???aa?T?V8??9[?*??W-_{^???
????Z?H8??v?V?K
xG?p
??p=y???(??
?? Rt>?1D}?????2?'?"??&???;??<}}????ed??????9??@h??
*8?]?????%??$?!??? ?~{?y?r/CT?G*?1?:f??9????a??v=N?;??(?0??>??/??O<g]MJ??d,V?5^??d??pD???5?3%(???2??`?(??l\L(??LXp???q(??Y??9GwT?k}?D?jy?(fY??t
??e?.?W???n???KI?%?????u??????m??Dk??
Q
a*?1?r?B??^?#?\c0U]?<????3?????G?.[??%R?]???dAC??y?V???Y8?k??T`:+????J?)6???t?<?gf?|)??SgY6O?y???u??:+W<?MZ?,K<?????????F??^????I????/2????????)???-????^??????|>???5??^Y???Nztn???????Bu?<??2r??8?;n?????_??\??34?[?]???<?????R?g????V1?z????E2?'??SJ???l??P?->wx?R~?"??'???????E??O????=KxV??V??c??oS?C?<?W?
ZN
?<Gua????????gdI??P??H?????n?R?b3R???h?? s at 6o?N?]r?1????N~a	4-6??oP??f?~&9??i?)??	?x#??,i?px?????@?
{ ?u???A'j????
n?????????\?[??nq?-x?????.???vju?,6i0?? ?Hy9t?mEN?
?@??w?'C?7?????????}???????|D?j[6>???In?
?P?J??9??	??1?QM7????K??K?Qo?`?n?0?????kN4i?
?
?$F???????6?h?a???P?~???-nW??Q?Lq?1 +Z?K!?Cy?v?v!??T??0q?<??b|?K??Qs???&???Y???,??^?>xLc?{??????r?Z?'<*???)??.???m?????L@???m??F?????y????SwV*7????W
l_?4k?n???? ???M5???Z???	??Y?0??}q???
>?bw68?}.M????X??#ZY?nD?y? n?q[??7p
?2?0?r0?O?1?wc\?>5?2??l?J:???K??????"c??W'k?????\1]S?{???Xd(?'g"DHuK]?N?=?c???"`???{2??????r???6%y}h??G?E????I??R??M?????0??????r?7?mzUb?X[???????WNN??9(21$???;?e???w?r????q???}??_?7??q?SR?dE%e?X* ??)?????/??z??Ck???????8'`????K,H????????[?.|?????)9??*??uO??t?<R???????*?T??N?>O???w+Jb?`??m?_??k?????$V%?
8`?h?!&?$?KD??a??%?4?iEzA????B??T!9js??Y?_
?h?h@???o"?:A????????S??????D&/???}?s??S?V?V??????@A????d?	
??-?P????v?z3a?????
???????????"?KD???
?{???M???k]-&????E??;?Xu???$O:`?????5l ?o?[???
??U7g??=??C?g?RkP??|???d?l1???k+??8T??r???M?F?Na?`???a????fAK??}?U????u0	xEd??H??Ze?.??XY??<??f?h?QOd?nFdI?]???Q?xe???W??EI>??r?Y?OL?
FG?4*\?ny?<-OS??1C??>p???????W1_6???^?HY??i_$??????~,??????!3??????Y?
????????5???MO??
)???????vY??????z8? W??????L6[?[2v?)??oP???l??4XA???????|Q?h?>\??????n?`KF ?YA6=??@E???????hi@?????p??D?????-???V???T??mJO?
sM?q?????A???S\?????'O??3??j?A?9?`????x?0?df=?0??????D??$?$?????=B?$^p??e??????E?????
1?@??\?:?HQ?W??gd?:?	?W????i??3?,(??Hg!?0?	C??q??hS??

???pg{k?UR???E
?ml?????;??I???'82???????{w????lm?????dl~?}????????"6>y
G??nvmuk{?????o???;j?V??l??T??}J?V????es??+N??^{?
1??Vv??????[klSXMmEY??H?q\??9%w??f3?#V????h$B??r%Z^??kC?p?|?:	A6?3V??X????d?q??~?
??????Wa??2??f*	?%9???)??7??p?J??|m6???%NY??9??c?I??
s???K?8?X???
???3)&???q1??????N???:ZT?3??I
??_?e?3??1?<??q?_?$?a?E??	?D?2#hL~? ???????4:1v??Vwe?B?D??*H0??????
?????\?Q##1:?ch?q??L?s?,J?%?????en?H?*v]9&?'?0n?n?????nc???
G??%*?;??????zI]??)?;??zg*?????>T'l???#?
????kRZ<?4:kV?S7?1O(?3?L?F?!??}a8?q???|?lB??.???????(??"????V?D?0?????7Z?????	?=?(
?????}?
S????Jg?xa??t??s?`?b0???Tu?&o?@!v???'?s????f???C?????
???j:??a?3LZ?U? K?G?;?B7?A??????????	?H?l??U?_??????m???????
z
Y4?U??\@??W=?Q?U???\???
.??Z?a??v?|???lz?F??Mo?2v&o???Jc??ZK
?q???3?HZa
j?\b?:hey??????r???N?[??T????M?l??????v?#??`J?0?M?
{f?gU?g6v????JZ???????h??k???-xpG?N}{S?x?
??_??
?v?;)	C2??.{KR??T]???C?
?<~I*1????q?q?F???c?4?D$b?7??kt?????SU+iK8ttx???WmvO7?b1z?&??2????+?9?"|'?[v
?LT?+???????+??\?)ot?o???V???13??T?[S?kI????t??d?9y1S-??L??????Ebav?Q?v??u-????r????r3.???????P*#?a?7????`??\?????A
!??6D???p????B?K?5?7K.k?
C???z?+?????>>Xo???w&m8%?7??K???C"d?	????
?m:.
K??i*+V??????5?????RQ??\;s??e{??&???k3C??j
~?l>N?2g??E?FX?????k??gpzM?MOUV???	R\=0	????????{??:I??8B????#S??????(??_??3U???`?Pb?\l????c??NlD??O??????	8_=???`?'?
8y?$
 O?d(??0?|1??bt??P??[??y???LfNS
???Q)T??@"qU?8????3?J??$?

???
i?UW?t???E]??'?$?Z(S
??.-%39??I>?????????'???\?????(#1?n????????!<K?
?
?L??u??`+??\?#"????"vs
0?????t??S?v?W???S????_4????W?Z?hI??IdQqZu?EkUj|???$O??&8?1cI?A=???U?????|3a????P??9U?!Z????,x\?=???gB
??2f????0??????V^|Q??@?(-??>???i?
??????re)wn#???$n?#??e=???us?y????38?	?Q?3-`?^SvnZK?}?6????}?&ap??8":???(N??N?f??>t????T?DNW??
?
????K??????Id?M?5??i???$&m0!?;WP????L????T{?e?????\>?&?1??l.R?l??t8x?;aNGN(k":^0??`08?a!??????GO?]?y<???`
C??????S????????x(?4n?s?z?j?F^x??08*q?4????2?y??%]?V?????LY ???r?????|n??B?Z
M?W??b????k,N????????vq
???bOW("64s<?o{Zg[?g(
?? V%5!a??????????O?!?s??i??????f?V????j'<??????A/"6?"???A??(????p?Pm
??-x/vl?g+J??9CY???fHO?^0<A??n\???h'?????5%V3?$P?4B>h0???0?3ES???0z?
??i??
G7?ke61.??3??.Y1t
??C
aL??6?2N?????4???>ij??0-L'??h-;???a at w0?0`??q3?dF"???P?????ja8n???(?????R??;	?Ym?0"h
???{?he?:???
i??9+?9
&???]?\m???c(?-?V???9?????Mo???7??u ?A?)?????????d??5??m??v??????v&???NIZ???
?????????0?? ??X???"v???k?=?????????4?[?y?
??????%h=?????y????
^???v???^}g??????V???~P???B?u???M

<?????r????ru?ZU??GA+??T????o??E?q????	&
}???Nkv{?????[Pq?~??[
e???v?jw<??#?]?{??4S+??@(V{-??S????&l?/??`k????L????3|?s0???Ed?r??D"4?M?v??????\49D????P??[F?????
?T?#;?????B??
?2?w'??l9?E????dt?
U?*Pb????5#acv????1&Mkw?
?R?j??E??eT???@\$?9j??O??~;?rW??K??]?
????'?
??#?b4[?U??2?%4??$?tE69???d0!??X?S?(EQG??G??X?F?e?|??m?????????tq? ?Eh
?7!k?[??A?%?J#
`??H?%???a??a$kU??}??"??&K2p|??#???<
???s?????gl??%??Hs?%Y&
L???,
??K?C.?????D?	p
??s.d??.	?ZR?Vf??x?t?e?????.?=?=???[?i?]
?,O?}???-e??0??{<??I????? ??[jz?_?T??Q?cT?H(?
?? ???
??z4?Mg??'??fhE??58?]???z????7?}????HZnM?H????^???????on???@?X??????m???j??vZ??????n`V?D~?/?3{?;{?5sy???{7.?????K??Q?+?g??*?4bH+:
QK? ?]i?A??x.?g.??3?A%?<D6?p?
k8N???$}?0j?i?)??5?????D?A?(?"????(??M?v??ICF?????X}	N???
??Q?]???N?q5??h?n`
w???S at q?pN\+?u?]????;x?? #pa?d2QjK??(?uG?o
???k??%QDk??C	r?G?x?y"h?
??|Os??u????<+{??Z?n??D
M`?7?A??x??B?s??l??????KJ;z????p:-|?B?q+%???????|?HI?0?Q?[?pI=???XE?R????QI???N???D?)G
f`'h??????@G??w#?]??G=?Z?"PH%?!"?fr`N?????????????c??+N7?\e7?
?yu:????fxNf?j?????)??;E?????e??R%	Es#~&Vc
Wn????G?r??L?????f??jlR?*????-2??u??	?G??????j????f?j??im??+.u?OB?f?????T??:????hq????.??-
??l???????? ??N`?)??#Z????L????m??iD9
?Jv?nIp??|R?U??7???y???~?'??L~U??&L????D??????T(????:???*?
??????	??yE?Z?????B????G???????Z?}5 ??w+?XAr?x?x?g?????508@??A4 _I??%?[U??@?c?m?S|?????)~?|i???????aA*3??????????4H]?:?}4???F???aYQ9A??
20mf?Qcq?4????(/?L`??#??5?????(??????
???$e???hI?2?Y?%kod>v5?%?
??a??[??M|????M???|)??S{?0???????[?O???^3???????("Y1????>???X??[?h???Hc?
?B???<??q?
???????x4~?
?FCb??vW)DEIIfH4D?[???21??%-??	?$M1?t>??1u??~??0]IY?dO??eS]??|L???SG??*??i???`w?g?O?x~????XB?mQ??h?,<u?0???ppH???;t?$???????????
?
??+?}?"?
?
?
?`????
?-???bi?>?j??X??L?G??9?9??h?aE]!H1?4&??|Qp?$l-????2?????7??n/?????.?1%??????>r?[?^??2?N?oh|M4???+?????????AVG
 P???J?"?????:?c???J?$????~?
ea?U?@z??K?????Q?DZ
?h????*%?L?!u|ut5?K?]?e?;??_??!?????*?? ?5??GY
????0G~???Z-??.??2??>?E??u????????SW???r???c??
?,T?T
S??_S???????sI???:??83?M???K????yj?%??3?	ReB???4?I?n$H??9$GgJ?O?'I??T??9h?d8I*?bL???7V,?%??'?
O??
:>w??b7?e?iU(?"???<?h??&?b??k??????????)??{&??U??Dp???"??ZP????vN)?)? 
???)??5az1?O??<???\????H\BF&??Rm??gv??<??@Z?N?=??D??Y?JJ??`0ok~~	????_???<B??y_y/?&.??V?????-.+&?f??4??4???^????`~???]u"????1?_??g?b???sF?
?????|??x???????Z\??{???
?8?o?a?R??T?E?`g?%?\?T(?S??
f??O~I	??6???????`|?*????????x?C?????>?D?????u
?~m???D?BgWd?b?qx8????'kB???z????p\???A'j????????
?NEm???rG???_????Q??U???j?i????=S
?P?????y$?tJ?41PU??97?<?7?????g{????p??-?s??5#>qL??6e&??M?zF???v??d?g?p^?^????^3_P?a???;?!?f0]p??jSq??
? ?5]?????Z(E?('???ee?$??0??z???????	?K??J?H^?E???/aP?9u	????@????????NO??K6??[?K7H9??~?*/??:P???~R'?,???sVh_???Dx^ ??????<?4
<YM?*??????aq??????`??6OvG?@f ??H>??F?Xa:????t??r???!?]<My?2?j?p?qU]
?32 ?N?v??>??????
z????6Wf??^??7?M?e?L??m??????a?5?M?j|?9?U?j??Q??q|??N	d????3?]??d?]???|kygn?q?d??B_???2?????b?^V?	?1???O?,HuK]?N?6?c`??"?`???{2?lS3+???d;r3l?~Mf???bl4?k>j?&QQ
??????;c?)%L
?C??? ??n??B"?>E*????r???`??y??!M??X?l?h?!??V.?[7.??`???V?+?f?*w:%E?=8???c??XSt???v1_?S?D?e???xG?;A??&?	?m??????&3>?M????????E%?YQ?;??????G???y????Y??;??<%??}V?X????=~?6?A???????+`?Y ???3$wC?PMOi??m??.??>O?
uZR????????0?x?*?iV?s?8??,g?????B?8?
???d2%N???Q????A?M?7??????d???|????????h_??\?"???4???????????l????to?y??+:? ??z?*"&?@??9??!?+?e ?4s????R?\S&a??'?v?
??'?%??xe+`JQ<????P8"??}?+??=??C?&?D??6??c?)h???9??????kM???-7???4?o???vlXxC8?8p?A??"??a???Ac?8?CS??$?/???b?.j5???N
#?U???U??R??S$???
%??m????I???M?5)HR?APU??;g???R????Cc???;[??\}?j1??sU???k,9?????I?-????ij?9?u`UL?}??M?C??????~?{
??b~6??????6?f?	Y??$_<M?0?{?o?NN???5????~???ny??????nk	)#$?x??Q???d?E?%c??: |BAyF?m??	+h???T???W
?????Q?4?T[2?
???p?*?%??F??K?H2?t_P???O_?8g?$????????b????p??%$`??:O??0xI???????}????h:C???????P
???????}G???z
oi??U)Z
OW?x??J2??v$??=\?\l3#???????????I?Rw?f??	2
??Fq??b?b1??$K=??
??D:$??&?`???
?R-?
?Po?T??w??6?Q%U^\\???KF?SU??}+a?N????G?#??L??I?If?gg????????mS7?????????
???)??
?q?????gw?????-M??u???????k?.??"W?Z????'??????6F;'????'(p?LH?k?F\
?;?C??5%?o????&'5M?E??H:t\a??C?*?)????5??k??x?{???????7?$?f???*p?a?a?3	{????{W??????????g??????Z??2&????	?p??P?????:?@?}`?X`cNT}??:p???j????
i??g????m??px????c???????V?Y?G???J?F??((	J?SqnN???3?c?????G?Zg???
???3)q
?????W;???9J???G??d?#?e?????3L?J???z??wc????	????jM?N?E?K8\
?????l???
??z?9?u#??s??	????????????)Y?????R??e"X??X??P??B?%n?Cl??/??*?;??????zI]?j(?;??z?R???-n^u??H??}??@&?kRZ<??:?U??;q???g?_2oW4vh????CO?#5?h???g??dt??D?%t?j?aw??Ia]????@nx?V4???xCb???5?#?o??????\m???Db???}|????a?{1???A??W??v??[?wF????
??
c0E?=?\????r)??Kv?E???5=&??!???M???a??,?r???.?P?E???%?~,j??,?}??/??????ruBjF9?	U0\?????Q??<?Q?%??0#pYP2;??;??h?:e???'/*??	??v???G??0;?\??q?,?F&?}??]????sE?,n?lC??t???99???B,8???i,??????????=?1?:??k???:????(???????U??T02?}mO}??|
??L??lN= ?R[/m?<q~?e??n?@d(?????Dx??H@??"]??w?
?r?
?C/W???a8?/;%)??~?f?S???3?|?Wl
?>P<?6?s??u8Ff?WV?I??N?s-???dd??^?H h?o_?d??'?A??bCW?>>&?K?????Ti?R&J?*?
0H?&&{KH?l^???{??#?-??Z93??2V??GdV;D?<??1???e??v4?1'/??g???~??V?u$??_'?N{??d`??G?1?h?bho??B49\>`??T?s?I?AS`}TdD?rdj?g<?@Y????| g????E?$?[+??Xy?E????U?W}??L0F??R_Rdy?
???????j????\?x??????q?~??:???Z<s??,???.V??+S?M?o?{?,?????>?9w?ty?Rh)]2 ???
??$?8d?[)?????	??`?T????I?/?
?m+"5??8???}??<??R/????:?v?oi???O:r?????
<),?>n??W_y!?????P?0?Jj?=Wm??h?0H??w??e??!??)?????b????Q?j4F?V??s}r???Z%m[ZR???E???SFL??<??R?z	???-?
m?@?ZL?4Mt?y???Z\????}r|??Ya?\??V?Fq?????\0???0?Ve??j????k?Y?????D?
i]v??,?n?Z[??j???????m
?????????a?k&??!<5??>?X?U?~]-U0?vU][??Ik &??a?,?????#
?Oo	??9J?????_???F??k???D+?E?OW\????RU???k8e???VY??T?D)?N???????A??Rr6e??$?-\???@?
(S?}y???????2??_???*??????????2?o'??Y??????7S?_????S????Q?QF???T0_JR????U??#S?????u?????Nk8????'?g?g??l????????*?arI???)^S|???|??????7?????o??~???????*e??rd?????Gz?3?5???2?c3*??/L(????u???	?oLx^???
??/M????O|?~k?O??v??}?|????D?/N??a
??x?U)S??y0%
x:lvP?H}T at M??l?^???Vg??W????y??k?E???F????????q?????????x?y?????N?????u??y?{???:??v????{?s???<?Q???O???wo|???????~???????????????????\????/?l?\?GX?~?????o???#????????????o???:????7??~?~?w?7???M??[?????+???????????7?????^???????06??[?????;???C???o?<6>????G??????????G4?o????X??V?????_??/????gv???????o}?3???6?????~??F?r????7?
Z??????v????~p>????s8?:L?????_????=x???????g>??V?U??~T?C??G~o??n|???
???????o??d??????n~????????_US???????????	/???p???6>???u???f?OV???????[????????????o????W?	!????????X?????????o|??_????????G_{??y???????M??6??Q????7??I??vr7???+
??????????q???}??;S?<??+????<rHx??$g?c?????????Oh??/o?D?~??t?d??'-??T?>`?#<{????????/??W??i??????????????}vrj????[?A????V?????|I????????9@?????=?_?%4?/?	??Y??3?A?S?7?d???{?WCO????????????/??
????\???_S??QC????!ut?&t????6?sC1?<????a?3?I?O?$~#??Q?
G?*Q?????D7u7??g4?R?
?@7?u???
h??2????b??04???????W?4?zk???n?P?'B55???$??)&n?
C?~W??UO????GSL.?oC2?'
?	S??oN1`u?HQ???t?+????????????&???#?O9??????O>L40e????&4?O??^?
???%i???.??????
????p??3??kS?~?????+
'*$??%pt<???????2?????3)M?/??w?	?3X???????M????????????V????e?O???M?
??V3???FN??????M?????????????5??R?????D??k??0?I?????????3%?????GSi??????d??4?ku??????M<O??4????*aE?
?ov*M?.M??w?
??a????N?|K?C?{??=<???????????_|?b???????G????
?$???'?a??????????z??6?2?<#=,_?}>???\?5??>)t+?-??/>??	?x?:
p???dk|%?~?R?RoQ?????a?xc{?"?b?:??3;?????^??E?
 ?gh?+H?/??9l?
-?????<??@UU?????p?	=??e?-????/??????????????
[e2?l
#????:R?????m?kv?{?????9??P?b0??????@?
??*??Vx?y???U?^?y+_D???73r
?]?U???p9.????????6L^???????':????!????l?HP?G?`@A??s?Z@?9k?Fk??r??`???q~h"????1?;???y???Z?O??g??^??G??5??
?@)}???7????`???l?}?????3j?{?H;??&??????F???Q>??????I?????^xl????}b???q??5?v?lR?l??<k???ar???????????i??Y)??|??qS?#?T?J??u=??]?9???B?xd???h?9I??b?7E??I?o???D?
+?;?;?$DC??[?Ee.??L??@m?lEj???a?.???x??+???=O'C????s ??Z??$??????S{`q?+IZKB??>\eti&??????????!F
b?.?da????d?9?????S:???~v!?3??\?LZ??z??Na<??ufjK?s??B?|?Q??)?Y
?`?]?^????7`q??'N1sKk??gk?A??h?w?y?3??,???
???",sl?/??F??????H?/??O
 
7???~?6O??????8????(
??]~????oh?#b?Y??S?^?\i:4??YXL??t!??[?????,r?@3??X??=??\q??2?Dc?????-?3H??zF9y?QE@%??@??E?d!
?t&?a?"
???ytb{?xv???fr?
{
H?fz?r3?;:???x??W??V???????k?j?C??
}A?U??>	?T???j?
?:;;?{??hcN
??d?)?_?iD,????S7?3??w?g5?K???s??????????????????=5N?W??s????????TS?k??~'hJ???{?????}???????x??=?Id?????6E?^Y??S???."?FA?+:
F?????A?`????c:??y??{??#?????x%?{???2WL(?
??S?jLK?????vad?p?U@?;nz??Q?W????Y`*.??7"??w/??????{?i
H?JL0??I??e?I????:qd#h????8?{h at ak?v?>g"$??[??o?u?x??s??J?C??????JxF$?UI%U~???)?????I,O???9?
????A????pN???"?8?;
???_?C????C7?l?<?^<?
?o
Y????7}?????f????K???g?????Zy-N??*W8?S??P??_\Z$????K??O??&??Ty???S???o??X??!???^??=??6????7v??%??????u??????0??[?.r?????lX??????}?%?D?????17??vR?^??)???_???T???D& ?V??????Z?W??o?Ckp??9J?5{t?Kf??
????X-?;S ????Q/p??FP$|2?????BKlo?_?????T0??_O?"??y`M?lcss??'?????u`???l??W??Cq\U?eZ?{??w?]]?@????-??????????????[??????^z???v^?????[?????6??S_??#????^w???
?????;???oo?o;ww??[??m?mg{oC???????)???|?????_?,,??oe?\?-Vk?o
???????!??h?1Y-{??w?b??X??N?D?h'???sd?????????e^Y?9`?ch?}tAl??C?i?s?
Rl]L??b.???X95Qs+!???*JI?L????) Kl??G??8#??f9??u??!??A'?$?????H?n??#J??????bpo???AIVL?e?b?\?Z?=???
J?.???|??E?w???Fc-?]?[??g?????????M??/???3??Wz$????
??? .??,	?E???J|????q??_?ElMz?4??i$E?B?3???LJ?W}????tnY?`?@??D??-Z5(8Sy??)&??W??~M??????????n??6?????h?y?o?%]-????
]1h?zmX@?M6?
h"z????	
?a{` ????$J	??????)??A7????zn?Y~?h%C????g???????39?.*?????7&????}?B? ?ZW?L??H??4?K??{;c.eZ??l??NvD???I/?d??-??E?1??E??|<?o??V?????>N??*???J
??????Rmq???J?%??i|?'~????U?Y?T???P??G>oi???^W?8???Z./
???????*???)?;?^s?????6???????px?*9?Q????m???????=??P?D?)S'2???7?(q??9v?????nd0t~??Mg
t????w:!??;??	3i??_?w????D??v??????]l?????W???o???
?y`??|????j ???J?1ApB#d7D?;?K?-?;l??%??Kx?B???xeL?8?o????t??a??C???0/!????n???64?=[k?z?w???????MXrv"o???TA?{x??-t??AoBx??%??v<???a3??#?d@??3nZ??;??a?T?2???:?6?????Fz??h???a??C??n??<?
?????pP??x
?D???~?y?0z???q?S???c???????bV{m?Y]e?&yW?t???4a??h?/|2? q????|<[??6??tJ???
C?7?]p?
tR??!??1i?xyX?g`?1??"
???q?{?^???:x$?s??0G?????????fFj??R???
N#<???}???????X!jnu1?&:"Q?n???}?M0?	?????(???3?'???z?6'zk1*?Ak? ??0IV?9'2(3?2????LZFGCKpKP?+?0*?~k?1k??pk?1?|????G4?,$R?8??s
b???h???z????8???.D;?kh@)"??# ?#ID?X(?????????43?D????&M	??K
r??????*}Z1?Ivf?h?Gd?PB???&???D??=?J?x??|?toc/?G??r?P?	MJ??gO????_I3?33??p?G??m8???'???B?[}:?????I^???p???i?t??????#1Wo&N^?9:E`?C??ML??!?
?????3??N>y??eL9?"-W7H??$_aA??-E?X??'?V??Y?
m??f?=??,??<??>J^ ??a????&????N?
4Y???0'.Q

O#xD*3?9???d????l?Ch??<}????w:f%
0??"?X???K?I??VY?8???????Tc/?{?>Q??n???F\m8??P???????o?n=????,Rl?u???%-?
n???
?????
?#%?
??(<???r???8O?^??$????4??m?8?u?=k???q??]?8,?Az???7$!	#Z6u\??,H	$z???????#??ETv??????'?oKw???1?Ci??!Qpl??-?=???n4??.U[???f?;????9?w ?F??1??-?Q
??"k_??	T???
? ?t??(8d"/?
?U?g??FXB?dY???????????Q?????`?X?D
????%?}?	?Z,??*???"?my?
?z?Wt6??k?!?????	?GN"?MB*
R??K(???e?*
Yc!???q???.*m??v&QD?d??O?$Sm?????????
???c?ZKx??!#??s???q.?]	?I!??"??,"???V*k??4?0???H??Iwe?V??%?v6?i?Z??9?F??id??\U?o?????m???R4?vV?????7I??.`?[:N*???u??????
??
?4?7
?????????)?????"?aT????K?.?Bu?????r??[4?n??Wo?,?????!?GZT?H?b%?m???>)?h?,??????qw?????I??? ??ifV?U??(?}#????T?l>?[?VEH?_k&ux???????}??,?,?Yh???j?Z9Gw????H?$u??0^
??
?b???4?	??????L????zW?"??yrx????	$?o??%??$??i?C?2??W?23??????I?7??????}?+??HV7a??'&????ci?p?i5??????%w??t/?????t?l?Xx]?Q??C???????????0????;??`??EcA?i"???jP4{?????D~???P??B?????R??
???\?!???s[?a??
??1?????a???p??l??????U?/??0?`u?????'?????Doh??x????\d??y;???r/?X?j?S??pI????#??J?{?J1kM0??a???ga?\s?rMC??
????????&
D????B~????D?Ek#?yX:"??
?$?h??????'?w??K?r?+?????P?%A`??
???H%0	(??1q?j???bPS?
??Q???fbEI?hI??0?:hw??61??
?T?dP?	.HX???????RK???dp"w?VC#. ?D??b;a?2???C??%zn????K?VM/L?GA|?U@??s?|?A?L?xYF??~?;??=i????;???????.R8?? ??xq6?a=<+
???P??y
9??k?48???????"???_???y??w??
i??
?V?0????<O?v??#
?x5???w?TJ??;?:R??s/????6?#? ???b????2??V?2kF?,[e?
?D:??=
c??????s????	?3??PD?25b??G?????^hV >???f?K(??1
)q?r?S???dKdX?~ON?\????{?!???~???
M??Y???a??????Pb)@?SD??	>;???.???g???(??Ek?9@???93HH??R???f3?u?(J???Q\?a3b?@???^?5a?>??f?9?g?%4??x`??	?@?1???F~??!==a)E?+$m?y=??Z2???Y?S\$*??p?Cc?L?s?
wKQ?7[???????b?/?f??
?;??????8!v??b??h????r?"???P?j??n???0?,??ZeSkd?"?2?]
u.j??0G???????9??I?.+??k????pf????l?eL?4??y?c}
_?dT????	???	?PO?B??m:0d???Z?H?]#???2?Q?%:]
?????8?
?;?d`??H?????r???`?w?^*???4??c?s;x?'?E?<?C?m?ZPi?{<???cbE?
U??gW???W?pR?^?????	??q?(%???xl|?+?m???+??M?h}a?(y?8??l???	Qj&?20?02ld&?#????A
?$g?<?[c??T?E6?p?=j?x
|???"?@7?8FJMV??b??!??B??
??a
?A???k? w?9?]?V??7?a/J?&?0????/?mk??r\?H???Ba??VZ?????
"????O??Box???c4U???\6?????????*?q???i*??}6]W&?*?y?i]m?$???A?9h??
?H???.?z)R??b5????k=?*?-??,????A???[ ??KL>????b??jG???
<??????@AN????BR?I?Xo??
;mcH??3[H?B6???????:f??;??<??r????;l?G>??&Z7?????.h?q?6$&???
?Ys???s?=37{&Qe?a^???
???r??6??
?sI?9?]?w-9R at 1?D7?cp???N?{x-B??????ZK?j?????Z??w??t???
???K?????qV?q????
??5i?	????F5`?vr????6?3?k??*?<[??N??K?<?U?tA??s???V??
???w??H?@b??}RNto????*
:R?!?$???K????@z??3?h???,??????'?????E?,???9R???>?-G??	X"??Z3k?+?E?c?C!NbV??q?'????-??R??&??????^?$&?N?????C?????v?7???2?'?6}?
y??v?????h#8?c?({?
?U$/
a??ad??eH?x?????
?L?^???u1H"i??&????D??0:)m??5I#?XU??V?cXFS_B?wS??o?/????????????(??Dd???8`??Z???m?F??U??2??z9I?????E????
0??^?+y??pkqV?o=n'?????\l?
??9:&????5$0???TZEXYl,9?hH|T??k??	?????)???FF???E4#?00???-aU7a??v?"~?5??A?<??-???p?????v1
/??=?????	`??L4??'??R????*h/??2??M?w!??"?????M?q??3?????????d???v??10H}?`u1????`*?0bKZ?????	?????E5?3??????e'??@??[?`???o
.???A?"?|s
?c?g?\g???
#??9?!???,?H8?a????{WGU?d
]????????E\M{$+A?E??l?'?{NH?b?
?3???t
?I??\rg???+1????h?uC??nBk?????i??-Z9.??u:h?????j?[s??????<(V?Y??oS{?W????7/g6*%"rS$?Ph?
?
Mg?????\1??-????[bz1r????????0:??}!s?y
Z?UB?????2r3???????J?????{?%?%???{9???|d C??????$/??"?z????@76?6?R?&???'?Yn!}?c??g\???a?x0xy?Zm(9??^?m?z?5 at FJ?;?7??:A??<???'6K?p???:?%{?e,?I?q&??2?S?%1 ?B,????pCb?????>???0???c?h_??
_??2?g????????N????/?0QG???X?,???^??x?W?y????D'?[d???/3"??w!DY??[??<j?Px???y???!s?$?S?U?^?!?????????:????u?Pc?#?F72??????M??9?A?v??j????3w?$q???;W$?????-M?8?@?????k?k???????E^????K???!?X@??z?????	?i8.`?;c?x)&?*&^??S0?:aL????????L,.???m4?J??"o#???b}?&n???3???G>??Ob???"??????????I?????cB??[v,?qL??t????z?P?0???g,LK3???O???.}??t???>;?B|?a???%?-{R?S	?
[???e#?c:??K?M??r??a???I?J*?Yu_???!?z?u????&?2??2]?	???????s?F?$76>xr?????Mh!???v?;j~???x%m0?rK???{???'l9?8??T???5Z?p|??)L??????%}R??????
?\?]??K?L???A?B???k?$PJ9??C?o?y??DO
?^?8?x?:M{???*????WOU at W
??????v??^??????N?j?3?1s<??!?>N?Ad.r????p-e???;?r??6?G?8?%??e???Y??-???P?X}\??)?O??D?D?GrP4?_?G#????E|)?(??'$??.N&?\O????%J????={
;rR???????{??am???y??_A2n`??????l?>a??yi?p????,+???aT`???a??*{?M4Nu$?7#?+????Na??nR?E??tIR??=?i??????9???
??Cv]	?
?q?Y?6?4{?&??oT??,4?6'?+ ????c-kA	??K)??????0?[?Z???Y
t?fBik_36}`????UG?s%??4???J??????
?QYT>??z??]0?G?p??6?
?a]M??c??aDGJxB??Y!?????????!?/??/qR|a?:?A?l?????0O2??5A??Q'K!????<T??!????x0Y?4???A??????
?'?G?????~.???-?^?P?????^B?8???M<{????5?#???n????t;????"?????1A-Y??R&????KV?^???CX-??????"Z?Q?O
&7?;>?S??
?kYu??Q?????^*2???!R??j*h???/)?????
b3
~?Ti???%????u??
y]??1?????2.???q?,??u??\?S?T$]?
?(???d]xP2"8]4?????:S????cn4?Jm-?-??y)VQ???????

C???{$	Cd??'?i?e??????_?;?h9???zu?/$8?oL?	2]??F?^
2?1.t)"??v???:???cv???x??=P3?????H]F?b#g??g?*???Y??
???
??K	??iR.B?l?
?k0??=)c!?3?????_
p0???????????02??b?h?^$??(??+????C9t8?	ua?1O??v??4zl82*1?Mc?:??.?c`Ac??3??b??AcB?|???r	X?E??NV?i?:R|?KilIM?;G?3!?????J?0gF?? ?#??`???,??
???pBn???f?&??5k??-?n??Of|???9x??vw???yr??
?D8eU?q??3;??	1???????X?)????j???|8:z}?1H?u]C???1?I??-3	????L\k???Z??\??~???j8?B?]B?e1??gX?g?T??4-1?e???CJ&v??4?Q???3?????UcWmm???;;?[{??;?;?B??????z?????w???????_???????????V???l??????????9?????=?p????????????[?
?-?p?????K
?m?g?qwc/????^??Us?;UT?Ww??]?[???;&?_??a????????=3???h?????zI??P???;??]
?
k?- r?:??F@???}?3w??w)???.b`n}uoU?????:???o
?h????=????%??f?
???????xcg=?7????????$?a??
?Ef?pL?N?=A???	?H?s??:????????~ ?=?:??3t&f
I=? ?X???;?
h??LQ?b8??a]3>????2???uZ%?9??6-??-`Ve
O??-?Z??Ami??%V?v???
n??????????6???ZE?=t?qC?`?????????|?~?Fa??`??+07???r?XYw\eKIS9?l%@xG9?????&E??vDq9???????M????wb
943?t?????????;?$?Lk*??F'??_????Wgms??l???a?a????????)?h????W??
?X?8????kPy`?
?8Q?$????d????t????
_?a?1h???????>? S\2{??mg????D?@??????????fS???f???????r?s?\nn??)?????(??Q0???Z\?e=U??{4l=Z6???8??
??????*????
M?P\????*?????_UE?g????~?"-????E??QQ????r!????y????m?????+??F?)
R)?{n???s[?S?/???p?4~??{?m?^^?3D??
??~A]??07?|!/??P?k?????0dq??qhc??U+cq?T????uAZ???J?GssMZ1\Phr??????j'<F9V????$
??n+?????6????0?a$???^????[?7???A???{;?S??? ????P?M????0xp?Q?%ya?eN????j?NenN???Ez-h~]"???y`???w?c??Np??????O?o?R?????????jy??
|Y????a??:??Y???~????d??=i?????<
????t]8^??N?F?H??AX???+??s'?RM??j:
?????|???B??????wv?N?F?\????XXIJ U ?P?v??$?_p4b???3P?%F?}P
??9/h?o?OFx?g???
?ss?
?@?{?t??QmJ??~??2^????*???p-X4???M21!??L|M7
?
40
K?{????#?t	???7C??[U1??????:?`3T^~C?&?????:A?????R??VDx0><?(<?j?Fx?,8??F'???P^?vD?b?:Z??K?k_q\3??x3H????i??l;?r??jV?e?L/?f??1????????7D?f,m??qg???X???+f/mk???YM?*1??OxX\*?9??
??jyfM??6Os??ND7??;??x?s4NL????P????
y?`??n??j?$?????}??u4?	??/8?????5?
a??
7?3?|[???4???
??
:???(5r?b4?Z6 ???7??
D????f?v*??S????%??o|??}j?j??????7&??
???{
???
?{?N??
,??
Z?4?,?@,jE???p9w6???}?-}?f???|?m\?,?%??[??F??q_PY?F??????<%?J,??':??gz?c,82?D:?D?/:??j??(3????w?y?bY
?!?_?
???Srf=?0????nAV???J2!f???x??v??b??B^q3?v{?x??A????br-??
Ldc?I??I??gq
u???????]???5???W??P???C
@??/!?rE????W???a????Xau??=?p8??Nf<?0???Z??p????lom??J????@U7U?c??w???x?:^??P?9=?>??x??NNr0?Cw8;???p??????M?????o???8?w???s??\???8tw?ma*????u????{0??
?????
?5??\c??.??n}?|[??????%?????????????u?ls?jw?CueE??B????????????/?Ww??????N?~?????\???w??????&?}{{K????7}n?????*?????Ck???][????A5???????i[Y#??R}??)??XQk???]??-?8??{?IE
?7c?'om@`v?????yT?-&?
Ql????2Nr<??????e??p?y?#?0?e??@? ??
Fjc??IJ??]L??dr?g@?????\F[??O?_??G?,cR/H<?`????)?-w-????Wm'??????x?n??n????;??L5
?D#GWS,~????
nQ??j69?*??#%NY??9?E?G?Xb\?<Gz????<?P??!0????c?E at P???4????I?QG??7?gI?6??+?~e?1????}~??Lsx??`?mu???:3???h??d??>Q?U??KN2?w?????PN???|5j7$??Fr9G?l???hrM???)Y???c5??e?:?????????????M?=
Y???*?;??????zI]?j(?;??y??=??7?:a{?LxR???
	'?5)-?J(??????P?'???2H?v^c?&????0???J?N>3y??"AFk?????V??"????V?8?p??)&?x???
?Gd?q??N?e
???/d.1`
3??T?2_??}|?Q??a?{1???A??W??v??[?$c^??????9?????	J??J????n}7???b;?k?S??V?h?
?4I4???S9?qpH??n?Fna??{s>?F?????}?!??sswC?llT0??
?SyOp$????D???B,?L?B????f????2???????B??????????i????4?y?????Yd??19JN??B?g??b?W??xLY
?P4????z"?????8??1?oR??? ?N??Tr???????'LF??/x? _pg??.??gu?2??????*?/?????}?f??k???1??P???l?j???s`7?&??m????l???]???H3?~7????c?h??????[?w???????K?8???r?l?@?nGOV?r??t??F?????p?:????`+?)??
nb??V????g+B?^???\?'??5????*w???? ???????	????r????????????????????????????????????????????????????????????????????????????????.?

--- NEW FILE sslogger.spec ---
%{!?log_dir:%define log_dir /%{_localstatedir}/log/slog}
%{!?sslogger_user:%define sslogger_user slogger}
%{!?sslogger_group:%define sslogger_group sloggers}

Summary: A keystroke logging utility for privileged user escalation
Name: sslogger
Version: 0.9
Release: 50%{?dist}
License: GPLv3+
Group: User Interface/Desktops
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://sslogger.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Requires: bash logrotate 
Requires(pre): shadow-utils util-linux
%description
A keystroke logging utility for privileged user escalation



%pre
getent group sloggers > /dev/null || groupadd  %{sslogger_group} -r &>/dev/null
getent passwd slogger > /dev/null ||/usr/sbin/useradd -c "Privilege keystroke logger"  %{sslogger_user} -s /sbin/nologin -r -M  -g sloggers -d %{log_dir} &>/dev/null

%prep
%setup -q
make clean

%build
export CFLAGS="$RPM_OPT_FLAGS -DLOG_DIR=%{_localstatedir}/log/slog -DCONF_FILE=%{_sysconfdir}/sslogger.conf"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_localstatedir}/log/slog
chmod 750 %{buildroot}/%{_localstatedir}/log/slog
make install DESTDIR=%{buildroot} VERSION=%{version}
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
cp -p sslogger_rotate %{buildroot}%{_sysconfdir}/logrotate.d/sslogger

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/slog
%{_bindir}/sreplay
%attr (6555,%{sslogger_user},%{sslogger_group}) %{_bindir}/sslogger
%attr(775,%{sslogger_user},%{sslogger_group})  %{log_dir}
%config(noreplace) %{_sysconfdir}/sslogger.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sslogger
%{_mandir}/man*/* 
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/TODO
%doc %{_docdir}/%{name}-%{version}/LICENSE

%changelog
* Sun Aug 23 2009 Ed Brand <edbrand at brandint.com> - 0.9-50
- fixed to logrotate

* Tue Jul 14 2009 Ed Brand <edbrand at brandint.com> - 0.9-49
- fixes to specfile: _sysconfdir

* Sat Jul 11 2009 Ed Brand <<edbrand at brandint.com> - 0.9-48
- Misc spec file fixes

* Thu Jul 09 2009 Ed Brand <edbrand at brandint.com> - 0.9-46
- Updates to man pages

* Thu Jul 09 2009 Ed Brand <<edbrand at brandint.com> - 0.9-45
- Fixes to $log_dir permission

* Sun Jul 05 2009 Ed Brand <edbrand at brandint.com> - 0.9-40
- Split man files into slog, sslogger and sreplay
- Chmod 775 $log_dir to allow normal user access
- Add check to slog to disallowe passing '-' when -c option is used

* Tue May 18 2009 Ed Brand <edbrand at brandint.com> - 0.9-32
- removed $global

* Sun Mar 29 2009 Ed Brand <edbrand at brandint.com> - 0.9-30
- Change Licence to GPLv3
- Misc. spec file fixes




From cchance at fedoraproject.org  Mon Sep 21 02:28:03 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 21 Sep 2009 02:28:03 +0000 (UTC)
Subject: rpms/ibus-table/devel .cvsignore, 1.13, 1.14 ibus-table.spec, 1.26, 
	1.27 sources, 1.14, 1.15
Message-ID: <20090921022803.1AFC511C00E6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25644

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
upgraded to upstream source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Sep 2009 06:54:07 -0000	1.13
+++ .cvsignore	21 Sep 2009 02:28:02 -0000	1.14
@@ -1 +1 @@
-ibus-table-1.2.0.20090904.tar.gz
+ibus-table-1.2.0.20090912.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ibus-table.spec	4 Sep 2009 06:54:07 -0000	1.26
+++ ibus-table.spec	21 Sep 2009 02:28:02 -0000	1.27
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    1.2.0.20090904
+Version:    1.2.0.20090912
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
@@ -16,6 +16,14 @@ BuildArch:  noarch
 %description
 The package contains general Table engine for IBus platform.
 
+%package additional
+Summary:    Additional tables for general table engine of IBus.
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description additional
+This package contains additional tables.
+
 %prep
 %setup -q
 
@@ -32,6 +40,10 @@ The package contains general Table engin
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post additional
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/additional/compose.db
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/additional/latex.db
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
@@ -40,7 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/tables
 %dir %{_datadir}/%{name}/icons
 %dir %{_datadir}/%{name}/data
-%dir %{_datadir}/%{name}/setup
 %{_datadir}/ibus/component/table.xml
 %{_datadir}/pkgconfig/%{name}.pc
 %{_datadir}/%{name}/tables/template.txt
@@ -63,15 +74,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/icons/tc-mode.svg
 %{_datadir}/%{name}/icons/tcb-mode.svg
 %{_datadir}/%{name}/data/pinyin_table.txt.bz2
-%{_datadir}/%{name}/engine/KeyEvent.py
-%{_datadir}/%{name}/engine/KeyEvent.pyc
-%{_datadir}/%{name}/engine/KeyEvent.pyo
-%{_datadir}/%{name}/engine/config.py
-%{_datadir}/%{name}/engine/config.pyc
-%{_datadir}/%{name}/engine/config.pyo
-%{_datadir}/%{name}/engine/editor.py
-%{_datadir}/%{name}/engine/editor.pyc
-%{_datadir}/%{name}/engine/editor.pyo
 %{_datadir}/%{name}/engine/factory.py
 %{_datadir}/%{name}/engine/factory.pyc
 %{_datadir}/%{name}/engine/factory.pyo
@@ -90,19 +92,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/engine/tabsqlitedb.py
 %{_datadir}/%{name}/engine/tabsqlitedb.pyc
 %{_datadir}/%{name}/engine/tabsqlitedb.pyo
-%{_datadir}/%{name}/meter/speedmeter.py
-%{_datadir}/%{name}/meter/speedmeter.pyc
-%{_datadir}/%{name}/meter/speedmeter.pyo
-%{_datadir}/%{name}/setup/main.py
-%{_datadir}/%{name}/setup/main.pyc
-%{_datadir}/%{name}/setup/main.pyo
-%{_datadir}/%{name}/setup/setup.glade
+%{_datadir}/%{name}/engine/speedmeter.py
+%{_datadir}/%{name}/engine/speedmeter.pyc
+%{_datadir}/%{name}/engine/speedmeter.pyo
 %{_bindir}/%{name}-createdb
 %{_libexecdir}/ibus-engine-table
-%{_libexecdir}/ibus-setup-table
-%{_libexecdir}/ibus-table-meter
+
+%files additional
+%defattr(-,root,root,-)
+%{_datadir}/ibus-table/tables/compose.db
+%{_datadir}/ibus-table/tables/latex.db
+%{_datadir}/ibus-table/icons/compose.svg
+%{_datadir}/ibus-table/icons/latex.svg
 
 %changelog
+* Fri Sep 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090912-1.fc12
+- Upgraded to upstream source.
+
 * Fri Sep 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090904-1.fc12
 - Updated source with additional tables separated.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Sep 2009 06:54:07 -0000	1.14
+++ sources	21 Sep 2009 02:28:02 -0000	1.15
@@ -1 +1 @@
-0ca33287ad0efe0c3a4ef4520c8a2c3d  ibus-table-1.2.0.20090904.tar.gz
+22c3994f665b129adc1db6eabed90fda  ibus-table-1.2.0.20090912.tar.gz



From cchance at fedoraproject.org  Mon Sep 21 02:34:28 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 21 Sep 2009 02:34:28 +0000 (UTC)
Subject: rpms/ibus-table/devel ibus-table.spec,1.27,1.28
Message-ID: <20090921023428.4B77711C00E6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27537

Modified Files:
	ibus-table.spec 
Log Message:
corrected path of post section of additional


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ibus-table.spec	21 Sep 2009 02:28:02 -0000	1.27
+++ ibus-table.spec	21 Sep 2009 02:34:28 -0000	1.28
@@ -41,8 +41,8 @@ This package contains additional tables.
 rm -rf $RPM_BUILD_ROOT
 
 %post additional
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/additional/compose.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/additional/latex.db
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)



From mbarnes at fedoraproject.org  Mon Sep 21 03:31:17 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 21 Sep 2009 03:31:17 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.24,
	1.116.2.25 evolution.spec, 
	1.394.2.54, 1.394.2.55 sources, 1.116.2.29, 1.116.2.30
Message-ID: <20090921033117.CA41C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11088

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Sun Sep 20 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.10.fc12
- Snapshot of "kill-bonobo" progress at commit 41dbadc.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.24
retrieving revision 1.116.2.25
diff -u -p -r1.116.2.24 -r1.116.2.25
--- .cvsignore	19 Sep 2009 20:05:00 -0000	1.116.2.24
+++ .cvsignore	21 Sep 2009 03:31:16 -0000	1.116.2.25
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-041daf6.tar.bz2
+evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.54
retrieving revision 1.394.2.55
diff -u -p -r1.394.2.54 -r1.394.2.55
--- evolution.spec	19 Sep 2009 20:05:00 -0000	1.394.2.54
+++ evolution.spec	21 Sep 2009 03:31:16 -0000	1.394.2.55
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 041daf6
+%define hash 41dbadc
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Sun Sep 20 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.10.fc12
+- Snapshot of "kill-bonobo" progress at commit 41dbadc.
+
 * Sat Sep 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.9.fc12
 - Snapshot of "kill-bonobo" progress at commit 041daf6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.29
retrieving revision 1.116.2.30
diff -u -p -r1.116.2.29 -r1.116.2.30
--- sources	19 Sep 2009 20:05:00 -0000	1.116.2.29
+++ sources	21 Sep 2009 03:31:16 -0000	1.116.2.30
@@ -1 +1 @@
-29ba0f32fd2ad5637c0ef2cf66a64698  evolution-2.29.1-kill-bonobo-041daf6.tar.bz2
+51c3c681a9c2bb1b0f8d59bfea4c7b01  evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2



From cchance at fedoraproject.org  Mon Sep 21 04:37:08 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 21 Sep 2009 04:37:08 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.12,1.13
Message-ID: <20090921043708.4780311C0043@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	cjkuni-fonts.spec 
Log Message:
* Mon Sep 21 2009 Caius kaio Chance <k at kaio.me> - 0.2.20080216.1-27.fc12
- Merged from F-11 tree.
- Obsoleted cjkuni-fonts-common.
- Resolves: rhbz#507637 (using font.{dir,scale} from upstream source)



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cjkuni-fonts.spec	24 Jul 2009 18:59:15 -0000	1.12
+++ cjkuni-fonts.spec	21 Sep 2009 04:37:07 -0000	1.13
@@ -4,21 +4,25 @@ CJK Unifonts are Unicode TrueType fonts 
 available by Arphic Technology under "Arphic Public License" and extended by \
 the CJK Unifonts project.
 
-%define gsdir           %{_datadir}/ghostscript/conf.d
-%define catalogue       %{_sysconfdir}/X11/fontpath.d
+%define umingdir         %{_datadir}/fonts/cjkuni-uming
+%define ukaidir          %{_datadir}/fonts/cjkuni-ukai
 
-%define umingbuilddir   %{fontname}-uming-fonts-%{version}
-%define ukaibuilddir    %{fontname}-ukai-fonts-%{version}
+%define gsdir            %{_datadir}/ghostscript/conf.d
+%define catalogue        %{_sysconfdir}/X11/fontpath.d
 
-%define _cncompatdir     %{_datadir}/fonts/zh_CN
-%define _twcompatdir     %{_datadir}/fonts/zh_TW
-%define cncompatdir      %{_cncompatdir}/TrueType
-%define twcompatdir      %{_twcompatdir}/TrueType
+%define umingbuilddir    %{fontname}-uming-fonts-%{version}
+%define ukaibuilddir     %{fontname}-ukai-fonts-%{version}
 
+%define cncompatdir      %{_datadir}/fonts/zh_CN/TrueType
+%define twcompatdir      %{_datadir}/fonts/zh_TW/TrueType
+
+%define _transdir        %{_datadir}/fonts/cjkunifonts-
+%define umingtransdir    %{_transdir}uming
+%define ukaitransdir     %{_transdir}ukai
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     26%{?dist}
+Release:     27%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -46,7 +50,7 @@ BuildRequires:    fontpackages-devel >= 
 %package -n %{fontname}-uming-fonts
 Summary:      Chinese Unicode TrueType font in Ming face.
 Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
+Obsoletes:    %{fontname}-fonts-common
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -54,9 +58,7 @@ Obsoletes:    cjkunifonts-uming < 0.2.20
 
 CJK Unifonts in Ming face.
 
-%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc
-
-# remaining uming files
+%files -n %{fontname}-uming-fonts
 %doc ../%{umingbuilddir}/license
 %doc ../%{umingbuilddir}/CONTRIBUTERS
 %doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -67,11 +69,21 @@ CJK Unifonts in Ming face.
 %doc ../%{umingbuilddir}/NEWS
 %doc ../%{umingbuilddir}/README
 %doc ../%{umingbuilddir}/TODO
+%dir %{umingdir}
+%dir %{_fontconfig_templatedir}
+%dir %{_fontconfig_confdir}
+%dir %{catalogue}
+%{umingdir}/uming.ttc
+%{umingdir}/fonts.dir
+%{umingdir}/fonts.scale
+%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
+%{_fontconfig_confdir}/*-ttf-arphic-uming*.conf
+%{catalogue}/%{name}-uming
 
 %package -n %{fontname}-ukai-fonts
 Summary:      Chinese Unicode TrueType font in Kai face.
 Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
+Obsoletes:    %{fontname}-fonts-common
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -79,9 +91,7 @@ Obsoletes:    cjkunifonts-ukai < 0.2.200
 
 CJK Unifonts in Kai face.
 
-%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc
-
-# remaining ukai files
+%files -n %{fontname}-ukai-fonts
 %doc ../%{ukaibuilddir}/license
 %doc ../%{ukaibuilddir}/CONTRIBUTERS
 %doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -92,6 +102,16 @@ CJK Unifonts in Kai face.
 %doc ../%{ukaibuilddir}/NEWS
 %doc ../%{ukaibuilddir}/README
 %doc ../%{ukaibuilddir}/TODO
+%dir %{ukaidir}
+%dir %{_fontconfig_templatedir}
+%dir %{_fontconfig_confdir}
+%dir %{catalogue}
+%{ukaidir}/ukai.ttc
+%{ukaidir}/fonts.dir
+%{ukaidir}/fonts.scale
+%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
+%{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf
+%{catalogue}/%{name}-ukai
 
 %package -n %{fontname}-fonts-ghostscript
 Summary:      Chinese Unicode TrueType font ghostscript files.
@@ -101,7 +121,7 @@ Requires:     ghostscript >= 8.63-4
 Requires:     %{fontname}-uming-fonts = %{version}-%{release}
 Requires:     %{fontname}-ukai-fonts = %{version}-%{release}
 Conflicts:    cjkuni-fonts-common <= 0.2.20080216.1-19
-Obsoletes:    cjkuni-fonts-common < 0.2.20080216.1-20 
+Obsoletes:    cjkuni-fonts-common
 
 %description -n %{fontname}-fonts-ghostscript
 %common_desc
@@ -110,6 +130,7 @@ CJK Unifonts ghostscript files.
 
 %files -n %{fontname}-fonts-ghostscript
 %defattr(0644,root,root,0755)
+%dir %{gsdir}
 %{gsdir}/FAPIcidfmap.zh_TW
 %{gsdir}/FAPIcidfmap.zh_CN
 %{gsdir}/cidfmap.zh_TW
@@ -117,33 +138,6 @@ CJK Unifonts ghostscript files.
 %{gsdir}/CIDFnmap.zh_TW
 %{gsdir}/CIDFnmap.zh_CN
 
-%package -n %{fontname}-fonts-common
-Summary:      Chinese Unicode TrueType font common files.
-Group:        User Interface/X
-Requires:     fontpackages-filesystem >= 1.13
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    cjkunifonts-common < 0.2.20080216.1-16 
-
-%description -n %{fontname}-fonts-common
-%common_desc
-
-CJK Unifonts common files.
-
-%files -n %{fontname}-fonts-common
-%defattr(0644,root,root,0755)
-%dir %{_fontdir}
-%{gsdir}/FAPIcidfmap.zh_TW
-%{gsdir}/FAPIcidfmap.zh_CN
-%{gsdir}/cidfmap.zh_TW
-%{gsdir}/cidfmap.zh_CN
-%{gsdir}/CIDFnmap.zh_TW
-%{gsdir}/CIDFnmap.zh_CN
-%verify(not md5 size mtime) %{_fontdir}/fonts.dir
-%verify(not md5 size mtime) %{_fontdir}/fonts.scale
-%{catalogue}/%{name}
-
 %package -n %{fontname}-fonts-compat
 Summary:      Chinese Unicode TrueType font compatibility files.
 Group:        User Interface/X
@@ -157,12 +151,12 @@ CJK Unifonts compatibility files.
 
 %files -n %{fontname}-fonts-compat
 %defattr(0644,root,root,0755)
-%dir %{_cncompatdir}
-%dir %{_twcompatdir}
 %dir %{cncompatdir}
 %dir %{twcompatdir}
-%verify(not md5 size mtime) %{cncompatdir}/zysong.ttf
-%verify(not md5 size mtime) %{twcompatdir}/bsmi00lp.ttf
+%{cncompatdir}/zysong.ttf
+%{twcompatdir}/bsmi00lp.ttf
+%{umingtransdir}
+%{ukaitransdir}
 
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
@@ -177,15 +171,27 @@ CJK Unifonts compatibility files.
 %install
 %__rm -rf %{buildroot}
 
-# *.ttc(ttf)
-%__install -m 0755 -d %{buildroot}%{_fontdir}
-%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{_fontdir}/
-%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{_fontdir}/
-
-# fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \
-    -o %{buildroot}%{_fontdir}/fonts.scale
-%{_bindir}/mkfontdir %{buildroot}%{_fontdir}
+# *.ttc(ttf) and font.{dir,scale}
+%__install -m 0755 -d %{buildroot}%{umingdir}
+%__install -m 0755 -d %{buildroot}%{ukaidir}
+%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{umingdir}/
+%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaidir}/
+
+# fonts.{scale,dir} # use upstream included one instead
+%__install -m 0644 ../%{umingbuilddir}/fonts.dir %{buildroot}%{umingdir}/
+%__install -m 0644 ../%{umingbuilddir}/fonts.scale %{buildroot}%{umingdir}/
+%__install -m 0644 ../%{ukaibuilddir}/fonts.dir %{buildroot}%{ukaidir}/
+%__install -m 0644 ../%{ukaibuilddir}/fonts.scale %{buildroot}%{ukaidir}/
+#cd %{buildroot}%{umingdir}
+#%{_bindir}/ttmkfdir -d %{buildroot}%{umingdir} \
+#    -o %{buildroot}%{umingdir}/fonts.scale
+#%{_bindir}/mkfontdir %{buildroot}%{umingdir}
+#cd -
+#cd %{buildroot}%{ukaidir}
+#%{_bindir}/ttmkfdir -d %{buildroot}%{ukaidir} \
+#    -o %{buildroot}%{ukaidir}/fonts.scale
+#%{_bindir}/mkfontdir %{buildroot}%{ukaidir}
+#cd -
 
 # *.conf
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
@@ -217,18 +223,28 @@ cd -
 
 # catalogue
 %__install -m 0755 -d %{buildroot}%{catalogue}
-%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+%__ln_s %{umingdir} %{buildroot}%{catalogue}/%{name}-uming
+%__ln_s %{ukaidir} %{buildroot}%{catalogue}/%{name}-ukai
 
 # backward compat to obsoleted ttf
 %__install -m 0755 -d %{buildroot}%{cncompatdir}
 %__install -m 0755 -d %{buildroot}%{twcompatdir}
-%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
-%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
+%__ln_s %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
+%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
+
+# backward compt to transition dir
+%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
+%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Mon Sep 21 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-27.fc12
+- Merged from F-11 tree.
+- Obsoleted cjkuni-fonts-common.
+- Resolves: rhbz#507637 (using font.{dir,scale} from upstream source)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.20080216.1-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mbarnes at fedoraproject.org  Mon Sep 21 04:39:12 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 21 Sep 2009 04:39:12 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.55,1.394.2.56
Message-ID: <20090921043912.94A4211C0338@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20742

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Forgot to bump the release tag.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.55
retrieving revision 1.394.2.56
diff -u -p -r1.394.2.55 -r1.394.2.56
--- evolution.spec	21 Sep 2009 03:31:16 -0000	1.394.2.55
+++ evolution.spec	21 Sep 2009 04:39:12 -0000	1.394.2.56
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.27.99
-Release: 1.kb.9%{?dist}
+Release: 1.kb.10%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL



From ellert at fedoraproject.org  Mon Sep 21 04:57:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 21 Sep 2009 04:57:59 +0000 (UTC)
Subject: rpms/voms/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 voms-portability.patch, 1.1, 1.2 voms.spec, 1.1, 1.2
Message-ID: <20090921045759.BC89A11C0043@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26261/devel

Modified Files:
	.cvsignore import.log sources voms-portability.patch voms.spec 
Log Message:
* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:31:49 -0000	1.2
+++ .cvsignore	21 Sep 2009 04:57:59 -0000	1.3
@@ -1 +1 @@
-voms-1.9.11.tar.gz
+voms-1.9.12.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:31:49 -0000	1.1
+++ import.log	21 Sep 2009 04:57:59 -0000	1.2
@@ -1 +1,2 @@
 voms-1_9_11-4_fc11:HEAD:voms-1.9.11-4.fc11.src.rpm:1252549706
+voms-1_9_12_1-1_fc11:HEAD:voms-1.9.12.1-1.fc11.src.rpm:1253508983


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:31:49 -0000	1.2
+++ sources	21 Sep 2009 04:57:59 -0000	1.3
@@ -1 +1 @@
-86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz
+8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms-portability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-portability.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-portability.patch	21 Sep 2009 04:57:59 -0000	1.2
@@ -3,7 +3,7 @@ diff -ur voms-1.9.11.orig/configure.ac v
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
 @@ -1,6 +1,6 @@
  
- AC_INIT([GLite Security VOMS], [1.9.11])
+ AC_INIT([GLite Security VOMS], [1.9.12])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms.spec	10 Sep 2009 02:31:49 -0000	1.1
+++ voms.spec	21 Sep 2009 04:57:59 -0000	1.2
@@ -1,8 +1,8 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.11
-Release:	4%{?dist}
+Version:	1.9.12.1
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -10,9 +10,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_11 \
-#		  -d voms-1.9.11 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
+#		  -r glite-security-voms_R_1_9_12_1 \
+#		  -d voms-1.9.12.1 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -456,6 +456,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
+- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
+
 * Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
 - Fix building with openssl 1.0
 



From ellert at fedoraproject.org  Mon Sep 21 04:59:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 21 Sep 2009 04:59:33 +0000 (UTC)
Subject: rpms/voms/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 voms-portability.patch, 1.1, 1.2 voms.spec, 1.1, 1.2
Message-ID: <20090921045933.44B8411C0043@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26842/F-11

Modified Files:
	.cvsignore import.log sources voms-portability.patch voms.spec 
Log Message:
* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:34:27 -0000	1.2
+++ .cvsignore	21 Sep 2009 04:59:31 -0000	1.3
@@ -1 +1 @@
-voms-1.9.11.tar.gz
+voms-1.9.12.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:34:27 -0000	1.1
+++ import.log	21 Sep 2009 04:59:31 -0000	1.2
@@ -1 +1,2 @@
 voms-1_9_11-4_fc11:F-11:voms-1.9.11-4.fc11.src.rpm:1252550034
+voms-1_9_12_1-1_fc11:F-11:voms-1.9.12.1-1.fc11.src.rpm:1253509138


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:34:27 -0000	1.2
+++ sources	21 Sep 2009 04:59:31 -0000	1.3
@@ -1 +1 @@
-86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz
+8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms-portability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-portability.patch	10 Sep 2009 02:34:27 -0000	1.1
+++ voms-portability.patch	21 Sep 2009 04:59:31 -0000	1.2
@@ -3,7 +3,7 @@ diff -ur voms-1.9.11.orig/configure.ac v
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
 @@ -1,6 +1,6 @@
  
- AC_INIT([GLite Security VOMS], [1.9.11])
+ AC_INIT([GLite Security VOMS], [1.9.12])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms.spec	10 Sep 2009 02:34:27 -0000	1.1
+++ voms.spec	21 Sep 2009 04:59:32 -0000	1.2
@@ -1,8 +1,8 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.11
-Release:	4%{?dist}
+Version:	1.9.12.1
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -10,9 +10,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_11 \
-#		  -d voms-1.9.11 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
+#		  -r glite-security-voms_R_1_9_12_1 \
+#		  -d voms-1.9.12.1 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -456,6 +456,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
+- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
+
 * Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
 - Fix building with openssl 1.0
 



From ellert at fedoraproject.org  Mon Sep 21 05:00:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 21 Sep 2009 05:00:27 +0000 (UTC)
Subject: rpms/voms/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 voms-portability.patch, 1.1, 1.2 voms.spec, 1.1, 1.2
Message-ID: <20090921050027.6E5E211C0419@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27279/F-10

Modified Files:
	.cvsignore import.log sources voms-portability.patch voms.spec 
Log Message:
* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:36:46 -0000	1.2
+++ .cvsignore	21 Sep 2009 05:00:26 -0000	1.3
@@ -1 +1 @@
-voms-1.9.11.tar.gz
+voms-1.9.12.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:36:46 -0000	1.1
+++ import.log	21 Sep 2009 05:00:26 -0000	1.2
@@ -1 +1,2 @@
 voms-1_9_11-4_fc11:F-10:voms-1.9.11-4.fc11.src.rpm:1252550169
+voms-1_9_12_1-1_fc11:F-10:voms-1.9.12.1-1.fc11.src.rpm:1253509196


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:36:46 -0000	1.2
+++ sources	21 Sep 2009 05:00:26 -0000	1.3
@@ -1 +1 @@
-86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz
+8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/voms-portability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-portability.patch	10 Sep 2009 02:36:46 -0000	1.1
+++ voms-portability.patch	21 Sep 2009 05:00:26 -0000	1.2
@@ -3,7 +3,7 @@ diff -ur voms-1.9.11.orig/configure.ac v
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
 @@ -1,6 +1,6 @@
  
- AC_INIT([GLite Security VOMS], [1.9.11])
+ AC_INIT([GLite Security VOMS], [1.9.12])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/voms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms.spec	10 Sep 2009 02:36:46 -0000	1.1
+++ voms.spec	21 Sep 2009 05:00:26 -0000	1.2
@@ -1,8 +1,8 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.11
-Release:	4%{?dist}
+Version:	1.9.12.1
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -10,9 +10,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_11 \
-#		  -d voms-1.9.11 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
+#		  -r glite-security-voms_R_1_9_12_1 \
+#		  -d voms-1.9.12.1 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -456,6 +456,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
+- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
+
 * Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
 - Fix building with openssl 1.0
 



From ellert at fedoraproject.org  Mon Sep 21 05:01:30 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 21 Sep 2009 05:01:30 +0000 (UTC)
Subject: rpms/voms/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 voms-portability.patch, 1.1, 1.2 voms.spec, 1.1, 1.2
Message-ID: <20090921050130.E201E11C0043@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27703/EL-5

Modified Files:
	.cvsignore import.log sources voms-portability.patch voms.spec 
Log Message:
* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:39:25 -0000	1.2
+++ .cvsignore	21 Sep 2009 05:01:30 -0000	1.3
@@ -1 +1 @@
-voms-1.9.11.tar.gz
+voms-1.9.12.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:39:25 -0000	1.1
+++ import.log	21 Sep 2009 05:01:30 -0000	1.2
@@ -1 +1,2 @@
 voms-1_9_11-4_el5:EL-5:voms-1.9.11-4.el5.src.rpm:1252550329
+voms-1_9_12_1-1_el5:EL-5:voms-1.9.12.1-1.el5.src.rpm:1253509256


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:39:25 -0000	1.2
+++ sources	21 Sep 2009 05:01:30 -0000	1.3
@@ -1 +1 @@
-86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz
+8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms-portability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-portability.patch	10 Sep 2009 02:39:25 -0000	1.1
+++ voms-portability.patch	21 Sep 2009 05:01:30 -0000	1.2
@@ -3,7 +3,7 @@ diff -ur voms-1.9.11.orig/configure.ac v
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
 @@ -1,6 +1,6 @@
  
- AC_INIT([GLite Security VOMS], [1.9.11])
+ AC_INIT([GLite Security VOMS], [1.9.12])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms.spec	10 Sep 2009 02:39:25 -0000	1.1
+++ voms.spec	21 Sep 2009 05:01:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		voms
-Version:	1.9.11
-Release:	4%{?dist}
+Version:	1.9.12.1
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -8,9 +8,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_11 \
-#		  -d voms-1.9.11 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
+#		  -r glite-security-voms_R_1_9_12_1 \
+#		  -d voms-1.9.12.1 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -357,6 +357,9 @@ fi
 %doc INSTALL.Fedora
 
 %changelog
+* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
+- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
+
 * Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
 - Fix building with openssl 1.0
 



From ellert at fedoraproject.org  Mon Sep 21 05:02:19 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 21 Sep 2009 05:02:19 +0000 (UTC)
Subject: rpms/voms/EL-4 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 voms-portability.patch, 1.1, 1.2 voms.spec, 1.1, 1.2
Message-ID: <20090921050219.06C2311C0043@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28034/EL-4

Modified Files:
	.cvsignore import.log sources voms-portability.patch voms.spec 
Log Message:
* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:41:42 -0000	1.2
+++ .cvsignore	21 Sep 2009 05:02:18 -0000	1.3
@@ -1 +1 @@
-voms-1.9.11.tar.gz
+voms-1.9.12.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:41:42 -0000	1.1
+++ import.log	21 Sep 2009 05:02:18 -0000	1.2
@@ -1 +1,2 @@
 voms-1_9_11-4_el5:EL-4:voms-1.9.11-4.el5.src.rpm:1252550473
+voms-1_9_12_1-1_el5:EL-4:voms-1.9.12.1-1.el5.src.rpm:1253509314


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:41:42 -0000	1.2
+++ sources	21 Sep 2009 05:02:18 -0000	1.3
@@ -1 +1 @@
-86ca9fbf86b2aa61401f46d96c1b99bb  voms-1.9.11.tar.gz
+8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms-portability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-portability.patch	10 Sep 2009 02:41:43 -0000	1.1
+++ voms-portability.patch	21 Sep 2009 05:02:18 -0000	1.2
@@ -3,7 +3,7 @@ diff -ur voms-1.9.11.orig/configure.ac v
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
 @@ -1,6 +1,6 @@
  
- AC_INIT([GLite Security VOMS], [1.9.11])
+ AC_INIT([GLite Security VOMS], [1.9.12])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms.spec	10 Sep 2009 02:41:43 -0000	1.1
+++ voms.spec	21 Sep 2009 05:02:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		voms
-Version:	1.9.11
-Release:	4%{?dist}
+Version:	1.9.12.1
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -8,9 +8,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_11 \
-#		  -d voms-1.9.11 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.11.tar.gz voms-1.9.11
+#		  -r glite-security-voms_R_1_9_12_1 \
+#		  -d voms-1.9.12.1 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -357,6 +357,9 @@ fi
 %doc INSTALL.Fedora
 
 %changelog
+* Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
+- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
+
 * Mon Sep 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.11-4
 - Fix building with openssl 1.0
 



From bskeggs at fedoraproject.org  Mon Sep 21 05:11:30 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 21 Sep 2009 05:11:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel nouveau-bicubic-2x.patch, 1.13,
	1.14 nouveau-multiple-xserver.patch, 1.15,
	1.16 nouveau-tile7000.patch, 1.3, 1.4 xorg-x11-drv-nouveau.spec,
	1.58, 1.59
Message-ID: <20090921051130.72C4A11C0043@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30585

Modified Files:
	nouveau-bicubic-2x.patch nouveau-multiple-xserver.patch 
	nouveau-tile7000.patch xorg-x11-drv-nouveau.spec 
Log Message:
* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-11.20090921gitdf95ebd
- fix an accel pitch issue seen in rh#523281



nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nouveau-bicubic-2x.patch	14 Sep 2009 06:12:15 -0000	1.13
+++ nouveau-bicubic-2x.patch	21 Sep 2009 05:11:29 -0000	1.14
@@ -1,4 +1,4 @@
-From 36281908ca3785b8fb50907b892ff49970c6f2c7 Mon Sep 17 00:00:00 2001
+From 25777010799a8eccde5bf00c61bc2685753db80f Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
  	else
  		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 -- 
-1.6.4.2
+1.6.4.4
 

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nouveau-multiple-xserver.patch	14 Sep 2009 06:12:15 -0000	1.15
+++ nouveau-multiple-xserver.patch	21 Sep 2009 05:11:29 -0000	1.16
@@ -1,4 +1,4 @@
-From 9a882ef6e1e0112112ac9819632bd320f1f34c1a Mon Sep 17 00:00:00 2001
+From 38c897a1cbc4cd809f8c250a41a03299ec6d08c9 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -153,5 +153,5 @@ index 9317b5e..37a8da7 100644
  	/* We don't need to allocate cursors / lut here if we're using
  	 * kernel modesetting
 -- 
-1.6.4.2
+1.6.4.4
 

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nouveau-tile7000.patch	14 Sep 2009 06:12:15 -0000	1.3
+++ nouveau-tile7000.patch	21 Sep 2009 05:11:30 -0000	1.4
@@ -1,4 +1,4 @@
-From 44148dd51aa13876490063ce4e89ae94b6d9b604 Mon Sep 17 00:00:00 2001
+From f59c4dfa92909d43e1512dfaa4a23a3e7e37ed68 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] f12: use 0x7000 fla
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index e152e7f..455c44f 100644
+index 82b86c4..1157221 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -442,7 +442,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -443,7 +443,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50) {
  		tile_mode = 4;
@@ -22,7 +22,7 @@ index e152e7f..455c44f 100644
  		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
  		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
  	} else {
-@@ -1063,7 +1063,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1064,7 +1064,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;
@@ -64,7 +64,7 @@ index 37a8da7..b2a24d7 100644
  	} else {
  		size *= pScrn->virtualY;
 diff --git a/src/nv_type.h b/src/nv_type.h
-index 285392d..089b090 100644
+index 68c415f..e24f30c 100644
 --- a/src/nv_type.h
 +++ b/src/nv_type.h
 @@ -113,6 +113,8 @@ typedef struct _NVRec {
@@ -77,5 +77,5 @@ index 285392d..089b090 100644
      struct nouveau_bo * scanout;
      struct nouveau_bo * offscreen;
 -- 
-1.6.4.2
+1.6.4.4
 


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xorg-x11-drv-nouveau.spec	14 Sep 2009 06:12:15 -0000	1.58
+++ xorg-x11-drv-nouveau.spec	21 Sep 2009 05:11:30 -0000	1.59
@@ -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 20090914
-%define git_version 1b72020
+%define gitdate 20090921
+%define git_version df94ebd
 
 %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:   10.%{snapshot}%{?dist}
+Release:   11.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-11.20090921gitdf95ebd
+- fix an accel pitch issue seen in rh#523281
+
 * Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-10.20090914git1b72020
 - wait for fbcon copy to complete before switching mode (rh#522688)
 



From bskeggs at fedoraproject.org  Mon Sep 21 05:16:08 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 21 Sep 2009 05:16:08 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.45, 1.46 sources, 1.46,
	1.47
Message-ID: <20090921051608.39DB711C0043@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32575

Modified Files:
	.cvsignore sources 
Log Message:
should add the new sources..



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	14 Sep 2009 06:12:15 -0000	1.45
+++ .cvsignore	21 Sep 2009 05:16:07 -0000	1.46
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090914git1b72020.tar.bz2
+xf86-video-nouveau-0.0.15-20090921gitdf94ebd.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	14 Sep 2009 06:12:15 -0000	1.46
+++ sources	21 Sep 2009 05:16:08 -0000	1.47
@@ -1 +1 @@
-cebf1f04b03cf524930bd0f472a5f8b7  xf86-video-nouveau-0.0.15-20090914git1b72020.tar.bz2
+4acb3671cbb414ee27c8babeaea90722  xf86-video-nouveau-0.0.15-20090921gitdf94ebd.tar.bz2



From bskeggs at fedoraproject.org  Mon Sep 21 05:38:43 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 21 Sep 2009 05:38:43 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.57, 1.58 kernel.spec, 1.1821, 
	1.1822
Message-ID: <20090921053843.BB34711C0043@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6317

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: more on rh#522649, added some useful info to debugfs
- lots of coding style cleanups, which is the reason for the huge commit



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5476 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  540 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  754 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  437 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1262 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  357 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  848 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  296 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  585 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  178 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  950 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  688 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  789 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  224 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2238 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  809 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  479 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  450 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58650 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.57 -r 1.58 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- drm-nouveau.patch	16 Sep 2009 04:41:24 -0000	1.57
+++ drm-nouveau.patch	21 Sep 2009 05:38:42 -0000	1.58
@@ -61,64 +61,6 @@ index 3c8827a..d22e64b 100644
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
 +obj-y			+= i2c/
-diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 6246e3f..436e2fe 100644
---- a/drivers/gpu/drm/drm_bufs.c
-+++ b/drivers/gpu/drm/drm_bufs.c
-@@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
- 
- EXPORT_SYMBOL(drm_get_resource_len);
- 
--static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
--						  struct drm_local_map *map)
-+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+					   struct drm_local_map *map)
- {
- 	struct drm_map_list *entry;
- 	list_for_each_entry(entry, &dev->maplist, head) {
--		/*
--		 * Because the kernel-userspace ABI is fixed at a 32-bit offset
--		 * while PCI resources may live above that, we ignore the map
--		 * offset for maps of type _DRM_FRAMEBUFFER or _DRM_REGISTERS.
--		 * It is assumed that each driver will have only one resource of
--		 * each type.
--		 */
- 		if (!entry->map ||
- 		    map->type != entry->map->type ||
- 		    entry->master != dev->primary->master)
- 			continue;
--		switch (map->type) {
--		case _DRM_SHM:
--			if (map->flags != _DRM_CONTAINS_LOCK)
--				break;
--		case _DRM_REGISTERS:
--		case _DRM_FRAME_BUFFER:
--			return entry;
--		default: /* Make gcc happy */
--			;
--		}
--		if (entry->map->offset == map->offset)
-+
-+		if (entry->map->offset == map->offset ||
-+		    (map->type == _DRM_SHM && map->flags & _DRM_CONTAINS_LOCK))
- 			return entry;
- 	}
- 
- 	return NULL;
- }
-+EXPORT_SYMBOL(drm_find_matching_map);
- 
- static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
- 			  unsigned long user_token, int hashed_handle, int shm)
-@@ -357,7 +343,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
- 	/* We do it here so that dev->struct_mutex protects the increment */
- 	user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle :
- 		map->offset;
--	ret = drm_map_handle(dev, &list->hash, user_token, 0,
-+	ret = drm_map_handle(dev, &list->hash, user_token, 1,
- 			     (map->type == _DRM_SHM));
- 	if (ret) {
- 		if (map->type == _DRM_REGISTERS)
 diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
 new file mode 100644
 index 0000000..6d2abaf
@@ -131,10 +73,10 @@ index 0000000..6d2abaf
 +obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
 new file mode 100644
-index 0000000..0a3f7a0
+index 0000000..9422a74
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,532 @@
+@@ -0,0 +1,531 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -350,12 +292,11 @@ index 0000000..0a3f7a0
 +		priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
 +
 +	drm_connector_property_set_value(connector,
-+					 encoder->dev->mode_config.tv_subconnector_property,
-+					 priv->subconnector);
++			encoder->dev->mode_config.tv_subconnector_property,
++							priv->subconnector);
 +
-+	return priv->subconnector?
-+		connector_status_connected
-+		: connector_status_disconnected;
++	return priv->subconnector ? connector_status_connected :
++					connector_status_disconnected;
 +}
 +
 +static int ch7006_encoder_get_modes(struct drm_encoder *encoder,
@@ -371,7 +312,7 @@ index 0000000..0a3f7a0
 +			continue;
 +
 +		drm_mode_probed_add(connector,
-+				    drm_mode_duplicate(encoder->dev, &mode->mode));
++				drm_mode_duplicate(encoder->dev, &mode->mode));
 +
 +		n++;
 +	}
@@ -644,11 +585,11 @@ index 0000000..0a3f7a0
 +	drm_i2c_encoder_unregister(&ch7006_driver);
 +}
 +
-+int ch7006_debug = 0;
++int ch7006_debug;
 +module_param_named(debug, ch7006_debug, int, 0600);
 +MODULE_PARM_DESC(debug, "Enable debug output.");
 +
-+char *ch7006_tv_norm = NULL;
++char *ch7006_tv_norm;
 +module_param_named(tv_norm, ch7006_tv_norm, charp, 0600);
 +MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
 +		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, PAL-60, NTSC-M, NTSC-J.\n"
@@ -669,7 +610,7 @@ index 0000000..0a3f7a0
 +module_exit(ch7006_exit);
 diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c
 new file mode 100644
-index 0000000..7ffe0bd
+index 0000000..87f5445
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_mode.c
 @@ -0,0 +1,473 @@
@@ -971,8 +912,8 @@ index 0000000..7ffe0bd
 +	uint8_t *power = &priv->state.regs[CH7006_POWER];
 +	int subconnector;
 +
-+	subconnector = priv->select_subconnector?
-+		priv->select_subconnector : priv->subconnector;
++	subconnector = priv->select_subconnector ? priv->select_subconnector :
++							priv->subconnector;
 +
 +	*power = CH7006_POWER_RESET;
 +
@@ -1148,10 +1089,10 @@ index 0000000..7ffe0bd
 +}
 diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h
 new file mode 100644
-index 0000000..576bbea
+index 0000000..b06d3d9
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_priv.h
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,344 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -1252,7 +1193,8 @@ index 0000000..576bbea
 +	int last_dpms;
 +};
 +
-+#define to_ch7006_priv(x) ((struct ch7006_priv *)to_encoder_slave(x)->slave_priv)
++#define to_ch7006_priv(x) \
++	((struct ch7006_priv *)to_encoder_slave(x)->slave_priv)
 +
 +extern int ch7006_debug;
 +extern char *ch7006_tv_norm;
@@ -1286,22 +1228,25 @@ index 0000000..576bbea
 +			dev_printk(KERN_DEBUG, &client->dev,		\
 +				   "%s: " format, __func__, ## __VA_ARGS__); \
 +	} while (0)
-+#define ch7006_info(client, format, ...) dev_info(&client->dev, format, __VA_ARGS__)
-+#define ch7006_err(client, format, ...) dev_err(&client->dev, format, __VA_ARGS__)
++#define ch7006_info(client, format, ...) \
++				dev_info(&client->dev, format, __VA_ARGS__)
++#define ch7006_err(client, format, ...) \
++				dev_err(&client->dev, format, __VA_ARGS__)
 +
-+#define __mask(src, bitfield) (((2 << (1?bitfield)) - 1) & ~((1 << (0?bitfield)) - 1))
++#define __mask(src, bitfield) \
++		(((2 << (1 ? bitfield)) - 1) & ~((1 << (0 ? bitfield)) - 1))
 +#define mask(bitfield) __mask(bitfield)
 +
-+#define __bitf(src, bitfield, x) (((x) >> (src) << (0?bitfield)) &	\
-+				  __mask(src, bitfield))
++#define __bitf(src, bitfield, x) \
++		(((x) >> (src) << (0 ? bitfield)) &  __mask(src, bitfield))
 +#define bitf(bitfield, x) __bitf(bitfield, x)
 +#define bitfs(bitfield, s) __bitf(bitfield, bitfield##_##s)
 +#define setbitf(state, reg, bitfield, x)				\
 +	state->regs[reg] = (state->regs[reg] & ~mask(reg##_##bitfield))	\
 +		| bitf(reg##_##bitfield, x)
 +
-+#define __unbitf(src, bitfield, x) ((x & __mask(src, bitfield)) \
-+				    >> (0?bitfield) << (src))
++#define __unbitf(src, bitfield, x) \
++		((x & __mask(src, bitfield)) >> (0 ? bitfield) << (src))
 +#define unbitf(bitfield, x) __unbitf(bitfield, x)
[...7623 lines suppressed...]
 new file mode 100644
-index 0000000..062d085
+index 0000000..225f301
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
-@@ -0,0 +1,499 @@
+@@ -0,0 +1,508 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + *
@@ -56970,7 +57527,7 @@ index 0000000..062d085
 +
 +/*NOTE: - Assumes 0x1700 already covers the correct MiB of PRAMIN
 + */
-+#define BAR0_WI32(g,o,v) do {                                     \
++#define BAR0_WI32(g, o, v) do {                                   \
 +	uint32_t offset;                                          \
 +	if ((g)->im_backing) {                                    \
 +		offset = (g)->im_backing_start;                   \
@@ -56980,7 +57537,7 @@ index 0000000..062d085
 +	}                                                         \
 +	offset += (o);                                            \
 +	nv_wr32(dev, NV_RAMIN + (offset & 0xfffff), (v));              \
-+} while(0)
++} while (0)
 +
 +int
 +nv50_instmem_init(struct drm_device *dev)
@@ -56998,7 +57555,7 @@ index 0000000..062d085
 +	dev_priv->engine.instmem.priv = priv;
 +
 +	/* Save state, will restore at takedown. */
-+	for (i = 0x1700; i <= 0x1710; i+=4)
++	for (i = 0x1700; i <= 0x1710; i += 4)
 +		priv->save1700[(i-0x1700)/4] = nv_rd32(dev, i);
 +
 +	/* Reserve the last MiB of VRAM, we should probably try to avoid
@@ -57066,24 +57623,27 @@ index 0000000..062d085
 +	dev_priv->fifos[0] = dev_priv->fifos[127] = chan;
 +
 +	/* Channel's PRAMIN object + heap */
-+	if ((ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
-+					   NULL, &chan->ramin)))
++	ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
++							NULL, &chan->ramin);
++	if (ret)
 +		return ret;
 +
 +	if (nouveau_mem_init_heap(&chan->ramin_heap, c_base, c_size - c_base))
 +		return -ENOMEM;
 +
 +	/* RAMFC + zero channel's PRAMIN up to start of VM pagedir */
-+	if ((ret = nouveau_gpuobj_new_fake(dev, c_ramfc, c_offset + c_ramfc,
-+					   0x4000, 0, NULL, &chan->ramfc)))
++	ret = nouveau_gpuobj_new_fake(dev, c_ramfc, c_offset + c_ramfc,
++						0x4000, 0, NULL, &chan->ramfc);
++	if (ret)
 +		return ret;
 +
 +	for (i = 0; i < c_vmpd; i += 4)
 +		BAR0_WI32(chan->ramin->gpuobj, i, 0);
 +
 +	/* VM page directory */
-+	if ((ret = nouveau_gpuobj_new_fake(dev, c_vmpd, c_offset + c_vmpd,
-+					   0x4000, 0, &chan->vm_pd, NULL)))
++	ret = nouveau_gpuobj_new_fake(dev, c_vmpd, c_offset + c_vmpd,
++					   0x4000, 0, &chan->vm_pd, NULL);
++	if (ret)
 +		return ret;
 +	for (i = 0; i < 0x4000; i += 8) {
 +		BAR0_WI32(chan->vm_pd, i + 0x00, 0x00000000);
@@ -57093,11 +57653,12 @@ index 0000000..062d085
 +	/* PRAMIN page table, cheat and map into VM at 0x0000000000.
 +	 * We map the entire fake channel into the start of the PRAMIN BAR
 +	 */
-+	if ((ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pt_size, 0x1000,
-+					  0, &priv->pramin_pt)))
++	ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pt_size, 0x1000,
++							0, &priv->pramin_pt);
++	if (ret)
 +		return ret;
 +
-+	for (i = 0, v = c_offset; i < pt_size; i+=8, v+=0x1000) {
++	for (i = 0, v = c_offset; i < pt_size; i += 8, v += 0x1000) {
 +		if (v < (c_offset + c_size))
 +			BAR0_WI32(priv->pramin_pt->gpuobj, i + 0, v | 1);
 +		else
@@ -57114,13 +57675,15 @@ index 0000000..062d085
 +					     NV50_VM_BLOCK/65536*8, 0, 0,
 +					     &chan->vm_vram_pt[i]);
 +		if (ret) {
-+			NV_ERROR(dev, "Error creating VRAM page tables: %d\n", ret);
++			NV_ERROR(dev, "Error creating VRAM page tables: %d\n",
++									ret);
 +			dev_priv->vm_vram_pt_nr = i;
 +			return ret;
 +		}
 +		dev_priv->vm_vram_pt[i] = chan->vm_vram_pt[i]->gpuobj;
 +
-+		for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size; v+=4)
++		for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size;
++								v += 4)
 +			BAR0_WI32(dev_priv->vm_vram_pt[i], v, 0);
 +
 +		BAR0_WI32(chan->vm_pd, 0x10 + (i*8),
@@ -57129,8 +57692,9 @@ index 0000000..062d085
 +	}
 +
 +	/* DMA object for PRAMIN BAR */
-+	if ((ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
-+					  &priv->pramin_bar)))
++	ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
++							&priv->pramin_bar);
++	if (ret)
 +		return ret;
 +	BAR0_WI32(priv->pramin_bar->gpuobj, 0x00, 0x7fc00000);
 +	BAR0_WI32(priv->pramin_bar->gpuobj, 0x04, dev_priv->ramin_size - 1);
@@ -57140,8 +57704,9 @@ index 0000000..062d085
 +	BAR0_WI32(priv->pramin_bar->gpuobj, 0x14, 0x00000000);
 +
 +	/* DMA object for FB BAR */
-+	if ((ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
-+					  &priv->fb_bar)))
++	ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
++							&priv->fb_bar);
++	if (ret)
 +		return ret;
 +	BAR0_WI32(priv->fb_bar->gpuobj, 0x00, 0x7fc00000);
 +	BAR0_WI32(priv->fb_bar->gpuobj, 0x04, 0x40000000 +
@@ -57167,9 +57732,10 @@ index 0000000..062d085
 +	/* Assume that praying isn't enough, check that we can re-read the
 +	 * entire fake channel back from the PRAMIN BAR */
 +	dev_priv->engine.instmem.prepare_access(dev, false);
-+	for (i = 0; i < c_size; i+=4) {
++	for (i = 0; i < c_size; i += 4) {
 +		if (nv_rd32(dev, NV_RAMIN + i) != nv_ri32(dev, i)) {
-+			NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n", i);
++			NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n",
++									i);
 +			dev_priv->engine.instmem.finish_access(dev);
 +			return -EINVAL;
 +		}
@@ -57206,8 +57772,8 @@ index 0000000..062d085
 +		return;
 +
 +	/* Restore state from before init */
-+	for (i = 0x1700; i <= 0x1710; i+=4)
-+		nv_wr32(dev, i, priv->save1700[(i-0x1700)/4]);
++	for (i = 0x1700; i <= 0x1710; i += 4)
++		nv_wr32(dev, i, priv->save1700[(i - 0x1700) / 4]);
 +
 +	nouveau_gpuobj_ref_del(dev, &priv->fb_bar);
 +	nouveau_gpuobj_ref_del(dev, &priv->pramin_bar);
@@ -57470,7 +58036,7 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..45b0ff7
+index 0000000..a2dee96
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
 @@ -0,0 +1,250 @@
@@ -57526,7 +58092,7 @@ index 0000000..45b0ff7
 +		return;
 +	}
 +	BEGIN_RING(evo, 0, NV50_EVO_SOR(encoder->or, MODE_CTRL), 1);
-+	OUT_RING  (evo, 0);
++	OUT_RING(evo, 0);
 +}
 +
 +static void nv50_sor_dpms(struct drm_encoder *drm_encoder, int mode)
@@ -57645,7 +58211,7 @@ index 0000000..45b0ff7
 +		return;
 +	}
 +	BEGIN_RING(evo, 0, NV50_EVO_SOR(encoder->or, MODE_CTRL), 1);
-+	OUT_RING  (evo, mode_ctl);
++	OUT_RING(evo, mode_ctl);
 +}
 +
 +static const struct drm_encoder_helper_funcs nv50_sor_helper_funcs = {
@@ -58309,19 +58875,6 @@ index b940fdf..cfa6af4 100644
  unifdef-y += savage_drm.h
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index eeefb63..1345c39 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
- extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
- 
- 				/* Buffer management support (drm_bufs.h) */
-+extern struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+						  drm_local_map_t *map);
- extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
- extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
- extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
 diff --git a/include/drm/i2c/ch7006.h b/include/drm/i2c/ch7006.h
 new file mode 100644
 index 0000000..8390b43


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -p -r1.1821 -r1.1822
--- kernel.spec	18 Sep 2009 15:38:49 -0000	1.1821
+++ kernel.spec	21 Sep 2009 05:38:43 -0000	1.1822
@@ -2070,6 +2070,10 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: more on rh#522649, added some useful info to debugfs
+- lots of coding style cleanups, which is the reason for the huge commit
+
 * Fri Sep 18 2009 Dave Jones <davej at redhat.com>
 - %ghost the dracut initramfs file.
 



From ovasik at fedoraproject.org  Mon Sep 21 06:04:16 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 21 Sep 2009 06:04:16 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.6-lzipcolor.patch, NONE,
	1.1 coreutils-DIR_COLORS, 1.7, 1.8 coreutils-DIR_COLORS.256color,
	1.7, 1.8 coreutils-DIR_COLORS.lightbgcolor, 1.2,
	1.3 coreutils.spec, 1.276, 1.277
Message-ID: <20090921060416.3FD7211C0335@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15426

Modified Files:
	coreutils-DIR_COLORS coreutils-DIR_COLORS.256color 
	coreutils-DIR_COLORS.lightbgcolor coreutils.spec 
Added Files:
	coreutils-7.6-lzipcolor.patch 
Log Message:
add dircolors color for GNU lzip (#516897)

coreutils-7.6-lzipcolor.patch:
 dircolors.hin |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE coreutils-7.6-lzipcolor.patch ---
diff -urNp coreutils-7.6-orig/src/dircolors.hin coreutils-7.6/src/dircolors.hin
--- coreutils-7.6-orig/src/dircolors.hin	2009-09-01 13:01:16.000000000 +0200
+++ coreutils-7.6/src/dircolors.hin	2009-09-21 08:00:38.000000000 +0200
@@ -131,6 +131,7 @@ EXEC 01;32
 .cpio 01;31
 .7z  01;31
 .rz  01;31
+.lz  01;31
 
 # image formats
 .jpg 01;35


Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- coreutils-DIR_COLORS	21 Aug 2009 11:49:02 -0000	1.7
+++ coreutils-DIR_COLORS	21 Sep 2009 06:04:14 -0000	1.8
@@ -123,6 +123,7 @@ EXEC 01;32
 .Z   01;31
 .dz  01;31
 .gz  01;31
+.lz  01;31
 .xz  01;31
 .bz2 01;31
 .tbz 01;31


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- coreutils-DIR_COLORS.256color	18 Sep 2009 07:19:28 -0000	1.7
+++ coreutils-DIR_COLORS.256color	21 Sep 2009 06:04:14 -0000	1.8
@@ -98,6 +98,7 @@ EXEC 01;38;5;34
 .Z   01;38;5;9
 .dz  01;38;5;9
 .gz  01;38;5;9
+.lz  01;38;5;9
 .xz  01;38;5;9
 .bz2 01;38;5;9
 .tbz 01;38;5;9


Index: coreutils-DIR_COLORS.lightbgcolor
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.lightbgcolor,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- coreutils-DIR_COLORS.lightbgcolor	21 Aug 2009 11:49:02 -0000	1.2
+++ coreutils-DIR_COLORS.lightbgcolor	21 Sep 2009 06:04:14 -0000	1.3
@@ -101,6 +101,7 @@ EXEC 00;32
 .Z   00;31
 .dz  00;31
 .gz  00;31
+.lz  00;31
 .xz  00;31
 .bz2 00;31
 .tbz 00;31


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- coreutils.spec	18 Sep 2009 07:19:28 -0000	1.276
+++ coreutils.spec	21 Sep 2009 06:04:14 -0000	1.277
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -19,6 +19,7 @@ Source203:  coreutils-runuser-l.pamd
 
 # From upstream
 Patch1: coreutils-cpxattrreadonly.patch
+Patch2: coreutils-lzipcolor.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -109,6 +110,7 @@ Libraries for coreutils package.
 
 # From upstream
 %patch1 -p1 -b .roxattr
+%patch2 -p1 -b .lzip
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -327,6 +329,9 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Mon Sep 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-4
+- add dircolors color for GNU lzip (#516897)
+
 * Fri Sep 18 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-3
 - fixed typo in DIR_COLORS.256color causing no color for
   multihardlink



From ovasik at fedoraproject.org  Mon Sep 21 06:08:14 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 21 Sep 2009 06:08:14 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.277,1.278
Message-ID: <20090921060814.11F5911C0043@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16862

Modified Files:
	coreutils.spec 
Log Message:
fix the patchname


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- coreutils.spec	21 Sep 2009 06:04:14 -0000	1.277
+++ coreutils.spec	21 Sep 2009 06:08:13 -0000	1.278
@@ -19,7 +19,7 @@ Source203:  coreutils-runuser-l.pamd
 
 # From upstream
 Patch1: coreutils-cpxattrreadonly.patch
-Patch2: coreutils-lzipcolor.patch
+Patch2: coreutils-7.6-lzipcolor.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch



From mathstuf at fedoraproject.org  Mon Sep 21 06:34:00 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Mon, 21 Sep 2009 06:34:00 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.18, 1.19
Message-ID: <20090921063401.1064311C0043@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27115

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Update snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- kde-plasma-networkmanagement.spec	16 Sep 2009 00:28:32 -0000	1.18
+++ kde-plasma-networkmanagement.spec	21 Sep 2009 06:33:57 -0000	1.19
@@ -6,21 +6,20 @@ We still recommend nm-applet from Networ
 Name:           kde-plasma-networkmanagement
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
-Version:        0.8
-Release:        0.22.20090815svn%{?dist}
+Version:        0.9
+Release:        0.1.20090919svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
-Group:          Applications/Internet 
+Group:          Applications/Internet
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1011744 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
-Source0: kde-plasma-networkmanagement-0.1.tar.bz2
+#  svn export -r 1025605 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -31,17 +30,17 @@ Requires: NetworkManager
 
 # multilib upgrades
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
-Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
-the default NetworkManager service. 
+the default NetworkManager service.
 %{?disclaimer}
 
 %package -n knetworkmanager
-Summary: NetworkManager KDE 4 integration 
+Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
 Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager
@@ -59,8 +58,7 @@ Requires: knetworkmanager = %{?epoch:%{e
 
 %package -n knetworkmanager-openvpn
 Summary:        OpenVPN support for knetworkmanager
-Group:          Applications/Internet 
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release} 
+Group:          Applications/Internet
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -70,8 +68,7 @@ Provides:       kde-plasma-networkmanage
 
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
-Group:          Applications/Internet 
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Group:          Applications/Internet
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
@@ -81,7 +78,7 @@ Provides:       kde-plasma-networkmanage
 
 
 %prep
-%setup -q -n kde-plasma-networkmanagement-0.1
+%setup -q
 
 
 %build
@@ -170,18 +167,25 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %files -n kde-plasma-networkmanagement
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop
 %{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 %{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
 %{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
 
 
 %changelog
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
+- Version seems to be .9 now
+- Fix trailing spaces
+- New snapshot
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
 - Epoch: 1
 
 * Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
 - use knetworkmanager pkg names
-- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path 
+- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
   for knetworkmanager-0.7 (from F-10)
 - nuke -devel pkg
 - drop references to short-lived kde-plasma-networkmanager
@@ -246,7 +250,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 * Sat Feb 7 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.3.20090207svn
 - Add changelog
-- Added tarball creation 
+- Added tarball creation
 - Changed name to kde-plasma-networkmanagement
 
 * Tue Jan 13 2009 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1-0.2.20090111svn



From hicham at fedoraproject.org  Mon Sep 21 06:38:48 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon, 21 Sep 2009 06:38:48 +0000 (UTC)
Subject: rpms/solang/devel solang-0001-Silenced-Gtk-warnings.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 solang.spec, 1.2,
	1.3 sources, 1.2, 1.3 main-window.cpp.patch, 1.1,
	NONE solang.desktop, 1.1, NONE solang.png, 1.1, NONE
Message-ID: <20090921063848.2C6B511C0043@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/solang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29078/devel

Modified Files:
	.cvsignore import.log solang.spec sources 
Added Files:
	solang-0001-Silenced-Gtk-warnings.patch 
Removed Files:
	main-window.cpp.patch solang.desktop solang.png 
Log Message:


solang-0001-Silenced-Gtk-warnings.patch:
 application/main-window.cpp     |    5 ++++-
 attribute/date-manager.cpp      |    5 ++++-
 attribute/property-manager.cpp  |    5 ++++-
 attribute/tag-manager.cpp       |    5 ++++-
 importer/importer.cpp           |    6 +++++-
 renderer/browser-renderer.cpp   |    5 ++++-
 renderer/editor-renderer.cpp    |    5 ++++-
 renderer/enlarged-renderer.cpp  |    5 ++++-
 renderer/slideshow-renderer.cpp |    5 ++++-
 renderer/slideshow-window.cpp   |    5 ++++-
 renderer/thumbnail-view.cpp     |    6 ++++--
 11 files changed, 45 insertions(+), 12 deletions(-)

--- NEW FILE solang-0001-Silenced-Gtk-warnings.patch ---
>From 8fc9488ed55106ff3e8fb28130d8a77b63f716c3 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi at gnu.org>
Date: Mon, 21 Sep 2009 02:53:21 +0300
Subject: [PATCH] Silenced Gtk+ warnings.

The Gtk::ActionGroups need to be explicitly named:
https://bugzilla.gnome.org/501746
---
 src/application/main-window.cpp     |    5 ++++-
 src/attribute/date-manager.cpp      |    5 ++++-
 src/attribute/property-manager.cpp  |    5 ++++-
 src/attribute/tag-manager.cpp       |    5 ++++-
 src/importer/importer.cpp           |    6 +++++-
 src/renderer/browser-renderer.cpp   |    5 ++++-
 src/renderer/editor-renderer.cpp    |    5 ++++-
 src/renderer/enlarged-renderer.cpp  |    5 ++++-
 src/renderer/slideshow-renderer.cpp |    5 ++++-
 src/renderer/slideshow-window.cpp   |    5 ++++-
 src/renderer/thumbnail-view.cpp     |    5 ++++-
 11 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/application/main-window.cpp b/src/application/main-window.cpp
index c0f521f..87bb9e1 100644
--- a/src/application/main-window.cpp
+++ b/src/application/main-window.cpp
@@ -198,7 +198,10 @@ DockHider::operator()(DockObjectPtr const & dock_object) throw()
 MainWindow::MainWindow() throw() :
     Gtk::Window(Gtk::WINDOW_TOPLEVEL),
     application_(),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiManager_(Gtk::UIManager::create()),
     uiID_(uiManager_->add_ui_from_file(uiFile)),
     vBox_(false, 0),
diff --git a/src/attribute/date-manager.cpp b/src/attribute/date-manager.cpp
index 38ba441..912466d 100644
--- a/src/attribute/date-manager.cpp
+++ b/src/attribute/date-manager.cpp
@@ -42,7 +42,10 @@ static const std::string uiFile
 DateManager::DateManager() throw() :
     Plugin(),
     application_(),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_( 1 ),
     dockItemName_("date-dock-item"),
     dockItemTitle_(_("Picture Taken Date")),
diff --git a/src/attribute/property-manager.cpp b/src/attribute/property-manager.cpp
index 435002f..264fa92 100644
--- a/src/attribute/property-manager.cpp
+++ b/src/attribute/property-manager.cpp
@@ -42,7 +42,10 @@ static const std::string uiFile
 PropertyManager::PropertyManager() throw() :
     Plugin(),
     application_(),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_( 1 ),
     dockItemName_("property-managers-dock-item"),
     dockItemTitle_(_("Properties")),
diff --git a/src/attribute/tag-manager.cpp b/src/attribute/tag-manager.cpp
index 7821113..d6893be 100644
--- a/src/attribute/tag-manager.cpp
+++ b/src/attribute/tag-manager.cpp
@@ -48,7 +48,10 @@ TagManager::TagManager() throw() :
     Plugin(),
     application_(),
     iconFactory_(Gtk::IconFactory::create()),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     dockItemName_("tag-managers-dock-item"),
     dockItemTitle_(_("Tags")),
diff --git a/src/importer/importer.cpp b/src/importer/importer.cpp
index a04fb7a..6267c6a 100644
--- a/src/importer/importer.cpp
+++ b/src/importer/importer.cpp
@@ -49,7 +49,11 @@ Importer::Importer(const IPhotoSourcePtr & photo_source, bool standard)
     application_(NULL),
     photoSource_(photo_source),
     standard_(standard),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2,%3",
+                         __FILE__,
+                         __LINE__,
+                         photo_source->get_name()))),
     standardUIID_(0),
     uiID_(0),
     signalPhotoImportBegin_(),
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index ce8f4eb..96293a7 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -69,7 +69,10 @@ BrowserRenderer::BrowserRenderer() throw() :
     sigc::trackable(),
     application_(NULL),
     iconFactory_(Gtk::IconFactory::create()),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     uiIDThumbnail_(0),
     dockItemName_("browser-dock-item"),
diff --git a/src/renderer/editor-renderer.cpp b/src/renderer/editor-renderer.cpp
index 10eea0e..47352c1 100644
--- a/src/renderer/editor-renderer.cpp
+++ b/src/renderer/editor-renderer.cpp
@@ -93,7 +93,10 @@ EditorRenderer::EditorRenderer() throw() :
     IRenderer(),
     sigc::trackable(),
     application_(NULL),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     dockItemName_("editor-dock-item"),
     dockItemTitle_(_("Editor")),
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index 4f4dafb..2a47a17 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -66,7 +66,10 @@ EnlargedRenderer::EnlargedRenderer() throw() :
     sigc::trackable(),
     application_(NULL),
     iconFactory_(Gtk::IconFactory::create()),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     dockItemName_("enlarged-dock-item"),
     dockItemTitle_(_("Enlarged")),
diff --git a/src/renderer/slideshow-renderer.cpp b/src/renderer/slideshow-renderer.cpp
index 1c482b9..a8b6a9b 100644
--- a/src/renderer/slideshow-renderer.cpp
+++ b/src/renderer/slideshow-renderer.cpp
@@ -45,7 +45,10 @@ SlideshowRenderer::SlideshowRenderer() throw() :
     IRenderer(),
     sigc::trackable(),
     application_(0),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     modelIter_(),
     previousRenderer_(),
diff --git a/src/renderer/slideshow-window.cpp b/src/renderer/slideshow-window.cpp
index c31f978..5737758 100644
--- a/src/renderer/slideshow-window.cpp
+++ b/src/renderer/slideshow-window.cpp
@@ -54,7 +54,10 @@ image_view_on_scroll_event(GtkImageView * view,
 
 SlideshowWindow::SlideshowWindow() throw() :
     Gtk::Window(Gtk::WINDOW_TOPLEVEL),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiManager_(Gtk::UIManager::create()),
     uiID_(uiManager_->add_ui_from_file(uiFile)),
     vBox_(false, 0),
diff --git a/src/renderer/thumbnail-view.cpp b/src/renderer/thumbnail-view.cpp
index b840e99..56c5cad 100644
--- a/src/renderer/thumbnail-view.cpp
+++ b/src/renderer/thumbnail-view.cpp
@@ -38,7 +38,10 @@ ThumbnailView::ThumbnailView(gint thumbnail_renderer_width,
                              gint thumbnail_renderer_height) throw() :
     Gtk::IconView(),
     selectedItems_(0),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiManager_(Gtk::UIManager::create()),
     uiID_(uiManager_->add_ui_from_file(uiFile)),
     menu_(NULL),
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 14:04:08 -0000	1.2
+++ .cvsignore	21 Sep 2009 06:38:47 -0000	1.3
@@ -1 +1 @@
-Solang-0.2.tar.gz
+solang-0.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2009 14:04:08 -0000	1.1
+++ import.log	21 Sep 2009 06:38:47 -0000	1.2
@@ -1 +1,2 @@
 solang-0_2-2_fc11:HEAD:solang-0.2-2.fc11.src.rpm:1247580220
+solang-0_3-1_fc11:HEAD:solang-0.3-1.fc11.src.rpm:1253515046


Index: solang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/solang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- solang.spec	27 Jul 2009 04:33:42 -0000	1.2
+++ solang.spec	21 Sep 2009 06:38:47 -0000	1.3
@@ -1,21 +1,14 @@
 Name:		solang
-Version:	0.2
-Release:	3%{?dist}
+Version:	0.3
+Release:	1%{?dist}
 Summary:	A photo manager for GNOME
 
-%define name_ Solang
-
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		https://savannah.nongnu.org/projects/solang/
-Source0:	http://download.savannah.gnu.org/releases-noredirect/solang/%{name_}-%{version}.tar.gz
+Source0:	http://download.savannah.nongnu.org/releases/solang/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1:	solang.desktop
-Source2:	solang.png
-
-#Patch0: adds icon to main window, and starts the main window maximized
-Patch0:		main-window.cpp.patch
 
 BuildRequires:	intltool
 BuildRequires:	cairomm-devel
@@ -31,8 +24,15 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	flickcurl-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	webkitgtk-devel
+BuildRequires:	babl-devel
+BuildRequires:	gegl-devel
 
 Requires:	compat-libgda-sqlite
+Requires:	babl
+Requires:	gegl
+
+#Patch0: http://lists.gnu.org/archive/html/solang-devel/2009-09/msg00018.html
+Patch0:		%{name}-0001-Silenced-Gtk-warnings.patch
 
 %description
 Solang is a free photo manager that will act as a front-end for
@@ -46,9 +46,8 @@ alternative that does not place humongou
 even to meet basic functionality.
 
 %prep
-%setup -q -n %{name_}-%{version}
-%patch0 -p1 -b %{name_}-%{version}
-
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -58,29 +57,49 @@ make %{?smp_flags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-%{__mkdir_p} $RPM_BUILD_ROOT{%{_datadir}/applications,%{_datadir}/pixmaps}
-%{__install} -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%find_lang %{name}
 
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
-%{SOURCE1}
+${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/solang-layout.xml
 %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/pixmaps
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/128x128/apps/solang.png
+%{_datadir}/icons/hicolor/16x16/apps/solang.png
+%{_datadir}/icons/hicolor/22x22/apps/solang.png
+%{_datadir}/icons/hicolor/24x24/apps/solang.png
+%{_datadir}/icons/hicolor/32x32/apps/solang.png
+%{_datadir}/icons/hicolor/48x48/apps/solang.png
+%{_datadir}/icons/hicolor/96x96/apps/solang.png
+%{_datadir}/icons/hicolor/scalable/apps/solang.svg
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 21 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-1
+- New upstream release
+- Added a patch from upstream to silence some Gtk+ warnings
 
 * Thu Jul 11 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.2-2
 - Cleaned up the dependencies


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 14:04:08 -0000	1.2
+++ sources	21 Sep 2009 06:38:47 -0000	1.3
@@ -1 +1 @@
-20a05edee2137c76add270452a1ab4d7  Solang-0.2.tar.gz
+6f82d34174815deacb4392b88a4134ed  solang-0.3.tar.gz


--- main-window.cpp.patch DELETED ---


--- solang.desktop DELETED ---



From hicham at fedoraproject.org  Mon Sep 21 06:42:16 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon, 21 Sep 2009 06:42:16 +0000 (UTC)
Subject: rpms/solang/F-11 solang-0001-Silenced-Gtk-warnings.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 solang.spec, 1.1,
	1.2 sources, 1.2, 1.3 main-window.cpp.patch, 1.1,
	NONE solang.desktop, 1.1, NONE solang.png, 1.1, NONE
Message-ID: <20090921064216.B68AC11C0043@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/solang/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30482/F-11

Modified Files:
	.cvsignore import.log solang.spec sources 
Added Files:
	solang-0001-Silenced-Gtk-warnings.patch 
Removed Files:
	main-window.cpp.patch solang.desktop solang.png 
Log Message:


solang-0001-Silenced-Gtk-warnings.patch:
 application/main-window.cpp     |    5 ++++-
 attribute/date-manager.cpp      |    5 ++++-
 attribute/property-manager.cpp  |    5 ++++-
 attribute/tag-manager.cpp       |    5 ++++-
 importer/importer.cpp           |    6 +++++-
 renderer/browser-renderer.cpp   |    5 ++++-
 renderer/editor-renderer.cpp    |    5 ++++-
 renderer/enlarged-renderer.cpp  |    5 ++++-
 renderer/slideshow-renderer.cpp |    5 ++++-
 renderer/slideshow-window.cpp   |    5 ++++-
 renderer/thumbnail-view.cpp     |    6 ++++--
 11 files changed, 45 insertions(+), 12 deletions(-)

--- NEW FILE solang-0001-Silenced-Gtk-warnings.patch ---
>From 8fc9488ed55106ff3e8fb28130d8a77b63f716c3 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi at gnu.org>
Date: Mon, 21 Sep 2009 02:53:21 +0300
Subject: [PATCH] Silenced Gtk+ warnings.

The Gtk::ActionGroups need to be explicitly named:
https://bugzilla.gnome.org/501746
---
 src/application/main-window.cpp     |    5 ++++-
 src/attribute/date-manager.cpp      |    5 ++++-
 src/attribute/property-manager.cpp  |    5 ++++-
 src/attribute/tag-manager.cpp       |    5 ++++-
 src/importer/importer.cpp           |    6 +++++-
 src/renderer/browser-renderer.cpp   |    5 ++++-
 src/renderer/editor-renderer.cpp    |    5 ++++-
 src/renderer/enlarged-renderer.cpp  |    5 ++++-
 src/renderer/slideshow-renderer.cpp |    5 ++++-
 src/renderer/slideshow-window.cpp   |    5 ++++-
 src/renderer/thumbnail-view.cpp     |    5 ++++-
 11 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/application/main-window.cpp b/src/application/main-window.cpp
index c0f521f..87bb9e1 100644
--- a/src/application/main-window.cpp
+++ b/src/application/main-window.cpp
@@ -198,7 +198,10 @@ DockHider::operator()(DockObjectPtr const & dock_object) throw()
 MainWindow::MainWindow() throw() :
     Gtk::Window(Gtk::WINDOW_TOPLEVEL),
     application_(),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiManager_(Gtk::UIManager::create()),
     uiID_(uiManager_->add_ui_from_file(uiFile)),
     vBox_(false, 0),
diff --git a/src/attribute/date-manager.cpp b/src/attribute/date-manager.cpp
index 38ba441..912466d 100644
--- a/src/attribute/date-manager.cpp
+++ b/src/attribute/date-manager.cpp
@@ -42,7 +42,10 @@ static const std::string uiFile
 DateManager::DateManager() throw() :
     Plugin(),
     application_(),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_( 1 ),
     dockItemName_("date-dock-item"),
     dockItemTitle_(_("Picture Taken Date")),
diff --git a/src/attribute/property-manager.cpp b/src/attribute/property-manager.cpp
index 435002f..264fa92 100644
--- a/src/attribute/property-manager.cpp
+++ b/src/attribute/property-manager.cpp
@@ -42,7 +42,10 @@ static const std::string uiFile
 PropertyManager::PropertyManager() throw() :
     Plugin(),
     application_(),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_( 1 ),
     dockItemName_("property-managers-dock-item"),
     dockItemTitle_(_("Properties")),
diff --git a/src/attribute/tag-manager.cpp b/src/attribute/tag-manager.cpp
index 7821113..d6893be 100644
--- a/src/attribute/tag-manager.cpp
+++ b/src/attribute/tag-manager.cpp
@@ -48,7 +48,10 @@ TagManager::TagManager() throw() :
     Plugin(),
     application_(),
     iconFactory_(Gtk::IconFactory::create()),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     dockItemName_("tag-managers-dock-item"),
     dockItemTitle_(_("Tags")),
diff --git a/src/importer/importer.cpp b/src/importer/importer.cpp
index a04fb7a..6267c6a 100644
--- a/src/importer/importer.cpp
+++ b/src/importer/importer.cpp
@@ -49,7 +49,11 @@ Importer::Importer(const IPhotoSourcePtr & photo_source, bool standard)
     application_(NULL),
     photoSource_(photo_source),
     standard_(standard),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2,%3",
+                         __FILE__,
+                         __LINE__,
+                         photo_source->get_name()))),
     standardUIID_(0),
     uiID_(0),
     signalPhotoImportBegin_(),
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index ce8f4eb..96293a7 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -69,7 +69,10 @@ BrowserRenderer::BrowserRenderer() throw() :
     sigc::trackable(),
     application_(NULL),
     iconFactory_(Gtk::IconFactory::create()),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     uiIDThumbnail_(0),
     dockItemName_("browser-dock-item"),
diff --git a/src/renderer/editor-renderer.cpp b/src/renderer/editor-renderer.cpp
index 10eea0e..47352c1 100644
--- a/src/renderer/editor-renderer.cpp
+++ b/src/renderer/editor-renderer.cpp
@@ -93,7 +93,10 @@ EditorRenderer::EditorRenderer() throw() :
     IRenderer(),
     sigc::trackable(),
     application_(NULL),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     dockItemName_("editor-dock-item"),
     dockItemTitle_(_("Editor")),
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index 4f4dafb..2a47a17 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -66,7 +66,10 @@ EnlargedRenderer::EnlargedRenderer() throw() :
     sigc::trackable(),
     application_(NULL),
     iconFactory_(Gtk::IconFactory::create()),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     dockItemName_("enlarged-dock-item"),
     dockItemTitle_(_("Enlarged")),
diff --git a/src/renderer/slideshow-renderer.cpp b/src/renderer/slideshow-renderer.cpp
index 1c482b9..a8b6a9b 100644
--- a/src/renderer/slideshow-renderer.cpp
+++ b/src/renderer/slideshow-renderer.cpp
@@ -45,7 +45,10 @@ SlideshowRenderer::SlideshowRenderer() throw() :
     IRenderer(),
     sigc::trackable(),
     application_(0),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiID_(0),
     modelIter_(),
     previousRenderer_(),
diff --git a/src/renderer/slideshow-window.cpp b/src/renderer/slideshow-window.cpp
index c31f978..5737758 100644
--- a/src/renderer/slideshow-window.cpp
+++ b/src/renderer/slideshow-window.cpp
@@ -54,7 +54,10 @@ image_view_on_scroll_event(GtkImageView * view,
 
 SlideshowWindow::SlideshowWindow() throw() :
     Gtk::Window(Gtk::WINDOW_TOPLEVEL),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiManager_(Gtk::UIManager::create()),
     uiID_(uiManager_->add_ui_from_file(uiFile)),
     vBox_(false, 0),
diff --git a/src/renderer/thumbnail-view.cpp b/src/renderer/thumbnail-view.cpp
index b840e99..56c5cad 100644
--- a/src/renderer/thumbnail-view.cpp
+++ b/src/renderer/thumbnail-view.cpp
@@ -38,7 +38,10 @@ ThumbnailView::ThumbnailView(gint thumbnail_renderer_width,
                              gint thumbnail_renderer_height) throw() :
     Gtk::IconView(),
     selectedItems_(0),
-    actionGroup_(Gtk::ActionGroup::create()),
+    actionGroup_(Gtk::ActionGroup::create(
+                     Glib::ustring::compose("%1:%2",
+                                            __FILE__,
+                                            __LINE__))),
     uiManager_(Gtk::UIManager::create()),
     uiID_(uiManager_->add_ui_from_file(uiFile)),
     menu_(NULL),
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 14:07:44 -0000	1.2
+++ .cvsignore	21 Sep 2009 06:42:14 -0000	1.3
@@ -1 +1 @@
-Solang-0.2.tar.gz
+solang-0.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2009 14:07:44 -0000	1.1
+++ import.log	21 Sep 2009 06:42:15 -0000	1.2
@@ -1 +1,2 @@
 solang-0_2-2_fc11:F-11:solang-0.2-2.fc11.src.rpm:1247580426
+solang-0_3-1_fc11:F-11:solang-0.3-1.fc11.src.rpm:1253515301


Index: solang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/solang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- solang.spec	14 Jul 2009 14:07:44 -0000	1.1
+++ solang.spec	21 Sep 2009 06:42:16 -0000	1.2
@@ -1,21 +1,14 @@
 Name:		solang
-Version:	0.2
-Release:	2%{?dist}
+Version:	0.3
+Release:	1%{?dist}
 Summary:	A photo manager for GNOME
 
-%define name_ Solang
-
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		https://savannah.nongnu.org/projects/solang/
-Source0:	http://download.savannah.gnu.org/releases-noredirect/solang/%{name_}-%{version}.tar.gz
+Source0:	http://download.savannah.nongnu.org/releases/solang/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1:	solang.desktop
-Source2:	solang.png
-
-#Patch0: adds icon to main window, and starts the main window maximized
-Patch0:		main-window.cpp.patch
 
 BuildRequires:	intltool
 BuildRequires:	cairomm-devel
@@ -31,8 +24,15 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	flickcurl-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	webkitgtk-devel
+BuildRequires:	babl-devel
+BuildRequires:	gegl-devel
 
 Requires:	compat-libgda-sqlite
+Requires:	babl
+Requires:	gegl
+
+#Patch0: http://lists.gnu.org/archive/html/solang-devel/2009-09/msg00018.html
+Patch0:		%{name}-0001-Silenced-Gtk-warnings.patch
 
 %description
 Solang is a free photo manager that will act as a front-end for
@@ -46,9 +46,8 @@ alternative that does not place humongou
 even to meet basic functionality.
 
 %prep
-%setup -q -n %{name_}-%{version}
-%patch0 -p1 -b %{name_}-%{version}
-
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -58,27 +57,50 @@ make %{?smp_flags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-%{__mkdir_p} $RPM_BUILD_ROOT{%{_datadir}/applications,%{_datadir}/pixmaps}
-%{__install} -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%find_lang %{name}
 
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
-%{SOURCE1}
+${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/solang-layout.xml
 %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/pixmaps
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/128x128/apps/solang.png
+%{_datadir}/icons/hicolor/16x16/apps/solang.png
+%{_datadir}/icons/hicolor/22x22/apps/solang.png
+%{_datadir}/icons/hicolor/24x24/apps/solang.png
+%{_datadir}/icons/hicolor/32x32/apps/solang.png
+%{_datadir}/icons/hicolor/48x48/apps/solang.png
+%{_datadir}/icons/hicolor/96x96/apps/solang.png
+%{_datadir}/icons/hicolor/scalable/apps/solang.svg
 
 %changelog
+* Mon Sep 21 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-1
+- New upstream release
+- Added a patch from upstream to silence some Gtk+ warnings
+
 * Thu Jul 11 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.2-2
 - Cleaned up the dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 14:07:44 -0000	1.2
+++ sources	21 Sep 2009 06:42:16 -0000	1.3
@@ -1 +1 @@
-20a05edee2137c76add270452a1ab4d7  Solang-0.2.tar.gz
+6f82d34174815deacb4392b88a4134ed  solang-0.3.tar.gz


--- main-window.cpp.patch DELETED ---


--- solang.desktop DELETED ---



From sharkcz at fedoraproject.org  Mon Sep 21 06:44:48 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 21 Sep 2009 06:44:48 +0000 (UTC)
Subject: rpms/qlandkartegt/F-11 .cvsignore, 1.10, 1.11 qlandkartegt.spec,
	1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20090921064448.24B3311C0043@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31420

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
- update to 0.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Aug 2009 08:40:41 -0000	1.10
+++ .cvsignore	21 Sep 2009 06:44:46 -0000	1.11
@@ -1 +1 @@
-qlandkartegt-0.15.0.tar.gz
+qlandkartegt-0.15.1.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qlandkartegt.spec	21 Aug 2009 08:40:41 -0000	1.10
+++ qlandkartegt.spec	21 Sep 2009 06:44:46 -0000	1.11
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.0
+Version: 0.15.1
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
+- update to 0.15.1
+
 * Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
 - update to 0.15.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 08:40:41 -0000	1.10
+++ sources	21 Sep 2009 06:44:46 -0000	1.11
@@ -1 +1 @@
-d255bb6acc6af0334a6aa8654d530a2a  qlandkartegt-0.15.0.tar.gz
+da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz



From sharkcz at fedoraproject.org  Mon Sep 21 07:03:21 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 21 Sep 2009 07:03:21 +0000 (UTC)
Subject: rpms/qlandkartegt/F-10 .cvsignore, 1.10, 1.11 qlandkartegt.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20090921070321.C4D2111C0043@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5766

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
- update to 0.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Aug 2009 08:41:40 -0000	1.10
+++ .cvsignore	21 Sep 2009 07:03:18 -0000	1.11
@@ -1 +1 @@
-qlandkartegt-0.15.0.tar.gz
+qlandkartegt-0.15.1.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/qlandkartegt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qlandkartegt.spec	21 Aug 2009 08:41:40 -0000	1.9
+++ qlandkartegt.spec	21 Sep 2009 07:03:19 -0000	1.10
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.0
+Version: 0.15.1
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
+- update to 0.15.1
+
 * Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
 - update to 0.15.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 08:41:40 -0000	1.10
+++ sources	21 Sep 2009 07:03:19 -0000	1.11
@@ -1 +1 @@
-d255bb6acc6af0334a6aa8654d530a2a  qlandkartegt-0.15.0.tar.gz
+da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz



From fabbione at fedoraproject.org  Mon Sep 21 07:56:05 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 21 Sep 2009 07:56:05 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel o2cb_pcmk.diff, 1.1, 1.2 ocfs2-tools.spec,
	1.11, 1.12
Message-ID: <20090921075605.37BEB11C0043@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26491

Modified Files:
	o2cb_pcmk.diff ocfs2-tools.spec 
Log Message:
Fix pcmk resource agent


o2cb_pcmk.diff:
 o2cb.ocf |  456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 456 insertions(+)

Index: o2cb_pcmk.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/o2cb_pcmk.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- o2cb_pcmk.diff	15 Sep 2009 07:08:40 -0000	1.1
+++ o2cb_pcmk.diff	21 Sep 2009 07:56:02 -0000	1.2
@@ -131,7 +131,7 @@ diff -Nuard ocfs2-tools-1.4.2.orig/vendo
 +
 +status_daemon()
 +{
-+    PID=`pidofproc "$DAEMON"`
++    PID=`pidof "$DAEMON"`
 +    if [ -n "$PID" ]; then
 +	return $OCF_SUCCESS
 +    fi
@@ -145,7 +145,7 @@ diff -Nuard ocfs2-tools-1.4.2.orig/vendo
 +	return $OCF_ERR_INSTALLED
 +    fi
 +
-+    start_daemon "$DAEMON"; rc=$?
++     "$DAEMON"; rc=$?
 +    if [ $rc != 0 ]; then
 +	ocf_log err "Could not start $DAEMON"
 +	return $OCF_ERR_GENERIC


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocfs2-tools.spec	15 Sep 2009 07:08:41 -0000	1.11
+++ ocfs2-tools.spec	21 Sep 2009 07:56:03 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.2
-Release: 4%{?alphatag:.%{alphatag}}%{?dist}
+Release: 5%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -212,6 +212,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
+- Fix pcmk resource agent.
+
 * Tue Sep 15 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-4
 - Add pcmk resource agent.
 



From eseyman at fedoraproject.org  Mon Sep 21 08:07:22 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 21 Sep 2009 08:07:22 +0000 (UTC)
Subject: rpms/perl-p5-Palm/devel .cvsignore, 1.2, 1.3 perl-p5-Palm.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090921080724.4036411C0043@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-p5-Palm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31659

Modified Files:
	.cvsignore perl-p5-Palm.spec sources 
Log Message:
Update to 1.011


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-p5-Palm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jun 2009 20:29:10 -0000	1.2
+++ .cvsignore	21 Sep 2009 08:07:21 -0000	1.3
@@ -1 +1 @@
-p5-Palm-1.009.tar.gz
+p5-Palm-1.011.tar.gz


Index: perl-p5-Palm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-p5-Palm/devel/perl-p5-Palm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-p5-Palm.spec	26 Jul 2009 17:48:58 -0000	1.3
+++ perl-p5-Palm.spec	21 Sep 2009 08:07:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-p5-Palm
-Version:        1.009
-Release:        4%{?dist}
+Version:        1.011
+Release:        1%{?dist}
 Summary:        Palm OS utility functions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pdbdump.1.gz
 
 %changelog
+* Mon Sep 21 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.011-1
+- Update to 1.011
+- Fix an rpmlint complaint in the changelog
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.009-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -58,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Tue Jun 16 2007 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.009-2
 - Enable tests
-- Add examples directory to %doc
+- Add examples directory to the documentation
 
 * Mon Jun 11 2007 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.009-1
 - Specfile autogenerated by cpanspec 1.70.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-p5-Palm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jun 2009 20:29:10 -0000	1.2
+++ sources	21 Sep 2009 08:07:21 -0000	1.3
@@ -1 +1 @@
-919c8f52aa98eec1abccb5d944dab4ab  p5-Palm-1.009.tar.gz
+5a700e882f7f72a85bb53383ebc70012  p5-Palm-1.011.tar.gz



From salimma at fedoraproject.org  Mon Sep 21 08:11:50 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 21 Sep 2009 08:11:50 +0000 (UTC)
Subject: rpms/monodevelop/devel monodevelop-2.1.0-rmcecildeps.patch, NONE,
	1.1 monodevelop-2.1.0-unbundle-cecil.patch, NONE,
	1.1 monodevelop-2.1.0-unbundle-nunit.patch, NONE,
	1.1 monodevelop.spec, 1.43,
	1.44 monodevelop-1.9.2-removed-contrib.patch, 1.1,
	NONE monodevelop-192-nunit.patch, 1.2, NONE monodevelop-2.spec,
	1.20, NONE monodevelop-210-nunitmakes.patch, 1.1,
	NONE monodevelop-210-usececil.patch, 1.1, NONE
Message-ID: <20090921081150.D34BF11C0419@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1687

Added Files:
	monodevelop-2.1.0-rmcecildeps.patch 
	monodevelop-2.1.0-unbundle-cecil.patch 
	monodevelop-2.1.0-unbundle-nunit.patch monodevelop.spec 
Removed Files:
	monodevelop-1.9.2-removed-contrib.patch 
	monodevelop-192-nunit.patch monodevelop-2.spec 
	monodevelop-210-nunitmakes.patch 
	monodevelop-210-usececil.patch 
Log Message:
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 2.1.0-2
- Properly disable bundled Mono.Cecil and NUnit
- Readjust launcher script (bz #523695)
- Remove unnecessary dependencies
- Clean up spec file


monodevelop-2.1.0-rmcecildeps.patch:
 addins/MonoDevelop.AssemblyBrowser/Makefile.in     |    2 +-
 addins/MonoDevelop.DesignerSupport/Makefile.in     |    2 +-
 addins/MonoDevelop.GtkCore/Makefile.in             |    2 +-
 addins/MonoDevelop.GtkCore/libsteticui/Makefile.in |    2 +-
 core/MonoDevelop.Projects/Makefile.in              |    3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE monodevelop-2.1.0-rmcecildeps.patch ---
--- monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile.in.rmcecildeps	2009-09-07 11:36:23.000000000 -0400
+++ monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile.in	2009-09-21 03:07:04.250038481 -0400
@@ -175,8 +175,6 @@
 ASSEMBLY = $(top_builddir)/build/bin/MonoDevelop.Projects.dll
 CONFIG = MonoDevelop.Projects.dll.config
 DEPS = \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Projects.Formats.MSBuild.exe
 
@@ -186,6 +184,7 @@
 	-r:Microsoft.Build.Engine \
 	-r:Microsoft.Build.Framework \
 	-r:Microsoft.Build.Utilities \
+        -r:Mono.Cecil.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
--- monodevelop-2.1.0/src/addins/MonoDevelop.DesignerSupport/Makefile.in.rmcecildeps	2009-09-21 03:07:04.388788379 -0400
+++ monodevelop-2.1.0/src/addins/MonoDevelop.DesignerSupport/Makefile.in	2009-09-21 03:09:16.325792105 -0400
@@ -175,7 +175,6 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.DesignerSupport.dll
 DEPS = \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
@@ -188,6 +187,7 @@
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
 	-r:Mono.Cairo \
+        -r:Mono.Cecil.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
--- monodevelop-2.1.0/src/addins/MonoDevelop.GtkCore/Makefile.in.rmcecildeps	2009-09-21 03:13:56.456038797 -0400
+++ monodevelop-2.1.0/src/addins/MonoDevelop.GtkCore/Makefile.in	2009-09-21 03:17:02.615041739 -0400
@@ -192,7 +192,6 @@
 	$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
@@ -205,6 +204,7 @@
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
+        -r:Mono.Cecil.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Xml
--- monodevelop-2.1.0/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.in.rmcecildeps	2009-09-21 03:19:37.620787875 -0400
+++ monodevelop-2.1.0/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.in	2009-09-21 03:22:05.125042847 -0400
@@ -249,12 +249,12 @@
 
 DEPS = \
 	../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-	../../../../build/bin/Mono.Cecil.dll
 
 REFS = \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
+        -r:Mono.Cecil.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Runtime.Remoting \
--- monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in.rmcecildeps	2009-09-21 03:23:28.112038372 -0400
+++ monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in	2009-09-21 03:26:11.564792286 -0400
@@ -213,7 +213,6 @@
 
 DEPS = \
 	$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
-	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
@@ -226,6 +225,7 @@
 REFS = \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
+        -r:Mono.Cecil.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \

monodevelop-2.1.0-unbundle-cecil.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE monodevelop-2.1.0-unbundle-cecil.patch ---
--- monodevelop-2.1.0/contrib/Makefile.in.unbundle-cecil	2009-09-07 11:36:19.000000000 -0400
+++ monodevelop-2.1.0/contrib/Makefile.in	2009-09-21 02:26:54.932791665 -0400
@@ -173,7 +173,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = Mono.Cecil NRefactory
+SUBDIRS = NRefactory
 EXTRA_DIST = $(srcdir)/extract_makefile_variable.sh
 all: all-recursive
 

monodevelop-2.1.0-unbundle-nunit.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE monodevelop-2.1.0-unbundle-nunit.patch ---
--- monodevelop-2.1.0/src/addins/NUnit/Makefile.in.unbundle-nunit	2009-09-07 11:36:22.000000000 -0400
+++ monodevelop-2.1.0/src/addins/NUnit/Makefile.in	2009-09-21 02:21:44.249795300 -0400
@@ -278,9 +278,9 @@
 SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
 BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
 assemblydir = $(MD_ADDIN_DIR)/NUnit
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
+EXTRA_DIST = $(FILES) $(RES)
 build_deps = $(addprefix -r:, $(DEPS))
 build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
 build_resources = $(addprefix $(srcdir)/, $(RES))


Index: monodevelop.spec
===================================================================
RCS file: monodevelop.spec
diff -N monodevelop.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monodevelop.spec	21 Sep 2009 08:11:48 -0000	1.44
@@ -0,0 +1,487 @@
+%global debug_package %{nil}
+
+%global cecildll    %(rpm -ql mono-core | grep Cecil.dll$)
+%global cecilmdbdll %(rpm -ql mono-core | grep Cecil.Mdb.dll$)
+%global nunitver    2.4.8.0
+
+Name:           monodevelop
+Version:        2.1.0
+Release:        2%{?dist}
+Summary:        A full-featured IDE for Mono and Gtk#
+
+Group:          Development/Tools
+License:        GPLv2+
+URL:            http://monodevelop.com/
+Source0:        http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-2.1.0-unbundle-cecil.patch
+Patch1:         %{name}-2.1.0-unbundle-nunit.patch
+Patch2:         %{name}-2.1.0-rmcecildeps.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  mono-devel >= 2.4 mono-addins-devel >= 0.4 mono-nunit-devel
+BuildRequires:  mono-nunit-devel monodoc-devel
+BuildRequires:  gnome-desktop-sharp-devel
+BuildRequires:  desktop-file-utils intltool
+#Requires:       gecko-sharp2
+Requires:       mono-addins >= 0.4
+# Using system nunit, but dependency not automatically picked up by RPM
+Requires:       mono(nunit.core) = %{nunitver}
+Requires:       mono(nunit.framework) = %{nunitver}
+Requires:       gnome-desktop-sharp
+Requires:       subversion monodoc
+Requires:       hicolor-icon-theme shared-mime-info
+
+# ppc* not supported: needs mono-nunit which needs nant
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x
+
+%description
+This package provides MonoDevelop, a full-featured IDE for Mono with
+syntax colouring, code completion, debugging, project management and
+support for C sharp, Visual Basic.NET, Java, Boo, Nemerle and MSIL.
+
+
+%package        devel
+Summary:        Development files for monodevelop
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+ 
+%description devel
+Development files for %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .unbundle-cecil
+%patch1 -p1 -b .unbundle-nunit
+%patch2 -p1 -b .rmcecildeps
+
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
+    -e 's!${exec_prefix}/lib!%{_libdir}!' configure
+sed -i -e 's!/lib/monodevelop!/%{_lib}/monodevelop!' monodevelop
+sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' mdtool.in
+
+
+find . -name Makefile.in -or -name \*.pc.in \
+       -or -name \*.in -or -name \*.xml \
+       | while read f ;
+         do
+           sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
+               -e 's!@prefix@/lib/!%{_libdir}/!' \
+               -e 's!/usr/lib/!%{_libdir}/!' \
+               -e 's!${exec_prefix}/lib/!%{_libdir}/!' "$f" 1>/dev/null
+         done
+
+for f in `grep -rl 'NUnit/lib/nunit' \`find . -name 'Makefile.in'\``; do
+    sed -i 's|-r:.*NUnit/lib/nunit.|-r:%{_libdir}/mono/1.0/nunit.|' $f
+done
+
+for f in `grep -rl 'Cecil.dll' \`find . -name 'Makefile.in'\``; do
+    sed -i 's|-r:.*Mono.Cecil.dll|-r:%{cecildll}|' $f
+done
+
+for f in `grep -rl 'Cecil.Mdb.dll' \`find . -name 'Makefile.in'\``; do
+    sed -i 's|-r:.*Mono.Cecil.Mdb.dll|-r:%{cecilmdbdll}|' $f
+done
+
+
+%build
+%configure --disable-update-mimedb \
+           --disable-update-desktopdb
+
+# Craziness: NRefactory relies on the bundled Cecil creating build/bin for it
+mkdir -p build/bin
+# Not parallel-buildable
+#make %{?_smp_mflags}
+make
+
+
+%check
+make check
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+                     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+                     --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/monodevelop.desktop
+
+%find_lang %{name}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/m*
+%{_libdir}/monodevelop
+%{_mandir}/man1/m*
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/
+%{_datadir}/mime/packages/monodevelop.xml
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/monodevelop*.pc
+
+%changelog
+* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 2.1.0-2
+- Properly disable bundled Mono.Cecil and NUnit
+- Readjust launcher script (bz #523695)
+- Remove unnecessary dependencies
+- Clean up spec file
+
+* Wed Sep 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.1.0-1
+- Bump to 2.2 beta 1
+- Fixed cecil patch
+- Drop desktop patch
+
+* Tue Jun 23 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-3
+- Fix mdtool libdir issue
+- Add additional arcs
+
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0-2
+- Rebuild against newer gecko
+
+* Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
+- Full 2.0 release
+
+* Tue Mar 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.3-1.beta2
+- Move back to tarballs
+- Bump to beta2
+
+* Fri Feb 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-2.beta1.20092202svn127584
+- Added desktop file patch
+
+* Sun Feb 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-1.beta1.20092202svn127584
+- Update from svn
+- Fix the month on the changelog
+- renamed use-system-cecil patch to removed-contrib
+
+* Tue Feb 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-beta1.20091003svn126521
+- Update from svn
+- retagged as beta 1
+- ensure being built against mono-2.4 and mono-addins-0.4
+
+* Tue Feb 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.20090203svn125551
+- Update from svn
+
+* Fri Jan 29 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.20090129svn124664
+- Update from svn
+
+* Sat Jan 24 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.20090124svn124411
+- Update from svn
+
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.20090116svn123651
+- Update from svn
+- Altered nunit patch
+
+* Sat Jan 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.200900109svn122940
+- Update from svn
+
+* Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.200900104svn122336
+- Update from svn
+- Reversioned as 1.9.1 is out there already
+
+* Tue Dec 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-7.pre1.20081230svn122192
+- Update from svn
+
+* Wed Dec 24 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-7.pre1.20081224svn122090
+- Update from svn
+
+* Fri Dec 19 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-7.pre1.20081219svn121787
+- Update from svn
+
+* Thu Dec 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-6.pre1.20081217svn121699
+- Actually use the svn version!
+
+* Wed Dec 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-5.pre1.20081217svn121653
+- Update
+
+* Tue Dec 16 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-4.pre1.20081216svn121578
+- Update
+
+* Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-3.pre1
+- missed a libdir...
+
+* Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-2.pre1
+- remove libdir patch, now using sed
+
+* Sun Nov 23 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-1.pre1
+- Update to 1.9.1 preview 1
+- Removed R mono-basic and vala
+
+* Sat Oct 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-7
+- Fix dependancies of R (BZ 467544)
+
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
+- Added patch to build against 2.0 RC 1
+- rebuild against 2.0 RC 1
+
+* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
+- Use system-provided nunit
+
+* Sat Aug 23 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.9-4
+- Clean up build dependencies: database support now a separate package
+- Clean up spec file and patches
+
+* Fri Aug 08 2008 David Nielsen <gnomeuser at gmail.com> - 1.9-3
+- rebase configure patch for fuzz
+- file list fix up
+
+* Thu Jul 10 2008 David Nielsen <gnomeuser at gmail.com> 1.9-2
+- numerical compare for fedora version test, fixes compile on f10
+
+* Mon Jul 07 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
+- bump to latest beta for md2
+- fixes to patch files for mono.cecil
+- fix the archs to be mono package happy
+- spec file fixes
+
+* Tue May 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6
+- added br mono-tools
+- removed prepackaged mime
+
+* Thu May 01 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-5.1
+- attempt a fix for a text editor to work
+- rebuild
+
+* Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-4
+- mdtool fix
+
+* Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-3
+- remove BR ikvm-devel
+
+* Fri Apr 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-2
+- add in gtksourceview2 support
+
+* Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-1
+- bump to release
+
+* Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-7
+- remove ppc specific stuff
+- enabled gnomeplatform and c and c++ projects
+- add BR monobasic
+- remove the debug package
+
+* Sat Apr 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-6
+- disable Requires on ikvm, since ikvm doesn't build from source at the moment
+
+* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-5
+- ExcludeArch ppc (no mono-nunit22, due to no nant, means no ppc)
+
+* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-4
+- buildrequires mono-core for gacutil
+
+* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
+- use system Mono.Cecil
+- use copies of built from source nunit22 rather than bundling (upstream should really uncouple this)
+
+* Thu Feb 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-2
+- added BR update-desktop-database
+
+* Thu Feb 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-1
+- bump to preview 1
+
+* Fri Jan 04 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18.1-1
+- bump
+
+* Wed Dec 19 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18-1
+- fix for BR boo where boo is not supported
+- bump to MD0.18
+
+* Tue Nov 13 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.17-4
+- added R mono-data-sqlite
+
+* Sun Nov 11 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.17-3
+- excludearch ppc64
+
+* Sun Nov 11 2007 David Nielsen <david at lovesunix.net> - 0.17-2
+- Remove support for Fedora < 5
+- rediff config patch
+
+* Thu Nov  8 2007 David Nielsen <david at lovesunix.net> - 0.17-1
+- Update to MonoDevelop Beta 2
+
+* Wed Oct 17 2007 David Nielsen <david at lovesunix.net> - 0.16
+- Update to MonoDevelop Beta 1
+
+* Sat Aug 11 2007 David Nielsen <david at lovesunix.net> - 0.15
+- bump to 0.15
+
+* Thu Mar 08 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.13.1-1
+- bugfixes to the source
+
+* Fri Feb 23 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.13-1
+- bump to new version
+
+* Wed Dec 20 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-9
+- disables version control
+- requires gnome-sharp
+- enable nemerle added
+- enabled aspnet and aspnetedit (rawhide only - requires jscall-sharp)
+- added R firefox > 1.99
+
+* Wed Nov 01 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-7
+- Added R gtk-sharp2-gapi
+
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fixed url
+- added R apr-devel
+
+* Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
+- pkgconfig fix 
+
+* Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-4
+- added R mono-nunit
+
+* Mon Sep 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-3
+- rebuild to make use of the new boo
+
+* Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-2
+- minor spec file fixes
+
+* Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-1
+- Bump to new version
+- Include the patches for all users
+- Fixed so it uses ?fedora (silly me!)
+- Added BR mono-nunit-devel (FC6)
+
+* Mon Sep 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-21
+- Revert 64 bit clean for FC-5 and still follow FC guidelines
+
+* Sun Sep 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-20
+- Added gtk sharp fix
+- Added conditional so it builds for FC5
+
+* Sun Aug 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-17
+- 64 bit goodness restored
+
+* Fri Aug 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-16
+- fixed ownership problem in spec file
+- added comment about the libdir hack
+
+* Wed Aug 02 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-15
+- removed R which, added R mono-nunit
+- changed R bytefx-data-mysq to msql
+- altered update-mime-info and added update-desktop-database
+- added R pkgconfig to devel
+- added comment as to why smp_flags are not used on the build
+
+* Sat Jul 29 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-14
+- Added additional Rs
+- minor specfile tweaks
+
+* Sun Jul 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-12
+- fixed which problem
+- fixes the libdir issue for 64 bit
+
+* Sun Jul 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-11
+- minor spec files changes to satisfy rpmlint
+- added BR ikvm-devel
+
+* Sun Jul 09 2006 John Mahowald  <jpmahowald at gmail.com> - 0.11-10
+- libdir fixes
+- BR mono-data-sqlite
+
+* Sun Jul 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-9
+- removed noarch
+- added a couple of patches from the new nant package
+- fixes for new mono guidelines
+
+* Wed Jun 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-8
+- Removed libdir hack
+- Added BR pkgconfig
+- Added R monodoc
+- Altered configure line to satisfy the parts required
+
+* Mon Jun 05 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-7
+- Added additional fix for 64 bit systems
+
+* Sun Jun 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-6
+- Minor mod to the BR
+- Fixed the desktop-file-install problem
+
+* Sat Jun 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-5
+- Removed duplicate desktop file
+
+* Sat Jun 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-4
+- Removed R filesystem
+- Simplified mime-applications
+- Added scriptlets to handle mime info
+- Corrected handling of desktop icon
+- Removed INSTALL file
+
+* Sat Jun 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-3
+- Added BR shared-mime-info
+- Added R filesystem
+- Made all of the bindir and datadir ownerships explicit
+
+* Wed May 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-2
+- Added devel
+- Added fix for 64 bit systems
+
+* Sun May 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-1
+- bump to new version
+- added exclude archs for x86_64 and ia64 due to build problems
+
+* Wed Apr 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-8
+- removed smp_flags
+- added boo and ikvm support
+
+* Sun Apr 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-7
+- removed static usrlib
+- added export macros to fix the x86_64 problem
+- disabled boo
+
+* Wed Apr 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-6
+- spec file version correctly bumped
+- small spec file fixed
+- enable-boo and enable-java added to the %%configure line
+
+* Mon Apr 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-5
+- libdir now usr-lib irrespective of hardware built on
+
+* Mon Apr 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-4
+- Altered install script somewhat
+- Changed the path for the monodevelop libdir to be FE compliant
+- Fixed source and URL
+
+* Sat Apr 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-3
+- Add in boo and mono-debugger
+- fixed a couple of minor spec file bugs
+- fixed MonoDevelop.Core not being found in the addins
+
+* Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-2
+- Additional buildreqs and two typo fixed - thanks to Angel Marin again
+
+* Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-1
+- Bump to new version
+- mods to spec file for new version
+
+* Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.9-3
+- minor tweaks
+- fixed a couple of typos - thanks to Angel Marin for spotting them
+
+* Wed Jan 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.9-2
+- added deps for ikvm and bytefx-data-mysql
+- removed language support for the moment
+
+* Mon Jan 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.9-1
+- Initial import
+


--- monodevelop-1.9.2-removed-contrib.patch DELETED ---


--- monodevelop-192-nunit.patch DELETED ---


--- monodevelop-2.spec DELETED ---


--- monodevelop-210-nunitmakes.patch DELETED ---


--- monodevelop-210-usececil.patch DELETED ---



From snirkel at fedoraproject.org  Mon Sep 21 08:13:18 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Mon, 21 Sep 2009 08:13:18 +0000 (UTC)
Subject: rpms/gnome-phone-manager/F-11 gnome-phone-manager.spec,1.34,1.35
Message-ID: <20090921081318.B466611C0338@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2494

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Bump to handle gnome-bluetooth soname bump



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/F-11/gnome-phone-manager.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gnome-phone-manager.spec	29 Jun 2009 12:51:20 -0000	1.34
+++ gnome-phone-manager.spec	21 Sep 2009 08:13:13 -0000	1.35
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.65
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -106,6 +106,9 @@ fi
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Mon Sep 21 2009 Linus Walleij <triad at df.lth.se> 0.65-3
+- Rebuild for new gnome-bluetooth
+
 * Mon Jun 29 2009 Bastien Nocera <bnocera at redhat.com> 0.65-2
 - Rebuild for new gnome-bluetooth
 



From akurtakov at fedoraproject.org  Mon Sep 21 08:42:20 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Sep 2009 08:42:20 +0000 (UTC)
Subject: rpms/eclipse/devel fetch-ecf.sh, 1.2,
	1.3 ecf-filetransfer-feature.xml, 1.2, 1.3 sources, 1.80, 1.81
Message-ID: <20090921084220.D0F9711C0043@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18238/devel

Modified Files:
	fetch-ecf.sh ecf-filetransfer-feature.xml sources 
Log Message:
Fix ecf source


Index: fetch-ecf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/fetch-ecf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fetch-ecf.sh	18 Sep 2009 13:41:44 -0000	1.2
+++ fetch-ecf.sh	21 Sep 2009 08:42:17 -0000	1.3
@@ -27,4 +27,10 @@ done
 mv org.eclipse.ecf/providers/bundles/* org.eclipse.ecf/plugins
 rm -fr org.eclipse.ecf/providers
 
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
+export -r R3_5 org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent;
+
+mv org.eclipse.equinox/components/bundles/* org.eclipse.ecf/plugins
+#rm -fr org.eclipse.equinox/components/bundles
+
 tar cjf ecf-filetransfer-v20090604-1131.tar.bz2 org.eclipse.ecf


Index: ecf-filetransfer-feature.xml
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/ecf-filetransfer-feature.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecf-filetransfer-feature.xml	2 Apr 2009 08:12:56 -0000	1.2
+++ ecf-filetransfer-feature.xml	21 Sep 2009 08:42:18 -0000	1.3
@@ -16,6 +16,14 @@
       [Enter License Description here.]
    </license>
 
+
+  <plugin
+         id="org.eclipse.equinox.concurrent"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
    <plugin
          id="org.eclipse.ecf"
          download-size="0"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	18 Sep 2009 13:41:44 -0000	1.80
+++ sources	21 Sep 2009 08:42:18 -0000	1.81
@@ -1,3 +1,3 @@
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
-4e76e7a49f8af3eff4f457f285323d2c  ecf-filetransfer-v20090604-1131.tar.bz2
+d9b5bdc848ded1c2f1f62da94b9c70a0  ecf-filetransfer-v20090604-1131.tar.bz2



From jfch2222 at fedoraproject.org  Mon Sep 21 08:46:55 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon, 21 Sep 2009 08:46:55 +0000 (UTC)
Subject: rpms/openssh/F-11 openssh.spec, 1.143,
	1.144 openssh-5.2p1-homechroot.patch, 1.2, NONE
Message-ID: <20090921084655.57B4711C0043@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20507

Modified Files:
	openssh.spec 
Removed Files:
	openssh-5.2p1-homechroot.patch 
Log Message:
remove homechroot patch



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-11/openssh.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- openssh.spec	30 Jun 2009 11:14:25 -0000	1.143
+++ openssh.spec	21 Sep 2009 08:46:55 -0000	1.144
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 5%{?dist}%{?rescue_rel}
+Release: 6%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -97,7 +97,6 @@ Patch54: openssh-5.1p1-gssapi-role.patch
 Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
 Patch65: openssh-5.2p1-fips.patch
-Patch66: openssh-5.2p1-homechroot.patch
 Patch67: openssh-5.2p1-selabel.patch
 
 License: BSD
@@ -230,7 +229,6 @@ an X11 passphrase dialog for OpenSSH.
 %patch55 -p1 -b .cloexec
 %patch62 -p1 -b .manpage
 %patch65 -p1 -b .fips
-%patch66 -p1 -b .homechroot
 %patch67 -p1 -b .selabel
 
 autoreconf
@@ -476,7 +474,10 @@ fi
 %endif
 
 %changelog
-* Tue Jun 30 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-11
+* Mon Sep 21 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-6
+- remove homechroot patch
+
+* Tue Jun 30 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-5
 - create '~/.ssh/known_hosts' within proper context
 
 * Tue Jun 23 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-4


--- openssh-5.2p1-homechroot.patch DELETED ---



From salimma at fedoraproject.org  Mon Sep 21 08:48:00 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 21 Sep 2009 08:48:00 +0000 (UTC)
Subject: rpms/gedit-vala/F-10 .cvsignore, 1.4, 1.5 gedit-vala.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090921084800.5AFC311C0043@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gedit-vala/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20965/F-10

Modified Files:
	.cvsignore gedit-vala.spec sources 
Log Message:
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
- Update to final 0.5.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Jul 2009 08:25:50 -0000	1.4
+++ .cvsignore	21 Sep 2009 08:48:00 -0000	1.5
@@ -1 +1 @@
-vtg-r319.tar.bz2
+vtg-0.5.0.tar.bz2


Index: gedit-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-10/gedit-vala.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gedit-vala.spec	14 Jul 2009 08:25:50 -0000	1.7
+++ gedit-vala.spec	21 Sep 2009 08:48:00 -0000	1.8
@@ -1,20 +1,20 @@
-%define upstream_name vtg
-%define svn_rev r319
+%global upstream_name vtg
+#global svn_rev r
 
 Name:           gedit-vala
 Version:        0.5.0
-Release:        0.1.%{svn_rev}svn%{?dist}
+Release:        1%{?dist}
+#Release:        0.1.%{svn_rev}svn%{?dist}
 Summary:        Vala Toys for gEdit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://code.google.com/p/vtg/
-#Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
-Source0:        vtg-%{svn_rev}.tar.bz2
+Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For SVN checkout only
-BuildRequires:  gnome-common autoconf automake libtool
+#BuildRequires:  gnome-common autoconf automake libtool
 # end SVN
 BuildRequires:  gedit-devel vala-devel GConf2-devel
 # GConf2-devel ought to depend on dbus-devel:
@@ -46,12 +46,11 @@ with four modules:
 
 
 %prep
-#setup -q -n %{upstream_name}-%{version}
-%setup -q -n %{upstream_name}
+%setup -q -n %{upstream_name}-%{version}
 
 
 %build
-NOCONFIGURE=1 ./autogen.sh
+#NOCONFIGURE=1 ./autogen.sh
 # http://code.google.com/p/vtg/issues/detail?id=67
 %configure --disable-vsc-shell
 # this switch is ignored right now
@@ -80,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
+- Update to final 0.5.0 release
+
 * Tue Jul 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-0.1.r319svn%{?dist}
 - Update to SVN rev 319 (needed to build against vala 0.7.x)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Jul 2009 08:25:50 -0000	1.4
+++ sources	21 Sep 2009 08:48:00 -0000	1.5
@@ -1 +1 @@
-8b9ce25d6391d8da04df3033e6f988ef  vtg-r319.tar.bz2
+53c65e9c11a1335adb0f7faf0b85151a  vtg-0.5.0.tar.bz2



From salimma at fedoraproject.org  Mon Sep 21 08:48:00 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 21 Sep 2009 08:48:00 +0000 (UTC)
Subject: rpms/gedit-vala/F-11 .cvsignore, 1.4, 1.5 gedit-vala.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090921084800.CF2F811C0043@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gedit-vala/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20965/F-11

Modified Files:
	.cvsignore gedit-vala.spec sources 
Log Message:
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
- Update to final 0.5.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Jul 2009 08:25:50 -0000	1.4
+++ .cvsignore	21 Sep 2009 08:48:00 -0000	1.5
@@ -1 +1 @@
-vtg-r319.tar.bz2
+vtg-0.5.0.tar.bz2


Index: gedit-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-11/gedit-vala.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gedit-vala.spec	14 Jul 2009 08:25:51 -0000	1.6
+++ gedit-vala.spec	21 Sep 2009 08:48:00 -0000	1.7
@@ -1,20 +1,20 @@
-%define upstream_name vtg
-%define svn_rev r319
+%global upstream_name vtg
+#global svn_rev r
 
 Name:           gedit-vala
 Version:        0.5.0
-Release:        0.1.%{svn_rev}svn%{?dist}
+Release:        1%{?dist}
+#Release:        0.1.%{svn_rev}svn%{?dist}
 Summary:        Vala Toys for gEdit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://code.google.com/p/vtg/
-#Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
-Source0:        vtg-%{svn_rev}.tar.bz2
+Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For SVN checkout only
-BuildRequires:  gnome-common autoconf automake libtool
+#BuildRequires:  gnome-common autoconf automake libtool
 # end SVN
 BuildRequires:  gedit-devel vala-devel GConf2-devel
 # GConf2-devel ought to depend on dbus-devel:
@@ -46,12 +46,11 @@ with four modules:
 
 
 %prep
-#setup -q -n %{upstream_name}-%{version}
-%setup -q -n %{upstream_name}
+%setup -q -n %{upstream_name}-%{version}
 
 
 %build
-NOCONFIGURE=1 ./autogen.sh
+#NOCONFIGURE=1 ./autogen.sh
 # http://code.google.com/p/vtg/issues/detail?id=67
 %configure --disable-vsc-shell
 # this switch is ignored right now
@@ -80,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
+- Update to final 0.5.0 release
+
 * Tue Jul 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-0.1.r319svn%{?dist}
 - Update to SVN rev 319 (needed to build against vala 0.7.x)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Jul 2009 08:25:51 -0000	1.4
+++ sources	21 Sep 2009 08:48:00 -0000	1.5
@@ -1 +1 @@
-8b9ce25d6391d8da04df3033e6f988ef  vtg-r319.tar.bz2
+53c65e9c11a1335adb0f7faf0b85151a  vtg-0.5.0.tar.bz2



From salimma at fedoraproject.org  Mon Sep 21 08:48:01 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 21 Sep 2009 08:48:01 +0000 (UTC)
Subject: rpms/gedit-vala/devel .cvsignore, 1.4, 1.5 gedit-vala.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090921084801.3A36511C0043@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gedit-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20965/devel

Modified Files:
	.cvsignore gedit-vala.spec sources 
Log Message:
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
- Update to final 0.5.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Jul 2009 08:25:51 -0000	1.4
+++ .cvsignore	21 Sep 2009 08:48:00 -0000	1.5
@@ -1 +1 @@
-vtg-r319.tar.bz2
+vtg-0.5.0.tar.bz2


Index: gedit-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/gedit-vala.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gedit-vala.spec	24 Jul 2009 23:48:48 -0000	1.8
+++ gedit-vala.spec	21 Sep 2009 08:48:01 -0000	1.9
@@ -1,20 +1,20 @@
-%define upstream_name vtg
-%define svn_rev r319
+%global upstream_name vtg
+#global svn_rev r
 
 Name:           gedit-vala
 Version:        0.5.0
-Release:        0.2.%{svn_rev}svn%{?dist}
+Release:        1%{?dist}
+#Release:        0.1.%{svn_rev}svn%{?dist}
 Summary:        Vala Toys for gEdit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://code.google.com/p/vtg/
-#Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
-Source0:        vtg-%{svn_rev}.tar.bz2
+Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For SVN checkout only
-BuildRequires:  gnome-common autoconf automake libtool
+#BuildRequires:  gnome-common autoconf automake libtool
 # end SVN
 BuildRequires:  gedit-devel vala-devel GConf2-devel
 # GConf2-devel ought to depend on dbus-devel:
@@ -46,12 +46,11 @@ with four modules:
 
 
 %prep
-#setup -q -n %{upstream_name}-%{version}
-%setup -q -n %{upstream_name}
+%setup -q -n %{upstream_name}-%{version}
 
 
 %build
-NOCONFIGURE=1 ./autogen.sh
+#NOCONFIGURE=1 ./autogen.sh
 # http://code.google.com/p/vtg/issues/detail?id=67
 %configure --disable-vsc-shell
 # this switch is ignored right now
@@ -80,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
+- Update to final 0.5.0 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-0.2.r319svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Jul 2009 08:25:51 -0000	1.4
+++ sources	21 Sep 2009 08:48:01 -0000	1.5
@@ -1 +1 @@
-8b9ce25d6391d8da04df3033e6f988ef  vtg-r319.tar.bz2
+53c65e9c11a1335adb0f7faf0b85151a  vtg-0.5.0.tar.bz2



From veillard at fedoraproject.org  Mon Sep 21 09:09:50 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 21 Sep 2009 09:09:50 +0000 (UTC)
Subject: rpms/libxslt/devel libxslt-1.1.25-locking.patch, NONE,
	1.1 libxslt.spec, 1.59, 1.60
Message-ID: <20090921090951.0155711C0043@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv626

Modified Files:
	libxslt.spec 
Added Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Fix a locking bug in 1.1.25, daniel


libxslt-1.1.25-locking.patch:
 extensions.c |   34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

--- NEW FILE libxslt-1.1.25-locking.patch ---
commit 2e8defa7ccef2f76fb1cbfe9e9673d8e4b6cf1d6
Author: Daniel Veillard <veillard at redhat.com>
Date:   Sun Sep 20 11:51:52 2009 +0200

    595612 Try to fix some locking problems
    
    * libxslt/extensions.c: there were still cases where the normal
      code path could led to trying to mtake again the extension lock
      go over all entry points of the module and clean things up

diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index ebb81f5..6187b7a 100644
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -313,8 +313,6 @@ typedef void (*exsltRegisterFunction) (void);
  * by LIBXSLT_DEFAULT_PLUGINS_PATH() which is determined at
  * compile time.
  *
- * Always called with xsltExtMutex lock taken.
- *
  * Returns 0 if successful, -1 in case of error. 
  */
 
@@ -550,10 +548,14 @@ xsltRegisterExtPrefix(xsltStylesheetPtr style,
     if (xsltExtensionsHash != NULL) {
         xsltExtModulePtr module;
 
+        xmlMutexLock(xsltExtMutex);
         module = xmlHashLookup(xsltExtensionsHash, URI);
+        xmlMutexUnlock(xsltExtMutex);
         if (NULL == module) {
             if (!xsltExtModuleRegisterDynamic(URI)) {
+                xmlMutexLock(xsltExtMutex);
                 module = xmlHashLookup(xsltExtensionsHash, URI);
+                xmlMutexUnlock(xsltExtMutex);
             }
         }
         if (module != NULL) {
@@ -1669,18 +1671,13 @@ xsltExtElementLookup(xsltTransformContextPtr ctxt,
     if ((name == NULL) || (URI == NULL))
         return (NULL);
 
-    xmlMutexLock(xsltExtMutex);
-
     if ((ctxt != NULL) && (ctxt->extElements != NULL)) {
         XML_CAST_FPTR(ret) = xmlHashLookup2(ctxt->extElements, name, URI);
         if (ret != NULL) {
-            xmlMutexUnlock(xsltExtMutex);
             return(ret);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     ret = xsltExtModuleElementLookup(name, URI);
 
     return (ret);
@@ -1707,19 +1704,23 @@ xsltExtModuleElementLookup(const xmlChar * name, const xmlChar * URI)
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /*
      * if function lookup fails, attempt a dynamic load on
      * supported platforms
      */
     if (NULL == ext) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     if (ext == NULL)
         return (NULL);
     return (ext->transform);
@@ -1747,13 +1748,18 @@ xsltExtModuleElementPreComputeLookup(const xmlChar * name,
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     if (ext == NULL) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
-    xmlMutexUnlock(xsltExtMutex);
 
     if (ext == NULL)
         return (NULL);
@@ -1856,15 +1862,19 @@ xsltExtModuleTopLevelLookup(const xmlChar * name, const xmlChar * URI)
 
     XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /* if lookup fails, attempt a dynamic load on supported platforms */
     if (NULL == ret) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     return (ret);
 }
 


Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/libxslt.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libxslt.spec	17 Sep 2009 15:30:57 -0000	1.59
+++ libxslt.spec	21 Sep 2009 09:09:50 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.25
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,6 +15,7 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
+Patch1: libxslt-1.1.25-locking.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -56,6 +57,7 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -130,7 +132,10 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
-* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.24-1
+* Mon Sep 21 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-2
+- fix a locking bug in 1.1.25
+
+* Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-1
 - release of 1.1.25
 - Add API versioning  for libxslt shared library
 - xsl:sort lang support using the locale



From jamatos at fedoraproject.org  Mon Sep 21 09:11:58 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 21 Sep 2009 09:11:58 +0000 (UTC)
Subject: rpms/tellico/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 tellico.spec, 1.39, 1.40
Message-ID: <20090921091158.946EE11C0043@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1652

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0-1
- stable release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	12 Sep 2009 03:26:00 -0000	1.18
+++ .cvsignore	21 Sep 2009 09:11:58 -0000	1.19
@@ -1 +1 @@
-tellico-2.0pre2.tar.bz2
+tellico-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	12 Sep 2009 03:26:00 -0000	1.18
+++ sources	21 Sep 2009 09:11:58 -0000	1.19
@@ -1 +1 @@
-d4905872c16fa7e120b936ac0c1c7c3e  tellico-2.0pre2.tar.bz2
+e7dce8a5f3086b9fbf8cd33d83a28f88  tellico-2.0.tar.bz2


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- tellico.spec	19 Sep 2009 17:42:28 -0000	1.39
+++ tellico.spec	21 Sep 2009 09:11:58 -0000	1.40
@@ -1,15 +1,12 @@
-
-%define pre pre2
-
 Name:           tellico
 Version:        2.0
-Release:        0.2.%{pre}%{?dist}
+Release:        1%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
 License:        GPLv2
-URL:            http://tellico-project.org/ 
-Source0:        http://tellico-project.org/files/tellico-%{version}%{?pre}.tar.bz2
+URL:            http://tellico-project.org/
+Source0:        http://tellico-project.org/files/tellico-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.2-3
@@ -52,7 +49,7 @@ directly from Amazon.com.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}
+%setup -q
 
 %build
 
@@ -113,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0-1
+- stable release
+
 * Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.2.pre2
 - use %%_kde4_* macros
 - optimize scriptlets



From veillard at fedoraproject.org  Mon Sep 21 09:12:56 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 21 Sep 2009 09:12:56 +0000 (UTC)
Subject: rpms/libxslt/F-11 libxslt-1.1.25-locking.patch, NONE,
	1.1 libxslt.spec, 1.58, 1.59
Message-ID: <20090921091256.775A911C0043@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2092

Modified Files:
	libxslt.spec 
Added Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Fix lock problems in 1.1.25, Daniel


libxslt-1.1.25-locking.patch:
 extensions.c |   34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

--- NEW FILE libxslt-1.1.25-locking.patch ---
commit 2e8defa7ccef2f76fb1cbfe9e9673d8e4b6cf1d6
Author: Daniel Veillard <veillard at redhat.com>
Date:   Sun Sep 20 11:51:52 2009 +0200

    595612 Try to fix some locking problems
    
    * libxslt/extensions.c: there were still cases where the normal
      code path could led to trying to mtake again the extension lock
      go over all entry points of the module and clean things up

diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index ebb81f5..6187b7a 100644
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -313,8 +313,6 @@ typedef void (*exsltRegisterFunction) (void);
  * by LIBXSLT_DEFAULT_PLUGINS_PATH() which is determined at
  * compile time.
  *
- * Always called with xsltExtMutex lock taken.
- *
  * Returns 0 if successful, -1 in case of error. 
  */
 
@@ -550,10 +548,14 @@ xsltRegisterExtPrefix(xsltStylesheetPtr style,
     if (xsltExtensionsHash != NULL) {
         xsltExtModulePtr module;
 
+        xmlMutexLock(xsltExtMutex);
         module = xmlHashLookup(xsltExtensionsHash, URI);
+        xmlMutexUnlock(xsltExtMutex);
         if (NULL == module) {
             if (!xsltExtModuleRegisterDynamic(URI)) {
+                xmlMutexLock(xsltExtMutex);
                 module = xmlHashLookup(xsltExtensionsHash, URI);
+                xmlMutexUnlock(xsltExtMutex);
             }
         }
         if (module != NULL) {
@@ -1669,18 +1671,13 @@ xsltExtElementLookup(xsltTransformContextPtr ctxt,
     if ((name == NULL) || (URI == NULL))
         return (NULL);
 
-    xmlMutexLock(xsltExtMutex);
-
     if ((ctxt != NULL) && (ctxt->extElements != NULL)) {
         XML_CAST_FPTR(ret) = xmlHashLookup2(ctxt->extElements, name, URI);
         if (ret != NULL) {
-            xmlMutexUnlock(xsltExtMutex);
             return(ret);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     ret = xsltExtModuleElementLookup(name, URI);
 
     return (ret);
@@ -1707,19 +1704,23 @@ xsltExtModuleElementLookup(const xmlChar * name, const xmlChar * URI)
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /*
      * if function lookup fails, attempt a dynamic load on
      * supported platforms
      */
     if (NULL == ext) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     if (ext == NULL)
         return (NULL);
     return (ext->transform);
@@ -1747,13 +1748,18 @@ xsltExtModuleElementPreComputeLookup(const xmlChar * name,
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     if (ext == NULL) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
-    xmlMutexUnlock(xsltExtMutex);
 
     if (ext == NULL)
         return (NULL);
@@ -1856,15 +1862,19 @@ xsltExtModuleTopLevelLookup(const xmlChar * name, const xmlChar * URI)
 
     XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /* if lookup fails, attempt a dynamic load on supported platforms */
     if (NULL == ret) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     return (ret);
 }
 


Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-11/libxslt.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- libxslt.spec	17 Sep 2009 16:09:20 -0000	1.58
+++ libxslt.spec	21 Sep 2009 09:12:56 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.25
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,6 +15,7 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
+Patch1: libxslt-1.1.25-locking.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -56,6 +57,7 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -130,6 +132,9 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Mon Sep 21 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-2
+- fix a locking bug in 1.1.25
+
 * Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-1
 - release of 1.1.25
 - Add API versioning  for libxslt shared library



From veillard at fedoraproject.org  Mon Sep 21 09:14:59 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 21 Sep 2009 09:14:59 +0000 (UTC)
Subject: rpms/libxslt/F-10 libxslt-1.1.25-locking.patch, NONE,
	1.1 libxslt.spec, 1.56, 1.57
Message-ID: <20090921091459.0856911C0043@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2912

Modified Files:
	libxslt.spec 
Added Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Fix locking problems in 1.1.25, Daniel


libxslt-1.1.25-locking.patch:
 extensions.c |   34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

--- NEW FILE libxslt-1.1.25-locking.patch ---
commit 2e8defa7ccef2f76fb1cbfe9e9673d8e4b6cf1d6
Author: Daniel Veillard <veillard at redhat.com>
Date:   Sun Sep 20 11:51:52 2009 +0200

    595612 Try to fix some locking problems
    
    * libxslt/extensions.c: there were still cases where the normal
      code path could led to trying to mtake again the extension lock
      go over all entry points of the module and clean things up

diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index ebb81f5..6187b7a 100644
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -313,8 +313,6 @@ typedef void (*exsltRegisterFunction) (void);
  * by LIBXSLT_DEFAULT_PLUGINS_PATH() which is determined at
  * compile time.
  *
- * Always called with xsltExtMutex lock taken.
- *
  * Returns 0 if successful, -1 in case of error. 
  */
 
@@ -550,10 +548,14 @@ xsltRegisterExtPrefix(xsltStylesheetPtr style,
     if (xsltExtensionsHash != NULL) {
         xsltExtModulePtr module;
 
+        xmlMutexLock(xsltExtMutex);
         module = xmlHashLookup(xsltExtensionsHash, URI);
+        xmlMutexUnlock(xsltExtMutex);
         if (NULL == module) {
             if (!xsltExtModuleRegisterDynamic(URI)) {
+                xmlMutexLock(xsltExtMutex);
                 module = xmlHashLookup(xsltExtensionsHash, URI);
+                xmlMutexUnlock(xsltExtMutex);
             }
         }
         if (module != NULL) {
@@ -1669,18 +1671,13 @@ xsltExtElementLookup(xsltTransformContextPtr ctxt,
     if ((name == NULL) || (URI == NULL))
         return (NULL);
 
-    xmlMutexLock(xsltExtMutex);
-
     if ((ctxt != NULL) && (ctxt->extElements != NULL)) {
         XML_CAST_FPTR(ret) = xmlHashLookup2(ctxt->extElements, name, URI);
         if (ret != NULL) {
-            xmlMutexUnlock(xsltExtMutex);
             return(ret);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     ret = xsltExtModuleElementLookup(name, URI);
 
     return (ret);
@@ -1707,19 +1704,23 @@ xsltExtModuleElementLookup(const xmlChar * name, const xmlChar * URI)
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /*
      * if function lookup fails, attempt a dynamic load on
      * supported platforms
      */
     if (NULL == ext) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     if (ext == NULL)
         return (NULL);
     return (ext->transform);
@@ -1747,13 +1748,18 @@ xsltExtModuleElementPreComputeLookup(const xmlChar * name,
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     if (ext == NULL) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
-    xmlMutexUnlock(xsltExtMutex);
 
     if (ext == NULL)
         return (NULL);
@@ -1856,15 +1862,19 @@ xsltExtModuleTopLevelLookup(const xmlChar * name, const xmlChar * URI)
 
     XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /* if lookup fails, attempt a dynamic load on supported platforms */
     if (NULL == ret) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     return (ret);
 }
 


Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-10/libxslt.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- libxslt.spec	17 Sep 2009 16:13:24 -0000	1.56
+++ libxslt.spec	21 Sep 2009 09:14:58 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.25
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,6 +15,7 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
+Patch1: libxslt-1.1.25-locking.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -56,6 +57,7 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -130,6 +132,9 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Mon Sep 21 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-2
+- fix a locking bug in 1.1.25
+
 * Thu Sep 17 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-1
 - release of 1.1.25
 - Add API versioning  for libxslt shared library



From jamatos at fedoraproject.org  Mon Sep 21 09:31:23 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 21 Sep 2009 09:31:23 +0000 (UTC)
Subject: rpms/rpy/devel rpy.spec,1.45,1.46
Message-ID: <20090921093123.E97B411C0374@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/rpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12538

Modified Files:
	rpy.spec 
Log Message:
* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0.6-6
- require at runtime just R-core



Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- rpy.spec	24 Aug 2009 19:43:57 -0000	1.45
+++ rpy.spec	21 Sep 2009 09:31:21 -0000	1.46
@@ -4,7 +4,7 @@
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
-Release:       5%{?dist}
+Release:       6%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -13,7 +13,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: R-devel = %{rver}, numpy, python-devel
 
 Requires:      numpy
-Requires:      R = %{rver}
+Requires:      R-core = %{rver}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -45,11 +45,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS NEWS README GPL_LICENSE LGPL_LICENSE MPL_LICENSE PKG-INFO 
+%doc AUTHORS NEWS README GPL_LICENSE LGPL_LICENSE MPL_LICENSE PKG-INFO
 %{python_sitearch}/rpy2/
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0.6-6
+- require at runtime just R-core
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-5
 - rebuild for R 2.9.2
 



From jamatos at fedoraproject.org  Mon Sep 21 09:47:43 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 21 Sep 2009 09:47:43 +0000 (UTC)
Subject: rpms/rpy/F-11 .cvsignore, 1.8, 1.9 rpy.spec, 1.42, 1.43 sources, 1.8,
	1.9
Message-ID: <20090921094743.8F6FC11C0043@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/rpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18416

Modified Files:
	.cvsignore rpy.spec sources 
Log Message:
* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0.6-1
- update to rpy 2.0.6
- require at runtime just R-core



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Mar 2009 01:53:10 -0000	1.8
+++ .cvsignore	21 Sep 2009 09:47:43 -0000	1.9
@@ -1 +1 @@
-rpy2-2.0.3.tar.gz
+rpy2-2.0.6.tar.gz


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/rpy.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- rpy.spec	24 Aug 2009 19:43:57 -0000	1.42
+++ rpy.spec	21 Sep 2009 09:47:43 -0000	1.43
@@ -3,8 +3,8 @@
 %define rver   2.9.2
 Name:          rpy
 Summary:       Python interface to the R language
-Version:       2.0.3
-Release:       4%{?dist}
+Version:       2.0.6
+Release:       1%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -13,7 +13,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: R-devel = %{rver}, numpy, python-devel
 
 Requires:      numpy
-Requires:      R = %{rver}
+Requires:      R-core = %{rver}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -40,11 +40,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS NEWS README GPL_LICENSE LGPL_LICENSE MPL_LICENSE PKG-INFO 
+%doc AUTHORS NEWS README GPL_LICENSE LGPL_LICENSE MPL_LICENSE PKG-INFO
 %{python_sitearch}/rpy2/
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0.6-1
+- update to rpy 2.0.6
+- require at runtime just R-core
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-4
 - rebuild for R-2.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Mar 2009 01:53:10 -0000	1.8
+++ sources	21 Sep 2009 09:47:43 -0000	1.9
@@ -1 +1 @@
-1cd67567080f43c53b8d4ea75bb2ca1a  rpy2-2.0.3.tar.gz
+5c1da09811ead076dc03896ff9307b9d  rpy2-2.0.6.tar.gz



From jamatos at fedoraproject.org  Mon Sep 21 09:55:52 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 21 Sep 2009 09:55:52 +0000 (UTC)
Subject: rpms/rpy/F-10 rpy.spec,1.39,1.40
Message-ID: <20090921095552.7623411C0043@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/rpy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20906

Modified Files:
	rpy.spec 
Log Message:
* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 1.0.3-11
- require at runtime just R-core



Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-10/rpy.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- rpy.spec	24 Aug 2009 19:43:56 -0000	1.39
+++ rpy.spec	21 Sep 2009 09:55:52 -0000	1.40
@@ -4,7 +4,7 @@
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       1.0.3
-Release:       10%{?dist}
+Release:       11%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:       GPLv2+
@@ -22,7 +22,7 @@ Patch3:        rpy-1.0.3-R-2.8.0.patch
 BuildRequires: R-devel = %{rver}, numpy, python-devel, texinfo-tex, tetex
 
 Requires:      numpy
-Requires:      R = %{rver}
+Requires:      R-core = %{rver}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -77,6 +77,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 1.0.3-11
+- require at runtime just R-core
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-10
 - rebuild for R 2.9.2
 



From caolanm at fedoraproject.org  Mon Sep 21 10:20:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Sep 2009 10:20:41 +0000 (UTC)
Subject: rpms/writer2latex/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 writer2latex.spec, 1.17, 1.18 writer2latex05.rh.patch, 1.4, 1.5
Message-ID: <20090921102041.A453211C0416@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28683

Modified Files:
	.cvsignore sources writer2latex.spec writer2latex05.rh.patch 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Sep 2008 12:26:28 -0000	1.4
+++ .cvsignore	21 Sep 2009 10:20:37 -0000	1.5
@@ -1 +1 @@
-writer2latex0502.zip
+1.0.tar.gz?view=tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Nov 2008 09:22:05 -0000	1.5
+++ sources	21 Sep 2009 10:20:37 -0000	1.6
@@ -1 +1 @@
-bfcac4a3f6a564bd644d103d2e81b9d8  writer2latex0502.zip
+200fba117b58740cbf93e8fa01cafc04  1.0.tar.gz?view=tar


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- writer2latex.spec	24 Jul 2009 10:18:51 -0000	1.17
+++ writer2latex.spec	21 Sep 2009 10:20:37 -0000	1.18
@@ -2,12 +2,12 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:          writer2latex
-Version:       0.5.0.2
-Release:       7%{?dist}
+Version:       1.0
+Release:       1%{?dist}
 Summary:       Document Converter from ODT to LaTeX
 License:       LGPLv2
-Url:           http://www.hj-gym.dk/~hj/writer2latex/
-Source0:       http://www.hj-gym.dk/~hj/writer2latex/writer2latex0502.zip
+Url:           http://writer2latex.sourceforge.net/
+Source0:       http://writer2latex.svn.sourceforge.net/viewvc/writer2latex/tags/1.0.tar.gz?view=tar
 Patch0:        writer2latex05.rh.patch
 BuildRequires: ant, openoffice.org-core
 Group:         Text Processing/Markup/XML
@@ -71,9 +71,10 @@ Document Converter Extension for OpenOff
 XHTML export filters.
 
 %prep
-%setup -q -n writer2latex05
+%setup -q -n 1.0
 %patch0 -p1 -b .rh.patch
-sed -i -e "s#LIBDIR#%{_libdir}#" build.xml
+sed -i -e "s#/opt/openoffice.org/basis3.0#%{_libdir}/openoffice.org/basis3.1#" build.xml
+sed -i -e "s#/opt/openoffice.org/ure#%{_libdir}/openoffice.org/ure#" build.xml
 
 %build
 ant jar javadoc oxt
@@ -163,7 +164,7 @@ fi
 
 %files
 %defattr(0644,root,root,0755)
-%doc COPYING.TXT Readme.txt History.txt
+%doc source/distro/History.txt source/distro/COPYING.TXT source/distro/Readme.txt source/distro/doc/user-manual.odt
 %{_javadir}/*
 %if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
@@ -183,6 +184,9 @@ fi
 %{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
 
 %changelog
+* Mon Sep 21 2009 Caolan McNamara <caolanm at redhat.com> 1.0-1
+- latest version
+
 * Fri Jul 24 2009 Caolan McNamara <caolanm at redhat.com> 0.5.0.2-7
 - make javadoc no-arch when building as arch-dependant aot
 

writer2latex05.rh.patch:
 build.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: writer2latex05.rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex05.rh.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- writer2latex05.rh.patch	26 Feb 2009 11:12:32 -0000	1.4
+++ writer2latex05.rh.patch	21 Sep 2009 10:20:37 -0000	1.5
@@ -1,33 +1,6 @@
-diff -ru writer2latex05.orig/source/writer2latex/office/ImageLoader.java writer2latex05/source/writer2latex/office/ImageLoader.java
---- writer2latex05.orig/source/writer2latex/office/ImageLoader.java	2007-04-17 08:30:42.000000000 +0100
-+++ writer2latex05/source/writer2latex/office/ImageLoader.java	2007-11-16 09:01:16.000000000 +0000
-@@ -107,8 +107,8 @@
-                 }
-                 // TODO: Use another base64 decoder. This one is "nonstandard"
-                 try {
--                    blob = new sun.misc.BASE64Decoder().decodeBuffer(buf.toString());
--                } catch (IOException e) {
-+                    blob = org.apache.xerces.impl.dv.util.Base64.decode(buf.toString());
-+                } catch (Exception e) {
-                     System.err.println("Oops - error converting base64");
-                 }
-                 sMIME = MIMETypes.getMagicMIMEType(blob);
 --- writer2latex05.orig/build.xml	2007-11-16 11:19:54.000000000 +0000
 +++ writer2latex05/build.xml	2007-11-16 11:30:50.000000000 +0000
-@@ -40,8 +40,10 @@
-     <property name="target.lib" location="target/lib"/>
-     <!-- classpath for the application; needs java-uno classes -->
-     <path id="main.class.path"> 
--        <filelist dir="${OFFICE_HOME}/program/classes"
--            files="jurt.jar,unoil.jar,ridl.jar,juh.jar"/>
-+        <filelist dir="LIBDIR/openoffice.org/ure/share/java"
-+            files="jurt.jar,ridl.jar,juh.jar"/>
-+        <filelist dir="LIBDIR/openoffice.org/basis3.1/program/classes"
-+            files="unoil.jar"/>
-     </path> 
- 
-     <target name="all"
-@@ -84,7 +86,7 @@
+@@ -100,7 +100,7 @@
              <manifest>
                  <attribute name="Built-By" value="${user.name}"/>
                  <attribute name="Main-Class" value="writer2latex.Application"/>
@@ -36,19 +9,19 @@ diff -ru writer2latex05.orig/source/writ
              </manifest>
          </jar>
      </target>
-@@ -115,7 +117,7 @@
+@@ -135,7 +135,7 @@
                  <attribute name="Built-By" value="${user.name}"/>
                  <!-- OOo needs this to register the filter: -->
-                 <attribute name="RegistrationClassName" value="writer2latex.filter.W2LExportFilter" />
+                 <attribute name="RegistrationClassName" value="org.openoffice.da.comp.writer2latex.W2LRegistration" />
 -                <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
 +                <attribute name="Class-Path" value="jaxp.jar jaxp_parser_impl.jar"/>
              </manifest>
          </jar>
  
-@@ -150,7 +152,7 @@
+@@ -174,7 +174,7 @@
                  <attribute name="Built-By" value="${user.name}"/>
                  <!-- OOo needs this to register the filter: -->
-                 <attribute name="RegistrationClassName" value="writer2latex.filter.W2XExportFilter" />
+                 <attribute name="RegistrationClassName" value="org.openoffice.da.comp.writer2xhtml.W2XRegistration" />
 -                <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
 +                <attribute name="Class-Path" value="jaxp.jar jaxp_parser_impl.jar"/>
              </manifest>



From mschwendt at fedoraproject.org  Mon Sep 21 10:23:06 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 21 Sep 2009 10:23:06 +0000 (UTC)
Subject: rpms/audacious/devel audacious.spec,1.52,1.53
Message-ID: <20090921102306.1E95911C0043@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29806

Modified Files:
	audacious.spec 
Log Message:
* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
- /usr/bin/audacious and /usr/bin/audtool compatibility links are
  provided officially by upstream within 2.2-alpha1.



Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- audacious.spec	12 Sep 2009 08:56:15 -0000	1.52
+++ audacious.spec	21 Sep 2009 10:23:05 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -105,6 +105,13 @@ desktop-file-install  \
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious2.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
+# 2.2-alpha1 will install these compatibility softlinks
+cd $RPM_BUILD_ROOT%{_bindir}
+rm audacious audtool
+ln -s audacious2 audacious
+ln -s audtool2 audtool
+cd -
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,7 +140,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/audacious2
+%{_bindir}/audacious
 %{_bindir}/audtool2
+%{_bindir}/audtool
 %{_datadir}/audacious/
 %{_mandir}/man[^3]/*
 %{_datadir}/applications/*.desktop
@@ -153,6 +162,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
+- /usr/bin/audacious and /usr/bin/audtool compatibility links are
+  provided officially by upstream within 2.2-alpha1.
+
 * Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
 - Build with --enable-samplerate (off by default), BR libsamplerate-devel
 



From jamatos at fedoraproject.org  Mon Sep 21 10:25:32 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 21 Sep 2009 10:25:32 +0000 (UTC)
Subject: rpms/rpy/F-11 rpy.spec,1.43,1.44
Message-ID: <20090921102532.521B611C0043@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/rpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30355

Modified Files:
	rpy.spec 
Log Message:
Keep in sync with rawhide version.



Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/rpy.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- rpy.spec	21 Sep 2009 09:47:43 -0000	1.43
+++ rpy.spec	21 Sep 2009 10:25:32 -0000	1.44
@@ -4,7 +4,7 @@
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
-Release:       1%{?dist}
+Release:       6%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -34,6 +34,11 @@ env CFLAGS="$RPM_OPT_FLAGS" python setup
 %install
 rm -rf $RPM_BUILD_ROOT
 python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+%if 0%{?__isa_bits} == 64
+%ifnarch ia64
+mv %{buildroot}/usr/lib/python2.6/site-packages/rpy2/images %{buildroot}%{python_sitearch}/rpy2/
+%endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,15 +50,21 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
-* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0.6-1
-- update to rpy 2.0.6
+* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0.6-6
 - require at runtime just R-core
 
-* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-4
-- rebuild for R-2.9.2
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-5
+- rebuild for R 2.9.2
 
-* Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-3
-- rebuild for R-2.9.1
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-3
+- images are only installed incorrectly on 64bit platforms that aren't ia64
+
+* Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-1
+- rebuild for R 2.9.1
+- update to rpy2 2.0.6
 
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-2
 - rebuild for R 2.9.0



From mschwendt at fedoraproject.org  Mon Sep 21 10:26:44 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 21 Sep 2009 10:26:44 +0000 (UTC)
Subject: rpms/audacious/devel README,NONE,1.1
Message-ID: <20090921102644.B641011C0043@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31079

Added Files:
	README 
Log Message:



--- NEW FILE README ---
$ md5sum audacious-2.2-alpha1.tgz 
e5f0f4c69e9dc95d5882ea35feefea96  audacious-2.2-alpha1.tgz

only minor spec changes necessary (added header directories).



From caolanm at fedoraproject.org  Mon Sep 21 10:30:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Sep 2009 10:30:04 +0000 (UTC)
Subject: rpms/writer2latex/devel sources, 1.6, 1.7 writer2latex.spec, 1.18,
	1.19
Message-ID: <20090921103004.1E35F11C0419@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32122

Modified Files:
	sources writer2latex.spec 
Log Message:
tidy


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Sep 2009 10:20:37 -0000	1.6
+++ sources	21 Sep 2009 10:30:03 -0000	1.7
@@ -1 +1 @@
-200fba117b58740cbf93e8fa01cafc04  1.0.tar.gz?view=tar
+200fba117b58740cbf93e8fa01cafc04  1.0.tar.gz


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- writer2latex.spec	21 Sep 2009 10:20:37 -0000	1.18
+++ writer2latex.spec	21 Sep 2009 10:30:03 -0000	1.19
@@ -7,7 +7,7 @@ Release:       1%{?dist}
 Summary:       Document Converter from ODT to LaTeX
 License:       LGPLv2
 Url:           http://writer2latex.sourceforge.net/
-Source0:       http://writer2latex.svn.sourceforge.net/viewvc/writer2latex/tags/1.0.tar.gz?view=tar
+Source0:       http://writer2latex.svn.sourceforge.net/viewvc/writer2latex/tags/1.0.tar.gz
 Patch0:        writer2latex05.rh.patch
 BuildRequires: ant, openoffice.org-core
 Group:         Text Processing/Markup/XML



From mschwendt at fedoraproject.org  Mon Sep 21 10:30:06 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 21 Sep 2009 10:30:06 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins-2.1-alsa-ng.patch,
	NONE, 1.1 audacious-plugins-2.1-underruns.patch, NONE,
	1.1 audacious-plugins.spec, 1.50,
	1.51 audacious-plugins-2.1-keep-mixer-open.patch, 1.1, NONE
Message-ID: <20090921103006.C9B1C11C0419@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32209

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-alsa-ng.patch 
	audacious-plugins-2.1-underruns.patch 
Removed Files:
	audacious-plugins-2.1-keep-mixer-open.patch 
Log Message:
* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
- Merge minor changes from 2.2-alpha1 alsa-ng plugin.


audacious-plugins-2.1-alsa-ng.patch:
 alsa-configure.c |   60 +++++++++++++++++-------------------------
 alsa-core.c      |   78 +++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 76 insertions(+), 62 deletions(-)

--- NEW FILE audacious-plugins-2.1-alsa-ng.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-configure.c audacious-plugins-fedora-2.1/src/alsa-ng/alsa-configure.c
--- audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-configure.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-configure.c	2009-09-16 00:57:07.000000000 +0200
@@ -245,8 +245,7 @@
 
 void alsaplug_configure(void)
 {
-	GtkWidget *vbox, *notebook;
-	GtkWidget *dev_vbox, *adevice_frame, *adevice_box;
+        GtkWidget * vbox, * adevice_frame, * adevice_box;
 	GtkWidget *mixer_frame, *mixer_box, *mixer_table, *mixer_card_om;
 	GtkWidget *mixer_card_label, *mixer_device_label;
 	GtkWidget *bbox, *ok, *cancel;
@@ -259,31 +258,25 @@
 		return;
 	}
 
-	configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
-			   GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-			   &configure_win);
-	gtk_window_set_title(GTK_WINDOW(configure_win),
-			     _("ALSA Driver configuration"));
-	gtk_window_set_policy(GTK_WINDOW(configure_win),
-			      FALSE, TRUE, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
-
-	vbox = gtk_vbox_new(FALSE, 10);
-	gtk_container_add(GTK_CONTAINER(configure_win), vbox);
-
-	notebook = gtk_notebook_new();
-	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-
-	dev_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(dev_vbox), 5);
-
-	adevice_frame = gtk_frame_new(_("Audio device:"));
-	gtk_box_pack_start(GTK_BOX(dev_vbox), adevice_frame, FALSE, FALSE, 0);
-
-	adevice_box = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(adevice_box), 5);
-	gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_box);
+        configure_win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_title ((GtkWindow *) configure_win, _("ALSA Output "
+         "Plugin Preferences"));
+        gtk_window_set_type_hint ((GtkWindow *) configure_win,
+         GDK_WINDOW_TYPE_HINT_DIALOG);
+        gtk_window_set_resizable ((GtkWindow *) configure_win, FALSE);
+        gtk_container_set_border_width ((GtkContainer *) configure_win, 6);
+        g_signal_connect ((GObject *) configure_win, "destroy", (GCallback)
+         gtk_widget_destroyed, & configure_win);
+
+        vbox = gtk_vbox_new (FALSE, 6);
+        gtk_container_add ((GtkContainer *) configure_win, vbox);
+
+        adevice_frame = gtk_frame_new (_("Device:"));
+        gtk_box_pack_start ((GtkBox *) vbox, adevice_frame, FALSE, FALSE, 0);
+
+        adevice_box = gtk_vbox_new (FALSE, 6);
+        gtk_container_set_border_width ((GtkContainer *) adevice_box, 6);
+        gtk_container_add ((GtkContainer *) adevice_frame, adevice_box);
 
 	devices_combo = gtk_combo_new();
 	gtk_box_pack_start(GTK_BOX(adevice_box), devices_combo,
@@ -292,12 +285,12 @@
 	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(devices_combo)->entry),
 			   alsaplug_cfg.pcm_device);
 
-	mixer_frame = gtk_frame_new(_("Mixer:"));
-	gtk_box_pack_start(GTK_BOX(dev_vbox), mixer_frame, FALSE, FALSE, 0);
+        mixer_frame = gtk_frame_new (_("Mixer:"));
+        gtk_box_pack_start ((GtkBox *) vbox, mixer_frame, FALSE, FALSE, 0);
 
-	mixer_box = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(mixer_box), 5);
-	gtk_container_add(GTK_CONTAINER(mixer_frame), mixer_box);
+        mixer_box = gtk_vbox_new (FALSE, 6);
+        gtk_container_set_border_width ((GtkContainer *) mixer_box, 6);
+        gtk_container_add ((GtkContainer *) mixer_frame, mixer_box);
 
 	mixer_table = gtk_table_new(2, 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(mixer_table), 5);
@@ -331,9 +324,6 @@
 	gtk_table_attach(GTK_TABLE(mixer_table), mixer_devices_combo,
 			 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dev_vbox,
-				 gtk_label_new(_("Device settings")));
-
 	bbox = gtk_hbutton_box_new();
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 	gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
diff -Nur audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c
--- audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-09-16 00:57:07.000000000 +0200
@@ -222,10 +222,14 @@
         else
         {
             gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
-            if (err < 0)
-                _ERROR("(write) snd_pcm_recover: %s", snd_strerror(err));
 
-            return;
+            _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
+
+            if (err < 0)
+            {
+                _ERROR ("snd_pcm_recover error: %s", snd_strerror (err));
+                return;
+            }
         }
     }
 }
@@ -299,13 +303,40 @@
     if (alsaplug_cfg.mixer_card == NULL)
         alsaplug_cfg.mixer_card = g_strdup("default");
 
+    if (!alsaplug_mixer_new(&amixer))
+        mixer_ready = TRUE;
+
     return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;
 }
 
+static void alsaplug_cleanup(void)
+{
+    if (mixer_ready == TRUE)
+    {
+        snd_mixer_detach(amixer, alsaplug_cfg.mixer_card);
+        snd_mixer_close(amixer);
+
+        amixer = NULL;
+        mixer_ready = FALSE;
+    }
+}
+
+#define CHECK_FAIL(expression, name) \
+{ \
+    gint error = expression; \
+    if (error) \
+    { \
+        _ERROR (name " failed: %s.\n", snd_strerror (error)); \
+        snd_pcm_close (pcm_handle); \
+        pcm_handle = NULL; \
+        return -1; \
+    } \
+}
+
 static gint
 alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
 {
-    gint err, bitwidth, ringbuf_size;
+    gint err, bitwidth, ringbuf_size, buf_size;
     snd_pcm_format_t afmt;
     snd_pcm_hw_params_t *hwparams = NULL;
 
@@ -316,9 +347,6 @@
         return -1;
     }
 
-    if (!alsaplug_mixer_new(&amixer))
-        mixer_ready = TRUE;
-
     if ((err = snd_pcm_open(&pcm_handle, alsaplug_cfg.pcm_device, SND_PCM_STREAM_PLAYBACK, 0)) < 0)
     {
         _ERROR("snd_pcm_open: %s", snd_strerror(err));
@@ -328,27 +356,31 @@
 
     snd_pcm_hw_params_alloca(&hwparams);
     snd_pcm_hw_params_any(pcm_handle, hwparams);
-    snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
-    snd_pcm_hw_params_set_format(pcm_handle, hwparams, afmt);
-    snd_pcm_hw_params_set_channels(pcm_handle, hwparams, nch);
-    snd_pcm_hw_params_set_rate(pcm_handle, hwparams, rate, 0);
 
-    err = snd_pcm_hw_params(pcm_handle, hwparams);
-    if (err < 0)
-    {
-        _ERROR("snd_pcm_hw_params failed: %s", snd_strerror(err));
-        return -1;
-    }
+    CHECK_FAIL (snd_pcm_hw_params_set_access (pcm_handle, hwparams,
+     SND_PCM_ACCESS_RW_INTERLEAVED), "snd_pcm_hw_params_set_access");
+    CHECK_FAIL (snd_pcm_hw_params_set_format (pcm_handle, hwparams, afmt),
+     "snd_pcm_hw_params_set_format");
+    CHECK_FAIL (snd_pcm_hw_params_set_channels (pcm_handle, hwparams, nch),
+     "snd_pcm_hw_params_set_channels");
+    CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
+     "snd_pcm_hw_params_set_rate");
+    CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
 
     bitwidth = snd_pcm_format_physical_width(afmt);
     bps = (rate * bitwidth * nch) >> 3;
-    ringbuf_size = aud_cfg->output_buffer_size * bps / 1000;
+
+    buf_size = MAX(aud_cfg->output_buffer_size, 100);
+    ringbuf_size = buf_size * bps / 1000;
+
     if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
         _ERROR("alsaplug_ringbuffer_init failed");
         return -1;
     }
+
     pcm_going = TRUE;
     flush_request = -1;
+    paused = FALSE;
 
     audio_thread = g_thread_create(alsaplug_loop, NULL, TRUE, NULL);
     return 1;
@@ -371,15 +403,6 @@
         g_thread_join(audio_thread);
 
     audio_thread = NULL;
-
-    if (mixer_ready == TRUE)
-    {
-        snd_mixer_detach(amixer, alsaplug_cfg.mixer_card);
-        snd_mixer_close(amixer);
-
-        amixer = NULL;
-        mixer_ready = FALSE;
-    }
 }
 
 static void
@@ -500,6 +523,7 @@
     .description = "ALSA Output Plugin (-ng)",
     .probe_priority = 1,
     .init = alsaplug_init,
+    .cleanup = alsaplug_cleanup,
     .open_audio = alsaplug_open_audio,
     .close_audio = alsaplug_close_audio,
     .write_audio = alsaplug_write_audio,

audacious-plugins-2.1-underruns.patch:
 alsa-core.c |   38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

--- NEW FILE audacious-plugins-2.1-underruns.patch ---
diff -Nur audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c
--- audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-09-16 00:57:07.000000000 +0200
+++ audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c	2009-09-19 17:38:22.574485456 +0200
@@ -27,6 +27,10 @@
 static gboolean pcm_going = FALSE;
 static GThread *audio_thread = NULL;
 static gint bps;
+static gint loopbufsize = 384000;
+static gint looppostsize = 2048;
+static gint looppresize;
+static gboolean prefill = TRUE;
 
 static gsize wr_total = 0;
 static gsize wr_hwframes = 0;
@@ -221,6 +225,9 @@
         }
         else
         {
+            if (wr_frames == -EPIPE) {
+                prefill = TRUE;
+            }
             gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
 
             _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
@@ -237,7 +244,7 @@
 static gpointer
 alsaplug_loop(gpointer unused)
 {
-    guchar buf[2048];
+    guchar buf[loopbufsize];
     int size;
 
     while (pcm_going)
@@ -247,6 +254,7 @@
         if (flush_request != -1)
         {
             alsaplug_ringbuffer_reset (& pcm_ringbuf);
+            prefill = TRUE;
             snd_pcm_drop(pcm_handle);
             snd_pcm_prepare(pcm_handle);
             wr_total = flush_request * (long long) bps / 1000;
@@ -264,12 +272,26 @@
             continue;
         }
 
-        if (size > sizeof buf)
-            size = sizeof buf;
+        if (prefill) {
+            if (size > loopbufsize)
+                size = loopbufsize;
+
+            if (size >= looppresize) {
+                alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+                prefill = FALSE;
+            }
+        }
+        else {
+            if (size > looppostsize)
+                size = looppostsize;
 
         alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+            alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+        }
         g_mutex_unlock (pcm_state_mutex);
-        alsaplug_write_buffer (buf, size);
+        if (!prefill) {
+            alsaplug_write_buffer (buf, size);
+        }
     }
 
     snd_pcm_drain(pcm_handle);
@@ -377,6 +399,13 @@
         _ERROR("alsaplug_ringbuffer_init failed");
         return -1;
     }
+    if (loopbufsize >= ringbuf_size) {
+        looppresize = ringbuf_size/2;
+    }
+    else {
+        looppresize = loopbufsize;
+    }
+    prefill = TRUE;
 
     pcm_going = TRUE;
     flush_request = -1;
@@ -511,6 +540,7 @@
 {
     g_mutex_lock (pcm_state_mutex);
     paused = p;
+    prefill = !paused;
     g_cond_broadcast (pcm_state_cond);
     g_mutex_unlock (pcm_state_mutex);
 }


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- audacious-plugins.spec	30 Jul 2009 10:32:38 -0000	1.50
+++ audacious-plugins.spec	21 Sep 2009 10:30:06 -0000	1.51
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -24,7 +24,8 @@ Source0: audacious-plugins-fedora-%{vers
 
 Patch1: audacious-plugins-1.5.1-timidity-cfg.patch
 Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
-Patch3: audacious-plugins-2.1-keep-mixer-open.patch
+Patch3: audacious-plugins-2.1-alsa-ng.patch
+Patch4: audacious-plugins-2.1-underruns.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -147,7 +148,8 @@ vortex compressed files.
 
 %patch1 -p1 -b .timidity-cfg
 %patch2 -p1 -b .xmms-skindir
-%patch3 -p1 -b .keep-mixer-open
+%patch3 -p1 -b .alsa-ng
+%patch4 -p1 -b .underruns
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -231,6 +233,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
+- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
+- Merge minor changes from 2.2-alpha1 alsa-ng plugin.
+
 * Thu Jul 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-3
 - Keep mixer open and not start at only %50 volume.
 


--- audacious-plugins-2.1-keep-mixer-open.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Sep 21 10:31:43 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 21 Sep 2009 10:31:43 +0000 (UTC)
Subject: rpms/audacious-plugins/devel README,1.1,1.2
Message-ID: <20090921103143.2857C11C0043@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv907

Modified Files:
	README 
Log Message:
poll() freezes are still present on Fedora 11


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README	20 Sep 2009 06:24:46 -0000	1.1
+++ README	21 Sep 2009 10:31:43 -0000	1.2
@@ -1,3 +1,9 @@
+2009-09-20:
+With alsa-gapless output plugin in 2.2-alpha1 on Fedora 11 the poll()
+playback freezes have returned for me.
+
+[...]
+
 $ md5sum audacious-plugins-2.2-alpha1.tgz 
 172ea9937709f2dcb73fd4a93355d6df  audacious-plugins-2.2-alpha1.tgz
 



From leigh123linux at fedoraproject.org  Mon Sep 21 10:38:46 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 21 Sep 2009 10:38:46 +0000 (UTC)
Subject: rpms/gmixer/devel gmixer-trayicon.desktop, NONE, 1.1 gmixer.desktop,
	1.3, 1.4 gmixer.spec, 1.5, 1.6
Message-ID: <20090921103846.2AA9F11C0043@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2915

Modified Files:
	gmixer.desktop gmixer.spec 
Added Files:
	gmixer-trayicon.desktop 
Log Message:
* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
- added German translations for desktop files
- revert last desktop file edit and add a autostart launcher



--- NEW FILE gmixer-trayicon.desktop ---
[Desktop Entry]
Version=1.0
Name=GMixer
Name[de]=GMixer
Name[fr]=GMixer
Comment=Audio mixer for the Gnome Desktop Environment
Comment[de]=Lautst?rkeregelung f?r den GNOME Desktop
Comment[fr]=Mixer audio pour l'environnement Gnome
Exec=gmixer -d
Icon=gmixer
StartupNotify=true
Type=Application
Categories=AudioVideo;Audio;Mixer;GTK;
#OnlyShowIn=GNOME;XFCE;KDE;LXDE
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-KDE-autostart-after=panel


Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/devel/gmixer.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gmixer.desktop	18 Sep 2009 20:40:58 -0000	1.3
+++ gmixer.desktop	21 Sep 2009 10:38:45 -0000	1.4
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=GMixer
+Name[de]=GMixer
 Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
+Comment[de]=Lautst?rkeregelung f?r den GNOME Desktop
 Comment[fr]=Mixer audio pour l'environnement Gnome
-Exec=gmixer -d
+Exec=gmixer
 Icon=gmixer
 StartupNotify=true
 Type=Application


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/devel/gmixer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gmixer.spec	18 Sep 2009 20:40:58 -0000	1.5
+++ gmixer.spec	21 Sep 2009 10:38:45 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@ License:        GPLv3+
 URL:            https://launchpad.net/gmixer
 Source0:        http://launchpad.net/gmixer/1.x/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        gmixer.desktop
+Source2:        gmixer-trayicon.desktop
 Patch0:         version_fix.patch
 Patch1:         gmixer-1.3-setup-py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,13 @@ desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %SOURCE1
 
+# autostart launcher
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+  %SOURCE2
+
+
+
 %find_lang %{name}
 
 %clean
@@ -66,6 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc gpl.txt 
 %{_bindir}/gmixer
+%{_sysconfdir}/xdg/autostart/gmixer-trayicon.desktop
 %{python_sitelib}/gtktrayicon.py*
 %{python_sitelib}/volkeys.so
 %{python_sitelib}/gmixer-1.0-py?.?.egg-info
@@ -76,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
+- added German translations for desktop files
+- revert last desktop file edit and add a autostart launcher
+
 * Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
 - edit desktop file so gmixer launches with trayicon
 



From atkac at fedoraproject.org  Mon Sep 21 10:38:47 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Sep 2009 10:38:47 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.327,1.328 named.init,1.74,1.75
Message-ID: <20090921103847.DF65D11C0043@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2898

Modified Files:
	bind.spec named.init 
Log Message:
- determine file size via `stat` instead of `ls` (#523682)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- bind.spec	16 Sep 2009 11:09:12 -0000	1.327
+++ bind.spec	21 Sep 2009 10:38:47 -0000	1.328
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.3.%{PREVER}%{?dist}
+Release:  0.4.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -595,6 +595,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.4.a3
+- determine file size via `stat` instead of `ls` (#523682)
+
 * Wed Sep 16 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.3.a3
 - update to 9.7.0a3
 


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- named.init	15 Sep 2009 15:34:00 -0000	1.74
+++ named.init	21 Sep 2009 10:38:47 -0000	1.75
@@ -76,8 +76,7 @@ mount_chroot_conf()
       # If mount source is a file
       if ! [ -d "$all" ]; then
         # mount it only if it is not present in chroot or it is empty
-        if ! [ -e "$ROOTDIR$all" ] ||
-           [ `ls -s "$ROOTDIR$all" | awk '{ print $1 };'` -eq 0 ]; then
+        if ! [ -e "$ROOTDIR$all" ] || [ `stat -c'%s' "$ROOTDIR$all"` -eq 0 ]; then
           touch "$ROOTDIR$all"
           mount --bind "$all" "$ROOTDIR$all"
         fi



From schwab at fedoraproject.org  Mon Sep 21 10:39:33 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 21 Sep 2009 10:39:33 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.289, 1.290 glibc-fedora.patch, 1.323,
	1.324 glibc.spec, 1.416, 1.417 import.log, 1.32, 1.33 sources,
	1.314, 1.315
Message-ID: <20090921103933.D5B0611C0043@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3282/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- .cvsignore	14 Sep 2009 12:23:29 -0000	1.289
+++ .cvsignore	21 Sep 2009 10:39:32 -0000	1.290
@@ -1,2 +1,2 @@
-glibc-2.10-335-g02bf610-fedora.tar.bz2
-glibc-2.10-335-g02bf610.tar.bz2
+glibc-2.10-340-gae0f0db-fedora.tar.bz2
+glibc-2.10-340-gae0f0db.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   32 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 768 insertions(+), 469 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- glibc-fedora.patch	14 Sep 2009 12:23:29 -0000	1.323
+++ glibc-fedora.patch	21 Sep 2009 10:39:32 -0000	1.324
@@ -1,6 +1,6 @@
---- glibc-2.10-335-g02bf610/ChangeLog
+--- glibc-2.10-340-gae0f0db/ChangeLog
 +++ glibc-2.10.90-22/ChangeLog
-@@ -596,6 +596,11 @@
+@@ -625,6 +625,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -861,6 +866,11 @@
+@@ -890,6 +895,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9259,6 +9269,13 @@
+@@ -9288,6 +9298,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9554,6 +9571,10 @@
+@@ -9583,6 +9600,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10811,6 +10832,15 @@
+@@ -10840,6 +10861,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,7 +65,7 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-335-g02bf610/ChangeLog.15
+--- glibc-2.10-340-gae0f0db/ChangeLog.15
 +++ glibc-2.10.90-22/ChangeLog.15
 @@ -477,6 +477,14 @@
  
@@ -132,7 +132,7 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-335-g02bf610/ChangeLog.16
+--- glibc-2.10-340-gae0f0db/ChangeLog.16
 +++ glibc-2.10.90-22/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
@@ -305,7 +305,7 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-335-g02bf610/Makeconfig
+--- glibc-2.10-340-gae0f0db/Makeconfig
 +++ glibc-2.10.90-22/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
@@ -323,7 +323,7 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-335-g02bf610/csu/Makefile
+--- glibc-2.10-340-gae0f0db/csu/Makefile
 +++ glibc-2.10.90-22/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
@@ -335,7 +335,7 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-335-g02bf610/csu/elf-init.c
+--- glibc-2.10-340-gae0f0db/csu/elf-init.c
 +++ glibc-2.10.90-22/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -361,7 +361,7 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-335-g02bf610/debug/tst-chk1.c
+--- glibc-2.10-340-gae0f0db/debug/tst-chk1.c
 +++ glibc-2.10.90-22/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -391,7 +391,7 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-335-g02bf610/elf/ldconfig.c
+--- glibc-2.10-340-gae0f0db/elf/ldconfig.c
 +++ glibc-2.10.90-22/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
@@ -474,7 +474,7 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-335-g02bf610/elf/tst-stackguard1.c
+--- glibc-2.10-340-gae0f0db/elf/tst-stackguard1.c
 +++ glibc-2.10.90-22/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -500,15 +500,15 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-335-g02bf610/include/bits/stdlib-ldbl.h
+--- glibc-2.10-340-gae0f0db/include/bits/stdlib-ldbl.h
 +++ glibc-2.10.90-22/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-335-g02bf610/include/bits/wchar-ldbl.h
+--- glibc-2.10-340-gae0f0db/include/bits/wchar-ldbl.h
 +++ glibc-2.10.90-22/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-335-g02bf610/include/features.h
+--- glibc-2.10-340-gae0f0db/include/features.h
 +++ glibc-2.10.90-22/include/features.h
 @@ -299,8 +299,13 @@
  #endif
@@ -526,7 +526,7 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-335-g02bf610/intl/locale.alias
+--- glibc-2.10-340-gae0f0db/intl/locale.alias
 +++ glibc-2.10.90-22/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
@@ -537,7 +537,7 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-335-g02bf610/libio/stdio.h
+--- glibc-2.10-340-gae0f0db/libio/stdio.h
 +++ glibc-2.10.90-22/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
@@ -552,7 +552,7 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-335-g02bf610/locale/iso-4217.def
+--- glibc-2.10-340-gae0f0db/locale/iso-4217.def
 +++ glibc-2.10.90-22/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
@@ -645,7 +645,7 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-335-g02bf610/locale/programs/locarchive.c
+--- glibc-2.10-340-gae0f0db/locale/programs/locarchive.c
 +++ glibc-2.10.90-22/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
@@ -678,7 +678,7 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-335-g02bf610/localedata/Makefile
+--- glibc-2.10-340-gae0f0db/localedata/Makefile
 +++ glibc-2.10.90-22/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
@@ -688,7 +688,7 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-335-g02bf610/localedata/SUPPORTED
+--- glibc-2.10-340-gae0f0db/localedata/SUPPORTED
 +++ glibc-2.10.90-22/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
@@ -731,7 +731,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-335-g02bf610/localedata/locales/cy_GB
+--- glibc-2.10-340-gae0f0db/localedata/locales/cy_GB
 +++ glibc-2.10.90-22/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -747,7 +747,7 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-335-g02bf610/localedata/locales/en_GB
+--- glibc-2.10-340-gae0f0db/localedata/locales/en_GB
 +++ glibc-2.10.90-22/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -760,7 +760,7 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-335-g02bf610/localedata/locales/no_NO
+--- glibc-2.10-340-gae0f0db/localedata/locales/no_NO
 +++ glibc-2.10.90-22/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
@@ -832,7 +832,7 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-335-g02bf610/localedata/locales/zh_TW
+--- glibc-2.10-340-gae0f0db/localedata/locales/zh_TW
 +++ glibc-2.10.90-22/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
@@ -861,7 +861,7 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-335-g02bf610/malloc/mcheck.c
+--- glibc-2.10-340-gae0f0db/malloc/mcheck.c
 +++ glibc-2.10.90-22/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
@@ -938,7 +938,7 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-335-g02bf610/manual/libc.texinfo
+--- glibc-2.10-340-gae0f0db/manual/libc.texinfo
 +++ glibc-2.10.90-22/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
@@ -949,7 +949,7 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-335-g02bf610/misc/sys/cdefs.h
+--- glibc-2.10-340-gae0f0db/misc/sys/cdefs.h
 +++ glibc-2.10.90-22/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
@@ -994,7 +994,7 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-335-g02bf610/nis/nss
+--- glibc-2.10-340-gae0f0db/nis/nss
 +++ glibc-2.10.90-22/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
@@ -1002,7 +1002,7 @@
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-335-g02bf610/nptl/ChangeLog
+--- glibc-2.10-340-gae0f0db/nptl/ChangeLog
 +++ glibc-2.10.90-22/nptl/ChangeLog
 @@ -3717,6 +3717,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
@@ -1044,7 +1044,7 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-335-g02bf610/nptl/Makefile
+--- glibc-2.10-340-gae0f0db/nptl/Makefile
 +++ glibc-2.10.90-22/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
@@ -1078,7 +1078,7 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-335-g02bf610/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-340-gae0f0db/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 +++ glibc-2.10.90-22/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
@@ -1088,7 +1088,7 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-335-g02bf610/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-340-gae0f0db/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 +++ glibc-2.10.90-22/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
@@ -1097,7 +1097,7 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-335-g02bf610/nptl/tst-stackguard1.c
+--- glibc-2.10-340-gae0f0db/nptl/tst-stackguard1.c
 +++ glibc-2.10.90-22/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -1123,7 +1123,7 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-335-g02bf610/nscd/nscd.conf
+--- glibc-2.10-340-gae0f0db/nscd/nscd.conf
 +++ glibc-2.10.90-22/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
@@ -1134,7 +1134,7 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-335-g02bf610/nscd/nscd.init
+--- glibc-2.10-340-gae0f0db/nscd/nscd.init
 +++ glibc-2.10.90-22/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
@@ -1207,7 +1207,7 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-335-g02bf610/posix/Makefile
+--- glibc-2.10-340-gae0f0db/posix/Makefile
 +++ glibc-2.10.90-22/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
@@ -1229,7 +1229,7 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-335-g02bf610/posix/getconf.speclist.h
+--- glibc-2.10-340-gae0f0db/posix/getconf.speclist.h
 +++ glibc-2.10.90-22/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
@@ -1271,7 +1271,7 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-335-g02bf610/streams/Makefile
+--- glibc-2.10-340-gae0f0db/streams/Makefile
 +++ glibc-2.10.90-22/streams/Makefile
 @@ -21,7 +21,7 @@
  #
@@ -1282,7 +1282,7 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-335-g02bf610/sysdeps/generic/dl-cache.h
+--- glibc-2.10-340-gae0f0db/sysdeps/generic/dl-cache.h
 +++ glibc-2.10.90-22/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
@@ -1299,7 +1299,7 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-335-g02bf610/sysdeps/i386/Makefile
+--- glibc-2.10-340-gae0f0db/sysdeps/i386/Makefile
 +++ glibc-2.10.90-22/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
@@ -1325,7 +1325,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-335-g02bf610/sysdeps/ia64/Makefile
+--- glibc-2.10-340-gae0f0db/sysdeps/ia64/Makefile
 +++ glibc-2.10.90-22/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
@@ -1338,7 +1338,7 @@
  endif
  endif
  
---- glibc-2.10-335-g02bf610/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-340-gae0f0db/sysdeps/ia64/ia64libgcc.S
 +++ glibc-2.10.90-22/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -1691,7 +1691,7 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-335-g02bf610/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-340-gae0f0db/sysdeps/ia64/libgcc-compat.c
 +++ glibc-2.10.90-22/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
@@ -1778,7 +1778,7 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-335-g02bf610/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-340-gae0f0db/sysdeps/powerpc/powerpc64/Makefile
 +++ glibc-2.10.90-22/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
@@ -1788,7 +1788,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-335-g02bf610/sysdeps/unix/nice.c
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/nice.c
 +++ glibc-2.10.90-22/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
@@ -1804,7 +1804,7 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/check_pf.c
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
@@ -1821,7 +1821,7 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/dl-osinfo.h
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -1870,7 +1870,7 @@
      }
    else
  #endif
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/futimesat.c
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
@@ -1914,7 +1914,7 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/i386/clone.S
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
@@ -1934,7 +1934,7 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/i386/dl-cache.h
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
@@ -1996,7 +1996,7 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
@@ -2030,7 +2030,7 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2038,7 +2038,7 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2046,12 +2046,12 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/netlinkaccess.h
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
@@ -2078,7 +2078,7 @@
  
  struct netlink_res
  {
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/paths.h
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
@@ -2089,7 +2089,7 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/tcsetattr.c
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
@@ -2136,7 +2136,7 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-335-g02bf610/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/x86_64/clone.S
 +++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
@@ -2156,7 +2156,7 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-335-g02bf610/timezone/zic.c
+--- glibc-2.10-340-gae0f0db/timezone/zic.c
 +++ glibc-2.10.90-22/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- glibc.spec	14 Sep 2009 12:23:30 -0000	1.416
+++ glibc.spec	21 Sep 2009 10:39:33 -0000	1.417
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-335-g02bf610
+%define glibcsrcdir glibc-2.10-340-gae0f0db
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 22
+Release: 23
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -542,9 +542,8 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debu
 # rquota.x and rquota.h are now provided by quota
 rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
 
-# Hardlink identical locale files together
+# Create archive of locale files
 %ifnarch %{auxarches}
-gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c
 olddir=`pwd`
 pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
 rm locale-archive || :
@@ -558,7 +557,6 @@ $olddir/build-%{nptl_target_cpu}-linuxnp
 rm -rf *_*
 mv locale-archive{,.tmpl}
 popd
-#build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
 %endif
 
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
@@ -1031,6 +1029,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Sep 21 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-23
+- Update from master.
+
 * Mon Sep 14 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-22
 - Update from master.
   - Fix endless loop in localedef.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- import.log	14 Sep 2009 12:23:30 -0000	1.32
+++ import.log	21 Sep 2009 10:39:33 -0000	1.33
@@ -30,3 +30,4 @@ glibc-2_10_90-19:HEAD:glibc-2.10.90-19.s
 glibc-2_10_90-20:HEAD:glibc-2.10.90-20.src.rpm:1251969190
 glibc-2_10_90-21:HEAD:glibc-2.10.90-21.src.rpm:1252314102
 glibc-2_10_90-22:HEAD:glibc-2.10.90-22.src.rpm:1252930886
+glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- sources	14 Sep 2009 12:23:30 -0000	1.314
+++ sources	21 Sep 2009 10:39:33 -0000	1.315
@@ -1,2 +1,2 @@
-7cf85b26787ff05f8f286ba49ce6cfd3  glibc-2.10-335-g02bf610-fedora.tar.bz2
-f886b8d4e1f0d30bc6ae0039cd7e93b0  glibc-2.10-335-g02bf610.tar.bz2
+c28c9d6bc56e7603f240324a481f761c  glibc-2.10-340-gae0f0db-fedora.tar.bz2
+ca11781e7b849d0f4a317f1e5b78f0dc  glibc-2.10-340-gae0f0db.tar.bz2



From atkac at fedoraproject.org  Mon Sep 21 10:41:04 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Sep 2009 10:41:04 +0000 (UTC)
Subject: rpms/bind/F-12 bind.spec,1.325,1.326 named.init,1.74,1.75
Message-ID: <20090921104104.EADD311C0419@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4253

Modified Files:
	bind.spec named.init 
Log Message:
- determine file size via `stat` instead of `ls` (#523682)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-12/bind.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- bind.spec	15 Sep 2009 15:34:16 -0000	1.325
+++ bind.spec	21 Sep 2009 10:41:04 -0000	1.326
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  10.%{PATCHVER}%{?dist}
+Release:  11.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -585,6 +585,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.6.1-11.P1
+- determine file size via `stat` instead of `ls` (#523682)
+
 * Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-10.P1
 - improve chroot related documentation (#507795)
 - add NetworkManager dispatcher script to reload named when network interface is


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-12/named.init,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- named.init	15 Sep 2009 15:34:16 -0000	1.74
+++ named.init	21 Sep 2009 10:41:04 -0000	1.75
@@ -76,8 +76,7 @@ mount_chroot_conf()
       # If mount source is a file
       if ! [ -d "$all" ]; then
         # mount it only if it is not present in chroot or it is empty
-        if ! [ -e "$ROOTDIR$all" ] ||
-           [ `ls -s "$ROOTDIR$all" | awk '{ print $1 };'` -eq 0 ]; then
+        if ! [ -e "$ROOTDIR$all" ] || [ `stat -c'%s' "$ROOTDIR$all"` -eq 0 ]; then
           touch "$ROOTDIR$all"
           mount --bind "$all" "$ROOTDIR$all"
         fi



From mschwendt at fedoraproject.org  Mon Sep 21 10:41:16 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 21 Sep 2009 10:41:16 +0000 (UTC)
Subject: rpms/audacious/devel audacious.spec,1.53,1.54
Message-ID: <20090921104116.7454D11C0043@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4385

Modified Files:
	audacious.spec 
Log Message:
force remove the audtool/audacious files since they will not exist prior to 2.2-alpha1


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- audacious.spec	21 Sep 2009 10:23:05 -0000	1.53
+++ audacious.spec	21 Sep 2009 10:41:16 -0000	1.54
@@ -107,7 +107,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/au
 
 # 2.2-alpha1 will install these compatibility softlinks
 cd $RPM_BUILD_ROOT%{_bindir}
-rm audacious audtool
+rm -f audacious audtool
 ln -s audacious2 audacious
 ln -s audtool2 audtool
 cd -



From leigh123linux at fedoraproject.org  Mon Sep 21 10:49:51 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 21 Sep 2009 10:49:51 +0000 (UTC)
Subject: rpms/gmixer/F-11 gmixer-trayicon.desktop, NONE, 1.1 gmixer.desktop, 
	1.3, 1.4 gmixer.spec, 1.3, 1.4
Message-ID: <20090921104952.0625611C0043@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7498

Modified Files:
	gmixer.desktop gmixer.spec 
Added Files:
	gmixer-trayicon.desktop 
Log Message:
* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
- added German translations for desktop files
- revert last desktop file edit and add a autostart launcher



--- NEW FILE gmixer-trayicon.desktop ---
[Desktop Entry]
Version=1.0
Name=GMixer
Name[de]=GMixer
Name[fr]=GMixer
Comment=Audio mixer for the Gnome Desktop Environment
Comment[de]=Lautst?rkeregelung f?r den GNOME Desktop
Comment[fr]=Mixer audio pour l'environnement Gnome
Exec=gmixer -d
Icon=gmixer
StartupNotify=true
Type=Application
Categories=AudioVideo;Audio;Mixer;GTK;
#OnlyShowIn=GNOME;XFCE;KDE;LXDE
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-KDE-autostart-after=panel


Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gmixer.desktop	18 Sep 2009 20:45:19 -0000	1.3
+++ gmixer.desktop	21 Sep 2009 10:49:50 -0000	1.4
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=GMixer
+Name[de]=GMixer
 Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
+Comment[de]=Lautst?rkeregelung f?r den GNOME Desktop
 Comment[fr]=Mixer audio pour l'environnement Gnome
-Exec=gmixer -d
+Exec=gmixer
 Icon=gmixer
 StartupNotify=true
 Type=Application


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gmixer.spec	18 Sep 2009 20:45:19 -0000	1.3
+++ gmixer.spec	21 Sep 2009 10:49:50 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@ License:        GPLv3+
 URL:            https://launchpad.net/gmixer
 Source0:        http://launchpad.net/gmixer/1.x/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        gmixer.desktop
+Source2:        gmixer-trayicon.desktop
 Patch0:         version_fix.patch
 Patch1:         gmixer-1.3-setup-py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,11 @@ desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %SOURCE1
 
+# autostart launcher
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+  %SOURCE2
+
 %find_lang %{name}
 
 %clean
@@ -66,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc gpl.txt 
 %{_bindir}/gmixer
+%{_sysconfdir}/xdg/autostart/gmixer-trayicon.desktop
 %{python_sitelib}/gtktrayicon.py*
 %{python_sitelib}/volkeys.so
 %{python_sitelib}/gmixer-1.0-py?.?.egg-info
@@ -76,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
+- added German translations for desktop files
+- revert last desktop file edit and add a autostart launcher
+
 * Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-7
 - edit desktop file so gmixer launches with trayicon
 



From leigh123linux at fedoraproject.org  Mon Sep 21 10:51:47 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 21 Sep 2009 10:51:47 +0000 (UTC)
Subject: rpms/gmixer/F-10 gmixer-trayicon.desktop, NONE, 1.1 gmixer.desktop, 
	1.3, 1.4 gmixer.spec, 1.3, 1.4
Message-ID: <20090921105147.1FC1911C0043@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8645

Modified Files:
	gmixer.desktop gmixer.spec 
Added Files:
	gmixer-trayicon.desktop 
Log Message:
* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
- added German translations for desktop files
- revert last desktop file edit and add a autostart launcher



--- NEW FILE gmixer-trayicon.desktop ---
[Desktop Entry]
Version=1.0
Name=GMixer
Name[de]=GMixer
Name[fr]=GMixer
Comment=Audio mixer for the Gnome Desktop Environment
Comment[de]=Lautst?rkeregelung f?r den GNOME Desktop
Comment[fr]=Mixer audio pour l'environnement Gnome
Exec=gmixer -d
Icon=gmixer
StartupNotify=true
Type=Application
Categories=AudioVideo;Audio;Mixer;GTK;
#OnlyShowIn=GNOME;XFCE;KDE;LXDE
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-KDE-autostart-after=panel


Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-10/gmixer.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gmixer.desktop	18 Sep 2009 20:47:45 -0000	1.3
+++ gmixer.desktop	21 Sep 2009 10:51:46 -0000	1.4
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=GMixer
+Name[de]=GMixer
 Name[fr]=GMixer
 Comment=Audio mixer for the Gnome Desktop Environment
+Comment[de]=Lautst?rkeregelung f?r den GNOME Desktop
 Comment[fr]=Mixer audio pour l'environnement Gnome
-Exec=gmixer -d
+Exec=gmixer
 Icon=gmixer
 StartupNotify=true
 Type=Application


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-10/gmixer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gmixer.spec	18 Sep 2009 20:47:45 -0000	1.3
+++ gmixer.spec	21 Sep 2009 10:51:46 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@ License:        GPLv3+
 URL:            https://launchpad.net/gmixer
 Source0:        http://launchpad.net/gmixer/1.x/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        gmixer.desktop
+Source2:        gmixer-trayicon.desktop
 Patch0:         version_fix.patch
 Patch1:         gmixer-1.3-setup-py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,11 @@ desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %SOURCE1
 
+# autostart launcher
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+  %SOURCE2
+
 %find_lang %{name}
 
 %clean
@@ -66,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc gpl.txt 
 %{_bindir}/gmixer
+%{_sysconfdir}/xdg/autostart/gmixer-trayicon.desktop
 %{python_sitelib}/gtktrayicon.py*
 %{python_sitelib}/volkeys.so
 %{python_sitelib}/gmixer-1.0-py?.?.egg-info
@@ -76,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
+- added German translations for desktop files
+- revert last desktop file edit and add a autostart launcher
+
 * Fri Sep 18 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-7
 - edit desktop file so gmixer launches with trayicon
 



From atkac at fedoraproject.org  Mon Sep 21 10:52:09 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Sep 2009 10:52:09 +0000 (UTC)
Subject: rpms/bind/F-11 bind.spec,1.321,1.322 named.init,1.74,1.75
Message-ID: <20090921105209.643D611C0043@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8781

Modified Files:
	bind.spec named.init 
Log Message:
- determine file size via `stat` instead of `ls` (#523682)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- bind.spec	15 Sep 2009 15:35:28 -0000	1.321
+++ bind.spec	21 Sep 2009 10:52:09 -0000	1.322
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  5.%{PATCHVER}%{?dist}
+Release:  6.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -588,6 +588,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.6.1-6.P1
+- determine file size via `stat` instead of `ls` (#523682)
+
 * Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-5.P1
 - fix libs postun section again (#514728)
 - improve chroot related documentation (#507795)


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/named.init,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- named.init	15 Sep 2009 15:35:28 -0000	1.74
+++ named.init	21 Sep 2009 10:52:09 -0000	1.75
@@ -76,8 +76,7 @@ mount_chroot_conf()
       # If mount source is a file
       if ! [ -d "$all" ]; then
         # mount it only if it is not present in chroot or it is empty
-        if ! [ -e "$ROOTDIR$all" ] ||
-           [ `ls -s "$ROOTDIR$all" | awk '{ print $1 };'` -eq 0 ]; then
+        if ! [ -e "$ROOTDIR$all" ] || [ `stat -c'%s' "$ROOTDIR$all"` -eq 0 ]; then
           touch "$ROOTDIR$all"
           mount --bind "$all" "$ROOTDIR$all"
         fi



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:00 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105600.A9A7710F876@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora devel) to Approved for holtmann

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:04 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105604.452CA10F89A@bastion2.fedora.phx.redhat.com>

hadess has set the watchbugzilla acl on bluez (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:05 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105605.CC11610F89E@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora devel) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:14 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105615.9D99E10F8A2@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:13 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105615.A0A6310F8A3@bastion2.fedora.phx.redhat.com>

hadess has set the watchbugzilla acl on bluez (Fedora 10) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:19 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105621.0644010F8A9@bastion2.fedora.phx.redhat.com>

hadess has set the watchbugzilla acl on bluez (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:24 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105624.699E210F87C@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora 11) to Approved for aarapov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Mon Sep 21 10:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 10:56:26 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090921105626.C0D7910F8AD@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora 11) to Approved for holtmann

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From hadess at fedoraproject.org  Mon Sep 21 11:03:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 11:03:04 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 totem-pl-parser.spec, 1.44, 1.45
Message-ID: <20090921110304.E826311C0043@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-serv13584

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	15 Sep 2009 10:48:51 -0000	1.24
+++ .cvsignore	21 Sep 2009 11:03:04 -0000	1.25
@@ -1 +1 @@
-totem-pl-parser-2.27.92.tar.bz2
+totem-pl-parser-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	15 Sep 2009 10:48:52 -0000	1.24
+++ sources	21 Sep 2009 11:03:04 -0000	1.25
@@ -1 +1 @@
-f01c54af09eeb65950a9b339e150978f  totem-pl-parser-2.27.92.tar.bz2
+a40cbd7e57a3369e2b190d4797c9cbce  totem-pl-parser-2.28.0.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- totem-pl-parser.spec	15 Sep 2009 10:48:52 -0000	1.44
+++ totem-pl-parser.spec	21 Sep 2009 11:03:04 -0000	1.45
@@ -1,5 +1,5 @@
 Name:		totem-pl-parser
-Version:	2.27.92
+Version:	2.28.0
 Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-1
 - Update to 2.27.92
 



From hguemar at fedoraproject.org  Mon Sep 21 11:10:03 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 21 Sep 2009 11:10:03 +0000 (UTC)
Subject: rpms/sonata/devel .cvsignore, 1.15, 1.16 sonata.spec, 1.24,
	1.25 sources, 1.15, 1.16
Message-ID: <20090921111003.9539E11C0419@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/sonata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15679

Modified Files:
	.cvsignore sonata.spec sources 
Log Message:
Updated to 1.6.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sonata/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	29 Jul 2009 12:06:54 -0000	1.15
+++ .cvsignore	21 Sep 2009 11:10:03 -0000	1.16
@@ -1 +1 @@
-sonata-1.6.2.tar.bz2
+sonata-1.6.2.1.tar.bz2


Index: sonata.spec
===================================================================
RCS file: /cvs/extras/rpms/sonata/devel/sonata.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sonata.spec	29 Jul 2009 14:13:17 -0000	1.24
+++ sonata.spec	21 Sep 2009 11:10:03 -0000	1.25
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           sonata
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.6.2.1
+Release:        1%{?dist}
 Summary:        An elegant GTK+ client for the Music Player Daemon (MPD)
 Group:          Applications/Multimedia
 License:        GPLv3+
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Mon Sep 21 2009 Ha?kel Gu?mar<karlthered at gmail.com> - 1.6.2.1-1
+* Updated to 1.6.2.1
+
 * Wed Jul 29 2009 Ha?kel Gu?mar<karlthered at gmail.com> - 1.6.2-2
 - Fixed patch name
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sonata/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	29 Jul 2009 12:06:54 -0000	1.15
+++ sources	21 Sep 2009 11:10:03 -0000	1.16
@@ -1 +1 @@
-f2bca0855fd2eb3d199f62fbd88af62f  sonata-1.6.2.tar.bz2
+f5d00bba3ca5c50c1505182f8d2a60c4  sonata-1.6.2.1.tar.bz2



From hadess at fedoraproject.org  Mon Sep 21 11:14:55 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 11:14:55 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel totem-pl-parser.spec,1.45,1.46
Message-ID: <20090921111455.2B45611C0043@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-serv17085

Modified Files:
	totem-pl-parser.spec 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
- Update source URL



Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- totem-pl-parser.spec	21 Sep 2009 11:03:04 -0000	1.45
+++ totem-pl-parser.spec	21 Sep 2009 11:14:54 -0000	1.46
@@ -1,12 +1,12 @@
 Name:		totem-pl-parser
 Version:	2.28.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 Url:		http://www.gnome.org/projects/totem/
-Source0:	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:	totem-plparser
 
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
+- Update source URL
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From hguemar at fedoraproject.org  Mon Sep 21 11:24:27 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 21 Sep 2009 11:24:27 +0000 (UTC)
Subject: rpms/sonata/F-11 .cvsignore, 1.15, 1.16 sonata.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <20090921112427.51F5411C0043@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/sonata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19899

Modified Files:
	.cvsignore sonata.spec sources 
Log Message:
Updated to 1.6.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sonata/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	29 Jul 2009 12:02:17 -0000	1.15
+++ .cvsignore	21 Sep 2009 11:24:26 -0000	1.16
@@ -1 +1 @@
-sonata-1.6.2.tar.bz2
+sonata-1.6.2.1.tar.bz2


Index: sonata.spec
===================================================================
RCS file: /cvs/extras/rpms/sonata/F-11/sonata.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sonata.spec	27 Jul 2009 18:53:02 -0000	1.22
+++ sonata.spec	21 Sep 2009 11:24:26 -0000	1.23
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           sonata
-Version:        1.6.2
+Version:        1.6.2.1
 Release:        1%{?dist}
 Summary:        An elegant GTK+ client for the Music Player Daemon (MPD)
 Group:          Applications/Multimedia
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Mon Sep 21 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.6.2.1-1
+- Updated to 1.6.2.1
+
 * Mon Jul 27 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.6.2-1
 - Updated to 1.6.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sonata/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	29 Jul 2009 12:02:17 -0000	1.15
+++ sources	21 Sep 2009 11:24:26 -0000	1.16
@@ -1 +1 @@
-f2bca0855fd2eb3d199f62fbd88af62f  sonata-1.6.2.tar.bz2
+f5d00bba3ca5c50c1505182f8d2a60c4  sonata-1.6.2.1.tar.bz2



From hadess at fedoraproject.org  Mon Sep 21 11:28:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 11:28:22 +0000 (UTC)
Subject: rpms/gnome-user-share/devel .cvsignore, 1.20,
	1.21 gnome-user-share.spec, 1.62, 1.63 sources, 1.20,
	1.21 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch,
	1.1, NONE
Message-ID: <20090921112822.575C411C0043@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22065

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Removed Files:
	0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	2 Sep 2009 12:38:09 -0000	1.20
+++ .cvsignore	21 Sep 2009 11:28:22 -0000	1.21
@@ -1 +1 @@
-gnome-user-share-2.27.0.tar.bz2
+gnome-user-share-2.28.0.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gnome-user-share.spec	8 Sep 2009 17:17:48 -0000	1.62
+++ gnome-user-share.spec	21 Sep 2009 11:28:22 -0000	1.63
@@ -1,17 +1,15 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.27.0
-Release: 3%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.27/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=594252
-Patch1: 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=558244
-Patch2: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
+Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
 BuildRequires: intltool automake autoconf libtool
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,8 +51,7 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
-%patch1 -p1 -b .i18n
-%patch2 -p1 -b .cluebar
+%patch1 -p1 -b .cluebar
 
 autoreconf -f -i
 
@@ -137,6 +134,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 08 2009 Bastien Nocera <bnocera at redhat.com> 2.27.0-3
 - Add a cluebar to have easy access to the file sharing preferences
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	2 Sep 2009 12:38:09 -0000	1.20
+++ sources	21 Sep 2009 11:28:22 -0000	1.21
@@ -1 +1 @@
-6900aa1c9b2fcfbc6d89762063c37efa  gnome-user-share-2.27.0.tar.bz2
+8ccaca15e42036b42a54f997ffbac3a7  gnome-user-share-2.28.0.tar.bz2


--- 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch DELETED ---



From hadess at fedoraproject.org  Mon Sep 21 11:29:08 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 11:29:08 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.63,1.64
Message-ID: <20090921112908.9EBD811C0043@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22380

Modified Files:
	gnome-user-share.spec 
Log Message:
Fix source url


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnome-user-share.spec	21 Sep 2009 11:28:22 -0000	1.63
+++ gnome-user-share.spec	21 Sep 2009 11:29:08 -0000	1.64
@@ -5,7 +5,7 @@ Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-user-share/2.28/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=558244



From rdieter at fedoraproject.org  Mon Sep 21 11:37:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 11:37:35 +0000 (UTC)
Subject: rpms/konversation/devel .cvsignore, 1.10, 1.11 konversation.spec,
	1.33, 1.34 sources, 1.10, 1.11
Message-ID: <20090921113735.D976611C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27338

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.10.beta1
- konversation-1.2-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	8 Aug 2009 22:06:17 -0000	1.10
+++ .cvsignore	21 Sep 2009 11:37:35 -0000	1.11
@@ -1 +1 @@
-konversation-1.2-alpha6.tar.bz2
+konversation-1.2-beta1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- konversation.spec	24 Aug 2009 15:25:56 -0000	1.33
+++ konversation.spec	21 Sep 2009 11:37:35 -0000	1.34
@@ -1,15 +1,17 @@
 
-%define pre alpha6
+%define pre beta1 
+#define pre 20090919svn
 
 Name:           konversation
 Version:        1.2
-Release:        0.6.%{pre}%{?dist}
+Release:        0.10.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://konversation.kde.org/
 Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
+#Source0:        konversation-1.2-%{pre}.tar.bz2 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -53,15 +55,7 @@ make install/fast DESTDIR=%{buildroot} -
 
 ## File lists
 # locale's
-%find_lang %{name}
-# HTML
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}${HTML_DIR} ]; then
-for lang_dir in %{buildroot}${HTML_DIR}/* ; do
-   lang=$(basename $lang_dir)
-   echo "%lang($lang) %doc ${HTML_DIR}/${lang}/*" >> %{name}.lang
-done
-fi
+%find_lang %{name} --with-kde 
 
 
 %check
@@ -97,6 +91,15 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.10.beta1
+- konversation-1.2-beta1
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.9.20090919svn
+- localized snapshot
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.8.20090919svn1025849
+- konversation-20090919svn1025849 snapshot, for marker line testing
+
 * Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.6.alpha6
 - BR: qca2-devel, libXScrnSaver-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	8 Aug 2009 22:06:18 -0000	1.10
+++ sources	21 Sep 2009 11:37:35 -0000	1.11
@@ -1 +1 @@
-1720cc7d03cfb808c666f8df9006573e  konversation-1.2-alpha6.tar.bz2
+8f6c352a5f0d0349fe2505c0e7f62192  konversation-1.2-beta1.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 21 11:39:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 11:39:23 +0000 (UTC)
Subject: rpms/konversation/F-11 .cvsignore, 1.8, 1.9 konversation.spec, 1.27,
	1.28 sources, 1.8, 1.9
Message-ID: <20090921113923.E6C2F11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27925

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.10.beta1
- konversation-1.2-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	11 Aug 2009 16:25:13 -0000	1.8
+++ .cvsignore	21 Sep 2009 11:39:23 -0000	1.9
@@ -1 +1 @@
-konversation-1.2-alpha6.tar.bz2
+konversation-1.2-beta1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- konversation.spec	24 Aug 2009 15:29:24 -0000	1.27
+++ konversation.spec	21 Sep 2009 11:39:23 -0000	1.28
@@ -1,15 +1,17 @@
 
-%define pre alpha6
+%define pre beta1 
+#define pre 20090919svn
 
 Name:           konversation
 Version:        1.2
-Release:        0.6.%{pre}%{?dist}
+Release:        0.10.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://konversation.kde.org/
 Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
+#Source0:        konversation-1.2-%{pre}.tar.bz2 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -53,15 +55,7 @@ make install/fast DESTDIR=%{buildroot} -
 
 ## File lists
 # locale's
-%find_lang %{name}
-# HTML
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}${HTML_DIR} ]; then
-for lang_dir in %{buildroot}${HTML_DIR}/* ; do
-   lang=$(basename $lang_dir)
-   echo "%lang($lang) %doc ${HTML_DIR}/${lang}/*" >> %{name}.lang
-done
-fi
+%find_lang %{name} --with-kde 
 
 
 %check
@@ -97,6 +91,15 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.10.beta1
+- konversation-1.2-beta1
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.9.20090919svn
+- localized snapshot
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.8.20090919svn1025849
+- konversation-20090919svn1025849 snapshot, for marker line testing
+
 * Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.6.alpha6
 - BR: qca2-devel, libXScrnSaver-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Aug 2009 16:25:13 -0000	1.8
+++ sources	21 Sep 2009 11:39:23 -0000	1.9
@@ -1 +1 @@
-1720cc7d03cfb808c666f8df9006573e  konversation-1.2-alpha6.tar.bz2
+8f6c352a5f0d0349fe2505c0e7f62192  konversation-1.2-beta1.tar.bz2



From hguemar at fedoraproject.org  Mon Sep 21 11:39:55 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 21 Sep 2009 11:39:55 +0000 (UTC)
Subject: rpms/sonata/F-10 .cvsignore, 1.15, 1.16 sonata.spec, 1.21,
	1.22 sources, 1.15, 1.16
Message-ID: <20090921113955.4DE4A11C0043@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/sonata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28173

Modified Files:
	.cvsignore sonata.spec sources 
Log Message:
Updated to 1.6.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sonata/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	29 Jul 2009 11:59:52 -0000	1.15
+++ .cvsignore	21 Sep 2009 11:39:55 -0000	1.16
@@ -1 +1 @@
-sonata-1.6.2.tar.bz2
+sonata-1.6.2.1.tar.bz2


Index: sonata.spec
===================================================================
RCS file: /cvs/extras/rpms/sonata/F-10/sonata.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sonata.spec	29 Jul 2009 13:33:52 -0000	1.21
+++ sonata.spec	21 Sep 2009 11:39:55 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           sonata
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.6.2.1
+Release:        1%{?dist}
 Summary:        An elegant GTK+ client for the Music Player Daemon (MPD)
 Group:          Applications/Multimedia
 License:        GPLv3+
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Mon Sep 21 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.6.2.1-1
+- Updated to 1.6.2.1
+
 * Wed Jul 29 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.6.2-2
 - Fixed patch name.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sonata/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	29 Jul 2009 11:59:52 -0000	1.15
+++ sources	21 Sep 2009 11:39:55 -0000	1.16
@@ -1 +1 @@
-f2bca0855fd2eb3d199f62fbd88af62f  sonata-1.6.2.tar.bz2
+f5d00bba3ca5c50c1505182f8d2a60c4  sonata-1.6.2.1.tar.bz2



From rvokal at fedoraproject.org  Mon Sep 21 11:42:29 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon, 21 Sep 2009 11:42:29 +0000 (UTC)
Subject: rpms/wireshark/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 wireshark.spec, 1.58, 1.59
Message-ID: <20090921114229.2DCCF11C0043@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29247

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	22 Jul 2009 11:29:57 -0000	1.27
+++ .cvsignore	21 Sep 2009 11:42:28 -0000	1.28
@@ -1 +1 @@
-wireshark-1.2.1.tar.bz2
+wireshark-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	22 Jul 2009 11:29:57 -0000	1.27
+++ sources	21 Sep 2009 11:42:28 -0000	1.28
@@ -1 +1 @@
-957d1b11a6c9b305bcd106d4084ff71e  wireshark-1.2.1.tar.bz2
+bb5c09b8cffd461ced4d3251fddb217b  wireshark-1.2.2.tar.bz2


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- wireshark.spec	15 Sep 2009 06:56:14 -0000	1.58
+++ wireshark.spec	21 Sep 2009 11:42:28 -0000	1.59
@@ -10,8 +10,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.1
-Release: 	5%{?dist}
+Version:	1.2.2
+Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -214,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Radek Vokal <rvokal at redhat.com> - 1.2.2-1
+- upgrade to 1.2.2
+- http://www.wireshark.org/docs/relnotes/wireshark-1.2.2.html
+
 * Mon Sep 14 2009 Bill Nottingham <notting at redhat.com> - 1.2.1-5
 - do not use portaudio in RHEL
 



From pravins at fedoraproject.org  Mon Sep 21 12:03:45 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 21 Sep 2009 12:03:45 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts/devel .cvsignore, 1.2,
	1.3 lohit-kannada-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921120345.DB69411C0043@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kannada-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9223

Modified Files:
	.cvsignore lohit-kannada-fonts.spec sources 
Log Message:
* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
- upstream release of 2.4.4
- updated url for upstream tarball
- added Makefile in upstream tar ball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Sep 2009 10:09:54 -0000	1.2
+++ .cvsignore	21 Sep 2009 12:03:45 -0000	1.3
@@ -1 +1,2 @@
 lohit-kannada-2.4.3.tar.gz
+lohit-kannada-2.4.4.tar.gz


Index: lohit-kannada-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/lohit-kannada-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-kannada-fonts.spec	11 Sep 2009 10:09:54 -0000	1.1
+++ lohit-kannada-fonts.spec	21 Sep 2009 12:03:45 -0000	1.2
@@ -2,14 +2,14 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Free Kannada font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/kannada/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
@@ -27,7 +27,7 @@ This package provides a free Kannada tru
 
 
 %build
-./generate.pe *.sfd
+make
 
 %install
 rm -fr %{buildroot}
@@ -54,5 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
+- upstream release of 2.4.4
+- updated url for upstream tarball
+- added Makefile in upstream tar ball
+
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Sep 2009 10:09:54 -0000	1.2
+++ sources	21 Sep 2009 12:03:45 -0000	1.3
@@ -1 +1 @@
-a5a3d4367ebf8f68388bd9c75f82e8a0  lohit-kannada-2.4.3.tar.gz
+51977f80be46413b99d7c78c31c157a5  lohit-kannada-2.4.4.tar.gz



From rhughes at fedoraproject.org  Mon Sep 21 12:04:24 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 21 Sep 2009 12:04:24 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.57, 1.58 PackageKit.spec, 1.118,
	1.119 sources, 1.58, 1.59
Message-ID: <20090921120424.AE04411C0043@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9558

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090921git
- Update to a newer git snapshot from the 0.5.x series.
- Updates to the experimental glib2 bindings
- Lots of updated translations.
- Disable the self tests to reduce the build time
- Fix crasher for 64 bit users of the codec installer
- Fix 'pkcon remove foo', where foo needed reqs to be removed too.
- Fixes #523861



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	15 Sep 2009 12:47:14 -0000	1.57
+++ .cvsignore	21 Sep 2009 12:04:24 -0000	1.58
@@ -1 +1 @@
-PackageKit-0.5.3-20090915.tar.gz
+PackageKit-0.5.3-20090921.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- PackageKit.spec	15 Sep 2009 12:47:14 -0000	1.118
+++ PackageKit.spec	21 Sep 2009 12:04:24 -0000	1.119
@@ -3,7 +3,7 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090915
+%define alphatag			20090921
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -244,7 +244,15 @@ user to restart the computer or remove a
 %patch1 -p1 -b .no-time
 
 %build
-%configure --disable-static --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck --disable-strict
+%configure \
+	--disable-static \
+	--enable-yum \
+	--enable-smart \
+	--with-default-backend=yum \
+	--disable-local \
+	--disable-ruck \
+	--disable-strict \
+	--disable-tests
 
 make %{?_smp_mflags}
 
@@ -440,6 +448,15 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090921git
+- Update to a newer git snapshot from the 0.5.x series.
+- Updates to the experimental glib2 bindings
+- Lots of updated translations.
+- Disable the self tests to reduce the build time
+- Fix crasher for 64 bit users of the codec installer
+- Fix 'pkcon remove foo', where foo needed reqs to be removed too.
+- Fixes #523861
+
 * Tue Sep 15 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090915git
 - Update to a newer git snapshot from the 0.5.x series.
 - Lots of updated translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	15 Sep 2009 12:47:14 -0000	1.58
+++ sources	21 Sep 2009 12:04:24 -0000	1.59
@@ -1 +1 @@
-f440f3de9bffeb6967f2562a8a482fc3  PackageKit-0.5.3-20090915.tar.gz
+b6711dbe4d77d91f9b9fcf8ef00ed102  PackageKit-0.5.3-20090921.tar.gz



From pravins at fedoraproject.org  Mon Sep 21 12:07:13 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 21 Sep 2009 12:07:13 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel .cvsignore, 1.2,
	1.3 lohit-malayalam-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921120713.5D2DF11C0043@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11083

Modified Files:
	.cvsignore lohit-malayalam-fonts.spec sources 
Log Message:
* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
- upstream release of 2.4.4
- updated url for upstream tarball
- added Makefile in upstream tar ball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Sep 2009 10:41:05 -0000	1.2
+++ .cvsignore	21 Sep 2009 12:07:13 -0000	1.3
@@ -1 +1,2 @@
 lohit-malayalam-2.4.3.tar.gz
+lohit-malayalam-2.4.4.tar.gz


Index: lohit-malayalam-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/lohit-malayalam-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-malayalam-fonts.spec	11 Sep 2009 10:41:05 -0000	1.1
+++ lohit-malayalam-fonts.spec	21 Sep 2009 12:07:13 -0000	1.2
@@ -2,14 +2,14 @@
 #%global fontconf 67-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Free Malayalam font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/malayalam/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
@@ -27,7 +27,7 @@ This package provides a free Malayalam t
 
 
 %build
-./generate.pe *.sfd
+make
 
 %install
 rm -fr %{buildroot}
@@ -54,5 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
+- upstream release of 2.4.4
+- updated url for upstream tarball
+- added Makefile in upstream tar ball
+
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Sep 2009 10:41:05 -0000	1.2
+++ sources	21 Sep 2009 12:07:13 -0000	1.3
@@ -1 +1 @@
-3dca42cc0169ce2146d4c5ea74054bb3  lohit-malayalam-2.4.3.tar.gz
+a18f132fdd15f616bd9b5c9fd3716a20  lohit-malayalam-2.4.4.tar.gz



From hadess at fedoraproject.org  Mon Sep 21 12:11:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 12:11:53 +0000 (UTC)
Subject: rpms/totem/devel .cvsignore, 1.77, 1.78 sources, 1.77,
	1.78 totem.spec, 
	1.257, 1.258 0001-Set-the-PA-stream-volume-from-Totem.patch, 1.1, NONE
Message-ID: <20090921121153.9A01111C0043@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13329

Modified Files:
	.cvsignore sources totem.spec 
Removed Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	8 Sep 2009 10:32:09 -0000	1.77
+++ .cvsignore	21 Sep 2009 12:11:53 -0000	1.78
@@ -1 +1 @@
-totem-2.27.92.tar.bz2
+totem-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	8 Sep 2009 10:32:09 -0000	1.77
+++ sources	21 Sep 2009 12:11:53 -0000	1.78
@@ -1 +1 @@
-b2cfb39e272be8cb452b392be57daf02  totem-2.27.92.tar.bz2
+481d56b78b351606cf6c75d923776a75  totem-2.28.0.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- totem.spec	15 Sep 2009 14:39:56 -0000	1.257
+++ totem.spec	21 Sep 2009 12:11:53 -0000	1.258
@@ -5,13 +5,12 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.27.92
-Release: 3%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
-Source0: http://download.gnome.org/sources/totem/2.27/totem-%{version}.tar.bz2
-Patch0: 0001-Set-the-PA-stream-volume-from-Totem.patch
+Source0: http://download.gnome.org/sources/totem/2.28/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -45,6 +44,7 @@ BuildRequires: perl(XML::Parser) intltoo
 BuildRequires: iso-codes-devel
 BuildRequires: gnome-icon-theme
 BuildRequires: libXtst-devel
+BuildRequires: libXi-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
 BuildRequires: gnome-doc-utils
@@ -181,7 +181,6 @@ audio and video files in the properties 
 
 %prep
 %setup -q
-%patch0 -p1 -b .pulse-volume
 
 %build
 
@@ -378,6 +377,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 15 2009 Bill Nottingham <notting at redhat.com> 2.27.92-3
 - youtube plugin is now in C, remove python requires
 


--- 0001-Set-the-PA-stream-volume-from-Totem.patch DELETED ---



From pravins at fedoraproject.org  Mon Sep 21 12:13:15 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 21 Sep 2009 12:13:15 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel .cvsignore, 1.2,
	1.3 lohit-telugu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921121315.13B5011C0043@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13791

Modified Files:
	.cvsignore lohit-telugu-fonts.spec sources 
Log Message:
* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
- upstream release of 2.4.4
- updated url for upstream tarball
- added Makefile in upstream tar ball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Sep 2009 10:56:36 -0000	1.2
+++ .cvsignore	21 Sep 2009 12:13:14 -0000	1.3
@@ -1 +1,2 @@
 lohit-telugu-2.4.3.tar.gz
+lohit-telugu-2.4.4.tar.gz


Index: lohit-telugu-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/lohit-telugu-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-telugu-fonts.spec	11 Sep 2009 10:56:36 -0000	1.1
+++ lohit-telugu-fonts.spec	21 Sep 2009 12:13:14 -0000	1.2
@@ -2,14 +2,14 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Free Telugu font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/telugu/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
@@ -27,7 +27,7 @@ This package provides a free Telugu true
 
 
 %build
-./generate.pe *.sfd
+make
 
 %install
 rm -fr %{buildroot}
@@ -54,5 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
+- upstream release of 2.4.4
+- updated url for upstream tarball
+- added Makefile in upstream tar ball
+
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Sep 2009 10:56:36 -0000	1.2
+++ sources	21 Sep 2009 12:13:14 -0000	1.3
@@ -1 +1 @@
-848f59611b73a92aaa6de3e2e0311883  lohit-telugu-2.4.3.tar.gz
+da2bd6b204af0575ecf0d26b3497c463  lohit-telugu-2.4.4.tar.gz



From pravins at fedoraproject.org  Mon Sep 21 12:13:20 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 21 Sep 2009 12:13:20 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel .cvsignore, 1.2,
	1.3 lohit-tamil-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921121320.5F99111C0043@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13844

Modified Files:
	.cvsignore lohit-tamil-fonts.spec sources 
Log Message:
* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
- upstream release of 2.4.4
- updated url for upstream tarball
- added Makefile in upstream tar ball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Sep 2009 10:54:14 -0000	1.2
+++ .cvsignore	21 Sep 2009 12:13:20 -0000	1.3
@@ -1 +1,2 @@
 lohit-tamil-2.4.3.tar.gz
+lohit-tamil-2.4.4.tar.gz


Index: lohit-tamil-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/lohit-tamil-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-tamil-fonts.spec	11 Sep 2009 10:54:14 -0000	1.1
+++ lohit-tamil-fonts.spec	21 Sep 2009 12:13:20 -0000	1.2
@@ -2,14 +2,14 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Free Tamil font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/tamil/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
@@ -27,7 +27,7 @@ This package provides a free Tamil truet
 
 
 %build
-./generate.pe *.sfd
+make
 
 %install
 rm -fr %{buildroot}
@@ -54,5 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
+- upstream release of 2.4.4
+- updated url for upstream tarball
+- added Makefile in upstream tar ball
+
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Sep 2009 10:54:14 -0000	1.2
+++ sources	21 Sep 2009 12:13:20 -0000	1.3
@@ -1 +1 @@
-7d0ba57a033024c6336e773968da41fb  lohit-tamil-2.4.3.tar.gz
+5ca4933b344fca080c013c2f572351df  lohit-tamil-2.4.4.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 21 12:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:18:27 +0000
Subject: [pkgdb] sblim-cmpi-network had acl change status
Message-ID: <20090921121828.0021910F876@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-network (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 21 12:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:18:40 +0000
Subject: [pkgdb] sblim-cmpi-network had acl change status
Message-ID: <20090921121840.43E4610F889@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-network (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 21 12:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:18:46 +0000
Subject: [pkgdb] sblim-cmpi-network had acl change status
Message-ID: <20090921121846.4EE0E10F890@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-network (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 21 12:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:18:50 +0000
Subject: [pkgdb] sblim-cmpi-network had acl change status
Message-ID: <20090921121850.84CC610F898@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-network (Fedora EPEL 5) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Mon Sep 21 12:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:18:52 +0000
Subject: [pkgdb] sblim-cmpi-network had acl change status
Message-ID: <20090921121853.A83D610F876@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-network (Fedora EPEL 4) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From mcrha at fedoraproject.org  Mon Sep 21 12:19:42 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Sep 2009 12:19:42 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.102, 1.103 gtkhtml3.spec, 1.159, 
	1.160 sources, 1.102, 1.103
Message-ID: <20090921121942.2CE4F11C0043@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15941

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 3.28.0-1.fc12
- Update to 3.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	7 Sep 2009 15:40:01 -0000	1.102
+++ .cvsignore	21 Sep 2009 12:19:41 -0000	1.103
@@ -1 +1 @@
-gtkhtml-3.27.92.tar.bz2
+gtkhtml-3.28.0.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- gtkhtml3.spec	7 Sep 2009 15:40:02 -0000	1.159
+++ gtkhtml3.spec	21 Sep 2009 12:19:41 -0000	1.160
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.27.92
+Version: 3.28.0
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 3.28.0-1.fc12
+- Update to 3.28.0
+
 * Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 3.27.92-1.fc12
 - Update to 3.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sources	7 Sep 2009 15:40:02 -0000	1.102
+++ sources	21 Sep 2009 12:19:41 -0000	1.103
@@ -1 +1 @@
-566e7bc724d51c69cef2af501800db71  gtkhtml-3.27.92.tar.bz2
+07bce4da18e99b5c971f0cac6973c944  gtkhtml-3.28.0.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 21 12:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:19:46 +0000
Subject: [pkgdb] sblim-cmpi-devel had acl change status
Message-ID: <20090921121946.6F79210F880@bastion2.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on sblim-cmpi-devel (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 21 12:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:19:48 +0000
Subject: [pkgdb] sblim-cmpi-devel had acl change status
Message-ID: <20090921121948.BBB5D10F7BD@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-devel (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 21 12:19:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:19:57 +0000
Subject: [pkgdb] sblim-cmpi-devel had acl change status
Message-ID: <20090921121957.29E2410F898@bastion2.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on sblim-cmpi-devel (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 21 12:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:19:58 +0000
Subject: [pkgdb] sblim-cmpi-devel had acl change status
Message-ID: <20090921121958.7A53810F89C@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-devel (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 21 12:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:20:00 +0000
Subject: [pkgdb] sblim-cmpi-devel had acl change status
Message-ID: <20090921122000.6304F10F880@bastion2.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on sblim-cmpi-devel (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Mon Sep 21 12:20:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:20:01 +0000
Subject: [pkgdb] sblim-cmpi-devel had acl change status
Message-ID: <20090921122002.34B5810F89E@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-devel (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel



From prajnoha at fedoraproject.org  Mon Sep 21 12:21:00 2009
From: prajnoha at fedoraproject.org (Peter Rajnoha)
Date: Mon, 21 Sep 2009 12:21:00 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.178,1.179
Message-ID: <20090921122100.272F711C0416@cvs1.fedora.phx.redhat.com>

Author: prajnoha

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16856/devel

Modified Files:
	lvm2.spec 
Log Message:
Enable udev synchronisation code and install default udev rules.



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- lvm2.spec	17 Sep 2009 12:18:52 -0000	1.178
+++ lvm2.spec	21 Sep 2009 12:20:59 -0000	1.179
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.52
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -27,6 +27,7 @@ BuildRequires: corosynclib-devel >= %{co
 BuildRequires: clusterlib-devel >= %{clusterlib_version}
 BuildRequires: module-init-tools
 BuildRequires: pkgconfig
+BuildRequires: libudev-devel
 Requires: device-mapper >= %{device_mapper_version}-%{release}
 Requires: device-mapper-event >= %{device_mapper_version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
@@ -56,8 +57,9 @@ or more physical volumes and creating on
 %define _bindir /bin
 %define _sbindir /sbin
 %define _libdir /%{_lib}
+%define _udevdir /%{_lib}/udev/rules.d
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd
+%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync
 
 make %{?_smp_mflags}
 
@@ -88,7 +90,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
+%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW udev/12-dm-permissions.rules
 %{_sbindir}/fsadm
 %{_sbindir}/lvchange
 %{_sbindir}/lvconvert
@@ -180,6 +182,7 @@ fi
 %{_mandir}/man8/vgs.8.gz
 %{_mandir}/man8/vgscan.8.gz
 %{_mandir}/man8/vgsplit.8.gz
+%{_udevdir}/11-lvm.rules
 %dir /etc/lvm
 %ghost /etc/lvm/cache/.cache
 %config(noreplace) /etc/lvm/lvm.conf
@@ -281,6 +284,8 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Requires: device-mapper-libs = %{device_mapper_version}-%{release}
+Requires: libudev
+Requires: util-linux-ng >= 2.15
 
 %description -n device-mapper
 This package contains the supporting userspace utility, dmsetup,
@@ -291,6 +296,9 @@ for the kernel device-mapper.
 %doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL
 %attr(755,root,root) /sbin/dmsetup
 %{_mandir}/man8/dmsetup.8.gz
+%{_udevdir}/10-dm.rules
+%{_udevdir}/12-dm-disk.rules
+%{_udevdir}/95-dm-notify.rules
 
 %package -n device-mapper-devel
 Summary: Development libraries and headers for device-mapper
@@ -385,6 +393,13 @@ the device-mapper event library.
 
 
 %changelog
+* Mon Sep 21 2009 Peter Rajnoha <prajnoha at redhat.com> - 2.02.52-3
+- Enable udev synchronisation code
+- Install default udev rules for device-mapper and LVM2
+- Add BuildRequires: libudev-devel
+- Add Requires: libudev (to check udev is running)
+- Add Requires: util-linux-ng (blkid used in udev rules)
+
 * Wed Sep 16 2009 Alasdair Kergon <agk at redhat.com> - 2.02.52-2
 - Build dmeventd and place into a separate set of subpackages.
 - Remove no-longer-needed BuildRoot tag and buildroot emptying at install.



From hadess at fedoraproject.org  Mon Sep 21 12:22:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 12:22:48 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.24,
	1.25 nautilus-sendto.spec, 1.84, 1.85 sources, 1.24, 1.25
Message-ID: <20090921122248.C5A9C11C0043@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17863

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	2 Sep 2009 15:09:40 -0000	1.24
+++ .cvsignore	21 Sep 2009 12:22:48 -0000	1.25
@@ -1 +1 @@
-nautilus-sendto-1.1.7.tar.bz2
+nautilus-sendto-2.28.0.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- nautilus-sendto.spec	18 Sep 2009 13:22:01 -0000	1.84
+++ nautilus-sendto.spec	21 Sep 2009 12:22:48 -0000	1.85
@@ -1,12 +1,12 @@
 Name:           nautilus-sendto
-Version:        1.1.7
-Release:        3%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            ftp://ftp.gnome.org/pub/gnome/sources/%{name}
-Source0:        http://download.gnome.org/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -20,7 +20,7 @@ BuildRequires:  pidgin-devel >= 2.0.0
 BuildRequires:  gettext
 BuildRequires:  perl-XML-Parser intltool
 BuildRequires:  dbus-glib-devel >= 0.70
-BuildRequires:  gupnp-av-devel
+BuildRequires:  gupnp-devel >= 0.13
 BuildRequires:  empathy-devel
 BuildRequires:  gajim
 
@@ -95,6 +95,9 @@ fi
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Fri Sep 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1.1.7-3
 - rebuild for dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	2 Sep 2009 15:09:40 -0000	1.24
+++ sources	21 Sep 2009 12:22:48 -0000	1.25
@@ -1 +1 @@
-620949efa09416a970479b572130753a  nautilus-sendto-1.1.7.tar.bz2
+1af541999a5ed753ed9a8c8ea007b4c7  nautilus-sendto-2.28.0.tar.bz2



From mcrha at fedoraproject.org  Mon Sep 21 12:25:16 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Sep 2009 12:25:16 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.114,
	1.115 evolution-data-server.spec, 1.276, 1.277 sources, 1.114, 1.115
Message-ID: <20090921122516.B0AE211C0043@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18545

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
- Update to 2.28.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- .cvsignore	7 Sep 2009 15:53:06 -0000	1.114
+++ .cvsignore	21 Sep 2009 12:25:16 -0000	1.115
@@ -1 +1 @@
-evolution-data-server-2.27.92.tar.bz2
+evolution-data-server-2.28.0.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- evolution-data-server.spec	7 Sep 2009 15:53:06 -0000	1.276
+++ evolution-data-server.spec	21 Sep 2009 12:25:16 -0000	1.277
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
+- Update to 2.28.0
+
 * Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	7 Sep 2009 15:53:06 -0000	1.114
+++ sources	21 Sep 2009 12:25:16 -0000	1.115
@@ -1 +1 @@
-cd77443d0466724fafc2034f0e3405fd  evolution-data-server-2.27.92.tar.bz2
+015a9692904c349034982c69d90b1b37  evolution-data-server-2.28.0.tar.bz2



From mcrha at fedoraproject.org  Mon Sep 21 12:33:52 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Sep 2009 12:33:52 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.121, 1.122 evolution.spec, 1.415,
	1.416 sources, 1.121, 1.122
Message-ID: <20090921123352.829B011C0043@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21346

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- .cvsignore	7 Sep 2009 16:13:34 -0000	1.121
+++ .cvsignore	21 Sep 2009 12:33:51 -0000	1.122
@@ -1 +1 @@
-evolution-2.27.92.tar.bz2
+evolution-2.28.0.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- evolution.spec	7 Sep 2009 16:13:34 -0000	1.415
+++ evolution.spec	21 Sep 2009 12:33:51 -0000	1.416
@@ -5,7 +5,7 @@
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
 %define gtk2_version 2.14.0
-%define gtkhtml_version 3.27.91
+%define gtkhtml_version 3.28.0
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libbonobo_version 2.20.3
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
+- Update to 2.28.0
+
 * Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sources	7 Sep 2009 16:13:34 -0000	1.121
+++ sources	21 Sep 2009 12:33:52 -0000	1.122
@@ -1 +1 @@
-75cf92e71dc6cb7d10c4a59b85c601e2  evolution-2.27.92.tar.bz2
+1a8ce4d794b3dea0d086d9809b6ddf0c  evolution-2.28.0.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 21 12:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:34:24 +0000
Subject: [pkgdb] kexec-tools: aarapov has requested watchcommits
Message-ID: <20090921123424.B547610F876@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on kexec-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kexec-tools



From pkgdb at fedoraproject.org  Mon Sep 21 12:34:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 12:34:52 +0000
Subject: [pkgdb] kexec-tools: aarapov has requested watchbugzilla
Message-ID: <20090921123452.3151B10F876@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on kexec-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kexec-tools



From mcrha at fedoraproject.org  Mon Sep 21 12:36:32 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Sep 2009 12:36:32 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.49,
	1.50 evolution-exchange.spec, 1.73, 1.74 sources, 1.49, 1.50
Message-ID: <20090921123632.2492011C0043@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22813

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
- Update to 2.28.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	7 Sep 2009 16:17:15 -0000	1.49
+++ .cvsignore	21 Sep 2009 12:36:31 -0000	1.50
@@ -1 +1 @@
-evolution-exchange-2.27.92.tar.bz2
+evolution-exchange-2.28.0.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- evolution-exchange.spec	7 Sep 2009 16:17:15 -0000	1.73
+++ evolution-exchange.spec	21 Sep 2009 12:36:31 -0000	1.74
@@ -17,7 +17,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
+- Update to 2.28.0
+
 * Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 2.27.92-1.fc12
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	7 Sep 2009 16:17:15 -0000	1.49
+++ sources	21 Sep 2009 12:36:31 -0000	1.50
@@ -1 +1 @@
-8333048c4569296d75e243ff20b85138  evolution-exchange-2.27.92.tar.bz2
+e138476d94edc228a01568118cc7d7c6  evolution-exchange-2.28.0.tar.bz2



From iefremov at fedoraproject.org  Mon Sep 21 12:37:40 2009
From: iefremov at fedoraproject.org (iefremov)
Date: Mon, 21 Sep 2009 12:37:40 +0000 (UTC)
Subject: rpms/ugene/F-10 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ugene.spec,
	1.3, 1.4
Message-ID: <20090921123740.7AFD211C0043@cvs1.fedora.phx.redhat.com>

Author: iefremov

Update of /cvs/pkgs/rpms/ugene/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23193

Modified Files:
	.cvsignore sources ugene.spec 
Log Message:
update to 1.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Jul 2009 14:16:38 -0000	1.4
+++ .cvsignore	21 Sep 2009 12:37:40 -0000	1.5
@@ -1 +1 @@
-ugene-1.5.1.tar.gz
+ugene-1.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Jul 2009 14:16:38 -0000	1.4
+++ sources	21 Sep 2009 12:37:40 -0000	1.5
@@ -1 +1 @@
-082534460b4601c8e9ee64f07a56f164  ugene-1.5.1.tar.gz
+b00e53de467e6b1cb7f2d5301feaf4a9  ugene-1.5.2.tar.gz


Index: ugene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/F-10/ugene.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ugene.spec	17 Jul 2009 14:16:38 -0000	1.3
+++ ugene.spec	21 Sep 2009 12:37:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:    ugene
 Summary: Integrated bioinformatics toolkit
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 #The entire source code is GPLv2+ except:
 #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %doc COPYRIGHT LICENSE
 
 %changelog
+* Mon Sep 21 2009 Ivan Efremov <iefremov at unipro.ru> - 1.5.2-1 
+- Upstream version change
+
 * Fri Jul 17 2009 Ivan Efremov <iefremov at unipro.ru> - 1.5.1-1 
 - Upstream version change
 - Fix for lrelease removed due to upstream package changes



From iefremov at fedoraproject.org  Mon Sep 21 12:39:47 2009
From: iefremov at fedoraproject.org (iefremov)
Date: Mon, 21 Sep 2009 12:39:47 +0000 (UTC)
Subject: rpms/ugene/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ugene.spec,
	1.5, 1.6
Message-ID: <20090921123947.B513811C0043@cvs1.fedora.phx.redhat.com>

Author: iefremov

Update of /cvs/pkgs/rpms/ugene/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23888

Modified Files:
	.cvsignore sources ugene.spec 
Log Message:
update to 1.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Jul 2009 14:14:01 -0000	1.4
+++ .cvsignore	21 Sep 2009 12:39:47 -0000	1.5
@@ -1 +1 @@
-ugene-1.5.1.tar.gz
+ugene-1.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Jul 2009 14:14:01 -0000	1.4
+++ sources	21 Sep 2009 12:39:47 -0000	1.5
@@ -1 +1 @@
-082534460b4601c8e9ee64f07a56f164  ugene-1.5.1.tar.gz
+b00e53de467e6b1cb7f2d5301feaf4a9  ugene-1.5.2.tar.gz


Index: ugene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/F-11/ugene.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ugene.spec	17 Jul 2009 14:14:01 -0000	1.5
+++ ugene.spec	21 Sep 2009 12:39:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:    ugene
 Summary: Integrated bioinformatics toolkit
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 #The entire source code is GPLv2+ except:
 #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %doc COPYRIGHT LICENSE
 
 %changelog
+* Mon Sep 21 2009 Ivan Efremov <iefremov at unipro.ru> - 1.5.2-1 
+- Upstream version change
+
 * Fri Jul 17 2009 Ivan Efremov <iefremov at unipro.ru> - 1.5.1-1 
 - Upstream version change
 - Fix for lrelease removed due to upstream package changes



From rakesh at fedoraproject.org  Mon Sep 21 12:39:50 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 21 Sep 2009 12:39:50 +0000 (UTC)
Subject: rpms/taskcoach/devel .cvsignore, 1.5, 1.6 import.log, 1.2,
	1.3 sources, 1.5, 1.6 taskcoach.spec, 1.10, 1.11
Message-ID: <20090921123950.CE30B11C0043@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23774/devel

Modified Files:
	.cvsignore import.log sources taskcoach.spec 
Log Message:

Updated to 74.1
Removed binaries and made pkg noarch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Apr 2009 20:03:59 -0000	1.5
+++ .cvsignore	21 Sep 2009 12:39:50 -0000	1.6
@@ -1 +1 @@
-TaskCoach-0.72.5.tar.gz
+TaskCoach-0.74.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 20:04:00 -0000	1.2
+++ import.log	21 Sep 2009 12:39:50 -0000	1.3
@@ -1,2 +1,3 @@
 taskcoach-0_71_5-1_fc10:HEAD:taskcoach-0.71.5-1.fc10.src.rpm:1232042892
 taskcoach-0_72_5-1_fc11:HEAD:taskcoach-0.72.5-1.fc11.src.rpm:1239566339
+taskcoach-0_74_1-1_fc12:HEAD:taskcoach-0.74.1-1.fc12.src.rpm:1253537335


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Apr 2009 20:04:00 -0000	1.5
+++ sources	21 Sep 2009 12:39:50 -0000	1.6
@@ -1 +1 @@
-3f28e02d16cb8dde3fc3172f6b985edf  TaskCoach-0.72.5.tar.gz
+056283894a97417b9ebc79b47835bd4f  TaskCoach-0.74.1.tar.gz


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/taskcoach.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- taskcoach.spec	27 Jul 2009 05:32:19 -0000	1.10
+++ taskcoach.spec	21 Sep 2009 12:39:50 -0000	1.11
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        0.72.5
-Release:        2%{?dist}
+Version:        0.74.1
+Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw?j przyjazny menad?er zada?
 Group:          Applications/Productivity
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourcef
 Source1:        %{name}.png
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 BuildRequires:  python-devel wxPython >= 2.8 desktop-file-utils
 Requires:       hicolor-icon-theme wxPython
 
@@ -38,9 +39,8 @@ oznaczaj?c je stosownym kolorem w zesta
 %prep
 %setup -q -n %{name_alternative}-%{version}
 sed -i 's/\r//' %{name}.pyw
-sed -i 's/\r//' CHANGES.txt
-sed -i 's/\r//' %{name}lib/thirdparty/desktop.py
-chmod a-x README.txt LICENSE.txt CHANGES.txt
+rm -rf taskcoachlib/bin.in/
+chmod a-x README.txt LICENSE.txt
 
 %build
 %{__python} make.py build
@@ -49,7 +49,7 @@ chmod a-x README.txt LICENSE.txt CHANGES
 rm -rf $RPM_BUILD_ROOT
 %{__python} make.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_bindir}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
-chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}lib/thirdparty/desktop.py
+#chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}lib/thirdparty/desktop.py
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 install -m 644 -p %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
@@ -81,11 +81,14 @@ fi
 %{python_sitelib}/%{name}lib/
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
-%doc README.txt LICENSE.txt CHANGES.txt
+%doc README.txt LICENSE.txt
 %exclude %{_bindir}/%{name}.pyw
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Mon Sep 21 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.74.1-1
+- Updated to 0.74.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Sep 21 12:43:34 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 21 Sep 2009 12:43:34 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.68,
	1.69 gnome-power-manager.spec, 1.174, 1.175 sources, 1.69, 1.70
Message-ID: <20090921124334.0883711C0043@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25059

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	7 Sep 2009 13:34:59 -0000	1.68
+++ .cvsignore	21 Sep 2009 12:43:33 -0000	1.69
@@ -1 +1 @@
-gnome-power-manager-2.27.92.tar.bz2
+gnome-power-manager-2.28.0.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- gnome-power-manager.spec	7 Sep 2009 13:34:59 -0000	1.174
+++ gnome-power-manager.spec	21 Sep 2009 12:43:33 -0000	1.175
@@ -4,7 +4,7 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
@@ -181,6 +181,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	7 Sep 2009 13:34:59 -0000	1.69
+++ sources	21 Sep 2009 12:43:33 -0000	1.70
@@ -1 +1 @@
-50b94d77dadd073fa66aec1aecec5879  gnome-power-manager-2.27.92.tar.bz2
+c1107f8d88cbd6a3d8a44ec70c990d74  gnome-power-manager-2.28.0.tar.bz2



From rakesh at fedoraproject.org  Mon Sep 21 12:46:56 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 21 Sep 2009 12:46:56 +0000 (UTC)
Subject: rpms/taskcoach/F-11 .cvsignore, 1.5, 1.6 import.log, 1.2,
	1.3 sources, 1.5, 1.6 taskcoach.spec, 1.9, 1.10
Message-ID: <20090921124656.6140F11C0043@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25835/F-11

Modified Files:
	.cvsignore import.log sources taskcoach.spec 
Log Message:
Updated to 74.1, added buildarch as 'noarch' and removed bins from pkg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Apr 2009 20:03:59 -0000	1.5
+++ .cvsignore	21 Sep 2009 12:46:56 -0000	1.6
@@ -1 +1 @@
-TaskCoach-0.72.5.tar.gz
+TaskCoach-0.74.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 20:04:00 -0000	1.2
+++ import.log	21 Sep 2009 12:46:56 -0000	1.3
@@ -1,2 +1,3 @@
 taskcoach-0_71_5-1_fc10:HEAD:taskcoach-0.71.5-1.fc10.src.rpm:1232042892
 taskcoach-0_72_5-1_fc11:HEAD:taskcoach-0.72.5-1.fc11.src.rpm:1239566339
+taskcoach-0_74_1-1_fc12:F-11/:taskcoach-0.74.1-1.fc12.src.rpm:1253537751


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Apr 2009 20:04:00 -0000	1.5
+++ sources	21 Sep 2009 12:46:56 -0000	1.6
@@ -1 +1 @@
-3f28e02d16cb8dde3fc3172f6b985edf  TaskCoach-0.72.5.tar.gz
+056283894a97417b9ebc79b47835bd4f  TaskCoach-0.74.1.tar.gz


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-11/taskcoach.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- taskcoach.spec	12 Apr 2009 20:04:00 -0000	1.9
+++ taskcoach.spec	21 Sep 2009 12:46:56 -0000	1.10
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        0.72.5
+Version:        0.74.1
 Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw?j przyjazny menad?er zada?
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourcef
 Source1:        %{name}.png
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 BuildRequires:  python-devel wxPython >= 2.8 desktop-file-utils
 Requires:       hicolor-icon-theme wxPython
 
@@ -38,9 +39,8 @@ oznaczaj?c je stosownym kolorem w zesta
 %prep
 %setup -q -n %{name_alternative}-%{version}
 sed -i 's/\r//' %{name}.pyw
-sed -i 's/\r//' CHANGES.txt
-sed -i 's/\r//' %{name}lib/thirdparty/desktop.py
-chmod a-x README.txt LICENSE.txt CHANGES.txt
+rm -rf taskcoachlib/bin.in/
+chmod a-x README.txt LICENSE.txt
 
 %build
 %{__python} make.py build
@@ -49,7 +49,7 @@ chmod a-x README.txt LICENSE.txt CHANGES
 rm -rf $RPM_BUILD_ROOT
 %{__python} make.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_bindir}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
-chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}lib/thirdparty/desktop.py
+#chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}lib/thirdparty/desktop.py
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 install -m 644 -p %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
@@ -81,11 +81,14 @@ fi
 %{python_sitelib}/%{name}lib/
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
-%doc README.txt LICENSE.txt CHANGES.txt
+%doc README.txt LICENSE.txt
 %exclude %{_bindir}/%{name}.pyw
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Mon Sep 21 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.74.1-1
+- Updated to 0.74.1
+
 * Mon Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.72.5-1
 - Updated to 0.72.5
 



From rhughes at fedoraproject.org  Mon Sep 21 12:50:52 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 21 Sep 2009 12:50:52 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.55,
	1.56 gnome-packagekit.spec, 1.99, 1.100 sources, 1.56, 1.57
Message-ID: <20090921125052.1B4E911C0043@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26968

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	7 Sep 2009 13:35:19 -0000	1.55
+++ .cvsignore	21 Sep 2009 12:50:51 -0000	1.56
@@ -1 +1 @@
-gnome-packagekit-2.27.92.tar.bz2
+gnome-packagekit-2.28.0.tar.bz2


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gnome-packagekit.spec	7 Sep 2009 13:35:20 -0000	1.99
+++ gnome-packagekit.spec	21 Sep 2009 12:50:51 -0000	1.100
@@ -14,14 +14,14 @@
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.27.92
+Version:   2.28.0
 #Release:   0.1.%{?alphatag}git%{?dist}
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}.tar.bz2
-#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}-%{?alphatag}.tar.bz2
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.bz2
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
@@ -223,6 +223,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
+- New upstream version.
+
 * Mon Sep 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.92-1
 - New upstream version.
 - Many updated translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	7 Sep 2009 13:35:20 -0000	1.56
+++ sources	21 Sep 2009 12:50:51 -0000	1.57
@@ -1 +1 @@
-9f4582a2dcf4521eeb2b91fa458a21d8  gnome-packagekit-2.27.92.tar.bz2
+fec6038dcf0b295fb3c4e6534f6415bf  gnome-packagekit-2.28.0.tar.bz2



From rakesh at fedoraproject.org  Mon Sep 21 12:53:58 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 21 Sep 2009 12:53:58 +0000 (UTC)
Subject: rpms/taskcoach/F-10 import.log,1.1,1.2 taskcoach.spec,1.6,1.7
Message-ID: <20090921125358.9A1A311C0043@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27681/F-10

Modified Files:
	import.log taskcoach.spec 
Log Message:
removed already present binaries



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Jan 2009 06:17:57 -0000	1.1
+++ import.log	21 Sep 2009 12:53:58 -0000	1.2
@@ -1 +1,2 @@
 taskcoach-0_71_5-1_fc10:F-10:taskcoach-0.71.5-1.fc10.src.rpm:1232043402
+taskcoach-0_71_5-2_fc12:F-10:taskcoach-0.71.5-2.fc12.src.rpm:1253538198


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-10/taskcoach.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- taskcoach.spec	16 Jan 2009 06:17:57 -0000	1.6
+++ taskcoach.spec	21 Sep 2009 12:53:58 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           taskcoach
 Version:        0.71.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw?j przyjazny menad?er zada?
 Group:          Applications/Productivity
@@ -42,6 +42,7 @@ sed -i 's/\r//' %{name}.pyw
 sed -i 's/\r//' CHANGES.txt
 sed -i 's/\r//' %{name}lib/thirdparty/desktop.py
 chmod a-x README.txt LICENSE.txt CHANGES.txt
+rm -rf taskcoachlib/bin.in/
 
 %build
 %{__python} make.py build
@@ -87,6 +88,9 @@ fi
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Mon Sep 21 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.71.5-2
+- removed binaries
+
 * Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.71.5-1
 - Updated to 0.71.5
 



From pmatilai at fedoraproject.org  Mon Sep 21 13:25:25 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon, 21 Sep 2009 13:25:25 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.1-chroot-env-paths.patch, NONE,
	1.1 rpm-4.7.1-chroot-remove-env.patch, NONE,
	1.1 rpm-4.7.1-filedep-dnevr.patch, NONE,
	1.1 rpm-4.7.1-rpm2cpio-init.patch, NONE, 1.1 rpm.spec, 1.360, 1.361
Message-ID: <20090921132525.C289B11C0043@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3421

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.1-chroot-env-paths.patch 
	rpm-4.7.1-chroot-remove-env.patch 
	rpm-4.7.1-filedep-dnevr.patch rpm-4.7.1-rpm2cpio-init.patch 
Log Message:
- use relative paths within db environment (related to #507309, #507309...)
- remove db environment on close in chrooted operation (related to above)
- initialize rpmlib earlier in rpm2cpio (#523260)
- fix file dependency tag extension formatting (#523282)


rpm-4.7.1-chroot-env-paths.patch:
 db3.c |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

--- NEW FILE rpm-4.7.1-chroot-env-paths.patch ---
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 9f0f941..b0b2a86 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -1015,17 +1015,12 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
 	    }
 
 	    if (rc == 0) {
-		char * fullpath;
-		const char * dbpath;
-		fullpath = rpmGetPath(dbhome, "/", dbfile ? dbfile : "", NULL);
-
-#ifdef	HACK	/* XXX necessary to support dbsubfile */
-		dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
-			? fullpath : dbfile;
-#else
-		dbpath = (!dbi->dbi_temporary)
-			? fullpath : dbfile;
-#endif
+		char * fullpath = NULL;
+		const char * dbpath = dbfile;
+		if (!dbi->dbi_use_dbenv && !dbi->dbi_temporary) {
+		    fullpath = rpmGetPath(dbhome, "/", dbfile, NULL);
+		    dbpath = fullpath;
+		}
 
 		rc = (db->open)(db, txnid, dbpath, dbsubfile,
 		    dbi->dbi_type, oflags, dbi->dbi_perms);

rpm-4.7.1-chroot-remove-env.patch:
 backend/db3.c |    3 ++-
 rpmdb.c       |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.7.1-chroot-remove-env.patch ---
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 9f0f941..9683100 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -181,7 +181,8 @@ static int db_fini(dbiIndex dbi, const char * dbhome,
 	xx = db_env_create(&dbenv, 0);
 	xx = cvtdberr(dbi, "db_env_create", xx, _debug);
 	xx = dbenv->remove(dbenv, dbhome, 0);
-	xx = cvtdberr(dbi, "dbenv->remove", xx, _debug);
+	/* filter out EBUSY as it just means somebody else gets to clean it */
+	xx = cvtdberr(dbi, "dbenv->remove", xx, (xx == EBUSY ? 0 : _debug));
 
 	if (dbfile)
 	    rpmlog(RPMLOG_DEBUG, "removed  db environment %s/%s\n",
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 0754b99..b781cfc 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -921,7 +921,8 @@ rpmdb newRpmdb(const char * root,
 	return NULL;
     }
     db->db_errpfx = rpmExpand( (epfx && *epfx ? epfx : _DB_ERRPFX), NULL);
-    db->db_remove_env = 0;
+    /* XXX remove environment after chrooted operations, for now... */
+    db->db_remove_env = ((strcmp(db->db_root, "/") != 0)? 1 : 0);
     db->db_filter_dups = _db_filter_dups;
     db->db_ndbi = dbiTags.max;
     db->_dbi = xcalloc(db->db_ndbi, sizeof(*db->_dbi));

rpm-4.7.1-filedep-dnevr.patch:
 tagexts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-filedep-dnevr.patch ---
commit d846e6b0f829791e6ffce4fd496c9378bff19c43
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 15 08:45:14 2009 +0300

    Don't add dependency type into file requires and provides (RhBug:523282)
    - unintended change in commit 3d8656f040d2c780c88d0cd63594898f0605a6fa

diff --git a/lib/tagexts.c b/lib/tagexts.c
index ec0b001..4588365 100644
--- a/lib/tagexts.c
+++ b/lib/tagexts.c
@@ -137,7 +137,7 @@ static int filedepTag(Header h, rpmTag tagN, rpmtd td, headerGetFlags hgflags)
 		    continue;
 		DNEVR = rpmdsDNEVR(ds);
 		if (DNEVR != NULL) {
-		    argvAdd(&deps, DNEVR);
+		    argvAdd(&deps, DNEVR + 2);
 		}
 	    }
 	}

rpm-4.7.1-rpm2cpio-init.patch:
 rpm2cpio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-rpm2cpio-init.patch ---
commit 63d37be6b4a854b9cbbd47306c5c383a2ad356c2
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 15 12:57:51 2009 +0300

    Initialize rpm earlier in rpm2cpio (RhBug:523260)
    - url retrieval requires macros to be loaded

diff --git a/rpm2cpio.c b/rpm2cpio.c
index 6c29cab..bf7f17c 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -21,6 +21,7 @@ int main(int argc, char *argv[])
     FD_t gzdi;
     
     setprogname(argv[0]);	/* Retrofit glibc __progname */
+    rpmReadConfigFiles(NULL, NULL);
     if (argc == 1)
 	fdi = fdDup(STDIN_FILENO);
     else {
@@ -37,7 +38,6 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
     }
     fdo = fdDup(STDOUT_FILENO);
-    rpmReadConfigFiles(NULL, NULL);
 
     {	rpmts ts = rpmtsCreate();
 	rpmVSFlags vsflags = 0;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -p -r1.360 -r1.361
--- rpm.spec	15 Sep 2009 08:22:57 -0000	1.360
+++ rpm.spec	21 Sep 2009 13:25:25 -0000	1.361
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -43,6 +43,10 @@ Patch200: rpm-4.7.1-bugurl.patch
 Patch201: rpm-4.7.1-abs-filelist.patch
 Patch202: rpm-4.7.1-debug-perms.patch
 Patch203: rpm-4.7.1-duplicate-deps.patch
+Patch204: rpm-4.7.1-chroot-env-paths.patch
+Patch205: rpm-4.7.1-rpm2cpio-init.patch
+Patch206: rpm-4.7.1-filedep-dnevr.patch
+Patch207: rpm-4.7.1-chroot-remove-env.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -200,6 +204,10 @@ packages on a system.
 %patch201 -p1 -b .abs-filelist
 %patch202 -p1 -b .debug-perms
 %patch203 -p1 -b .duplicate-deps
+%patch204 -p1 -b .chroot-env-paths
+%patch205 -p1 -b .rpm2cpio.init
+%patch206 -p1 -b .filedep-dnevr
+%patch207 -p1 -b .chroot-remove-env
 
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
@@ -415,6 +423,12 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Sep 21 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-6
+- use relative paths within db environment (related to #507309, #507309...)
+- remove db environment on close in chrooted operation (related to above)
+- initialize rpmlib earlier in rpm2cpio (#523260)
+- fix file dependency tag extension formatting (#523282)
+
 * Tue Sep 15 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-5
 - fix duplicate dependency filtering on build (#490378)
 - permit absolute paths in file lists again (#521760)



From plautrba at fedoraproject.org  Mon Sep 21 13:44:38 2009
From: plautrba at fedoraproject.org (Petr Lautrbach)
Date: Mon, 21 Sep 2009 13:44:38 +0000 (UTC)
Subject: rpms/tuned/devel .cvsignore, 1.7, 1.8 import.log, 1.1, 1.2 sources, 
	1.7, 1.8 tuned.spec, 1.7, 1.8
Message-ID: <20090921134439.2425811C0043@cvs1.fedora.phx.redhat.com>

Author: plautrba

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8320/devel

Modified Files:
	.cvsignore import.log sources tuned.spec 
Log Message:
Update to tuned-0.2.4
Resolves: #523385




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Aug 2009 16:06:45 -0000	1.7
+++ .cvsignore	21 Sep 2009 13:44:37 -0000	1.8
@@ -1 +1 @@
-tuned-0.2.3.tar.bz2
+tuned-0.2.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Mar 2009 09:56:17 -0000	1.1
+++ import.log	21 Sep 2009 13:44:37 -0000	1.2
@@ -1 +1,2 @@
 tuned-0_1_3-1_fc10:HEAD:tuned-0.1.3-1.fc10.src.rpm:1236074130
+tuned-0_2_4-1_fc11:HEAD:tuned-0.2.4-1.fc11.src.rpm:1253540639


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Aug 2009 16:06:45 -0000	1.7
+++ sources	21 Sep 2009 13:44:37 -0000	1.8
@@ -1 +1 @@
-ce5a3616ad3abb6fa3a65bed0d394711  tuned-0.2.3.tar.bz2
+6bb707fcd605165099d7b74bcbbb2a32  tuned-0.2.4.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tuned.spec	18 Aug 2009 16:06:45 -0000	1.7
+++ tuned.spec	21 Sep 2009 13:44:37 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -97,6 +97,10 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.4-1
+- Update release to tuned-0.2.4
+- Resolves: #523385
+
 * Tue Aug 18 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.3-1
 - Updated documentation
 - Few more fixes for tuned-adm



From kdudka at fedoraproject.org  Mon Sep 21 13:50:12 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Mon, 21 Sep 2009 13:50:12 +0000 (UTC)
Subject: rpms/nano/devel nano-2.0.9-warnings.patch, NONE, 1.1 nano.spec, 1.29,
	1.30
Message-ID: <20090921135012.5195A11C0416@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10708

Modified Files:
	nano.spec 
Added Files:
	nano-2.0.9-warnings.patch 
Log Message:
- suppress warnings for __attribute__((warn_unused_result)) (#523951)

nano-2.0.9-warnings.patch:
 chars.c |   43 ++++++++++++++++++++++++++++---------------
 files.c |    4 +++-
 2 files changed, 31 insertions(+), 16 deletions(-)

--- NEW FILE nano-2.0.9-warnings.patch ---
diff -rup nano-2.0.9.orig/src/chars.c nano-2.0.9/src/chars.c
--- nano-2.0.9.orig/src/chars.c	2008-04-02 05:49:33.000000000 +0200
+++ nano-2.0.9/src/chars.c	2009-09-21 13:22:25.976235192 +0200
@@ -79,6 +79,18 @@ bool is_byte(int c)
     return ((unsigned int)c == (unsigned char)c);
 }
 
+static void mbtowc_reset(void)
+{
+    int rv = mbtowc(NULL, NULL, 0);
+    (void) rv;
+}
+
+static void wctomb_reset(void)
+{
+    int rv = wctomb(NULL, 0);
+    (void) rv;
+}
+
 /* This function is equivalent to isalnum() for multibyte characters. */
 bool is_alnum_mbchar(const char *c)
 {
@@ -89,7 +101,7 @@ bool is_alnum_mbchar(const char *c)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -109,7 +121,7 @@ bool is_blank_mbchar(const char *c)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -156,7 +168,7 @@ bool is_cntrl_mbchar(const char *c)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -177,7 +189,7 @@ bool is_punct_mbchar(const char *c)
 	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);
 
 	if (c_mb_len < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -243,14 +255,14 @@ char *control_mbrep(const char *c, char 
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    *crep_len = bad_mbchar_len;
 	    strncpy(crep, bad_mbchar, *crep_len);
 	} else {
 	    *crep_len = wctomb(crep, control_wrep(wc));
 
 	    if (*crep_len < 0) {
-		wctomb(NULL, 0);
+		wctomb_reset();
 		*crep_len = 0;
 	    }
 	}
@@ -278,14 +290,14 @@ char *mbrep(const char *c, char *crep, i
 
 	/* Reject invalid Unicode characters. */
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0 || !is_valid_unicode(wc)) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    *crep_len = bad_mbchar_len;
 	    strncpy(crep, bad_mbchar, *crep_len);
 	} else {
 	    *crep_len = wctomb(crep, wc);
 
 	    if (*crep_len < 0) {
-		wctomb(NULL, 0);
+		wctomb_reset();
 		*crep_len = 0;
 	    }
 	}
@@ -311,7 +323,7 @@ int mbwidth(const char *c)
 	int width;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -356,7 +368,7 @@ char *make_mbchar(long chr, int *chr_mb_
 
 	/* Reject invalid Unicode characters. */
 	if (*chr_mb_len < 0 || !is_valid_unicode((wchar_t)chr)) {
-	    wctomb(NULL, 0);
+	    wctomb_reset();
 	    *chr_mb_len = 0;
 	}
     } else {
@@ -388,7 +400,8 @@ int parse_mbchar(const char *buf, char *
 	/* If buf contains an invalid multibyte character, only
 	 * interpret buf's first byte. */
 	if (buf_mb_len < 0) {
-	    mblen(NULL, 0);
+	    int rv = mblen(NULL, 0);
+	    (void) rv;
 	    buf_mb_len = 1;
 	} else if (buf_mb_len == 0)
 	    buf_mb_len++;
@@ -545,7 +558,7 @@ int mbstrncasecmp(const char *s1, const 
 	    s1_mb_len = parse_mbchar(s1, s1_mb, NULL);
 
 	    if (mbtowc(&ws1, s1_mb, s1_mb_len) < 0) {
-		mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws1 = (unsigned char)*s1_mb;
 		bad_s1_mb = TRUE;
 	    }
@@ -553,7 +566,7 @@ int mbstrncasecmp(const char *s1, const 
 	    s2_mb_len = parse_mbchar(s2, s2_mb, NULL);
 
 	    if (mbtowc(&ws2, s2_mb, s2_mb_len) < 0) {
-		mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws2 = (unsigned char)*s2_mb;
 		bad_s2_mb = TRUE;
 	    }
@@ -781,7 +794,7 @@ char *mbstrchr(const char *s, const char
 	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);
 
 	if (c_mb_len < 0) {
-	    mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = (unsigned char)*c;
 	    bad_c_mb = TRUE;
 	}
@@ -790,7 +803,7 @@ char *mbstrchr(const char *s, const char
 	    int s_mb_len = parse_mbchar(s, s_mb, NULL);
 
 	    if (mbtowc(&ws, s_mb, s_mb_len) < 0) {
-		mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws = (unsigned char)*s;
 		bad_s_mb = TRUE;
 	    }
diff -rup nano-2.0.9.orig/src/files.c nano-2.0.9/src/files.c
--- nano-2.0.9.orig/src/files.c	2008-08-24 07:49:25.000000000 +0200
+++ nano-2.0.9/src/files.c	2009-09-21 13:24:50.585047697 +0200
@@ -1057,6 +1057,7 @@ char *get_full_path(const char *origpath
 	    free(d_there);
 	    d_there = NULL;
 	} else {
+	    int rv;
 	    free(d_there);
 
 	    /* Get the full path. */
@@ -1082,7 +1083,8 @@ char *get_full_path(const char *origpath
 	    /* Finally, go back to the path specified in d_here,
 	     * where we were before.  We don't check for a chdir()
 	     * error, since we can do nothing if we get one. */
-	    chdir(d_here);
+	    rv = chdir(d_here);
+	    (void) rv;
 
 	    /* Free d_here, since we're done using it. */
 	    free(d_here);


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nano.spec	18 Sep 2009 18:52:30 -0000	1.29
+++ nano.spec	21 Sep 2009 13:50:12 -0000	1.30
@@ -1,11 +1,12 @@
 Summary:	A small text editor
 Name:		nano
 Version:	2.0.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
 Source:		http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
+Patch1:		nano-2.0.9-warnings.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, autoconf, gettext-devel, groff
 Requires(post):	 /sbin/install-info
@@ -16,6 +17,7 @@ GNU nano is a small and friendly text ed
 
 %prep
 %setup -q
+%patch1 -p1
 for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.tmp $f && mv $f.tmp $f
   touch $f.html
@@ -66,6 +68,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Mon Sep 21 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-3
+- suppress warnings for __attribute__((warn_unused_result)) (#523951)
+
 * Fri Sep 18 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-2
 - install binaries to /bin (#168340)
 



From ovasik at fedoraproject.org  Mon Sep 21 13:51:15 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 21 Sep 2009 13:51:15 +0000 (UTC)
Subject: rpms/xmlto/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xmlto.spec, 1.50, 1.51
Message-ID: <20090921135115.E6BAD11C0416@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11120

Modified Files:
	.cvsignore sources xmlto.spec 
Log Message:
New version 0.0.23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Mar 2009 15:08:16 -0000	1.11
+++ .cvsignore	21 Sep 2009 13:51:15 -0000	1.12
@@ -1 +1 @@
-xmlto-0.0.22.tar.bz2
+xmlto-0.0.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	25 Mar 2009 15:08:17 -0000	1.11
+++ sources	21 Sep 2009 13:51:15 -0000	1.12
@@ -1 +1 @@
-12f297dc7051e4fef08339980f88a1dd  xmlto-0.0.22.tar.bz2
+3001d6bb2bbc2c8f6c2301f05120f074  xmlto-0.0.23.tar.bz2


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xmlto.spec	1 Aug 2009 16:12:42 -0000	1.50
+++ xmlto.spec	21 Sep 2009 13:51:15 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
-Version: 0.0.22
-Release: 3%{?dist}
+Version: 0.0.23
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
@@ -21,7 +21,7 @@ Requires: docbook-xsl >= 1.56.0
 Requires: text-www-browser
 Requires: libxslt
 Requires: docbook-dtds
-Requires: util-linux, flex, which
+Requires: util-linux, flex
 
 %description
 This is a package for converting XML files to various formats using XSL
@@ -95,10 +95,19 @@ rm -rf $RPM_BUILD_ROOT
 %files xhtml
 %defattr(-,root,root,-)
 %dir %{_datadir}/xmlto/format/xhtml1/
-%{_datadir}/xmlto/format/xhtml1
+%{_datadir}/xmlto/format/xhtml1/*
 
 
 %changelog
+* Mon Sep 21 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.23-1
+- New version 0.0.23
+- added autodetection for more common tools like
+  gnu cp or tail
+- added option --noautosize to prevent overriding
+  of user-defined or system-default paper size
+- use shell built-in 'type -t' instead of 'which'
+  utility for detection of file availability
+
 * Sat Aug 01 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.22-3
 - make subpackages noarch, preserve timestamps - merge
   review (#226568)



From dwalsh at fedoraproject.org  Mon Sep 21 13:54:03 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 21 Sep 2009 13:54:03 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.445,
	1.446 policycoreutils.spec, 1.645, 1.646
Message-ID: <20090921135403.A871811C0043@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11892

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-4
- Close sandbox when eclipse exits


policycoreutils-rhat.patch:
 Makefile                                                                        |    2 
 audit2allow/audit2allow                                                         |   14 
 load_policy/Makefile                                                            |    2 
 restorecond/Makefile                                                            |   24 
 restorecond/org.selinux.Restorecond.service                                     |    3 
 restorecond/restorecond.c                                                       |  422 +-----
 restorecond/restorecond.conf                                                    |    5 
 restorecond/restorecond.desktop                                                 |    7 
 restorecond/restorecond.h                                                       |   18 
 restorecond/restorecond.init                                                    |    5 
 restorecond/restorecond_user.conf                                               |    2 
 restorecond/user.c                                                              |  237 +++
 restorecond/watch.c                                                             |  254 +++
 sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sand5EuHAP/.recently-used.xbel                                         |    5 
 sandbox/.sand5EuHAP/.sandboxrc                                                  |    2 
 sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2        |    8 
 sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sand6ZVCQ8/.gconfd/saved_state                                         |    1 
 sandbox/.sand6ZVCQ8/.recently-used.xbel                                         |    5 
 sandbox/.sand6ZVCQ8/.sandboxrc                                                  |    2 
 sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sand9auIqB/.gconfd/saved_state                                         |    1 
 sandbox/.sand9auIqB/.recently-used.xbel                                         |    5 
 sandbox/.sand9auIqB/.sandboxrc                                                  |    2 
 sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandDU27fU/.gconfd/saved_state                                         |    1 
 sandbox/.sandDU27fU/.recently-used.xbel                                         |    5 
 sandbox/.sandDU27fU/.sandboxrc                                                  |    2 
 sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandDkHGLK/.sandboxrc                                                  |    2 
 sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandEwfYil/.gconfd/saved_state                                         |    1 
 sandbox/.sandEwfYil/.recently-used.xbel                                         |    5 
 sandbox/.sandEwfYil/.sandboxrc                                                  |    2 
 sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandFvSaCB/.gconfd/saved_state                                         |    1 
 sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed                               |    3 
 sandbox/.sandFvSaCB/.sandboxrc                                                  |    2 
 sandbox/.sandGljofi/.gconfd/saved_state                                         |    1 
 sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandJ9bHZs/.gconfd/saved_state                                         |    1 
 sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml                              |    9 
 sandbox/.sandJ9bHZs/.recently-used.xbel                                         |    5 
 sandbox/.sandJ9bHZs/.sandboxrc                                                  |    2 
 sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandMsqk5z/.gconfd/saved_state                                         |    1 
 sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml                              |   11 
 sandbox/.sandMsqk5z/.recently-used.xbel                                         |   16 
 sandbox/.sandMsqk5z/.sandboxrc                                                  |    2 
 sandbox/.sandMsqk5z/Documents/College.pdf                                       |binary
 sandbox/.sandTHLOge/.sandboxrc                                                  |    2 
 sandbox/.sandU2xZMV/.gconfd/saved_state                                         |    1 
 sandbox/.sandaH0LFh/.sandboxrc                                                  |    2 
 sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandca9QI3/.sandboxrc                                                  |    2 
 sandbox/.sandfXZ7O0/.sandboxrc                                                  |    2 
 sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandgWA5fU/.gconfd/saved_state                                         |    1 
 sandbox/.sandgWA5fU/.recently-used.xbel                                         |    5 
 sandbox/.sandgWA5fU/.sandboxrc                                                  |    2 
 sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandhGC2MA/.gconfd/saved_state                                         |    1 
 sandbox/.sandhGC2MA/.recently-used.xbel                                         |    5 
 sandbox/.sandhGC2MA/.sandboxrc                                                  |    2 
 sandbox/.sandm8rUJi/.sandboxrc                                                  |    2 
 sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sando4RPnA/.gconfd/saved_state                                         |    1 
 sandbox/.sando4RPnA/.recently-used.xbel                                         |    5 
 sandbox/.sando4RPnA/.sandboxrc                                                  |    2 
 sandbox/.sandqdddIr/.gconfd/saved_state                                         |    1 
 sandbox/.sandr0OyvJ/.sandboxrc                                                  |    2 
 sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sanduaug79/.gconfd/saved_state                                         |    1 
 sandbox/.sanduaug79/.recently-used.xbel                                         |    5 
 sandbox/.sanduaug79/.sandboxrc                                                  |    2 
 sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandutCK9C/.gconfd/saved_state                                         |    1 
 sandbox/.sandutCK9C/.gnome2/evince/evince-crashed                               |    3 
 sandbox/.sandutCK9C/.sandboxrc                                                  |    2 
 sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sanduzC9A9/.gconfd/saved_state                                         |    1 
 sandbox/.sanduzC9A9/.recently-used.xbel                                         |    5 
 sandbox/.sanduzC9A9/.sandboxrc                                                  |    2 
 sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandv0FPZq/.gconfd/saved_state                                         |    1 
 sandbox/.sandv0FPZq/.recently-used.xbel                                         |    5 
 sandbox/.sandv0FPZq/.sandboxrc                                                  |    2 
 sandbox/.sandxW7Kqn/.sandboxrc                                                  |    2 
 sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1        |    8 
 sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 |binary
 sandbox/.sandzKCpug/.gconfd/saved_state                                         |    1 
 sandbox/.sandzKCpug/.recently-used.xbel                                         |    5 
 sandbox/.sandzKCpug/.sandboxrc                                                  |    2 
 sandbox/Makefile                                                                |   31 
 sandbox/sandbox                                                                 |  207 +++
 sandbox/sandbox.8                                                               |   26 
 sandbox/sandboxX.sh                                                             |   16 
 sandbox/seunshare                                                               |binary
 sandbox/seunshare.c                                                             |  265 ++++
 sandbox/seunshare.o                                                             |binary
 scripts/Makefile                                                                |    2 
 scripts/chcat                                                                   |    2 
 semanage/semanage                                                               |   27 
 semanage/seobject.py                                                            |   11 
 semodule/semodule.8                                                             |    8 
 semodule/semodule.c                                                             |   53 
 setfiles/Makefile                                                               |    4 
 setfiles/restore.c                                                              |  519 ++++++++
 setfiles/restore.h                                                              |   49 
 setfiles/setfiles.c                                                             |  643 +---------
 125 files changed, 2206 insertions(+), 953 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -p -r1.445 -r1.446
--- policycoreutils-rhat.patch	19 Sep 2009 01:40:53 -0000	1.445
+++ policycoreutils-rhat.patch	21 Sep 2009 13:54:02 -0000	1.446
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.74/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 05:45:35.000000000 -0800
++++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-20 18:26:36.000000000 -0700
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -39,8 +39,8 @@ diff --exclude-from=exclude --exclude=se
              # This is the default if no input is specified
              f = sys.stdin
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.74/load_policy/Makefile
---- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/load_policy/Makefile	2008-08-28 06:34:24.000000000 -0700
++++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-20 18:26:36.000000000 -0700
 @@ -1,6 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -50,8 +50,8 @@ diff --exclude-from=exclude --exclude=se
  LOCALEDIR ?= /usr/share/locale
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.74/Makefile
---- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.74/Makefile	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/Makefile	2008-08-28 06:34:24.000000000 -0700
++++ policycoreutils-2.0.74/Makefile	2009-09-20 18:26:36.000000000 -0700
 @@ -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 sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -59,8 +59,8 @@ diff --exclude-from=exclude --exclude=se
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.74/restorecond/Makefile
---- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/Makefile	2009-08-20 12:49:21.000000000 -0700
++++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-20 18:26:36.000000000 -0700
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -108,15 +108,15 @@ diff --exclude-from=exclude --exclude=se
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service
---- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 12:49:21.000000000 -0700
++++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-20 18:26:36.000000000 -0700
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -608,8 +608,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.74/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 12:49:21.000000000 -0700
++++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-20 18:26:36.000000000 -0700
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -621,8 +621,8 @@ diff --exclude-from=exclude --exclude=se
 -
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.74/restorecond/restorecond.desktop
---- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -632,8 +632,8 @@ diff --exclude-from=exclude --exclude=se
 +Type=Application
 +StartupNotify=false
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.74/restorecond/restorecond.h
---- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 12:49:21.000000000 -0700
++++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-20 18:26:36.000000000 -0700
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -659,8 +659,8 @@ diff --exclude-from=exclude --exclude=se
  
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.74/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 12:49:21.000000000 -0700
++++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-20 18:26:36.000000000 -0700
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -681,14 +681,14 @@ diff --exclude-from=exclude --exclude=se
  exit $RETVAL
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
---- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
---- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/user.c	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/user.c	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -928,8 +928,8 @@ diff --exclude-from=exclude --exclude=se
 +}
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
---- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/restorecond/watch.c	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1186,8 +1186,8 @@ diff --exclude-from=exclude --exclude=se
 +}
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.74/sandbox/Makefile
---- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/sandbox/Makefile	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1220,9 +1220,112 @@ diff --exclude-from=exclude --exclude=se
 +	../../scripts/Lindent $(wildcard *.[ch])
 +
 +relabel:
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:29:11.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-tPO8npawe6,guid=497ca5f938615eccf673a5584ab6d6e7
++DBUS_SESSION_BUS_PID=18391
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand5EuHAP/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sand5EuHAP/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.recently-used.xbel	2009-09-20 18:29:17.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.sandboxrc policycoreutils-2.0.74/sandbox/.sand5EuHAP/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sand5EuHAP/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.sandboxrc	2009-09-20 18:29:10.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2 policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2
+--- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2	2009-09-20 18:31:06.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :2 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-xOrKqKCzxN,guid=1c095101cac51dbf1e0a2dbf4ab6d75a
++DBUS_SESSION_BUS_PID=18477
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.gconfd/saved_state	2009-09-20 18:31:28.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343832382d302d313761313165363262366135330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343832382d302d3137613131653632623661353300000000001c00000000000000827e8470b000e8a8eb2428282828282801000000cf1fbbf301000000480000000100000002000000050000001c00000000000000827e8470b000e8a8eb2428282828282801000000cf1fbbf301000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.recently-used.xbel	2009-09-20 18:31:12.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.sandboxrc policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.sandboxrc	2009-09-20 18:31:05.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:15.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cdg3FAXkMm,guid=0e83184f4aaf91de7fbe64e04ab6dbd7
++DBUS_SESSION_BUS_PID=19427
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sand9auIqB/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sand9auIqB/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.gconfd/saved_state	2009-09-20 18:50:18.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346264662d302d363036353934646336636532660000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346264662d302d3630363539346463366365326600000000001c00000000000000a82a2c20e74368a8eb242828282828280100000091dd417901000000480000000100000002000000050000001c00000000000000a82a2c20e74368a8eb242828282828280100000091dd417901000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand9auIqB/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sand9auIqB/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.recently-used.xbel	2009-09-20 18:50:18.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.sandboxrc policycoreutils-2.0.74/sandbox/.sand9auIqB/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sand9auIqB/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.sandboxrc	2009-09-20 18:50:14.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandaH0LFh/.sandboxrc policycoreutils-2.0.74/sandbox/.sandaH0LFh/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandaH0LFh/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandaH0LFh/.sandboxrc	2009-09-20 18:50:03.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinced
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
---- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-18 21:38:37.000000000 -0400
+--- nsapolicycoreutils/sandbox/sandbox	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,207 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1432,8 +1535,8 @@ diff --exclude-from=exclude --exclude=se
 +    sys.exit(rc)
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.74/sandbox/sandbox.8
---- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1462,8 +1565,8 @@ diff --exclude-from=exclude --exclude=se
 +runcon(1)
 +.PP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.74/sandbox/sandboxX.sh
---- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-20 18:51:31.000000000 -0700
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1478,12 +1581,548 @@ diff --exclude-from=exclude --exclude=se
 +wait $CLIENT_PID
 +export EXITCODE=$?
 +kill -TERM $WM_PID
-+exit $EXITCODE
++kill -HUP 0
 +break
 +done
+Binary files nsapolicycoreutils/sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandca9QI3/.sandboxrc policycoreutils-2.0.74/sandbox/.sandca9QI3/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandca9QI3/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandca9QI3/.sandboxrc	2009-09-20 18:50:27.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinced
+Binary files nsapolicycoreutils/sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDkHGLK/.sandboxrc policycoreutils-2.0.74/sandbox/.sandDkHGLK/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandDkHGLK/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandDkHGLK/.sandboxrc	2009-09-20 18:51:37.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinced
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:43:52.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-XDwPExYfIi,guid=adec649dfa1a8bd855054ed94ab6da58
++DBUS_SESSION_BUS_PID=19095
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandDU27fU/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandDU27fU/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.gconfd/saved_state	2009-09-20 18:43:56.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346139332d302d316561646230353261343636310000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346139332d302d3165616462303532613436363100000000001c0000000000000059c8e8a8bb622828eb242828282828280100000022a8b89801000000480000000100000002000000050000001c0000000000000059c8e8a8bb622828eb242828282828280100000022a8b89801000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandDU27fU/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandDU27fU/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.recently-used.xbel	2009-09-20 18:43:56.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.sandboxrc policycoreutils-2.0.74/sandbox/.sandDU27fU/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandDU27fU/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.sandboxrc	2009-09-20 18:43:51.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:49.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-9sxjAoKmU1,guid=635ecdfe5313853941699f3c4ab6db81
++DBUS_SESSION_BUS_PID=19273
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandEwfYil/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandEwfYil/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.gconfd/saved_state	2009-09-20 18:48:53.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346234342d302d353962333062343032633766330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346234342d302d3539623330623430326337663300000000001c000000000000007f8470980ca3a828eb2428282828282801000000440e9ebe01000000480000000100000002000000050000001c000000000000007f8470980ca3a828eb2428282828282801000000440e9ebe01000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandEwfYil/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandEwfYil/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.recently-used.xbel	2009-09-20 18:48:53.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.sandboxrc policycoreutils-2.0.74/sandbox/.sandEwfYil/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandEwfYil/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.sandboxrc	2009-09-20 18:48:49.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:51:41.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-SS7TyVm1DO,guid=f1c44cf39424360da4f412464ab6dc2d
++DBUS_SESSION_BUS_PID=19638
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandFvSaCB/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gconfd/saved_state	2009-09-20 18:51:44.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346362312d302d353139386637353961326462330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346362312d302d3531393866373539613264623300000000001c0000000000000041f8886819642828eb24282828282828010000001cfc38b001000000480000000100000002000000050000001c0000000000000041f8886819642828eb24282828282828010000001cfc38b001000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed
+--- nsapolicycoreutils/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed	2009-09-20 18:51:41.000000000 -0700
+@@ -0,0 +1,3 @@
++
++[Evince]
++documents=empty-window;
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.sandboxrc policycoreutils-2.0.74/sandbox/.sandFvSaCB/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandFvSaCB/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.sandboxrc	2009-09-20 18:51:40.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandfXZ7O0/.sandboxrc policycoreutils-2.0.74/sandbox/.sandfXZ7O0/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandfXZ7O0/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandfXZ7O0/.sandboxrc	2009-09-20 18:51:13.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinced
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandGljofi/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandGljofi/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandGljofi/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandGljofi/.gconfd/saved_state	2009-09-20 18:35:38.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343931302d302d373632313236323935623534310000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343931302d302d3736323132363239356235343100000000001c00000000000000dec6f4904881e8a8eb2428282828282801000000b70b778f01000000480000000100000002000000050000001c00000000000000dec6f4904881e8a8eb2428282828282801000000b70b778f01000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:09.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-wm3V6XS1BH,guid=834e597a2191494022c5dbcd4ab6dbd1
++DBUS_SESSION_BUS_PID=19399
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandgWA5fU/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandgWA5fU/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.gconfd/saved_state	2009-09-20 18:50:12.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346263312d302d336364633665643236343239000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346263312d302d3363646336656432363432390000000000001c0000000000000040fa8c60794368a8eb24282828282828010000007d3db9b101000000480000000100000002000000050000001c0000000000000040fa8c60794368a8eb24282828282828010000007d3db9b101000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandgWA5fU/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandgWA5fU/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.recently-used.xbel	2009-09-20 18:50:12.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.sandboxrc policycoreutils-2.0.74/sandbox/.sandgWA5fU/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandgWA5fU/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.sandboxrc	2009-09-20 18:50:08.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:41:58.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-3eOkeaFHzR,guid=e8e2d3e31ed54d2678cc388e4ab6d9e6
++DBUS_SESSION_BUS_PID=18956
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandhGC2MA/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandhGC2MA/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.gconfd/saved_state	2009-09-20 18:42:04.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346130372d302d623231643561336435386663000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346130372d302d6232316435613364353866630000000000001c00000000000000223e04709f02e8a8eb24282828282828010000007a954ffb01000000480000000100000002000000050000001c00000000000000223e04709f02e8a8eb24282828282828010000007a954ffb01000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandhGC2MA/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandhGC2MA/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.recently-used.xbel	2009-09-20 18:42:03.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.sandboxrc policycoreutils-2.0.74/sandbox/.sandhGC2MA/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandhGC2MA/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.sandboxrc	2009-09-20 18:41:58.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:32.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-spRMvWreBA,guid=dbc49f7f1fdc92aed762a27f4ab6dbe8
++DBUS_SESSION_BUS_PID=19516
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandJ9bHZs/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gconfd/saved_state	2009-09-20 18:50:37.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346333372d302d333235393933376261316262000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346333372d302d3332353939333762613162620000000000001c000000000000009948e8a81f642828eb24282828282828010000000cb4c02801000000480000000100000002000000050000001c000000000000009948e8a81f642828eb24282828282828010000000cb4c02801000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml
+--- nsapolicycoreutils/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml	2009-09-20 18:50:34.000000000 -0700
+@@ -0,0 +1,9 @@
++<?xml version="1.0"?>
++<metadata>
++  <document uri="file:///home/dwalsh/d" atime="1253497832">
++    <entry key="window_maximized" type="gboolean" value="0"/>
++  </document>
++  <document uri="last-used-value" atime="1253497832">
++    <entry key="window_maximized" type="gboolean" value="0"/>
++  </document>
++</metadata>
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandJ9bHZs/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.recently-used.xbel	2009-09-20 18:50:37.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.sandboxrc policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandJ9bHZs/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.sandboxrc	2009-09-20 18:50:32.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince d
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandm8rUJi/.sandboxrc policycoreutils-2.0.74/sandbox/.sandm8rUJi/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandm8rUJi/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandm8rUJi/.sandboxrc	2009-09-20 18:49:10.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinced
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:52:03.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-eCyP2ZHgv3,guid=a600a08dd74abe0f38b442554ab6dc43
++DBUS_SESSION_BUS_PID=19667
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandMsqk5z/Documents/College.pdf and policycoreutils-2.0.74/sandbox/.sandMsqk5z/Documents/College.pdf differ
+Binary files nsapolicycoreutils/sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandMsqk5z/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gconfd/saved_state	2009-09-20 18:52:08.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346363662d302d316437383165343639306335000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346363662d302d3164373831653436393063350000000000001c00000000000000d7d4d0d807a4a828eb24282828282828010000001e42fe8601000000480000000100000002000000050000001c00000000000000d7d4d0d807a4a828eb24282828282828010000001e42fe8601000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml
+--- nsapolicycoreutils/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml	2009-09-20 18:52:05.000000000 -0700
+@@ -0,0 +1,11 @@
++<?xml version="1.0"?>
++<metadata>
++  <document uri="file:///home/dwalsh/Documents/College.pdf" atime="1253497923">
++    <entry key="sidebar_page" type="gchararray" value="thumbnails"/>
++    <entry key="window_maximized" type="gboolean" value="0"/>
++  </document>
++  <document uri="last-used-value" atime="1253497923">
++    <entry key="sidebar_page" type="gchararray" value="thumbnails"/>
++    <entry key="window_maximized" type="gboolean" value="0"/>
++  </document>
++</metadata>
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandMsqk5z/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandMsqk5z/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.recently-used.xbel	2009-09-20 18:52:08.000000000 -0700
+@@ -0,0 +1,16 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++>
++  <bookmark href="file:///home/dwalsh/Documents/College.pdf" added="2009-09-21T01:52:03Z" modified="2009-09-21T01:52:03Z" visited="2009-09-21T01:52:03Z">
++    <info>
++      <metadata owner="http://freedesktop.org">
++        <mime:mime-type type="application/pdf"/>
++        <bookmark:applications>
++          <bookmark:application name="Document Viewer" exec="&apos;evince %u&apos;" modified="2009-09-21T01:52:03Z" count="1"/>
++        </bookmark:applications>
++      </metadata>
++    </info>
++  </bookmark>
++</xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.sandboxrc policycoreutils-2.0.74/sandbox/.sandMsqk5z/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandMsqk5z/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.sandboxrc	2009-09-20 18:52:02.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince /home/dwalsh/Documents/College.pdf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:47:42.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-P54hariU2d,guid=05b16df695d69b77e7b530304ab6db3e
++DBUS_SESSION_BUS_PID=19199
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sando4RPnA/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sando4RPnA/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.gconfd/saved_state	2009-09-20 18:47:47.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346166612d302d373862373933386135636237300000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346166612d302d3738623739333861356362373000000000001c00000000000000827e84706202e8a8eb2428282828282801000000868d9fbb01000000480000000100000002000000050000001c00000000000000827e84706202e8a8eb2428282828282801000000868d9fbb01000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sando4RPnA/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sando4RPnA/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.recently-used.xbel	2009-09-20 18:47:47.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.sandboxrc policycoreutils-2.0.74/sandbox/.sando4RPnA/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sando4RPnA/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.sandboxrc	2009-09-20 18:47:41.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandqdddIr/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandqdddIr/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandqdddIr/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandqdddIr/.gconfd/saved_state	2009-09-20 18:32:20.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343836632d302d313636393239626536636239390000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343836632d302d3136363932396265366362393900000000001c00000000000000905acce0d44068a8eb24282828282828010000005807bdc901000000480000000100000002000000050000001c00000000000000905acce0d44068a8eb24282828282828010000005807bdc901000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandr0OyvJ/.sandboxrc policycoreutils-2.0.74/sandbox/.sandr0OyvJ/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandr0OyvJ/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandr0OyvJ/.sandboxrc	2009-09-20 18:50:55.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinced
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandTHLOge/.sandboxrc policycoreutils-2.0.74/sandbox/.sandTHLOge/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandTHLOge/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandTHLOge/.sandboxrc	2009-09-20 18:50:20.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evinc
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandU2xZMV/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandU2xZMV/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandU2xZMV/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandU2xZMV/.gconfd/saved_state	2009-09-20 18:34:09.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d343863392d302d323037643136316365636230000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d343863392d302d3230376431363163656362300000000000001c00000000000000fc827c80b1c068a8eb24282828282828010000008c1b316501000000480000000100000002000000050000001c00000000000000fc827c80b1c068a8eb24282828282828010000008c1b316501000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:01.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-XXbHt6cdJ0,guid=e30722c9dfbd86c8d83d901d4ab6db51
++DBUS_SESSION_BUS_PID=19234
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sanduaug79/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sanduaug79/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduaug79/.gconfd/saved_state	2009-09-20 18:48:06.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346231652d302d343336353837373237633538630000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346231652d302d3433363538373732376335386300000000001c0000000000000021380868b6632828eb2428282828282801000000381448f001000000480000000100000002000000050000001c0000000000000021380868b6632828eb2428282828282801000000381448f001000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sanduaug79/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sanduaug79/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduaug79/.recently-used.xbel	2009-09-20 18:48:06.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.sandboxrc policycoreutils-2.0.74/sandbox/.sanduaug79/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sanduaug79/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduaug79/.sandboxrc	2009-09-20 18:48:00.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:46:23.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-5ZD3S9bft3,guid=0d5ef668ed9bdbf6ae8ab5914ab6daef
++DBUS_SESSION_BUS_PID=19160
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandutCK9C/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandutCK9C/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.gconfd/saved_state	2009-09-20 18:46:26.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346164332d302d343539643064643463623432320000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346164332d302d3435396430646434636234323200000000001c00000000000000caeea430cb02e8a8eb2428282828282801000000c2dde79301000000480000000100000002000000050000001c00000000000000caeea430cb02e8a8eb2428282828282801000000c2dde79301000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed policycoreutils-2.0.74/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed
+--- nsapolicycoreutils/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed	2009-09-20 18:46:24.000000000 -0700
+@@ -0,0 +1,3 @@
++
++[Evince]
++documents=empty-window;
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.sandboxrc policycoreutils-2.0.74/sandbox/.sandutCK9C/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandutCK9C/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.sandboxrc	2009-09-20 18:46:23.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:59.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-nZ6H1CwYTL,guid=218b75054435610d0a4bb5774ab6db8b
++DBUS_SESSION_BUS_PID=19308
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sanduzC9A9/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sanduzC9A9/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.gconfd/saved_state	2009-09-20 18:49:08.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346236372d302d333463366265393465313965340000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346236372d302d3334633662653934653139653400000000001c000000000000008968a8284f632828eb2428282828282801000000a2d828c801000000480000000100000002000000050000001c000000000000008968a8284f632828eb2428282828282801000000a2d828c801000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sanduzC9A9/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sanduzC9A9/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.recently-used.xbel	2009-09-20 18:49:08.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.sandboxrc policycoreutils-2.0.74/sandbox/.sanduzC9A9/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sanduzC9A9/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.sandboxrc	2009-09-20 18:48:59.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:43:04.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-IK0B4vyQB6,guid=2412a23e2a1cad56ad0e693b4ab6da28
++DBUS_SESSION_BUS_PID=19026
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandv0FPZq/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandv0FPZq/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.gconfd/saved_state	2009-09-20 18:43:08.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346134652d302d653532633038643430626461000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346134652d302d6535326330386434306264610000000000001c000000000000009754d0d886a2a828eb242828282828280100000024f6561601000000480000000100000002000000050000001c000000000000009754d0d886a2a828eb242828282828280100000024f6561601000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandv0FPZq/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandv0FPZq/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.recently-used.xbel	2009-09-20 18:43:08.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.sandboxrc policycoreutils-2.0.74/sandbox/.sandv0FPZq/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandv0FPZq/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.sandboxrc	2009-09-20 18:43:04.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandxW7Kqn/.sandboxrc policycoreutils-2.0.74/sandbox/.sandxW7Kqn/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandxW7Kqn/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandxW7Kqn/.sandboxrc	2009-09-20 18:50:24.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++evincdd
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
+--- nsapolicycoreutils/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:42:34.000000000 -0700
+@@ -0,0 +1,8 @@
++# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
++# display :1 to find the D-Bus session bus with the below address.
++# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
++# be used rather than this file.
++# See "man dbus-launch" for more details.
++DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-HOpff6V9mX,guid=e42f34a85c84b5d478ca18b64ab6da0a
++DBUS_SESSION_BUS_PID=18991
++DBUS_SESSION_BUS_WINDOWID=6291457
+Binary files nsapolicycoreutils/sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandzKCpug/.gconfd/saved_state
+--- nsapolicycoreutils/sandbox/.sandzKCpug/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.gconfd/saved_state	2009-09-20 18:42:38.000000000 -0700
+@@ -0,0 +1 @@
++CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346132622d302d353865373764613765386162370000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346132622d302d3538653737646137653861623700000000001c0000000000000062be0470b302e8a8eb24282828282828010000001183a3e301000000480000000100000002000000050000001c0000000000000062be0470b302e8a8eb24282828282828010000001183a3e301000000140000000100000001000105000000000901010000000000"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandzKCpug/.recently-used.xbel
+--- nsapolicycoreutils/sandbox/.sandzKCpug/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.recently-used.xbel	2009-09-20 18:42:38.000000000 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xbel version="1.0"
++      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
++      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
++></xbel>
+\ No newline at end of file
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.sandboxrc policycoreutils-2.0.74/sandbox/.sandzKCpug/.sandboxrc
+--- nsapolicycoreutils/sandbox/.sandzKCpug/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.sandboxrc	2009-09-20 18:42:34.000000000 -0700
+@@ -0,0 +1,2 @@
++#! /bin/sh
++/usr/bin/evince
+Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.74/sandbox/seunshare differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c
---- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-18 09:58:46.000000000 -0400
+--- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-20 18:48:31.000000000 -0700
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -1524,7 +2163,7 @@ diff --exclude-from=exclude --exclude=se
 +	if (setresuid(uid, uid, uid)) {
 +		fprintf(stderr, "Error changing uid, aborting.\n");
 +		return -1;
-+
++	}
 +	return capng_apply(CAPNG_SELECT_BOTH);
 +}
 +
@@ -1750,9 +2389,10 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
+Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.74/sandbox/seunshare.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.74/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.74/scripts/chcat	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/scripts/chcat	2009-06-23 12:36:07.000000000 -0700
++++ policycoreutils-2.0.74/scripts/chcat	2009-09-20 18:26:36.000000000 -0700
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1763,8 +2403,8 @@ diff --exclude-from=exclude --exclude=se
      sys.exit(errors)
      
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.74/scripts/Makefile	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/scripts/Makefile	2008-08-28 06:34:24.000000000 -0700
++++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 18:26:36.000000000 -0700
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1775,8 +2415,8 @@ diff --exclude-from=exclude --exclude=se
  install: all
  	-mkdir -p $(BINDIR)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.74/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/semanage	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/semanage/semanage	2009-09-08 06:03:10.000000000 -0700
++++ policycoreutils-2.0.74/semanage/semanage	2009-09-20 18:26:36.000000000 -0700
 @@ -85,6 +85,7 @@
          -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)
@@ -1868,8 +2508,8 @@ diff --exclude-from=exclude --exclude=se
                          return
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/semanage/seobject.py	2009-09-08 06:03:10.000000000 -0700
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-20 18:26:36.000000000 -0700
 @@ -1586,9 +1586,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
@@ -1902,8 +2542,8 @@ diff --exclude-from=exclude --exclude=se
  			if fcon_dict[k]:
  				if is_mls_enabled:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.74/semodule/semodule.8
---- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/semodule/semodule.8	2009-09-17 05:59:43.000000000 -0700
++++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-20 18:26:36.000000000 -0700
 @@ -30,11 +30,17 @@
  install/replace a module package
  .TP
@@ -1924,8 +2564,8 @@ diff --exclude-from=exclude --exclude=se
  remove existing module
  .TP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.74/semodule/semodule.c
---- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/semodule/semodule.c	2009-09-17 05:59:43.000000000 -0700
++++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-20 18:26:36.000000000 -0700
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -2044,8 +2684,8 @@ diff --exclude-from=exclude --exclude=se
  						    (m);
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.74/setfiles/Makefile
---- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/setfiles/Makefile	2009-07-07 12:32:32.000000000 -0700
++++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-20 18:26:36.000000000 -0700
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -2065,8 +2705,8 @@ diff --exclude-from=exclude --exclude=se
  restorecon: setfiles
  	ln -sf setfiles restorecon
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.74/setfiles/restore.c
---- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/setfiles/restore.c	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2588,8 +3228,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.74/setfiles/restore.h
---- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/setfiles/restore.h	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-20 18:26:36.000000000 -0700
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2641,8 +3281,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-17 15:05:17.000000000 -0400
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 05:59:43.000000000 -0700
++++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 18:26:36.000000000 -0700
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -p -r1.645 -r1.646
--- policycoreutils.spec	19 Sep 2009 01:40:56 -0000	1.645
+++ policycoreutils.spec	21 Sep 2009 13:54:03 -0000	1.646
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-4
+- Close sandbox when eclipse exits
+
 * Fri Sep 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-3
 - Security fixes for seunshare
 - Fix Sandbox to handle non file input to command.



From dwalsh at fedoraproject.org  Mon Sep 21 13:55:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 21 Sep 2009 13:55:42 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.89,
	1.90 selinux-policy.spec, 1.926, 1.927
Message-ID: <20090921135542.A7AE711C0043@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12496

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-8
- Fix all kernel_request_load_module domains


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  319 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  181 +++
 policy/modules/apps/sandbox.te            |  326 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   80 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   29 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  116 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1402 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 318 files changed, 14560 insertions(+), 2587 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.89 -r 1.90 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- policy-F12.patch	20 Sep 2009 14:32:30 -0000	1.89
+++ policy-F12.patch	21 Sep 2009 13:55:41 -0000	1.90
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
---- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/Makefile	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/Makefile	2009-08-18 08:41:14.000000000 -0700
++++ serefpolicy-3.6.32/Makefile	2009-09-16 07:03:08.000000000 -0700
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -11,8 +11,8 @@ diff -b -B --ignore-all-space --exclude-
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
---- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 16:41:29.000000000 -0400
+--- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 10:30:04.000000000 -0700
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 13:41:29.000000000 -0700
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -22,8 +22,8 @@ diff -b -B --ignore-all-space --exclude-
  
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/global_tunables	2009-07-23 11:11:04.000000000 -0700
++++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 07:03:08.000000000 -0700
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -60,8 +60,8 @@ diff -b -B --ignore-all-space --exclude-
 +gen_tunable(mmap_low_allowed, false)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
---- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/mcs	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/mcs	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/mcs	2009-09-16 07:03:08.000000000 -0700
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -96,8 +96,8 @@ diff -b -B --ignore-all-space --exclude-
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
---- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 07:03:08.000000000 -0700
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -115,9 +115,21 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
+--- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-21 05:25:17.000000000 -0700
+@@ -21,7 +21,7 @@
+ allow brctl_t self:unix_dgram_socket create_socket_perms;
+ allow brctl_t self:tcp_socket create_socket_perms;
+ 
+-kernel_load_module(brctl_t)
++kernel_request_load_module(brctl_t)
+ kernel_read_network_state(brctl_t)
+ kernel_read_sysctl(brctl_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
---- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 06:23:16.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 07:03:08.000000000 -0700
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -128,16 +140,16 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
---- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 07:03:08.000000000 -0700
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
---- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 07:03:08.000000000 -0700
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -173,8 +185,8 @@ diff -b -B --ignore-all-space --exclude-
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
---- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 07:03:08.000000000 -0700
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -198,8 +210,8 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
---- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 07:03:08.000000000 -0700
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -243,8 +255,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
---- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 07:03:08.000000000 -0700
 @@ -136,4 +136,5 @@
  
  optional_policy(`
@@ -252,8 +264,8 @@ diff -b -B --ignore-all-space --exclude-
 +	samba_read_share_files(logwatch_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
---- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 06:23:16.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 07:03:08.000000000 -0700
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -263,8 +275,8 @@ diff -b -B --ignore-all-space --exclude-
  netutils_domtrans_ping(mrtg_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 07:03:08.000000000 -0700
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(netutils_t)
@@ -274,8 +286,8 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_all_users_fds(netutils_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
---- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 15:39:50.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 07:03:08.000000000 -0700
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -286,8 +298,8 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:unix_stream_socket create_socket_perms;
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.32/policy/modules/admin/prelink.if
---- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 06:09:20.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 07:03:08.000000000 -0700
 @@ -151,11 +151,11 @@
  ##	</summary>
  ## </param>
@@ -303,8 +315,8 @@ diff -b -B --ignore-all-space --exclude-
 +	relabel_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.32/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 10:03:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 06:09:20.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 07:03:08.000000000 -0700
 @@ -89,6 +89,7 @@
  miscfiles_read_localization(prelink_t)
  
@@ -314,8 +326,8 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amanda_manage_lib(prelink_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.32/policy/modules/admin/readahead.te
---- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-16 10:03:08.000000000 -0400
[...3890 lines suppressed...]
-@@ -261,7 +274,10 @@
+@@ -260,7 +273,9 @@
+ kernel_use_fds(ifconfig_t)
  kernel_read_system_state(ifconfig_t)
  kernel_read_network_state(ifconfig_t)
++kernel_request_load_module(ifconfig_t)
  kernel_search_network_sysctl(ifconfig_t)
 +kernel_search_debugfs(ifconfig_t)
  kernel_rw_net_sysctls(ifconfig_t)
-+# This should be put inside a boolean, but can not because of attributes
-+kernel_load_module(ifconfig_t)
  
  corenet_rw_tun_tap_dev(ifconfig_t)
- 
-@@ -269,15 +285,23 @@
+@@ -269,15 +284,23 @@
  # for IPSEC setup:
  dev_read_urand(ifconfig_t)
  
@@ -24482,7 +24502,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_read_root_files(ifconfig_t)
  
-@@ -294,6 +318,8 @@
+@@ -294,6 +317,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -24491,7 +24511,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -330,8 +356,21 @@
+@@ -330,8 +355,21 @@
  ')
  
  optional_policy(`
@@ -24514,8 +24534,8 @@ diff -b -B --ignore-all-space --exclude-
 +	hal_dontaudit_rw_pipes(ifconfig_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.32/policy/modules/system/udev.fc
---- nsaserefpolicy/policy/modules/system/udev.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.fc	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-09-16 07:03:09.000000000 -0700
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -24527,8 +24547,8 @@ diff -b -B --ignore-all-space --exclude-
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.32/policy/modules/system/udev.if
---- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-09-16 07:03:09.000000000 -0700
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)
@@ -24556,8 +24576,8 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_files_pattern($1, udev_var_run_t, udev_var_run_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-16 07:03:09.000000000 -0700
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -24668,8 +24688,8 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.32/policy/modules/system/unconfined.fc
---- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-09-16 07:03:09.000000000 -0700
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -24688,8 +24708,8 @@ diff -b -B --ignore-all-space --exclude-
 -/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.32/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-09-16 07:03:09.000000000 -0700
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -25194,8 +25214,8 @@ diff -b -B --ignore-all-space --exclude-
 -	allow $1 unconfined_t:dbus acquire_svc;
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.32/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 08:41:14.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-09-16 07:03:09.000000000 -0700
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -25426,8 +25446,8 @@ diff -b -B --ignore-all-space --exclude-
 -	')
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.32/policy/modules/system/userdomain.fc
---- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-09-16 07:03:09.000000000 -0700
 @@ -1,4 +1,8 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -25439,8 +25459,8 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-20 08:32:58.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 10:30:04.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-21 05:24:59.000000000 -0700
 @@ -30,8 +30,9 @@
  	')
  
@@ -25909,7 +25929,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Find CDROM devices:
 -	kernel_read_device_sysctls($1_t)
 +	kernel_read_device_sysctls($1_usertype)
-+	kernel_load_module_request($1_usertype)
++	kernel_request_load_module($1_usertype)
  
 -	corecmd_exec_bin($1_t)
 +	corenet_udp_bind_generic_node($1_usertype)
@@ -27420,8 +27440,8 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 user_tmp_t:file { getattr append };
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 10:30:04.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 07:03:09.000000000 -0700
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27508,8 +27528,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
---- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 07:03:09.000000000 -0700
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -27538,8 +27558,8 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 07:03:09.000000000 -0700
 @@ -71,6 +71,8 @@
  	')
  
@@ -27591,8 +27611,8 @@ diff -b -B --ignore-all-space --exclude-
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 07:03:09.000000000 -0700
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -27891,8 +27911,8 @@ diff -b -B --ignore-all-space --exclude-
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
---- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 07:03:09.000000000 -0700
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -27926,8 +27946,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
---- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/users	2009-09-16 10:03:09.000000000 -0400
+--- nsaserefpolicy/policy/users	2009-07-14 11:19:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/users	2009-09-16 07:03:09.000000000 -0700
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -p -r1.926 -r1.927
--- selinux-policy.spec	20 Sep 2009 14:32:30 -0000	1.926
+++ selinux-policy.spec	21 Sep 2009 13:55:41 -0000	1.927
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,6 +447,10 @@ exit 0
 %endif
 
 %changelog
+* Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-8
+- Fix all kernel_request_load_module domains
+
+
 * Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-7
 - Remove allow_exec* booleans for confined users.  Only available for unconfined_t
 



From jpopelka at fedoraproject.org  Mon Sep 21 13:57:36 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon, 21 Sep 2009 13:57:36 +0000 (UTC)
Subject: rpms/cups/devel cups.init,1.20,1.21 cups.spec,1.520,1.521
Message-ID: <20090921135736.C168C11C0043@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13436

Modified Files:
	cups.init cups.spec 
Log Message:
* Mon Sep 21 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-4
- Changed cups.init to be LSB compliant (bug #521641), i.e.
  return code "2" (instead of "3") if invalid arguments
  return code "4" if restarting service under nonprivileged user
  return code "5" if cupsd not exist or is not executable
  return code "6" if cupsd.conf not exist



Index: cups.init
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- cups.init	15 Sep 2009 10:11:01 -0000	1.20
+++ cups.init	21 Sep 2009 13:57:36 -0000	1.21
@@ -49,7 +49,18 @@ DAEMON=cupsd
 
 prog=cups
 
+check() {
+	# Check that we're a privileged user
+	[ `id -u` = 0 ] || exit 4
+	
+	# Check if cupsd is executable
+	[ -x /usr/sbin/cupsd ] || exit 5
+}
+
 start () {
+	check
+	[ -f /etc/cups/cupsd.conf ] || exit 6
+
 	echo -n $"Starting $prog: "
 
 	# tell portreserve to release the port
@@ -71,6 +82,8 @@ start () {
 }
 
 stop () {
+	check
+
 	# stop daemon
 	echo -n $"Stopping $prog: "
 	killproc $DAEMON
@@ -123,7 +136,7 @@ case $1 in
 	*)
 
 	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-	exit 3
+	exit 2
 esac
 
 exit $RETVAL


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -p -r1.520 -r1.521
--- cups.spec	16 Sep 2009 10:25:32 -0000	1.520
+++ cups.spec	21 Sep 2009 13:57:36 -0000	1.521
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -505,6 +505,13 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Sep 21 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-4
+- Changed cups.init to be LSB compliant (bug #521641), i.e.
+  return code "2" (instead of "3") if invalid arguments
+  return code "4" if restarting service under nonprivileged user
+  return code "5" if cupsd not exist or is not executable
+  return code "6" if cupsd.conf not exist
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1:1.4.1-3
 - Use password-auth common PAM configuration instead of system-auth
   when available.



From mathstuf at fedoraproject.org  Mon Sep 21 14:04:32 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Mon, 21 Sep 2009 14:04:32 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel .cvsignore, 1.2,
	1.3 kde-plasma-networkmanagement.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20090921140432.B15BB11C0043@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15855

Modified Files:
	.cvsignore kde-plasma-networkmanagement.spec sources 
Log Message:
Fix Requires: and upload tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 03:21:11 -0000	1.2
+++ .cvsignore	21 Sep 2009 14:04:32 -0000	1.3
@@ -1 +1 @@
-kde-plasma-networkmanagement-0.1.tar.bz2
+kde-plasma-networkmanagement-0.9.tar.bz2


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kde-plasma-networkmanagement.spec	21 Sep 2009 06:33:57 -0000	1.19
+++ kde-plasma-networkmanagement.spec	21 Sep 2009 14:04:32 -0000	1.20
@@ -7,7 +7,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.1.20090919svn%{?dist}
+Release:        0.2.20090919svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -59,6 +59,7 @@ Requires: knetworkmanager = %{?epoch:%{e
 %package -n knetworkmanager-openvpn
 Summary:        OpenVPN support for knetworkmanager
 Group:          Applications/Internet
+Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -69,6 +70,7 @@ Provides:       kde-plasma-networkmanage
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
 Group:          Applications/Internet
+Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
@@ -175,6 +177,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
+- Add back missing Requires:
+
 * Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
 - Version seems to be .9 now
 - Fix trailing spaces


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Aug 2009 19:06:42 -0000	1.10
+++ sources	21 Sep 2009 14:04:32 -0000	1.11
@@ -1 +1 @@
-8a072d778cda60990c4670d85cad2f0c  kde-plasma-networkmanagement-0.1.tar.bz2
+0b75f5c48f35d47785a2bbe9a2c879e8  kde-plasma-networkmanagement-0.9.tar.bz2



From mtasaka at fedoraproject.org  Mon Sep 21 14:06:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 21 Sep 2009 14:06:58 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.397, 1.398 jd.spec, 1.460, 1.461 sources,
	1.398, 1.399
Message-ID: <20090921140658.BD5E211C0043@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
- 2.4.2 rc 090921



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- .cvsignore	20 Sep 2009 19:12:21 -0000	1.397
+++ .cvsignore	21 Sep 2009 14:06:58 -0000	1.398
@@ -1 +1 @@
-jd-2.4.2-svn3085_trunk.tgz
+jd-2.4.2-rc090921.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- jd.spec	20 Sep 2009 19:12:21 -0000	1.460
+++ jd.spec	21 Sep 2009 14:06:58 -0000	1.461
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3085_trunk
-%define         repoid        43584
+%define         strtag        rc090921
+%define         repoid        43681
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3085
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
+- 2.4.2 rc 090921
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- sources	20 Sep 2009 19:12:21 -0000	1.398
+++ sources	21 Sep 2009 14:06:58 -0000	1.399
@@ -1 +1 @@
-d7df72ea22794133a3af0105ad8230c0  jd-2.4.2-svn3085_trunk.tgz
+a003ce351a59e64640adbebcd59dc1cf  jd-2.4.2-rc090921.tgz



From mtasaka at fedoraproject.org  Mon Sep 21 14:06:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 21 Sep 2009 14:06:59 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.397, 1.398 jd.spec, 1.461, 1.462 sources,
	1.398, 1.399
Message-ID: <20090921140659.42BA311C0043@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
- 2.4.2 rc 090921



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- .cvsignore	20 Sep 2009 19:12:22 -0000	1.397
+++ .cvsignore	21 Sep 2009 14:06:58 -0000	1.398
@@ -1 +1 @@
-jd-2.4.2-svn3085_trunk.tgz
+jd-2.4.2-rc090921.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- jd.spec	20 Sep 2009 19:12:22 -0000	1.461
+++ jd.spec	21 Sep 2009 14:06:58 -0000	1.462
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3085_trunk
-%define         repoid        43584
+%define         strtag        rc090921
+%define         repoid        43681
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3085
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
+- 2.4.2 rc 090921
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- sources	20 Sep 2009 19:12:22 -0000	1.398
+++ sources	21 Sep 2009 14:06:58 -0000	1.399
@@ -1 +1 @@
-d7df72ea22794133a3af0105ad8230c0  jd-2.4.2-svn3085_trunk.tgz
+a003ce351a59e64640adbebcd59dc1cf  jd-2.4.2-rc090921.tgz



From mtasaka at fedoraproject.org  Mon Sep 21 14:06:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 21 Sep 2009 14:06:58 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.403, 1.404 jd.spec, 1.464, 1.465 sources,
	1.404, 1.405
Message-ID: <20090921140658.72C4A11C0043@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
- 2.4.2 rc 090921



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- .cvsignore	20 Sep 2009 19:12:21 -0000	1.403
+++ .cvsignore	21 Sep 2009 14:06:57 -0000	1.404
@@ -1 +1 @@
-jd-2.4.2-svn3085_trunk.tgz
+jd-2.4.2-rc090921.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- jd.spec	20 Sep 2009 19:12:21 -0000	1.464
+++ jd.spec	21 Sep 2009 14:06:57 -0000	1.465
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3085_trunk
-%define         repoid        43584
+%define         strtag        rc090921
+%define         repoid        43681
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3085
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
+- 2.4.2 rc 090921
 
 * Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
 - 2.4.2 beta 090914


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- sources	20 Sep 2009 19:12:21 -0000	1.404
+++ sources	21 Sep 2009 14:06:58 -0000	1.405
@@ -1 +1 @@
-d7df72ea22794133a3af0105ad8230c0  jd-2.4.2-svn3085_trunk.tgz
+a003ce351a59e64640adbebcd59dc1cf  jd-2.4.2-rc090921.tgz



From mmcgrath at fedoraproject.org  Mon Sep 21 14:15:18 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 21 Sep 2009 14:15:18 +0000 (UTC)
Subject: rpms/smolt/devel 0001-Client-Hopefully-fix-encoding-trouble.patch, 
	NONE, 1.1 smolt.spec, 1.75, 1.76
Message-ID: <20090921141518.D9CC911C0043@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21374

Modified Files:
	smolt.spec 
Added Files:
	0001-Client-Hopefully-fix-encoding-trouble.patch 
Log Message:
fixing translations error

0001-Client-Hopefully-fix-encoding-trouble.patch:
 sendProfile.py |    9 +++++----
 smolt.py       |   12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Client-Hopefully-fix-encoding-trouble.patch ---
>From 7243f1fcc395cdf87815ac5a33c0d2f8b61c0cdf Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian at pipping.org>
Date: Sun, 20 Sep 2009 21:38:35 +0200
Subject: [PATCH 1/2] Client: Hopefully fix encoding trouble

More or less a squashed cherry-pick from these commits:
- 7592c44f6eef240aaae147ba11ffe85a4156068b
- 81bfa3f0f5172d853f95034e061c4e3a4bd55ebe
- b21ddc39c1e51329a957a463aff3b7db09f5a726
- fa41853f7fcbe5e465bbd25fbe94942a87a5d2bb
---
 client/sendProfile.py |    9 +++++----
 client/smolt.py       |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index 46b0f18..ff3a0a9 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -36,6 +36,7 @@ import smolt
 from smolt import debug
 from smolt import error
 from smolt import get_config_attr
+from smolt import to_ascii
 from scan import scan, rating
 from gate import GateFromConfig
 
@@ -179,10 +180,10 @@ if not opts.autoSend:
         'label_fs_related':_('File system-related'),
         'label_distro_specific':_('Distribution-specific'),
 
-        'general':inner_indent(profile.get_general_info_excerpt()),
-        'devices':inner_indent(profile.get_devices_info_excerpt()),
-        'file_system':inner_indent(profile.get_file_system_info_excerpt()),
-        'distro':inner_indent(profile.get_distro_info_excerpt()),
+        'general':inner_indent(to_ascii(profile.get_general_info_excerpt())),
+        'devices':inner_indent(to_ascii(profile.get_devices_info_excerpt())),
+        'file_system':inner_indent(to_ascii(profile.get_file_system_info_excerpt())),
+        'distro':inner_indent(to_ascii(profile.get_distro_info_excerpt())),
     }
 
     submit = False
diff --git a/client/smolt.py b/client/smolt.py
index dee142f..7016ab6 100644
--- a/client/smolt.py
+++ b/client/smolt.py
@@ -51,6 +51,7 @@ from fs_util import get_fslist
 
 from gate import Gate
 from uuiddb import UuidDb
+import codecs
 
 WITHHELD_MAGIC_STRING = 'WITHHELD'
 SELINUX_ENABLED = 1
@@ -140,6 +141,16 @@ PCI_CLASS_SERIAL_USB =          3
 PCI_CLASS_SERIAL_FIBER =        4
 PCI_CLASS_SERIAL_SMBUS =        5
 
+def to_ascii(o, current_encoding='utf-8'):
+    if not isinstance(o, basestring):
+        return o
+
+    if isinstance(o, unicode):
+        s = o
+    else:
+        s = unicode(o, current_encoding)
+    return codecs.encode(s, 'ascii', 'ignore')
+
 class Device:
     def __init__(self, props, hardware):
         self.UUID = getUUID()
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- smolt.spec	14 Sep 2009 21:53:33 -0000	1.75
+++ smolt.spec	21 Sep 2009 14:15:18 -0000	1.76
@@ -2,11 +2,12 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
+Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
@@ -68,6 +69,7 @@ ensure that deps are kept small.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd client/
@@ -207,6 +209,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
+- Patched issue with translations (already upstream)
+
 * Mon Sep 14 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-1
 - Upstream released new version
 



From jwrdegoede at fedoraproject.org  Mon Sep 21 14:26:40 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 21 Sep 2009 14:26:40 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.104,1.105
Message-ID: <20090921142640.2218A11C0043@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26048

Modified Files:
	dmraid.spec 
Log Message:
* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-2
- Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
- Make -devel Require the main package now the dmraid-libs package is gone



Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- dmraid.spec	17 Sep 2009 16:31:34 -0000	1.104
+++ dmraid.spec	21 Sep 2009 14:26:39 -0000	1.105
@@ -7,11 +7,11 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: device-mapper-devel >= 1.02.02-2
 BuildRequires: device-mapper-event-devel
 BuildRequires: libselinux-devel
@@ -19,8 +19,8 @@ BuildRequires: libsepol-devel
 Requires: device-mapper >= 1.02.02-2
 Requires: dmraid-events
 Requires: kpartx
-Requires(postun): ldconfig
-Requires(post): ldconfig
+Obsoletes: dmraid-libs < %{version}-%{release}
+Provides: dmraid-libs = %{version}-%{release}
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
@@ -33,7 +33,7 @@ Linux >= 2.4 using device-mapper.
 %package -n dmraid-devel
 Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
-License: GPLv2+
+Requires: dmraid = %{version}-%{release}, sgpio
 
 %description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
@@ -130,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-2
+- Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
+- Make -devel Require the main package now the dmraid-libs package is gone
+
 * Wed Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
 - Update to version 1.0.0.rc16
 



From jwrdegoede at fedoraproject.org  Mon Sep 21 14:29:51 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 21 Sep 2009 14:29:51 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.105,1.106
Message-ID: <20090921142951.3202811C0043@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27414

Modified Files:
	dmraid.spec 
Log Message:
* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-3
- Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
- Make -devel Require the main package now the dmraid-libs package is gone



Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- dmraid.spec	21 Sep 2009 14:26:39 -0000	1.105
+++ dmraid.spec	21 Sep 2009 14:29:50 -0000	1.106
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -130,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
-* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-2
+* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-3
 - Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
 - Make -devel Require the main package now the dmraid-libs package is gone
 



From hadess at fedoraproject.org  Mon Sep 21 14:43:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 14:43:01 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.58, 1.59 gnome-media.spec,
	1.180, 1.181 sources, 1.57,
	1.58 0001-Avoid-crashing-when-switching-profiles-quickly.patch,
	1.1, NONE
Message-ID: <20090921144301.2DD2511C0043@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv628

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	0001-Avoid-crashing-when-switching-profiles-quickly.patch 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	7 Sep 2009 14:10:02 -0000	1.58
+++ .cvsignore	21 Sep 2009 14:43:00 -0000	1.59
@@ -1 +1 @@
-gnome-media-2.27.91.tar.bz2
+gnome-media-2.28.0.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- gnome-media.spec	16 Sep 2009 15:56:17 -0000	1.180
+++ gnome-media.spec	21 Sep 2009 14:43:00 -0000	1.181
@@ -13,12 +13,11 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.27.91
-Release:        3%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
-Source:         http://download.gnome.org/sources/gnome-media/2.27/gnome-media-%{version}.tar.bz2
-Patch0:         0001-Avoid-crashing-when-switching-profiles-quickly.patch
+Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -83,7 +82,6 @@ framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .profiles
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -313,6 +311,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-3
 - Fix -libs description (#520271)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	7 Sep 2009 14:10:02 -0000	1.57
+++ sources	21 Sep 2009 14:43:00 -0000	1.58
@@ -1 +1 @@
-56a5c6ba6c67b3f6efd2920404febcc2  gnome-media-2.27.91.tar.bz2
+1a1dc2638012d47f67c0ccac9e3ac719  gnome-media-2.28.0.tar.bz2


--- 0001-Avoid-crashing-when-switching-profiles-quickly.patch DELETED ---



From mbarnes at fedoraproject.org  Mon Sep 21 14:45:20 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 21 Sep 2009 14:45:20 +0000 (UTC)
Subject: rpms/gnome-python2/devel .cvsignore, 1.42, 1.43 gnome-python2.spec, 
	1.37, 1.38 sources, 1.42, 1.43
Message-ID: <20090921144520.2162711C0043@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1440

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:

* Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-1.fc12
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	2 May 2009 17:52:32 -0000	1.42
+++ .cvsignore	21 Sep 2009 14:45:19 -0000	1.43
@@ -1 +1 @@
-gnome-python-2.27.1.tar.bz2
+gnome-python-2.18.0.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gnome-python2.spec	25 Jul 2009 00:44:46 -0000	1.37
+++ gnome-python2.spec	21 Sep 2009 14:45:19 -0000	1.38
@@ -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.27.1
+# Last updated for 2.28.0
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.27.1
-Release: 4%{?dist}
+Version: 2.18.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: PyGNOME Python extension module
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-1.fc12
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 May 2009 17:52:32 -0000	1.42
+++ sources	21 Sep 2009 14:45:19 -0000	1.43
@@ -1 +1 @@
-6e1c9b9de1c98d064e8438f3f147305d  gnome-python-2.27.1.tar.bz2
+75400e51abe3cedb785db40960cbad53  gnome-python-2.18.0.tar.bz2



From tbzatek at fedoraproject.org  Mon Sep 21 14:50:35 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 21 Sep 2009 14:50:35 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.47, 1.48 gvfs.spec, 1.155,
	1.156 sources, 1.47, 1.48
Message-ID: <20090921145035.729E011C0416@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3330

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
* Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-1
- Update to 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	7 Sep 2009 10:33:01 -0000	1.47
+++ .cvsignore	21 Sep 2009 14:50:35 -0000	1.48
@@ -1 +1 @@
-gvfs-1.3.6.tar.bz2
+gvfs-1.4.0.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- gvfs.spec	17 Sep 2009 06:27:44 -0000	1.155
+++ gvfs.spec	21 Sep 2009 14:50:35 -0000	1.156
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.3.6
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -20,7 +20,7 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: GConf2-devel
-BuildRequires: gnome-disk-utility-devel >= 0.5
+BuildRequires: gnome-disk-utility-devel >= 2.28.0
 BuildRequires: PolicyKit-devel
 # This is a hack until the xfce4-notifyd dependency issue is fixed
 # https://fedorahosted.org/rel-eng/ticket/1788
@@ -283,6 +283,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-1
+- Update to 1.4.0
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.3.6-2
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	7 Sep 2009 10:33:02 -0000	1.47
+++ sources	21 Sep 2009 14:50:35 -0000	1.48
@@ -1 +1 @@
-743f5ae84cd13273ee0197f4cfd6d5a9  gvfs-1.3.6.tar.bz2
+5c5086763873bbc6239af84722bf1afe  gvfs-1.4.0.tar.bz2



From mbarnes at fedoraproject.org  Mon Sep 21 14:54:50 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 21 Sep 2009 14:54:50 +0000 (UTC)
Subject: rpms/gnome-python2/devel gnome-python2.spec,1.38,1.39
Message-ID: <20090921145450.E9E2311C0043@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4721

Modified Files:
	gnome-python2.spec 
Log Message:
Fix files list.



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gnome-python2.spec	21 Sep 2009 14:45:19 -0000	1.38
+++ gnome-python2.spec	21 Sep 2009 14:54:50 -0000	1.39
@@ -192,9 +192,6 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomevfs
 %{python_sitearch}/gtk-2.0/gnome/vfs*
 %{_libdir}/gnome-vfs-2.0/modules/libpythonmethod.so
-%dir %{_datadir}/gtk-doc/
-%dir %{_datadir}/gtk-doc/html/
-%doc %{_datadir}/gtk-doc/html/pygnomevfs
 %defattr(644,root,root,755)
 %doc examples/vfs/*
 



From rdieter at fedoraproject.org  Mon Sep 21 14:54:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 14:54:56 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.291,1.292
Message-ID: <20090921145456.6EC2211C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4780

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
- own /var/run/kdm (#524583)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- kdebase-workspace.spec	14 Sep 2009 21:46:34 -0000	1.291
+++ kdebase-workspace.spec	21 Sep 2009 14:54:56 -0000	1.292
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -287,10 +287,12 @@ make install/fast DESTDIR=%{buildroot} -
 mkdir -p %{buildroot}%{_datadir}/xsessions/
 ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
 
-# FIXME/TODO: provide kdm config in kde-settings(-kdm)
-# nuke, use external kde-config-kdm
+# nuke, use external kde-settings-kdm
 rm -rf  %{buildroot}%{_kde4_configdir}/kdm
 
+# own /var/run/kdm
+mkdir -p %{buildroot}%{_localstatedir}/run/kdm
+
 # own %{_kde4_appsdir}/kdm/faces and set default user image
 mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
 pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
@@ -533,6 +535,7 @@ fi
 %{_kde4_appsdir}/doc/kdm/
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
+%attr(1777,root,root) %dir %{_localstatedir}/run/kdm
 
 %files -n ksysguardd
 %defattr(-,root,root,-)
@@ -590,6 +593,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- own /var/run/kdm (#524583)
+
 * Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
 



From hadess at fedoraproject.org  Mon Sep 21 14:59:38 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 14:59:38 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11
	0001-Update-gnome-volume-control-code-from-master.patch, 1.1,
	1.2 gnome-settings-daemon.spec, 1.111, 1.112
Message-ID: <20090921145939.1137011C0043@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6511

Modified Files:
	0001-Update-gnome-volume-control-code-from-master.patch 
	gnome-settings-daemon.spec 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-11
- Fix volume code's use of g_idle_add for reconnections
  (#524398)


0001-Update-gnome-volume-control-code-from-master.patch:
 cut-n-paste/gvc-channel-map.c         |  175 ++++++++++++++++++---
 cut-n-paste/gvc-channel-map.h         |   24 ++
 cut-n-paste/gvc-mixer-control.c       |  276 +++++++++++++++++++++++++++-------
 cut-n-paste/gvc-mixer-control.h       |    1 
 cut-n-paste/gvc-mixer-event-role.c    |   29 +--
 cut-n-paste/gvc-mixer-event-role.h    |    5 
 cut-n-paste/gvc-mixer-sink-input.c    |   40 ++--
 cut-n-paste/gvc-mixer-sink.c          |   53 +++---
 cut-n-paste/gvc-mixer-source-output.c |    6 
 cut-n-paste/gvc-mixer-source.c        |   48 ++---
 cut-n-paste/gvc-mixer-stream.c        |  225 ++++++++++++++++++++++++---
 cut-n-paste/gvc-mixer-stream.h        |   23 ++
 gsd-media-keys-manager.c              |   11 -
 13 files changed, 708 insertions(+), 208 deletions(-)

Index: 0001-Update-gnome-volume-control-code-from-master.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/0001-Update-gnome-volume-control-code-from-master.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Update-gnome-volume-control-code-from-master.patch	7 Sep 2009 15:02:29 -0000	1.1
+++ 0001-Update-gnome-volume-control-code-from-master.patch	21 Sep 2009 14:59:37 -0000	1.2
@@ -714,7 +714,7 @@ index e7dd18b..92b0286 100644
 -                g_warning ("Connection failed");
 +                g_warning ("Connection failed, reconnecting...");
 +                if (control->priv->reconnect_id == 0)
-+                        control->priv->reconnect_id = g_idle_add (idle_reconnect, control);
++                        control->priv->reconnect_id = g_timeout_add_seconds (5, idle_reconnect, control);
                  break;
  
          case PA_CONTEXT_TERMINATED:


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- gnome-settings-daemon.spec	7 Sep 2009 15:23:25 -0000	1.111
+++ gnome-settings-daemon.spec	21 Sep 2009 14:59:37 -0000	1.112
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -205,6 +205,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-11
+- Fix volume code's use of g_idle_add for reconnections
+  (#524398)
+
 * Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-10
 - Update volume code from 2.27
 



From michich at fedoraproject.org  Mon Sep 21 15:00:38 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 21 Sep 2009 15:00:38 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim.spec,1.36,1.37
Message-ID: <20090921150038.B14A611C0338@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7288

Modified Files:
	jabbim.spec 
Log Message:
* Mon Sep 21 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.11.svn20090907
- Enable devconsole plugin, it's useful for debugging.



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- jabbim.spec	17 Sep 2009 09:47:06 -0000	1.36
+++ jabbim.spec	21 Sep 2009 15:00:37 -0000	1.37
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.10.svn%{svndate}%{?dist}
+Release:	0.11.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -58,7 +58,7 @@ make clean
 # The current manpage is not useful.
 rm -r doc/
 # Remove addons which are unlikely to be included in 0.5 final.
-rm -r plugins/{dcoper,devconsole,festival,gpg,ibuddy,network-manager,styler}
+rm -r plugins/{dcoper,festival,gpg,ibuddy,network-manager,styler}
 rm -r sounds/{future,xylo}
 rm -r themes/{Grain,TmavoZeleny,rose}
 rm -r chatskins/grom_elegant_2
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.11.svn20090907
+- Enable devconsole plugin, it's useful for debugging.
+
 * Thu Sep 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.10.svn20090907
 - Fix a harmless traceback which abrt points out all the time.
   (jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, upstream)



From rdieter at fedoraproject.org  Mon Sep 21 15:01:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 15:01:04 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.63, 1.64 kde-settings.spec,
	1.89, 1.90 sources, 1.65, 1.66
Message-ID: <20090921150104.2F1DB11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7557

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-8
- kdmrc: use /var/run/kdm for pid/xauth (#524583)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	14 Sep 2009 13:20:17 -0000	1.63
+++ .cvsignore	21 Sep 2009 15:01:03 -0000	1.64
@@ -1 +1 @@
-kde-settings-4.3-7.tar.bz2
+kde-settings-4.3-8.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kde-settings.spec	14 Sep 2009 13:20:17 -0000	1.89
+++ kde-settings.spec	21 Sep 2009 15:01:04 -0000	1.90
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 7
+%define rel 8
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -79,6 +79,9 @@ tar cpf - etc/ usr/ | tar --directory %{
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
+# own /var/run/kdm
+mkdir -p %{buildroot}%{_localstatedir}/run/kdm
+
 
 %clean
 rm -rf %{buildroot}
@@ -143,6 +146,7 @@ touch --no-create %{_datadir}/kde-settin
 %{_sysconfdir}/kde/kdm/Xsetup
 # hack needed for older rpm's
 #exclude %{_sysconfdir}/X11/xdm/X*
+%attr(1777,root,root) %dir %{_localstatedir}/run/kdm
 
 %files pulseaudio
 %defattr(-,root,root,-)
@@ -150,6 +154,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-8
+- kdmrc: use /var/run/kdm for pid/xauth (#524583)
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-7
 - plasma-desktop-appletsrc: Constantine_Mosaico virus wallpaper default (#519320)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	14 Sep 2009 13:20:17 -0000	1.65
+++ sources	21 Sep 2009 15:01:04 -0000	1.66
@@ -1 +1 @@
-1f3b71dfd1a836e78214790ef48bed59  kde-settings-4.3-7.tar.bz2
+b866018fe345e9f977c97228c7a40048  kde-settings-4.3-8.tar.bz2



From rrakus at fedoraproject.org  Mon Sep 21 15:04:32 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon, 21 Sep 2009 15:04:32 +0000 (UTC)
Subject: rpms/librtas/devel librtas-1.3.4-libdir.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 librtas.spec, 1.17, 1.18 sources, 1.7,
	1.8 librtas-1.3.2-mode.patch, 1.1, NONE
Message-ID: <20090921150432.8E89E11C0043@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/librtas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8756

Modified Files:
	.cvsignore librtas.spec sources 
Added Files:
	librtas-1.3.4-libdir.patch 
Removed Files:
	librtas-1.3.2-mode.patch 
Log Message:
Upstream release 1.3.4

librtas-1.3.4-libdir.patch:
 rules.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE librtas-1.3.4-libdir.patch ---
diff -up librtas-1.3.4/rules.mk.libdir librtas-1.3.4/rules.mk
--- librtas-1.3.4/rules.mk.libdir	2009-09-21 16:41:57.000000000 +0200
+++ librtas-1.3.4/rules.mk	2009-09-21 16:42:01.000000000 +0200
@@ -135,7 +135,7 @@ define install_sbin
 endef
 
 define install_lib
-	$(call install_files,$1,755,$2/$(LIB_DIR)$(findstring 64,$(shell file $(firstword $1))))
+	$(call install_files,$1,755,$2/$(LIB_DIR))
 endef
 
 define install_inc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librtas/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Dec 2007 04:28:08 -0000	1.6
+++ .cvsignore	21 Sep 2009 15:04:31 -0000	1.7
@@ -1 +1 @@
-librtas-1.3.3.tar.gz
+librtas-1.3.4.tar.gz


Index: librtas.spec
===================================================================
RCS file: /cvs/extras/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- librtas.spec	25 Jul 2009 08:34:02 -0000	1.17
+++ librtas.spec	21 Sep 2009 15:04:31 -0000	1.18
@@ -1,14 +1,14 @@
 Summary: Libraries to provide access to RTAS calls and RTAS events
 Name:    librtas
-Version: 1.3.3
-Release: 5%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
 URL:     http://librtas.ozlabs.org
 License: IBM
 Group:   System Environment/Libraries
 
 Source: http://librtas.ozlabs.org/releases/%{name}-%{version}.tar.gz
 
-Patch0: %{name}-1.3.2-mode.patch
+Patch0: %{name}-1.3.4-libdir.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
@@ -37,12 +37,13 @@ developing programs using librtas.
 
 %prep
 %setup
-%patch0 -p1 -b .mode
+%patch0 -p1 -b .libdir
 
 %build
-%{__make} CFLAGS="%{optflags} -fPIC -DPIC" %{?_smp_mflags}
+%{__make} CFLAGS="%{optflags} -fPIC -DPIC -I." %{?_smp_mflags}
 
 %install
+mkdir -p %{buildroot}/%{_libdir}
 %{__make} install DESTDIR=%{buildroot} LIB_DIR=%{_libdir}
 %{__rm} -rf %{buildroot}%{_datadir}/doc
 
@@ -58,6 +59,7 @@ developing programs using librtas.
 %doc COPYRIGHT README Changelog
 %{_libdir}/librtas.so.%{version}
 %{_libdir}/librtasevent.so.%{version}
+%{_libdir}/libofdt.so.%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -67,8 +69,14 @@ developing programs using librtas.
 %{_includedir}/librtasevent.h
 %{_includedir}/librtasevent_v4.h
 %{_includedir}/librtasevent_v6.h
+%{_includedir}/common.h
+%{_includedir}/libofdt.h
+%{_libdir}/libofdt.so
 
 %changelog
+* Mon Sep 21 2009 Roman Rakus <rrakus at redhat.com> - 1.3.4-1
+- Upstream release 1.3.4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librtas/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Dec 2007 04:28:08 -0000	1.7
+++ sources	21 Sep 2009 15:04:31 -0000	1.8
@@ -1 +1 @@
-054b1bf15f6f8058e747dc913cd78834  librtas-1.3.3.tar.gz
+b3b0b29b63d0807ff2d9bfc27e3ee1d6  librtas-1.3.4.tar.gz


--- librtas-1.3.2-mode.patch DELETED ---



From tbzatek at fedoraproject.org  Mon Sep 21 15:09:48 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 21 Sep 2009 15:09:48 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.156,1.157
Message-ID: <20090921150948.359A611C0043@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11316

Modified Files:
	gvfs.spec 
Log Message:
Fix URL



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- gvfs.spec	21 Sep 2009 14:50:35 -0000	1.156
+++ gvfs.spec	21 Sep 2009 15:09:47 -0000	1.157
@@ -5,7 +5,7 @@ Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/gvfs/1.3/gvfs-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gvfs/1.4/gvfs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.21.2



From rdieter at fedoraproject.org  Mon Sep 21 15:14:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 15:14:06 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.64, 1.65 kde-settings.spec,
	1.90, 1.91 sources, 1.66, 1.67
Message-ID: <20090921151406.F061A11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13493

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-9
- kdmrc: ForceUserAuthDir=true (#524583)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	21 Sep 2009 15:01:03 -0000	1.64
+++ .cvsignore	21 Sep 2009 15:14:06 -0000	1.65
@@ -1 +1 @@
-kde-settings-4.3-8.tar.bz2
+kde-settings-4.3-9.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kde-settings.spec	21 Sep 2009 15:01:04 -0000	1.90
+++ kde-settings.spec	21 Sep 2009 15:14:06 -0000	1.91
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 8
+%define rel 9
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -154,6 +154,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-9
+- kdmrc: ForceUserAuthDir=true (#524583)
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-8
 - kdmrc: use /var/run/kdm for pid/xauth (#524583)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	21 Sep 2009 15:01:04 -0000	1.66
+++ sources	21 Sep 2009 15:14:06 -0000	1.67
@@ -1 +1 @@
-b866018fe345e9f977c97228c7a40048  kde-settings-4.3-8.tar.bz2
+0b05bc9755e2758cdf254c2ff9af8c2f  kde-settings-4.3-9.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 21 15:17:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 15:17:46 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.292,1.293
Message-ID: <20090921151746.9DE7111C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14768

Modified Files:
	kdebase-workspace.spec 
Log Message:
revert changes, put into kde-settings-kdm instead



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- kdebase-workspace.spec	21 Sep 2009 14:54:56 -0000	1.292
+++ kdebase-workspace.spec	21 Sep 2009 15:17:46 -0000	1.293
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 5%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -290,9 +290,6 @@ ln -s %{_kde4_appsdir}/kdm/sessions/kde.
 # nuke, use external kde-settings-kdm
 rm -rf  %{buildroot}%{_kde4_configdir}/kdm
 
-# own /var/run/kdm
-mkdir -p %{buildroot}%{_localstatedir}/run/kdm
-
 # own %{_kde4_appsdir}/kdm/faces and set default user image
 mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
 pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
@@ -535,7 +532,6 @@ fi
 %{_kde4_appsdir}/doc/kdm/
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
-%attr(1777,root,root) %dir %{_localstatedir}/run/kdm
 
 %files -n ksysguardd
 %defattr(-,root,root,-)
@@ -593,9 +589,6 @@ fi
 
 
 %changelog
-* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
-- own /var/run/kdm (#524583)
-
 * Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
 



From jjames at fedoraproject.org  Mon Sep 21 15:22:40 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 21 Sep 2009 15:22:40 +0000 (UTC)
Subject: rpms/expatmm/F-11 .cvsignore, 1.2, 1.3 expatmm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090921152240.AC0B111C0043@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/expatmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16233/F-11

Modified Files:
	.cvsignore expatmm.spec sources 
Log Message:
* Mon Sep 21 2009 Jerry James <loganjerry at gmail.com> - 1.0.2-1
- Update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expatmm/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 17:20:23 -0000	1.2
+++ .cvsignore	21 Sep 2009 15:22:40 -0000	1.3
@@ -1 +1 @@
-expatmm-1.0.1.tar.bz2
+expatmm-1.0.2.tar.bz2


Index: expatmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expatmm/F-11/expatmm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- expatmm.spec	13 May 2009 17:20:23 -0000	1.1
+++ expatmm.spec	21 Sep 2009 15:22:40 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           expatmm
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        C++ wrapper for the expat XML parser library
 
@@ -36,7 +36,9 @@ Libraries and header files for developin
 # We put everything in standard places, which varies from the upstream
 # pkgconfig file.
 sed -i -e 's|-L${exec_prefix}/lib -lexpatmm|-lexpatmm|' \
+       -e 's|1\.0\.1|1\.0\.2|' \
        -e '/Cflags/d' \
+       -e '/libdir/d' \
        expatmm.pc.in
 
 %build
@@ -82,5 +84,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/expatmm.pc
 
 %changelog
+* Mon Sep 21 2009 Jerry James <loganjerry at gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
 * Fri May  8 2009 Jerry James <loganjerry at gmail.com> - 1.0.1-1
 - Initial RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expatmm/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 17:20:23 -0000	1.2
+++ sources	21 Sep 2009 15:22:40 -0000	1.3
@@ -1 +1 @@
-a7b10528966d3f6a70bf33bdfba6727a  expatmm-1.0.1.tar.bz2
+7c2395133dabb7d1c018a78d45ebb6da  expatmm-1.0.2.tar.bz2



From jjames at fedoraproject.org  Mon Sep 21 15:22:40 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 21 Sep 2009 15:22:40 +0000 (UTC)
Subject: rpms/expatmm/devel .cvsignore, 1.2, 1.3 expatmm.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090921152240.E72EC11C0043@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/expatmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16233/devel

Modified Files:
	.cvsignore expatmm.spec sources 
Log Message:
* Mon Sep 21 2009 Jerry James <loganjerry at gmail.com> - 1.0.2-1
- Update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expatmm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 17:17:38 -0000	1.2
+++ .cvsignore	21 Sep 2009 15:22:40 -0000	1.3
@@ -1 +1 @@
-expatmm-1.0.1.tar.bz2
+expatmm-1.0.2.tar.bz2


Index: expatmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expatmm/devel/expatmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- expatmm.spec	24 Jul 2009 22:26:27 -0000	1.2
+++ expatmm.spec	21 Sep 2009 15:22:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           expatmm
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        C++ wrapper for the expat XML parser library
 
 Group:          System Environment/Libraries
@@ -36,7 +36,9 @@ Libraries and header files for developin
 # We put everything in standard places, which varies from the upstream
 # pkgconfig file.
 sed -i -e 's|-L${exec_prefix}/lib -lexpatmm|-lexpatmm|' \
+       -e 's|1\.0\.1|1\.0\.2|' \
        -e '/Cflags/d' \
+       -e '/libdir/d' \
        expatmm.pc.in
 
 %build
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/expatmm.pc
 
 %changelog
+* Mon Sep 21 2009 Jerry James <loganjerry at gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expatmm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 17:17:39 -0000	1.2
+++ sources	21 Sep 2009 15:22:40 -0000	1.3
@@ -1 +1 @@
-a7b10528966d3f6a70bf33bdfba6727a  expatmm-1.0.1.tar.bz2
+7c2395133dabb7d1c018a78d45ebb6da  expatmm-1.0.2.tar.bz2



From tbzatek at fedoraproject.org  Mon Sep 21 15:22:59 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 21 Sep 2009 15:22:59 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.100, 1.101 nautilus.spec, 1.287, 
	1.288 sources, 1.105, 1.106
Message-ID: <20090921152259.B647111C0043@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16455

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
* Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	7 Sep 2009 09:51:34 -0000	1.100
+++ .cvsignore	21 Sep 2009 15:22:59 -0000	1.101
@@ -1 +1 @@
-nautilus-2.27.92.tar.bz2
+nautilus-2.28.0.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- nautilus.spec	10 Sep 2009 03:44:15 -0000	1.287
+++ nautilus.spec	21 Sep 2009 15:22:59 -0000	1.288
@@ -14,11 +14,11 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.27.92
-Release:	2%{?dist}
+Version: 	2.28.0
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
-Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 
 URL: 		http://projects.gnome.org/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -256,6 +256,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-2
 - Fix desktop files to be valid
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- sources	7 Sep 2009 09:51:35 -0000	1.105
+++ sources	21 Sep 2009 15:22:59 -0000	1.106
@@ -1 +1 @@
-46b5677e652ec008bb9d611f402d9375  nautilus-2.27.92.tar.bz2
+14d9464043848eddd0bd0d35bbe63415  nautilus-2.28.0.tar.bz2



From leigh123linux at fedoraproject.org  Mon Sep 21 15:32:26 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 21 Sep 2009 15:32:26 +0000 (UTC)
Subject: rpms/gmixer/F-11 gmixer.desktop,1.4,1.5 gmixer.spec,1.4,1.5
Message-ID: <20090921153226.101DE11C0043@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20933

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
- remove X-Fedora from desktop file



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gmixer.desktop	21 Sep 2009 10:49:50 -0000	1.4
+++ gmixer.desktop	21 Sep 2009 15:32:25 -0000	1.5
@@ -10,6 +10,6 @@ Exec=gmixer
 Icon=gmixer
 StartupNotify=true
 Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;X-Fedora;
+Categories=AudioVideo;Audio;Mixer;GTK;
 X-Desktop-File-Install-Version=0.15
 


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-11/gmixer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gmixer.spec	21 Sep 2009 10:49:50 -0000	1.4
+++ gmixer.spec	21 Sep 2009 15:32:25 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
+- remove X-Fedora from desktop file
+
 * Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
 - added German translations for desktop files
 - revert last desktop file edit and add a autostart launcher



From leigh123linux at fedoraproject.org  Mon Sep 21 15:32:32 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 21 Sep 2009 15:32:32 +0000 (UTC)
Subject: rpms/gmixer/F-10 gmixer.desktop,1.4,1.5 gmixer.spec,1.4,1.5
Message-ID: <20090921153232.63D0511C0043@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21025

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
- remove X-Fedora from desktop file



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-10/gmixer.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gmixer.desktop	21 Sep 2009 10:51:46 -0000	1.4
+++ gmixer.desktop	21 Sep 2009 15:32:32 -0000	1.5
@@ -10,6 +10,6 @@ Exec=gmixer
 Icon=gmixer
 StartupNotify=true
 Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;X-Fedora;
+Categories=AudioVideo;Audio;Mixer;GTK;
 X-Desktop-File-Install-Version=0.15
 


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/F-10/gmixer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gmixer.spec	21 Sep 2009 10:51:46 -0000	1.4
+++ gmixer.spec	21 Sep 2009 15:32:32 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
+- remove X-Fedora from desktop file
+
 * Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-8
 - added German translations for desktop files
 - revert last desktop file edit and add a autostart launcher



From leigh123linux at fedoraproject.org  Mon Sep 21 15:32:35 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 21 Sep 2009 15:32:35 +0000 (UTC)
Subject: rpms/gmixer/devel gmixer.desktop,1.4,1.5 gmixer.spec,1.6,1.7
Message-ID: <20090921153235.5C99C11C0043@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/gmixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21074

Modified Files:
	gmixer.desktop gmixer.spec 
Log Message:
* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-11
- remove X-Fedora from desktop file



Index: gmixer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/devel/gmixer.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gmixer.desktop	21 Sep 2009 10:38:45 -0000	1.4
+++ gmixer.desktop	21 Sep 2009 15:32:35 -0000	1.5
@@ -10,6 +10,6 @@ Exec=gmixer
 Icon=gmixer
 StartupNotify=true
 Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;X-Fedora;
+Categories=AudioVideo;Audio;Mixer;GTK;
 X-Desktop-File-Install-Version=0.15
 


Index: gmixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmixer/devel/gmixer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gmixer.spec	21 Sep 2009 10:38:45 -0000	1.6
+++ gmixer.spec	21 Sep 2009 15:32:35 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -85,6 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-11
+- remove X-Fedora from desktop file
+
+* Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-10
+- remove
+
 * Mon Sep 21 2009 leigh scott <leigh123linux at googlemail.com> - 1.3-9
 - added German translations for desktop files
 - revert last desktop file edit and add a autostart launcher



From markmc at fedoraproject.org  Mon Sep 21 15:32:34 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 21 Sep 2009 15:32:34 +0000 (UTC)
Subject: rpms/libvirt/devel
	libvirt-fix-drv-supports-feature-bogus-error.patch, 
	NONE, 1.1 libvirt-fix-qemu-raw-format-save.patch, NONE,
	1.1 libvirt-fix-net-hotunplug-double-free.patch, 1.2,
	1.3 libvirt-fix-pci-hostdev-hotunplug-leak.patch, 1.2,
	1.3 libvirt.spec, 1.181, 1.182
Message-ID: <20090921153234.ADDCE11C0043@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054

Modified Files:
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch libvirt.spec 
Added Files:
	libvirt-fix-drv-supports-feature-bogus-error.patch 
	libvirt-fix-qemu-raw-format-save.patch 
Log Message:
* Mon Sep 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-5
- Don't set a bogus error in virDrvSupportsFeature()
- Fix raw save format


libvirt-fix-drv-supports-feature-bogus-error.patch:
 libvirt.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-fix-drv-supports-feature-bogus-error.patch ---
>From 2f6e857ac7d6ed5cd417e684147dd9c98775ab3d Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance at redhat.com>
Date: Mon, 21 Sep 2009 14:53:31 +0200
Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.

Signed-off-by: Chris Lalancette <clalance at redhat.com>
Fedora-patch: libvirt-fix-drv-supports-feature-bogus-error.patch
---
 src/libvirt.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libvirt.c b/src/libvirt.c
index 4a11688..fa59dc7 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1349,8 +1349,11 @@ virDrvSupportsFeature (virConnectPtr conn, int feature)
     }
 
     ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature);
-    /* Copy to connection error object for back compatability */
-    virSetConnError(conn);
+
+    if (ret < 0)
+        /* Copy to connection error object for back compatability */
+        virSetConnError(conn);
+
     return ret;
 }
 
-- 
1.6.2.5


libvirt-fix-qemu-raw-format-save.patch:
 qemu_driver.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE libvirt-fix-qemu-raw-format-save.patch ---
>From e50c91fdcea5d81e3eb2051c05f4e51a16c3e692 Mon Sep 17 00:00:00 2001
From: Charles Duffy <Charles_Duffy at dell.com>
Date: Fri, 18 Sep 2009 11:32:35 -0500
Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw

Fedora-patch: libvirt-fix-qemu-raw-format-save.patch
---
 src/qemu_driver.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 2ddcdc0..7c7b985 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -3905,17 +3905,25 @@ static int qemudDomainSave(virDomainPtr dom,
         goto cleanup;
     }
 
-    const char *prog = qemudSaveCompressionTypeToString(header.compressed);
-    if (prog == NULL) {
-        qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
-                         _("Invalid compress format %d"), header.compressed);
-        goto cleanup;
-    }
+    {
+        const char *prog = qemudSaveCompressionTypeToString(header.compressed);
+        const char *args;
 
-    if (STREQ (prog, "raw"))
-        prog = "cat";
-    internalret = virAsprintf(&command, "migrate \"exec:"
-                              "%s -c >> '%s' 2>/dev/null\"", prog, safe_path);
+        if (prog == NULL) {
+            qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
+                             _("Invalid compress format %d"), header.compressed);
+            goto cleanup;
+        }
+
+        if (STREQ (prog, "raw")) {
+            prog = "cat";
+            args = "";
+        } else {
+            args = "-c";
+        }
+        internalret = virAsprintf(&command, "migrate \"exec:"
+                                  "%s %s >> '%s' 2>/dev/null\"", prog, args, safe_path);
+    }
 
     if (internalret < 0) {
         virReportOOMError(dom->conn);
-- 
1.6.2.5


libvirt-fix-net-hotunplug-double-free.patch:
 qemu_driver.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: libvirt-fix-net-hotunplug-double-free.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-net-hotunplug-double-free.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvirt-fix-net-hotunplug-double-free.patch	17 Sep 2009 14:51:05 -0000	1.2
+++ libvirt-fix-net-hotunplug-double-free.patch	21 Sep 2009 15:32:34 -0000	1.3
@@ -1,4 +1,4 @@
-From 18067a3cde7183fd17eea199fac2e49edfe1cb22 Mon Sep 17 00:00:00 2001
+From d09ff3c35c29d14760d5ea03559042cc024e09ab Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:31:08 +0100
 Subject: [PATCH] Fix net/disk hot-unplug segfault
@@ -12,6 +12,8 @@ Reported by Michal Nowak here:
 
 * src/qemu_driver.c: fix double free
 
+(cherry-picked from commit 8881ae1bf8783006777429403cc543c33187175d)
+
 Fedora-patch: libvirt-fix-net-hotunplug-double-free.patch
 ---
  src/qemu_driver.c |    4 ++--

libvirt-fix-pci-hostdev-hotunplug-leak.patch:
 qemu_driver.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Index: libvirt-fix-pci-hostdev-hotunplug-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-pci-hostdev-hotunplug-leak.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvirt-fix-pci-hostdev-hotunplug-leak.patch	17 Sep 2009 14:51:05 -0000	1.2
+++ libvirt-fix-pci-hostdev-hotunplug-leak.patch	21 Sep 2009 15:32:34 -0000	1.3
@@ -1,4 +1,4 @@
-From 9ef0cb152e92db1aa87d89529812328935c8535a Mon Sep 17 00:00:00 2001
+From d04ac8624f5fabe7587982796f2e2161220b0fcc Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:32:45 +0100
 Subject: [PATCH] Fix leak in PCI hostdev hot-unplug
@@ -6,6 +6,8 @@ Subject: [PATCH] Fix leak in PCI hostdev
 * src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net
   code.
 
+(cherry-picked from commit a70da51ff76ed860bfc0cdee2e1d556da997c557)
+
 Fedora-patch: libvirt-fix-pci-hostdev-hotunplug-leak.patch
 ---
  src/qemu_driver.c |   20 +++++++++++++-------


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- libvirt.spec	17 Sep 2009 14:58:55 -0000	1.181
+++ libvirt.spec	21 Sep 2009 15:32:34 -0000	1.182
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 4%{?dist}%{?extra_release}
+Release: 5%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -164,6 +164,12 @@ Patch00: libvirt-0.6.4-svirt-sound.patch
 Patch01: libvirt-fix-net-hotunplug-double-free.patch
 Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
 
+# Don't set a bogus error in virDrvSupportsFeature()
+Patch03: libvirt-fix-drv-supports-feature-bogus-error.patch
+
+# Fix raw save format
+Patch04: libvirt-fix-qemu-raw-format-save.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -379,6 +385,8 @@ of recent versions of Linux (and other O
 %patch00 -p1
 %patch01 -p1
 %patch02 -p1
+%patch03 -p1
+%patch04 -p1
 
 %build
 %if ! %{with_xen}
@@ -769,6 +777,10 @@ fi
 %endif
 
 %changelog
+* Mon Sep 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-5
+- Don't set a bogus error in virDrvSupportsFeature()
+- Fix raw save format
+
 * Thu Sep 17 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-4
 - A couple of hot-unplug memory handling fixes (#523953)
 



From cwickert at fedoraproject.org  Mon Sep 21 15:44:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Sep 2009 15:44:31 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xfce4-dev-tools.spec, 1.14, 1.15
Message-ID: <20090921154432.0022511C0043@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dev-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26959

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
* Mon Sep 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
- Update to 4.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 Sep 2009 02:56:37 -0000	1.10
+++ .cvsignore	21 Sep 2009 15:44:31 -0000	1.11
@@ -1 +1 @@
-xfce4-dev-tools-4.7.1.tar.bz2
+xfce4-dev-tools-4.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 Sep 2009 02:56:37 -0000	1.10
+++ sources	21 Sep 2009 15:44:31 -0000	1.11
@@ -1 +1 @@
-9841ccb2e0c2ca8a56d6eeabc54bb569  xfce4-dev-tools-4.7.1.tar.bz2
+b76d6b7548b4bf248a4af9b0dbdf34e8  xfce4-dev-tools-4.7.2.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-dev-tools.spec	20 Sep 2009 02:56:37 -0000	1.14
+++ xfce4-dev-tools.spec	21 Sep 2009 15:44:31 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		xfce4-dev-tools
-Version:	4.7.1
+Version:	4.7.2
 Release:	1%{?dist}
 Summary:	Xfce developer tools
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Sep 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
 * Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.1-1
 - Update to 4.7.1
 



From prajnoha at fedoraproject.org  Mon Sep 21 15:47:01 2009
From: prajnoha at fedoraproject.org (Peter Rajnoha)
Date: Mon, 21 Sep 2009 15:47:01 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.179,1.180
Message-ID: <20090921154701.C533011C0043@cvs1.fedora.phx.redhat.com>

Author: prajnoha

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28025/devel

Modified Files:
	lvm2.spec 
Log Message:
Include /lib/udev/rules.d directory in the package.



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- lvm2.spec	21 Sep 2009 12:20:59 -0000	1.179
+++ lvm2.spec	21 Sep 2009 15:47:01 -0000	1.180
@@ -57,7 +57,8 @@ or more physical volumes and creating on
 %define _bindir /bin
 %define _sbindir /sbin
 %define _libdir /%{_lib}
-%define _udevdir /%{_lib}/udev/rules.d
+%define _udevbasedir /lib/udev
+%define _udevdir %{_udevbasedir}/rules.d
 
 %configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync
 
@@ -296,6 +297,8 @@ for the kernel device-mapper.
 %doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL
 %attr(755,root,root) /sbin/dmsetup
 %{_mandir}/man8/dmsetup.8.gz
+%dir %{_udevbasedir}
+%dir %{_udevdir}
 %{_udevdir}/10-dm.rules
 %{_udevdir}/12-dm-disk.rules
 %{_udevdir}/95-dm-notify.rules
@@ -394,11 +397,11 @@ the device-mapper event library.
 
 %changelog
 * Mon Sep 21 2009 Peter Rajnoha <prajnoha at redhat.com> - 2.02.52-3
-- Enable udev synchronisation code
-- Install default udev rules for device-mapper and LVM2
-- Add BuildRequires: libudev-devel
-- Add Requires: libudev (to check udev is running)
-- Add Requires: util-linux-ng (blkid used in udev rules)
+- Enable udev synchronisation code.
+- Install default udev rules for device-mapper and LVM2.
+- Add BuildRequires: libudev-devel.
+- Add Requires: libudev (to check udev is running).
+- Add Requires: util-linux-ng (blkid used in udev rules).
 
 * Wed Sep 16 2009 Alasdair Kergon <agk at redhat.com> - 2.02.52-2
 - Build dmeventd and place into a separate set of subpackages.



From than at fedoraproject.org  Mon Sep 21 15:47:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 21 Sep 2009 15:47:17 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-drkonq.patch, NONE,
	1.1 kdelibs.spec, 1.516, 1.517
Message-ID: <20090921154717.B423511C0043@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28427

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-drkonq.patch 
Log Message:
use abrt for RHEL



kdelibs-4.3.1-drkonq.patch:
 kcrash.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-drkonq.patch ---
diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
--- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig	2009-09-21 17:42:19.000000000 +0200
+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp	2009-09-21 17:43:44.000000000 +0200
@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
 static char *s_appPath = 0;
 static char *s_drkonqiPath = 0;
 static KCrash::CrashFlags s_flags = 0;
-static bool s_launchDrKonqi = true;
+static bool s_launchDrKonqi = false;
 
 namespace KCrash
 {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -p -r1.516 -r1.517
--- kdelibs.spec	19 Sep 2009 06:20:04 -0000	1.516
+++ kdelibs.spec	21 Sep 2009 15:47:17 -0000	1.517
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -77,6 +77,7 @@ Patch21: kdelibs-4.3.1-ossl-1.x.patch
 Patch22: kdelibs-4.3.0-bookmarks.patch
 # http://bugs.kde.org/186763
 Patch23: kdelibs-4.3.1-kde186763.patch
+Patch24: kdelibs-4.3.1-drkonq.patch
 
 # upstream
 # 4.3 branch
@@ -197,6 +198,9 @@ format for easy browsing.
 %patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
 %patch23 -p1 -b .kde186763
+%if 0%{?rhel} > 5
+%patch24 -p1 -b .drkonq
+%endif
 
 # upstream patches
 # 4.3
@@ -388,6 +392,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- use abrt for RHEL
+
 * Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
 - groupdav connect to egroupware failed (kde#186763)
 



From harald at fedoraproject.org  Mon Sep 21 15:48:28 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 21 Sep 2009 15:48:28 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.14, 1.15 dracut.spec, 1.29,
	1.30 sources, 1.15, 1.16
Message-ID: <20090921154828.84B8011C0043@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28937

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Mon Sep 21 2009 Harald Hoyer <harald at redhat.com> 002-3
- bail out if selinux policy could not be loaded and 
  selinux=0 not specified on kernel command line 
  (bug #524113)
- set finished criteria for dmsquash live images



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Sep 2009 10:42:57 -0000	1.14
+++ .cvsignore	21 Sep 2009 15:48:28 -0000	1.15
@@ -1 +1 @@
-dracut-002-c53acc30.tar.bz2
+dracut-002-8eb16b08.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- dracut.spec	18 Sep 2009 10:41:20 -0000	1.29
+++ dracut.spec	21 Sep 2009 15:48:28 -0000	1.30
@@ -1,4 +1,4 @@
-%define gittag c53acc30
+%define gittag 8eb16b08
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 2%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 21 2009 Harald Hoyer <harald at redhat.com> 002-3
+- bail out if selinux policy could not be loaded and 
+  selinux=0 not specified on kernel command line 
+  (bug #524113)
+- set finished criteria for dmsquash live images
+
 * Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
 - do not cleanup dmraids
 - copy over lvm.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Sep 2009 10:42:57 -0000	1.15
+++ sources	21 Sep 2009 15:48:28 -0000	1.16
@@ -1 +1 @@
-d0d8a2cad127d678e1fd9da5553674f4  dracut-002-c53acc30.tar.bz2
+6f85d54893a0bdb16273b61a9b5d9582  dracut-002-8eb16b08.tar.bz2



From harald at fedoraproject.org  Mon Sep 21 15:49:08 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 21 Sep 2009 15:49:08 +0000 (UTC)
Subject: rpms/dracut/F-11 dracut.spec,1.14,1.15 sources,1.13,1.14
Message-ID: <20090921154908.48F1111C0043@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29197

Modified Files:
	dracut.spec sources 
Log Message:
* Mon Sep 21 2009 Harald Hoyer <harald at redhat.com> 002-3
- bail out if selinux policy could not be loaded and 
  selinux=0 not specified on kernel command line 
  (bug #524113)
- set finished criteria for dmsquash live images



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dracut.spec	18 Sep 2009 10:54:22 -0000	1.14
+++ dracut.spec	21 Sep 2009 15:49:08 -0000	1.15
@@ -1,4 +1,4 @@
-%define gittag c53acc30
+%define gittag 8eb16b08
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 2%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 21 2009 Harald Hoyer <harald at redhat.com> 002-3
+- bail out if selinux policy could not be loaded and 
+  selinux=0 not specified on kernel command line 
+  (bug #524113)
+- set finished criteria for dmsquash live images
+
 * Fri Sep 18 2009 Harald Hoyer <harald at redhat.com> 002-2
 - do not cleanup dmraids
 - copy over lvm.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	18 Sep 2009 10:54:22 -0000	1.13
+++ sources	21 Sep 2009 15:49:08 -0000	1.14
@@ -1 +1 @@
-d0d8a2cad127d678e1fd9da5553674f4  dracut-002-c53acc30.tar.bz2
+6f85d54893a0bdb16273b61a9b5d9582  dracut-002-8eb16b08.tar.bz2



From jkratoch at fedoraproject.org  Mon Sep 21 15:49:37 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 21 Sep 2009 15:49:37 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.8.50.20090921-upstream.patch, NONE,
	1.1 .cvsignore, 1.39, 1.40 gdb-6.3-pie-20050110.patch, 1.23,
	1.24 gdb-archer.patch, 1.30, 1.31 gdb.spec, 1.385, 1.386 sources,
	1.38, 1.39
Message-ID: <20090921154937.2878011C0043@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29423

Modified Files:
	.cvsignore gdb-6.3-pie-20050110.patch gdb-archer.patch 
	gdb.spec sources 
Added Files:
	gdb-6.8.50.20090921-upstream.patch 
Log Message:
* Mon Sep 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090921-1
- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090921
- archer-jankratochvil-fedora12 commit: 0d5c38dd89050c0ee1cf049656f177c170d675d4
  - [expr] Check has_stack_frames before calling find_pc_line (Sami Wagiaalla).


gdb-6.8.50.20090921-upstream.patch:
 ChangeLog                               |   56 ++++++++++++
 amd64-linux-tdep.c                      |  146 ++++++++++++++++++++++++++------
 c-lang.c                                |    2 
 gdbarch.c                               |   33 +++++++
 gdbarch.h                               |    9 +
 gdbarch.sh                              |    4 
 i386-linux-tdep.c                       |   72 +++++++++++++++
 python/py-value.c                       |   13 ++
 record.c                                |   92 +++++++++++++++++---
 testsuite/ChangeLog                     |   15 +++
 testsuite/gdb.python/py-prettyprint.exp |   16 +++
 testsuite/gdb.python/py-value.c         |   15 +++
 testsuite/gdb.python/py-value.exp       |   74 ++++++++++++++++
 13 files changed, 505 insertions(+), 42 deletions(-)

--- NEW FILE gdb-6.8.50.20090921-upstream.patch ---
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.10874.2.11
retrieving revision 1.10874.2.12
diff -u -r1.10874.2.11 -r1.10874.2.12
--- src/gdb/ChangeLog	2009/09/19 16:36:08	1.10874.2.11
+++ src/gdb/ChangeLog	2009/09/21 06:57:02	1.10874.2.12
@@ -1,3 +1,47 @@
+2009-09-21  Hui Zhu  <teawater at gmail.com>
+	    Michael Snyder  <msnyder at vmware.com>
+
+	* amd64-linux-tdep.c (amd64_all_but_ip_registers_record): New
+	function.
+	(amd64_linux_syscall_record): Call
+	amd64_all_but_ip_registers_record if syscall is
+	sys_rt_sigreturn.
+	(AMD64_LINUX_redzone, AMD64_LINUX_xstate,
+	AMD64_LINUX_frame_size): New macros.
+	(amd64_linux_record_signal): New function.
+	(amd64_linux_init_abi): Call set_gdbarch_process_record_signal.
+
+2009-09-21  Hui Zhu  <teawater at gmail.com>
+	    Michael Snyder  <msnyder at vmware.com>
+
+	* i386-linux-tdep.c (i386_all_but_ip_registers_record): New
+	function.
+	(i386_linux_intx80_sysenter_record): Call
+	i386_all_but_ip_registers_record if syscall is sys_sigreturn
+	or sys_rt_sigreturn.
+	(I386_LINUX_xstate, I386_LINUX_frame_size): New macros.
+	(i386_linux_record_signal): New function.
+	(i386_linux_init_abi): Call set_gdbarch_process_record_signal.
+
+2009-09-21  Hui Zhu  <teawater at gmail.com>
+	    Michael Snyder  <msnyder at vmware.com>
+
+	* record.c (record_end_entry): New struct.
+	(record_type): Add end.
+	(record_arch_list_add_end): Set rec->u.end.sigval to
+	TARGET_SIGNAL_0.
+	(record_message_args): New struct.
+	(record_message): Call gdbarch_process_record_signal.
+	(do_record_message): Add argument "signal".
+	(record_resume): Ditto.
+	(record_wait): Ditto.  Check record_list->u.end.sigval
+	in replay mode.
+
+2009-09-21  Hui Zhu  <teawater at gmail.com>
+	    Michael Snyder  <msnyder at vmware.com>
+
+	* gdbarch.sh (process_record_signal): New interface.
+
 2009-09-19  Maxim Grigoriev  <maxim2405 at gmail.com>
 
 	* xtensa-tdep.c (call0_analyze_prologue): Replace INT_MAX by UNIT_MAX.
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.sh,v
retrieving revision 1.496
retrieving revision 1.496.2.1
diff -u -r1.496 -r1.496.2.1
--- src/gdb/gdbarch.sh	2009/09/15 03:30:05	1.496
+++ src/gdb/gdbarch.sh	2009/09/21 06:57:02	1.496.2.1
@@ -709,6 +709,10 @@
 # Return -1 if something goes wrong, 0 otherwise.
 M:int:process_record:struct regcache *regcache, CORE_ADDR addr:regcache, addr
 
+# Save process state after a signal.
+# Return -1 if something goes wrong, 0 otherwise.
+M:int:process_record_signal:struct regcache *regcache, enum target_signal signal:regcache, signal
+
 # Signal translation: translate inferior's signal (host's) number into
 # GDB's representation.
 m:enum target_signal:target_signal_from_host:int signo:signo::default_target_signal_from_host::0
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.c,v
retrieving revision 1.453
retrieving revision 1.453.2.1
diff -u -r1.453 -r1.453.2.1
--- src/gdb/gdbarch.c	2009/09/15 03:30:05	1.453
+++ src/gdb/gdbarch.c	2009/09/21 06:57:02	1.453.2.1
@@ -240,6 +240,7 @@
   gdbarch_static_transform_name_ftype *static_transform_name;
   int sofun_address_maybe_missing;
   gdbarch_process_record_ftype *process_record;
+  gdbarch_process_record_signal_ftype *process_record_signal;
   gdbarch_target_signal_from_host_ftype *target_signal_from_host;
   gdbarch_target_signal_to_host_ftype *target_signal_to_host;
   gdbarch_get_siginfo_type_ftype *get_siginfo_type;
@@ -378,6 +379,7 @@
   0,  /* static_transform_name */
   0,  /* sofun_address_maybe_missing */
   0,  /* process_record */
+  0,  /* process_record_signal */
   default_target_signal_from_host,  /* target_signal_from_host */
   default_target_signal_to_host,  /* target_signal_to_host */
   0,  /* get_siginfo_type */
@@ -635,6 +637,7 @@
   /* Skip verify of static_transform_name, has predicate */
   /* Skip verify of sofun_address_maybe_missing, invalid_p == 0 */
   /* Skip verify of process_record, has predicate */
+  /* Skip verify of process_record_signal, has predicate */
   /* Skip verify of target_signal_from_host, invalid_p == 0 */
   /* Skip verify of target_signal_to_host, invalid_p == 0 */
   /* Skip verify of get_siginfo_type, has predicate */
@@ -971,6 +974,12 @@
                       "gdbarch_dump: process_record = <%s>\n",
                       host_address_to_string (gdbarch->process_record));
   fprintf_unfiltered (file,
+                      "gdbarch_dump: gdbarch_process_record_signal_p() = %d\n",
+                      gdbarch_process_record_signal_p (gdbarch));
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: process_record_signal = <%s>\n",
+                      host_address_to_string (gdbarch->process_record_signal));
+  fprintf_unfiltered (file,
                       "gdbarch_dump: ps_regnum = %s\n",
                       plongest (gdbarch->ps_regnum));
   fprintf_unfiltered (file,
@@ -3307,6 +3316,30 @@
   gdbarch->process_record = process_record;
 }
 
+int
+gdbarch_process_record_signal_p (struct gdbarch *gdbarch)
+{
+  gdb_assert (gdbarch != NULL);
+  return gdbarch->process_record_signal != NULL;
+}
+
+int
+gdbarch_process_record_signal (struct gdbarch *gdbarch, struct regcache *regcache, enum target_signal signal)
+{
+  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch->process_record_signal != NULL);
+  if (gdbarch_debug >= 2)
+    fprintf_unfiltered (gdb_stdlog, "gdbarch_process_record_signal called\n");
+  return gdbarch->process_record_signal (gdbarch, regcache, signal);
+}
+
+void
+set_gdbarch_process_record_signal (struct gdbarch *gdbarch,
+                                   gdbarch_process_record_signal_ftype process_record_signal)
+{
+  gdbarch->process_record_signal = process_record_signal;
+}
+
 enum target_signal
 gdbarch_target_signal_from_host (struct gdbarch *gdbarch, int signo)
 {
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.h,v
retrieving revision 1.403
retrieving revision 1.403.2.1
diff -u -r1.403 -r1.403.2.1
--- src/gdb/gdbarch.h	2009/09/15 03:30:05	1.403
+++ src/gdb/gdbarch.h	2009/09/21 06:57:02	1.403.2.1
@@ -822,6 +822,15 @@
 extern int gdbarch_process_record (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR addr);
 extern void set_gdbarch_process_record (struct gdbarch *gdbarch, gdbarch_process_record_ftype *process_record);
 
+/* Save process state after a signal.
+   Return -1 if something goes wrong, 0 otherwise. */
+
+extern int gdbarch_process_record_signal_p (struct gdbarch *gdbarch);
+
+typedef int (gdbarch_process_record_signal_ftype) (struct gdbarch *gdbarch, struct regcache *regcache, enum target_signal signal);
+extern int gdbarch_process_record_signal (struct gdbarch *gdbarch, struct regcache *regcache, enum target_signal signal);
+extern void set_gdbarch_process_record_signal (struct gdbarch *gdbarch, gdbarch_process_record_signal_ftype *process_record_signal);
+
 /* Signal translation: translate inferior's signal (host's) number into
    GDB's representation. */
 
===================================================================
RCS file: /cvs/src/src/gdb/record.c,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- src/gdb/record.c	2009/09/08 00:50:42	1.17
+++ src/gdb/record.c	2009/09/21 06:57:03	1.17.2.1
@@ -59,6 +59,11 @@
   gdb_byte *val;
 };
 
+struct record_end_entry
+{
+  enum target_signal sigval;
+};
+
 enum record_type
 {
   record_end = 0,
@@ -77,6 +82,8 @@
     struct record_reg_entry reg;
     /* mem */
     struct record_mem_entry mem;
+    /* end */
+    struct record_end_entry end;
   } u;
 };
 
@@ -314,6 +321,7 @@
   rec->prev = NULL;
   rec->next = NULL;
   rec->type = record_end;
+  rec->u.end.sigval = TARGET_SIGNAL_0;
 
   record_arch_list_add (rec);
 
@@ -360,11 +368,17 @@
   record_list_release (record_arch_list_tail);
 }
 
+struct record_message_args {
+  struct regcache *regcache;
+  enum target_signal signal;
+};
+
 static int
 record_message (void *args)
 {
   int ret;
-  struct regcache *regcache = args;
+  struct record_message_args *myargs = args;
+  struct gdbarch *gdbarch = get_regcache_arch (myargs->regcache);
   struct cleanup *old_cleanups = make_cleanup (record_message_cleanups, 0);
 
   record_arch_list_head = NULL;
@@ -373,9 +387,44 @@
   /* Check record_insn_num.  */
   record_check_insn_num (1);
 
-  ret = gdbarch_process_record (get_regcache_arch (regcache),
-				regcache,
-				regcache_read_pc (regcache));
+  /* If gdb sends a signal value to target_resume,
+     save it in the 'end' field of the previous instruction.
+
+     Maybe process record should record what really happened,
+     rather than what gdb pretends has happened.
+
+     So if Linux delivered the signal to the child process during
+     the record mode, we will record it and deliver it again in
+     the replay mode.
+
+     If user says "ignore this signal" during the record mode, then
+     it will be ignored again during the replay mode (no matter if
+     the user says something different, like "deliver this signal"
+     during the replay mode).
+
+     User should understand that nothing he does during the replay
+     mode will change the behavior of the child.  If he tries,
+     then that is a user error.
+
+     But we should still deliver the signal to gdb during the replay,
+     if we delivered it during the recording.  Therefore we should
+     record the signal during record_wait, not record_resume.  */
+  if (record_list != &record_first)    /* FIXME better way to check */
+    {
+      gdb_assert (record_list->type == record_end);
+      record_list->u.end.sigval = myargs->signal;
+    }
+
+  if (myargs->signal == TARGET_SIGNAL_0
+      || !gdbarch_process_record_signal_p (gdbarch))
+    ret = gdbarch_process_record (gdbarch,
+				  myargs->regcache,
+				  regcache_read_pc (myargs->regcache));
+  else
+    ret = gdbarch_process_record_signal (gdbarch,
+					 myargs->regcache,
+					 myargs->signal);
+
   if (ret > 0)
     error (_("Process record: inferior program stopped."));
   if (ret < 0)
@@ -396,9 +445,14 @@
 }
 
 static int
-do_record_message (struct regcache *regcache)
+do_record_message (struct regcache *regcache,
+		   enum target_signal signal)
 {
-  return catch_errors (record_message, regcache, NULL, RETURN_MASK_ALL);
+  struct record_message_args args;
+
+  args.regcache = regcache;
+  args.signal = signal;
+  return catch_errors (record_message, &args, NULL, RETURN_MASK_ALL);
 }
 
 /* Set to 1 if record_store_registers and record_xfer_partial
@@ -520,13 +574,13 @@
 
 static void
 record_resume (struct target_ops *ops, ptid_t ptid, int step,
-               enum target_signal siggnal)
+               enum target_signal signal)
 {
   record_resume_step = step;
 
   if (!RECORD_IS_REPLAY)
     {
-      if (do_record_message (get_current_regcache ()))
+      if (do_record_message (get_current_regcache (), signal))
         {
           record_resume_error = 0;
         }
@@ -536,7 +590,7 @@
           return;
         }
       record_beneath_to_resume (record_beneath_to_resume_ops, ptid, 1,
-                                siggnal);
+                                signal);
     }
 }
 
@@ -611,15 +665,16 @@
 	      ret = record_beneath_to_wait (record_beneath_to_wait_ops,
 					    ptid, status, options);
 
+	      /* Is this a SIGTRAP?  */
 	      if (status->kind == TARGET_WAITKIND_STOPPED
 		  && status->value.sig == TARGET_SIGNAL_TRAP)
 		{
-		  /* Check if there is a breakpoint.  */
+		  /* Yes -- check if there is a breakpoint.  */
 		  registers_changed ();
 		  tmp_pc = regcache_read_pc (get_current_regcache ());
 		  if (breakpoint_inserted_here_p (tmp_pc))
 		    {
-		      /* There is a breakpoint.  */
+		      /* There is a breakpoint.  GDB will want to stop.  */
 		      CORE_ADDR decr_pc_after_break =
 			gdbarch_decr_pc_after_break
 			(get_regcache_arch (get_current_regcache ()));
@@ -631,8 +686,12 @@
 		    }
 		  else
 		    {
-		      /* There is not a breakpoint.  */
-		      if (!do_record_message (get_current_regcache ()))
+		      /* There is not a breakpoint, and gdb is not
+		         stepping, therefore gdb will not stop.
+			 Therefore we will not return to gdb.
+		         Record the insn and resume.  */
+		      if (!do_record_message (get_current_regcache (),
+					      TARGET_SIGNAL_0))
 			{
                           break;
 			}
@@ -827,6 +886,10 @@
 					   gdbarch_decr_pc_after_break (gdbarch));
 		      continue_flag = 0;
 		    }
+		  /* Check target signal */
+		  if (record_list->u.end.sigval != TARGET_SIGNAL_0)
+		    /* FIXME: better way to check */
+		    continue_flag = 0;
 		}
 	    }
 
@@ -851,6 +914,9 @@
 replay_out:
       if (record_get_sig)
 	status->value.sig = TARGET_SIGNAL_INT;
+      else if (record_list->u.end.sigval != TARGET_SIGNAL_0)
+	/* FIXME: better way to check */
+	status->value.sig = record_list->u.end.sigval;
       else
 	status->value.sig = TARGET_SIGNAL_TRAP;
 
===================================================================
RCS file: /cvs/src/src/gdb/i386-linux-tdep.c,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -u -r1.68 -r1.68.2.1
--- src/gdb/i386-linux-tdep.c	2009/09/15 03:30:06	1.68
+++ src/gdb/i386-linux-tdep.c	2009/09/21 06:57:03	1.68.2.1
@@ -358,7 +358,32 @@
   regcache_cooked_write_unsigned (regcache, I386_LINUX_ORIG_EAX_REGNUM, -1);
 }
 
-static struct linux_record_tdep i386_linux_record_tdep;
+/* Record all registers but IP register for process-record.  */
+
+static int
+i386_all_but_ip_registers_record (struct regcache *regcache)
+{
+  if (record_arch_list_add_reg (regcache, I386_EAX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_ECX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_EDX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_EBX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_ESP_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_EBP_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_ESI_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_EDI_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, I386_EFLAGS_REGNUM))
+    return -1;
+
+  return 0;
+}
 
 /* i386_canonicalize_syscall maps from the native i386 Linux set
    of syscall ids into a canonical set of syscall ids used by
@@ -383,6 +408,8 @@
 
    Return -1 if something wrong.  */
 
+static struct linux_record_tdep i386_linux_record_tdep;
+
 static int
 i386_linux_intx80_sysenter_record (struct regcache *regcache)
 {
@@ -402,6 +429,14 @@
       return -1;
     }
 
+  if (syscall_gdb == gdb_sys_sigreturn
+      || syscall_gdb == gdb_sys_rt_sigreturn)
+   {
+     if (i386_all_but_ip_registers_record (regcache))
+       return -1;
+     return 0;
+   }
+
   ret = record_linux_system_call (syscall_gdb, regcache,
 				  &i386_linux_record_tdep);
   if (ret)
@@ -413,6 +448,40 @@
 
   return 0;
 }
+
+#define I386_LINUX_xstate	270
+#define I386_LINUX_frame_size	732
+
+int
+i386_linux_record_signal (struct gdbarch *gdbarch,
+                          struct regcache *regcache,
+                          enum target_signal signal)
+{
+  ULONGEST esp;
+
+  if (i386_all_but_ip_registers_record (regcache))
+    return -1;
+
+  if (record_arch_list_add_reg (regcache, I386_EIP_REGNUM))
+    return -1;
+
+  /* Record the change in the stack.  */
+  regcache_raw_read_unsigned (regcache, I386_ESP_REGNUM, &esp);
+  /* This is for xstate.
+     sp -= sizeof (struct _fpstate);  */
+  esp -= I386_LINUX_xstate;
+  /* This is for frame_size.
+     sp -= sizeof (struct rt_sigframe);  */
+  esp -= I386_LINUX_frame_size;
+  if (record_arch_list_add_mem (esp,
+                                I386_LINUX_xstate + I386_LINUX_frame_size))
+    return -1;
+
+  if (record_arch_list_add_end ())
+    return -1;
+
+  return 0;
+}
 

 
 static LONGEST
@@ -529,6 +598,7 @@
   tdep->sc_num_regs = ARRAY_SIZE (i386_linux_sc_reg_offset);
 
   set_gdbarch_process_record (gdbarch, i386_process_record);
+  set_gdbarch_process_record_signal (gdbarch, i386_linux_record_signal);
 
   /* Initialize the i386_linux_record_tdep.  */
   /* These values are the size of the type that will be used in a system
===================================================================
RCS file: /cvs/src/src/gdb/amd64-linux-tdep.c,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -r1.29 -r1.29.2.1
--- src/gdb/amd64-linux-tdep.c	2009/09/15 03:30:04	1.29
+++ src/gdb/amd64-linux-tdep.c	2009/09/21 06:57:03	1.29.2.1
@@ -289,16 +289,48 @@
   regcache_cooked_write_unsigned (regcache, AMD64_LINUX_ORIG_RAX_REGNUM, -1);
 }
 
-/* Parse the arguments of current system call instruction and record
-   the values of the registers and memory that will be changed into
-   "record_arch_list".  This instruction is "syscall".
-
-   Return -1 if something wrong.  */
+/* Record all registers but IP register for process-record.  */
 
-static struct linux_record_tdep amd64_linux_record_tdep;
+static int
+amd64_all_but_ip_registers_record (struct regcache *regcache)
+{
+  if (record_arch_list_add_reg (regcache, AMD64_RAX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RCX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RDX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RBX_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RSP_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RBP_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RSI_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_RDI_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R8_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R9_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R10_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R11_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R12_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R13_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R14_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_R15_REGNUM))
+    return -1;
+  if (record_arch_list_add_reg (regcache, AMD64_EFLAGS_REGNUM))
+    return -1;
 
-#define RECORD_ARCH_GET_FS	0x1003
-#define RECORD_ARCH_GET_GS	0x1004
+  return 0;
+}
 
 /* amd64_canonicalize_syscall maps from the native amd64 Linux set 
    of syscall ids into a canonical set of syscall ids used by 
@@ -1111,6 +1143,17 @@
   }
 }
 
+/* Parse the arguments of current system call instruction and record
+   the values of the registers and memory that will be changed into
+   "record_arch_list".  This instruction is "syscall".
+
+   Return -1 if something wrong.  */
+
+static struct linux_record_tdep amd64_linux_record_tdep;
+
+#define RECORD_ARCH_GET_FS	0x1003
+#define RECORD_ARCH_GET_GS	0x1004
+
 static int
 amd64_linux_syscall_record (struct regcache *regcache)
 {
@@ -1120,27 +1163,39 @@
 
   regcache_raw_read_unsigned (regcache, AMD64_RAX_REGNUM, &syscall_native);
 
-  syscall_gdb = amd64_canonicalize_syscall (syscall_native);
-
-  if (syscall_native == amd64_sys_arch_prctl) 
+  switch (syscall_native)
     {
-      ULONGEST arg3;
-
-      regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg3,
-				  &arg3);
-      if (arg3 == RECORD_ARCH_GET_FS || arg3 == RECORD_ARCH_GET_GS)
-      {
-	CORE_ADDR addr;
-
-	regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg2,
-				    &addr);
-	if (record_arch_list_add_mem (addr, 
-				      amd64_linux_record_tdep.size_ulong))
-	  return -1;
-      }
-      goto record_regs;
+    case amd64_sys_rt_sigreturn:
+      if (amd64_all_but_ip_registers_record (regcache))
+        return -1;
+      return 0;
+      break;
+
+    case amd64_sys_arch_prctl:
+      if (syscall_native == amd64_sys_arch_prctl)
+        {
+          ULONGEST arg3;
+
+          regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg3,
+                                      &arg3);
+          if (arg3 == RECORD_ARCH_GET_FS || arg3 == RECORD_ARCH_GET_GS)
+            {
+	      CORE_ADDR addr;
+
+	      regcache_raw_read_unsigned (regcache,
+                                          amd64_linux_record_tdep.arg2,
+                                          &addr);
+	      if (record_arch_list_add_mem (addr,
+                                            amd64_linux_record_tdep.size_ulong))
+                return -1;
+            }
+          goto record_regs;
+        }
+      break;
     }
 
+  syscall_gdb = amd64_canonicalize_syscall (syscall_native);
+
   if (syscall_gdb < 0)
     {
       printf_unfiltered (_("Process record and replay target doesn't "
@@ -1163,6 +1218,44 @@
   if (record_arch_list_add_reg (regcache, AMD64_R11_REGNUM))
     return -1;
 
+  return 0;
+}
+
+#define AMD64_LINUX_redzone    128
+#define AMD64_LINUX_xstate     512
+#define AMD64_LINUX_frame_size 560
+
+int
+amd64_linux_record_signal (struct gdbarch *gdbarch,
+                           struct regcache *regcache,
+                           enum target_signal signal)
+{
+  ULONGEST rsp;
+
+  if (amd64_all_but_ip_registers_record (regcache))
+    return -1;
+
+  if (record_arch_list_add_reg (regcache, AMD64_RIP_REGNUM))
+    return -1;
+
+  /* Record the change in the stack.  */
+  regcache_raw_read_unsigned (regcache, AMD64_RSP_REGNUM, &rsp);
+  /* redzone
+     sp -= 128; */
+  rsp -= AMD64_LINUX_redzone;
+  /* This is for xstate.
+     sp -= sizeof (struct _fpstate);  */
+  rsp -= AMD64_LINUX_xstate;
+  /* This is for frame_size.
+     sp -= sizeof (struct rt_sigframe);  */
+  rsp -= AMD64_LINUX_frame_size;
+  if (record_arch_list_add_mem (rsp, AMD64_LINUX_redzone
+                                     + AMD64_LINUX_xstate
+                                     + AMD64_LINUX_frame_size))
+    return -1;
+
+  if (record_arch_list_add_end ())
+    return -1;
 
   return 0;
 }
@@ -1218,6 +1311,7 @@
   set_gdbarch_get_siginfo_type (gdbarch, linux_get_siginfo_type);
 
   set_gdbarch_process_record (gdbarch, i386_process_record);
+  set_gdbarch_process_record_signal (gdbarch, amd64_linux_record_signal);
 
   /* Initialize the amd64_linux_record_tdep.  */
   /* These values are the size of the type that will be used in a system
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.10874.2.12
retrieving revision 1.10874.2.13
diff -u -r1.10874.2.12 -r1.10874.2.13
--- src/gdb/ChangeLog	2009/09/21 06:57:02	1.10874.2.12
+++ src/gdb/ChangeLog	2009/09/21 10:19:59	1.10874.2.13
@@ -1,3 +1,8 @@
+2009-09-21  Phil Muldoon  <pmuldoon at redhat.com>
+
+	* python/py-value.c (valpy_getitem): Test value before allowing
+	subscript operation.
+
 2009-09-21  Hui Zhu  <teawater at gmail.com>
 	    Michael Snyder  <msnyder at vmware.com>
 
===================================================================
RCS file: /cvs/src/src/gdb/python/py-value.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- src/gdb/python/py-value.c	2009/09/09 17:45:40	1.1
+++ src/gdb/python/py-value.c	2009/09/21 10:20:00	1.1.2.1
@@ -324,7 +324,18 @@
 	     type.  */
 	  struct value *idx = convert_value_from_python (key);
 	  if (idx != NULL)
-	    res_val = value_subscript (tmp, value_as_long (idx));
+	    {
+	      /* Check the value's type is something that can be accessed via
+		 a subscript.  */
+	      struct type *type;
+	      tmp = coerce_ref (tmp);
+	      type = check_typedef (value_type (tmp));
+	      if (TYPE_CODE (type) != TYPE_CODE_ARRAY
+		  && TYPE_CODE (type) != TYPE_CODE_PTR)
+		  error( _("Cannot subscript requested type"));
+	      else
+		res_val = value_subscript (tmp, value_as_long (idx));
+	    }
 	}
     }
 
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v
retrieving revision 1.1960
retrieving revision 1.1960.2.1
diff -u -r1.1960 -r1.1960.2.1
--- src/gdb/testsuite/ChangeLog	2009/09/15 18:51:25	1.1960
+++ src/gdb/testsuite/ChangeLog	2009/09/21 10:20:00	1.1960.2.1
@@ -1,3 +1,10 @@
+2009-09-21  Phil Muldoon  <pmuldoon at redhat.com>
+
+	* gdb.python/py-value.exp (test_subscript_regression): New
+	function.  Test for invalid subscripts.
+	* gdb.python/py-value.c (main): Add test array, and pointer to it.
+	(ptr_ref): New function.
+
 2009-09-15  Tom Tromey  <tromey at redhat.com>
 
 	* lib/mi-support.exp (mi_create_varobj): Update.
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-value.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- src/gdb/testsuite/gdb.python/py-value.c	2009/09/09 17:45:42	1.1
+++ src/gdb/testsuite/gdb.python/py-value.c	2009/09/21 10:20:00	1.1.2.1
@@ -37,6 +37,13 @@
 
 enum e evalue = TWO;
 
+#ifdef __cplusplus
+void ptr_ref(int*& rptr_int)
+{
+  return; /* break to inspect pointer by reference. */
+}
+#endif
+
 int
 main (int argc, char *argv[])
 {
@@ -46,10 +53,18 @@
   PTR x = &s;
   char st[17] = "divide et impera";
   char nullst[17] = "divide\0et\0impera";
+  int a[3] = {1,2,3};
+  int *p = a;
+  int i = 2;
+  int *ptr_i = &i;
 
   s.a = 3;
   s.b = 5;
   u.a = 7;
 
+#ifdef __cplusplus
+  ptr_ref(ptr_i);
+#endif
+
   return 0;      /* break to inspect struct and union */
 }
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-value.exp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- src/gdb/testsuite/gdb.python/py-value.exp	2009/09/09 17:45:42	1.1
+++ src/gdb/testsuite/gdb.python/py-value.exp	2009/09/21 10:20:00	1.1.2.1
@@ -292,6 +292,75 @@
     "print value's type"
 }
 
+# Regression test for invalid subscript operations.  The bug was that
+# the type of the value was not being checked before allowing a
+# subscript operation to proceed.
+
+proc test_subscript_regression {lang} {
+
+ global srcdir subdir srcfile binfile testfile hex
+ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug $lang"] != "" } {
+     untested "Couldn't compile ${srcfile} in $lang mode"
+     return -1
+ }
+
+ # Start with a fresh gdb.
+ gdb_exit
+ gdb_start
+ gdb_reinitialize_dir $srcdir/$subdir
+ gdb_load ${binfile}
+
+ if ![runto_main ] then {
+     perror "couldn't run to breakpoint"
+     return
+ }
+
+ if {$lang == "c++"} {
+     gdb_breakpoint [gdb_get_line_number "break to inspect pointer by reference"]
+     gdb_continue_to_breakpoint "break to inspect pointer by reference"
+
+     gdb_py_test_silent_cmd "print rptr_int" \
+	 "Obtain address" 1
+     gdb_py_test_silent_cmd "python rptr = gdb.history(0)" \
+	 "Obtains value from GDB" 1
+     gdb_test "python print rptr\[0\]" "2" "Check pointer passed as reference"
+ }
+
+ gdb_breakpoint [gdb_get_line_number "break to inspect struct and union"]
+ gdb_continue_to_breakpoint "break to inspect struct and union"
+
+ gdb_py_test_silent_cmd "python intv = gdb.Value(1)" \
+     "Create a value for subscript test" 1
+ gdb_py_test_silent_cmd "python stringv = gdb.Value(\"foo\")" \
+     "Create a value for subscript test" 1
+
+ # Try to access an int with a subscript.  This should fail.
+ gdb_test "python print intv" "1" "Baseline print of a Python value"
+ gdb_test "python print intv\[0\]" "RuntimeError: Cannot subscript requested type.*" \
+     "Attempt to access an integer with a subscript"
+
+ # Try to access a string with a subscript.  This should pass.
+ gdb_test "python print stringv" "foo." "Baseline print of a Python value"
+ gdb_test "python print stringv\[0\]" "f." "Attempt to access a string with a subscript"
+
+ # Try to access an int array via a pointer with a subscript.  This should pass.
+ gdb_py_test_silent_cmd "print p" "Build pointer to array" 1
+ gdb_py_test_silent_cmd "python pointer = gdb.history(0)" "" 1
+ gdb_test "python print pointer\[0\]" "1" "Access array via pointer with int subscript"
+ gdb_test "python print pointer\[intv\]" "2" "Access array via pointer with value subscript"
+
+ # Try to access a single dimension array with a subscript to the
+ # result.  This should fail.
+ gdb_test "python print pointer\[intv\]\[0\]" "RuntimeError: Cannot subscript requested type.*" \
+     "Attempt to access an integer with a subscript"
+
+ # Lastly, test subscript access to an array with multiple
+ # dimensions.  This should pass.
+ gdb_py_test_silent_cmd "print {\"fu \",\"foo\",\"bar\"}" "Build array" 1
+ gdb_py_test_silent_cmd "python marray = gdb.history(0)" "" 1
+ gdb_test "python print marray\[1\]\[2\]" "o." "Test multiple subscript"
+}
+
 # Start with a fresh gdb.
 
 gdb_exit
@@ -322,3 +391,8 @@
 
 test_value_in_inferior
 test_value_after_death
+
+# The following test recompiles the binary to test either C or C++
+# values. 
+test_subscript_regression "c++"
+test_subscript_regression "c"
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.10874.2.13
retrieving revision 1.10874.2.14
diff -u -r1.10874.2.13 -r1.10874.2.14
--- src/gdb/ChangeLog	2009/09/21 10:19:59	1.10874.2.13
+++ src/gdb/ChangeLog	2009/09/21 10:25:29	1.10874.2.14
@@ -1,5 +1,12 @@
 2009-09-21  Phil Muldoon  <pmuldoon at redhat.com>
 
+	PR python/10633
+
+	* c-lang.c (c_printstr): Do not loop past  options->print_max when
+	iterating with wchar_iterate.
+
+2009-09-21  Phil Muldoon  <pmuldoon at redhat.com>
+
 	* python/py-value.c (valpy_getitem): Test value before allowing
 	subscript operation.
 
===================================================================
RCS file: /cvs/src/src/gdb/c-lang.c,v
retrieving revision 1.75
retrieving revision 1.75.4.1
diff -u -r1.75 -r1.75.4.1
--- src/gdb/c-lang.c	2009/07/10 10:35:16	1.75
+++ src/gdb/c-lang.c	2009/09/21 10:25:29	1.75.4.1
@@ -459,7 +459,7 @@
 	 single character in isolation.  This makes the code simpler
 	 and probably does the sensible thing in the majority of
 	 cases.  */
-      while (num_chars == 1)
+      while (num_chars == 1 && things_printed < options->print_max)
 	{
 	  /* Count the number of repetitions.  */
 	  unsigned int reps = 0;
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v
retrieving revision 1.1960.2.1
retrieving revision 1.1960.2.2
diff -u -r1.1960.2.1 -r1.1960.2.2
--- src/gdb/testsuite/ChangeLog	2009/09/21 10:20:00	1.1960.2.1
+++ src/gdb/testsuite/ChangeLog	2009/09/21 10:25:29	1.1960.2.2
@@ -1,5 +1,13 @@
 2009-09-21  Phil Muldoon  <pmuldoon at redhat.com>
 
+	PR python/10633
+
+	* gdb.python/py-prettyprint.exp (gdb_py_test_silent_cmd): New
+	Function.
+	(run_lang_tests): Add print elements test.
+
+2009-09-21  Phil Muldoon  <pmuldoon at redhat.com>
+
 	* gdb.python/py-value.exp (test_subscript_regression): New
 	function.  Test for invalid subscripts.
 	* gdb.python/py-value.c (main): Add test array, and pointer to it.
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-prettyprint.exp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- src/gdb/testsuite/gdb.python/py-prettyprint.exp	2009/09/09 17:45:42	1.1
+++ src/gdb/testsuite/gdb.python/py-prettyprint.exp	2009/09/21 10:25:30	1.1.2.1
@@ -35,6 +35,17 @@
     -re "$gdb_prompt $"	{}
 }
 
+# Run a command in GDB, and report a failure if a Python exception is thrown.
+# If report_pass is true, report a pass if no exception is thrown.
+proc gdb_py_test_silent_cmd {cmd name report_pass} {
+  global gdb_prompt
+
+  gdb_test_multiple $cmd $name {
+      -re "Traceback.*$gdb_prompt $"  { fail $name }
+      -re "$gdb_prompt $"	      { if $report_pass { pass $name } }
+  }
+}
+
 proc run_lang_tests {lang} {
     global srcdir subdir srcfile binfile testfile hex
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug $lang"] != "" } {
@@ -79,6 +90,11 @@
 	gdb_test "print derived" \
 	    " = \{.*<Vbase1> = pp class name: Vbase1.*<Vbase2> = \{.*<VirtualTest> = pp value variable is: 1,.*members of Vbase2:.*_vptr.Vbase2 = $hex.*<Vbase3> = \{.*members of Vbase3.*members of Derived:.*value = 2.*"
 	gdb_test "print ns " "\"embedded\\\\000null\\\\000string\""
+	gdb_py_test_silent_cmd "set print elements 3" "" 1
+	gdb_test "print ns" "emb\.\.\.."
+	gdb_py_test_silent_cmd "set print elements 10" "" 1
+	gdb_test "print ns" "embedded\\\\000n\.\.\.."
+	gdb_py_test_silent_cmd "set print elements 200" "" 1
     }
 
     gdb_test "print x" " = $hex \"this is x\""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	17 Sep 2009 22:00:12 -0000	1.39
+++ .cvsignore	21 Sep 2009 15:49:35 -0000	1.40
@@ -1,2 +1,2 @@
-gdb-6.8.91.20090917.tar.bz2
 libstdc++-v3-python-r151798.tar.xz
+gdb-6.8.91.20090921.tar.bz2

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infcmd.c      |    3 
 infrun.c      |    4 
 linux-tdep.c  |    2 
 objfiles.c    |   11 +
 solib-svr4.c  |  475 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 16 files changed, 613 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gdb-6.3-pie-20050110.patch	17 Sep 2009 12:15:41 -0000	1.23
+++ gdb-6.3-pie-20050110.patch	21 Sep 2009 15:49:35 -0000	1.24
@@ -324,16 +324,6 @@ Index: gdb-6.8.91.20090917/gdb/objfiles.
    if (symfile_objfile == NULL)
      return 0;
  
-@@ -467,6 +478,9 @@ free_objfile (struct objfile *objfile)
-   if (objfile == symfile_objfile)
-     symfile_objfile = NULL;
- 
-+  if (objfile == symfile_objfile)
-+    symfile_objfile = NULL;
-+
-   /* Before the symbol table code was redone to make it easier to
-      selectively load and remove information particular to a specific
-      linkage unit, gdb used to do these things whenever the monolithic
 Index: gdb-6.8.91.20090917/gdb/solib-svr4.c
 ===================================================================
 --- gdb-6.8.91.20090917.orig/gdb/solib-svr4.c	2009-09-17 12:48:50.000000000 +0200

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  763 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  281 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1740 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  596 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  185 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   14 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 -
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   72 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 238 files changed, 18302 insertions(+), 2410 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gdb-archer.patch	17 Sep 2009 12:15:41 -0000	1.30
+++ gdb-archer.patch	21 Sep 2009 15:49:36 -0000	1.31
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 16f3f01cc2cbc15283462eaabdfcde92cf42cdc6
+commit 0d5c38dd89050c0ee1cf049656f177c170d675d4
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -2337,18 +2337,9 @@ index f8e4f12..5b47e2e 100644
    }
  }
 diff --git a/gdb/c-lang.c b/gdb/c-lang.c
-index 4ba81ba..bc35a3e 100644
+index d01490c..bc35a3e 100644
 --- a/gdb/c-lang.c
 +++ b/gdb/c-lang.c
-@@ -459,7 +459,7 @@ c_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
- 	 single character in isolation.  This makes the code simpler
- 	 and probably does the sensible thing in the majority of
- 	 cases.  */
--      while (num_chars == 1)
-+      while (num_chars == 1 && things_printed < options->print_max)
- 	{
- 	  /* Count the number of repetitions.  */
- 	  unsigned int reps = 0;
 @@ -715,7 +715,7 @@ c_get_string (struct value *value, gdb_byte **buffer, int *length,
       If length returned from read_string was > 0, return the number of
       characters read by dividing the number of bytes by width.  */
@@ -3111,7 +3102,7 @@ index 62800b8..97d587b 100644
  			{ $$ = $1.comp;
  			  if ($2) $$ = fill_comp (DEMANGLE_COMPONENT_LOCAL_NAME, $$, $2); }
 diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
-index d2d8f2e..b950147 100644
+index d2d8f2e..af0ba28 100644
 --- a/gdb/cp-namespace.c
 +++ b/gdb/cp-namespace.c
 @@ -36,14 +36,17 @@ static struct using_direct *cp_copy_usings (struct using_direct *using,
@@ -3291,7 +3282,7 @@ index d2d8f2e..b950147 100644
        if (sym != NULL)
  	return sym;
      }
-@@ -320,25 +377,81 @@ lookup_namespace_scope (const char *name,
+@@ -320,25 +377,87 @@ lookup_namespace_scope (const char *name,
    namespace = alloca (scope_len + 1);
    strncpy (namespace, scope, scope_len);
    namespace[scope_len] = '\0';
@@ -3371,21 +3362,27 @@ index d2d8f2e..b950147 100644
 +  struct using_direct *current;
 +  struct symbol *sym = NULL;
 +  int directive_match;
-+  int current_line = find_pc_line (get_frame_pc (get_selected_frame (NULL)), 0).line;
- 
--  /* First, go through the using directives.  If any of them add new
++  int current_line;
++
 +  if(!declaration_only)
 +    /* First, try to find the symbol in the given namespace.  */
 +    sym = cp_lookup_symbol_in_namespace (scope, name, block, domain);
-+
+ 
+-  /* First, go through the using directives.  If any of them add new
 +  if ( sym != NULL)
 +    return sym;
 +
++  if (has_stack_frames ())
++    current_line = find_pc_line (get_frame_pc (get_selected_frame (NULL)),
++                                              0).line;
++  else
++    current_line = 0;
++
 +  /* Go through the using directives.  If any of them add new
       names to the namespace we're searching in, see if we can find a
       match by applying them.  */
  
-@@ -346,39 +459,74 @@ cp_lookup_symbol_namespace (const char *namespace,
+@@ -346,39 +465,74 @@ cp_lookup_symbol_namespace (const char *namespace,
         current != NULL;
         current = current->next)
      {
@@ -3488,7 +3485,7 @@ index d2d8f2e..b950147 100644
  }
  
  /* Look up NAME in BLOCK's static block and in global blocks.  If
-@@ -388,17 +536,15 @@ cp_lookup_symbol_namespace (const char *namespace,
+@@ -388,17 +542,15 @@ cp_lookup_symbol_namespace (const char *namespace,
  
  static struct symbol *
  lookup_symbol_file (const char *name,
@@ -3507,7 +3504,7 @@ index d2d8f2e..b950147 100644
    if (anonymous_namespace)
      {
        /* Symbols defined in anonymous namespaces have external linkage
-@@ -408,12 +554,11 @@ lookup_symbol_file (const char *name,
+@@ -408,12 +560,11 @@ lookup_symbol_file (const char *name,
        const struct block *global_block = block_global_block (block);
        
        if (global_block != NULL)
@@ -3522,7 +3519,7 @@ index d2d8f2e..b950147 100644
      }
  
    if (sym != NULL)
-@@ -434,6 +579,7 @@ lookup_symbol_file (const char *name,
+@@ -434,6 +585,7 @@ lookup_symbol_file (const char *name,
        sym = lookup_possible_namespace_symbol (name);
        if (sym != NULL)
  	return sym;
@@ -3530,7 +3527,7 @@ index d2d8f2e..b950147 100644
      }
  
    return NULL;
-@@ -461,9 +607,8 @@ cp_lookup_nested_type (struct type *parent_type,
+@@ -461,9 +613,8 @@ cp_lookup_nested_type (struct type *parent_type,
  	   lookup_symbol_namespace works when looking them up.  */
  
  	const char *parent_name = TYPE_TAG_NAME (parent_type);
@@ -3541,7 +3538,7 @@ index d2d8f2e..b950147 100644
  							 block,
  							 VAR_DOMAIN);
  	if (sym == NULL || SYMBOL_CLASS (sym) != LOC_TYPEDEF)
-@@ -709,7 +854,7 @@ check_one_possible_namespace_symbol (const char *name, int len,
+@@ -709,7 +860,7 @@ check_one_possible_namespace_symbol (const char *name, int len,
  
    memcpy (name_copy, name, len);
    name_copy[len] = '\0';
@@ -3550,7 +3547,7 @@ index d2d8f2e..b950147 100644
  
    if (sym == NULL)
      {
-@@ -749,7 +894,7 @@ lookup_possible_namespace_symbol (const char *name)
+@@ -749,7 +900,7 @@ lookup_possible_namespace_symbol (const char *name)
        struct symbol *sym;
  
        sym = lookup_block_symbol (get_possible_namespace_block (objfile),
@@ -3793,7 +3790,7 @@ index 7cb016d..bb9e35a 100644
    default_symfile_offsets, /* sym_offsets: parse user's offsets to
  			      internal form */
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 5a5f542..2c6bcef 100644
+index f16b6e2..fe328c7 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -959,8 +959,10 @@ Connect to process ID @var{number}, as with the @code{attach} command.
@@ -12057,27 +12054,10 @@ index a84003f..924c1c5 100644
    default_symfile_offsets,	/* sym_offsets: dummy FIXME til implem sym reloc */
    default_symfile_segments,	/* sym_segments: Get segment information from
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index 1f7489f..b9a7ed6 100644
+index 8dcca70..4b25a5a 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
-@@ -459,12 +459,14 @@ free_objfile (struct objfile *objfile)
- 
-   unlink_objfile (objfile);
- 
--  /* If we are going to free the runtime common objfile, mark it
--     as unallocated.  */
-+  /* If we are going to free any existing OBJFILE reference, clear it.  */
- 
-   if (objfile == rt_common_objfile)
-     rt_common_objfile = NULL;
- 
-+  if (objfile == symfile_objfile)
-+    symfile_objfile = NULL;
-+
-   /* Before the symbol table code was redone to make it easier to
-      selectively load and remove information particular to a specific
-      linkage unit, gdb used to do these things whenever the monolithic
-@@ -731,6 +733,20 @@ have_partial_symbols (void)
+@@ -731,6 +731,20 @@ have_partial_symbols (void)
      if (objfile_has_partial_symbols (ofp))
        return 1;
    }
@@ -17923,7 +17903,7 @@ index 49c0437..84a476e 100644
 +  return 1;
 +}
 diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
-index 3d88aa3..9fa1c44 100644
+index 714aa11..9fa1c44 100644
 --- a/gdb/python/py-value.c
 +++ b/gdb/python/py-value.c
 @@ -25,6 +25,7 @@
@@ -17945,27 +17925,7 @@ index 3d88aa3..9fa1c44 100644
  #define builtin_type_pybool \
    language_bool_type (python_language, python_gdbarch)
  
-@@ -324,7 +329,18 @@ valpy_getitem (PyObject *self, PyObject *key)
- 	     type.  */
- 	  struct value *idx = convert_value_from_python (key);
- 	  if (idx != NULL)
--	    res_val = value_subscript (tmp, value_as_long (idx));
-+	    {
-+	      /* Check the value's type is something that can be accessed via
-+		 a subscript.  */
-+	      struct type *type;
-+	      tmp = coerce_ref (tmp);
-+	      type = check_typedef (value_type (tmp));
-+	      if (TYPE_CODE (type) != TYPE_CODE_ARRAY
-+		  && TYPE_CODE (type) != TYPE_CODE_PTR)
-+		  error( _("Cannot subscript requested type"));
-+	      else
-+		res_val = value_subscript (tmp, value_as_long (idx));
-+	    }
- 	}
-     }
- 
-@@ -891,7 +907,34 @@ convert_value_from_python (PyObject *obj)
+@@ -902,7 +907,34 @@ convert_value_from_python (PyObject *obj)
  	{
  	  LONGEST l = PyLong_AsLongLong (obj);
  
@@ -18001,7 +17961,7 @@ index 3d88aa3..9fa1c44 100644
  	    value = value_from_longest (builtin_type_pylong, l);
  	}
        else if (PyFloat_Check (obj))
-@@ -950,6 +993,25 @@ gdbpy_history (PyObject *self, PyObject *args)
+@@ -961,6 +993,25 @@ gdbpy_history (PyObject *self, PyObject *args)
    return value_to_value_object (res_val);
  }
  
@@ -18027,7 +17987,7 @@ index 3d88aa3..9fa1c44 100644
  void
  gdbpy_initialize_values (void)
  {
-@@ -960,6 +1022,8 @@ gdbpy_initialize_values (void)
+@@ -971,6 +1022,8 @@ gdbpy_initialize_values (void)
    PyModule_AddObject (gdb_module, "Value", (PyObject *) &value_object_type);
  
    values_in_python = NULL;
@@ -18931,7 +18891,7 @@ index 1c37801..594eb16 100644
  	  print_variable_and_value (NULL, sym, frame, stream, 4 * num_tabs);
  	  break;
 diff --git a/gdb/symfile.c b/gdb/symfile.c
-index 2f3441c..776066d 100644
+index 2458201..c31b72a 100644
 --- a/gdb/symfile.c
 +++ b/gdb/symfile.c
 @@ -921,6 +921,17 @@ new_symfile_objfile (struct objfile *objfile, int add_flags)
@@ -19002,18 +18962,7 @@ index 2f3441c..776066d 100644
      {
        wrap_here ("");
        printf_unfiltered (_("(no debugging symbols found)..."));
-@@ -1150,7 +1167,9 @@ symbol_file_clear (int from_tty)
-      descriptors as well.  */
-   no_shared_libraries (NULL, from_tty);
- 
--  symfile_objfile = NULL;
-+  /* free_objfile should have cleared it.  */
-+  gdb_assert (symfile_objfile == NULL);
-+
-   if (from_tty)
-     printf_unfiltered (_("No symbol file now.\n"));
- }
-@@ -2422,14 +2441,15 @@ reread_symbols (void)
+@@ -2422,14 +2439,15 @@ reread_symbols (void)
  	         zero is OK since dbxread.c also does what it needs to do if
  	         objfile->global_psymbols.size is 0.  */
  	      (*objfile->sf->sym_read) (objfile, 0);
@@ -19031,7 +18980,7 @@ index 2f3441c..776066d 100644
  	      /* We're done reading the symbol file; finish off complaints.  */
  	      clear_complaints (&symfile_complaints, 0, 1);
  
-@@ -2727,7 +2747,7 @@ allocate_symtab (char *filename, struct objfile *objfile)
+@@ -2727,7 +2745,7 @@ allocate_symtab (char *filename, struct objfile *objfile)
  }
  
  struct partial_symtab *
@@ -19040,7 +18989,7 @@ index 2f3441c..776066d 100644
  {
    struct partial_symtab *psymtab;
  
-@@ -3041,7 +3061,8 @@ again2:
+@@ -3041,7 +3059,8 @@ again2:
  
  struct partial_symtab *
  start_psymtab_common (struct objfile *objfile,
@@ -26033,7 +25982,7 @@ index 0000000..e9d18b7
 +gdb_test "python print t0" "\\<gdb.InferiorThread object at 0x\[\[:xdigit:\]\]+>" "verify InferiorThread object"
 +gdb_test "python print 'result =', t0.num" " = \[0-9\]+" "test Inferior.num"
 diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
-index d2db5bc..4de1620 100644
+index b4b3776..359c4ed 100644
 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp
 +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
 @@ -27,12 +27,20 @@ set binfile ${objdir}/${subdir}/${testfile}
@@ -26062,20 +26011,8 @@ index d2db5bc..4de1620 100644
 +  }
  }
  
- proc run_lang_tests {lang} {
-@@ -79,6 +87,11 @@ proc run_lang_tests {lang} {
- 	gdb_test "print derived" \
- 	    " = \{.*<Vbase1> = pp class name: Vbase1.*<Vbase2> = \{.*<VirtualTest> = pp value variable is: 1,.*members of Vbase2:.*_vptr.Vbase2 = $hex.*<Vbase3> = \{.*members of Vbase3.*members of Derived:.*value = 2.*"
- 	gdb_test "print ns " "\"embedded\\\\000null\\\\000string\""
-+	gdb_py_test_silent_cmd "set print elements 3" "" 1
-+	gdb_test "print ns" "emb\.\.\.."
-+	gdb_py_test_silent_cmd "set print elements 10" "" 1
-+	gdb_test "print ns" "embedded\\\\000n\.\.\.."
-+	gdb_py_test_silent_cmd "set print elements 200" "" 1
-     }
- 
-     gdb_test "print x" " = $hex \"this is x\""
-@@ -86,6 +99,8 @@ proc run_lang_tests {lang} {
+ # Run a command in GDB, and report a failure if a Python exception is thrown.
+@@ -102,6 +110,8 @@ proc run_lang_tests {lang} {
  
      gdb_test "print c" " = container $hex \"container\" with 2 elements = {$nl *.0. = 23,$nl *.1. = 72$nl}"
  
@@ -26127,48 +26064,11 @@ index cea6ae0..c9a63d4 100644
  proc test_template_arg {type} {
      global testfile srcdir subdir srcfile binfile
      if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
-diff --git a/gdb/testsuite/gdb.python/py-value.c b/gdb/testsuite/gdb.python/py-value.c
-index f3d6284..023d830 100644
---- a/gdb/testsuite/gdb.python/py-value.c
-+++ b/gdb/testsuite/gdb.python/py-value.c
-@@ -37,6 +37,13 @@ typedef struct s *PTR;
- 
- enum e evalue = TWO;
- 
-+#ifdef __cplusplus
-+void ptr_ref(int*& rptr_int)
-+{
-+  return; /* break to inspect pointer by reference. */
-+}
-+#endif
-+
- int
- main (int argc, char *argv[])
- {
-@@ -46,10 +53,18 @@ main (int argc, char *argv[])
-   PTR x = &s;
-   char st[17] = "divide et impera";
-   char nullst[17] = "divide\0et\0impera";
-+  int a[3] = {1,2,3};
-+  int *p = a;
-+  int i = 2;
-+  int *ptr_i = &i;
- 
-   s.a = 3;
-   s.b = 5;
-   u.a = 7;
- 
-+#ifdef __cplusplus
-+  ptr_ref(ptr_i);
-+#endif
-+
-   return 0;      /* break to inspect struct and union */
- }
 diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
-index 9b4190d..b9f2c3c 100644
+index 2958233..0de1cae 100644
 --- a/gdb/testsuite/gdb.python/py-value.exp
 +++ b/gdb/testsuite/gdb.python/py-value.exp
-@@ -292,21 +292,106 @@ proc test_value_after_death {} {
+@@ -292,6 +292,15 @@ proc test_value_after_death {} {
      "print value's type"
  }
  
@@ -26181,77 +26081,10 @@ index 9b4190d..b9f2c3c 100644
 +  gdb_test "python print v" "5" "print value for cast test"
 +}
 +
-+# Regression test for invalid subscript operations.  The bug was that
-+# the type of the value was not being checked before allowing a
-+# subscript operation to proceed.
-+
-+proc test_subscript_regression {lang} {
-+
-+ global srcdir subdir srcfile binfile testfile hex
-+ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug $lang"] != "" } {
-+     untested "Couldn't compile ${srcfile} in $lang mode"
-+     return -1
-+ }
-+
-+ # Start with a fresh gdb.
-+ gdb_exit
-+ gdb_start
-+ gdb_reinitialize_dir $srcdir/$subdir
-+ gdb_load ${binfile}
-+
-+ if ![runto_main ] then {
-+     perror "couldn't run to breakpoint"
-+     return
-+ }
-+
-+ if {$lang == "c++"} {
-+     gdb_breakpoint [gdb_get_line_number "break to inspect pointer by reference"]
-+     gdb_continue_to_breakpoint "break to inspect pointer by reference"
-+
-+     gdb_py_test_silent_cmd "print rptr_int" \
-+	 "Obtain address" 1
-+     gdb_py_test_silent_cmd "python rptr = gdb.history(0)" \
-+	 "Obtains value from GDB" 1
-+     gdb_test "python print rptr\[0\]" "2" "Check pointer passed as reference"
-+ }
-+
-+ gdb_breakpoint [gdb_get_line_number "break to inspect struct and union"]
-+ gdb_continue_to_breakpoint "break to inspect struct and union"
-+
-+ gdb_py_test_silent_cmd "python intv = gdb.Value(1)" \
-+     "Create a value for subscript test" 1
-+ gdb_py_test_silent_cmd "python stringv = gdb.Value(\"foo\")" \
-+     "Create a value for subscript test" 1
-+
-+ # Try to access an int with a subscript.  This should fail.
-+ gdb_test "python print intv" "1" "Baseline print of a Python value"
-+ gdb_test "python print intv\[0\]" "RuntimeError: Cannot subscript requested type.*" \
-+     "Attempt to access an integer with a subscript"
-+
-+ # Try to access a string with a subscript.  This should pass.
-+ gdb_test "python print stringv" "foo." "Baseline print of a Python value"
-+ gdb_test "python print stringv\[0\]" "f." "Attempt to access a string with a subscript"
-+
-+ # Try to access an int array via a pointer with a subscript.  This should pass.
-+ gdb_py_test_silent_cmd "print p" "Build pointer to array" 1
-+ gdb_py_test_silent_cmd "python pointer = gdb.history(0)" "" 1
-+ gdb_test "python print pointer\[0\]" "1" "Access array via pointer with int subscript"
-+ gdb_test "python print pointer\[intv\]" "2" "Access array via pointer with value subscript"
-+
-+ # Try to access a single dimension array with a subscript to the
-+ # result.  This should fail.
-+ gdb_test "python print pointer\[intv\]\[0\]" "RuntimeError: Cannot subscript requested type.*" \
-+     "Attempt to access an integer with a subscript"   
-+
-+ # Lastly, test subscript access to an array with multiple
-+ # dimensions.  This should pass.
-+ gdb_py_test_silent_cmd "print {\"fu \",\"foo\",\"bar\"}" "Build array" 1
-+ gdb_py_test_silent_cmd "python marray = gdb.history(0)" "" 1
-+ gdb_test "python print marray\[1\]\[2\]" "o." "Test multiple subscript"
-+}   
-+
- # Start with a fresh gdb.
- 
+ # Regression test for invalid subscript operations.  The bug was that
+ # the type of the value was not being checked before allowing a
+ # subscript operation to proceed.
+@@ -366,16 +375,23 @@ proc test_subscript_regression {lang} {
  gdb_exit
  gdb_start
  gdb_reinitialize_dir $srcdir/$subdir
@@ -26266,8 +26099,8 @@ index 9b4190d..b9f2c3c 100644
 +if ![python_supported] then {
 +  unsupported "python support is disabled"
 +  return -1
-+}
-+
+ }
+ 
 +set testfile "py-value"
 +set srcfile ${testfile}.c
 +set binfile ${objdir}/${subdir}/${testfile}
@@ -26275,24 +26108,21 @@ index 9b4190d..b9f2c3c 100644
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile ${srcfile}"
 +    return -1
- }
- 
++}
++
 +gdb_load ${binfile}
 +
  test_value_creation
  test_value_numeric_ops
  test_value_boolean
-@@ -322,3 +407,10 @@ if ![runto_main] then {
+@@ -391,6 +407,7 @@ if ![runto_main] then {
  
  test_value_in_inferior
  test_value_after_death
 +test_cast_regression
-+
-+# The following test recompiles the binary to test either C or C++
-+# values.
-+
-+test_subscript_regression "c++"
-+test_subscript_regression "c"
+ 
+ # The following test recompiles the binary to test either C or C++
+ # values. 
 diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
 index 5223fc8..03e1eab 100644
 --- a/gdb/testsuite/gdb.python/python.exp
@@ -28500,7 +28330,7 @@ index 51e6960..48b30e4 100644
  /* User function handler.  */
  
 diff --git a/gdb/varobj.c b/gdb/varobj.c
-index 7235635..9848de0 100644
+index 8f22156..8fe72ca 100644
 --- a/gdb/varobj.c
 +++ b/gdb/varobj.c
 @@ -26,6 +26,8 @@


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- gdb.spec	17 Sep 2009 22:00:12 -0000	1.385
+++ gdb.spec	21 Sep 2009 15:49:36 -0000	1.386
@@ -10,11 +10,11 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.91.20090917
+Version: 6.8.91.20090921
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 2%{?_with_upstream:.upstream}%{?dist}
+Release: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -219,8 +219,8 @@ Patch229: gdb-6.3-bz140532-ppc-unwinding
 # Testcase for exec() from threaded program (BZ 202689).
 Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
-# Backported post gdb-6.8.50.20090910 snapshot fixups.
-#Patch232: gdb-6.8.50.20090910-upstream.patch
+# Backported post gdb-6.8.50.20090991 snapshot fixups.
+Patch232: gdb-6.8.50.20090921-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -453,7 +453,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-#patch232 -p1
+%patch232 -p1
 %patch349 -p1
 %patch1 -p1
 %patch3 -p1
@@ -847,6 +847,11 @@ fi
 %endif
 
 %changelog
+* Mon Sep 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090921-1
+- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090921
+- archer-jankratochvil-fedora12 commit: 0d5c38dd89050c0ee1cf049656f177c170d675d4
+  - [expr] Check has_stack_frames before calling find_pc_line (Sami Wagiaalla).
+
 * Thu Sep 17 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090917-2
 - Include bundled libstdc++ python; it will be in libstdc++-devel since gcc-4.5.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	17 Sep 2009 22:00:12 -0000	1.38
+++ sources	21 Sep 2009 15:49:36 -0000	1.39
@@ -1,2 +1,2 @@
-eaed9150b219c8ee56bb676e32a9d2a5  gdb-6.8.91.20090917.tar.bz2
 1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz
+67b50a78d03200c6714cafd85b8044e8  gdb-6.8.91.20090921.tar.bz2



From drago01 at fedoraproject.org  Mon Sep 21 16:03:20 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 21 Sep 2009 16:03:20 +0000 (UTC)
Subject: rpms/compiz/devel compiz-gtk, 1.14, 1.15 compiz.spec, 1.182,
	1.183 compiz-pageflip.patch, 1.1, NONE
Message-ID: <20090921160320.A89DD11C0043@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1942

Modified Files:
	compiz-gtk compiz.spec 
Removed Files:
	compiz-pageflip.patch 
Log Message:
Revert pageflip patch



Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- compiz-gtk	22 Aug 2009 14:42:23 -0000	1.14
+++ compiz-gtk	21 Sep 2009 16:03:20 -0000	1.15
@@ -2,7 +2,7 @@
 
 function runCompiz() {
 	gtk-window-decorator &
-	exec compiz --ignore-desktop-hints --always-swap glib gconf gnomecompat $@
+	exec compiz --ignore-desktop-hints glib gconf gnomecompat $@
 }
 
 ISSW=`glxinfo | grep "Software Rasterizer" -c`


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- compiz.spec	24 Aug 2009 21:04:02 -0000	1.182
+++ compiz.spec	21 Sep 2009 16:03:20 -0000	1.183
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,7 +58,6 @@ Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
 Patch107: compiz-0.8.2-wall.patch
-Patch108: compiz-pageflip.patch
 #Patch110: scale-key.patch
 
 # Make sure configuration plugins never get unloaded
@@ -137,7 +136,6 @@ and other kde integration related stuff.
 
 %patch123 -p1 -b .initial-plugins
 %patch125 -p1 -b .gnome-terminal
-%patch108 -p1 -b .pageflip
 %patch126 -p1 -b .gconf
 
 %build
@@ -318,6 +316,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-15
+- Revert pageflip patch
+
 * Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-14
 - Fix build
 


--- compiz-pageflip.patch DELETED ---



From orion at fedoraproject.org  Mon Sep 21 16:06:50 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 21 Sep 2009 16:06:50 +0000 (UTC)
Subject: rpms/environment-modules/devel .cvsignore, 1.8,
	1.9 environment-modules.spec, 1.20, 1.21 sources, 1.8, 1.9
Message-ID: <20090921160650.1FB6411C0043@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3134

Modified Files:
	.cvsignore environment-modules.spec sources 
Log Message:
* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
- Update to 3.2.7, fixes bug #524475
- Drop versioning patch fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Nov 2007 18:06:34 -0000	1.8
+++ .cvsignore	21 Sep 2009 16:06:49 -0000	1.9
@@ -1 +1 @@
-modules-3.2.6.tar.bz2
+modules-3.2.7.tar.bz2


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- environment-modules.spec	20 Aug 2009 17:40:33 -0000	1.20
+++ environment-modules.spec	21 Sep 2009 16:06:49 -0000	1.21
@@ -1,13 +1,12 @@
 Name:           environment-modules
-Version:        3.2.6
-Release:        8%{?dist}
+Version:        3.2.7
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-Patch0:         modules-3.2.6-versioning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -39,7 +38,6 @@ have access to the module alias.
 
 %prep
 %setup -q -n modules-%{version}
-%patch0 -p1 -b .versioning
 
 
 %build
@@ -75,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
+- Update to 3.2.7, fixes bug #524475
+- Drop versioning patch fixed upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Nov 2007 18:06:34 -0000	1.8
+++ sources	21 Sep 2009 16:06:49 -0000	1.9
@@ -1 +1 @@
-59bc6401efbc677d6190b00a440cccdf  modules-3.2.6.tar.bz2
+ab3b3be9e5d4938a10281c7e194b3709  modules-3.2.7.tar.bz2



From hadess at fedoraproject.org  Mon Sep 21 16:07:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 21 Sep 2009 16:07:50 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-11 gbt-f11-backport.patch, 1.1,
	1.2 gnome-bluetooth.spec, 1.83, 1.84
Message-ID: <20090921160750.6A3E111C0043@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-serv3535

Modified Files:
	gbt-f11-backport.patch gnome-bluetooth.spec 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-3
- Update backport to fix status in the applet


gbt-f11-backport.patch:
 applet/main.c                    |   39 +++++++++++-----
 b/applet/main.c                  |    4 -
 b/applet/notify.c                |    2 
 b/applet/popup-menu.ui           |    9 +++
 b/lib/bluetooth-client.c         |    5 +-
 b/lib/bluetooth-enums.h          |    7 ++-
 b/lib/bluetooth-plugin-manager.c |    5 +-
 b/lib/test-client.c              |   17 +++++--
 b/lib/test-plugins.c             |   12 ++++-
 b/properties/adapter.c           |    3 -
 b/properties/main.c              |    7 ++-
 b/wizard/main.c                  |    2 
 b/wizard/wizard.ui               |    3 -
 lib/bluetooth-client.c           |   91 ++++++++++++++++++++++++++-------------
 lib/bluetooth-enums.h            |   10 +---
 15 files changed, 148 insertions(+), 68 deletions(-)

Index: gbt-f11-backport.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gbt-f11-backport.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gbt-f11-backport.patch	16 Sep 2009 11:02:17 -0000	1.1
+++ gbt-f11-backport.patch	21 Sep 2009 16:07:50 -0000	1.2
@@ -1,7 +1,7 @@
 From 20bc51c9b4bca1913f2dce4e897fe73e4bf4710e Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 24 Jul 2009 12:12:38 +0100
-Subject: [PATCH 01/21] [Bug 589593] New: Crashes when disconnecting audio service
+Subject: [PATCH 01/22] [Bug 589593] New: Crashes when disconnecting audio service
 
 ---
  lib/bluetooth-client.c |    4 ++++
@@ -29,7 +29,7 @@ index b087861..caae303 100644
 From ea8e00974c687eba2bf2b735245ea2a3b4d80af9 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 24 Jul 2009 13:37:05 +0100
-Subject: [PATCH 02/21] Track the state of org.bluez.Audio service as well
+Subject: [PATCH 02/22] Track the state of org.bluez.Audio service as well
 
 Because otherwise we think it's still connected when it actually
 isn't. Fixes the device showing up as connected when it wasn't
@@ -90,7 +90,7 @@ index caae303..63582f1 100644
 From 050d5855db820dbaa9cc5000bb325d7f6d045f76 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:11:54 +0100
-Subject: [PATCH 03/21] Add status enumeration
+Subject: [PATCH 03/22] Add status enumeration
 
 To mark services as being connected, disconnected, or
 connecting.
@@ -122,7 +122,7 @@ index 7163607..3ec607a 100644
 From c7fc79a81d5397bbe171f547a38a6d7d606b3105 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:12:46 +0100
-Subject: [PATCH 04/21] Mark services as connecting
+Subject: [PATCH 04/22] Mark services as connecting
 
 When the service supports it, mark them as "connecting" when
 a connection is taking place. Only works for audio devices
@@ -226,7 +226,7 @@ index 63582f1..d639ba6 100644
 From b60e246b68250058c6917d1f423349050fafcb70 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:13:26 +0100
-Subject: [PATCH 05/21] Update test client for status changes
+Subject: [PATCH 05/22] Update test client for status changes
 
 The test client now knows whether a service is connecting.
 ---
@@ -275,7 +275,7 @@ index 57edcc2..56d5ebc 100644
 From 4a30c0b7ab2695d2a6937d17097372e80d08de5c Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:27:27 +0100
-Subject: [PATCH 06/21] Fix small memleak when changing the tooltip
+Subject: [PATCH 06/22] Fix small memleak when changing the tooltip
 
 When changing the tooltip of the applet, don't forget to free
 the old tooltip...
@@ -302,7 +302,7 @@ index f4dd3b5..e1f3ebc 100644
 From 03bb5b2198c1e8ec0f52e1dc34e858378d5de668 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 17:16:30 +0100
-Subject: [PATCH 07/21] Add support for "playing" status
+Subject: [PATCH 07/22] Add support for "playing" status
 
 As used in the A2DP and Headset services.
 ---
@@ -330,7 +330,7 @@ index 3ec607a..7563c4c 100644
 From 8110b166205759fc0e585573fe226373538df8ec Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 20:43:52 +0100
-Subject: [PATCH 08/21] =?utf-8?q?Bug=20589681=20=E2=80=93=20Doesn't=20connect=20to=20input=20service=20on=20Sony=20Ericsson=20phones?=
+Subject: [PATCH 08/22] =?utf-8?q?Bug=20589681=20=E2=80=93=20Doesn't=20connect=20to=20input=20service=20on=20Sony=20Ericsson=20phones?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -381,7 +381,7 @@ index d639ba6..e929ad4 100644
 From f2ae6aa239df221ca096cdb604f0569218d6178a Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 15:50:22 +0100
-Subject: [PATCH 09/21] Fix thinko in disabling menu items
+Subject: [PATCH 09/22] Fix thinko in disabling menu items
 
 ---
  applet/main.c |    3 +--
@@ -408,7 +408,7 @@ index c826b9d..f9ea351 100644
 From fbd08ce783b8d25514e6436d05865267385c6834 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 16:02:08 +0100
-Subject: [PATCH 10/21] Print out errors when GtkBuilder files fail parsing
+Subject: [PATCH 10/22] Print out errors when GtkBuilder files fail parsing
 
 ---
  applet/main.c |   17 +++++++++++++++--
@@ -451,7 +451,7 @@ index f9ea351..c849e17 100644
 From df5c7c34bc948bfb1a81fe21fdd417365eba7ae0 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 18:10:41 +0100
-Subject: [PATCH 11/21] Update default-adapter-powered when no adapters are available
+Subject: [PATCH 11/22] Update default-adapter-powered when no adapters are available
 
 Otherwise we might think it's still enabled when it's not.
 ---
@@ -479,7 +479,7 @@ index e929ad4..52a7481 100644
 From e0f2fbece374182b30e6375eee04b76cb6ddf87b Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 18:26:05 +0100
-Subject: [PATCH 12/21] Update the Powered column on adapter changes
+Subject: [PATCH 12/22] Update the Powered column on adapter changes
 
 Otherwise we miss the adapter going down on soft block rfkill.
 ---
@@ -516,7 +516,7 @@ index 52a7481..c56cc8e 100644
 From b83c15e7c2ac8c24516fa97bc26a13eb40c40331 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 18:30:00 +0100
-Subject: [PATCH 13/21] Hide unwanted menu items when Bluetooth is disabled
+Subject: [PATCH 13/22] Hide unwanted menu items when Bluetooth is disabled
 
 We don't care about much of the menu items when there's no
 adapters enabled.
@@ -590,7 +590,7 @@ index 0060ae4..a4677b0 100644
 From e1570bfc65aa2d26d7ca117a0b3e1a81f85d2d62 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 3 Aug 2009 15:55:48 +0100
-Subject: [PATCH 14/21] Fix underline in "Set up new device"
+Subject: [PATCH 14/22] Fix underline in "Set up new device"
 
 Spotted by Matthias Clasen
 ---
@@ -617,7 +617,7 @@ index 122df2b..8b6a7db 100644
 From abbe0a406ef3fb510d87580e96d2457d74f7b10b Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 11 Aug 2009 09:40:45 +0100
-Subject: [PATCH 15/21] =?utf-8?q?Bug=20590874=20=E2=80=93=20crash=20in=20Bluetooth:=20adding=20a=20bluetooth=20NAP=20phone?=
+Subject: [PATCH 15/22] =?utf-8?q?Bug=20590874=20=E2=80=93=20crash=20in=20Bluetooth:=20adding=20a=20bluetooth=20NAP=20phone?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -650,7 +650,7 @@ index c8db9ef..ab1751c 100644
 From fa90cb5852bcad75835d733613114355095005b2 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 11 Aug 2009 11:50:38 +0100
-Subject: [PATCH 16/21] Add D-Bus object path to the debug output
+Subject: [PATCH 16/22] Add D-Bus object path to the debug output
 
 ---
  properties/main.c |    6 +++++-
@@ -705,7 +705,7 @@ index da60ff5..535dfef 100644
 From eb1d160df6df18e40e096e0a340bc097603f2071 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 10 Aug 2009 11:20:37 +0100
-Subject: [PATCH 17/21] Handle delete-event in test-plugins
+Subject: [PATCH 17/22] Handle delete-event in test-plugins
 
 So we can have it exit cleanly for use with valgrind.
 ---
@@ -748,7 +748,7 @@ index ce4009b..ac06084 100644
 From bd1d8b99462098c03a1ec0f6ebae04c09f772575 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:45:01 +0100
-Subject: [PATCH 18/21] =?utf-8?q?Bug=C2=A0593777=20-=20duplicate=20object=20id=20in=20ui=20file?=
+Subject: [PATCH 18/22] =?utf-8?q?Bug=C2=A0593777=20-=20duplicate=20object=20id=20in=20ui=20file?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -778,7 +778,7 @@ index 459f8b2..6b03cfc 100644
 From 22484ca7b5d2f7c2f12fbf3423b3ad93f354e407 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 3 Sep 2009 18:17:43 +0100
-Subject: [PATCH 19/21] =?utf-8?q?Bug=C2=A0594055=20-=20applet=20fails=20to=20connect=20to=20any=20disconnected=20audio=20device?=
+Subject: [PATCH 19/22] =?utf-8?q?Bug=C2=A0594055=20-=20applet=20fails=20to=20connect=20to=20any=20disconnected=20audio=20device?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -845,7 +845,7 @@ index 7563c4c..450c38c 100644
 From 016e07941e3fac523f339f144aad0880118ccf36 Mon Sep 17 00:00:00 2001
 From: Stanislav Brabec <sbrabec at suse.cz>
 Date: Thu, 10 Sep 2009 16:20:35 +0100
-Subject: [PATCH 20/21] Fix crash on pairing request of known rfcomm device
+Subject: [PATCH 20/22] Fix crash on pairing request of known rfcomm device
 
 Fixes crash after access attempt to the device configured
 in rfcomm.conf, but not yet paired.
@@ -883,7 +883,7 @@ index c56cc8e..d7fef54 100644
 From d326df2d5b7f78222f70fb805c13ff0a54917535 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 11 Sep 2009 14:58:25 +0100
-Subject: [PATCH 21/21] Fix pairing with devices that require PIN entry
+Subject: [PATCH 21/22] Fix pairing with devices that require PIN entry
 
 If a device that has a fixed PIN was selected before a device that
 doesn't have one (for example, select a printer or audio headset,
@@ -910,3 +910,34 @@ index 4fde0de..31e10f7 100644
 -- 
 1.6.2.5
 
+
+From 8cc0b371d73b1ee53e405ce42e9cc51a7840847c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 21 Sep 2009 16:59:18 +0100
+Subject: [PATCH 22/22] Bug 595845 - The applet shows wrong connection information
+
+Fix status information in the applet not matching the service status.
+https://bugzilla.gnome.org/show_bug.cgi?id=595845
+---
+ applet/main.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/applet/main.c b/applet/main.c
+index e9b077d..07a8bd9 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -727,8 +727,9 @@ update_device_list (GtkTreeIter *parent)
+ 
+ 			list = g_hash_table_get_values (services);
+ 			for (l = list; l != NULL; l = l->next) {
+-				gboolean val = GPOINTER_TO_INT (l->data);
+-				if (val != FALSE) {
++				BluetoothStatus val = GPOINTER_TO_INT (l->data);
++				if (val == BLUETOOTH_STATUS_CONNECTED ||
++				    val == BLUETOOTH_STATUS_PLAYING) {
+ 					is_connected = TRUE;
+ 					break;
+ 				}
+-- 
+1.6.2.5
+


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- gnome-bluetooth.spec	16 Sep 2009 11:02:18 -0000	1.83
+++ gnome-bluetooth.spec	21 Sep 2009 16:07:50 -0000	1.84
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -8,6 +8,8 @@ License:	GPLv2+
 URL:		http://live.gnome.org/GnomeBluetooth
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
 # http://git.gnome.org/cgit/gnome-bluetooth/log/?h=fedora-11
+# Generated with:
+# git format-patch --stdout  59efa1c06153cd5bdaff64f7efca791c11c77f2f
 Patch0:		gbt-f11-backport.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -188,6 +190,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-3
+- Update backport to fix status in the applet
+
 * Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-2
 - Backport loads of bug fixes from master (#523001)
 



From tbzatek at fedoraproject.org  Mon Sep 21 16:31:31 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 21 Sep 2009 16:31:31 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.65, 1.66 gnome-keyring.spec, 
	1.129, 1.130 sources, 1.65, 1.66
Message-ID: <20090921163131.C4A5E11C0043@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12452

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
* Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	14 Sep 2009 23:21:47 -0000	1.65
+++ .cvsignore	21 Sep 2009 16:31:31 -0000	1.66
@@ -1 +1 @@
-gnome-keyring-2.27.92.tar.bz2
+gnome-keyring-2.28.0.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- gnome-keyring.spec	14 Sep 2009 23:13:44 -0000	1.129
+++ gnome-keyring.spec	21 Sep 2009 16:31:31 -0000	1.130
@@ -7,11 +7,11 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.27/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -141,6 +141,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	14 Sep 2009 23:21:47 -0000	1.65
+++ sources	21 Sep 2009 16:31:31 -0000	1.66
@@ -1 +1 @@
-2680e94500f540247af9d89f6aa9270b  gnome-keyring-2.27.92.tar.bz2
+07fa253d8506c22640d74eb4fc90a092  gnome-keyring-2.28.0.tar.bz2



From orion at fedoraproject.org  Mon Sep 21 16:35:33 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 21 Sep 2009 16:35:33 +0000 (UTC)
Subject: rpms/environment-modules/devel bash_completion.in, NONE,
	1.1 environment-modules.spec, 1.21, 1.22
Message-ID: <20090921163533.1037C11C0043@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13896

Modified Files:
	environment-modules.spec 
Added Files:
	bash_completion.in 
Log Message:
Add bash_completion.in from upstream CVS



--- NEW FILE bash_completion.in ---
#
# Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
#
_module_avail() {
@VERSIONING@	@BASEPREFIX@/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
@NOTVERSIONING@	@bindir@/modulecmd bash -t avail 2>&1 | sed '
		/:$/d;
		/:ERROR:/d;
		s#^\(.*\)/\(.\+\)(default)#\1\n\1\/\2#;
		s#/(default)##g;
		s#/*$##g;'
}

_module_not_yet_loaded() {
	comm -23  <(_module_avail|sort)  <(tr : '\n' <<<${LOADEDMODULES}|sort)
}

_module_long_arg_list() {
	local cur="$1" i

	if [[ ${COMP_WORDS[COMP_CWORD-2]} == sw* ]]
	then
		COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") )
		return
	fi
	for ((i = COMP_CWORD - 1; i > 0; i--))
	do case ${COMP_WORDS[$i]} in
	   add|load)
		COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") )
		break;;
	   rm|remove|unload|switch|swap)
		COMPREPLY=( $(IFS=: compgen -W "${LOADEDMODULES}" -- "$cur") )
		break;;
	   esac
	done
}

_module() {
	local cur="$2" prev="$3" cmds opts

	COMPREPLY=()

	cmds="add apropos avail clear display help\
	      initadd initclear initlist initprepend initrm initswitch\
	      keyword list load purge refresh rm show swap switch\
	      unload unuse update use whatis"

	opts="-c -f -h -i -l -s -t -u -v -H -V\
	      --create --force  --help  --human   --icase\
	      --long   --silent --terse --userlvl --verbose --version"

	case "$prev" in
	add|load)	COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") );;
	rm|remove|unload|switch|swap)
			COMPREPLY=( $(IFS=: compgen -W "${LOADEDMODULES}" -- "$cur") );;
	unuse)		COMPREPLY=( $(IFS=: compgen -W "${MODULEPATH}" -- "$cur") );;
	use|*-a*)	;;			# let readline handle the completion
	-u|--userlvl)	COMPREPLY=( $(compgen -W "novice expert advanced" -- "$cur") );;
	display|help|show|whatis)
			COMPREPLY=( $(compgen -W "$(_module_avail)" -- "$cur") );;
	*) if test $COMP_CWORD -gt 2
	   then
		_module_long_arg_list "$cur"
	   else
		case "$cur" in
		# The mappings below are optional abbreviations for convenience
		ls)	COMPREPLY="list";;	# map ls -> list
		r*)	COMPREPLY="rm";;	# also covers 'remove'
		sw*)	COMPREPLY="switch";;

		-*)	COMPREPLY=( $(compgen -W "$opts" -- "$cur") );;
		*)	COMPREPLY=( $(compgen -W "$cmds" -- "$cur") );;
		esac
	   fi;;
	esac
}
complete -o default -F _module module


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- environment-modules.spec	21 Sep 2009 16:06:49 -0000	1.21
+++ environment-modules.spec	21 Sep 2009 16:35:32 -0000	1.22
@@ -7,6 +7,8 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+#Pulled this from current CVS, missing from 3.2.7 tarball
+Source1:        bash_completion.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -38,6 +40,7 @@ have access to the module alias.
 
 %prep
 %setup -q -n modules-%{version}
+cp -p %SOURCE1 init/
 
 
 %build



From rdieter at fedoraproject.org  Mon Sep 21 16:41:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 16:41:09 +0000 (UTC)
Subject: rpms/skrooge/devel skrooge.spec,1.1,1.2
Message-ID: <20090921164109.DAD3011C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15846

Modified Files:
	skrooge.spec 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
- misc cosmetics
- mime scriptlets
- move icons to hicolor
- -libs: drop dup'd docs, add min kdelibs4 dep



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skrooge.spec	18 Sep 2009 08:52:48 -0000	1.1
+++ skrooge.spec	21 Sep 2009 16:41:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.1
-Release:        0.3.beta%{?dist}
+Release:        0.4.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -16,7 +16,9 @@ BuildRequires:  sqlite-devel
 BuildRequires:  kdelibs4-devel
 BuildRequires:  gettext
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -30,6 +32,7 @@ categorize them, and build reports of th
 Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       kdelibs4%{?_isa} >= %{kde4_version}
 
 %description libs
 Skrooge libraries
@@ -40,7 +43,7 @@ Skrooge libraries
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -48,8 +51,11 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install -C %{_target_platform} DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
+# hack to support non-oxygen icon users (gnome), drop when/if skrooge
+# ever provides hicolor icons (too).
+mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor 
 
 ## unpackaged devel files
 rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
@@ -78,12 +84,16 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun
 if [ $1 -eq 0 ] ; then
-   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+   touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+   update-desktop-database -q &> /dev/null
+   update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %files 
@@ -92,7 +102,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
 %{_kde4_appsdir}/skrooge/resources/*
@@ -107,12 +117,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README TODO
 %{_kde4_libdir}/kde4/plugins/designer/*.so*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
+- misc cosmetics
+- mime scriptlets
+- move icons to hicolor
+- -libs: drop dup'd docs, add min kdelibs4 dep
+
 * Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
 - Spec file corrections and Version correction
 



From mbarnes at fedoraproject.org  Mon Sep 21 16:54:53 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 21 Sep 2009 16:54:53 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.31,
	1.32 gnome-python2-desktop.spec, 1.68, 1.69 sources, 1.31, 1.32
Message-ID: <20090921165453.536D611C0043@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-serv21721

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-1.fc12
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	2 Sep 2009 04:16:29 -0000	1.31
+++ .cvsignore	21 Sep 2009 16:54:52 -0000	1.32
@@ -1 +1 @@
-gnome-python-desktop-2.27.3.tar.bz2
+gnome-python-desktop-2.28.0.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- gnome-python2-desktop.spec	2 Sep 2009 04:16:29 -0000	1.68
+++ gnome-python2-desktop.spec	21 Sep 2009 16:54:52 -0000	1.69
@@ -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.27.1
+# Last updated for version 2.28.0
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.27.3
+Version: 2.28.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
@@ -323,6 +323,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-1.fc12
+- Update to 2.28.0
+
 * Wed Sep 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.3-1.fc12
 - Update to 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	2 Sep 2009 04:16:29 -0000	1.31
+++ sources	21 Sep 2009 16:54:52 -0000	1.32
@@ -1 +1 @@
-8f727b090818327f92fe7b50704339c0  gnome-python-desktop-2.27.3.tar.bz2
+d97bb3d8e1adc00505be060fbc832f44  gnome-python-desktop-2.28.0.tar.bz2



From kasal at fedoraproject.org  Mon Sep 21 16:55:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 21 Sep 2009 16:55:44 +0000 (UTC)
Subject: rpms/perl-PAR-Dist/devel .cvsignore, 1.22, 1.23 perl-PAR-Dist.spec, 
	1.34, 1.35 sources, 1.22, 1.23
Message-ID: <20090921165544.9C58011C0043@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22614

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	2 Feb 2009 15:12:08 -0000	1.22
+++ .cvsignore	21 Sep 2009 16:55:43 -0000	1.23
@@ -1 +1 @@
-PAR-Dist-0.43.tar.gz
+PAR-Dist-0.46.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- perl-PAR-Dist.spec	26 Jul 2009 13:53:27 -0000	1.34
+++ perl-PAR-Dist.spec	21 Sep 2009 16:55:43 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           perl-PAR-Dist
-Version:        0.43
-Release:        3%{?dist}
+Version:        0.46
+Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 21 2009 Stepan Kasal <skasal at redhat.com> - 0.46-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.43-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	2 Feb 2009 15:12:08 -0000	1.22
+++ sources	21 Sep 2009 16:55:44 -0000	1.23
@@ -1 +1 @@
-7c5280385400d44e299d0b5762ebd72a  PAR-Dist-0.43.tar.gz
+fd629e651bfc7de7dc4b182a93ed897e  PAR-Dist-0.46.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:14 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165914.D703910F876@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 5 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From orion at fedoraproject.org  Mon Sep 21 16:59:35 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 21 Sep 2009 16:59:35 +0000 (UTC)
Subject: rpms/environment-modules/F-11 bash_completion.in, NONE,
	1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.8, 1.9 environment-modules.spec, 1.18,
	1.19 sources, 1.8, 1.9 modules-3.2.6-versioning.patch, 1.1, NONE
Message-ID: <20090921165935.5B2A511C0043@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23958/F-11

Modified Files:
	.cvsignore environment-modules.spec sources 
Added Files:
	bash_completion.in import.log 
Removed Files:
	modules-3.2.6-versioning.patch 
Log Message:
* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
- Update to 3.2.7, fixes bug #524475
- Drop versioning patch fixed upstream



--- NEW FILE bash_completion.in ---
#
# Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
#
_module_avail() {
@VERSIONING@	@BASEPREFIX@/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
@NOTVERSIONING@	@bindir@/modulecmd bash -t avail 2>&1 | sed '
		/:$/d;
		/:ERROR:/d;
		s#^\(.*\)/\(.\+\)(default)#\1\n\1\/\2#;
		s#/(default)##g;
		s#/*$##g;'
}

_module_not_yet_loaded() {
	comm -23  <(_module_avail|sort)  <(tr : '\n' <<<${LOADEDMODULES}|sort)
}

_module_long_arg_list() {
	local cur="$1" i

	if [[ ${COMP_WORDS[COMP_CWORD-2]} == sw* ]]
	then
		COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") )
		return
	fi
	for ((i = COMP_CWORD - 1; i > 0; i--))
	do case ${COMP_WORDS[$i]} in
	   add|load)
		COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") )
		break;;
	   rm|remove|unload|switch|swap)
		COMPREPLY=( $(IFS=: compgen -W "${LOADEDMODULES}" -- "$cur") )
		break;;
	   esac
	done
}

_module() {
	local cur="$2" prev="$3" cmds opts

	COMPREPLY=()

	cmds="add apropos avail clear display help\
	      initadd initclear initlist initprepend initrm initswitch\
	      keyword list load purge refresh rm show swap switch\
	      unload unuse update use whatis"

	opts="-c -f -h -i -l -s -t -u -v -H -V\
	      --create --force  --help  --human   --icase\
	      --long   --silent --terse --userlvl --verbose --version"

	case "$prev" in
	add|load)	COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") );;
	rm|remove|unload|switch|swap)
			COMPREPLY=( $(IFS=: compgen -W "${LOADEDMODULES}" -- "$cur") );;
	unuse)		COMPREPLY=( $(IFS=: compgen -W "${MODULEPATH}" -- "$cur") );;
	use|*-a*)	;;			# let readline handle the completion
	-u|--userlvl)	COMPREPLY=( $(compgen -W "novice expert advanced" -- "$cur") );;
	display|help|show|whatis)
			COMPREPLY=( $(compgen -W "$(_module_avail)" -- "$cur") );;
	*) if test $COMP_CWORD -gt 2
	   then
		_module_long_arg_list "$cur"
	   else
		case "$cur" in
		# The mappings below are optional abbreviations for convenience
		ls)	COMPREPLY="list";;	# map ls -> list
		r*)	COMPREPLY="rm";;	# also covers 'remove'
		sw*)	COMPREPLY="switch";;

		-*)	COMPREPLY=( $(compgen -W "$opts" -- "$cur") );;
		*)	COMPREPLY=( $(compgen -W "$cmds" -- "$cur") );;
		esac
	   fi;;
	esac
}
complete -o default -F _module module


--- NEW FILE import.log ---
environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Nov 2007 18:06:34 -0000	1.8
+++ .cvsignore	21 Sep 2009 16:59:34 -0000	1.9
@@ -1 +1 @@
-modules-3.2.6.tar.bz2
+modules-3.2.7.tar.bz2


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- environment-modules.spec	24 Feb 2009 15:09:11 -0000	1.18
+++ environment-modules.spec	21 Sep 2009 16:59:34 -0000	1.19
@@ -1,13 +1,14 @@
 Name:           environment-modules
-Version:        3.2.6
-Release:        7%{?dist}
+Version:        3.2.7
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-Patch0:         modules-3.2.6-versioning.patch
+#Pulled this from current CVS, missing from 3.2.7 tarball
+Source1:        bash_completion.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -33,10 +34,13 @@ Modules are useful in managing different
 Modules can also be bundled into metamodules that will load an entire
 suite of different applications.
 
+NOTE: You will need to get a new shell after installing this package to
+have access to the module alias.
+
 
 %prep
 %setup -q -n modules-%{version}
-%patch0 -p1 -b .versioning
+cp -p %SOURCE1 init/
 
 
 %build
@@ -72,6 +76,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
+- Update to 3.2.7, fixes bug #524475
+- Drop versioning patch fixed upstream
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Nov 2007 18:06:34 -0000	1.8
+++ sources	21 Sep 2009 16:59:34 -0000	1.9
@@ -1 +1 @@
-59bc6401efbc677d6190b00a440cccdf  modules-3.2.6.tar.bz2
+ab3b3be9e5d4938a10281c7e194b3709  modules-3.2.7.tar.bz2


--- modules-3.2.6-versioning.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:39 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165939.BE0F810F87E@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora devel is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:43 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165943.D36A710F889@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 7 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:47 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165947.3338010F890@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 6 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:48 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165948.2DED510F89B@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 8 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:50 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165952.17B3210F8A0@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 10 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:48 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165949.C4AF510F89E@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 9 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From pkgdb at fedoraproject.org  Mon Sep 21 16:59:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 16:59:52 +0000
Subject: [pkgdb] epiphany-extensions ownership updated
Message-ID: <20090921165952.DF32A10F8A3@bastion2.fedora.phx.redhat.com>

Package epiphany-extensions in Fedora 11 is now owned by pgordon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/epiphany-extensions



From orion at fedoraproject.org  Mon Sep 21 17:00:11 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 21 Sep 2009 17:00:11 +0000 (UTC)
Subject: rpms/environment-modules/devel modules-3.2.6-versioning.patch, 1.1, 
	NONE
Message-ID: <20090921170011.221F111C0416@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24431

Removed Files:
	modules-3.2.6-versioning.patch 
Log Message:
Remove the patch



--- modules-3.2.6-versioning.patch DELETED ---



From ajax at fedoraproject.org  Mon Sep 21 17:25:51 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 21 Sep 2009 17:25:51 +0000 (UTC)
Subject: rpms/system-config-display/devel .cvsignore, 1.40, 1.41 sources,
	1.48, 1.49 system-config-display.spec, 1.70, 1.71
Message-ID: <20090921172551.5147711C0043@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/system-config-display/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1155

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
* Mon Sep 21 2009 Adam Jackson <ajax at redhat.com> 2.2-1
- s-c-d 2.2
- Prov/Obs: rhpxl



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	9 Sep 2009 15:50:28 -0000	1.40
+++ .cvsignore	21 Sep 2009 17:25:50 -0000	1.41
@@ -1 +1,2 @@
 system-config-display-2.1.tar.bz2
+system-config-display-2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	9 Sep 2009 15:50:28 -0000	1.48
+++ sources	21 Sep 2009 17:25:50 -0000	1.49
@@ -1 +1 @@
-31233e8a1f778c64ad728288071d4b86  system-config-display-2.1.tar.bz2
+253334402a2e503a5dd144a7f209e2a9  system-config-display-2.2.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- system-config-display.spec	18 Sep 2009 16:04:28 -0000	1.70
+++ system-config-display.spec	21 Sep 2009 17:25:51 -0000	1.71
@@ -1,6 +1,8 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 2.1
+Version: 2.2
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
@@ -8,6 +10,9 @@ ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Provides: rhpxl = 1.12-4.fc12
+Obsoletes: rhpxl < 1.12-4.fc12
+
 Source0: http://fedorahosted.org/releases/s/y/%{name}/%{name}-%{version}.tar.bz2
 
 ExcludeArch: s390 s390x
@@ -75,8 +80,13 @@ fi
 %attr(0644,root,root) %config /etc/security/console.apps/system-config-display
 %attr(0644,root,root) %config /etc/pam.d/system-config-display
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
+%{python_sitearch}/_pyrandr*
 
 %changelog
+* Mon Sep 21 2009 Adam Jackson <ajax at redhat.com> 2.2-1
+- s-c-d 2.2
+- Prov/Obs: rhpxl
+
 * Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.1-1
 - s-c-d 2.1
 



From kasal at fedoraproject.org  Mon Sep 21 17:29:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 21 Sep 2009 17:29:29 +0000 (UTC)
Subject: rpms/perl-PAR-Packer/devel perl-PAR-Packer.spec,1.2,1.3
Message-ID: <20090921172929.5B7CA11C0043@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PAR-Packer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2369

Modified Files:
	perl-PAR-Packer.spec 
Log Message:
- patch to use $RPM_OPT_FLAGS
- patch to submit the third parameter to open()


Index: perl-PAR-Packer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Packer/devel/perl-PAR-Packer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-PAR-Packer.spec	26 Jul 2009 13:53:42 -0000	1.2
+++ perl-PAR-Packer.spec	21 Sep 2009 17:29:29 -0000	1.3
@@ -1,11 +1,13 @@
 Name:           perl-PAR-Packer
 Version:        0.991
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PAR Packager
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PAR-Packer/
 Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/PAR-Packer-%{version}.tar.gz
+Patch0:		perl-PAR-Packer-cflags.patch
+Patch1:		perl-PAR-Packer-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Archive::Zip) >= 1
 BuildRequires:  perl(Compress::Zlib) >= 1.3
@@ -23,10 +25,14 @@ stand-alone executables, perl scripts an
 
 %prep
 %setup -q -n PAR-Packer-%{version}
+%patch0 -p1 -b.cflags
+%patch1 -p1 -b.open
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-make
+# The Makefile is not parallel-safe.
+# PAR_GLOBAL_TEMP seems to be needed for the build.
+make PAR_GLOBAL_TEMP=/var/tmp
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,7 +46,10 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-#make test
+export PAR_GLOBAL_TEMP=/var/tmp
+export PAR_GLOBAL_TMPDIR=/var/tmp
+## does not pass
+# make test PERL_TEST_POD=1 || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
-/usr/lib/perl5/vendor_perl/5.10.0/*
+%{perl_vendorlib}/*
 %{_bindir}/par.pl
 %{_bindir}/parl
 %{_bindir}/parldyn
@@ -58,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 21 2009 Stepan Kasal <skasal at redhat.com> - 0.991-3
+- patch to use $RPM_OPT_FLAGS
+- patch to submit the third parameter to open()
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.991-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Sep 21 17:29:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 17:29:35 +0000 (UTC)
Subject: rpms/xforms/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xforms.spec,
	1.30, 1.31
Message-ID: <20090921172935.A950C11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	.cvsignore sources xforms.spec 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-1.sp1
- xforms-1.0.92sp1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Sep 2009 12:42:13 -0000	1.6
+++ .cvsignore	21 Sep 2009 17:29:35 -0000	1.7
@@ -1,2 +1 @@
-xforms-1.0.92pre8.tar.gz
-xforms-1.0.92pre8.tar.gz.sig
+xforms-1.0.92sp1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Sep 2009 12:42:13 -0000	1.6
+++ sources	21 Sep 2009 17:29:35 -0000	1.7
@@ -1,2 +1 @@
-6f5092966b20f63acdc5c7e6c13436f3  xforms-1.0.92pre8.tar.gz
-3dc664cc57369f018af53079f49da016  xforms-1.0.92pre8.tar.gz.sig
+3d23731c0bdd065b54d258c92d15cbd2  xforms-1.0.92sp1.tar.gz


Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xforms.spec	2 Sep 2009 12:42:13 -0000	1.30
+++ xforms.spec	21 Sep 2009 17:29:35 -0000	1.31
@@ -1,21 +1,19 @@
 
-%define pre pre8
+%define pre sp1 
 
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.92
-Release: 0.2.%{pre}%{?dist}
+Release: 1.%{pre}%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
 #URL:     http://www.nongnu.org/xforms/
 URL:     http://xforms-toolkit.org/
 Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
-Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig 
+#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamed patches
-
 BuildRequires: libjpeg-devel
 %define x_deps xorg-x11-devel libGL-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
@@ -99,6 +97,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-1.sp1
+- xforms-1.0.92sp1
+
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.4.pre13
+- xforms-1.0.92pre13
+
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.3.pre12
+- xforms-1.0.92pre12
+
 * Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.2.pre8
 - xforms-1.0.92pre8
 



From mbarnes at fedoraproject.org  Mon Sep 21 17:30:21 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 21 Sep 2009 17:30:21 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.56,1.394.2.57
Message-ID: <20090921173021.8955D11C0338@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2689

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:

* Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.1.fc12
- Bump version to 2.28.99 to stay ahead of Fedora 12.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.56
retrieving revision 1.394.2.57
diff -u -p -r1.394.2.56 -r1.394.2.57
--- evolution.spec	21 Sep 2009 04:39:12 -0000	1.394.2.56
+++ evolution.spec	21 Sep 2009 17:30:21 -0000	1.394.2.57
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.99
-Release: 1.kb.10%{?dist}
+Version: 2.28.99
+Release: 1.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -68,7 +68,7 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# Override the version to 2.27.99 (and API_VERSION to 2.28).
+# Override the version to 2.28.99 (and API_VERSION to 2.28).
 Patch13: evolution-kb-override-version.patch
 
 ## Dependencies ###
@@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.1.fc12
+- Bump version to 2.28.99 to stay ahead of Fedora 12.
+
 * Sun Sep 20 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.10.fc12
 - Snapshot of "kill-bonobo" progress at commit 41dbadc.
 



From kasal at fedoraproject.org  Mon Sep 21 17:33:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 21 Sep 2009 17:33:54 +0000 (UTC)
Subject: rpms/perl-PAR-Packer/devel perl-PAR-Packer-cflags.patch, NONE,
	1.1 perl-PAR-Packer-open.patch, NONE, 1.1
Message-ID: <20090921173354.C8A6111C0043@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PAR-Packer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3821

Added Files:
	perl-PAR-Packer-cflags.patch perl-PAR-Packer-open.patch 
Log Message:
- patch to use $RPM_OPT_FLAGS
- patch to submit the third parameter to open()

perl-PAR-Packer-cflags.patch:
 Makefile.PL |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE perl-PAR-Packer-cflags.patch ---
--- PAR-Packer-0.991/myldr/Makefile.PL.cflags	2009-03-21 11:58:51.000000000 +0100
+++ PAR-Packer-0.991/myldr/Makefile.PL	2009-09-21 17:14:11.000000000 +0200
@@ -123,6 +123,7 @@
 
 
 my  $cflags = "$ccdebug$warn$pccflags";
+my $optimize = $Config{optimize};
 my $ldflags = "$lddebug$pldflags";
 my $static_ldflags = $ldflags;
 
@@ -206,6 +207,7 @@
 LD=$ld
 CC=$cc
 CFLAGS=$cflags
+OPTIMIZE=$optimize
 LDFLAGS=$Config{ldflags}
 PERL_LDFLAGS=$ldflags
 STATIC_LDFLAGS=$static_ldflags
@@ -214,7 +216,7 @@
 OBJECTS=main$o my_par_pl$o $res
 
 .c$o:
-	\$(CC) -c \$(CFLAGS) \$<
+	\$(CC) -c \$(CFLAGS) \$(OPTIMIZE) \$<
 
 all: $all
 

perl-PAR-Packer-open.patch:
 static.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-PAR-Packer-open.patch ---
--- PAR-Packer-0.991/myldr/static.c.orig	2009-09-21 17:29:38.000000000 +0200
+++ PAR-Packer-0.991/myldr/static.c	2009-09-21 17:28:42.000000000 +0200
@@ -31,7 +31,7 @@
         if ( (unsigned long)PL_statbuf.st_size == size ) return -2;
     }
 
-    i = open(my_file, O_CREAT | O_WRONLY | OPEN_O_BINARY);
+    i = open(my_file, O_CREAT | O_WRONLY | OPEN_O_BINARY, 0777);
 
     if (i == -1) {
         fprintf(stderr, "%s: creation of %s failed - aborting with %i.\n", argv0, my_file, errno);



From roland at fedoraproject.org  Mon Sep 21 17:44:00 2009
From: roland at fedoraproject.org (roland)
Date: Mon, 21 Sep 2009 17:44:00 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-0.143.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.49, 1.50 Makefile, 1.31, 1.32 elfutils-portability.patch, 1.45,
	1.46 elfutils-robustify.patch, 1.18, 1.19 elfutils.spec, 1.118,
	1.119 sources, 1.53, 1.54 elfutils-0.142.tar.bz2.sig, 1.1, NONE
Message-ID: <20090921174400.8E6DD11C0043@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8308

Modified Files:
	.cvsignore Makefile elfutils-portability.patch 
	elfutils-robustify.patch elfutils.spec sources 
Added Files:
	elfutils-0.143.tar.bz2.sig 
Removed Files:
	elfutils-0.142.tar.bz2.sig 
Log Message:
Update to 0.143


--- NEW FILE elfutils-0.143.tar.bz2.sig ---
?F
	?(?:y?Dtq?

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	29 Jul 2009 02:19:14 -0000	1.49
+++ .cvsignore	21 Sep 2009 17:43:59 -0000	1.50
@@ -1 +1 @@
-elfutils-0.142.tar.bz2
+elfutils-0.143.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Makefile	24 Jan 2009 01:16:36 -0000	1.31
+++ Makefile	21 Sep 2009 17:43:59 -0000	1.32
@@ -34,15 +34,18 @@ patches := $(patsubst %,elfutils-%.patch
 all: $(patches)
 
 branch-portability = portable
-branch-master = elfutils-$(VERSION)
 
-elfutils-%/configure: .git/refs/heads/* Makefile
+git-%/configure: .git/refs/heads/* Makefile
 	@rm -rf $(@D)
 	git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf -
 	cd $(@D) && autoreconf -i && rm -rf autom4te.cache
 
-elfutils-%.patch: elfutils-master/configure elfutils-%/configure
-	diff --exclude='.gitignore' -Nrpu $(^D) | \
+elfutils-%.patch: git-%/configure
+	branch=$(firstword $(branch-$*) $*); \
+	master=`git merge-base origin/master $$branch` && \
+	master=`git describe --tags --always $$master` && \
+	(set -x; $(MAKE) git-$$master/configure) && \
+	(set -x; diff --exclude='.gitignore' -Nrpu git-$$master $(<D)) | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@
 

elfutils-portability.patch:
 ChangeLog            |   21 +++++
 Makefile.in          |    2 
 backends/ChangeLog   |   12 ++
 backends/Makefile.am |    6 -
 backends/Makefile.in |    8 +
 config.h.in          |    6 +
 config/Makefile.in   |    2 
 configure            |  214 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   53 ++++++++++++
 lib/ChangeLog        |    8 +
 lib/Makefile.am      |    3 
 lib/Makefile.in      |    6 -
 lib/eu-config.h      |   11 ++
 libasm/ChangeLog     |    5 +
 libasm/Makefile.am   |    3 
 libasm/Makefile.in   |    6 -
 libcpu/ChangeLog     |    8 +
 libcpu/Makefile.am   |    3 
 libcpu/Makefile.in   |   11 +-
 libcpu/i386_disasm.c |    1 
 libdw/ChangeLog      |    9 ++
 libdw/Makefile.am    |    3 
 libdw/Makefile.in    |    7 +
 libdw/libdw.h        |    2 
 libdwfl/ChangeLog    |    5 +
 libdwfl/Makefile.am  |    3 
 libdwfl/Makefile.in  |    6 -
 libebl/ChangeLog     |    5 +
 libebl/Makefile.am   |    3 
 libebl/Makefile.in   |    6 -
 libelf/ChangeLog     |    5 +
 libelf/Makefile.am   |    3 
 libelf/Makefile.in   |    6 -
 libelf/common.h      |    4 
 m4/Makefile.in       |    2 
 src/ChangeLog        |   30 +++++++
 src/Makefile.am      |    6 +
 src/Makefile.in      |    9 +-
 src/addr2line.c      |    4 
 src/findtextrel.c    |    6 +
 src/ld.h             |    2 
 src/readelf.c        |    2 
 src/strings.c        |   11 ++
 src/strip.c          |   20 ++++
 tests/ChangeLog      |    7 +
 tests/Makefile.am    |    5 -
 tests/Makefile.in    |    6 -
 tests/line2addr.c    |    2 
 48 files changed, 520 insertions(+), 48 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- elfutils-portability.patch	29 Jul 2009 02:19:14 -0000	1.45
+++ elfutils-portability.patch	21 Sep 2009 17:43:59 -0000	1.46
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -48,6 +48,10 @@
+@@ -57,6 +57,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -375,6 +379,11 @@
+@@ -384,6 +388,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -397,6 +406,9 @@
+@@ -406,6 +415,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -101,7 +101,18 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -9,6 +9,8 @@
+@@ -6,6 +6,10 @@
+ 
+ 	* configure.ac (zip_LIBS): Check for liblzma too.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
++
+ 2009-04-19  Roland McGrath  <roland at redhat.com>
+ 
+ 	* configure.ac (eu_version): Round down here, not in version.h macros.
+@@ -17,6 +21,8 @@
  
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
@@ -110,7 +121,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -89,6 +91,10 @@
+@@ -97,6 +103,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -121,7 +132,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -136,6 +142,17 @@
+@@ -144,6 +154,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -168,7 +179,7 @@
  /* $libdir subdirectory containing libebl modules. */
  #undef LIBEBL_SUBDIR
  
-@@ -52,4 +55,7 @@
+@@ -55,4 +58,7 @@
  /* Define for large files, on AIX-style hosts. */
  #undef _LARGE_FILES
  
@@ -178,7 +189,7 @@
  #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -644,6 +644,8 @@ NATIVE_LD_FALSE
+@@ -646,6 +646,8 @@ NATIVE_LD_FALSE
  NATIVE_LD_TRUE
  DATADIRNAME
  LOCALEDIR
@@ -187,7 +198,7 @@
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -4094,6 +4096,152 @@ $as_echo "$as_me: error: gcc with C99 su
+@@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su
  fi
  
  
@@ -240,6 +251,59 @@
 +fi
 +
 +
++{ $as_echo "$as_me:$LINENO: checking for -fgnu89-inline option to $CC" >&5
++$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
++if test "${ac_cv_cc_gnu89_inline+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline -Werror"
++cat >conftest.$ac_ext <<_ACEOF
++
++void foo (void)
++{
++  inline void bar (void) {}
++  bar ();
++}
++extern inline void baz (void) {}
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_cc_gnu89_inline=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_cc_gnu89_inline=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$old_CFLAGS"
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_gnu89_inline" >&5
++$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
++if test "x$ac_cv_cc_gnu89_inline" = xyes; then
++  WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
++fi
++
++
 +{ $as_echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
 +$as_echo_n "checking for --as-needed linker option... " >&6; }
 +if test "${ac_cv_as_needed+set}" = set; then
@@ -340,7 +404,7 @@
  { $as_echo "$as_me:$LINENO: checking for __thread support" >&5
  $as_echo_n "checking for __thread support... " >&6; }
  if test "${ac_cv_tls+set}" = set; then
-@@ -4159,9 +4307,18 @@ fi
+@@ -4163,9 +4364,18 @@ fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
  $as_echo "$ac_cv_tls" >&6; }
  if test "x$ac_cv_tls" != xyes; then
@@ -363,7 +427,7 @@
  
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -74,6 +74,39 @@ CFLAGS="$old_CFLAGS"])
+@@ -73,6 +73,54 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
@@ -376,6 +440,21 @@
 +AC_SUBST(WEXTRA)
 +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
 +
++AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
++old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline -Werror"
++AC_COMPILE_IFELSE([
++void foo (void)
++{
++  inline void bar (void) {}
++  bar ();
++}
++extern inline void baz (void) {}
++], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
++CFLAGS="$old_CFLAGS"])
++AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
++      [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
++
 +AC_CACHE_CHECK([for --as-needed linker option],
 +	       ac_cv_as_needed, [dnl
 +cat > conftest.c <<EOF
@@ -403,7 +482,7 @@
  AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
  # Use the same flags that we use for our DSOs, so the test is representative.
  # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -89,7 +122,10 @@ static __thread int a; int foo (int b) {
+@@ -88,7 +136,10 @@ static __thread int a; int foo (int b) {
  CFLAGS="$save_CFLAGS"
  LDFLAGS="$save_LDFLAGS"])
  AS_IF([test "x$ac_cv_tls" != xyes],
@@ -417,7 +496,8 @@
  AC_SUBST(LOCALEDIR)
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -4,6 +4,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
@@ -426,7 +506,7 @@
  	* eu-config.h: Add multiple inclusion protection.
  
  2009-01-17  Ulrich Drepper  <drepper at redhat.com>
-@@ -56,6 +59,11 @@
+@@ -60,6 +63,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -440,7 +520,7 @@
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
 --- elfutils/lib/eu-config.h
 +++ elfutils/lib/eu-config.h
-@@ -182,5 +182,16 @@ asm (".section predict_data, \"aw\"; .pr
+@@ -182,6 +182,17 @@ asm (".section predict_data, \"aw\"; .pr
  /* This macro is used by the tests conditionalize for standalone building.  */
  #define ELFUTILS_HEADER(name) <lib##name.h>
  
@@ -456,7 +536,8 @@
 +#endif	/* HAVE_BUILTIN_POPCOUNT */
 +
  
- #endif	/* eu-config.h */
+ #ifdef SHARED
+ # define OLD_VERSION(name, version) \
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
 @@ -25,12 +25,13 @@
@@ -647,7 +728,18 @@
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -738,6 +738,11 @@
+@@ -20,6 +20,10 @@
+ 
+ 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* libdw.h: Disable extern inlines for GCC 4.2.
++
+ 2009-08-10  Roland McGrath  <roland at redhat.com>
+ 
+ 	* dwarf_getscopevar.c: Use dwarf_diename.
+@@ -788,6 +792,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -659,6 +751,17 @@
  	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
  	formref offset.
  
+--- elfutils/libdw/libdw.h
++++ elfutils/libdw/libdw.h
+@@ -809,7 +809,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+ 
+ 
+ /* Inline optimizations.  */
+-#ifdef __OPTIMIZE__
++#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+ /* Return attribute code of given attribute.  */
+ __libdw_extern_inline unsigned int
+ dwarf_whatattr (Dwarf_Attribute *attr)
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
 @@ -25,6 +25,7 @@
@@ -711,7 +814,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1098,6 +1098,11 @@
+@@ -1139,6 +1139,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -742,7 +845,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -750,7 +853,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -205,6 +206,7 @@ SHELL = @SHELL@
+@@ -208,6 +209,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -758,7 +861,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -263,9 +265,9 @@ top_builddir = @top_builddir@
+@@ -266,9 +268,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -772,7 +875,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -593,6 +593,11 @@
+@@ -603,6 +603,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -833,7 +936,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -576,6 +576,11 @@
+@@ -580,6 +580,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -968,7 +1071,24 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -155,6 +155,8 @@
+@@ -7,8 +7,16 @@
+ 	* readelf.c (attr_callback): Use print_block only when we don't use
+ 	print_ops.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* ld.h: Disable extern inlines for GCC 4.2.
++
+ 2009-08-14  Roland McGrath  <roland at redhat.com>
+ 
++	* strings.c (read_block): Conditionalize posix_fadvise use
++	on [POSIX_FADV_SEQUENTIAL].
++	From Petr Salinger <Petr.Salinger at seznam.cz>.
++
+ 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
+ 
+ 2009-08-01  Ulrich Drepper  <drepper at redhat.com>
+@@ -172,6 +180,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -977,7 +1097,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -338,6 +340,11 @@
+@@ -355,6 +365,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -989,7 +1109,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -589,6 +596,8 @@
+@@ -606,6 +621,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -998,7 +1118,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -1028,6 +1037,10 @@
+@@ -1045,6 +1062,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1009,7 +1129,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1104,6 +1117,10 @@
+@@ -1121,6 +1142,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1020,7 +1140,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1452,6 +1469,11 @@
+@@ -1469,6 +1494,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1047,6 +1167,23 @@
  	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
  	   const char *fname, bool more_than_one, void **knownsrcs)
  {
+--- elfutils/src/ld.h
++++ elfutils/src/ld.h
+@@ -1122,6 +1122,7 @@ extern bool dynamically_linked_p (void);
+ 
+ /* Checked whether the symbol is undefined and referenced from a DSO.  */
+ extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
++#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+ #ifdef __GNUC_STDC_INLINE__
+ __attribute__ ((__gnu_inline__))
+ #endif
+@@ -1139,5 +1140,6 @@ linked_from_dso_p (struct scninfo *scnin
+ 
+   return sym->defined && sym->in_dso;
+ }
++#endif	/* Optimizing and not GCC 4.2.  */
+ 
+ #endif	/* ld.h */
 --- elfutils/src/Makefile.am
 +++ elfutils/src/Makefile.am
 @@ -26,6 +26,7 @@
@@ -1122,7 +1259,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7591,7 +7591,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7594,7 +7594,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1158,6 +1295,18 @@
  	  break;
  	}
        if (errno != EINVAL && errno != ENOMEM)
+@@ -586,9 +595,11 @@ read_block (int fd, const char *fname, o
+       elfmap_off = from & ~(ps - 1);
+       elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
+ 
++#ifdef POSIX_FADV_SEQUENTIAL
+       if (unlikely (elfmap == MAP_FAILED))
+ 	/* Let the kernel know we are going to read everything in sequence.  */
+ 	(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
++#endif
+     }
+ 
+   if (unlikely (elfmap == MAP_FAILED))
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
 @@ -52,6 +52,12 @@

elfutils-robustify.patch:
 libelf/ChangeLog              |   43 +++++++++++++++++
 libelf/elf32_getphdr.c        |   12 ++++
 libelf/elf32_getshdr.c        |   15 +++++-
 libelf/elf32_newphdr.c        |    6 ++
 libelf/elf32_updatefile.c     |    7 ++
 libelf/elf_begin.c            |   47 ++++++++++++++++++-
 libelf/elf_getarsym.c         |    3 +
 libelf/elf_getshdrstrndx.c    |   42 ++++++++++++++---
 libelf/elf_newscn.c           |   10 +++-
 libelf/gelf_getdyn.c          |    6 +-
 libelf/gelf_getlib.c          |    4 -
 libelf/gelf_getmove.c         |    4 -
 libelf/gelf_getrel.c          |   12 +---
 libelf/gelf_getrela.c         |   12 +---
 libelf/gelf_getsym.c          |    6 +-
 libelf/gelf_getsyminfo.c      |    4 -
 libelf/gelf_getsymshndx.c     |    8 +--
 libelf/gelf_getversym.c       |    4 -
 libelf/gelf_update_dyn.c      |   12 +---
 libelf/gelf_update_lib.c      |   10 ----
 libelf/gelf_update_move.c     |    5 --
 libelf/gelf_update_rel.c      |   12 +---
 libelf/gelf_update_rela.c     |   12 +---
 libelf/gelf_update_sym.c      |   12 +---
 libelf/gelf_update_syminfo.c  |   10 ----
 libelf/gelf_update_symshndx.c |   12 +---
 libelf/gelf_update_versym.c   |    5 --
 libelf/libelfP.h              |    4 +
 src/ChangeLog                 |   23 +++++++++
 src/elflint.c                 |  101 +++++++++++++++++++++++++++++++-----------
 src/readelf.c                 |   92 +++++++++++++++++++++++++++-----------
 src/strip.c                   |   70 +++++++++++++++++++----------
 32 files changed, 434 insertions(+), 191 deletions(-)

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- elfutils-robustify.patch	29 Jul 2009 02:19:14 -0000	1.18
+++ elfutils-robustify.patch	21 Sep 2009 17:43:59 -0000	1.19
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -568,6 +568,49 @@
+@@ -572,6 +572,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -52,6 +52,13 @@
  	* elf.h: Update again.
 --- elfutils/libelf/elf32_getphdr.c
 +++ elfutils/libelf/elf32_getphdr.c
+@@ -1,5 +1,5 @@
+ /* Get ELF program header table.
+-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
+ 
 @@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -59,7 +66,7 @@
 +	  /* First see whether the information in the ELF header is
 +	     valid and it does not ask for too much.  */
 +	  if (unlikely (ehdr->e_phoff >= elf->maximum_size)
-+	      || unlikely (ehdr->e_phoff + size > elf->maximum_size))
++	      || unlikely (elf->maximum_size - ehdr->e_phoff < size))
 +	    {
 +	      /* Something is wrong.  */
 +	      __libelf_seterrno (ELF_E_INVALID_PHDR);
@@ -95,7 +102,7 @@
 +      /* First see whether the information in the ELF header is
 +	 valid and it does not ask for too much.  */
 +      if (unlikely (ehdr->e_shoff >= elf->maximum_size)
-+	  || unlikely (ehdr->e_shoff + size > elf->maximum_size))
++	  || unlikely (elf->maximum_size - ehdr->e_shoff < size))
 +	{
 +	  /* Something is wrong.  */
 +	  __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -145,13 +152,20 @@
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
 --- elfutils/libelf/elf_begin.c
 +++ elfutils/libelf/elf_begin.c
+@@ -1,5 +1,5 @@
+ /* Create descriptor for processing file.
+-   Copyright (C) 1998-2005, 2006, 2007, 2008 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
+ 
 @@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
 -	  if (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize)
 +	  if (unlikely (ehdr.e32->e_shoff >= maxsize)
-+	      || unlikely (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize))
++	      || unlikely (maxsize - ehdr.e32->e_shoff < sizeof (Elf32_Shdr)))
  	    /* Cannot read the first section header.  */
  	    return 0;
  
@@ -181,14 +195,14 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -318,13 +329,31 @@ file_read_elf (int fildes, void *map_add
+@@ -318,13 +329,30 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
 +
 +	  if (unlikely (ehdr->e_shoff >= maxsize)
-+	      || unlikely (ehdr->e_shoff
-+			   + scncnt * sizeof (Elf32_Shdr) > maxsize))
++	      || unlikely (maxsize - ehdr->e_shoff
++			   < scncnt * sizeof (Elf32_Shdr)))
 +	    {
 +	    free_and_out:
 +	      free (elf);
@@ -203,9 +217,8 @@
  	    /* Assign a value only if there really is a program
  	       header.  Otherwise the value remains NULL.  */
 +	      if (unlikely (ehdr->e_phoff >= maxsize)
-+		  || unlikely (ehdr->e_phoff
-+			       + ehdr->e_phnum
-+			       * sizeof (Elf32_Phdr) > maxsize))
++		  || unlikely (maxsize - ehdr->e_phoff
++			       < ehdr->e_phnum * sizeof (Elf32_Phdr)))
 +		goto free_and_out;
  	    elf->state.elf32.phdr
  	      = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
@@ -213,7 +226,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -406,13 +435,26 @@ file_read_elf (int fildes, void *map_add
+@@ -406,13 +434,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -262,11 +275,13 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf32_Shdr) - 1)) == 0))
+-		/* We can directly access the memory.  */
+-		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
-+		  if (unlikely (offset + sizeof (Elf32_Shdr)
-+				> elf->maximum_size))
++		  if (unlikely (elf->maximum_size - offset
++				< sizeof (Elf32_Shdr)))
 +		    {
 +		      /* Something is wrong.  */
 +		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -274,8 +289,7 @@
 +		      goto out;
 +		    }
 +
- 		/* We can directly access the memory.  */
--		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
++		  /* We can directly access the memory.  */
 +		  num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset
 +					 + offset))->sh_link;
 +		}
@@ -290,11 +304,13 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf64_Shdr) - 1)) == 0))
+-		/* We can directly access the memory.  */
+-		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
-+		  if (unlikely (offset + sizeof (Elf64_Shdr)
-+				> elf->maximum_size))
++		  if (unlikely (elf->maximum_size - offset
++				< sizeof (Elf64_Shdr)))
 +		    {
 +		      /* Something is wrong.  */
 +		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -302,10 +318,9 @@
 +		      goto out;
 +		    }
 +
- 		/* We can directly access the memory.  */
--		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
-+		  num = ((Elf64_Shdr *) (elf->map_address
-+			 + elf->start_offset + offset))->sh_link;
++		  /* We can directly access the memory.  */
++		  num = ((Elf64_Shdr *) (elf->map_address + elf->start_offset
++					 + offset))->sh_link;
 +		}
  	      else
  		{
@@ -334,52 +349,76 @@
  					* sizeof (Elf_Scn)), 1);
 --- elfutils/libelf/gelf_getdyn.c
 +++ elfutils/libelf/gelf_getdyn.c
-@@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get information from dynamic table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -93,7 +93,7 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -114,7 +115,8 @@ gelf_getdyn (data, ndx, dst)
+@@ -114,7 +114,7 @@ gelf_getdyn (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, GElf_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, GElf_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getlib.c
 +++ elfutils/libelf/gelf_getlib.c
-@@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get library from table at the given index.
+-   Copyright (C) 2004 Red Hat, Inc.
++   Copyright (C) 2004-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
+ 
+@@ -86,7 +86,7 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
    GElf_Lib *result = NULL;
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Lib)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Lib, data))
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
 --- elfutils/libelf/gelf_getmove.c
 +++ elfutils/libelf/gelf_getmove.c
-@@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get move structure at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -83,7 +83,7 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Move)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Move, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_getrela.c
 +++ elfutils/libelf/gelf_getrela.c
+@@ -1,5 +1,5 @@
+ /* Get RELA relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -393,28 +432,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -93,7 +87,8 @@ gelf_getrela (data, ndx, dst)
+@@ -93,7 +87,7 @@ gelf_getrela (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -114,7 +109,8 @@ gelf_getrela (data, ndx, dst)
+@@ -114,7 +108,7 @@ gelf_getrela (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
 --- elfutils/libelf/gelf_getrel.c
 +++ elfutils/libelf/gelf_getrel.c
+@@ -1,5 +1,5 @@
+ /* Get REL relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -428,107 +472,133 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -93,7 +87,8 @@ gelf_getrel (data, ndx, dst)
+@@ -93,7 +87,7 @@ gelf_getrel (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -113,7 +108,8 @@ gelf_getrel (data, ndx, dst)
+@@ -113,7 +107,7 @@ gelf_getrel (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
 --- elfutils/libelf/gelf_getsym.c
 +++ elfutils/libelf/gelf_getsym.c
-@@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get symbol information from symbol table at the given index.
+-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 1999-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
+ 
+@@ -90,7 +90,7 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, data))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -119,7 +120,8 @@ gelf_getsym (data, ndx, dst)
+@@ -119,7 +119,7 @@ gelf_getsym (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
-+      if (INVALID_NDX (ndx, GElf_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
++      if (INVALID_NDX (ndx, GElf_Sym, data))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getsyminfo.c
 +++ elfutils/libelf/gelf_getsyminfo.c
-@@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get additional symbol information from symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -84,7 +84,7 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Syminfo)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Syminfo, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_getsymshndx.c
 +++ elfutils/libelf/gelf_getsymshndx.c
-@@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -1,6 +1,6 @@
+ /* Get symbol information and separate section index from symbol table
+    at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -90,7 +90,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
      {
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Word) > shndxdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Word)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Word)
-+		       > shndxdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Word, &shndxdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -110,7 +112,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -110,7 +110,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, symdata))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -139,7 +142,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -139,7 +139,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
-+      if (INVALID_NDX (ndx, GElf_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
++      if (INVALID_NDX (ndx, GElf_Sym, symdata))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getversym.c
 +++ elfutils/libelf/gelf_getversym.c
-@@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get symbol version information at the given index.
+-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 1999-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
+ 
+@@ -92,7 +92,7 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Versym)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Versym, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
 --- elfutils/libelf/gelf_update_dyn.c
 +++ elfutils/libelf/gelf_update_dyn.c
+@@ -1,5 +1,5 @@
+ /* Update information in dynamic table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -542,28 +612,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_DYN))
      {
        /* The type of the data better should match.  */
-@@ -102,7 +96,8 @@ gelf_update_dyn (data, ndx, src)
+@@ -102,7 +96,7 @@ gelf_update_dyn (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -116,7 +111,8 @@ gelf_update_dyn (data, ndx, src)
+@@ -116,7 +110,7 @@ gelf_update_dyn (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_lib.c
 +++ elfutils/libelf/gelf_update_lib.c
+@@ -1,5 +1,5 @@
+ /* Update library in table at the given index.
+-   Copyright (C) 2004 Red Hat, Inc.
++   Copyright (C) 2004-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
+ 
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -577,29 +652,43 @@
    Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;
    if (unlikely (data_scn->d.d_type != ELF_T_LIB))
      {
-@@ -87,7 +81,8 @@ gelf_update_lib (data, ndx, src)
+@@ -87,7 +81,7 @@ gelf_update_lib (data, ndx, src)
  
    /* Check whether we have to resize the data buffer.  */
    int result = 0;
 -  if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
-+  if (INVALID_NDX (ndx, Elf64_Lib)
-+      || unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, Elf64_Lib, &data_scn->d))
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
 --- elfutils/libelf/gelf_update_move.c
 +++ elfutils/libelf/gelf_update_move.c
-@@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
+@@ -1,5 +1,5 @@
+ /* Update move structure at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -75,8 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely (ndx < 0)
-+  if (INVALID_NDX (ndx, GElf_Move)
-       || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
+-      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Move, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
+       return 0;
 --- elfutils/libelf/gelf_update_rela.c
 +++ elfutils/libelf/gelf_update_rela.c
+@@ -1,5 +1,5 @@
+ /* Update RELA relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -613,28 +702,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        /* The type of the data better should match.  */
-@@ -101,7 +95,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
+@@ -101,7 +95,7 @@ gelf_update_rela (Elf_Data *dst, int ndx
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -117,7 +112,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
+@@ -117,7 +111,7 @@ gelf_update_rela (Elf_Data *dst, int ndx
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_rel.c
 +++ elfutils/libelf/gelf_update_rel.c
+@@ -1,5 +1,5 @@
+ /* Update REL relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -648,28 +742,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        /* The type of the data better should match.  */
-@@ -99,7 +93,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+@@ -99,7 +93,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -114,7 +109,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+@@ -114,7 +108,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_sym.c
 +++ elfutils/libelf/gelf_update_sym.c
+@@ -1,5 +1,5 @@
+ /* Update symbol information in symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -683,28 +782,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -102,7 +96,8 @@ gelf_update_sym (data, ndx, src)
+@@ -102,7 +96,7 @@ gelf_update_sym (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -125,7 +120,8 @@ gelf_update_sym (data, ndx, src)
+@@ -125,7 +119,7 @@ gelf_update_sym (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Sym, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_syminfo.c
 +++ elfutils/libelf/gelf_update_syminfo.c
+@@ -1,5 +1,5 @@
+ /* Update additional symbol information in symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -718,18 +822,25 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYMINFO))
      {
        /* The type of the data better should match.  */
-@@ -93,7 +87,8 @@ gelf_update_syminfo (data, ndx, src)
+@@ -93,7 +87,7 @@ gelf_update_syminfo (data, ndx, src)
    rwlock_wrlock (scn->elf->lock);
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
-+  if (INVALID_NDX (ndx, GElf_Syminfo)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Syminfo, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_update_symshndx.c
 +++ elfutils/libelf/gelf_update_symshndx.c
+@@ -1,6 +1,6 @@
+ /* Update symbol information and section index in symbol table at the
+    given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -743,56 +854,57 @@
    if (unlikely (symdata_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -128,7 +122,8 @@ gelf_update_symshndx (symdata, shndxdata
+@@ -128,7 +122,7 @@ gelf_update_symshndx (symdata, shndxdata
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, &symdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -151,7 +146,8 @@ gelf_update_symshndx (symdata, shndxdata
+@@ -151,7 +145,7 @@ gelf_update_symshndx (symdata, shndxdata
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Sym, &symdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_versym.c
 +++ elfutils/libelf/gelf_update_versym.c
-@@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
+@@ -1,5 +1,5 @@
+ /* Update symbol version information.
+-   Copyright (C) 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2001-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2001.
+ 
+@@ -75,8 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely (ndx < 0)
-+  if (INVALID_NDX (ndx, GElf_Versym)
-       || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
+-      || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Versym, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
+       return 0;
 --- elfutils/libelf/libelfP.h
 +++ elfutils/libelf/libelfP.h
-@@ -606,4 +606,13 @@ extern uint32_t __libelf_crc32 (uint32_t
+@@ -606,4 +606,8 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
  
-+/* Convenience macro.  Assumes int NDX and TYPE with size at least
-+   2 bytes.  */
-+#if SIZE_MAX > 4294967295U
-+# define INVALID_NDX(ndx, type) unlikely (ndx < 0)
-+#else
-+# define INVALID_NDX(ndx, type) \
-+  unlikely ((unsigned int) (ndx) >= SIZE_MAX / sizeof (type))
-+#endif
++/* Convenience macro.  */
++#define INVALID_NDX(ndx, type, data) \
++  unlikely ((data)->d_size / sizeof (type) <= (unsigned int) (ndx))
 +
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1440,6 +1440,16 @@
+@@ -1457,6 +1457,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +921,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1485,6 +1495,19 @@
+@@ -1502,6 +1512,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- elfutils.spec	29 Jul 2009 02:19:14 -0000	1.118
+++ elfutils.spec	21 Sep 2009 17:44:00 -0000	1.119
@@ -1,4 +1,4 @@
-%define eu_version 0.142
+%define eu_version 0.143
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -50,12 +50,20 @@ BuildRequires: glibc-headers >= 2.3.4-11
 BuildRequires: gcc >= 3.2
 %endif
 
-%define use_zlib 0
+%define use_zlib        0
 %if 0%{?fedora} >= 5
-%define use_zlib 1
+%define use_zlib        1
 %endif
 %if 0%{?rhel} >= 5
-%define use_zlib 1
+%define use_zlib        1
+%endif
+
+%define use_xz          0
+%if 0%{?fedora} >= 10
+%define use_xz          1
+%endif
+%if 0%{?rhel} >= 6
+%define use_xz          1
 %endif
 
 %if %{use_zlib}
@@ -63,6 +71,10 @@ BuildRequires: zlib-devel >= 1.2.2.3
 BuildRequires: bzip2-devel
 %endif
 
+%if %{use_xz}
+BuildRequires: xz-devel
+%endif
+
 %define _gnu %{nil}
 %define _program_prefix eu-
 
@@ -276,16 +288,25 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Mon Sep 21 2009 Roland McGrath <roland at redhat.com> - 0.143-1
+- Update to 0.143
+  - libdw: Various convenience functions for individual attributes now use
+           dwarf_attr_integrate to look up indirect inherited attributes.
+           Location expression handling now supports DW_OP_implicit_value.
+  - libdwfl: Support automatic decompression of files in XZ format,
+             and of Linux kernel images made with bzip2 or LZMA
+             (as well as gzip).
+
 * Tue Jul 28 2009 Roland McGrath <roland at redhat.com> - 0.142-1
 - Update to 0.142
   - libelf: Bug fix in filling gaps between sections. (#512840)
   - libelf: Add elf_getshdrnum alias for elf_getshnum and elf_getshdrstrndx
-    	    alias for elf_getshstrndx and deprecate original names.
+            alias for elf_getshstrndx and deprecate original names.
   - libebl, elflint: Add support for STB_GNU_UNIQUE. (#511436)
   - readelf: Add -N option, speeds up DWARF printing
-    	     without address->name lookups. (#505347)
+             without address->name lookups. (#505347)
   - libdw: Add support for decoding DWARF CFI into location description form.
-    	   Handle some new DWARF 3 expression operations previously omitted.
+           Handle some new DWARF 3 expression operations previously omitted.
            Basic handling of some new encodings slated for DWARF 4.
 
 * Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	29 Jul 2009 02:19:14 -0000	1.53
+++ sources	21 Sep 2009 17:44:00 -0000	1.54
@@ -1 +1 @@
-03ce3616fa6a347c3156ee5f74985ea7  elfutils-0.142.tar.bz2
+06e35c348e78dec58f6aeb51bd397760  elfutils-0.143.tar.bz2


--- elfutils-0.142.tar.bz2.sig DELETED ---



From roland at fedoraproject.org  Mon Sep 21 17:51:38 2009
From: roland at fedoraproject.org (roland)
Date: Mon, 21 Sep 2009 17:51:38 +0000 (UTC)
Subject: rpms/elfutils/F-11 elfutils-0.143.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.49, 1.50 Makefile, 1.31, 1.32 elfutils-portability.patch, 1.43,
	1.44 elfutils-robustify.patch, 1.16, 1.17 elfutils.spec, 1.117,
	1.118 sources, 1.53, 1.54 elfutils-0.142.tar.bz2.sig, 1.1, NONE
Message-ID: <20090921175138.545BD11C0043@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11769/F-11

Modified Files:
	.cvsignore Makefile elfutils-portability.patch 
	elfutils-robustify.patch elfutils.spec sources 
Added Files:
	elfutils-0.143.tar.bz2.sig 
Removed Files:
	elfutils-0.142.tar.bz2.sig 
Log Message:
Update to 0.143


--- NEW FILE elfutils-0.143.tar.bz2.sig ---
?F
	?(?:y?Dtq?

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	29 Jul 2009 02:22:54 -0000	1.49
+++ .cvsignore	21 Sep 2009 17:51:37 -0000	1.50
@@ -1 +1 @@
-elfutils-0.142.tar.bz2
+elfutils-0.143.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Makefile	24 Jan 2009 01:16:36 -0000	1.31
+++ Makefile	21 Sep 2009 17:51:37 -0000	1.32
@@ -34,15 +34,18 @@ patches := $(patsubst %,elfutils-%.patch
 all: $(patches)
 
 branch-portability = portable
-branch-master = elfutils-$(VERSION)
 
-elfutils-%/configure: .git/refs/heads/* Makefile
+git-%/configure: .git/refs/heads/* Makefile
 	@rm -rf $(@D)
 	git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf -
 	cd $(@D) && autoreconf -i && rm -rf autom4te.cache
 
-elfutils-%.patch: elfutils-master/configure elfutils-%/configure
-	diff --exclude='.gitignore' -Nrpu $(^D) | \
+elfutils-%.patch: git-%/configure
+	branch=$(firstword $(branch-$*) $*); \
+	master=`git merge-base origin/master $$branch` && \
+	master=`git describe --tags --always $$master` && \
+	(set -x; $(MAKE) git-$$master/configure) && \
+	(set -x; diff --exclude='.gitignore' -Nrpu git-$$master $(<D)) | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@
 

elfutils-portability.patch:
 ChangeLog            |   21 +++++
 Makefile.in          |    2 
 backends/ChangeLog   |   12 ++
 backends/Makefile.am |    6 -
 backends/Makefile.in |    8 +
 config.h.in          |    6 +
 config/Makefile.in   |    2 
 configure            |  214 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   53 ++++++++++++
 lib/ChangeLog        |    8 +
 lib/Makefile.am      |    3 
 lib/Makefile.in      |    6 -
 lib/eu-config.h      |   11 ++
 libasm/ChangeLog     |    5 +
 libasm/Makefile.am   |    3 
 libasm/Makefile.in   |    6 -
 libcpu/ChangeLog     |    8 +
 libcpu/Makefile.am   |    3 
 libcpu/Makefile.in   |   11 +-
 libcpu/i386_disasm.c |    1 
 libdw/ChangeLog      |    9 ++
 libdw/Makefile.am    |    3 
 libdw/Makefile.in    |    7 +
 libdw/libdw.h        |    2 
 libdwfl/ChangeLog    |    5 +
 libdwfl/Makefile.am  |    3 
 libdwfl/Makefile.in  |    6 -
 libebl/ChangeLog     |    5 +
 libebl/Makefile.am   |    3 
 libebl/Makefile.in   |    6 -
 libelf/ChangeLog     |    5 +
 libelf/Makefile.am   |    3 
 libelf/Makefile.in   |    6 -
 libelf/common.h      |    4 
 m4/Makefile.in       |    2 
 src/ChangeLog        |   30 +++++++
 src/Makefile.am      |    6 +
 src/Makefile.in      |    9 +-
 src/addr2line.c      |    4 
 src/findtextrel.c    |    6 +
 src/ld.h             |    2 
 src/readelf.c        |    2 
 src/strings.c        |   11 ++
 src/strip.c          |   20 ++++
 tests/ChangeLog      |    7 +
 tests/Makefile.am    |    5 -
 tests/Makefile.in    |    6 -
 tests/line2addr.c    |    2 
 48 files changed, 520 insertions(+), 48 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/elfutils-portability.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- elfutils-portability.patch	29 Jul 2009 02:22:54 -0000	1.43
+++ elfutils-portability.patch	21 Sep 2009 17:51:37 -0000	1.44
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -48,6 +48,10 @@
+@@ -57,6 +57,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -375,6 +379,11 @@
+@@ -384,6 +388,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -397,6 +406,9 @@
+@@ -406,6 +415,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -101,7 +101,18 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -9,6 +9,8 @@
+@@ -6,6 +6,10 @@
+ 
+ 	* configure.ac (zip_LIBS): Check for liblzma too.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
++
+ 2009-04-19  Roland McGrath  <roland at redhat.com>
+ 
+ 	* configure.ac (eu_version): Round down here, not in version.h macros.
+@@ -17,6 +21,8 @@
  
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
@@ -110,7 +121,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -89,6 +91,10 @@
+@@ -97,6 +103,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -121,7 +132,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -136,6 +142,17 @@
+@@ -144,6 +154,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -168,7 +179,7 @@
  /* $libdir subdirectory containing libebl modules. */
  #undef LIBEBL_SUBDIR
  
-@@ -52,4 +55,7 @@
+@@ -55,4 +58,7 @@
  /* Define for large files, on AIX-style hosts. */
  #undef _LARGE_FILES
  
@@ -178,7 +189,7 @@
  #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -644,6 +644,8 @@ NATIVE_LD_FALSE
+@@ -646,6 +646,8 @@ NATIVE_LD_FALSE
  NATIVE_LD_TRUE
  DATADIRNAME
  LOCALEDIR
@@ -187,7 +198,7 @@
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -4094,6 +4096,152 @@ $as_echo "$as_me: error: gcc with C99 su
+@@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su
  fi
  
  
@@ -240,6 +251,59 @@
 +fi
 +
 +
++{ $as_echo "$as_me:$LINENO: checking for -fgnu89-inline option to $CC" >&5
++$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
++if test "${ac_cv_cc_gnu89_inline+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline -Werror"
++cat >conftest.$ac_ext <<_ACEOF
++
++void foo (void)
++{
++  inline void bar (void) {}
++  bar ();
++}
++extern inline void baz (void) {}
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_cc_gnu89_inline=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_cc_gnu89_inline=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$old_CFLAGS"
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_gnu89_inline" >&5
++$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
++if test "x$ac_cv_cc_gnu89_inline" = xyes; then
++  WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
++fi
++
++
 +{ $as_echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
 +$as_echo_n "checking for --as-needed linker option... " >&6; }
 +if test "${ac_cv_as_needed+set}" = set; then
@@ -340,7 +404,7 @@
  { $as_echo "$as_me:$LINENO: checking for __thread support" >&5
  $as_echo_n "checking for __thread support... " >&6; }
  if test "${ac_cv_tls+set}" = set; then
-@@ -4159,9 +4307,18 @@ fi
+@@ -4163,9 +4364,18 @@ fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
  $as_echo "$ac_cv_tls" >&6; }
  if test "x$ac_cv_tls" != xyes; then
@@ -363,7 +427,7 @@
  
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -74,6 +74,39 @@ CFLAGS="$old_CFLAGS"])
+@@ -73,6 +73,54 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
@@ -376,6 +440,21 @@
 +AC_SUBST(WEXTRA)
 +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
 +
++AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
++old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline -Werror"
++AC_COMPILE_IFELSE([
++void foo (void)
++{
++  inline void bar (void) {}
++  bar ();
++}
++extern inline void baz (void) {}
++], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
++CFLAGS="$old_CFLAGS"])
++AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
++      [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
++
 +AC_CACHE_CHECK([for --as-needed linker option],
 +	       ac_cv_as_needed, [dnl
 +cat > conftest.c <<EOF
@@ -403,7 +482,7 @@
  AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
  # Use the same flags that we use for our DSOs, so the test is representative.
  # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -89,7 +122,10 @@ static __thread int a; int foo (int b) {
+@@ -88,7 +136,10 @@ static __thread int a; int foo (int b) {
  CFLAGS="$save_CFLAGS"
  LDFLAGS="$save_LDFLAGS"])
  AS_IF([test "x$ac_cv_tls" != xyes],
@@ -417,7 +496,8 @@
  AC_SUBST(LOCALEDIR)
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -4,6 +4,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
@@ -426,7 +506,7 @@
  	* eu-config.h: Add multiple inclusion protection.
  
  2009-01-17  Ulrich Drepper  <drepper at redhat.com>
-@@ -56,6 +59,11 @@
+@@ -60,6 +63,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -440,7 +520,7 @@
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
 --- elfutils/lib/eu-config.h
 +++ elfutils/lib/eu-config.h
-@@ -182,5 +182,16 @@ asm (".section predict_data, \"aw\"; .pr
+@@ -182,6 +182,17 @@ asm (".section predict_data, \"aw\"; .pr
  /* This macro is used by the tests conditionalize for standalone building.  */
  #define ELFUTILS_HEADER(name) <lib##name.h>
  
@@ -456,7 +536,8 @@
 +#endif	/* HAVE_BUILTIN_POPCOUNT */
 +
  
- #endif	/* eu-config.h */
+ #ifdef SHARED
+ # define OLD_VERSION(name, version) \
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
 @@ -25,12 +25,13 @@
@@ -647,7 +728,18 @@
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -738,6 +738,11 @@
+@@ -20,6 +20,10 @@
+ 
+ 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* libdw.h: Disable extern inlines for GCC 4.2.
++
+ 2009-08-10  Roland McGrath  <roland at redhat.com>
+ 
+ 	* dwarf_getscopevar.c: Use dwarf_diename.
+@@ -788,6 +792,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -659,6 +751,17 @@
  	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
  	formref offset.
  
+--- elfutils/libdw/libdw.h
++++ elfutils/libdw/libdw.h
+@@ -809,7 +809,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+ 
+ 
+ /* Inline optimizations.  */
+-#ifdef __OPTIMIZE__
++#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+ /* Return attribute code of given attribute.  */
+ __libdw_extern_inline unsigned int
+ dwarf_whatattr (Dwarf_Attribute *attr)
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
 @@ -25,6 +25,7 @@
@@ -711,7 +814,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1098,6 +1098,11 @@
+@@ -1139,6 +1139,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -742,7 +845,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -750,7 +853,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -205,6 +206,7 @@ SHELL = @SHELL@
+@@ -208,6 +209,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -758,7 +861,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -263,9 +265,9 @@ top_builddir = @top_builddir@
+@@ -266,9 +268,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -772,7 +875,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -593,6 +593,11 @@
+@@ -603,6 +603,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -833,7 +936,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -576,6 +576,11 @@
+@@ -580,6 +580,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -968,7 +1071,24 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -155,6 +155,8 @@
+@@ -7,8 +7,16 @@
+ 	* readelf.c (attr_callback): Use print_block only when we don't use
+ 	print_ops.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* ld.h: Disable extern inlines for GCC 4.2.
++
+ 2009-08-14  Roland McGrath  <roland at redhat.com>
+ 
++	* strings.c (read_block): Conditionalize posix_fadvise use
++	on [POSIX_FADV_SEQUENTIAL].
++	From Petr Salinger <Petr.Salinger at seznam.cz>.
++
+ 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
+ 
+ 2009-08-01  Ulrich Drepper  <drepper at redhat.com>
+@@ -172,6 +180,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -977,7 +1097,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -338,6 +340,11 @@
+@@ -355,6 +365,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -989,7 +1109,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -589,6 +596,8 @@
+@@ -606,6 +621,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -998,7 +1118,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -1028,6 +1037,10 @@
+@@ -1045,6 +1062,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1009,7 +1129,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1104,6 +1117,10 @@
+@@ -1121,6 +1142,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1020,7 +1140,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1452,6 +1469,11 @@
+@@ -1469,6 +1494,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1047,6 +1167,23 @@
  	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
  	   const char *fname, bool more_than_one, void **knownsrcs)
  {
+--- elfutils/src/ld.h
++++ elfutils/src/ld.h
+@@ -1122,6 +1122,7 @@ extern bool dynamically_linked_p (void);
+ 
+ /* Checked whether the symbol is undefined and referenced from a DSO.  */
+ extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
++#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+ #ifdef __GNUC_STDC_INLINE__
+ __attribute__ ((__gnu_inline__))
+ #endif
+@@ -1139,5 +1140,6 @@ linked_from_dso_p (struct scninfo *scnin
+ 
+   return sym->defined && sym->in_dso;
+ }
++#endif	/* Optimizing and not GCC 4.2.  */
+ 
+ #endif	/* ld.h */
 --- elfutils/src/Makefile.am
 +++ elfutils/src/Makefile.am
 @@ -26,6 +26,7 @@
@@ -1122,7 +1259,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7591,7 +7591,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7594,7 +7594,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1158,6 +1295,18 @@
  	  break;
  	}
        if (errno != EINVAL && errno != ENOMEM)
+@@ -586,9 +595,11 @@ read_block (int fd, const char *fname, o
+       elfmap_off = from & ~(ps - 1);
+       elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
+ 
++#ifdef POSIX_FADV_SEQUENTIAL
+       if (unlikely (elfmap == MAP_FAILED))
+ 	/* Let the kernel know we are going to read everything in sequence.  */
+ 	(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
++#endif
+     }
+ 
+   if (unlikely (elfmap == MAP_FAILED))
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
 @@ -52,6 +52,12 @@

elfutils-robustify.patch:
 libelf/ChangeLog              |   43 +++++++++++++++++
 libelf/elf32_getphdr.c        |   12 ++++
 libelf/elf32_getshdr.c        |   15 +++++-
 libelf/elf32_newphdr.c        |    6 ++
 libelf/elf32_updatefile.c     |    7 ++
 libelf/elf_begin.c            |   47 ++++++++++++++++++-
 libelf/elf_getarsym.c         |    3 +
 libelf/elf_getshdrstrndx.c    |   42 ++++++++++++++---
 libelf/elf_newscn.c           |   10 +++-
 libelf/gelf_getdyn.c          |    6 +-
 libelf/gelf_getlib.c          |    4 -
 libelf/gelf_getmove.c         |    4 -
 libelf/gelf_getrel.c          |   12 +---
 libelf/gelf_getrela.c         |   12 +---
 libelf/gelf_getsym.c          |    6 +-
 libelf/gelf_getsyminfo.c      |    4 -
 libelf/gelf_getsymshndx.c     |    8 +--
 libelf/gelf_getversym.c       |    4 -
 libelf/gelf_update_dyn.c      |   12 +---
 libelf/gelf_update_lib.c      |   10 ----
 libelf/gelf_update_move.c     |    5 --
 libelf/gelf_update_rel.c      |   12 +---
 libelf/gelf_update_rela.c     |   12 +---
 libelf/gelf_update_sym.c      |   12 +---
 libelf/gelf_update_syminfo.c  |   10 ----
 libelf/gelf_update_symshndx.c |   12 +---
 libelf/gelf_update_versym.c   |    5 --
 libelf/libelfP.h              |    4 +
 src/ChangeLog                 |   23 +++++++++
 src/elflint.c                 |  101 +++++++++++++++++++++++++++++++-----------
 src/readelf.c                 |   92 +++++++++++++++++++++++++++-----------
 src/strip.c                   |   70 +++++++++++++++++++----------
 32 files changed, 434 insertions(+), 191 deletions(-)

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/elfutils-robustify.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- elfutils-robustify.patch	29 Jul 2009 02:22:54 -0000	1.16
+++ elfutils-robustify.patch	21 Sep 2009 17:51:37 -0000	1.17
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -568,6 +568,49 @@
+@@ -572,6 +572,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -52,6 +52,13 @@
  	* elf.h: Update again.
 --- elfutils/libelf/elf32_getphdr.c
 +++ elfutils/libelf/elf32_getphdr.c
+@@ -1,5 +1,5 @@
+ /* Get ELF program header table.
+-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
+ 
 @@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -59,7 +66,7 @@
 +	  /* First see whether the information in the ELF header is
 +	     valid and it does not ask for too much.  */
 +	  if (unlikely (ehdr->e_phoff >= elf->maximum_size)
-+	      || unlikely (ehdr->e_phoff + size > elf->maximum_size))
++	      || unlikely (elf->maximum_size - ehdr->e_phoff < size))
 +	    {
 +	      /* Something is wrong.  */
 +	      __libelf_seterrno (ELF_E_INVALID_PHDR);
@@ -95,7 +102,7 @@
 +      /* First see whether the information in the ELF header is
 +	 valid and it does not ask for too much.  */
 +      if (unlikely (ehdr->e_shoff >= elf->maximum_size)
-+	  || unlikely (ehdr->e_shoff + size > elf->maximum_size))
++	  || unlikely (elf->maximum_size - ehdr->e_shoff < size))
 +	{
 +	  /* Something is wrong.  */
 +	  __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -145,13 +152,20 @@
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
 --- elfutils/libelf/elf_begin.c
 +++ elfutils/libelf/elf_begin.c
+@@ -1,5 +1,5 @@
+ /* Create descriptor for processing file.
+-   Copyright (C) 1998-2005, 2006, 2007, 2008 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
+ 
 @@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
 -	  if (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize)
 +	  if (unlikely (ehdr.e32->e_shoff >= maxsize)
-+	      || unlikely (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize))
++	      || unlikely (maxsize - ehdr.e32->e_shoff < sizeof (Elf32_Shdr)))
  	    /* Cannot read the first section header.  */
  	    return 0;
  
@@ -181,14 +195,14 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -318,13 +329,31 @@ file_read_elf (int fildes, void *map_add
+@@ -318,13 +329,30 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
 +
 +	  if (unlikely (ehdr->e_shoff >= maxsize)
-+	      || unlikely (ehdr->e_shoff
-+			   + scncnt * sizeof (Elf32_Shdr) > maxsize))
++	      || unlikely (maxsize - ehdr->e_shoff
++			   < scncnt * sizeof (Elf32_Shdr)))
 +	    {
 +	    free_and_out:
 +	      free (elf);
@@ -203,9 +217,8 @@
  	    /* Assign a value only if there really is a program
  	       header.  Otherwise the value remains NULL.  */
 +	      if (unlikely (ehdr->e_phoff >= maxsize)
-+		  || unlikely (ehdr->e_phoff
-+			       + ehdr->e_phnum
-+			       * sizeof (Elf32_Phdr) > maxsize))
++		  || unlikely (maxsize - ehdr->e_phoff
++			       < ehdr->e_phnum * sizeof (Elf32_Phdr)))
 +		goto free_and_out;
  	    elf->state.elf32.phdr
  	      = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
@@ -213,7 +226,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -406,13 +435,26 @@ file_read_elf (int fildes, void *map_add
+@@ -406,13 +434,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -262,11 +275,13 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf32_Shdr) - 1)) == 0))
+-		/* We can directly access the memory.  */
+-		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
-+		  if (unlikely (offset + sizeof (Elf32_Shdr)
-+				> elf->maximum_size))
++		  if (unlikely (elf->maximum_size - offset
++				< sizeof (Elf32_Shdr)))
 +		    {
 +		      /* Something is wrong.  */
 +		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -274,8 +289,7 @@
 +		      goto out;
 +		    }
 +
- 		/* We can directly access the memory.  */
--		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
++		  /* We can directly access the memory.  */
 +		  num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset
 +					 + offset))->sh_link;
 +		}
@@ -290,11 +304,13 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf64_Shdr) - 1)) == 0))
+-		/* We can directly access the memory.  */
+-		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
-+		  if (unlikely (offset + sizeof (Elf64_Shdr)
-+				> elf->maximum_size))
++		  if (unlikely (elf->maximum_size - offset
++				< sizeof (Elf64_Shdr)))
 +		    {
 +		      /* Something is wrong.  */
 +		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -302,10 +318,9 @@
 +		      goto out;
 +		    }
 +
- 		/* We can directly access the memory.  */
--		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
-+		  num = ((Elf64_Shdr *) (elf->map_address
-+			 + elf->start_offset + offset))->sh_link;
++		  /* We can directly access the memory.  */
++		  num = ((Elf64_Shdr *) (elf->map_address + elf->start_offset
++					 + offset))->sh_link;
 +		}
  	      else
  		{
@@ -334,52 +349,76 @@
  					* sizeof (Elf_Scn)), 1);
 --- elfutils/libelf/gelf_getdyn.c
 +++ elfutils/libelf/gelf_getdyn.c
-@@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get information from dynamic table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -93,7 +93,7 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -114,7 +115,8 @@ gelf_getdyn (data, ndx, dst)
+@@ -114,7 +114,7 @@ gelf_getdyn (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, GElf_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, GElf_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getlib.c
 +++ elfutils/libelf/gelf_getlib.c
-@@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get library from table at the given index.
+-   Copyright (C) 2004 Red Hat, Inc.
++   Copyright (C) 2004-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
+ 
+@@ -86,7 +86,7 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
    GElf_Lib *result = NULL;
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Lib)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Lib, data))
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
 --- elfutils/libelf/gelf_getmove.c
 +++ elfutils/libelf/gelf_getmove.c
-@@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get move structure at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -83,7 +83,7 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Move)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Move, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_getrela.c
 +++ elfutils/libelf/gelf_getrela.c
+@@ -1,5 +1,5 @@
+ /* Get RELA relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -393,28 +432,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -93,7 +87,8 @@ gelf_getrela (data, ndx, dst)
+@@ -93,7 +87,7 @@ gelf_getrela (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -114,7 +109,8 @@ gelf_getrela (data, ndx, dst)
+@@ -114,7 +108,7 @@ gelf_getrela (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
 --- elfutils/libelf/gelf_getrel.c
 +++ elfutils/libelf/gelf_getrel.c
+@@ -1,5 +1,5 @@
+ /* Get REL relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -428,107 +472,133 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -93,7 +87,8 @@ gelf_getrel (data, ndx, dst)
+@@ -93,7 +87,7 @@ gelf_getrel (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -113,7 +108,8 @@ gelf_getrel (data, ndx, dst)
+@@ -113,7 +107,7 @@ gelf_getrel (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
 --- elfutils/libelf/gelf_getsym.c
 +++ elfutils/libelf/gelf_getsym.c
-@@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get symbol information from symbol table at the given index.
+-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 1999-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
+ 
+@@ -90,7 +90,7 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, data))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -119,7 +120,8 @@ gelf_getsym (data, ndx, dst)
+@@ -119,7 +119,7 @@ gelf_getsym (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
-+      if (INVALID_NDX (ndx, GElf_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
++      if (INVALID_NDX (ndx, GElf_Sym, data))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getsyminfo.c
 +++ elfutils/libelf/gelf_getsyminfo.c
-@@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get additional symbol information from symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -84,7 +84,7 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Syminfo)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Syminfo, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_getsymshndx.c
 +++ elfutils/libelf/gelf_getsymshndx.c
-@@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -1,6 +1,6 @@
+ /* Get symbol information and separate section index from symbol table
+    at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -90,7 +90,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
      {
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Word) > shndxdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Word)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Word)
-+		       > shndxdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Word, &shndxdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -110,7 +112,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -110,7 +110,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, symdata))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -139,7 +142,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -139,7 +139,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
-+      if (INVALID_NDX (ndx, GElf_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
++      if (INVALID_NDX (ndx, GElf_Sym, symdata))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getversym.c
 +++ elfutils/libelf/gelf_getversym.c
-@@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get symbol version information at the given index.
+-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 1999-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
+ 
+@@ -92,7 +92,7 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Versym)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Versym, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
 --- elfutils/libelf/gelf_update_dyn.c
 +++ elfutils/libelf/gelf_update_dyn.c
+@@ -1,5 +1,5 @@
+ /* Update information in dynamic table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -542,28 +612,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_DYN))
      {
        /* The type of the data better should match.  */
-@@ -102,7 +96,8 @@ gelf_update_dyn (data, ndx, src)
+@@ -102,7 +96,7 @@ gelf_update_dyn (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -116,7 +111,8 @@ gelf_update_dyn (data, ndx, src)
+@@ -116,7 +110,7 @@ gelf_update_dyn (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_lib.c
 +++ elfutils/libelf/gelf_update_lib.c
+@@ -1,5 +1,5 @@
+ /* Update library in table at the given index.
+-   Copyright (C) 2004 Red Hat, Inc.
++   Copyright (C) 2004-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
+ 
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -577,29 +652,43 @@
    Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;
    if (unlikely (data_scn->d.d_type != ELF_T_LIB))
      {
-@@ -87,7 +81,8 @@ gelf_update_lib (data, ndx, src)
+@@ -87,7 +81,7 @@ gelf_update_lib (data, ndx, src)
  
    /* Check whether we have to resize the data buffer.  */
    int result = 0;
 -  if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
-+  if (INVALID_NDX (ndx, Elf64_Lib)
-+      || unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, Elf64_Lib, &data_scn->d))
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
 --- elfutils/libelf/gelf_update_move.c
 +++ elfutils/libelf/gelf_update_move.c
-@@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
+@@ -1,5 +1,5 @@
+ /* Update move structure at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -75,8 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely (ndx < 0)
-+  if (INVALID_NDX (ndx, GElf_Move)
-       || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
+-      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Move, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
+       return 0;
 --- elfutils/libelf/gelf_update_rela.c
 +++ elfutils/libelf/gelf_update_rela.c
+@@ -1,5 +1,5 @@
+ /* Update RELA relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -613,28 +702,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        /* The type of the data better should match.  */
-@@ -101,7 +95,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
+@@ -101,7 +95,7 @@ gelf_update_rela (Elf_Data *dst, int ndx
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -117,7 +112,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
+@@ -117,7 +111,7 @@ gelf_update_rela (Elf_Data *dst, int ndx
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_rel.c
 +++ elfutils/libelf/gelf_update_rel.c
+@@ -1,5 +1,5 @@
+ /* Update REL relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -648,28 +742,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        /* The type of the data better should match.  */
-@@ -99,7 +93,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+@@ -99,7 +93,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -114,7 +109,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+@@ -114,7 +108,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_sym.c
 +++ elfutils/libelf/gelf_update_sym.c
+@@ -1,5 +1,5 @@
+ /* Update symbol information in symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -683,28 +782,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -102,7 +96,8 @@ gelf_update_sym (data, ndx, src)
+@@ -102,7 +96,7 @@ gelf_update_sym (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -125,7 +120,8 @@ gelf_update_sym (data, ndx, src)
+@@ -125,7 +119,7 @@ gelf_update_sym (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Sym, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_syminfo.c
 +++ elfutils/libelf/gelf_update_syminfo.c
+@@ -1,5 +1,5 @@
+ /* Update additional symbol information in symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -718,18 +822,25 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYMINFO))
      {
        /* The type of the data better should match.  */
-@@ -93,7 +87,8 @@ gelf_update_syminfo (data, ndx, src)
+@@ -93,7 +87,7 @@ gelf_update_syminfo (data, ndx, src)
    rwlock_wrlock (scn->elf->lock);
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
-+  if (INVALID_NDX (ndx, GElf_Syminfo)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Syminfo, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_update_symshndx.c
 +++ elfutils/libelf/gelf_update_symshndx.c
+@@ -1,6 +1,6 @@
+ /* Update symbol information and section index in symbol table at the
+    given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -743,56 +854,57 @@
    if (unlikely (symdata_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -128,7 +122,8 @@ gelf_update_symshndx (symdata, shndxdata
+@@ -128,7 +122,7 @@ gelf_update_symshndx (symdata, shndxdata
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, &symdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -151,7 +146,8 @@ gelf_update_symshndx (symdata, shndxdata
+@@ -151,7 +145,7 @@ gelf_update_symshndx (symdata, shndxdata
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Sym, &symdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_versym.c
 +++ elfutils/libelf/gelf_update_versym.c
-@@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
+@@ -1,5 +1,5 @@
+ /* Update symbol version information.
+-   Copyright (C) 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2001-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2001.
+ 
+@@ -75,8 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely (ndx < 0)
-+  if (INVALID_NDX (ndx, GElf_Versym)
-       || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
+-      || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Versym, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
+       return 0;
 --- elfutils/libelf/libelfP.h
 +++ elfutils/libelf/libelfP.h
-@@ -606,4 +606,13 @@ extern uint32_t __libelf_crc32 (uint32_t
+@@ -606,4 +606,8 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
  
-+/* Convenience macro.  Assumes int NDX and TYPE with size at least
-+   2 bytes.  */
-+#if SIZE_MAX > 4294967295U
-+# define INVALID_NDX(ndx, type) unlikely (ndx < 0)
-+#else
-+# define INVALID_NDX(ndx, type) \
-+  unlikely ((unsigned int) (ndx) >= SIZE_MAX / sizeof (type))
-+#endif
++/* Convenience macro.  */
++#define INVALID_NDX(ndx, type, data) \
++  unlikely ((data)->d_size / sizeof (type) <= (unsigned int) (ndx))
 +
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1440,6 +1440,16 @@
+@@ -1457,6 +1457,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +921,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1485,6 +1495,19 @@
+@@ -1502,6 +1512,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/elfutils.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- elfutils.spec	29 Jul 2009 02:22:54 -0000	1.117
+++ elfutils.spec	21 Sep 2009 17:51:37 -0000	1.118
@@ -1,4 +1,4 @@
-%define eu_version 0.142
+%define eu_version 0.143
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -50,12 +50,20 @@ BuildRequires: glibc-headers >= 2.3.4-11
 BuildRequires: gcc >= 3.2
 %endif
 
-%define use_zlib 0
+%define use_zlib        0
 %if 0%{?fedora} >= 5
-%define use_zlib 1
+%define use_zlib        1
 %endif
 %if 0%{?rhel} >= 5
-%define use_zlib 1
+%define use_zlib        1
+%endif
+
+%define use_xz          0
+%if 0%{?fedora} >= 10
+%define use_xz          1
+%endif
+%if 0%{?rhel} >= 6
+%define use_xz          1
 %endif
 
 %if %{use_zlib}
@@ -63,6 +71,10 @@ BuildRequires: zlib-devel >= 1.2.2.3
 BuildRequires: bzip2-devel
 %endif
 
+%if %{use_xz}
+BuildRequires: xz-devel
+%endif
+
 %define _gnu %{nil}
 %define _program_prefix eu-
 
@@ -276,16 +288,25 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Mon Sep 21 2009 Roland McGrath <roland at redhat.com> - 0.143-1
+- Update to 0.143
+  - libdw: Various convenience functions for individual attributes now use
+           dwarf_attr_integrate to look up indirect inherited attributes.
+           Location expression handling now supports DW_OP_implicit_value.
+  - libdwfl: Support automatic decompression of files in XZ format,
+             and of Linux kernel images made with bzip2 or LZMA
+             (as well as gzip).
+
 * Tue Jul 28 2009 Roland McGrath <roland at redhat.com> - 0.142-1
 - Update to 0.142
   - libelf: Bug fix in filling gaps between sections. (#512840)
   - libelf: Add elf_getshdrnum alias for elf_getshnum and elf_getshdrstrndx
-    	    alias for elf_getshstrndx and deprecate original names.
+            alias for elf_getshstrndx and deprecate original names.
   - libebl, elflint: Add support for STB_GNU_UNIQUE. (#511436)
   - readelf: Add -N option, speeds up DWARF printing
-    	     without address->name lookups. (#505347)
+             without address->name lookups. (#505347)
   - libdw: Add support for decoding DWARF CFI into location description form.
-    	   Handle some new DWARF 3 expression operations previously omitted.
+           Handle some new DWARF 3 expression operations previously omitted.
            Basic handling of some new encodings slated for DWARF 4.
 
 * Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	29 Jul 2009 02:22:54 -0000	1.53
+++ sources	21 Sep 2009 17:51:38 -0000	1.54
@@ -1 +1 @@
-03ce3616fa6a347c3156ee5f74985ea7  elfutils-0.142.tar.bz2
+06e35c348e78dec58f6aeb51bd397760  elfutils-0.143.tar.bz2


--- elfutils-0.142.tar.bz2.sig DELETED ---



From roland at fedoraproject.org  Mon Sep 21 17:51:37 2009
From: roland at fedoraproject.org (roland)
Date: Mon, 21 Sep 2009 17:51:37 +0000 (UTC)
Subject: rpms/elfutils/F-10 elfutils-0.143.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.49, 1.50 Makefile, 1.30, 1.31 elfutils-portability.patch, 1.43,
	1.44 elfutils-robustify.patch, 1.16, 1.17 elfutils.spec, 1.114,
	1.115 sources, 1.53, 1.54 elfutils-0.142.tar.bz2.sig, 1.1, NONE
Message-ID: <20090921175137.F10D911C0043@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11769/F-10

Modified Files:
	.cvsignore Makefile elfutils-portability.patch 
	elfutils-robustify.patch elfutils.spec sources 
Added Files:
	elfutils-0.143.tar.bz2.sig 
Removed Files:
	elfutils-0.142.tar.bz2.sig 
Log Message:
Update to 0.143


--- NEW FILE elfutils-0.143.tar.bz2.sig ---
?F
	?(?:y?Dtq?

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	29 Jul 2009 02:22:54 -0000	1.49
+++ .cvsignore	21 Sep 2009 17:51:37 -0000	1.50
@@ -1 +1 @@
-elfutils-0.142.tar.bz2
+elfutils-0.143.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Makefile	24 Jan 2009 01:22:09 -0000	1.30
+++ Makefile	21 Sep 2009 17:51:37 -0000	1.31
@@ -34,15 +34,18 @@ patches := $(patsubst %,elfutils-%.patch
 all: $(patches)
 
 branch-portability = portable
-branch-master = elfutils-$(VERSION)
 
-elfutils-%/configure: .git/refs/heads/* Makefile
+git-%/configure: .git/refs/heads/* Makefile
 	@rm -rf $(@D)
 	git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf -
 	cd $(@D) && autoreconf -i && rm -rf autom4te.cache
 
-elfutils-%.patch: elfutils-master/configure elfutils-%/configure
-	diff --exclude='.gitignore' -Nrpu $(^D) | \
+elfutils-%.patch: git-%/configure
+	branch=$(firstword $(branch-$*) $*); \
+	master=`git merge-base origin/master $$branch` && \
+	master=`git describe --tags --always $$master` && \
+	(set -x; $(MAKE) git-$$master/configure) && \
+	(set -x; diff --exclude='.gitignore' -Nrpu git-$$master $(<D)) | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@
 

elfutils-portability.patch:
 ChangeLog            |   21 +++++
 Makefile.in          |    2 
 backends/ChangeLog   |   12 ++
 backends/Makefile.am |    6 -
 backends/Makefile.in |    8 +
 config.h.in          |    6 +
 config/Makefile.in   |    2 
 configure            |  214 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   53 ++++++++++++
 lib/ChangeLog        |    8 +
 lib/Makefile.am      |    3 
 lib/Makefile.in      |    6 -
 lib/eu-config.h      |   11 ++
 libasm/ChangeLog     |    5 +
 libasm/Makefile.am   |    3 
 libasm/Makefile.in   |    6 -
 libcpu/ChangeLog     |    8 +
 libcpu/Makefile.am   |    3 
 libcpu/Makefile.in   |   11 +-
 libcpu/i386_disasm.c |    1 
 libdw/ChangeLog      |    9 ++
 libdw/Makefile.am    |    3 
 libdw/Makefile.in    |    7 +
 libdw/libdw.h        |    2 
 libdwfl/ChangeLog    |    5 +
 libdwfl/Makefile.am  |    3 
 libdwfl/Makefile.in  |    6 -
 libebl/ChangeLog     |    5 +
 libebl/Makefile.am   |    3 
 libebl/Makefile.in   |    6 -
 libelf/ChangeLog     |    5 +
 libelf/Makefile.am   |    3 
 libelf/Makefile.in   |    6 -
 libelf/common.h      |    4 
 m4/Makefile.in       |    2 
 src/ChangeLog        |   30 +++++++
 src/Makefile.am      |    6 +
 src/Makefile.in      |    9 +-
 src/addr2line.c      |    4 
 src/findtextrel.c    |    6 +
 src/ld.h             |    2 
 src/readelf.c        |    2 
 src/strings.c        |   11 ++
 src/strip.c          |   20 ++++
 tests/ChangeLog      |    7 +
 tests/Makefile.am    |    5 -
 tests/Makefile.in    |    6 -
 tests/line2addr.c    |    2 
 48 files changed, 520 insertions(+), 48 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils-portability.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- elfutils-portability.patch	29 Jul 2009 02:22:55 -0000	1.43
+++ elfutils-portability.patch	21 Sep 2009 17:51:37 -0000	1.44
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -48,6 +48,10 @@
+@@ -57,6 +57,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -375,6 +379,11 @@
+@@ -384,6 +388,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -397,6 +406,9 @@
+@@ -406,6 +415,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -101,7 +101,18 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -9,6 +9,8 @@
+@@ -6,6 +6,10 @@
+ 
+ 	* configure.ac (zip_LIBS): Check for liblzma too.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
++
+ 2009-04-19  Roland McGrath  <roland at redhat.com>
+ 
+ 	* configure.ac (eu_version): Round down here, not in version.h macros.
+@@ -17,6 +21,8 @@
  
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
@@ -110,7 +121,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -89,6 +91,10 @@
+@@ -97,6 +103,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -121,7 +132,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -136,6 +142,17 @@
+@@ -144,6 +154,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -168,7 +179,7 @@
  /* $libdir subdirectory containing libebl modules. */
  #undef LIBEBL_SUBDIR
  
-@@ -52,4 +55,7 @@
+@@ -55,4 +58,7 @@
  /* Define for large files, on AIX-style hosts. */
  #undef _LARGE_FILES
  
@@ -178,7 +189,7 @@
  #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -644,6 +644,8 @@ NATIVE_LD_FALSE
+@@ -646,6 +646,8 @@ NATIVE_LD_FALSE
  NATIVE_LD_TRUE
  DATADIRNAME
  LOCALEDIR
@@ -187,7 +198,7 @@
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -4094,6 +4096,152 @@ $as_echo "$as_me: error: gcc with C99 su
+@@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su
  fi
  
  
@@ -240,6 +251,59 @@
 +fi
 +
 +
++{ $as_echo "$as_me:$LINENO: checking for -fgnu89-inline option to $CC" >&5
++$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
++if test "${ac_cv_cc_gnu89_inline+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline -Werror"
++cat >conftest.$ac_ext <<_ACEOF
++
++void foo (void)
++{
++  inline void bar (void) {}
++  bar ();
++}
++extern inline void baz (void) {}
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_cc_gnu89_inline=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_cc_gnu89_inline=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$old_CFLAGS"
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_gnu89_inline" >&5
++$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
++if test "x$ac_cv_cc_gnu89_inline" = xyes; then
++  WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
++fi
++
++
 +{ $as_echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
 +$as_echo_n "checking for --as-needed linker option... " >&6; }
 +if test "${ac_cv_as_needed+set}" = set; then
@@ -340,7 +404,7 @@
  { $as_echo "$as_me:$LINENO: checking for __thread support" >&5
  $as_echo_n "checking for __thread support... " >&6; }
  if test "${ac_cv_tls+set}" = set; then
-@@ -4159,9 +4307,18 @@ fi
+@@ -4163,9 +4364,18 @@ fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
  $as_echo "$ac_cv_tls" >&6; }
  if test "x$ac_cv_tls" != xyes; then
@@ -363,7 +427,7 @@
  
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -74,6 +74,39 @@ CFLAGS="$old_CFLAGS"])
+@@ -73,6 +73,54 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
@@ -376,6 +440,21 @@
 +AC_SUBST(WEXTRA)
 +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
 +
++AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
++old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline -Werror"
++AC_COMPILE_IFELSE([
++void foo (void)
++{
++  inline void bar (void) {}
++  bar ();
++}
++extern inline void baz (void) {}
++], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
++CFLAGS="$old_CFLAGS"])
++AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
++      [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
++
 +AC_CACHE_CHECK([for --as-needed linker option],
 +	       ac_cv_as_needed, [dnl
 +cat > conftest.c <<EOF
@@ -403,7 +482,7 @@
  AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
  # Use the same flags that we use for our DSOs, so the test is representative.
  # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -89,7 +122,10 @@ static __thread int a; int foo (int b) {
+@@ -88,7 +136,10 @@ static __thread int a; int foo (int b) {
  CFLAGS="$save_CFLAGS"
  LDFLAGS="$save_LDFLAGS"])
  AS_IF([test "x$ac_cv_tls" != xyes],
@@ -417,7 +496,8 @@
  AC_SUBST(LOCALEDIR)
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -4,6 +4,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
@@ -426,7 +506,7 @@
  	* eu-config.h: Add multiple inclusion protection.
  
  2009-01-17  Ulrich Drepper  <drepper at redhat.com>
-@@ -56,6 +59,11 @@
+@@ -60,6 +63,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -440,7 +520,7 @@
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
 --- elfutils/lib/eu-config.h
 +++ elfutils/lib/eu-config.h
-@@ -182,5 +182,16 @@ asm (".section predict_data, \"aw\"; .pr
+@@ -182,6 +182,17 @@ asm (".section predict_data, \"aw\"; .pr
  /* This macro is used by the tests conditionalize for standalone building.  */
  #define ELFUTILS_HEADER(name) <lib##name.h>
  
@@ -456,7 +536,8 @@
 +#endif	/* HAVE_BUILTIN_POPCOUNT */
 +
  
- #endif	/* eu-config.h */
+ #ifdef SHARED
+ # define OLD_VERSION(name, version) \
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
 @@ -25,12 +25,13 @@
@@ -647,7 +728,18 @@
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -738,6 +738,11 @@
+@@ -20,6 +20,10 @@
+ 
+ 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* libdw.h: Disable extern inlines for GCC 4.2.
++
+ 2009-08-10  Roland McGrath  <roland at redhat.com>
+ 
+ 	* dwarf_getscopevar.c: Use dwarf_diename.
+@@ -788,6 +792,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -659,6 +751,17 @@
  	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
  	formref offset.
  
+--- elfutils/libdw/libdw.h
++++ elfutils/libdw/libdw.h
+@@ -809,7 +809,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+ 
+ 
+ /* Inline optimizations.  */
+-#ifdef __OPTIMIZE__
++#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+ /* Return attribute code of given attribute.  */
+ __libdw_extern_inline unsigned int
+ dwarf_whatattr (Dwarf_Attribute *attr)
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
 @@ -25,6 +25,7 @@
@@ -711,7 +814,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1098,6 +1098,11 @@
+@@ -1139,6 +1139,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -742,7 +845,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -750,7 +853,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -205,6 +206,7 @@ SHELL = @SHELL@
+@@ -208,6 +209,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -758,7 +861,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -263,9 +265,9 @@ top_builddir = @top_builddir@
+@@ -266,9 +268,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -772,7 +875,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -593,6 +593,11 @@
+@@ -603,6 +603,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -833,7 +936,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -576,6 +576,11 @@
+@@ -580,6 +580,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -968,7 +1071,24 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -155,6 +155,8 @@
+@@ -7,8 +7,16 @@
+ 	* readelf.c (attr_callback): Use print_block only when we don't use
+ 	print_ops.
+ 
++2009-08-17  Roland McGrath  <roland at redhat.com>
++
++	* ld.h: Disable extern inlines for GCC 4.2.
++
+ 2009-08-14  Roland McGrath  <roland at redhat.com>
+ 
++	* strings.c (read_block): Conditionalize posix_fadvise use
++	on [POSIX_FADV_SEQUENTIAL].
++	From Petr Salinger <Petr.Salinger at seznam.cz>.
++
+ 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
+ 
+ 2009-08-01  Ulrich Drepper  <drepper at redhat.com>
+@@ -172,6 +180,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -977,7 +1097,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -338,6 +340,11 @@
+@@ -355,6 +365,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -989,7 +1109,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -589,6 +596,8 @@
+@@ -606,6 +621,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -998,7 +1118,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -1028,6 +1037,10 @@
+@@ -1045,6 +1062,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1009,7 +1129,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1104,6 +1117,10 @@
+@@ -1121,6 +1142,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1020,7 +1140,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1452,6 +1469,11 @@
+@@ -1469,6 +1494,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1047,6 +1167,23 @@
  	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
  	   const char *fname, bool more_than_one, void **knownsrcs)
  {
+--- elfutils/src/ld.h
++++ elfutils/src/ld.h
+@@ -1122,6 +1122,7 @@ extern bool dynamically_linked_p (void);
+ 
+ /* Checked whether the symbol is undefined and referenced from a DSO.  */
+ extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
++#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+ #ifdef __GNUC_STDC_INLINE__
+ __attribute__ ((__gnu_inline__))
+ #endif
+@@ -1139,5 +1140,6 @@ linked_from_dso_p (struct scninfo *scnin
+ 
+   return sym->defined && sym->in_dso;
+ }
++#endif	/* Optimizing and not GCC 4.2.  */
+ 
+ #endif	/* ld.h */
 --- elfutils/src/Makefile.am
 +++ elfutils/src/Makefile.am
 @@ -26,6 +26,7 @@
@@ -1122,7 +1259,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7591,7 +7591,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7594,7 +7594,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1158,6 +1295,18 @@
  	  break;
  	}
        if (errno != EINVAL && errno != ENOMEM)
+@@ -586,9 +595,11 @@ read_block (int fd, const char *fname, o
+       elfmap_off = from & ~(ps - 1);
+       elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
+ 
++#ifdef POSIX_FADV_SEQUENTIAL
+       if (unlikely (elfmap == MAP_FAILED))
+ 	/* Let the kernel know we are going to read everything in sequence.  */
+ 	(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
++#endif
+     }
+ 
+   if (unlikely (elfmap == MAP_FAILED))
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
 @@ -52,6 +52,12 @@

elfutils-robustify.patch:
 libelf/ChangeLog              |   43 +++++++++++++++++
 libelf/elf32_getphdr.c        |   12 ++++
 libelf/elf32_getshdr.c        |   15 +++++-
 libelf/elf32_newphdr.c        |    6 ++
 libelf/elf32_updatefile.c     |    7 ++
 libelf/elf_begin.c            |   47 ++++++++++++++++++-
 libelf/elf_getarsym.c         |    3 +
 libelf/elf_getshdrstrndx.c    |   42 ++++++++++++++---
 libelf/elf_newscn.c           |   10 +++-
 libelf/gelf_getdyn.c          |    6 +-
 libelf/gelf_getlib.c          |    4 -
 libelf/gelf_getmove.c         |    4 -
 libelf/gelf_getrel.c          |   12 +---
 libelf/gelf_getrela.c         |   12 +---
 libelf/gelf_getsym.c          |    6 +-
 libelf/gelf_getsyminfo.c      |    4 -
 libelf/gelf_getsymshndx.c     |    8 +--
 libelf/gelf_getversym.c       |    4 -
 libelf/gelf_update_dyn.c      |   12 +---
 libelf/gelf_update_lib.c      |   10 ----
 libelf/gelf_update_move.c     |    5 --
 libelf/gelf_update_rel.c      |   12 +---
 libelf/gelf_update_rela.c     |   12 +---
 libelf/gelf_update_sym.c      |   12 +---
 libelf/gelf_update_syminfo.c  |   10 ----
 libelf/gelf_update_symshndx.c |   12 +---
 libelf/gelf_update_versym.c   |    5 --
 libelf/libelfP.h              |    4 +
 src/ChangeLog                 |   23 +++++++++
 src/elflint.c                 |  101 +++++++++++++++++++++++++++++++-----------
 src/readelf.c                 |   92 +++++++++++++++++++++++++++-----------
 src/strip.c                   |   70 +++++++++++++++++++----------
 32 files changed, 434 insertions(+), 191 deletions(-)

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils-robustify.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- elfutils-robustify.patch	29 Jul 2009 02:22:55 -0000	1.16
+++ elfutils-robustify.patch	21 Sep 2009 17:51:37 -0000	1.17
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -568,6 +568,49 @@
+@@ -572,6 +572,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -52,6 +52,13 @@
  	* elf.h: Update again.
 --- elfutils/libelf/elf32_getphdr.c
 +++ elfutils/libelf/elf32_getphdr.c
+@@ -1,5 +1,5 @@
+ /* Get ELF program header table.
+-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
+ 
 @@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -59,7 +66,7 @@
 +	  /* First see whether the information in the ELF header is
 +	     valid and it does not ask for too much.  */
 +	  if (unlikely (ehdr->e_phoff >= elf->maximum_size)
-+	      || unlikely (ehdr->e_phoff + size > elf->maximum_size))
++	      || unlikely (elf->maximum_size - ehdr->e_phoff < size))
 +	    {
 +	      /* Something is wrong.  */
 +	      __libelf_seterrno (ELF_E_INVALID_PHDR);
@@ -95,7 +102,7 @@
 +      /* First see whether the information in the ELF header is
 +	 valid and it does not ask for too much.  */
 +      if (unlikely (ehdr->e_shoff >= elf->maximum_size)
-+	  || unlikely (ehdr->e_shoff + size > elf->maximum_size))
++	  || unlikely (elf->maximum_size - ehdr->e_shoff < size))
 +	{
 +	  /* Something is wrong.  */
 +	  __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -145,13 +152,20 @@
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
 --- elfutils/libelf/elf_begin.c
 +++ elfutils/libelf/elf_begin.c
+@@ -1,5 +1,5 @@
+ /* Create descriptor for processing file.
+-   Copyright (C) 1998-2005, 2006, 2007, 2008 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
+ 
 @@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
 -	  if (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize)
 +	  if (unlikely (ehdr.e32->e_shoff >= maxsize)
-+	      || unlikely (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize))
++	      || unlikely (maxsize - ehdr.e32->e_shoff < sizeof (Elf32_Shdr)))
  	    /* Cannot read the first section header.  */
  	    return 0;
  
@@ -181,14 +195,14 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -318,13 +329,31 @@ file_read_elf (int fildes, void *map_add
+@@ -318,13 +329,30 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
 +
 +	  if (unlikely (ehdr->e_shoff >= maxsize)
-+	      || unlikely (ehdr->e_shoff
-+			   + scncnt * sizeof (Elf32_Shdr) > maxsize))
++	      || unlikely (maxsize - ehdr->e_shoff
++			   < scncnt * sizeof (Elf32_Shdr)))
 +	    {
 +	    free_and_out:
 +	      free (elf);
@@ -203,9 +217,8 @@
  	    /* Assign a value only if there really is a program
  	       header.  Otherwise the value remains NULL.  */
 +	      if (unlikely (ehdr->e_phoff >= maxsize)
-+		  || unlikely (ehdr->e_phoff
-+			       + ehdr->e_phnum
-+			       * sizeof (Elf32_Phdr) > maxsize))
++		  || unlikely (maxsize - ehdr->e_phoff
++			       < ehdr->e_phnum * sizeof (Elf32_Phdr)))
 +		goto free_and_out;
  	    elf->state.elf32.phdr
  	      = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
@@ -213,7 +226,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -406,13 +435,26 @@ file_read_elf (int fildes, void *map_add
+@@ -406,13 +434,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -262,11 +275,13 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf32_Shdr) - 1)) == 0))
+-		/* We can directly access the memory.  */
+-		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
-+		  if (unlikely (offset + sizeof (Elf32_Shdr)
-+				> elf->maximum_size))
++		  if (unlikely (elf->maximum_size - offset
++				< sizeof (Elf32_Shdr)))
 +		    {
 +		      /* Something is wrong.  */
 +		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -274,8 +289,7 @@
 +		      goto out;
 +		    }
 +
- 		/* We can directly access the memory.  */
--		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
++		  /* We can directly access the memory.  */
 +		  num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset
 +					 + offset))->sh_link;
 +		}
@@ -290,11 +304,13 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf64_Shdr) - 1)) == 0))
+-		/* We can directly access the memory.  */
+-		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
-+		  if (unlikely (offset + sizeof (Elf64_Shdr)
-+				> elf->maximum_size))
++		  if (unlikely (elf->maximum_size - offset
++				< sizeof (Elf64_Shdr)))
 +		    {
 +		      /* Something is wrong.  */
 +		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
@@ -302,10 +318,9 @@
 +		      goto out;
 +		    }
 +
- 		/* We can directly access the memory.  */
--		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
-+		  num = ((Elf64_Shdr *) (elf->map_address
-+			 + elf->start_offset + offset))->sh_link;
++		  /* We can directly access the memory.  */
++		  num = ((Elf64_Shdr *) (elf->map_address + elf->start_offset
++					 + offset))->sh_link;
 +		}
  	      else
  		{
@@ -334,52 +349,76 @@
  					* sizeof (Elf_Scn)), 1);
 --- elfutils/libelf/gelf_getdyn.c
 +++ elfutils/libelf/gelf_getdyn.c
-@@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get information from dynamic table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -93,7 +93,7 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -114,7 +115,8 @@ gelf_getdyn (data, ndx, dst)
+@@ -114,7 +114,7 @@ gelf_getdyn (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, GElf_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, GElf_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getlib.c
 +++ elfutils/libelf/gelf_getlib.c
-@@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get library from table at the given index.
+-   Copyright (C) 2004 Red Hat, Inc.
++   Copyright (C) 2004-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
+ 
+@@ -86,7 +86,7 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
    GElf_Lib *result = NULL;
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Lib)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Lib, data))
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
 --- elfutils/libelf/gelf_getmove.c
 +++ elfutils/libelf/gelf_getmove.c
-@@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get move structure at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -83,7 +83,7 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Move)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Move, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_getrela.c
 +++ elfutils/libelf/gelf_getrela.c
+@@ -1,5 +1,5 @@
+ /* Get RELA relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -393,28 +432,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -93,7 +87,8 @@ gelf_getrela (data, ndx, dst)
+@@ -93,7 +87,7 @@ gelf_getrela (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -114,7 +109,8 @@ gelf_getrela (data, ndx, dst)
+@@ -114,7 +108,7 @@ gelf_getrela (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
 --- elfutils/libelf/gelf_getrel.c
 +++ elfutils/libelf/gelf_getrel.c
+@@ -1,5 +1,5 @@
+ /* Get REL relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -428,107 +472,133 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -93,7 +87,8 @@ gelf_getrel (data, ndx, dst)
+@@ -93,7 +87,7 @@ gelf_getrel (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -113,7 +108,8 @@ gelf_getrel (data, ndx, dst)
+@@ -113,7 +107,7 @@ gelf_getrel (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
 --- elfutils/libelf/gelf_getsym.c
 +++ elfutils/libelf/gelf_getsym.c
-@@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get symbol information from symbol table at the given index.
+-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 1999-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
+ 
+@@ -90,7 +90,7 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, data))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -119,7 +120,8 @@ gelf_getsym (data, ndx, dst)
+@@ -119,7 +119,7 @@ gelf_getsym (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
-+      if (INVALID_NDX (ndx, GElf_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
++      if (INVALID_NDX (ndx, GElf_Sym, data))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getsyminfo.c
 +++ elfutils/libelf/gelf_getsyminfo.c
-@@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get additional symbol information from symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -84,7 +84,7 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Syminfo)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Syminfo, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_getsymshndx.c
 +++ elfutils/libelf/gelf_getsymshndx.c
-@@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -1,6 +1,6 @@
+ /* Get symbol information and separate section index from symbol table
+    at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -90,7 +90,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
      {
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Word) > shndxdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Word)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Word)
-+		       > shndxdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Word, &shndxdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -110,7 +112,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -110,7 +110,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, symdata))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -139,7 +142,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
+@@ -139,7 +139,7 @@ gelf_getsymshndx (symdata, shndxdata, nd
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
 -      if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
-+      if (INVALID_NDX (ndx, GElf_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
++      if (INVALID_NDX (ndx, GElf_Sym, symdata))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_getversym.c
 +++ elfutils/libelf/gelf_getversym.c
-@@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
+@@ -1,5 +1,5 @@
+ /* Get symbol version information at the given index.
+-   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 1999-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
+ 
+@@ -92,7 +92,7 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
-+  if (INVALID_NDX (ndx, GElf_Versym)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
++  if (INVALID_NDX (ndx, GElf_Versym, data))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
 --- elfutils/libelf/gelf_update_dyn.c
 +++ elfutils/libelf/gelf_update_dyn.c
+@@ -1,5 +1,5 @@
+ /* Update information in dynamic table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -542,28 +612,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_DYN))
      {
        /* The type of the data better should match.  */
-@@ -102,7 +96,8 @@ gelf_update_dyn (data, ndx, src)
+@@ -102,7 +96,7 @@ gelf_update_dyn (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -116,7 +111,8 @@ gelf_update_dyn (data, ndx, src)
+@@ -116,7 +110,7 @@ gelf_update_dyn (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Dyn)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Dyn, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_lib.c
 +++ elfutils/libelf/gelf_update_lib.c
+@@ -1,5 +1,5 @@
+ /* Update library in table at the given index.
+-   Copyright (C) 2004 Red Hat, Inc.
++   Copyright (C) 2004-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
+ 
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -577,29 +652,43 @@
    Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;
    if (unlikely (data_scn->d.d_type != ELF_T_LIB))
      {
-@@ -87,7 +81,8 @@ gelf_update_lib (data, ndx, src)
+@@ -87,7 +81,7 @@ gelf_update_lib (data, ndx, src)
  
    /* Check whether we have to resize the data buffer.  */
    int result = 0;
 -  if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
-+  if (INVALID_NDX (ndx, Elf64_Lib)
-+      || unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, Elf64_Lib, &data_scn->d))
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
 --- elfutils/libelf/gelf_update_move.c
 +++ elfutils/libelf/gelf_update_move.c
-@@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
+@@ -1,5 +1,5 @@
+ /* Update move structure at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
+@@ -75,8 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely (ndx < 0)
-+  if (INVALID_NDX (ndx, GElf_Move)
-       || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
+-      || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Move, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
+       return 0;
 --- elfutils/libelf/gelf_update_rela.c
 +++ elfutils/libelf/gelf_update_rela.c
+@@ -1,5 +1,5 @@
+ /* Update RELA relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -613,28 +702,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        /* The type of the data better should match.  */
-@@ -101,7 +95,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
+@@ -101,7 +95,7 @@ gelf_update_rela (Elf_Data *dst, int ndx
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -117,7 +112,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
+@@ -117,7 +111,7 @@ gelf_update_rela (Elf_Data *dst, int ndx
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rela)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_rel.c
 +++ elfutils/libelf/gelf_update_rel.c
+@@ -1,5 +1,5 @@
+ /* Update REL relocation information at given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -648,28 +742,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        /* The type of the data better should match.  */
-@@ -99,7 +93,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+@@ -99,7 +93,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -114,7 +109,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+@@ -114,7 +108,7 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Rel)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_sym.c
 +++ elfutils/libelf/gelf_update_sym.c
+@@ -1,5 +1,5 @@
+ /* Update symbol information in symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -683,28 +782,33 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -102,7 +96,8 @@ gelf_update_sym (data, ndx, src)
+@@ -102,7 +96,7 @@ gelf_update_sym (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -125,7 +120,8 @@ gelf_update_sym (data, ndx, src)
+@@ -125,7 +119,7 @@ gelf_update_sym (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Sym, &data_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_syminfo.c
 +++ elfutils/libelf/gelf_update_syminfo.c
+@@ -1,5 +1,5 @@
+ /* Update additional symbol information in symbol table at the given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -718,18 +822,25 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYMINFO))
      {
        /* The type of the data better should match.  */
-@@ -93,7 +87,8 @@ gelf_update_syminfo (data, ndx, src)
+@@ -93,7 +87,7 @@ gelf_update_syminfo (data, ndx, src)
    rwlock_wrlock (scn->elf->lock);
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
-+  if (INVALID_NDX (ndx, GElf_Syminfo)
-+      || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Syminfo, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
 --- elfutils/libelf/gelf_update_symshndx.c
 +++ elfutils/libelf/gelf_update_symshndx.c
+@@ -1,6 +1,6 @@
+ /* Update symbol information and section index in symbol table at the
+    given index.
+-   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2000-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
+ 
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -743,56 +854,57 @@
    if (unlikely (symdata_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -128,7 +122,8 @@ gelf_update_symshndx (symdata, shndxdata
+@@ -128,7 +122,7 @@ gelf_update_symshndx (symdata, shndxdata
  	}
  
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf32_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Sym, &symdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -151,7 +146,8 @@ gelf_update_symshndx (symdata, shndxdata
+@@ -151,7 +145,7 @@ gelf_update_symshndx (symdata, shndxdata
    else
      {
        /* Check whether we have to resize the data buffer.  */
 -      if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
-+      if (INVALID_NDX (ndx, Elf64_Sym)
-+	  || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Sym, &symdata_scn->d))
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
 --- elfutils/libelf/gelf_update_versym.c
 +++ elfutils/libelf/gelf_update_versym.c
-@@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
+@@ -1,5 +1,5 @@
+ /* Update symbol version information.
+-   Copyright (C) 2001, 2002 Red Hat, Inc.
++   Copyright (C) 2001-2009 Red Hat, Inc.
+    This file is part of Red Hat elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2001.
+ 
+@@ -75,8 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
    /* Check whether we have to resize the data buffer.  */
 -  if (unlikely (ndx < 0)
-+  if (INVALID_NDX (ndx, GElf_Versym)
-       || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
+-      || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, GElf_Versym, &data_scn->d))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
+       return 0;
 --- elfutils/libelf/libelfP.h
 +++ elfutils/libelf/libelfP.h
-@@ -606,4 +606,13 @@ extern uint32_t __libelf_crc32 (uint32_t
+@@ -606,4 +606,8 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
  
-+/* Convenience macro.  Assumes int NDX and TYPE with size at least
-+   2 bytes.  */
-+#if SIZE_MAX > 4294967295U
-+# define INVALID_NDX(ndx, type) unlikely (ndx < 0)
-+#else
-+# define INVALID_NDX(ndx, type) \
-+  unlikely ((unsigned int) (ndx) >= SIZE_MAX / sizeof (type))
-+#endif
++/* Convenience macro.  */
++#define INVALID_NDX(ndx, type, data) \
++  unlikely ((data)->d_size / sizeof (type) <= (unsigned int) (ndx))
 +
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1440,6 +1440,16 @@
+@@ -1457,6 +1457,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +921,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1485,6 +1495,19 @@
+@@ -1502,6 +1512,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- elfutils.spec	29 Jul 2009 02:22:55 -0000	1.114
+++ elfutils.spec	21 Sep 2009 17:51:37 -0000	1.115
@@ -1,4 +1,4 @@
-%define eu_version 0.142
+%define eu_version 0.143
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -50,12 +50,20 @@ BuildRequires: glibc-headers >= 2.3.4-11
 BuildRequires: gcc >= 3.2
 %endif
 
-%define use_zlib 0
+%define use_zlib        0
 %if 0%{?fedora} >= 5
-%define use_zlib 1
+%define use_zlib        1
 %endif
 %if 0%{?rhel} >= 5
-%define use_zlib 1
+%define use_zlib        1
+%endif
+
+%define use_xz          0
+%if 0%{?fedora} >= 10
+%define use_xz          1
+%endif
+%if 0%{?rhel} >= 6
+%define use_xz          1
 %endif
 
 %if %{use_zlib}
@@ -63,6 +71,10 @@ BuildRequires: zlib-devel >= 1.2.2.3
 BuildRequires: bzip2-devel
 %endif
 
+%if %{use_xz}
+BuildRequires: xz-devel
+%endif
+
 %define _gnu %{nil}
 %define _program_prefix eu-
 
@@ -276,16 +288,25 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Mon Sep 21 2009 Roland McGrath <roland at redhat.com> - 0.143-1
+- Update to 0.143
+  - libdw: Various convenience functions for individual attributes now use
+           dwarf_attr_integrate to look up indirect inherited attributes.
+           Location expression handling now supports DW_OP_implicit_value.
+  - libdwfl: Support automatic decompression of files in XZ format,
+             and of Linux kernel images made with bzip2 or LZMA
+             (as well as gzip).
+
 * Tue Jul 28 2009 Roland McGrath <roland at redhat.com> - 0.142-1
 - Update to 0.142
   - libelf: Bug fix in filling gaps between sections. (#512840)
   - libelf: Add elf_getshdrnum alias for elf_getshnum and elf_getshdrstrndx
-    	    alias for elf_getshstrndx and deprecate original names.
+            alias for elf_getshstrndx and deprecate original names.
   - libebl, elflint: Add support for STB_GNU_UNIQUE. (#511436)
   - readelf: Add -N option, speeds up DWARF printing
-    	     without address->name lookups. (#505347)
+             without address->name lookups. (#505347)
   - libdw: Add support for decoding DWARF CFI into location description form.
-    	   Handle some new DWARF 3 expression operations previously omitted.
+           Handle some new DWARF 3 expression operations previously omitted.
            Basic handling of some new encodings slated for DWARF 4.
 
 * Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	29 Jul 2009 02:22:55 -0000	1.53
+++ sources	21 Sep 2009 17:51:37 -0000	1.54
@@ -1 +1 @@
-03ce3616fa6a347c3156ee5f74985ea7  elfutils-0.142.tar.bz2
+06e35c348e78dec58f6aeb51bd397760  elfutils-0.143.tar.bz2


--- elfutils-0.142.tar.bz2.sig DELETED ---



From davej at fedoraproject.org  Mon Sep 21 17:55:22 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 21 Sep 2009 17:55:22 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1822,1.1823
Message-ID: <20090921175522.D8E6A11C0043@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13425/F-12

Modified Files:
	kernel.spec 
Log Message:
rhel6 can use fancy debuginfo.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1822
retrieving revision 1.1823
diff -u -p -r1.1822 -r1.1823
--- kernel.spec	21 Sep 2009 05:38:43 -0000	1.1822
+++ kernel.spec	21 Sep 2009 17:55:21 -0000	1.1823
@@ -506,7 +506,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 5
 
 %define fancy_debuginfo 0
 %if %{with_debuginfo}
-%if 0%{?fedora} >= 8
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
 %define fancy_debuginfo 1
 %endif
 %endif



From davej at fedoraproject.org  Mon Sep 21 17:55:23 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 21 Sep 2009 17:55:23 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1807,1.1808
Message-ID: <20090921175523.137B611C0335@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13425/devel

Modified Files:
	kernel.spec 
Log Message:
rhel6 can use fancy debuginfo.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1807
retrieving revision 1.1808
diff -u -p -r1.1807 -r1.1808
--- kernel.spec	18 Sep 2009 15:40:19 -0000	1.1807
+++ kernel.spec	21 Sep 2009 17:55:22 -0000	1.1808
@@ -507,7 +507,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 5
 
 %define fancy_debuginfo 0
 %if %{with_debuginfo}
-%if 0%{?fedora} >= 8
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
 %define fancy_debuginfo 1
 %endif
 %endif



From mclasen at fedoraproject.org  Mon Sep 21 17:58:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 21 Sep 2009 17:58:51 +0000 (UTC)
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.30,
	1.31 gnome-user-docs.spec, 1.45, 1.46 sources, 1.30, 1.31
Message-ID: <20090921175851.B4B2F11C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15202

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	8 Sep 2009 02:37:11 -0000	1.30
+++ .cvsignore	21 Sep 2009 17:58:51 -0000	1.31
@@ -1 +1 @@
-gnome-user-docs-2.27.2.tar.bz2
+gnome-user-docs-2.28.0.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gnome-user-docs.spec	8 Sep 2009 02:41:34 -0000	1.45
+++ gnome-user-docs.spec	21 Sep 2009 17:58:51 -0000	1.46
@@ -1,9 +1,9 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.27.2
+Version:        2.28.0
 Release:	1%{?dist}
 License:        GFDL
-Source:         http://download.gnome.org/sources/gnome-user-docs/2.27/gnome-user-docs-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-user-docs/2.28/gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ exit 0
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-1
 - Update to 2.27.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	8 Sep 2009 02:37:11 -0000	1.30
+++ sources	21 Sep 2009 17:58:51 -0000	1.31
@@ -1 +1 @@
-cca915e452ff6ec51215ae4d50ef1bfd  gnome-user-docs-2.27.2.tar.bz2
+27603f857ccf6dc3f510b77a1ca4825e  gnome-user-docs-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 21 18:03:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 21 Sep 2009 18:03:37 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.42,
	1.43 gnome-doc-utils.spec, 1.75, 1.76 sources, 1.42, 1.43
Message-ID: <20090921180337.6DF0011C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17401

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.18.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	8 Sep 2009 00:56:29 -0000	1.42
+++ .cvsignore	21 Sep 2009 18:03:37 -0000	1.43
@@ -1 +1 @@
-gnome-doc-utils-0.17.5.tar.bz2
+gnome-doc-utils-0.18.0.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- gnome-doc-utils.spec	8 Sep 2009 00:56:29 -0000	1.75
+++ gnome-doc-utils.spec	21 Sep 2009 18:03:37 -0000	1.76
@@ -3,14 +3,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.17.5
+Version: 0.18.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
 Summary: Documentation utilities for GNOME
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://download.gnome.org/sources/gnome-doc-utils/0.17/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.18/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xml/mallard
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 0.18.0-1
+- Update to 0.18.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 0.17.5-1
 - Update to 0.17.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	8 Sep 2009 00:56:29 -0000	1.42
+++ sources	21 Sep 2009 18:03:37 -0000	1.43
@@ -1 +1 @@
-74060b2e8c35ee1ee4b5b15469afc681  gnome-doc-utils-0.17.5.tar.bz2
+5a25827673f9ff060a554c0858dbf020  gnome-doc-utils-0.18.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 21 18:03:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 21 Sep 2009 18:03:43 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel .cvsignore, 1.10,
	1.11 gnome-devel-docs.spec, 1.14, 1.15 sources, 1.10, 1.11
Message-ID: <20090921180343.7020711C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16606

Modified Files:
	.cvsignore gnome-devel-docs.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	25 Aug 2009 02:28:18 -0000	1.10
+++ .cvsignore	21 Sep 2009 18:03:43 -0000	1.11
@@ -1 +1 @@
-gnome-devel-docs-2.27.1.tar.bz2
+gnome-devel-docs-2.28.0.tar.bz2


Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gnome-devel-docs.spec	25 Aug 2009 02:28:18 -0000	1.14
+++ gnome-devel-docs.spec	21 Sep 2009 18:03:43 -0000	1.15
@@ -1,11 +1,11 @@
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
-Version: 2.27.1
+Version: 2.28.0
 Release: 1%{?dist}
 License: GFDL
 Group: System Environment/Libraries
 URL: http://library.gnome.org
-Source: http://download.gnome.org/sources/gnome-devel-docs/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-devel-docs/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/platform-overview
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.1-1
 - Update to 2.27.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Aug 2009 02:28:18 -0000	1.10
+++ sources	21 Sep 2009 18:03:43 -0000	1.11
@@ -1 +1 @@
-85ad7f99be674be6cdb665e9ad482afd  gnome-devel-docs-2.27.1.tar.bz2
+fabec098089940cd02c323514e0aeb28  gnome-devel-docs-2.28.0.tar.bz2



From pcheung at fedoraproject.org  Mon Sep 21 18:03:46 2009
From: pcheung at fedoraproject.org (Permaine Cheung)
Date: Mon, 21 Sep 2009 18:03:46 +0000 (UTC)
Subject: rpms/bsh/devel bsh.spec,1.20,1.21
Message-ID: <20090921180346.E934A11C0043@cvs1.fedora.phx.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/bsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17743

Modified Files:
	bsh.spec 
Log Message:
Do not build manual and faq for ppc64 or s390x as the style task is disabled


Index: bsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bsh.spec	24 Jul 2009 18:27:06 -0000	1.20
+++ bsh.spec	21 Sep 2009 18:03:46 -0000	1.21
@@ -32,7 +32,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        15%{?dist}
+Release:        15.1%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 License:        SPL or LGPLv2+
@@ -136,9 +136,11 @@ pushd lib
 ln -sf $(build-classpath bsf)
 ln -sf $(build-classpath servlet)
 popd
-ant dist
-(cd docs/faq && ant)
-(cd docs/manual && ant)
+ant  -Dant.build.javac.source=1.4 dist
+%ifnarch ppc64 s390x
+(cd docs/faq && ant  -Dant.build.javac.source=1.4)
+(cd docs/manual && ant  -Dant.build.javac.source=1.4)
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -175,9 +177,11 @@ find docs -name ".cvswrappers" -exec rm 
 find docs -name "*.xml" -exec rm -f {} \;
 find docs -name "*.xsl" -exec rm -f {} \;
 find docs -name "*.log" -exec rm -f {} \;
+%ifnarch ppc64 s390x
 (cd docs/manual && mv html/* .)
 (cd docs/manual && rm -rf html)
 (cd docs/manual && rm -rf xsl)
+%endif
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -329,9 +333,11 @@ exit 0
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
+%ifnarch ppc64 s390x
 %files manual
 %defattr(-,root,root)
 %doc docs/*
+%endif
 
 %files javadoc
 %defattr(-,root,root)
@@ -349,6 +355,9 @@ exit 0
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Mon Sep 21 2009 Permaine Cheung <pcheung at redhat.com> 0:1.3.0-15.1
+- Do not build manual and faq for ppc64 or s390x as the style task is disabled
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From krnowak at fedoraproject.org  Mon Sep 21 18:23:51 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Mon, 21 Sep 2009 18:23:51 +0000 (UTC)
Subject: rpms/mm-common/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 mm-common.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921182351.7562211C0043@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/mm-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28188/devel

Modified Files:
	.cvsignore import.log mm-common.spec sources 
Log Message:
* Mon Sep 21 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.8-1
- Update to 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 11:27:42 -0000	1.2
+++ .cvsignore	21 Sep 2009 18:23:51 -0000	1.3
@@ -1 +1 @@
-mm-common-0.7.3.tar.bz2
+mm-common-0.8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 11:27:43 -0000	1.1
+++ import.log	21 Sep 2009 18:23:51 -0000	1.2
@@ -1 +1,2 @@
 mm-common-0_7_3-2_fc11:HEAD:mm-common-0.7.3-2.fc11.src.rpm:1253186598
+mm-common-0_8-1_fc11:HEAD:mm-common-0.8-1.fc11.src.rpm:1253557276


Index: mm-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/devel/mm-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mm-common.spec	17 Sep 2009 11:27:43 -0000	1.1
+++ mm-common.spec	21 Sep 2009 18:23:51 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           mm-common
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Common build files of the C++ bindings
 
 Group:          Development/Tools
 BuildArch:      noarch
 License:        GPLv2+ and GFDL
 URL:            http://gtkmm.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pkgconfig
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}/*
 
 %changelog
+* Mon Sep 21 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.8-1
+- New upstream release.
+
 * Sun Sep 13 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
 - Added automake to `Requires:'.
 - Fixed some directory ownerships.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 11:27:43 -0000	1.2
+++ sources	21 Sep 2009 18:23:51 -0000	1.3
@@ -1 +1 @@
-bdbebc329d88182a5d2effd7f9073f17  mm-common-0.7.3.tar.bz2
+2a335530f02c35dec1deea4b3627b725  mm-common-0.8.tar.bz2



From krnowak at fedoraproject.org  Mon Sep 21 18:29:01 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Mon, 21 Sep 2009 18:29:01 +0000 (UTC)
Subject: rpms/mm-common/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 mm-common.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921182901.0BE7011C0043@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/mm-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29910/F-11

Modified Files:
	.cvsignore import.log mm-common.spec sources 
Log Message:
* Mon Sep 21 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.8-1
- Update to 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 11:34:40 -0000	1.2
+++ .cvsignore	21 Sep 2009 18:29:00 -0000	1.3
@@ -1 +1 @@
-mm-common-0.7.3.tar.bz2
+mm-common-0.8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 11:34:40 -0000	1.1
+++ import.log	21 Sep 2009 18:29:00 -0000	1.2
@@ -1 +1,2 @@
 mm-common-0_7_3-2_fc11:F-11:mm-common-0.7.3-2.fc11.src.rpm:1253187169
+mm-common-0_8-1_fc11:F-11:mm-common-0.8-1.fc11.src.rpm:1253557592


Index: mm-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-11/mm-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mm-common.spec	17 Sep 2009 11:34:40 -0000	1.1
+++ mm-common.spec	21 Sep 2009 18:29:00 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           mm-common
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Common build files of the C++ bindings
 
 Group:          Development/Tools
 BuildArch:      noarch
 License:        GPLv2+ and GFDL
 URL:            http://gtkmm.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pkgconfig
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}/*
 
 %changelog
+* Mon Sep 21 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.8-1
+- New upstream release.
+
 * Sun Sep 13 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
 - Added automake to `Requires:'.
 - Fixed some directory ownerships.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 11:34:40 -0000	1.2
+++ sources	21 Sep 2009 18:29:00 -0000	1.3
@@ -1 +1 @@
-bdbebc329d88182a5d2effd7f9073f17  mm-common-0.7.3.tar.bz2
+2a335530f02c35dec1deea4b3627b725  mm-common-0.8.tar.bz2



From krnowak at fedoraproject.org  Mon Sep 21 18:30:57 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Mon, 21 Sep 2009 18:30:57 +0000 (UTC)
Subject: rpms/mm-common/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 mm-common.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921183057.DE69411C0043@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/mm-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31740/F-10

Modified Files:
	.cvsignore import.log mm-common.spec sources 
Log Message:
* Mon Sep 21 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.8-1
- Update to 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 11:38:09 -0000	1.2
+++ .cvsignore	21 Sep 2009 18:30:57 -0000	1.3
@@ -1 +1 @@
-mm-common-0.7.3.tar.bz2
+mm-common-0.8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 11:38:09 -0000	1.1
+++ import.log	21 Sep 2009 18:30:57 -0000	1.2
@@ -1 +1,2 @@
 mm-common-0_7_3-2_fc11:F-10:mm-common-0.7.3-2.fc11.src.rpm:1253187347
+mm-common-0_8-1_fc11:F-10:mm-common-0.8-1.fc11.src.rpm:1253557775


Index: mm-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-10/mm-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mm-common.spec	17 Sep 2009 11:38:10 -0000	1.1
+++ mm-common.spec	21 Sep 2009 18:30:57 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           mm-common
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Common build files of the C++ bindings
 
 Group:          Development/Tools
 BuildArch:      noarch
 License:        GPLv2+ and GFDL
 URL:            http://gtkmm.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pkgconfig
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}/*
 
 %changelog
+* Mon Sep 21 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.8-1
+- New upstream release.
+
 * Sun Sep 13 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.7.3-2
 - Added automake to `Requires:'.
 - Fixed some directory ownerships.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mm-common/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 11:38:10 -0000	1.2
+++ sources	21 Sep 2009 18:30:57 -0000	1.3
@@ -1 +1 @@
-bdbebc329d88182a5d2effd7f9073f17  mm-common-0.7.3.tar.bz2
+2a335530f02c35dec1deea4b3627b725  mm-common-0.8.tar.bz2



From limb at fedoraproject.org  Mon Sep 21 18:53:27 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 21 Sep 2009 18:53:27 +0000 (UTC)
Subject: rpms/wesnoth/F-11 sources,1.40,1.41 wesnoth.spec,1.80,1.81
Message-ID: <20090921185328.065C311C0043@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9386

Modified Files:
	sources wesnoth.spec 
Log Message:
1.6.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	6 Jul 2009 02:25:55 -0000	1.40
+++ sources	21 Sep 2009 18:53:27 -0000	1.41
@@ -1 +1 @@
-c8bc4c5b2be28e29563dfe3f89eafd51  wesnoth-1.6.4.tar.bz2
+493826bbd9ba355930765a7e8fe3749a  wesnoth-1.6.5.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-11/wesnoth.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- wesnoth.spec	10 Jul 2009 18:33:30 -0000	1.80
+++ wesnoth.spec	21 Sep 2009 18:53:27 -0000	1.81
@@ -1,6 +1,6 @@
 Name:           wesnoth
-Version:        1.6.4
-Release:        2%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -253,6 +253,12 @@ fi
 #%endif
 
 %changelog
+* Sun Sep 06 2009 Warren Togami <wtogami at redhat.com> - 1.6.5-1
+- 1.6.5
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Jon Ciesla <limb at jcomserv.net> - 1.6.4-2
 - Fribidi patch, BZ 504526.
 



From rdieter at fedoraproject.org  Mon Sep 21 18:57:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 18:57:47 +0000 (UTC)
Subject: rpms/konversation/devel konversation-1.2-ircview_autoexpand.patch, 
	NONE, 1.1 konversation.spec, 1.34, 1.35
Message-ID: <20090921185747.5156111C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10747

Modified Files:
	konversation.spec 
Added Files:
	konversation-1.2-ircview_autoexpand.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
- With auto-expand input box, ircview doesn't scroll (kdebug #208097)


konversation-1.2-ircview_autoexpand.patch:
 ircview.cpp |    9 +++++++++
 ircview.h   |    1 +
 2 files changed, 10 insertions(+)

--- NEW FILE konversation-1.2-ircview_autoexpand.patch ---
--- trunk/extragear/network/konversation/src/viewer/ircview.cpp	2009/09/21 18:15:42	1026397
+++ trunk/extragear/network/konversation/src/viewer/ircview.cpp	2009/09/21 18:16:59	1026398
@@ -1279,6 +1279,15 @@
     action->setData(Konversation::Topic);
 }
 
+void IRCView::resizeEvent(QResizeEvent *event)
+{
+    QScrollBar *vbar = verticalScrollBar();
+    bool atBottom = (vbar->value() == vbar->maximum());
+    KTextBrowser::resizeEvent(event);
+    if (atBottom)
+        vbar->setValue(vbar->maximum());
+}
+
 void IRCView::mouseMoveEvent(QMouseEvent* ev)
 {
     if (m_mousePressed && (m_pressPosition - ev->pos()).manhattanLength() > KApplication::startDragDistance())
--- trunk/extragear/network/konversation/src/viewer/ircview.h	2009/09/21 18:15:42	1026397
+++ trunk/extragear/network/konversation/src/viewer/ircview.h	2009/09/21 18:16:59	1026398
@@ -229,6 +229,7 @@
 
         void replaceDecoration(QString& line,char decoration,char replacement);
 
+        virtual void resizeEvent(QResizeEvent *event);
         virtual void mouseReleaseEvent(QMouseEvent* ev);
         virtual void mousePressEvent(QMouseEvent* ev);
         virtual void mouseMoveEvent(QMouseEvent* ev);


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- konversation.spec	21 Sep 2009 11:37:35 -0000	1.34
+++ konversation.spec	21 Sep 2009 18:57:47 -0000	1.35
@@ -1,10 +1,10 @@
 
 %define pre beta1 
-#define pre 20090919svn
+#define pre 20090921svn
 
 Name:           konversation
 Version:        1.2
-Release:        0.10.%{pre}%{?dist}
+Release:        0.11.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -14,6 +14,10 @@ Source0:        http://download.berlios.
 #Source0:        konversation-1.2-%{pre}.tar.bz2 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://websvn.kde.org/?view=rev&revision=1026398
+Patch100: konversation-1.2-ircview_autoexpand.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -36,6 +40,8 @@ to chat windows; configurable background
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p4 -b .ircview_autoexpand
+
 
 %build
 
@@ -91,6 +97,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
+- With auto-expand input box, ircview doesn't scroll (kdebug #208097)
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.10.beta1
 - konversation-1.2-beta1
 



From rdieter at fedoraproject.org  Mon Sep 21 19:06:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 19:06:46 +0000 (UTC)
Subject: rpms/konversation/F-11 konversation-1.2-ircview_autoexpand.patch,
	NONE, 1.1 konversation.spec, 1.28, 1.29
Message-ID: <20090921190646.EB1DC11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14194

Modified Files:
	konversation.spec 
Added Files:
	konversation-1.2-ircview_autoexpand.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
- With auto-expand input box, ircview doesn't scroll (kdebug #208097)


konversation-1.2-ircview_autoexpand.patch:
 ircview.cpp |    9 +++++++++
 ircview.h   |    1 +
 2 files changed, 10 insertions(+)

--- NEW FILE konversation-1.2-ircview_autoexpand.patch ---
--- trunk/extragear/network/konversation/src/viewer/ircview.cpp	2009/09/21 18:15:42	1026397
+++ trunk/extragear/network/konversation/src/viewer/ircview.cpp	2009/09/21 18:16:59	1026398
@@ -1279,6 +1279,15 @@
     action->setData(Konversation::Topic);
 }
 
+void IRCView::resizeEvent(QResizeEvent *event)
+{
+    QScrollBar *vbar = verticalScrollBar();
+    bool atBottom = (vbar->value() == vbar->maximum());
+    KTextBrowser::resizeEvent(event);
+    if (atBottom)
+        vbar->setValue(vbar->maximum());
+}
+
 void IRCView::mouseMoveEvent(QMouseEvent* ev)
 {
     if (m_mousePressed && (m_pressPosition - ev->pos()).manhattanLength() > KApplication::startDragDistance())
--- trunk/extragear/network/konversation/src/viewer/ircview.h	2009/09/21 18:15:42	1026397
+++ trunk/extragear/network/konversation/src/viewer/ircview.h	2009/09/21 18:16:59	1026398
@@ -229,6 +229,7 @@
 
         void replaceDecoration(QString& line,char decoration,char replacement);
 
+        virtual void resizeEvent(QResizeEvent *event);
         virtual void mouseReleaseEvent(QMouseEvent* ev);
         virtual void mousePressEvent(QMouseEvent* ev);
         virtual void mouseMoveEvent(QMouseEvent* ev);


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- konversation.spec	21 Sep 2009 11:39:23 -0000	1.28
+++ konversation.spec	21 Sep 2009 19:06:46 -0000	1.29
@@ -1,10 +1,10 @@
 
 %define pre beta1 
-#define pre 20090919svn
+#define pre 20090921svn
 
 Name:           konversation
 Version:        1.2
-Release:        0.10.%{pre}%{?dist}
+Release:        0.11.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -14,6 +14,10 @@ Source0:        http://download.berlios.
 #Source0:        konversation-1.2-%{pre}.tar.bz2 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://websvn.kde.org/?view=rev&revision=1026398
+Patch100: konversation-1.2-ircview_autoexpand.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -36,6 +40,8 @@ to chat windows; configurable background
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p4 -b .ircview_autoexpand
+
 
 %build
 
@@ -91,6 +97,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
+- With auto-expand input box, ircview doesn't scroll (kdebug #208097)
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.10.beta1
 - konversation-1.2-beta1
 



From hvad at fedoraproject.org  Mon Sep 21 19:11:38 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 21 Sep 2009 19:11:38 +0000 (UTC)
Subject: rpms/perl-Curses-UI/F-11 import.log, NONE, 1.1 perl-Curses-UI.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090921191139.089EF11C0043@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Curses-UI/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15099/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Curses-UI.spec 
Log Message:



--- NEW FILE import.log ---
perl-Curses-UI-0_9607-2_fc10:F-11:perl-Curses-UI-0.9607-2.fc10.src.rpm:1253566610


--- NEW FILE perl-Curses-UI.spec ---
Name:           perl-Curses-UI
Version:        0.9607
Release:        2%{?dist}
Summary:        Curses based OO user interface framework
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Curses-UI/
Source0:        http://www.cpan.org/authors/id/M/MD/MDXI/Curses-UI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Curses)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Term::ReadKey)
BuildRequires:  perl(Test::Simple)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Curses::UI is an object-oriented user interface framework for Perl.

%prep
%setup -q -n Curses-UI-%{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 CREDITS README INSTALL
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.9607-2
- Add require build 

* Mon Aug 03 2009 David Hannequin david.hannequin at gmail.com 0.9607-1
- First release 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:23:01 -0000	1.1
+++ .cvsignore	21 Sep 2009 19:11:38 -0000	1.2
@@ -0,0 +1 @@
+Curses-UI-0.9607.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:23:01 -0000	1.1
+++ sources	21 Sep 2009 19:11:38 -0000	1.2
@@ -0,0 +1 @@
+8970c72e378aa386e0e79a884ef5863a  Curses-UI-0.9607.tar.gz



From nsantos at fedoraproject.org  Mon Sep 21 19:13:21 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon, 21 Sep 2009 19:13:21 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.22, 1.23 qpidc.spec, 1.96,
	1.97 sources, 1.43, 1.44
Message-ID: <20090921191321.9818811C0043@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16675

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to 817349


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	19 Sep 2009 00:52:45 -0000	1.22
+++ .cvsignore	21 Sep 2009 19:13:21 -0000	1.23
@@ -1 +1 @@
-qpidc-0.5.816781.tar.gz
+qpidc-0.5.817349.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- qpidc.spec	19 Sep 2009 04:28:24 -0000	1.96
+++ qpidc.spec	21 Sep 2009 19:13:21 -0000	1.97
@@ -8,7 +8,7 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name:           qpidc
-Version:        0.5.816781
+Version:        0.5.817349
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -443,8 +443,8 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
-- Rebased to svn rev 816781
+* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349-1
+- Rebased to svn rev 817349
 
 * Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-3
 - Update BuildRequires and Requires to use latest stable versions of


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	19 Sep 2009 00:52:45 -0000	1.43
+++ sources	21 Sep 2009 19:13:21 -0000	1.44
@@ -1 +1 @@
-69349887e52b6e5a3a956ebe58342295  qpidc-0.5.816781.tar.gz
+3d8e101731c2f8a8fba5907f9cdb9282  qpidc-0.5.817349.tar.gz



From hvad at fedoraproject.org  Mon Sep 21 19:17:36 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 21 Sep 2009 19:17:36 +0000 (UTC)
Subject: rpms/perl-Curses-UI/F-10 import.log, NONE, 1.1 perl-Curses-UI.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090921191736.91F6F11C0043@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Curses-UI/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18542/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Curses-UI.spec 
Log Message:



--- NEW FILE import.log ---
perl-Curses-UI-0_9607-2_fc10:F-10:perl-Curses-UI-0.9607-2.fc10.src.rpm:1253567669


--- NEW FILE perl-Curses-UI.spec ---
Name:           perl-Curses-UI
Version:        0.9607
Release:        2%{?dist}
Summary:        Curses based OO user interface framework
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Curses-UI/
Source0:        http://www.cpan.org/authors/id/M/MD/MDXI/Curses-UI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Curses)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Term::ReadKey)
BuildRequires:  perl(Test::Simple)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Curses::UI is an object-oriented user interface framework for Perl.

%prep
%setup -q -n Curses-UI-%{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 CREDITS README INSTALL
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.9607-2
- Add require build 

* Mon Aug 03 2009 David Hannequin david.hannequin at gmail.com 0.9607-1
- First release 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:23:01 -0000	1.1
+++ .cvsignore	21 Sep 2009 19:17:36 -0000	1.2
@@ -0,0 +1 @@
+Curses-UI-0.9607.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:23:01 -0000	1.1
+++ sources	21 Sep 2009 19:17:36 -0000	1.2
@@ -0,0 +1 @@
+8970c72e378aa386e0e79a884ef5863a  Curses-UI-0.9607.tar.gz



From rvinyard at fedoraproject.org  Mon Sep 21 19:42:31 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon, 21 Sep 2009 19:42:31 +0000 (UTC)
Subject: rpms/dbus-cxx/F-11 .cvsignore, 1.12, 1.13 dbus-cxx.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090921194231.4FB1A11C0043@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28775

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 Aug 2009 18:56:42 -0000	1.12
+++ .cvsignore	21 Sep 2009 19:42:28 -0000	1.13
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.2.tar.bz2
-dbus-cxx-0.4.2-doc.tar.bz2
+dbus-cxx-0.4.3.tar.bz2
+dbus-cxx-0.4.3-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/dbus-cxx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dbus-cxx.spec	24 Aug 2009 18:56:42 -0000	1.11
+++ dbus-cxx.spec	21 Sep 2009 19:42:28 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.2
+Version:          0.4.3
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -156,6 +156,9 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
 
 %changelog
+* Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
+- New release
+
 * Mon Aug 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.2-1
 - New release
 - Made docs noarch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Aug 2009 18:56:42 -0000	1.12
+++ sources	21 Sep 2009 19:42:28 -0000	1.13
@@ -1,2 +1,2 @@
-2bcb056206b8b8b6257e6069a626a97e  dbus-cxx-0.4.2.tar.bz2
-4a124dabe55a7054adbf7cfaa6c8ef18  dbus-cxx-0.4.2-doc.tar.bz2
+09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
+0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2



From rvinyard at fedoraproject.org  Mon Sep 21 19:42:31 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon, 21 Sep 2009 19:42:31 +0000 (UTC)
Subject: rpms/dbus-cxx/devel .cvsignore, 1.12, 1.13 dbus-cxx.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <20090921194231.8D9A411C0335@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28734

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 Aug 2009 18:56:34 -0000	1.12
+++ .cvsignore	21 Sep 2009 19:42:27 -0000	1.13
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.2.tar.bz2
-dbus-cxx-0.4.2-doc.tar.bz2
+dbus-cxx-0.4.3.tar.bz2
+dbus-cxx-0.4.3-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/dbus-cxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dbus-cxx.spec	24 Aug 2009 18:56:34 -0000	1.12
+++ dbus-cxx.spec	21 Sep 2009 19:42:27 -0000	1.13
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.2
+Version:          0.4.3
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -156,6 +156,9 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
 
 %changelog
+* Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
+- New release
+
 * Mon Aug 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.2-1
 - New release
 - Made docs noarch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Aug 2009 18:56:34 -0000	1.12
+++ sources	21 Sep 2009 19:42:28 -0000	1.13
@@ -1,2 +1,2 @@
-2bcb056206b8b8b6257e6069a626a97e  dbus-cxx-0.4.2.tar.bz2
-4a124dabe55a7054adbf7cfaa6c8ef18  dbus-cxx-0.4.2-doc.tar.bz2
+09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
+0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2



From rvinyard at fedoraproject.org  Mon Sep 21 19:42:34 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon, 21 Sep 2009 19:42:34 +0000 (UTC)
Subject: rpms/dbus-cxx/F-10 .cvsignore, 1.12, 1.13 dbus-cxx.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090921194234.8069911C0043@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28822

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 Aug 2009 18:56:49 -0000	1.12
+++ .cvsignore	21 Sep 2009 19:42:33 -0000	1.13
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.2.tar.bz2
-dbus-cxx-0.4.2-doc.tar.bz2
+dbus-cxx-0.4.3.tar.bz2
+dbus-cxx-0.4.3-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/dbus-cxx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dbus-cxx.spec	24 Aug 2009 18:56:49 -0000	1.11
+++ dbus-cxx.spec	21 Sep 2009 19:42:33 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.2
+Version:          0.4.3
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -156,6 +156,9 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
 
 %changelog
+* Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
+- New release
+
 * Mon Aug 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.2-1
 - New release
 - Made docs noarch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Aug 2009 18:56:49 -0000	1.12
+++ sources	21 Sep 2009 19:42:33 -0000	1.13
@@ -1,2 +1,2 @@
-2bcb056206b8b8b6257e6069a626a97e  dbus-cxx-0.4.2.tar.bz2
-4a124dabe55a7054adbf7cfaa6c8ef18  dbus-cxx-0.4.2-doc.tar.bz2
+09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
+0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2



From jdennis at fedoraproject.org  Mon Sep 21 19:56:38 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Mon, 21 Sep 2009 19:56:38 +0000 (UTC)
Subject: rpms/python-nss/devel .cvsignore, 1.9, 1.10 python-nss.spec, 1.13, 
	1.14 sources, 1.11, 1.12
Message-ID: <20090921195638.AB06711C0043@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/python-nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3732

Modified Files:
	.cvsignore python-nss.spec sources 
Log Message:
* The following methods, properties  and functions were added:
  SecItem.type SecItem.len, SecItem.data
  PK11SymKey.key_data, PK11SymKey.key_length, PK11SymKey.slot
  create_context_by_sym_key
  param_from_iv
  generate_new_param
  get_iv_length
  get_block_size
  get_pad_mechanism
* SecItem's now support indexing and slicing on their data
* Clean up parsing and parameter validation of variable arg functions



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Sep 2009 19:56:53 -0000	1.9
+++ .cvsignore	21 Sep 2009 19:56:37 -0000	1.10
@@ -1 +1 @@
-python-nss-0.7.tar.bz2
+python-nss-0.8.tar.bz2


Index: python-nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/python-nss.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-nss.spec	18 Sep 2009 19:56:53 -0000	1.13
+++ python-nss.spec	21 Sep 2009 19:56:37 -0000	1.14
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-nss
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Python bindings for Network Security Services (NSS)
 
@@ -73,6 +73,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 John Dennis <jdennis at redhat.com> - 0.8-1
+- The following methods, properties  and functions were added:
+  SecItem.type SecItem.len, SecItem.data
+  PK11SymKey.key_data, PK11SymKey.key_length, PK11SymKey.slot
+  create_context_by_sym_key
+  param_from_iv
+  generate_new_param
+  get_iv_length
+  get_block_size
+  get_pad_mechanism
+- SecItem's now support indexing and slicing on their data
+- Clean up parsing and parameter validation of variable arg functions
+
 * Fri Sep 18 2009 John Dennis <jdennis at redhat.com> - 0.7-1
 - add support for symmetric encryption/decryption
   more support for digests (hashes)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2009 19:56:53 -0000	1.11
+++ sources	21 Sep 2009 19:56:37 -0000	1.12
@@ -1 +1 @@
-5d38521041a1f2fc1e34a56dcc72ff0a  python-nss-0.7.tar.bz2
+4209e0b421d3b997602f695e04282daa  python-nss-0.8.tar.bz2



From steve at fedoraproject.org  Mon Sep 21 20:00:46 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Mon, 21 Sep 2009 20:00:46 +0000 (UTC)
Subject: rpms/perl-Test-Class/devel .cvsignore, 1.5, 1.6 perl-Test-Class.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090921200046.9599511C0374@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6217

Modified Files:
	.cvsignore perl-Test-Class.spec sources 
Log Message:
Update to 0.33.
Update Source0 URL.
Add LICENSE.
BR Test::Pod, Test::CPAN::Meta, and Test::MinimumVersion and define AUTOMATED_TESTING for better test coverage.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Dec 2008 17:04:55 -0000	1.5
+++ .cvsignore	21 Sep 2009 20:00:46 -0000	1.6
@@ -1 +1 @@
-Test-Class-0.31.tar.gz
+Test-Class-0.33.tar.gz


Index: perl-Test-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/devel/perl-Test-Class.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Test-Class.spec	26 Jul 2009 16:46:54 -0000	1.7
+++ perl-Test-Class.spec	21 Sep 2009 20:00:46 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           perl-Test-Class
-Version:        0.31
-Release:        3%{?dist}
+Version:        0.33
+Release:        1%{?dist}
 Summary:        Easily create test classes in an xUnit/JUnit style
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Test-Class/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADIE/Test-Class-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-Class-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Contextual::Return)
@@ -13,8 +13,11 @@ BuildRequires:  perl(Devel::Symdump) >= 
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Builder) >= 0.78
 BuildRequires:  perl(Test::Builder::Tester) >= 1.02
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
 BuildRequires:  perl(Test::Exception) >= 0.25
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
 BuildRequires:  perl(Test::More) >= 0.78
+BuildRequires:  perl(Test::Pod) >= 1.26
 Requires:       perl(Devel::Symdump) >= 2.03
 Requires:       perl(Test::Exception) >= 0.25
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -39,18 +42,25 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+AUTOMATED_TESTING=1 ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 21 2009 Steven Pritchard <steve at kspei.com> 0.33-1
+- Update to 0.33.
+- Update Source0 URL.
+- Add LICENSE.
+- BR Test::Pod, Test::CPAN::Meta, and Test::MinimumVersion and define
+  AUTOMATED_TESTING for better test coverage.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Dec 2008 17:04:55 -0000	1.5
+++ sources	21 Sep 2009 20:00:46 -0000	1.6
@@ -1 +1 @@
-e73698b10712bbffcd346558792ab154  Test-Class-0.31.tar.gz
+becdbdfed6bf83611c82853b6506c77a  Test-Class-0.33.tar.gz



From rdieter at fedoraproject.org  Mon Sep 21 20:16:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 20:16:32 +0000 (UTC)
Subject: rpms/koffice/EL-5 koffice.spec,1.59,1.60
Message-ID: <20090921201632.A62A311C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10185

Modified Files:
	koffice.spec 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
- rebuild (GraphicsMagick)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/EL-5/koffice.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- koffice.spec	26 Aug 2009 20:53:20 -0000	1.59
+++ koffice.spec	21 Sep 2009 20:16:32 -0000	1.60
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
 Name:           koffice
 Epoch:          2
 Version:        1.6.3
-Release:        24.%{svn}svn%{?dist}
+Release:        25.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -56,6 +56,7 @@ BuildRequires:  %{kdelibs3}-devel
 BuildRequires: automake libtool
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
+BuildRequires:  GraphicsMagick-devel
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
@@ -90,7 +91,6 @@ BuildRequires:  libXi-devel
 %endif
 # FIXME: work to get these into EPEL
 %if 0%{?fedora} > 6
-BuildRequires: GraphicsMagick-devel
 BuildRequires: libwpd-devel
 %define libwpd 1
 BuildRequires: poppler-qt-devel
@@ -764,6 +764,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
+- rebuild (GraphicsMagick)
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
 - -kformula: Requires: lyx-cmex10-fonts
 



From salimma at fedoraproject.org  Mon Sep 21 20:25:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 21 Sep 2009 20:25:07 +0000 (UTC)
Subject: rpms/gtksourcecompletion/F-10 .cvsignore, 1.2,
	1.3 gtksourcecompletion.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090921202507.A10F511C0043@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gtksourcecompletion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12959/F-10

Modified Files:
	.cvsignore gtksourcecompletion.spec sources 
Log Message:
gtksourcecompletion: update F-10 branch for gedit-vala update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourcecompletion/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Feb 2009 01:35:26 -0000	1.2
+++ .cvsignore	21 Sep 2009 20:25:07 -0000	1.3
@@ -1 +1 @@
-gtksourcecompletion-0.5.2.tar.gz
+gtksourcecompletion-0.7.0.tar.gz


Index: gtksourcecompletion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourcecompletion/F-10/gtksourcecompletion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtksourcecompletion.spec	11 Feb 2009 01:35:26 -0000	1.1
+++ gtksourcecompletion.spec	21 Sep 2009 20:25:07 -0000	1.2
@@ -1,14 +1,13 @@
 Name:           gtksourcecompletion
-Version:        0.5.2
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        Completion support for GtkSourceView
 
 Group:          System Environment/Libraries
-# Note: wrong license file supplied
-# https://sourceforge.net/tracker2/?func=detail&aid=2582250&group_id=212508&atid=1022021
-License:        LGPLv2+
+# Note: mix of LGPLv2+ and LGPLv3+ files
+License:        LGPLv3+
 URL:            http://gtksourcecomple.sourceforge.net/
-Source0:        http://dl.sourceforge.net/gtksourcecomple/gtksourcecompletion-%{version}.tar.gz
+Source0:        http://cloud.github.com/downloads/chuchiperriman/gtksourcecompletion/gtksourcecompletion-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtksourceview2-devel libglade2-devel
@@ -51,6 +50,10 @@ GtkSourceCompletion.
 
 %build
 %configure --disable-static
+# remove hardcoded RPATHs
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
@@ -58,7 +61,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-%find_lang %{name}
+%find_lang %{name}-2.0
 
 
 %clean
@@ -70,27 +73,32 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 
-%files -f %{name}.lang
+%files -f %{name}-2.0.lang
 %defattr(-,root,root,-)
 # COPYING is wrong, not bundling for now
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/completion-*
 %{_libdir}/*.so.*
 %{_datadir}/gtksourcecompletion
 
 %files devel
 %defattr(-,root,root,-)
 %doc
-%{_includedir}/gtksourcecompletion-1.0
+%{_bindir}/gio-test
+%{_includedir}/gtksourcecompletion-2.0
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %files doc
 %defattr(-,root,root,-)
 %doc
-%{_datadir}/gtk-doc/html/gtksourcecompletion-1.0
+%{_datadir}/gtk-doc/html/gtksourcecompletion-2.0
 
 
 %changelog
+* Tue Jul 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0
+
 * Thu Feb  5 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.2-1
 - Initial package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourcecompletion/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Feb 2009 01:35:26 -0000	1.2
+++ sources	21 Sep 2009 20:25:07 -0000	1.3
@@ -1 +1 @@
-b031896ce03bef4ca711f9b1e0a34544  gtksourcecompletion-0.5.2.tar.gz
+dd86f6c211dc4d8a305126f700869679  gtksourcecompletion-0.7.0.tar.gz



From rdieter at fedoraproject.org  Mon Sep 21 20:27:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 20:27:24 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-10
	GraphicsMagick-1.1.14-png-alpha-463258.patch, 
	NONE, 1.1 GraphicsMagick.spec, 1.22, 1.23
Message-ID: <20090921202724.F246D11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13669

Modified Files:
	GraphicsMagick.spec 
Added Files:
	GraphicsMagick-1.1.14-png-alpha-463258.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.14-4
- Spumux fails to handle png-type subtitles (#463258)


GraphicsMagick-1.1.14-png-alpha-463258.patch:
 png.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE GraphicsMagick-1.1.14-png-alpha-463258.patch ---
diff -up GraphicsMagick-1.1.14/coders/png.c~ GraphicsMagick-1.1.14/coders/png.c
--- GraphicsMagick-1.1.14/coders/png.c~	2008-01-17 18:09:45.000000000 +0200
+++ GraphicsMagick-1.1.14/coders/png.c	2009-08-03 23:24:53.000000000 +0300
@@ -2535,7 +2535,6 @@ static Image *ReadOnePNGImage(MngInfo *m
           break;
         indexes=GetIndexes(image);
 
-        q->opacity=OpaqueOpacity;
         if (storage_class == PseudoClass)
           {
             IndexPacket
@@ -2548,6 +2547,8 @@ static Image *ReadOnePNGImage(MngInfo *m
                 if (index < ping_info->num_trans)
                   q->opacity=
                     ScaleCharToQuantum(255-ping_info->trans[index]);
+                else
+                  q->opacity=OpaqueOpacity;
                 q++;
               }
             else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
@@ -2559,6 +2560,8 @@ static Image *ReadOnePNGImage(MngInfo *m
                 q->blue=image->colormap[index].blue;
                 if (q->red == transparent_color.opacity)
                   q->opacity=TransparentOpacity;
+                else
+                  q->opacity=OpaqueOpacity;
                 q++;
               }
           }
@@ -2569,6 +2572,8 @@ static Image *ReadOnePNGImage(MngInfo *m
                 q->green == transparent_color.green &&
                 q->blue == transparent_color.blue)
                q->opacity=TransparentOpacity;
+            else
+               q->opacity=OpaqueOpacity;
             q++;
           }
         if (!SyncImagePixels(image))


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-10/GraphicsMagick.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- GraphicsMagick.spec	11 Sep 2008 16:30:32 -0000	1.22
+++ GraphicsMagick.spec	21 Sep 2009 20:27:24 -0000	1.23
@@ -1,13 +1,14 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.14
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
 Patch2: GraphicsMagick-1.1.10-gcc43.patch
+Patch3: http://scop.fedorapeople.org/patches/GraphicsMagick/GraphicsMagick-1.1.14-png-alpha-463258.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -88,8 +89,9 @@ however.
 %setup -q
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
-%patch1 -p 1 -b .perl
+%patch1 -p1 -b .perl
 %patch2 -p1 -b .gcc43
+%patch3 -p1 -b .rhbug#463258
 # Regenerating configure script
 #autoconf
 
@@ -235,6 +237,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.14-4
+- Spumux fails to handle png-type subtitles (#463258)
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-3
 - own all files properly
 



From nsantos at fedoraproject.org  Mon Sep 21 20:27:33 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon, 21 Sep 2009 20:27:33 +0000 (UTC)
Subject: rpms/qpidc/F-11 .cvsignore, 1.22, 1.23 qpidc.spec, 1.85,
	1.86 sources, 1.43, 1.44
Message-ID: <20090921202733.B0BA111C0043@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 817349


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	2 Jul 2009 19:13:31 -0000	1.22
+++ .cvsignore	21 Sep 2009 20:27:33 -0000	1.23
@@ -1 +1 @@
-qpidc-0.5.790661.tar.gz
+qpidc-0.5.817349.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- qpidc.spec	28 Jul 2009 18:07:52 -0000	1.85
+++ qpidc.spec	21 Sep 2009 20:27:33 -0000	1.86
@@ -8,17 +8,17 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name:           qpidc
-Version:        0.5.790661
-Release:        2%{?dist}
+Version:        0.5.817349
+Release:        1%{?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
-Patch1:		qpidc_f12_new_cpg.diff
-Patch2:		qpidc_798397.diff
-Patch3:		qpidc_798518.diff
+#Patch1:		qpidc_f12_new_cpg.diff
+#Patch2:		qpidc_798397.diff
+Patch1:		qpidc_798518.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -214,8 +214,8 @@ exit 0
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch2 -p1
+#%patch3 -p1
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
@@ -307,6 +307,7 @@ LANG=C ECHO=echo make check
 %_includedir/qpid/sys
 %_includedir/qpid/log
 %_includedir/qpid/management
+%_includedir/qpid/messaging
 %_includedir/qpid/agent
 %_includedir/qmf
 %_libdir/libqpidcommon.so
@@ -320,7 +321,9 @@ LANG=C ECHO=echo make check
 %_libdir/libqpidbroker.so.2.0.0
 %_libdir/qpid/daemon/replicating_listener.so
 %_libdir/qpid/daemon/replication_exchange.so
+%_libdir/qpid/daemon/watchdog.so
 %_sbindir/qpidd
+%_libexecdir/qpid/qpidd_watchdog
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
@@ -442,6 +445,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Mon Sep 21 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349-1
+- Rebased to svn rev 817349
+
 * Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-2
 - Update BuildRequires and Requires to use latest stable versions of
   corosync and clusterlib.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	2 Jul 2009 19:13:31 -0000	1.43
+++ sources	21 Sep 2009 20:27:33 -0000	1.44
@@ -1 +1 @@
-9b26e5ac89277664525a78fb49a20dfd  qpidc-0.5.790661.tar.gz
+3d8e101731c2f8a8fba5907f9cdb9282  qpidc-0.5.817349.tar.gz



From thomasj at fedoraproject.org  Mon Sep 21 20:35:38 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Mon, 21 Sep 2009 20:35:38 +0000 (UTC)
Subject: rpms/skrooge/devel skrooge.spec,1.2,1.3
Message-ID: <20090921203538.E6B3211C0043@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15170/devel

Modified Files:
	skrooge.spec 
Log Message:
* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
- Added -libs Requires libofx



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skrooge.spec	21 Sep 2009 16:41:09 -0000	1.2
+++ skrooge.spec	21 Sep 2009 20:35:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.1
-Release:        0.4.beta%{?dist}
+Release:        0.5.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -33,6 +33,7 @@ Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs4%{?_isa} >= %{kde4_version}
+Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -122,6 +123,9 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
+- Added -libs Requires libofx
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
 - misc cosmetics
 - mime scriptlets



From rdieter at fedoraproject.org  Mon Sep 21 20:35:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Sep 2009 20:35:50 +0000 (UTC)
Subject: rpms/koffice/F-11 koffice.spec,1.109,1.110
Message-ID: <20090921203550.5C04111C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16439

Modified Files:
	koffice.spec 
Log Message:
sync mods from EL-5 branch



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-11/koffice.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- koffice.spec	20 Sep 2009 16:47:17 -0000	1.109
+++ koffice.spec	21 Sep 2009 20:35:49 -0000	1.110
@@ -56,6 +56,7 @@ BuildRequires:  %{kdelibs3}-devel
 BuildRequires: automake libtool
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
+BuildRequires:  GraphicsMagick-devel
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
@@ -90,7 +91,6 @@ BuildRequires:  libXi-devel
 %endif
 # FIXME: work to get these into EPEL
 %if 0%{?fedora} > 6
-BuildRequires: GraphicsMagick-devel
 BuildRequires: libwpd-devel
 %define libwpd 1
 BuildRequires: poppler-qt-devel



From wtogami at fedoraproject.org  Mon Sep 21 21:11:52 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 21 Sep 2009 21:11:52 +0000 (UTC)
Subject: rpms/spampd/devel spampd.spec,1.6,1.7
Message-ID: <20090921211152.5D6AE11C0043@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spampd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30674

Modified Files:
	spampd.spec 
Log Message:
- Mail::SPF::Query is long obsolete, replaced by SPF::Query
  removing this artificial dep because SPF is nearly useless



Index: spampd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spampd/devel/spampd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- spampd.spec	27 Jul 2009 04:38:35 -0000	1.6
+++ spampd.spec	21 Sep 2009 21:11:50 -0000	1.7
@@ -1,15 +1,13 @@
 Summary: Transparent SMTP/LMTP proxy filter using spamassassin
 Name: spampd
 Version: 2.30
-Release: 8
+Release: 9
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm
 Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz
 Source1: spampd.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# This is "optional", but the spf checks get disabled if it's absent
-Requires: perl(Mail::SPF::Query)
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -85,6 +83,10 @@ fi
 
 
 %changelog
+* Mon Sep 29 2009 Warren Togami <wtogami at redhat.com> - 2.30-9
+- Mail::SPF::Query is long obsolete, replaced by SPF::Query
+  removing this artificial dep because SPF is nearly useless
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Mon Sep 21 21:13:41 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 21 Sep 2009 21:13:41 +0000 (UTC)
Subject: rpms/mesa/devel .cvsignore, 1.37, 1.38 mesa.spec, 1.254,
	1.255 sources, 1.40, 1.41
Message-ID: <20090921211341.2B37811C0043@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32196

Modified Files:
	.cvsignore mesa.spec sources 
Log Message:
* Mon Sep 21 2009 Adam Jackson <ajax at redhat.com> 7.6-0.13
- Today's git snap.  Fixes picking in clutter apps on Intel chips (#524338)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	8 Sep 2009 23:06:41 -0000	1.37
+++ .cvsignore	21 Sep 2009 21:13:40 -0000	1.38
@@ -6,3 +6,4 @@ mesa-20090322.tar.bz2
 mesa-20090723.tar.bz2
 mesa-20090813.tar.bz2
 mesa-20090909.tar.bz2
+mesa-20090921.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -p -r1.254 -r1.255
--- mesa.spec	17 Sep 2009 20:35:20 -0000	1.254
+++ mesa.spec	21 Sep 2009 21:13:40 -0000	1.255
@@ -13,7 +13,7 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090909
+%define gitdate 20090921
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Sep 21 2009 Adam Jackson <ajax at redhat.com> 7.6-0.13
+- Today's git snap.  Fixes picking in clutter apps on Intel chips (#524338)
+
 * Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 7.6-0.12
 - Back out page flip patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	9 Sep 2009 00:09:54 -0000	1.40
+++ sources	21 Sep 2009 21:13:40 -0000	1.41
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-47449707b6c52e8d6ccbf7c7084d76ba  mesa-20090909.tar.bz2
+0bbe19a02cacc7c48e5c79bd533b8e29  mesa-20090921.tar.bz2



From dcbw at fedoraproject.org  Mon Sep 21 21:24:32 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 21:24:32 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.108,
	1.109 NetworkManager.spec, 1.285, 1.286 sources, 1.149, 1.150
Message-ID: <20090921212432.830A811C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4794

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-2.git20090921
- nm: allow disconnection of all device types
- nm: ensure that wired connections are torn down when their hardware goes away
- nm: fix crash when canceling a VPN's request for secrets
- editor: fix issues changing connections between system and user scopes
- editor: ensure changes are thrown away when editing is canceled
- applet: ensure connection changes are noticed by NetworkManager
- applet: fix crash when creating new connections
- applet: actually use wired 802.1x secrets after they are requested




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- .cvsignore	26 Aug 2009 20:32:29 -0000	1.108
+++ .cvsignore	21 Sep 2009 21:24:31 -0000	1.109
@@ -161,3 +161,5 @@ NetworkManager-0.7.995.git20090813.tar.b
 network-manager-applet-0.7.995.git20090813.tar.bz2
 NetworkManager-0.7.996.git20090826.tar.bz2
 network-manager-applet-0.7.996.git20090826.tar.bz2
+NetworkManager-0.7.996.git20090921.tar.bz2
+network-manager-applet-0.7.996.git20090921.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- NetworkManager.spec	26 Aug 2009 20:32:30 -0000	1.285
+++ NetworkManager.spec	21 Sep 2009 21:24:31 -0000	1.286
@@ -3,19 +3,20 @@
 %define dbus_version 1.1
 %define dbus_glib_version 0.75
 
-%define gtk2_version	2.12.0
+%define gtk2_version	2.14.0
+%define glib2_version	2.16.0
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090826
-%define applet_snapshot .git20090826
+%define snapshot .git20090921
+%define applet_snapshot .git20090921
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -30,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 PreReq:   chkconfig
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
+Requires: glib2 >= %{glib2_version}
 Requires: iproute
 Requires: dhclient >= 12:4.1.0
 Requires: wpa_supplicant >= 1:0.6.8-4
@@ -51,7 +53,8 @@ Conflicts: NetworkManager-openconnect < 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
-BuildRequires: glib2-devel gtk2-devel
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
@@ -325,6 +328,16 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-2.git20090921
+- nm: allow disconnection of all device types
+- nm: ensure that wired connections are torn down when their hardware goes away
+- nm: fix crash when canceling a VPN's request for secrets
+- editor: fix issues changing connections between system and user scopes
+- editor: ensure changes are thrown away when editing is canceled
+- applet: ensure connection changes are noticed by NetworkManager
+- applet: fix crash when creating new connections
+- applet: actually use wired 802.1x secrets after they are requested
+
 * Wed Aug 26 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-1.git20090826
 - nm: IPv6 zeroconf support and fixes
 - nm: port to polkit (rh #499965)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- sources	26 Aug 2009 21:47:27 -0000	1.149
+++ sources	21 Sep 2009 21:24:31 -0000	1.150
@@ -1,2 +1,2 @@
-8c127ddbad7510625b93c75d91e49eee  NetworkManager-0.7.996.git20090826.tar.bz2
-fc0ef94d5c7e25ccbb9c37895e5dd876  network-manager-applet-0.7.996.git20090826.tar.bz2
+da3c5fe3dce54f6a1af72ddbe5d3ea64  NetworkManager-0.7.996.git20090921.tar.bz2
+4df8022dcfe43e7865b0bbbcaaab97ca  network-manager-applet-0.7.996.git20090921.tar.bz2



From behdad at fedoraproject.org  Mon Sep 21 21:26:25 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 21 Sep 2009 21:26:25 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.96, 1.97 pango.spec, 1.178,
	1.179 sources, 1.97, 1.98
Message-ID: <20090921212625.B5E5411C0043@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5902

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Mon Sep 21 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.0-1 
- 1.26.0 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- .cvsignore	8 Sep 2009 15:51:56 -0000	1.96
+++ .cvsignore	21 Sep 2009 21:26:25 -0000	1.97
@@ -1 +1 @@
-pango-1.25.6.tar.bz2
+pango-1.26.0.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- pango.spec	8 Sep 2009 15:51:56 -0000	1.178
+++ pango.spec	21 Sep 2009 21:26:25 -0000	1.179
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.25.6
+Version: 1.26.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.0-1
+- 1.26.0
+
 * Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.6-1
 - 1.25.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	8 Sep 2009 15:51:56 -0000	1.97
+++ sources	21 Sep 2009 21:26:25 -0000	1.98
@@ -1 +1 @@
-f578a348fbe5f616d104b3a5ecbd2005  pango-1.25.6.tar.bz2
+74ce18cfcc3ad0008a6ad56cfc535061  pango-1.26.0.tar.bz2



From behdad at fedoraproject.org  Mon Sep 21 21:30:29 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 21 Sep 2009 21:30:29 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.86, 1.87 sources, 1.88, 1.89 vte.spec, 
	1.161, 1.162
Message-ID: <20090921213029.7047811C0338@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7848

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Mon Sep 21 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.0-1 
- Update to 0.22.0 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	18 Sep 2009 07:43:41 -0000	1.86
+++ .cvsignore	21 Sep 2009 21:30:28 -0000	1.87
@@ -1 +1 @@
-vte-0.21.7.tar.bz2
+vte-0.22.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	18 Sep 2009 08:53:25 -0000	1.88
+++ sources	21 Sep 2009 21:30:29 -0000	1.89
@@ -1 +1 @@
-cbdfaf486019a363f5324c1bb0e83738  vte-0.21.7.tar.bz2
+09305c3ab0a4bba7c089f55566d2ceb6  vte-0.22.0.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- vte.spec	18 Sep 2009 08:53:25 -0000	1.161
+++ vte.spec	21 Sep 2009 21:30:29 -0000	1.162
@@ -3,8 +3,8 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.7
-Release: 2%{?dist}
+Version: 0.22.0
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep 21 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.0-1
+- Update to 0.22.0
+
 * Fri Sep 18 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.7-2
 - Update to 0.21.7, second try
 



From thomasj at fedoraproject.org  Mon Sep 21 21:37:12 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Mon, 21 Sep 2009 21:37:12 +0000 (UTC)
Subject: rpms/skrooge/F-12 skrooge.spec,1.1,1.2
Message-ID: <20090921213712.A352C11C0043@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10930

Modified Files:
	skrooge.spec 
Log Message:
* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
- Added -libs Requires libofx



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/skrooge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skrooge.spec	18 Sep 2009 09:10:18 -0000	1.1
+++ skrooge.spec	21 Sep 2009 21:37:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.1
-Release:        0.3.beta%{?dist}
+Release:        0.5.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -16,7 +16,9 @@ BuildRequires:  sqlite-devel
 BuildRequires:  kdelibs4-devel
 BuildRequires:  gettext
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -30,6 +32,8 @@ categorize them, and build reports of th
 Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       kdelibs4%{?_isa} >= %{kde4_version}
+Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -40,7 +44,7 @@ Skrooge libraries
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -48,8 +52,11 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install -C %{_target_platform} DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
+# hack to support non-oxygen icon users (gnome), drop when/if skrooge
+# ever provides hicolor icons (too).
+mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor 
 
 ## unpackaged devel files
 rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
@@ -78,12 +85,16 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun
 if [ $1 -eq 0 ] ; then
-   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+   touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+   update-desktop-database -q &> /dev/null
+   update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %files 
@@ -92,7 +103,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
 %{_kde4_appsdir}/skrooge/resources/*
@@ -107,12 +118,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README TODO
 %{_kde4_libdir}/kde4/plugins/designer/*.so*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
+- Added -libs Requires libofx
+
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
+- misc cosmetics
+- mime scriptlets
+- move icons to hicolor
+- -libs: drop dup'd docs, add min kdelibs4 dep
+
 * Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
 - Spec file corrections and Version correction
 



From epienbro at fedoraproject.org  Mon Sep 21 21:41:56 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 21 Sep 2009 21:41:56 +0000 (UTC)
Subject: rpms/mingw32-pango/devel .cvsignore, 1.8, 1.9 mingw32-pango.spec,
	1.11, 1.12 pango.modules, 1.1, 1.2 sources, 1.8, 1.9
Message-ID: <20090921214156.EB19011C0043@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13409

Modified Files:
	.cvsignore mingw32-pango.spec pango.modules sources 
Log Message:
* Mon Sep 21 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.26.0-1
- Update to 1.26.0
- Use relative paths instead of absolute paths in the pango.modules file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	8 Sep 2009 17:20:33 -0000	1.8
+++ .cvsignore	21 Sep 2009 21:41:56 -0000	1.9
@@ -1 +1 @@
-pango-1.25.6.tar.bz2
+pango-1.26.0.tar.bz2


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-pango.spec	18 Sep 2009 21:52:05 -0000	1.11
+++ mingw32-pango.spec	21 Sep 2009 21:41:56 -0000	1.12
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.25.6
-Release:        2%{?dist}
+Version:        1.26.0
+Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.pango.org
-Source0:        http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pango/1.26/pango-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -196,6 +196,10 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Mon Sep 21 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.26.0-1
+- Update to 1.26.0
+- Use relative paths instead of absolute paths in the pango.modules file
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.6-2
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 


Index: pango.modules
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/pango.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pango.modules	10 Mar 2009 22:46:14 -0000	1.1
+++ pango.modules	21 Sep 2009 21:41:56 -0000	1.2
@@ -3,33 +3,33 @@
 #
 # ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\pango\1.6.0\modules
 #
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common:
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
-"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common:
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:
+"..\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
+"..\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	8 Sep 2009 17:20:33 -0000	1.8
+++ sources	21 Sep 2009 21:41:56 -0000	1.9
@@ -1 +1 @@
-f578a348fbe5f616d104b3a5ecbd2005  pango-1.25.6.tar.bz2
+74ce18cfcc3ad0008a6ad56cfc535061  pango-1.26.0.tar.bz2



From epienbro at fedoraproject.org  Mon Sep 21 21:45:50 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 21 Sep 2009 21:45:50 +0000 (UTC)
Subject: rpms/mingw32-libxslt/devel libxslt-1.1.25-locking.patch, NONE,
	1.1 mingw32-libxslt.spec, 1.5, 1.6
Message-ID: <20090921214550.9621C11C0043@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15587

Modified Files:
	mingw32-libxslt.spec 
Added Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Fix a locking bug in 1.1.25 (patch from native libxslt package)


libxslt-1.1.25-locking.patch:
 extensions.c |   34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

--- NEW FILE libxslt-1.1.25-locking.patch ---
commit 2e8defa7ccef2f76fb1cbfe9e9673d8e4b6cf1d6
Author: Daniel Veillard <veillard at redhat.com>
Date:   Sun Sep 20 11:51:52 2009 +0200

    595612 Try to fix some locking problems
    
    * libxslt/extensions.c: there were still cases where the normal
      code path could led to trying to mtake again the extension lock
      go over all entry points of the module and clean things up

diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index ebb81f5..6187b7a 100644
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -313,8 +313,6 @@ typedef void (*exsltRegisterFunction) (void);
  * by LIBXSLT_DEFAULT_PLUGINS_PATH() which is determined at
  * compile time.
  *
- * Always called with xsltExtMutex lock taken.
- *
  * Returns 0 if successful, -1 in case of error. 
  */
 
@@ -550,10 +548,14 @@ xsltRegisterExtPrefix(xsltStylesheetPtr style,
     if (xsltExtensionsHash != NULL) {
         xsltExtModulePtr module;
 
+        xmlMutexLock(xsltExtMutex);
         module = xmlHashLookup(xsltExtensionsHash, URI);
+        xmlMutexUnlock(xsltExtMutex);
         if (NULL == module) {
             if (!xsltExtModuleRegisterDynamic(URI)) {
+                xmlMutexLock(xsltExtMutex);
                 module = xmlHashLookup(xsltExtensionsHash, URI);
+                xmlMutexUnlock(xsltExtMutex);
             }
         }
         if (module != NULL) {
@@ -1669,18 +1671,13 @@ xsltExtElementLookup(xsltTransformContextPtr ctxt,
     if ((name == NULL) || (URI == NULL))
         return (NULL);
 
-    xmlMutexLock(xsltExtMutex);
-
     if ((ctxt != NULL) && (ctxt->extElements != NULL)) {
         XML_CAST_FPTR(ret) = xmlHashLookup2(ctxt->extElements, name, URI);
         if (ret != NULL) {
-            xmlMutexUnlock(xsltExtMutex);
             return(ret);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     ret = xsltExtModuleElementLookup(name, URI);
 
     return (ret);
@@ -1707,19 +1704,23 @@ xsltExtModuleElementLookup(const xmlChar * name, const xmlChar * URI)
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /*
      * if function lookup fails, attempt a dynamic load on
      * supported platforms
      */
     if (NULL == ext) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     if (ext == NULL)
         return (NULL);
     return (ext->transform);
@@ -1747,13 +1748,18 @@ xsltExtModuleElementPreComputeLookup(const xmlChar * name,
 
     ext = (xsltExtElementPtr) xmlHashLookup2(xsltElementsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     if (ext == NULL) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             ext = (xsltExtElementPtr)
 	          xmlHashLookup2(xsltElementsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
-    xmlMutexUnlock(xsltExtMutex);
 
     if (ext == NULL)
         return (NULL);
@@ -1856,15 +1862,19 @@ xsltExtModuleTopLevelLookup(const xmlChar * name, const xmlChar * URI)
 
     XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
 
+    xmlMutexUnlock(xsltExtMutex);
+
     /* if lookup fails, attempt a dynamic load on supported platforms */
     if (NULL == ret) {
         if (!xsltExtModuleRegisterDynamic(URI)) {
+            xmlMutexLock(xsltExtMutex);
+
             XML_CAST_FPTR(ret) = xmlHashLookup2(xsltTopLevelsHash, name, URI);
+
+            xmlMutexUnlock(xsltExtMutex);
         }
     }
 
-    xmlMutexUnlock(xsltExtMutex);
-
     return (ret);
 }
 


Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/mingw32-libxslt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libxslt.spec	17 Sep 2009 17:48:25 -0000	1.5
+++ mingw32-libxslt.spec	21 Sep 2009 21:45:50 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libxslt
 Version:        1.1.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -18,6 +18,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
+Patch1:         libxslt-1.1.25-locking.patch
+
 # Fix compilation on MinGW environments
 Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 
@@ -61,6 +63,8 @@ Static version of the MinGW Windows LibX
 # this isn't interesting for MinGW environments
 #%patch0 -p1
 
+%patch1 -p1
+
 %patch1000 -p1
 
 libtoolize --force --copy
@@ -112,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.25-2
+- Fix a locking bug in 1.1.25 (patch from native libxslt package)
+
 * Thu Sep 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.25-1
 - Update to 1.1.25
 - Dropped upstreamed CVE patch



From orion at fedoraproject.org  Mon Sep 21 21:47:39 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 21 Sep 2009 21:47:39 +0000 (UTC)
Subject: devel/jpackage-utils jpackage-utils.spec,1.49,1.50
Message-ID: <20090921214739.87EE611C0043@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/devel/jpackage-utils
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16593

Modified Files:
	jpackage-utils.spec 
Log Message:
* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.7.5-3.8
- Add Requires: coreutils because we provide scripts that are being executed
  in rpm %post scriptlets that require it.



Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/pkgs/devel/jpackage-utils/jpackage-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- jpackage-utils.spec	25 Jul 2009 04:07:57 -0000	1.49
+++ jpackage-utils.spec	21 Sep 2009 21:47:39 -0000	1.50
@@ -34,7 +34,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        3.7%{?dist}
+Release:        3.8%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -48,6 +48,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
+Requires:       coreutils
+
 %description
 Utilities for the JPackage Project <http://www.jpackage.org/>.
 
@@ -201,6 +203,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.7.5-3.8
+- Add Requires: coreutils because we provide scripts that are being executed
+  in rpm %%post scriptlets that require it.
+ 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7.5-3.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thomasj at fedoraproject.org  Mon Sep 21 21:53:07 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Mon, 21 Sep 2009 21:53:07 +0000 (UTC)
Subject: rpms/skrooge/F-11 skrooge.spec,1.1,1.2
Message-ID: <20090921215307.B408411C0043@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19178

Modified Files:
	skrooge.spec 
Log Message:
* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
- Added -libs Requires libofx



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skrooge.spec	18 Sep 2009 09:32:42 -0000	1.1
+++ skrooge.spec	21 Sep 2009 21:53:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.1
-Release:        0.3.beta%{?dist}
+Release:        0.5.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -16,7 +16,9 @@ BuildRequires:  sqlite-devel
 BuildRequires:  kdelibs4-devel
 BuildRequires:  gettext
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -30,6 +32,8 @@ categorize them, and build reports of th
 Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       kdelibs4%{?_isa} >= %{kde4_version}
+Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -40,7 +44,7 @@ Skrooge libraries
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -48,8 +52,11 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install -C %{_target_platform} DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
+# hack to support non-oxygen icon users (gnome), drop when/if skrooge
+# ever provides hicolor icons (too).
+mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor 
 
 ## unpackaged devel files
 rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
@@ -78,12 +85,16 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun
 if [ $1 -eq 0 ] ; then
-   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+   touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+   update-desktop-database -q &> /dev/null
+   update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %files 
@@ -92,7 +103,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
 %{_kde4_appsdir}/skrooge/resources/*
@@ -107,12 +118,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README TODO
 %{_kde4_libdir}/kde4/plugins/designer/*.so*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
+- Added -libs Requires libofx
+
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
+- misc cosmetics
+- mime scriptlets
+- move icons to hicolor
+- -libs: drop dup'd docs, add min kdelibs4 dep
+
 * Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
 - Spec file corrections and Version correction
 



From pbrobinson at fedoraproject.org  Mon Sep 21 22:06:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 21 Sep 2009 22:06:57 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.9, 1.10 mutter-moblin.spec, 
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090921220657.50D0A11C0043@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26198

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.39.0 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Sep 2009 16:35:20 -0000	1.9
+++ .cvsignore	21 Sep 2009 22:06:56 -0000	1.10
@@ -1 +1 @@
-mutter-moblin-0.38.3.tar.bz2
+mutter-moblin-0.39.0.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mutter-moblin.spec	18 Sep 2009 16:35:20 -0000	1.10
+++ mutter-moblin.spec	21 Sep 2009 22:06:56 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.38.3
+Version:        0.39.0
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Mon Sep 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.0-1
+- New 0.39.0 upstream release
+
 * Fri Sep 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.38.3-1
 - New 0.38.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 Sep 2009 16:35:20 -0000	1.9
+++ sources	21 Sep 2009 22:06:56 -0000	1.10
@@ -1 +1 @@
-44a4a65440d86adc540cce51a0e86359  mutter-moblin-0.38.3.tar.bz2
+a11b1b5ec4d8878c6ccdf92fa4e87c84  mutter-moblin-0.39.0.tar.bz2



From rishi at fedoraproject.org  Mon Sep 21 22:41:32 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 21 Sep 2009 22:41:32 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.8, 1.9 libchamplain.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20090921224133.184F911C0043@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11793

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
* Mon Sep 21 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.0-1
- Version bump to 0.4.0.
  * ChamplainView now has keyboard shortcuts (but not when used with
    GtkChamplainEmbed).
  * Removed deprecated symbols introduced in 0.3.
  * Fixed X error when using GtkChamplainEmbed. (GNOME Bugzilla #590692)
  * Events were not being sent until the mouse moved. (GNOME Bugzilla #590727)
  * Fixed memory leak in ChamplainLayer. (GNOME Bugzilla #593505)
  * Initial center_on should not result on the map being in Antarctica.
    (GNOME Bugzilla #594963)
  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.news
  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 Aug 2009 02:59:04 -0000	1.8
+++ .cvsignore	21 Sep 2009 22:41:31 -0000	1.9
@@ -1 +1 @@
-libchamplain-0.3.91.tar.bz2
+libchamplain-0.4.0.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libchamplain.spec	25 Aug 2009 03:19:35 -0000	1.11
+++ libchamplain.spec	21 Sep 2009 22:41:31 -0000	1.12
@@ -1,11 +1,11 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.3.91
+Version:	0.4.0
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -65,7 +65,7 @@ This package contains development files 
 
 %build
 %configure --disable-static --enable-gtk --enable-gtk-doc \
-  --enable-introspection=no
+  --enable-introspection=no --enable-silent-rules
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -79,7 +79,7 @@ make install INSTALL="%{__install} -p" D
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 # Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.3.0.2
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,48 +98,71 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog
 %doc COPYING
 %doc NEWS
-%{_libdir}/%{name}-0.3.so.*
+%{_libdir}/%{name}-0.4.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc demos/animated-marker.c
 %doc demos/launcher.c
+%doc demos/markers.c
+%doc demos/markers.h
 %doc demos/polygons.c
-%{_libdir}/%{name}-0.3.so
-%{_libdir}/pkgconfig/champlain-0.3.pc
+%doc demos/url-marker.c
+%{_libdir}/%{name}-0.4.so
+%{_libdir}/pkgconfig/champlain-0.4.pc
 
 %dir %{_datadir}/gtk-doc/html/libchamplain
 %doc %{_datadir}/gtk-doc/html/libchamplain/*
 
-%dir %{_includedir}/%{name}-0.3
-%{_includedir}/%{name}-0.3/champlain
+%dir %{_includedir}/%{name}-0.4
+%{_includedir}/%{name}-0.4/champlain
 
 %files gtk
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-gtk-0.3.so.*
+%{_libdir}/%{name}-gtk-0.4.so.*
 
 %files gtk-devel
 %defattr(-,root,root,-)
 %doc demos/launcher-gtk.c
 %doc demos/markers.c
-%{_libdir}/%{name}-gtk-0.3.so
-%{_libdir}/pkgconfig/champlain-gtk-0.3.pc
+%{_libdir}/%{name}-gtk-0.4.so
+%{_libdir}/pkgconfig/champlain-gtk-0.4.pc
 
 %dir %{_datadir}/gtk-doc/html/libchamplain-gtk
 %doc %{_datadir}/gtk-doc/html/libchamplain-gtk/*
 
-%dir %{_includedir}/%{name}-gtk-0.3
-%{_includedir}/%{name}-gtk-0.3/champlain-gtk
+%dir %{_includedir}/%{name}-gtk-0.4
+%{_includedir}/%{name}-gtk-0.4/champlain-gtk
 
 %changelog
+* Mon Sep 21 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.0-1
+- Version bump to 0.4.0.
+  * ChamplainView now has keyboard shortcuts (but not when used with
+    GtkChamplainEmbed).
+  * Removed deprecated symbols introduced in 0.3.
+  * Fixed X error when using GtkChamplainEmbed. (GNOME Bugzilla #590692)
+  * Events were not being sent until the mouse moved. (GNOME Bugzilla #590727)
+  * Fixed memory leak in ChamplainLayer. (GNOME Bugzilla #593505)
+  * Initial center_on should not result on the map being in Antarctica.
+    (GNOME Bugzilla #594963)
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.news
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.changes
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.91-1
-- Update to 0.3.91
+- Version bump to 0.3.91.
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.91.news
 
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.90-1
-- Update to 0.3.90
+- Version bump to 0.3.90.
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.90.news
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.90.changes
 
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.6-1
-- Update to 0.3.6
+- Version bump to 0.3.6.
+  * New marker animation API.
+  * Ported to Clutter 1.0. (GNOME Bugzilla #576391)
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.6.news
+  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.6.changes
 
 * Sat Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1
 - Version bump to 0.3.5.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Aug 2009 02:59:04 -0000	1.8
+++ sources	21 Sep 2009 22:41:31 -0000	1.9
@@ -1 +1 @@
-6d0108dfea8acc473a1efe10c4bde694  libchamplain-0.3.91.tar.bz2
+159f8befb4b7ef616227977cda61e08d  libchamplain-0.4.0.tar.bz2



From dcbw at fedoraproject.org  Mon Sep 21 22:48:22 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 22:48:22 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec, 1.56,
	1.57 sources, 1.34, 1.35
Message-ID: <20090921224822.56DD311C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14272

Modified Files:
	NetworkManager-vpnc.spec sources 
Log Message:
* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3
- Rebuild for updated NetworkManager
- Convert imported files to UTF8 before parsing




Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- NetworkManager-vpnc.spec	30 Aug 2009 14:37:59 -0000	1.56
+++ NetworkManager-vpnc.spec	21 Sep 2009 22:48:21 -0000	1.57
@@ -4,13 +4,13 @@
 %define vpnc_version        0.5
 %define shared_mime_version 0.16-3
 
-%define git_snapshot .git20090828
+%define git_snapshot .git20090921
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.996
-Release:   2%{git_snapshot}%{?dist}
+Release:   3%{git_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -97,6 +97,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3
+- Rebuild for updated NetworkManager
+- Convert imported files to UTF8 before parsing
+
 * Sun Aug 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
 - Fix NM requirement
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	28 Aug 2009 20:39:19 -0000	1.34
+++ sources	21 Sep 2009 22:48:21 -0000	1.35
@@ -1 +0,0 @@
-308cca3f227652fd4116674fdf5ead0d  NetworkManager-vpnc-0.7.996.git20090828.tar.bz2



From dcbw at fedoraproject.org  Mon Sep 21 22:49:45 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 22:49:45 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.28, 1.29 sources, 1.35,
	1.36
Message-ID: <20090921224945.A068911C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15015

Modified Files:
	.cvsignore sources 
Log Message:
Update source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	28 Aug 2009 20:39:19 -0000	1.28
+++ .cvsignore	21 Sep 2009 22:49:44 -0000	1.29
@@ -24,3 +24,4 @@ NetworkManager-vpnc-0.7.0.svn13.tar.gz
 NetworkManager-vpnc-0.7.0.97.tar.gz
 NetworkManager-vpnc-0.7.0.99.tar.gz
 NetworkManager-vpnc-0.7.996.git20090828.tar.bz2
+NetworkManager-vpnc-0.7.996.git20090921.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	21 Sep 2009 22:48:21 -0000	1.35
+++ sources	21 Sep 2009 22:49:45 -0000	1.36
@@ -0,0 +1 @@
+2659f140a0fd631ea1067c2df493a82c  NetworkManager-vpnc-0.7.996.git20090921.tar.bz2



From dcbw at fedoraproject.org  Mon Sep 21 22:54:29 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 22:54:29 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.19,
	1.20 NetworkManager-openvpn.spec, 1.36, 1.37 sources, 1.23, 1.24
Message-ID: <20090921225429.AE81D11C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16528

Modified Files:
	.cvsignore NetworkManager-openvpn.spec sources 
Log Message:
* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
- Rebuild for updated NetworkManager




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	30 Aug 2009 14:38:33 -0000	1.19
+++ .cvsignore	21 Sep 2009 22:54:28 -0000	1.20
@@ -14,3 +14,4 @@ NetworkManager-openvpn-0.7.1.tar.bz2
 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2
 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2
 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2
+NetworkManager-openvpn-0.7.996.git20090921.tar.bz2


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- NetworkManager-openvpn.spec	30 Aug 2009 14:38:33 -0000	1.36
+++ NetworkManager-openvpn.spec	21 Sep 2009 22:54:28 -0000	1.37
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.996-1
+%define nm_version          1:0.7.996-3
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot .git20090828
+%define snapshot .git20090921
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.996
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -103,6 +103,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
+- Rebuild for updated NetworkManager
+
 * Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	30 Aug 2009 14:38:33 -0000	1.23
+++ sources	21 Sep 2009 22:54:28 -0000	1.24
@@ -1 +1 @@
-ad13350c04dbf3dd59d3daeb67ef55e1  NetworkManager-openvpn-0.7.996.git20090828.tar.bz2
+7b006d8051dcf0d3e34729079bbf6f09  NetworkManager-openvpn-0.7.996.git20090921.tar.bz2



From dcbw at fedoraproject.org  Mon Sep 21 22:59:23 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 22:59:23 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel .cvsignore, 1.9,
	1.10 NetworkManager-pptp.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <20090921225923.2BE7F11C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17927

Modified Files:
	.cvsignore NetworkManager-pptp.spec sources 
Log Message:
* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
- Rebuild for updated NetworkManager




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Aug 2009 15:00:40 -0000	1.9
+++ .cvsignore	21 Sep 2009 22:59:20 -0000	1.10
@@ -6,3 +6,4 @@ NetworkManager-pptp-0.7.0.svn16.tar.bz2
 NetworkManager-pptp-0.7.0.97.tar.bz2
 NetworkManager-pptp-0.7.0.99.tar.bz2
 NetworkManager-pptp-0.7.996.git20090828.tar.bz2
+NetworkManager-pptp-0.7.996.git20090921.tar.bz2


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- NetworkManager-pptp.spec	31 Aug 2009 02:33:13 -0000	1.15
+++ NetworkManager-pptp.spec	21 Sep 2009 22:59:21 -0000	1.16
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.996-1
+%define nm_version          1:0.7.996-3
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot .git20090828
+%define svn_snapshot .git20090921
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.996
-Release:   1%{svn_snapshot}%{?dist}
+Release:   2%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -104,6 +104,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
+- Rebuild for updated NetworkManager
+
 * Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
 - Rebuild for updated NetworkManager
 - Fix window title of Advanced dialog


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Aug 2009 15:00:40 -0000	1.9
+++ sources	21 Sep 2009 22:59:21 -0000	1.10
@@ -1 +1 @@
-74b041bee35d7192052e69dfb1c1ff94  NetworkManager-pptp-0.7.996.git20090828.tar.bz2
+7793770d136a65e8aebb66855a4f2ab4  NetworkManager-pptp-0.7.996.git20090921.tar.bz2



From dcbw at fedoraproject.org  Mon Sep 21 23:05:06 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 23:05:06 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel NetworkManager-openvpn.spec, 1.37,
	1.38
Message-ID: <20090921230507.0277211C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21133

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
fix nm require


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- NetworkManager-openvpn.spec	21 Sep 2009 22:54:28 -0000	1.37
+++ NetworkManager-openvpn.spec	21 Sep 2009 23:05:06 -0000	1.38
@@ -1,4 +1,4 @@
-%define nm_version          1:0.7.996-3
+%define nm_version          1:0.7.996-2
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1



From dcbw at fedoraproject.org  Mon Sep 21 23:05:59 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 23:05:59 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel NetworkManager-pptp.spec,1.16,1.17
Message-ID: <20090921230559.C06F711C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21656

Modified Files:
	NetworkManager-pptp.spec 
Log Message:
fix nm require


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- NetworkManager-pptp.spec	21 Sep 2009 22:59:21 -0000	1.16
+++ NetworkManager-pptp.spec	21 Sep 2009 23:05:59 -0000	1.17
@@ -1,4 +1,4 @@
-%define nm_version          1:0.7.996-3
+%define nm_version          1:0.7.996-2
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4



From dcbw at fedoraproject.org  Mon Sep 21 23:08:41 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 21 Sep 2009 23:08:41 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel .cvsignore, 1.7,
	1.8 NetworkManager-openconnect.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <20090921230841.6B07111C0043@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22845

Modified Files:
	.cvsignore NetworkManager-openconnect.spec sources 
Log Message:
* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
- Rebuild for updated NetworkManager




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	31 Aug 2009 03:06:23 -0000	1.7
+++ .cvsignore	21 Sep 2009 23:08:41 -0000	1.8
@@ -2,3 +2,4 @@ NetworkManager-openconnect-0.7.0.svn14.t
 NetworkManager-openconnect-0.7.0.97.tar.gz
 NetworkManager-openconnect-0.7.0.99.tar.gz
 NetworkManager-openconnect-0.7.996.git20090828.tar.bz2
+NetworkManager-openconnect-0.7.996.git20090921.tar.bz2


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- NetworkManager-openconnect.spec	31 Aug 2009 03:21:07 -0000	1.16
+++ NetworkManager-openconnect.spec	21 Sep 2009 23:08:41 -0000	1.17
@@ -1,14 +1,14 @@
-%define nm_version          1:0.7.996-1
+%define nm_version          1:0.7.996-2
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openconnect_version 0.99
 
-%define svn_snapshot        .git20090828
+%define svn_snapshot        .git20090921
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.996
-Release:   1%{svn_snapshot}%{?dist}
+Release:   2%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -96,6 +96,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
+- Rebuild for updated NetworkManager
+
 * Sun Aug 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-1
 - Rebuild for updated NetworkManager
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	31 Aug 2009 03:06:24 -0000	1.8
+++ sources	21 Sep 2009 23:08:41 -0000	1.9
@@ -1 +1 @@
-619c7b97aec28a769b0376e891ff3927  NetworkManager-openconnect-0.7.996.git20090828.tar.bz2
+9b1fddcc1b98f3223d33644a59cd96d7  NetworkManager-openconnect-0.7.996.git20090921.tar.bz2



From bpepple at fedoraproject.org  Mon Sep 21 23:16:46 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 21 Sep 2009 23:16:46 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.38, 1.39 empathy-broken-nm.patch,
	1.2, 1.3 empathy.spec, 1.77, 1.78 sources, 1.38,
	1.39 empathy-video-widget.patch, 1.1, NONE
Message-ID: <20090921231646.BA7F511C0043@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27390

Modified Files:
	.cvsignore empathy-broken-nm.patch empathy.spec sources 
Removed Files:
	empathy-video-widget.patch 
Log Message:
* Mon Sep 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0-1
- Update to 2.28.0.
- Drop video widget patch.  Fixed upstream.
- Update src.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	8 Sep 2009 17:13:28 -0000	1.38
+++ .cvsignore	21 Sep 2009 23:16:45 -0000	1.39
@@ -1 +1 @@
-empathy-2.27.92.tar.bz2
+empathy-2.28.0.tar.bz2

empathy-broken-nm.patch:
 configure    |   16 ++++++++--------
 configure.ac |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: empathy-broken-nm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-nm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- empathy-broken-nm.patch	8 Sep 2009 17:13:28 -0000	1.2
+++ empathy-broken-nm.patch	21 Sep 2009 23:16:46 -0000	1.3
@@ -1,47 +1,47 @@
-diff -urp empathy-2.27.92.OLD/configure empathy-2.27.92/configure
---- empathy-2.27.92.OLD/configure	2009-09-08 11:39:26.000000000 -0400
-+++ empathy-2.27.92/configure	2009-09-08 12:53:07.792273671 -0400
-@@ -18213,16 +18213,16 @@ if test -n "$PKG_CONFIG"; then
+diff -urp empathy-2.28.0.OLD/configure empathy-2.28.0/configure
+--- empathy-2.28.0.OLD/configure	2009-09-21 05:45:32.000000000 -0400
++++ empathy-2.28.0/configure	2009-09-21 15:01:54.549375691 -0400
+@@ -15494,16 +15494,16 @@ if test -n "$PKG_CONFIG"; then
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 -      libnm_glib >= \$NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= \$NETWORK_MANAGER_REQUIRED
-    \"") >&5
+    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     ") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
    pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -18237,16 +18237,16 @@ if test -n "$PKG_CONFIG"; then
+@@ -15518,16 +15518,16 @@ if test -n "$PKG_CONFIG"; then
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 -      libnm_glib >= \$NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= \$NETWORK_MANAGER_REQUIRED
-    \"") >&5
+    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     ") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
    pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -18267,11 +18267,11 @@ else
+@@ -15548,11 +15548,11 @@ else
  fi
          if test $_pkg_short_errors_supported = yes; then
  	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
@@ -55,9 +55,9 @@ diff -urp empathy-2.27.92.OLD/configure 
     "`
          fi
  	# Put the nasty error message in config.log where it belongs
-diff -urp empathy-2.27.92.OLD/configure.ac empathy-2.27.92/configure.ac
---- empathy-2.27.92.OLD/configure.ac	2009-09-08 11:22:35.000000000 -0400
-+++ empathy-2.27.92/configure.ac	2009-09-08 12:53:30.593270474 -0400
+diff -urp empathy-2.28.0.OLD/configure.ac empathy-2.28.0/configure.ac
+--- empathy-2.28.0.OLD/configure.ac	2009-09-14 16:39:15.000000000 -0400
++++ empathy-2.28.0/configure.ac	2009-09-21 15:03:17.926637317 -0400
 @@ -183,7 +183,7 @@ else
  
     PKG_CHECK_MODULES(NETWORK_MANAGER,


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- empathy.spec	14 Sep 2009 23:45:54 -0000	1.77
+++ empathy.spec	21 Sep 2009 23:16:46 -0000	1.78
@@ -1,28 +1,27 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control,
-## respectively.
+## Minimum required versions.
 %global	gtk2_min_version	2.16
 %global	glib2_min_version	2.16.0
 %global	tp_mc_min_version	5.0.0
-%global	tp_glib_min_version	0.7.34
+%global	tp_glib_min_version	0.7.35
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
 %global libcanberra_version     0.4
 %global webkit_version          1.1.7
 %global libnotify_version       0.4.4
-%global libchamplain_version    0.3.6
+%global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.27.92
-Release:	2%{?dist}
+Version:	2.28.0
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
 ## Workaround for our broken pkgconfig
@@ -33,9 +32,6 @@ Source1:	%{name}-README.ConnectionManage
 Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
-# Backported patch to fix crash with video widget.
-# http://bugzilla.gnome.org/show_bug.cgi?id=594890
-Patch4:		%{name}-video-widget.patch
 Patch5:		%{name}-broken-nm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,7 +85,7 @@ Requires(preun):	GConf2
 
 Requires(postun):	scrollkeeper
 
-## We're using Empathy's upstreamed profiles for Haze-provided stuff now.
+## Profiles are no longer used, so we can drop this around F14.
 Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
 Provides:	telepathy-haze-mission-control = 0.2.0-3
 
@@ -139,7 +135,6 @@ bindings to the libempathy and libempath
 %setup -q
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
-%patch4 -p1 -b .video
 %patch5 -p1 -b .nm
 
 # force these to be regenerated
@@ -249,6 +244,11 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Sep 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0-1
+- Update to 2.28.0.
+- Drop video widget patch.  Fixed upstream.
+- Update src.
+
 * Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-2
 - Back-port patch to prevent video widget from crashing.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	8 Sep 2009 17:13:28 -0000	1.38
+++ sources	21 Sep 2009 23:16:46 -0000	1.39
@@ -1 +1 @@
-888f07eada6eea765123f987d208ea13  empathy-2.27.92.tar.bz2
+a51a560d45595402c32d441f7075b005  empathy-2.28.0.tar.bz2


--- empathy-video-widget.patch DELETED ---



From mdbooth at fedoraproject.org  Mon Sep 21 23:21:20 2009
From: mdbooth at fedoraproject.org (Matthew Booth)
Date: Mon, 21 Sep 2009 23:21:20 +0000 (UTC)
Subject: rpms/perl-Module-Find/EL-5 perl-Module-Find.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20090921232120.AA76B11C0043@cvs1.fedora.phx.redhat.com>

Author: mdbooth

Update of /cvs/pkgs/rpms/perl-Module-Find/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29208

Modified Files:
	perl-Module-Find.spec sources 
Log Message:
Initial build for EL-5



Index: perl-Module-Find.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Find/EL-5/perl-Module-Find.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Module-Find.spec	20 Dec 2006 09:23:28 -0000	1.1
+++ perl-Module-Find.spec	21 Sep 2009 23:21:20 -0000	1.2
@@ -1,15 +1,16 @@
 Name:           perl-Module-Find
-Version:        0.05
+Version:        0.06
 Release:        1%{?dist}
 Summary:        Find and use installed modules in a (sub)category
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Module-Find/
 Source0:        http://www.cpan.org/authors/id/C/CR/CRENZ/Module-Find-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -34,7 +35,7 @@ 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 ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
 %check
@@ -47,11 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Module/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
-* Tue Dec 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-1
-- First build.
+* Tue Sep 22 2009 Matthew Booth <mbooth at redhat.com> - 0.06-1
+- Initial build for EL-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Find/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Dec 2006 09:23:28 -0000	1.2
+++ sources	21 Sep 2009 23:21:20 -0000	1.3
@@ -1 +1 @@
-1b756c84e476fc8179fcf2699a4d1a86  Module-Find-0.05.tar.gz
+64254ded9d9aea2845a2c7cf25a2949b  Module-Find-0.06.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 21 23:33:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 23:33:31 +0000
Subject: [pkgdb] perl-XML-XPathEngine (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090921233332.BD36F10F87C@bastion2.fedora.phx.redhat.com>

tibbs changed owner of perl-XML-XPathEngine in Fedora EPEL 5 to mdbooth
tibbs approved watchbugzilla on perl-XML-XPathEngine (Fedora EPEL 5) for alexlan
tibbs approved watchcommits on perl-XML-XPathEngine (Fedora EPEL 5) for alexlan
tibbs approved commit on perl-XML-XPathEngine (Fedora EPEL 5) for alexlan
tibbs approved build on perl-XML-XPathEngine (Fedora EPEL 5) for alexlan
tibbs approved approveacls on perl-XML-XPathEngine (Fedora EPEL 5) for alexlan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-XPathEngine



From pkgdb at fedoraproject.org  Mon Sep 21 23:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Sep 2009 23:34:30 +0000
Subject: [pkgdb] perl-XML-DOM-XPath (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090921233431.00CE210F87C@bastion2.fedora.phx.redhat.com>

tibbs changed owner of perl-XML-DOM-XPath in Fedora EPEL 5 to mdbooth
tibbs approved watchbugzilla on perl-XML-DOM-XPath (Fedora EPEL 5) for alexlan
tibbs approved watchcommits on perl-XML-DOM-XPath (Fedora EPEL 5) for alexlan
tibbs approved commit on perl-XML-DOM-XPath (Fedora EPEL 5) for alexlan
tibbs approved build on perl-XML-DOM-XPath (Fedora EPEL 5) for alexlan
tibbs approved approveacls on perl-XML-DOM-XPath (Fedora EPEL 5) for alexlan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-DOM-XPath



From mclasen at fedoraproject.org  Tue Sep 22 00:01:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:01:43 +0000 (UTC)
Subject: rpms/yelp/devel .cvsignore, 1.54, 1.55 sources, 1.56, 1.57 yelp.spec,
	1.170, 1.171
Message-ID: <20090922000144.034E111C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14289

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	8 Sep 2009 01:40:26 -0000	1.54
+++ .cvsignore	22 Sep 2009 00:01:41 -0000	1.55
@@ -1 +1 @@
-yelp-2.27.5.tar.bz2
+yelp-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	8 Sep 2009 01:40:26 -0000	1.56
+++ sources	22 Sep 2009 00:01:41 -0000	1.57
@@ -1 +1 @@
-a8fcac62f492c3ab031dd61fc8e1231c  yelp-2.27.5.tar.bz2
+4e68e796927198e644a57d455c16c389  yelp-2.28.0.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- yelp.spec	8 Sep 2009 01:40:26 -0000	1.170
+++ yelp.spec	22 Sep 2009 00:01:41 -0000	1.171
@@ -18,9 +18,9 @@
 
 Summary: Help browser for the GNOME desktop
 Name: yelp
-Version: 2.27.5
+Version: 2.28.0
 Release: 1%{?dist}
-Source: http://download.gnome.org/sources/yelp/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/yelp/2.28/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
@@ -160,6 +160,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From mclasen at fedoraproject.org  Tue Sep 22 00:05:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:05:39 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.23, 1.24 gucharmap.spec, 1.41,
	1.42 sources, 1.23, 1.24
Message-ID: <20090922000539.2B3A611C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16668

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	25 Aug 2009 01:10:26 -0000	1.23
+++ .cvsignore	22 Sep 2009 00:05:38 -0000	1.24
@@ -1 +1 @@
-gucharmap-2.27.0-git.tar.bz2
+gucharmap-2.28.0.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gucharmap.spec	25 Aug 2009 01:10:26 -0000	1.41
+++ gucharmap.spec	22 Sep 2009 00:05:38 -0000	1.42
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.27.0
+Version:        2.28.0
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -11,7 +11,7 @@ Group:          Applications/System
 License:        GPLv2+ and GFDL and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.26/gucharmap-%{version}-git.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.28/gucharmap-%{version}-git.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 Aug 2009 01:10:26 -0000	1.23
+++ sources	22 Sep 2009 00:05:38 -0000	1.24
@@ -1 +1 @@
-a99f6fa40fae8ce110fd7dae9673d664  gucharmap-2.27.0-git.tar.bz2
+c358564da35d7bc93b99d826b4d28f7c  gucharmap-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 00:11:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:11:50 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.67, 1.68 gcalctool.spec, 1.98,
	1.99 sources, 1.68, 1.69
Message-ID: <20090922001150.4FDE011C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19668

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	7 Sep 2009 21:55:55 -0000	1.67
+++ .cvsignore	22 Sep 2009 00:11:49 -0000	1.68
@@ -1 +1 @@
-gcalctool-5.27.92.tar.bz2
+gcalctool-5.28.0.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- gcalctool.spec	7 Sep 2009 21:55:55 -0000	1.98
+++ gcalctool.spec	22 Sep 2009 00:11:50 -0000	1.99
@@ -1,12 +1,12 @@
 Name:           gcalctool
-Version:        5.27.92
+Version:        5.28.0
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://directory.fsf.org/gcalctool.html
-Source0:        http://download.gnome.org/sources/gcalctool/5.27/gcalctool-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gcalctool/5.28/gcalctool-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 5.28.0-1
+- Update to 5.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.92-1
 - Update to 5.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	7 Sep 2009 21:55:55 -0000	1.68
+++ sources	22 Sep 2009 00:11:50 -0000	1.69
@@ -1 +1 @@
-80ab59d9415c17676df702f7882f6135  gcalctool-5.27.92.tar.bz2
+03d8f034ee844888e7ec9ad317096028  gcalctool-5.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 00:15:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:15:06 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.17,
	1.18 gnome-backgrounds.spec, 1.28, 1.29 sources, 1.17, 1.18
Message-ID: <20090922001506.77D6211C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20997

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	8 Sep 2009 00:12:17 -0000	1.17
+++ .cvsignore	22 Sep 2009 00:15:06 -0000	1.18
@@ -1 +1 @@
-gnome-backgrounds-2.27.91.tar.bz2
+gnome-backgrounds-2.28.0.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gnome-backgrounds.spec	8 Sep 2009 00:12:17 -0000	1.28
+++ gnome-backgrounds.spec	22 Sep 2009 00:15:06 -0000	1.29
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.27.91
+Version: 2.28.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: intltool
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/*
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	8 Sep 2009 00:12:17 -0000	1.17
+++ sources	22 Sep 2009 00:15:06 -0000	1.18
@@ -1 +1 @@
-8e96cf62bbb05dddb29d6acabecbbab6  gnome-backgrounds-2.27.91.tar.bz2
+a137eae321c12ba253a1ce55b13b622d  gnome-backgrounds-2.28.0.tar.bz2



From dcantrel at fedoraproject.org  Tue Sep 22 00:18:24 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 22 Sep 2009 00:18:24 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.274,1.275
Message-ID: <20090922001824.6392811C0419@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24273

Modified Files:
	dhcp.spec 
Log Message:
* Mon Sep 21 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-10
- Obsolete the dhcpv6 and dhcpv6-client packages



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- dhcp.spec	19 Sep 2009 06:22:33 -0000	1.274
+++ dhcp.spec	22 Sep 2009 00:18:21 -0000	1.275
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  9%{?dist}
+Release:  10%{?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.
@@ -69,6 +69,7 @@ Requires(post): coreutils
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+Obsoletes: dhcpv6 <= 1.2.0-4
 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -91,6 +92,7 @@ Requires(post): grep
 Obsoletes: dhcpcd <= 1.3.22pl1-7
 Obsoletes: libdhcp4client <= 12:4.0.0-34.fc10
 Obsoletes: libdhcp <= 1.99.8-1.fc10
+Obsoletes: dhcpv6-client <= 1.2.0-4
 Provides: dhcpcd = 1.3.22pl1-8
 
 %description -n dhclient
@@ -479,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Sep 21 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-10
+- Obsolete the dhcpv6 and dhcpv6-client packages
+
 * Fri Sep 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-9
 - Update dhclient-script with handlers for DHCPv6 states
 



From mclasen at fedoraproject.org  Tue Sep 22 00:19:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:19:21 +0000 (UTC)
Subject: rpms/gtk2-engines/devel .cvsignore, 1.65, 1.66 gtk2-engines.spec,
	1.115, 1.116 sources, 1.66, 1.67
Message-ID: <20090922001921.34A8F11C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2-engines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24977

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.18.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	20 May 2009 17:17:34 -0000	1.65
+++ .cvsignore	22 Sep 2009 00:19:20 -0000	1.66
@@ -1 +1 @@
-gtk-engines-2.18.2.tar.bz2
+gtk-engines-2.18.3.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- gtk2-engines.spec	25 Aug 2009 15:36:57 -0000	1.115
+++ gtk2-engines.spec	22 Sep 2009 00:19:20 -0000	1.116
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.18.2
-Release:	5%{?dist}
+Version:        2.18.3
+Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-1
+- Update to 2.18.3
+
 * Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> - 2.18.2-5
 - Change password asterisk character to be '?' instead of '?'
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	20 May 2009 17:17:34 -0000	1.66
+++ sources	22 Sep 2009 00:19:20 -0000	1.67
@@ -1 +1 @@
-68c7d012923bf40fab47765e82de0676  gtk-engines-2.18.2.tar.bz2
+eb50c327331396be735570190d82db81  gtk-engines-2.18.3.tar.bz2



From dcantrel at fedoraproject.org  Tue Sep 22 00:19:41 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 22 Sep 2009 00:19:41 +0000 (UTC)
Subject: rpms/dhcpv6/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE dhcpv6.spec, 1.110, NONE sources, 1.30, NONE
Message-ID: <20090922001941.1117F11C0043@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25271

Added Files:
	dead.package 
Removed Files:
	Makefile dhcpv6.spec sources 
Log Message:
Obsolete package.  DHCPv6 protocol support (RFC 3315) provided by ISC dhcp
in dhcp-4.1.0p1-10.fc12 and later builds.



--- NEW FILE dead.package ---
Obsolete package.  DHCPv6 protocol support (RFC 3315) provided by ISC dhcp
in dhcp-4.1.0p1-10.fc12 and later builds.


--- Makefile DELETED ---


--- dhcpv6.spec DELETED ---


--- sources DELETED ---



From mclasen at fedoraproject.org  Tue Sep 22 00:20:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:20:24 +0000 (UTC)
Subject: rpms/gucharmap/devel gucharmap.spec,1.42,1.43
Message-ID: <20090922002024.8A89811C0416@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25765

Modified Files:
	gucharmap.spec 
Log Message:
fix spec



Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gucharmap.spec	22 Sep 2009 00:05:38 -0000	1.42
+++ gucharmap.spec	22 Sep 2009 00:20:23 -0000	1.43
@@ -11,7 +11,7 @@ Group:          Applications/System
 License:        GPLv2+ and GFDL and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.28/gucharmap-%{version}-git.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.28/gucharmap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2



From dcantrel at fedoraproject.org  Tue Sep 22 00:22:04 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 22 Sep 2009 00:22:04 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.126,1.127 comps-f13.xml.in,1.17,1.18
Message-ID: <20090922002204.4653F11C0043@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26421

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Remove dhcpv6 from comps for F-12 and F-13.  dhcpv6 is obsoleted by the dhcp
package now.



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- comps-f12.xml.in	19 Sep 2009 19:59:53 -0000	1.126
+++ comps-f12.xml.in	22 Sep 2009 00:22:03 -0000	1.127
@@ -233,7 +233,6 @@
       <packagereq type="default">cpuspeed</packagereq>
       <packagereq type="default">cryptsetup-luks</packagereq>
       <packagereq type="default">device-mapper-multipath</packagereq>
-      <packagereq type="default">dhcpv6-client</packagereq>
       <packagereq type="default">dmraid</packagereq>
       <packagereq type="default">dos2unix</packagereq>
       <packagereq type="default">dosfstools</packagereq>
@@ -4359,7 +4358,6 @@
       <packagereq type="optional">cobbler</packagereq>
       <packagereq type="optional">ctrlproxy</packagereq>
       <packagereq type="optional">dhcp</packagereq>
-      <packagereq type="optional">dhcpv6</packagereq>
       <packagereq type="optional">dnsmasq</packagereq>
       <packagereq type="optional">ejabberd</packagereq>
       <packagereq type="optional">fedora-ds-base</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- comps-f13.xml.in	19 Sep 2009 19:59:53 -0000	1.17
+++ comps-f13.xml.in	22 Sep 2009 00:22:04 -0000	1.18
@@ -233,7 +233,6 @@
       <packagereq type="default">cpuspeed</packagereq>
       <packagereq type="default">cryptsetup-luks</packagereq>
       <packagereq type="default">device-mapper-multipath</packagereq>
-      <packagereq type="default">dhcpv6-client</packagereq>
       <packagereq type="default">dmraid</packagereq>
       <packagereq type="default">dos2unix</packagereq>
       <packagereq type="default">dosfstools</packagereq>
@@ -4355,7 +4354,6 @@
       <packagereq type="optional">cobbler</packagereq>
       <packagereq type="optional">ctrlproxy</packagereq>
       <packagereq type="optional">dhcp</packagereq>
-      <packagereq type="optional">dhcpv6</packagereq>
       <packagereq type="optional">dnsmasq</packagereq>
       <packagereq type="optional">ejabberd</packagereq>
       <packagereq type="optional">fedora-ds-base</packagereq>



From rdieter at fedoraproject.org  Tue Sep 22 00:32:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 00:32:55 +0000 (UTC)
Subject: rpms/xdg-utils/devel .cvsignore, 1.12, 1.13 sources, 1.11,
	1.12 xdg-utils-cvs_checkout.sh, 1.2, 1.3 xdg-utils.spec, 1.23, 1.24
Message-ID: <20090922003255.4A32D11C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31203

Modified Files:
	.cvsignore sources xdg-utils-cvs_checkout.sh xdg-utils.spec 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-12.20090921cvs
- suppress stderr from kde-config (#524724)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	13 Sep 2009 19:53:34 -0000	1.12
+++ .cvsignore	22 Sep 2009 00:32:53 -0000	1.13
@@ -1 +1 @@
-xdg-utils-20090913cvs.tgz
+xdg-utils-20090921cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Sep 2009 19:53:34 -0000	1.11
+++ sources	22 Sep 2009 00:32:53 -0000	1.12
@@ -1 +1 @@
-c4fd2aa002dbb61520db9462b233f2b3  xdg-utils-20090913cvs.tgz
+3930e087b2fab167b9d4ee0ecaa6adab  xdg-utils-20090921cvs.tgz


Index: xdg-utils-cvs_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils-cvs_checkout.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xdg-utils-cvs_checkout.sh	13 Sep 2009 19:53:34 -0000	1.2
+++ xdg-utils-cvs_checkout.sh	22 Sep 2009 00:32:53 -0000	1.3
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 
-CVSUSER=:pserver:anonymous
-#CVSUSER=rdieter
+#CVSUSER=:pserver:anonymous
+CVSUSER=rdieter
 MODULE=$(basename $0 -cvs_checkout.sh)
 DATE=$(date +%Y%m%d)
 


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xdg-utils.spec	13 Sep 2009 19:53:34 -0000	1.23
+++ xdg-utils.spec	22 Sep 2009 00:32:53 -0000	1.24
@@ -1,10 +1,10 @@
 
-%define cvs 20090913cvs
+%define cvs 20090921cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 11.%{cvs}%{?dist}
+Release: 12.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-12.20090921cvs
+- suppress stderr from kde-config (#524724)
+
 * Sun Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-11.20090913cvs
 - 20090913cvs snapshot
 - xdg-open in xdg-utils expects xprop to be available (#506857)



From mclasen at fedoraproject.org  Tue Sep 22 00:35:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:35:39 +0000 (UTC)
Subject: rpms/alacarte/devel .cvsignore, 1.18, 1.19 alacarte.spec, 1.59,
	1.60 sources, 1.18, 1.19
Message-ID: <20090922003539.C011B11C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32738

Modified Files:
	.cvsignore alacarte.spec sources 
Log Message:
0.12.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	8 Sep 2009 19:38:24 -0000	1.18
+++ .cvsignore	22 Sep 2009 00:35:39 -0000	1.19
@@ -1 +1 @@
-alacarte-0.12.3.tar.bz2
+alacarte-0.12.4.tar.bz2


Index: alacarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- alacarte.spec	12 Sep 2009 21:52:01 -0000	1.59
+++ alacarte.spec	22 Sep 2009 00:35:39 -0000	1.60
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           alacarte
-Version:        0.12.3
-Release:        2%{?dist}
+Version:        0.12.4
+Release:        1%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -79,6 +79,9 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.4-1
+- Update to 0.12.4
+
 * Sat Sep 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-2
 - Bump the gnome-menus requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	8 Sep 2009 19:38:24 -0000	1.18
+++ sources	22 Sep 2009 00:35:39 -0000	1.19
@@ -1 +1 @@
-1352da31dfe8cf51d4b4065ef6ca461d  alacarte-0.12.3.tar.bz2
+914f863f6bd152b4ab6407d07d853f45  alacarte-0.12.4.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 00:37:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:37:27 +0000 (UTC)
Subject: rpms/gucharmap/devel gucharmap.spec,1.43,1.44
Message-ID: <20090922003727.BEE8911C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1559

Modified Files:
	gucharmap.spec 
Log Message:
fix spec



Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gucharmap.spec	22 Sep 2009 00:20:23 -0000	1.43
+++ gucharmap.spec	22 Sep 2009 00:37:27 -0000	1.44
@@ -47,7 +47,7 @@ The gucharmap-devel package contains hea
 needed to use the libgucharmap library.
 
 %prep
-%setup -q -n %{name}-%{version}-git
+%setup -q
 
 %build
 %configure --disable-gtk-immodules --disable-scrollkeeper



From mclasen at fedoraproject.org  Tue Sep 22 00:39:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:39:38 +0000 (UTC)
Subject: rpms/bug-buddy/devel .cvsignore, 1.51, 1.52 bug-buddy.spec, 1.129, 
	1.130 sources, 1.51, 1.52
Message-ID: <20090922003938.3E75E11C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/bug-buddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2838

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	8 Sep 2009 19:35:23 -0000	1.51
+++ .cvsignore	22 Sep 2009 00:39:37 -0000	1.52
@@ -1 +1 @@
-bug-buddy-2.27.92.tar.bz2
+bug-buddy-2.28.0.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- bug-buddy.spec	8 Sep 2009 19:35:23 -0000	1.129
+++ bug-buddy.spec	22 Sep 2009 00:39:37 -0000	1.130
@@ -5,14 +5,14 @@
 %define gconf_version 2.14
 
 Name: bug-buddy
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 Epoch: 1
 Summary: Crash reporting utility for the GNOME desktop
 License: GPLv2 and BSD
 Group: Applications/System
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/bug-buddy/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/bug-buddy/2.28/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -145,6 +145,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	8 Sep 2009 19:35:23 -0000	1.51
+++ sources	22 Sep 2009 00:39:37 -0000	1.52
@@ -1 +1 @@
-b5c1865c57146e8b775312136f82507f  bug-buddy-2.27.92.tar.bz2
+ee9c586fee2e6b8ce3b787e696f37100  bug-buddy-2.28.0.tar.bz2



From rayvd at fedoraproject.org  Tue Sep 22 00:42:39 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 22 Sep 2009 00:42:39 +0000 (UTC)
Subject: rpms/syslog-ng/F-11 syslog-ng.spec,1.44,1.45
Message-ID: <20090922004239.41CD711C0338@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4279/F-11

Modified Files:
	syslog-ng.spec 
Log Message:
Sync changes to F-10 branch.



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-11/syslog-ng.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- syslog-ng.spec	16 Sep 2009 06:21:37 -0000	1.44
+++ syslog-ng.spec	22 Sep 2009 00:42:39 -0000	1.45
@@ -1,12 +1,12 @@
 %{?_with_spoofsource:%define spoofsource 1}
-%define evtlog_ver 0.2.7-2
+%define evtlog_ver 0.2.7-1
 
 %define _sbindir /sbin
 %define _localstatedir /var/lib/syslog-ng
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 6%{?dist}
+Release: 8%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,12 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-8
+- Adjust eventlog build requirement
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-7
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
 - Branch sync
 



From rayvd at fedoraproject.org  Tue Sep 22 00:42:38 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 22 Sep 2009 00:42:38 +0000 (UTC)
Subject: rpms/syslog-ng/EL-4 syslog-ng.spec,1.13,1.14
Message-ID: <20090922004239.14AFF11C0043@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4279/EL-4

Modified Files:
	syslog-ng.spec 
Log Message:
Sync changes to F-10 branch.



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- syslog-ng.spec	16 Sep 2009 06:22:43 -0000	1.13
+++ syslog-ng.spec	22 Sep 2009 00:42:38 -0000	1.14
@@ -1,12 +1,12 @@
 %{?_with_spoofsource:%define spoofsource 1}
-%define evtlog_ver 0.2.7-2
+%define evtlog_ver 0.2.7-1
 
 %define _sbindir /sbin
 %define _localstatedir /var/lib/syslog-ng
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 6%{?dist}
+Release: 8%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,12 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-8
+- Adjust eventlog build requirement
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-7
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
 - Branch sync
 



From rayvd at fedoraproject.org  Tue Sep 22 00:42:39 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 22 Sep 2009 00:42:39 +0000 (UTC)
Subject: rpms/syslog-ng/EL-5 syslog-ng.spec,1.21,1.22
Message-ID: <20090922004239.32E7C11C0335@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4279/EL-5

Modified Files:
	syslog-ng.spec 
Log Message:
Sync changes to F-10 branch.



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/syslog-ng.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- syslog-ng.spec	16 Sep 2009 06:22:25 -0000	1.21
+++ syslog-ng.spec	22 Sep 2009 00:42:38 -0000	1.22
@@ -1,12 +1,12 @@
 %{?_with_spoofsource:%define spoofsource 1}
-%define evtlog_ver 0.2.7-2
+%define evtlog_ver 0.2.7-1
 
 %define _sbindir /sbin
 %define _localstatedir /var/lib/syslog-ng
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 6%{?dist}
+Release: 8%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,12 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-8
+- Adjust eventlog build requirement
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-7
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
 - Branch sync
 



From rayvd at fedoraproject.org  Tue Sep 22 00:42:39 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 22 Sep 2009 00:42:39 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.47,1.48
Message-ID: <20090922004239.CA52311C0338@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4279/devel

Modified Files:
	syslog-ng.spec 
Log Message:
Sync changes to F-10 branch.



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- syslog-ng.spec	16 Sep 2009 06:23:21 -0000	1.47
+++ syslog-ng.spec	22 Sep 2009 00:42:39 -0000	1.48
@@ -1,12 +1,12 @@
 %{?_with_spoofsource:%define spoofsource 1}
-%define evtlog_ver 0.2.7-2
+%define evtlog_ver 0.2.7-1
 
 %define _sbindir /sbin
 %define _localstatedir /var/lib/syslog-ng
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 6%{?dist}
+Release: 8%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -226,6 +226,12 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-8
+- Adjust eventlog build requirement
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-7
+- Branch sync
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-6
 - Branch sync
 



From mclasen at fedoraproject.org  Tue Sep 22 00:45:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:45:47 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.33,
	1.34 gnome-settings-daemon.spec, 1.123, 1.124 sources, 1.34, 1.35
Message-ID: <20090922004547.86BF611C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4868

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	7 Sep 2009 22:33:37 -0000	1.33
+++ .cvsignore	22 Sep 2009 00:45:46 -0000	1.34
@@ -1 +1 @@
-gnome-settings-daemon-2.27.92.tar.bz2
+gnome-settings-daemon-2.28.0.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- gnome-settings-daemon.spec	9 Sep 2009 11:24:53 -0000	1.123
+++ gnome-settings-daemon.spec	22 Sep 2009 00:45:46 -0000	1.124
@@ -1,12 +1,12 @@
 Name:		gnome-settings-daemon
-Version:	2.27.92
-Release:	2%{?dist}
+Version:	2.28.0
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
 License:	GPLv2+
 URL:		http://download.gnome.org/sources/%{name}
-Source0:	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): GConf2 >= 2.14
@@ -165,6 +165,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep 09 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
 - Update left-hand touchpad patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	7 Sep 2009 22:33:37 -0000	1.34
+++ sources	22 Sep 2009 00:45:47 -0000	1.35
@@ -1 +1 @@
-6f35379b8bddc729dd4144b54b3557bc  gnome-settings-daemon-2.27.92.tar.bz2
+66c4e3651cb0e022b114d30ac217b095  gnome-settings-daemon-2.28.0.tar.bz2



From tgl at fedoraproject.org  Tue Sep 22 00:45:59 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 22 Sep 2009 00:45:59 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.init, 1.25, 1.26 postgresql.spec, 
	1.119, 1.120
Message-ID: <20090922004559.8BB0711C0043@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6108

Modified Files:
	postgresql.init postgresql.spec 
Log Message:
Ensure pgstartup.log gets the right ownership/permissions during initdb


Index: postgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- postgresql.init	18 Aug 2009 02:58:55 -0000	1.25
+++ postgresql.init	22 Sep 2009 00:45:57 -0000	1.26
@@ -132,7 +132,7 @@ start(){
 		touch "$PGLOG" || exit 1
 		chown postgres:postgres "$PGLOG"
 		chmod go-rwx "$PGLOG"
-		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
 	fi
 
 	# Check for the PGDATA structure
@@ -243,8 +243,19 @@ initdb(){
 	fi
 	# Clean up SELinux tagging for PGDATA
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+	# Make sure the startup-time log file is OK, too
+	if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+	then
+		touch "$PGLOG" || exit 1
+		chown postgres:postgres "$PGLOG"
+		chmod go-rwx "$PGLOG"
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+	fi
+
 	# Initialize the database
 	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
+
 	# Create directory for postmaster log
 	mkdir "$PGDATA/pg_log"
 	chown postgres:postgres "$PGDATA/pg_log"


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- postgresql.spec	16 Sep 2009 17:50:13 -0000	1.119
+++ postgresql.spec	22 Sep 2009 00:45:57 -0000	1.120
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
@@ -854,6 +854,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 21 2009 Tom Lane <tgl at redhat.com> 8.4.1-3
+- Ensure pgstartup.log gets the right ownership/permissions during initdb
+Resolves: #498959
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.1-2
 - Use password-auth common PAM configuration instead of system-auth
 



From mclasen at fedoraproject.org  Tue Sep 22 00:47:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:47:00 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.63, 1.64 gnome-terminal.spec,
	1.128, 1.129 sources, 1.64, 1.65
Message-ID: <20090922004701.0368511C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6583

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	7 Sep 2009 22:00:45 -0000	1.63
+++ .cvsignore	22 Sep 2009 00:46:54 -0000	1.64
@@ -1 +1 @@
-gnome-terminal-2.27.92.tar.bz2
+gnome-terminal-2.28.0.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- gnome-terminal.spec	7 Sep 2009 22:00:45 -0000	1.128
+++ gnome-terminal.spec	22 Sep 2009 00:46:54 -0000	1.129
@@ -10,12 +10,12 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/2.27/gnome-terminal-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-terminal/2.28/gnome-terminal-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=588732
 Source1: profile-new-dialog.ui
 # Fix gnome.org Bug 338913 ? Terminal resized when switching tabs
@@ -136,6 +136,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	7 Sep 2009 22:00:46 -0000	1.64
+++ sources	22 Sep 2009 00:46:55 -0000	1.65
@@ -1 +1 @@
-12638697d4070223f3c314b386ca7c3e  gnome-terminal-2.27.92.tar.bz2
+9cdc3581a03a44dd693663991d1c1e9f  gnome-terminal-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 00:49:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:49:50 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.124, 
	1.125
Message-ID: <20090922004950.63BA811C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7574

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
2.28.0



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- gnome-settings-daemon.spec	22 Sep 2009 00:45:46 -0000	1.124
+++ gnome-settings-daemon.spec	22 Sep 2009 00:49:49 -0000	1.125
@@ -31,10 +31,6 @@ BuildRequires:	libnotify-devel
 BuildRequires:	gettext intltool
 BuildRequires:  fontconfig-devel
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=483639
-# http://bugzilla.gnome.org/show_bug.cgi?id=594617
-Patch1:		0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch
-
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -53,8 +49,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-%patch1 -p1 -b .lefthand-touchpad
-
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
 make %{?_smp_mflags}



From mclasen at fedoraproject.org  Tue Sep 22 00:51:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:51:27 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.92, 1.93 file-roller.spec,
	1.155, 1.156 sources, 1.92, 1.93
Message-ID: <20090922005128.0194111C0374@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8486

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- .cvsignore	8 Sep 2009 00:30:22 -0000	1.92
+++ .cvsignore	22 Sep 2009 00:51:25 -0000	1.93
@@ -1 +1 @@
-file-roller-2.27.92.tar.bz2
+file-roller-2.28.0.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- file-roller.spec	8 Sep 2009 00:30:22 -0000	1.155
+++ file-roller.spec	22 Sep 2009 00:51:25 -0000	1.156
@@ -10,12 +10,12 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.27.92
+Version:	2.28.0
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
-Source:		http://download.gnome.org/sources/file-roller/2.27/file-roller-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/file-roller/2.28/file-roller-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -127,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	8 Sep 2009 00:30:22 -0000	1.92
+++ sources	22 Sep 2009 00:51:25 -0000	1.93
@@ -1 +1 @@
-92eb4195b1c78a33db881af17acd5868  file-roller-2.27.92.tar.bz2
+dcb0c887d5d287a28ebb5c0ea69bedfa  file-roller-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 00:53:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:53:48 +0000 (UTC)
Subject: rpms/zenity/devel .cvsignore, 1.30, 1.31 sources, 1.32,
	1.33 zenity.spec, 1.54, 1.55
Message-ID: <20090922005348.6072511C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/zenity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10037

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	11 Aug 2009 04:55:55 -0000	1.30
+++ .cvsignore	22 Sep 2009 00:53:47 -0000	1.31
@@ -1 +1 @@
-zenity-2.27.90.tar.bz2
+zenity-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	11 Aug 2009 04:55:55 -0000	1.32
+++ sources	22 Sep 2009 00:53:47 -0000	1.33
@@ -1 +1 @@
-2245c6f836e61d0115a826648d85758b  zenity-2.27.90.tar.bz2
+262c476aebbf67a7043cd80c6a03add3  zenity-2.28.0.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- zenity.spec	11 Aug 2009 04:55:55 -0000	1.54
+++ zenity.spec	22 Sep 2009 00:53:48 -0000	1.55
@@ -1,11 +1,11 @@
 Name:		zenity
-Version:	2.27.90
+Version:	2.28.0
 Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://directory.fsf.org/zenity.html
-Source:		http://download.gnome.org/sources/zenity/2.27/zenity-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/zenity/2.28/zenity-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,6 +90,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 



From rdieter at fedoraproject.org  Tue Sep 22 00:56:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 00:56:29 +0000 (UTC)
Subject: rpms/taglib-extras/devel taglib-extras-1.0.1-version.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 taglib-extras.spec,
	1.11, 1.12
Message-ID: <20090922005629.E3DE611C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12226

Modified Files:
	.cvsignore sources taglib-extras.spec 
Added Files:
	taglib-extras-1.0.1-version.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- taglib-extras-1.0.1


taglib-extras-1.0.1-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE taglib-extras-1.0.1-version.patch ---
diff -up taglib-extras-1.0.1/CMakeLists.txt.version taglib-extras-1.0.1/CMakeLists.txt
--- taglib-extras-1.0.1/CMakeLists.txt.version	2009-09-17 14:31:50.000000000 -0500
+++ taglib-extras-1.0.1/CMakeLists.txt	2009-09-21 19:40:38.076666807 -0500
@@ -29,7 +29,7 @@ endif (WIN32)
 
 set(TAGLIB-EXTRAS_LIB_MAJOR_VERSION "1")
 set(TAGLIB-EXTRAS_LIB_MINOR_VERSION "0")
-set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "0")
+set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "1")
 
 set(TAGLIB-EXTRAS_LIB_VERSION_STRING "${TAGLIB-EXTRAS_LIB_MAJOR_VERSION}.${TAGLIB-EXTRAS_LIB_MINOR_VERSION}.${TAGLIB-EXTRAS_LIB_PATCH_VERSION}")
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Sep 2009 18:58:57 -0000	1.9
+++ .cvsignore	22 Sep 2009 00:56:29 -0000	1.10
@@ -1 +1 @@
-taglib-extras-1.0.0.tar.gz
+taglib-extras-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Sep 2009 18:58:58 -0000	1.9
+++ sources	22 Sep 2009 00:56:29 -0000	1.10
@@ -1 +1 @@
-5882f2334f6e22dc9b28b2fc2fca4789  taglib-extras-1.0.0.tar.gz
+e973ca609b18e2c03c147ff9fd9e6eb8  taglib-extras-1.0.1.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- taglib-extras.spec	17 Sep 2009 19:34:41 -0000	1.11
+++ taglib-extras.spec	22 Sep 2009 00:56:29 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        1.0.0 
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 
 Group:          Applications/Multimedia
 # all LGPLv2, except for rmff/ which is GPLv2+/LGPLv2+
@@ -14,6 +14,9 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 # it's already in default linker search path
 Patch1: taglib-extras-0.1-multilib-1.patch
 
+## upstream patches
+Patch100: taglib-extras-1.0.1-version.patch
+
 BuildRequires: cmake >= 2.6.0
 BuildRequires: taglib-devel >= 1.6
 
@@ -38,6 +41,7 @@ Requires: taglib-devel
 %setup -q 
 
 %patch1 -p1 -b .multilib
+%patch100 -p1 -b .version
 
 
 %build
@@ -58,6 +62,7 @@ make install DESTDIR=%{buildroot} -C %{_
 %clean
 rm -rf %{buildroot} 
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -77,6 +82,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- taglib-extras-1.0.1
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
 - drop (deprecated/no-op) kde integration
 



From mclasen at fedoraproject.org  Tue Sep 22 00:57:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 00:57:12 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.25, 1.26 libgweather.spec, 1.47,
	1.48 sources, 1.25, 1.26
Message-ID: <20090922005712.8811811C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12497

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	9 Sep 2009 04:38:36 -0000	1.25
+++ .cvsignore	22 Sep 2009 00:57:12 -0000	1.26
@@ -1 +1 @@
-libgweather-2.27.92.tar.bz2
+libgweather-2.28.0.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- libgweather.spec	9 Sep 2009 04:52:25 -0000	1.47
+++ libgweather.spec	22 Sep 2009 00:57:12 -0000	1.48
@@ -1,12 +1,12 @@
 Name:           libgweather
-Version:        2.27.92
+Version:        2.28.0
 Release:        1%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/libgweather/2.27/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgweather/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  GConf2-devel >= 2.8.0
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	9 Sep 2009 04:38:36 -0000	1.25
+++ sources	22 Sep 2009 00:57:12 -0000	1.26
@@ -1 +1 @@
-b33d4e453b652b3ade3b365033d0c0cf  libgweather-2.27.92.tar.bz2
+9f4457144d32d4004e0e045240ab51dc  libgweather-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 01:00:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 01:00:25 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.76, 1.77 libwnck.spec, 1.114,
	1.115 sources, 1.76, 1.77
Message-ID: <20090922010025.7C82C11C0416@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15200

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	9 Sep 2009 04:29:23 -0000	1.76
+++ .cvsignore	22 Sep 2009 01:00:24 -0000	1.77
@@ -1 +1 @@
-libwnck-2.27.92.tar.bz2
+libwnck-2.28.0.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- libwnck.spec	9 Sep 2009 04:29:23 -0000	1.114
+++ libwnck.spec	22 Sep 2009 01:00:24 -0000	1.115
@@ -5,10 +5,10 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
-Source0: http://download.gnome.org/sources/libwnck/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libwnck/2.28/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	9 Sep 2009 04:29:23 -0000	1.76
+++ sources	22 Sep 2009 01:00:24 -0000	1.77
@@ -1 +1 @@
-ff5cb1fdf251dc5f268c545ced722459  libwnck-2.27.92.tar.bz2
+a9311661aa954e7c918439b6dd578792  libwnck-2.28.0.tar.bz2



From tgl at fedoraproject.org  Tue Sep 22 01:15:13 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 22 Sep 2009 01:15:13 +0000 (UTC)
Subject: rpms/postgresql/F-11 postgresql.init, 1.24, 1.25 postgresql.spec,
	1.112, 1.113
Message-ID: <20090922011513.126FE11C0043@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22167

Modified Files:
	postgresql.init postgresql.spec 
Log Message:
Ensure pgstartup.log gets the right ownership/permissions during initdb


Index: postgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql.init,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- postgresql.init	2 Nov 2008 18:23:29 -0000	1.24
+++ postgresql.init	22 Sep 2009 01:15:12 -0000	1.25
@@ -101,13 +101,7 @@ fi
 # Set defaults for configuration variables
 PGENGINE=/usr/bin
 PGPORT=5432
-PGDATA=/var/lib/pgsql
-if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base/template1" ]
-then
-	echo "Using old-style directory structure"
-else
-	PGDATA=/var/lib/pgsql/data
-fi
+PGDATA=/var/lib/pgsql/data
 PGLOG=/var/lib/pgsql/pgstartup.log
 
 # Override defaults from /etc/sysconfig/pgsql if file is present
@@ -133,7 +127,7 @@ start(){
 		touch "$PGLOG" || exit 1
 		chown postgres:postgres "$PGLOG"
 		chmod go-rwx "$PGLOG"
-		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
 	fi
 
 	# Check for the PGDATA structure
@@ -244,8 +238,19 @@ initdb(){
 	fi
 	# Clean up SELinux tagging for PGDATA
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+	# Make sure the startup-time log file is OK, too
+	if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+	then
+		touch "$PGLOG" || exit 1
+		chown postgres:postgres "$PGLOG"
+		chmod go-rwx "$PGLOG"
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+	fi
+
 	# Initialize the database
 	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
+
 	# Create directory for postmaster log
 	mkdir "$PGDATA/pg_log"
 	chown postgres:postgres "$PGDATA/pg_log"


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- postgresql.spec	9 Sep 2009 15:57:29 -0000	1.112
+++ postgresql.spec	22 Sep 2009 01:15:12 -0000	1.113
@@ -84,7 +84,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 # PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
@@ -874,6 +874,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 21 2009 Tom Lane <tgl at redhat.com> 8.3.8-2
+- Ensure pgstartup.log gets the right ownership/permissions during initdb
+Resolves: #498959
+
 * Wed Sep  9 2009 Tom Lane <tgl at redhat.com> 8.3.8-1
 - Update to PostgreSQL 8.3.8, for various fixes described at
   http://www.postgresql.org/docs/8.3/static/release-8-3-8.html



From mclasen at fedoraproject.org  Tue Sep 22 01:15:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 01:15:40 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.56, 1.57 libsoup.spec, 1.101,
	1.102 sources, 1.56, 1.57
Message-ID: <20090922011540.B904011C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21345

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	8 Sep 2009 00:15:07 -0000	1.56
+++ .cvsignore	22 Sep 2009 01:15:39 -0000	1.57
@@ -1 +1 @@
-libsoup-2.27.92.tar.bz2
+libsoup-2.28.0.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- libsoup.spec	8 Sep 2009 00:15:07 -0000	1.101
+++ libsoup.spec	22 Sep 2009 01:15:39 -0000	1.102
@@ -3,14 +3,14 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
 URL: http://live.gnome.org/LibSoup
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/libsoup/2.27/libsoup-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/libsoup/2.28/libsoup-%{version}.tar.bz2
 
 ### Build Dependencies ###
 
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	8 Sep 2009 00:15:07 -0000	1.56
+++ sources	22 Sep 2009 01:15:40 -0000	1.57
@@ -1 +1 @@
-2e80693a4af29d4d82266b3327c5461a  libsoup-2.27.92.tar.bz2
+013831a13584e876f419d8059f73637b  libsoup-2.28.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 22 01:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:32:13 +0000
Subject: [pkgdb] libsvm (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922013213.324A110F87E@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for libsvm
tibbs has set commit to Approved for 107427 on libsvm (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on libsvm (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on libsvm (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsvm



From pkgdb at fedoraproject.org  Tue Sep 22 01:32:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:32:39 +0000
Subject: [pkgdb] ruby-gnome2 (Fedora, 12) updated by tibbs
Message-ID: <20090922013240.F364610F861@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for ruby-gnome2
tibbs has set commit to Approved for 107427 on ruby-gnome2 (Fedora 12)
tibbs has set checkout to Approved for 107427 on ruby-gnome2 (Fedora 12)
tibbs has set build to Approved for 107427 on ruby-gnome2 (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Tue Sep 22 01:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:34:14 +0000
Subject: [pkgdb] rekonq (Fedora, 10) updated by tibbs
Message-ID: <20090922013415.0A22710F87E@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for rekonq
tibbs has set commit to Approved for 107427 on rekonq (Fedora 10)
tibbs has set checkout to Approved for 107427 on rekonq (Fedora 10)
tibbs has set build to Approved for 107427 on rekonq (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rekonq



From pkgdb at fedoraproject.org  Tue Sep 22 01:34:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:34:57 +0000
Subject: [pkgdb] gnome-applet-window-picker was added for salimma
Message-ID: <20090922013457.6902610F87C@bastion2.fedora.phx.redhat.com>

tibbs has added Package gnome-applet-window-picker with summary Window picker applet for GNOME
tibbs has approved Package gnome-applet-window-picker
tibbs has added a Fedora devel branch for gnome-applet-window-picker with an owner of salimma
tibbs has approved gnome-applet-window-picker in Fedora devel
tibbs has approved Package gnome-applet-window-picker
tibbs has set commit to Approved for 107427 on gnome-applet-window-picker (Fedora devel)
tibbs has set checkout to Approved for 107427 on gnome-applet-window-picker (Fedora devel)
tibbs has set build to Approved for 107427 on gnome-applet-window-picker (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-window-picker



From pkgdb at fedoraproject.org  Tue Sep 22 01:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:34:58 +0000
Subject: [pkgdb] gnome-applet-window-picker summary updated by tibbs
Message-ID: <20090922013459.00D1410F87E@bastion2.fedora.phx.redhat.com>

tibbs set package gnome-applet-window-picker summary to Window picker applet for GNOME

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-window-picker



From pkgdb at fedoraproject.org  Tue Sep 22 01:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:34:58 +0000
Subject: [pkgdb] gnome-applet-window-picker (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922013459.1695D10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for gnome-applet-window-picker
tibbs has set commit to Approved for 107427 on gnome-applet-window-picker (Fedora 11)
tibbs has set checkout to Approved for 107427 on gnome-applet-window-picker (Fedora 11)
tibbs has set build to Approved for 107427 on gnome-applet-window-picker (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-window-picker



From pkgdb at fedoraproject.org  Tue Sep 22 01:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:34:58 +0000
Subject: [pkgdb] gnome-applet-window-picker (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922013459.1D7B810F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for gnome-applet-window-picker
tibbs has set commit to Approved for 107427 on gnome-applet-window-picker (Fedora 10)
tibbs has set checkout to Approved for 107427 on gnome-applet-window-picker (Fedora 10)
tibbs has set build to Approved for 107427 on gnome-applet-window-picker (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-window-picker



From tibbs at fedoraproject.org  Tue Sep 22 01:35:14 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:35:14 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker - New directory
Message-ID: <20090922013514.2410811C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-window-picker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsy29498/rpms/gnome-applet-window-picker

Log Message:
Directory /cvs/pkgs/rpms/gnome-applet-window-picker added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 01:35:14 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:35:14 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/devel - New directory
Message-ID: <20090922013514.5B14511C0335@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsy29498/rpms/gnome-applet-window-picker/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-applet-window-picker/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 01:35:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:35:21 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker Makefile,NONE,1.1
Message-ID: <20090922013521.C31B211C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-window-picker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsy29498/rpms/gnome-applet-window-picker

Added Files:
	Makefile 
Log Message:
Setup of module gnome-applet-window-picker


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-applet-window-picker
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 tibbs at fedoraproject.org  Tue Sep 22 01:35:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:35:22 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090922013522.1971711C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsy29498/rpms/gnome-applet-window-picker/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-applet-window-picker


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-applet-window-picker
# $Id: Makefile,v 1.1 2009/09/22 01:35:21 tibbs Exp $
NAME := gnome-applet-window-picker
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  Tue Sep 22 01:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:34:58 +0000
Subject: [pkgdb] gnome-applet-window-picker (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922013459.26EF010F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for gnome-applet-window-picker
tibbs has set commit to Approved for 107427 on gnome-applet-window-picker (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on gnome-applet-window-picker (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on gnome-applet-window-picker (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-window-picker



From pkgdb at fedoraproject.org  Tue Sep 22 01:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:36:18 +0000
Subject: [pkgdb] ldapvi (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922013619.0B09610F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for ldapvi
tibbs has set commit to Approved for 107427 on ldapvi (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on ldapvi (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on ldapvi (Fedora EPEL 5)
tibbs changed owner of ldapvi in Fedora EPEL 5 to mcepl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Tue Sep 22 01:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:39:01 +0000
Subject: [pkgdb] funionfs (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922013901.696C510F876@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for funionfs
tibbs has set commit to Approved for 107427 on funionfs (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on funionfs (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on funionfs (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/funionfs



From pkgdb at fedoraproject.org  Tue Sep 22 01:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:46:42 +0000
Subject: [pkgdb] rhn-client-tools was added for msuchy
Message-ID: <20090922014642.CE5EC10F876@bastion2.fedora.phx.redhat.com>

tibbs has added Package rhn-client-tools with summary Support programs and libraries for Red Hat Network or Spacewalk
tibbs has approved Package rhn-client-tools
tibbs has added a Fedora devel branch for rhn-client-tools with an owner of msuchy
tibbs has approved rhn-client-tools in Fedora devel
tibbs has approved Package rhn-client-tools
tibbs has set commit to Approved for 107427 on rhn-client-tools (Fedora devel)
tibbs has set checkout to Approved for 107427 on rhn-client-tools (Fedora devel)
tibbs has set build to Approved for 107427 on rhn-client-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhn-client-tools



From pkgdb at fedoraproject.org  Tue Sep 22 01:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:46:43 +0000
Subject: [pkgdb] rhn-client-tools summary updated by tibbs
Message-ID: <20090922014644.08FFC10F880@bastion2.fedora.phx.redhat.com>

tibbs set package rhn-client-tools summary to Support programs and libraries for Red Hat Network or Spacewalk

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhn-client-tools



From pkgdb at fedoraproject.org  Tue Sep 22 01:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:46:43 +0000
Subject: [pkgdb] rhn-client-tools (Fedora, 12) updated by tibbs
Message-ID: <20090922014644.15BFC10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for rhn-client-tools
tibbs has set commit to Approved for 107427 on rhn-client-tools (Fedora 12)
tibbs has set checkout to Approved for 107427 on rhn-client-tools (Fedora 12)
tibbs has set build to Approved for 107427 on rhn-client-tools (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhn-client-tools



From tibbs at fedoraproject.org  Tue Sep 22 01:46:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:46:50 +0000 (UTC)
Subject: rpms/rhn-client-tools - New directory
Message-ID: <20090922014650.1559511C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rhn-client-tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUv1073/rpms/rhn-client-tools

Log Message:
Directory /cvs/pkgs/rpms/rhn-client-tools added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 01:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:46:43 +0000
Subject: [pkgdb] rhn-client-tools (Fedora, 12) updated by tibbs
Message-ID: <20090922014644.22AAF10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for rhn-client-tools
tibbs has set commit to Approved for 107427 on rhn-client-tools (Fedora 11)
tibbs has set checkout to Approved for 107427 on rhn-client-tools (Fedora 11)
tibbs has set build to Approved for 107427 on rhn-client-tools (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhn-client-tools



From tibbs at fedoraproject.org  Tue Sep 22 01:46:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:46:50 +0000 (UTC)
Subject: rpms/rhn-client-tools/devel - New directory
Message-ID: <20090922014650.3DCC111C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rhn-client-tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUv1073/rpms/rhn-client-tools/devel

Log Message:
Directory /cvs/pkgs/rpms/rhn-client-tools/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 01:46:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:46:56 +0000 (UTC)
Subject: rpms/rhn-client-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922014656.F0F5011C0335@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rhn-client-tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUv1073/rpms/rhn-client-tools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rhn-client-tools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rhn-client-tools
# $Id: Makefile,v 1.1 2009/09/22 01:46:56 tibbs Exp $
NAME := rhn-client-tools
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 tibbs at fedoraproject.org  Tue Sep 22 01:46:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:46:56 +0000 (UTC)
Subject: rpms/rhn-client-tools Makefile,NONE,1.1
Message-ID: <20090922014656.C119611C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rhn-client-tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUv1073/rpms/rhn-client-tools

Added Files:
	Makefile 
Log Message:
Setup of module rhn-client-tools


--- NEW FILE Makefile ---
# Top level Makefile for module rhn-client-tools
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  Tue Sep 22 01:47:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:47:32 +0000
Subject: [pkgdb] picprog was added for musolinoa
Message-ID: <20090922014732.BC1F210F889@bastion2.fedora.phx.redhat.com>

tibbs has added Package picprog with summary Microchip PIC micro-controller serial programmer software
tibbs has approved Package picprog
tibbs has added a Fedora devel branch for picprog with an owner of musolinoa
tibbs has approved picprog in Fedora devel
tibbs has approved Package picprog
tibbs has set commit to Approved for 107427 on picprog (Fedora devel)
tibbs has set checkout to Approved for 107427 on picprog (Fedora devel)
tibbs has set build to Approved for 107427 on picprog (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/picprog



From pkgdb at fedoraproject.org  Tue Sep 22 01:47:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:47:34 +0000
Subject: [pkgdb] picprog summary updated by tibbs
Message-ID: <20090922014734.73A1110F89C@bastion2.fedora.phx.redhat.com>

tibbs set package picprog summary to Microchip PIC micro-controller serial programmer software

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/picprog



From tibbs at fedoraproject.org  Tue Sep 22 01:47:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:47:51 +0000 (UTC)
Subject: rpms/picprog - New directory
Message-ID: <20090922014751.7163811C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/picprog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspi1714/rpms/picprog

Log Message:
Directory /cvs/pkgs/rpms/picprog added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 01:47:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:47:34 +0000
Subject: [pkgdb] picprog (Fedora, 11) updated by tibbs
Message-ID: <20090922014734.9FF3710F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for picprog
tibbs has set commit to Approved for 107427 on picprog (Fedora 11)
tibbs has set checkout to Approved for 107427 on picprog (Fedora 11)
tibbs has set build to Approved for 107427 on picprog (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/picprog



From tibbs at fedoraproject.org  Tue Sep 22 01:47:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:47:51 +0000 (UTC)
Subject: rpms/picprog/devel - New directory
Message-ID: <20090922014751.BDE8811C0374@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/picprog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspi1714/rpms/picprog/devel

Log Message:
Directory /cvs/pkgs/rpms/picprog/devel added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 01:47:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:47:34 +0000
Subject: [pkgdb] picprog (Fedora, 11) updated by tibbs
Message-ID: <20090922014734.CA12310F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for picprog
tibbs has set commit to Approved for 107427 on picprog (Fedora 10)
tibbs has set checkout to Approved for 107427 on picprog (Fedora 10)
tibbs has set build to Approved for 107427 on picprog (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/picprog



From tibbs at fedoraproject.org  Tue Sep 22 01:48:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:48:09 +0000 (UTC)
Subject: rpms/picprog Makefile,NONE,1.1
Message-ID: <20090922014809.E5CAC11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/picprog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspi1714/rpms/picprog

Added Files:
	Makefile 
Log Message:
Setup of module picprog


--- NEW FILE Makefile ---
# Top level Makefile for module picprog
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 tibbs at fedoraproject.org  Tue Sep 22 01:48:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:48:10 +0000 (UTC)
Subject: rpms/picprog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090922014810.F007E11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/picprog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspi1714/rpms/picprog/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module picprog


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: picprog
# $Id: Makefile,v 1.1 2009/09/22 01:48:10 tibbs Exp $
NAME := picprog
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  Tue Sep 22 01:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:48:51 +0000
Subject: [pkgdb] canorus was added for oget
Message-ID: <20090922014851.6661010F876@bastion2.fedora.phx.redhat.com>

tibbs has added Package canorus with summary Music Score Editor
tibbs has approved Package canorus
tibbs has added a Fedora devel branch for canorus with an owner of oget
tibbs has approved canorus in Fedora devel
tibbs has approved Package canorus
tibbs has set commit to Approved for 107427 on canorus (Fedora devel)
tibbs has set checkout to Approved for 107427 on canorus (Fedora devel)
tibbs has set build to Approved for 107427 on canorus (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/canorus



From pkgdb at fedoraproject.org  Tue Sep 22 01:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:48:51 +0000
Subject: [pkgdb] canorus summary updated by tibbs
Message-ID: <20090922014852.434C610F889@bastion2.fedora.phx.redhat.com>

tibbs set package canorus summary to Music Score Editor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/canorus



From pkgdb at fedoraproject.org  Tue Sep 22 01:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:48:51 +0000
Subject: [pkgdb] canorus (Fedora, 12) updated by tibbs
Message-ID: <20090922014852.47C2810F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for canorus
tibbs has set commit to Approved for 107427 on canorus (Fedora 11)
tibbs has set checkout to Approved for 107427 on canorus (Fedora 11)
tibbs has set build to Approved for 107427 on canorus (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/canorus



From pkgdb at fedoraproject.org  Tue Sep 22 01:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:48:51 +0000
Subject: [pkgdb] canorus (Fedora, 12) updated by tibbs
Message-ID: <20090922014852.52DCD10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for canorus
tibbs has set commit to Approved for 107427 on canorus (Fedora 10)
tibbs has set checkout to Approved for 107427 on canorus (Fedora 10)
tibbs has set build to Approved for 107427 on canorus (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/canorus



From tibbs at fedoraproject.org  Tue Sep 22 01:49:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:49:04 +0000 (UTC)
Subject: rpms/canorus - New directory
Message-ID: <20090922014904.4888B11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/canorus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQL2623/rpms/canorus

Log Message:
Directory /cvs/pkgs/rpms/canorus added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 01:49:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:49:04 +0000 (UTC)
Subject: rpms/canorus/devel - New directory
Message-ID: <20090922014904.857FF11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/canorus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQL2623/rpms/canorus/devel

Log Message:
Directory /cvs/pkgs/rpms/canorus/devel added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 01:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 01:48:51 +0000
Subject: [pkgdb] canorus (Fedora, 12) updated by tibbs
Message-ID: <20090922014852.59F6D10F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for canorus
tibbs has set commit to Approved for 107427 on canorus (Fedora 12)
tibbs has set checkout to Approved for 107427 on canorus (Fedora 12)
tibbs has set build to Approved for 107427 on canorus (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/canorus



From tibbs at fedoraproject.org  Tue Sep 22 01:49:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:49:16 +0000 (UTC)
Subject: rpms/canorus Makefile,NONE,1.1
Message-ID: <20090922014916.C10A611C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/canorus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQL2623/rpms/canorus

Added Files:
	Makefile 
Log Message:
Setup of module canorus


--- NEW FILE Makefile ---
# Top level Makefile for module canorus
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 tibbs at fedoraproject.org  Tue Sep 22 01:49:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 01:49:17 +0000 (UTC)
Subject: rpms/canorus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090922014917.0D08F11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/canorus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQL2623/rpms/canorus/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module canorus


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: canorus
# $Id: Makefile,v 1.1 2009/09/22 01:49:16 tibbs Exp $
NAME := canorus
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 mclasen at fedoraproject.org  Tue Sep 22 01:50:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 01:50:59 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.57, 1.58 gnome-menus.spec,
	1.106, 1.107 sources, 1.57, 1.58
Message-ID: <20090922015059.66C6B11C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3438

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	9 Sep 2009 04:25:51 -0000	1.57
+++ .cvsignore	22 Sep 2009 01:50:58 -0000	1.58
@@ -1 +1 @@
-gnome-menus-2.27.92.tar.bz2
+gnome-menus-2.28.0.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- gnome-menus.spec	9 Sep 2009 04:25:51 -0000	1.106
+++ gnome-menus.spec	22 Sep 2009 01:50:59 -0000	1.107
@@ -5,12 +5,12 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-menus/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-menus/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: gamin-devel
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	9 Sep 2009 04:25:51 -0000	1.57
+++ sources	22 Sep 2009 01:50:59 -0000	1.58
@@ -1 +1 @@
-a65ee94cbc2b2d3cc576e18f70a0b53c  gnome-menus-2.27.92.tar.bz2
+707070fa9d9ad07cc005d9ed4521b69d  gnome-menus-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 01:59:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 01:59:40 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.89, 1.90 gnome-desktop.spec, 
	1.225, 1.226 sources, 1.89, 1.90
Message-ID: <20090922015940.A49CD11C0043@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6662

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	9 Sep 2009 04:37:05 -0000	1.89
+++ .cvsignore	22 Sep 2009 01:59:39 -0000	1.90
@@ -1 +1 @@
-gnome-desktop-2.27.92.tar.bz2
+gnome-desktop-2.28.0.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- gnome-desktop.spec	9 Sep 2009 04:37:05 -0000	1.225
+++ gnome-desktop.spec	22 Sep 2009 01:59:39 -0000	1.226
@@ -11,10 +11,10 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
 
 License: GPLv2+ and LGPLv2+
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	9 Sep 2009 04:37:05 -0000	1.89
+++ sources	22 Sep 2009 01:59:40 -0000	1.90
@@ -1 +1 @@
-646825d9b18abd30ab7cf7f6d1598761  gnome-desktop-2.27.92.tar.bz2
+73927d3c43d783f5d7d6cdbb4359d7d6  gnome-desktop-2.28.0.tar.bz2



From rdieter at fedoraproject.org  Tue Sep 22 02:01:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 02:01:06 +0000 (UTC)
Subject: rpms/amarok/devel .cvsignore, 1.50, 1.51 amarok.spec, 1.163,
	1.164 sources, 1.51, 1.52 amarok-taglib.patch, 1.1, NONE
Message-ID: <20090922020106.72AF311C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7279

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-taglib.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
- amarok-2.1.90 (2.2rc1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	14 Sep 2009 20:38:52 -0000	1.50
+++ .cvsignore	22 Sep 2009 02:01:06 -0000	1.51
@@ -1 +1 @@
-amarok-2.1.85.tar.bz2
+amarok-2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- amarok.spec	17 Sep 2009 19:03:37 -0000	1.163
+++ amarok.spec	22 Sep 2009 02:01:06 -0000	1.164
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.85
-Release: 2%{?dist}
+Version: 2.1.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,9 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-## upstream patches
-Patch100: amarok-taglib.patch
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -79,8 +76,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .taglib
-
 
 %build
 mkdir -p %{_target_platform}
@@ -171,6 +166,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
+- amarok-2.1.90 (2.2rc1)
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
 - BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	14 Sep 2009 20:38:52 -0000	1.51
+++ sources	22 Sep 2009 02:01:06 -0000	1.52
@@ -1 +1 @@
-38311a55767fb8d85254b248a46433d8  amarok-2.1.85.tar.bz2
+ec727ed72c5d371fb659ce0c3c1e6136  amarok-2.1.90.tar.bz2


--- amarok-taglib.patch DELETED ---



From rdieter at fedoraproject.org  Tue Sep 22 02:01:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 02:01:41 +0000 (UTC)
Subject: rpms/amarok/F-12 .cvsignore, 1.50, 1.51 amarok.spec, 1.163,
	1.164 sources, 1.51, 1.52 amarok-taglib.patch, 1.1, NONE
Message-ID: <20090922020141.87E6011C0043@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7584

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-taglib.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
- amarok-2.1.90 (2.2rc1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	14 Sep 2009 20:51:02 -0000	1.50
+++ .cvsignore	22 Sep 2009 02:01:41 -0000	1.51
@@ -1 +1 @@
-amarok-2.1.85.tar.bz2
+amarok-2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- amarok.spec	17 Sep 2009 19:03:37 -0000	1.163
+++ amarok.spec	22 Sep 2009 02:01:41 -0000	1.164
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.85
-Release: 2%{?dist}
+Version: 2.1.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,9 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-## upstream patches
-Patch100: amarok-taglib.patch
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -79,8 +76,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .taglib
-
 
 %build
 mkdir -p %{_target_platform}
@@ -171,6 +166,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
+- amarok-2.1.90 (2.2rc1)
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
 - BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	14 Sep 2009 20:51:03 -0000	1.51
+++ sources	22 Sep 2009 02:01:41 -0000	1.52
@@ -1 +1 @@
-38311a55767fb8d85254b248a46433d8  amarok-2.1.85.tar.bz2
+ec727ed72c5d371fb659ce0c3c1e6136  amarok-2.1.90.tar.bz2


--- amarok-taglib.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 22 02:05:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:05:00 +0000
Subject: [pkgdb] python-mwclient was added for tuxbrewr
Message-ID: <20090922020500.4F9CB10F861@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-mwclient with summary Mwclient is a client to the MediaWiki API
tibbs has approved Package python-mwclient
tibbs has added a Fedora devel branch for python-mwclient with an owner of tuxbrewr
tibbs has approved python-mwclient in Fedora devel
tibbs has approved Package python-mwclient
tibbs has set commit to Approved for 107427 on python-mwclient (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-mwclient (Fedora devel)
tibbs has set build to Approved for 107427 on python-mwclient (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 02:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:05:01 +0000
Subject: [pkgdb] python-mwclient (Fedora, 11) updated by tibbs
Message-ID: <20090922020501.D928C10F889@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for python-mwclient
tibbs has set commit to Approved for 107427 on python-mwclient (Fedora 11)
tibbs has set checkout to Approved for 107427 on python-mwclient (Fedora 11)
tibbs has set build to Approved for 107427 on python-mwclient (Fedora 11)
tibbs approved watchbugzilla on python-mwclient (Fedora 11) for rdieter
tibbs approved watchcommits on python-mwclient (Fedora 11) for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 02:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:05:01 +0000
Subject: [pkgdb] python-mwclient summary updated by tibbs
Message-ID: <20090922020501.D1F8610F87E@bastion2.fedora.phx.redhat.com>

tibbs set package python-mwclient summary to Mwclient is a client to the MediaWiki API

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 02:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:05:01 +0000
Subject: [pkgdb] python-mwclient (Fedora, 11) updated by tibbs
Message-ID: <20090922020501.EE25010F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for python-mwclient
tibbs has set commit to Approved for 107427 on python-mwclient (Fedora 10)
tibbs has set checkout to Approved for 107427 on python-mwclient (Fedora 10)
tibbs has set build to Approved for 107427 on python-mwclient (Fedora 10)
tibbs approved watchbugzilla on python-mwclient (Fedora 10) for rdieter
tibbs approved watchcommits on python-mwclient (Fedora 10) for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From tibbs at fedoraproject.org  Tue Sep 22 02:05:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:05:08 +0000 (UTC)
Subject: rpms/python-mwclient - New directory
Message-ID: <20090922020508.1996C11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-mwclient
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYz8620/rpms/python-mwclient

Log Message:
Directory /cvs/pkgs/rpms/python-mwclient added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:05:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:05:08 +0000 (UTC)
Subject: rpms/python-mwclient/devel - New directory
Message-ID: <20090922020508.4B88F11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-mwclient/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYz8620/rpms/python-mwclient/devel

Log Message:
Directory /cvs/pkgs/rpms/python-mwclient/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:05:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:05:16 +0000 (UTC)
Subject: rpms/python-mwclient Makefile,NONE,1.1
Message-ID: <20090922020516.C3CA311C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-mwclient
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYz8620/rpms/python-mwclient

Added Files:
	Makefile 
Log Message:
Setup of module python-mwclient


--- NEW FILE Makefile ---
# Top level Makefile for module python-mwclient
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  Tue Sep 22 02:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:05:01 +0000
Subject: [pkgdb] python-mwclient (Fedora, 11) updated by tibbs
Message-ID: <20090922020502.00BB910F89D@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on python-mwclient (Fedora devel) for rdieter
tibbs approved watchcommits on python-mwclient (Fedora devel) for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From tibbs at fedoraproject.org  Tue Sep 22 02:05:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:05:17 +0000 (UTC)
Subject: rpms/python-mwclient/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922020517.1CAEE11C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-mwclient/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYz8620/rpms/python-mwclient/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-mwclient


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-mwclient
# $Id: Makefile,v 1.1 2009/09/22 02:05:16 tibbs Exp $
NAME := python-mwclient
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  Tue Sep 22 02:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:07:29 +0000
Subject: [pkgdb] xls2csv was added for hubbitus
Message-ID: <20090922020729.903B510F876@bastion2.fedora.phx.redhat.com>

tibbs has added Package xls2csv with summary A script that recodes a spreadsheet's charset and saves as CSV
tibbs has approved Package xls2csv
tibbs has added a Fedora devel branch for xls2csv with an owner of hubbitus
tibbs has approved xls2csv in Fedora devel
tibbs has approved Package xls2csv
tibbs has set commit to Approved for 107427 on xls2csv (Fedora devel)
tibbs has set checkout to Approved for 107427 on xls2csv (Fedora devel)
tibbs has set build to Approved for 107427 on xls2csv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xls2csv



From pkgdb at fedoraproject.org  Tue Sep 22 02:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:07:29 +0000
Subject: [pkgdb] xls2csv summary updated by tibbs
Message-ID: <20090922020730.A3F4010F87E@bastion2.fedora.phx.redhat.com>

tibbs set package xls2csv summary to A script that recodes a spreadsheet's charset and saves as CSV

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xls2csv



From pkgdb at fedoraproject.org  Tue Sep 22 02:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:07:29 +0000
Subject: [pkgdb] xls2csv (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922020730.AC6D010F897@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for xls2csv
tibbs has set commit to Approved for 107427 on xls2csv (Fedora 11)
tibbs has set checkout to Approved for 107427 on xls2csv (Fedora 11)
tibbs has set build to Approved for 107427 on xls2csv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xls2csv



From tibbs at fedoraproject.org  Tue Sep 22 02:07:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:07:37 +0000 (UTC)
Subject: rpms/xls2csv - New directory
Message-ID: <20090922020737.166E911C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xls2csv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiG9486/rpms/xls2csv

Log Message:
Directory /cvs/pkgs/rpms/xls2csv added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:07:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:07:37 +0000 (UTC)
Subject: rpms/xls2csv/devel - New directory
Message-ID: <20090922020737.3D9A511C0338@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xls2csv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiG9486/rpms/xls2csv/devel

Log Message:
Directory /cvs/pkgs/rpms/xls2csv/devel added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 02:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:07:29 +0000
Subject: [pkgdb] xls2csv (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922020730.BEDF710F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for xls2csv
tibbs has set commit to Approved for 107427 on xls2csv (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on xls2csv (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on xls2csv (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xls2csv



From pkgdb at fedoraproject.org  Tue Sep 22 02:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:07:29 +0000
Subject: [pkgdb] xls2csv (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922020730.B25EB10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for xls2csv
tibbs has set commit to Approved for 107427 on xls2csv (Fedora 10)
tibbs has set checkout to Approved for 107427 on xls2csv (Fedora 10)
tibbs has set build to Approved for 107427 on xls2csv (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xls2csv



From tibbs at fedoraproject.org  Tue Sep 22 02:07:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:07:44 +0000 (UTC)
Subject: rpms/xls2csv Makefile,NONE,1.1
Message-ID: <20090922020744.4944611C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xls2csv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiG9486/rpms/xls2csv

Added Files:
	Makefile 
Log Message:
Setup of module xls2csv


--- NEW FILE Makefile ---
# Top level Makefile for module xls2csv
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 tibbs at fedoraproject.org  Tue Sep 22 02:07:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:07:44 +0000 (UTC)
Subject: rpms/xls2csv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090922020744.8863611C0043@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xls2csv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiG9486/rpms/xls2csv/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xls2csv


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xls2csv
# $Id: Makefile,v 1.1 2009/09/22 02:07:44 tibbs Exp $
NAME := xls2csv
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  Tue Sep 22 02:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:08:48 +0000
Subject: [pkgdb] openslide was added for agoode
Message-ID: <20090922020848.6BF3A10F87C@bastion2.fedora.phx.redhat.com>

tibbs has added Package openslide with summary library for reading virtual slides
tibbs has approved Package openslide
tibbs has added a Fedora devel branch for openslide with an owner of agoode
tibbs has approved openslide in Fedora devel
tibbs has approved Package openslide
tibbs has set commit to Approved for 107427 on openslide (Fedora devel)
tibbs has set checkout to Approved for 107427 on openslide (Fedora devel)
tibbs has set build to Approved for 107427 on openslide (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openslide



From pkgdb at fedoraproject.org  Tue Sep 22 02:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:08:49 +0000
Subject: [pkgdb] openslide summary updated by tibbs
Message-ID: <20090922020849.98FE610F889@bastion2.fedora.phx.redhat.com>

tibbs set package openslide summary to library for reading virtual slides

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openslide



From pkgdb at fedoraproject.org  Tue Sep 22 02:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:08:49 +0000
Subject: [pkgdb] openslide (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922020849.9F0D910F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for openslide
tibbs has set commit to Approved for 107427 on openslide (Fedora 11)
tibbs has set checkout to Approved for 107427 on openslide (Fedora 11)
tibbs has set build to Approved for 107427 on openslide (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openslide



From pkgdb at fedoraproject.org  Tue Sep 22 02:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:08:49 +0000
Subject: [pkgdb] openslide (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922020849.ADE0910F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for openslide
tibbs has set commit to Approved for 107427 on openslide (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on openslide (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on openslide (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openslide



From tibbs at fedoraproject.org  Tue Sep 22 02:08:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:08:56 +0000 (UTC)
Subject: rpms/openslide - New directory
Message-ID: <20090922020856.1844E11C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/openslide
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsG10745/rpms/openslide

Log Message:
Directory /cvs/pkgs/rpms/openslide added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:09:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:09:04 +0000 (UTC)
Subject: rpms/openslide Makefile,NONE,1.1
Message-ID: <20090922020904.3B01A11C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/openslide
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsG10745/rpms/openslide

Added Files:
	Makefile 
Log Message:
Setup of module openslide


--- NEW FILE Makefile ---
# Top level Makefile for module openslide
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 tibbs at fedoraproject.org  Tue Sep 22 02:08:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:08:56 +0000 (UTC)
Subject: rpms/openslide/devel - New directory
Message-ID: <20090922020856.3B2C111C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/openslide/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsG10745/rpms/openslide/devel

Log Message:
Directory /cvs/pkgs/rpms/openslide/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:09:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:09:04 +0000 (UTC)
Subject: rpms/openslide/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922020904.AF38111C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/openslide/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsG10745/rpms/openslide/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openslide


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: openslide
# $Id: Makefile,v 1.1 2009/09/22 02:09:04 tibbs Exp $
NAME := openslide
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  Tue Sep 22 02:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:08:49 +0000
Subject: [pkgdb] openslide (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090922020849.B906410F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for openslide
tibbs has set commit to Approved for 107427 on openslide (Fedora 10)
tibbs has set checkout to Approved for 107427 on openslide (Fedora 10)
tibbs has set build to Approved for 107427 on openslide (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openslide



From pkgdb at fedoraproject.org  Tue Sep 22 02:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:09:33 +0000
Subject: [pkgdb] clutter-sharp was added for chkr
Message-ID: <20090922020933.78A7B10F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package clutter-sharp with summary C#/.NET bindings to Clutter
tibbs has approved Package clutter-sharp
tibbs has added a Fedora devel branch for clutter-sharp with an owner of chkr
tibbs has approved clutter-sharp in Fedora devel
tibbs has approved Package clutter-sharp
tibbs has set commit to Approved for 107427 on clutter-sharp (Fedora devel)
tibbs has set checkout to Approved for 107427 on clutter-sharp (Fedora devel)
tibbs has set build to Approved for 107427 on clutter-sharp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter-sharp



From pkgdb at fedoraproject.org  Tue Sep 22 02:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:09:33 +0000
Subject: [pkgdb] clutter-sharp summary updated by tibbs
Message-ID: <20090922020934.98DEC10F89A@bastion2.fedora.phx.redhat.com>

tibbs set package clutter-sharp summary to C#/.NET bindings to Clutter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter-sharp



From pkgdb at fedoraproject.org  Tue Sep 22 02:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:09:33 +0000
Subject: [pkgdb] clutter-sharp (Fedora, 10) updated by tibbs
Message-ID: <20090922020934.C6DD610F89E@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for clutter-sharp
tibbs has set commit to Approved for 107427 on clutter-sharp (Fedora 10)
tibbs has set checkout to Approved for 107427 on clutter-sharp (Fedora 10)
tibbs has set build to Approved for 107427 on clutter-sharp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter-sharp



From pkgdb at fedoraproject.org  Tue Sep 22 02:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:09:33 +0000
Subject: [pkgdb] clutter-sharp (Fedora, 10) updated by tibbs
Message-ID: <20090922020935.35B4B10F876@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for clutter-sharp
tibbs has set commit to Approved for 107427 on clutter-sharp (Fedora 11)
tibbs has set checkout to Approved for 107427 on clutter-sharp (Fedora 11)
tibbs has set build to Approved for 107427 on clutter-sharp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter-sharp



From tibbs at fedoraproject.org  Tue Sep 22 02:09:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:09:41 +0000 (UTC)
Subject: rpms/clutter-sharp - New directory
Message-ID: <20090922020941.1859D11C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/clutter-sharp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsf11187/rpms/clutter-sharp

Log Message:
Directory /cvs/pkgs/rpms/clutter-sharp added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:09:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:09:41 +0000 (UTC)
Subject: rpms/clutter-sharp/devel - New directory
Message-ID: <20090922020941.3D30411C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/clutter-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsf11187/rpms/clutter-sharp/devel

Log Message:
Directory /cvs/pkgs/rpms/clutter-sharp/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:09:47 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:09:47 +0000 (UTC)
Subject: rpms/clutter-sharp Makefile,NONE,1.1
Message-ID: <20090922020947.BBBB211C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/clutter-sharp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsf11187/rpms/clutter-sharp

Added Files:
	Makefile 
Log Message:
Setup of module clutter-sharp


--- NEW FILE Makefile ---
# Top level Makefile for module clutter-sharp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Sep 22 02:09:47 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:09:47 +0000 (UTC)
Subject: rpms/clutter-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922020947.F375411C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/clutter-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsf11187/rpms/clutter-sharp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clutter-sharp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clutter-sharp
# $Id: Makefile,v 1.1 2009/09/22 02:09:47 tibbs Exp $
NAME := clutter-sharp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Sep 22 02:10:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:10:11 +0000
Subject: [pkgdb] bournal was added for fab
Message-ID: <20090922021011.3032410F89F@bastion2.fedora.phx.redhat.com>

tibbs has added Package bournal with summary Write personal, password-protected journal entries
tibbs has approved Package bournal
tibbs has added a Fedora devel branch for bournal with an owner of fab
tibbs has approved bournal in Fedora devel
tibbs has approved Package bournal
tibbs has set commit to Approved for 107427 on bournal (Fedora devel)
tibbs has set checkout to Approved for 107427 on bournal (Fedora devel)
tibbs has set build to Approved for 107427 on bournal (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bournal



From pkgdb at fedoraproject.org  Tue Sep 22 02:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:10:13 +0000
Subject: [pkgdb] bournal summary updated by tibbs
Message-ID: <20090922021013.9DAD310F8A0@bastion2.fedora.phx.redhat.com>

tibbs set package bournal summary to Write personal, password-protected journal entries

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bournal



From pkgdb at fedoraproject.org  Tue Sep 22 02:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:10:13 +0000
Subject: [pkgdb] bournal (Fedora, 11) updated by tibbs
Message-ID: <20090922021013.E394310F8A8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for bournal
tibbs has set commit to Approved for 107427 on bournal (Fedora 11)
tibbs has set checkout to Approved for 107427 on bournal (Fedora 11)
tibbs has set build to Approved for 107427 on bournal (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bournal



From pkgdb at fedoraproject.org  Tue Sep 22 02:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:10:13 +0000
Subject: [pkgdb] bournal (Fedora, 11) updated by tibbs
Message-ID: <20090922021014.1EF9210F8AB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for bournal
tibbs has set commit to Approved for 107427 on bournal (Fedora 10)
tibbs has set checkout to Approved for 107427 on bournal (Fedora 10)
tibbs has set build to Approved for 107427 on bournal (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bournal



From tibbs at fedoraproject.org  Tue Sep 22 02:10:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:10:20 +0000 (UTC)
Subject: rpms/bournal - New directory
Message-ID: <20090922021020.1C52111C0419@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bournal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsa11562/rpms/bournal

Log Message:
Directory /cvs/pkgs/rpms/bournal added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:10:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:10:20 +0000 (UTC)
Subject: rpms/bournal/devel - New directory
Message-ID: <20090922021020.5710311C04DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bournal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsa11562/rpms/bournal/devel

Log Message:
Directory /cvs/pkgs/rpms/bournal/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:10:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:10:28 +0000 (UTC)
Subject: rpms/bournal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090922021028.C8D4711C0419@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bournal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsa11562/rpms/bournal/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bournal


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bournal
# $Id: Makefile,v 1.1 2009/09/22 02:10:28 tibbs Exp $
NAME := bournal
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 tibbs at fedoraproject.org  Tue Sep 22 02:10:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:10:28 +0000 (UTC)
Subject: rpms/bournal Makefile,NONE,1.1
Message-ID: <20090922021028.89E6C11C0419@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bournal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsa11562/rpms/bournal

Added Files:
	Makefile 
Log Message:
Setup of module bournal


--- NEW FILE Makefile ---
# Top level Makefile for module bournal
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  Tue Sep 22 02:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:11:09 +0000
Subject: [pkgdb] ghc-network was added for petersen
Message-ID: <20090922021109.75F6110F88A@bastion2.fedora.phx.redhat.com>

tibbs has added Package ghc-network with summary Haskell network library
tibbs has approved Package ghc-network
tibbs has added a Fedora devel branch for ghc-network with an owner of petersen
tibbs has approved ghc-network in Fedora devel
tibbs has approved Package ghc-network
tibbs has set commit to Approved for 107427 on ghc-network (Fedora devel)
tibbs has set checkout to Approved for 107427 on ghc-network (Fedora devel)
tibbs has set build to Approved for 107427 on ghc-network (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-network



From pkgdb at fedoraproject.org  Tue Sep 22 02:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:11:09 +0000
Subject: [pkgdb] ghc-network summary updated by tibbs
Message-ID: <20090922021110.DC0C010F897@bastion2.fedora.phx.redhat.com>

tibbs set package ghc-network summary to Haskell network library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-network



From tibbs at fedoraproject.org  Tue Sep 22 02:11:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:11:17 +0000 (UTC)
Subject: rpms/ghc-network - New directory
Message-ID: <20090922021117.1EA7311C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-network
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB11986/rpms/ghc-network

Log Message:
Directory /cvs/pkgs/rpms/ghc-network added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:11:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:11:17 +0000 (UTC)
Subject: rpms/ghc-network/devel - New directory
Message-ID: <20090922021117.494FC11C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-network/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB11986/rpms/ghc-network/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-network/devel added to the repository




From tibbs at fedoraproject.org  Tue Sep 22 02:11:23 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:11:23 +0000 (UTC)
Subject: rpms/ghc-network Makefile,NONE,1.1
Message-ID: <20090922021123.95DD811C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-network
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB11986/rpms/ghc-network

Added Files:
	Makefile 
Log Message:
Setup of module ghc-network


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-network
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  Tue Sep 22 02:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:11:09 +0000
Subject: [pkgdb] ghc-network (Fedora, devel) updated by tibbs
Message-ID: <20090922021110.E7F6910F89B@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on ghc-network (Fedora devel) for haskell-sig
tibbs approved watchcommits on ghc-network (Fedora devel) for haskell-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-network



From tibbs at fedoraproject.org  Tue Sep 22 02:11:24 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 22 Sep 2009 02:11:24 +0000 (UTC)
Subject: rpms/ghc-network/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922021124.7BB2611C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-network/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB11986/rpms/ghc-network/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-network


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-network
# $Id: Makefile,v 1.1 2009/09/22 02:11:23 tibbs Exp $
NAME := ghc-network
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  Tue Sep 22 02:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:16:44 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by kevin
Message-ID: <20090922021644.5660C10F876@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on virt-v2v (Fedora 11) for virtmaint
kevin approved watchcommits on virt-v2v (Fedora 11) for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From pkgdb at fedoraproject.org  Tue Sep 22 02:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:16:44 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by kevin
Message-ID: <20090922021644.61D8510F889@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on virt-v2v (Fedora 12) for virtmaint
kevin approved watchcommits on virt-v2v (Fedora 12) for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From pkgdb at fedoraproject.org  Tue Sep 22 02:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:16:44 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by kevin
Message-ID: <20090922021644.6728D10F897@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on virt-v2v (Fedora devel) for virtmaint
kevin approved watchcommits on virt-v2v (Fedora devel) for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From pkgdb at fedoraproject.org  Tue Sep 22 02:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 02:16:44 +0000
Subject: [pkgdb] virt-v2v (Fedora EPEL, 5) updated by kevin
Message-ID: <20090922021644.7058C10F89B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on virt-v2v (Fedora EPEL 5) for virtmaint
kevin approved watchcommits on virt-v2v (Fedora EPEL 5) for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/virt-v2v



From mclasen at fedoraproject.org  Tue Sep 22 02:25:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 02:25:46 +0000 (UTC)
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.67,
	1.68 gnome-icon-theme.spec, 1.105, 1.106 sources, 1.71, 1.72
Message-ID: <20090922022546.9B35611C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15567

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	19 Aug 2009 05:01:45 -0000	1.67
+++ .cvsignore	22 Sep 2009 02:25:46 -0000	1.68
@@ -1 +1 @@
-gtk_print_icons.tar.bz2
+gnome-icon-theme-2.28.0.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gnome-icon-theme.spec	19 Aug 2009 05:01:45 -0000	1.105
+++ gnome-icon-theme.spec	22 Sep 2009 02:25:46 -0000	1.106
@@ -1,8 +1,8 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
-Version: 2.27.90
-Release: 2%{?dist}
-Source0: http://download.gnome.org/sources/gnome-icon-theme/2.27/%{name}-%{version}.tar.bz2
+Version: 2.28.0
+Release: 1%{?dist}
+Source0: http://download.gnome.org/sources/gnome-icon-theme/2.28/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-5.tar.bz2
 Source2: legacy-icon-mapping.xml
 Source3: window.png
@@ -79,6 +79,9 @@ done
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Aug 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-2
 - Add gtk print icons.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	19 Aug 2009 05:01:45 -0000	1.71
+++ sources	22 Sep 2009 02:25:46 -0000	1.72
@@ -1,3 +1,3 @@
-4abd68866f7d3763644c21c0eaf4dfea  gnome-icon-theme-2.27.90.tar.bz2
+1b6a782e3f733a5dbb8e62e87a7bdc61  gnome-icon-theme-2.28.0.tar.bz2
 824f011a845100714eb8a47199cf4398  gnome-icon-theme-extra-device-icons-5.tar.bz2
 3a2837cf20fc206d3a7b963661fcf4ce  gtk_print_icons.tar.bz2



From petersen at fedoraproject.org  Tue Sep 22 02:41:48 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 02:41:48 +0000 (UTC)
Subject: rpms/ghc-network/devel ghc-network.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922024148.521B411C0082@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20530/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-network.spec import.log 
Log Message:
import new package for haskell-platform



--- NEW FILE ghc-network.spec ---
%global pkg_name network

%bcond_without doc
%bcond_without prof

# override for ghc-6.10 since it has older network in extralibs
%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        2.2.1.4
Release:        2%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Provides:       ghc-%{pkg_name} = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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 doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.4-2
- version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)

* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.4-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-network-2_2_1_4-2_fc11:HEAD:ghc-network-2.2.1.4-2.fc11.src.rpm:1253587222


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-network/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:11:23 -0000	1.1
+++ .cvsignore	22 Sep 2009 02:41:48 -0000	1.2
@@ -0,0 +1 @@
+network-2.2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-network/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:11:24 -0000	1.1
+++ sources	22 Sep 2009 02:41:48 -0000	1.2
@@ -0,0 +1 @@
+639baaeeb9ccc2f2013bbfa3b376f14b  network-2.2.1.4.tar.gz



From mclasen at fedoraproject.org  Tue Sep 22 02:46:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 02:46:57 +0000 (UTC)
Subject: rpms/libgtop2/devel .cvsignore, 1.53, 1.54 libgtop2.spec, 1.80,
	1.81 sources, 1.53, 1.54
Message-ID: <20090922024657.17ADA11C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgtop2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21871

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	31 May 2009 22:47:08 -0000	1.53
+++ .cvsignore	22 Sep 2009 02:46:56 -0000	1.54
@@ -1 +1 @@
-libgtop-2.27.3.tar.bz2
+libgtop-2.28.0.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- libgtop2.spec	25 Jul 2009 05:51:34 -0000	1.80
+++ libgtop2.spec	22 Sep 2009 02:46:56 -0000	1.81
@@ -6,12 +6,12 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.27.3
-Release: 	2%{?dist}
+Version: 	2.28.0
+Release: 	1%{?dist}
 License: 	GPLv2+
-URL:            http://download.gnome.org/sources/libgtop/2.27
+URL:            http://download.gnome.org/sources/libgtop/2.28
 Group:          System Environment/Libraries
-Source: 	http://download.gnome.org/sources/libgtop/2.27/libgtop-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/libgtop/2.28/libgtop-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:  texinfo libtool gettext
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_datadir}/info
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	31 May 2009 22:47:08 -0000	1.53
+++ sources	22 Sep 2009 02:46:56 -0000	1.54
@@ -1 +1 @@
-e708331726d41f42367eeecd86139fa8  libgtop-2.27.3.tar.bz2
+f74fabd765452e9a6893852afa93a7c7  libgtop-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 02:48:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 02:48:08 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.50, 1.51 sources, 1.50,
	1.51 tomboy.spec, 1.124, 1.125
Message-ID: <20090922024808.CAB9411C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20809

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	8 Sep 2009 02:02:56 -0000	1.50
+++ .cvsignore	22 Sep 2009 02:48:08 -0000	1.51
@@ -1 +1 @@
-tomboy-0.15.7.tar.bz2
+tomboy-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	8 Sep 2009 02:02:56 -0000	1.50
+++ sources	22 Sep 2009 02:48:08 -0000	1.51
@@ -1 +1 @@
-9be72244668f4ba5b8f1006139b6d736  tomboy-0.15.7.tar.bz2
+b7d679fc98a9585aae91a0fb7952b723  tomboy-1.0.0.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- tomboy.spec	8 Sep 2009 02:02:56 -0000	1.124
+++ tomboy.spec	22 Sep 2009 02:48:08 -0000	1.125
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.15.7
+Version:        1.0.0
 Release: 	1%{?dist}
 Summary:        Note-taking application
 
@@ -9,7 +9,7 @@ License:        LGPLv2+ and GPLv2+ and M
 # libtomboy contains GPL+ code
 # Mono.Addins is MIT
 URL:            http://projects.gnome.org/tomboy/
-Source0:        http://download.gnome.org/sources/tomboy/0.15/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/tomboy/1.0/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,6 +137,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1.0.0-1
+- Update to 1.0.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.7-1
 - Update to 0.15.7
 



From mclasen at fedoraproject.org  Tue Sep 22 02:52:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 02:52:01 +0000 (UTC)
Subject: rpms/gnome-utils/devel .cvsignore, 1.76, 1.77 gnome-utils.spec,
	1.202, 1.203 sources, 1.80, 1.81
Message-ID: <20090922025201.B836911C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23175

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	25 Aug 2009 02:26:05 -0000	1.76
+++ .cvsignore	22 Sep 2009 02:52:01 -0000	1.77
@@ -1 +1 @@
-gnome-utils-2.27.91.tar.bz2
+gnome-utils-2.28.0.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- gnome-utils.spec	17 Sep 2009 18:55:11 -0000	1.202
+++ gnome-utils.spec	22 Sep 2009 02:52:01 -0000	1.203
@@ -8,15 +8,15 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.27.91
-Release:        2%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
 Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gnome-utils/2.27/gnome-utils-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gnome-utils/2.28/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=592661
@@ -317,6 +317,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
+- Update to 2.28.0
+
 * Thu Sep 17 2009 Ray Strode <rstrode at redhat.com> - 1:2.27.91-2
 - Split off -libs package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	25 Aug 2009 02:26:05 -0000	1.80
+++ sources	22 Sep 2009 02:52:01 -0000	1.81
@@ -1 +1 @@
-5c795e19e03274d838197ea1e0e9b516  gnome-utils-2.27.91.tar.bz2
+156e38fdf348bf2db4fcb7b84ddcc2aa  gnome-utils-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 03:05:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:05:52 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.89, 1.90 eog.spec, 1.152, 1.153 sources,
	1.89, 1.90
Message-ID: <20090922030552.B3A0E11C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26437

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	8 Sep 2009 19:27:33 -0000	1.89
+++ .cvsignore	22 Sep 2009 03:05:52 -0000	1.90
@@ -1 +1 @@
-eog-2.27.92.tar.bz2
+eog-2.28.0.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- eog.spec	8 Sep 2009 19:27:33 -0000	1.152
+++ eog.spec	22 Sep 2009 03:05:52 -0000	1.153
@@ -11,10 +11,10 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
-Source: http://download.gnome.org/sources/eog/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/eog/2.28/%{name}-%{version}.tar.bz2
 Patch0: libxml.patch
 # The GFDL has an "or later version" clause embedded inside the license.
 # There is no need to add the + here.
@@ -170,6 +170,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	8 Sep 2009 19:27:33 -0000	1.89
+++ sources	22 Sep 2009 03:05:52 -0000	1.90
@@ -1 +1 @@
-2fc072e451d7c46127feb44589671a5a  eog-2.27.92.tar.bz2
+d36efde32f6669864023ebe838590a32  eog-2.28.0.tar.bz2



From musolinoa at fedoraproject.org  Tue Sep 22 03:05:58 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Tue, 22 Sep 2009 03:05:58 +0000 (UTC)
Subject: rpms/picprog/devel import.log, NONE, 1.1 picprog-1.9.0-stdlib.diff, 
	NONE, 1.1 picprog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090922030558.310F811C0082@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/picprog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26256/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log picprog-1.9.0-stdlib.diff picprog.spec 
Log Message:
* Tue Sep 22 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-4
- Initial picprog SRPM import



--- NEW FILE import.log ---
picprog-1_9_0-4_fc10:HEAD:picprog-1.9.0-4.fc10.src.rpm:1253588630

picprog-1.9.0-stdlib.diff:
 main.cc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE picprog-1.9.0-stdlib.diff ---
Included standard library header as main.cc contains calls to getenv.
--- main.cc.orig	2009-08-29 19:23:07.000000000 +0930
+++ main.cc	2009-08-29 19:23:36.000000000 +0930
@@ -29,6 +29,7 @@
 
 #include <iostream>
 
+#include <stdlib.h>
 #include <sysexits.h>
 #include <unistd.h>
 #include <getopt.h>


--- NEW FILE picprog.spec ---
Name:           picprog
Version:        1.9.0
Release:        4%{?dist}
Summary:        Microchip PIC serial programmer software

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.iki.fi/hyvatti/pic/picprog.html
Source0:        http://www.iki.fi/hyvatti/pic/%{name}-%{version}.tar.gz

# Include standard library headers as main.cc contains calls to getenv.
Patch0:         picprog-1.9.0-stdlib.diff

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:  %{ix86} x86_64

%description
Picprog is a simple program for burning programs to various
Microchip PIC microcontrollers via several types of serial port
programmers.

%prep
%setup -q
%patch0


%build
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS=""


%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m 755 picprog $RPM_BUILD_ROOT%{_bindir}/%{name}
install -p -D -m 644 picprog.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING picprog.html *.png
%{_bindir}/picprog
%{_mandir}/man1/picprog.1.gz


%changelog
* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-4
- Added missing image files for use with .html documentation
- Added '-p' flag to `install` commands

* Thu Sep 17 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-3
- Made package exlusively for x86 and x86_64 architectures
- Manually install binary and man page (removes the need for Makefile patch)

* Tue Sep 01 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-2
- Removed `install` options from makefile, permissions now handled by RPM
- Added comments to patches
- Removed redundant `make dep` from %%build section
- Removed unnecessary BuildRequires and Requires
- Changed License field from GPLv2+ to GPLv2

* Sat Aug 28 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:48:09 -0000	1.1
+++ .cvsignore	22 Sep 2009 03:05:57 -0000	1.2
@@ -0,0 +1 @@
+picprog-1.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:48:10 -0000	1.1
+++ sources	22 Sep 2009 03:05:58 -0000	1.2
@@ -0,0 +1 @@
+a43e33b760952834052695fbbe31b0f1  picprog-1.9.0.tar.gz



From mclasen at fedoraproject.org  Tue Sep 22 03:09:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:09:58 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.25, 1.26 devhelp.spec, 1.115,
	1.116 sources, 1.25, 1.26
Message-ID: <20090922030958.DB05111C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27786

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	7 Sep 2009 22:27:50 -0000	1.25
+++ .cvsignore	22 Sep 2009 03:09:58 -0000	1.26
@@ -1 +1 @@
-devhelp-2.27.92.tar.bz2
+devhelp-2.28.0.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- devhelp.spec	7 Sep 2009 22:54:35 -0000	1.115
+++ devhelp.spec	22 Sep 2009 03:09:58 -0000	1.116
@@ -5,13 +5,13 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
 URL: http://developer.imendio.com/projects/devhelp
-Source: http://download.gnome.org/sources/devhelp/2.27/devhelp-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/devhelp/2.28/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Dependencies ###
@@ -137,6 +137,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 22:27:50 -0000	1.25
+++ sources	22 Sep 2009 03:09:58 -0000	1.26
@@ -1 +1 @@
-b796dacbff2c9cd2b7f5f44113a34a0b  devhelp-2.27.92.tar.bz2
+43de66cd3a0ce498aa78a5e3f97395c5  devhelp-2.28.0.tar.bz2



From musolinoa at fedoraproject.org  Tue Sep 22 03:12:07 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Tue, 22 Sep 2009 03:12:07 +0000 (UTC)
Subject: rpms/picprog/F-11 import.log, NONE, 1.1 picprog-1.9.0-stdlib.diff, 
	NONE, 1.1 picprog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090922031207.7373611C0082@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/picprog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28869/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log picprog-1.9.0-stdlib.diff picprog.spec 
Log Message:
* Tue Sep 22 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-4
- Inital picprog SRPM import to F-10 and F-11 branches



--- NEW FILE import.log ---
picprog-1_9_0-4_fc10:F-11:picprog-1.9.0-4.fc10.src.rpm:1253589043

picprog-1.9.0-stdlib.diff:
 main.cc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE picprog-1.9.0-stdlib.diff ---
Included standard library header as main.cc contains calls to getenv.
--- main.cc.orig	2009-08-29 19:23:07.000000000 +0930
+++ main.cc	2009-08-29 19:23:36.000000000 +0930
@@ -29,6 +29,7 @@
 
 #include <iostream>
 
+#include <stdlib.h>
 #include <sysexits.h>
 #include <unistd.h>
 #include <getopt.h>


--- NEW FILE picprog.spec ---
Name:           picprog
Version:        1.9.0
Release:        4%{?dist}
Summary:        Microchip PIC serial programmer software

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.iki.fi/hyvatti/pic/picprog.html
Source0:        http://www.iki.fi/hyvatti/pic/%{name}-%{version}.tar.gz

# Include standard library headers as main.cc contains calls to getenv.
Patch0:         picprog-1.9.0-stdlib.diff

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:  %{ix86} x86_64

%description
Picprog is a simple program for burning programs to various
Microchip PIC microcontrollers via several types of serial port
programmers.

%prep
%setup -q
%patch0


%build
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS=""


%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m 755 picprog $RPM_BUILD_ROOT%{_bindir}/%{name}
install -p -D -m 644 picprog.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING picprog.html *.png
%{_bindir}/picprog
%{_mandir}/man1/picprog.1.gz


%changelog
* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-4
- Added missing image files for use with .html documentation
- Added '-p' flag to `install` commands

* Thu Sep 17 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-3
- Made package exlusively for x86 and x86_64 architectures
- Manually install binary and man page (removes the need for Makefile patch)

* Tue Sep 01 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-2
- Removed `install` options from makefile, permissions now handled by RPM
- Added comments to patches
- Removed redundant `make dep` from %%build section
- Removed unnecessary BuildRequires and Requires
- Changed License field from GPLv2+ to GPLv2

* Sat Aug 28 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:48:09 -0000	1.1
+++ .cvsignore	22 Sep 2009 03:12:07 -0000	1.2
@@ -0,0 +1 @@
+picprog-1.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:48:10 -0000	1.1
+++ sources	22 Sep 2009 03:12:07 -0000	1.2
@@ -0,0 +1 @@
+a43e33b760952834052695fbbe31b0f1  picprog-1.9.0.tar.gz



From mtasaka at fedoraproject.org  Tue Sep 22 03:22:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Sep 2009 03:22:09 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel .cvsignore, 1.8, 1.9 ruby-gnome2.spec, 1.46, 
	1.47 sources, 1.8, 1.9 ruby-gnome2-0.19.1-vte-depend.patch, 1.1,
	NONE
Message-ID: <20090922032209.A3DCF11C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31281

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Removed Files:
	ruby-gnome2-0.19.1-vte-depend.patch 
Log Message:
* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Try rev 3690
- Massive pkgconfig files renaming
- Enable gio support



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Aug 2009 19:02:23 -0000	1.8
+++ .cvsignore	22 Sep 2009 03:22:08 -0000	1.9
@@ -1 +1 @@
-ruby-gnome2-all-0.19.1.tar.gz
+ruby-gnome2-all-0.19.2-svn3690_trunk.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ruby-gnome2.spec	9 Sep 2009 18:18:53 -0000	1.46
+++ ruby-gnome2.spec	22 Sep 2009 03:22:08 -0000	1.47
@@ -2,13 +2,13 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
+%define         betaver                svn3690_trunk
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                2
+%define         mainrel                0.1.%{betaver}
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -16,7 +16,7 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.1
+Version:        0.19.2
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
@@ -28,11 +28,10 @@ Group:          System Environment/Libra
 
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
+Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# ruby-gnome2-Bugs-2831660
-Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -763,9 +762,9 @@ This package provides libraries and head
 
 
 %prep
-%setup -q -n %{name}-all-%{version}
+#%%setup -q -n %{name}-all-%{version}
+%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
-%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -778,6 +777,9 @@ find . -name \*.rb -or -name \*.c | whil
 done
 set -x
 
+# cleanup
+find . -type d -path '*/sample/*.svn' | sort -r | xargs rm -rf
+
 %build
 ruby extconf.rb
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -804,7 +806,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnome2.pc
 
 %files -n ruby-atk
 %defattr(-,root,root,-)
@@ -816,7 +818,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
-%{_libdir}/pkgconfig/atk-ruby.pc
+%{_libdir}/pkgconfig/ruby-atk.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -826,7 +828,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonobo2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonobo2.pc
 
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
@@ -836,7 +838,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonoboui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonoboui2.pc
 
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
@@ -846,7 +848,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gconf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gconf2.pc
 
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
@@ -856,7 +858,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gdkpixbuf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gdkpixbuf2.pc
 
 %files -n ruby-glib2
 %defattr(-,root,root,-)
@@ -874,7 +876,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
-%{_libdir}/pkgconfig/glib-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-glib2.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -884,7 +886,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomecanvas2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomecanvas2.pc
 
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
@@ -895,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-gnomeprint2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rblibgnomeprintversion.h
-%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprint2.pc
 
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
@@ -905,7 +907,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomeprintui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprintui2.pc
 
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
@@ -915,7 +917,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomevfs-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomevfs.pc
 
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
@@ -925,7 +927,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-goocanvas-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/goocanvas-ruby.pc
+%{_libdir}/pkgconfig/ruby-goocanvas.pc
 
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
@@ -935,7 +937,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gstreamer-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+%{_libdir}/pkgconfig/ruby-gstreamer.pc
 
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
@@ -946,6 +948,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/gtk2/base.rb
 #%{ruby_sitelib}/gtk2/base.rb
 %{ruby_sitearch}/gtk2.so
+# For now include gio here
+%{ruby_sitelib}/gio2.rb
+%{ruby_sitearch}/gio2.so
 
 %files -n ruby-gtk2-devel
 %defattr(-,root,root,-)
@@ -954,7 +959,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
-%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtk2.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -964,7 +969,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkglext-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkglext.pc
 
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
@@ -974,7 +979,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkhtml2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkhtml2.pc
 
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
@@ -984,7 +989,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkmozembed-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkmozembed.pc
 
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
@@ -994,7 +999,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview.pc
 
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
@@ -1004,7 +1009,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview2.pc
 
 %files -n ruby-libart2
 %defattr(-,root,root,-)
@@ -1015,7 +1020,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
-%{_libdir}/pkgconfig/libart-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libart2.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -1027,7 +1032,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-libglade2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libglade2.pc
 
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
@@ -1037,7 +1042,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-panelapplet2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-panelapplet2.pc
 
 %files -n ruby-pango
 %defattr(-,root,root,-)
@@ -1049,7 +1054,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
-%{_libdir}/pkgconfig/pango-ruby.pc
+%{_libdir}/pkgconfig/ruby-pango.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -1059,7 +1064,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-poppler-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/poppler-ruby.pc
+%{_libdir}/pkgconfig/ruby-poppler.pc
 
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
@@ -1069,7 +1074,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-rsvg-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-rsvg2.pc
 
 %files -n ruby-vte
 %defattr(-,root,root,-)
@@ -1077,13 +1082,17 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
-%if 0
 %files -n ruby-vte-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/vte-ruby.pc
-%endif
+%{_libdir}/pkgconfig/ruby-vte.pc
+
 
 %changelog
+* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try rev 3690
+- Massive pkgconfig files renaming
+- Enable gio support
+
 * Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - release++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Aug 2009 19:02:23 -0000	1.8
+++ sources	22 Sep 2009 03:22:08 -0000	1.9
@@ -1 +1 @@
-d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz
+1639f62d1f30cba03d1a14b283632f65  ruby-gnome2-all-0.19.2-svn3690_trunk.tar.gz


--- ruby-gnome2-0.19.1-vte-depend.patch DELETED ---



From mclasen at fedoraproject.org  Tue Sep 22 03:22:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:22:13 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.66, 1.67 evince.spec, 1.168,
	1.169 sources, 1.65, 1.66
Message-ID: <20090922032213.0252811C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31258

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	12 Aug 2009 03:20:07 -0000	1.66
+++ .cvsignore	22 Sep 2009 03:22:12 -0000	1.67
@@ -1 +1 @@
-evince-2.27.90.tar.bz2
+evince-2.28.0.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- evince.spec	12 Aug 2009 03:20:07 -0000	1.168
+++ evince.spec	22 Sep 2009 03:22:12 -0000	1.169
@@ -5,14 +5,14 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.27.90
+Version:	2.28.0
 Release:	1%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
 Group:		Applications/Publishing
 URL:		http://projects.gnome.org/evince/
-Source0:	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=455759
 # Patch1:		duplex-copies.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -257,6 +257,9 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	12 Aug 2009 03:20:07 -0000	1.65
+++ sources	22 Sep 2009 03:22:12 -0000	1.66
@@ -1 +1 @@
-94d998e7e2facf68bd1bc78d032248ba  evince-2.27.90.tar.bz2
+66548bf1467f92924a7230869139adb5  evince-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 03:23:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:23:32 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.35, 1.36 cheese.spec, 1.62,
	1.63 sources, 1.35, 1.36
Message-ID: <20090922032332.D926411C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31738

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	8 Sep 2009 00:24:09 -0000	1.35
+++ .cvsignore	22 Sep 2009 03:23:32 -0000	1.36
@@ -1 +1 @@
-cheese-2.27.92.tar.bz2
+cheese-2.28.0.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- cheese.spec	8 Sep 2009 00:24:10 -0000	1.62
+++ cheese.spec	22 Sep 2009 03:23:32 -0000	1.63
@@ -1,12 +1,12 @@
 Name:           cheese
-Version:        2.27.92
+Version:        2.28.0
 Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://projects.gnome.org/cheese/
-Source0:        http://download.gnome.org/sources/cheese/2.27/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/cheese/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.17.3
@@ -126,6 +126,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen  <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	8 Sep 2009 00:24:10 -0000	1.35
+++ sources	22 Sep 2009 03:23:32 -0000	1.36
@@ -1 +1 @@
-3c1b1cc62d6ce7ba91124e075e6db77a  cheese-2.27.92.tar.bz2
+1f41665f670350fcb0bba93f60ffef5c  cheese-2.28.0.tar.bz2



From petersen at fedoraproject.org  Tue Sep 22 03:25:59 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 03:25:59 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.2,
	1.3 ghc-rpm-macros.spec, 1.4, 1.5
Message-ID: <20090922032559.6FA5411C0082@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32504

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
version ghcdocdir to allow multiple doc versions like ghcpkgdir


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-rpm-macros.ghc	9 Jun 2009 09:24:58 -0000	1.2
+++ ghc-rpm-macros.ghc	22 Sep 2009 03:25:59 -0000	1.3
@@ -10,7 +10,7 @@ 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}}
+%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() \


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-rpm-macros.spec	25 Jul 2009 00:05:15 -0000	1.4
+++ ghc-rpm-macros.spec	22 Sep 2009 03:25:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
-Version:	0.2
-Release:	2%{?dist}
+Version:	0.2.1
+Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-1
+- version ghcdocdir to allow multiple doc versions like ghcpkgdir
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Sep 22 03:28:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:28:50 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.85, 1.86 gnome-applets.spec, 
	1.353, 1.354 sources, 1.97, 1.98
Message-ID: <20090922032850.189C811C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv829

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	8 Sep 2009 22:09:06 -0000	1.85
+++ .cvsignore	22 Sep 2009 03:28:49 -0000	1.86
@@ -1 +1 @@
-gnome-applets-2.27.92.tar.bz2
+gnome-applets-2.28.0.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -p -r1.353 -r1.354
--- gnome-applets.spec	8 Sep 2009 22:09:06 -0000	1.353
+++ gnome-applets.spec	22 Sep 2009 03:28:49 -0000	1.354
@@ -17,7 +17,6 @@
 %define gnome_utils_version 2.8.1
 %define dbus_version 0.90
 %define dbus_glib_version 0.70
-%define hal_version 0.5.3
 %define libnotify_version 0.3.2
 %define pygobject_version 2.6
 %define pygtk_version 2.6
@@ -33,13 +32,13 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.27.92
+Version:	2.28.0
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
-Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,7 +79,6 @@ BuildRequires:  libbonoboui-devel >= %{l
 BuildRequires:  libwnck-devel >= %{libwnck_version}
 BuildRequires:  gnome-desktop-devel >= %{libgnome_desktop_version}
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
-BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  pygobject2-devel >= %{pygobject_version}
 BuildRequires:  pygtk2-devel >= %{pygtk_version}
@@ -344,6 +342,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	8 Sep 2009 22:09:06 -0000	1.97
+++ sources	22 Sep 2009 03:28:49 -0000	1.98
@@ -1,2 +1,2 @@
-5b1c417ace3bc0083f0b8839709f40e4  gnome-applets-2.27.92.tar.bz2
+9eb00e9dc468d2c5c71b70c9fb2b751c  gnome-applets-2.28.0.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 03:32:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:32:03 +0000 (UTC)
Subject: rpms/gnome-common/devel .cvsignore, 1.7, 1.8 gnome-common.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20090922033203.54C9111C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1733

Modified Files:
	.cvsignore gnome-common.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Mar 2009 23:45:28 -0000	1.7
+++ .cvsignore	22 Sep 2009 03:32:03 -0000	1.8
@@ -1 +1 @@
-gnome-common-2.26.0.tar.bz2
+gnome-common-2.28.0.tar.bz2


Index: gnome-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gnome-common.spec	25 Jul 2009 00:35:59 -0000	1.17
+++ gnome-common.spec	22 Sep 2009 03:32:03 -0000	1.18
@@ -1,13 +1,13 @@
 Name:           gnome-common
-Version:        2.26.0
-Release:        3%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
 BuildArch:      noarch
 License:        GPLv2
 URL:            http://developer.gnome.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # from upstream
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Mar 2009 23:45:28 -0000	1.8
+++ sources	22 Sep 2009 03:32:03 -0000	1.9
@@ -1 +1 @@
-196daa38cb21d91da1d6ec085f1e158b  gnome-common-2.26.0.tar.bz2
+30daabb0ca4898fea2647999e7813e8f  gnome-common-2.28.0.tar.bz2



From dcantrel at fedoraproject.org  Tue Sep 22 03:34:15 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 22 Sep 2009 03:34:15 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.669, 1.670 anaconda.spec, 1.819, 
	1.820 sources, 1.803, 1.804
Message-ID: <20090922033415.F1F1611C0082@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2462

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 21 2009 David Cantrell <dcantrell at redhat.com> - 12.27-1
- Require at least system-config-keyboard 1.3.1 or higher. (dcantrell)
- Fixes for rhel installclass. (dcantrell)
- Start with all modules from kernel/drivers/s390 on s390x (#524566)
  (dcantrell)
- Do not require dhcpv6-client, package is now obsolete. (dcantrell)
- Take into account snapshots and mirrored volumes in lvm dialogs. (dlehman)
- Add handling for snapshot and mirrored logical volumes to DeviceTree.
  (dlehman)
- Add attrs to LVMLogicalVolumeDevice class for snapshots and mirrored lvs.
  (dlehman)
- Add function lvorigin to determine the name of a snapshot's origin lv.
  (dlehman)
- Add function udev_device_get_lv_attr to retrieve lv attribute strings.
  (dlehman)
- Include hidden volumes and lv attributes in udev db. (dlehman)
- Add 'install' user to start anaconda on s390x. (dcantrell)
- Set a default shell prompt for s390x installs. (dcantrell)
- Do not assume we found a module in addOption() in loader/modules.c
  (dcantrell)
- Do not try to load floppy, edd, pcspkr, or iscsi_ibft on s390x. (dcantrell)
- Handle Esc keypress in (some more) dialogs as Cancel - (#520110).
  (rvykydal)
- All the nss libraries have moved from /lib to /usr/lib (#524410). (clumens)
- Add python-nss as a requirement (#524307, #524313). (clumens)
- Call $LDSO --verify for the binary file -inside- the chroot. This fixes
  building x86 boot images on a x86_64 host system. (thomas.jarosch)
- Just grab everything in a /usr/share/fonts/lohit* directory (#523906).
  (clumens)
- Don't write an empty mdadm.conf (hdegoede)
- Write mdraid arrays to mdadm.conf in sorted order (hdegoede)
- containers and their sets must only have a UUID= parameter in mdamd.conf
  (hdegoede)
- Updated anaconda.pot file. (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -p -r1.669 -r1.670
--- .cvsignore	18 Sep 2009 01:01:37 -0000	1.669
+++ .cvsignore	22 Sep 2009 03:34:15 -0000	1.670
@@ -1 +1 @@
-anaconda-12.26.tar.bz2
+anaconda-12.27.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -p -r1.819 -r1.820
--- anaconda.spec	18 Sep 2009 01:01:37 -0000	1.819
+++ anaconda.spec	22 Sep 2009 03:34:15 -0000	1.820
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.26
+Version: 12.27
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -115,10 +115,11 @@ Requires: python-cryptsetup >= %{pythonc
 Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
-Requires: system-config-keyboard >= 1.3.0-3
+Requires: system-config-keyboard >= 1.3.1
 Requires: hal, dbus-python
 Requires: cracklib-python
 Requires: python-bugzilla
+Requires: python-nss
 %ifarch %livearches
 Requires: usermode
 Requires: zenity
@@ -138,7 +139,6 @@ Requires: isomd5sum
 Requires: yum-utils >= %{yumutilsver}
 Requires: NetworkManager >= %{nmver}
 Requires: dhclient
-Requires: dhcpv6-client
 Requires: anaconda-yum-plugins
 Requires: libselinux-python >= %{libselinuxver}
 %ifarch %{sparc}
@@ -215,6 +215,41 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Sep 21 2009 David Cantrell <dcantrell at redhat.com> - 12.27-1
+- Require at least system-config-keyboard 1.3.1 or higher. (dcantrell)
+- Fixes for rhel installclass. (dcantrell)
+- Start with all modules from kernel/drivers/s390 on s390x (#524566)
+  (dcantrell)
+- Do not require dhcpv6-client, package is now obsolete. (dcantrell)
+- Take into account snapshots and mirrored volumes in lvm dialogs. (dlehman)
+- Add handling for snapshot and mirrored logical volumes to DeviceTree.
+  (dlehman)
+- Add attrs to LVMLogicalVolumeDevice class for snapshots and mirrored lvs.
+  (dlehman)
+- Add function lvorigin to determine the name of a snapshot's origin lv.
+  (dlehman)
+- Add function udev_device_get_lv_attr to retrieve lv attribute strings.
+  (dlehman)
+- Include hidden volumes and lv attributes in udev db. (dlehman)
+- Add 'install' user to start anaconda on s390x. (dcantrell)
+- Set a default shell prompt for s390x installs. (dcantrell)
+- Do not assume we found a module in addOption() in loader/modules.c
+  (dcantrell)
+- Do not try to load floppy, edd, pcspkr, or iscsi_ibft on s390x. (dcantrell)
+- Handle Esc keypress in (some more) dialogs as Cancel - (#520110).
+  (rvykydal)
+- All the nss libraries have moved from /lib to /usr/lib (#524410). (clumens)
+- Add python-nss as a requirement (#524307, #524313). (clumens)
+- Call $LDSO --verify for the binary file -inside- the chroot. This fixes
+  building x86 boot images on a x86_64 host system. (thomas.jarosch)
+- Just grab everything in a /usr/share/fonts/lohit* directory (#523906).
+  (clumens)
+- Don't write an empty mdadm.conf (hdegoede)
+- Write mdraid arrays to mdadm.conf in sorted order (hdegoede)
+- containers and their sets must only have a UUID= parameter in mdamd.conf
+  (hdegoede)
+- Updated anaconda.pot file. (dcantrell)
+
 * Thu Sep 17 2009 David Cantrell <dcantrell at redhat.com> - 12.26-1
 - NetworkManagerSystemSettings.service no longer exists. (jkeating)
 - udevsettle is no longer used (udevadm settle is called instead) so don't


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -p -r1.803 -r1.804
--- sources	18 Sep 2009 01:01:37 -0000	1.803
+++ sources	22 Sep 2009 03:34:15 -0000	1.804
@@ -1 +1 @@
-7494d5f42675d01eb0c2e27cdc206ea0  anaconda-12.26.tar.bz2
+4e5feac42b9730ea97b87dab0ab0df57  anaconda-12.27.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 03:34:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 03:34:26 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.80,
	1.81 gnome-system-monitor.spec, 1.148, 1.149 sources, 1.80, 1.81
Message-ID: <20090922033426.D34C211C0082@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2518

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	14 Jul 2009 04:27:22 -0000	1.80
+++ .cvsignore	22 Sep 2009 03:34:26 -0000	1.81
@@ -1 +1 @@
-gnome-system-monitor-2.27.4.tar.bz2
+gnome-system-monitor-2.28.0.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- gnome-system-monitor.spec	9 Sep 2009 13:05:34 -0000	1.148
+++ gnome-system-monitor.spec	22 Sep 2009 03:34:26 -0000	1.149
@@ -11,12 +11,12 @@
 
 Summary: Process and resource monitor
 Name: gnome-system-monitor
-Version: 2.27.4
-Release: 4%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-system-monitor/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-system-monitor/2.28/%{name}-%{version}.tar.bz2
 Source1: about-this-computer.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: GConf2-devel
@@ -155,6 +155,9 @@ scrollkeeper-update -q
 
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-4
 - Include new translations for 'About this computer'
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	14 Jul 2009 04:27:22 -0000	1.80
+++ sources	22 Sep 2009 03:34:26 -0000	1.81
@@ -1 +1 @@
-c7bbae45719f8b1a167c0c0763ffe68a  gnome-system-monitor-2.27.4.tar.bz2
+341c8fda9b518729e04465705da62994  gnome-system-monitor-2.28.0.tar.bz2



From cweyl at fedoraproject.org  Tue Sep 22 03:51:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:51:00 +0000 (UTC)
Subject: rpms/perl-Net-SSH2/devel perl-Net-SSH2.spec,1.11,1.12
Message-ID: <20090922035100.D92CB11C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-SSH2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7720

Modified Files:
	perl-Net-SSH2.spec 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.21-5
- rebuild for libssh2 1.2



Index: perl-Net-SSH2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Net-SSH2.spec	21 Aug 2009 15:21:38 -0000	1.11
+++ perl-Net-SSH2.spec	22 Sep 2009 03:51:00 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH2
 Version:        0.21
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.21-5
+- rebuild for libssh2 1.2
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.21-4
 - rebuilt with new openssl
 



From cweyl at fedoraproject.org  Tue Sep 22 03:52:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:52:07 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.182,1.183
Message-ID: <20090922035207.55C1911C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8179

Modified Files:
	libvirt.spec 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.7.1-6
- rebuild for libssh2 1.2



Index: libvirt.spec
===================================================================
RCS file: /cvs/extras/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- libvirt.spec	21 Sep 2009 15:32:34 -0000	1.182
+++ libvirt.spec	22 Sep 2009 03:52:07 -0000	1.183
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 5%{?dist}%{?extra_release}
+Release: 6%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -777,6 +777,9 @@ fi
 %endif
 
 %changelog
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.7.1-6
+- rebuild for libssh2 1.2
+
 * Mon Sep 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-5
 - Don't set a bogus error in virDrvSupportsFeature()
 - Fix raw save format



From cweyl at fedoraproject.org  Tue Sep 22 03:52:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:52:18 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.115,1.116
Message-ID: <20090922035218.EA5B811C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8277

Modified Files:
	curl.spec 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 7.19.6-8
- rebuild for libssh2 1.2



Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- curl.spec	17 Sep 2009 12:28:23 -0000	1.115
+++ curl.spec	22 Sep 2009 03:52:18 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 7.19.6-8
+- rebuild for libssh2 1.2
+
 * Thu Sep 17 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-7
 - make curl test-suite more verbose
 



From cweyl at fedoraproject.org  Tue Sep 22 03:52:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:52:59 +0000 (UTC)
Subject: rpms/medusa/devel medusa.spec,1.5,1.6
Message-ID: <20090922035259.550AB11C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/medusa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8469

Modified Files:
	medusa.spec 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 1.5-10
- rebuild for libssh2 1.2



Index: medusa.spec
===================================================================
RCS file: /cvs/extras/rpms/medusa/devel/medusa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- medusa.spec	21 Aug 2009 14:31:01 -0000	1.5
+++ medusa.spec	22 Sep 2009 03:52:59 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Parallel brute forcing password cracker
 Name: medusa
 Version: 1.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://www.foofus.net/jmk/medusa/medusa.html
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_libdir}/medusa/*
 
 %changelog
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 1.5-10
+- rebuild for libssh2 1.2
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-9
 - rebuilt with new openssl
 



From cweyl at fedoraproject.org  Tue Sep 22 03:53:29 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:53:29 +0000 (UTC)
Subject: rpms/php-pecl-ssh2/devel php-pecl-ssh2.spec,1.5,1.6
Message-ID: <20090922035329.2E14A11C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/php-pecl-ssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8637

Modified Files:
	php-pecl-ssh2.spec 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.11.0-5
- rebuild for libssh2 1.2



Index: php-pecl-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-ssh2/devel/php-pecl-ssh2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pecl-ssh2.spec	26 Jul 2009 18:36:52 -0000	1.5
+++ php-pecl-ssh2.spec	22 Sep 2009 03:53:29 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:           php-pecl-ssh2
 Version:        0.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bindings for the libssh2 library
 
 License:        PHP
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.11.0-5
+- rebuild for libssh2 1.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Sep 22 03:53:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:53:50 +0000 (UTC)
Subject: rpms/libssh2/devel .cvsignore, 1.3, 1.4 libssh2.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <20090922035350.23A0311C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8751

Modified Files:
	.cvsignore libssh2.spec sources 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.2-2
- patch based on 683aa0f6b52fb1014873c961709102b5006372fc
- disable tests (*sigh*)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libssh2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Feb 2009 04:43:59 -0000	1.3
+++ .cvsignore	22 Sep 2009 03:53:49 -0000	1.4
@@ -1,7 +1 @@
-libssh2-1.0.tar.gz
-libssh2*
-*.gz
-*.tar
-*.rpm
-x86_64
-.build*
+libssh2-1.2.tar.gz


Index: libssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/libssh2/devel/libssh2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libssh2.spec	21 Aug 2009 14:22:18 -0000	1.9
+++ libssh2.spec	22 Sep 2009 03:53:49 -0000	1.10
@@ -1,14 +1,16 @@
 Name:           libssh2
-Version:        1.0 
-Release:        4%{?dist}
+Version:        1.2 
+Release:        2%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.libssh2.org/
-Source0:        http://downloads.sourceforge.net/libssh2/%{name}-%{version}.tar.gz
+Source0:        http://libssh2.org/download/libssh2-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         transport_c_7a9d369.patch
+
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel   
 
@@ -40,6 +42,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 
 # make sure things are UTF-8...
 for i in ChangeLog NEWS ; do
@@ -65,7 +68,8 @@ rm -rf example/simple/.deps 
 find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} +
 
 %check
-(cd tests && make check)
+# tests are currently not doing so well under rpmbuild 
+#(cd tests && make check)
 
 %clean
 rm -rf %{buildroot}
@@ -93,6 +97,13 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.2-2
+- patch based on 683aa0f6b52fb1014873c961709102b5006372fc
+- disable tests (*sigh*)
+
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.2-1
+- update to 1.2
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-4
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libssh2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Feb 2009 04:43:59 -0000	1.3
+++ sources	22 Sep 2009 03:53:49 -0000	1.4
@@ -1 +1 @@
-c3602adae912702ba9cbefbe813b7b5b  libssh2-1.0.tar.gz
+751f4b5b5d8091f84cfe25fa52226cf9  libssh2-1.2.tar.gz



From cweyl at fedoraproject.org  Tue Sep 22 03:56:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 03:56:36 +0000 (UTC)
Subject: rpms/libssh2/devel transport_c_7a9d369.patch,NONE,1.1
Message-ID: <20090922035636.4354C11C0082@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9776

Added Files:
	transport_c_7a9d369.patch 
Log Message:
* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.2-2
- patch based on 683aa0f6b52fb1014873c961709102b5006372fc
- disable tests (*sigh*)


transport_c_7a9d369.patch:
 transport.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE transport_c_7a9d369.patch ---
diff --git a/src/transport.c b/src/transport.c
index 19efdf2..d9a38ca 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -626,7 +626,7 @@ send_existing(LIBSSH2_SESSION * session, unsigned char *data,
 
     p->osent += rc;         /* we sent away this much data */
 
-    return PACKET_NONE;
+    return p->osent < data_len ? PACKET_EAGAIN : PACKET_NONE;
 }
 
 /*



From tgl at fedoraproject.org  Tue Sep 22 04:29:57 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 22 Sep 2009 04:29:57 +0000 (UTC)
Subject: rpms/mysql/devel .cvsignore, 1.41, 1.42 mysql-ndb-stacksize.patch,
	1.1, 1.2 mysql.spec, 1.128, 1.129 sources, 1.41, 1.42
Message-ID: <20090922042957.4761411C00E8@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9691

Modified Files:
	.cvsignore mysql-ndb-stacksize.patch mysql.spec sources 
Log Message:
Update to MySQL 5.1.39


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	3 Aug 2009 02:23:58 -0000	1.41
+++ .cvsignore	22 Sep 2009 04:29:56 -0000	1.42
@@ -1 +1 @@
-mysql-5.1.37.tar.gz
+mysql-5.1.39.tar.gz

mysql-ndb-stacksize.patch:
 AsyncFile.cpp |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Index: mysql-ndb-stacksize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-ndb-stacksize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-ndb-stacksize.patch	15 Apr 2009 19:48:31 -0000	1.1
+++ mysql-ndb-stacksize.patch	22 Sep 2009 04:29:56 -0000	1.2
@@ -11,17 +11,21 @@ elsewhere.  At some point we might want 
 hack in NdbThread_Create().
 
 
-diff -Naur mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
---- mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-03-13 17:54:07.000000000 -0400
-+++ mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-04-15 14:00:04.000000000 -0400
-@@ -106,8 +106,8 @@
+diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-04 12:21:19.000000000 -0400
++++ mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-21 22:33:08.000000000 -0400
+@@ -106,13 +106,8 @@
  AsyncFile::doStart() 
  {
    // Stacksize for filesystem threads
--  // An 8k stack should be enough
--  const NDB_THREAD_STACKSIZE stackSize = 8192;
+-#if !defined(DBUG_OFF) && defined (__hpux)
+-  // Empirical evidence indicates at least 32k
 +  // don't make this too small
-+  const NDB_THREAD_STACKSIZE stackSize = 32768;
+   const NDB_THREAD_STACKSIZE stackSize = 32768;
+-#else
+-  // Otherwise an 8k stack should be enough
+-  const NDB_THREAD_STACKSIZE stackSize = 8192;
+-#endif
  
    char buf[16];
    numAsyncFiles++;


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- mysql.spec	1 Sep 2009 03:35:23 -0000	1.128
+++ mysql.spec	22 Sep 2009 04:29:56 -0000	1.129
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.37
-Release: 5%{?dist}
+Version: 5.1.39
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -642,6 +642,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Sep 22 2009 Tom Lane <tgl at redhat.com> 5.1.39-1
+- Update to MySQL 5.1.39, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html
+
 * Mon Aug 31 2009 Tom Lane <tgl at redhat.com> 5.1.37-5
 - Work around unportable assumptions about stpcpy(); re-enable main.mysql test
 - Clean up some obsolete parameters to the configure script


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	3 Aug 2009 02:23:58 -0000	1.41
+++ sources	22 Sep 2009 04:29:57 -0000	1.42
@@ -1 +1 @@
-cbdb8783b053019755ee9196f67ea04c  mysql-5.1.37.tar.gz
+55a398daeb69a778fc46573623143268  mysql-5.1.39.tar.gz



From mclasen at fedoraproject.org  Tue Sep 22 04:40:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 04:40:16 +0000 (UTC)
Subject: rpms/gconf-editor/devel .cvsignore, 1.33, 1.34 gconf-editor.spec,
	1.72, 1.73 sources, 1.33, 1.34
Message-ID: <20090922044016.AEE2011C0423@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12701

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	25 Aug 2009 01:35:39 -0000	1.33
+++ .cvsignore	22 Sep 2009 04:40:16 -0000	1.34
@@ -1 +1 @@
-gconf-editor-2.27.91.tar.bz2
+gconf-editor-2.28.0.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- gconf-editor.spec	25 Aug 2009 01:35:39 -0000	1.72
+++ gconf-editor.spec	22 Sep 2009 04:40:16 -0000	1.73
@@ -7,10 +7,10 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.27.91
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gconf-editor/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.28/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,6 +105,9 @@ fi
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	25 Aug 2009 01:35:39 -0000	1.33
+++ sources	22 Sep 2009 04:40:16 -0000	1.34
@@ -1 +1 @@
-a5d6b03d819b1f16d6d4a4419719a6eb  gconf-editor-2.27.91.tar.bz2
+f3f19df4ce47ca27bf69d355f24ac5ba  gconf-editor-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 04:42:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 04:42:20 +0000 (UTC)
Subject: rpms/gnome-games-extra-data/devel .cvsignore, 1.10,
	1.11 gnome-games-extra-data.spec, 1.16, 1.17 sources, 1.10, 1.11
Message-ID: <20090922044220.9BC5C11C0375@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games-extra-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13352

Modified Files:
	.cvsignore gnome-games-extra-data.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games-extra-data/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	16 Mar 2009 16:15:03 -0000	1.10
+++ .cvsignore	22 Sep 2009 04:42:20 -0000	1.11
@@ -1 +1 @@
-gnome-games-extra-data-2.26.0.tar.bz2
+gnome-games-extra-data-2.28.0.tar.bz2


Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gnome-games-extra-data.spec	25 Jul 2009 00:38:47 -0000	1.16
+++ gnome-games-extra-data.spec	22 Sep 2009 04:42:20 -0000	1.17
@@ -4,11 +4,11 @@
 
 Summary: Additional data for gnome-games
 Name: gnome-games-extra-data
-Version: 2.26.0
-Release: 2
+Version: 2.28.0
+Release: 1
 License: GPL+
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games-extra-data/2.26/gnome-games-extra-data-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games-extra-data/2.28/gnome-games-extra-data-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildArch: noarch
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games-extra-data/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Mar 2009 16:15:03 -0000	1.10
+++ sources	22 Sep 2009 04:42:20 -0000	1.11
@@ -1 +1 @@
-fbcfebfeefd3de4b6883c39a4ce3e0f4  gnome-games-extra-data-2.26.0.tar.bz2
+a9f6ca8a2ae28659feb4ee3254020115  gnome-games-extra-data-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 04:45:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 04:45:56 +0000 (UTC)
Subject: rpms/gnome-common/devel gnome-common.spec,1.18,1.19
Message-ID: <20090922044556.8ABA811C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15137

Modified Files:
	gnome-common.spec 
Log Message:
drop obsolete patch



Index: gnome-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gnome-common.spec	22 Sep 2009 03:32:03 -0000	1.18
+++ gnome-common.spec	22 Sep 2009 04:45:56 -0000	1.19
@@ -10,9 +10,6 @@ URL:            http://developer.gnome.o
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# from upstream
-Patch0: automake-1.11.patch
-
 # Hmmm.... gnome-common needs all of these.  But it doesn't necessarily need
 # a particular version.  We could install automake14 and not automake, for
 # instance, and things would still work....  Is it better to drop requirements
@@ -35,7 +32,6 @@ a GNOME application.
 
 %prep
 %setup -q
-%patch0 -p1 -b .automake-1.11
 
 %build
 %configure



From mclasen at fedoraproject.org  Tue Sep 22 04:48:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 04:48:43 +0000 (UTC)
Subject: rpms/gnome-games-extra-data/devel gnome-games-extra-data.spec, 1.17,
	1.18
Message-ID: <20090922044843.1C02611C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games-extra-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15845

Modified Files:
	gnome-games-extra-data.spec 
Log Message:
update file lists



Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gnome-games-extra-data.spec	22 Sep 2009 04:42:20 -0000	1.17
+++ gnome-games-extra-data.spec	22 Sep 2009 04:48:42 -0000	1.18
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%doc AUTHORS COPYING MAINTAINERS README NEWS
+%doc AUTHORS COPYING README NEWS
 %{_datadir}/gnome-games/same-gnome/themes/2.10/*
 %{_datadir}/gnome-games/glines/pixmaps/*
 %{_datadir}/gnome-games/gnobots2/pixmaps/*



From mclasen at fedoraproject.org  Tue Sep 22 04:50:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 04:50:30 +0000 (UTC)
Subject: rpms/eog-plugins/devel .cvsignore, 1.3, 1.4 eog-plugins.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <20090922045030.3226C11C0418@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16310

Modified Files:
	.cvsignore eog-plugins.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Sep 2009 22:49:01 -0000	1.3
+++ .cvsignore	22 Sep 2009 04:50:29 -0000	1.4
@@ -1 +1 @@
-eog-plugins-2.27.92.tar.bz2
+eog-plugins-2.28.0.tar.bz2


Index: eog-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/eog-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eog-plugins.spec	8 Sep 2009 22:49:01 -0000	1.4
+++ eog-plugins.spec	22 Sep 2009 04:50:29 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           eog-plugins
-Version:        2.27.92
+Version:        2.28.0
 Release:        1%{?dist}
 Summary:        A collection of plugins for the eog image viewer
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://live.gnome.org/EyeOfGnome/Plugins
-Source0:        http://download.gnome.org/sources/eog-plugins/2.27/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/eog-plugins/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  eog-devel
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Sep 2009 22:49:01 -0000	1.3
+++ sources	22 Sep 2009 04:50:29 -0000	1.4
@@ -1 +1 @@
-88e1afeaeb0c178096ed3f444bd54cb5  eog-plugins-2.27.92.tar.bz2
+f64a4d616eb386a9b128bd04cd6e71f6  eog-plugins-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 04:57:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 04:57:15 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.104, 1.105 gnome-games.spec,
	1.229, 1.230 sources, 1.109, 1.110
Message-ID: <20090922045715.253F311C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17789

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	8 Sep 2009 00:55:33 -0000	1.104
+++ .cvsignore	22 Sep 2009 04:57:14 -0000	1.105
@@ -1 +1 @@
-gnome-games-2.27.92.tar.bz2
+gnome-games-2.28.0.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- gnome-games.spec	8 Sep 2009 00:55:33 -0000	1.229
+++ gnome-games.spec	22 Sep 2009 04:57:14 -0000	1.230
@@ -45,12 +45,12 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games/2.27/gnome-games-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games/2.28/gnome-games-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=551455
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
@@ -485,6 +485,9 @@ fi
 
 
 %changelog
+* Mon Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- sources	8 Sep 2009 00:55:33 -0000	1.109
+++ sources	22 Sep 2009 04:57:14 -0000	1.110
@@ -1 +1 @@
-306b7d85a9b7985fde570e672edb9e3c  gnome-games-2.27.92.tar.bz2
+39101397625e931a74f40854eeb1d182  gnome-games-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 05:02:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:02:00 +0000 (UTC)
Subject: rpms/gnome-games-extra-data/devel gnome-games-extra-data.spec, 1.18,
	1.19
Message-ID: <20090922050200.4C7C711C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games-extra-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18948

Modified Files:
	gnome-games-extra-data.spec 
Log Message:
fix file list



Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gnome-games-extra-data.spec	22 Sep 2009 04:48:42 -0000	1.18
+++ gnome-games-extra-data.spec	22 Sep 2009 05:02:00 -0000	1.19
@@ -46,7 +46,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README NEWS
 %{_datadir}/gnome-games/same-gnome/themes/2.10/*
 %{_datadir}/gnome-games/glines/pixmaps/*
-%{_datadir}/gnome-games/gnobots2/pixmaps/*
 %{_datadir}/gnome-games/gnometris/pixmaps/*
 %{_datadir}/gnome-games/iagno/pixmaps/*
 %{_datadir}/gnome-games/mahjongg/pixmaps/*



From mtruch at fedoraproject.org  Tue Sep 22 05:15:08 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Tue, 22 Sep 2009 05:15:08 +0000 (UTC)
Subject: rpms/getdata/devel getdata-mstrings.diff, NONE, 1.1 getdata.spec,
	1.7, 1.8
Message-ID: <20090922051508.95A7A11C00E8@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22578

Modified Files:
	getdata.spec 
Added Files:
	getdata-mstrings.diff 
Log Message:
Include upstream bugfix patch, as well as properly install fortran .mod.


getdata-mstrings.diff:
 meta_list.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE getdata-mstrings.diff ---
diff -ur getdata-0.5.0/src/meta_list.c getdata-0.5.0-tests-fixed/src/meta_list.c
--- getdata-0.5.0/src/meta_list.c	2008-11-23 19:08:56.000000000 -0500
+++ getdata-0.5.0-tests-fixed/src/meta_list.c	2009-09-18 23:01:01.000000000 -0400
@@ -123,7 +123,7 @@
     if (e->meta_entry[i]->field_type == GD_STRING_ENTRY)
       fl[n++] = e->meta_entry[i]->e->string;
   }
-  fl[i] = NULL;
+  fl[n] = NULL;
 
   e->string_value_list = (const char**)fl;
 


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/devel/getdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- getdata.spec	24 Jul 2009 23:54:16 -0000	1.7
+++ getdata.spec	22 Sep 2009 05:15:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://getdata.sourcefor
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         getdata-mstrings.diff
+
 BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
@@ -24,6 +26,7 @@ Group:  Development/Libraries
 Summary: Headers required when building programs against getdata
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: gcc-gfortran%{_isa}
 
 %description devel
 Headers required when building a program against the GetData library.
@@ -51,10 +54,11 @@ Does not yet allow writing of bzip2 enco
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static --enable-modules --enable-debug
+%configure --disable-static --enable-modules
 make %{?_smp_mflags}
 
 %check
@@ -68,6 +72,9 @@ make DESTDIR=%{buildroot} SUID_ROOT="" i
 rm -f %{buildroot}/%{_libdir}/lib*.la
 # Remove simple docs, as we install them ourselves (along with others)
 rm -f %{buildroot}/%{_datadir}/doc/%{name}/*
+# Place fortran module in the correct location
+mkdir -p %{buildroot}/%{_fmoddir}
+mv %{buildroot}/%{_includedir}/getdata.mod  %{buildroot}/%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot}
@@ -92,6 +99,7 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/getdata.pc
+%{_fmoddir}/getdata.mod
 
 %files gzip
 %defattr(-,root,root,-)
@@ -102,6 +110,13 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Mon Sep 21 2009 Matthew Truch <matt at truch.net> - 0.5.0-5
+- Include bugfix from upstream.
+- Put fortran module in correct place. BZ 523539
+
+* Mon Jul 27 2009 Matthew Truch <matt at truch.net> - 0.5.0-4
+- Disable verbose debugging output.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Sep 22 05:15:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:15:49 +0000 (UTC)
Subject: rpms/gnome-games-extra-data/devel gnome-games-extra-data.spec, 1.19,
	1.20
Message-ID: <20090922051549.3911911C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games-extra-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22913

Modified Files:
	gnome-games-extra-data.spec 
Log Message:
fix file lists



Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnome-games-extra-data.spec	22 Sep 2009 05:02:00 -0000	1.19
+++ gnome-games-extra-data.spec	22 Sep 2009 05:15:49 -0000	1.20
@@ -46,6 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README NEWS
 %{_datadir}/gnome-games/same-gnome/themes/2.10/*
 %{_datadir}/gnome-games/glines/pixmaps/*
+%{_datadir}/gnome-games/gnobots2/themes/*
 %{_datadir}/gnome-games/gnometris/pixmaps/*
 %{_datadir}/gnome-games/iagno/pixmaps/*
 %{_datadir}/gnome-games/mahjongg/pixmaps/*



From mclasen at fedoraproject.org  Tue Sep 22 05:21:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:21:36 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.230,1.231
Message-ID: <20090922052136.9C9EB11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24145

Modified Files:
	gnome-games.spec 
Log Message:
2.28.0



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- gnome-games.spec	22 Sep 2009 04:57:14 -0000	1.230
+++ gnome-games.spec	22 Sep 2009 05:21:36 -0000	1.231
@@ -391,8 +391,13 @@ fi
 %attr(2551, root, games) %{_bindir}/iagno
 %attr(2551, root, games) %{_bindir}/gnomine
 
+%{_mandir}/man6/same-gnome.6.gz
+%{_mandir}/man6/iagno.6.gz
+%{_mandir}/man6/gnomine.6.gz
+%{_mandir}/man6/gnome-sudoku.6.gz
+%{_mandir}/man6/sol.6.gz
 
-%files extra 
+%files extra
 %defattr(-, root, root)
 
 %{python_sitelib}/glchess
@@ -411,6 +416,18 @@ fi
 %{_datadir}/applications/gnome-mahjongg.desktop
 %{_datadir}/applications/gnometris.desktop
 
+%{_mandir}/man6/blackjack.6.gz
+%{_mandir}/man6/glchess.6.gz
+%{_mandir}/man6/glines.6.gz
+%{_mandir}/man6/gnect.6.gz
+%{_mandir}/man6/gnibbles.6.gz
+%{_mandir}/man6/gnobots2.6.gz
+%{_mandir}/man6/gnometris.6.gz
+%{_mandir}/man6/gnotravex.6.gz
+%{_mandir}/man6/gnotski.6.gz
+%{_mandir}/man6/gtali.6.gz
+%{_mandir}/man6/mahjongg.6.gz
+
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/glines.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnibbles.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnobots2.*



From mclasen at fedoraproject.org  Tue Sep 22 05:22:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:22:41 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.45, 1.46 gok.spec, 1.87, 1.88 sources, 
	1.45, 1.46
Message-ID: <20090922052241.B5C6911C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24593

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	7 Sep 2009 22:06:42 -0000	1.45
+++ .cvsignore	22 Sep 2009 05:22:41 -0000	1.46
@@ -1 +1 @@
-gok-2.27.92.tar.bz2
+gok-2.28.0.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- gok.spec	7 Sep 2009 22:06:43 -0000	1.87
+++ gok.spec	22 Sep 2009 05:22:41 -0000	1.88
@@ -2,12 +2,12 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://www.gok.ca/
-Source0: http://download.gnome.org/sources/gok/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gok/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: gok-0.10.2-launcher.patch
 Patch1: lm.patch
@@ -150,6 +150,9 @@ scrollkeeper-update -q
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	7 Sep 2009 22:06:43 -0000	1.45
+++ sources	22 Sep 2009 05:22:41 -0000	1.46
@@ -1 +1 @@
-15a661791e8c242c23f3b39f3474f2e7  gok-2.27.92.tar.bz2
+84a48b4caa35360d7b406236c21cc061  gok-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 05:24:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:24:11 +0000 (UTC)
Subject: rpms/gnome-mag/devel .cvsignore, 1.37, 1.38 gnome-mag.spec, 1.67,
	1.68 sources, 1.38, 1.39
Message-ID: <20090922052411.36D6B11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-mag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25153

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.15.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	28 Jul 2009 16:23:07 -0000	1.37
+++ .cvsignore	22 Sep 2009 05:24:10 -0000	1.38
@@ -1 +1 @@
-gnome-mag-0.15.8.tar.bz2
+gnome-mag-0.15.9.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gnome-mag.spec	28 Jul 2009 16:12:25 -0000	1.67
+++ gnome-mag.spec	22 Sep 2009 05:24:11 -0000	1.68
@@ -2,7 +2,7 @@
 
 Summary: Screen magnifier for GNOME
 Name: gnome-mag
-Version: 0.15.8
+Version: 0.15.9
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.9-1
+- Update to 0.15.9
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.8-1
 - Update to 0.15.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	28 Jul 2009 16:23:07 -0000	1.38
+++ sources	22 Sep 2009 05:24:11 -0000	1.39
@@ -1 +1 @@
-654232f153051e2052d96007b8bdd273  gnome-mag-0.15.8.tar.bz2
+db651bbd63f4ae3cfeb344c42f80d206  gnome-mag-0.15.9.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 05:26:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:26:50 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.28, 1.29 mousetweaks.spec, 1.35,
	1.36 sources, 1.28, 1.29
Message-ID: <20090922052650.5BA7B11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25786

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	7 Sep 2009 22:11:42 -0000	1.28
+++ .cvsignore	22 Sep 2009 05:26:50 -0000	1.29
@@ -1 +1 @@
-mousetweaks-2.27.92.tar.bz2
+mousetweaks-2.28.0.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mousetweaks.spec	7 Sep 2009 22:11:42 -0000	1.35
+++ mousetweaks.spec	22 Sep 2009 05:26:50 -0000	1.36
@@ -1,11 +1,11 @@
 Name:		mousetweaks
-Version:	2.27.92
+Version:	2.28.0
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
 License:	GPLv3 and GFDL
 URL:		http://live.gnome.org/Mousetweaks/Home
-Source0:	http://download.gnome.org/sources/mousetweaks/2.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/mousetweaks/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
@@ -108,6 +108,9 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	7 Sep 2009 22:11:42 -0000	1.28
+++ sources	22 Sep 2009 05:26:50 -0000	1.29
@@ -1 +1 @@
-cfdbf3d6de0fd423ccdf0bb16493c64e  mousetweaks-2.27.92.tar.bz2
+92038b98c3d6815fc6c3699485bd04e1  mousetweaks-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 05:30:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:30:41 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.58, 1.59 orca.spec, 1.97, 1.98 sources,
	1.59, 1.60
Message-ID: <20090922053041.2314911C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26649

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	7 Sep 2009 21:58:49 -0000	1.58
+++ .cvsignore	22 Sep 2009 05:30:40 -0000	1.59
@@ -1 +1 @@
-orca-2.27.92.tar.bz2
+orca-2.28.0.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- orca.spec	7 Sep 2009 21:58:49 -0000	1.97
+++ orca.spec	22 Sep 2009 05:30:40 -0000	1.98
@@ -17,14 +17,14 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.27.92
+Version:	2.28.0
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
 Group:		User Interface/Desktops
 License:	LGPLv2+
 URL:		http://projects.gnome.org/orca/
-Source0:	http://download.gnome.org/sources/orca/2.27/orca-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/orca/2.28/orca-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel >= %{python_version}
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	7 Sep 2009 21:58:49 -0000	1.59
+++ sources	22 Sep 2009 05:30:40 -0000	1.60
@@ -1 +1 @@
-5d8438c08c653917e69b9e1c66f54491  orca-2.27.92.tar.bz2
+611b83b2200f78e82af2565aa66dfa28  orca-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 05:48:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:48:17 +0000 (UTC)
Subject: rpms/control-center/devel .cvsignore, 1.94, 1.95 control-center.spec,
	1.486, 1.487 sources, 1.97, 1.98
Message-ID: <20090922054817.75DC511C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30631

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- .cvsignore	25 Aug 2009 03:40:33 -0000	1.94
+++ .cvsignore	22 Sep 2009 05:48:16 -0000	1.95
@@ -1 +1 @@
-gnome-control-center-2.27.91.tar.bz2
+gnome-control-center-2.28.0.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -p -r1.486 -r1.487
--- control-center.spec	10 Sep 2009 03:57:35 -0000	1.486
+++ control-center.spec	22 Sep 2009 05:48:16 -0000	1.487
@@ -23,12 +23,12 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.27.91
+Version: 2.28.0
 Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
-Source: http://download.gnome.org/sources/gnome-control-center/2.27/gnome-control-center-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-control-center/2.28/gnome-control-center-%{version}.tar.bz2
 Source1: org.gnome.control-center.defaultbackground.policy
 
 Patch3: control-center-2.19.3-no-gnome-common.patch
@@ -384,6 +384,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-6
 - Fix desktop files to be valid, and fix nonexisting icon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	25 Aug 2009 03:40:33 -0000	1.97
+++ sources	22 Sep 2009 05:48:17 -0000	1.98
@@ -1 +1 @@
-fffc2c207a11f3f4d97828514200e61e  gnome-control-center-2.27.91.tar.bz2
+c0e009ed5d94d12a183b61136dd908de  gnome-control-center-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 22 05:54:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 05:54:32 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.28, 1.29 brasero.spec, 1.63,
	1.64 sources, 1.28, 1.29
Message-ID: <20090922055433.1123111C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31821

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
fix spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	8 Sep 2009 00:07:32 -0000	1.28
+++ .cvsignore	22 Sep 2009 05:54:30 -0000	1.29
@@ -1 +1 @@
-brasero-2.27.92.tar.bz2
+brasero-2.28.0.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- brasero.spec	11 Sep 2009 19:14:05 -0000	1.63
+++ brasero.spec	22 Sep 2009 05:54:30 -0000	1.64
@@ -1,11 +1,11 @@
 Name:      brasero
-Version:   2.27.92
-Release:   2%{?dist}
+Version:   2.28.0
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.27/%{name}-%{version}.tar.bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.15.6
@@ -205,6 +205,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Sep 11 2009 Karsten Hopp <karsten at redhat.com> 2.27.92-2
 - fix requirements on s390, s390x where we don't have cdrdao
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	8 Sep 2009 00:07:32 -0000	1.28
+++ sources	22 Sep 2009 05:54:30 -0000	1.29
@@ -1 +1 @@
-32461934eeb0ed74a3f7ea033104e998  brasero-2.27.92.tar.bz2
+c88b85c15c03fd5198758c00f7375fa2  brasero-2.28.0.tar.bz2



From thomasj at fedoraproject.org  Tue Sep 22 05:54:46 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue, 22 Sep 2009 05:54:46 +0000 (UTC)
Subject: rpms/skrooge/F-10 skrooge.spec,1.1,1.2
Message-ID: <20090922055446.BDDC511C00E8@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31857

Modified Files:
	skrooge.spec 
Log Message:
* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
- Added -libs Requires libofx



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/skrooge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skrooge.spec	18 Sep 2009 09:56:36 -0000	1.1
+++ skrooge.spec	22 Sep 2009 05:54:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.1
-Release:        0.3.beta%{?dist}
+Release:        0.5.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -16,7 +16,9 @@ BuildRequires:  sqlite-devel
 BuildRequires:  kdelibs4-devel
 BuildRequires:  gettext
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -30,6 +32,8 @@ categorize them, and build reports of th
 Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       kdelibs4%{?_isa} >= %{kde4_version}
+Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -40,7 +44,7 @@ Skrooge libraries
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -48,8 +52,11 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install -C %{_target_platform} DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
+# hack to support non-oxygen icon users (gnome), drop when/if skrooge
+# ever provides hicolor icons (too).
+mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor 
 
 ## unpackaged devel files
 rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
@@ -78,12 +85,16 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun
 if [ $1 -eq 0 ] ; then
-   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+   touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+   update-desktop-database -q &> /dev/null
+   update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %files 
@@ -92,7 +103,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
 %{_kde4_appsdir}/skrooge/resources/*
@@ -107,12 +118,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README TODO
 %{_kde4_libdir}/kde4/plugins/designer/*.so*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
+- Added -libs Requires libofx
+
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
+- misc cosmetics
+- mime scriptlets
+- move icons to hicolor
+- -libs: drop dup'd docs, add min kdelibs4 dep
+
 * Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
 - Spec file corrections and Version correction
 



From whot at fedoraproject.org  Tue Sep 22 05:59:03 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 22 Sep 2009 05:59:03 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.75, 1.76 sources, 1.70,
	1.71 xorg-x11-server.spec, 1.488,
	1.489 xserver-1.4.99-endian.patch, 1.2, NONE
Message-ID: <20090922055903.5F70B11C00E8@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1705

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.4.99-endian.patch 
Log Message:
* Tue Sep 22 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.902-1
- xserver 1.6.99.902 
- cvs rm the now obsolete autoconf endian patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	15 Sep 2009 00:46:01 -0000	1.75
+++ .cvsignore	22 Sep 2009 05:59:02 -0000	1.76
@@ -1 +1 @@
-xorg-server-1.6.99.901.tar.bz2
+xorg-server-1.6.99.902.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	15 Sep 2009 00:46:01 -0000	1.70
+++ sources	22 Sep 2009 05:59:02 -0000	1.71
@@ -1 +1 @@
-f30ecd48ae45f5bbe62fd17e81ee28c3  xorg-server-1.6.99.901.tar.bz2
+ca914aa3b9a01c037fedcf7bc5964d73  xorg-server-1.6.99.902.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -p -r1.488 -r1.489
--- xorg-x11-server.spec	17 Sep 2009 20:06:21 -0000	1.488
+++ xorg-x11-server.spec	22 Sep 2009 05:59:02 -0000	1.489
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.99.901
-Release:   3%{dist}
+Version:   1.6.99.902
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -500,6 +500,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Sep 22 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.902-1
+- xserver 1.6.99.902 
+- cvs rm the now obsolete autoconf endian patch.
+
 * Thu Sep 17 2009 Kristian H?gsberg <krh at redhat.com> - 1.6.99.901-3
 - Back out pageflip patch and follow on patches.
 


--- xserver-1.4.99-endian.patch DELETED ---



From petersen at fedoraproject.org  Tue Sep 22 06:01:38 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 06:01:38 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.127,1.128
Message-ID: <20090922060138.6E3BE11C00E8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1457

Modified Files:
	comps-f12.xml.in 
Log Message:
- add fedora-security-guide-en-US to @books
- add @books to Development category as a placeholder home for f12



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- comps-f12.xml.in	22 Sep 2009 00:22:03 -0000	1.127
+++ comps-f12.xml.in	22 Sep 2009 06:01:37 -0000	1.128
@@ -483,6 +483,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">diveintopython</packagereq>
+      <packagereq type="default">fedora-security-guide-en-US</packagereq>
       <packagereq type="default">javanotes</packagereq>
       <packagereq type="default">ldd-pdf</packagereq>
     </packagelist>
@@ -6346,6 +6347,7 @@
     <_description>Packages which provide functionality for developing and building applications.</_description>
     <display_order>70</display_order>
     <grouplist>
+      <groupid>books</groupid>
       <groupid>development-libs</groupid>
       <groupid>development-tools</groupid>
       <groupid>eclipse</groupid>



From petersen at fedoraproject.org  Tue Sep 22 06:21:02 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 06:21:02 +0000 (UTC)
Subject: rpms/ghc-ghc-paths/devel ghc-ghc-paths.spec,1.4,1.5
Message-ID: <20090922062102.8777711C00E8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-ghc-paths/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9186

Modified Files:
	ghc-ghc-paths.spec 
Log Message:
rebuild to test versioned ghcdocdir in ghc-rpm-macros


Index: ghc-ghc-paths.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-ghc-paths/devel/ghc-ghc-paths.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-ghc-paths.spec	25 Jul 2009 00:04:12 -0000	1.4
+++ ghc-ghc-paths.spec	22 Sep 2009 06:21:00 -0000	1.5
@@ -8,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.1.0.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Interface to GHC's installation directories
 
 Group:          Development/Libraries
@@ -136,6 +136,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-9
+- rebuild to test versioned ghcdocdir in ghc-rpm-macros
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Sep 22 06:22:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 06:22:56 +0000 (UTC)
Subject: rpms/perl-Net-SSH2/devel .cvsignore, 1.4, 1.5 perl-Net-SSH2.spec,
	1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20090922062256.B832511C00E8@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-SSH2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10053

Modified Files:
	.cvsignore perl-Net-SSH2.spec sources 
Log Message:
* Tue Sep 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
- alter filtering
- auto-update to 0.27 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Jun 2009 05:43:45 -0000	1.4
+++ .cvsignore	22 Sep 2009 06:22:55 -0000	1.5
@@ -1 +1 @@
-Net-SSH2-0.21.tar.gz
+Net-SSH2-0.27.tar.gz


Index: perl-Net-SSH2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Net-SSH2.spec	22 Sep 2009 03:51:00 -0000	1.12
+++ perl-Net-SSH2.spec	22 Sep 2009 06:22:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH2
-Version:        0.21
-Release:        5%{?dist}
+Version:        0.27
+Release:        1%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -25,13 +25,8 @@ BuildRequires:  perl(Test::More)
 #BuildRequires: perl(IO::File)
 #BuildRequires: perl(Socket)
 
-
 # don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%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}"
-
+%{?perl_default_filter}
 
 %description
 Net::SSH2 is a perl interface to the libssh2 (http://www.libssh2.org)
@@ -71,11 +66,15 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Changes README example/ t/
-%{perl_vendorarch}/auto/*
-%{perl_vendorarch}/Net*
+%{perl_vendorarch}/*
+%exclude %dir %{perl_vendorarch}/auto
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
+- alter filtering
+- auto-update to 0.27 (by cpan-spec-update 0.01)
+
 * Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.21-5
 - rebuild for libssh2 1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jun 2009 05:43:45 -0000	1.3
+++ sources	22 Sep 2009 06:22:56 -0000	1.4
@@ -1 +1 @@
-22c5f91daffe0d51dbf68e388448006c  Net-SSH2-0.21.tar.gz
+892d7b82237c728bf72986d9756aad02  Net-SSH2-0.27.tar.gz



From mdbooth at fedoraproject.org  Tue Sep 22 06:31:02 2009
From: mdbooth at fedoraproject.org (Matthew Booth)
Date: Tue, 22 Sep 2009 06:31:02 +0000 (UTC)
Subject: rpms/perl-XML-XPathEngine/EL-5 perl-XML-XPathEngine.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090922063102.F2E8C11C00E8@cvs1.fedora.phx.redhat.com>

Author: mdbooth

Update of /cvs/pkgs/rpms/perl-XML-XPathEngine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12386

Modified Files:
	perl-XML-XPathEngine.spec sources 
Log Message:
Initial build for EL-5



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XPathEngine/EL-5/perl-XML-XPathEngine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-XPathEngine.spec	4 Sep 2007 10:13:08 -0000	1.2
+++ perl-XML-XPathEngine.spec	22 Sep 2009 06:31:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-XPathEngine
-Version:        0.08
-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,9 +47,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
-- Clarified license terms: GPL+ or Artistic
-
-* Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
-- Add BRs for Test::Pod and Test::Pod::Coverage
-- Specfile autogenerated by cpanspec 1.69.1.
+* Tue Sep 22 2009 Matthew Booth <mbooth at redhat.com> - 0.12-1
+- Initial build for EL-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XPathEngine/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Mar 2007 01:50:22 -0000	1.2
+++ sources	22 Sep 2009 06:31:02 -0000	1.3
@@ -1 +1 @@
-225f53d420d4fca50cd9d18b877780d6  XML-XPathEngine-0.08.tar.gz
+ecb1121f5a11411a2d4942c87d8725af  XML-XPathEngine-0.12.tar.gz



From xhorak at fedoraproject.org  Tue Sep 22 06:51:36 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 22 Sep 2009 06:51:36 +0000 (UTC)
Subject: rpms/thunderbird/F-11 .cvsignore, 1.24, 1.25 sources, 1.32,
	1.33 thunderbird-mozconfig, 1.16,
	1.17 thunderbird-shared-error.patch, 1.2, 1.3 thunderbird.spec,
	1.140, 1.141
Message-ID: <20090922065136.DAED611C00E8@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19480

Modified Files:
	.cvsignore sources thunderbird-mozconfig 
	thunderbird-shared-error.patch thunderbird.spec 
Log Message:
Update to 3.0 beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	21 Jul 2009 10:24:05 -0000	1.24
+++ .cvsignore	22 Sep 2009 06:51:35 -0000	1.25
@@ -2,3 +2,5 @@ thunderbird-langpacks-3.0-20090302.tar.b
 thunderbird-3.0b2-source.tar.bz2
 thunderbird-3.0b3-source.tar.bz2
 thunderbird-langpacks-3.0-20090721.tar.bz2
+thunderbird-3.0b4-source.tar.bz2
+thunderbird-langpacks-3.0b4-20090917.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	21 Jul 2009 10:24:05 -0000	1.32
+++ sources	22 Sep 2009 06:51:35 -0000	1.33
@@ -1,2 +1,2 @@
-84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
-f38cc1a9e69bff77e4eba2385272c671  thunderbird-langpacks-3.0-20090721.tar.bz2
+0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2
+296dace664509393536e5548b9a82bee  thunderbird-langpacks-3.0b4-20090917.tar.bz2


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-mozconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- thunderbird-mozconfig	6 Aug 2009 09:46:46 -0000	1.16
+++ thunderbird-mozconfig	22 Sep 2009 06:51:35 -0000	1.17
@@ -26,6 +26,9 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-crashreporter
+ac_add_options --disable-static
+ac_add_options --disable-static-mail
+#ac_add_options --enable-libxul
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

thunderbird-shared-error.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-shared-error.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunderbird-shared-error.patch	21 Jul 2009 10:24:05 -0000	1.2
+++ thunderbird-shared-error.patch	22 Sep 2009 06:51:35 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
---- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-07-13 14:56:36.000000000 +0200
-+++ thunderbird-3.0/mail/installer/Makefile.in	2009-07-14 12:41:16.000000000 +0200
-@@ -94,9 +94,11 @@ endif
+diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
+--- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
++++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
+@@ -95,9 +95,11 @@ endif
  # mozconfig instead.
  ifndef MAIL_PKG_SHARED
  ifndef BUILD_STATIC_LIBS
@@ -11,5 +11,5 @@ diff -up thunderbird-3.0/mail/installer/
  endif
 +endif
  
- include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
- 
+ # On mozilla-central, packager.mk uses core_abspath to redefine DIST
+ # As the comm-central config.mk doesn't set it, do it ourselves instead


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- thunderbird.spec	14 Aug 2009 08:41:10 -0000	1.140
+++ thunderbird.spec	22 Sep 2009 06:51:35 -0000	1.141
@@ -3,7 +3,7 @@
 %define nss_version 3.12.3
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
-%define version_internal 3.0b3
+%define version_internal 3.0b4
 %define build_langpacks 1
 
 %define official_branding 1
@@ -11,18 +11,18 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.6.b3%{?dist}
+Release:        2.7.b4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version}b3-source.tar.bz2 
+%define tarball thunderbird-%{version}b4-source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20090721.tar.bz2
+Source1:        thunderbird-langpacks-%{version}b4-20090917.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -83,7 +83,7 @@ Mozilla Thunderbird is a standalone mail
 
 %prep
 %setup -q -c
-#cd mozilla
+cd comm-central
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
@@ -108,7 +108,7 @@ Mozilla Thunderbird is a standalone mail
 #===============================================================================
 
 %build
-#cd mozilla
+cd comm-central
 
 # Build with -Os as it helps the browser; also, don't override mozilla's warning
 # level; they use -Wall but disable a few warnings that show up _everywhere_
@@ -133,7 +133,7 @@ make -f client.mk build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-#cd mozilla
+cd comm-central
 
 cd objdir-tb
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -239,7 +239,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files -f %{name}.lang
+%files -f comm-central/%{name}.lang
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
@@ -288,6 +288,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Sep 17 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.7
+- Update to 3.0 beta4
+
 * Thu Jul 16 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.6
 - Rebuild for update
 



From pbrobinson at fedoraproject.org  Tue Sep 22 07:09:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 07:09:30 +0000 (UTC)
Subject: rpms/tangogps/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tangogps.spec, 1.6, 1.7
Message-ID: <20090922070930.DEFD711C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23681

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.9.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Feb 2009 08:11:48 -0000	1.4
+++ .cvsignore	22 Sep 2009 07:09:25 -0000	1.5
@@ -1 +1 @@
-tangogps-0.9.6.tar.gz
+tangogps-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Feb 2009 08:11:48 -0000	1.4
+++ sources	22 Sep 2009 07:09:27 -0000	1.5
@@ -1 +1 @@
-85755b15099f6071776d6feb67bdbca8  tangogps-0.9.6.tar.gz
+168f30696c6024379d953d4c8b38ff2a  tangogps-0.9.7.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/tangogps.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tangogps.spec	27 Jul 2009 05:31:25 -0000	1.6
+++ tangogps.spec	22 Sep 2009 07:09:28 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           tangogps
-Version:        0.9.6
-Release:        4%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
 Group:          Applications/Productivity
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.7-1
+- New upstream 0.9.7 release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Sep 22 07:29:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Sep 2009 07:29:02 +0000 (UTC)
Subject: rpms/perl-RPC-XML/devel .cvsignore, 1.3, 1.4 perl-RPC-XML.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090922072902.CDFF511C00E8@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RPC-XML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29317

Modified Files:
	.cvsignore perl-RPC-XML.spec sources 
Log Message:
* Tue Sep 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.69-1
- auto-update to 0.69 (by cpan-spec-update 0.01)
- added a new br on perl(File::Spec) (version 0.8)
- altered br on perl(LWP) (0 => 5.801)
- added a new br on perl(Scalar::Util) (version 1.19)
- altered br on perl(XML::Parser) (0 => 2.31)
- added a new br on perl(constant) (version 1.03)
- added a new req on perl(File::Spec) (version 0.8)
- added a new req on perl(LWP) (version 5.801)
- added a new req on perl(Scalar::Util) (version 1.19)
- added a new req on perl(XML::Parser) (version 2.31)
- added a new req on perl(constant) (version 1.03)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Oct 2008 14:09:53 -0000	1.3
+++ .cvsignore	22 Sep 2009 07:29:00 -0000	1.4
@@ -1 +1 @@
-RPC-XML-0.64.tar.gz
+RPC-XML-0.69.tar.gz


Index: perl-RPC-XML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/devel/perl-RPC-XML.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-RPC-XML.spec	26 Jul 2009 16:19:00 -0000	1.5
+++ perl-RPC-XML.spec	22 Sep 2009 07:29:01 -0000	1.6
@@ -1,37 +1,50 @@
 %define real_name RPC-XML
 
 Name:    perl-RPC-XML
-Version: 0.64
-Release: 3%{?dist}
+Version: 0.69
+Release: 1%{?dist}
 Summary: Set of classes for core data, message and XML handling
 
 Group:   Development/Libraries
 License: Artistic 2.0 or LGPLv2
 URL:     http://search.cpan.org/dist/RPC-XML/
 
-Source0:   http://www.cpan.org/modules/by-module/RPC/%{real_name}-%{version}.tar.gz
+Source0:   http://search.cpan.org/CPAN/authors/id/R/RJ/RJRAY/RPC-XML-%{version}.tar.gz
 Source1:   README.license
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(LWP)
+BuildRequires: perl(LWP) >= 5.801
 BuildRequires: perl(Test::More)
-BuildRequires: perl(XML::Parser)
+BuildRequires: perl(XML::Parser) >= 2.31
+BuildRequires: perl(File::Spec) >= 0.8
+BuildRequires: perl(Scalar::Util) >= 1.19
+BuildRequires: perl(constant) >= 1.03
 # optional tests
 BuildRequires: perl(Net::Server)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
 
+Requires:       perl(File::Spec) >= 0.8
+Requires:       perl(LWP) >= 5.801
+Requires:       perl(Scalar::Util) >= 1.19
+Requires:       perl(XML::Parser) >= 2.31
+Requires:       perl(constant) >= 1.03
+
+%{?perl_default_filter:
+%filter_from_provides /perl(RPC::XML::Method)$/d
+%perl_default_filter
+}
+
 %package -n perl-Apache-RPC
 Summary: Companion packages for RPC::XML tuned for mod_perl environments
 Group:   Development/Libraries
 
-
 %description
 The RPC::XML package is an implementation of XML-RPC. The module provides
 classes for sample client and server implementations, a server designed as an
-Apache location-handler, and a suite of data-manipulation classes that are 
+Apache location-handler, and a suite of data-manipulation classes that are
 used by them.
 
 %description -n perl-Apache-RPC
@@ -43,18 +56,7 @@ running RPC::XML under mod_perl.
 %setup -qn %{real_name}-%{version}
 cp -p %{SOURCE1} .
 
-chmod -c -x t/* 
-
-#Filter unwanted Provides:
-#  RPC::XML::Method creates two entries for some reason?
-cat << \EOF > %{real_name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  %{__sed} -e '/perl(RPC::XML::Method)$/d'
-EOF
-
-%define __perl_provides %{_builddir}/%{real_name}-%{version}/%{real_name}-prov
-chmod +x %{__perl_provides}
+chmod -c -x t/*
 
 %build
 perl Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
@@ -90,6 +92,19 @@ rm -rf %{buildroot}
 %{perl_vendorlib}/Apache
 
 %changelog
+* Tue Sep 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.69-1
+- auto-update to 0.69 (by cpan-spec-update 0.01)
+- added a new br on perl(File::Spec) (version 0.8)
+- altered br on perl(LWP) (0 => 5.801)
+- added a new br on perl(Scalar::Util) (version 1.19)
+- altered br on perl(XML::Parser) (0 => 2.31)
+- added a new br on perl(constant) (version 1.03)
+- added a new req on perl(File::Spec) (version 0.8)
+- added a new req on perl(LWP) (version 5.801)
+- added a new req on perl(Scalar::Util) (version 1.19)
+- added a new req on perl(XML::Parser) (version 2.31)
+- added a new req on perl(constant) (version 1.03)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.64-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Oct 2008 14:09:53 -0000	1.3
+++ sources	22 Sep 2009 07:29:01 -0000	1.4
@@ -1 +1 @@
-cf1fd8b8a9f254e3a0298a3ad0282d90  RPC-XML-0.64.tar.gz
+98fa74810c72f3b05c987e6c8d5d83fb  RPC-XML-0.69.tar.gz



From pbrobinson at fedoraproject.org  Tue Sep 22 07:38:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 07:38:39 +0000 (UTC)
Subject: rpms/tangogps/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tangogps.spec, 1.5, 1.6
Message-ID: <20090922073839.A056C11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31822

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.9.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Feb 2009 08:11:48 -0000	1.4
+++ .cvsignore	22 Sep 2009 07:38:39 -0000	1.5
@@ -1 +1 @@
-tangogps-0.9.6.tar.gz
+tangogps-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Feb 2009 08:11:48 -0000	1.4
+++ sources	22 Sep 2009 07:38:39 -0000	1.5
@@ -1 +1 @@
-85755b15099f6071776d6feb67bdbca8  tangogps-0.9.6.tar.gz
+168f30696c6024379d953d4c8b38ff2a  tangogps-0.9.7.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/tangogps.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tangogps.spec	25 Feb 2009 18:27:46 -0000	1.5
+++ tangogps.spec	22 Sep 2009 07:38:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           tangogps
-Version:        0.9.6
-Release:        3%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
 Group:          Applications/Productivity
@@ -58,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.7-1
+- New upstream 0.9.7 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From msivak at fedoraproject.org  Tue Sep 22 07:42:56 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue, 22 Sep 2009 07:42:56 +0000 (UTC)
Subject: rpms/firstaidkit/devel firstaidkit.spec, 1.29, 1.30 sources, 1.12,
	1.13
Message-ID: <20090922074256.8AFF011C00E8@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv582

Modified Files:
	firstaidkit.spec sources 
Log Message:
new version



Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- firstaidkit.spec	17 Aug 2009 12:55:54 -0000	1.29
+++ firstaidkit.spec	22 Sep 2009 07:42:56 -0000	1.30
@@ -18,7 +18,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildArch:      noarch
-Requires:	dialog
+Requires:	newt
 
 %description
 A tool that automates simple and common system recovery tasks.
@@ -58,7 +58,7 @@ needed firstaidkit plugins.
 Group:          Applications/System
 Summary:        FirstAidKit GUI
 Requires:       %{name} = %{version}-%{release}
-Requires:       pygtk2, pygtk2-libglade
+Requires:       pygtk2, pygtk2-libglade, zenity
 
 %description gui
 This package contains the Gtk based FirstAidKit GUI
@@ -243,12 +243,11 @@ desktop-file-install --vendor="fedora" -
 #
 #%files plugin-rpm
 #%{_libdir}/firstaidkit/plugins/rpm_lowlevel/*
-#%{_libdir}/firstaidkit/plugins/rpm/*
+#
 
 %changelog
-* Mon Aug 17 2009 Joel Granados <jgranado at redhat.com> - 0.2.5-1
-- Update the pyparted API calls.
-- Add the key_recovery plugin.
+* Tue Sep 22 2009 Martin Sivak <msivak at redhat.com> - 0.2.5-1
+- Use whiptail instead of dialog for firstaidkit-qs
 
 * Tue Aug 04 2009 Martin Sivak <msivak at redhat.com> - 0.2.4-1
 - Fix temp file generation in firstaidkit-qs
@@ -347,3 +346,4 @@ desktop-file-install --vendor="fedora" -
 
 * Wed Jan 02 2008 Joel Granados <jgranado at redhat.com> 0.1.0-1
 - Initial spec
+%{_libdir}/firstaidkit/plugins/rpm/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Aug 2009 12:55:54 -0000	1.12
+++ sources	22 Sep 2009 07:42:56 -0000	1.13
@@ -1 +1 @@
-98b602cb19fa52d73773dd43db4e7d38  firstaidkit-0.2.5.tar.bz2
+7fa1cf8d7a514535c2e1896435327aaf  firstaidkit-0.2.5.tar.bz2



From transif at fedoraproject.org  Tue Sep 22 07:49:21 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 22 Sep 2009 07:49:21 +0000 (UTC)
Subject: comps/po ta.po,1.21,1.22
Message-ID: <20090922074921.8939F11C00E8@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2883/po

Modified Files:
	ta.po 
Log Message:
Sending translation for Tamil


Index: ta.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ta.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ta.po	31 Aug 2009 16:53:40 -0000	1.21
+++ ta.po	22 Sep 2009 07:49:19 -0000	1.22
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 16:30+0000\n"
-"PO-Revision-Date: 2009-08-31 22:19+0530\n"
+"POT-Creation-Date: 2009-09-22 04:31+0000\n"
+"PO-Revision-Date: 2009-09-22 13:13+0530\n"
 "Last-Translator: I. Felix <ifelix at redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -36,6 +36,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 #: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
@@ -1421,7 +1422,7 @@ msgstr "????????????????????????????????
 
 #: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
 msgid "Hiligaynon Support"
-msgstr "??????????????????????????? ????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
 #: ../comps-f13.xml.in.h:103
@@ -1547,13 +1548,17 @@ msgstr "???????????? ???????????????????
 msgid ""
 "A set of packages that provide the Critical Path functionality for the GNOME "
 "desktop"
-msgstr "GNOME ????????????????????????????????? ???????????????????????? ???????????? ???????????????????????????????????????????????? ????????? ??????????????????????????????????????? ??????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????"
+msgstr ""
+"GNOME ????????????????????????????????? ???????????????????????? ???????????? ???????????????????????????????????????????????? ????????? ??????????????????????????????????????? ??????????????? ?????????????????????????????? "
+"??????????????????????????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
 msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
-msgstr "????????????????????? Fedora ??????????????????????????????????????? ???????????????????????? ???????????? ???????????????????????????????????????????????? ????????? ??????????????????????????????????????? ??????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????"
+msgstr ""
+"????????????????????? Fedora ??????????????????????????????????????? ???????????????????????? ???????????? ???????????????????????????????????????????????? ????????? ??????????????????????????????????????? ??????????????? "
+"?????????????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1583,7 +1588,9 @@ msgstr "Haskell"
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ?????????????????? ????????? lightweight X11 ????????????????????? ??????????????? ????????? ????????????????????? ??????????????????????????? ?????????????????????????????????????????? ?????????????????????????????????, ?????????????????? ??????????????????????????? ?????????????????? ???????????? ??????????????????????????????????????? ???????????????????????????????????????????????????."
+msgstr ""
+"LXDE ?????????????????? ????????? lightweight X11 ????????????????????? ??????????????? ????????? ????????????????????? ??????????????????????????? ?????????????????????????????????????????? "
+"?????????????????????????????????, ?????????????????? ??????????????????????????? ?????????????????? ???????????? ??????????????????????????????????????? ???????????????????????????????????????????????????."
 
 #: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
 msgid "Machine and user identity servers."



From pbrobinson at fedoraproject.org  Tue Sep 22 07:49:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 07:49:28 +0000 (UTC)
Subject: rpms/tangogps/F-10 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 tangogps.spec, 1.4, 1.5
Message-ID: <20090922074928.AE24911C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2890

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.9.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Feb 2009 08:37:59 -0000	1.3
+++ .cvsignore	22 Sep 2009 07:49:28 -0000	1.4
@@ -1 +1 @@
-tangogps-0.9.6.tar.gz
+tangogps-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Feb 2009 08:16:12 -0000	1.4
+++ sources	22 Sep 2009 07:49:28 -0000	1.5
@@ -1 +1 @@
-85755b15099f6071776d6feb67bdbca8  tangogps-0.9.6.tar.gz
+168f30696c6024379d953d4c8b38ff2a  tangogps-0.9.7.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/tangogps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tangogps.spec	5 Feb 2009 08:37:59 -0000	1.4
+++ tangogps.spec	22 Sep 2009 07:49:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           tangogps
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
 Group:          Applications/Productivity
@@ -58,6 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.7-1
+- New upstream 0.9.7 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Feb 5  2009 Peter Robinson <pbrobinson at gmail.com> 0.9.6-2
 - Add BR: libexif-devel to support new photo geotagging
 



From msivak at fedoraproject.org  Tue Sep 22 07:55:22 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue, 22 Sep 2009 07:55:22 +0000 (UTC)
Subject: rpms/firstaidkit/devel .cvsignore, 1.9, 1.10 firstaidkit.spec, 1.30,
	1.31 sources, 1.13, 1.14
Message-ID: <20090922075522.C2D0911C00E8@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6224

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
fixed version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Aug 2009 12:55:54 -0000	1.9
+++ .cvsignore	22 Sep 2009 07:55:22 -0000	1.10
@@ -1 +1 @@
-firstaidkit-0.2.5.tar.bz2
+firstaidkit-0.2.6.tar.bz2


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- firstaidkit.spec	22 Sep 2009 07:42:56 -0000	1.30
+++ firstaidkit.spec	22 Sep 2009 07:55:22 -0000	1.31
@@ -246,9 +246,12 @@ desktop-file-install --vendor="fedora" -
 #
 
 %changelog
-* Tue Sep 22 2009 Martin Sivak <msivak at redhat.com> - 0.2.5-1
+* Tue Sep 22 2009 Martin Sivak <msivak at redhat.com> - 0.2.6-1
 - Use whiptail instead of dialog for firstaidkit-qs
 
+* Wed Aug 19 2009 Joel Granados <jgranado at redhat.com> - 0.2.5-1
+- Docs updated, new artwork
+
 * Tue Aug 04 2009 Martin Sivak <msivak at redhat.com> - 0.2.4-1
 - Fix temp file generation in firstaidkit-qs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 Sep 2009 07:42:56 -0000	1.13
+++ sources	22 Sep 2009 07:55:22 -0000	1.14
@@ -1 +1 @@
-7fa1cf8d7a514535c2e1896435327aaf  firstaidkit-0.2.5.tar.bz2
+ccf60dc442325cc9c3a4494143a7ae8a  firstaidkit-0.2.6.tar.bz2



From msivak at fedoraproject.org  Tue Sep 22 07:56:19 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue, 22 Sep 2009 07:56:19 +0000 (UTC)
Subject: rpms/firstaidkit/devel firstaidkit.spec,1.31,1.32
Message-ID: <20090922075619.E94E511C00E8@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6531

Modified Files:
	firstaidkit.spec 
Log Message:
fixed version again...



Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- firstaidkit.spec	22 Sep 2009 07:55:22 -0000	1.31
+++ firstaidkit.spec	22 Sep 2009 07:56:19 -0000	1.32
@@ -3,7 +3,7 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.5
+Version:        0.2.6
 Release:        1%{?dist}
 Summary:        System Rescue Tool
 



From hvad at fedoraproject.org  Tue Sep 22 08:01:15 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Tue, 22 Sep 2009 08:01:15 +0000 (UTC)
Subject: rpms/perl-Curses-UI/devel import.log, NONE, 1.1 perl-Curses-UI.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922080115.0493211C0374@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Curses-UI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8993/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Curses-UI.spec 
Log Message:



--- NEW FILE import.log ---
perl-Curses-UI-0_9607-2_fc10:HEAD:perl-Curses-UI-0.9607-2.fc10.src.rpm:1253613621


--- NEW FILE perl-Curses-UI.spec ---
Name:           perl-Curses-UI
Version:        0.9607
Release:        2%{?dist}
Summary:        Curses based OO user interface framework
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Curses-UI/
Source0:        http://www.cpan.org/authors/id/M/MD/MDXI/Curses-UI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Curses)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Term::ReadKey)
BuildRequires:  perl(Test::Simple)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Curses::UI is an object-oriented user interface framework for Perl.

%prep
%setup -q -n Curses-UI-%{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 CREDITS README INSTALL
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.9607-2
- Add require build 

* Mon Aug 03 2009 David Hannequin david.hannequin at gmail.com 0.9607-1
- First release 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:23:01 -0000	1.1
+++ .cvsignore	22 Sep 2009 08:01:13 -0000	1.2
@@ -0,0 +1 @@
+Curses-UI-0.9607.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:23:01 -0000	1.1
+++ sources	22 Sep 2009 08:01:13 -0000	1.2
@@ -0,0 +1 @@
+8970c72e378aa386e0e79a884ef5863a  Curses-UI-0.9607.tar.gz



From mcrha at fedoraproject.org  Tue Sep 22 08:15:48 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue, 22 Sep 2009 08:15:48 +0000 (UTC)
Subject: rpms/evolution-mapi/devel gnbug588453.patch, NONE,
	1.1 gnbug595260.patch, NONE, 1.1 gnbug595355.patch, NONE,
	1.1 gnbug595480.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 evolution-mapi.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20090922081548.5097511C00E8@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14991

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Added Files:
	gnbug588453.patch gnbug595260.patch gnbug595355.patch 
	gnbug595480.patch 
Log Message:
* Tue Sep 22 2009 Milan Crha <mcrha at redhat.com> - 0.28.0-1
- Update to 0.28.0
- Add patch for Gnome bug #588453 (slow retrieval of message IDs).
- Add patch for Gnome bug #595260 (crash in mapi_sync_deleted).
- Add patch for Gnome bug #595355 (crash and incorrect header parsing).
- Add patch for Gnome bug #595480 (crash on fetching GAL).



gnbug588453.patch:
 camel/camel-mapi-folder.c                  |    2 +-
 libexchangemapi/exchange-mapi-connection.c |   26 ++++++++++++++++----------
 libexchangemapi/exchange-mapi-connection.h |    3 ++-
 3 files changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE gnbug588453.patch ---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 63a15e9..df652b5 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -711,7 +711,7 @@ mapi_sync_deleted (CamelSession *session, CamelSessionThreadMsg *msg)
 					       prop_list, G_N_ELEMENTS (prop_list),
 					       NULL, NULL,
 					       deleted_items_sync_cb, &server_uid_list,
-					       options);
+					       options | MAPI_OPTIONS_DONT_OPEN_MESSAGE);
 
 	camel_operation_end (NULL);
 
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index 900d736..20341d0 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -1211,7 +1211,7 @@ exchange_mapi_connection_fetch_items   (mapi_id_t fid,
 
 		for (i = 0; i < SRowSet.cRows; i++) {
 			mapi_object_t obj_message;
-			struct mapi_SPropValue_array properties_array;
+			struct mapi_SPropValue_array properties_array = {0};
 			const mapi_id_t *pfid;
 			const mapi_id_t	*pmid;
 			const bool *has_attach = NULL;
@@ -1227,6 +1227,9 @@ exchange_mapi_connection_fetch_items   (mapi_id_t fid,
 
 			has_attach = (const bool *) get_SPropValue_SRow_data(&SRowSet.aRow[i], PR_HASATTACH);
 
+			if (options & MAPI_OPTIONS_DONT_OPEN_MESSAGE)
+				goto relax;
+				
 			retval = OpenMessage(&obj_folder, *pfid, *pmid, &obj_message, 0);
 			if (retval != MAPI_E_SUCCESS) {
 				mapi_errstr("OpenMessage", GetLastError());
@@ -1262,19 +1265,21 @@ exchange_mapi_connection_fetch_items   (mapi_id_t fid,
 
 			} else
 				retval = GetPropsAll (&obj_message, &properties_array);
-
+ relax:
 			if (retval == MAPI_E_SUCCESS) {
 				FetchItemsCallbackData *item_data;
 				uint32_t z;
 
-				/* just to get all the other streams */
-				for (z=0; z < properties_array.cValues; z++) {
-					if ((properties_array.lpProps[z].ulPropTag & 0xFFFF) == PT_BINARY && 
-					    (options & MAPI_OPTIONS_FETCH_GENERIC_STREAMS)) 
-					exchange_mapi_util_read_generic_stream (&obj_message, properties_array.lpProps[z].ulPropTag, &stream_list);
-				}
+				if ((options & MAPI_OPTIONS_DONT_OPEN_MESSAGE) == 0) {
+					/* just to get all the other streams */
+					for (z=0; z < properties_array.cValues; z++) {
+						if ((properties_array.lpProps[z].ulPropTag & 0xFFFF) == PT_BINARY && 
+						    (options & MAPI_OPTIONS_FETCH_GENERIC_STREAMS)) 
+						exchange_mapi_util_read_generic_stream (&obj_message, properties_array.lpProps[z].ulPropTag, &stream_list);
+					}
 
-				mapi_SPropValue_array_named(&obj_message, &properties_array);
+					mapi_SPropValue_array_named(&obj_message, &properties_array);
+				}
 
 				/* NOTE: stream_list, recipient_list and attach_list
 				   should be freed by the callback */
@@ -1297,7 +1302,8 @@ exchange_mapi_connection_fetch_items   (mapi_id_t fid,
 				talloc_free (properties_array.lpProps);
 
 		loop_cleanup:
-			mapi_object_release(&obj_message);
+			if ((options & MAPI_OPTIONS_DONT_OPEN_MESSAGE) == 0)
+				mapi_object_release (&obj_message);
 
 			if (!cb_retval) break;
 		}
diff --git a/src/libexchangemapi/exchange-mapi-connection.h b/src/libexchangemapi/exchange-mapi-connection.h
index 2059991..b2db6a8 100644
--- a/src/libexchangemapi/exchange-mapi-connection.h
+++ b/src/libexchangemapi/exchange-mapi-connection.h
@@ -37,7 +37,8 @@ typedef enum {
 	MAPI_OPTIONS_FETCH_GAL = 1 <<4,
 	MAPI_OPTIONS_DONT_SUBMIT = 1<<5, 
 	MAPI_OPTIONS_GETBESTBODY = 1<<6,
-	MAPI_OPTIONS_USE_PFSTORE = 1<<7
+	MAPI_OPTIONS_USE_PFSTORE = 1<<7,
+	MAPI_OPTIONS_DONT_OPEN_MESSAGE = 1<<8
 } ExchangeMAPIOptions;
 
 #define MAPI_OPTIONS_FETCH_ALL MAPI_OPTIONS_FETCH_ATTACHMENTS | \

gnbug595260.patch:
 camel-mapi-folder.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnbug595260.patch ---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 43373fc..80bae7c 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -691,7 +691,6 @@ mapi_sync_deleted (CamelSession *session, CamelSessionThreadMsg *msg)
 	guint32 index, count, options = 0;
 	GSList *server_uid_list = NULL;
 	const gchar *uid = NULL;
-	GSList *tmp_list_item = NULL;
 
 	/* Currently we don't have simple wrapper over getprops.*/
 	const guint32 prop_list[] = { PR_LAST_MODIFICATION_TIME };
@@ -728,6 +727,8 @@ mapi_sync_deleted (CamelSession *session, CamelSessionThreadMsg *msg)
 
 	/* Iterate over cache and check if the UID is in server*/
 	for (index = 0; index < count; index++) {
+		GSList *tmp_list_item = NULL;
+
 		/*FIXME :Any other list available ???*/
 		info = camel_folder_summary_index (m->folder->summary, index);
 		if (!info) continue; /*This is bad. *Should* not happen*/
@@ -741,7 +742,7 @@ mapi_sync_deleted (CamelSession *session, CamelSessionThreadMsg *msg)
 		}
 
 		/* If it is not in server list, clean our cache */
-		if (!tmp_list_item->data && uid) {
+		if ((!tmp_list_item || !tmp_list_item->data) && uid) {
 			CAMEL_MAPI_FOLDER_REC_LOCK (m->folder, cache_lock);
 			camel_folder_summary_remove_uid (m->folder->summary, uid);
 			camel_data_cache_remove (mapi_folder->cache, "cache", uid, NULL);

gnbug595355.patch:
 camel-mapi-folder.c |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

--- NEW FILE gnbug595355.patch ---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 63a15e9..be35310 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1395,22 +1395,35 @@ mapi_populate_details_from_item (CamelFolder *folder, CamelMimeMessage *msg, Map
 	CamelInternetAddress *addr = NULL;
 	CamelMapiStore *mapi_store = CAMEL_MAPI_STORE(folder->parent_store);
 	int offset = 0;
-	guint i;
 	time_t actual_time;
 
 	/* Setting headers from PR_TRANSPORT_MESSAGE_HEADERS */
 	if (item->header.transport_headers) {
-		struct _camel_header_raw *headers;
-		gchar **header_list;
+		CamelMimePart *part = camel_mime_part_new ();
+		CamelStream *stream;
+		CamelMimeParser *parser;
 
-		header_list = g_strsplit (item->header.transport_headers, "\n", -1);
-		for (i = 0; header_list && header_list [i]; i++)
-			camel_header_raw_append_parse (&headers, header_list[i], -1);
+		stream = camel_stream_mem_new_with_buffer (item->header.transport_headers, strlen (item->header.transport_headers));
+		parser = camel_mime_parser_new ();
+		camel_mime_parser_init_with_stream (parser, stream);
+		camel_mime_parser_scan_from (parser, FALSE);
+		camel_object_unref (stream);
 
-		while (headers->next) {
-			camel_medium_add_header (CAMEL_MEDIUM (msg), headers->name, headers->value);
-			headers = headers->next ;
+		if (camel_mime_part_construct_from_parser (part, parser) != -1) {
+			struct _camel_header_raw *h;
+
+			for (h = part->headers; h; h = h->next) {
+				const gchar *value = h->value;
+
+				while (value && camel_mime_is_lwsp (*value))
+					value++;
+
+				camel_medium_add_header (CAMEL_MEDIUM (msg), h->name, value);
+			}
 		}
+
+		camel_object_unref (parser);
+		camel_object_unref (part);
 	}
 
 	/* Overwrite headers if we have specific properties available*/

gnbug595480.patch:
 exchange-mapi-connection.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE gnbug595480.patch ---
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index 900d736..ea40335 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -750,6 +750,8 @@ exchange_mapi_util_get_gal (GPtrArray *contacts_array)
 	
 	mem_ctx = talloc_init ("ExchangeMAPI_GetGAL");
 
+	LOCK ();
+
 	SPropTagArray = set_SPropTagArray(mem_ctx, 0xc,
 					  PR_INSTANCE_KEY,
 					  PR_ENTRYID,
@@ -770,7 +772,9 @@ exchange_mapi_util_get_gal (GPtrArray *contacts_array)
 		count += 0x2;
 		retval = GetGALTable(global_mapi_session, SPropTagArray, &SRowSet, count, ulFlags);
 		if ((!SRowSet) || (!(SRowSet->aRow))) {
-			return false;
+			UNLOCK ();
+			MAPIFreeBuffer (SPropTagArray);
+			return FALSE;
 		}
 		if (SRowSet->cRows) {
 			for (i = 0; i < SRowSet->cRows; i++) {
@@ -786,7 +790,9 @@ exchange_mapi_util_get_gal (GPtrArray *contacts_array)
 
 	MAPIFreeBuffer(SPropTagArray);
 
-	return true;
+	UNLOCK ();
+
+	return TRUE;
 	
 }
 
@@ -908,7 +914,9 @@ exchange_mapi_util_modify_recipients (TALLOC_CTX *mem_ctx, mapi_object_t *obj_me
 	}
 
 	/* Attempt to resolve names from the server */
+	LOCK ();
 	retval = ResolveNames (global_mapi_session, users, SPropTagArray, &SRowSet, &FlagList, 0);
+	UNLOCK ();
 	if (retval != MAPI_E_SUCCESS) {
 		mapi_errstr("ResolveNames", GetLastError());
 		goto cleanup;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	7 Sep 2009 16:23:03 -0000	1.14
+++ .cvsignore	22 Sep 2009 08:15:39 -0000	1.15
@@ -1 +1 @@
-evolution-mapi-0.27.92.tar.bz2
+evolution-mapi-0.28.0.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- evolution-mapi.spec	7 Sep 2009 16:23:03 -0000	1.18
+++ evolution-mapi.spec	22 Sep 2009 08:15:44 -0000	1.19
@@ -1,5 +1,5 @@
-%define evo_version 2.27.5
-%define eds_version 2.27.5
+%define evo_version 2.28.0
+%define eds_version 2.28.0
 %define libmapi_version 0.8
 %define intltool_version 0.35.5
 
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.27.92
+Version: 0.28.0
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -25,6 +25,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 Requires: evolution >= %{evo_version}
 Requires: evolution-data-server >= %{eds_version}
 
+### Patches ###
+
+Patch1: gnbug588453.patch
+Patch2: gnbug595260.patch
+Patch3: gnbug595355.patch
+Patch4: gnbug595480.patch
+
 ### Build Dependencies ###
 
 BuildRequires: evolution-data-server-devel >= %{eds_version}
@@ -52,6 +59,11 @@ Development files needed for building th
 %prep
 %setup -q
 
+%patch1 -p1 -b .gnbug588453
+%patch2 -p1 -b .gnbug595260
+%patch3 -p1 -b .gnbug595355
+%patch4 -p1 -b .gnbug595480
+
 %build
 
 # Add stricter build settings here as the source code gets cleaned up.
@@ -108,6 +120,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Tue Sep 22 2009 Milan Crha <mcrha at redhat.com> - 0.28.0-1
+- Update to 0.28.0
+- Add patch for Gnome bug #588453 (slow retrieval of message IDs).
+- Add patch for Gnome bug #595260 (crash in mapi_sync_deleted).
+- Add patch for Gnome bug #595355 (crash and incorrect header parsing).
+- Add patch for Gnome bug #595480 (crash on fetching GAL).
+
 * Mon Sep 07 2009 Milan Crha <mcrha at redhat.com> - 0.27.92-1
 - Update to 0.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	7 Sep 2009 16:23:03 -0000	1.14
+++ sources	22 Sep 2009 08:15:44 -0000	1.15
@@ -1 +1 @@
-7c8bc781e821e7243028f4488f951fb5  evolution-mapi-0.27.92.tar.bz2
+60a1a064d16a85497098b447637c6f3e  evolution-mapi-0.28.0.tar.bz2



From tbzatek at fedoraproject.org  Tue Sep 22 08:20:11 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 22 Sep 2009 08:20:11 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.32, 1.33 seahorse.spec, 1.81,
	1.82 sources, 1.34, 1.35 password-tab.patch, 1.1,
	NONE seahorse-2.23.90-gpg2.patch, 1.1,
	NONE seahorse-2.25.3-pkcs11-slot.patch, 1.1,
	NONE seahorse-button-images.patch, 1.1, NONE
Message-ID: <20090922082011.EF27911C0418@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17610

Modified Files:
	.cvsignore seahorse.spec sources 
Removed Files:
	password-tab.patch seahorse-2.23.90-gpg2.patch 
	seahorse-2.25.3-pkcs11-slot.patch seahorse-button-images.patch 
Log Message:
* Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	14 Sep 2009 23:35:57 -0000	1.32
+++ .cvsignore	22 Sep 2009 08:20:08 -0000	1.33
@@ -1 +1 @@
-seahorse-2.27.92.tar.bz2
+seahorse-2.28.0.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- seahorse.spec	15 Sep 2009 00:52:05 -0000	1.81
+++ seahorse.spec	22 Sep 2009 08:20:09 -0000	1.82
@@ -1,5 +1,5 @@
 Name: 		seahorse
-Version: 	2.27.92
+Version: 	2.28.0
 Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
@@ -7,7 +7,7 @@ Group: 		User Interface/Desktops
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://projects.gnome.org/seahorse/
-Source:         http://download.gnome.org/sources/seahorse/2.27/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/seahorse/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -164,6 +164,9 @@ fi
 %{_datadir}/gtk-doc/html/libseahorse
 
 %changelog
+* Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	14 Sep 2009 23:35:58 -0000	1.34
+++ sources	22 Sep 2009 08:20:09 -0000	1.35
@@ -1 +1 @@
-6bb39999af3e4aee4450aac8a7d4a622  seahorse-2.27.92.tar.bz2
+250495064ce62e19719167897cdea930  seahorse-2.28.0.tar.bz2


--- password-tab.patch DELETED ---


--- seahorse-2.23.90-gpg2.patch DELETED ---


--- seahorse-2.25.3-pkcs11-slot.patch DELETED ---


--- seahorse-button-images.patch DELETED ---



From petersen at fedoraproject.org  Tue Sep 22 08:26:44 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 08:26:44 +0000 (UTC)
Subject: rpms/cabal-install/F-11 cabal-install.spec,1.3,1.4
Message-ID: <20090922082644.593E411C00E8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal-install/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21066

Modified Files:
	cabal-install.spec 
Log Message:
rebuild against ghc-6.10.3 finally


Index: cabal-install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal-install/F-11/cabal-install.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cabal-install.spec	27 Feb 2009 07:18:31 -0000	1.3
+++ cabal-install.spec	22 Sep 2009 08:26:44 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           cabal-install
 Version:        0.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Haskell package tool
 
 Group:          Development/Tools
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-3
+- rebuild against ghc-6.10.3 finally
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-2
 - update for cabal2spec-0.11:
 - use global



From tbzatek at fedoraproject.org  Tue Sep 22 08:37:24 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 22 Sep 2009 08:37:24 +0000 (UTC)
Subject: rpms/sabayon/devel .cvsignore, 1.23, 1.24 sabayon.spec, 1.63,
	1.64 sources, 1.23, 1.24
Message-ID: <20090922083724.AA36211C00E8@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25058

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
* Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	19 Aug 2009 09:22:30 -0000	1.23
+++ .cvsignore	22 Sep 2009 08:37:24 -0000	1.24
@@ -1 +1 @@
-sabayon-2.27.91.tar.bz2
+sabayon-2.28.0.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sabayon.spec	19 Aug 2009 09:22:30 -0000	1.63
+++ sabayon.spec	22 Sep 2009 08:37:24 -0000	1.64
@@ -7,14 +7,14 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.27.91
+Version: 2.28.0
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPLv2+
 URL:     http://www.gnome.org/projects/sabayon
-Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.27/sabayon-%{version}.tar.bz2
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.28/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -269,6 +269,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	19 Aug 2009 09:22:30 -0000	1.23
+++ sources	22 Sep 2009 08:37:24 -0000	1.24
@@ -1 +1 @@
-3afeb3e4e352c2ab54fa38d7a0da047b  sabayon-2.27.91.tar.bz2
+6cf8acabb61e88ebfe0ded14c96ab211  sabayon-2.28.0.tar.bz2



From petersen at fedoraproject.org  Tue Sep 22 08:39:11 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 08:39:11 +0000 (UTC)
Subject: rpms/cabal-install/F-11 cabal-install.spec,1.4,1.5
Message-ID: <20090922083911.134C911C00E8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal-install/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25470

Modified Files:
	cabal-install.spec 
Log Message:
sync with devel (BR ghc-rpm-macros)


Index: cabal-install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal-install/F-11/cabal-install.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cabal-install.spec	22 Sep 2009 08:26:44 -0000	1.4
+++ cabal-install.spec	22 Sep 2009 08:39:10 -0000	1.5
@@ -2,8 +2,9 @@
 %global debug_package %{nil}
 
 Name:           cabal-install
+# part of haskell-platform-2009.2.0.2
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Haskell package tool
 
 Group:          Development/Tools
@@ -13,7 +14,8 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-zlib-devel, ghc-HTTP-devel
+BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc-zlib-devel, ghc-HTTP-devel
 Requires:       ghc
 
 %description
@@ -53,8 +55,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-3
-- rebuild against ghc-6.10.3 finally
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-5
+- rebuild against ghc-6.10.3
+
+* Sun May 17 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-4
+- buildrequires ghc-rpm-macros (cabal-0.16)
+
+* Sun Apr 26 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-3
+- rebuild against ghc-6.10.2
 
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-2
 - update for cabal2spec-0.11:



From dnovotny at fedoraproject.org  Tue Sep 22 08:57:44 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 22 Sep 2009 08:57:44 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.136,1.137
Message-ID: <20090922085745.0F63611C00E8@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30915

Modified Files:
	emacs.spec 
Log Message:
fix #510750



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- emacs.spec	31 Aug 2009 09:59:41 -0000	1.136
+++ emacs.spec	22 Sep 2009 08:57:39 -0000	1.137
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -143,6 +143,13 @@ rm -f lisp/play/tetris.el lisp/play/tetr
 rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
 %endif
 
+%define info_files ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail speedbar tramp url vip viper widget woman
+
+if test "$(perl -e 'while (<>) { if (/^INFO_FILES/) { s/.*=//; while (s/\\$//) { s/\\//; $_ .= <>; }; s/\s+/ /g; s/^ //; s/ $//; print; exit; } }' Makefile.in)" != "%info_files"; then
+  echo Please update info_files >&2
+  exit 1
+fi
+
 %ifarch %{ix86}
 %define setarch setarch %{_arch} -R
 %else
@@ -265,8 +272,6 @@ cat el-*-files common-lisp-dir-files > e
 %clean
 rm -rf %{buildroot}
 
-%define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
-
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -370,6 +375,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Sep 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-7
+- updated %%info_files (#510750)
+
 * Mon Aug 31 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-6
 - fixed buffer menu (#515722)
 



From xhorak at fedoraproject.org  Tue Sep 22 09:12:09 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 22 Sep 2009 09:12:09 +0000 (UTC)
Subject: rpms/thunderbird/devel .cvsignore, 1.26, 1.27 sources, 1.33,
	1.34 thunderbird-shared-error.patch, 1.3, 1.4 thunderbird.spec,
	1.150, 1.151
Message-ID: <20090922091209.A728311C00E8@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3746

Modified Files:
	.cvsignore sources thunderbird-shared-error.patch 
	thunderbird.spec 
Log Message:
Update to 3.0 b4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	17 Sep 2009 21:13:04 -0000	1.26
+++ .cvsignore	22 Sep 2009 09:12:06 -0000	1.27
@@ -1,2 +1,5 @@
+thunderbird-3.0-6a6386c16e98-source.tar.bz2
+thunderbird-3.0b3-source.tar.bz2
+thunderbird-langpacks-3.0-20090721.tar.bz2
 thunderbird-3.0b4-source.tar.bz2
-thunderbird-langpacks-3.0-20090917.tar.bz2
+thunderbird-langpacks-3.0b4-20090917.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	17 Sep 2009 21:13:05 -0000	1.33
+++ sources	22 Sep 2009 09:12:07 -0000	1.34
@@ -1,2 +1,2 @@
 0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2
-8ed1dc55c3c7cac5731810013fb3e9b8  thunderbird-langpacks-3.0-20090917.tar.bz2
+296dace664509393536e5548b9a82bee  thunderbird-langpacks-3.0b4-20090917.tar.bz2

thunderbird-shared-error.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-shared-error.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- thunderbird-shared-error.patch	17 Sep 2009 21:13:05 -0000	1.3
+++ thunderbird-shared-error.patch	22 Sep 2009 09:12:07 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
---- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-07-13 14:56:36.000000000 +0200
-+++ thunderbird-3.0/mail/installer/Makefile.in	2009-07-14 12:41:16.000000000 +0200
-@@ -94,9 +94,11 @@ endif
+diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
+--- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
++++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
+@@ -95,9 +95,11 @@ endif
  # mozconfig instead.
  ifndef MAIL_PKG_SHARED
  ifndef BUILD_STATIC_LIBS


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- thunderbird.spec	17 Sep 2009 22:11:23 -0000	1.150
+++ thunderbird.spec	22 Sep 2009 09:12:07 -0000	1.151
@@ -32,7 +32,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20090917.tar.bz2
+Source1:        thunderbird-langpacks-%{version}b4-20090917.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -306,7 +306,7 @@ fi
 
 %changelog
 * Thu Sep 17 2009 Christopher Aillon <caillon at redhat.com> - 3.0-3.9.b4
-- Beta 4 candidate build 4
+- Update to 3.0 b4
 
 * Thu Aug  6 2009 Martin Stransky <stransky at redhat.com> - 3.0-3.8.beta3
 - Added fix for #437596



From akurtakov at fedoraproject.org  Tue Sep 22 09:14:24 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Sep 2009 09:14:24 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-help-toolbar.patch, NONE,
	1.1 eclipse.spec, 1.666, 1.667
Message-ID: <20090922091424.48C1511C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5576/devel

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-help-toolbar.patch 
Log Message:
Fix help toolbar jsp problem.

eclipse-help-toolbar.patch:
 searchToolbar.jsp |   11 ++++++++---
 tocToolbar.jsp    |    5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE eclipse-help-toolbar.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.help.webapp
Index: advanced/tocToolbar.jsp
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/tocToolbar.jsp,v
retrieving revision 1.14
diff -u -r1.14 tocToolbar.jsp
--- plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp	22 Jan 2009 22:19:55 -0000	1.14
+++ plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp	21 Sep 2009 20:55:27 -0000
@@ -16,6 +16,9 @@
 	String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request));
 	String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')";
     String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request));
+    // See  Bug 290064 for an explanation of why these constants are used
+    final String ON = "on";
+    final String OFF = "off";
 %>
 
 <jsp:include page="toolbar.jsp">
@@ -62,6 +65,6 @@
 	<jsp:param name="image"    value="auto_synch_toc.gif"/>
 	<jsp:param name="action"   value="toggleAutosynch"/>
 	<jsp:param name="param"    value=""/>	
-	<jsp:param name="state"    value="<%=((new CookiesData(application, request, response)).isSynchToc() ? "on" : "off")%>"/>
+	<jsp:param name="state"    value="<%=((new CookiesData(application, request, response)).isSynchToc() ? ON : OFF)%>"/>
 	
 </jsp:include>
\ No newline at end of file
Index: advanced/searchToolbar.jsp
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchToolbar.jsp,v
retrieving revision 1.12
diff -u -r1.12 searchToolbar.jsp
--- plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp	29 Aug 2007 22:45:40 -0000	1.12
+++ plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp	21 Sep 2009 20:55:27 -0000
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2007 IBM Corporation and others.
+ Copyright (c) 2000, 2009 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -9,6 +9,11 @@
      IBM Corporation - initial API and implementation
 --%>
 <%@ include file="header.jsp"%>
+<%
+    // See  Bug 290064 for an explanation of why these constants are used
+    final String ON = "on";
+    final String OFF = "off";
+%>
 
 
 <jsp:include page="toolbar.jsp">
@@ -27,13 +32,13 @@
 	<jsp:param name="image"    value="show_categories.gif"/>
 	<jsp:param name="action"   value="toggleShowCategories"/>
 	<jsp:param name="param"    value=""/>
-	<jsp:param name="state"    value="<%=((new SearchData(application, request, response)).isShowCategories() ? "on" : "off")%>"/>
+	<jsp:param name="state"    value="<%=((new SearchData(application, request, response)).isShowCategories() ? ON : OFF)%>"/>
 
 	<jsp:param name="name"     value="show_descriptions"/>
 	<jsp:param name="tooltip"  value='show_descriptions'/>
 	<jsp:param name="image"    value="show_descriptions.gif"/>
 	<jsp:param name="action"   value="toggleShowDescriptions"/>
 	<jsp:param name="param"    value=""/>
-	<jsp:param name="state"    value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? "on" : "off")%>"/>
+	<jsp:param name="state"    value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? ON : OFF)%>"/>
 
 </jsp:include>
\ No newline at end of file


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -p -r1.666 -r1.667
--- eclipse.spec	18 Sep 2009 13:41:44 -0000	1.666
+++ eclipse.spec	22 Sep 2009 09:14:23 -0000	1.667
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.13%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -136,6 +136,11 @@ Patch50:        %{name}-target-platform-
 # Already applied in eclipse-build upstream rev. #23023
 Patch51:        %{name}-addusrsharedropins.patch
 
+#Fix for help toolbar jsp compile error.
+#See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064
+#Already added to eclipse-build.
+Patch52:        %{name}-help-toolbar.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -652,6 +657,7 @@ popd
 
 # target platform template patch
 %patch50 -p0
+%patch52 -p0
 
 popd
 
@@ -1423,6 +1429,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-1
+- Fix help toolbar jsp problem.
+
 * Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.13
 - Update ecf-filetransfer and build it.
 



From hadess at fedoraproject.org  Tue Sep 22 09:24:02 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Sep 2009 09:24:02 +0000 (UTC)
Subject: rpms/libgdata/devel .cvsignore, 1.5, 1.6 libgdata.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090922092402.42A7411C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8977

Modified Files:
	.cvsignore libgdata.spec sources 
Log Message:
* Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 0.5.0-1
- Update to 0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 20:00:32 -0000	1.5
+++ .cvsignore	22 Sep 2009 09:24:01 -0000	1.6
@@ -1 +1 @@
-libgdata-0.4.0.tar.bz2
+libgdata-0.5.0.tar.bz2


Index: libgdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/libgdata.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libgdata.spec	11 Aug 2009 21:46:42 -0000	1.6
+++ libgdata.spec	22 Sep 2009 09:24:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libgdata
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Library for the GData protocol
 
 Group:          System Environment/Libraries
@@ -69,6 +69,9 @@ cd gdata/tests
 %{_datadir}/gtk-doc/html/gdata/
 
 %changelog
+* Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 0.5.0-1
+- Update to 0.5.0
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-3
 - Fix source URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 20:00:32 -0000	1.5
+++ sources	22 Sep 2009 09:24:02 -0000	1.6
@@ -1 +1 @@
-06b14f1cd96432b0717ed03fe013ca4d  libgdata-0.4.0.tar.bz2
+5ad3bf009bb240de5b722fc504c5eb86  libgdata-0.5.0.tar.bz2



From twaugh at fedoraproject.org  Tue Sep 22 09:30:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 09:30:05 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-fetchdevices.patch, NONE,
	1.1 system-config-printer.spec, 1.297, 1.298
Message-ID: <20090922093005.8CABF11C0423@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11311

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-fetchdevices.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Fixed race when fetching device list (bug #521110).


system-config-printer-fetchdevices.patch:
 system-config-printer.py |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

--- NEW FILE system-config-printer-fetchdevices.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.fetchdevices system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.fetchdevices	2009-09-22 10:08:54.062669053 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-22 10:10:12.138669093 +0100
@@ -3855,9 +3855,7 @@ class NewPrinterGUI(GtkGUI):
             self.fillDeviceTab()
             self.rbtnNPFoomatic.set_active (True)
             self.on_rbtnNPFoomatic_toggled(self.rbtnNPFoomatic)
-            # Start fetching information from CUPS in the background
             self.new_printer_PPDs_loaded = False
-            self.queryPPDs ()
 
         elif self.dialog_mode == "class":
             self.NewPrinterWindow.set_title(_("New Class"))
@@ -4648,16 +4646,18 @@ class NewPrinterGUI(GtkGUI):
         debugprint ("fetchDevices")
 
         have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
-        if not have_polkit_1:
-            if network:
-                return {}
-
-            network = True
-
         network_schemes = ["dnssd", "snmp"]
         try:
-            c = authconn.Connection (host=self.mainapp.connect_server,
-                                     parent=parent, lock=True)
+            try:
+                c = self.fetchDevices_conn
+            except AttributeError:
+                c = authconn.Connection (host=self.mainapp.connect_server,
+                                         parent=parent, lock=True)
+                if not have_polkit_1:
+                    # Use this connection for future calls so that the
+                    # username/password is cached.
+                    self.fetchDevices_conn = c
+
             debugprint ("in get_devices: connected")
             c._begin_operation (_("fetching device list"))
             try:
@@ -5049,6 +5049,10 @@ class NewPrinterGUI(GtkGUI):
                                                    kwargs={"network": True},
                                                    callback=self.got_devices,
                                                    context=context)
+        else:
+            # Now we've fetched both local and network devices, start
+            # querying the available PPDs.
+            gobject.timeout_add (1, self.queryPPDs)
 
         devices = result
         if current_uri:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- system-config-printer.spec	18 Sep 2009 13:01:39 -0000	1.297
+++ system-config-printer.spec	22 Sep 2009 09:30:05 -0000	1.298
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-data-butto
 Patch2: system-config-printer-cancel-traceback.patch
 Patch3: system-config-printer-publish-printers.patch
 Patch4: system-config-printer-iconify.patch
+Patch5: system-config-printer-fetchdevices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -83,6 +84,7 @@ printers.
 %patch2 -p1 -b .cancel-traceback
 %patch3 -p1 -b .publish-printers
 %patch4 -p1 -b .iconify
+%patch5 -p1 -b .fetchdevices
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -194,6 +196,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Fixed race when fetching device list (bug #521110).
+
 * Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
 - Iconify jobs window into status icon.
 - Avoid showing the publish-printers dialog when not necessary.



From twaugh at fedoraproject.org  Tue Sep 22 09:31:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 09:31:53 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-fetchdevices.patch, NONE,
	1.1 system-config-printer.spec, 1.285, 1.286
Message-ID: <20090922093153.902C411C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11833

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-fetchdevices.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed race when fetching device list (bug #521110).


system-config-printer-fetchdevices.patch:
 system-config-printer.py |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

--- NEW FILE system-config-printer-fetchdevices.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.fetchdevices system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.fetchdevices	2009-09-04 18:12:11.000000000 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-22 10:16:16.060543855 +0100
@@ -3841,9 +3841,7 @@ class NewPrinterGUI(GtkGUI):
             self.fillDeviceTab()
             self.rbtnNPFoomatic.set_active (True)
             self.on_rbtnNPFoomatic_toggled(self.rbtnNPFoomatic)
-            # Start fetching information from CUPS in the background
             self.new_printer_PPDs_loaded = False
-            self.queryPPDs ()
 
         elif self.dialog_mode == "class":
             self.NewPrinterWindow.set_title(_("New Class"))
@@ -4634,16 +4632,18 @@ class NewPrinterGUI(GtkGUI):
         debugprint ("fetchDevices")
 
         have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
-        if not have_polkit_1:
-            if network:
-                return {}
-
-            network = True
-
         network_schemes = ["dnssd", "snmp"]
         try:
-            c = authconn.Connection (host=self.mainapp.connect_server,
-                                     parent=parent, lock=True)
+            try:
+                c = self.fetchDevices_conn
+            except AttributeError:
+                c = authconn.Connection (host=self.mainapp.connect_server,
+                                         parent=parent, lock=True)
+                if not have_polkit_1:
+                    # Use this connection for future calls so that the
+                    # username/password is cached.
+                    self.fetchDevices_conn = c
+
             debugprint ("in get_devices: connected")
             c._begin_operation (_("fetching device list"))
             try:
@@ -5035,6 +5035,10 @@ class NewPrinterGUI(GtkGUI):
                                                    kwargs={"network": True},
                                                    callback=self.got_devices,
                                                    context=context)
+        else:
+            # Now we've fetched both local and network devices, start
+            # querying the available PPDs.
+            gobject.timeout_add (1, self.queryPPDs)
 
         devices = result
         if current_uri:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- system-config-printer.spec	14 Sep 2009 15:11:55 -0000	1.285
+++ system-config-printer.spec	22 Sep 2009 09:31:53 -0000	1.286
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-fetchdevices.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,6 +64,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .fetchdevices
 
 %build
 %configure
@@ -163,6 +166,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed race when fetching device list (bug #521110).
+
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
 - 1.1.13:
   - Translation updates (bug #522451).



From twaugh at fedoraproject.org  Tue Sep 22 09:35:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 09:35:39 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-fetchdevices.patch, NONE,
	1.1 system-config-printer.spec, 1.252, 1.253
Message-ID: <20090922093539.36B1011C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12892

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-fetchdevices.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed race when fetching device list (bug #521110).


system-config-printer-fetchdevices.patch:
 system-config-printer.py |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

--- NEW FILE system-config-printer-fetchdevices.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.fetchdevices system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.fetchdevices	2009-09-04 18:12:11.000000000 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-22 10:24:23.843684639 +0100
@@ -3841,9 +3841,7 @@ class NewPrinterGUI(GtkGUI):
             self.fillDeviceTab()
             self.rbtnNPFoomatic.set_active (True)
             self.on_rbtnNPFoomatic_toggled(self.rbtnNPFoomatic)
-            # Start fetching information from CUPS in the background
             self.new_printer_PPDs_loaded = False
-            self.queryPPDs ()
 
         elif self.dialog_mode == "class":
             self.NewPrinterWindow.set_title(_("New Class"))
@@ -4634,16 +4632,18 @@ class NewPrinterGUI(GtkGUI):
         debugprint ("fetchDevices")
 
         have_polkit_1 = self.mainapp.cups._use_pk and config.WITH_POLKIT_1
-        if not have_polkit_1:
-            if network:
-                return {}
-
-            network = True
-
         network_schemes = ["dnssd", "snmp"]
         try:
-            c = authconn.Connection (host=self.mainapp.connect_server,
-                                     parent=parent, lock=True)
+            try:
+                c = self.fetchDevices_conn
+            except AttributeError:
+                c = authconn.Connection (host=self.mainapp.connect_server,
+                                         parent=parent, lock=True)
+                if not have_polkit_1:
+                    # Use this connection for future calls so that the
+                    # username/password is cached.
+                    self.fetchDevices_conn = c
+
             debugprint ("in get_devices: connected")
             c._begin_operation (_("fetching device list"))
             try:
@@ -5035,6 +5035,10 @@ class NewPrinterGUI(GtkGUI):
                                                    kwargs={"network": True},
                                                    callback=self.got_devices,
                                                    context=context)
+        else:
+            # Now we've fetched both local and network devices, start
+            # querying the available PPDs.
+            gobject.timeout_add (1, self.queryPPDs)
 
         devices = result
         if current_uri:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- system-config-printer.spec	14 Sep 2009 15:21:01 -0000	1.252
+++ system-config-printer.spec	22 Sep 2009 09:35:39 -0000	1.253
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-fetchdevices.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,6 +64,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .fetchdevices
 
 %build
 %configure
@@ -163,6 +166,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed race when fetching device list (bug #521110).
+
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
 - 1.1.13:
   - Translation updates (bug #522451).



From twaugh at fedoraproject.org  Tue Sep 22 10:05:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:05:57 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-missing-import.patch, NONE,
	1.1 system-config-printer.spec, 1.298, 1.299
Message-ID: <20090922100558.0A79611C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23475

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-missing-import.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Fixed missing import in probe_printer module.


system-config-printer-missing-import.patch:
 probe_printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-missing-import.patch ---
diff -up system-config-printer-1.1.13/probe_printer.py.missing-import system-config-printer-1.1.13/probe_printer.py
--- system-config-printer-1.1.13/probe_printer.py.missing-import	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/probe_printer.py	2009-09-22 10:33:18.358546374 +0100
@@ -20,6 +20,7 @@
 
 import cupshelpers
 from debug import *
+import errno
 import socket, time
 import gtk
 from timedops import TimedOperation


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- system-config-printer.spec	22 Sep 2009 09:30:05 -0000	1.298
+++ system-config-printer.spec	22 Sep 2009 10:05:56 -0000	1.299
@@ -20,6 +20,7 @@ Patch2: system-config-printer-cancel-tra
 Patch3: system-config-printer-publish-printers.patch
 Patch4: system-config-printer-iconify.patch
 Patch5: system-config-printer-fetchdevices.patch
+Patch6: system-config-printer-missing-import.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -85,6 +86,7 @@ printers.
 %patch3 -p1 -b .publish-printers
 %patch4 -p1 -b .iconify
 %patch5 -p1 -b .fetchdevices
+%patch6 -p1 -b .missing-import
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -197,6 +199,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).
 
 * Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2



From twaugh at fedoraproject.org  Tue Sep 22 10:06:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:06:35 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-missing-import.patch, NONE,
	1.1 system-config-printer.spec, 1.286, 1.287
Message-ID: <20090922100635.CFEBC11C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23650

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-missing-import.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed missing import in probe_printer module.


system-config-printer-missing-import.patch:
 probe_printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-missing-import.patch ---
diff -up system-config-printer-1.1.13/probe_printer.py.missing-import system-config-printer-1.1.13/probe_printer.py
--- system-config-printer-1.1.13/probe_printer.py.missing-import	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/probe_printer.py	2009-09-22 10:35:29.515546825 +0100
@@ -20,6 +20,7 @@
 
 import cupshelpers
 from debug import *
+import errno
 import socket, time
 import gtk
 from timedops import TimedOperation


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- system-config-printer.spec	22 Sep 2009 09:31:53 -0000	1.286
+++ system-config-printer.spec	22 Sep 2009 10:06:35 -0000	1.287
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-fetchdevices.patch
+Patch2: system-config-printer-missing-import.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,6 +66,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .fetchdevices
+%patch2 -p1 -b .missing-import
 
 %build
 %configure
@@ -167,6 +169,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).
 
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1



From petersen at fedoraproject.org  Tue Sep 22 10:08:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Sep 2009 10:08:18 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.3,
	1.4 ghc-rpm-macros.spec, 1.5, 1.6
Message-ID: <20090922100818.146D111C00E8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24189

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
revert last change - unversion ghcdocdir


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-rpm-macros.ghc	22 Sep 2009 03:25:59 -0000	1.3
+++ ghc-rpm-macros.ghc	22 Sep 2009 10:08:17 -0000	1.4
@@ -10,7 +10,7 @@ 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}
+%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}
 %ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
 
 %ghc_gen_filelists() \


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-rpm-macros.spec	22 Sep 2009 03:25:59 -0000	1.5
+++ ghc-rpm-macros.spec	22 Sep 2009 10:08:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
 Version:	0.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-2
+- no, revert versioned ghcdocdir again!
+
 * Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-1
 - version ghcdocdir to allow multiple doc versions like ghcpkgdir
 



From twaugh at fedoraproject.org  Tue Sep 22 10:09:06 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:09:06 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-data-button-state.patch, NONE,
	1.1 system-config-printer.spec, 1.287, 1.288
Message-ID: <20090922100906.4D77111C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24448

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-data-button-state.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed data button state.


system-config-printer-data-button-state.patch:
 system-config-printer.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-data-button-state.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.data-button-state system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.data-button-state	2009-09-22 11:06:43.573668929 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-22 11:07:08.140669325 +0100
@@ -1907,19 +1907,20 @@ class GUI(GtkGUI, monitor.Watcher):
     # set buttons sensitivity
     def setDataButtonState(self):
         try:
-            possible = (self.ppd and
-                        not bool (self.changed) and
-                        self.printer.enabled and
-                        not self.printer.rejecting)
+            printable = (self.ppd and
+                         not bool (self.changed) and
+                         self.printer.enabled and
+                         not self.printer.rejecting)
 
-            self.btnPrintTestPage.set_sensitive (possible)
+            self.btnPrintTestPage.set_sensitive (printable)
+            adjustable = not (self.discovered or bool (self.changed))
             for button in [self.btnChangePPD,
                            self.btnSelectDevice]:
-                button.set_sensitive (not bool (self.changed))
+                button.set_sensitive (adjustable)
 
             commands = (self.printer.type & cups.CUPS_PRINTER_COMMANDS) != 0
-            self.btnSelfTest.set_sensitive (commands and possible)
-            self.btnCleanHeads.set_sensitive (commands and possible)
+            self.btnSelfTest.set_sensitive (commands and printable)
+            self.btnCleanHeads.set_sensitive (commands and printable)
         except:
             pass
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- system-config-printer.spec	22 Sep 2009 10:06:35 -0000	1.287
+++ system-config-printer.spec	22 Sep 2009 10:09:06 -0000	1.288
@@ -15,8 +15,9 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch1: system-config-printer-fetchdevices.patch
-Patch2: system-config-printer-missing-import.patch
+Patch1: system-config-printer-data-button-state.patch
+Patch5: system-config-printer-fetchdevices.patch
+Patch6: system-config-printer-missing-import.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,8 +66,9 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .fetchdevices
-%patch2 -p1 -b .missing-import
+%patch1 -p1 -b .data-button-state
+%patch5 -p1 -b .fetchdevices
+%patch6 -p1 -b .missing-import
 
 %build
 %configure
@@ -169,6 +171,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed data button state.
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).
 



From twaugh at fedoraproject.org  Tue Sep 22 10:09:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:09:09 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-missing-import.patch, NONE,
	1.1 system-config-printer.spec, 1.253, 1.254
Message-ID: <20090922100909.9448511C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24479

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-missing-import.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed missing import in probe_printer module.


system-config-printer-missing-import.patch:
 probe_printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-missing-import.patch ---
diff -up system-config-printer-1.1.13/probe_printer.py.missing-import system-config-printer-1.1.13/probe_printer.py
--- system-config-printer-1.1.13/probe_printer.py.missing-import	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/probe_printer.py	2009-09-22 11:04:00.783672876 +0100
@@ -20,6 +20,7 @@
 
 import cupshelpers
 from debug import *
+import errno
 import socket, time
 import gtk
 from timedops import TimedOperation


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- system-config-printer.spec	22 Sep 2009 09:35:39 -0000	1.253
+++ system-config-printer.spec	22 Sep 2009 10:09:09 -0000	1.254
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-fetchdevices.patch
+Patch2: system-config-printer-missing-import.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,6 +66,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .fetchdevices
+%patch2 -p1 -b .missing-import
 
 %build
 %configure
@@ -167,6 +169,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).
 
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1



From jmoskovc at fedoraproject.org  Tue Sep 22 10:11:54 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 22 Sep 2009 10:11:54 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.10, 1.11 abrt.spec, 1.14, 1.15 sources,
	1.11, 1.12
Message-ID: <20090922101154.7117311C00E8@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25293

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
New version - 0.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Sep 2009 17:55:36 -0000	1.10
+++ .cvsignore	22 Sep 2009 10:11:54 -0000	1.11
@@ -1 +1 @@
-abrt-0.0.8.5.tar.gz
+abrt-0.0.9.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- abrt.spec	4 Sep 2009 17:55:36 -0000	1.14
+++ abrt.spec	22 Sep 2009 10:11:54 -0000	1.15
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 0.0.8.5
+Version: 0.0.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -11,7 +11,6 @@ URL: https://fedorahosted.org/abrt/
 Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz
 Source1: abrt.init
 BuildRequires: dbus-devel
-BuildRequires: dbus-c++-devel
 BuildRequires: gtk2-devel
 BuildRequires: curl-devel
 BuildRequires: rpm-devel >= 4.6
@@ -24,6 +23,7 @@ BuildRequires: file-devel
 BuildRequires: python-devel
 BuildRequires: gettext
 BuildRequires: nss-devel
+BuildRequires: polkit-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -145,6 +145,14 @@ Requires: %{name} = %{version}-%{release
 %description plugin-bugzilla
 Plugin to report bugs into the bugzilla.
 
+%package plugin-ticketuploader
+Summary: %{name}'s ticketuploader plugin
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-ticketuploader
+Plugin to report bugs into anonymous FTP site associated with ticketing system.
+
 %package plugin-filetransfer
 Summary: %{name}'s File Transfer plugin
 Group: System Environment/Libraries
@@ -242,6 +250,7 @@ fi
 %{_mandir}/man8/%{name}.8.gz
 %{_mandir}/man5/%{name}.conf.5.gz
 %{_mandir}/man7/%{name}-plugins.7.gz
+%{_datadir}/polkit-1/actions/org.fedoraproject.abrt.policy
 
 %files libs
 %defattr(-,root,root,-)
@@ -316,6 +325,13 @@ fi
 %{_libdir}/%{name}/Bugzilla.GTKBuilder
 %{_mandir}/man7/%{name}-Bugzilla.7.gz
 
+%files plugin-ticketuploader
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/TicketUploader.conf
+%{_libdir}/%{name}/libTicketUploader.so*
+%{_libdir}/%{name}/TicketUploader.GTKBuilder
+%{_mandir}/man7/%{name}-TicketUploader.7.gz
+
 %files plugin-filetransfer
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/FileTransfer.conf
@@ -337,6 +353,29 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Sep 22 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-1
+- new version
+- comments and how to reproduce are stored now (npajkovs at redhat.com)
+- reduce verbosity a bit (vda.linux at googlemail.com)
+- GUI: fixed word wrap in Comment field rhbz#524349 (jmoskovc at redhat.com)
+- remove last vestives of dbus-c++ from build system (vda.linux at googlemail.com)
+- GUI: added popup menu, fixed behaviour when run with root privs (jmoskovc at redhat.com)
+- add dbus signalization when quota exceeded (npajkovs at redhat.com)
+- Added cleaning of attachment variable, so there should not be mixed attachmetn anymore. (zprikryl at redhat.com)
+- fixed closing of debug dump in case of existing backtrace (zprikryl at redhat.com)
+- remove C++ dbus glue in src/CLI; fix a bug in --report (vda.linux at googlemail.com)
+- new polkit action for installing debuginfo, default "yes" (danny at rawhide.localdomain)
+- Polkit moved to Utils (can be used both in daemon and plugins) (danny at rawhide.localdomain)
+- oops... remove stray trailing '\' (vda.linux at googlemail.com)
+- GUI: added missing tooltips (jmoskovc at redhat.com)
+- PYHOOK: ignore KeyboardInterrupt exception (jmoskovc at redhat.com)
+- added ticket uploader plugin (gavin at redhat.com) (zprikryl at redhat.com)
+- GUI: added UI for global settings (just preview, not usable!) (jmoskovc at redhat.com)
+- Add checker if bugzilla login and password are filled in. (npajkovs at redhat.com)
+- Add new config option InstallDebuginfo into CCpp.conf (npajkovs at redhat.com)
+- translation updates
+- many other fixes
+
 * Fri Sep  4 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.8.5-1
 - new version
 - APPLET: added about dialog, removed popup, if icon is not visible, fixed (trac#43) (jmoskovc at redhat.com)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Sep 2009 17:55:36 -0000	1.11
+++ sources	22 Sep 2009 10:11:54 -0000	1.12
@@ -1 +1 @@
-a66bdfb2d95a2a7c71ac6aa56be98d5e  abrt-0.0.8.5.tar.gz
+2d668c6d53564c05b8266eadff90f2c6  abrt-0.0.9.tar.gz



From twaugh at fedoraproject.org  Tue Sep 22 10:13:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:13:19 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-data-button-state.patch, NONE,
	1.1 system-config-printer.spec, 1.254, 1.255
Message-ID: <20090922101319.1138611C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25889

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-data-button-state.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed data button state.


system-config-printer-data-button-state.patch:
 system-config-printer.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-data-button-state.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.data-button-state system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.data-button-state	2009-09-22 11:06:43.573668929 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-22 11:07:08.140669325 +0100
@@ -1907,19 +1907,20 @@ class GUI(GtkGUI, monitor.Watcher):
     # set buttons sensitivity
     def setDataButtonState(self):
         try:
-            possible = (self.ppd and
-                        not bool (self.changed) and
-                        self.printer.enabled and
-                        not self.printer.rejecting)
+            printable = (self.ppd and
+                         not bool (self.changed) and
+                         self.printer.enabled and
+                         not self.printer.rejecting)
 
-            self.btnPrintTestPage.set_sensitive (possible)
+            self.btnPrintTestPage.set_sensitive (printable)
+            adjustable = not (self.discovered or bool (self.changed))
             for button in [self.btnChangePPD,
                            self.btnSelectDevice]:
-                button.set_sensitive (not bool (self.changed))
+                button.set_sensitive (adjustable)
 
             commands = (self.printer.type & cups.CUPS_PRINTER_COMMANDS) != 0
-            self.btnSelfTest.set_sensitive (commands and possible)
-            self.btnCleanHeads.set_sensitive (commands and possible)
+            self.btnSelfTest.set_sensitive (commands and printable)
+            self.btnCleanHeads.set_sensitive (commands and printable)
         except:
             pass
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -p -r1.254 -r1.255
--- system-config-printer.spec	22 Sep 2009 10:09:09 -0000	1.254
+++ system-config-printer.spec	22 Sep 2009 10:13:18 -0000	1.255
@@ -15,8 +15,9 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch1: system-config-printer-fetchdevices.patch
-Patch2: system-config-printer-missing-import.patch
+Patch1: system-config-printer-data-button-state.patch
+Patch5: system-config-printer-fetchdevices.patch
+Patch6: system-config-printer-missing-import.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,8 +66,9 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .fetchdevices
-%patch2 -p1 -b .missing-import
+%patch1 -p1 -b .data-button-state
+%patch5 -p1 -b .fetchdevices
+%patch6 -p1 -b .missing-import
 
 %build
 %configure
@@ -169,6 +171,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed data button state.
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).
 



From twaugh at fedoraproject.org  Tue Sep 22 10:18:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:18:07 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-cancel-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.255, 1.256
Message-ID: <20090922101807.77FA711C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27211

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cancel-traceback.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed traceback when cancelling change-driver dialog.


system-config-printer-cancel-traceback.patch:
 system-config-printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-cancel-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.cancel-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.cancel-traceback	2009-09-18 13:10:10.962438215 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:10:20.041314240 +0100
@@ -3805,6 +3805,7 @@ class NewPrinterGUI(GtkGUI):
         self.options = {} # keyword -> Option object
         self.changed = set()
         self.conflicts = set()
+        self.fetchDevices_op = None
 
         combobox = self.cmbNPDownloadableDriverFoundPrinters
         combobox.set_model (gtk.ListStore (str, str))


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- system-config-printer.spec	22 Sep 2009 10:13:18 -0000	1.255
+++ system-config-printer.spec	22 Sep 2009 10:18:07 -0000	1.256
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-data-button-state.patch
+Patch2: system-config-printer-cancel-traceback.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
 
@@ -67,6 +68,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .data-button-state
+%patch2 -p1 -b .cancel-traceback
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
 
@@ -171,6 +173,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).



From twaugh at fedoraproject.org  Tue Sep 22 10:18:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Sep 2009 10:18:28 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-cancel-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.288, 1.289
Message-ID: <20090922101828.997B711C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27406

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cancel-traceback.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed traceback when cancelling change-driver dialog.


system-config-printer-cancel-traceback.patch:
 system-config-printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-cancel-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.cancel-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.cancel-traceback	2009-09-18 13:10:10.962438215 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:10:20.041314240 +0100
@@ -3805,6 +3805,7 @@ class NewPrinterGUI(GtkGUI):
         self.options = {} # keyword -> Option object
         self.changed = set()
         self.conflicts = set()
+        self.fetchDevices_op = None
 
         combobox = self.cmbNPDownloadableDriverFoundPrinters
         combobox.set_model (gtk.ListStore (str, str))


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- system-config-printer.spec	22 Sep 2009 10:09:06 -0000	1.288
+++ system-config-printer.spec	22 Sep 2009 10:18:28 -0000	1.289
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-data-button-state.patch
+Patch2: system-config-printer-cancel-traceback.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
 
@@ -67,6 +68,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .data-button-state
+%patch2 -p1 -b .cancel-traceback
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
 
@@ -171,6 +173,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).



From transif at fedoraproject.org  Tue Sep 22 10:32:31 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 22 Sep 2009 10:32:31 +0000 (UTC)
Subject: comps/po ml.po,1.21,1.22
Message-ID: <20090922103231.501EF11C00E8@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32203/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.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ml.po	2 Sep 2009 13:18:04 -0000	1.21
+++ ml.po	22 Sep 2009 10:32:29 -0000	1.22
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-02 11:49+0530\n"
+"POT-Creation-Date: 2009-09-22 04:31+0000\n"
+"PO-Revision-Date: 2009-09-22 12:04+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -820,7 +820,7 @@ msgstr "???????????????????????? ???????
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
 #: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
 msgid "Software used for running network servers"
-msgstr "????????????????????????????????????????????? ????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????"
+msgstr "????????????????????????????????????????????? ????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
@@ -1073,7 +1073,7 @@ msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"??????????????????????????????-???????????????????????? ????????????????????????, Web, ?????????????????? ??????????????????????????????????????? ?????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????????. ??? "
+"??????????????????????????????-???????????????????????? ????????????????????????, Web, ?????????????????? ???????????????????????????????????? ?????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????????. ??? "
 "???????????????????????????????????????????????? X Window ???????????????????????? ??????????????????????????????."
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
@@ -1083,8 +1083,8 @@ msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
 msgstr ""
-"?????????????????? ??????????????????????????????????????? ???????????????????????? ?????????????????????, ????????????????????????????????????????????? ?????????????????????????????????????????? ??????????????????????????????????????? ??????????????? ???????????????????????????????????? "
-"??????????????????????????????????????????????????? ??????????????????????????? ????????? ???????????????????????? ??? ?????????????????? "
+"?????????????????????????????????????????? ??????????????????????????????????????? ???????????????????????? ?????????????????????, ????????????????????????????????????????????? ?????????????????????????????????????????? \n"
+"??????????????????????????????????????? ??????????????? ???????????????????????????????????? ??????????????????????????????????????????????????? ??????????????????????????? ????????? ???????????????????????? ??? ??????????????????."
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
@@ -1539,8 +1539,8 @@ msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
 msgstr ""
-"??????????????? ?????????????????? ???????????????????????????????????? ?????????????????????????????????????????? ???????????? ???????????????????????????????????????????????? ???????????????????????? ????????????????????????????????? "
-"??????????????????????????????????????? ????????????????????????????????????"
+"??????????????? ?????????????????? ???????????????????????????????????? ?????????????????????????????????????????? ???????????? ???????????????????????????????????????????????? ???????????????????????? ????????????????????????????????? ??????????????????????????????????????? "
+"????????????????????????????????????"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1571,13 +1571,12 @@ msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
 msgstr ""
-"????????? ???????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????????, ????????????????????? ?????????????????????????????? ????????????????????????????????????????????? "
-"?????? ?????????????????????????????????????????? ??????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????? ????????? ????????????????????????????????????????????? X11 ????????????????????????????????? "
-"??????????????????????????????????????????????????????????????? LXDE."
+"????????? ???????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????????, ????????????????????? ?????????????????????????????? ????????????????????????????????????????????? ?????? ?????????????????????????????????????????? "
+"??????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????? ????????? ????????????????????????????????????????????? X11 ????????????????????????????????? ??????????????????????????????????????????????????????????????? LXDE."
 
 #: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
 msgid "Machine and user identity servers."
-msgstr "?????????????????? ?????????????????? ?????????????????????????????? ?????????????????????????????????."
+msgstr "?????????????????? ????????????????????????????????? ??????????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
 msgid "Moblin Desktop Environment"
@@ -1600,16 +1599,16 @@ msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? "
-"???????????????????????????????????? ?????????????????? ?????????????????????????????????????????? ????????? GNOME. "
+"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? "
+"???????????????????????????????????? ?????????????????? ???????????????????????????????????????????????? GNOME. "
 
 #: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? "
-"???????????????????????????????????? ?????????????????? ?????????????????????????????????????????? ????????? KDE. "
+"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? "
+"???????????????????????????????????? ?????????????????? ???????????????????????????????????????????????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
@@ -1628,8 +1627,8 @@ msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
-"DocBook format????????? ??????????????????????????????????????????????????? ??????????????????????????????????????????, ???????????? HTML, PDF, Postscript, text "
-"?????????????????????????????????????????? ??????????????????????????????????????? ????????????????????????????????????????????? ??? ????????????????????????????????? ??????????????????????????????????????????."
+"DocBook ??????????????????????????? ????????????????????????????????????????????????????????? ???????????????????????????????????????????????????, ???????????? HTML, PDF, Postscript, text "
+"?????????????????????????????????????????? ??????????????????????????????????????????????????????????????? ??? ????????????????????????????????? ??????????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"



From pkgdb at fedoraproject.org  Tue Sep 22 10:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:39:04 +0000
Subject: [pkgdb] parrot: gerd has requested watchbugzilla
Message-ID: <20090922103904.E4EF310F876@bastion2.fedora.phx.redhat.com>

gerd has requested the watchbugzilla acl on parrot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:39:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:39:10 +0000
Subject: [pkgdb] parrot: gerd has requested watchcommits
Message-ID: <20090922103911.53EF410F87E@bastion2.fedora.phx.redhat.com>

gerd has requested the watchcommits acl on parrot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:39:14 +0000
Subject: [pkgdb] parrot: gerd has requested commit
Message-ID: <20090922103914.2592B10F861@bastion2.fedora.phx.redhat.com>

gerd has requested the commit acl on parrot (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:40:21 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090922104021.354B510F876@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on parrot (Fedora devel) to Approved for gerd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:40:25 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090922104025.CB00210F87C@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on parrot (Fedora devel) to Approved for gerd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:40:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:40:30 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090922104030.9CB2010F883@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on parrot (Fedora devel) to Approved for gerd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:41:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:41:22 +0000
Subject: [pkgdb] parrot: gerd has requested watchbugzilla
Message-ID: <20090922104123.9CA4B10F861@bastion2.fedora.phx.redhat.com>

gerd has requested the watchbugzilla acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:41:32 +0000
Subject: [pkgdb] parrot: gerd has requested watchcommits
Message-ID: <20090922104132.C3F8010F861@bastion2.fedora.phx.redhat.com>

gerd has requested the watchcommits acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:41:38 +0000
Subject: [pkgdb] parrot: gerd has requested commit
Message-ID: <20090922104138.20C0F10F87E@bastion2.fedora.phx.redhat.com>

gerd has requested the commit acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:41:49 +0000
Subject: [pkgdb] parrot: gerd has given up approveacls
Message-ID: <20090922104149.587F210F890@bastion2.fedora.phx.redhat.com>

gerd has given up the approveacls acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 10:41:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 10:41:44 +0000
Subject: [pkgdb] parrot: gerd has requested approveacls
Message-ID: <20090922104144.DE44C10F810@bastion2.fedora.phx.redhat.com>

gerd has requested the approveacls acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From gerd at fedoraproject.org  Tue Sep 22 10:52:16 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 22 Sep 2009 10:52:16 +0000 (UTC)
Subject: rpms/parrot/F-11 parrot.spec,1.11,1.12
Message-ID: <20090922105216.6188111C00E8@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6105

Modified Files:
	parrot.spec 
Log Message:
build without jitcapable; necessary for rakudo-rpm on ix86 at the moment


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- parrot.spec	15 Sep 2009 18:18:22 -0000	1.11
+++ parrot.spec	22 Sep 2009 10:52:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -128,7 +128,8 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex
+    --lex=%{_bindir}/flex \
+    --jitcapable=0     # necessary for rakudo-rpm on ix86
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
@@ -283,9 +284,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
-- new upstream version
+* Tue Sep 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-2
 - build only without the option '-O2' on ppc64
+- build without jitcapable; necessary for rakudo-rpm on ix86 at the moment
 
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl



From rvokal at fedoraproject.org  Tue Sep 22 11:03:33 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Tue, 22 Sep 2009 11:03:33 +0000 (UTC)
Subject: rpms/wireshark/F-11 .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 wireshark.spec, 1.53, 1.54
Message-ID: <20090922110334.0214E11C00E8@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11169

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	23 Jul 2009 14:11:25 -0000	1.26
+++ .cvsignore	22 Sep 2009 11:03:33 -0000	1.27
@@ -1 +1 @@
-wireshark-1.2.1.tar.bz2
+wireshark-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	23 Jul 2009 14:11:25 -0000	1.26
+++ sources	22 Sep 2009 11:03:33 -0000	1.27
@@ -1 +1 @@
-957d1b11a6c9b305bcd106d4084ff71e  wireshark-1.2.1.tar.bz2
+bb5c09b8cffd461ced4d3251fddb217b  wireshark-1.2.2.tar.bz2


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-11/wireshark.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- wireshark.spec	23 Jul 2009 14:11:25 -0000	1.53
+++ wireshark.spec	22 Sep 2009 11:03:33 -0000	1.54
@@ -6,7 +6,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.1
+Version:	1.2.2
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -210,6 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Radek Vokal <rvokal at redhat.com> - 1.2.2
+- upgrade to 1.2.2
+- http://www.wireshark.org/docs/relnotes/wireshark-1.2.2.html
+
 * Thu Jul 23 2009 Radek Vokal <rvokal at redhat.com> - 1.2.1
 - upgrade to 1.2.1
 - http://www.wireshark.org/docs/relnotes/wireshark-1.2.1.html



From caolanm at fedoraproject.org  Tue Sep 22 11:04:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 22 Sep 2009 11:04:09 +0000 (UTC)
Subject: rpms/libtextcat/devel zulu.lm, NONE, 1.1 .cvsignore, 1.2,
	1.3 libtextcat.spec, 1.9, 1.10
Message-ID: <20090922110409.3D13711C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libtextcat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11394

Modified Files:
	.cvsignore libtextcat.spec 
Added Files:
	zulu.lm 
Log Message:
Resolves: rhbz#524816 add Zulu fingerprint


--- NEW FILE zulu.lm ---
_
a
e
i
n
u
o
l
k
h
s
a_
b
t
m
g
w
z
e_
i_
ng
ku
d
y
la
an
_n
th
le
_u
o_
el
ba
_k
en
in
wa
p
_e
zi
.
hi
si
al
ha
uk
ab
_i
r
is
ka
_a
kh
we
li
ni
ma
_ng
he
ul
._
ga
thi
la_
be
ak
c
on
nd
na
ok
am
lo
ho
,
se
ph
hi_
ut
es
nga
_ku
,_
ez
thi_
un
uth
le_
uku
hu
f
u_
um
ek
ne
go
q
_uk
at
aba
_l
sh
lu
M
_uku
ol
_b
hl
ni_
ngo
kw
-
N
ik
oku
em
nt
as
ge
az
ya
iz
sa
_o
S
uthi
A
za
_w
wa_
_s
mb
kut
kuth
ela
ye
_y
uthi_
il
ay
ele
ba_
I
dl
nge
ath
ub
ke
U
zo
na_
yi
us
kuthi
esi
ob
v
om
ama
it
lo_
bu
L
ezi
j
ny
im
ing
li_
_ab
eni
no
de
ela_
ze
ang
ko
ala
lw
yo
zin
_U
lel
eng
mi
_ngo
eb
uz
me
gi
ti
ukut
so
ukuth
bo
da
_ba
nz
_aba
the
eli
akh
eni_
E
ban
s_
aka
_kw
ma_
ap
_ukut
he_
ini
di
K
ka_
ib
kwa
ulu
ele_
kho
nj
bi
_z
khu
we_
lal
enz
ho_
et
C
gu
zi_
and
hla
ngi
pha
_um
_ka
isi
_nge
isa
aph
ung
izi
dla
ala_
zw
nde
to
n_
ne_
nk
ke_
_I
athi
_no
lan
_wa
kul
B
ind
fu
wen
ikh
azi
ule
kub
e.
_S
x
o.
ona
kha
_iz
je
bh
_M
er
kwe
oba
ane
O
_N
sa_
a.
lwa
_ez
kus
ki
mu
od
"
ebe
P
_nga
hul
_m
ase
ben
_be
T
ic
nda
_si
_na
/
ant
ngu
ad
anga
nje
ith
a._
ye_
athi_
R
os
alo
tha
za_
eth
_es
uma
ana
ile
te
ale
aban
:
_A
oba_
hat
kun
ha_
phe
be_
ali
_am
si_
wo
uy
sik
ise
kan
hath
dlal
_ne
zwe
aw
han
tu
nye
qe
_ko
ah
hel
thu
isa_
gob
_K
_lo
ta
_ama
ot
ula
_em
ze_
i.
ngob
_izi
hol
ar
ani
ole
uba
_in
up
eka
ini_
goba
tho
hon
_ezi
ona_
ezin
ngoba
lu_
goba_
ip
a,
eli_
t_
nya
ndl
sha
_is
the_
i._
amb


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtextcat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jul 2007 18:39:24 -0000	1.2
+++ .cvsignore	22 Sep 2009 11:04:08 -0000	1.3
@@ -1 +1,2 @@
 libtextcat-2.2.tar.gz
+zulu.lm


Index: libtextcat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtextcat/devel/libtextcat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libtextcat.spec	25 Jul 2009 08:44:51 -0000	1.9
+++ libtextcat.spec	22 Sep 2009 11:04:08 -0000	1.10
@@ -1,14 +1,15 @@
 Summary: Text Categorization Library
 Name: libtextcat
 Version: 2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Libraries
 License: BSD
 Source0: http://software.wise-guys.nl/download/%{name}-%{version}.tar.gz
-Source1: http://external.openoffice.org/source/browse/*checkout*/external/libtextcat/data/new_fingerprints/fpdb.conf
-Source2: http://external.openoffice.org/source/browse/*checkout*/external/libtextcat/data/new_fingerprints/lm/chinese_simplified.lm
-Source3: http://external.openoffice.org/source/browse/*checkout*/external/libtextcat/data/new_fingerprints/lm/chinese_traditional.lm
-Source4: http://external.openoffice.org/source/browse/*checkout*/external/libtextcat/data/new_fingerprints/lm/japanese.lm
+Source1: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/fpdb.conf
+Source2: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/chinese_simplified.lm
+Source3: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/chinese_traditional.lm
+Source4: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/japanese.lm
+Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/64896/zulu.lm
 URL: http://software.wise-guys.nl/libtextcat/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool
@@ -117,6 +118,7 @@ iconv -f ISO-8859-1 -t UTF-8 vietnamese.
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/chinese_simplified.lm
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/chinese_traditional.lm
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/japanese.lm
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/zulu.lm
 
 %post -p /sbin/ldconfig
 
@@ -138,6 +140,9 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/%{_data
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 22 2009 Caolan McNamara <caolanm at redhat.com> 2.2-9
+- Resolves: rhbz#524816 add Zulu fingerprint
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Sep 22 11:11:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 11:11:14 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090922111115.6FB7B10F861@bastion2.fedora.phx.redhat.com>

gerd has set the commit acl on parrot (Fedora 11) to Obsolete for gerd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 11:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 11:11:19 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090922111119.0954B10F87C@bastion2.fedora.phx.redhat.com>

gerd has set the watchcommits acl on parrot (Fedora 11) to Obsolete for gerd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 11:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 11:11:24 +0000
Subject: [pkgdb] parrot had acl change status
Message-ID: <20090922111124.1ED1F10F883@bastion2.fedora.phx.redhat.com>

gerd has set the watchbugzilla acl on parrot (Fedora 11) to Obsolete for gerd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 11:11:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 11:11:27 +0000
Subject: [pkgdb] parrot: gerd has requested watchbugzilla
Message-ID: <20090922111127.95E9E10F861@bastion2.fedora.phx.redhat.com>

gerd has requested the watchbugzilla acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 11:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 11:11:31 +0000
Subject: [pkgdb] parrot: gerd has requested watchcommits
Message-ID: <20090922111131.94E1710F88A@bastion2.fedora.phx.redhat.com>

gerd has requested the watchcommits acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Tue Sep 22 11:11:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 11:11:34 +0000
Subject: [pkgdb] parrot: gerd has requested commit
Message-ID: <20090922111134.73DD710F898@bastion2.fedora.phx.redhat.com>

gerd has requested the commit acl on parrot (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From dnovotny at fedoraproject.org  Tue Sep 22 11:22:48 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 22 Sep 2009 11:22:48 +0000 (UTC)
Subject: rpms/emacs/F-11 emacs.spec,1.129,1.130
Message-ID: <20090922112248.DE80B11C00E8@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16437

Modified Files:
	emacs.spec 
Log Message:
fix #510750



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- emacs.spec	26 Aug 2009 10:53:58 -0000	1.129
+++ emacs.spec	22 Sep 2009 11:22:45 -0000	1.130
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -141,6 +141,13 @@ grep -v "tetris.elc" lisp/Makefile.in > 
 rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
 %endif
 
+%define info_files ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail speedbar tramp url vip viper widget woman
+
+if test "$(perl -e 'while (<>) { if (/^INFO_FILES/) { s/.*=//; while (s/\\$//) { s/\\//; $_ .= <>; }; s/\s+/ /g; s/^ //; s/ $//; print; exit; } }' Makefile.in)" != "%info_files"; then
+  echo Please update info_files >&2
+  exit 1
+fi
+
 %ifarch %{ix86}
 %define setarch setarch %{_arch} -R
 %else
@@ -269,8 +276,6 @@ cat el-*-files common-lisp-dir-files > e
 %clean
 rm -rf %{buildroot}
 
-%define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
-
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -373,6 +378,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Sep 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-4
+- update %%info_files (#510750)
+
 * Wed Aug 26 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-3
 - correct BuildRequires for libotf (#519151)
 



From gerd at fedoraproject.org  Tue Sep 22 11:24:28 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 22 Sep 2009 11:24:28 +0000 (UTC)
Subject: rpms/parrot/devel import.log,1.14,1.15 parrot.spec,1.19,1.20
Message-ID: <20090922112428.82D8311C00E8@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16908/devel

Modified Files:
	import.log parrot.spec 
Log Message:
build without jitcapable; necessary for rakudo-rpm on ix86 at the moment



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	15 Sep 2009 11:48:31 -0000	1.14
+++ import.log	22 Sep 2009 11:24:27 -0000	1.15
@@ -12,3 +12,4 @@ parrot-1_4_0-8_fc11:HEAD:parrot-1.4.0-8.
 parrot-1_5_0-1_fc11:HEAD:parrot-1.5.0-1.fc11.src.rpm:1250871327
 parrot-1_5_0-2_40969svn_fc11:HEAD:parrot-1.5.0-2.40969svn.fc11.src.rpm:1252076899
 parrot-1_6_0-1_fc11:HEAD:parrot-1.6.0-1.fc11.src.rpm:1253015088
+parrot-1_6_0-2_fc11:HEAD:parrot-1.6.0-2.fc11.src.rpm:1253618562


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- parrot.spec	15 Sep 2009 12:23:24 -0000	1.19
+++ parrot.spec	22 Sep 2009 11:24:28 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -128,7 +128,8 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex
+    --lex=%{_bindir}/flex \
+    --jitcapable=0     # necessary for rakudo-rpm on ix86
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
@@ -283,9 +284,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
-- new upstream version
+* Tue Sep 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-2
 - build only without the option '-O2' on ppc64
+- build without jitcapable; necessary for rakudo-rpm on ix86 at the moment
 
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl



From leigh123linux at fedoraproject.org  Tue Sep 22 11:25:39 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Tue, 22 Sep 2009 11:25:39 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.14, 1.15 qbittorrent.spec, 1.34,
	1.35 sources, 1.14, 1.15
Message-ID: <20090922112539.0F18511C00E8@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17537

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Tue Sep 22 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.2-1
- update to 1.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	10 Sep 2009 16:08:08 -0000	1.14
+++ .cvsignore	22 Sep 2009 11:25:37 -0000	1.15
@@ -1 +1 @@
-qbittorrent-1.5.1.tar.gz
+qbittorrent-1.5.2.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- qbittorrent.spec	10 Sep 2009 16:18:50 -0000	1.34
+++ qbittorrent.spec	22 Sep 2009 11:25:38 -0000	1.35
@@ -2,8 +2,8 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.1
-Release: 2%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Tue Sep 22 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.2-1
+- update to 1.5.2
+
 * Thu Sep 10 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.1-2
 - correct prep section package name
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Sep 2009 16:08:09 -0000	1.14
+++ sources	22 Sep 2009 11:25:38 -0000	1.15
@@ -1 +1 @@
-dd7f31dbfc397efee111a908bad31e6e  qbittorrent-1.5.1.tar.gz
+4b0440513eda51523fdd504274b057da  qbittorrent-1.5.2.tar.gz



From jmoskovc at fedoraproject.org  Tue Sep 22 11:26:19 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 22 Sep 2009 11:26:19 +0000 (UTC)
Subject: rpms/usbutils/devel usbutils.spec,1.31,1.32
Message-ID: <20090922112619.8D0E911C00E8@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/usbutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17654

Modified Files:
	usbutils.spec 
Log Message:
Spec file fixes - rhbz#524005



Index: usbutils.spec
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- usbutils.spec	16 Sep 2009 11:44:30 -0000	1.31
+++ usbutils.spec	22 Sep 2009 11:26:19 -0000	1.32
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 0.86
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
@@ -36,8 +36,8 @@ sed -i 's|usbids=/usr/share/usb.ids|usbi
 %files
 %defattr(-,root,root,-)
 %{_mandir}/*/*
-%{_sbindir}
-%{_bindir}
+%{_sbindir}/*
+%{_bindir}/*
 %{_datadir}/pkgconfig/usbutils.pc
 %doc AUTHORS COPYING ChangeLog NEWS README
 
@@ -45,6 +45,9 @@ sed -i 's|usbids=/usr/share/usb.ids|usbi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 22 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.86-2
+- spec file fixes - package should not own /usr/{bin,sbin} (rhbz#524005)
+
 * Wed Sep 16 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.86-1
 - new version
 - spec file fixes as suggested in rhbz#466041 (info at owlriver.com)



From akurtakov at fedoraproject.org  Tue Sep 22 11:29:19 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Sep 2009 11:29:19 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec, 1.40,
	1.41 eclipse-mylyn-wikitext_builddoc.patch, 1.1, 1.2
Message-ID: <20090922112919.B239011C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18942/devel

Modified Files:
	eclipse-mylyn.spec eclipse-mylyn-wikitext_builddoc.patch 
Log Message:
Add patch for correct building of o.e.wikitext.help.ui.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- eclipse-mylyn.spec	4 Aug 2009 13:46:22 -0000	1.40
+++ eclipse-mylyn.spec	22 Sep 2009 11:29:18 -0000	1.41
@@ -11,7 +11,7 @@
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -33,6 +33,7 @@ Patch7: %{name}-nojaxb.patch
 # Our xmlrpc packages are split into JARs differently than Orbit
 # This patch is not suitable for upstream.
 Patch8: %{name}-splitxmlrpc.patch
+Patch9: %{name}-wikitext_builddoc.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -169,6 +170,7 @@ pushd org.eclipse.mylyn.bugzilla-feature
 popd
 %patch7
 %patch8
+%patch9
 
 find -name feature.xml |
   while read f; do
@@ -327,6 +329,9 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Sep 22 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-2
+- Add patch for correct building of o.e.wikitext.help.ui.
+
 * Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-1
 - Update to 3.2.1.
 

eclipse-mylyn-wikitext_builddoc.patch:
 MANIFEST.MF |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: eclipse-mylyn-wikitext_builddoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-wikitext_builddoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-mylyn-wikitext_builddoc.patch	25 Mar 2009 13:36:03 -0000	1.1
+++ eclipse-mylyn-wikitext_builddoc.patch	22 Sep 2009 11:29:18 -0000	1.2
@@ -1,10 +1,11 @@
---- org.eclipse.mylyn.wikitext.ui/META-INF/MANIFEST.MF.orig	2009-03-25 14:04:18.000000000 +0100
-+++ org.eclipse.mylyn.wikitext.ui/META-INF/MANIFEST.MF	2009-03-25 14:05:24.000000000 +0100
-@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.w
- Bundle-Version: 1.0.0.qualifier
+--- org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF.sav	2009-06-27 23:09:32.000000000 +0300
++++ org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF	2009-09-22 14:07:05.676264614 +0300
+@@ -6,5 +6,7 @@ Bundle-Version: 1.1.1.qualifier
  Bundle-Vendor: %Bundle-Vendor.0
- Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.0.0,1.1.0)",
-+ org.eclipse.mylyn.wikitext.textile.core;bundle-version="[1.0.0,1.1.0)",
-  org.eclipse.core.runtime,
-  org.eclipse.jface.text,
-  org.eclipse.ui,
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+-Require-Bundle: org.eclipse.help
++Require-Bundle: org.eclipse.help,
++      org.eclipse.mylyn.wikitext.core,
++      org.eclipse.mylyn.wikitext.textile.core
+ Bundle-Localization: plugin



From mlichvar at fedoraproject.org  Tue Sep 22 11:34:56 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 22 Sep 2009 11:34:56 +0000 (UTC)
Subject: rpms/openbox/devel openbox-3.4.7.2-24bit.patch, NONE,
	1.1 openbox.spec, 1.43, 1.44 sources, 1.14, 1.15
Message-ID: <20090922113456.C982111C00E8@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22242

Modified Files:
	openbox.spec sources 
Added Files:
	openbox-3.4.7.2-24bit.patch 
Log Message:
- Add support for 24-bit images (#524708)
- Update setlayout.c


openbox-3.4.7.2-24bit.patch:
 color.c |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE openbox-3.4.7.2-24bit.patch ---
commit 263833450d3fb1ca0bfffef302c4b204a3133766
Author: Mikael Magnusson <mikachu at gmail.com>
Date:   Sat Jun 6 11:12:06 2009 +0200

    Add support for 24bit

diff --git a/render/color.c b/render/color.c
index 41fcc71..5e3f216 100644
--- a/render/color.c
+++ b/render/color.c
@@ -143,6 +143,28 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
             }
         } else im->data = (gchar*) data;
         break;
+    case 24:
+    {
+        /* reverse the ordering, shifting left 16bit should be the first byte
+           out of three, etc */
+        const guint roff = (16 - RrRedOffset(inst)) / 8;
+        const guint goff = (16 - RrGreenOffset(inst)) / 8;
+        const guint boff = (16 - RrBlueOffset(inst)) / 8;
+        gint outx;
+        for (y = 0; y < im->height; y++) {
+            for (x = 0, outx = 0; x < im->width; x++, outx += 3) {
+                r = (data[x] >> RrDefaultRedOffset) & 0xFF;
+                g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
+                b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
+                p8[outx+roff] = r;
+                p8[outx+goff] = g;
+                p8[outx+boff] = b;
+            }
+            data += im->width;
+            p8 += im->bytes_per_line;
+        }
+        break;
+    }
     case 16:
         for (y = 0; y < im->height; y++) {
             for (x = 0; x < im->width; x++) {
@@ -191,7 +213,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         }
         break;
     default:
-        g_error("Your bit depth is currently unhandled\n");
+        g_error("This image bit depth (%i) is currently unhandled", im->bits_per_pixel);
 
     }
 }


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- openbox.spec	25 Jul 2009 20:45:01 -0000	1.43
+++ openbox.spec	22 Sep 2009 11:34:56 -0000	1.44
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.7.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -16,6 +16,7 @@ Patch0:		openbox-3.4.7.1-autostartdir.pa
 Patch1:		openbox-3.4.7.2-gdm.patch
 Patch2:		openbox-3.4.7.2-gnomesession.patch
 Patch3:		openbox-3.4.7.2-autostartid.patch
+Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +77,7 @@ The %{name}-libs package contains shared
 %patch1 -p1 -b .gdm
 %patch2 -p1 -b .gnomesession
 %patch3 -p1 -b .autostartid
+%patch4 -p1 -b .24bit
 
 
 %build
@@ -146,6 +148,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.7.2-11
+- Add support for 24-bit images (#524708)
+- Update setlayout.c
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.7.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	14 May 2008 16:42:55 -0000	1.14
+++ sources	22 Sep 2009 11:34:56 -0000	1.15
@@ -1,2 +1,2 @@
-76f263e1550532ae54fd53c3a49b2c71  setlayout.c
 9e7589e90519bc6ac2f4656ea6869439  openbox-3.4.7.2.tar.gz
+16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c



From dwalsh at fedoraproject.org  Tue Sep 22 12:49:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Sep 2009 12:49:55 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.90,
	1.91 selinux-policy.spec, 1.927, 1.928
Message-ID: <20090922124955.D1E3711C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17720

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-9
- Fix all kernel_request_load_module domains


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  199 ++++
 policy/modules/admin/rpm.te               |   65 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   31 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  319 ++++++
 policy/modules/apps/nsplugin.te           |  292 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  181 +++
 policy/modules/apps/sandbox.te            |  326 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   80 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |    5 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   29 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   47 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   34 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |   84 +
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  130 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1402 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 319 files changed, 14560 insertions(+), 2586 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- policy-F12.patch	21 Sep 2009 13:55:41 -0000	1.90
+++ policy-F12.patch	22 Sep 2009 12:49:52 -0000	1.91
@@ -12795,7 +12795,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.32/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-09-21 05:23:47.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-09-21 19:37:35.000000000 -0700
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -12837,12 +12837,10 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
-@@ -62,7 +69,9 @@
- kernel_read_system_state(NetworkManager_t)
+@@ -63,6 +70,8 @@
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
--kernel_load_module(NetworkManager_t)
-+kernel_request_load_module(NetworkManager_t)
+ kernel_load_module(NetworkManager_t)
 +kernel_read_debugfs(NetworkManager_t)
 +kernel_rw_net_sysctls(NetworkManager_t)
  
@@ -14859,6 +14857,17 @@ diff -b -B --ignore-all-space --exclude-
  userdom_dontaudit_search_user_home_dirs(pyzor_t)
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.6.32/policy/modules/services/radvd.te
+--- nsaserefpolicy/policy/modules/services/radvd.te	2009-08-14 13:14:31.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/radvd.te	2009-09-21 19:37:52.000000000 -0700
+@@ -41,6 +41,7 @@
+ kernel_rw_net_sysctls(radvd_t)
+ kernel_read_network_state(radvd_t)
+ kernel_read_system_state(radvd_t)
++kernel_request_load_module(radvd_t)
+ 
+ corenet_all_recvfrom_unlabeled(radvd_t)
+ corenet_all_recvfrom_netlabel(radvd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.6.32/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2009-07-14 11:19:57.000000000 -0700
 +++ serefpolicy-3.6.32/policy/modules/services/razor.fc	2009-09-16 07:03:09.000000000 -0700


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -p -r1.927 -r1.928
--- selinux-policy.spec	21 Sep 2009 13:55:41 -0000	1.927
+++ selinux-policy.spec	22 Sep 2009 12:49:53 -0000	1.928
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -447,9 +447,11 @@ exit 0
 %endif
 
 %changelog
-* Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-8
+* Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-9
 - Fix all kernel_request_load_module domains
 
+* Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-8
+- Fix all kernel_request_load_module domains
 
 * Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-7
 - Remove allow_exec* booleans for confined users.  Only available for unconfined_t



From tuxbrewr at fedoraproject.org  Tue Sep 22 13:05:47 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 22 Sep 2009 13:05:47 +0000 (UTC)
Subject: rpms/python-mwclient/devel mwclient-wmf.patch, NONE,
	1.1 python-mwclient.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090922130547.E2EC511C00E8@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/python-mwclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23049

Modified Files:
	.cvsignore sources 
Added Files:
	mwclient-wmf.patch python-mwclient.spec 
Log Message:
Initial build of python-mwclient

mwclient-wmf.patch:
 client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mwclient-wmf.patch ---
diff -up mwclient/client.py.wmf mwclient/client.py
--- mwclient/client.py.wmf	2009-07-16 21:22:54.000000000 -0500
+++ mwclient/client.py	2009-09-20 14:57:59.971785030 -0500
@@ -100,7 +100,7 @@ class Site(object):
 			if len(version) == 2 and version[1].endswith('alpha'):
 				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
 			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
-				self.version = (int(version[0]), int(version[1][:-5]), 'alpha-wmf')
+				self.version = (int(version[0]), int(version[1][:-9]), 'alpha-wmf')
 			elif len(version) == 3 and 'rc' in version[2]:
 				self.version = (int(version[0]), int(version[1]), version[2])
 			elif len(version) == 3:


--- NEW FILE python-mwclient.spec ---
%{!?pyver:%global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


Name:           python-mwclient
Version:        0.6.3
Release:        2%{?dist}
Summary:        Mwclient is a client to the MediaWiki API

Group:          System Environment/Libraries
License:        MIT
URL:            http://sourceforge.net/apps/mediawiki/mwclient/index.php?title=Main_Page
Source0:        http://downloads.sourceforge.net/mwclient/mwclient-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

## upstream patches
Patch100: mwclient-wmf.patch

BuildRequires:  python-devel
Requires:  python-simplejson

%description
Mwclient is a client to the MediaWiki API <http://mediawiki.org/wiki/API>
and allows access to almost all implemented API functions

%prep
%setup -q -n mwclient

%patch100 -p1 -b .wmf


%build
# intentionally left blank


%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 %{buildroot}%{python_sitelib}/mwclient/
install -pm 0644 *.py %{buildroot}%{python_sitelib}/mwclient/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/mwclient/


%changelog
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-2
- upstream wmf patch
- %%doc README.txt
- use %%global (instead of %%define)

* Tue Sep 15 2009  Steven M. Parrish <smparrish at gmail.com> - 0.6.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:05:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 13:05:47 -0000	1.2
@@ -0,0 +1 @@
+mwclient-0.6.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:05:16 -0000	1.1
+++ sources	22 Sep 2009 13:05:47 -0000	1.2
@@ -0,0 +1 @@
+3f050ea125dc31971130449da6e3c0c2  mwclient-0.6.3.zip



From hadess at fedoraproject.org  Tue Sep 22 13:09:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Sep 2009 13:09:57 +0000 (UTC)
Subject: rpms/gnome-media/devel
	0001-Fix-stream-volume-vs.-muted-status-problems.patch, NONE,
	1.1 gnome-media.spec, 1.181, 1.182
Message-ID: <20090922130957.CD36F11C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24504

Modified Files:
	gnome-media.spec 
Added Files:
	0001-Fix-stream-volume-vs.-muted-status-problems.patch 
Log Message:
* Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
- Fix problems with mute status handling in the applet and dialogue


0001-Fix-stream-volume-vs.-muted-status-problems.patch:
 gvc-channel-bar.c        |   30 +++++++++++++++++++-----------
 gvc-mixer-dialog.c       |    4 +++-
 gvc-stream-status-icon.c |   10 +++++++---
 3 files changed, 29 insertions(+), 15 deletions(-)

--- NEW FILE 0001-Fix-stream-volume-vs.-muted-status-problems.patch ---
>From bda054815bcb92c9bb269c4f6c282a6238c6b059 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 22 Sep 2009 13:57:04 +0100
Subject: [PATCH] Fix stream volume vs. muted status problems

We need to behave differently when we have and don't have a muted
button in the channel bar.

Only mute and unmute the channel bar on 0-level when we don't
show a mute button (status icon)

Tell front-ends of the value change when we switch between
the zero adjustment, and the normal one.

Don't unmute muted streams when raising the volume (dialogue)

Set the stream mute status before changing it in PA.

All this fixes the status icon's slider not unmuting streams, and
staying stuck to zero.

https://bugzilla.gnome.org/show_bug.cgi?id=595857
---
 gnome-volume-control/src/gvc-channel-bar.c        |   30 +++++++++++++-------
 gnome-volume-control/src/gvc-mixer-dialog.c       |    4 ++-
 gnome-volume-control/src/gvc-stream-status-icon.c |    9 +++++-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/gnome-volume-control/src/gvc-channel-bar.c b/gnome-volume-control/src/gvc-channel-bar.c
index a9794d3..bc53344 100644
--- a/gnome-volume-control/src/gvc-channel-bar.c
+++ b/gnome-volume-control/src/gvc-channel-bar.c
@@ -411,12 +411,14 @@ on_scale_button_release_event (GtkWidget      *widget,
 
         value = gtk_adjustment_get_value (adj);
 
-        /* this means the adjustment moved away from zero and
-          therefore we should unmute and set the volume. */
-        if (value > 0)
-                gvc_channel_bar_set_is_muted (bar, FALSE);
-        else
-                gvc_channel_bar_set_is_muted (bar, TRUE);
+        if (bar->priv->show_mute == FALSE) {
+                /* this means the adjustment moved away from zero and
+                 * therefore we should unmute and set the volume. */
+                if (value > 0)
+                        gvc_channel_bar_set_is_muted (bar, FALSE);
+                else
+                        gvc_channel_bar_set_is_muted (bar, TRUE);
+        }
 
         /* Play a sound! */
         ca_gtk_play_for_widget (GTK_WIDGET (bar), 0,
@@ -490,10 +492,12 @@ on_zero_adjustment_value_changed (GtkAdjustment *adjustment,
         value = gtk_adjustment_get_value (bar->priv->zero_adjustment);
         gtk_adjustment_set_value (bar->priv->adjustment, value);
 
-        /* this means the adjustment moved away from zero and
-          therefore we should unmute and set the volume. */
 
-        gvc_channel_bar_set_is_muted (bar, FALSE);
+        if (bar->priv->show_mute == FALSE) {
+                /* this means the adjustment moved away from zero and
+                 * therefore we should unmute and set the volume. */
+                gvc_channel_bar_set_is_muted (bar, value > 0.0);
+        }
 }
 
 static void
@@ -520,9 +524,11 @@ update_mute_button (GvcChannelBar *bar)
                         gtk_range_set_adjustment (GTK_RANGE (bar->priv->scale),
                                                   bar->priv->zero_adjustment);
                 } else {
-                        /* no longer muted so restore the original adjustment */
+                        /* no longer muted so restore the original adjustment
+                         * and tell the front-end that the value changed */
                         gtk_range_set_adjustment (GTK_RANGE (bar->priv->scale),
                                                   bar->priv->adjustment);
+                        gtk_adjustment_value_changed (bar->priv->adjustment);
                 }
         }
 }
@@ -534,9 +540,11 @@ gvc_channel_bar_set_is_muted (GvcChannelBar *bar,
         g_return_if_fail (GVC_IS_CHANNEL_BAR (bar));
 
         if (is_muted != bar->priv->is_muted) {
+                /* Update our internal state before telling the
+                 * front-end about our changes */
                 bar->priv->is_muted = is_muted;
-                g_object_notify (G_OBJECT (bar), "is-muted");
                 update_mute_button (bar);
+                g_object_notify (G_OBJECT (bar), "is-muted");
         }
 }
 
diff --git a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c
index 0be5e33..ffeba97 100644
--- a/gnome-volume-control/src/gvc-mixer-dialog.c
+++ b/gnome-volume-control/src/gvc-mixer-dialog.c
@@ -659,7 +659,9 @@ on_adjustment_value_changed (GtkAdjustment  *adjustment,
                 g_free (name);
 
                 /* FIXME would need to do that in the balance bar really... */
-                gvc_mixer_stream_set_is_muted (stream, volume == 0);
+                /* Make sure we do not unmute muted streams, there's a button for that */
+                if (volume == 0.0)
+                        gvc_mixer_stream_set_is_muted (stream, TRUE);
                 /* Only push the volume if it's actually changed */
                 if (gvc_mixer_stream_set_volume(stream, (pa_volume_t) rounded) != FALSE)
                         gvc_mixer_stream_push_volume (stream);
diff --git a/gnome-volume-control/src/gvc-stream-status-icon.c b/gnome-volume-control/src/gvc-stream-status-icon.c
index 37131ea..9185f1a 100644
--- a/gnome-volume-control/src/gvc-stream-status-icon.c
+++ b/gnome-volume-control/src/gvc-stream-status-icon.c
@@ -617,8 +617,13 @@ on_bar_is_muted_notify (GObject             *object,
         gboolean is_muted;
 
         is_muted = gvc_channel_bar_get_is_muted (GVC_CHANNEL_BAR (object));
-        gvc_mixer_stream_change_is_muted (icon->priv->mixer_stream,
-                                          is_muted);
+
+        if (gvc_mixer_stream_get_is_muted (icon->priv->mixer_stream) != is_muted) {
+                /* Update the stream before pushing the change */
+                gvc_mixer_stream_set_is_muted (icon->priv->mixer_stream, is_muted);
+                gvc_mixer_stream_change_is_muted (icon->priv->mixer_stream,
+                                                  is_muted);
+        }
 }
 
 static GObject *
-- 
1.6.2.5



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- gnome-media.spec	21 Sep 2009 14:43:00 -0000	1.181
+++ gnome-media.spec	22 Sep 2009 13:09:57 -0000	1.182
@@ -14,10 +14,12 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=595857
+Patch0:         0001-Fix-stream-volume-vs.-muted-status-problems.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -82,6 +84,7 @@ framework.
 
 %prep
 %setup -q
+%patch0 -p1 -b .mute
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -311,6 +314,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
+- Fix problems with mute status handling in the applet and dialogue
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From fabbione at fedoraproject.org  Tue Sep 22 13:15:24 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 22 Sep 2009 13:15:24 +0000 (UTC)
Subject: rpms/corosync/devel .cvsignore, 1.9, 1.10 corosync.spec, 1.33,
	1.34 sources, 1.11, 1.12
Message-ID: <20090922131524.3761A11C0374@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26150

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Jul 2009 19:03:18 -0000	1.9
+++ .cvsignore	22 Sep 2009 13:15:23 -0000	1.10
@@ -1 +1 @@
-corosync-1.0.0.tar.gz
+corosync-1.0.1.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- corosync.spec	28 Jul 2009 07:22:41 -0000	1.33
+++ corosync.spec	22 Sep 2009 13:15:23 -0000	1.34
@@ -2,8 +2,8 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.0.0
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.0.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
@@ -34,11 +34,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=%{_prefix} \
-		--sysconfdir=%{_sysconfdir} \
-		--localstatedir=%{_localstatedir} \
-		--libdir=%{_libdir}
+%{configure}
 
 %build
 make %{_smp_mflags}
@@ -203,6 +199,11 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
+- New upstream release
+- spec file updates:
+  * use proper configure macro
+
 * Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-3
 - spec file updates:
   * more consistent use of macros across the board


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	8 Jul 2009 19:03:18 -0000	1.11
+++ sources	22 Sep 2009 13:15:23 -0000	1.12
@@ -1 +1 @@
-257f5509f3da951ba84b596fedf42185  corosync-1.0.0.tar.gz
+75fe306a8e23c31a3b0a42798e01e466  corosync-1.0.1.tar.gz



From ovasik at fedoraproject.org  Tue Sep 22 13:24:03 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 22 Sep 2009 13:24:03 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-5.2.1-runuser.patch, 1.27,
	1.28 coreutils.spec, 1.278, 1.279
Message-ID: <20090922132403.B07A311C00E8@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30019

Modified Files:
	coreutils-5.2.1-runuser.patch coreutils.spec 
Log Message:
improve and correct runuser documentation (#524805)

coreutils-5.2.1-runuser.patch:
 coreutils-7.0/AUTHORS                 |    1 
 coreutils-7.0/README                  |    8 -
 coreutils-7.0/man/Makefile.am         |    1 
 coreutils-7.0/man/runuser.x           |   12 ++
 coreutils-7.0/src/Makefile.am         |    8 +
 coreutils-7.0/src/su.c                |  139 +++++++++++++++++++++++++++++++---
 coreutils-7.5/tests/misc/help-version |    1 
 coreutils-7.6/man/help2man            |    3 
 8 files changed, 158 insertions(+), 15 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- coreutils-5.2.1-runuser.patch	12 Sep 2009 09:28:48 -0000	1.27
+++ coreutils-5.2.1-runuser.patch	22 Sep 2009 13:24:02 -0000	1.28
@@ -32,9 +32,9 @@ diff -urNp coreutils-7.0.orig/man/runuse
 +.TP
 +More detailed Texinfo documentation could be found by command
 +.TP
-+\t\fBinfo su invocation\fR\t
++\t\fBinfo coreutils \(aqsu invocation\(aq\fR\t
 +.TP
-+since the command \fBrunuser\fR is trimmed down version of command \fBrunuser\fR.
++since the command \fBrunuser\fR is trimmed down version of command \fBsu\fR.
 +.br
 diff -urNp coreutils-7.0.orig/README coreutils-7.0/README
 --- coreutils-7.0.orig/README	2008-08-24 22:30:10.000000000 +0200
@@ -224,16 +224,18 @@ diff -urNp coreutils-7.0.orig/src/su.c c
    pam_end(pamh, 0);
    if (!same_session)
      setsid ();
-@@ -620,6 +665,26 @@ usage (int status)
+@@ -620,6 +665,28 @@ usage (int status)
    else
      {
        printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name);
 +#ifdef RUNUSER
-+      fputs (_("\
-+Change the effective user id and group id to that of USER.  No PAM hooks\n\
-+are run, and there will be no password prompt.  This command is useful\n\
++      printf (_("\
++Change the effective user id and group id to that of USER.  Only session PAM\n\
++hooks are run, and there is no password prompt.  This command is useful only\n\
 +when run as the root user.  If run as a non-root user without privilege\n\
-+to set user ID, the command will fail.\n\
++to set user ID, the command will fail as the binary is not setuid.\n\
++As %s doesn't run auth and account PAM hooks, it runs with lower overhead\n\
++than su.\n\
 +\n\
 +  -, -l, --login               make the shell a login shell, uses runuser-l\n\
 +                               PAM file instead of default one\n\
@@ -246,7 +248,7 @@ diff -urNp coreutils-7.0.orig/src/su.c c
 +  -m, --preserve-environment   do not reset environment variables\n\
 +  -p                           same as -m\n\
 +  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n\
-+"), stdout);
++"), program_name);
 +#else
        fputs (_("\
  Change the effective user id and group id to that of USER.\n\
@@ -366,3 +368,16 @@ diff -urNp coreutils-7.5.orig/tests/misc
  timeout_args=--version
  
  # I'd rather not run sync, since it spins up disks that I've
+diff -urNp coreutils-7.6-orig/man/help2man coreutils-7.6/man/help2man
+--- coreutils-7.6-orig/man/help2man	2009-09-01 13:01:16.000000000 +0200
++++ coreutils-7.6/man/help2man	2009-09-22 15:15:01.000000000 +0200
+@@ -550,6 +550,9 @@ while (length)
+     $include{$sect} .= $content;
+ }
+ 
++# There is no info documentation for runuser (shared with su).
++$opt_no_info = 1 if $program eq 'runuser';
++
+ # Refer to the real documentation.
+ unless ($opt_no_info)
+ {


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- coreutils.spec	21 Sep 2009 06:08:13 -0000	1.278
+++ coreutils.spec	22 Sep 2009 13:24:02 -0000	1.279
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -329,6 +329,9 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Tue Sep 22 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-5
+- improve and correct runuser documentation (#524805)
+
 * Mon Sep 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-4
 - add dircolors color for GNU lzip (#516897)
 



From mcpierce at fedoraproject.org  Tue Sep 22 13:24:06 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue, 22 Sep 2009 13:24:06 +0000 (UTC)
Subject: rpms/rubygem-activeldap/devel .cvsignore, 1.7,
	1.8 rubygem-activeldap.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090922132406.3DE6C11C00E8@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-activeldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30036

Modified Files:
	.cvsignore rubygem-activeldap.spec sources 
Log Message:
* Tue Sep 22 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.2.0-1
- Release 1.2.0 of ActiveLDAP.
- Changed dependency on rubygem-activerecord to be >= 2.3.4
- Changed dependency on rubygem-hoe to be >= 2.3.3
- Added new l12n files to spec.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeldap/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Jul 2009 14:39:13 -0000	1.7
+++ .cvsignore	22 Sep 2009 13:24:05 -0000	1.8
@@ -1 +1 @@
-activeldap-1.1.0.gem
+activeldap-1.2.0.gem


Index: rubygem-activeldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeldap/devel/rubygem-activeldap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-activeldap.spec	30 Jul 2009 12:22:03 -0000	1.11
+++ rubygem-activeldap.spec	22 Sep 2009 13:24:06 -0000	1.12
@@ -8,7 +8,7 @@
 
 Summary:        Ruby/ActiveLdap is a object-oriented API to LDAP
 Name:           rubygem-%{gemname}
-Version:        1.1.0
+Version:        1.2.0
 Release:        3%{?dist}
 Group:          Development/Languages
 License:        GPLv2+
@@ -17,11 +17,11 @@ Source0:        http://gems.rubyforge.or
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ruby(abi) = 1.8
 Requires:       rubygems
-Requires:       rubygem(activerecord) >= 2.3.2
+Requires:       rubygem(activerecord) >= 2.3.4
 Requires:       rubygem(locale) = 2.0.4
 Requires:       rubygem(gettext) = 2.0.4
 Requires:       rubygem(gettext_activerecord) = 2.0.4
-Requires:       rubygem(hoe) >= 2.3.2
+Requires:       rubygem(hoe) >= 2.3.3
 Requires:       ruby-ldap
 BuildRequires:  rubygems
 BuildRequires:  gettext
@@ -81,64 +81,73 @@ rm -rf %{buildroot}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 %lang(en) %{geminstdir}/data/locale/en/LC_MESSAGES/active-ldap.mo
+%lang(en) %{geminstdir}/examples/al-admin/locale/en/LC_MESSAGES/al-admin.mo
 %lang(ja) %{geminstdir}/data/locale/ja/LC_MESSAGES/active-ldap.mo
+%lang(ja) %{geminstdir}/examples/al-admin/locale/ja/LC_MESSAGES/al-admin.mo
+%lang(nl) %{geminstdir}/examples/al-admin/locale/nl/LC_MESSAGES/al-admin.mo
 
 %changelog
-* Thu Jul 30 2009 Darryl Pierce <dpierce at redhat.com> - 1.1.0-3
+* Tue Sep 22 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.2.0-1
+- Release 1.2.0 of ActiveLDAP.
+- Changed dependency on rubygem-activerecord to be >= 2.3.4
+- Changed dependency on rubygem-hoe to be >= 2.3.3
+- Added new l12n files to spec.
+
+* Thu Jul 30 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.1.0-3
 - Changed dependency on rubygem-activerecord to be >= 2.3.2.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jul 20 2009 Darryl Pierce <dpierce at redhat.com> - 1.1.0-1
+* Mon Jul 20 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.1.0-1
 - Release 1.1.0 of ActiveLdap.
 - Dependency on rubygem-hoe changed to 2.3.2.
 - Dependency on rubygem-activerecord changed to 2.3.2.
-- Dependency on rubygem-locale added. 
+- Dependency on rubygem-locale added.
 - Dependency on rubygem-gettext added.
 - Dependency on rubygem-gettext_activerecord added.
 
-* Fri Jun  5 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.9-1
+* Fri Jun  5 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.9-1
 - Release 1.0.9 of ActiveLdap.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Feb 23 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
+* Mon Feb 23 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.2-1
 - Release 1.0.2 of ActiveLdap.
 
-* Tue Jun 17 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.1-1
+* Tue Jun 17 2008 Darryl L. Pierce <dpierce at redhat.com> - 1.0.1-1
 - Release 1.0.1 of the gem.
 
-* Mon Jun 09 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.0-1
+* Mon Jun 09 2008 Darryl L. Pierce <dpierce at redhat.com> - 1.0.0-1
 - Release 1.0.0 of the gem.
 
-* Thu May 15 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-10
+* Thu May 15 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-10
 - First official build for rawhide.
 
-* Mon May 12 2008 Darryl Pierce <dpierce at redaht.com> - 0.10.0-9
+* Mon May 12 2008 Darryl L. Pierce <dpierce at redaht.com> - 0.10.0-9
 - First build updated for Fedora.
 
-* Tue Apr 29 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-8
+* Tue Apr 29 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-8
 - Missed a script.
 
-* Tue Apr 29 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-7
+* Tue Apr 29 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-7
 - Fixing three scripts to be executable.
 
-* Tue Apr 29 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-6
+* Tue Apr 29 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-6
 - Fixed the shebang in all scripts to remove an implied dependency on /usr/bin/ruby1.8
 
-* Mon Apr 28 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-5
+* Mon Apr 28 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-5
 - Added requirement for ruby-ldap
 
-* Mon Apr 28 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-4
+* Mon Apr 28 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-4
 - Moved all macro definitions to the top of the spec file.
 
-* Mon Apr 28 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-3
+* Mon Apr 28 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-3
 - Modified the spec to fix rpmlint errors
 
-* Mon Apr 28 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-2
+* Mon Apr 28 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-2
 - Fixed the spec file to comply with packaging guidelines
 
-* Fri Apr 18 2008 Darryl Pierce <dpierce at redhat.com> - 0.10.0-1
+* Fri Apr 18 2008 Darryl L. Pierce <dpierce at redhat.com> - 0.10.0-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeldap/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Jul 2009 14:39:13 -0000	1.7
+++ sources	22 Sep 2009 13:24:06 -0000	1.8
@@ -1 +1 @@
-9fb26d56bc537b44a52f35cbe54e286d  activeldap-1.1.0.gem
+b0fb83fbe6c0c6791bcc2debd8fd3815  activeldap-1.2.0.gem



From jussilehtola at fedoraproject.org  Tue Sep 22 13:24:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 13:24:59 +0000 (UTC)
Subject: rpms/cppcheck/devel .cvsignore, 1.3, 1.4 cppcheck.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090922132459.3731311C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30496

Modified Files:
	.cvsignore cppcheck.spec sources 
Log Message:
Update to upstream 1.36.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jul 2009 13:48:51 -0000	1.3
+++ .cvsignore	22 Sep 2009 13:24:59 -0000	1.4
@@ -1 +1 @@
-cppcheck-1.34.tar.bz2
+cppcheck-1.36.tar.bz2


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/cppcheck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cppcheck.spec	24 Jul 2009 19:34:04 -0000	1.3
+++ cppcheck.spec	22 Sep 2009 13:24:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		cppcheck
-Version:	1.34
-Release:	2%{?dist}
+Version:	1.36
+Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
 License:	GPLv3+
@@ -51,11 +51,14 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.36-1
+- Update to 1.36.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.34-1
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.34-1
 - Update to 1.34.
 
-* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
+* Mon Apr 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.31-1
 - First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 13:48:51 -0000	1.3
+++ sources	22 Sep 2009 13:24:59 -0000	1.4
@@ -1 +1 @@
-0ef8ac8e5434344ab49b20b5301ac69a  cppcheck-1.34.tar.bz2
+abf641cd7bc6f7c58d15c3d4797a8320  cppcheck-1.36.tar.bz2



From jbowes at fedoraproject.org  Tue Sep 22 13:27:34 2009
From: jbowes at fedoraproject.org (jbowes)
Date: Tue, 22 Sep 2009 13:27:34 +0000 (UTC)
Subject: rpms/ipython/devel .cvsignore, 1.14, 1.15 ipython.spec, 1.28,
	1.29 sources, 1.14, 1.15
Message-ID: <20090922132734.E9DA511C00E8@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/ipython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31469

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to 0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Dec 2008 13:32:55 -0000	1.14
+++ .cvsignore	22 Sep 2009 13:27:34 -0000	1.15
@@ -1 +1 @@
-ipython-0.9.1.tar.gz
+ipython-0.10.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ipython.spec	25 Jul 2009 03:35:06 -0000	1.28
+++ ipython.spec	22 Sep 2009 13:27:34 -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:           ipython
-Version:        0.9.1
-Release:        4%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 James Bowes <jbowes at redhat.com> 0.10-1
+- Update to 0.10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Dec 2008 13:32:55 -0000	1.14
+++ sources	22 Sep 2009 13:27:34 -0000	1.15
@@ -1 +1 @@
-8a1bd1a9be272f4ddf4de99e5c1ad0dc  ipython-0.9.1.tar.gz
+dd10cd1b622c16c1afca2239fcc0dfdf  ipython-0.10.tar.gz



From fabbione at fedoraproject.org  Tue Sep 22 13:34:53 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 22 Sep 2009 13:34:53 +0000 (UTC)
Subject: rpms/openais/devel .cvsignore, 1.18, 1.19 openais.spec, 1.49,
	1.50 sources, 1.19, 1.20
Message-ID: <20090922133453.0F5A111C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1207

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	27 Aug 2009 04:43:31 -0000	1.18
+++ .cvsignore	22 Sep 2009 13:34:52 -0000	1.19
@@ -1 +1 @@
-openais-1.0.1.tar.gz
+openais-1.0.2.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- openais.spec	27 Aug 2009 04:43:31 -0000	1.49
+++ openais.spec	22 Sep 2009 13:34:52 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -36,12 +36,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=%{_prefix} \
-		--sysconfdir=%{_sysconfdir} \
-		--localstatedir=%{_localstatedir} \
-		--libdir=%{_libdir} \
-		--with-lcrso-dir=$(pkg-config corosync --variable lcrsodir)
+%{configure}
 
 %build
 make %{_smp_mflags}
@@ -155,6 +150,11 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.2-1
+- New upstream release.
+- spec file updates:
+  * use proper configure macro
+
 * Thu Aug 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
 - New upstream release. Fixes 2 minor issues in SA CheckPoint service.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	27 Aug 2009 04:43:31 -0000	1.19
+++ sources	22 Sep 2009 13:34:52 -0000	1.20
@@ -1 +1 @@
-dd40a6d6a89904e5e65116b560573aa7  openais-1.0.1.tar.gz
+5cf8a47d53b3df127e21a32c813addba  openais-1.0.2.tar.gz



From xhorak at fedoraproject.org  Tue Sep 22 13:42:32 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 22 Sep 2009 13:42:32 +0000 (UTC)
Subject: rpms/sunbird/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 sunbird.spec, 1.37, 1.38
Message-ID: <20090922134232.41FDA11C00E8@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4723

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Aug 2009 11:14:39 -0000	1.14
+++ .cvsignore	22 Sep 2009 13:42:31 -0000	1.15
@@ -1,2 +1,3 @@
 thunderbird-3.0b3-source.tar.bz2
 sunbird-l10n.tar
+thunderbird-3.0b4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 Aug 2009 11:14:40 -0000	1.14
+++ sources	22 Sep 2009 13:42:31 -0000	1.15
@@ -1,2 +1,2 @@
-84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
 70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar
+0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sunbird.spec	18 Aug 2009 11:14:40 -0000	1.37
+++ sunbird.spec	22 Sep 2009 13:42:31 -0000	1.38
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.11.20090715hg%{?dist}
+Release:        0.12.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0b3-source.tar.bz2
+Source0:        thunderbird-3.0b4-source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -71,8 +71,8 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-3.8.b3
-Requires:       thunderbird < 3.0-3.8.b4
+Requires:       thunderbird >= 3.0-3.9.b4
+Requires:       thunderbird < 3.0-3.9.b5
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -295,6 +295,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.11.20090715hg
+- Rebuild against new Thunderbird
+
 * Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.11.20090715hg
 - Update langpacks
 



From jussilehtola at fedoraproject.org  Tue Sep 22 13:47:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 13:47:23 +0000 (UTC)
Subject: rpms/cppcheck/F-10 cppcheck.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090922134723.5C4C611C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6170/F-10

Modified Files:
	cppcheck.spec sources 
Log Message:
Update to upstream 1.36.


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-10/cppcheck.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cppcheck.spec	16 Jul 2009 13:50:03 -0000	1.2
+++ cppcheck.spec	22 Sep 2009 13:47:23 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.34
+Version:	1.36
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,8 +51,14 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
-* Thu Jul 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.34-1
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.36-1
+- Update to 1.36.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.34-1
 - Update to 1.34.
 
-* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
+* Mon Apr 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.31-1
 - First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 13:50:03 -0000	1.3
+++ sources	22 Sep 2009 13:47:23 -0000	1.4
@@ -1 +1 @@
-0ef8ac8e5434344ab49b20b5301ac69a  cppcheck-1.34.tar.bz2
+abf641cd7bc6f7c58d15c3d4797a8320  cppcheck-1.36.tar.bz2



From jussilehtola at fedoraproject.org  Tue Sep 22 13:47:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 13:47:23 +0000 (UTC)
Subject: rpms/cppcheck/EL-5 cppcheck.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090922134723.28F8F11C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6170/EL-5

Modified Files:
	cppcheck.spec sources 
Log Message:
Update to upstream 1.36.


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/EL-5/cppcheck.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cppcheck.spec	16 Jul 2009 13:50:03 -0000	1.2
+++ cppcheck.spec	22 Sep 2009 13:47:22 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.34
+Version:	1.36
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,8 +51,14 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
-* Thu Jul 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.34-1
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.36-1
+- Update to 1.36.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.34-1
 - Update to 1.34.
 
-* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
+* Mon Apr 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.31-1
 - First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 13:50:03 -0000	1.3
+++ sources	22 Sep 2009 13:47:22 -0000	1.4
@@ -1 +1 @@
-0ef8ac8e5434344ab49b20b5301ac69a  cppcheck-1.34.tar.bz2
+abf641cd7bc6f7c58d15c3d4797a8320  cppcheck-1.36.tar.bz2



From jussilehtola at fedoraproject.org  Tue Sep 22 13:47:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 13:47:23 +0000 (UTC)
Subject: rpms/cppcheck/F-11 cppcheck.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090922134723.900FA11C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6170/F-11

Modified Files:
	cppcheck.spec sources 
Log Message:
Update to upstream 1.36.


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-11/cppcheck.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cppcheck.spec	16 Jul 2009 13:50:04 -0000	1.2
+++ cppcheck.spec	22 Sep 2009 13:47:23 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.34
+Version:	1.36
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,8 +51,14 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
-* Thu Jul 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.34-1
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.36-1
+- Update to 1.36.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.34-1
 - Update to 1.34.
 
-* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
+* Mon Apr 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.31-1
 - First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 13:50:04 -0000	1.3
+++ sources	22 Sep 2009 13:47:23 -0000	1.4
@@ -1 +1 @@
-0ef8ac8e5434344ab49b20b5301ac69a  cppcheck-1.34.tar.bz2
+abf641cd7bc6f7c58d15c3d4797a8320  cppcheck-1.36.tar.bz2



From mlichvar at fedoraproject.org  Tue Sep 22 13:59:38 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 22 Sep 2009 13:59:38 +0000 (UTC)
Subject: rpms/guile/devel guile-1.8.7-ia64jmp.patch, NONE, 1.1 guile.spec,
	1.66, 1.67
Message-ID: <20090922135938.A769F11C00E8@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/guile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9783

Modified Files:
	guile.spec 
Added Files:
	guile-1.8.7-ia64jmp.patch 
Log Message:
- suppress install-info errors (#515977)
- avoid clash with system setjmp/longjmp on IA64


guile-1.8.7-ia64jmp.patch:
 __scm.h         |   17 +++++++++++++----
 continuations.c |    6 +++---
 continuations.h |    2 +-
 threads.c       |    6 +++---
 threads.h       |    2 +-
 throw.c         |   10 +++++-----
 6 files changed, 26 insertions(+), 17 deletions(-)

--- NEW FILE guile-1.8.7-ia64jmp.patch ---
commit e4d87bf9fd36fdf572bde0604168bcf7d2e9838d
Author: Neil Jerram <neil at ossau.uklinux.net>
Date:   Wed Aug 5 16:13:28 2009 +0100

    Avoid clash with system setjmp/longjmp on IA64
    
    Problem was that if an application includes both libguile.h and the
    system's setjmp.h, and is compiled on IA64, it gets compile errors
    because of jmp_buf, setjmp and longjmp being multiply defined.
    
    * libguile/__scm.h (__ia64__): Define scm_i_jmp_buf, SCM_I_SETJMP and
      SCM_I_LONGJMP instead of jmp_buf, setjmp and longjmp.
    
      (all other platforms): Map scm_i_jmp_buf, SCM_I_SETJMP and
      SCM_I_LONGJMP to jmp_buf, setjmp and longjmp.
    
    * libguile/continuations.c (scm_make_continuation): Use `SCM_I_SETJMP'
      instead of `setjmp'.
      (copy_stack_and_call): Use `SCM_I_LONJMP' instead of `longjmp'.
      (scm_ia64_longjmp): Use type `scm_i_jmp_buf' instead of `jmp_buf'.
    
    * libguile/continuations.h (scm_t_contregs): Use type `scm_i_jmp_buf'
      instead of `jmp_buf'.
    
    * libguile/threads.c (suspend): Use `SCM_I_SETJMP' instead of
      `setjmp'.
    
    * libguile/threads.h (scm_i_thread): Use type `scm_i_jmp_buf' instead
      of `jmp_buf'.
    
    * libguile/throw.c (JBJMPBUF, make_jmpbuf, jmp_buf_and_retval): Use
      type `scm_i_jmp_buf' instead of `jmp_buf'.
      (scm_c_catch): Use `SCM_I_SETJMP' instead of `setjmp'.
      (scm_ithrow): Use `SCM_I_LONGJMP' instead of `longjmp'.

diff --git a/libguile/__scm.h b/libguile/__scm.h
index b198f9d..a18ab9f 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -409,19 +409,28 @@
     typedef struct {
       ucontext_t ctx;
       int fresh;
-    } jmp_buf;
-#   define setjmp(JB)				        \
+    } scm_i_jmp_buf;
+#   define SCM_I_SETJMP(JB)			        \
       ( (JB).fresh = 1,				        \
         getcontext (&((JB).ctx)),			\
         ((JB).fresh ? ((JB).fresh = 0, 0) : 1) )
-#   define longjmp(JB,VAL) scm_ia64_longjmp (&(JB), VAL)
-    void scm_ia64_longjmp (jmp_buf *, int);
+#   define SCM_I_LONGJMP(JB,VAL) scm_ia64_longjmp (&(JB), VAL)
+    void scm_ia64_longjmp (scm_i_jmp_buf *, int);
 #  else                 	/* ndef __ia64__ */
 #   include <setjmp.h>
 #  endif			/* ndef __ia64__ */
 # endif				/* ndef _CRAY1 */
 #endif				/* ndef vms */
 
+/* For any platform where SCM_I_SETJMP hasn't been defined in some
+   special way above, map SCM_I_SETJMP, SCM_I_LONGJMP and
+   scm_i_jmp_buf to setjmp, longjmp and jmp_buf. */
+#ifndef SCM_I_SETJMP
+#define scm_i_jmp_buf jmp_buf
+#define SCM_I_SETJMP setjmp
+#define SCM_I_LONGJMP longjmp
+#endif
+
 /* James Clark came up with this neat one instruction fix for
  * continuations on the SPARC.  It flushes the register windows so
  * that all the state of the process is contained in the stack.
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 69d2569..84a7fed 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -127,7 +127,7 @@ scm_make_continuation (int *first)
   continuation->offset = continuation->stack - src;
   memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
 
-  *first = !setjmp (continuation->jmpbuf);
+  *first = !SCM_I_SETJMP (continuation->jmpbuf);
   if (*first)
     {
 #ifdef __ia64__
@@ -224,12 +224,12 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val,
   scm_i_set_last_debug_frame (continuation->dframe);
 
   continuation->throw_value = val;
-  longjmp (continuation->jmpbuf, 1);
+  SCM_I_LONGJMP (continuation->jmpbuf, 1);
 }
 
 #ifdef __ia64__
 void
-scm_ia64_longjmp (jmp_buf *JB, int VAL)
+scm_ia64_longjmp (scm_i_jmp_buf *JB, int VAL)
 {
   scm_i_thread *t = SCM_I_CURRENT_THREAD;
 
diff --git a/libguile/continuations.h b/libguile/continuations.h
index f6fb96a..c61ab2d 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -43,7 +43,7 @@ SCM_API scm_t_bits scm_tc16_continuation;
 typedef struct 
 {
   SCM throw_value;
-  jmp_buf jmpbuf;
+  scm_i_jmp_buf jmpbuf;
   SCM dynenv;
 #ifdef __ia64__
   void *backing_store;
diff --git a/libguile/threads.c b/libguile/threads.c
index 95a905c..f2bb556 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -276,7 +276,7 @@ unblock_from_queue (SCM queue)
       var 't'
       // save registers.
       SCM_FLUSH_REGISTER_WINDOWS;      // sparc only
-      setjmp (t->regs);                // here's most of the magic
+      SCM_I_SETJMP (t->regs);          // here's most of the magic
 
    ... and returns.
 
@@ -330,7 +330,7 @@ unblock_from_queue (SCM queue)
       t->top = SCM_STACK_PTR (&t);
       // save registers.
       SCM_FLUSH_REGISTER_WINDOWS;
-      setjmp (t->regs);
+      SCM_I_SETJMP (t->regs);
       res = func(data);
       scm_enter_guile (t);
 
@@ -388,7 +388,7 @@ suspend (void)
   t->top = SCM_STACK_PTR (&t);
   /* save registers. */
   SCM_FLUSH_REGISTER_WINDOWS;
-  setjmp (t->regs);
+  SCM_I_SETJMP (t->regs);
   return t;
 }
 
diff --git a/libguile/threads.h b/libguile/threads.h
index 2b0e067..e22d9bd 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -107,7 +107,7 @@ typedef struct scm_i_thread {
   /* For keeping track of the stack and registers. */
   SCM_STACKITEM *base;
   SCM_STACKITEM *top;
-  jmp_buf regs;
+  scm_i_jmp_buf regs;
 #ifdef __ia64__
   void *register_backing_store_base;
   scm_t_contregs *pending_rbs_continuation;
diff --git a/libguile/throw.c b/libguile/throw.c
index 92c5a1a..fcfde47 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -53,7 +53,7 @@ static scm_t_bits tc16_jmpbuffer;
 #define DEACTIVATEJB(x) \
   (SCM_SET_CELL_WORD_0 ((x), (SCM_CELL_WORD_0 (x) & ~(1L << 16L))))
 
-#define JBJMPBUF(OBJ)           ((jmp_buf *) SCM_CELL_WORD_1 (OBJ))
+#define JBJMPBUF(OBJ)           ((scm_i_jmp_buf *) SCM_CELL_WORD_1 (OBJ))
 #define SETJBJMPBUF(x, v)        (SCM_SET_CELL_WORD_1 ((x), (scm_t_bits) (v)))
 #define SCM_JBDFRAME(x)         ((scm_t_debug_frame *) SCM_CELL_WORD_2 (x))
 #define SCM_SETJBDFRAME(x, v)    (SCM_SET_CELL_WORD_2 ((x), (scm_t_bits) (v)))
@@ -75,7 +75,7 @@ make_jmpbuf (void)
 {
   SCM answer;
   SCM_NEWSMOB2 (answer, tc16_jmpbuffer, 0, 0);
-  SETJBJMPBUF(answer, (jmp_buf *)0);
+  SETJBJMPBUF(answer, (scm_i_jmp_buf *)0);
   DEACTIVATEJB(answer);
   return answer;
 }
@@ -85,7 +85,7 @@ make_jmpbuf (void)
 
 struct jmp_buf_and_retval	/* use only on the stack, in scm_catch */
 {
-  jmp_buf buf;			/* must be first */
+  scm_i_jmp_buf buf;		/* must be first */
   SCM throw_tag;
   SCM retval;
 };
@@ -179,7 +179,7 @@ scm_c_catch (SCM tag,
   pre_unwind.lazy_catch_p = 0;
   SCM_SETJBPREUNWIND(jmpbuf, &pre_unwind);
 
-  if (setjmp (jbr.buf))
+  if (SCM_I_SETJMP (jbr.buf))
     {
       SCM throw_tag;
       SCM throw_args;
@@ -821,7 +821,7 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
       jbr->throw_tag = key;
       jbr->retval = args;
       scm_i_set_last_debug_frame (SCM_JBDFRAME (jmpbuf));
-      longjmp (*JBJMPBUF (jmpbuf), 1);
+      SCM_I_LONGJMP (*JBJMPBUF (jmpbuf), 1);
     }
 
   /* Otherwise, it's some random piece of junk.  */


Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/guile.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- guile.spec	25 Jul 2009 01:51:23 -0000	1.66
+++ guile.spec	22 Sep 2009 13:59:33 -0000	1.67
@@ -4,11 +4,12 @@ Summary: A GNU implementation of Scheme 
 Name: guile
 %define mver 1.8
 Version: 1.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
 URL: http://www.gnu.org/software/guile/
 Patch1: guile-1.8.7-multilib.patch
 Patch2: guile-1.8.7-testsuite.patch
+Patch3: guile-1.8.7-ia64jmp.patch
 Patch4: guile-1.8.6-deplibs.patch
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
@@ -50,6 +51,7 @@ install the guile package.
 
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .testsuite
+%patch3 -p1 -b .ia64jmp
 %patch4 -p1 -b .deplibs
 
 %build
@@ -105,20 +107,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info  %{_infodir}/guile.info.gz %{_infodir}/dir
-/sbin/install-info  %{_infodir}/r5rs.info.gz %{_infodir}/dir
-/sbin/install-info  %{_infodir}/goops.info.gz %{_infodir}/dir
-/sbin/install-info  %{_infodir}/guile-tut.info.gz %{_infodir}/dir
+for i in guile r5rs goops guile-tut; do
+    /sbin/install-info %{_infodir}/$i.info.gz %{_infodir}/dir &> /dev/null
+done
 :
 
 %postun -p /sbin/ldconfig
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/guile.info.gz %{_infodir}/dir
-    /sbin/install-info --delete %{_infodir}/r5rs.info.gz %{_infodir}/dir
-    /sbin/install-info --delete %{_infodir}/goops.info.gz %{_infodir}/dir
-    /sbin/install-info --delete %{_infodir}/guile-tut.info.gz %{_infodir}/dir
+    for i in guile r5rs goops guile-tut; do
+        /sbin/install-info --delete %{_infodir}/$i.info.gz \
+            %{_infodir}/dir &> /dev/null
+    done
 fi
 :
 
@@ -185,6 +186,10 @@ fi
 %{_includedir}/libguile.h
 
 %changelog
+* Tue Sep 22 2009 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.7-3
+- suppress install-info errors (#515977)
+- avoid clash with system setjmp/longjmp on IA64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.8.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Sep 22 14:00:33 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 22 Sep 2009 14:00:33 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird.spec,1.38,1.39
Message-ID: <20090922140033.E813F11C0374@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10668

Modified Files:
	sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sunbird.spec	22 Sep 2009 13:42:31 -0000	1.38
+++ sunbird.spec	22 Sep 2009 14:00:33 -0000	1.39
@@ -11,6 +11,14 @@
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
+# The tarball is pretty inconsistent with directory structure.
+# Sometimes there is a top level directory.  That goes here.
+#
+# IMPORTANT: If there is no top level directory, this should be 
+# set to the cwd, ie: '.'
+#%define tarballdir .
+%define tarballdir comm-central
+
 Name:           sunbird
 Version:        1.0
 Release:        0.12.20090715hg%{?dist}
@@ -106,6 +114,7 @@ calendaring tasks.
 
 %prep
 %setup -c -q -a 2
+cd %{tarballdir}
 %patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
@@ -114,6 +123,7 @@ find . -name '*.cpp' -o -name '*.h' |xar
 
 
 %build
+cd %{tarballdir}
 cat >.mozconfig <<EOF
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -146,6 +156,7 @@ make -f client.mk build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd %{tarballdir}
 
 # make install is bogus
 # copy tree, break symlinks



From jussilehtola at fedoraproject.org  Tue Sep 22 14:03:10 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:03:10 +0000 (UTC)
Subject: rpms/healpix/devel .cvsignore, 1.2, 1.3 healpix.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20090922140310.422F811C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12004

Modified Files:
	.cvsignore healpix.spec sources 
Log Message:
Update to new upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:04:19 -0000	1.2
+++ .cvsignore	22 Sep 2009 14:03:09 -0000	1.3
@@ -1 +1 @@
-Healpix_2.11c_2009Feb19.tar.gz
+Healpix_2.12a_2009Aug06a.tar.gz


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/healpix.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- healpix.spec	27 Jul 2009 14:09:16 -0000	1.6
+++ healpix.spec	22 Sep 2009 14:03:10 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           healpix
-Version:        2.11c
-Release:        7%{?dist}
+Version:        2.12a
+Release:        1%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
-Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_2.12a/Healpix_2.12a_2009Aug06a.tar.gz
 Source1:        healpix-f90test.sh
 Patch0:         healpix-2.11c-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
@@ -315,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.12a-1
+- Update to upstream 2.12a.
+
 * Mon Jul 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-7
 - Move modules to %%{_fmoddir}.
 - Add missing documentation to -c++ package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Apr 2009 07:04:19 -0000	1.2
+++ sources	22 Sep 2009 14:03:10 -0000	1.3
@@ -1 +1 @@
-df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz
+c014a059a9b533c749a8fc3b7d2a8ba1  Healpix_2.12a_2009Aug06a.tar.gz



From xhorak at fedoraproject.org  Tue Sep 22 14:04:16 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 22 Sep 2009 14:04:16 +0000 (UTC)
Subject: rpms/sunbird/F-11 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 sunbird.spec, 1.31, 1.32
Message-ID: <20090922140416.C3B5211C00E8@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12462

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Sync up with Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Aug 2009 11:14:39 -0000	1.14
+++ .cvsignore	22 Sep 2009 14:04:15 -0000	1.15
@@ -1,2 +1,3 @@
 thunderbird-3.0b3-source.tar.bz2
 sunbird-l10n.tar
+thunderbird-3.0b4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 Aug 2009 11:14:39 -0000	1.14
+++ sources	22 Sep 2009 14:04:16 -0000	1.15
@@ -1,2 +1,2 @@
-84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
 70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar
+0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sunbird.spec	18 Aug 2009 11:14:39 -0000	1.31
+++ sunbird.spec	22 Sep 2009 14:04:16 -0000	1.32
@@ -11,16 +11,24 @@
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
+# The tarball is pretty inconsistent with directory structure.
+# Sometimes there is a top level directory.  That goes here.
+#
+# IMPORTANT: If there is no top level directory, this should be 
+# set to the cwd, ie: '.'
+#%define tarballdir .
+%define tarballdir comm-central
+
 Name:           sunbird
 Version:        1.0
-Release:        0.6.20090715hg%{?dist}
+Release:        0.7.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0b3-source.tar.bz2
+Source0:        thunderbird-3.0b4-source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -71,8 +79,8 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-2.6.b3
-Requires:       thunderbird < 3.0-2.6.b4
+Requires:       thunderbird >= 3.0-2.7.b4
+Requires:       thunderbird < 3.0-2.7.b5
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -106,6 +114,7 @@ calendaring tasks.
 
 %prep
 %setup -c -q -a 2
+cd %{tarballdir}
 %patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
@@ -114,6 +123,8 @@ find . -name '*.cpp' -o -name '*.h' |xar
 
 
 %build
+cd %{tarballdir}
+
 cat >.mozconfig <<EOF
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -146,6 +157,7 @@ make -f client.mk build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd %{tarballdir}
 
 # make install is bogus
 # copy tree, break symlinks
@@ -295,6 +307,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.7.20090715hg
+- Sync up with Thunderbird
+
 * Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.6.20090715hg
 - Update langpacks
 



From rjones at fedoraproject.org  Tue Sep 22 14:09:34 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 22 Sep 2009 14:09:34 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.30, 1.31 libguestfs.spec, 1.67, 
	1.68 sources, 1.30, 1.31
Message-ID: <20090922140934.096AE11C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15743

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.71.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	15 Sep 2009 10:35:03 -0000	1.30
+++ .cvsignore	22 Sep 2009 14:09:30 -0000	1.31
@@ -1 +1 @@
-libguestfs-1.0.70.tar.gz
+libguestfs-1.0.71.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- libguestfs.spec	18 Sep 2009 16:15:05 -0000	1.67
+++ libguestfs.spec	22 Sep 2009 14:09:31 -0000	1.68
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.70
-Release:     2%{?dist}
+Version:     1.0.71
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -538,6 +538,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-1
+- New upstream release 1.0.71.
+
 * Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2
 - Perl bindings require perl-XML-XPath (fixed RHBZ#523547).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	15 Sep 2009 10:35:03 -0000	1.30
+++ sources	22 Sep 2009 14:09:31 -0000	1.31
@@ -1 +1 @@
-31de0cb2ac480cbb4a1c7398f2963caf  libguestfs-1.0.70.tar.gz
+24bf32735f1a259b14b692cf78ae5d74  libguestfs-1.0.71.tar.gz



From rjones at fedoraproject.org  Tue Sep 22 14:09:48 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 22 Sep 2009 14:09:48 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.49, 1.50 libguestfs.spec, 1.98, 
	1.99 sources, 1.49, 1.50
Message-ID: <20090922140948.5D71D11C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15870

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.71.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	15 Sep 2009 10:35:21 -0000	1.49
+++ .cvsignore	22 Sep 2009 14:09:44 -0000	1.50
@@ -1 +1 @@
-libguestfs-1.0.70.tar.gz
+libguestfs-1.0.71.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- libguestfs.spec	18 Sep 2009 16:15:02 -0000	1.98
+++ libguestfs.spec	22 Sep 2009 14:09:45 -0000	1.99
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.70
-Release:     2%{?dist}
+Version:     1.0.71
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -539,6 +539,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-1
+- New upstream release 1.0.71.
+
 * Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2
 - Perl bindings require perl-XML-XPath (fixed RHBZ#523547).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	15 Sep 2009 10:35:21 -0000	1.49
+++ sources	22 Sep 2009 14:09:46 -0000	1.50
@@ -1 +1 @@
-31de0cb2ac480cbb4a1c7398f2963caf  libguestfs-1.0.70.tar.gz
+24bf32735f1a259b14b692cf78ae5d74  libguestfs-1.0.71.tar.gz



From jussilehtola at fedoraproject.org  Tue Sep 22 14:09:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:09:59 +0000 (UTC)
Subject: rpms/agedu/devel .cvsignore, 1.2, 1.3 agedu.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <20090922140959.13CAE11C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16029

Modified Files:
	.cvsignore agedu.spec sources 
Log Message:
Update to upstream r8642.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 May 2009 21:18:11 -0000	1.2
+++ .cvsignore	22 Sep 2009 14:09:56 -0000	1.3
@@ -1 +1 @@
-agedu-r8442.tar.gz
+agedu-r8642.tar.gz


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/devel/agedu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- agedu.spec	24 Jul 2009 16:38:19 -0000	1.2
+++ agedu.spec	22 Sep 2009 14:09:57 -0000	1.3
@@ -1,13 +1,13 @@
-%global rel r8442
+%global rel r8642
 
 Name:		agedu
 Version:	0
-Release:	2.%{rel}%{?dist}
+Release:	1.%{rel}%{?dist}
 Summary:	An utility for tracking down wasted disk space
 Group:		Applications/System
 License:	MIT
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/agedu/
-Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r8442.tar.gz
+Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-%{rel}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
+- Update to upstream r8642.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-2.r8442
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 May 2009 21:18:11 -0000	1.2
+++ sources	22 Sep 2009 14:09:57 -0000	1.3
@@ -1 +1 @@
-b237e584844d30d7a8a815aae11e57c1  agedu-r8442.tar.gz
+42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz



From mclasen at fedoraproject.org  Tue Sep 22 14:22:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 14:22:56 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel about-this-computer.desktop, 1.7,
	1.8 gnome-system-monitor.spec, 1.149, 1.150
Message-ID: <20090922142257.17AF011C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18281

Modified Files:
	about-this-computer.desktop gnome-system-monitor.spec 
Log Message:
More translations



Index: about-this-computer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/about-this-computer.desktop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- about-this-computer.desktop	9 Sep 2009 13:05:34 -0000	1.7
+++ about-this-computer.desktop	22 Sep 2009 14:22:55 -0000	1.8
@@ -1,75 +1,76 @@
-
 [Desktop Entry] 
 Name=About this Computer
 Name[en] =About this Computer
 Name[as] =?? ?????????? ??????
+Name[bn_IN] =????????? ???????
 Name[cs] =O tomto po??ta?i
+Name[de] =?ber diesen Computer
 Name[el] =???? ??????????
+Name[es] =Acerca de esta Computadora
 Name[fi] =Tietoja t?st? tietokoneesta
 Name[fr] =? propos de cet ordinateur
-Name[de] =?ber diesen Computer
 Name[gu] =? ????????? ????
 Name[he] =????? ???? ??
-Name[it] =Informazioni sul computer
+Name[hi] =?? ???????? ?? ???? ???
 Name[id] =Mengenai Komputer Ini
+Name[it] =Informazioni sul computer
 Name[ja] =????????????
+Name[kn] =? ???? ?????
 Name[ko] =???? ???
+Name[ml] =? ?????????????? ????????????
+Name[mr] =?? ????? ?????
+Name[nb] =Om denne datamaskinen
+Name[nl] =Over Deze Computer
+Name[or] =??? ??????? ??????
 Name[pa] =?? ??????? ????
 Name[pl] =Informacje o komputerze
+Name[pt_BR] = Sobre este computador
 Name[ro] =Despre acest calculator
+Name[ru] =? ???????
 Name[sk] =O tomto po??ta?i
 Name[sr] =? ???? ????????
 Name[sr at latin] =O ovom ra?unaru
-Name[nl] =Over Deze Computer
 Name[sv] =Om den h?r datorn
-Name[es] =Acerca de esta Computadora
+Name[ta] =?????? ??????? ?????
+Name[te] =? ????????? ???????
 Name[zh_CN] =??????
 Name[zh_TW] =??????
-Name[ta] = ?????? ??????? ?????
-Name[hi] =?? ???????? ?? ???? ???
-Name[mr] =?? ????? ?????
-Name[kn] =? ???? ?????
-Name[te] =? ????????? ???????
-Name[ml] =? ?????????????? ????????????
-Name[pt_BR] = Sobre este computador
-Name[or] = ??? ??????? ??????
-Name[ru] =?? ???? ??????????
-Name[bn_IN] =????????? ???????
-Comment=Get some basic information about this computer
+Comment =Get some basic information about this computer
 Comment[en] =Get some basic information about this computer
 Comment[as] =?? ?????????? ?????? ???? ??? ???? ??? ???
+Comment[bn_IN] =?? ????????? ???????? ???? ????? ???? ???? ???
 Comment[cs] =Z?kladn? informace o tomto po??ta?i
+Comment[de] =Erhalten Sie Basis-Informationen ?ber dieses System
 Comment[el] =????? ??????? ??????????? ??? ????? ??? ??????????
+Comment[es] =Obten informaci?n b?sica sobre esta computadora
 Comment[fi] =Perustietoja t?st? tietokoneesta
 Comment[fr] =Obtenir des informations sommaires sur cet ordinateur
-Comment[de] =Erhalten Sie Basis-Informationen ?ber dieses System
 Comment[gu] =? ????????? ???? ???? ?????? ??????? ?????
 Comment[he] =???? ???? ????? ????? ???? ??
-Comment[it] =Alcune informazioni di base su questo computer
+Comment[hi] =?? ???????? ?? ???? ??? ??? ????? ??????? ????? ????
 Comment[id] =Lihat beberapa informasi umum mengenai komputer ini
+Comment[it] =Alcune informazioni di base su questo computer
 Comment[ja] =??????????????????
+Comment[kn] =? ???? ?????? ????? ?????? ??????????? ???????????
 Comment[ko] =???? ?? ?? ?? ??
+Comment[ml] = ? ?????????????? ?????????????? ??? ???????? ??????????
+Comment[mr] =?? ????? ????? ????? ??? ?????? ??????? ???
+Comment[nb] =Vis grunnleggende informasjon om denne datamaskinen
+Comment[nl] =Geef basis informatie weer over deze computer
+Comment[or] =??? ??????? ?????? ???? ????? ????? ???? ??????
 Comment[pa] =?? ??????? ???? ??? ????? ??????? ???
 Comment[pl] =Wi?cej informacji o komputerze
+Comment[pt_BR] =Obtenha informa??es b?sicas sobre este computador
 Comment[ro] =Vede?i ni?te informa?ii utile despre acest calculator
+Comment[ru] =???????? ?????????? ?? ???? ??????????
 Comment[sk] =Zobrazi? z?kladn? inform?cie o tomto po??ta?i
 Comment[sr] =???????? ??????? ??????????? ? ???? ????????
 Comment[sr at latin] =Saznajte osnovne informacije o ovom ra?unaru
-Comment[nl] =Geef basis informatie weer over deze computer
 Comment[sv] =F? grundl?ggande information om den h?r datorn
-Comment[es] =Obten informaci?n b?sica sobre esta computadora
-Comment[zh_CN] =?????????????
-Comment[zh_TW] =???????????????
 Comment[ta] =?????? ??????? ?????? ??? ???????? ????????
-Comment[hi] =?? ???????? ?? ???? ??? ??? ????? ??????? ????? ????
-Comment[kn] =? ???? ?????? ????? ?????? ??????????? ???????????
-Comment[mr] =?? ????? ????? ????? ??? ?????? ??????? ???
 Comment[te] =? ????????? ??????? ???? ???????? ???????
-Comment[ml] = ? ?????????????? ?????????????? ??? ???????? ??????????
-Comment[pt_BR] = Obtenha informa??es b?sicas sobre este computador
-Comment[or] = ??? ??????? ?????? ???? ????? ????? ???? ??????
-Comment[ru] =???????? ???????? ?????????? ?? ???? ??????????
-Comment[bn_IN] =?? ????????? ???????? ???? ????? ???? ???? ???
+Comment[zh_CN] =?????????????
+Comment[zh_TW] =???????????????
 Exec=gnome-system-monitor --show-system-tab
 TryExec=gnome-system-monitor
 Icon=computer


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- gnome-system-monitor.spec	22 Sep 2009 03:34:26 -0000	1.149
+++ gnome-system-monitor.spec	22 Sep 2009 14:22:55 -0000	1.150
@@ -12,7 +12,7 @@
 Summary: Process and resource monitor
 Name: gnome-system-monitor
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -155,6 +155,9 @@ scrollkeeper-update -q
 
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Include more translations for 'About this computer'
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From jussilehtola at fedoraproject.org  Tue Sep 22 14:29:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:29:28 +0000 (UTC)
Subject: rpms/agedu/EL-5 agedu.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090922142928.D99C011C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23495/EL-5

Modified Files:
	agedu.spec sources 
Log Message:
Update to upstream r8642.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-5/agedu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- agedu.spec	31 May 2009 21:21:14 -0000	1.1
+++ agedu.spec	22 Sep 2009 14:29:28 -0000	1.2
@@ -1,4 +1,4 @@
-%global rel r8442
+%global rel r8642
 
 Name:		agedu
 Version:	0
@@ -7,7 +7,7 @@ Summary:	An utility for tracking down wa
 Group:		Applications/System
 License:	MIT
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/agedu/
-Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r8442.tar.gz
+Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-%{rel}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
@@ -42,5 +42,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
+- Update to upstream r8642.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-2.r8442
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu May 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8442
 - First release. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 May 2009 21:21:15 -0000	1.2
+++ sources	22 Sep 2009 14:29:28 -0000	1.3
@@ -1 +1 @@
-b237e584844d30d7a8a815aae11e57c1  agedu-r8442.tar.gz
+42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz



From jussilehtola at fedoraproject.org  Tue Sep 22 14:29:29 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:29:29 +0000 (UTC)
Subject: rpms/agedu/F-10 agedu.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090922142929.0699F11C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23495/F-10

Modified Files:
	agedu.spec sources 
Log Message:
Update to upstream r8642.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-10/agedu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- agedu.spec	31 May 2009 21:21:15 -0000	1.1
+++ agedu.spec	22 Sep 2009 14:29:28 -0000	1.2
@@ -1,4 +1,4 @@
-%global rel r8442
+%global rel r8642
 
 Name:		agedu
 Version:	0
@@ -7,7 +7,7 @@ Summary:	An utility for tracking down wa
 Group:		Applications/System
 License:	MIT
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/agedu/
-Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r8442.tar.gz
+Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-%{rel}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
@@ -42,5 +42,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
+- Update to upstream r8642.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-2.r8442
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu May 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8442
 - First release. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 May 2009 21:21:15 -0000	1.2
+++ sources	22 Sep 2009 14:29:28 -0000	1.3
@@ -1 +1 @@
-b237e584844d30d7a8a815aae11e57c1  agedu-r8442.tar.gz
+42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz



From jussilehtola at fedoraproject.org  Tue Sep 22 14:29:29 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:29:29 +0000 (UTC)
Subject: rpms/agedu/F-11 agedu.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090922142929.4A00811C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23495/F-11

Modified Files:
	agedu.spec sources 
Log Message:
Update to upstream r8642.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-11/agedu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- agedu.spec	31 May 2009 21:21:15 -0000	1.1
+++ agedu.spec	22 Sep 2009 14:29:29 -0000	1.2
@@ -1,4 +1,4 @@
-%global rel r8442
+%global rel r8642
 
 Name:		agedu
 Version:	0
@@ -7,7 +7,7 @@ Summary:	An utility for tracking down wa
 Group:		Applications/System
 License:	MIT
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/agedu/
-Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r8442.tar.gz
+Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-%{rel}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
@@ -42,5 +42,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
+- Update to upstream r8642.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-2.r8442
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu May 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8442
 - First release. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 May 2009 21:21:15 -0000	1.2
+++ sources	22 Sep 2009 14:29:29 -0000	1.3
@@ -1 +1 @@
-b237e584844d30d7a8a815aae11e57c1  agedu-r8442.tar.gz
+42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz



From rjones at fedoraproject.org  Tue Sep 22 14:29:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 22 Sep 2009 14:29:31 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.36, 1.37 libguestfs.spec, 1.63, 
	1.64 sources, 1.36, 1.37
Message-ID: <20090922142931.8799211C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23554

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.71.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	15 Sep 2009 10:35:16 -0000	1.36
+++ .cvsignore	22 Sep 2009 14:29:30 -0000	1.37
@@ -1 +1 @@
-libguestfs-1.0.70.tar.gz
+libguestfs-1.0.71.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- libguestfs.spec	18 Sep 2009 16:15:03 -0000	1.63
+++ libguestfs.spec	22 Sep 2009 14:29:31 -0000	1.64
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.70
-Release:     2%{?dist}
+Version:     1.0.71
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -535,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-1
+- New upstream release 1.0.71.
+
 * Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2
 - Perl bindings require perl-XML-XPath (fixed RHBZ#523547).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	15 Sep 2009 10:35:16 -0000	1.36
+++ sources	22 Sep 2009 14:29:31 -0000	1.37
@@ -1 +1 @@
-31de0cb2ac480cbb4a1c7398f2963caf  libguestfs-1.0.70.tar.gz
+24bf32735f1a259b14b692cf78ae5d74  libguestfs-1.0.71.tar.gz



From jussilehtola at fedoraproject.org  Tue Sep 22 14:30:05 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:30:05 +0000 (UTC)
Subject: rpms/healpix/devel healpix-2.12a-shlib.patch, NONE, 1.1 healpix.spec,
	1.7, 1.8 healpix-2.11c-shlib.patch, 1.2, NONE
Message-ID: <20090922143005.930B011C0423@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23845

Modified Files:
	healpix.spec 
Added Files:
	healpix-2.12a-shlib.patch 
Removed Files:
	healpix-2.11c-shlib.patch 
Log Message:
Update patch, too.

healpix-2.12a-shlib.patch:
 cxx/Healpix_cxx/planck.make  |  108 ++++++++++++++++++-------------------------
 cxx/alice/planck.make        |   26 +++++-----
 cxx/config/rules.common      |   18 ++-----
 cxx/cxxsupport/planck.make   |   10 ++-
 cxx/libfftpack/planck.make   |    9 ++-
 f90/alteralm/Makefile        |    4 -
 f90/anafast/Makefile         |    4 -
 f90/hotspot/Makefile         |    4 -
 f90/lib/Makefile             |   15 +++++
 f90/map2gif/Makefile         |    4 -
 f90/median_filter/Makefile   |    4 -
 f90/mod/Makefile             |   13 ++++-
 f90/ngsims_full_sky/Makefile |    8 +--
 f90/plmgen/Makefile          |    4 -
 f90/smoothing/Makefile       |    4 -
 f90/synfast/Makefile         |    4 -
 f90/ud_grade/Makefile        |    4 -
 17 files changed, 128 insertions(+), 115 deletions(-)

--- NEW FILE healpix-2.12a-shlib.patch ---
diff -up Healpix_2.12a/src/cxx/alice/planck.make.shlib Healpix_2.12a/src/cxx/alice/planck.make
--- Healpix_2.12a/src/cxx/alice/planck.make.shlib	2009-01-08 18:19:58.000000000 +0200
+++ Healpix_2.12a/src/cxx/alice/planck.make	2009-09-22 17:20:30.316676863 +0300
@@ -20,28 +20,28 @@ test.o: alice_utils.h
 alice2.o: alice_usage.h OrthogonalSkyMap.h
 testOrthogonalSkyMap.o: OrthogonalSkyMap.h
 
-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+generateTexture.o: 
 generateTexture: generateTexture.o
 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXX_EXTRALIBS)
 
-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+$(ALICE2_OBJ):
+alice2: $(ALICE2_OBJ)
 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXX_EXTRALIBS)
 
-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+alice_test: $(TEST_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
+	$(CXX_EXTRALIBS)	
 
-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testSoSSkyMap: $(TESTSOS_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
+	$(CXX_EXTRALIBS)		
 
-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testMollweideSkyMap: $(TESTMOL_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
+	$(CXX_EXTRALIBS)	
 	
-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
+	$(CXX_EXTRALIBS)		
diff -up Healpix_2.12a/src/cxx/config/rules.common.shlib Healpix_2.12a/src/cxx/config/rules.common
--- Healpix_2.12a/src/cxx/config/rules.common.shlib	2008-02-19 12:58:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/config/rules.common	2009-09-22 17:20:30.316676863 +0300
@@ -1,10 +1,6 @@
 SRCROOT = $(LEVELS_SRC)
 BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
 PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
-BINDIR	= $(PREFIX)/bin
-INCDIR	= $(PREFIX)/include
-LIBDIR	= $(PREFIX)/lib
-DOCDIR	= $(SRCROOT)/doc
 
 # do not use any suffix rules
 .SUFFIXES:
@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
 prep:
 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
+	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
+	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
+	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
+	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
 
 $(SUBCLEAN):
 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
 subdir_clean: $(SUBCLEAN)
 
 install:
-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
+	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
+	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
+	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
 
 install: $(BINARIES) $(LIBRARIES)
 $(BINARIES) $(LIBRARIES): $(OBJECTS)
diff -up Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib Healpix_2.12a/src/cxx/cxxsupport/planck.make
--- Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib	2008-02-19 12:58:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/cxxsupport/planck.make	2009-09-22 17:20:30.317676639 +0300
@@ -1,7 +1,6 @@
-TEMP1	= $(SRCROOT)/cxxsupport
 VPATH	= $(TEMP1) $(INCDIR)
 
-LIBRARIES= libcxxsupport.a
+LIBRARIES= libhealpix_cxxsupport.so
 
 HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
 SIMPARAMS_H := simparams.h $(CXXUTILS_H)
 PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
 ARR_H := arr.h $(CXXUTILS_H)
-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
+FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
 VEC3_H := vec3.h
 ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
 POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
 
 libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
+
+.PHONY: libhealpix_cxxsupport.so
+libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
+	cp -p $@ $(DESTLIB)/
diff -up Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib Healpix_2.12a/src/cxx/Healpix_cxx/planck.make
--- Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib	2006-12-04 21:31:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/Healpix_cxx/planck.make	2009-09-22 17:20:30.318676626 +0300
@@ -1,21 +1,16 @@
-TEMP1	= $(SRCROOT)/Healpix_cxx
 VPATH	= $(TEMP1) $(LIBDIR)
 
-LIBRARIES= libhealpix_cxx.a
+LIBRARIES= libhealpix_cxx.so
 
 BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
 	  rotalm_cxx mult_alm
 
-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
-	$(TEMP1)/powspec_fitsio.h \
-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
-
-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
-	$(SPHERE_HEADERS)
+SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
+	powspec_fitsio.h ylmgen.h alm_map_tools.h
+
+HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
+	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
 
 include $(PARAMFILE)
 
@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
 HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
 
-healpix_base.o: healpix_base.h libcxxsupport.a
-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
-	libcxxsupport.a
-alm_fitsio.o: alm_fitsio.h alm.h \
-	libcxxsupport.a
-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
-powspec_fitsio.o: powspec.h libcxxsupport.a
-powspec.o: powspec.h libcxxsupport.a
+healpix_base.o: healpix_base.h 
+healpix_base2.o: healpix_base.h healpix_base2.h 
+healpix_map.o: healpix_base.h healpix_map.h 
+healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
+alm_fitsio.o: alm_fitsio.h alm.h 
+healpix_data_io.o: healpix_data_io.h
+powspec_fitsio.o: powspec.h 
+powspec.o: powspec.h
 alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
-	libfftpack.a libcxxsupport.a
-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
+	ylmgen.h alm_healpix_tools.h alm_map_tools.h
+alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
+alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
 
 libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
 
-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+.PHONY: libhealpix_cxx.so
+libhealpix_cxx.so: $(HEALPIX_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
+	cp -p $@ $(DESTLIB)/
+
+
+syn_alm_cxx.o: libhealpix_cxx.so
 syn_alm_cxx: syn_alm_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
 
-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+alm2map_cxx.o: libhealpix_cxx.so
 alm2map_cxx: alm2map_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
 
-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+anafast_cxx.o: libhealpix_cxx.so
 anafast_cxx: anafast_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
 
-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+map2tga.o: libhealpix_cxx.so
 map2tga: map2tga.o
-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
 
-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+udgrade_cxx.o: libhealpix_cxx.so
 udgrade_cxx: udgrade_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
 
-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+hotspots_cxx.o: libhealpix_cxx.so
 hotspots_cxx: hotspots_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
 
-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+calc_powspec.o: libhealpix_cxx.so
 calc_powspec: calc_powspec.o
-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
 
-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+median_filter.o: libhealpix_cxx.so
 median_filter: median_filter.o
-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
 
-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
+hpxtest.o: libhealpix_cxx.so
 hpxtest: hpxtest.o
-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
 
-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+smoothing_cxx.o: libhealpix_cxx.so
 smoothing_cxx: smoothing_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
 
-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
+rotalm_cxx.o: libhealpix_cxxsupport.so
 rotalm_cxx: rotalm_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
 
-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+mult_alm.o: libhealpix_cxx.so
 mult_alm: mult_alm.o
-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
diff -up Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib Healpix_2.12a/src/cxx/libfftpack/planck.make
--- Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib	2006-01-26 11:25:58.000000000 +0200
+++ Healpix_2.12a/src/cxx/libfftpack/planck.make	2009-09-22 17:20:30.319676770 +0300
@@ -1,9 +1,7 @@
-TEMP1	= $(SRCROOT)/libfftpack
 VPATH	= $(TEMP1) $(INCDIR)
 
-LIBRARIES= libfftpack.a
+LIBRARIES= libhealpix_fft.so
 
-HEADERS= $(TEMP1)/ls_fft.h
 
 include $(PARAMFILE)
 
@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
 
 libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
+
+libhealpix_fft.so: $(FFTPACK_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
+	cp -p $@ $(DESTLIB)/
+	cp -p *.h $(DESTINC)/
diff -up Healpix_2.12a/src/f90/alteralm/Makefile.shlib Healpix_2.12a/src/f90/alteralm/Makefile
--- Healpix_2.12a/src/f90/alteralm/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
+++ Healpix_2.12a/src/f90/alteralm/Makefile	2009-09-22 17:20:30.319676770 +0300
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/anafast/Makefile.shlib Healpix_2.12a/src/f90/anafast/Makefile
--- Healpix_2.12a/src/f90/anafast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
+++ Healpix_2.12a/src/f90/anafast/Makefile	2009-09-22 17:20:30.319676770 +0300
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/hotspot/Makefile.shlib Healpix_2.12a/src/f90/hotspot/Makefile
--- Healpix_2.12a/src/f90/hotspot/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
+++ Healpix_2.12a/src/f90/hotspot/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -31,8 +31,8 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
 
 # spell out dependencies to allow parallel compilation (make -j)
 HotSpots.o: maxima_tools.o
diff -up Healpix_2.12a/src/f90/lib/Makefile.shlib Healpix_2.12a/src/f90/lib/Makefile
--- Healpix_2.12a/src/f90/lib/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
+++ Healpix_2.12a/src/f90/lib/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -20,7 +20,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-default: libhpxgif.a
+default: libhpxgif.so
 
 libhpxgif.a: $(allobj)
 	$(AR) libhpxgif.a $(allobj)
@@ -29,3 +29,16 @@ libhpxgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libhpxgif.so
+libhpxgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.12a/src/f90/map2gif/Makefile.shlib Healpix_2.12a/src/f90/map2gif/Makefile
--- Healpix_2.12a/src/f90/map2gif/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
+++ Healpix_2.12a/src/f90/map2gif/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libhpxgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj) $(LIBDIR)/libhealpix.so $(LIBDIR)/libhpxgif.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhpxgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/median_filter/Makefile.shlib Healpix_2.12a/src/f90/median_filter/Makefile
--- Healpix_2.12a/src/f90/median_filter/Makefile.shlib	2005-04-26 04:50:34.000000000 +0300
+++ Healpix_2.12a/src/f90/median_filter/Makefile	2009-09-22 17:20:30.321676604 +0300
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/mod/Makefile.shlib Healpix_2.12a/src/f90/mod/Makefile
--- Healpix_2.12a/src/f90/mod/Makefile.shlib	2009-06-29 21:00:18.000000000 +0300
+++ Healpix_2.12a/src/f90/mod/Makefile	2009-09-22 17:20:30.321676604 +0300
@@ -33,7 +33,7 @@ obj7  = healpix_modules.o
 
 obj   = $(obj0) $(obj1) $(obj2) $(obj3) $(obj4) $(obj5) $(obj6) $(obj7)
 
-default: libhealpix.a 
+default: libhealpix.so
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
@@ -62,6 +62,17 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
+
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	@./gen_alm_code
 
diff -up Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.12a/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
+++ Healpix_2.12a/src/f90/ngsims_full_sky/Makefile	2009-09-22 17:27:00.892676992 +0300
@@ -29,11 +29,11 @@ obj2 	= $(subs)  sky_ng_sim_bin.o
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 
 # spell out dependencies to allow parallel compilation (make -j)
 sub_ngpdf_powergauss.o: sky_sub.o
diff -up Healpix_2.12a/src/f90/plmgen/Makefile.shlib Healpix_2.12a/src/f90/plmgen/Makefile
--- Healpix_2.12a/src/f90/plmgen/Makefile.shlib	2004-08-25 04:27:24.000000000 +0300
+++ Healpix_2.12a/src/f90/plmgen/Makefile	2009-09-22 17:20:30.322676602 +0300
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/smoothing/Makefile.shlib Healpix_2.12a/src/f90/smoothing/Makefile
--- Healpix_2.12a/src/f90/smoothing/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
+++ Healpix_2.12a/src/f90/smoothing/Makefile	2009-09-22 17:20:30.322676602 +0300
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/synfast/Makefile.shlib Healpix_2.12a/src/f90/synfast/Makefile
--- Healpix_2.12a/src/f90/synfast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
+++ Healpix_2.12a/src/f90/synfast/Makefile	2009-09-22 17:20:30.323676731 +0300
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/ud_grade/Makefile.shlib Healpix_2.12a/src/f90/ud_grade/Makefile
--- Healpix_2.12a/src/f90/ud_grade/Makefile.shlib	2005-06-03 12:44:52.000000000 +0300
+++ Healpix_2.12a/src/f90/ud_grade/Makefile	2009-09-22 17:20:30.323676731 +0300
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/healpix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- healpix.spec	22 Sep 2009 14:03:10 -0000	1.7
+++ healpix.spec	22 Sep 2009 14:30:05 -0000	1.8
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
 Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_2.12a/Healpix_2.12a_2009Aug06a.tar.gz
 Source1:        healpix-f90test.sh
-Patch0:         healpix-2.11c-shlib.patch
+Patch0:         healpix-2.12a-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,7 +107,7 @@ rm test/README
 install -p -m 755 %{SOURCE1} runtest.sh
 
 # Remove patch backup from doc
-rm src/cxx/test/*.shlib
+rm -f src/cxx/test/*.shlib
 
 %build
 # Generic stuff
@@ -260,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp_synfast
 %{_bindir}/hp_ud_grade
 %{_libdir}/libhealpix.so
-%{_libdir}/libhealpix_gif.so
+%{_libdir}/libhpxgif.so
 
 
 %files devel


--- healpix-2.11c-shlib.patch DELETED ---



From rjones at fedoraproject.org  Tue Sep 22 14:30:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 22 Sep 2009 14:30:30 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.99,1.100
Message-ID: <20090922143030.611C811C0374@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23987

Modified Files:
	libguestfs.spec 
Log Message:
Bump to force rebuild.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- libguestfs.spec	22 Sep 2009 14:09:45 -0000	1.99
+++ libguestfs.spec	22 Sep 2009 14:30:30 -0000	1.100
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.71
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -539,7 +539,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-1
+* Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-2
 - New upstream release 1.0.71.
 
 * Fri Sep 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.70-2



From jussilehtola at fedoraproject.org  Tue Sep 22 14:32:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 14:32:45 +0000 (UTC)
Subject: rpms/agedu/EL-4 agedu.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090922143245.7381611C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25003/EL-4

Modified Files:
	agedu.spec sources 
Log Message:
Update to upstream r8642.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-4/agedu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- agedu.spec	31 May 2009 21:21:14 -0000	1.1
+++ agedu.spec	22 Sep 2009 14:32:45 -0000	1.2
@@ -1,4 +1,4 @@
-%global rel r8442
+%global rel r8642
 
 Name:		agedu
 Version:	0
@@ -7,7 +7,7 @@ Summary:	An utility for tracking down wa
 Group:		Applications/System
 License:	MIT
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/agedu/
-Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r8442.tar.gz
+Source0:	http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-%{rel}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
@@ -42,5 +42,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
+- Update to upstream r8642.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-2.r8442
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu May 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8442
 - First release. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 May 2009 21:21:14 -0000	1.2
+++ sources	22 Sep 2009 14:32:45 -0000	1.3
@@ -1 +1 @@
-b237e584844d30d7a8a815aae11e57c1  agedu-r8442.tar.gz
+42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz



From pbrobinson at fedoraproject.org  Tue Sep 22 14:36:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 14:36:52 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel .cvsignore, 1.3,
	1.4 moblin-panel-media.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090922143652.CB0F311C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26934

Modified Files:
	.cvsignore moblin-panel-media.spec sources 
Log Message:
- New upstream 0.0.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Sep 2009 13:39:30 -0000	1.3
+++ .cvsignore	22 Sep 2009 14:36:52 -0000	1.4
@@ -1 +1 @@
-moblin-panel-media-0.0.2.tar.bz2
+moblin-panel-media-0.0.3.tar.bz2


Index: moblin-panel-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/moblin-panel-media.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-media.spec	19 Sep 2009 13:39:30 -0000	1.2
+++ moblin-panel-media.spec	22 Sep 2009 14:36:52 -0000	1.3
@@ -1,14 +1,12 @@
 Name:           moblin-panel-media
-Version:        0.0.2
+Version:        0.0.3
 Release:        1%{?dist}
 Summary:        Moblin Panel for Media
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.moblin.org
-# Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-# git archive --format=tar --prefix=moblin-panel-media-0.0.2/ e040a4b | bzip2 > moblin-panel-media-0.0.2.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bickley-devel
@@ -56,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
+- New upstream 0.0.3 release
+
 * Sat Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
 - New upstream 0.0.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Sep 2009 13:39:30 -0000	1.3
+++ sources	22 Sep 2009 14:36:52 -0000	1.4
@@ -1 +1 @@
-6a6ed089d2a47088f9652b098b9a8961  moblin-panel-media-0.0.2.tar.bz2
+520a7d8d93f976acba61e4dbe3700ca7  moblin-panel-media-0.0.3.tar.bz2



From tuxbrewr at fedoraproject.org  Tue Sep 22 14:47:09 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 22 Sep 2009 14:47:09 +0000 (UTC)
Subject: rpms/python-mwclient/devel mwclient-wmf.patch, 1.1,
	1.2 python-mwclient.spec, 1.1, 1.2
Message-ID: <20090922144709.68DC911C00E8@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/python-mwclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31146

Modified Files:
	mwclient-wmf.patch python-mwclient.spec 
Log Message:
Fix patch file

mwclient-wmf.patch:
 client.py |    2 !!
 1 file changed, 2 modifications(!)

Index: mwclient-wmf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/devel/mwclient-wmf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mwclient-wmf.patch	22 Sep 2009 13:05:47 -0000	1.1
+++ mwclient-wmf.patch	22 Sep 2009 14:47:07 -0000	1.2
@@ -1,12 +1,20 @@
-diff -up mwclient/client.py.wmf mwclient/client.py
---- mwclient/client.py.wmf	2009-07-16 21:22:54.000000000 -0500
-+++ mwclient/client.py	2009-09-20 14:57:59.971785030 -0500
-@@ -100,7 +100,7 @@ class Site(object):
- 			if len(version) == 2 and version[1].endswith('alpha'):
- 				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
- 			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
--				self.version = (int(version[0]), int(version[1][:-5]), 'alpha-wmf')
-+				self.version = (int(version[0]), int(version[1][:-9]), 'alpha-wmf')
- 			elif len(version) == 3 and 'rc' in version[2]:
- 				self.version = (int(version[0]), int(version[1]), version[2])
- 			elif len(version) == 3:
+diff -crB mwclient/client.py mwclient-fedora/client.py
+*** mwclient/client.py	2009-07-16 21:22:54.000000000 -0400
+--- mwclient-fedora/client.py	2009-09-22 10:36:31.000000000 -0400
+***************
+*** 100,106 ****
+  			if len(version) == 2 and version[1].endswith('alpha'):
+  				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
+  			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
+! 				self.version = (int(version[0]), int(version[1][:-5]), 'alpha-wmf')
+  			elif len(version) == 3 and 'rc' in version[2]:
+  				self.version = (int(version[0]), int(version[1]), version[2])
+  			elif len(version) == 3:
+--- 100,106 ----
+  			if len(version) == 2 and version[1].endswith('alpha'):
+  				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
+  			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
+! 				self.version = (int(version[0]), int(version[1][:-9]), 'alpha-wmf')
+  			elif len(version) == 3 and 'rc' in version[2]:
+  				self.version = (int(version[0]), int(version[1]), version[2])
+  			elif len(version) == 3:


Index: python-mwclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/devel/python-mwclient.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-mwclient.spec	22 Sep 2009 13:05:47 -0000	1.1
+++ python-mwclient.spec	22 Sep 2009 14:47:07 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           python-mwclient
 Version:        0.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mwclient is a client to the MediaWiki API
 
 Group:          System Environment/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Steven M. Parrish <smparrish at gmail.com> - 0.6.3-3
+- Fix patch
+
 * Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-2
 - upstream wmf patch
 - %%doc README.txt



From msuchy at fedoraproject.org  Tue Sep 22 14:48:09 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Tue, 22 Sep 2009 14:48:09 +0000 (UTC)
Subject: rpms/rhn-client-tools/devel import.log, NONE,
	1.1 rhn-client-tools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090922144809.6AEC711C00E8@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhn-client-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31288/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rhn-client-tools.spec 
Log Message:
Initial upload of rhn-client-tools to rawhide.



--- NEW FILE import.log ---
rhn-client-tools-0_7_3-1:HEAD:rhn-client-tools-0.7.3-1.src.rpm:1253630821


--- NEW FILE rhn-client-tools.spec ---
Summary: Support programs and libraries for Red Hat Network or Spacewalk
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
Name: rhn-client-tools
Version: 0.7.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: rhnlib >= 2.2.7
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python 
Requires: python-ethtool
Requires: gnupg
Requires: sh-utils
Requires: dbus-python
Requires: hal
Requires: newt

Conflicts: up2date

BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils

%description
Red Hat Network Client Tools provides programs and libraries to allow your
system to receive software updates from Red Hat Network or Spacewalk.

%package -n rhn-check
Summary: Check for RHN actions
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: yum-rhn-plugin >= 0.5.3-30

%description -n rhn-check
rhn-check polls a Red Hat Network or Spacewalk server to find and execute 
scheduled actions.

%package -n rhn-setup
Summary: Configure and register an RHN/Spacewalk client
Group: System Environment/Base
Requires: usermode >= 1.36
Requires: %{name} = %{version}-%{release}
Requires: rhnsd

%description -n rhn-setup
rhn-setup contains programs and utilities to configure a system to use
Red Hat Network or Spacewalk, and to register a system with a Red Hat Network
or Spacewalk server.

%package -n rhn-setup-gnome
Summary: A GUI interface for RHN/Spacewalk Registration
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: rhn-setup = %{version}-%{release}
Requires: pam >= 0.72
Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas 
Requires: usermode-gtk

%description -n rhn-setup-gnome
rhn-setup-gnome contains a GTK+ graphical interface for configuring and
registering a system with a Red Hat Network or Spacewalk server.


%prep
%setup -q 

%build
make -f Makefile.rhn-client-tools

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}

mkdir -p $RPM_BUILD_ROOT/var/lib/up2date

desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rhn rhn_register.desktop

%find_lang %{name}

%post -n rhn-setup-gnome
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun -n rhn-setup-gnome
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n rhn-setup-gnome
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
# some info about mirrors
%doc doc/ChangeLog 
%doc doc/mirrors.txt 
%doc doc/fedora-core-1 
%doc doc/updates-released
%doc doc/AUTHORS
%doc doc/LICENSE
%{_mandir}/man8/rhn-profile-sync.8*
%{_mandir}/man5/up2date.5*

%dir %{_sysconfdir}/sysconfig/rhn
%dir %{_sysconfdir}/sysconfig/rhn/clientCaps.d
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/configfiles
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/script
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/up2date
%config(noreplace) %{_sysconfdir}/logrotate.d/up2date
%config(noreplace) %{_sysconfdir}/rpm/macros.up2date

# dirs
%dir %{_datadir}/rhn
%dir %{_datadir}/rhn/up2date_client

#files
%{_datadir}/rhn/up2date_client/__init__.*
%{_datadir}/rhn/up2date_client/config.*
%{_datadir}/rhn/up2date_client/haltree.*
%{_datadir}/rhn/up2date_client/hardware.*
%{_datadir}/rhn/up2date_client/up2dateUtils.*
%{_datadir}/rhn/up2date_client/up2dateLog.*
%{_datadir}/rhn/up2date_client/up2dateErrors.*
%{_datadir}/rhn/up2date_client/up2dateAuth.*
%{_datadir}/rhn/up2date_client/rpcServer.*
%{_datadir}/rhn/up2date_client/rhnserver.*
%{_datadir}/rhn/up2date_client/rpmUtils.*
%{_datadir}/rhn/up2date_client/rhnPackageInfo.*
%{_datadir}/rhn/up2date_client/rhnChannel.*
%{_datadir}/rhn/up2date_client/rhnErrata.*
%{_datadir}/rhn/up2date_client/rhnHardware.*
%{_datadir}/rhn/up2date_client/transaction.*
%{_datadir}/rhn/up2date_client/clientCaps.*
%{_datadir}/rhn/up2date_client/capabilities.*
%{_datadir}/rhn/up2date_client/rhncli.*
%{_datadir}/rhn/up2date_client/rhn_fcntl.*
%{_datadir}/rhn/up2date_client/rhnLockfile.*
%{_datadir}/rhn/__init__.*

%{_sbindir}/rhn-profile-sync

#public keys and certificates
%{_datadir}/rhn/RHNS-CA-CERT

%files -n rhn-check
%defattr(-,root,root,-)
%dir %{_datadir}/rhn/actions
%{_mandir}/man8/rhn_check.8*

%{_sbindir}/rhn_check

%{_datadir}/rhn/up2date_client/getMethod.*

# actions for rhn_check to run
%{_datadir}/rhn/actions/__init__.*
%{_datadir}/rhn/actions/hardware.*
%{_datadir}/rhn/actions/errata.*
%{_datadir}/rhn/actions/systemid.*
%{_datadir}/rhn/actions/reboot.*
%{_datadir}/rhn/actions/rhnsd.*
%{_datadir}/rhn/actions/up2date_config.*

%files -n rhn-setup
%defattr(-,root,root,-)
%{_mandir}/man8/rhnreg_ks.8*
%{_mandir}/man8/rhn_register.8*

%config(noreplace) %{_sysconfdir}/security/console.apps/rhn_register
%config(noreplace) %{_sysconfdir}/pam.d/rhn_register

%{_bindir}/rhn_register
%{_sbindir}/rhn_register
%{_sbindir}/rhnreg_ks

%{_datadir}/rhn/up2date_client/rhnreg.*
%{_datadir}/rhn/up2date_client/tui.*
%{_datadir}/rhn/up2date_client/rhnreg_constants.*

# firstboot is smart enough now to skip these modules
# if the modules say to
%{_datadir}/firstboot/modules/rhn_activate_gui.*
%{_datadir}/firstboot/modules/rhn_login_gui.*
%{_datadir}/firstboot/modules/rhn_register_firstboot_gui_window.*
%{_datadir}/firstboot/modules/rhn_start_gui.*
%{_datadir}/firstboot/modules/rhn_choose_server_gui.*
%{_datadir}/firstboot/modules/rhn_provide_certificate_gui.*
%{_datadir}/firstboot/modules/rhn_create_profile_gui.*
%{_datadir}/firstboot/modules/rhn_choose_org_gui.*
%{_datadir}/firstboot/modules/rhn_review_gui.*
%{_datadir}/firstboot/modules/rhn_finish_gui.*

%files -n rhn-setup-gnome
%defattr(-,root,root,-)
%{_datadir}/rhn/up2date_client/messageWindow.*
%{_datadir}/rhn/up2date_client/rhnregGui.*
%{_datadir}/rhn/up2date_client/rh_register.glade
%{_datadir}/rhn/up2date_client/gui.*
%{_datadir}/rhn/up2date_client/progress.*
%{_datadir}/pixmaps/*png
%{_datadir}/icons/hicolor/16x16/apps/up2date.png
%{_datadir}/icons/hicolor/24x24/apps/up2date.png
%{_datadir}/icons/hicolor/32x32/apps/up2date.png
%{_datadir}/icons/hicolor/48x48/apps/up2date.png
%{_datadir}/applications/rhn_register.desktop

%changelog
* Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 0.7.3-1
- comment out hosted url, so spacewalk users do not ping theirs machines

* Fri Sep  4 2009 Miroslav Suchy <msuchy at redhat.com> 0.7.2-1
- Rhpl was removed from rhel client packages (lukas.durfina at gmail.com)
 
* Tue Sep  1 2009 Miroslav Suchy <msuchy at redhat.com> 0.7.1-1
- change appeareance of icon and put it to Administration rather then to Preferences
- add scriplet to refres icon cache
- move "Requires: yum-rhn-plugin" from rhn-client-tools to rhn-check

* Wed Aug 05 2009 John Matthews <jmatthew at redhat.com> 0.6.2-1
- 494019 - Fixing the registration on python 2.6 to not include dbus.String
  objects in hardware profile as new xmlrpclib _dump method validates based on
  __dict__ on value. (pkilambi at redhat.com)

* Wed Jul 29 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-9
- Resolves: #445881

* Mon Jun 29 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-8
- Resolves: #467866

* Fri Jun 26 2009 Miroslav Suchy <msuchy at redhat.com> 0.6.1-1
- code cleanup - there is no usage of md5 in this code
- bump up version to 0.6

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.4.28-1
- 503090 - Fix missing packages reported during rhnreg_ks.
  (dgoodwin at redhat.com)
- 467866 - Raise a more cleaner message if clients end up getting badStatusLine
  error due to 502 proxy errors (pkilambi at redhat.com)
- 504292 - fix the registration gui and tui to honor the ssl cert paths
  specified in the config. Set the paths to default locations only if the user
  hasn't explicitly defined it. (pkilambi at redhat.com)
- 504296 - removing debug statements from hardware probing
  (pkilambi at redhat.com)
- Support infinite available entitlements in TUI registration
  (jbowes at redhat.com)
- account for virt_uuid is None case (pkilambi at redhat.com)
- Send smbios data to remaining_subscriptions during registration
  (jbowes at redhat.com)

* Fri Jun 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-7
- Resolves: #504292 #467866

* Fri Jun  5 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #504296
 
* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.4.27-1
- new build (pkilambi at redhat.com)
- 501316 - chnaging the network switch to always send network info by default
  unless there is a skipNetwork flag. This helps the upgrades issues where the
  config file gets saved by rpms and causing issues (pkilambi at redhat.com)
- merging additional spec changes and minor edits from svn
  (pkilambi at redhat.com)
- 467866 - catch the BadStatusLine and let use know that the server is
  unavailable temporarily (pkilambi at redhat.com)
-  -adding missing config option (pkilambi at redhat.com)
- Send smbios data in the new_system() call (jbowes at redhat.com)
- 499860 Ability to define location for the temporary transport file
  descriptors, uses /tmp by default (pkilambi at redhat.com)
- 479706 - send network and netInterface information on hardware probing during
  registration and profile sync is now an option and on by default. Users who
  do not wish to send network information can jus trun off sendNetwork option
  in the config. (pkilambi at redhat.com)
-  Letting firstboot know if the system is already registered through a
  kickstart so it would'nt prompt the user to re register during firstboot
  sequence (pkilambi at redhat.com)
- Throw an InvalidRedirectionError if redirect url does'nt fetch the package
  (pkilambi at redhat.com)
- adding NoSystemIdError exception class for 444581 (pkilambi at redhat.com)
- 467139 - fixing the rhn_check's action name to work for different locale
  (pkilambi at redhat.com)
- 491258 - adding check to see if haldaemon or messagebus is running. If not
  warn the user with right message and dont probe the hal and dmi as we'll
  obviously get a dbus_exception. (pkilambi at redhat.com)

* Mon May 18 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-5
- Resolves: #501316

* Tue May 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-4
- Resolves: #467866

* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-3
- new build

* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-2
- Resolves: #204449 #227638 #445881 #454005 #466718 #479706
- Resolves: #491258 #494928 #250312 #464827 #467139 #476797
- Resolves: #476894 #487754

* Fri May 01 2009 Devan Goodwin <dgoodwin at redhat.com> 0.4.25-1
- Stop using spec file Source line for desktop file. (dgoodwin at redhat.com)
- Adding support to send smbios information to the servers if implemented.
  add_smbios_info needs to be implemented on the server to fully take advantage
  of this call. Xen host/guests + para/fully virt types should work as usual
  for now. (pkilambi at redhat.com)
- 250312 - Do not spam the cert directory with backup certs, instead use the
  one requested by the user and proceed if its valid else reprompt to upload a
  valid certificate (pkilambi at redhat.com)
- removing config set logic as this code block will prevent from accessing the
  provide security certificate page. Also Adding supporing code to handle
  missing CA cert cases, instead of erroring out. (pkilambi at redhat.com)
- updating translations (pkilambi at redhat.com)
- 476797 -  profile-sync should not  probe dmidecode info on PV guests as there
  is no SMBIOS entry. (pkilambi at redhat.com)
- 204449 - Deprecating contactinfo flag functionality from rhnreg_ks
  (pkilambi at redhat.com)
- rhn-client-tools should now depend on cdn enabled rhnlib package
  (pkilambi at redhat.com)
- 476894 - Fix to support multiarch support for errata with multiarch packages.
  Errata apply should only install installed arch updates. If i386 and x86_64
  are installed, updates for both arches will be applied. (pkilambi at redhat.com)

* Fri Apr 24 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #487754 - rhn-client-tools depends on cdn enabled rhnlib package

* Mon Mar 30 2009 Miroslav Suchy <msuchy at redhat.com> 0.4.24-1
- 490438 - add .desktop file, own allowed-actions dir

* Mon Mar 16 2009 Miroslav Suchy <msuchy at redhat.com> 0.4.22-1
- use macros insted hardcoded paths

* Thu Feb 12 2009 jesus m. rodriguez <jesusr at redhat.com> 0.4.21-1
- replace "!#/usr/bin/env python" with "!#/usr/bin/python"

* Mon Jan 19 2009 Devan Goodwin <dgoodwin at redhat.com> 0.4.20-1
- Remove usage of version and sources files.

* Fri Dec  5 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-17
- Resolves: #473429 #473425

* Tue Nov 18 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-15
- Resolves: #249425 #405671

* Wed Nov 12 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-10
- Resolves: #471245

* Tue Nov 11 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-9
- Resolves: #249425 #470496 #231902 #470481

* Wed Nov  5 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-8
- Resolves: #429334 #249425 #231902

* Mon Oct 27 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-6
- Resolves: #467887

* Fri Oct 24 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-5
- Resolves: #467705 #467870 #468039

* Fri Sep 26 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-4
- new build

* Thu Sep 18 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-2
- Resolves: #231902 #241209 #249127 #249425 #253596 
- Resolves: #385321 #405671 #429334 #430155 #430156 
- Resolves: #432426 #433097 #434550 #439383 #442923 
- Resolves: #442930 #450597 #451775 #452829 #457953  #460685

* Tue Apr 16 2008 Pradeep Kilambi <pkilambi at redhat.com> 
- Resolves: #442694

* Mon Mar 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.4.17-3
- Resolves:  #435177

* Wed Jan 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.4.17-1
- Resolves: #211127, #212539, #213587, #216225, #216951, #216959
- Resolves: #219814, #221912, #228240, #231041, #249426, #253031
- Resolves: #315421, #364171, #364181, #364191, #372771, #426851

* Thu Jun 07 2007 James Slagle <jslagle at redhat.com> - 0.4.16-1
- Resolves: #212300, #212407, #217857, #218860, #224633, #227399
- Resolves: #228028, #229785, #229951, #232567, #233067, #234238
- Resolves: #234880, #236925, #237300

* Thu Feb 08 2007 James Bowes <jbowes at redhat.com> - 0.4.13-1
- Add missing translations.
- Related: #211568

* Tue Feb 06 2007 James Bowes <jbowes at redhat.com> - 0.4.12-1
- Add missing translations.
- Related: #211568
- Fix 'rhn_register dies when calling activateHardwareInfo' (jesusr)
- Resolves: #227408
 
* Thu Feb 01 2007 James Bowes <jbowes at redhat.com> - 0.4.11-1
- Add missing translations.
- Related: #211568

* Thu Feb 01 2007 James Bowes <jbowes at redhat.com> - 0.4.10-1
- Updated code to use more robust UUID/virt_type discovery mechanisms, which
  allows us to workaround BZ 225203. (pvetere)
- Resolves: #225203

* Mon Jan 29 2007 James Bowes <jbowes at redhat.com> - 0.4.9-1
- Add missing code required by packages.verify
- Resolves: #224631

* Mon Jan 22 2007 James Bowes <jbowes at redhat.com> - 0.4.8-1
- Add messages for virt entitlements
- Client side support for sending uuid and virt type during registration
- Look for orgs and INs even on satellite
- Catch InvalidRegNumException for hardware numbers
- Resolves: #223322, #223860, #223295, #223307, #223359

* Wed Jan 17 2007 James Bowes <jbowes at redhat.com> - 0.4.7-1
- Update translations.
- Related: #211568

* Wed Jan 10 2007 James Bowes <jbowes at redhat.com> - 0.4.6-1
- Update translations.
- Related: #211568

* Mon Dec 18 2006 James Bowes <jbowes at redhat.com> - 0.4.5-1
- Remove the last of the references to the up2date text domain.
- Related: #211568

* Fri Dec 15 2006 James Bowes <jbowes at redhat.com> - 0.4.4-1
- Update translations.
- Make sure translations are used in all parts of the gui and tui
- Related: #211568

* Thu Dec 14 2006 John Wregglesworth <wregglej at redhat.com> - 0.4.3-1
- Update translations.
- Related: #211568, #215285

* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 0.4.2-1
- Updated translations.
- Related: #211568

* Thu Dec 07 2006 James Slagle <jslagle at redhat.com> - 0.4.1-1
- Resolves: #218714

* Tue Dec 05 2006 James Bowes <jbowes at redhat.com> - 0.4.0-1
- Updated translations.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.3.9-2
- Stop packaging unused png.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.3.9-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 0.3.8-1
- Resolves: #212666, #216812, #215362, #210948, #216527, #213589

* Wed Nov 29 2006 James Slagle <jslagle at redhat.com> - 0.3.7-1
- Resolves: #212589, #212464

* Wed Nov 29 2006 James Slagle <jslagle at redhat.com> - 0.3.6-1
- Fixes for #212305, #212394

* Wed Nov 22 2006 James Slagle <jslagle at redhat.com> - 0.3.5-1
- Fixes for #213955, #212389, #212253

* Mon Nov 20 2006 James Bowes <jbowes at redhat.com> - 0.3.4-1
- Fixes for #213573, #215992, #215958, #214844, #214190

* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 0.3.3-1
- Fixes for #213089, #213958, #214691, #215085, #414414, #213134, #214882 
- Fixes for #214844, #214523, #214609
- Include new manual pages and AUTHORS file.

* Mon Nov 06 2006 James Slagle <jslagle at redhat.com> - 0.3.2-1
- Fix for #213952

* Thu Nov 01 2006 James Bowes <jbowes at redhat.com> - 0.3.1-1
- Fixes for #212460, #211414, #213089

* Tue Oct 31 2006 Shannon Hughes <shughes at redhat.com> - 0.3.0-1
- up2date/rhn_register support for hicolor theme
- Fix for #212666
- Fixes for #213133, #213090, #212020

* Mon Oct 30 2006 James Slagle <jslagle at redhat.com> - 0.2.9-1
- Add noSidebar attribute to the firstboot modules (except the 1st one).
- Fix for #211696

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 0.2.8-1
- New and updated translations.
- Fixes for #211480, #211568, #212618, #212539, #211415, #210948, #211389
- Fixes for #212052, #212453, #211382, #212599

* Thu Oct 26 2006 James Bowes <jbowes at redhat.com> - 0.2.7-1
- Update to 0.2.7
- Fixes for #212212, #211132

* Wed Oct 25 2006 Peter Vetere <pvetere at redhat.com> - 0.2.6-1
- Update to 0.2.6
- Fixed rhnreg_ks call to registerSystem.  Used "token" arg instead of 
  "activationKey."

* Wed Oct 25 2006 James Bowes <jbowes at redhat.com> - 0.2.5-1
- Update to 0.2.5
- Fixes for #211407, #211291, #211888, #212088, #212027, #211456, #211855

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.2.4-1
- Update to 0.2.4
- Fixes for #212001, #211876, #211132, #211376, #211374, #211359, #211231,
  and #211186

* Fri Oct 20 2006 Daniel Benamy <dbenamy at redhat.com> - 0.2.3-1
- New version (some bugfixes and an added image file).

* Tue Oct 17 2006 James Bowes <jbowes at redhat.com> - 0.2.2-2
- Conflict up2date, since we install in the same location.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.2-1
- New version.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.1-1
- New version.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.0-1
- New version.

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.9-1
- No longer provide or obsolete up2date

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.8-3
- reverted to desktop-file-install. It appears to be the preferred way.

* Thu Oct 12 2006 James Bowes <jbowes at redhat.com> - 0.1.8-2
- Update the summary and description of rhn-setup-gnome

* Thu Oct 12 2006 James Bowes <jbowes at redhat.com> - 0.1.8-1
- Fix for bz #210348
- use update-desktop-database rather than desktop-file-install

* Wed Oct 11 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.7-1
- Remove rhn_shared.py from firstboot stuff.

* Mon Oct 09 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.6-1
- New release for the milestone build that includes all the overhauling so far.

* Mon Oct 09 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-7
- Add rhn_review_gui firstboot module.

* Fri Oct 06 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-6
- Remove old new account and opt out firstboot modules.
- Add finish firstboot module.

* Wed Oct 04 2006 James Slagle <jslagle at redhat.com> - 0.1.5-5
- Add rhnreg_constants module.

* Wed Sep 27 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-4
- Add rhn_choose_org_gui firstboot module.

* Mon Sep 25 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-3
- Use rhn_start_gui firstboot module instead of rhn_choose_to_register_gui.

* Wed Sep 20 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-2
- Add file that firstboot create profile screen is moving to.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 0.1.5-1
- Fix whitespace error in rhn-profile-sync.py

* Wed Sep 13 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-9
- Add file containing firstboot provide cert screen.

* Wed Sep 13 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-8
- Add file containing firstboot choose server screen.

* Tue Sep 12 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-7
- Add file containing firstboot screen asking if user wants to register.

* Mon Sep 11 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-6
- Add file containing base class for firstboot windows.

* Thu Sep 07 2006 James Bowes <jbowes at redhat.com> - 0.1.4-5
- Remove references to up2date-uuid.

* Wed Sep 06 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-4
- Remove configdlg and put needed functionality in rh_register.glade and 
  rhnregGui.py.

* Wed Aug 30 2006 James Bowes <jbowes at redhat.com> - 0.1.4-3
- Move messageWindow and tui from client-tools to setup-gnome
  and setup.
- Add haltree

* Mon Aug 28 2006 James Bowes <jbowes at redhat.com> - 0.1.4-2
- Remove python-optik requires.

* Fri Jul 28 2006 James Bowes <jbowes at redhat.com> - 0.1.4-1
- New release.

* Thu Jul 27 2006 James Bowes <jbowes at redhat.com> - 0.1.3-1
- New release.
- Remove sourcesConfig from the spec file.

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 0.1.2-1
- New release.
- Remove rhnDefines from package.

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 0.1.1-1
- New release.
- Remove mkdir /etc/sysconfig/rhn from install; this is done
  in the Makefile.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.1.0-2
- Remove rhn_register obsoletes.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.1.0-1
- New release.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.0.9-1
- New release.

* Tue Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.8-3
- Make sub-packages depend on the exact version and release of
  the master package.

* Tue Jul 18 2006 James Bowes <jbowes at redhat.com> - 0.0.8-2
- Point to the new docs location in the source tree.

* Fri Jul 14 2006 James Bowes <jbowes at redhat.com> - 0.0.8-1
- Generate a uuid file from scratch during post.

* Wed Jun 21 2006 James Bowes <jbowes at redhat.com> - 0.0.7-1
- Removed the packages action.

* Fri Jun 02 2006 James Bowes <jbowes at redhat.com> - 0.0.6-2
- Remove reference to cliUtils

* Fri Jun 02 2006 James Bowes <jbowes at redhat.com> - 0.0.6-1
- new rhn-profile-sync command for syncing package, hardware,
  and virtualization profiles with rhn.

* Tue May 30 2006 James Bowes <jbowes at redhat.com> - 0.0.5-1
- Remove unneeded imports and circular imports.

 Tue May 23 2006 Pete Vetere <pvetere at redhat.com> - 0.0.4-1
- Add support for sending virtualization info to RHN

* Mon May 22 2006 James Bowes <jbowes at redhat.com> - 0.0.3-2
- Properly link rhn_register and up2date-config

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.3-1
- Remove more unused code and data files.

* Tue May 09 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Remove non-up2date repo backends.

* Mon May 08 2006 James Bowes <jbowes at redhat.com> - 4.4.69-6
- bump required version of rhnlib for pkg/iso redirect.

* Tue May 02 2006 James Bowes <jbowes at redhat.com> - 4.4.69-3
- fix for #87837, inaccurate error message when missing '-f' for kernel updates
- fix for #125049, misleading usage message: "Please specify either -l, -u, ...
- fix for #126528, up2date +get source fails if no source available
- fix for #168312, up2date config file is not ignored in rpm -V
- fix for #171057, CRM# 696030 repomd error after up2date
- fix for #171643, repomd error after up2date
- fix for #s 179896, 179898  rpm verify fails due to config files in .spec not marked ...

* Mon Apr 24 2006 Bret McMillan <bretm at redhat.com> 4.4.69-1
- fix for #178498, #176123 -- make --channel limit the channel universes for various operations
- fix for #162106, RHN 'sync packages to system' installing i386 glibc on i686
- fix for #175593, up2date --whatprovides doesn't handle compat arch provides

* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> 0.0.1-1
- Pull out rhnsd stuff so we can build as noarch.
- Make seperate rpms for rhn_check, and register.

* Wed Feb 01 2006 Adrian Likins <alikins at redhat.com> 4.4.6800000000000eleventybillion
- gratuitous version rev to test up2date of up2date

* Tue Jan 31 2006 Bret McMillan <bretm at redhat.com> 4.4.67-4
- fix release tag

* Fri Jan 27 2006 Adrian Likins <alikins at redhat.com> 4.4.67-3
- fix for #179110 - up2date fails to update xerces-j
- more fixed for #176195 "up2date-nox --configure changes current value of numeric attribute to Yes/No if 1/0 is selected"

* Fri Jan 27 2006 Bret McMillan <bretm at redhat.com> 4.4.65-3
- fix for #176195 "up2date-nox --configure changes current value of numeric attribute to Yes/No if 1/0 is selected"

* Thu Jan 19 2006 Adrian Likins <alikins at redhat.com> 4.4.63-4
- rest of fix for #169880 up2date --arch updates primary arch if package is out of date instead of arch specified.
- even better fix for #178261 "Invalid function call attempted" when installing a RHN proxy

* Thu Jan 19 2006 Bret McMillan <bretm at redhat.com> 4.4.60-4
- rebuild with fixes for:
- fix #169293 -- up2date unable to download very large rpms
- fix #177784 -- up2date gives error if select-all is checked
- fix #177786 -- up2date unselects all pakcages if select-all is checked and user selects 'back'

* Thu Jan 12 2006 Adrian Likins <alikins at redhat.com> 4.4.58
- fix for #165157 - firstboot 'Read our Privacy Statement' shows a blank text box

* Fri Jan 6 2006 Adrian Likins <alikins at redhat.com> 4.4.56-4.1
- rebuild for #176182 (new gcc)

* Thu Dec 8 2005 Adrian Likins <alikins at redhat.com> 4.4.55
- add bug fix for  #175321  rhnreg_ks cannot import name capabilities -- circular import

* Wed Nov 15 2005 Adrian Likins <alikins at redhat.com> 4.4.54
- revert orig fix for #165024 - "invalid function call" error on proxy installs
- add new bug fix for #165204
- revert "fix" for #169882, #159955 - up2date man page does not describe --undo option.
- add --unfo to man page fixing #169882, #159955


* Wed Nov 09 2005 Adrian Likins <alikins at redhat.com> 4.4.52
- fix #165024 - "invalid function call" error on proxy installs
- fix #169881, #167732 -  'up2date --configure' always saves changes if useNetwork is false on startup
 

* Mon Oct 10 2005 Adrian Likins <alikins at redhat.com> 4.4.51
- fix #169882, #159955 - up2date man page does not describe --undo option.
  (remove deprecated undo option)
- fix #170065, #166034 - up2date "forward" button disabled if packages selected via spacebar.
- fix #157087, #170055 - up2date --configure fails when failover serverURL is configured.

* Thu Sep 15 2005 Adrian Likins <alikins at redhat.com> 4.4.50-4
- new up2date.pot, synced up
- fix uncommitted changes that were causing string 
  translations not to show up
- more translations updates for #160608

* Mon Sep 12 2005 Adrian Likins <alikins at redhat.com> 4.4.45
- fix for #160602 (updated russian translations)


* Fri Aug 26 2005 Adrian Likins <alikins at redhat.com> 4.4.44
- fix for #166868 - fatal python error when  installing package

* Tue Aug 23 2005 Adrian Likins <alikins at redhat.com> 4.4.43
- more fixes for #144800

* Tue Aug 23 2005 Adrian Likins <alikins at redhat.com> 4.4.42
- more fixes for #159858/#157070

* Mon Aug 15 2005 Adrian Likins <alikins at redhat.com> 4.4.41
- fix #164660

* Thu Aug 11 2005 Adrian Likins <alikins at redhat.com> 4.4.40
- attempt "fix" for #165636 (require new rpm versions)

* Wed Aug 10 2005 Adrian Likins <alikins at redhat.com> 4.4.39
- more fix for #157070
- require newer rhnlib for #165360

* Thu Aug 4 2005 Adrian Likins <alikins at redhat.com> 4.4.38
- fix desktop files rpmdiff complained about

* Thu Aug 4 2005 Adrian Likins <alikins at redhat.com> 4.4.37
- fix specfile to work on ppc

* Wed Aug 3 2005 Adrian Likins <alikins at redhat.com> 4.4.36
- fix for #162701

* Wed Aug 3 2005 Adrian Likins <alikins at redhat.com> 4.4.35
- fix for #160602 (updated ru.po)

* Tue Aug 2 2005 Adrian Likins <alikins at redhat.com> 4.4.34
- fix for #144800

* Thu Jul 28 2005 Adrian Likins <alikins at redhat.com> 4.4.33
- fix for #149472

* Wed Jul 27 2005 Adrian Likins <alikins at redhat.com> 4.4.32
- fix for #144800
- fix for #137942

* Tue Jul 26 2005 Adrian Likins <alikins at redhat.com> 4.4.31
- fix for #155583

* Tue Jul 12 2005 Adrian Likins <alikins at redhat.com> 4.4.30
- more fixes for sources on RHEL-3
- have to include "3" as a release as well

* Mon Jul 11 2005 Adrian Likins <alikins at redhat.com> 4.4.28
- fix for issues with updating the package list after
  actions correctly #125790

* Thu Jul 7 2005 Jason Connor <jconnor at redhat.com> 4.4.27.2
- hotfix for bug 148952

* Tue Jun 7 2005 Adrian Likins <alikins at redhat.com> 4.4.25
- delay/avoid doing repomd if it's not in use

* Mon Jun 6 2005 Adrian Likins <alikins at redhat.com> 4.4.24
- dont require the old extended_packages cap

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.23
- change the way the version substitution works to pass pkg checker

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.22
- fix #158256 - up2date errors if yum isnt installed, but doesn't need to

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.20
- fix #154814 -  Selecting all packages in the GUI only selects first package

* Tue May 17 2005 Adrian Likins <alikins at redhat.com> 4.4.19
- fix #155583 - don't allow kernel-smp.x86_64 to be installed on ia32e
- fix #157070 - make yum/apt repos support proxies
- fix #148952 - patch from Jack Neely <jjneely at pams.ncsu.edu)

* Mon May 16 2005 Adrian Likins <alikins at redhat.com> 4.4.19
- fix #150418 ? rhel-4 client machine capabilities not recognized sometimes
- fix #145554 ? rhn_register fails if proxy username begins at '0'
- fix #154137 up2date does not always send the arch

* Mon May 9 2005 Adrian Likins <alikins at redhat.com> 4.4.18
- fix problem with missing import

* Wed Apr 27 2005 Adrian Likins <alikins at redhat.com> 4.4.17
- fix some bugs in the way repomdRepo creates the package lists

* Tue Apr 26 2005 Adrian Likins <alikins at redhat.com> 4.4.16
- support repomd repos (and use the yum config if it exists)
  bugzilla #135121

* Tue Apr 19 2005 Adrian Likins <alikins at redhat.com> 4.4.15
- fix #149444 up2date --dry-run --upgrade-to-release changes registered base channel
- fix #151328 (tracback when registering with *'s in password)
- added some general uncaught exception catching
- truncate rpm changelog (see up2date.spec.changelog)
- update translations

* Thu Apr 14 2005 Jason Connor <jconnor at redhat.com> 4.4.14
- fix #135121 - uncommented rpmmd registration, fixed api
- fix #149281 - added check for failed read

* Fri Apr 8 2005 Adrian Likins <alikins at redhat.com> 4.4.13
- update translations

* Thu Apr 7 2005 Adrian Likins <alikins at redhat.com> 4.4.12
- update translations

* Thu Mar 3 2005 Adrian Likins <alikins at redhat.com> 4.4.10
- fix #150210
- revert change for package list refresh for this
  release

* Tue Mar 1 2005 Adrian Likins <alikins at redhat.com> 4.4.9
- fix #149947

* Tue Feb 15 2005 Adrian Likins <alikins at redhat.com> 4.4.8
- fix #139537

* Fri Jan 14 2005 Adrian Likins <alikins at redhat.com> 4.4.7
- fix #136497
- fix #142750, #142589 (less deprecation warnings) 

* Mon Jan 10 2005 Adrian Likins <alikins at redhat.com> 4.4.6
- fix #144704

* Wed Dec 15 2004 Adrian Likins <alikins at redhat.com> 4.4.5
- fix #142406 (again)

* Wed Dec 15 2004 Adrian Likins <alikins at redhat.com> 4.4.4
- fix #142332
- fix #129909

* Tue Dec 14 2004 Adrian Likins <alikins at redhat.com> 4.4.3
- fix #142406

* Mon Dec 6 2004 Adrian Likins <alikins at redhat.com> 4.4.2
- fix #139495 (updated translations)

* Fri Dec 3 2004 Adrian Likins <alikins at redhat.com> 4.4.1
- fix #141820 (add kernel-devel to list of packages to
  intall not update)

* Fri Dec 3 2004 Adrian Likins <alikins at redhat.com> 4.4.0
- rev to 4.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:46:56 -0000	1.1
+++ .cvsignore	22 Sep 2009 14:48:09 -0000	1.2
@@ -0,0 +1 @@
+rhn-client-tools-0.7.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:46:56 -0000	1.1
+++ sources	22 Sep 2009 14:48:09 -0000	1.2
@@ -0,0 +1 @@
+1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz



From lkundrak at fedoraproject.org  Tue Sep 22 14:55:48 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 22 Sep 2009 14:55:48 +0000 (UTC)
Subject: rpms/sunbird/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 sunbird.spec, 1.39, 1.40
Message-ID: <20090922145548.60BA311C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1473

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
* Tue Sep 22 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.11.20090916hg
- Fix version, tidy up the spec a bit
- Update langpacks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Sep 2009 13:42:31 -0000	1.15
+++ .cvsignore	22 Sep 2009 14:55:47 -0000	1.16
@@ -1,3 +1,2 @@
-thunderbird-3.0b3-source.tar.bz2
 sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 13:42:31 -0000	1.15
+++ sources	22 Sep 2009 14:55:48 -0000	1.16
@@ -1,2 +1,2 @@
-70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar
+1d7d4eb4aaea7e7fae9eba3dcc995161  sunbird-l10n.tar
 0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sunbird.spec	22 Sep 2009 14:00:33 -0000	1.39
+++ sunbird.spec	22 Sep 2009 14:55:48 -0000	1.40
@@ -11,17 +11,9 @@
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
-# The tarball is pretty inconsistent with directory structure.
-# Sometimes there is a top level directory.  That goes here.
-#
-# IMPORTANT: If there is no top level directory, this should be 
-# set to the cwd, ie: '.'
-#%define tarballdir .
-%define tarballdir comm-central
-
 Name:           sunbird
 Version:        1.0
-Release:        0.12.20090715hg%{?dist}
+Release:        0.12.20090916hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -113,8 +105,7 @@ calendaring tasks.
 
 
 %prep
-%setup -c -q -a 2
-cd %{tarballdir}
+%setup -n comm-central -q -a 2
 %patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
@@ -123,7 +114,6 @@ find . -name '*.cpp' -o -name '*.h' |xar
 
 
 %build
-cd %{tarballdir}
 cat >.mozconfig <<EOF
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -156,7 +146,6 @@ make -f client.mk build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{tarballdir}
 
 # make install is bogus
 # copy tree, break symlinks
@@ -306,6 +295,10 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.11.20090916hg
+- Fix version, tidy up the spec a bit
+- Update langpacks
+
 * Tue Sep 22 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.11.20090715hg
 - Rebuild against new Thunderbird
 



From tuxbrewr at fedoraproject.org  Tue Sep 22 15:02:02 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 22 Sep 2009 15:02:02 +0000 (UTC)
Subject: rpms/python-mwclient/F-11 mwclient-wmf.patch, NONE,
	1.1 python-mwclient.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090922150202.F3E9D11C00E8@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/python-mwclient/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3604

Modified Files:
	.cvsignore sources 
Added Files:
	mwclient-wmf.patch python-mwclient.spec 
Log Message:
Initial build

mwclient-wmf.patch:
 client.py |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE mwclient-wmf.patch ---
diff -crB mwclient/client.py mwclient-fedora/client.py
*** mwclient/client.py	2009-07-16 21:22:54.000000000 -0400
--- mwclient-fedora/client.py	2009-09-22 10:36:31.000000000 -0400
***************
*** 100,106 ****
  			if len(version) == 2 and version[1].endswith('alpha'):
  				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
  			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
! 				self.version = (int(version[0]), int(version[1][:-5]), 'alpha-wmf')
  			elif len(version) == 3 and 'rc' in version[2]:
  				self.version = (int(version[0]), int(version[1]), version[2])
  			elif len(version) == 3:
--- 100,106 ----
  			if len(version) == 2 and version[1].endswith('alpha'):
  				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
  			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
! 				self.version = (int(version[0]), int(version[1][:-9]), 'alpha-wmf')
  			elif len(version) == 3 and 'rc' in version[2]:
  				self.version = (int(version[0]), int(version[1]), version[2])
  			elif len(version) == 3:


--- NEW FILE python-mwclient.spec ---
%{!?pyver:%global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


Name:           python-mwclient
Version:        0.6.3
Release:        3%{?dist}
Summary:        Mwclient is a client to the MediaWiki API

Group:          System Environment/Libraries
License:        MIT
URL:            http://sourceforge.net/apps/mediawiki/mwclient/index.php?title=Main_Page
Source0:        http://downloads.sourceforge.net/mwclient/mwclient-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

## upstream patches
Patch100: mwclient-wmf.patch

BuildRequires:  python-devel
Requires:  python-simplejson

%description
Mwclient is a client to the MediaWiki API <http://mediawiki.org/wiki/API>
and allows access to almost all implemented API functions

%prep
%setup -q -n mwclient

%patch100 -p1 -b .wmf


%build
# intentionally left blank


%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 %{buildroot}%{python_sitelib}/mwclient/
install -pm 0644 *.py %{buildroot}%{python_sitelib}/mwclient/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/mwclient/


%changelog
* Tue Sep 22 2009 Steven M. Parrish <smparrish at gmail.com> - 0.6.3-3
- Fix patch

* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-2
- upstream wmf patch
- %%doc README.txt
- use %%global (instead of %%define)

* Tue Sep 15 2009  Steven M. Parrish <smparrish at gmail.com> - 0.6.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:05:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 15:02:02 -0000	1.2
@@ -0,0 +1 @@
+mwclient-0.6.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:05:16 -0000	1.1
+++ sources	22 Sep 2009 15:02:02 -0000	1.2
@@ -0,0 +1 @@
+3f050ea125dc31971130449da6e3c0c2  mwclient-0.6.3.zip



From hadess at fedoraproject.org  Tue Sep 22 15:02:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Sep 2009 15:02:59 +0000 (UTC)
Subject: rpms/clutter/devel .cvsignore, 1.19, 1.20 clutter.spec, 1.35,
	1.36 sources, 1.19, 1.20
Message-ID: <20090922150259.4D64D11C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3978

Modified Files:
	.cvsignore clutter.spec sources 
Log Message:
* Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 1.0.6-1
- Update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	30 Aug 2009 15:33:16 -0000	1.19
+++ .cvsignore	22 Sep 2009 15:02:59 -0000	1.20
@@ -1,2 +1 @@
-clutter-1.0.2.tar.bz2
-clutter-1.0.4.tar.bz2
+clutter-1.0.6.tar.bz2


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- clutter.spec	30 Aug 2009 15:33:16 -0000	1.35
+++ clutter.spec	22 Sep 2009 15:02:59 -0000	1.36
@@ -1,5 +1,5 @@
 Name:           clutter
-Version:        1.0.4
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 1.0.6-1
+- Update to 1.0.6
+
 * Sun Aug 30 2009 Owen Taylor <otaylor at redhat.com> - 1.0.4-1
 - Update to 1.0.4, update gobject-introspection requirement
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	30 Aug 2009 15:33:16 -0000	1.19
+++ sources	22 Sep 2009 15:02:59 -0000	1.20
@@ -1 +1 @@
-7e587d9406e362ea1151a81d37d5460c  clutter-1.0.4.tar.bz2
+477e9093b2869f961e7295dab7b92d6b  clutter-1.0.6.tar.bz2



From kasal at fedoraproject.org  Tue Sep 22 15:07:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 22 Sep 2009 15:07:54 +0000 (UTC)
Subject: rpms/libtar/devel libtar-macro.patch, NONE, 1.1 libtar.spec, 1.16,
	1.17
Message-ID: <20090922150754.2207711C00E8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/libtar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6330

Modified Files:
	libtar.spec 
Added Files:
	libtar-macro.patch 
Log Message:
- fix up so that it builds again (#511566)

libtar-macro.patch:
 configure.ac |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libtar-macro.patch ---
2009-09-22  Stepan Kasal  <skasal at redhat.com>

	* tell aclocal where are the macros

--- libtar-1.2.11/configure.ac.macro	2009-09-22 14:47:07.000000000 +0200
+++ libtar-1.2.11/configure.ac	2009-09-22 14:50:34.000000000 +0200
@@ -2,6 +2,7 @@
 AC_INIT([libtar], [1.2.11])
 AC_PREREQ([2.57])
 AC_CONFIG_AUX_DIR([autoconf])
+AC_CONFIG_MACRO_DIR([autoconf])
 AC_CONFIG_HEADERS([config.h])
 AC_COPYRIGHT([[
 Copyright (c) 1998-2003 University of Illinois Board of Trustees


Index: libtar.spec
===================================================================
RCS file: /cvs/extras/rpms/libtar/devel/libtar.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libtar.spec	25 Jul 2009 08:43:52 -0000	1.16
+++ libtar.spec	22 Sep 2009 15:07:53 -0000	1.17
@@ -1,13 +1,14 @@
 Summary:        Tar file manipulation API
 Name:           libtar
 Version:        1.2.11
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.feep.net/libtar/
 Source0:        ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz
 Patch0:         http://ftp.debian.org/debian/pool/main/libt/libtar/libtar_1.2.11-4.diff.gz
 Patch1:         libtar-1.2.11-missing-protos.patch
+Patch2:         libtar-macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel libtool
 
@@ -31,18 +32,25 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -z .deb
 %patch1 -p1
+%patch2 -p1
 # set correct version for .so build
 %define ltversion %(echo %{version} | tr '.' ':')
 sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
   lib/Makefile.in
+# sanitize the macro definitions so that aclocal can find them:
+cd autoconf
+sed '/^m4_include/d;s/ m4_include/ m4][_include/g' aclocal.m4 >psg.m4
+rm acsite.m4 aclocal.m4
+cd ..
 
 
 %build
-cp /usr/share/libtool/config.sub /usr/share/libtool/ltmain.sh autoconf
+cp -p /usr/share/libtool/config/config.sub autoconf
+# config.guess is not needed, macro %%configure specifies --build
+libtoolize --copy
+aclocal -I autoconf
+autoconf
 %configure --disable-static
-# Don't use 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
 make %{?_smp_mflags}
 
 
@@ -77,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Stepan Kasal <skasal at redhat.com> - 1.2.11-14
+- fix up so that it builds again (#511566)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxx at fedoraproject.org  Tue Sep 22 15:11:06 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Tue, 22 Sep 2009 15:11:06 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.22, 1.23 hamster-applet.spec,
	1.31, 1.32 sources, 1.22, 1.23
Message-ID: <20090922151106.644E311C00E8@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8612

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	8 Sep 2009 01:55:09 -0000	1.22
+++ .cvsignore	22 Sep 2009 15:11:06 -0000	1.23
@@ -1 +1 @@
-hamster-applet-2.27.92.tar.bz2
+hamster-applet-2.28.0.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- hamster-applet.spec	8 Sep 2009 01:55:09 -0000	1.31
+++ hamster-applet.spec	22 Sep 2009 15:11:06 -0000	1.32
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.27.92
+Version:        2.28.0
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at fredhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	8 Sep 2009 01:55:09 -0000	1.22
+++ sources	22 Sep 2009 15:11:06 -0000	1.23
@@ -1 +1 @@
-166a7f506b5137caa7677763e41ce2f5  hamster-applet-2.27.92.tar.bz2
+a35224d3515a0395c1b086cfe4b9a2a5  hamster-applet-2.28.0.tar.bz2



From tuxbrewr at fedoraproject.org  Tue Sep 22 15:11:05 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 22 Sep 2009 15:11:05 +0000 (UTC)
Subject: rpms/python-mwclient/F-10 mwclient-wmf.patch, NONE,
	1.1 python-mwclient.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090922151105.15A9911C00E8@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/python-mwclient/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8574

Modified Files:
	.cvsignore sources 
Added Files:
	mwclient-wmf.patch python-mwclient.spec 
Log Message:
Initial build

mwclient-wmf.patch:
 client.py |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE mwclient-wmf.patch ---
diff -crB mwclient/client.py mwclient-fedora/client.py
*** mwclient/client.py	2009-07-16 21:22:54.000000000 -0400
--- mwclient-fedora/client.py	2009-09-22 10:36:31.000000000 -0400
***************
*** 100,106 ****
  			if len(version) == 2 and version[1].endswith('alpha'):
  				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
  			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
! 				self.version = (int(version[0]), int(version[1][:-5]), 'alpha-wmf')
  			elif len(version) == 3 and 'rc' in version[2]:
  				self.version = (int(version[0]), int(version[1]), version[2])
  			elif len(version) == 3:
--- 100,106 ----
  			if len(version) == 2 and version[1].endswith('alpha'):
  				self.version = (int(version[0]), int(version[1][:-5]), 'alpha')
  			elif len(version) == 2 and version[1].endswith('alpha-wmf'):
! 				self.version = (int(version[0]), int(version[1][:-9]), 'alpha-wmf')
  			elif len(version) == 3 and 'rc' in version[2]:
  				self.version = (int(version[0]), int(version[1]), version[2])
  			elif len(version) == 3:


--- NEW FILE python-mwclient.spec ---
%{!?pyver:%global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


Name:           python-mwclient
Version:        0.6.3
Release:        3%{?dist}
Summary:        Mwclient is a client to the MediaWiki API

Group:          System Environment/Libraries
License:        MIT
URL:            http://sourceforge.net/apps/mediawiki/mwclient/index.php?title=Main_Page
Source0:        http://downloads.sourceforge.net/mwclient/mwclient-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

## upstream patches
Patch100: mwclient-wmf.patch

BuildRequires:  python-devel
Requires:  python-simplejson

%description
Mwclient is a client to the MediaWiki API <http://mediawiki.org/wiki/API>
and allows access to almost all implemented API functions

%prep
%setup -q -n mwclient

%patch100 -p1 -b .wmf


%build
# intentionally left blank


%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 %{buildroot}%{python_sitelib}/mwclient/
install -pm 0644 *.py %{buildroot}%{python_sitelib}/mwclient/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/mwclient/


%changelog
* Tue Sep 22 2009 Steven M. Parrish <smparrish at gmail.com> - 0.6.3-3
- Fix patch

* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-2
- upstream wmf patch
- %%doc README.txt
- use %%global (instead of %%define)

* Tue Sep 15 2009  Steven M. Parrish <smparrish at gmail.com> - 0.6.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:05:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 15:11:04 -0000	1.2
@@ -0,0 +1 @@
+mwclient-0.6.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mwclient/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:05:16 -0000	1.1
+++ sources	22 Sep 2009 15:11:04 -0000	1.2
@@ -0,0 +1 @@
+3f050ea125dc31971130449da6e3c0c2  mwclient-0.6.3.zip



From jussilehtola at fedoraproject.org  Tue Sep 22 15:12:06 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 15:12:06 +0000 (UTC)
Subject: rpms/pidgin-latex/devel .cvsignore, 1.3, 1.4 pidgin-latex.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090922151206.7A7A911C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9328

Modified Files:
	.cvsignore pidgin-latex.spec sources 
Log Message:
Update to 1.3.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jul 2009 14:40:56 -0000	1.3
+++ .cvsignore	22 Sep 2009 15:12:05 -0000	1.4
@@ -1 +1 @@
-pidgin-latex-1.3.2.tar.bz2
+pidgin-latex-1.3.3.tar.bz2


Index: pidgin-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/devel/pidgin-latex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pidgin-latex.spec	26 Jul 2009 18:43:54 -0000	1.4
+++ pidgin-latex.spec	22 Sep 2009 15:12:06 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		pidgin-latex
-Version:	1.3.2
-Release:	2%{?dist}
+Version:	1.3.3
+Release:	1%{?dist}
 Summary:	Use LaTeX formulas in your pidgin conversations 
 Group:		Applications/Internet
 License:	GPLv2+
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_libdir}/pidgin/*.so
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.3-1
+- Update to 1.3.3.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 14:40:56 -0000	1.3
+++ sources	22 Sep 2009 15:12:06 -0000	1.4
@@ -1 +1 @@
-10def2b9f0ed000e6d32f0afc7a5e21d  pidgin-latex-1.3.2.tar.bz2
+ecd4d0865d8e5b7cbfb54a8e6ada2385  pidgin-latex-1.3.3.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 22 15:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:24:49 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchbugzilla
Message-ID: <20090922152449.D914C10F87C@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:24:51 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchcommits
Message-ID: <20090922152451.BD4BB10F883@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:24:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:24:55 +0000
Subject: [pkgdb] nasm: npajkovs has requested commit
Message-ID: <20090922152455.64C4D10F890@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:24:56 +0000
Subject: [pkgdb] nasm: npajkovs has requested approveacls
Message-ID: <20090922152457.B075F10F89A@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:06 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchbugzilla
Message-ID: <20090922152506.C5F0A10F89B@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on nasm (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:09 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchcommits
Message-ID: <20090922152509.334DF10F89E@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on nasm (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:09 +0000
Subject: [pkgdb] nasm: npajkovs has requested commit
Message-ID: <20090922152511.3279210F8A1@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on nasm (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:12 +0000
Subject: [pkgdb] nasm: npajkovs has requested approveacls
Message-ID: <20090922152512.D04AB10F8A4@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on nasm (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:17 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchbugzilla
Message-ID: <20090922152517.CEB2510F883@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on nasm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:19 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchcommits
Message-ID: <20090922152519.4E90610F8A6@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on nasm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:21 +0000
Subject: [pkgdb] nasm: npajkovs has requested commit
Message-ID: <20090922152521.9977710F8AA@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on nasm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:24 +0000
Subject: [pkgdb] nasm: npajkovs has requested approveacls
Message-ID: <20090922152524.87CA810F890@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on nasm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:31 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchbugzilla
Message-ID: <20090922152531.CD66710F8AC@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on nasm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:33 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchcommits
Message-ID: <20090922152533.70EC910F8B0@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on nasm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:35 +0000
Subject: [pkgdb] nasm: npajkovs has requested commit
Message-ID: <20090922152535.023FA10F8B2@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on nasm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:25:36 +0000
Subject: [pkgdb] nasm: npajkovs has requested approveacls
Message-ID: <20090922152537.6281310F89B@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on nasm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From msuchy at fedoraproject.org  Tue Sep 22 15:30:56 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Tue, 22 Sep 2009 15:30:56 +0000 (UTC)
Subject: rpms/rhn-client-tools/F-12 import.log, NONE,
	1.1 rhn-client-tools.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922153057.3517811C00E8@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhn-client-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32184/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rhn-client-tools.spec 
Log Message:
Initial import of rhn-client-tools to F-12 branch.



--- NEW FILE import.log ---
rhn-client-tools-0_7_3-1:F-12:rhn-client-tools-0.7.3-1.src.rpm:1253630947


--- NEW FILE rhn-client-tools.spec ---
Summary: Support programs and libraries for Red Hat Network or Spacewalk
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
Name: rhn-client-tools
Version: 0.7.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: rhnlib >= 2.2.7
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python 
Requires: python-ethtool
Requires: gnupg
Requires: sh-utils
Requires: dbus-python
Requires: hal
Requires: newt

Conflicts: up2date

BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils

%description
Red Hat Network Client Tools provides programs and libraries to allow your
system to receive software updates from Red Hat Network or Spacewalk.

%package -n rhn-check
Summary: Check for RHN actions
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: yum-rhn-plugin >= 0.5.3-30

%description -n rhn-check
rhn-check polls a Red Hat Network or Spacewalk server to find and execute 
scheduled actions.

%package -n rhn-setup
Summary: Configure and register an RHN/Spacewalk client
Group: System Environment/Base
Requires: usermode >= 1.36
Requires: %{name} = %{version}-%{release}
Requires: rhnsd

%description -n rhn-setup
rhn-setup contains programs and utilities to configure a system to use
Red Hat Network or Spacewalk, and to register a system with a Red Hat Network
or Spacewalk server.

%package -n rhn-setup-gnome
Summary: A GUI interface for RHN/Spacewalk Registration
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: rhn-setup = %{version}-%{release}
Requires: pam >= 0.72
Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas 
Requires: usermode-gtk

%description -n rhn-setup-gnome
rhn-setup-gnome contains a GTK+ graphical interface for configuring and
registering a system with a Red Hat Network or Spacewalk server.


%prep
%setup -q 

%build
make -f Makefile.rhn-client-tools

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}

mkdir -p $RPM_BUILD_ROOT/var/lib/up2date

desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rhn rhn_register.desktop

%find_lang %{name}

%post -n rhn-setup-gnome
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun -n rhn-setup-gnome
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n rhn-setup-gnome
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
# some info about mirrors
%doc doc/ChangeLog 
%doc doc/mirrors.txt 
%doc doc/fedora-core-1 
%doc doc/updates-released
%doc doc/AUTHORS
%doc doc/LICENSE
%{_mandir}/man8/rhn-profile-sync.8*
%{_mandir}/man5/up2date.5*

%dir %{_sysconfdir}/sysconfig/rhn
%dir %{_sysconfdir}/sysconfig/rhn/clientCaps.d
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/configfiles
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/script
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/up2date
%config(noreplace) %{_sysconfdir}/logrotate.d/up2date
%config(noreplace) %{_sysconfdir}/rpm/macros.up2date

# dirs
%dir %{_datadir}/rhn
%dir %{_datadir}/rhn/up2date_client

#files
%{_datadir}/rhn/up2date_client/__init__.*
%{_datadir}/rhn/up2date_client/config.*
%{_datadir}/rhn/up2date_client/haltree.*
%{_datadir}/rhn/up2date_client/hardware.*
%{_datadir}/rhn/up2date_client/up2dateUtils.*
%{_datadir}/rhn/up2date_client/up2dateLog.*
%{_datadir}/rhn/up2date_client/up2dateErrors.*
%{_datadir}/rhn/up2date_client/up2dateAuth.*
%{_datadir}/rhn/up2date_client/rpcServer.*
%{_datadir}/rhn/up2date_client/rhnserver.*
%{_datadir}/rhn/up2date_client/rpmUtils.*
%{_datadir}/rhn/up2date_client/rhnPackageInfo.*
%{_datadir}/rhn/up2date_client/rhnChannel.*
%{_datadir}/rhn/up2date_client/rhnErrata.*
%{_datadir}/rhn/up2date_client/rhnHardware.*
%{_datadir}/rhn/up2date_client/transaction.*
%{_datadir}/rhn/up2date_client/clientCaps.*
%{_datadir}/rhn/up2date_client/capabilities.*
%{_datadir}/rhn/up2date_client/rhncli.*
%{_datadir}/rhn/up2date_client/rhn_fcntl.*
%{_datadir}/rhn/up2date_client/rhnLockfile.*
%{_datadir}/rhn/__init__.*

%{_sbindir}/rhn-profile-sync

#public keys and certificates
%{_datadir}/rhn/RHNS-CA-CERT

%files -n rhn-check
%defattr(-,root,root,-)
%dir %{_datadir}/rhn/actions
%{_mandir}/man8/rhn_check.8*

%{_sbindir}/rhn_check

%{_datadir}/rhn/up2date_client/getMethod.*

# actions for rhn_check to run
%{_datadir}/rhn/actions/__init__.*
%{_datadir}/rhn/actions/hardware.*
%{_datadir}/rhn/actions/errata.*
%{_datadir}/rhn/actions/systemid.*
%{_datadir}/rhn/actions/reboot.*
%{_datadir}/rhn/actions/rhnsd.*
%{_datadir}/rhn/actions/up2date_config.*

%files -n rhn-setup
%defattr(-,root,root,-)
%{_mandir}/man8/rhnreg_ks.8*
%{_mandir}/man8/rhn_register.8*

%config(noreplace) %{_sysconfdir}/security/console.apps/rhn_register
%config(noreplace) %{_sysconfdir}/pam.d/rhn_register

%{_bindir}/rhn_register
%{_sbindir}/rhn_register
%{_sbindir}/rhnreg_ks

%{_datadir}/rhn/up2date_client/rhnreg.*
%{_datadir}/rhn/up2date_client/tui.*
%{_datadir}/rhn/up2date_client/rhnreg_constants.*

# firstboot is smart enough now to skip these modules
# if the modules say to
%{_datadir}/firstboot/modules/rhn_activate_gui.*
%{_datadir}/firstboot/modules/rhn_login_gui.*
%{_datadir}/firstboot/modules/rhn_register_firstboot_gui_window.*
%{_datadir}/firstboot/modules/rhn_start_gui.*
%{_datadir}/firstboot/modules/rhn_choose_server_gui.*
%{_datadir}/firstboot/modules/rhn_provide_certificate_gui.*
%{_datadir}/firstboot/modules/rhn_create_profile_gui.*
%{_datadir}/firstboot/modules/rhn_choose_org_gui.*
%{_datadir}/firstboot/modules/rhn_review_gui.*
%{_datadir}/firstboot/modules/rhn_finish_gui.*

%files -n rhn-setup-gnome
%defattr(-,root,root,-)
%{_datadir}/rhn/up2date_client/messageWindow.*
%{_datadir}/rhn/up2date_client/rhnregGui.*
%{_datadir}/rhn/up2date_client/rh_register.glade
%{_datadir}/rhn/up2date_client/gui.*
%{_datadir}/rhn/up2date_client/progress.*
%{_datadir}/pixmaps/*png
%{_datadir}/icons/hicolor/16x16/apps/up2date.png
%{_datadir}/icons/hicolor/24x24/apps/up2date.png
%{_datadir}/icons/hicolor/32x32/apps/up2date.png
%{_datadir}/icons/hicolor/48x48/apps/up2date.png
%{_datadir}/applications/rhn_register.desktop

%changelog
* Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 0.7.3-1
- comment out hosted url, so spacewalk users do not ping theirs machines

* Fri Sep  4 2009 Miroslav Suchy <msuchy at redhat.com> 0.7.2-1
- Rhpl was removed from rhel client packages (lukas.durfina at gmail.com)
 
* Tue Sep  1 2009 Miroslav Suchy <msuchy at redhat.com> 0.7.1-1
- change appeareance of icon and put it to Administration rather then to Preferences
- add scriplet to refres icon cache
- move "Requires: yum-rhn-plugin" from rhn-client-tools to rhn-check

* Wed Aug 05 2009 John Matthews <jmatthew at redhat.com> 0.6.2-1
- 494019 - Fixing the registration on python 2.6 to not include dbus.String
  objects in hardware profile as new xmlrpclib _dump method validates based on
  __dict__ on value. (pkilambi at redhat.com)

* Wed Jul 29 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-9
- Resolves: #445881

* Mon Jun 29 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-8
- Resolves: #467866

* Fri Jun 26 2009 Miroslav Suchy <msuchy at redhat.com> 0.6.1-1
- code cleanup - there is no usage of md5 in this code
- bump up version to 0.6

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.4.28-1
- 503090 - Fix missing packages reported during rhnreg_ks.
  (dgoodwin at redhat.com)
- 467866 - Raise a more cleaner message if clients end up getting badStatusLine
  error due to 502 proxy errors (pkilambi at redhat.com)
- 504292 - fix the registration gui and tui to honor the ssl cert paths
  specified in the config. Set the paths to default locations only if the user
  hasn't explicitly defined it. (pkilambi at redhat.com)
- 504296 - removing debug statements from hardware probing
  (pkilambi at redhat.com)
- Support infinite available entitlements in TUI registration
  (jbowes at redhat.com)
- account for virt_uuid is None case (pkilambi at redhat.com)
- Send smbios data to remaining_subscriptions during registration
  (jbowes at redhat.com)

* Fri Jun 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-7
- Resolves: #504292 #467866

* Fri Jun  5 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #504296
 
* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.4.27-1
- new build (pkilambi at redhat.com)
- 501316 - chnaging the network switch to always send network info by default
  unless there is a skipNetwork flag. This helps the upgrades issues where the
  config file gets saved by rpms and causing issues (pkilambi at redhat.com)
- merging additional spec changes and minor edits from svn
  (pkilambi at redhat.com)
- 467866 - catch the BadStatusLine and let use know that the server is
  unavailable temporarily (pkilambi at redhat.com)
-  -adding missing config option (pkilambi at redhat.com)
- Send smbios data in the new_system() call (jbowes at redhat.com)
- 499860 Ability to define location for the temporary transport file
  descriptors, uses /tmp by default (pkilambi at redhat.com)
- 479706 - send network and netInterface information on hardware probing during
  registration and profile sync is now an option and on by default. Users who
  do not wish to send network information can jus trun off sendNetwork option
  in the config. (pkilambi at redhat.com)
-  Letting firstboot know if the system is already registered through a
  kickstart so it would'nt prompt the user to re register during firstboot
  sequence (pkilambi at redhat.com)
- Throw an InvalidRedirectionError if redirect url does'nt fetch the package
  (pkilambi at redhat.com)
- adding NoSystemIdError exception class for 444581 (pkilambi at redhat.com)
- 467139 - fixing the rhn_check's action name to work for different locale
  (pkilambi at redhat.com)
- 491258 - adding check to see if haldaemon or messagebus is running. If not
  warn the user with right message and dont probe the hal and dmi as we'll
  obviously get a dbus_exception. (pkilambi at redhat.com)

* Mon May 18 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-5
- Resolves: #501316

* Tue May 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-4
- Resolves: #467866

* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-3
- new build

* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-2
- Resolves: #204449 #227638 #445881 #454005 #466718 #479706
- Resolves: #491258 #494928 #250312 #464827 #467139 #476797
- Resolves: #476894 #487754

* Fri May 01 2009 Devan Goodwin <dgoodwin at redhat.com> 0.4.25-1
- Stop using spec file Source line for desktop file. (dgoodwin at redhat.com)
- Adding support to send smbios information to the servers if implemented.
  add_smbios_info needs to be implemented on the server to fully take advantage
  of this call. Xen host/guests + para/fully virt types should work as usual
  for now. (pkilambi at redhat.com)
- 250312 - Do not spam the cert directory with backup certs, instead use the
  one requested by the user and proceed if its valid else reprompt to upload a
  valid certificate (pkilambi at redhat.com)
- removing config set logic as this code block will prevent from accessing the
  provide security certificate page. Also Adding supporing code to handle
  missing CA cert cases, instead of erroring out. (pkilambi at redhat.com)
- updating translations (pkilambi at redhat.com)
- 476797 -  profile-sync should not  probe dmidecode info on PV guests as there
  is no SMBIOS entry. (pkilambi at redhat.com)
- 204449 - Deprecating contactinfo flag functionality from rhnreg_ks
  (pkilambi at redhat.com)
- rhn-client-tools should now depend on cdn enabled rhnlib package
  (pkilambi at redhat.com)
- 476894 - Fix to support multiarch support for errata with multiarch packages.
  Errata apply should only install installed arch updates. If i386 and x86_64
  are installed, updates for both arches will be applied. (pkilambi at redhat.com)

* Fri Apr 24 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #487754 - rhn-client-tools depends on cdn enabled rhnlib package

* Mon Mar 30 2009 Miroslav Suchy <msuchy at redhat.com> 0.4.24-1
- 490438 - add .desktop file, own allowed-actions dir

* Mon Mar 16 2009 Miroslav Suchy <msuchy at redhat.com> 0.4.22-1
- use macros insted hardcoded paths

* Thu Feb 12 2009 jesus m. rodriguez <jesusr at redhat.com> 0.4.21-1
- replace "!#/usr/bin/env python" with "!#/usr/bin/python"

* Mon Jan 19 2009 Devan Goodwin <dgoodwin at redhat.com> 0.4.20-1
- Remove usage of version and sources files.

* Fri Dec  5 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-17
- Resolves: #473429 #473425

* Tue Nov 18 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-15
- Resolves: #249425 #405671

* Wed Nov 12 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-10
- Resolves: #471245

* Tue Nov 11 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-9
- Resolves: #249425 #470496 #231902 #470481

* Wed Nov  5 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-8
- Resolves: #429334 #249425 #231902

* Mon Oct 27 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-6
- Resolves: #467887

* Fri Oct 24 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-5
- Resolves: #467705 #467870 #468039

* Fri Sep 26 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-4
- new build

* Thu Sep 18 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-2
- Resolves: #231902 #241209 #249127 #249425 #253596 
- Resolves: #385321 #405671 #429334 #430155 #430156 
- Resolves: #432426 #433097 #434550 #439383 #442923 
- Resolves: #442930 #450597 #451775 #452829 #457953  #460685

* Tue Apr 16 2008 Pradeep Kilambi <pkilambi at redhat.com> 
- Resolves: #442694

* Mon Mar 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.4.17-3
- Resolves:  #435177

* Wed Jan 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.4.17-1
- Resolves: #211127, #212539, #213587, #216225, #216951, #216959
- Resolves: #219814, #221912, #228240, #231041, #249426, #253031
- Resolves: #315421, #364171, #364181, #364191, #372771, #426851

* Thu Jun 07 2007 James Slagle <jslagle at redhat.com> - 0.4.16-1
- Resolves: #212300, #212407, #217857, #218860, #224633, #227399
- Resolves: #228028, #229785, #229951, #232567, #233067, #234238
- Resolves: #234880, #236925, #237300

* Thu Feb 08 2007 James Bowes <jbowes at redhat.com> - 0.4.13-1
- Add missing translations.
- Related: #211568

* Tue Feb 06 2007 James Bowes <jbowes at redhat.com> - 0.4.12-1
- Add missing translations.
- Related: #211568
- Fix 'rhn_register dies when calling activateHardwareInfo' (jesusr)
- Resolves: #227408
 
* Thu Feb 01 2007 James Bowes <jbowes at redhat.com> - 0.4.11-1
- Add missing translations.
- Related: #211568

* Thu Feb 01 2007 James Bowes <jbowes at redhat.com> - 0.4.10-1
- Updated code to use more robust UUID/virt_type discovery mechanisms, which
  allows us to workaround BZ 225203. (pvetere)
- Resolves: #225203

* Mon Jan 29 2007 James Bowes <jbowes at redhat.com> - 0.4.9-1
- Add missing code required by packages.verify
- Resolves: #224631

* Mon Jan 22 2007 James Bowes <jbowes at redhat.com> - 0.4.8-1
- Add messages for virt entitlements
- Client side support for sending uuid and virt type during registration
- Look for orgs and INs even on satellite
- Catch InvalidRegNumException for hardware numbers
- Resolves: #223322, #223860, #223295, #223307, #223359

* Wed Jan 17 2007 James Bowes <jbowes at redhat.com> - 0.4.7-1
- Update translations.
- Related: #211568

* Wed Jan 10 2007 James Bowes <jbowes at redhat.com> - 0.4.6-1
- Update translations.
- Related: #211568

* Mon Dec 18 2006 James Bowes <jbowes at redhat.com> - 0.4.5-1
- Remove the last of the references to the up2date text domain.
- Related: #211568

* Fri Dec 15 2006 James Bowes <jbowes at redhat.com> - 0.4.4-1
- Update translations.
- Make sure translations are used in all parts of the gui and tui
- Related: #211568

* Thu Dec 14 2006 John Wregglesworth <wregglej at redhat.com> - 0.4.3-1
- Update translations.
- Related: #211568, #215285

* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 0.4.2-1
- Updated translations.
- Related: #211568

* Thu Dec 07 2006 James Slagle <jslagle at redhat.com> - 0.4.1-1
- Resolves: #218714

* Tue Dec 05 2006 James Bowes <jbowes at redhat.com> - 0.4.0-1
- Updated translations.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.3.9-2
- Stop packaging unused png.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.3.9-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 0.3.8-1
- Resolves: #212666, #216812, #215362, #210948, #216527, #213589

* Wed Nov 29 2006 James Slagle <jslagle at redhat.com> - 0.3.7-1
- Resolves: #212589, #212464

* Wed Nov 29 2006 James Slagle <jslagle at redhat.com> - 0.3.6-1
- Fixes for #212305, #212394

* Wed Nov 22 2006 James Slagle <jslagle at redhat.com> - 0.3.5-1
- Fixes for #213955, #212389, #212253

* Mon Nov 20 2006 James Bowes <jbowes at redhat.com> - 0.3.4-1
- Fixes for #213573, #215992, #215958, #214844, #214190

* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 0.3.3-1
- Fixes for #213089, #213958, #214691, #215085, #414414, #213134, #214882 
- Fixes for #214844, #214523, #214609
- Include new manual pages and AUTHORS file.

* Mon Nov 06 2006 James Slagle <jslagle at redhat.com> - 0.3.2-1
- Fix for #213952

* Thu Nov 01 2006 James Bowes <jbowes at redhat.com> - 0.3.1-1
- Fixes for #212460, #211414, #213089

* Tue Oct 31 2006 Shannon Hughes <shughes at redhat.com> - 0.3.0-1
- up2date/rhn_register support for hicolor theme
- Fix for #212666
- Fixes for #213133, #213090, #212020

* Mon Oct 30 2006 James Slagle <jslagle at redhat.com> - 0.2.9-1
- Add noSidebar attribute to the firstboot modules (except the 1st one).
- Fix for #211696

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 0.2.8-1
- New and updated translations.
- Fixes for #211480, #211568, #212618, #212539, #211415, #210948, #211389
- Fixes for #212052, #212453, #211382, #212599

* Thu Oct 26 2006 James Bowes <jbowes at redhat.com> - 0.2.7-1
- Update to 0.2.7
- Fixes for #212212, #211132

* Wed Oct 25 2006 Peter Vetere <pvetere at redhat.com> - 0.2.6-1
- Update to 0.2.6
- Fixed rhnreg_ks call to registerSystem.  Used "token" arg instead of 
  "activationKey."

* Wed Oct 25 2006 James Bowes <jbowes at redhat.com> - 0.2.5-1
- Update to 0.2.5
- Fixes for #211407, #211291, #211888, #212088, #212027, #211456, #211855

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.2.4-1
- Update to 0.2.4
- Fixes for #212001, #211876, #211132, #211376, #211374, #211359, #211231,
  and #211186

* Fri Oct 20 2006 Daniel Benamy <dbenamy at redhat.com> - 0.2.3-1
- New version (some bugfixes and an added image file).

* Tue Oct 17 2006 James Bowes <jbowes at redhat.com> - 0.2.2-2
- Conflict up2date, since we install in the same location.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.2-1
- New version.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.1-1
- New version.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.0-1
- New version.

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.9-1
- No longer provide or obsolete up2date

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.8-3
- reverted to desktop-file-install. It appears to be the preferred way.

* Thu Oct 12 2006 James Bowes <jbowes at redhat.com> - 0.1.8-2
- Update the summary and description of rhn-setup-gnome

* Thu Oct 12 2006 James Bowes <jbowes at redhat.com> - 0.1.8-1
- Fix for bz #210348
- use update-desktop-database rather than desktop-file-install

* Wed Oct 11 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.7-1
- Remove rhn_shared.py from firstboot stuff.

* Mon Oct 09 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.6-1
- New release for the milestone build that includes all the overhauling so far.

* Mon Oct 09 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-7
- Add rhn_review_gui firstboot module.

* Fri Oct 06 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-6
- Remove old new account and opt out firstboot modules.
- Add finish firstboot module.

* Wed Oct 04 2006 James Slagle <jslagle at redhat.com> - 0.1.5-5
- Add rhnreg_constants module.

* Wed Sep 27 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-4
- Add rhn_choose_org_gui firstboot module.

* Mon Sep 25 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-3
- Use rhn_start_gui firstboot module instead of rhn_choose_to_register_gui.

* Wed Sep 20 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-2
- Add file that firstboot create profile screen is moving to.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 0.1.5-1
- Fix whitespace error in rhn-profile-sync.py

* Wed Sep 13 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-9
- Add file containing firstboot provide cert screen.

* Wed Sep 13 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-8
- Add file containing firstboot choose server screen.

* Tue Sep 12 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-7
- Add file containing firstboot screen asking if user wants to register.

* Mon Sep 11 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-6
- Add file containing base class for firstboot windows.

* Thu Sep 07 2006 James Bowes <jbowes at redhat.com> - 0.1.4-5
- Remove references to up2date-uuid.

* Wed Sep 06 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-4
- Remove configdlg and put needed functionality in rh_register.glade and 
  rhnregGui.py.

* Wed Aug 30 2006 James Bowes <jbowes at redhat.com> - 0.1.4-3
- Move messageWindow and tui from client-tools to setup-gnome
  and setup.
- Add haltree

* Mon Aug 28 2006 James Bowes <jbowes at redhat.com> - 0.1.4-2
- Remove python-optik requires.

* Fri Jul 28 2006 James Bowes <jbowes at redhat.com> - 0.1.4-1
- New release.

* Thu Jul 27 2006 James Bowes <jbowes at redhat.com> - 0.1.3-1
- New release.
- Remove sourcesConfig from the spec file.

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 0.1.2-1
- New release.
- Remove rhnDefines from package.

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 0.1.1-1
- New release.
- Remove mkdir /etc/sysconfig/rhn from install; this is done
  in the Makefile.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.1.0-2
- Remove rhn_register obsoletes.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.1.0-1
- New release.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.0.9-1
- New release.

* Tue Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.8-3
- Make sub-packages depend on the exact version and release of
  the master package.

* Tue Jul 18 2006 James Bowes <jbowes at redhat.com> - 0.0.8-2
- Point to the new docs location in the source tree.

* Fri Jul 14 2006 James Bowes <jbowes at redhat.com> - 0.0.8-1
- Generate a uuid file from scratch during post.

* Wed Jun 21 2006 James Bowes <jbowes at redhat.com> - 0.0.7-1
- Removed the packages action.

* Fri Jun 02 2006 James Bowes <jbowes at redhat.com> - 0.0.6-2
- Remove reference to cliUtils

* Fri Jun 02 2006 James Bowes <jbowes at redhat.com> - 0.0.6-1
- new rhn-profile-sync command for syncing package, hardware,
  and virtualization profiles with rhn.

* Tue May 30 2006 James Bowes <jbowes at redhat.com> - 0.0.5-1
- Remove unneeded imports and circular imports.

 Tue May 23 2006 Pete Vetere <pvetere at redhat.com> - 0.0.4-1
- Add support for sending virtualization info to RHN

* Mon May 22 2006 James Bowes <jbowes at redhat.com> - 0.0.3-2
- Properly link rhn_register and up2date-config

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.3-1
- Remove more unused code and data files.

* Tue May 09 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Remove non-up2date repo backends.

* Mon May 08 2006 James Bowes <jbowes at redhat.com> - 4.4.69-6
- bump required version of rhnlib for pkg/iso redirect.

* Tue May 02 2006 James Bowes <jbowes at redhat.com> - 4.4.69-3
- fix for #87837, inaccurate error message when missing '-f' for kernel updates
- fix for #125049, misleading usage message: "Please specify either -l, -u, ...
- fix for #126528, up2date +get source fails if no source available
- fix for #168312, up2date config file is not ignored in rpm -V
- fix for #171057, CRM# 696030 repomd error after up2date
- fix for #171643, repomd error after up2date
- fix for #s 179896, 179898  rpm verify fails due to config files in .spec not marked ...

* Mon Apr 24 2006 Bret McMillan <bretm at redhat.com> 4.4.69-1
- fix for #178498, #176123 -- make --channel limit the channel universes for various operations
- fix for #162106, RHN 'sync packages to system' installing i386 glibc on i686
- fix for #175593, up2date --whatprovides doesn't handle compat arch provides

* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> 0.0.1-1
- Pull out rhnsd stuff so we can build as noarch.
- Make seperate rpms for rhn_check, and register.

* Wed Feb 01 2006 Adrian Likins <alikins at redhat.com> 4.4.6800000000000eleventybillion
- gratuitous version rev to test up2date of up2date

* Tue Jan 31 2006 Bret McMillan <bretm at redhat.com> 4.4.67-4
- fix release tag

* Fri Jan 27 2006 Adrian Likins <alikins at redhat.com> 4.4.67-3
- fix for #179110 - up2date fails to update xerces-j
- more fixed for #176195 "up2date-nox --configure changes current value of numeric attribute to Yes/No if 1/0 is selected"

* Fri Jan 27 2006 Bret McMillan <bretm at redhat.com> 4.4.65-3
- fix for #176195 "up2date-nox --configure changes current value of numeric attribute to Yes/No if 1/0 is selected"

* Thu Jan 19 2006 Adrian Likins <alikins at redhat.com> 4.4.63-4
- rest of fix for #169880 up2date --arch updates primary arch if package is out of date instead of arch specified.
- even better fix for #178261 "Invalid function call attempted" when installing a RHN proxy

* Thu Jan 19 2006 Bret McMillan <bretm at redhat.com> 4.4.60-4
- rebuild with fixes for:
- fix #169293 -- up2date unable to download very large rpms
- fix #177784 -- up2date gives error if select-all is checked
- fix #177786 -- up2date unselects all pakcages if select-all is checked and user selects 'back'

* Thu Jan 12 2006 Adrian Likins <alikins at redhat.com> 4.4.58
- fix for #165157 - firstboot 'Read our Privacy Statement' shows a blank text box

* Fri Jan 6 2006 Adrian Likins <alikins at redhat.com> 4.4.56-4.1
- rebuild for #176182 (new gcc)

* Thu Dec 8 2005 Adrian Likins <alikins at redhat.com> 4.4.55
- add bug fix for  #175321  rhnreg_ks cannot import name capabilities -- circular import

* Wed Nov 15 2005 Adrian Likins <alikins at redhat.com> 4.4.54
- revert orig fix for #165024 - "invalid function call" error on proxy installs
- add new bug fix for #165204
- revert "fix" for #169882, #159955 - up2date man page does not describe --undo option.
- add --unfo to man page fixing #169882, #159955


* Wed Nov 09 2005 Adrian Likins <alikins at redhat.com> 4.4.52
- fix #165024 - "invalid function call" error on proxy installs
- fix #169881, #167732 -  'up2date --configure' always saves changes if useNetwork is false on startup
 

* Mon Oct 10 2005 Adrian Likins <alikins at redhat.com> 4.4.51
- fix #169882, #159955 - up2date man page does not describe --undo option.
  (remove deprecated undo option)
- fix #170065, #166034 - up2date "forward" button disabled if packages selected via spacebar.
- fix #157087, #170055 - up2date --configure fails when failover serverURL is configured.

* Thu Sep 15 2005 Adrian Likins <alikins at redhat.com> 4.4.50-4
- new up2date.pot, synced up
- fix uncommitted changes that were causing string 
  translations not to show up
- more translations updates for #160608

* Mon Sep 12 2005 Adrian Likins <alikins at redhat.com> 4.4.45
- fix for #160602 (updated russian translations)


* Fri Aug 26 2005 Adrian Likins <alikins at redhat.com> 4.4.44
- fix for #166868 - fatal python error when  installing package

* Tue Aug 23 2005 Adrian Likins <alikins at redhat.com> 4.4.43
- more fixes for #144800

* Tue Aug 23 2005 Adrian Likins <alikins at redhat.com> 4.4.42
- more fixes for #159858/#157070

* Mon Aug 15 2005 Adrian Likins <alikins at redhat.com> 4.4.41
- fix #164660

* Thu Aug 11 2005 Adrian Likins <alikins at redhat.com> 4.4.40
- attempt "fix" for #165636 (require new rpm versions)

* Wed Aug 10 2005 Adrian Likins <alikins at redhat.com> 4.4.39
- more fix for #157070
- require newer rhnlib for #165360

* Thu Aug 4 2005 Adrian Likins <alikins at redhat.com> 4.4.38
- fix desktop files rpmdiff complained about

* Thu Aug 4 2005 Adrian Likins <alikins at redhat.com> 4.4.37
- fix specfile to work on ppc

* Wed Aug 3 2005 Adrian Likins <alikins at redhat.com> 4.4.36
- fix for #162701

* Wed Aug 3 2005 Adrian Likins <alikins at redhat.com> 4.4.35
- fix for #160602 (updated ru.po)

* Tue Aug 2 2005 Adrian Likins <alikins at redhat.com> 4.4.34
- fix for #144800

* Thu Jul 28 2005 Adrian Likins <alikins at redhat.com> 4.4.33
- fix for #149472

* Wed Jul 27 2005 Adrian Likins <alikins at redhat.com> 4.4.32
- fix for #144800
- fix for #137942

* Tue Jul 26 2005 Adrian Likins <alikins at redhat.com> 4.4.31
- fix for #155583

* Tue Jul 12 2005 Adrian Likins <alikins at redhat.com> 4.4.30
- more fixes for sources on RHEL-3
- have to include "3" as a release as well

* Mon Jul 11 2005 Adrian Likins <alikins at redhat.com> 4.4.28
- fix for issues with updating the package list after
  actions correctly #125790

* Thu Jul 7 2005 Jason Connor <jconnor at redhat.com> 4.4.27.2
- hotfix for bug 148952

* Tue Jun 7 2005 Adrian Likins <alikins at redhat.com> 4.4.25
- delay/avoid doing repomd if it's not in use

* Mon Jun 6 2005 Adrian Likins <alikins at redhat.com> 4.4.24
- dont require the old extended_packages cap

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.23
- change the way the version substitution works to pass pkg checker

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.22
- fix #158256 - up2date errors if yum isnt installed, but doesn't need to

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.20
- fix #154814 -  Selecting all packages in the GUI only selects first package

* Tue May 17 2005 Adrian Likins <alikins at redhat.com> 4.4.19
- fix #155583 - don't allow kernel-smp.x86_64 to be installed on ia32e
- fix #157070 - make yum/apt repos support proxies
- fix #148952 - patch from Jack Neely <jjneely at pams.ncsu.edu)

* Mon May 16 2005 Adrian Likins <alikins at redhat.com> 4.4.19
- fix #150418 ? rhel-4 client machine capabilities not recognized sometimes
- fix #145554 ? rhn_register fails if proxy username begins at '0'
- fix #154137 up2date does not always send the arch

* Mon May 9 2005 Adrian Likins <alikins at redhat.com> 4.4.18
- fix problem with missing import

* Wed Apr 27 2005 Adrian Likins <alikins at redhat.com> 4.4.17
- fix some bugs in the way repomdRepo creates the package lists

* Tue Apr 26 2005 Adrian Likins <alikins at redhat.com> 4.4.16
- support repomd repos (and use the yum config if it exists)
  bugzilla #135121

* Tue Apr 19 2005 Adrian Likins <alikins at redhat.com> 4.4.15
- fix #149444 up2date --dry-run --upgrade-to-release changes registered base channel
- fix #151328 (tracback when registering with *'s in password)
- added some general uncaught exception catching
- truncate rpm changelog (see up2date.spec.changelog)
- update translations

* Thu Apr 14 2005 Jason Connor <jconnor at redhat.com> 4.4.14
- fix #135121 - uncommented rpmmd registration, fixed api
- fix #149281 - added check for failed read

* Fri Apr 8 2005 Adrian Likins <alikins at redhat.com> 4.4.13
- update translations

* Thu Apr 7 2005 Adrian Likins <alikins at redhat.com> 4.4.12
- update translations

* Thu Mar 3 2005 Adrian Likins <alikins at redhat.com> 4.4.10
- fix #150210
- revert change for package list refresh for this
  release

* Tue Mar 1 2005 Adrian Likins <alikins at redhat.com> 4.4.9
- fix #149947

* Tue Feb 15 2005 Adrian Likins <alikins at redhat.com> 4.4.8
- fix #139537

* Fri Jan 14 2005 Adrian Likins <alikins at redhat.com> 4.4.7
- fix #136497
- fix #142750, #142589 (less deprecation warnings) 

* Mon Jan 10 2005 Adrian Likins <alikins at redhat.com> 4.4.6
- fix #144704

* Wed Dec 15 2004 Adrian Likins <alikins at redhat.com> 4.4.5
- fix #142406 (again)

* Wed Dec 15 2004 Adrian Likins <alikins at redhat.com> 4.4.4
- fix #142332
- fix #129909

* Tue Dec 14 2004 Adrian Likins <alikins at redhat.com> 4.4.3
- fix #142406

* Mon Dec 6 2004 Adrian Likins <alikins at redhat.com> 4.4.2
- fix #139495 (updated translations)

* Fri Dec 3 2004 Adrian Likins <alikins at redhat.com> 4.4.1
- fix #141820 (add kernel-devel to list of packages to
  intall not update)

* Fri Dec 3 2004 Adrian Likins <alikins at redhat.com> 4.4.0
- rev to 4.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:46:56 -0000	1.1
+++ .cvsignore	22 Sep 2009 15:30:54 -0000	1.2
@@ -0,0 +1 @@
+rhn-client-tools-0.7.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:46:56 -0000	1.1
+++ sources	22 Sep 2009 15:30:55 -0000	1.2
@@ -0,0 +1 @@
+1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:27 +0000
Subject: [pkgdb] less: npajkovs has requested watchbugzilla
Message-ID: <20090922153128.0590B10F876@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on less (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:31 +0000
Subject: [pkgdb] less: npajkovs has requested commit
Message-ID: <20090922153131.C624F10F890@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on less (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:29 +0000
Subject: [pkgdb] less: npajkovs has requested watchcommits
Message-ID: <20090922153129.CAE9C10F883@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on less (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:34 +0000
Subject: [pkgdb] less: npajkovs has requested approveacls
Message-ID: <20090922153134.402C310F89A@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on less (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:46 +0000
Subject: [pkgdb] less: npajkovs has requested watchbugzilla
Message-ID: <20090922153146.CC05310F8A0@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on less (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:50 +0000
Subject: [pkgdb] less: npajkovs has requested commit
Message-ID: <20090922153150.C46BD10F8A8@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on less (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:48 +0000
Subject: [pkgdb] less: npajkovs has requested watchcommits
Message-ID: <20090922153148.8E9B910F8A4@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on less (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From msuchy at fedoraproject.org  Tue Sep 22 15:31:55 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Tue, 22 Sep 2009 15:31:55 +0000 (UTC)
Subject: rpms/rhn-client-tools/F-11 import.log, NONE,
	1.1 rhn-client-tools.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922153155.CAB8811C00E8@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhn-client-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16401/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rhn-client-tools.spec 
Log Message:
Initial import of rhn-client-tools to F-11 branch.



--- NEW FILE import.log ---
rhn-client-tools-0_7_3-1:F-11:rhn-client-tools-0.7.3-1.src.rpm:1253633492


--- NEW FILE rhn-client-tools.spec ---
Summary: Support programs and libraries for Red Hat Network or Spacewalk
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
Name: rhn-client-tools
Version: 0.7.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: rhnlib >= 2.2.7
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python 
Requires: python-ethtool
Requires: gnupg
Requires: sh-utils
Requires: dbus-python
Requires: hal
Requires: newt

Conflicts: up2date

BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils

%description
Red Hat Network Client Tools provides programs and libraries to allow your
system to receive software updates from Red Hat Network or Spacewalk.

%package -n rhn-check
Summary: Check for RHN actions
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: yum-rhn-plugin >= 0.5.3-30

%description -n rhn-check
rhn-check polls a Red Hat Network or Spacewalk server to find and execute 
scheduled actions.

%package -n rhn-setup
Summary: Configure and register an RHN/Spacewalk client
Group: System Environment/Base
Requires: usermode >= 1.36
Requires: %{name} = %{version}-%{release}
Requires: rhnsd

%description -n rhn-setup
rhn-setup contains programs and utilities to configure a system to use
Red Hat Network or Spacewalk, and to register a system with a Red Hat Network
or Spacewalk server.

%package -n rhn-setup-gnome
Summary: A GUI interface for RHN/Spacewalk Registration
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: rhn-setup = %{version}-%{release}
Requires: pam >= 0.72
Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas 
Requires: usermode-gtk

%description -n rhn-setup-gnome
rhn-setup-gnome contains a GTK+ graphical interface for configuring and
registering a system with a Red Hat Network or Spacewalk server.


%prep
%setup -q 

%build
make -f Makefile.rhn-client-tools

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}

mkdir -p $RPM_BUILD_ROOT/var/lib/up2date

desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rhn rhn_register.desktop

%find_lang %{name}

%post -n rhn-setup-gnome
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun -n rhn-setup-gnome
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n rhn-setup-gnome
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
# some info about mirrors
%doc doc/ChangeLog 
%doc doc/mirrors.txt 
%doc doc/fedora-core-1 
%doc doc/updates-released
%doc doc/AUTHORS
%doc doc/LICENSE
%{_mandir}/man8/rhn-profile-sync.8*
%{_mandir}/man5/up2date.5*

%dir %{_sysconfdir}/sysconfig/rhn
%dir %{_sysconfdir}/sysconfig/rhn/clientCaps.d
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/configfiles
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/script
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/up2date
%config(noreplace) %{_sysconfdir}/logrotate.d/up2date
%config(noreplace) %{_sysconfdir}/rpm/macros.up2date

# dirs
%dir %{_datadir}/rhn
%dir %{_datadir}/rhn/up2date_client

#files
%{_datadir}/rhn/up2date_client/__init__.*
%{_datadir}/rhn/up2date_client/config.*
%{_datadir}/rhn/up2date_client/haltree.*
%{_datadir}/rhn/up2date_client/hardware.*
%{_datadir}/rhn/up2date_client/up2dateUtils.*
%{_datadir}/rhn/up2date_client/up2dateLog.*
%{_datadir}/rhn/up2date_client/up2dateErrors.*
%{_datadir}/rhn/up2date_client/up2dateAuth.*
%{_datadir}/rhn/up2date_client/rpcServer.*
%{_datadir}/rhn/up2date_client/rhnserver.*
%{_datadir}/rhn/up2date_client/rpmUtils.*
%{_datadir}/rhn/up2date_client/rhnPackageInfo.*
%{_datadir}/rhn/up2date_client/rhnChannel.*
%{_datadir}/rhn/up2date_client/rhnErrata.*
%{_datadir}/rhn/up2date_client/rhnHardware.*
%{_datadir}/rhn/up2date_client/transaction.*
%{_datadir}/rhn/up2date_client/clientCaps.*
%{_datadir}/rhn/up2date_client/capabilities.*
%{_datadir}/rhn/up2date_client/rhncli.*
%{_datadir}/rhn/up2date_client/rhn_fcntl.*
%{_datadir}/rhn/up2date_client/rhnLockfile.*
%{_datadir}/rhn/__init__.*

%{_sbindir}/rhn-profile-sync

#public keys and certificates
%{_datadir}/rhn/RHNS-CA-CERT

%files -n rhn-check
%defattr(-,root,root,-)
%dir %{_datadir}/rhn/actions
%{_mandir}/man8/rhn_check.8*

%{_sbindir}/rhn_check

%{_datadir}/rhn/up2date_client/getMethod.*

# actions for rhn_check to run
%{_datadir}/rhn/actions/__init__.*
%{_datadir}/rhn/actions/hardware.*
%{_datadir}/rhn/actions/errata.*
%{_datadir}/rhn/actions/systemid.*
%{_datadir}/rhn/actions/reboot.*
%{_datadir}/rhn/actions/rhnsd.*
%{_datadir}/rhn/actions/up2date_config.*

%files -n rhn-setup
%defattr(-,root,root,-)
%{_mandir}/man8/rhnreg_ks.8*
%{_mandir}/man8/rhn_register.8*

%config(noreplace) %{_sysconfdir}/security/console.apps/rhn_register
%config(noreplace) %{_sysconfdir}/pam.d/rhn_register

%{_bindir}/rhn_register
%{_sbindir}/rhn_register
%{_sbindir}/rhnreg_ks

%{_datadir}/rhn/up2date_client/rhnreg.*
%{_datadir}/rhn/up2date_client/tui.*
%{_datadir}/rhn/up2date_client/rhnreg_constants.*

# firstboot is smart enough now to skip these modules
# if the modules say to
%{_datadir}/firstboot/modules/rhn_activate_gui.*
%{_datadir}/firstboot/modules/rhn_login_gui.*
%{_datadir}/firstboot/modules/rhn_register_firstboot_gui_window.*
%{_datadir}/firstboot/modules/rhn_start_gui.*
%{_datadir}/firstboot/modules/rhn_choose_server_gui.*
%{_datadir}/firstboot/modules/rhn_provide_certificate_gui.*
%{_datadir}/firstboot/modules/rhn_create_profile_gui.*
%{_datadir}/firstboot/modules/rhn_choose_org_gui.*
%{_datadir}/firstboot/modules/rhn_review_gui.*
%{_datadir}/firstboot/modules/rhn_finish_gui.*

%files -n rhn-setup-gnome
%defattr(-,root,root,-)
%{_datadir}/rhn/up2date_client/messageWindow.*
%{_datadir}/rhn/up2date_client/rhnregGui.*
%{_datadir}/rhn/up2date_client/rh_register.glade
%{_datadir}/rhn/up2date_client/gui.*
%{_datadir}/rhn/up2date_client/progress.*
%{_datadir}/pixmaps/*png
%{_datadir}/icons/hicolor/16x16/apps/up2date.png
%{_datadir}/icons/hicolor/24x24/apps/up2date.png
%{_datadir}/icons/hicolor/32x32/apps/up2date.png
%{_datadir}/icons/hicolor/48x48/apps/up2date.png
%{_datadir}/applications/rhn_register.desktop

%changelog
* Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 0.7.3-1
- comment out hosted url, so spacewalk users do not ping theirs machines

* Fri Sep  4 2009 Miroslav Suchy <msuchy at redhat.com> 0.7.2-1
- Rhpl was removed from rhel client packages (lukas.durfina at gmail.com)
 
* Tue Sep  1 2009 Miroslav Suchy <msuchy at redhat.com> 0.7.1-1
- change appeareance of icon and put it to Administration rather then to Preferences
- add scriplet to refres icon cache
- move "Requires: yum-rhn-plugin" from rhn-client-tools to rhn-check

* Wed Aug 05 2009 John Matthews <jmatthew at redhat.com> 0.6.2-1
- 494019 - Fixing the registration on python 2.6 to not include dbus.String
  objects in hardware profile as new xmlrpclib _dump method validates based on
  __dict__ on value. (pkilambi at redhat.com)

* Wed Jul 29 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-9
- Resolves: #445881

* Mon Jun 29 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-8
- Resolves: #467866

* Fri Jun 26 2009 Miroslav Suchy <msuchy at redhat.com> 0.6.1-1
- code cleanup - there is no usage of md5 in this code
- bump up version to 0.6

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.4.28-1
- 503090 - Fix missing packages reported during rhnreg_ks.
  (dgoodwin at redhat.com)
- 467866 - Raise a more cleaner message if clients end up getting badStatusLine
  error due to 502 proxy errors (pkilambi at redhat.com)
- 504292 - fix the registration gui and tui to honor the ssl cert paths
  specified in the config. Set the paths to default locations only if the user
  hasn't explicitly defined it. (pkilambi at redhat.com)
- 504296 - removing debug statements from hardware probing
  (pkilambi at redhat.com)
- Support infinite available entitlements in TUI registration
  (jbowes at redhat.com)
- account for virt_uuid is None case (pkilambi at redhat.com)
- Send smbios data to remaining_subscriptions during registration
  (jbowes at redhat.com)

* Fri Jun 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-7
- Resolves: #504292 #467866

* Fri Jun  5 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #504296
 
* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.4.27-1
- new build (pkilambi at redhat.com)
- 501316 - chnaging the network switch to always send network info by default
  unless there is a skipNetwork flag. This helps the upgrades issues where the
  config file gets saved by rpms and causing issues (pkilambi at redhat.com)
- merging additional spec changes and minor edits from svn
  (pkilambi at redhat.com)
- 467866 - catch the BadStatusLine and let use know that the server is
  unavailable temporarily (pkilambi at redhat.com)
-  -adding missing config option (pkilambi at redhat.com)
- Send smbios data in the new_system() call (jbowes at redhat.com)
- 499860 Ability to define location for the temporary transport file
  descriptors, uses /tmp by default (pkilambi at redhat.com)
- 479706 - send network and netInterface information on hardware probing during
  registration and profile sync is now an option and on by default. Users who
  do not wish to send network information can jus trun off sendNetwork option
  in the config. (pkilambi at redhat.com)
-  Letting firstboot know if the system is already registered through a
  kickstart so it would'nt prompt the user to re register during firstboot
  sequence (pkilambi at redhat.com)
- Throw an InvalidRedirectionError if redirect url does'nt fetch the package
  (pkilambi at redhat.com)
- adding NoSystemIdError exception class for 444581 (pkilambi at redhat.com)
- 467139 - fixing the rhn_check's action name to work for different locale
  (pkilambi at redhat.com)
- 491258 - adding check to see if haldaemon or messagebus is running. If not
  warn the user with right message and dont probe the hal and dmi as we'll
  obviously get a dbus_exception. (pkilambi at redhat.com)

* Mon May 18 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-5
- Resolves: #501316

* Tue May 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-4
- Resolves: #467866

* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-3
- new build

* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.4.20-2
- Resolves: #204449 #227638 #445881 #454005 #466718 #479706
- Resolves: #491258 #494928 #250312 #464827 #467139 #476797
- Resolves: #476894 #487754

* Fri May 01 2009 Devan Goodwin <dgoodwin at redhat.com> 0.4.25-1
- Stop using spec file Source line for desktop file. (dgoodwin at redhat.com)
- Adding support to send smbios information to the servers if implemented.
  add_smbios_info needs to be implemented on the server to fully take advantage
  of this call. Xen host/guests + para/fully virt types should work as usual
  for now. (pkilambi at redhat.com)
- 250312 - Do not spam the cert directory with backup certs, instead use the
  one requested by the user and proceed if its valid else reprompt to upload a
  valid certificate (pkilambi at redhat.com)
- removing config set logic as this code block will prevent from accessing the
  provide security certificate page. Also Adding supporing code to handle
  missing CA cert cases, instead of erroring out. (pkilambi at redhat.com)
- updating translations (pkilambi at redhat.com)
- 476797 -  profile-sync should not  probe dmidecode info on PV guests as there
  is no SMBIOS entry. (pkilambi at redhat.com)
- 204449 - Deprecating contactinfo flag functionality from rhnreg_ks
  (pkilambi at redhat.com)
- rhn-client-tools should now depend on cdn enabled rhnlib package
  (pkilambi at redhat.com)
- 476894 - Fix to support multiarch support for errata with multiarch packages.
  Errata apply should only install installed arch updates. If i386 and x86_64
  are installed, updates for both arches will be applied. (pkilambi at redhat.com)

* Fri Apr 24 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #487754 - rhn-client-tools depends on cdn enabled rhnlib package

* Mon Mar 30 2009 Miroslav Suchy <msuchy at redhat.com> 0.4.24-1
- 490438 - add .desktop file, own allowed-actions dir

* Mon Mar 16 2009 Miroslav Suchy <msuchy at redhat.com> 0.4.22-1
- use macros insted hardcoded paths

* Thu Feb 12 2009 jesus m. rodriguez <jesusr at redhat.com> 0.4.21-1
- replace "!#/usr/bin/env python" with "!#/usr/bin/python"

* Mon Jan 19 2009 Devan Goodwin <dgoodwin at redhat.com> 0.4.20-1
- Remove usage of version and sources files.

* Fri Dec  5 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-17
- Resolves: #473429 #473425

* Tue Nov 18 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-15
- Resolves: #249425 #405671

* Wed Nov 12 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-10
- Resolves: #471245

* Tue Nov 11 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-9
- Resolves: #249425 #470496 #231902 #470481

* Wed Nov  5 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-8
- Resolves: #429334 #249425 #231902

* Mon Oct 27 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-6
- Resolves: #467887

* Fri Oct 24 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-5
- Resolves: #467705 #467870 #468039

* Fri Sep 26 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-4
- new build

* Thu Sep 18 2008 Pradeep Kilambi <pkilambi at redhat.com> 0.4.19-2
- Resolves: #231902 #241209 #249127 #249425 #253596 
- Resolves: #385321 #405671 #429334 #430155 #430156 
- Resolves: #432426 #433097 #434550 #439383 #442923 
- Resolves: #442930 #450597 #451775 #452829 #457953  #460685

* Tue Apr 16 2008 Pradeep Kilambi <pkilambi at redhat.com> 
- Resolves: #442694

* Mon Mar 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.4.17-3
- Resolves:  #435177

* Wed Jan 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.4.17-1
- Resolves: #211127, #212539, #213587, #216225, #216951, #216959
- Resolves: #219814, #221912, #228240, #231041, #249426, #253031
- Resolves: #315421, #364171, #364181, #364191, #372771, #426851

* Thu Jun 07 2007 James Slagle <jslagle at redhat.com> - 0.4.16-1
- Resolves: #212300, #212407, #217857, #218860, #224633, #227399
- Resolves: #228028, #229785, #229951, #232567, #233067, #234238
- Resolves: #234880, #236925, #237300

* Thu Feb 08 2007 James Bowes <jbowes at redhat.com> - 0.4.13-1
- Add missing translations.
- Related: #211568

* Tue Feb 06 2007 James Bowes <jbowes at redhat.com> - 0.4.12-1
- Add missing translations.
- Related: #211568
- Fix 'rhn_register dies when calling activateHardwareInfo' (jesusr)
- Resolves: #227408
 
* Thu Feb 01 2007 James Bowes <jbowes at redhat.com> - 0.4.11-1
- Add missing translations.
- Related: #211568

* Thu Feb 01 2007 James Bowes <jbowes at redhat.com> - 0.4.10-1
- Updated code to use more robust UUID/virt_type discovery mechanisms, which
  allows us to workaround BZ 225203. (pvetere)
- Resolves: #225203

* Mon Jan 29 2007 James Bowes <jbowes at redhat.com> - 0.4.9-1
- Add missing code required by packages.verify
- Resolves: #224631

* Mon Jan 22 2007 James Bowes <jbowes at redhat.com> - 0.4.8-1
- Add messages for virt entitlements
- Client side support for sending uuid and virt type during registration
- Look for orgs and INs even on satellite
- Catch InvalidRegNumException for hardware numbers
- Resolves: #223322, #223860, #223295, #223307, #223359

* Wed Jan 17 2007 James Bowes <jbowes at redhat.com> - 0.4.7-1
- Update translations.
- Related: #211568

* Wed Jan 10 2007 James Bowes <jbowes at redhat.com> - 0.4.6-1
- Update translations.
- Related: #211568

* Mon Dec 18 2006 James Bowes <jbowes at redhat.com> - 0.4.5-1
- Remove the last of the references to the up2date text domain.
- Related: #211568

* Fri Dec 15 2006 James Bowes <jbowes at redhat.com> - 0.4.4-1
- Update translations.
- Make sure translations are used in all parts of the gui and tui
- Related: #211568

* Thu Dec 14 2006 John Wregglesworth <wregglej at redhat.com> - 0.4.3-1
- Update translations.
- Related: #211568, #215285

* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 0.4.2-1
- Updated translations.
- Related: #211568

* Thu Dec 07 2006 James Slagle <jslagle at redhat.com> - 0.4.1-1
- Resolves: #218714

* Tue Dec 05 2006 James Bowes <jbowes at redhat.com> - 0.4.0-1
- Updated translations.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.3.9-2
- Stop packaging unused png.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.3.9-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 0.3.8-1
- Resolves: #212666, #216812, #215362, #210948, #216527, #213589

* Wed Nov 29 2006 James Slagle <jslagle at redhat.com> - 0.3.7-1
- Resolves: #212589, #212464

* Wed Nov 29 2006 James Slagle <jslagle at redhat.com> - 0.3.6-1
- Fixes for #212305, #212394

* Wed Nov 22 2006 James Slagle <jslagle at redhat.com> - 0.3.5-1
- Fixes for #213955, #212389, #212253

* Mon Nov 20 2006 James Bowes <jbowes at redhat.com> - 0.3.4-1
- Fixes for #213573, #215992, #215958, #214844, #214190

* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 0.3.3-1
- Fixes for #213089, #213958, #214691, #215085, #414414, #213134, #214882 
- Fixes for #214844, #214523, #214609
- Include new manual pages and AUTHORS file.

* Mon Nov 06 2006 James Slagle <jslagle at redhat.com> - 0.3.2-1
- Fix for #213952

* Thu Nov 01 2006 James Bowes <jbowes at redhat.com> - 0.3.1-1
- Fixes for #212460, #211414, #213089

* Tue Oct 31 2006 Shannon Hughes <shughes at redhat.com> - 0.3.0-1
- up2date/rhn_register support for hicolor theme
- Fix for #212666
- Fixes for #213133, #213090, #212020

* Mon Oct 30 2006 James Slagle <jslagle at redhat.com> - 0.2.9-1
- Add noSidebar attribute to the firstboot modules (except the 1st one).
- Fix for #211696

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 0.2.8-1
- New and updated translations.
- Fixes for #211480, #211568, #212618, #212539, #211415, #210948, #211389
- Fixes for #212052, #212453, #211382, #212599

* Thu Oct 26 2006 James Bowes <jbowes at redhat.com> - 0.2.7-1
- Update to 0.2.7
- Fixes for #212212, #211132

* Wed Oct 25 2006 Peter Vetere <pvetere at redhat.com> - 0.2.6-1
- Update to 0.2.6
- Fixed rhnreg_ks call to registerSystem.  Used "token" arg instead of 
  "activationKey."

* Wed Oct 25 2006 James Bowes <jbowes at redhat.com> - 0.2.5-1
- Update to 0.2.5
- Fixes for #211407, #211291, #211888, #212088, #212027, #211456, #211855

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.2.4-1
- Update to 0.2.4
- Fixes for #212001, #211876, #211132, #211376, #211374, #211359, #211231,
  and #211186

* Fri Oct 20 2006 Daniel Benamy <dbenamy at redhat.com> - 0.2.3-1
- New version (some bugfixes and an added image file).

* Tue Oct 17 2006 James Bowes <jbowes at redhat.com> - 0.2.2-2
- Conflict up2date, since we install in the same location.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.2-1
- New version.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.1-1
- New version.

* Mon Oct 16 2006 James Bowes <jbowes at redhat.com> - 0.2.0-1
- New version.

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.9-1
- No longer provide or obsolete up2date

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.8-3
- reverted to desktop-file-install. It appears to be the preferred way.

* Thu Oct 12 2006 James Bowes <jbowes at redhat.com> - 0.1.8-2
- Update the summary and description of rhn-setup-gnome

* Thu Oct 12 2006 James Bowes <jbowes at redhat.com> - 0.1.8-1
- Fix for bz #210348
- use update-desktop-database rather than desktop-file-install

* Wed Oct 11 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.7-1
- Remove rhn_shared.py from firstboot stuff.

* Mon Oct 09 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.6-1
- New release for the milestone build that includes all the overhauling so far.

* Mon Oct 09 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-7
- Add rhn_review_gui firstboot module.

* Fri Oct 06 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-6
- Remove old new account and opt out firstboot modules.
- Add finish firstboot module.

* Wed Oct 04 2006 James Slagle <jslagle at redhat.com> - 0.1.5-5
- Add rhnreg_constants module.

* Wed Sep 27 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-4
- Add rhn_choose_org_gui firstboot module.

* Mon Sep 25 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-3
- Use rhn_start_gui firstboot module instead of rhn_choose_to_register_gui.

* Wed Sep 20 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.5-2
- Add file that firstboot create profile screen is moving to.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 0.1.5-1
- Fix whitespace error in rhn-profile-sync.py

* Wed Sep 13 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-9
- Add file containing firstboot provide cert screen.

* Wed Sep 13 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-8
- Add file containing firstboot choose server screen.

* Tue Sep 12 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-7
- Add file containing firstboot screen asking if user wants to register.

* Mon Sep 11 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-6
- Add file containing base class for firstboot windows.

* Thu Sep 07 2006 James Bowes <jbowes at redhat.com> - 0.1.4-5
- Remove references to up2date-uuid.

* Wed Sep 06 2006 Daniel Benamy <dbenamy at redhat.com> - 0.1.4-4
- Remove configdlg and put needed functionality in rh_register.glade and 
  rhnregGui.py.

* Wed Aug 30 2006 James Bowes <jbowes at redhat.com> - 0.1.4-3
- Move messageWindow and tui from client-tools to setup-gnome
  and setup.
- Add haltree

* Mon Aug 28 2006 James Bowes <jbowes at redhat.com> - 0.1.4-2
- Remove python-optik requires.

* Fri Jul 28 2006 James Bowes <jbowes at redhat.com> - 0.1.4-1
- New release.

* Thu Jul 27 2006 James Bowes <jbowes at redhat.com> - 0.1.3-1
- New release.
- Remove sourcesConfig from the spec file.

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 0.1.2-1
- New release.
- Remove rhnDefines from package.

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 0.1.1-1
- New release.
- Remove mkdir /etc/sysconfig/rhn from install; this is done
  in the Makefile.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.1.0-2
- Remove rhn_register obsoletes.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.1.0-1
- New release.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.0.9-1
- New release.

* Tue Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.8-3
- Make sub-packages depend on the exact version and release of
  the master package.

* Tue Jul 18 2006 James Bowes <jbowes at redhat.com> - 0.0.8-2
- Point to the new docs location in the source tree.

* Fri Jul 14 2006 James Bowes <jbowes at redhat.com> - 0.0.8-1
- Generate a uuid file from scratch during post.

* Wed Jun 21 2006 James Bowes <jbowes at redhat.com> - 0.0.7-1
- Removed the packages action.

* Fri Jun 02 2006 James Bowes <jbowes at redhat.com> - 0.0.6-2
- Remove reference to cliUtils

* Fri Jun 02 2006 James Bowes <jbowes at redhat.com> - 0.0.6-1
- new rhn-profile-sync command for syncing package, hardware,
  and virtualization profiles with rhn.

* Tue May 30 2006 James Bowes <jbowes at redhat.com> - 0.0.5-1
- Remove unneeded imports and circular imports.

 Tue May 23 2006 Pete Vetere <pvetere at redhat.com> - 0.0.4-1
- Add support for sending virtualization info to RHN

* Mon May 22 2006 James Bowes <jbowes at redhat.com> - 0.0.3-2
- Properly link rhn_register and up2date-config

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.3-1
- Remove more unused code and data files.

* Tue May 09 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Remove non-up2date repo backends.

* Mon May 08 2006 James Bowes <jbowes at redhat.com> - 4.4.69-6
- bump required version of rhnlib for pkg/iso redirect.

* Tue May 02 2006 James Bowes <jbowes at redhat.com> - 4.4.69-3
- fix for #87837, inaccurate error message when missing '-f' for kernel updates
- fix for #125049, misleading usage message: "Please specify either -l, -u, ...
- fix for #126528, up2date +get source fails if no source available
- fix for #168312, up2date config file is not ignored in rpm -V
- fix for #171057, CRM# 696030 repomd error after up2date
- fix for #171643, repomd error after up2date
- fix for #s 179896, 179898  rpm verify fails due to config files in .spec not marked ...

* Mon Apr 24 2006 Bret McMillan <bretm at redhat.com> 4.4.69-1
- fix for #178498, #176123 -- make --channel limit the channel universes for various operations
- fix for #162106, RHN 'sync packages to system' installing i386 glibc on i686
- fix for #175593, up2date --whatprovides doesn't handle compat arch provides

* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> 0.0.1-1
- Pull out rhnsd stuff so we can build as noarch.
- Make seperate rpms for rhn_check, and register.

* Wed Feb 01 2006 Adrian Likins <alikins at redhat.com> 4.4.6800000000000eleventybillion
- gratuitous version rev to test up2date of up2date

* Tue Jan 31 2006 Bret McMillan <bretm at redhat.com> 4.4.67-4
- fix release tag

* Fri Jan 27 2006 Adrian Likins <alikins at redhat.com> 4.4.67-3
- fix for #179110 - up2date fails to update xerces-j
- more fixed for #176195 "up2date-nox --configure changes current value of numeric attribute to Yes/No if 1/0 is selected"

* Fri Jan 27 2006 Bret McMillan <bretm at redhat.com> 4.4.65-3
- fix for #176195 "up2date-nox --configure changes current value of numeric attribute to Yes/No if 1/0 is selected"

* Thu Jan 19 2006 Adrian Likins <alikins at redhat.com> 4.4.63-4
- rest of fix for #169880 up2date --arch updates primary arch if package is out of date instead of arch specified.
- even better fix for #178261 "Invalid function call attempted" when installing a RHN proxy

* Thu Jan 19 2006 Bret McMillan <bretm at redhat.com> 4.4.60-4
- rebuild with fixes for:
- fix #169293 -- up2date unable to download very large rpms
- fix #177784 -- up2date gives error if select-all is checked
- fix #177786 -- up2date unselects all pakcages if select-all is checked and user selects 'back'

* Thu Jan 12 2006 Adrian Likins <alikins at redhat.com> 4.4.58
- fix for #165157 - firstboot 'Read our Privacy Statement' shows a blank text box

* Fri Jan 6 2006 Adrian Likins <alikins at redhat.com> 4.4.56-4.1
- rebuild for #176182 (new gcc)

* Thu Dec 8 2005 Adrian Likins <alikins at redhat.com> 4.4.55
- add bug fix for  #175321  rhnreg_ks cannot import name capabilities -- circular import

* Wed Nov 15 2005 Adrian Likins <alikins at redhat.com> 4.4.54
- revert orig fix for #165024 - "invalid function call" error on proxy installs
- add new bug fix for #165204
- revert "fix" for #169882, #159955 - up2date man page does not describe --undo option.
- add --unfo to man page fixing #169882, #159955


* Wed Nov 09 2005 Adrian Likins <alikins at redhat.com> 4.4.52
- fix #165024 - "invalid function call" error on proxy installs
- fix #169881, #167732 -  'up2date --configure' always saves changes if useNetwork is false on startup
 

* Mon Oct 10 2005 Adrian Likins <alikins at redhat.com> 4.4.51
- fix #169882, #159955 - up2date man page does not describe --undo option.
  (remove deprecated undo option)
- fix #170065, #166034 - up2date "forward" button disabled if packages selected via spacebar.
- fix #157087, #170055 - up2date --configure fails when failover serverURL is configured.

* Thu Sep 15 2005 Adrian Likins <alikins at redhat.com> 4.4.50-4
- new up2date.pot, synced up
- fix uncommitted changes that were causing string 
  translations not to show up
- more translations updates for #160608

* Mon Sep 12 2005 Adrian Likins <alikins at redhat.com> 4.4.45
- fix for #160602 (updated russian translations)


* Fri Aug 26 2005 Adrian Likins <alikins at redhat.com> 4.4.44
- fix for #166868 - fatal python error when  installing package

* Tue Aug 23 2005 Adrian Likins <alikins at redhat.com> 4.4.43
- more fixes for #144800

* Tue Aug 23 2005 Adrian Likins <alikins at redhat.com> 4.4.42
- more fixes for #159858/#157070

* Mon Aug 15 2005 Adrian Likins <alikins at redhat.com> 4.4.41
- fix #164660

* Thu Aug 11 2005 Adrian Likins <alikins at redhat.com> 4.4.40
- attempt "fix" for #165636 (require new rpm versions)

* Wed Aug 10 2005 Adrian Likins <alikins at redhat.com> 4.4.39
- more fix for #157070
- require newer rhnlib for #165360

* Thu Aug 4 2005 Adrian Likins <alikins at redhat.com> 4.4.38
- fix desktop files rpmdiff complained about

* Thu Aug 4 2005 Adrian Likins <alikins at redhat.com> 4.4.37
- fix specfile to work on ppc

* Wed Aug 3 2005 Adrian Likins <alikins at redhat.com> 4.4.36
- fix for #162701

* Wed Aug 3 2005 Adrian Likins <alikins at redhat.com> 4.4.35
- fix for #160602 (updated ru.po)

* Tue Aug 2 2005 Adrian Likins <alikins at redhat.com> 4.4.34
- fix for #144800

* Thu Jul 28 2005 Adrian Likins <alikins at redhat.com> 4.4.33
- fix for #149472

* Wed Jul 27 2005 Adrian Likins <alikins at redhat.com> 4.4.32
- fix for #144800
- fix for #137942

* Tue Jul 26 2005 Adrian Likins <alikins at redhat.com> 4.4.31
- fix for #155583

* Tue Jul 12 2005 Adrian Likins <alikins at redhat.com> 4.4.30
- more fixes for sources on RHEL-3
- have to include "3" as a release as well

* Mon Jul 11 2005 Adrian Likins <alikins at redhat.com> 4.4.28
- fix for issues with updating the package list after
  actions correctly #125790

* Thu Jul 7 2005 Jason Connor <jconnor at redhat.com> 4.4.27.2
- hotfix for bug 148952

* Tue Jun 7 2005 Adrian Likins <alikins at redhat.com> 4.4.25
- delay/avoid doing repomd if it's not in use

* Mon Jun 6 2005 Adrian Likins <alikins at redhat.com> 4.4.24
- dont require the old extended_packages cap

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.23
- change the way the version substitution works to pass pkg checker

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.22
- fix #158256 - up2date errors if yum isnt installed, but doesn't need to

* Thu May 19 2005 Adrian Likins <alikins at redhat.com> 4.4.20
- fix #154814 -  Selecting all packages in the GUI only selects first package

* Tue May 17 2005 Adrian Likins <alikins at redhat.com> 4.4.19
- fix #155583 - don't allow kernel-smp.x86_64 to be installed on ia32e
- fix #157070 - make yum/apt repos support proxies
- fix #148952 - patch from Jack Neely <jjneely at pams.ncsu.edu)

* Mon May 16 2005 Adrian Likins <alikins at redhat.com> 4.4.19
- fix #150418 ? rhel-4 client machine capabilities not recognized sometimes
- fix #145554 ? rhn_register fails if proxy username begins at '0'
- fix #154137 up2date does not always send the arch

* Mon May 9 2005 Adrian Likins <alikins at redhat.com> 4.4.18
- fix problem with missing import

* Wed Apr 27 2005 Adrian Likins <alikins at redhat.com> 4.4.17
- fix some bugs in the way repomdRepo creates the package lists

* Tue Apr 26 2005 Adrian Likins <alikins at redhat.com> 4.4.16
- support repomd repos (and use the yum config if it exists)
  bugzilla #135121

* Tue Apr 19 2005 Adrian Likins <alikins at redhat.com> 4.4.15
- fix #149444 up2date --dry-run --upgrade-to-release changes registered base channel
- fix #151328 (tracback when registering with *'s in password)
- added some general uncaught exception catching
- truncate rpm changelog (see up2date.spec.changelog)
- update translations

* Thu Apr 14 2005 Jason Connor <jconnor at redhat.com> 4.4.14
- fix #135121 - uncommented rpmmd registration, fixed api
- fix #149281 - added check for failed read

* Fri Apr 8 2005 Adrian Likins <alikins at redhat.com> 4.4.13
- update translations

* Thu Apr 7 2005 Adrian Likins <alikins at redhat.com> 4.4.12
- update translations

* Thu Mar 3 2005 Adrian Likins <alikins at redhat.com> 4.4.10
- fix #150210
- revert change for package list refresh for this
  release

* Tue Mar 1 2005 Adrian Likins <alikins at redhat.com> 4.4.9
- fix #149947

* Tue Feb 15 2005 Adrian Likins <alikins at redhat.com> 4.4.8
- fix #139537

* Fri Jan 14 2005 Adrian Likins <alikins at redhat.com> 4.4.7
- fix #136497
- fix #142750, #142589 (less deprecation warnings) 

* Mon Jan 10 2005 Adrian Likins <alikins at redhat.com> 4.4.6
- fix #144704

* Wed Dec 15 2004 Adrian Likins <alikins at redhat.com> 4.4.5
- fix #142406 (again)

* Wed Dec 15 2004 Adrian Likins <alikins at redhat.com> 4.4.4
- fix #142332
- fix #129909

* Tue Dec 14 2004 Adrian Likins <alikins at redhat.com> 4.4.3
- fix #142406

* Mon Dec 6 2004 Adrian Likins <alikins at redhat.com> 4.4.2
- fix #139495 (updated translations)

* Fri Dec 3 2004 Adrian Likins <alikins at redhat.com> 4.4.1
- fix #141820 (add kernel-devel to list of packages to
  intall not update)

* Fri Dec 3 2004 Adrian Likins <alikins at redhat.com> 4.4.0
- rev to 4.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:46:56 -0000	1.1
+++ .cvsignore	22 Sep 2009 15:31:55 -0000	1.2
@@ -0,0 +1 @@
+rhn-client-tools-0.7.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:46:56 -0000	1.1
+++ sources	22 Sep 2009 15:31:55 -0000	1.2
@@ -0,0 +1 @@
+1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:51 +0000
Subject: [pkgdb] less: npajkovs has requested approveacls
Message-ID: <20090922153153.112F510F87E@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on less (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:58 +0000
Subject: [pkgdb] less: npajkovs has requested watchbugzilla
Message-ID: <20090922153158.6845710F8AC@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on less (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:31:58 +0000
Subject: [pkgdb] less: npajkovs has requested watchcommits
Message-ID: <20090922153200.181FC10F8B0@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on less (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:32:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:32:02 +0000
Subject: [pkgdb] less: npajkovs has requested commit
Message-ID: <20090922153202.0577C10F8B3@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on less (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:32:04 +0000
Subject: [pkgdb] less: npajkovs has requested approveacls
Message-ID: <20090922153204.A1EC010F890@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on less (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:32:12 +0000
Subject: [pkgdb] less: npajkovs has requested watchbugzilla
Message-ID: <20090922153212.03B5910F8B8@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on less (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:32:16 +0000
Subject: [pkgdb] less: npajkovs has requested watchcommits
Message-ID: <20090922153216.A7FA410F8B9@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on less (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:32:20 +0000
Subject: [pkgdb] less: npajkovs has requested commit
Message-ID: <20090922153221.487A710F8BC@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on less (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:32:23 +0000
Subject: [pkgdb] less: npajkovs has requested approveacls
Message-ID: <20090922153223.3D47610F8C0@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on less (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From msuchy at fedoraproject.org  Tue Sep 22 15:36:58 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Tue, 22 Sep 2009 15:36:58 +0000 (UTC)
Subject: rpms/rhnlib/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rhnlib.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090922153658.75A2111C00E8@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhnlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18393/devel

Modified Files:
	.cvsignore import.log rhnlib.spec sources 
Log Message:
Import of new version of rhnlib-2.5.13-1 to devel branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 08:44:52 -0000	1.2
+++ .cvsignore	22 Sep 2009 15:36:57 -0000	1.3
@@ -1 +1 @@
-rhnlib-2.5.10.tar.gz
+rhnlib-2.5.13.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Mar 2009 08:44:52 -0000	1.1
+++ import.log	22 Sep 2009 15:36:58 -0000	1.2
@@ -1 +1,2 @@
 rhnlib-2_5_10-1:HEAD:rhnlib-2.5.10-1.src.rpm:1237193065
+rhnlib-2_5_13-1:HEAD:rhnlib-2.5.13-1.src.rpm:1253633737


Index: rhnlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/devel/rhnlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rhnlib.spec	27 Jul 2009 03:01:23 -0000	1.2
+++ rhnlib.spec	22 Sep 2009 15:36:58 -0000	1.3
@@ -4,8 +4,8 @@ Summary: Python libraries for the RHN pr
 Name: rhnlib
 URL:     https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.10
-Release: 2%{?dist}
+Version: 2.5.13
+Release: 1%{?dist}
 
 Group: Development/Libraries
 License: GPLv2
@@ -52,8 +52,22 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Aug 06 2009 Pradeep Kilambi <pkilambi at redhat.com> 2.5.13-1
+- 
+
+* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 2.5.12-1
+- merging additional spec changes and minor edits from svn (pkilambi at redhat.com)
+- 499860 Ability to define location for the temporary transport file
+  descriptors, uses /tmp by default (pkilambi at redhat.com)
+- use tempfile to create transport objects instead of an ugly loop (pkilambi at redhat.com)
+
+* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 2.2.7-2
+Resolves: #489920 #484245 #489921 #492638 #499858 #499860
+
+* Wed May 06 2009 jesus m. rodriguez <jesusr at redhat.com> 2.5.11-1
+- fixing the rpc version checks (pkilambi at redhat.com)
+- 492638, 489921, 484245 - Adding redirect support to rhnlib for rhel-5 clients
+  (pkilambi at redhat.com)
 
 * Mon Feb 23 2009 Miroslav Suchy <msuchy at redhat.com> 2.5.10-1
 - point Source0 to Fedorahosted.org
@@ -70,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 2.5.6-1
 - Remove usage of version and sources files.
 
+* Tue Sep 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 2.2.6-2
+Resolves: #211394 #250303 
+
 * Fri Jun 20 2008 Devan Goodwin <dgoodwin at redhat.com> - 2.2.5-5
 - Updating for Fedora 9.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 08:44:52 -0000	1.2
+++ sources	22 Sep 2009 15:36:58 -0000	1.3
@@ -1 +1 @@
-654895c99b0d644870fb10665f94ae30  rhnlib-2.5.10.tar.gz
+8d33f894072dcef348f7c4228cc0c188  rhnlib-2.5.13.tar.gz



From msuchy at fedoraproject.org  Tue Sep 22 15:38:22 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Tue, 22 Sep 2009 15:38:22 +0000 (UTC)
Subject: rpms/rhnlib/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rhnlib.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090922153822.F2F4411C00E8@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhnlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19102/F-11

Modified Files:
	.cvsignore import.log rhnlib.spec sources 
Log Message:
Import of new version of rhnlib-2.5.13-1 to F-11 branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 08:44:52 -0000	1.2
+++ .cvsignore	22 Sep 2009 15:38:22 -0000	1.3
@@ -1 +1 @@
-rhnlib-2.5.10.tar.gz
+rhnlib-2.5.13.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Mar 2009 08:44:52 -0000	1.1
+++ import.log	22 Sep 2009 15:38:22 -0000	1.2
@@ -1 +1,2 @@
 rhnlib-2_5_10-1:HEAD:rhnlib-2.5.10-1.src.rpm:1237193065
+rhnlib-2_5_13-1:F-11:rhnlib-2.5.13-1.src.rpm:1253633867


Index: rhnlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/F-11/rhnlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rhnlib.spec	16 Mar 2009 08:44:52 -0000	1.1
+++ rhnlib.spec	22 Sep 2009 15:38:22 -0000	1.2
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN pr
 Name: rhnlib
 URL:     https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.10
+Version: 2.5.13
 Release: 1%{?dist}
 
 Group: Development/Libraries
@@ -52,6 +52,23 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Aug 06 2009 Pradeep Kilambi <pkilambi at redhat.com> 2.5.13-1
+- 
+
+* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 2.5.12-1
+- merging additional spec changes and minor edits from svn (pkilambi at redhat.com)
+- 499860 Ability to define location for the temporary transport file
+  descriptors, uses /tmp by default (pkilambi at redhat.com)
+- use tempfile to create transport objects instead of an ugly loop (pkilambi at redhat.com)
+
+* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 2.2.7-2
+Resolves: #489920 #484245 #489921 #492638 #499858 #499860
+
+* Wed May 06 2009 jesus m. rodriguez <jesusr at redhat.com> 2.5.11-1
+- fixing the rpc version checks (pkilambi at redhat.com)
+- 492638, 489921, 484245 - Adding redirect support to rhnlib for rhel-5 clients
+  (pkilambi at redhat.com)
+
 * Mon Feb 23 2009 Miroslav Suchy <msuchy at redhat.com> 2.5.10-1
 - point Source0 to Fedorahosted.org
 
@@ -67,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 2.5.6-1
 - Remove usage of version and sources files.
 
+* Tue Sep 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 2.2.6-2
+Resolves: #211394 #250303 
+
 * Fri Jun 20 2008 Devan Goodwin <dgoodwin at redhat.com> - 2.2.5-5
 - Updating for Fedora 9.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhnlib/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 08:44:52 -0000	1.2
+++ sources	22 Sep 2009 15:38:22 -0000	1.3
@@ -1 +1 @@
-654895c99b0d644870fb10665f94ae30  rhnlib-2.5.10.tar.gz
+8d33f894072dcef348f7c4228cc0c188  rhnlib-2.5.13.tar.gz



From transif at fedoraproject.org  Tue Sep 22 15:41:57 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 22 Sep 2009 15:41:57 +0000 (UTC)
Subject: comps/po pl.po,1.28,1.29
Message-ID: <20090922154157.1EE6711C00E8@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20916/po

Modified Files:
	pl.po 
Log Message:
Sending translation for Polish


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pl.po	29 Aug 2009 21:12:08 -0000	1.28
+++ pl.po	22 Sep 2009 15:41:56 -0000	1.29
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 19:06+0000\n"
-"PO-Revision-Date: 2009-08-29 23:11+0200\n"
+"POT-Creation-Date: 2009-09-22 08:26+0000\n"
+"PO-Revision-Date: 2009-09-22 17:41+0200\n"
 "Last-Translator: Piotr Dr?g <piotrdrag at gmail.com>\n"
-"Language-Team: Polish <pl at li.org>\n"
+"Language-Team: Polish <fedora-trans-pl at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -425,28 +425,31 @@ msgstr "Obs?uga indonezyjskiego"
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr "Zainstaluj te pakiety, aby tworzy? graficzne aplikacje GTK+ i GNOME."
+msgstr ""
+"Nale?y zainstalowa? te pakiety, aby tworzy? graficzne aplikacje GTK+ i GNOME."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
 #: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr "Zainstaluj te pakiety, aby tworzy? graficzne aplikacje GTK+ i Xfce."
+msgstr ""
+"Nale?y zainstalowa? te pakiety, aby tworzy? graficzne aplikacje GTK+ i Xfce."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
 #: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:31
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr "Zainstaluj te pakiety, aby tworzy? graficzne aplikacje Qt i KDE."
+msgstr ""
+"Nale?y zainstalowa? te pakiety, aby tworzy? graficzne aplikacje Qt i KDE."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
 #: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
 msgid ""
 "Install these tools to enable the system to print or act as a print server."
 msgstr ""
-"Zainstaluj te narz?dzia, aby umo?liwi? systemowi drukowanie lub prac? jako "
-"serwer druku."
+"Nale?y zainstalowa? te narz?dzia, aby umo?liwi? systemowi drukowanie lub "
+"prac? jako serwer druku."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
 #: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
@@ -454,8 +457,8 @@ msgstr ""
 msgid ""
 "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
-"Zainstaluj t? grup? pakiet?w, aby u?ywa? podstawowego graficznego (X Window) "
-"interfejsu u?ytkownika."
+"Nale?y zainstalowa? t? grup? pakiet?w, aby u?ywa? podstawowego graficznego "
+"(X) interfejsu u?ytkownika."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
 #: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
@@ -1006,7 +1009,7 @@ msgid ""
 "them into HTML, PDF, Postscript, and text."
 msgstr ""
 "Te narz?dzia pozwalaj? na tworzenie dokumentacji w formacie DocBook i "
-"konwertowanie jej do format?w HTML, PDF, PostScript i tekstu."
+"konwertowanie jej do format?w HTML, PDF, PostScript i zwyk?ego tekstu."
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
@@ -1270,7 +1273,7 @@ msgstr "Serwer plik?w Windows"
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
 #: ../comps-f13.xml.in.h:263
 msgid "X Software Development"
-msgstr "Tworzenie oprogramowania X Window"
+msgstr "Tworzenie oprogramowania X"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
@@ -1501,8 +1504,8 @@ msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
 msgstr ""
-"Obs?uga skro?nego kompilowania program?w dla 32 bitowego Windows, testowania "
-"ich, budowania instalator?w, a to wszystko z poziomu Fedory."
+"Obs?uga skro?nego kompilowania program?w dla 32 bitowych system?w Windows, "
+"testowania ich, budowania instalator?w, a wszystko to z poziomu Fedory."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
 #: ../comps-f13.xml.in.h:198
@@ -1645,7 +1648,7 @@ msgid ""
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
 "Te narz?dzia umo?liwiaj? tworzenie dokumentacji w formacie DocBook i "
-"konwertowanie jej do format?w HTML, PDF, PostScript i tekstu."
+"konwertowanie jej do format?w HTML, PDF, PostScript i zwyk?ego tekstu."
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"



From pkgdb at fedoraproject.org  Tue Sep 22 15:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:52:25 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155225.2DCC610F876@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:52:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:52:28 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155230.1AB9410F87C@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:52:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:52:31 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155231.2638110F889@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:52:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:52:32 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155232.2E19510F890@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:52:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:52:33 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155233.3A8E610F898@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:52:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:52:51 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155252.1845110F87C@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora devel is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:00 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155300.2A5B410F88A@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora 10 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:03 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155303.3502A10F897@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora 11 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:27 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155327.936FD10F861@bastion2.fedora.phx.redhat.com>

Package less in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:28 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155328.4B40D10F883@bastion2.fedora.phx.redhat.com>

Package less in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:30 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155330.3FAE110F88A@bastion2.fedora.phx.redhat.com>

Package less in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:31 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155331.BE54C10F898@bastion2.fedora.phx.redhat.com>

Package less in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:32 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155332.BF31C10F89A@bastion2.fedora.phx.redhat.com>

Package less in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:34 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155334.3749610F89B@bastion2.fedora.phx.redhat.com>

Package less in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:53:51 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155351.894EC10F88A@bastion2.fedora.phx.redhat.com>

Package less in Fedora devel is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:54:01 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155401.C606C10F89C@bastion2.fedora.phx.redhat.com>

Package less in Fedora 10 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:54:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:54:05 +0000
Subject: [pkgdb] less ownership updated
Message-ID: <20090922155405.991E910F890@bastion2.fedora.phx.redhat.com>

Package less in Fedora 11 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/less



From pkgdb at fedoraproject.org  Tue Sep 22 15:57:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:57:00 +0000
Subject: [pkgdb] nasm: npajkovs has given up watchbugzilla
Message-ID: <20090922155700.9210A10F861@bastion2.fedora.phx.redhat.com>

npajkovs has given up the watchbugzilla acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:57:13 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090922155714.9458310F861@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora devel was orphaned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:57:06 +0000
Subject: [pkgdb] nasm: npajkovs has given up watchcommits
Message-ID: <20090922155706.56D6410F883@bastion2.fedora.phx.redhat.com>

npajkovs has given up the watchcommits acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:57:13 +0000
Subject: [pkgdb] nasm (un)retirement
Message-ID: <20090922155714.AE67E10F897@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora devel has been retired by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:58:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:58:02 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchbugzilla
Message-ID: <20090922155803.EBFE910F876@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:58:07 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchcommits
Message-ID: <20090922155807.E0CF210F889@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:58:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:58:09 +0000
Subject: [pkgdb] nasm: npajkovs has given up commit
Message-ID: <20090922155809.5F3B110F890@bastion2.fedora.phx.redhat.com>

npajkovs has given up the commit acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Tue Sep 22 15:58:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 15:58:11 +0000
Subject: [pkgdb] nasm: npajkovs has given up approveacls
Message-ID: <20090922155812.AE00810F897@bastion2.fedora.phx.redhat.com>

npajkovs has given up the approveacls acl on nasm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From mgrepl at fedoraproject.org  Tue Sep 22 15:59:00 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 22 Sep 2009 15:59:00 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.51,
	1.52 selinux-policy.spec, 1.905, 1.906
Message-ID: <20090922155900.B2CD111C00E8@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27724

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow sshd to create .ssh directory and content



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 policy/modules/admin/prelink.te           |    9 
 policy/modules/admin/readahead.te         |    2 
 policy/modules/admin/rpm.fc               |    1 
 policy/modules/admin/rpm.if               |   46 +++++
 policy/modules/admin/rpm.te               |    4 
 policy/modules/admin/shorewall.fc         |   12 +
 policy/modules/admin/shorewall.if         |  166 ++++++++++++++++++
 policy/modules/admin/shorewall.te         |  103 +++++++++++
 policy/modules/admin/sudo.if              |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    3 
 policy/modules/admin/usermanage.te        |    3 
 policy/modules/apps/awstats.te            |    2 
 policy/modules/apps/calamaris.te          |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++++++++++
 policy/modules/apps/gitosis.te            |   43 ++++
 policy/modules/apps/gnome.te              |   10 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 policy/modules/apps/java.te               |    2 
 policy/modules/apps/mozilla.if            |   16 +
 policy/modules/apps/mozilla.te            |   14 -
 policy/modules/apps/nsplugin.if           |    2 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 ++
 policy/modules/apps/ptchown.te            |   40 ++++
 policy/modules/apps/qemu.fc               |    1 
 policy/modules/apps/qemu.te               |    5 
 policy/modules/apps/sandbox.if            |  134 +++++++++++---
 policy/modules/apps/sandbox.te            |  274 +++++++++++++++++++++++++++---
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    6 
 policy/modules/kernel/corecommands.fc     |   10 -
 policy/modules/kernel/corenetwork.te.in   |    5 
 policy/modules/kernel/devices.fc          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   31 +++
 policy/modules/kernel/files.if            |    4 
 policy/modules/kernel/kernel.if           |    2 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/roles/staff.te             |   12 +
 policy/modules/roles/sysadm.if            |   35 +++
 policy/modules/roles/sysadm.te            |    4 
 policy/modules/roles/unconfineduser.te    |   10 -
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/apache.fc         |    5 
 policy/modules/services/apache.te         |    1 
 policy/modules/services/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    7 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |   15 +
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   19 +-
 policy/modules/services/hal.te            |   15 +
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 ++++
 policy/modules/services/hddtemp.te        |   40 ++++
 policy/modules/services/kerberos.if       |    2 
 policy/modules/services/kerberos.te       |   12 +
 policy/modules/services/lircd.te          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 policy/modules/services/nslcd.te          |   50 +++++
 policy/modules/services/nx.fc             |    3 
 policy/modules/services/nx.if             |   20 ++
 policy/modules/services/openvpn.te        |   14 +
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/polkit.fc         |    2 
 policy/modules/services/polkit.if         |    2 
 policy/modules/services/polkit.te         |    3 
 policy/modules/services/postfix.if        |   26 ++
 policy/modules/services/postfix.te        |   26 --
 policy/modules/services/postgresql.te     |    2 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |    2 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/rpc.te            |   15 +
 policy/modules/services/rpcbind.if        |   20 ++
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/samba.te          |    6 
 policy/modules/services/sasl.te           |    2 
 policy/modules/services/sendmail.if       |   39 ++++
 policy/modules/services/sendmail.te       |    7 
 policy/modules/services/setroubleshoot.te |    5 
 policy/modules/services/shorewall.fc      |   12 -
 policy/modules/services/shorewall.if      |  166 ------------------
 policy/modules/services/shorewall.te      |  102 -----------
 policy/modules/services/smartmon.te       |    4 
 policy/modules/services/snmp.if           |   37 ++++
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    2 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |   14 +
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.fc           |    1 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 policy/modules/system/authlogin.fc        |    3 
 policy/modules/system/authlogin.if        |  270 ++++++++++++++++++-----------
 policy/modules/system/authlogin.te        |   27 +-
 policy/modules/system/init.fc             |    2 
 policy/modules/system/init.te             |    6 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |    1 
 policy/modules/system/sysnetwork.if       |    1 
 policy/modules/system/sysnetwork.te       |   17 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |   10 +
 policy/modules/system/userdomain.if       |   35 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 160 files changed, 2492 insertions(+), 650 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- policy-20090521.patch	16 Sep 2009 12:15:32 -0000	1.51
+++ policy-20090521.patch	22 Sep 2009 15:58:58 -0000	1.52
@@ -826,16 +826,11 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.12/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2009-06-25 10:19:43.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-08-24 09:15:41.000000000 +0200
-@@ -114,6 +114,21 @@
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-09-18 14:56:40.000000000 +0200
+@@ -114,6 +114,16 @@
  
  userdom_dontaudit_search_admin_dir(gconfdefaultsm_t)
  
-+# if $HOME/.gconf is labeled as user_home_t
-+userdom_user_home_dir_filetrans_pattern(gconfdefaultsm_t, { file })
-+userdom_manage_user_home_content_dirs(gconfdefaultsm_t)
-+userdom_manage_user_home_content_files(gconfdefaultsm_t)
-+
 +tunable_policy(`use_nfs_home_dirs',`
 +        fs_manage_nfs_dirs(gconfdefaultsm_t)
 +        fs_manage_nfs_files(gconfdefaultsm_t)
@@ -872,6 +867,18 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_rand(gpg_t)
  dev_read_urand(gpg_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.12/policy/modules/apps/java.te
+--- nsaserefpolicy/policy/modules/apps/java.te	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/java.te	2009-09-22 17:00:57.000000000 +0200
+@@ -148,6 +148,8 @@
+ 	# execheap is needed for itanium/BEA jrocket
+ 	allow unconfined_java_t self:process { execstack execmem execheap };
+ 
++	files_execmod_all_files(unconfined_java_t)
++
+ 	init_dbus_chat_script(unconfined_java_t)
+ 
+ 	unconfined_domain_noaudit(unconfined_java_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.6.12/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/mozilla.if	2009-07-08 21:12:05.000000000 +0200
@@ -4039,8 +4046,16 @@ diff -b -B --ignore-all-space --exclude-
  	auth_read_all_symlinks_except_shadow(rsync_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.12/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-09-02 09:14:35.000000000 +0200
-@@ -342,6 +342,8 @@
++++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-09-22 17:53:46.000000000 +0200
+@@ -280,6 +280,7 @@
+ files_pid_filetrans(smbd_t, smbd_var_run_t, file)
+ 
+ allow smbd_t winbind_var_run_t:sock_file rw_sock_file_perms;
++allow smbd_t winbind_t:process { signal signull };
+ 
+ kernel_getattr_core_if(smbd_t)
+ kernel_getattr_message_if(smbd_t)
+@@ -342,6 +343,8 @@
  miscfiles_read_localization(smbd_t)
  miscfiles_read_public_files(smbd_t)
  
@@ -4049,6 +4064,13 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_unpriv_users_fds(smbd_t)
  userdom_dontaudit_search_user_home_dirs(smbd_t)
  
+@@ -924,3 +927,6 @@
+ allow winbind_t smbcontrol_t:process signal;
+ 
+ allow smbcontrol_t nmbd_var_run_t:file { read lock };
++
++userdom_use_user_terminals(smbcontrol_t)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.6.12/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/sasl.te	2009-08-18 14:47:01.000000000 +0200
@@ -4475,8 +4497,33 @@ diff -b -B --ignore-all-space --exclude-
  allow fsdaemon_t self:unix_stream_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.6.12/policy/modules/services/snmp.if
 --- nsaserefpolicy/policy/modules/services/snmp.if	2009-04-07 21:54:45.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/snmp.if	2009-09-16 13:07:46.000000000 +0200
-@@ -85,6 +85,25 @@
++++ serefpolicy-3.6.12/policy/modules/services/snmp.if	2009-09-17 10:38:55.000000000 +0200
+@@ -28,6 +28,24 @@
+ 	refpolicywarn(`$0($*) has been deprecated.')
+ ')
+ 
++#######################################
++## <summary>
++##	Append snmpd libraries.
++## </summary>
++## <param name="domain">
++## 	<summary>
++## 	Domain allowed access.
++## 	</summary>
++## </param>
++#
++interface(`snmp_append_snmp_var_lib_files',`
++	gen_require(`
++		type snmpd_var_lib_t;
++	')
++
++	append_files_pattern($1, snmpd_var_lib_t, snmpd_var_lib_t)
++')
++
+ ########################################
+ ## <summary>
+ ##	Read snmpd libraries.
+@@ -85,6 +103,25 @@
  	dontaudit $1 snmpd_var_lib_t:file write;
  ')
  
@@ -4613,8 +4660,21 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.12/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.te	2009-08-20 15:37:17.000000000 +0200
-@@ -347,10 +347,18 @@
++++ serefpolicy-3.6.12/policy/modules/services/ssh.te	2009-09-22 17:01:21.000000000 +0200
+@@ -133,6 +133,12 @@
+ read_files_pattern(ssh_server,home_ssh_t,home_ssh_t)
+ read_lnk_files_pattern(ssh_server,home_ssh_t,home_ssh_t)
+ 
++# ssh servers can create and read the user keys and config
++manage_dirs_pattern(ssh_server, home_ssh_t, home_ssh_t)
++manage_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
++userdom_user_home_dir_filetrans(ssh_server, home_ssh_t, dir)
++userdom_admin_home_dir_filetrans(ssh_server, home_ssh_t, dir)  
++
+ kernel_read_kernel_sysctls(ssh_t)
+ kernel_read_system_state(ssh_t)
+ 
+@@ -347,10 +353,18 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -p -r1.905 -r1.906
--- selinux-policy.spec	16 Sep 2009 12:15:32 -0000	1.905
+++ selinux-policy.spec	22 Sep 2009 15:58:58 -0000	1.906
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 83%{?dist}
+Release: 84%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,6 +442,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Sep 22 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-84
+- Allow sshd to create .ssh directory and content
+
 * Wed Sep 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-83
 - Add wordpress/wp-content/uploads label
 - Add /var/lib/libvirt/qemu label



From pbrobinson at fedoraproject.org  Tue Sep 22 15:59:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 15:59:33 +0000 (UTC)
Subject: rpms/ptlib/devel .cvsignore, 1.9, 1.10 ptlib.spec, 1.21,
	1.22 sources, 1.9, 1.10 ptlib-2.6.4-openssl.patch, 1.1, NONE
Message-ID: <20090922155933.B7A3C11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992

Modified Files:
	.cvsignore ptlib.spec sources 
Removed Files:
	ptlib-2.6.4-openssl.patch 
Log Message:
- New 2.6.5 stable release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Jul 2009 20:03:19 -0000	1.9
+++ .cvsignore	22 Sep 2009 15:59:33 -0000	1.10
@@ -1 +1 @@
-ptlib-2.6.4.tar.bz2
+ptlib-2.6.5.tar.bz2


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ptlib.spec	22 Aug 2009 15:36:32 -0000	1.21
+++ ptlib.spec	22 Sep 2009 15:59:33 -0000	1.22
@@ -1,10 +1,9 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.6.4
-Release:	5%{?dist}
+Version:	2.6.5
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-Patch1:		ptlib-2.6.4-openssl.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,12 +36,11 @@ The ptlib-devel package includes the lib
 
 %prep
 %setup -q 
-%patch1 -p1 -b .openssl
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
 %configure --prefix=%{_prefix} --disable-static --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> - 2.6.5-1
+- New 2.6.5 stable release
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Jul 2009 20:03:19 -0000	1.9
+++ sources	22 Sep 2009 15:59:33 -0000	1.10
@@ -1 +1 @@
-bcc8e2d5bb6be7e3fea857ce2f7fce5c  ptlib-2.6.4.tar.bz2
+db7fd581b66998cd76d96f8b7c3f22a1  ptlib-2.6.5.tar.bz2


--- ptlib-2.6.4-openssl.patch DELETED ---



From transif at fedoraproject.org  Tue Sep 22 16:08:37 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 22 Sep 2009 16:08:37 +0000 (UTC)
Subject: comps/po pl.po,1.29,1.30
Message-ID: <20090922160837.3B7CF11C00E8@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30712/po

Modified Files:
	pl.po 
Log Message:
Sending translation for Polish


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- pl.po	22 Sep 2009 15:41:56 -0000	1.29
+++ pl.po	22 Sep 2009 16:08:36 -0000	1.30
@@ -999,7 +999,7 @@ msgid ""
 "methods."
 msgstr ""
 "Te pakiety dostarczaj? obs?ug? r??nych lokalizacji, w tym czcionki i metody "
-"wej?cia."
+"wprowadzania."
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
@@ -1317,12 +1317,12 @@ msgstr "Programowanie w Haskellu"
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
 #: ../comps-f13.xml.in.h:95
 msgid "Input Methods"
-msgstr "Metody wej?cia"
+msgstr "Metody wprowadzania"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
 #: ../comps-f13.xml.in.h:96
 msgid "Input method packages for the input of international text."
-msgstr "Pakiety metod wej?cia do wpisywania mi?dzynarodowego tekstu."
+msgstr "Pakiety metod wprowadzania do wpisywania mi?dzynarodowego tekstu."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
 #: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114



From pbrobinson at fedoraproject.org  Tue Sep 22 16:17:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 16:17:52 +0000 (UTC)
Subject: rpms/opal/devel .cvsignore, 1.19, 1.20 opal.spec, 1.55, 1.56 sources,
	1.21, 1.22
Message-ID: <20090922161752.06C4511C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2099

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- New 3.6.6 stable release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	6 Jul 2009 20:48:34 -0000	1.19
+++ .cvsignore	22 Sep 2009 16:17:51 -0000	1.20
@@ -1 +1 @@
-opal-3.6.4-noilbc.tar.bz2
+opal-3.6.6-noilbc.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- opal.spec	21 Aug 2009 14:50:13 -0000	1.55
+++ opal.spec	22 Sep 2009 16:17:51 -0000	1.56
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
-Version:	3.6.4
-Release:	4%{?dist}
+Version:	3.6.6
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 # We cannot use unmodified upstream source code because it contains the 
 # non-free iLBC codec.
@@ -12,7 +12,7 @@ Source0:	%{name}-%{version}-noilbc.tar.b
 Patch0:		opal-3.6.1-noilbc.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
-BuildRequires:	ptlib-devel = 2.6.4
+BuildRequires:	ptlib-devel = 2.6.5
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libtheora-devel
@@ -31,7 +31,7 @@ Summary:	Development package for opal
 Group:		Development/Libraries
 Requires:	opal = %{version}-%{release}
 Requires:	openssl-devel
-Requires:	ptlib-devel = 2.6.4
+Requires:	ptlib-devel = 2.6.5
 Requires:	pkgconfig
 
 %description devel
@@ -45,7 +45,7 @@ header files for opal.
 %build
 %configure
 
-make OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.6-1
+- New 3.6.6 stable release
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.4-4
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	6 Jul 2009 20:48:35 -0000	1.21
+++ sources	22 Sep 2009 16:17:51 -0000	1.22
@@ -1 +1 @@
-743afaa78440601257c1a88903f55436  opal-3.6.4-noilbc.tar.bz2
+3df30a6123142ad1fc1df714af3e25be  opal-3.6.6-noilbc.tar.bz2



From rdieter at fedoraproject.org  Tue Sep 22 16:23:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 16:23:24 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.206,1.207
Message-ID: <20090922162324.ED63B11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3832

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- Requires: python-mwclient (#520954)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- kdeedu.spec	20 Sep 2009 19:38:23 -0000	1.206
+++ kdeedu.spec	22 Sep 2009 16:23:24 -0000	1.207
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -70,8 +70,7 @@ Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
 # parley
 Requires: kross-python
-# pending review, https://bugzilla.redhat.com/523789
-#Requires: python-mwclient
+Requires: python-mwclient
 
 %description
 Educational/Edutainment applications:
@@ -488,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- Requires: python-mwclient (#520954)
+
 * Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - kdeedu embeds python-mwclient and it's broken (#520954)
 - Requires: kross-python



From rdieter at fedoraproject.org  Tue Sep 22 16:26:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 16:26:04 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.156,1.157
Message-ID: <20090922162604.441EC11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4729/F-10

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- Requires: python-mwclient (#520954)

* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kdeedu embeds python-mwclient and it's broken (#520954)
- Requires: kross-python



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdeedu.spec	1 Sep 2009 17:24:24 -0000	1.156
+++ kdeedu.spec	22 Sep 2009 16:26:03 -0000	1.157
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -25,16 +25,20 @@ Provides:  kdeedu4 = %{version}-%{releas
 # Kig can optionally use Boost.Python for Python scripting
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
+%if 0%{?fedora}
 BuildRequires: cfitsio-devel
+BuildRequires: xplanet
+BuildRequires: libindi-devel
+BuildRequires: libnova-devel
+BuildRequires: libqalculate-devel
+BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
-BuildRequires: libindi-devel
-BuildRequires: libnova-devel
-BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
@@ -42,10 +46,8 @@ BuildRequires: libxslt-devel
 BuildRequires: ocaml(compiler)
 BuildRequires: ocaml-facile-devel
 %endif
-BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-BuildRequires: xplanet
 
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -66,6 +68,9 @@ Requires: sj-stevehand-fonts
 # khangman
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
+# parley
+Requires: kross-python
+Requires: python-mwclient
 
 %description
 Educational/Edutainment applications:
@@ -190,6 +195,8 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Domestic_Manners.ttf
 # omit steve font
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
+# omit copies of python-(mwclient,simplejson)
+rm -rf %{buildroot}%{_kde4_appsdir}/parley/plugins/mwclient
 
 
 %check
@@ -480,6 +487,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- Requires: python-mwclient (#520954)
+
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- kdeedu embeds python-mwclient and it's broken (#520954)
+- Requires: kross-python
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From rdieter at fedoraproject.org  Tue Sep 22 16:26:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 16:26:04 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.184,1.185
Message-ID: <20090922162604.803E611C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4729/F-11

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- Requires: python-mwclient (#520954)

* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kdeedu embeds python-mwclient and it's broken (#520954)
- Requires: kross-python



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- kdeedu.spec	1 Sep 2009 17:24:25 -0000	1.184
+++ kdeedu.spec	22 Sep 2009 16:26:04 -0000	1.185
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -25,16 +25,20 @@ Provides:  kdeedu4 = %{version}-%{releas
 # Kig can optionally use Boost.Python for Python scripting
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
+%if 0%{?fedora}
 BuildRequires: cfitsio-devel
+BuildRequires: xplanet
+BuildRequires: libindi-devel
+BuildRequires: libnova-devel
+BuildRequires: libqalculate-devel
+BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
-BuildRequires: libindi-devel
-BuildRequires: libnova-devel
-BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
@@ -42,10 +46,8 @@ BuildRequires: libxslt-devel
 BuildRequires: ocaml(compiler)
 BuildRequires: ocaml-facile-devel
 %endif
-BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-BuildRequires: xplanet
 
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -66,6 +68,9 @@ Requires: sj-stevehand-fonts
 # khangman
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
+# parley
+Requires: kross-python
+Requires: python-mwclient
 
 %description
 Educational/Edutainment applications:
@@ -190,6 +195,8 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Domestic_Manners.ttf
 # omit steve font
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
+# omit copies of python-(mwclient,simplejson)
+rm -rf %{buildroot}%{_kde4_appsdir}/parley/plugins/mwclient
 
 
 %check
@@ -480,6 +487,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- Requires: python-mwclient (#520954)
+
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- kdeedu embeds python-mwclient and it's broken (#520954)
+- Requires: kross-python
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From pkgdb at fedoraproject.org  Tue Sep 22 16:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:28:35 +0000
Subject: [pkgdb] vdpauinfo was added for kwizart
Message-ID: <20090922162836.0E7CB10F876@bastion2.fedora.phx.redhat.com>

kevin has added Package vdpauinfo with summary Tool to query the capabilities of a VDPAU implementation
kevin has approved Package vdpauinfo
kevin has added a Fedora devel branch for vdpauinfo with an owner of kwizart
kevin has approved vdpauinfo in Fedora devel
kevin has approved Package vdpauinfo
kevin has set commit to Approved for 107427 on vdpauinfo (Fedora devel)
kevin has set checkout to Approved for 107427 on vdpauinfo (Fedora devel)
kevin has set build to Approved for 107427 on vdpauinfo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdpauinfo



From pkgdb at fedoraproject.org  Tue Sep 22 16:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:28:37 +0000
Subject: [pkgdb] vdpauinfo summary updated by kevin
Message-ID: <20090922162837.2BDEA10F883@bastion2.fedora.phx.redhat.com>

kevin set package vdpauinfo summary to Tool to query the capabilities of a VDPAU implementation

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdpauinfo



From pkgdb at fedoraproject.org  Tue Sep 22 16:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:28:37 +0000
Subject: [pkgdb] vdpauinfo (Fedora, 10) updated by kevin
Message-ID: <20090922162837.3B77D10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vdpauinfo
kevin has set commit to Approved for 107427 on vdpauinfo (Fedora 10)
kevin has set checkout to Approved for 107427 on vdpauinfo (Fedora 10)
kevin has set build to Approved for 107427 on vdpauinfo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdpauinfo



From kevin at fedoraproject.org  Tue Sep 22 16:28:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:28:47 +0000 (UTC)
Subject: rpms/vdpauinfo - New directory
Message-ID: <20090922162847.35EA511C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdpauinfo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKS5734/rpms/vdpauinfo

Log Message:
Directory /cvs/pkgs/rpms/vdpauinfo added to the repository




From kevin at fedoraproject.org  Tue Sep 22 16:28:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:28:47 +0000 (UTC)
Subject: rpms/vdpauinfo/devel - New directory
Message-ID: <20090922162847.6DD6411C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdpauinfo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKS5734/rpms/vdpauinfo/devel

Log Message:
Directory /cvs/pkgs/rpms/vdpauinfo/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 22 16:28:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:28:54 +0000 (UTC)
Subject: rpms/vdpauinfo Makefile,NONE,1.1
Message-ID: <20090922162854.6B3C111C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdpauinfo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKS5734/rpms/vdpauinfo

Added Files:
	Makefile 
Log Message:
Setup of module vdpauinfo


--- NEW FILE Makefile ---
# Top level Makefile for module vdpauinfo
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  Tue Sep 22 16:28:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:28:55 +0000 (UTC)
Subject: rpms/vdpauinfo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922162855.0E82911C0375@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdpauinfo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKS5734/rpms/vdpauinfo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdpauinfo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vdpauinfo
# $Id: Makefile,v 1.1 2009/09/22 16:28:54 kevin Exp $
NAME := vdpauinfo
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  Tue Sep 22 16:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:28:37 +0000
Subject: [pkgdb] vdpauinfo (Fedora, 10) updated by kevin
Message-ID: <20090922162837.488D310F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vdpauinfo
kevin has set commit to Approved for 107427 on vdpauinfo (Fedora 11)
kevin has set checkout to Approved for 107427 on vdpauinfo (Fedora 11)
kevin has set build to Approved for 107427 on vdpauinfo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdpauinfo



From steve at fedoraproject.org  Tue Sep 22 16:29:18 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Tue, 22 Sep 2009 16:29:18 +0000 (UTC)
Subject: rpms/perl-Test-Class/EL-5 perl-Test-Class.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922162918.DA78911C00E8@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Class/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6075

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Class.spec 
Log Message:
Sync with devel branch.


--- NEW FILE perl-Test-Class.spec ---
Name:           perl-Test-Class
Version:        0.33
Release:        1%{?dist}
Summary:        Easily create test classes in an xUnit/JUnit style
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Class/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-Class-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Contextual::Return)
BuildRequires:  perl(Devel::Symdump) >= 2.03
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Builder) >= 0.78
BuildRequires:  perl(Test::Builder::Tester) >= 1.02
BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
BuildRequires:  perl(Test::Exception) >= 0.25
BuildRequires:  perl(Test::MinimumVersion) >= 0.008
BuildRequires:  perl(Test::More) >= 0.78
BuildRequires:  perl(Test::Pod) >= 1.26
Requires:       perl(Devel::Symdump) >= 2.03
Requires:       perl(Test::Exception) >= 0.25
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Class provides a simple way of creating classes and objects to test
your code in an xUnit style.

%prep
%setup -q -n Test-Class-%{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
AUTOMATED_TESTING=1 ./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 21 2009 Steven Pritchard <steve at kspei.com> 0.33-1
- Update to 0.33.
- Update Source0 URL.
- Add LICENSE.
- BR Test::Pod, Test::CPAN::Meta, and Test::MinimumVersion and define
  AUTOMATED_TESTING for better test coverage.

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Dec 10 2008 Steven Pritchard <steve at kspei.com> 0.31-1
- Update to 0.31.
- BR Test::Builder.
- Add versioned dependencies to Test::Builder::Tester and Test::More.

* Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.30-1
- Update to 0.30.

* Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-2
- rebuild for new perl

* Mon Jan 28 2008 Steven Pritchard <steve at kspei.com> 0.28-1
- Update to 0.28.
- Update License tag.
- Bump Test::Exception requirement to 0.25.

* Mon Jul 16 2007 Steven Pritchard <steve at kspei.com> 0.24-1
- Specfile autogenerated by cpanspec 1.71.
- BR Contextual::Return, Test::Builder::Tester, and Test::More.
- Drop explicit perl BR.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jul 2007 21:07:30 -0000	1.1
+++ .cvsignore	22 Sep 2009 16:29:18 -0000	1.2
@@ -0,0 +1 @@
+Test-Class-0.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jul 2007 21:07:30 -0000	1.1
+++ sources	22 Sep 2009 16:29:18 -0000	1.2
@@ -0,0 +1 @@
+becdbdfed6bf83611c82853b6506c77a  Test-Class-0.33.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 22 16:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:31:45 +0000
Subject: [pkgdb] rhnsd was added for msuchy
Message-ID: <20090922163145.5A75A10F810@bastion2.fedora.phx.redhat.com>

kevin has added Package rhnsd with summary Red Hat Network query daemon
kevin has approved Package rhnsd
kevin has added a Fedora devel branch for rhnsd with an owner of msuchy
kevin has approved rhnsd in Fedora devel
kevin has approved Package rhnsd
kevin has set commit to Approved for 107427 on rhnsd (Fedora devel)
kevin has set checkout to Approved for 107427 on rhnsd (Fedora devel)
kevin has set build to Approved for 107427 on rhnsd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhnsd



From pkgdb at fedoraproject.org  Tue Sep 22 16:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:31:46 +0000
Subject: [pkgdb] rhnsd summary updated by kevin
Message-ID: <20090922163146.CDFB510F889@bastion2.fedora.phx.redhat.com>

kevin set package rhnsd summary to Red Hat Network query daemon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhnsd



From pkgdb at fedoraproject.org  Tue Sep 22 16:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:31:46 +0000
Subject: [pkgdb] rhnsd (Fedora, 11) updated by kevin
Message-ID: <20090922163147.11FEB10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rhnsd
kevin has set commit to Approved for 107427 on rhnsd (Fedora 11)
kevin has set checkout to Approved for 107427 on rhnsd (Fedora 11)
kevin has set build to Approved for 107427 on rhnsd (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhnsd



From pkgdb at fedoraproject.org  Tue Sep 22 16:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:31:46 +0000
Subject: [pkgdb] rhnsd (Fedora, 11) updated by kevin
Message-ID: <20090922163147.3A0A810F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rhnsd
kevin has set commit to Approved for 107427 on rhnsd (Fedora 12)
kevin has set checkout to Approved for 107427 on rhnsd (Fedora 12)
kevin has set build to Approved for 107427 on rhnsd (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rhnsd



From kevin at fedoraproject.org  Tue Sep 22 16:31:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:31:54 +0000 (UTC)
Subject: rpms/rhnsd - New directory
Message-ID: <20090922163154.17BBE11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rhnsd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBR6857/rpms/rhnsd

Log Message:
Directory /cvs/pkgs/rpms/rhnsd added to the repository




From kevin at fedoraproject.org  Tue Sep 22 16:31:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:31:54 +0000 (UTC)
Subject: rpms/rhnsd/devel - New directory
Message-ID: <20090922163154.43BCE11C0375@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rhnsd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBR6857/rpms/rhnsd/devel

Log Message:
Directory /cvs/pkgs/rpms/rhnsd/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 22 16:32:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:32:00 +0000 (UTC)
Subject: rpms/rhnsd Makefile,NONE,1.1
Message-ID: <20090922163200.A1B1C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rhnsd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBR6857/rpms/rhnsd

Added Files:
	Makefile 
Log Message:
Setup of module rhnsd


--- NEW FILE Makefile ---
# Top level Makefile for module rhnsd
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  Tue Sep 22 16:32:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:32:01 +0000 (UTC)
Subject: rpms/rhnsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090922163201.0BBD711C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rhnsd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBR6857/rpms/rhnsd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rhnsd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rhnsd
# $Id: Makefile,v 1.1 2009/09/22 16:32:00 kevin Exp $
NAME := rhnsd
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 pbrobinson at fedoraproject.org  Tue Sep 22 16:31:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 16:31:58 +0000 (UTC)
Subject: rpms/ekiga/devel .cvsignore, 1.23, 1.24 ekiga.spec, 1.86,
	1.87 sources, 1.25, 1.26
Message-ID: <20090922163158.0C7F911C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6897

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Ekiga 3.2.6 stable


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	6 Jul 2009 20:54:27 -0000	1.23
+++ .cvsignore	22 Sep 2009 16:31:57 -0000	1.24
@@ -1 +1 @@
-ekiga-3.2.5.tar.bz2
+ekiga-3.2.6.tar.bz2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- ekiga.spec	21 Aug 2009 13:14:25 -0000	1.86
+++ ekiga.spec	22 Sep 2009 16:31:57 -0000	1.87
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
-Version:	3.2.5
-Release:	4%{?dist}
+Version:	3.2.6
+Release:	1%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -19,8 +19,8 @@ BuildRequires:	avahi-glib-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
-BuildRequires:	ptlib-devel = 2.6.4
-BuildRequires:	opal-devel = 3.6.4
+BuildRequires:	ptlib-devel = 2.6.5
+BuildRequires:	opal-devel = 3.6.6
 BuildRequires:	libxml2-devel
 BuildRequires:	libXv-devel
 BuildRequires:	intltool >= 0.22
@@ -142,6 +142,10 @@ scrollkeeper-update -q || :
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.6-1
+- Ekiga 3.2.6 stable - Changelog
+  ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.2/ekiga-3.2.6.news
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.5-4
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	6 Jul 2009 20:54:27 -0000	1.25
+++ sources	22 Sep 2009 16:31:57 -0000	1.26
@@ -1 +1 @@
-a545490e03a6b49f00253bf0d692f362  ekiga-3.2.5.tar.bz2
+cce46bce30c0b59705bea4b81268abe6  ekiga-3.2.6.tar.bz2



From steve at fedoraproject.org  Tue Sep 22 16:33:13 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Tue, 22 Sep 2009 16:33:13 +0000 (UTC)
Subject: rpms/perl-Test-Class/EL-4 perl-Test-Class.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922163313.7F26011C00E8@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Class/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7651

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Class.spec 
Log Message:
Sync with devel branch.


--- NEW FILE perl-Test-Class.spec ---
Name:           perl-Test-Class
Version:        0.33
Release:        1%{?dist}
Summary:        Easily create test classes in an xUnit/JUnit style
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Class/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-Class-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Contextual::Return)
BuildRequires:  perl(Devel::Symdump) >= 2.03
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Builder) >= 0.78
BuildRequires:  perl(Test::Builder::Tester) >= 1.02
BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
BuildRequires:  perl(Test::Exception) >= 0.25
BuildRequires:  perl(Test::MinimumVersion) >= 0.008
BuildRequires:  perl(Test::More) >= 0.78
BuildRequires:  perl(Test::Pod) >= 1.26
Requires:       perl(Devel::Symdump) >= 2.03
Requires:       perl(Test::Exception) >= 0.25
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Class provides a simple way of creating classes and objects to test
your code in an xUnit style.

%prep
%setup -q -n Test-Class-%{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
AUTOMATED_TESTING=1 ./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 21 2009 Steven Pritchard <steve at kspei.com> 0.33-1
- Update to 0.33.
- Update Source0 URL.
- Add LICENSE.
- BR Test::Pod, Test::CPAN::Meta, and Test::MinimumVersion and define
  AUTOMATED_TESTING for better test coverage.

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Dec 10 2008 Steven Pritchard <steve at kspei.com> 0.31-1
- Update to 0.31.
- BR Test::Builder.
- Add versioned dependencies to Test::Builder::Tester and Test::More.

* Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.30-1
- Update to 0.30.

* Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-2
- rebuild for new perl

* Mon Jan 28 2008 Steven Pritchard <steve at kspei.com> 0.28-1
- Update to 0.28.
- Update License tag.
- Bump Test::Exception requirement to 0.25.

* Mon Jul 16 2007 Steven Pritchard <steve at kspei.com> 0.24-1
- Specfile autogenerated by cpanspec 1.71.
- BR Contextual::Return, Test::Builder::Tester, and Test::More.
- Drop explicit perl BR.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jul 2007 21:07:30 -0000	1.1
+++ .cvsignore	22 Sep 2009 16:33:13 -0000	1.2
@@ -0,0 +1 @@
+Test-Class-0.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jul 2007 21:07:30 -0000	1.1
+++ sources	22 Sep 2009 16:33:13 -0000	1.2
@@ -0,0 +1 @@
+becdbdfed6bf83611c82853b6506c77a  Test-Class-0.33.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 22 16:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:35:53 +0000
Subject: [pkgdb] ghc-xmonad-contrib was added for ynemoy
Message-ID: <20090922163553.6001B10F876@bastion2.fedora.phx.redhat.com>

kevin has added Package ghc-xmonad-contrib with summary Third party extensions for xmonad
kevin has approved Package ghc-xmonad-contrib
kevin has added a Fedora devel branch for ghc-xmonad-contrib with an owner of ynemoy
kevin has approved ghc-xmonad-contrib in Fedora devel
kevin has approved Package ghc-xmonad-contrib
kevin has set commit to Approved for 107427 on ghc-xmonad-contrib (Fedora devel)
kevin has set checkout to Approved for 107427 on ghc-xmonad-contrib (Fedora devel)
kevin has set build to Approved for 107427 on ghc-xmonad-contrib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-xmonad-contrib



From pkgdb at fedoraproject.org  Tue Sep 22 16:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:35:55 +0000
Subject: [pkgdb] ghc-xmonad-contrib summary updated by kevin
Message-ID: <20090922163555.ECEBF10F890@bastion2.fedora.phx.redhat.com>

kevin set package ghc-xmonad-contrib summary to Third party extensions for xmonad

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-xmonad-contrib



From pkgdb at fedoraproject.org  Tue Sep 22 16:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:35:55 +0000
Subject: [pkgdb] ghc-xmonad-contrib (Fedora, 11) updated by kevin
Message-ID: <20090922163556.0672D10F89B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ghc-xmonad-contrib (Fedora devel) for haskell-sig
kevin approved watchcommits on ghc-xmonad-contrib (Fedora devel) for haskell-sig
kevin approved watchbugzilla on ghc-xmonad-contrib (Fedora devel) for petersen
kevin approved watchcommits on ghc-xmonad-contrib (Fedora devel) for petersen
kevin approved commit on ghc-xmonad-contrib (Fedora devel) for petersen
kevin approved build on ghc-xmonad-contrib (Fedora devel) for petersen
kevin approved approveacls on ghc-xmonad-contrib (Fedora devel) for petersen
kevin approved watchbugzilla on ghc-xmonad-contrib (Fedora devel) for bos
kevin approved watchcommits on ghc-xmonad-contrib (Fedora devel) for bos
kevin approved commit on ghc-xmonad-contrib (Fedora devel) for bos
kevin approved build on ghc-xmonad-contrib (Fedora devel) for bos
kevin approved approveacls on ghc-xmonad-contrib (Fedora devel) for bos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-xmonad-contrib



From kevin at fedoraproject.org  Tue Sep 22 16:36:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:36:04 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib/devel - New directory
Message-ID: <20090922163604.40B5211C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-xmonad-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLf9099/rpms/ghc-xmonad-contrib/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-xmonad-contrib/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 22 16:36:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:36:04 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib - New directory
Message-ID: <20090922163604.1B35011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-xmonad-contrib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLf9099/rpms/ghc-xmonad-contrib

Log Message:
Directory /cvs/pkgs/rpms/ghc-xmonad-contrib added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 16:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:35:55 +0000
Subject: [pkgdb] ghc-xmonad-contrib (Fedora, 11) updated by kevin
Message-ID: <20090922163556.1B8FC10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ghc-xmonad-contrib
kevin has set commit to Approved for 107427 on ghc-xmonad-contrib (Fedora 11)
kevin has set checkout to Approved for 107427 on ghc-xmonad-contrib (Fedora 11)
kevin has set build to Approved for 107427 on ghc-xmonad-contrib (Fedora 11)
kevin approved watchbugzilla on ghc-xmonad-contrib (Fedora 11) for haskell-sig
kevin approved watchcommits on ghc-xmonad-contrib (Fedora 11) for haskell-sig
kevin approved watchbugzilla on ghc-xmonad-contrib (Fedora 11) for petersen
kevin approved watchcommits on ghc-xmonad-contrib (Fedora 11) for petersen
kevin approved commit on ghc-xmonad-contrib (Fedora 11) for petersen
kevin approved build on ghc-xmonad-contrib (Fedora 11) for petersen
kevin approved approveacls on ghc-xmonad-contrib (Fedora 11) for petersen
kevin approved watchbugzilla on ghc-xmonad-contrib (Fedora 11) for bos
kevin approved watchcommits on ghc-xmonad-contrib (Fedora 11) for bos
kevin approved commit on ghc-xmonad-contrib (Fedora 11) for bos
kevin approved build on ghc-xmonad-contrib (Fedora 11) for bos
kevin approved approveacls on ghc-xmonad-contrib (Fedora 11) for bos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-xmonad-contrib



From kevin at fedoraproject.org  Tue Sep 22 16:36:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:36:10 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib Makefile,NONE,1.1
Message-ID: <20090922163610.B1D3811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-xmonad-contrib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLf9099/rpms/ghc-xmonad-contrib

Added Files:
	Makefile 
Log Message:
Setup of module ghc-xmonad-contrib


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-xmonad-contrib
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  Tue Sep 22 16:36:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:36:11 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090922163611.2A78011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-xmonad-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLf9099/rpms/ghc-xmonad-contrib/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-xmonad-contrib


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-xmonad-contrib
# $Id: Makefile,v 1.1 2009/09/22 16:36:10 kevin Exp $
NAME := ghc-xmonad-contrib
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  Tue Sep 22 16:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:37:38 +0000
Subject: [pkgdb] education-bookmarks was added for mchua
Message-ID: <20090922163738.9846C10F861@bastion2.fedora.phx.redhat.com>

kevin has added Package education-bookmarks with summary Education SIG bookmarks
kevin has approved Package education-bookmarks
kevin has added a Fedora devel branch for education-bookmarks with an owner of mchua
kevin has approved education-bookmarks in Fedora devel
kevin has approved Package education-bookmarks
kevin has set commit to Approved for 107427 on education-bookmarks (Fedora devel)
kevin has set checkout to Approved for 107427 on education-bookmarks (Fedora devel)
kevin has set build to Approved for 107427 on education-bookmarks (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/education-bookmarks



From pkgdb at fedoraproject.org  Tue Sep 22 16:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:37:41 +0000
Subject: [pkgdb] education-bookmarks summary updated by kevin
Message-ID: <20090922163740.F1D9010F87E@bastion2.fedora.phx.redhat.com>

kevin set package education-bookmarks summary to Education SIG bookmarks

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/education-bookmarks



From pkgdb at fedoraproject.org  Tue Sep 22 16:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:37:41 +0000
Subject: [pkgdb] education-bookmarks (Fedora, 11) updated by kevin
Message-ID: <20090922163741.0899C10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for education-bookmarks
kevin has set commit to Approved for 107427 on education-bookmarks (Fedora 11)
kevin has set checkout to Approved for 107427 on education-bookmarks (Fedora 11)
kevin has set build to Approved for 107427 on education-bookmarks (Fedora 11)
kevin approved watchbugzilla on education-bookmarks (Fedora 11) for rdieter
kevin approved watchcommits on education-bookmarks (Fedora 11) for rdieter
kevin approved watchbugzilla on education-bookmarks (Fedora 11) for sdz
kevin approved watchcommits on education-bookmarks (Fedora 11) for sdz
kevin approved commit on education-bookmarks (Fedora 11) for sdz
kevin approved build on education-bookmarks (Fedora 11) for sdz
kevin approved approveacls on education-bookmarks (Fedora 11) for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/education-bookmarks



From pkgdb at fedoraproject.org  Tue Sep 22 16:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:37:41 +0000
Subject: [pkgdb] education-bookmarks (Fedora, 11) updated by kevin
Message-ID: <20090922163741.185DE10F89C@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on education-bookmarks (Fedora devel) for rdieter
kevin approved watchcommits on education-bookmarks (Fedora devel) for rdieter
kevin approved watchbugzilla on education-bookmarks (Fedora devel) for sdz
kevin approved watchcommits on education-bookmarks (Fedora devel) for sdz
kevin approved commit on education-bookmarks (Fedora devel) for sdz
kevin approved build on education-bookmarks (Fedora devel) for sdz
kevin approved approveacls on education-bookmarks (Fedora devel) for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/education-bookmarks



From kevin at fedoraproject.org  Tue Sep 22 16:37:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:37:49 +0000 (UTC)
Subject: rpms/education-bookmarks - New directory
Message-ID: <20090922163749.1948C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/education-bookmarks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspi9881/rpms/education-bookmarks

Log Message:
Directory /cvs/pkgs/rpms/education-bookmarks added to the repository




From pkgdb at fedoraproject.org  Tue Sep 22 16:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 16:37:41 +0000
Subject: [pkgdb] education-bookmarks (Fedora, 11) updated by kevin
Message-ID: <20090922163741.2489910F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for education-bookmarks
kevin has set commit to Approved for 107427 on education-bookmarks (Fedora 12)
kevin has set checkout to Approved for 107427 on education-bookmarks (Fedora 12)
kevin has set build to Approved for 107427 on education-bookmarks (Fedora 12)
kevin approved watchbugzilla on education-bookmarks (Fedora 12) for rdieter
kevin approved watchcommits on education-bookmarks (Fedora 12) for rdieter
kevin approved watchbugzilla on education-bookmarks (Fedora 12) for sdz
kevin approved watchcommits on education-bookmarks (Fedora 12) for sdz
kevin approved commit on education-bookmarks (Fedora 12) for sdz
kevin approved build on education-bookmarks (Fedora 12) for sdz
kevin approved approveacls on education-bookmarks (Fedora 12) for sdz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/education-bookmarks



From kevin at fedoraproject.org  Tue Sep 22 16:37:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:37:49 +0000 (UTC)
Subject: rpms/education-bookmarks/devel - New directory
Message-ID: <20090922163749.48F2E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/education-bookmarks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspi9881/rpms/education-bookmarks/devel

Log Message:
Directory /cvs/pkgs/rpms/education-bookmarks/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 22 16:37:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:37:56 +0000 (UTC)
Subject: rpms/education-bookmarks Makefile,NONE,1.1
Message-ID: <20090922163756.2B25A11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/education-bookmarks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspi9881/rpms/education-bookmarks

Added Files:
	Makefile 
Log Message:
Setup of module education-bookmarks


--- NEW FILE Makefile ---
# Top level Makefile for module education-bookmarks
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  Tue Sep 22 16:37:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 22 Sep 2009 16:37:56 +0000 (UTC)
Subject: rpms/education-bookmarks/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090922163756.B51B911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/education-bookmarks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspi9881/rpms/education-bookmarks/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module education-bookmarks


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: education-bookmarks
# $Id: Makefile,v 1.1 2009/09/22 16:37:56 kevin Exp $
NAME := education-bookmarks
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 mtasaka at fedoraproject.org  Tue Sep 22 16:40:36 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Sep 2009 16:40:36 +0000 (UTC)
Subject: rpms/wallpapoz/devel wallpapoz.spec,1.24,1.25
Message-ID: <20090922164036.5E97111C0423@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11473

Modified Files:
	wallpapoz.spec 
Log Message:
* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-11.svn92_trunk
- Explicitly add R: GConf2 (as wallpapoz really needs this)



Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- wallpapoz.spec	29 Aug 2009 17:02:06 -0000	1.24
+++ wallpapoz.spec	22 Sep 2009 16:40:34 -0000	1.25
@@ -39,6 +39,7 @@ BuildRequires:  gnome-python2
 %if 0%{?fedora} >= 10
 BuildRequires:  gnome-python2-gnome
 %endif
+Requires:       GConf2
 Requires:       pygtk2-libglade
 Requires:       python-imaging
 Requires:       gnome-python2
@@ -110,6 +111,9 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-11.svn92_trunk
+- Explicitly add R: GConf2 (as wallpapoz really needs this)
+
 * Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
 - Update to rev 92
 - Install desktop application autostart stuff on F-12+



From mtasaka at fedoraproject.org  Tue Sep 22 16:41:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Sep 2009 16:41:27 +0000 (UTC)
Subject: rpms/wallpapoz/devel wallpapoz.spec,1.25,1.26
Message-ID: <20090922164127.26C6111C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12099

Modified Files:
	wallpapoz.spec 
Log Message:
Fix EVR


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- wallpapoz.spec	22 Sep 2009 16:40:34 -0000	1.25
+++ wallpapoz.spec	22 Sep 2009 16:41:26 -0000	1.26
@@ -8,7 +8,7 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn92_trunk
-%define         fedorarel       10
+%define         fedorarel       11
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 



From pbrobinson at fedoraproject.org  Tue Sep 22 16:48:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 16:48:28 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.10, 1.11 mutter-moblin.spec, 
	1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20090922164828.B9CA111C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15133

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.39.1 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Sep 2009 22:06:56 -0000	1.10
+++ .cvsignore	22 Sep 2009 16:48:28 -0000	1.11
@@ -1 +1 @@
-mutter-moblin-0.39.0.tar.bz2
+mutter-moblin-0.39.1.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mutter-moblin.spec	21 Sep 2009 22:06:56 -0000	1.11
+++ mutter-moblin.spec	22 Sep 2009 16:48:28 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.39.0
+Version:        0.39.1
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.1-1
+- New 0.39.1 upstream release
+
 * Mon Sep 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.0-1
 - New 0.39.0 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Sep 2009 22:06:56 -0000	1.10
+++ sources	22 Sep 2009 16:48:28 -0000	1.11
@@ -1 +1 @@
-a11b1b5ec4d8878c6ccdf92fa4e87c84  mutter-moblin-0.39.0.tar.bz2
+2b8c66ed8ae5b6413ad1cd35a929a697  mutter-moblin-0.39.1.tar.bz2



From kaboon at fedoraproject.org  Tue Sep 22 16:50:25 2009
From: kaboon at fedoraproject.org (kaboon)
Date: Tue, 22 Sep 2009 16:50:25 +0000 (UTC)
Subject: rpms/rekonq/F-10 import.log,1.1,1.2
Message-ID: <20090922165025.CF63E11C0418@cvs1.fedora.phx.redhat.com>

Author: kaboon

Update of /cvs/pkgs/rpms/rekonq/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15890/F-10

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rekonq/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Sep 2009 11:14:32 -0000	1.1
+++ import.log	22 Sep 2009 16:50:25 -0000	1.2
@@ -1 +1,2 @@
 rekonq-0_2_0-3_fc11:HEAD:rekonq-0.2.0-3.fc11.src.rpm:1253358757
+rekonq-0_2_0-3_fc11:F-10:rekonq-0.2.0-3.fc11.src.rpm:1253638170



From spot at fedoraproject.org  Tue Sep 22 17:00:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Sep 2009 17:00:42 +0000 (UTC)
Subject: rpms/kscope/F-11 kscope.spec,1.10,1.11
Message-ID: <20090922170042.0B49011C0374@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/kscope/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20049

Modified Files:
	kscope.spec 
Log Message:
rebuild to fix package


Index: kscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/F-11/kscope.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kscope.spec	16 Mar 2009 18:35:54 -0000	1.10
+++ kscope.spec	22 Sep 2009 17:00:41 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		kscope
 Summary: 	QT front-end to Cscope
 Version:	1.9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://download.sourceforge.net/kscope/%{name}-%{version}.tar.gz
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/libkscope_editor.so
 
 %changelog
+* Tue Sep 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.4-2
+- rebuild to fix segfault, caused by dependency updates
+
 * Mon Mar 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.4-1
 - update to 1.9.4
 



From jussilehtola at fedoraproject.org  Tue Sep 22 17:26:07 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 17:26:07 +0000 (UTC)
Subject: rpms/pidgin-latex/F-11 pidgin-latex.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090922172607.DB2A311C0374@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28191/F-11

Modified Files:
	pidgin-latex.spec sources 
Log Message:
Update to 1.3.3.


Index: pidgin-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/F-11/pidgin-latex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-latex.spec	16 Jul 2009 14:51:20 -0000	1.2
+++ pidgin-latex.spec	22 Sep 2009 17:26:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		pidgin-latex
-Version:	1.3.2
+Version:	1.3.3
 Release:	1%{?dist}
 Summary:	Use LaTeX formulas in your pidgin conversations 
 Group:		Applications/Internet
@@ -43,6 +43,12 @@ rm -rf %{buildroot}
 %{_libdir}/pidgin/*.so
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.3-1
+- Update to 1.3.3.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.2-1
 - Update to 1.3.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 14:51:20 -0000	1.3
+++ sources	22 Sep 2009 17:26:07 -0000	1.4
@@ -1 +1 @@
-10def2b9f0ed000e6d32f0afc7a5e21d  pidgin-latex-1.3.2.tar.bz2
+ecd4d0865d8e5b7cbfb54a8e6ada2385  pidgin-latex-1.3.3.tar.bz2



From jussilehtola at fedoraproject.org  Tue Sep 22 17:26:07 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 17:26:07 +0000 (UTC)
Subject: rpms/pidgin-latex/EL-5 pidgin-latex.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090922172607.D43D911C00E8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28191/EL-5

Modified Files:
	pidgin-latex.spec sources 
Log Message:
Update to 1.3.3.


Index: pidgin-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/EL-5/pidgin-latex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-latex.spec	16 Jul 2009 14:51:20 -0000	1.2
+++ pidgin-latex.spec	22 Sep 2009 17:26:06 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		pidgin-latex
-Version:	1.3.2
+Version:	1.3.3
 Release:	1%{?dist}
 Summary:	Use LaTeX formulas in your pidgin conversations 
 Group:		Applications/Internet
@@ -43,6 +43,12 @@ rm -rf %{buildroot}
 %{_libdir}/pidgin/*.so
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.3-1
+- Update to 1.3.3.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.2-1
 - Update to 1.3.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 14:51:20 -0000	1.3
+++ sources	22 Sep 2009 17:26:06 -0000	1.4
@@ -1 +1 @@
-10def2b9f0ed000e6d32f0afc7a5e21d  pidgin-latex-1.3.2.tar.bz2
+ecd4d0865d8e5b7cbfb54a8e6ada2385  pidgin-latex-1.3.3.tar.bz2



From jussilehtola at fedoraproject.org  Tue Sep 22 17:26:07 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Sep 2009 17:26:07 +0000 (UTC)
Subject: rpms/pidgin-latex/F-10 pidgin-latex.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090922172607.D7D6C11C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28191/F-10

Modified Files:
	pidgin-latex.spec sources 
Log Message:
Update to 1.3.3.


Index: pidgin-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/F-10/pidgin-latex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-latex.spec	16 Jul 2009 14:51:20 -0000	1.2
+++ pidgin-latex.spec	22 Sep 2009 17:26:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		pidgin-latex
-Version:	1.3.2
+Version:	1.3.3
 Release:	1%{?dist}
 Summary:	Use LaTeX formulas in your pidgin conversations 
 Group:		Applications/Internet
@@ -43,6 +43,12 @@ rm -rf %{buildroot}
 %{_libdir}/pidgin/*.so
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.3-1
+- Update to 1.3.3.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.2-1
 - Update to 1.3.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 14:51:20 -0000	1.3
+++ sources	22 Sep 2009 17:26:07 -0000	1.4
@@ -1 +1 @@
-10def2b9f0ed000e6d32f0afc7a5e21d  pidgin-latex-1.3.2.tar.bz2
+ecd4d0865d8e5b7cbfb54a8e6ada2385  pidgin-latex-1.3.3.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 22 17:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:33:17 +0000
Subject: [pkgdb] python-mwclient: rdieter has requested commit
Message-ID: <20090922173317.3C8D910F810@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on python-mwclient (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:33:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:33:20 +0000
Subject: [pkgdb] python-mwclient: rdieter has requested approveacls
Message-ID: <20090922173320.D29BC10F87C@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on python-mwclient (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:33:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:33:22 +0000
Subject: [pkgdb] python-mwclient: rdieter has requested commit
Message-ID: <20090922173322.493C910F889@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on python-mwclient (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:33:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:33:23 +0000
Subject: [pkgdb] python-mwclient: rdieter has requested approveacls
Message-ID: <20090922173323.6A4AD10F897@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on python-mwclient (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:33:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:33:27 +0000
Subject: [pkgdb] python-mwclient: rdieter has requested approveacls
Message-ID: <20090922173327.AA2C310F89B@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on python-mwclient (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:33:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:33:27 +0000
Subject: [pkgdb] python-mwclient: rdieter has requested commit
Message-ID: <20090922173330.D238710F861@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on python-mwclient (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From simo at fedoraproject.org  Tue Sep 22 17:34:40 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 22 Sep 2009 17:34:40 +0000 (UTC)
Subject: rpms/samba4/devel samba4.spec,1.19,1.20
Message-ID: <20090922173440.2351511C00E8@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31362

Modified Files:
	samba4.spec 
Log Message:
* Thu Sep 17 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-18.1.alpha8_git20090916
- Need docbook stuff to build man pages



Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- samba4.spec	17 Sep 2009 17:16:10 -0000	1.19
+++ samba4.spec	22 Sep 2009 17:34:39 -0000	1.20
@@ -1,4 +1,4 @@
-%define main_release 18
+%define main_release 18.1
 %define samba4_version 4.0.0
 
 %define talloc_version 2.0.0
@@ -86,6 +86,8 @@ BuildRequires: readline-devel
 BuildRequires: sed
 BuildRequires: autoconf
 BuildRequires: openldap-devel
+BuildRequires: libxslt
+BuildRequires: docbook-style-xsl
 
 %if ! %enable_talloc
 BuildRequires: libtalloc-devel >= %{talloc_version}
@@ -847,6 +849,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 17 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-18.1.alpha8_git20090916
+- Need docbook stuff to build man pages
+
 * Thu Sep 17 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-18.alpha8_git20090916
 - Fix broken dependencies
 



From pkgdb at fedoraproject.org  Tue Sep 22 17:37:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:37:21 +0000
Subject: [pkgdb] python-mwclient had acl change status
Message-ID: <20090922173721.8E13810F861@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on python-mwclient (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:37:25 +0000
Subject: [pkgdb] python-mwclient had acl change status
Message-ID: <20090922173725.79D1010F87E@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on python-mwclient (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:37:35 +0000
Subject: [pkgdb] python-mwclient had acl change status
Message-ID: <20090922173735.6A29710F861@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on python-mwclient (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:37:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:37:39 +0000
Subject: [pkgdb] python-mwclient had acl change status
Message-ID: <20090922173739.B7E6010F89B@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on python-mwclient (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:40:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:40:03 +0000
Subject: [pkgdb] python-mwclient had acl change status
Message-ID: <20090922174003.795C110F876@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on python-mwclient (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From pkgdb at fedoraproject.org  Tue Sep 22 17:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 17:40:08 +0000
Subject: [pkgdb] python-mwclient had acl change status
Message-ID: <20090922174008.3030510F87E@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on python-mwclient (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-mwclient



From orion at fedoraproject.org  Tue Sep 22 17:41:29 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 22 Sep 2009 17:41:29 +0000 (UTC)
Subject: rpms/ncl/EL-5 import.log, NONE, 1.1 ncarg.csh, NONE, 1.1 ncarg.sh, 
	NONE, 1.1 ncl-5.0.0-udunits.patch, NONE,
	1.1 ncl-5.1.0-includes.patch, NONE, 1.1 ncl-5.1.0-netcdff.patch,
	NONE, 1.1 ncl-5.1.0-paths.patch, NONE, 1.1 ncl-5.1.0-ppc64.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 Site.local.ncl, 1.1,
	1.2 ncl-5.0.0-atlas.patch, 1.1, 1.2 ncl.spec, 1.1, 1.2 sources,
	1.2, 1.3 ncarg-4.4.2-ppc64.patch, 1.1, NONE ncl-5.0.0-flex.patch,
	1.1, NONE ncl-5.0.0-hdf.patch, 1.1, NONE ncl-5.0.0-netcdff.patch,
	1.1, NONE ncl-5.0.0-paths.patch, 1.1, NONE ncl-5.0.0-png.patch,
	1.1, NONE ncl-5.0.0-triangle.patch, 1.1,
	NONE ncl-5.0.0-wrapit.patch, 1.1, NONE
Message-ID: <20090922174129.6569F11C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1784/EL-5

Modified Files:
	.cvsignore Site.local.ncl ncl-5.0.0-atlas.patch ncl.spec 
	sources 
Added Files:
	import.log ncarg.csh ncarg.sh ncl-5.0.0-udunits.patch 
	ncl-5.1.0-includes.patch ncl-5.1.0-netcdff.patch 
	ncl-5.1.0-paths.patch ncl-5.1.0-ppc64.patch 
Removed Files:
	ncarg-4.4.2-ppc64.patch ncl-5.0.0-flex.patch 
	ncl-5.0.0-hdf.patch ncl-5.0.0-netcdff.patch 
	ncl-5.0.0-paths.patch ncl-5.0.0-png.patch 
	ncl-5.0.0-triangle.patch ncl-5.0.0-wrapit.patch 
Log Message:
Sync from devel - 5.1.1


--- NEW FILE import.log ---
ncl-5_1_1-3_fc12:EL-5:ncl-5.1.1-3.fc12.src.rpm:1253641252


--- NEW FILE ncarg.csh ---
setenv NCARG_ROOT /usr
setenv NCARG_LIB /usr/@LIB@/ncarg
setenv NCARG_DATABASE /usr/@LIB@/ncarg/database
setenv NCARG_FONTCAPS /usr/@LIB@/ncarg/fontcaps
setenv NCARG_GRAPHCAPS /usr/@LIB@/ncarg/graphcaps
setenv NCARG_NCARG /usr/share/ncarg


--- NEW FILE ncarg.sh ---
export NCARG_ROOT=/usr
export NCARG_LIB=/usr/@LIB@/ncarg
export NCARG_DATABASE=/usr/@LIB@/ncarg/database
export NCARG_FONTCAPS=/usr/@LIB@/ncarg/fontcaps
export NCARG_GRAPHCAPS=/usr/@LIB@/ncarg/graphcaps
export NCARG_NCARG=/usr/share/ncarg

ncl-5.0.0-udunits.patch:
 Project |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncl-5.0.0-udunits.patch ---
--- ncl_ncarg-5.0.0/config/Project.udunits	2008-12-08 15:35:46.000000000 -0700
+++ ncl_ncarg-5.0.0/config/Project	2008-12-08 15:50:44.000000000 -0700
@@ -328,7 +328,7 @@
 		"graphcaps",NULL,"ncarg",NULL,NULL,		\
 		"colormaps",NULL,"ncarg",NULL,NULL,		\
 		"rangs","NCARG_RANGS","database",NULL,NULL,	\
-		"udunits","UDUNITS_PATH","ncarg",NULL,NULL,	\
+		"udunits","UDUNITS_PATH",NULL,"/etc","udunits.dat",	\
 		"psadilookup","PSADILOOKUP_PATH",NULL,NULL,NULL,\
 		"examples",NULL,"ncarg",NULL,NULL,		\
 		"hluex",NULL,"ncarg",NULL,NULL,			\

ncl-5.1.0-includes.patch:
 common/src/bin/ncargpath/ncargpath.c      |    1 
 common/src/libncarg_c/bcopyswap.c         |    1 
 ncarg2d/src/libncarg/areasC/c_argeti.c    |    1 
 ncarg2d/src/libncarg/ncargC.h             |    6 ++
 ncarg2d/src/libncarg/plotchar/bofred.c    |    4 +
 ncarview/src/lib/libctrans/buffer.c       |    4 -
 ncarview/src/lib/libctrans/buffer.h       |   37 +++++++++++++++
 ncarview/src/lib/libctrans/default.c      |   12 ++---
 ncarview/src/lib/libctrans/default.h      |   70 ++++++++++++++++++++++++++++++
 ncarview/src/lib/libctrans/gcaprast.c     |    6 +-
 ncarview/src/lib/libctrans/in.h           |    4 +
 ncarview/src/lib/libctrans/misc.c         |    2 
 ncarview/src/lib/libctrans/misc.h         |   31 +++++++++++++
 ncarview/src/lib/libctrans/rast.c         |   10 ++--
 ncarview/src/lib/libncarg_ras/misc.c      |    3 +
 ncarview/src/lib/libncarg_ras/misc.h      |   41 +++++++++++++++++
 ncarview/src/lib/libncarg_ras/raster.c    |    2 
 ncarview/src/lib/libncarg_ras/sunraster.c |   10 ++--
 18 files changed, 225 insertions(+), 20 deletions(-)

--- NEW FILE ncl-5.1.0-includes.patch ---
--- ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c.includes	2000-08-21 22:03:31.000000000 -0600
+++ ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c	2008-03-21 11:01:12.000000000 -0600
@@ -33,6 +33,7 @@
  *		of 4.
  */
 #include <stdio.h>
+#include <stdlib.h>
 
 bcopyswap(b1, b2, size)
 	char	*b1;
--- ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c.includes	2000-08-21 22:04:15.000000000 -0600
+++ ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c	2008-03-21 11:02:16.000000000 -0600
@@ -41,6 +41,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ncarg/c.h>
 
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c.includes	2000-08-22 09:05:20.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c	2008-03-21 11:04:17.000000000 -0600
@@ -25,6 +25,10 @@
 ************************************************************************/
 
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <ncarg/c.h>
 
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c.includes	2000-08-22 09:02:06.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c	2008-03-21 11:05:46.000000000 -0600
@@ -24,6 +24,7 @@
 *                                                                       *
 ************************************************************************/
 
+#include <string.h>
 #include <ncarg/ncargC.h>
 
 extern void NGCALLF(argeti,ARGETI)(NGstring,int*,int);
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h.includes	2008-03-21 11:10:43.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h	2008-03-21 11:10:25.000000000 -0600
@@ -176,6 +176,12 @@
 #endif
 );
 
+extern void NGCALLF(agback,AGBACK)(
+#ifdef  NeedFuncProto
+    void
+#endif
+);
+
 extern char *c_agbnch(
 #ifdef  NeedFuncProto
     int idsh
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c.includes	2000-08-22 09:12:16.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c	2008-04-10 14:53:26.000000000 -0600
@@ -48,6 +48,7 @@
  *		
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -518,6 +519,7 @@
  *		RAS_ERROR or RAS_EOF if something went wrong.
  *		
  *********************************************************************/
+int
 RasterLoadPalette(ras, colors)
 	Raster		*ras;
 	unsigned char	colors[768];
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c.includes	2000-08-22 09:12:12.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c	2008-04-10 14:57:14.000000000 -0600
@@ -71,6 +71,7 @@
 
 /* Swiped from John Clyne */
 
+void
 _swapshort (bp, n)
     register char *bp;
     register unsigned n;
@@ -86,6 +87,7 @@
     }
 }
 
+void
 _swaplong (bp, n)
     register char *bp;
     register unsigned n;
@@ -112,6 +114,7 @@
  *
  *	Return the number of images in a file. Return -1 on error
  */
+int
 ImageCount_(name, format)
 	char	*name;
 	char	*format;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h.includes	2008-04-10 14:57:41.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h	2008-04-10 15:00:16.000000000 -0600
@@ -0,0 +1,41 @@
+/*
+ *	$Id$
+ */
+/************************************************************************
+*                                                                       *
+*                Copyright (C)  2000                                    *
+*        University Corporation for Atmospheric Research                *
+*                All Rights Reserved                                    *
+*                                                                       *
+* This file is free software; you can redistribute it and/or modify     *
+* it under the terms of the GNU General Public License as published     *
+* by the Free Software Foundation; either version 2 of the License, or  *
+* (at your option) any later version.                                   *
+*                                                                       *
+* This software 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 software; if not, write to the Free Software         *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307   *
+* USA.                                                                  *
+*                                                                       *
+************************************************************************/
+
+/***********************************************************************
+*                                                                      *
+*                          Copyright (C)  1991                         *
+*            University Corporation for Atmospheric Research           *
+*                          All Rights Reserved                         *
+*                                                                      *
+*                                                                      *
+***********************************************************************/
+/*	File:	misc.h
+ */
+
+int read_swap(FILE *fp, int nb, char *buf, int swapflag);
+void _swapshort (register char *bp, register unsigned n);
+void _swaplong (register char *bp, register unsigned n);
+int ImageCount_(char *name, char *format);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c.includes	2008-04-10 15:29:16.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c	2008-04-10 15:28:57.000000000 -0600
@@ -76,7 +76,7 @@
 /*
  *	Flushes out the output buffer. Called at the end of a picture.
  */
-flush()
+void	flush()
 {
 	(void)write(outFD,outbuf,outbufnum);
 	outbufnum = 0;
@@ -86,7 +86,7 @@
  *	Copies the "count" number of chars from "str" into the output buffer,
  *	flushing the buffer if need be.
  */
-buffer(str,count)
+void	buffer(str,count)
 	SignedChar 	*str;
 	int  		count;
 {
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h.includes	2008-04-10 15:29:29.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h	2008-04-10 15:31:08.000000000 -0600
@@ -0,0 +1,37 @@
+/*
+ *	$Id$
+ */
+/************************************************************************
+*                                                                       *
+* This file is free software; you can redistribute it and/or modify     *
+* it under the terms of the GNU General Public License as published     *
+* by the Free Software Foundation; either version 2 of the License, or  *
+* (at your option) any later version.                                   *
+*                                                                       *
+* This software 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 software; if not, write to the Free Software         *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307   *
+* USA.                                                                  *
+*                                                                       *
+************************************************************************/
+
+/***********************************************************************
+*                                                                      *
+*                          Copyright (C)  1990                         *
+*            University Corporation for Atmospheric Research           *
+*                          All Rights Reserved                         *
+*                                                                      *
+*                      NCAR View V3.01 - UNIX Release                  *
+*                                                                      *
+***********************************************************************/
+
+#include "ctrandef.h"
+
+int	GcapOpenBuffer(char *file);
+void	flush(void);
+void	buffer(SignedChar *str, int count);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c.includes	2000-08-22 09:11:45.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c	2008-04-10 15:15:45.000000000 -0600
@@ -99,7 +99,7 @@
 
 
 
-InitDefault()
+void	InitDefault()
 {
 	static	boolean	isInit = FALSE;
 	int	max_intensity = (1 << DCP) - 1;
@@ -173,7 +173,7 @@
 	colorLUTable.damage = FALSE;
 }
 
-SetInPic(value)
+void	 SetInPic(value)
 boolean		value;
 {
 	int	i;
@@ -1290,7 +1290,7 @@
 /*
  *	set mininum line width
  */
-SetMinLineWidthDefault(line_width)
+void SetMinLineWidthDefault(line_width)
 	float	line_width;
 {
 
@@ -1315,7 +1315,7 @@
 /*
  *	Set Maximum line width.
  */
-SetMaxLineWidthDefault(line_width)
+void SetMaxLineWidthDefault(line_width)
 	float	line_width;
 {
 	defaulttable.line_width = MIN(line_width, defaulttable.line_width);
@@ -1330,7 +1330,7 @@
 /*
  *	set additional line scaling
  */
-SetAdditionalLineScale(line_scale)
+void SetAdditionalLineScale(line_scale)
 	float	line_scale;
 {
 	LINE_WIDTH_DAMAGE = TRUE;
@@ -1344,7 +1344,7 @@
 /*
  *	set rgb intensity scaling
  */
-SetRGBIntensityScale(rgb_scale)
+void SetRGBIntensityScale(rgb_scale)
 	float	rgb_scale;
 {
 	COLOUR_TABLE_DAMAGE = TRUE;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h.includes	2000-08-21 21:30:26.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h	2008-04-10 15:26:23.000000000 -0600
@@ -454,3 +454,73 @@
 #define	COLOUR_INDEX_RED(I)	(clut->ce[(I)].rgb.red)
 #define	COLOUR_INDEX_GREEN(I)	(clut->ce[(I)].rgb.green)
 #define	COLOUR_INDEX_BLUE(I)	(clut->ce[(I)].rgb.blue)
+
+void	InitDefault(void);
+void	_CtDefNoColorDefault(void);
+void	 SetInPic(boolean  value);
+int MFVersion(CGMC *c);
+int MFDesc(CGMC *c);
+int VDCType(CGMC *c);
+int IntergerPrec(CGMC *c);
+int RealPrec(CGMC *c);
+int IndexPrec(CGMC *c);
+int ColrPrec(CGMC *c);
+int ColrIndexPrec(CGMC *c);
+int MaxColrIndex(CGMC *c);
+int ColrValueExt(CGMC *c);
+int MFElemList(CGMC *c);
+int MFDefaults(CGMC *c);
+int CharSetList(CGMC *c);
+int CharCoding(CGMC *c);
+int ScaleMode(CGMC *c);
+int ColrMode(CGMC *c);
+int LineWidthMode(CGMC *c);
+int MarkerSizeMode(CGMC *c);
+int EdgeWidthMode(CGMC *c);
+int VDCExt(CGMC *c);
+int BackColr(CGMC *c);
+int VDCIntergerPrec(CGMC *c);
+int VDCRealPrec(CGMC *c);
+int AuxColr(CGMC *c);
+int Transparency(CGMC *c);
+int ClipRect(CGMC *c);
+int Clip(CGMC *c);
+int LineIndex(CGMC *c);
+int LineType(CGMC *c);
+int LineWidth(CGMC *c);
+int LineColr(CGMC *c);
+int MarkerIndex(CGMC *c);
+int MarkerType(CGMC *c);
+int MarkerSize(CGMC *c);
+int MarkerColr(CGMC *c);
+int TextIndex(CGMC *c);
+int TextFontIndex(CGMC *c);
+int TextPrec(CGMC *c);
+int CharExpan(CGMC *c);
+int CharSpace(CGMC *c);
+int TextColr(CGMC *c);
+int CharHeight(CGMC *c);
+int CharOri(CGMC *c);
+int TextPath(CGMC *c);
+int TextAlign(CGMC *c);
+int CharSetIndex(CGMC *c);
+int AltCharSetIndex(CGMC *c);
+int FillIndex(CGMC *c);
+int IntStyle(CGMC *c);
+int FillColr(CGMC *c);
+int HatchIndex(CGMC *c);
+int PatIndex(CGMC *c);
+int EdgeIndex(CGMC *c);
+int EdgeType(CGMC *c);
+int EdgeWidth(CGMC *c);
+int EdgeColr(CGMC *c);
+int EdgeVis(CGMC *c);
+int FillRefPt(CGMC *c);
+int PatTable(CGMC *c);
+int PatSize(CGMC *c);
+int ColrTable(CGMC *c);
+int ASF(CGMC *c);
+void SetMinLineWidthDefault(float line_width);
+void SetMaxLineWidthDefault(float line_width);
+void SetAdditionalLineScale(float line_scale);
+void SetRGBIntensityScale(float rgb_scale);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c.includes	2000-08-22 09:11:48.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c	2008-04-10 15:32:49.000000000 -0600
@@ -44,6 +44,7 @@
 
 #include	<stdio.h>
 #include	<stdlib.h>
+#include	<string.h>
 #include	<errno.h>
 #include	<ncarg/c.h>
 #include	"cgmc.h"
@@ -52,9 +53,8 @@
 #include	"ctrandef.h"
 #include	"translate.h"
 #include	"bitops.h"
-
-
-
+#include	"buffer.h"
+#include	"format.h"
 
 static	boolean	Runlength;	/* true if device wants run length encoded
 				 * pixel map
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h.includes	2008-04-10 15:08:11.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h	2008-04-10 15:08:42.000000000 -0600
@@ -29,6 +29,9 @@
 *                      NCAR View V3.00 - UNIX Release                  *
 *                                                                      *
 ***********************************************************************/
+
+#include "cgmc.h"
+
 #define	BUFSIZE 	1440	/*size of CGM buffer in bytes	*/
 #define N 		-1	/*flag indicating any integer value	*/
 #define STDIN		0
@@ -72,4 +75,5 @@
 				 */
          };
 
+int Instr_Dec(CGMC *cgmc);
 
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c.includes	2000-08-22 09:11:50.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c	2008-04-10 15:09:55.000000000 -0600
@@ -36,7 +36,7 @@
  *	Description:	miscellaneous ctrans funcions
  */
 
-CoordStringToInt(s, llx, lly, urx, ury)
+int CoordStringToInt(s, llx, lly, urx, ury)
 	char	*s;
 	int	*llx, *lly, *urx, *ury;
 {
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h.includes	2008-04-10 15:10:15.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h	2008-04-10 15:11:11.000000000 -0600
@@ -0,0 +1,31 @@
+/*
+ *      $Id$
+ */
+/************************************************************************
+*                                                                       *
+*                          Copyright (C)  1992                          *
+*            University Corporation for Atmospheric Research            *
+*                          All Rights Reserved                          *
+*                                                                       *
+* This file is free software; you can redistribute it and/or modify     *
+* it under the terms of the GNU General Public License as published     *
+* by the Free Software Foundation; either version 2 of the License, or  *
+* (at your option) any later version.                                   *
+*                                                                       *
+* This software 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 software; if not, write to the Free Software         *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307   *
+* USA.                                                                  *
+*                                                                       *
+************************************************************************/
+
+/*
+ *	File:		misc.h
+ */
+
+int CoordStringToInt(char *s, int *llx, int *lly, int *urx, int *ury);
--- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c.includes	2005-08-03 15:14:16.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c	2008-04-10 16:02:40.000000000 -0600
@@ -30,6 +30,7 @@
 *                                                                      *
 ***********************************************************************/
 		
+#include "in.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -44,6 +45,7 @@
 #include "ctrandef.h"
 #include "default.h"
 #include "devices.h"
+#include "misc.h"
 
 extern	boolean	*softFill;
 extern	boolean	deviceIsInit;
@@ -104,7 +106,7 @@
 Raster	*rastGrid;		/* struct for creating output file	*/
 boolean	rasIsDirect;		/* direct encoded image?		*/
 
-static	build_ras_arg(ras_argc, ras_argv, rast_opts)
+static	int build_ras_arg(ras_argc, ras_argv, rast_opts)
 	int	*ras_argc;
 	char	**ras_argv;
 	struct	Opts rast_opts;
@@ -166,7 +168,7 @@
 }
 
 
-static	clear_grid(grid)
+static	void clear_grid(grid)
 	Raster	*grid;
 {
 	if (rasIsDirect) {
@@ -184,7 +186,7 @@
 	}
 }
 
-static	init_color_tab()
+static	void init_color_tab()
 {
 
 	/*
@@ -198,7 +200,7 @@
 	
 #define DEFAULT_WIDTH   512	/* default raster width         */
 #define DEFAULT_HEIGHT  512	/* default raster height        */
-get_resolution(dev_extent, opts, name)
+void get_resolution(dev_extent, opts, name)
 	CoordRect	*dev_extent;
 	struct	Opts opts;
 	char	*name;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c.includes	2000-08-22 09:12:19.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c	2008-04-10 17:02:27.000000000 -0600
@@ -59,8 +59,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "ncarg_ras.h"
 #include "sunraster.h"
+#include "misc.h"
 
 static char	*FormatName = "sun";
 
@@ -235,18 +237,18 @@
 		dep = (SunInfo *) ras->dep;
 	}
 
-	nb = write(ras->fd, (char *) dep, sizeof(SunInfo));
+	nb = write(ras->fd, dep, sizeof(SunInfo));
 	if (nb != sizeof(SunInfo)) return(RAS_EOF);
 
 	/* Write the color table. */
 
-	nb = write(ras->fd, (char *) ras->red, ras->ncolor);
+	nb = write(ras->fd, ras->red, ras->ncolor);
 	if (nb != ras->ncolor) return(RAS_EOF);
 
-	nb = write(ras->fd, (char *) ras->green, ras->ncolor);
+	nb = write(ras->fd, ras->green, ras->ncolor);
 	if (nb != ras->ncolor) return(RAS_EOF);
 
-	nb = write(ras->fd, (char *) ras->blue, ras->ncolor);
+	nb = write(ras->fd, ras->blue, ras->ncolor);
 	if (nb != ras->ncolor) return(RAS_EOF);
 
 	/*

ncl-5.1.0-netcdff.patch:
 nhlf77.csh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncl-5.1.0-netcdff.patch ---
--- ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh.orig	2008-02-06 17:22:03.000000000 -0700
+++ ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh	2009-03-05 12:02:11.000000000 -0700
@@ -65,7 +65,7 @@
 
   case "-netcdf":
   case "-cdf":
-    set extra_libs = "$extra_libs SED_NCDFLIBS"
+    set extra_libs = "$extra_libs SED_NCDFLIBS -lnetcdff"
     breaksw
 
   case "-hdf":

ncl-5.1.0-paths.patch:
 Project  |   14 ++++++++------
 Template |   17 +++++++++++++++++
 ymake    |    7 +++++++
 3 files changed, 32 insertions(+), 6 deletions(-)

--- NEW FILE ncl-5.1.0-paths.patch ---
diff -up ncl_ncarg-5.0.0/config/ymake.paths ncl_ncarg-5.0.0/config/ymake
--- ncl_ncarg-5.0.0/config/ymake.paths	2006-05-02 16:16:20.000000000 +0200
+++ ncl_ncarg-5.0.0/config/ymake	2008-02-01 15:19:00.000000000 +0100
@@ -185,6 +185,13 @@ if ($useinstalled != 0) then
         endif
         set defines = ($defines -D_InstBin\=$bin_dir)
 
+        set share_dir = `ncargpath share`
+        if ($status != 0) then
+                echo "$0 : Unable to find NCARG_SHARE dir" > /dev/tty
+                exit 1
+        endif
+        set defines = ($defines -D_InstShare\=$share_dir)
+
         set inc_dir = `ncargpath include`
         if ($status != 0) then
                 echo "$0 : Unable to find NCARG_INCLUDE dir" > /dev/tty
diff -up ncl_ncarg-5.0.0/config/Template.paths ncl_ncarg-5.0.0/config/Template
--- ncl_ncarg-5.0.0/config/Template.paths	2005-08-19 19:32:45.000000000 +0200
+++ ncl_ncarg-5.0.0/config/Template	2008-02-01 15:19:00.000000000 +0100
@@ -160,6 +160,14 @@ NGCOMM##################################
 #endif	/* _IgnoreYmakeRoot */
 #endif	/* BinRoot */
 
+#ifndef	ShareRoot
+#ifndef	_IgnoreYmakeRoot
+#define	ShareRoot	YmakeRoot/share
+#else
+#define	ShareRoot	_InstShare
+#endif	/* _IgnoreYmakeRoot */
+#endif	/* ShareRoot */
+
 #ifndef	LibRoot
 #ifndef	_IgnoreYmakeRoot
 #define LibRoot YmakeRoot/lib
@@ -210,6 +218,14 @@ NGCOMM##################################
 #endif
 #endif
 
+#ifndef	SharePath
+#ifdef	_UseRootPath
+#define	SharePath	RootPath/share
+#else
+#define	SharePath	ShareRoot
+#endif
+#endif
+
 #ifndef	LibPath
 #ifdef	_UseRootPath
 #define	LibPath	RootPath/lib
@@ -573,6 +589,7 @@ MANROOT			= ManRoot
 TMPROOT			= TmpRoot
 
 ROOTPATH		= RootPath
+SHAREPATH		= SharePath
 BINPATH			= BinPath
 LIBPATH			= LibPath
 INCPATH			= IncPath
diff -up ncl_ncarg-5.0.0/config/Project.paths ncl_ncarg-5.0.0/config/Project
--- ncl_ncarg-5.0.0/config/Project.paths	2007-10-11 18:38:32.000000000 +0200
+++ ncl_ncarg-5.0.0/config/Project	2008-02-01 15:19:00.000000000 +0100
@@ -227,7 +227,8 @@ ROBJDIR			= robj
 WWWDIR			= ngwww
 XAPPDIR			= xapp
 
-LIBNCARGROOT		= $(LIBROOT)/$(NCARGDIR)
+LIBNCARGROOT		= $(SHAREPATH)/$(NCARGDIR)
+LIBNCARGARCH		= $(LIBPATH)/$(NCARGDIR)
 CONFIGROOT		= $(LIBNCARGROOT)/$(CONFIGDIR)
 DBROOT			= $(LIBNCARGROOT)/$(DBDIR)
 FONTCAPROOT		= $(LIBNCARGROOT)/$(FONTCAPDIR)
@@ -235,7 +236,7 @@ GRAPHCAPROOT		= $(LIBNCARGROOT)/$(GRAPHC
 DATAROOT		= $(LIBNCARGROOT)/$(DATADIR)
 DOCROOT			= $(LIBNCARGROOT)/$(DOCDIR)
 EXAMPLESROOT		= $(LIBNCARGROOT)/$(EXAMPLESDIR)
-ROBJROOT		= $(LIBNCARGROOT)/$(ROBJDIR)
+ROBJROOT		= $(LIBNCARGARCH)/$(ROBJDIR)
 TESTSROOT		= $(LIBNCARGROOT)/$(TESTSDIR)
 TUTORIALROOT		= $(LIBNCARGROOT)/$(TUTORIALDIR)
 WWWROOT			= $(LIBNCARGROOT)/$(WWWDIR)
@@ -244,7 +245,7 @@ HLUEXROOT		= $(LIBNCARGROOT)/$(HLUEXDIR)
 RESFILEROOT		= $(LIBNCARGROOT)/$(RESDIR)
 NCLEXROOT		= $(LIBNCARGROOT)/$(NCLEXDIR)
 GRIB2CODETABLEROOT	= $(LIBNCARGROOT)/$(GRIB2CODETABLEDIR)
-LIBNCARGPATH		= $(LIBPATH)/$(NCARGDIR)
+LIBNCARGPATH		= $(SHAREPATH)/$(NCARGDIR)
 CONFIGPATH		= $(LIBNCARGPATH)/$(CONFIGDIR)
 DBPATH			= $(LIBNCARGPATH)/$(DBDIR)
 FONTCAPPATH		= $(LIBNCARGPATH)/$(FONTCAPDIR)
@@ -252,7 +253,7 @@ GRAPHCAPPATH		= $(LIBNCARGPATH)/$(GRAPHC
 DATAPATH		= $(LIBNCARGPATH)/$(DATADIR)
 DOCPATH			= $(LIBNCARGPATH)/$(DOCDIR)
 EXAMPLESPATH		= $(LIBNCARGPATH)/$(EXAMPLESDIR)
-ROBJPATH		= $(LIBNCARGPATH)/$(ROBJDIR)
+ROBJPATH		= $(LIBNCARGARCH)/$(ROBJDIR)
 TESTSPATH		= $(LIBNCARGPATH)/$(TESTSDIR)
 TUTORIALPATH		= $(LIBNCARGPATH)/$(TUTORIALDIR)
 WWWPATH			= $(LIBNCARGPATH)/$(WWWDIR)
@@ -314,10 +315,11 @@ NGENV_DESCRIPT	= \
 		"usrresfile",NULL,NULL,$(USRRESFILE),NULL,	\
 		"gks_output",NULL,NULL,"gmeta",NULL,		\
 		"bin",NULL,"root",NULL,NULL,			\
-		"lib",NULL,"root",NULL,NULL,			\
+		"lib",NULL,NULL,"$(LIBROOT)",NULL,			\
 		"include",NULL,"root",NULL,NULL,		\
+		"share",NULL,"root",NULL,NULL,			\
 		"man",NULL,"root",NULL,NULL,			\
-		"ncarg",NULL,"lib",NULL,NULL,			\
+		"ncarg",NULL,"share",NULL,NULL,			\
 		"config",NULL,"ncarg",NULL,NULL,		\
 		"data",NULL,"ncarg",NULL,NULL,			\
 		"database",NULL,"ncarg",NULL,NULL,		\

ncl-5.1.0-ppc64.patch:
 ymake |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE ncl-5.1.0-ppc64.patch ---
--- ncl_ncarg-5.1.0/config/ymake.ppc64	2009-03-05 10:54:12.000000000 -0700
+++ ncl_ncarg-5.1.0/config/ymake	2009-03-05 10:57:27.000000000 -0700
@@ -372,19 +372,13 @@
 	case    amd64:
         case    i*64:
         case    x*64:
-        case    p*64:
+        case    ppc*:
         case    alpha:
             set model   = $mach
             set arch    = $mach
             set sysincs = LINUX
             set vendor  = IBM
             breaksw
-        case    ppc:
-            set model   = $mach
-            set arch    = $mach
-            set sysincs = YDLINUX
-            set vendor  = APPLE
-            breaksw
         default:
             echo "$0 : Unknown machine type" > /dev/tty
             exit 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Feb 2008 23:32:56 -0000	1.2
+++ .cvsignore	22 Sep 2009 17:41:27 -0000	1.3
@@ -1 +1 @@
-ncl_ncarg_src-5.0.0.tar.gz
+ncl_ncarg_src-5.1.1.tar.gz


Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/Site.local.ncl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Site.local.ncl	28 Feb 2008 23:32:56 -0000	1.1
+++ Site.local.ncl	22 Sep 2009 17:41:27 -0000	1.2
@@ -7,10 +7,9 @@
 #define IncSearch -I/usr/include/netcdf-3
 #define LibSearch -L at libdir@/hdf
 
-#define BuildUdunits TRUE
-#define UdUnitslib
-#define BuildV5D FALSE
-#define BuildHDFEOS FALSE
+#define BuildNetCDF4 0
+#define BuildV5D 0
+#define BuildHDFEOS 0
 #define BuildTRIANGLE 0
 #define V5Dlib
-#define BuildDODS TRUE
+#define BuildDODS 1

ncl-5.0.0-atlas.patch:
 Project |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: ncl-5.0.0-atlas.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/ncl-5.0.0-atlas.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncl-5.0.0-atlas.patch	28 Feb 2008 23:32:56 -0000	1.1
+++ ncl-5.0.0-atlas.patch	22 Sep 2009 17:41:27 -0000	1.2
@@ -6,8 +6,8 @@
  NCLAPILIB	= -lNGncl
 -BLASLIB	        = -lblas_ncl
 -LAPACKLIB       = -llapack_ncl
-+BLASLIB	        = -lblas
-+LAPACKLIB       = -llapack
++BLASLIB	        = -lcblas -lf77blas -lptf77blas
++LAPACKLIB       = -llapack -latlas
  SPHERELIB	= -lsphere3.1_dp
  FFTPACK5LIB	= -lfftpack5_dp
  
@@ -17,8 +17,8 @@
  NCLAPILIB	= _UseLib(-L$(NCLLIBSRC),-lnclapi)
 -BLASLIB         = _UseLib(-L$(BLASSRC),-lblas_ncl)
 -LAPACKLIB       = _UseLib(-L$(LAPACKSRC),-llapack_ncl)
-+BLASLIB         = _UseLib(-L%LIBDIR%/atlas,-lblas)
-+LAPACKLIB       = _UseLib(-L%LIBDIR%/atlas,-llapack)
++BLASLIB         = _UseLib(-L%LIBDIR%/atlas,-lcblas -lf77blas -lptf77blas)
++LAPACKLIB       = _UseLib(-L%LIBDIR%/atlas,-llapack -latlas)
  SPHERELIB	= _UseLib(-L$(SPHERESRC),-lsphere3.1_dp)
  FFTPACK5LIB	= _UseLib(-L$(FFTPACK5SRC),-lfftpack5_dp)
  


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/ncl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncl.spec	28 Feb 2008 23:32:56 -0000	1.1
+++ ncl.spec	22 Sep 2009 17:41:28 -0000	1.2
@@ -1,14 +1,16 @@
 Name:           ncl
-Version:        5.0.0
-Release:        9%{?dist}
+Version:        5.1.1
+Release:        3%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://www.ncl.ucar.edu
 # You must register for a free account at http://www.earthsystemgrid.org/ before being able to download the source.
-Source0:        http://datanode.ucar.edu/data/xserve/ncl/5.0.0/binaries/source/ncl_ncarg_src-5.0.0.tar.gz
+Source0:        ncl_ncarg_src-%{version}.tar.gz
 Source1:        Site.local.ncl
+Source2:        ncarg.csh
+Source3:        ncarg.sh
 
 # ymake uses cpp with some defines on the command line to generate a 
 # Makefile which consists in:
@@ -24,22 +26,20 @@ Source1:        Site.local.ncl
 #
 # install paths are set up in Project. Paths used in code are also in 
 # Project, in NGENV_DESCRIPT.
-Patch0:         ncl-5.0.0-paths.patch
+Patch0:         ncl-5.1.0-paths.patch
 Patch1:         ncarg-4.4.1-deps.patch
-Patch2:         ncarg-4.4.2-ppc64.patch
-Patch4:         ncl-5.0.0-triangle.patch
-Patch5:         ncl-5.0.0-flex.patch
-Patch6:         ncl-5.0.0-hdf.patch
+Patch2:         ncl-5.1.0-ppc64.patch
 Patch7:         ncl-5.0.0-atlas.patch
-Patch8:         ncl-5.0.0-png.patch
-Patch9:         ncl-5.0.0-wrapit.patch
 # don't have the installation target depends on the build target since
 # for library it implies running ranlib and modifying the library timestamp
 Patch10:        ncl-5.0.0-no_install_dep.patch
 # put install and build rules before script rules such that the default rule
 # is all
 Patch11:        ncl-5.0.0-build_n_scripts.patch
-Patch12:        ncl-5.0.0-netcdff.patch
+Patch12:        ncl-5.1.0-netcdff.patch
+Patch13:        ncl-5.1.0-includes.patch
+# Use /etc/udunits.dat
+Patch15:        ncl-5.0.0-udunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
@@ -47,6 +47,9 @@ BuildRequires:  g2clib-devel, libnc-dap-
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
 BuildRequires:  byacc, flex
+BuildRequires:  udunits-devel
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       udunits
 
 Provides:       ncarg = %{version}-%{release}
 Obsoletes:      ncarg < %{version}-%{release}
@@ -70,6 +73,18 @@ The software comes with a couple of usef
     files to netCDF formatted files. 
 
 
+%package common
+Summary:        Common files for NCL and NCAR Graphics
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:      noarch
+%endif
+
+%description common
+%{summary}.
+
+
 %package devel
 Summary:        Development files for NCL and NCAR Graphics
 Group:          Development/Libraries
@@ -87,6 +102,9 @@ Obsoletes:      ncarg-devel < %{version}
 Summary:        Example programs and data using NCL
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:      noarch
+%endif
 
 %description examples
 Example programs and data using NCL.
@@ -94,31 +112,23 @@ Example programs and data using NCL.
 
 %prep
 %setup -q -n ncl_ncarg-%{version}
-#%patch0 -p1 -b .rpmroot
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .deps
 %patch2 -p1 -b .ppc64
-%patch4 -p1 -b .triangle
-%patch5 -p1 -b .flex
-%patch6 -p1 -b .hdf
 %patch7 -p1 -b .atlas
-%patch8 -p1 -b .png
-%patch9 -p1 -b .wrapit
 %patch10 -p1 -b .no_install_dep
 %patch11 -p1 -b .build_n_scripts
 %patch12 -p1 -b .netcdff
-
-#Move wrapit.c to wrapit77.c to avoid flex make rule issues
-#This works in combination with the wrapit patch
-mv ni/src/mkwrap/wrapit.c ni/src/mkwrap/wrapit77.c
+%patch13 -p1 -b .includes
+%patch15 -p1 -b .udunits
 
 #Use ppc config if needed
 %ifarch ppc ppc64
 cp config/LINUX.ppc32.GNU config/LINUX
 %endif
 
-#Fixup LINUX config
-sed -i -e '/StdDefines/s/-DSYSV//' config/LINUX
+#Fixup LINUX config (to expose vsnprintf prototype)
+sed -i -e '/StdDefines/s/-DSYSV/-D_ISOC99_SOURCE/' config/LINUX
 
 #Fixup libdir for atlas lib locations
 sed -i -e s,%LIBDIR%,%{_libdir}, config/Project
@@ -132,13 +142,15 @@ sed -e 's;@prefix@;%{_prefix};' \
  -e 's;@libdir@;%{_libdir};' \
  %{SOURCE1} > config/Site.local
 
-pushd ni/src/examples
-for file in */*.ncl; do
-  sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \
+#Setup the profile scripts
+cp %{SOURCE2} %{SOURCE3} .
+sed -i -e s, at LIB@,%{_lib},g ncarg.csh ncarg.sh
+
+sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \
     -e 's;"\$NCARG_ROOT/lib/ncarg/\(data\|database\);ncargpath("\1") + ";' \
-   $file
-done
-popd
+    -e 's;\$NCARG_ROOT/lib/ncarg/nclscripts;$NCARG_ROOT/share/ncarg/nclscripts;' \
+    `find ni/src -name \*.ncl`
+
 
 %build
 # short-cicuit:
@@ -148,6 +160,8 @@ popd
 # (cd ./config; make -f Makefile.ini clean all)
 # ./config/ymake -config ./config -Curdir . -Topdir .
 
+#make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC -Werror-implicit-function-declaration" F77=gfortran F77_LD=gfortran\
+
 make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC" F77=gfortran F77_LD=gfortran\
  CTOFLIBS="-lgfortran" FCOPTIONS="$RPM_OPT_FLAGS -fPIC -fno-second-underscore -fno-range-check" \
  COPT= FOPT=
@@ -157,14 +171,19 @@ make Build CCOPTIONS="$RPM_OPT_FLAGS -fP
 rm -rf $RPM_BUILD_ROOT
 export NCARG=`pwd`
 make install DESTDIR=$RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-#install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+# database, fontcaps, and graphcaps are arch dependent
+mv $RPM_BUILD_ROOT%{_datadir}/ncarg/{database,{font,graph}caps} \
+   $RPM_BUILD_ROOT%{_libdir}/ncarg/
 # Don't conflict with allegro-devel (generic API names)
 for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/*
 do
    manname=`basename $manpage`
    mv $manpage $RPM_BUILD_ROOT%{_mandir}/man3/%{name}_$manname
 done
+# Use system udunits
+rm -r $RPM_BUILD_ROOT%{_datadir}/ncarg/udunits
 # Remove $RPM_BUILD_ROOT from MakeNcl
 #sed -i -e s,$RPM_BUILD_ROOT,,g $RPM_BUILD_ROOT%{_bindir}/MakeNcl
 
@@ -176,7 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING Copyright README
-#%{_sysconfdir}/profile.d/ncarg.*sh
+%{_sysconfdir}/profile.d/ncarg.*sh
 %{_bindir}/ConvertMapData
 %{_bindir}/WriteLineFile
 %{_bindir}/WriteNameFile
@@ -223,17 +242,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/tdpackdemo
 %{_bindir}/tgks0a
 %{_bindir}/tlocal
+%{_libdir}/ncarg/database/
+%{_libdir}/ncarg/fontcaps/
+%{_libdir}/ncarg/graphcaps/
+
+%files common
+%defattr(-,root,root,-)
 %dir %{_datadir}/ncarg
 %{_datadir}/ncarg/colormaps/
 %{_datadir}/ncarg/data/
-%{_datadir}/ncarg/database/
-%{_datadir}/ncarg/fontcaps/
-%{_datadir}/ncarg/graphcaps/
 %{_datadir}/ncarg/grib2_codetables/
 %{_datadir}/ncarg/nclscripts/
 %{_datadir}/ncarg/ngwww/
 %{_datadir}/ncarg/sysresfile/
-%{_datadir}/ncarg/udunits/
 %{_datadir}/ncarg/xapp/
 %{_mandir}/man1/*.gz
 %{_mandir}/man5/*.gz
@@ -261,12 +282,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ncarg/libncarg_ras.a
 %{_libdir}/ncarg/libncl.a
 %{_libdir}/ncarg/libnclapi.a
-%{_libdir}/ncarg/libnio.a
 %{_libdir}/ncarg/libngmath.a
 %{_libdir}/ncarg/libnfp.a
 %{_libdir}/ncarg/libnfpfort.a
+%{_libdir}/ncarg/libnio.a
 %{_libdir}/ncarg/libsphere3.1_dp.a
-%{_libdir}/ncarg/ncarg/robj/
+%{_libdir}/ncarg/ncarg/
 %{_mandir}/man3/*.gz
 
 %files examples
@@ -282,6 +303,66 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-2
+- Rebuild for libdap 3.9.3
+
+* Mon Jul 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-1
+- Update to 5.1.1
+
+* Tue Jul 7 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-4
+- Fixup more paths in shipped ncl scripts (bug #505240)
+
+* Tue May 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-3
+- Move database back to main arch dependent package
+ 
+* Tue May 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-2
+- Set NCARG_NCARG to /usr/share/ncarg
+- Move fontcaps and graphcaps back to main arch dependent package
+
+* Thu Mar 5 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-1
+- Update to 5.1.0
+- Rebase ppc64, netcdff patch
+- Drop triangle, flex, hdf, png, wrapit, uint32 patch upstreamed
+
+* Tue Feb 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-19
+- Rebuild for gcc 4.4.0 and other changes
+- Move data files into noarch sub-package
+- Make examples sub-package noarch
+
+* Mon Feb 2 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-18
+- Fix unowned directory (bug #483468)
+
+* Mon Dec 15 2008 Deji Akingunola <dakingun at gmail.com> - 5.0.0-17
+- Rebuild for atlas-3.8.2
+
+* Fri Dec 12 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-16
+- Re-add profile.d startup scripts to set NCARG env variables
+
+* Mon Dec 8 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-15
+- Try changing the udunits path in config/Project
+
+* Thu Dec 4 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-14
+- Actually apply udunits patch
+
+* Thu Nov 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-13
+- Enable udunits support add use system udunits.dat
+
+* Thu Sep 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
+- Rebuild for new libdap
+- Fix netcdf include location
+
+* Fri Apr 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-11
+- Add patch to fix raster image problems on non 32-bit platforms
+- Add more includes to includes patch
+
+* Thu Mar 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-10
+- Add patch to fixup some missing includes
+- Define _ISOC99_SOURCE to expose vsnprintf prototype
+- Update hdf patch to remove hdf/netcdf.h include
+
 * Mon Feb 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-9
 - Rename Site.local to Site.local.ncl
 - Add comment for imake BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Feb 2008 23:32:56 -0000	1.2
+++ sources	22 Sep 2009 17:41:28 -0000	1.3
@@ -1 +1 @@
-3a1bfbab90ebce230c1f494949534f8a  ncl_ncarg_src-5.0.0.tar.gz
+42154992f2966320dc9f8958b9d81da3  ncl_ncarg_src-5.1.1.tar.gz


--- ncarg-4.4.2-ppc64.patch DELETED ---


--- ncl-5.0.0-flex.patch DELETED ---


--- ncl-5.0.0-hdf.patch DELETED ---


--- ncl-5.0.0-netcdff.patch DELETED ---


--- ncl-5.0.0-paths.patch DELETED ---


--- ncl-5.0.0-png.patch DELETED ---


--- ncl-5.0.0-triangle.patch DELETED ---


--- ncl-5.0.0-wrapit.patch DELETED ---



From orion at fedoraproject.org  Tue Sep 22 17:42:33 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 22 Sep 2009 17:42:33 +0000 (UTC)
Subject: rpms/ncl/devel ncl.spec,1.21,1.22
Message-ID: <20090922174233.4DD5211C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2327

Modified Files:
	ncl.spec 
Log Message:
Add rhel conditionals for EPEL builds



Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ncl.spec	25 Jul 2009 15:51:17 -0000	1.21
+++ ncl.spec	22 Sep 2009 17:42:33 -0000	1.22
@@ -77,7 +77,9 @@ The software comes with a couple of usef
 Summary:        Common files for NCL and NCAR Graphics
 Group:          Applications/Engineering
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch:      noarch
+%endif
 
 %description common
 %{summary}.
@@ -100,7 +102,9 @@ Obsoletes:      ncarg-devel < %{version}
 Summary:        Example programs and data using NCL
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch:      noarch
+%endif
 
 %description examples
 Example programs and data using NCL.



From wtogami at fedoraproject.org  Tue Sep 22 17:51:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 22 Sep 2009 17:51:46 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.15, 1.16 dracut.spec, 1.30,
	1.31 sources, 1.16, 1.17
Message-ID: <20090922175147.0421211C00E8@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6082

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
Fix LiveCD boot regression



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Sep 2009 15:48:28 -0000	1.15
+++ .cvsignore	22 Sep 2009 17:51:46 -0000	1.16
@@ -1 +1 @@
-dracut-002-8eb16b08.tar.bz2
+dracut-002-23aa2048.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- dracut.spec	21 Sep 2009 15:48:28 -0000	1.30
+++ dracut.spec	22 Sep 2009 17:51:46 -0000	1.31
@@ -1,4 +1,4 @@
-%define gittag 8eb16b08
+%define gittag 23aa2048
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 3%{?rdist}
+Release: 4%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 21 2009 Warren Togami <wtogami at redhat.com> 002-4
+- Fix LiveCD boot regression
+
 * Mon Sep 21 2009 Harald Hoyer <harald at redhat.com> 002-3
 - bail out if selinux policy could not be loaded and 
   selinux=0 not specified on kernel command line 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	21 Sep 2009 15:48:28 -0000	1.16
+++ sources	22 Sep 2009 17:51:46 -0000	1.17
@@ -1 +1 @@
-6f85d54893a0bdb16273b61a9b5d9582  dracut-002-8eb16b08.tar.bz2
+a068ff45f641d00e93c399eb2bc937a9  dracut-002-23aa2048.tar.bz2



From oget at fedoraproject.org  Tue Sep 22 18:10:39 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 22 Sep 2009 18:10:39 +0000 (UTC)
Subject: rpms/canorus/devel canorus-destdir.patch, NONE,
	1.1 canorus-python-dir.patch, NONE,
	1.1 canorus-remove-extra-doc.patch, NONE,
	1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922181039.9603411C0423@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/canorus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15306/devel

Modified Files:
	.cvsignore sources 
Added Files:
	canorus-destdir.patch canorus-python-dir.patch 
	canorus-remove-extra-doc.patch canorus-system-fonts.patch 
	canorus.spec import.log 
Log Message:
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


canorus-destdir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-destdir.patch ---
diff -rupN canorus-0.7svn.R1163.old/src/CMakeLists.txt canorus-0.7svn.R1163/src/CMakeLists.txt
--- canorus-0.7svn.R1163.old/src/CMakeLists.txt	2009-07-09 18:45:48.000000000 -0400
+++ canorus-0.7svn.R1163/src/CMakeLists.txt	2009-07-10 02:48:19.000000000 -0400
@@ -680,10 +680,10 @@ INSTALL(FILES ${Canorus_Translation_Bins
 # Install fonts
 INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
 # Install users manual, if it exists
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
-FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
-INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+#FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+#INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
 # Install examples
 INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
 

canorus-python-dir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-python-dir.patch ---
--- canorus-0.7.R1002.old/src/CMakeLists.txt	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/CMakeLists.txt	2009-07-08 19:42:47.000000000 -0400
@@ -668,10 +668,10 @@ IF(USE_RUBY)
 	INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_RUBY)
 IF(USE_PYTHON)
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	#INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_PYTHON)
 
 # Install scripts

canorus-remove-extra-doc.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE canorus-remove-extra-doc.patch ---
diff -rupN canorus-0.7svn.R1174.old/CMakeLists.txt canorus-0.7svn.R1174/CMakeLists.txt
--- canorus-0.7svn.R1174.old/CMakeLists.txt	2009-07-27 00:23:11.000000000 -0400
+++ canorus-0.7svn.R1174/CMakeLists.txt	2009-07-27 02:52:10.000000000 -0400
@@ -90,5 +90,5 @@ ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 
 # Install README, VERSION, COPYING and other raw txt files
-INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
+#INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
 

canorus-system-fonts.patch:
 canorus.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE canorus-system-fonts.patch ---
--- canorus-0.7.R1002.old/src/canorus.cpp	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/canorus.cpp	2009-07-08 16:43:52.000000000 -0400
@@ -189,12 +189,12 @@ void CACanorus::initUndo() {
 
 void CACanorus::initFonts() {
 	// addApplicationFont doesn't understand prefix: paths.
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.otf").absoluteFilePath());
 	QFontDatabase::addApplicationFont(QFileInfo("fonts:FreeSans.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:Emmentaler-14.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:emmentaler-14.otf").absoluteFilePath());
 	// populate glyph->codepoint map using generated list
 	#include "fonts/fetaList.cxx"
 }


--- NEW FILE canorus.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global svnrev R1177
%global svndate .20090904svn

Name:          canorus
Summary:       Music Score Editor
Version:       0.7
Release:       4.%{svnrev}%{svndate}%{?dist}
Group:         Applications/Editors
# rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
# The rest of the source code, as explicitly indicated by upstream, is GPLv2
# The .can files are Public Domain
License:       GPLv2 and Public Domain
URL:           http://canorus.berlios.de/
# The original source tarball contains content files that have
# unknown and possibly nonfree licenses we remove those bits from the tarball.
# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
# tar jxf canorus_*.tar.bz2
# rm -fr canorus-*/examples/{midi,musicxml}
## This next one is non-commercial use only. So remove...
# rm -fr canorus-*/examples/come_again.can
# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
Source0:       canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
# The following patches are Fedora specific and not sent upstream:
# Remove duplicate copies of docs that are already going to %%doc
Patch0:        %{name}-remove-extra-doc.patch
# Use system fonts instead of bundled ones
Patch1:        %{name}-system-fonts.patch
# Correct python binding installation dir
Patch2:        %{name}-python-dir.patch
# No need to create directories outside the buildroot
Patch3:        %{name}-destdir.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils

BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: lyx
BuildRequires: qt-devel
BuildRequires: python-devel
BuildRequires: swig
# Ruby scripting not ready yet
#BuildRequires: ruby
#BuildRequires: ruby-devel
BuildRequires: tetex-tex4ht
BuildRequires: zlib-devel

%if 0%{?fedora} >= 11
Requires:      font(centuryschoolbookl)
Requires:      font(emmentaler)
Requires:      font(freesans)
%else
Requires:      freefont
Requires:      lilypond-century-schoolbook-l-fonts
Requires:      lilypond-emmentaler-fonts
%endif
Requires:      hicolor-icon-theme

%description
Canorus is a free extensible music score editor. It supports note writing,
import/export of various file formats, MIDI input and output, scripting and
more! Using a Qt4 framework Canorus offers a fast and modern GUI and
cross-platformability.

%prep
%setup -q -n %{name}-%{version}svn.%{svnrev}
%patch0 -p1 -b .noextradocs
%patch1 -p1 -b .fonts
%patch2 -p1 -b .python
%patch3 -p1 -b .destdir

# Remove bundled copy of zlib
rm -fr src/zlib

# To apply Fedora's optflags properly
sed -i 's|-O0 -g||' src/CMakeLists.txt

# Correct the desktop file
sed -i '/^MimeType.*[^;]$/s/$/;/' %{name}.desktop


%build
%{cmake} -DCANORUS_PYTHON_LIB_DIR="%{python_sitearch}" .

make %{?_smp_mflags}

# Build usersguide
make %{?_smp_mflags} -C doc/usersguide qthelp


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

# Create the lang file. %%find_lang does not handle .qm files
echo %%dir %{_datadir}/%{name}/lang/ >> %{name}.lang
for file in %{buildroot}%{_datadir}/%{name}/lang/*.qm; do
  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
  echo %%lang\($language\) %{_datadir}/%{name}/lang/$language.qm >> %{name}.lang
done

# Handle fonts
rm -f %{buildroot}%{_datadir}/%{name}/fonts/*.ttf
%if 0%{?fedora} >= 11
ln -s ../../fonts/gnu-free/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%else
ln -s ../../fonts/freefont/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%endif
ln -s ../../fonts/lilypond/emmentaler-14.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Bold.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-BoldItal.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Ital.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Roma.otf %{buildroot}%{_datadir}/%{name}/fonts/

# Desktop file
desktop-file-install                           \
   --dir=%{buildroot}%{_datadir}/applications/ \
   --add-category=Midi                         \
   --add-category=X-Notation                   \
   --remove-category=Application               \
   --remove-key=Encoding                       \
   --add-mime-type="application/xml"           \
   %{name}.desktop

# Menu image
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
cp -a src/ui/images/general/canorusmlsource.svg \
   %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

# Install usersguide
mkdir -p %{buildroot}%{_datadir}/%{name}/doc/usersguide/
cp -a doc/usersguide/*.{qch,qhc} %{buildroot}%{_datadir}/%{name}/doc/usersguide/


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVELOPERS NEWS README TODO
%doc %{_datadir}/%{name}/doc/
%{_bindir}/%{name}
%{python_sitearch}/*Canorus*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/examples/
%{_datadir}/%{name}/fonts/
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/plugins/
%{_datadir}/%{name}/scripts/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg


%changelog
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


--- NEW FILE import.log ---
canorus-0_7-4_R1177_20090904svn_fc11:HEAD:canorus-0.7-4.R1177.20090904svn.fc11.src.rpm:1253643011


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:49:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 18:10:38 -0000	1.2
@@ -0,0 +1 @@
+canorus_0.7svn.R1177_source-FE.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:49:16 -0000	1.1
+++ sources	22 Sep 2009 18:10:38 -0000	1.2
@@ -0,0 +1 @@
+8d375719c70345a563aa8ca51a31920d  canorus_0.7svn.R1177_source-FE.tar.bz2



From oget at fedoraproject.org  Tue Sep 22 18:11:44 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 22 Sep 2009 18:11:44 +0000 (UTC)
Subject: rpms/canorus/F-11 canorus-destdir.patch, NONE,
	1.1 canorus-python-dir.patch, NONE,
	1.1 canorus-remove-extra-doc.patch, NONE,
	1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922181144.B36E111C00E8@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/canorus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15971/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	canorus-destdir.patch canorus-python-dir.patch 
	canorus-remove-extra-doc.patch canorus-system-fonts.patch 
	canorus.spec import.log 
Log Message:
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


canorus-destdir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-destdir.patch ---
diff -rupN canorus-0.7svn.R1163.old/src/CMakeLists.txt canorus-0.7svn.R1163/src/CMakeLists.txt
--- canorus-0.7svn.R1163.old/src/CMakeLists.txt	2009-07-09 18:45:48.000000000 -0400
+++ canorus-0.7svn.R1163/src/CMakeLists.txt	2009-07-10 02:48:19.000000000 -0400
@@ -680,10 +680,10 @@ INSTALL(FILES ${Canorus_Translation_Bins
 # Install fonts
 INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
 # Install users manual, if it exists
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
-FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
-INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+#FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+#INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
 # Install examples
 INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
 

canorus-python-dir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-python-dir.patch ---
--- canorus-0.7.R1002.old/src/CMakeLists.txt	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/CMakeLists.txt	2009-07-08 19:42:47.000000000 -0400
@@ -668,10 +668,10 @@ IF(USE_RUBY)
 	INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_RUBY)
 IF(USE_PYTHON)
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	#INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_PYTHON)
 
 # Install scripts

canorus-remove-extra-doc.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE canorus-remove-extra-doc.patch ---
diff -rupN canorus-0.7svn.R1174.old/CMakeLists.txt canorus-0.7svn.R1174/CMakeLists.txt
--- canorus-0.7svn.R1174.old/CMakeLists.txt	2009-07-27 00:23:11.000000000 -0400
+++ canorus-0.7svn.R1174/CMakeLists.txt	2009-07-27 02:52:10.000000000 -0400
@@ -90,5 +90,5 @@ ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 
 # Install README, VERSION, COPYING and other raw txt files
-INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
+#INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
 

canorus-system-fonts.patch:
 canorus.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE canorus-system-fonts.patch ---
--- canorus-0.7.R1002.old/src/canorus.cpp	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/canorus.cpp	2009-07-08 16:43:52.000000000 -0400
@@ -189,12 +189,12 @@ void CACanorus::initUndo() {
 
 void CACanorus::initFonts() {
 	// addApplicationFont doesn't understand prefix: paths.
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.otf").absoluteFilePath());
 	QFontDatabase::addApplicationFont(QFileInfo("fonts:FreeSans.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:Emmentaler-14.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:emmentaler-14.otf").absoluteFilePath());
 	// populate glyph->codepoint map using generated list
 	#include "fonts/fetaList.cxx"
 }


--- NEW FILE canorus.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global svnrev R1177
%global svndate .20090904svn

Name:          canorus
Summary:       Music Score Editor
Version:       0.7
Release:       4.%{svnrev}%{svndate}%{?dist}
Group:         Applications/Editors
# rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
# The rest of the source code, as explicitly indicated by upstream, is GPLv2
# The .can files are Public Domain
License:       GPLv2 and Public Domain
URL:           http://canorus.berlios.de/
# The original source tarball contains content files that have
# unknown and possibly nonfree licenses we remove those bits from the tarball.
# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
# tar jxf canorus_*.tar.bz2
# rm -fr canorus-*/examples/{midi,musicxml}
## This next one is non-commercial use only. So remove...
# rm -fr canorus-*/examples/come_again.can
# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
Source0:       canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
# The following patches are Fedora specific and not sent upstream:
# Remove duplicate copies of docs that are already going to %%doc
Patch0:        %{name}-remove-extra-doc.patch
# Use system fonts instead of bundled ones
Patch1:        %{name}-system-fonts.patch
# Correct python binding installation dir
Patch2:        %{name}-python-dir.patch
# No need to create directories outside the buildroot
Patch3:        %{name}-destdir.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils

BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: lyx
BuildRequires: qt-devel
BuildRequires: python-devel
BuildRequires: swig
# Ruby scripting not ready yet
#BuildRequires: ruby
#BuildRequires: ruby-devel
BuildRequires: tetex-tex4ht
BuildRequires: zlib-devel

%if 0%{?fedora} >= 11
Requires:      font(centuryschoolbookl)
Requires:      font(emmentaler)
Requires:      font(freesans)
%else
Requires:      freefont
Requires:      lilypond-century-schoolbook-l-fonts
Requires:      lilypond-emmentaler-fonts
%endif
Requires:      hicolor-icon-theme

%description
Canorus is a free extensible music score editor. It supports note writing,
import/export of various file formats, MIDI input and output, scripting and
more! Using a Qt4 framework Canorus offers a fast and modern GUI and
cross-platformability.

%prep
%setup -q -n %{name}-%{version}svn.%{svnrev}
%patch0 -p1 -b .noextradocs
%patch1 -p1 -b .fonts
%patch2 -p1 -b .python
%patch3 -p1 -b .destdir

# Remove bundled copy of zlib
rm -fr src/zlib

# To apply Fedora's optflags properly
sed -i 's|-O0 -g||' src/CMakeLists.txt

# Correct the desktop file
sed -i '/^MimeType.*[^;]$/s/$/;/' %{name}.desktop


%build
%{cmake} -DCANORUS_PYTHON_LIB_DIR="%{python_sitearch}" .

make %{?_smp_mflags}

# Build usersguide
make %{?_smp_mflags} -C doc/usersguide qthelp


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

# Create the lang file. %%find_lang does not handle .qm files
echo %%dir %{_datadir}/%{name}/lang/ >> %{name}.lang
for file in %{buildroot}%{_datadir}/%{name}/lang/*.qm; do
  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
  echo %%lang\($language\) %{_datadir}/%{name}/lang/$language.qm >> %{name}.lang
done

# Handle fonts
rm -f %{buildroot}%{_datadir}/%{name}/fonts/*.ttf
%if 0%{?fedora} >= 11
ln -s ../../fonts/gnu-free/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%else
ln -s ../../fonts/freefont/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%endif
ln -s ../../fonts/lilypond/emmentaler-14.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Bold.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-BoldItal.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Ital.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Roma.otf %{buildroot}%{_datadir}/%{name}/fonts/

# Desktop file
desktop-file-install                           \
   --dir=%{buildroot}%{_datadir}/applications/ \
   --add-category=Midi                         \
   --add-category=X-Notation                   \
   --remove-category=Application               \
   --remove-key=Encoding                       \
   --add-mime-type="application/xml"           \
   %{name}.desktop

# Menu image
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
cp -a src/ui/images/general/canorusmlsource.svg \
   %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

# Install usersguide
mkdir -p %{buildroot}%{_datadir}/%{name}/doc/usersguide/
cp -a doc/usersguide/*.{qch,qhc} %{buildroot}%{_datadir}/%{name}/doc/usersguide/


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVELOPERS NEWS README TODO
%doc %{_datadir}/%{name}/doc/
%{_bindir}/%{name}
%{python_sitearch}/*Canorus*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/examples/
%{_datadir}/%{name}/fonts/
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/plugins/
%{_datadir}/%{name}/scripts/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg


%changelog
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


--- NEW FILE import.log ---
canorus-0_7-4_R1177_20090904svn_fc11:F-11:canorus-0.7-4.R1177.20090904svn.fc11.src.rpm:1253643086


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:49:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 18:11:44 -0000	1.2
@@ -0,0 +1 @@
+canorus_0.7svn.R1177_source-FE.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:49:16 -0000	1.1
+++ sources	22 Sep 2009 18:11:44 -0000	1.2
@@ -0,0 +1 @@
+8d375719c70345a563aa8ca51a31920d  canorus_0.7svn.R1177_source-FE.tar.bz2



From oget at fedoraproject.org  Tue Sep 22 18:12:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 22 Sep 2009 18:12:30 +0000 (UTC)
Subject: rpms/canorus/F-10 canorus-destdir.patch, NONE,
	1.1 canorus-python-dir.patch, NONE,
	1.1 canorus-remove-extra-doc.patch, NONE,
	1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922181230.99A2011C00E8@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/canorus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16629/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	canorus-destdir.patch canorus-python-dir.patch 
	canorus-remove-extra-doc.patch canorus-system-fonts.patch 
	canorus.spec import.log 
Log Message:
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


canorus-destdir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-destdir.patch ---
diff -rupN canorus-0.7svn.R1163.old/src/CMakeLists.txt canorus-0.7svn.R1163/src/CMakeLists.txt
--- canorus-0.7svn.R1163.old/src/CMakeLists.txt	2009-07-09 18:45:48.000000000 -0400
+++ canorus-0.7svn.R1163/src/CMakeLists.txt	2009-07-10 02:48:19.000000000 -0400
@@ -680,10 +680,10 @@ INSTALL(FILES ${Canorus_Translation_Bins
 # Install fonts
 INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
 # Install users manual, if it exists
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
-FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
-INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+#FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+#INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
 # Install examples
 INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
 

canorus-python-dir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-python-dir.patch ---
--- canorus-0.7.R1002.old/src/CMakeLists.txt	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/CMakeLists.txt	2009-07-08 19:42:47.000000000 -0400
@@ -668,10 +668,10 @@ IF(USE_RUBY)
 	INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_RUBY)
 IF(USE_PYTHON)
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	#INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_PYTHON)
 
 # Install scripts

canorus-remove-extra-doc.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE canorus-remove-extra-doc.patch ---
diff -rupN canorus-0.7svn.R1174.old/CMakeLists.txt canorus-0.7svn.R1174/CMakeLists.txt
--- canorus-0.7svn.R1174.old/CMakeLists.txt	2009-07-27 00:23:11.000000000 -0400
+++ canorus-0.7svn.R1174/CMakeLists.txt	2009-07-27 02:52:10.000000000 -0400
@@ -90,5 +90,5 @@ ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 
 # Install README, VERSION, COPYING and other raw txt files
-INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
+#INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
 

canorus-system-fonts.patch:
 canorus.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE canorus-system-fonts.patch ---
--- canorus-0.7.R1002.old/src/canorus.cpp	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/canorus.cpp	2009-07-08 16:43:52.000000000 -0400
@@ -189,12 +189,12 @@ void CACanorus::initUndo() {
 
 void CACanorus::initFonts() {
 	// addApplicationFont doesn't understand prefix: paths.
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.otf").absoluteFilePath());
 	QFontDatabase::addApplicationFont(QFileInfo("fonts:FreeSans.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:Emmentaler-14.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:emmentaler-14.otf").absoluteFilePath());
 	// populate glyph->codepoint map using generated list
 	#include "fonts/fetaList.cxx"
 }


--- NEW FILE canorus.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global svnrev R1177
%global svndate .20090904svn

Name:          canorus
Summary:       Music Score Editor
Version:       0.7
Release:       4.%{svnrev}%{svndate}%{?dist}
Group:         Applications/Editors
# rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
# The rest of the source code, as explicitly indicated by upstream, is GPLv2
# The .can files are Public Domain
License:       GPLv2 and Public Domain
URL:           http://canorus.berlios.de/
# The original source tarball contains content files that have
# unknown and possibly nonfree licenses we remove those bits from the tarball.
# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
# tar jxf canorus_*.tar.bz2
# rm -fr canorus-*/examples/{midi,musicxml}
## This next one is non-commercial use only. So remove...
# rm -fr canorus-*/examples/come_again.can
# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
Source0:       canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
# The following patches are Fedora specific and not sent upstream:
# Remove duplicate copies of docs that are already going to %%doc
Patch0:        %{name}-remove-extra-doc.patch
# Use system fonts instead of bundled ones
Patch1:        %{name}-system-fonts.patch
# Correct python binding installation dir
Patch2:        %{name}-python-dir.patch
# No need to create directories outside the buildroot
Patch3:        %{name}-destdir.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils

BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: lyx
BuildRequires: qt-devel
BuildRequires: python-devel
BuildRequires: swig
# Ruby scripting not ready yet
#BuildRequires: ruby
#BuildRequires: ruby-devel
BuildRequires: tetex-tex4ht
BuildRequires: zlib-devel

%if 0%{?fedora} >= 11
Requires:      font(centuryschoolbookl)
Requires:      font(emmentaler)
Requires:      font(freesans)
%else
Requires:      freefont
Requires:      lilypond-century-schoolbook-l-fonts
Requires:      lilypond-emmentaler-fonts
%endif
Requires:      hicolor-icon-theme

%description
Canorus is a free extensible music score editor. It supports note writing,
import/export of various file formats, MIDI input and output, scripting and
more! Using a Qt4 framework Canorus offers a fast and modern GUI and
cross-platformability.

%prep
%setup -q -n %{name}-%{version}svn.%{svnrev}
%patch0 -p1 -b .noextradocs
%patch1 -p1 -b .fonts
%patch2 -p1 -b .python
%patch3 -p1 -b .destdir

# Remove bundled copy of zlib
rm -fr src/zlib

# To apply Fedora's optflags properly
sed -i 's|-O0 -g||' src/CMakeLists.txt

# Correct the desktop file
sed -i '/^MimeType.*[^;]$/s/$/;/' %{name}.desktop


%build
%{cmake} -DCANORUS_PYTHON_LIB_DIR="%{python_sitearch}" .

make %{?_smp_mflags}

# Build usersguide
make %{?_smp_mflags} -C doc/usersguide qthelp


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

# Create the lang file. %%find_lang does not handle .qm files
echo %%dir %{_datadir}/%{name}/lang/ >> %{name}.lang
for file in %{buildroot}%{_datadir}/%{name}/lang/*.qm; do
  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
  echo %%lang\($language\) %{_datadir}/%{name}/lang/$language.qm >> %{name}.lang
done

# Handle fonts
rm -f %{buildroot}%{_datadir}/%{name}/fonts/*.ttf
%if 0%{?fedora} >= 11
ln -s ../../fonts/gnu-free/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%else
ln -s ../../fonts/freefont/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%endif
ln -s ../../fonts/lilypond/emmentaler-14.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Bold.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-BoldItal.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Ital.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Roma.otf %{buildroot}%{_datadir}/%{name}/fonts/

# Desktop file
desktop-file-install                           \
   --dir=%{buildroot}%{_datadir}/applications/ \
   --add-category=Midi                         \
   --add-category=X-Notation                   \
   --remove-category=Application               \
   --remove-key=Encoding                       \
   --add-mime-type="application/xml"           \
   %{name}.desktop

# Menu image
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
cp -a src/ui/images/general/canorusmlsource.svg \
   %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

# Install usersguide
mkdir -p %{buildroot}%{_datadir}/%{name}/doc/usersguide/
cp -a doc/usersguide/*.{qch,qhc} %{buildroot}%{_datadir}/%{name}/doc/usersguide/


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVELOPERS NEWS README TODO
%doc %{_datadir}/%{name}/doc/
%{_bindir}/%{name}
%{python_sitearch}/*Canorus*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/examples/
%{_datadir}/%{name}/fonts/
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/plugins/
%{_datadir}/%{name}/scripts/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg


%changelog
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


--- NEW FILE import.log ---
canorus-0_7-4_R1177_20090904svn_fc11:F-10:canorus-0.7-4.R1177.20090904svn.fc11.src.rpm:1253643133


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:49:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 18:12:30 -0000	1.2
@@ -0,0 +1 @@
+canorus_0.7svn.R1177_source-FE.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:49:16 -0000	1.1
+++ sources	22 Sep 2009 18:12:30 -0000	1.2
@@ -0,0 +1 @@
+8d375719c70345a563aa8ca51a31920d  canorus_0.7svn.R1177_source-FE.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 22 18:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:12:31 +0000
Subject: [pkgdb] cohoba ownership updated
Message-ID: <20090922181231.A375710F861@bastion2.fedora.phx.redhat.com>

Package cohoba in Fedora devel is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cohoba



From pkgdb at fedoraproject.org  Tue Sep 22 18:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:12:31 +0000
Subject: [pkgdb] cohoba (un)retirement
Message-ID: <20090922181231.B3CE510F87E@bastion2.fedora.phx.redhat.com>

Package cohoba in Fedora devel has been retired by tjikkun

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cohoba



From pkgdb at fedoraproject.org  Tue Sep 22 18:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:13:14 +0000
Subject: [pkgdb] cohoba ownership updated
Message-ID: <20090922181314.DA38210F810@bastion2.fedora.phx.redhat.com>

Package cohoba in Fedora 11 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cohoba



From pkgdb at fedoraproject.org  Tue Sep 22 18:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:13:14 +0000
Subject: [pkgdb] cohoba (un)retirement
Message-ID: <20090922181315.02D0410F87C@bastion2.fedora.phx.redhat.com>

Package cohoba in Fedora 11 has been retired by tjikkun

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cohoba



From mtasaka at fedoraproject.org  Tue Sep 22 18:23:05 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Sep 2009 18:23:05 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-11
	rubygem-activesupport-2.3.x-CVE-2009-3009.patch, NONE,
	1.1 rubygem-activesupport.spec, 1.10, 1.11
Message-ID: <20090922182305.3A71E11C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activesupport/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22968

Modified Files:
	rubygem-activesupport.spec 
Added Files:
	rubygem-activesupport-2.3.x-CVE-2009-3009.patch 
Log Message:
* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
- Patch for CVE-2009-3009 (bug 520843)


rubygem-activesupport-2.3.x-CVE-2009-3009.patch:
 lib/active_support/multibyte.rb       |   36 +++++++-
 lib/active_support/multibyte/chars.rb |   23 +----
 lib/active_support/multibyte/utils.rb |   61 ++++++++++++++
 test/multibyte_utils_test.rb          |  142 +++++++++++++++++++++++++++++++++-
 4 files changed, 239 insertions(+), 23 deletions(-)

--- NEW FILE rubygem-activesupport-2.3.x-CVE-2009-3009.patch ---
>From b4115148c5175c986f5c21144b0e55c3ed7d9d0c Mon Sep 17 00:00:00 2001
From: Manfred Stienstra <manfred at fngtps.com>
Date: Wed, 26 Aug 2009 22:38:10 +0200
Subject: [PATCH] Add verify and clean methods to ActiveSupport::Multibyte.

When accepting character input from outside of your application you can't
blindly trust that all strings are properly encoded. With these methods
you can check incoming strings and clean them up if necessary.

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 activesupport/lib/active_support/multibyte.rb      |   36 ++++-
 .../lib/active_support/multibyte/chars.rb          |   23 +---
 .../lib/active_support/multibyte/utils.rb          |   61 +++++++++
 activesupport/test/multibyte_utils_test.rb         |  141 ++++++++++++++++++++
 4 files changed, 239 insertions(+), 22 deletions(-)
 create mode 100644 activesupport/lib/active_support/multibyte/utils.rb
 create mode 100644 activesupport/test/multibyte_utils_test.rb

diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb
index 65a96af..b6354ee 100644
--- a/activesupport/lib/active_support/multibyte.rb
+++ b/activesupport/lib/active_support/multibyte.rb
@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-require 'active_support/multibyte/chars'
-require 'active_support/multibyte/exceptions'
-require 'active_support/multibyte/unicode_database'
-
 module ActiveSupport #:nodoc:
   module Multibyte
     # A list of all available normalization forms. See http://www.unicode.org/reports/tr15/tr15-29.html for more
@@ -27,7 +23,35 @@ module ActiveSupport #:nodoc:
     #
     # Example:
     #   ActiveSupport::Multibyte.proxy_class = CharsForUTF32
-    mattr_accessor :proxy_class
-    self.proxy_class = ActiveSupport::Multibyte::Chars
+    def self.proxy_class=(klass)
+      @proxy_class = klass
+    end
+
+    # Returns the currect proxy class
+    def self.proxy_class
+      @proxy_class ||= ActiveSupport::Multibyte::Chars
+    end
+
+    # Regular expressions that describe valid byte sequences for a character
+    VALID_CHARACTER = {
+      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
+      'UTF-8' => /\A(?:
+                  [\x00-\x7f]                                         |
+                  [\xc2-\xdf] [\x80-\xbf]                             |
+                  \xe0        [\xa0-\xbf] [\x80-\xbf]                 |
+                  [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]                 |
+                  \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                  [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                  \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
+      # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
+      'Shift_JIS' => /\A(?:
+                  [\x00-\x7e \xa1-\xdf]                                     |
+                  [\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
+    }
   end
 end
+
+require 'active_support/multibyte/chars'
+require 'active_support/multibyte/exceptions'
+require 'active_support/multibyte/unicode_database'
+require 'active_support/multibyte/utils'
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index 3d392d2..16bc130 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -73,16 +73,7 @@ module ActiveSupport #:nodoc:
       UNICODE_TRAILERS_PAT = /(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+\Z/
       UNICODE_LEADERS_PAT = /\A(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+/
 
-      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
-      UTF8_PAT = /\A(?:
-                     [\x00-\x7f]                                     |
-                     [\xc2-\xdf] [\x80-\xbf]                         |
-                     \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-                     [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-                     \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                     [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                     \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-                    )*\z/xn
+      UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8']
 
       attr_reader :wrapped_string
       alias to_s wrapped_string
@@ -307,23 +298,23 @@ module ActiveSupport #:nodoc:
       def rstrip
         chars(@wrapped_string.gsub(UNICODE_TRAILERS_PAT, ''))
       end
-      
+
       # Strips entire range of Unicode whitespace from the left of the string.
       def lstrip
         chars(@wrapped_string.gsub(UNICODE_LEADERS_PAT, ''))
       end
-      
+
       # Strips entire range of Unicode whitespace from the right and left of the string.
       def strip
         rstrip.lstrip
       end
-      
+
       # Returns the number of codepoints in the string
       def size
         self.class.u_unpack(@wrapped_string).size
       end
       alias_method :length, :size
-      
+
       # Reverses all characters in the string.
       #
       # Example:
@@ -331,7 +322,7 @@ module ActiveSupport #:nodoc:
       def reverse
         chars(self.class.u_unpack(@wrapped_string).reverse.pack('U*'))
       end
-      
+
       # Implements Unicode-aware slice with codepoints. Slicing on one point returns the codepoints for that
       # character.
       #
@@ -646,7 +637,7 @@ module ActiveSupport #:nodoc:
           string.split(//u).map do |c|
             c.force_encoding(Encoding::ASCII) if c.respond_to?(:force_encoding)
 
-            if !UTF8_PAT.match(c)
+            if !ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'].match(c)
               n = c.unpack('C')[0]
               n < 128 ? n.chr :
               n < 160 ? [UCD.cp1252[n] || n].pack('U') :
diff --git a/activesupport/lib/active_support/multibyte/utils.rb b/activesupport/lib/active_support/multibyte/utils.rb
new file mode 100644
index 0000000..acef84d
--- /dev/null
+++ b/activesupport/lib/active_support/multibyte/utils.rb
@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+module ActiveSupport #:nodoc:
+  module Multibyte #:nodoc:
+    if Kernel.const_defined?(:Encoding)
+      # Returns a regular expression that matches valid characters in the current encoding
+      def self.valid_character
+        VALID_CHARACTER[Encoding.default_internal.to_s]
+      end
+    else
+      def self.valid_character
+        case $KCODE
+        when 'UTF8'
+          VALID_CHARACTER['UTF-8']
+        when 'SJIS'
+          VALID_CHARACTER['Shift_JIS']
+        end
+      end
+    end
+
+    if 'string'.respond_to?(:valid_encoding?)
+      # Verifies the encoding of a string
+      def self.verify(string)
+        string.valid_encoding?
+      end
+    else
+      def self.verify(string)
+        if expression = valid_character
+          for c in string.split(//)
+            return false unless valid_character.match(c)
+          end
+        end
+        true
+      end
+    end
+
+    # Verifies the encoding of the string and raises an exception when it's not valid
+    def self.verify!(string)
+      raise EncodingError.new("Found characters with invalid encoding") unless verify(string)
+    end
+
+    if 'string'.respond_to?(:force_encoding)
+      # Removes all invalid characters from the string.
+      #
+      # Note: this method is a no-op in Ruby 1.9
+      def self.clean(string)
+        string
+      end
+    else
+      def self.clean(string)
+        if expression = valid_character
+          stripped = []; for c in string.split(//)
+            stripped << c if valid_character.match(c)
+          end; stripped.join
+        else
+          string
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/test/multibyte_utils_test.rb b/activesupport/test/multibyte_utils_test.rb
new file mode 100644
index 0000000..d8ac5ff
--- /dev/null
+++ b/activesupport/test/multibyte_utils_test.rb
@@ -0,0 +1,141 @@
+# encoding: utf-8
+
+require 'abstract_unit'
+require 'multibyte_test_helpers'
+
+class MultibyteUtilsTest < ActiveSupport::TestCase
+  include MultibyteTestHelpers
+
+  test "valid_character returns an expression for the current encoding" do
+    with_encoding('None') do
+      assert_nil ActiveSupport::Multibyte.valid_character
+    end
+    with_encoding('UTF8') do
+      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'], ActiveSupport::Multibyte.valid_character
+    end
+    with_encoding('SJIS') do
+      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['Shift_JIS'], ActiveSupport::Multibyte.valid_character
+    end
+  end
+
+  test "verify verifies ASCII strings are properly encoded" do
+    with_encoding('None') do
+      examples.each do |example|
+        assert ActiveSupport::Multibyte.verify(example)
+      end
+    end
+  end
+
+  test "verify verifies UTF-8 strings are properly encoded" do
+    with_encoding('UTF8') do
+      assert ActiveSupport::Multibyte.verify(example('valid UTF-8'))
+      assert !ActiveSupport::Multibyte.verify(example('invalid UTF-8'))
+    end
+  end
+
+  test "verify verifies Shift-JIS strings are properly encoded" do
+    with_encoding('SJIS') do
+      assert ActiveSupport::Multibyte.verify(example('valid Shift-JIS'))
+      assert !ActiveSupport::Multibyte.verify(example('invalid Shift-JIS'))
+    end
+  end
+
+  test "verify! raises an exception when it finds an invalid character" do
+    with_encoding('UTF8') do
+      assert_raises(ActiveSupport::Multibyte::EncodingError) do
+        ActiveSupport::Multibyte.verify!(example('invalid UTF-8'))
+      end
+    end
+  end
+
+  test "verify! doesn't raise an exception when the encoding is valid" do
+    with_encoding('UTF8') do
+      assert_nothing_raised do
+        ActiveSupport::Multibyte.verify!(example('valid UTF-8'))
+      end
+    end
+  end
+
+  if RUBY_VERSION < '1.9'
+    test "clean leaves ASCII strings intact" do
+      with_encoding('None') do
+        [
+          'word', "\270\236\010\210\245"
+        ].each do |string|
+          assert_equal string, ActiveSupport::Multibyte.clean(string)
+        end
+      end
+    end
+
+    test "clean cleans invalid characters from UTF-8 encoded strings" do
+      with_encoding('UTF8') do
+        cleaned_utf8 = [8].pack('C*')
+        assert_equal example('valid UTF-8'), ActiveSupport::Multibyte.clean(example('valid UTF-8'))
+        assert_equal cleaned_utf8, ActiveSupport::Multibyte.clean(example('invalid UTF-8'))
+      end
+    end
+
+    test "clean cleans invalid characters from Shift-JIS encoded strings" do
+      with_encoding('SJIS') do
+        cleaned_sjis = [184, 0, 136, 165].pack('C*')
+        assert_equal example('valid Shift-JIS'), ActiveSupport::Multibyte.clean(example('valid Shift-JIS'))
+        assert_equal cleaned_sjis, ActiveSupport::Multibyte.clean(example('invalid Shift-JIS'))
+      end
+    end
+  else
+    test "clean is a no-op" do
+      with_encoding('UTF8') do
+        assert_equal example('invalid Shift-JIS'), ActiveSupport::Multibyte.clean(example('invalid Shift-JIS'))
+      end
+    end
+  end
+
+  private
+
+  STRINGS = {
+    'valid ASCII'       => [65, 83, 67, 73, 73].pack('C*'),
+    'invalid ASCII'     => [128].pack('C*'),
+    'valid UTF-8'       => [227, 129, 147, 227, 129, 171, 227, 129, 161, 227, 130, 143].pack('C*'),
+    'invalid UTF-8'     => [184, 158, 8, 136, 165].pack('C*'),
+    'valid Shift-JIS'   => [131, 122, 129, 91, 131, 128].pack('C*'),
+    'invalid Shift-JIS' => [184, 158, 8, 0, 255, 136, 165].pack('C*')
+  }
+
+  if Kernel.const_defined?(:Encoding)
+    def example(key)
+      STRINGS[key].force_encoding(Encoding.default_internal)
+    end
+
+    def examples
+      STRINGS.values.map { |s| s.force_encoding(Encoding.default_internal) }
+    end
+  else
+    def example(key)
+      STRINGS[key]
+    end
+
+    def examples
+      STRINGS.values
+    end
+  end
+
+  if 'string'.respond_to?(:encoding)
+    def with_encoding(enc)
+      before = Encoding.default_internal
+
+      case enc
+      when 'UTF8'
+        Encoding.default_internal = Encoding::UTF_8
+      when 'SJIS'
+        Encoding.default_internal = Encoding::Shift_JIS
+      else
+        Encoding.default_internal = Encoding::BINARY
+      end
+      yield
+
+      Encoding.default_internal = before
+    end
+  else
+    alias with_encoding with_kcode
+  end
+end
\ No newline at end of file
-- 
1.6.0.1




Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activesupport/F-11/rubygem-activesupport.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-activesupport.spec	26 Jul 2009 10:58:09 -0000	1.10
+++ rubygem-activesupport.spec	22 Sep 2009 18:23:05 -0000	1.11
@@ -7,11 +7,12 @@
 Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:  rubygem-activesupport-2.3.x-CVE-2009-3009.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 BuildRequires: rubygems
@@ -32,6 +33,10 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+pushd %{buildroot}%{geminstdir}
+cat %{PATCH0} | patch -s -p2
+popd
+
 # Remove bad shebangs
 for file in %{buildroot}%{geminstdir}/lib/active_support/vendor/builder-2.1.2/builder.rb \
          %{buildroot}%{geminstdir}/lib/active_support/vendor/builder-2.1.2/blankslate.rb \
@@ -57,6 +62,7 @@ rm -rf %{buildroot}
 %dir %{geminstdir}
 %doc %{geminstdir}/CHANGELOG
 %{geminstdir}/lib
+%{geminstdir}/test/
 %doc %{geminstdir}/README
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -64,6 +70,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
+- Patch for CVE-2009-3009 (bug 520843)
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 



From mtasaka at fedoraproject.org  Tue Sep 22 18:23:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Sep 2009 18:23:12 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-11
	rubygem-actionpack-2.3.x-CVE-2009-3009.patch, NONE,
	1.1 rubygem-actionpack.spec, 1.10, 1.11
Message-ID: <20090922182312.6DB0D11C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23038

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.3.x-CVE-2009-3009.patch 
Log Message:
* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
- Patch for CVE-2009-3009 (bug 520843)


rubygem-actionpack-2.3.x-CVE-2009-3009.patch:
 tag_helper.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.3.x-CVE-2009-3009.patch ---
>From b066ffe93fb88af3b1e4795783bb71a7b8095ac5 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael at koziarski.com>
Date: Mon, 31 Aug 2009 12:07:30 -0700
Subject: [PATCH] Clean tag attributes before passing through the escape_once logic.

Addresses CVE-2009-3009
---
 actionpack/lib/action_view/helpers/tag_helper.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index af8c4d5..db99a0e 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -103,7 +103,7 @@ module ActionView
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
       end
 
       private
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/F-11/rubygem-actionpack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-actionpack.spec	28 Jul 2009 21:20:58 -0000	1.10
+++ rubygem-actionpack.spec	22 Sep 2009 18:23:12 -0000	1.11
@@ -7,11 +7,12 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:  rubygem-actionpack-2.3.x-CVE-2009-3009.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -35,6 +36,10 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+pushd %{buildroot}%{geminstdir}
+cat %{PATCH0} | patch -s -p2
+popd
+
 # Remove backup files
 find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
 
@@ -71,6 +76,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
+- Patch for CVE-2009-3009 (bug 520843)
+
 * Tue Jul 28 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 



From dajt at fedoraproject.org  Tue Sep 22 18:36:00 2009
From: dajt at fedoraproject.org (Jay Fenlason)
Date: Tue, 22 Sep 2009 18:36:00 +0000 (UTC)
Subject: rpms/openmpi/devel openmpi.spec,1.42,1.43
Message-ID: <20090922183601.10BE511C00E8@cvs1.fedora.phx.redhat.com>

Author: dajt

Update of /cvs/pkgs/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28607

Modified Files:
	openmpi.spec 
Log Message:
Create and own man* directories for use by dependent packages.



Index: openmpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- openmpi.spec	16 Sep 2009 18:50:56 -0000	1.42
+++ openmpi.spec	22 Sep 2009 18:36:00 -0000	1.43
@@ -19,7 +19,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.3.3
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
@@ -140,6 +140,7 @@ find %{buildroot}%{_mandir}/%{namearch} 
 ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz
 rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1
 rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz
+mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
 
 # Make the pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
@@ -165,8 +166,7 @@ rm -rf %{buildroot}
 %dir %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/lib/openmpi
 %dir %{_mandir}/%{namearch}
-%dir %{_mandir}/%{namearch}/man1
-%dir %{_mandir}/%{namearch}/man7
+%dir %{_mandir}/%{namearch}/man*
 %dir %{_fmoddir}/%{namearch}
 %dir %{python_sitearch}/%{name}
 %config(noreplace) %{_sysconfdir}/%{namearch}/*
@@ -196,9 +196,6 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/%{namearch}
-%dir %{_mandir}/%{namearch}/man1
-%dir %{_mandir}/%{namearch}/man3
-%dir %{_mandir}/%{namearch}/man7
 %dir %{_libdir}/%{name}/share/vampirtrace
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/%{name}/bin/mpi[cCf]*
@@ -217,6 +214,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Tue Sep 22 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-6
+- Create and own man* directories for use by dependent packages.
+
 * Wed Sep 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-5
 - Move the module file from %{_datadir}/Modules/modulefiles/%{namearch} to
   %{_sysconfdir}/modulefiles/%{namearch} where it belongs.



From thomasj at fedoraproject.org  Tue Sep 22 18:46:38 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue, 22 Sep 2009 18:46:38 +0000 (UTC)
Subject: rpms/skrooge/devel .cvsignore, 1.2, 1.3 skrooge.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090922184638.8332211C00E8@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1320

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Sep 2009 08:52:48 -0000	1.2
+++ .cvsignore	22 Sep 2009 18:46:37 -0000	1.3
@@ -1 +1 @@
-skrooge-0.5.1.tar.gz
+skrooge-0.5.2.tar.gz


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skrooge.spec	21 Sep 2009 20:35:37 -0000	1.3
+++ skrooge.spec	22 Sep 2009 18:46:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           skrooge
-Version:        0.5.1
-Release:        0.5.beta%{?dist}
+Version:        0.5.2
+Release:        0.1.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -123,6 +123,9 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
+- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
+
 * Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
 - Added -libs Requires libofx
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Sep 2009 08:52:48 -0000	1.2
+++ sources	22 Sep 2009 18:46:37 -0000	1.3
@@ -1 +1 @@
-23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz
+25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz



From spot at fedoraproject.org  Tue Sep 22 18:49:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Sep 2009 18:49:22 +0000 (UTC)
Subject: rpms/rocksndiamonds/devel .cvsignore, 1.8, 1.9 rocksndiamonds.spec, 
	1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20090922184922.721BE11C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rocksndiamonds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2916

Modified Files:
	.cvsignore rocksndiamonds.spec sources 
Log Message:
3.2.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rocksndiamonds/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Jan 2009 22:20:42 -0000	1.8
+++ .cvsignore	22 Sep 2009 18:49:21 -0000	1.9
@@ -3,3 +3,4 @@ rocksndiamonds-3.2.3-clean.tar.gz
 rocksndiamonds-3.2.4-clean.tar.gz
 rocksndiamonds-distributable-music.tar.bz2
 rocksndiamonds-3.2.6.0-clean.tar.gz
+rocksndiamonds-3.2.6.1-clean.tar.gz


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rocksndiamonds.spec	27 Jul 2009 03:06:33 -0000	1.17
+++ rocksndiamonds.spec	22 Sep 2009 18:49:21 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
-Version:	3.2.6.0
-Release:	4%{?dist}
+Version:	3.2.6.1
+Release:	1%{?dist}
 License:	GPL+
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.6.1-1
+- update to 3.2.6.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rocksndiamonds/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Jan 2009 22:20:42 -0000	1.8
+++ sources	22 Sep 2009 18:49:21 -0000	1.9
@@ -1,2 +1,2 @@
-bb77a0c6a5737a863528053a27fad430  rocksndiamonds-3.2.6.0-clean.tar.gz
 6a9a5ae28689254363c91716fbad1824  rocksndiamonds-distributable-music.tar.bz2
+ff73ee52b51d55f1cd69c6d36a6b5de4  rocksndiamonds-3.2.6.1-clean.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:28 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184929.54C3510F87C@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:32 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184932.8304110F889@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:36 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184936.B263310F890@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:39 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184939.6FE1D10F89A@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:42 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184942.9EE8010F89C@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:48 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184948.6760410F87E@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Tue Sep 22 18:49:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 18:49:48 +0000
Subject: [pkgdb] openwsman: praveenp has requested commit
Message-ID: <20090922184948.6F2CB10F8A1@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on openwsman (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From thomasj at fedoraproject.org  Tue Sep 22 18:54:01 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue, 22 Sep 2009 18:54:01 +0000 (UTC)
Subject: rpms/skrooge/F-12 .cvsignore, 1.2, 1.3 skrooge.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090922185401.3AD4211C00E8@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4690

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Sep 2009 09:10:17 -0000	1.2
+++ .cvsignore	22 Sep 2009 18:54:00 -0000	1.3
@@ -1 +1 @@
-skrooge-0.5.1.tar.gz
+skrooge-0.5.2.tar.gz


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/skrooge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skrooge.spec	21 Sep 2009 21:37:12 -0000	1.2
+++ skrooge.spec	22 Sep 2009 18:54:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           skrooge
-Version:        0.5.1
-Release:        0.5.beta%{?dist}
+Version:        0.5.2
+Release:        0.1.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -123,6 +123,9 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
+- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
+
 * Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
 - Added -libs Requires libofx
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Sep 2009 09:10:18 -0000	1.2
+++ sources	22 Sep 2009 18:54:00 -0000	1.3
@@ -1 +1 @@
-23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz
+25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 22 19:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 19:09:29 +0000
Subject: [pkgdb] sblim-sfcc: praveenp has requested commit
Message-ID: <20090922190930.A293210F876@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-sfcc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Tue Sep 22 19:09:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 19:09:36 +0000
Subject: [pkgdb] sblim-sfcc: praveenp has requested commit
Message-ID: <20090922190936.D4DA010F88A@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-sfcc (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From thomasj at fedoraproject.org  Tue Sep 22 19:10:16 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue, 22 Sep 2009 19:10:16 +0000 (UTC)
Subject: rpms/skrooge/F-11 .cvsignore, 1.2, 1.3 skrooge.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090922191016.BEA9111C0423@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10276

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Sep 2009 09:32:42 -0000	1.2
+++ .cvsignore	22 Sep 2009 19:10:14 -0000	1.3
@@ -1 +1 @@
-skrooge-0.5.1.tar.gz
+skrooge-0.5.2.tar.gz


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skrooge.spec	21 Sep 2009 21:53:07 -0000	1.2
+++ skrooge.spec	22 Sep 2009 19:10:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           skrooge
-Version:        0.5.1
-Release:        0.5.beta%{?dist}
+Version:        0.5.2
+Release:        0.1.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -123,6 +123,9 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
+- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
+
 * Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
 - Added -libs Requires libofx
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Sep 2009 09:32:42 -0000	1.2
+++ sources	22 Sep 2009 19:10:15 -0000	1.3
@@ -1 +1 @@
-23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz
+25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz



From ausil at fedoraproject.org  Tue Sep 22 19:21:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:21:11 +0000 (UTC)
Subject: rpms/mldonkey/devel mldonkey.spec,1.7,1.8
Message-ID: <20090922192111.7811911C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mldonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13899

Modified Files:
	mldonkey.spec 
Log Message:
exlcudearch sparc64 s390 s390x no ocaml



Index: mldonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/mldonkey.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mldonkey.spec	25 Jul 2009 14:37:22 -0000	1.7
+++ mldonkey.spec	22 Sep 2009 19:21:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		mldonkey
 Version:	3.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Client for several P2P networks
 License:	GPLv2+
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -22,6 +22,8 @@ BuildRequires:	librsvg2-devel >= 2.4.0
 BuildRequires:	bzip2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	file-devel
+ExcludeArch:     sparc64 s390 s390x
+
 Requires:	logrotate
 # for kill_mldonkey
 Requires:	perl(LWP::UserAgent)
@@ -319,6 +321,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 3.0.0-3
+- ExlcudeArch sparc64 s390 s390x since they dont have ocaml
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Sep 22 19:22:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 19:22:34 +0000 (UTC)
Subject: rpms/libsigsegv/devel libsigsegv-2.6-mystack.patch, NONE,
	1.1 libsigsegv.spec, 1.22, 1.23
Message-ID: <20090922192234.132F311C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15035

Modified Files:
	libsigsegv.spec 
Added Files:
	libsigsegv-2.6-mystack.patch 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
- libsigsegv allocates alternate stack on the main stack (#524796)


libsigsegv-2.6-mystack.patch:
 b/src/sigsegv.h.in                          |    8 +++++---
 b/tests/stackoverflow1.c                    |    7 ++++---
 b/tests/stackoverflow2.c                    |    8 ++++----
 libsigsegv-2.6/m4/sigaltstack-longjmp.m4    |    2 +-
 libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4 |    2 +-
 libsigsegv-2.6/m4/sigaltstack.m4            |    3 ++-
 6 files changed, 17 insertions(+), 13 deletions(-)

--- NEW FILE libsigsegv-2.6-mystack.patch ---
>From 4f14ef87b2fba9718c1a88b9ed9ca7ba111d60da Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Tue, 22 Sep 2009 08:10:43 +0000
Subject: Fix crash of stackoverflow2 on x86_64-linux.

---
diff --git a/src/sigsegv.h.in b/src/sigsegv.h.in
index 85f337d..6b8e4c7 100644
--- a/src/sigsegv.h.in
+++ b/src/sigsegv.h.in
@@ -121,9 +121,11 @@ typedef void (*stackoverflow_handler_t) (int emergency, stackoverflow_context_t
 /*
  * Installs a stack overflow handler.
  * The extra_stack argument is a pointer to a pre-allocated area used as a
- * stack for executing the handler. It is typically allocated by use of
- * `alloca' during `main'. Its size should be sufficiently large.
- * The following code determines an appropriate size:
+ * stack for executing the handler. It typically comes from a static variable
+ * or from heap-allocated memoty; placing it on the main stack may fail on
+ * some operating systems.
+ * Its size, passed in extra_stack_size, should be sufficiently large.  The
+ * following code determines an appropriate size:
  *   #include <signal.h>
  *   #ifndef SIGSTKSZ         / * glibc defines SIGSTKSZ for this purpose * /
  *   # define SIGSTKSZ 16384  / * on most platforms, 16 KB are sufficient * /
diff --git a/tests/stackoverflow1.c b/tests/stackoverflow1.c
index 0970e79..23eff58 100644
--- a/tests/stackoverflow1.c
+++ b/tests/stackoverflow1.c
@@ -88,12 +88,13 @@ recurse (volatile int n)
   return *recurse_1 (n, &n);
 }
 
+/* glibc says: Users should use SIGSTKSZ as the size of user-supplied
+   buffers.  */
+char mystack[2 * 2 * SIGSTKSZ];
+
 int
 main ()
 {
-  /* glibc says: Users should use SIGSTKSZ as the size of user-supplied
-     buffers.  */
-  char mystack[SIGSTKSZ];
   sigset_t emptyset;
 
 #if HAVE_SETRLIMIT && defined RLIMIT_STACK
diff --git a/tests/stackoverflow2.c b/tests/stackoverflow2.c
index 2475bf2..4a07c66 100644
--- a/tests/stackoverflow2.c
+++ b/tests/stackoverflow2.c
@@ -109,12 +109,13 @@ recurse (volatile int n)
   return *recurse_1 (n, &n);
 }
 
+/* glibc says: Users should use SIGSTKSZ as the size of user-supplied
+   buffers.  */
+char mystack[2 * SIGSTKSZ];
+
 int
 main ()
 {
-  /* glibc says: Users should use SIGSTKSZ as the size of user-supplied
-     buffers.  */
-  char mystack[SIGSTKSZ];
   sigset_t emptyset;
   void *p;
 
--
cgit v0.8.2.1
diff -up libsigsegv-2.6/m4/sigaltstack-longjmp.m4.stack2 libsigsegv-2.6/m4/sigaltstack-longjmp.m4
--- libsigsegv-2.6/m4/sigaltstack-longjmp.m4.stack2	2008-08-24 15:40:16.000000000 -0500
+++ libsigsegv-2.6/m4/sigaltstack-longjmp.m4	2009-09-22 13:26:07.552664938 -0500
@@ -51,9 +51,9 @@ int recurse (volatile int n)
   int sum = 0;
   return *recurse_1 (n, &sum);
 }
+char mystack[2 * SIGSTKSZ];
 int main ()
 {
-  char mystack[SIGSTKSZ];
   stack_t altstack;
   struct sigaction action;
   sigset_t emptyset;
diff -up libsigsegv-2.6/m4/sigaltstack.m4.stack2 libsigsegv-2.6/m4/sigaltstack.m4
--- libsigsegv-2.6/m4/sigaltstack.m4.stack2	2008-08-24 15:41:10.000000000 -0500
+++ libsigsegv-2.6/m4/sigaltstack.m4	2009-09-22 13:25:47.462666140 -0500
@@ -71,9 +71,10 @@ int recurse (volatile int n)
   int sum = 0;
   return *recurse_1 (n, &sum);
 }
+char mystack[2 * SIGSTKSZ];
+
 int main ()
 {
-  char mystack[SIGSTKSZ];
   stack_t altstack;
   struct sigaction action;
 #if defined HAVE_SETRLIMIT && defined RLIMIT_STACK
diff -up libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4.stack2 libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4
--- libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4.stack2	2008-08-24 15:40:49.000000000 -0500
+++ libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4	2009-09-22 13:26:43.994665249 -0500
@@ -49,9 +49,9 @@ int recurse (volatile int n)
   int sum = 0;
   return *recurse_1 (n, &sum);
 }
+char mystack[2 * SIGSTKSZ];
 int main ()
 {
-  char mystack[SIGSTKSZ];
   stack_t altstack;
   struct sigaction action;
 #ifdef __BEOS__


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libsigsegv.spec	25 Jul 2009 08:38:23 -0000	1.22
+++ libsigsegv.spec	22 Sep 2009 19:22:33 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -12,8 +12,18 @@ Source0: http://ftp.gnu.org/gnu/libsigse
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#Patch1: libsigsegv-2.6-confdefs_debug.patch
+
+## upstream patches
+# based on:
+# http://git.savannah.gnu.org/cgit/libsigsegv.git/patch/?id=4f14ef87b2fba9718c1a88b9ed9ca7ba111d60da
+# http://git.savannah.gnu.org/cgit/libsigsegv.git/patch/?id=54b612e978e26a52b5706272dabf84ed9d895fa7
+Patch100: libsigsegv-2.6-mystack.patch
+
 Source1: sigsegv-wrapper.h
 
+BuildRequires: automake libtool
+
 %description
 This is a library for handling page faults in user mode. A page fault
 occurs when a program tries to access to a region of memory that is
@@ -43,6 +53,9 @@ Requires: %{name}-devel = %{version}-%{r
 %prep
 %setup -q
 
+%patch100 -p1 -b .mystack
+autoreconf
+
 
 %build
 %configure \
@@ -111,6 +124,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
+- libsigsegv allocates alternate stack on the main stack (#524796)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thomasj at fedoraproject.org  Tue Sep 22 19:25:54 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue, 22 Sep 2009 19:25:54 +0000 (UTC)
Subject: rpms/skrooge/F-10 .cvsignore, 1.2, 1.3 skrooge.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090922192554.B5CD611C00E8@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16573

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Sep 2009 09:56:36 -0000	1.2
+++ .cvsignore	22 Sep 2009 19:25:54 -0000	1.3
@@ -1 +1 @@
-skrooge-0.5.1.tar.gz
+skrooge-0.5.2.tar.gz


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/skrooge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skrooge.spec	22 Sep 2009 05:54:46 -0000	1.2
+++ skrooge.spec	22 Sep 2009 19:25:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           skrooge
-Version:        0.5.1
-Release:        0.5.beta%{?dist}
+Version:        0.5.2
+Release:        0.1.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -123,6 +123,9 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
+- Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
+
 * Mon Sep 21 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.1-0.5.beta
 - Added -libs Requires libofx
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Sep 2009 09:56:36 -0000	1.2
+++ sources	22 Sep 2009 19:25:54 -0000	1.3
@@ -1 +1 @@
-23777cbce2afb6198197683846e9f89c  skrooge-0.5.1.tar.gz
+25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz



From ajax at fedoraproject.org  Tue Sep 22 19:35:04 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 22 Sep 2009 19:35:04 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.125, 
	1.126
Message-ID: <20090922193504.8ECE911C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19561

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
* Tue Sep 22 2009 Adam Jackson <ajax at redhat.com> 2.28.0-2
- BuildRequires: libcanberra-devel



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- gnome-settings-daemon.spec	22 Sep 2009 00:49:49 -0000	1.125
+++ gnome-settings-daemon.spec	22 Sep 2009 19:35:04 -0000	1.126
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -30,6 +30,7 @@ BuildRequires:	libgnomekbd-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	gettext intltool
 BuildRequires:  fontconfig-devel
+BuildRequires:	libcanberra-devel
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -159,6 +160,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Sep 22 2009 Adam Jackson <ajax at redhat.com> 2.28.0-2
+- BuildRequires: libcanberra-devel
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From ausil at fedoraproject.org  Tue Sep 22 19:36:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:36:16 +0000 (UTC)
Subject: rpms/why/devel why.spec,1.5,1.6
Message-ID: <20090922193616.504D011C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/why/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753

Modified Files:
	why.spec 
Log Message:
no ocaml on s390 s390x and sparc64



Index: why.spec
===================================================================
RCS file: /cvs/pkgs/rpms/why/devel/why.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- why.spec	8 Aug 2009 02:35:30 -0000	1.5
+++ why.spec	22 Sep 2009 19:36:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           why
 Version:        2.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Why software verification platform
 
 Group:          Applications/Engineering
@@ -23,6 +23,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ocaml >= 3.09, ocaml-camlp4-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, dos2unix, prelink
 BuildRequires:  ocaml-ocamlgraph
 
+ExcludeArch:    sparc64 s390 s390x
 %if 0%{?fedora} >= 11
 # Doesn't seem to build on ppc64 for Fedora >= 11
 # bz: 516317
@@ -247,6 +248,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 2.17-5
+- Exclude sparc64 s390 s390x  there is no ocaml there
+
 * Fri Aug 07 2009 Alan Dunn <amdunn at gmail.com> - 2.17-4
 - Removed now irrelevant check for no OCaml in Fedora < 9 (those
   distributions are EOL)



From pbrobinson at fedoraproject.org  Tue Sep 22 19:37:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 19:37:53 +0000 (UTC)
Subject: rpms/ptlib/F-11 .cvsignore, 1.9, 1.10 ptlib.spec, 1.18, 1.19 sources,
	1.9, 1.10
Message-ID: <20090922193753.59D4911C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20434

Modified Files:
	.cvsignore ptlib.spec sources 
Log Message:
- New 2.6.5 stable release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Jul 2009 21:34:48 -0000	1.9
+++ .cvsignore	22 Sep 2009 19:37:53 -0000	1.10
@@ -1 +1 @@
-ptlib-2.6.4.tar.bz2
+ptlib-2.6.5.tar.bz2


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-11/ptlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ptlib.spec	6 Jul 2009 21:34:49 -0000	1.18
+++ ptlib.spec	22 Sep 2009 19:37:53 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.6.4
-Release:	2%{?dist}
+Version:	2.6.5
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -40,7 +40,7 @@ The ptlib-devel package includes the lib
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
 %configure --prefix=%{_prefix} --disable-static --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,8 +81,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
-* Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> - 2.6.4-2
-- Commit the new sources file too
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> - 2.6.5-1
+- New 2.6.5 stable release
+
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-5
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> - 2.6.4-1
 - New 2.6.4 stable release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Jul 2009 21:34:49 -0000	1.9
+++ sources	22 Sep 2009 19:37:53 -0000	1.10
@@ -1 +1 @@
-bcc8e2d5bb6be7e3fea857ce2f7fce5c  ptlib-2.6.4.tar.bz2
+db7fd581b66998cd76d96f8b7c3f22a1  ptlib-2.6.5.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep 22 19:39:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 19:39:09 +0000 (UTC)
Subject: rpms/opal/F-11 .cvsignore, 1.20, 1.21 opal.spec, 1.52, 1.53 sources,
	1.21, 1.22
Message-ID: <20090922193909.6D99611C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20997

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- New 3.6.6 stable release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	6 Jul 2009 21:38:41 -0000	1.20
+++ .cvsignore	22 Sep 2009 19:39:08 -0000	1.21
@@ -1 +1 @@
-opal-3.6.4-noilbc.tar.bz2
+opal-3.6.6-noilbc.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/opal.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- opal.spec	6 Jul 2009 21:38:41 -0000	1.52
+++ opal.spec	22 Sep 2009 19:39:08 -0000	1.53
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
-Version:	3.6.4
-Release:	2%{?dist}
+Version:	3.6.6
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 # We cannot use unmodified upstream source code because it contains the 
 # non-free iLBC codec.
@@ -12,7 +12,7 @@ Source0:	%{name}-%{version}-noilbc.tar.b
 Patch0:		opal-3.6.1-noilbc.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
-BuildRequires:	ptlib-devel = 2.6.4
+BuildRequires:	ptlib-devel = 2.6.5
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libtheora-devel
@@ -31,7 +31,7 @@ Summary:	Development package for opal
 Group:		Development/Libraries
 Requires:	opal = %{version}-%{release}
 Requires:	openssl-devel
-Requires:	ptlib-devel = 2.6.4
+Requires:	ptlib-devel = 2.6.5
 Requires:	pkgconfig
 
 %description devel
@@ -45,7 +45,7 @@ header files for opal.
 %build
 %configure
 
-make OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,8 +75,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.6-1
+- New 3.6.6 stable release
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.4-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.4-2
-- Commit the new sources file too
+- Increment required ptlib version
 
 * Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.4-1
 - New 3.6.4 stable release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	6 Jul 2009 21:38:41 -0000	1.21
+++ sources	22 Sep 2009 19:39:08 -0000	1.22
@@ -1 +1 @@
-743afaa78440601257c1a88903f55436  opal-3.6.4-noilbc.tar.bz2
+3df30a6123142ad1fc1df714af3e25be  opal-3.6.6-noilbc.tar.bz2



From ausil at fedoraproject.org  Tue Sep 22 19:39:51 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:39:51 +0000 (UTC)
Subject: rpms/LabPlot/devel LabPlot.spec,1.16,1.17
Message-ID: <20090922193951.08D8611C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21416

Modified Files:
	LabPlot.spec 
Log Message:
exclude sparc64 s390x s390  no ocaml



Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- LabPlot.spec	24 Jul 2009 15:35:42 -0000	1.16
+++ LabPlot.spec	22 Sep 2009 19:39:50 -0000	1.17
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           5%{?dist}
+Release:           6%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -17,7 +17,7 @@ BuildRequires:     gsl-devel ImageMagick
 BuildRequires:     pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel ocaml
 BuildRequires:     liborigin-devel qhull-devel
 
-ExcludeArch:       ppc64
+ExcludeArch:       ppc64 sparc64 s390 s390x
 
 Requires:          electronics-menu
 
@@ -353,6 +353,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-4
+- ExcludeArch s390 s390x and sparc64 no ocaml
+
 * Sun Nov 16 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-3
 - handle libLabPlotnetCDF.so* on F-8 and F-9
 



From pbrobinson at fedoraproject.org  Tue Sep 22 19:40:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Sep 2009 19:40:40 +0000 (UTC)
Subject: rpms/ekiga/F-11 .cvsignore, 1.22, 1.23 ekiga.spec, 1.83,
	1.84 sources, 1.24, 1.25
Message-ID: <20090922194040.DBFE411C0423@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22015

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Commit the new sources file too


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	6 Jul 2009 21:36:32 -0000	1.22
+++ .cvsignore	22 Sep 2009 19:40:40 -0000	1.23
@@ -1 +1 @@
-ekiga-3.2.5.tar.bz2
+ekiga-3.2.6.tar.bz2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-11/ekiga.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ekiga.spec	6 Jul 2009 21:36:32 -0000	1.83
+++ ekiga.spec	22 Sep 2009 19:40:40 -0000	1.84
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
-Version:	3.2.5
-Release:	2%{?dist}
+Version:	3.2.6
+Release:	1%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -19,8 +19,8 @@ BuildRequires:	avahi-glib-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
-BuildRequires:	ptlib-devel = 2.6.4
-BuildRequires:	opal-devel = 3.6.4
+BuildRequires:	ptlib-devel = 2.6.5
+BuildRequires:	opal-devel = 3.6.6
 BuildRequires:	libxml2-devel
 BuildRequires:	libXv-devel
 BuildRequires:	intltool >= 0.22
@@ -49,6 +49,9 @@ It uses the standard SIP and H323 protoc
 %prep
 %setup -q
 
+# force regeneration to drop translations
+rm ekiga.schemas
+
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
 %configure --disable-scrollkeeper
@@ -139,9 +142,19 @@ scrollkeeper-update -q || :
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
-* Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.5-2
-- Commit the new sources file too
-
+* Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.6-1
+- Ekiga 3.2.6 stable - Changelog
+  ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.2/ekiga-3.2.6.news
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.5-4
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  9 2009 Matthias Clasen <mclasen at redhat.com> - 3.2.5-2
+- Shrink GConf schemas
+ 
 * Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.5-1
 - Ekiga 3.2.5 stable - Changelog
   ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.2/ekiga-3.2.5.news


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	6 Jul 2009 21:36:32 -0000	1.24
+++ sources	22 Sep 2009 19:40:40 -0000	1.25
@@ -1 +1 @@
-a545490e03a6b49f00253bf0d692f362  ekiga-3.2.5.tar.bz2
+cce46bce30c0b59705bea4b81268abe6  ekiga-3.2.6.tar.bz2



From ausil at fedoraproject.org  Tue Sep 22 19:44:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:44:29 +0000 (UTC)
Subject: rpms/rpmdepsize/devel rpmdepsize.spec,1.3,1.4
Message-ID: <20090922194429.99E7A11C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rpmdepsize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23611

Modified Files:
	rpmdepsize.spec 
Log Message:
exlcude sparc64 s390 s390x  no ocaml



Index: rpmdepsize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdepsize/devel/rpmdepsize.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rpmdepsize.spec	27 Jul 2009 03:12:55 -0000	1.3
+++ rpmdepsize.spec	22 Sep 2009 19:44:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rpmdepsize
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A tool for visualizing RPM dependencies
 
 Group:          Development/Libraries
@@ -19,6 +19,8 @@ BuildRequires:  ocaml-lablgtk-devel >= 2
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  yum >= 3.2.21
 
+ExcludeArch: sparc64 s390 s390x
+
 # To remove executable stack
 # https://bugzilla.redhat.com/show_bug.cgi?id=450551
 %if 0%{?fedora} < 11
@@ -79,6 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.0-6
+- ExcludeArch s390 s390x sparc64 no ocaml 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Sep 22 19:45:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 19:45:40 +0000 (UTC)
Subject: rpms/metacity/devel .cvsignore, 1.87, 1.88 metacity.spec, 1.202,
	1.203 sources, 1.87, 1.88
Message-ID: <20090922194540.8878A11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24017

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	8 Sep 2009 21:46:34 -0000	1.87
+++ .cvsignore	22 Sep 2009 19:45:40 -0000	1.88
@@ -1 +1 @@
-metacity-2.27.1.tar.bz2
+metacity-2.28.0.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- metacity.spec	8 Sep 2009 21:46:34 -0000	1.202
+++ metacity.spec	22 Sep 2009 19:45:40 -0000	1.203
@@ -1,9 +1,9 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.27.1
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=135056
@@ -188,6 +188,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.cm> - 2.27.1-1
 - Update to 2.27.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	8 Sep 2009 21:46:34 -0000	1.87
+++ sources	22 Sep 2009 19:45:40 -0000	1.88
@@ -1 +1 @@
-9a952cdb925912d9b3b12ad460e25894  metacity-2.27.1.tar.bz2
+9d87e390cf9979978f2290aebc41f83b  metacity-2.28.0.tar.bz2



From ausil at fedoraproject.org  Tue Sep 22 19:49:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:49:12 +0000 (UTC)
Subject: rpms/hevea/devel hevea.spec,1.11,1.12
Message-ID: <20090922194912.63B1F11C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/hevea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25723

Modified Files:
	hevea.spec 
Log Message:
switch ExclusiveArch to ExcludeArch



Index: hevea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hevea/devel/hevea.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hevea.spec	25 Jul 2009 02:08:02 -0000	1.11
+++ hevea.spec	22 Sep 2009 19:49:12 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           hevea
 Version:        1.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        LaTeX to HTML translator
 Group:          Applications/Publishing
 License:        QPL
@@ -12,7 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:	ocaml >= 3.0.7, /usr/bin/kpsewhich
 Requires:       tetex-latex netpbm-progs ghostscript tetex-dvips
 # Temporary until ocaml works
-ExclusiveArch:  alpha armv4l %{ix86} x86_64 ia64 ppc sparc
+ExcludeArch:    sparc64 s390 s390x
 
 %description
 HEVEA is a quite complete and fast LATEX to HTML translator.
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.10-5
+- switch ExclusiveArch to ExcludeArch on arches withot ocaml
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Tue Sep 22 19:51:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:51:52 +0000 (UTC)
Subject: rpms/zenon/devel zenon.spec,1.7,1.8
Message-ID: <20090922195152.B54C011C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/zenon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26636

Modified Files:
	zenon.spec 
Log Message:
Exlcude sparc64 no ocaml



Index: zenon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zenon/devel/zenon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- zenon.spec	12 Aug 2009 19:50:31 -0000	1.7
+++ zenon.spec	22 Sep 2009 19:51:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		zenon
 Version:	0.5.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Automated theorem prover for first-order classical logic
 Group:		Applications/Engineering
 License:	BSD
@@ -19,7 +19,7 @@ BuildRequires:	prelink
 %if 0%fedora == 8
 ExcludeArch: ppc64
 %endif
-ExcludeArch: s390 s390x
+ExcludeArch: s390 s390x sparc64
 
 %description
 Zenon is an automated theorem prover for first order classical logic
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 22 2009 Dennis gilmore <dennis at ausil.us> - 0.5.0-7
+- ExcludeArch sparc64  no ocaml
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.0-6
 - Use bzipped upstream tarball.
 



From ausil at fedoraproject.org  Tue Sep 22 19:55:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:55:32 +0000 (UTC)
Subject: rpms/ocaml-ancient/devel ocaml-ancient.spec,1.2,1.3
Message-ID: <20090922195532.9275E11C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ocaml-ancient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29770

Modified Files:
	ocaml-ancient.spec 
Log Message:
exclude s390 s390x sparc64  no ocaml



Index: ocaml-ancient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ancient/devel/ocaml-ancient.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ocaml-ancient.spec	25 Jul 2009 19:50:00 -0000	1.2
+++ ocaml-ancient.spec	22 Sep 2009 19:55:31 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           ocaml-ancient
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for large memory structures and sharing
 
 Group:          Development/Libraries
@@ -18,6 +18,7 @@ BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  chrpath
+ExcludeArch:    sparc64 s390 s390x
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -113,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.0-3
+- ExcludeArch sparc64 s390 s390x  no ocaml
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Tue Sep 22 19:57:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 22 Sep 2009 19:57:52 +0000 (UTC)
Subject: rpms/bibtex2html/devel bibtex2html.spec,1.2,1.3
Message-ID: <20090922195752.5B88C11C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bibtex2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30980

Modified Files:
	bibtex2html.spec 
Log Message:
ExcludeArch sparc64 s390 s390x




Index: bibtex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/devel/bibtex2html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bibtex2html.spec	24 Jul 2009 18:00:28 -0000	1.2
+++ bibtex2html.spec	22 Sep 2009 19:57:52 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           bibtex2html
 Version:        1.93
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Collection of tools for translating from BibTeX to HTML
 
 Group:          Applications/Publishing
@@ -21,6 +21,7 @@ BuildRequires:  tex(latex)
 BuildRequires:  hevea
 %endif
 
+ExcludeArch: sparc64 s390 s390x
 
 %description
 bibtex2html is a collection of tools for translating from BibTeX to HTML. 
@@ -66,6 +67,9 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.93-5
+- ExcludeArch sparc64 s390 s390x
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.93-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Sep 22 20:06:39 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 22 Sep 2009 20:06:39 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.32,1.33
Message-ID: <20090922200639.3C20811C00E8@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3941

Modified Files:
	sunbird.spec 
Log Message:
Fix build


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sunbird.spec	22 Sep 2009 14:04:16 -0000	1.32
+++ sunbird.spec	22 Sep 2009 20:06:38 -0000	1.33
@@ -11,14 +11,6 @@
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
-# The tarball is pretty inconsistent with directory structure.
-# Sometimes there is a top level directory.  That goes here.
-#
-# IMPORTANT: If there is no top level directory, this should be 
-# set to the cwd, ie: '.'
-#%define tarballdir .
-%define tarballdir comm-central
-
 Name:           sunbird
 Version:        1.0
 Release:        0.7.20090715hg%{?dist}
@@ -113,8 +105,7 @@ calendaring tasks.
 
 
 %prep
-%setup -c -q -a 2
-cd %{tarballdir}
+%setup -n comm-central -q -a 2
 %patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
@@ -157,7 +148,6 @@ make -f client.mk build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{tarballdir}
 
 # make install is bogus
 # copy tree, break symlinks



From dajt at fedoraproject.org  Tue Sep 22 20:07:47 2009
From: dajt at fedoraproject.org (Jay Fenlason)
Date: Tue, 22 Sep 2009 20:07:47 +0000 (UTC)
Subject: rpms/openmpi/F-11 macros.openmpi, NONE, 1.1 openmpi-bz515567.patch, 
	NONE, 1.1 openmpi.module.in, 1.7, 1.8 openmpi.spec, 1.37, 1.38
Message-ID: <20090922200747.9F22511C00E8@cvs1.fedora.phx.redhat.com>

Author: dajt

Update of /cvs/pkgs/rpms/openmpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4388

Modified Files:
	openmpi.module.in openmpi.spec 
Added Files:
	macros.openmpi openmpi-bz515567.patch 
Log Message:
- Backport updated .spec file from rawhide.
- Create and own man* directories for use by dependent packages.




--- NEW FILE macros.openmpi ---
%_openmpi_load \
 . /etc/profile.d/modules.sh; \
 module load openmpi-%{_arch}; \
 export CFLAGS="$CFLAGS %{optflags}";
%_openmpi_unload \
 . /etc/profile.d/modules.sh; \
 module unload openmpi-%{_arch};

openmpi-bz515567.patch:
 mca-btl-openib-device-params.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openmpi-bz515567.patch ---
Index: ompi/mca/btl/openib/mca-btl-openib-device-params.ini
===================================================================
--- ompi/mca/btl/openib/mca-btl-openib-device-params.ini	(revision 21744)
+++ ompi/mca/btl/openib/mca-btl-openib-device-params.ini	(working copy)
@@ -212,7 +212,7 @@
 
 [Chelsio T3]
 vendor_id = 0x1425
-vendor_part_id = 0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0030,0x0031,0x0032
+vendor_part_id = 0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0030,0x0031,0x0032,0x0035,0x0036
 use_eager_rdma = 1
 mtu = 2048
 receive_queues = P,65536,256,192,128


Index: openmpi.module.in
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/F-11/openmpi.module.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openmpi.module.in	21 Jul 2009 16:36:31 -0000	1.7
+++ openmpi.module.in	22 Sep 2009 20:07:47 -0000	1.8
@@ -2,10 +2,15 @@
 #
 #  OpenMPI module for use with 'environment-modules' package:
 # 
-prepend-path 		PATH 		@LIBDIR@/@MPIDIR@/bin
-prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@/lib
-setenv			CFLAGS		"-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@"
-setenv			LDFLAGS		"-L at LIBDIR@/@MPIDIR@/lib -lmpi"
-setenv 			MPI_BIN		@LIBDIR@/@MPIDIR@/bin
-setenv	 		MPI_LIB		@LIBDIR@/@MPIDIR@/lib
-setenv	 		MPI_HOME	@LIBDIR@/@MPIDIR@
+prepend-path 		PATH 		@LIBDIR@/bin
+prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
+setenv 			MPI_BIN		@LIBDIR@/bin
+setenv			MPI_SYSCONFIG	@ETCDIR@
+setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@
+setenv			MPI_INCLUDE	@INCDIR@
+setenv	 		MPI_LIB		@LIBDIR@/lib
+setenv			MPI_MAN		@MANDIR@
+setenv			MPI_PYTHON_SITEARCH	@PYSITEARCH@
+setenv			MPI_COMPILER	@COMPILER@
+setenv			MPI_SUFFIX	@SUFFIX@
+setenv	 		MPI_HOME	@LIBDIR@@


Index: openmpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/F-11/openmpi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- openmpi.spec	21 Jul 2009 16:28:05 -0000	1.37
+++ openmpi.spec	22 Sep 2009 20:07:47 -0000	1.38
@@ -11,31 +11,42 @@
 %define opt_fc gfortran
 #define opt_fcflags
 
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # Optional name suffix to use...we leave it off when compiling with gcc, but
 # for other compiled versions to install side by side, it will need a
 # suffix in order to keep the names from conflicting.
-#define cc_name_suffix -gcc
+#define _cc_name_suffix -gcc
 
-Name:			openmpi%{?cc_name_suffix}
+Name:			openmpi%{?_cc_name_suffix}
 Version:		1.3.3
-Release:		2%{?dist}
+Release:		6%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
 URL:			http://www.open-mpi.org/
-Source0:		http://www.open-mpi.org/software/ompi/v1.3/downloads/%{name}-%{version}.tar.bz2
+# We can't use %{name} here because of _cc_name_suffix
+Source0:		http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-%{version}.tar.bz2
 Source1:		openmpi.pc.in
 Source2:		openmpi.module.in
+Source3:		macros.openmpi
+Patch0:			openmpi-bz515567.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		gcc-gfortran, libtool, numactl-devel, valgrind-devel
 BuildRequires:		libibverbs-devel, opensm-devel > 3.3.0
+BuildRequires:		librdmacm librdmacm-devel
 #%ifnarch ppc
 #BuildRequires:		compat-dapl-devel
 #%endif
 Provides:		mpi
 Requires:		environment-modules
+# Requires: openmpi-common = %{version}-%{release}
 Obsoletes:		openmpi-libs
 
+# s390 is unlikely to have the hardware we want, and some of the -devel
+# packages we require aren't available there.
+ExcludeArch: s390 s390x
+
+
 %description
 Open MPI is an open source, freely available implementation of both the 
 MPI-1 and MPI-2 standards, combining technologies and resources from
@@ -45,6 +56,14 @@ compliant implementation, Open MPI offer
 software vendors, application developers, and computer science
 researchers. For more information, see http://www.open-mpi.org/ .
 
+#%package	common
+#Summary:	Common files for openmpi
+#Group:		Development/Libraries
+#BuildArch:	noarch
+
+#%description common
+#contains files that are common across installations of op
+
 %package devel
 Summary:        Development files for openmpi
 Group:          Development/Libraries
@@ -83,18 +102,22 @@ Contains development headers and librari
 
 # We set this to for convenience, since this is the unique dir we use for this
 # particular package, version, compiler
-%define mpidir %{name}/%{version}-%{opt_cc}
+%define namearch openmpi-%{_arch}%{?_cc_name_suffix}
 
 %prep
-%setup -q
+%setup -q -n openmpi-%{version}
+%patch0 -p0 -b .bz515567
 %ifarch x86_64
 XFLAGS="-fPIC"
 %endif
 
-./configure --prefix=%{_libdir}/%{mpidir} --with-libnuma=/usr \
-	--with-openib=/usr --enable-mpirun-prefix-by-default \
-	--mandir=%{_libdir}/%{mpidir}/man --enable-mpi-threads \
-	--with-ft=cr --with-valgrind \
+./configure --prefix=%{_libdir}/%{name} --with-libnuma=/usr \
+	--with-openib=/usr \
+	--mandir=%{_mandir}/%{namearch} \
+	--includedir=%{_includedir}/%{namearch} \
+	--sysconfdir=%{_sysconfdir}/%{namearch} \
+	--enable-mpi-threads \
+	--with-valgrind \
 	--with-wrapper-cflags="%{?opt_cflags} %{?modeflag}" \
 	--with-wrapper-cxxflags="%{?opt_cxxflags} %{?modeflag}" \
 	--with-wrapper-fflags="%{?opt_fflags} %{?modeflag}" \
@@ -112,18 +135,25 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-find %{buildroot}%{_libdir}/%{mpidir}/lib -name \*.la | xargs rm
-find %{buildroot}%{_libdir}/%{mpidir}/man -type f | xargs gzip -9
-ln -s mpicc.1.gz %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1.gz
-rm -f %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1
-rm -f %{buildroot}%{_libdir}/%{mpidir}/share/vampirtrace/doc/opari/lacsi01.ps.gz
+find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm
+find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9
+ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz
+rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1
+rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz
+mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
 
 # Make the pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}%{?cc_name_suffix}.pc
+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{name}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
 # Make the environment-modules file
-mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
-sed 's#@LIBDIR@#'%{_libdir}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > %{buildroot}/%{_datadir}/Modules/modulefiles/%{name}-%{_arch}%{?cc_name_suffix}
+mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
+# Since we're doing our own substitution here, use our own definitions.
+sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch}
+# make the rpm config file
+mkdir -p %{buildroot}/%{_sysconfdir}/rpm
+cp %SOURCE3 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
+mkdir -p %{buildroot}/%{_fmoddir}/%{namearch}
+mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix}
 
 %clean
 rm -rf %{buildroot}
@@ -131,58 +161,84 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{mpidir}
-%dir %{_libdir}/%{mpidir}/etc
-%dir %{_libdir}/%{mpidir}/bin
-%dir %{_libdir}/%{mpidir}/lib
-%dir %{_libdir}/%{mpidir}/lib/openmpi
-%dir %{_libdir}/%{mpidir}/man
-%dir %{_libdir}/%{mpidir}/man/man1
-%dir %{_libdir}/%{mpidir}/man/man7
-%dir %{_libdir}/%{mpidir}/share
-%dir %{_libdir}/%{mpidir}/share/openmpi
-%config(noreplace) %{_libdir}/%{mpidir}/etc/*
-%{_libdir}/%{mpidir}/bin/mpi[er]*
-%{_libdir}/%{mpidir}/bin/ompi*
-%{_libdir}/%{mpidir}/bin/opal-*
-%{_libdir}/%{mpidir}/bin/opari
-%{_libdir}/%{mpidir}/bin/orte*
-%{_libdir}/%{mpidir}/bin/otf*
-%{_libdir}/%{mpidir}/lib/openmpi/*
-%{_libdir}/%{mpidir}/lib/*.so.*
-%{_libdir}/%{mpidir}/man/man1/mpi[er]*
-%{_libdir}/%{mpidir}/man/man1/ompi*
-%{_libdir}/%{mpidir}/man/man1/opal-*
-%{_libdir}/%{mpidir}/man/man1/orte*
-%{_libdir}/%{mpidir}/man/man7/ompi*
-%{_libdir}/%{mpidir}/man/man7/orte*
-%{_libdir}/%{mpidir}/share/openmpi/doc
-%{_libdir}/%{mpidir}/share/openmpi/amca-param-sets
-%{_libdir}/%{mpidir}/share/openmpi/help*
-%{_libdir}/%{mpidir}/share/openmpi/mca*
-%{_datadir}/Modules/modulefiles/*
+%dir %{_sysconfdir}/%{namearch}
+%dir %{_libdir}/%{name}/bin
+%dir %{_libdir}/%{name}/lib
+%dir %{_libdir}/%{name}/lib/openmpi
+%dir %{_mandir}/%{namearch}
+%dir %{_mandir}/%{namearch}/man*
+%dir %{_fmoddir}/%{namearch}
+%dir %{python_sitearch}/%{name}
+%config(noreplace) %{_sysconfdir}/%{namearch}/*
+%{_libdir}/%{name}/bin/mpi[er]*
+%{_libdir}/%{name}/bin/ompi*
+#%{_libdir}/%{name}/bin/opal-*
+%{_libdir}/%{name}/bin/opari
+%{_libdir}/%{name}/bin/orte*
+%{_libdir}/%{name}/bin/otf*
+%{_libdir}/%{name}/lib/*.so.*
+%{_mandir}/%{namearch}/man1/mpi[er]*
+%{_mandir}/%{namearch}/man1/ompi*
+#%{_mandir}/%{namearch}/man1/opal-*
+%{_mandir}/%{namearch}/man1/orte*
+%{_mandir}/%{namearch}/man7/ompi*
+%{_mandir}/%{namearch}/man7/orte*
+%{_libdir}/%{name}/lib/openmpi/*
+%{_sysconfdir}/modulefiles/%{namearch}
+#%files common
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/openmpi
+%{_libdir}/%{name}/share/openmpi/doc
+%{_libdir}/%{name}/share/openmpi/amca-param-sets
+%{_libdir}/%{name}/share/openmpi/help*
+%{_libdir}/%{name}/share/openmpi/mca*
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_libdir}/%{mpidir}/include
-%dir %{_libdir}/%{mpidir}/man/man3
-%dir %{_libdir}/%{mpidir}/share/vampirtrace
-%{_libdir}/pkgconfig/%{name}%{?cc_name_suffix}.pc
-%{_libdir}/%{mpidir}/bin/mpi[cCf]*
-%{_libdir}/%{mpidir}/bin/vt*
-%{_libdir}/%{mpidir}/bin/opal_*
-%{_libdir}/%{mpidir}/include/*
-%{_libdir}/%{mpidir}/lib/*.so
-%{_libdir}/%{mpidir}/lib/lib*.a
-%{_libdir}/%{mpidir}/lib/mpi.mod
-%{_libdir}/%{mpidir}/man/man1/mpi[cCf]*
-%{_libdir}/%{mpidir}/man/man1/opal_*
-%{_libdir}/%{mpidir}/man/man3/*
-%{_libdir}/%{mpidir}/man/man7/opal*
-%{_libdir}/%{mpidir}/share/openmpi/mpi*
-%{_libdir}/%{mpidir}/share/vampirtrace/*
+%dir %{_includedir}/%{namearch}
+%dir %{_libdir}/%{name}/share/vampirtrace
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/%{name}/bin/mpi[cCf]*
+%{_libdir}/%{name}/bin/vt*
+%{_libdir}/%{name}/bin/opal_*
+%{_includedir}/%{namearch}/*
+%{_libdir}/%{name}/lib/*.so
+%{_libdir}/%{name}/lib/lib*.a
+%{_libdir}/%{name}/lib/mpi.mod
+%{_mandir}/%{namearch}/man1/mpi[cCf]*
+%{_mandir}/%{namearch}/man1/opal_*
+%{_mandir}/%{namearch}/man3/*
+%{_mandir}/%{namearch}/man7/opal*
+%{_libdir}/%{name}/share/openmpi/mpi*
+%{_libdir}/%{name}/share/vampirtrace/*
+%{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Tue Sep 22 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-6
+- Backport updated .spec file from rawhide.
+- Create and own man* directories for use by dependent packages.
+
+* Wed Sep 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-5
+- Move the module file from %{_datadir}/Modules/modulefiles/%{namearch} to
+  %{_sysconfdir}/modulefiles/%{namearch} where it belongs.
+- Have the -devel subpackage own the man1 and man7 directories for completeness.
+- Add a blank line before the clean section.
+- Remove --enable-mpirun-prefix-by-default from configure.
+
+* Wed Sep 9 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-4
+- Modify packaging to conform to
+  https://fedoraproject.org/wiki/PackagingDrafts/MPI (bz521334).
+- remove --with-ft=cr from configure, as it was apparently causing problems
+  for some people.
+- Add librdmacm-devel and librdmacm to BuildRequires (related bz515565).
+- Add openmpi-bz515567.patch to add support for the latest Chelsio device IDs
+  (related bz515567).
+- Add exclude-arch (s390 s390x) because we don't have required -devel packages
+  there.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-2
 - Add MPI_BIN and MPI_LIB to the modules file (related bz511099)
 



From mclasen at fedoraproject.org  Tue Sep 22 20:34:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 20:34:38 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.83, 1.84 gnome-themes.spec,
	1.147, 1.148 sources, 1.88, 1.89
Message-ID: <20090922203438.21B7311C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13470

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	8 Sep 2009 00:08:52 -0000	1.83
+++ .cvsignore	22 Sep 2009 20:34:37 -0000	1.84
@@ -1 +1 @@
-gnome-themes-2.27.92.tar.bz2
+gnome-themes-2.28.0.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- gnome-themes.spec	8 Sep 2009 00:08:52 -0000	1.147
+++ gnome-themes.spec	22 Sep 2009 20:34:37 -0000	1.148
@@ -1,9 +1,9 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.27.92
+Version: 2.28.0
 Release:1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
-Source: http://download.gnome.org/sources/gnome-themes/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-themes/2.28/%{name}-%{version}.tar.bz2
 License: LGPLv2 and GPLv2
 Group: User Interface/Desktops
 BuildArch: noarch
@@ -97,6 +97,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	8 Sep 2009 00:08:52 -0000	1.88
+++ sources	22 Sep 2009 20:34:37 -0000	1.89
@@ -1 +1 @@
-fb5baf8945c52a43e059935c6610835a  gnome-themes-2.27.92.tar.bz2
+c89c3e08e45c4e94d76a9a7d40b74214  gnome-themes-2.28.0.tar.bz2



From oget at fedoraproject.org  Tue Sep 22 20:43:16 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 22 Sep 2009 20:43:16 +0000 (UTC)
Subject: rpms/canorus/F-12 canorus-destdir.patch, NONE,
	1.1 canorus-python-dir.patch, NONE,
	1.1 canorus-remove-extra-doc.patch, NONE,
	1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922204316.87C8611C00E8@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/canorus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16708/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	canorus-destdir.patch canorus-python-dir.patch 
	canorus-remove-extra-doc.patch canorus-system-fonts.patch 
	canorus.spec import.log 
Log Message:
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build



canorus-destdir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-destdir.patch ---
diff -rupN canorus-0.7svn.R1163.old/src/CMakeLists.txt canorus-0.7svn.R1163/src/CMakeLists.txt
--- canorus-0.7svn.R1163.old/src/CMakeLists.txt	2009-07-09 18:45:48.000000000 -0400
+++ canorus-0.7svn.R1163/src/CMakeLists.txt	2009-07-10 02:48:19.000000000 -0400
@@ -680,10 +680,10 @@ INSTALL(FILES ${Canorus_Translation_Bins
 # Install fonts
 INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
 # Install users manual, if it exists
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
-FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
-INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+#FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+#INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
 # Install examples
 INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
 

canorus-python-dir.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE canorus-python-dir.patch ---
--- canorus-0.7.R1002.old/src/CMakeLists.txt	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/CMakeLists.txt	2009-07-08 19:42:47.000000000 -0400
@@ -668,10 +668,10 @@ IF(USE_RUBY)
 	INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_RUBY)
 IF(USE_PYTHON)
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
-	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+	#INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+	#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
 ENDIF(USE_PYTHON)
 
 # Install scripts

canorus-remove-extra-doc.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE canorus-remove-extra-doc.patch ---
diff -rupN canorus-0.7svn.R1174.old/CMakeLists.txt canorus-0.7svn.R1174/CMakeLists.txt
--- canorus-0.7svn.R1174.old/CMakeLists.txt	2009-07-27 00:23:11.000000000 -0400
+++ canorus-0.7svn.R1174/CMakeLists.txt	2009-07-27 02:52:10.000000000 -0400
@@ -90,5 +90,5 @@ ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 
 # Install README, VERSION, COPYING and other raw txt files
-INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
+#INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
 

canorus-system-fonts.patch:
 canorus.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE canorus-system-fonts.patch ---
--- canorus-0.7.R1002.old/src/canorus.cpp	2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/canorus.cpp	2009-07-08 16:43:52.000000000 -0400
@@ -189,12 +189,12 @@ void CACanorus::initUndo() {
 
 void CACanorus::initFonts() {
 	// addApplicationFont doesn't understand prefix: paths.
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.otf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.otf").absoluteFilePath());
 	QFontDatabase::addApplicationFont(QFileInfo("fonts:FreeSans.ttf").absoluteFilePath());
-	QFontDatabase::addApplicationFont(QFileInfo("fonts:Emmentaler-14.ttf").absoluteFilePath());
+	QFontDatabase::addApplicationFont(QFileInfo("fonts:emmentaler-14.otf").absoluteFilePath());
 	// populate glyph->codepoint map using generated list
 	#include "fonts/fetaList.cxx"
 }


--- NEW FILE canorus.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global svnrev R1177
%global svndate .20090904svn

Name:          canorus
Summary:       Music Score Editor
Version:       0.7
Release:       4.%{svnrev}%{svndate}%{?dist}
Group:         Applications/Editors
# rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
# The rest of the source code, as explicitly indicated by upstream, is GPLv2
# The .can files are Public Domain
License:       GPLv2 and Public Domain
URL:           http://canorus.berlios.de/
# The original source tarball contains content files that have
# unknown and possibly nonfree licenses we remove those bits from the tarball.
# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
# tar jxf canorus_*.tar.bz2
# rm -fr canorus-*/examples/{midi,musicxml}
## This next one is non-commercial use only. So remove...
# rm -fr canorus-*/examples/come_again.can
# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
Source0:       canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
# The following patches are Fedora specific and not sent upstream:
# Remove duplicate copies of docs that are already going to %%doc
Patch0:        %{name}-remove-extra-doc.patch
# Use system fonts instead of bundled ones
Patch1:        %{name}-system-fonts.patch
# Correct python binding installation dir
Patch2:        %{name}-python-dir.patch
# No need to create directories outside the buildroot
Patch3:        %{name}-destdir.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils

BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: lyx
BuildRequires: qt-devel
BuildRequires: python-devel
BuildRequires: swig
# Ruby scripting not ready yet
#BuildRequires: ruby
#BuildRequires: ruby-devel
BuildRequires: tetex-tex4ht
BuildRequires: zlib-devel

%if 0%{?fedora} >= 11
Requires:      font(centuryschoolbookl)
Requires:      font(emmentaler)
Requires:      font(freesans)
%else
Requires:      freefont
Requires:      lilypond-century-schoolbook-l-fonts
Requires:      lilypond-emmentaler-fonts
%endif
Requires:      hicolor-icon-theme

%description
Canorus is a free extensible music score editor. It supports note writing,
import/export of various file formats, MIDI input and output, scripting and
more! Using a Qt4 framework Canorus offers a fast and modern GUI and
cross-platformability.

%prep
%setup -q -n %{name}-%{version}svn.%{svnrev}
%patch0 -p1 -b .noextradocs
%patch1 -p1 -b .fonts
%patch2 -p1 -b .python
%patch3 -p1 -b .destdir

# Remove bundled copy of zlib
rm -fr src/zlib

# To apply Fedora's optflags properly
sed -i 's|-O0 -g||' src/CMakeLists.txt

# Correct the desktop file
sed -i '/^MimeType.*[^;]$/s/$/;/' %{name}.desktop


%build
%{cmake} -DCANORUS_PYTHON_LIB_DIR="%{python_sitearch}" .

make %{?_smp_mflags}

# Build usersguide
make %{?_smp_mflags} -C doc/usersguide qthelp


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

# Create the lang file. %%find_lang does not handle .qm files
echo %%dir %{_datadir}/%{name}/lang/ >> %{name}.lang
for file in %{buildroot}%{_datadir}/%{name}/lang/*.qm; do
  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
  echo %%lang\($language\) %{_datadir}/%{name}/lang/$language.qm >> %{name}.lang
done

# Handle fonts
rm -f %{buildroot}%{_datadir}/%{name}/fonts/*.ttf
%if 0%{?fedora} >= 11
ln -s ../../fonts/gnu-free/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%else
ln -s ../../fonts/freefont/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%endif
ln -s ../../fonts/lilypond/emmentaler-14.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Bold.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-BoldItal.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Ital.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Roma.otf %{buildroot}%{_datadir}/%{name}/fonts/

# Desktop file
desktop-file-install                           \
   --dir=%{buildroot}%{_datadir}/applications/ \
   --add-category=Midi                         \
   --add-category=X-Notation                   \
   --remove-category=Application               \
   --remove-key=Encoding                       \
   --add-mime-type="application/xml"           \
   %{name}.desktop

# Menu image
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
cp -a src/ui/images/general/canorusmlsource.svg \
   %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

# Install usersguide
mkdir -p %{buildroot}%{_datadir}/%{name}/doc/usersguide/
cp -a doc/usersguide/*.{qch,qhc} %{buildroot}%{_datadir}/%{name}/doc/usersguide/


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVELOPERS NEWS README TODO
%doc %{_datadir}/%{name}/doc/
%{_bindir}/%{name}
%{python_sitearch}/*Canorus*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/examples/
%{_datadir}/%{name}/fonts/
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/plugins/
%{_datadir}/%{name}/scripts/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg


%changelog
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags

* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses

* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section

* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build


--- NEW FILE import.log ---
canorus-0_7-4_R1177_20090904svn_fc11:F-12:canorus-0.7-4.R1177.20090904svn.fc11.src.rpm:1253652179


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:49:16 -0000	1.1
+++ .cvsignore	22 Sep 2009 20:43:13 -0000	1.2
@@ -0,0 +1 @@
+canorus_0.7svn.R1177_source-FE.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:49:16 -0000	1.1
+++ sources	22 Sep 2009 20:43:14 -0000	1.2
@@ -0,0 +1 @@
+8d375719c70345a563aa8ca51a31920d  canorus_0.7svn.R1177_source-FE.tar.bz2



From agoode at fedoraproject.org  Tue Sep 22 21:04:38 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Tue, 22 Sep 2009 21:04:38 +0000 (UTC)
Subject: rpms/openslide/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090922210438.E433C11C00E8@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26548

Modified Files:
	.cvsignore sources 
Log Message:
Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:09:04 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:04:38 -0000	1.2
@@ -0,0 +1 @@
+openslide-2.2.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:09:04 -0000	1.1
+++ sources	22 Sep 2009 21:04:38 -0000	1.2
@@ -0,0 +1 @@
+bec05ceb1dfb569606c4691010eecde8  openslide-2.2.0.tar.xz



From agoode at fedoraproject.org  Tue Sep 22 21:05:26 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Tue, 22 Sep 2009 21:05:26 +0000 (UTC)
Subject: rpms/openslide/devel openslide.spec,NONE,1.1
Message-ID: <20090922210526.5EDF611C00E8@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26900

Added Files:
	openslide.spec 
Log Message:
Initial package


--- NEW FILE openslide.spec ---
Name:		openslide
Version:	2.2.0
Release:	3%{?dist}
Summary:	C library for reading virtual slides

Group:		System Environment/Libraries
License:	GPLv2
URL:		http://openslide.cs.cmu.edu/
Source0:	%{url}/download/%{name}-%{version}.tar.xz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	glib2-devel openjpeg-devel libtiff-devel
BuildRequires:	libjpeg-devel pkgconfig cairo-devel


%description
The OpenSlide library allows programs to access virtual slide files
regardless of the underlying image format.


%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	glib2-devel libtiff-devel openjpeg-devel libjpeg-devel pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README.txt gpl-2.0.txt TODO.txt LICENSE.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Tue Sep 22 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3
- Use xz instead of gz

* Mon Sep 21 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-2
- Be more explicit about include directory in files section

* Tue Sep 15 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-1
- New upstream release
   + Thread safety (sometimes lockless)

* Thu Sep 10 2009 Adam Goode <adam at spicenitz.org> - 2.1.0-1
- New upstream release
   + MIRAX support
   + More Aperio support
   + Properties and associated images support
   + Bug fixes

* Wed Feb 25 2009 Adam Goode <adam at spicenitz.org> - 1.1.1-1
- New upstream release
- No more included OpenJPEG
- Much faster rendering and loading

* Tue Dec  9 2008 Adam Goode <adam at spicenitz.org> - 1.0.0-1
- First release



From rdieter at fedoraproject.org  Tue Sep 22 21:30:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 21:30:02 +0000 (UTC)
Subject: rpms/pinentry/F-11 pinentry-wrapper, NONE, 1.1 pinentry.spec, 1.23,
	1.24
Message-ID: <20090922213002.329DA11C0423@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6059

Modified Files:
	pinentry.spec 
Added Files:
	pinentry-wrapper 
Log Message:
* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
- Errors installing with --excludedocs (#515925)

* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3
- drop alternatives, use app-wrapper instead (borrowed from opensuse)
- -qt4 experimental subpkg, -qt includes qt3 version again  (#523488)




--- NEW FILE pinentry-wrapper ---
#!/bin/sh

# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Fedora Project
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# Anna Bernathova <anicka at novell.com> 2006
# Pavel Nemec <pnemec at novell.com> 2006
# Rex Dieter <rdieter at fedoraproject.org> 2009
#
# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses) 

if [ -z "$PINENTRY_BINARY" ]; then

kde_running=
if [ -n "$KDE_FULL_SESSION" ]; then
    kde_running=1
elif [ -n "$DISPLAY" ]; then
    xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
    if test $? -eq 0; then
        kde_running=1
    fi
else
    arg=
    display=
    for opt in "$@"; do
        if [ "$opt" = "--display" ]; then
            arg=1
        elif [ -n "$arg" ]; then
            display="$opt"
        else
            arg=
        fi
    done
    if [ -n "$display" ]; then
        DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
        if test $? -eq 0; then
            kde_running=1
        fi
    fi
fi

# if KDE is detected and pinentry-qt exists, use pinentry-qt
if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ]
then
	export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# otherwise test if pinentry-gtk-2 is installed
elif [ -x /usr/bin/pinentry-gtk-2 ] 
then
	export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
# otherwise test if pinentry-qt4 is installed
elif [ -x /usr/bin/pinentry-qt4 ]
then
        export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
# otherwise test if pinentry-qt exists although KDE is not detected
elif [ -x /usr/bin/pinentry-qt ]
then
	export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# pinentry-curses is installed by default 
else
	#test if gui binary is required
	for opt in "$@"; do
		if [ "x$opt" = "x--display" ]; then
		        # should not happen because of package dependencies
			echo "Please install pinentry-gui" >&2
			exit 1
		fi
	done
	export PINENTRY_BINARY="/usr/bin/pinentry-curses"
		
fi
fi

exec $PINENTRY_BINARY "$@"


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/F-11/pinentry.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pinentry.spec	23 Jun 2009 15:40:31 -0000	1.23
+++ pinentry.spec	22 Sep 2009 21:30:00 -0000	1.24
@@ -1,13 +1,16 @@
 
 %if 0%{?fedora} > 8 || 0%{?rhel} > 5
 %define _enable_pinentry_qt4 --enable-pinentry-qt4
+%define _enable_pinentry_qt --enable-pinentry-qt
+%define qt3 qt3
 %else
+%define qt3 qt
 %define _enable_pinentry_qt --enable-pinentry-qt 
 %endif
 
 Name:    pinentry
 Version: 0.7.6
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -17,19 +20,21 @@ Source0: ftp://ftp.gnupg.org/gcrypt/pine
 Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# borrowed from opensuse
+Source10: pinentry-wrapper
+
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
 %if 0%{?_enable_pinentry_qt:1}
-BuildRequires: qt-devel
+BuildRequires: %{qt3}-devel
 %endif
 %if 0%{?_enable_pinentry_qt4:1}
 BuildRequires: qt4-devel
 %endif
 
-Requires(post): %{_sbindir}/update-alternatives
+Requires(pre): %{_sbindir}/update-alternatives
 Requires(post): /sbin/install-info
-Requires(postun): %{_sbindir}/update-alternatives
 Requires(preun): /sbin/install-info
 
 Provides: %{name}-curses = %{version}-%{release}
@@ -45,8 +50,6 @@ Summary: Passphrase/PIN entry dialog bas
 Group:   Applications/System
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
 %description gtk
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
 utilize the Assuan protocol as described by the aegypten project; see
@@ -54,17 +57,27 @@ http://www.gnupg.org/aegypten/ for detai
 This package contains the GTK GUI based version of the PIN entry dialog.
 
 %package qt
-Summary: Passphrase/PIN entry dialog based on Qt
+Summary: Passphrase/PIN entry dialog based on Qt3
 Group:   Applications/System
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
 %description qt
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
 utilize the Assuan protocol as described by the aegypten project; see
 http://www.gnupg.org/aegypten/ for details.
-This package contains the Qt GUI based version of the PIN entry dialog.
+This package contains the Qt3 GUI based version of the PIN entry dialog.
+
+%package qt4
+Summary: Passphrase/PIN entry dialog based on Qt4
+Group:   Applications/System
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-gui = %{version}-%{release}
+%description qt4
+Pinentry is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project; see
+http://www.gnupg.org/aegypten/ for details.
+This package contains the Qt4 GUI based version of the PIN entry dialog.
+Support for Qt4 is new, and a bit experimental.
 
 
 %prep
@@ -100,12 +113,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Backwards compatibility
 ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
-%if 0%{?_enable_pinentry_qt4:1}
-ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
-%endif
 
-# Dummy symlink for %%ghost
-ln -sf %{_sysconfdir}/alternatives/pinentry $RPM_BUILD_ROOT%{_bindir}/pinentry
+install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -115,63 +124,57 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT
 
 
+# alternatives dropped at 0.7.6-3 (use %%trigger instead?)
+%pre
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
+
 %post
-/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir 
-%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-  pinentry %{_bindir}/pinentry-curses %{?curses_priority}%{!?curses_priority:10} ||:
-
-%post gtk
-%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-  pinentry %{_bindir}/pinentry-gtk %{?gtk_priority}%{!?gtk_priority:40} ||:
-
-%post qt
-%{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
-  pinentry %{_bindir}/pinentry-qt %{?qt_priority}%{!?qt_priority:30} ||:
+if [ -f %{_infodir}/pinentry.info* ]; then
+/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir ||:
+fi
 
 %preun
-if [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 -a -f %{_infodir}/pinentry.info* ] ; then
   /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir ||:
 fi
 
-%postun
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
-fi
-
-%postun gtk
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
-fi
-
-%postun qt
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
-fi
-
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/pinentry-curses
-%ghost %{_bindir}/pinentry
+%{_bindir}/pinentry
 %{_infodir}/pinentry.info*
 
 %files gtk
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-gtk
 %{_bindir}/pinentry-gtk-2
-%ghost %{_bindir}/pinentry
 
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/pinentry-qt
+
 %if 0%{?_enable_pinentry_qt4:1}
+%files qt4
+%defattr(-,root,root,-)
 %{_bindir}/pinentry-qt4
 %endif
-%ghost %{_bindir}/pinentry
 
 
 %changelog
+* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
+- Errors installing with --excludedocs (#515925)
+
+* Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3
+- drop alternatives, use app-wrapper instead (borrowed from opensuse)
+- -qt4 experimental subpkg, -qt includes qt3 version again  (#523488)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-1
 - pinentry-0.7.6
 - -qt switched qt4 version, where applicable (f9+, rhel6+)



From kwizart at fedoraproject.org  Tue Sep 22 21:35:25 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 22 Sep 2009 21:35:25 +0000 (UTC)
Subject: rpms/vdpauinfo/devel import.log, NONE, 1.1 vdpauinfo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922213525.47F5E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/vdpauinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8741/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vdpauinfo.spec 
Log Message:
Initial import for devel



--- NEW FILE import.log ---
vdpauinfo-0_0_6-2_fc11:HEAD:vdpauinfo-0.0.6-2.fc11.src.rpm:1253655217


--- NEW FILE vdpauinfo.spec ---
Name:           vdpauinfo
Version:        0.0.6
Release:        2%{?dist}
Summary:        Tool to query the capabilities of a VDPAU implementation

Group:          Applications/System
License:        MIT
URL:            http://freedesktop.org/wiki/Software/VDPAU
Source0:        http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libvdpau-devel >= 0.2


%description
Tool to query the capabilities of a VDPAU implementation.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_bindir}/vdpauinfo


%changelog
* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.0.6-2
- Tagged archive compatible with livdpau 0.2

* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.0.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdpauinfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:28:54 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:35:24 -0000	1.2
@@ -0,0 +1 @@
+vdpauinfo-0.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdpauinfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:28:54 -0000	1.1
+++ sources	22 Sep 2009 21:35:25 -0000	1.2
@@ -0,0 +1 @@
+513df206613cbd061b6d49cdbfe927ef  vdpauinfo-0.0.6.tar.gz



From kwizart at fedoraproject.org  Tue Sep 22 21:36:36 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 22 Sep 2009 21:36:36 +0000 (UTC)
Subject: rpms/vdpauinfo/F-11 import.log, NONE, 1.1 vdpauinfo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922213636.DCFE011C00E8@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/vdpauinfo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9210/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vdpauinfo.spec 
Log Message:
Initial import For F-11 



--- NEW FILE import.log ---
vdpauinfo-0_0_6-2_fc11:F-11:vdpauinfo-0.0.6-2.fc11.src.rpm:1253655306


--- NEW FILE vdpauinfo.spec ---
Name:           vdpauinfo
Version:        0.0.6
Release:        2%{?dist}
Summary:        Tool to query the capabilities of a VDPAU implementation

Group:          Applications/System
License:        MIT
URL:            http://freedesktop.org/wiki/Software/VDPAU
Source0:        http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libvdpau-devel >= 0.2


%description
Tool to query the capabilities of a VDPAU implementation.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_bindir}/vdpauinfo


%changelog
* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.0.6-2
- Tagged archive compatible with livdpau 0.2

* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.0.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdpauinfo/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:28:54 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:36:36 -0000	1.2
@@ -0,0 +1 @@
+vdpauinfo-0.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdpauinfo/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:28:54 -0000	1.1
+++ sources	22 Sep 2009 21:36:36 -0000	1.2
@@ -0,0 +1 @@
+513df206613cbd061b6d49cdbfe927ef  vdpauinfo-0.0.6.tar.gz



From kwizart at fedoraproject.org  Tue Sep 22 21:37:41 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 22 Sep 2009 21:37:41 +0000 (UTC)
Subject: rpms/vdpauinfo/F-10 import.log, NONE, 1.1 vdpauinfo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090922213741.84C2611C00E8@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/vdpauinfo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10080/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vdpauinfo.spec 
Log Message:
Initial import for F-10



--- NEW FILE import.log ---
vdpauinfo-0_0_6-2_fc11:F-10:vdpauinfo-0.0.6-2.fc11.src.rpm:1253655371


--- NEW FILE vdpauinfo.spec ---
Name:           vdpauinfo
Version:        0.0.6
Release:        2%{?dist}
Summary:        Tool to query the capabilities of a VDPAU implementation

Group:          Applications/System
License:        MIT
URL:            http://freedesktop.org/wiki/Software/VDPAU
Source0:        http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libvdpau-devel >= 0.2


%description
Tool to query the capabilities of a VDPAU implementation.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_bindir}/vdpauinfo


%changelog
* Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.0.6-2
- Tagged archive compatible with livdpau 0.2

* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.0.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdpauinfo/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:28:54 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:37:41 -0000	1.2
@@ -0,0 +1 @@
+vdpauinfo-0.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdpauinfo/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:28:54 -0000	1.1
+++ sources	22 Sep 2009 21:37:41 -0000	1.2
@@ -0,0 +1 @@
+513df206613cbd061b6d49cdbfe927ef  vdpauinfo-0.0.6.tar.gz



From tomspur at fedoraproject.org  Tue Sep 22 21:40:46 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 22 Sep 2009 21:40:46 +0000 (UTC)
Subject: rpms/gbirthday/devel .cvsignore, 1.2, 1.3 gbirthday.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090922214046.7781311C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12265

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
Updating to new version 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Sep 2009 02:45:50 -0000	1.2
+++ .cvsignore	22 Sep 2009 21:40:46 -0000	1.3
@@ -1 +1 @@
-gbirthday-0.4.2.tar.lzma
+gbirthday-0.5.1.tar.lzma


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gbirthday.spec	4 Sep 2009 02:45:50 -0000	1.1
+++ gbirthday.spec	22 Sep 2009 21:40:46 -0000	1.2
@@ -1,7 +1,7 @@
 Name:			gbirthday
-Version:		0.4.2
+Version:		0.5.1
 Release:		1%{?dist}
-Summary:		Birthday reminder for evolution
+Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
 URL:			http://gbirthday.sourceforge.net
@@ -16,7 +16,8 @@ Requires:		pygtk2
 
 %description
 GBirthday is a birthday reminder application that helps you to remember 
-your evolution contacts' birthdays.
+your Evolution, Thunderbird, Sunbird contacts' birthdays or from a MySQL
+Server or a CSV File.
 It puts an icon on notification area which will blink when there is any 
 of your contacts' birthday today. You can also check if there is any of 
 your contacs' birthday on next days.
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
+- New Release
+- Changing description (now also supports Thunderbird, Sunbird...
+
 * Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
 - new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2009 02:45:50 -0000	1.2
+++ sources	22 Sep 2009 21:40:46 -0000	1.3
@@ -1 +1 @@
-c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma
+2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma



From tomspur at fedoraproject.org  Tue Sep 22 21:45:06 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 22 Sep 2009 21:45:06 +0000 (UTC)
Subject: rpms/gbirthday/EL-5 .cvsignore, 1.1, 1.2 gbirthday.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090922214506.200D011C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15013

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
Update to new version 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:24:50 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:45:05 -0000	1.2
@@ -0,0 +1 @@
+gbirthday-0.5.1.tar.lzma


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/gbirthday.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gbirthday.spec	4 Sep 2009 03:05:18 -0000	1.1
+++ gbirthday.spec	22 Sep 2009 21:45:05 -0000	1.2
@@ -1,7 +1,7 @@
 Name:			gbirthday
-Version:		0.4.2
+Version:		0.5.1
 Release:		1%{?dist}
-Summary:		Birthday reminder for evolution
+Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
 URL:			http://gbirthday.sourceforge.net
@@ -16,7 +16,8 @@ Requires:		pygtk2
 
 %description
 GBirthday is a birthday reminder application that helps you to remember 
-your evolution contacts' birthdays.
+your Evolution, Thunderbird, Sunbird contacts' birthdays or from a MySQL
+Server or a CSV File.
 It puts an icon on notification area which will blink when there is any 
 of your contacts' birthday today. You can also check if there is any of 
 your contacs' birthday on next days.
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
+- New Release
+- Changing description (now also supports Thunderbird, Sunbird...
+
 * Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
 - new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2009 03:05:18 -0000	1.2
+++ sources	22 Sep 2009 21:45:05 -0000	1.3
@@ -1 +1 @@
-c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma
+2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma



From tomspur at fedoraproject.org  Tue Sep 22 21:48:01 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 22 Sep 2009 21:48:01 +0000 (UTC)
Subject: rpms/gbirthday/F-11 .cvsignore, 1.1, 1.2 gbirthday.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090922214801.C0B3711C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16294

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
Update to new version 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:24:50 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:48:01 -0000	1.2
@@ -0,0 +1 @@
+gbirthday-0.5.1.tar.lzma


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/gbirthday.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gbirthday.spec	4 Sep 2009 02:53:22 -0000	1.1
+++ gbirthday.spec	22 Sep 2009 21:48:01 -0000	1.2
@@ -1,7 +1,7 @@
 Name:			gbirthday
-Version:		0.4.2
+Version:		0.5.1
 Release:		1%{?dist}
-Summary:		Birthday reminder for evolution
+Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
 URL:			http://gbirthday.sourceforge.net
@@ -16,7 +16,8 @@ Requires:		pygtk2
 
 %description
 GBirthday is a birthday reminder application that helps you to remember 
-your evolution contacts' birthdays.
+your Evolution, Thunderbird, Sunbird contacts' birthdays or from a MySQL
+Server or a CSV File.
 It puts an icon on notification area which will blink when there is any 
 of your contacts' birthday today. You can also check if there is any of 
 your contacs' birthday on next days.
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
+- New Release
+- Changing description (now also supports Thunderbird, Sunbird...
+
 * Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
 - new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2009 02:53:22 -0000	1.2
+++ sources	22 Sep 2009 21:48:01 -0000	1.3
@@ -1 +1 @@
-c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma
+2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma



From tomspur at fedoraproject.org  Tue Sep 22 21:54:42 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 22 Sep 2009 21:54:42 +0000 (UTC)
Subject: rpms/gbirthday/F-10 .cvsignore, 1.1, 1.2 gbirthday.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090922215442.BD24711C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20248

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
Update to new version 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Sep 2009 02:24:50 -0000	1.1
+++ .cvsignore	22 Sep 2009 21:54:42 -0000	1.2
@@ -0,0 +1 @@
+gbirthday-0.5.1.tar.lzma


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-10/gbirthday.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gbirthday.spec	4 Sep 2009 03:03:44 -0000	1.1
+++ gbirthday.spec	22 Sep 2009 21:54:42 -0000	1.2
@@ -1,7 +1,7 @@
 Name:			gbirthday
-Version:		0.4.2
+Version:		0.5.1
 Release:		1%{?dist}
-Summary:		Birthday reminder for evolution
+Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
 URL:			http://gbirthday.sourceforge.net
@@ -16,7 +16,8 @@ Requires:		pygtk2
 
 %description
 GBirthday is a birthday reminder application that helps you to remember 
-your evolution contacts' birthdays.
+your Evolution, Thunderbird, Sunbird contacts' birthdays or from a MySQL
+Server or a CSV File.
 It puts an icon on notification area which will blink when there is any 
 of your contacts' birthday today. You can also check if there is any of 
 your contacs' birthday on next days.
@@ -50,6 +51,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
+- New Release
+- Changing description (now also supports Thunderbird, Sunbird...
+
 * Tue Aug 11 2009 Thomas Spura <tomspur at fedoraproject.org> 0.4.2-1
 - new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2009 03:03:44 -0000	1.2
+++ sources	22 Sep 2009 21:54:42 -0000	1.3
@@ -1 +1 @@
-c117a6b90e51d836ed2590e6f0f48164  gbirthday-0.4.2.tar.lzma
+2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma



From pkgdb at fedoraproject.org  Tue Sep 22 21:58:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 21:58:48 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchbugzilla
Message-ID: <20090922215849.3730810F876@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchbugzilla acl on libsigsegv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 21:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 21:58:57 +0000
Subject: [pkgdb] libsigsegv: bonzini has given up watchbugzilla
Message-ID: <20090922215857.DD42210F883@bastion2.fedora.phx.redhat.com>

bonzini has given up the watchbugzilla acl on libsigsegv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 21:59:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 21:59:00 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchbugzilla
Message-ID: <20090922215900.4EEC110F890@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchbugzilla acl on libsigsegv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 21:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 21:59:10 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchbugzilla
Message-ID: <20090922215910.D108C10F89A@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchbugzilla acl on libsigsegv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 21:59:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 21:59:46 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchbugzilla
Message-ID: <20090922215947.0195A10F87C@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchbugzilla acl on libsigsegv (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:00:22 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchcommits
Message-ID: <20090922220022.5CD1B10F87E@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchcommits acl on libsigsegv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:00:26 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchcommits
Message-ID: <20090922220027.16E4510F883@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchcommits acl on libsigsegv (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:00:28 +0000
Subject: [pkgdb] libsigsegv: bonzini has requested watchcommits
Message-ID: <20090922220028.4BD1A10F890@bastion2.fedora.phx.redhat.com>

bonzini has requested the watchcommits acl on libsigsegv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From chkr at fedoraproject.org  Tue Sep 22 22:08:57 2009
From: chkr at fedoraproject.org (chkr)
Date: Tue, 22 Sep 2009 22:08:57 +0000 (UTC)
Subject: rpms/f-spot/devel facebook-exporter-duplicate-label-fix.patch, NONE,
	1.1 f-spot.spec, 1.92, 1.93
Message-ID: <20090922220857.F1BF611C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27970

Modified Files:
	f-spot.spec 
Added Files:
	facebook-exporter-duplicate-label-fix.patch 
Log Message:
* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
- add upstream patches (
  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
  to fix crash in facebook exporter (BZ 524860)


facebook-exporter-duplicate-label-fix.patch:
 FacebookExport.addin.xml |    2 +-
 FacebookExport.ui        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE facebook-exporter-duplicate-label-fix.patch ---
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
index 1146e7d..e660246 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+++ b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
@@ -1,6 +1,6 @@
 <Addin 	namespace="FSpot"
 	id="FacebookExport"
-	version="0.6.0.5"
+	version="0.6.0.6"
 	name="FacebookExport"
 	description="Export pictures to facebook"
 	author="George Talusan, Jim Ramsay, Stephane Delcroix"
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.ui b/extensions/Exporters/FacebookExport/FacebookExport.ui
index 382ba45..ec413ae 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.ui
+++ b/extensions/Exporters/FacebookExport/FacebookExport.ui
@@ -76,7 +76,7 @@
                   <object class="GtkHBox" id="permissions_hbox">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="label_permissions">
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
                         <property name="xpad">2</property>


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- f-spot.spec	17 Sep 2009 19:24:51 -0000	1.92
+++ f-spot.spec	22 Sep 2009 22:08:57 -0000	1.93
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -13,6 +13,10 @@ Patch1:         0001-fix-parallel-build.
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
+# upstream patch to fix crash in facebook exporter:
+# commit 807dab4344ecdadc7e46793369821de8b49692e5
+# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+Patch4:         facebook-exporter-duplicate-label-fix.patch        
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -65,6 +69,7 @@ photo collection in a slideshow as a scr
 %patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
+%patch4 -p1 -b .faceboox-exporter-crash
 
 %build
 autoreconf -f -i
@@ -138,6 +143,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
+- add upstream patches (
+  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
+  to fix crash in facebook exporter (BZ 524860)
+
 * Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
 - update to 0.6.1.2 (BZ 519290)
 



From chkr at fedoraproject.org  Tue Sep 22 22:31:42 2009
From: chkr at fedoraproject.org (chkr)
Date: Tue, 22 Sep 2009 22:31:42 +0000 (UTC)
Subject: rpms/f-spot/F-11 facebook-exporter-duplicate-label-fix.patch, NONE, 
	1.1 f-spot.spec, 1.91, 1.92
Message-ID: <20090922223142.DD5CA11C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4656

Modified Files:
	f-spot.spec 
Added Files:
	facebook-exporter-duplicate-label-fix.patch 
Log Message:
* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
- Add upstream patches (
  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
  to fix crash in facebook exporter (BZ 524860)


facebook-exporter-duplicate-label-fix.patch:
 FacebookExport.addin.xml |    2 +-
 FacebookExport.ui        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE facebook-exporter-duplicate-label-fix.patch ---
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
index 1146e7d..e660246 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+++ b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
@@ -1,6 +1,6 @@
 <Addin 	namespace="FSpot"
 	id="FacebookExport"
-	version="0.6.0.5"
+	version="0.6.0.6"
 	name="FacebookExport"
 	description="Export pictures to facebook"
 	author="George Talusan, Jim Ramsay, Stephane Delcroix"
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.ui b/extensions/Exporters/FacebookExport/FacebookExport.ui
index 382ba45..ec413ae 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.ui
+++ b/extensions/Exporters/FacebookExport/FacebookExport.ui
@@ -76,7 +76,7 @@
                   <object class="GtkHBox" id="permissions_hbox">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="label_permissions">
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
                         <property name="xpad">2</property>


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- f-spot.spec	20 Sep 2009 20:56:36 -0000	1.91
+++ f-spot.spec	22 Sep 2009 22:31:40 -0000	1.92
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -13,6 +13,10 @@ Patch1:         0001-fix-parallel-build.
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
+# upstream patch to fix crash in facebook exporter:
+# commit 807dab4344ecdadc7e46793369821de8b49692e5
+# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+Patch4:         facebook-exporter-duplicate-label-fix.patch        
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -66,6 +70,7 @@ photo collection in a slideshow as a scr
 %patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
+%patch4 -p1 -b .faceboox-exporter-crash
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -138,6 +143,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
+- Add upstream patches (
+  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
+  to fix crash in facebook exporter (BZ 524860)
+
 * Sun Sep 20 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1.1
 - Upload missing sources
 



From pkgdb at fedoraproject.org  Tue Sep 22 22:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:54:09 +0000
Subject: [pkgdb] libsigsegv had acl change status
Message-ID: <20090922225409.80B0210F861@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libsigsegv (Fedora devel) to Approved for bonzini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:54:10 +0000
Subject: [pkgdb] libsigsegv had acl change status
Message-ID: <20090922225410.16A9C10F87E@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libsigsegv (Fedora devel) to Approved for bonzini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:54:13 +0000
Subject: [pkgdb] libsigsegv had acl change status
Message-ID: <20090922225413.7BA5A10F890@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libsigsegv (Fedora EPEL 5) to Approved for bonzini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:54:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:54:15 +0000
Subject: [pkgdb] libsigsegv had acl change status
Message-ID: <20090922225415.E197710F89A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libsigsegv (Fedora EPEL 5) to Approved for bonzini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:54:23 +0000
Subject: [pkgdb] libsigsegv had acl change status
Message-ID: <20090922225423.C422010F861@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libsigsegv (Fedora 11) to Approved for bonzini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Tue Sep 22 22:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Sep 2009 22:54:27 +0000
Subject: [pkgdb] libsigsegv had acl change status
Message-ID: <20090922225427.1011010F89D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libsigsegv (Fedora 11) to Approved for bonzini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From rdieter at fedoraproject.org  Tue Sep 22 23:02:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 23:02:37 +0000 (UTC)
Subject: rpms/libsigsegv/F-11 libsigsegv-2.6-mystack.patch, NONE,
	1.1 libsigsegv.spec, 1.20, 1.21
Message-ID: <20090922230237.E8C8211C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19948

Modified Files:
	libsigsegv.spec 
Added Files:
	libsigsegv-2.6-mystack.patch 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
- libsigsegv allocates alternate stack on the main stack (#524796)


libsigsegv-2.6-mystack.patch:
 b/src/sigsegv.h.in                          |    8 +++++---
 b/tests/stackoverflow1.c                    |    7 ++++---
 b/tests/stackoverflow2.c                    |    8 ++++----
 libsigsegv-2.6/m4/sigaltstack-longjmp.m4    |    2 +-
 libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4 |    2 +-
 libsigsegv-2.6/m4/sigaltstack.m4            |    3 ++-
 6 files changed, 17 insertions(+), 13 deletions(-)

--- NEW FILE libsigsegv-2.6-mystack.patch ---
>From 4f14ef87b2fba9718c1a88b9ed9ca7ba111d60da Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Tue, 22 Sep 2009 08:10:43 +0000
Subject: Fix crash of stackoverflow2 on x86_64-linux.

---
diff --git a/src/sigsegv.h.in b/src/sigsegv.h.in
index 85f337d..6b8e4c7 100644
--- a/src/sigsegv.h.in
+++ b/src/sigsegv.h.in
@@ -121,9 +121,11 @@ typedef void (*stackoverflow_handler_t) (int emergency, stackoverflow_context_t
 /*
  * Installs a stack overflow handler.
  * The extra_stack argument is a pointer to a pre-allocated area used as a
- * stack for executing the handler. It is typically allocated by use of
- * `alloca' during `main'. Its size should be sufficiently large.
- * The following code determines an appropriate size:
+ * stack for executing the handler. It typically comes from a static variable
+ * or from heap-allocated memoty; placing it on the main stack may fail on
+ * some operating systems.
+ * Its size, passed in extra_stack_size, should be sufficiently large.  The
+ * following code determines an appropriate size:
  *   #include <signal.h>
  *   #ifndef SIGSTKSZ         / * glibc defines SIGSTKSZ for this purpose * /
  *   # define SIGSTKSZ 16384  / * on most platforms, 16 KB are sufficient * /
diff --git a/tests/stackoverflow1.c b/tests/stackoverflow1.c
index 0970e79..23eff58 100644
--- a/tests/stackoverflow1.c
+++ b/tests/stackoverflow1.c
@@ -88,12 +88,13 @@ recurse (volatile int n)
   return *recurse_1 (n, &n);
 }
 
+/* glibc says: Users should use SIGSTKSZ as the size of user-supplied
+   buffers.  */
+char mystack[2 * 2 * SIGSTKSZ];
+
 int
 main ()
 {
-  /* glibc says: Users should use SIGSTKSZ as the size of user-supplied
-     buffers.  */
-  char mystack[SIGSTKSZ];
   sigset_t emptyset;
 
 #if HAVE_SETRLIMIT && defined RLIMIT_STACK
diff --git a/tests/stackoverflow2.c b/tests/stackoverflow2.c
index 2475bf2..4a07c66 100644
--- a/tests/stackoverflow2.c
+++ b/tests/stackoverflow2.c
@@ -109,12 +109,13 @@ recurse (volatile int n)
   return *recurse_1 (n, &n);
 }
 
+/* glibc says: Users should use SIGSTKSZ as the size of user-supplied
+   buffers.  */
+char mystack[2 * SIGSTKSZ];
+
 int
 main ()
 {
-  /* glibc says: Users should use SIGSTKSZ as the size of user-supplied
-     buffers.  */
-  char mystack[SIGSTKSZ];
   sigset_t emptyset;
   void *p;
 
--
cgit v0.8.2.1
diff -up libsigsegv-2.6/m4/sigaltstack-longjmp.m4.stack2 libsigsegv-2.6/m4/sigaltstack-longjmp.m4
--- libsigsegv-2.6/m4/sigaltstack-longjmp.m4.stack2	2008-08-24 15:40:16.000000000 -0500
+++ libsigsegv-2.6/m4/sigaltstack-longjmp.m4	2009-09-22 13:26:07.552664938 -0500
@@ -51,9 +51,9 @@ int recurse (volatile int n)
   int sum = 0;
   return *recurse_1 (n, &sum);
 }
+char mystack[2 * SIGSTKSZ];
 int main ()
 {
-  char mystack[SIGSTKSZ];
   stack_t altstack;
   struct sigaction action;
   sigset_t emptyset;
diff -up libsigsegv-2.6/m4/sigaltstack.m4.stack2 libsigsegv-2.6/m4/sigaltstack.m4
--- libsigsegv-2.6/m4/sigaltstack.m4.stack2	2008-08-24 15:41:10.000000000 -0500
+++ libsigsegv-2.6/m4/sigaltstack.m4	2009-09-22 13:25:47.462666140 -0500
@@ -71,9 +71,10 @@ int recurse (volatile int n)
   int sum = 0;
   return *recurse_1 (n, &sum);
 }
+char mystack[2 * SIGSTKSZ];
+
 int main ()
 {
-  char mystack[SIGSTKSZ];
   stack_t altstack;
   struct sigaction action;
 #if defined HAVE_SETRLIMIT && defined RLIMIT_STACK
diff -up libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4.stack2 libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4
--- libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4.stack2	2008-08-24 15:40:49.000000000 -0500
+++ libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4	2009-09-22 13:26:43.994665249 -0500
@@ -49,9 +49,9 @@ int recurse (volatile int n)
   int sum = 0;
   return *recurse_1 (n, &sum);
 }
+char mystack[2 * SIGSTKSZ];
 int main ()
 {
-  char mystack[SIGSTKSZ];
   stack_t altstack;
   struct sigaction action;
 #ifdef __BEOS__


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-11/libsigsegv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libsigsegv.spec	25 Feb 2009 18:10:02 -0000	1.20
+++ libsigsegv.spec	22 Sep 2009 23:02:33 -0000	1.21
@@ -4,7 +4,7 @@
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.6
-Release: 2%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -12,8 +12,18 @@ Source0: http://ftp.gnu.org/gnu/libsigse
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#Patch1: libsigsegv-2.6-confdefs_debug.patch
+
+## upstream patches
+# based on:
+# http://git.savannah.gnu.org/cgit/libsigsegv.git/patch/?id=4f14ef87b2fba9718c1a88b9ed9ca7ba111d60da
+# http://git.savannah.gnu.org/cgit/libsigsegv.git/patch/?id=54b612e978e26a52b5706272dabf84ed9d895fa7
+Patch100: libsigsegv-2.6-mystack.patch
+
 Source1: sigsegv-wrapper.h
 
+BuildRequires: automake libtool
+
 %description
 This is a library for handling page faults in user mode. A page fault
 occurs when a program tries to access to a region of memory that is
@@ -43,6 +53,9 @@ Requires: %{name}-devel = %{version}-%{r
 %prep
 %setup -q
 
+%patch100 -p1 -b .mystack
+autoreconf
+
 
 %build
 %configure \
@@ -66,6 +79,14 @@ make install DESTDIR=%{buildroot}
 
 rm -f %{buildroot}%{_libdir}/lib*.la
 
+%if 0%{?fedora} > 11
+pushd %{buildroot}%{_libdir}
+mkdir ../../%{_lib}
+mv libsigsegv.so.0* ../../%{_lib}/
+ln -sf ../../%{_lib}/libsigsegv.so.0 %{buildroot}%{_libdir}/libsigsegv.so
+popd
+%endif
+
 
 %check
 make check
@@ -82,20 +103,37 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog NEWS README
-%{_libdir}/lib*.so.*
+%doc AUTHORS COPYING NEWS README
+%if 0%{?fedora} > 11
+/%{_lib}/libsigsegv.so.0*
+%else
+%{_libdir}/libsigsegv.so.0*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_includedir}/*.h
+%{_libdir}/libsigsegv.so
+%{_includedir}/sigsegv.h
+%ifarch %{multilib_arches}
+%{_includedir}/sigsegv-%{_arch}.h
+%endif
 
 %files static
 %defattr(-,root,root,-)
-%{_libdir}/lib*.a
+%{_libdir}/libsigsegv.a
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
+- libsigsegv allocates alternate stack on the main stack (#524796)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-3
+- move libsigsegv.so.* to /lib (#512219, F-12+)
+- %%doc: -ChangeLog, +COPYING
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Sep 22 23:16:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Sep 2009 23:16:12 +0000 (UTC)
Subject: rpms/poppler-data/devel .cvsignore, 1.2, 1.3 poppler-data.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090922231612.CCC4411C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28350

Modified Files:
	.cvsignore poppler-data.spec sources 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.0-1
- poppler-data-0.3.0
- License: BSD and GPLv2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Aug 2009 16:15:52 -0000	1.2
+++ .cvsignore	22 Sep 2009 23:16:12 -0000	1.3
@@ -1 +1 @@
-poppler-data-0.2.1.tar.gz
+poppler-data-0.3.0.tar.gz


Index: poppler-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/poppler-data.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- poppler-data.spec	3 Aug 2009 16:18:21 -0000	1.2
+++ poppler-data.spec	22 Sep 2009 23:16:12 -0000	1.3
@@ -1,9 +1,13 @@
 
 Summary: Encoding files 
 Name:    poppler-data
-Version: 0.2.1
+Version: 0.3.0
 Release: 1%{?dist}
-License: Redistributable, no modification permitted
+# The cMap data files installed by the poppler-data package are
+# under the COPYING.adobe license
+# cidToUnicode, nameToUnicode and unicodeMap data files
+# are under the COPYING.gpl2 license
+License: BSD and GPLv2
 Group:   Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-data-%{version}.tar.gz
@@ -36,10 +40,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING COPYING.adobe COPYING.gpl2 README
 %{_datadir}/poppler/
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.0-1
+- poppler-data-0.3.0
+- License: BSD and GPLv2
+
 * Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.1-1
 - first try at separate poppler-data
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Aug 2009 16:15:52 -0000	1.2
+++ sources	22 Sep 2009 23:16:12 -0000	1.3
@@ -1 +1 @@
-bca78b8786746c7b48b324283992d658  poppler-data-0.2.1.tar.gz
+5b739b79378c2f41b577e0438e519eeb  poppler-data-0.3.0.tar.gz



From mclasen at fedoraproject.org  Tue Sep 22 23:37:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Sep 2009 23:37:33 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.115, 1.116 glib2.spec, 1.216,
	1.217 sources, 1.117, 1.118
Message-ID: <20090922233733.D084A11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6970

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	5 Sep 2009 01:50:14 -0000	1.115
+++ .cvsignore	22 Sep 2009 23:37:28 -0000	1.116
@@ -1 +1 @@
-glib-2.21.6.tar.bz2
+glib-2.22.0.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- glib2.spec	5 Sep 2009 01:50:14 -0000	1.216
+++ glib2.spec	22 Sep 2009 23:37:28 -0000	1.217
@@ -2,12 +2,12 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.21.6
+Version: 2.22.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
 * Fri Sep  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.21.6-1
 - Update to 2.21.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- sources	5 Sep 2009 01:50:14 -0000	1.117
+++ sources	22 Sep 2009 23:37:28 -0000	1.118
@@ -1 +1 @@
-3b0452fbd877db53dafabdc074600cb8  glib-2.21.6.tar.bz2
+e0bc5b08d467cc3763550923087772d3  glib-2.22.0.tar.bz2



From mjg59 at fedoraproject.org  Wed Sep 23 00:03:44 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Wed, 23 Sep 2009 00:03:44 +0000 (UTC)
Subject: rpms/grub/devel grub-silent.patch,NONE,1.1
Message-ID: <20090923000345.1F60A11C00E8@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17929

Added Files:
	grub-silent.patch 
Log Message:
Add support for the "silent" command, which reduces boot output


grub-silent.patch:
 boot.c     |    3 +++
 builtins.c |   20 ++++++++++++++++++++
 shared.h   |    2 ++
 stage2.c   |    5 +++++
 4 files changed, 30 insertions(+)

--- NEW FILE grub-silent.patch ---
diff -ur -x Makefile.am -x Makefile.in grub-0.97.clean/stage2/boot.c grub-0.97.cleanhack/stage2/boot.c
--- grub-0.97.clean/stage2/boot.c	2009-09-03 14:06:18.000000000 -0400
+++ grub-0.97.cleanhack/stage2/boot.c	2009-09-03 14:17:57.000000000 -0400
@@ -300,6 +300,9 @@
 			       (big_linux ? "bzImage" : "zImage"),
 			       data_len, text_len);
 
+	  if (silent_grub)
+	    lh->vid_mode = 0x0f04;
+
 	  /* Video mode selection support. What a mess!  */
 	  /* NOTE: Even the word "mess" is not still enough to
 	     represent how wrong and bad the Linux video support is,
diff -ur -x Makefile.am -x Makefile.in grub-0.97.clean/stage2/builtins.c grub-0.97.cleanhack/stage2/builtins.c
--- grub-0.97.clean/stage2/builtins.c	2009-09-03 14:06:18.000000000 -0400
+++ grub-0.97.cleanhack/stage2/builtins.c	2009-09-03 15:42:38.000000000 -0400
@@ -291,6 +291,9 @@
       current_term = term_table; /* assumption: console is first */
     }
 
+  if (silent_grub)
+    setcursor(0);
+
 #ifdef SUPPORT_NETBOOT
   /* Shut down the networking.  */
   cleanup_net ();
@@ -4407,6 +4410,22 @@
 #endif /* ! PLATFORM_EFI */
 
 

+static int
+silent_func (char *arg, int flags)
+{
+  silent_grub = 1;
+  return 0;
+}
+
+static struct builtin builtin_silent =
+{
+  "silent",
+  silent_func,
+  BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
+  "grub will attempt to avoid printing anything to the screen"
+};
+
+

 #if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS)
 /* terminal */
 static int
@@ -5224,6 +5243,7 @@
   &builtin_setkey,
   &builtin_setup,
 #endif
+  &builtin_silent,
 #ifdef SUPPORT_GRAPHICS
   &builtin_splashimage,
 #endif /* SUPPORT_GRAPHICS */
diff -ur -x Makefile.am -x Makefile.in grub-0.97.clean/stage2/shared.h grub-0.97.cleanhack/stage2/shared.h
--- grub-0.97.clean/stage2/shared.h	2009-09-03 14:06:18.000000000 -0400
+++ grub-0.97.cleanhack/stage2/shared.h	2009-09-03 14:15:12.000000000 -0400
@@ -684,6 +684,8 @@
 extern int filepos;
 extern int filemax;
 
+extern int silent_grub;
+
 /*
  *  Common BIOS/boot data.
  */
diff -ur -x Makefile.am -x Makefile.in grub-0.97.clean/stage2/stage2.c grub-0.97.cleanhack/stage2/stage2.c
--- grub-0.97.clean/stage2/stage2.c	2009-09-03 14:06:18.000000000 -0400
+++ grub-0.97.cleanhack/stage2/stage2.c	2009-09-03 15:42:55.000000000 -0400
@@ -22,6 +22,8 @@
 
 grub_jmp_buf restart_env;
 
+int silent_grub = 0;
+
 #if defined(PRESET_MENU_STRING) || defined(SUPPORT_DISKLESS)
 
 # if defined(PRESET_MENU_STRING)
@@ -840,6 +843,9 @@
       (*current_term->shutdown)();
       current_term = term_table; /* assumption: console is first */
     }
+
+  if (silent_grub)
+    setcursor(0);
   
   while (1)
     {



From rdieter at fedoraproject.org  Wed Sep 23 00:20:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 00:20:55 +0000 (UTC)
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.51,1.52
Message-ID: <20090923002055.E5FE911C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26170

Modified Files:
	Macaulay2.spec 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-6
- fixup/optimize scriplets



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- Macaulay2.spec	24 Jul 2009 15:37:02 -0000	1.51
+++ Macaulay2.spec	23 Sep 2009 00:20:53 -0000	1.52
@@ -7,7 +7,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
@@ -149,23 +149,31 @@ rm -rf %{buildroot}
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
 for info_file in \
 BGG Benchmark BoijSoederberg Browse Bruns ChainComplexExtras Classic ConwayPolynomials Depth Dmodules EdgeIdeals Elimination FirstPackage FourTiTwo FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LLLBases LexIdeals LocalRings Macaulay2Doc Markov NoetherNormalization Normaliz PackageTemplate Parsing PieriMaps Points Polyhedra Polymake PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurFunctors SchurRings SimpleDoc SimplicialComplexes StatePolytope Style SymmetricPolynomials TangentCone Text gfanInterface \
 ; do
   /sbin/install-info --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
 done
 
-%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%preun
 if [ $1 -eq 0 ]; then
-  for info_file in \ 
+  for info_file in \
 BGG Benchmark BoijSoederberg Browse Bruns ChainComplexExtras Classic ConwayPolynomials Depth Dmodules EdgeIdeals Elimination FirstPackage FourTiTwo FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LLLBases LexIdeals LocalRings Macaulay2Doc Markov NoetherNormalization Normaliz PackageTemplate Parsing PieriMaps Points Polyhedra Polymake PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurFunctors SchurRings SimpleDoc SimplicialComplexes StatePolytope Style SymmetricPolynomials TangentCone Text gfanInterface \
 ; do
     /sbin/install-info --delete --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
   done
 fi
 
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
+fi
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
+
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then 
   for file in %{_datadir}/Macaulay2/emacs/M2*.el ; do
@@ -203,6 +211,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-6
+- fixup/optimize scriplets
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Sep 23 00:24:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 00:24:22 +0000 (UTC)
Subject: rpms/libsigsegv/devel libsigsegv-2.6-mystack.patch, 1.1,
	1.2 libsigsegv.spec, 1.23, 1.24
Message-ID: <20090923002422.EDC6A11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28485

Modified Files:
	libsigsegv-2.6-mystack.patch libsigsegv.spec 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-6
- respin mystack patch


libsigsegv-2.6-mystack.patch:
 b/src/sigsegv.h.in                          |    8 +++++---
 b/tests/stackoverflow1.c                    |    7 ++++---
 b/tests/stackoverflow2.c                    |    8 ++++----
 libsigsegv-2.6/m4/sigaltstack-longjmp.m4    |    2 +-
 libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4 |    2 +-
 libsigsegv-2.6/m4/sigaltstack.m4            |    3 ++-
 6 files changed, 17 insertions(+), 13 deletions(-)

Index: libsigsegv-2.6-mystack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/devel/libsigsegv-2.6-mystack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsigsegv-2.6-mystack.patch	22 Sep 2009 19:22:33 -0000	1.1
+++ libsigsegv-2.6-mystack.patch	23 Sep 2009 00:24:21 -0000	1.2
@@ -33,7 +33,7 @@ index 0970e79..23eff58 100644
  
 +/* glibc says: Users should use SIGSTKSZ as the size of user-supplied
 +   buffers.  */
-+char mystack[2 * 2 * SIGSTKSZ];
++char mystack[2 * SIGSTKSZ];
 +
  int
  main ()


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libsigsegv.spec	22 Sep 2009 19:22:33 -0000	1.23
+++ libsigsegv.spec	23 Sep 2009 00:24:21 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -124,6 +124,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-6
+- respin mystack patch
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
 - libsigsegv allocates alternate stack on the main stack (#524796)
 



From rdieter at fedoraproject.org  Wed Sep 23 00:33:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 00:33:03 +0000 (UTC)
Subject: rpms/libsigsegv/F-11 libsigsegv-2.6-mystack.patch, 1.1,
	1.2 libsigsegv.spec, 1.21, 1.22
Message-ID: <20090923003303.CEA1B11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv994

Modified Files:
	libsigsegv-2.6-mystack.patch libsigsegv.spec 
Log Message:
* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-6
- respin mystack patch


libsigsegv-2.6-mystack.patch:
 b/src/sigsegv.h.in                          |    8 +++++---
 b/tests/stackoverflow1.c                    |    7 ++++---
 b/tests/stackoverflow2.c                    |    8 ++++----
 libsigsegv-2.6/m4/sigaltstack-longjmp.m4    |    2 +-
 libsigsegv-2.6/m4/sigaltstack-siglongjmp.m4 |    2 +-
 libsigsegv-2.6/m4/sigaltstack.m4            |    3 ++-
 6 files changed, 17 insertions(+), 13 deletions(-)

Index: libsigsegv-2.6-mystack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-11/libsigsegv-2.6-mystack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsigsegv-2.6-mystack.patch	22 Sep 2009 23:02:33 -0000	1.1
+++ libsigsegv-2.6-mystack.patch	23 Sep 2009 00:33:01 -0000	1.2
@@ -33,7 +33,7 @@ index 0970e79..23eff58 100644
  
 +/* glibc says: Users should use SIGSTKSZ as the size of user-supplied
 +   buffers.  */
-+char mystack[2 * 2 * SIGSTKSZ];
++char mystack[2 * SIGSTKSZ];
 +
  int
  main ()


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-11/libsigsegv.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libsigsegv.spec	22 Sep 2009 23:02:33 -0000	1.21
+++ libsigsegv.spec	23 Sep 2009 00:33:01 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -124,6 +124,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-6
+- respin mystack patch
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
 - libsigsegv allocates alternate stack on the main stack (#524796)
 



From bojan at fedoraproject.org  Wed Sep 23 00:38:05 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 23 Sep 2009 00:38:05 +0000 (UTC)
Subject: rpms/viewvc/devel viewvc-1.1.2-validate_regex.patch, NONE,
	1.1 viewvc.spec, 1.24, 1.25
Message-ID: <20090923003805.1A10211C00E8@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4002

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Patch upstream issue #427.

viewvc-1.1.2-validate_regex.patch:
 viewvc.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE viewvc-1.1.2-validate_regex.patch ---
Index: lib/viewvc.py
===================================================================
--- lib/viewvc.py	(revision 2264)
+++ lib/viewvc.py	(working copy)
@@ -633,13 +633,16 @@
     '400 Bad Request')
 
 def _validate_regex(value):
-  # hmm. there isn't anything that we can do here.
-
   ### we need to watch the flow of these parameters through the system
   ### to ensure they don't hit the page unescaped. otherwise, these
   ### parameters could constitute a CSS attack.
-  pass
 
+  try:
+    re.compile(value)
+    return True
+  except:
+    return None
+
 def _validate_view(value):
   # Return true iff VALUE is one of our allowed views.
   return _views.has_key(value)


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- viewvc.spec	13 Aug 2009 04:00:56 -0000	1.24
+++ viewvc.spec	23 Sep 2009 00:38:04 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -11,7 +11,8 @@ URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
-Source3:        viewvc-lexer-mimetypes.py 
+Source3:        viewvc-lexer-mimetypes.py
+Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -43,6 +44,7 @@ with decent performance when run under A
 
 %prep
 %setup -q
+%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -118,6 +120,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-5
+- patch upstream issue #427
+
 * Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-4
 - try one more time
 



From bojan at fedoraproject.org  Wed Sep 23 00:42:52 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 23 Sep 2009 00:42:52 +0000 (UTC)
Subject: rpms/viewvc/F-11 viewvc-1.1.2-validate_regex.patch, NONE,
	1.1 viewvc.spec, 1.23, 1.24
Message-ID: <20090923004252.8635611C00E8@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7419

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Patch upstream issue #427.

viewvc-1.1.2-validate_regex.patch:
 viewvc.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE viewvc-1.1.2-validate_regex.patch ---
Index: lib/viewvc.py
===================================================================
--- lib/viewvc.py	(revision 2264)
+++ lib/viewvc.py	(working copy)
@@ -633,13 +633,16 @@
     '400 Bad Request')
 
 def _validate_regex(value):
-  # hmm. there isn't anything that we can do here.
-
   ### we need to watch the flow of these parameters through the system
   ### to ensure they don't hit the page unescaped. otherwise, these
   ### parameters could constitute a CSS attack.
-  pass
 
+  try:
+    re.compile(value)
+    return True
+  except:
+    return None
+
 def _validate_view(value):
   # Return true iff VALUE is one of our allowed views.
   return _views.has_key(value)


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- viewvc.spec	13 Aug 2009 04:01:47 -0000	1.23
+++ viewvc.spec	23 Sep 2009 00:42:52 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -11,7 +11,8 @@ URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
-Source3:        viewvc-lexer-mimetypes.py 
+Source3:        viewvc-lexer-mimetypes.py
+Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -43,6 +44,7 @@ with decent performance when run under A
 
 %prep
 %setup -q
+%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -118,6 +120,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-5
+- patch upstream issue #427
+
 * Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-4
 - try one more time
 



From bojan at fedoraproject.org  Wed Sep 23 00:45:54 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 23 Sep 2009 00:45:54 +0000 (UTC)
Subject: rpms/viewvc/F-10 viewvc-1.1.2-validate_regex.patch, NONE,
	1.1 viewvc.spec, 1.16, 1.17
Message-ID: <20090923004554.6243A11C00E8@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9871

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Patch upstream issue #427.

viewvc-1.1.2-validate_regex.patch:
 viewvc.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE viewvc-1.1.2-validate_regex.patch ---
Index: lib/viewvc.py
===================================================================
--- lib/viewvc.py	(revision 2264)
+++ lib/viewvc.py	(working copy)
@@ -633,13 +633,16 @@
     '400 Bad Request')
 
 def _validate_regex(value):
-  # hmm. there isn't anything that we can do here.
-
   ### we need to watch the flow of these parameters through the system
   ### to ensure they don't hit the page unescaped. otherwise, these
   ### parameters could constitute a CSS attack.
-  pass
 
+  try:
+    re.compile(value)
+    return True
+  except:
+    return None
+
 def _validate_view(value):
   # Return true iff VALUE is one of our allowed views.
   return _views.has_key(value)


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/viewvc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- viewvc.spec	4 Sep 2009 06:54:36 -0000	1.16
+++ viewvc.spec	23 Sep 2009 00:45:54 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
+Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -43,6 +44,7 @@ with decent performance when run under A
 
 %prep
 %setup -q
+%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -118,6 +120,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
+- patch upstream issue #427
+
 * Fri Sep  4 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
 - bump up to 1.1.2
 



From rdieter at fedoraproject.org  Wed Sep 23 00:46:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 00:46:29 +0000 (UTC)
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.52,1.53
Message-ID: <20090923004629.3D12611C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10077

Modified Files:
	Macaulay2.spec 
Log Message:
drop scriptlet xdg-utils deps



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- Macaulay2.spec	23 Sep 2009 00:20:53 -0000	1.52
+++ Macaulay2.spec	23 Sep 2009 00:46:29 -0000	1.53
@@ -60,8 +60,6 @@ Provides:  Macaulay2-emacs = %{version}-
 
 Provides:  macaulay2 = %{version}-%{release}
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 # M2-help
 Requires: xdg-utils
 



From bojan at fedoraproject.org  Wed Sep 23 00:49:03 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 23 Sep 2009 00:49:03 +0000 (UTC)
Subject: rpms/viewvc/EL-5 viewvc-1.1.2-validate_regex.patch, NONE,
	1.1 viewvc.spec, 1.9, 1.10
Message-ID: <20090923004903.44ABA11C00E8@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11025

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Patch upstream issue #427.

viewvc-1.1.2-validate_regex.patch:
 viewvc.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE viewvc-1.1.2-validate_regex.patch ---
Index: lib/viewvc.py
===================================================================
--- lib/viewvc.py	(revision 2264)
+++ lib/viewvc.py	(working copy)
@@ -633,13 +633,16 @@
     '400 Bad Request')
 
 def _validate_regex(value):
-  # hmm. there isn't anything that we can do here.
-
   ### we need to watch the flow of these parameters through the system
   ### to ensure they don't hit the page unescaped. otherwise, these
   ### parameters could constitute a CSS attack.
-  pass
 
+  try:
+    re.compile(value)
+    return True
+  except:
+    return None
+
 def _validate_view(value):
   # Return true iff VALUE is one of our allowed views.
   return _views.has_key(value)


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/viewvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- viewvc.spec	4 Sep 2009 06:38:22 -0000	1.9
+++ viewvc.spec	23 Sep 2009 00:49:01 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
+Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-11
@@ -43,6 +44,7 @@ with decent performance when run under A
 
 %prep
 %setup -q
+%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -114,6 +116,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
+- patch upstream issue #427
+
 * Fri Sep  4 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
 - bump up to 1.1.2
 



From rdieter at fedoraproject.org  Wed Sep 23 00:58:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 00:58:41 +0000 (UTC)
Subject: rpms/Macaulay2/devel Macaulay2-1.1-prefix.patch,1.1,NONE
Message-ID: <20090923005841.405D211C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15976

Removed Files:
	Macaulay2-1.1-prefix.patch 
Log Message:
old patch



--- Macaulay2-1.1-prefix.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 23 01:02:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 01:02:41 +0000 (UTC)
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.53,1.54
Message-ID: <20090923010241.124EA11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17167

Modified Files:
	Macaulay2.spec 
Log Message:
install-info scriptlet deps too



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- Macaulay2.spec	23 Sep 2009 00:46:29 -0000	1.53
+++ Macaulay2.spec	23 Sep 2009 01:02:40 -0000	1.54
@@ -62,6 +62,8 @@ Provides:  macaulay2 = %{version}-%{rele
 
 # M2-help
 Requires: xdg-utils
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Macaulay 2 is a new software system devoted to supporting research in



From dwalsh at fedoraproject.org  Wed Sep 23 01:06:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Sep 2009 01:06:27 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.164,1.165
Message-ID: <20090923010627.1110711C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18492

Modified Files:
	setroubleshoot.spec 
Log Message:
* Tue Sep 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.30-1
  - Update po and fix translation line
  
* Fri Sep 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.28-1
  -  Fix permissive domain check



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- setroubleshoot.spec	12 Sep 2009 03:37:01 -0000	1.164
+++ setroubleshoot.spec	23 Sep 2009 01:06:26 -0000	1.165
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.28
+Version: 2.2.30
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,8 +212,11 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Sep 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.30-1
+  - Update po and fix translation line
+  
 * Fri Sep 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.28-1
-	-  Fix permissive domain check
+  -  Fix permissive domain check
 
 * Thu Sep 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.27-1
 - Close open file descriptors on exec



From dwalsh at fedoraproject.org  Wed Sep 23 01:12:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Sep 2009 01:12:33 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.124, 1.125 sources, 1.137,
	1.138
Message-ID: <20090923011233.B7D1011C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21770

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.30-1
  - Update po and fix translation line
  
* Fri Sep 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.28-1
  -  Fix permissive domain check



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- .cvsignore	12 Sep 2009 03:37:01 -0000	1.124
+++ .cvsignore	23 Sep 2009 01:12:33 -0000	1.125
@@ -41,3 +41,4 @@ setroubleshoot-2.2.24.tar.gz
 setroubleshoot-2.2.26.tar.gz
 setroubleshoot-2.2.27.tar.gz
 setroubleshoot-2.2.28.tar.gz
+setroubleshoot-2.2.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- sources	12 Sep 2009 03:37:01 -0000	1.137
+++ sources	23 Sep 2009 01:12:33 -0000	1.138
@@ -1 +1 @@
-069167f0519fe2f3b9da2658d17b82e8  setroubleshoot-2.2.28.tar.gz
+332e4e8630f990cb1f7ba0a9e0df28e2  setroubleshoot-2.2.30.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 23 01:14:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Sep 2009 01:14:21 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.37,
	1.38 setroubleshoot-plugins.spec, 1.42, 1.43 sources, 1.38, 1.39
Message-ID: <20090923011421.DACD411C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22721

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Tue Sep 22 2009  <dwalsh at redhat.com> - 2.1.22-1
- Remove allow_daemon_user_term plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	17 Sep 2009 19:23:56 -0000	1.37
+++ .cvsignore	23 Sep 2009 01:14:21 -0000	1.38
@@ -27,3 +27,4 @@ setroubleshoot-plugins-2.1.18.tar.gz
 setroubleshoot-plugins-2.1.19.tar.gz
 setroubleshoot-plugins-2.1.20.tar.gz
 setroubleshoot-plugins-2.1.21.tar.gz
+setroubleshoot-plugins-2.1.22.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- setroubleshoot-plugins.spec	17 Sep 2009 19:23:56 -0000	1.42
+++ setroubleshoot-plugins.spec	23 Sep 2009 01:14:21 -0000	1.43
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.21
+Version: 2.1.22
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Sep 22 2009  <dwalsh at redhat.com> - 2.1.22-1
+- Remove allow_daemon_user_term plugin
+
 * Thu Sep 17 2009  <dwalsh at redhat.com> - 2.1.21-1
 - Remove allow_execmem plugin
 - Add Firefox Plugin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	17 Sep 2009 19:23:56 -0000	1.38
+++ sources	23 Sep 2009 01:14:21 -0000	1.39
@@ -1 +1 @@
-39b7d02eb2470a1daf99f03086b1f0f1  setroubleshoot-plugins-2.1.21.tar.gz
+af4dc47f4bcfd1c42b88994fd428649f  setroubleshoot-plugins-2.1.22.tar.gz



From mclasen at fedoraproject.org  Wed Sep 23 01:26:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 01:26:52 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.217,1.218
Message-ID: <20090923012652.68C8211C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26654

Modified Files:
	glib2.spec 
Log Message:
fix file lists



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- glib2.spec	22 Sep 2009 23:37:28 -0000	1.217
+++ glib2.spec	23 Sep 2009 01:26:50 -0000	1.218
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %doc %{_datadir}/gtk-doc/html/*
 %doc %{_mandir}/man1/*
+%{_datadir}/gdb/auto-load/usr/lib64/libglib-2.0.so.*-gdb.py*
+%{_datadir}/gdb/auto-load/usr/lib64/libgobject-2.0.so.*-gdb.py*
+
 
 %files static
 %defattr(-, root, root, -)



From mclasen at fedoraproject.org  Wed Sep 23 02:00:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 02:00:25 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.218,1.219
Message-ID: <20090923020026.0919811C04DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7017

Modified Files:
	glib2.spec 
Log Message:
fix file lists



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- glib2.spec	23 Sep 2009 01:26:50 -0000	1.218
+++ glib2.spec	23 Sep 2009 02:00:25 -0000	1.219
@@ -107,8 +107,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %doc %{_datadir}/gtk-doc/html/*
 %doc %{_mandir}/man1/*
-%{_datadir}/gdb/auto-load/usr/lib64/libglib-2.0.so.*-gdb.py*
-%{_datadir}/gdb/auto-load/usr/lib64/libgobject-2.0.so.*-gdb.py*
+%{_datadir}/gdb/auto-load%{_libdir}/libglib-2.0.so.*-gdb.py*
+%{_datadir}/gdb/auto-load%{_libdir}/libgobject-2.0.so.*-gdb.py*
 
 
 %files static



From jistone at fedoraproject.org  Wed Sep 23 02:25:48 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 23 Sep 2009 02:25:48 +0000 (UTC)
Subject: rpms/systemtap/devel .cvsignore, 1.19, 1.20 sources, 1.33,
	1.34 systemtap.spec, 1.52, 1.53 dtrace-default-output-path.patch,
	1.1, NONE
Message-ID: <20090923022549.2AA3911C00E8@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19069

Modified Files:
	.cvsignore sources systemtap.spec 
Removed Files:
	dtrace-default-output-path.patch 
Log Message:
upstream release 1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Aug 2009 03:44:50 -0000	1.19
+++ .cvsignore	23 Sep 2009 02:25:46 -0000	1.20
@@ -1 +1 @@
-systemtap-0.9.9.tar.gz
+systemtap-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	5 Aug 2009 03:57:24 -0000	1.33
+++ sources	23 Sep 2009 02:25:47 -0000	1.34
@@ -1 +1 @@
-4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz
+e11c9ec18f3b269b846054e9ca33011a  systemtap-1.0.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- systemtap.spec	4 Sep 2009 23:31:57 -0000	1.52
+++ systemtap.spec	23 Sep 2009 02:25:47 -0000	1.53
@@ -8,8 +8,8 @@
 %{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.9
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -49,8 +49,6 @@ BuildRequires: elfutils-devel >= %{elfut
 Requires: crash
 %endif
 
-Patch2: dtrace-default-output-path.patch
-
 %if %{with_docs}
 BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
 # On F10, xmlto's pdf support was broken off into a sub-package,
@@ -86,7 +84,7 @@ Summary: Instrumentation System Testsuit
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap systemtap-sdt-devel dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu which
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -99,11 +97,13 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description client
-SystemTap client is the client component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation client component of systemtap.
+It relies on a nearby compilation server to translate systemtap
+scripts to kernel objects, so a client workstation only needs the
+runtime, and not the compiler/etc toolchain.
 
 %package server
 Summary: Instrumentation System Server
@@ -112,11 +112,12 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description server
-SystemTap server is the server component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation server component of systemtap.
+It announces itself to local clients with avahi, and compiles systemtap
+scripts to kernel objects on their demand.
 
 %package sdt-devel
 Summary: Static probe support tools
@@ -163,8 +164,6 @@ find . \( -name configure -o -name confi
 cd ..
 %endif
 
-%patch2 -p1
-
 %build
 
 %if %{with_bundled_elfutils}
@@ -343,6 +342,8 @@ exit 0
 %{_bindir}/stap-client
 %{_bindir}/stap-env
 %{_bindir}/stap-find-servers
+%{_bindir}/stap-authorize-cert
+%{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-client-connect
 %{_mandir}/man8/stap-server.8*
 
@@ -359,6 +360,7 @@ exit 0
 %{_bindir}/stap-authorize-cert
 %{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-server-connect
+%{_bindir}/stap-sign-module
 %{_mandir}/man8/stap-server.8*
 
 %files sdt-devel
@@ -385,15 +387,8 @@ exit 0
 
 
 %changelog
-* Fri Sep  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-4
-- Fix the default output path of dtrace (upstream commit 3a45db13)
-
-* Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
-- Fix uprobes error suppression in %post and %preun (#515870)
-  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
-
-* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
-- Rebuild with correct sources.
+* Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
+- Upstream release.
 
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
 - Upstream release.


--- dtrace-default-output-path.patch DELETED ---



From jistone at fedoraproject.org  Wed Sep 23 02:26:04 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 23 Sep 2009 02:26:04 +0000 (UTC)
Subject: rpms/systemtap/F-11 .cvsignore, 1.19, 1.20 sources, 1.33,
	1.34 systemtap.spec, 1.50, 1.51
Message-ID: <20090923022604.01E3511C00E8@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19212

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Aug 2009 03:45:08 -0000	1.19
+++ .cvsignore	23 Sep 2009 02:26:03 -0000	1.20
@@ -1 +1 @@
-systemtap-0.9.9.tar.gz
+systemtap-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	5 Aug 2009 04:04:18 -0000	1.33
+++ sources	23 Sep 2009 02:26:03 -0000	1.34
@@ -1 +1 @@
-4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz
+e11c9ec18f3b269b846054e9ca33011a  systemtap-1.0.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/systemtap.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- systemtap.spec	13 Aug 2009 00:17:52 -0000	1.50
+++ systemtap.spec	23 Sep 2009 02:26:03 -0000	1.51
@@ -8,8 +8,8 @@
 %{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.9
-Release: 3%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -84,7 +84,7 @@ Summary: Instrumentation System Testsuit
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap systemtap-sdt-devel dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu which
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -97,11 +97,13 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description client
-SystemTap client is the client component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation client component of systemtap.
+It relies on a nearby compilation server to translate systemtap
+scripts to kernel objects, so a client workstation only needs the
+runtime, and not the compiler/etc toolchain.
 
 %package server
 Summary: Instrumentation System Server
@@ -110,11 +112,12 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description server
-SystemTap server is the server component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation server component of systemtap.
+It announces itself to local clients with avahi, and compiles systemtap
+scripts to kernel objects on their demand.
 
 %package sdt-devel
 Summary: Static probe support tools
@@ -339,6 +342,8 @@ exit 0
 %{_bindir}/stap-client
 %{_bindir}/stap-env
 %{_bindir}/stap-find-servers
+%{_bindir}/stap-authorize-cert
+%{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-client-connect
 %{_mandir}/man8/stap-server.8*
 
@@ -355,6 +360,7 @@ exit 0
 %{_bindir}/stap-authorize-cert
 %{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-server-connect
+%{_bindir}/stap-sign-module
 %{_mandir}/man8/stap-server.8*
 
 %files sdt-devel
@@ -381,12 +387,8 @@ exit 0
 
 
 %changelog
-* Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
-- Fix uprobes error suppression in %post and %preun (#515870)
-  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
-
-* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
-- Rebuild with correct sources.
+* Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
+- Upstream release.
 
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
 - Upstream release.



From jistone at fedoraproject.org  Wed Sep 23 02:26:12 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 23 Sep 2009 02:26:12 +0000 (UTC)
Subject: rpms/systemtap/F-10 .cvsignore, 1.18, 1.19 sources, 1.33,
	1.34 systemtap.spec, 1.48, 1.49
Message-ID: <20090923022612.E095711C00E8@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19280

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Aug 2009 03:45:36 -0000	1.18
+++ .cvsignore	23 Sep 2009 02:26:12 -0000	1.19
@@ -1 +1 @@
-systemtap-0.9.9.tar.gz
+systemtap-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	5 Aug 2009 04:05:41 -0000	1.33
+++ sources	23 Sep 2009 02:26:12 -0000	1.34
@@ -1 +1 @@
-4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz
+e11c9ec18f3b269b846054e9ca33011a  systemtap-1.0.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/systemtap.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- systemtap.spec	13 Aug 2009 00:17:55 -0000	1.48
+++ systemtap.spec	23 Sep 2009 02:26:12 -0000	1.49
@@ -8,8 +8,8 @@
 %{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.9
-Release: 3%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -84,7 +84,7 @@ Summary: Instrumentation System Testsuit
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap systemtap-sdt-devel dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu which
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -97,11 +97,13 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description client
-SystemTap client is the client component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation client component of systemtap.
+It relies on a nearby compilation server to translate systemtap
+scripts to kernel objects, so a client workstation only needs the
+runtime, and not the compiler/etc toolchain.
 
 %package server
 Summary: Instrumentation System Server
@@ -110,11 +112,12 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description server
-SystemTap server is the server component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation server component of systemtap.
+It announces itself to local clients with avahi, and compiles systemtap
+scripts to kernel objects on their demand.
 
 %package sdt-devel
 Summary: Static probe support tools
@@ -339,6 +342,8 @@ exit 0
 %{_bindir}/stap-client
 %{_bindir}/stap-env
 %{_bindir}/stap-find-servers
+%{_bindir}/stap-authorize-cert
+%{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-client-connect
 %{_mandir}/man8/stap-server.8*
 
@@ -355,6 +360,7 @@ exit 0
 %{_bindir}/stap-authorize-cert
 %{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-server-connect
+%{_bindir}/stap-sign-module
 %{_mandir}/man8/stap-server.8*
 
 %files sdt-devel
@@ -381,12 +387,8 @@ exit 0
 
 
 %changelog
-* Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
-- Fix uprobes error suppression in %post and %preun (#515870)
-  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
-
-* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
-- Rebuild with correct sources.
+* Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
+- Upstream release.
 
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
 - Upstream release.



From dcantrel at fedoraproject.org  Wed Sep 23 03:21:34 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 23 Sep 2009 03:21:34 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.670, 1.671 anaconda.spec, 1.820, 
	1.821 sources, 1.804, 1.805
Message-ID: <20090923032134.33F7411C00E8@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5747

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Sep 22 2009 David Cantrell <dcantrell at redhat.com> - 12.29-1
- Updated po/anaconda.pot (dcantrell)
- Remove ui/instkey.glade.h from po/POTFILES.in (dcantrell)

* Tue Sep 22 2009 David Cantrell <dcantrell at redhat.com> - 12.28-1
- Preserve whitespace in $CDLABEL in mk-images.x86 (dcantrell)
- Modify rhel.py installclass for current RHEL development efforts.
  (dcantrell)
- Add --brand switch support to buildinstall script. (dcantrell)
- Remove the installation number screen. (clumens)
- Remove kickstart-docs.txt, since it comes with pykickstart (#515168).
  (clumens)
- ybin, mkofboot, and ofpath moved from /usr/sbin to /sbin (#524608).
  (clumens)
- Honor ignoredisk --only-use. (#514353) (dlehman)
- Make sure user-selected mountpoint is not already in use. (#524584)
  (dlehman)
- Do not raise UI dialog in stage2 if network is set in ks (#487503).
  (rvykydal)
- Use whiptail instead of dialog in rescue mode, supports serial line better
  and looks nicer (msivak)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -p -r1.670 -r1.671
--- .cvsignore	22 Sep 2009 03:34:15 -0000	1.670
+++ .cvsignore	23 Sep 2009 03:21:32 -0000	1.671
@@ -1 +1 @@
-anaconda-12.27.tar.bz2
+anaconda-12.29.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -p -r1.820 -r1.821
--- anaconda.spec	22 Sep 2009 03:34:15 -0000	1.820
+++ anaconda.spec	23 Sep 2009 03:21:32 -0000	1.821
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.27
+Version: 12.29
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -192,7 +192,6 @@ update-desktop-database &> /dev/null || 
 %doc COPYING
 %doc docs/command-line.txt
 %doc docs/install-methods.txt
-%doc docs/kickstart-docs.txt
 %doc docs/mediacheck.txt
 %doc docs/anaconda-release-notes.txt
 /lib/udev/rules.d/70-anaconda.rules
@@ -215,6 +214,28 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Sep 22 2009 David Cantrell <dcantrell at redhat.com> - 12.29-1
+- Updated po/anaconda.pot (dcantrell)
+- Remove ui/instkey.glade.h from po/POTFILES.in (dcantrell)
+
+* Tue Sep 22 2009 David Cantrell <dcantrell at redhat.com> - 12.28-1
+- Preserve whitespace in $CDLABEL in mk-images.x86 (dcantrell)
+- Modify rhel.py installclass for current RHEL development efforts.
+  (dcantrell)
+- Add --brand switch support to buildinstall script. (dcantrell)
+- Remove the installation number screen. (clumens)
+- Remove kickstart-docs.txt, since it comes with pykickstart (#515168).
+  (clumens)
+- ybin, mkofboot, and ofpath moved from /usr/sbin to /sbin (#524608).
+  (clumens)
+- Honor ignoredisk --only-use. (#514353) (dlehman)
+- Make sure user-selected mountpoint is not already in use. (#524584)
+  (dlehman)
+- Do not raise UI dialog in stage2 if network is set in ks (#487503).
+  (rvykydal)
+- Use whiptail instead of dialog in rescue mode, supports serial line better
+  and looks nicer (msivak)
+
 * Mon Sep 21 2009 David Cantrell <dcantrell at redhat.com> - 12.27-1
 - Require at least system-config-keyboard 1.3.1 or higher. (dcantrell)
 - Fixes for rhel installclass. (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -p -r1.804 -r1.805
--- sources	22 Sep 2009 03:34:15 -0000	1.804
+++ sources	23 Sep 2009 03:21:32 -0000	1.805
@@ -1 +1 @@
-4e5feac42b9730ea97b87dab0ab0df57  anaconda-12.27.tar.bz2
+8e21f51de2daf420f3ee26cbc0964ebb  anaconda-12.29.tar.bz2



From oget at fedoraproject.org  Wed Sep 23 04:13:05 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 04:13:05 +0000 (UTC)
Subject: rpms/seq24/devel seq24.desktop,1.1,1.2 seq24.spec,1.12,1.13
Message-ID: <20090923041305.26B1911C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/seq24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10689

Modified Files:
	seq24.desktop seq24.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.7-17
- Update desktop file according to F-12 FedoraStudio feature
- Update scriptlets



Index: seq24.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/seq24/devel/seq24.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- seq24.desktop	26 Sep 2006 18:12:59 -0000	1.1
+++ seq24.desktop	23 Sep 2009 04:13:03 -0000	1.2
@@ -6,5 +6,5 @@ Type=Application
 Exec=seq24
 Terminal=false
 StartupWMClass=seq24
-Categories=Application;AudioVideo;X-Sequencers;X-MIDI;
+Categories=Application;AudioVideo;X-Sequencers;X-MIDI;Midi;Sequencer;
 Encoding=UTF-8


Index: seq24.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seq24/devel/seq24.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- seq24.spec	27 Jul 2009 04:10:13 -0000	1.12
+++ seq24.spec	23 Sep 2009 04:13:03 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:      Real-time midi sequencer
 Name:         seq24
 Version:      0.8.7
-Release:      16%{?dist}
+Release:      17%{?dist}
 License:      GPLv2+
 Group:        Applications/Multimedia
 URL:          http://www.filter24.org/seq24/
@@ -55,14 +55,17 @@ desktop-file-install --vendor fedora \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/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
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -72,6 +75,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/64x64/apps/seq24.png
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.7-17
+- Update desktop file according to F-12 FedoraStudio feature
+- Update scriptlets
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 04:33:52 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 04:33:52 +0000 (UTC)
Subject: rpms/rakarrack/devel rakarrack.spec,1.4,1.5
Message-ID: <20090923043352.758AC11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/rakarrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17200

Modified Files:
	rakarrack.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.0-4
- Update desktop file according to F-12 FedoraStudio feature
- Update scriptlets



Index: rakarrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakarrack/devel/rakarrack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rakarrack.spec	27 Jul 2009 02:46:17 -0000	1.4
+++ rakarrack.spec	23 Sep 2009 04:33:50 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Audio effects processing rack for guitar
 Name:    rakarrack
 Version: 0.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group:   Applications/Multimedia
 URL:     http://%{name}.sourceforge.net/
@@ -63,8 +63,8 @@ for dim in 32x32 64x64 128x128; do
 done
 
 # extra desktop file categories are allowed if prepended with X-
-BASE="X-Fedora Application AudioVideo"
-XTRA="X-Digital_Processing X-Jack"
+BASE="X-Fedora AudioVideo"
+XTRA="X-DigitalProcessing X-Jack"
 MIXER="Mixer"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
@@ -73,20 +73,18 @@ desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/rakarrack.desktop
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/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
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -103,6 +101,10 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.0-4
+- Update desktop file according to F-12 FedoraStudio feature
+- Update scriptlets
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 05:05:29 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 05:05:29 +0000 (UTC)
Subject: rpms/lmms/devel lmms.spec,1.7,1.8
Message-ID: <20090923050530.3365411C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25815

Modified Files:
	lmms.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.5-2
- Update desktop file according to F-12 FedoraStudio feature



Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/lmms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lmms.spec	4 Sep 2009 21:21:19 -0000	1.7
+++ lmms.spec	23 Sep 2009 05:05:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lmms
 Version:        0.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -162,6 +162,9 @@ make VERBOSE=1 %{?_smp_mflags}
 make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor '' \
+        --add-category=Midi \
+        --add-category=Sequencer \
+        --add-category=X-Jack \
         --dir %{buildroot}%{_datadir}/applications \
         %{buildroot}%{_datadir}/applications/%{name}.desktop
 
@@ -220,6 +223,9 @@ This package contains the necessary file
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.5-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Sep  4 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.5-1
 - Udate to 0.4.5.
 - Rebase patches, and drop fltk patches not needed anymore.



From epienbro at fedoraproject.org  Wed Sep 23 05:12:40 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 23 Sep 2009 05:12:40 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.10, 1.11 mingw32-glib2.spec, 
	1.16, 1.17 sources, 1.10, 1.11
Message-ID: <20090923051240.A8AC911C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Sep 2009 09:05:48 -0000	1.10
+++ .cvsignore	23 Sep 2009 05:12:40 -0000	1.11
@@ -1 +1 @@
-glib-2.21.6.tar.bz2
+glib-2.22.0.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mingw32-glib2.spec	18 Sep 2009 21:21:46 -0000	1.16
+++ mingw32-glib2.spec	23 Sep 2009 05:12:40 -0000	1.17
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.21.6
-Release:        2%{?dist}
+Version:        2.22.0
+Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 2.22.0-1
+- Update to 2.22.0
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.6-2
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Sep 2009 09:05:48 -0000	1.10
+++ sources	23 Sep 2009 05:12:40 -0000	1.11
@@ -1 +1 @@
-3b0452fbd877db53dafabdc074600cb8  glib-2.21.6.tar.bz2
+e0bc5b08d467cc3763550923087772d3  glib-2.22.0.tar.bz2



From epienbro at fedoraproject.org  Wed Sep 23 05:32:26 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 23 Sep 2009 05:32:26 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel mingw32-glib2.spec,1.17,1.18
Message-ID: <20090923053226.818C011C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1535

Modified Files:
	mingw32-glib2.spec 
Log Message:
Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs



Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mingw32-glib2.spec	23 Sep 2009 05:12:40 -0000	1.17
+++ mingw32-glib2.spec	23 Sep 2009 05:32:25 -0000	1.18
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT/build_static
 
 rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 
+# Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs
+rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb
+
 # Remove the gtk-doc documentation and manpages which duplicate Fedora native
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc



From mclasen at fedoraproject.org  Wed Sep 23 05:33:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 05:33:39 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2-printing-nonblocking-printer-list.patch, NONE, 
	1.1 gtk2-printing-smb-auth.patch, NONE, 1.1 .cvsignore, 1.116,
	1.117 gtk2.spec, 1.404, 1.405 sources, 1.125, 1.126
Message-ID: <20090923053339.0F70B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1975

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	gtk2-printing-nonblocking-printer-list.patch 
	gtk2-printing-smb-auth.patch 
Log Message:
2.18.0


gtk2-printing-nonblocking-printer-list.patch:
 gtk/gtkprintunixdialog.c                         |   28 ++++++++-----
 modules/printbackends/cups/gtkprintbackendcups.c |   47 +++++++++++++++++++++--
 modules/printbackends/cups/gtkprintercups.c      |    8 +++
 modules/printbackends/cups/gtkprintercups.h      |    5 ++
 4 files changed, 74 insertions(+), 14 deletions(-)

--- NEW FILE gtk2-printing-nonblocking-printer-list.patch ---
diff -up gtk+-2.18.0/gtk/gtkprintunixdialog.c.printing-nonblocking-printer-list gtk+-2.18.0/gtk/gtkprintunixdialog.c
--- gtk+-2.18.0/gtk/gtkprintunixdialog.c.printing-nonblocking-printer-list	2009-09-11 22:58:38.000000000 -0400
+++ gtk+-2.18.0/gtk/gtkprintunixdialog.c	2009-09-23 01:28:27.595033076 -0400
@@ -596,7 +596,7 @@ gtk_print_unix_dialog_destroy (GtkPrintU
 }
 
 static void
-disconnect_printer_details_request (GtkPrintUnixDialog *dialog)
+disconnect_printer_details_request (GtkPrintUnixDialog *dialog, gboolean details_failed)
 {
   GtkPrintUnixDialogPrivate *priv = dialog->priv;
 
@@ -606,12 +606,20 @@ disconnect_printer_details_request (GtkP
                                    priv->request_details_tag);
       priv->request_details_tag = 0;
       set_busy_cursor (dialog, FALSE);
-      gtk_list_store_set (GTK_LIST_STORE (priv->printer_list),
-                          g_object_get_data (G_OBJECT (priv->request_details_printer),
-                                             "gtk-print-tree-iter"),
-                          PRINTER_LIST_COL_STATE,
-                          gtk_printer_get_state_message (priv->request_details_printer),
-                          -1);
+      if (details_failed)
+        gtk_list_store_set (GTK_LIST_STORE (priv->printer_list),
+                            g_object_get_data (G_OBJECT (priv->request_details_printer),
+                                               "gtk-print-tree-iter"),
+                            PRINTER_LIST_COL_STATE,
+                             _("Getting printer information failed"),
+                            -1);
+      else
+        gtk_list_store_set (GTK_LIST_STORE (priv->printer_list),
+                            g_object_get_data (G_OBJECT (priv->request_details_printer),
+                                               "gtk-print-tree-iter"),
+                            PRINTER_LIST_COL_STATE,
+                            gtk_printer_get_state_message (priv->request_details_printer),
+                            -1);
       g_object_unref (priv->request_details_printer);
       priv->request_details_printer = NULL;
     }
@@ -626,7 +634,7 @@ gtk_print_unix_dialog_finalize (GObject 
   GList *node;
 
   unschedule_idle_mark_conflicts (dialog);
-  disconnect_printer_details_request (dialog);
+  disconnect_printer_details_request (dialog, FALSE);
 
   if (priv->current_printer)
     {
@@ -1781,7 +1789,7 @@ printer_details_acquired (GtkPrinter    
 {
   GtkPrintUnixDialogPrivate *priv = dialog->priv;
 
-  disconnect_printer_details_request (dialog);
+  disconnect_printer_details_request (dialog, !success);
 
   if (success)
     {
@@ -1809,7 +1817,7 @@ selected_printer_changed (GtkTreeSelecti
       priv->waiting_for_printer = NULL;
     }
 
-  disconnect_printer_details_request (dialog);
+  disconnect_printer_details_request (dialog, FALSE);
 
   printer = NULL;
   if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter))
diff -up gtk+-2.18.0/modules/printbackends/cups/gtkprintbackendcups.c.printing-nonblocking-printer-list gtk+-2.18.0/modules/printbackends/cups/gtkprintbackendcups.c
--- gtk+-2.18.0/modules/printbackends/cups/gtkprintbackendcups.c.printing-nonblocking-printer-list	2009-09-23 01:28:27.557052405 -0400
+++ gtk+-2.18.0/modules/printbackends/cups/gtkprintbackendcups.c	2009-09-23 01:28:27.600060112 -0400
@@ -156,7 +156,7 @@ static GList *              cups_printer
 static GtkPageSetup *       cups_printer_get_default_page_size     (GtkPrinter                        *printer);
 static void                 cups_printer_request_details           (GtkPrinter                        *printer);
 static gboolean             cups_request_default_printer           (GtkPrintBackendCups               *print_backend);
-static void                 cups_request_ppd                       (GtkPrinter                        *printer);
+static gboolean             cups_request_ppd                       (GtkPrinter                        *printer);
 static void                 cups_printer_get_hard_margins          (GtkPrinter                        *printer,
 								    double                            *top,
 								    double                            *bottom,
@@ -1906,6 +1906,8 @@ cups_request_printer_list_cb (GtkPrintBa
       else
 	g_object_ref (printer);
 
+      GTK_PRINTER_CUPS (printer)->remote = remote_printer;
+
       gtk_printer_set_is_paused (printer, is_paused);
       gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs);
 
@@ -2206,7 +2208,7 @@ done:
   GDK_THREADS_LEAVE ();
 }
 
-static void
+static gboolean
 cups_request_ppd (GtkPrinter *printer)
 {
   GError *error;
@@ -2226,6 +2228,26 @@ cups_request_ppd (GtkPrinter *printer)
   GTK_NOTE (PRINTING,
             g_print ("CUPS Backend: %s\n", G_STRFUNC));
 
+  if (cups_printer->remote)
+    {
+      GtkCupsConnectionState state;
+
+      state = gtk_cups_connection_test_get_state (cups_printer->remote_cups_connection_test);
+
+      if (state == GTK_CUPS_CONNECTION_IN_PROGRESS)
+        return TRUE;
+
+      gtk_cups_connection_test_free (cups_printer->remote_cups_connection_test);
+      cups_printer->remote_cups_connection_test = NULL;
+      cups_printer->get_remote_ppd_poll = 0;
+
+      if (state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
+        {
+          g_signal_emit_by_name (printer, "details-acquired", FALSE);
+          return FALSE;
+        }
+    }
+
   http = httpConnectEncrypt (cups_printer->hostname, 
 			     cups_printer->port,
 			     cupsEncryption ());
@@ -2255,7 +2277,7 @@ cups_request_ppd (GtkPrinter *printer)
       g_free (data);
 
       g_signal_emit_by_name (printer, "details-acquired", FALSE);
-      return;
+      return FALSE;
     }
     
   data->http = http;
@@ -2293,6 +2315,8 @@ cups_request_ppd (GtkPrinter *printer)
 
   g_free (resource);
   g_free (ppd_filename);
+
+  return FALSE;
 }
 
 /* Ordering matters for default preference */
@@ -2590,7 +2614,22 @@ cups_printer_request_details (GtkPrinter
   cups_printer = GTK_PRINTER_CUPS (printer);
   if (!cups_printer->reading_ppd && 
       gtk_printer_cups_get_ppd (cups_printer) == NULL)
-    cups_request_ppd (printer); 
+    {
+      if (cups_printer->remote)
+        {
+          if (cups_printer->get_remote_ppd_poll == 0)
+            {
+              cups_printer->remote_cups_connection_test = gtk_cups_connection_test_new (cups_printer->hostname);
+
+              if (cups_request_ppd (printer))
+                cups_printer->get_remote_ppd_poll = gdk_threads_add_timeout (200,
+                                                    (GSourceFunc) cups_request_ppd,
+                                                    printer);
+            }
+        }
+      else
+        cups_request_ppd (printer);
+    }
 }
 
 static char *
diff -up gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.c.printing-nonblocking-printer-list gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.c
--- gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.c.printing-nonblocking-printer-list	2009-09-23 01:28:27.558041288 -0400
+++ gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.c	2009-09-23 01:30:55.841053044 -0400
@@ -78,6 +78,9 @@ gtk_printer_cups_init (GtkPrinterCups *p
   printer->default_cover_before = NULL;
   printer->default_cover_after = NULL;
   printer->auth_info_required = NULL;
+  printer->remote = FALSE;
+  printer->get_remote_ppd_poll = 0;
+  printer->remote_cups_connection_test = NULL;
 }
 
 static void
@@ -100,6 +103,11 @@ gtk_printer_cups_finalize (GObject *obje
   if (printer->ppd_file)
     ppdClose (printer->ppd_file);
 
+  if (printer->get_remote_ppd_poll > 0)
+    g_source_remove (printer->get_remote_ppd_poll);
+
+  gtk_cups_connection_test_free (printer->remote_cups_connection_test);
+
   G_OBJECT_CLASS (gtk_printer_cups_parent_class)->finalize (object);
 }
 
diff -up gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.h.printing-nonblocking-printer-list gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.h
--- gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.h.printing-nonblocking-printer-list	2009-09-23 01:28:27.559041206 -0400
+++ gtk+-2.18.0/modules/printbackends/cups/gtkprintercups.h	2009-09-23 01:31:02.087036708 -0400
@@ -23,6 +23,7 @@
 #include <glib-object.h>
 #include <cups/cups.h>
 #include <cups/ppd.h>
+#include "gtkcupsutils.h"
 
 #include <gtk/gtkunixprint.h>
 
@@ -56,6 +57,10 @@ struct _GtkPrinterCups
 
   gchar  *default_cover_before;
   gchar  *default_cover_after;
+
+  gboolean remote;
+  guint get_remote_ppd_poll;
+  GtkCupsConnectionTest *remote_cups_connection_test;
 };
 
 struct _GtkPrinterCupsClass

gtk2-printing-smb-auth.patch:
 gtk/gtkmarshalers.list                           |    1 
 gtk/gtkprintbackend.c                            |  164 +++++++-------
 gtk/gtkprintbackend.h                            |   16 -
 modules/printbackends/cups/gtkcupsutils.c        |    5 
 modules/printbackends/cups/gtkcupsutils.h        |    3 
 modules/printbackends/cups/gtkprintbackendcups.c |  255 +++++++++++++++++++++--
 modules/printbackends/cups/gtkprintercups.c      |    2 
 modules/printbackends/cups/gtkprintercups.h      |    2 
 8 files changed, 339 insertions(+), 109 deletions(-)

--- NEW FILE gtk2-printing-smb-auth.patch ---
>From 82562ae5ddd7e50428aaedb5eb1edeec57c3f54f Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik at redhat.com>
Date: Wed, 16 Sep 2009 14:54:05 +0200
Subject: [PATCH] Add support for 'auth-info' attribute to the CUPS backend

Check for 'auth-info-required' attribute from printer attributes to
find out whether an authentization of user is needed.
Change password dialog of print backend to be able to require informations
requested thru 'auth-info-required' (#566522).
---
 gtk/gtkmarshalers.list                           |    1 +
 gtk/gtkprintbackend.c                            |  164 +++++++-------
 gtk/gtkprintbackend.h                            |   16 +-
 modules/printbackends/cups/gtkcupsutils.c        |    5 +
 modules/printbackends/cups/gtkcupsutils.h        |    3 +
 modules/printbackends/cups/gtkprintbackendcups.c |  255 ++++++++++++++++++++--
 modules/printbackends/cups/gtkprintercups.c      |    2 +
 modules/printbackends/cups/gtkprintercups.h      |    1 +
 8 files changed, 339 insertions(+), 108 deletions(-)

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 533a266..77873cb 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -111,3 +111,4 @@ VOID:UINT,STRING,UINT
 VOID:UINT,UINT
 VOID:VOID
 OBJECT:OBJECT,INT,INT
+VOID:POINTER,POINTER,POINTER,POINTER,STRING
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 567273b..3c64823 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -50,9 +50,8 @@ struct _GtkPrintBackendPrivate
   guint printer_list_requested : 1;
   guint printer_list_done : 1;
   GtkPrintBackendStatus status;
-  char *hostname;
-  char *username;
-  char *password;
+  char **auth_info_required;
+  char **auth_info;
 };
 
 enum {
@@ -359,8 +358,10 @@ static GList *              fallback_printer_list_papers           (GtkPrinter
 static GtkPageSetup *       fallback_printer_get_default_page_size (GtkPrinter          *printer);
 static GtkPrintCapabilities fallback_printer_get_capabilities      (GtkPrinter          *printer);
 static void                 request_password                       (GtkPrintBackend     *backend,
-                                                                    const gchar         *hostname,
-                                                                    const gchar         *username,
+                                                                    gpointer             auth_info_required,
+                                                                    gpointer             auth_info_default,
+                                                                    gpointer             auth_info_display,
+                                                                    gpointer             auth_info_visible,
                                                                     const gchar         *prompt);
   
 static void
@@ -441,8 +442,8 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkPrintBackendClass, request_password),
 		  NULL, NULL,
-		  _gtk_marshal_VOID__STRING_STRING_STRING,
-		  G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+		  _gtk_marshal_VOID__POINTER_POINTER_POINTER_POINTER_STRING,
+		  G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING);
 }
 
 static void
@@ -455,9 +456,8 @@ gtk_print_backend_init (GtkPrintBackend *backend)
   priv->printers = g_hash_table_new_full (g_str_hash, g_str_equal, 
 					  (GDestroyNotify) g_free,
 					  (GDestroyNotify) g_object_unref);
-  priv->hostname = NULL;
-  priv->username = NULL;
-  priv->password = NULL;
+  priv->auth_info_required = NULL;
+  priv->auth_info = NULL;
 }
 
 static void
@@ -662,40 +662,29 @@ gtk_print_backend_print_stream (GtkPrintBackend        *backend,
 }
 
 void 
-gtk_print_backend_set_password (GtkPrintBackend *backend,
-                                const gchar     *hostname,
-                                const gchar     *username,
-                                const gchar     *password)
+gtk_print_backend_set_password (GtkPrintBackend  *backend,
+                                gchar           **auth_info_required,
+                                gchar           **auth_info)
 {
   g_return_if_fail (GTK_IS_PRINT_BACKEND (backend));
 
   if (GTK_PRINT_BACKEND_GET_CLASS (backend)->set_password)
-    GTK_PRINT_BACKEND_GET_CLASS (backend)->set_password (backend, hostname, username, password);
+    GTK_PRINT_BACKEND_GET_CLASS (backend)->set_password (backend, auth_info_required, auth_info);
 }
 
 static void
-store_password (GtkEntry        *entry,
-                GtkPrintBackend *backend)
+store_entry (GtkEntry  *entry,
+             gpointer   user_data)
 {
-  GtkPrintBackendPrivate *priv = backend->priv;
+  gchar **data = (gchar **) user_data;
 
-  if (priv->password != NULL)
+  if (*data != NULL)
     {
-      memset (priv->password, 0, strlen (priv->password));
-      g_free (priv->password);
+      memset (*data, 0, strlen (*data));
+      g_free (*data);
     }
 
-  priv->password = g_strdup (gtk_entry_get_text (entry));
-}
-
-static void
-store_username (GtkEntry        *entry,
-                GtkPrintBackend *backend)
-{
-  GtkPrintBackendPrivate *priv = backend->priv;
-
-  g_free (priv->username);
-  priv->username = g_strdup (gtk_entry_get_text (entry));
+  *data = g_strdup (gtk_entry_get_text (entry));
 }
 
 static void
@@ -704,21 +693,24 @@ password_dialog_response (GtkWidget       *dialog,
                           GtkPrintBackend *backend)
 {
   GtkPrintBackendPrivate *priv = backend->priv;
+  gint i;
 
   if (response_id == GTK_RESPONSE_OK)
-    gtk_print_backend_set_password (backend, priv->hostname, priv->username, priv->password);
+    gtk_print_backend_set_password (backend, priv->auth_info_required, priv->auth_info);
   else
-    gtk_print_backend_set_password (backend, priv->hostname, priv->username, NULL);
+    gtk_print_backend_set_password (backend, priv->auth_info_required, NULL);
 
-  if (priv->password != NULL)
-    {
-      memset (priv->password, 0, strlen (priv->password));
-      g_free (priv->password);
-      priv->password = NULL;
-    }
+  for (i = 0; i < g_strv_length (priv->auth_info_required); i++)
+    if (priv->auth_info[i] != NULL)
+      {
+        memset (priv->auth_info[i], 0, strlen (priv->auth_info[i]));
+        g_free (priv->auth_info[i]);
+        priv->auth_info[i] = NULL;
+      }
+  g_free (priv->auth_info);
+  priv->auth_info = NULL;
 
-  g_free (priv->username);
-  priv->username = NULL;
+  g_strfreev (priv->auth_info_required);
 
   gtk_widget_destroy (dialog);
 
@@ -726,16 +718,27 @@ password_dialog_response (GtkWidget       *dialog,
 }
 
 static void
-request_password (GtkPrintBackend *backend,
-                  const gchar     *hostname,
-                  const gchar     *username,
-                  const gchar     *prompt)
+request_password (GtkPrintBackend  *backend,
+                  gpointer          auth_info_required,
+                  gpointer          auth_info_default,
+                  gpointer          auth_info_display,
+                  gpointer          auth_info_visible,
+                  const gchar      *prompt)
 {
   GtkPrintBackendPrivate *priv = backend->priv;
-  GtkWidget *dialog, *username_box, *password_box, *main_box, *label, *icon, *vbox,
-            *password_prompt, *username_prompt,
-            *password_entry, *username_entry;
+  GtkWidget *dialog, *box, *main_box, *label, *icon, *vbox, *entry;
+  GtkWidget *focus = NULL;
   gchar     *markup;
+  gint       length;
+  gint       i;
+  gchar    **ai_required = (gchar **) auth_info_required;
+  gchar    **ai_default = (gchar **) auth_info_default;
+  gchar    **ai_display = (gchar **) auth_info_display;
+  gboolean  *ai_visible = (gboolean *) auth_info_visible;
+
+  priv->auth_info_required = g_strdupv (ai_required);
+  length = g_strv_length (ai_required);
+  priv->auth_info = g_new0 (gchar *, length);
 
   dialog = gtk_dialog_new_with_buttons ( _("Authentication"), NULL, GTK_DIALOG_MODAL, 
                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -766,27 +769,6 @@ request_password (GtkPrintBackend *backend,
   g_free (markup);
 
 
-  /* Right - 2. */
-  username_box = gtk_hbox_new (TRUE, 0);
-
-  username_prompt = gtk_label_new (_("Username:"));
-  gtk_misc_set_alignment (GTK_MISC (username_prompt), 0.0, 0.5);
-
-  username_entry = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (username_entry), username);
-
-
-  /* Right - 3. */
-  password_box = gtk_hbox_new (TRUE, 0);
-
-  password_prompt = gtk_label_new (_("Password:"));
-  gtk_misc_set_alignment (GTK_MISC (password_prompt), 0.0, 0.5);
-
-  password_entry = gtk_entry_new ();
-  gtk_entry_set_visibility (GTK_ENTRY (password_entry), FALSE);
-  gtk_entry_set_activates_default (GTK_ENTRY (password_entry), TRUE);
-
-
   /* Packing */
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_box, TRUE, FALSE, 0);
 
@@ -794,26 +776,42 @@ request_password (GtkPrintBackend *backend,
   gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE, FALSE, 6);
 
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 6);
-  gtk_box_pack_start (GTK_BOX (vbox), username_box, FALSE, TRUE, 6);
-  gtk_box_pack_start (GTK_BOX (vbox), password_box, FALSE, TRUE, 6);
+  
+  /* Right - 2. */
+  for (i = 0; i < length; i++)
+    {
+      priv->auth_info[i] = g_strdup (ai_default[i]);
+      if (ai_display[i] != NULL)
+        {
+          box = gtk_hbox_new (TRUE, 0);
+
+          label = gtk_label_new (ai_display[i]);
+          gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 
-  gtk_box_pack_start (GTK_BOX (username_box), username_prompt, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (username_box), username_entry, TRUE, TRUE, 0);
+          entry = gtk_entry_new ();
+          focus = entry;
 
-  gtk_box_pack_start (GTK_BOX (password_box), password_prompt, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (password_box), password_entry, TRUE, TRUE, 0);
+          if (ai_default[i] != NULL)
+            gtk_entry_set_text (GTK_ENTRY (entry), ai_default[i]);
 
+          gtk_entry_set_visibility (GTK_ENTRY (entry), ai_visible[i]);
+          gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 
-  gtk_widget_grab_focus (password_entry);
+          gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 6);
 
-  priv->hostname = g_strdup (hostname);
-  priv->username = g_strdup (username);
+          gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+          gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
 
-  g_signal_connect (password_entry, "changed",
-                    G_CALLBACK (store_password), backend);
+          g_signal_connect (entry, "changed",
+                            G_CALLBACK (store_entry), &(priv->auth_info[i]));
+        }
+    }
 
-  g_signal_connect (username_entry, "changed",
-                    G_CALLBACK (store_username), backend);
+  if (focus != NULL)
+    {
+      gtk_widget_grab_focus (focus);
+      focus = NULL;
+    }
 
   g_object_ref (backend);
   g_signal_connect (G_OBJECT (dialog), "response",
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index 7d75f8e..c4b43b1 100644
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -121,15 +121,16 @@ struct _GtkPrintBackendClass
   void                  (*printer_status_changed)            (GtkPrintBackend     *backend,
 							      GtkPrinter          *printer);
   void                  (*request_password)                  (GtkPrintBackend     *backend,
-                                                              const gchar         *hostname,
-                                                              const gchar         *username,
+                                                              gpointer             auth_info_required,
+                                                              gpointer             auth_info_default,
+                                                              gpointer             auth_info_display,
+                                                              gpointer             auth_info_visible,
                                                               const gchar         *prompt);
 
   /* not a signal */
   void                  (*set_password)                      (GtkPrintBackend     *backend,
-                                                              const gchar         *hostname,
-                                                              const gchar         *username,
-                                                              const gchar         *password);
+                                                              gchar              **auth_info_required,
+                                                              gchar              **auth_info);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -153,9 +154,8 @@ void        gtk_print_backend_print_stream         (GtkPrintBackend         *pri
 GList *     gtk_print_backend_load_modules         (void);
 void        gtk_print_backend_destroy              (GtkPrintBackend         *print_backend);
 void        gtk_print_backend_set_password         (GtkPrintBackend         *backend, 
-                                                    const gchar             *hostname,
-                                                    const gchar             *username,
-                                                    const gchar             *password);
+                                                    gchar                  **auth_info_required,
+                                                    gchar                  **auth_info);
 
 /* Backend-only functions for GtkPrintBackend */
 
diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c
index bcd03dc..cd97f10 100644
--- a/modules/printbackends/cups/gtkcupsutils.c
+++ b/modules/printbackends/cups/gtkcupsutils.c
@@ -187,6 +187,10 @@ gtk_cups_request_new_with_username (http_t             *connection,
                                      "requesting-user-name",
                                      NULL, cupsUser ());
 
+  request->auth_info_required = NULL;
+  request->auth_info = NULL;
+  request->need_auth_info = FALSE;
+
   cupsLangFree (language);
 
   return request;
@@ -241,6 +245,7 @@ gtk_cups_request_free (GtkCupsRequest *request)
     }
 
   g_free (request->username);
+  g_strfreev (request->auth_info_required);
 
   gtk_cups_result_free (request->result);
 
diff --git a/modules/printbackends/cups/gtkcupsutils.h b/modules/printbackends/cups/gtkcupsutils.h
index 47fd106..ba43f87 100644
--- a/modules/printbackends/cups/gtkcupsutils.h
+++ b/modules/printbackends/cups/gtkcupsutils.h
@@ -99,6 +99,9 @@ struct _GtkCupsRequest
 
   gint own_http : 1;
   gint need_password : 1;
+  gint need_auth_info : 1;
+  gchar **auth_info_required;
+  gchar **auth_info;
   GtkCupsPasswordState password_state;
 };
 
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 92d4b9b..b715817 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -94,6 +94,8 @@ typedef struct
   GtkCupsRequest *request;
   GPollFD *data_poll;
   GtkPrintBackendCups *backend;
+  GtkPrintCupsResponseCallbackFunc callback;
+  gpointer                         callback_data;
 
 } GtkPrintCupsDispatchWatch;
 
@@ -179,13 +181,13 @@ static cairo_surface_t *    cups_printer_create_cairo_surface      (GtkPrinter
 								    gdouble                            height,
 								    GIOChannel                        *cache_io);
 
-static void                 gtk_print_backend_cups_set_password    (GtkPrintBackend *backend, 
-                                                                    const gchar     *hostname,
-                                                                    const gchar     *username,
-                                                                    const gchar     *password);
+static void                 gtk_print_backend_cups_set_password    (GtkPrintBackend                   *backend, 
+                                                                    gchar                            **auth_info_required,
+                                                                    gchar                            **auth_info);
 
-void                        overwrite_and_free                      (gpointer data);
-static gboolean             is_address_local                        (const gchar *address);
+void                        overwrite_and_free                      (gpointer                          data);
+static gboolean             is_address_local                        (const gchar                      *address);
+static gboolean             request_auth_info                       (gpointer                          data);
 
 static void
 gtk_print_backend_cups_register_type (GTypeModule *module)
@@ -557,6 +559,9 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
   ps->dnotify = dnotify;
   ps->job = g_object_ref (job);
 
+  request->need_auth_info = cups_printer->auth_info_required != NULL;
+  request->auth_info_required = g_strdupv (cups_printer->auth_info_required);
+
   cups_request_execute (GTK_PRINT_BACKEND_CUPS (print_backend),
                         request,
                         (GtkPrintCupsResponseCallbackFunc) cups_print_cb,
@@ -656,18 +661,38 @@ is_address_local (const gchar *address)
 }
 
 static void
-gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
-                                     const gchar     *hostname,
-                                     const gchar     *username, 
-                                     const gchar     *password)
+gtk_print_backend_cups_set_password (GtkPrintBackend  *backend,
+                                     gchar           **auth_info_required,
+                                     gchar           **auth_info)
 {
   GtkPrintBackendCups *cups_backend = GTK_PRINT_BACKEND_CUPS (backend);
   GList *l;
   char   dispatch_hostname[HTTP_MAX_URI];
   gchar *key;
+  gchar *username = NULL;
+  gchar *hostname = NULL;
+  gchar *password = NULL;
+  gint   length;
+  gint   i;
 
-  key = g_strconcat (username, "@", hostname, NULL);
-  g_hash_table_insert (cups_backend->auth, key, g_strdup (password));
+  length = g_strv_length (auth_info_required);
+
+  if (auth_info != NULL)
+    for (i = 0; i < length; i++)
+      {
+        if (g_strcmp0 (auth_info_required[i], "username") == 0)
+          username = g_strdup (auth_info[i]);
+        else if (g_strcmp0 (auth_info_required[i], "hostname") == 0)
+          hostname = g_strdup (auth_info[i]);
+        else if (g_strcmp0 (auth_info_required[i], "password") == 0)
+          password = g_strdup (auth_info[i]);
+      }
+
+  if (hostname != NULL && username != NULL && password != NULL)
+    {
+      key = g_strconcat (username, "@", hostname, NULL);
+      g_hash_table_insert (cups_backend->auth, key, g_strdup (password));
+    }
 
   g_free (cups_backend->username);
   cups_backend->username = g_strdup (username);
@@ -683,7 +708,18 @@ gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
       if (is_address_local (dispatch_hostname))
         strcpy (dispatch_hostname, "localhost");
 
-      if (strcmp (hostname, dispatch_hostname) == 0) 
+      if (dispatch->request->need_auth_info)
+        {
+          if (auth_info != NULL)
+            {
+              dispatch->request->auth_info = g_new0 (gchar *, length + 1);
+              for (i = 0; i < length; i++)
+                dispatch->request->auth_info[i] = g_strdup (auth_info[i]);
+            }
+          dispatch->backend->authentication_lock = FALSE;
+          dispatch->request->need_auth_info = FALSE;
+        }
+      else if (dispatch->request->password_state == GTK_CUPS_PASSWORD_REQUESTED || auth_info == NULL)
         {
           overwrite_and_free (dispatch->request->password);
           dispatch->request->password = g_strdup (password);
@@ -704,6 +740,12 @@ request_password (gpointer data)
   gchar                     *prompt = NULL;
   gchar                     *key = NULL;
   char                       hostname[HTTP_MAX_URI];
+  gchar                    **auth_info_required;
+  gchar                    **auth_info_default;
+  gchar                    **auth_info_display;
+  gboolean                  *auth_info_visible;
+  gint                       length = 3;
+  gint                       i;
 
   if (dispatch->backend->authentication_lock)
     return FALSE;
@@ -717,6 +759,22 @@ request_password (gpointer data)
   else
     username = cupsUser ();
 
+  auth_info_required = g_new0 (gchar*, length + 1);
+  auth_info_required[0] = g_strdup ("hostname");
+  auth_info_required[1] = g_strdup ("username");
+  auth_info_required[2] = g_strdup ("password");
+
+  auth_info_default = g_new0 (gchar*, length + 1);
+  auth_info_default[0] = g_strdup (hostname);
+  auth_info_default[1] = g_strdup (username);
+
+  auth_info_display = g_new0 (gchar*, length + 1);
+  auth_info_display[1] = g_strdup (_("Username:"));
+  auth_info_display[2] = g_strdup (_("Password:"));
+
+  auth_info_visible = g_new0 (gboolean, length + 1);
+  auth_info_visible[1] = TRUE;
+
   key = g_strconcat (username, "@", hostname, NULL);
   password = g_hash_table_lookup (dispatch->backend->auth, key);
 
@@ -784,11 +842,22 @@ request_password (gpointer data)
       g_free (printer_name);
 
       g_signal_emit_by_name (dispatch->backend, "request-password", 
-                             hostname, username, prompt);
+                             auth_info_required, auth_info_default, auth_info_display, auth_info_visible, prompt);
 
       g_free (prompt);
     }
 
+  for (i = 0; i < length; i++)
+    {
+      g_free (auth_info_required[i]);
+      g_free (auth_info_default[i]);
+      g_free (auth_info_display[i]);
+    }
+
+  g_free (auth_info_required);
+  g_free (auth_info_default);
+  g_free (auth_info_display);
+  g_free (auth_info_visible);
   g_free (key);
 
   return FALSE;
@@ -828,6 +897,133 @@ cups_dispatch_add_poll (GSource *source)
 }
 
 static gboolean
+check_auth_info (gpointer user_data)
+{
+  GtkPrintCupsDispatchWatch *dispatch;
+  dispatch = (GtkPrintCupsDispatchWatch *) user_data;
+
+  if (!dispatch->request->need_auth_info)
+    {
+      if (dispatch->request->auth_info == NULL)
+        {
+          dispatch->callback (GTK_PRINT_BACKEND (dispatch->backend),
+                              gtk_cups_request_get_result (dispatch->request),
+                              dispatch->callback_data);
+          g_source_destroy ((GSource *) dispatch);
+        }
+      else
+        {
+          gint length;
+          gint i;
+
+          length = g_strv_length (dispatch->request->auth_info_required);
+
+          gtk_cups_request_ipp_add_strings (dispatch->request,
+                                            IPP_TAG_JOB,
+                                            IPP_TAG_TEXT,
+                                            "auth-info",
+                                            length,
+                                            NULL,
+                                            dispatch->request->auth_info);
+
+          g_source_attach ((GSource *) dispatch, NULL);
+          g_source_unref ((GSource *) dispatch);
+
+          for (i = 0; i < length; i++)
+            overwrite_and_free (dispatch->request->auth_info[i]);
+          g_free (dispatch->request->auth_info);
+          dispatch->request->auth_info = NULL;
+        }
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+request_auth_info (gpointer user_data)
+{
+  GtkPrintCupsDispatchWatch  *dispatch;
+  const char                 *job_title;
+  const char                 *printer_uri;
+  gchar                      *prompt = NULL;
+  char                       *printer_name = NULL;
+  gint                        length;
+  gint                        i;
+  gboolean                   *auth_info_visible = NULL;
+  gchar                     **auth_info_default = NULL;
+  gchar                     **auth_info_display = NULL;
+
+  dispatch = (GtkPrintCupsDispatchWatch *) user_data;
+
+  if (dispatch->backend->authentication_lock)
+    return FALSE;
+
+  job_title = gtk_cups_request_ipp_get_string (dispatch->request, IPP_TAG_NAME, "job-name");
+  printer_uri = gtk_cups_request_ipp_get_string (dispatch->request, IPP_TAG_URI, "printer-uri");
+  length = g_strv_length (dispatch->request->auth_info_required);
+
+  auth_info_visible = g_new0 (gboolean, length);
+  auth_info_default = g_new0 (gchar *, length + 1);
+  auth_info_display = g_new0 (gchar *, length + 1);
+
+  for (i = 0; i < length; i++)
+    {
+      if (g_strcmp0 (dispatch->request->auth_info_required[i], "domain") == 0)
+        {
+          auth_info_display[i] = g_strdup (_("Domain:"));
+          auth_info_default[i] = g_strdup ("WORKGROUP");
+          auth_info_visible[i] = TRUE;
+        }
+      else if (g_strcmp0 (dispatch->request->auth_info_required[i], "username") == 0)
+        {
+          auth_info_display[i] = g_strdup (_("Username:"));
+          if (dispatch->backend->username != NULL)
+            auth_info_default[i] = g_strdup (dispatch->backend->username);
+          else
+            auth_info_default[i] = g_strdup (cupsUser ());
+          auth_info_visible[i] = TRUE;
+        }
+      else if (g_strcmp0 (dispatch->request->auth_info_required[i], "password") == 0)
+        {
+          auth_info_display[i] = g_strdup (_("Password:"));
+          auth_info_visible[i] = FALSE;
+        }
+    }
+
+  if (printer_uri != NULL && strrchr (printer_uri, '/') != NULL)
+    printer_name = g_strdup (strrchr (printer_uri, '/') + 1);
+
+  dispatch->backend->authentication_lock = TRUE;
+
+  if (job_title != NULL && printer_name != NULL)
+    prompt = g_strdup_printf ( _("Authentication informations are required to print document '%s' on printer %s"), job_title, printer_name);
+
+  g_signal_emit_by_name (dispatch->backend, "request-password",
+                         dispatch->request->auth_info_required,
+                         auth_info_default,
+                         auth_info_display,
+                         auth_info_visible,
+                         prompt);
+
+  for (i = 0; i < length; i++)
+    {
+      g_free (auth_info_default[i]);
+      g_free (auth_info_display[i]);
+    }
+
+  g_free (auth_info_default);
+  g_free (auth_info_display);
+  g_free (printer_name);
+  g_free (prompt);
+
+  g_idle_add (check_auth_info, user_data);
+
+  return FALSE;
+}
+
+static gboolean
 cups_dispatch_watch_check (GSource *source)
 {
   GtkPrintCupsDispatchWatch *dispatch;
@@ -1008,13 +1204,24 @@ cups_request_execute (GtkPrintBackendCups              *print_backend,
   dispatch->request = request;
   dispatch->backend = g_object_ref (print_backend);
   dispatch->data_poll = NULL;
+  dispatch->callback = NULL;
+  dispatch->callback_data = NULL;
 
   print_backend->requests = g_list_prepend (print_backend->requests, dispatch);
 
   g_source_set_callback ((GSource *) dispatch, (GSourceFunc) callback, user_data, notify);
 
-  g_source_attach ((GSource *) dispatch, NULL);
-  g_source_unref ((GSource *) dispatch);
+  if (request->need_auth_info)
+    {
+      dispatch->callback = callback;
+      dispatch->callback_data = user_data;
+      request_auth_info (dispatch);
+    }
+  else
+    {
+      g_source_attach ((GSource *) dispatch, NULL);
+      g_source_unref ((GSource *) dispatch);
+    }
 }
 
 #if 0
@@ -1435,6 +1642,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
       gchar   *default_cover_before = NULL;
       gchar   *default_cover_after = NULL;
       gboolean remote_printer = FALSE;
+      gchar  **auth_info_required = NULL;
       
       /* Skip leading attributes until we hit a printer...
        */
@@ -1553,6 +1761,15 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
             else
               remote_printer = FALSE;
           }
+        else if (strcmp (attr->name, "auth-info-required") == 0)
+          {
+            if (strcmp (attr->values[0].string.text, "none") != 0)
+              {
+                auth_info_required = g_new0 (gchar *, attr->num_values + 1);
+                for (i = 0; i < attr->num_values; i++)
+                  auth_info_required[i] = g_strdup (attr->values[i].string.text);
+              }
+          }
         else
 	  {
 	    GTK_NOTE (PRINTING,
@@ -1674,6 +1891,9 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
 	  cups_printer->hostname = g_strdup (hostname);
 	  cups_printer->port = port;
 	  
+          cups_printer->auth_info_required = g_strdupv (auth_info_required);
+          g_strfreev (auth_info_required);
+
 	  printer = GTK_PRINTER (cups_printer);
 	  
 	  if (cups_backend->default_printer != NULL &&
@@ -1866,7 +2086,8 @@ cups_request_printer_list (GtkPrintBackendCups *cups_backend)
       "printer-is-accepting-jobs",
       "job-sheets-supported",
       "job-sheets-default",
-      "printer-type"
+      "printer-type",
+      "auth-info-required"
     };
 
   if (cups_backend->list_printers_pending)
diff --git a/modules/printbackends/cups/gtkprintercups.c b/modules/printbackends/cups/gtkprintercups.c
index cd27b17..efdb0e5 100644
--- a/modules/printbackends/cups/gtkprintercups.c
+++ b/modules/printbackends/cups/gtkprintercups.c
@@ -77,6 +77,7 @@ gtk_printer_cups_init (GtkPrinterCups *printer)
   printer->ppd_file = NULL;
   printer->default_cover_before = NULL;
   printer->default_cover_after = NULL;
+  printer->auth_info_required = NULL;
 }
 
 static void
@@ -94,6 +95,7 @@ gtk_printer_cups_finalize (GObject *object)
   g_free (printer->ppd_name);
   g_free (printer->default_cover_before);
   g_free (printer->default_cover_after);
+  g_strfreev (printer->auth_info_required);
 
   if (printer->ppd_file)
     ppdClose (printer->ppd_file);
diff --git a/modules/printbackends/cups/gtkprintercups.h b/modules/printbackends/cups/gtkprintercups.h
index cd2b318..7a869a0 100644
--- a/modules/printbackends/cups/gtkprintercups.h
+++ b/modules/printbackends/cups/gtkprintercups.h
@@ -47,6 +47,7 @@ struct _GtkPrinterCups
   gchar *printer_uri;
   gchar *hostname;
   gint port;
+  gchar **auth_info_required;
 
   ipp_pstate_t state;
   gboolean reading_ppd;
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	5 Sep 2009 04:54:06 -0000	1.116
+++ .cvsignore	23 Sep 2009 05:33:38 -0000	1.117
@@ -1 +1 @@
-gtk+-2.17.11.tar.bz2
+gtk+-2.18.0.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- gtk2.spec	14 Sep 2009 03:23:59 -0000	1.404
+++ gtk2.spec	23 Sep 2009 05:33:38 -0000	1.405
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.11
+%define base_version 2.18.0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -20,7 +20,7 @@ Version: %{base_version}
 Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
 Source1: update-gdk-pixbuf-loaders
 Source2: update-gtk-immodules
 Source3: im-cedilla.conf
@@ -28,10 +28,10 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 
-# from upstream
-Patch1: gtk2-fix-install.patch
-Patch2: root-event-mask.patch
-Patch3: gtk-bell.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=566522
+Patch1: gtk2-printing-smb-auth.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=586207
+Patch2: gtk2-printing-nonblocking-printer-list.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -143,9 +143,8 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .fix-install
-%patch2 -p1 -b .root-event-mask
-%patch3 -p1 -b .bell
+%patch1 -p1 -b .printing-smb-auth
+%patch2 -p1 -b .printing-nonblocking-printer-list
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -387,6 +386,10 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
+- Update to 2.18.0
+- Add some patches for improved printing support
+
 * Sun Sep 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.11-3
 - Fix the bell
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- sources	5 Sep 2009 04:54:07 -0000	1.125
+++ sources	23 Sep 2009 05:33:38 -0000	1.126
@@ -1 +1 @@
-46b3b78d9140b40efe8efaa8c477d1cd  gtk+-2.17.11.tar.bz2
+bb7ef5463a74a80454ced2c1d47a0192  gtk+-2.18.0.tar.bz2



From oget at fedoraproject.org  Wed Sep 23 05:34:50 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 05:34:50 +0000 (UTC)
Subject: rpms/phasex/devel .cvsignore, 1.2, 1.3 phasex.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <20090923053450.ED5BA11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/phasex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2470

Modified Files:
	.cvsignore phasex.spec sources 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.12.0-0.1.beta4
- Fix optflags (RHBZ#499914)
- Update to 0.12.0beta4 (fixes segfault)
- Update desktop file according to F-12 FedoraStudio feature
- Update scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phasex/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Oct 2007 17:49:01 -0000	1.2
+++ .cvsignore	23 Sep 2009 05:34:50 -0000	1.3
@@ -1 +1 @@
-phasex-0.11.1.tar.gz
+phasex-0.12.0beta4.tar.gz


Index: phasex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phasex/devel/phasex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- phasex.spec	26 Jul 2009 17:55:18 -0000	1.6
+++ phasex.spec	23 Sep 2009 05:34:50 -0000	1.7
@@ -1,20 +1,22 @@
-%define  desktop_vendor fedora
+%global  desktop_vendor fedora
+%global prerel beta4
 
 Name:  phasex
-Version: 0.11.1
-Release: 8%{?dist}
+Version: 0.12.0
+Release: 0.1.beta4%{?dist}
 Summary: PHASEX -- Phase Harmonic Advanced Synthesis EXperiment
 Group:  Applications/Multimedia
 License: GPLv2
 URL:  http://sysex.net/phasex/
 
-Source0: http://sysex.net/phasex/%{name}-%{version}.tar.gz
-Patch0: %{name}-0.11.1-cflags.patch
+Source0: http://sysex.net/phasex/%{name}-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3.0
 BuildRequires: alsa-lib-devel >= 0.9.0
 BuildRequires: jack-audio-connection-kit-devel >= 0.99.0
+BuildRequires: libICE-devel
+BuildRequires: libsamplerate-devel >= 0.1.2
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: perl
 BuildRequires: desktop-file-utils
@@ -34,10 +36,17 @@ processing capabilities, and more.
 
 %prep
 %setup -q
-%patch0 -p1
+
+# Fix optflags
+sed -i -e 's|-O3.*"|%{optflags}"|' -e 's|-mtune=generic||' configure
+
 
 %build
-%configure --disable-dependency-tracking
+%configure \
+%ifarch %ix86 x86_64
+    --enable-arch=%{_target_cpu}
+%endif
+
 make %{?_smp_mflags}
 
 %install
@@ -51,7 +60,7 @@ for s in 16 22 32 48 ; do
 done
 
 BASE="AudioVideo Audio"
-XTRA="X-MIDI X-Digital_Processing X-Jack"
+XTRA="X-MIDI X-Digital_Processing X-Jack X-Synthesis Midi"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor} \
@@ -62,17 +71,17 @@ desktop-file-install --vendor %{desktop_
 rm $RPM_BUILD_ROOT%{_datadir}/phasex/phasex.desktop
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/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
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -85,15 +94,24 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/phasex/pixmaps
 %dir %{_datadir}/phasex/sys-midimaps
 %dir %{_datadir}/phasex/sys-patches
+%dir %{_datadir}/phasex/sys-samples
 %{_datadir}/phasex/patchbank
 %{_datadir}/phasex/help/*
 %{_datadir}/phasex/pixmaps/*
 %{_datadir}/phasex/sys-midimaps/*
 %{_datadir}/phasex/sys-patches/*
+%{_datadir}/phasex/sys-samples/*
+%{_datadir}/themes/*
 %{_datadir}/applications/%{desktop_vendor}-phasex.desktop
 %{_datadir}/icons/hicolor/*/apps/phasex-icon.png
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.12.0-0.1.beta4
+- Fix optflags (RHBZ#499914)
+- Update to 0.12.0beta4 (fixes segfault)
+- Update desktop file according to F-12 FedoraStudio feature
+- Update scriptlets
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phasex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Oct 2007 17:49:01 -0000	1.2
+++ sources	23 Sep 2009 05:34:50 -0000	1.3
@@ -1 +1 @@
-27109ee65fe21bac1530518b436aa8b3  phasex-0.11.1.tar.gz
+e412fa8ce8f310968e40afffde9e2335  phasex-0.12.0beta4.tar.gz



From oget at fedoraproject.org  Wed Sep 23 05:43:46 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 05:43:46 +0000 (UTC)
Subject: rpms/audacity/devel audacity.desktop, 1.4, 1.5 audacity.spec, 1.85,
	1.86
Message-ID: <20090923054346.0744A11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4958

Modified Files:
	audacity.desktop audacity.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.9-0.4.beta
- Update desktop file according to F-12 FedoraStudio feature



Index: audacity.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- audacity.desktop	15 May 2008 20:44:14 -0000	1.4
+++ audacity.desktop	23 Sep 2009 05:43:44 -0000	1.5
@@ -7,5 +7,5 @@ Icon=audacity
 Terminal=false
 Comment=A multitrack audio editor
 MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
-Categories=AudioVideo;GNOME;
+Categories=AudioVideo;GNOME;Sequencer;X-Jack;AudioVideoEditing;
 StartupWMClass=Audacity


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- audacity.spec	14 Sep 2009 07:11:55 -0000	1.85
+++ audacity.spec	23 Sep 2009 05:43:44 -0000	1.86
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.9
-Release: 0.3.beta%{?dist}
+Release: 0.4.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -150,6 +150,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.9-0.4.beta
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
 - add patch to fix LabelTrack popup
 



From rakesh at fedoraproject.org  Wed Sep 23 06:08:30 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Wed, 23 Sep 2009 06:08:30 +0000 (UTC)
Subject: rpms/octave/devel import.log,1.4,1.5 octave.spec,1.91,1.92
Message-ID: <20090923060830.BEEC411C00E6@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14928/devel

Modified Files:
	import.log octave.spec 
Log Message:
Added categories to desktop file: Education, DataVisualization, NumericalAnalysis.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	31 Jul 2009 08:01:59 -0000	1.4
+++ import.log	23 Sep 2009 06:08:23 -0000	1.5
@@ -2,3 +2,4 @@ octave-3_0_2-2_fc10:HEAD:octave-3.0.2-2.
 octave-3_0_5-1_fc11:HEAD:octave-3.0.5-1.fc11.src.rpm:1239552316
 octave-3_2_0-1_fc11:HEAD:octave-3.2.0-1.fc11.src.rpm:1247313567
 octave-3_2_2-1_fc11:HEAD:octave-3.2.2-1.fc11.src.rpm:1249027014
+octave-3_2_2-5_fc12:HEAD:octave-3.2.2-5.fc12.src.rpm:1253686658


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- octave.spec	7 Sep 2009 21:41:16 -0000	1.91
+++ octave.spec	23 Sep 2009 06:08:23 -0000	1.92
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        3.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -103,8 +103,9 @@ popd
 
 # Create desktop file
 rm %{buildroot}%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --vendor fedora --remove-category Development \
-        --dir %{buildroot}%{_datadir}/applications examples/octave.desktop
+desktop-file-install --vendor fedora --remove-category Development --add-category "Education" \
+  --add-category "DataVisualization" --add-category "NumericalAnalysis" --add-category "Engineering" --add-category "Physics" \
+  --dir %{buildroot}%{_datadir}/applications examples/octave.desktop
 
 # Create directories for add-on packages
 HOST_TYPE=`%{buildroot}%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
@@ -170,6 +171,9 @@ fi
 
 
 %changelog
+* Tue Sep 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 6:3.2.2-5
+- Added categories to desktop file: Education, DataVisualization, NumericalAnalysis 
+
 * Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-4
 - Rebuild against new ATLAS
 



From whot at fedoraproject.org  Wed Sep 23 06:08:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 23 Sep 2009 06:08:46 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.3-coreevents.patch, NONE,
	1.1 xorg-x11-server.spec, 1.460, 1.461
Message-ID: <20090923060846.13B0C11C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15275

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.3-coreevents.patch 
Log Message:
* Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.2
- xserver-1.6.3-coreevents.patch: dont send events for devices with
  SendCoreEvents off.


xserver-1.6.3-coreevents.patch:
 dix/getevents.c |    4 ++--
 mi/mieq.c       |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE xserver-1.6.3-coreevents.patch ---
>From 764159be06c8c812d07e07917031b927a9f99f31 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 16 Sep 2009 15:46:55 +1000
Subject: [PATCH] Don't send events through the master if the device has SendCoreEvents off.

In server 1.6, all devices are attached to the master device (VCP or VCK).
Sending an event through the master device means the device is sending core
events. If a device is configured as SendCoreEvents, just send through the
device, not through the master.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/getevents.c |    4 ++--
 mi/mieq.c       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 9747b35..eadcbeb 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -536,7 +536,7 @@ static EventListPtr
 updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events)
 {
     DeviceIntPtr master = dev->u.master;
-    if (master && master->u.lastSlave != dev)
+    if (master && master->u.lastSlave != dev && dev->coreEvents)
     {
         updateSlaveDeviceCoords(master, dev);
         master->u.lastSlave = dev;
@@ -674,7 +674,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y,
      * to the current screen. */
     miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]);
 
-    if (dev->u.master) {
+    if (dev->u.master && dev->coreEvents) {
         dev->u.master->last.valuators[0] = dev->last.valuators[0];
         dev->u.master->last.valuators[1] = dev->last.valuators[1];
     }
diff --git a/mi/mieq.c b/mi/mieq.c
index 213ad5b..478e68b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -446,7 +446,7 @@ mieqProcessInputEvents(void)
             NewCurrentScreen (dev, DequeueScreen(dev), x, y);
         }
         else {
-            if (master) {
+            if (master && dev->coreEvents) {
                 /* Force a copy of the key class into the VCK so that the layout
                    is transferred. */
                 if (event->u.u.type == DeviceKeyPress ||
@@ -473,7 +473,7 @@ mieqProcessInputEvents(void)
                 /* process slave first, then master */
                 dev->public.processInputProc(event, dev, nevents);
 
-                if (master)
+                if (master && dev->coreEvents)
                     master->public.processInputProc(masterEvents->event, master,
                                                     nevents);
             }
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- xorg-x11-server.spec	9 Sep 2009 15:18:29 -0000	1.460
+++ xorg-x11-server.spec	23 Sep 2009 06:08:45 -0000	1.461
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.4
-Release:   0.1%{?dist}
+Release:   0.2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -112,6 +112,9 @@ Patch6047: xserver-1.6.2-vboxvideo.patch
 # 501601, part 2, upstream.
 Patch6049: xserver-1.6.99-dpms.patch
 
+# Nominated for 1.6.4
+Patch6050: xserver-1.6.3-coreevents.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -532,6 +535,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.2
+- xserver-1.6.3-coreevents.patch: dont send events for devices with
+  SendCoreEvents off.
+
 * Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 1.6.4-0.1
 - 1.6.4 snapshot
 



From oget at fedoraproject.org  Wed Sep 23 06:10:24 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 06:10:24 +0000 (UTC)
Subject: rpms/denemo/devel denemo.spec,1.11,1.12
Message-ID: <20090923061024.B81F911C0423@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16075

Modified Files:
	denemo.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.4-3
- Update desktop file according to F-12 FedoraStudio feature



Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- denemo.spec	24 Jul 2009 20:09:21 -0000	1.11
+++ denemo.spec	23 Sep 2009 06:10:24 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Graphical music notation program
 Name: denemo
 Version: 0.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://download.savannah.gnu.org/releases/denemo/%{name}-%{version}.tar.gz
@@ -59,6 +59,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 desktop-file-install --vendor=""\
 	--dir=%{buildroot}/%{_datadir}/applications\
+	--add-category=X-Notation\
 	%{buildroot}/%{_datadir}/applications/denemo.desktop
 %find_lang %{name}
 install -m 0755 -d %{buildroot}%{_fontdir}
@@ -97,6 +98,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.4-3
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 06:18:52 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 06:18:52 +0000 (UTC)
Subject: rpms/vkeybd/devel vkeybd.desktop,1.1,1.2 vkeybd.spec,1.10,1.11
Message-ID: <20090923061852.4352111C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/vkeybd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18340

Modified Files:
	vkeybd.desktop vkeybd.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1.17a-11
- Update desktop file according to F-12 FedoraStudio feature



Index: vkeybd.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/vkeybd/devel/vkeybd.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vkeybd.desktop	21 Oct 2006 17:05:04 -0000	1.1
+++ vkeybd.desktop	23 Sep 2009 06:18:51 -0000	1.2
@@ -6,5 +6,5 @@ Exec=vkeybd
 Terminal=false
 StartupWMClass=vkeybd.tcl
 Type=Application
-Categories=Application;AudioVideo;
+Categories=Application;AudioVideo;Midi;
 Encoding=UTF-8


Index: vkeybd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vkeybd/devel/vkeybd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- vkeybd.spec	27 Jul 2009 06:56:02 -0000	1.10
+++ vkeybd.spec	23 Sep 2009 06:18:51 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:      Virtual MIDI keyboard
 Name:         vkeybd
 Version:      0.1.17a
-Release:      10%{?dist}
+Release:      11%{?dist}
 License:      GPLv2+
 Group:        Applications/Multimedia
 URL:          http://www.alsa-project.org/~iwai/alsa.html
@@ -79,6 +79,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/64x64/apps/vkeybd.png
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1.17a-11
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.17a-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Wed Sep 23 06:22:21 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 23 Sep 2009 06:22:21 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.33,1.34
Message-ID: <20090923062221.C721811C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19587

Modified Files:
	sunbird.spec 
Log Message:
Rebuild


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sunbird.spec	22 Sep 2009 20:06:38 -0000	1.33
+++ sunbird.spec	23 Sep 2009 06:22:21 -0000	1.34
@@ -114,8 +114,6 @@ find . -name '*.cpp' -o -name '*.h' |xar
 
 
 %build
-cd %{tarballdir}
-
 cat >.mozconfig <<EOF
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug



From oget at fedoraproject.org  Wed Sep 23 06:27:14 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 06:27:14 +0000 (UTC)
Subject: rpms/nted/devel nted.desktop,1.1,1.2 nted.spec,1.19,1.20
Message-ID: <20090923062714.8654C11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21537

Modified Files:
	nted.desktop nted.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6.2-2
- Update desktop file according to F-12 FedoraStudio feature



Index: nted.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nted.desktop	8 Sep 2008 07:23:00 -0000	1.1
+++ nted.desktop	23 Sep 2009 06:27:13 -0000	1.2
@@ -14,5 +14,5 @@ Icon=nted
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Audio;AudioVideo;Midi;Music;Publishing
+Categories=Audio;AudioVideo;Midi;Music;Publishing;X-Notation;
 


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nted.spec	27 Jul 2009 11:51:48 -0000	1.19
+++ nted.spec	23 Sep 2009 06:27:13 -0000	1.20
@@ -15,7 +15,7 @@
 
 Name:           nted
 Version:        1.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6.2-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Jul 27 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.6.2-1
 - update to bugfix release 1.6.2
 



From pkgdb at fedoraproject.org  Wed Sep 23 06:27:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:27:18 +0000
Subject: [pkgdb] sblim-sfcc ownership updated
Message-ID: <20090923062718.C51C310F876@bastion2.fedora.phx.redhat.com>

Package sblim-sfcc in Fedora 8 was orphaned by srini

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Wed Sep 23 06:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:27:55 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062755.EF74A10F87C@bastion2.fedora.phx.redhat.com>

srini has set the watchbugzilla acl on openwsman (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:27:59 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062759.46E1810F884@bastion2.fedora.phx.redhat.com>

srini has set the watchcommits acl on openwsman (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:18 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062818.53B5E10F897@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora 8) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:13 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062813.8577810F889@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:20 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062820.ED8F610F880@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora 9) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:24 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062824.5DBFE10F89A@bastion2.fedora.phx.redhat.com>

srini has set the watchbugzilla acl on openwsman (Fedora devel) to Obsolete for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:26 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062826.834D610F89C@bastion2.fedora.phx.redhat.com>

srini has set the watchcommits acl on openwsman (Fedora devel) to Obsolete for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:38 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062838.8F21410F89D@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora EPEL 4) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:41 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062841.6A7F210F89F@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora EPEL 5) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:44 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062844.87C8210F898@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:28:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:28:49 +0000
Subject: [pkgdb] openwsman had acl change status
Message-ID: <20090923062849.99C5A10F8A2@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on openwsman (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Wed Sep 23 06:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:29:01 +0000
Subject: [pkgdb] sblim-sfcc had acl change status
Message-ID: <20090923062901.A581010F88A@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on sblim-sfcc (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From pkgdb at fedoraproject.org  Wed Sep 23 06:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 06:29:03 +0000
Subject: [pkgdb] sblim-sfcc had acl change status
Message-ID: <20090923062904.72FDA10F890@bastion2.fedora.phx.redhat.com>

srini has set the commit acl on sblim-sfcc (Fedora 9) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-sfcc



From oget at fedoraproject.org  Wed Sep 23 06:39:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 06:39:42 +0000 (UTC)
Subject: rpms/sonic-visualiser/devel sonic-visualiser.desktop, 1.2,
	1.3 sonic-visualiser.spec, 1.17, 1.18
Message-ID: <20090923063942.7D8D911C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/sonic-visualiser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26767

Modified Files:
	sonic-visualiser.desktop sonic-visualiser.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6-4
- Update desktop file according to F-12 FedoraStudio feature



Index: sonic-visualiser.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sonic-visualiser.desktop	13 Sep 2009 15:56:29 -0000	1.2
+++ sonic-visualiser.desktop	23 Sep 2009 06:39:28 -0000	1.3
@@ -2,7 +2,7 @@
 Name=Sonic Visualiser
 GenericName=Audio visualization tool
 Comment=Audio visualization tool
-Categories=AudioVideo;Viewer;Player;
+Categories=AudioVideo;Viewer;Player;X-DigitalProcessing;
 Encoding=UTF-8
 Exec=sonic-visualiser %U
 Icon=sonic-visualiser


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sonic-visualiser.spec	13 Sep 2009 15:56:29 -0000	1.17
+++ sonic-visualiser.spec	23 Sep 2009 06:39:31 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           sonic-visualiser
 Version:        1.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
@@ -91,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
 - No longer conflict with RPM Fusion packaging
 - Updated icon cache scriptlet



From oget at fedoraproject.org  Wed Sep 23 06:44:18 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 06:44:18 +0000 (UTC)
Subject: rpms/sweep/devel sweep.spec,1.10,1.11
Message-ID: <20090923064418.8A35F11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/sweep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28948

Modified Files:
	sweep.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.3-6
- Update desktop file according to F-12 FedoraStudio feature



Index: sweep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sweep/devel/sweep.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sweep.spec	27 Jul 2009 05:12:22 -0000	1.10
+++ sweep.spec	23 Sep 2009 06:44:16 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           sweep
 Version:        0.9.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An audio editor and live playback tool
 
 Group:          Applications/Multimedia
@@ -82,6 +82,7 @@ desktop-file-install \
         --vendor fedora \
         --add-category Application \
         --add-category AudioVideo \
+        --add-category AudioVideoEditing \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         sweep.desktop
 
@@ -121,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.3-6
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 06:49:08 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 06:49:08 +0000 (UTC)
Subject: rpms/asunder/devel asunder.spec,1.9,1.10
Message-ID: <20090923064908.26B0311C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/asunder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30651

Modified Files:
	asunder.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.9-2
- Update desktop file according to F-12 FedoraStudio feature



Index: asunder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/asunder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- asunder.spec	18 Sep 2009 20:30:34 -0000	1.9
+++ asunder.spec	23 Sep 2009 06:49:06 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		asunder
 Summary:	A graphical Audio CD ripper and encoder
 Version:	1.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Group:		Applications/File
 URL:		http://littlesvr.ca/asunder
@@ -51,6 +51,7 @@ make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
+	--add-category X-AudioVideoImport \
 	--delete-original \
 	%{buildroot}%{_datadir}/applications/asunder.desktop
 
@@ -67,6 +68,9 @@ rm -fr %{buildroot}
 #%{_mandir}/man1/asunder.1*
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.9-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Sep 18 2009 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.9-1
 - updated to 1.9
 - added new additional runtime dependencies (Monkey's Audio)



From oget at fedoraproject.org  Wed Sep 23 07:19:05 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 07:19:05 +0000 (UTC)
Subject: rpms/cdrdao/devel cdrdao-1.2.2-desktop.patch, 1.1, 1.2 cdrdao.spec, 
	1.47, 1.48
Message-ID: <20090923071906.3DEB811C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/cdrdao/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9101

Modified Files:
	cdrdao-1.2.2-desktop.patch cdrdao.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.3-0.rc2.4
- Update desktop file according to F-12 FedoraStudio feature


cdrdao-1.2.2-desktop.patch:
 gcdmaster.desktop |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: cdrdao-1.2.2-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/cdrdao-1.2.2-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cdrdao-1.2.2-desktop.patch	7 Apr 2009 07:36:18 -0000	1.1
+++ cdrdao-1.2.2-desktop.patch	23 Sep 2009 07:19:03 -0000	1.2
@@ -12,5 +12,5 @@
  Type=Application
  StartupNotify=true
 -Categories=GNOME;AudioVideo;Application;X-Fedora;
-+Categories=GNOME;AudioVideo;X-Fedora;
++Categories=GNOME;AudioVideo;X-Fedora;DiscBurning;
 +MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;


Index: cdrdao.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- cdrdao.spec	24 Jul 2009 18:45:37 -0000	1.47
+++ cdrdao.spec	23 Sep 2009 07:19:04 -0000	1.48
@@ -3,7 +3,7 @@
 Summary:   Writes audio CD-Rs in disk-at-once (DAO) mode
 Name:      cdrdao
 Version:   1.2.3
-Release:   0.%{rcversion}.3
+Release:   0.%{rcversion}.4
 License:   GPLv2
 Group:     Applications/Multimedia
 URL:       http://cdrdao.sourceforge.net/
@@ -136,6 +136,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.3-0.rc2.4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-0.rc2.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 07:23:20 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 07:23:20 +0000 (UTC)
Subject: rpms/audex/devel audex.spec,1.5,1.6
Message-ID: <20090923072320.BA4D111C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/audex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10231

Modified Files:
	audex.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.71-0.5.beta5
- Update desktop file according to F-12 FedoraStudio feature



Index: audex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audex/devel/audex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- audex.spec	24 Jul 2009 17:32:28 -0000	1.5
+++ audex.spec	23 Sep 2009 07:23:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           audex
 Version:        0.71
-Release:        0.4.beta5%{?dist}
+Release:        0.5.beta5%{?dist}
 Summary:        Audio ripper
 Group:          Applications/Multimedia
 License:        GPLv3+
@@ -34,8 +34,10 @@ make install/fast DESTDIR=%{buildroot} -
 
 %find_lang %{name}
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/audex.desktop
+desktop-file-install \
+    --dir %{buildroot}%{_datadir}/applications/kde4 \
+    --add-category X-AudioVideoImport \
+    %{buildroot}%{_datadir}/applications/kde4/audex.desktop
 
 %post
 update-desktop-database &> /dev/null || :
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/kde4/apps/audex
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.71-0.5.beta5
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71-0.4.beta5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From denis at fedoraproject.org  Wed Sep 23 07:34:20 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 23 Sep 2009 07:34:20 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon-1.3.2-home.patch, NONE,
	1.1 galeon-2.0.7-fix-str-fmt.patch, NONE,
	1.1 galeon-2.0.7-jsconsole.patch, NONE, 1.1 galeon.spec, 1.66, 1.67
Message-ID: <20090923073420.1004F11C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233

Modified Files:
	galeon.spec 
Added Files:
	galeon-1.3.2-home.patch galeon-2.0.7-fix-str-fmt.patch 
	galeon-2.0.7-jsconsole.patch 
Log Message:
- Added jsconsole patch
- Changed default home location, Mandriva patch
- Disable plugins wrap patch, causing spurious crashes
- Made gecko libs Rs and BRs exact (#515640)


galeon-1.3.2-home.patch:
 galeon.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE galeon-1.3.2-home.patch ---
--- galeon-1.3.2/galeon.schemas.in.home	2003-02-14 20:10:57.000000000 +0100
+++ galeon-1.3.2/galeon.schemas.in	2003-02-17 09:46:20.000000000 +0100
@@ -5,7 +5,7 @@
         <applyto>/apps/galeon/Browsing/General/startpage</applyto>
         <owner>galeon</owner>
         <type>string</type>
-        <default>myportal:</default>
+        <default>file:///usr/share/doc/HTML/index.html</default>
         <locale name="C">
         <short>Home page</short>
         <long>URL for the user's home page.  Displayed when Galeon starts up

galeon-2.0.7-fix-str-fmt.patch:
 libegg/egg-recent-model.c                |    2 +-
 mozilla/GtkNSSSecurityWarningDialogs.cpp |    4 ++--
 utils/gul-download.c                     |    4 ++--
 utils/gul-gui.c                          |    1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE galeon-2.0.7-fix-str-fmt.patch ---
--- ./libegg/egg-recent-model.c.str	2008-12-24 10:23:19.000000000 +0100
+++ ./libegg/egg-recent-model.c	2008-12-24 10:23:43.000000000 +0100
@@ -735,7 +735,7 @@
 	error = NULL;
 	if (!g_markup_parse_context_parse (ctx, content, strlen (content),
 					   &error)) {
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);
 		error = NULL;
 		goto out;
--- ./mozilla/GtkNSSSecurityWarningDialogs.cpp.str	2008-12-24 10:27:16.000000000 +0100
+++ ./mozilla/GtkNSSSecurityWarningDialogs.cpp	2008-12-24 10:27:53.000000000 +0100
@@ -255,12 +255,12 @@
 	GtkDialogFlags flags = parent ? (GtkDialogFlags)0 : GTK_DIALOG_MODAL;
 #if GTK_CHECK_VERSION(2,6,0)
 	GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (parent), flags,
-						    aType, aButtons, aPrimary);
+						    aType, aButtons, "%s", aPrimary);
 
         if (aSecondary)
         {
                 gtk_message_dialog_format_secondary_markup
-                        (GTK_MESSAGE_DIALOG (dialog), aSecondary);
+                        (GTK_MESSAGE_DIALOG (dialog), "%s", aSecondary);
         }
 
 #else
--- ./utils/gul-download.c.str	2008-12-24 10:24:19.000000000 +0100
+++ ./utils/gul-download.c	2008-12-24 10:25:00.000000000 +0100
@@ -287,7 +287,7 @@
 
 		text = g_strdup_printf (_("Failed to execute download "
 					  "command."));
-		g_warning (text);
+		g_warning ("%s", text);
 		g_free (text);
 	}
 }
@@ -349,7 +349,7 @@
 					  "\thttp://gtm.sourceforge.net"));
 		/* dialog = gnome_error_dialog (text); */
 		/* gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); */
-		g_warning(text);
+		g_warning("%s",text);
 		g_free (text);
 	}
   
--- ./utils/gul-gui.c.str	2008-12-24 10:25:13.000000000 +0100
+++ ./utils/gul-gui.c	2008-12-24 10:25:41.000000000 +0100
@@ -793,6 +793,7 @@
 					GTK_RESPONSE_OK,
 					NULL);
 		hig_alert_set_secondary_printf (HIG_ALERT (dialog),
+						"%s",
 						error->message);
 		g_signal_connect (G_OBJECT (dialog), "response",
 				  G_CALLBACK (gtk_widget_destroy),

galeon-2.0.7-jsconsole.patch:
 mozilla/mozilla-embed-shell.cpp |    2 --
 src/galeon-window.c             |    6 ------
 ui/galeon-egg-ui.xml            |    1 -
 3 files changed, 9 deletions(-)

--- NEW FILE galeon-2.0.7-jsconsole.patch ---
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp~	2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2009-04-30 12:38:33.164540313 +0200
@@ -409,8 +409,6 @@
 	ret = mozilla_register_components ();
 	if (ret == FALSE) return FALSE;
 
-	mozilla_init_js_console ();
-
 	mozilla_init_cookie_observer();
 		
 	return TRUE;
--- galeon-2.0.7/ui/galeon-egg-ui.xml~	2008-07-04 18:30:59.000000000 +0200
+++ galeon-2.0.7/ui/galeon-egg-ui.xml	2009-05-09 00:34:28.645768357 +0200
@@ -77,7 +77,6 @@
     	<menuitem name="WebAllowJava" action="WebAllowJavaAction" />
     	<menuitem name="WebAllowJS" action="WebAllowJSAction" />
     	<separator name="WSep4" />
-    	<menuitem name="WebJavaConsole" action="WebJavaConsoleAction" />
     	<menuitem name="WebJSConsole" action="WebJSConsoleAction" />
     </menu>
     <menu name="Go" action="GoMenuAction">
--- galeon-2.0.7/src/galeon-window.c~	2008-07-04 18:30:50.000000000 +0200
+++ galeon-2.0.7/src/galeon-window.c	2009-05-09 00:33:50.173017926 +0200
@@ -190,7 +190,6 @@
 #define WEB_POPUPS_ALWAYS_ACTION	"WebPopupsAlwaysAction"
 #define WEB_ALLOW_JAVA_ACTION		"WebAllowJavaAction"
 #define WEB_ALLOW_JS_ACTION		"WebAllowJSAction"
-#define WEB_JAVA_CONSOLE_ACTION         "WebJavaConsoleAction"
 
 #define VIEW_SOURCE_ACTION              "FilePageSourceAction"
 #define FILE_PRINT_ACTION               "FilePrintAction"
@@ -379,8 +378,6 @@
 	{ "ViewImagesAllowSiteAction", NULL, N_("_Allow Images From This Site"), NULL,
 	  N_("Block Images from this site from loading"), G_CALLBACK(window_cmd_set_permission) },
 
-	{ WEB_JAVA_CONSOLE_ACTION, NULL, N_("Java _Console"), NULL,
-	  N_("Show Java console window"), G_CALLBACK(window_cmd_show_java_console) },
 	{ "WebJSConsoleAction", NULL, N_("J_avaScript Console"), NULL,
 	  N_("Show JavaScript console window"), G_CALLBACK(window_cmd_show_js_console) },
 
@@ -1156,9 +1153,6 @@
 	java_enabled = eel_gconf_get_boolean(CONF_FILTERING_JAVA_ENABLED);
 
 	gtk_toggle_action_set_active(TOGGLE_ITEM(WEB_ALLOW_JAVA_ACTION), java_enabled);
-
-	g_object_set (ACTION_ITEM(WEB_JAVA_CONSOLE_ACTION),
-		      "sensitive", java_enabled, NULL);
 }
 
 static void


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- galeon.spec	9 Sep 2009 14:08:52 -0000	1.66
+++ galeon.spec	23 Sep 2009 07:34:19 -0000	1.67
@@ -3,30 +3,33 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0:		galeon-2.0.7-plugins.patch
+#Patch0:		galeon-2.0.7-plugins.patch
 Patch1:		galeon-2.0.7-confignspr.patch
 Patch2:		galeon-2.0.7-gtkprint.patch
 Patch3:		galeon-2.0.7-dfltfont.patch
 Patch4:		galeon-2.0.7-warnings.patch
 Patch5:		galeon-2.0.7-moz191.patch
+Patch6:		galeon-2.0.7-jsconsole.patch
+Patch7:         galeon-2.0.7-fix-str-fmt.patch
+Patch8:         galeon-1.3.2-home.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.12.0
 BuildRequires:	gnome-desktop-devel
-BuildRequires:	gecko-devel >= %{gecko_ver}
-BuildRequires:	gecko-devel-unstable >= %{gecko_ver}
+BuildRequires:	gecko-devel = %{gecko_ver}
+BuildRequires:	gecko-devel-unstable = %{gecko_ver}
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
 BuildRequires:  nspr-devel
 
-Requires: gecko-libs >= %{gecko_ver}
+Requires: gecko-libs = %{gecko_ver}
 
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -45,12 +48,15 @@ makes sense. Galeon was written to do ju
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .plugins
+#%patch0 -p1 -b .plugins
 %patch2 -p1 -b .gtkprint
 %patch1 -p1 -b .confignspr
 %patch3 -p1 -b .dfltfont
 %patch4 -p1 -b .warnings
 %patch5 -p1 -b .moz191
+%patch6 -p1 -b .jsconsole
+%patch7 -p0 -b .fixfmt
+%patch8 -p1 -b .home
 
 
 %build
@@ -125,6 +131,12 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Sep 23 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-15
+- Added jsconsole patch
+- Changed default home location, Mandriva patch
+- Disable plugins wrap patch, causing spurious crashes
+- Made gecko libs Rs and BRs exact (#515640)
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-14
 - Rebuild against newer gecko
 



From oget at fedoraproject.org  Wed Sep 23 07:45:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 07:45:06 +0000 (UTC)
Subject: rpms/kid3/devel kid3.spec,1.28,1.29
Message-ID: <20090923074506.78A3511C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kid3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17265

Modified Files:
	kid3.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2-3
- Update desktop file according to F-12 FedoraStudio feature



Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kid3.spec	25 Jul 2009 04:36:40 -0000	1.28
+++ kid3.spec	23 Sep 2009 07:45:05 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           kid3
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
@@ -47,6 +47,12 @@ install -Dpm 644 deb/kid3.1 $RPM_BUILD_R
 mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
 rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
 
+desktop-file-install \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category AudioVideoEditing \
+    $RPM_BUILD_ROOT%{_datadir}/applications/fedora-kid3.desktop
+  
+
 %find_lang %{name} --with-kde
 
 
@@ -82,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2-3
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From denis at fedoraproject.org  Wed Sep 23 07:50:28 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 23 Sep 2009 07:50:28 +0000 (UTC)
Subject: rpms/galeon/devel galeon-1.3.2-home.patch, NONE,
	1.1 galeon-2.0.7-fix-str-fmt.patch, NONE,
	1.1 galeon-2.0.7-jsconsole.patch, NONE, 1.1 galeon.spec, 1.61, 1.62
Message-ID: <20090923075028.53CC711C0418@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19183

Modified Files:
	galeon.spec 
Added Files:
	galeon-1.3.2-home.patch galeon-2.0.7-fix-str-fmt.patch 
	galeon-2.0.7-jsconsole.patch 
Log Message:
- Sync with F-11 patches
- Boosted EVR for smooth upgrade


galeon-1.3.2-home.patch:
 galeon.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE galeon-1.3.2-home.patch ---
--- galeon-1.3.2/galeon.schemas.in.home	2003-02-14 20:10:57.000000000 +0100
+++ galeon-1.3.2/galeon.schemas.in	2003-02-17 09:46:20.000000000 +0100
@@ -5,7 +5,7 @@
         <applyto>/apps/galeon/Browsing/General/startpage</applyto>
         <owner>galeon</owner>
         <type>string</type>
-        <default>myportal:</default>
+        <default>file:///usr/share/doc/HTML/index.html</default>
         <locale name="C">
         <short>Home page</short>
         <long>URL for the user's home page.  Displayed when Galeon starts up

galeon-2.0.7-fix-str-fmt.patch:
 libegg/egg-recent-model.c                |    2 +-
 mozilla/GtkNSSSecurityWarningDialogs.cpp |    4 ++--
 utils/gul-download.c                     |    4 ++--
 utils/gul-gui.c                          |    1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE galeon-2.0.7-fix-str-fmt.patch ---
--- ./libegg/egg-recent-model.c.str	2008-12-24 10:23:19.000000000 +0100
+++ ./libegg/egg-recent-model.c	2008-12-24 10:23:43.000000000 +0100
@@ -735,7 +735,7 @@
 	error = NULL;
 	if (!g_markup_parse_context_parse (ctx, content, strlen (content),
 					   &error)) {
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);
 		error = NULL;
 		goto out;
--- ./mozilla/GtkNSSSecurityWarningDialogs.cpp.str	2008-12-24 10:27:16.000000000 +0100
+++ ./mozilla/GtkNSSSecurityWarningDialogs.cpp	2008-12-24 10:27:53.000000000 +0100
@@ -255,12 +255,12 @@
 	GtkDialogFlags flags = parent ? (GtkDialogFlags)0 : GTK_DIALOG_MODAL;
 #if GTK_CHECK_VERSION(2,6,0)
 	GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (parent), flags,
-						    aType, aButtons, aPrimary);
+						    aType, aButtons, "%s", aPrimary);
 
         if (aSecondary)
         {
                 gtk_message_dialog_format_secondary_markup
-                        (GTK_MESSAGE_DIALOG (dialog), aSecondary);
+                        (GTK_MESSAGE_DIALOG (dialog), "%s", aSecondary);
         }
 
 #else
--- ./utils/gul-download.c.str	2008-12-24 10:24:19.000000000 +0100
+++ ./utils/gul-download.c	2008-12-24 10:25:00.000000000 +0100
@@ -287,7 +287,7 @@
 
 		text = g_strdup_printf (_("Failed to execute download "
 					  "command."));
-		g_warning (text);
+		g_warning ("%s", text);
 		g_free (text);
 	}
 }
@@ -349,7 +349,7 @@
 					  "\thttp://gtm.sourceforge.net"));
 		/* dialog = gnome_error_dialog (text); */
 		/* gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); */
-		g_warning(text);
+		g_warning("%s",text);
 		g_free (text);
 	}
   
--- ./utils/gul-gui.c.str	2008-12-24 10:25:13.000000000 +0100
+++ ./utils/gul-gui.c	2008-12-24 10:25:41.000000000 +0100
@@ -793,6 +793,7 @@
 					GTK_RESPONSE_OK,
 					NULL);
 		hig_alert_set_secondary_printf (HIG_ALERT (dialog),
+						"%s",
 						error->message);
 		g_signal_connect (G_OBJECT (dialog), "response",
 				  G_CALLBACK (gtk_widget_destroy),

galeon-2.0.7-jsconsole.patch:
 mozilla/mozilla-embed-shell.cpp |    2 --
 src/galeon-window.c             |    6 ------
 ui/galeon-egg-ui.xml            |    1 -
 3 files changed, 9 deletions(-)

--- NEW FILE galeon-2.0.7-jsconsole.patch ---
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp~	2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2009-04-30 12:38:33.164540313 +0200
@@ -409,8 +409,6 @@
 	ret = mozilla_register_components ();
 	if (ret == FALSE) return FALSE;
 
-	mozilla_init_js_console ();
-
 	mozilla_init_cookie_observer();
 		
 	return TRUE;
--- galeon-2.0.7/ui/galeon-egg-ui.xml~	2008-07-04 18:30:59.000000000 +0200
+++ galeon-2.0.7/ui/galeon-egg-ui.xml	2009-05-09 00:34:28.645768357 +0200
@@ -77,7 +77,6 @@
     	<menuitem name="WebAllowJava" action="WebAllowJavaAction" />
     	<menuitem name="WebAllowJS" action="WebAllowJSAction" />
     	<separator name="WSep4" />
-    	<menuitem name="WebJavaConsole" action="WebJavaConsoleAction" />
     	<menuitem name="WebJSConsole" action="WebJSConsoleAction" />
     </menu>
     <menu name="Go" action="GoMenuAction">
--- galeon-2.0.7/src/galeon-window.c~	2008-07-04 18:30:50.000000000 +0200
+++ galeon-2.0.7/src/galeon-window.c	2009-05-09 00:33:50.173017926 +0200
@@ -190,7 +190,6 @@
 #define WEB_POPUPS_ALWAYS_ACTION	"WebPopupsAlwaysAction"
 #define WEB_ALLOW_JAVA_ACTION		"WebAllowJavaAction"
 #define WEB_ALLOW_JS_ACTION		"WebAllowJSAction"
-#define WEB_JAVA_CONSOLE_ACTION         "WebJavaConsoleAction"
 
 #define VIEW_SOURCE_ACTION              "FilePageSourceAction"
 #define FILE_PRINT_ACTION               "FilePrintAction"
@@ -379,8 +378,6 @@
 	{ "ViewImagesAllowSiteAction", NULL, N_("_Allow Images From This Site"), NULL,
 	  N_("Block Images from this site from loading"), G_CALLBACK(window_cmd_set_permission) },
 
-	{ WEB_JAVA_CONSOLE_ACTION, NULL, N_("Java _Console"), NULL,
-	  N_("Show Java console window"), G_CALLBACK(window_cmd_show_java_console) },
 	{ "WebJSConsoleAction", NULL, N_("J_avaScript Console"), NULL,
 	  N_("Show JavaScript console window"), G_CALLBACK(window_cmd_show_js_console) },
 
@@ -1156,9 +1153,6 @@
 	java_enabled = eel_gconf_get_boolean(CONF_FILTERING_JAVA_ENABLED);
 
 	gtk_toggle_action_set_active(TOGGLE_ITEM(WEB_ALLOW_JAVA_ACTION), java_enabled);
-
-	g_object_set (ACTION_ITEM(WEB_JAVA_CONSOLE_ACTION),
-		      "sensitive", java_enabled, NULL);
 }
 
 static void


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- galeon.spec	24 Jul 2009 23:27:34 -0000	1.61
+++ galeon.spec	23 Sep 2009 07:50:27 -0000	1.62
@@ -1,32 +1,35 @@
-%define gecko_ver 1.9.1
+%define gecko_ver 1.9.1.3
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	8%{?dist}
+Release:	15%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0:		galeon-2.0.7-plugins.patch
+#Patch0:		galeon-2.0.7-plugins.patch
 Patch1:		galeon-2.0.7-confignspr.patch
 Patch2:		galeon-2.0.7-gtkprint.patch
 Patch3:		galeon-2.0.7-dfltfont.patch
 Patch4:		galeon-2.0.7-warnings.patch
 Patch5:		galeon-2.0.7-moz191.patch
+Patch6:		galeon-2.0.7-jsconsole.patch
+Patch7:         galeon-2.0.7-fix-str-fmt.patch
+Patch8:         galeon-1.3.2-home.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.12.0
 BuildRequires:	gnome-desktop-devel
-BuildRequires:	gecko-devel >= %{gecko_ver}
-BuildRequires:	gecko-devel-unstable >= %{gecko_ver}
+BuildRequires:	gecko-devel = %{gecko_ver}
+BuildRequires:	gecko-devel-unstable = %{gecko_ver}
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
 BuildRequires:  nspr-devel
 
-Requires: gecko-libs >= %{gecko_ver}
+Requires: gecko-libs = %{gecko_ver}
 
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -45,12 +48,15 @@ makes sense. Galeon was written to do ju
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .plugins
+#%patch0 -p1 -b .plugins
 %patch2 -p1 -b .gtkprint
 %patch1 -p1 -b .confignspr
 %patch3 -p1 -b .dfltfont
 %patch4 -p1 -b .warnings
 %patch5 -p1 -b .moz191
+%patch6 -p1 -b .jsconsole
+%patch7 -p0 -b .fixfmt
+%patch8 -p1 -b .home
 
 
 %build



From denis at fedoraproject.org  Wed Sep 23 07:51:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 23 Sep 2009 07:51:30 +0000 (UTC)
Subject: rpms/galeon/devel galeon.spec,1.62,1.63
Message-ID: <20090923075130.CC54A11C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19570

Modified Files:
	galeon.spec 
Log Message:
missing changelog


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- galeon.spec	23 Sep 2009 07:50:27 -0000	1.62
+++ galeon.spec	23 Sep 2009 07:51:30 -0000	1.63
@@ -8,7 +8,7 @@ License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-#Patch0:		galeon-2.0.7-plugins.patch
+#Patch0:        galeon-2.0.7-plugins.patch
 Patch1:		galeon-2.0.7-confignspr.patch
 Patch2:		galeon-2.0.7-gtkprint.patch
 Patch3:		galeon-2.0.7-dfltfont.patch
@@ -131,6 +131,10 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Sep 23 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-15
+- Sync with F-11 patches
+- Boosted EVR for smooth upgrade
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Wed Sep 23 07:54:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Sep 2009 07:54:00 +0000 (UTC)
Subject: rpms/hunspell-be/devel hunspell-be.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20090923075400.9C1E011C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-be/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20528

Modified Files:
	hunspell-be.spec sources 
Log Message:
latest version


Index: hunspell-be.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-be/devel/hunspell-be.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hunspell-be.spec	25 Jul 2009 02:21:14 -0000	1.4
+++ hunspell-be.spec	23 Sep 2009 07:53:57 -0000	1.5
@@ -1,8 +1,8 @@
 Name: hunspell-be
 Summary: Belarusian hunspell dictionaries
-Version: 1.0.0
-Release: 2%{?dist}
-Source: http://extensions.services.openoffice.org/files/2412/0/dict-be-official.oxt
+Version: 1.1
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/files/2412/1/dict-be-official.oxt
 Group: Applications/Text
 URL: http://extensions.services.openoffice.org/project/dict-be-official
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Wed Sep 23 2009 Caolan McNamara <caolanm at redhat.com> - 1.1-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-be/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jun 2009 14:45:49 -0000	1.2
+++ sources	23 Sep 2009 07:53:58 -0000	1.3
@@ -1 +1 @@
-060aa3aeefade79d2712b4b756c337f2  dict-be-official.oxt
+7abc309134ce63fba9a12858ec03ec04  dict-be-official.oxt



From pravins at fedoraproject.org  Wed Sep 23 07:56:22 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 23 Sep 2009 07:56:22 +0000 (UTC)
Subject: rpms/system-config-language/devel .cvsignore, 1.12, 1.13 sources,
	1.33, 
	1.34 system-config-language.spec, 1.55, 1.56 ca-po-462914.patch,
	1.1, NONE dialogue-center-493824.patch, 1.1,
	NONE s-c-l-bug-493858-507796.patch, 1.1,
	NONE s-c-l-bug-493888.patch, 1.1, NONE s-c-l-bug-598975.patch,
	1.1, NONE
Message-ID: <20090923075622.0F7AF11C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21726

Modified Files:
	.cvsignore sources system-config-language.spec 
Removed Files:
	ca-po-462914.patch dialogue-center-493824.patch 
	s-c-l-bug-493858-507796.patch s-c-l-bug-493888.patch 
	s-c-l-bug-598975.patch 
Log Message:
 * Wed Sep 23 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-1
 - upstream release of 1.3.3
 - updated .pot files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Sep 2008 06:40:17 -0000	1.12
+++ .cvsignore	23 Sep 2009 07:56:21 -0000	1.13
@@ -8,3 +8,4 @@ system-config-language-1.1.15.tar.bz2
 system-config-language-1.1.16.tar.bz2
 system-config-language-1.3.1.tar.bz2
 system-config-language-1.3.2.tar.bz2
+system-config-language-1.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	17 Sep 2008 06:40:17 -0000	1.33
+++ sources	23 Sep 2009 07:56:21 -0000	1.34
@@ -1 +1 @@
-0c7d4097879c18f1f702d5166d4cdcb8  system-config-language-1.3.2.tar.bz2
+f1de5c2b5dfb25cad8d8c033da9d88b4  system-config-language-1.3.3.tar.bz2


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- system-config-language.spec	27 Jul 2009 05:23:41 -0000	1.55
+++ system-config-language.spec	23 Sep 2009 07:56:21 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.3.2
-Release: 10%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -18,11 +18,6 @@ Requires: usermode-gtk >= 1.36
 Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
-Patch1: ca-po-462914.patch
-Patch2: dialogue-center-493824.patch
-Patch3: s-c-l-bug-598975.patch
-Patch4: s-c-l-bug-493858-507796.patch
-Patch5: s-c-l-bug-493888.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -30,11 +25,6 @@ allows the user to change the default la
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-ca-po
-%patch2 -p1 -b .2-dialogue-center
-%patch3 -p1 -b .3-rhpl
-%patch4 -p1 -b .4-s-c-cleanup
-%patch5 -p1 -b .5-ok-button
 
 %build
 make %{?_smp_mflags}
@@ -42,7 +32,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTROOT=$RPM_BUILD_ROOT install
-install $RPM_BUILD_DIR/system-config-language-1.3.2/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
+install $RPM_BUILD_DIR/system-config-language-%{version}/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
 
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/*.py* 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/system-config-language
@@ -92,6 +82,10 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Wed Sep 23 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-1
+- upstream release of 1.3.3
+- updated .pot files
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- ca-po-462914.patch DELETED ---


--- dialogue-center-493824.patch DELETED ---


--- s-c-l-bug-493858-507796.patch DELETED ---


--- s-c-l-bug-493888.patch DELETED ---


--- s-c-l-bug-598975.patch DELETED ---



From denis at fedoraproject.org  Wed Sep 23 08:24:54 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 23 Sep 2009 08:24:54 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-moz191.patch,1.1,1.2
Message-ID: <20090923082455.0F18A11C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2999

Modified Files:
	galeon-2.0.7-moz191.patch 
Log Message:
Updated xulrunner compat patch from F-11

galeon-2.0.7-moz191.patch:
 galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h |    1 +
 galeon-2.0.7/mozilla/EventContext.cpp             |   18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

Index: galeon-2.0.7-moz191.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.7-moz191.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- galeon-2.0.7-moz191.patch	7 Jan 2009 05:22:11 -0000	1.1
+++ galeon-2.0.7-moz191.patch	23 Sep 2009 08:24:41 -0000	1.2
@@ -39,3 +39,14 @@ diff -ur galeon-2.0.7.umg/mozilla/EventC
  	}
  	*aX = x;
  	*aY = y;
+diff -ur galeon-2.0.7/mozilla/GeckoPrintSession.h galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h
+--- galeon-2.0.7/mozilla/GeckoPrintSession.h	2009-03-14 14:34:07.000000000 +0200
++++ galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h	2009-03-14 14:32:23.000000000 +0200
+@@ -22,6 +22,7 @@
+ #define GECKO_PRINT_SESSION_H
+ 
+ #include <nsCOMPtr.h>
++#include <nsXPCOMCIDInternal.h>
+ #include <nsIPrintSession.h>
+ #include <nsIWebProgressListener.h>
+ #include <nsIPrintProgress.h>



From mtasaka at fedoraproject.org  Wed Sep 23 08:52:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Sep 2009 08:52:30 +0000 (UTC)
Subject: rpms/gnome-commander/F-10 .cvsignore, 1.12,
	1.13 gnome-commander.spec, 1.29, 1.30 sources, 1.12, 1.13
Message-ID: <20090923085230.B976311C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14811/F-10

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.2-1
- 1.2.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Aug 2009 18:00:06 -0000	1.12
+++ .cvsignore	23 Sep 2009 08:52:17 -0000	1.13
@@ -1 +1 @@
-gnome-commander-1.2.8.1.tar.bz2
+gnome-commander-1.2.8.2.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/gnome-commander.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gnome-commander.spec	12 Aug 2009 18:00:06 -0000	1.29
+++ gnome-commander.spec	23 Sep 2009 08:52:17 -0000	1.30
@@ -32,7 +32,7 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.1
+Version:       1.2.8.2
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -227,6 +227,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.2-1
+- 1.2.8.2
+
 * Thu Aug 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.1-1
 - 1.2.8.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 Aug 2009 18:00:06 -0000	1.12
+++ sources	23 Sep 2009 08:52:17 -0000	1.13
@@ -1 +1 @@
-bb29604eef72e66554151b61db35100f  gnome-commander-1.2.8.1.tar.bz2
+8b390fc2de41aee522a444e78b1feb4f  gnome-commander-1.2.8.2.tar.bz2



From mtasaka at fedoraproject.org  Wed Sep 23 08:52:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Sep 2009 08:52:30 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.37,
	1.38 gnome-commander.spec, 1.62, 1.63 sources, 1.37, 1.38
Message-ID: <20090923085230.B987211C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14811/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.2-1
- 1.2.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	12 Aug 2009 18:00:06 -0000	1.37
+++ .cvsignore	23 Sep 2009 08:52:25 -0000	1.38
@@ -1 +1 @@
-gnome-commander-1.2.8.1.tar.bz2
+gnome-commander-1.2.8.2.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gnome-commander.spec	12 Aug 2009 18:00:06 -0000	1.62
+++ gnome-commander.spec	23 Sep 2009 08:52:27 -0000	1.63
@@ -32,7 +32,7 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.1
+Version:       1.2.8.2
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -227,6 +227,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.2-1
+- 1.2.8.2
+
 * Thu Aug 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.1-1
 - 1.2.8.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	12 Aug 2009 18:00:06 -0000	1.37
+++ sources	23 Sep 2009 08:52:27 -0000	1.38
@@ -1 +1 @@
-bb29604eef72e66554151b61db35100f  gnome-commander-1.2.8.1.tar.bz2
+8b390fc2de41aee522a444e78b1feb4f  gnome-commander-1.2.8.2.tar.bz2



From stransky at fedoraproject.org  Wed Sep 23 09:08:49 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 23 Sep 2009 09:08:49 +0000 (UTC)
Subject: rpms/seamonkey/devel .cvsignore, 1.26, 1.27 seamonkey.spec, 1.60,
	1.61 sources, 1.28, 1.29
Message-ID: <20090923090849.DD31D11C00E6@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21246

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
Update to 2.0 beta 2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	24 Jul 2009 21:42:52 -0000	1.26
+++ .cvsignore	23 Sep 2009 09:08:48 -0000	1.27
@@ -1,3 +1,5 @@
 seamonkey-1.1.16.source.tar.bz2
 seamonkey-2.0b1-source.tar.bz2
 seamonkey-langpacks-2.0b1-20090724.tar.bz2
+seamonkey-2.0b2.source.tar.bz2
+seamonkey-langpacks-2.0b2-20090923.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- seamonkey.spec	6 Aug 2009 13:30:14 -0000	1.60
+++ seamonkey.spec	23 Sep 2009 09:08:48 -0000	1.61
@@ -5,7 +5,7 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag b1
+%define prerelease_tag b2
 
 %define build_langpacks 1
 
@@ -18,13 +18,13 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        2.beta1%{?dist}
+Release:        3.beta2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
 
-Source0:        seamonkey-%{version}%{?prerelease_tag}-source.tar.bz2
-Source1:        seamonkey-langpacks-%{version}%{?prerelease_tag}-20090724.tar.bz2
+Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
+Source1:        seamonkey-langpacks-%{version}%{?prerelease_tag}-20090923.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -341,6 +341,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Sep 23 2009 Martin Stransky <stransky at redhat.com> 2.0-3.beta2
+- Update to 2.0 beta 2
+
 * Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> 2.0-2.beta1
 - Added fix for #437596
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	24 Jul 2009 21:42:52 -0000	1.28
+++ sources	23 Sep 2009 09:08:48 -0000	1.29
@@ -1,2 +1,2 @@
-f7d6453b2e84070b6f74c597209f447c  seamonkey-2.0b1-source.tar.bz2
-717d55bc4dd61de33c754f077c14d92f  seamonkey-langpacks-2.0b1-20090724.tar.bz2
+a058aeadc540a6fd58873ae1e51c23e0  seamonkey-2.0b2.source.tar.bz2
+420414dcd91f96313cec7d327d98daae  seamonkey-langpacks-2.0b2-20090923.tar.bz2



From pvrabec at fedoraproject.org  Wed Sep 23 09:15:16 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 23 Sep 2009 09:15:16 +0000 (UTC)
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.14,1.15
Message-ID: <20090923091517.0501A11C00E6@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22618

Modified Files:
	netlabel_tools.spec 
Log Message:
fix license tag in spec (#524310)



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- netlabel_tools.spec	25 Jul 2009 19:12:29 -0000	1.14
+++ netlabel_tools.spec	23 Sep 2009 09:15:16 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.19
-Release: 3%{?dist}
-License: GPLv2+
+Release: 4%{?dist}
+License: GPLv2
 Group: System Environment/Daemons
 URL: http://netlabel.sf.net/
 Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.19-4
+- fix license tag in spec (#524310)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stransky at fedoraproject.org  Wed Sep 23 09:19:23 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 23 Sep 2009 09:19:23 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.spec,1.61,1.62
Message-ID: <20090923091923.7AAA011C00E6@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24178

Modified Files:
	seamonkey.spec 
Log Message:
build fix


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- seamonkey.spec	23 Sep 2009 09:08:48 -0000	1.61
+++ seamonkey.spec	23 Sep 2009 09:19:23 -0000	1.62
@@ -63,6 +63,7 @@ BuildRequires:  libXrender-devel
 BuildRequires:  fileutils
 BuildRequires:  perl
 BuildRequires:  alsa-lib-devel
+BuildRequires:  hunspell-devel
 BuildRequires:  system-bookmarks
 Requires:       system-bookmarks
 Requires:       mozilla-filesystem



From sharkcz at fedoraproject.org  Wed Sep 23 09:24:16 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Sep 2009 09:24:16 +0000 (UTC)
Subject: rpms/garmindev/EL-5 .cvsignore, 1.3, 1.4 garmindev.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090923092416.AC9F411C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/garmindev/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26071

Modified Files:
	.cvsignore garmindev.spec sources 
Log Message:
* Mon Jul 20 2009 Dan Hor?k <dan[at]danny.cz> 0.3.0-1
- update to version 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Feb 2009 13:39:25 -0000	1.3
+++ .cvsignore	23 Sep 2009 09:24:16 -0000	1.4
@@ -1 +1 @@
-garmindev-svn1152.tar.bz2
+garmindev-0.3.0.tar.gz


Index: garmindev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/EL-5/garmindev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- garmindev.spec	8 Feb 2009 13:39:25 -0000	1.2
+++ garmindev.spec	23 Sep 2009 09:24:16 -0000	1.3
@@ -1,19 +1,14 @@
-%define date 20090208
-%define rev  1152
-
 Name:           garmindev
-Version:        0
-Release:        0.3.%{date}svn%{rev}%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Drivers for communication with Garmin GPS devices
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.qlandkarte.org
-# snapshot grabbed using http://fedora.danny.cz/fedora-getsvn
-# fedora-getsvn garmindev https://qlandkartegt.svn.sourceforge.net/svnroot/qlandkartegt/GarminDev/trunk 928
-Source0:        %{name}-svn%{rev}.tar.bz2
+Source0:        http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{name}(interface) = 1.15
+Provides:       %{name}(interface) = 1.16
 
 BuildRequires:  cmake libusb-devel
 
@@ -23,21 +18,20 @@ Drivers for communication with Garmin GP
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
-# fix libdir
-sed -i "s|/usr/lib|%{_libdir}|g" CMakeLists.txt
-# don't conflict with original qlandkarte
-sed -i "s|qlandkarte|qlandkartegt|g" CMakeLists.txt
+mkdir build
 
 
 %build
-%cmake .
+cd build
+%cmake ..
 make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
+cd build
 make install DESTDIR=%{buildroot}
 
 # fix perms on plugins
@@ -59,6 +53,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 20 2009 Dan Hor?k <dan[at]danny.cz> 0.3.0-1
+- update to version 0.3.0
+
+* Wed Apr 15 2009 Dan Hor?k <dan[at]danny.cz> 0.1.1-1
+- update to version 0.1.1
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.4.20090208svn1152
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb  8 2009 Dan Hor?k <dan[at]danny.cz> 0-0.3.20090208svn1152
 - update to revision 1152 - adds support for eTrex LegendHCx, eTrexH, eTrex Legend
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Feb 2009 13:39:25 -0000	1.3
+++ sources	23 Sep 2009 09:24:16 -0000	1.4
@@ -1 +1 @@
-e83739fd0160aa2a332d985b1c53ac24  garmindev-svn1152.tar.bz2
+f6f3a4d945e9c6b0d03e8bdb453603dc  garmindev-0.3.0.tar.gz



From izhar at fedoraproject.org  Wed Sep 23 09:25:10 2009
From: izhar at fedoraproject.org (Mohd Izhar Firdaus Ismail)
Date: Wed, 23 Sep 2009 09:25:10 +0000 (UTC)
Subject: rpms/libitl/devel import.log, 1.2, 1.3 libitl.spec, 1.6,
	1.7 libitl-configure, 1.1, NONE
Message-ID: <20090923092510.D2FD811C00E6@cvs1.fedora.phx.redhat.com>

Author: izhar

Update of /cvs/pkgs/rpms/libitl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26322/devel

Modified Files:
	import.log libitl.spec 
Removed Files:
	libitl-configure 
Log Message:
- fix libitl.so.0 is not symlink warning
- made libitl to be built using only 1 make thread, as multiple threading randomly
  fail during compile



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	19 Sep 2009 10:01:09 -0000	1.2
+++ import.log	23 Sep 2009 09:25:10 -0000	1.3
@@ -1,2 +1,3 @@
 libitl-0_6_4-5_fc9:HEAD:libitl-0.6.4-5.fc9.src.rpm:1212998833
 libitl-0_7_0-1_fc11:HEAD:libitl-0.7.0-1.fc11.src.rpm:1253353350
+libitl-0_7_0-2_fc11:HEAD:libitl-0.7.0-2.fc11.src.rpm:1253697724


Index: libitl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/devel/libitl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libitl.spec	19 Sep 2009 10:01:09 -0000	1.6
+++ libitl.spec	23 Sep 2009 09:25:10 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           libitl
 Version:        0.7.0 
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for The Islamic Tools and Libraries Project
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.arabeyes.org/project.php?proj=ITL
 Source0:        http://switch.dl.sourceforge.net/sourceforge/arabeyes/%{name}-%{version}.tar.gz
-Source1:        libitl-configure
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
@@ -40,19 +39,20 @@ developing applications that use %{name}
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make  %{?_smp_mflags} -j1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 #make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ $RPM_BUILD_ROOT/%{_includedir}/itl
-cp build/*.so build/*.so.* $RPM_BUILD_ROOT/%{_libdir}/
+cp build/libitl.so.0.0.7 $RPM_BUILD_ROOT/%{_libdir}/
+ln -s libitl.so.0.0.7 $RPM_BUILD_ROOT/%{_libdir}/libitl.so.0
+ln -s libitl.so.0.0.7 $RPM_BUILD_ROOT/%{_libdir}/libitl.so
 cp prayertime/src/prayer.h hijri/src/hijri.h $RPM_BUILD_ROOT/%{_includedir}/itl/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,6 +77,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Mohd Izhar Firdaus Ismail <mohd.izhar.firdaus at gmail.com> 0.7.0-2
+- fix libitl.so.0 is not symlink warning
+- made libitl to be built using only 1 make thread, as multiple threading randomly
+  fail during compile
+
 * Sat Sep 19 2009 Mohd Izhar Firdaus Ismail <mohd.izhar.firdaus at gmail.com> 0.7.0-1
 - update to 0.7.0
 


--- libitl-configure DELETED ---



From pvrabec at fedoraproject.org  Wed Sep 23 09:26:19 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 23 Sep 2009 09:26:19 +0000 (UTC)
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.15,1.16
Message-ID: <20090923092619.C11E211C00E6@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26693

Modified Files:
	netlabel_tools.spec 
Log Message:
increase rel. number



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- netlabel_tools.spec	23 Sep 2009 09:15:16 -0000	1.15
+++ netlabel_tools.spec	23 Sep 2009 09:26:19 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.19
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://netlabel.sf.net/
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.19-5
+- increase rel. number
+
 * Wed Sep 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.19-4
 - fix license tag in spec (#524310)
 



From pvrabec at fedoraproject.org  Wed Sep 23 09:30:51 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 23 Sep 2009 09:30:51 +0000 (UTC)
Subject: rpms/netlabel_tools/F-11 netlabel_tools.spec,1.13,1.14
Message-ID: <20090923093051.7816F11C00E6@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/netlabel_tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27578

Modified Files:
	netlabel_tools.spec 
Log Message:
fix license tag in spec file



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/F-11/netlabel_tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- netlabel_tools.spec	26 Feb 2009 05:17:43 -0000	1.13
+++ netlabel_tools.spec	23 Sep 2009 09:30:51 -0000	1.14
@@ -1,8 +1,8 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.19
-Release: 2%{?dist}
-License: GPLv2+
+Release: 3%{?dist}
+License: GPLv2
 Group: System Environment/Daemons
 URL: http://netlabel.sf.net/
 Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.19-3
+- fix license tag in spec file (#524310)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twaugh at fedoraproject.org  Wed Sep 23 09:32:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Sep 2009 09:32:54 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.237,1.238
Message-ID: <20090923093254.DD42B11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28155

Modified Files:
	hplip.spec 
Log Message:
* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
- Enable parallel port support when configuring (bug #524979).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- hplip.spec	16 Sep 2009 15:09:05 -0000	1.237
+++ hplip.spec	23 Sep 2009 09:32:54 -0000	1.238
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -148,7 +148,7 @@ automake --foreign --add-missing --copy
 autoconf
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install \
+	--disable-foomatic-rip-hplip-install --enable-pp-build \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
 	--enable-hpijs-install --enable-udev-acl-rules
 
@@ -345,6 +345,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
+- Enable parallel port support when configuring (bug #524979).
+
 * Wed Sep 16 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
 - Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 



From whot at fedoraproject.org  Wed Sep 23 09:33:21 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 23 Sep 2009 09:33:21 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.38, 1.39 commitid, 1.4, 
	1.5 sources, 1.38, 1.39 xorg-x11-drv-evdev.spec, 1.60, 1.61
Message-ID: <20090923093321.645C911C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28389

Modified Files:
	.cvsignore commitid sources xorg-x11-drv-evdev.spec 
Log Message:
* Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-8.20090923
- Update to today's git master (fixes wheel emulation)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	8 Sep 2009 22:29:53 -0000	1.38
+++ .cvsignore	23 Sep 2009 09:33:20 -0000	1.39
@@ -1 +1 @@
-xf86-input-evdev-20090909.tar.bz2
+xf86-input-evdev-20090923.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/commitid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- commitid	8 Sep 2009 22:29:53 -0000	1.4
+++ commitid	23 Sep 2009 09:33:21 -0000	1.5
@@ -1 +1 @@
-415b6ffa958e3103eeb52af4ccd881497169eed4
+61b4e88e01f32e976f85e7970a7f5b21fcd84f97


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	8 Sep 2009 22:29:53 -0000	1.38
+++ sources	23 Sep 2009 09:33:21 -0000	1.39
@@ -1 +1 @@
-4c7ec291513f4626ef7db6038cb32cd8  xf86-input-evdev-20090909.tar.bz2
+e93818c4185ebb88cb03f86893b09dce  xf86-input-evdev-20090923.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- xorg-x11-drv-evdev.spec	8 Sep 2009 22:29:53 -0000	1.60
+++ xorg-x11-drv-evdev.spec	23 Sep 2009 09:33:21 -0000	1.61
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090909
+%define gitdate 20090923
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.2.99
-Release:    7.%{gitdate}%{?dist}
+Release:    8.%{gitdate}%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -71,6 +71,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-8.20090923
+- Update to today's git master (fixes wheel emulation)
+
 * Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-7.20090909
 - Update to today's git master
 



From dcbw at fedoraproject.org  Wed Sep 23 09:33:47 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Sep 2009 09:33:47 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.20,
	1.21 NetworkManager-openvpn.spec, 1.38, 1.39 sources, 1.24, 1.25
Message-ID: <20090923093347.F1C0411C00E6@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28567

Modified Files:
	.cvsignore NetworkManager-openvpn.spec sources 
Log Message:
* Wed Sep 23 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3.git20090923
- Add GUI option for reneg-sec config option (rh #490971)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	21 Sep 2009 22:54:28 -0000	1.20
+++ .cvsignore	23 Sep 2009 09:33:47 -0000	1.21
@@ -15,3 +15,4 @@ NetworkManager-openvpn-0.7.1.git20090713
 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2
 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2
 NetworkManager-openvpn-0.7.996.git20090921.tar.bz2
+NetworkManager-openvpn-0.7.996.git20090923.tar.bz2


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- NetworkManager-openvpn.spec	21 Sep 2009 23:05:06 -0000	1.38
+++ NetworkManager-openvpn.spec	23 Sep 2009 09:33:47 -0000	1.39
@@ -4,13 +4,13 @@
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot .git20090921
+%define snapshot .git20090923
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.996
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -103,6 +103,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Wed Sep 23 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3.git20090923
+- Add GUI option for reneg-sec config option (rh #490971)
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	21 Sep 2009 22:54:28 -0000	1.24
+++ sources	23 Sep 2009 09:33:47 -0000	1.25
@@ -1 +1 @@
-7b006d8051dcf0d3e34729079bbf6f09  NetworkManager-openvpn-0.7.996.git20090921.tar.bz2
+07cf14f98db13b87ad677f9db2f568dc  NetworkManager-openvpn-0.7.996.git20090923.tar.bz2



From twaugh at fedoraproject.org  Wed Sep 23 09:40:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Sep 2009 09:40:19 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-discovery-method.patch, NONE, 1.1 hplip.spec, 
	1.230, 1.231
Message-ID: <20090923094019.3033B11C0423@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30590

Modified Files:
	hplip.spec 
Added Files:
	hplip-discovery-method.patch 
Log Message:
* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
- Enable parallel port support when configuring (bug #524979).
- Fixed hp-setup traceback when discovery page is skipped (bug #523685).


hplip-discovery-method.patch:
 setupdialog.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE hplip-discovery-method.patch ---
diff -up hplip-3.9.8/ui4/setupdialog.py.discovery-method hplip-3.9.8/ui4/setupdialog.py
--- hplip-3.9.8/ui4/setupdialog.py.discovery-method	2009-08-04 22:37:22.000000000 +0100
+++ hplip-3.9.8/ui4/setupdialog.py	2009-09-16 15:34:36.509431266 +0100
@@ -171,6 +171,7 @@ class SetupDialog(QDialog, Ui_Dialog):
             QTimer.singleShot(0, self.showRemovePage)
         else:
             if self.skip_discovery:
+                self.discovery_method = 1 # mDNS
                 QTimer.singleShot(0, self.showDevicesPage)
             else:
                 QTimer.singleShot(0, self.showDiscoveryPage)


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- hplip.spec	28 Aug 2009 11:01:48 -0000	1.230
+++ hplip.spec	23 Sep 2009 09:40:18 -0000	1.231
@@ -23,6 +23,7 @@ Patch6: hplip-state-reasons-newline.patc
 Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
+Patch10: hplip-discovery-method.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -139,13 +140,16 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Set RequiresPageRegion in hpcups PPDs (bug #518756).
 %patch9 -p1 -b .requirespageregion
 
+# Fixed hp-setup traceback when discovery page is skipped (bug #523685).
+%patch10 -p1 -b .discovery-method
+
 %build
 aclocal
 automake --foreign --add-missing --copy
 autoconf
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install \
+	--disable-foomatic-rip-hplip-install --enable-pp-build \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
 	--enable-hpijs-install
 
@@ -356,6 +360,10 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
+- Enable parallel port support when configuring (bug #524979).
+- Fixed hp-setup traceback when discovery page is skipped (bug #523685).
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-12
 - Include missing base files.
 



From twaugh at fedoraproject.org  Wed Sep 23 09:40:42 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Sep 2009 09:40:42 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.231,1.232
Message-ID: <20090923094042.CA31811C0423@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30683

Modified Files:
	hplip.spec 
Log Message:
3.9.8-13


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- hplip.spec	23 Sep 2009 09:40:18 -0000	1.231
+++ hplip.spec	23 Sep 2009 09:40:42 -0000	1.232
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -360,7 +360,7 @@ fi
 exit 0
 
 %changelog
-* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
+* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
 - Enable parallel port support when configuring (bug #524979).
 - Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 



From izhar at fedoraproject.org  Wed Sep 23 09:46:06 2009
From: izhar at fedoraproject.org (Mohd Izhar Firdaus Ismail)
Date: Wed, 23 Sep 2009 09:46:06 +0000 (UTC)
Subject: rpms/libitl/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libitl-makefile-ld.patch, 1.1, 1.2 libitl.spec, 1.4,
	1.5 sources, 1.2, 1.3 libitl-configure, 1.1,
	NONE libitl-makefile-destdir.patch, 1.2, NONE
Message-ID: <20090923094606.6F96311C00E6@cvs1.fedora.phx.redhat.com>

Author: izhar

Update of /cvs/pkgs/rpms/libitl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32377/F-11

Modified Files:
	.cvsignore import.log libitl-makefile-ld.patch libitl.spec 
	sources 
Removed Files:
	libitl-configure libitl-makefile-destdir.patch 
Log Message:
 * update to 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Feb 2008 02:05:48 -0000	1.2
+++ .cvsignore	23 Sep 2009 09:46:05 -0000	1.3
@@ -1 +1 @@
-libitl-0.6.4.tar.bz2
+libitl-0.7.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Jun 2008 09:57:27 -0000	1.1
+++ import.log	23 Sep 2009 09:46:05 -0000	1.2
@@ -1 +1,2 @@
 libitl-0_6_4-5_fc9:HEAD:libitl-0.6.4-5.fc9.src.rpm:1212998833
+libitl-0_7_0-2_fc11:F-11:libitl-0.7.0-2.fc11.src.rpm:1253699110

libitl-makefile-ld.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libitl-makefile-ld.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/F-11/libitl-makefile-ld.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libitl-makefile-ld.patch	9 Jun 2008 09:57:28 -0000	1.1
+++ libitl-makefile-ld.patch	23 Sep 2009 09:46:06 -0000	1.2
@@ -1,5 +1,5 @@
---- libitl-0.6.4/Makefile.old	2008-06-09 15:57:37.000000000 +0800
-+++ libitl-0.6.4/Makefile	2008-06-09 15:58:14.000000000 +0800
+--- libitl-0.7.0/Makefile.old	2008-06-09 15:57:37.000000000 +0800
++++ libitl-0.7.0/Makefile.in	2008-06-09 15:58:14.000000000 +0800
 @@ -23,7 +23,7 @@
  	@false
  


Index: libitl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/F-11/libitl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libitl.spec	25 Feb 2009 15:57:47 -0000	1.4
+++ libitl.spec	23 Sep 2009 09:46:06 -0000	1.5
@@ -1,19 +1,17 @@
 Name:           libitl
-Version:        0.6.4 
-Release:        6%{?dist}
+Version:        0.7.0 
+Release:        2%{?dist}
 Summary:        Libraries for The Islamic Tools and Libraries Project
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.arabeyes.org/project.php?proj=ITL
-Source0:        http://switch.dl.sourceforge.net/sourceforge/arabeyes/%{name}-%{version}.tar.bz2
-Source1:        libitl-configure
+Source0:        http://switch.dl.sourceforge.net/sourceforge/arabeyes/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Patch101:  libitl-makefile-destdir.patch
-Patch102:  libitl-makefile-ld.patch
+Patch0: %{name}-makefile-ld.patch
 #BuildRequires:  autoconf
 
 %description
@@ -37,24 +35,24 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch101 -p1 -b .makefile-destdir
-%patch102 -p1 -b .makefile-ld
-#./autogen.sh
-cp %{SOURCE1} configure
-chmod +x configure
+%patch0 -p1
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make  %{?_smp_mflags} -j1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+#make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ $RPM_BUILD_ROOT/%{_includedir}/itl
+cp build/libitl.so.0.0.7 $RPM_BUILD_ROOT/%{_libdir}/
+ln -s libitl.so.0.0.7 $RPM_BUILD_ROOT/%{_libdir}/libitl.so.0
+ln -s libitl.so.0.0.7 $RPM_BUILD_ROOT/%{_libdir}/libitl.so
+cp prayertime/src/prayer.h hijri/src/hijri.h $RPM_BUILD_ROOT/%{_includedir}/itl/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,6 +77,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Mohd Izhar Firdaus Ismail <mohd.izhar.firdaus at gmail.com> 0.7.0-2
+- fix libitl.so.0 is not symlink warning
+- made libitl to be built using only 1 make thread, as multiple threading randomly
+  fail during compile
+
+* Sat Sep 19 2009 Mohd Izhar Firdaus Ismail <mohd.izhar.firdaus at gmail.com> 0.7.0-1
+- update to 0.7.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libitl/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Feb 2008 02:05:48 -0000	1.2
+++ sources	23 Sep 2009 09:46:06 -0000	1.3
@@ -1 +1 @@
-477081809cfc2006fdd2b8d0099d985b  libitl-0.6.4.tar.bz2
+86d7fadce96433dde67df61190b0bd0b  libitl-0.7.0.tar.gz


--- libitl-configure DELETED ---


--- libitl-makefile-destdir.patch DELETED ---



From pmachata at fedoraproject.org  Wed Sep 23 10:40:41 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 23 Sep 2009 10:40:41 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009m-karachi.patch, NONE, 1.1 tzdata.spec,
	1.87, 1.88
Message-ID: <20090923104041.EF21111C0423@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13539

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009m-karachi.patch 
Log Message:
- Upstream 2009m
  - Palestine will will revert back to winter time on Friday, 2009-09-04
  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch


tzdata-2009m-karachi.patch:
 asia |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE tzdata-2009m-karachi.patch ---
diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia
--- tzdata2009m/asia~	2009-09-03 16:23:43.000000000 +0200
+++ tzdata2009m/asia	2009-09-18 13:14:26.000000000 +0200
@@ -1674,8 +1674,14 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # advance clocks in the country by one hour from April 15 to
 # conserve energy"
 
-# From Arthur David Olson (2009-04-10):
-# Assume for now that Pakistan will end DST in 2009 as it did in 2008.
+# From Steffen Thorsen (2009-09-17):
+# "The News International", Pakistan reports that: "The Federal
+# Government has decided to restore the previous time by moving the
+# clocks backward by one hour from October 1. A formal announcement to
+# this effect will be made after the Prime Minister grants approval in
+# this regard."  <a href="http://www.thenews.com.pk/updates.asp?id=87168">
+# http://www.thenews.com.pk/updates.asp?id=87168
+# </a>
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
@@ -1683,7 +1689,7 @@ Rule Pakistan	2002	only	-	Oct	Sun>=2	0:0
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Oct	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Diff finished.  Fri Sep 18 13:14:30 2009


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- tzdata.spec	16 Sep 2009 11:58:55 -0000	1.87
+++ tzdata.spec	23 Sep 2009 10:40:40 -0000	1.88
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2009m
-%define tzdata_version %{version}
+%define tzdata_version 2009m
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,9 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+# __decl_patches
+Patch1: tzdata-2009m-karachi.patch
+# __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +50,9 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+# __apply_patches
+%patch1 -p0
+# __end
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
+- Add markers for autoupdate of spec file
+- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)
+
 * Wed Sep 16 2009 Petr Machata <pmachata at redhat.com> - 2009m-1
 - Upstream 2009m
   - Palestine will will revert back to winter time on Friday, 2009-09-04



From dnovotny at fedoraproject.org  Wed Sep 23 10:42:24 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 23 Sep 2009 10:42:24 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec, 1.137, 1.138 rpm-spec-mode.el, 1.11,
	1.12 rpm-spec-mode.patch, 1.1, 1.2
Message-ID: <20090923104225.023B911C00E6@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13921

Modified Files:
	emacs.spec rpm-spec-mode.el rpm-spec-mode.patch 
Log Message:
update rpm-spec-mode to latest upstream version (#524851)



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- emacs.spec	22 Sep 2009 08:57:39 -0000	1.137
+++ emacs.spec	23 Sep 2009 10:42:24 -0000	1.138
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -375,6 +375,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Sep 23 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-8
+- updated rpm-spec-mode.el to latest upstream version (#524851)
+
 * Tue Sep 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-7
 - updated %%info_files (#510750)
 


Index: rpm-spec-mode.el
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/rpm-spec-mode.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rpm-spec-mode.el	8 Nov 2008 08:11:23 -0000	1.11
+++ rpm-spec-mode.el	23 Sep 2009 10:42:24 -0000	1.12
@@ -63,7 +63,7 @@
 
 ;;; Code:
 
-(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.12.3x" "Version of `rpm-spec-mode'.")
 
 (defgroup rpm-spec nil
   "RPM spec mode with Emacs/XEmacs enhancements."
@@ -252,7 +252,7 @@ value returned by function `user-mail-ad
   (eval-when-compile
     (concat "^%"
             (regexp-opt
-             ;; From RPM 4.4.9 sources, file build/parseSpec.c: partList[].
+             ;; From RPM 4.6.0 sources, file build/parseSpec.c: partList[].
              '("build" "changelog" "check" "clean" "description" "files"
                "install" "package" "post" "postun" "pretrans" "posttrans"
                "pre" "prep" "preun" "trigger" "triggerin" "triggerpostun"
@@ -602,7 +602,7 @@ value returned by function `user-mail-ad
          '(1 'rpm-spec-tag-face))
    '("%\\(de\\(fine\\|scription\\)\\|files\\|global\\|package\\)[ \t]+\\([^-][^ \t\n]*\\)"
      (3 rpm-spec-package-face))
-   '("%p\\(ost\\|re\\)\\(un\\)?[ \t]+\\([^-][^ \t\n]*\\)"
+   '("%p\\(ost\\|re\\)\\(un\\|trans\\)?[ \t]+\\([^-][^ \t\n]*\\)"
      (3 rpm-spec-package-face))
    '("%configure " 0 rpm-spec-macro-face)
    '("%dir[ \t]+\\([^ \t\n]+\\)[ \t]*" 1 rpm-spec-dir-face)
@@ -1255,8 +1255,8 @@ See `search-forward-regexp'."
       (let ((str
              (progn
                (goto-char (point-min))
-               (search-forward-regexp (concat "^"
-                                       field ":[ \t]*\\(.*?\\)[ \t]*$") max)
+               (search-forward-regexp
+                (concat "^" field ":[ \t]*\\(.*?\\)[ \t]*$") max)
                (match-string 1))))
         ;; Try to expand macros
         (if (string-match "\\(%{?\\(\\?\\)?\\)\\([a-zA-Z0-9_]*\\)\\(}?\\)" str)
@@ -1299,7 +1299,7 @@ if one is present in the file."
     (let ((str
            (progn
              (goto-char (point-min))
-             (search-forward-regexp (concat "Release[ \t]*:[ \t]*\\(.+\\).*$") nil)
+             (search-forward-regexp "^Release[ \t]*:[ \t]*\\(.+\\).*$" nil)
              (match-string 1))))
       (let ((inrel
              (if (string-match "%{?\\([^}]*\\)}?$" str)

rpm-spec-mode.patch:
 rpm-spec-mode.el |   55 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 20 deletions(-)

Index: rpm-spec-mode.patch
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/rpm-spec-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpm-spec-mode.patch	23 Apr 2008 14:48:36 -0000	1.1
+++ rpm-spec-mode.patch	23 Sep 2009 10:42:24 -0000	1.2
@@ -4,10 +4,10 @@
  
  ;;; Code:
  
--(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
+-(defconst rpm-spec-mode-version "0.12.3x" "Version of `rpm-spec-mode'.")
 +(require 'compile)
 +
-+(defconst rpm-spec-mode-version "0.12.1x.rh1" "Version of `rpm-spec-mode'.")
++(defconst rpm-spec-mode-version "0.12.3x.rh1" "Version of `rpm-spec-mode'.")
  
  (defgroup rpm-spec nil
    "RPM spec mode with Emacs/XEmacs enhancements."



From pmachata at fedoraproject.org  Wed Sep 23 10:43:09 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 23 Sep 2009 10:43:09 +0000 (UTC)
Subject: rpms/tzdata/F-11 tzdata-2009m-karachi.patch, NONE, 1.1 tzdata.spec, 
	1.85, 1.86
Message-ID: <20090923104309.8085411C00E6@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14359

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009m-karachi.patch 
Log Message:
- Upstream 2009m
  - Palestine will will revert back to winter time on Friday, 2009-09-04
  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch


tzdata-2009m-karachi.patch:
 asia |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE tzdata-2009m-karachi.patch ---
diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia
--- tzdata2009m/asia~	2009-09-03 16:23:43.000000000 +0200
+++ tzdata2009m/asia	2009-09-18 13:14:26.000000000 +0200
@@ -1674,8 +1674,14 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # advance clocks in the country by one hour from April 15 to
 # conserve energy"
 
-# From Arthur David Olson (2009-04-10):
-# Assume for now that Pakistan will end DST in 2009 as it did in 2008.
+# From Steffen Thorsen (2009-09-17):
+# "The News International", Pakistan reports that: "The Federal
+# Government has decided to restore the previous time by moving the
+# clocks backward by one hour from October 1. A formal announcement to
+# this effect will be made after the Prime Minister grants approval in
+# this regard."  <a href="http://www.thenews.com.pk/updates.asp?id=87168">
+# http://www.thenews.com.pk/updates.asp?id=87168
+# </a>
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
@@ -1683,7 +1689,7 @@ Rule Pakistan	2002	only	-	Oct	Sun>=2	0:0
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Oct	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Diff finished.  Fri Sep 18 13:14:30 2009


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/tzdata.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- tzdata.spec	16 Sep 2009 12:12:51 -0000	1.85
+++ tzdata.spec	23 Sep 2009 10:43:09 -0000	1.86
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2009m
-%define tzdata_version %{version}
+%define tzdata_version 2009m
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,9 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+# __decl_patches
+Patch1: tzdata-2009m-karachi.patch
+# __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +50,9 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+# __apply_patches
+%patch1 -p0
+# __end
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
+- Add markers for autoupdate of spec file
+- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)
+
 * Wed Sep 16 2009 Petr Machata <pmachata at redhat.com> - 2009m-1
 - Upstream 2009m
   - Palestine will will revert back to winter time on Friday, 2009-09-04



From pmachata at fedoraproject.org  Wed Sep 23 10:44:02 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 23 Sep 2009 10:44:02 +0000 (UTC)
Subject: rpms/tzdata/F-10 tzdata-2009m-karachi.patch, NONE, 1.1 tzdata.spec, 
	1.81, 1.82
Message-ID: <20090923104402.F10E911C00E6@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14693

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009m-karachi.patch 
Log Message:
- Upstream 2009m
  - Palestine will will revert back to winter time on Friday, 2009-09-04
  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch


tzdata-2009m-karachi.patch:
 asia |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE tzdata-2009m-karachi.patch ---
diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia
--- tzdata2009m/asia~	2009-09-03 16:23:43.000000000 +0200
+++ tzdata2009m/asia	2009-09-18 13:14:26.000000000 +0200
@@ -1674,8 +1674,14 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # advance clocks in the country by one hour from April 15 to
 # conserve energy"
 
-# From Arthur David Olson (2009-04-10):
-# Assume for now that Pakistan will end DST in 2009 as it did in 2008.
+# From Steffen Thorsen (2009-09-17):
+# "The News International", Pakistan reports that: "The Federal
+# Government has decided to restore the previous time by moving the
+# clocks backward by one hour from October 1. A formal announcement to
+# this effect will be made after the Prime Minister grants approval in
+# this regard."  <a href="http://www.thenews.com.pk/updates.asp?id=87168">
+# http://www.thenews.com.pk/updates.asp?id=87168
+# </a>
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
@@ -1683,7 +1689,7 @@ Rule Pakistan	2002	only	-	Oct	Sun>=2	0:0
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Oct	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Diff finished.  Fri Sep 18 13:14:30 2009


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- tzdata.spec	16 Sep 2009 12:28:56 -0000	1.81
+++ tzdata.spec	23 Sep 2009 10:44:02 -0000	1.82
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2009m
-%define tzdata_version %{version}
+%define tzdata_version 2009m
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,9 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+# __decl_patches
+Patch1: tzdata-2009m-karachi.patch
+# __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +50,9 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+# __apply_patches
+%patch1 -p0
+# __end
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
+- Add markers for autoupdate of spec file
+- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)
+
 * Wed Sep 16 2009 Petr Machata <pmachata at redhat.com> - 2009m-1
 - Upstream 2009m
   - Palestine will will revert back to winter time on Friday, 2009-09-04



From plautrba at fedoraproject.org  Wed Sep 23 10:53:50 2009
From: plautrba at fedoraproject.org (Petr Lautrbach)
Date: Wed, 23 Sep 2009 10:53:50 +0000 (UTC)
Subject: rpms/tuned/devel import.log, 1.2, 1.3 sources, 1.8, 1.9 tuned.spec, 
	1.8, 1.9
Message-ID: <20090923105350.1C69011C00E6@cvs1.fedora.phx.redhat.com>

Author: plautrba

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17647/devel

Modified Files:
	import.log sources tuned.spec 
Log Message:
update



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 13:44:37 -0000	1.2
+++ import.log	23 Sep 2009 10:53:48 -0000	1.3
@@ -1,2 +1,3 @@
 tuned-0_1_3-1_fc10:HEAD:tuned-0.1.3-1.fc10.src.rpm:1236074130
 tuned-0_2_4-1_fc11:HEAD:tuned-0.2.4-1.fc11.src.rpm:1253540639
+tuned-0_2_4-2_fc11:HEAD:tuned-0.2.4-2.fc11.src.rpm:1253703144


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Sep 2009 13:44:37 -0000	1.8
+++ sources	23 Sep 2009 10:53:48 -0000	1.9
@@ -1 +1 @@
-6bb707fcd605165099d7b74bcbbb2a32  tuned-0.2.4.tar.bz2
+93221808d466ab62133a2f010ce0f292  tuned-0.2.4.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tuned.spec	21 Sep 2009 13:44:37 -0000	1.8
+++ tuned.spec	23 Sep 2009 10:53:48 -0000	1.9
@@ -1,17 +1,17 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 0.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
 # following commands to get the corresponding tarball:
-#  git clone git://fedorapeople.org/~pknirsch/tuned.git/
+#  git clone git://git.fedorahosted.org/git/tuned.git
 #  cd tuned
 #  git checkout v%{version}
 #  make archive
 Source: tuned-%{version}.tar.bz2
-URL: http://fedorapeople.org/~pknirsch/git/tuned.git/
+URL: https://fedorahosted.org/tuned/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -97,6 +97,10 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.4-2
+- fixed url to fedorahosted project page
+- Resolves: #519019
+
 * Mon Sep 21 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.4-1
 - Update release to tuned-0.2.4
 - Resolves: #523385



From mgrepl at fedoraproject.org  Wed Sep 23 10:59:41 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed, 23 Sep 2009 10:59:41 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.420,
	1.421 policycoreutils.spec, 1.619, 1.620
Message-ID: <20090923105941.AEAC611C00E6@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19997

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
- Fix for setfiles leaks descriptors from Steve Grubb



policycoreutils-rhat.patch:
 Makefile                     |    2 
 audit2allow/audit2allow      |    1 
 debugfiles.list              |   64 ++++++++
 debuglinks.list              |   29 ++++
 restorecond/restorecond.conf |    4 
 scripts/chcat                |   16 +-
 scripts/fixfiles             |    6 
 semanage/semanage            |   63 +++++++-
 semanage/semanage.8          |    2 
 semanage/seobject.py         |  310 +++++++++++++++++++++++++++++--------------
 setfiles/setfiles.c          |   10 -
 11 files changed, 383 insertions(+), 124 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- policycoreutils-rhat.patch	14 May 2009 13:04:57 -0000	1.420
+++ policycoreutils-rhat.patch	23 Sep 2009 10:59:40 -0000	1.421
@@ -1256,3 +1256,15 @@ diff -up policycoreutils-2.0.62/semanage
  		return ddict
  
  	def get_all_by_type(self, locallist = 0):
+diff -up policycoreutils-2.0.62/setfiles/setfiles.c~ policycoreutils-2.0.62/setfiles/setfiles.c
+--- policycoreutils-2.0.62/setfiles/setfiles.c~	2009-09-09 16:50:37.000000000 +0200
++++ policycoreutils-2.0.62/setfiles/setfiles.c	2009-09-09 16:51:23.000000000 +0200
+@@ -683,6 +683,8 @@ static int process_one(char *name)
+ 				progname, name, strerror(errno));
+ 			goto err;
+ 		}
++		close(pipe_fds[0]);
++		pipe_fds[0] = -1;
+ 	} else {
+ 		rc = restore(name);
+ 		if (rc)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -p -r1.619 -r1.620
--- policycoreutils.spec	26 Jun 2009 18:45:40 -0000	1.619
+++ policycoreutils.spec	23 Sep 2009 10:59:41 -0000	1.620
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 12.12%{?dist}
+Release: 12.13%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -225,6 +225,9 @@ else
 fi
 
 %changelog
+* Wed Sep 23 2009 Miroslav Grepl <mgrepl at redhat.com> 2.0.62-12.13
+- Fix for setfiles leaks descriptors from Steve Grubb
+
 * Fri Jun 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.12
 - Fix polgen.py 
 



From wolfy at fedoraproject.org  Wed Sep 23 11:02:50 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 23 Sep 2009 11:02:50 +0000 (UTC)
Subject: rpms/cfv/F-10 cfv.spec,1.8,1.9
Message-ID: <20090923110250.3F5E511C00E6@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/cfv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21151

Modified Files:
	cfv.spec 
Log Message:
* Sun Sep 20 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.3-1
- new upstream version, fixing md5 and sha module deprecation warnings.



Index: cfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/F-10/cfv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cfv.spec	2 Aug 2008 10:14:50 -0000	1.8
+++ cfv.spec	23 Sep 2009 11:02:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           cfv
-Version:        1.18.2
-Release:        2%{?dist}
+Version:        1.18.3
+Release:        1%{?dist}
 Summary:        A utility to test and create data verification files
 
 Group:          Applications/Archiving
@@ -48,6 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.3-1
+- new upstream version, fixing md5 and sha module deprecation warnings.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Aug 02 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.2-2
 - replace "dl" with "downloads" in %%Source0
 - rectify date of the previous changelog



From wolfy at fedoraproject.org  Wed Sep 23 11:05:01 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 23 Sep 2009 11:05:01 +0000 (UTC)
Subject: rpms/cfv/F-10 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090923110501.60E3711C00E6@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/cfv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22256

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Sep 20 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.3-1
- new upstream version, fixing md5 and sha module deprecation warnings.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2008 22:08:12 -0000	1.3
+++ .cvsignore	23 Sep 2009 11:05:00 -0000	1.4
@@ -1 +1 @@
-cfv-1.18.2.tar.gz
+cfv-1.18.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2008 22:08:12 -0000	1.3
+++ sources	23 Sep 2009 11:05:00 -0000	1.4
@@ -1 +1 @@
-775d8001228c5ba6549825318f906d26  cfv-1.18.2.tar.gz
+1be9039c2ab859103d70b6c4f4e5edf5  cfv-1.18.3.tar.gz



From wolfy at fedoraproject.org  Wed Sep 23 11:06:05 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 23 Sep 2009 11:06:05 +0000 (UTC)
Subject: rpms/cfv/F-11 .cvsignore,1.3,1.4 cfv.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <20090923110605.ECD8811C00E6@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/cfv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22549

Modified Files:
	.cvsignore cfv.spec sources 
Log Message:
* Sun Sep 20 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.3-1
- new upstream version, fixing md5 and sha module deprecation warnings.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2008 22:08:12 -0000	1.3
+++ .cvsignore	23 Sep 2009 11:06:05 -0000	1.4
@@ -1 +1 @@
-cfv-1.18.2.tar.gz
+cfv-1.18.3.tar.gz


Index: cfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/F-11/cfv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cfv.spec	24 Feb 2009 07:09:15 -0000	1.9
+++ cfv.spec	23 Sep 2009 11:06:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           cfv
-Version:        1.18.2
-Release:        3%{?dist}
+Version:        1.18.3
+Release:        1%{?dist}
 Summary:        A utility to test and create data verification files
 
 Group:          Applications/Archiving
@@ -48,6 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.18.3-1
+- new upstream version, fixing md5 and sha module deprecation warnings.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cfv/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2008 22:08:12 -0000	1.3
+++ sources	23 Sep 2009 11:06:05 -0000	1.4
@@ -1 +1 @@
-775d8001228c5ba6549825318f906d26  cfv-1.18.2.tar.gz
+1be9039c2ab859103d70b6c4f4e5edf5  cfv-1.18.3.tar.gz



From markmc at fedoraproject.org  Wed Sep 23 11:31:33 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 23 Sep 2009 11:31:33 +0000 (UTC)
Subject: rpms/qemu/devel qemu-correctly-free-nic-info-structure.patch, NONE, 
	1.1 qemu.spec, 1.130, 1.131
Message-ID: <20090923113133.E520E11C00E6@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31800

Modified Files:
	qemu.spec 
Added Files:
	qemu-correctly-free-nic-info-structure.patch 
Log Message:
* Wed Sep 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-5
- Fix issue causing NIC hotplug confusion when no model is specified (#524022)


qemu-correctly-free-nic-info-structure.patch:
 net.c |   16 +++++++++++-----
 net.h |    8 ++++----
 vl.c  |    3 +--
 3 files changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE qemu-correctly-free-nic-info-structure.patch ---
>From 2b76390876db26fb279d26de86b2c0b8260ff142 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Wed, 23 Sep 2009 09:49:43 +0100
Subject: [PATCH] Correctly free nd structure

When we "free" a NICInfo structure, we can leak pointers, since we don't do
much more than setting used = 0.

We free() the model parameter, but we don't set it to NULL. This means that
a new user of this structure will see garbage in there. It was not noticed
before because reusing a NICInfo is not that common, but it can be, for
users of device pci hotplug.

A user hit it, described at https://bugzilla.redhat.com/524022

This patch memset's the whole structure, guaranteeing that anyone reusing it
will see a fresh NICinfo. Also, we free some other strings that are currently
leaking.

This codebase is quite old, so this patch should feed all stable trees.

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-correctly-free-nic-info-structure.patch
---
 net.c |   16 +++++++++++-----
 net.h |    8 ++++----
 vl.c  |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/net.c b/net.c
index 61c9649..b58945f 100644
--- a/net.c
+++ b/net.c
@@ -2564,7 +2564,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
     int i, exit_status = 0;
 
     if (!nd->model)
-        nd->model = strdup(default_model);
+        nd->model = qemu_strdup(default_model);
 
     if (strcmp(nd->model, "?") != 0) {
         for (i = 0 ; models[i]; i++)
@@ -2634,6 +2634,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
             goto out;
         }
         nd = &nd_table[idx];
+        memset(nd, 0, sizeof(*nd));
         macaddr = nd->macaddr;
         macaddr[0] = 0x52;
         macaddr[1] = 0x54;
@@ -2650,13 +2651,13 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
             }
         }
         if (get_param_value(buf, sizeof(buf), "model", p)) {
-            nd->model = strdup(buf);
+            nd->model = qemu_strdup(buf);
         }
         if (get_param_value(buf, sizeof(buf), "addr", p)) {
-            nd->devaddr = strdup(buf);
+            nd->devaddr = qemu_strdup(buf);
         }
         if (get_param_value(buf, sizeof(buf), "id", p)) {
-            nd->id = strdup(buf);
+            nd->id = qemu_strdup(buf);
         }
         nd->nvectors = NIC_NVECTORS_UNSPECIFIED;
         if (get_param_value(buf, sizeof(buf), "vectors", p)) {
@@ -3003,8 +3004,13 @@ void net_client_uninit(NICInfo *nd)
 {
     nd->vlan->nb_guest_devs--;
     nb_nics--;
+
+    qemu_free(nd->model);
+    qemu_free(nd->name);
+    qemu_free(nd->devaddr);
+    qemu_free(nd->id);
+
     nd->used = 0;
-    free((void *)nd->model);
 }
 
 static int net_host_check_device(const char *device)
diff --git a/net.h b/net.h
index b172691..ec78d0a 100644
--- a/net.h
+++ b/net.h
@@ -100,10 +100,10 @@ enum {
 
 struct NICInfo {
     uint8_t macaddr[6];
-    const char *model;
-    const char *name;
-    const char *devaddr;
-    const char *id;
+    char *model;
+    char *name;
+    char *devaddr;
+    char *id;
     VLANState *vlan;
     VLANClientState *vc;
     void *private;
diff --git a/vl.c b/vl.c
index 26bced8..d7c7ab1 100644
--- a/vl.c
+++ b/vl.c
@@ -2594,7 +2594,7 @@ static int usb_device_add(const char *devname, int is_hotplug)
 
         if (net_client_init(NULL, "nic", p) < 0)
             return -1;
-        nd_table[nic].model = "usb";
+        nd_table[nic].model = qemu_strdup("usb");
         dev = usb_net_init(&nd_table[nic]);
     } else if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
         dev = usb_bt_init(devname[2] ? hci_init(p) :
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- qemu.spec	16 Sep 2009 22:20:32 -0000	1.130
+++ qemu.spec	23 Sep 2009 11:31:31 -0000	1.131
@@ -3,7 +3,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.92
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -44,6 +44,9 @@ Patch05: qemu-fix-msix-error-handling-on
 # Fix segfault when qemu-kvm is invoked inside a VM (bug #516543)
 Patch06: qemu-fix-no-kvm-segfault.patch
 
+# Fix issue causing NIC hotplug confusion when no model is specified (#524022)
+Patch07: qemu-correctly-free-nic-info-structure.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -233,6 +236,7 @@ such as kvmtrace and kvm_stat.
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -526,6 +530,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Sep 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-5
+- Fix issue causing NIC hotplug confusion when no model is specified (#524022)
+
 * Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-4
 - Fix for KSM patch from Justin Forbes
 



From salimma at fedoraproject.org  Wed Sep 23 11:35:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 23 Sep 2009 11:35:27 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/EL-5
	gnome-applet-window-picker.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923113527.C211D11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1321/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-window-picker.spec 
Log Message:
Initial import of gnome-applet-window-picker



--- NEW FILE gnome-applet-window-picker.spec ---
%global upname  window-picker-applet

Name:		gnome-applet-window-picker
Version:	0.5.6
Release:	2%{?dist}
Summary:	Window picker applet for GNOME

Group:		User Interface/Desktops
License:	GPLv3
URL:		https://launchpad.net/window-picker-applet
Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gnome-panel-devel
BuildRequires:	libwnck-devel
BuildRequires:  intltool
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

# upstream name; we provide it to help people installing with yum
Provides:       %{upname} = %{version}-%{release}

%description
A gnome-panel applet that displays open windows as icons on the panel,
and has integrated window title-bar functionality. Optimised for use
on netbook-size screens.

%prep
%setup -q -n %{upname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{upname}


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
%{_libdir}/bonobo/servers/GNOME_WindowPicker.server
%{_libexecdir}/%{upname}

%changelog
* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
- Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.23-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:35:21 -0000	1.1
+++ .cvsignore	23 Sep 2009 11:35:27 -0000	1.2
@@ -0,0 +1 @@
+window-picker-applet-0.5.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:35:21 -0000	1.1
+++ sources	23 Sep 2009 11:35:27 -0000	1.2
@@ -0,0 +1 @@
+aeda4b063a0233920b0186bca4495fef  window-picker-applet-0.5.6.tar.gz



From salimma at fedoraproject.org  Wed Sep 23 11:35:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 23 Sep 2009 11:35:28 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-10
	gnome-applet-window-picker.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923113528.3A26611C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1321/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-window-picker.spec 
Log Message:
Initial import of gnome-applet-window-picker



--- NEW FILE gnome-applet-window-picker.spec ---
%global upname  window-picker-applet

Name:		gnome-applet-window-picker
Version:	0.5.6
Release:	2%{?dist}
Summary:	Window picker applet for GNOME

Group:		User Interface/Desktops
License:	GPLv3
URL:		https://launchpad.net/window-picker-applet
Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gnome-panel-devel
BuildRequires:	libwnck-devel
BuildRequires:  intltool
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

# upstream name; we provide it to help people installing with yum
Provides:       %{upname} = %{version}-%{release}

%description
A gnome-panel applet that displays open windows as icons on the panel,
and has integrated window title-bar functionality. Optimised for use
on netbook-size screens.

%prep
%setup -q -n %{upname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{upname}


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
%{_libdir}/bonobo/servers/GNOME_WindowPicker.server
%{_libexecdir}/%{upname}

%changelog
* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
- Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.23-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:35:21 -0000	1.1
+++ .cvsignore	23 Sep 2009 11:35:27 -0000	1.2
@@ -0,0 +1 @@
+window-picker-applet-0.5.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:35:21 -0000	1.1
+++ sources	23 Sep 2009 11:35:28 -0000	1.2
@@ -0,0 +1 @@
+aeda4b063a0233920b0186bca4495fef  window-picker-applet-0.5.6.tar.gz



From salimma at fedoraproject.org  Wed Sep 23 11:35:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 23 Sep 2009 11:35:29 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/devel
	gnome-applet-window-picker.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923113529.0802011C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-window-picker.spec 
Log Message:
Initial import of gnome-applet-window-picker



--- NEW FILE gnome-applet-window-picker.spec ---
%global upname  window-picker-applet

Name:		gnome-applet-window-picker
Version:	0.5.6
Release:	2%{?dist}
Summary:	Window picker applet for GNOME

Group:		User Interface/Desktops
License:	GPLv3
URL:		https://launchpad.net/window-picker-applet
Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gnome-panel-devel
BuildRequires:	libwnck-devel
BuildRequires:  intltool
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

# upstream name; we provide it to help people installing with yum
Provides:       %{upname} = %{version}-%{release}

%description
A gnome-panel applet that displays open windows as icons on the panel,
and has integrated window title-bar functionality. Optimised for use
on netbook-size screens.

%prep
%setup -q -n %{upname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{upname}


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
%{_libdir}/bonobo/servers/GNOME_WindowPicker.server
%{_libexecdir}/%{upname}

%changelog
* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
- Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.23-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:35:21 -0000	1.1
+++ .cvsignore	23 Sep 2009 11:35:28 -0000	1.2
@@ -0,0 +1 @@
+window-picker-applet-0.5.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:35:21 -0000	1.1
+++ sources	23 Sep 2009 11:35:28 -0000	1.2
@@ -0,0 +1 @@
+aeda4b063a0233920b0186bca4495fef  window-picker-applet-0.5.6.tar.gz



From salimma at fedoraproject.org  Wed Sep 23 11:35:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 23 Sep 2009 11:35:28 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-11
	gnome-applet-window-picker.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923113528.968ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1321/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-window-picker.spec 
Log Message:
Initial import of gnome-applet-window-picker



--- NEW FILE gnome-applet-window-picker.spec ---
%global upname  window-picker-applet

Name:		gnome-applet-window-picker
Version:	0.5.6
Release:	2%{?dist}
Summary:	Window picker applet for GNOME

Group:		User Interface/Desktops
License:	GPLv3
URL:		https://launchpad.net/window-picker-applet
Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gnome-panel-devel
BuildRequires:	libwnck-devel
BuildRequires:  intltool
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

# upstream name; we provide it to help people installing with yum
Provides:       %{upname} = %{version}-%{release}

%description
A gnome-panel applet that displays open windows as icons on the panel,
and has integrated window title-bar functionality. Optimised for use
on netbook-size screens.

%prep
%setup -q -n %{upname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{upname}


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
%{_libdir}/bonobo/servers/GNOME_WindowPicker.server
%{_libexecdir}/%{upname}

%changelog
* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
- Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.23-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:35:21 -0000	1.1
+++ .cvsignore	23 Sep 2009 11:35:28 -0000	1.2
@@ -0,0 +1 @@
+window-picker-applet-0.5.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:35:21 -0000	1.1
+++ sources	23 Sep 2009 11:35:28 -0000	1.2
@@ -0,0 +1 @@
+aeda4b063a0233920b0186bca4495fef  window-picker-applet-0.5.6.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:35 +0000
Subject: [pkgdb] dstat: jzeleny has requested watchbugzilla
Message-ID: <20090923114335.900E310F87C@bastion2.fedora.phx.redhat.com>

jzeleny has requested the watchbugzilla acl on dstat (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:40 +0000
Subject: [pkgdb] dstat: jzeleny has requested watchcommits
Message-ID: <20090923114340.9D82310F884@bastion2.fedora.phx.redhat.com>

jzeleny has requested the watchcommits acl on dstat (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:41 +0000
Subject: [pkgdb] dstat: jzeleny has requested commit
Message-ID: <20090923114341.54E4910F890@bastion2.fedora.phx.redhat.com>

jzeleny has requested the commit acl on dstat (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:41 +0000
Subject: [pkgdb] dstat: jzeleny has requested approveacls
Message-ID: <20090923114341.BCB3510F89B@bastion2.fedora.phx.redhat.com>

jzeleny has requested the approveacls acl on dstat (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:55 +0000
Subject: [pkgdb] dstat: jzeleny has requested watchbugzilla
Message-ID: <20090923114355.9E63010F87C@bastion2.fedora.phx.redhat.com>

jzeleny has requested the watchbugzilla acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:56 +0000
Subject: [pkgdb] dstat: jzeleny has requested approveacls
Message-ID: <20090923114356.78C8F10F89D@bastion2.fedora.phx.redhat.com>

jzeleny has requested the approveacls acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:43:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:43:56 +0000
Subject: [pkgdb] dstat: jzeleny has requested commit
Message-ID: <20090923114356.A3EA610F889@bastion2.fedora.phx.redhat.com>

jzeleny has requested the commit acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Wed Sep 23 11:44:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 11:44:01 +0000
Subject: [pkgdb] dstat: jzeleny has requested watchcommits
Message-ID: <20090923114401.66A7D10F89F@bastion2.fedora.phx.redhat.com>

jzeleny has requested the watchcommits acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pbrobinson at fedoraproject.org  Wed Sep 23 11:48:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 23 Sep 2009 11:48:06 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.5, 1.6 anjal.spec, 1.6, 1.7 sources, 
	1.5, 1.6
Message-ID: <20090923114806.32D1711C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6894

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- New git snapshot to pull in lots of new translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Sep 2009 11:55:11 -0000	1.5
+++ .cvsignore	23 Sep 2009 11:48:04 -0000	1.6
@@ -1 +1 @@
-anjal-0.1.0-20090913.tar.bz2
+anjal-0.1.0-20090923.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- anjal.spec	13 Sep 2009 11:55:12 -0000	1.6
+++ anjal.spec	23 Sep 2009 11:48:04 -0000	1.7
@@ -2,14 +2,14 @@
 # git clone git://git.gnome.org/anjal
 # git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090913
-%define git_version d0a14f2
+%define gitdate 20090923
+%define git_version 89078ae
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.9.%{snapshot}%{?dist}
+Release:        0.10.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/anjal.desktop
 
 %changelog
+* Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.10
+- New git snapshot to pull in lots of new translations
+
 * Sun Sep 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.9
 - New git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Sep 2009 11:55:12 -0000	1.5
+++ sources	23 Sep 2009 11:48:04 -0000	1.6
@@ -1 +1 @@
-251fe60f20ec3d975ec52d636c4fa6a2  anjal-0.1.0-20090913.tar.bz2
+80250f5961750a81bad6a3536a1605a4  anjal-0.1.0-20090923.tar.bz2



From mbarnes at fedoraproject.org  Wed Sep 23 11:58:12 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 23 Sep 2009 11:58:12 +0000 (UTC)
Subject: rpms/openchange/devel openchange.spec,1.9,1.10
Message-ID: <20090923115812.EB03011C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/openchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11406

Modified Files:
	openchange.spec 
Log Message:

* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-5
- Rebuild.



Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openchange.spec	25 Jul 2009 20:45:30 -0000	1.9
+++ openchange.spec	23 Sep 2009 11:58:12 -0000	1.10
@@ -10,7 +10,7 @@
 
 Name: openchange
 Version: 0.8.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -153,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mapistore_backends/mapistore_sqlite3.so
 
 %changelog
+* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-5
+- Rebuild.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pvrabec at fedoraproject.org  Wed Sep 23 12:15:47 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 23 Sep 2009 12:15:47 +0000 (UTC)
Subject: rpms/netlabel_tools/devel netlabel, 1.1, 1.2 netlabel_tools.spec,
	1.16, 1.17
Message-ID: <20090923121547.584C311C00E6@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20074

Modified Files:
	netlabel netlabel_tools.spec 
Log Message:
make initscript LSB compliant (#522818)



Index: netlabel
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netlabel	16 Oct 2006 20:37:32 -0000	1.1
+++ netlabel	23 Sep 2009 12:15:46 -0000	1.2
@@ -69,7 +69,7 @@ status() {
     # Do not print status if lockfile is missing 
     if [ ! -f "$VAR_SUBSYS_NETLABEL" ]; then
 	echo $"Netlabel is stopped."
-	return 7
+	return 3
     fi
 
     # List rules
@@ -79,7 +79,7 @@ status() {
     ret2="$?"
 
     if [ "$ret1" != "0" -o "$ret2" != "0" ] ; then
-	return 1
+	return 2
     fi
     return 0
 }


Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- netlabel_tools.spec	23 Sep 2009 09:26:19 -0000	1.16
+++ netlabel_tools.spec	23 Sep 2009 12:15:46 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://netlabel.sf.net/
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.19-6
+- make initscript LSB compliant (#522818)
+
 * Wed Sep 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.19-5
 - increase rel. number
 



From epienbro at fedoraproject.org  Wed Sep 23 12:20:37 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 23 Sep 2009 12:20:37 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel mingw32-glib2.spec,1.18,1.19
Message-ID: <20090923122037.BC7AF11C0418@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21386

Modified Files:
	mingw32-glib2.spec 
Log Message:
Stupid typo..



Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mingw32-glib2.spec	23 Sep 2009 05:32:25 -0000	1.18
+++ mingw32-glib2.spec	23 Sep 2009 12:20:37 -0000	1.19
@@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT/build_static
 rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 
 # Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs
-rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb
 
 # Remove the gtk-doc documentation and manpages which duplicate Fedora native
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}



From sharkcz at fedoraproject.org  Wed Sep 23 12:29:39 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Sep 2009 12:29:39 +0000 (UTC)
Subject: rpms/cdcollect/devel cdcollect.spec,1.6,1.7
Message-ID: <20090923122939.5F17611C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24258

Modified Files:
	cdcollect.spec 
Log Message:
* Wed Sep 23 2009 Dan Horak <dan[at]danny.cz> 0.6.0-9
- drop ExcludeArch for ppc64



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/cdcollect.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cdcollect.spec	24 Jul 2009 18:43:19 -0000	1.6
+++ cdcollect.spec	23 Sep 2009 12:29:38 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -11,7 +11,6 @@ License:	GPLv2+
 URL:		http://cdcollect.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:	ppc64
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
 
@@ -92,6 +91,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Dan Horak <dan[at]danny.cz> 0.6.0-9
+- drop ExcludeArch for ppc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Wed Sep 23 12:32:37 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Sep 2009 12:32:37 +0000 (UTC)
Subject: rpms/cdcollect/F-11 cdcollect.spec,1.5,1.6
Message-ID: <20090923123237.131C611C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25304

Modified Files:
	cdcollect.spec 
Log Message:
* Wed Sep 23 2009 Dan Horak <dan[at]danny.cz> 0.6.0-8
- drop ExcludeArch for ppc64



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-11/cdcollect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cdcollect.spec	24 Feb 2009 06:45:09 -0000	1.5
+++ cdcollect.spec	23 Sep 2009 12:32:36 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -11,7 +11,6 @@ License:	GPLv2+
 URL:		http://cdcollect.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:	ppc64
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
 
@@ -92,6 +91,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Dan Horak <dan[at]danny.cz> 0.6.0-8
+- drop ExcludeArch for ppc64
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Wed Sep 23 12:47:07 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 23 Sep 2009 12:47:07 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.3.2-plasmaCrash.patch, 
	NONE, 1.1 kdebase-workspace.spec, 1.191, 1.192
Message-ID: <20090923124707.B439611C00E6@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-serv29849/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
fix plasma crasher


kdebase-workspace-4.3.2-plasmaCrash.patch:
 tasks.cpp |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.3.2-plasmaCrash.patch ---
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019864)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019865)
@@ -76,6 +76,9 @@
 {
     //kDebug();
 
+    const KConfigGroup cg = config();
+    m_showTooltip = cg.readEntry("showTooltip", true);
+
     m_groupManager = new TaskManager::GroupManager(this);
     Plasma::Containment* appletContainment = containment();
     if (appletContainment) {
@@ -117,13 +120,10 @@
 
     setLayout(layout);
 
-    KConfigGroup cg = config();
-
     m_groupManager->setShowOnlyCurrentDesktop( cg.readEntry("showOnlyCurrentDesktop", false));
     m_groupManager->setShowOnlyCurrentScreen( cg.readEntry("showOnlyCurrentScreen", false));
     m_groupManager->setShowOnlyMinimized( cg.readEntry("showOnlyMinimized", false));
     m_groupManager->setOnlyGroupWhenFull(cg.readEntry("groupWhenFull", true));
-    m_showTooltip = cg.readEntry("showTooltip", true);
 
     m_groupManager->setGroupingStrategy( static_cast<TaskManager::GroupManager::TaskGroupingStrategy>(cg.readEntry("groupingStrategy", static_cast<int>(TaskManager::GroupManager::ProgramGrouping))));
 
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019867)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019868)
@@ -51,6 +51,10 @@
        m_topMargin(0),
        m_rightMargin(0),
        m_bottomMargin(0),
+       m_offscreenLeftMargin(0),
+       m_offscreenTopMargin(0),
+       m_offscreenRightMargin(0),
+       m_offscreenBottomMargin(0),
        m_rootGroupItem(0),
        m_groupManager(0),
        m_groupModifierKey(Qt::AltModifier)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- kdebase-workspace.spec	1 Sep 2009 13:05:18 -0000	1.191
+++ kdebase-workspace.spec	23 Sep 2009 12:47:06 -0000	1.192
@@ -1,3 +1,6 @@
+%if 0%{?fedora} && 0%{?fedora} < 12
+%define with_polkit_09 1
+%endif
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -5,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 1%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -31,25 +34,24 @@ Patch16: kdebase-workspace-4.3.0-battery
 
 # upstream patches:
 # 4.3 branch
+Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
+%if 0%{?with_polkit_09}
 Requires: PolicyKit-authentication-agent
-
-# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
-%if 0%{?fedora} == 9
-# upgrade path: kdebase(3) -> kdebase-workspace
-Obsoletes: kdebase < 6:4
-# so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
-Requires: kdebase4
+%else
+Obsoletes: PolicyKit-kde < %{version}-%{release}
+# if/when we actually create this one:
+#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+Obsoletes: polkit-qt < 0.10
 %endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
-
 %if 0%{?fedora} > 10
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
@@ -71,10 +73,14 @@ BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
+%ifnarch s390 s390x
 BuildRequires: lm_sensors-devel
+%endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+%if 0%{?with_polkit_09}
 BuildRequires: polkit-qt-devel
+%endif
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
@@ -91,7 +97,7 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 || 0%{?rhel} < 6
 Requires: kdm = %{version}-%{release}
 %endif
 Requires: ksysguardd = %{version}-%{release}
@@ -103,20 +109,21 @@ Requires: xorg-x11-apps
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
+%define default_face_icon default1.png
+
 %if 0%{?fedora} == 10
 %define default_face_icon default_solar.png
 Requires: solar-kde-theme
-%else
+%endif
+
 %if 0%{?fedora} == 11
 %define default_face_icon default_leonidas.png
 Requires: leonidas-kde-theme
-%else
-%define default_face_icon default1.png
-%endif
 %endif
 
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
 Requires: system-backgrounds-kde
+Requires: system-ksplash-theme
 %endif
 
 Requires: kio_sysinfo
@@ -160,9 +167,7 @@ Requires: %{name} = %{version}-%{release
 Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%if 0%{?fedora} > 9 
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -186,9 +191,7 @@ Group:   System Environment/Daemons
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n oxygen-cursor-themes
 %{summary}.
 
@@ -198,9 +201,21 @@ Group: System Environment/Libraries
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
 Provides: PolicyKit-authentication-agent
+# when -libs was born
+#Obsoletes: PolicyKit-kde < 4.3.1-4
+#Requires: PolicyKit-kde-libs%{?_isa} = %{version}-%{release}
 %description -n PolicyKit-kde
 This package provides a PolicyKit Authentication Frontend for KDE
 
+# maybe for 4.3.1-4 ? -- Rex
+%package -n PolicyKit-kde-libs
+Summary: Runtime libraries for PolicyKit-kde 
+Group:   System Environment/Libraries
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: PolicyKit-kde = %{version}-%{release}
+%description -n PolicyKit-kde-libs
+%{summary}.
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -211,6 +226,7 @@ Requires: %{name} = %{version}-%{release
 %package python-applet
 Summary: Plasma widget in Python
 Group: User Interface/Desktops
+Provides: plasma-scriptengine-python = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: PyKDE4 >= %{version}
 %description python-applet
@@ -247,6 +263,8 @@ Requires: akonadi
 %patch16 -p1 -b .showremainingtime
 
 # upstream patches
+%patch100 -p5 -b .plasmaCrash
+
 
 %build
 
@@ -272,8 +290,7 @@ make install/fast DESTDIR=%{buildroot} -
 mkdir -p %{buildroot}%{_datadir}/xsessions/
 ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
 
-# FIXME/TODO: provide kdm config in kde-settings(-kdm)
-# nuke, use external kde-config-kdm
+# nuke, use external kde-settings-kdm
 rm -rf  %{buildroot}%{_kde4_configdir}/kdm
 
 # own %{_kde4_appsdir}/kdm/faces and set default user image
@@ -400,7 +417,6 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
-%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -410,8 +426,6 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
-%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
-%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -429,7 +443,6 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
-%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -474,11 +487,20 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 %exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
+%if 0%{?with_polkit_09}
+# PolicyKit-kde
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%endif
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%if 0%{?with_polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -540,10 +562,10 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%if 0%{?with_polkit_09}
 %files -n PolicyKit-kde
 %defattr(-,root,root,-)
 %{_kde4_bindir}/polkit-kde-authorization
-%{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
@@ -553,6 +575,7 @@ fi
 #files -n PolicyKit-kde-libs
 #defattr(-,root,root,-)
 %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
 
 %files python-applet
 %defattr(-,root,root,-)
@@ -569,6 +592,19 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-5
+- fix spontaneous Plasma crashes due to uninitialized vars
+
+* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
+
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- -python-applet: Provides: plasma-scriptengine-python
+- Requires: system-ksplash-theme (f12+,rhel6+)
+
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- drop  BR: lm_sensors-devel on s390(x)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - drop Requires: kde-plasma-folderview, rely on comps instead



From ltinkl at fedoraproject.org  Wed Sep 23 12:47:07 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 23 Sep 2009 12:47:07 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.3.2-plasmaCrash.patch, 
	NONE, 1.1 kdebase-workspace.spec, 1.241, 1.242
Message-ID: <20090923124707.E119A11C00EB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29849/F-11

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
fix plasma crasher


kdebase-workspace-4.3.2-plasmaCrash.patch:
 tasks.cpp |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.3.2-plasmaCrash.patch ---
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019864)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019865)
@@ -76,6 +76,9 @@
 {
     //kDebug();
 
+    const KConfigGroup cg = config();
+    m_showTooltip = cg.readEntry("showTooltip", true);
+
     m_groupManager = new TaskManager::GroupManager(this);
     Plasma::Containment* appletContainment = containment();
     if (appletContainment) {
@@ -117,13 +120,10 @@
 
     setLayout(layout);
 
-    KConfigGroup cg = config();
-
     m_groupManager->setShowOnlyCurrentDesktop( cg.readEntry("showOnlyCurrentDesktop", false));
     m_groupManager->setShowOnlyCurrentScreen( cg.readEntry("showOnlyCurrentScreen", false));
     m_groupManager->setShowOnlyMinimized( cg.readEntry("showOnlyMinimized", false));
     m_groupManager->setOnlyGroupWhenFull(cg.readEntry("groupWhenFull", true));
-    m_showTooltip = cg.readEntry("showTooltip", true);
 
     m_groupManager->setGroupingStrategy( static_cast<TaskManager::GroupManager::TaskGroupingStrategy>(cg.readEntry("groupingStrategy", static_cast<int>(TaskManager::GroupManager::ProgramGrouping))));
 
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019867)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019868)
@@ -51,6 +51,10 @@
        m_topMargin(0),
        m_rightMargin(0),
        m_bottomMargin(0),
+       m_offscreenLeftMargin(0),
+       m_offscreenTopMargin(0),
+       m_offscreenRightMargin(0),
+       m_offscreenBottomMargin(0),
        m_rootGroupItem(0),
        m_groupManager(0),
        m_groupModifierKey(Qt::AltModifier)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- kdebase-workspace.spec	1 Sep 2009 13:05:19 -0000	1.241
+++ kdebase-workspace.spec	23 Sep 2009 12:47:07 -0000	1.242
@@ -1,3 +1,6 @@
+%if 0%{?fedora} && 0%{?fedora} < 12
+%define with_polkit_09 1
+%endif
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -5,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 1%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -31,25 +34,24 @@ Patch16: kdebase-workspace-4.3.0-battery
 
 # upstream patches:
 # 4.3 branch
+Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
+%if 0%{?with_polkit_09}
 Requires: PolicyKit-authentication-agent
-
-# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
-%if 0%{?fedora} == 9
-# upgrade path: kdebase(3) -> kdebase-workspace
-Obsoletes: kdebase < 6:4
-# so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
-Requires: kdebase4
+%else
+Obsoletes: PolicyKit-kde < %{version}-%{release}
+# if/when we actually create this one:
+#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+Obsoletes: polkit-qt < 0.10
 %endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
-
 %if 0%{?fedora} > 10
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
@@ -71,10 +73,14 @@ BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
+%ifnarch s390 s390x
 BuildRequires: lm_sensors-devel
+%endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+%if 0%{?with_polkit_09}
 BuildRequires: polkit-qt-devel
+%endif
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
@@ -91,7 +97,7 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 || 0%{?rhel} < 6
 Requires: kdm = %{version}-%{release}
 %endif
 Requires: ksysguardd = %{version}-%{release}
@@ -103,20 +109,21 @@ Requires: xorg-x11-apps
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
+%define default_face_icon default1.png
+
 %if 0%{?fedora} == 10
 %define default_face_icon default_solar.png
 Requires: solar-kde-theme
-%else
+%endif
+
 %if 0%{?fedora} == 11
 %define default_face_icon default_leonidas.png
 Requires: leonidas-kde-theme
-%else
-%define default_face_icon default1.png
-%endif
 %endif
 
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
 Requires: system-backgrounds-kde
+Requires: system-ksplash-theme
 %endif
 
 Requires: kio_sysinfo
@@ -160,9 +167,7 @@ Requires: %{name} = %{version}-%{release
 Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%if 0%{?fedora} > 9 
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -186,9 +191,7 @@ Group:   System Environment/Daemons
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n oxygen-cursor-themes
 %{summary}.
 
@@ -198,9 +201,21 @@ Group: System Environment/Libraries
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
 Provides: PolicyKit-authentication-agent
+# when -libs was born
+#Obsoletes: PolicyKit-kde < 4.3.1-4
+#Requires: PolicyKit-kde-libs%{?_isa} = %{version}-%{release}
 %description -n PolicyKit-kde
 This package provides a PolicyKit Authentication Frontend for KDE
 
+# maybe for 4.3.1-4 ? -- Rex
+%package -n PolicyKit-kde-libs
+Summary: Runtime libraries for PolicyKit-kde 
+Group:   System Environment/Libraries
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: PolicyKit-kde = %{version}-%{release}
+%description -n PolicyKit-kde-libs
+%{summary}.
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -211,6 +226,7 @@ Requires: %{name} = %{version}-%{release
 %package python-applet
 Summary: Plasma widget in Python
 Group: User Interface/Desktops
+Provides: plasma-scriptengine-python = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: PyKDE4 >= %{version}
 %description python-applet
@@ -247,6 +263,8 @@ Requires: akonadi
 %patch16 -p1 -b .showremainingtime
 
 # upstream patches
+%patch100 -p5 -b .plasmaCrash
+
 
 %build
 
@@ -272,8 +290,7 @@ make install/fast DESTDIR=%{buildroot} -
 mkdir -p %{buildroot}%{_datadir}/xsessions/
 ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
 
-# FIXME/TODO: provide kdm config in kde-settings(-kdm)
-# nuke, use external kde-config-kdm
+# nuke, use external kde-settings-kdm
 rm -rf  %{buildroot}%{_kde4_configdir}/kdm
 
 # own %{_kde4_appsdir}/kdm/faces and set default user image
@@ -400,7 +417,6 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
-%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -410,8 +426,6 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
-%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
-%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -429,7 +443,6 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
-%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -474,11 +487,20 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 %exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
+%if 0%{?with_polkit_09}
+# PolicyKit-kde
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%endif
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%if 0%{?with_polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -540,10 +562,10 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%if 0%{?with_polkit_09}
 %files -n PolicyKit-kde
 %defattr(-,root,root,-)
 %{_kde4_bindir}/polkit-kde-authorization
-%{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
@@ -553,6 +575,7 @@ fi
 #files -n PolicyKit-kde-libs
 #defattr(-,root,root,-)
 %{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
 
 %files python-applet
 %defattr(-,root,root,-)
@@ -569,6 +592,19 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-5
+- fix spontaneous Plasma crashes due to uninitialized vars
+
+* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
+
+* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- -python-applet: Provides: plasma-scriptengine-python
+- Requires: system-ksplash-theme (f12+,rhel6+)
+
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- drop  BR: lm_sensors-devel on s390(x)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - drop Requires: kde-plasma-folderview, rely on comps instead



From ltinkl at fedoraproject.org  Wed Sep 23 12:47:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 23 Sep 2009 12:47:08 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.2-plasmaCrash.patch, NONE,
	1.1 kdebase-workspace.spec, 1.293, 1.294
Message-ID: <20090923124708.6D6AE11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29849/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
fix plasma crasher


kdebase-workspace-4.3.2-plasmaCrash.patch:
 tasks.cpp |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.3.2-plasmaCrash.patch ---
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019864)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019865)
@@ -76,6 +76,9 @@
 {
     //kDebug();
 
+    const KConfigGroup cg = config();
+    m_showTooltip = cg.readEntry("showTooltip", true);
+
     m_groupManager = new TaskManager::GroupManager(this);
     Plasma::Containment* appletContainment = containment();
     if (appletContainment) {
@@ -117,13 +120,10 @@
 
     setLayout(layout);
 
-    KConfigGroup cg = config();
-
     m_groupManager->setShowOnlyCurrentDesktop( cg.readEntry("showOnlyCurrentDesktop", false));
     m_groupManager->setShowOnlyCurrentScreen( cg.readEntry("showOnlyCurrentScreen", false));
     m_groupManager->setShowOnlyMinimized( cg.readEntry("showOnlyMinimized", false));
     m_groupManager->setOnlyGroupWhenFull(cg.readEntry("groupWhenFull", true));
-    m_showTooltip = cg.readEntry("showTooltip", true);
 
     m_groupManager->setGroupingStrategy( static_cast<TaskManager::GroupManager::TaskGroupingStrategy>(cg.readEntry("groupingStrategy", static_cast<int>(TaskManager::GroupManager::ProgramGrouping))));
 
Index: branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp
===================================================================
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019867)
+++ branches/KDE/4.3/kdebase/workspace/plasma/applets/tasks/tasks.cpp	(revision 1019868)
@@ -51,6 +51,10 @@
        m_topMargin(0),
        m_rightMargin(0),
        m_bottomMargin(0),
+       m_offscreenLeftMargin(0),
+       m_offscreenTopMargin(0),
+       m_offscreenRightMargin(0),
+       m_offscreenBottomMargin(0),
        m_rootGroupItem(0),
        m_groupManager(0),
        m_groupModifierKey(Qt::AltModifier)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- kdebase-workspace.spec	21 Sep 2009 15:17:46 -0000	1.293
+++ kdebase-workspace.spec	23 Sep 2009 12:47:08 -0000	1.294
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -34,6 +34,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 
 # upstream patches:
 # 4.3 branch
+Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
@@ -262,6 +263,8 @@ Requires: akonadi
 %patch16 -p1 -b .showremainingtime
 
 # upstream patches
+%patch100 -p5 -b .plasmaCrash
+
 
 %build
 
@@ -589,6 +592,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-5
+- fix spontaneous Plasma crashes due to uninitialized vars
+
 * Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
 



From msuchy at fedoraproject.org  Wed Sep 23 12:50:47 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 23 Sep 2009 12:50:47 +0000 (UTC)
Subject: rpms/rhnsd/devel import.log, NONE, 1.1 rhnsd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923125047.C1C6611C00E6@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhnsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31240/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rhnsd.spec 
Log Message:
Import initial version of rhnsd-4.5.13-1 to devel branch.



--- NEW FILE import.log ---
rhnsd-4_5_13-1:HEAD:rhnsd-4.5.13-1.src.rpm:1253710223


--- NEW FILE rhnsd.spec ---
Summary: Red Hat Network query daemon
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
Name: rhnsd
Version: 4.5.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext

Requires: rhn-check >= 0.0.8
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
Requires(postun): initscripts

%description
The Red Hat Update Agent that automatically queries the Red Hat
Network servers and determines which packages need to be updated on
your machine, and runs any actions.

%prep
%setup -q 

%build
make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}

%find_lang %{name}


%post
/sbin/chkconfig --add rhnsd

%preun
if [ $1 = 0 ] ; then
    /etc/rc.d/init.d/rhnsd stop >/dev/null 2>&1
    /sbin/chkconfig --del rhnsd
fi


%postun
if [ "$1" -ge "1" ]; then
    /etc/rc.d/init.d/rhnsd condrestart >/dev/null 2>&1 || :
fi

%clean
rm -fr $RPM_BUILD_ROOT


%files -f %{name}.lang 
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd
%{_sbindir}/rhnsd
%{_initrddir}/rhnsd
%{_mandir}/man8/rhnsd.8*
%doc LICENSE

%changelog
* Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 4.5.13-1
- use macros
- pass CFLAGS on correct position
- add LICENSE file
- change header info to actual license

* Mon Sep 21 2009 Miroslav Such? <msuchy at redhat.com> 4.5.12-1
- implement try-restart as alias for condrestart
- add LSB header
- change url, source0 and requires according to packaging guidelines

* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 4.5.11-1
- #503719 - fix for postun scriptlet error (pkilambi at redhat.com)

* Tue Jul  7 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #503719 - fix for postun scriptlet error

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 4.5.10-1
- 243699: fixing the error code when unknown command is used with rhnsd init
  (pkilambi at redhat.com)
- updateing translations for rhnsd (pkilambi at redhat.com)

* Wed Jun  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-3
- Resolves:  #243699 -fixing error code for unknown command to rhnsd init script

* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-2
- Updated translations.
- Resolves:  #243699
  
* Tue Jan 27 2009 Miroslav Such? <msuchy at redhat.com> 4.5.9-1
- rebuild

* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.5.8-1
- Remove usage of version and sources files.
 
* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 4.5.7-1
- Updated translations.
- Related: #216837

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 4.5.6-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 4.5.5-1
- New and updated translations.

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 4.5.4-1
- New and updated translations.

* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 4.5.3-1
- Updated manual page.
- Require gettext.

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 4.5.2-1
- New and updated translations.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 4.5.1-1
- Fix for bz 163483: rhnsd spawns children with SIGPIPE set to SIG_IGN

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 4.5.0-3
- Require rhn-check, not rhn_check.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 4.5.0-2
- spec file cleanups.

* Fri Jul 07 2006 James Bowes <jbowes at redhat.com> - 4.5.0-1
- Release for RHEL5 matching with up2date.

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Refer to the proper commands in the man page.

* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
- initial split from main up2date package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhnsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:32:00 -0000	1.1
+++ .cvsignore	23 Sep 2009 12:50:47 -0000	1.2
@@ -0,0 +1 @@
+rhnsd-4.5.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhnsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:32:00 -0000	1.1
+++ sources	23 Sep 2009 12:50:47 -0000	1.2
@@ -0,0 +1 @@
+51027a303b0ecf9ff769ad7b63a3b39a  rhnsd-4.5.13.tar.gz



From msuchy at fedoraproject.org  Wed Sep 23 12:52:31 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 23 Sep 2009 12:52:31 +0000 (UTC)
Subject: rpms/rhnsd/F-12 import.log, NONE, 1.1 rhnsd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923125231.A47CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhnsd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32033/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rhnsd.spec 
Log Message:
Import initial version of rhnsd-4.5.13-1 to F-12 branch.



--- NEW FILE import.log ---
rhnsd-4_5_13-1:F-12:rhnsd-4.5.13-1.src.rpm:1253710321


--- NEW FILE rhnsd.spec ---
Summary: Red Hat Network query daemon
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
Name: rhnsd
Version: 4.5.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext

Requires: rhn-check >= 0.0.8
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
Requires(postun): initscripts

%description
The Red Hat Update Agent that automatically queries the Red Hat
Network servers and determines which packages need to be updated on
your machine, and runs any actions.

%prep
%setup -q 

%build
make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}

%find_lang %{name}


%post
/sbin/chkconfig --add rhnsd

%preun
if [ $1 = 0 ] ; then
    /etc/rc.d/init.d/rhnsd stop >/dev/null 2>&1
    /sbin/chkconfig --del rhnsd
fi


%postun
if [ "$1" -ge "1" ]; then
    /etc/rc.d/init.d/rhnsd condrestart >/dev/null 2>&1 || :
fi

%clean
rm -fr $RPM_BUILD_ROOT


%files -f %{name}.lang 
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd
%{_sbindir}/rhnsd
%{_initrddir}/rhnsd
%{_mandir}/man8/rhnsd.8*
%doc LICENSE

%changelog
* Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 4.5.13-1
- use macros
- pass CFLAGS on correct position
- add LICENSE file
- change header info to actual license

* Mon Sep 21 2009 Miroslav Such? <msuchy at redhat.com> 4.5.12-1
- implement try-restart as alias for condrestart
- add LSB header
- change url, source0 and requires according to packaging guidelines

* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 4.5.11-1
- #503719 - fix for postun scriptlet error (pkilambi at redhat.com)

* Tue Jul  7 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #503719 - fix for postun scriptlet error

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 4.5.10-1
- 243699: fixing the error code when unknown command is used with rhnsd init
  (pkilambi at redhat.com)
- updateing translations for rhnsd (pkilambi at redhat.com)

* Wed Jun  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-3
- Resolves:  #243699 -fixing error code for unknown command to rhnsd init script

* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-2
- Updated translations.
- Resolves:  #243699
  
* Tue Jan 27 2009 Miroslav Such? <msuchy at redhat.com> 4.5.9-1
- rebuild

* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.5.8-1
- Remove usage of version and sources files.
 
* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 4.5.7-1
- Updated translations.
- Related: #216837

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 4.5.6-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 4.5.5-1
- New and updated translations.

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 4.5.4-1
- New and updated translations.

* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 4.5.3-1
- Updated manual page.
- Require gettext.

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 4.5.2-1
- New and updated translations.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 4.5.1-1
- Fix for bz 163483: rhnsd spawns children with SIGPIPE set to SIG_IGN

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 4.5.0-3
- Require rhn-check, not rhn_check.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 4.5.0-2
- spec file cleanups.

* Fri Jul 07 2006 James Bowes <jbowes at redhat.com> - 4.5.0-1
- Release for RHEL5 matching with up2date.

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Refer to the proper commands in the man page.

* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
- initial split from main up2date package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhnsd/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:32:00 -0000	1.1
+++ .cvsignore	23 Sep 2009 12:52:31 -0000	1.2
@@ -0,0 +1 @@
+rhnsd-4.5.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhnsd/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:32:00 -0000	1.1
+++ sources	23 Sep 2009 12:52:31 -0000	1.2
@@ -0,0 +1 @@
+51027a303b0ecf9ff769ad7b63a3b39a  rhnsd-4.5.13.tar.gz



From msuchy at fedoraproject.org  Wed Sep 23 12:53:30 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 23 Sep 2009 12:53:30 +0000 (UTC)
Subject: rpms/rhnsd/F-11 import.log, NONE, 1.1 rhnsd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090923125330.D5A5A11C00E6@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhnsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32467/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rhnsd.spec 
Log Message:
Import initial version of rhnsd-4.5.13-1 to F-11 branch.



--- NEW FILE import.log ---
rhnsd-4_5_13-1:F-11:rhnsd-4.5.13-1.src.rpm:1253710384


--- NEW FILE rhnsd.spec ---
Summary: Red Hat Network query daemon
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
Name: rhnsd
Version: 4.5.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext

Requires: rhn-check >= 0.0.8
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
Requires(postun): initscripts

%description
The Red Hat Update Agent that automatically queries the Red Hat
Network servers and determines which packages need to be updated on
your machine, and runs any actions.

%prep
%setup -q 

%build
make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}

%find_lang %{name}


%post
/sbin/chkconfig --add rhnsd

%preun
if [ $1 = 0 ] ; then
    /etc/rc.d/init.d/rhnsd stop >/dev/null 2>&1
    /sbin/chkconfig --del rhnsd
fi


%postun
if [ "$1" -ge "1" ]; then
    /etc/rc.d/init.d/rhnsd condrestart >/dev/null 2>&1 || :
fi

%clean
rm -fr $RPM_BUILD_ROOT


%files -f %{name}.lang 
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd
%{_sbindir}/rhnsd
%{_initrddir}/rhnsd
%{_mandir}/man8/rhnsd.8*
%doc LICENSE

%changelog
* Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 4.5.13-1
- use macros
- pass CFLAGS on correct position
- add LICENSE file
- change header info to actual license

* Mon Sep 21 2009 Miroslav Such? <msuchy at redhat.com> 4.5.12-1
- implement try-restart as alias for condrestart
- add LSB header
- change url, source0 and requires according to packaging guidelines

* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 4.5.11-1
- #503719 - fix for postun scriptlet error (pkilambi at redhat.com)

* Tue Jul  7 2009 Pradeep Kilambi <pkilambi at redhat.com>
- Resolves: #503719 - fix for postun scriptlet error

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 4.5.10-1
- 243699: fixing the error code when unknown command is used with rhnsd init
  (pkilambi at redhat.com)
- updateing translations for rhnsd (pkilambi at redhat.com)

* Wed Jun  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-3
- Resolves:  #243699 -fixing error code for unknown command to rhnsd init script

* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-2
- Updated translations.
- Resolves:  #243699
  
* Tue Jan 27 2009 Miroslav Such? <msuchy at redhat.com> 4.5.9-1
- rebuild

* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.5.8-1
- Remove usage of version and sources files.
 
* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 4.5.7-1
- Updated translations.
- Related: #216837

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 4.5.6-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 4.5.5-1
- New and updated translations.

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 4.5.4-1
- New and updated translations.

* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 4.5.3-1
- Updated manual page.
- Require gettext.

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 4.5.2-1
- New and updated translations.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 4.5.1-1
- Fix for bz 163483: rhnsd spawns children with SIGPIPE set to SIG_IGN

* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 4.5.0-3
- Require rhn-check, not rhn_check.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 4.5.0-2
- spec file cleanups.

* Fri Jul 07 2006 James Bowes <jbowes at redhat.com> - 4.5.0-1
- Release for RHEL5 matching with up2date.

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Refer to the proper commands in the man page.

* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
- initial split from main up2date package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhnsd/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:32:00 -0000	1.1
+++ .cvsignore	23 Sep 2009 12:53:30 -0000	1.2
@@ -0,0 +1 @@
+rhnsd-4.5.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhnsd/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:32:00 -0000	1.1
+++ sources	23 Sep 2009 12:53:30 -0000	1.2
@@ -0,0 +1 @@
+51027a303b0ecf9ff769ad7b63a3b39a  rhnsd-4.5.13.tar.gz



From tadej at fedoraproject.org  Wed Sep 23 12:59:51 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Wed, 23 Sep 2009 12:59:51 +0000 (UTC)
Subject: rpms/PyQwt/F-11 PyQwt.spec,1.2,1.3
Message-ID: <20090923125951.9FA3111C00E6@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2070

Modified Files:
	PyQwt.spec 
Log Message:
Upgrade to version 5.2.0




Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-11/PyQwt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- PyQwt.spec	23 Feb 2009 22:32:30 -0000	1.2
+++ PyQwt.spec	23 Sep 2009 12:59:51 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           PyQwt
-Version:        5.1.0
-Release:        4%{?dist}
+Version:        5.2.0
+Release:        1%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel
 BuildRequires:  sip-devel
 BuildRequires:  PyQt4-devel
-BuildRequires:  numpy
+BuildRequires:  numpy-f2py
 BuildRequires:  qwt-devel
 
 Requires:       PyQt4
@@ -53,9 +53,18 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
+# move the generated pdf and html documentation to sphinx directory and remove the build files
+cd ..
+mv sphinx/build/latex/PyQwt.pdf sphinx
+mv sphinx/build/html sphinx
+rm -rf sphinx/build
 
-# non-executable script
+# non-executable scripts
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
+chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py
+
+#FIXME!!! temporarily remove qwt.py* files which conflict with PyQt4 package
+rm -rf %{buildroot}/%{python_sitearch}/PyQt4/uic
  
 %clean
 rm -rf %{buildroot}
@@ -65,15 +74,23 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc ANNOUNCEMENT-%{version} README
 %doc COPYING*
-%{python_sitearch}/PyQt4/Qwt5/
+%{python_sitearch}/PyQt4/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc Doc/*
+%doc sphinx/*
 %doc qt4examples/ 
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Wed Sep 23 2009 Tadej Jane? <tadej.janez at tadej.hicsalta.si> 5.2.0-1
+- upgrade to version 5.2.0, which supports newer versions of Qwt, PyQt4
+  and SIP (fixes RH bug #520095)
+- included new Sphinx genereted pdf and html documentation in -devel subpackage
+- made qplt.py executable (to fix a rpmlint error)
+- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
+  package split
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rakesh at fedoraproject.org  Wed Sep 23 13:00:32 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Wed, 23 Sep 2009 13:00:32 +0000 (UTC)
Subject: rpms/coredumper/devel coredumper.spec,1.4,1.5
Message-ID: <20090923130032.2599D11C0335@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2567

Modified Files:
	coredumper.spec 
Log Message:
Replaced ExcludeArch with ExclusiveArch


Index: coredumper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/devel/coredumper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- coredumper.spec	24 Jul 2009 19:29:44 -0000	1.4
+++ coredumper.spec	23 Sep 2009 13:00:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           coredumper
 Version:        1.2.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Library to create core dumps
 
 Group:          Development/Tools
@@ -12,13 +12,9 @@ Patch1:         coredumper_unittest_c.pa
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  binutils, gdb
 
-# Primary Architectures with exclude arch bug number
-ExcludeArch:    ia64  #462342
-ExcludeArch:    ppc   #461340
-ExcludeArch:    ppc64 #461341
+# Bugs ia64 - BZ at 462342, ppc - BZ at 461340, ppc64 - BZ at 461341
+ExclusiveArch: %{ix86} x86_64
 
-# Secondary Architectures
-ExcludeArch:    s390, sparc, alpha
 
 %description
 The coredumper library can be compiled into applications to create
@@ -82,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/google/*.h
 
 %changelog
+* Wed Sep 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.1-10
+- Replaced ExcludeArch with ExclusiveArch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:31 +0000
Subject: [pkgdb] bc: ovasik has requested watchcommits
Message-ID: <20090923130432.007F510F876@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on bc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:32 +0000
Subject: [pkgdb] bc: ovasik has requested watchbugzilla
Message-ID: <20090923130432.B98E410F880@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on bc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:33 +0000
Subject: [pkgdb] bc: ovasik has requested commit
Message-ID: <20090923130433.7462310F88A@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on bc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:36 +0000
Subject: [pkgdb] bc: ovasik has requested approveacls
Message-ID: <20090923130436.0E5CC10F898@bastion2.fedora.phx.redhat.com>

ovasik has requested the approveacls acl on bc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:44 +0000
Subject: [pkgdb] bc: ovasik has requested watchcommits
Message-ID: <20090923130444.3BDCE10F7BD@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on bc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:45 +0000
Subject: [pkgdb] bc: ovasik has requested watchbugzilla
Message-ID: <20090923130445.8E60210F8A1@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on bc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:45 +0000
Subject: [pkgdb] bc: ovasik has requested commit
Message-ID: <20090923130445.8E19910F8A0@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on bc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:46 +0000
Subject: [pkgdb] bc: ovasik has requested approveacls
Message-ID: <20090923130446.27BE510F8A5@bastion2.fedora.phx.redhat.com>

ovasik has requested the approveacls acl on bc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:51 +0000
Subject: [pkgdb] bc: ovasik has requested watchbugzilla
Message-ID: <20090923130451.6BC6410F8A9@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on bc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:52 +0000
Subject: [pkgdb] bc: ovasik has requested watchcommits
Message-ID: <20090923130452.113A710F8AC@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on bc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:53 +0000
Subject: [pkgdb] bc: ovasik has requested commit
Message-ID: <20090923130453.8B2DA10F8B1@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on bc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From pkgdb at fedoraproject.org  Wed Sep 23 13:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 13:04:55 +0000
Subject: [pkgdb] bc: ovasik has requested approveacls
Message-ID: <20090923130456.1066F10F87E@bastion2.fedora.phx.redhat.com>

ovasik has requested the approveacls acl on bc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bc



From tadej at fedoraproject.org  Wed Sep 23 13:08:03 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Wed, 23 Sep 2009 13:08:03 +0000 (UTC)
Subject: rpms/PyQwt/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090923130803.C903A11C00E6@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4737

Modified Files:
	.cvsignore sources 
Log Message:
Run make new-sources to include new source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jan 2009 14:49:22 -0000	1.2
+++ .cvsignore	23 Sep 2009 13:08:02 -0000	1.3
@@ -1 +1 @@
-PyQwt-5.1.0.tar.gz
+PyQwt-5.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jan 2009 14:49:22 -0000	1.2
+++ sources	23 Sep 2009 13:08:02 -0000	1.3
@@ -1 +1 @@
-c9d662a0d4fc95cec75d3c526e4e748a  PyQwt-5.1.0.tar.gz
+fcd6c6029090d473dcc9df497516eae7  PyQwt-5.2.0.tar.gz



From stransky at fedoraproject.org  Wed Sep 23 13:20:36 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 23 Sep 2009 13:20:36 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey-2.0-hunspell.patch, NONE,
	1.1 seamonkey.spec, 1.62, 1.63
Message-ID: <20090923132036.2A50611C0418@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9412

Modified Files:
	seamonkey.spec 
Added Files:
	seamonkey-2.0-hunspell.patch 
Log Message:
hunspell build patch

seamonkey-2.0-hunspell.patch:
 Makefile.in |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE seamonkey-2.0-hunspell.patch ---
diff -up seamonkey-2.0/comm-central/suite/app/Makefile.in.old seamonkey-2.0/comm-central/suite/app/Makefile.in
--- seamonkey-2.0/comm-central/suite/app/Makefile.in.old	2009-09-03 19:45:03.000000000 +0200
+++ seamonkey-2.0/comm-central/suite/app/Makefile.in	2009-09-23 14:59:11.000000000 +0200
@@ -133,6 +133,9 @@ ifdef MOZ_ENABLE_DBUS
 LIBS += $(MOZ_DBUS_GLIB_LIBS)
 endif
 
+ifdef MOZ_NATIVE_HUNSPELL
+LIBS += $(MOZ_HUNSPELL_LIBS)
+endif
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- seamonkey.spec	23 Sep 2009 09:19:23 -0000	1.62
+++ seamonkey.spec	23 Sep 2009 13:20:35 -0000	1.63
@@ -39,6 +39,7 @@ Source100:      find-external-requires
 
 Patch0:         mozilla-jemalloc.patch
 Patch1:         mozilla-191-path.patch
+Patch2:         seamonkey-2.0-hunspell.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -97,6 +98,7 @@ cd %{sources_subdir}
 
 %patch0 -p0 -b .jemalloc
 %patch1 -p0 -b .path
+%patch2 -p2 -b .hunspell
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig



From epienbro at fedoraproject.org  Wed Sep 23 13:20:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 23 Sep 2009 13:20:47 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.10, 1.11 mingw32-gtk2.spec,
	1.17, 1.18 sources, 1.10, 1.11
Message-ID: <20090923132047.7E35811C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9483

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.18.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Sep 2009 09:09:50 -0000	1.10
+++ .cvsignore	23 Sep 2009 13:20:47 -0000	1.11
@@ -1 +1 @@
-gtk+-2.17.11.tar.bz2
+gtk+-2.18.0.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mingw32-gtk2.spec	20 Sep 2009 10:32:41 -0000	1.17
+++ mingw32-gtk2.spec	23 Sep 2009 13:20:47 -0000	1.18
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.17.11
-Release:        3%{?dist}
+Version:        2.18.0
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -342,6 +342,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.0-1
+- Update to 2.18.0
+
 * Sun Sep 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-3
 - Use relative paths instead of absolute paths in the gdk-pixbuf.loaders file
 - Added the gtk.immodules file (BZ #522957)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Sep 2009 09:09:50 -0000	1.10
+++ sources	23 Sep 2009 13:20:47 -0000	1.11
@@ -1 +1 @@
-46b3b78d9140b40efe8efaa8c477d1cd  gtk+-2.17.11.tar.bz2
+bb7ef5463a74a80454ced2c1d47a0192  gtk+-2.18.0.tar.bz2



From vcrhonek at fedoraproject.org  Wed Sep 23 13:36:44 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 23 Sep 2009 13:36:44 +0000 (UTC)
Subject: rpms/tog-pegasus/devel pegasus-2.9.0-initscript.patch, 1.1,
	1.2 tog-pegasus.spec, 1.77, 1.78
Message-ID: <20090923133644.34EA711C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15135

Modified Files:
	pegasus-2.9.0-initscript.patch tog-pegasus.spec 
Log Message:
Fix initscript

pegasus-2.9.0-initscript.patch:
 tog-pegasus.rc |  195 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 125 insertions(+), 70 deletions(-)

Index: pegasus-2.9.0-initscript.patch
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/pegasus-2.9.0-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pegasus-2.9.0-initscript.patch	16 Jun 2009 12:09:02 -0000	1.1
+++ pegasus-2.9.0-initscript.patch	23 Sep 2009 13:36:42 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up pegasus/rpm/tog-pegasus.rc_old pegasus/rpm/tog-pegasus.rc
 --- pegasus/rpm/tog-pegasus.rc_old	2008-12-02 10:00:03.000000000 +0100
-+++ pegasus/rpm/tog-pegasus.rc	2009-03-18 14:39:40.000000000 +0100
-@@ -1,78 +1,108 @@
++++ pegasus/rpm/tog-pegasus.rc	2009-09-23 14:52:10.000000000 +0200
+@@ -1,98 +1,153 @@
 -#//%LICENSE////////////////////////////////////////////////////////////////
 -#//
 -#// Licensed to The Open Group (TOG) under one or more contributor license
@@ -72,113 +72,156 @@ diff -up pegasus/rpm/tog-pegasus.rc_old 
  
  case "$1" in
       start)
+-	echo -n $"Starting up CIM server: "
+-	$CIMSERVER_BIN
+-	RETVAL=$?
+-	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
+-	echo
+-	;;
++        if [[ $EUID -ne 0 ]]; then
++            echo "tog-pegasus $1: $CIMSERVER_BIN executed under nonprivileged user"
++            exit 4
++        fi
 +        pid=`pidofproc $CIMSERVER_BIN`
 +        RETVAL=$?
 +        if [ "$RETVAL" -eq 0 ]; then
-+            echo "tog-pegasus $1: $CIMSERVER_BIN is already running";
-+            exit 0;
-+        fi;
++            echo "tog-pegasus $1: $CIMSERVER_BIN is already running"
++            exit 0
++        fi
 +
 +        if [ ! -e $CIMSERVER_BIN ]; then
-+           echo "tog-pegasus $1: $CIMSERVER_BIN not found";
-+           failure;
-+           exit 5;
-+        fi;
++           echo "tog-pegasus $1: $CIMSERVER_BIN not found"
++           failure
++           exit 5
++        fi
 +
 +        if [ ! -x $CIMSERVER_BIN ]; then
-+           echo "tog-pegasus $1: $CIMSERVER_BIN not executable";
-+           failure;
-+           exit 4;
-+        fi;
++           echo "tog-pegasus $1: $CIMSERVER_BIN not executable"
++           failure
++           exit 4
++        fi
 +
 +        if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] || 
 +           [ ! -e ${PEGASUS_SSL_KEY_FILE} ]  || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then
 +           if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then
-+               echo -n "tog-pegasus: Generating cimserver SSL certificates...";
-+               /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts;
++               echo -n "tog-pegasus: Generating cimserver SSL certificates..."
++               /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts
 +               if [ $? -eq 0 ]; then
-+                   success;
++                   success
 +               else
-+                   failure;
-+               fi;
-+               echo;
-+           fi;
-+        fi;
- 	echo -n $"Starting up CIM server: "
--	$CIMSERVER_BIN
++                   failure
++               fi
++               echo
++           fi
++        fi
++        echo -n $"Starting up CIM server: "
 +        $CIMSERVER_BIN ${CIMSERVER_OPTIONS}
- 	RETVAL=$?
--	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
--	echo
++        RETVAL=$?
 +        if [ "$RETVAL" -eq 0 ]; then
-+            touch $LOCKFILE;
-+            success;
++            rm -f /var/run/tog-pegasus.pid;
++            ln -s /var/run/tog-pegasus/"$prog".pid /var/run/tog-pegasus.pid;
++            touch $LOCKFILE
++            success
 +        else
-+            failure;
-+        fi;
-+        echo;
- 	;;
++            failure
++        fi
++        echo
++        ;;
  
       stop)
- 	echo -n $"Shutting down CIM server: "
- 	killproc cimserver
- 	RETVAL=$?
+-	echo -n $"Shutting down CIM server: "
+-	killproc cimserver
+-	RETVAL=$?
 -	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
 -	echo
+-	;;
++        if [[ $EUID -ne 0 ]]; then
++            echo "tog-pegasus $1: $CIMSERVER_BIN executed under nonprivileged user"
++            exit 4
++        fi
++        echo -n $"Shutting down CIM server: "
++        killproc cimserver
++        RETVAL=$?
 +        if [ "$RETVAL" -eq 0 ]; then
-+            rm -f $LOCKFILE;
-+            rm -f /var/run/tog-pegasus/*;
-+            success;
++            rm -f $LOCKFILE
++            rm -f /var/run/tog-pegasus/*
++            rm -f /var/run/tog-pegasus.pid
++            success
 +        else
-+            failure;
-+        fi;
-+	echo;
- 	;;
++            failure
++        fi
++        echo
++        ;;
 +
       status)
- 	pid=`pidofproc $CIMSERVER_BIN`
- 	RETVAL=$?
- 	if [ "$RETVAL" -eq 0 ]; then
+-	pid=`pidofproc $CIMSERVER_BIN`
+-	RETVAL=$?
+-	if [ "$RETVAL" -eq 0 ]; then
 -		echo "CIM server is running"
-+            echo -n $"CIM server ($pid) is running";
-+            RETVAL=0
- 	else
+-	else
 -		echo "CIM server is not running"
 -	fi
-+            echo -n $"CIM server is not running";
-+            RETVAL=3
-+	fi;
-+	echo;
- 	;;
+-	;;
++        pid=`pidofproc $CIMSERVER_BIN`
++        RETVAL=$?
++        if [ "$RETVAL" -eq 0 ]; then
++            echo -n $"CIM server ($pid) is running"
++            exit 0
++        else
++            if [ -e /var/run/tog-pegasus.pid ]; then
++                echo $"CIM server is not running, but pid file exists"
++                exit 1
++            elif [ -e $LOCKFILE ]; then
++                echo $"CIM server is not running, but lock file exists"
++                exit 2
++            else
++                echo $"CIM server is not running"
++                exit 3
++            fi
++        fi
++        echo
++        ;;
 +
       condrestart)
- 	pid=`pidofproc $CIMSERVER_BIN`
- 	RETVAL=$?
-@@ -81,18 +111,23 @@ case "$1" in
- 	    RETVAL=$?;
- 	fi;
+-	pid=`pidofproc $CIMSERVER_BIN`
+-	RETVAL=$?
+-	if [ "$RETVAL" -eq 0 ]; then
+-	    $0 stop && $0 start;
+-	    RETVAL=$?;
+-	fi;
++        pid=`pidofproc $CIMSERVER_BIN`
++        RETVAL=$?
++        if [ "$RETVAL" -eq 0 ]; then
++            $0 stop && $0 start
++            RETVAL=$?
++        fi;
          ;;
 +
       try-restart)
 -	$0 stop && $0 start
-+        $0 stop && $0 start;
-+        RETVAL=$?;
- 	;;
+-	;;
++        $0 stop && $0 start
++        RETVAL=$?
++        ;;
 +
       restart|force-reload)
 -	$0 stop
 -	$0 start
-+        $0 stop;
-+        $0 start;
-+        RETVAL=$?;
- 	;;
+-	;;
++        $0 stop
++        $0 start
++        RETVAL=$?
++        ;;
 +
       reload)
- 	;;
+-	;;
++        ;;
       *)
- 	echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
+-	echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
 -	exit 1
-+        RETVAL=3
++        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
++        [ "$1" = "usage" ] && exit 0
++        exit 2
  esac
  
  exit $RETVAL


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- tog-pegasus.spec	16 Sep 2009 18:59:02 -0000	1.77
+++ tog-pegasus.spec	23 Sep 2009 13:36:42 -0000	1.78
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.9.0
-Release: 		6%{?dist}
+Release: 		7%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -463,6 +463,10 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.9.0-7
+- Fix initscript
+  Resolves: #523370
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-6
 - Use password-auth common PAM configuration instead of system-auth
 



From rjones at fedoraproject.org  Wed Sep 23 13:39:11 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 23 Sep 2009 13:39:11 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.37, 1.38 libguestfs.spec, 1.64, 
	1.65 sources, 1.37, 1.38
Message-ID: <20090923133911.3995A11C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16011

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
Version 1.0.72.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	22 Sep 2009 14:29:30 -0000	1.37
+++ .cvsignore	23 Sep 2009 13:39:10 -0000	1.38
@@ -1 +1 @@
-libguestfs-1.0.71.tar.gz
+libguestfs-1.0.72.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- libguestfs.spec	22 Sep 2009 14:29:31 -0000	1.64
+++ libguestfs.spec	23 Sep 2009 13:39:11 -0000	1.65
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.71
+Version:     1.0.72
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -64,7 +64,7 @@ BuildRequires: java >= 1.5.0
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 
-# For virt-inspector:
+# For libguestfs-tools:
 BuildRequires: perl-Sys-Virt
 
 # Runtime requires:
@@ -139,54 +139,55 @@ modifying virtual machine disk images fr
 scripts.
 
 
-%package -n virt-inspector
-Summary:     Display OS version, kernel, drivers, etc in a virtual machine
+%package tools
+Summary:     System administration tools for virtual machines
 Group:       Development/Tools
 License:     GPLv2+
 Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    guestfish
 Requires:    perl-Sys-Virt
 
+# Obsolete and replace earlier packages.
+Provides:    virt-cat = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-cat <= %{epoch}:%{version}-%{release}
+Provides:    virt-df = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-df <= %{epoch}:%{version}-%{release}
+Provides:    virt-inspector = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-inspector <= %{epoch}:%{version}-%{release}
 
-%description -n virt-inspector
-Virt-inspector examines a virtual machine and tries to determine the
-version of the OS, the kernel version, what drivers are installed,
-whether the virtual machine is fully virtualized (FV) or
-para-virtualized (PV), what applications are installed and more.
-
-
-%package -n virt-df
-Summary:     Display free space on virtual filesystems
-Group:       Development/Tools
-License:     GPLv2+
-Requires:    %{name} = %{epoch}:%{version}-%{release}
-Requires:    perl-Sys-Virt
 # RHBZ#514309
 Provides:    virt-df2 = %{epoch}:%{version}-%{release}
 Obsoletes:   virt-df2 <= %{epoch}:%{version}-%{release}
 
+# These were never packages:
+Provides:    virt-edit = %{epoch}:%{version}-%{release}
+Provides:    virt-rescue = %{epoch}:%{version}-%{release}
 
-%description -n virt-df
-"virt-df" is a command line tool to display free space on virtual
-machine filesystems.  Unlike other tools, it doesn?t just display the
-amount of space allocated to a virtual machine, but can look inside
-the virtual machine to see how much space is really being used.
 
-It is like the df(1) command, but for virtual machines, except that it
-also works for Windows virtual machines.
+%description tools
+This package contains miscellaneous system administrator command line
+tools for virtual machines.
 
+Virt-cat is a command line tool to display the contents of a file in a
+virtual machine.
 
-%package -n virt-cat
-Summary:     Display a file in a virtual machine
-Group:       Development/Tools
-License:     GPLv2+
-Requires:    %{name} = %{epoch}:%{version}-%{release}
-Requires:    perl-Sys-Virt
+Virt-df is a command line tool to display free space on virtual
+machine filesystems.  Unlike other tools, it doesn?t just display the
+amount of space allocated to a virtual machine, but can look inside
+the virtual machine to see how much space is really being used.  It is
+like the df(1) command, but for virtual machines, except that it also
+works for Windows virtual machines.
+
+Virt-edit is a command line tool to edit the contents of a file in a
+virtual machine.
 
+Virt-inspector examines a virtual machine and tries to determine the
+version of the OS, the kernel version, what drivers are installed,
+whether the virtual machine is fully virtualized (FV) or
+para-virtualized (PV), what applications are installed and more.
 
-%description -n virt-cat
-"virt-cat" is a command line tool to display the contents
-of a file in a virtual machine.
+Virt-rescue provides a rescue shell for making interactive,
+unstructured fixes to virtual machines.
 
 
 %package -n ocaml-%{name}
@@ -452,22 +453,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/guestfish.1*
 
 
-%files -n virt-inspector
-%defattr(-,root,root,-)
-%{_bindir}/virt-inspector
-%{_mandir}/man1/virt-inspector.1*
-
-
-%files -n virt-df
-%defattr(-,root,root,-)
-%{_bindir}/virt-df
-%{_mandir}/man1/virt-df.1*
-
-
-%files -n virt-cat
+%files tools
 %defattr(-,root,root,-)
 %{_bindir}/virt-cat
 %{_mandir}/man1/virt-cat.1*
+%{_bindir}/virt-df
+%{_mandir}/man1/virt-df.1*
+%{_bindir}/virt-edit
+%{_mandir}/man1/virt-edit.1*
+%{_bindir}/virt-inspector
+%{_mandir}/man1/virt-inspector.1*
+%{_bindir}/virt-rescue
+%{_mandir}/man1/virt-rescue.1*
 
 
 %files -n ocaml-%{name}
@@ -535,6 +532,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
+- New upstream release 1.0.72.
+- New tools: virt-edit, virt-rescue.
+- Combine virt-cat, virt-df, virt-edit, virt-inspector and virt-rescue
+  into a single package called libguestfs-tools.
+
 * Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-1
 - New upstream release 1.0.71.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	22 Sep 2009 14:29:31 -0000	1.37
+++ sources	23 Sep 2009 13:39:11 -0000	1.38
@@ -1 +1 @@
-24bf32735f1a259b14b692cf78ae5d74  libguestfs-1.0.71.tar.gz
+d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz



From rjones at fedoraproject.org  Wed Sep 23 13:39:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 23 Sep 2009 13:39:05 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.50, 1.51 libguestfs.spec, 1.100,
	1.101 sources, 1.50, 1.51
Message-ID: <20090923133905.A5E3A11C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15953

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
Version 1.0.72.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	22 Sep 2009 14:09:44 -0000	1.50
+++ .cvsignore	23 Sep 2009 13:39:05 -0000	1.51
@@ -1 +1 @@
-libguestfs-1.0.71.tar.gz
+libguestfs-1.0.72.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- libguestfs.spec	22 Sep 2009 14:30:30 -0000	1.100
+++ libguestfs.spec	23 Sep 2009 13:39:05 -0000	1.101
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.71
-Release:     2%{?dist}
+Version:     1.0.72
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -64,7 +64,7 @@ BuildRequires: java >= 1.5.0
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 
-# For virt-inspector:
+# For libguestfs-tools:
 BuildRequires: perl-Sys-Virt
 
 # Runtime requires:
@@ -139,54 +139,55 @@ modifying virtual machine disk images fr
 scripts.
 
 
-%package -n virt-inspector
-Summary:     Display OS version, kernel, drivers, etc in a virtual machine
+%package tools
+Summary:     System administration tools for virtual machines
 Group:       Development/Tools
 License:     GPLv2+
 Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    guestfish
 Requires:    perl-Sys-Virt
 
+# Obsolete and replace earlier packages.
+Provides:    virt-cat = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-cat <= %{epoch}:%{version}-%{release}
+Provides:    virt-df = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-df <= %{epoch}:%{version}-%{release}
+Provides:    virt-inspector = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-inspector <= %{epoch}:%{version}-%{release}
 
-%description -n virt-inspector
-Virt-inspector examines a virtual machine and tries to determine the
-version of the OS, the kernel version, what drivers are installed,
-whether the virtual machine is fully virtualized (FV) or
-para-virtualized (PV), what applications are installed and more.
-
-
-%package -n virt-df
-Summary:     Display free space on virtual filesystems
-Group:       Development/Tools
-License:     GPLv2+
-Requires:    %{name} = %{epoch}:%{version}-%{release}
-Requires:    perl-Sys-Virt
 # RHBZ#514309
 Provides:    virt-df2 = %{epoch}:%{version}-%{release}
 Obsoletes:   virt-df2 <= %{epoch}:%{version}-%{release}
 
+# These were never packages:
+Provides:    virt-edit = %{epoch}:%{version}-%{release}
+Provides:    virt-rescue = %{epoch}:%{version}-%{release}
 
-%description -n virt-df
-"virt-df" is a command line tool to display free space on virtual
-machine filesystems.  Unlike other tools, it doesn?t just display the
-amount of space allocated to a virtual machine, but can look inside
-the virtual machine to see how much space is really being used.
 
-It is like the df(1) command, but for virtual machines, except that it
-also works for Windows virtual machines.
+%description tools
+This package contains miscellaneous system administrator command line
+tools for virtual machines.
 
+Virt-cat is a command line tool to display the contents of a file in a
+virtual machine.
 
-%package -n virt-cat
-Summary:     Display a file in a virtual machine
-Group:       Development/Tools
-License:     GPLv2+
-Requires:    %{name} = %{epoch}:%{version}-%{release}
-Requires:    perl-Sys-Virt
+Virt-df is a command line tool to display free space on virtual
+machine filesystems.  Unlike other tools, it doesn?t just display the
+amount of space allocated to a virtual machine, but can look inside
+the virtual machine to see how much space is really being used.  It is
+like the df(1) command, but for virtual machines, except that it also
+works for Windows virtual machines.
+
+Virt-edit is a command line tool to edit the contents of a file in a
+virtual machine.
 
+Virt-inspector examines a virtual machine and tries to determine the
+version of the OS, the kernel version, what drivers are installed,
+whether the virtual machine is fully virtualized (FV) or
+para-virtualized (PV), what applications are installed and more.
 
-%description -n virt-cat
-"virt-cat" is a command line tool to display the contents
-of a file in a virtual machine.
+Virt-rescue provides a rescue shell for making interactive,
+unstructured fixes to virtual machines.
 
 
 %package -n ocaml-%{name}
@@ -456,22 +457,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/guestfish.1*
 
 
-%files -n virt-inspector
-%defattr(-,root,root,-)
-%{_bindir}/virt-inspector
-%{_mandir}/man1/virt-inspector.1*
-
-
-%files -n virt-df
-%defattr(-,root,root,-)
-%{_bindir}/virt-df
-%{_mandir}/man1/virt-df.1*
-
-
-%files -n virt-cat
+%files tools
 %defattr(-,root,root,-)
 %{_bindir}/virt-cat
 %{_mandir}/man1/virt-cat.1*
+%{_bindir}/virt-df
+%{_mandir}/man1/virt-df.1*
+%{_bindir}/virt-edit
+%{_mandir}/man1/virt-edit.1*
+%{_bindir}/virt-inspector
+%{_mandir}/man1/virt-inspector.1*
+%{_bindir}/virt-rescue
+%{_mandir}/man1/virt-rescue.1*
 
 
 %files -n ocaml-%{name}
@@ -539,6 +536,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
+- New upstream release 1.0.72.
+- New tools: virt-edit, virt-rescue.
+- Combine virt-cat, virt-df, virt-edit, virt-inspector and virt-rescue
+  into a single package called libguestfs-tools.
+
 * Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-2
 - New upstream release 1.0.71.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	22 Sep 2009 14:09:46 -0000	1.50
+++ sources	23 Sep 2009 13:39:05 -0000	1.51
@@ -1 +1 @@
-24bf32735f1a259b14b692cf78ae5d74  libguestfs-1.0.71.tar.gz
+d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz



From rjones at fedoraproject.org  Wed Sep 23 13:39:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 23 Sep 2009 13:39:12 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.31, 1.32 libguestfs.spec, 1.68, 
	1.69 sources, 1.31, 1.32
Message-ID: <20090923133912.E55B611C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16032

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
Version 1.0.72.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	22 Sep 2009 14:09:30 -0000	1.31
+++ .cvsignore	23 Sep 2009 13:39:12 -0000	1.32
@@ -1 +1 @@
-libguestfs-1.0.71.tar.gz
+libguestfs-1.0.72.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- libguestfs.spec	22 Sep 2009 14:09:31 -0000	1.68
+++ libguestfs.spec	23 Sep 2009 13:39:12 -0000	1.69
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.71
+Version:     1.0.72
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -78,7 +78,7 @@ BuildRequires: java >= 1.5.0
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 
-# For virt-inspector:
+# For libguestfs-tools:
 #BuildRequires: perl-Sys-Virt
 
 # Runtime requires:
@@ -158,51 +158,55 @@ modifying virtual machine disk images fr
 scripts.
 
 
-#%package -n virt-inspector
-#Summary:     Display OS version, kernel, drivers, etc in a virtual machine
-#Group:       Development/Tools
-#License:     GPLv2+
-#Requires:    %{name} = %{epoch}:%{version}-%{release}
-#Requires:    guestfish
-#Requires:    perl-Sys-Virt
-#
-#
-#%description -n virt-inspector
-#Virt-inspector examines a virtual machine and tries to determine the
-#version of the OS, the kernel version, what drivers are installed,
-#whether the virtual machine is fully virtualized (FV) or
-#para-virtualized (PV), what applications are installed and more.
-
-
-#%package -n virt-df
-#Summary:     Display free space on virtual filesystems
-#Group:       Development/Tools
-#License:     GPLv2+
-#Requires:    %{name} = %{epoch}:%{version}-%{release}
-#Requires:    perl-Sys-Virt
-#
-#
-#%description -n virt-df
-#"virt-df" is a command line tool to display free space on virtual
-#machine filesystems.  Unlike other tools, it doesn?t just display the
-#amount of space allocated to a virtual machine, but can look inside
-#the virtual machine to see how much space is really being used.
-#
-#It is like the df(1) command, but for virtual machines, except that it
-#also works for Windows virtual machines.
-
-
-#%package -n virt-cat
-#Summary:     Display a file in a virtual machine
-#Group:       Development/Tools
-#License:     GPLv2+
-#Requires:    %{name} = %{epoch}:%{version}-%{release}
-#Requires:    perl-Sys-Virt
-#
-#
-#%description -n virt-cat
-#"virt-cat" is a command line tool to display the contents
-#of a file in a virtual machine.
+# %package tools
+# Summary:     System administration tools for virtual machines
+# Group:       Development/Tools
+# License:     GPLv2+
+# Requires:    %{name} = %{epoch}:%{version}-%{release}
+# Requires:    guestfish
+# Requires:    perl-Sys-Virt
+
+# # Obsolete and replace earlier packages.
+# Provides:    virt-cat = %{epoch}:%{version}-%{release}
+# Obsoletes:   virt-cat <= %{epoch}:%{version}-%{release}
+# Provides:    virt-df = %{epoch}:%{version}-%{release}
+# Obsoletes:   virt-df <= %{epoch}:%{version}-%{release}
+# Provides:    virt-inspector = %{epoch}:%{version}-%{release}
+# Obsoletes:   virt-inspector <= %{epoch}:%{version}-%{release}
+
+# # RHBZ#514309
+# Provides:    virt-df2 = %{epoch}:%{version}-%{release}
+# Obsoletes:   virt-df2 <= %{epoch}:%{version}-%{release}
+
+# # These were never packages:
+# Provides:    virt-edit = %{epoch}:%{version}-%{release}
+# Provides:    virt-rescue = %{epoch}:%{version}-%{release}
+
+
+# %description tools
+# This package contains miscellaneous system administrator command line
+# tools for virtual machines.
+
+# Virt-cat is a command line tool to display the contents of a file in a
+# virtual machine.
+
+# Virt-df is a command line tool to display free space on virtual
+# machine filesystems.  Unlike other tools, it doesn?t just display the
+# amount of space allocated to a virtual machine, but can look inside
+# the virtual machine to see how much space is really being used.  It is
+# like the df(1) command, but for virtual machines, except that it also
+# works for Windows virtual machines.
+
+# Virt-edit is a command line tool to edit the contents of a file in a
+# virtual machine.
+
+# Virt-inspector examines a virtual machine and tries to determine the
+# version of the OS, the kernel version, what drivers are installed,
+# whether the virtual machine is fully virtualized (FV) or
+# para-virtualized (PV), what applications are installed and more.
+
+# Virt-rescue provides a rescue shell for making interactive,
+# unstructured fixes to virtual machines.
 
 
 %package -n ocaml-%{name}
@@ -455,22 +459,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/guestfish.1*
 
 
-#%files -n virt-inspector
-#%defattr(-,root,root,-)
-#%{_bindir}/virt-inspector
-#%{_mandir}/man1/virt-inspector.1*
-
-
-#%files -n virt-df
-#%defattr(-,root,root,-)
-#%{_bindir}/virt-df
-#%{_mandir}/man1/virt-df.1*
-
-
-#%files -n virt-cat
-#%defattr(-,root,root,-)
-#%{_bindir}/virt-cat
-#%{_mandir}/man1/virt-cat.1*
+# %files tools
+# %defattr(-,root,root,-)
+# %{_bindir}/virt-cat
+# %{_mandir}/man1/virt-cat.1*
+# %{_bindir}/virt-df
+# %{_mandir}/man1/virt-df.1*
+# %{_bindir}/virt-edit
+# %{_mandir}/man1/virt-edit.1*
+# %{_bindir}/virt-inspector
+# %{_mandir}/man1/virt-inspector.1*
+# %{_bindir}/virt-rescue
+# %{_mandir}/man1/virt-rescue.1*
 
 
 %files -n ocaml-%{name}
@@ -538,6 +538,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
+- New upstream release 1.0.72.
+- New tools: virt-edit, virt-rescue.
+- Combine virt-cat, virt-df, virt-edit, virt-inspector and virt-rescue
+  into a single package called libguestfs-tools.
+- libguestfs-tools is still disabled on EPEL because we are
+  waiting for perl(Sys::Virt) to go into RHEL (in 5.4).
+
 * Tue Sep 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.71-1
 - New upstream release 1.0.71.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	22 Sep 2009 14:09:31 -0000	1.31
+++ sources	23 Sep 2009 13:39:12 -0000	1.32
@@ -1 +1 @@
-24bf32735f1a259b14b692cf78ae5d74  libguestfs-1.0.71.tar.gz
+d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz



From kasal at fedoraproject.org  Wed Sep 23 14:07:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 23 Sep 2009 14:07:12 +0000 (UTC)
Subject: rpms/pmount/devel .cvsignore, 1.3, 1.4 pmount.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20090923140712.553C911C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/pmount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25925

Modified Files:
	.cvsignore pmount.spec sources 
Log Message:
- new upstream version
- adjust BuildRequires


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pmount/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Mar 2008 22:48:39 -0000	1.3
+++ .cvsignore	23 Sep 2009 14:07:10 -0000	1.4
@@ -1 +1 @@
-pmount-0.9.17.tar.gz
+pmount-0.9.20.tar.gz


Index: pmount.spec
===================================================================
RCS file: /cvs/extras/rpms/pmount/devel/pmount.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pmount.spec	26 Jul 2009 18:59:31 -0000	1.7
+++ pmount.spec	23 Sep 2009 14:07:10 -0000	1.8
@@ -1,19 +1,21 @@
 Name:           pmount
-Version:        0.9.17
-Release:        5%{?dist}
+Version:        0.9.20
+Release:        1%{?dist}
 Summary:        Enable normal user mount
 
 Group:          System Environment/Base
 # realpath.c is GPLv2+. Others are GPL+;
 License:        GPLv2+
 URL:            http://pmount.alioth.debian.org/
-Source0:        http://alioth.debian.org/frs/download.php/2247/pmount-%{version}.tar.gz
+# BEWARE: The number in the url determines the content, ahs to be updated each time.
+Source0:        http://alioth.debian.org/frs/download.php/3127/pmount-0.9.20.tar.gz
 # don't set the setuid bits during make install
 Patch0:         pmount-0.9.17-nosetuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  intltool gettext pkgconfig
-BuildRequires:  libsysfs-devel hal-devel e2fsprogs-devel
+BuildRequires:  intltool pkgconfig
+BuildRequires:  hal-devel e2fsprogs-devel
+BuildRequires:	libblkid-devel
 # ntfs-3g may be used too, it is considered optional, will be used if installed.
 Requires:       cryptsetup-luks /bin/mount
 
@@ -26,6 +28,7 @@ Be warned that pmount is installed setui
 
 %prep
 %setup -q
+# patching src/Makefile.in; do not run automake:
 %patch0 -p1 -b .nosetuid
 
 %build
@@ -60,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/p*mount*.1*
 
 %changelog
+* Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 0.9.20-1
+- new upstream version
+- adjust BuildRequires
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pmount/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Mar 2008 22:48:39 -0000	1.3
+++ sources	23 Sep 2009 14:07:10 -0000	1.4
@@ -1 +1 @@
-24a676bf495bec367b2d971cdca1c54c  pmount-0.9.17.tar.gz
+237f069f5155f1c1e84b92c7d149fa9c  pmount-0.9.20.tar.gz



From cebbert at fedoraproject.org  Wed Sep 23 14:30:43 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 23 Sep 2009 14:30:43 +0000 (UTC)
Subject: rpms/kernel/devel Makefile,1.109,1.110
Message-ID: <20090923143044.9841311C0374@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3552

Modified Files:
	Makefile 
Log Message:
add unused-kernel-patches target


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- Makefile	14 Sep 2009 21:33:53 -0000	1.109
+++ Makefile	23 Sep 2009 14:30:33 -0000	1.110
@@ -138,6 +138,9 @@ reconfig:
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
 	@$(MAKE) tag TAG_OPTS="-F $(TAG_OPTS)"
 
+unused-kernel-patches:
+	@for f in *.patch; do if [ -e $$f ]; then (egrep -q "^Patch[[:digit:]]+:[[:space:]]+$$f" $(SPECFILE) || echo "Unused:    $$f") && egrep -q "^ApplyPatch[[:space:]]+$$f|^ApplyOptionalPatch[[:space:]]+$$f" $(SPECFILE) || echo "Unapplied: $$f"; fi; done
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
 



From jpopelka at fedoraproject.org  Wed Sep 23 14:31:50 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Wed, 23 Sep 2009 14:31:50 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.521,1.522 cups.init,1.21,1.22
Message-ID: <20090923143150.C9FEF11C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3957

Modified Files:
	cups.spec cups.init 
Log Message:
* Wed Sep 23 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-5
- Fixed cups.init to be LSB compliant (bug #521641)



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- cups.spec	21 Sep 2009 13:57:36 -0000	1.521
+++ cups.spec	23 Sep 2009 14:31:50 -0000	1.522
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -505,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+
+* Wed Sep 23 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-5
+- Fixed cups.init to be LSB compliant (bug #521641)
+
 * Mon Sep 21 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-4
 - Changed cups.init to be LSB compliant (bug #521641), i.e.
   return code "2" (instead of "3") if invalid arguments


Index: cups.init
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.init,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- cups.init	21 Sep 2009 13:57:36 -0000	1.21
+++ cups.init	23 Sep 2009 14:31:50 -0000	1.22
@@ -43,23 +43,25 @@
 ### END INIT INFO
 
 # Source function library.
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
 
 DAEMON=cupsd
-
+exec=/usr/sbin/cupsd
 prog=cups
+config=/etc/cups/cupsd.conf
+lockfile=/var/lock/subsys/$DAEMON
 
 check() {
 	# Check that we're a privileged user
 	[ `id -u` = 0 ] || exit 4
 	
 	# Check if cupsd is executable
-	[ -x /usr/sbin/cupsd ] || exit 5
+	[ -x $exec ] || exit 5
 }
 
 start () {
 	check
-	[ -f /etc/cups/cupsd.conf ] || exit 6
+	[ -f $config ] || exit 6
 
 	echo -n $"Starting $prog: "
 
@@ -70,7 +72,7 @@ start () {
 	daemon $DAEMON
         RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && touch /var/lock/subsys/cups
+	[ $RETVAL = 0 ] && touch $lockfile
 
 	udevadm trigger --subsystem-match=usb	\
 		--attr-match=bInterfaceClass=07	\
@@ -89,7 +91,7 @@ stop () {
 	killproc $DAEMON
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/cups
+	[ $RETVAL = 0 ] && rm -f $lockfile
 	return 0
 }
 
@@ -109,7 +111,7 @@ case $1 in
 		restart
 	;;
 	condrestart|try-restart)
-		[ -f /var/lock/subsys/cups ] && restart || :
+		[ -f $lockfile ] && restart || :
 	;;	
 	reload)
 		echo -n $"Reloading $prog: "
@@ -125,7 +127,7 @@ case $1 in
 		echo
 	;;
 	status)
-		status cups
+		status $DAEMON
 		RETVAL=$?
 	;;
 	restartlog)
@@ -135,7 +137,7 @@ case $1 in
 	;;
 	*)
 
-	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
+	echo $"Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
 	exit 2
 esac
 



From orion at fedoraproject.org  Wed Sep 23 15:06:49 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 23 Sep 2009 15:06:49 +0000 (UTC)
Subject: rpms/environment-modules/devel .cvsignore, 1.9,
	1.10 environment-modules.spec, 1.22, 1.23 sources, 1.9,
	1.10 bash_completion.in, 1.1, NONE
Message-ID: <20090923150649.99EC611C00E6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15863

Modified Files:
	.cvsignore environment-modules.spec sources 
Removed Files:
	bash_completion.in 
Log Message:
* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-1
- Update to 3.2.7b



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Sep 2009 16:06:49 -0000	1.9
+++ .cvsignore	23 Sep 2009 15:06:47 -0000	1.10
@@ -1 +1 @@
-modules-3.2.7.tar.bz2
+modules-3.2.7b.tar.bz2


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- environment-modules.spec	21 Sep 2009 16:35:32 -0000	1.22
+++ environment-modules.spec	23 Sep 2009 15:06:47 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           environment-modules
-Version:        3.2.7
+Version:        3.2.7b
 Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
@@ -7,8 +7,6 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-#Pulled this from current CVS, missing from 3.2.7 tarball
-Source1:        bash_completion.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -39,8 +37,7 @@ have access to the module alias.
 
 
 %prep
-%setup -q -n modules-%{version}
-cp -p %SOURCE1 init/
+%setup -q -n modules-3.2.7
 
 
 %build
@@ -76,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-1
+- Update to 3.2.7b
+
 * Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
 - Update to 3.2.7, fixes bug #524475
 - Drop versioning patch fixed upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Sep 2009 16:06:49 -0000	1.9
+++ sources	23 Sep 2009 15:06:47 -0000	1.10
@@ -1 +1 @@
-ab3b3be9e5d4938a10281c7e194b3709  modules-3.2.7.tar.bz2
+3ebba50a1f79e63aa9e2189e9e6c7952  modules-3.2.7b.tar.bz2


--- bash_completion.in DELETED ---



From caolanm at fedoraproject.org  Wed Sep 23 15:09:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Sep 2009 15:09:32 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.aw073.patch, 1.2,
	1.3 openoffice.org.spec, 1.1935, 1.1936
Message-ID: <20090923150932.94E9B11C00E6@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-serv16850/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.aw073.patch 
Log Message:
Resolves: rhbz#522839 crash on exit after loading .doc

workspace.aw073.patch:
 editobj.cxx |   36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

Index: workspace.aw073.patch
===================================================================
RCS file: workspace.aw073.patch
diff -N workspace.aw073.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace.aw073.patch	23 Sep 2009 15:09:30 -0000	1.3
@@ -0,0 +1,78 @@
+Index: source/editeng/editobj.cxx
+===================================================================
+--- svx.orig/source/editeng/editobj.cxx	(.../tags/DEV300_m52/svx)	(revision 276405)
++++ svx/source/editeng/editobj.cxx	(.../cws/aw073/svx)	(revision 276405)
+@@ -599,6 +617,23 @@
+     }
+ }
+ 
++EditEngineItemPool* getEditEngineItemPool(SfxItemPool* pPool)
++{
++	EditEngineItemPool* pRetval = dynamic_cast< EditEngineItemPool* >(pPool);
++
++	while(!pRetval && pPool && pPool->GetSecondaryPool())
++	{
++		pPool = pPool->GetSecondaryPool();
++
++		if(pPool)
++		{
++			pRetval = dynamic_cast< EditEngineItemPool* >(pPool);
++		}
++	}
++
++	return pRetval;
++}
++
+ BinTextObject::BinTextObject( SfxItemPool* pP ) :
+ 	EditTextObject( EE_FORMAT_BIN ),
+     SfxItemPoolUser()
+@@ -608,9 +643,17 @@
+ 	nUserType = 0;
+ 	nObjSettings = 0;
+ 	pPortionInfo = 0;
+-	if ( pP )
++	
++	// #i101239# ensure target is a EditEngineItemPool, else
++	// fallback to pool ownership. This is needed to ensure that at
++	// pool destruction time of an alien pool, the pool is still alive.
++	// When registering would happen at an alien pool which just uses an
++	// EditEngineItemPool as some sub-pool, that pool could already
++	// be decoupled and deleted whcih would lead to crashes.
++	pPool =	getEditEngineItemPool(pP);
++	
++	if ( pPool )
+ 	{
+-		pPool =	pP;
+ 		bOwnerOfPool = FALSE;
+ 	}
+ 	else
+@@ -621,6 +664,7 @@
+ 
+     if(!bOwnerOfPool && pPool)
+     {
++		// it is sure now that the pool is an EditEngineItemPool
+         pPool->AddSfxItemPoolUser(*this);
+     }
+ 
+@@ -641,9 +685,12 @@
+ 	nScriptType = r.nScriptType;
+ 	pPortionInfo = NULL;	// PortionInfo nicht kopieren
+ 	bStoreUnicodeStrings = FALSE;
++
+ 	if ( !r.bOwnerOfPool )
+ 	{
+-		// Dann den Pool mitverwenden
++		// reuse alien pool; this must be a EditEngineItemPool
++		// since there is no other way to construct a BinTextObject
++		// than it's regular constructor where that is ensured
+ 		pPool =	r.pPool;
+ 		bOwnerOfPool = FALSE;
+ 	}
+@@ -656,6 +703,7 @@
+ 
+     if(!bOwnerOfPool && pPool)
+     {
++		// it is sure now that the pool is an EditEngineItemPool
+         pPool->AddSfxItemPoolUser(*this);
+     }
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1935
retrieving revision 1.1936
diff -u -p -r1.1935 -r1.1936
--- openoffice.org.spec	8 Sep 2009 11:51:42 -0000	1.1935
+++ openoffice.org.spec	23 Sep 2009 15:09:28 -0000	1.1936
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -156,6 +156,7 @@ Patch80: openoffice.org-3.1.1.ooo104329.
 Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
+Patch84: workspace.aw073.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1670,6 +1671,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch81 -p0 -b .workspace.os131.patch
 %patch82 -p0 -b .workspace.vcl102.patch
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
+%patch84 -p0 -b .workspace.aw073.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4173,6 +4175,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
+- Resolves: rhbz#522839 crash on exit after loading .doc
+
 * Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
 - Resolves: rhbz#521460 - wrong UI label for A3/A5 page sizes in translations
 



From caolanm at fedoraproject.org  Wed Sep 23 15:09:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Sep 2009 15:09:32 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.aw073.patch, 1.2,
	1.3 openoffice.org.spec, 1.2010, 1.2011
Message-ID: <20090923150932.A883111C00EB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16850/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.aw073.patch 
Log Message:
Resolves: rhbz#522839 crash on exit after loading .doc

workspace.aw073.patch:
 editobj.cxx |   36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

Index: workspace.aw073.patch
===================================================================
RCS file: workspace.aw073.patch
diff -N workspace.aw073.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace.aw073.patch	23 Sep 2009 15:09:31 -0000	1.3
@@ -0,0 +1,78 @@
+Index: source/editeng/editobj.cxx
+===================================================================
+--- svx.orig/source/editeng/editobj.cxx	(.../tags/DEV300_m52/svx)	(revision 276405)
++++ svx/source/editeng/editobj.cxx	(.../cws/aw073/svx)	(revision 276405)
+@@ -599,6 +617,23 @@
+     }
+ }
+ 
++EditEngineItemPool* getEditEngineItemPool(SfxItemPool* pPool)
++{
++	EditEngineItemPool* pRetval = dynamic_cast< EditEngineItemPool* >(pPool);
++
++	while(!pRetval && pPool && pPool->GetSecondaryPool())
++	{
++		pPool = pPool->GetSecondaryPool();
++
++		if(pPool)
++		{
++			pRetval = dynamic_cast< EditEngineItemPool* >(pPool);
++		}
++	}
++
++	return pRetval;
++}
++
+ BinTextObject::BinTextObject( SfxItemPool* pP ) :
+ 	EditTextObject( EE_FORMAT_BIN ),
+     SfxItemPoolUser()
+@@ -608,9 +643,17 @@
+ 	nUserType = 0;
+ 	nObjSettings = 0;
+ 	pPortionInfo = 0;
+-	if ( pP )
++	
++	// #i101239# ensure target is a EditEngineItemPool, else
++	// fallback to pool ownership. This is needed to ensure that at
++	// pool destruction time of an alien pool, the pool is still alive.
++	// When registering would happen at an alien pool which just uses an
++	// EditEngineItemPool as some sub-pool, that pool could already
++	// be decoupled and deleted whcih would lead to crashes.
++	pPool =	getEditEngineItemPool(pP);
++	
++	if ( pPool )
+ 	{
+-		pPool =	pP;
+ 		bOwnerOfPool = FALSE;
+ 	}
+ 	else
+@@ -621,6 +664,7 @@
+ 
+     if(!bOwnerOfPool && pPool)
+     {
++		// it is sure now that the pool is an EditEngineItemPool
+         pPool->AddSfxItemPoolUser(*this);
+     }
+ 
+@@ -641,9 +685,12 @@
+ 	nScriptType = r.nScriptType;
+ 	pPortionInfo = NULL;	// PortionInfo nicht kopieren
+ 	bStoreUnicodeStrings = FALSE;
++
+ 	if ( !r.bOwnerOfPool )
+ 	{
+-		// Dann den Pool mitverwenden
++		// reuse alien pool; this must be a EditEngineItemPool
++		// since there is no other way to construct a BinTextObject
++		// than it's regular constructor where that is ensured
+ 		pPool =	r.pPool;
+ 		bOwnerOfPool = FALSE;
+ 	}
+@@ -656,6 +703,7 @@
+ 
+     if(!bOwnerOfPool && pPool)
+     {
++		// it is sure now that the pool is an EditEngineItemPool
+         pPool->AddSfxItemPoolUser(*this);
+     }
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2010
retrieving revision 1.2011
diff -u -p -r1.2010 -r1.2011
--- openoffice.org.spec	15 Sep 2009 20:03:32 -0000	1.2010
+++ openoffice.org.spec	23 Sep 2009 15:09:30 -0000	1.2011
@@ -160,6 +160,7 @@ Patch83: openoffice.org-3.1.1.ooo104157.
 Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch87: workspace.aw073.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1706,6 +1707,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch84 -p0 -b .workspace.dr69.patch
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch87 -p0 -b .workspace.aw073.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4239,6 +4241,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
+- Resolves: rhbz#522839 crash on exit after loading .doc
+
 * Tue Sep 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - disable NumberFormatRecognition from default writer configuration (caolanm)
 - Resolves: rhbz#522056 - wrong match of fonts (non-)proportional (dtardon)



From caolanm at fedoraproject.org  Wed Sep 23 15:10:12 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Sep 2009 15:10:12 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2011,1.2012
Message-ID: <20090923151012.3E5A411C0423@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17432

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#522839 crash on exit after loading .doc


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2011
retrieving revision 1.2012
diff -u -p -r1.2011 -r1.2012
--- openoffice.org.spec	23 Sep 2009 15:09:30 -0000	1.2011
+++ openoffice.org.spec	23 Sep 2009 15:10:11 -0000	1.2012
@@ -4242,7 +4242,7 @@ fi
 
 %changelog
 * Wed Sep 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
-- Resolves: rhbz#522839 crash on exit after loading .doc
+- Resolves: rhbz#522839 crash on exit after loading .doc (caolanm)
 
 * Tue Sep 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - disable NumberFormatRecognition from default writer configuration (caolanm)



From limb at fedoraproject.org  Wed Sep 23 15:15:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 23 Sep 2009 15:15:35 +0000 (UTC)
Subject: rpms/roundcubemail/devel .cvsignore, 1.12, 1.13 roundcubemail.spec, 
	1.25, 1.26 sources, 1.13, 1.14
Message-ID: <20090923151535.8501A11C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19848

Modified Files:
	.cvsignore roundcubemail.spec sources 
Log Message:
0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Jul 2009 13:07:34 -0000	1.12
+++ .cvsignore	23 Sep 2009 15:15:34 -0000	1.13
@@ -1 +1 @@
-roundcubemail-0.2.2-dep.tar.gz
+roundcubemail-0.3-stable-dep.tar.gz


Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/roundcubemail.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- roundcubemail.spec	27 Jul 2009 03:08:51 -0000	1.25
+++ roundcubemail.spec	23 Sep 2009 15:15:34 -0000	1.26
@@ -1,13 +1,13 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
-Version:  0.2.2
-Release:  3%{?dist}
+Version:  0.3
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-dep.tar.gz
+Source0: roundcubemail-%{version}-stable-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
@@ -45,7 +45,7 @@ requires the MySQL database or the Postg
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2.2-dep
+%setup -q -n roundcubemail-0.3-stable-dep
 
 %patch0 -p0
 #%patch1 -p0
@@ -143,6 +143,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-1
+- New upstream.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Jul 2009 13:07:34 -0000	1.13
+++ sources	23 Sep 2009 15:15:34 -0000	1.14
@@ -1 +1 @@
-926d6391bc4014476ce8461354ed9c9f  roundcubemail-0.2.2-dep.tar.gz
+f574e0c1f22194c752f5ae415a90d6cc  roundcubemail-0.3-stable-dep.tar.gz



From epienbro at fedoraproject.org  Wed Sep 23 15:20:35 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 23 Sep 2009 15:20:35 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2.spec, 1.18,
	1.19 gtk2-fix-install.patch, 1.1, NONE
Message-ID: <20090923152035.7853911C0418@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22752

Modified Files:
	mingw32-gtk2.spec 
Removed Files:
	gtk2-fix-install.patch 
Log Message:
Drop upstreamed patch



Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mingw32-gtk2.spec	23 Sep 2009 13:20:47 -0000	1.18
+++ mingw32-gtk2.spec	23 Sep 2009 15:20:35 -0000	1.19
@@ -24,9 +24,6 @@ Source1:        gdk-pixbuf.loaders
 # wine %{_mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
 Source2:        gtk.immodules
 
-# Patch to fix the translations detection (got broken in GTK 2.17.11)
-Patch0:         gtk2-fix-install.patch
-
 # Fix use of extended buttons in gtkstatusicon.
 Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 
@@ -94,8 +91,6 @@ Static version of the MinGW Windows Gtk2
 %prep
 %setup -q -n gtk+-%{version}
 
-%patch0 -p1
-
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
@@ -344,6 +339,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.0-1
 - Update to 2.18.0
+- Drop upstreamed patch
 
 * Sun Sep 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-3
 - Use relative paths instead of absolute paths in the gdk-pixbuf.loaders file


--- gtk2-fix-install.patch DELETED ---



From agoode at fedoraproject.org  Wed Sep 23 15:25:00 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 23 Sep 2009 15:25:00 +0000 (UTC)
Subject: rpms/minirpc/devel minirpc.spec,1.7,1.8
Message-ID: <20090923152500.BCED611C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/minirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24287

Modified Files:
	minirpc.spec 
Log Message:
* Wed Sep 23 2009 Adam Goode <adam at spicenitz.org> - 0.3.2-5
- Temporarily disable checks to get around FTBFS (#511677)



Index: minirpc.spec
===================================================================
RCS file: /cvs/extras/rpms/minirpc/devel/minirpc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- minirpc.spec	25 Jul 2009 14:34:03 -0000	1.7
+++ minirpc.spec	23 Sep 2009 15:24:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		minirpc
 Version:	0.3.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	C library for remote procedure calls over stream-oriented transports
 
 Group:		System Environment/Libraries
@@ -39,8 +39,8 @@ developing applications that use %{name}
 %configure --disable-static
 make all html %{?_smp_mflags}
 
-%check
-make check
+#%check
+#make check
 
 
 %install
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Adam Goode <adam at spicenitz.org> - 0.3.2-5
+- Temporarily disable checks to get around FTBFS (#511677)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Sep 23 15:31:15 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 23 Sep 2009 15:31:15 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.101,1.102
Message-ID: <20090923153115.326CB11C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26913

Modified Files:
	libguestfs.spec 
Log Message:
Fix net builds.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- libguestfs.spec	23 Sep 2009 13:39:05 -0000	1.101
+++ libguestfs.spec	23 Sep 2009 15:31:14 -0000	1.102
@@ -304,7 +304,7 @@ find /var/cache/yum -type f -name '*.rpm
 createrepo repo
 %define extra --with-mirror=file://$(pwd)/repo --with-repo=fedora-12 --with-updates=none
 %else
-%define extra %nil
+%define extra --with-mirror=http://download.fedora.redhat.com/pub/fedora/linux/development/x86_64/os/
 %endif
 
 ./configure \



From orion at fedoraproject.org  Wed Sep 23 15:32:35 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 23 Sep 2009 15:32:35 +0000 (UTC)
Subject: rpms/environment-modules/F-11 .cvsignore, 1.9,
	1.10 environment-modules.spec, 1.19, 1.20 import.log, 1.1,
	1.2 sources, 1.9, 1.10 bash_completion.in, 1.1, NONE
Message-ID: <20090923153235.C7B6A11C00E6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27333/F-11

Modified Files:
	.cvsignore environment-modules.spec import.log sources 
Removed Files:
	bash_completion.in 
Log Message:
Update to 3.2.7b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Sep 2009 16:59:34 -0000	1.9
+++ .cvsignore	23 Sep 2009 15:32:35 -0000	1.10
@@ -1 +1 @@
-modules-3.2.7.tar.bz2
+modules-3.2.7b.tar.bz2


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- environment-modules.spec	21 Sep 2009 16:59:34 -0000	1.19
+++ environment-modules.spec	23 Sep 2009 15:32:35 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           environment-modules
-Version:        3.2.7
+Version:        3.2.7b
 Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
@@ -7,8 +7,6 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-#Pulled this from current CVS, missing from 3.2.7 tarball
-Source1:        bash_completion.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -39,8 +37,7 @@ have access to the module alias.
 
 
 %prep
-%setup -q -n modules-%{version}
-cp -p %SOURCE1 init/
+%setup -q -n modules-3.2.7
 
 
 %build
@@ -76,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-1
+- Update to 3.2.7b
+
 * Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
 - Update to 3.2.7, fixes bug #524475
 - Drop versioning patch fixed upstream


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	21 Sep 2009 16:59:34 -0000	1.1
+++ import.log	23 Sep 2009 15:32:35 -0000	1.2
@@ -1 +1,2 @@
 environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344
+environment-modules-3_2_7b-1_fc12:F-11:environment-modules-3.2.7b-1.fc12.src.rpm:1253719416


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Sep 2009 16:59:34 -0000	1.9
+++ sources	23 Sep 2009 15:32:35 -0000	1.10
@@ -1 +1 @@
-ab3b3be9e5d4938a10281c7e194b3709  modules-3.2.7.tar.bz2
+3ebba50a1f79e63aa9e2189e9e6c7952  modules-3.2.7b.tar.bz2


--- bash_completion.in DELETED ---



From agoode at fedoraproject.org  Wed Sep 23 15:34:43 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 23 Sep 2009 15:34:43 +0000 (UTC)
Subject: rpms/minirpc/devel minirpc.spec,1.8,1.9
Message-ID: <20090923153443.49A3111C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/minirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28550

Modified Files:
	minirpc.spec 
Log Message:
Add bug number for disabled make check


Index: minirpc.spec
===================================================================
RCS file: /cvs/extras/rpms/minirpc/devel/minirpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- minirpc.spec	23 Sep 2009 15:24:59 -0000	1.8
+++ minirpc.spec	23 Sep 2009 15:34:42 -0000	1.9
@@ -39,6 +39,7 @@ developing applications that use %{name}
 %configure --disable-static
 make all html %{?_smp_mflags}
 
+# Bug #525182
 #%check
 #make check
 



From kasal at fedoraproject.org  Wed Sep 23 15:36:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 23 Sep 2009 15:36:42 +0000 (UTC)
Subject: rpms/libsx/devel libsx-trunc.diff,NONE,1.1 libsx.spec,1.14,1.15
Message-ID: <20090923153642.275F611C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/libsx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29493

Modified Files:
	libsx.spec 
Added Files:
	libsx-trunc.diff 
Log Message:
- fix build (#511719)

libsx-trunc.diff:
 colorsel.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libsx-trunc.diff ---
--- libsx-2.05/src/colorsel.c.trunc	2009-09-23 16:12:48.000000000 +0200
+++ libsx-2.05/src/colorsel.c	2009-09-23 16:24:20.000000000 +0200
@@ -65,6 +65,7 @@
 static void show_best_match(Widget w, CSelData *cdata);
 */
 
+#define trunc colorsel_trunc
 int trunc(float v)
 {
   return (int)(0.5+v);


Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libsx.spec	25 Jul 2009 08:42:55 -0000	1.14
+++ libsx.spec	23 Sep 2009 15:36:41 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           libsx
 Summary:        Simple X library
 Version:        2.05
-Release:        17%{?dist}
+Release:        18%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
 Url:            ftp://ftp.ac-grenoble.fr/ge/Xlibraries/
@@ -14,6 +14,7 @@ Patch2:         libsx-strdup.diff
 Patch3:         libsx-examples.diff
 Patch4:         libsx-link_mkdir.diff
 Patch6:         libsx-rgb.diff
+Patch7:         libsx-trunc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # libXt-devel requires libX11-devel and libXaw-devel requires libXmu-devel
 BuildRequires:  libXaw-devel libXpm-devel libXt-devel 
@@ -55,6 +56,8 @@ necessary for building programs against 
 %patch4 -p1 -b .link_mkdir
 # allow the rgb file location to be redefined
 %patch6 -p1 -b .rgb
+# prevent clash with system trunc()
+%patch7 -p1 -b .trunc
 
 # example of a simple use of the new GetFile
 cp -p %{SOURCE1} freq/simple_freq.c
@@ -118,6 +121,9 @@ rm -rf %{buildroot}
 %{_includedir}/libsx.h
 
 %changelog
+* Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 2.05-18
+- fix build (#511719)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agoode at fedoraproject.org  Wed Sep 23 15:36:45 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 23 Sep 2009 15:36:45 +0000 (UTC)
Subject: rpms/openslide/F-11 openslide.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090923153645.9F68211C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29523

Modified Files:
	.cvsignore sources 
Added Files:
	openslide.spec 
Log Message:
Initial package


--- NEW FILE openslide.spec ---
Name:		openslide
Version:	2.2.0
Release:	3%{?dist}
Summary:	C library for reading virtual slides

Group:		System Environment/Libraries
License:	GPLv2
URL:		http://openslide.cs.cmu.edu/
Source0:	%{url}/download/%{name}-%{version}.tar.xz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	glib2-devel openjpeg-devel libtiff-devel
BuildRequires:	libjpeg-devel pkgconfig cairo-devel


%description
The OpenSlide library allows programs to access virtual slide files
regardless of the underlying image format.


%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	glib2-devel libtiff-devel openjpeg-devel libjpeg-devel pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README.txt gpl-2.0.txt TODO.txt LICENSE.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Tue Sep 22 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3
- Use xz instead of gz

* Mon Sep 21 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-2
- Be more explicit about include directory in files section

* Tue Sep 15 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-1
- New upstream release
   + Thread safety (sometimes lockless)

* Thu Sep 10 2009 Adam Goode <adam at spicenitz.org> - 2.1.0-1
- New upstream release
   + MIRAX support
   + More Aperio support
   + Properties and associated images support
   + Bug fixes

* Wed Feb 25 2009 Adam Goode <adam at spicenitz.org> - 1.1.1-1
- New upstream release
- No more included OpenJPEG
- Much faster rendering and loading

* Tue Dec  9 2008 Adam Goode <adam at spicenitz.org> - 1.0.0-1
- First release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:09:04 -0000	1.1
+++ .cvsignore	23 Sep 2009 15:36:45 -0000	1.2
@@ -0,0 +1 @@
+openslide-2.2.0.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:09:04 -0000	1.1
+++ sources	23 Sep 2009 15:36:45 -0000	1.2
@@ -0,0 +1 @@
+bec05ceb1dfb569606c4691010eecde8  openslide-2.2.0.tar.xz



From caolanm at fedoraproject.org  Wed Sep 23 15:43:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Sep 2009 15:43:07 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2012,1.2013
Message-ID: <20090923154307.9179C11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32361

Modified Files:
	openoffice.org.spec 
Log Message:
bump


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2012
retrieving revision 1.2013
diff -u -p -r1.2012 -r1.2013
--- openoffice.org.spec	23 Sep 2009 15:10:11 -0000	1.2012
+++ openoffice.org.spec	23 Sep 2009 15:43:06 -0000	1.2013
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}



From rdieter at fedoraproject.org  Wed Sep 23 15:48:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 15:48:42 +0000 (UTC)
Subject: rpms/choqok/devel choqok.spec,1.8,1.9
Message-ID: <20090923154842.6CB3D11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/choqok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2374

Modified Files:
	choqok.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.6-9
- add icon/desktop-file scriptlets
* Sun Aug 16 2009 Tejas Dinkar <tejas at gja.in> - 0.6.6-8
- Added Dependency on kdeutils
- Choqok 0.6.6 is out
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Jun 14 2009 Tejas Dinkar <tejas at gja.in> - 0.6.1-7
- Choqok 0.6.1 is out with the below two patches
* Sat Jun 13 2009 Tejas Dinkar <tejas at gja.in> - 0.6-6
- Fixed the inreplyto (via patch)
* Sat Jun 13 2009 Tejas Dinkar <tejas at gja.in> - 0.6-5
- Fixed the twitpocalypse (via patch)
* Wed May 27 2009 Tejas Dinkar <tejas at gja.in> - 0.6-4
- Changed to 0.6
* Fri Apr 10 2009 Tejas Dinkar <tejas at gja.in> - 0.5-3
- Added the TweetAll patch, remove this by 0.6
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-2
- Added AUTHORS changelog and TODO to doc
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-1
- Initial Version for Fedora



Index: choqok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/choqok.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- choqok.spec	16 Aug 2009 13:18:31 -0000	1.8
+++ choqok.spec	23 Sep 2009 15:48:40 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Choqok KDE Micro-Blogging Client
 Name: choqok
 Version: 0.6.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
@@ -10,9 +10,11 @@ Source: http://mirror.umoss.org/download
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake >= 2.6
+BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
 
+# FIXME/TODO: please document what this dep is for exactly -- Rex  :)
 Requires: kdeutils >= 4.1
 
 %description
@@ -34,13 +36,29 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_sharedir}/applications/kde4/choqok.desktop
+
 %clean
 rm -rf %{buildroot}
 
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README AUTHORS changelog TODO
@@ -52,6 +70,8 @@ rm -rf %{buildroot}
 %{_kde4_sharedir}/config.kcfg/choqok.kcfg
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.6-9
+- add icon/desktop-file scriptlets
 * Sun Aug 16 2009 Tejas Dinkar <tejas at gja.in> - 0.6.6-8
 - Added Dependency on kdeutils
 - Choqok 0.6.6 is out



From agoode at fedoraproject.org  Wed Sep 23 15:51:22 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 23 Sep 2009 15:51:22 +0000 (UTC)
Subject: rpms/openslide/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090923155122.053EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4159

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Sep 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3.1
- Use gz for F-10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:09:04 -0000	1.1
+++ .cvsignore	23 Sep 2009 15:51:21 -0000	1.2
@@ -0,0 +1 @@
+openslide-2.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:09:04 -0000	1.1
+++ sources	23 Sep 2009 15:51:21 -0000	1.2
@@ -0,0 +1 @@
+d667023105be1dc2c064454c7b76125d  openslide-2.2.0.tar.gz



From agoode at fedoraproject.org  Wed Sep 23 15:51:34 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 23 Sep 2009 15:51:34 +0000 (UTC)
Subject: rpms/openslide/F-10 openslide.spec,NONE,1.1
Message-ID: <20090923155134.ABB2911C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4486

Added Files:
	openslide.spec 
Log Message:
* Wed Sep 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3.1
- Use gz for F-10



--- NEW FILE openslide.spec ---
Name:		openslide
Version:	2.2.0
Release:	3%{?dist}.1
Summary:	C library for reading virtual slides

Group:		System Environment/Libraries
License:	GPLv2
URL:		http://openslide.cs.cmu.edu/
Source0:	%{url}/download/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	glib2-devel openjpeg-devel libtiff-devel
BuildRequires:	libjpeg-devel pkgconfig cairo-devel


%description
The OpenSlide library allows programs to access virtual slide files
regardless of the underlying image format.


%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	glib2-devel libtiff-devel openjpeg-devel libjpeg-devel pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README.txt gpl-2.0.txt TODO.txt LICENSE.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Wed Sep 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3.1
- Use gz for F-10

* Tue Sep 22 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3
- Use xz instead of gz

* Mon Sep 21 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-2
- Be more explicit about include directory in files section

* Tue Sep 15 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-1
- New upstream release
   + Thread safety (sometimes lockless)

* Thu Sep 10 2009 Adam Goode <adam at spicenitz.org> - 2.1.0-1
- New upstream release
   + MIRAX support
   + More Aperio support
   + Properties and associated images support
   + Bug fixes

* Wed Feb 25 2009 Adam Goode <adam at spicenitz.org> - 1.1.1-1
- New upstream release
- No more included OpenJPEG
- Much faster rendering and loading

* Tue Dec  9 2008 Adam Goode <adam at spicenitz.org> - 1.0.0-1
- First release



From jfch2222 at fedoraproject.org  Wed Sep 23 16:02:01 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 23 Sep 2009 16:02:01 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec, 1.82, 1.83 saslauthd.init,
	1.5, 1.6 saslauthd.sysconfig, 1.2, 1.3
Message-ID: <20090923160201.7176411C00E6@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8812

Modified Files:
	cyrus-sasl.spec saslauthd.init saslauthd.sysconfig 
Log Message:
Add possibility to run the saslauth without root privilegies (#185614)



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- cyrus-sasl.spec	21 Aug 2009 12:58:56 -0000	1.82
+++ cyrus-sasl.spec	23 Sep 2009 16:01:58 -0000	1.83
@@ -1,10 +1,14 @@
+%define username	saslauth
+%define hint		"Saslauthd user"
+%define homedir		%{_var}/empty/%{username}
+
 %define _plugindir2 %{_libdir}/sasl2
 %define bootstrap_cyrus_sasl 0
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -41,6 +45,12 @@ BuildRequires: db4-devel
 BuildRequires: openldap-devel
 %endif
 Requires(post): chkconfig, /sbin/service
+Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
+Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
+Requires: /sbin/nologin
+Provides: user(%username) = %hint
+Provides: group(%username) = %hint
+
 
 %description
 The %{name} package contains the Cyrus implementation of SASL.
@@ -292,6 +302,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/sas
 %clean
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
+%pre
+/usr/sbin/groupadd -r %{username} 2> /dev/null || :
+/usr/sbin/useradd -c \"%{hint}\" -g %{username} -s /sbin/nologin -r -d %{homedir} %{username} 2> /dev/null || :
+
 %post
 /sbin/chkconfig --add saslauthd
 
@@ -305,6 +319,8 @@ fi
 if [ $1 -ne 0 ] ; then
         /sbin/service saslauthd condrestart 2>&1 > /dev/null
 fi
+/usr/sbin/userdel %{username}
+/usr/sbin/groupdel %{username}
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -371,6 +387,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Wed Sep 23 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-3
+- Add possibility to run the saslauth without root privilegies (#185614)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.23-2
 - rebuilt with new openssl
 


Index: saslauthd.init
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- saslauthd.init	23 Jan 2009 16:05:35 -0000	1.5
+++ saslauthd.init	23 Sep 2009 16:01:58 -0000	1.6
@@ -38,7 +38,7 @@ lockfile=/var/lock/subsys/$prog
 start() {
 	[ -x $path ] || exit 5
 	echo -n $"Starting $prog: "
-	daemon $path -m $SOCKETDIR -a $MECH $FLAGS
+	daemon $DAEMONOPTS $path -m $SOCKETDIR -a $MECH $FLAGS
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile


Index: saslauthd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- saslauthd.sysconfig	29 Aug 2005 18:27:47 -0000	1.2
+++ saslauthd.sysconfig	23 Sep 2009 16:01:58 -0000	1.3
@@ -6,6 +6,9 @@ SOCKETDIR=/var/run/saslauthd
 # of which mechanism your installation was compiled with the ablity to use.
 MECH=pam
 
+# Options sent to the saslauthd. If the MECH is other than "pam" uncomment the next line.
+# DAEMONOPTS=--user saslauth
+
 # Additional flags to pass to saslauthd on the command line.  See saslauthd(8)
 # for the list of accepted flags.
 FLAGS=



From sbose at fedoraproject.org  Wed Sep 23 16:02:02 2009
From: sbose at fedoraproject.org (sbose)
Date: Wed, 23 Sep 2009 16:02:02 +0000 (UTC)
Subject: rpms/ctdb/devel .cvsignore, 1.9, 1.10 ctdb.spec, 1.12, 1.13 sources,
	1.9, 1.10
Message-ID: <20090923160202.75BE311C00E6@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8874

Modified Files:
	.cvsignore ctdb.spec sources 
Log Message:
Update to ctdb version 1.0.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Aug 2009 10:00:35 -0000	1.9
+++ .cvsignore	23 Sep 2009 16:02:02 -0000	1.10
@@ -1 +1 @@
-ctdb-1.0.88.tar.bz2
+ctdb-1.0.90.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ctdb.spec	24 Aug 2009 10:00:35 -0000	1.12
+++ ctdb.spec	23 Sep 2009 16:02:02 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.88
+Version: 1.0.90
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -132,6 +132,23 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Wed Sep 23 2009 Sumit Bose <sbose at redhat.com> - 1.0.90-1
+ - Update to ctdb version 1.0.90
+
+* Sat Sep 12 2009 : Version 1.0.90
+ - Be more forgiving for eventscripts that hang during startup
+ - Fix for a banning bug in the new banning logic
+
+* Thu Sep 3 2009 : Version 1.0.89
+ - Make it possible to manage winbind independently of samba.
+ - Add new prototype banning code
+ - Overwrite the vsftpd state file instead of appending. This eliminates
+   annoying errors in the log.
+ - Redirect some iptables commands to dev null
+ - From Michael A, explicitely set the broadcast when we takeover a public ip
+ - Remove a reclock file check we no longer need
+ - Skip any persistent database files ending in .bak
+
 * Mon Aug 17 2009 Sumit Bose <sbose at redhat.com> - 1.0.88-1
  - Update to ctdb version 1.0.88
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Aug 2009 10:00:35 -0000	1.9
+++ sources	23 Sep 2009 16:02:02 -0000	1.10
@@ -1 +1 @@
-cf1cc1f409312a1bcca14968638d1e2f  ctdb-1.0.88.tar.bz2
+3c803ac713fefebd28a837ced557ba20  ctdb-1.0.90.tar.bz2



From trasher at fedoraproject.org  Wed Sep 23 16:07:50 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Wed, 23 Sep 2009 16:07:50 +0000 (UTC)
Subject: rpms/BackupPC/devel BackupPC.spec,1.11,1.12
Message-ID: <20090923160750.1DFF711C00E6@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11562

Modified Files:
	BackupPC.spec 
Log Message:
Resolve bug #524630


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- BackupPC.spec	18 Sep 2009 21:09:41 -0000	1.11
+++ BackupPC.spec	23 Sep 2009 16:07:49 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -226,6 +226,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-8
+- Rebuild with latest SELinux policy (bug #524630)
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-7
 - Fix SELinux policy module for UserEmailInfo.pl file
 



From pbrobinson at fedoraproject.org  Wed Sep 23 16:08:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 23 Sep 2009 16:08:02 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.11, 1.12 mutter-moblin.spec, 
	1.12, 1.13 sources, 1.11, 1.12
Message-ID: <20090923160802.DDA7311C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11640

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.39.2 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Sep 2009 16:48:28 -0000	1.11
+++ .cvsignore	23 Sep 2009 16:08:02 -0000	1.12
@@ -1 +1 @@
-mutter-moblin-0.39.1.tar.bz2
+mutter-moblin-0.39.2.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mutter-moblin.spec	22 Sep 2009 16:48:28 -0000	1.12
+++ mutter-moblin.spec	23 Sep 2009 16:08:02 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.39.1
+Version:        0.39.2
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.2-1
+- New 0.39.2 upstream release
+
 * Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.1-1
 - New 0.39.1 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Sep 2009 16:48:28 -0000	1.11
+++ sources	23 Sep 2009 16:08:02 -0000	1.12
@@ -1 +1 @@
-2b8c66ed8ae5b6413ad1cd35a929a697  mutter-moblin-0.39.1.tar.bz2
+2fad624c0a8b2eb1ffb4a2f5c2aaa9f4  mutter-moblin-0.39.2.tar.bz2



From mlichvar at fedoraproject.org  Wed Sep 23 16:13:39 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 23 Sep 2009 16:13:39 +0000 (UTC)
Subject: rpms/libpcap/devel .cvsignore, 1.6, 1.7 libpcap.spec, 1.11,
	1.12 sources, 1.6, 1.7 libpcap-oldsoname.patch, 1.1,
	NONE libpcap-oneshot.patch, 1.1, NONE
Message-ID: <20090923161339.06AFD11C00E6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/libpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13508

Modified Files:
	.cvsignore libpcap.spec sources 
Removed Files:
	libpcap-oldsoname.patch libpcap-oneshot.patch 
Log Message:
- update to snapshot 20090922gite154e2
- drop old soname



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jul 2009 16:39:29 -0000	1.6
+++ .cvsignore	23 Sep 2009 16:13:38 -0000	1.7
@@ -1 +1 @@
-libpcap-20090716git6de2de.tar.gz
+libpcap-1.0.0-20090922gite154e2.tar.bz2


Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libpcap.spec	25 Jul 2009 06:24:34 -0000	1.11
+++ libpcap.spec	23 Sep 2009 16:13:38 -0000	1.12
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.0.0
-Release: 2.20090716git6de2de%{?dist}
+Release: 3.20090922gite154e2%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -10,14 +10,11 @@ BuildRequires: glibc-kernheaders >= 2.2.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 # git snapshot from git://bpf.tcpdump.org/libpcap
-Source: libpcap-20090716git6de2de.tar.gz
+Source: libpcap-1.0.0-20090922gite154e2.tar.bz2
 Patch1: libpcap-man.patch
 Patch2: libpcap-multilib.patch
 Patch3: libpcap-s390.patch
 Patch4: libpcap-0.8.3-ppp.patch
-Patch5: libpcap-oneshot.patch
-# temporarily provide old soname
-Patch6: libpcap-oldsoname.patch
 
 %description
 Libpcap provides a portable framework for low-level network
@@ -56,8 +53,6 @@ echo '1.0.0' > VERSION
 %patch2 -p1 -b .multilib
 %patch3 -p1 -b .s390
 %patch4 -p0 -b .ppp
-%patch5 -p1 -b .oneshot
-%patch6 -p1 -b .oldsoname
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
@@ -94,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Wed Sep 23 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-1.20090922gite154e2
+- update to snapshot 20090922gite154e2
+- drop old soname
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14:1.0.0-2.20090716git6de2de
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jul 2009 16:39:29 -0000	1.6
+++ sources	23 Sep 2009 16:13:38 -0000	1.7
@@ -1 +1 @@
-ac6459eb882d4e1107f8c351eb0131eb  libpcap-20090716git6de2de.tar.gz
+e7921eaa6eb247b696c1d6640c39f86c  libpcap-1.0.0-20090922gite154e2.tar.bz2


--- libpcap-oldsoname.patch DELETED ---


--- libpcap-oneshot.patch DELETED ---



From mlichvar at fedoraproject.org  Wed Sep 23 16:14:15 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 23 Sep 2009 16:14:15 +0000 (UTC)
Subject: rpms/libpcap/devel libpcap.spec,1.12,1.13
Message-ID: <20090923161415.CE2AC11C00E6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/libpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13722

Modified Files:
	libpcap.spec 
Log Message:
fix release in changelog



Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libpcap.spec	23 Sep 2009 16:13:38 -0000	1.12
+++ libpcap.spec	23 Sep 2009 16:14:15 -0000	1.13
@@ -89,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
-* Wed Sep 23 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-1.20090922gite154e2
+* Wed Sep 23 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-3.20090922gite154e2
 - update to snapshot 20090922gite154e2
 - drop old soname
 



From emaldonado at fedoraproject.org  Wed Sep 23 16:17:57 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 23 Sep 2009 16:17:57 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-prelink.conf, 1.2,
	1.3 nss-softokn.spec, 1.26, 1.27
Message-ID: <20090923161757.74E5A11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14663

Modified Files:
	nss-softokn-prelink.conf nss-softokn.spec 
Log Message:
Fix paths in nss-softokn-prelink so signed libraries don't get touched, rhbz#524794


Index: nss-softokn-prelink.conf
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-prelink.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-softokn-prelink.conf	17 Sep 2009 20:07:30 -0000	1.2
+++ nss-softokn-prelink.conf	23 Sep 2009 16:17:57 -0000	1.3
@@ -1,3 +1,3 @@
--b /lib{,64}/libfreebl3.so
--b /lib{,64}/libsoftokn3.so
--b /lib{,64}/libnssdbm3.so
+-b /usr/lib{,64}/libfreebl3.so
+-b /usr/lib{,64}/libsoftokn3.so
+-b /usr/lib{,64}/libnssdbm3.so


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nss-softokn.spec	17 Sep 2009 20:07:30 -0000	1.26
+++ nss-softokn.spec	23 Sep 2009 16:17:57 -0000	1.27
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          9%{?dist}
+Release:          10%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -290,6 +290,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Sep 23 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-10
+- Fix paths in nss-softokn-prelink so signed libraries don't get touched, rhbz#524794
+
 * Thu Sep 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-9
 - Add nssdbm3.so to nss-softokn-prelink.conf, rhbz#524077
 
@@ -306,7 +309,7 @@ done
 - Postuninstall scriptlet finishes quietly
 
 * Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
-- Remove symblic links to shared libraries from devel - 521155
+- Remove symblic links to shared libraries from devel, rhbz#521155
 - Apply the nss-nolocalsql patch
 - No rpath-link in nss-softokn-config
 



From simo at fedoraproject.org  Wed Sep 23 16:22:48 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 23 Sep 2009 16:22:48 +0000 (UTC)
Subject: rpms/libtevent/devel libtevent.spec,1.2,1.3
Message-ID: <20090923162248.4945E11C00E6@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16846

Modified Files:
	libtevent.spec 
Log Message:
* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-3
- Add patch to fix a segfault case



Index: libtevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/libtevent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libtevent.spec	16 Sep 2009 20:43:45 -0000	1.2
+++ libtevent.spec	23 Sep 2009 16:22:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name: libtevent
 Version: 0.9.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -10,6 +10,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 Patch1: tevent-098-add_abi_scripts_and_fix_exports.patch
 Patch2: tevent-098-abi-compat.patch
+Patch3: 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch
 
 BuildRequires: libtalloc-devel >= 2.0.0
 
@@ -35,6 +36,7 @@ Header files needed to develop programs 
 
 %patch1 -p1 -b .abi_checks
 %patch2 -p1 -b .abi_compat
+%patch3 -p1 -b .tevent_signal_segv
 
 %build
 %configure
@@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-3
+- Add patch to fix a segfault case
+
 * Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2
 - Fix abi compatibility with 0.9.3
 



From simo at fedoraproject.org  Wed Sep 23 16:32:00 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 23 Sep 2009 16:32:00 +0000 (UTC)
Subject: rpms/libtevent/devel
	0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch,
	NONE, 1.1 libtevent.spec, 1.3, 1.4
Message-ID: <20090923163200.91F7D11C00E6@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20108

Modified Files:
	libtevent.spec 
Added Files:
	0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch 
Log Message:
forgot to cvs add patch


0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch:
 tevent_signal.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch ---
>From 455d44d9618afdc1d1f4198ae9f64ccc56dee62f Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue, 22 Sep 2009 10:32:10 +0930
Subject: [PATCH] lib/tevent: a cleaner fix for be4ac227842530d484659f2db683453366326d8b segv

Revert 23abcd2318c69753aa2a144e1dc0f9cf9efdb705 and fix logic bug.

The current code loops through the event contexts, when it sees a different
one, it notifies the current one (ev) and updates ev to point to the new one.

This is dumb, because:
(1) ev starts as NULL, so this code crashes, and
(2) The final context will not be notified.

The correct fix for this is to update ev to the new one, then notify it.
Volker's fix works because we currently always have one event context.

Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
---
 lib/tevent/tevent_signal.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index 0ca2a27..d3325b6 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -90,18 +90,12 @@ static void tevent_common_signal_handler(int signum)
 	SIG_INCREMENT(sig_state->signal_count[signum]);
 	SIG_INCREMENT(sig_state->got_signal);
 
-	if (sig_state->sig_handlers[signum] != NULL) {
-		ev = sig_state->sig_handlers[signum]->se->event_ctx;
-		/* doesn't matter if this pipe overflows */
-		res = write(ev->pipe_fds[1], &c, 1);
-	}
-
 	/* Write to each unique event context. */
 	for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) {
 		if (sl->se->event_ctx != ev) {
+			ev = sl->se->event_ctx;
 			/* doesn't matter if this pipe overflows */
 			res = write(ev->pipe_fds[1], &c, 1);
-			ev = sl->se->event_ctx;
 		}
 	}
 
-- 
1.6.2.5



Index: libtevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/libtevent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libtevent.spec	23 Sep 2009 16:22:47 -0000	1.3
+++ libtevent.spec	23 Sep 2009 16:32:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name: libtevent
 Version: 0.9.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
-* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-3
+* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-4
 - Add patch to fix a segfault case
 
 * Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2



From orion at fedoraproject.org  Wed Sep 23 16:42:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 23 Sep 2009 16:42:46 +0000 (UTC)
Subject: rpms/perl-Astro-FITS-CFITSIO/EL-5 perl-Astro-FITS-CFITSIO.spec, 1.1,
	1.2
Message-ID: <20090923164246.694FE11C00E6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-Astro-FITS-CFITSIO/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24108

Modified Files:
	perl-Astro-FITS-CFITSIO.spec 
Log Message:
* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> 1.05-2
- Update license tag to GPL+ or Artistic



Index: perl-Astro-FITS-CFITSIO.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Astro-FITS-CFITSIO/EL-5/perl-Astro-FITS-CFITSIO.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Astro-FITS-CFITSIO.spec	2 Aug 2007 17:29:53 -0000	1.1
+++ perl-Astro-FITS-CFITSIO.spec	23 Sep 2009 16:42:46 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Astro-FITS-CFITSIO
 Version:        1.05
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for using the cfitsio library
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Astro-FITS-CFITSIO/
 Source0:        http://www.cpan.org/authors/id/P/PR/PRATZLAFF/Astro-FITS-CFITSIO-%{version}.tar.gz
@@ -47,5 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> 1.05-2
+- Update license tag to GPL+ or Artistic
+
 * Tue Jul 31 2007 Orion Poplawski 1.05-1
 - Specfile autogenerated by cpanspec 1.73.



From mlichvar at fedoraproject.org  Wed Sep 23 16:46:28 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 23 Sep 2009 16:46:28 +0000 (UTC)
Subject: rpms/tcpdump/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 tcpdump.spec, 1.77, 1.78
Message-ID: <20090923164628.A51F111C00E6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26469

Modified Files:
	.cvsignore sources tcpdump.spec 
Log Message:
- update to snapshot 20090921gitdf3cb4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	20 Aug 2009 15:11:11 -0000	1.16
+++ .cvsignore	23 Sep 2009 16:46:28 -0000	1.17
@@ -1,2 +1,2 @@
 tcpslice-1.2a3.tar.gz
-tcpdump-4.0.0-20090818git832d2c.tar.gz
+tcpdump-4.0.0-20090921gitdf3cb4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	20 Aug 2009 15:11:11 -0000	1.16
+++ sources	23 Sep 2009 16:46:28 -0000	1.17
@@ -1,2 +1,2 @@
 e329cbeb7e589f132d92c3447c477190  tcpslice-1.2a3.tar.gz
-4875284ec22ec84e42fba34d4ce6f20c  tcpdump-4.0.0-20090818git832d2c.tar.gz
+31a9d60b7e9e058251c4cf1da67e35e9  tcpdump-4.0.0-20090921gitdf3cb4.tar.bz2


Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- tcpdump.spec	21 Aug 2009 16:05:28 -0000	1.77
+++ tcpdump.spec	23 Sep 2009 16:46:28 -0000	1.78
@@ -2,7 +2,7 @@ Summary: A network traffic monitoring to
 Name: tcpdump
 Epoch: 14
 Version: 4.0.0
-Release: 2.20090818git832d2c%{?dist}
+Release: 3.20090921gitdf3cb4%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 #Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
 # git snapshot from git://bpf.tcpdump.org/tcpdump
-Source0: tcpdump-4.0.0-20090818git832d2c.tar.gz
+Source0: tcpdump-4.0.0-20090921gitdf3cb4.tar.bz2
 Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
 Patch1: tcpdump-4.0.0-droproot.patch
 Patch2: tcpdump-4.0.0-portnumbers.patch
@@ -96,6 +96,9 @@ exit 0
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Wed Sep 23 2009 Miroslav Lichvar <mlichvar at redhat.com> - 14:4.0.0-3.20090921gitdf3cb4
+- update to snapshot 20090921gitdf3cb4
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 14:4.0.0-2.20090818git832d2c
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Wed Sep 23 16:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:46:56 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164656.7AC6110F87E@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on openjpeg (Fedora devel) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:46:56 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164656.F0BCD10F88A@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on openjpeg (Fedora devel) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:46:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:46:58 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164658.96EA910F89A@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on openjpeg (Fedora devel) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:01 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164702.30A9A10F89F@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on openjpeg (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:02 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164703.0E03310F8A3@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on openjpeg (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:03 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164704.0451210F8A8@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on openjpeg (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:10 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164710.B577D10F8AA@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on openjpeg (Fedora 10) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:11 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164711.8C6A210F8AF@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on openjpeg (Fedora 10) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:12 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164712.54B9510F8B3@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on openjpeg (Fedora 10) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:15 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164715.259F410F8B7@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on openjpeg (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:16 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164716.BBD5410F8BC@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on openjpeg (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:17 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164718.11A9010F8C0@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on openjpeg (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:20 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164720.7DC8D10F8C4@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on openjpeg (Fedora 11) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:21 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164721.169FF10F8C3@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on openjpeg (Fedora 11) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:22 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164722.2938410F8C8@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on openjpeg (Fedora 11) to Approved for agoode

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:23 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164724.1B60710F8CE@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on openjpeg (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:24 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164724.A745F10F8D2@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on openjpeg (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Wed Sep 23 16:47:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:47:26 +0000
Subject: [pkgdb] openjpeg had acl change status
Message-ID: <20090923164726.3B1F810F8D7@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on openjpeg (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From limb at fedoraproject.org  Wed Sep 23 16:47:39 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 23 Sep 2009 16:47:39 +0000 (UTC)
Subject: rpms/moodle/devel .cvsignore, 1.17, 1.18 moodle.spec, 1.45,
	1.46 sources, 1.21, 1.22
Message-ID: <20090923164739.84AB511C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26926

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
BZ 525120



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	15 May 2009 16:37:02 -0000	1.17
+++ .cvsignore	23 Sep 2009 16:47:39 -0000	1.18
@@ -1,4 +1,4 @@
-moodle-1.9.5.tgz
+moodle-weekly-19.tgz
 af_utf8.zip
 ar_utf8.zip
 be_utf8.zip
@@ -73,6 +73,7 @@ tl_utf8.zip
 to_utf8.zip
 tr_utf8.zip
 uk_utf8.zip
+ur_utf8.zip
 uz_utf8.zip
 vi_utf8.zip
 zh_cn_utf8.zip


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- moodle.spec	30 Jul 2009 22:10:17 -0000	1.45
+++ moodle.spec	23 Sep 2009 16:47:39 -0000	1.46
@@ -8,15 +8,15 @@
 
 Name:           moodle
 Version:        1.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://moodle.org/
-Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
-#Using weekly snapshot downloaded 11/7/08 to fix snoopy CVE-2008-4796
-#Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
+#Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
+#Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
+Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
 Source1:        moodle.conf
 Source2:        moodle-config.php
 Source3:        moodle.cron
@@ -102,6 +102,7 @@ Source80:       http://download.moodle.o
 Source81:       http://download.moodle.org/lang16/ta_lk_utf8.zip
 Source82:       http://download.moodle.org/lang16/cy_utf8.zip
 Source83:       http://download.moodle.org/lang16/uz_utf8.zip
+Source84:	http://download.moodle.org/lang16/ur_utf8.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
@@ -1316,6 +1317,18 @@ This package contains the files needed t
 %{moodlewebdir}/install/lang/uk_utf8
 #%{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php
 
+%package        ur
+Summary:        Moodle language pack for Urdu
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    ur
+This package contains the files needed to display Moodle in Urdu.
+
+%files          ur
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/ur_utf8
+
 %package        uz
 Summary:        Moodle language pack for Uzbek
 Group:          Applications/Publishing
@@ -1709,6 +1722,10 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-3
+- Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
+- Added Urdu installer.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	15 May 2009 16:37:02 -0000	1.21
+++ sources	23 Sep 2009 16:47:39 -0000	1.22
@@ -1,4 +1,4 @@
-60ec17b003eb75912a3ce362da7ac378  moodle-1.9.5.tgz
+37910e55ed9ada16f0d2d2d06f78647e  moodle-weekly-19.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -73,6 +73,7 @@ c700dd1a55a3b8991430ac3f45a46f86  ta_lk_
 6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
+ba2222207b4fcae3ecd911508e915568  ur_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip



From pkgdb at fedoraproject.org  Wed Sep 23 16:48:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:48:40 +0000
Subject: [pkgdb] nasm (un)retirement
Message-ID: <20090923164840.AEAB710F89F@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora devel has been unretired by jkeating and is now orphan.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Wed Sep 23 16:51:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 16:51:19 +0000
Subject: [pkgdb] ldapvi (un)retirement
Message-ID: <20090923165120.0A4D510F87E@bastion2.fedora.phx.redhat.com>

Package ldapvi in Fedora devel has been unretired by jkeating and is now orphan.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From simo at fedoraproject.org  Wed Sep 23 16:59:09 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 23 Sep 2009 16:59:09 +0000 (UTC)
Subject: rpms/libtevent/devel tevent_signal_segfault.patch, NONE,
	1.1 libtevent.spec, 1.4,
	1.5 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch,
	1.1, NONE
Message-ID: <20090923165909.5B96F11C00E6@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30943

Modified Files:
	libtevent.spec 
Added Files:
	tevent_signal_segfault.patch 
Removed Files:
	0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch 
Log Message:
Sigh committed the original patch instead of the right one.
(The original didn't apply because rawhide has fuzz=0)


tevent_signal_segfault.patch:
 tevent_signal.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE tevent_signal_segfault.patch ---
diff -uPr tevent-0.9.8.orig/tevent_signal.c tevent-0.9.8/tevent_signal.c
--- tevent-0.9.8.orig/tevent_signal.c	2009-09-23 12:41:48.000000000 -0400
+++ tevent-0.9.8/tevent_signal.c	2009-09-23 12:42:25.000000000 -0400
@@ -89,18 +89,12 @@
 	SIG_INCREMENT(sig_state->signal_count[signum]);
 	SIG_INCREMENT(sig_state->got_signal);
 
-	if (sig_state->sig_handlers[signum] != NULL) {
-		ev = sig_state->sig_handlers[signum]->se->event_ctx;
-		/* doesn't matter if this pipe overflows */
-		res = write(ev->pipe_fds[1], &c, 1);
-	}
-
 	/* Write to each unique event context. */
 	for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) {
 		if (sl->se->event_ctx != ev) {
+			ev = sl->se->event_ctx;
 			/* doesn't matter if this pipe overflows */
 			res = write(ev->pipe_fds[1], &c, 1);
-			ev = sl->se->event_ctx;
 		}
 	}
 }


Index: libtevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtevent/devel/libtevent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libtevent.spec	23 Sep 2009 16:32:00 -0000	1.4
+++ libtevent.spec	23 Sep 2009 16:59:09 -0000	1.5
@@ -1,6 +1,6 @@
 Name: libtevent
 Version: 0.9.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -10,7 +10,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 Patch1: tevent-098-add_abi_scripts_and_fix_exports.patch
 Patch2: tevent-098-abi-compat.patch
-Patch3: 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch
+Patch3: tevent_signal_segfault.patch
 
 BuildRequires: libtalloc-devel >= 2.0.0
 
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
-* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-4
+* Wed Sep 23 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-5
 - Add patch to fix a segfault case
 
 * Wed Sep 16 2009 Simo Sorce <ssorce at redhat.com> - 0.9.8-2


--- 0001-lib-tevent-a-cleaner-fix-for-be4ac227842530d484659f.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 23 17:25:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 17:25:53 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.2-ldapCompletionCrash.patch, 1.1,
	1.2 kdepim.spec, 1.236, 1.237
Message-ID: <20090923172553.554B511C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7879

Modified Files:
	kdepim-4.3.2-ldapCompletionCrash.patch kdepim.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
- respin ldap crasher patch (kdebug:206024, rhbz#524870)


kdepim-4.3.2-ldapCompletionCrash.patch:
 addresseelineedit.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: kdepim-4.3.2-ldapCompletionCrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim-4.3.2-ldapCompletionCrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.2-ldapCompletionCrash.patch	15 Sep 2009 14:33:58 -0000	1.1
+++ kdepim-4.3.2-ldapCompletionCrash.patch	23 Sep 2009 17:25:51 -0000	1.2
@@ -1,7 +1,6 @@
-Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
-===================================================================
---- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019118)
-+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019119)
+diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp
+--- libkdepim/addresseelineedit.cpp	(revision 1019119)
++++ libkdepim/addresseelineedit.cpp	(revision 1019358)
 @@ -800,7 +800,7 @@
  
  void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
@@ -11,3 +10,13 @@ Index: branches/KDE/4.3/kdepim/libkdepim
      return;
    }
  
+@@ -817,7 +817,8 @@
+     setText( m_previousAddresses + m_searchString );
+     // only complete again if the user didn't change the selection while
+     // we were waiting; otherwise the completion box will be closed
+-    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
++    QListWidgetItem *current = completionBox()->currentItem();
++    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
+       doCompletion( m_lastSearchMode );
+     }
+   }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- kdepim.spec	15 Sep 2009 14:33:58 -0000	1.236
+++ kdepim.spec	23 Sep 2009 17:25:52 -0000	1.237
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -20,6 +20,7 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # http://websvn.kde.org/?view=rev&revision=1022964
 Patch100: kdepim-4.3.2-imapMove.patch
 #?http://websvn.kde.org/?view=rev&revision=1019119
+# http://websvn.kde.org/?view=rev&revision=1019358
 Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,7 +102,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 %patch100 -p4 -b .imapMove
-%patch101 -p4 -b .ldapCompletionCrash
+%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -220,6 +221,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- respin ldap crasher patch (kdebug:206024, rhbz#524870)
+
 * Tue Sep 15 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-4
 - fix crash when autocompleting LDAP address (kdebug:206024)
 



From rdieter at fedoraproject.org  Wed Sep 23 17:26:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 17:26:47 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.2-ldapCompletionCrash.patch, 1.1,
	1.2 kdepim.spec, 1.225, 1.226
Message-ID: <20090923172647.9A24711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8321

Modified Files:
	kdepim-4.3.2-ldapCompletionCrash.patch kdepim.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
- respin ldap crasher patch (kdebug:206024, rhbz#524870)


kdepim-4.3.2-ldapCompletionCrash.patch:
 addresseelineedit.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: kdepim-4.3.2-ldapCompletionCrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim-4.3.2-ldapCompletionCrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.2-ldapCompletionCrash.patch	15 Sep 2009 14:33:57 -0000	1.1
+++ kdepim-4.3.2-ldapCompletionCrash.patch	23 Sep 2009 17:26:47 -0000	1.2
@@ -1,7 +1,6 @@
-Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
-===================================================================
---- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019118)
-+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019119)
+diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp
+--- libkdepim/addresseelineedit.cpp	(revision 1019119)
++++ libkdepim/addresseelineedit.cpp	(revision 1019358)
 @@ -800,7 +800,7 @@
  
  void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
@@ -11,3 +10,13 @@ Index: branches/KDE/4.3/kdepim/libkdepim
      return;
    }
  
+@@ -817,7 +817,8 @@
+     setText( m_previousAddresses + m_searchString );
+     // only complete again if the user didn't change the selection while
+     // we were waiting; otherwise the completion box will be closed
+-    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
++    QListWidgetItem *current = completionBox()->currentItem();
++    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
+       doCompletion( m_lastSearchMode );
+     }
+   }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- kdepim.spec	15 Sep 2009 14:33:57 -0000	1.225
+++ kdepim.spec	23 Sep 2009 17:26:47 -0000	1.226
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -20,6 +20,7 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # http://websvn.kde.org/?view=rev&revision=1022964
 Patch100: kdepim-4.3.2-imapMove.patch
 #?http://websvn.kde.org/?view=rev&revision=1019119
+# http://websvn.kde.org/?view=rev&revision=1019358
 Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,7 +102,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 %patch100 -p4 -b .imapMove
-%patch101 -p4 -b .ldapCompletionCrash
+%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -220,6 +221,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- respin ldap crasher patch (kdebug:206024, rhbz#524870)
+
 * Tue Sep 15 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-4
 - fix crash when autocompleting LDAP address (kdebug:206024)
 



From harald at fedoraproject.org  Wed Sep 23 17:27:00 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 23 Sep 2009 17:27:00 +0000 (UTC)
Subject: rpms/udev/devel udev.spec,1.291,1.292
Message-ID: <20090923172700.3EDBB11C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8446

Modified Files:
	udev.spec 
Log Message:
* Wed Sep 23 2009 harald at redhat.com 145-8
- obsolete libgudev and libgudev-devel (bug #523569)



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- udev.spec	24 Aug 2009 15:19:15 -0000	1.291
+++ udev.spec	23 Sep 2009 17:27:00 -0000	1.292
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -75,8 +75,8 @@ Summary: Libraries for adding libudev su
 Group: Development/Libraries
 Requires: libudev >= 142
 # remove the following lines for libgudev so major 1 
-Provides: libgudev = 20090517
-Obsoletes: libgudev <= 20090516
+Provides: libgudev = 20090518
+Obsoletes: libgudev <= 20090517
 
 %description -n libgudev1
 This package contains the libraries that make it easier to use libudev
@@ -86,8 +86,8 @@ functionality from applications that use
 Summary: Header files for adding libudev support to applications that use glib
 Group: Development/Libraries
 Requires: libudev-devel >= 142
-Provides: libgudev-devel = 20090517
-Obsoletes: libgudev-devel <= 20090516
+Provides: libgudev-devel = 20090518
+Obsoletes: libgudev-devel <= 20090517
 
 Requires: libgudev1 = %{version}-%{release}
 
@@ -350,6 +350,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Sep 23 2009 harald at redhat.com 145-8
+- obsolete libgudev and libgudev-devel (bug #523569)
+
 * Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 145-7
 - drop ifnarch s390x for usbutils, as we now have usbutils for s390x
 



From rdieter at fedoraproject.org  Wed Sep 23 17:27:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 17:27:12 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.2-ldapCompletionCrash.patch, 1.1,
	1.2 kdepim.spec, 1.219, 1.220
Message-ID: <20090923172712.C05C311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8541

Modified Files:
	kdepim-4.3.2-ldapCompletionCrash.patch kdepim.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
- respin ldap crasher patch (kdebug:206024, rhbz#524870)


kdepim-4.3.2-ldapCompletionCrash.patch:
 addresseelineedit.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: kdepim-4.3.2-ldapCompletionCrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim-4.3.2-ldapCompletionCrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.2-ldapCompletionCrash.patch	15 Sep 2009 14:33:56 -0000	1.1
+++ kdepim-4.3.2-ldapCompletionCrash.patch	23 Sep 2009 17:27:12 -0000	1.2
@@ -1,7 +1,6 @@
-Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
-===================================================================
---- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019118)
-+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp	(revision 1019119)
+diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp
+--- libkdepim/addresseelineedit.cpp	(revision 1019119)
++++ libkdepim/addresseelineedit.cpp	(revision 1019358)
 @@ -800,7 +800,7 @@
  
  void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
@@ -11,3 +10,13 @@ Index: branches/KDE/4.3/kdepim/libkdepim
      return;
    }
  
+@@ -817,7 +817,8 @@
+     setText( m_previousAddresses + m_searchString );
+     // only complete again if the user didn't change the selection while
+     // we were waiting; otherwise the completion box will be closed
+-    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
++    QListWidgetItem *current = completionBox()->currentItem();
++    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
+       doCompletion( m_lastSearchMode );
+     }
+   }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdepim.spec	15 Sep 2009 14:33:57 -0000	1.219
+++ kdepim.spec	23 Sep 2009 17:27:12 -0000	1.220
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -20,6 +20,7 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # http://websvn.kde.org/?view=rev&revision=1022964
 Patch100: kdepim-4.3.2-imapMove.patch
 #?http://websvn.kde.org/?view=rev&revision=1019119
+# http://websvn.kde.org/?view=rev&revision=1019358
 Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,7 +102,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 %patch100 -p4 -b .imapMove
-%patch101 -p4 -b .ldapCompletionCrash
+%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -220,6 +221,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- respin ldap crasher patch (kdebug:206024, rhbz#524870)
+
 * Tue Sep 15 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-4
 - fix crash when autocompleting LDAP address (kdebug:206024)
 



From hpejakle at fedoraproject.org  Wed Sep 23 17:28:21 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed, 23 Sep 2009 17:28:21 +0000 (UTC)
Subject: rpms/pidgin-musictracker/devel .cvsignore, 1.2,
	1.3 pidgin-musictracker.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090923172821.D9BE611C00E6@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9021

Modified Files:
	.cvsignore pidgin-musictracker.spec sources 
Log Message:
update to 0.4.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Apr 2009 06:52:40 -0000	1.2
+++ .cvsignore	23 Sep 2009 17:28:21 -0000	1.3
@@ -1 +1 @@
-pidgin-musictracker-0.4.16.tar.bz2
+pidgin-musictracker-0.4.20.tar.bz2


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/pidgin-musictracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-musictracker.spec	26 Jul 2009 18:44:24 -0000	1.2
+++ pidgin-musictracker.spec	23 Sep 2009 17:28:21 -0000	1.3
@@ -1,8 +1,8 @@
 %global	pidgin_version 2.0.0
 
 Name:		pidgin-musictracker
-Version:	0.4.16
-Release:	2%{?dist}
+Version:	0.4.20
+Release:	1%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
+* Wed Sep 23 2009 Jan Klepek <jan.klepek at hp.com> 0.4.20-1
+- update to 0.4.20
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Apr 2009 06:52:40 -0000	1.2
+++ sources	23 Sep 2009 17:28:21 -0000	1.3
@@ -1 +1 @@
-1cfa0bba6542193713fccb568efdc4cc  pidgin-musictracker-0.4.16.tar.bz2
+9db72bfc8aa5fbda4578f83aa7cd6189  pidgin-musictracker-0.4.20.tar.bz2



From hpejakle at fedoraproject.org  Wed Sep 23 17:30:47 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed, 23 Sep 2009 17:30:47 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-11 .cvsignore, 1.2,
	1.3 pidgin-musictracker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090923173047.97CB311C00E6@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9828

Modified Files:
	.cvsignore pidgin-musictracker.spec sources 
Log Message:
update to 0.4.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Apr 2009 22:04:40 -0000	1.2
+++ .cvsignore	23 Sep 2009 17:30:47 -0000	1.3
@@ -1 +1 @@
-pidgin-musictracker-0.4.16.tar.bz2
+pidgin-musictracker-0.4.20.tar.bz2


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/pidgin-musictracker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pidgin-musictracker.spec	14 Apr 2009 22:04:40 -0000	1.1
+++ pidgin-musictracker.spec	23 Sep 2009 17:30:47 -0000	1.2
@@ -1,7 +1,7 @@
 %global	pidgin_version 2.0.0
 
 Name:		pidgin-musictracker
-Version:	0.4.16
+Version:	0.4.20
 Release:	1%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
+* Wed Sep 23 2009 Jan Klepek <jan.klepek at hp.com> 0.4.20-1
+- update to 0.4.20
+
 * Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
 - combined spec file from all below people and builded package for 0.4.16 version
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Apr 2009 22:04:40 -0000	1.2
+++ sources	23 Sep 2009 17:30:47 -0000	1.3
@@ -1 +1 @@
-1cfa0bba6542193713fccb568efdc4cc  pidgin-musictracker-0.4.16.tar.bz2
+9db72bfc8aa5fbda4578f83aa7cd6189  pidgin-musictracker-0.4.20.tar.bz2



From ajax at fedoraproject.org  Wed Sep 23 17:31:17 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 23 Sep 2009 17:31:17 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint.spec,1.55,1.56
Message-ID: <20090923173117.4409211C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10132

Modified Files:
	gutenprint.spec 
Log Message:
typo fix in %description


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- gutenprint.spec	1 Sep 2009 09:09:43 -0000	1.55
+++ gutenprint.spec	23 Sep 2009 17:31:17 -0000	1.56
@@ -130,7 +130,7 @@ Provides: gutenprint-ppds-zh_TW = %{vers
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
-Epson, HP and compatible printers..
+Epson, HP and compatible printers.
 
 %prep
 %setup -q -n %{name}-%{version}



From kasal at fedoraproject.org  Wed Sep 23 17:42:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 23 Sep 2009 17:42:03 +0000 (UTC)
Subject: rpms/perl-SQL-Statement/devel .cvsignore, 1.3,
	1.4 perl-SQL-Statement.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <20090923174203.2B9AB11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13539

Modified Files:
	.cvsignore perl-SQL-Statement.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Feb 2006 14:34:18 -0000	1.3
+++ .cvsignore	23 Sep 2009 17:42:02 -0000	1.4
@@ -1 +1 @@
-SQL-Statement-1.15.tar.gz
+SQL-Statement-1.20.tar.gz


Index: perl-SQL-Statement.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/perl-SQL-Statement.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-SQL-Statement.spec	26 Jul 2009 16:24:49 -0000	1.10
+++ perl-SQL-Statement.spec	23 Sep 2009 17:42:02 -0000	1.11
@@ -1,20 +1,22 @@
 Name:           perl-SQL-Statement
-Version:        1.15
-Release:        6%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        SQL parsing and processing engine
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/SQL-Statement/
-Source0:        http://www.cpan.org/authors/id/J/JZ/JZUCKER/SQL-Statement-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RE/REHSACK/SQL-Statement-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBI)
-BuildRequires:  perl(DBD::XBase)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::Simple) >= 0.86
+BuildRequires:  perl(Clone) >= 0.30
+BuildRequires:  perl(Params::Util) >= 1.00
+# for tests only:
+BuildRequires:  perl(DBD::CSV) perl(DBD::XBase)
 
 %description
 The SQL::Statement module implements a pure Perl SQL parsing and execution
@@ -26,8 +28,8 @@ other features.
 
 %prep
 %setup -q -n SQL-Statement-%{version}
-find . -type f -exec chmod -c a-x {} ';'
-%{__perl} -pi -e 's/\r\n/\n/' Changes README
+find  -type f -perm /111 | xargs chmod -c a-x
+%{__perl} -pi -e 's/\r\n/\n/' README
 
 
 %build
@@ -44,7 +46,9 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-make test
+# It is known that several tests fail in 1.20, all of them were fixed in
+# 1.21_1, but it is not easy to separate the fixes from other changes.
+make test || :
 
 
 %clean
@@ -59,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 1.20-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Feb 2006 14:34:18 -0000	1.3
+++ sources	23 Sep 2009 17:42:02 -0000	1.4
@@ -1 +1 @@
-c17a1c38f071e5c7135e3085020e7d47  SQL-Statement-1.15.tar.gz
+74b70971b60a44ab9d93071d91b4d258  SQL-Statement-1.20.tar.gz



From harald at fedoraproject.org  Wed Sep 23 17:42:33 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 23 Sep 2009 17:42:33 +0000 (UTC)
Subject: rpms/dracut/F-11 .cvsignore, 1.10, 1.11 dracut.spec, 1.15,
	1.16 sources, 1.14, 1.15
Message-ID: <20090923174233.4272011C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13913

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Mon Sep 21 2009 Warren Togami <wtogami at redhat.com> 002-4
- Fix LiveCD boot regression



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Sep 2009 13:57:13 -0000	1.10
+++ .cvsignore	23 Sep 2009 17:42:33 -0000	1.11
@@ -1 +1 @@
-dracut-001-4d924752.tar.bz2
+dracut-002-23aa2048.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dracut.spec	21 Sep 2009 15:49:08 -0000	1.15
+++ dracut.spec	23 Sep 2009 17:42:33 -0000	1.16
@@ -1,4 +1,4 @@
-%define gittag 8eb16b08
+%define gittag 23aa2048
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 3%{?rdist}
+Release: 4%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 21 2009 Warren Togami <wtogami at redhat.com> 002-4
+- Fix LiveCD boot regression
+
 * Mon Sep 21 2009 Harald Hoyer <harald at redhat.com> 002-3
 - bail out if selinux policy could not be loaded and 
   selinux=0 not specified on kernel command line 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	21 Sep 2009 15:49:08 -0000	1.14
+++ sources	23 Sep 2009 17:42:33 -0000	1.15
@@ -1 +1 @@
-6f85d54893a0bdb16273b61a9b5d9582  dracut-002-8eb16b08.tar.bz2
+a068ff45f641d00e93c399eb2bc937a9  dracut-002-23aa2048.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 23 18:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 18:06:55 +0000
Subject: [pkgdb] ldapvi ownership updated
Message-ID: <20090923180655.EEC4310F87C@bastion2.fedora.phx.redhat.com>

Package ldapvi in Fedora devel is now owned by mcepl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From kasal at fedoraproject.org  Wed Sep 23 18:18:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 23 Sep 2009 18:18:39 +0000 (UTC)
Subject: rpms/perl-PAR-Packer/devel perl-PAR-Packer.spec,1.3,1.4
Message-ID: <20090923181839.17C2811C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PAR-Packer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31530

Modified Files:
	perl-PAR-Packer.spec 
Log Message:
- too hard to build without stripping (#524894)


Index: perl-PAR-Packer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Packer/devel/perl-PAR-Packer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-PAR-Packer.spec	21 Sep 2009 17:29:29 -0000	1.3
+++ perl-PAR-Packer.spec	23 Sep 2009 18:18:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-PAR-Packer
 Version:        0.991
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PAR Packager
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -29,6 +29,11 @@ stand-alone executables, perl scripts an
 %patch1 -p1 -b.open
 
 %build
+# The build procedure for binaries parl and parldyn exploits PAR through
+# a compiled binary named myldr/static and thus looks very obfuscated.
+# There is no obvious way to teach the build system not to strip the installed
+# binaries.  Consequently, desable the -debuginfo subpackage:
+%global debug_package %{nil}
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 # The Makefile is not parallel-safe.
 # PAR_GLOBAL_TEMP seems to be needed for the build.
@@ -47,7 +52,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 %check
 export PAR_GLOBAL_TEMP=/var/tmp
-export PAR_GLOBAL_TMPDIR=/var/tmp
+#export PAR_GLOBAL_TMPDIR=/var/tmp
 ## does not pass
 # make test PERL_TEST_POD=1 || :
 
@@ -67,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 0.991-4
+- too hard to build without stripping (#524894)
+
 * Mon Sep 21 2009 Stepan Kasal <skasal at redhat.com> - 0.991-3
 - patch to use $RPM_OPT_FLAGS
 - patch to submit the third parameter to open()



From jakub at fedoraproject.org  Wed Sep 23 18:21:10 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 23 Sep 2009 18:21:10 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.293, 1.294 gcc.spec, 1.72, 1.73 sources,
	1.297, 1.298 gcc44-powerpc-libgcc_s_so.patch, 1.1,
	NONE gcc44-pr41175.patch, 1.3,
	NONE gcc44-vta-cfgexpand-ptr-mode-pr41248.patch, 1.1, NONE
Message-ID: <20090923182110.0404211C00E6@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32471

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-powerpc-libgcc_s_so.patch gcc44-pr41175.patch 
	gcc44-vta-cfgexpand-ptr-mode-pr41248.patch 
Log Message:
4.4.1-16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- .cvsignore	18 Sep 2009 08:28:25 -0000	1.293
+++ .cvsignore	23 Sep 2009 18:21:09 -0000	1.294
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090918.tar.bz2
+gcc-4.4.1-20090923.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- gcc.spec	18 Sep 2009 08:28:26 -0000	1.72
+++ gcc.spec	23 Sep 2009 18:21:09 -0000	1.73
@@ -1,9 +1,9 @@
-%global DATE 20090918
-%global SVNREV 151835
+%global DATE 20090923
+%global SVNREV 152092
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 15
+%global gcc_release 16
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -159,10 +159,7 @@ Patch15: gcc44-raw-string.patch
 Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
-Patch19: gcc44-vta-cfgexpand-ptr-mode-pr41248.patch
-Patch20: gcc44-powerpc-libgcc_s_so.patch
-Patch21: gcc44-pr41175.patch
-Patch22: gcc44-ppc64-aixdesc.patch
+Patch19: gcc44-ppc64-aixdesc.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -468,10 +465,7 @@ which are required to compile with the G
 %if %{build_libstdcxx_docs}
 %patch18 -p0 -b .libstdc++-docs~
 %endif
-%patch19 -p0 -b .vta-cfgexpand-ptr-mode-pr41248~
-%patch20 -p0 -b .powerpc-libgcc_s_so~
-%patch21 -p0 -b .pr41175~
-%patch22 -p0 -b .ppc64-aixdesc~
+%patch19 -p0 -b .ppc64-aixdesc~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1827,6 +1821,20 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Sep 23 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-16
+- update from gcc-4_4-branch
+  - PRs c/39779, c/41049, debug/41065, libffi/40242, libffi/41443,
+	libgfortran/41328, testsuite/41288
+- VTA backports
+  - PRs bootstrap/41397, bootstrap/41404, bootstrap/41405, debug/41295,
+	debug/41411, debug/41439
+  - fix ICE caused by reload substitution of const_int into zero_extend
+    in debug_insn (#524439)
+- fix altivec vec_cmp{lt,gt} (#524273)
+- fix -mno-sched-epilogue on ppc (#524216, PR target/40473)
+- don't look at MUDFLAP_OPTIONS env var in suid/sgid programs
+  (PR libmudflap/41433)
+
 * Fri Sep 18 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-15
 - for now disable out of line gpr/fpr saving on ppc with -m64 -Os -mcall-aixdesc
 - fix DW_AT_decl_{file,location} for DW_TAG_structure_type for C structs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- sources	18 Sep 2009 08:28:26 -0000	1.297
+++ sources	23 Sep 2009 18:21:09 -0000	1.298
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-d80d46cdb567914d34408afcd3c4d5af  gcc-4.4.1-20090918.tar.bz2
+25ef066c0ea8770f562eed45a9e1619f  gcc-4.4.1-20090923.tar.bz2


--- gcc44-powerpc-libgcc_s_so.patch DELETED ---


--- gcc44-pr41175.patch DELETED ---


--- gcc44-vta-cfgexpand-ptr-mode-pr41248.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 23 18:23:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 18:23:01 +0000 (UTC)
Subject: rpms/xmms/devel xmms.spec,1.43,1.44
Message-ID: <20090923182301.DD51911C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1360

Modified Files:
	xmms.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.11-9.20071117cvs
- optimize desktop/icon scriptlets



Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xmms.spec	14 Sep 2009 21:32:52 -0000	1.43
+++ xmms.spec	23 Sep 2009 18:23:01 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        8.20071117cvs%{?dist}
+Release:        9.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -169,17 +169,22 @@ rm -rf %{buildroot}
 
 
 %post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database -q || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
 %postun
+if [ $1 -eq 0 ]; then
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database -q || :
+fi
 
 %postun libs -p /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database -q || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -221,6 +226,9 @@ update-desktop-database -q || :
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.11-9.20071117cvs
+- optimize desktop/icon scriptlets
+
 * Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-8.20071117cvs
 - Update crossfade patch to the latest version (#518176).
 



From tmraz at fedoraproject.org  Wed Sep 23 18:27:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 23 Sep 2009 18:27:10 +0000 (UTC)
Subject: rpms/gnutls/F-11 gnutls-2.6.6-cve-2009-2730.patch, 1.1,
	1.2 gnutls.spec, 1.44, 1.45
Message-ID: <20090923182710.47A3511C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3885

Modified Files:
	gnutls-2.6.6-cve-2009-2730.patch gnutls.spec 
Log Message:
* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.6.6-3
- fix handling of hostname in openpgp certificates


gnutls-2.6.6-cve-2009-2730.patch:
 gnutls_str.c            |   24 +++++++++++++++---------
 gnutls_str.h            |    2 +-
 openpgp/pgp.c           |    2 +-
 x509/common.c           |   38 ++++++++++++++++++++++----------------
 x509/output.c           |   31 +++++++++++++++++++++++++++++++
 x509/rfc2818_hostname.c |    6 +++---
 6 files changed, 73 insertions(+), 30 deletions(-)

Index: gnutls-2.6.6-cve-2009-2730.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-11/gnutls-2.6.6-cve-2009-2730.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnutls-2.6.6-cve-2009-2730.patch	14 Aug 2009 11:59:03 -0000	1.1
+++ gnutls-2.6.6-cve-2009-2730.patch	23 Sep 2009 18:27:09 -0000	1.2
@@ -76,7 +76,7 @@ diff -up gnutls-2.6.6/lib/openpgp/pgp.c.
        if (ret == 0)
  	{
 -	  if (_gnutls_hostname_compare (dnsname, hostname))
-+	  if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
++	  if (_gnutls_hostname_compare (dnsname, dnsnamesize-1, hostname))
  	    return 1;
  	}
      }


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-11/gnutls.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnutls.spec	14 Aug 2009 11:59:03 -0000	1.44
+++ gnutls.spec	23 Sep 2009 18:27:10 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 2.6.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -151,6 +151,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.6.6-3
+- fix handling of hostname in openpgp certificates
+
 * Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.6.6-2
 - fix CVE-2009-2730 - handling of NUL chars in certificate
   CNs and SANs



From heffer at fedoraproject.org  Wed Sep 23 18:28:58 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 23 Sep 2009 18:28:58 +0000 (UTC)
Subject: rpms/dansguardian/devel dansguardian-must-be-successful.patch, NONE,
	1.1 dansguardian.logrotate, NONE, 1.1 dansguardian.spec, 1.2, 1.3
Message-ID: <20090923182858.ADCD611C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/dansguardian/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5585

Modified Files:
	dansguardian.spec 
Added Files:
	dansguardian-must-be-successful.patch dansguardian.logrotate 
Log Message:
* Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
- fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
- lists now reside in /etc/dansguardian/lists


dansguardian-must-be-successful.patch:
 configs/dansguardian.conf.in |    2 +-
 src/FDTunnel.cpp             |    2 +-
 src/FOptionContainer.cpp     |    2 +-
 src/FatController.cpp        |    2 +-
 src/ListContainer.cpp        |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE dansguardian-must-be-successful.patch ---
diff -ruN dansguardian-2.10.1.1.orig/configs/dansguardian.conf.in dansguardian-2.10.1.1/configs/dansguardian.conf.in
--- dansguardian-2.10.1.1.orig/configs/dansguardian.conf.in	2009-08-04 11:46:41.484910072 +0200
+++ dansguardian-2.10.1.1/configs/dansguardian.conf.in	2009-08-04 11:49:08.980902851 +0200
@@ -354,7 +354,7 @@
 
 # Delete file cache after user completes download
 # When a file gets save to temp it stays there until it is deleted.
-# You can choose to have the file deleted when the user makes a sucessful
+# You can choose to have the file deleted when the user makes a successful
 # download.  This will mean if they click on the link to download from
 # the temp store a second time it will give a 404 error.
 # You should configure something to delete old files in temp to stop it filling up.
diff -ruN dansguardian-2.10.1.1.orig/src/FatController.cpp dansguardian-2.10.1.1/src/FatController.cpp
--- dansguardian-2.10.1.1.orig/src/FatController.cpp	2009-08-04 11:46:41.465902112 +0200
+++ dansguardian-2.10.1.1/src/FatController.cpp	2009-08-04 11:48:43.541651965 +0200
@@ -2074,7 +2074,7 @@
 	int tofind;
 	reloadconfig = false;
 
-	syslog(LOG_INFO, "Started sucessfully.");
+	syslog(LOG_INFO, "Started successfully.");
 
 	while (failurecount < 30 && !ttg && !reloadconfig) {
 
diff -ruN dansguardian-2.10.1.1.orig/src/FDTunnel.cpp dansguardian-2.10.1.1/src/FDTunnel.cpp
--- dansguardian-2.10.1.1.orig/src/FDTunnel.cpp	2009-08-04 11:46:41.464902536 +0200
+++ dansguardian-2.10.1.1/src/FDTunnel.cpp	2009-08-04 11:47:37.011652752 +0200
@@ -114,7 +114,7 @@
 	bool done = false;  // so we get past the first while
 
 	while (!done && (targetthroughput > -1 ? throughput < targetthroughput : true)) {
-		done = true;  // if we don't make a sucessful read and write this
+		done = true;  // if we don't make a successful read and write this
 		// flag will stay true and so the while() will exit
 
 		inset = fdSet;  // as select() can modify the sets we need to take
diff -ruN dansguardian-2.10.1.1.orig/src/FOptionContainer.cpp dansguardian-2.10.1.1/src/FOptionContainer.cpp
--- dansguardian-2.10.1.1.orig/src/FOptionContainer.cpp	2009-08-04 11:46:41.464902536 +0200
+++ dansguardian-2.10.1.1/src/FOptionContainer.cpp	2009-08-04 11:48:03.572653450 +0200
@@ -56,7 +56,7 @@
 	if (inet_aton(ip, &address)) {	// convert to in_addr
 		struct hostent *answer;
 		answer = gethostbyaddr((char *) &address, sizeof(address), AF_INET);
-		if (answer) {	// sucess in reverse dns
+		if (answer) {	// success in reverse dns
 			result->push_back(String(answer->h_name));
 			for (addrptr = (struct in_addr **) answer->h_addr_list; *addrptr; addrptr++) {
 				result->push_back(String(inet_ntoa(**addrptr)));
diff -ruN dansguardian-2.10.1.1.orig/src/ListContainer.cpp dansguardian-2.10.1.1/src/ListContainer.cpp
--- dansguardian-2.10.1.1.orig/src/ListContainer.cpp	2009-08-04 11:46:41.460901992 +0200
+++ dansguardian-2.10.1.1/src/ListContainer.cpp	2009-08-04 11:47:22.300690828 +0200
@@ -246,7 +246,7 @@
 		}
 	}
 	listfile.close();
-	return true;  // sucessful read
+	return true;  // successful read
 }
 
 // for phrase lists - helper function for readPhraseList
@@ -502,7 +502,7 @@
 			addToItemList(temp.toCharArray(), temp.length());  // add to unsorted list
 	}
 	listfile.close();
-	return true;  // sucessful read
+	return true;  // successful read
 }
 
 // for item lists - read nested item lists


--- NEW FILE dansguardian.logrotate ---
/var/log/dansguardian/access.log {
  rotate 4
  weekly
  sharedscripts
  postrotate
    /bin/kill -HUP `cat /var/run/dansguardian.pid 2>/dev/null` 2> /dev/null || true
  endscript
}


Index: dansguardian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dansguardian/devel/dansguardian.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dansguardian.spec	24 Jul 2009 19:56:12 -0000	1.2
+++ dansguardian.spec	23 Sep 2009 18:28:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dansguardian
 Version:        2.10.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Content filtering web proxy
 Summary(de):    Contentfilter-Proxy
 
@@ -15,17 +15,21 @@ URL:            http://www.dansguardian.
 Source0:        http://dansguardian.org/downloads/2/Stable/%{name}-%{version}.tar.gz
 Source1:        dansguardian.init
 Source2:        dansguardian.httpd
+Source3:        dansguardian.logrotate
 # This patch removes the upstream restrictions on the GPLv2+ source
 Patch0:         dansguardian-copyright-notice.patch
 # Fixes some compilation errors with gcc 4.4
 Patch1:         dansguardian-gcc44.patch
 # Adds support for ClamAV > 0.95
 Patch2:         dansguardian-clamav095.patch
+# Fix some typos ;) (Bug #515363)
+Patch3:         dansguardian-must-be-successful.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  clamav-devel pcre-devel zlib-devel
-BuildRequires:  pkgconfig
-Requires(post): chkconfig
+BuildRequires:   clamav-devel pcre-devel zlib-devel
+BuildRequires:   pkgconfig
+Requires(pre):   shadow-utils
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -45,7 +49,7 @@ want but DansGuardian puts you in contro
 DansGuardian requires squid or another similar caching proxy server on your
 local network.
 
-%description(de)
+%description -l de
 DansGuardian filtert den Content einer Webseite basierend auf verschiedenen
 Methoden wie beispielsweise Wortfilter, PICS filtering und URL filtering. Es
 handelt sich also um ein echtes Content filtering anstatt einfacher Blacklists.
@@ -64,11 +68,10 @@ lokalen Netzwerk.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@/lists/|' configs/%{name}*.conf.in
-
+%patch3 -p1
 
 %build
-%configure --enable-orig-ip \
+%configure \
    --enable-clamav \
    --enable-clamd \
    --enable-icap \
@@ -76,7 +79,9 @@ sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@
    --enable-commandline \
    --enable-trickledm \
    --enable-ntlm \
-   --enable-email
+   --enable-email \
+   --with-proxyuser=dansguardian \
+   --with-proxygroup=dansguardian
 
 make %{?_smp_mflags}
 
@@ -84,16 +89,12 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/%{name} \
+install -Dpm 644 %{SOURCE3} \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 # delete the other scripts since they are of no use for Fedora users
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.pl
 
-# move the lists to the datadir, since they really are data
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/lists \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}
-
 # install init script and httpd config
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -Dp -m0644 %{SOURCE2} \
@@ -102,10 +103,30 @@ install -Dp -m0644 %{SOURCE2} \
 # we'll install this later within %doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
+# create the log dir
+install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+useradd -r -g %{name} -d %{_datadir}/%{name} -s /sbin/nologin \
+   -c "DansGuardian web content filter" %{name}
+exit 0
+
+# in the first release we put some user-editable files inside the datadir. doh!
+# if they are still there we migrate them over to their new home in the
+# sysconfdir.
+if [ "$1" -gt 1 ]?; then
+    if [ -e %{_datadir}/%{name}/lists ] ; then
+        mv -f %{_datadir}/%{name}/lists %{_sysconfdir}/%{name}
+    fi
+fi
+
 %post
 /sbin/chkconfig --add %{name}
 
@@ -128,9 +149,9 @@ fi
 %doc COPYING INSTALL README UPGRADING
 %doc doc/AuthPlugins doc/ContentScanners doc/DownloadManagers doc/FAQ
 %doc doc/FAQ.html doc/Plugins
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man8/%{name}.8.gz
 %{_sbindir}/%{name}
-%{_datadir}/%{name}
+%attr(-,%{name},%{name}) %{_datadir}/%{name}
 %{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}*.conf
@@ -140,12 +161,18 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/contentscanners/*
 %dir %{_sysconfdir}/%{name}/downloadmanagers
 %config(noreplace) %{_sysconfdir}/%{name}/downloadmanagers/*
+%dir %{_sysconfdir}/%{name}/lists
+%config(noreplace) %{_sysconfdir}/%{name}/lists/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-
+%attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
 
 
 %changelog
+* Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
+- fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
+- lists now reside in /etc/dansguardian/lists
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Wed Sep 23 18:29:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 23 Sep 2009 18:29:40 +0000 (UTC)
Subject: rpms/gnutls/F-10 gnutls-2.4.2-cve-2009-2730.patch, 1.1,
	1.2 gnutls.spec, 1.38, 1.39
Message-ID: <20090923182940.3869F11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6030

Modified Files:
	gnutls-2.4.2-cve-2009-2730.patch gnutls.spec 
Log Message:
* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-5
- fix handling of hostname in openpgp certificates


gnutls-2.4.2-cve-2009-2730.patch:
 gnutls_str.c            |   45 ++++++++++++++++++++++++++-------------------
 gnutls_str.h            |    2 +-
 openpgp/pgp.c           |    2 +-
 x509/common.c           |   38 ++++++++++++++++++++++----------------
 x509/output.c           |   31 +++++++++++++++++++++++++++++++
 x509/rfc2818_hostname.c |   12 ++++++------
 6 files changed, 87 insertions(+), 43 deletions(-)

Index: gnutls-2.4.2-cve-2009-2730.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-10/gnutls-2.4.2-cve-2009-2730.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnutls-2.4.2-cve-2009-2730.patch	14 Aug 2009 12:24:51 -0000	1.1
+++ gnutls-2.4.2-cve-2009-2730.patch	23 Sep 2009 18:29:39 -0000	1.2
@@ -89,7 +89,7 @@ diff -up gnutls-2.4.2/lib/openpgp/pgp.c.
        if (ret == 0)
          {
 -          if (_gnutls_hostname_compare (dnsname, hostname))
-+          if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
++          if (_gnutls_hostname_compare (dnsname, dnsnamesize-1, hostname))
              return 1;
          }
      }


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-10/gnutls.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gnutls.spec	14 Aug 2009 12:24:51 -0000	1.38
+++ gnutls.spec	23 Sep 2009 18:29:40 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 2.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -152,6 +152,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-5
+- fix handling of hostname in openpgp certificates
+
 * Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-4
 - fix CVE-2009-2730 - handling of NUL chars in certificate
   CNs and SANs



From heffer at fedoraproject.org  Wed Sep 23 18:37:45 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 23 Sep 2009 18:37:45 +0000 (UTC)
Subject: rpms/dansguardian/F-11 dansguardian-must-be-successful.patch, NONE, 
	1.1 dansguardian.logrotate, NONE, 1.1 dansguardian.spec, 1.1, 1.2
Message-ID: <20090923183745.E1AF511C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/dansguardian/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9904

Modified Files:
	dansguardian.spec 
Added Files:
	dansguardian-must-be-successful.patch dansguardian.logrotate 
Log Message:
* Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
- fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
- lists now reside in /etc/dansguardian/lists


dansguardian-must-be-successful.patch:
 configs/dansguardian.conf.in |    2 +-
 src/FDTunnel.cpp             |    2 +-
 src/FOptionContainer.cpp     |    2 +-
 src/FatController.cpp        |    2 +-
 src/ListContainer.cpp        |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE dansguardian-must-be-successful.patch ---
diff -ruN dansguardian-2.10.1.1.orig/configs/dansguardian.conf.in dansguardian-2.10.1.1/configs/dansguardian.conf.in
--- dansguardian-2.10.1.1.orig/configs/dansguardian.conf.in	2009-08-04 11:46:41.484910072 +0200
+++ dansguardian-2.10.1.1/configs/dansguardian.conf.in	2009-08-04 11:49:08.980902851 +0200
@@ -354,7 +354,7 @@
 
 # Delete file cache after user completes download
 # When a file gets save to temp it stays there until it is deleted.
-# You can choose to have the file deleted when the user makes a sucessful
+# You can choose to have the file deleted when the user makes a successful
 # download.  This will mean if they click on the link to download from
 # the temp store a second time it will give a 404 error.
 # You should configure something to delete old files in temp to stop it filling up.
diff -ruN dansguardian-2.10.1.1.orig/src/FatController.cpp dansguardian-2.10.1.1/src/FatController.cpp
--- dansguardian-2.10.1.1.orig/src/FatController.cpp	2009-08-04 11:46:41.465902112 +0200
+++ dansguardian-2.10.1.1/src/FatController.cpp	2009-08-04 11:48:43.541651965 +0200
@@ -2074,7 +2074,7 @@
 	int tofind;
 	reloadconfig = false;
 
-	syslog(LOG_INFO, "Started sucessfully.");
+	syslog(LOG_INFO, "Started successfully.");
 
 	while (failurecount < 30 && !ttg && !reloadconfig) {
 
diff -ruN dansguardian-2.10.1.1.orig/src/FDTunnel.cpp dansguardian-2.10.1.1/src/FDTunnel.cpp
--- dansguardian-2.10.1.1.orig/src/FDTunnel.cpp	2009-08-04 11:46:41.464902536 +0200
+++ dansguardian-2.10.1.1/src/FDTunnel.cpp	2009-08-04 11:47:37.011652752 +0200
@@ -114,7 +114,7 @@
 	bool done = false;  // so we get past the first while
 
 	while (!done && (targetthroughput > -1 ? throughput < targetthroughput : true)) {
-		done = true;  // if we don't make a sucessful read and write this
+		done = true;  // if we don't make a successful read and write this
 		// flag will stay true and so the while() will exit
 
 		inset = fdSet;  // as select() can modify the sets we need to take
diff -ruN dansguardian-2.10.1.1.orig/src/FOptionContainer.cpp dansguardian-2.10.1.1/src/FOptionContainer.cpp
--- dansguardian-2.10.1.1.orig/src/FOptionContainer.cpp	2009-08-04 11:46:41.464902536 +0200
+++ dansguardian-2.10.1.1/src/FOptionContainer.cpp	2009-08-04 11:48:03.572653450 +0200
@@ -56,7 +56,7 @@
 	if (inet_aton(ip, &address)) {	// convert to in_addr
 		struct hostent *answer;
 		answer = gethostbyaddr((char *) &address, sizeof(address), AF_INET);
-		if (answer) {	// sucess in reverse dns
+		if (answer) {	// success in reverse dns
 			result->push_back(String(answer->h_name));
 			for (addrptr = (struct in_addr **) answer->h_addr_list; *addrptr; addrptr++) {
 				result->push_back(String(inet_ntoa(**addrptr)));
diff -ruN dansguardian-2.10.1.1.orig/src/ListContainer.cpp dansguardian-2.10.1.1/src/ListContainer.cpp
--- dansguardian-2.10.1.1.orig/src/ListContainer.cpp	2009-08-04 11:46:41.460901992 +0200
+++ dansguardian-2.10.1.1/src/ListContainer.cpp	2009-08-04 11:47:22.300690828 +0200
@@ -246,7 +246,7 @@
 		}
 	}
 	listfile.close();
-	return true;  // sucessful read
+	return true;  // successful read
 }
 
 // for phrase lists - helper function for readPhraseList
@@ -502,7 +502,7 @@
 			addToItemList(temp.toCharArray(), temp.length());  // add to unsorted list
 	}
 	listfile.close();
-	return true;  // sucessful read
+	return true;  // successful read
 }
 
 // for item lists - read nested item lists


--- NEW FILE dansguardian.logrotate ---
/var/log/dansguardian/access.log {
  rotate 4
  weekly
  sharedscripts
  postrotate
    /bin/kill -HUP `cat /var/run/dansguardian.pid 2>/dev/null` 2> /dev/null || true
  endscript
}


Index: dansguardian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dansguardian/F-11/dansguardian.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dansguardian.spec	15 Jul 2009 10:14:29 -0000	1.1
+++ dansguardian.spec	23 Sep 2009 18:37:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dansguardian
 Version:        2.10.1.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Content filtering web proxy
 Summary(de):    Contentfilter-Proxy
 
@@ -15,17 +15,21 @@ URL:            http://www.dansguardian.
 Source0:        http://dansguardian.org/downloads/2/Stable/%{name}-%{version}.tar.gz
 Source1:        dansguardian.init
 Source2:        dansguardian.httpd
+Source3:        dansguardian.logrotate
 # This patch removes the upstream restrictions on the GPLv2+ source
 Patch0:         dansguardian-copyright-notice.patch
 # Fixes some compilation errors with gcc 4.4
 Patch1:         dansguardian-gcc44.patch
 # Adds support for ClamAV > 0.95
 Patch2:         dansguardian-clamav095.patch
+# Fix some typos ;) (Bug #515363)
+Patch3:         dansguardian-must-be-successful.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  clamav-devel pcre-devel zlib-devel
-BuildRequires:  pkgconfig
-Requires(post): chkconfig
+BuildRequires:   clamav-devel pcre-devel zlib-devel
+BuildRequires:   pkgconfig
+Requires(pre):   shadow-utils
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -45,7 +49,7 @@ want but DansGuardian puts you in contro
 DansGuardian requires squid or another similar caching proxy server on your
 local network.
 
-%description(de)
+%description -l de
 DansGuardian filtert den Content einer Webseite basierend auf verschiedenen
 Methoden wie beispielsweise Wortfilter, PICS filtering und URL filtering. Es
 handelt sich also um ein echtes Content filtering anstatt einfacher Blacklists.
@@ -64,11 +68,10 @@ lokalen Netzwerk.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@/lists/|' configs/%{name}*.conf.in
-
+%patch3 -p1
 
 %build
-%configure --enable-orig-ip \
+%configure \
    --enable-clamav \
    --enable-clamd \
    --enable-icap \
@@ -76,7 +79,9 @@ sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@
    --enable-commandline \
    --enable-trickledm \
    --enable-ntlm \
-   --enable-email
+   --enable-email \
+   --with-proxyuser=dansguardian \
+   --with-proxygroup=dansguardian
 
 make %{?_smp_mflags}
 
@@ -84,16 +89,12 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/%{name} \
+install -Dpm 644 %{SOURCE3} \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 # delete the other scripts since they are of no use for Fedora users
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.pl
 
-# move the lists to the datadir, since they really are data
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/lists \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}
-
 # install init script and httpd config
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -Dp -m0644 %{SOURCE2} \
@@ -102,10 +103,30 @@ install -Dp -m0644 %{SOURCE2} \
 # we'll install this later within %doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
+# create the log dir
+install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+useradd -r -g %{name} -d %{_datadir}/%{name} -s /sbin/nologin \
+   -c "DansGuardian web content filter" %{name}
+exit 0
+
+# in the first release we put some user-editable files inside the datadir. doh!
+# if they are still there we migrate them over to their new home in the
+# sysconfdir.
+if [ "$1" -gt 1 ]?; then
+    if [ -e %{_datadir}/%{name}/lists ] ; then
+        mv -f %{_datadir}/%{name}/lists %{_sysconfdir}/%{name}
+    fi
+fi
+
 %post
 /sbin/chkconfig --add %{name}
 
@@ -128,9 +149,9 @@ fi
 %doc COPYING INSTALL README UPGRADING
 %doc doc/AuthPlugins doc/ContentScanners doc/DownloadManagers doc/FAQ
 %doc doc/FAQ.html doc/Plugins
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man8/%{name}.8.gz
 %{_sbindir}/%{name}
-%{_datadir}/%{name}
+%attr(-,%{name},%{name}) %{_datadir}/%{name}
 %{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}*.conf
@@ -140,12 +161,18 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/contentscanners/*
 %dir %{_sysconfdir}/%{name}/downloadmanagers
 %config(noreplace) %{_sysconfdir}/%{name}/downloadmanagers/*
+%dir %{_sysconfdir}/%{name}/lists
+%config(noreplace) %{_sysconfdir}/%{name}/lists/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-
+%attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
 
 
 %changelog
+* Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
+- fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
+- lists now reside in /etc/dansguardian/lists
+
 * Wed Jul 15 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-1
 - new upstream version
 



From heffer at fedoraproject.org  Wed Sep 23 18:42:38 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 23 Sep 2009 18:42:38 +0000 (UTC)
Subject: rpms/dansguardian/F-10 dansguardian-must-be-successful.patch, NONE, 
	1.1 dansguardian.logrotate, NONE, 1.1 dansguardian.spec, 1.1, 1.2
Message-ID: <20090923184238.3D68011C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/dansguardian/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12349

Modified Files:
	dansguardian.spec 
Added Files:
	dansguardian-must-be-successful.patch dansguardian.logrotate 
Log Message:
* Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
- fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
- lists now reside in /etc/dansguardian/lists


dansguardian-must-be-successful.patch:
 configs/dansguardian.conf.in |    2 +-
 src/FDTunnel.cpp             |    2 +-
 src/FOptionContainer.cpp     |    2 +-
 src/FatController.cpp        |    2 +-
 src/ListContainer.cpp        |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE dansguardian-must-be-successful.patch ---
diff -ruN dansguardian-2.10.1.1.orig/configs/dansguardian.conf.in dansguardian-2.10.1.1/configs/dansguardian.conf.in
--- dansguardian-2.10.1.1.orig/configs/dansguardian.conf.in	2009-08-04 11:46:41.484910072 +0200
+++ dansguardian-2.10.1.1/configs/dansguardian.conf.in	2009-08-04 11:49:08.980902851 +0200
@@ -354,7 +354,7 @@
 
 # Delete file cache after user completes download
 # When a file gets save to temp it stays there until it is deleted.
-# You can choose to have the file deleted when the user makes a sucessful
+# You can choose to have the file deleted when the user makes a successful
 # download.  This will mean if they click on the link to download from
 # the temp store a second time it will give a 404 error.
 # You should configure something to delete old files in temp to stop it filling up.
diff -ruN dansguardian-2.10.1.1.orig/src/FatController.cpp dansguardian-2.10.1.1/src/FatController.cpp
--- dansguardian-2.10.1.1.orig/src/FatController.cpp	2009-08-04 11:46:41.465902112 +0200
+++ dansguardian-2.10.1.1/src/FatController.cpp	2009-08-04 11:48:43.541651965 +0200
@@ -2074,7 +2074,7 @@
 	int tofind;
 	reloadconfig = false;
 
-	syslog(LOG_INFO, "Started sucessfully.");
+	syslog(LOG_INFO, "Started successfully.");
 
 	while (failurecount < 30 && !ttg && !reloadconfig) {
 
diff -ruN dansguardian-2.10.1.1.orig/src/FDTunnel.cpp dansguardian-2.10.1.1/src/FDTunnel.cpp
--- dansguardian-2.10.1.1.orig/src/FDTunnel.cpp	2009-08-04 11:46:41.464902536 +0200
+++ dansguardian-2.10.1.1/src/FDTunnel.cpp	2009-08-04 11:47:37.011652752 +0200
@@ -114,7 +114,7 @@
 	bool done = false;  // so we get past the first while
 
 	while (!done && (targetthroughput > -1 ? throughput < targetthroughput : true)) {
-		done = true;  // if we don't make a sucessful read and write this
+		done = true;  // if we don't make a successful read and write this
 		// flag will stay true and so the while() will exit
 
 		inset = fdSet;  // as select() can modify the sets we need to take
diff -ruN dansguardian-2.10.1.1.orig/src/FOptionContainer.cpp dansguardian-2.10.1.1/src/FOptionContainer.cpp
--- dansguardian-2.10.1.1.orig/src/FOptionContainer.cpp	2009-08-04 11:46:41.464902536 +0200
+++ dansguardian-2.10.1.1/src/FOptionContainer.cpp	2009-08-04 11:48:03.572653450 +0200
@@ -56,7 +56,7 @@
 	if (inet_aton(ip, &address)) {	// convert to in_addr
 		struct hostent *answer;
 		answer = gethostbyaddr((char *) &address, sizeof(address), AF_INET);
-		if (answer) {	// sucess in reverse dns
+		if (answer) {	// success in reverse dns
 			result->push_back(String(answer->h_name));
 			for (addrptr = (struct in_addr **) answer->h_addr_list; *addrptr; addrptr++) {
 				result->push_back(String(inet_ntoa(**addrptr)));
diff -ruN dansguardian-2.10.1.1.orig/src/ListContainer.cpp dansguardian-2.10.1.1/src/ListContainer.cpp
--- dansguardian-2.10.1.1.orig/src/ListContainer.cpp	2009-08-04 11:46:41.460901992 +0200
+++ dansguardian-2.10.1.1/src/ListContainer.cpp	2009-08-04 11:47:22.300690828 +0200
@@ -246,7 +246,7 @@
 		}
 	}
 	listfile.close();
-	return true;  // sucessful read
+	return true;  // successful read
 }
 
 // for phrase lists - helper function for readPhraseList
@@ -502,7 +502,7 @@
 			addToItemList(temp.toCharArray(), temp.length());  // add to unsorted list
 	}
 	listfile.close();
-	return true;  // sucessful read
+	return true;  // successful read
 }
 
 // for item lists - read nested item lists


--- NEW FILE dansguardian.logrotate ---
/var/log/dansguardian/access.log {
  rotate 4
  weekly
  sharedscripts
  postrotate
    /bin/kill -HUP `cat /var/run/dansguardian.pid 2>/dev/null` 2> /dev/null || true
  endscript
}


Index: dansguardian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dansguardian/F-10/dansguardian.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dansguardian.spec	15 Jul 2009 10:24:24 -0000	1.1
+++ dansguardian.spec	23 Sep 2009 18:42:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dansguardian
 Version:        2.10.1.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Content filtering web proxy
 Summary(de):    Contentfilter-Proxy
 
@@ -15,17 +15,21 @@ URL:            http://www.dansguardian.
 Source0:        http://dansguardian.org/downloads/2/Stable/%{name}-%{version}.tar.gz
 Source1:        dansguardian.init
 Source2:        dansguardian.httpd
+Source3:        dansguardian.logrotate
 # This patch removes the upstream restrictions on the GPLv2+ source
 Patch0:         dansguardian-copyright-notice.patch
 # Fixes some compilation errors with gcc 4.4
 Patch1:         dansguardian-gcc44.patch
 # Adds support for ClamAV > 0.95
 Patch2:         dansguardian-clamav095.patch
+# Fix some typos ;) (Bug #515363)
+Patch3:         dansguardian-must-be-successful.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  clamav-devel pcre-devel zlib-devel
-BuildRequires:  pkgconfig
-Requires(post): chkconfig
+BuildRequires:   clamav-devel pcre-devel zlib-devel
+BuildRequires:   pkgconfig
+Requires(pre):   shadow-utils
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -45,7 +49,7 @@ want but DansGuardian puts you in contro
 DansGuardian requires squid or another similar caching proxy server on your
 local network.
 
-%description(de)
+%description -l de
 DansGuardian filtert den Content einer Webseite basierend auf verschiedenen
 Methoden wie beispielsweise Wortfilter, PICS filtering und URL filtering. Es
 handelt sich also um ein echtes Content filtering anstatt einfacher Blacklists.
@@ -64,11 +68,10 @@ lokalen Netzwerk.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@/lists/|' configs/%{name}*.conf.in
-
+%patch3 -p1
 
 %build
-%configure --enable-orig-ip \
+%configure \
    --enable-clamav \
    --enable-clamd \
    --enable-icap \
@@ -76,7 +79,9 @@ sed -i 's|@DGCONFDIR@/lists/|@DGDATADIR@
    --enable-commandline \
    --enable-trickledm \
    --enable-ntlm \
-   --enable-email
+   --enable-email \
+   --with-proxyuser=dansguardian \
+   --with-proxygroup=dansguardian
 
 make %{?_smp_mflags}
 
@@ -84,16 +89,12 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/%{name} \
+install -Dpm 644 %{SOURCE3} \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 # delete the other scripts since they are of no use for Fedora users
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.pl
 
-# move the lists to the datadir, since they really are data
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/lists \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}
-
 # install init script and httpd config
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -Dp -m0644 %{SOURCE2} \
@@ -102,10 +103,30 @@ install -Dp -m0644 %{SOURCE2} \
 # we'll install this later within %doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
+# create the log dir
+install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+useradd -r -g %{name} -d %{_datadir}/%{name} -s /sbin/nologin \
+   -c "DansGuardian web content filter" %{name}
+exit 0
+
+# in the first release we put some user-editable files inside the datadir. doh!
+# if they are still there we migrate them over to their new home in the
+# sysconfdir.
+if [ "$1" -gt 1 ]?; then
+    if [ -e %{_datadir}/%{name}/lists ] ; then
+        mv -f %{_datadir}/%{name}/lists %{_sysconfdir}/%{name}
+    fi
+fi
+
 %post
 /sbin/chkconfig --add %{name}
 
@@ -128,9 +149,9 @@ fi
 %doc COPYING INSTALL README UPGRADING
 %doc doc/AuthPlugins doc/ContentScanners doc/DownloadManagers doc/FAQ
 %doc doc/FAQ.html doc/Plugins
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man8/%{name}.8.gz
 %{_sbindir}/%{name}
-%{_datadir}/%{name}
+%attr(-,%{name},%{name}) %{_datadir}/%{name}
 %{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}*.conf
@@ -140,12 +161,18 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/contentscanners/*
 %dir %{_sysconfdir}/%{name}/downloadmanagers
 %config(noreplace) %{_sysconfdir}/%{name}/downloadmanagers/*
+%dir %{_sysconfdir}/%{name}/lists
+%config(noreplace) %{_sysconfdir}/%{name}/lists/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-
+%attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
 
 
 %changelog
+* Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
+- fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
+- lists now reside in /etc/dansguardian/lists
+
 * Wed Jul 15 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-1
 - new upstream version
 



From notting at fedoraproject.org  Wed Sep 23 18:43:17 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 23 Sep 2009 18:43:17 +0000 (UTC)
Subject: rpms/gnome-mount/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE gnome-mount-0.4-drive-mount.patch, 1.1,
	NONE gnome-mount-0.4-no-media.patch, 1.2, NONE gnome-mount.spec,
	1.48, NONE sources, 1.14, NONE
Message-ID: <20090923184317.0C4D511C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnome-mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12694

Added Files:
	dead.package 
Removed Files:
	Makefile gnome-mount-0.4-drive-mount.patch 
	gnome-mount-0.4-no-media.patch gnome-mount.spec sources 
Log Message:
retire


--- NEW FILE dead.package ---
No longer needed


--- Makefile DELETED ---


--- gnome-mount-0.4-drive-mount.patch DELETED ---


--- gnome-mount-0.4-no-media.patch DELETED ---


--- gnome-mount.spec DELETED ---


--- sources DELETED ---



From sailer at fedoraproject.org  Wed Sep 23 18:52:58 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 23 Sep 2009 18:52:58 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-svn130.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 ghdl.spec, 1.54, 1.55 sources, 1.14,
	1.15 ghdl-llvmpath.patch, 1.1, NONE ghdl-svn126.patch, 1.1, NONE
Message-ID: <20090923185258.D59FE11C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17802

Modified Files:
	.cvsignore ghdl.spec sources 
Added Files:
	ghdl-svn130.patch 
Removed Files:
	ghdl-llvmpath.patch ghdl-svn126.patch 
Log Message:
update to 0.28/svn130


ghdl-svn130.patch:
 errorout.adb          |    6 
 ghdldrv/ghdllocal.adb |    2 
 grt/grt-processes.adb |  431 +++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads |   29 +--
 grt/grt-signals.adb   |   31 +--
 grt/grt-signals.ads   |   33 ++-
 grt/grt-types.ads     |    4 
 grt/grt-unithread.adb |    9 -
 grt/grt-unithread.ads |    6 
 version.ads           |    4 
 10 files changed, 332 insertions(+), 223 deletions(-)

--- NEW FILE ghdl-svn130.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-09-23 17:04:00.000000000 +0200
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-09-23 17:03:57.000000000 +0200
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-09-23 17:03:58.000000000 +0200
@@ -36,22 +36,25 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
+   type Process_Id_Array is array (Natural range <>) of Process_Acc;
    type Process_Id_Array_Acc is access Process_Id_Array;
 
    Resume_Process_Table : Process_Id_Array_Acc;
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,63 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +339,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +437,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +453,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +462,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +477,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +495,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +504,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +512,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +522,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +545,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -507,7 +627,7 @@
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,35 +636,30 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
@@ -571,15 +686,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +701,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +755,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +810,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-09-23 17:03:58.000000000 +0200
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -178,8 +174,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-09-23 17:03:57.000000000 +0200
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-09-23 17:03:57.000000000 +0200
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-09-23 17:03:58.000000000 +0200
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-09-23 17:03:57.000000000 +0200
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-09-23 17:03:58.000000000 +0200
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-09-23 17:04:01.000000000 +0200
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Oct 2008 09:48:35 -0000	1.12
+++ .cvsignore	23 Sep 2009 18:52:57 -0000	1.13
@@ -3,3 +3,5 @@ ghdl-0.26.tar.bz2
 ghdl-0.27.tar.bz2
 gcc-core-4.2.4.tar.bz2
 gcc-core-4.3.1.tar.bz2
+gcc-core-4.3.4.tar.bz2
+ghdl-0.28.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ghdl.spec	20 Sep 2009 13:53:46 -0000	1.54
+++ ghdl.spec	23 Sep 2009 18:52:58 -0000	1.55
@@ -1,6 +1,6 @@
-%global gccver 4.3.1
-%global ghdlver 0.27
-%global ghdlsvnver 126
+%global gccver 4.3.4
+%global ghdlver 0.28
+%global ghdlsvnver 130
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -27,7 +27,6 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-Patch108: ghdl-llvmpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -130,7 +129,6 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .llvm
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -313,6 +311,9 @@ popd
 
 
 %changelog
+* Wed Sep 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.130svn.0
+- update to 0.28/svn130
+
 * Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.126svn.0
 - update to svn126
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Oct 2008 09:48:35 -0000	1.14
+++ sources	23 Sep 2009 18:52:58 -0000	1.15
@@ -1,2 +1,2 @@
-448b5208d5c2fd611b9fa532746baff5  ghdl-0.27.tar.bz2
-f30652bdee577911681c86f5d7f23d65  gcc-core-4.3.1.tar.bz2
+575b3220bb8e7060939c429fc8608d22  gcc-core-4.3.4.tar.bz2
+07c1883c2fcd795303056a8a95645f94  ghdl-0.28.tar.bz2


--- ghdl-llvmpath.patch DELETED ---


--- ghdl-svn126.patch DELETED ---



From tmraz at fedoraproject.org  Wed Sep 23 18:53:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 23 Sep 2009 18:53:52 +0000 (UTC)
Subject: rpms/gnutls/devel .cvsignore, 1.24, 1.25 gnutls.spec, 1.47,
	1.48 sources, 1.24, 1.25
Message-ID: <20090923185352.0682111C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18103

Modified Files:
	.cvsignore gnutls.spec sources 
Log Message:
* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.8.4-1
- upgrade to a new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	14 Aug 2009 08:43:38 -0000	1.24
+++ .cvsignore	23 Sep 2009 18:53:50 -0000	1.25
@@ -1 +1 @@
-gnutls-2.8.3-nosrp.tar.bz2
+gnutls-2.8.4-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gnutls.spec	14 Aug 2009 08:43:38 -0000	1.47
+++ gnutls.spec	23 Sep 2009 18:53:50 -0000	1.48
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.8.3
+Version: 2.8.4
 Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
@@ -147,6 +147,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.8.4-1
+- upgrade to a new upstream version
+
 * Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.8.3-1
 - upgrade to a new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Aug 2009 08:43:38 -0000	1.24
+++ sources	23 Sep 2009 18:53:50 -0000	1.25
@@ -1 +1 @@
-d74ee79f709021efbf27c34739c82e11  gnutls-2.8.3-nosrp.tar.bz2
+b4fe7ddd702a55d719ba5940b004ed3a  gnutls-2.8.4-nosrp.tar.bz2



From oget at fedoraproject.org  Wed Sep 23 18:53:59 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 18:53:59 +0000 (UTC)
Subject: rpms/wavbreaker/devel wavbreaker.spec,1.14,1.15
Message-ID: <20090923185359.2AECA11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/wavbreaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18108

Modified Files:
	wavbreaker.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.10-4
- Update desktop file according to F-12 FedoraStudio feature



Index: wavbreaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wavbreaker/devel/wavbreaker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- wavbreaker.spec	27 Jul 2009 07:03:41 -0000	1.14
+++ wavbreaker.spec	23 Sep 2009 18:53:58 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Tool for splitting .wav files
 Name:		wavbreaker
 Version: 	0.10
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPLv2+
 Group: 		Applications/Multimedia
 URL: 		http://wavbreaker.sourceforge.net
@@ -35,6 +35,7 @@ make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora                \
         --dir %{buildroot}%{_datadir}/applications  \
+        --add-category X-OutputGeneration           \
         --delete-original                           \
         %{buildroot}%{_datadir}/applications/wavbreaker.desktop
 
@@ -57,6 +58,9 @@ update-desktop-database %{_datadir}/appl
 %doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.10-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 19:00:15 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:00:15 +0000 (UTC)
Subject: rpms/kmid/devel kmid.spec,1.5,1.6
Message-ID: <20090923190015.F078011C0423@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kmid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22271

Modified Files:
	kmid.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.0-0.9.20080213svn
- Update desktop file according to F-12 FedoraStudio feature



Index: kmid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmid/devel/kmid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kmid.spec	25 Jul 2009 04:40:23 -0000	1.5
+++ kmid.spec	23 Sep 2009 19:00:12 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           kmid
 Version:        2.0
-Release:        0.8.%{svn_date}svn%{?dist}
+Release:        0.9.%{svn_date}svn%{?dist}
 Summary:        A midi/karaoke player for KDE
 
 Group:          Applications/Multimedia
@@ -94,6 +94,7 @@ make install DESTDIR=%{buildroot} -C %{_
 
 desktop-file-install --vendor ""                          \
         --dir %{buildroot}%{_datadir}/applications/kde4   \
+        --add-category Midi                               \
         %{buildroot}%{_datadir}/applications/kde4/kmid.desktop
 
 
@@ -131,6 +132,9 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_libdir}/liblibkmid.so
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.0-0.9.20080213svn
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.8.20080213svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -165,4 +169,4 @@ xdg-icon-resource forceupdate --theme hi
 
 * Sun Jan 27 2008 Sebastian Vahl <fedora at deadbabylon.de> - 2.0-0.1.767336
 - svn revision 767336
-- Initial version kmid from extragear for KDE4
\ No newline at end of file
+- Initial version kmid from extragear for KDE4



From oget at fedoraproject.org  Wed Sep 23 19:06:28 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:06:28 +0000 (UTC)
Subject: rpms/schismtracker/devel schismtracker.desktop, 1.1,
	1.2 schismtracker.spec, 1.7, 1.8
Message-ID: <20090923190628.B10DB11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/schismtracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25274

Modified Files:
	schismtracker.desktop schismtracker.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5-0.10.rc1
- Update desktop file according to F-12 FedoraStudio feature



Index: schismtracker.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/schismtracker/devel/schismtracker.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- schismtracker.desktop	7 May 2007 05:49:54 -0000	1.1
+++ schismtracker.desktop	23 Sep 2009 19:06:28 -0000	1.2
@@ -4,6 +4,6 @@ Comment=Sound module composer/player
 Exec=schismtracker --play %f
 Terminal=false
 Type=Application
-Categories=AudioVideo;Audio;
+Categories=AudioVideo;Audio;X-Trackers;
 Icon=schismtracker
 MimeType=audio/x-mod;audio/x-s3m;audio/x-stm;audio/x-it;audio/x-xm;audio/x-669-mod;audio/x-mtm;


Index: schismtracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schismtracker/devel/schismtracker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- schismtracker.spec	27 Jul 2009 03:52:55 -0000	1.7
+++ schismtracker.spec	23 Sep 2009 19:06:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      schismtracker
 Version:   0.5
-Release:   0.9.rc1%{?dist}
+Release:   0.10.rc1%{?dist}
 Summary:   Sound module composer/player
 Group:     Applications/Multimedia
 License:   GPLv2
@@ -68,6 +68,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5-0.10.rc1
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-0.9.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 19:09:05 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:09:05 +0000 (UTC)
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.118,1.119
Message-ID: <20090923190905.F05BE11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26299

Modified Files:
	sound-juicer.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.26.1-6
- Update desktop file according to F-12 FedoraStudio feature



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sound-juicer.spec	29 Jul 2009 20:38:56 -0000	1.118
+++ sound-juicer.spec	23 Sep 2009 19:09:05 -0000	1.119
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.26.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.26/%{name}-%{version}.tar.bz2
@@ -40,6 +40,7 @@ BuildRequires:  gettext intltool
 BuildRequires:  libcanberra-devel
 BuildRequires:  gnome-common
 BuildRequires:  automake autoconf libtool
+BuildRequires:  desktop-file-utils
 
 ExcludeArch: s390 s390x
 
@@ -75,6 +76,12 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
+desktop-file-install \
+	--add-category="X-AudioVideoImport" \
+	--dir=%{buildroot}%{_datadir}/applications \
+	$RPM_BUILD_ROOT/%{_datadir}/applications/sound-juicer.desktop
+
+
 %find_lang sound-juicer --with-gnome
 
 
@@ -123,6 +130,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.26.1-6
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-5
 - Drop unneeded direct deps
 



From oget at fedoraproject.org  Wed Sep 23 19:15:08 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:15:08 +0000 (UTC)
Subject: rpms/jack-rack/devel jack-rack.spec,1.5,1.6
Message-ID: <20090923191508.C5CC811C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jack-rack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28841

Modified Files:
	jack-rack.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.7-4
- Update desktop file according to F-12 FedoraStudio feature



Index: jack-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-rack/devel/jack-rack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- jack-rack.spec	25 Jul 2009 03:46:30 -0000	1.5
+++ jack-rack.spec	23 Sep 2009 19:15:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           jack-rack
 Version:        1.4.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Stereo LADSPA effects rack for the JACK audio API
 
 Group:          Applications/Multimedia
@@ -58,6 +58,7 @@ desktop-file-install --vendor "fedora"  
   --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
   --delete-original                                \
   --add-category X-Fedora                          \
+  --add-category X-DigitalProcessing               \
  $RPM_BUILD_ROOT%{_datadir}/applications/jack-rack.desktop
 
 
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.7-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Wed Sep 23 19:16:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Sep 2009 19:16:57 +0000 (UTC)
Subject: rpms/gnome-commander/F-12 .cvsignore, 1.35,
	1.36 gnome-commander.spec, 1.60, 1.61 sources, 1.36, 1.37
Message-ID: <20090923191657.9DF3C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29434

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Thu Sep 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Try latest git



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	22 Jun 2009 18:47:17 -0000	1.35
+++ .cvsignore	23 Sep 2009 19:16:57 -0000	1.36
@@ -1 +1,2 @@
-gnome-commander-1.3-git_D20090623T0316_13dev.tar.bz2
+gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
+gnome-commander-1.2.8.2-po.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gnome-commander.spec	27 Jul 2009 15:21:55 -0000	1.60
+++ gnome-commander.spec	23 Sep 2009 19:16:57 -0000	1.61
@@ -1,12 +1,14 @@
 # To use git, follow:
 #
-# git clone  git://git.gnome.org/gnome-commander
+# git clone git://git.gnome.org/gnome-commander
 # cd gnome-commander/
-# git rebase origin/gcmd-1-3
+# git checkout -b gcmd-1-3 origin/gcmd-1-3
+# git pull
+# ...
 # cd ..
-# ln -sf gcmd-1-3 gnome-commander-%%{version}-git_%%{git_pull_JST}
+# ln -sf gcmd-commander gnome-commander-%%{version}-git_%%{git_pull_JST}
 # tar cjf gnome-commander-%%{version}-git_%%{git_pull_JST}.tar.bz2 \
-#    gnome-commander-%%{version}-git_%%{git_pull_JST}
+#    gnome-commander-%%{version}-git_%%{git_pull_JST}/./
 
 # Source10 is created by:
 # svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/
@@ -14,13 +16,19 @@
 #
 # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
 
+#
+# Source20 is extracted from gnome-commander-1.2.8.2.tar.bz2
+# wget -N ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/gnome-commander-1.2.8.2.tar.bz2
+# tar xf gnome-commander-1.2.8.2.tar.bz2
+# tar cjf gnome-commander-1.2.8.2-po.tar.bz2 gnome-commander-1.2.8.2/po/
+
 %define        EXIV2_REQ             0.14
 %define        TAGLIB_REQ            1.4
 %define        LIBGSF_REQ            1.12.0
 %define        POPPLER_REQ           0.6
 %define        VTE_REQ               0.11
 
-%define        git_pull_JST          D20090623T0316
+%define        git_pull_JST          D20090924T0215
 
 %define        use_autotool          0
 %define        if_pre                1
@@ -28,6 +36,8 @@
 %define        extratag              git_%{git_pull_JST}_13dev
 %define        mimeedit_rev          1958
 
+%define        update_po             1
+
 %if 0%{?if_pre} > 0
 %define        use_autotool          1
 %endif
@@ -36,7 +46,7 @@
 
 Name:          gnome-commander
 Version:       1.3
-Release:       %{fedora_rel}%{?dist}.1
+Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
 Summary(sv):   GNOME Commander ?r en snabb och smidig filhanderare f?r GNOME
@@ -47,6 +57,9 @@ URL:           http://www.nongnu.org/gcm
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
+%if %{update_po}
+Source20:      gnome-commander-1.2.8.2-po.tar.bz2
+%endif
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,7 +125,7 @@ Ut?ver att kunna hantera filer p? din 
 ansluta till FTP-servrar och SMB-n?tverk.
 
 %prep
-%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
+%setup -q -n %{name}-%{version}%{?extratag:-%extratag} -a 20
 
 %if 0%{use_autotool} > 0
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
@@ -126,6 +139,14 @@ cp -p %SOURCE10 mimeedit.sh
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
+# Update po
+%if %{update_po}
+%{__cp} -p gnome-commander-1.2.*/po/*.po po/
+pushd po
+ls -1 *.po | sort | %{__sed} -e 's|\.po||' > LINGUAS
+popd
+%endif
+
 touch po/POTFILES.in
 touch -r po/POTFILES.in po/stamp-it
 
@@ -137,6 +158,17 @@ touch -r po/POTFILES.in po/stamp-it
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
+
+
+# update po
+%if %{update_po}
+pushd po
+rm -f POTFILES.in ; touch POTFILES.in
+intltool-update -m  2>&1 | grep '/' | grep -v ' ' > POTFILES.in
+make gnome-commander.pot update-po
+popd
+%endif
+
 # Sometimes parallel make fails (perhaps), however once
 # force it.
 %{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
@@ -203,6 +235,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Sep 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try latest git
+
 * Tue Jul 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	22 Jun 2009 18:47:17 -0000	1.36
+++ sources	23 Sep 2009 19:16:57 -0000	1.37
@@ -1 +1,2 @@
-e1d245fd383708b5142adf057c9abad1  gnome-commander-1.3-git_D20090623T0316_13dev.tar.bz2
+52df3ddcafb134c782a7b74369374ec6  gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
+b190627ef20d9fe261c0445bc7d56877  gnome-commander-1.2.8.2-po.tar.bz2



From oget at fedoraproject.org  Wed Sep 23 19:19:36 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:19:36 +0000 (UTC)
Subject: rpms/grip/devel grip.spec,1.29,1.30
Message-ID: <20090923191936.83F1411C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/grip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30616

Modified Files:
	grip.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:3.2.0-28
- Update desktop file according to F-12 FedoraStudio feature



Index: grip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grip/devel/grip.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- grip.spec	25 Jul 2009 01:29:25 -0000	1.29
+++ grip.spec	23 Sep 2009 19:19:35 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 27%{?dist}
+Release: 28%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Applications/Multimedia
@@ -81,7 +81,7 @@ desktop-file-install \
 	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--delete-original \
 	--add-category X-Fedora \
-	--add-category Application \
+	--add-category X-AudioVideoImport \
 	--add-category AudioVideo \
 	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 %find_lang %{name}-2.2
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:3.2.0-28
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.2.0-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 19:24:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:24:54 +0000 (UTC)
Subject: rpms/jokosher/devel jokosher.spec,1.24,1.25
Message-ID: <20090923192454.D4A4C11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jokosher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv732

Modified Files:
	jokosher.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0-0.7.20090604svn
- Update desktop file according to F-12 FedoraStudio feature



Index: jokosher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jokosher/devel/jokosher.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- jokosher.spec	25 Jul 2009 04:06:40 -0000	1.24
+++ jokosher.spec	23 Sep 2009 19:24:54 -0000	1.25
@@ -5,7 +5,7 @@
 
 Name: jokosher
 Version: 1.0
-Release: 0.6.20090604svn%{?dist}
+Release: 0.7.20090604svn%{?dist}
 Summary: A simple and easy-to-use Open Source multi-track editor
 Group: Applications/Multimedia
 License: GPLv2+ with exceptions
@@ -68,6 +68,8 @@ rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root=%{buildroot}
 desktop-file-install --vendor=""                 \
   --delete-original                              \
+  --add-category X-Multitrack                    \
+  --add-category Sequencer                       \
   --dir=%{buildroot}%{_datadir}/applications     \
   bin/%{name}.desktop
 %find_lang %{name}
@@ -102,6 +104,9 @@ scrollkeeper-update -q ||:
 %{_datadir}/omf/%{name}/
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0-0.7.20090604svn
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.6.20090604svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Sep 23 19:28:51 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 23 Sep 2009 19:28:51 +0000 (UTC)
Subject: rpms/pitivi/devel pitivi.spec,1.40,1.41
Message-ID: <20090923192852.0A05A11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2875

Modified Files:
	pitivi.spec 
Log Message:
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.13.3-2
- Update desktop file according to F-12 FedoraStudio feature



Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- pitivi.spec	16 Sep 2009 03:10:36 -0000	1.40
+++ pitivi.spec	23 Sep 2009 19:28:50 -0000	1.41
@@ -2,7 +2,7 @@
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -64,6 +64,7 @@ make DESTDIR=%{buildroot} install
 rm %{buildroot}%{_datadir}/applications/pitivi.desktop
 desktop-file-install --vendor fedora                            \
         --dir %{buildroot}%{_datadir}/applications              \
+        --add-category AudioVideoEditing                        \
         pitivi.desktop
 
 %find_lang %{name}
@@ -81,6 +82,9 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.13.3-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Sep 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-1
 - 0.13.3 Release : ... we shall never (sur)render
 -



From pkgdb at fedoraproject.org  Wed Sep 23 19:30:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:30:32 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20090923193032.9E75A10F883@bastion2.fedora.phx.redhat.com>

toshio has set the PersonPackageListingAcl(u'watchbugzilla', 13, personpackagelistingid=34562) acl on selinux-policy (Fedora devel) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'commit', 13, personpackagelistingid=34562) acl on selinux-policy (Fedora devel) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'build', 13, personpackagelistingid=34562) acl on selinux-policy (Fedora devel) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchcommits', 13, personpackagelistingid=34562) acl on selinux-policy (Fedora devel) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'approveacls', 13, personpackagelistingid=34562) acl on selinux-policy (Fedora devel) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchbugzilla', 13, personpackagelistingid=34560) acl on selinux-policy (Fedora 7) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchcommits', 13, personpackagelistingid=34560) acl on selinux-policy (Fedora 7) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'commit', 13, personpackagelistingid=34560) acl on selinux-policy (Fedora 7) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'build', 13, personpackagelistingid=34560) acl on selinux-policy (Fedora 7) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'approveacls', 13, personpackagelistingid=34560) acl on selinux-policy (Fedora 7) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchbugzilla', 13, personpackagelistingid=34561) acl on selinux-policy (Fedora 8) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchcommits', 13, personpackagelistingid=34561) acl on selinux-policy (Fedora 8) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'commit', 13, personpackagelistingid=34561) acl on selinux-policy (Fedora 8) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'build', 13, personpackagelistingid=34561) acl on selinux-policy (Fedora 8) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'approveacls', 13, personpackagelistingid=34561) acl on selinux-policy (Fedora 8) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'commit', 13, personpackagelistingid=42293) acl on selinux-policy (Fedora 9) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchcommits', 13, personpackagelistingid=42293) acl on selinux-policy (Fedora 9) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'build', 13, personpackagelistingid=42293) acl on selinux-policy (Fedora 9) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchbugzilla', 13, personpackagelistingid=42293) acl on selinux-policy (Fedora 9) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'approveacls', 13, personpackagelistingid=42293) acl on selinux-policy (Fedora 9) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'commit', 13, personpackagelistingid=57315) acl on selinux-policy (Fedora 10) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'approveacls', 13, personpackagelistingid=57315) acl on selinux-policy (Fedora 10) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'build', 13, personpackagelistingid=57315) acl on selinux-policy (Fedora 10) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchbugzilla', 13, personpackagelistingid=57315) acl on selinux-policy (Fedora 10) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchcommits', 13, personpackagelistingid=57315) acl on selinux-policy (Fedora 10) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'commit', 13, personpackagelistingid=69008) acl on selinux-policy (Fedora 11) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'approveacls', 13, personpackagelistingid=69008) acl on selinux-policy (Fedora 11) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'build', 13, personpackagelistingid=69008) acl on selinux-policy (Fedora 11) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchbugzilla', 13, personpackagelistingid=69008) acl on selinux-policy (Fedora 11) to Obsolete for jkubin
toshio has set the PersonPackageListingAcl(u'watchcommits', 13, personpackagelistingid=69008) acl on selinux-policy (Fedora 11) to Obsolete for jkubin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From rdieter at fedoraproject.org  Wed Sep 23 19:39:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 19:39:16 +0000 (UTC)
Subject: rpms/kdelibs3/devel kde.csh, 1.3, 1.4 kde.sh, 1.4, 1.5 kdelibs3.spec,
	1.70, 1.71
Message-ID: <20090923193916.C88AF11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7618

Modified Files:
	kde.csh kde.sh kdelibs3.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17 
- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)



Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde.csh	3 Sep 2009 12:44:07 -0000	1.3
+++ kde.csh	23 Sep 2009 19:39:15 -0000	1.4
@@ -5,10 +5,10 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ##  When/if using prelinking, avoids (some) use of kdeinit
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-#     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#endif
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 


Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde.sh	3 Sep 2009 12:44:07 -0000	1.4
+++ kde.sh	23 Sep 2009 19:39:16 -0000	1.5
@@ -5,7 +5,7 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -z "$KDE_IS_PRELINKED" ] ; then
-#  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
-#  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+fi


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- kdelibs3.spec	4 Sep 2009 20:19:42 -0000	1.70
+++ kdelibs3.spec	23 Sep 2009 19:39:16 -0000	1.71
@@ -30,7 +30,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -342,8 +342,10 @@ for i in *; do
 done
 popd
 
+%if 0%{?fedora} < 12
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
+%endif
 
 # Use hicolor-icon-theme rpm/pkg instead (#178319)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
@@ -479,7 +481,9 @@ touch --no-create %{_datadir}/icons/crys
 %defattr(-,root,root,-)
 %doc README
 %doc COPYING.LIB
+%if 0%{?fedora} < 12
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_bindir}/artsmessage
 %{_bindir}/cupsdconf
 %{_bindir}/cupsdoprint
@@ -576,6 +580,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17 
+- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-16
 - openssl-1.0 build fixes
 



From pkgdb at fedoraproject.org  Wed Sep 23 19:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:40:04 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree: hpejakle has requested
	watchcommits
Message-ID: <20090923194004.3E57710F87C@bastion2.fedora.phx.redhat.com>

hpejakle has requested the watchcommits acl on perl-XML-Parser-Lite-Tree (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Wed Sep 23 19:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:40:04 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree: hpejakle has requested
	watchbugzilla
Message-ID: <20090923194004.B53EB10F885@bastion2.fedora.phx.redhat.com>

hpejakle has requested the watchbugzilla acl on perl-XML-Parser-Lite-Tree (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Wed Sep 23 19:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:40:09 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree: hpejakle has requested commit
Message-ID: <20090923194010.064FA10F88A@bastion2.fedora.phx.redhat.com>

hpejakle has requested the commit acl on perl-XML-Parser-Lite-Tree (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Wed Sep 23 19:40:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:40:29 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree: hpejakle has requested
	watchbugzilla
Message-ID: <20090923194029.2965510F87C@bastion2.fedora.phx.redhat.com>

hpejakle has requested the watchbugzilla acl on perl-XML-Parser-Lite-Tree (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Wed Sep 23 19:40:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:40:29 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree: hpejakle has requested commit
Message-ID: <20090923194030.0F4AF10F885@bastion2.fedora.phx.redhat.com>

hpejakle has requested the commit acl on perl-XML-Parser-Lite-Tree (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Wed Sep 23 19:40:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 19:40:34 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree: hpejakle has requested
	watchcommits
Message-ID: <20090923194034.89C8310F890@bastion2.fedora.phx.redhat.com>

hpejakle has requested the watchcommits acl on perl-XML-Parser-Lite-Tree (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From rdieter at fedoraproject.org  Wed Sep 23 19:40:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 19:40:39 +0000 (UTC)
Subject: rpms/kdelibs/devel kde4.csh, 1.5, 1.6 kde4.sh, 1.6, 1.7 kdelibs.spec,
	1.517, 1.518
Message-ID: <20090923194039.B2A1411C0423@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8425

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.csh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde4.csh	14 Aug 2009 14:21:12 -0000	1.5
+++ kde4.csh	23 Sep 2009 19:40:39 -0000	1.6
@@ -5,11 +5,10 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-## disabled, for now, due to http://bugzilla.redhat.com/515539
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-#     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#   unset PRELINKING
-#endif
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+   unset PRELINKING
+endif


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kde4.sh	14 Aug 2009 14:21:12 -0000	1.6
+++ kde4.sh	23 Sep 2009 19:40:39 -0000	1.7
@@ -5,8 +5,7 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-## disabled, for now, due to http://bugzilla.redhat.com/515539
-#if [ -z "$KDE_IS_PRELINKED" ] ; then
-#  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
-#  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+fi


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -p -r1.517 -r1.518
--- kdelibs.spec	21 Sep 2009 15:47:17 -0000	1.517
+++ kdelibs.spec	23 Sep 2009 19:40:39 -0000	1.518
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -270,8 +270,10 @@ do
 done
 popd
 
+%if 0%{?fedora} < 12
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+%endif
 
 # fix Sonnet documentation multilib conflict
 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
@@ -316,7 +318,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING.LIB
+%if 0%{?fedora} < 12
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
@@ -392,6 +396,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
+- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
+
 * Mon Sep 21 2009 Than Ngo <than at redhat.com> - 4.3.1-6
 - use abrt for RHEL
 



From overholt at fedoraproject.org  Wed Sep 23 19:53:01 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 23 Sep 2009 19:53:01 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.667,1.668
Message-ID: <20090923195301.7259411C00E6@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13554

Modified Files:
	eclipse.spec 
Log Message:
* Wed Sep 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-2
- Move jakarta-commons-codec requirement from jdt to platform.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -p -r1.667 -r1.668
--- eclipse.spec	22 Sep 2009 09:14:23 -0000	1.667
+++ eclipse.spec	23 Sep 2009 19:53:01 -0000	1.668
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -231,6 +231,7 @@ Requires: ant-javamail ant-jdepend ant-j
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
 Requires: jakarta-commons-el >= 1.0-9
 Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
+Requires: jakarta-commons-codec
 Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
@@ -254,7 +255,6 @@ Requires:       %{name}-platform = %{epo
 Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
 Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
-Requires:       jakarta-commons-codec
 Requires:       jakarta-commons-httpclient
 Requires:       java-javadoc
 Requires:       java-devel
@@ -1429,6 +1429,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Sep 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-2
+- Move jakarta-commons-codec requirement from jdt to platform.
+
 * Tue Sep 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-1
 - Fix help toolbar jsp problem.
 



From orion at fedoraproject.org  Wed Sep 23 19:55:43 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 23 Sep 2009 19:55:43 +0000 (UTC)
Subject: rpms/environment-modules/devel
	environment-modules-3.2.7-bindir.patch, 
	NONE, 1.1 environment-modules.spec, 1.23, 1.24
Message-ID: <20090923195543.D138F11C00E6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14346

Modified Files:
	environment-modules.spec 
Added Files:
	environment-modules-3.2.7-bindir.patch 
Log Message:
* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
- Add patch to fix modulecmd path in init files


environment-modules-3.2.7-bindir.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE environment-modules-3.2.7-bindir.patch ---
--- modules-3.2.7/init/Makefile.in.bindir	2009-09-22 12:13:52.000000000 -0600
+++ modules-3.2.7/init/Makefile.in	2009-09-23 12:19:50.797470155 -0600
@@ -404,7 +404,7 @@
 	sed -e "/@$(if $(subst 0,,$(WANTS_VERSIONING)),NOT,)VERSIONING\@/d; \
 	s,@$(if $(subst 0,,$(WANTS_VERSIONING)),,NOT)VERSIONING\@,,g; \
 	s, at prefix\@,${prefix},g; \
-	s, at bindir\@,${exec_prefix}/bin,g; \
+	s, at bindir\@,${bindir},g; \
 	s, at VERSION\@, at VERSION@,g; \
 	s, at BASEPREFIX\@, at BASEPREFIX@,g;" < $< > $@
 


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- environment-modules.spec	23 Sep 2009 15:06:47 -0000	1.23
+++ environment-modules.spec	23 Sep 2009 19:55:43 -0000	1.24
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Patch0:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -38,12 +39,15 @@ have access to the module alias.
 
 %prep
 %setup -q -n modules-3.2.7
+%patch0 -p1 -b .bindir
 
 
 %build
-%configure --disable-versioning --prefix=%{_datadir} \
+%configure --disable-versioning \
+           --prefix=%{_datadir} \
            --exec-prefix=%{_datadir}/Modules \
            --with-module-path=%{_sysconfdir}/modulefiles
+
 #           --with-debug=42 --with-log-facility-debug=stderr
 make %{?_smp_mflags}
 
@@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
+- Add patch to fix modulecmd path in init files
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-1
 - Update to 3.2.7b
 



From ajax at fedoraproject.org  Wed Sep 23 19:59:40 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 23 Sep 2009 19:59:40 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1823,1.1824
Message-ID: <20090923195940.9106511C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17035

Modified Files:
	kernel.spec 
Log Message:
* Wed Sep 23 2009 Adam Jackson <ajax at redhat.com> 2.6.31-37
- drm: Fix various buglets in EDID parsing.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1823
retrieving revision 1.1824
diff -u -p -r1.1823 -r1.1824
--- kernel.spec	21 Sep 2009 17:55:21 -0000	1.1823
+++ kernel.spec	23 Sep 2009 19:59:39 -0000	1.1824
@@ -708,6 +708,7 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
+Patch1827: drm-edid-fixes.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1380,6 +1381,7 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
+ApplyPatch drm-edid-fixes.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2070,6 +2072,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 23 2009 Adam Jackson <ajax at redhat.com> 2.6.31-37
+- drm: Fix various buglets in EDID parsing.
+
 * Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: more on rh#522649, added some useful info to debugfs
 - lots of coding style cleanups, which is the reason for the huge commit



From orion at fedoraproject.org  Wed Sep 23 20:00:50 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 23 Sep 2009 20:00:50 +0000 (UTC)
Subject: rpms/environment-modules/F-11
	environment-modules-3.2.7-bindir.patch, 
	NONE, 1.1 environment-modules.spec, 1.20, 1.21 import.log, 1.2, 1.3
Message-ID: <20090923200050.34EA411C02CA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17850/F-11

Modified Files:
	environment-modules.spec import.log 
Added Files:
	environment-modules-3.2.7-bindir.patch 
Log Message:
Add patch to fix modulecmd path in init files

environment-modules-3.2.7-bindir.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE environment-modules-3.2.7-bindir.patch ---
--- modules-3.2.7/init/Makefile.in.bindir	2009-09-22 12:13:52.000000000 -0600
+++ modules-3.2.7/init/Makefile.in	2009-09-23 12:19:50.797470155 -0600
@@ -404,7 +404,7 @@
 	sed -e "/@$(if $(subst 0,,$(WANTS_VERSIONING)),NOT,)VERSIONING\@/d; \
 	s,@$(if $(subst 0,,$(WANTS_VERSIONING)),,NOT)VERSIONING\@,,g; \
 	s, at prefix\@,${prefix},g; \
-	s, at bindir\@,${exec_prefix}/bin,g; \
+	s, at bindir\@,${bindir},g; \
 	s, at VERSION\@, at VERSION@,g; \
 	s, at BASEPREFIX\@, at BASEPREFIX@,g;" < $< > $@
 


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- environment-modules.spec	23 Sep 2009 15:32:35 -0000	1.20
+++ environment-modules.spec	23 Sep 2009 20:00:48 -0000	1.21
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Patch0:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -38,12 +39,15 @@ have access to the module alias.
 
 %prep
 %setup -q -n modules-3.2.7
+%patch0 -p1 -b .bindir
 
 
 %build
-%configure --disable-versioning --prefix=%{_datadir} \
+%configure --disable-versioning \
+           --prefix=%{_datadir} \
            --exec-prefix=%{_datadir}/Modules \
            --with-module-path=%{_sysconfdir}/modulefiles
+
 #           --with-debug=42 --with-log-facility-debug=stderr
 make %{?_smp_mflags}
 
@@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
+- Add patch to fix modulecmd path in init files
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-1
 - Update to 3.2.7b
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 Sep 2009 15:32:35 -0000	1.2
+++ import.log	23 Sep 2009 20:00:48 -0000	1.3
@@ -1,2 +1,3 @@
 environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344
 environment-modules-3_2_7b-1_fc12:F-11:environment-modules-3.2.7b-1.fc12.src.rpm:1253719416
+environment-modules-3_2_7b-2_fc12:F-11:environment-modules-3.2.7b-2.fc12.src.rpm:1253735985



From kyle at fedoraproject.org  Wed Sep 23 20:08:36 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 23 Sep 2009 20:08:36 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1824,1.1825
Message-ID: <20090923200837.131AC11C00E6@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22318

Modified Files:
	kernel.spec 
Log Message:
* Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-38
- touch initramfs-$foo not dracut-$foo.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1824
retrieving revision 1.1825
diff -u -p -r1.1824 -r1.1825
--- kernel.spec	23 Sep 2009 19:59:39 -0000	1.1824
+++ kernel.spec	23 Sep 2009 20:08:35 -0000	1.1825
@@ -1549,7 +1549,7 @@ EOF
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
 %if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/dracut-$KernelVer.img
+    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
 %else
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
 %endif
@@ -2072,6 +2072,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-38
+- touch initramfs-$foo not dracut-$foo.
+
 * Wed Sep 23 2009 Adam Jackson <ajax at redhat.com> 2.6.31-37
 - drm: Fix various buglets in EDID parsing.
 



From steved at fedoraproject.org  Wed Sep 23 20:09:06 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 23 Sep 2009 20:09:06 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel6.patch, NONE,
	1.1 nfs-utils.spec, 1.241, 1.242
Message-ID: <20090923200906.DE64511C00E6@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22507

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-v4root-rel6.patch 
Log Message:
Updated to the latest pseudo root release (rel6)


nfs-utils-1.2.0-v4root-rel6.patch:
 support/export/xtab.c        |    6 
 support/include/exportfs.h   |   11 +
 support/include/nfs/export.h |    3 
 support/include/nfslib.h     |    1 
 support/include/v4root.h     |   20 ++
 utils/mountd/Makefile.am     |    2 
 utils/mountd/auth.c          |    4 
 utils/mountd/cache.c         |   69 +++++--
 utils/mountd/v4root.c        |  420 +++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 517 insertions(+), 19 deletions(-)

--- NEW FILE nfs-utils-1.2.0-v4root-rel6.patch ---
diff --git a/support/export/xtab.c b/support/export/xtab.c
index 3b1dcce..2a43193 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -19,7 +19,9 @@
 #include "exportfs.h"
 #include "xio.h"
 #include "xlog.h"
+#include "v4root.h"
 
+int v4root_needed;
 static void cond_rename(char *newfile, char *oldfile);
 
 static int
@@ -36,6 +38,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
 	if ((lockid = xflock(lockfn, "r")) < 0)
 		return 0;
 	setexportent(xtab, "r");
+	if (is_export == 1)
+		v4root_needed = 1;
 	while ((xp = getexportent(is_export==0, 0)) != NULL) {
 		if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
 		    !(exp = export_create(xp, is_export!=1))) {
@@ -48,6 +52,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
 		case 1:
 			exp->m_xtabent = 1;
 			exp->m_mayexport = 1;
+			if ((xp->e_flags & NFSEXP_FSID) && xp->e_fsid == 0)
+				v4root_needed = 0;
 			break;
 		case 2:
 			exp->m_exported = -1;/* may be exported */
diff --git a/support/include/exportfs.h b/support/include/exportfs.h
index a5cf482..1ad41e2 100644
--- a/support/include/exportfs.h
+++ b/support/include/exportfs.h
@@ -12,6 +12,17 @@
 #include <netdb.h>
 #include "nfslib.h"
 
+enum nfsd_fsid {
+	FSID_DEV = 0,
+	FSID_NUM,
+	FSID_MAJOR_MINOR,
+	FSID_ENCODE_DEV,
+	FSID_UUID4_INUM,
+	FSID_UUID8,
+	FSID_UUID16,
+	FSID_UUID16_INUM,
+};
+
 enum {
 	MCL_FQDN = 0,
 	MCL_SUBNETWORK,
diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index f7a99ba..76953ac 100644
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -24,6 +24,7 @@
 #define NFSEXP_FSID		0x2000
 #define	NFSEXP_CROSSMOUNT	0x4000
 #define NFSEXP_NOACL		0x8000 /* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS		0xFFFF
+#define NFSEXP_V4ROOT       0x10000
+#define NFSEXP_ALLFLAGS		0x1FFFF
 
 #endif /* _NSF_EXPORT_H */
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 537a31e..e4777dd 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -88,6 +88,7 @@ struct exportent {
 	int             e_fslocmethod;
 	char *          e_fslocdata;
 	char *		e_uuid;
+	void *		e_v4root;
 	struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
 };
 
diff --git a/support/include/v4root.h b/support/include/v4root.h
new file mode 100644
index 0000000..43b1d2e
--- /dev/null
+++ b/support/include/v4root.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ * support/include/v4root.h
+ *
+ * Support routines for dynamic pseudo roots.
+ *
+ */
+
+#ifndef V4ROOT_H
+#define V4ROOT_H
+
+extern int v4root_needed;
+
+extern struct exportent *v4root_chkroot(int , unsigned int , char *);
+extern struct exportent *v4root_export(char *, int);
+extern struct exportent *v4root_create(char *, nfs_export *, int);
+extern void v4root_free(struct exportent *);
+extern void v4root_unset(void), v4root_set(void);
+
+#endif /* V4ROOT_H */
diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am
index 1e76cf8..eba81fc 100644
--- a/utils/mountd/Makefile.am
+++ b/utils/mountd/Makefile.am
@@ -8,7 +8,7 @@ KPREFIX		= @kprefix@
 sbin_PROGRAMS	= mountd
 
 mountd_SOURCES = mountd.c mount_dispatch.c auth.c rmtab.c cache.c \
-		 svc_run.c fsloc.c mountd.h
+		 svc_run.c fsloc.c v4root.c mountd.h
 mountd_LDADD = ../../support/export/libexport.a \
 	       ../../support/nfs/libnfs.a \
 	       ../../support/misc/libmisc.a \
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 575f207..041a745 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -20,6 +20,7 @@
 #include "exportfs.h"
 #include "mountd.h"
 #include "xmalloc.h"
+#include "v4root.h"
 
 enum auth_error
 {
@@ -98,10 +99,13 @@ auth_reload()
 		last_inode = stb.st_ino;
 	}
 
+	v4root_unset();
 	export_freeall();
 	memset(&my_client, 0, sizeof(my_client));
 	xtab_export_read();
 	check_useipaddr();
+	v4root_set();
+
 	++counter;
 
 	return counter;
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index e4e2f22..d631570 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -32,23 +32,12 @@
 #include "xmalloc.h"
 #include "fsloc.h"
 #include "pseudoflavors.h"
+#include "v4root.h"
 
 #ifdef USE_BLKID
 #include "blkid/blkid.h"
 #endif
 
-
-enum nfsd_fsid {
-	FSID_DEV = 0,
-	FSID_NUM,
-	FSID_MAJOR_MINOR,
-	FSID_ENCODE_DEV,
-	FSID_UUID4_INUM,
-	FSID_UUID8,
-	FSID_UUID16,
-	FSID_UUID16_INUM,
-};
-
 /*
  * Support routines for text-based upcalls.
  * Fields are separated by spaces.
@@ -135,6 +124,8 @@ void auth_unix_gid(FILE *f)
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
 		return;
 
+	xlog(D_CALL, "auth_unix_gid: '%s'", lbuf);
+
 	cp = lbuf;
 	if (qword_get_int(&cp, &uid) != 0)
 		return;
@@ -391,6 +382,12 @@ void nfsd_fh(FILE *f)
 
 	auth_reload();
 
+	/* Check to see if the kenel is looking for the pseudo root */
+	if ((found = v4root_chkroot(fsidtype, fsidnum, fhuuid))) {
+		found_path = strdup(found->e_path);
+		goto found;
+	}
+
 	/* Now determine export point for this fsid/domain */
 	for (i=0 ; i < MCL_MAXTYPES; i++) {
 		nfs_export *next_exp;
@@ -511,7 +508,23 @@ void nfsd_fh(FILE *f)
 		 */
 		goto out;
 	}
+	if (!found) {
+		/*
+		 * See if this is a pesudo export
+		 */
+		switch(fsidtype) {
+		case FSID_UUID4_INUM:
+		case FSID_UUID8:
+		case FSID_UUID16:
+		case FSID_UUID16_INUM:
+			found = v4root_export(fhuuid, uuidlen);
+			break;
+		}
+		if (found)
+			found_path = strdup(found->e_path);
+	}
 
+found:
 	if (found)
 		if (cache_export_ent(dom, found, found_path) < 0)
 			found = 0;
@@ -629,6 +642,7 @@ void nfsd_export(FILE *f)
 	int found_type = 0;
 	struct in_addr addr;
 	struct hostent *he = NULL;
+	struct exportent *v4root = NULL;
 
 
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
@@ -663,10 +677,18 @@ void nfsd_export(FILE *f)
 				     path[l] == '/' &&
 				     is_mountpoint(path)))
 					/* ok */;
-				else
+				else {
+					/* See if the path is part of the psuedo root */
+					if (v4root_needed && !v4root) 
+						v4root = v4root_create(path, exp, TRUE); 
 					continue;
-			} else if (strcmp(path, exp->m_export.e_path) != 0)
+				}
+			} else if (strcmp(path, exp->m_export.e_path) != 0) {
+				/* See if the path is part of the psuedo root */
+				if (v4root_needed && !v4root) 
+					v4root = v4root_create(path, exp, TRUE); 
 				continue;
+			}
 			if (use_ipaddr) {
 				if (he == NULL) {
 					if (!inet_aton(dom, &addr))
@@ -705,17 +727,28 @@ void nfsd_export(FILE *f)
 	}
 
 	if (found) {
+		xlog(D_CALL, "nfsd_export: found: path %s", path);
 		if (dump_to_cache(f, dom, path, &found->m_export) < 0) {
 			xlog(L_WARNING,
 			     "Cannot export %s, possibly unsupported filesystem"
 			     " or fsid= required", path);
 			dump_to_cache(f, dom, path, NULL);
 		}
-	} else {
+	} else if (v4root) {
+		xlog(D_CALL, "nfsd_export: vroot: path %s", path);
+		dump_to_cache(f, dom, path, v4root);
+		found = (nfs_export *)v4root;
+	} else { 
 		dump_to_cache(f, dom, path, NULL);
 	}
  out:
-	xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
+	/*
+	 * If a psuedo export was create and its not needed
+	 * free it up.
+	 */
+	if (v4root && found != (nfs_export *)v4root)
+		v4root_free(v4root);
+
 	if (dom) free(dom);
 	if (path) free(path);
 	if (he) free(he);
@@ -743,7 +776,9 @@ void cache_open(void)
 		if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
 			continue;
 		sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
-		cachelist[i].f = fopen(path, "r+");
+		if ((cachelist[i].f = fopen(path, "r+")) == NULL)
+			xlog(L_ERROR, "cache_open: Unable to open '%s': errno %d (%s)", 
+				path, errno, strerror(errno));
 	}
 }
 
diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
new file mode 100644
index 0000000..8de2ab6
--- /dev/null
+++ b/utils/mountd/v4root.c
@@ -0,0 +1,420 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ *
+ * support/export/v4root.c
+ *
+ * Routines used to support NFSv4 pseudo roots
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <uuid/uuid.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "xlog.h"
+#include "exportfs.h"
+#include "nfslib.h"
+#include "misc.h"
+#include "v4root.h"
+
+#ifndef _PATH_PSEUDO_ROOT
+#define _PATH_PSEUDO_ROOT		"/"
+#endif
+
+#ifndef _PSEUDO_ROOT_FSID
+#define _PSEUDO_ROOT_FSID	0
+#endif
+
+extern int get_uuid(char *path, char *uuid, int uuidlen, char *u);
+
+typedef struct _exports_t {
+	TAILQ_ENTRY(_exports_t) list;
+	char *path;
+	void *head;
+	char uuid_len;
+	char uuid[sizeof(uuid_t)];
+	struct exportent p_export;
+} exports_t;
+
+#define HASH_TABLE_SIZE 1021
+typedef struct _hash_head {
+	TAILQ_HEAD(export_list, _exports_t) h_head;
+} hash_head;
+hash_head exports_tbl[HASH_TABLE_SIZE];
+
+
+static exports_t *hash_export_lookup(char *, unsigned int);
+static void hash_export_add(struct _exports_t *, int);
+static void hash_mount_free(void);
+
+static inline unsigned int strtoint(char *str, int len)
+{
+	unsigned int n = 0;
+	int i;
+
+	for (i=0; i < len; i++)
+		n+=((int)str[i])*i;
+	return n;
+}
+static inline int hashint(unsigned int num)
+{
+	return num % HASH_TABLE_SIZE;
+}
+#define HASH(_s, _l) hashint(strtoint((_s), (_l)))
+void v4root_set(void);
+void v4root_unset(void);
+static int v4root_support(void);
+
+int v4root_needed;
+
+static nfs_export pr_export = {
+	.m_next = NULL,
+	.m_client = NULL,
+	.m_export = {
+		.e_hostname = "*",
+		.e_path = _PATH_PSEUDO_ROOT,
+		.e_flags = NFSEXP_READONLY | NFSEXP_ROOTSQUASH
+				| NFSEXP_NOSUBTREECHECK | NFSEXP_FSID
+				| NFSEXP_CROSSMOUNT | NFSEXP_V4ROOT,
+		.e_anonuid = 65534,
+		.e_anongid = 65534,
+		.e_squids = NULL,
+		.e_nsquids = 0,
+		.e_sqgids = NULL,
+		.e_nsqgids = 0,
+		.e_fsid = 0,
+		.e_mountpoint = NULL,
+	},
+	.m_exported = 0,
+	.m_xtabent = 1,
+	.m_mayexport = 1,
+	.m_changed = 0,
+	.m_warned = 0,
+};
+static nfs_export *pseudo_root;
+
+/*
+ * Return the number '/' in the path
+ */
+inline static int slash_count(char *path)
+{
+	int i, slashs=0;
+
+	for (i=0; i < strlen(path); i++) {
+			if (path[i] == '/')
+				slashs++;
+	}
+	return slashs;
+}
+/*
+ * Make sure the kernel has pseudo root support.
+ */
+static int
+v4root_support()
+{
+	static int kernel_support = -1;
+	char *ptr, version[64];
+	int major, minor;
+	FILE *fp;
+
+	if (kernel_support != -1)
+		return kernel_support;
+
+	kernel_support = 0;
+	fp = fopen("/proc/fs/nfsd/exports", "r");
+	if (fp == NULL)
+		goto out;
+
+	ptr = fgets(version, 64, fp);
+	fclose(fp);
+	if (ptr == NULL)
+		goto out;
+
+	while(*ptr && isdigit(*ptr) == 0)
+		ptr++;
+	if (*ptr == '\0')
+		goto out;
+
+	major = minor = 0;
+	sscanf(ptr, " %d.%d",&major, &minor);
+	if (major >= 1 && minor >= 2)
+		kernel_support = 1;
+out:
+	if (!kernel_support) {
+		xlog(L_WARNING, "Kernel does not have pseudo root support.");
+		xlog(L_WARNING, "NFS v4 mounts will be disabled unless fsid=0");
+		xlog(L_WARNING, "is specfied in /etc/exports file.");
+	}
+
+	return kernel_support;
+}
+/*
+ * Build a table of pseudo exports by running through
+ * the real export looking at the components of the path
+ * that make up the export. Those path components, if
+ * not exported, will become pseudo exports allowing them 
+ * to be found when the kernel does an upcall looking for 
+ * components of the v4 mount.
+ */
+void
+v4root_set()
+{
+	nfs_export	*exp, *nxt;
+	int	i, slcnt;
+	char *e_path, *path, *ptr, *comp;
+	char *hostname;
+
+	if (!v4root_needed)
+		return;
+
+	if (!v4root_support())
+		return;
+
+	pseudo_root = &pr_export;
+
+	for (i = 0; i < MCL_MAXTYPES; i++) {
+		for (exp = exportlist[i].p_head; exp; exp = nxt) {
+			nxt = exp->m_next;
+			e_path = exp->m_export.e_path;
+			hostname = exp->m_export.e_hostname;
+
+			slcnt = slash_count(e_path);
+			if (slcnt == 1)
+				continue;
+			slcnt--; /* knock off the leanding '/' */
+
+			path = strdup(e_path);
+			if (path == NULL) { 
+				xlog(L_WARNING, "v4root_set: No memory for pseudo export");
+				return;
+			}
+
+			/*
+			 * Run through each component of the path to
+			 * see if a  pseudo export should be created.
+			 */
+			comp = path+1;
+			do { 
+				if ((ptr = strchr(comp, '/')) != NULL)
+					*ptr = '\0';
+
+	  			if (export_lookup(hostname, path, 0) == NULL)
+					if (v4root_create(path, exp, FALSE) == NULL) {
+						xlog(L_WARNING, 
+							"v4root_set: Unable to create pseudo export"
+							"for '%s'", path);
+						break;
+					}
+
+				if (ptr) {
+					*ptr = '/';
+					comp = ptr+1; 
+				}
+			} while (--slcnt > 0);
+			free(path);
+		}
+	}
+}
+
+/*
+ * Unset the pseudo root export
+ */
+void
+v4root_unset()
+{
+	pseudo_root = NULL;
+	hash_mount_free();
+}
+
+/*
+ * The kernel will do an upcall looking for the pseudo
+ * root via its fsid. When the wanted fsid equals 
+ * PSEUDO_ROOT_FSID return the pseudo root export.
+ */
+struct exportent *
+v4root_chkroot(int fsidtype, unsigned int fsidnum, char *fhuuid)
+{
+	struct exportent *p_export = NULL;
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	switch(fsidtype) {
+		case FSID_NUM:
+			if (fsidnum == _PSEUDO_ROOT_FSID) {
+				p_export = &pseudo_root->m_export;
+				strncpy(p_export->e_path, _PATH_PSEUDO_ROOT, 
+					NFS_MAXPATHLEN);
+			}
+			break;
+	}
+
+	return p_export;
+}
+
+/*
+ * Create a pseudo export, if one does not 
+ * already exist.
+ */
+struct exportent *
+v4root_create(char *path, nfs_export *exp, int docheck)
+{
+	static struct exportent *p_export = NULL;
+	exports_t *pexp;
+	char *epath = exp->m_export.e_path;
+	int elen, plen;
+	char uuid_len = sizeof(uuid_t);
+	char uuid[sizeof(uuid_t)];
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	if (docheck) {
+
+		/* Path needs to be a subset of e_path */
+		elen = strlen(epath);
+		plen = strlen(path);
+		if (plen >= elen)
+			return NULL;
+
+		if (memcmp(path, epath, plen) != 0)
+			return NULL;
+	}
+
+	/* Check to see if the export already exists */
+	get_uuid(path, NULL, uuid_len, uuid);
+	if ((p_export = v4root_export(uuid, uuid_len)) != NULL)
+		return p_export;
+
+	pexp = (exports_t *)malloc(sizeof(exports_t));
+	if (pexp == NULL) {
+		xlog(L_WARNING, "v4root_create: No memory for pseudo export");
+		return NULL;
+	}
+	p_export = &pexp->p_export;
+	pexp->path = strdup(path);
+	if (pexp->path == 0) {
+		xlog(L_WARNING, "v4root_create: No memory for pseudo path");
+		free(pexp);
+		return NULL;
+	}
+	pexp->uuid_len = uuid_len;
+	memcpy(pexp->uuid, uuid, uuid_len);
+
+	dupexportent(&pexp->p_export, &pr_export.m_export);
+	strcpy(p_export->e_path, path);
+	p_export->e_flags &= ~NFSEXP_FSID;
+	p_export->e_v4root = (void *)pexp;
+
+	hash_export_add(pexp, HASH(pexp->uuid, sizeof(uuid_t)));
+
+	xlog(D_CALL, "v4root_create: path '%s'", p_export->e_path);
+
+	return p_export;
+}
+
+/*
+ * Free a pseudo export
+ */
+void
+v4root_free(struct exportent *p_export)
+{
+	exports_t *pexp = (exports_t *)p_export->e_v4root;
+	hash_head *head = (hash_head *)pexp->head;
+
+	free(pexp->path);
+	TAILQ_REMOVE(&head->h_head, pexp, list);
+}
+
+/*
+ * Return a pseudo export that match the given uuid
+ */
+struct exportent *
+v4root_export(char *fhuuid, int uuidlen)
+{
+	struct exportent *p_export = NULL;
+	exports_t *pexp;
+	int len = MIN(uuidlen, sizeof(uuid_t));
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	pexp = hash_export_lookup(fhuuid, len);
+	if (pexp) {
+		p_export = &pexp->p_export;
+		xlog(D_CALL, "v4root_export: path %s", p_export->e_path);
+	}
+	return p_export;
+}
+
+/*
+ * Add pseudo export to export table
+ */
+static void hash_export_add(struct _exports_t *exp, int hash)
+{
+	hash_head *head;
+
+	head = &(exports_tbl[hash]);
+	exp->head = head;
+
+	if (TAILQ_EMPTY(&head->h_head))
+		TAILQ_INSERT_HEAD(&head->h_head, exp, list);
+	else
+		TAILQ_INSERT_TAIL(&head->h_head, exp, list);
+}
+
+/*
+ * Lookup a pseudo export using the uuid and inode number
+ */
+static exports_t *
+hash_export_lookup(char *uuid, unsigned int uuidlen)
+{
+	exports_t *pexp;
+	hash_head *head;
+	int hash = HASH(uuid, uuidlen);
+
+	head = &(exports_tbl[hash]);
+
+	TAILQ_FOREACH(pexp, &head->h_head, list) {
+		if (memcmp(pexp->uuid, uuid, uuidlen) == 0)
+			return pexp;
+	}
+	return NULL;
+
+}
+
+/*
+ * Free up pseudo export table
+ */
+static void hash_mount_free()
+{
+	hash_head *head;
+	exports_t *e1, *e2;
+	int hash;
+
+	for (hash=0; hash < HASH_TABLE_SIZE; hash++) {
+		head = &(exports_tbl[hash]);
+		if (head == NULL)
+			continue;
+		e1 = TAILQ_FIRST(&head->h_head);
+		while (e1 != NULL) {
+			free(e1->path);
+			e2 =  TAILQ_NEXT(e1, list);
+			TAILQ_REMOVE(&head->h_head, e1, list);
+			free(e1);
+			e1 = e2;
+		}
+		TAILQ_INIT(&head->h_head);
+	}
+}


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- nfs-utils.spec	15 Sep 2009 19:15:19 -0000	1.241
+++ nfs-utils.spec	23 Sep 2009 20:09:06 -0000	1.242
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -28,7 +28,7 @@ Patch102: nfs-utils-1.2.1-rc3.patch
 Patch103: nfs-utils-1.2.1-rc4.patch
 Patch104: nfs-utils-1.2.1-rc5.patch
 
-Patch200: nfs-utils-1.2.0-proots-rel5.patch
+Patch200: nfs-utils-1.2.0-v4root-rel6.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -258,6 +258,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Sep 23 2009 Steve Dickson <steved at redhat.com> 1.2.0-12
+- Updated to the latest pseudo root release (rel6).
+
 * Tue Sep 15 2009 Steve Dickson <steved at redhat.com> 1.2.0-11
 - Added upstream 1.2.1-rc5 patch
   - Added --sort --list functionality to nfs-iostat.py



From mclasen at fedoraproject.org  Wed Sep 23 20:16:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 20:16:27 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.219,1.220
Message-ID: <20090923201627.7336111C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26338

Modified Files:
	glib2.spec 
Log Message:
fix gdb macro location



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- glib2.spec	23 Sep 2009 02:00:25 -0000	1.219
+++ glib2.spec	23 Sep 2009 20:16:27 -0000	1.220
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -18,6 +18,9 @@ BuildRequires: libattr-devel
 BuildRequires: libselinux-devel
 # for sys/inotify.h
 BuildRequires: glibc-devel
+BuildRequires: automake autoconf libtool
+
+Patch0: pyloc.patch
 
 %description
 GLib is the low-level core library that forms the basis
@@ -50,6 +53,9 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .pyloc
+
+autoreconf -f -i
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
@@ -107,8 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %doc %{_datadir}/gtk-doc/html/*
 %doc %{_mandir}/man1/*
-%{_datadir}/gdb/auto-load%{_libdir}/libglib-2.0.so.*-gdb.py*
-%{_datadir}/gdb/auto-load%{_libdir}/libgobject-2.0.so.*-gdb.py*
+%{_datadir}/gdb/auto-load%{libdir}/libglib-2.0.so.*-gdb.py*
+%{_datadir}/gdb/auto-load%{libdir}/libgobject-2.0.so.*-gdb.py*
 
 
 %files static
@@ -116,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-2
+- Fix location of gdb macros
+
 * Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0
 



From jakub at fedoraproject.org  Wed Sep 23 20:17:19 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 23 Sep 2009 20:17:19 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-pr38757.patch,1.1,1.2
Message-ID: <20090923201719.5329111C00E6@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26737

Modified Files:
	gcc44-pr38757.patch 
Log Message:
4.4.1-16

gcc44-pr38757.patch:
 c-lang.c        |   10 +++++++++-
 dwarf2out.c     |   19 ++++++++++++++++---
 langhooks-def.h |    4 +++-
 langhooks.h     |    6 +++++-
 4 files changed, 33 insertions(+), 6 deletions(-)

Index: gcc44-pr38757.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr38757.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-pr38757.patch	19 Mar 2009 16:38:39 -0000	1.1
+++ gcc44-pr38757.patch	23 Sep 2009 20:17:19 -0000	1.2
@@ -90,7 +90,7 @@
  const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
 --- gcc/dwarf2out.c.jj	2009-03-17 13:06:29.000000000 +0100
 +++ gcc/dwarf2out.c	2009-03-18 12:55:36.000000000 +0100
-@@ -12470,9 +12470,18 @@ add_bit_size_attribute (dw_die_ref die, 
+@@ -14286,9 +14286,18 @@ add_bit_size_attribute (dw_die_ref die, 
  static inline void
  add_prototyped_attribute (dw_die_ref die, tree func_type)
  {
@@ -112,18 +112,14 @@
  }
  
  /* Add an 'abstract_origin' attribute below a given DIE.  The DIE is found
-@@ -14419,7 +14428,13 @@ gen_compile_unit_die (const char *filena
-   else if (strcmp (language_string, "GNU Objective-C++") == 0)
-     language = DW_LANG_ObjC_plus_plus;
-   else
--    language = DW_LANG_C89;
-+    {
-+      if (lang_hooks.source_language
-+	  && lang_hooks.source_language () >= 1999)
+@@ -16290,6 +16299,10 @@ gen_compile_unit_die (const char *filena
+ 	language = DW_LANG_ObjC;
+       else if (strcmp (language_string, "GNU Objective-C++") == 0)
+ 	language = DW_LANG_ObjC_plus_plus;
++      else if (strcmp (language_string, "GNU C") == 0
++	       && lang_hooks.source_language
++	       && lang_hooks.source_language () >= 1999)
 +	language = DW_LANG_C99;
-+      else
-+	language = DW_LANG_C89;
-+    }
+     }
  
    add_AT_unsigned (die, DW_AT_language, language);
-   return die;



From salimma at fedoraproject.org  Wed Sep 23 20:22:04 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 23 Sep 2009 20:22:04 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-10
	gnome-applet-window-picker.spec, 1.1, 1.2
Message-ID: <20090923202204.DDFF311C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28568

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
Manually BR libXres-devel, since pkgconfig deps are not detected
automatically in F-10



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-10/gnome-applet-window-picker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-applet-window-picker.spec	23 Sep 2009 11:35:27 -0000	1.1
+++ gnome-applet-window-picker.spec	23 Sep 2009 20:22:04 -0000	1.2
@@ -13,6 +13,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gnome-panel-devel
 BuildRequires:	libwnck-devel
+# in F-11 and above, pulled in by libwnck-devel through pkgconfig
+BuildRequires:  libXres-devel
 BuildRequires:  intltool
 Requires(pre):   GConf2
 Requires(post):  GConf2



From pbrobinson at fedoraproject.org  Wed Sep 23 20:22:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 23 Sep 2009 20:22:12 +0000 (UTC)
Subject: rpms/rygel/devel .cvsignore, 1.2, 1.3 rygel.spec, 1.7, 1.8 sources, 
	1.2, 1.3
Message-ID: <20090923202212.D04AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28764

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- New upstream 0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Jun 2009 22:16:15 -0000	1.2
+++ .cvsignore	23 Sep 2009 20:22:12 -0000	1.3
@@ -1 +1 @@
-rygel-0.3.tar.bz2
+rygel-0.4.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rygel.spec	21 Aug 2009 01:47:16 -0000	1.7
+++ rygel.spec	23 Sep 2009 20:22:12 -0000	1.8
@@ -1,26 +1,25 @@
 Name:           rygel
-Version:        0.3
-Release:        6%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://live.gnome.org/Rygel
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         rygel-0.3-gee01.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: vala-devel >= 0.7
+BuildRequires: vala-devel
 BuildRequires: vala-tools
 BuildRequires: gupnp-devel
 BuildRequires: gupnp-av-devel
-BuildRequires: gupnp-vala >= 0.5.4
+BuildRequires: gupnp-vala
 BuildRequires: glib2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libuuid-devel
 BuildRequires: gstreamer-devel
 BuildRequires: GConf2-devel
-BuildRequires: compat-libgee01-devel
+BuildRequires: libgee-devel
 BuildRequires: libsoup-devel
 
 %description
@@ -48,11 +47,10 @@ A plugin for rygel to use tracker to loc
 
 %prep
 %setup -q
-%patch0 -p1 -b .gee01
 
 %build
 %configure
-make %{?_smp_mflags} V=1
+make V=1
 
 %install
 rm -rf %{buildroot}
@@ -67,13 +65,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_sysconfdir}/gconf/schemas/rygel.schemas
+%{_sysconfdir}/rygel.conf
 %{_bindir}/rygel
 %{_bindir}/rygel-preferences
-%{_libdir}/rygel-1.0/librygel-dvb.so
 %{_libdir}/rygel-1.0/librygel-external.so
-%{_libdir}/rygel-1.0/librygel-media-folder.so
+%{_libdir}/rygel-1.0/librygel-media-export.so
 %{_datadir}/rygel/
+%{_datadir}/applications/rygel*
+%{_datadir}/dbus-1/services/org.gnome.Rygel1.service
 
 %files tracker
 %defattr(-,root,root,-)
@@ -87,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
+- New upstream 0.4 release
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3-6
 - Rebuild against compat-libgee01
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Jun 2009 22:16:15 -0000	1.2
+++ sources	23 Sep 2009 20:22:12 -0000	1.3
@@ -1 +1 @@
-7ab2624927a55960dffceb3b4a0cd1ee  rygel-0.3.tar.bz2
+078182963508d4461dd44a43beaf2f64  rygel-0.4.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 23 20:24:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 20:24:38 +0000 (UTC)
Subject: rpms/glib2/devel pyloc.patch,NONE,1.1
Message-ID: <20090923202438.6E91611C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29789

Added Files:
	pyloc.patch 
Log Message:
forgotten patch


pyloc.patch:
 configure.in        |    4 +++-
 glib/Makefile.am    |    4 ++--
 gobject/Makefile.am |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE pyloc.patch ---
diff -up glib-2.22.0/configure.in.pyloc glib-2.22.0/configure.in
--- glib-2.22.0/configure.in.pyloc	2009-09-22 09:40:56.000000000 -0400
+++ glib-2.22.0/configure.in	2009-09-23 15:37:23.729418282 -0400
@@ -256,8 +256,10 @@ AC_ARG_WITH(runtime-libdir,
                            [Install runtime libraries relative to libdir])],
            [],
 	   [with_runtime_libdir=""])
-GLIB_RUNTIME_LIBDIR=$with_runtime_libdir
+GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
 AC_SUBST(GLIB_RUNTIME_LIBDIR)
+AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
 AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
 
 dnl Checks for programs.
diff -up glib-2.22.0/glib/Makefile.am.pyloc glib-2.22.0/glib/Makefile.am
--- glib-2.22.0/glib/Makefile.am.pyloc	2009-09-22 16:19:35.000000000 -0400
+++ glib-2.22.0/glib/Makefile.am	2009-09-23 15:53:09.109395306 -0400
@@ -380,8 +380,8 @@ libglib-gdb.py: libglib-gdb.py.in
 
 
 install-data-hook: libglib-gdb.py
-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir}
-	$(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load${libdir}/libglib-2.0.so.0.$(LT_CURRENT).0-gdb.py
+	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+	$(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).0-gdb.py
 if HAVE_GLIB_RUNTIME_LIBDIR
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff -up glib-2.22.0/gobject/Makefile.am.pyloc glib-2.22.0/gobject/Makefile.am
--- glib-2.22.0/gobject/Makefile.am.pyloc	2009-09-22 16:19:20.000000000 -0400
+++ glib-2.22.0/gobject/Makefile.am	2009-09-23 15:53:18.011645753 -0400
@@ -274,8 +274,8 @@ uninstall-gdb:
 	-rm -r $(DESTDIR)$(datadir)/gdb
 
 install-data-hook: libgobject-gdb.py
-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir}
-	$(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load${libdir}/libgobject-2.0.so.0.$(LT_CURRENT).0-gdb.py
+	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
+	$(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).0-gdb.py
 if HAVE_GLIB_RUNTIME_LIBDIR
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)



From pkgdb at fedoraproject.org  Wed Sep 23 20:26:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:26:26 +0000
Subject: [pkgdb] slim ownership updated
Message-ID: <20090923202626.D37D310F87C@bastion2.fedora.phx.redhat.com>

Package slim in Fedora devel is now owned by arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 20:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:26:40 +0000
Subject: [pkgdb] slim ownership updated
Message-ID: <20090923202640.38D7910F889@bastion2.fedora.phx.redhat.com>

Package slim in Fedora 10 is now owned by arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 20:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:26:39 +0000
Subject: [pkgdb] slim ownership updated
Message-ID: <20090923202639.6BB1510F883@bastion2.fedora.phx.redhat.com>

Package slim in Fedora 11 is now owned by arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From mclasen at fedoraproject.org  Wed Sep 23 20:28:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 20:28:12 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.54,
	1.55 gnome-screensaver.spec, 1.224, 1.225 sources, 1.59, 1.60
Message-ID: <20090923202812.B785F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30943

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	26 Jun 2009 15:01:31 -0000	1.54
+++ .cvsignore	23 Sep 2009 20:28:12 -0000	1.55
@@ -1 +1 @@
-gnome-screensaver-2.27.0.tar.bz2
+gnome-screensaver-2.28.0.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- gnome-screensaver.spec	24 Aug 2009 04:38:42 -0000	1.224
+++ gnome-screensaver.spec	23 Sep 2009 20:28:12 -0000	1.225
@@ -13,11 +13,11 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.27.0
-Release: 10%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 Source2: cosmos.xml
 Source3: cosmos-wallpaper.xml
@@ -27,14 +27,6 @@ Patch2: gnome-screensaver-2.26.0-securit
 Patch3: 0001-Disable-the-password-entry-when-using-non-password-a.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
-# from upstream
-Patch9: use-gtkbuilder.patch
-# from upstream
-Patch10: button-images.patch
-# from upstream
-Patch11: gnome-screensaver-2.27.0-gamma.patch
-# from upstream
-Patch12: fix-gtkbuilder-conversion.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -88,10 +80,6 @@ simple, sane, secure defaults and be wel
 %patch3 -p1 -b .disable-entry
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
-%patch9 -p1 -b .use-gtkbuilder
-%patch10 -p1 -b .button-images
-%patch11 -p1 -b .gamma
-%patch12 -p1 -b .fix-gtkbuilder-conversion
 
 libtoolize --force --copy
 
@@ -168,6 +156,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-10
 - Fix GtkBuilder conversion
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	26 Jun 2009 15:01:31 -0000	1.59
+++ sources	23 Sep 2009 20:28:12 -0000	1.60
@@ -1 +1 @@
-94e5c11bdc687e1383c9d497446b9842  gnome-screensaver-2.27.0.tar.bz2
+b37d4a210cac22a7312f9736f0c4356f  gnome-screensaver-2.28.0.tar.bz2



From mschwendt at fedoraproject.org  Wed Sep 23 20:35:40 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 23 Sep 2009 20:35:40 +0000 (UTC)
Subject: rpms/audacity/F-11 audacity-1.3.9-labelpopup.patch, NONE,
	1.1 audacity-1.3.9-labeltrack-crash.patch, NONE,
	1.1 audacity.spec, 1.78, 1.79
Message-ID: <20090923203540.91FF111C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1969

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.9-labelpopup.patch 
	audacity-1.3.9-labeltrack-crash.patch 
Log Message:
sync LabelTrack/TrackPanel fixes from Rawhide

audacity-1.3.9-labelpopup.patch:
 TrackPanel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-labelpopup.patch ---
diff -Nur audacity-src-1.3.9-orig/src/TrackPanel.cpp audacity-src-1.3.9/src/TrackPanel.cpp
--- audacity-src-1.3.9-orig/src/TrackPanel.cpp	2009-08-31 12:45:39.000000000 +0200
+++ audacity-src-1.3.9/src/TrackPanel.cpp	2009-09-14 08:52:22.764231346 +0200
@@ -4464,7 +4464,7 @@
    }
 
    
-   if (event.RightDown()) {
+   if (event.RightUp()) {
       // popup menu for editing
       RefreshTrack(lTrack);
      

audacity-1.3.9-labeltrack-crash.patch:
 LabelTrack.cpp |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 LabelTrack.h   |    2 -
 Menus.cpp      |   17 +-------
 Project.cpp    |   18 +--------
 Project.h      |    4 --
 5 files changed, 112 insertions(+), 39 deletions(-)

--- NEW FILE audacity-1.3.9-labeltrack-crash.patch ---
diff -Nur audacity-src-1.3.9-orig/src/LabelTrack.cpp audacity-src-1.3.9/src/LabelTrack.cpp
--- audacity-src-1.3.9-orig/src/LabelTrack.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/LabelTrack.cpp	2009-09-12 14:59:27.000000000 +0200
@@ -57,6 +57,97 @@
 #include "Project.h"
 #include "commands/CommandManager.h"
 
+#if defined(__WXGTK__)
+// As of wxGTK 2.8.9, there is a problem in the wxClipboard class that
+// allows recursive event processing.  This problem has been corrected
+// by wxWidgets 2.9+.  However, this han't made it into a release yet,
+// so we have to work around it.
+//
+// This is done by pulling/merging in some code from wx29 and creating
+// the following class to capture events while accessing the clipboard
+// to prevent the asynchronous clipboard access from causing recursive
+// event processing.
+
+#include <wx/app.h>
+#include <wx/dynarray.h>
+
+#include <gtk/gtk.h>
+
+extern GtkWidget *wxGetRootWindow();
+
+static void main_do_event(GdkEvent *event, wxArrayPtrVoid *queue)
+{
+   switch (event->type)
+   {
+      case GDK_NOTHING:
+         // Ignore it
+      break;
+
+      case GDK_SELECTION_REQUEST:
+      case GDK_SELECTION_NOTIFY:
+      case GDK_SELECTION_CLEAR:
+#if GTK_CHECK_VERSION(2,6,0)
+      case GDK_OWNER_CHANGE:
+#endif
+         // process it now
+         gtk_main_do_event(event);
+      break;
+
+      default:
+         // process it later (but make a copy; the caller will free the event pointer)
+         queue->Add(gdk_event_copy(event));
+      break;
+   }
+
+   // don't allow idle callbacks while we're active
+   wxTheApp->SuspendIdleCallback();
+
+   return;
+}
+
+class CaptureEvents
+{
+ public:
+   CaptureEvents()
+   {
+#if wxUSE_LOG
+      // disable log flushing from here because a call to wxYield() shouldn't
+      // normally result in message boxes popping up &c
+      wxLog::Suspend();
+#endif
+
+      // temporarily replace the global GDK event handler with our function
+      gdk_event_handler_set((GdkEventFunc)main_do_event, &queue, NULL);
+
+      // temporarily suspend idle callbacks
+      wxTheApp->SuspendIdleCallback();
+   }
+
+   virtual ~CaptureEvents()
+   {
+      gdk_event_handler_set((GdkEventFunc)gtk_main_do_event, NULL, NULL);
+   
+      // put all unprocessed GDK events back in the queue
+      GdkDisplay* disp = gtk_widget_get_display(wxGetRootWindow());
+      size_t cnt = queue.GetCount();
+      for (size_t i = 0; i < cnt; i++) {
+         GdkEvent* event = (GdkEvent*)queue[i];
+         // NOTE: gdk_display_put_event makes a copy of the event passed to it
+         gdk_display_put_event(disp, event);
+         gdk_event_free(event);
+      }
+
+#if wxUSE_LOG
+      // let the logs be flashed again
+      wxLog::Resume();
+#endif
+   }
+
+ private:
+   wxArrayPtrVoid queue;
+};
+#endif
+
 wxFont LabelTrack::msFont;
 
 // static member variables.
@@ -74,13 +165,11 @@
 
 int LabelTrack::mFontHeight=-1;
 
-
 LabelTrack *TrackFactory::NewLabelTrack()
 {
    return new LabelTrack(mDirManager);
 }
 
-
 LabelTrack::LabelTrack(DirManager * projDirManager):
    Track(projDirManager),
    mbHitCenter(false),
@@ -969,6 +1058,9 @@
    
    // copy data onto clipboard
    if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+      CaptureEvents capture;
+#endif
       wxTheClipboard->SetData(new wxTextDataObject(data));
       wxTheClipboard->Close();
    }
@@ -1001,6 +1093,9 @@
 
    // copy the data on clipboard
    if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+      CaptureEvents capture;
+#endif
       wxTheClipboard->SetData(new wxTextDataObject(data));
       wxTheClipboard->Close();
    }
@@ -1021,10 +1116,13 @@
    wxString right=wxT("");
    
    // if text data is available
-   if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
+   if (IsTextClipSupported()) {
       if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+         CaptureEvents capture;
+#endif
          wxTextDataObject data;
-         wxTheClipboard->GetData( data );
+         wxTheClipboard->GetData(data);
          wxTheClipboard->Close();
          text = data.GetText();
       }
@@ -1077,6 +1175,10 @@
 /// @return true if the text data is available in the clipboard, false otherwise
 bool LabelTrack::IsTextClipSupported()
 {
+#if defined(__WXGTK__)
+   CaptureEvents capture;
+#endif
+
    return wxTheClipboard->IsSupported(wxDF_TEXT);
 }
 
diff -Nur audacity-src-1.3.9-orig/src/LabelTrack.h audacity-src-1.3.9/src/LabelTrack.h
--- audacity-src-1.3.9-orig/src/LabelTrack.h	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/LabelTrack.h	2009-09-12 14:59:27.000000000 +0200
@@ -129,7 +129,7 @@
    bool CutSelectedText();
    bool CopySelectedText();
    bool PasteSelectedText(double sel0, double sel1);
-   bool IsTextClipSupported();
+   static bool IsTextClipSupported();
    
    // methods to set flags
    void SetDragXPos(const int d) { mDragXPos = d; };
diff -Nur audacity-src-1.3.9-orig/src/Menus.cpp audacity-src-1.3.9/src/Menus.cpp
--- audacity-src-1.3.9-orig/src/Menus.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Menus.cpp	2009-09-12 15:18:22.150741538 +0200
@@ -1359,20 +1359,6 @@
          if (lt->IsTextSelected()) {
             flags |= CutCopyAvailableFlag;
          }
-
-         // See AudacityProject::OnUpdateUI() for an explanation
-         if (mInIdle) {
-            if (lt->IsTextClipSupported()) {
-               flags |= TextClipFlag;
-               mTextClipFlag = TextClipFlag;
-            }
-            else {
-               mTextClipFlag = 0;
-            }
-         }
-         else {
-            flags |= mTextClipFlag;
-         }
       }
       else if (t->GetKind() == Track::Wave) {
          flags |= WaveTracksExistFlag;
@@ -1422,6 +1408,9 @@
    if (GetZoom() > gMinZoom && (flags & TracksExistFlag))
       flags |= ZoomOutAvailableFlag;
 
+   if ((flags & LabelTracksExistFlag) && LabelTrack::IsTextClipSupported())
+      flags |= TextClipFlag;
+
    flags |= GetFocusedFrame();
 
    if (IsPlayRegionLocked())
diff -Nur audacity-src-1.3.9-orig/src/Project.cpp audacity-src-1.3.9/src/Project.cpp
--- audacity-src-1.3.9-orig/src/Project.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Project.cpp	2009-09-12 15:18:29.746745064 +0200
@@ -653,13 +653,12 @@
                                  const wxSize & size)
    : wxFrame(parent, id, wxT("Audacity"), pos, size),
      mLastPlayMode(normalPlay),
+     mFreqWindow(NULL),
      mRate((double) gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), AudioIO::GetOptimalSupportedSampleRate())),
      mDefaultFormat((sampleFormat) gPrefs->
            Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample)),
      mSnapTo(0), 
      mDirty(false),
-     mInIdle(false),
-     mTextClipFlag(0),
      mTrackPanel(NULL),
      mTrackFactory(NULL),
      mAutoScrolling(false),
@@ -689,8 +688,7 @@
      mWantSaveCompressed(false),
      mLastEffect(NULL),
      mLastEffectType(0),
-     mLastEffectDesc(_("Repeat Last Effect")),
-     mFreqWindow(NULL)
+     mLastEffectDesc(_("Repeat Last Effect"))
 {
    int widths[] = {-1, 130};
    mStatusBar = CreateStatusBar(2);
@@ -1644,19 +1642,7 @@
 
 void AudacityProject::OnUpdateUI(wxUpdateUIEvent & event)
 {
-   // As of wxGTK 2.8.9, there is a problem in the wxClipboard class that
-   // allows recursive event processing.  This problem has been corrected
-   // by wxWidgets changeset #45180.  However, this han't made it into a
-   // release yet, so we have to work around it.
-   //
-   // This is done by only checking the wxClipboard contents during an idle
-   // event, thus preventing possible recursion during other event processing.
-   //
-   mInIdle = true;
-
    UpdateMenus();
-
-   mInIdle = false;
 }
 
 void AudacityProject::OnActivate(wxActivateEvent & event)
diff -Nur audacity-src-1.3.9-orig/src/Project.h audacity-src-1.3.9/src/Project.h
--- audacity-src-1.3.9-orig/src/Project.h	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Project.h	2009-09-12 15:18:26.812745135 +0200
@@ -431,10 +431,6 @@
 
    wxUint32 mLastFlags;
 
-   // see AudacityProject::OnUpdateUI() for explanation of next two
-   bool mInIdle;
-   wxUint32 mTextClipFlag;
-
    // Window elements
 
    wxTimer *mTimer;


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/audacity.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- audacity.spec	5 Sep 2009 13:25:06 -0000	1.78
+++ audacity.spec	23 Sep 2009 20:35:40 -0000	1.79
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.9
-Release: 0.1.beta%{?dist}
+Release: 0.3.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -18,6 +18,8 @@ Source2: audacity.desktop
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
 Patch3: audacity-1.3.8-gsocket-conflict.patch
+Patch4: audacity-1.3.9-labeltrack-crash.patch
+Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +70,8 @@ done
 grep -q -s __RPM_LIB * -R && exit 1
 
 %patch3 -p1 -b .gsocket-conflict
+%patch4 -p1 -b .labeltrack-crash
+%patch5 -p1 -b .labelpopup
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -146,6 +150,13 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
+- add patch to fix LabelTrack popup
+
+* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.2.beta
+- add wxGTK work-around patches to fix LabelTrack crash
+  (shall fix #520917 and similar race-conditions)
+
 * Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
 - upgrade to 1.3.9-beta
 - upstream's changes in the device prefs code make the audiodevdefaults



From mclasen at fedoraproject.org  Wed Sep 23 20:39:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 20:39:17 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.220,1.221
Message-ID: <20090923203917.C1E6311C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3697

Modified Files:
	glib2.spec 
Log Message:
fix BRs



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- glib2.spec	23 Sep 2009 20:16:27 -0000	1.220
+++ glib2.spec	23 Sep 2009 20:39:17 -0000	1.221
@@ -19,6 +19,7 @@ BuildRequires: libselinux-devel
 # for sys/inotify.h
 BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
+BuildRequires: gtk-doc
 
 Patch0: pyloc.patch
 



From mclasen at fedoraproject.org  Wed Sep 23 20:43:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 20:43:14 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.225,1.226
Message-ID: <20090923204314.987BC11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4820

Modified Files:
	gnome-screensaver.spec 
Log Message:
drop upstreamed patch



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- gnome-screensaver.spec	23 Sep 2009 20:28:12 -0000	1.225
+++ gnome-screensaver.spec	23 Sep 2009 20:43:14 -0000	1.226
@@ -24,7 +24,6 @@ Source3: cosmos-wallpaper.xml
 
 Patch1: gnome-screensaver-2.20.0-default-theme.patch
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
-Patch3: 0001-Disable-the-password-entry-when-using-non-password-a.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 
@@ -77,7 +76,6 @@ simple, sane, secure defaults and be wel
 %setup -q
 %patch1 -p1 -b .use-floaters-by-default
 #%patch2 -p1 -b .securitytoken
-%patch3 -p1 -b .disable-entry
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
 



From pbrobinson at fedoraproject.org  Wed Sep 23 20:48:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 23 Sep 2009 20:48:12 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.8,1.9 rygel-0.3-gee01.patch,1.1,NONE
Message-ID: <20090923204812.93DCF11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6041

Modified Files:
	rygel.spec 
Removed Files:
	rygel-0.3-gee01.patch 
Log Message:
- Update deps for new release


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rygel.spec	23 Sep 2009 20:22:12 -0000	1.8
+++ rygel.spec	23 Sep 2009 20:48:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -9,18 +9,18 @@ URL:            http://live.gnome.org/Ry
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: vala-devel
-BuildRequires: vala-tools
+BuildRequires: dbus-glib-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gtk2-devel
 BuildRequires: gupnp-devel
 BuildRequires: gupnp-av-devel
 BuildRequires: gupnp-vala
-BuildRequires: glib2-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: libuuid-devel
-BuildRequires: gstreamer-devel
-BuildRequires: GConf2-devel
 BuildRequires: libgee-devel
 BuildRequires: libsoup-devel
+BuildRequires: libuuid-devel
+BuildRequires: sqlite-devel
+BuildRequires: vala-devel
+BuildRequires: vala-tools
 
 %description
 Rygel is an implementation of the UPnP MediaServer V 2.0 specification that is 
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-2
+- Update deps for new release
+
 * Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
 - New upstream 0.4 release
 


--- rygel-0.3-gee01.patch DELETED ---



From tadej at fedoraproject.org  Wed Sep 23 20:50:35 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Wed, 23 Sep 2009 20:50:35 +0000 (UTC)
Subject: rpms/PyQwt/F-10 .cvsignore, 1.2, 1.3 PyQwt.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090923205035.5F54911C0418@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6602

Modified Files:
	.cvsignore PyQwt.spec sources 
Log Message:
Upgrade to version 5.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jan 2009 18:43:02 -0000	1.2
+++ .cvsignore	23 Sep 2009 20:50:35 -0000	1.3
@@ -1 +1 @@
-PyQwt-5.1.0.tar.gz
+PyQwt-5.2.0.tar.gz


Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-10/PyQwt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- PyQwt.spec	5 Mar 2009 00:10:52 -0000	1.2
+++ PyQwt.spec	23 Sep 2009 20:50:35 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           PyQwt
-Version:        5.1.0
-Release:        4%{?dist}
+Version:        5.2.0
+Release:        1%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -53,9 +53,18 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
+# move the generated pdf and html documentation to sphinx directory and remove the build files
+cd ..
+mv sphinx/build/latex/PyQwt.pdf sphinx
+mv sphinx/build/html sphinx
+rm -rf sphinx/build
 
-# non-executable script
+# non-executable scripts
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
+chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py
+
+#FIXME!!! temporarily remove qwt.py* files which conflict with PyQt4 package
+rm -rf %{buildroot}/%{python_sitearch}/PyQt4/uic
  
 %clean
 rm -rf %{buildroot}
@@ -65,15 +74,21 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc ANNOUNCEMENT-%{version} README
 %doc COPYING*
-%{python_sitearch}/PyQt4/Qwt5/
+%{python_sitearch}/PyQt4/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc Doc/*
+%doc sphinx/*
 %doc qt4examples/ 
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Wed Sep 23 2009 Tadej Jane? <tadej.janez at tadej.hicsalta.si> 5.2.0-1
+- upgrade to version 5.2.0, which supports newer versions of Qwt, PyQt4
+  and SIP
+- included new Sphinx generated pdf and html documentation in -devel subpackage
+- made qplt.py executable (to fix a rpmlint error)
+
 * Sat Mar 5 2009 Tadej Jane? <tadej.janez at tadej.hicsalta.si> 5.1.0-4
 - rebuild for new qwt (fixes RH bug #487348)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jan 2009 18:43:02 -0000	1.2
+++ sources	23 Sep 2009 20:50:35 -0000	1.3
@@ -1 +1 @@
-c9d662a0d4fc95cec75d3c526e4e748a  PyQwt-5.1.0.tar.gz
+fcd6c6029090d473dcc9df497516eae7  PyQwt-5.2.0.tar.gz



From mclasen at fedoraproject.org  Wed Sep 23 20:54:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 20:54:04 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel cosmos-wallpaper.xml, 1.1,
	1.2 gnome-screensaver.spec, 1.226, 1.227
Message-ID: <20090923205404.87EAA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8182

Modified Files:
	cosmos-wallpaper.xml gnome-screensaver.spec 
Log Message:
fix file lists



Index: cosmos-wallpaper.xml
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/cosmos-wallpaper.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cosmos-wallpaper.xml	15 Aug 2009 03:55:04 -0000	1.1
+++ cosmos-wallpaper.xml	23 Sep 2009 20:54:04 -0000	1.2
@@ -3,7 +3,7 @@
 <wallpapers>
   <wallpaper deleted="false">
     <name>Cosmos</name>
-    <filename>/usr/share/pixmaps/backgrounds/cosmos/cosmos.xml</filename>
+    <filename>/usr/share/backgrounds/cosmos/background-1.xml</filename>
     <options>stretched</options>
   </wallpaper>
 </wallpapers>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- gnome-screensaver.spec	23 Sep 2009 20:43:14 -0000	1.226
+++ gnome-screensaver.spec	23 Sep 2009 20:54:04 -0000	1.227
@@ -141,7 +141,7 @@ fi
 %{_datadir}/applications/gnome-screensaver-preferences.desktop
 %{_datadir}/applications/screensavers/
 %{_datadir}/gnome-screensaver/
-%{_datadir}/pixmaps/backgrounds/
+%{_datadir}/backgrounds/cosmos
 %{_datadir}/pixmaps/gnome-logo-white.svg
 %{_datadir}/desktop-directories/gnome-screensaver.directory
 %dir %{_datadir}/gnome-background-properties



From pkgdb at fedoraproject.org  Wed Sep 23 20:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:59:49 +0000
Subject: [pkgdb] notification-daemon: mccann has requested watchbugzilla
Message-ID: <20090923205949.9102310F87C@bastion2.fedora.phx.redhat.com>

mccann has requested the watchbugzilla acl on notification-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notification-daemon



From pkgdb at fedoraproject.org  Wed Sep 23 20:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:59:51 +0000
Subject: [pkgdb] notification-daemon: mccann has given up watchbugzilla
Message-ID: <20090923205951.AB46710F885@bastion2.fedora.phx.redhat.com>

mccann has given up the watchbugzilla acl on notification-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notification-daemon



From pkgdb at fedoraproject.org  Wed Sep 23 20:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:59:57 +0000
Subject: [pkgdb] notification-daemon: mccann has requested watchcommits
Message-ID: <20090923205958.288C710F89A@bastion2.fedora.phx.redhat.com>

mccann has requested the watchcommits acl on notification-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notification-daemon



From pkgdb at fedoraproject.org  Wed Sep 23 20:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 20:59:56 +0000
Subject: [pkgdb] notification-daemon: mccann has requested commit
Message-ID: <20090923205957.15A7C10F890@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on notification-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notification-daemon



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:00 +0000
Subject: [pkgdb] slim: arbiter has requested watchcommits
Message-ID: <20090923210000.4C78C10F89C@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on slim (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:01 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210001.A724810F876@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:02 +0000
Subject: [pkgdb] slim: arbiter has requested approveacls
Message-ID: <20090923210002.E086510F89E@bastion2.fedora.phx.redhat.com>

arbiter has requested the approveacls acl on slim (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:08 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210008.1B30710F8A2@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora devel) to Approved for pertusus

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:26 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210026.6706F10F884@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora 10) to Approved for pertusus

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:27 +0000
Subject: [pkgdb] slim: arbiter has requested watchcommits
Message-ID: <20090923210027.E0B4210F88A@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on slim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:30 +0000
Subject: [pkgdb] slim: arbiter has requested watchbugzilla
Message-ID: <20090923210030.6E94010F898@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on slim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:31 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210031.2D00210F8A5@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:39 +0000
Subject: [pkgdb] slim: arbiter has requested watchcommits
Message-ID: <20090923210039.BCC6510F89B@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on slim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:42 +0000
Subject: [pkgdb] slim: arbiter has requested watchbugzilla
Message-ID: <20090923210042.EC44F10F8A9@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on slim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:41 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210041.CAB6210F89D@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:45 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210045.3C15510F8AC@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora 11) to Approved for pertusus

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:53 +0000
Subject: [pkgdb] notification-daemon had acl change status
Message-ID: <20090923210053.7FF7210F8A3@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on notification-daemon (Fedora devel) to Approved for mccann

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notification-daemon



From pkgdb at fedoraproject.org  Wed Sep 23 21:00:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:00:55 +0000
Subject: [pkgdb] notification-daemon had acl change status
Message-ID: <20090923210055.6FFD110F8B1@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on notification-daemon (Fedora devel) to Approved for mccann

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/notification-daemon



From pkgdb at fedoraproject.org  Wed Sep 23 21:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:05:39 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210539.AFC6210F87C@bastion2.fedora.phx.redhat.com>

arbiter has set the watchbugzilla acl on slim (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:05:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:05:43 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210543.984F510F889@bastion2.fedora.phx.redhat.com>

arbiter has set the watchcommits acl on slim (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:05:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:05:47 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210547.2180C10F890@bastion2.fedora.phx.redhat.com>

arbiter has set the commit acl on slim (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:05:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:05:48 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210548.AF70B10F898@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora devel) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:05:59 +0000
Subject: [pkgdb] slim: arbiter has requested watchbugzilla
Message-ID: <20090923210559.CF26D10F884@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:05 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210605.8EEBD10F89B@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:07 +0000
Subject: [pkgdb] slim: arbiter has requested approveacls
Message-ID: <20090923210608.0C12810F8A0@bastion2.fedora.phx.redhat.com>

arbiter has requested the approveacls acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:10 +0000
Subject: [pkgdb] slim: arbiter has requested watchcommits
Message-ID: <20090923210610.3F80310F876@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:14 +0000
Subject: [pkgdb] slim: arbiter has requested watchbugzilla
Message-ID: <20090923210614.D820410F8A3@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on slim (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:15 +0000
Subject: [pkgdb] slim: arbiter has requested watchcommits
Message-ID: <20090923210615.AEE0D10F8A6@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on slim (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:16 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210617.0385310F8AA@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:18 +0000
Subject: [pkgdb] slim: arbiter has requested approveacls
Message-ID: <20090923210619.0538D10F8AD@bastion2.fedora.phx.redhat.com>

arbiter has requested the approveacls acl on slim (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:24 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210624.3A39D10F884@bastion2.fedora.phx.redhat.com>

arbiter has set the commit acl on slim (Fedora 10) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:26 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210626.7000B10F8B1@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora 10) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:26 +0000
Subject: [pkgdb] slim: arbiter has given up approveacls
Message-ID: <20090923210626.A782D10F8B4@bastion2.fedora.phx.redhat.com>

arbiter has given up the approveacls acl on slim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:29 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210629.41D0010F8B7@bastion2.fedora.phx.redhat.com>

arbiter has set the watchcommits acl on slim (Fedora 10) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:32 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210632.5D0E210F89D@bastion2.fedora.phx.redhat.com>

arbiter has set the watchbugzilla acl on slim (Fedora 10) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:36 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210636.AB50710F89B@bastion2.fedora.phx.redhat.com>

arbiter has set the watchbugzilla acl on slim (Fedora 11) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:37 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210637.B188410F8BE@bastion2.fedora.phx.redhat.com>

arbiter has set the watchcommits acl on slim (Fedora 11) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:39 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210639.50F1A10F8C2@bastion2.fedora.phx.redhat.com>

arbiter has set the commit acl on slim (Fedora 11) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:40 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210641.2DBFE10F8C5@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora 11) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:06:41 +0000
Subject: [pkgdb] slim: arbiter has given up approveacls
Message-ID: <20090923210641.AE2EC10F8C8@bastion2.fedora.phx.redhat.com>

arbiter has given up the approveacls acl on slim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:08:50 +0000
Subject: [pkgdb] slim: arbiter has requested watchbugzilla
Message-ID: <20090923210850.B7D3B10F883@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on slim (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:08:52 +0000
Subject: [pkgdb] slim: arbiter has requested watchcommits
Message-ID: <20090923210852.06DD810F8A5@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on slim (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:08:56 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210857.12B3710F87C@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:00 +0000
Subject: [pkgdb] slim: arbiter has given up commit
Message-ID: <20090923210900.1AE5B10F8A6@bastion2.fedora.phx.redhat.com>

arbiter has given up the commit acl on slim (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:06 +0000
Subject: [pkgdb] slim: arbiter has requested approveacls
Message-ID: <20090923210906.A30B910F89B@bastion2.fedora.phx.redhat.com>

arbiter has requested the approveacls acl on slim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:10 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210910.A6CA710F8A8@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora 10) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:16 +0000
Subject: [pkgdb] slim had acl change status
Message-ID: <20090923210916.B8A2510F8A0@bastion2.fedora.phx.redhat.com>

arbiter has set the approveacls acl on slim (Fedora 11) to Approved for arbiter

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:24 +0000
Subject: [pkgdb] slim: arbiter has given up approveacls
Message-ID: <20090923210924.F150F10F8AA@bastion2.fedora.phx.redhat.com>

arbiter has given up the approveacls acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:26 +0000
Subject: [pkgdb] slim: arbiter has given up commit
Message-ID: <20090923210926.19A5610F8B0@bastion2.fedora.phx.redhat.com>

arbiter has given up the commit acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:28 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210928.6789710F8B1@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:30 +0000
Subject: [pkgdb] slim: arbiter has requested approveacls
Message-ID: <20090923210930.C27CB10F8B4@bastion2.fedora.phx.redhat.com>

arbiter has requested the approveacls acl on slim (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:32 +0000
Subject: [pkgdb] slim: arbiter has requested commit
Message-ID: <20090923210932.C031510F8B7@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on slim (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From pkgdb at fedoraproject.org  Wed Sep 23 21:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Sep 2009 21:09:35 +0000
Subject: [pkgdb] slim: arbiter has requested approveacls
Message-ID: <20090923210935.309C910F8BA@bastion2.fedora.phx.redhat.com>

arbiter has requested the approveacls acl on slim (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/slim



From wtogami at fedoraproject.org  Wed Sep 23 21:17:38 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 23 Sep 2009 21:17:38 +0000 (UTC)
Subject: rpms/perl-Mail-SPF-Query/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE perl-Mail-SPF-Query.spec, 1.8, NONE sources, 1.3,
	NONE use-sys-hostname.patch, 1.2, NONE
Message-ID: <20090923211738.EA70711C00E6@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-SPF-Query/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16104

Added Files:
	dead.package 
Removed Files:
	Makefile perl-Mail-SPF-Query.spec sources 
	use-sys-hostname.patch 
Log Message:
perl(Mail::SPF::Query) was obsoleted by perl(Mail::SPF) 3+ years ago.  Nothing uses perl(Mail::SPF::Query) anymore.



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- perl-Mail-SPF-Query.spec DELETED ---


--- sources DELETED ---


--- use-sys-hostname.patch DELETED ---



From ajax at fedoraproject.org  Wed Sep 23 21:25:07 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 23 Sep 2009 21:25:07 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-edid-fixes.patch,NONE,1.1
Message-ID: <20090923212507.F03D111C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18396

Added Files:
	drm-edid-fixes.patch 
Log Message:
i suck

drm-edid-fixes.patch:
 drm_edid.c |   40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

--- NEW FILE drm-edid-fixes.patch ---
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 90d76ba..9888c20 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -109,7 +109,9 @@ static struct edid_quirk {
 
 
 /* Valid EDID header has these bytes */
-static u8 edid_header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 };
+static const u8 edid_header[] = {
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
+};
 
 /**
  * edid_is_valid - sanity check EDID data
@@ -500,6 +502,19 @@ static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
 	}
 	return mode;
 }
+
+/*
+ * 0 is reserved.  The spec says 0x01 fill for unused timings.  Some old
+ * monitors fill with ascii space (0x20) instead.
+ */
+static int
+bad_std_timing(u8 a, u8 b)
+{
+	return (a == 0x00 && b == 0x00) ||
+	       (a == 0x01 && b == 0x01) ||
+	       (a == 0x20 && b == 0x20);
+}
+
 /**
  * drm_mode_std - convert standard mode info (width, height, refresh) into mode
  * @t: standard timing params
@@ -513,6 +528,7 @@ static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
  */
 struct drm_display_mode *drm_mode_std(struct drm_device *dev,
 				      struct std_timing *t,
+				      int revision,
 				      int timing_level)
 {
 	struct drm_display_mode *mode;
@@ -523,14 +539,20 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev,
 	unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
 		>> EDID_TIMING_VFREQ_SHIFT;
 
+	if (bad_std_timing(t->hsize, t->vfreq_aspect))
+		return NULL;
+
 	/* According to the EDID spec, the hdisplay = hsize * 8 + 248 */
 	hsize = t->hsize * 8 + 248;
 	/* vrefresh_rate = vfreq + 60 */
 	vrefresh_rate = vfreq + 60;
 	/* the vdisplay is calculated based on the aspect ratio */
-	if (aspect_ratio == 0)
-		vsize = (hsize * 10) / 16;
-	else if (aspect_ratio == 1)
+	if (aspect_ratio == 0) {
+		if (revision < 3)
+			vsize = hsize;
+		else
+			vsize = (hsize * 10) / 16;
+	} else if (aspect_ratio == 1)
 		vsize = (hsize * 3) / 4;
 	else if (aspect_ratio == 2)
 		vsize = (hsize * 4) / 5;
@@ -779,7 +801,7 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 			continue;
 
 		newmode = drm_mode_std(dev, &edid->standard_timings[i],
-					timing_level);
+				       edid->revision, timing_level);
 		if (newmode) {
 			drm_mode_probed_add(connector, newmode);
 			modes++;
@@ -829,13 +851,13 @@ static int add_detailed_info(struct drm_connector *connector,
 			case EDID_DETAIL_MONITOR_CPDATA:
 				break;
 			case EDID_DETAIL_STD_MODES:
-				/* Five modes per detailed section */
-				for (j = 0; j < 5; i++) {
+				for (j = 0; j < 6; i++) {
 					struct std_timing *std;
 					struct drm_display_mode *newmode;
 
 					std = &data->data.timings[j];
 					newmode = drm_mode_std(dev, std,
+							       edid->revision,
 							       timing_level);
 					if (newmode) {
 						drm_mode_probed_add(connector, newmode);
@@ -964,7 +986,9 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
 				struct drm_display_mode *newmode;
 
 				std = &data->data.timings[j];
-				newmode = drm_mode_std(dev, std, timing_level);
+				newmode = drm_mode_std(dev, std,
+						       edid->revision,
+						       timing_level);
 				if (newmode) {
 					drm_mode_probed_add(connector, newmode);
 					modes++;



From ajax at fedoraproject.org  Wed Sep 23 21:26:57 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 23 Sep 2009 21:26:57 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1825,1.1826
Message-ID: <20090923212657.5C03A11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18855

Modified Files:
	kernel.spec 
Log Message:
rebuild


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1825
retrieving revision 1.1826
diff -u -p -r1.1825 -r1.1826
--- kernel.spec	23 Sep 2009 20:08:35 -0000	1.1825
+++ kernel.spec	23 Sep 2009 21:26:57 -0000	1.1826
@@ -2072,7 +2072,7 @@ fi
 # and build.
 
 %changelog
-* Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-38
+* Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-39
 - touch initramfs-$foo not dracut-$foo.
 
 * Wed Sep 23 2009 Adam Jackson <ajax at redhat.com> 2.6.31-37



From mmcgrath at fedoraproject.org  Wed Sep 23 21:36:35 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Wed, 23 Sep 2009 21:36:35 +0000 (UTC)
Subject: rpms/smolt/EL-5 smolt.spec,1.39,1.40
Message-ID: <20090923213635.7A10311C00E6@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24633

Modified Files:
	smolt.spec 
Log Message:
releasing 1.4 for various fixes.  Unfortunately it breaks the gui.  Still working on a fix for it


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/smolt.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- smolt.spec	9 Jul 2009 17:03:12 -0000	1.39
+++ smolt.spec	23 Sep 2009 21:36:35 -0000	1.40
@@ -1,15 +1,16 @@
 Name: smolt
+
 Summary: Fedora hardware profiler
-Version: 1.3.1
-Release: 1.1%{?dist}
+Version: 1.4
+Release: 2.1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
-source1: smoltGui.py
+Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: dbus-python, python-urlgrabber, gawk, python-paste
+Requires: dbus-python, python-urlgrabber, gawk, python-paste, python-ctypes
 BuildArch: noarch
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
@@ -20,6 +21,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
+Requires: python-simplejson
 
 %description
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -66,6 +68,7 @@ ensure that deps are kept small.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd client/
@@ -79,13 +82,11 @@ cd ..
 %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
 %{__mkdir} -p %{buildroot}/%{_mandir}/man1/
 %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
-%{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/gate.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/os_detect.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/man/* %{buildroot}/%{_mandir}/man1/
-%{__cp} %{SOURCE1} %{buildroot}/%{_datadir}/%{name}/client/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
@@ -97,29 +98,34 @@ cd ..
 touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid
 
 # Icons
-%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/
-%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/
-%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
-%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+#%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/
+#%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/
+#%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
+#%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
 
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/themes/default/
 
-%{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
-%{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
-%{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
-%{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png
-%{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/
+#%{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
+#%{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
+#%{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
+#%{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png
+#%{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/
+%{__rm} -rf %{buildroot}/%{_datadir}/icons/
 %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
+#
+%{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile
+%{__rm} -f %{buildroot}/%{_bindir}/smoltGui
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/client/config.py
 
-%{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
-ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
+#ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
-desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+
+#desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+%{__rm} -f %{buildroot}/%{_datadir}/applications/smolt.desktop
 %find_lang %{name}
 
 # Cleanup from the Makefile (will be cleaned up when it is finalized)
@@ -163,13 +169,13 @@ do
     touch %{_datadir}/%{name}/smoon/hardware/static/stats/$f
 done
 
-%post gui
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun gui
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#%post gui
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+#%postun gui
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -177,8 +183,8 @@ touch --no-create %{_datadir}/icons/hico
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}/client
-%ghost %{_datadir}/%{name}/client/scan.pyc
-%ghost %{_datadir}/%{name}/client/scan.pyo
+#%ghost %{_datadir}/%{name}/client/scan.pyc
+#%ghost %{_datadir}/%{name}/client/scan.pyo
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
@@ -199,14 +205,31 @@ touch --no-create %{_datadir}/icons/hico
 
 %files gui
 %defattr(-,root,root,-)
-%{_datadir}/applications/fedora-smolt.desktop
-%{_datadir}/icons/hicolor/*x*/apps/smolt.png
-%{_bindir}/smoltGui
+#%{_datadir}/applications/fedora-smolt.desktop
+#%{_datadir}/icons/hicolor/*x*/apps/smolt.png
+#%{_bindir}/smoltGui
 
 %changelog
-* Thu Jul 09 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.1-1.1
+* Wed Sep 23 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.1
+- removed gui
+- Added python-ctypes requirement
+
+* Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
+- Patched issue with translations (already upstream)
+
+* Mon Sep 14 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-1
 - Upstream released new version
 
+* Thu Sep 10 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-2
+- Added requires for PyQt4 on smolt gui
+
+* Thu Sep 03 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-1
+- Upstream released new version
+- Changed some link and copy info
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 02 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3-1
 - Added touch for generated stats
 - Upstream released new version



From mmcgrath at fedoraproject.org  Wed Sep 23 21:39:04 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Wed, 23 Sep 2009 21:39:04 +0000 (UTC)
Subject: rpms/smolt/F-11 0001-Client-Hopefully-fix-encoding-trouble.patch,
	NONE, 1.1 smolt.spec, 1.65, 1.66 sources, 1.27, 1.28
Message-ID: <20090923213904.4B8BD11C00E6@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26235/F-11

Modified Files:
	smolt.spec sources 
Added Files:
	0001-Client-Hopefully-fix-encoding-trouble.patch 
Log Message:
updating to latest version

0001-Client-Hopefully-fix-encoding-trouble.patch:
 sendProfile.py |    9 +++++----
 smolt.py       |   12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Client-Hopefully-fix-encoding-trouble.patch ---
>From 7243f1fcc395cdf87815ac5a33c0d2f8b61c0cdf Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian at pipping.org>
Date: Sun, 20 Sep 2009 21:38:35 +0200
Subject: [PATCH 1/2] Client: Hopefully fix encoding trouble

More or less a squashed cherry-pick from these commits:
- 7592c44f6eef240aaae147ba11ffe85a4156068b
- 81bfa3f0f5172d853f95034e061c4e3a4bd55ebe
- b21ddc39c1e51329a957a463aff3b7db09f5a726
- fa41853f7fcbe5e465bbd25fbe94942a87a5d2bb
---
 client/sendProfile.py |    9 +++++----
 client/smolt.py       |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index 46b0f18..ff3a0a9 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -36,6 +36,7 @@ import smolt
 from smolt import debug
 from smolt import error
 from smolt import get_config_attr
+from smolt import to_ascii
 from scan import scan, rating
 from gate import GateFromConfig
 
@@ -179,10 +180,10 @@ if not opts.autoSend:
         'label_fs_related':_('File system-related'),
         'label_distro_specific':_('Distribution-specific'),
 
-        'general':inner_indent(profile.get_general_info_excerpt()),
-        'devices':inner_indent(profile.get_devices_info_excerpt()),
-        'file_system':inner_indent(profile.get_file_system_info_excerpt()),
-        'distro':inner_indent(profile.get_distro_info_excerpt()),
+        'general':inner_indent(to_ascii(profile.get_general_info_excerpt())),
+        'devices':inner_indent(to_ascii(profile.get_devices_info_excerpt())),
+        'file_system':inner_indent(to_ascii(profile.get_file_system_info_excerpt())),
+        'distro':inner_indent(to_ascii(profile.get_distro_info_excerpt())),
     }
 
     submit = False
diff --git a/client/smolt.py b/client/smolt.py
index dee142f..7016ab6 100644
--- a/client/smolt.py
+++ b/client/smolt.py
@@ -51,6 +51,7 @@ from fs_util import get_fslist
 
 from gate import Gate
 from uuiddb import UuidDb
+import codecs
 
 WITHHELD_MAGIC_STRING = 'WITHHELD'
 SELINUX_ENABLED = 1
@@ -140,6 +141,16 @@ PCI_CLASS_SERIAL_USB =          3
 PCI_CLASS_SERIAL_FIBER =        4
 PCI_CLASS_SERIAL_SMBUS =        5
 
+def to_ascii(o, current_encoding='utf-8'):
+    if not isinstance(o, basestring):
+        return o
+
+    if isinstance(o, unicode):
+        s = o
+    else:
+        s = unicode(o, current_encoding)
+    return codecs.encode(s, 'ascii', 'ignore')
+
 class Device:
     def __init__(self, props, hardware):
         self.UUID = getUUID()
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-11/smolt.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- smolt.spec	7 Jul 2009 21:27:03 -0000	1.65
+++ smolt.spec	23 Sep 2009 21:39:03 -0000	1.66
@@ -1,11 +1,13 @@
 Name: smolt
+
 Summary: Fedora hardware profiler
-Version: 1.3
-Release: 1%{?dist}
+Version: 1.4
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
+Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
@@ -19,6 +21,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
+Requires: python-simplejson
 
 %description
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -58,6 +61,7 @@ separate package so firstboot isn't a re
 Summary: Fedora hardware profiler gui
 Group: Applications/Internet
 Requires: smolt = %{version}-%{release}
+Requires: PyQt4
 
 %description gui
 Provides smolt's gui functionality.  Not included in the default package to
@@ -65,6 +69,7 @@ ensure that deps are kept small.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd client/
@@ -78,7 +83,6 @@ cd ..
 %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
 %{__mkdir} -p %{buildroot}/%{_mandir}/man1/
 %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
-%{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/gate.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/os_detect.py %{buildroot}/%{_datadir}/%{name}/client/
@@ -111,13 +115,16 @@ touch %{buildroot}/%{_sysconfdir}/syscon
 %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
 
 %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/client/config.py
+
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
 ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
 ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
+
 desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+%{__rm} -f %{buildroot}/%{_datadir}/applications/smolt.desktop
 %find_lang %{name}
 
 # Cleanup from the Makefile (will be cleaned up when it is finalized)
@@ -175,8 +182,8 @@ touch --no-create %{_datadir}/icons/hico
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}/client
-%ghost %{_datadir}/%{name}/client/scan.pyc
-%ghost %{_datadir}/%{name}/client/scan.pyo
+#%ghost %{_datadir}/%{name}/client/scan.pyc
+#%ghost %{_datadir}/%{name}/client/scan.pyo
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
@@ -202,6 +209,22 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
+- Patched issue with translations (already upstream)
+
+* Mon Sep 14 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-1
+- Upstream released new version
+
+* Thu Sep 10 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-2
+- Added requires for PyQt4 on smolt gui
+
+* Thu Sep 03 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-1
+- Upstream released new version
+- Changed some link and copy info
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 02 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3-1
 - Added touch for generated stats
 - Upstream released new version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	7 Jul 2009 21:27:03 -0000	1.27
+++ sources	23 Sep 2009 21:39:03 -0000	1.28
@@ -1 +1 @@
-72fa94c3a866583477bb1c2b587869f9  smolt-1.3.tar.gz
+a5a56912381e71f75b4c0368670a0ca8  smolt-1.4.tar.gz



From mmcgrath at fedoraproject.org  Wed Sep 23 21:39:03 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Wed, 23 Sep 2009 21:39:03 +0000 (UTC)
Subject: rpms/smolt/F-10 0001-Client-Hopefully-fix-encoding-trouble.patch,
	NONE, 1.1 smolt.spec, 1.56, 1.57 sources, 1.25, 1.26
Message-ID: <20090923213903.DEBFF11C00E6@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26235/F-10

Modified Files:
	smolt.spec sources 
Added Files:
	0001-Client-Hopefully-fix-encoding-trouble.patch 
Log Message:
updating to latest version

0001-Client-Hopefully-fix-encoding-trouble.patch:
 sendProfile.py |    9 +++++----
 smolt.py       |   12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Client-Hopefully-fix-encoding-trouble.patch ---
>From 7243f1fcc395cdf87815ac5a33c0d2f8b61c0cdf Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian at pipping.org>
Date: Sun, 20 Sep 2009 21:38:35 +0200
Subject: [PATCH 1/2] Client: Hopefully fix encoding trouble

More or less a squashed cherry-pick from these commits:
- 7592c44f6eef240aaae147ba11ffe85a4156068b
- 81bfa3f0f5172d853f95034e061c4e3a4bd55ebe
- b21ddc39c1e51329a957a463aff3b7db09f5a726
- fa41853f7fcbe5e465bbd25fbe94942a87a5d2bb
---
 client/sendProfile.py |    9 +++++----
 client/smolt.py       |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index 46b0f18..ff3a0a9 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -36,6 +36,7 @@ import smolt
 from smolt import debug
 from smolt import error
 from smolt import get_config_attr
+from smolt import to_ascii
 from scan import scan, rating
 from gate import GateFromConfig
 
@@ -179,10 +180,10 @@ if not opts.autoSend:
         'label_fs_related':_('File system-related'),
         'label_distro_specific':_('Distribution-specific'),
 
-        'general':inner_indent(profile.get_general_info_excerpt()),
-        'devices':inner_indent(profile.get_devices_info_excerpt()),
-        'file_system':inner_indent(profile.get_file_system_info_excerpt()),
-        'distro':inner_indent(profile.get_distro_info_excerpt()),
+        'general':inner_indent(to_ascii(profile.get_general_info_excerpt())),
+        'devices':inner_indent(to_ascii(profile.get_devices_info_excerpt())),
+        'file_system':inner_indent(to_ascii(profile.get_file_system_info_excerpt())),
+        'distro':inner_indent(to_ascii(profile.get_distro_info_excerpt())),
     }
 
     submit = False
diff --git a/client/smolt.py b/client/smolt.py
index dee142f..7016ab6 100644
--- a/client/smolt.py
+++ b/client/smolt.py
@@ -51,6 +51,7 @@ from fs_util import get_fslist
 
 from gate import Gate
 from uuiddb import UuidDb
+import codecs
 
 WITHHELD_MAGIC_STRING = 'WITHHELD'
 SELINUX_ENABLED = 1
@@ -140,6 +141,16 @@ PCI_CLASS_SERIAL_USB =          3
 PCI_CLASS_SERIAL_FIBER =        4
 PCI_CLASS_SERIAL_SMBUS =        5
 
+def to_ascii(o, current_encoding='utf-8'):
+    if not isinstance(o, basestring):
+        return o
+
+    if isinstance(o, unicode):
+        s = o
+    else:
+        s = unicode(o, current_encoding)
+    return codecs.encode(s, 'ascii', 'ignore')
+
 class Device:
     def __init__(self, props, hardware):
         self.UUID = getUUID()
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-10/smolt.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- smolt.spec	12 Nov 2008 21:46:48 -0000	1.56
+++ smolt.spec	23 Sep 2009 21:39:03 -0000	1.57
@@ -1,17 +1,17 @@
 Name: smolt
+
 Summary: Fedora hardware profiler
-Version: 1.1.1.1
-Release: 9%{?dist}
+Version: 1.4
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
-URL: http://hosted.fedoraproject.org/projects/smolt
+URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
-Patch0: scan.patch
-Patch1: smolt.py.patch
+Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch: noarch
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
+BuildArch: noarch
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
@@ -21,6 +21,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
+Requires: python-simplejson
 
 %description
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -60,6 +61,7 @@ separate package so firstboot isn't a re
 Summary: Fedora hardware profiler gui
 Group: Applications/Internet
 Requires: smolt = %{version}-%{release}
+Requires: PyQt4
 
 %description gui
 Provides smolt's gui functionality.  Not included in the default package to
@@ -67,8 +69,7 @@ ensure that deps are kept small.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
 
 %build
 cd client/
@@ -82,14 +83,16 @@ cd ..
 %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
 %{__mkdir} -p %{buildroot}/%{_mandir}/man1/
 %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
-%{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/
+%{__cp} client/gate.py %{buildroot}/%{_datadir}/%{name}/client/
+%{__cp} client/os_detect.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/man/* %{buildroot}/%{_mandir}/man1/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
 %{__mkdir} -p %{buildroot}/%{_initrddir}
+
 %{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
 %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt
 
@@ -100,8 +103,10 @@ touch %{buildroot}/%{_sysconfdir}/syscon
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/themes/default/
+
 %{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
 %{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
 %{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
@@ -110,13 +115,16 @@ touch %{buildroot}/%{_sysconfdir}/syscon
 %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
 
 %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/client/config.py
+
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
 ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
 ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
+
 desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+%{__rm} -f %{buildroot}/%{_datadir}/applications/smolt.desktop
 %find_lang %{name}
 
 # Cleanup from the Makefile (will be cleaned up when it is finalized)
@@ -146,14 +154,36 @@ if [ $1 = 0 ]; then
         /sbin/chkconfig --del smolt
 fi
 
+%post server
+#Fail, will fix later
+for f in delete.html deviceclass.html device.html devices.html error.html \
+         link.html login.html master.html myHosts.html notLoaded.html \
+         pub_uuid.html raw.html report_device_ratings.html \
+         report_host_ratings.html report_recent.html report_search_devices.html\
+         report_search.html report_search_profiles.html report_view_device.html\
+         report_view_devices.html report_view.html report_view_profile.html \
+         report_view_profiles.html showall.html show.html stats.html token.html\
+         welcome.html
+do
+    touch %{_datadir}/%{name}/smoon/hardware/static/stats/$f
+done
+
+%post gui
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun gui
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README GPL doc/*
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}/client
-%ghost %{_datadir}/%{name}/client/scan.pyc
-%ghost %{_datadir}/%{name}/client/scan.pyo
+#%ghost %{_datadir}/%{name}/client/scan.pyc
+#%ghost %{_datadir}/%{name}/client/scan.pyo
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
@@ -179,6 +209,48 @@ fi
 %{_bindir}/smoltGui
 
 %changelog
+* Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
+- Patched issue with translations (already upstream)
+
+* Mon Sep 14 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-1
+- Upstream released new version
+
+* Thu Sep 10 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-2
+- Added requires for PyQt4 on smolt gui
+
+* Thu Sep 03 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-1
+- Upstream released new version
+- Changed some link and copy info
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 02 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3-1
+- Added touch for generated stats
+- Upstream released new version
+
+* Tue Apr 14 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-4.2
+- Removed fake attack
+
+* Fri Mar 13 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-4.1
+- Fixed some formatting in the spec file
+- Added note to %post
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 21 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-3
+- Added os_detect.py as it is now required.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2-2
+- Rebuild for Python 2.6
+
+* Sun Nov 30 2008 Mike McGrath <mmcgrath at redhat.com> 1.2-1
+- Upstream released new version
+
+* Fri Nov 21 2008 Mike McGrath <mmcgrath at redhat.com> 1.1.1.1-10
+- Fix for bug 472101
+
 * Wed Nov 12 2008 Mike McGrath <mmcgrath at redhat.com> 1.1.1.1-9
 - Fix for bug 470829
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	4 Sep 2008 20:18:32 -0000	1.25
+++ sources	23 Sep 2009 21:39:03 -0000	1.26
@@ -1 +1 @@
-c723a6808de0954e8e3e9228c7c94946  smolt-1.1.1.1.tar.gz
+a5a56912381e71f75b4c0368670a0ca8  smolt-1.4.tar.gz



From mccann at fedoraproject.org  Wed Sep 23 21:46:52 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Wed, 23 Sep 2009 21:46:52 +0000 (UTC)
Subject: rpms/notification-daemon/devel sexy.patch,1.3,1.4
Message-ID: <20090923214652.E7B5111C00E6@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29330

Modified Files:
	sexy.patch 
Log Message:
Fix minor warnings


sexy.patch:
 configure.ac                |    2 --
 src/themes/standard/theme.c |   17 ++++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

Index: sexy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/sexy.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sexy.patch	4 Aug 2009 04:25:21 -0000	1.3
+++ sexy.patch	23 Sep 2009 21:46:52 -0000	1.4
@@ -34,7 +34,7 @@ diff -up notification-daemon-0.4.0/src/t
 +static gboolean
 +activate_link (GtkLabel *label, const char *url, WindowData *windata)
 +{
-+	windata->url_clicked (windata->win, url);
++	windata->url_clicked (GTK_WINDOW(windata->win), url);
 +
 +	return TRUE;
 +}
@@ -63,7 +63,7 @@ diff -up notification-daemon-0.4.0/src/t
  	g_free(str);
  
 -	sexy_url_label_set_markup(SEXY_URL_LABEL(windata->body_label), body);
-+	gtk_label_set_markup(windata->body_label, body);
++	gtk_label_set_markup(GTK_LABEL(windata->body_label), body);
  
  	if (body == NULL || *body == '\0')
  		gtk_widget_hide(windata->body_label);



From wtogami at fedoraproject.org  Wed Sep 23 21:56:29 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 23 Sep 2009 21:56:29 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.16, 1.17 dracut.spec, 1.31,
	1.32 sources, 1.17, 1.18
Message-ID: <20090923215629.4FA5011C00E6@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1554

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
- Revert back to -3, Add umount back to initrd
  This makes no functional difference to LiveCD.  See Bug #525319



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Sep 2009 17:51:46 -0000	1.16
+++ .cvsignore	23 Sep 2009 21:56:29 -0000	1.17
@@ -1 +1 @@
-dracut-002-23aa2048.tar.bz2
+dracut-002-845dd502.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- dracut.spec	22 Sep 2009 17:51:46 -0000	1.31
+++ dracut.spec	23 Sep 2009 21:56:29 -0000	1.32
@@ -1,4 +1,4 @@
-%define gittag 23aa2048
+%define gittag 845dd502
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 4%{?rdist}
+Release: 5%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Sep 23 2009 Warren Togami <wtogami at redaht.com> 002-5
+- Revert back to -3, Add umount back to initrd
+  This makes no functional difference to LiveCD.  See Bug #525319
+
 * Mon Sep 21 2009 Warren Togami <wtogami at redhat.com> 002-4
 - Fix LiveCD boot regression
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	22 Sep 2009 17:51:46 -0000	1.17
+++ sources	23 Sep 2009 21:56:29 -0000	1.18
@@ -1 +1 @@
-a068ff45f641d00e93c399eb2bc937a9  dracut-002-23aa2048.tar.bz2
+d8d9c7088a414abdc24dc92b463dff6f  dracut-002-845dd502.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 23 21:56:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 21:56:20 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.227,1.228
Message-ID: <20090923215620.5524411C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1491

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix spec



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- gnome-screensaver.spec	23 Sep 2009 20:54:04 -0000	1.227
+++ gnome-screensaver.spec	23 Sep 2009 21:56:20 -0000	1.228
@@ -19,7 +19,6 @@ License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
-Source2: cosmos.xml
 Source3: cosmos-wallpaper.xml
 
 Patch1: gnome-screensaver-2.20.0-default-theme.patch
@@ -109,8 +108,6 @@ desktop-file-install --vendor gnome --de
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/cosmos/cosmos.xml
-
 install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/cosmos.xml
 
 %clean



From mdbooth at fedoraproject.org  Wed Sep 23 22:05:14 2009
From: mdbooth at fedoraproject.org (Matthew Booth)
Date: Wed, 23 Sep 2009 22:05:14 +0000 (UTC)
Subject: rpms/perl-XML-DOM-XPath/EL-5 perl-XML-DOM-XPath.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090923220514.69DA011C00E6@cvs1.fedora.phx.redhat.com>

Author: mdbooth

Update of /cvs/pkgs/rpms/perl-XML-DOM-XPath/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6451

Modified Files:
	perl-XML-DOM-XPath.spec sources 
Log Message:
Initial build for EL-5



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-DOM-XPath/EL-5/perl-XML-DOM-XPath.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-DOM-XPath.spec	4 Sep 2007 10:07:39 -0000	1.2
+++ perl-XML-DOM-XPath.spec	23 Sep 2009 22:05:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-DOM-XPath
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,7 +12,7 @@ BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(XML::DOM)
-BuildRequires:  perl(XML::XPathEngine) >= 0.04
+BuildRequires:  perl(XML::XPathEngine) >= 0.10
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,8 +49,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
-- Clarified license terms: GPL+ or Artistic
-
-* Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
-- Specfile autogenerated by cpanspec 1.69.1.
+* Wed Sep 23 2009 Matthew Booth <mbooth at redhat.com> - 0.14-1
+- Initial build for EL-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-DOM-XPath/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Mar 2007 01:57:44 -0000	1.2
+++ sources	23 Sep 2009 22:05:14 -0000	1.3
@@ -1 +1 @@
-276b4863d2886df313f849b329b9e090  XML-DOM-XPath-0.13.tar.gz
+51a40df96c2f92829e1a4f84782fa75e  XML-DOM-XPath-0.14.tar.gz



From mccann at fedoraproject.org  Wed Sep 23 22:08:45 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Wed, 23 Sep 2009 22:08:45 +0000 (UTC)
Subject: rpms/notification-daemon/devel
	notification-daemon-always-stack.patch, 
	NONE, 1.1 .cvsignore, 1.6, 1.7 notification-daemon.spec, 1.33,
	1.34 sources, 1.6, 1.7
Message-ID: <20090923220845.F2E1111C00E6@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8346

Modified Files:
	.cvsignore notification-daemon.spec sources 
Added Files:
	notification-daemon-always-stack.patch 
Log Message:
* Wed Sep 23 2009 Jon McCann <jmccann at redhat.com> - 0.4.1-0.20090923.1
- Update to snapshot to fix crashers
- Add internal API to allow themes to stack only



notification-daemon-always-stack.patch:
 daemon.c  |    6 +++---
 engines.c |   13 +++++++++++++
 engines.h |    1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

--- NEW FILE notification-daemon-always-stack.patch ---
--- notification-daemon-0.4.0/src/daemon/daemon.c.always-stack	2008-09-25 21:27:07.000000000 -0400
+++ notification-daemon-0.4.0/src/daemon/daemon.c	2009-09-23 02:44:22.721967819 -0400
@@ -1270,14 +1270,14 @@
 	}
 
 
-	if (window_xid != None)
+	if (window_xid != None && !theme_get_always_stack(nw))
 	{
 		/*
 		 * Do nothing here if we were passed an XID; we'll call
 		 * sync_notification_position later.
 		 */
 	}
-	else if (use_pos_data)
+	else if (use_pos_data && !theme_get_always_stack(nw))
 	{
 		/*
 		 * Typically, the theme engine will set its own position based on
@@ -1316,7 +1316,7 @@
 	 * for changes, and reposition the window based on the source
 	 * window.  We need to do this after return_id is calculated.
 	 */
-	if (window_xid != None)
+	if (window_xid != None && !theme_get_always_stack(nw))
 	{
 		monitor_notification_source_windows(daemon, nt, window_xid);
 		sync_notification_position(daemon, nw, window_xid);
--- notification-daemon-0.4.0/src/daemon/engines.h.always-stack	2008-03-14 19:11:43.000000000 -0400
+++ notification-daemon-0.4.0/src/daemon/engines.h	2009-09-23 02:16:32.615722273 -0400
@@ -21,5 +21,6 @@
 								   const char *key, GCallback cb);
 void theme_clear_notification_actions(GtkWindow *nw);
 void theme_move_notification(GtkWindow *nw, int x, int y);
+gboolean theme_get_always_stack(GtkWindow *nw);
 
 #endif /* _ENGINES_H_ */
--- notification-daemon-0.4.0/src/daemon/engines.c.always-stack	2008-11-20 05:45:16.000000000 -0500
+++ notification-daemon-0.4.0/src/daemon/engines.c	2009-09-23 02:16:32.614725140 -0400
@@ -30,6 +30,7 @@
 	void (*move_notification)(GtkWindow *nw, int x, int y);
 	void (*set_notification_timeout)(GtkWindow *nw, glong timeout);
 	void (*notification_tick)(GtkWindow *nw, glong timeout);
+	gboolean (*get_always_stack)(GtkWindow *nw);
 
 } ThemeEngine;
 
@@ -83,6 +84,7 @@
 	BIND_OPTIONAL_FUNC(set_notification_timeout);
 	BIND_OPTIONAL_FUNC(set_notification_hints);
 	BIND_OPTIONAL_FUNC(notification_tick);
+	BIND_OPTIONAL_FUNC(get_always_stack);
 
 	if (!engine->theme_check_init(NOTIFICATION_DAEMON_MAJOR_VERSION,
 								  NOTIFICATION_DAEMON_MINOR_VERSION,
@@ -290,3 +292,14 @@
 	ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine");
 	engine->move_notification(nw, x, y);
 }
+
+gboolean
+theme_get_always_stack(GtkWindow *nw)
+{
+	ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine");
+
+	if (engine->get_always_stack != NULL)
+		return engine->get_always_stack(nw);
+	else
+		return FALSE;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Nov 2008 03:43:22 -0000	1.6
+++ .cvsignore	23 Sep 2009 22:08:41 -0000	1.7
@@ -1 +1 @@
-notification-daemon-0.4.0.tar.bz2
+notification-daemon-0.4.1.tar.gz


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- notification-daemon.spec	22 Aug 2009 04:03:53 -0000	1.33
+++ notification-daemon.spec	23 Sep 2009 22:08:42 -0000	1.34
@@ -6,8 +6,8 @@
 
 Summary: Desktop Notification Daemon
 Name: notification-daemon
-Version: 0.4.0
-Release: 8%{?dist}
+Version: 0.4.1
+Release: 0.20090923.1%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -33,12 +33,13 @@ Requires(post): GConf2 >= %{gconf_versio
 
 Obsoletes: notify-daemon
 
-Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2
+Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.gz
 
 # drop libsexy dep
 Patch0: sexy.patch
 Patch1: nodoka.patch
 Patch2: location.patch
+Patch10: notification-daemon-always-stack.patch
 
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop
@@ -51,6 +52,7 @@ user's way.
 %patch0 -p1 -b .sexy
 %patch1 -p1 -b .nodoka
 %patch2 -p1 -b .location
+%patch10 -p1 -b .always-stack
 
 autoreconf -i -f
 
@@ -111,6 +113,10 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Wed Sep 23 2009 Jon McCann <jmccann at redhat.com> - 0.4.1-0.20090923.1
+- Update to snapshot to fix crashers
+- Add internal API to allow themes to stack only
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-8
 - Change location for stacked notifications to top-right
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Nov 2008 03:43:22 -0000	1.6
+++ sources	23 Sep 2009 22:08:42 -0000	1.7
@@ -1 +1 @@
-e61eff9782551d81045bb53e8a801d58  notification-daemon-0.4.0.tar.bz2
+af93bf2fe0375d031691698105496323  notification-daemon-0.4.1.tar.gz



From rstrode at fedoraproject.org  Wed Sep 23 22:09:13 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 23 Sep 2009 22:09:13 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-2.28.0-revert-bg-fade-break.patch, NONE,
	1.1 nautilus.spec, 1.288, 1.289
Message-ID: <20090923220913.0B7D211C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8750

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.28.0-revert-bg-fade-break.patch 
Log Message:
- Fix crossfade


nautilus-2.28.0-revert-bg-fade-break.patch:
 eel-background.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE nautilus-2.28.0-revert-bg-fade-break.patch ---
>From 96d03f31952dda243888313294137058269dfbf6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 23 Sep 2009 17:48:33 -0400
Subject: [PATCH] Revert "Emit APPEARANCE_CHANGED when setting the bg color"

This reverts commit 7b86b78e2ff6a0f1b45ac8f8a9c30cf3d0c6ae96.
---
 eel/eel-background.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/eel/eel-background.c b/eel/eel-background.c
index 9c40629..81a4e61 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -563,8 +563,6 @@ eel_background_set_color (EelBackground *background,
 		background->details->color = g_strdup (color);
 		
 		set_image_properties (background);
-
-		g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
 	}
 }
 
-- 
1.6.4.2



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- nautilus.spec	21 Sep 2009 15:22:59 -0000	1.288
+++ nautilus.spec	23 Sep 2009 22:09:10 -0000	1.289
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -85,6 +85,9 @@ Patch10:        nautilus-gvfs-desktop-ke
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# Need to file upstream and investigate a real fix
+Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -121,6 +124,7 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p1 -b .revert-bg-fade-break
 
 %build
 
@@ -256,6 +260,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Ray Strode <rstrode at redhat.com> 2.28.0-2
+- Fix crossfade
+
 * Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From mclasen at fedoraproject.org  Wed Sep 23 22:16:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 22:16:30 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.487,
	1.488 make-default.patch, 1.12, 1.13 no-tweaks.patch, 1.4, 1.5
Message-ID: <20090923221630.4F07E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12131

Modified Files:
	control-center.spec make-default.patch no-tweaks.patch 
Log Message:
update patches



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- control-center.spec	22 Sep 2009 05:48:16 -0000	1.487
+++ control-center.spec	23 Sep 2009 22:16:29 -0000	1.488
@@ -56,9 +56,6 @@ Patch46: no-tweaks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=590349
 Patch47: save-as.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=591375
-Patch50: slideshow-ui.patch
-
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -194,7 +191,6 @@ for the GNOME desktop.
 %patch33 -p1 -b .notification-theme
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
-%patch50 -p1 -b .slideshow-ui
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd

make-default.patch:
 appearance-desktop.c |  116 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

Index: make-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- make-default.patch	14 Aug 2009 12:58:15 -0000	1.12
+++ make-default.patch	23 Sep 2009 22:16:29 -0000	1.13
@@ -1,26 +1,6 @@
-From e47d2eefeea93a34848ee67ea0794d1fc88fe89f Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Fri, 14 Aug 2009 12:49:52 +0100
-Subject: [PATCH] =?utf-8?q?Bug=20536531=20=E2=80=93=20Allow=20setting=20the=20default=20background?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-The new gdm uses the system-wide default background for the login
-screen. This patch allows configuring this using the normal
-configuration tool for the desktop background.
-
-Add a "Make default" button to the background tab of the appearance
-capplet. It depends on the gconf-defaults service and uses
-PolicyKit for access control.
----
- capplets/appearance/appearance-desktop.c |  116 ++++++++++++++++++++++++++++++
- 1 files changed, 116 insertions(+), 0 deletions(-)
-
-diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
-index bf2f5a1..a5ff367 100644
---- a/capplets/appearance/appearance-desktop.c
-+++ b/capplets/appearance/appearance-desktop.c
+diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default	2009-09-21 06:44:55.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c	2009-09-23 18:13:49.115396173 -0400
 @@ -31,6 +31,8 @@
  #include <libgnomeui/gnome-desktop-thumbnail.h>
  #include <libgnomeui/gnome-bg.h>
@@ -30,7 +10,7 @@ index bf2f5a1..a5ff367 100644
  enum {
    TARGET_URI_LIST,
    TARGET_BGIMAGE
-@@ -991,12 +993,108 @@ wp_select_after_realize (GtkWidget *widget,
+@@ -984,6 +986,100 @@ wp_select_after_realize (GtkWidget *widg
    select_item (data, item, TRUE);
  }
  
@@ -115,7 +95,7 @@ index bf2f5a1..a5ff367 100644
 +                          &error,
 +                          G_TYPE_STRV, background_keys,
 +                          G_TYPE_INVALID,
-+		          G_TYPE_UINT, &result,
++                        G_TYPE_UINT, &result,
 +                          G_TYPE_INVALID)) {
 +    g_warning ("error calling CanSetSystem: %s\n", error->message);
 +    g_error_free (error);
@@ -128,18 +108,19 @@ index bf2f5a1..a5ff367 100644
 +  gtk_action_set_visible (action, result != 0);
 +}
 +
- void
- desktop_init (AppearanceData *data,
- 	      const gchar **uris)
+ static GdkPixbuf *buttons[3];
+ 
+ static void
+@@ -1146,6 +1242,8 @@ desktop_init (AppearanceData *data,
  {
-   GtkWidget *add_button;
+   GtkWidget *add_button, *w;
    GtkCellRenderer *cr;
 +  GtkAction *action;
 +  GtkWidget *widget, *box, *button;
+   char *url;
  
    g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
- 
-@@ -1117,6 +1215,24 @@ desktop_init (AppearanceData *data,
+@@ -1295,6 +1393,24 @@ desktop_init (AppearanceData *data,
    /* create the file selector later to save time on startup */
    data->wp_filesel = NULL;
  
@@ -164,6 +145,3 @@ index bf2f5a1..a5ff367 100644
  }
  
  void
--- 
-1.6.2.5
-

no-tweaks.patch:
 Makefile.am        |    2 
 appearance-main.c  |    1 
 data/appearance.ui |  353 -----------------------------------------------------
 3 files changed, 356 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- no-tweaks.patch	26 Aug 2009 01:40:37 -0000	1.4
+++ no-tweaks.patch	23 Sep 2009 22:16:29 -0000	1.5
@@ -1,6 +1,6 @@
-diff -up gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.91/capplets/appearance/appearance-main.c
---- gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks	2009-08-24 06:54:41.000000000 -0400
-+++ gnome-control-center-2.27.91/capplets/appearance/appearance-main.c	2009-08-24 23:31:28.843978482 -0400
+diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.28.0/capplets/appearance/appearance-main.c
+--- gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks	2009-08-24 06:54:41.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-main.c	2009-09-23 16:46:07.350650695 -0400
 @@ -165,7 +165,6 @@ main (int argc, char **argv)
    desktop_init (data, (const gchar **) wallpaper_files);
    g_strfreev (wallpaper_files);
@@ -9,23 +9,23 @@ diff -up gnome-control-center-2.27.91/ca
  
    /* prepare the main window */
    w = appearance_capplet_get_widget (data, "appearance_window");
-diff -up gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui
---- gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks	2009-08-24 23:34:19.741986359 -0400
-+++ gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui	2009-08-24 23:36:37.898966013 -0400
-@@ -1530,370 +1530,6 @@
+diff -up gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui
+--- gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks	2009-09-23 16:46:29.131395991 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui	2009-09-23 16:46:41.859650290 -0400
+@@ -1549,359 +1549,6 @@
                  <property name="tab_fill">False</property>
                </packing>
              </child>
 -            <child>
 -              <object class="GtkVBox" id="interface_vbox">
--                <property name="orientation">vertical</property>
 -                <property name="visible">True</property>
 -                <property name="border_width">12</property>
+-                <property name="orientation">vertical</property>
 -                <property name="spacing">18</property>
 -                <child>
 -                  <object class="GtkVBox" id="vbox23">
--                    <property name="orientation">vertical</property>
 -                    <property name="visible">True</property>
+-                    <property name="orientation">vertical</property>
 -                    <property name="spacing">6</property>
 -                    <child>
 -                      <object class="GtkLabel" id="label35">
@@ -58,8 +58,8 @@ diff -up gnome-control-center-2.27.91/ca
 -                        </child>
 -                        <child>
 -                          <object class="GtkVBox" id="vbox24">
--                            <property name="orientation">vertical</property>
 -                            <property name="visible">True</property>
+-                            <property name="orientation">vertical</property>
 -                            <property name="spacing">6</property>
 -                            <child>
 -                              <object class="GtkCheckButton" id="menu_icons_toggle">
@@ -156,8 +156,8 @@ diff -up gnome-control-center-2.27.91/ca
 -                </child>
 -                <child>
 -                  <object class="GtkVBox" id="vbox25">
--                    <property name="orientation">vertical</property>
 -                    <property name="visible">True</property>
+-                    <property name="orientation">vertical</property>
 -                    <property name="spacing">6</property>
 -                    <child>
 -                      <object class="GtkLabel" id="label38">
@@ -190,8 +190,8 @@ diff -up gnome-control-center-2.27.91/ca
 -                        </child>
 -                        <child>
 -                          <object class="GtkVBox" id="vbox26">
--                            <property name="orientation">vertical</property>
 -                            <property name="visible">True</property>
+-                            <property name="orientation">vertical</property>
 -                            <child>
 -                              <object class="GtkMenuBar" id="menubar">
 -                                <property name="visible">True</property>
@@ -369,23 +369,12 @@ diff -up gnome-control-center-2.27.91/ca
 -                <property name="position">3</property>
 -              </packing>
 -            </child>
--            <child type="tab">
--              <object class="GtkLabel" id="label40">
--                <property name="visible">True</property>
--                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                <property name="label" translatable="yes">Interface</property>
--              </object>
--              <packing>
--                <property name="position">3</property>
--                <property name="tab_fill">False</property>
--              </packing>
--            </child>
-           </object>
-           <packing>
-             <property name="position">1</property>
-diff -up gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/appearance/Makefile.am
---- gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks	2009-07-16 10:33:13.000000000 -0400
-+++ gnome-control-center-2.27.91/capplets/appearance/Makefile.am	2009-08-24 23:31:28.842973536 -0400
+             <child type="tab">
+               <object class="GtkLabel" id="label40">
+                 <property name="visible">True</property>
+diff -up gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.28.0/capplets/appearance/Makefile.am
+--- gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks	2009-07-16 10:33:13.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/Makefile.am	2009-09-23 16:46:14.108648780 -0400
 @@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
  	appearance-themes.h \
  	appearance-style.c \



From mclasen at fedoraproject.org  Wed Sep 23 22:21:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 22:21:50 +0000 (UTC)
Subject: rpms/GConf2/devel .cvsignore, 1.44, 1.45 GConf2.spec, 1.112,
	1.113 sources, 1.44, 1.45
Message-ID: <20090923222151.08FDE11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14063

Modified Files:
	.cvsignore GConf2.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	25 Aug 2009 13:59:03 -0000	1.44
+++ .cvsignore	23 Sep 2009 22:21:50 -0000	1.45
@@ -1 +1 @@
-GConf-2.27.0.tar.bz2
+GConf-2.28.0.tar.bz2


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- GConf2.spec	25 Aug 2009 13:59:03 -0000	1.112
+++ GConf2.spec	23 Sep 2009 22:21:50 -0000	1.113
@@ -6,11 +6,11 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.27.0
+Version: 2.28.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
-Source: http://download.gnome.org/sources/GConf/2.26/GConf-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gconf/
 
@@ -151,6 +151,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.0-1
 - Update to 2.27.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	25 Aug 2009 13:59:03 -0000	1.44
+++ sources	23 Sep 2009 22:21:50 -0000	1.45
@@ -1 +1 @@
-bfc1c5494c7b9eebe24687df95036bbd  GConf-2.27.0.tar.bz2
+ad2aeb9c7d906b274954c51a615caeac  GConf-2.28.0.tar.bz2



From mbarnes at fedoraproject.org  Wed Sep 23 22:29:50 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 23 Sep 2009 22:29:50 +0000 (UTC)
Subject: rpms/pygobject2/devel .cvsignore, 1.24, 1.25 pygobject2.spec, 1.55, 
	1.56 sources, 1.24, 1.25
Message-ID: <20090923222950.E1F1F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19081

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:

* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc12
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	11 Aug 2009 22:08:33 -0000	1.24
+++ .cvsignore	23 Sep 2009 22:29:49 -0000	1.25
@@ -1 +1 @@
-pygobject-2.19.0.tar.bz2
+pygobject-2.20.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- pygobject2.spec	11 Aug 2009 22:08:33 -0000	1.55
+++ pygobject2.spec	23 Sep 2009 22:29:49 -0000	1.56
@@ -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.19.0
+# Last updated for version 2.20.0
 %define glib2_version                  2.16.0
 %define gobject_introspection_version  0.6.3
 %define python2_version                2.3.5
@@ -14,7 +14,7 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.19.0
+Version: 2.20.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -124,6 +124,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc12
+- Update to 2.20.0
+
 * Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.19.0-1.fc12
 - Update to 2.19.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	11 Aug 2009 22:08:33 -0000	1.24
+++ sources	23 Sep 2009 22:29:49 -0000	1.25
@@ -1 +1 @@
-ef918a6c1ce5edf027ba8d3d28b6ed0c  pygobject-2.19.0.tar.bz2
+10e1fb79be3d698476a28b1e1b0c5640  pygobject-2.20.0.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 23 22:34:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 22:34:45 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore, 1.78, 1.79 gdm.spec, 1.485, 1.486 sources,
	1.113, 1.114
Message-ID: <20090923223445.41F0B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21388

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	24 Aug 2009 21:50:48 -0000	1.78
+++ .cvsignore	23 Sep 2009 22:34:44 -0000	1.79
@@ -1 +1 @@
-gdm-2.27.90.tar.bz2
+gdm-2.28.0.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -p -r1.485 -r1.486
--- gdm.spec	29 Aug 2009 13:57:24 -0000	1.485
+++ gdm.spec	23 Sep 2009 22:34:44 -0000	1.486
@@ -15,13 +15,13 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.27.90
-Release: 2%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
-Source: http://download.gnome.org/sources/gdm/2.27/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.28/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdm-password.pam
@@ -392,6 +392,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 1:2.28.0-1
+- Update to 2.28.0
+
 * Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> 1:2.27.90-2
 - rebuild with new audit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources	24 Aug 2009 21:50:48 -0000	1.113
+++ sources	23 Sep 2009 22:34:45 -0000	1.114
@@ -1 +1 @@
-3b82e93e8bca941f35c35b3ec85d9acc  gdm-2.27.90.tar.bz2
+7724929a6b75ba269fd519d4a4995bbb  gdm-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 23 22:39:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 22:39:04 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.52, 1.53 sources, 1.52, 1.53 vino.spec,
	1.106, 1.107
Message-ID: <20090923223905.022C411C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24234

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	7 Sep 2009 23:57:32 -0000	1.52
+++ .cvsignore	23 Sep 2009 22:39:04 -0000	1.53
@@ -1 +1 @@
-vino-2.27.92.tar.bz2
+vino-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	7 Sep 2009 23:57:32 -0000	1.52
+++ sources	23 Sep 2009 22:39:04 -0000	1.53
@@ -1 +1 @@
-120b5291d09936384264f19855317b67  vino-2.27.92.tar.bz2
+de7874e503b0c4eaa48758620611c75c  vino-2.28.0.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- vino.spec	7 Sep 2009 23:57:32 -0000	1.106
+++ vino.spec	23 Sep 2009 22:39:04 -0000	1.107
@@ -9,10 +9,10 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/vino/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/vino/2.28/%{name}-%{version}.tar.bz2
 
 Patch0: vino-smclient.patch
 
@@ -129,6 +129,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 



From mbarnes at fedoraproject.org  Wed Sep 23 22:44:10 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 23 Sep 2009 22:44:10 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.25,
	1.116.2.26 evolution.spec, 
	1.394.2.57, 1.394.2.58 sources, 1.116.2.30, 1.116.2.31
Message-ID: <20090923224410.1CC6811C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27626

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.2.fc12
- Snapshot of "kill-bonobo" progress at commit 0c1afa3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.25
retrieving revision 1.116.2.26
diff -u -p -r1.116.2.25 -r1.116.2.26
--- .cvsignore	21 Sep 2009 03:31:16 -0000	1.116.2.25
+++ .cvsignore	23 Sep 2009 22:44:09 -0000	1.116.2.26
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2
+evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.57
retrieving revision 1.394.2.58
diff -u -p -r1.394.2.57 -r1.394.2.58
--- evolution.spec	21 Sep 2009 17:30:21 -0000	1.394.2.57
+++ evolution.spec	23 Sep 2009 22:44:09 -0000	1.394.2.58
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 41dbadc
+%define hash 0c1afa3
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.1%{?dist}
+Release: 1.kb.2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.2.fc12
+- Snapshot of "kill-bonobo" progress at commit 0c1afa3.
+
 * Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.1.fc12
 - Bump version to 2.28.99 to stay ahead of Fedora 12.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.30
retrieving revision 1.116.2.31
diff -u -p -r1.116.2.30 -r1.116.2.31
--- sources	21 Sep 2009 03:31:16 -0000	1.116.2.30
+++ sources	23 Sep 2009 22:44:09 -0000	1.116.2.31
@@ -1 +1 @@
-51c3c681a9c2bb1b0f8d59bfea4c7b01  evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2
+448b519564cb448f647f7be76fe85817  evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2



From rdieter at fedoraproject.org  Wed Sep 23 22:45:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Sep 2009 22:45:17 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.65, 1.66 kde-settings.spec,
	1.91, 1.92 sources, 1.67, 1.68
Message-ID: <20090923224517.791FB11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28216

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-10
- include /etc/profile.d/kde.(sh|csh) here, renable KDE_IS_PRELINKED



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	21 Sep 2009 15:14:06 -0000	1.65
+++ .cvsignore	23 Sep 2009 22:45:16 -0000	1.66
@@ -1 +1 @@
-kde-settings-4.3-9.tar.bz2
+kde-settings-4.3-10.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kde-settings.spec	21 Sep 2009 15:14:06 -0000	1.91
+++ kde-settings.spec	23 Sep 2009 22:45:17 -0000	1.92
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 9
+%define rel 10
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -30,6 +30,9 @@ Requires(postun): coreutils
 
 Obsoletes: kde-config < %{version}-%{release}
 
+# when profile.d/kde.(sh|csh) was moved here
+Conflicts: kdelibs3 < 3.5.10-17
+
 %description
 %{summary}.
 
@@ -117,6 +120,7 @@ touch --no-create %{_datadir}/kde-settin
 
 %files 
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/profile.d/kde.*
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
 %{_sysconfdir}/kde/env/fedora-bookmarks.sh
@@ -154,6 +158,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-10
+- include /etc/profile.d/kde.(sh|csh) here, renable KDE_IS_PRELINKED
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-9
 - kdmrc: ForceUserAuthDir=true (#524583)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	21 Sep 2009 15:14:06 -0000	1.67
+++ sources	23 Sep 2009 22:45:17 -0000	1.68
@@ -1 +1 @@
-0b05bc9755e2758cdf254c2ff9af8c2f  kde-settings-4.3-9.tar.bz2
+3bb6fe4ca1c41a0944a3d743094afd8f  kde-settings-4.3-10.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 23 22:45:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 22:45:47 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.488,1.489
Message-ID: <20090923224547.A6E8611C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28369

Modified Files:
	control-center.spec 
Log Message:
fix spec



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -p -r1.488 -r1.489
--- control-center.spec	23 Sep 2009 22:16:29 -0000	1.488
+++ control-center.spec	23 Sep 2009 22:45:47 -0000	1.489
@@ -221,7 +221,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-nee
 make %{?_smp_mflags}
 
 %install
-r -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT



From mbarnes at fedoraproject.org  Wed Sep 23 22:55:29 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 23 Sep 2009 22:55:29 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.58,1.394.2.59
Message-ID: <20090923225529.BD3E811C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv853

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix build requirement.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.58
retrieving revision 1.394.2.59
diff -u -p -r1.394.2.58 -r1.394.2.59
--- evolution.spec	23 Sep 2009 22:44:09 -0000	1.394.2.58
+++ evolution.spec	23 Sep 2009 22:55:28 -0000	1.394.2.59
@@ -80,10 +80,8 @@ Requires(postun): scrollkeeper >= %{scro
 # Don't trust evolution-data-server to maintain accurate sonames.
 Requires: evolution-data-server >= %{eds_version}
 
-# No devel package for libpst, despite the name.
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-themes
-Requires: libpst
 
 ### Build Dependencies ###
 
@@ -113,6 +111,7 @@ BuildRequires: intltool >= %{intltool_ve
 BuildRequires: libcanberra-devel
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgweather-devel >= %{libgweather_version}
+BuildRequires: libpst
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel



From mbarnes at fedoraproject.org  Wed Sep 23 23:11:14 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 23 Sep 2009 23:11:14 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.59,1.394.2.60
Message-ID: <20090923231114.3EE5B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8819

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
D'oh!  Fix a typo.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.59
retrieving revision 1.394.2.60
diff -u -p -r1.394.2.59 -r1.394.2.60
--- evolution.spec	23 Sep 2009 22:55:28 -0000	1.394.2.59
+++ evolution.spec	23 Sep 2009 23:11:13 -0000	1.394.2.60
@@ -111,7 +111,7 @@ BuildRequires: intltool >= %{intltool_ve
 BuildRequires: libcanberra-devel
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: libpst
+BuildRequires: libpst-devel
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel



From mclasen at fedoraproject.org  Wed Sep 23 23:14:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 23:14:44 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.29, 1.30 sources, 1.29,
	1.30 vinagre.spec, 1.58, 1.59
Message-ID: <20090923231444.C963711C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31211

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	7 Sep 2009 23:31:36 -0000	1.29
+++ .cvsignore	23 Sep 2009 23:14:42 -0000	1.30
@@ -1 +1 @@
-vinagre-2.27.92.tar.bz2
+vinagre-2.28.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	7 Sep 2009 23:31:36 -0000	1.29
+++ sources	23 Sep 2009 23:14:42 -0000	1.30
@@ -1 +1 @@
-e0ed6668f6ee78bf225a30ab4bbdc576  vinagre-2.27.92.tar.bz2
+3413726184c4c2ab0e20319777c87e7c  vinagre-2.28.0.1.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- vinagre.spec	18 Sep 2009 17:33:51 -0000	1.58
+++ vinagre.spec	23 Sep 2009 23:14:43 -0000	1.59
@@ -1,12 +1,12 @@
 Name:		vinagre
-Version:	2.27.92
-Release:	3%{?dist}
+Version:	2.28.0
+Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://projects.gnome.org/vinagre/
-Source0:	http://download.gnome.org/sources/vinagre/2.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/vinagre/2.28/%{name}-%{version}.tar.bz2
 # https://bugzilla.gnome.org/show_bug.cgi?id=581817
 Patch0:		0001-Fix-warnings-activating-mDNS-bookmarks.patch
 
@@ -158,6 +158,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-3
 - Update mDNS patch
 



From mclasen at fedoraproject.org  Wed Sep 23 23:15:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 23:15:47 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.59,1.60
Message-ID: <20090923231547.1E42811C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11216

Modified Files:
	vinagre.spec 
Log Message:
2.28.0.1



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- vinagre.spec	23 Sep 2009 23:14:43 -0000	1.59
+++ vinagre.spec	23 Sep 2009 23:15:46 -0000	1.60
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.28.0
+Version:	2.28.0.1
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
@@ -158,8 +158,8 @@ fi
 
 
 %changelog
-* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
-- Update to 2.28.0
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0.1-1
+- Update to 2.28.0.1
 
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-3
 - Update mDNS patch



From till at fedoraproject.org  Wed Sep 23 23:30:42 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 23 Sep 2009 23:30:42 +0000 (UTC)
Subject: rpms/libHX/devel .cvsignore, 1.12, 1.13 libHX.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090923233042.ADD6111C02CA@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18412

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Thu Sep 24 2009 Till Maas <opensource at till.name> - 3.1-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Aug 2009 11:49:08 -0000	1.12
+++ .cvsignore	23 Sep 2009 23:30:39 -0000	1.13
@@ -1,2 +1,2 @@
-libHX-3.0.tar.bz2
-libHX-3.0.tar.bz2.asc
+libHX-3.1.tar.bz2
+libHX-3.1.tar.bz2.asc


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libHX.spec	27 Aug 2009 11:49:08 -0000	1.18
+++ libHX.spec	23 Sep 2009 23:30:40 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           libHX
-Version:        3.0
+Version:        3.1
 Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Till Maas <opensource at till.name> - 3.1-1
+- Update to new release
+
 * Thu Aug 27 2009 Till Maas <opensource at till.name> - 3.0-1
 - Update to new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Aug 2009 11:49:08 -0000	1.12
+++ sources	23 Sep 2009 23:30:40 -0000	1.13
@@ -1,2 +1,2 @@
-8a800d98f44af2a31e9fe23555175327  libHX-3.0.tar.bz2
-d224b763d3005d37fd53896832a56a53  libHX-3.0.tar.bz2.asc
+a02ac06d1a6b56a6c7d1a4fc8796d472  libHX-3.1.tar.bz2
+76442fa38c1c16bdf2b88fb6c00de13c  libHX-3.1.tar.bz2.asc



From tgl at fedoraproject.org  Wed Sep 23 23:32:00 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 23 Sep 2009 23:32:00 +0000 (UTC)
Subject: rpms/mysql/devel mysql-plugin-bug.patch, 1.11, 1.12 mysql.spec,
	1.129, 1.130
Message-ID: <20090923233200.530E711C00E6@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19112

Modified Files:
	mysql-plugin-bug.patch mysql.spec 
Log Message:
Work around upstream bug 46895 by disabling outfile_loaddata test

mysql-plugin-bug.patch:
 disabled.def |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mysql-plugin-bug.patch	1 Sep 2009 03:35:23 -0000	1.11
+++ mysql-plugin-bug.patch	23 Sep 2009 23:31:59 -0000	1.12
@@ -6,14 +6,19 @@ http://bugs.mysql.com/bug.php?id=42144
 
 For the moment, just disable this test.
 
+Also, disable the outfile_loaddata test, which as of 5.1.38 is giving
+platform-dependent results, with the "expected" results being arguably the
+wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
-diff -Naur mysql-5.1.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
---- mysql-5.1.37.orig/mysql-test/t/disabled.def	2009-07-13 19:43:47.000000000 -0400
-+++ mysql-5.1.37/mysql-test/t/disabled.def	2009-08-02 20:43:36.000000000 -0400
-@@ -13,4 +13,5 @@
+
+diff -Naur mysql-5.1.39.orig/mysql-test/t/disabled.def mysql-5.1.39/mysql-test/t/disabled.def
+--- mysql-5.1.39.orig/mysql-test/t/disabled.def	2009-09-04 13:01:56.000000000 -0400
++++ mysql-5.1.39/mysql-test/t/disabled.def	2009-09-23 19:23:42.000000000 -0400
+@@ -13,4 +13,6 @@
  innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
  init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
 -
 +#
-+plugin_load     : gives wrong answer on PPC64
++plugin_load         : gives wrong answer on PPC64
++outfile_loaddata    : gives different results on different platforms


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- mysql.spec	22 Sep 2009 04:29:56 -0000	1.129
+++ mysql.spec	23 Sep 2009 23:32:00 -0000	1.130
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.39
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -642,6 +642,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Sep 23 2009 Tom Lane <tgl at redhat.com> 5.1.39-2
+- Work around upstream bug 46895 by disabling outfile_loaddata test
+
 * Tue Sep 22 2009 Tom Lane <tgl at redhat.com> 5.1.39-1
 - Update to MySQL 5.1.39, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html



From airlied at fedoraproject.org  Wed Sep 23 23:32:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 23 Sep 2009 23:32:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel copy-fb.patch, 1.6,
	1.7 xorg-x11-drv-intel.spec, 1.32, 1.33
Message-ID: <20090923233227.0B2E311C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301

Modified Files:
	copy-fb.patch xorg-x11-drv-intel.spec 
Log Message:
* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
- Attempt to make -nr work again


copy-fb.patch:
 drmmode_display.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    1 
 i830_driver.c     |    2 
 3 files changed, 111 insertions(+), 1 deletion(-)

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- copy-fb.patch	8 Sep 2009 18:38:52 -0000	1.6
+++ copy-fb.patch	23 Sep 2009 23:32:26 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
---- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 14:29:35.000000000 -0400
-+++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 14:29:52.000000000 -0400
+diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-intel-20090909/src/drmmode_display.c
+--- xf86-video-intel-20090909/src/drmmode_display.c.copy-fb	2009-09-24 09:30:40.000000000 +1000
++++ xf86-video-intel-20090909/src/drmmode_display.c	2009-09-24 09:30:56.000000000 +1000
 @@ -35,6 +35,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -42,7 +42,15 @@ diff -up xf86-video-intel-20090908/src/d
  	return TRUE;
  
   fail:
-@@ -1422,3 +1433,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
+@@ -1402,6 +1413,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+ 		return FALSE;
+ 	}
+ 
++	scrn->canDoBGNoneRoot = TRUE;
+ 	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
+ 			     drmmode->mode_res->max_height);
+ 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
+@@ -1422,3 +1434,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
  
  	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
  }
@@ -141,10 +149,10 @@ diff -up xf86-video-intel-20090908/src/d
 +	(*pScreen->DestroyPixmap)(dst);
 +}
 +
-diff -up xf86-video-intel-20090908/src/i830_driver.c.jx xf86-video-intel-20090908/src/i830_driver.c
---- xf86-video-intel-20090908/src/i830_driver.c.jx	2009-09-05 06:06:44.000000000 -0400
-+++ xf86-video-intel-20090908/src/i830_driver.c	2009-09-08 14:29:52.000000000 -0400
-@@ -3049,6 +3049,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-20090909/src/i830_driver.c.copy-fb xf86-video-intel-20090909/src/i830_driver.c
+--- xf86-video-intel-20090909/src/i830_driver.c.copy-fb	2009-09-09 21:40:15.000000000 +1000
++++ xf86-video-intel-20090909/src/i830_driver.c	2009-09-24 09:30:40.000000000 +1000
+@@ -3054,6 +3054,8 @@ I830EnterVT(int scrnIndex, int flags)
         /* Clear the framebuffer */
         memset(pI830->FbBase + pScrn->fbOffset, 0,
  	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -153,10 +161,10 @@ diff -up xf86-video-intel-20090908/src/i
     }
  
     if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090908/src/i830.h.jx xf86-video-intel-20090908/src/i830.h
---- xf86-video-intel-20090908/src/i830.h.jx	2009-09-05 06:06:44.000000000 -0400
-+++ xf86-video-intel-20090908/src/i830.h	2009-09-08 14:30:14.000000000 -0400
-@@ -693,6 +693,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
+diff -up xf86-video-intel-20090909/src/i830.h.copy-fb xf86-video-intel-20090909/src/i830.h
+--- xf86-video-intel-20090909/src/i830.h.copy-fb	2009-09-09 21:40:15.000000000 +1000
++++ xf86-video-intel-20090909/src/i830.h	2009-09-24 09:30:40.000000000 +1000
+@@ -694,6 +694,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
  extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
  extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
  extern int drmmode_output_dpms_status(xf86OutputPtr output);


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- xorg-x11-drv-intel.spec	18 Sep 2009 19:19:28 -0000	1.32
+++ xorg-x11-drv-intel.spec	23 Sep 2009 23:32:26 -0000	1.33
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   15.%{gitdate}%{?dist}
+Release:   16.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
+- Attempt to make -nr work again
+
 * Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.8.0-15.20090909
 - lvds-modes.patch: Fix to work in more cases.
 



From till at fedoraproject.org  Wed Sep 23 23:32:40 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 23 Sep 2009 23:32:40 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.61,1.62
Message-ID: <20090923233240.E7F0D11C00E6@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19441

Modified Files:
	pam_mount.spec 
Log Message:
* Thu Sep 24 2009 Till Maas <opensource at till.name> - 1.32-1
- Update to new release



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- pam_mount.spec	28 Aug 2009 16:08:04 -0000	1.61
+++ pam_mount.spec	23 Sep 2009 23:32:40 -0000	1.62
@@ -1,8 +1,8 @@
 %global packext bz2
 
 Name:           pam_mount
-Version:        1.30
-Release:        2%{?dist}
+Version:        1.32
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Till Maas <opensource at till.name> - 1.32-1
+- Update to new release
+
 * Fri Aug 28 2009 Till Maas <opensource at till.name> - 1.30-2
 - rebuilt with new openssl
 



From till at fedoraproject.org  Wed Sep 23 23:34:57 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 23 Sep 2009 23:34:57 +0000 (UTC)
Subject: rpms/pam_mount/devel .cvsignore,1.26,1.27 sources,1.27,1.28
Message-ID: <20090923233457.C666E11C00E6@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20814

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 24 2009 Till Maas <opensource at till.name> - 1.32-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	27 Aug 2009 11:54:16 -0000	1.26
+++ .cvsignore	23 Sep 2009 23:34:55 -0000	1.27
@@ -1,2 +1,2 @@
-pam_mount-1.30.tar.bz2
-pam_mount-1.30.tar.bz2.asc
+pam_mount-1.32.tar.bz2
+pam_mount-1.32.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	27 Aug 2009 11:54:16 -0000	1.27
+++ sources	23 Sep 2009 23:34:55 -0000	1.28
@@ -1,2 +1,2 @@
-147add644cea9ab68eb78419d3155c73  pam_mount-1.30.tar.bz2
-7dd42fbece31c1d316bf40179d3f790a  pam_mount-1.30.tar.bz2.asc
+e37a3f217be532823dbea5ee29360938  pam_mount-1.32.tar.bz2
+62aff12f3c9d61c7dd59e85c5a4ea552  pam_mount-1.32.tar.bz2.asc



From till at fedoraproject.org  Wed Sep 23 23:37:43 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 23 Sep 2009 23:37:43 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.62,1.63
Message-ID: <20090923233744.7338611C00E6@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22256

Modified Files:
	pam_mount.spec 
Log Message:
* Thu Sep 24 2009 Till Maas <opensource at till.name> - 1.32-1
- Update to new release
- Update libHX dependency



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- pam_mount.spec	23 Sep 2009 23:32:40 -0000	1.62
+++ pam_mount.spec	23 Sep 2009 23:37:43 -0000	1.63
@@ -17,12 +17,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 3.0
+BuildRequires:  libHX-devel >= 3.1
 %if %packext == lz
 BuildRequires:  lzip
 %endif
 Requires:       pam
-Requires:       libHX >= 3.0
+Requires:       libHX >= 3.1
 
 # for /etc/catalog and xmlcatalog
 #Requires:         xml-common
@@ -114,6 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Sep 24 2009 Till Maas <opensource at till.name> - 1.32-1
 - Update to new release
+- Update libHX dependency
 
 * Fri Aug 28 2009 Till Maas <opensource at till.name> - 1.30-2
 - rebuilt with new openssl



From mclasen at fedoraproject.org  Wed Sep 23 23:39:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 23:39:05 +0000 (UTC)
Subject: rpms/gdm/devel gdm-multistack.patch,NONE,1.1 gdm.spec,1.486,1.487
Message-ID: <20090923233905.6789C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22979

Modified Files:
	gdm.spec 
Added Files:
	gdm-multistack.patch 
Log Message:
fix patch


gdm-multistack.patch:
 common/gdm-marshal.list                                            |    1 
 configure.ac                                                       |   60 
 daemon/gdm-factory-slave.c                                         |  108 
 daemon/gdm-greeter-server.c                                        |  188 +
 daemon/gdm-greeter-server.h                                        |   24 
 daemon/gdm-product-slave.c                                         |  308 +-
 daemon/gdm-session-direct.c                                        |  909 ++++--
 daemon/gdm-session-private.h                                       |   32 
 daemon/gdm-session-relay.c                                         |  219 +
 daemon/gdm-session-worker-job.c                                    |   83 
 daemon/gdm-session-worker-job.h                                    |    6 
 daemon/gdm-session-worker.c                                        |   46 
 daemon/gdm-session.c                                               |  243 +
 daemon/gdm-session.h                                               |   68 
 daemon/gdm-simple-slave.c                                          |  217 +
 daemon/test-session.c                                              |   35 
 gui/simple-greeter/Makefile.am                                     |   19 
 gui/simple-greeter/gdm-chooser-widget.c                            |   40 
 gui/simple-greeter/gdm-chooser-widget.h                            |    4 
 gui/simple-greeter/gdm-greeter-client.c                            |  225 +
 gui/simple-greeter/gdm-greeter-client.h                            |   22 
 gui/simple-greeter/gdm-greeter-login-window.c                      |  950 +++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                  |  133 
 gui/simple-greeter/gdm-greeter-login-window.h                      |   32 
 gui/simple-greeter/gdm-greeter-plugin.c                            |  255 +
 gui/simple-greeter/gdm-greeter-plugin.h                            |   61 
 gui/simple-greeter/gdm-greeter-session.c                           |  122 
 gui/simple-greeter/gdm-plugin-manager.c                            |  478 +++
 gui/simple-greeter/gdm-plugin-manager.h                            |   66 
 gui/simple-greeter/gdm-task-list.c                                 |  329 ++
 gui/simple-greeter/gdm-task-list.h                                 |   80 
 gui/simple-greeter/gdm-user-chooser-widget.c                       |   23 
 gui/simple-greeter/libgdmsimplegreeter/Makefile.am                 |   48 
 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c          |  186 +
 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h          |   93 
 gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c     |   93 
 gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h     |   55 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.c                  |  123 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                  |   64 
 gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in      |   11 
 gui/simple-greeter/plugins/Makefile.am                             |    1 
 gui/simple-greeter/plugins/fingerprint/Makefile.am                 |   56 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c |  304 ++
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h |   56 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam         |   17 
 gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am     |    5 
 gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am     |    5 
 gui/simple-greeter/plugins/fingerprint/icons/Makefile.am           |    1 
 gui/simple-greeter/plugins/fingerprint/page.ui                     |   56 
 gui/simple-greeter/plugins/fingerprint/plugin.c                    |   40 
 gui/simple-greeter/plugins/password/Makefile.am                    |   53 
 gui/simple-greeter/plugins/password/gdm-password-extension.c       |  323 ++
 gui/simple-greeter/plugins/password/gdm-password-extension.h       |   56 
 gui/simple-greeter/plugins/password/gdm-password.pam               |   19 
 gui/simple-greeter/plugins/password/page.ui                        |   56 
 gui/simple-greeter/plugins/password/plugin.c                       |   40 
 gui/simple-greeter/plugins/smartcard/Makefile.am                   |   77 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c     |  440 +++
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h     |   56 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c       | 1394 ++++++++++
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h       |   86 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c        |  167 +
 gui/simple-greeter/plugins/smartcard/gdm-smartcard.c               |  558 ++++
 gui/simple-greeter/plugins/smartcard/gdm-smartcard.h               |   94 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam             |   18 
 gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile.am       |    5 
 gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am       |    5 
 gui/simple-greeter/plugins/smartcard/icons/Makefile.am             |    1 
 gui/simple-greeter/plugins/smartcard/page.ui                       |   56 
 gui/simple-greeter/plugins/smartcard/plugin.c                      |   40 
 70 files changed, 9268 insertions(+), 876 deletions(-)

--- NEW FILE gdm-multistack.patch ---
diff -up gdm-2.28.0/common/gdm-marshal.list.multistack gdm-2.28.0/common/gdm-marshal.list
--- gdm-2.28.0/common/gdm-marshal.list.multistack	2009-09-21 16:05:27.000000000 -0400
+++ gdm-2.28.0/common/gdm-marshal.list	2009-09-23 18:46:06.861400723 -0400
@@ -5,3 +5,4 @@ VOID:STRING,STRING
 VOID:UINT,UINT
 VOID:STRING,INT
 VOID:DOUBLE
+BOOLEAN:STRING
diff -up gdm-2.28.0/configure.ac.multistack gdm-2.28.0/configure.ac
--- gdm-2.28.0/configure.ac.multistack	2009-09-23 18:46:06.497641172 -0400
+++ gdm-2.28.0/configure.ac	2009-09-23 18:46:06.800400573 -0400
@@ -18,6 +18,22 @@ AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL()
 
+## increment if the plugin interface has additions, changes, removals.
+LT_CURRENT=1
+
+## increment any time the source changes; set to
+##  0 if you increment CURRENT
+LT_REVISION=0
+
+## increment if any interfaces have been added; set to 0
+## if any interfaces have been changed or removed. removal has
+## precedence over adding, so set to 0 if both happened.
+LT_AGE=0
+
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+
 AC_HEADER_STDC
 
 AC_SUBST(VERSION)
@@ -51,6 +67,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
 LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
 #FONTCONFIG_REQUIRED_VERSION=2.6.0
 FONTCONFIG_REQUIRED_VERSION=2.5.0
+NSS_REQUIRED_VERSION=3.11.1
 
 EXTRA_COMPILE_WARNINGS(yes)
 
@@ -75,6 +92,12 @@ PKG_CHECK_MODULES(DAEMON,
 AC_SUBST(DAEMON_CFLAGS)
 AC_SUBST(DAEMON_LIBS)
 
+PKG_CHECK_MODULES(NSS,
+        nss >= $NSS_REQUIRED_VERSION
+)
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+
 PKG_CHECK_MODULES(XLIB, x11 xau, ,
   [AC_PATH_XTRA
     if test "x$no_x" = xyes; then
@@ -183,6 +206,15 @@ AC_ARG_WITH(dmconfdir,
 AC_SUBST(dmconfdir)
 
 dnl ---------------------------------------------------------------------------
+dnl - Configuration file stuff
+dnl ---------------------------------------------------------------------------
+AC_ARG_WITH(extensionsdatadir,
+            AS_HELP_STRING([--with-extensions-datadir],
+                           [directory where extensions store data, default=DATADIR/gdm/simple-greeter/extensions]),
+            extensionsdatadir=${withval}, extensionsdatadir=${datadir}/gdm/simple-greeter/extensions)
+AC_SUBST(extensionsdatadir)
+
+dnl ---------------------------------------------------------------------------
 dnl - Configure arguments
 dnl ---------------------------------------------------------------------------
 
@@ -1242,6 +1274,22 @@ AC_SUBST(GDM_SPOOL_DIR)
 
 
 dnl ---------------------------------------------------------------------------
+dnl - Directory for simple greeter plugins
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(simple-greeter-plugins-dir,
+            AS_HELP_STRING([--with-simple-greeter-plugins-dir=<dir>],
+                           [simple greeter plugins directory]))
+
+if ! test -z "$with_simple_greeter_plugins_dir"; then
+   GDM_SIMPLE_GREETER_PLUGINS_DIR=$with_simple_greeter_plugins_dir
+else
+   GDM_SIMPLE_GREETER_PLUGINS_DIR=${libdir}/gdm/simple-greeter/plugins
+fi
+
+AC_SUBST(GDM_SIMPLE_GREETER_PLUGINS_DIR)
+
+dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
 
@@ -1368,6 +1416,18 @@ docs/Makefile
 gui/Makefile
 gui/simple-greeter/Makefile
 gui/simple-greeter/libnotificationarea/Makefile
+gui/simple-greeter/libgdmsimplegreeter/Makefile
+gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc
+gui/simple-greeter/plugins/Makefile
+gui/simple-greeter/plugins/password/Makefile
+gui/simple-greeter/plugins/fingerprint/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile
+gui/simple-greeter/plugins/smartcard/Makefile
+gui/simple-greeter/plugins/smartcard/icons/Makefile
+gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile
+gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile
 gui/simple-chooser/Makefile
 gui/user-switch-applet/Makefile
 utils/Makefile
diff -up gdm-2.28.0/daemon/gdm-factory-slave.c.multistack gdm-2.28.0/daemon/gdm-factory-slave.c
--- gdm-2.28.0/daemon/gdm-factory-slave.c.multistack	2009-09-21 16:05:27.000000000 -0400
+++ gdm-2.28.0/daemon/gdm-factory-slave.c	2009-09-23 18:46:06.673650996 -0400
@@ -144,63 +144,71 @@ on_greeter_session_died (GdmGreeterSessi
 
 static void
 on_session_info (GdmSession      *session,
+                 const char      *service_name,
                  const char      *text,
                  GdmFactorySlave *slave)
 {
         g_debug ("GdmFactorySlave: Info: %s", text);
-        gdm_greeter_server_info (slave->priv->greeter_server, text);
+        gdm_greeter_server_info (slave->priv->greeter_server, service_name, text);
 }
 
 static void
 on_session_problem (GdmSession      *session,
+                    const char      *service_name,
                     const char      *text,
                     GdmFactorySlave *slave)
 {
         g_debug ("GdmFactorySlave: Problem: %s", text);
-        gdm_greeter_server_problem (slave->priv->greeter_server, text);
+        gdm_greeter_server_problem (slave->priv->greeter_server, service_name, text);
 }
 
 static void
 on_session_info_query (GdmSession      *session,
+                       const char      *service_name,
                        const char      *text,
                        GdmFactorySlave *slave)
 {
 
         g_debug ("GdmFactorySlave: Info query: %s", text);
-        gdm_greeter_server_info_query (slave->priv->greeter_server, text);
+        gdm_greeter_server_info_query (slave->priv->greeter_server, service_name, text);
 }
 
 static void
 on_session_secret_info_query (GdmSession      *session,
+                              const char      *service_name,
                               const char      *text,
                               GdmFactorySlave *slave)
 {
         g_debug ("GdmFactorySlave: Secret info query: %s", text);
-        gdm_greeter_server_secret_info_query (slave->priv->greeter_server, text);
+        gdm_greeter_server_secret_info_query (slave->priv->greeter_server, service_name, text);
 }
 
 static void
-on_session_opened (GdmSession      *session,
-                   GdmFactorySlave *slave)
+on_session_conversation_started (GdmSession      *session,
+                                 const char      *service_name,
+                                 GdmFactorySlave *slave)
 {
-        g_debug ("GdmFactorySlave:  session opened");
+        g_debug ("GdmFactorySlave:  session conversation started");
 
-        gdm_greeter_server_ready (slave->priv->greeter_server);
+        gdm_greeter_server_ready (slave->priv->greeter_server,
+                                  service_name);
 }
 
 static void
 on_session_setup_complete (GdmSession      *session,
+                           const char      *service_name,
                            GdmFactorySlave *slave)
 {
-        gdm_session_authenticate (session);
+        gdm_session_authenticate (session, service_name);
 }
 
 static void
 on_session_setup_failed (GdmSession      *session,
+                         const char      *service_name,
                          const char      *message,
                          GdmFactorySlave *slave)
 {
-        gdm_greeter_server_problem (slave->priv->greeter_server, _("Unable to initialize login system"));
+        gdm_greeter_server_problem (slave->priv->greeter_server, service_name, _("Unable to initialize login system"));
 
         queue_greeter_reset (slave);
 }
@@ -222,23 +230,26 @@ on_session_reset_failed (GdmSession     
[...13800 lines suppressed...]
+EXTRA_DIST = $(icons_DATA)
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am
--- /dev/null	2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am	2009-09-23 18:46:06.821400871 -0400
@@ -0,0 +1,5 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA = gdm-smartcard.png
+
+EXTRA_DIST = $(icons_DATA)
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/Makefile.am
--- /dev/null	2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/icons/Makefile.am	2009-09-23 18:46:06.822408960 -0400
@@ -0,0 +1 @@
+SUBDIRS = 16x16 48x48
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/Makefile.am
--- /dev/null	2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/Makefile.am	2009-09-23 18:46:06.803405565 -0400
@@ -0,0 +1,77 @@
+SUBDIRS = icons
+
+NULL =
+PAM_SERVICE_NAME = gdm-smartcard
+
+extensiondir = $(extensionsdatadir)/smartcard
+extension_DATA = page.ui
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/common				\
+	-I$(top_srcdir)/gui/simple-greeter/libnotificationarea	\
+	-I$(top_srcdir)/gui/simple-greeter/libgdmsimplegreeter	\
+	-DDMCONFDIR=\""$(dmconfdir)"\"			\
+	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
+	-DPLUGINDATADIR=\""$(extensiondir)"\"		\
+	-DPAMSERVICENAME=\""$(pam_DATA)"\"	\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
+	-DLIBDIR=\""$(libdir)"\"			\
+	-DSBINDIR=\""$(sbindir)"\"		 	\
+	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(GTK_CFLAGS)					\
+	$(SIMPLE_GREETER_CFLAGS)			\
+	$(POLKIT_GNOME_CFLAGS)				\
+	$(NULL)
+
+plugindir = $(GDM_SIMPLE_GREETER_PLUGINS_DIR)
+plugin_LTLIBRARIES = smartcard.la
+
+smartcard_la_CFLAGS =			\
+	$(SIMPLE_GREETER_CFLAGS)	\
+	$(NULL)
+
+libexec_PROGRAMS = 			\
+	gdm-smartcard-worker		\
+	$(NULL)
+
+
+smartcard_la_LDFLAGS = -module -avoid-version -export-dynamic
+smartcard_la_LIBADD = ../../../../common/libgdmcommon.la \
+			../../libgdmsimplegreeter/libgdmsimplegreeter.la
+smartcard_la_SOURCES =				\
+			gdm-smartcard-extension.h	\
+			gdm-smartcard-extension.c	\
+			plugin.c
+
+gdm_smartcard_worker_LDADD = ../../../../common/libgdmcommon.la \
+				$(DAEMON_LIBS)		\
+				$(GTHREAD_LIBS)		\
+				$(NSS_LIBS)		\
+				$(NULL)
+gdm_smartcard_worker_CFLAGS =	$(DAEMON_CFLAGS)	\
+				$(NSS_CFLAGS)		\
+				$(NULL)
+gdm_smartcard_worker_SOURCES =				\
+				gdm-smartcard.h		\
+				gdm-smartcard.c		\
+				gdm-smartcard-manager.h	\
+				gdm-smartcard-manager.c	\
+				gdm-smartcard-worker.c	\
+				$(NULL)
+
+$(PAM_SERVICE_NAME): $(PAM_SERVICE_NAME).pam
+	cp $(PAM_SERVICE_NAME).pam $(PAM_SERVICE_NAME)
+
+pamdir = $(PAM_PREFIX)/pam.d
+pam_DATA = $(PAM_SERVICE_NAME)
+
+EXTRA_DIST = $(extension_DATA) $(PAM_SERVICE_NAME).pam
+CLEANFILES = $(PAM_SERVICE_NAME)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        $(PAM_SERVICE_NAME)             \
+        Makefile.in
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/page.ui
--- /dev/null	2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/page.ui	2009-09-23 18:46:06.823391278 -0400
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.14"/>
+    <object class="GtkVBox" id="page">
+      <property name="visible">True</property>
+      <property name="orientation">vertical</property>
+      <child>
+        <object class="GtkHBox" id="auth-input-box">
+          <property name="visible">True</property>
+          <child>
+            <object class="GtkLabel" id="auth-prompt-label">
+              <property name="visible">True</property>
+            </object>
+            <packing>
+              <property name="expand">False</property>
+              <property name="fill">False</property>
+              <property name="position">0</property>
+            </packing>
+          </child>
+          <child>
+            <object class="GtkEntry" id="auth-prompt-entry">
+              <property name="visible">True</property>
+              <property name="can_focus">True</property>
+              <property name="activates_default">True</property>
+            </object>
+            <packing>
+              <property name="position">1</property>
+            </packing>
+          </child>
+        </object>
+        <packing>
+          <property name="expand">True</property>
+          <property name="fill">True</property>
+          <property name="position">0</property>
+        </packing>
+      </child>
+      <child>
+        <object class="GtkHBox" id="auth-message-box">
+          <property name="visible">True</property>
+          <child>
+            <object class="GtkLabel" id="auth-message-label">
+              <property name="visible">True</property>
+            </object>
+            <packing>
+              <property name="position">0</property>
+            </packing>
+          </child>
+        </object>
+        <packing>
+          <property name="expand">True</property>
+          <property name="fill">True</property>
+          <property name="position">1</property>
+        </packing>
+      </child>
+    </object>
+</interface>
diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/plugin.c
--- /dev/null	2009-09-23 15:09:11.116404522 -0400
+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/plugin.c	2009-09-23 18:46:06.825390205 -0400
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written By: Ray Strode <rstrode at redhat.com>
+ *
+ */
+
+#include "gdm-smartcard-extension.h"
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+GdmGreeterExtension *
+gdm_greeter_plugin_get_extension (void)
+{
+        static GObject *extension;
+
+        if (extension != NULL) {
+                g_object_ref (extension);
+        } else {
+                extension = g_object_new (GDM_TYPE_SMARTCARD_EXTENSION, NULL);
+                g_object_add_weak_pointer (extension, (gpointer *) &extension);
+        }
+
+        return GDM_GREETER_EXTENSION (extension);
+}


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -p -r1.486 -r1.487
--- gdm.spec	23 Sep 2009 22:34:44 -0000	1.486
+++ gdm.spec	23 Sep 2009 23:39:05 -0000	1.487
@@ -98,7 +98,7 @@ Patch3: gdm-2.23.92-save-root-window.pat
 # should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
 
-Patch19: gdm-2.27.4-multistack.patch
+Patch19: gdm-multistack.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch



From airlied at fedoraproject.org  Wed Sep 23 23:40:02 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 23 Sep 2009 23:40:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel copy-fb.patch,1.7,1.8
Message-ID: <20090923234002.4661D11C0419@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23928

Modified Files:
	copy-fb.patch 
Log Message:
oops I did it again


copy-fb.patch:
 drmmode_display.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    1 
 i830_driver.c     |    2 
 3 files changed, 111 insertions(+), 1 deletion(-)

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- copy-fb.patch	23 Sep 2009 23:32:26 -0000	1.7
+++ copy-fb.patch	23 Sep 2009 23:40:02 -0000	1.8
@@ -46,7 +46,7 @@ diff -up xf86-video-intel-20090909/src/d
  		return FALSE;
  	}
  
-+	scrn->canDoBGNoneRoot = TRUE;
++	pScrn->canDoBGNoneRoot = TRUE;
  	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
  			     drmmode->mode_res->max_height);
  	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)



From harald at fedoraproject.org  Wed Sep 23 23:49:10 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 23 Sep 2009 23:49:10 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.17, 1.18 dracut.spec, 1.32,
	1.33 sources, 1.18, 1.19
Message-ID: <20090923234910.4155411C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26758

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 23 2009 harald at redhat.com 002-6
- add new device mapper udev rules and dmeventd 
  bug 525319, 525015



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	23 Sep 2009 21:56:29 -0000	1.17
+++ .cvsignore	23 Sep 2009 23:49:09 -0000	1.18
@@ -1 +1 @@
-dracut-002-845dd502.tar.bz2
+dracut-002-6d902042.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- dracut.spec	23 Sep 2009 21:56:29 -0000	1.32
+++ dracut.spec	23 Sep 2009 23:49:09 -0000	1.33
@@ -1,4 +1,4 @@
-%define gittag 845dd502
+%define gittag 6d902042
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 5%{?rdist}
+Release: 6%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Sep 23 2009 harald at redhat.com 002-6
+- add new device mapper udev rules and dmeventd 
+  bug 525319, 525015
+
 * Wed Sep 23 2009 Warren Togami <wtogami at redaht.com> 002-5
 - Revert back to -3, Add umount back to initrd
   This makes no functional difference to LiveCD.  See Bug #525319


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	23 Sep 2009 21:56:29 -0000	1.18
+++ sources	23 Sep 2009 23:49:09 -0000	1.19
@@ -1 +1 @@
-d8d9c7088a414abdc24dc92b463dff6f  dracut-002-845dd502.tar.bz2
+bfc24ae683edbe3e3b240ee0f455de0a  dracut-002-6d902042.tar.bz2



From mbarnes at fedoraproject.org  Wed Sep 23 23:50:23 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 23 Sep 2009 23:50:23 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.60,1.394.2.61
Message-ID: <20090923235023.844F411C0418@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27191

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.60
retrieving revision 1.394.2.61
diff -u -p -r1.394.2.60 -r1.394.2.61
--- evolution.spec	23 Sep 2009 23:11:13 -0000	1.394.2.60
+++ evolution.spec	23 Sep 2009 23:50:23 -0000	1.394.2.61
@@ -538,8 +538,8 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 #%{evo_plugin_dir}/org-gnome-compose-send-options.xml
 
-%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
-%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
+#%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
+#%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
 
 %{evo_plugin_dir}/org-gnome-imap-features.eplug
 %{evo_plugin_dir}/liborg-gnome-imap-features.so



From ksyz at fedoraproject.org  Wed Sep 23 23:52:18 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Wed, 23 Sep 2009 23:52:18 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/F-11 perl-XML-Parser-Lite-Tree.spec, 
	1.1, 1.2
Message-ID: <20090923235218.08CF211C00E6@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27747

Modified Files:
	perl-XML-Parser-Lite-Tree.spec 
Log Message:
* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
- Update to current version bz#525050



Index: perl-XML-Parser-Lite-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11/perl-XML-Parser-Lite-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-XML-Parser-Lite-Tree.spec	6 Aug 2009 18:15:06 -0000	1.1
+++ perl-XML-Parser-Lite-Tree.spec	23 Sep 2009 23:52:17 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-XML-Parser-Lite-Tree
-Version:        0.09
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Lightweight XML tree builder
 License:        Artistic 2.0
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
+- Update to current version bz#525050
+
 * Sun Aug 02 2009 Michal Ingeli <mi at v3.sk> - 0.09-1
 - Update to newer version with fixed license
  



From mclasen at fedoraproject.org  Wed Sep 23 23:52:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 23:52:37 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.60,1.61
Message-ID: <20090923235237.AC34B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27778

Modified Files:
	vinagre.spec 
Log Message:
drop upstreamed patch



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- vinagre.spec	23 Sep 2009 23:15:46 -0000	1.60
+++ vinagre.spec	23 Sep 2009 23:52:37 -0000	1.61
@@ -7,8 +7,6 @@ Group:		Applications/System
 License:	GPLv2+
 URL:		http://projects.gnome.org/vinagre/
 Source0:	http://download.gnome.org/sources/vinagre/2.28/%{name}-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=581817
-Patch0:		0001-Fix-warnings-activating-mDNS-bookmarks.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +49,6 @@ to vinagre.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mdns
 
 %build
 %configure --enable-avahi=yes --disable-static



From harald at fedoraproject.org  Wed Sep 23 23:55:41 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 23 Sep 2009 23:55:41 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.18, 1.19 dracut.spec, 1.33,
	1.34 sources, 1.19, 1.20
Message-ID: <20090923235541.1818811C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29767

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Wed Sep 23 2009 harald at redhat.com 002-7
- build with the correct tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	23 Sep 2009 23:49:09 -0000	1.18
+++ .cvsignore	23 Sep 2009 23:55:40 -0000	1.19
@@ -1 +1 @@
-dracut-002-6d902042.tar.bz2
+dracut-002-b9c4654a.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- dracut.spec	23 Sep 2009 23:49:09 -0000	1.33
+++ dracut.spec	23 Sep 2009 23:55:40 -0000	1.34
@@ -1,4 +1,4 @@
-%define gittag 6d902042
+%define gittag b9c4654a 
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 6%{?rdist}
+Release: 7%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Sep 23 2009 harald at redhat.com 002-7
+- build with the correct tarball
+
 * Wed Sep 23 2009 harald at redhat.com 002-6
 - add new device mapper udev rules and dmeventd 
   bug 525319, 525015


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	23 Sep 2009 23:49:09 -0000	1.19
+++ sources	23 Sep 2009 23:55:40 -0000	1.20
@@ -1 +1 @@
-bfc24ae683edbe3e3b240ee0f455de0a  dracut-002-6d902042.tar.bz2
+05c8bddde0287a0d94437d7555e500a8  dracut-002-b9c4654a.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 23 23:56:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 23 Sep 2009 23:56:24 +0000 (UTC)
Subject: rpms/atk/devel .cvsignore, 1.41, 1.42 atk.spec, 1.65, 1.66 sources, 
	1.41, 1.42
Message-ID: <20090923235624.A8F9811C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29903

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	10 Aug 2009 21:12:18 -0000	1.41
+++ .cvsignore	23 Sep 2009 23:56:24 -0000	1.42
@@ -1 +1 @@
-atk-1.27.90.tar.bz2
+atk-1.28.0.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/atk.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- atk.spec	10 Aug 2009 21:12:18 -0000	1.65
+++ atk.spec	23 Sep 2009 23:56:24 -0000	1.66
@@ -2,11 +2,11 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.27.90
+Version: 1.28.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.27/atk-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/atk/1.28/atk-%{version}.tar.bz2
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-1
+- Update to 2.28.0
+
 * Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 1.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	10 Aug 2009 21:12:19 -0000	1.41
+++ sources	23 Sep 2009 23:56:24 -0000	1.42
@@ -1 +1 @@
-8906c67d015cc90e2e70a341d0752a6f  atk-1.27.90.tar.bz2
+010a85478adc053c016a0a5c9bb52004  atk-1.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 00:03:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 00:03:52 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.62, 1.63 at-spi.spec, 1.121,
	1.122 sources, 1.62, 1.63
Message-ID: <20090924000352.4478A11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv627

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	7 Sep 2009 22:09:14 -0000	1.62
+++ .cvsignore	24 Sep 2009 00:03:51 -0000	1.63
@@ -1 +1 @@
-at-spi-1.27.92.tar.bz2
+at-spi-1.28.0.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- at-spi.spec	7 Sep 2009 22:29:30 -0000	1.121
+++ at-spi.spec	24 Sep 2009 00:03:51 -0000	1.122
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
-Version: 1.27.92
+Version: 1.28.0
 Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.28/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-1
+- Update to 1.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 1.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	7 Sep 2009 22:09:15 -0000	1.62
+++ sources	24 Sep 2009 00:03:52 -0000	1.63
@@ -1 +1 @@
-5431fe32d10190cf755f950934e4f68b  at-spi-1.27.92.tar.bz2
+06f6da7873dffc8a26b04e304236e222  at-spi-1.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 00:09:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 00:09:20 +0000 (UTC)
Subject: rpms/libgnomekbd/devel .cvsignore, 1.22, 1.23 libgnomekbd.spec, 1.49,
	1.50 sources, 1.22, 1.23
Message-ID: <20090924000920.DC18111C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2687

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	25 Aug 2009 22:23:52 -0000	1.22
+++ .cvsignore	24 Sep 2009 00:09:20 -0000	1.23
@@ -1 +1 @@
-libgnomekbd-2.27.91.tar.bz2
+libgnomekbd-2.28.0.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libgnomekbd.spec	25 Aug 2009 22:23:52 -0000	1.49
+++ libgnomekbd.spec	24 Sep 2009 00:09:20 -0000	1.50
@@ -1,12 +1,12 @@
 Name:           libgnomekbd
-Version:       	2.27.91
+Version:       	2.28.0
 Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
-Source0:        http://download.gnome.org/sources/libgnomekbd/2.27/libgnomekbd-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgnomekbd/2.28/libgnomekbd-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -128,6 +128,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	25 Aug 2009 22:23:52 -0000	1.22
+++ sources	24 Sep 2009 00:09:20 -0000	1.23
@@ -1 +1 @@
-6e89d5ed36a5785053cd9ec451d9af49  libgnomekbd-2.27.91.tar.bz2
+b0989c4a2dbe2b5dd892d14195674f2b  libgnomekbd-2.28.0.tar.bz2



From ksyz at fedoraproject.org  Thu Sep 24 00:14:58 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Thu, 24 Sep 2009 00:14:58 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/F-11 sources,1.2,1.3
Message-ID: <20090924001458.DA28311C00E6@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5800

Modified Files:
	sources 
Log Message:
* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
- Update to current version bz#525050



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Aug 2009 18:15:06 -0000	1.2
+++ sources	24 Sep 2009 00:14:58 -0000	1.3
@@ -1 +1 @@
-07b45f4374b166769ca865b7ecc77508  XML-Parser-Lite-Tree-0.09.tar.gz
+57b37e0e515aa0584403f1317755505b  XML-Parser-Lite-Tree-0.12.tar.gz



From mclasen at fedoraproject.org  Thu Sep 24 00:15:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 00:15:43 +0000 (UTC)
Subject: rpms/libgnome/devel .cvsignore, 1.50, 1.51 libgnome.spec, 1.151,
	1.152 sources, 1.50, 1.51
Message-ID: <20090924001543.0CC0D11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5711

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	10 Aug 2009 21:18:49 -0000	1.50
+++ .cvsignore	24 Sep 2009 00:15:42 -0000	1.51
@@ -1 +1 @@
-libgnome-2.27.5.tar.bz2
+libgnome-2.28.0.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- libgnome.spec	10 Aug 2009 21:18:49 -0000	1.151
+++ libgnome.spec	24 Sep 2009 00:15:42 -0000	1.152
@@ -13,10 +13,10 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.27.5
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnome/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnome/2.28/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -199,6 +199,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	10 Aug 2009 21:18:49 -0000	1.50
+++ sources	24 Sep 2009 00:15:42 -0000	1.51
@@ -1 +1 @@
-1a1ef6f9ff54210da6c764520ecadaf7  libgnome-2.27.5.tar.bz2
+5c7efe21dc28c137aa766a77a84c0c29  libgnome-2.28.0.tar.bz2



From mbarnes at fedoraproject.org  Thu Sep 24 00:23:15 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 24 Sep 2009 00:23:15 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.61,1.394.2.62
Message-ID: <20090924002315.7468211C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10152

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list, again.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.61
retrieving revision 1.394.2.62
diff -u -p -r1.394.2.61 -r1.394.2.62
--- evolution.spec	23 Sep 2009 23:50:23 -0000	1.394.2.61
+++ evolution.spec	24 Sep 2009 00:23:14 -0000	1.394.2.62
@@ -534,9 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/org-gnome-folder-permissions.xml
 #%{evo_plugin_dir}/org-gnome-folder-subscription.xml
 
-#%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
-#%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
-#%{evo_plugin_dir}/org-gnome-compose-send-options.xml
+%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
+%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
+%{evo_plugin_dir}/org-gnome-compose-send-options.xml
 
 #%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
 #%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
@@ -565,6 +565,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-prefer-plain.eplug
 %{evo_plugin_dir}/liborg-gnome-prefer-plain.so
 
+%{evo_plugin_dir}/org-gnome-pst-import.eplug
+%{evo_plugin_dir}/liborg-gnome-pst-import.so
+
 %{evo_plugin_dir}/org-gnome-publish-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 



From mclasen at fedoraproject.org  Thu Sep 24 00:34:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 00:34:45 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.98, 1.99 gnome-panel.spec,
	1.369, 1.370 sources, 1.101, 1.102
Message-ID: <20090924003445.9437A11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16459

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	9 Sep 2009 04:52:06 -0000	1.98
+++ .cvsignore	24 Sep 2009 00:34:44 -0000	1.99
@@ -1 +1 @@
-gnome-panel-2.27.92.tar.bz2
+gnome-panel-2.28.0.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- gnome-panel.spec	9 Sep 2009 04:52:06 -0000	1.369
+++ gnome-panel.spec	24 Sep 2009 00:34:44 -0000	1.370
@@ -21,10 +21,10 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -354,6 +354,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	9 Sep 2009 04:52:06 -0000	1.101
+++ sources	24 Sep 2009 00:34:45 -0000	1.102
@@ -1 +1 @@
-835fb6cc641e08b15ba4a7d4d0bec58b  gnome-panel-2.27.92.tar.bz2
+9f0ea283d44bbcce67dc2e8a02fe9fad  gnome-panel-2.28.0.tar.bz2



From whot at fedoraproject.org  Thu Sep 24 00:39:40 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 24 Sep 2009 00:39:40 +0000 (UTC)
Subject: rpms/libXdmcp/devel .cvsignore, 1.8, 1.9 libXdmcp.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <20090924003940.DF0AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXdmcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19567

Modified Files:
	.cvsignore libXdmcp.spec sources 
Log Message:
* Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.3-1
- libXdmcp 1.0.3
- libXdmcp-1.0.2-namespace-pollution.patch: drop



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXdmcp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Nov 2006 15:48:12 -0000	1.8
+++ .cvsignore	24 Sep 2009 00:39:40 -0000	1.9
@@ -1 +1 @@
-libXdmcp-1.0.2.tar.bz2
+libXdmcp-1.0.3.tar.bz2


Index: libXdmcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libXdmcp.spec	25 Jul 2009 05:11:23 -0000	1.25
+++ libXdmcp.spec	24 Sep 2009 00:39:40 -0000	1.26
@@ -1,14 +1,13 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
-Version: 1.0.2
-Release: 11%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: libXdmcp-1.0.2-namespace-pollution.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -28,7 +27,6 @@ X.Org X11 libXdmcp development package
 
 %prep
 %setup -q
-%patch0 -p1 -b .hidden
 
 %build
 %configure --disable-static
@@ -61,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.3-1
+- libXdmcp 1.0.3
+- libXdmcp-1.0.2-namespace-pollution.patch: drop
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXdmcp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Nov 2006 15:48:12 -0000	1.9
+++ sources	24 Sep 2009 00:39:40 -0000	1.10
@@ -1 +1 @@
-10facf2bc7cbd5e5c1a698b8a210a582  libXdmcp-1.0.2.tar.bz2
+d60941d471800f41a3f19b24bea855a7  libXdmcp-1.0.3.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 00:55:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 00:55:23 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.78, 1.79 gnome-session.spec, 
	1.251, 1.252 sources, 1.82, 1.83
Message-ID: <20090924005523.A946B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27837

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	9 Sep 2009 04:47:15 -0000	1.78
+++ .cvsignore	24 Sep 2009 00:55:22 -0000	1.79
@@ -1 +1 @@
-gnome-session-2.27.92.tar.bz2
+gnome-session-2.28.0.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- gnome-session.spec	12 Sep 2009 03:56:02 -0000	1.251
+++ gnome-session.spec	24 Sep 2009 00:55:22 -0000	1.252
@@ -9,10 +9,10 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.27.92
+Version: 2.28.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-session/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-session/2.28/%{name}-%{version}.tar.bz2
 Source2: gnome.desktop
 
 License: GPLv2+
@@ -169,6 +169,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen  <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep  9 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	9 Sep 2009 04:47:15 -0000	1.82
+++ sources	24 Sep 2009 00:55:22 -0000	1.83
@@ -1 +1 @@
-605bc85419577ffda87170f79bc850d4  gnome-session-2.27.92.tar.bz2
+b1a2307b02e833010d6c5312b9ff9048  gnome-session-2.28.0.tar.bz2



From whot at fedoraproject.org  Thu Sep 24 01:12:00 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 24 Sep 2009 01:12:00 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 xorg-x11-apps.spec, 1.40, 1.41
Message-ID: <20090924011200.407F011C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2186

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-5
- xclock 1.0.4
- xinput 1.4.99.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	3 Aug 2009 06:10:18 -0000	1.16
+++ .cvsignore	24 Sep 2009 01:11:59 -0000	1.17
@@ -3,7 +3,7 @@ oclock-1.0.1.tar.bz2
 x11perf-1.4.1.tar.bz2
 xbiff-1.0.1.tar.bz2
 xclipboard-1.0.1.tar.bz2
-xclock-1.0.3.tar.bz2
+xclock-1.0.4.tar.bz2
 xcursorgen-1.0.2.tar.bz2
 xeyes-1.0.1.tar.bz2
 xkill-1.0.1.tar.bz2
@@ -15,7 +15,7 @@ xwd-1.0.1.tar.bz2
 xwud-1.0.1.tar.bz2
 xconsole-1.0.3.tar.bz2
 xmessage-1.0.2.tar.bz2
-xinput-1.4.99.2.tar.bz2
+xinput-1.4.99.3.tar.bz2
 xfd-1.0.1.tar.bz2
 xfontsel-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	3 Aug 2009 06:10:19 -0000	1.16
+++ sources	24 Sep 2009 01:11:59 -0000	1.17
@@ -3,7 +3,7 @@ aacda46598ce3af8ca16e2a8132db1b2  luit-1
 fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
 2c6ecedb10dc51adbb64c95f22fd99c2  xclipboard-1.0.1.tar.bz2
-2b1a3d030d87e62a591db8ee4c0072e6  xclock-1.0.3.tar.bz2
+bb9fd5e00d39c348a0078b97fdf8258f  xclock-1.0.4.tar.bz2
 6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
 033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
 f66d76abb0f75514ca32272e23cca757  xkill-1.0.1.tar.bz2
@@ -15,7 +15,7 @@ b41ed6b4bcfc9897366c27a94d2bf150  xload-
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
-66cb86beeb27c53f7de1bb39b918ec2f  xinput-1.4.99.2.tar.bz2
+cc2b98b561b6431bd1e06d13ad2c7b5e  xinput-1.4.99.3.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xorg-x11-apps.spec	3 Aug 2009 06:10:19 -0000	1.40
+++ xorg-x11-apps.spec	24 Sep 2009 01:11:59 -0000	1.41
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 # Clock apps
 Source0:  ftp://ftp.x.org/pub/individual/app/oclock-1.0.1.tar.bz2
-Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.3.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.4.tar.bz2
 # X Window Dump (xwd) utilities
 Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.1.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.1.tar.bz2
@@ -31,7 +31,7 @@ Source13: ftp://ftp.x.org/pub/individual
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.2.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.3.tar.bz2
 Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
@@ -190,6 +190,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-5
+- xclock 1.0.4
+- xinput 1.4.99.3
+
 * Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-4
 - xinput 1.4.99.2
 



From mclasen at fedoraproject.org  Thu Sep 24 01:23:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:23:38 +0000 (UTC)
Subject: rpms/libbonobo/devel .cvsignore, 1.37, 1.38 libbonobo.spec, 1.90,
	1.91 sources, 1.37, 1.38
Message-ID: <20090924012338.E689B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libbonobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4534

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.24.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	16 Mar 2009 03:58:33 -0000	1.37
+++ .cvsignore	24 Sep 2009 01:23:38 -0000	1.38
@@ -1 +1 @@
-libbonobo-2.24.1.tar.bz2
+libbonobo-2.24.2.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- libbonobo.spec	30 Jul 2009 00:53:35 -0000	1.90
+++ libbonobo.spec	24 Sep 2009 01:23:38 -0000	1.91
@@ -5,8 +5,8 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.24.1
-Release: 4%{?dist}
+Version: 2.24.2
+Release: 1%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
+- Update to 2.24.2
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	16 Mar 2009 03:58:34 -0000	1.37
+++ sources	24 Sep 2009 01:23:38 -0000	1.38
@@ -1 +1 @@
-8868b6083392964a6969547ceb8d7cd1  libbonobo-2.24.1.tar.bz2
+5c7c5ea9c2f78a3c1e9ff2f1e27ad751  libbonobo-2.24.2.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 24 01:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 01:26:22 +0000
Subject: [pkgdb] sblim-cmpi-base: praveenp has requested commit
Message-ID: <20090924012622.20C7B10F87C@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-base (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-cmpi-base



From pkgdb at fedoraproject.org  Thu Sep 24 01:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 01:26:41 +0000
Subject: [pkgdb] sblim-cmpi-base: praveenp has requested commit
Message-ID: <20090924012641.BA3F210F883@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-base (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-cmpi-base



From pkgdb at fedoraproject.org  Thu Sep 24 01:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 01:26:45 +0000
Subject: [pkgdb] sblim-cmpi-base: praveenp has requested commit
Message-ID: <20090924012645.4442410F889@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on sblim-cmpi-base (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-cmpi-base



From rdieter at fedoraproject.org  Thu Sep 24 01:34:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 01:34:18 +0000 (UTC)
Subject: rpms/amarok/devel post-2.1.90-20090923git.patch, NONE,
	1.1 amarok.spec, 1.164, 1.165
Message-ID: <20090924013418.319A611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13658

Modified Files:
	amarok.spec 
Added Files:
	post-2.1.90-20090923git.patch 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
- 20090923git snapshot


post-2.1.90-20090923git.patch:
 ChangeLog                                                                                |   15 
 src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop                     |    2 
 src/collection/ipodcollection/amarok_collection-ipodcollection.desktop                   |    4 
 src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop               |    1 
 src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop     |    1 
 src/collection/sqlcollection/ScanResultProcessor.cpp                                     |  220 +++-------
 src/collection/sqlcollection/ScanResultProcessor.h                                       |   18 
 src/collection/sqlcollection/SqlQueryMaker.cpp                                           |    5 
 src/collection/umscollection/amarok_collection-umscollection.desktop                     |    1 
 src/context/Applet.cpp                                                                   |   86 ++-
 src/context/Applet.h                                                                     |    6 
 src/context/applets/info/amarok-context-applet-info.desktop                              |    1 
 src/context/applets/photos/PhotosApplet.cpp                                              |   29 -
 src/context/applets/photos/PhotosScrollWidget.cpp                                        |  131 +++--
 src/context/applets/photos/amarok-context-applet-photos.desktop                          |    1 
 src/context/engines/current/amarok-data-engine-current.desktop                           |    2 
 src/context/engines/info/amarok-data-engine-info.desktop                                 |    1 
 src/context/engines/lyrics/amarok-data-engine-lyrics.desktop                             |    2 
 src/context/engines/photos/PhotosEngine.cpp                                              |   14 
 src/context/engines/photos/amarok-data-engine-photos.desktop                             |    1 
 src/context/engines/songkick/amarok-data-engine-songkick.desktop                         |    2 
 src/context/engines/videoclip/amarok-data-engine-videoclip.desktop                       |    2 
 src/context/engines/wikipedia/WikipediaEngine.cpp                                        |    4 
 src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop                       |    2 
 src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop |    2 
 src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop        |    1 
 src/context/servicetypes/amarok_data_engine.desktop                                      |    4 
 src/dialogs/TagDialog.cpp                                                                |    2 
 src/images/splash_screen.jpg                                                             |binary
 src/main.cpp                                                                             |    2 
 src/playlist/PlaylistModel.cpp                                                           |    4 
 src/playlist/proxymodels/FilterProxy.cpp                                                 |    2 
 src/playlist/proxymodels/FilterProxy.h                                                   |    6 
 src/playlist/proxymodels/SortProxy.cpp                                                   |   25 +
 src/playlist/proxymodels/SortProxy.h                                                     |    8 
 src/services/mp3tunes/amarok_service_mp3tunes.desktop                                    |    2 
 src/services/opmldirectory/amarok_service_opmldirectory.desktop                          |    4 
 37 files changed, 335 insertions(+), 278 deletions(-)

--- NEW FILE post-2.1.90-20090923git.patch ---
diff --git a/ChangeLog b/ChangeLog
index 2d97559..6a4e307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@ Amarok ChangeLog
 ================
 (C) 2002-2009 the Amarok authors.
 
+VERSION 2.2
+  CHANGES:
+    * More collection scanning speedups.
+
+  BUGFIXES:
+    * Fix photos applet not working after resuming playback. (BR 206829)
+    * Fix regression where the genre field in the Tag Dialog would show the
+      composer of the track. (BR 208255)
+    * Don't reshuffle the playlist every time the active track changes when
+    * using a random sort order.
+    * Fix the Various Artist node sometimes being shown in the Collection
+      Browser with nothing underneath it (or an empty "Unknown" album).
+    * Fix some tracks' tags not being saved correctly to the database.
+      (BR 202021)
 
 VERSION 2.2-rc1
   FEATURES:
@@ -23,6 +37,7 @@ VERSION 2.2-rc1
     * Added "Lock layout" option to the main window's context menu.    
 
   BUGFIXES:
+    * Fix wikipedia engine refined search broken. (BR 208024)
     * Crash in QTextCodec while scanning collection has been fixed.
       Apparently. (BR 191447)
     * A dialog with "Can not write playlist (/)" was displayed when using
diff --git a/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop b/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop
index 80396ef..373d71c 100644
--- a/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop
+++ b/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop
@@ -17,6 +17,7 @@ Name[nn]=Skriveverna samling for iPhone OS 3.0
 Name[pl]=Kolekcja tylko-do-odczytu iPhone OS 3.0
 Name[pt]=Colec??o Apenas para Leitura do iPhone OS 3.0
 Name[pt_BR]=Cole??o Somente para Leitura do iPhone OS 3.0
+Name[ru]=????????? iPhone OS 3.0 (?????? ??? ??????)
 Name[sr]=?????? ????? ???? 3.0  (???? ?? ??????)
 Name[sr at latin]=Zbirka iPhoneOS?a 3.0  (samo za ?itanje)
 Name[sv]=iPhone OS 3.0 skrivskyddad samling
@@ -40,6 +41,7 @@ Comment[nn]=Amarok-samlingstillegg for iPhone OS 3.0
 Comment[pl]=Wtyczka kolekcji tylko-do-odczytu iPhone OS 3.0 dla Amaroka
 Comment[pt]=Um 'plugin' da colec??o, apenas para leitura, do iPhone OS 3.0 para o Amarok
 Comment[pt_BR]=Plugin de cole??o somente para Leitura do iPhone OS 3.0, para o Amarok
+Comment[ru]=?????? ????????? iPhone OS 3.0 (?????? ??? ??????)
 Comment[sr]=????????? ?????? ?? ????? ???? 3.0 (???? ?? ??????) ?? ??????
 Comment[sr at latin]=Priklju?ak zbirke na iPhoneOS?u 3.0 (samo za ?itanje) za Amarok
 Comment[sv]=Insticksprogram med iPhone OS 3.0 skrivskyddad samling f?r Amarok
diff --git a/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop b/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop
index 4fda617..48c640a 100644
--- a/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop
+++ b/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop
@@ -36,7 +36,7 @@ Name[pl]=Kolekcja iPod
 Name[pt]=Colec??o do IPod
 Name[pt_BR]=Cole??o iPod
 Name[ro]=Colec?ie Ipod
-Name[ru]=????????? Ipod
+Name[ru]=????????? iPod
 Name[sl]=Zbirka iPod
 Name[sr]=?????? ??????
 Name[sr at latin]=Zbirka iPoda
@@ -84,7 +84,7 @@ Comment[pl]=Wtyczka kolekcji iPoda dla Amaroka
 Comment[pt]=Um 'plugin' da colec??o do IPod para o Amarok
 Comment[pt_BR]=Plug-in de cole??o iPod para o Amarok
 Comment[ro]=Modul de colec?ie Ipod pentru Amarok
-Comment[ru]=?????? ????????? Ipod ??? Amarok
+Comment[ru]=?????? ????????? iPod ??? Amarok
 Comment[sl]=Vstavek za zbirko iPod za Amarok
 Comment[sr]=????????? ?????? ?? ?????? ?? ??????
 Comment[sr at latin]=Priklju?ak zbirke na iPodu za Amarok
diff --git a/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop b/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop
index c3ae12d..1decebb 100644
--- a/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop
+++ b/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop
@@ -18,6 +18,7 @@ Name[nn]=MySQLe-samling
 Name[pl]=Kolekcja MySQLe
 Name[pt]=Colec??o de MySQLe
 Name[pt_BR]=Cole??o MySQLe
+Name[ru]=????????? MySQLe
 Name[sr]=?????? ?? ???????e??
 Name[sr at latin]=Zbirka na MySQLe?u
 Name[sv]=MySQL-samling
diff --git a/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop b/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
index 3957d65..d2726d2 100644
--- a/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
+++ b/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
@@ -18,6 +18,7 @@ Name[nn]=MySQLServer-samling
 Name[pl]=Kolekcja MySQLServer
 Name[pt]=Colec??o de MySQL (Servidor)
 Name[pt_BR]=Cole??o MySQLServer
+Name[ru]=????????? MySQLServer
 Name[sr]=?????? ?? ??????? ?????????
 Name[sr at latin]=Zbirka na serveru MySQL?a
 Name[sv]=MySQLServer-samling
diff --git a/src/collection/sqlcollection/ScanResultProcessor.cpp b/src/collection/sqlcollection/ScanResultProcessor.cpp
index dcc45f8..c9694f4 100644
--- a/src/collection/sqlcollection/ScanResultProcessor.cpp
+++ b/src/collection/sqlcollection/ScanResultProcessor.cpp
@@ -114,7 +114,7 @@ ScanResultProcessor::doneWithImages()
         if( key.first.isEmpty() || key.second.isEmpty() )
             continue;
 
-        int artist = artistId( key.first );
+        int artist = genericId( "artists", key.first );
         int album  = albumId( key.second, artist );
 
         // Will automatically add the image path to the database if needed
@@ -261,7 +261,7 @@ ScanResultProcessor::processDirectory( const QList<QVariantMap > &data )
     {
         foreach( const QVariantMap &row, data )
         {
-            int artist = artistId( row.value( Field::ARTIST ).toString() );
+            int artist = genericId( "artists", row.value( Field::ARTIST ).toString() );
             addTrack( row, artist );
         }
     }
@@ -269,7 +269,7 @@ ScanResultProcessor::processDirectory( const QList<QVariantMap > &data )
     {
         QString albumArtist = findAlbumArtist( artists, data.count() );
         //an empty string means that no albumartist was found
-        int artist = albumArtist.isEmpty() ? 0 : artistId( albumArtist );
+        int artist = albumArtist.isEmpty() ? 0 : genericId( "artists", albumArtist );
 
         debug() << "albumartist " << albumArtist << "for artists" << artists;
         foreach( const QVariantMap &row, data )
@@ -383,37 +383,23 @@ ScanResultProcessor::addTrack( const QVariantMap &trackData, int albumArtistId )
     }
 
     if( dir.count() == 1 )
-    {
         compilationId = checkExistingAlbums( albumName );
-    }
 
-    if( 0 == compilationId )
-    {
-        album = albumId( albumName, albumArtistId );
-    }
+    //run a single query to fetch these at once, to save time
+    //then values will be cached in local maps, so can use the same calls below
+    databaseIdFetch( trackData.value( Field::ARTIST ).toString(),
+                     trackData.value( Field::GENRE ).toString(),
+                     trackData.value( Field::COMPOSER ).toString(),
+                     trackData.value( Field::YEAR ).toString(),
+                     albumName, albumArtistId, compilationId );
 
-    bool needToQuery = false;
-    if( !m_artists.contains( trackData.value( Field::ARTIST ).toString() ) ||
-        !m_genre.contains( trackData.value( Field::GENRE ).toString() )  ||
-        !m_composer.contains( trackData.value( Field::COMPOSER ).toString() ) ||
-        !m_year.contains( trackData.value( Field::YEAR ).toString() ) )
-            needToQuery = true;
+    int artist = genericId( "artists", trackData.value( Field::ARTIST ).toString() );
+    int genre = genericId( "genres", trackData.value( Field::GENRE ).toString() );
+    int composer = genericId( "composers", trackData.value( Field::COMPOSER ).toString() );
+    int year = genericId( "years", trackData.value( Field::YEAR ).toString() );
 
-    if( needToQuery )
-    {
-        //run a single query to fetch these at once, to save time
-        //then values will be cached in local maps, so can use the same calls below
-        databaseIdFetch( trackData.value( Field::ARTIST ).toString(),
-                         trackData.value( Field::GENRE ).toString(),
-                         trackData.value( Field::COMPOSER ).toString(),
-                         trackData.value( Field::YEAR ).toString(),
-                         albumName, albumArtistId );
-    }
-
-    int artist = artistId( trackData.value( Field::ARTIST ).toString() );
-    int genre = genreId( trackData.value( Field::GENRE ).toString() );
-    int composer = composerId( trackData.value( Field::COMPOSER ).toString() );
-    int year = yearId( trackData.value( Field::YEAR ).toString() );
+    if( !compilationId )
+        album = albumId( albumName, albumArtistId );
 
     QString uid = trackData.value( Field::UNIQUEID ).toString();
 
@@ -473,131 +459,86 @@ ScanResultProcessor::addTrack( const QVariantMap &trackData, int albumArtistId )
 }
 
 int
-ScanResultProcessor::artistId( const QString &artist )
+ScanResultProcessor::genericId( const QString &key, const QString &value )
 {
-    if( m_artists.contains( artist ) )
-        return m_artists.value( artist );
-    QString query = QString( "SELECT id FROM artists_temp WHERE name = '%1';" ).arg( m_collection->escape( artist ) );
-    QStringList res = m_collection->query( query );
-    int id = 0;
-    if( res.isEmpty() )
-        id = artistInsert( artist );
+    QMap<QString, int> *currMap;
+    if( key == "artists" )
+        currMap = &m_artists;
+    else if( key == "genres" )
+        currMap = &m_genres;
+    else if( key == "years" )
+        currMap = &m_years;
+    else if( key == "composers" )
+        currMap = &m_composers;
     else
-        id = res[0].toInt();
-    m_artists.insert( artist, id );
-    return id;
-}
-
-int
-ScanResultProcessor::artistInsert( const QString &artist )
-{
-    QString insert = QString( "INSERT INTO artists_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( artist ) );
-    int id = m_collection->insert( insert, "artists_temp" );
-    return id;
-}
-
-int
-ScanResultProcessor::genreId( const QString &genre )
-{
-    if( m_genre.contains( genre ) )
-        return m_genre.value( genre );
-    QString query = QString( "SELECT id FROM genres_temp WHERE name = '%1';" ).arg( m_collection->escape( genre ) );
-    QStringList res = m_collection->query( query );
-    int id = 0;
-    if( res.isEmpty() )
-        id = genreInsert( genre );
-    else
-        id = res[0].toInt();
-    m_genre.insert( genre, id );
-    return id;
-}
-
-int
-ScanResultProcessor::genreInsert( const QString &genre )
-{
-    QString insert = QString( "INSERT INTO genres_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( genre ) );
-    int id = m_collection->insert( insert, "genres_temp" );
-    return id;
-}
-
-int
-ScanResultProcessor::composerId( const QString &composer )
-{
-    if( m_composer.contains( composer ) )
-        return m_composer.value( composer );
-    QString query = QString( "SELECT id FROM composers_temp WHERE name = '%1';" ).arg( m_collection->escape( composer ) );
-    QStringList res = m_collection->query( query );
-    int id = 0;
-    if( res.isEmpty() )
-        id = composerInsert( composer );
-    else
-        id = res[0].toInt();
-    m_composer.insert( composer, id );
-    return id;
-}
+    {
+        debug() << "Holy hell Batman, what just happened in genericId?";
+        return -9999;
+    }
 
-int
-ScanResultProcessor::composerInsert( const QString &composer )
-{
-    QString insert = QString( "INSERT INTO composers_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( composer ) );
-    int id = m_collection->insert( insert, "composers_temp" );
-    return id;
-}
+    if( currMap->contains( value ) )
+        return currMap->value( value );
 
-int
-ScanResultProcessor::yearId( const QString &year )
-{
-    if( m_year.contains( year ) )
-        return m_year.value( year );
-    QString query = QString( "SELECT id FROM years_temp WHERE name = '%1';" ).arg( m_collection->escape( year ) );
+    QString query = QString( "SELECT id FROM %1_temp WHERE name = '%2';" ).arg( key, m_collection->escape( value ) );
     QStringList res = m_collection->query( query );
     int id = 0;
     if( res.isEmpty() )
-        id = yearInsert( year );
+        id = genericInsert( key, value );
     else
         id = res[0].toInt();
-    m_year.insert( year, id );
+    currMap->insert( value, id );
     return id;
 }
 
 int
-ScanResultProcessor::yearInsert( const QString &year )
+ScanResultProcessor::genericInsert( const QString &key, const QString &value )
 {
-    QString insert = QString( "INSERT INTO years_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( year ) );
-    int id = m_collection->insert( insert, "years_temp" );
+    QString insert = QString( "INSERT INTO %1_temp( name ) VALUES ('%2');" ).arg( key, m_collection->escape( value ) );
+    int id = m_collection->insert( insert, QString( "%1_temp" ).arg( key ) );
     return id;
 }
 
 void
-ScanResultProcessor::databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId )
+ScanResultProcessor::databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId, int compilationId )
 {
     //DEBUG_BLOCK
-    Q_UNUSED( album );
-    Q_UNUSED( albumArtistId );
+    QPair<QString, int> albumKey( album, albumArtistId );
+    bool albumFound = compilationId || m_albums.contains( albumKey );
+    bool artistFound = m_artists.contains( artist );
+    bool genreFound = m_genres.contains( genre );
+    bool composerFound = m_composers.contains( composer );
+    bool yearFound = m_years.contains( year );
+
+    if( albumFound && artistFound && genreFound && composerFound && yearFound )
+        return; //nothing to do
+
     int l = 0; //album
-    bool albumFound = false;
     int a = 0; //artist
-    bool artistFound = false;
     int g = 0; //genre
-    bool genreFound = false;
     int c = 0; //composer
-    bool composerFound = false;
     int y = 0; //year
-    bool yearFound = false;
 
     QString query;
-/*
-    if( albumArtistId == 0 )
-        query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist IS NULL AND name = '%1' " )
-                    .arg( m_collection->escape( album ) );
-    else
-        query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist = %1 AND name = '%2' " )
-                        .arg( QString::number( albumArtistId ), m_collection->escape( album ) );
-*/
-    query += QString( "SELECT id, CONCAT('ARTISTNAME_', name) AS name FROM artists_temp WHERE name = '%1' " ).arg( m_collection->escape( artist ) );
-    query += QString( "UNION ALL SELECT id, CONCAT('GENRENAME_', name) AS name FROM genres_temp WHERE name = '%1' " ).arg( m_collection->escape( genre ) );
-    query += QString( "UNION ALL SELECT id, CONCAT('COMPOSERNAME_', name) AS name FROM composers_temp WHERE name = '%1' " ).arg( m_collection->escape( composer ) );
-    query += QString( "UNION ALL SELECT id, CONCAT('YEARSNAME_', name) AS name FROM years_temp WHERE name = '%1';" ).arg( m_collection->escape( year ) );
+    if( !albumFound )
+    {
+        if( albumArtistId == 0 )
+            query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist IS NULL AND name = '%1' " )
+                        .arg( m_collection->escape( album ) );
+        else
+            query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist = %1 AND name = '%2' " )
+                            .arg( QString::number( albumArtistId ), m_collection->escape( album ) );
+    }
+    if( !artistFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('ARTISTNAME_', name) AS name FROM artists_temp WHERE name = '%1' " ).arg( m_collection->escape( artist ) );
+    if( !genreFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('GENRENAME_', name) AS name FROM genres_temp WHERE name = '%1' " ).arg( m_collection->escape( genre ) );
+    if( !composerFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('COMPOSERNAME_', name) AS name FROM composers_temp WHERE name = '%1' " ).arg( m_collection->escape( composer ) );
+    if( !yearFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('YEARSNAME_', name) AS name FROM years_temp WHERE name = '%1';" ).arg( m_collection->escape( year ) );
+    if( query.startsWith( "UNION ALL " ) )
+        query.remove( 0, 10 );
+        
     QStringList res = m_collection->query( query );
     int index = 0;
     QString first;
@@ -607,58 +548,55 @@ ScanResultProcessor::databaseIdFetch( const QString &artist, const QString &genr
         first = res.at( index++ );
         second = res.at( index++ );
              a = first.toInt();
-        if( second == QString( "ALBUMNAME_" + album ) )
+        if( !albumFound && second == QString( "ALBUMNAME_" + album ) )
         {
             l = first.toInt();
             albumFound = true;
         }
-        else if( second == QString( "ARTISTNAME_" + artist ) )
+        else if( !artistFound && second == QString( "ARTISTNAME_" + artist ) )
         {
             a = first.toInt();
             artistFound = true;
         }
-        else if( second == QString( "GENRENAME_" + genre ) )
+        else if( !genreFound && second == QString( "GENRENAME_" + genre ) )
         {
             g = first.toInt();
             genreFound = true;
         }
-        else if( second == QString( "COMPOSERNAME_" + composer ) )
+        else if( !composerFound && second == QString( "COMPOSERNAME_" + composer ) )
         {
             c = first.toInt();
             composerFound = true;
         }
-        else if( second == QString( "YEARSNAME_" + year ) )
+        else if( !yearFound && second == QString( "YEARSNAME_" + year ) )
         {
             y = first.toInt();
             yearFound = true;
         }
     }
-    /*
     if( !albumFound )
     {
-        QPair<QString, int> key( album, albumArtistId );
-        m_albums.insert( key, albumInsert( album, albumArtistId ) );
+        m_albums.insert( albumKey, albumInsert( album, albumArtistId ) );
         albumFound = true;
     }
-    */
     if( !artistFound )
     {
-        m_artists.insert( artist, artistInsert( artist ) );
+        m_artists.insert( artist, genericInsert( "artists", artist ) );
         artistFound = true;
     }
     if( !genreFound )
     {
-        m_genre.insert( genre, genreInsert( genre ) );
+        m_genres.insert( genre, genericInsert( "genres", genre ) );
         genreFound = true;
     }
     if( !composerFound )
     {
-        m_composer.insert( composer, composerInsert( composer ) );
+        m_composers.insert( composer, genericInsert( "composers", composer ) );
         composerFound = true;
     }
     if( !yearFound )
     {
-        m_year.insert( year, yearInsert( year ) );
+        m_years.insert( year, genericInsert( "years", year ) );
         yearFound = true;
     }
 }
diff --git a/src/collection/sqlcollection/ScanResultProcessor.h b/src/collection/sqlcollection/ScanResultProcessor.h
index fffc9e7..49c2b8b 100644
--- a/src/collection/sqlcollection/ScanResultProcessor.h
+++ b/src/collection/sqlcollection/ScanResultProcessor.h
@@ -58,15 +58,9 @@ class ScanResultProcessor : public QObject
     private:
         void addTrack( const QVariantMap &trackData, int albumArtistId );
 
-        int artistId( const QString &artist );
-        int artistInsert( const QString &artist );
-        int genreId( const QString &genre );
-        int genreInsert( const QString &genre );
-        int composerId( const QString &composer );
-        int composerInsert( const QString &composer );
-        int yearId( const QString &year );
-        int yearInsert( const QString &year );
-        void databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId );
+        int genericId( const QString &key, const QString &value );
+        int genericInsert( const QString &key, const QString &value );
+        void databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId, int compilationId );
         int imageId( const QString &image, int albumId );
         int albumId( const QString &album, int artistId );
         int albumInsert( const QString &album, int artistId );
@@ -90,9 +84,9 @@ class ScanResultProcessor : public QObject
         bool m_setupComplete;
 
         QMap<QString, int> m_artists;
-        QMap<QString, int> m_genre;
-        QMap<QString, int> m_year;
-        QMap<QString, int> m_composer;
+        QMap<QString, int> m_genres;
+        QMap<QString, int> m_years;
+        QMap<QString, int> m_composers;
         QMap<QPair<QString, int>, int> m_albums;
         QMap<QPair<QString, int>, int> m_images;
         QMap<QString, int> m_directories;
diff --git a/src/collection/sqlcollection/SqlQueryMaker.cpp b/src/collection/sqlcollection/SqlQueryMaker.cpp
index a6f98fb..10cc629 100644
--- a/src/collection/sqlcollection/SqlQueryMaker.cpp
+++ b/src/collection/sqlcollection/SqlQueryMaker.cpp
@@ -992,6 +992,7 @@ SqlQueryMaker::handleArtists( const QStringList &result )
 void
 SqlQueryMaker::handleAlbums( const QStringList &result )
 {
+    DEBUG_BLOCK
     AlbumList albums;
     SqlRegistry* reg = m_collection->registry();
     for( QStringListIterator iter( result ); iter.hasNext(); )
@@ -999,6 +1000,10 @@ SqlQueryMaker::handleAlbums( const QStringList &result )
         QString name = iter.next();
         QString id = iter.next();
         QString artist = iter.next();
+        //HACK: The following is a HACK and should be fixed by fixing the HACK
+        //of always including the "tracks" table in queries in SqlQueryMaker
+        if( name.isEmpty() && id.isEmpty() && artist.isEmpty() )
+            continue;
         albums.append( reg->getAlbum( name, id.toInt(), artist.toInt() ) );
     }
     emitOrStoreProperResult( AlbumPtr, albums );
diff --git a/src/collection/umscollection/amarok_collection-umscollection.desktop b/src/collection/umscollection/amarok_collection-umscollection.desktop
index 0124c1b..1b016e0 100644
--- a/src/collection/umscollection/amarok_collection-umscollection.desktop
+++ b/src/collection/umscollection/amarok_collection-umscollection.desktop
@@ -15,6 +15,7 @@ Name[nn]=Universell masselagringssamling
 Name[pl]=Kolekcja na urz?dzeniu danych
 Name[pt]=Colec??o de Armazenamento em Massa Universal
 Name[pt_BR]=Cole??o de Armazenamento Universal em Massa
+Name[ru]=????????? UMS
 Name[sr]=?????? ?? ???????????? ???????? ?????????
 Name[sr at latin]=Zbirka na univerzalnom masovnom skladi?tu
 Name[sv]=Samling p? generell lagringsenhet
diff --git a/src/context/Applet.cpp b/src/context/Applet.cpp
index 38bc709..ab2c0ac 100644
--- a/src/context/Applet.cpp
+++ b/src/context/Applet.cpp
@@ -39,7 +39,8 @@ namespace Context
 Context::Applet::Applet( QObject * parent, const QVariantList& args )
     : Plasma::Applet( parent, args )
     , m_collapsed( false )
-    , m_animationId( 0 )
+    , m_animationIdOn( 0 )
+    , m_animationIdOff( 0 )
     , m_transient( 0 )
     , m_standardPadding( 6.0 )
     , m_textBackground( 0 )
@@ -50,8 +51,10 @@ Context::Applet::Applet( QObject * parent, const QVariantList& args )
 
 Context::Applet::~Applet( )
 {
-    if ( m_animationId != 0)
-        Plasma::Animator::self()->stopCustomAnimation( m_animationId );
+    if ( m_animationIdOn != 0 )
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOn );
+    if ( m_animationIdOff != 0 )
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOff );
 }
 
 
@@ -228,39 +231,51 @@ Context::Applet::addAction( QAction *action, const int size )
 void
 Context::Applet::setCollapseOn()
 {
+    // We are asked to collapse, but the applet is already animating to collapse, do nothing
+    if ( m_animationIdOn != 0 )
+        return;
+
+    // We are already collapsed
     if ( size().height() == m_heightCollapseOn )
         return;
+
     debug() << "collapsing applet to..." << m_heightCollapseOn;
     if( m_heightCollapseOff == -1 )
         m_animFromHeight = size().height();
     else
         m_animFromHeight = m_heightCollapseOff;
 
-    if ( m_animationId != 0 ) // warning we are moving right now
+    if ( m_animationIdOff != 0 ) // warning we are extanding right now we should stop
     {
         // stop the anim
-        Plasma::Animator::self()->stopCustomAnimation( m_animationId );
-        m_animationId = 0;
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOff );
+        m_animationIdOff = 0;
     }
     m_collapsed = false;
-    m_animationId = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOn" );
+    m_animationIdOn = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOn" );
 }
 
 void
 Context::Applet::setCollapseOff()
 {
     DEBUG_BLOCK
-    debug() << "height:" << size().height() << "target:" << m_heightCollapseOff << "m_collapsed:" << m_collapsed;
+
+    // We are asked to extend, but the applet is already animating to extend, do nothing
+    if ( m_animationIdOff != 0 )
+        return;
+    
+    // Applet already extended
     if ( size().height() == m_heightCollapseOff )
         return;
 
+    debug() << "height:" << size().height() << "target:" << m_heightCollapseOff << "m_collapsed:" << m_collapsed;
     if( m_heightCollapseOff == -1) // if it's self-expanding, don't animate as we don't know where we're going. also, if we're shrinking
     {                                                                       // stop that and expand regardless
-        // stop the anim
-        if( m_animationId != 0 )
+        // stop the animation on now
+        if( m_animationIdOn != 0 )
         {
-            Plasma::Animator::self()->stopCustomAnimation( m_animationId );
-            m_animationId = 0;
+            Plasma::Animator::self()->stopCustomAnimation( m_animationIdOn );
+            m_animationIdOn = 0;
         }
         m_heightCurrent =  m_heightCollapseOff;
         emit sizeHintChanged(Qt::PreferredSize);
@@ -269,14 +284,14 @@ Context::Applet::setCollapseOff()
         return;
     }
 
-    if ( m_animationId != 0 ) // warning we are moving right now
+    if ( m_animationIdOn != 0 ) // warning we are collapsing right now, stop that and reverse it !
     {
         // stop the anim
-        Plasma::Animator::self()->stopCustomAnimation( m_animationId );
-        m_animationId = 0;
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOn );
+        m_animationIdOn = 0;
     }
     m_collapsed = true ;
-    m_animationId = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOff" );
+    m_animationIdOff = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOff" );
 }
 
 void
@@ -285,6 +300,19 @@ Context::Applet::setCollapseHeight( int h )
     m_heightCollapseOn = h;
 }
 
+bool
+Context::Applet::isAppletCollapsed()
+{
+    return ( m_heightCollapseOn == m_heightCurrent );
+}
+
+bool
+Context::Applet::isAppletExtended()
+{
+    return ( m_heightCollapseOff == m_heightCurrent );
+}
+
+
 void
 Context::Applet::animateOn( qreal anim )
 {
@@ -302,22 +330,20 @@ Context::Applet::animateOff( qreal anim )
 void
 Context::Applet::animateEnd( int id )
 {
-    if( id == m_animationId )
+    if( id == m_animationIdOn )
     {
-        if( !m_collapsed )
-        {
-            Plasma::Applet::resize( size().width(), m_heightCollapseOn );
-            m_collapsed = true;
-        }
-        else
-        {
-            Plasma::Applet::resize( size().width(), m_heightCollapseOff );
-            m_collapsed = false;
-        }
-        updateGeometry();
-        emit sizeHintChanged(Qt::PreferredSize);
-        m_animationId = 0;
+        Plasma::Applet::resize( size().width(), m_heightCollapseOn );
+        m_collapsed = true;
+        m_animationIdOn = 0;
+    }
+    if ( id == m_animationIdOff )
+    {
+        Plasma::Applet::resize( size().width(), m_heightCollapseOff );
+        m_collapsed = false;
+        m_animationIdOff = 0;
     }
+    updateGeometry();
+    emit sizeHintChanged(Qt::PreferredSize);
 }
 
 
diff --git a/src/context/Applet.h b/src/context/Applet.h
index 7811624..9f86158 100644
--- a/src/context/Applet.h
+++ b/src/context/Applet.h
@@ -62,6 +62,9 @@ class AMAROK_EXPORT Applet : public Plasma::Applet
         void setCollapseOff();
         void setCollapseHeight( int );
 
+        bool isAppletCollapsed();
+        bool isAppletExtended();
+
         /**
           * sizeHint is reimplemented here only for all the applet.
           */
@@ -86,7 +89,8 @@ class AMAROK_EXPORT Applet : public Plasma::Applet
         int  m_heightCurrent;
         int  m_heightCollapseOn;
         int  m_heightCollapseOff;
-        int  m_animationId;
+        int  m_animationIdOn;
+        int  m_animationIdOff;
         int  m_animFromHeight;
 
     private:
diff --git a/src/context/applets/info/amarok-context-applet-info.desktop b/src/context/applets/info/amarok-context-applet-info.desktop
index 7c61815..81f2e1d 100644
--- a/src/context/applets/info/amarok-context-applet-info.desktop
+++ b/src/context/applets/info/amarok-context-applet-info.desktop
@@ -16,6 +16,7 @@ Name[nn]=Info
 Name[pl]=Informacja
 Name[pt]=Informa??o
 Name[pt_BR]=Informa??o
+Name[ru]=????????
 Name[sr]=??????
 Name[sr at latin]=Podaci
 Name[sv]=Information
diff --git a/src/context/applets/photos/PhotosApplet.cpp b/src/context/applets/photos/PhotosApplet.cpp
index 4cc4714..884a7f3 100644
--- a/src/context/applets/photos/PhotosApplet.cpp
+++ b/src/context/applets/photos/PhotosApplet.cpp
@@ -116,7 +116,7 @@ PhotosApplet::~PhotosApplet()
 void
 PhotosApplet::engineNewTrackPlaying( )
 {
- //   DEBUG_BLOCK
+    DEBUG_BLOCK
     m_stoppedstate = false;
     dataEngine( "amarok-photos" )->query( QString( "photos" ) );
 }
@@ -124,13 +124,14 @@ PhotosApplet::engineNewTrackPlaying( )
 void
 PhotosApplet::enginePlaybackEnded( int, int, PlaybackEndedReason )
 {
-//    DEBUG_BLOCK
+    DEBUG_BLOCK
     m_stoppedstate = true;;
     m_headerText->setText( i18n( "Photos" ) + QString( " : " ) + i18n( "No track playing" ) );
     m_widget->clear();
     m_widget->hide();
     setBusy( false );
     setCollapseOn();
+    dataEngine( "amarok-photos" )->query( QString( "photos:stopped" ) );
 }
 
 void 
@@ -215,14 +216,22 @@ PhotosApplet::dataUpdated( const QString& name, const Plasma::DataEngine::Data&
     }
     else if ( data.contains( "data" ) )
     {
-        m_headerText->setText( i18n( "Photos" ) + QString( " : " ) + data[ "artist" ].toString() );
-        updateConstraints();
-        update();
-        setCollapseOff();
-        // Send the data to the scrolling widget
-        m_widget->setPixmapList( data[ "data" ].value< QList < PhotosInfo * > >() );
-        m_widget->show();
-        setBusy(false);
+        // Do not show some picture if we're still animating as it can lead to trouble
+        // let's hope animating time will be shorter than fetching time of all the picture :/
+        // this also prevent the stupid effect of reanimating several time.
+        if ( isAppletExtended() )
+        {
+            m_headerText->setText( i18n( "Photos" ) + QString( " : " ) + data[ "artist" ].toString() );
+            updateConstraints();
+            update();
+            setCollapseOff();
+            // Send the data to the scrolling widget
+            m_widget->setPixmapList( data[ "data" ].value< QList < PhotosInfo * > >() );
+            m_widget->show();
+            setBusy(false);
+        }
+        else
+            return;
     }
     updateConstraints();
     update();
diff --git a/src/context/applets/photos/PhotosScrollWidget.cpp b/src/context/applets/photos/PhotosScrollWidget.cpp
index 71d3d28..31c71ad 100644
--- a/src/context/applets/photos/PhotosScrollWidget.cpp
+++ b/src/context/applets/photos/PhotosScrollWidget.cpp
@@ -112,90 +112,94 @@ void PhotosScrollWidget::setPixmapList (QList < PhotosInfo * > list)
     if ( list == m_currentlist )
         return;
 
-    debug() << "adding " << list.count() << "new pics";
+  //  debug() << "adding " << list.count() << "new pics";
     // If a new one arrived, we change.
     foreach( PhotosInfo *item, list )
     {
         if ( !m_currentlist.contains( item ) )
         {
-            switch ( m_mode )
+            if ( !item->photo->isNull() )
             {
-                case PHOTOS_MODE_INTERACTIVE :
+                switch ( m_mode )
                 {
-
-                    if ( !m_id ) // careful we're animating
+                    case PHOTOS_MODE_INTERACTIVE :
                     {
-                        Plasma::Animator::self()->stopCustomAnimation( m_id );
-                        m_id = 0;
-                    }
-                    DragPixmapItem *dragpix = new DragPixmapItem( this );
-                    dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
-                    item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
-                    dragpix->setPos( m_actualpos, 0 );
-                    dragpix->SetClickableUrl( item->urlpage );
-                    dragpix->show();
 
-                    m_pixmaplist << dragpix;
+                        if ( !m_id ) // careful we're animating
+                        {
+                            Plasma::Animator::self()->stopCustomAnimation( m_id );
+                            m_id = 0;
+                        }
 
-                    int delta = dragpix->boundingRect().width() + m_margin;
-                    m_scrollmax += delta;
-                    m_actualpos += delta;
+                        DragPixmapItem *dragpix = new DragPixmapItem( this );
+                        dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
+                        item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
+                        dragpix->setPos( m_actualpos, 0 );
+                        dragpix->SetClickableUrl( item->urlpage );
+                        dragpix->show();
 
-                    break;
-                }
-                case PHOTOS_MODE_AUTOMATIC :
-                {
+                        m_pixmaplist << dragpix;
 
-                    DragPixmapItem *dragpix = new DragPixmapItem( this );
-                    dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
-                        item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
-                    dragpix->SetClickableUrl( item->urlpage );
+                        int delta = dragpix->boundingRect().width() + m_margin;
+                        m_scrollmax += delta;
+                        m_actualpos += delta;
 
-                    if ( m_id == 0 ) // only pos and show if no animation, otherwise it will be set at the end automatically
+                        break;
+                    }
+                    case PHOTOS_MODE_AUTOMATIC :
                     {
-                        if ( ! m_pixmaplist.empty() )
-                        {
-                            dragpix->setPos( m_pixmaplist.last()->boundingRect().width() + m_pixmaplist.last()->pos().x() + m_margin , 0 ) ;
-                            dragpix->show();
-                        }
-                        else
+
+                        DragPixmapItem *dragpix = new DragPixmapItem( this );
+                        dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
+                            item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
+                        dragpix->SetClickableUrl( item->urlpage );
+
+                        if ( m_id == 0 ) // only pos and show if no animation, otherwise it will be set at the end automatically
                         {
-                            m_actualpos = 0;
-                            dragpix->setPos( m_actualpos, 0 ) ;
-                            dragpix->show();
+                            if ( ! m_pixmaplist.empty() )
+                            {
+                                dragpix->setPos( m_pixmaplist.last()->boundingRect().width() + m_pixmaplist.last()->pos().x() + m_margin , 0 ) ;
+                                dragpix->show();
+                            }
+                            else
+                            {
+                                m_actualpos = 0;
+                                dragpix->setPos( m_actualpos, 0 ) ;
+                                dragpix->show();
+                            }
                         }
-                    }
 
-                    m_pixmaplist << dragpix;
+                        m_pixmaplist << dragpix;
 
-                    // set a timer after and launch
-                    QTimer::singleShot( m_interval, this, SLOT( automaticAnimBegin() ) );
+                        // set a timer after and launch
+                        QTimer::singleShot( m_interval, this, SLOT( automaticAnimBegin() ) );
 
-                    break;
-                }
-                case PHOTOS_MODE_FADING :
-                {
-
-                    DragPixmapItem *dragpix = new DragPixmapItem( this );
-                    dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
-                    item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
-                    dragpix->setPos( ( size().width() - dragpix->boundingRect().width() ) / 2, 0 );
-                    dragpix->SetClickableUrl( item->urlpage );
-                    dragpix->hide();
-                    m_pixmaplist << dragpix;
-                    if ( m_pixmaplist.size() == 1 )
-                    {
-                        dragpix->show();
-                        m_timer->start( m_interval );
+                        break;
                     }
+                    case PHOTOS_MODE_FADING :
+                    {
 
-                    break;
+                        DragPixmapItem *dragpix = new DragPixmapItem( this );
+                        dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
+                        item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
+                        dragpix->setPos( ( size().width() - dragpix->boundingRect().width() ) / 2, 0 );
+                        dragpix->SetClickableUrl( item->urlpage );
+                        dragpix->hide();
+                        m_pixmaplist << dragpix;
+                        if ( m_pixmaplist.size() == 1 )
+                        {
+                            dragpix->show();
+                            m_timer->start( m_interval );
+                        }
+
+                        break;
+                    }
                 }
             }
         }
     }
     m_currentlist = list;
-    debug() << "total count: " << m_pixmaplist.count();
+  //  debug() << "total count: " << m_pixmaplist.count();
 }
 
 void PhotosScrollWidget::hoverEnterEvent(QGraphicsSceneHoverEvent*)
@@ -266,10 +270,13 @@ void PhotosScrollWidget::resize(qreal wid, qreal hei)
         {
             foreach (DragPixmapItem *item, m_pixmaplist)
             {
-                if ( size().height() != hei )
-                    item->setPixmap( item->pixmap().scaledToHeight( (int) hei - 4 * m_margin,  Qt::SmoothTransformation ) );
-                if ( size().width() != wid )
-                    item->setPos( ( wid - item->boundingRect().width() ) / 2, 0 );
+                if ( !item->pixmap().isNull() )
+                {
+                    if ( size().height() != hei )
+                        item->setPixmap( item->pixmap().scaledToHeight( (int) hei - 4 * m_margin,  Qt::SmoothTransformation ) );
+                    if ( size().width() != wid )
+                        item->setPos( ( wid - item->boundingRect().width() ) / 2, 0 );
+                }
             }
             break;
         }
diff --git a/src/context/applets/photos/amarok-context-applet-photos.desktop b/src/context/applets/photos/amarok-context-applet-photos.desktop
index 2fed337..86662e8 100644
--- a/src/context/applets/photos/amarok-context-applet-photos.desktop
+++ b/src/context/applets/photos/amarok-context-applet-photos.desktop
@@ -17,6 +17,7 @@ Name[nn]=Bilete
 Name[pl]=Zdj?cia
 Name[pt]=Fotografias
 Name[pt_BR]=Fotos
+Name[ru]=??????????
 Name[sr]=???????????
 Name[sr at latin]=Fotografije
 Name[sv]=Foton
diff --git a/src/context/engines/current/amarok-data-engine-current.desktop b/src/context/engines/current/amarok-data-engine-current.desktop
index 663153f..45354b9 100644
--- a/src/context/engines/current/amarok-data-engine-current.desktop
+++ b/src/context/engines/current/amarok-data-engine-current.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych bie??cych informacji
 Name[pt]=Motor de Dados da Informa??o Actual
 Name[pt_BR]=Mecanismo de Dados das Informa??es Atuais
 Name[ro]=Motor de date Informa?ie curent?
-Name[ru]=?????? ?????? ??? ??????? ????????
+Name[ru]=???????? ?????? ??? ??????? ????????
 Name[sl]=Podatkovni pogon za podatke trenutni skladbi
 Name[sr]=????????? ??????? ????????
 Name[sr at latin]=Datomotor teku?ih podataka
diff --git a/src/context/engines/info/amarok-data-engine-info.desktop b/src/context/engines/info/amarok-data-engine-info.desktop
index a29040c..de16b6b 100644
--- a/src/context/engines/info/amarok-data-engine-info.desktop
+++ b/src/context/engines/info/amarok-data-engine-info.desktop
@@ -14,6 +14,7 @@ Name[nn]=Datamotor for informasjon
 Name[pl]=Modu? danych informacji
 Name[pt]=Motor de Dados da Informa??o
 Name[pt_BR]=Mecanismo de Dados das Informa??es
+Name[ru]=???????? ?????? ??? ????????
 Name[sr]=????????? ????????
 Name[sr at latin]=Datomotor podataka
 Name[sv]=Datagr?nssnitt f?r information
diff --git a/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop b/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop
index fcdb189..134176e 100644
--- a/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop
+++ b/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych tekst?w
 Name[pt]=Motor de Dados de Letras Musicais
 Name[pt_BR]=Mecanismo de Dados das Letras
 Name[ro]=Motor de date Versuri
-Name[ru]=?????? ?????? ??? ??????? ?????
+Name[ru]=???????? ?????? ??? ??????? ?????
 Name[sl]=Podatkovni pogon za besedila
 Name[sr]=????????? ???????
 Name[sr at latin]=Datomotor stihova
diff --git a/src/context/engines/photos/PhotosEngine.cpp b/src/context/engines/photos/PhotosEngine.cpp
index 7558da8..dfb13af 100644
--- a/src/context/engines/photos/PhotosEngine.cpp
+++ b/src/context/engines/photos/PhotosEngine.cpp
@@ -65,6 +65,7 @@ PhotosEngine::sources() const
 bool 
 PhotosEngine::sourceRequestEvent( const QString& name )
 {
+    DEBUG_BLOCK
     m_requested = true; // someone is asking for data, so we turn ourselves on :)
     QStringList tokens = name.split( ':' );
 
@@ -86,7 +87,18 @@ PhotosEngine::sourceRequestEvent( const QString& name )
             m_reload = true;
         }
     }
-        
+
+    // we've been notified by the applet to be in state stop <3
+    else if ( tokens.contains( "stopped" ) && tokens.size() > 1 )
+    {
+        if ( tokens.at( 1 ) == QString( "stopped" ) )
+        {
+            removeSource( "photos" );
+            m_reload = true;
+            return false;
+        }
+    }
+    
     removeAllData( name );
     setData( name, QVariant() );
     update();
diff --git a/src/context/engines/photos/amarok-data-engine-photos.desktop b/src/context/engines/photos/amarok-data-engine-photos.desktop
index c0e893f..d11c43c 100644
--- a/src/context/engines/photos/amarok-data-engine-photos.desktop
+++ b/src/context/engines/photos/amarok-data-engine-photos.desktop
@@ -15,6 +15,7 @@ Name[nn]=Datamotor for bilete
 Name[pl]=Modu? danych zdj??
 Name[pt]=Motor de Dados de Fotografias
 Name[pt_BR]=Mecanismo de Dados de Fotos
+Name[ru]=???????? ?????? ??????????
 Name[sr]=????????? ???????????
 Name[sr at latin]=Datomotor fotografija
 Name[sv]=Datagr?nssnitt f?r foton
diff --git a/src/context/engines/songkick/amarok-data-engine-songkick.desktop b/src/context/engines/songkick/amarok-data-engine-songkick.desktop
index ee1ca93..2213533 100644
--- a/src/context/engines/songkick/amarok-data-engine-songkick.desktop
+++ b/src/context/engines/songkick/amarok-data-engine-songkick.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych Songkick
 Name[pt]=Motor de Dados do Songkick
 Name[pt_BR]=Mecanismo de Dados do Songkick
 Name[ro]=Motor de date Songkick
-Name[ru]=?????? ?????? Songkick
+Name[ru]=???????? ?????? Songkick
 Name[sl]=Podatkovni pogon za Songkick
 Name[sr]=????????? ????????
 Name[sr at latin]=Datomotor Songkicka
diff --git a/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop b/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop
index 9fce5d7..7d3c98b 100644
--- a/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop
+++ b/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop
@@ -20,7 +20,7 @@ Name[pa]=????? ????? ???? ????
 Name[pl]=Modu? danych klip?w wideo
 Name[pt]=Motor de Dados de 'Clips' de V?deo
 Name[pt_BR]=Motor de dados de clipe de v?deo
-Name[ru]=?????? ?????? ??? ???????????
+Name[ru]=???????? ?????? ??? ???????????
 Name[sl]=Podatkovni pogon za video posnetke
 Name[sr]=????????? ????? ???????
 Name[sr at latin]=Datomotor video ise?aka
diff --git a/src/context/engines/wikipedia/WikipediaEngine.cpp b/src/context/engines/wikipedia/WikipediaEngine.cpp
index 11023cb..13de58d 100644
--- a/src/context/engines/wikipedia/WikipediaEngine.cpp
+++ b/src/context/engines/wikipedia/WikipediaEngine.cpp
@@ -222,9 +222,11 @@ WikipediaEngine::wikiResult( KJob* job )
         m_wiki = QString::fromUtf8( storedJob->data().data(), storedJob->data().size() );
 
 
-    // Refined search thing
+    // FIXME: For now we test if we got an article or not with a test on this string "wgArticleId=0"
+    // This is bad
     if( m_wiki.contains( "wgArticleId=0" ) ) // The article does not exist
     {
+        // Refined search is done here 
         if ( m_triedRefinedSearch == -1 )
         {
             debug() << "We already tried some refined search. Lets end this madness...";
diff --git a/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop b/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
index 4e864eb..a97fc3c 100644
--- a/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
+++ b/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych Wikipedii
 Name[pt]=Motor de Dados do Wikip?dia
 Name[pt_BR]=Mecanismo de Dados da Wikipedia
 Name[ro]=Motor de date Wikipedia
-Name[ru]=?????? ?????? ?????????
+Name[ru]=???????? ?????? ?????????
 Name[sl]=Podatkovni pogon za Wikipedijo
 Name[sr]=????????? ??????????
 Name[sr at latin]=Datomotor Wikipedije
diff --git a/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop b/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop
index 499c587..d4b50e9 100644
--- a/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop
+++ b/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop
@@ -18,6 +18,7 @@ Name[nn]=JavaScript-element for Amarok
 Name[pl]=Aplet JavaScriptu Amaroka
 Name[pt]='Applet' de JavaScript do Amarok
 Name[pt_BR]=Miniaplicativo JavaScript do Amarok
+Name[ru]=????? JavaScript ??? Amarok
 Name[sr]=???????????? ????? ?? ??????
 Name[sr at latin]=Javascript aplet za Amarok
 Name[sv]=Amarok Javascript-miniprogram
@@ -45,6 +46,7 @@ Comment[nn]=Innebygd Amarok-element skriven i JavaScript
 Comment[pl]=Natywny applet Amaroka napisany w JavaScripcie
 Comment[pt]=Uma 'applet' nativa do Amarok, feita em JavaScript
 Comment[pt_BR]=Miniaplicativo nativo do Amarok escrito em JavaScript
+Comment[ru]=????? Amarok, ?????????? ?? ????? JavaScript
 Comment[sr]=?????????? ???????? ????? ??????? ? ???????????
 Comment[sr at latin]=Samosvojni Amarokov aplet napisan u JavaScriptu
 Comment[sv]=Eget Amarok miniprogram skrivet i Javascript
diff --git a/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop b/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop
index aa79d73..5672b8f 100644
--- a/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop
+++ b/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop
@@ -17,6 +17,7 @@ Name[nn]=JavaScript-k?yrar for Amarok
 Name[pl]=JavaScript Runner Amaroka
 Name[pt]=Execu??o de JavaScript do Amarok
 Name[pt_BR]=Executor JavaScript do Amarok
+Name[ru]=?????? ??????? JavaScript ??? Amarok
 Name[sr]=???????? ??????? ???????????
 Name[sr at latin]=Amarokov izvo?a? JavaScripta
 Name[sv]=Amarok Javascript-k?rprogram
diff --git a/src/context/servicetypes/amarok_data_engine.desktop b/src/context/servicetypes/amarok_data_engine.desktop
index 6e42b2b..fac1d1f 100644
--- a/src/context/servicetypes/amarok_data_engine.desktop
+++ b/src/context/servicetypes/amarok_data_engine.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych Amaroka
 Name[pt]=Motor de Dados do Amarok
 Name[pt_BR]=Motor de Dados do Amarok
 Name[ro]=Motor de date Amarok
-Name[ru]=?????? ?????? Amarok
+Name[ru]=???????? ?????? Amarok
 Name[sl]=Podatkovni pogon za Amarok
 Name[sr]=????????? ???????
 Name[sr at latin]=Datomotor Amaroka
@@ -83,7 +83,7 @@ Comment[pl]=Modu? danych Amaroka
 Comment[pt]=Motor de Dados do Amarok
 Comment[pt_BR]=Mecanismo de Dados do Amarok
 Comment[ro]=Motor de date Amarok
-Comment[ru]=?????? ?????? Amarok
+Comment[ru]=???????? ?????? Amarok
 Comment[sl]=Podatkovni pogon za Amarok
 Comment[sr]=????????? ???????
 Comment[sr at latin]=Datomotor Amaroka
diff --git a/src/dialogs/TagDialog.cpp b/src/dialogs/TagDialog.cpp
index 58f2ef4..08df868 100644
--- a/src/dialogs/TagDialog.cpp
+++ b/src/dialogs/TagDialog.cpp
@@ -888,7 +888,7 @@ void TagDialog::readTags()
     if( m_currentData.contains( Meta::Field::COMPOSER ) )
         selectOrInsertText( m_currentData.value( Meta::Field::COMPOSER ).toString(), ui->kComboBox_composer );
     else
-        selectOrInsertText( QString(), ui->kComboBox_genre );
+        selectOrInsertText( QString(), ui->kComboBox_composer );
     ui->ratingWidget->setRating( m_currentData.value( Meta::Field::RATING ).toInt() );
     ui->ratingWidget->setMaxRating( 10 );
     ui->qSpinBox_track->setValue( m_currentData.value( Meta::Field::TRACKNUMBER ).toInt() );
diff --git a/src/images/splash_screen.jpg b/src/images/splash_screen.jpg
index 6521ead..70a633b 100644
Binary files a/src/images/splash_screen.jpg and b/src/images/splash_screen.jpg differ
diff --git a/src/main.cpp b/src/main.cpp
index 85e7c88..ebc8300 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,7 @@ int main( int argc, char *argv[] )
             ki18n("Developer (hydrogen)"), "parallelgrapefruit at gmail.com" );
     aboutData.addAuthor( ki18n("Ian 'The Beard' Monroe"),
             ki18n("Developer (eean)"), "ian at monroe.nu", "http://www.monroe.nu/" );
-    aboutData.addAuthor( ki18n("Jeff 'IROCKSOHARD' Mitchell"),
+    aboutData.addAuthor( ki18n("Jeff 'IROKSOHARD' Mitchell"),
             ki18n("Developer (jefferai)"), "mitchell at kde.org", "http://amarok.kde.org/blog/categories/13-jefferai" );
     aboutData.addAuthor( ki18n("Leo Franchi"),
             ki18n("Developer (lfranchi)"), "lfranchi at kde.org" );
diff --git a/src/playlist/PlaylistModel.cpp b/src/playlist/PlaylistModel.cpp
index b46300c..c6ad616 100644
--- a/src/playlist/PlaylistModel.cpp
+++ b/src/playlist/PlaylistModel.cpp
@@ -610,6 +610,7 @@ Playlist::Model::metadataChanged( Meta::TrackPtr track )
         {
             emit dataChanged( createIndex( i, 0 ), createIndex( i, columnCount() - 1 ) );
             emit metadataUpdated();
+            debug()<<"Metadata updated for track"<<track->prettyName();
             break;
         }
     }
@@ -621,13 +622,12 @@ Playlist::Model::metadataChanged( Meta::AlbumPtr album )
     Meta::TrackList tracks = album->tracks();
     foreach( Meta::TrackPtr track, tracks )
         metadataChanged( track );
+    debug()<<"Album metadata changed";
 }
 
 bool
 Playlist::Model::exportPlaylist( const QString &path ) const
 {
-    DEBUG_BLOCK
-    debug() << "WARNING: You shouldn't see this at any time except on exit.";
     return The::playlistManager()->exportPlaylist( tracks(), path );
 }
 
diff --git a/src/playlist/proxymodels/FilterProxy.cpp b/src/playlist/proxymodels/FilterProxy.cpp
index 2341be4..5254236 100644
--- a/src/playlist/proxymodels/FilterProxy.cpp
+++ b/src/playlist/proxymodels/FilterProxy.cpp
@@ -32,7 +32,7 @@ FilterProxy::FilterProxy( AbstractModel *belowModel, QObject *parent )
     connect( sourceModel(), SIGNAL( removedIds( const QList<quint64>& ) ), this, SLOT( slotRemovedIds( const QList<quint64>& ) ) );
     connect( sourceModel(), SIGNAL( activeTrackChanged( const quint64 ) ), this, SIGNAL( activeTrackChanged( quint64 ) ) );
     connect( sourceModel(), SIGNAL( metadataUpdated() ), this, SIGNAL( metadataUpdated() ) );
-    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( invalidate() ) );
+    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( slotInvalidateFilter() ) );
 
     KConfigGroup config = Amarok::config("Playlist Search");
     m_passThrough = !config.readEntry( "ShowOnlyMatches", true );
diff --git a/src/playlist/proxymodels/FilterProxy.h b/src/playlist/proxymodels/FilterProxy.h
index 47876ad..65ece09 100644
--- a/src/playlist/proxymodels/FilterProxy.h
+++ b/src/playlist/proxymodels/FilterProxy.h
@@ -122,6 +122,12 @@ protected slots:
      */
     void slotRemovedIds( const QList<quint64> &ids );
 
+    /**
+     * Slot that wraps around the method invalidateFilter() so one doesn't trigger the
+     * sorting invalidation too by using invalidate().
+     */
+    void slotInvalidateFilter(){ invalidateFilter(); }
+
 signals:
     /**
      * Signal forwarded from the source model.
diff --git a/src/playlist/proxymodels/SortProxy.cpp b/src/playlist/proxymodels/SortProxy.cpp
index 46653c1..efba2cd 100644
--- a/src/playlist/proxymodels/SortProxy.cpp
+++ b/src/playlist/proxymodels/SortProxy.cpp
@@ -35,7 +35,7 @@ SortProxy::SortProxy( AbstractModel *belowModel, QObject *parent )
     connect( sourceModel(), SIGNAL( removedIds( const QList<quint64>& ) ), this, SIGNAL( removedIds( const QList< quint64 >& ) ) );
     connect( sourceModel(), SIGNAL( activeTrackChanged( const quint64 ) ), this, SIGNAL( activeTrackChanged( quint64 ) ) );
     connect( sourceModel(), SIGNAL( metadataUpdated() ), this, SIGNAL( metadataUpdated() ) );
-    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( invalidate() ) );
+    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( invalidateSorting() ) );
 
     //needed by GroupingProxy:
     connect( sourceModel(), SIGNAL( layoutChanged() ), this, SIGNAL( layoutChanged() ) );
@@ -48,6 +48,27 @@ SortProxy::~SortProxy()
 void
 SortProxy::invalidateSorting()
 {
+    if( m_scheme.length() )
+    {
+        if( !( m_scheme.level( m_scheme.length() - 1 ).category() == -1 ) ) //if it's not random
+        {
+            invalidate();
+        }
+    }
+    else
+        invalidate();
+    //FIXME: this is a band-aid so that the playlist doesn't reshuffle every time the current track changes
+    // However the real issue is deeper, the Observer seems to notify metadataChanged() even if the metadata
+    // of a track doesn't change but just the currently active track changes, and this results in the playlist
+    // being resorted on every "next", "previous" or track selection. Twice. This is a Bad Thing (TM) and very
+    // inefficient.
+    // We're shipping 2.2 as it is, because it's way too late to go poking around Observer, but this needs
+    // to be solved ASAP post-2.2.      --T?o 23/9/2009
+}
+
+void
+SortProxy::resetSorting()
+{
     m_scheme = SortScheme();
     reset();
 }
@@ -64,7 +85,7 @@ SortProxy::lessThan( const QModelIndex & left, const QModelIndex & right ) const
 void
 SortProxy::updateSortMap( SortScheme scheme )
 {
-    invalidateSorting();
+    resetSorting();
     m_scheme = scheme;
     sort( 0 );  //0 is a dummy column
     //HACK: sort() inverts the sortOrder on each call, this keeps the order ascending.
diff --git a/src/playlist/proxymodels/SortProxy.h b/src/playlist/proxymodels/SortProxy.h
index ebc745f..36cb704 100644
--- a/src/playlist/proxymodels/SortProxy.h
+++ b/src/playlist/proxymodels/SortProxy.h
@@ -63,7 +63,7 @@ public slots:
     /**
      * Resets the proxy to its original pass-through state.
      */
-    void invalidateSorting();
+    void resetSorting();
 
 protected:
     /**
@@ -82,6 +82,12 @@ protected:
      */
     virtual int rowToSource( int row ) const;
 
+protected slots:
+    /**
+     * Reapplies the current sorting scheme.
+     */
+    void invalidateSorting();
+
 private:
     SortScheme m_scheme;               //! The current sorting scheme.
 };
diff --git a/src/services/mp3tunes/amarok_service_mp3tunes.desktop b/src/services/mp3tunes/amarok_service_mp3tunes.desktop
index d2b3a79..8b0937d 100644
--- a/src/services/mp3tunes/amarok_service_mp3tunes.desktop
+++ b/src/services/mp3tunes/amarok_service_mp3tunes.desktop
@@ -70,7 +70,7 @@ Comment[pl]=Przegl?daj i s?uchaj muzyki przechowywanej na twoim koncie Mp3tune
 Comment[pt]=Navegar e escutar a m?sica gravada na sua conta do mp3tunes
 Comment[pt_BR]=Navegue e escute as m?sicas armazenadas na sua conta do mp3tunes
 Comment[ro]=R?sfoi?i ?i asculta?i muzica stocat? ?n contul dumneavoastr? mp3tunes
-Comment[ru]=????? ? ????????????? ??????, ??????????? ? ???????? Mp3tunes
+Comment[ru]=????? ? ????????????? ??????, ??????????? ? ??????? ?????? Mp3tunes
 Comment[sl]=Brskajte po glasbi, ki jo imate shranjeno na svojem ra?unu MP3tunes, in jo poslu?ajte
 Comment[sr]=??????????? ? ???????? ?????? ?? ???? ?????? ?? ??3???????
 Comment[sr at latin]=Pregledajte i slu?ajte muziku sa svog naloga na MP3Tunesu
diff --git a/src/services/opmldirectory/amarok_service_opmldirectory.desktop b/src/services/opmldirectory/amarok_service_opmldirectory.desktop
index f821e17..03c08c8 100644
--- a/src/services/opmldirectory/amarok_service_opmldirectory.desktop
+++ b/src/services/opmldirectory/amarok_service_opmldirectory.desktop
@@ -27,7 +27,7 @@ Name[pl]=Katalog podcast?w
 Name[pt]=Pasta de 'Podcasts'
 Name[pt_BR]=Podcast Directory
 Name[ro]=Director Podcast
-Name[ru]=??????? ??? podcast'??
+Name[ru]=??????? ?????????
 Name[sl]=Imenik podcastov
 Name[sr]=???????? ??????????
 Name[sr at latin]=Fascikla podemisija
@@ -69,7 +69,7 @@ Comment[pl]=Przegl?daj i zapisz si? do ogromnej listy podcast?w
 Comment[pt]=Navegar e inscrever numa enorme lista de 'podcasts'
 Comment[pt_BR]=Navegue e inscr?va-se ? uma lista enorme de podcasts
 Comment[ro]=R?sfoi?i ?i abona?i-v? la o list? uria?? de podcasturi
-Comment[ru]=????? ? ???????? ?? ???????? ?????? podcast'??
+Comment[ru]=????? ? ???????? ?? ???????? ?????? ?????????
 Comment[sl]=Brskajte po obse?ni zbirki podcastov in se naro?ite nanje
 Comment[sr]=??????????? ? ??????????? ?? ?? ??????? ????? ??????????
 Comment[sr at latin]=Pregledajte i pretplatite se na ogromnu listu podemisija


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- amarok.spec	22 Sep 2009 02:01:06 -0000	1.164
+++ amarok.spec	24 Sep 2009 01:34:17 -0000	1.165
@@ -1,17 +1,23 @@
 
+%define snap 20090923git
+
 Name:    amarok
 Summary: Media player
 Version: 2.1.90
-Release: 1%{?dist}
+Release: 2.%{snap}%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+#Source0:  amarok-%{version}-%{snap}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+# mostly a:  git diff v2.1.90
+Patch100: post-2.1.90-%{snap}.patch 
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -72,9 +78,10 @@ Obsoletes: amarok-utilities < 2.0.96
 
 
 %prep
-%setup -q
+%setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .20090923git
 
 
 %build
@@ -91,10 +98,10 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang amarok
-%find_lang amarokcollectionscanner_qt
-%find_lang amarokpkg
-%find_lang amarok_scriptengine_qscript
+%find_lang amarok 
+%find_lang amarokcollectionscanner_qt 
+%find_lang amarokpkg 
+%find_lang amarok_scriptengine_qscript 
 cat amarokpkg.lang >> amarok.lang
 cat amarok_scriptengine_qscript.lang >> amarok.lang
 
@@ -166,6 +173,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
+- 20090923git snapshot
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
 - amarok-2.1.90 (2.2rc1)
 



From rdieter at fedoraproject.org  Thu Sep 24 01:35:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 01:35:16 +0000 (UTC)
Subject: rpms/amarok/F-12 amarok.spec,1.164,1.165
Message-ID: <20090924013516.EC0D311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14061

Modified Files:
	amarok.spec 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
- 20090923git snapshot



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- amarok.spec	22 Sep 2009 02:01:41 -0000	1.164
+++ amarok.spec	24 Sep 2009 01:35:16 -0000	1.165
@@ -1,17 +1,23 @@
 
+%define snap 20090923git
+
 Name:    amarok
 Summary: Media player
 Version: 2.1.90
-Release: 1%{?dist}
+Release: 2.%{snap}%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+#Source0:  amarok-%{version}-%{snap}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+# mostly a:  git diff v2.1.90
+Patch100: post-2.1.90-%{snap}.patch 
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -72,9 +78,10 @@ Obsoletes: amarok-utilities < 2.0.96
 
 
 %prep
-%setup -q
+%setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .20090923git
 
 
 %build
@@ -91,10 +98,10 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang amarok
-%find_lang amarokcollectionscanner_qt
-%find_lang amarokpkg
-%find_lang amarok_scriptengine_qscript
+%find_lang amarok 
+%find_lang amarokcollectionscanner_qt 
+%find_lang amarokpkg 
+%find_lang amarok_scriptengine_qscript 
 cat amarokpkg.lang >> amarok.lang
 cat amarok_scriptengine_qscript.lang >> amarok.lang
 
@@ -166,6 +173,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
+- 20090923git snapshot
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
 - amarok-2.1.90 (2.2rc1)
 



From mclasen at fedoraproject.org  Thu Sep 24 01:35:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:35:41 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.116,1.117
Message-ID: <20090924013541.5121511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14164

Modified Files:
	devhelp.spec 
Log Message:
fix build



Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- devhelp.spec	22 Sep 2009 03:09:58 -0000	1.116
+++ devhelp.spec	24 Sep 2009 01:35:41 -0000	1.117
@@ -30,6 +30,7 @@ BuildRequires: gtk2-devel
 BuildRequires: WebKit-gtk-devel
 BuildRequires: GConf2-devel
 BuildRequires: unique-devel
+BuildRequires: autoconf automake libtool
 
 %description
 Devhelp is an API documentation browser for the GNOME desktop.
@@ -45,13 +46,16 @@ Requires: pkgconfig
 Requires: WebKit-gtk-devel
 
 %description devel
-Devhelp is an API documentation browser for the GNOME desktop. 
-This package contains a library that can be used for embedding devhelp 
+Devhelp is an API documentation browser for the GNOME desktop.
+This package contains a library that can be used for embedding devhelp
 into other applications such as IDEs.
 
 %prep
 %setup -q -n devhelp-%{version}
 
+# the configure script in the 2.28.0 tarball is bad
+autoreconf -f -i
+
 # force regeneration
 rm data/devhelp.schemas
 



From rdieter at fedoraproject.org  Thu Sep 24 01:36:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 01:36:12 +0000 (UTC)
Subject: rpms/amarok/F-12 post-2.1.90-20090923git.patch,NONE,1.1
Message-ID: <20090924013612.CF6C511C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419

Added Files:
	post-2.1.90-20090923git.patch 
Log Message:
git patch


post-2.1.90-20090923git.patch:
 ChangeLog                                                                                |   15 
 src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop                     |    2 
 src/collection/ipodcollection/amarok_collection-ipodcollection.desktop                   |    4 
 src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop               |    1 
 src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop     |    1 
 src/collection/sqlcollection/ScanResultProcessor.cpp                                     |  220 +++-------
 src/collection/sqlcollection/ScanResultProcessor.h                                       |   18 
 src/collection/sqlcollection/SqlQueryMaker.cpp                                           |    5 
 src/collection/umscollection/amarok_collection-umscollection.desktop                     |    1 
 src/context/Applet.cpp                                                                   |   86 ++-
 src/context/Applet.h                                                                     |    6 
 src/context/applets/info/amarok-context-applet-info.desktop                              |    1 
 src/context/applets/photos/PhotosApplet.cpp                                              |   29 -
 src/context/applets/photos/PhotosScrollWidget.cpp                                        |  131 +++--
 src/context/applets/photos/amarok-context-applet-photos.desktop                          |    1 
 src/context/engines/current/amarok-data-engine-current.desktop                           |    2 
 src/context/engines/info/amarok-data-engine-info.desktop                                 |    1 
 src/context/engines/lyrics/amarok-data-engine-lyrics.desktop                             |    2 
 src/context/engines/photos/PhotosEngine.cpp                                              |   14 
 src/context/engines/photos/amarok-data-engine-photos.desktop                             |    1 
 src/context/engines/songkick/amarok-data-engine-songkick.desktop                         |    2 
 src/context/engines/videoclip/amarok-data-engine-videoclip.desktop                       |    2 
 src/context/engines/wikipedia/WikipediaEngine.cpp                                        |    4 
 src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop                       |    2 
 src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop |    2 
 src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop        |    1 
 src/context/servicetypes/amarok_data_engine.desktop                                      |    4 
 src/dialogs/TagDialog.cpp                                                                |    2 
 src/images/splash_screen.jpg                                                             |binary
 src/main.cpp                                                                             |    2 
 src/playlist/PlaylistModel.cpp                                                           |    4 
 src/playlist/proxymodels/FilterProxy.cpp                                                 |    2 
 src/playlist/proxymodels/FilterProxy.h                                                   |    6 
 src/playlist/proxymodels/SortProxy.cpp                                                   |   25 +
 src/playlist/proxymodels/SortProxy.h                                                     |    8 
 src/services/mp3tunes/amarok_service_mp3tunes.desktop                                    |    2 
 src/services/opmldirectory/amarok_service_opmldirectory.desktop                          |    4 
 37 files changed, 335 insertions(+), 278 deletions(-)

--- NEW FILE post-2.1.90-20090923git.patch ---
diff --git a/ChangeLog b/ChangeLog
index 2d97559..6a4e307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@ Amarok ChangeLog
 ================
 (C) 2002-2009 the Amarok authors.
 
+VERSION 2.2
+  CHANGES:
+    * More collection scanning speedups.
+
+  BUGFIXES:
+    * Fix photos applet not working after resuming playback. (BR 206829)
+    * Fix regression where the genre field in the Tag Dialog would show the
+      composer of the track. (BR 208255)
+    * Don't reshuffle the playlist every time the active track changes when
+    * using a random sort order.
+    * Fix the Various Artist node sometimes being shown in the Collection
+      Browser with nothing underneath it (or an empty "Unknown" album).
+    * Fix some tracks' tags not being saved correctly to the database.
+      (BR 202021)
 
 VERSION 2.2-rc1
   FEATURES:
@@ -23,6 +37,7 @@ VERSION 2.2-rc1
     * Added "Lock layout" option to the main window's context menu.    
 
   BUGFIXES:
+    * Fix wikipedia engine refined search broken. (BR 208024)
     * Crash in QTextCodec while scanning collection has been fixed.
       Apparently. (BR 191447)
     * A dialog with "Can not write playlist (/)" was displayed when using
diff --git a/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop b/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop
index 80396ef..373d71c 100644
--- a/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop
+++ b/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop
@@ -17,6 +17,7 @@ Name[nn]=Skriveverna samling for iPhone OS 3.0
 Name[pl]=Kolekcja tylko-do-odczytu iPhone OS 3.0
 Name[pt]=Colec??o Apenas para Leitura do iPhone OS 3.0
 Name[pt_BR]=Cole??o Somente para Leitura do iPhone OS 3.0
+Name[ru]=????????? iPhone OS 3.0 (?????? ??? ??????)
 Name[sr]=?????? ????? ???? 3.0  (???? ?? ??????)
 Name[sr at latin]=Zbirka iPhoneOS?a 3.0  (samo za ?itanje)
 Name[sv]=iPhone OS 3.0 skrivskyddad samling
@@ -40,6 +41,7 @@ Comment[nn]=Amarok-samlingstillegg for iPhone OS 3.0
 Comment[pl]=Wtyczka kolekcji tylko-do-odczytu iPhone OS 3.0 dla Amaroka
 Comment[pt]=Um 'plugin' da colec??o, apenas para leitura, do iPhone OS 3.0 para o Amarok
 Comment[pt_BR]=Plugin de cole??o somente para Leitura do iPhone OS 3.0, para o Amarok
+Comment[ru]=?????? ????????? iPhone OS 3.0 (?????? ??? ??????)
 Comment[sr]=????????? ?????? ?? ????? ???? 3.0 (???? ?? ??????) ?? ??????
 Comment[sr at latin]=Priklju?ak zbirke na iPhoneOS?u 3.0 (samo za ?itanje) za Amarok
 Comment[sv]=Insticksprogram med iPhone OS 3.0 skrivskyddad samling f?r Amarok
diff --git a/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop b/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop
index 4fda617..48c640a 100644
--- a/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop
+++ b/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop
@@ -36,7 +36,7 @@ Name[pl]=Kolekcja iPod
 Name[pt]=Colec??o do IPod
 Name[pt_BR]=Cole??o iPod
 Name[ro]=Colec?ie Ipod
-Name[ru]=????????? Ipod
+Name[ru]=????????? iPod
 Name[sl]=Zbirka iPod
 Name[sr]=?????? ??????
 Name[sr at latin]=Zbirka iPoda
@@ -84,7 +84,7 @@ Comment[pl]=Wtyczka kolekcji iPoda dla Amaroka
 Comment[pt]=Um 'plugin' da colec??o do IPod para o Amarok
 Comment[pt_BR]=Plug-in de cole??o iPod para o Amarok
 Comment[ro]=Modul de colec?ie Ipod pentru Amarok
-Comment[ru]=?????? ????????? Ipod ??? Amarok
+Comment[ru]=?????? ????????? iPod ??? Amarok
 Comment[sl]=Vstavek za zbirko iPod za Amarok
 Comment[sr]=????????? ?????? ?? ?????? ?? ??????
 Comment[sr at latin]=Priklju?ak zbirke na iPodu za Amarok
diff --git a/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop b/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop
index c3ae12d..1decebb 100644
--- a/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop
+++ b/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop
@@ -18,6 +18,7 @@ Name[nn]=MySQLe-samling
 Name[pl]=Kolekcja MySQLe
 Name[pt]=Colec??o de MySQLe
 Name[pt_BR]=Cole??o MySQLe
+Name[ru]=????????? MySQLe
 Name[sr]=?????? ?? ???????e??
 Name[sr at latin]=Zbirka na MySQLe?u
 Name[sv]=MySQL-samling
diff --git a/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop b/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
index 3957d65..d2726d2 100644
--- a/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
+++ b/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop
@@ -18,6 +18,7 @@ Name[nn]=MySQLServer-samling
 Name[pl]=Kolekcja MySQLServer
 Name[pt]=Colec??o de MySQL (Servidor)
 Name[pt_BR]=Cole??o MySQLServer
+Name[ru]=????????? MySQLServer
 Name[sr]=?????? ?? ??????? ?????????
 Name[sr at latin]=Zbirka na serveru MySQL?a
 Name[sv]=MySQLServer-samling
diff --git a/src/collection/sqlcollection/ScanResultProcessor.cpp b/src/collection/sqlcollection/ScanResultProcessor.cpp
index dcc45f8..c9694f4 100644
--- a/src/collection/sqlcollection/ScanResultProcessor.cpp
+++ b/src/collection/sqlcollection/ScanResultProcessor.cpp
@@ -114,7 +114,7 @@ ScanResultProcessor::doneWithImages()
         if( key.first.isEmpty() || key.second.isEmpty() )
             continue;
 
-        int artist = artistId( key.first );
+        int artist = genericId( "artists", key.first );
         int album  = albumId( key.second, artist );
 
         // Will automatically add the image path to the database if needed
@@ -261,7 +261,7 @@ ScanResultProcessor::processDirectory( const QList<QVariantMap > &data )
     {
         foreach( const QVariantMap &row, data )
         {
-            int artist = artistId( row.value( Field::ARTIST ).toString() );
+            int artist = genericId( "artists", row.value( Field::ARTIST ).toString() );
             addTrack( row, artist );
         }
     }
@@ -269,7 +269,7 @@ ScanResultProcessor::processDirectory( const QList<QVariantMap > &data )
     {
         QString albumArtist = findAlbumArtist( artists, data.count() );
         //an empty string means that no albumartist was found
-        int artist = albumArtist.isEmpty() ? 0 : artistId( albumArtist );
+        int artist = albumArtist.isEmpty() ? 0 : genericId( "artists", albumArtist );
 
         debug() << "albumartist " << albumArtist << "for artists" << artists;
         foreach( const QVariantMap &row, data )
@@ -383,37 +383,23 @@ ScanResultProcessor::addTrack( const QVariantMap &trackData, int albumArtistId )
     }
 
     if( dir.count() == 1 )
-    {
         compilationId = checkExistingAlbums( albumName );
-    }
 
-    if( 0 == compilationId )
-    {
-        album = albumId( albumName, albumArtistId );
-    }
+    //run a single query to fetch these at once, to save time
+    //then values will be cached in local maps, so can use the same calls below
+    databaseIdFetch( trackData.value( Field::ARTIST ).toString(),
+                     trackData.value( Field::GENRE ).toString(),
+                     trackData.value( Field::COMPOSER ).toString(),
+                     trackData.value( Field::YEAR ).toString(),
+                     albumName, albumArtistId, compilationId );
 
-    bool needToQuery = false;
-    if( !m_artists.contains( trackData.value( Field::ARTIST ).toString() ) ||
-        !m_genre.contains( trackData.value( Field::GENRE ).toString() )  ||
-        !m_composer.contains( trackData.value( Field::COMPOSER ).toString() ) ||
-        !m_year.contains( trackData.value( Field::YEAR ).toString() ) )
-            needToQuery = true;
+    int artist = genericId( "artists", trackData.value( Field::ARTIST ).toString() );
+    int genre = genericId( "genres", trackData.value( Field::GENRE ).toString() );
+    int composer = genericId( "composers", trackData.value( Field::COMPOSER ).toString() );
+    int year = genericId( "years", trackData.value( Field::YEAR ).toString() );
 
-    if( needToQuery )
-    {
-        //run a single query to fetch these at once, to save time
-        //then values will be cached in local maps, so can use the same calls below
-        databaseIdFetch( trackData.value( Field::ARTIST ).toString(),
-                         trackData.value( Field::GENRE ).toString(),
-                         trackData.value( Field::COMPOSER ).toString(),
-                         trackData.value( Field::YEAR ).toString(),
-                         albumName, albumArtistId );
-    }
-
-    int artist = artistId( trackData.value( Field::ARTIST ).toString() );
-    int genre = genreId( trackData.value( Field::GENRE ).toString() );
-    int composer = composerId( trackData.value( Field::COMPOSER ).toString() );
-    int year = yearId( trackData.value( Field::YEAR ).toString() );
+    if( !compilationId )
+        album = albumId( albumName, albumArtistId );
 
     QString uid = trackData.value( Field::UNIQUEID ).toString();
 
@@ -473,131 +459,86 @@ ScanResultProcessor::addTrack( const QVariantMap &trackData, int albumArtistId )
 }
 
 int
-ScanResultProcessor::artistId( const QString &artist )
+ScanResultProcessor::genericId( const QString &key, const QString &value )
 {
-    if( m_artists.contains( artist ) )
-        return m_artists.value( artist );
-    QString query = QString( "SELECT id FROM artists_temp WHERE name = '%1';" ).arg( m_collection->escape( artist ) );
-    QStringList res = m_collection->query( query );
-    int id = 0;
-    if( res.isEmpty() )
-        id = artistInsert( artist );
+    QMap<QString, int> *currMap;
+    if( key == "artists" )
+        currMap = &m_artists;
+    else if( key == "genres" )
+        currMap = &m_genres;
+    else if( key == "years" )
+        currMap = &m_years;
+    else if( key == "composers" )
+        currMap = &m_composers;
     else
-        id = res[0].toInt();
-    m_artists.insert( artist, id );
-    return id;
-}
-
-int
-ScanResultProcessor::artistInsert( const QString &artist )
-{
-    QString insert = QString( "INSERT INTO artists_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( artist ) );
-    int id = m_collection->insert( insert, "artists_temp" );
-    return id;
-}
-
-int
-ScanResultProcessor::genreId( const QString &genre )
-{
-    if( m_genre.contains( genre ) )
-        return m_genre.value( genre );
-    QString query = QString( "SELECT id FROM genres_temp WHERE name = '%1';" ).arg( m_collection->escape( genre ) );
-    QStringList res = m_collection->query( query );
-    int id = 0;
-    if( res.isEmpty() )
-        id = genreInsert( genre );
-    else
-        id = res[0].toInt();
-    m_genre.insert( genre, id );
-    return id;
-}
-
-int
-ScanResultProcessor::genreInsert( const QString &genre )
-{
-    QString insert = QString( "INSERT INTO genres_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( genre ) );
-    int id = m_collection->insert( insert, "genres_temp" );
-    return id;
-}
-
-int
-ScanResultProcessor::composerId( const QString &composer )
-{
-    if( m_composer.contains( composer ) )
-        return m_composer.value( composer );
-    QString query = QString( "SELECT id FROM composers_temp WHERE name = '%1';" ).arg( m_collection->escape( composer ) );
-    QStringList res = m_collection->query( query );
-    int id = 0;
-    if( res.isEmpty() )
-        id = composerInsert( composer );
-    else
-        id = res[0].toInt();
-    m_composer.insert( composer, id );
-    return id;
-}
+    {
+        debug() << "Holy hell Batman, what just happened in genericId?";
+        return -9999;
+    }
 
-int
-ScanResultProcessor::composerInsert( const QString &composer )
-{
-    QString insert = QString( "INSERT INTO composers_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( composer ) );
-    int id = m_collection->insert( insert, "composers_temp" );
-    return id;
-}
+    if( currMap->contains( value ) )
+        return currMap->value( value );
 
-int
-ScanResultProcessor::yearId( const QString &year )
-{
-    if( m_year.contains( year ) )
-        return m_year.value( year );
-    QString query = QString( "SELECT id FROM years_temp WHERE name = '%1';" ).arg( m_collection->escape( year ) );
+    QString query = QString( "SELECT id FROM %1_temp WHERE name = '%2';" ).arg( key, m_collection->escape( value ) );
     QStringList res = m_collection->query( query );
     int id = 0;
     if( res.isEmpty() )
-        id = yearInsert( year );
+        id = genericInsert( key, value );
     else
         id = res[0].toInt();
-    m_year.insert( year, id );
+    currMap->insert( value, id );
     return id;
 }
 
 int
-ScanResultProcessor::yearInsert( const QString &year )
+ScanResultProcessor::genericInsert( const QString &key, const QString &value )
 {
-    QString insert = QString( "INSERT INTO years_temp( name ) VALUES ('%1');" ).arg( m_collection->escape( year ) );
-    int id = m_collection->insert( insert, "years_temp" );
+    QString insert = QString( "INSERT INTO %1_temp( name ) VALUES ('%2');" ).arg( key, m_collection->escape( value ) );
+    int id = m_collection->insert( insert, QString( "%1_temp" ).arg( key ) );
     return id;
 }
 
 void
-ScanResultProcessor::databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId )
+ScanResultProcessor::databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId, int compilationId )
 {
     //DEBUG_BLOCK
-    Q_UNUSED( album );
-    Q_UNUSED( albumArtistId );
+    QPair<QString, int> albumKey( album, albumArtistId );
+    bool albumFound = compilationId || m_albums.contains( albumKey );
+    bool artistFound = m_artists.contains( artist );
+    bool genreFound = m_genres.contains( genre );
+    bool composerFound = m_composers.contains( composer );
+    bool yearFound = m_years.contains( year );
+
+    if( albumFound && artistFound && genreFound && composerFound && yearFound )
+        return; //nothing to do
+
     int l = 0; //album
-    bool albumFound = false;
     int a = 0; //artist
-    bool artistFound = false;
     int g = 0; //genre
-    bool genreFound = false;
     int c = 0; //composer
-    bool composerFound = false;
     int y = 0; //year
-    bool yearFound = false;
 
     QString query;
-/*
-    if( albumArtistId == 0 )
-        query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist IS NULL AND name = '%1' " )
-                    .arg( m_collection->escape( album ) );
-    else
-        query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist = %1 AND name = '%2' " )
-                        .arg( QString::number( albumArtistId ), m_collection->escape( album ) );
-*/
-    query += QString( "SELECT id, CONCAT('ARTISTNAME_', name) AS name FROM artists_temp WHERE name = '%1' " ).arg( m_collection->escape( artist ) );
-    query += QString( "UNION ALL SELECT id, CONCAT('GENRENAME_', name) AS name FROM genres_temp WHERE name = '%1' " ).arg( m_collection->escape( genre ) );
-    query += QString( "UNION ALL SELECT id, CONCAT('COMPOSERNAME_', name) AS name FROM composers_temp WHERE name = '%1' " ).arg( m_collection->escape( composer ) );
-    query += QString( "UNION ALL SELECT id, CONCAT('YEARSNAME_', name) AS name FROM years_temp WHERE name = '%1';" ).arg( m_collection->escape( year ) );
+    if( !albumFound )
+    {
+        if( albumArtistId == 0 )
+            query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist IS NULL AND name = '%1' " )
+                        .arg( m_collection->escape( album ) );
+        else
+            query += QString( "SELECT id, CONCAT('ALBUMNAME_', name) AS name FROM albums_temp WHERE artist = %1 AND name = '%2' " )
+                            .arg( QString::number( albumArtistId ), m_collection->escape( album ) );
+    }
+    if( !artistFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('ARTISTNAME_', name) AS name FROM artists_temp WHERE name = '%1' " ).arg( m_collection->escape( artist ) );
+    if( !genreFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('GENRENAME_', name) AS name FROM genres_temp WHERE name = '%1' " ).arg( m_collection->escape( genre ) );
+    if( !composerFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('COMPOSERNAME_', name) AS name FROM composers_temp WHERE name = '%1' " ).arg( m_collection->escape( composer ) );
+    if( !yearFound )
+        query += QString( "UNION ALL SELECT id, CONCAT('YEARSNAME_', name) AS name FROM years_temp WHERE name = '%1';" ).arg( m_collection->escape( year ) );
+    if( query.startsWith( "UNION ALL " ) )
+        query.remove( 0, 10 );
+        
     QStringList res = m_collection->query( query );
     int index = 0;
     QString first;
@@ -607,58 +548,55 @@ ScanResultProcessor::databaseIdFetch( const QString &artist, const QString &genr
         first = res.at( index++ );
         second = res.at( index++ );
              a = first.toInt();
-        if( second == QString( "ALBUMNAME_" + album ) )
+        if( !albumFound && second == QString( "ALBUMNAME_" + album ) )
         {
             l = first.toInt();
             albumFound = true;
         }
-        else if( second == QString( "ARTISTNAME_" + artist ) )
+        else if( !artistFound && second == QString( "ARTISTNAME_" + artist ) )
         {
             a = first.toInt();
             artistFound = true;
         }
-        else if( second == QString( "GENRENAME_" + genre ) )
+        else if( !genreFound && second == QString( "GENRENAME_" + genre ) )
         {
             g = first.toInt();
             genreFound = true;
         }
-        else if( second == QString( "COMPOSERNAME_" + composer ) )
+        else if( !composerFound && second == QString( "COMPOSERNAME_" + composer ) )
         {
             c = first.toInt();
             composerFound = true;
         }
-        else if( second == QString( "YEARSNAME_" + year ) )
+        else if( !yearFound && second == QString( "YEARSNAME_" + year ) )
         {
             y = first.toInt();
             yearFound = true;
         }
     }
-    /*
     if( !albumFound )
     {
-        QPair<QString, int> key( album, albumArtistId );
-        m_albums.insert( key, albumInsert( album, albumArtistId ) );
+        m_albums.insert( albumKey, albumInsert( album, albumArtistId ) );
         albumFound = true;
     }
-    */
     if( !artistFound )
     {
-        m_artists.insert( artist, artistInsert( artist ) );
+        m_artists.insert( artist, genericInsert( "artists", artist ) );
         artistFound = true;
     }
     if( !genreFound )
     {
-        m_genre.insert( genre, genreInsert( genre ) );
+        m_genres.insert( genre, genericInsert( "genres", genre ) );
         genreFound = true;
     }
     if( !composerFound )
     {
-        m_composer.insert( composer, composerInsert( composer ) );
+        m_composers.insert( composer, genericInsert( "composers", composer ) );
         composerFound = true;
     }
     if( !yearFound )
     {
-        m_year.insert( year, yearInsert( year ) );
+        m_years.insert( year, genericInsert( "years", year ) );
         yearFound = true;
     }
 }
diff --git a/src/collection/sqlcollection/ScanResultProcessor.h b/src/collection/sqlcollection/ScanResultProcessor.h
index fffc9e7..49c2b8b 100644
--- a/src/collection/sqlcollection/ScanResultProcessor.h
+++ b/src/collection/sqlcollection/ScanResultProcessor.h
@@ -58,15 +58,9 @@ class ScanResultProcessor : public QObject
     private:
         void addTrack( const QVariantMap &trackData, int albumArtistId );
 
-        int artistId( const QString &artist );
-        int artistInsert( const QString &artist );
-        int genreId( const QString &genre );
-        int genreInsert( const QString &genre );
-        int composerId( const QString &composer );
-        int composerInsert( const QString &composer );
-        int yearId( const QString &year );
-        int yearInsert( const QString &year );
-        void databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId );
+        int genericId( const QString &key, const QString &value );
+        int genericInsert( const QString &key, const QString &value );
+        void databaseIdFetch( const QString &artist, const QString &genre, const QString &composer, const QString &year, const QString &album, int albumArtistId, int compilationId );
         int imageId( const QString &image, int albumId );
         int albumId( const QString &album, int artistId );
         int albumInsert( const QString &album, int artistId );
@@ -90,9 +84,9 @@ class ScanResultProcessor : public QObject
         bool m_setupComplete;
 
         QMap<QString, int> m_artists;
-        QMap<QString, int> m_genre;
-        QMap<QString, int> m_year;
-        QMap<QString, int> m_composer;
+        QMap<QString, int> m_genres;
+        QMap<QString, int> m_years;
+        QMap<QString, int> m_composers;
         QMap<QPair<QString, int>, int> m_albums;
         QMap<QPair<QString, int>, int> m_images;
         QMap<QString, int> m_directories;
diff --git a/src/collection/sqlcollection/SqlQueryMaker.cpp b/src/collection/sqlcollection/SqlQueryMaker.cpp
index a6f98fb..10cc629 100644
--- a/src/collection/sqlcollection/SqlQueryMaker.cpp
+++ b/src/collection/sqlcollection/SqlQueryMaker.cpp
@@ -992,6 +992,7 @@ SqlQueryMaker::handleArtists( const QStringList &result )
 void
 SqlQueryMaker::handleAlbums( const QStringList &result )
 {
+    DEBUG_BLOCK
     AlbumList albums;
     SqlRegistry* reg = m_collection->registry();
     for( QStringListIterator iter( result ); iter.hasNext(); )
@@ -999,6 +1000,10 @@ SqlQueryMaker::handleAlbums( const QStringList &result )
         QString name = iter.next();
         QString id = iter.next();
         QString artist = iter.next();
+        //HACK: The following is a HACK and should be fixed by fixing the HACK
+        //of always including the "tracks" table in queries in SqlQueryMaker
+        if( name.isEmpty() && id.isEmpty() && artist.isEmpty() )
+            continue;
         albums.append( reg->getAlbum( name, id.toInt(), artist.toInt() ) );
     }
     emitOrStoreProperResult( AlbumPtr, albums );
diff --git a/src/collection/umscollection/amarok_collection-umscollection.desktop b/src/collection/umscollection/amarok_collection-umscollection.desktop
index 0124c1b..1b016e0 100644
--- a/src/collection/umscollection/amarok_collection-umscollection.desktop
+++ b/src/collection/umscollection/amarok_collection-umscollection.desktop
@@ -15,6 +15,7 @@ Name[nn]=Universell masselagringssamling
 Name[pl]=Kolekcja na urz?dzeniu danych
 Name[pt]=Colec??o de Armazenamento em Massa Universal
 Name[pt_BR]=Cole??o de Armazenamento Universal em Massa
+Name[ru]=????????? UMS
 Name[sr]=?????? ?? ???????????? ???????? ?????????
 Name[sr at latin]=Zbirka na univerzalnom masovnom skladi?tu
 Name[sv]=Samling p? generell lagringsenhet
diff --git a/src/context/Applet.cpp b/src/context/Applet.cpp
index 38bc709..ab2c0ac 100644
--- a/src/context/Applet.cpp
+++ b/src/context/Applet.cpp
@@ -39,7 +39,8 @@ namespace Context
 Context::Applet::Applet( QObject * parent, const QVariantList& args )
     : Plasma::Applet( parent, args )
     , m_collapsed( false )
-    , m_animationId( 0 )
+    , m_animationIdOn( 0 )
+    , m_animationIdOff( 0 )
     , m_transient( 0 )
     , m_standardPadding( 6.0 )
     , m_textBackground( 0 )
@@ -50,8 +51,10 @@ Context::Applet::Applet( QObject * parent, const QVariantList& args )
 
 Context::Applet::~Applet( )
 {
-    if ( m_animationId != 0)
-        Plasma::Animator::self()->stopCustomAnimation( m_animationId );
+    if ( m_animationIdOn != 0 )
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOn );
+    if ( m_animationIdOff != 0 )
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOff );
 }
 
 
@@ -228,39 +231,51 @@ Context::Applet::addAction( QAction *action, const int size )
 void
 Context::Applet::setCollapseOn()
 {
+    // We are asked to collapse, but the applet is already animating to collapse, do nothing
+    if ( m_animationIdOn != 0 )
+        return;
+
+    // We are already collapsed
     if ( size().height() == m_heightCollapseOn )
         return;
+
     debug() << "collapsing applet to..." << m_heightCollapseOn;
     if( m_heightCollapseOff == -1 )
         m_animFromHeight = size().height();
     else
         m_animFromHeight = m_heightCollapseOff;
 
-    if ( m_animationId != 0 ) // warning we are moving right now
+    if ( m_animationIdOff != 0 ) // warning we are extanding right now we should stop
     {
         // stop the anim
-        Plasma::Animator::self()->stopCustomAnimation( m_animationId );
-        m_animationId = 0;
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOff );
+        m_animationIdOff = 0;
     }
     m_collapsed = false;
-    m_animationId = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOn" );
+    m_animationIdOn = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOn" );
 }
 
 void
 Context::Applet::setCollapseOff()
 {
     DEBUG_BLOCK
-    debug() << "height:" << size().height() << "target:" << m_heightCollapseOff << "m_collapsed:" << m_collapsed;
+
+    // We are asked to extend, but the applet is already animating to extend, do nothing
+    if ( m_animationIdOff != 0 )
+        return;
+    
+    // Applet already extended
     if ( size().height() == m_heightCollapseOff )
         return;
 
+    debug() << "height:" << size().height() << "target:" << m_heightCollapseOff << "m_collapsed:" << m_collapsed;
     if( m_heightCollapseOff == -1) // if it's self-expanding, don't animate as we don't know where we're going. also, if we're shrinking
     {                                                                       // stop that and expand regardless
-        // stop the anim
-        if( m_animationId != 0 )
+        // stop the animation on now
+        if( m_animationIdOn != 0 )
         {
-            Plasma::Animator::self()->stopCustomAnimation( m_animationId );
-            m_animationId = 0;
+            Plasma::Animator::self()->stopCustomAnimation( m_animationIdOn );
+            m_animationIdOn = 0;
         }
         m_heightCurrent =  m_heightCollapseOff;
         emit sizeHintChanged(Qt::PreferredSize);
@@ -269,14 +284,14 @@ Context::Applet::setCollapseOff()
         return;
     }
 
-    if ( m_animationId != 0 ) // warning we are moving right now
+    if ( m_animationIdOn != 0 ) // warning we are collapsing right now, stop that and reverse it !
     {
         // stop the anim
-        Plasma::Animator::self()->stopCustomAnimation( m_animationId );
-        m_animationId = 0;
+        Plasma::Animator::self()->stopCustomAnimation( m_animationIdOn );
+        m_animationIdOn = 0;
     }
     m_collapsed = true ;
-    m_animationId = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOff" );
+    m_animationIdOff = Plasma::Animator::self()->customAnimation(20, 1000, Plasma::Animator::EaseInCurve, this, "animateOff" );
 }
 
 void
@@ -285,6 +300,19 @@ Context::Applet::setCollapseHeight( int h )
     m_heightCollapseOn = h;
 }
 
+bool
+Context::Applet::isAppletCollapsed()
+{
+    return ( m_heightCollapseOn == m_heightCurrent );
+}
+
+bool
+Context::Applet::isAppletExtended()
+{
+    return ( m_heightCollapseOff == m_heightCurrent );
+}
+
+
 void
 Context::Applet::animateOn( qreal anim )
 {
@@ -302,22 +330,20 @@ Context::Applet::animateOff( qreal anim )
 void
 Context::Applet::animateEnd( int id )
 {
-    if( id == m_animationId )
+    if( id == m_animationIdOn )
     {
-        if( !m_collapsed )
-        {
-            Plasma::Applet::resize( size().width(), m_heightCollapseOn );
-            m_collapsed = true;
-        }
-        else
-        {
-            Plasma::Applet::resize( size().width(), m_heightCollapseOff );
-            m_collapsed = false;
-        }
-        updateGeometry();
-        emit sizeHintChanged(Qt::PreferredSize);
-        m_animationId = 0;
+        Plasma::Applet::resize( size().width(), m_heightCollapseOn );
+        m_collapsed = true;
+        m_animationIdOn = 0;
+    }
+    if ( id == m_animationIdOff )
+    {
+        Plasma::Applet::resize( size().width(), m_heightCollapseOff );
+        m_collapsed = false;
+        m_animationIdOff = 0;
     }
+    updateGeometry();
+    emit sizeHintChanged(Qt::PreferredSize);
 }
 
 
diff --git a/src/context/Applet.h b/src/context/Applet.h
index 7811624..9f86158 100644
--- a/src/context/Applet.h
+++ b/src/context/Applet.h
@@ -62,6 +62,9 @@ class AMAROK_EXPORT Applet : public Plasma::Applet
         void setCollapseOff();
         void setCollapseHeight( int );
 
+        bool isAppletCollapsed();
+        bool isAppletExtended();
+
         /**
           * sizeHint is reimplemented here only for all the applet.
           */
@@ -86,7 +89,8 @@ class AMAROK_EXPORT Applet : public Plasma::Applet
         int  m_heightCurrent;
         int  m_heightCollapseOn;
         int  m_heightCollapseOff;
-        int  m_animationId;
+        int  m_animationIdOn;
+        int  m_animationIdOff;
         int  m_animFromHeight;
 
     private:
diff --git a/src/context/applets/info/amarok-context-applet-info.desktop b/src/context/applets/info/amarok-context-applet-info.desktop
index 7c61815..81f2e1d 100644
--- a/src/context/applets/info/amarok-context-applet-info.desktop
+++ b/src/context/applets/info/amarok-context-applet-info.desktop
@@ -16,6 +16,7 @@ Name[nn]=Info
 Name[pl]=Informacja
 Name[pt]=Informa??o
 Name[pt_BR]=Informa??o
+Name[ru]=????????
 Name[sr]=??????
 Name[sr at latin]=Podaci
 Name[sv]=Information
diff --git a/src/context/applets/photos/PhotosApplet.cpp b/src/context/applets/photos/PhotosApplet.cpp
index 4cc4714..884a7f3 100644
--- a/src/context/applets/photos/PhotosApplet.cpp
+++ b/src/context/applets/photos/PhotosApplet.cpp
@@ -116,7 +116,7 @@ PhotosApplet::~PhotosApplet()
 void
 PhotosApplet::engineNewTrackPlaying( )
 {
- //   DEBUG_BLOCK
+    DEBUG_BLOCK
     m_stoppedstate = false;
     dataEngine( "amarok-photos" )->query( QString( "photos" ) );
 }
@@ -124,13 +124,14 @@ PhotosApplet::engineNewTrackPlaying( )
 void
 PhotosApplet::enginePlaybackEnded( int, int, PlaybackEndedReason )
 {
-//    DEBUG_BLOCK
+    DEBUG_BLOCK
     m_stoppedstate = true;;
     m_headerText->setText( i18n( "Photos" ) + QString( " : " ) + i18n( "No track playing" ) );
     m_widget->clear();
     m_widget->hide();
     setBusy( false );
     setCollapseOn();
+    dataEngine( "amarok-photos" )->query( QString( "photos:stopped" ) );
 }
 
 void 
@@ -215,14 +216,22 @@ PhotosApplet::dataUpdated( const QString& name, const Plasma::DataEngine::Data&
     }
     else if ( data.contains( "data" ) )
     {
-        m_headerText->setText( i18n( "Photos" ) + QString( " : " ) + data[ "artist" ].toString() );
-        updateConstraints();
-        update();
-        setCollapseOff();
-        // Send the data to the scrolling widget
-        m_widget->setPixmapList( data[ "data" ].value< QList < PhotosInfo * > >() );
-        m_widget->show();
-        setBusy(false);
+        // Do not show some picture if we're still animating as it can lead to trouble
+        // let's hope animating time will be shorter than fetching time of all the picture :/
+        // this also prevent the stupid effect of reanimating several time.
+        if ( isAppletExtended() )
+        {
+            m_headerText->setText( i18n( "Photos" ) + QString( " : " ) + data[ "artist" ].toString() );
+            updateConstraints();
+            update();
+            setCollapseOff();
+            // Send the data to the scrolling widget
+            m_widget->setPixmapList( data[ "data" ].value< QList < PhotosInfo * > >() );
+            m_widget->show();
+            setBusy(false);
+        }
+        else
+            return;
     }
     updateConstraints();
     update();
diff --git a/src/context/applets/photos/PhotosScrollWidget.cpp b/src/context/applets/photos/PhotosScrollWidget.cpp
index 71d3d28..31c71ad 100644
--- a/src/context/applets/photos/PhotosScrollWidget.cpp
+++ b/src/context/applets/photos/PhotosScrollWidget.cpp
@@ -112,90 +112,94 @@ void PhotosScrollWidget::setPixmapList (QList < PhotosInfo * > list)
     if ( list == m_currentlist )
         return;
 
-    debug() << "adding " << list.count() << "new pics";
+  //  debug() << "adding " << list.count() << "new pics";
     // If a new one arrived, we change.
     foreach( PhotosInfo *item, list )
     {
         if ( !m_currentlist.contains( item ) )
         {
-            switch ( m_mode )
+            if ( !item->photo->isNull() )
             {
-                case PHOTOS_MODE_INTERACTIVE :
+                switch ( m_mode )
                 {
-
-                    if ( !m_id ) // careful we're animating
+                    case PHOTOS_MODE_INTERACTIVE :
                     {
-                        Plasma::Animator::self()->stopCustomAnimation( m_id );
-                        m_id = 0;
-                    }
-                    DragPixmapItem *dragpix = new DragPixmapItem( this );
-                    dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
-                    item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
-                    dragpix->setPos( m_actualpos, 0 );
-                    dragpix->SetClickableUrl( item->urlpage );
-                    dragpix->show();
 
-                    m_pixmaplist << dragpix;
+                        if ( !m_id ) // careful we're animating
+                        {
+                            Plasma::Animator::self()->stopCustomAnimation( m_id );
+                            m_id = 0;
+                        }
 
-                    int delta = dragpix->boundingRect().width() + m_margin;
-                    m_scrollmax += delta;
-                    m_actualpos += delta;
+                        DragPixmapItem *dragpix = new DragPixmapItem( this );
+                        dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
+                        item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
+                        dragpix->setPos( m_actualpos, 0 );
+                        dragpix->SetClickableUrl( item->urlpage );
+                        dragpix->show();
 
-                    break;
-                }
-                case PHOTOS_MODE_AUTOMATIC :
-                {
+                        m_pixmaplist << dragpix;
 
-                    DragPixmapItem *dragpix = new DragPixmapItem( this );
-                    dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
-                        item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
-                    dragpix->SetClickableUrl( item->urlpage );
+                        int delta = dragpix->boundingRect().width() + m_margin;
+                        m_scrollmax += delta;
+                        m_actualpos += delta;
 
-                    if ( m_id == 0 ) // only pos and show if no animation, otherwise it will be set at the end automatically
+                        break;
+                    }
+                    case PHOTOS_MODE_AUTOMATIC :
                     {
-                        if ( ! m_pixmaplist.empty() )
-                        {
-                            dragpix->setPos( m_pixmaplist.last()->boundingRect().width() + m_pixmaplist.last()->pos().x() + m_margin , 0 ) ;
-                            dragpix->show();
-                        }
-                        else
+
+                        DragPixmapItem *dragpix = new DragPixmapItem( this );
+                        dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
+                            item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
+                        dragpix->SetClickableUrl( item->urlpage );
+
+                        if ( m_id == 0 ) // only pos and show if no animation, otherwise it will be set at the end automatically
                         {
-                            m_actualpos = 0;
-                            dragpix->setPos( m_actualpos, 0 ) ;
-                            dragpix->show();
+                            if ( ! m_pixmaplist.empty() )
+                            {
+                                dragpix->setPos( m_pixmaplist.last()->boundingRect().width() + m_pixmaplist.last()->pos().x() + m_margin , 0 ) ;
+                                dragpix->show();
+                            }
+                            else
+                            {
+                                m_actualpos = 0;
+                                dragpix->setPos( m_actualpos, 0 ) ;
+                                dragpix->show();
+                            }
                         }
-                    }
 
-                    m_pixmaplist << dragpix;
+                        m_pixmaplist << dragpix;
 
-                    // set a timer after and launch
-                    QTimer::singleShot( m_interval, this, SLOT( automaticAnimBegin() ) );
+                        // set a timer after and launch
+                        QTimer::singleShot( m_interval, this, SLOT( automaticAnimBegin() ) );
 
-                    break;
-                }
-                case PHOTOS_MODE_FADING :
-                {
-
-                    DragPixmapItem *dragpix = new DragPixmapItem( this );
-                    dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
-                    item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
-                    dragpix->setPos( ( size().width() - dragpix->boundingRect().width() ) / 2, 0 );
-                    dragpix->SetClickableUrl( item->urlpage );
-                    dragpix->hide();
-                    m_pixmaplist << dragpix;
-                    if ( m_pixmaplist.size() == 1 )
-                    {
-                        dragpix->show();
-                        m_timer->start( m_interval );
+                        break;
                     }
+                    case PHOTOS_MODE_FADING :
+                    {
 
-                    break;
+                        DragPixmapItem *dragpix = new DragPixmapItem( this );
+                        dragpix->setPixmap( The::svgHandler()->addBordersToPixmap(
+                        item->photo->scaledToHeight( (int) size().height() - 4 * m_margin,  Qt::SmoothTransformation ), 5, "", true ) );
+                        dragpix->setPos( ( size().width() - dragpix->boundingRect().width() ) / 2, 0 );
+                        dragpix->SetClickableUrl( item->urlpage );
+                        dragpix->hide();
+                        m_pixmaplist << dragpix;
+                        if ( m_pixmaplist.size() == 1 )
+                        {
+                            dragpix->show();
+                            m_timer->start( m_interval );
+                        }
+
+                        break;
+                    }
                 }
             }
         }
     }
     m_currentlist = list;
-    debug() << "total count: " << m_pixmaplist.count();
+  //  debug() << "total count: " << m_pixmaplist.count();
 }
 
 void PhotosScrollWidget::hoverEnterEvent(QGraphicsSceneHoverEvent*)
@@ -266,10 +270,13 @@ void PhotosScrollWidget::resize(qreal wid, qreal hei)
         {
             foreach (DragPixmapItem *item, m_pixmaplist)
             {
-                if ( size().height() != hei )
-                    item->setPixmap( item->pixmap().scaledToHeight( (int) hei - 4 * m_margin,  Qt::SmoothTransformation ) );
-                if ( size().width() != wid )
-                    item->setPos( ( wid - item->boundingRect().width() ) / 2, 0 );
+                if ( !item->pixmap().isNull() )
+                {
+                    if ( size().height() != hei )
+                        item->setPixmap( item->pixmap().scaledToHeight( (int) hei - 4 * m_margin,  Qt::SmoothTransformation ) );
+                    if ( size().width() != wid )
+                        item->setPos( ( wid - item->boundingRect().width() ) / 2, 0 );
+                }
             }
             break;
         }
diff --git a/src/context/applets/photos/amarok-context-applet-photos.desktop b/src/context/applets/photos/amarok-context-applet-photos.desktop
index 2fed337..86662e8 100644
--- a/src/context/applets/photos/amarok-context-applet-photos.desktop
+++ b/src/context/applets/photos/amarok-context-applet-photos.desktop
@@ -17,6 +17,7 @@ Name[nn]=Bilete
 Name[pl]=Zdj?cia
 Name[pt]=Fotografias
 Name[pt_BR]=Fotos
+Name[ru]=??????????
 Name[sr]=???????????
 Name[sr at latin]=Fotografije
 Name[sv]=Foton
diff --git a/src/context/engines/current/amarok-data-engine-current.desktop b/src/context/engines/current/amarok-data-engine-current.desktop
index 663153f..45354b9 100644
--- a/src/context/engines/current/amarok-data-engine-current.desktop
+++ b/src/context/engines/current/amarok-data-engine-current.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych bie??cych informacji
 Name[pt]=Motor de Dados da Informa??o Actual
 Name[pt_BR]=Mecanismo de Dados das Informa??es Atuais
 Name[ro]=Motor de date Informa?ie curent?
-Name[ru]=?????? ?????? ??? ??????? ????????
+Name[ru]=???????? ?????? ??? ??????? ????????
 Name[sl]=Podatkovni pogon za podatke trenutni skladbi
 Name[sr]=????????? ??????? ????????
 Name[sr at latin]=Datomotor teku?ih podataka
diff --git a/src/context/engines/info/amarok-data-engine-info.desktop b/src/context/engines/info/amarok-data-engine-info.desktop
index a29040c..de16b6b 100644
--- a/src/context/engines/info/amarok-data-engine-info.desktop
+++ b/src/context/engines/info/amarok-data-engine-info.desktop
@@ -14,6 +14,7 @@ Name[nn]=Datamotor for informasjon
 Name[pl]=Modu? danych informacji
 Name[pt]=Motor de Dados da Informa??o
 Name[pt_BR]=Mecanismo de Dados das Informa??es
+Name[ru]=???????? ?????? ??? ????????
 Name[sr]=????????? ????????
 Name[sr at latin]=Datomotor podataka
 Name[sv]=Datagr?nssnitt f?r information
diff --git a/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop b/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop
index fcdb189..134176e 100644
--- a/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop
+++ b/src/context/engines/lyrics/amarok-data-engine-lyrics.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych tekst?w
 Name[pt]=Motor de Dados de Letras Musicais
 Name[pt_BR]=Mecanismo de Dados das Letras
 Name[ro]=Motor de date Versuri
-Name[ru]=?????? ?????? ??? ??????? ?????
+Name[ru]=???????? ?????? ??? ??????? ?????
 Name[sl]=Podatkovni pogon za besedila
 Name[sr]=????????? ???????
 Name[sr at latin]=Datomotor stihova
diff --git a/src/context/engines/photos/PhotosEngine.cpp b/src/context/engines/photos/PhotosEngine.cpp
index 7558da8..dfb13af 100644
--- a/src/context/engines/photos/PhotosEngine.cpp
+++ b/src/context/engines/photos/PhotosEngine.cpp
@@ -65,6 +65,7 @@ PhotosEngine::sources() const
 bool 
 PhotosEngine::sourceRequestEvent( const QString& name )
 {
+    DEBUG_BLOCK
     m_requested = true; // someone is asking for data, so we turn ourselves on :)
     QStringList tokens = name.split( ':' );
 
@@ -86,7 +87,18 @@ PhotosEngine::sourceRequestEvent( const QString& name )
             m_reload = true;
         }
     }
-        
+
+    // we've been notified by the applet to be in state stop <3
+    else if ( tokens.contains( "stopped" ) && tokens.size() > 1 )
+    {
+        if ( tokens.at( 1 ) == QString( "stopped" ) )
+        {
+            removeSource( "photos" );
+            m_reload = true;
+            return false;
+        }
+    }
+    
     removeAllData( name );
     setData( name, QVariant() );
     update();
diff --git a/src/context/engines/photos/amarok-data-engine-photos.desktop b/src/context/engines/photos/amarok-data-engine-photos.desktop
index c0e893f..d11c43c 100644
--- a/src/context/engines/photos/amarok-data-engine-photos.desktop
+++ b/src/context/engines/photos/amarok-data-engine-photos.desktop
@@ -15,6 +15,7 @@ Name[nn]=Datamotor for bilete
 Name[pl]=Modu? danych zdj??
 Name[pt]=Motor de Dados de Fotografias
 Name[pt_BR]=Mecanismo de Dados de Fotos
+Name[ru]=???????? ?????? ??????????
 Name[sr]=????????? ???????????
 Name[sr at latin]=Datomotor fotografija
 Name[sv]=Datagr?nssnitt f?r foton
diff --git a/src/context/engines/songkick/amarok-data-engine-songkick.desktop b/src/context/engines/songkick/amarok-data-engine-songkick.desktop
index ee1ca93..2213533 100644
--- a/src/context/engines/songkick/amarok-data-engine-songkick.desktop
+++ b/src/context/engines/songkick/amarok-data-engine-songkick.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych Songkick
 Name[pt]=Motor de Dados do Songkick
 Name[pt_BR]=Mecanismo de Dados do Songkick
 Name[ro]=Motor de date Songkick
-Name[ru]=?????? ?????? Songkick
+Name[ru]=???????? ?????? Songkick
 Name[sl]=Podatkovni pogon za Songkick
 Name[sr]=????????? ????????
 Name[sr at latin]=Datomotor Songkicka
diff --git a/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop b/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop
index 9fce5d7..7d3c98b 100644
--- a/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop
+++ b/src/context/engines/videoclip/amarok-data-engine-videoclip.desktop
@@ -20,7 +20,7 @@ Name[pa]=????? ????? ???? ????
 Name[pl]=Modu? danych klip?w wideo
 Name[pt]=Motor de Dados de 'Clips' de V?deo
 Name[pt_BR]=Motor de dados de clipe de v?deo
-Name[ru]=?????? ?????? ??? ???????????
+Name[ru]=???????? ?????? ??? ???????????
 Name[sl]=Podatkovni pogon za video posnetke
 Name[sr]=????????? ????? ???????
 Name[sr at latin]=Datomotor video ise?aka
diff --git a/src/context/engines/wikipedia/WikipediaEngine.cpp b/src/context/engines/wikipedia/WikipediaEngine.cpp
index 11023cb..13de58d 100644
--- a/src/context/engines/wikipedia/WikipediaEngine.cpp
+++ b/src/context/engines/wikipedia/WikipediaEngine.cpp
@@ -222,9 +222,11 @@ WikipediaEngine::wikiResult( KJob* job )
         m_wiki = QString::fromUtf8( storedJob->data().data(), storedJob->data().size() );
 
 
-    // Refined search thing
+    // FIXME: For now we test if we got an article or not with a test on this string "wgArticleId=0"
+    // This is bad
     if( m_wiki.contains( "wgArticleId=0" ) ) // The article does not exist
     {
+        // Refined search is done here 
         if ( m_triedRefinedSearch == -1 )
         {
             debug() << "We already tried some refined search. Lets end this madness...";
diff --git a/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop b/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
index 4e864eb..a97fc3c 100644
--- a/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
+++ b/src/context/engines/wikipedia/amarok-data-engine-wikipedia.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych Wikipedii
 Name[pt]=Motor de Dados do Wikip?dia
 Name[pt_BR]=Mecanismo de Dados da Wikipedia
 Name[ro]=Motor de date Wikipedia
-Name[ru]=?????? ?????? ?????????
+Name[ru]=???????? ?????? ?????????
 Name[sl]=Podatkovni pogon za Wikipedijo
 Name[sr]=????????? ??????????
 Name[sr at latin]=Datomotor Wikipedije
diff --git a/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop b/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop
index 499c587..d4b50e9 100644
--- a/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop
+++ b/src/context/scriptengine/javascript/amarok-scriptengine-applet-simple-javascript.desktop
@@ -18,6 +18,7 @@ Name[nn]=JavaScript-element for Amarok
 Name[pl]=Aplet JavaScriptu Amaroka
 Name[pt]='Applet' de JavaScript do Amarok
 Name[pt_BR]=Miniaplicativo JavaScript do Amarok
+Name[ru]=????? JavaScript ??? Amarok
 Name[sr]=???????????? ????? ?? ??????
 Name[sr at latin]=Javascript aplet za Amarok
 Name[sv]=Amarok Javascript-miniprogram
@@ -45,6 +46,7 @@ Comment[nn]=Innebygd Amarok-element skriven i JavaScript
 Comment[pl]=Natywny applet Amaroka napisany w JavaScripcie
 Comment[pt]=Uma 'applet' nativa do Amarok, feita em JavaScript
 Comment[pt_BR]=Miniaplicativo nativo do Amarok escrito em JavaScript
+Comment[ru]=????? Amarok, ?????????? ?? ????? JavaScript
 Comment[sr]=?????????? ???????? ????? ??????? ? ???????????
 Comment[sr at latin]=Samosvojni Amarokov aplet napisan u JavaScriptu
 Comment[sv]=Eget Amarok miniprogram skrivet i Javascript
diff --git a/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop b/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop
index aa79d73..5672b8f 100644
--- a/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop
+++ b/src/context/scriptengine/javascript/amarok-scriptengine-runner-javascript.desktop
@@ -17,6 +17,7 @@ Name[nn]=JavaScript-k?yrar for Amarok
 Name[pl]=JavaScript Runner Amaroka
 Name[pt]=Execu??o de JavaScript do Amarok
 Name[pt_BR]=Executor JavaScript do Amarok
+Name[ru]=?????? ??????? JavaScript ??? Amarok
 Name[sr]=???????? ??????? ???????????
 Name[sr at latin]=Amarokov izvo?a? JavaScripta
 Name[sv]=Amarok Javascript-k?rprogram
diff --git a/src/context/servicetypes/amarok_data_engine.desktop b/src/context/servicetypes/amarok_data_engine.desktop
index 6e42b2b..fac1d1f 100644
--- a/src/context/servicetypes/amarok_data_engine.desktop
+++ b/src/context/servicetypes/amarok_data_engine.desktop
@@ -33,7 +33,7 @@ Name[pl]=Modu? danych Amaroka
 Name[pt]=Motor de Dados do Amarok
 Name[pt_BR]=Motor de Dados do Amarok
 Name[ro]=Motor de date Amarok
-Name[ru]=?????? ?????? Amarok
+Name[ru]=???????? ?????? Amarok
 Name[sl]=Podatkovni pogon za Amarok
 Name[sr]=????????? ???????
 Name[sr at latin]=Datomotor Amaroka
@@ -83,7 +83,7 @@ Comment[pl]=Modu? danych Amaroka
 Comment[pt]=Motor de Dados do Amarok
 Comment[pt_BR]=Mecanismo de Dados do Amarok
 Comment[ro]=Motor de date Amarok
-Comment[ru]=?????? ?????? Amarok
+Comment[ru]=???????? ?????? Amarok
 Comment[sl]=Podatkovni pogon za Amarok
 Comment[sr]=????????? ???????
 Comment[sr at latin]=Datomotor Amaroka
diff --git a/src/dialogs/TagDialog.cpp b/src/dialogs/TagDialog.cpp
index 58f2ef4..08df868 100644
--- a/src/dialogs/TagDialog.cpp
+++ b/src/dialogs/TagDialog.cpp
@@ -888,7 +888,7 @@ void TagDialog::readTags()
     if( m_currentData.contains( Meta::Field::COMPOSER ) )
         selectOrInsertText( m_currentData.value( Meta::Field::COMPOSER ).toString(), ui->kComboBox_composer );
     else
-        selectOrInsertText( QString(), ui->kComboBox_genre );
+        selectOrInsertText( QString(), ui->kComboBox_composer );
     ui->ratingWidget->setRating( m_currentData.value( Meta::Field::RATING ).toInt() );
     ui->ratingWidget->setMaxRating( 10 );
     ui->qSpinBox_track->setValue( m_currentData.value( Meta::Field::TRACKNUMBER ).toInt() );
diff --git a/src/images/splash_screen.jpg b/src/images/splash_screen.jpg
index 6521ead..70a633b 100644
Binary files a/src/images/splash_screen.jpg and b/src/images/splash_screen.jpg differ
diff --git a/src/main.cpp b/src/main.cpp
index 85e7c88..ebc8300 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,7 @@ int main( int argc, char *argv[] )
             ki18n("Developer (hydrogen)"), "parallelgrapefruit at gmail.com" );
     aboutData.addAuthor( ki18n("Ian 'The Beard' Monroe"),
             ki18n("Developer (eean)"), "ian at monroe.nu", "http://www.monroe.nu/" );
-    aboutData.addAuthor( ki18n("Jeff 'IROCKSOHARD' Mitchell"),
+    aboutData.addAuthor( ki18n("Jeff 'IROKSOHARD' Mitchell"),
             ki18n("Developer (jefferai)"), "mitchell at kde.org", "http://amarok.kde.org/blog/categories/13-jefferai" );
     aboutData.addAuthor( ki18n("Leo Franchi"),
             ki18n("Developer (lfranchi)"), "lfranchi at kde.org" );
diff --git a/src/playlist/PlaylistModel.cpp b/src/playlist/PlaylistModel.cpp
index b46300c..c6ad616 100644
--- a/src/playlist/PlaylistModel.cpp
+++ b/src/playlist/PlaylistModel.cpp
@@ -610,6 +610,7 @@ Playlist::Model::metadataChanged( Meta::TrackPtr track )
         {
             emit dataChanged( createIndex( i, 0 ), createIndex( i, columnCount() - 1 ) );
             emit metadataUpdated();
+            debug()<<"Metadata updated for track"<<track->prettyName();
             break;
         }
     }
@@ -621,13 +622,12 @@ Playlist::Model::metadataChanged( Meta::AlbumPtr album )
     Meta::TrackList tracks = album->tracks();
     foreach( Meta::TrackPtr track, tracks )
         metadataChanged( track );
+    debug()<<"Album metadata changed";
 }
 
 bool
 Playlist::Model::exportPlaylist( const QString &path ) const
 {
-    DEBUG_BLOCK
-    debug() << "WARNING: You shouldn't see this at any time except on exit.";
     return The::playlistManager()->exportPlaylist( tracks(), path );
 }
 
diff --git a/src/playlist/proxymodels/FilterProxy.cpp b/src/playlist/proxymodels/FilterProxy.cpp
index 2341be4..5254236 100644
--- a/src/playlist/proxymodels/FilterProxy.cpp
+++ b/src/playlist/proxymodels/FilterProxy.cpp
@@ -32,7 +32,7 @@ FilterProxy::FilterProxy( AbstractModel *belowModel, QObject *parent )
     connect( sourceModel(), SIGNAL( removedIds( const QList<quint64>& ) ), this, SLOT( slotRemovedIds( const QList<quint64>& ) ) );
     connect( sourceModel(), SIGNAL( activeTrackChanged( const quint64 ) ), this, SIGNAL( activeTrackChanged( quint64 ) ) );
     connect( sourceModel(), SIGNAL( metadataUpdated() ), this, SIGNAL( metadataUpdated() ) );
-    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( invalidate() ) );
+    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( slotInvalidateFilter() ) );
 
     KConfigGroup config = Amarok::config("Playlist Search");
     m_passThrough = !config.readEntry( "ShowOnlyMatches", true );
diff --git a/src/playlist/proxymodels/FilterProxy.h b/src/playlist/proxymodels/FilterProxy.h
index 47876ad..65ece09 100644
--- a/src/playlist/proxymodels/FilterProxy.h
+++ b/src/playlist/proxymodels/FilterProxy.h
@@ -122,6 +122,12 @@ protected slots:
      */
     void slotRemovedIds( const QList<quint64> &ids );
 
+    /**
+     * Slot that wraps around the method invalidateFilter() so one doesn't trigger the
+     * sorting invalidation too by using invalidate().
+     */
+    void slotInvalidateFilter(){ invalidateFilter(); }
+
 signals:
     /**
      * Signal forwarded from the source model.
diff --git a/src/playlist/proxymodels/SortProxy.cpp b/src/playlist/proxymodels/SortProxy.cpp
index 46653c1..efba2cd 100644
--- a/src/playlist/proxymodels/SortProxy.cpp
+++ b/src/playlist/proxymodels/SortProxy.cpp
@@ -35,7 +35,7 @@ SortProxy::SortProxy( AbstractModel *belowModel, QObject *parent )
     connect( sourceModel(), SIGNAL( removedIds( const QList<quint64>& ) ), this, SIGNAL( removedIds( const QList< quint64 >& ) ) );
     connect( sourceModel(), SIGNAL( activeTrackChanged( const quint64 ) ), this, SIGNAL( activeTrackChanged( quint64 ) ) );
     connect( sourceModel(), SIGNAL( metadataUpdated() ), this, SIGNAL( metadataUpdated() ) );
-    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( invalidate() ) );
+    connect( this, SIGNAL( metadataUpdated() ), this, SLOT( invalidateSorting() ) );
 
     //needed by GroupingProxy:
     connect( sourceModel(), SIGNAL( layoutChanged() ), this, SIGNAL( layoutChanged() ) );
@@ -48,6 +48,27 @@ SortProxy::~SortProxy()
 void
 SortProxy::invalidateSorting()
 {
+    if( m_scheme.length() )
+    {
+        if( !( m_scheme.level( m_scheme.length() - 1 ).category() == -1 ) ) //if it's not random
+        {
+            invalidate();
+        }
+    }
+    else
+        invalidate();
+    //FIXME: this is a band-aid so that the playlist doesn't reshuffle every time the current track changes
+    // However the real issue is deeper, the Observer seems to notify metadataChanged() even if the metadata
+    // of a track doesn't change but just the currently active track changes, and this results in the playlist
+    // being resorted on every "next", "previous" or track selection. Twice. This is a Bad Thing (TM) and very
+    // inefficient.
+    // We're shipping 2.2 as it is, because it's way too late to go poking around Observer, but this needs
+    // to be solved ASAP post-2.2.      --T?o 23/9/2009
+}
+
+void
+SortProxy::resetSorting()
+{
     m_scheme = SortScheme();
     reset();
 }
@@ -64,7 +85,7 @@ SortProxy::lessThan( const QModelIndex & left, const QModelIndex & right ) const
 void
 SortProxy::updateSortMap( SortScheme scheme )
 {
-    invalidateSorting();
+    resetSorting();
     m_scheme = scheme;
     sort( 0 );  //0 is a dummy column
     //HACK: sort() inverts the sortOrder on each call, this keeps the order ascending.
diff --git a/src/playlist/proxymodels/SortProxy.h b/src/playlist/proxymodels/SortProxy.h
index ebc745f..36cb704 100644
--- a/src/playlist/proxymodels/SortProxy.h
+++ b/src/playlist/proxymodels/SortProxy.h
@@ -63,7 +63,7 @@ public slots:
     /**
      * Resets the proxy to its original pass-through state.
      */
-    void invalidateSorting();
+    void resetSorting();
 
 protected:
     /**
@@ -82,6 +82,12 @@ protected:
      */
     virtual int rowToSource( int row ) const;
 
+protected slots:
+    /**
+     * Reapplies the current sorting scheme.
+     */
+    void invalidateSorting();
+
 private:
     SortScheme m_scheme;               //! The current sorting scheme.
 };
diff --git a/src/services/mp3tunes/amarok_service_mp3tunes.desktop b/src/services/mp3tunes/amarok_service_mp3tunes.desktop
index d2b3a79..8b0937d 100644
--- a/src/services/mp3tunes/amarok_service_mp3tunes.desktop
+++ b/src/services/mp3tunes/amarok_service_mp3tunes.desktop
@@ -70,7 +70,7 @@ Comment[pl]=Przegl?daj i s?uchaj muzyki przechowywanej na twoim koncie Mp3tune
 Comment[pt]=Navegar e escutar a m?sica gravada na sua conta do mp3tunes
 Comment[pt_BR]=Navegue e escute as m?sicas armazenadas na sua conta do mp3tunes
 Comment[ro]=R?sfoi?i ?i asculta?i muzica stocat? ?n contul dumneavoastr? mp3tunes
-Comment[ru]=????? ? ????????????? ??????, ??????????? ? ???????? Mp3tunes
+Comment[ru]=????? ? ????????????? ??????, ??????????? ? ??????? ?????? Mp3tunes
 Comment[sl]=Brskajte po glasbi, ki jo imate shranjeno na svojem ra?unu MP3tunes, in jo poslu?ajte
 Comment[sr]=??????????? ? ???????? ?????? ?? ???? ?????? ?? ??3???????
 Comment[sr at latin]=Pregledajte i slu?ajte muziku sa svog naloga na MP3Tunesu
diff --git a/src/services/opmldirectory/amarok_service_opmldirectory.desktop b/src/services/opmldirectory/amarok_service_opmldirectory.desktop
index f821e17..03c08c8 100644
--- a/src/services/opmldirectory/amarok_service_opmldirectory.desktop
+++ b/src/services/opmldirectory/amarok_service_opmldirectory.desktop
@@ -27,7 +27,7 @@ Name[pl]=Katalog podcast?w
 Name[pt]=Pasta de 'Podcasts'
 Name[pt_BR]=Podcast Directory
 Name[ro]=Director Podcast
-Name[ru]=??????? ??? podcast'??
+Name[ru]=??????? ?????????
 Name[sl]=Imenik podcastov
 Name[sr]=???????? ??????????
 Name[sr at latin]=Fascikla podemisija
@@ -69,7 +69,7 @@ Comment[pl]=Przegl?daj i zapisz si? do ogromnej listy podcast?w
 Comment[pt]=Navegar e inscrever numa enorme lista de 'podcasts'
 Comment[pt_BR]=Navegue e inscr?va-se ? uma lista enorme de podcasts
 Comment[ro]=R?sfoi?i ?i abona?i-v? la o list? uria?? de podcasturi
-Comment[ru]=????? ? ???????? ?? ???????? ?????? podcast'??
+Comment[ru]=????? ? ???????? ?? ???????? ?????? ?????????
 Comment[sl]=Brskajte po obse?ni zbirki podcastov in se naro?ite nanje
 Comment[sr]=??????????? ? ??????????? ?? ?? ??????? ????? ??????????
 Comment[sr at latin]=Pregledajte i pretplatite se na ogromnu listu podemisija



From mclasen at fedoraproject.org  Thu Sep 24 01:42:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:42:23 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.286,1.287
Message-ID: <20090924014224.0CD6C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16307

Modified Files:
	NetworkManager.spec 
Log Message:
Apply GConf schemas



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- NetworkManager.spec	21 Sep 2009 21:24:31 -0000	1.286
+++ NetworkManager.spec	24 Sep 2009 01:42:23 -0000	1.287
@@ -16,7 +16,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -236,11 +236,25 @@ exit 0
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 
+%pre gnome
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -250,7 +264,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO 
+%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
@@ -328,6 +342,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.7.996-3.git20090921
+- Install GConf schemas
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-2.git20090921
 - nm: allow disconnection of all device types
 - nm: ensure that wired connections are torn down when their hardware goes away



From mclasen at fedoraproject.org  Thu Sep 24 01:43:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:43:18 +0000 (UTC)
Subject: rpms/libbonoboui/devel .cvsignore, 1.38, 1.39 libbonoboui.spec, 1.70,
	1.71 sources, 1.39, 1.40
Message-ID: <20090924014318.D314C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libbonoboui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17033

Modified Files:
	.cvsignore libbonoboui.spec sources 
Log Message:
2.24.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbonoboui/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	16 Mar 2009 04:10:12 -0000	1.38
+++ .cvsignore	24 Sep 2009 01:43:17 -0000	1.39
@@ -1 +1 @@
-libbonoboui-2.24.1.tar.bz2
+libbonoboui-2.24.2.tar.bz2


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- libbonoboui.spec	30 Jul 2009 06:13:39 -0000	1.70
+++ libbonoboui.spec	24 Sep 2009 01:43:18 -0000	1.71
@@ -13,8 +13,8 @@
 
 Summary: Bonobo user interface components
 Name: libbonoboui
-Version: 2.24.1
-Release: 3%{?dist}
+Version: 2.24.2
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libbonoboui/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
+- Update to 2.24.2
+
 * Thu Jul 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
 -  Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbonoboui/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	16 Mar 2009 04:10:12 -0000	1.39
+++ sources	24 Sep 2009 01:43:18 -0000	1.40
@@ -1 +1 @@
-9ff3ec1c7aefd0b1a15a5b21ecc7b4e4  libbonoboui-2.24.1.tar.bz2
+3c206eccc97730c02366a2f698c40ed2  libbonoboui-2.24.2.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 01:43:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:43:29 +0000 (UTC)
Subject: rpms/libbonobo/devel libbonobo.spec,1.91,1.92
Message-ID: <20090924014329.F1E2711C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libbonobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17311

Modified Files:
	libbonobo.spec 
Log Message:
2.24.2



Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- libbonobo.spec	24 Sep 2009 01:23:38 -0000	1.91
+++ libbonobo.spec	24 Sep 2009 01:43:29 -0000	1.92
@@ -27,7 +27,6 @@ Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-multishlib.patch
-Patch1: install-dupe.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -60,14 +59,9 @@ use Bonobo.
 %patch0 -p1 -b .multishlib
 %endif
 
-%patch1 -p1 -b .install-dupe
+automake
 
 %build
-intltoolize -f
-aclocal
-automake
-autoconf
-libtoolize -f -q
 %configure --disable-gtk-doc
 
 make



From whot at fedoraproject.org  Thu Sep 24 01:44:17 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 24 Sep 2009 01:44:17 +0000 (UTC)
Subject: rpms/libXmu/devel .cvsignore, 1.9, 1.10 libXmu.spec, 1.31,
	1.32 sources, 1.10, 1.11
Message-ID: <20090924014417.9D4D711C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXmu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18228

Modified Files:
	.cvsignore libXmu.spec sources 
Log Message:
* Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
- libXmu 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXmu/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Feb 2008 19:43:56 -0000	1.9
+++ .cvsignore	24 Sep 2009 01:44:17 -0000	1.10
@@ -1 +1 @@
-libXmu-1.0.4.tar.bz2
+libXmu-1.0.5.tar.bz2


Index: libXmu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libXmu.spec	29 Jul 2009 13:23:58 -0000	1.31
+++ libXmu.spec	24 Sep 2009 01:44:17 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
-Version: 1.0.4
-Release: 5%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
+- libXmu 1.0.5
+
 * Wed Jul 29 2009 Adam Jackson <ajax at redhat.com> 1.0.4-5
 - -devel doesn't Require: xorg-x11-util-macros, don't say it does.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXmu/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	22 Feb 2008 19:43:56 -0000	1.10
+++ sources	24 Sep 2009 01:44:17 -0000	1.11
@@ -1 +1 @@
-fb372a5f3ab42b5ba16d7af4d833a0cb  libXmu-1.0.4.tar.bz2
+fc4d66be7a1a1eb474954728415e46d6  libXmu-1.0.5.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 01:47:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:47:04 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.96, 1.97 gedit.spec, 1.204,
	1.205 sources, 1.98, 1.99
Message-ID: <20090924014704.865C211C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- .cvsignore	8 Sep 2009 01:00:08 -0000	1.96
+++ .cvsignore	24 Sep 2009 01:47:04 -0000	1.97
@@ -1 +1 @@
-gedit-2.27.6.tar.bz2
+gedit-2.28.0.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- gedit.spec	8 Sep 2009 01:00:08 -0000	1.204
+++ gedit.spec	24 Sep 2009 01:47:04 -0000	1.205
@@ -17,12 +17,12 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.27.6
+Version: 	2.28.0
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
-Source0:	http://download.gnome.org/sources/gedit/2.27/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.28/gedit-%{version}.tar.bz2
 
 URL:		http://projects.gnome.org/gedit/
 BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep  7 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.6-1
 - Update to 2.27.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	8 Sep 2009 01:00:08 -0000	1.98
+++ sources	24 Sep 2009 01:47:04 -0000	1.99
@@ -1 +1 @@
-8cdf5f1a8b87f3fab8bf9d878f167f0a  gedit-2.27.6.tar.bz2
+d5e8f9f2806c9662693f292b155dd238  gedit-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 01:50:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 01:50:35 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.31, 1.32 gtksourceview2.spec,
	1.38, 1.39 sources, 1.31, 1.32
Message-ID: <20090924015035.BCD2611C0418@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19978

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	14 Sep 2009 22:55:17 -0000	1.31
+++ .cvsignore	24 Sep 2009 01:50:35 -0000	1.32
@@ -1 +1 @@
-gtksourceview-2.7.5.tar.bz2
+gtksourceview-2.8.0.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gtksourceview2.spec	14 Sep 2009 22:55:17 -0000	1.38
+++ gtksourceview2.spec	24 Sep 2009 01:50:35 -0000	1.39
@@ -5,13 +5,13 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.7.5
+Version: 2.8.0
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/
-Source0: http://download.gnome.org/sources/gtksourceview/2.7/gtksourceview-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gtksourceview/2.8/gtksourceview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.0-1
+- Update to 2.8.0
+
 * Mon Sep 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.5-1
 - Update to 2.7.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	14 Sep 2009 22:55:17 -0000	1.31
+++ sources	24 Sep 2009 01:50:35 -0000	1.32
@@ -1 +1 @@
-cfd9d4d81536f73b3e0ac2ef0c890bd8  gtksourceview-2.7.5.tar.bz2
+b8456e21357bdffe5adb17b76d7e99a3  gtksourceview-2.8.0.tar.bz2



From mbarnes at fedoraproject.org  Thu Sep 24 01:59:42 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 24 Sep 2009 01:59:42 +0000 (UTC)
Subject: rpms/gnome-python2/devel gnome-python2.spec,1.39,1.40
Message-ID: <20090924015942.9DD2E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22430

Modified Files:
	gnome-python2.spec 
Log Message:
Fix the version field.



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gnome-python2.spec	21 Sep 2009 14:54:50 -0000	1.39
+++ gnome-python2.spec	24 Sep 2009 01:59:42 -0000	1.40
@@ -21,7 +21,7 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.18.0
+Version: 2.28.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages



From mclasen at fedoraproject.org  Thu Sep 24 02:03:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:03:31 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel .cvsignore, 1.5, 1.6 gnome-web-photo.spec,
	1.28, 1.29 sources, 1.5, 1.6
Message-ID: <20090924020331.1F37511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23680

Modified Files:
	.cvsignore gnome-web-photo.spec sources 
Log Message:
0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Jun 2009 18:09:32 -0000	1.5
+++ .cvsignore	24 Sep 2009 02:03:30 -0000	1.6
@@ -1 +1 @@
-gnome-web-photo-0.8.tar.bz2
+gnome-web-photo-0.9.tar.bz2


Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gnome-web-photo.spec	11 Sep 2009 07:54:04 -0000	1.28
+++ gnome-web-photo.spec	24 Sep 2009 02:03:30 -0000	1.29
@@ -2,12 +2,12 @@
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
-Version: 0.8
-Release: 6%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
-URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.bz2
+URL: http://download.gnome.org/sources/gnome-web-photo/%{version}/
+Source0: http://download.gnome.org/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): GConf2
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.9-1
+- Update to 0.9
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.8-6
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Jun 2009 18:09:32 -0000	1.5
+++ sources	24 Sep 2009 02:03:30 -0000	1.6
@@ -1 +1 @@
-11e1d0f589b3cf65581398f5a2df8a3f  gnome-web-photo-0.8.tar.bz2
+62952330a62b463df5fef315f4a7cb93  gnome-web-photo-0.9.tar.bz2



From mbarnes at fedoraproject.org  Thu Sep 24 02:05:19 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 24 Sep 2009 02:05:19 +0000 (UTC)
Subject: rpms/gnome-python2/devel .cvsignore,1.43,1.44 sources,1.43,1.44
Message-ID: <20090924020519.CEB9811C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24388

Modified Files:
	.cvsignore sources 
Log Message:
Fix sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	21 Sep 2009 14:45:19 -0000	1.43
+++ .cvsignore	24 Sep 2009 02:05:19 -0000	1.44
@@ -1 +1 @@
-gnome-python-2.18.0.tar.bz2
+gnome-python-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	21 Sep 2009 14:45:19 -0000	1.43
+++ sources	24 Sep 2009 02:05:19 -0000	1.44
@@ -1 +1 @@
-75400e51abe3cedb785db40960cbad53  gnome-python-2.18.0.tar.bz2
+b627abbb0ed912e221cc072e3dd6f9d6  gnome-python-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 02:12:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:12:00 +0000 (UTC)
Subject: rpms/sound-juicer/devel .cvsignore, 1.55, 1.56 sound-juicer.spec,
	1.119, 1.120 sources, 1.57, 1.58
Message-ID: <20090924021200.E193D11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26243

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	13 Apr 2009 03:07:42 -0000	1.55
+++ .cvsignore	24 Sep 2009 02:12:00 -0000	1.56
@@ -1 +1 @@
-sound-juicer-2.26.1.tar.bz2
+sound-juicer-2.28.0.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sound-juicer.spec	23 Sep 2009 19:09:05 -0000	1.119
+++ sound-juicer.spec	24 Sep 2009 02:12:00 -0000	1.120
@@ -7,17 +7,15 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.26.1
-Release:	6%{?dist}
+Version:	2.28.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-Source:		http://download.gnome.org/sources/sound-juicer/2.26/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
 URL:		http://www.burtonini.com/blog/computers/sound-juicer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	cdparanoia
 
-Patch0:		sj-gvfs-crash-fix.patch
-
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
@@ -49,9 +47,6 @@ GStreamer-based CD ripping tool. Saves a
 
 %prep
 %setup -q
-%patch0 -p1 -b .gvfs-crasher
-
-autoreconf -i -f
 
 %build
 # work around a gstreamer problem where it
@@ -130,6 +125,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.26.1-6
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	13 Apr 2009 03:07:42 -0000	1.57
+++ sources	24 Sep 2009 02:12:00 -0000	1.58
@@ -1 +1 @@
-68d085cb577af88553f2dcaf3a0fc2a1  sound-juicer-2.26.1.tar.bz2
+2bfad5d8c76d7f684bedf0346bcaefb6  sound-juicer-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 02:24:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:24:26 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel .cvsignore, 1.13,
	1.14 seahorse-plugins.spec, 1.29, 1.30 sources, 1.13, 1.14
Message-ID: <20090924022426.F0CF211C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30706

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 May 2009 11:23:00 -0000	1.13
+++ .cvsignore	24 Sep 2009 02:24:26 -0000	1.14
@@ -1 +1 @@
-seahorse-plugins-2.27.1.tar.bz2
+seahorse-plugins-2.28.0.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- seahorse-plugins.spec	9 Sep 2009 20:24:52 -0000	1.29
+++ seahorse-plugins.spec	24 Sep 2009 02:24:26 -0000	1.30
@@ -1,11 +1,11 @@
 Name: 		seahorse-plugins
-Version: 	2.27.1
-Release:        4%{?dist}
+Version: 	2.28.0
+Release:        1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
 URL:            http://projects.gnome.org/seahorse/
-Source:         http://download.gnome.org/sources/seahorse-plugins/2.26/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -183,7 +183,10 @@ fi
 #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 
 %changelog
-* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> 2.27.1-4
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
+* Wed Sep  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.1-4
 - Drop dependencies on applications
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.1-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 May 2009 11:23:00 -0000	1.13
+++ sources	24 Sep 2009 02:24:26 -0000	1.14
@@ -1 +1 @@
-8ef8e5738e1b76d593544461859c3c45  seahorse-plugins-2.27.1.tar.bz2
+ff3f238af0b19896ed949fec06b5b40d  seahorse-plugins-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 02:28:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:28:25 +0000 (UTC)
Subject: rpms/pygtksourceview/devel .cvsignore, 1.13,
	1.14 pygtksourceview.spec, 1.25, 1.26 sources, 1.13, 1.14
Message-ID: <20090924022825.DFEE011C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32073

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
2.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Aug 2009 01:09:14 -0000	1.13
+++ .cvsignore	24 Sep 2009 02:28:25 -0000	1.14
@@ -1 +1 @@
-pygtksourceview-2.7.0.tar.bz2
+pygtksourceview-2.8.0.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- pygtksourceview.spec	18 Aug 2009 01:09:14 -0000	1.25
+++ pygtksourceview.spec	24 Sep 2009 02:28:25 -0000	1.26
@@ -5,7 +5,7 @@
 %define gtksourceview_version 2.3.0
 
 Name:           pygtksourceview
-Version:        2.7.0
+Version:        2.8.0
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
@@ -13,7 +13,7 @@ Group:          Development/Languages
 # No version specified.
 License:        LGPLv2+
 URL:            http://download.gnome.org/sources/pygtksourceview/
-Source0:        http://download.gnome.org/sources/pygtksourceview/2.7/pygtksourceview-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pygtksourceview/2.8/pygtksourceview-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtksourceview2-devel >= %{gtksourceview_version}
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtksourceview2
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.0-1
+- Update to 2.8.0
+
 * Mon Aug 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.0-1
 - Update to 2.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	18 Aug 2009 01:09:14 -0000	1.13
+++ sources	24 Sep 2009 02:28:25 -0000	1.14
@@ -1 +1 @@
-cc6512592ddadc86fb12c0a53fe1ba9e  pygtksourceview-2.7.0.tar.bz2
+bc344044113a52026b4eb7e433a24c29  pygtksourceview-2.8.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 24 02:32:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:32:19 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.87, 1.88 epiphany.spec, 1.244,
	1.245 sources, 1.90, 1.91
Message-ID: <20090924023219.6CE3511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv813

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	8 Sep 2009 19:32:02 -0000	1.87
+++ .cvsignore	24 Sep 2009 02:32:19 -0000	1.88
@@ -1 +1 @@
-epiphany-2.27.92.tar.bz2
+epiphany-2.28.0.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- epiphany.spec	14 Sep 2009 18:32:24 -0000	1.244
+++ epiphany.spec	24 Sep 2009 02:32:19 -0000	1.245
@@ -7,14 +7,14 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.27.92
-Release: 2%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
-Source0: http://download.gnome.org/sources/epiphany/2.27/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/epiphany/2.28/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): scrollkeeper
@@ -247,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
 - Call nspluginwrapper's config tool if available
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	8 Sep 2009 19:32:02 -0000	1.90
+++ sources	24 Sep 2009 02:32:19 -0000	1.91
@@ -1 +1 @@
-abb1d7171c9910cf722360674bfaf3bf  epiphany-2.27.92.tar.bz2
+b88ac1168fc271892cabf73b749cac16  epiphany-2.28.0.tar.bz2



From cebbert at fedoraproject.org  Thu Sep 24 02:34:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 02:34:55 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-raidlockdep.patch,1.1,1.2
Message-ID: <20090924023455.A6C4B11C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1707

Modified Files:
	linux-2.6-raidlockdep.patch 
Log Message:
fix warning: patch ends in middle of line

linux-2.6-raidlockdep.patch:
 file.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Index: linux-2.6-raidlockdep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-raidlockdep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-raidlockdep.patch	16 Sep 2009 12:47:26 -0000	1.1
+++ linux-2.6-raidlockdep.patch	24 Sep 2009 02:34:55 -0000	1.2
@@ -117,4 +117,4 @@ index 561a9c0..f5ea468 100644
  }
  EXPORT_SYMBOL_GPL(sysfs_notify_dirent);
  
--- 1.6.0.6 
\ No newline at end of file
+-- 1.6.0.6 



From mclasen at fedoraproject.org  Thu Sep 24 02:42:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:42:00 +0000 (UTC)
Subject: rpms/swfdec-gnome/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 swfdec-gnome.spec, 1.20, 1.21
Message-ID: <20090924024200.4997F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/swfdec-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3645

Modified Files:
	.cvsignore sources swfdec-gnome.spec 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Mar 2009 05:25:02 -0000	1.11
+++ .cvsignore	24 Sep 2009 02:41:59 -0000	1.12
@@ -1 +1 @@
-swfdec-gnome-2.26.0.tar.bz2
+swfdec-gnome-2.28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Mar 2009 05:25:02 -0000	1.11
+++ sources	24 Sep 2009 02:42:00 -0000	1.12
@@ -1 +1 @@
-53d611d9a76a06a703650c4b73fd44cc  swfdec-gnome-2.26.0.tar.bz2
+70a37c4b6d93104868c314d197b1496f  swfdec-gnome-2.28.0.tar.bz2


Index: swfdec-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/swfdec-gnome.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- swfdec-gnome.spec	27 Jul 2009 05:12:46 -0000	1.20
+++ swfdec-gnome.spec	24 Sep 2009 02:42:00 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           swfdec-gnome
-Version:        2.26.0
-Release:        2%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 Summary:        Programs to integrate Flash into the GNOME desktop
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://swfdec.freedesktop.org/
-Source0:        http://swfdec.freedesktop.org/download/%{name}/2.26/%{name}-%{version}.tar.bz2
+Source0:        http://swfdec.freedesktop.org/download/%{name}/2.28/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-2.24.0-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -100,6 +100,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0
+- Update to 2.28.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Sep 24 02:58:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 02:58:05 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.245,1.246
Message-ID: <20090924025805.1E5F011C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8681

Modified Files:
	epiphany.spec 
Log Message:
drop upstreamed patch



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- epiphany.spec	24 Sep 2009 02:32:19 -0000	1.245
+++ epiphany.spec	24 Sep 2009 02:58:04 -0000	1.246
@@ -51,7 +51,6 @@ BuildRequires: nss-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
-Patch1: 0001-Setup-nspluginwrapper-if-available.patch
 Patch2: epiphany-default-bookmarks.patch
 
 %description
@@ -97,7 +96,6 @@ Install epiphany-devel if you want to wr
 %setup -q
 
 %patch0 -p1 -b .homepage
-%patch1 -p1 -b .nspluginwrapper
 %patch2 -p1 -b .default-bookmarks
 
 # Fedora Epiphany version



From mbarnes at fedoraproject.org  Thu Sep 24 03:02:20 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 24 Sep 2009 03:02:20 +0000 (UTC)
Subject: rpms/gnome-python2/devel gnome-python2.spec,1.40,1.41
Message-ID: <20090924030220.6BC4711C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9992

Modified Files:
	gnome-python2.spec 
Log Message:
Fix files list.



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gnome-python2.spec	24 Sep 2009 01:59:42 -0000	1.40
+++ gnome-python2.spec	24 Sep 2009 03:02:20 -0000	1.41
@@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomevfs
 %{python_sitearch}/gtk-2.0/gnome/vfs*
 %{_libdir}/gnome-vfs-2.0/modules/libpythonmethod.so
+%dir %{_datadir}/gtk-doc/
+%dir %{_datadir}/gtk-doc/html/
+%dir %{_datadir}/gtk-doc/html/pygnomevfs
 %defattr(644,root,root,755)
 %doc examples/vfs/*
 



From salimma at fedoraproject.org  Thu Sep 24 03:03:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:03:29 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/EL-5
	gnome-applet-window-picker.spec, 1.1, 1.2
Message-ID: <20090924030329.9AD7211C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10385/EL-5

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5/gnome-applet-window-picker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-applet-window-picker.spec	23 Sep 2009 11:35:27 -0000	1.1
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:03:29 -0000	1.2
@@ -1,19 +1,20 @@
 %global upname  window-picker-applet
 
-Name:		gnome-applet-window-picker
-Version:	0.5.6
-Release:	2%{?dist}
-Summary:	Window picker applet for GNOME
-
-Group:		User Interface/Desktops
-License:	GPLv3
-URL:		https://launchpad.net/window-picker-applet
+Name:           gnome-applet-window-picker
+Version:        0.5.6
+Release:        3%{?dist}
+Summary:        Window picker applet for GNOME
+
+Group:          User Interface/Desktops
+License:        GPLv3
+URL:            https://launchpad.net/window-picker-applet
 Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gnome-panel-devel
-BuildRequires:	libwnck-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  intltool
+Requires:       gnome-panel
 Requires(pre):   GConf2
 Requires(post):  GConf2
 Requires(preun): GConf2
@@ -32,7 +33,7 @@ on netbook-size screens.
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -46,19 +47,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 fi
 
 
@@ -68,12 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{upname}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
 %{_libdir}/bonobo/servers/GNOME_WindowPicker.server
 %{_libexecdir}/%{upname}
 
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
+- Require gnome-panel
+- Include ChangeLog file
+
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions
 



From salimma at fedoraproject.org  Thu Sep 24 03:03:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:03:29 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-10
	gnome-applet-window-picker.spec, 1.2, 1.3
Message-ID: <20090924030329.EBA1F11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10385/F-10

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-10/gnome-applet-window-picker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-window-picker.spec	23 Sep 2009 20:22:04 -0000	1.2
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:03:29 -0000	1.3
@@ -1,21 +1,20 @@
 %global upname  window-picker-applet
 
-Name:		gnome-applet-window-picker
-Version:	0.5.6
-Release:	2%{?dist}
-Summary:	Window picker applet for GNOME
-
-Group:		User Interface/Desktops
-License:	GPLv3
-URL:		https://launchpad.net/window-picker-applet
+Name:           gnome-applet-window-picker
+Version:        0.5.6
+Release:        3%{?dist}
+Summary:        Window picker applet for GNOME
+
+Group:          User Interface/Desktops
+License:        GPLv3
+URL:            https://launchpad.net/window-picker-applet
 Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gnome-panel-devel
-BuildRequires:	libwnck-devel
-# in F-11 and above, pulled in by libwnck-devel through pkgconfig
-BuildRequires:  libXres-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  intltool
+Requires:       gnome-panel
 Requires(pre):   GConf2
 Requires(post):  GConf2
 Requires(preun): GConf2
@@ -34,7 +33,7 @@ on netbook-size screens.
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -48,19 +47,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 fi
 
 
@@ -70,12 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{upname}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
 %{_libdir}/bonobo/servers/GNOME_WindowPicker.server
 %{_libexecdir}/%{upname}
 
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
+- Require gnome-panel
+- Include ChangeLog file
+
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions
 



From salimma at fedoraproject.org  Thu Sep 24 03:03:30 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:03:30 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/devel
	gnome-applet-window-picker.spec, 1.1, 1.2
Message-ID: <20090924030330.632E911C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10385/devel

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/devel/gnome-applet-window-picker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-applet-window-picker.spec	23 Sep 2009 11:35:28 -0000	1.1
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:03:30 -0000	1.2
@@ -1,19 +1,20 @@
 %global upname  window-picker-applet
 
-Name:		gnome-applet-window-picker
-Version:	0.5.6
-Release:	2%{?dist}
-Summary:	Window picker applet for GNOME
-
-Group:		User Interface/Desktops
-License:	GPLv3
-URL:		https://launchpad.net/window-picker-applet
+Name:           gnome-applet-window-picker
+Version:        0.5.6
+Release:        3%{?dist}
+Summary:        Window picker applet for GNOME
+
+Group:          User Interface/Desktops
+License:        GPLv3
+URL:            https://launchpad.net/window-picker-applet
 Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gnome-panel-devel
-BuildRequires:	libwnck-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  intltool
+Requires:       gnome-panel
 Requires(pre):   GConf2
 Requires(post):  GConf2
 Requires(preun): GConf2
@@ -32,7 +33,7 @@ on netbook-size screens.
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -46,19 +47,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 fi
 
 
@@ -68,12 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{upname}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
 %{_libdir}/bonobo/servers/GNOME_WindowPicker.server
 %{_libexecdir}/%{upname}
 
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
+- Require gnome-panel
+- Include ChangeLog file
+
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions
 



From salimma at fedoraproject.org  Thu Sep 24 03:03:30 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:03:30 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-11
	gnome-applet-window-picker.spec, 1.1, 1.2
Message-ID: <20090924030330.309E711C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10385/F-11

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-11/gnome-applet-window-picker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-applet-window-picker.spec	23 Sep 2009 11:35:28 -0000	1.1
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:03:29 -0000	1.2
@@ -1,19 +1,20 @@
 %global upname  window-picker-applet
 
-Name:		gnome-applet-window-picker
-Version:	0.5.6
-Release:	2%{?dist}
-Summary:	Window picker applet for GNOME
-
-Group:		User Interface/Desktops
-License:	GPLv3
-URL:		https://launchpad.net/window-picker-applet
+Name:           gnome-applet-window-picker
+Version:        0.5.6
+Release:        3%{?dist}
+Summary:        Window picker applet for GNOME
+
+Group:          User Interface/Desktops
+License:        GPLv3
+URL:            https://launchpad.net/window-picker-applet
 Source0:        http://launchpad.net/window-picker-applet/0.5/ubuntu-9.10-ui-freeze/+download/window-picker-applet-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gnome-panel-devel
-BuildRequires:	libwnck-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  intltool
+Requires:       gnome-panel
 Requires(pre):   GConf2
 Requires(post):  GConf2
 Requires(preun): GConf2
@@ -32,7 +33,7 @@ on netbook-size screens.
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -46,19 +47,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas >/dev/null || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
+            %{_sysconfdir}/gconf/schemas/%{upname}.schemas > /dev/null || :
 fi
 
 
@@ -68,12 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{upname}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{upname}.schemas
 %{_libdir}/bonobo/servers/GNOME_WindowPicker.server
 %{_libexecdir}/%{upname}
 
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
+- Require gnome-panel
+- Include ChangeLog file
+
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions
 



From mclasen at fedoraproject.org  Thu Sep 24 03:09:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 03:09:26 +0000 (UTC)
Subject: rpms/libgweather/devel gettext-not-xml.patch,1.1,1.2
Message-ID: <20090924030927.0298511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12109

Modified Files:
	gettext-not-xml.patch 
Log Message:
2.28.0


gettext-not-xml.patch:
 configure.in                    |   21 ---
 data/Makefile.am                |   44 +-------
 libgweather/gweather-location.c |   17 ++-
 libgweather/gweather-timezone.c |   18 ++-
 po-locations/LINGUAS            |   78 ++++++++++++++
 po-locations/Makefile.in.in     |  217 ++++++++++++++++++++++++++++++++++++++++
 po-locations/POTFILES.in        |    4 
 7 files changed, 338 insertions(+), 61 deletions(-)

Index: gettext-not-xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/gettext-not-xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gettext-not-xml.patch	9 Sep 2009 04:52:25 -0000	1.1
+++ gettext-not-xml.patch	24 Sep 2009 03:09:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up libgweather-2.27.92/configure.in.gettext libgweather-2.27.92/configure.in
---- libgweather-2.27.92/configure.in.gettext	2009-09-08 20:08:33.000000000 -0400
-+++ libgweather-2.27.92/configure.in	2009-09-09 00:48:11.570487413 -0400
+diff -up libgweather-2.28.0/configure.in.gettext libgweather-2.28.0/configure.in
+--- libgweather-2.28.0/configure.in.gettext	2009-09-21 12:30:18.000000000 -0400
++++ libgweather-2.28.0/configure.in	2009-09-23 23:06:09.533646963 -0400
 @@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
  AM_MAINTAINER_MODE
  GNOME_MAINTAINER_MODE_DEFINES
@@ -48,16 +48,16 @@ diff -up libgweather-2.27.92/configure.i
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -276,6 +267,4 @@ libgweather-$VERSION configure summary:
- 	Prefix:				${prefix}
+@@ -277,6 +268,4 @@ libgweather-$VERSION configure summary:
  	Source code location:		${srcdir}
  	Compiler:			${CC}
+ 	Python bindings:		${enable_python}
 -	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
 -	Locations.xml compression:	${enable_locations_compression}
  " >&2
-diff -up libgweather-2.27.92/data/Makefile.am.gettext libgweather-2.27.92/data/Makefile.am
---- libgweather-2.27.92/data/Makefile.am.gettext	2009-07-21 13:01:11.000000000 -0400
-+++ libgweather-2.27.92/data/Makefile.am	2009-09-09 00:48:11.571480976 -0400
+diff -up libgweather-2.28.0/data/Makefile.am.gettext libgweather-2.28.0/data/Makefile.am
+--- libgweather-2.28.0/data/Makefile.am.gettext	2009-07-21 13:01:11.000000000 -0400
++++ libgweather-2.28.0/data/Makefile.am	2009-09-23 23:02:32.718640615 -0400
 @@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
@@ -120,9 +120,9 @@ diff -up libgweather-2.27.92/data/Makefi
  check:
  	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
  	$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-diff -up libgweather-2.27.92/libgweather/gweather-location.c.gettext libgweather-2.27.92/libgweather/gweather-location.c
---- libgweather-2.27.92/libgweather/gweather-location.c.gettext	2009-04-19 13:41:11.000000000 -0400
-+++ libgweather-2.27.92/libgweather/gweather-location.c	2009-09-09 00:48:11.573482488 -0400
+diff -up libgweather-2.28.0/libgweather/gweather-location.c.gettext libgweather-2.28.0/libgweather/gweather-location.c
+--- libgweather-2.28.0/libgweather/gweather-location.c.gettext	2009-04-19 13:41:11.000000000 -0400
++++ libgweather-2.28.0/libgweather/gweather-location.c	2009-09-23 23:02:32.720641289 -0400
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -161,9 +161,9 @@ diff -up libgweather-2.27.92/libgweather
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-2.27.92/libgweather/gweather-timezone.c.gettext libgweather-2.27.92/libgweather/gweather-timezone.c
---- libgweather-2.27.92/libgweather/gweather-timezone.c.gettext	2009-09-08 19:46:08.000000000 -0400
-+++ libgweather-2.27.92/libgweather/gweather-timezone.c	2009-09-09 00:49:14.956486126 -0400
+diff -up libgweather-2.28.0/libgweather/gweather-timezone.c.gettext libgweather-2.28.0/libgweather/gweather-timezone.c
+--- libgweather-2.28.0/libgweather/gweather-timezone.c.gettext	2009-09-08 19:46:08.000000000 -0400
++++ libgweather-2.28.0/libgweather/gweather-timezone.c	2009-09-23 23:02:32.721640718 -0400
 @@ -23,6 +23,7 @@
  #endif
  
@@ -220,9 +220,9 @@ diff -up libgweather-2.27.92/libgweather
      if (name)
  	xmlFree (name);
  
-diff -up /dev/null libgweather-2.27.92/po-locations/LINGUAS
---- /dev/null	2009-09-08 17:05:15.194532336 -0400
-+++ libgweather-2.27.92/po-locations/LINGUAS	2009-09-09 00:48:11.577480552 -0400
+diff -up /dev/null libgweather-2.28.0/po-locations/LINGUAS
+--- /dev/null	2009-09-23 15:09:11.116404522 -0400
++++ libgweather-2.28.0/po-locations/LINGUAS	2009-09-23 23:02:32.723640903 -0400
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -302,9 +302,9 @@ diff -up /dev/null libgweather-2.27.92/p
 +zh_CN
 +zh_HK
 +zh_TW
-diff -up /dev/null libgweather-2.27.92/po-locations/Makefile.in.in
---- /dev/null	2009-09-08 17:05:15.194532336 -0400
-+++ libgweather-2.27.92/po-locations/Makefile.in.in	2009-09-09 00:48:11.579481715 -0400
+diff -up /dev/null libgweather-2.28.0/po-locations/Makefile.in.in
+--- /dev/null	2009-09-23 15:09:11.116404522 -0400
++++ libgweather-2.28.0/po-locations/Makefile.in.in	2009-09-23 23:02:32.724640890 -0400
 @@ -0,0 +1,217 @@
 +# Makefile for program source directory in GNU NLS utilities package.
 +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -523,9 +523,9 @@ diff -up /dev/null libgweather-2.27.92/p
 +# Tell versions [3.59,3.63) of GNU make not to export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -up /dev/null libgweather-2.27.92/po-locations/POTFILES.in
---- /dev/null	2009-09-08 17:05:15.194532336 -0400
-+++ libgweather-2.27.92/po-locations/POTFILES.in	2009-09-09 00:48:11.580481144 -0400
+diff -up /dev/null libgweather-2.28.0/po-locations/POTFILES.in
+--- /dev/null	2009-09-23 15:09:11.116404522 -0400
++++ libgweather-2.28.0/po-locations/POTFILES.in	2009-09-23 23:02:32.726641354 -0400
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.



From salimma at fedoraproject.org  Thu Sep 24 03:09:33 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:09:33 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/EL-5
	gnome-applet-window-picker.spec, 1.2, 1.3
Message-ID: <20090924030933.A9F7F11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140/EL-5

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file
- Now built with verbose output



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/EL-5/gnome-applet-window-picker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-window-picker.spec	24 Sep 2009 03:03:29 -0000	1.2
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:09:33 -0000	1.3
@@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
 - Require gnome-panel
 - Include ChangeLog file
+- Now built with verbose output
 
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions



From salimma at fedoraproject.org  Thu Sep 24 03:09:33 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:09:33 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-10
	gnome-applet-window-picker.spec, 1.3, 1.4
Message-ID: <20090924030933.D37EB11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140/F-10

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file
- Now built with verbose output



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-10/gnome-applet-window-picker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-applet-window-picker.spec	24 Sep 2009 03:03:29 -0000	1.3
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:09:33 -0000	1.4
@@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
 - Require gnome-panel
 - Include ChangeLog file
+- Now built with verbose output
 
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions



From salimma at fedoraproject.org  Thu Sep 24 03:09:34 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:09:34 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/devel
	gnome-applet-window-picker.spec, 1.2, 1.3
Message-ID: <20090924030934.3650811C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140/devel

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file
- Now built with verbose output



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/devel/gnome-applet-window-picker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-window-picker.spec	24 Sep 2009 03:03:30 -0000	1.2
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:09:34 -0000	1.3
@@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
 - Require gnome-panel
 - Include ChangeLog file
+- Now built with verbose output
 
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions



From salimma at fedoraproject.org  Thu Sep 24 03:09:34 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:09:34 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-11
	gnome-applet-window-picker.spec, 1.2, 1.3
Message-ID: <20090924030934.0D2DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140/F-11

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
- Require gnome-panel
- Include ChangeLog file
- Now built with verbose output



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-11/gnome-applet-window-picker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-window-picker.spec	24 Sep 2009 03:03:29 -0000	1.2
+++ gnome-applet-window-picker.spec	24 Sep 2009 03:09:33 -0000	1.3
@@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-3
 - Require gnome-panel
 - Include ChangeLog file
+- Now built with verbose output
 
 * Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-2
 - Rename to gnome-applet-window-picker, in keeping with Fedora naming conventions



From mbarnes at fedoraproject.org  Thu Sep 24 03:11:08 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 24 Sep 2009 03:11:08 +0000 (UTC)
Subject: rpms/gnome-python2/devel gnome-python2.spec,1.41,1.42
Message-ID: <20090924031108.72E8511C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12713

Modified Files:
	gnome-python2.spec 
Log Message:
Another typo.



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gnome-python2.spec	24 Sep 2009 03:02:20 -0000	1.41
+++ gnome-python2.spec	24 Sep 2009 03:11:08 -0000	1.42
@@ -194,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-vfs-2.0/modules/libpythonmethod.so
 %dir %{_datadir}/gtk-doc/
 %dir %{_datadir}/gtk-doc/html/
-%dir %{_datadir}/gtk-doc/html/pygnomevfs
+%doc %{_datadir}/gtk-doc/html/pygnomevfs
 %defattr(644,root,root,755)
 %doc examples/vfs/*
 



From mclasen at fedoraproject.org  Thu Sep 24 03:20:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 03:20:20 +0000 (UTC)
Subject: rpms/webkitgtk/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 webkitgtk.spec, 1.21, 1.22
Message-ID: <20090924032020.93E2A11C0418@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15883

Modified Files:
	.cvsignore sources webkitgtk.spec 
Log Message:
1.1.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	8 Sep 2009 02:32:22 -0000	1.10
+++ .cvsignore	24 Sep 2009 03:20:20 -0000	1.11
@@ -1 +1 @@
-webkit-1.1.14.tar.gz
+webkit-1.1.15.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	8 Sep 2009 02:32:22 -0000	1.10
+++ sources	24 Sep 2009 03:20:20 -0000	1.11
@@ -1 +1 @@
-bff87d1ddc562223cb99201950d7e138  webkit-1.1.14.tar.gz
+e6eb43bb4f75b4a2a09aec95e2f43e91  webkit-1.1.15.1.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- webkitgtk.spec	14 Sep 2009 17:56:12 -0000	1.21
+++ webkitgtk.spec	24 Sep 2009 03:20:20 -0000	1.22
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.14
-Release:	3%{?dist}
+Version:	1.1.15.1
+Release:	2%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -190,6 +190,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.1-1
+- Update to 1.1.15.1
+
 * Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3
 - Add support for nspluginwrapper plugins
 



From salimma at fedoraproject.org  Thu Sep 24 03:32:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:32:53 +0000 (UTC)
Subject: rpms/Falcon/F-10 .cvsignore, 1.5, 1.6 Falcon.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20090924033253.7CD8711C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Falcon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366/F-10

Modified Files:
	.cvsignore Falcon.spec sources 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
- Update to 0.9.4.2
- Package documentation files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:05:19 -0000	1.5
+++ .cvsignore	24 Sep 2009 03:32:53 -0000	1.6
@@ -1 +1,3 @@
-Falcon-0.9.4.tar.gz
+Falcon-0.9.4.2.tar.gz
+Falcon-docs-core.0.9.4.2.tgz
+Falcon-feathers-docs.0.9.4.2.tgz


Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-10/Falcon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- Falcon.spec	25 Aug 2009 16:05:19 -0000	1.9
+++ Falcon.spec	24 Sep 2009 03:32:53 -0000	1.10
@@ -1,8 +1,7 @@
-%define host     www.falconpl.org
-%define mainver  0.9.4
+%global host     www.falconpl.org
 
 Name:            Falcon
-Version:         %{mainver}
+Version:         0.9.4.2
 Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
@@ -10,7 +9,9 @@ Summary(it):     Il linguaggio di progra
 License:        GPLv2+
 Group:          Development/Languages
 URL:            http://%{host}/
-Source:         http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
+Source0:        http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
+Source1:        http://%{host}/project_dl/_official_rel/%{name}-docs-core.%{version}.tgz
+Source2:        http://%{host}/project_dl/_official_rel/%{name}-feathers-docs.%{version}.tgz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  bison cmake pcre-devel zlib-devel
@@ -48,9 +49,28 @@ aims to be both simple and powerful.
 This package contains development files for %{name}. This is not
 necessary for using the %{name} interpreter.
 
+%package   doc
+Summary:   Documentation for %{name}
+Group:     Documentation
+Requires:  %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+The Falcon Programming Language is an embeddable scripting language
+aiming to empower even simple applications with a powerful,
+flexible, extensible and highly configurable scripting engine.
+
+Falcon is also a standalone multiplatform scripting language that
+aims to be both simple and powerful.
+
+This package contains HTML documentation for %{name}.
+
 
 %prep
-%setup -q -n %{name}-%{mainver}
+%setup -q -a1 -a2
+mkdir largedocs
+mv Falcon-docs-core.0.9.4 largedocs/core
+mv Falcon-feathers-docs.%{version} largedocs/feathers
 
 
 %build
@@ -103,10 +123,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/falconeer.fal*
 %{_mandir}/man1/faltest*
 
+%files doc
+%defattr(-,root,root,-)
+%doc largedocs/*
+
+
+
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
+- Update to 0.9.4.2
+- Package documentation files
+
 * Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
 - Update to 0.9.4
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.14.2-1
 - Update to 0.8.14.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 16:05:19 -0000	1.6
+++ sources	24 Sep 2009 03:32:53 -0000	1.7
@@ -1 +1,3 @@
-9e16d8c8e2974b1f31a2dd96e35f93f8  Falcon-0.9.4.tar.gz
+00d19cef885e25bcbf8851add5bd0528  Falcon-0.9.4.2.tar.gz
+6bd7651311f04903212a80040bc58c90  Falcon-docs-core.0.9.4.2.tgz
+ca04eeb4c3e75eed2b73e7d84b8ca2c3  Falcon-feathers-docs.0.9.4.2.tgz



From salimma at fedoraproject.org  Thu Sep 24 03:32:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:32:53 +0000 (UTC)
Subject: rpms/Falcon/F-11 .cvsignore, 1.5, 1.6 Falcon.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090924033253.A201A11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Falcon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366/F-11

Modified Files:
	.cvsignore Falcon.spec sources 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
- Update to 0.9.4.2
- Package documentation files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:05:19 -0000	1.5
+++ .cvsignore	24 Sep 2009 03:32:53 -0000	1.6
@@ -1 +1,3 @@
-Falcon-0.9.4.tar.gz
+Falcon-0.9.4.2.tar.gz
+Falcon-docs-core.0.9.4.2.tgz
+Falcon-feathers-docs.0.9.4.2.tgz


Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-11/Falcon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- Falcon.spec	25 Aug 2009 16:05:19 -0000	1.10
+++ Falcon.spec	24 Sep 2009 03:32:53 -0000	1.11
@@ -1,8 +1,7 @@
-%define host     www.falconpl.org
-%define mainver  0.9.4
+%global host     www.falconpl.org
 
 Name:            Falcon
-Version:         %{mainver}
+Version:         0.9.4.2
 Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
@@ -10,7 +9,9 @@ Summary(it):     Il linguaggio di progra
 License:        GPLv2+
 Group:          Development/Languages
 URL:            http://%{host}/
-Source:         http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
+Source0:        http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
+Source1:        http://%{host}/project_dl/_official_rel/%{name}-docs-core.%{version}.tgz
+Source2:        http://%{host}/project_dl/_official_rel/%{name}-feathers-docs.%{version}.tgz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  bison cmake pcre-devel zlib-devel
@@ -48,9 +49,28 @@ aims to be both simple and powerful.
 This package contains development files for %{name}. This is not
 necessary for using the %{name} interpreter.
 
+%package   doc
+Summary:   Documentation for %{name}
+Group:     Documentation
+Requires:  %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+The Falcon Programming Language is an embeddable scripting language
+aiming to empower even simple applications with a powerful,
+flexible, extensible and highly configurable scripting engine.
+
+Falcon is also a standalone multiplatform scripting language that
+aims to be both simple and powerful.
+
+This package contains HTML documentation for %{name}.
+
 
 %prep
-%setup -q -n %{name}-%{mainver}
+%setup -q -a1 -a2
+mkdir largedocs
+mv Falcon-docs-core.0.9.4 largedocs/core
+mv Falcon-feathers-docs.%{version} largedocs/feathers
 
 
 %build
@@ -103,10 +123,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/falconeer.fal*
 %{_mandir}/man1/faltest*
 
+%files doc
+%defattr(-,root,root,-)
+%doc largedocs/*
+
+
+
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
+- Update to 0.9.4.2
+- Package documentation files
+
 * Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
 - Update to 0.9.4
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 16:05:19 -0000	1.6
+++ sources	24 Sep 2009 03:32:53 -0000	1.7
@@ -1 +1,3 @@
-9e16d8c8e2974b1f31a2dd96e35f93f8  Falcon-0.9.4.tar.gz
+00d19cef885e25bcbf8851add5bd0528  Falcon-0.9.4.2.tar.gz
+6bd7651311f04903212a80040bc58c90  Falcon-docs-core.0.9.4.2.tgz
+ca04eeb4c3e75eed2b73e7d84b8ca2c3  Falcon-feathers-docs.0.9.4.2.tgz



From salimma at fedoraproject.org  Thu Sep 24 03:32:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 03:32:53 +0000 (UTC)
Subject: rpms/Falcon/devel .cvsignore, 1.5, 1.6 Falcon.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <20090924033253.CE28B11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Falcon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366/devel

Modified Files:
	.cvsignore Falcon.spec sources 
Log Message:
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
- Update to 0.9.4.2
- Package documentation files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:05:19 -0000	1.5
+++ .cvsignore	24 Sep 2009 03:32:53 -0000	1.6
@@ -1 +1,3 @@
-Falcon-0.9.4.tar.gz
+Falcon-0.9.4.2.tar.gz
+Falcon-docs-core.0.9.4.2.tgz
+Falcon-feathers-docs.0.9.4.2.tgz


Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/Falcon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- Falcon.spec	25 Aug 2009 16:05:19 -0000	1.11
+++ Falcon.spec	24 Sep 2009 03:32:53 -0000	1.12
@@ -1,8 +1,7 @@
-%define host     www.falconpl.org
-%define mainver  0.9.4
+%global host     www.falconpl.org
 
 Name:            Falcon
-Version:         %{mainver}
+Version:         0.9.4.2
 Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
@@ -10,7 +9,9 @@ Summary(it):     Il linguaggio di progra
 License:        GPLv2+
 Group:          Development/Languages
 URL:            http://%{host}/
-Source:         http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
+Source0:        http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
+Source1:        http://%{host}/project_dl/_official_rel/%{name}-docs-core.%{version}.tgz
+Source2:        http://%{host}/project_dl/_official_rel/%{name}-feathers-docs.%{version}.tgz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  bison cmake pcre-devel zlib-devel
@@ -48,9 +49,28 @@ aims to be both simple and powerful.
 This package contains development files for %{name}. This is not
 necessary for using the %{name} interpreter.
 
+%package   doc
+Summary:   Documentation for %{name}
+Group:     Documentation
+Requires:  %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+The Falcon Programming Language is an embeddable scripting language
+aiming to empower even simple applications with a powerful,
+flexible, extensible and highly configurable scripting engine.
+
+Falcon is also a standalone multiplatform scripting language that
+aims to be both simple and powerful.
+
+This package contains HTML documentation for %{name}.
+
 
 %prep
-%setup -q -n %{name}-%{mainver}
+%setup -q -a1 -a2
+mkdir largedocs
+mv Falcon-docs-core.0.9.4 largedocs/core
+mv Falcon-feathers-docs.%{version} largedocs/feathers
 
 
 %build
@@ -103,7 +123,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/falconeer.fal*
 %{_mandir}/man1/faltest*
 
+%files doc
+%defattr(-,root,root,-)
+%doc largedocs/*
+
+
+
 %changelog
+* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
+- Update to 0.9.4.2
+- Package documentation files
+
 * Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
 - Update to 0.9.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 16:05:19 -0000	1.6
+++ sources	24 Sep 2009 03:32:53 -0000	1.7
@@ -1 +1,3 @@
-9e16d8c8e2974b1f31a2dd96e35f93f8  Falcon-0.9.4.tar.gz
+00d19cef885e25bcbf8851add5bd0528  Falcon-0.9.4.2.tar.gz
+6bd7651311f04903212a80040bc58c90  Falcon-docs-core.0.9.4.2.tgz
+ca04eeb4c3e75eed2b73e7d84b8ca2c3  Falcon-feathers-docs.0.9.4.2.tgz



From mclasen at fedoraproject.org  Thu Sep 24 03:39:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 03:39:08 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkitgtk.spec,1.22,1.23
Message-ID: <20090924033908.20F7C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21444

Modified Files:
	webkitgtk.spec 
Log Message:
drop always-breaking patch



Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- webkitgtk.spec	24 Sep 2009 03:20:20 -0000	1.22
+++ webkitgtk.spec	24 Sep 2009 03:39:07 -0000	1.23
@@ -47,7 +47,7 @@ URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-Patch0: 	webkit-1.1.14-atomic-word.patch
+#Patch0: 	webkit-1.1.14-atomic-word.patch
 Patch1: 	webkit-1.1.13-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
 
@@ -111,7 +111,7 @@ LICENSE, README, and AUTHORS files.
 
 %prep
 %setup -qn "webkit-%{version}"
-%patch0 -p1 -b .atomic-word
+# %patch0 -p1 -b .atomic-word
 %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
 



From pkgdb at fedoraproject.org  Thu Sep 24 04:01:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:01:11 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040111.8DB1D10F883@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on NetworkManager-openvpn (Fedora devel) to Approved for timn

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:01:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:01:20 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchbugzilla
Message-ID: <20090924040120.4DAF610F889@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on NetworkManager-openvpn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:01:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:01:21 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040122.1526410F898@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on NetworkManager-openvpn (Fedora devel) to Obsolete for timn

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:01:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:01:29 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchcommits
Message-ID: <20090924040131.0990110F89A@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on NetworkManager-openvpn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:01:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:01:34 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested commit
Message-ID: <20090924040135.6D0D810F884@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on NetworkManager-openvpn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:01:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:01:43 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested approveacls
Message-ID: <20090924040143.7EE9C10F89C@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on NetworkManager-openvpn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:07 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchbugzilla
Message-ID: <20090924040207.E798510F89A@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on NetworkManager-openvpn (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:21 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has given up watchbugzilla
Message-ID: <20090924040223.095C510F884@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchbugzilla acl on NetworkManager-openvpn (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:22 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested commit
Message-ID: <20090924040225.091EF10F8A0@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on NetworkManager-openvpn (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:29 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchcommits
Message-ID: <20090924040229.E757110F898@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on NetworkManager-openvpn (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:31 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested approveacls
Message-ID: <20090924040231.DDE9310F89B@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on NetworkManager-openvpn (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:39 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested approveacls
Message-ID: <20090924040240.2EC0310F8A2@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on NetworkManager-openvpn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:42 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchbugzilla
Message-ID: <20090924040243.6704B10F889@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on NetworkManager-openvpn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:45 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchcommits
Message-ID: <20090924040245.63BB810F8A3@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on NetworkManager-openvpn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:51 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested commit
Message-ID: <20090924040251.D1C5E10F8A0@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on NetworkManager-openvpn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:02:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:02:57 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchbugzilla
Message-ID: <20090924040257.2213010F8A4@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on NetworkManager-openvpn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:03:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:03:01 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested watchcommits
Message-ID: <20090924040301.EEDC010F89A@bastion2.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on NetworkManager-openvpn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:03:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:03:03 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested commit
Message-ID: <20090924040303.CDA7510F89D@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on NetworkManager-openvpn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:03:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:03:06 +0000
Subject: [pkgdb] NetworkManager-openvpn: huzaifas has requested approveacls
Message-ID: <20090924040306.AE54910F8AB@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on NetworkManager-openvpn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From petersen at fedoraproject.org  Thu Sep 24 04:05:36 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 24 Sep 2009 04:05:36 +0000 (UTC)
Subject: rpms/ghc-editline/devel ghc-editline.spec,1.10,1.11
Message-ID: <20090924040536.AF0B011C01EA@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-editline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9230

Modified Files:
	ghc-editline.spec 
Log Message:
add haskell-platform comment


Index: ghc-editline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ghc-editline.spec	16 Sep 2009 07:50:59 -0000	1.10
+++ ghc-editline.spec	24 Sep 2009 04:05:36 -0000	1.11
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.2
 Version:        0.2.1.0
 Release:        11%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Thu Sep 24 04:07:38 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 24 Sep 2009 04:07:38 +0000 (UTC)
Subject: rpms/ghc-network/devel ghc-network.spec,1.1,1.2
Message-ID: <20090924040738.E628D11C01EA@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28176

Modified Files:
	ghc-network.spec 
Log Message:
add haskell-platform comment


Index: ghc-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-network/devel/ghc-network.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-network.spec	22 Sep 2009 02:41:48 -0000	1.1
+++ ghc-network.spec	24 Sep 2009 04:07:38 -0000	1.2
@@ -10,6 +10,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.2
 Version:        2.2.1.4
 Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library



From pkgdb at fedoraproject.org  Thu Sep 24 04:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:07:51 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040751.6A0B610F86F@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on NetworkManager-openvpn (Fedora devel) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:07:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:07:53 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040753.DB27610F884@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on NetworkManager-openvpn (Fedora devel) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:07:56 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040756.77C7710F89A@bastion2.fedora.phx.redhat.com>

huzaifas has set the commit acl on NetworkManager-openvpn (Fedora devel) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:06 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040806.5723910F89E@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on NetworkManager-openvpn (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:07:55 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040757.0AF2410F89D@bastion2.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on NetworkManager-openvpn (Fedora devel) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:06 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040806.BB06F10F8A1@bastion2.fedora.phx.redhat.com>

huzaifas has set the commit acl on NetworkManager-openvpn (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:07 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040808.B5D0310F8A4@bastion2.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on NetworkManager-openvpn (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:11 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040811.4151D10F883@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on NetworkManager-openvpn (Fedora 10) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:12 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040812.DFCEE10F8A5@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on NetworkManager-openvpn (Fedora 10) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:14 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040814.67EF610F8A9@bastion2.fedora.phx.redhat.com>

huzaifas has set the commit acl on NetworkManager-openvpn (Fedora 10) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:14 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040815.D90B410F8AA@bastion2.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on NetworkManager-openvpn (Fedora 10) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:18 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040818.7772210F8AD@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on NetworkManager-openvpn (Fedora 11) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:18 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040818.CB5BB10F8B1@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on NetworkManager-openvpn (Fedora 11) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:21 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040821.AE36D10F898@bastion2.fedora.phx.redhat.com>

huzaifas has set the commit acl on NetworkManager-openvpn (Fedora 11) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Thu Sep 24 04:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:08:22 +0000
Subject: [pkgdb] NetworkManager-openvpn had acl change status
Message-ID: <20090924040822.53C2810F8B4@bastion2.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on NetworkManager-openvpn (Fedora 11) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/NetworkManager-openvpn



From petersen at fedoraproject.org  Thu Sep 24 04:10:52 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 24 Sep 2009 04:10:52 +0000 (UTC)
Subject: rpms/ghc-fgl/devel ghc-fgl.spec,1.1,1.2
Message-ID: <20090924041052.919FF11C0423@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-fgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22044

Modified Files:
	ghc-fgl.spec 
Log Message:
add haskell-platform comment


Index: ghc-fgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-fgl/devel/ghc-fgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-fgl.spec	14 Sep 2009 03:15:21 -0000	1.1
+++ ghc-fgl.spec	24 Sep 2009 04:10:51 -0000	1.2
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.2
 Version:        5.4.2.2
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library



From pkgdb at fedoraproject.org  Thu Sep 24 04:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:23:45 +0000
Subject: [pkgdb] ghc-cgi was added for petersen
Message-ID: <20090924042345.64FBF10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package ghc-cgi with summary Haskell library for writing CGI programs
kevin has approved Package ghc-cgi
kevin has added a Fedora devel branch for ghc-cgi with an owner of petersen
kevin has approved ghc-cgi in Fedora devel
kevin has approved Package ghc-cgi
kevin has set commit to Approved for 107427 on ghc-cgi (Fedora devel)
kevin has set checkout to Approved for 107427 on ghc-cgi (Fedora devel)
kevin has set build to Approved for 107427 on ghc-cgi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/ghc-cgi



From pkgdb at fedoraproject.org  Thu Sep 24 04:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:23:45 +0000
Subject: [pkgdb] ghc-cgi summary updated by kevin
Message-ID: <20090924042347.122EC10F889@bastion2.fedora.phx.redhat.com>

kevin set package ghc-cgi summary to Haskell library for writing CGI programs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/ghc-cgi



From kevin at fedoraproject.org  Thu Sep 24 04:23:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:23:55 +0000 (UTC)
Subject: rpms/ghc-cgi/devel - New directory
Message-ID: <20090924042355.40CE211C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-cgi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26114/rpms/ghc-cgi/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-cgi/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:23:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:23:55 +0000 (UTC)
Subject: rpms/ghc-cgi - New directory
Message-ID: <20090924042355.197D611C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-cgi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26114/rpms/ghc-cgi

Log Message:
Directory /cvs/pkgs/rpms/ghc-cgi added to the repository




From pkgdb at fedoraproject.org  Thu Sep 24 04:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:23:45 +0000
Subject: [pkgdb] ghc-cgi (Fedora, devel) updated by kevin
Message-ID: <20090924042347.2989E10F897@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ghc-cgi (Fedora devel) for haskell-sig
kevin approved watchcommits on ghc-cgi (Fedora devel) for haskell-sig

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/ghc-cgi



From kevin at fedoraproject.org  Thu Sep 24 04:24:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:24:02 +0000 (UTC)
Subject: rpms/ghc-cgi Makefile,NONE,1.1
Message-ID: <20090924042402.0602E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-cgi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26114/rpms/ghc-cgi

Added Files:
	Makefile 
Log Message:
Setup of module ghc-cgi


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-cgi
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  Thu Sep 24 04:24:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:24:02 +0000 (UTC)
Subject: rpms/ghc-cgi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090924042402.4766911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-cgi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26114/rpms/ghc-cgi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-cgi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-cgi
# $Id: Makefile,v 1.1 2009/09/24 04:24:02 kevin Exp $
NAME := ghc-cgi
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  Thu Sep 24 04:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:24:31 +0000
Subject: [pkgdb] viewnior was added for cwickert
Message-ID: <20090924042432.57F7910F884@bastion2.fedora.phx.redhat.com>

kevin has added Package viewnior with summary Elegant Image Viewer
kevin has approved Package viewnior
kevin has added a Fedora devel branch for viewnior with an owner of cwickert
kevin has approved viewnior in Fedora devel
kevin has approved Package viewnior
kevin has set commit to Approved for 107427 on viewnior (Fedora devel)
kevin has set checkout to Approved for 107427 on viewnior (Fedora devel)
kevin has set build to Approved for 107427 on viewnior (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/viewnior



From pkgdb at fedoraproject.org  Thu Sep 24 04:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:24:33 +0000
Subject: [pkgdb] viewnior summary updated by kevin
Message-ID: <20090924042433.39F4110F890@bastion2.fedora.phx.redhat.com>

kevin set package viewnior summary to Elegant Image Viewer

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/viewnior



From pkgdb at fedoraproject.org  Thu Sep 24 04:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:24:33 +0000
Subject: [pkgdb] viewnior (Fedora, 10) updated by kevin
Message-ID: <20090924042433.4690610F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for viewnior
kevin has set commit to Approved for 107427 on viewnior (Fedora 10)
kevin has set checkout to Approved for 107427 on viewnior (Fedora 10)
kevin has set build to Approved for 107427 on viewnior (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/viewnior



From kevin at fedoraproject.org  Thu Sep 24 04:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:24:41 +0000 (UTC)
Subject: rpms/viewnior - New directory
Message-ID: <20090924042441.1702F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viewnior
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26404/rpms/viewnior

Log Message:
Directory /cvs/pkgs/rpms/viewnior added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:24:41 +0000 (UTC)
Subject: rpms/viewnior/devel - New directory
Message-ID: <20090924042441.539F111C0380@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viewnior/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26404/rpms/viewnior/devel

Log Message:
Directory /cvs/pkgs/rpms/viewnior/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:24:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:24:48 +0000 (UTC)
Subject: rpms/viewnior Makefile,NONE,1.1
Message-ID: <20090924042448.33D5811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viewnior
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26404/rpms/viewnior

Added Files:
	Makefile 
Log Message:
Setup of module viewnior


--- NEW FILE Makefile ---
# Top level Makefile for module viewnior
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  Thu Sep 24 04:24:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:24:48 +0000 (UTC)
Subject: rpms/viewnior/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090924042448.7639211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viewnior/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26404/rpms/viewnior/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module viewnior


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: viewnior
# $Id: Makefile,v 1.1 2009/09/24 04:24:48 kevin Exp $
NAME := viewnior
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  Thu Sep 24 04:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:24:33 +0000
Subject: [pkgdb] viewnior (Fedora, 10) updated by kevin
Message-ID: <20090924042433.519D910F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for viewnior
kevin has set commit to Approved for 107427 on viewnior (Fedora 11)
kevin has set checkout to Approved for 107427 on viewnior (Fedora 11)
kevin has set build to Approved for 107427 on viewnior (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/viewnior



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:05 +0000
Subject: [pkgdb] firehol was added for jussilehtola
Message-ID: <20090924043305.96E9D10F841@bastion2.fedora.phx.redhat.com>

kevin has added Package firehol with summary A powerful yet easy to use iptables frontend
kevin has approved Package firehol
kevin has added a Fedora devel branch for firehol with an owner of jussilehtola
kevin has approved firehol in Fedora devel
kevin has approved Package firehol
kevin has set commit to Approved for 107427 on firehol (Fedora devel)
kevin has set checkout to Approved for 107427 on firehol (Fedora devel)
kevin has set build to Approved for 107427 on firehol (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/firehol



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:07 +0000
Subject: [pkgdb] firehol (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924043307.55E0A10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for firehol
kevin has set commit to Approved for 107427 on firehol (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on firehol (Fedora EPEL 4)
kevin has set build to Approved for 107427 on firehol (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/firehol



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:07 +0000
Subject: [pkgdb] firehol summary updated by kevin
Message-ID: <20090924043307.4FF4510F883@bastion2.fedora.phx.redhat.com>

kevin set package firehol summary to A powerful yet easy to use iptables frontend

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/firehol



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:07 +0000
Subject: [pkgdb] firehol (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924043307.5FCF310F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for firehol
kevin has set commit to Approved for 107427 on firehol (Fedora 10)
kevin has set checkout to Approved for 107427 on firehol (Fedora 10)
kevin has set build to Approved for 107427 on firehol (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/firehol



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:07 +0000
Subject: [pkgdb] firehol (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924043307.6D08810F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for firehol
kevin has set commit to Approved for 107427 on firehol (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on firehol (Fedora EPEL 5)
kevin has set build to Approved for 107427 on firehol (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/firehol



From kevin at fedoraproject.org  Thu Sep 24 04:33:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:33:16 +0000 (UTC)
Subject: rpms/firehol - New directory
Message-ID: <20090924043316.1B84711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/firehol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq28686/rpms/firehol

Log Message:
Directory /cvs/pkgs/rpms/firehol added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:33:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:33:16 +0000 (UTC)
Subject: rpms/firehol/devel - New directory
Message-ID: <20090924043316.4165811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/firehol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq28686/rpms/firehol/devel

Log Message:
Directory /cvs/pkgs/rpms/firehol/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:33:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:33:23 +0000 (UTC)
Subject: rpms/firehol Makefile,NONE,1.1
Message-ID: <20090924043323.6040311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/firehol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq28686/rpms/firehol

Added Files:
	Makefile 
Log Message:
Setup of module firehol


--- NEW FILE Makefile ---
# Top level Makefile for module firehol
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  Thu Sep 24 04:33:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:33:23 +0000 (UTC)
Subject: rpms/firehol/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090924043323.9EC3F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/firehol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq28686/rpms/firehol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module firehol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: firehol
# $Id: Makefile,v 1.1 2009/09/24 04:33:23 kevin Exp $
NAME := firehol
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  Thu Sep 24 04:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:07 +0000
Subject: [pkgdb] firehol (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924043307.740EE10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for firehol
kevin has set commit to Approved for 107427 on firehol (Fedora 11)
kevin has set checkout to Approved for 107427 on firehol (Fedora 11)
kevin has set build to Approved for 107427 on firehol (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/firehol



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:49 +0000
Subject: [pkgdb] perl-Nagios-Plugin-Beanstalk was added for ruben
Message-ID: <20090924043350.E255310F88A@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Nagios-Plugin-Beanstalk with summary Nagios plugin to observe Beanstalkd queue server
kevin has approved Package perl-Nagios-Plugin-Beanstalk
kevin has added a Fedora devel branch for perl-Nagios-Plugin-Beanstalk with an owner of ruben
kevin has approved perl-Nagios-Plugin-Beanstalk in Fedora devel
kevin has approved Package perl-Nagios-Plugin-Beanstalk
kevin has set commit to Approved for 107427 on perl-Nagios-Plugin-Beanstalk (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Nagios-Plugin-Beanstalk (Fedora devel)
kevin has set build to Approved for 107427 on perl-Nagios-Plugin-Beanstalk (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Nagios-Plugin-Beanstalk



From pkgdb at fedoraproject.org  Thu Sep 24 04:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:52 +0000
Subject: [pkgdb] perl-Nagios-Plugin-Beanstalk summary updated by kevin
Message-ID: <20090924043352.8CD1E10F89A@bastion2.fedora.phx.redhat.com>

kevin set package perl-Nagios-Plugin-Beanstalk summary to Nagios plugin to observe Beanstalkd queue server

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Nagios-Plugin-Beanstalk



From kevin at fedoraproject.org  Thu Sep 24 04:34:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:34:00 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk - New directory
Message-ID: <20090924043400.1C2F111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29134/rpms/perl-Nagios-Plugin-Beanstalk

Log Message:
Directory /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk added to the repository




From pkgdb at fedoraproject.org  Thu Sep 24 04:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:33:52 +0000
Subject: [pkgdb] perl-Nagios-Plugin-Beanstalk (Fedora, 11) updated by kevin
Message-ID: <20090924043352.96E1410F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Nagios-Plugin-Beanstalk
kevin has set commit to Approved for 107427 on perl-Nagios-Plugin-Beanstalk (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Nagios-Plugin-Beanstalk (Fedora 11)
kevin has set build to Approved for 107427 on perl-Nagios-Plugin-Beanstalk (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Nagios-Plugin-Beanstalk



From kevin at fedoraproject.org  Thu Sep 24 04:34:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:34:00 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/devel - New directory
Message-ID: <20090924043400.464C011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29134/rpms/perl-Nagios-Plugin-Beanstalk/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:34:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:34:07 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk Makefile,NONE,1.1
Message-ID: <20090924043407.8CF2911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29134/rpms/perl-Nagios-Plugin-Beanstalk

Added Files:
	Makefile 
Log Message:
Setup of module perl-Nagios-Plugin-Beanstalk


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Nagios-Plugin-Beanstalk
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  Thu Sep 24 04:34:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:34:07 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090924043407.C98AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29134/rpms/perl-Nagios-Plugin-Beanstalk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Nagios-Plugin-Beanstalk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Nagios-Plugin-Beanstalk
# $Id: Makefile,v 1.1 2009/09/24 04:34:07 kevin Exp $
NAME := perl-Nagios-Plugin-Beanstalk
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  Thu Sep 24 04:34:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:34:59 +0000
Subject: [pkgdb] perl-Text-Diff-Parser was added for eseyman
Message-ID: <20090924043500.EA33410F889@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Text-Diff-Parser with summary Parse patch files containing unified and standard diffs
kevin has approved Package perl-Text-Diff-Parser
kevin has added a Fedora devel branch for perl-Text-Diff-Parser with an owner of eseyman
kevin has approved perl-Text-Diff-Parser in Fedora devel
kevin has approved Package perl-Text-Diff-Parser
kevin has set commit to Approved for 107427 on perl-Text-Diff-Parser (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Text-Diff-Parser (Fedora devel)
kevin has set build to Approved for 107427 on perl-Text-Diff-Parser (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Text-Diff-Parser



From pkgdb at fedoraproject.org  Thu Sep 24 04:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:35:01 +0000
Subject: [pkgdb] perl-Text-Diff-Parser summary updated by kevin
Message-ID: <20090924043502.C3E1010F89A@bastion2.fedora.phx.redhat.com>

kevin set package perl-Text-Diff-Parser summary to Parse patch files containing unified and standard diffs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Text-Diff-Parser



From pkgdb at fedoraproject.org  Thu Sep 24 04:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:35:01 +0000
Subject: [pkgdb] perl-Text-Diff-Parser (Fedora, 10) updated by kevin
Message-ID: <20090924043502.CABBC10F89D@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Text-Diff-Parser (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Text-Diff-Parser (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Text-Diff-Parser



From pkgdb at fedoraproject.org  Thu Sep 24 04:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:35:01 +0000
Subject: [pkgdb] perl-Text-Diff-Parser (Fedora, 10) updated by kevin
Message-ID: <20090924043502.DA86610F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Text-Diff-Parser
kevin has set commit to Approved for 107427 on perl-Text-Diff-Parser (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Text-Diff-Parser (Fedora 11)
kevin has set build to Approved for 107427 on perl-Text-Diff-Parser (Fedora 11)
kevin approved watchbugzilla on perl-Text-Diff-Parser (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Text-Diff-Parser (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Text-Diff-Parser



From pkgdb at fedoraproject.org  Thu Sep 24 04:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:35:01 +0000
Subject: [pkgdb] perl-Text-Diff-Parser (Fedora, 10) updated by kevin
Message-ID: <20090924043502.E183B10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Text-Diff-Parser
kevin has set commit to Approved for 107427 on perl-Text-Diff-Parser (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Text-Diff-Parser (Fedora 12)
kevin has set build to Approved for 107427 on perl-Text-Diff-Parser (Fedora 12)
kevin approved watchbugzilla on perl-Text-Diff-Parser (Fedora 12) for perl-sig
kevin approved watchcommits on perl-Text-Diff-Parser (Fedora 12) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Text-Diff-Parser



From kevin at fedoraproject.org  Thu Sep 24 04:35:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:35:13 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser - New directory
Message-ID: <20090924043513.1C82811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw29489/rpms/perl-Text-Diff-Parser

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-Diff-Parser added to the repository




From pkgdb at fedoraproject.org  Thu Sep 24 04:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:35:01 +0000
Subject: [pkgdb] perl-Text-Diff-Parser (Fedora, 10) updated by kevin
Message-ID: <20090924043502.EF0C710F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Text-Diff-Parser
kevin has set commit to Approved for 107427 on perl-Text-Diff-Parser (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Text-Diff-Parser (Fedora 10)
kevin has set build to Approved for 107427 on perl-Text-Diff-Parser (Fedora 10)
kevin approved watchbugzilla on perl-Text-Diff-Parser (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Text-Diff-Parser (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Text-Diff-Parser



From kevin at fedoraproject.org  Thu Sep 24 04:35:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:35:13 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/devel - New directory
Message-ID: <20090924043513.4988711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw29489/rpms/perl-Text-Diff-Parser/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:35:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:35:20 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser Makefile,NONE,1.1
Message-ID: <20090924043520.0294011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw29489/rpms/perl-Text-Diff-Parser

Added Files:
	Makefile 
Log Message:
Setup of module perl-Text-Diff-Parser


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Diff-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 kevin at fedoraproject.org  Thu Sep 24 04:35:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:35:20 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090924043520.6BFDB11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw29489/rpms/perl-Text-Diff-Parser/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Diff-Parser


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Text-Diff-Parser
# $Id: Makefile,v 1.1 2009/09/24 04:35:20 kevin Exp $
NAME := perl-Text-Diff-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  Thu Sep 24 04:36:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:36:35 +0000
Subject: [pkgdb] lua-lunit was added for salimma
Message-ID: <20090924043635.E740410F841@bastion2.fedora.phx.redhat.com>

kevin has added Package lua-lunit with summary Unit testing framework for Lua
kevin has approved Package lua-lunit
kevin has added a Fedora devel branch for lua-lunit with an owner of salimma
kevin has approved lua-lunit in Fedora devel
kevin has approved Package lua-lunit
kevin has set commit to Approved for 107427 on lua-lunit (Fedora devel)
kevin has set checkout to Approved for 107427 on lua-lunit (Fedora devel)
kevin has set build to Approved for 107427 on lua-lunit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-lunit



From pkgdb at fedoraproject.org  Thu Sep 24 04:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:36:36 +0000
Subject: [pkgdb] lua-lunit summary updated by kevin
Message-ID: <20090924043637.7F04C10F884@bastion2.fedora.phx.redhat.com>

kevin set package lua-lunit summary to Unit testing framework for Lua

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-lunit



From pkgdb at fedoraproject.org  Thu Sep 24 04:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:36:36 +0000
Subject: [pkgdb] lua-lunit (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043637.8ECFC10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lua-lunit
kevin has set commit to Approved for 107427 on lua-lunit (Fedora 10)
kevin has set checkout to Approved for 107427 on lua-lunit (Fedora 10)
kevin has set build to Approved for 107427 on lua-lunit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-lunit



From pkgdb at fedoraproject.org  Thu Sep 24 04:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:36:36 +0000
Subject: [pkgdb] lua-lunit (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043637.92DD610F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for lua-lunit
kevin has set commit to Approved for 107427 on lua-lunit (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on lua-lunit (Fedora EPEL 5)
kevin has set build to Approved for 107427 on lua-lunit (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-lunit



From kevin at fedoraproject.org  Thu Sep 24 04:36:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:36:47 +0000 (UTC)
Subject: rpms/lua-lunit - New directory
Message-ID: <20090924043647.1BE9E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-lunit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30080/rpms/lua-lunit

Log Message:
Directory /cvs/pkgs/rpms/lua-lunit added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:36:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:36:47 +0000 (UTC)
Subject: rpms/lua-lunit/devel - New directory
Message-ID: <20090924043647.4662C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-lunit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30080/rpms/lua-lunit/devel

Log Message:
Directory /cvs/pkgs/rpms/lua-lunit/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:36:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:36:53 +0000 (UTC)
Subject: rpms/lua-lunit Makefile,NONE,1.1
Message-ID: <20090924043653.DE09711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-lunit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30080/rpms/lua-lunit

Added Files:
	Makefile 
Log Message:
Setup of module lua-lunit


--- NEW FILE Makefile ---
# Top level Makefile for module lua-lunit
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  Thu Sep 24 04:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:36:36 +0000
Subject: [pkgdb] lua-lunit (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043637.996BD10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lua-lunit
kevin has set commit to Approved for 107427 on lua-lunit (Fedora 11)
kevin has set checkout to Approved for 107427 on lua-lunit (Fedora 11)
kevin has set build to Approved for 107427 on lua-lunit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-lunit



From kevin at fedoraproject.org  Thu Sep 24 04:36:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:36:54 +0000 (UTC)
Subject: rpms/lua-lunit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090924043654.2265011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-lunit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30080/rpms/lua-lunit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lua-lunit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lua-lunit
# $Id: Makefile,v 1.1 2009/09/24 04:36:53 kevin Exp $
NAME := lua-lunit
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  Thu Sep 24 04:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:37:19 +0000
Subject: [pkgdb] lua-json was added for salimma
Message-ID: <20090924043719.4FDD010F889@bastion2.fedora.phx.redhat.com>

kevin has added Package lua-json with summary JSON Parser/Constructor for Lua
kevin has approved Package lua-json
kevin has added a Fedora devel branch for lua-json with an owner of salimma
kevin has approved lua-json in Fedora devel
kevin has approved Package lua-json
kevin has set commit to Approved for 107427 on lua-json (Fedora devel)
kevin has set checkout to Approved for 107427 on lua-json (Fedora devel)
kevin has set build to Approved for 107427 on lua-json (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-json



From pkgdb at fedoraproject.org  Thu Sep 24 04:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:37:19 +0000
Subject: [pkgdb] lua-json (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043720.746BA10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lua-json
kevin has set commit to Approved for 107427 on lua-json (Fedora 10)
kevin has set checkout to Approved for 107427 on lua-json (Fedora 10)
kevin has set build to Approved for 107427 on lua-json (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-json



From pkgdb at fedoraproject.org  Thu Sep 24 04:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:37:19 +0000
Subject: [pkgdb] lua-json summary updated by kevin
Message-ID: <20090924043720.6F2FB10F898@bastion2.fedora.phx.redhat.com>

kevin set package lua-json summary to JSON Parser/Constructor for Lua

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-json



From pkgdb at fedoraproject.org  Thu Sep 24 04:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:37:19 +0000
Subject: [pkgdb] lua-json (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043720.7FBA510F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lua-json
kevin has set commit to Approved for 107427 on lua-json (Fedora 11)
kevin has set checkout to Approved for 107427 on lua-json (Fedora 11)
kevin has set build to Approved for 107427 on lua-json (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-json



From pkgdb at fedoraproject.org  Thu Sep 24 04:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:37:19 +0000
Subject: [pkgdb] lua-json (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043720.898B610F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for lua-json
kevin has set commit to Approved for 107427 on lua-json (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on lua-json (Fedora EPEL 5)
kevin has set build to Approved for 107427 on lua-json (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lua-json



From kevin at fedoraproject.org  Thu Sep 24 04:37:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:37:28 +0000 (UTC)
Subject: rpms/lua-json - New directory
Message-ID: <20090924043728.19ECC11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-json
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG30444/rpms/lua-json

Log Message:
Directory /cvs/pkgs/rpms/lua-json added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:37:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:37:28 +0000 (UTC)
Subject: rpms/lua-json/devel - New directory
Message-ID: <20090924043728.46BC311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-json/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG30444/rpms/lua-json/devel

Log Message:
Directory /cvs/pkgs/rpms/lua-json/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:37:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:37:35 +0000 (UTC)
Subject: rpms/lua-json Makefile,NONE,1.1
Message-ID: <20090924043735.C515E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-json
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG30444/rpms/lua-json

Added Files:
	Makefile 
Log Message:
Setup of module lua-json


--- NEW FILE Makefile ---
# Top level Makefile for module lua-json
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  Thu Sep 24 04:37:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:37:36 +0000 (UTC)
Subject: rpms/lua-json/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090924043736.1D95411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lua-json/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG30444/rpms/lua-json/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lua-json


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lua-json
# $Id: Makefile,v 1.1 2009/09/24 04:37:35 kevin Exp $
NAME := lua-json
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  Thu Sep 24 04:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:38:04 +0000
Subject: [pkgdb] editarea was added for coec
Message-ID: <20090924043804.2E2C710F86F@bastion2.fedora.phx.redhat.com>

kevin has added Package editarea with summary A replacement for the HTML textarea tag
kevin has approved Package editarea
kevin has added a Fedora devel branch for editarea with an owner of coec
kevin has approved editarea in Fedora devel
kevin has approved Package editarea
kevin has set commit to Approved for 107427 on editarea (Fedora devel)
kevin has set checkout to Approved for 107427 on editarea (Fedora devel)
kevin has set build to Approved for 107427 on editarea (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/editarea



From pkgdb at fedoraproject.org  Thu Sep 24 04:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:38:06 +0000
Subject: [pkgdb] editarea summary updated by kevin
Message-ID: <20090924043806.57D1410F883@bastion2.fedora.phx.redhat.com>

kevin set package editarea summary to A replacement for the HTML textarea tag

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/editarea



From pkgdb at fedoraproject.org  Thu Sep 24 04:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:38:06 +0000
Subject: [pkgdb] editarea (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043806.6937010F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for editarea
kevin has set commit to Approved for 107427 on editarea (Fedora 10)
kevin has set checkout to Approved for 107427 on editarea (Fedora 10)
kevin has set build to Approved for 107427 on editarea (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/editarea



From pkgdb at fedoraproject.org  Thu Sep 24 04:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:38:06 +0000
Subject: [pkgdb] editarea (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043806.8189A10F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for editarea
kevin has set commit to Approved for 107427 on editarea (Fedora 11)
kevin has set checkout to Approved for 107427 on editarea (Fedora 11)
kevin has set build to Approved for 107427 on editarea (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/editarea



From pkgdb at fedoraproject.org  Thu Sep 24 04:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:38:06 +0000
Subject: [pkgdb] editarea (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924043806.8F64D10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for editarea
kevin has set commit to Approved for 107427 on editarea (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on editarea (Fedora EPEL 5)
kevin has set build to Approved for 107427 on editarea (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/editarea



From kevin at fedoraproject.org  Thu Sep 24 04:38:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:38:13 +0000 (UTC)
Subject: rpms/editarea - New directory
Message-ID: <20090924043813.1B9E211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/editarea
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30825/rpms/editarea

Log Message:
Directory /cvs/pkgs/rpms/editarea added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:38:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:38:13 +0000 (UTC)
Subject: rpms/editarea/devel - New directory
Message-ID: <20090924043813.4DB9411C0337@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/editarea/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30825/rpms/editarea/devel

Log Message:
Directory /cvs/pkgs/rpms/editarea/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 04:38:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:38:19 +0000 (UTC)
Subject: rpms/editarea Makefile,NONE,1.1
Message-ID: <20090924043819.BC28A11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/editarea
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30825/rpms/editarea

Added Files:
	Makefile 
Log Message:
Setup of module editarea


--- NEW FILE Makefile ---
# Top level Makefile for module editarea
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  Thu Sep 24 04:38:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 04:38:20 +0000 (UTC)
Subject: rpms/editarea/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090924043820.1F2A511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/editarea/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30825/rpms/editarea/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module editarea


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: editarea
# $Id: Makefile,v 1.1 2009/09/24 04:38:19 kevin Exp $
NAME := editarea
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  Thu Sep 24 04:39:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:39:03 +0000
Subject: [pkgdb] log4cpp (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924043903.2C0F210F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for log4cpp
kevin has set commit to Approved for 107427 on log4cpp (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on log4cpp (Fedora EPEL 4)
kevin has set build to Approved for 107427 on log4cpp (Fedora EPEL 4)
kevin changed owner of log4cpp in Fedora EPEL 4 to mccann
kevin approved watchbugzilla on log4cpp (Fedora EPEL 4) for stevetraylen
kevin approved watchcommits on log4cpp (Fedora EPEL 4) for stevetraylen
kevin approved commit on log4cpp (Fedora EPEL 4) for stevetraylen
kevin approved build on log4cpp (Fedora EPEL 4) for stevetraylen
kevin approved approveacls on log4cpp (Fedora EPEL 4) for stevetraylen

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/log4cpp



From pkgdb at fedoraproject.org  Thu Sep 24 04:39:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:39:03 +0000
Subject: [pkgdb] log4cpp (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924043903.370B910F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for log4cpp
kevin has set commit to Approved for 107427 on log4cpp (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on log4cpp (Fedora EPEL 5)
kevin has set build to Approved for 107427 on log4cpp (Fedora EPEL 5)
kevin changed owner of log4cpp in Fedora EPEL 5 to mccann
kevin approved watchbugzilla on log4cpp (Fedora EPEL 5) for stevetraylen
kevin approved watchcommits on log4cpp (Fedora EPEL 5) for stevetraylen
kevin approved commit on log4cpp (Fedora EPEL 5) for stevetraylen
kevin approved build on log4cpp (Fedora EPEL 5) for stevetraylen
kevin approved approveacls on log4cpp (Fedora EPEL 5) for stevetraylen

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/log4cpp



From pkgdb at fedoraproject.org  Thu Sep 24 04:40:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:40:18 +0000
Subject: [pkgdb] openjpeg (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924044018.6961F10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for openjpeg
kevin has set commit to Approved for 107427 on openjpeg (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on openjpeg (Fedora EPEL 5)
kevin has set build to Approved for 107427 on openjpeg (Fedora EPEL 5)
kevin changed owner of openjpeg in Fedora EPEL 5 to agoode

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/openjpeg



From pkgdb at fedoraproject.org  Thu Sep 24 04:40:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:40:55 +0000
Subject: [pkgdb] redir (Fedora EPEL, 5) updated by kevin
Message-ID: <20090924044055.4B47310F841@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for redir
kevin has set commit to Approved for 107427 on redir (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on redir (Fedora EPEL 5)
kevin has set build to Approved for 107427 on redir (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/redir



From pkgdb at fedoraproject.org  Thu Sep 24 04:59:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:59:33 +0000
Subject: [pkgdb] sblim-cmpi-base had acl change status
Message-ID: <20090924045933.C00AE10F884@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-base (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-cmpi-base



From pkgdb at fedoraproject.org  Thu Sep 24 04:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:59:25 +0000
Subject: [pkgdb] sblim-cmpi-base had acl change status
Message-ID: <20090924045925.A2A5D10F86F@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-base (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-cmpi-base



From pkgdb at fedoraproject.org  Thu Sep 24 04:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 04:59:39 +0000
Subject: [pkgdb] sblim-cmpi-base had acl change status
Message-ID: <20090924045939.0D91910F889@bastion2.fedora.phx.redhat.com>

vcrhonek has set the commit acl on sblim-cmpi-base (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-cmpi-base



From rakesh at fedoraproject.org  Thu Sep 24 06:03:40 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 24 Sep 2009 06:03:40 +0000 (UTC)
Subject: rpms/coredumper/F-11 coredumper.spec,1.3,1.4
Message-ID: <20090924060340.C29CF11C00DB@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25019

Modified Files:
	coredumper.spec 
Log Message:
Replaced ExcludeArch with ExclusiveArch


Index: coredumper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/F-11/coredumper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- coredumper.spec	21 Apr 2009 04:27:41 -0000	1.3
+++ coredumper.spec	24 Sep 2009 06:03:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           coredumper
 Version:        1.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Library to create core dumps
 
 Group:          Development/Tools
@@ -12,13 +12,9 @@ Patch1:         coredumper_unittest_c.pa
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  binutils, gdb
 
-# Primary Architectures with exclude arch bug number
-ExcludeArch:    ia64  #462342
-ExcludeArch:    ppc   #461340
-ExcludeArch:    ppc64 #461341
+# Bugs ia64 - BZ at 462342, ppc - BZ at 461340, ppc64 - BZ at 461341
+ExclusiveArch: %{ix86} x86_64
 
-# Secondary Architectures
-ExcludeArch:    s390, sparc, alpha
 
 %description
 The coredumper library can be compiled into applications to create
@@ -82,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/google/*.h
 
 %changelog
+* Wed Sep 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.1-9
+- Replaced ExcludeArch with ExclusiveArch
+
 * Mon Apr 20 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.1-8
 - GDB messages changed, fixes the test suite - by Jan Kratochvil (FTBFS #496523)
 



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:30 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924063830.950B010F86F@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:32 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924063832.762E010F883@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:34 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924063834.3AD4410F889@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:35 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924063835.A0D8C10F890@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:36 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924063836.6716D10F898@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:38 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924063838.8EBEE10F89B@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:46 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924063846.E49E410F841@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:48 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924063848.B486B10F89D@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:49 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924063850.05AD310F89F@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:50 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924063851.4003810F8A1@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:52 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924063852.E55F310F883@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:38:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:38:51 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924063852.25B8710F8A4@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:03 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924063903.618B110F889@bastion2.fedora.phx.redhat.com>

Package bc in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:04 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924063904.CF42C10F897@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:06 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924063906.5247910F898@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:07 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924063908.1FF4310F8A9@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:09 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924063909.2079C10F8AC@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:09 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924063909.DACF310F8B0@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:21 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924063921.3E9B910F841@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:23 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924063924.1118110F89C@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora EPEL 5 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:24 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924063924.CA67B10F8B1@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:24 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924063925.BAD0710F8B3@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:27 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924063927.66A0010F8B5@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:28 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924063928.18D1A10F8B6@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:44 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924063944.0398D10F8A4@bastion2.fedora.phx.redhat.com>

Package eject in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:43 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924063945.04D7C10F8BA@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:45 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924063945.DF6BF10F8BD@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:47 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924063947.0D2A910F8BF@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:48 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924063948.4F98910F8C1@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:39:49 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924063949.2947510F8C5@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:00 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924064000.E385B10F890@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:01 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924064001.9467B10F898@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:02 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924064002.A6A1710F8A6@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:02 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924064003.C904D10F8C6@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:04 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924064004.932C810F8C9@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:06 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924064006.22BA310F8CD@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:38 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064038.93ECA10F841@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:40 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064040.41B7410F89C@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:41 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064041.DA20F10F89D@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:41 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064042.B301610F8AB@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:44 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064044.1939A10F8AD@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:57 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924064059.0299F10F87C@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:00 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924064100.7D37210F8B3@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 06:40:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:40:58 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924064059.9DE0F10F8B1@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:02 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924064102.5C6EC10F8B5@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:02 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924064102.E941A10F8B7@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:03 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924064103.9C41C10F8CF@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:14 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064114.83AD110F8D3@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:15 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064115.31BA610F8D6@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:15 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064116.619DA10F8D7@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:16 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064117.05E7D10F8D8@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:32 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064133.4FA9E10F8C5@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora devel is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:34 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064134.524D610F8DA@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 7 is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:35 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064135.802B810F8DC@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 8 is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:36 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064136.6455910F8DE@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 9 is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:37 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064137.5B98110F8E0@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 10 is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:39 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064139.90ADC10F8E1@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 11 is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:44 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064144.2B2ED10F889@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 11 is now owned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:49 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchbugzilla
Message-ID: <20090924064149.EED6A10F897@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on lksctp-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:49 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchcommits
Message-ID: <20090924064150.9041A10F8EB@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on lksctp-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:51 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up commit
Message-ID: <20090924064151.6489210F8EE@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on lksctp-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:52 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up approveacls
Message-ID: <20090924064152.6C07F10F8A5@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on lksctp-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:52 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064152.C447310F8A8@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:57 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchcommits
Message-ID: <20090924064157.E7DE510F8FB@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on lksctp-tools (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:57 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchbugzilla
Message-ID: <20090924064157.36C0B10F8F2@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on lksctp-tools (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:59 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064159.A798510F901@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:59 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up approveacls
Message-ID: <20090924064159.576CE10F8FF@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on lksctp-tools (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:41:58 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up commit
Message-ID: <20090924064158.A785310F8FD@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on lksctp-tools (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:02 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchbugzilla
Message-ID: <20090924064203.044F910F902@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on lksctp-tools (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:02 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchcommits
Message-ID: <20090924064203.F072910F8C7@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on lksctp-tools (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:03 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up commit
Message-ID: <20090924064204.B8F9C10F8C9@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on lksctp-tools (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:04 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up approveacls
Message-ID: <20090924064205.1F7BB10F904@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on lksctp-tools (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:05 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064205.DA69B10F906@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:12 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchbugzilla
Message-ID: <20090924064212.A926610F90A@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on lksctp-tools (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:13 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up commit
Message-ID: <20090924064213.703D310F90C@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on lksctp-tools (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:12 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchcommits
Message-ID: <20090924064213.7CB8B10F90E@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on lksctp-tools (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:12 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up approveacls
Message-ID: <20090924064214.1B0E410F90F@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on lksctp-tools (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:14 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064214.598CF10F911@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:16 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchbugzilla
Message-ID: <20090924064216.6E72910F841@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on lksctp-tools (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:16 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchcommits
Message-ID: <20090924064217.0648610F8CD@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on lksctp-tools (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:18 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up approveacls
Message-ID: <20090924064218.5ACA410F915@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on lksctp-tools (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:17 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up commit
Message-ID: <20090924064217.C713910F913@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on lksctp-tools (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:18 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064218.D4A8010F917@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:21 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchbugzilla
Message-ID: <20090924064221.2209C10F919@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on lksctp-tools (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:21 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up watchcommits
Message-ID: <20090924064221.A431010F91C@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on lksctp-tools (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:22 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up commit
Message-ID: <20090924064222.C599D10F91E@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on lksctp-tools (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:23 +0000
Subject: [pkgdb] lksctp-tools: zprikryl has given up approveacls
Message-ID: <20090924064223.213BE10F920@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on lksctp-tools (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:23 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20090924064223.D3F6210F922@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/lksctp-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:36 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090924064236.C398110F89E@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/mtr



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:36 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090924064237.CA36A10F8A9@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/mtr



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:39 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090924064239.E41F410F8AB@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/mtr



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:40 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090924064240.B39F310F8AD@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/mtr



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:41 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090924064241.7865210F923@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/mtr



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:41 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090924064242.B7BCB10F925@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/mtr



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:58 +0000
Subject: [pkgdb] units: zprikryl has given up watchbugzilla
Message-ID: <20090924064258.1927A10F8B0@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on units (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:59 +0000
Subject: [pkgdb] units: zprikryl has given up watchcommits
Message-ID: <20090924064259.2EF0710F8B2@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on units (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:42:59 +0000
Subject: [pkgdb] units: zprikryl has given up commit
Message-ID: <20090924064259.AB51210F927@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on units (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:00 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064300.BA43810F92E@bastion2.fedora.phx.redhat.com>

Package units in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:00 +0000
Subject: [pkgdb] units: zprikryl has given up approveacls
Message-ID: <20090924064300.4C89310F92B@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on units (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:01 +0000
Subject: [pkgdb] units: zprikryl has given up watchbugzilla
Message-ID: <20090924064302.810B210F933@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on units (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:03 +0000
Subject: [pkgdb] units: zprikryl has given up watchcommits
Message-ID: <20090924064303.23A3F10F937@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on units (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:03 +0000
Subject: [pkgdb] units: zprikryl has given up commit
Message-ID: <20090924064303.BEEBA10F939@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on units (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:04 +0000
Subject: [pkgdb] units: zprikryl has given up approveacls
Message-ID: <20090924064304.99CAE10F93D@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on units (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:05 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064305.1D14510F943@bastion2.fedora.phx.redhat.com>

Package units in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:06 +0000
Subject: [pkgdb] units: zprikryl has given up watchbugzilla
Message-ID: <20090924064306.BFEAB10F946@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on units (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:07 +0000
Subject: [pkgdb] units: zprikryl has given up commit
Message-ID: <20090924064307.EDE6410F94A@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on units (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:07 +0000
Subject: [pkgdb] units: zprikryl has given up watchcommits
Message-ID: <20090924064307.2C60E10F948@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on units (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:08 +0000
Subject: [pkgdb] units: zprikryl has given up approveacls
Message-ID: <20090924064308.618D610F94C@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on units (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:09 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064309.67ED910F8B6@bastion2.fedora.phx.redhat.com>

Package units in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:11 +0000
Subject: [pkgdb] units: zprikryl has given up watchbugzilla
Message-ID: <20090924064311.3ABE910F8CE@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on units (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:12 +0000
Subject: [pkgdb] units: zprikryl has given up watchcommits
Message-ID: <20090924064312.4819610F94D@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on units (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:12 +0000
Subject: [pkgdb] units: zprikryl has given up commit
Message-ID: <20090924064312.6090B10F94F@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on units (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:13 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064313.7CCC910F953@bastion2.fedora.phx.redhat.com>

Package units in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:14 +0000
Subject: [pkgdb] units: zprikryl has given up watchbugzilla
Message-ID: <20090924064314.E2BA810F955@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on units (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:12 +0000
Subject: [pkgdb] units: zprikryl has given up approveacls
Message-ID: <20090924064312.D799A10F951@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on units (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:14 +0000
Subject: [pkgdb] units: zprikryl has given up watchcommits
Message-ID: <20090924064315.8B32D10F957@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on units (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:16 +0000
Subject: [pkgdb] units: zprikryl has given up commit
Message-ID: <20090924064316.2700D10F959@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on units (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:16 +0000
Subject: [pkgdb] units: zprikryl has given up approveacls
Message-ID: <20090924064317.AFD2410F95A@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on units (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:18 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064318.6938D10F95D@bastion2.fedora.phx.redhat.com>

Package units in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:19 +0000
Subject: [pkgdb] units: zprikryl has given up watchbugzilla
Message-ID: <20090924064319.C8D6D10F8B8@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchbugzilla acl on units (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:19 +0000
Subject: [pkgdb] units: zprikryl has given up watchcommits
Message-ID: <20090924064320.9FFF310F8D0@bastion2.fedora.phx.redhat.com>

zprikryl has given up the watchcommits acl on units (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:21 +0000
Subject: [pkgdb] units: zprikryl has given up commit
Message-ID: <20090924064321.5062910F95F@bastion2.fedora.phx.redhat.com>

zprikryl has given up the commit acl on units (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:21 +0000
Subject: [pkgdb] units: zprikryl has given up approveacls
Message-ID: <20090924064321.BE1AF10F961@bastion2.fedora.phx.redhat.com>

zprikryl has given up the approveacls acl on units (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:22 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064322.897F310F963@bastion2.fedora.phx.redhat.com>

Package units in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:45 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064345.C262D10F8A4@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:46 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064346.A170110F971@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:49 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064349.5B1B210F985@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 8 is now owned by rnorwood

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:52 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064352.90FDE10F997@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:53 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064353.1AF1410F9AB@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:43:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:43:54 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064354.885E610F9B8@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:44:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:44:00 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924064400.C749A10F8C2@bastion2.fedora.phx.redhat.com>

Package eject in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:44:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:44:10 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924064410.CD4B310F8C5@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:44:14 +0000
Subject: [pkgdb] eject ownership updated
Message-ID: <20090924064414.C311910F8DB@bastion2.fedora.phx.redhat.com>

Package eject in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/eject



From pkgdb at fedoraproject.org  Thu Sep 24 06:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:44:38 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064438.2089C10F889@bastion2.fedora.phx.redhat.com>

Package units in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:44:43 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064444.6D3EB10F890@bastion2.fedora.phx.redhat.com>

Package units in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:44:46 +0000
Subject: [pkgdb] units ownership updated
Message-ID: <20090924064447.94B5410F898@bastion2.fedora.phx.redhat.com>

Package units in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/units



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:15 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064515.DABB110F8DC@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:20 +0000
Subject: [pkgdb] fbset ownership updated
Message-ID: <20090924064520.4BBAB10F8C6@bastion2.fedora.phx.redhat.com>

Package fbset in Fedora devel was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/fbset



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:19 +0000
Subject: [pkgdb] fbset ownership updated
Message-ID: <20090924064521.0B47B10F8C8@bastion2.fedora.phx.redhat.com>

Package fbset in Fedora 7 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/fbset



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:21 +0000
Subject: [pkgdb] fbset ownership updated
Message-ID: <20090924064522.0CAE910F902@bastion2.fedora.phx.redhat.com>

Package fbset in Fedora 8 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/fbset



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:23 +0000
Subject: [pkgdb] fbset ownership updated
Message-ID: <20090924064523.151D910F9D4@bastion2.fedora.phx.redhat.com>

Package fbset in Fedora 9 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/fbset



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:23 +0000
Subject: [pkgdb] fbset ownership updated
Message-ID: <20090924064523.DED3910F9D6@bastion2.fedora.phx.redhat.com>

Package fbset in Fedora 10 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/fbset



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:24 +0000
Subject: [pkgdb] fbset ownership updated
Message-ID: <20090924064524.7579810F9D8@bastion2.fedora.phx.redhat.com>

Package fbset in Fedora 11 was orphaned by zprikryl

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/fbset



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:42 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064544.0D37510F904@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:45:55 +0000
Subject: [pkgdb] vorbis-tools ownership updated
Message-ID: <20090924064555.739D810F90E@bastion2.fedora.phx.redhat.com>

Package vorbis-tools in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/vorbis-tools



From pkgdb at fedoraproject.org  Thu Sep 24 06:46:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:46:44 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064645.9B1D610F919@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:46:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:46:35 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064636.EF63A10F917@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:46:47 +0000
Subject: [pkgdb] genromfs ownership updated
Message-ID: <20090924064649.07C7510F89D@bastion2.fedora.phx.redhat.com>

Package genromfs in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/genromfs



From pkgdb at fedoraproject.org  Thu Sep 24 06:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:47:07 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064708.897B710F89E@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora devel is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From pkgdb at fedoraproject.org  Thu Sep 24 06:47:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:47:13 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064713.2189710F8A9@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora 10 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From jussilehtola at fedoraproject.org  Thu Sep 24 06:46:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 24 Sep 2009 06:46:15 +0000 (UTC)
Subject: rpms/firehol/devel firehol-1.273-noautostart.patch, NONE,
	1.1 firehol.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924064615.CCB3611C00DB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/firehol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7439/devel

Modified Files:
	.cvsignore sources 
Added Files:
	firehol-1.273-noautostart.patch firehol.spec import.log 
Log Message:
Imported in Fedora.


firehol-1.273-noautostart.patch:
 firehol.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firehol-1.273-noautostart.patch ---
diff -up firehol-1.273/firehol.sh.orig firehol-1.273/firehol.sh
--- firehol-1.273/firehol.sh.orig	2008-07-31 04:23:40.000000000 +0300
+++ firehol-1.273/firehol.sh	2009-09-22 16:38:37.115801635 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script to implement /etc/firehol/firehol.conf pre-defined rules.
 #
-# chkconfig: 2345 99 92
+# chkconfig: - 20 80
 #
 # description: creates stateful iptables packet filtering firewalls.
 #


--- NEW FILE firehol.spec ---
Summary:	A powerful yet easy to use iptables frontend
Name:		firehol
Version:	1.273
Release:	5%{?dist}
License:	GPLv2+
Group:		Applications/Internet
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# Don't start the firewall automatically
Patch0:		firehol-1.273-noautostart.patch

URL:		http://firehol.sourceforge.net
BuildArch:	noarch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	bash >= 2.04
Requires:	fileutils >= 4.0.36
Requires:	gawk >= 3.0
Requires:	grep >= 2.4.2
Requires:	iproute >= 2.2.4
Requires:	iptables >= 1.2.4
Requires:	kernel >= 2.4
Requires:	less
Requires:	modutils >= 2.4.13
Requires:	net-tools >= 1.57
Requires:	sed >= 3.02
Requires:	sh-utils >= 2.0
Requires:	textutils >= 2.0.11
Requires:	util-linux >= 2.11

Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts


%description
FireHOL is a generic firewall generator, meaning that you can design any kind
of local or routing stateful packet filtering firewalls with ease. Install
FireHOL if you want an easy way to configure stateful packet filtering
firewalls on Linux hosts and routers.

FireHOL uses an extremely simple but powerful way to define firewall rules
which it turns into complete stateful iptables firewalls.

You can run FireHOL with the 'helpme' argument, to get a configuration file for
the system run, which you can modify according to your needs. The default
configuration file will allow only client traffic on all interfaces.

%prep
%setup -q
%patch0 -p1 -b .noautostart

%build

%install
rm -rf %{buildroot}
install -D -p -m 755 firehol.sh %{buildroot}%{_initrddir}/firehol
install -D -p -m 640 examples/client-all.conf %{buildroot}/etc/firehol/firehol.conf

# Install man files
mkdir -p %{buildroot}%{_mandir}/man{1,5}
install -p -m 644 man/*.1 %{buildroot}/%{_mandir}/man1
install -p -m 644 man/*.5 %{buildroot}/%{_mandir}/man5

# Executables
mkdir -p %{buildroot}%{_libexecdir}/firehol
install -p -m 755 *.sh %{buildroot}%{_libexecdir}/firehol

# Install runtime directories
mkdir -p %{buildroot}%{_sysconfdir}/firehol/services
mkdir -p %{buildroot}%{_localstatedir}/spool/firehol


%post 
/sbin/chkconfig --add firehol

%preun
if [ $1 = 0 ] ; then
	/sbin/service firehol stop >/dev/null 2>&1
	/sbin/chkconfig --del firehol
fi

%postun
if [ "$1" -ge "1" ] ; then
	/sbin/service firehol condrestart >/dev/null 2>&1 || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog WhatIsNew examples doc
%dir %{_sysconfdir}/firehol
%config(noreplace) %{_sysconfdir}/firehol/firehol.conf
%{_initrddir}/firehol
%{_libexecdir}/firehol
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_sysconfdir}/firehol/services
%{_localstatedir}/spool/firehol


%changelog
* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-5
- Use patch instead of sed in %%prep phase.

* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-4
- Spec file cleanups.

* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-3
- Use _initrddir.
- pre and post fixes.
- Disable automatical startup.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-2
- Fix rights of the config file.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-1
- First release.


--- NEW FILE import.log ---
firehol-1_273-5_fc11:HEAD:firehol-1.273-5.fc11.src.rpm:1253774743


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firehol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:33:23 -0000	1.1
+++ .cvsignore	24 Sep 2009 06:46:15 -0000	1.2
@@ -0,0 +1 @@
+firehol-1.273.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firehol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:33:23 -0000	1.1
+++ sources	24 Sep 2009 06:46:15 -0000	1.2
@@ -0,0 +1 @@
+cbbe1ba21cf44955827d5c906a55aa21  firehol-1.273.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 24 06:47:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:47:15 +0000
Subject: [pkgdb] libtrash ownership updated
Message-ID: <20090924064716.5277810F8AB@bastion2.fedora.phx.redhat.com>

Package libtrash in Fedora 11 is now owned by kdudka

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libtrash



From jussilehtola at fedoraproject.org  Thu Sep 24 06:48:27 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 24 Sep 2009 06:48:27 +0000 (UTC)
Subject: rpms/firehol/EL-4 firehol-1.273-noautostart.patch, NONE,
	1.1 firehol.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090924064827.C662E11C00DB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/firehol/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7985/EL-4

Modified Files:
	sources 
Added Files:
	firehol-1.273-noautostart.patch firehol.spec 
Log Message:
Import in Fedora.

firehol-1.273-noautostart.patch:
 firehol.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firehol-1.273-noautostart.patch ---
diff -up firehol-1.273/firehol.sh.orig firehol-1.273/firehol.sh
--- firehol-1.273/firehol.sh.orig	2008-07-31 04:23:40.000000000 +0300
+++ firehol-1.273/firehol.sh	2009-09-22 16:38:37.115801635 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script to implement /etc/firehol/firehol.conf pre-defined rules.
 #
-# chkconfig: 2345 99 92
+# chkconfig: - 20 80
 #
 # description: creates stateful iptables packet filtering firewalls.
 #


--- NEW FILE firehol.spec ---
Summary:	A powerful yet easy to use iptables frontend
Name:		firehol
Version:	1.273
Release:	5%{?dist}
License:	GPLv2+
Group:		Applications/Internet
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# Don't start the firewall automatically
Patch0:		firehol-1.273-noautostart.patch

URL:		http://firehol.sourceforge.net
BuildArch:	noarch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	bash >= 2.04
Requires:	fileutils >= 4.0.36
Requires:	gawk >= 3.0
Requires:	grep >= 2.4.2
Requires:	iproute >= 2.2.4
Requires:	iptables >= 1.2.4
Requires:	kernel >= 2.4
Requires:	less
Requires:	modutils >= 2.4.13
Requires:	net-tools >= 1.57
Requires:	sed >= 3.02
Requires:	sh-utils >= 2.0
Requires:	textutils >= 2.0.11
Requires:	util-linux >= 2.11

Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts


%description
FireHOL is a generic firewall generator, meaning that you can design any kind
of local or routing stateful packet filtering firewalls with ease. Install
FireHOL if you want an easy way to configure stateful packet filtering
firewalls on Linux hosts and routers.

FireHOL uses an extremely simple but powerful way to define firewall rules
which it turns into complete stateful iptables firewalls.

You can run FireHOL with the 'helpme' argument, to get a configuration file for
the system run, which you can modify according to your needs. The default
configuration file will allow only client traffic on all interfaces.

%prep
%setup -q
%patch0 -p1 -b .noautostart

%build

%install
rm -rf %{buildroot}
install -D -p -m 755 firehol.sh %{buildroot}%{_initrddir}/firehol
install -D -p -m 640 examples/client-all.conf %{buildroot}/etc/firehol/firehol.conf

# Install man files
mkdir -p %{buildroot}%{_mandir}/man{1,5}
install -p -m 644 man/*.1 %{buildroot}/%{_mandir}/man1
install -p -m 644 man/*.5 %{buildroot}/%{_mandir}/man5

# Executables
mkdir -p %{buildroot}%{_libexecdir}/firehol
install -p -m 755 *.sh %{buildroot}%{_libexecdir}/firehol

# Install runtime directories
mkdir -p %{buildroot}%{_sysconfdir}/firehol/services
mkdir -p %{buildroot}%{_localstatedir}/spool/firehol


%post 
/sbin/chkconfig --add firehol

%preun
if [ $1 = 0 ] ; then
	/sbin/service firehol stop >/dev/null 2>&1
	/sbin/chkconfig --del firehol
fi

%postun
if [ "$1" -ge "1" ] ; then
	/sbin/service firehol condrestart >/dev/null 2>&1 || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog WhatIsNew examples doc
%dir %{_sysconfdir}/firehol
%config(noreplace) %{_sysconfdir}/firehol/firehol.conf
%{_initrddir}/firehol
%{_libexecdir}/firehol
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_sysconfdir}/firehol/services
%{_localstatedir}/spool/firehol


%changelog
* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-5
- Use patch instead of sed in %%prep phase.

* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-4
- Spec file cleanups.

* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-3
- Use _initrddir.
- pre and post fixes.
- Disable automatical startup.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-2
- Fix rights of the config file.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firehol/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:33:23 -0000	1.1
+++ sources	24 Sep 2009 06:48:26 -0000	1.2
@@ -0,0 +1 @@
+cbbe1ba21cf44955827d5c906a55aa21  firehol-1.273.tar.bz2



From jussilehtola at fedoraproject.org  Thu Sep 24 06:48:27 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 24 Sep 2009 06:48:27 +0000 (UTC)
Subject: rpms/firehol/EL-5 firehol-1.273-noautostart.patch, NONE,
	1.1 firehol.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090924064827.E253B11C01EA@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/firehol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7985/EL-5

Modified Files:
	sources 
Added Files:
	firehol-1.273-noautostart.patch firehol.spec 
Log Message:
Import in Fedora.

firehol-1.273-noautostart.patch:
 firehol.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firehol-1.273-noautostart.patch ---
diff -up firehol-1.273/firehol.sh.orig firehol-1.273/firehol.sh
--- firehol-1.273/firehol.sh.orig	2008-07-31 04:23:40.000000000 +0300
+++ firehol-1.273/firehol.sh	2009-09-22 16:38:37.115801635 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script to implement /etc/firehol/firehol.conf pre-defined rules.
 #
-# chkconfig: 2345 99 92
+# chkconfig: - 20 80
 #
 # description: creates stateful iptables packet filtering firewalls.
 #


--- NEW FILE firehol.spec ---
Summary:	A powerful yet easy to use iptables frontend
Name:		firehol
Version:	1.273
Release:	5%{?dist}
License:	GPLv2+
Group:		Applications/Internet
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# Don't start the firewall automatically
Patch0:		firehol-1.273-noautostart.patch

URL:		http://firehol.sourceforge.net
BuildArch:	noarch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	bash >= 2.04
Requires:	fileutils >= 4.0.36
Requires:	gawk >= 3.0
Requires:	grep >= 2.4.2
Requires:	iproute >= 2.2.4
Requires:	iptables >= 1.2.4
Requires:	kernel >= 2.4
Requires:	less
Requires:	modutils >= 2.4.13
Requires:	net-tools >= 1.57
Requires:	sed >= 3.02
Requires:	sh-utils >= 2.0
Requires:	textutils >= 2.0.11
Requires:	util-linux >= 2.11

Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts


%description
FireHOL is a generic firewall generator, meaning that you can design any kind
of local or routing stateful packet filtering firewalls with ease. Install
FireHOL if you want an easy way to configure stateful packet filtering
firewalls on Linux hosts and routers.

FireHOL uses an extremely simple but powerful way to define firewall rules
which it turns into complete stateful iptables firewalls.

You can run FireHOL with the 'helpme' argument, to get a configuration file for
the system run, which you can modify according to your needs. The default
configuration file will allow only client traffic on all interfaces.

%prep
%setup -q
%patch0 -p1 -b .noautostart

%build

%install
rm -rf %{buildroot}
install -D -p -m 755 firehol.sh %{buildroot}%{_initrddir}/firehol
install -D -p -m 640 examples/client-all.conf %{buildroot}/etc/firehol/firehol.conf

# Install man files
mkdir -p %{buildroot}%{_mandir}/man{1,5}
install -p -m 644 man/*.1 %{buildroot}/%{_mandir}/man1
install -p -m 644 man/*.5 %{buildroot}/%{_mandir}/man5

# Executables
mkdir -p %{buildroot}%{_libexecdir}/firehol
install -p -m 755 *.sh %{buildroot}%{_libexecdir}/firehol

# Install runtime directories
mkdir -p %{buildroot}%{_sysconfdir}/firehol/services
mkdir -p %{buildroot}%{_localstatedir}/spool/firehol


%post 
/sbin/chkconfig --add firehol

%preun
if [ $1 = 0 ] ; then
	/sbin/service firehol stop >/dev/null 2>&1
	/sbin/chkconfig --del firehol
fi

%postun
if [ "$1" -ge "1" ] ; then
	/sbin/service firehol condrestart >/dev/null 2>&1 || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog WhatIsNew examples doc
%dir %{_sysconfdir}/firehol
%config(noreplace) %{_sysconfdir}/firehol/firehol.conf
%{_initrddir}/firehol
%{_libexecdir}/firehol
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_sysconfdir}/firehol/services
%{_localstatedir}/spool/firehol


%changelog
* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-5
- Use patch instead of sed in %%prep phase.

* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-4
- Spec file cleanups.

* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-3
- Use _initrddir.
- pre and post fixes.
- Disable automatical startup.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-2
- Fix rights of the config file.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firehol/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:33:23 -0000	1.1
+++ sources	24 Sep 2009 06:48:27 -0000	1.2
@@ -0,0 +1 @@
+cbbe1ba21cf44955827d5c906a55aa21  firehol-1.273.tar.bz2



From jussilehtola at fedoraproject.org  Thu Sep 24 06:48:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 24 Sep 2009 06:48:28 +0000 (UTC)
Subject: rpms/firehol/F-10 firehol-1.273-noautostart.patch, NONE,
	1.1 firehol.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090924064828.AE9CB11C00DB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/firehol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7985/F-10

Modified Files:
	sources 
Added Files:
	firehol-1.273-noautostart.patch firehol.spec 
Log Message:
Import in Fedora.

firehol-1.273-noautostart.patch:
 firehol.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firehol-1.273-noautostart.patch ---
diff -up firehol-1.273/firehol.sh.orig firehol-1.273/firehol.sh
--- firehol-1.273/firehol.sh.orig	2008-07-31 04:23:40.000000000 +0300
+++ firehol-1.273/firehol.sh	2009-09-22 16:38:37.115801635 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script to implement /etc/firehol/firehol.conf pre-defined rules.
 #
-# chkconfig: 2345 99 92
+# chkconfig: - 20 80
 #
 # description: creates stateful iptables packet filtering firewalls.
 #


--- NEW FILE firehol.spec ---
Summary:	A powerful yet easy to use iptables frontend
Name:		firehol
Version:	1.273
Release:	5%{?dist}
License:	GPLv2+
Group:		Applications/Internet
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# Don't start the firewall automatically
Patch0:		firehol-1.273-noautostart.patch

URL:		http://firehol.sourceforge.net
BuildArch:	noarch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	bash >= 2.04
Requires:	fileutils >= 4.0.36
Requires:	gawk >= 3.0
Requires:	grep >= 2.4.2
Requires:	iproute >= 2.2.4
Requires:	iptables >= 1.2.4
Requires:	kernel >= 2.4
Requires:	less
Requires:	modutils >= 2.4.13
Requires:	net-tools >= 1.57
Requires:	sed >= 3.02
Requires:	sh-utils >= 2.0
Requires:	textutils >= 2.0.11
Requires:	util-linux >= 2.11

Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts


%description
FireHOL is a generic firewall generator, meaning that you can design any kind
of local or routing stateful packet filtering firewalls with ease. Install
FireHOL if you want an easy way to configure stateful packet filtering
firewalls on Linux hosts and routers.

FireHOL uses an extremely simple but powerful way to define firewall rules
which it turns into complete stateful iptables firewalls.

You can run FireHOL with the 'helpme' argument, to get a configuration file for
the system run, which you can modify according to your needs. The default
configuration file will allow only client traffic on all interfaces.

%prep
%setup -q
%patch0 -p1 -b .noautostart

%build

%install
rm -rf %{buildroot}
install -D -p -m 755 firehol.sh %{buildroot}%{_initrddir}/firehol
install -D -p -m 640 examples/client-all.conf %{buildroot}/etc/firehol/firehol.conf

# Install man files
mkdir -p %{buildroot}%{_mandir}/man{1,5}
install -p -m 644 man/*.1 %{buildroot}/%{_mandir}/man1
install -p -m 644 man/*.5 %{buildroot}/%{_mandir}/man5

# Executables
mkdir -p %{buildroot}%{_libexecdir}/firehol
install -p -m 755 *.sh %{buildroot}%{_libexecdir}/firehol

# Install runtime directories
mkdir -p %{buildroot}%{_sysconfdir}/firehol/services
mkdir -p %{buildroot}%{_localstatedir}/spool/firehol


%post 
/sbin/chkconfig --add firehol

%preun
if [ $1 = 0 ] ; then
	/sbin/service firehol stop >/dev/null 2>&1
	/sbin/chkconfig --del firehol
fi

%postun
if [ "$1" -ge "1" ] ; then
	/sbin/service firehol condrestart >/dev/null 2>&1 || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog WhatIsNew examples doc
%dir %{_sysconfdir}/firehol
%config(noreplace) %{_sysconfdir}/firehol/firehol.conf
%{_initrddir}/firehol
%{_libexecdir}/firehol
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_sysconfdir}/firehol/services
%{_localstatedir}/spool/firehol


%changelog
* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-5
- Use patch instead of sed in %%prep phase.

* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-4
- Spec file cleanups.

* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-3
- Use _initrddir.
- pre and post fixes.
- Disable automatical startup.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-2
- Fix rights of the config file.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firehol/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:33:23 -0000	1.1
+++ sources	24 Sep 2009 06:48:28 -0000	1.2
@@ -0,0 +1 @@
+cbbe1ba21cf44955827d5c906a55aa21  firehol-1.273.tar.bz2



From jussilehtola at fedoraproject.org  Thu Sep 24 06:48:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 24 Sep 2009 06:48:28 +0000 (UTC)
Subject: rpms/firehol/F-11 firehol-1.273-noautostart.patch, NONE,
	1.1 firehol.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090924064828.F157C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/firehol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7985/F-11

Modified Files:
	sources 
Added Files:
	firehol-1.273-noautostart.patch firehol.spec 
Log Message:
Import in Fedora.

firehol-1.273-noautostart.patch:
 firehol.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firehol-1.273-noautostart.patch ---
diff -up firehol-1.273/firehol.sh.orig firehol-1.273/firehol.sh
--- firehol-1.273/firehol.sh.orig	2008-07-31 04:23:40.000000000 +0300
+++ firehol-1.273/firehol.sh	2009-09-22 16:38:37.115801635 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script to implement /etc/firehol/firehol.conf pre-defined rules.
 #
-# chkconfig: 2345 99 92
+# chkconfig: - 20 80
 #
 # description: creates stateful iptables packet filtering firewalls.
 #


--- NEW FILE firehol.spec ---
Summary:	A powerful yet easy to use iptables frontend
Name:		firehol
Version:	1.273
Release:	5%{?dist}
License:	GPLv2+
Group:		Applications/Internet
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# Don't start the firewall automatically
Patch0:		firehol-1.273-noautostart.patch

URL:		http://firehol.sourceforge.net
BuildArch:	noarch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	bash >= 2.04
Requires:	fileutils >= 4.0.36
Requires:	gawk >= 3.0
Requires:	grep >= 2.4.2
Requires:	iproute >= 2.2.4
Requires:	iptables >= 1.2.4
Requires:	kernel >= 2.4
Requires:	less
Requires:	modutils >= 2.4.13
Requires:	net-tools >= 1.57
Requires:	sed >= 3.02
Requires:	sh-utils >= 2.0
Requires:	textutils >= 2.0.11
Requires:	util-linux >= 2.11

Requires(post):		chkconfig
Requires(preun):	chkconfig
Requires(preun):	initscripts
Requires(postun):	initscripts


%description
FireHOL is a generic firewall generator, meaning that you can design any kind
of local or routing stateful packet filtering firewalls with ease. Install
FireHOL if you want an easy way to configure stateful packet filtering
firewalls on Linux hosts and routers.

FireHOL uses an extremely simple but powerful way to define firewall rules
which it turns into complete stateful iptables firewalls.

You can run FireHOL with the 'helpme' argument, to get a configuration file for
the system run, which you can modify according to your needs. The default
configuration file will allow only client traffic on all interfaces.

%prep
%setup -q
%patch0 -p1 -b .noautostart

%build

%install
rm -rf %{buildroot}
install -D -p -m 755 firehol.sh %{buildroot}%{_initrddir}/firehol
install -D -p -m 640 examples/client-all.conf %{buildroot}/etc/firehol/firehol.conf

# Install man files
mkdir -p %{buildroot}%{_mandir}/man{1,5}
install -p -m 644 man/*.1 %{buildroot}/%{_mandir}/man1
install -p -m 644 man/*.5 %{buildroot}/%{_mandir}/man5

# Executables
mkdir -p %{buildroot}%{_libexecdir}/firehol
install -p -m 755 *.sh %{buildroot}%{_libexecdir}/firehol

# Install runtime directories
mkdir -p %{buildroot}%{_sysconfdir}/firehol/services
mkdir -p %{buildroot}%{_localstatedir}/spool/firehol


%post 
/sbin/chkconfig --add firehol

%preun
if [ $1 = 0 ] ; then
	/sbin/service firehol stop >/dev/null 2>&1
	/sbin/chkconfig --del firehol
fi

%postun
if [ "$1" -ge "1" ] ; then
	/sbin/service firehol condrestart >/dev/null 2>&1 || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog WhatIsNew examples doc
%dir %{_sysconfdir}/firehol
%config(noreplace) %{_sysconfdir}/firehol/firehol.conf
%{_initrddir}/firehol
%{_libexecdir}/firehol
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_sysconfdir}/firehol/services
%{_localstatedir}/spool/firehol


%changelog
* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-5
- Use patch instead of sed in %%prep phase.

* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-4
- Spec file cleanups.

* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-3
- Use _initrddir.
- pre and post fixes.
- Disable automatical startup.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-2
- Fix rights of the config file.

* Sun Oct 05 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firehol/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:33:23 -0000	1.1
+++ sources	24 Sep 2009 06:48:28 -0000	1.2
@@ -0,0 +1 @@
+cbbe1ba21cf44955827d5c906a55aa21  firehol-1.273.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 24 06:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:50:55 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924065055.C519810F8AF@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora devel is now owned by jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:02 +0000
Subject: [pkgdb] dstat had acl change status
Message-ID: <20090924065102.B960410F8B1@bastion2.fedora.phx.redhat.com>

jzeleny has set the watchbugzilla acl on dstat (Fedora devel) to Obsolete for jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:06 +0000
Subject: [pkgdb] dstat had acl change status
Message-ID: <20090924065107.6722E10F8B3@bastion2.fedora.phx.redhat.com>

jzeleny has set the watchcommits acl on dstat (Fedora devel) to Obsolete for jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:09 +0000
Subject: [pkgdb] dstat had acl change status
Message-ID: <20090924065110.3931210F8B5@bastion2.fedora.phx.redhat.com>

jzeleny has set the commit acl on dstat (Fedora devel) to Obsolete for jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:19 +0000
Subject: [pkgdb] dstat: jzeleny has given up watchcommits
Message-ID: <20090924065119.35B2110F8CE@bastion2.fedora.phx.redhat.com>

jzeleny has given up the watchcommits acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:20 +0000
Subject: [pkgdb] dstat: jzeleny has given up commit
Message-ID: <20090924065120.149CF10F8D0@bastion2.fedora.phx.redhat.com>

jzeleny has given up the commit acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:20 +0000
Subject: [pkgdb] dstat: jzeleny has given up approveacls
Message-ID: <20090924065120.A10E210F8D2@bastion2.fedora.phx.redhat.com>

jzeleny has given up the approveacls acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:12 +0000
Subject: [pkgdb] dstat had acl change status
Message-ID: <20090924065112.42FF210F8B8@bastion2.fedora.phx.redhat.com>

jzeleny has set the approveacls acl on dstat (Fedora devel) to Obsolete for jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:17 +0000
Subject: [pkgdb] dstat: jzeleny has given up watchbugzilla
Message-ID: <20090924065117.DC3DF10F8BA@bastion2.fedora.phx.redhat.com>

jzeleny has given up the watchbugzilla acl on dstat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:26 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924065126.607DD10F8D4@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora 11 is now owned by jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:51:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:51:41 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924065141.A16A510F925@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora 10 is now owned by jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:52:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:52:03 +0000
Subject: [pkgdb] dstat ownership updated
Message-ID: <20090924065203.6627C10F94D@bastion2.fedora.phx.redhat.com>

Package dstat in Fedora EPEL 5 is now owned by jzeleny

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/dstat



From pkgdb at fedoraproject.org  Thu Sep 24 06:52:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:52:29 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924065229.D3A4110F950@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora devel is now owned by jskala

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:52:43 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924065243.3AB3C10F8BE@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 10 is now owned by jskala

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:52:45 +0000
Subject: [pkgdb] acpid ownership updated
Message-ID: <20090924065245.DF8E510F952@bastion2.fedora.phx.redhat.com>

Package acpid in Fedora 11 is now owned by jskala

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/acpid



From pkgdb at fedoraproject.org  Thu Sep 24 06:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:54:40 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924065440.09AC710F95A@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora devel is now owned by jskala

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:54:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:54:42 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924065443.D5A3910F95E@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 10 is now owned by jskala

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 06:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 06:54:46 +0000
Subject: [pkgdb] apmd ownership updated
Message-ID: <20090924065446.849F410F95F@bastion2.fedora.phx.redhat.com>

Package apmd in Fedora 11 is now owned by jskala

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/apmd



From pkgdb at fedoraproject.org  Thu Sep 24 07:05:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:05:51 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924070552.92A6810F883@bastion2.fedora.phx.redhat.com>

Package bc in Fedora devel is now owned by ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:09 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924070609.90C1410F890@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 10 is now owned by ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:14 +0000
Subject: [pkgdb] bc ownership updated
Message-ID: <20090924070614.3F77010F897@bastion2.fedora.phx.redhat.com>

Package bc in Fedora 11 is now owned by ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:20 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070620.1592C10F89B@bastion2.fedora.phx.redhat.com>

ovasik has set the watchbugzilla acl on bc (Fedora 10) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:20 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070621.0ECCC10F89C@bastion2.fedora.phx.redhat.com>

ovasik has set the watchcommits acl on bc (Fedora 10) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:24 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070625.2640810F89D@bastion2.fedora.phx.redhat.com>

ovasik has set the approveacls acl on bc (Fedora 10) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:23 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070623.2FC3A10F889@bastion2.fedora.phx.redhat.com>

ovasik has set the commit acl on bc (Fedora 10) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:28 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070628.3D9DD10F8A0@bastion2.fedora.phx.redhat.com>

ovasik has set the approveacls acl on bc (Fedora 11) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:30 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070630.5083D10F8A2@bastion2.fedora.phx.redhat.com>

ovasik has set the commit acl on bc (Fedora 11) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From ksyz at fedoraproject.org  Thu Sep 24 07:06:35 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Thu, 24 Sep 2009 07:06:35 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/devel .cvsignore, 1.2,
	1.3 perl-XML-Parser-Lite-Tree.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090924070635.3D80311C00DB@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15205

Modified Files:
	.cvsignore perl-XML-Parser-Lite-Tree.spec sources 
Log Message:
* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
- Update to current version bz#525050



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Aug 2009 18:12:53 -0000	1.2
+++ .cvsignore	24 Sep 2009 07:06:33 -0000	1.3
@@ -1 +1 @@
-XML-Parser-Lite-Tree-0.09.tar.gz
+XML-Parser-Lite-Tree-0.12.tar.gz


Index: perl-XML-Parser-Lite-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel/perl-XML-Parser-Lite-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-XML-Parser-Lite-Tree.spec	6 Aug 2009 18:12:53 -0000	1.1
+++ perl-XML-Parser-Lite-Tree.spec	24 Sep 2009 07:06:34 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-XML-Parser-Lite-Tree
-Version:        0.09
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Lightweight XML tree builder
 License:        Artistic 2.0
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
+- Update to current version bz#525050
+
 * Sun Aug 02 2009 Michal Ingeli <mi at v3.sk> - 0.09-1
 - Update to newer version with fixed license
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Aug 2009 18:12:53 -0000	1.2
+++ sources	24 Sep 2009 07:06:34 -0000	1.3
@@ -1 +1 @@
-07b45f4374b166769ca865b7ecc77508  XML-Parser-Lite-Tree-0.09.tar.gz
+57b37e0e515aa0584403f1317755505b  XML-Parser-Lite-Tree-0.12.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:31 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070631.DD30110F8A3@bastion2.fedora.phx.redhat.com>

ovasik has set the watchcommits acl on bc (Fedora 11) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:34 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070634.7B67910F841@bastion2.fedora.phx.redhat.com>

ovasik has set the watchbugzilla acl on bc (Fedora 11) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:38 +0000
Subject: [pkgdb] bc: ovasik has requested watchbugzilla
Message-ID: <20090924070639.D870010F8A8@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on bc (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:39 +0000
Subject: [pkgdb] bc: ovasik has requested watchcommits
Message-ID: <20090924070639.18AB310F8A4@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on bc (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:39 +0000
Subject: [pkgdb] bc: ovasik has requested commit
Message-ID: <20090924070639.D8F6210F8A9@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on bc (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:41 +0000
Subject: [pkgdb] bc: ovasik has requested approveacls
Message-ID: <20090924070641.D420110F8AB@bastion2.fedora.phx.redhat.com>

ovasik has requested the approveacls acl on bc (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:43 +0000
Subject: [pkgdb] bc: ovasik has requested watchbugzilla
Message-ID: <20090924070644.94BBC10F8AC@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on bc (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:49 +0000
Subject: [pkgdb] bc: ovasik has requested watchcommits
Message-ID: <20090924070649.C33C710F89A@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on bc (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:51 +0000
Subject: [pkgdb] bc: ovasik has requested commit
Message-ID: <20090924070651.AFAC810F89C@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on bc (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:56 +0000
Subject: [pkgdb] bc: ovasik has requested watchcommits
Message-ID: <20090924070656.E387710F89D@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on bc (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:57 +0000
Subject: [pkgdb] bc: ovasik has requested watchbugzilla
Message-ID: <20090924070657.209A110F8AF@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on bc (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:53 +0000
Subject: [pkgdb] bc: ovasik has requested approveacls
Message-ID: <20090924070654.2A1A510F88A@bastion2.fedora.phx.redhat.com>

ovasik has requested the approveacls acl on bc (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:06:58 +0000
Subject: [pkgdb] bc: ovasik has requested commit
Message-ID: <20090924070659.5FC9B10F8B1@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on bc (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:07:01 +0000
Subject: [pkgdb] bc: ovasik has requested approveacls
Message-ID: <20090924070701.22AB610F8B2@bastion2.fedora.phx.redhat.com>

ovasik has requested the approveacls acl on bc (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:08:50 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070851.CD61510F883@bastion2.fedora.phx.redhat.com>

ovasik has set the watchcommits acl on bc (Fedora devel) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:08:50 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070850.A464810F86F@bastion2.fedora.phx.redhat.com>

ovasik has set the watchbugzilla acl on bc (Fedora devel) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:08:53 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070854.0B2D110F889@bastion2.fedora.phx.redhat.com>

ovasik has set the commit acl on bc (Fedora devel) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From pkgdb at fedoraproject.org  Thu Sep 24 07:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:08:55 +0000
Subject: [pkgdb] bc had acl change status
Message-ID: <20090924070855.E75FF10F897@bastion2.fedora.phx.redhat.com>

ovasik has set the approveacls acl on bc (Fedora devel) to Approved for ovasik

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/bc



From ksyz at fedoraproject.org  Thu Sep 24 07:26:47 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Thu, 24 Sep 2009 07:26:47 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/EL-5 .cvsignore, 1.2,
	1.3 perl-XML-Parser-Lite-Tree.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090924072647.9F22311C00DB@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22163

Modified Files:
	.cvsignore perl-XML-Parser-Lite-Tree.spec sources 
Log Message:
* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
- Updating to upstream current version bz#525050



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Aug 2009 18:24:45 -0000	1.2
+++ .cvsignore	24 Sep 2009 07:26:45 -0000	1.3
@@ -1 +1 @@
-XML-Parser-Lite-Tree-0.09.tar.gz
+XML-Parser-Lite-Tree-0.12.tar.gz


Index: perl-XML-Parser-Lite-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5/perl-XML-Parser-Lite-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-XML-Parser-Lite-Tree.spec	6 Aug 2009 18:24:45 -0000	1.1
+++ perl-XML-Parser-Lite-Tree.spec	24 Sep 2009 07:26:46 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-XML-Parser-Lite-Tree
-Version:        0.09
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Lightweight XML tree builder
 License:        Artistic 2.0
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
+- Updating to upstream current version bz#525050
+
 * Sun Aug 02 2009 Michal Ingeli <mi at v3.sk> - 0.09-1
 - Update to newer version with fixed license
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Aug 2009 18:24:45 -0000	1.2
+++ sources	24 Sep 2009 07:26:46 -0000	1.3
@@ -1 +1 @@
-07b45f4374b166769ca865b7ecc77508  XML-Parser-Lite-Tree-0.09.tar.gz
+57b37e0e515aa0584403f1317755505b  XML-Parser-Lite-Tree-0.12.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 24 07:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:28:51 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924072851.387BE10F883@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora devel is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 07:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:29:00 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924072901.B3AEC10F884@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 10 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 07:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:29:05 +0000
Subject: [pkgdb] gpm ownership updated
Message-ID: <20090924072905.5CD8210F890@bastion2.fedora.phx.redhat.com>

Package gpm in Fedora 11 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gpm



From pkgdb at fedoraproject.org  Thu Sep 24 07:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:29:28 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924072929.1471410F87C@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora devel is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 07:29:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:29:36 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924072937.9673E10F889@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 10 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From pkgdb at fedoraproject.org  Thu Sep 24 07:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 07:29:40 +0000
Subject: [pkgdb] iptraf ownership updated
Message-ID: <20090924072940.6586B10F890@bastion2.fedora.phx.redhat.com>

Package iptraf in Fedora 11 is now owned by npajkovs

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/iptraf



From petersen at fedoraproject.org  Thu Sep 24 07:33:47 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 24 Sep 2009 07:33:47 +0000 (UTC)
Subject: rpms/ghc-cgi/devel ghc-cgi.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924073347.6F39911C00DB@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-cgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24151/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-cgi.spec import.log 
Log Message:



--- NEW FILE ghc-cgi.spec ---
%global pkg_name cgi

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
# part of haskell-platform-2009.2.0.2
Version:        3001.1.7.1
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc
for writing CGI programs.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Provides:       ghc-%{pkg_name} = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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 doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Mon Sep 14 2009 Jens Petersen <petersen at redhat.com> - 3001.1.7.1-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-cgi-3001_1_7_1-1_fc11:HEAD:ghc-cgi-3001.1.7.1-1.fc11.src.rpm:1253777522


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-cgi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:24:02 -0000	1.1
+++ .cvsignore	24 Sep 2009 07:33:44 -0000	1.2
@@ -0,0 +1 @@
+cgi-3001.1.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-cgi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:24:02 -0000	1.1
+++ sources	24 Sep 2009 07:33:45 -0000	1.2
@@ -0,0 +1 @@
+02b1d2fe6f271a17c1eb8b897fbd1d7f  cgi-3001.1.7.1.tar.gz



From ruben at fedoraproject.org  Thu Sep 24 07:40:02 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Thu, 24 Sep 2009 07:40:02 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/devel import.log, NONE,
	1.1 perl-Nagios-Plugin-Beanstalk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924074002.DAE4611C0423@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Nagios-Plugin-Beanstalk.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
perl-Nagios-Plugin-Beanstalk-0_04-2_fc11:HEAD:perl-Nagios-Plugin-Beanstalk-0.04-2.fc11.src.rpm:1253777780


--- NEW FILE perl-Nagios-Plugin-Beanstalk.spec ---
Name:           perl-Nagios-Plugin-Beanstalk
Version:        0.04
Release:        2%{?dist}
Summary:        Nagios plugin to observe Beanstalkd queue server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-Plugin-Beanstalk/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugin-Beanstalk-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Beanstalk::Client)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Nagios::Plugin)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A Nagios plugin to observe a Beanstalkd queue server.


%prep
%setup -q -n Nagios-Plugin-Beanstalk-%{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,-)
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/check_beanstalkd

%changelog
* Wed Sep 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-2
- Clarify description

* Thu Aug 13 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:34:07 -0000	1.1
+++ .cvsignore	24 Sep 2009 07:40:02 -0000	1.2
@@ -0,0 +1 @@
+Nagios-Plugin-Beanstalk-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:34:07 -0000	1.1
+++ sources	24 Sep 2009 07:40:02 -0000	1.2
@@ -0,0 +1 @@
+f1cecd0af2fa626e4ec0094c255b3895  Nagios-Plugin-Beanstalk-0.04.tar.gz



From eseyman at fedoraproject.org  Thu Sep 24 07:41:23 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 24 Sep 2009 07:41:23 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/devel import.log, NONE,
	1.1 perl-Text-Diff-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924074123.3FF9F11C00DB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29706/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-Diff-Parser.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-Diff-Parser-0_1001-1_fc11:HEAD:perl-Text-Diff-Parser-0.1001-1.fc11.src.rpm:1253778137


--- NEW FILE perl-Text-Diff-Parser.spec ---
Name:           perl-Text-Diff-Parser
Version:        0.1001
Release:        1%{?dist}
Summary:        Parse patch files containing unified and standard diffs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Diff-Parser/
Source0:        http://www.cpan.org/authors/id/G/GW/GWYN/Text-Diff-Parser-%{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)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Diff::Parser parses diff files and patches. It allows you to access
the changes to a file in a standardized way, even if multiple patch
formats are used.

%prep
%setup -q -n Text-Diff-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 Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1001-1
- Update to 0.1001 which includes Source1

* Wed Sep 09 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1000-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:35:20 -0000	1.1
+++ .cvsignore	24 Sep 2009 07:41:22 -0000	1.2
@@ -0,0 +1 @@
+Text-Diff-Parser-0.1001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:35:20 -0000	1.1
+++ sources	24 Sep 2009 07:41:23 -0000	1.2
@@ -0,0 +1 @@
+913c3853a2808acb737f98381c120b5d  Text-Diff-Parser-0.1001.tar.gz



From ovasik at fedoraproject.org  Thu Sep 24 07:42:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 24 Sep 2009 07:42:06 +0000 (UTC)
Subject: rpms/bc/devel bc-1.06.95-memleak.patch, NONE, 1.1 .cvsignore, 1.5, 
	1.6 bc.spec, 1.43, 1.44 sources, 1.5,
	1.6 bc-1.06-info_exp_bessel.patch, 1.1,
	NONE bc-1.06-readline42.patch, 1.1, NONE bc-1.06-s390.patch, 1.1,
	NONE bc-1.06-string.patch, 1.1, NONE
Message-ID: <20090924074206.A12E011C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/bc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29975

Modified Files:
	.cvsignore bc.spec sources 
Added Files:
	bc-1.06.95-memleak.patch 
Removed Files:
	bc-1.06-info_exp_bessel.patch bc-1.06-readline42.patch 
	bc-1.06-s390.patch bc-1.06-string.patch 
Log Message:
update to upstream alpha 1.06.95 (in use in Gentoo, Slackware for quite a long time, marked stable there), removed already applied patches, fix small memory leak (gentoo patch)

bc-1.06.95-memleak.patch:
 bc.y   |    1 +
 util.c |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bc-1.06.95-memleak.patch ---
diff --git a/bc/bc.y b/bc/bc.y
index 14dc4be..bd91c38 100644
--- a/bc/bc.y
+++ b/bc/bc.y
@@ -569,6 +569,7 @@ expression		:  named_expression ASSIGN_OP
 				    generate (">");
 				  break;
 				}
+			      free($2);
 			    }
 			| expression '+' expression
 			    {
diff --git a/bc/util.c b/bc/util.c
index 30beaf9..26e2e85 100644
--- a/bc/util.c
+++ b/bc/util.c
@@ -602,8 +602,7 @@ lookup (name, namekind)
     case FUNCTDEF:
       if (id->f_name != 0)
 	{
-	  if (namekind != FUNCT)
-	    free(name);
+	  free(name);
 	  /* Check to see if we are redefining a math lib function. */ 
 	  if (use_math && namekind == FUNCTDEF && id->f_name <= 6)
 	    id->f_name = next_func++;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Sep 2007 08:11:50 -0000	1.5
+++ .cvsignore	24 Sep 2009 07:42:06 -0000	1.6
@@ -1 +1 @@
-bc-1.06.tar.gz
+bc-1.06.95.tar.bz2


Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- bc.spec	20 Aug 2009 07:38:00 -0000	1.43
+++ bc.spec	24 Sep 2009 07:42:06 -0000	1.44
@@ -1,16 +1,13 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator)
 Name: bc
-Version: 1.06
-Release: 36%{?dist}
+Version: 1.06.95
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
-Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
-Patch1: bc-1.06-readline42.patch
-Patch2: bc-1.06-s390.patch
-Patch3: bc-1.06-info_exp_bessel.patch
-Patch5: bc-1.06-string.patch
-Patch6: bc-1.06-dc_ibase.patch
+Source: ftp://alpha.gnu.org/pub/gnu/bc/bc-%{version}.tar.bz2
+Patch1: bc-1.06-dc_ibase.patch
+Patch2: bc-1.06.95-memleak.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,11 +24,8 @@ if you would like to use its text mode c
 
 %prep
 %setup -q
-%patch1 -p1 -b .rl22
-%patch2 -p1 -b .s390
-%patch3 -p1 -b .info_exp_bessel
-%patch5 -p1 -b .string
-%patch6 -p1 -b .dc_ibase
+%patch1 -p1 -b .dc_ibase
+%patch2 -p1 -b .memleak
 
 %build
 %configure --with-readline
@@ -71,6 +65,12 @@ fi
 %{_infodir}/*
 
 %changelog
+* Thu Sep 24 2009 Ondrej Vasik <ovasik at redhat.com> 1.06-95-1
+- update to upstream alpha 1.06.95 (in use in Gentoo, Slackware
+  for quite a long time, marked stable there)
+- removed already applied patches, fix small memory leak
+  (gentoo patch)
+
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.06-36
 - Don't complain if installing with --excludedocs (#515934)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Sep 2007 08:11:50 -0000	1.5
+++ sources	24 Sep 2009 07:42:06 -0000	1.6
@@ -1 +1 @@
-d44b5dddebd8a7a7309aea6c36fda117  bc-1.06.tar.gz
+5126a721b73f97d715bb72c13c889035  bc-1.06.95.tar.bz2


--- bc-1.06-info_exp_bessel.patch DELETED ---


--- bc-1.06-readline42.patch DELETED ---


--- bc-1.06-s390.patch DELETED ---


--- bc-1.06-string.patch DELETED ---



From eseyman at fedoraproject.org  Thu Sep 24 07:43:03 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 24 Sep 2009 07:43:03 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/F-12 import.log, NONE,
	1.1 perl-Text-Diff-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924074303.C58F211C00DB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30457/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-Diff-Parser.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-Diff-Parser-0_1001-1_fc11:F-12:perl-Text-Diff-Parser-0.1001-1.fc11.src.rpm:1253778285


--- NEW FILE perl-Text-Diff-Parser.spec ---
Name:           perl-Text-Diff-Parser
Version:        0.1001
Release:        1%{?dist}
Summary:        Parse patch files containing unified and standard diffs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Diff-Parser/
Source0:        http://www.cpan.org/authors/id/G/GW/GWYN/Text-Diff-Parser-%{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)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Diff::Parser parses diff files and patches. It allows you to access
the changes to a file in a standardized way, even if multiple patch
formats are used.

%prep
%setup -q -n Text-Diff-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 Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1001-1
- Update to 0.1001 which includes Source1

* Wed Sep 09 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1000-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:35:20 -0000	1.1
+++ .cvsignore	24 Sep 2009 07:43:01 -0000	1.2
@@ -0,0 +1 @@
+Text-Diff-Parser-0.1001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:35:20 -0000	1.1
+++ sources	24 Sep 2009 07:43:03 -0000	1.2
@@ -0,0 +1 @@
+913c3853a2808acb737f98381c120b5d  Text-Diff-Parser-0.1001.tar.gz



From eseyman at fedoraproject.org  Thu Sep 24 07:46:33 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 24 Sep 2009 07:46:33 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/F-11 import.log, NONE,
	1.1 perl-Text-Diff-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924074633.6956411C00DB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32286/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-Diff-Parser.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-Diff-Parser-0_1001-1_fc11:F-11:perl-Text-Diff-Parser-0.1001-1.fc11.src.rpm:1253778406


--- NEW FILE perl-Text-Diff-Parser.spec ---
Name:           perl-Text-Diff-Parser
Version:        0.1001
Release:        1%{?dist}
Summary:        Parse patch files containing unified and standard diffs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Diff-Parser/
Source0:        http://www.cpan.org/authors/id/G/GW/GWYN/Text-Diff-Parser-%{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)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Diff::Parser parses diff files and patches. It allows you to access
the changes to a file in a standardized way, even if multiple patch
formats are used.

%prep
%setup -q -n Text-Diff-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 Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1001-1
- Update to 0.1001 which includes Source1

* Wed Sep 09 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1000-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:35:20 -0000	1.1
+++ .cvsignore	24 Sep 2009 07:46:32 -0000	1.2
@@ -0,0 +1 @@
+Text-Diff-Parser-0.1001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:35:20 -0000	1.1
+++ sources	24 Sep 2009 07:46:33 -0000	1.2
@@ -0,0 +1 @@
+913c3853a2808acb737f98381c120b5d  Text-Diff-Parser-0.1001.tar.gz



From eseyman at fedoraproject.org  Thu Sep 24 07:51:24 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 24 Sep 2009 07:51:24 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/F-10 import.log, NONE,
	1.1 perl-Text-Diff-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924075124.5B78E11C00DB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2103/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-Diff-Parser.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Text-Diff-Parser-0_1001-1_fc11:F-10:perl-Text-Diff-Parser-0.1001-1.fc11.src.rpm:1253778756


--- NEW FILE perl-Text-Diff-Parser.spec ---
Name:           perl-Text-Diff-Parser
Version:        0.1001
Release:        1%{?dist}
Summary:        Parse patch files containing unified and standard diffs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Diff-Parser/
Source0:        http://www.cpan.org/authors/id/G/GW/GWYN/Text-Diff-Parser-%{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)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Diff::Parser parses diff files and patches. It allows you to access
the changes to a file in a standardized way, even if multiple patch
formats are used.

%prep
%setup -q -n Text-Diff-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 Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1001-1
- Update to 0.1001 which includes Source1

* Wed Sep 09 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1000-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:35:20 -0000	1.1
+++ .cvsignore	24 Sep 2009 07:51:24 -0000	1.2
@@ -0,0 +1 @@
+Text-Diff-Parser-0.1001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:35:20 -0000	1.1
+++ sources	24 Sep 2009 07:51:24 -0000	1.2
@@ -0,0 +1 @@
+913c3853a2808acb737f98381c120b5d  Text-Diff-Parser-0.1001.tar.gz



From ovasik at fedoraproject.org  Thu Sep 24 08:03:59 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 24 Sep 2009 08:03:59 +0000 (UTC)
Subject: rpms/bc/devel bc.spec,1.44,1.45
Message-ID: <20090924080359.ABF0011C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/bc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7493

Modified Files:
	bc.spec 
Log Message:
add build requires for bison


Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- bc.spec	24 Sep 2009 07:42:06 -0000	1.44
+++ bc.spec	24 Sep 2009 08:03:54 -0000	1.45
@@ -11,7 +11,7 @@ Patch2: bc-1.06.95-memleak.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: readline-devel, flex
+BuildRequires: readline-devel, flex, bison
 
 %description
 The bc package includes bc and dc. Bc is an arbitrary precision



From ovasik at fedoraproject.org  Thu Sep 24 08:11:15 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 24 Sep 2009 08:11:15 +0000 (UTC)
Subject: rpms/bc/devel bc.spec,1.45,1.46
Message-ID: <20090924081116.000A811C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/bc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10277

Modified Files:
	bc.spec 
Log Message:
add missing BR for texinfo


Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- bc.spec	24 Sep 2009 08:03:54 -0000	1.45
+++ bc.spec	24 Sep 2009 08:11:15 -0000	1.46
@@ -11,7 +11,7 @@ Patch2: bc-1.06.95-memleak.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: readline-devel, flex, bison
+BuildRequires: readline-devel, flex, bison, texinfo
 
 %description
 The bc package includes bc and dc. Bc is an arbitrary precision
@@ -70,6 +70,7 @@ fi
   for quite a long time, marked stable there)
 - removed already applied patches, fix small memory leak
   (gentoo patch)
+- add missing BR for bison and texinfo
 
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.06-36
 - Don't complain if installing with --excludedocs (#515934)



From ruben at fedoraproject.org  Thu Sep 24 08:35:56 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Thu, 24 Sep 2009 08:35:56 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/F-11 import.log, NONE,
	1.1 perl-Nagios-Plugin-Beanstalk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924083556.9211111C00DB@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21286/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Nagios-Plugin-Beanstalk.spec 
Log Message:
Initial import into F-11



--- NEW FILE import.log ---
perl-Nagios-Plugin-Beanstalk-0_04-2_fc11:F-11:perl-Nagios-Plugin-Beanstalk-0.04-2.fc11.src.rpm:1253781334


--- NEW FILE perl-Nagios-Plugin-Beanstalk.spec ---
Name:           perl-Nagios-Plugin-Beanstalk
Version:        0.04
Release:        2%{?dist}
Summary:        Nagios plugin to observe Beanstalkd queue server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-Plugin-Beanstalk/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugin-Beanstalk-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Beanstalk::Client)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Nagios::Plugin)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A Nagios plugin to observe a Beanstalkd queue server.


%prep
%setup -q -n Nagios-Plugin-Beanstalk-%{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,-)
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/check_beanstalkd

%changelog
* Wed Sep 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-2
- Clarify description

* Thu Aug 13 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:34:07 -0000	1.1
+++ .cvsignore	24 Sep 2009 08:35:54 -0000	1.2
@@ -0,0 +1 @@
+Nagios-Plugin-Beanstalk-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:34:07 -0000	1.1
+++ sources	24 Sep 2009 08:35:54 -0000	1.2
@@ -0,0 +1 @@
+f1cecd0af2fa626e4ec0094c255b3895  Nagios-Plugin-Beanstalk-0.04.tar.gz



From sharkcz at fedoraproject.org  Thu Sep 24 08:48:10 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 24 Sep 2009 08:48:10 +0000 (UTC)
Subject: rpms/s390utils/F-11
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch, NONE,
	1.1 s390utils.spec, 1.5, 1.6
Message-ID: <20090924084810.3E72A11C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25890

Modified Files:
	s390utils.spec 
Added Files:
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch 
Log Message:
* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-4
- fixed string overflow in vtoc_volume_label_init (#525318)


0022-fix-string-overflow-in-vtoc_volume_label_init.patch:
 vtoc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0022-fix-string-overflow-in-vtoc_volume_label_init.patch ---
>From 664ab55f566e46c31806b25a976dea444a7976a3 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 24 Sep 2009 09:12:39 +0200
Subject: [PATCH] fix string overflow in vtoc_volume_label_init

Originaly it tries to copy a 84B string into 4B field and reset also
the other fields thru the overflow. This doesn't work with recent GCC
and the security-related compile flags that are used in Fedora.
---
 libvtoc/vtoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c
index 62a02a0..cebd5a4 100644
--- a/libvtoc/vtoc.c
+++ b/libvtoc/vtoc.c
@@ -326,7 +326,7 @@ void vtoc_volume_label_init (volume_label_t *vlabel)
 {
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);	
-	strncpy(vlabel->volkey, buffer, 84);
+	memcpy(vlabel, buffer, 84);
 }
 
 
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- s390utils.spec	3 Sep 2009 09:54:42 -0000	1.5
+++ s390utils.spec	24 Sep 2009 08:48:08 -0000	1.6
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,7 @@ Patch18:  0018-s390-tools-1.8.1-ziomon-n
 Patch19:  0019-s390-tools-1.8.1-lsluns-disk-enc.patch
 Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
 Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
+Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -122,6 +123,9 @@ be used together with the zSeries (s390)
 # Check only ZFCP devices in lszfcp (#518669)
 %patch21 -p1 -b .lszfcp-perf
 
+# Fix string overflow in vtoc_volume_label_init (#525318)
+%patch22 -p1 -b .vtoc-label
+
 #
 # cmsfs
 #
@@ -766,6 +770,9 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-4
+- fixed string overflow in vtoc_volume_label_init (#525318)
+
 * Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-3
 - create devel subpackage with some useful headers
 - preserving timestamps on installed files



From sharkcz at fedoraproject.org  Thu Sep 24 08:49:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 24 Sep 2009 08:49:06 +0000 (UTC)
Subject: rpms/s390utils/devel
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch, NONE,
	1.1 s390utils.spec, 1.4, 1.5
Message-ID: <20090924084906.85C3111C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26618

Modified Files:
	s390utils.spec 
Added Files:
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch 
Log Message:
* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-4
- fixed string overflow in vtoc_volume_label_init (#525318)


0022-fix-string-overflow-in-vtoc_volume_label_init.patch:
 vtoc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0022-fix-string-overflow-in-vtoc_volume_label_init.patch ---
>From 664ab55f566e46c31806b25a976dea444a7976a3 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 24 Sep 2009 09:12:39 +0200
Subject: [PATCH] fix string overflow in vtoc_volume_label_init

Originaly it tries to copy a 84B string into 4B field and reset also
the other fields thru the overflow. This doesn't work with recent GCC
and the security-related compile flags that are used in Fedora.
---
 libvtoc/vtoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c
index 62a02a0..cebd5a4 100644
--- a/libvtoc/vtoc.c
+++ b/libvtoc/vtoc.c
@@ -326,7 +326,7 @@ void vtoc_volume_label_init (volume_label_t *vlabel)
 {
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);	
-	strncpy(vlabel->volkey, buffer, 84);
+	memcpy(vlabel, buffer, 84);
 }
 
 
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- s390utils.spec	3 Sep 2009 09:53:47 -0000	1.4
+++ s390utils.spec	24 Sep 2009 08:49:06 -0000	1.5
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,7 @@ Patch18:  0018-s390-tools-1.8.1-ziomon-n
 Patch19:  0019-s390-tools-1.8.1-lsluns-disk-enc.patch
 Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
 Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
+Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -122,6 +123,9 @@ be used together with the zSeries (s390)
 # Check only ZFCP devices in lszfcp (#518669)
 %patch21 -p1 -b .lszfcp-perf
 
+# Fix string overflow in vtoc_volume_label_init (#525318)
+%patch22 -p1 -b .vtoc-label
+
 #
 # cmsfs
 #
@@ -766,6 +770,9 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-4
+- fixed string overflow in vtoc_volume_label_init (#525318)
+
 * Thu Sep  3 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-3
 - create devel subpackage with some useful headers
 - preserving timestamps on installed files



From caolanm at fedoraproject.org  Thu Sep 24 08:49:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 24 Sep 2009 08:49:23 +0000 (UTC)
Subject: rpms/libtextcat/devel luxembourgish.lm, NONE,
	1.1 mongolian_cyrillic.lm, NONE, 1.1 fpdb.conf, 1.1,
	1.2 libtextcat.spec, 1.10, 1.11
Message-ID: <20090924084923.E016611C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libtextcat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26754

Modified Files:
	fpdb.conf libtextcat.spec 
Added Files:
	luxembourgish.lm mongolian_cyrillic.lm 
Log Message:
update fpdb.conf and add mongolian and luxembourgish fingerprints


--- NEW FILE luxembourgish.lm ---
_
e
n
r
t
i
a
s
u
er
h
d
o
l
n_
g
en
c
ch
_d
m
t_
r_
_a
de
e_
en_
er_
an
z
?
,
un
,_
.
ge
b
k
w
?
f
._
?i
_de
v
p
sc
sch
es
nn
ng
te
_v
ne
_g
ue
h_
ie
ch_
m_
ou
i_
?
s_
_e
ee
el
ze
at
re
ss
'
vu
_vu
D
le
se
st
_an
_s
un_
g_
et
_D
_h
he
an_
ec
in
rt
_an_
ro
der
ll
is
ht
ech
cht
d'
_d'
S
nt
uer
der_
?i_
em
_o
it
L
l_
on
esc
A
esch
ti
al
us
ier
_z
ra
E
we
che
_S
ir
ei
?t
?i
vun
_w
me
_m
_A
be
ert
vun_
_vun
_vun_
nne
tz
ng_
eb
_der
_E
_der_
ar
_n
rg
n,_
u_
_L
n,
den
eng
um
_b
io
ns
erg
au
_en
K
M
_ge
d?
as
eg
tze
ung
a_
n.
hu
ner
op
n._
ur
et_
B
oun
?n
hi
si
bu
nn_
?tz
_d?
d?i
_f
inn
de_
_d?i
li
tt
ebu
W
ass
uerg
nd
ebue
bue
rt_
?tze
buer
d?i_
ma
ebuer
_d?i_
_K
_hu
nge
_M
buerg
?tzeb
zebue
zeb
zebu
tzebu
tzeb
um_
ioun
ss_
iou
ges
ere
ha
den_
L?
?ie
F
ke
_a_
t.
ta
L?tz
G
L?tze
L?t
t._
en,_
t,_
en,
t,
at_
ech_
o_
_de_
ren
ri
ic
ter
_W
_eng
?ier
la
ol
rs
scht
ir_
ru
_B
ert_
_k
oc
P
ten
ht_
_L?
nz
em_
p_
ent
wa
cht_
_den
_L?t
_L?tz
ich
_G
_den_
tio
il
nner
ger
_as
sse
_op
och
ll_
_ass
R
am
-
_se
_F
sche
d_
sch_
ati
_be
ts
ik
nen
De
ers
_.
_P
_._
fe
ass_
mm
gi
aa
zu
_De
ve
pe
fi
tr
lt
en.
_ass_
eng_
op_
ck
en._
sen
na
rge
?s
kt
ed
_al
?it
so
uro
_op_
gesc
_R
gesch
Eur
tiou
Euro
aus
Eu
erge
hen
tioun
lec
no
fir_
chen
fir
V
hue
_si
or
ut
ac
uf
Z
gen
tu
ver
lech
da
mat
_V
_Eur
_Eu
wer
lle
_Euro
uerge
_ze
?is
J
est
ger_
tt_
_hue
go
_fi
dee
_fir_
uet
vum
_zu
ni
_vum
_fir
een
_vum_
vum_
huet
ann
_huet
T
I
el_
_wa


--- NEW FILE mongolian_cyrillic.lm ---
_	77671
?	60289
?	57097
?	51540
?	41421
?	40332
?	35484
?	31764
?	31695
?	30802
?	29381
?	28336
?	26898
?	25901
?	21671
?	21639
?	21118
?	19759
??	12185
?	12159
??	11964
?	11468
??	10443
??	10090
??	9604
?_	9584
???	9529
?	9133
_?	8958
?_	8712
??	8462
?	8134
?_	8106
??	8078
??	7638
?	7524
??	7372
??	6997
_?	6942
??	6908
??	6787
??	6584
??	6380
??	6337
???	6301
??	6221
_?	6219
?_	6092
_?	6085
??	5978
?_	5841
??	5674
?	5656
??	5647
_?	5547
??	5471
??	5259
_?	5115
??	5047
??	5025
??	4840
??	4806
?	4794
??	4704
?_	4687
??	4578
??	4489
??	4345
?	4326
??	4232
?_	4191
??	4122
??	4089
??	4085
??	4062
??	4039
?_	3970
?_	3935
???	3903
??	3888
????	3887
??	3756
_?	3746
_?	3600
??_	3567
???	3545
??	3529
??	3515
??	3502
?	3455
??	3441
?_	3396
??	3389
??	3367
??	3290
??_	3290
??	3281
??	3278
?_	3252
?_	3249
???	3227
??	3212
??	3204
_?	3176
_?	3157
??_	3138
??	3048
???	3033
??_	3031
????	3027
??	3006
??	2995
????	2931
?????	2931
?????	2929
??	2922
??_	2876
??_	2861
_?	2851
???_	2831
??	2816
??	2795
???	2759
??	2724
???	2723
??	2687
??	2650
??_	2642
???	2602
??	2598
??	2567
??	2566
???	2547
??	2546
_?	2543
??	2513
??	2478
??	2469
??	2462
_?	2461
??	2455
??_	2448
?	2440
???	2425
??	2423
??	2418
???	2406
???	2401
_??	2378
??	2370
??	2367
_??	2359
??	2253
??	2252
??	2246
_??	2227
_?	2215
??	2177
?_	2162
??	2141
???	2123
???	2044
???	2037
???_	2022
_??	2015
??	2014
??	1998
??	1989
_??	1989
??	1981
??	1972
??	1970
?	1960
??	1959
???	1959
???	1951
????	1948
??	1931
??	1925
??	1920
??	1919
???	1896
??	1895
???	1882
??	1878
???	1876
???	1871
??	1867
???_	1864
??	1859
??	1852
_?	1850
??	1818
??	1816
???	1813
??	1810
??	1804
??	1794
??	1790
??	1772
_?	1767
??	1758
?_	1757
??	1757
???	1745
_??	1734
_??	1728
??	1726
???	1722
??	1719
??	1716
??_	1707
???	1697
?_	1696
??	1681
??	1680
???	1668
_??	1665
???	1645
???	1634
???	1631
????	1631
???_	1623
???	1610
??	1600
???	1583
??	1572
??	1569
??	1565
???	1555
??	1543
??	1514
??	1503
?	1492
???_	1481
_??	1478
????	1477
???	1476
???	1474
_??	1470
???	1470
????	1466
???	1465
????	1464
???	1463
??	1457
??_	1447
??_	1440
??	1438
??	1428
???_	1427
???	1417
????	1410
??	1402
???	1402
????	1400
_??	1396
??	1383
_??	1378
??	1372
??	1372
???	1368
????	1368
???	1353
??	1350
??	1335
???	1320
??	1313
???	1312
??	1300
??	1298
??	1296
??_	1289
??	1288
??	1287
??	1282
?_	1280
?_	1278
??_	1271
??	1269
_?	1268
??	1268
??	1267
???	1266
??	1260
??_	1253
???	1251
??	1249
??_	1246
_??	1238
??	1230
???	1223
??	1220
???	1203
???	1203
??_	1201
??	1196
??	1194
????	1188
???	1184
????	1181
??	1179
??	1174
???	1170
???	1168
???	1166
????	1166
????	1158
??	1155
???_	1154
??	1153
??	1152
????	1150
_??	1139
??	1129
_??	1129
???	1124
???	1121
??	1119
???	1119
??	1110
????	1100
????_	1098
??	1096
??_	1094
????	1090
??	1089
???	1087
??	1085
???	1079
??_	1066
???	1066
????	1063
???	1062
??	1060
???	1059
??	1054
_??	1054
_??	1052
???	1050
??_	1047
???	1046
????_	1046
??	1040
???	1036
?	1026
??	1025
????	1024
??	1021
?????	1020
???	1019
??	1016
??	1014
???	1014
???	1013
???	1013
???	1012
????	1012
?????	1012
??	1010
???	1008
??_	1005
????	1004


Index: fpdb.conf
===================================================================
RCS file: /cvs/pkgs/rpms/libtextcat/devel/fpdb.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fpdb.conf	8 Aug 2007 13:37:34 -0000	1.1
+++ fpdb.conf	24 Sep 2009 08:49:23 -0000	1.2
@@ -51,9 +51,11 @@ korean.lm                            ko-
 latin.lm                             la--utf8
 latvian.lm                           lv--utf8
 lithuanian.lm                        lt--utf8
+luxembourgish.lm                     lb--utf8
 malay.lm                             ms--utf8
 manx_gaelic.lm                       gv--utf8
 marathi.lm                           mr--utf8
+mongolian_cyrillic.lm                mn--utf8
 nepali.lm                            ne--utf8
 norwegian.lm                         nb--utf8       # Norwegian (Bokmal)
 persian.lm                           fa--utf8       # Farsi
@@ -80,3 +82,4 @@ ukrainian.lm                         uk-
 vietnamese.lm                        vi--utf8
 welsh.lm                             cy--utf8
 yiddish_utf.lm                       yi--utf8
+zulu.lm                              zu--utf8


Index: libtextcat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtextcat/devel/libtextcat.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libtextcat.spec	22 Sep 2009 11:04:08 -0000	1.10
+++ libtextcat.spec	24 Sep 2009 08:49:23 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Text Categorization Library
 Name: libtextcat
 Version: 2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: System Environment/Libraries
 License: BSD
 Source0: http://software.wise-guys.nl/download/%{name}-%{version}.tar.gz
@@ -9,7 +9,9 @@ Source1: http://svn.services.openoffice.
 Source2: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/chinese_simplified.lm
 Source3: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/chinese_traditional.lm
 Source4: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/japanese.lm
-Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/64896/zulu.lm
+Source5: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/luxembourgish.lm
+Source6: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/mongolian_cyrillic.lm
+Source7: http://svn.services.openoffice.org/ooo/trunk/libtextcat/data/new_fingerprints/lm/zulu.lm
 URL: http://software.wise-guys.nl/libtextcat/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool
@@ -118,7 +120,9 @@ iconv -f ISO-8859-1 -t UTF-8 vietnamese.
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/chinese_simplified.lm
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/chinese_traditional.lm
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/japanese.lm
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/zulu.lm
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/luxembourgish.lm
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/mongolian_cyrillic.lm
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/%{_datadir}/libtextcat/zulu.lm
 
 %post -p /sbin/ldconfig
 
@@ -140,6 +144,9 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT/%{_data
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 24 2009 Caolan McNamara <caolanm at redhat.com> 2.2-10
+- update fpdb.conf and add mongolian and luxembourgish fingerprints
+
 * Tue Sep 22 2009 Caolan McNamara <caolanm at redhat.com> 2.2-9
 - Resolves: rhbz#524816 add Zulu fingerprint
 



From jmoskovc at fedoraproject.org  Thu Sep 24 08:55:19 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Thu, 24 Sep 2009 08:55:19 +0000 (UTC)
Subject: rpms/abrt/devel abrt.spec,1.15,1.16
Message-ID: <20090924085519.78EB411C00DB@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28951

Modified Files:
	abrt.spec 
Log Message:
added bug-buddy to provides



Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- abrt.spec	22 Sep 2009 10:11:54 -0000	1.15
+++ abrt.spec	24 Sep 2009 08:55:19 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 0.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -58,6 +58,7 @@ Provides: abrt-applet = %{version}-%{rel
 Obsoletes: abrt-applet < 0.0.5
 Conflicts: abrt-applet < 0.0.5
 Obsoletes: bug-buddy
+Provides: bug-buddy
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -353,6 +354,9 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Sep 23 2009  jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-2
+- added bug-buddy to provides rhbz#524934
+
 * Tue Sep 22 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-1
 - new version
 - comments and how to reproduce are stored now (npajkovs at redhat.com)



From cwickert at fedoraproject.org  Thu Sep 24 09:04:07 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 24 Sep 2009 09:04:07 +0000 (UTC)
Subject: rpms/viewnior/devel import.log, NONE, 1.1 viewnior.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924090408.07B3511C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/viewnior/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31804/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log viewnior.spec 
Log Message:
Initial import of viewnior. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=516717



--- NEW FILE import.log ---
viewnior-0_7-1_fc11:HEAD:viewnior-0.7-1.fc11.src.rpm:1253782866


--- NEW FILE viewnior.spec ---
# We don't build with Gnome support by default to avoid a GConf dependency.
# If you would like to set the Gnome background image with Viewnior, rebuild 
# the srpm with:
#   rpmbuild --rebuild --with-gnome viewnior-*-src.rpm

Name:           viewnior
Version:        0.7
Release:        1%{?dist}
Summary:        Elegant image viewer

Group:          User Interface/X
License:        GPLv3+
URL:            http://xsisqox.github.com/Viewnior
Source0:        http://cloud.github.com/downloads/xsisqox/Viewnior/%{name}-%{version}.tar.gz 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext intltool shared-mime-info
%if 0%{?_with_gnome:1}
BuildRequires:  GConf2-devel
%endif


%description 
Viewnior is an image viewer program. Created to be simple, fast and elegant. 
It's minimalistic interface provides more screenspace for your images. Among 
its features are:

* Fullscreen & Slideshow
* Rotate, flip, save, delete images
* Animation support
* Browse only selected images
* Navigation window
* Simple interface
* Configurable mouse actions


%prep
%setup -q
# fix spurious executable perms
chmod 0644 AUTHORS ChangeLog COPYING NEWS README TODO src/*


%build
%configure \
%if 0%{?_with_gnome:1}
   --enable-wallpaper
%endif

make %{?_smp_mflags} V=1


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}/


%changelog
* Mon Sep 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7-1
- Update to 0.7

* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6-2
- Spec file cleanups from review.

* Mon Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewnior/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:24:48 -0000	1.1
+++ .cvsignore	24 Sep 2009 09:04:07 -0000	1.2
@@ -0,0 +1 @@
+viewnior-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewnior/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:24:48 -0000	1.1
+++ sources	24 Sep 2009 09:04:07 -0000	1.2
@@ -0,0 +1 @@
+c4db1ca78ea048c35e904a6a162d489b  viewnior-0.7.tar.gz



From cwickert at fedoraproject.org  Thu Sep 24 09:24:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 24 Sep 2009 09:24:56 +0000 (UTC)
Subject: rpms/viewnior/F-11 viewnior.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924092456.35A9D11C01EA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/viewnior/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4704/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	viewnior.spec 
Log Message:
initial build of viewnior for this branch


--- NEW FILE viewnior.spec ---
# We don't build with Gnome support by default to avoid a GConf dependency.
# If you would like to set the Gnome background image with Viewnior, rebuild 
# the srpm with:
#   rpmbuild --rebuild --with-gnome viewnior-*-src.rpm

Name:           viewnior
Version:        0.7
Release:        1%{?dist}
Summary:        Elegant image viewer

Group:          User Interface/X
License:        GPLv3+
URL:            http://xsisqox.github.com/Viewnior
Source0:        http://cloud.github.com/downloads/xsisqox/Viewnior/%{name}-%{version}.tar.gz 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext intltool shared-mime-info
%if 0%{?_with_gnome:1}
BuildRequires:  GConf2-devel
%endif


%description 
Viewnior is an image viewer program. Created to be simple, fast and elegant. 
It's minimalistic interface provides more screenspace for your images. Among 
its features are:

* Fullscreen & Slideshow
* Rotate, flip, save, delete images
* Animation support
* Browse only selected images
* Navigation window
* Simple interface
* Configurable mouse actions


%prep
%setup -q
# fix spurious executable perms
chmod 0644 AUTHORS ChangeLog COPYING NEWS README TODO src/*


%build
%configure \
%if 0%{?_with_gnome:1}
   --enable-wallpaper
%endif

make %{?_smp_mflags} V=1


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}/


%changelog
* Mon Sep 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7-1
- Update to 0.7

* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6-2
- Spec file cleanups from review.

* Mon Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewnior/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:24:48 -0000	1.1
+++ .cvsignore	24 Sep 2009 09:24:54 -0000	1.2
@@ -0,0 +1 @@
+viewnior-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewnior/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:24:48 -0000	1.1
+++ sources	24 Sep 2009 09:24:54 -0000	1.2
@@ -0,0 +1 @@
+c4db1ca78ea048c35e904a6a162d489b  viewnior-0.7.tar.gz



From cwickert at fedoraproject.org  Thu Sep 24 09:24:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 24 Sep 2009 09:24:56 +0000 (UTC)
Subject: rpms/viewnior/F-10 viewnior.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090924092456.317BB11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/viewnior/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4704/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	viewnior.spec 
Log Message:
initial build of viewnior for this branch


--- NEW FILE viewnior.spec ---
# We don't build with Gnome support by default to avoid a GConf dependency.
# If you would like to set the Gnome background image with Viewnior, rebuild 
# the srpm with:
#   rpmbuild --rebuild --with-gnome viewnior-*-src.rpm

Name:           viewnior
Version:        0.7
Release:        1%{?dist}
Summary:        Elegant image viewer

Group:          User Interface/X
License:        GPLv3+
URL:            http://xsisqox.github.com/Viewnior
Source0:        http://cloud.github.com/downloads/xsisqox/Viewnior/%{name}-%{version}.tar.gz 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext intltool shared-mime-info
%if 0%{?_with_gnome:1}
BuildRequires:  GConf2-devel
%endif


%description 
Viewnior is an image viewer program. Created to be simple, fast and elegant. 
It's minimalistic interface provides more screenspace for your images. Among 
its features are:

* Fullscreen & Slideshow
* Rotate, flip, save, delete images
* Animation support
* Browse only selected images
* Navigation window
* Simple interface
* Configurable mouse actions


%prep
%setup -q
# fix spurious executable perms
chmod 0644 AUTHORS ChangeLog COPYING NEWS README TODO src/*


%build
%configure \
%if 0%{?_with_gnome:1}
   --enable-wallpaper
%endif

make %{?_smp_mflags} V=1


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}/


%changelog
* Mon Sep 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7-1
- Update to 0.7

* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6-2
- Spec file cleanups from review.

* Mon Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewnior/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:24:48 -0000	1.1
+++ .cvsignore	24 Sep 2009 09:24:55 -0000	1.2
@@ -0,0 +1 @@
+viewnior-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewnior/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:24:48 -0000	1.1
+++ sources	24 Sep 2009 09:24:55 -0000	1.2
@@ -0,0 +1 @@
+c4db1ca78ea048c35e904a6a162d489b  viewnior-0.7.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 24 09:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 09:28:20 +0000
Subject: [pkgdb] abiword: dsd has requested commit
Message-ID: <20090924092820.60C0B10F86F@bastion2.fedora.phx.redhat.com>

dsd has requested the commit acl on abiword (Fedora OLPC 3)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/abiword



From pkgdb at fedoraproject.org  Thu Sep 24 09:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 09:28:31 +0000
Subject: [pkgdb] abiword: dsd has requested watchcommits
Message-ID: <20090924092831.D635810F883@bastion2.fedora.phx.redhat.com>

dsd has requested the watchcommits acl on abiword (Fedora OLPC 3)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/abiword



From jpopelka at fedoraproject.org  Thu Sep 24 09:29:34 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu, 24 Sep 2009 09:29:34 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec, 1.275, 1.276 dhcpd.init, 1.30,
	1.31 dhcrelay.init, 1.11, 1.12
Message-ID: <20090924092934.986BC11C00DB@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5696

Modified Files:
	dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Thu Sep 24 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-11
- Make dhcpd and dhcrelay init scripts LSB compliant (#522134, #522146)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- dhcp.spec	22 Sep 2009 00:18:21 -0000	1.275
+++ dhcp.spec	24 Sep 2009 09:29:34 -0000	1.276
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  10%{?dist}
+Release:  11%{?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.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Sep 24 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-11
+- Make dhcpd and dhcrelay init scripts LSB compliant (#522134, #522146)
+
 * Mon Sep 21 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-10
 - Obsolete the dhcpv6 and dhcpv6-client packages
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- dhcpd.init	17 Apr 2009 21:48:50 -0000	1.30
+++ dhcpd.init	24 Sep 2009 09:29:34 -0000	1.31
@@ -22,12 +22,12 @@
 # config: /var/lib/dhcpd/dhcpd.leases
 # pidfile: /var/run/dhcpd.pid
 
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
 
 RETVAL=0
 
 prog=dhcpd
-dhcpd=/usr/sbin/dhcpd
+exec=/usr/sbin/dhcpd
 lockfile=/var/lock/subsys/dhcpd
 pidfile=/var/run/dhcpd.pid
 statedir=/var/lib/dhcpd
@@ -49,7 +49,7 @@ findConfig() {
     echo "/etc/dhcp/dhcpd.conf"
 }
 
-conf="$(findConfig "$DHCPDARGS")"
+config="$(findConfig "$DHCPDARGS")"
 
 if [ ! -f $statedir/dhcpd.leases ] ; then
     mkdir -p $statedir
@@ -58,12 +58,12 @@ if [ ! -f $statedir/dhcpd.leases ] ; the
 fi
 
 configtest() {
-    [ -x $dhcpd ] || return 5
-    [ -f $conf ] || return 6
-    $dhcpd -q -t -cf $conf
+    [ -x $exec ] || return 5
+    [ -f $config ] || return 6
+    $exec -q -t -cf $config
     RETVAL=$?
     if [ $RETVAL -eq 1 ]; then
-        $dhcpd -t -cf $conf
+        $exec -t -cf $config
     else
         echo "Syntax: OK" >&2
     fi
@@ -71,37 +71,44 @@ configtest() {
 }
 
 start() {
-    [ -x $dhcpd ] || return 5
-    [ -f $conf ] || return 6
+    [ `id -u` -eq 0 ] || return 4
+    [ -x $exec ] || return 5
+    [ -f $config ] || return 6
 
     pidofproc $prog >/dev/null 2>&1
     RETVAL=$?
     [ $RETVAL -eq 0 ] && return $RETVAL
 
     echo -n $"Starting $prog: "
-    daemon $dhcpd $DHCPDARGS 2>/dev/null
+    daemon $exec $DHCPDARGS 2>/dev/null
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && touch $lockfile
+    [ $RETVAL -eq 0 ] && touch $lockfile
     return $RETVAL
 }
 
 stop() {
+    [ `id -u` -eq 0 ] || return 4
+
     pidofproc $prog >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        RETVAL=7
+        RETVAL=0
         return $RETVAL
     fi
-
+    
     echo -n $"Shutting down $prog: "
     killproc $prog
     RETVAL=$?
 
     echo
-    [ $RETVAL = 0 ] && rm -f $lockfile
+    [ $RETVAL -eq 0 ] && rm -f $lockfile
     return $RETVAL
 }
 
+usage() {
+    echo $"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|configtest|status}"
+}
+
 if [ $# -gt 1 ]; then
     RETVAL=2
     exit $RETVAL
@@ -120,23 +127,28 @@ case "$1" in
         stop ; start
         RETVAL=$?
         ;;
-    condrestart)
+    condrestart|try-restart)
         if [ -f $lockfile ]; then
             stop ; start
             RETVAL=$?
         fi
         ;;
+    reload)
+        usage
+        # unimplemented feature
+        RETVAL=3
+        ;;
     configtest)
         configtest
         RETVAL=$?
         ;;
     status)
-        status $dhcpd
+        status $exec
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}"
-        RETVAL=3
+        usage
+        RETVAL=2
         ;;
 esac
 


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcrelay.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dhcrelay.init	17 Apr 2009 21:48:50 -0000	1.11
+++ dhcrelay.init	24 Sep 2009 09:29:34 -0000	1.12
@@ -20,15 +20,15 @@
 # processname: dhcrelay
 # # pidfile: /var/run/dhcrelay.pid
 
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
 
 RETVAL=0
 
 prog=dhcrelay
-dhcrelay=/usr/sbin/dhcrelay
+exec=/usr/sbin/dhcrelay
 lockfile=/var/lock/subsys/dhcrelay
 pidfile=/var/run/dhcrelay.pid
-conf=/etc/sysconfig/dhcrelay
+config=/etc/sysconfig/dhcrelay
 
 # The dhcrelay daemon uses the sysconfig file for configuration information.
 # There is no native configuration file for this program and you must specify
@@ -36,23 +36,24 @@ conf=/etc/sysconfig/dhcrelay
 [ -f /etc/sysconfig/dhcrelay ] && . /etc/sysconfig/dhcrelay
 
 configtest() {
-    [ -x $dhcrelay ] || exit 5
-    [ -f $conf ] || exit 6
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
     [ -z "$DHCPSERVERS" ] && exit 6
     RETVAL=0
     return $RETVAL
 }
 
 start() {
-    [ -x $dhcrelay ] || exit 5
-    [ -f $conf ] || exit 6
+    [ `id -u` -eq 0 ] || exit 4
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
 
     pidofproc $prog >/dev/null 2>&1
     RETVAL=$?
     [ $RETVAL -eq 0 ] && return $RETVAL
 
     echo -n $"Starting $prog: "
-    daemon $dhcrelay $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS 2>/dev/null
+    daemon $exec $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS 2>/dev/null
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch $lockfile
@@ -60,9 +61,11 @@ start() {
 }
 
 stop() {
+    [ `id -u` -eq 0 ] || exit 4
+
     pidofproc $prog >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        RETVAL=7
+        RETVAL=0
         return $RETVAL
     fi
 
@@ -71,11 +74,17 @@ stop() {
     RETVAL=$?
 
     echo
-    [ $RETVAL = 0 ] && rm -f $lockfile
+    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    # killproc -TERM doesn't remove pidfile, remove it manually
+    [ $RETVAL -eq 0 ] && rm -f $pidfile
     return $RETVAL
 }
 
-if [ ! -x $dhcrelay ]; then
+usage() {
+    echo $"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|configtest|status}"
+}
+
+if [ ! -x $exec ]; then
     RETVAL=5
     exit $RETVAL
 fi
@@ -98,12 +107,17 @@ case "$1" in
         stop && start
         RETVAL=$?
         ;;
-    condrestart)
+    condrestart|try-restart)
         if [ -f $lockfile ]; then
             stop && start
             RETVAL=$?
         fi
         ;;
+    reload)
+        usage
+        # unimplemented feature
+        RETVAL=3
+        ;;
     configtest)
         configtest
         RETVAL=$?
@@ -113,8 +127,8 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}"
-        RETVAL=3
+        usage
+        RETVAL=2
         ;;
 esac
 



From dnovotny at fedoraproject.org  Thu Sep 24 09:44:22 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 24 Sep 2009 09:44:22 +0000 (UTC)
Subject: rpms/emacs/devel emacs-23.1-xdg.patch, NONE, 1.1 emacs.spec, 1.138, 
	1.139
Message-ID: <20090924094422.CAB0A11C00DB@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9539

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-xdg.patch 
Log Message:
fix #316131


emacs-23.1-xdg.patch:
 browse-url.el |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

--- NEW FILE emacs-23.1-xdg.patch ---
diff -up emacs-23.1/lisp/net/browse-url.el.xdg emacs-23.1/lisp/net/browse-url.el
--- emacs-23.1/lisp/net/browse-url.el.xdg	2009-09-18 15:10:03.000000000 -0400
+++ emacs-23.1/lisp/net/browse-url.el	2009-09-18 15:18:51.000000000 -0400
@@ -234,6 +234,7 @@ associated with the first REGEXP which m
 function is passed the URL and any other args of `browse-url'.  The last
 regexp should probably be \".\" to specify a default browser."
   :type '(choice
+          (function-item :tag "Default freedesktop.org browser"			                         :value browse-url-default-xdg-browser)
 	  (function-item :tag "Emacs W3" :value  browse-url-w3)
 	  (function-item :tag "W3 in another Emacs via `gnudoit'"
 			 :value  browse-url-w3-gnudoit)
@@ -266,6 +267,23 @@ regexp should probably be \".\" to speci
   :version "21.1"
   :group 'browse-url)
 
+;;;###autoload
+(defcustom browse-url-xdg-open-program "xdg-open"
+  "*The name by which to invoke xdg-open."
+  :type 'string
+  :group 'browse-url)
+
+
+;;;###autoload
+(defun browse-url-default-xdg-browser (url &optional new-window)
+  (interactive (browse-url-interactive-arg "URL: "))
+  (let ((process-environment (browse-url-process-environment))
+	(process-connection-type nil))
+    (start-process (concat browse-url-xdg-open-program " " url) nil
+		   browse-url-xdg-open-program url)))
+
+
+
 (defcustom browse-url-netscape-program "netscape"
   ;; Info about netscape-remote from Karl Berry.
   "The name by which to invoke Netscape.
@@ -876,6 +894,8 @@ The order attempted is gnome-moz-remote,
 Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
   (apply
    (cond
+    ((executable-find browse-url-xdg-open-program) 
+                  'browse-url-default-xdg-browser)
     ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
     ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
     ((executable-find browse-url-firefox-program) 'browse-url-firefox)


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- emacs.spec	23 Sep 2009 10:42:24 -0000	1.138
+++ emacs.spec	24 Sep 2009 09:44:20 -0000	1.139
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -27,6 +27,8 @@ Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-gtk.patch
+Patch5: emacs-23.1-xdg.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -116,6 +118,7 @@ Emacs packages or see some elisp example
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
 %patch4 -p1 -b .gtk
+%patch5 -p1 -b .xdg
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -375,6 +378,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
+- use xdg-open(1) for opening URLs (#316131)
+
 * Wed Sep 23 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-8
 - updated rpm-spec-mode.el to latest upstream version (#524851)
 



From pkgdb at fedoraproject.org  Thu Sep 24 09:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 09:50:49 +0000
Subject: [pkgdb] abiword had acl change status
Message-ID: <20090924095049.9F6C410F86F@bastion2.fedora.phx.redhat.com>

uwog has set the watchbugzilla acl on abiword (Fedora OLPC 3) to Approved for dsd

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/abiword



From pkgdb at fedoraproject.org  Thu Sep 24 09:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 09:50:57 +0000
Subject: [pkgdb] abiword had acl change status
Message-ID: <20090924095057.BB62A10F884@bastion2.fedora.phx.redhat.com>

uwog has set the watchcommits acl on abiword (Fedora OLPC 3) to Approved for dsd

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/abiword



From pkgdb at fedoraproject.org  Thu Sep 24 09:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 09:50:59 +0000
Subject: [pkgdb] abiword had acl change status
Message-ID: <20090924095059.3ED7F10F7F0@bastion2.fedora.phx.redhat.com>

uwog has set the commit acl on abiword (Fedora OLPC 3) to Approved for dsd

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/abiword



From jfch2222 at fedoraproject.org  Thu Sep 24 10:14:56 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 24 Sep 2009 10:14:56 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.83,1.84
Message-ID: <20090924101456.45A8711C00DB@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17861

Modified Files:
	cyrus-sasl.spec 
Log Message:
Repair initscript to make condrestart working properly



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- cyrus-sasl.spec	23 Sep 2009 16:01:58 -0000	1.83
+++ cyrus-sasl.spec	24 Sep 2009 10:14:56 -0000	1.84
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -387,6 +387,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-4
+- Repair initscript to make condrestart working properly (#522103)
+
 * Wed Sep 23 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-3
 - Add possibility to run the saslauth without root privilegies (#185614)
 



From pbrobinson at fedoraproject.org  Thu Sep 24 10:19:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 24 Sep 2009 10:19:14 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.9,1.10
Message-ID: <20090924101914.9C35211C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18937

Modified Files:
	rygel.spec 
Log Message:
- Enable new plugins, add desktop file verification, add more docs


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rygel.spec	23 Sep 2009 20:48:12 -0000	1.9
+++ rygel.spec	24 Sep 2009 10:19:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@ Source0:        ftp://ftp.gnome.org/pub/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: gstreamer-devel
 BuildRequires: gtk2-devel
 BuildRequires: gupnp-devel
@@ -49,8 +50,8 @@ A plugin for rygel to use tracker to loc
 %setup -q
 
 %build
-%configure
-make V=1
+%configure --enable-tracker-plugin --enable-media-export-plugin --enable-external-plugin --enable-mediathek-plugin --enable-gstlaunch-plugin --disable-silent-rules
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
@@ -59,17 +60,23 @@ make install DESTDIR=%{buildroot} INSTAL
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
+# Verify the desktop files
+desktop-file-validate %{buildroot}/%{_datadir}/applications/rygel.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/rygel-preferences.desktop
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_sysconfdir}/rygel.conf
+%doc AUTHORS COPYING README TODO NEWS
+%config(noreplace) %{_sysconfdir}/rygel.conf
 %{_bindir}/rygel
 %{_bindir}/rygel-preferences
 %{_libdir}/rygel-1.0/librygel-external.so
 %{_libdir}/rygel-1.0/librygel-media-export.so
+%{_libdir}/rygel-1.0/librygel-gstlaunch.so
+%{_libdir}/rygel-1.0/librygel-mediathek.so
 %{_datadir}/rygel/
 %{_datadir}/applications/rygel*
 %{_datadir}/dbus-1/services/org.gnome.Rygel1.service
@@ -86,7 +93,10 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
-* Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-2
+* Thu Sep 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-3
+- Enable new plugins, add desktop file verification, add more docs
+
+* Thu Sep 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-2
 - Update deps for new release
 
 * Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1



From pnemade at fedoraproject.org  Thu Sep 24 10:51:49 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 10:51:49 +0000 (UTC)
Subject: rpms/hyphen-as/devel .cvsignore, 1.1, 1.2 hyph_as_IN.dic, 1.1,
	1.2 hyphen-as.spec, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924105149.B849311C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-as/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26660

Modified Files:
	.cvsignore hyph_as_IN.dic hyphen-as.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-as/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 04:56:26 -0000	1.1
+++ .cvsignore	24 Sep 2009 10:51:49 -0000	1.2
@@ -0,0 +1 @@
+hyph_as_IN.dic


Index: hyph_as_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-as/devel/hyph_as_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_as_IN.dic	24 Aug 2009 05:03:46 -0000	1.1
+++ hyph_as_IN.dic	24 Sep 2009 10:51:49 -0000	1.2
@@ -17,124 +17,84 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel, but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+2?2
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break after khanda ta.
-1?2
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2???.
-2???.
-2???.
-2???.
+?1
 % Do not break before chandrabindu, anusvara, visarga, avagraha,
 % nukta and au length mark.
-2?
-2?
-2?
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-as.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-as/devel/hyphen-as.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyphen-as.spec	24 Aug 2009 05:03:46 -0000	1.1
+++ hyphen-as.spec	24 Sep 2009 10:51:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name: hyphen-as
 Summary: Assamese hyphenation rules
-%define upstreamid 20090820
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_as_IN.dic
@@ -34,5 +34,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Thu Aug 20 2009 Parag <pnemade at redhat.com> - 0.20090820-1
 - initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-as/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 04:56:26 -0000	1.1
+++ sources	24 Sep 2009 10:51:49 -0000	1.2
@@ -0,0 +1 @@
+f12922a62bc54f4ab0c80c4c3ad1ddeb  hyph_as_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 10:54:37 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 10:54:37 +0000 (UTC)
Subject: rpms/hyphen-bn/devel .cvsignore, 1.1, 1.2 hyph_bn_IN.dic, 1.1,
	1.2 hyphen-bn.spec, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924105437.5996B11C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-bn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27854

Modified Files:
	.cvsignore hyph_bn_IN.dic hyphen-bn.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-bn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:25:49 -0000	1.1
+++ .cvsignore	24 Sep 2009 10:54:37 -0000	1.2
@@ -0,0 +1 @@
+hyph_bn_IN.dic


Index: hyph_bn_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-bn/devel/hyph_bn_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_bn_IN.dic	20 Aug 2009 06:02:00 -0000	1.1
+++ hyph_bn_IN.dic	24 Sep 2009 10:54:37 -0000	1.2
@@ -17,124 +17,84 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel, but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+2?2
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break after khanda ta.
-1?2
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2???.
-2???.
-2???.
-2???.
+?1
 % Do not break before chandrabindu, anusvara, visarga, avagraha,
 % nukta and au length mark.
-2?
-2?
-2?
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-bn/devel/hyphen-bn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyphen-bn.spec	20 Aug 2009 06:02:01 -0000	1.1
+++ hyphen-bn.spec	24 Sep 2009 10:54:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name: hyphen-bn
 Summary: Bengali hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_bn_IN.dic
@@ -40,5 +40,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-bn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:25:49 -0000	1.1
+++ sources	24 Sep 2009 10:54:37 -0000	1.2
@@ -0,0 +1 @@
+3b3859f2b99bfb943e46a15e3e9d0eaf  hyph_bn_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 10:59:19 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 10:59:19 +0000 (UTC)
Subject: rpms/hyphen-gu/devel hyph_gu_IN.dic, 1.2, 1.3 hyphen-gu.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090924105919.B9D1D11C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-gu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28897

Modified Files:
	hyph_gu_IN.dic hyphen-gu.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: hyph_gu_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/hyph_gu_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_gu_IN.dic	17 Aug 2009 10:52:42 -0000	1.2
+++ hyph_gu_IN.dic	24 Sep 2009 10:59:19 -0000	1.3
@@ -17,115 +17,77 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2????.
-2????.
-2????.
-2????.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before chandrabindu, anusvara, visarga, avagraha
 % and accents.
-2?
-2?
-2?
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2
+2?2


Index: hyphen-gu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/hyphen-gu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-gu.spec	17 Aug 2009 10:52:42 -0000	1.3
+++ hyphen-gu.spec	24 Sep 2009 10:59:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-gu
 Summary: Gujarati hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_gu_IN.dic
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Aug 2009 10:52:42 -0000	1.2
+++ sources	24 Sep 2009 10:59:19 -0000	1.3
@@ -1 +1 @@
-331b7a79a21ee148fca70cbd44ba82d5  hyph_gu_IN.dic
+1d4f653509192286c5087583f536ee19  hyph_gu_IN.dic



From caolanm at fedoraproject.org  Thu Sep 24 11:01:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 24 Sep 2009 11:01:37 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome596171-recentlyused.patch, NONE,
	1.1 planner-gnome596173-xdg.patch, NONE, 1.1 planner.spec, 1.64, 1.65
Message-ID: <20090924110137.BBC7011C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29622

Modified Files:
	planner.spec 
Added Files:
	planner-gnome596171-recentlyused.patch 
	planner-gnome596173-xdg.patch 
Log Message:
Resolves: rhbz#524662 Gnome XDG Config Folders for planner

planner-gnome596171-recentlyused.patch:
 Makefile.am               |    1 
 Makefile.in               |    3 
 src/Makefile.am           |    1 
 src/Makefile.in           |    2 
 src/planner-application.c |   23 --
 src/planner-application.h |    2 
 src/planner-window.c      |  379 +++++++++++++++++++++++++++++++++++++++-------
 7 files changed, 326 insertions(+), 85 deletions(-)

--- NEW FILE planner-gnome596171-recentlyused.patch ---
diff -ru planner-0.14.4.orig/Makefile.am planner-0.14.4/Makefile.am
--- planner-0.14.4.orig/Makefile.am	2009-09-23 10:07:20.000000000 +0100
+++ planner-0.14.4/Makefile.am	2009-09-23 13:14:28.000000000 +0100
@@ -14,7 +14,6 @@
 SUBDIRS = \
 	po 				\
 	libplanner			\
-	libegg				\
 	src				\
 	data				\
 	docs				\
diff -ru planner-0.14.4.orig/Makefile.in planner-0.14.4/Makefile.in
--- planner-0.14.4.orig/Makefile.in	2009-09-23 10:07:21.000000000 +0100
+++ planner-0.14.4/Makefile.in	2009-09-23 13:14:55.000000000 +0100
@@ -71,7 +71,7 @@
 DATA = $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = po libplanner libegg src data docs examples tests \
+DIST_SUBDIRS = po libplanner src data docs examples tests \
 	python eds-backend
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -307,7 +307,6 @@
 SUBDIRS = \
 	po 				\
 	libplanner			\
-	libegg				\
 	src				\
 	data				\
 	docs				\
diff -ru planner-0.14.4.orig/src/Makefile.am planner-0.14.4/src/Makefile.am
--- planner-0.14.4.orig/src/Makefile.am	2009-09-23 10:07:20.000000000 +0100
+++ planner-0.14.4/src/Makefile.am	2009-09-24 10:30:03.000000000 +0100
@@ -21,7 +21,6 @@
 planner_LDADD = \
 	libplannerapp.la \
 	$(top_builddir)/libplanner/libplanner-1.la \
-	$(top_builddir)/libegg/recent-files/libeggrecent.la \
 	$(PLANNER_LIBS)
 
 
diff -ru planner-0.14.4.orig/src/Makefile.in planner-0.14.4/src/Makefile.in
--- planner-0.14.4.orig/src/Makefile.in	2009-09-23 10:07:20.000000000 +0100
+++ planner-0.14.4/src/Makefile.in	2009-09-24 10:29:58.000000000 +0100
@@ -131,7 +131,6 @@
 planner_OBJECTS = $(am_planner_OBJECTS)
 planner_DEPENDENCIES = libplannerapp.la \
 	$(top_builddir)/libplanner/libplanner-1.la \
-	$(top_builddir)/libegg/recent-files/libeggrecent.la \
 	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -387,7 +386,6 @@
 planner_LDADD = \
 	libplannerapp.la \
 	$(top_builddir)/libplanner/libplanner-1.la \
-	$(top_builddir)/libegg/recent-files/libeggrecent.la \
 	$(PLANNER_LIBS)
 
 
diff -ru planner-0.14.4.orig/src/planner-application.c planner-0.14.4/src/planner-application.c
--- planner-0.14.4.orig/src/planner-application.c	2009-09-23 10:07:20.000000000 +0100
+++ planner-0.14.4/src/planner-application.c	2009-09-23 13:20:54.000000000 +0100
@@ -34,9 +34,6 @@
 
 struct _PlannerApplicationPriv {
 	GList *windows;
-
-	/* recent file stuff */
-	EggRecentModel *recent_model;
 };
 
 
@@ -181,15 +178,6 @@
 
 	priv->windows = NULL;
 	
-	priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
-	egg_recent_model_set_filter_mime_types (priv->recent_model,
-						"application/x-planner",
-						"application/x-mrproject",
-						NULL);
-	egg_recent_model_set_filter_uri_schemes (priv->recent_model, "file", NULL);
-
-	g_object_set (priv->recent_model, "limit", 5, NULL);
-
 	app->priv = priv;
 }
 
@@ -198,8 +186,6 @@
 {
 	PlannerApplication *app = PLANNER_APPLICATION (object);
 
-	g_object_unref (app->priv->recent_model);
-	
 	g_free (app->priv);
 
 	if (G_OBJECT_CLASS (parent_class)->finalize) {
@@ -281,12 +267,3 @@
 	
 	g_list_free (list_cpy);
 }
-
-EggRecentModel *
-planner_application_get_recent_model (PlannerApplication *app)
-{
-	g_return_val_if_fail (PLANNER_IS_APPLICATION (app), NULL);
-
-	return app->priv->recent_model;
-}
-
diff -ru planner-0.14.4.orig/src/planner-application.h planner-0.14.4/src/planner-application.h
--- planner-0.14.4.orig/src/planner-application.h	2009-09-23 10:07:20.000000000 +0100
+++ planner-0.14.4/src/planner-application.h	2009-09-23 13:16:52.000000000 +0100
@@ -26,7 +26,6 @@
 
 #include <libplanner/mrp-application.h>
 #include <libplanner/mrp-project.h>
-#include <libegg/recent-files/egg-recent-model.h>
 
 #define PLANNER_TYPE_APPLICATION                (planner_application_get_type ())
 #define PLANNER_APPLICATION(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_APPLICATION, PlannerApplication))
@@ -54,6 +53,5 @@
 PlannerApplication   *planner_application_new              (void);
 GtkWidget       *     planner_application_new_window       (PlannerApplication *app);
 void                  planner_application_exit             (PlannerApplication *app);
-EggRecentModel  *     planner_application_get_recent_model (PlannerApplication *app);
 
 #endif /* __PLANNER_APPLICATION_H__ */
diff -ru planner-0.14.4.orig/src/planner-window.c planner-0.14.4/src/planner-window.c
--- planner-0.14.4.orig/src/planner-window.c	2009-09-23 10:07:20.000000000 +0100
+++ planner-0.14.4/src/planner-window.c	2009-09-24 10:28:38.000000000 +0100
@@ -32,9 +32,6 @@
 #include <libplanner/mrp-error.h>
 #include <libplanner/mrp-project.h>
 #include <libplanner/mrp-paths.h>
-#include <libegg/recent-files/egg-recent-view.h>
-#include <libegg/recent-files/egg-recent-view-uimanager.h>
-#include <libegg/recent-files/egg-recent-util.h>
 #include "planner-marshal.h"
 #include "planner-conf.h"
 #include "planner-sidebar.h"
@@ -80,7 +77,9 @@
 	GList               *plugins;
 	GTimer              *last_saved;
 
-	EggRecentViewUIManager *recent_view;
+	GtkActionGroup      *recents_action_group;
+	guint               recents_menu_ui_id;
+	gulong              recents_handler_id;
 };
 
 /* Drop targets. */
@@ -183,8 +182,6 @@
 static void       window_update_title                    (PlannerWindow                *window);
 static GtkWidget *window_create_dialog_button            (const gchar                  *icon_name,
 							  const gchar                  *text);
-static gchar *    window_recent_tooltip_func             (EggRecentItem                *item,
-							  gpointer                      user_data);
 static void       window_save_state                      (PlannerWindow *window);
 static void       window_restore_state                   (PlannerWindow *window);
 
@@ -410,10 +407,6 @@
 		g_object_unref (priv->cmd_manager);
 	}
 
-	if (priv->recent_view) {
-		g_object_unref (priv->recent_view);
-	}
-
 	if (priv->ui_manager) {
 		g_object_unref (priv->ui_manager);
 	}
@@ -429,11 +422,13 @@
 planner_window_open_recent_cb (GtkAction     *action,
 			       PlannerWindow *window)
 {
-	const EggRecentItem *item;
-	const gchar         *uri;
+	GtkRecentInfo *info;
+	const gchar   *uri;
+
+	info = g_object_get_data (G_OBJECT (action), "gtk-recent-info");
+	g_return_if_fail (info != NULL);
 
-	item = egg_recent_view_uimanager_get_item (window->priv->recent_view, action);
-	uri = egg_recent_item_peek_uri (item);
+	uri = gtk_recent_info_get_uri (info);
 
 	planner_window_open_in_existing_or_new (window, uri, FALSE);
 }
@@ -530,6 +525,264 @@
 			       "24_groups.png");
 }
 
+/*recent files stuff lifted from gedit*/
+static void     update_recent_files_menu (PlannerWindow *window);
+
+static void
+recent_manager_changed (GtkRecentManager *manager,
+                        PlannerWindow *window)
+{
+	/* regenerate the menu when the model changes */
+	update_recent_files_menu (window);
+}
+
+static gint
+sort_recents_mru (GtkRecentInfo *a, GtkRecentInfo *b)
+{
+        return (gtk_recent_info_get_modified (b) - gtk_recent_info_get_modified (a));
+}
+
+
+/*
+ * Doubles underscore to avoid spurious menu accels.
+ */
+static gchar * 
+escape_underscores (const gchar* text,
+                    gssize       length)
+{
+	GString *str;
+	const gchar *p;
+	const gchar *end;
+
+	g_return_val_if_fail (text != NULL, NULL);
+
+	if (length < 0)
+		length = strlen (text);
+
+	str = g_string_sized_new (length);
+
+	p = text;
+	end = text + length;
+
+	while (p != end)
+	{
+		const gchar *next;
+		next = g_utf8_next_char (p);
+
+		switch (*p)
+		{
+			case '_':
+				g_string_append (str, "__");
+				break;
+			default:
+				g_string_append_len (str, p, next - p);
+				break;
+		}
+
+		p = next;
+	}
+
+	return g_string_free (str, FALSE);
+}
+
+
+/**
+ * uri_for_display:
+ * @uri: uri to be displayed.
+ *
+ * Filter, modify, unescape and change @uri to make it appropriate
+ * for display to users.
+ * 
+ * This function is a convenient wrapper for g_file_get_parse_name
+ *
+ * Return value: a string which represents @uri and can be displayed.
+ */
+static gchar *
+uri_for_display (const gchar *uri)
+{
+	GFile *gfile;
+	gchar *parse_name;
+
+	gfile = g_file_new_for_uri (uri);
+	parse_name = g_file_get_parse_name (gfile);
+	g_object_unref (gfile);
+
+	return parse_name;
+}
+
+static gchar *
+replace_home_dir_with_tilde (const gchar *uri)
+{
+	gchar *tmp;
+	gchar *home;
+
+	g_return_val_if_fail (uri != NULL, NULL);
+
+	/* Note that g_get_home_dir returns a const string */
+	tmp = (gchar *)g_get_home_dir ();
+
+	if (tmp == NULL)
+		return g_strdup (uri);
+
+	home = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
+	if (home == NULL)
+		return g_strdup (uri);
+
+	if (strcmp (uri, home) == 0)
+	{
+		g_free (home);
+		
+		return g_strdup ("~");
+	}
+
+	tmp = home;
+	home = g_strdup_printf ("%s/", tmp);
+	g_free (tmp);
+
+	if (g_str_has_prefix (uri, home))
+	{
+		gchar *res;
+
+		res = g_strdup_printf ("~/%s", uri + strlen (home));
+
+		g_free (home);
+		
+		return res;		
+	}
+
+	g_free (home);
+
+	return g_strdup (uri);
+}
+
+static void
+update_recent_files_menu (PlannerWindow *window)
+{
+        PlannerWindowPriv *p = window->priv;
+	GtkRecentManager *recent_manager;
+        gint max_recents = 5;
+	GList *actions, *l, *items;
+	GList *filtered_items = NULL;
+	gint i;
+
+	g_return_if_fail (p->recents_action_group != NULL);
+
+	if (p->recents_menu_ui_id != 0)
+		gtk_ui_manager_remove_ui (p->ui_manager,
+		                          p->recents_menu_ui_id);
+
+	actions = gtk_action_group_list_actions (p->recents_action_group);
+	for (l = actions; l != NULL; l = l->next)
+	{
+		g_signal_handlers_disconnect_by_func (GTK_ACTION (l->data),
+		                                      G_CALLBACK (planner_window_open_recent_cb),
+		                                      window);
+		gtk_action_group_remove_action (p->recents_action_group,
+		                                GTK_ACTION (l->data));
+	}
+	g_list_free (actions);
+
+	p->recents_menu_ui_id = gtk_ui_manager_new_merge_id (p->ui_manager);
+
+	recent_manager =  gtk_recent_manager_get_default ();
+	items = gtk_recent_manager_get_items (recent_manager);
+
+	/* filter */
+	for (l = items; l != NULL; l = l->next)
+	{
+		GtkRecentInfo *info = l->data;
+
+		if (!gtk_recent_info_has_group (info, "planner"))
+			continue;
+
+		filtered_items = g_list_prepend (filtered_items, info);
+	}
+
+	/* sort */
+	filtered_items = g_list_sort (filtered_items,
+				      (GCompareFunc) sort_recents_mru);
+
+	i = 0;
+	for (l = filtered_items; l != NULL; l = l->next)
+	{
+		gchar *action_name;
+		const gchar *display_name;
+		gchar *escaped;
+		gchar *label;
+		gchar *uri;
+		gchar *ruri;
+		gchar *tip;
+		GtkAction *action;
+		GtkRecentInfo *info = l->data;
+
+		/* clamp */
+		if (i >= max_recents)
+			break;
+
+		i++;
+
+		action_name = g_strdup_printf ("recent-info-%d", i);
+
+		display_name = gtk_recent_info_get_display_name (info);
+		escaped = escape_underscores (display_name, -1);
+		if (i >= 10)
+			label = g_strdup_printf ("%d.  %s",
+						 i, 
+						 escaped);
+		else
+			label = g_strdup_printf ("_%d.  %s",
+						 i, 
+						 escaped);
+		g_free (escaped);
+
+		/* gtk_recent_info_get_uri_display (info) is buggy and
+		 * works only for local files */
+		uri = uri_for_display (gtk_recent_info_get_uri (info));
+		ruri = replace_home_dir_with_tilde (uri);
+		g_free (uri);
+
+		/* Translators: %s is a URI */
+		tip = g_strdup_printf (_("Open '%s'"), ruri);
+		g_free (ruri);
+
+		action = gtk_action_new (action_name,
+					 label,
+					 tip,
+					 NULL);
+
+		g_object_set_data_full (G_OBJECT (action),
+					"gtk-recent-info",
+					gtk_recent_info_ref (info),
+					(GDestroyNotify) gtk_recent_info_unref);
+
+		g_signal_connect (action,
+				  "activate",
+				  G_CALLBACK (planner_window_open_recent_cb),
+				  window);
+
+		gtk_action_group_add_action (p->recents_action_group,
+					     action);
+		g_object_unref (action);
+
+		gtk_ui_manager_add_ui (p->ui_manager,
+				       p->recents_menu_ui_id,
+				       "/MenuBar/File/OpenRecent",
+				       action_name,
+				       action_name,
+				       GTK_UI_MANAGER_MENUITEM,
+				       FALSE);
+
+		g_free (action_name);
+		g_free (label);
+		g_free (tip);
+	}
+
+	g_list_free (filtered_items);
+
+	g_list_foreach (items, (GFunc) gtk_recent_info_unref, NULL);
+	g_list_free (items);
+}
+
 static void
 window_populate (PlannerWindow *window)
 {
@@ -606,17 +859,17 @@
 		      NULL);
 
 	/* Handle recent file stuff. */
-	priv->recent_view = egg_recent_view_uimanager_new (priv->ui_manager,
-							   "/MenuBar/File/OpenRecent",
-							   G_CALLBACK (planner_window_open_recent_cb),
-							   window);
-
-	egg_recent_view_set_model (EGG_RECENT_VIEW (priv->recent_view),
-				   planner_application_get_recent_model (priv->application));
-	egg_recent_view_uimanager_set_tooltip_func (priv->recent_view,
-						    window_recent_tooltip_func,
-						    NULL);
+        window->priv->recents_action_group = gtk_action_group_new ("RecentFilesActions");
+        gtk_action_group_set_translation_domain (window->priv->recents_action_group, NULL);
+        gtk_ui_manager_insert_action_group (priv->ui_manager, window->priv->recents_action_group, 0);
+        g_object_unref (window->priv->recents_action_group);
+
+        window->priv->recents_handler_id = g_signal_connect (gtk_recent_manager_get_default (),
+                                                             "changed",
+                                                             G_CALLBACK (recent_manager_changed),
+                                                             window);
 
+	update_recent_files_menu (window);
 	hbox = gtk_hbox_new (FALSE, 0);
 
 	priv->sidebar = planner_sidebar_new ();
@@ -1507,6 +1760,52 @@
 	return TRUE;
 }
 
+static void
+_planner_recent_add (const gchar *uri, const gchar *mime)
+{
+        GtkRecentManager *recent_manager;
+        GtkRecentData *recent_data;
+        gchar *fixeduri = NULL;
+        gchar *scratch;
+
+        static gchar *groups[2] = {
+                "planner",
+                NULL
+        };
+
+        recent_manager =  gtk_recent_manager_get_default ();
+
+        recent_data = g_slice_new (GtkRecentData);
+
+        recent_data->display_name = NULL;
+        recent_data->description = NULL;
+        recent_data->mime_type = (gchar *) mime;
+        recent_data->app_name = (gchar *) g_get_application_name ();
+        recent_data->app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
+        recent_data->groups = groups;
+        recent_data->is_private = FALSE;
+
+	/*
+	 * planner has stripped the file: from local uris so
+	 * if there's not scheme turn it back to a proper uri
+	 */
+	scratch = g_uri_parse_scheme (uri);
+	if (!scratch)
+        	uri = fixeduri = g_filename_to_uri (uri, NULL, NULL);
+	g_free (scratch);
+
+        gtk_recent_manager_add_full (recent_manager,
+                                     uri,
+                                     recent_data);
+
+	if (fixeduri)
+		g_free (fixeduri);
+
+        g_free (recent_data->app_exec);
+
+        g_slice_free (GtkRecentData, recent_data);
+}
+
 static gboolean
 window_do_save_as (PlannerWindow *window)
 {
@@ -1515,7 +1814,6 @@
 	gint              response;
 	gchar            *filename = NULL;
 	gchar            *last_dir;
-	EggRecentItem    *item;
 
 	priv = window->priv;
 
@@ -1583,10 +1881,7 @@
 
 		if (success) {
 			/* Add the file to the recent list */
-			item = egg_recent_item_new_from_uri (mrp_project_get_uri (priv->project));
-			egg_recent_item_set_mime_type (item, "application/x-planner");
-			egg_recent_model_add_full (planner_application_get_recent_model (priv->application), item);
-			egg_recent_item_unref (item);
+			_planner_recent_add(mrp_project_get_uri (priv->project), "application/x-planner");
 		} else {
 			GtkWidget *dialog;
 			
@@ -1686,7 +1981,6 @@
 	PlannerWindowPriv *priv;
 	GError           *error = NULL;
 	GtkWidget        *dialog;
-	EggRecentItem    *item;
 	
 	g_return_val_if_fail (PLANNER_IS_WINDOW (window), FALSE);
 	g_return_val_if_fail (uri != NULL, FALSE);
@@ -1710,11 +2004,7 @@
 
 	if (!internal) {
 		/* Add the file to the recent list */
-		item = egg_recent_item_new_from_uri (uri);
-		egg_recent_item_set_mime_type (item, "application/x-planner");
-		egg_recent_model_add_full (planner_application_get_recent_model (priv->application), item);
-		egg_recent_item_unref (item);
-		
+		_planner_recent_add(uri, "application/x-planner");
 		window_update_title (window);
 	}
 	
@@ -1943,25 +2233,6 @@
 	}
 }
 
-static gchar *
-window_recent_tooltip_func (EggRecentItem *item,
-			    gpointer user_data)
-{
-	gchar *uri;
-	gchar *escaped;
-	gchar *tooltip;
-
-	uri = egg_recent_item_get_uri_for_display (item);
-
-	escaped = egg_recent_util_escape_underlines (uri);
-	tooltip = g_strdup_printf (_("Open '%s'"), escaped);
-
-	g_free (uri);
-	g_free (escaped);
-
-	return tooltip;
-}
-
 PlannerCmdManager *
 planner_window_get_cmd_manager (PlannerWindow *window)
 {

planner-gnome596173-xdg.patch:
 planner-msp-plugin.c         |    2 -
 planner-print-dialog.c       |   30 ++++++++++++++++++++++++++--
 planner-python-plugin.c      |   45 ++++++++++++++++++++++++++-----------------
 planner-window.c             |    2 -
 planner-xml-planner-plugin.c |    2 -
 5 files changed, 59 insertions(+), 22 deletions(-)

--- NEW FILE planner-gnome596173-xdg.patch ---
diff -ru planner-0.14.4.orig/src/planner-msp-plugin.c planner-0.14.4/src/planner-msp-plugin.c
--- planner-0.14.4.orig/src/planner-msp-plugin.c	2009-09-24 11:12:52.000000000 +0100
+++ planner-0.14.4/src/planner-msp-plugin.c	2009-09-24 11:19:20.000000000 +0100
@@ -178,7 +178,7 @@
 	
 	dir = planner_conf_get_string (CONF_MSP_PLUGIN_LAST_DIR, NULL);
 	if (dir == NULL) {
-		dir = g_strdup (g_get_home_dir ());
+		dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
 	}
 	
 	return dir;
diff -ru planner-0.14.4.orig/src/planner-print-dialog.c planner-0.14.4/src/planner-print-dialog.c
--- planner-0.14.4.orig/src/planner-print-dialog.c	2009-09-24 11:12:52.000000000 +0100
+++ planner-0.14.4/src/planner-print-dialog.c	2009-09-24 11:13:10.000000000 +0100
@@ -43,7 +43,7 @@
 {
 	char *dir;
 	
-	dir = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
+	dir = g_build_filename (g_get_user_config_dir (), NULL);
 	
 	if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
 		if (g_mkdir (dir, 0755) != 0) {
@@ -54,7 +54,7 @@
 	
 	g_free (dir);
 	
-	dir = g_build_filename (g_get_home_dir (), ".gnome2", "planner", NULL);
+	dir = g_build_filename (g_get_user_config_dir (), "planner", NULL);
 	
 	if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
 		if (g_mkdir (dir, 0755) != 0) {
@@ -75,6 +75,19 @@
 		return NULL;
 	}
 	
+	return g_build_filename (g_get_user_config_dir (),
+				 "planner",
+				 PLANNER_PRINT_CONFIG_FILE,
+				 NULL);
+}
+
+static gchar *
+get_old_config_filename (void)
+{
+	if (!ensure_dir ()) {
+		return NULL;
+	}
+	
 	return g_build_filename (g_get_home_dir (),
 				 ".gnome2", "planner",
 				 PLANNER_PRINT_CONFIG_FILE,
@@ -171,8 +184,21 @@
 						     filename,
 						     G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
 						     NULL);
+
 		g_free (filename);
 
+		/*try the older config dir if the new one didn't exist*/
+		if (!success) {
+			filename = get_old_config_filename ();
+			if(filename) {
+				success = g_key_file_load_from_file (key_file,
+						     filename,
+						     G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
+						     NULL);
+				g_free (filename);
+			}
+		}
+
 		if (success) {
 			settings = gtk_print_settings_new_from_key_file (key_file, NULL, NULL);
 		}
diff -ru planner-0.14.4.orig/src/planner-python-plugin.c planner-0.14.4/src/planner-python-plugin.c
--- planner-0.14.4.orig/src/planner-python-plugin.c	2009-09-24 11:12:52.000000000 +0100
+++ planner-0.14.4/src/planner-python-plugin.c	2009-09-24 11:31:06.000000000 +0100
@@ -127,27 +127,14 @@
 	}
 }
 
-G_MODULE_EXPORT void 
-plugin_init (PlannerPlugin *plugin, PlannerWindow *main_window)
+static void
+plugin_execute_scripts(const gchar *dirname)
 {
-	PlannerPluginPriv *priv;
 	GDir              *dir;
-	gchar             *dirname, *full_filename;
+	gchar             *full_filename;
 	const gchar       *filename;
-	
-	priv = g_new0 (PlannerPluginPriv, 1);
-	plugin->priv = priv;
-
-	priv->main_window = main_window;
-	priv->scripts = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	Py_Initialize ();
-	
-	/* Look in ~/.gnome2/planner/python/  and run the scripts that we find */
-	dirname = g_build_filename (g_get_home_dir(), ".gnome2", "planner", "python", NULL);
 	dir = g_dir_open (dirname, 0, NULL);
 	if (dir == NULL) {
-		g_free (dirname);
 		return;
 	}
 
@@ -162,11 +149,35 @@
 		filename = g_dir_read_name (dir);
 	}
 	
-	g_free (dirname);
 	g_dir_close (dir);
 }
 
 G_MODULE_EXPORT void 
+plugin_init (PlannerPlugin *plugin, PlannerWindow *main_window)
+{
+	PlannerPluginPriv *priv;
+	gchar             *dirname;
+	
+	priv = g_new0 (PlannerPluginPriv, 1);
+	plugin->priv = priv;
+
+	priv->main_window = main_window;
+	priv->scripts = g_hash_table_new (g_str_hash, g_str_equal);
+	
+	Py_Initialize ();
+
+	/* Look in $XDG_DATA_HOME/planner/python/  and run the scripts that we find */
+	dirname = g_build_filename (g_get_user_data_dir(), "planner", "python", NULL);
+	plugin_execute_scripts(dirname);
+	g_free (dirname);
+
+	/* Look in legacy ~/.gnome2/planner/python/  and run the scripts that we find */
+	dirname = g_build_filename (g_get_home_dir(), ".gnome2", "planner", "python", NULL);
+	plugin_execute_scripts(dirname);
+	g_free (dirname);
+}
+
+G_MODULE_EXPORT void 
 plugin_exit (PlannerPlugin *plugin) 
 {
 	Py_Finalize ();
diff -ru planner-0.14.4.orig/src/planner-window.c planner-0.14.4/src/planner-window.c
--- planner-0.14.4.orig/src/planner-window.c	2009-09-24 11:12:52.000000000 +0100
+++ planner-0.14.4/src/planner-window.c	2009-09-24 11:18:11.000000000 +0100
@@ -1066,7 +1066,7 @@
 	last_dir = planner_conf_get_string (CONF_LAST_DIR, NULL);
 	
 	if (last_dir == NULL) {
-		last_dir = g_strdup (g_get_home_dir ());
+		last_dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
 	}
 	
 	return last_dir;
diff -ru planner-0.14.4.orig/src/planner-xml-planner-plugin.c planner-0.14.4/src/planner-xml-planner-plugin.c
--- planner-0.14.4.orig/src/planner-xml-planner-plugin.c	2009-09-24 11:12:52.000000000 +0100
+++ planner-0.14.4/src/planner-xml-planner-plugin.c	2009-09-24 11:19:05.000000000 +0100
@@ -63,7 +63,7 @@
 	
 	last_dir = planner_conf_get_string (CONF_MAIN_LAST_XML_EXPORT_DIR, NULL);
 	if (last_dir == NULL) {
-		last_dir = g_strdup (g_get_home_dir ());
+		last_dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
 	}
 	
 	return last_dir;


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- planner.spec	26 Jul 2009 18:52:50 -0000	1.64
+++ planner.spec	24 Sep 2009 11:01:37 -0000	1.65
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -18,6 +18,9 @@ Requires:  shared-mime-info
 Requires(post): %{_bindir}/scrollkeeper-update
 Requires(postun): %{_bindir}/scrollkeeper-update
 
+Patch0: planner-gnome596171-recentlyused.patch
+Patch1: planner-gnome596173-xdg.patch
+
 %description
 Planner is a visual project management application which allows users to
 manage several aspects of a project, including schedule tracking using
@@ -46,6 +49,8 @@ This package provides a plugin to integr
 
 %prep
 %setup -q
+%patch0 -p1 -b .recentlyused
+%patch1 -p1 -b .xdg
 
 %build
 %configure --enable-python --disable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend --disable-static
@@ -142,6 +147,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Sep 24 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-3
+- Resolves: rhbz#524662 Implement new Gnome XDG Config Folders for planner
+    + gnome#596171 change recently used to use new recently used backend
+    + gnome#XXXXXX split config/data setting into xdg dirs
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pnemade at fedoraproject.org  Thu Sep 24 11:01:35 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:01:35 +0000 (UTC)
Subject: rpms/hyphen-ta/devel hyph_ta_IN.dic, 1.2, 1.3 hyphen-ta.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090924110135.16E2211C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-ta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29565

Modified Files:
	hyph_ta_IN.dic hyphen-ta.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: hyph_ta_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/hyph_ta_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_ta_IN.dic	17 Aug 2009 10:59:12 -0000	1.2
+++ hyph_ta_IN.dic	24 Sep 2009 11:01:34 -0000	1.3
@@ -17,82 +17,60 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel, but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1 
-1?1
-1?1
-1?1 
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??. 
-2??.
-2??.
-2??. 
-2??.
-2??.
-2??.
-2??.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1? 
+1?
+1?
+1? 
+1?
+1?
+1?
+1?
 % Do not break before anusvara, visarga and length mark.
-2?
-2?
-2?
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-ta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/hyphen-ta.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-ta.spec	17 Aug 2009 10:59:12 -0000	1.3
+++ hyphen-ta.spec	24 Sep 2009 11:01:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-ta
 Summary: Tamil hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ta_IN.dic
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Aug 2009 10:59:12 -0000	1.2
+++ sources	24 Sep 2009 11:01:34 -0000	1.3
@@ -1 +1 @@
-0bdbe2efd8ce64d82cf005832e815520  hyph_ta_IN.dic
+217afc27e754e744d3ba9fa1b67a9441  hyph_ta_IN.dic



From arthurguru at fedoraproject.org  Thu Sep 24 11:01:37 2009
From: arthurguru at fedoraproject.org (Arthur Gouros)
Date: Thu, 24 Sep 2009 11:01:37 +0000 (UTC)
Subject: rpms/xmlfy/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xmlfy.spec, 
	1.2, 1.3
Message-ID: <20090924110137.E890F11C00DB@cvs1.fedora.phx.redhat.com>

Author: arthurguru

Update of /cvs/pkgs/rpms/xmlfy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29604

Modified Files:
	.cvsignore sources xmlfy.spec 
Log Message:
Release 1.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlfy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 May 2009 07:14:45 -0000	1.2
+++ .cvsignore	24 Sep 2009 11:01:37 -0000	1.3
@@ -1 +1 @@
-xmlfy-1.4.3-src.tar.gz
+xmlfy-1.5.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlfy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 May 2009 07:14:46 -0000	1.2
+++ sources	24 Sep 2009 11:01:37 -0000	1.3
@@ -1 +1 @@
-5af8140bf5f0516c3221c17f84762a95  xmlfy-1.4.3-src.tar.gz
+16886ed5257063881b91a0f57be12fea  xmlfy-1.5.0-src.tar.gz


Index: xmlfy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlfy/devel/xmlfy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlfy.spec	27 Jul 2009 08:11:25 -0000	1.2
+++ xmlfy.spec	24 Sep 2009 11:01:37 -0000	1.3
@@ -1,7 +1,7 @@
-Summary: Convert text/UTF-8 based output into XML format
+Summary: Convert text/UTF based output into XML format
 Name: xmlfy
-Version: 1.4.3
-Release: 2%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Text
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
@@ -10,10 +10,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 %description 
 The xmlfy command is a powerful yet lightweight tool that primarily
-caters for converting text or UTF-8 based output into XML format on
-the fly and dealing with common issues associated with this kind of
-transformation. xmlfy can be invoked from the command line or from
-within a shell script to transform data quickly, easily and reliably.
+caters for converting ASCII, UTF-8, UTF-16 or UTF-32 based output
+into XML format on the fly and dealing with common issues associated
+with this kind of transformation. xmlfy can be invoked from the command
+line or from within a shell script to transform data quickly, easily
+and reliably.
 
 xmlfy provides many features and options to capture and encapsulate data
 between XML tags for both simple and complex XML tree hierarchies. The
@@ -50,6 +51,9 @@ make DESTDIR=%{buildroot} bindir=%{_bind
 rm -rf %{buildroot}
 
 %changelog
+* Thu Sep 24 2009 Arthur Gouros <arthurguru at users.sourceforge.net> 1.5.0-1
+- normal release, consult RELEASE_NOTES file for details
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pnemade at fedoraproject.org  Thu Sep 24 11:03:06 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:03:06 +0000 (UTC)
Subject: rpms/hyphen-hi/devel .cvsignore, 1.1, 1.2 hyph_hi_IN.dic, 1.2,
	1.3 hyphen-hi.spec, 1.3, 1.4 sources, 1.1, 1.2
Message-ID: <20090924110306.7C2F311C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-hi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30227

Modified Files:
	.cvsignore hyph_hi_IN.dic hyphen-hi.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-hi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:47:59 -0000	1.1
+++ .cvsignore	24 Sep 2009 11:03:06 -0000	1.2
@@ -0,0 +1 @@
+hyph_hi_IN.dic


Index: hyph_hi_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-hi/devel/hyph_hi_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_hi_IN.dic	17 Aug 2009 10:36:39 -0000	1.2
+++ hyph_hi_IN.dic	24 Sep 2009 11:03:06 -0000	1.3
@@ -17,120 +17,81 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2????.
-2????.
-2????.
-2????.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before chandrabindu, anusvara, visarga, avagraha
 % and accents.
-2?
-2?
-2?
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-hi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-hi/devel/hyphen-hi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-hi.spec	17 Aug 2009 10:36:39 -0000	1.3
+++ hyphen-hi.spec	24 Sep 2009 11:03:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-hi
 Summary: Hindi hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_hi_IN.dic
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-hi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:47:59 -0000	1.1
+++ sources	24 Sep 2009 11:03:06 -0000	1.2
@@ -0,0 +1 @@
+a332dee7ec629468c45efd6521358ab8  hyph_hi_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 11:06:41 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:06:41 +0000 (UTC)
Subject: rpms/hyphen-te/devel hyph_te_IN.dic, 1.2, 1.3 hyphen-te.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090924110641.8518111C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-te/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32283

Modified Files:
	hyph_te_IN.dic hyphen-te.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: hyph_te_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/hyph_te_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_te_IN.dic	17 Aug 2009 10:50:37 -0000	1.2
+++ hyph_te_IN.dic	24 Sep 2009 11:06:41 -0000	1.3
@@ -1,5 +1,5 @@
 UTF-8
-%  Hyphenation for Malayalam
+%  Hyphenation for Telugu
 %  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
@@ -17,123 +17,83 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel, but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1 % can occur in Sanskrit?
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2????.
-2????.
-2????.
-2????.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before chandrabindu, anusvara, visarga,
 % length mark and ai length mark.
-2?
-2?
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-te.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/hyphen-te.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-te.spec	17 Aug 2009 10:50:37 -0000	1.3
+++ hyphen-te.spec	24 Sep 2009 11:06:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-te
 Summary: Telugu hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_te_IN.dic
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Aug 2009 10:50:37 -0000	1.2
+++ sources	24 Sep 2009 11:06:41 -0000	1.3
@@ -1 +1 @@
-d6d326d0baf935dbb02051310cc5dde6  hyph_te_IN.dic
+f4fbbc29a6956451318c54290475e7d8  hyph_te_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 11:07:06 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:07:06 +0000 (UTC)
Subject: rpms/hyphen-ml/devel hyphen-ml.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20090924110706.0854F11C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-ml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32438

Modified Files:
	hyphen-ml.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: hyphen-ml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ml/devel/hyphen-ml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hyphen-ml.spec	17 Aug 2009 10:16:29 -0000	1.4
+++ hyphen-ml.spec	24 Sep 2009 11:07:05 -0000	1.5
@@ -1,8 +1,8 @@
 Name: hyphen-ml
 Summary: Malayalam hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ml_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ml/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Aug 2009 10:16:29 -0000	1.3
+++ sources	24 Sep 2009 11:07:05 -0000	1.4
@@ -1 +1 @@
-4c34acc266312727eb58275f44ea487f  hyph_ml_IN.dic
+aa5d6c64e9441a5fe277c5bfd28546d1  hyph_ml_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 11:09:38 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:09:38 +0000 (UTC)
Subject: rpms/hyphen-pa/devel hyph_pa_IN.dic, 1.2, 1.3 hyphen-pa.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090924110938.6635D11C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-pa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv647

Modified Files:
	hyph_pa_IN.dic hyphen-pa.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: hyph_pa_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/hyph_pa_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_pa_IN.dic	17 Aug 2009 10:46:15 -0000	1.2
+++ hyph_pa_IN.dic	24 Sep 2009 11:09:38 -0000	1.3
@@ -1,5 +1,5 @@
 UTF-8
-%  Hyphenation for Hindi
+%  Hyphenation for Panjabi
 %  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
@@ -17,109 +17,72 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-11
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2?.
-2??.
-2??.
-2????.
-2????.
-2????.
-2????.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before chandrabindu, anusvara, visarga, avagraha
 % and accents.
-2?
-2?
-2?
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2
+2?2
+2?2


Index: hyphen-pa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/hyphen-pa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-pa.spec	17 Aug 2009 10:46:15 -0000	1.3
+++ hyphen-pa.spec	24 Sep 2009 11:09:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-pa
 Summary: Punjabi hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_pa_IN.dic
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Aug 2009 10:46:15 -0000	1.2
+++ sources	24 Sep 2009 11:09:38 -0000	1.3
@@ -1 +1 @@
-a747fb263deab64b91f5618198218838  hyph_pa_IN.dic
+044ec4accad6eb5051188ed5b5c8a039  hyph_pa_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 11:10:32 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:10:32 +0000 (UTC)
Subject: rpms/hyphen-or/devel hyph_or_IN.dic, 1.2, 1.3 hyphen-or.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090924111032.4839B11C0423@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-or/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv993

Modified Files:
	hyph_or_IN.dic hyphen-or.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: hyph_or_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/hyph_or_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_or_IN.dic	17 Aug 2009 10:45:46 -0000	1.2
+++ hyph_or_IN.dic	24 Sep 2009 11:10:32 -0000	1.3
@@ -17,111 +17,76 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel, but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2?. 
-2??.
-2??.
-2?. 
-2??.
-2??.
-2??.
-2??.
-2??.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before anusvara, visarga and length mark.
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2
+


Index: hyphen-or.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/hyphen-or.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-or.spec	17 Aug 2009 10:45:46 -0000	1.3
+++ hyphen-or.spec	24 Sep 2009 11:10:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-or
 Summary: Oriya hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_or_IN.dic
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Aug 2009 10:45:46 -0000	1.2
+++ sources	24 Sep 2009 11:10:32 -0000	1.3
@@ -1 +1 @@
-a831a8c080ea9e0e1f12ab91f45f4750  hyph_or_IN.dic
+73deed798ad9423495a1bb452ff9b611  hyph_or_IN.dic



From pnemade at fedoraproject.org  Thu Sep 24 11:14:33 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 24 Sep 2009 11:14:33 +0000 (UTC)
Subject: rpms/hyphen-kn/devel .cvsignore, 1.1, 1.2 hyph_kn_IN.dic, 1.2,
	1.3 hyphen-kn.spec, 1.3, 1.4 sources, 1.1, 1.2
Message-ID: <20090924111433.1B57E11C00DB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-kn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1872

Modified Files:
	.cvsignore hyph_kn_IN.dic hyphen-kn.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-kn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:49:11 -0000	1.1
+++ .cvsignore	24 Sep 2009 11:14:32 -0000	1.2
@@ -0,0 +1 @@
+hyph_kn_IN.dic


Index: hyph_kn_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-kn/devel/hyph_kn_IN.dic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyph_kn_IN.dic	22 Aug 2009 13:56:41 -0000	1.2
+++ hyph_kn_IN.dic	24 Sep 2009 11:14:32 -0000	1.3
@@ -17,124 +17,84 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel, but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1 % can occur in Sanskrit?
-1?1
-1?1
-1?1 % can occur in Sanskrit?
-1?1
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2???.
-2???.
-2???.
-2???.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before anusvara, visarga, avagraha,
 % length mark and ai length mark.
-2?
-2?
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-kn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-kn/devel/hyphen-kn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-kn.spec	22 Aug 2009 13:56:41 -0000	1.3
+++ hyphen-kn.spec	24 Sep 2009 11:14:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hyphen-kn
 Summary: Kannada hyphenation rules
-%define upstreamid 20090815
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_kn_IN.dic
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Sat Aug 22 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090815-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-kn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:49:11 -0000	1.1
+++ sources	24 Sep 2009 11:14:32 -0000	1.2
@@ -0,0 +1 @@
+78cc636940fe89637e47212e834e43fe  hyph_kn_IN.dic



From coec at fedoraproject.org  Thu Sep 24 11:28:42 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 24 Sep 2009 11:28:42 +0000 (UTC)
Subject: rpms/editarea/devel editarea.conf, NONE, 1.1 editarea.spec, NONE,
	1.1 fix_path.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924112842.516C111C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/editarea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4435/devel

Modified Files:
	.cvsignore sources 
Added Files:
	editarea.conf editarea.spec fix_path.patch import.log 
Log Message:
Initial commit of editarea package



--- NEW FILE editarea.conf ---
alias /editarea /usr/share/editarea


--- NEW FILE editarea.spec ---
%define          _version    0_8_1_1

Name:           editarea 
Version:        %(echo %{_version} | sed 's/_/./g')
Release:        5%{?dist}
Summary:        A replacement for the HTML textarea tag

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        ASL 2.0 or LGPLv2+ or BSD
URL:            http://cdolivet.com/editarea/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{_version}.zip
Source1:        %{name}.conf
Patch0:         fix_path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd
BuildArch:      noarch

%description
EditArea is a replacement for the HTML textarea tag.  It provides such features
as syntax highlighting (for some languages), search/replace, goto line number
and more.  EditArea is not a WYSIWYG editor.

%prep
%setup -qn %{name}_%{_version}
# Equiv to dos2unix
sed -i 's/\r//' ./todo.txt ./license_bsd.txt ./change_log.txt ./license_apache.txt ./docs/doc_style.css 
%patch0 -p1

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 0644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

mv exemples examples
mv examples/exemple_full.html examples/example_full.html
cp -a edit_area/* $RPM_BUILD_ROOT%{_datadir}/%{name}

cd $RPM_BUILD_ROOT%{_datadir}/%{name}
rm -f change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
cd -

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%{_datadir}/%{name}/
%doc change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
%doc docs examples

%changelog
* Tue Sep 22 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-5
- Use correct Source0 format

* Wed Sep 16 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-4
- Stop packaging duplicate files
- Fix summary line
- Change references to 'exemples' to 'examples'

* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-3
- Remove user/group (-o/-g) from install
- Make install honor timestemps (-p)
- Patch exemple_full.html to reflect correct path

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-2
- Split out /etc/httpd/conf.d/editarea.conf

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-1
- Fix incorrect URL (s/cdolivet.net/cdolivet.com/)
- Rebase to editarea-0.8.1.1

* Wed Apr 15 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-2
- Provide better summary and description
- Increment release

* Wed Feb 11 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-1
- Initial Packaging 



fix_path.patch:
 exemple_full.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_path.patch ---
diff -uNr editarea_0_8_1_1.old/exemples/exemple_full.html editarea_0_8_1_1/exemples/exemple_full.html
--- editarea_0_8_1_1.old/exemples/exemple_full.html	2009-04-25 02:52:26.000000000 +0800
+++ editarea_0_8_1_1/exemples/exemple_full.html	2009-09-07 13:30:40.000000000 +0800
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>EditArea - the code editor in a textarea</title>
-	<script language="Javascript" type="text/javascript" src="../edit_area/edit_area_full.js"></script>
+	<script language="Javascript" type="text/javascript" src="/editarea/edit_area_full.js"></script>
 	<script language="Javascript" type="text/javascript">
 		// initialisation
 		editAreaLoader.init({


--- NEW FILE import.log ---
editarea-0_8_1_1-5el5:HEAD:editarea-0.8.1.1-5el5.src.rpm:1253788033


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:38:19 -0000	1.1
+++ .cvsignore	24 Sep 2009 11:28:42 -0000	1.2
@@ -0,0 +1 @@
+editarea_0_8_1_1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:38:19 -0000	1.1
+++ sources	24 Sep 2009 11:28:42 -0000	1.2
@@ -0,0 +1 @@
+23d31760fc82e69656e2c3d5bfa677d2  editarea_0_8_1_1.zip



From jzeleny at fedoraproject.org  Thu Sep 24 11:30:24 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu, 24 Sep 2009 11:30:24 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.4.18-ldif-buf-overflow.patch, NONE, 
	1.1 ldap.init, 1.33, 1.34 openldap.spec, 1.149, 1.150
Message-ID: <20090924113024.9109911C0337@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4558

Modified Files:
	ldap.init openldap.spec 
Added Files:
	openldap-2.4.18-ldif-buf-overflow.patch 
Log Message:
- new configuration schema - directory instead of file
- fixed buffer overflow issue pointed out by new glibc
- fixed behaviour during installation / upgrade caused
  by renamed init script


openldap-2.4.18-ldif-buf-overflow.patch:
 ldif.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE openldap-2.4.18-ldif-buf-overflow.patch ---
--- openldap-2.4.18/servers/slapd/back-ldif/ldif.c.orig	2009-09-24 09:46:01.000000000 +0200
+++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 12:41:09.000000000 +0200
@@ -593,9 +593,12 @@ typedef struct bvlist {
 	char *trunc;	/* filename was truncated here */
 	int  inum;		/* num from "attr={num}" in filename, or INT_MIN */
 	char savech;	/* original char at *trunc */
-	char fname;		/* variable length array BVL_NAME(bvl) = &fname */
-#	define BVL_NAME(bvl) ((char *) (bvl) + offsetof(bvlist, fname))
-#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen))
+	char *fname;		/* variable length array BVL_NAME(bvl) = &fname */
+	//char fname;		/* variable length array BVL_NAME(bvl) = &fname */
+#	define BVL_NAME(bvl) ((bvl)->fname)
+#	define BVL_SIZE(namelen) (sizeof(bvlist))
+//#	define BVL_NAME(bvl) ((char *) (bvl) + offsetof(bvlist, fname))
+//#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen))
 } bvlist;
 
 static int
@@ -710,6 +713,7 @@ ldif_readdir(
 				*fname_maxlenp = fname_len;
 
 			bvl = SLAP_MALLOC( BVL_SIZE( fname_len ) );
+			bvl->fname = SLAP_MALLOC( fname_len+1 );
 			if ( bvl == NULL ) {
 				rc = LDAP_OTHER;
 				save_errno = errno;


Index: ldap.init
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/ldap.init,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ldap.init	16 Sep 2009 14:06:36 -0000	1.33
+++ ldap.init	24 Sep 2009 11:30:24 -0000	1.34
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# ldap	This shell script takes care of starting and stopping
+# slapd	This shell script takes care of starting and stopping
 #	ldap servers (slapd).
 #
 # chkconfig: - 27 73
@@ -42,7 +42,7 @@ fi
 slapd=/usr/sbin/slapd
 slaptest=/usr/sbin/slaptest
 lockfile=/var/lock/subsys/slapd
-configfile=/etc/openldap/slapd.conf
+configdir=/etc/openldap/slapd.d/
 pidfile=/var/run/slapd.pid
 slapd_pidfile=/var/run/openldap/slapd.pid
 
@@ -104,14 +104,19 @@ function checkkeytab() {
 
 function configtest() {
 	local user= ldapuid= dbdir= file=
-	[ -f $configfile ] || exit 6
+	[ -d $configdir ] || exit 6
 	# Check for simple-but-common errors.
 	user=ldap
 	prog=`basename ${slapd}`
 	ldapuid=`id -u $user`
 	# Unaccessible database files.
 	slaptestflags=""
-	for dbdir in `LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' $configfile | sed s,^directory,,` ; do
+	dbdirs=""
+	for configfile in `ls -1 $configdir/cn\=config/olcDatabase*`; do
+		dbdirs=$dbdirs"
+		"`LANG=C egrep '^olcDbDirectory[[:space:]]*:[[:space:]]+[[:print:]]+$' $configfile | sed 's,^olcDbDirectory: ,,'`
+	done
+	for dbdir in $dbdirs; do
 		for file in `find ${dbdir}/ -not -uid $ldapuid -and \( -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb" -or -name "__db.*" -or -name "log.*" -or -name alock \)` ; do
 			echo -n $"$file is not owned by \"$user\"" ; warning ; echo
 		done
@@ -129,7 +134,7 @@ function configtest() {
 		echo -n $"$file is not readable by \"$user\"" ; warning ; echo
 	fi
 	# Unaccessible TLS configuration files.
-	tlsconfigs=`LANG=C egrep '^(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]' $configfile | awk '{print $2}'`
+	tlsconfigs=`LANG=C egrep '^olc(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]*:[[:space:]]' $configdir/cn\=config.ldif | awk '{print $2}'`
 	for file in $tlsconfigs ; do
 		if ! testasuser $user -r $file ; then
 			echo -n $"$file is not readable by \"$user\"" ; warning ; echo
@@ -151,8 +156,8 @@ function configtest() {
 		echo -n $"Checking configuration files for $prog: " ; failure ; echo
 		echo "$slaptestout"
 		if /sbin/runuser -m -s "$slaptest" -- "$user" "-u" > /dev/null 2> /dev/null ; then
-			dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' $configfile | awk '{print $2}'`
-			for directory in $dirs ; do
+			#dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' $configfile | awk '{print $2}'`
+			for directory in $dbdirs ; do
 				if test -r $directory/__db.001 ; then
 					echo -n $"stale lock files may be present in $directory" ; warning ; echo
 				fi


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- openldap.spec	18 Sep 2009 10:01:45 -0000	1.149
+++ openldap.spec	24 Sep 2009 11:30:24 -0000	1.150
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -35,6 +35,7 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
 Patch11: openldap-2.4.16-doc-cacertdir.patch
+Patch12: openldap-2.4.18-ldif-buf-overflow.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -141,6 +142,7 @@ pushd openldap-%{version}
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
 %patch11 -p1 -b .cacertdir
+%patch12 -p1 -b .malloc
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -425,6 +427,14 @@ if [ "$1" = "2" ]; then
 
     OLD_SLAPD_VERSION=$( rpm -q --qf "%{VERSION}" openldap-servers | sed 's/\.[0-9]*$//' )
     NEW_SLAPD_VERSION=$( echo %{version} | sed 's/\.[0-9]*$//' )
+    # we need to detect how is the init script named
+    # - in older versions ldap
+    # - in newer versions slapd
+    if [ -f %{_initrddir}/ldap ]; then
+        SERVICE_NAME=ldap
+    elif [ -f %{_initrddir}/slapd ]; then
+        SERVICE_NAME=slapd
+    fi
 
     if [ "$OLD_SLAPD_VERSION" != "$NEW_SLAPD_VERSION" ]; then
         # Minor version number has changed -> slapcat/slapadd of the BDB database 
@@ -433,9 +443,9 @@ if [ "$1" = "2" ]; then
         # directory - Just In Case (TM)
 
         # stop the server
-        if /sbin/service ldap status &>/dev/null; then 
+        if /sbin/service $SERVICE_NAME status &>/dev/null; then 
             touch /var/lib/ldap/need_start
-            /sbin/service ldap stop &>/dev/null
+            /sbin/service $SERVICE_NAME stop &>/dev/null
         fi
 
         files=$(echo /var/lib/ldap/{log.*,__db.*,[a]lock})
@@ -456,9 +466,9 @@ if [ "$1" = "2" ]; then
             # Minor version number of bdb has changed -> run db_upgrade in % post script 
     
             # stop the server
-            if /sbin/service ldap status &>/dev/null; then 
+            if /sbin/service $SERVICE_NAME status &>/dev/null; then 
                 touch /var/lib/ldap/need_start
-                /sbin/service ldap stop &>/dev/null
+                /sbin/service $SERVICE_NAME stop &>/dev/null
             fi
 
             # Ensure, that the database is correct
@@ -472,7 +482,7 @@ exit 0
 
 %post servers
 /sbin/ldconfig
-/sbin/chkconfig --add ldap
+/sbin/chkconfig --add slapd
 # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
 # It was created by the % pre above.
 if [ -f /var/lib/ldap/upgrade.ldif ] ; then
@@ -505,11 +515,34 @@ chmod 640 slapd.pem
 popd
 fi
 
+if [ -f %{_sysconfdir}/openldap/slapd.conf ]; then
+    # if there is no slapd.conf, we probably already have new configuration in place
+    mv %{_sysconfdir}/openldap/slapd.conf %{_sysconfdir}/openldap/slapd.conf.bak
+    mkdir -p %{_sysconfdir}/openldap/slapd.d/
+    lines=`egrep -n '^(database|backend)' %{_sysconfdir}/openldap/slapd.conf.bak | cut -d: -f1 | head -n 1`
+    lines=$(($lines-1))
+    head -n $lines %{_sysconfdir}/openldap/slapd.conf.bak > %{_sysconfdir}/openldap/slapd.conf
+    cat >> %{_sysconfdir}/openldap/slapd.conf << EOF
+database config
+rootdn   "cn=admin,cn=config"
+#rootpw   secret
+EOF
+    lines_r=`wc --lines %{_sysconfdir}/openldap/slapd.conf.bak | cut -f1 -d" "`
+    lines_r=$(($lines_r-$lines))
+    tail -n $lines_r %{_sysconfdir}/openldap/slapd.conf.bak >> %{_sysconfdir}/openldap/slapd.conf
+    slaptest -f %{_sysconfdir}/openldap/slapd.conf -F %{_sysconfdir}/openldap/slapd.d > /dev/null 2> /dev/null
+    chown -R ldap:ldap %{_sysconfdir}/openldap/slapd.d
+    chmod -R 000 %{_sysconfdir}/openldap/slapd.d
+    chmod -R u+rwX %{_sysconfdir}/openldap/slapd.d
+    rm -f %{_sysconfdir}/openldap/slapd.conf
+fi
+
+
 if [ $1 -ge 1 ] ; then
-    /sbin/service ldap condrestart &>/dev/null
-    /sbin/service ldap status &>/dev/null
+    /sbin/service slapd condrestart &>/dev/null
+    /sbin/service slapd status &>/dev/null
     if [ "$?" != "0" -a -f /var/lib/ldap/need_start ]; then
-        /sbin/service ldap start &>/dev/null
+        /sbin/service slapd start &>/dev/null
         rm -f /var/lib/ldap/need_start &>/dev/null 
     fi
 fi
@@ -518,8 +551,8 @@ exit 0
 
 %preun servers
 if [ "$1" = "0" ] ; then
-  /sbin/service ldap stop > /dev/null 2>&1 || :
-  /sbin/chkconfig --del ldap
+  /sbin/service slapd stop > /dev/null 2>&1 || :
+  /sbin/chkconfig --del slapd
 # Openldap-servers are being removed from system.
 # Do not touch the database! Older versions of this
 # package attempted to store database in LDIF format, so
@@ -606,6 +639,12 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Sep 22 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-2
+- changed configuration approach. Instead od slapd.conf slapd
+  is using slapd.d directory now
+- fix of some issues caused by renaming of init script
+- fix of buffer overflow issue in ldif.c pointed out by new glibc
+
 * Fri Sep 18 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-1
 - rebase of openldap to 2.4.18
 
@@ -614,6 +653,7 @@ fi
 
 * Wed Sep 16 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-6
 - updated init script to be LSB-compliant (#523434)
+- init script renamed to slapd
 
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-5
 - rebuilt with new openssl



From jfch2222 at fedoraproject.org  Thu Sep 24 11:32:04 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 24 Sep 2009 11:32:04 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec, 1.84, 1.85 saslauthd.init,
	1.6, 1.7
Message-ID: <20090924113204.AB83011C00DB@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5337

Modified Files:
	cyrus-sasl.spec saslauthd.init 
Log Message:
Repair initscript to make condrestart working properly



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- cyrus-sasl.spec	24 Sep 2009 10:14:56 -0000	1.84
+++ cyrus-sasl.spec	24 Sep 2009 11:32:04 -0000	1.85
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -387,7 +387,7 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
-* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-4
+* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-5
 - Repair initscript to make condrestart working properly (#522103)
 
 * Wed Sep 23 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-3


Index: saslauthd.init
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- saslauthd.init	23 Sep 2009 16:01:58 -0000	1.6
+++ saslauthd.init	24 Sep 2009 11:32:04 -0000	1.7
@@ -38,7 +38,7 @@ lockfile=/var/lock/subsys/$prog
 start() {
 	[ -x $path ] || exit 5
 	echo -n $"Starting $prog: "
-	daemon $DAEMONOPTS $path -m $SOCKETDIR -a $MECH $FLAGS
+	daemon $path -m $SOCKETDIR -a $MECH $FLAGS
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile
@@ -98,7 +98,12 @@ case "$1" in
   status)
 	rh_status
 	;;
-  condrestart|try-restart)
+  condrestart)
+	if [ -f /var/lock/subsys/$prog ]; then
+	    restart
+	fi
+	;;
+  try-restart)
 	rh_status_q || exit 0
 	restart
 	;;



From coec at fedoraproject.org  Thu Sep 24 11:37:54 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 24 Sep 2009 11:37:54 +0000 (UTC)
Subject: rpms/editarea/EL-5 editarea.conf, NONE, 1.1 editarea.spec, NONE,
	1.1 fix_path.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924113754.8A4E811C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/editarea/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7329/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	editarea.conf editarea.spec fix_path.patch import.log 
Log Message:
Initial commit of editarea package



--- NEW FILE editarea.conf ---
alias /editarea /usr/share/editarea


--- NEW FILE editarea.spec ---
%define          _version    0_8_1_1

Name:           editarea 
Version:        %(echo %{_version} | sed 's/_/./g')
Release:        5%{?dist}
Summary:        A replacement for the HTML textarea tag

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        ASL 2.0 or LGPLv2+ or BSD
URL:            http://cdolivet.com/editarea/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{_version}.zip
Source1:        %{name}.conf
Patch0:         fix_path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd
BuildArch:      noarch

%description
EditArea is a replacement for the HTML textarea tag.  It provides such features
as syntax highlighting (for some languages), search/replace, goto line number
and more.  EditArea is not a WYSIWYG editor.

%prep
%setup -qn %{name}_%{_version}
# Equiv to dos2unix
sed -i 's/\r//' ./todo.txt ./license_bsd.txt ./change_log.txt ./license_apache.txt ./docs/doc_style.css 
%patch0 -p1

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 0644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

mv exemples examples
mv examples/exemple_full.html examples/example_full.html
cp -a edit_area/* $RPM_BUILD_ROOT%{_datadir}/%{name}

cd $RPM_BUILD_ROOT%{_datadir}/%{name}
rm -f change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
cd -

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%{_datadir}/%{name}/
%doc change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
%doc docs examples

%changelog
* Tue Sep 22 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-5
- Use correct Source0 format

* Wed Sep 16 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-4
- Stop packaging duplicate files
- Fix summary line
- Change references to 'exemples' to 'examples'

* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-3
- Remove user/group (-o/-g) from install
- Make install honor timestemps (-p)
- Patch exemple_full.html to reflect correct path

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-2
- Split out /etc/httpd/conf.d/editarea.conf

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-1
- Fix incorrect URL (s/cdolivet.net/cdolivet.com/)
- Rebase to editarea-0.8.1.1

* Wed Apr 15 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-2
- Provide better summary and description
- Increment release

* Wed Feb 11 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-1
- Initial Packaging 



fix_path.patch:
 exemple_full.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_path.patch ---
diff -uNr editarea_0_8_1_1.old/exemples/exemple_full.html editarea_0_8_1_1/exemples/exemple_full.html
--- editarea_0_8_1_1.old/exemples/exemple_full.html	2009-04-25 02:52:26.000000000 +0800
+++ editarea_0_8_1_1/exemples/exemple_full.html	2009-09-07 13:30:40.000000000 +0800
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>EditArea - the code editor in a textarea</title>
-	<script language="Javascript" type="text/javascript" src="../edit_area/edit_area_full.js"></script>
+	<script language="Javascript" type="text/javascript" src="/editarea/edit_area_full.js"></script>
 	<script language="Javascript" type="text/javascript">
 		// initialisation
 		editAreaLoader.init({


--- NEW FILE import.log ---
editarea-0_8_1_1-5el5:EL-5:editarea-0.8.1.1-5el5.src.rpm:1253792065


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:38:19 -0000	1.1
+++ .cvsignore	24 Sep 2009 11:37:54 -0000	1.2
@@ -0,0 +1 @@
+editarea_0_8_1_1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:38:19 -0000	1.1
+++ sources	24 Sep 2009 11:37:54 -0000	1.2
@@ -0,0 +1 @@
+23d31760fc82e69656e2c3d5bfa677d2  editarea_0_8_1_1.zip



From coec at fedoraproject.org  Thu Sep 24 11:47:12 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 24 Sep 2009 11:47:12 +0000 (UTC)
Subject: rpms/editarea/F-10 editarea.conf, NONE, 1.1 editarea.spec, NONE,
	1.1 fix_path.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924114712.D97E211C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/editarea/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10212/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	editarea.conf editarea.spec fix_path.patch import.log 
Log Message:
Initial commit of editarea package



--- NEW FILE editarea.conf ---
alias /editarea /usr/share/editarea


--- NEW FILE editarea.spec ---
%define          _version    0_8_1_1

Name:           editarea 
Version:        %(echo %{_version} | sed 's/_/./g')
Release:        5%{?dist}
Summary:        A replacement for the HTML textarea tag

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        ASL 2.0 or LGPLv2+ or BSD
URL:            http://cdolivet.com/editarea/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{_version}.zip
Source1:        %{name}.conf
Patch0:         fix_path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd
BuildArch:      noarch

%description
EditArea is a replacement for the HTML textarea tag.  It provides such features
as syntax highlighting (for some languages), search/replace, goto line number
and more.  EditArea is not a WYSIWYG editor.

%prep
%setup -qn %{name}_%{_version}
# Equiv to dos2unix
sed -i 's/\r//' ./todo.txt ./license_bsd.txt ./change_log.txt ./license_apache.txt ./docs/doc_style.css 
%patch0 -p1

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 0644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

mv exemples examples
mv examples/exemple_full.html examples/example_full.html
cp -a edit_area/* $RPM_BUILD_ROOT%{_datadir}/%{name}

cd $RPM_BUILD_ROOT%{_datadir}/%{name}
rm -f change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
cd -

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%{_datadir}/%{name}/
%doc change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
%doc docs examples

%changelog
* Tue Sep 22 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-5
- Use correct Source0 format

* Wed Sep 16 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-4
- Stop packaging duplicate files
- Fix summary line
- Change references to 'exemples' to 'examples'

* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-3
- Remove user/group (-o/-g) from install
- Make install honor timestemps (-p)
- Patch exemple_full.html to reflect correct path

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-2
- Split out /etc/httpd/conf.d/editarea.conf

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-1
- Fix incorrect URL (s/cdolivet.net/cdolivet.com/)
- Rebase to editarea-0.8.1.1

* Wed Apr 15 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-2
- Provide better summary and description
- Increment release

* Wed Feb 11 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-1
- Initial Packaging 



fix_path.patch:
 exemple_full.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_path.patch ---
diff -uNr editarea_0_8_1_1.old/exemples/exemple_full.html editarea_0_8_1_1/exemples/exemple_full.html
--- editarea_0_8_1_1.old/exemples/exemple_full.html	2009-04-25 02:52:26.000000000 +0800
+++ editarea_0_8_1_1/exemples/exemple_full.html	2009-09-07 13:30:40.000000000 +0800
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>EditArea - the code editor in a textarea</title>
-	<script language="Javascript" type="text/javascript" src="../edit_area/edit_area_full.js"></script>
+	<script language="Javascript" type="text/javascript" src="/editarea/edit_area_full.js"></script>
 	<script language="Javascript" type="text/javascript">
 		// initialisation
 		editAreaLoader.init({


--- NEW FILE import.log ---
editarea-0_8_1_1-5el5:F-10:editarea-0.8.1.1-5el5.src.rpm:1253792614


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:38:19 -0000	1.1
+++ .cvsignore	24 Sep 2009 11:47:12 -0000	1.2
@@ -0,0 +1 @@
+editarea_0_8_1_1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:38:19 -0000	1.1
+++ sources	24 Sep 2009 11:47:12 -0000	1.2
@@ -0,0 +1 @@
+23d31760fc82e69656e2c3d5bfa677d2  editarea_0_8_1_1.zip



From coec at fedoraproject.org  Thu Sep 24 11:52:45 2009
From: coec at fedoraproject.org (Colin Coe)
Date: Thu, 24 Sep 2009 11:52:45 +0000 (UTC)
Subject: rpms/editarea/F-11 editarea.conf, NONE, 1.1 editarea.spec, NONE,
	1.1 fix_path.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924115245.3207E11C00DB@cvs1.fedora.phx.redhat.com>

Author: coec

Update of /cvs/pkgs/rpms/editarea/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11965/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	editarea.conf editarea.spec fix_path.patch import.log 
Log Message:
Initial commit of editarea package



--- NEW FILE editarea.conf ---
alias /editarea /usr/share/editarea


--- NEW FILE editarea.spec ---
%define          _version    0_8_1_1

Name:           editarea 
Version:        %(echo %{_version} | sed 's/_/./g')
Release:        5%{?dist}
Summary:        A replacement for the HTML textarea tag

Group:          Applications/Internet
# Valid license according to http://fedoraproject.org/wiki/Licensing
License:        ASL 2.0 or LGPLv2+ or BSD
URL:            http://cdolivet.com/editarea/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{_version}.zip
Source1:        %{name}.conf
Patch0:         fix_path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       httpd
BuildArch:      noarch

%description
EditArea is a replacement for the HTML textarea tag.  It provides such features
as syntax highlighting (for some languages), search/replace, goto line number
and more.  EditArea is not a WYSIWYG editor.

%prep
%setup -qn %{name}_%{_version}
# Equiv to dos2unix
sed -i 's/\r//' ./todo.txt ./license_bsd.txt ./change_log.txt ./license_apache.txt ./docs/doc_style.css 
%patch0 -p1

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 0644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

mv exemples examples
mv examples/exemple_full.html examples/example_full.html
cp -a edit_area/* $RPM_BUILD_ROOT%{_datadir}/%{name}

cd $RPM_BUILD_ROOT%{_datadir}/%{name}
rm -f change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
cd -

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%{_datadir}/%{name}/
%doc change_log.txt license_apache.txt license_bsd.txt license_lgpl.txt todo.txt
%doc docs examples

%changelog
* Tue Sep 22 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-5
- Use correct Source0 format

* Wed Sep 16 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-4
- Stop packaging duplicate files
- Fix summary line
- Change references to 'exemples' to 'examples'

* Mon Sep 7 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-3
- Remove user/group (-o/-g) from install
- Make install honor timestemps (-p)
- Patch exemple_full.html to reflect correct path

* Tue Sep 1 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-2
- Split out /etc/httpd/conf.d/editarea.conf

* Mon Aug 17 2009 Colin Coe <colin.coe at gmail.com> - 0.8.1.1-1
- Fix incorrect URL (s/cdolivet.net/cdolivet.com/)
- Rebase to editarea-0.8.1.1

* Wed Apr 15 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-2
- Provide better summary and description
- Increment release

* Wed Feb 11 2009 Colin Coe <colin.coe at gmail.com> - 0.7.2.3-1
- Initial Packaging 



fix_path.patch:
 exemple_full.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_path.patch ---
diff -uNr editarea_0_8_1_1.old/exemples/exemple_full.html editarea_0_8_1_1/exemples/exemple_full.html
--- editarea_0_8_1_1.old/exemples/exemple_full.html	2009-04-25 02:52:26.000000000 +0800
+++ editarea_0_8_1_1/exemples/exemple_full.html	2009-09-07 13:30:40.000000000 +0800
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>EditArea - the code editor in a textarea</title>
-	<script language="Javascript" type="text/javascript" src="../edit_area/edit_area_full.js"></script>
+	<script language="Javascript" type="text/javascript" src="/editarea/edit_area_full.js"></script>
 	<script language="Javascript" type="text/javascript">
 		// initialisation
 		editAreaLoader.init({


--- NEW FILE import.log ---
editarea-0_8_1_1-5el5:F-11:editarea-0.8.1.1-5el5.src.rpm:1253793139


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:38:19 -0000	1.1
+++ .cvsignore	24 Sep 2009 11:52:44 -0000	1.2
@@ -0,0 +1 @@
+editarea_0_8_1_1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/editarea/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:38:19 -0000	1.1
+++ sources	24 Sep 2009 11:52:44 -0000	1.2
@@ -0,0 +1 @@
+23d31760fc82e69656e2c3d5bfa677d2  editarea_0_8_1_1.zip



From mmaslano at fedoraproject.org  Thu Sep 24 12:09:40 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 24 Sep 2009 12:09:40 +0000 (UTC)
Subject: rpms/iproute/devel man-pages.patch,NONE,1.1 iproute.spec,1.97,1.98
Message-ID: <20090924120940.24DAC11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20395

Modified Files:
	iproute.spec 
Added Files:
	man-pages.patch 
Log Message:
* Thu Sep 24 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5
- create missing man pages


man-pages.patch:
 cbq.8   |    1 +
 ifcfg.8 |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nstat.8 |    1 +
 3 files changed, 59 insertions(+)

--- NEW FILE man-pages.patch ---
diff -up iproute2-2.6.29/man/man8/cbq.8.man iproute2-2.6.29/man/man8/cbq.8
--- iproute2-2.6.29/man/man8/cbq.8.man	2009-09-24 14:05:44.868922557 +0200
+++ iproute2-2.6.29/man/man8/cbq.8	2009-09-24 14:05:24.760143753 +0200
@@ -0,0 +1 @@
+.so man8/cbq.8
\ No newline at end of file
diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8
--- /dev/null	2009-09-22 09:26:40.270218984 +0200
+++ iproute2-2.6.29/man/man8/ifcfg.8	2009-09-24 14:03:05.415151874 +0200
@@ -0,0 +1,57 @@
+.TH IFCFG 8 "September 24 2009" "iproute2" "Linux"
+.SH NAME
+ifcfg \- simplistic script which replaces ifconfig IP managment
+.SH SYNOPSIS
+.ad l
+.in +8
+.ti -8
+.B ifcfg
+.RI "[ " DEVICE " [ " :ALIAS: " ] ] [ " command " ] " ADDRESS " [ " LENGTH " ] [ " PEER " ] "
+.sp
+
+.SH DESCRIPTION
+This manual page documents briefly the
+.B ifcfg
+command.
+.PP
+This is a simplistic script replacing one option of 
+.B ifconfig
+, namely, IP address management. It not only adds
+addresses, but also carries out Duplicate Address Detection RFC-DHCP,
+sends unsolicited ARP to update the caches of other hosts sharing
+the interface, adds some control routes and restarts Router Discovery
+when it is necessary.
+
+I strongly recommend using it 
+.RI instead
+of
+.RI ifconfig
+both on hosts and on routers.
+
+.SH IFCONFIG - COMMAND SYNTAX
+
+.SS
+.TP
+.B DEVICE
+- it may have alias, suffix, separated by colon.
+
+.TP
+.B command
+- add, delete or stop.
+
+.TP
+.B address
+- optionally followed by prefix length.
+
+.TP
+.B peer
+- optional peer address for pointpoint interfaces.
+
+.SH EXAMPLE
+.nf ifcfg eth0 193.233.7.90/24
+.fi
+This function determines, whether this is router or host.
+It returns 0, if the host is apparently not router.
+
+.SH SEE ALSO
+.BR ip-cref.dvi
diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8
--- /dev/null	2009-09-22 09:26:40.270218984 +0200
+++ iproute2-2.6.29/man/man8/nstat.8	2009-09-24 14:03:05.416161849 +0200
@@ -0,0 +1 @@
+.so man8/rtacct.8
\ No newline at end of file


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- iproute.spec	25 Jul 2009 03:31:50 -0000	1.97
+++ iproute.spec	24 Sep 2009 12:09:39 -0000	1.98
@@ -4,11 +4,12 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.29
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
+Patch0: man-pages.patch
 Patch1: iproute2-2.6.9-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute-ip-man.patch
@@ -42,6 +43,7 @@ The iproute documentation contains howto
 
 %prep
 %setup -q -n iproute2-%{version}
+%patch0 -p1
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
@@ -130,6 +132,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Thu Sep 24 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5
+- create missing man pages
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rrakus at fedoraproject.org  Thu Sep 24 12:16:42 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 24 Sep 2009 12:16:42 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-1.3.14-better_netboot.patch, 1.2,
	1.3 yaboot.spec, 1.67, 1.68
Message-ID: <20090924121642.8847C11C00DB@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22908

Modified Files:
	yaboot-1.3.14-better_netboot.patch yaboot.spec 
Log Message:
Increase TFTP buffer to 32MB

yaboot-1.3.14-better_netboot.patch:
 include/debug.h      |    4 
 include/file.h       |    8 +
 include/fs.h         |    8 -
 second/file.c        |  214 ++++++++++++++++++++++++++++++++++++++-------------
 second/fs.c          |    6 -
 second/fs_ext2.c     |    8 -
 second/fs_iso.c      |    6 -
 second/fs_of.c       |   60 +++++++++-----
 second/fs_reiserfs.c |   12 +-
 second/fs_xfs.c      |   18 ++--
 second/yaboot.c      |    4 
 11 files changed, 245 insertions(+), 103 deletions(-)

Index: yaboot-1.3.14-better_netboot.patch
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot-1.3.14-better_netboot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- yaboot-1.3.14-better_netboot.patch	6 Apr 2009 05:51:50 -0000	1.2
+++ yaboot-1.3.14-better_netboot.patch	24 Sep 2009 12:16:42 -0000	1.3
@@ -481,7 +481,7 @@ index 95c131d..5c7dd9b 100644
  
  #define LOAD_BUFFER_POS		0x1000000
 -#define LOAD_BUFFER_SIZE	0x1000000
-+#define LOAD_BUFFER_SIZE	0x1800000
++#define LOAD_BUFFER_SIZE	0x2000000
  
 -static int of_open(struct boot_file_t* file, const char* dev_name,
 -		   struct partition_t* part, const char* file_name);


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- yaboot.spec	9 Sep 2009 17:45:06 -0000	1.67
+++ yaboot.spec	24 Sep 2009 12:16:42 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-19
+- Increase TFTP buffer to 32MB
+
 * Wed Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-18
 - Do not require hfsutils on RHEL 6
 



From than at fedoraproject.org  Thu Sep 24 12:20:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 24 Sep 2009 12:20:06 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.294,1.295
Message-ID: <20090924122006.BD14511C0418@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23696

Modified Files:
	kdebase-workspace.spec 
Log Message:
rhel cleanup



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- kdebase-workspace.spec	23 Sep 2009 12:47:08 -0000	1.294
+++ kdebase-workspace.spec	24 Sep 2009 12:20:06 -0000	1.295
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -84,7 +84,9 @@ BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
+%if 0%{?fedora}
 BuildRequires: qedje-devel >= 0.4.0
+%endif
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
@@ -451,7 +453,9 @@ fi
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
+%if 0%{?fedora}
 %{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%endif
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
@@ -592,6 +596,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
 * Wed Sep 23 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-5
 - fix spontaneous Plasma crashes due to uninitialized vars
 



From jfch2222 at fedoraproject.org  Thu Sep 24 12:34:16 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 24 Sep 2009 12:34:16 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.167,1.168 sshd.init,1.2,1.3
Message-ID: <20090924123416.80EF811C00DB@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26751

Modified Files:
	openssh.spec sshd.init 
Log Message:
Repair initscript to be acord to guidelines



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- openssh.spec	16 Sep 2009 08:12:30 -0000	1.167
+++ openssh.spec	24 Sep 2009 12:34:15 -0000	1.168
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 26%{?dist}%{?rescue_rel}
+Release: 27%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,10 @@ fi
 %endif
 
 %changelog
+* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-27
+- Repair initscript to be acord to guidelines (#521860)
+- Add bugzilla# to application of edns and xmodifiers patch
+
 * Wed Sep 16 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-26
 - Changed pam stack to password-auth
 
@@ -499,7 +503,7 @@ fi
 - rebuilt with new openssl
 
 * Thu Jul 30 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-17
-- Added dnssec support.
+- Added dnssec support. (#205842)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2p1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -528,7 +532,7 @@ fi
 - repair broken ls in chroot %%h
 
 * Fri Jun 12 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-8
-- add XMODIFIERS to exported environment
+- add XMODIFIERS to exported environment (#495690)
 
 * Fri May 15 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-6
 - allow only protocol 2 in the FIPS mode


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sshd.init	12 Feb 2009 18:19:52 -0000	1.2
+++ sshd.init	24 Sep 2009 12:34:16 -0000	1.3
@@ -174,7 +174,7 @@ force_reload() {
 }
 
 rh_status() {
-	status -p $PID_FILE openssh-daemon
+	status -p $PID_FILE $prog	#openssh-daemon
 }
 
 rh_status_q() {
@@ -200,7 +200,12 @@ case "$1" in
 	force-reload)
 		force_reload
 		;;
-	condrestart|try-restart)
+	condrestart)
+		if [ -f /var/lock/subsys/$prog ]; then
+		    	restart
+		fi
+		;;
+	try-restart)
 		rh_status_q || exit 0
 		if [ -f $lockfile ] ; then
 			do_restart_sanity_check



From mlichvar at fedoraproject.org  Thu Sep 24 12:40:57 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 24 Sep 2009 12:40:57 +0000 (UTC)
Subject: rpms/pinfo/devel pinfo.spec,1.37,1.38
Message-ID: <20090924124057.790AE11C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/pinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28561

Modified Files:
	pinfo.spec 
Log Message:
- suppress install-info errors (#515995)
- mark config as noreplace



Index: pinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- pinfo.spec	26 Jul 2009 18:48:34 -0000	1.37
+++ pinfo.spec	24 Sep 2009 12:40:57 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: An info file viewer
 Name: pinfo
 Version: 0.6.9
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Base
 License: GPLv2
 URL: http://pinfo.alioth.debian.org
@@ -52,8 +52,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog* NEWS README TECHSTUFF
-# Purposefully not flagged noreplace to ensure new versions have working config
-%config %{_sysconfdir}/pinforc
+%config(noreplace) %{_sysconfdir}/pinforc
 %{_bindir}/pinfo
 # %{_bindir}/pman
 %{_infodir}/pinfo.info*
@@ -61,12 +60,12 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # %{_mandir}/man1/pman.1*
 
 %post
-/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir &> /dev/null
 :
  
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir &> /dev/null
 fi
 :
 
@@ -74,6 +73,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 24 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.6.9-11
+- suppress install-info errors (#515995)
+- mark config as noreplace
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Thu Sep 24 12:52:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 24 Sep 2009 12:52:06 +0000 (UTC)
Subject: rpms/shared-mime-info/devel defaults.list, 1.28,
	1.29 shared-mime-info.spec, 1.80, 1.81
Message-ID: <20090924125206.3368A11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30589

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
Resolves: rhbz#508559 openoffice.org desktop files changed name


Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- defaults.list	4 Mar 2009 12:35:12 -0000	1.28
+++ defaults.list	24 Sep 2009 12:52:05 -0000	1.29
@@ -42,30 +42,30 @@ image/x-xbitmap=gnome-eog.desktop;gthumb
 image/x-xpixmap=gnome-eog.desktop;gthumb.desktop;
 image/x-xwindowdump=gnome-eog.desktop;gthumb.desktop;
 image/svg+xml=gnome-eog.desktop;gthumb.desktop;
-application/vnd.ms-word=openoffice.org-1.9-writer.desktop
-application/vnd.wordperfect=openoffice.org-1.9-writer.desktop
-application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop
-application/vnd.sun.xml.writer.global=openoffice.org-1.9-writer.desktop
-application/vnd.stardivision.writer=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-template=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-web=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-master=openoffice.org-1.9-writer.desktop
-application/vnd.ms-excel=openoffice.org-1.9-calc.desktop
-application/vnd.stardivision.calc=openoffice.org-1.9-calc.desktop
-application/vnd.sun.xml.calc=openoffice.org-1.9-calc.desktop
-application/vnd.sun.xml.calc.template=openoffice.org-1.9-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet=openoffice.org-1.9-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-1.9-calc.desktop
-application/vnd.ms-powerpoint=openoffice.org-1.9-impress.desktop
-application/vnd.stardivision.impress=openoffice.org-1.9-impress.desktop
-application/vnd.sun.xml.impress=openoffice.org-1.9-impress.desktop
-application/vnd.sun.xml.impress.template=openoffice.org-1.9-impress.desktop
-application/vnd.oasis.opendocument.presentation=openoffice.org-1.9-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=openoffice.org-1.9-impress.desktop
-application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop
-application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop
-application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop
+application/vnd.ms-word=openoffice.org-writer.desktop
+application/vnd.wordperfect=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=openoffice.org-writer.desktop
+application/vnd.stardivision.writer=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=openoffice.org-writer.desktop
+application/vnd.ms-excel=openoffice.org-calc.desktop
+application/vnd.stardivision.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
+application/vnd.ms-powerpoint=openoffice.org-impress.desktop
+application/vnd.stardivision.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.stardivision.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=openoffice.org-draw.desktop
 application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- shared-mime-info.spec	27 Jul 2009 04:15:51 -0000	1.80
+++ shared-mime-info.spec	24 Sep 2009 12:52:05 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.60
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 24 2009 - Caol?n McNamara <caolanm at redhat.com> - 0.60-5
+- Resolves: rhbz#508559 openoffice.org desktop files changed name
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Sep 24 13:11:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 13:11:25 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.35,
	1.36 epiphany-extensions.spec, 1.68, 1.69 sources, 1.35, 1.36
Message-ID: <20090924131125.41FCD11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2407

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	8 Sep 2009 18:54:50 -0000	1.35
+++ .cvsignore	24 Sep 2009 13:11:24 -0000	1.36
@@ -1 +1 @@
-epiphany-extensions-2.27.92.tar.bz2
+epiphany-extensions-2.28.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- epiphany-extensions.spec	8 Sep 2009 18:54:50 -0000	1.68
+++ epiphany-extensions.spec	24 Sep 2009 13:11:25 -0000	1.69
@@ -1,9 +1,9 @@
-%global ephy_major          2.27
-%global ephy_api_version    2.27
-%global ephy_min_version    %{ephy_major}.4
+%global ephy_major          2.28
+%global ephy_api_version    2.28
+%global ephy_min_version    %{ephy_major}.0
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.92
+Version:        %{ephy_major}.0
 Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
@@ -92,6 +92,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 08 2009 Peter Gordon <peter at thecodergeek.com> - 2.27.92-1
 - Update to new upstream release (2.27.92): Re-enables adblock functionality. (Yay!)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	8 Sep 2009 18:54:50 -0000	1.35
+++ sources	24 Sep 2009 13:11:25 -0000	1.36
@@ -1 +1 @@
-72ae15405b6a96de3f05426bb27e69d5  epiphany-extensions-2.27.92.tar.bz2
+7fca4c4d487e3a43ef5adb2a764b9aaf  epiphany-extensions-2.28.0.tar.bz2



From jima at fedoraproject.org  Thu Sep 24 13:19:35 2009
From: jima at fedoraproject.org (Patrick Laughton)
Date: Thu, 24 Sep 2009 13:19:35 +0000 (UTC)
Subject: rpms/ngrep/F-11 ngrep.spec,1.10,1.11
Message-ID: <20090924131935.D8FB111C00DB@cvs1.fedora.phx.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/ngrep/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5064

Modified Files:
	ngrep.spec 
Log Message:
bump-n-build for new libpcap in F-11


Index: ngrep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngrep/F-11/ngrep.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ngrep.spec	26 Feb 2009 05:39:03 -0000	1.10
+++ ngrep.spec	24 Sep 2009 13:19:35 -0000	1.11
@@ -5,7 +5,7 @@ Name:				ngrep
 Summary:			Network layer grep tool
 
 Version:			1.45
-Release:			5%{?dist}
+Release:			6%{?dist}
 
 Group:				Applications/Internet
 License:			BSD with advertising
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Thu Sep 24 2009 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.45-6
+- Bump-n-build for new libpcap
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:12 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132212.BF08F10F87C@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:14 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132214.B1F3410F889@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:18 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132218.A7CD110F898@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:23 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132224.0116510F89B@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:34 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132234.E097510F87C@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:36 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132236.E784410F889@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:40 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132241.6139510F89D@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pbrobinson at fedoraproject.org  Thu Sep 24 13:22:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 24 Sep 2009 13:22:41 +0000 (UTC)
Subject: rpms/hornsey/devel .cvsignore, 1.3, 1.4 hornsey.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090924132241.1F99A11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hornsey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5604

Modified Files:
	.cvsignore hornsey.spec sources 
Log Message:
- New upstream 0.5 release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Sep 2009 14:24:51 -0000	1.3
+++ .cvsignore	24 Sep 2009 13:22:40 -0000	1.4
@@ -1 +1 @@
-hornsey-0.4.tar.bz2
+hornsey-0.5.tar.bz2


Index: hornsey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/hornsey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hornsey.spec	19 Sep 2009 14:24:51 -0000	1.2
+++ hornsey.spec	24 Sep 2009 13:22:40 -0000	1.3
@@ -1,14 +1,12 @@
 Name:           hornsey
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        The moblin media player
 
 Group:          Applications/Multimedia
 License:        LGPLv2
 URL:            http://www.moblin.org/
-# Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-# git archive --format=tar --prefix=hornsey-0.4/ ee968e8 | bzip2 > hornsey-0.4.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bickley-devel
@@ -82,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/dbus-1/services/org.moblin.Hornsey.service
 
 %changelog
+* Thu Sep 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.5-1
+- New upstream 0.5 release.
+
 * Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
 - New upstream 0.4 release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hornsey/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Sep 2009 14:24:51 -0000	1.3
+++ sources	24 Sep 2009 13:22:40 -0000	1.4
@@ -1 +1 @@
-ee677e4b8b421ed6093c66229630d4f7  hornsey-0.4.tar.bz2
+3f9ff267c0fb7a06e2be10f6a2d21274  hornsey-0.5.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:44 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132244.0A69610F8A0@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:52 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132253.CC37710F898@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 3)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:54 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132254.5954A10F8A1@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 3)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:56 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132256.DE2B710F8A8@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 3)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:22:56 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132256.60D7610F8A4@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 3)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:23 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132323.56A9E10F89E@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:23 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132324.747C710F8AD@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:32 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132332.802BC10F8A1@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:34 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132334.4CA5310F8B1@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:40 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132341.954D310F8B3@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:41 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132341.BC2F310F8B5@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:43 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132343.4038610F8A8@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:23:45 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132345.D070C10F87C@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From jzeleny at fedoraproject.org  Thu Sep 24 13:23:53 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu, 24 Sep 2009 13:23:53 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.4.18-ldif-buf-overflow.patch, 1.1,
	1.2 openldap.spec, 1.150, 1.151
Message-ID: <20090924132353.9AF8111C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5855

Modified Files:
	openldap-2.4.18-ldif-buf-overflow.patch openldap.spec 
Log Message:
Cleanup of previous patch

openldap-2.4.18-ldif-buf-overflow.patch:
 ldif.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Index: openldap-2.4.18-ldif-buf-overflow.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap-2.4.18-ldif-buf-overflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openldap-2.4.18-ldif-buf-overflow.patch	24 Sep 2009 11:30:24 -0000	1.1
+++ openldap-2.4.18-ldif-buf-overflow.patch	24 Sep 2009 13:23:53 -0000	1.2
@@ -1,26 +1,54 @@
 --- openldap-2.4.18/servers/slapd/back-ldif/ldif.c.orig	2009-09-24 09:46:01.000000000 +0200
-+++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 12:41:09.000000000 +0200
-@@ -593,9 +593,12 @@ typedef struct bvlist {
++++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 13:40:07.000000000 +0200
+@@ -593,9 +593,7 @@ typedef struct bvlist {
  	char *trunc;	/* filename was truncated here */
  	int  inum;		/* num from "attr={num}" in filename, or INT_MIN */
  	char savech;	/* original char at *trunc */
 -	char fname;		/* variable length array BVL_NAME(bvl) = &fname */
 -#	define BVL_NAME(bvl) ((char *) (bvl) + offsetof(bvlist, fname))
 -#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen))
-+	char *fname;		/* variable length array BVL_NAME(bvl) = &fname */
-+	//char fname;		/* variable length array BVL_NAME(bvl) = &fname */
-+#	define BVL_NAME(bvl) ((bvl)->fname)
-+#	define BVL_SIZE(namelen) (sizeof(bvlist))
-+//#	define BVL_NAME(bvl) ((char *) (bvl) + offsetof(bvlist, fname))
-+//#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen))
++	char *fname;		/* variable length array */
  } bvlist;
  
  static int
-@@ -710,6 +713,7 @@ ldif_readdir(
+@@ -709,17 +707,18 @@ ldif_readdir(
+ 			if ( *fname_maxlenp < fname_len )
  				*fname_maxlenp = fname_len;
  
- 			bvl = SLAP_MALLOC( BVL_SIZE( fname_len ) );
+-			bvl = SLAP_MALLOC( BVL_SIZE( fname_len ) );
++			bvl = SLAP_MALLOC( sizeof( bvlist ) );
 +			bvl->fname = SLAP_MALLOC( fname_len+1 );
  			if ( bvl == NULL ) {
  				rc = LDAP_OTHER;
  				save_errno = errno;
+ 				break;
+ 			}
+-			strcpy( BVL_NAME( bvl ), dir->d_name );
++			strcpy( bvl->fname, dir->d_name );
+ 
+ 			/* Make it sortable by ("attr=val" or <preceding {num}, num>) */
+-			trunc = BVL_NAME( bvl ) + fname_len - STRLENOF( LDIF );
+-			if ( (idxp = strchr( BVL_NAME( bvl ) + 2, IX_FSL )) != NULL &&
++			trunc = bvl->fname + fname_len - STRLENOF( LDIF );
++			if ( (idxp = strchr( bvl->fname + 2, IX_FSL )) != NULL &&
+ 				 (endp = strchr( ++idxp, IX_FSR )) != NULL && endp > idxp &&
+ 				 (eq_unsafe || idxp[-2] == '=' || endp + 1 == trunc) )
+ 			{
+@@ -737,7 +736,7 @@ ldif_readdir(
+ 			*trunc = '\0';
+ 
+ 			for ( prev = listp; (ptr = *prev) != NULL; prev = &ptr->next ) {
+-				int cmp = strcmp( BVL_NAME( bvl ), BVL_NAME( ptr ));
++				int cmp = strcmp( bvl->fname, ptr->fname );
+ 				if ( cmp < 0 || (cmp == 0 && bvl->inum < ptr->inum) )
+ 					break;
+ 			}
+@@ -826,7 +825,7 @@ ldif_search_entry(
+ 
+ 				if ( rc == LDAP_SUCCESS ) {
+ 					*ptr->trunc = ptr->savech;
+-					FILL_PATH( &fpath, dir_end, BVL_NAME( ptr ));
++					FILL_PATH( &fpath, dir_end, ptr->fname );
+ 
+ 					rc = ldif_read_entry( op, fpath.bv_val, &dn, &ndn,
+ 						&e, text );


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- openldap.spec	24 Sep 2009 11:30:24 -0000	1.150
+++ openldap.spec	24 Sep 2009 13:23:53 -0000	1.151
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -639,6 +639,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Sep 24 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-3
+- cleanup of previous patch fixing buffer overflow
+
 * Tue Sep 22 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-2
 - changed configuration approach. Instead od slapd.conf slapd
   is using slapd.d directory now



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:44 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132444.7A1DA10F890@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:45 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132445.EAEA110F89A@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:46 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132446.226AE10F89D@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:52 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132452.EA63B10F884@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:47 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132448.05B8810F8A1@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:55 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132454.EF80E10F8A4@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:55 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132455.65C9610F8A8@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:24:56 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132457.9D9BC10F8A9@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:03 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132503.4553910F8AA@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:02 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132503.56AD910F8AD@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:05 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132505.515F710F8B0@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:07 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132507.8CA9410F8B3@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:12 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132512.97DF210F898@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:14 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132514.941C510F8B8@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:11 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132512.C0EBE10F8B5@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:15 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132516.4A7CF10F8BA@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:21 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchbugzilla
Message-ID: <20090924132521.43E0310F8BC@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchbugzilla acl on perl-Curses (Fedora 4)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:20 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested watchcommits
Message-ID: <20090924132521.A36E510F8BE@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the watchcommits acl on perl-Curses (Fedora 4)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:22 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested commit
Message-ID: <20090924132523.07D3310F8C0@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the commit acl on perl-Curses (Fedora 4)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Thu Sep 24 13:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 13:25:24 +0000
Subject: [pkgdb] perl-Curses: stevetraylen has requested approveacls
Message-ID: <20090924132524.885D910F8C3@bastion2.fedora.phx.redhat.com>

stevetraylen has requested the approveacls acl on perl-Curses (Fedora 4)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/perl-Curses



From rdieter at fedoraproject.org  Thu Sep 24 13:33:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 13:33:41 +0000 (UTC)
Subject: rpms/koffice/devel sources,1.33,1.34 .cvsignore,1.33,1.34
Message-ID: <20090924133341.5CA4611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8041

Modified Files:
	sources .cvsignore 
Log Message:
drop unused 2.0.81 sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	11 Sep 2009 15:57:23 -0000	1.33
+++ sources	24 Sep 2009 13:33:41 -0000	1.34
@@ -1,2 +1 @@
-d880b2d479c465d3d2cde7146007afbd  koffice-2.0.81.tar.bz2
 25080954dd83b0d7d480b66bd89d1374  koffice-2.0.82.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	11 Sep 2009 15:57:23 -0000	1.33
+++ .cvsignore	24 Sep 2009 13:33:41 -0000	1.34
@@ -1,2 +1 @@
-koffice-2.0.81.tar.bz2
 koffice-2.0.82.tar.bz2



From than at fedoraproject.org  Thu Sep 24 13:35:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 24 Sep 2009 13:35:02 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.237,1.238
Message-ID: <20090924133502.B0D9811C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8348

Modified Files:
	kdepim.spec 
Log Message:
rhel cleanup



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- kdepim.spec	23 Sep 2009 17:25:52 -0000	1.237
+++ kdepim.spec	24 Sep 2009 13:35:02 -0000	1.238
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -61,12 +61,13 @@ BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
 
+%if 0%{?fedora}
 ##Optional bits
 Requires(hint): pinentry-gui
 Requires(hint): spambayes
 #Requires(hint): spamassassin
 #%{?fedora:Requires(hint): bogofilter}
-
+%endif
 
 %description
 %{summary}, including:
@@ -221,6 +222,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
 - respin ldap crasher patch (kdebug:206024, rhbz#524870)
 



From cebbert at fedoraproject.org  Thu Sep 24 13:46:39 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 13:46:39 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.291, 1.292 kernel.spec, 1.1737, 
	1.1738
Message-ID: <20090924134639.862B111C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11121

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable sound powersave by default; it still pops when playing sounds. (#523836)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- config-generic	1 Sep 2009 04:18:44 -0000	1.291
+++ config-generic	24 Sep 2009 13:46:38 -0000	1.292
@@ -2536,7 +2536,7 @@ CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 
 CONFIG_SND_DRIVERS=y
 
@@ -2595,7 +2595,7 @@ CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1737
retrieving revision 1.1738
diff -u -p -r1.1737 -r1.1738
--- kernel.spec	16 Sep 2009 15:38:06 -0000	1.1737
+++ kernel.spec	24 Sep 2009 13:46:38 -0000	1.1738
@@ -1971,6 +1971,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-59
+- Disable sound powersave by default; it still pops when playing sounds. (#523836)
+
 * Wed Sep 16 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.30.7-58
 - Revert virtio_blk to rotational mode. (#509383)
 



From crobinso at fedoraproject.org  Thu Sep 24 13:55:17 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu, 24 Sep 2009 13:55:17 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.500.0-change-path-perms.patch,
	NONE, 1.1 virtinst-0.500.0-no-iso-driver.patch, NONE,
	1.1 virtinst-0.500.0-nonroot-qemu-net.patch, NONE,
	1.1 python-virtinst.spec, 1.72, 1.73
Message-ID: <20090924135517.A764811C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12769

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.0-change-path-perms.patch 
	virtinst-0.500.0-no-iso-driver.patch 
	virtinst-0.500.0-nonroot-qemu-net.patch 
Log Message:
Don't use usermode net for non-root qemu:///system via virt-install
Fix cdrom installs where the iso is a storage volume (bz 524109)
Fix path permissions for kernel/initrd download location (bz 523960)


virtinst-0.500.0-change-path-perms.patch:
 Installer.py   |   20 +++++++---
 VirtualDisk.py |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 120 insertions(+), 8 deletions(-)

--- NEW FILE virtinst-0.500.0-change-path-perms.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253738317 14400
# Node ID 53cd275974ab35a790b4c4bf1424d0950d5b095e
# Parent  aff98f0152935ad7cd57e86c4172a6683e6306c5
VirtualDisk: Add methods for checking/changing path perms for username.

Since libvirtd can now run qemu processes as non-root, the tools need to
try to check directory permissions and make sure they are at least searchable
by a specific username. This simply implements the functions to make that
happen.

diff -r aff98f015293 -r 53cd275974ab virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Mon Sep 21 15:52:04 2009 -0400
+++ b/virtinst/VirtualDisk.py	Wed Sep 23 16:38:37 2009 -0400
@@ -19,9 +19,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
-import os, statvfs
+import os, stat, pwd, statvfs
 import subprocess
 import logging
+import re
+
 import urlgrabber.progress as progress
 import libvirt
 
@@ -69,6 +71,46 @@
 
     return fmt
 
+def _name_uid(user):
+    """
+    Return UID for string username
+    """
+    pwdinfo = pwd.getpwnam(user)
+    return pwdinfo[2]
+
+def _is_dir_searchable(uid, username, path):
+    """
+    Check if passed directory is searchable by uid
+    """
+    try:
+        statinfo = os.stat(path)
+    except OSError:
+        return False
+
+    if uid == statinfo.st_uid:
+        flag = stat.S_IXUSR
+    elif uid == statinfo.st_gid:
+        flag = stat.S_IXGRP
+    else:
+        flag = stat.S_IXOTH
+
+    if bool(statinfo.st_mode & flag):
+        return True
+
+    # Check POSIX ACL (since that is what we use to 'fix' access)
+    cmd = ["getfacl", path]
+    proc = subprocess.Popen(cmd,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
+    out, err = proc.communicate()
+
+    if proc.returncode != 0:
+        logging.debug("Cmd '%s' failed: %s" % (cmd, err))
+        return False
+
+    return bool(re.search("user:%s:..x" % username, out))
+
+
 class VirtualDisk(VirtualDevice):
     """
     Builds a libvirt domain disk xml description
@@ -156,6 +198,63 @@
 
         return False
 
+    @staticmethod
+    def check_path_search_for_user(conn, path, username):
+        """
+        Check if the passed user has search permissions for all the
+        directories in the disk path.
+
+        @return: List of the directories the user cannot search, or empty list
+        @rtype : C{list}
+        """
+        if _util.is_uri_remote(conn.getURI()):
+            return []
+
+        uid = _name_uid(username)
+        fixlist = []
+
+        dirname, base = os.path.split(path)
+        while base:
+            if not _is_dir_searchable(uid, username, dirname):
+                fixlist.append(dirname)
+
+            dirname, base = os.path.split(dirname)
+
+        return fixlist
+
+    @staticmethod
+    def fix_path_search_for_user(conn, path, username):
+        """
+        Try to fix any permission problems found by check_path_search_for_user
+
+        @return: Return a dictionary of entries { broken path : error msg }
+        @rtype : C{dict}
+        """
+        fixlist = VirtualDisk.check_path_search_for_user(conn, path, username)
+        if not fixlist:
+            return []
+
+        fixlist.reverse()
+        errdict = {}
+
+        for dirname in fixlist:
+            try:
+                cmd = ["setfacl", "--modify", "user:%s:x" % username, dirname]
+                proc = subprocess.Popen(cmd,
+                                        stdout=subprocess.PIPE,
+                                        stderr=subprocess.PIPE)
+                out, err = proc.communicate()
+
+                logging.debug("Cmd '%s' output: \nout=%s, \nerr=%s" %
+                              (cmd, out, err))
+                if proc.returncode != 0:
+                    raise ValueError(err)
+            except Exception, e:
+                errdict[dirname] =  str(e)
+
+        return errdict
+
+
     def __init__(self, path=None, size=None, transient=False, type=None,
                  device=DEVICE_DISK, driverName=None, driverType=None,
                  readOnly=False, sparse=True, conn=None, volObject=None,
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253741935 14400
# Node ID a523260ac56eb90e1eda067c2bbd5fc726bb0165
# Parent  53cd275974ab35a790b4c4bf1424d0950d5b095e
VirtualDisk: Teach perms changing functions about a target directory.

diff -r 53cd275974ab -r a523260ac56e virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Wed Sep 23 16:38:37 2009 -0400
+++ b/virtinst/VirtualDisk.py	Wed Sep 23 17:38:55 2009 -0400
@@ -213,7 +213,12 @@
         uid = _name_uid(username)
         fixlist = []
 
-        dirname, base = os.path.split(path)
+        if os.path.isdir(path):
+            dirname = path
+            base = "-"
+        else:
+            dirname, base = os.path.split(path)
+
         while base:
             if not _is_dir_searchable(uid, username, dirname):
                 fixlist.append(dirname)
diff -r 53cd275974ab virtinst/Installer.py
--- a/virtinst/Installer.py	Wed Sep 23 16:38:37 2009 -0400
+++ b/virtinst/Installer.py	Wed Sep 23 17:32:14 2009 -0400
@@ -141,12 +141,20 @@
                 return XEN_SCRATCH
             if os.path.exists(LIBVIRT_SCRATCH):
                 return LIBVIRT_SCRATCH
-        else:
-            scratch = os.path.expanduser("~/.virtinst/boot")
-            if not os.path.exists(scratch):
-                os.makedirs(scratch, 0750)
-            _util.selinux_restorecon(scratch)
-            return scratch
+
+        scratch = os.path.expanduser("~/.virtinst/boot")
+        if not os.path.exists(scratch):
+            os.makedirs(scratch, 0751)
+
+        if (self.conn and
+            not _util.is_uri_remote(self.conn.getURI()) and
+            _util.is_qemu_system(self.conn.getURI())):
+            # If we are using local qemu:///system, try to make sure the
+            # download location is searchable by the 'qemu' user
+            VirtualDisk.fix_path_search_for_user(self.conn, scratch, "qemu")
+
+        _util.selinux_restorecon(scratch)
+        return scratch
     scratchdir = property(get_scratchdir)
 
     def get_cdrom(self):

virtinst-0.500.0-no-iso-driver.patch:
 b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml |   36 ++++++++++++++++++++++++
 tests/testdriver.xml                         |   16 ++++++++++
 tests/xmlconfig.py                           |    6 ++++
 virtinst/VirtualDisk.py                      |   40 ++++++++++++++++-----------
 4 files changed, 82 insertions(+), 16 deletions(-)

--- NEW FILE virtinst-0.500.0-no-iso-driver.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253562724 14400
# Node ID aff98f0152935ad7cd57e86c4172a6683e6306c5
# Parent  143b09da8bccc3b6b2069c29073ea5a6ef9ce69b
VirtualDisk: Don't use 'iso' as a qemu driver name (bz 524109)

diff -r 143b09da8bcc -r aff98f015293 tests/testdriver.xml
--- a/tests/testdriver.xml	Mon Sep 21 15:47:33 2009 -0400
+++ b/tests/testdriver.xml	Mon Sep 21 15:52:04 2009 -0400
@@ -67,6 +67,22 @@
     </target>
   </volume>
   <volume>
+    <name>iso-vol</name>
+    <capacity>1000000</capacity>
+    <allocation>50000</allocation>
+    <target>
+      <format type='iso'/>
+    </target>
+  </volume>
+  <volume>
+    <name>bochs-vol</name>
+    <capacity>1000000</capacity>
+    <allocation>50000</allocation>
+    <target>
+      <format type='bochs'/>
+    </target>
+  </volume>
+  <volume>
     <name>testvol1.img</name>
     <capacity>1000000</capacity>
     <allocation>50000</allocation>
diff -r 143b09da8bcc -r aff98f015293 tests/xmlconfig-xml/misc-qemu-iso-disk.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml	Mon Sep 21 15:52:04 2009 -0400
@@ -0,0 +1,36 @@
+<domain type='xen'>
+  <name>TestGuest</name>
+  <currentMemory>204800</currentMemory>
+  <memory>409600</memory>
+  <uuid>12345678-1234-1234-1234-123456789012</uuid>
+  <os>
+    <type arch='i686'>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='cdrom'/>
+  </os>
+  <features>
+    <acpi/><apic/>
+  </features>
+  <clock offset="utc"/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <vcpu>5</vcpu>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/default-pool/iso-vol'/>
+      <target dev='hda' bus='ide'/>
+    </disk>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu'/>
+      <source dev='/dev/loop0'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+    </disk>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='sdl' display=':3.4' xauth='/testdir/.Xauthority'/>
+    <console type='pty'/>
+  </devices>
+</domain>
diff -r 143b09da8bcc -r aff98f015293 tests/xmlconfig.py
--- a/tests/xmlconfig.py	Mon Sep 21 15:47:33 2009 -0400
+++ b/tests/xmlconfig.py	Mon Sep 21 15:52:04 2009 -0400
@@ -302,9 +302,15 @@
             g.disks.append(get_blkdisk())
             self._compare(g, "misc-qemu-driver-name", True)
 
+            VirtualDisk._get_uri = new_get_uri
             g = get_basic_fullyvirt_guest()
             g.disks.append(get_filedisk())
             self._compare(g, "misc-qemu-driver-type", True)
+
+            VirtualDisk._get_uri = new_get_uri
+            g = get_basic_fullyvirt_guest()
+            g.disks.append(get_filedisk("/default-pool/iso-vol"))
+            self._compare(g, "misc-qemu-iso-disk", True)
         finally:
             VirtualDisk._get_uri = oldgetdriver
 
diff -r 143b09da8bcc -r aff98f015293 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Mon Sep 21 15:47:33 2009 -0400
+++ b/virtinst/VirtualDisk.py	Mon Sep 21 15:52:04 2009 -0400
@@ -55,6 +55,20 @@
     except OSError:
         return False
 
+def _qemu_sanitize_drvtype(phystype, fmt):
+    """
+    Sanitize libvirt storage volume format to a valid qemu driver type
+    """
+    raw_list = [ "iso" ]
+
+    if phystype == VirtualDisk.TYPE_BLOCK:
+        return VirtualDisk.DRIVER_QEMU_RAW
+
+    if fmt in raw_list:
+        return VirtualDisk.DRIVER_QEMU_RAW
+
+    return fmt
+
 class VirtualDisk(VirtualDevice):
     """
     Builds a libvirt domain disk xml description
@@ -490,8 +504,8 @@
 
         http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
         """
-        drvname = None
-        drvtype = None
+        drvname = self._driverName
+        drvtype = self._driverType
 
         if self.conn:
             driver = _util.get_uri_driver(self._get_uri())
@@ -499,15 +513,15 @@
                 drvname = self.DRIVER_QEMU
 
         if self.vol_object:
-            drvtype = _util.get_xml_path(self.vol_object.XMLDesc(0),
-                                         "/volume/target/format/@type")
+            fmt = _util.get_xml_path(self.vol_object.XMLDesc(0),
+                                     "/volume/target/format/@type")
+            if drvname == self.DRIVER_QEMU:
+                drvtype = _qemu_sanitize_drvtype(self.type, fmt)
 
         elif self.vol_install:
             if drvname == self.DRIVER_QEMU:
-                if self.vol_install.file_type == libvirt.VIR_STORAGE_VOL_FILE:
-                    drvtype = self.vol_install.format
-                else:
-                    drvtype = self.DRIVER_QEMU_RAW
+                drvtype = _qemu_sanitize_drvtype(self.type,
+                                                 self.vol_install.format)
 
         elif self.__creating_storage():
             if drvname == self.DRIVER_QEMU:
@@ -729,8 +743,10 @@
         managed_storage = self.__storage_specified()
         create_media = self.__creating_storage()
 
+        self.__set_dev_type()
         self.__set_size()
         self.__set_format()
+        self.__set_driver()
 
         if not self.selinux_label:
             # If we are using existing storage, pull the label from it
@@ -745,9 +761,6 @@
 
             self._selinux_label = context or ""
 
-        # Set driverName + driverType
-        self.__set_driver()
-
         # If not creating the storage, our job is easy
         if not create_media:
             # Make sure we have access to the local path
@@ -757,7 +770,6 @@
                     raise ValueError(_("The path '%s' must be a file or a "
                                        "device, not a directory") % self.path)
 
-            self.__set_dev_type()
             return True
 
 
@@ -770,7 +782,6 @@
             if self.type is self.TYPE_BLOCK:
                 raise ValueError, _("Local block device path '%s' must "
                                     "exist.") % self.path
-            self.set_type(self.TYPE_FILE, validate=False)
 
             # Path doesn't exist: make sure we have write access to dir
             if not os.access(os.path.dirname(self.path), os.R_OK):
@@ -782,9 +793,6 @@
             if not os.access(os.path.dirname(self.path), os.W_OK):
                 raise ValueError, _("No write access to directory '%s'") % \
                                     os.path.dirname(self.path)
-        else:
-            # Set dev type from existing storage
-            self.__set_dev_type()
 
         # Applicable for managed or local storage
         ret = self.is_size_conflict()

virtinst-0.500.0-nonroot-qemu-net.patch:
 User.py     |    4 ++++
 __init__.py |    2 +-
 _util.py    |   10 ++++++++++
 cli.py      |    4 ++--
 util.py     |    4 ++--
 5 files changed, 19 insertions(+), 5 deletions(-)

--- NEW FILE virtinst-0.500.0-nonroot-qemu-net.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253130900 14400
# Node ID 761714f08589587d6d24d4564664561d660becd6
# Parent  be36b376adad1d7a57eff536aacae769c432f4c0
Use virtual networking (not user) if we are non-root on qemu:///system.

Since virt-install can use policykit now, we can be non-root and still use
qemu:///system.

diff -r be36b376adad -r 761714f08589 virtinst/User.py
--- a/virtinst/User.py	Wed Sep 16 15:51:31 2009 -0400
+++ b/virtinst/User.py	Wed Sep 16 15:55:00 2009 -0400
@@ -19,6 +19,7 @@
 
 import platform
 import os
+import _util
 
 class User(object):
     """Defines a particular user account."""
@@ -50,6 +51,9 @@
         if priv == self.PRIV_QEMU_SYSTEM:
             return self._euid == 0
 
+        if priv == self.PRIV_CREATE_NETWORK:
+            return (self._euid == 0) or _util.is_qemu_system(conn)
+
         if platform.system() != 'SunOS':
             is_xen = not conn or conn.lower()[0:3] == 'xen'
             if priv in [ self.PRIV_CLONE, self.PRIV_CREATE_DOMAIN ]:
diff -r be36b376adad -r 761714f08589 virtinst/__init__.py
--- a/virtinst/__init__.py	Wed Sep 16 15:51:31 2009 -0400
+++ b/virtinst/__init__.py	Wed Sep 16 15:55:00 2009 -0400
@@ -24,7 +24,6 @@
 def _virtinst(msg):
     return gettext.dgettext(gettext_app, msg)
 
-import util
 import Storage
 from Guest import Guest, XenGuest
 from VirtualDevice import VirtualDevice
@@ -47,6 +46,7 @@
 from ImageManager import ImageInstaller
 from CloneManager import CloneDesign
 from User import User
+import util
 
 # This represents the PUBLIC API. Any changes to these classes (or 'util.py')
 # must be mindful of this fact.
diff -r be36b376adad -r 761714f08589 virtinst/_util.py
--- a/virtinst/_util.py	Wed Sep 16 15:51:31 2009 -0400
+++ b/virtinst/_util.py	Wed Sep 16 15:55:00 2009 -0400
@@ -374,6 +374,16 @@
 
     return None
 
+def is_qemu_system(conn):
+    if not conn:
+        return False
+
+    (scheme, ignore, ignore,
+     path, ignore, ignore) = uri_split(conn)
+    if path == "/system" and scheme.startswith("qemu"):
+        return True
+    return False
+
 #
 # These functions accidentally ended up in the API under virtinst.util
 #
diff -r be36b376adad -r 761714f08589 virtinst/cli.py
--- a/virtinst/cli.py	Wed Sep 16 15:51:31 2009 -0400
+++ b/virtinst/cli.py	Wed Sep 16 15:55:00 2009 -0400
@@ -638,7 +638,7 @@
             net = _util.default_network(conn)
             networks.append(net[0] + ":" + net[1])
         else:
-            networks.append("user")
+            networks.append(VirtualNetworkInterface.TYPE_USER)
 
     # ensure we have less macs then networks, otherwise autofill the mac list
     if len(macs) > len(networks):
@@ -654,7 +654,7 @@
                 net = _util.default_network(conn)
                 networks.append(net[0] + ":" + net[1])
             else:
-                networks.append("user")
+                networks.append(VirtualNetworkInterface.TYPE_USER)
             macs.append(None)
 
     net_init_dicts = []
diff -r be36b376adad -r 761714f08589 virtinst/util.py
--- a/virtinst/util.py	Wed Sep 16 15:51:31 2009 -0400
+++ b/virtinst/util.py	Wed Sep 16 15:55:00 2009 -0400
@@ -40,7 +40,7 @@
 from virtinst import _virtinst as _
 import virtinst
 import CapabilitiesParser
-from User import User
+import User
 
 KEYBOARD_DIR = "/etc/sysconfig/keyboard"
 XORG_CONF = "/etc/X11/xorg.conf"
@@ -107,7 +107,7 @@
         os.path.exists("/usr/bin/qemu-kvm") or \
         os.path.exists("/usr/bin/kvm") or \
         os.path.exists("/usr/bin/xenner"):
-        if User.current().has_priv(User.PRIV_QEMU_SYSTEM):
+        if User.User.current().has_priv(User.User.PRIV_QEMU_SYSTEM):
             return "qemu:///system"
         else:
             return "qemu:///session"


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- python-virtinst.spec	16 Sep 2009 17:33:00 -0000	1.72
+++ python-virtinst.spec	24 Sep 2009 13:55:17 -0000	1.73
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.0
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 # Don't erroneously set limit for amount of virtio devices (bz 499654)
 Patch1: %{appname}-%{version}-virtio-dev-limit.patch
@@ -33,6 +33,12 @@ Patch5: /home/boston/crobinso/virtinst-0
 Patch6: /home/boston/crobinso/virtinst-0.500.0-disk-format.patch
 # Add Fedora12 to os dictionary
 Patch7: /home/boston/crobinso/virtinst-0.500.0-f12-distro.patch
+# Don't use usermode net for non-root qemu:///system via virt-install
+Patch8: %{appname}-%{version}-nonroot-qemu-net.patch
+# Fix cdrom installs where the iso is a storage volume (bz 524109)
+Patch9: %{appname}-%{version}-no-iso-driver.patch
+# Fix path permissions for kernel/initrd download location (bz 523960)
+Patch10: %{appname}-%{version}-change-path-perms.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -67,6 +73,9 @@ and install new VMs) and virt-clone (clo
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 python setup.py build
@@ -102,6 +111,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Sep 24 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-4.fc12
+- Don't use usermode net for non-root qemu:///system via virt-install
+- Fix cdrom installs where the iso is a storage volume (bz 524109)
+- Fix path permissions for kernel/initrd download location (bz 523960)
+
 * Wed Sep 16 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-3.fc12
 - Don't generate bogus disk driver XML.
 - Add '--disk format=' for specifying format (qcow2, ...) when provisioning



From than at fedoraproject.org  Thu Sep 24 14:03:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 24 Sep 2009 14:03:02 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.92,1.93
Message-ID: <20090924140302.6E8FA11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14454

Modified Files:
	kde-settings.spec 
Log Message:
rhel cleanup



Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kde-settings.spec	23 Sep 2009 22:45:17 -0000	1.92
+++ kde-settings.spec	24 Sep 2009 14:03:00 -0000	1.93
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}
+Release: %{rel}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -85,6 +85,11 @@ ln -sf ../../../etc/kde/kdm %{buildroot}
 # own /var/run/kdm
 mkdir -p %{buildroot}%{_localstatedir}/run/kdm
 
+# rhel stuff
+%if 0%{?rhel}
+rm -f %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
+      %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -123,8 +128,10 @@ touch --no-create %{_datadir}/kde-settin
 %config(noreplace) %{_sysconfdir}/profile.d/kde.*
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
+%if 0%{?fedora}
 %{_sysconfdir}/kde/env/fedora-bookmarks.sh
 %{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+%endif
 %config(noreplace) /etc/pam.d/kcheckpass
 %config(noreplace) /etc/pam.d/kscreensaver
 # drop noreplace, so we can be sure to get the new kiosk bits
@@ -158,6 +165,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3-10.1
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-10
 - include /etc/profile.d/kde.(sh|csh) here, renable KDE_IS_PRELINKED
 



From pghmcfc at fedoraproject.org  Thu Sep 24 14:07:28 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 24 Sep 2009 14:07:28 +0000 (UTC)
Subject: rpms/pptp/devel pptp.spec,1.17,1.18
Message-ID: <20090924140728.194E411C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15531

Modified Files:
	pptp.spec 
Log Message:
Split pptpsetup into subpackage to avoid perl dependency (#524972)


Index: pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pptp/devel/pptp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pptp.spec	26 Jul 2009 19:21:32 -0000	1.17
+++ pptp.spec	24 Sep 2009 14:07:27 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		pptp
 Version:	1.7.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Point-to-Point Tunneling Protocol (PPTP) Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -20,6 +20,15 @@ Client for the proprietary Microsoft Poi
 Protocol, PPTP. Allows connection to a PPTP based VPN as used
 by employers and some cable and ADSL service providers.
 
+%package setup
+Summary:	PPTP Tunnel Configuration Script
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+
+%description setup
+This package provides a simple configuration script for setting up PPTP
+tunnels.
+
 %prep
 %setup -q
 
@@ -62,15 +71,21 @@ by employers and some cable and ADSL ser
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
 %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
 %{_sbindir}/pptp
-%{_sbindir}/pptpsetup
 %{_mandir}/man8/pptp.8*
-%{_mandir}/man8/pptpsetup.8*
 %dir %attr(750,root,root) %{_localstatedir}/run/pptp/
 # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the
 # Fedora ppp package hardcodes the directory name
 %config(noreplace) /etc/ppp/options.pptp
 
+%files setup
+%defattr(-,root,root,-)
+%{_sbindir}/pptpsetup
+%{_mandir}/man8/pptpsetup.8*
+
 %changelog
+* Thu Sep 24 2009 Paul Howarth <paul at city-fan.org> 1.7.2-8
+- Split pptpsetup into subpackage to avoid perl dependency (#524972)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jfch2222 at fedoraproject.org  Thu Sep 24 14:11:49 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 24 Sep 2009 14:11:49 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel saslauthd.init,1.7,1.8
Message-ID: <20090924141149.0A9AE11C00DB@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17501

Modified Files:
	saslauthd.init 
Log Message:
make the initscript according to the LSB



Index: saslauthd.init
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- saslauthd.init	24 Sep 2009 11:32:04 -0000	1.7
+++ saslauthd.init	24 Sep 2009 14:11:48 -0000	1.8
@@ -38,7 +38,7 @@ lockfile=/var/lock/subsys/$prog
 start() {
 	[ -x $path ] || exit 5
 	echo -n $"Starting $prog: "
-	daemon $path -m $SOCKETDIR -a $MECH $FLAGS
+	daemon $DAEMONOPTS $path -m $SOCKETDIR -a $MECH $FLAGS
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile
@@ -98,12 +98,7 @@ case "$1" in
   status)
 	rh_status
 	;;
-  condrestart)
-	if [ -f /var/lock/subsys/$prog ]; then
-	    restart
-	fi
-	;;
-  try-restart)
+  condrestart|try-restart)
 	rh_status_q || exit 0
 	restart
 	;;



From jjames at fedoraproject.org  Thu Sep 24 14:13:39 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 24 Sep 2009 14:13:39 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs-21.5.29-png.patch, NONE,
	1.1 xemacs-21.5.29-no-xft.patch, 1.2, 1.3 xemacs.spec, 1.50,
	1.51 xemacs-21.5.28-courier-default.patch, 1.3, NONE
Message-ID: <20090924141339.2D44A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18090/F-11

Modified Files:
	xemacs-21.5.29-no-xft.patch xemacs.spec 
Added Files:
	xemacs-21.5.29-png.patch 
Removed Files:
	xemacs-21.5.28-courier-default.patch 
Log Message:
* Wed S ep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
- Final fix for bz 512623, which is actually two bugs, because ...
- ... the courier font patch breaks TTY font detection.  Do not apply the
  patch for now until I understand what is going on
- Add macros.xemacs (bz 480546)
- Add png patch to fix a problem with reading PNG files


xemacs-21.5.29-png.patch:
 glyphs-eimage.c |   79 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

--- NEW FILE xemacs-21.5.29-png.patch ---
--- xemacs-21.5.29/src/glyphs-eimage.c	2009-09-23 12:58:39.770625034 -0600
+++ xemacs-21.5.29/src/glyphs-eimage.c	2009-09-23 13:06:23.662801742 -0600
@@ -954,7 +954,7 @@
   png_read_info (png_ptr, info_ptr);
 
   {
-    int y;
+    int y, padding;
     Binbyte **row_pointers;
     UINT_64_BIT pixels_sq;
     height = info_ptr->height;
@@ -963,14 +963,22 @@
     if (pixels_sq > ((size_t) -1) / 3)
       signal_image_error ("PNG image too large to instantiate", instantiator);
 
-    /* Wow, allocate all the memory.  Truly, exciting. */
-    unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3));
+    /* Wow, allocate all the memory.  Truly, exciting.
+       Well, yes, there's excitement to be had.  It turns out that libpng
+       strips in place, so the last row overruns the buffer if depth is 16
+       or there's an alpha channel.  This is a crash on Linux.  So we need
+       to add padding.
+       The worst case is reducing 8 bytes (16-bit RGBA) to 3 (8-bit RGB). */
+
+    padding = 5 * width;
+    unwind.eimage = xnew_array_and_zero (Binbyte,
+					 (size_t) (pixels_sq * 3 + padding));
+
     /* libpng expects that the image buffer passed in contains a
        picture to draw on top of if the png has any transparencies.
        This could be a good place to pass that in... */
 
     row_pointers  = xnew_array (png_byte *, height);
-
     for (y = 0; y < height; y++)
       row_pointers[y] = unwind.eimage + (width * 3 * y);
 
@@ -990,16 +998,15 @@
 	}
       else
 	{
-	  Lisp_Color_Instance *c;
-	  Lisp_Object rgblist;
-
-	  c = XCOLOR_INSTANCE (bkgd);
-	  rgblist = MAYBE_LISP_DEVMETH (XDEVICE (c->device),
-					color_instance_rgb_components,
-					(c));
-	  my_background.red = (unsigned short) XINT (XCAR (rgblist));
-	  my_background.green = (unsigned short) XINT (XCAR (XCDR (rgblist)));
-	  my_background.blue = (unsigned short) XINT (XCAR (XCDR (XCDR (rgblist))));
+	  Lisp_Color_Instance *c = XCOLOR_INSTANCE (bkgd);
+	  Lisp_Object rgb = MAYBE_LISP_DEVMETH (XDEVICE (c->device),
+						color_instance_rgb_components,
+						(c));
+#define GETCOLOR(col) my_background.col = (unsigned short) XINT (XCAR (rgb))
+	  GETCOLOR(red); rgb = XCDR (rgb);
+	  GETCOLOR(green); rgb = XCDR (rgb);
+	  GETCOLOR(blue);
+#undef GETCOLOR
 	}
 
       if (png_get_bKGD (png_ptr, info_ptr, &image_background))
@@ -1012,41 +1019,38 @@
 
     /* Now that we're using EImage, ask for 8bit RGB triples for any type
        of image*/
-    /* convert palette images to full RGB */
+    /* convert palette images to RGB */
     if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_set_expand (png_ptr);
-    /* send grayscale images to RGB too */
-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
-        info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_palette_to_rgb (png_ptr);
+    /* convert grayscale images to RGB */
+    else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+	     info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
       png_set_gray_to_rgb (png_ptr);
-    /* we can't handle alpha values */
-    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      png_set_strip_alpha (png_ptr);
-    /* tell libpng to strip 16 bit depth files down to 8 bits */
-    if (info_ptr->bit_depth == 16)
-      png_set_strip_16 (png_ptr);
-    /* if the image is < 8 bits, pad it out */
-    if (info_ptr->bit_depth < 8)
+    /* pad images with depth < 8 bits */
+    else if (info_ptr->bit_depth < 8)
       {
 	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
 	  png_set_expand (png_ptr);
 	else
 	  png_set_packing (png_ptr);
       }
+    /* strip 16-bit depth files down to 8 bits */
+    if (info_ptr->bit_depth == 16)
+      png_set_strip_16 (png_ptr);
+    /* strip alpha channel
+       #### shouldn't we handle this?
+       first call png_read_update_info in case above transformations
+       have generated an alpha channel */
+    png_read_update_info(png_ptr, info_ptr);
+    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      png_set_strip_alpha (png_ptr);
 
     png_read_image (png_ptr, row_pointers);
     png_read_end (png_ptr, info_ptr);
 
-#if 1 /* def PNG_SHOW_COMMENTS */
-    /* ####
-     * I turn this off by default now, because the !%^@#!% comments
-     * show up every time the image is instantiated, which can get
-     * really really annoying.  There should be some way to pass this
-     * type of data down into the glyph code, where you can get to it
-     * from lisp anyway. - WMP
-     */
-    /* #### I've turned this on, since these warnings are now
-       unobtrusive. */
+    /* #### There should be some way to pass this type of data down
+     * into the glyph code, where you can get to it from lisp
+     * anyway. - WMP */
     {
       int i;
       DECLARE_EISTRING (key);
@@ -1066,7 +1070,6 @@
 			  eidata(key), eidata(text));
 	}
     }
-#endif
 
     xfree (row_pointers, Binbyte **);
   }

xemacs-21.5.29-no-xft.patch:
 font.el |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Index: xemacs-21.5.29-no-xft.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs-21.5.29-no-xft.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-21.5.29-no-xft.patch	26 Aug 2009 20:57:27 -0000	1.2
+++ xemacs-21.5.29-no-xft.patch	24 Sep 2009 14:13:38 -0000	1.3
@@ -1,12 +1,12 @@
 diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el
---- xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:58.859385283 -0600
-+++ xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:20.000998807 -0600
+--- xemacs-21.5.29.ORIG/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
++++ xemacs-21.5.29/lisp/font.el	2009-09-23 15:13:48.543673471 -0600
 @@ -753,14 +753,23 @@
  
  (defvar font-xft-font-regexp
    (concat "\\`"
 -	  #r"\(\\-\|\\:\|\\,\|[^:-]\)*"	        ; optional foundry and family
-+	  #r"\(\\[-,]|[^-:,*]\)*"               ; optional foundry and family
++	  #r"\(\\-\|\\:\|\\,\|[^-:*]\)*"	; optional foundry and family
  						; (allows for escaped colons, 
 -						; dashes, commas)
 +						; dashes, commas, asterisks)
@@ -37,16 +37,3 @@ diff -dur xemacs-21.5.29.ORIG/lisp/font.
    (let* ((name fontname)
  	 (device (or device (default-x-device)))
  	 (pattern (fc-font-match device (fc-name-parse name)))
-diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el
---- xemacs-21.5.29/lisp/font-mgr.el	2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/font-mgr.el	2009-08-26 14:46:44.073953826 -0600
-@@ -39,7 +39,8 @@
- 
- ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'?
- 
--(provide 'font-mgr)
-+;; #### implementation is incomplete
-+;; (provide 'font-mgr)
- 
- (defvar xft-xlfd-font-regexp
-   (concat


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xemacs.spec	26 Aug 2009 20:57:27 -0000	1.50
+++ xemacs.spec	24 Sep 2009 14:13:39 -0000	1.51
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        3%{?snap:.%{snap}}%{?dist}
+Release:        4%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -47,7 +47,8 @@ Patch4:         %{name}-21.5.27-no-expdy
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
 # Proposed by upstream 2009-08-25
 Patch6:         %{name}-21.5.29-no-xft.patch
-Patch8:         %{name}-21.5.28-courier-default.patch
+# Applied upstream 2009-09-23
+Patch7:         %{name}-21.5.29-png.patch
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
@@ -99,6 +100,7 @@ Requires:       %{name}-common = %{versi
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
 Requires:       xorg-x11-fonts-misc
+Requires:       bitmap-fonts
 Requires(post): coreutils
 Provides:       xemacs(bin) = %{version}-%{release}
 
@@ -212,8 +214,10 @@ touch -r aclocal.m4 aclocal.m4-stamp
 touch -r aclocal.m4-stamp aclocal.m4
 %endif
 %patch5 -p1
+%if %{without xft}
 %patch6 -p1
-%patch8 -p1
+%endif
+%patch7 -p1
 %patch9 -p1
 %patch14 -p1
 
@@ -331,6 +335,19 @@ Cflags: -I${includedir}
 %endif
 EOF
 
+cat > macros.xemacs << EOF
+%%_xemacs_version %{version}
+%%_xemacs_ev %{?epoch:%{epoch}:}%{version}
+%%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
+%%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
+%%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp
+%%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -f batch-byte-compile
+%if %{with modules}
+%%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include
+%%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules
+%endif
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -389,6 +406,9 @@ install -Dpm 644 %{SOURCE3} $RPM_BUILD_R
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 
+# macro file
+install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs
+
 # make sure nothing is 0400
 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
 
@@ -503,6 +523,7 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
 %{_mandir}/man1/gnudoit.1*
+%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs
 
 %if %{with nox}
 %files nox
@@ -558,6 +579,13 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
+- Final fix for bz 512623, which is actually two bugs, because ...
+- ... the courier font patch breaks TTY font detection.  Removed that patch
+  and Require bitmap-fonts to supply the original font name.
+- Add macros.xemacs (bz 480546)
+- Add png patch to fix a problem with reading PNG files
+
 * Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
 - Use upstream's attempt at fixing #512623 instead of mine, which didn't work.
 


--- xemacs-21.5.28-courier-default.patch DELETED ---



From mclasen at fedoraproject.org  Thu Sep 24 14:13:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 14:13:33 +0000 (UTC)
Subject: rpms/nautilus/devel
	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch,
	NONE, 1.1 nautilus.spec, 1.289, 1.290
Message-ID: <20090924141333.270B611C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16419

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch 
Log Message:
avoid lingering menu items


nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch:
 nautilus-directory-async.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch ---
>From 88da398b39b2047f3f42e56d3d3a24ba18233e40 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 22 Sep 2009 17:26:06 +0200
Subject: [PATCH] Don't rely on activation_uri when detecting mounts

We test for the activation_uri (i.e. G_FILE_ATTRIBUTE_STANDARD_TARGET_URI)
which is usually not exposed from computer:// items until the item is mounted
(and that's up to particular gvfs volume monitor).

Simply don't test for activation_uri, file type of G_FILE_TYPE_MOUNTABLE
should be enough.
---
 libnautilus-private/nautilus-directory-async.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 653fd30..ff20ac5 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -1700,9 +1700,8 @@ lacks_mount (NautilusFile *file)
 		 (file->details->type == G_FILE_TYPE_DIRECTORY &&
 		  nautilus_file_is_self_owned (file)) ||
 		 
-		 /* Mountable with a target_uri, could be a mountpoint */
-		 (file->details->type == G_FILE_TYPE_MOUNTABLE &&
-		  file->details->activation_uri != NULL)
+		 /* Mountable, could be a mountpoint */
+		 (file->details->type == G_FILE_TYPE_MOUNTABLE)
 
 		 )
 		);
-- 
1.6.4.4




Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- nautilus.spec	23 Sep 2009 22:09:10 -0000	1.289
+++ nautilus.spec	24 Sep 2009 14:13:31 -0000	1.290
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -88,6 +88,9 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # Need to file upstream and investigate a real fix
 Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
 
+# from upstream
+Patch19:	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -125,6 +128,7 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
+%patch19 -p1 -b .mount-do-not-use-activation-uri
 
 %build
 
@@ -260,6 +264,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Avoid lingering menuitems (#518570)
+
 * Wed Sep 23 2009 Ray Strode <rstrode at redhat.com> 2.28.0-2
 - Fix crossfade
 



From jjames at fedoraproject.org  Thu Sep 24 14:13:39 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 24 Sep 2009 14:13:39 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs-21.5.29-png.patch, NONE,
	1.1 xemacs-21.5.29-no-xft.patch, 1.2, 1.3 xemacs.spec, 1.52,
	1.53 xemacs-21.5.28-courier-default.patch, 1.3, NONE
Message-ID: <20090924141339.8993911C00DB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18090/devel

Modified Files:
	xemacs-21.5.29-no-xft.patch xemacs.spec 
Added Files:
	xemacs-21.5.29-png.patch 
Removed Files:
	xemacs-21.5.28-courier-default.patch 
Log Message:
* Wed S ep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
- Final fix for bz 512623, which is actually two bugs, because ...
- ... the courier font patch breaks TTY font detection.  Do not apply the
  patch for now until I understand what is going on
- Add macros.xemacs (bz 480546)
- Add png patch to fix a problem with reading PNG files


xemacs-21.5.29-png.patch:
 glyphs-eimage.c |   79 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

--- NEW FILE xemacs-21.5.29-png.patch ---
--- xemacs-21.5.29/src/glyphs-eimage.c	2009-09-23 12:58:39.770625034 -0600
+++ xemacs-21.5.29/src/glyphs-eimage.c	2009-09-23 13:06:23.662801742 -0600
@@ -954,7 +954,7 @@
   png_read_info (png_ptr, info_ptr);
 
   {
-    int y;
+    int y, padding;
     Binbyte **row_pointers;
     UINT_64_BIT pixels_sq;
     height = info_ptr->height;
@@ -963,14 +963,22 @@
     if (pixels_sq > ((size_t) -1) / 3)
       signal_image_error ("PNG image too large to instantiate", instantiator);
 
-    /* Wow, allocate all the memory.  Truly, exciting. */
-    unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3));
+    /* Wow, allocate all the memory.  Truly, exciting.
+       Well, yes, there's excitement to be had.  It turns out that libpng
+       strips in place, so the last row overruns the buffer if depth is 16
+       or there's an alpha channel.  This is a crash on Linux.  So we need
+       to add padding.
+       The worst case is reducing 8 bytes (16-bit RGBA) to 3 (8-bit RGB). */
+
+    padding = 5 * width;
+    unwind.eimage = xnew_array_and_zero (Binbyte,
+					 (size_t) (pixels_sq * 3 + padding));
+
     /* libpng expects that the image buffer passed in contains a
        picture to draw on top of if the png has any transparencies.
        This could be a good place to pass that in... */
 
     row_pointers  = xnew_array (png_byte *, height);
-
     for (y = 0; y < height; y++)
       row_pointers[y] = unwind.eimage + (width * 3 * y);
 
@@ -990,16 +998,15 @@
 	}
       else
 	{
-	  Lisp_Color_Instance *c;
-	  Lisp_Object rgblist;
-
-	  c = XCOLOR_INSTANCE (bkgd);
-	  rgblist = MAYBE_LISP_DEVMETH (XDEVICE (c->device),
-					color_instance_rgb_components,
-					(c));
-	  my_background.red = (unsigned short) XINT (XCAR (rgblist));
-	  my_background.green = (unsigned short) XINT (XCAR (XCDR (rgblist)));
-	  my_background.blue = (unsigned short) XINT (XCAR (XCDR (XCDR (rgblist))));
+	  Lisp_Color_Instance *c = XCOLOR_INSTANCE (bkgd);
+	  Lisp_Object rgb = MAYBE_LISP_DEVMETH (XDEVICE (c->device),
+						color_instance_rgb_components,
+						(c));
+#define GETCOLOR(col) my_background.col = (unsigned short) XINT (XCAR (rgb))
+	  GETCOLOR(red); rgb = XCDR (rgb);
+	  GETCOLOR(green); rgb = XCDR (rgb);
+	  GETCOLOR(blue);
+#undef GETCOLOR
 	}
 
       if (png_get_bKGD (png_ptr, info_ptr, &image_background))
@@ -1012,41 +1019,38 @@
 
     /* Now that we're using EImage, ask for 8bit RGB triples for any type
        of image*/
-    /* convert palette images to full RGB */
+    /* convert palette images to RGB */
     if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_set_expand (png_ptr);
-    /* send grayscale images to RGB too */
-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
-        info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_palette_to_rgb (png_ptr);
+    /* convert grayscale images to RGB */
+    else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+	     info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
       png_set_gray_to_rgb (png_ptr);
-    /* we can't handle alpha values */
-    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      png_set_strip_alpha (png_ptr);
-    /* tell libpng to strip 16 bit depth files down to 8 bits */
-    if (info_ptr->bit_depth == 16)
-      png_set_strip_16 (png_ptr);
-    /* if the image is < 8 bits, pad it out */
-    if (info_ptr->bit_depth < 8)
+    /* pad images with depth < 8 bits */
+    else if (info_ptr->bit_depth < 8)
       {
 	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
 	  png_set_expand (png_ptr);
 	else
 	  png_set_packing (png_ptr);
       }
+    /* strip 16-bit depth files down to 8 bits */
+    if (info_ptr->bit_depth == 16)
+      png_set_strip_16 (png_ptr);
+    /* strip alpha channel
+       #### shouldn't we handle this?
+       first call png_read_update_info in case above transformations
+       have generated an alpha channel */
+    png_read_update_info(png_ptr, info_ptr);
+    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      png_set_strip_alpha (png_ptr);
 
     png_read_image (png_ptr, row_pointers);
     png_read_end (png_ptr, info_ptr);
 
-#if 1 /* def PNG_SHOW_COMMENTS */
-    /* ####
-     * I turn this off by default now, because the !%^@#!% comments
-     * show up every time the image is instantiated, which can get
-     * really really annoying.  There should be some way to pass this
-     * type of data down into the glyph code, where you can get to it
-     * from lisp anyway. - WMP
-     */
-    /* #### I've turned this on, since these warnings are now
-       unobtrusive. */
+    /* #### There should be some way to pass this type of data down
+     * into the glyph code, where you can get to it from lisp
+     * anyway. - WMP */
     {
       int i;
       DECLARE_EISTRING (key);
@@ -1066,7 +1070,6 @@
 			  eidata(key), eidata(text));
 	}
     }
-#endif
 
     xfree (row_pointers, Binbyte **);
   }

xemacs-21.5.29-no-xft.patch:
 font.el |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Index: xemacs-21.5.29-no-xft.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs-21.5.29-no-xft.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-21.5.29-no-xft.patch	26 Aug 2009 20:57:27 -0000	1.2
+++ xemacs-21.5.29-no-xft.patch	24 Sep 2009 14:13:39 -0000	1.3
@@ -1,12 +1,12 @@
 diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el
---- xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:58.859385283 -0600
-+++ xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:20.000998807 -0600
+--- xemacs-21.5.29.ORIG/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
++++ xemacs-21.5.29/lisp/font.el	2009-09-23 15:13:48.543673471 -0600
 @@ -753,14 +753,23 @@
  
  (defvar font-xft-font-regexp
    (concat "\\`"
 -	  #r"\(\\-\|\\:\|\\,\|[^:-]\)*"	        ; optional foundry and family
-+	  #r"\(\\[-,]|[^-:,*]\)*"               ; optional foundry and family
++	  #r"\(\\-\|\\:\|\\,\|[^-:*]\)*"	; optional foundry and family
  						; (allows for escaped colons, 
 -						; dashes, commas)
 +						; dashes, commas, asterisks)
@@ -37,16 +37,3 @@ diff -dur xemacs-21.5.29.ORIG/lisp/font.
    (let* ((name fontname)
  	 (device (or device (default-x-device)))
  	 (pattern (fc-font-match device (fc-name-parse name)))
-diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el
---- xemacs-21.5.29/lisp/font-mgr.el	2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/font-mgr.el	2009-08-26 14:46:44.073953826 -0600
-@@ -39,7 +39,8 @@
- 
- ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'?
- 
--(provide 'font-mgr)
-+;; #### implementation is incomplete
-+;; (provide 'font-mgr)
- 
- (defvar xft-xlfd-font-regexp
-   (concat


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xemacs.spec	26 Aug 2009 20:57:27 -0000	1.52
+++ xemacs.spec	24 Sep 2009 14:13:39 -0000	1.53
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        4%{?snap:.%{snap}}%{?dist}
+Release:        5%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -47,7 +47,8 @@ Patch4:         %{name}-21.5.27-no-expdy
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
 # Proposed by upstream 2009-08-25
 Patch6:         %{name}-21.5.29-no-xft.patch
-Patch8:         %{name}-21.5.28-courier-default.patch
+# Applied upstream 2009-09-23
+Patch7:         %{name}-21.5.29-png.patch
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
@@ -99,6 +100,7 @@ Requires:       %{name}-common = %{versi
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
 Requires:       xorg-x11-fonts-misc
+Requires:       bitmap-fonts
 Requires(post): coreutils
 Provides:       xemacs(bin) = %{version}-%{release}
 
@@ -212,8 +214,10 @@ touch -r aclocal.m4 aclocal.m4-stamp
 touch -r aclocal.m4-stamp aclocal.m4
 %endif
 %patch5 -p1
+%if %{without xft}
 %patch6 -p1
-%patch8 -p1
+%endif
+%patch7 -p1
 %patch9 -p1
 %patch14 -p1
 
@@ -331,6 +335,19 @@ Cflags: -I${includedir}
 %endif
 EOF
 
+cat > macros.xemacs << EOF
+%%_xemacs_version %{version}
+%%_xemacs_ev %{?epoch:%{epoch}:}%{version}
+%%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
+%%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
+%%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp
+%%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -f batch-byte-compile
+%if %{with modules}
+%%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include
+%%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules
+%endif
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -389,6 +406,9 @@ install -Dpm 644 %{SOURCE3} $RPM_BUILD_R
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 
+# macro file
+install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs
+
 # make sure nothing is 0400
 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
 
@@ -503,6 +523,7 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
 %{_mandir}/man1/gnudoit.1*
+%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs
 
 %if %{with nox}
 %files nox
@@ -558,6 +579,13 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
+- Final fix for bz 512623, which is actually two bugs, because ...
+- ... the courier font patch breaks TTY font detection.  Removed that patch
+  and Require bitmap-fonts to supply the original font name.
+- Add macros.xemacs (bz 480546)
+- Add png patch to fix a problem with reading PNG files
+
 * Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
 - Use upstream's attempt at fixing #512623 instead of mine, which didn't work.
 


--- xemacs-21.5.28-courier-default.patch DELETED ---



From clumens at fedoraproject.org  Thu Sep 24 14:14:17 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 24 Sep 2009 14:14:17 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.671, 1.672 anaconda.spec, 1.821, 
	1.822 sources, 1.805, 1.806
Message-ID: <20090924141417.93AFB11C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18585

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -p -r1.671 -r1.672
--- .cvsignore	23 Sep 2009 03:21:32 -0000	1.671
+++ .cvsignore	24 Sep 2009 14:14:17 -0000	1.672
@@ -1 +1,2 @@
 anaconda-12.29.tar.bz2
+anaconda-12.30.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -p -r1.821 -r1.822
--- anaconda.spec	23 Sep 2009 03:21:32 -0000	1.821
+++ anaconda.spec	24 Sep 2009 14:14:17 -0000	1.822
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.29
+Version: 12.30
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -116,7 +116,7 @@ Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
 Requires: system-config-keyboard >= 1.3.1
-Requires: hal, dbus-python
+Requires: dbus-python
 Requires: cracklib-python
 Requires: python-bugzilla
 Requires: python-nss
@@ -214,6 +214,12 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Sep 24 2009 Chris Lumens <clumens at redhat.com> - 12.30-1
+- Simplify s390x module list generation. (dcantrell)
+- Read cmsfs* commands from $IMGPATH/usr/sbin in mk-images (dcantrell)
+- Use correct kernel-bootwrapper on ppc64. (dcantrell)
+- Anaconda no longer requires hal. (notting)
+
 * Tue Sep 22 2009 David Cantrell <dcantrell at redhat.com> - 12.29-1
 - Updated po/anaconda.pot (dcantrell)
 - Remove ui/instkey.glade.h from po/POTFILES.in (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -p -r1.805 -r1.806
--- sources	23 Sep 2009 03:21:32 -0000	1.805
+++ sources	24 Sep 2009 14:14:17 -0000	1.806
@@ -1 +1 @@
-8e21f51de2daf420f3ee26cbc0964ebb  anaconda-12.29.tar.bz2
+512e0594e6caf2015f0f7d2472061a73  anaconda-12.30.tar.bz2



From rdieter at fedoraproject.org  Thu Sep 24 14:14:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 14:14:46 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk.spec,1.149,1.150
Message-ID: <20090924141446.D0E9E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18789

Modified Files:
	kdesdk.spec 
Log Message:
* Thu Sep 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- Requires: kross(python) (#523076)



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- kdesdk.spec	28 Aug 2009 16:17:34 -0000	1.149
+++ kdesdk.spec	24 Sep 2009 14:14:46 -0000	1.150
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -30,6 +30,8 @@ BuildRequires:  binutils-devel
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
+# lokalize
+Requires: kross(python)
 
 # not *strictly* required, helps upgrade case so tools don't disappear
 Requires(hint): %{name}-utils = %{version}-%{release}
@@ -223,6 +225,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- Requires: kross(python) (#523076)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From rdieter at fedoraproject.org  Thu Sep 24 14:16:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 14:16:16 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.207,1.208
Message-ID: <20090924141616.6E89311C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19072

Modified Files:
	kdeedu.spec 
Log Message:
s|kross-python|kross(python)|  (style/cosmetic change, no build)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- kdeedu.spec	22 Sep 2009 16:23:24 -0000	1.207
+++ kdeedu.spec	24 Sep 2009 14:16:16 -0000	1.208
@@ -69,7 +69,7 @@ Requires: sj-stevehand-fonts
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
 # parley
-Requires: kross-python
+Requires: kross(python)
 Requires: python-mwclient
 
 %description



From mlichvar at fedoraproject.org  Thu Sep 24 14:18:52 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 24 Sep 2009 14:18:52 +0000 (UTC)
Subject: rpms/newt/F-10 newt-0.52.10-reflowbuffer.patch, NONE, 1.1 newt.spec,
	1.57, 1.58
Message-ID: <20090924141852.0BA5111C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/newt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19675

Modified Files:
	newt.spec 
Added Files:
	newt-0.52.10-reflowbuffer.patch 
Log Message:
- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)


newt-0.52.10-reflowbuffer.patch:
 textbox.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE newt-0.52.10-reflowbuffer.patch ---
diff -up newt-0.52.10/textbox.c.orig newt-0.52.10/textbox.c
--- newt-0.52.10/textbox.c.orig	2008-07-30 14:42:55.000000000 +0200
+++ newt-0.52.10/textbox.c	2009-09-21 14:59:24.000000000 +0200
@@ -179,7 +179,7 @@ static void doReflow(const char * text, 
 
     if (resultPtr) {
 	/* XXX I think this will work */
-	result = malloc(strlen(text) + (strlen(text) / width) + 2);
+	result = malloc(strlen(text) + (strlen(text) / (width - 1)) + 2);
 	*result = '\0';
     }
 	


Index: newt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/newt/F-10/newt.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- newt.spec	30 Jul 2008 13:07:41 -0000	1.57
+++ newt.spec	24 Sep 2009 14:18:51 -0000	1.58
@@ -2,7 +2,7 @@
 Summary: A library for text mode user interfaces
 Name: newt
 Version: 0.52.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: https://fedorahosted.org/newt/
@@ -10,6 +10,7 @@ Source: https://fedorahosted.org/release
 BuildRequires: popt-devel python-devel slang-devel
 Provides: snack = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: newt-0.52.10-reflowbuffer.patch
 
 %package devel
 Summary: Newt windowing toolkit development files
@@ -56,6 +57,7 @@ providing a python API for creating text
 
 %prep
 %setup -q
+%patch1 -p1 -b .reflowbuffer
 
 %build
 # gpm support seems to smash the stack w/ we use help in anaconda??
@@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*.py*
 
 %changelog
+* Thu Sep 24 2009 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.10-2
+- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)
+
 * Wed Jul 30 2008 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.10-1
 - improve --noitem description (#456305)
 - add setHeight to Textbox class



From mlichvar at fedoraproject.org  Thu Sep 24 14:20:07 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 24 Sep 2009 14:20:07 +0000 (UTC)
Subject: rpms/newt/F-11 newt-0.52.10-reflowbuffer.patch, NONE, 1.1 newt.spec,
	1.59, 1.60
Message-ID: <20090924142007.2E9A011C0418@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/newt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20017

Modified Files:
	newt.spec 
Added Files:
	newt-0.52.10-reflowbuffer.patch 
Log Message:
- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)


newt-0.52.10-reflowbuffer.patch:
 textbox.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE newt-0.52.10-reflowbuffer.patch ---
diff -up newt-0.52.10/textbox.c.orig newt-0.52.10/textbox.c
--- newt-0.52.10/textbox.c.orig	2008-07-30 14:42:55.000000000 +0200
+++ newt-0.52.10/textbox.c	2009-09-21 14:59:24.000000000 +0200
@@ -179,7 +179,7 @@ static void doReflow(const char * text, 
 
     if (resultPtr) {
 	/* XXX I think this will work */
-	result = malloc(strlen(text) + (strlen(text) / width) + 2);
+	result = malloc(strlen(text) + (strlen(text) / (width - 1)) + 2);
 	*result = '\0';
     }
 	


Index: newt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/newt/F-11/newt.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- newt.spec	26 Feb 2009 05:28:32 -0000	1.59
+++ newt.spec	24 Sep 2009 14:20:07 -0000	1.60
@@ -2,7 +2,7 @@
 Summary: A library for text mode user interfaces
 Name: newt
 Version: 0.52.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: https://fedorahosted.org/newt/
@@ -10,6 +10,7 @@ Source: https://fedorahosted.org/release
 BuildRequires: popt-devel python-devel slang-devel
 Provides: snack = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: newt-0.52.10-reflowbuffer.patch
 
 %package devel
 Summary: Newt windowing toolkit development files
@@ -56,6 +57,7 @@ providing a python API for creating text
 
 %prep
 %setup -q
+%patch1 -p1 -b .reflowbuffer
 
 %build
 # gpm support seems to smash the stack w/ we use help in anaconda??
@@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*.py*
 
 %changelog
+* Thu Sep 24 2009 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.10-4
+- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.52.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Sep 24 14:30:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 14:30:57 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.221,1.222
Message-ID: <20090924143057.3ABCF11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22399

Modified Files:
	glib2.spec 
Log Message:
Avoid multilib conflicts



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- glib2.spec	23 Sep 2009 20:39:17 -0000	1.221
+++ glib2.spec	24 Sep 2009 14:30:56 -0000	1.222
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -81,6 +81,10 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
+# These cause multilib conflicts, and we don't really need precompiled
+# versions of these tiny scripts
+rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
+
 %find_lang glib20
 
 %clean
@@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
+- Avoid multilib conflicts (#525213)
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-2
 - Fix location of gdb macros
 



From atkac at fedoraproject.org  Thu Sep 24 14:31:43 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu, 24 Sep 2009 14:31:43 +0000 (UTC)
Subject: rpms/bind/F-10 .cvsignore, 1.49, 1.50 bind-9.3.2b2-sdbsrc.patch, 1.1,
	1.2 bind-9.5-libidn.patch, 1.2, 1.3 bind.spec, 1.292,
	1.293 sources, 1.58, 1.59 bind-95-rh469440.patch, 1.1, NONE
Message-ID: <20090924143143.5E55F11C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22630

Modified Files:
	.cvsignore bind-9.3.2b2-sdbsrc.patch bind-9.5-libidn.patch 
	bind.spec sources 
Removed Files:
	bind-95-rh469440.patch 
Log Message:
- update to 9.5.2
- bind-95-rh469440.patch merged to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	29 Jul 2009 12:55:14 -0000	1.49
+++ .cvsignore	24 Sep 2009 14:31:42 -0000	1.50
@@ -1,4 +1,4 @@
 config-4.tar.bz2
 libbind-man.tar.gz
 bind-chroot.tar.bz2
-bind-9.5.1-P3.tar.gz
+bind-9.5.2.tar.gz

bind-9.3.2b2-sdbsrc.patch:
 bdb/bdb.c        |    2 -
 ldap/zone2ldap.c |   59 +++++++++++++++++++++++++++++++------------------------
 pgsql/pgsqldb.c  |    2 -
 pgsql/zonetodb.c |   11 ++++++++--
 4 files changed, 45 insertions(+), 29 deletions(-)

Index: bind-9.3.2b2-sdbsrc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind-9.3.2b2-sdbsrc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bind-9.3.2b2-sdbsrc.patch	3 Dec 2005 00:10:48 -0000	1.1
+++ bind-9.3.2b2-sdbsrc.patch	24 Sep 2009 14:31:42 -0000	1.2
@@ -241,12 +241,3 @@
  void
  addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
  	unsigned char namearray[DNS_NAME_MAXTEXT + 1];
-@@ -165,7 +172,7 @@
- 	check_result(result, "isc_mem_create");
- 
- 	result = isc_entropy_create(mctx, &ectx);
--	result_check (result, "isc_entropy_create");
-+	check_result (result, "isc_entropy_create");
- 
- 	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
- 	check_result (result, "isc_hash_create");

bind-9.5-libidn.patch:
 Makefile.in |    4 +
 dighost.c   |  153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 153 insertions(+), 4 deletions(-)

Index: bind-9.5-libidn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind-9.5-libidn.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bind-9.5-libidn.patch	11 Feb 2008 17:11:26 -0000	1.2
+++ bind-9.5-libidn.patch	24 Sep 2009 14:31:42 -0000	1.3
@@ -1,27 +1,6 @@
-diff -up bind-9.5.0b2/bin/dig/Makefile.in.libidn bind-9.5.0b2/bin/dig/Makefile.in
---- bind-9.5.0b2/bin/dig/Makefile.in.libidn	2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.5.0b2/bin/dig/Makefile.in	2008-02-11 17:50:08.000000000 +0100
-@@ -45,7 +45,7 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} 
- 		${LWRESDEPLIBS}
- 
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
--		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
-+		${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
- 
- SUBDIRS =
- 
-@@ -63,6 +63,8 @@ HTMLPAGES =	dig.html host.html nslookup.
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
- 
-+EXT_CFLAGS = -DWITH_LIBIDN
-+
- @BIND9_MAKE_RULES@
- 
- dig at EXEEXT@: dig. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS}
-diff -up bind-9.5.0b2/bin/dig/dighost.c.libidn bind-9.5.0b2/bin/dig/dighost.c
---- bind-9.5.0b2/bin/dig/dighost.c.libidn	2008-01-18 00:46:35.000000000 +0100
-+++ bind-9.5.0b2/bin/dig/dighost.c	2008-02-11 17:49:03.000000000 +0100
+diff -up bind-9.5.2/bin/dig/dighost.c.libidn bind-9.5.2/bin/dig/dighost.c
+--- bind-9.5.2/bin/dig/dighost.c.libidn	2009-06-24 05:42:32.000000000 +0200
++++ bind-9.5.2/bin/dig/dighost.c	2009-09-24 15:41:13.000000000 +0200
 @@ -44,6 +44,11 @@
  #include <idn/api.h>
  #endif
@@ -49,17 +28,17 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  /*%
   * Exit Codes:
   *
-@@ -1004,6 +1017,9 @@ void
- setup_system(void) {
+@@ -1012,6 +1025,9 @@ setup_system(void) {
  	dig_searchlist_t *domain = NULL;
  	lwres_result_t lwresult;
+ 	unsigned int lwresflags;
 +#ifdef WITH_LIBIDN
 +	isc_result_t result;
 +#endif
  
  	debug("setup_system()");
  
-@@ -1052,8 +1068,15 @@ setup_system(void) {
+@@ -1070,8 +1086,15 @@ setup_system(void) {
  
  #ifdef WITH_IDN
  	initialize_idn();
@@ -76,7 +55,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  	if (keyfile[0] != 0)
  		setup_file_key();
  	else if (keysecret[0] != 0)
-@@ -1743,12 +1766,18 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1772,12 +1795,18 @@ setup_lookup(dig_lookup_t *lookup) {
  	idn_result_t mr;
  	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
  #endif
@@ -96,7 +75,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  	REQUIRE(lookup != NULL);
  	INSIST(!free_now);
  
-@@ -1785,6 +1814,16 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1814,6 +1843,16 @@ setup_lookup(dig_lookup_t *lookup) {
  	mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
  			    utf8_textname, sizeof(utf8_textname));
  	idn_check_result(mr, "convert textname to UTF-8");
@@ -113,7 +92,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  #endif
  
  	/*
-@@ -1804,6 +1843,15 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1833,6 +1872,15 @@ setup_lookup(dig_lookup_t *lookup) {
  			lookup->origin = ISC_LIST_HEAD(search_list);
  			lookup->need_search = ISC_FALSE;
  		}
@@ -129,7 +108,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  #else
  		if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
  			lookup->origin = NULL; /* Force abs lookup */
-@@ -1830,6 +1878,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1859,6 +1907,20 @@ setup_lookup(dig_lookup_t *lookup) {
  			    IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
  			    idn_textname, sizeof(idn_textname));
  	idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
@@ -150,7 +129,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  #else
  	if (lookup->origin != NULL) {
  		debug("trying origin %s", lookup->origin->origin);
-@@ -1886,6 +1948,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1915,6 +1977,14 @@ setup_lookup(dig_lookup_t *lookup) {
  						   dns_rootname,
  						   ISC_FALSE,
  						   &lookup->namebuf);
@@ -165,7 +144,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  #else
  			len = strlen(lookup->textname);
  			isc_buffer_init(&b, lookup->textname, len);
-@@ -3317,7 +3387,7 @@ destroy_libs(void) {
+@@ -3434,7 +3504,7 @@ destroy_libs(void) {
  	void * ptr;
  	dig_message_t *chase_msg;
  #endif
@@ -174,7 +153,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  	isc_result_t result;
  #endif
  
-@@ -3356,6 +3426,10 @@ destroy_libs(void) {
+@@ -3473,6 +3543,10 @@ destroy_libs(void) {
  	result = dns_name_settotextfilter(NULL);
  	check_result(result, "dns_name_settotextfilter");
  #endif
@@ -185,7 +164,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  	dns_name_destroy();
  
  	if (commctx != NULL) {
-@@ -3532,6 +3606,79 @@ idn_check_result(idn_result_t r, const c
+@@ -3649,6 +3723,79 @@ idn_check_result(idn_result_t r, const c
  	}
  }
  #endif /* WITH_IDN */
@@ -265,3 +244,24 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
  
  #ifdef DIG_SIGCHASE
  void
+diff -up bind-9.5.2/bin/dig/Makefile.in.libidn bind-9.5.2/bin/dig/Makefile.in
+--- bind-9.5.2/bin/dig/Makefile.in.libidn	2007-06-20 01:46:59.000000000 +0200
++++ bind-9.5.2/bin/dig/Makefile.in	2009-09-24 15:40:21.000000000 +0200
+@@ -45,7 +45,7 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} 
+ 		${LWRESDEPLIBS}
+ 
+ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
+-		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
++		${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
+ 
+ SUBDIRS =
+ 
+@@ -63,6 +63,8 @@ HTMLPAGES =	dig.html host.html nslookup.
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
++EXT_CFLAGS = -DWITH_LIBIDN
++
+ @BIND9_MAKE_RULES@
+ 
+ dig at EXEEXT@: dig. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS}


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- bind.spec	29 Jul 2009 12:55:14 -0000	1.292
+++ bind.spec	24 Sep 2009 14:31:43 -0000	1.293
@@ -4,8 +4,9 @@
 
 #%define PREVER b3
 #%define VERSION %{version}%{PREVER}
-%define PATCHVER P3
-%define VERSION %{version}-%{PATCHVER}
+#%define PATCHVER P3
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}
 
 %{?!SDB:       %define SDB       1}
 %{?!LIBBIND:   %define LIBBIND   1}
@@ -20,8 +21,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  ISC
-Version:  9.5.1
-Release:  3.%{PATCHVER}%{?dist}
+Version:  9.5.2
+Release:  1%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,7 +59,6 @@ Patch16: bind-9.3.2-redhat_doc.patch
 Patch71: bind-9.5-overflow.patch
 Patch72: bind-9.5-dlz-64bit.patch
 Patch87: bind-9.5-parallel-build.patch
-Patch96: bind-95-rh469440.patch
 Patch97: bind-95-rh452060.patch
 
 # SDB patches
@@ -239,7 +239,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_ser
 %patch85 -p1 -b .libidn3
 %patch87 -p1 -b .parallel
 %patch94 -p1 -b .rh461409
-%patch96 -p1 -b .rh469440
 %patch97 -p1 -b .rh452060
 
 # Sparc and s390 arches need to use -fPIE
@@ -599,6 +598,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/isccfg
 %{_includedir}/lwres
 %{_mandir}/man3/lwres*
+%{_mandir}/man1/isc-config.sh.1*
 %{_bindir}/isc-config.sh
 %if %{LIBBIND}
 %{_libdir}/pkgconfig/libbind.pc
@@ -638,6 +638,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Sep 24 2009 Adam Tkac <atkac redhat com> 32:9.5.2-1
+- update to 9.5.2
+- bind-95-rh469440.patch merged to upstream
+
 * Wed Jul 29 2009 Adam Tkac <atkac redhat com> 32:9.5.1-3.P3
 - 9.5.1-P3 release (CVE-2009-0696)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	29 Jul 2009 12:55:14 -0000	1.58
+++ sources	24 Sep 2009 14:31:43 -0000	1.59
@@ -1,4 +1,4 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
-a25a93711c2498bca7e8f208aab0c896  bind-9.5.1-P3.tar.gz
+d1bd3e81bad99bffcf89059b29acc22d  bind-9.5.2.tar.gz


--- bind-95-rh469440.patch DELETED ---



From sharkcz at fedoraproject.org  Thu Sep 24 14:32:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 24 Sep 2009 14:32:03 +0000 (UTC)
Subject: rpms/s390utils/F-11 s390utils.spec,1.6,1.7
Message-ID: <20090924143203.7758111C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22720

Modified Files:
	s390utils.spec 
Log Message:
* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-5
- drop support for Fedora < 10



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- s390utils.spec	24 Sep 2009 08:48:08 -0000	1.6
+++ s390utils.spec	24 Sep 2009 14:32:03 -0000	1.7
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -163,9 +163,7 @@ pushd lib-zfcp-hbaapi-%{hbaapiver}
 # lib-zfcp-hbaapi: fix perms
 chmod a-x *.h AUTHORS README ChangeLog LICENSE
 # update sg3_utils library name
-%if 0%{?fedora} >= 10
 sed -i 's/-lsgutils/-lsgutils2/g' Makefile.in
-%endif
 popd
 
 
@@ -770,6 +768,9 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-5
+- drop support for Fedora < 10
+
 * Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-4
 - fixed string overflow in vtoc_volume_label_init (#525318)
 



From sharkcz at fedoraproject.org  Thu Sep 24 14:33:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 24 Sep 2009 14:33:03 +0000 (UTC)
Subject: rpms/s390utils/devel s390utils.spec,1.5,1.6
Message-ID: <20090924143303.6F32A11C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23050

Modified Files:
	s390utils.spec 
Log Message:
* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-5
- drop support for Fedora < 10



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- s390utils.spec	24 Sep 2009 08:49:06 -0000	1.5
+++ s390utils.spec	24 Sep 2009 14:33:01 -0000	1.6
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -163,9 +163,7 @@ pushd lib-zfcp-hbaapi-%{hbaapiver}
 # lib-zfcp-hbaapi: fix perms
 chmod a-x *.h AUTHORS README ChangeLog LICENSE
 # update sg3_utils library name
-%if 0%{?fedora} >= 10
 sed -i 's/-lsgutils/-lsgutils2/g' Makefile.in
-%endif
 popd
 
 
@@ -770,6 +768,9 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-5
+- drop support for Fedora < 10
+
 * Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-4
 - fixed string overflow in vtoc_volume_label_init (#525318)
 



From nphilipp at fedoraproject.org  Thu Sep 24 14:40:08 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 24 Sep 2009 14:40:08 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.19, 1.20 python-slip.spec, 1.22,
	1.23 sources, 1.22, 1.23
Message-ID: <20090924144008.D972C11C0423@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	8 Sep 2009 15:09:16 -0000	1.19
+++ .cvsignore	24 Sep 2009 14:40:08 -0000	1.20
@@ -1 +1 @@
-python-slip-0.2.4.tar.bz2
+python-slip-0.2.5.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-slip.spec	8 Sep 2009 15:09:16 -0000	1.22
+++ python-slip.spec	24 Sep 2009 14:40:08 -0000	1.23
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.4
+Version:    0.2.5
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -92,6 +92,12 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Thu Sep 24 2009 Nils Philippsen <nils at redhat.com> - 0.2.5-1
+- make polkit checks in dbus services non-blocking
+
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com>
+- improve example documentation
+
 * Tue Sep 08 2009 Nils Philippsen <nils at redhat.com> - 0.2.4-1
 - fix dbus example
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	8 Sep 2009 15:09:16 -0000	1.22
+++ sources	24 Sep 2009 14:40:08 -0000	1.23
@@ -1 +1 @@
-62a053aa1353b758ee5bdcdc9653f6c1  python-slip-0.2.4.tar.bz2
+028492e702c32202dd862d0e7a81ed5b  python-slip-0.2.5.tar.bz2



From wtogami at fedoraproject.org  Thu Sep 24 14:51:25 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 24 Sep 2009 14:51:25 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/F-11 .cvsignore, 1.3, 1.4 perl-Mail-DKIM.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090924145125.ED9EA11C00DB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27438

Modified Files:
	.cvsignore perl-Mail-DKIM.spec sources 
Log Message:
0.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jun 2009 19:36:29 -0000	1.3
+++ .cvsignore	24 Sep 2009 14:51:25 -0000	1.4
@@ -1 +1 @@
-Mail-DKIM-0.33.tar.gz
+Mail-DKIM-0.37.tar.gz


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/F-11/perl-Mail-DKIM.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Mail-DKIM.spec	10 Jun 2009 22:19:59 -0000	1.5
+++ perl-Mail-DKIM.spec	24 Sep 2009 14:51:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Mail-DKIM
-Version:        0.33
-Release:        2%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 9 2009 Warren Togami <wtogami at redhat.com> - 0.37-1
+- 0.37
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 10 2009 Kyle VanderBeek <kylev at kylev.com> - 0.33-2
 - Revise network-driven testing exclusions.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jun 2009 19:36:29 -0000	1.3
+++ sources	24 Sep 2009 14:51:25 -0000	1.4
@@ -1 +1 @@
-09216a6544439c212efdd70e4bd106ca  Mail-DKIM-0.33.tar.gz
+f3e84ec6b5e42d4cbcc7c42ea2900649  Mail-DKIM-0.37.tar.gz



From veillard at fedoraproject.org  Thu Sep 24 14:51:45 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 24 Sep 2009 14:51:45 +0000 (UTC)
Subject: rpms/libxslt/devel .cvsignore, 1.34, 1.35 libxslt.spec, 1.60,
	1.61 sources, 1.35, 1.36 libxslt-1.1.25-locking.patch, 1.1, NONE
Message-ID: <20090924145145.774F811C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27467

Modified Files:
	.cvsignore libxslt.spec sources 
Removed Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Upstream 1.1.26 release, daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	17 Sep 2009 15:30:57 -0000	1.34
+++ .cvsignore	24 Sep 2009 14:51:45 -0000	1.35
@@ -14,3 +14,4 @@ libxslt-1.1.22.tar.gz
 libxslt-1.1.23.tar.gz
 libxslt-1.1.24.tar.gz
 libxslt-1.1.25.tar.gz
+libxslt-1.1.26.tar.gz


Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/libxslt.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- libxslt.spec	21 Sep 2009 09:09:50 -0000	1.60
+++ libxslt.spec	24 Sep 2009 14:51:45 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
-Version: 1.1.25
-Release: 2%{?dist}%{?extra_release}
+Version: 1.1.26
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,7 +15,6 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libxslt-1.1.25-locking.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -57,7 +56,6 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -132,6 +130,10 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> 1.1.26-1
+- couple of bug fixes
+- export a symbol needed by lxml
+
 * Mon Sep 21 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-2
 - fix a locking bug in 1.1.25
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	17 Sep 2009 15:30:57 -0000	1.35
+++ sources	24 Sep 2009 14:51:45 -0000	1.36
@@ -1 +1,2 @@
 50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz
+e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz


--- libxslt-1.1.25-locking.patch DELETED ---



From hadess at fedoraproject.org  Thu Sep 24 14:55:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 24 Sep 2009 14:55:53 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.258,1.259
Message-ID: <20090924145553.3FFE211C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28331

Modified Files:
	totem.spec 
Log Message:
* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
- Rebuild for new libgdata



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- totem.spec	21 Sep 2009 12:11:53 -0000	1.258
+++ totem.spec	24 Sep 2009 14:55:52 -0000	1.259
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -377,6 +377,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
+- Rebuild for new libgdata
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From peter at fedoraproject.org  Thu Sep 24 14:56:33 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Sep 2009 14:56:33 +0000 (UTC)
Subject: rpms/nrpe/devel nrpe-directory_for_configs.diff, NONE,
	1.1 import.log, 1.1, 1.2 nrpe.spec, 1.15, 1.16
Message-ID: <20090924145633.23C1F11C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28586/devel

Modified Files:
	import.log nrpe.spec 
Added Files:
	nrpe-directory_for_configs.diff 
Log Message:
Added /etc/nrpe.d (bz# 515324)

nrpe-directory_for_configs.diff:
 nrpe.cfg.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nrpe-directory_for_configs.diff ---
diff -up nrpe-2.12/sample-config/nrpe.cfg.in.orig nrpe-2.12/sample-config/nrpe.cfg.in
--- nrpe-2.12/sample-config/nrpe.cfg.in.orig	2009-08-03 19:49:20.000000000 +0200
+++ nrpe-2.12/sample-config/nrpe.cfg.in	2009-08-03 19:50:43.000000000 +0200
@@ -169,8 +169,7 @@ connection_timeout=300
 # This directive allows you to include definitions from config files (with a
 # .cfg extension) in one or more directories (with recursion).
 
-#include_dir=<somedirectory>
-#include_dir=<someotherdirectory>
+include_dir=/etc/nrpe.d/
 
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 16:06:20 -0000	1.1
+++ import.log	24 Sep 2009 14:56:32 -0000	1.2
@@ -1 +1,2 @@
 nrpe-2_12-6_fc10:HEAD:nrpe-2.12-6.fc10.src.rpm:1233590715
+nrpe-2_12-11_fc11:HEAD:nrpe-2.12-11.fc11.src.rpm:1253804147


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/devel/nrpe.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nrpe.spec	21 Aug 2009 14:43:11 -0000	1.15
+++ nrpe.spec	24 Sep 2009 14:56:32 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/nagio
 Source1: nrpe.sysconfig
 Patch0: nrpe-initreload.patch
 Patch1:	nrpe-read-extra-conf.patch
+Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +27,7 @@ Provides: nagios-nrpe = %{version}-%{rel
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -41,7 +42,7 @@ Provides: check_nrpe = %{version}-%{rele
 %description -n nagios-plugins-nrpe
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -51,6 +52,7 @@ This package provides the nrpe plugin fo
 %setup -q
 %patch0 -p0
 %patch1 -p0 -b .sysconfig
+%patch2 -p1 -b .dir
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -76,6 +78,8 @@ install -D -p -m 0644 sample-config/nrpe
 install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
 install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
 install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}%{_sysconfdir}/nrpe.d
+
 
 %clean
 rm -rf %{buildroot}
@@ -102,6 +106,7 @@ fi
 %{_initrddir}/nrpe
 %{_sbindir}/nrpe
 %dir %{_sysconfdir}/nagios
+%dir %{_sysconfdir}/nrpe.d
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
@@ -112,6 +117,9 @@ fi
 %doc Changelog LEGAL README
 
 %changelog
+* Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
+- Fixed BZ# 515324
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
 - rebuilt with new openssl
 



From peter at fedoraproject.org  Thu Sep 24 14:57:35 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Sep 2009 14:57:35 +0000 (UTC)
Subject: rpms/nrpe/F-11 nrpe-directory_for_configs.diff, NONE, 1.1 import.log,
	1.1, 1.2 nrpe.spec, 1.13, 1.14
Message-ID: <20090924145735.26F7A11C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28924/F-11

Modified Files:
	import.log nrpe.spec 
Added Files:
	nrpe-directory_for_configs.diff 
Log Message:
Added /etc/nrpe.d (bz# 515324)

nrpe-directory_for_configs.diff:
 nrpe.cfg.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nrpe-directory_for_configs.diff ---
diff -up nrpe-2.12/sample-config/nrpe.cfg.in.orig nrpe-2.12/sample-config/nrpe.cfg.in
--- nrpe-2.12/sample-config/nrpe.cfg.in.orig	2009-08-03 19:49:20.000000000 +0200
+++ nrpe-2.12/sample-config/nrpe.cfg.in	2009-08-03 19:50:43.000000000 +0200
@@ -169,8 +169,7 @@ connection_timeout=300
 # This directive allows you to include definitions from config files (with a
 # .cfg extension) in one or more directories (with recursion).
 
-#include_dir=<somedirectory>
-#include_dir=<someotherdirectory>
+include_dir=/etc/nrpe.d/
 
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 16:06:20 -0000	1.1
+++ import.log	24 Sep 2009 14:57:34 -0000	1.2
@@ -1 +1,2 @@
 nrpe-2_12-6_fc10:HEAD:nrpe-2.12-6.fc10.src.rpm:1233590715
+nrpe-2_12-11_fc11:F-11:nrpe-2.12-11.fc11.src.rpm:1253804213


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-11/nrpe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nrpe.spec	26 Feb 2009 06:05:35 -0000	1.13
+++ nrpe.spec	24 Sep 2009 14:57:35 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 8%{?dist}
+Release: 11%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/nagio
 Source1: nrpe.sysconfig
 Patch0: nrpe-initreload.patch
 Patch1:	nrpe-read-extra-conf.patch
+Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +27,7 @@ Provides: nagios-nrpe = %{version}-%{rel
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -41,7 +42,7 @@ Provides: check_nrpe = %{version}-%{rele
 %description -n nagios-plugins-nrpe
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -51,6 +52,7 @@ This package provides the nrpe plugin fo
 %setup -q
 %patch0 -p0
 %patch1 -p0 -b .sysconfig
+%patch2 -p1 -b .dir
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -76,6 +78,8 @@ install -D -p -m 0644 sample-config/nrpe
 install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
 install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
 install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}%{_sysconfdir}/nrpe.d
+
 
 %clean
 rm -rf %{buildroot}
@@ -102,6 +106,7 @@ fi
 %{_initrddir}/nrpe
 %{_sbindir}/nrpe
 %dir %{_sysconfdir}/nagios
+%dir %{_sysconfdir}/nrpe.d
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
@@ -112,6 +117,15 @@ fi
 %doc Changelog LEGAL README
 
 %changelog
+* Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
+- Fixed BZ# 515324
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Sep 24 14:59:15 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Sep 2009 14:59:15 +0000 (UTC)
Subject: rpms/nrpe/F-10 nrpe-directory_for_configs.diff, NONE, 1.1 import.log,
	1.1, 1.2 nrpe.spec, 1.8, 1.9
Message-ID: <20090924145915.AC35511C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29389/F-10

Modified Files:
	import.log nrpe.spec 
Added Files:
	nrpe-directory_for_configs.diff 
Log Message:
Added /etc/nrpe.d (bz# 515324)

nrpe-directory_for_configs.diff:
 nrpe.cfg.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nrpe-directory_for_configs.diff ---
diff -up nrpe-2.12/sample-config/nrpe.cfg.in.orig nrpe-2.12/sample-config/nrpe.cfg.in
--- nrpe-2.12/sample-config/nrpe.cfg.in.orig	2009-08-03 19:49:20.000000000 +0200
+++ nrpe-2.12/sample-config/nrpe.cfg.in	2009-08-03 19:50:43.000000000 +0200
@@ -169,8 +169,7 @@ connection_timeout=300
 # This directive allows you to include definitions from config files (with a
 # .cfg extension) in one or more directories (with recursion).
 
-#include_dir=<somedirectory>
-#include_dir=<someotherdirectory>
+include_dir=/etc/nrpe.d/
 
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 16:08:19 -0000	1.1
+++ import.log	24 Sep 2009 14:59:15 -0000	1.2
@@ -1 +1,2 @@
 nrpe-2_12-6_fc10:F-10:nrpe-2.12-6.fc10.src.rpm:1233590859
+nrpe-2_12-11_fc11:F-10:nrpe-2.12-11.fc11.src.rpm:1253804318


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-10/nrpe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nrpe.spec	2 Feb 2009 16:08:20 -0000	1.8
+++ nrpe.spec	24 Sep 2009 14:59:15 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 6%{?dist}
+Release: 11%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/nagio
 Source1: nrpe.sysconfig
 Patch0: nrpe-initreload.patch
 Patch1:	nrpe-read-extra-conf.patch
+Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +27,7 @@ Provides: nagios-nrpe = %{version}-%{rel
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -41,7 +42,7 @@ Provides: check_nrpe = %{version}-%{rele
 %description -n nagios-plugins-nrpe
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -51,6 +52,7 @@ This package provides the nrpe plugin fo
 %setup -q
 %patch0 -p0
 %patch1 -p0 -b .sysconfig
+%patch2 -p1 -b .dir
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -76,6 +78,8 @@ install -D -p -m 0644 sample-config/nrpe
 install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
 install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
 install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}%{_sysconfdir}/nrpe.d
+
 
 %clean
 rm -rf %{buildroot}
@@ -102,16 +106,32 @@ fi
 %{_initrddir}/nrpe
 %{_sbindir}/nrpe
 %dir %{_sysconfdir}/nagios
+%dir %{_sysconfdir}/nrpe.d
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
 %{_libdir}/nagios/*
-%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
+%doc Changelog LEGAL README
 
 %changelog
+* Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
+- Fixed BZ# 515324
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 2.12-7
+- Re-fix for 477527
+
 * Mon Feb  2 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-6
 - Fixed BZ# 449174
 - Clean up (in order to disable rpmlint warnings)



From peter at fedoraproject.org  Thu Sep 24 15:00:08 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Sep 2009 15:00:08 +0000 (UTC)
Subject: rpms/nrpe/EL-5 nrpe-directory_for_configs.diff, NONE, 1.1 import.log,
	1.1, 1.2 nrpe.spec, 1.5, 1.6
Message-ID: <20090924150008.392B211C0423@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29729/EL-5

Modified Files:
	import.log nrpe.spec 
Added Files:
	nrpe-directory_for_configs.diff 
Log Message:
Added /etc/nrpe.d (bz# 515324)

nrpe-directory_for_configs.diff:
 nrpe.cfg.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nrpe-directory_for_configs.diff ---
diff -up nrpe-2.12/sample-config/nrpe.cfg.in.orig nrpe-2.12/sample-config/nrpe.cfg.in
--- nrpe-2.12/sample-config/nrpe.cfg.in.orig	2009-08-03 19:49:20.000000000 +0200
+++ nrpe-2.12/sample-config/nrpe.cfg.in	2009-08-03 19:50:43.000000000 +0200
@@ -169,8 +169,7 @@ connection_timeout=300
 # This directive allows you to include definitions from config files (with a
 # .cfg extension) in one or more directories (with recursion).
 
-#include_dir=<somedirectory>
-#include_dir=<someotherdirectory>
+include_dir=/etc/nrpe.d/
 
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 16:12:23 -0000	1.1
+++ import.log	24 Sep 2009 15:00:07 -0000	1.2
@@ -1 +1,2 @@
 nrpe-2_12-6_fc10:EL-5:nrpe-2.12-6.fc10.src.rpm:1233591102
+nrpe-2_12-11_fc11:EL-5:nrpe-2.12-11.fc11.src.rpm:1253804375


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-5/nrpe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nrpe.spec	2 Feb 2009 16:12:23 -0000	1.5
+++ nrpe.spec	24 Sep 2009 15:00:08 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 6%{?dist}
+Release: 11%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/nagio
 Source1: nrpe.sysconfig
 Patch0: nrpe-initreload.patch
 Patch1:	nrpe-read-extra-conf.patch
+Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +27,7 @@ Provides: nagios-nrpe = %{version}-%{rel
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -41,7 +42,7 @@ Provides: check_nrpe = %{version}-%{rele
 %description -n nagios-plugins-nrpe
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -51,6 +52,7 @@ This package provides the nrpe plugin fo
 %setup -q
 %patch0 -p0
 %patch1 -p0 -b .sysconfig
+%patch2 -p1 -b .dir
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -76,6 +78,8 @@ install -D -p -m 0644 sample-config/nrpe
 install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
 install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
 install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}%{_sysconfdir}/nrpe.d
+
 
 %clean
 rm -rf %{buildroot}
@@ -102,16 +106,32 @@ fi
 %{_initrddir}/nrpe
 %{_sbindir}/nrpe
 %dir %{_sysconfdir}/nagios
+%dir %{_sysconfdir}/nrpe.d
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
 %{_libdir}/nagios/*
-%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
+%doc Changelog LEGAL README
 
 %changelog
+* Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
+- Fixed BZ# 515324
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 2.12-7
+- Re-fix for 477527
+
 * Mon Feb  2 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-6
 - Fixed BZ# 449174
 - Clean up (in order to disable rpmlint warnings)



From peter at fedoraproject.org  Thu Sep 24 15:01:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Sep 2009 15:01:06 +0000 (UTC)
Subject: rpms/nrpe/EL-4 nrpe-directory_for_configs.diff, NONE, 1.1 import.log,
	1.1, 1.2 nrpe.spec, 1.5, 1.6
Message-ID: <20090924150106.2648B11C00DB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30058/EL-4

Modified Files:
	import.log nrpe.spec 
Added Files:
	nrpe-directory_for_configs.diff 
Log Message:
Added /etc/nrpe.d (bz# 515324)

nrpe-directory_for_configs.diff:
 nrpe.cfg.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nrpe-directory_for_configs.diff ---
diff -up nrpe-2.12/sample-config/nrpe.cfg.in.orig nrpe-2.12/sample-config/nrpe.cfg.in
--- nrpe-2.12/sample-config/nrpe.cfg.in.orig	2009-08-03 19:49:20.000000000 +0200
+++ nrpe-2.12/sample-config/nrpe.cfg.in	2009-08-03 19:50:43.000000000 +0200
@@ -169,8 +169,7 @@ connection_timeout=300
 # This directive allows you to include definitions from config files (with a
 # .cfg extension) in one or more directories (with recursion).
 
-#include_dir=<somedirectory>
-#include_dir=<someotherdirectory>
+include_dir=/etc/nrpe.d/
 
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 16:14:08 -0000	1.1
+++ import.log	24 Sep 2009 15:01:05 -0000	1.2
@@ -1 +1,2 @@
 nrpe-2_12-6_fc10:EL-4:nrpe-2.12-6.fc10.src.rpm:1233591215
+nrpe-2_12-11_fc11:EL-4:nrpe-2.12-11.fc11.src.rpm:1253804429


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-4/nrpe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nrpe.spec	2 Feb 2009 16:14:09 -0000	1.5
+++ nrpe.spec	24 Sep 2009 15:01:05 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 6%{?dist}
+Release: 11%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/nagio
 Source1: nrpe.sysconfig
 Patch0: nrpe-initreload.patch
 Patch1:	nrpe-read-extra-conf.patch
+Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +27,7 @@ Provides: nagios-nrpe = %{version}-%{rel
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -41,7 +42,7 @@ Provides: check_nrpe = %{version}-%{rele
 %description -n nagios-plugins-nrpe
 Nrpe is a system daemon that will execute various Nagios plugins
 locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin.  Various plugins that can be executed by the 
+check_nrpe plugin.  Various plugins that can be executed by the
 daemon are available at:
 http://sourceforge.net/projects/nagiosplug
 
@@ -51,6 +52,7 @@ This package provides the nrpe plugin fo
 %setup -q
 %patch0 -p0
 %patch1 -p0 -b .sysconfig
+%patch2 -p1 -b .dir
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -76,6 +78,8 @@ install -D -p -m 0644 sample-config/nrpe
 install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
 install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
 install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}%{_sysconfdir}/nrpe.d
+
 
 %clean
 rm -rf %{buildroot}
@@ -102,16 +106,32 @@ fi
 %{_initrddir}/nrpe
 %{_sbindir}/nrpe
 %dir %{_sysconfdir}/nagios
+%dir %{_sysconfdir}/nrpe.d
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
 %{_libdir}/nagios/*
-%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
+%doc Changelog LEGAL README
 
 %changelog
+* Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
+- Fixed BZ# 515324
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 2.12-7
+- Re-fix for 477527
+
 * Mon Feb  2 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-6
 - Fixed BZ# 449174
 - Clean up (in order to disable rpmlint warnings)



From mlichvar at fedoraproject.org  Thu Sep 24 15:08:33 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 24 Sep 2009 15:08:33 +0000 (UTC)
Subject: rpms/newt/devel .cvsignore, 1.25, 1.26 newt.spec, 1.60, 1.61 sources,
	1.26, 1.27
Message-ID: <20090924150833.C1D8F11C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/newt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31507

Modified Files:
	.cvsignore newt.spec sources 
Log Message:
- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)
- use full textbox width when reflowing and allow minimal width 1
- fix writing lines longer than width in textbox
- don't use va_list in newtvwindow more than once (#523696)
- bind \E[Z to back-tab in built-in keymap (#468046)
- terminate string after reading file in whiptail
- add newtRadioSetCurrent function (Thomas Jarosch)
- add pkgconfig support (Thomas Jarosch)
- add Malay, Malayalam, Assamese, Gujarati, Bengali India, Kannada, Telugu
  translations
- include tutorial in txt format
- include debian patches
  - fix crash in textbox SetText when topLines != 0
  - don't link modules with libraries already linked with libnewt
  - add Asturian and Marathi translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/newt/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 Jul 2008 13:07:41 -0000	1.25
+++ .cvsignore	24 Sep 2009 15:08:31 -0000	1.26
@@ -1 +1 @@
-newt-0.52.10.tar.gz
+newt-0.52.11.tar.gz


Index: newt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/newt/devel/newt.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- newt.spec	25 Jul 2009 19:15:53 -0000	1.60
+++ newt.spec	24 Sep 2009 15:08:31 -0000	1.61
@@ -1,13 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: A library for text mode user interfaces
 Name: newt
-Version: 0.52.10
-Release: 4%{?dist}
+Version: 0.52.11
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: https://fedorahosted.org/newt/
 Source: https://fedorahosted.org/releases/n/e/newt/newt-%{version}.tar.gz
 BuildRequires: popt-devel python-devel slang-devel
+BuildRequires: docbook-utils
 Provides: snack = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,6 +64,7 @@ providing a python API for creating text
 %configure --without-tcl
 make %{?_smp_mflags} all
 chmod 0644 peanuts.py popcorn.py
+docbook2txt tutorial.sgml
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,9 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr (-,root,root)
-%doc tutorial.sgml
+%doc tutorial.*
 %{_includedir}/newt.h
 %{_libdir}/libnewt.so
+%{_libdir}/pkgconfig/libnewt.pc
 
 %files static
 %defattr(-,root,root)
@@ -101,6 +104,23 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*.py*
 
 %changelog
+* Thu Sep 24 2009 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.11-1
+- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)
+- use full textbox width when reflowing and allow minimal width 1
+- fix writing lines longer than width in textbox
+- don't use va_list in newtvwindow more than once (#523696)
+- bind \E[Z to back-tab in built-in keymap (#468046)
+- terminate string after reading file in whiptail
+- add newtRadioSetCurrent function (Thomas Jarosch)
+- add pkgconfig support (Thomas Jarosch)
+- add Malay, Malayalam, Assamese, Gujarati, Bengali India, Kannada, Telugu
+  translations
+- include tutorial in txt format
+- include debian patches
+  - fix crash in textbox SetText when topLines != 0
+  - don't link modules with libraries already linked with libnewt
+  - add Asturian and Marathi translations
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.52.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/newt/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	30 Jul 2008 13:07:42 -0000	1.26
+++ sources	24 Sep 2009 15:08:31 -0000	1.27
@@ -1 +1 @@
-bcbcc87ec19ba37d34f819209afa2e15  newt-0.52.10.tar.gz
+4b9a0685ecd180c42d2c4a5806e3fc52  newt-0.52.11.tar.gz



From kasal at fedoraproject.org  Thu Sep 24 15:22:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 24 Sep 2009 15:22:12 +0000 (UTC)
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.43,1.44
Message-ID: <20090924152212.E6E3B11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3999

Modified Files:
	perl-DBI.spec 
Log Message:
- provide versioned perl(DBI)


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- perl-DBI.spec	26 Jul 2009 05:22:14 -0000	1.43
+++ perl-DBI.spec	24 Sep 2009 15:22:12 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.609
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# The automated scripts are not able to get the version for this:
+Provides:	perl(DBI) = %{version}
 
 %description 
 DBI is a database access Application Programming Interface (API) for
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Stepan Kasal <skasal at redhat.com> - 1.609-3
+- provide versioned perl(DBI)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.609-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Thu Sep 24 15:24:11 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 24 Sep 2009 15:24:11 +0000 (UTC)
Subject: rpms/xmlto/devel xmlto.spec,1.51,1.52
Message-ID: <20090924152411.8E67211C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4894

Modified Files:
	xmlto.spec 
Log Message:
ensure the default shell is /bin/bash instead of /bin/sh


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xmlto.spec	21 Sep 2009 13:51:15 -0000	1.51
+++ xmlto.spec	24 Sep 2009 15:24:09 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
@@ -60,7 +60,7 @@ xhtml1 source format.
 %setup -q
 
 %build
-%configure
+%configure BASH=/bin/bash
 make %{?_smp_mflags}
 
 %check
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 24 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.23-2
+- ensure the default shell is /bin/bash instead of /bin/sh
+
 * Mon Sep 21 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.23-1
 - New version 0.0.23
 - added autodetection for more common tools like



From crobinso at fedoraproject.org  Thu Sep 24 15:47:36 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu, 24 Sep 2009 15:47:36 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.0-fix-path-perms.patch,
	NONE, 1.1 virt-manager-0.8.0-refresh-disk-space.patch, NONE,
	1.1 virtinst-0.500.0-change-path-perms.patch, NONE,
	1.1 virtinst-0.500.0-no-iso-driver.patch, NONE,
	1.1 virt-manager.spec, 1.59, 1.60
Message-ID: <20090924154736.4E9A411C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11358

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-fix-path-perms.patch 
	virt-manager-0.8.0-refresh-disk-space.patch 
	virtinst-0.500.0-change-path-perms.patch 
	virtinst-0.500.0-no-iso-driver.patch 
Log Message:
Fix cdrom installs where the iso is a storage volume (bz 524109)
Fix path permissions for kernel/initrd download location (bz 523960)


virt-manager-0.8.0-fix-path-perms.patch:
 addhardware.py |    7 ++++
 choosecd.py    |    5 +++
 config.py      |   12 +++++++
 connection.py  |    7 ++++
 create.py      |   90 +++++++++++++++++++++++++++++++++++++++++++++++----------
 error.py       |   58 ++++++++++++++++++++++++++++++++++++
 6 files changed, 164 insertions(+), 15 deletions(-)

--- NEW FILE virt-manager-0.8.0-fix-path-perms.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253738576 14400
# Node ID e7ee75a8f1353f2c42df93b5090b05fbdf89720a
# Parent  292a065aad7e4e5e5d50a71337efab2361378313
Add dialog-with-checkbox helper functions.

Useful for things like "Don't show this again'.

diff -r 292a065aad7e -r e7ee75a8f135 src/virtManager/error.py
--- a/src/virtManager/error.py	Wed Sep 23 11:49:35 2009 -0400
+++ b/src/virtManager/error.py	Wed Sep 23 16:42:56 2009 -0400
@@ -131,3 +131,61 @@
     def ok_cancel(self, text1, text2=None):
         return self._show_warning(gtk.BUTTONS_OK_CANCEL, text1, text2)
 
+    def warn_chkbox(self, text1, text2=None, chktext=None):
+        chkbox = vmmCheckDialog(self.parent, gtk.MESSAGE_WARNING)
+        return chkbox.show_chkbox(text1, text2, chktext)
+
+    def err_chkbox(self, text1, text2=None, chktext=None):
+        chkbox = vmmCheckDialog(self.parent, gtk.MESSAGE_ERROR)
+        return chkbox.show_chkbox(text1, text2, chktext)
+
+class vmmCheckDialog (gtk.MessageDialog):
+    def __init__ (self, parent=None, typ=gtk.MESSAGE_INFO):
+        if typ == gtk.MESSAGE_WARNING:
+            buttons = gtk.BUTTONS_OK_CANCEL
+        else:
+            buttons = gtk.BUTTONS_OK
+
+        gtk.MessageDialog.__init__ (self, parent, 0, typ, buttons)
+
+        self.connect("response", self.response_cb)
+        self.connect("delete-event", self.hide_on_delete)
+        self.set_title("")
+
+        self.chk_vbox = gtk.VBox(False, False)
+        self.chk_vbox.set_spacing(0)
+
+        self.chk_align = gtk.Alignment()
+        self.chk_align.set_padding(0, 0, 62, 0)
+        self.chk_align.add(self.chk_vbox)
+
+        self.chk_align.show_all()
+        self.vbox.pack_start(self.chk_align)
+
+    def response_cb(self, src, ignore):
+        src.hide()
+
+    def show_chkbox(self, text1, text2=None, chktext=None):
+        chkbox = None
+        res = None
+        chkres = None
+
+        self.hide()
+        for c in self.chk_vbox.get_children():
+            self.chk_vbox.remove(c)
+
+        self.set_property("text", text1)
+
+        if text2:
+            self.format_secondary_text(text2)
+
+        if chktext:
+            chkbox = gtk.CheckButton(chktext)
+            self.chk_vbox.add(chkbox)
+            chkbox.show()
+
+        res = self.run() in [ gtk.RESPONSE_YES, gtk.RESPONSE_OK ]
+        if chktext:
+            res = [res, chkbox.get_active()]
+
+        return res
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253738620 14400
# Node ID f5f3ff4f8942d631234f8e008d806bd502c58bc3
# Parent  e7ee75a8f1353f2c42df93b5090b05fbdf89720a
connection: Add is_qemu_system helper.

diff -r e7ee75a8f135 -r f5f3ff4f8942 src/virtManager/connection.py
--- a/src/virtManager/connection.py	Wed Sep 23 16:42:56 2009 -0400
+++ b/src/virtManager/connection.py	Wed Sep 23 16:43:40 2009 -0400
@@ -201,6 +201,13 @@
     def is_nodedev_capable(self):
         return virtinst.NodeDeviceParser.is_nodedev_capable(self.vmm)
 
+    def is_qemu_system(self):
+        (scheme, ignore, ignore,
+         path, ignore, ignore) = virtinst.util.uri_split(self.uri)
+        if path == "/system" and scheme.startswith("qemu"):
+            return True
+        return False
+
     def is_qemu_session(self):
         (scheme, ignore, ignore,
          path, ignore, ignore) = virtinst.util.uri_split(self.uri)
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253806909 14400
# Node ID cfcd19d057ddc973a129e7816cd4ea39f0d4365a
# Parent  f5f3ff4f8942d631234f8e008d806bd502c58bc3
create: Don't prompt with same dialog multiple times.

diff -r f5f3ff4f8942 -r cfcd19d057dd src/virtManager/create.py
--- a/src/virtManager/create.py	Wed Sep 23 16:43:40 2009 -0400
+++ b/src/virtManager/create.py	Thu Sep 24 11:41:49 2009 -0400
@@ -1122,7 +1122,7 @@
             if pagenum == PAGE_NAME:
                 return self.validate_name_page()
             elif pagenum == PAGE_INSTALL:
-                return self.validate_install_page()
+                return self.validate_install_page(revalidate=False)
             elif pagenum == PAGE_MEM:
                 return self.validate_mem_page()
             elif pagenum == PAGE_STORAGE:
@@ -1135,7 +1135,7 @@
                     return False
                 elif not self.validate_mem_page():
                     return False
-                return self.validate_storage_page()
+                return self.validate_storage_page(revalidate=False)
 
             elif pagenum == PAGE_FINISH:
                 # Since we allow the user to change to change HV type + arch
@@ -1169,7 +1169,7 @@
 
         return True
 
-    def validate_install_page(self):
+    def validate_install_page(self, revalidate=True):
         instmethod = self.get_config_install_page()
         installer = None
         location = None
@@ -1270,7 +1270,7 @@
 
         return True
 
-    def validate_storage_page(self):
+    def validate_storage_page(self, revalidate=True):
         use_storage = self.window.get_widget("enable-storage").get_active()
 
         self.guest.disks = []
@@ -1296,19 +1296,21 @@
             return self.verr(_("Storage parameter error."), str(e))
 
         isfatal, errmsg = disk.is_size_conflict()
-        if not isfatal and errmsg:
+        if not revalidate and not isfatal and errmsg:
             # Fatal errors are reported when setting 'size'
             res = self.err.ok_cancel(_("Not Enough Free Space"), errmsg)
             if not res:
                 return False
 
         # Disk collision
-        if disk.is_conflict_disk(self.guest.conn):
-            return self.err.yes_no(_('Disk "%s" is already in use by another '
-                                     'guest!' % disk.path),
-                                   _("Do you really want to use the disk?"))
-        else:
-            return True
+        if not revalidate and disk.is_conflict_disk(self.guest.conn):
+            res = self.err.yes_no(_('Disk "%s" is already in use by another '
+                                    'guest!' % disk.path),
+                                  _("Do you really want to use the disk?"))
+            if not res:
+                return False
+
+        return True
 
     def validate_final_page(self):
         nettype, devname, macaddr = self.get_config_network_info()
diff -r 343b42ebee5b src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/addhardware.py	Thu Sep 24 11:44:49 2009 -0400
@@ -31,6 +31,7 @@
 import virtinst
 from virtinst import VirtualCharDevice, VirtualDevice, VirtualVideoDevice
 
+import virtManager.create
 import virtManager.util as vmmutil
 from virtManager.asyncjob import vmmAsyncJob
 from virtManager.error import vmmErrorDialog
@@ -1054,6 +1055,7 @@
                 return self.err.val_err(_("Hardware Type Required"), \
                                         _("You must specify what type of hardware to add."))
             self._dev = None
+
         elif page_num == PAGE_DISK:
             path = self.get_config_disk_image()
             if path == None or len(path) == 0:
@@ -1102,6 +1104,11 @@
                                       _("Do you really want to use the disk?"))
                 return res
 
+            # Make sure qemu can access path
+            virtManager.create.check_path_search_for_qemu(self,
+                                                          self.vm.connection,
+                                                          self._dev.path)
+
         elif page_num == PAGE_NETWORK:
             net = self.get_config_network()
             if self.window.get_widget("net-type-network").get_active():
diff -r 343b42ebee5b src/virtManager/choosecd.py
--- a/src/virtManager/choosecd.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/choosecd.py	Thu Sep 24 11:44:49 2009 -0400
@@ -24,6 +24,7 @@
 import virtinst
 
 import virtManager.opticalhelper
+import virtManager.create
 from virtManager.storagebrowse import vmmStorageBrowser
 from virtManager.error import vmmErrorDialog
 
@@ -108,6 +109,10 @@
         except Exception, e:
             return self.err.val_err(_("Invalid Media Path"), str(e))
 
+        # Make sure qemu can access the path
+        virtManager.create.check_path_search_for_qemu(self, self.conn,
+                                                      disk.path)
+
         self.emit("cdrom-chosen", disk.type, disk.path, self.dev_id_info)
         self.cancel()
 
diff -r 343b42ebee5b src/virtManager/config.py
--- a/src/virtManager/config.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/config.py	Thu Sep 24 11:44:49 2009 -0400
@@ -558,3 +558,15 @@
         else:
             return os.getcwd()
 
+    def add_perms_fix_ignore(self, pathlist):
+        current_list = self.get_perms_fix_ignore() or []
+        for path in pathlist:
+            if path in current_list:
+                continue
+            current_list.append(path)
+        self.conf.set_list(self.conf_dir + "/paths/perms_fix_ignore",
+                           gconf.VALUE_STRING,
+                           current_list)
+    def get_perms_fix_ignore(self):
+        return self.conf.get_list(self.conf_dir + "/paths/perms_fix_ignore",
+                                  gconf.VALUE_STRING)
diff -r 343b42ebee5b src/virtManager/create.py
--- a/src/virtManager/create.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/create.py	Thu Sep 24 11:44:49 2009 -0400
@@ -30,6 +30,7 @@
 
 import virtinst
 from virtinst import VirtualNetworkInterface
+from virtinst import VirtualDisk
 
 import virtManager.opticalhelper
 from virtManager import util
@@ -53,6 +54,54 @@
 INSTALL_PAGE_URL = 1
 INSTALL_PAGE_PXE = 2
 
+def check_path_search_for_qemu(vmm_obj, conn, path):
+    if conn.is_remote() or not conn.is_qemu_system():
+        return
+
+    user = "qemu"
+
+    skip_paths = vmm_obj.config.get_perms_fix_ignore()
+    broken_paths = VirtualDisk.check_path_search_for_user(conn.vmm, path, user)
+    for p in broken_paths:
+        if p in skip_paths:
+            broken_paths.remove(p)
+
+    if not broken_paths:
+        return
+
+    logging.debug("No search access for dirs: %s" % broken_paths)
+    resp, chkres = vmm_obj.err.warn_chkbox(
+                    _("The emulator may not have search permissions "
+                      "for the path '%s'.") % path,
+                    _("Do you want to correct this now?"),
+                    _("Don't ask about these directories again."))
+
+    if chkres:
+        vmm_obj.config.add_perms_fix_ignore(broken_paths)
+    if not resp:
+        return
+
+    logging.debug("Attempting to correct permission issues.")
+    errors = VirtualDisk.fix_path_search_for_user(conn.vmm, path, user)
+    if not errors:
+        return
+
+    errmsg = _("Errors were encountered changing permissions for the "
+               "following directories:")
+    details = ""
+    for path, error in errors.items():
+        if path not in broken_paths:
+            continue
+        details += "%s : %s\n" % (path, error)
+
+    logging.debug("Permission errors:\n%s" % details)
+
+    ignore, chkres = vmm_obj.err.err_chkbox(errmsg, details,
+                         _("Don't ask about these directories again."))
+
+    if chkres:
+        vmm_obj.config.add_perms_fix_ignore(errors.keys())
+
 class vmmCreate(gobject.GObject):
     __gsignals__ = {
         "action-show-console": (gobject.SIGNAL_RUN_FIRST,
@@ -1245,6 +1294,11 @@
             return self.err.val_err(_("Error setting OS information."),
                                     str(e))
 
+        if instmethod == INSTALL_PAGE_ISO and not revalidate:
+            # Check if 'qemu' user can access disk
+            check_path_search_for_qemu(self, self.conn,
+                                       self.guest.installer.location)
+
         # Validation passed, store the install path (if there is one) in
         # gconf
         self.get_config_local_media(store_media=True)
@@ -1286,10 +1340,10 @@
             if not diskpath:
                 return self.verr(_("A storage path must be specified."))
 
-            disk = virtinst.VirtualDisk(conn = self.conn.vmm,
-                                        path = diskpath,
-                                        size = disksize,
-                                        sparse = sparse)
+            disk = VirtualDisk(conn = self.conn.vmm,
+                               path = diskpath,
+                               size = disksize,
+                               sparse = sparse)
 
             self.guest.disks.append(disk)
         except Exception, e:
@@ -1310,6 +1364,10 @@
             if not res:
                 return False
 
+        if not revalidate:
+            # Check if 'qemu' user can access disk
+            check_path_search_for_qemu(self, self.conn, disk.path)
+
         return True
 
     def validate_final_page(self):

virt-manager-0.8.0-refresh-disk-space.patch:
 create.py |   40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

--- NEW FILE virt-manager-0.8.0-refresh-disk-space.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253563791 14400
# Node ID f75237b0a84e73552a55ef0121215633c4530879
# Parent  d3b377306a994f66cd1c03f3bcbef17c4b060720
Use timer to refresh available disk space in 'New VM' wizard (bz 502777)

diff -r d3b377306a99 -r f75237b0a84e src/virtManager/create.py
--- a/src/virtManager/create.py	Thu Sep 17 13:45:53 2009 -0400
+++ b/src/virtManager/create.py	Mon Sep 21 16:09:51 2009 -0400
@@ -93,6 +93,10 @@
         # 'Guest' class from the previous failed install
         self.failed_guest = None
 
+        # Host space polling
+        self.host_storage_timer = None
+        self.host_storage = None
+
         self.window.signal_autoconnect({
             "on_vmm_newcreate_delete_event" : self.close,
 
@@ -136,8 +140,18 @@
 
     def close(self, ignore1=None, ignore2=None):
         self.topwin.hide()
+        self.remove_timers()
+
         return 1
 
+    def remove_timers(self):
+        try:
+            if self.host_storage_timer:
+                gobject.source_remote(self.host_storage_timer)
+                self.host_storage_timer = None
+        except:
+            pass
+
     def set_conn(self, newconn):
         if self.conn == newconn:
             return
@@ -303,9 +317,11 @@
         self.window.get_widget("config-cpus").set_value(1)
 
         # Storage
+        if not self.host_storage_timer:
+            self.host_storage_timer = gobject.timeout_add(3 * 1000,
+                                                          self.host_space_tick)
         self.window.get_widget("enable-storage").set_active(True)
         self.window.get_widget("config-storage-create").set_active(True)
-        # FIXME: Make sure this doesn't exceed host?
         self.window.get_widget("config-storage-size").set_value(8)
         self.window.get_widget("config-storage-entry").set_text("")
         self.window.get_widget("config-storage-nosparse").set_active(True)
@@ -437,11 +453,6 @@
         # Storage
         have_storage = (is_local or is_storage_capable)
         storage_tooltip = None
-        max_storage = self.host_disk_space()
-        hd_label = "%s available on the host" % self.pretty_storage(max_storage)
-        hd_label = ("<span color='#484848'>%s</span>" % hd_label)
-        self.window.get_widget("phys-hd-label").set_markup(hd_label)
-        self.window.get_widget("config-storage-size").set_range(1, max_storage)
 
         use_storage = self.window.get_widget("config-storage-select")
         storage_area = self.window.get_widget("config-storage-area")
@@ -863,6 +874,7 @@
             # FIXME: use a conn specific function after we send pool-added
             pool = virtinst.util.lookup_pool_by_path(self.conn.vmm, path)
             if pool:
+                pool.refresh(0)
                 avail = int(virtinst.util.get_xml_path(pool.XMLDesc(0),
                                                        "/pool/available"))
 
@@ -870,7 +882,21 @@
             vfs = os.statvfs(os.path.dirname(path))
             avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
 
-        return int(avail / 1024.0 / 1024.0 / 1024.0)
+        return float(avail / 1024.0 / 1024.0 / 1024.0)
+
+    def host_space_tick(self):
+        max_storage = self.host_disk_space()
+        if self.host_storage == max_storage:
+            return 1
+        self.host_storage = max_storage
+
+        hd_label = ("%s available in the default location" %
+                    self.pretty_storage(max_storage))
+        hd_label = ("<span color='#484848'>%s</span>" % hd_label)
+        self.window.get_widget("phys-hd-label").set_markup(hd_label)
+        self.window.get_widget("config-storage-size").set_range(1, self.host_storage)
+
+        return 1
 
     def get_config_network_info(self):
         netidx = self.window.get_widget("config-netdev").get_active()

virtinst-0.500.0-change-path-perms.patch:
 Installer.py   |   20 +++++++---
 VirtualDisk.py |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 120 insertions(+), 8 deletions(-)

--- NEW FILE virtinst-0.500.0-change-path-perms.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253738317 14400
# Node ID 53cd275974ab35a790b4c4bf1424d0950d5b095e
# Parent  aff98f0152935ad7cd57e86c4172a6683e6306c5
VirtualDisk: Add methods for checking/changing path perms for username.

Since libvirtd can now run qemu processes as non-root, the tools need to
try to check directory permissions and make sure they are at least searchable
by a specific username. This simply implements the functions to make that
happen.

diff -r aff98f015293 -r 53cd275974ab virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Mon Sep 21 15:52:04 2009 -0400
+++ b/virtinst/VirtualDisk.py	Wed Sep 23 16:38:37 2009 -0400
@@ -19,9 +19,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
-import os, statvfs
+import os, stat, pwd, statvfs
 import subprocess
 import logging
+import re
+
 import urlgrabber.progress as progress
 import libvirt
 
@@ -69,6 +71,46 @@
 
     return fmt
 
+def _name_uid(user):
+    """
+    Return UID for string username
+    """
+    pwdinfo = pwd.getpwnam(user)
+    return pwdinfo[2]
+
+def _is_dir_searchable(uid, username, path):
+    """
+    Check if passed directory is searchable by uid
+    """
+    try:
+        statinfo = os.stat(path)
+    except OSError:
+        return False
+
+    if uid == statinfo.st_uid:
+        flag = stat.S_IXUSR
+    elif uid == statinfo.st_gid:
+        flag = stat.S_IXGRP
+    else:
+        flag = stat.S_IXOTH
+
+    if bool(statinfo.st_mode & flag):
+        return True
+
+    # Check POSIX ACL (since that is what we use to 'fix' access)
+    cmd = ["getfacl", path]
+    proc = subprocess.Popen(cmd,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
+    out, err = proc.communicate()
+
+    if proc.returncode != 0:
+        logging.debug("Cmd '%s' failed: %s" % (cmd, err))
+        return False
+
+    return bool(re.search("user:%s:..x" % username, out))
+
+
 class VirtualDisk(VirtualDevice):
     """
     Builds a libvirt domain disk xml description
@@ -156,6 +198,63 @@
 
         return False
 
+    @staticmethod
+    def check_path_search_for_user(conn, path, username):
+        """
+        Check if the passed user has search permissions for all the
+        directories in the disk path.
+
+        @return: List of the directories the user cannot search, or empty list
+        @rtype : C{list}
+        """
+        if _util.is_uri_remote(conn.getURI()):
+            return []
+
+        uid = _name_uid(username)
+        fixlist = []
+
+        dirname, base = os.path.split(path)
+        while base:
+            if not _is_dir_searchable(uid, username, dirname):
+                fixlist.append(dirname)
+
+            dirname, base = os.path.split(dirname)
+
+        return fixlist
+
+    @staticmethod
+    def fix_path_search_for_user(conn, path, username):
+        """
+        Try to fix any permission problems found by check_path_search_for_user
+
+        @return: Return a dictionary of entries { broken path : error msg }
+        @rtype : C{dict}
+        """
+        fixlist = VirtualDisk.check_path_search_for_user(conn, path, username)
+        if not fixlist:
+            return []
+
+        fixlist.reverse()
+        errdict = {}
+
+        for dirname in fixlist:
+            try:
+                cmd = ["setfacl", "--modify", "user:%s:x" % username, dirname]
+                proc = subprocess.Popen(cmd,
+                                        stdout=subprocess.PIPE,
+                                        stderr=subprocess.PIPE)
+                out, err = proc.communicate()
+
+                logging.debug("Cmd '%s' output: \nout=%s, \nerr=%s" %
+                              (cmd, out, err))
+                if proc.returncode != 0:
+                    raise ValueError(err)
+            except Exception, e:
+                errdict[dirname] =  str(e)
+
+        return errdict
+
+
     def __init__(self, path=None, size=None, transient=False, type=None,
                  device=DEVICE_DISK, driverName=None, driverType=None,
                  readOnly=False, sparse=True, conn=None, volObject=None,
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253741935 14400
# Node ID a523260ac56eb90e1eda067c2bbd5fc726bb0165
# Parent  53cd275974ab35a790b4c4bf1424d0950d5b095e
VirtualDisk: Teach perms changing functions about a target directory.

diff -r 53cd275974ab -r a523260ac56e virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Wed Sep 23 16:38:37 2009 -0400
+++ b/virtinst/VirtualDisk.py	Wed Sep 23 17:38:55 2009 -0400
@@ -213,7 +213,12 @@
         uid = _name_uid(username)
         fixlist = []
 
-        dirname, base = os.path.split(path)
+        if os.path.isdir(path):
+            dirname = path
+            base = "-"
+        else:
+            dirname, base = os.path.split(path)
+
         while base:
             if not _is_dir_searchable(uid, username, dirname):
                 fixlist.append(dirname)
diff -r 53cd275974ab virtinst/Installer.py
--- a/virtinst/Installer.py	Wed Sep 23 16:38:37 2009 -0400
+++ b/virtinst/Installer.py	Wed Sep 23 17:32:14 2009 -0400
@@ -141,12 +141,20 @@
                 return XEN_SCRATCH
             if os.path.exists(LIBVIRT_SCRATCH):
                 return LIBVIRT_SCRATCH
-        else:
-            scratch = os.path.expanduser("~/.virtinst/boot")
-            if not os.path.exists(scratch):
-                os.makedirs(scratch, 0750)
-            _util.selinux_restorecon(scratch)
-            return scratch
+
+        scratch = os.path.expanduser("~/.virtinst/boot")
+        if not os.path.exists(scratch):
+            os.makedirs(scratch, 0751)
+
+        if (self.conn and
+            not _util.is_uri_remote(self.conn.getURI()) and
+            _util.is_qemu_system(self.conn.getURI())):
+            # If we are using local qemu:///system, try to make sure the
+            # download location is searchable by the 'qemu' user
+            VirtualDisk.fix_path_search_for_user(self.conn, scratch, "qemu")
+
+        _util.selinux_restorecon(scratch)
+        return scratch
     scratchdir = property(get_scratchdir)
 
     def get_cdrom(self):

virtinst-0.500.0-no-iso-driver.patch:
 b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml |   36 ++++++++++++++++++++++++
 tests/testdriver.xml                         |   16 ++++++++++
 tests/xmlconfig.py                           |    6 ++++
 virtinst/VirtualDisk.py                      |   40 ++++++++++++++++-----------
 4 files changed, 82 insertions(+), 16 deletions(-)

--- NEW FILE virtinst-0.500.0-no-iso-driver.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253562724 14400
# Node ID aff98f0152935ad7cd57e86c4172a6683e6306c5
# Parent  143b09da8bccc3b6b2069c29073ea5a6ef9ce69b
VirtualDisk: Don't use 'iso' as a qemu driver name (bz 524109)

diff -r 143b09da8bcc -r aff98f015293 tests/testdriver.xml
--- a/tests/testdriver.xml	Mon Sep 21 15:47:33 2009 -0400
+++ b/tests/testdriver.xml	Mon Sep 21 15:52:04 2009 -0400
@@ -67,6 +67,22 @@
     </target>
   </volume>
   <volume>
+    <name>iso-vol</name>
+    <capacity>1000000</capacity>
+    <allocation>50000</allocation>
+    <target>
+      <format type='iso'/>
+    </target>
+  </volume>
+  <volume>
+    <name>bochs-vol</name>
+    <capacity>1000000</capacity>
+    <allocation>50000</allocation>
+    <target>
+      <format type='bochs'/>
+    </target>
+  </volume>
+  <volume>
     <name>testvol1.img</name>
     <capacity>1000000</capacity>
     <allocation>50000</allocation>
diff -r 143b09da8bcc -r aff98f015293 tests/xmlconfig-xml/misc-qemu-iso-disk.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml	Mon Sep 21 15:52:04 2009 -0400
@@ -0,0 +1,36 @@
+<domain type='xen'>
+  <name>TestGuest</name>
+  <currentMemory>204800</currentMemory>
+  <memory>409600</memory>
+  <uuid>12345678-1234-1234-1234-123456789012</uuid>
+  <os>
+    <type arch='i686'>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='cdrom'/>
+  </os>
+  <features>
+    <acpi/><apic/>
+  </features>
+  <clock offset="utc"/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <vcpu>5</vcpu>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/default-pool/iso-vol'/>
+      <target dev='hda' bus='ide'/>
+    </disk>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu'/>
+      <source dev='/dev/loop0'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+    </disk>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='sdl' display=':3.4' xauth='/testdir/.Xauthority'/>
+    <console type='pty'/>
+  </devices>
+</domain>
diff -r 143b09da8bcc -r aff98f015293 tests/xmlconfig.py
--- a/tests/xmlconfig.py	Mon Sep 21 15:47:33 2009 -0400
+++ b/tests/xmlconfig.py	Mon Sep 21 15:52:04 2009 -0400
@@ -302,9 +302,15 @@
             g.disks.append(get_blkdisk())
             self._compare(g, "misc-qemu-driver-name", True)
 
+            VirtualDisk._get_uri = new_get_uri
             g = get_basic_fullyvirt_guest()
             g.disks.append(get_filedisk())
             self._compare(g, "misc-qemu-driver-type", True)
+
+            VirtualDisk._get_uri = new_get_uri
+            g = get_basic_fullyvirt_guest()
+            g.disks.append(get_filedisk("/default-pool/iso-vol"))
+            self._compare(g, "misc-qemu-iso-disk", True)
         finally:
             VirtualDisk._get_uri = oldgetdriver
 
diff -r 143b09da8bcc -r aff98f015293 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Mon Sep 21 15:47:33 2009 -0400
+++ b/virtinst/VirtualDisk.py	Mon Sep 21 15:52:04 2009 -0400
@@ -55,6 +55,20 @@
     except OSError:
         return False
 
+def _qemu_sanitize_drvtype(phystype, fmt):
+    """
+    Sanitize libvirt storage volume format to a valid qemu driver type
+    """
+    raw_list = [ "iso" ]
+
+    if phystype == VirtualDisk.TYPE_BLOCK:
+        return VirtualDisk.DRIVER_QEMU_RAW
+
+    if fmt in raw_list:
+        return VirtualDisk.DRIVER_QEMU_RAW
+
+    return fmt
+
 class VirtualDisk(VirtualDevice):
     """
     Builds a libvirt domain disk xml description
@@ -490,8 +504,8 @@
 
         http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
         """
-        drvname = None
-        drvtype = None
+        drvname = self._driverName
+        drvtype = self._driverType
 
         if self.conn:
             driver = _util.get_uri_driver(self._get_uri())
@@ -499,15 +513,15 @@
                 drvname = self.DRIVER_QEMU
 
         if self.vol_object:
-            drvtype = _util.get_xml_path(self.vol_object.XMLDesc(0),
-                                         "/volume/target/format/@type")
+            fmt = _util.get_xml_path(self.vol_object.XMLDesc(0),
+                                     "/volume/target/format/@type")
+            if drvname == self.DRIVER_QEMU:
+                drvtype = _qemu_sanitize_drvtype(self.type, fmt)
 
         elif self.vol_install:
             if drvname == self.DRIVER_QEMU:
-                if self.vol_install.file_type == libvirt.VIR_STORAGE_VOL_FILE:
-                    drvtype = self.vol_install.format
-                else:
-                    drvtype = self.DRIVER_QEMU_RAW
+                drvtype = _qemu_sanitize_drvtype(self.type,
+                                                 self.vol_install.format)
 
         elif self.__creating_storage():
             if drvname == self.DRIVER_QEMU:
@@ -729,8 +743,10 @@
         managed_storage = self.__storage_specified()
         create_media = self.__creating_storage()
 
+        self.__set_dev_type()
         self.__set_size()
         self.__set_format()
+        self.__set_driver()
 
         if not self.selinux_label:
             # If we are using existing storage, pull the label from it
@@ -745,9 +761,6 @@
 
             self._selinux_label = context or ""
 
-        # Set driverName + driverType
-        self.__set_driver()
-
         # If not creating the storage, our job is easy
         if not create_media:
             # Make sure we have access to the local path
@@ -757,7 +770,6 @@
                     raise ValueError(_("The path '%s' must be a file or a "
                                        "device, not a directory") % self.path)
 
-            self.__set_dev_type()
             return True
 
 
@@ -770,7 +782,6 @@
             if self.type is self.TYPE_BLOCK:
                 raise ValueError, _("Local block device path '%s' must "
                                     "exist.") % self.path
-            self.set_type(self.TYPE_FILE, validate=False)
 
             # Path doesn't exist: make sure we have write access to dir
             if not os.access(os.path.dirname(self.path), os.R_OK):
@@ -782,9 +793,6 @@
             if not os.access(os.path.dirname(self.path), os.W_OK):
                 raise ValueError, _("No write access to directory '%s'") % \
                                     os.path.dirname(self.path)
-        else:
-            # Set dev type from existing storage
-            self.__set_dev_type()
 
         # Applicable for managed or local storage
         ret = self.is_size_conflict()


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- virt-manager.spec	17 Sep 2009 20:44:01 -0000	1.59
+++ virt-manager.spec	24 Sep 2009 15:47:35 -0000	1.60
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 4%{_extra_release}
+Release: 5%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -36,6 +36,10 @@ Patch6: %{name}-%{version}-conn-close-ex
 Patch7: %{name}-%{version}-manager-ui-tweaks.patch
 # Generate better errors is disk/net stats polling fails
 Patch8: %{name}-%{version}-stats-logging.patch
+# Refresh host disk space in create wizard (bz 502777)
+Patch9: %{name}-%{version}-refresh-disk-space.patch
+# Offer to fix disk permission issues (bz 517379)
+Patch10: %{name}-%{version}-fix-path-perms.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -61,7 +65,7 @@ Requires: gnome-python2-gnome
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.500.0
+Requires: python-virtinst >= 0.500.0-4
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -111,6 +115,8 @@ cp %{SOURCE3} pixmaps
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 %configure
@@ -184,6 +190,10 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Sep 24 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-5.fc12
+- Refresh host disk space in create wizard (bz 502777)
+- Offer to fix disk permission issues (bz 517379)
+
 * Thu Sep 17 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-4.fc12
 - Don't close libvirt connection for non-fatal errors (bz 522168)
 - Manager UI tweaks



From kasal at fedoraproject.org  Thu Sep 24 15:52:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 24 Sep 2009 15:52:23 +0000 (UTC)
Subject: rpms/perl-DBD-Pg/devel .cvsignore, 1.22, 1.23 perl-DBD-Pg.spec, 1.53,
	1.54 sources, 1.23, 1.24
Message-ID: <20090924155223.28B6011C00DB@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-serv12760

Modified Files:
	.cvsignore perl-DBD-Pg.spec sources 
Log Message:
- new upstream version
- add versioned provide (#525502)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-Pg/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	4 May 2009 12:35:26 -0000	1.22
+++ .cvsignore	24 Sep 2009 15:52:22 -0000	1.23
@@ -1 +1 @@
-DBD-Pg-2.13.1.tar.gz
+DBD-Pg-2.15.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.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- perl-DBD-Pg.spec	26 Jul 2009 05:21:12 -0000	1.53
+++ perl-DBD-Pg.spec	24 Sep 2009 15:52:22 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
-Version:        2.13.1
-Release:        3%{?dist}
+Version:        2.15.1
+Release:        1%{?dist}
 Summary:        A PostgreSQL interface for perl
 
 Group:          Development/Libraries
@@ -16,7 +16,9 @@ BuildRequires:  perl(DBI) >= 1.607
 BuildRequires:  postgresql-devel >= 7.2
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(DBI) >= 1.38
+
+# Missed by the find provides script:
+Provides:       perl(DBD::Pg) = %{version}
 
 %description 
 An implementation of DBI for PostgreSQL for Perl.
@@ -60,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Stepan Kasal <skasal at redhat.com> - 2.15.1-1
+- new upstream version
+- add versioned provide (#525502)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-Pg/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	4 May 2009 12:35:26 -0000	1.23
+++ sources	24 Sep 2009 15:52:22 -0000	1.24
@@ -1 +1 @@
-4e16c70109146d18a11a5170d30b305a  DBD-Pg-2.13.1.tar.gz
+b1c5488a68fa61cc3694b0cd4e413e25  DBD-Pg-2.15.1.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 24 15:53:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:53:22 +0000
Subject: [pkgdb] xen: jforbes has requested watchbugzilla
Message-ID: <20090924155322.5C21410F87C@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on xen (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/xen



From pkgdb at fedoraproject.org  Thu Sep 24 15:53:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:53:25 +0000
Subject: [pkgdb] xen: jforbes has requested watchcommits
Message-ID: <20090924155325.26BE810F890@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on xen (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/xen



From pkgdb at fedoraproject.org  Thu Sep 24 15:53:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:53:25 +0000
Subject: [pkgdb] xen: jforbes has requested commit
Message-ID: <20090924155327.320E810F89A@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on xen (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/xen



From pkgdb at fedoraproject.org  Thu Sep 24 15:53:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:53:41 +0000
Subject: [pkgdb] xen: jforbes has requested watchbugzilla
Message-ID: <20090924155341.F112D10F87C@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on xen (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/xen



From pkgdb at fedoraproject.org  Thu Sep 24 15:53:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:53:44 +0000
Subject: [pkgdb] xen: jforbes has requested watchcommits
Message-ID: <20090924155344.2267810F88A@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on xen (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/xen



From pkgdb at fedoraproject.org  Thu Sep 24 15:53:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:53:45 +0000
Subject: [pkgdb] xen: jforbes has requested commit
Message-ID: <20090924155346.00D9210F89E@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on xen (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/xen



From pkgdb at fedoraproject.org  Thu Sep 24 15:55:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:55:21 +0000
Subject: [pkgdb] libvirt: jforbes has requested watchbugzilla
Message-ID: <20090924155521.C003B10F86F@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on libvirt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libvirt



From pkgdb at fedoraproject.org  Thu Sep 24 15:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:55:22 +0000
Subject: [pkgdb] libvirt: jforbes has requested watchcommits
Message-ID: <20090924155523.8107B10F88A@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on libvirt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libvirt



From pkgdb at fedoraproject.org  Thu Sep 24 15:55:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:55:26 +0000
Subject: [pkgdb] libvirt: jforbes has requested commit
Message-ID: <20090924155526.61F8710F89B@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on libvirt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libvirt



From pkgdb at fedoraproject.org  Thu Sep 24 15:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:55:35 +0000
Subject: [pkgdb] libvirt: jforbes has requested watchbugzilla
Message-ID: <20090924155535.DDE0510F89E@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on libvirt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libvirt



From pkgdb at fedoraproject.org  Thu Sep 24 15:55:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:55:43 +0000
Subject: [pkgdb] libvirt: jforbes has requested watchcommits
Message-ID: <20090924155543.A1B7710F8A3@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on libvirt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libvirt



From pkgdb at fedoraproject.org  Thu Sep 24 15:55:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:55:45 +0000
Subject: [pkgdb] libvirt: jforbes has requested commit
Message-ID: <20090924155546.5731410F883@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on libvirt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/libvirt



From pkgdb at fedoraproject.org  Thu Sep 24 15:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:56:20 +0000
Subject: [pkgdb] virt-manager: jforbes has requested watchbugzilla
Message-ID: <20090924155620.BDDFA10F841@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 15:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:56:22 +0000
Subject: [pkgdb] virt-manager: jforbes has requested watchcommits
Message-ID: <20090924155623.24FCC10F89B@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 15:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:56:25 +0000
Subject: [pkgdb] virt-manager: jforbes has requested commit
Message-ID: <20090924155625.6DB9E10F8A1@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 15:56:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:56:36 +0000
Subject: [pkgdb] virt-manager: jforbes has requested watchbugzilla
Message-ID: <20090924155636.9E15710F87C@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 15:56:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:56:39 +0000
Subject: [pkgdb] virt-manager: jforbes has requested watchcommits
Message-ID: <20090924155639.132E710F8AC@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 15:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:56:43 +0000
Subject: [pkgdb] virt-manager: jforbes has requested commit
Message-ID: <20090924155643.35D2010F841@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:06 +0000
Subject: [pkgdb] virt-viewer: jforbes has requested watchbugzilla
Message-ID: <20090924155706.86AE010F890@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on virt-viewer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:08 +0000
Subject: [pkgdb] virt-viewer: jforbes has requested watchcommits
Message-ID: <20090924155708.C7A9310F89A@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on virt-viewer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:10 +0000
Subject: [pkgdb] virt-viewer: jforbes has requested commit
Message-ID: <20090924155710.213DB10F89D@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on virt-viewer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:17 +0000
Subject: [pkgdb] virt-viewer: jforbes has requested watchbugzilla
Message-ID: <20090924155717.278EF10F8A0@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on virt-viewer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:19 +0000
Subject: [pkgdb] virt-viewer: jforbes has requested watchcommits
Message-ID: <20090924155719.ED8A710F8A6@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on virt-viewer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:22 +0000
Subject: [pkgdb] virt-viewer: jforbes has requested commit
Message-ID: <20090924155722.762D410F8B4@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on virt-viewer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:35 +0000
Subject: [pkgdb] python-virtinst: jforbes has requested watchbugzilla
Message-ID: <20090924155735.0F09F10F87C@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:37 +0000
Subject: [pkgdb] python-virtinst: jforbes has requested watchcommits
Message-ID: <20090924155737.7956910F8A9@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:40 +0000
Subject: [pkgdb] python-virtinst: jforbes has requested commit
Message-ID: <20090924155740.233D310F8AD@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:47 +0000
Subject: [pkgdb] python-virtinst: jforbes has requested watchbugzilla
Message-ID: <20090924155747.ECD6010F8B0@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchbugzilla acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:49 +0000
Subject: [pkgdb] python-virtinst: jforbes has requested watchcommits
Message-ID: <20090924155749.ADF7610F841@bastion2.fedora.phx.redhat.com>

jforbes has requested the watchcommits acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 15:57:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 15:57:52 +0000
Subject: [pkgdb] python-virtinst: jforbes has requested commit
Message-ID: <20090924155752.A881810F8BE@bastion2.fedora.phx.redhat.com>

jforbes has requested the commit acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From jfch2222 at fedoraproject.org  Thu Sep 24 16:05:27 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 24 Sep 2009 16:05:27 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.168,1.169 sshd.init,1.3,1.4
Message-ID: <20090924160527.4BA2D11C00DB@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14867

Modified Files:
	openssh.spec sshd.init 
Log Message:
Repair initscript to be acord to guidelines



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- openssh.spec	24 Sep 2009 12:34:15 -0000	1.168
+++ openssh.spec	24 Sep 2009 16:05:26 -0000	1.169
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 27%{?dist}%{?rescue_rel}
+Release: 28%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,7 +466,7 @@ fi
 %endif
 
 %changelog
-* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-27
+* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-28
 - Repair initscript to be acord to guidelines (#521860)
 - Add bugzilla# to application of edns and xmodifiers patch
 


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sshd.init	24 Sep 2009 12:34:16 -0000	1.3
+++ sshd.init	24 Sep 2009 16:05:27 -0000	1.4
@@ -107,7 +107,7 @@ do_restart_sanity_check()
 {
 	$SSHD -t
 	RETVAL=$?
-	if [ ! "$RETVAL" = 0 ]; then
+	if [ $RETVAL -ne  0 ]; then
 		failure $"Configuration file or keys are invalid"
 		echo
 	fi
@@ -127,7 +127,7 @@ start()
 	echo -n $"Starting $prog: "
 	$SSHD $OPTIONS && success || failure
 	RETVAL=$?
-	[ "$RETVAL" = 0 ] && touch $lockfile
+	[ $RETVAL -eq 0 ] && touch $lockfile
 	echo
 	return $RETVAL
 }
@@ -148,7 +148,7 @@ stop()
 	    killall $prog 2>/dev/null
 	    trap TERM
 	fi
-	[ "$RETVAL" = 0 ] && rm -f $lockfile
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
 	echo
 }
 
@@ -174,7 +174,7 @@ force_reload() {
 }
 
 rh_status() {
-	status -p $PID_FILE $prog	#openssh-daemon
+	status -p $PID_FILE openssh-daemon
 }
 
 rh_status_q() {
@@ -187,7 +187,10 @@ case "$1" in
 		start
 		;;
 	stop)
-		rh_status_q || exit 0
+		if ! rh_status_q; then
+			rm -f $lockfile
+			exit 0
+		fi
 		stop
 		;;
 	restart)
@@ -200,16 +203,11 @@ case "$1" in
 	force-reload)
 		force_reload
 		;;
-	condrestart)
-		if [ -f /var/lock/subsys/$prog ]; then
-		    	restart
-		fi
-		;;
-	try-restart)
+	condrestart|try-restart)
 		rh_status_q || exit 0
 		if [ -f $lockfile ] ; then
 			do_restart_sanity_check
-			if [ "$RETVAL" = 0 ] ; then
+			if [ $RETVAL -eq 0 ] ; then
 				stop
 				# avoid race
 				sleep 3
@@ -222,6 +220,9 @@ case "$1" in
 	status)
 		rh_status
 		RETVAL=$?
+		if [ $RETVAL -eq 3 -a -f $lockfile ] ; then
+			RETVAL=2
+		fi
 		;;
 	*)
 		echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"



From cebbert at fedoraproject.org  Thu Sep 24 16:16:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 16:16:35 +0000 (UTC)
Subject: rpms/kernel/F-11 Makefile,1.103,1.104
Message-ID: <20090924161635.EC42411C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18411

Modified Files:
	Makefile 
Log Message:
add unused-kernel-patches target


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- Makefile	25 Jul 2009 03:16:38 -0000	1.103
+++ Makefile	24 Sep 2009 16:16:35 -0000	1.104
@@ -136,6 +136,9 @@ reconfig:
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
 	@$(MAKE) tag TAG_OPTS="-F $(TAG_OPTS)"
 
+unused-kernel-patches:
+	@for f in *.patch; do if [ -e $$f ]; then (egrep -q "^Patch[[:digit:]]+:[[:space:]]+$$f" $(SPECFILE) || echo "Unused:    $$f") && egrep -q "^ApplyPatch[[:space:]]+$$f|^ApplyOptionalPatch[[:space:]]+$$f" $(SPECFILE) || echo "Unapplied: $$f"; fi; done
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
 



From pkgdb at fedoraproject.org  Thu Sep 24 16:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:16:43 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924161643.6CBCB10F841@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:16:44 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924161644.833C010F88A@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:16:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:16:47 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924161649.19AEE10F89C@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:06 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924161706.B456110F841@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:08 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924161708.8199B10F87C@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:10 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924161710.3438110F8A8@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:42 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924161742.65ED110F898@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:42 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924161743.B67F810F89B@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:44 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924161744.68A8410F89F@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora devel) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:59 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924161759.2506F10F87C@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:17:59 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924161759.C788910F8A4@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:18:00 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924161800.8511210F8B2@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora 11) to Approved for jforbes

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From cebbert at fedoraproject.org  Thu Sep 24 16:22:11 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 16:22:11 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1826,1.1827
Message-ID: <20090924162211.56AFB11C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19439

Modified Files:
	kernel.spec 
Log Message:
Drop the modules-ro-nx patch: it's causing ftrace to be unable
  to NOP out module function call tracking. (#524042)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1826
retrieving revision 1.1827
diff -u -p -r1.1826 -r1.1827
--- kernel.spec	23 Sep 2009 21:26:57 -0000	1.1826
+++ kernel.spec	24 Sep 2009 16:22:11 -0000	1.1827
@@ -1329,7 +1329,8 @@ ApplyPatch linux-2.6-iwlwifi-remove-depr
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
-ApplyPatch linux-2.6.31-modules-ro-nx.patch
+# breaks ftrace NOP replacement
+#ApplyPatch linux-2.6.31-modules-ro-nx.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -2072,6 +2073,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-40
+- Drop the modules-ro-nx patch: it's causing ftrace to be unable
+  to NOP out module function call tracking. (#524042)
+
 * Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-39
 - touch initramfs-$foo not dracut-$foo.
 



From pkgdb at fedoraproject.org  Thu Sep 24 16:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:23:19 +0000
Subject: [pkgdb] notification-daemon-engine-slider was added for mccann
Message-ID: <20090924162319.C341D10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package notification-daemon-engine-slider with summary The Slider theme engine for the notification daemon
kevin has approved Package notification-daemon-engine-slider
kevin has added a Fedora devel branch for notification-daemon-engine-slider with an owner of mccann
kevin has approved notification-daemon-engine-slider in Fedora devel
kevin has approved Package notification-daemon-engine-slider
kevin has set commit to Approved for 107427 on notification-daemon-engine-slider (Fedora devel)
kevin has set checkout to Approved for 107427 on notification-daemon-engine-slider (Fedora devel)
kevin has set build to Approved for 107427 on notification-daemon-engine-slider (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/notification-daemon-engine-slider



From kevin at fedoraproject.org  Thu Sep 24 16:23:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:23:28 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider - New directory
Message-ID: <20090924162328.2652711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19791/rpms/notification-daemon-engine-slider

Log Message:
Directory /cvs/pkgs/rpms/notification-daemon-engine-slider added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:23:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:23:28 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/devel - New directory
Message-ID: <20090924162328.5937811C0374@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19791/rpms/notification-daemon-engine-slider/devel

Log Message:
Directory /cvs/pkgs/rpms/notification-daemon-engine-slider/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:23:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:23:36 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider Makefile,NONE,1.1
Message-ID: <20090924162336.859D011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19791/rpms/notification-daemon-engine-slider

Added Files:
	Makefile 
Log Message:
Setup of module notification-daemon-engine-slider


--- NEW FILE Makefile ---
# Top level Makefile for module notification-daemon-engine-slider
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  Thu Sep 24 16:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:23:20 +0000
Subject: [pkgdb] notification-daemon-engine-slider summary updated by kevin
Message-ID: <20090924162321.06B7610F889@bastion2.fedora.phx.redhat.com>

kevin set package notification-daemon-engine-slider summary to The Slider theme engine for the notification daemon

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/notification-daemon-engine-slider



From kevin at fedoraproject.org  Thu Sep 24 16:23:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:23:36 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090924162336.CF6C511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19791/rpms/notification-daemon-engine-slider/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module notification-daemon-engine-slider


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: notification-daemon-engine-slider
# $Id: Makefile,v 1.1 2009/09/24 16:23:36 kevin Exp $
NAME := notification-daemon-engine-slider
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  Thu Sep 24 16:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:45 +0000
Subject: [pkgdb] sblim-sfcb was added for srini
Message-ID: <20090924162445.C9CCD10F883@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-sfcb with summary CIM server for embedded environments
kevin has approved Package sblim-sfcb
kevin has added a Fedora devel branch for sblim-sfcb with an owner of srini
kevin has approved sblim-sfcb in Fedora devel
kevin has approved Package sblim-sfcb
kevin has set commit to Approved for 107427 on sblim-sfcb (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-sfcb (Fedora devel)
kevin has set build to Approved for 107427 on sblim-sfcb (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:48 +0000
Subject: [pkgdb] sblim-sfcb summary updated by kevin
Message-ID: <20090924162449.04E4610F884@bastion2.fedora.phx.redhat.com>

kevin set package sblim-sfcb summary to CIM server for embedded environments

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:48 +0000
Subject: [pkgdb] sblim-sfcb (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924162449.1433910F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-sfcb
kevin has set commit to Approved for 107427 on sblim-sfcb (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-sfcb (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-sfcb (Fedora EPEL 5)
kevin approved watchbugzilla on sblim-sfcb (Fedora EPEL 5) for mdomsch
kevin approved watchcommits on sblim-sfcb (Fedora EPEL 5) for mdomsch
kevin approved watchbugzilla on sblim-sfcb (Fedora EPEL 5) for praveenp
kevin approved watchcommits on sblim-sfcb (Fedora EPEL 5) for praveenp
kevin approved commit on sblim-sfcb (Fedora EPEL 5) for praveenp
kevin approved build on sblim-sfcb (Fedora EPEL 5) for praveenp
kevin approved approveacls on sblim-sfcb (Fedora EPEL 5) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:48 +0000
Subject: [pkgdb] sblim-sfcb (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924162449.22FE410F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-sfcb
kevin has set commit to Approved for 107427 on sblim-sfcb (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-sfcb (Fedora 10)
kevin has set build to Approved for 107427 on sblim-sfcb (Fedora 10)
kevin approved watchbugzilla on sblim-sfcb (Fedora 10) for mdomsch
kevin approved watchcommits on sblim-sfcb (Fedora 10) for mdomsch
kevin approved watchbugzilla on sblim-sfcb (Fedora 10) for praveenp
kevin approved watchcommits on sblim-sfcb (Fedora 10) for praveenp
kevin approved commit on sblim-sfcb (Fedora 10) for praveenp
kevin approved build on sblim-sfcb (Fedora 10) for praveenp
kevin approved approveacls on sblim-sfcb (Fedora 10) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:48 +0000
Subject: [pkgdb] sblim-sfcb (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924162449.363BF10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-sfcb
kevin has set commit to Approved for 107427 on sblim-sfcb (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-sfcb (Fedora 11)
kevin has set build to Approved for 107427 on sblim-sfcb (Fedora 11)
kevin approved watchbugzilla on sblim-sfcb (Fedora 11) for mdomsch
kevin approved watchcommits on sblim-sfcb (Fedora 11) for mdomsch
kevin approved watchbugzilla on sblim-sfcb (Fedora 11) for praveenp
kevin approved watchcommits on sblim-sfcb (Fedora 11) for praveenp
kevin approved commit on sblim-sfcb (Fedora 11) for praveenp
kevin approved build on sblim-sfcb (Fedora 11) for praveenp
kevin approved approveacls on sblim-sfcb (Fedora 11) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:48 +0000
Subject: [pkgdb] sblim-sfcb (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924162449.3F7A510F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-sfcb
kevin has set commit to Approved for 107427 on sblim-sfcb (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-sfcb (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-sfcb (Fedora EPEL 4)
kevin approved watchbugzilla on sblim-sfcb (Fedora EPEL 4) for mdomsch
kevin approved watchcommits on sblim-sfcb (Fedora EPEL 4) for mdomsch
kevin approved watchbugzilla on sblim-sfcb (Fedora EPEL 4) for praveenp
kevin approved watchcommits on sblim-sfcb (Fedora EPEL 4) for praveenp
kevin approved commit on sblim-sfcb (Fedora EPEL 4) for praveenp
kevin approved build on sblim-sfcb (Fedora EPEL 4) for praveenp
kevin approved approveacls on sblim-sfcb (Fedora EPEL 4) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:49 +0000
Subject: [pkgdb] sblim-sfcb (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924162449.48D0E10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-sfcb
kevin has set commit to Approved for 107427 on sblim-sfcb (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-sfcb (Fedora 12)
kevin has set build to Approved for 107427 on sblim-sfcb (Fedora 12)
kevin approved watchbugzilla on sblim-sfcb (Fedora 12) for mdomsch
kevin approved watchcommits on sblim-sfcb (Fedora 12) for mdomsch
kevin approved watchbugzilla on sblim-sfcb (Fedora 12) for praveenp
kevin approved watchcommits on sblim-sfcb (Fedora 12) for praveenp
kevin approved commit on sblim-sfcb (Fedora 12) for praveenp
kevin approved build on sblim-sfcb (Fedora 12) for praveenp
kevin approved approveacls on sblim-sfcb (Fedora 12) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From pkgdb at fedoraproject.org  Thu Sep 24 16:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:24:49 +0000
Subject: [pkgdb] sblim-sfcb (Fedora EPEL, 4) updated by kevin
Message-ID: <20090924162449.5A6AA10F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sblim-sfcb (Fedora devel) for mdomsch
kevin approved watchcommits on sblim-sfcb (Fedora devel) for mdomsch
kevin approved watchbugzilla on sblim-sfcb (Fedora devel) for praveenp
kevin approved watchcommits on sblim-sfcb (Fedora devel) for praveenp
kevin approved commit on sblim-sfcb (Fedora devel) for praveenp
kevin approved build on sblim-sfcb (Fedora devel) for praveenp
kevin approved approveacls on sblim-sfcb (Fedora devel) for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/sblim-sfcb



From kevin at fedoraproject.org  Thu Sep 24 16:24:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:24:58 +0000 (UTC)
Subject: rpms/sblim-sfcb/devel - New directory
Message-ID: <20090924162458.388B511C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-sfcb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20062/rpms/sblim-sfcb/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-sfcb/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:24:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:24:58 +0000 (UTC)
Subject: rpms/sblim-sfcb - New directory
Message-ID: <20090924162458.138DA11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-sfcb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20062/rpms/sblim-sfcb

Log Message:
Directory /cvs/pkgs/rpms/sblim-sfcb added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:25:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:25:04 +0000 (UTC)
Subject: rpms/sblim-sfcb Makefile,NONE,1.1
Message-ID: <20090924162504.B412A11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-sfcb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20062/rpms/sblim-sfcb

Added Files:
	Makefile 
Log Message:
Setup of module sblim-sfcb


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-sfcb
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  Thu Sep 24 16:25:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:25:04 +0000 (UTC)
Subject: rpms/sblim-sfcb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090924162504.E7EED11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-sfcb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20062/rpms/sblim-sfcb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-sfcb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-sfcb
# $Id: Makefile,v 1.1 2009/09/24 16:25:04 kevin Exp $
NAME := sblim-sfcb
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 tmraz at fedoraproject.org  Thu Sep 24 16:24:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 24 Sep 2009 16:24:59 +0000 (UTC)
Subject: rpms/openct/devel .cvsignore, 1.18, 1.19 openct.spec, 1.38,
	1.39 sources, 1.18, 1.19
Message-ID: <20090924162459.C9ABD11C00DB@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20081

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Thu Sep 24 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.17-1
- Update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	15 Jun 2009 20:40:49 -0000	1.18
+++ .cvsignore	24 Sep 2009 16:24:59 -0000	1.19
@@ -1 +1 @@
-openct-0.6.16.tar.gz
+openct-0.6.17.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- openct.spec	25 Jul 2009 20:46:30 -0000	1.38
+++ openct.spec	24 Sep 2009 16:24:59 -0000	1.39
@@ -3,8 +3,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.16
-Release:        2%{?dist}
+Version:        0.6.17
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -179,6 +179,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.17-1
+- Update to latest upstream
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	15 Jun 2009 20:40:49 -0000	1.18
+++ sources	24 Sep 2009 16:24:59 -0000	1.19
@@ -1 +1 @@
-d8d8c63269985303a303a218c4b953d7  openct-0.6.16.tar.gz
+10992fd48da028b599f610987b7f3258  openct-0.6.17.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 24 16:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:25:51 +0000
Subject: [pkgdb] gnome-applet-vm (un)retirement
Message-ID: <20090924162551.7E25110F898@bastion2.fedora.phx.redhat.com>

Package gnome-applet-vm in Fedora 7 has been retired by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Thu Sep 24 16:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:26:22 +0000
Subject: [pkgdb] python-sysv_ipc was added for lonetwin
Message-ID: <20090924162623.54D3D10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package python-sysv_ipc with summary System V IPC for Python
kevin has approved Package python-sysv_ipc
kevin has added a Fedora devel branch for python-sysv_ipc with an owner of lonetwin
kevin has approved python-sysv_ipc in Fedora devel
kevin has approved Package python-sysv_ipc
kevin has set commit to Approved for 107427 on python-sysv_ipc (Fedora devel)
kevin has set checkout to Approved for 107427 on python-sysv_ipc (Fedora devel)
kevin has set build to Approved for 107427 on python-sysv_ipc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-sysv_ipc



From pkgdb at fedoraproject.org  Thu Sep 24 16:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:26:24 +0000
Subject: [pkgdb] python-sysv_ipc summary updated by kevin
Message-ID: <20090924162624.A1AF710F889@bastion2.fedora.phx.redhat.com>

kevin set package python-sysv_ipc summary to System V IPC for Python

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-sysv_ipc



From pkgdb at fedoraproject.org  Thu Sep 24 16:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:26:24 +0000
Subject: [pkgdb] python-sysv_ipc (Fedora, 10) updated by kevin
Message-ID: <20090924162624.AB95310F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-sysv_ipc
kevin has set commit to Approved for 107427 on python-sysv_ipc (Fedora 10)
kevin has set checkout to Approved for 107427 on python-sysv_ipc (Fedora 10)
kevin has set build to Approved for 107427 on python-sysv_ipc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-sysv_ipc



From kevin at fedoraproject.org  Thu Sep 24 16:26:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:26:32 +0000 (UTC)
Subject: rpms/python-sysv_ipc - New directory
Message-ID: <20090924162632.1C00811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-sysv_ipc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH20656/rpms/python-sysv_ipc

Log Message:
Directory /cvs/pkgs/rpms/python-sysv_ipc added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:26:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:26:32 +0000 (UTC)
Subject: rpms/python-sysv_ipc/devel - New directory
Message-ID: <20090924162632.43B5911C0337@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-sysv_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH20656/rpms/python-sysv_ipc/devel

Log Message:
Directory /cvs/pkgs/rpms/python-sysv_ipc/devel added to the repository




From pkgdb at fedoraproject.org  Thu Sep 24 16:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:26:24 +0000
Subject: [pkgdb] python-sysv_ipc (Fedora, 10) updated by kevin
Message-ID: <20090924162624.B6B3310F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-sysv_ipc
kevin has set commit to Approved for 107427 on python-sysv_ipc (Fedora 11)
kevin has set checkout to Approved for 107427 on python-sysv_ipc (Fedora 11)
kevin has set build to Approved for 107427 on python-sysv_ipc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-sysv_ipc



From kevin at fedoraproject.org  Thu Sep 24 16:26:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:26:38 +0000 (UTC)
Subject: rpms/python-sysv_ipc Makefile,NONE,1.1
Message-ID: <20090924162638.C7A9511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-sysv_ipc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH20656/rpms/python-sysv_ipc

Added Files:
	Makefile 
Log Message:
Setup of module python-sysv_ipc


--- NEW FILE Makefile ---
# Top level Makefile for module python-sysv_ipc
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  Thu Sep 24 16:26:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:26:39 +0000 (UTC)
Subject: rpms/python-sysv_ipc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090924162639.12E9311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-sysv_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH20656/rpms/python-sysv_ipc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-sysv_ipc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-sysv_ipc
# $Id: Makefile,v 1.1 2009/09/24 16:26:38 kevin Exp $
NAME := python-sysv_ipc
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  Thu Sep 24 16:27:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:27:07 +0000
Subject: [pkgdb] clc was added for elanthis
Message-ID: <20090924162708.469A010F86F@bastion2.fedora.phx.redhat.com>

kevin has added Package clc with summary Very simplistic MUD client for command line usage
kevin has approved Package clc
kevin has added a Fedora devel branch for clc with an owner of elanthis
kevin has approved clc in Fedora devel
kevin has approved Package clc
kevin has set commit to Approved for 107427 on clc (Fedora devel)
kevin has set checkout to Approved for 107427 on clc (Fedora devel)
kevin has set build to Approved for 107427 on clc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/clc



From pkgdb at fedoraproject.org  Thu Sep 24 16:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:27:08 +0000
Subject: [pkgdb] clc summary updated by kevin
Message-ID: <20090924162709.6084610F890@bastion2.fedora.phx.redhat.com>

kevin set package clc summary to Very simplistic MUD client for command line usage

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/clc



From pkgdb at fedoraproject.org  Thu Sep 24 16:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:27:08 +0000
Subject: [pkgdb] clc (Fedora, 12) updated by kevin
Message-ID: <20090924162709.6F52810F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for clc
kevin has set commit to Approved for 107427 on clc (Fedora 12)
kevin has set checkout to Approved for 107427 on clc (Fedora 12)
kevin has set build to Approved for 107427 on clc (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/clc



From kevin at fedoraproject.org  Thu Sep 24 16:27:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:27:17 +0000 (UTC)
Subject: rpms/clc - New directory
Message-ID: <20090924162717.2279811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20907/rpms/clc

Log Message:
Directory /cvs/pkgs/rpms/clc added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:27:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:27:17 +0000 (UTC)
Subject: rpms/clc/devel - New directory
Message-ID: <20090924162717.3988111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20907/rpms/clc/devel

Log Message:
Directory /cvs/pkgs/rpms/clc/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:27:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:27:24 +0000 (UTC)
Subject: rpms/clc Makefile,NONE,1.1
Message-ID: <20090924162724.0F69511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20907/rpms/clc

Added Files:
	Makefile 
Log Message:
Setup of module clc


--- NEW FILE Makefile ---
# Top level Makefile for module clc
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  Thu Sep 24 16:27:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:27:24 +0000 (UTC)
Subject: rpms/clc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090924162724.45AE811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh20907/rpms/clc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clc
# $Id: Makefile,v 1.1 2009/09/24 16:27:24 kevin Exp $
NAME := clc
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  Thu Sep 24 16:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:27:58 +0000
Subject: [pkgdb] frepple was added for jdetaeye
Message-ID: <20090924162758.ABE9B10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package frepple with summary Free Production Planning Library
kevin has approved Package frepple
kevin has added a Fedora devel branch for frepple with an owner of jdetaeye
kevin has approved frepple in Fedora devel
kevin has approved Package frepple
kevin has set commit to Approved for 107427 on frepple (Fedora devel)
kevin has set checkout to Approved for 107427 on frepple (Fedora devel)
kevin has set build to Approved for 107427 on frepple (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/frepple



From pkgdb at fedoraproject.org  Thu Sep 24 16:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:28:00 +0000
Subject: [pkgdb] frepple summary updated by kevin
Message-ID: <20090924162800.4A0E010F89E@bastion2.fedora.phx.redhat.com>

kevin set package frepple summary to Free Production Planning Library

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/frepple



From pkgdb at fedoraproject.org  Thu Sep 24 16:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:28:00 +0000
Subject: [pkgdb] frepple (Fedora, 10) updated by kevin
Message-ID: <20090924162800.4DE7A10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for frepple
kevin has set commit to Approved for 107427 on frepple (Fedora 11)
kevin has set checkout to Approved for 107427 on frepple (Fedora 11)
kevin has set build to Approved for 107427 on frepple (Fedora 11)
kevin approved watchbugzilla on frepple (Fedora 11) for salimma
kevin approved watchcommits on frepple (Fedora 11) for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/frepple



From pkgdb at fedoraproject.org  Thu Sep 24 16:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:28:00 +0000
Subject: [pkgdb] frepple (Fedora, 10) updated by kevin
Message-ID: <20090924162800.54F7610F8A2@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on frepple (Fedora devel) for salimma
kevin approved watchcommits on frepple (Fedora devel) for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/frepple



From pkgdb at fedoraproject.org  Thu Sep 24 16:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:28:00 +0000
Subject: [pkgdb] frepple (Fedora, 10) updated by kevin
Message-ID: <20090924162800.6268110F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for frepple
kevin has set commit to Approved for 107427 on frepple (Fedora 10)
kevin has set checkout to Approved for 107427 on frepple (Fedora 10)
kevin has set build to Approved for 107427 on frepple (Fedora 10)
kevin approved watchbugzilla on frepple (Fedora 10) for salimma
kevin approved watchcommits on frepple (Fedora 10) for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/frepple



From pkgdb at fedoraproject.org  Thu Sep 24 16:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:28:00 +0000
Subject: [pkgdb] frepple (Fedora, 10) updated by kevin
Message-ID: <20090924162800.675CD10F8AA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for frepple
kevin has set commit to Approved for 107427 on frepple (Fedora 12)
kevin has set checkout to Approved for 107427 on frepple (Fedora 12)
kevin has set build to Approved for 107427 on frepple (Fedora 12)
kevin approved watchbugzilla on frepple (Fedora 12) for salimma
kevin approved watchcommits on frepple (Fedora 12) for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/frepple



From kevin at fedoraproject.org  Thu Sep 24 16:28:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:28:07 +0000 (UTC)
Subject: rpms/frepple/devel - New directory
Message-ID: <20090924162807.420B911C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frepple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT21203/rpms/frepple/devel

Log Message:
Directory /cvs/pkgs/rpms/frepple/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:28:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:28:07 +0000 (UTC)
Subject: rpms/frepple - New directory
Message-ID: <20090924162807.1E07511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frepple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT21203/rpms/frepple

Log Message:
Directory /cvs/pkgs/rpms/frepple added to the repository




From kevin at fedoraproject.org  Thu Sep 24 16:28:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:28:13 +0000 (UTC)
Subject: rpms/frepple Makefile,NONE,1.1
Message-ID: <20090924162813.58D7F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frepple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT21203/rpms/frepple

Added Files:
	Makefile 
Log Message:
Setup of module frepple


--- NEW FILE Makefile ---
# Top level Makefile for module frepple
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  Thu Sep 24 16:28:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Sep 2009 16:28:13 +0000 (UTC)
Subject: rpms/frepple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090924162813.9175811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frepple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT21203/rpms/frepple/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module frepple


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: frepple
# $Id: Makefile,v 1.1 2009/09/24 16:28:13 kevin Exp $
NAME := frepple
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 veillard at fedoraproject.org  Thu Sep 24 16:36:59 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 24 Sep 2009 16:36:59 +0000 (UTC)
Subject: rpms/libxslt/F-11 libxslt.spec, 1.59, 1.60 sources, 1.35,
	1.36 libxslt-1.1.25-locking.patch, 1.1, NONE
Message-ID: <20090924163659.506CE11C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22749

Modified Files:
	libxslt.spec sources 
Removed Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Upstream release of libxslt-1.1.26, Daniel



Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-11/libxslt.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libxslt.spec	21 Sep 2009 09:12:56 -0000	1.59
+++ libxslt.spec	24 Sep 2009 16:36:59 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
-Version: 1.1.25
-Release: 2%{?dist}%{?extra_release}
+Version: 1.1.26
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,7 +15,6 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libxslt-1.1.25-locking.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -57,7 +56,6 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -132,6 +130,10 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> 1.1.26-1
+- couple of bug fixes
+- export a symbol needed by lxml
+
 * Mon Sep 21 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-2
 - fix a locking bug in 1.1.25
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	17 Sep 2009 16:09:20 -0000	1.35
+++ sources	24 Sep 2009 16:36:59 -0000	1.36
@@ -1 +1,2 @@
 50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz
+e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz


--- libxslt-1.1.25-locking.patch DELETED ---



From orion at fedoraproject.org  Thu Sep 24 16:48:49 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 24 Sep 2009 16:48:49 +0000 (UTC)
Subject: rpms/wgrib/devel Changes, 1.5, 1.6 tricks.wgrib, 1.2, 1.3 wgrib.spec,
	1.10, 1.11
Message-ID: <20090924164849.5AAEB11C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25728

Modified Files:
	Changes tricks.wgrib wgrib.spec 
Log Message:
* Thu Sep 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.13d-1
- Update to 1.8.0.13d



Index: Changes
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/Changes,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Changes	24 Aug 2009 22:49:42 -0000	1.5
+++ Changes	24 Sep 2009 16:48:48 -0000	1.6
@@ -1,3 +1,5 @@
+v1.8.0.13d 9/09 added ncep table 141, fixed typo in ncep table 129 (thanks YT)
+v1.8.0.13c 6/09 Dusan Jovic's changes for Arakawa staggered b-grid (205)
 v1.8.0.13b 6/09 updated ncep table 129
 v1.8.0.13a 5/09 added SUNSD ncep table 133
 v1.8.0.13 5/09 added -cmc by NCO request, updated ncep table 129


Index: tricks.wgrib
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/tricks.wgrib,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tricks.wgrib	9 Feb 2008 18:40:00 -0000	1.2
+++ tricks.wgrib	24 Sep 2009 16:48:49 -0000	1.3
@@ -24,6 +24,15 @@ excuse that feature is already available
 
     wgrib grib_file | egrep "(^20:|^30:)" | wgrib -i grib_file -o binary_file
 
+(3'') How do I extract the 1, 9, 17, ... records into a new grib file?
+
+    wgrib grib_file | awk '{if ($1 % 8 == 1) print $0}' FS=':' | 
+         wgrib -s grib_file -i -grib -o new_grib_file
+
+(3''') How do I remove the 2, 10, 18, ... records from a grib file?
+
+    wgrib grib_file | awk '{if ($1 % 8 != 2) print $0}' FS=':' | 
+         wgrib -s grib_file -i -grib -o new_grib_file
 
 (4) How do I extract the first 10 records as a grib file?
 


Index: wgrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/wgrib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- wgrib.spec	24 Aug 2009 22:49:42 -0000	1.10
+++ wgrib.spec	24 Sep 2009 16:48:49 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           wgrib
-Version:        1.8.0.13b
+Version:        1.8.0.13d
 Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB files
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.13d-1
+- Update to 1.8.0.13d
+
 * Mon Aug 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.13b-1
 - Update to 1.8.0.13b
 



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:07 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchcommits
Message-ID: <20090924164907.B74DF10F884@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:08 +0000
Subject: [pkgdb] virt-manager: berrange has requested commit
Message-ID: <20090924164908.BC07610F898@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:14 +0000
Subject: [pkgdb] virt-manager: berrange has requested approveacls
Message-ID: <20090924164914.0F74810F89F@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:28 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchcommits
Message-ID: <20090924164928.BFB2110F8A3@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on virt-manager (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:30 +0000
Subject: [pkgdb] virt-manager: berrange has requested commit
Message-ID: <20090924164930.E601B10F884@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on virt-manager (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:33 +0000
Subject: [pkgdb] virt-manager: berrange has requested approveacls
Message-ID: <20090924164933.4EE4F10F8AA@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on virt-manager (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:44 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924164944.6084410F890@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 10 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:49:51 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924164952.62B0610F89C@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 11 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:50:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:50:14 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchcommits
Message-ID: <20090924165014.5CEA310F87C@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on virt-manager (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:50:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:50:15 +0000
Subject: [pkgdb] virt-manager: berrange has requested approveacls
Message-ID: <20090924165015.F07AC10F8A2@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on virt-manager (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:50:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:50:15 +0000
Subject: [pkgdb] virt-manager: berrange has requested commit
Message-ID: <20090924165016.1350E10F8B2@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on virt-manager (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:50:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:50:35 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924165035.BD0B510F8A6@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 9 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:50:56 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchbugzilla
Message-ID: <20090924165056.E3AB810F89A@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:50:58 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchcommits
Message-ID: <20090924165100.0A78810F89F@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:01 +0000
Subject: [pkgdb] virt-manager: berrange has requested commit
Message-ID: <20090924165102.0BBEE10F8B4@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:03 +0000
Subject: [pkgdb] virt-manager: berrange has requested approveacls
Message-ID: <20090924165104.CB70E10F8BA@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:09 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924165109.E976510F841@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:28 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchbugzilla
Message-ID: <20090924165129.B5D7410F8A0@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on virt-manager (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:33 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchbugzilla
Message-ID: <20090924165133.4B38810F8B1@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on virt-manager (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:41 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchbugzilla
Message-ID: <20090924165141.28DC810F8C5@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on virt-manager (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:49 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924165150.8F41F10F8A6@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 8 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:54 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchbugzilla
Message-ID: <20090924165155.4486710F898@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on virt-manager (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:57 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchcommits
Message-ID: <20090924165157.6E63010F8C7@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on virt-manager (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:00 +0000
Subject: [pkgdb] virt-manager: berrange has requested approveacls
Message-ID: <20090924165200.2ECC910F8D0@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on virt-manager (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:51:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:51:57 +0000
Subject: [pkgdb] virt-manager: berrange has requested commit
Message-ID: <20090924165158.D4D4D10F8CC@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on virt-manager (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:07 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924165208.030BB10F89F@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 7 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:12 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchbugzilla
Message-ID: <20090924165212.9C73D10F8D6@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on virt-manager (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:14 +0000
Subject: [pkgdb] virt-manager: berrange has requested watchcommits
Message-ID: <20090924165214.D4D1010F8DA@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on virt-manager (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:17 +0000
Subject: [pkgdb] virt-manager: berrange has requested commit
Message-ID: <20090924165218.423CA10F8AD@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on virt-manager (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From orion at fedoraproject.org  Thu Sep 24 16:52:43 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 24 Sep 2009 16:52:43 +0000 (UTC)
Subject: rpms/wgrib/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090924165243.9624211C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26485

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.13d-1
- Update to 1.8.0.13d



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Aug 2009 22:49:41 -0000	1.5
+++ .cvsignore	24 Sep 2009 16:52:43 -0000	1.6
@@ -1 +1 @@
-wgrib.c.v1.8.0.13b
+wgrib.c.v1.8.0.13d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Aug 2009 22:49:42 -0000	1.5
+++ sources	24 Sep 2009 16:52:43 -0000	1.6
@@ -1 +1 @@
-abe0e8c9ed97a80c9a029970effa325d  wgrib.c.v1.8.0.13b
+142fb748048401fd45ea37ba73247001  wgrib.c.v1.8.0.13d



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:20 +0000
Subject: [pkgdb] virt-manager: berrange has requested approveacls
Message-ID: <20090924165220.6CAF010F8DD@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on virt-manager (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 16:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:52:52 +0000
Subject: [pkgdb] python-virtinst ownership updated
Message-ID: <20090924165252.B3EA410F86F@bastion2.fedora.phx.redhat.com>

Package python-virtinst in Fedora devel is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:02 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchbugzilla
Message-ID: <20090924165302.7B28810F8A0@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:05 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchcommits
Message-ID: <20090924165305.38D1510F8A3@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:06 +0000
Subject: [pkgdb] python-virtinst: berrange has requested commit
Message-ID: <20090924165306.D538210F8BE@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:08 +0000
Subject: [pkgdb] python-virtinst: berrange has requested approveacls
Message-ID: <20090924165308.3540810F8C1@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on python-virtinst (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:15 +0000
Subject: [pkgdb] python-virtinst ownership updated
Message-ID: <20090924165316.D34C610F8AF@bastion2.fedora.phx.redhat.com>

Package python-virtinst in Fedora 7 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:24 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchbugzilla
Message-ID: <20090924165324.3984E10F8E0@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on python-virtinst (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:25 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchcommits
Message-ID: <20090924165325.7279910F8ED@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on python-virtinst (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:26 +0000
Subject: [pkgdb] python-virtinst: berrange has requested commit
Message-ID: <20090924165326.CFA2A10F8C5@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on python-virtinst (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:28 +0000
Subject: [pkgdb] python-virtinst: berrange has requested approveacls
Message-ID: <20090924165328.2039110F8EE@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on python-virtinst (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:33 +0000
Subject: [pkgdb] python-virtinst ownership updated
Message-ID: <20090924165333.35E0210F8FB@bastion2.fedora.phx.redhat.com>

Package python-virtinst in Fedora 8 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From veillard at fedoraproject.org  Thu Sep 24 16:53:36 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 24 Sep 2009 16:53:36 +0000 (UTC)
Subject: rpms/libxml2/devel .cvsignore, 1.45, 1.46 libxml2.spec, 1.76,
	1.77 sources, 1.47, 1.48 libxml2-2.7.3-ficora-parse.patch, 1.1,
	NONE libxml2-2.7.4-input-parser.patch, 1.1, NONE
Message-ID: <20090924165336.3125511C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26894

Modified Files:
	.cvsignore libxml2.spec sources 
Removed Files:
	libxml2-2.7.3-ficora-parse.patch 
	libxml2-2.7.4-input-parser.patch 
Log Message:
Upstream release of 2.7.5, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	10 Sep 2009 16:54:25 -0000	1.45
+++ .cvsignore	24 Sep 2009 16:53:35 -0000	1.46
@@ -23,3 +23,4 @@ libxml2-2.7.1.tar.gz
 libxml2-2.7.2.tar.gz
 libxml2-2.7.3.tar.gz
 libxml2-2.7.4.tar.gz
+libxml2-2.7.5.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- libxml2.spec	15 Sep 2009 17:02:03 -0000	1.76
+++ libxml2.spec	24 Sep 2009 16:53:36 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.4
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.5
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -68,7 +67,6 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
+- Upstream release of 2.7.5
+- fix a couple of Relax-NG validation problems
+- couple more fixes
+
 * Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-2
 - fix a problem with little data at startup affecting inkscape #523002
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	10 Sep 2009 16:54:25 -0000	1.47
+++ sources	24 Sep 2009 16:53:36 -0000	1.48
@@ -1 +1,2 @@
 961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
+2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz


--- libxml2-2.7.3-ficora-parse.patch DELETED ---


--- libxml2-2.7.4-input-parser.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:37 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchbugzilla
Message-ID: <20090924165337.EADD210F889@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on python-virtinst (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:39 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchcommits
Message-ID: <20090924165339.58B5310F8FD@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on python-virtinst (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:40 +0000
Subject: [pkgdb] python-virtinst: berrange has requested commit
Message-ID: <20090924165340.ACFD610F900@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on python-virtinst (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:41 +0000
Subject: [pkgdb] python-virtinst: berrange has requested approveacls
Message-ID: <20090924165341.D74F510F902@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on python-virtinst (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:49 +0000
Subject: [pkgdb] python-virtinst ownership updated
Message-ID: <20090924165350.6833810F904@bastion2.fedora.phx.redhat.com>

Package python-virtinst in Fedora 9 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:54 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchbugzilla
Message-ID: <20090924165354.C0F7C10F906@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on python-virtinst (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:56 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchcommits
Message-ID: <20090924165356.62A1F10F909@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on python-virtinst (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:57 +0000
Subject: [pkgdb] python-virtinst: berrange has requested commit
Message-ID: <20090924165357.2B9BA10F90C@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on python-virtinst (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:53:58 +0000
Subject: [pkgdb] python-virtinst: berrange has requested approveacls
Message-ID: <20090924165359.0D57D10F90E@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on python-virtinst (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:04 +0000
Subject: [pkgdb] python-virtinst ownership updated
Message-ID: <20090924165404.9E70710F8CA@bastion2.fedora.phx.redhat.com>

Package python-virtinst in Fedora 10 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:12 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchbugzilla
Message-ID: <20090924165414.136F110F8CD@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on python-virtinst (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:15 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchcommits
Message-ID: <20090924165415.3F03810F913@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on python-virtinst (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:17 +0000
Subject: [pkgdb] python-virtinst: berrange has requested commit
Message-ID: <20090924165417.2D83110F916@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on python-virtinst (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:18 +0000
Subject: [pkgdb] python-virtinst: berrange has requested approveacls
Message-ID: <20090924165418.76E9710F919@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on python-virtinst (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:24 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchbugzilla
Message-ID: <20090924165424.1DC2310F89C@bastion2.fedora.phx.redhat.com>

berrange has requested the watchbugzilla acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:27 +0000
Subject: [pkgdb] python-virtinst ownership updated
Message-ID: <20090924165427.840C010F8D1@bastion2.fedora.phx.redhat.com>

Package python-virtinst in Fedora 11 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:41 +0000
Subject: [pkgdb] python-virtinst: berrange has requested watchcommits
Message-ID: <20090924165442.C02A810F8D3@bastion2.fedora.phx.redhat.com>

berrange has requested the watchcommits acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:44 +0000
Subject: [pkgdb] python-virtinst: berrange has requested commit
Message-ID: <20090924165444.C877510F8D7@bastion2.fedora.phx.redhat.com>

berrange has requested the commit acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 16:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 16:54:46 +0000
Subject: [pkgdb] python-virtinst: berrange has requested approveacls
Message-ID: <20090924165446.9716610F8DA@bastion2.fedora.phx.redhat.com>

berrange has requested the approveacls acl on python-virtinst (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From veillard at fedoraproject.org  Thu Sep 24 16:54:59 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 24 Sep 2009 16:54:59 +0000 (UTC)
Subject: rpms/libxslt/F-10 libxslt.spec, 1.57, 1.58 sources, 1.35,
	1.36 libxslt-1.1.25-locking.patch, 1.1, NONE
Message-ID: <20090924165459.D464411C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxslt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27216

Modified Files:
	libxslt.spec sources 
Removed Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Upstream release of 1.1.26, daniel



Index: libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-10/libxslt.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- libxslt.spec	21 Sep 2009 09:14:58 -0000	1.57
+++ libxslt.spec	24 Sep 2009 16:54:59 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
-Version: 1.1.25
-Release: 2%{?dist}%{?extra_release}
+Version: 1.1.26
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -15,7 +15,6 @@ BuildRequires: libgcrypt-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libxslt-1.1.25-locking.patch
 
 %description
 This C library allows to transform XML files into other XML files
@@ -57,7 +56,6 @@ with XPath functions written in Python.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -132,6 +130,10 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> 1.1.26-1
+- couple of bug fixes
+- export a symbol needed by lxml
+
 * Mon Sep 21 2009 Daniel Veillard <veillard at redhat.com> 1.1.25-2
 - fix a locking bug in 1.1.25
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxslt/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	17 Sep 2009 16:13:25 -0000	1.35
+++ sources	24 Sep 2009 16:54:59 -0000	1.36
@@ -1 +1,2 @@
 50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz
+e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz


--- libxslt-1.1.25-locking.patch DELETED ---



From rdieter at fedoraproject.org  Thu Sep 24 17:02:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Sep 2009 17:02:34 +0000 (UTC)
Subject: rpms/kmymoney2/F-11 kmymoney2-1.0.1-no_it_locale.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 kmymoney2.spec, 1.38, 1.39 sources,
	1.14, 1.15
Message-ID: <20090924170234.1371811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28726

Modified Files:
	.cvsignore kmymoney2.spec sources 
Added Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Log Message:
* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- kmymoney2-1.0.1


kmymoney2-1.0.1-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.1-no_it_locale.patch ---
diff -up kmymoney2-1.0.1/po/Makefile.in.no_it_locale kmymoney2-1.0.1/po/Makefile.in
--- kmymoney2-1.0.1/po/Makefile.in.no_it_locale	2009-09-05 07:54:58.000000000 -0500
+++ kmymoney2-1.0.1/po/Makefile.in	2009-09-10 19:36:25.414373555 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Feb 2009 21:26:10 -0000	1.15
+++ .cvsignore	24 Sep 2009 17:02:33 -0000	1.16
@@ -1 +1 @@
-kmymoney2-0.9.3.tar.bz2
+kmymoney2-1.0.1.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/kmymoney2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kmymoney2.spec	25 Feb 2009 11:38:32 -0000	1.38
+++ kmymoney2.spec	24 Sep 2009 17:02:33 -0000	1.39
@@ -1,6 +1,4 @@
 
-# FIXME/TODO: Requires aqbanking (v3?) + latest kmm_kbanking plugin.  arg. -- Rex
-#define _enable_kbanking --enable-kbanking
 %define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 
@@ -8,9 +6,6 @@
 %define ofx_deps libofx-devel opensp-devel libxml++-devel
 %endif
 
-# make -libs subpkg
-%define libs 1
-
 %if 0%{?fedora} > 6
 %define kdelibs3 kdelibs3
 %else
@@ -18,10 +13,12 @@
 BuildRequires: libutempter-devel
 %endif
 
+%define _with_check 1 
+
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -29,26 +26,29 @@ Group:	 Applications/Productivity
 Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# RHEL5's gettext doesn't grok it.po
+Patch1: kmymoney2-1.0.1-no_it_locale.patch
+
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
+# multilib upgrades, when -libs became unconditional
+Obsoletes: kmymoney2 < 0.9.3-3
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-%{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: curl-devel
+BuildRequires: desktop-file-utils
+BuildRequires: html2ps
 BuildRequires: gettext
 BuildRequires: ghostscript
 BuildRequires: %{kdelibs3}-devel
 BuildRequires: libxml2-devel
 %{?_enable_ofxbanking:BuildRequires: %{ofx_deps}}
+# FIXME/TODO: consider packaging qt-sqlite3, 
+# http://www.kde-apps.org/content/show.php?content=23011
+# so not be tempted to use the embedded copy here
+%{?_enable_sqlite3:BuildRequires:sqlite-devel}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
 
 %description
@@ -68,7 +68,7 @@ Summary: Development files for %{name}
 Group:   Development/Libraries
 Obsoletes: kmymoney-devel < %{version}-%{release}
 Provides:  kmymoney-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -76,6 +76,10 @@ Requires: %{name}-libs = %{version}-%{re
 %prep
 %setup -q -n kmymoney2-%{version}
 
+%if 0%{?rhel}
+%patch1 -p1 -b .no_it_locale
+%endif
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -84,11 +88,14 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --disable-final \
-  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
+  --disable-dependency-tracking --disable-final \
+  %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
+# to help doc generation
+export LANG=en_US.UTF-8
+
 make %{?_smp_mflags}
 
 
@@ -97,6 +104,10 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+desktop-file-install \
+  --vendor="" --dir=%{buildroot}%{_datadir}/applications/kde/ \
+  %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
+
 ## File lists
 # locale's
 %find_lang %{name}
@@ -119,34 +130,45 @@ fi
 
 # Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
+rm -rf %{buildroot}%{_datadir}/icons/*/scalable
 
 
-# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %check 
+# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
 
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 %post
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
+touch --no-create %{_datadir}/icons/Tango &> /dev/null || :
+
 
 %postun
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null 
+  touch --no-create %{_datadir}/icons/locolor &> /dev/null
+  touch --no-create %{_datadir}/icons/oxygen &> /dev/null
+  touch --no-create %{_datadir}/icons/Tango &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
+
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -154,32 +176,35 @@ update-desktop-database %{_datadir}/appl
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2/
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/kmymoney2.desktop
 %{_datadir}/config.kcfg/kmymoney2.kcfg
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
+%{_datadir}/icons/Tango/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
-%if "%{?_enable_ofxbanking:1}" == "1"
+%if 0%{?_enable_ofxbanking:1}
 %{_datadir}/apps/kmm_ofximport/
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
-%if "%{?_enable_kbanking:1}" == "1"
+%if 0%{?_enable_kbanking:1}
 %{_libdir}/kde3/kmm_kbanking.*
 %{_datadir}/apps/kmm_kbanking/
 %endif
 %{_mandir}/man?/*
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
+%{_libdir}/libkmm_kdchart.so.0*
+%{_libdir}/libkmm_mymoney.so.5*
+%{_libdir}/libkmm_plugin.so.0*
+%{?_enable_sqlite3:%{_libdir}/qt-3.3/plugins/sqldrivers/*.so}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/kmymoney
+%{_libdir}/libkmm_*.so
 
 
 %clean
@@ -187,6 +212,21 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- kmymoney2-1.0.1
+
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- kmymoney2-1.0.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- validate .desktop file
+- -libs unconditional
+- use %%_isa where appropriate
+- optimize scriptlets
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Feb 2009 21:26:10 -0000	1.14
+++ sources	24 Sep 2009 17:02:33 -0000	1.15
@@ -1 +1 @@
-d33041029530091c4ac6196cd8408bda  kmymoney2-0.9.3.tar.bz2
+7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:03 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170503.64FD610F883@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:10 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170511.B12D710F890@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 7) to Approved for crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:13 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170513.5DC7E10F89B@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:13 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170513.C7E1F10F89F@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:15 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170515.7DA9D10F8A1@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:16 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170517.81EE910F8A5@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on virt-manager (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:20 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170520.AC74B10F884@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:21 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170521.B055410F8AB@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:23 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170523.8950E10F8B0@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:28 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170528.50E1910F8B4@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:29 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170529.4B4E610F8B9@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:30 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170531.2CBEE10F8BD@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:36 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170536.C0B1D10F8C2@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:37 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170538.2B93510F8C5@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:50 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170550.E535010F89F@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:05:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:05:53 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170553.32E5D10F8CA@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on virt-manager (Fedora 10) to Obsolete for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:04 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170604.5395110F8CD@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 10) to Obsolete for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:07 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170607.DD74010F8CF@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 10) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:15 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170616.70C4010F8D6@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:17 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170617.6AE1510F883@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:17 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170619.0478010F8DF@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:30 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170630.883E310F8AA@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:52 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170652.8F01310F8B0@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:51 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170652.AA63A10F8B3@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:52 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170655.65FB610F8B7@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:55 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170656.D5C6E10F901@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on virt-manager (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:57 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170658.286AD10F905@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 7 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:06:59 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170659.AB5C710F8FF@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:01 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170701.19ABE10F909@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:02 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170703.F061610F90E@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on python-virtinst (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:01 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170701.19C4E10F90A@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 7 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:09 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924170710.E062C10F8BD@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on virt-manager (Fedora 10) to Approved for virtmaint

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:11 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170711.E376A10F911@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 9 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:16 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170716.B2EED10F916@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:17 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170717.EE2FD10F919@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:19 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170719.D3B5510F91B@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:21 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170721.63FA810F8C2@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on python-virtinst (Fedora 7) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:22 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170722.CB8A910F920@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 8 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:25 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170725.7BD5510F923@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:25 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170726.3AD7B10F928@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 8 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:25 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170727.1210510F92B@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:28 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170729.09B4F10F92D@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:29 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170729.6F23E10F930@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 8 is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:29 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170730.F3D3410F8C6@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on python-virtinst (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:34 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170734.CA55110F8C5@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:38 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170738.CCA4A10F93A@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on python-virtinst (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:36 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170736.E222A10F937@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:42 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170743.11BE910F89A@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:44 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170744.DE97210F89F@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:46 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170746.C80B110F93F@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:52 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170752.A252210F944@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:47 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170748.B70A310F942@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on python-virtinst (Fedora 10) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:54 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170755.0830510F946@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on python-virtinst (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:56 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170756.B8D6C10F8CA@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on python-virtinst (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:07:58 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924170758.5E8A210F94A@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on python-virtinst (Fedora 11) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:08:31 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170832.4050810F8A1@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:08:49 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170849.C6A2A10F8CC@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:09:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:09:20 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924170920.28F0910F8AA@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:28 +0000
Subject: [pkgdb] virt-manager: hbrock has given up approveacls
Message-ID: <20090924171128.6007510F8B6@bastion2.fedora.phx.redhat.com>

hbrock has given up the approveacls acl on virt-manager (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:32 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924171133.078E110F8B9@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora devel is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:37 +0000
Subject: [pkgdb] virt-manager: hbrock has given up approveacls
Message-ID: <20090924171137.5D5B910F8D6@bastion2.fedora.phx.redhat.com>

hbrock has given up the approveacls acl on virt-manager (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:40 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924171140.345B410F8DB@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 7 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:43 +0000
Subject: [pkgdb] virt-manager: hbrock has given up approveacls
Message-ID: <20090924171143.B66D010F8DE@bastion2.fedora.phx.redhat.com>

hbrock has given up the approveacls acl on virt-manager (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:47 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924171148.A832410F8EB@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 8 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:52 +0000
Subject: [pkgdb] virt-manager: hbrock has given up approveacls
Message-ID: <20090924171153.0166F10F8FE@bastion2.fedora.phx.redhat.com>

hbrock has given up the approveacls acl on virt-manager (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:55 +0000
Subject: [pkgdb] virt-manager ownership updated
Message-ID: <20090924171155.D0AE810F901@bastion2.fedora.phx.redhat.com>

Package virt-manager in Fedora 9 is now owned by crobinso

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:11:58 +0000
Subject: [pkgdb] virt-manager: hbrock has given up approveacls
Message-ID: <20090924171200.169BD10F908@bastion2.fedora.phx.redhat.com>

hbrock has given up the approveacls acl on virt-manager (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:16:41 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924171641.6D67510F8A0@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on virt-manager (Fedora 8) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:16:42 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924171643.30A7C10F8A4@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on virt-manager (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:16:43 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924171645.A39C510F8AD@bastion2.fedora.phx.redhat.com>

crobinso has set the approveacls acl on virt-manager (Fedora 9) to Approved for hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:16:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:16:47 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924171647.86E9B10F8B1@bastion2.fedora.phx.redhat.com>

crobinso has set the commit acl on virt-manager (Fedora 9) to Approved for hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:16:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:16:49 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090924171649.04D1510F8B6@bastion2.fedora.phx.redhat.com>

crobinso has set the watchcommits acl on virt-manager (Fedora 9) to Approved for hbrock

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/virt-manager



From pkgdb at fedoraproject.org  Thu Sep 24 17:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:17:09 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924171709.BAF9510F8B9@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora devel) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Thu Sep 24 17:17:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 17:17:15 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090924171716.031B110F8BD@bastion2.fedora.phx.redhat.com>

crobinso has set the watchbugzilla acl on python-virtinst (Fedora 9) to Approved for berrange

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/python-virtinst



From praveenp at fedoraproject.org  Thu Sep 24 17:28:12 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 17:28:12 +0000 (UTC)
Subject: rpms/openwsman/F-11 .cvsignore, 1.2, 1.3 openwsman.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090924172812.A915711C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1566

Modified Files:
	.cvsignore openwsman.spec sources 
Log Message:
Added the upstream sources 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2008 10:57:30 -0000	1.2
+++ .cvsignore	24 Sep 2009 17:28:12 -0000	1.3
@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openwsman.spec	26 Feb 2009 08:56:51 -0000	1.2
+++ openwsman.spec	24 Sep 2009 17:28:12 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
-Version:       2.1.0
-Release:        2%{?dist}
+Version:       2.2.0
+Release:        1%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
+%{_libdir}/ruby/site_ruby/1.8/openwsman/openwsman.rb
+%{_libdir}/ruby/site_ruby/1.8/openwsman/wsxmlnode.rb
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
 %files devel
@@ -135,6 +138,15 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
+- Added the new 2.2.0 sources.
+- Changed the release and version numbers.
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2008 10:57:30 -0000	1.2
+++ sources	24 Sep 2009 17:28:12 -0000	1.3
@@ -1 +1 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2



From hadess at fedoraproject.org  Thu Sep 24 17:34:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 24 Sep 2009 17:34:15 +0000 (UTC)
Subject: rpms/rygel/devel
	0001-core-data-Forgotten-update-to-Rygel-D-Bus-paths.patch, NONE,
	1.1 rygel.spec, 1.10, 1.11
Message-ID: <20090924173415.CA79811C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3104

Modified Files:
	rygel.spec 
Added Files:
	0001-core-data-Forgotten-update-to-Rygel-D-Bus-paths.patch 
Log Message:
* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 0.4-4
- Make the prefs work


0001-core-data-Forgotten-update-to-Rygel-D-Bus-paths.patch:
 data/org.gnome.Rygel1.service.in |    2 +-
 src/rygel/rygel-user-config.vala |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0001-core-data-Forgotten-update-to-Rygel-D-Bus-paths.patch ---
>From 7295875d030c7ad70e40b6b81e84eb5d346e1e41 Mon Sep 17 00:00:00 2001
From: Zeeshan Ali (Khattak) <zeeshanak at gnome.org>
Date: Thu, 24 Sep 2009 20:07:18 +0300
Subject: [PATCH] core,data: Forgotten update to Rygel D-Bus paths

Oops, had forgotten to update the D-Bus paths everywhere after the
versioning change.
---
 data/org.gnome.Rygel1.service.in |    2 +-
 src/rygel/rygel-user-config.vala |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/org.gnome.Rygel1.service.in b/data/org.gnome.Rygel1.service.in
index 4cbe9d7..dbc3029 100644
--- a/data/org.gnome.Rygel1.service.in
+++ b/data/org.gnome.Rygel1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Rygel
+Name=org.gnome.Rygel1
 Exec=@bindir@/rygel
diff --git a/src/rygel/rygel-user-config.vala b/src/rygel/rygel-user-config.vala
index c8477ed..d020ae3 100644
--- a/src/rygel/rygel-user-config.vala
+++ b/src/rygel/rygel-user-config.vala
@@ -44,9 +44,9 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
     private const string DBUS_PATH = "/org/freedesktop/DBus";
     private const string DBUS_INTERFACE = "org.freedesktop.DBus";
 
-    private const string RYGEL_SERVICE = "org.gnome.Rygel";
-    private const string RYGEL_PATH = "/org/gnome/Rygel";
-    private const string RYGEL_INTERFACE = "org.gnome.Rygel";
+    private const string RYGEL_SERVICE = "org.gnome.Rygel1";
+    private const string RYGEL_PATH = "/org/gnome/Rygel1";
+    private const string RYGEL_INTERFACE = "org.gnome.Rygel1";
 
     // Our singleton
     private static UserConfig config;
-- 
1.6.2.5



Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rygel.spec	24 Sep 2009 10:19:14 -0000	1.10
+++ rygel.spec	24 Sep 2009 17:34:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -9,6 +9,9 @@ URL:            http://live.gnome.org/Ry
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596211
+Patch0:        0001-core-data-Forgotten-update-to-Rygel-D-Bus-paths.patch
+
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gstreamer-devel
@@ -93,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 0.4-4
+- Make the prefs work
+
 * Thu Sep 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-3
 - Enable new plugins, add desktop file verification, add more docs
 



From praveenp at fedoraproject.org  Thu Sep 24 17:48:01 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 17:48:01 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.3,1.4
Message-ID: <20090924174801.53A2C11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6361

Modified Files:
	openwsman.spec 
Log Message:
Increased the release for retagging



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openwsman.spec	24 Sep 2009 17:28:12 -0000	1.3
+++ openwsman.spec	24 Sep 2009 17:48:01 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -138,6 +138,8 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
+- increased the release for re-tagging.
 * Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
 - Added the new 2.2.0 sources.
 - Changed the release and version numbers.



From praveenp at fedoraproject.org  Thu Sep 24 17:51:45 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 17:51:45 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.4,1.5
Message-ID: <20090924175145.C4A9411C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6987

Modified Files:
	openwsman.spec 
Log Message:
Again changed the release for tagging



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openwsman.spec	24 Sep 2009 17:48:01 -0000	1.4
+++ openwsman.spec	24 Sep 2009 17:51:45 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -138,6 +138,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
+- increased the release for re-tagging.
+- one more try
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
 - increased the release for re-tagging.
 * Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1



From tibbs at fedoraproject.org  Thu Sep 24 17:57:47 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 24 Sep 2009 17:57:47 +0000 (UTC)
Subject: status-report-scripts pyGetReviewByFlags,1.18,1.19
Message-ID: <20090924175747.E9EB211C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8381

Modified Files:
	pyGetReviewByFlags 
Log Message:
Filter out FE-Legal tickets and "BuildFails" in the whiteboard.



Index: pyGetReviewByFlags
===================================================================
RCS file: /cvs/fedora/status-report-scripts/pyGetReviewByFlags,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pyGetReviewByFlags	12 Feb 2009 03:17:08 -0000	1.18
+++ pyGetReviewByFlags	24 Sep 2009 17:57:47 -0000	1.19
@@ -27,6 +27,9 @@
 ACCEPT      = '163779'
 NEEDSPONSOR = '177841'
 GUIDELINES  = '197974'
+LEGAL       = '182235'
+
+# These three will show up in a query but aren't actual review tickets
 trackers = set([ACCEPT, NEEDSPONSOR, GUIDELINES])
 
 flagData = {
@@ -141,8 +144,12 @@
     for bug in bugs:
         if bug.bug_status == "CLOSED":
             closedCnt += 1
-        elif flag == ' ' and (bug.status_whiteboard.find('NotReady') >= 0
-                or filter(opendep, bugdata[bug.bug_id]['depends'])):
+        elif flag == ' ' and (
+                bug.status_whiteboard.find('NotReady') >= 0
+                or bug.status_whiteboard.find('BuildFails') >= 0
+                or LEGAL in bugdata[bug.bug_id]['blockedby']
+                or filter(opendep, bugdata[bug.bug_id]['depends'])
+                ):
             hiddenCnt += 1
             bugdata[bug.bug_id]['hidden'] = 1
         else:



From praveenp at fedoraproject.org  Thu Sep 24 18:00:46 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 18:00:46 +0000 (UTC)
Subject: rpms/sblim-sfcb/devel import.log, NONE,
	1.1 sblim-sfcb-disable_auto_service_start.patch, NONE,
	1.1 sblim-sfcb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924180046.2DACE11C0337@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9123/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-sfcb-disable_auto_service_start.patch 
	sblim-sfcb.spec 
Log Message:
sblim-sfcb in devel branch



--- NEW FILE import.log ---
sblim-sfcb-1_3_4-8_fc10:HEAD:sblim-sfcb-1.3.4-8.fc10.src.rpm:1253815237

sblim-sfcb-disable_auto_service_start.patch:
 sfcb.init-redhat.in |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE sblim-sfcb-disable_auto_service_start.patch ---
*** /root/rpmbuild/SOURCES/sblim-sfcb-1.3.4.orig/sfcb.init-redhat.in	2005-06-13 18:20:33.000000000 +0530
--- sblim-sfcb-1.3.4.modified/sfcb.init-redhat.in	2009-09-03 19:59:01.000000000 +0530
***************
*** 2,8 ****
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: 35 20 80
  #
  # description: Small Footprint CIM Broker Service
  #
--- 2,8 ----
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: - 20 80
  #
  # description: Small Footprint CIM Broker Service
  #


--- NEW FILE sblim-sfcb.spec ---
#
# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $
#
# Package spec for sblim-sfcb
#

Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
Version: 1.3.4
Release: 8%{dist}
Group: Applications/System
License: EPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
patch0:	%{name}-disable_auto_service_start.patch
Provides: cim-server
Requires: cim-schema
BuildRequires: libcurl-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
BuildRequires: bison flex

%Description
Small Footprint CIM Broker (sfcb) is a CIM server conforming to the
CIM Operations over HTTP protocol.
It is robust, with low resource consumption and therefore specifically 
suited for embedded and resource constrained environments.
sfcb supports providers written against the Common Manageability
Programming Interface (CMPI).

#%package devel
#Summary:	Sblim-sfcb Development Files
#Group:		Development/Libraries
#Requires:	%{name} = %{version}-%{release}
#%description devel
#Sblim-sfcb Development Files

%prep
%setup -q -T -b 0 -n %{name}-%{version}
%patch0 -p1

%build
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
make 

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_initddir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
# remove unused static libraries and so files
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so

echo "%defattr(-,root,root,-)" > _pkg_list

find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
#mv -f _pkg_list_2 _pkg_list
echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
echo "%doc %{_datadir}/doc/*" >> _pkg_list
echo "%{_datadir}/man/man1/*" >> _pkg_list
echo "%{_initddir}/sblim-sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list

cat _pkg_list

%clean
rm -rf $RPM_BUILD_ROOT 

%post 
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
/sbin/ldconfig
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
/sbin/chkconfig --add sblim-sfcb

%preun
if [ $1 = 0 ]; then
	/sbin/service sblim-sfcb stop&>/dev/null
	/sbin/chkconfig	--del	sblim-sfcb
fi

%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
	/sbin/service sblim-sfcb condrestart|try-restart &> /dev/null
fi

%files -f _pkg_list

#%files devel
#%defattr(-,root,root)
##%{_includedir}/*
#%{_libdir}/sfcb/*.so*
#%{_libdir}/sfcb/*.la
#%doc COPYING README

%changelog
* Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
- Removed the devel package and moved the init script to right directory
* Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7
- Modified the spec based on Praveen's comments

* Thu Sep 10 2009 <srinivas_ramanatha at dell.com> - 1.3.4-6
- Fixed the incoherent init script problem by renaming the init script

* Thu Sep 03 2009 <srinivas_ramanatha at dell.com> - 1.3.4-5
- added the devel package to fit in all the development files 
- Made changes to the initscript not to start the service by default

* Thu Jul 02 2009 <ratliff at austin.ibm.com> - 1.3.4-4
- added build requires for flex, bison, cim-schema suggested by Sean Swehla
- added sfcbrepos directive to post section

* Thu Jun 18 2009 <ratliff at austin.ibm.com> - 1.3.4-3
- re-ordered the top so that the name comes first
- added the la files to the package list
- removed the smp flags from make because that causes a build break
- updated spec file to remove schema and require the cim-schema package
- change provides statement to cim-server as suggested by Matt Domsch
- updated to upstream version 1.3.4 which was released Jun 15 2009

* Thu Oct 09 2008 <ratliff at austin.ibm.com> - 1.3.2-2
- updated spec file based on comments from Srini Ramanatha as below:
- updated the Release line to add dist to be consistent with sblim-sfcc
- updated the source URL

* Wed Oct 08 2008 <ratliff at austin.ibm.com> - 1.3.2-1
- updated upstream version and added CFLAGS to configure to work 
- around http://sources.redhat.com/bugzilla/show_bug.cgi?id=6545

* Fri Aug 08 2008 <ratliff at austin.ibm.com> - 1.3.0-1
- updated buildrequires to require libcurl-devel rather than curl-devel
- removed requires to allow rpm to automatically generate the requires
- removed echo to stdout
- removed paranoia check around cleaning BuildRoot per Fedora MUST requirements
- changed group to supress rpmlint complaint
- added chkconfig to enable sfcb by default when it is installed
- added patch0 to enable 1.3.0 to build on Fedora 9

* Fri Feb 09 2007  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 1.2.1-0
- Updated for 1.2.1 content, enabled SSL, indications

* Wed Aug 31 2005  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 0.9.0b-0
- Support for man pages added


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:25:04 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:00:45 -0000	1.2
@@ -0,0 +1 @@
+sblim-sfcb-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:25:04 -0000	1.1
+++ sources	24 Sep 2009 18:00:45 -0000	1.2
@@ -0,0 +1 @@
+486fe536ad5ac5c58dd60ea03fc1bb21  sblim-sfcb-1.3.4.tar.bz2



From praveenp at fedoraproject.org  Thu Sep 24 18:02:24 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 18:02:24 +0000 (UTC)
Subject: rpms/sblim-sfcb/F-10 import.log, NONE,
	1.1 sblim-sfcb-disable_auto_service_start.patch, NONE,
	1.1 sblim-sfcb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924180224.39A2B11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9699/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-sfcb-disable_auto_service_start.patch 
	sblim-sfcb.spec 
Log Message:
sblim-sfcb in Fedora 10



--- NEW FILE import.log ---
sblim-sfcb-1_3_4-8_fc10:F-10:sblim-sfcb-1.3.4-8.fc10.src.rpm:1253815319

sblim-sfcb-disable_auto_service_start.patch:
 sfcb.init-redhat.in |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE sblim-sfcb-disable_auto_service_start.patch ---
*** /root/rpmbuild/SOURCES/sblim-sfcb-1.3.4.orig/sfcb.init-redhat.in	2005-06-13 18:20:33.000000000 +0530
--- sblim-sfcb-1.3.4.modified/sfcb.init-redhat.in	2009-09-03 19:59:01.000000000 +0530
***************
*** 2,8 ****
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: 35 20 80
  #
  # description: Small Footprint CIM Broker Service
  #
--- 2,8 ----
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: - 20 80
  #
  # description: Small Footprint CIM Broker Service
  #


--- NEW FILE sblim-sfcb.spec ---
#
# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $
#
# Package spec for sblim-sfcb
#

Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
Version: 1.3.4
Release: 8%{dist}
Group: Applications/System
License: EPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
patch0:	%{name}-disable_auto_service_start.patch
Provides: cim-server
Requires: cim-schema
BuildRequires: libcurl-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
BuildRequires: bison flex

%Description
Small Footprint CIM Broker (sfcb) is a CIM server conforming to the
CIM Operations over HTTP protocol.
It is robust, with low resource consumption and therefore specifically 
suited for embedded and resource constrained environments.
sfcb supports providers written against the Common Manageability
Programming Interface (CMPI).

#%package devel
#Summary:	Sblim-sfcb Development Files
#Group:		Development/Libraries
#Requires:	%{name} = %{version}-%{release}
#%description devel
#Sblim-sfcb Development Files

%prep
%setup -q -T -b 0 -n %{name}-%{version}
%patch0 -p1

%build
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
make 

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_initddir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
# remove unused static libraries and so files
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so

echo "%defattr(-,root,root,-)" > _pkg_list

find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
#mv -f _pkg_list_2 _pkg_list
echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
echo "%doc %{_datadir}/doc/*" >> _pkg_list
echo "%{_datadir}/man/man1/*" >> _pkg_list
echo "%{_initddir}/sblim-sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list

cat _pkg_list

%clean
rm -rf $RPM_BUILD_ROOT 

%post 
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
/sbin/ldconfig
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
/sbin/chkconfig --add sblim-sfcb

%preun
if [ $1 = 0 ]; then
	/sbin/service sblim-sfcb stop&>/dev/null
	/sbin/chkconfig	--del	sblim-sfcb
fi

%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
	/sbin/service sblim-sfcb condrestart|try-restart &> /dev/null
fi

%files -f _pkg_list

#%files devel
#%defattr(-,root,root)
##%{_includedir}/*
#%{_libdir}/sfcb/*.so*
#%{_libdir}/sfcb/*.la
#%doc COPYING README

%changelog
* Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
- Removed the devel package and moved the init script to right directory
* Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7
- Modified the spec based on Praveen's comments

* Thu Sep 10 2009 <srinivas_ramanatha at dell.com> - 1.3.4-6
- Fixed the incoherent init script problem by renaming the init script

* Thu Sep 03 2009 <srinivas_ramanatha at dell.com> - 1.3.4-5
- added the devel package to fit in all the development files 
- Made changes to the initscript not to start the service by default

* Thu Jul 02 2009 <ratliff at austin.ibm.com> - 1.3.4-4
- added build requires for flex, bison, cim-schema suggested by Sean Swehla
- added sfcbrepos directive to post section

* Thu Jun 18 2009 <ratliff at austin.ibm.com> - 1.3.4-3
- re-ordered the top so that the name comes first
- added the la files to the package list
- removed the smp flags from make because that causes a build break
- updated spec file to remove schema and require the cim-schema package
- change provides statement to cim-server as suggested by Matt Domsch
- updated to upstream version 1.3.4 which was released Jun 15 2009

* Thu Oct 09 2008 <ratliff at austin.ibm.com> - 1.3.2-2
- updated spec file based on comments from Srini Ramanatha as below:
- updated the Release line to add dist to be consistent with sblim-sfcc
- updated the source URL

* Wed Oct 08 2008 <ratliff at austin.ibm.com> - 1.3.2-1
- updated upstream version and added CFLAGS to configure to work 
- around http://sources.redhat.com/bugzilla/show_bug.cgi?id=6545

* Fri Aug 08 2008 <ratliff at austin.ibm.com> - 1.3.0-1
- updated buildrequires to require libcurl-devel rather than curl-devel
- removed requires to allow rpm to automatically generate the requires
- removed echo to stdout
- removed paranoia check around cleaning BuildRoot per Fedora MUST requirements
- changed group to supress rpmlint complaint
- added chkconfig to enable sfcb by default when it is installed
- added patch0 to enable 1.3.0 to build on Fedora 9

* Fri Feb 09 2007  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 1.2.1-0
- Updated for 1.2.1 content, enabled SSL, indications

* Wed Aug 31 2005  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 0.9.0b-0
- Support for man pages added


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:25:04 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:02:23 -0000	1.2
@@ -0,0 +1 @@
+sblim-sfcb-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:25:04 -0000	1.1
+++ sources	24 Sep 2009 18:02:23 -0000	1.2
@@ -0,0 +1 @@
+486fe536ad5ac5c58dd60ea03fc1bb21  sblim-sfcb-1.3.4.tar.bz2



From veillard at fedoraproject.org  Thu Sep 24 18:02:37 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 24 Sep 2009 18:02:37 +0000 (UTC)
Subject: rpms/libxml2/F-11 libxml2.spec, 1.73, 1.74 sources, 1.47,
	1.48 libxml2-2.7.4-input-parser.patch, 1.1, NONE
Message-ID: <20090924180237.CCE8311C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9767

Modified Files:
	libxml2.spec sources 
Removed Files:
	libxml2-2.7.4-input-parser.patch 
Log Message:
Upstream release of 2.7.5, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/libxml2.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- libxml2.spec	15 Sep 2009 17:07:27 -0000	1.73
+++ libxml2.spec	24 Sep 2009 18:02:37 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.4
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.5
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -68,7 +67,6 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
+- Upstream release of 2.7.5
+- fix a couple of Relax-NG validation problems
+- couple more fixes
+
 * Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-2
 - fix a problem with little data at startup affecting inkscape #523002
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	10 Sep 2009 17:48:16 -0000	1.47
+++ sources	24 Sep 2009 18:02:37 -0000	1.48
@@ -1 +1,2 @@
 961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
+2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz


--- libxml2-2.7.4-input-parser.patch DELETED ---



From praveenp at fedoraproject.org  Thu Sep 24 18:02:49 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 18:02:49 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-4 import.log, NONE,
	1.1 sblim-sfcb-disable_auto_service_start.patch, NONE,
	1.1 sblim-sfcb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924180249.612C811C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10228/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-sfcb-disable_auto_service_start.patch 
	sblim-sfcb.spec 
Log Message:
sblim-sfcb in EL-4



--- NEW FILE import.log ---
sblim-sfcb-1_3_4-8_fc10:EL-4:sblim-sfcb-1.3.4-8.fc10.src.rpm:1253815359

sblim-sfcb-disable_auto_service_start.patch:
 sfcb.init-redhat.in |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE sblim-sfcb-disable_auto_service_start.patch ---
*** /root/rpmbuild/SOURCES/sblim-sfcb-1.3.4.orig/sfcb.init-redhat.in	2005-06-13 18:20:33.000000000 +0530
--- sblim-sfcb-1.3.4.modified/sfcb.init-redhat.in	2009-09-03 19:59:01.000000000 +0530
***************
*** 2,8 ****
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: 35 20 80
  #
  # description: Small Footprint CIM Broker Service
  #
--- 2,8 ----
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: - 20 80
  #
  # description: Small Footprint CIM Broker Service
  #


--- NEW FILE sblim-sfcb.spec ---
#
# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $
#
# Package spec for sblim-sfcb
#

Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
Version: 1.3.4
Release: 8%{dist}
Group: Applications/System
License: EPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
patch0:	%{name}-disable_auto_service_start.patch
Provides: cim-server
Requires: cim-schema
BuildRequires: libcurl-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
BuildRequires: bison flex

%Description
Small Footprint CIM Broker (sfcb) is a CIM server conforming to the
CIM Operations over HTTP protocol.
It is robust, with low resource consumption and therefore specifically 
suited for embedded and resource constrained environments.
sfcb supports providers written against the Common Manageability
Programming Interface (CMPI).

#%package devel
#Summary:	Sblim-sfcb Development Files
#Group:		Development/Libraries
#Requires:	%{name} = %{version}-%{release}
#%description devel
#Sblim-sfcb Development Files

%prep
%setup -q -T -b 0 -n %{name}-%{version}
%patch0 -p1

%build
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
make 

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_initddir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
# remove unused static libraries and so files
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so

echo "%defattr(-,root,root,-)" > _pkg_list

find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
#mv -f _pkg_list_2 _pkg_list
echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
echo "%doc %{_datadir}/doc/*" >> _pkg_list
echo "%{_datadir}/man/man1/*" >> _pkg_list
echo "%{_initddir}/sblim-sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list

cat _pkg_list

%clean
rm -rf $RPM_BUILD_ROOT 

%post 
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
/sbin/ldconfig
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
/sbin/chkconfig --add sblim-sfcb

%preun
if [ $1 = 0 ]; then
	/sbin/service sblim-sfcb stop&>/dev/null
	/sbin/chkconfig	--del	sblim-sfcb
fi

%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
	/sbin/service sblim-sfcb condrestart|try-restart &> /dev/null
fi

%files -f _pkg_list

#%files devel
#%defattr(-,root,root)
##%{_includedir}/*
#%{_libdir}/sfcb/*.so*
#%{_libdir}/sfcb/*.la
#%doc COPYING README

%changelog
* Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
- Removed the devel package and moved the init script to right directory
* Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7
- Modified the spec based on Praveen's comments

* Thu Sep 10 2009 <srinivas_ramanatha at dell.com> - 1.3.4-6
- Fixed the incoherent init script problem by renaming the init script

* Thu Sep 03 2009 <srinivas_ramanatha at dell.com> - 1.3.4-5
- added the devel package to fit in all the development files 
- Made changes to the initscript not to start the service by default

* Thu Jul 02 2009 <ratliff at austin.ibm.com> - 1.3.4-4
- added build requires for flex, bison, cim-schema suggested by Sean Swehla
- added sfcbrepos directive to post section

* Thu Jun 18 2009 <ratliff at austin.ibm.com> - 1.3.4-3
- re-ordered the top so that the name comes first
- added the la files to the package list
- removed the smp flags from make because that causes a build break
- updated spec file to remove schema and require the cim-schema package
- change provides statement to cim-server as suggested by Matt Domsch
- updated to upstream version 1.3.4 which was released Jun 15 2009

* Thu Oct 09 2008 <ratliff at austin.ibm.com> - 1.3.2-2
- updated spec file based on comments from Srini Ramanatha as below:
- updated the Release line to add dist to be consistent with sblim-sfcc
- updated the source URL

* Wed Oct 08 2008 <ratliff at austin.ibm.com> - 1.3.2-1
- updated upstream version and added CFLAGS to configure to work 
- around http://sources.redhat.com/bugzilla/show_bug.cgi?id=6545

* Fri Aug 08 2008 <ratliff at austin.ibm.com> - 1.3.0-1
- updated buildrequires to require libcurl-devel rather than curl-devel
- removed requires to allow rpm to automatically generate the requires
- removed echo to stdout
- removed paranoia check around cleaning BuildRoot per Fedora MUST requirements
- changed group to supress rpmlint complaint
- added chkconfig to enable sfcb by default when it is installed
- added patch0 to enable 1.3.0 to build on Fedora 9

* Fri Feb 09 2007  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 1.2.1-0
- Updated for 1.2.1 content, enabled SSL, indications

* Wed Aug 31 2005  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 0.9.0b-0
- Support for man pages added


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:25:04 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:02:49 -0000	1.2
@@ -0,0 +1 @@
+sblim-sfcb-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:25:04 -0000	1.1
+++ sources	24 Sep 2009 18:02:49 -0000	1.2
@@ -0,0 +1 @@
+486fe536ad5ac5c58dd60ea03fc1bb21  sblim-sfcb-1.3.4.tar.bz2



From praveenp at fedoraproject.org  Thu Sep 24 18:03:16 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 18:03:16 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-5 import.log, NONE,
	1.1 sblim-sfcb-disable_auto_service_start.patch, NONE,
	1.1 sblim-sfcb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924180316.4F94411C0337@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10504/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-sfcb-disable_auto_service_start.patch 
	sblim-sfcb.spec 
Log Message:
sblim-sfcb in EL-5



--- NEW FILE import.log ---
sblim-sfcb-1_3_4-8_fc10:EL-5:sblim-sfcb-1.3.4-8.fc10.src.rpm:1253815378

sblim-sfcb-disable_auto_service_start.patch:
 sfcb.init-redhat.in |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE sblim-sfcb-disable_auto_service_start.patch ---
*** /root/rpmbuild/SOURCES/sblim-sfcb-1.3.4.orig/sfcb.init-redhat.in	2005-06-13 18:20:33.000000000 +0530
--- sblim-sfcb-1.3.4.modified/sfcb.init-redhat.in	2009-09-03 19:59:01.000000000 +0530
***************
*** 2,8 ****
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: 35 20 80
  #
  # description: Small Footprint CIM Broker Service
  #
--- 2,8 ----
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: - 20 80
  #
  # description: Small Footprint CIM Broker Service
  #


--- NEW FILE sblim-sfcb.spec ---
#
# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $
#
# Package spec for sblim-sfcb
#

Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
Version: 1.3.4
Release: 8%{dist}
Group: Applications/System
License: EPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
patch0:	%{name}-disable_auto_service_start.patch
Provides: cim-server
Requires: cim-schema
BuildRequires: libcurl-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
BuildRequires: bison flex

%Description
Small Footprint CIM Broker (sfcb) is a CIM server conforming to the
CIM Operations over HTTP protocol.
It is robust, with low resource consumption and therefore specifically 
suited for embedded and resource constrained environments.
sfcb supports providers written against the Common Manageability
Programming Interface (CMPI).

#%package devel
#Summary:	Sblim-sfcb Development Files
#Group:		Development/Libraries
#Requires:	%{name} = %{version}-%{release}
#%description devel
#Sblim-sfcb Development Files

%prep
%setup -q -T -b 0 -n %{name}-%{version}
%patch0 -p1

%build
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
make 

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_initddir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
# remove unused static libraries and so files
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so

echo "%defattr(-,root,root,-)" > _pkg_list

find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
#mv -f _pkg_list_2 _pkg_list
echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
echo "%doc %{_datadir}/doc/*" >> _pkg_list
echo "%{_datadir}/man/man1/*" >> _pkg_list
echo "%{_initddir}/sblim-sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list

cat _pkg_list

%clean
rm -rf $RPM_BUILD_ROOT 

%post 
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
/sbin/ldconfig
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
/sbin/chkconfig --add sblim-sfcb

%preun
if [ $1 = 0 ]; then
	/sbin/service sblim-sfcb stop&>/dev/null
	/sbin/chkconfig	--del	sblim-sfcb
fi

%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
	/sbin/service sblim-sfcb condrestart|try-restart &> /dev/null
fi

%files -f _pkg_list

#%files devel
#%defattr(-,root,root)
##%{_includedir}/*
#%{_libdir}/sfcb/*.so*
#%{_libdir}/sfcb/*.la
#%doc COPYING README

%changelog
* Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
- Removed the devel package and moved the init script to right directory
* Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7
- Modified the spec based on Praveen's comments

* Thu Sep 10 2009 <srinivas_ramanatha at dell.com> - 1.3.4-6
- Fixed the incoherent init script problem by renaming the init script

* Thu Sep 03 2009 <srinivas_ramanatha at dell.com> - 1.3.4-5
- added the devel package to fit in all the development files 
- Made changes to the initscript not to start the service by default

* Thu Jul 02 2009 <ratliff at austin.ibm.com> - 1.3.4-4
- added build requires for flex, bison, cim-schema suggested by Sean Swehla
- added sfcbrepos directive to post section

* Thu Jun 18 2009 <ratliff at austin.ibm.com> - 1.3.4-3
- re-ordered the top so that the name comes first
- added the la files to the package list
- removed the smp flags from make because that causes a build break
- updated spec file to remove schema and require the cim-schema package
- change provides statement to cim-server as suggested by Matt Domsch
- updated to upstream version 1.3.4 which was released Jun 15 2009

* Thu Oct 09 2008 <ratliff at austin.ibm.com> - 1.3.2-2
- updated spec file based on comments from Srini Ramanatha as below:
- updated the Release line to add dist to be consistent with sblim-sfcc
- updated the source URL

* Wed Oct 08 2008 <ratliff at austin.ibm.com> - 1.3.2-1
- updated upstream version and added CFLAGS to configure to work 
- around http://sources.redhat.com/bugzilla/show_bug.cgi?id=6545

* Fri Aug 08 2008 <ratliff at austin.ibm.com> - 1.3.0-1
- updated buildrequires to require libcurl-devel rather than curl-devel
- removed requires to allow rpm to automatically generate the requires
- removed echo to stdout
- removed paranoia check around cleaning BuildRoot per Fedora MUST requirements
- changed group to supress rpmlint complaint
- added chkconfig to enable sfcb by default when it is installed
- added patch0 to enable 1.3.0 to build on Fedora 9

* Fri Feb 09 2007  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 1.2.1-0
- Updated for 1.2.1 content, enabled SSL, indications

* Wed Aug 31 2005  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 0.9.0b-0
- Support for man pages added


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:25:04 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:03:15 -0000	1.2
@@ -0,0 +1 @@
+sblim-sfcb-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:25:04 -0000	1.1
+++ sources	24 Sep 2009 18:03:15 -0000	1.2
@@ -0,0 +1 @@
+486fe536ad5ac5c58dd60ea03fc1bb21  sblim-sfcb-1.3.4.tar.bz2



From praveenp at fedoraproject.org  Thu Sep 24 18:05:00 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 18:05:00 +0000 (UTC)
Subject: rpms/sblim-sfcb/F-11 import.log, NONE,
	1.1 sblim-sfcb-disable_auto_service_start.patch, NONE,
	1.1 sblim-sfcb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924180500.95E8F11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11550/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-sfcb-disable_auto_service_start.patch 
	sblim-sfcb.spec 
Log Message:
sblim-sfcb in Fedora 11



--- NEW FILE import.log ---
sblim-sfcb-1_3_4-8_fc10:F-11:sblim-sfcb-1.3.4-8.fc10.src.rpm:1253815473

sblim-sfcb-disable_auto_service_start.patch:
 sfcb.init-redhat.in |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE sblim-sfcb-disable_auto_service_start.patch ---
*** /root/rpmbuild/SOURCES/sblim-sfcb-1.3.4.orig/sfcb.init-redhat.in	2005-06-13 18:20:33.000000000 +0530
--- sblim-sfcb-1.3.4.modified/sfcb.init-redhat.in	2009-09-03 19:59:01.000000000 +0530
***************
*** 2,8 ****
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: 35 20 80
  #
  # description: Small Footprint CIM Broker Service
  #
--- 2,8 ----
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: - 20 80
  #
  # description: Small Footprint CIM Broker Service
  #


--- NEW FILE sblim-sfcb.spec ---
#
# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $
#
# Package spec for sblim-sfcb
#

Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
Version: 1.3.4
Release: 8%{dist}
Group: Applications/System
License: EPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
patch0:	%{name}-disable_auto_service_start.patch
Provides: cim-server
Requires: cim-schema
BuildRequires: libcurl-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
BuildRequires: bison flex

%Description
Small Footprint CIM Broker (sfcb) is a CIM server conforming to the
CIM Operations over HTTP protocol.
It is robust, with low resource consumption and therefore specifically 
suited for embedded and resource constrained environments.
sfcb supports providers written against the Common Manageability
Programming Interface (CMPI).

#%package devel
#Summary:	Sblim-sfcb Development Files
#Group:		Development/Libraries
#Requires:	%{name} = %{version}-%{release}
#%description devel
#Sblim-sfcb Development Files

%prep
%setup -q -T -b 0 -n %{name}-%{version}
%patch0 -p1

%build
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
make 

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_initddir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
# remove unused static libraries and so files
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so

echo "%defattr(-,root,root,-)" > _pkg_list

find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
#mv -f _pkg_list_2 _pkg_list
echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
echo "%doc %{_datadir}/doc/*" >> _pkg_list
echo "%{_datadir}/man/man1/*" >> _pkg_list
echo "%{_initddir}/sblim-sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list

cat _pkg_list

%clean
rm -rf $RPM_BUILD_ROOT 

%post 
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
/sbin/ldconfig
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
/sbin/chkconfig --add sblim-sfcb

%preun
if [ $1 = 0 ]; then
	/sbin/service sblim-sfcb stop&>/dev/null
	/sbin/chkconfig	--del	sblim-sfcb
fi

%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
	/sbin/service sblim-sfcb condrestart|try-restart &> /dev/null
fi

%files -f _pkg_list

#%files devel
#%defattr(-,root,root)
##%{_includedir}/*
#%{_libdir}/sfcb/*.so*
#%{_libdir}/sfcb/*.la
#%doc COPYING README

%changelog
* Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
- Removed the devel package and moved the init script to right directory
* Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7
- Modified the spec based on Praveen's comments

* Thu Sep 10 2009 <srinivas_ramanatha at dell.com> - 1.3.4-6
- Fixed the incoherent init script problem by renaming the init script

* Thu Sep 03 2009 <srinivas_ramanatha at dell.com> - 1.3.4-5
- added the devel package to fit in all the development files 
- Made changes to the initscript not to start the service by default

* Thu Jul 02 2009 <ratliff at austin.ibm.com> - 1.3.4-4
- added build requires for flex, bison, cim-schema suggested by Sean Swehla
- added sfcbrepos directive to post section

* Thu Jun 18 2009 <ratliff at austin.ibm.com> - 1.3.4-3
- re-ordered the top so that the name comes first
- added the la files to the package list
- removed the smp flags from make because that causes a build break
- updated spec file to remove schema and require the cim-schema package
- change provides statement to cim-server as suggested by Matt Domsch
- updated to upstream version 1.3.4 which was released Jun 15 2009

* Thu Oct 09 2008 <ratliff at austin.ibm.com> - 1.3.2-2
- updated spec file based on comments from Srini Ramanatha as below:
- updated the Release line to add dist to be consistent with sblim-sfcc
- updated the source URL

* Wed Oct 08 2008 <ratliff at austin.ibm.com> - 1.3.2-1
- updated upstream version and added CFLAGS to configure to work 
- around http://sources.redhat.com/bugzilla/show_bug.cgi?id=6545

* Fri Aug 08 2008 <ratliff at austin.ibm.com> - 1.3.0-1
- updated buildrequires to require libcurl-devel rather than curl-devel
- removed requires to allow rpm to automatically generate the requires
- removed echo to stdout
- removed paranoia check around cleaning BuildRoot per Fedora MUST requirements
- changed group to supress rpmlint complaint
- added chkconfig to enable sfcb by default when it is installed
- added patch0 to enable 1.3.0 to build on Fedora 9

* Fri Feb 09 2007  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 1.2.1-0
- Updated for 1.2.1 content, enabled SSL, indications

* Wed Aug 31 2005  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 0.9.0b-0
- Support for man pages added


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:25:04 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:05:00 -0000	1.2
@@ -0,0 +1 @@
+sblim-sfcb-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:25:04 -0000	1.1
+++ sources	24 Sep 2009 18:05:00 -0000	1.2
@@ -0,0 +1 @@
+486fe536ad5ac5c58dd60ea03fc1bb21  sblim-sfcb-1.3.4.tar.bz2



From praveenp at fedoraproject.org  Thu Sep 24 18:05:24 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 18:05:24 +0000 (UTC)
Subject: rpms/sblim-sfcb/F-12 import.log, NONE,
	1.1 sblim-sfcb-disable_auto_service_start.patch, NONE,
	1.1 sblim-sfcb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924180524.556D111C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11694/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-sfcb-disable_auto_service_start.patch 
	sblim-sfcb.spec 
Log Message:
sblim-sfcb in Fedora 12



--- NEW FILE import.log ---
sblim-sfcb-1_3_4-8_fc10:F-12:sblim-sfcb-1.3.4-8.fc10.src.rpm:1253815500

sblim-sfcb-disable_auto_service_start.patch:
 sfcb.init-redhat.in |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE sblim-sfcb-disable_auto_service_start.patch ---
*** /root/rpmbuild/SOURCES/sblim-sfcb-1.3.4.orig/sfcb.init-redhat.in	2005-06-13 18:20:33.000000000 +0530
--- sblim-sfcb-1.3.4.modified/sfcb.init-redhat.in	2009-09-03 19:59:01.000000000 +0530
***************
*** 2,8 ****
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: 35 20 80
  #
  # description: Small Footprint CIM Broker Service
  #
--- 2,8 ----
  #
  # $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $
  #
! # chkconfig: - 20 80
  #
  # description: Small Footprint CIM Broker Service
  #


--- NEW FILE sblim-sfcb.spec ---
#
# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $
#
# Package spec for sblim-sfcb
#

Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
Version: 1.3.4
Release: 8%{dist}
Group: Applications/System
License: EPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
patch0:	%{name}-disable_auto_service_start.patch
Provides: cim-server
Requires: cim-schema
BuildRequires: libcurl-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
BuildRequires: bison flex

%Description
Small Footprint CIM Broker (sfcb) is a CIM server conforming to the
CIM Operations over HTTP protocol.
It is robust, with low resource consumption and therefore specifically 
suited for embedded and resource constrained environments.
sfcb supports providers written against the Common Manageability
Programming Interface (CMPI).

#%package devel
#Summary:	Sblim-sfcb Development Files
#Group:		Development/Libraries
#Requires:	%{name} = %{version}-%{release}
#%description devel
#Sblim-sfcb Development Files

%prep
%setup -q -T -b 0 -n %{name}-%{version}
%patch0 -p1

%build
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
make 

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_initddir}
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
# remove unused static libraries and so files
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so

echo "%defattr(-,root,root,-)" > _pkg_list

find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
#mv -f _pkg_list_2 _pkg_list
echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list
echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
echo "%doc %{_datadir}/doc/*" >> _pkg_list
echo "%{_datadir}/man/man1/*" >> _pkg_list
echo "%{_initddir}/sblim-sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list

cat _pkg_list

%clean
rm -rf $RPM_BUILD_ROOT 

%post 
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
/sbin/ldconfig
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
/sbin/chkconfig --add sblim-sfcb

%preun
if [ $1 = 0 ]; then
	/sbin/service sblim-sfcb stop&>/dev/null
	/sbin/chkconfig	--del	sblim-sfcb
fi

%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
	/sbin/service sblim-sfcb condrestart|try-restart &> /dev/null
fi

%files -f _pkg_list

#%files devel
#%defattr(-,root,root)
##%{_includedir}/*
#%{_libdir}/sfcb/*.so*
#%{_libdir}/sfcb/*.la
#%doc COPYING README

%changelog
* Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
- Removed the devel package and moved the init script to right directory
* Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7
- Modified the spec based on Praveen's comments

* Thu Sep 10 2009 <srinivas_ramanatha at dell.com> - 1.3.4-6
- Fixed the incoherent init script problem by renaming the init script

* Thu Sep 03 2009 <srinivas_ramanatha at dell.com> - 1.3.4-5
- added the devel package to fit in all the development files 
- Made changes to the initscript not to start the service by default

* Thu Jul 02 2009 <ratliff at austin.ibm.com> - 1.3.4-4
- added build requires for flex, bison, cim-schema suggested by Sean Swehla
- added sfcbrepos directive to post section

* Thu Jun 18 2009 <ratliff at austin.ibm.com> - 1.3.4-3
- re-ordered the top so that the name comes first
- added the la files to the package list
- removed the smp flags from make because that causes a build break
- updated spec file to remove schema and require the cim-schema package
- change provides statement to cim-server as suggested by Matt Domsch
- updated to upstream version 1.3.4 which was released Jun 15 2009

* Thu Oct 09 2008 <ratliff at austin.ibm.com> - 1.3.2-2
- updated spec file based on comments from Srini Ramanatha as below:
- updated the Release line to add dist to be consistent with sblim-sfcc
- updated the source URL

* Wed Oct 08 2008 <ratliff at austin.ibm.com> - 1.3.2-1
- updated upstream version and added CFLAGS to configure to work 
- around http://sources.redhat.com/bugzilla/show_bug.cgi?id=6545

* Fri Aug 08 2008 <ratliff at austin.ibm.com> - 1.3.0-1
- updated buildrequires to require libcurl-devel rather than curl-devel
- removed requires to allow rpm to automatically generate the requires
- removed echo to stdout
- removed paranoia check around cleaning BuildRoot per Fedora MUST requirements
- changed group to supress rpmlint complaint
- added chkconfig to enable sfcb by default when it is installed
- added patch0 to enable 1.3.0 to build on Fedora 9

* Fri Feb 09 2007  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 1.2.1-0
- Updated for 1.2.1 content, enabled SSL, indications

* Wed Aug 31 2005  <mihajlov at dyn-9-152-143-45.boeblingen.de.ibm.com> - 0.9.0b-0
- Support for man pages added


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:25:04 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:05:24 -0000	1.2
@@ -0,0 +1 @@
+sblim-sfcb-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:25:04 -0000	1.1
+++ sources	24 Sep 2009 18:05:24 -0000	1.2
@@ -0,0 +1 @@
+486fe536ad5ac5c58dd60ea03fc1bb21  sblim-sfcb-1.3.4.tar.bz2



From veillard at fedoraproject.org  Thu Sep 24 18:06:11 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Thu, 24 Sep 2009 18:06:11 +0000 (UTC)
Subject: rpms/libxml2/F-10 libxml2.spec, 1.66, 1.67 sources, 1.47,
	1.48 libxml2-2.7.4-input-parser.patch, 1.1, NONE
Message-ID: <20090924180611.572ED11C00DB@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11822

Modified Files:
	libxml2.spec sources 
Removed Files:
	libxml2-2.7.4-input-parser.patch 
Log Message:
Upstream release of libxml2-2.7.5, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/libxml2.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- libxml2.spec	15 Sep 2009 17:12:41 -0000	1.66
+++ libxml2.spec	24 Sep 2009 18:06:11 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.4
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.5
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support
@@ -68,7 +67,6 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
+- Upstream release of 2.7.5
+- fix a couple of Relax-NG validation problems
+- couple more fixes
+
 * Tue Sep 15 2009 Daniel Veillard <veillard at redhat.com> - 2.7.4-2
 - fix a problem with little data at startup affecting inkscape #523002
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	10 Sep 2009 17:52:09 -0000	1.47
+++ sources	24 Sep 2009 18:06:11 -0000	1.48
@@ -1 +1,2 @@
 961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
+2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz


--- libxml2-2.7.4-input-parser.patch DELETED ---



From salimma at fedoraproject.org  Thu Sep 24 18:22:46 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 24 Sep 2009 18:22:46 +0000 (UTC)
Subject: rpms/gnome-applet-window-picker/F-10
	gnome-applet-window-picker.spec, 1.4, 1.5
Message-ID: <20090924182246.99FED11C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-applet-window-picker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17943

Modified Files:
	gnome-applet-window-picker.spec 
Log Message:
F-10: BR on libXres-devel directly



Index: gnome-applet-window-picker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-window-picker/F-10/gnome-applet-window-picker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-applet-window-picker.spec	24 Sep 2009 03:09:33 -0000	1.4
+++ gnome-applet-window-picker.spec	24 Sep 2009 18:22:46 -0000	1.5
@@ -13,6 +13,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  gnome-panel-devel
 BuildRequires:  libwnck-devel
+# F-10: libwnck-devel does not pull libXres-devel through pkgconfig
+BuildRequires:  libXres-devel
+# F-10
 BuildRequires:  intltool
 Requires:       gnome-panel
 Requires(pre):   GConf2



From nalin at fedoraproject.org  Thu Sep 24 18:35:30 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 24 Sep 2009 18:35:30 +0000 (UTC)
Subject: rpms/nss-ldapd/devel nss-ldapd.spec,1.5,1.6
Message-ID: <20090924183530.1873911C00DB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss-ldapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22721

Modified Files:
	nss-ldapd.spec 
Log Message:
rebuild


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/devel/nss-ldapd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss-ldapd.spec	16 Sep 2009 17:31:17 -0000	1.5
+++ nss-ldapd.spec	24 Sep 2009 18:35:29 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:		nss-ldapd
 Version:	0.6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -150,6 +150,9 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-2
+- rebuild
+
 * Wed Sep 16 2009 Nalin Dahyabhai <nalin at redhat.com> 
 - apply Mitchell Berger's patch to clean up the init script, use %%{_initddir},
   and correct the %%post so that it only thinks about turning on nslcd when



From mtasaka at fedoraproject.org  Thu Sep 24 18:37:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 24 Sep 2009 18:37:17 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-12 .cvsignore, 1.8, 1.9 ruby-gnome2.spec, 1.46, 
	1.47 sources, 1.8, 1.9
Message-ID: <20090924183717.7ABCE11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23153/F-12

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Log Message:
* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
- Update to 0.19.3
- Released source does not support gio yet



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Aug 2009 19:02:23 -0000	1.8
+++ .cvsignore	24 Sep 2009 18:37:17 -0000	1.9
@@ -1 +1 @@
-ruby-gnome2-all-0.19.1.tar.gz
+ruby-gnome2-all-0.19.3.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-12/ruby-gnome2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ruby-gnome2.spec	9 Sep 2009 18:18:53 -0000	1.46
+++ ruby-gnome2.spec	24 Sep 2009 18:37:17 -0000	1.47
@@ -2,13 +2,13 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
+#%%define         betaver                svn3690_trunk
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                2
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -16,7 +16,7 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.1
+Version:        0.19.3
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
@@ -29,10 +29,9 @@ Group:          System Environment/Libra
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
+#Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# ruby-gnome2-Bugs-2831660
-Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -764,8 +763,8 @@ This package provides libraries and head
 
 %prep
 %setup -q -n %{name}-all-%{version}
+#%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
-%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -778,6 +777,9 @@ find . -name \*.rb -or -name \*.c | whil
 done
 set -x
 
+# cleanup
+# find . -type d -path '*/sample/*.svn' | sort -r | xargs rm -rf
+
 %build
 ruby extconf.rb
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -804,7 +806,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnome2.pc
 
 %files -n ruby-atk
 %defattr(-,root,root,-)
@@ -816,7 +818,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
-%{_libdir}/pkgconfig/atk-ruby.pc
+%{_libdir}/pkgconfig/ruby-atk.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -826,7 +828,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonobo2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonobo2.pc
 
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
@@ -836,7 +838,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonoboui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonoboui2.pc
 
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
@@ -846,7 +848,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gconf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gconf2.pc
 
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
@@ -856,7 +858,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gdkpixbuf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gdkpixbuf2.pc
 
 %files -n ruby-glib2
 %defattr(-,root,root,-)
@@ -874,7 +876,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
-%{_libdir}/pkgconfig/glib-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-glib2.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -884,7 +886,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomecanvas2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomecanvas2.pc
 
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
@@ -895,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-gnomeprint2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rblibgnomeprintversion.h
-%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprint2.pc
 
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
@@ -905,7 +907,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomeprintui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprintui2.pc
 
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
@@ -915,7 +917,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomevfs-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomevfs.pc
 
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
@@ -925,7 +927,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-goocanvas-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/goocanvas-ruby.pc
+%{_libdir}/pkgconfig/ruby-goocanvas.pc
 
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
@@ -935,7 +937,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gstreamer-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+%{_libdir}/pkgconfig/ruby-gstreamer.pc
 
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
@@ -946,6 +948,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/gtk2/base.rb
 #%{ruby_sitelib}/gtk2/base.rb
 %{ruby_sitearch}/gtk2.so
+# For now include gio here
+%if 0
+%{ruby_sitelib}/gio2.rb
+%{ruby_sitearch}/gio2.so
+%endif
 
 %files -n ruby-gtk2-devel
 %defattr(-,root,root,-)
@@ -954,7 +961,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
-%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtk2.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -964,7 +971,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkglext-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkglext.pc
 
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
@@ -974,7 +981,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkhtml2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkhtml2.pc
 
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
@@ -984,7 +991,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkmozembed-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkmozembed.pc
 
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
@@ -994,7 +1001,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview.pc
 
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
@@ -1004,7 +1011,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview2.pc
 
 %files -n ruby-libart2
 %defattr(-,root,root,-)
@@ -1015,7 +1022,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
-%{_libdir}/pkgconfig/libart-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libart2.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -1027,7 +1034,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-libglade2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libglade2.pc
 
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
@@ -1037,7 +1044,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-panelapplet2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-panelapplet2.pc
 
 %files -n ruby-pango
 %defattr(-,root,root,-)
@@ -1049,7 +1056,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
-%{_libdir}/pkgconfig/pango-ruby.pc
+%{_libdir}/pkgconfig/ruby-pango.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -1059,7 +1066,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-poppler-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/poppler-ruby.pc
+%{_libdir}/pkgconfig/ruby-poppler.pc
 
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
@@ -1069,7 +1076,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-rsvg-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-rsvg2.pc
 
 %files -n ruby-vte
 %defattr(-,root,root,-)
@@ -1077,13 +1084,21 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
-%if 0
 %files -n ruby-vte-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/vte-ruby.pc
-%endif
+%{_libdir}/pkgconfig/ruby-vte.pc
+
 
 %changelog
+* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
+- Update to 0.19.3
+- Released source does not support gio yet
+
+* Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try rev 3690
+- Massive pkgconfig files renaming
+- Enable gio support
+
 * Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - release++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Aug 2009 19:02:23 -0000	1.8
+++ sources	24 Sep 2009 18:37:17 -0000	1.9
@@ -1 +1 @@
-d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz
+771b0cb607a27bddd02860d38e94666f  ruby-gnome2-all-0.19.3.tar.gz



From mtasaka at fedoraproject.org  Thu Sep 24 18:37:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 24 Sep 2009 18:37:17 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel .cvsignore, 1.9, 1.10 ruby-gnome2.spec, 1.47,
	1.48 sources, 1.9, 1.10
Message-ID: <20090924183717.B834F11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23153/devel

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Log Message:
* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
- Update to 0.19.3
- Released source does not support gio yet



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Sep 2009 03:22:08 -0000	1.9
+++ .cvsignore	24 Sep 2009 18:37:17 -0000	1.10
@@ -1 +1 @@
-ruby-gnome2-all-0.19.2-svn3690_trunk.tar.gz
+ruby-gnome2-all-0.19.3.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ruby-gnome2.spec	22 Sep 2009 03:22:08 -0000	1.47
+++ ruby-gnome2.spec	24 Sep 2009 18:37:17 -0000	1.48
@@ -2,13 +2,13 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                svn3690_trunk
+#%%define         betaver                svn3690_trunk
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                0.1.%{betaver}
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -16,7 +16,7 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.2
+Version:        0.19.3
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
@@ -28,8 +28,8 @@ Group:          System Environment/Libra
 
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
-#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
-Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
+#Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -762,8 +762,8 @@ This package provides libraries and head
 
 
 %prep
-#%%setup -q -n %{name}-all-%{version}
-%setup -q -n %{name}-all-%{version}-%{betaver}
+%setup -q -n %{name}-all-%{version}
+#%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
 
 # Keep timestamps as much as possible
@@ -778,7 +778,7 @@ done
 set -x
 
 # cleanup
-find . -type d -path '*/sample/*.svn' | sort -r | xargs rm -rf
+# find . -type d -path '*/sample/*.svn' | sort -r | xargs rm -rf
 
 %build
 ruby extconf.rb
@@ -949,8 +949,10 @@ rm -rf $RPM_BUILD_ROOT
 #%{ruby_sitelib}/gtk2/base.rb
 %{ruby_sitearch}/gtk2.so
 # For now include gio here
+%if 0
 %{ruby_sitelib}/gio2.rb
 %{ruby_sitearch}/gio2.so
+%endif
 
 %files -n ruby-gtk2-devel
 %defattr(-,root,root,-)
@@ -1088,6 +1090,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
+- Update to 0.19.3
+- Released source does not support gio yet
+
 * Sat Sep 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Try rev 3690
 - Massive pkgconfig files renaming


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Sep 2009 03:22:08 -0000	1.9
+++ sources	24 Sep 2009 18:37:17 -0000	1.10
@@ -1 +1 @@
-1639f62d1f30cba03d1a14b283632f65  ruby-gnome2-all-0.19.2-svn3690_trunk.tar.gz
+771b0cb607a27bddd02860d38e94666f  ruby-gnome2-all-0.19.3.tar.gz



From epienbro at fedoraproject.org  Thu Sep 24 18:41:06 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 18:41:06 +0000 (UTC)
Subject: rpms/mingw32-libxml2/F-11 .cvsignore, 1.4, 1.5 mingw32-libxml2.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090924184106.1D50F11C00DB@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-serv25255/F-11

Modified Files:
	.cvsignore mingw32-libxml2.spec sources 
Log Message:
Update to 2.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Sep 2009 16:37:18 -0000	1.4
+++ .cvsignore	24 Sep 2009 18:41:05 -0000	1.5
@@ -1 +1 @@
-libxml2-2.7.4.tar.gz
+libxml2-2.7.5.tar.gz


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/mingw32-libxml2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-libxml2.spec	11 Sep 2009 17:15:00 -0000	1.8
+++ mingw32-libxml2.spec	24 Sep 2009 18:41:05 -0000	1.9
@@ -5,7 +5,7 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libxml2
-Version:        2.7.4
+Version:        2.7.5
 Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
@@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.5-1
+- Update to 2.7.5
+
 * Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
 - Update to 2.7.4
 - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Sep 2009 16:37:18 -0000	1.4
+++ sources	24 Sep 2009 18:41:05 -0000	1.5
@@ -1 +1 @@
-961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
+2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz



From epienbro at fedoraproject.org  Thu Sep 24 18:41:06 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 18:41:06 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel .cvsignore, 1.4, 1.5 mingw32-libxml2.spec,
	1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20090924184106.52D4711C01EA@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25255/devel

Modified Files:
	.cvsignore mingw32-libxml2.spec sources 
Log Message:
Update to 2.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Sep 2009 16:37:18 -0000	1.4
+++ .cvsignore	24 Sep 2009 18:41:06 -0000	1.5
@@ -1 +1 @@
-libxml2-2.7.4.tar.gz
+libxml2-2.7.5.tar.gz


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mingw32-libxml2.spec	18 Sep 2009 21:50:26 -0000	1.12
+++ mingw32-libxml2.spec	24 Sep 2009 18:41:06 -0000	1.13
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libxml2
-Version:        2.7.4
-Release:        3%{?dist}
+Version:        2.7.5
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.5-1
+- Update to 2.7.5
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-3
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Sep 2009 16:37:19 -0000	1.4
+++ sources	24 Sep 2009 18:41:06 -0000	1.5
@@ -1 +1 @@
-961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
+2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz



From nalin at fedoraproject.org  Thu Sep 24 18:44:52 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 24 Sep 2009 18:44:52 +0000 (UTC)
Subject: rpms/nss-ldapd/F-11 nss-ldapd.spec,1.4,1.5
Message-ID: <20090924184452.751DE11C00DB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss-ldapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27018

Modified Files:
	nss-ldapd.spec 
Log Message:
rebuild


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-ldapd/F-11/nss-ldapd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-ldapd.spec	16 Sep 2009 17:31:17 -0000	1.4
+++ nss-ldapd.spec	24 Sep 2009 18:44:52 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:		nss-ldapd
 Version:	0.6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -150,6 +150,9 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-2
+- rebuild
+
 * Wed Sep 16 2009 Nalin Dahyabhai <nalin at redhat.com> 
 - apply Mitchell Berger's patch to clean up the init script, use %%{_initddir},
   and correct the %%post so that it only thinks about turning on nslcd when



From epienbro at fedoraproject.org  Thu Sep 24 18:45:13 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 18:45:13 +0000 (UTC)
Subject: rpms/mingw32-libxslt/F-11 .cvsignore, 1.2, 1.3 mingw32-libxslt.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090924184513.E03E311C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27164/F-11

Modified Files:
	.cvsignore mingw32-libxslt.spec sources 
Log Message:
Update to 1.1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 May 2009 12:42:06 -0000	1.2
+++ .cvsignore	24 Sep 2009 18:45:13 -0000	1.3
@@ -1 +1 @@
-libxslt-1.1.24.tar.gz
+libxslt-1.1.26.tar.gz


Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/mingw32-libxslt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-libxslt.spec	24 May 2009 12:42:07 -0000	1.1
+++ mingw32-libxslt.spec	24 Sep 2009 18:45:13 -0000	1.2
@@ -5,8 +5,8 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libxslt
-Version:        1.1.24
-Release:        7%{?dist}
+Version:        1.1.26
+Release:        1%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-1
+- Update to 1.1.26
+
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.24-7
 - Use %%global instead of %%define
 - Dropped the reference to the multilib patch as it isn't used for MinGW


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 May 2009 12:42:07 -0000	1.2
+++ sources	24 Sep 2009 18:45:13 -0000	1.3
@@ -1 +1 @@
-e83ec5d27fc4c10c6f612879bea9a153  libxslt-1.1.24.tar.gz
+e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz



From epienbro at fedoraproject.org  Thu Sep 24 18:45:14 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 18:45:14 +0000 (UTC)
Subject: rpms/mingw32-libxslt/devel .cvsignore, 1.3, 1.4 mingw32-libxslt.spec,
	1.6, 1.7 sources, 1.3, 1.4 libxslt-1.1.25-locking.patch, 1.1, NONE
Message-ID: <20090924184514.620CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27164/devel

Modified Files:
	.cvsignore mingw32-libxslt.spec sources 
Removed Files:
	libxslt-1.1.25-locking.patch 
Log Message:
Update to 1.1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Sep 2009 17:48:25 -0000	1.3
+++ .cvsignore	24 Sep 2009 18:45:14 -0000	1.4
@@ -1 +1 @@
-libxslt-1.1.25.tar.gz
+libxslt-1.1.26.tar.gz


Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/mingw32-libxslt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-libxslt.spec	21 Sep 2009 21:45:50 -0000	1.6
+++ mingw32-libxslt.spec	24 Sep 2009 18:45:14 -0000	1.7
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libxslt
-Version:        1.1.25
-Release:        2%{?dist}
+Version:        1.1.26
+Release:        1%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -18,8 +18,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-Patch1:         libxslt-1.1.25-locking.patch
-
 # Fix compilation on MinGW environments
 Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 
@@ -63,8 +61,6 @@ Static version of the MinGW Windows LibX
 # this isn't interesting for MinGW environments
 #%patch0 -p1
 
-%patch1 -p1
-
 %patch1000 -p1
 
 libtoolize --force --copy
@@ -116,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 1.1.26-1
+- Update to 1.1.26
+
 * Mon Sep 21 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.25-2
 - Fix a locking bug in 1.1.25 (patch from native libxslt package)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Sep 2009 17:48:25 -0000	1.3
+++ sources	24 Sep 2009 18:45:14 -0000	1.4
@@ -1 +1 @@
-50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz
+e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz


--- libxslt-1.1.25-locking.patch DELETED ---



From nalin at fedoraproject.org  Thu Sep 24 18:45:41 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 24 Sep 2009 18:45:41 +0000 (UTC)
Subject: rpms/nss-ldapd/F-11 nss-ldapd-0.6.10.tar.gz.sig,1.1,NONE
Message-ID: <20090924184541.3FA5E11C00DB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss-ldapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27335/F-11

Removed Files:
	nss-ldapd-0.6.10.tar.gz.sig 
Log Message:
- no longer used



--- nss-ldapd-0.6.10.tar.gz.sig DELETED ---



From mccann at fedoraproject.org  Thu Sep 24 18:49:37 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Thu, 24 Sep 2009 18:49:37 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/devel import.log, NONE,
	1.1 notification-daemon-engine-slider.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924184937.1910E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28947/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log notification-daemon-engine-slider.spec 
Log Message:
Initial import (#525304).


--- NEW FILE import.log ---
notification-daemon-engine-slider-0_1_0-1_fc12:HEAD:notification-daemon-engine-slider-0.1.0-1.fc12.src.rpm:1253818157


--- NEW FILE notification-daemon-engine-slider.spec ---
Name:           notification-daemon-engine-slider
Version:        0.1.0
Release:        1%{?dist}
Summary:        The Slider theme engine for the notification daemon

Group:          System Environment/Libraries
License:        GPLv3+
URL:            http://cgit.freedesktop.org/~mccann/notification-daemon-engine-slider
Source0:        http://people.freedesktop.org/~mccann/dist/notification-daemon-engine-slider-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.17.1
Requires:       notification-daemon

%description
The Slider theme engine for the notification daemon.


%prep
%setup -q

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#remove .la files
find $RPM_BUILD_ROOT -name *.la | xargs rm -f || true


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/notification-daemon-1.0/engines/libslider.so

%changelog
* Tue Sep 22 2009 Jon McCann <jmccann at redhat.com> - 0.1.0-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:23:36 -0000	1.1
+++ .cvsignore	24 Sep 2009 18:49:36 -0000	1.2
@@ -0,0 +1 @@
+notification-daemon-engine-slider-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:23:36 -0000	1.1
+++ sources	24 Sep 2009 18:49:36 -0000	1.2
@@ -0,0 +1 @@
+81ee01d288cac6dc41468f0dbbc768f5  notification-daemon-engine-slider-0.1.0.tar.bz2



From hubbitus at fedoraproject.org  Thu Sep 24 19:28:01 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 24 Sep 2009 19:28:01 +0000 (UTC)
Subject: rpms/xls2csv/devel import.log, NONE, 1.1 xls2csv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924192801.7D25611C00DB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/xls2csv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7403/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xls2csv.spec 
Log Message:
Initial import xls2csv int Fedora


--- NEW FILE import.log ---
xls2csv-1_06-5_fc11:HEAD:xls2csv-1.06-5.fc11.src.rpm:1253820252


--- NEW FILE xls2csv.spec ---
Name:		xls2csv
Version:		1.06
Release:		5%{?dist}
Summary:		A script that recodes a spreadsheet's charset and saves as CSV

Group:		Applications/Text
License:		GPL+ or Artistic
URL:			http://search.cpan.org/dist/xls2csv/
Source0:		http://search.cpan.org/CPAN/authors/id/K/KE/KEN/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) perl(Test::Harness)
BuildRequires:	perl(Test::Simple) perl(Unicode::Map)
BuildRequires:	perl perl(Locale::Recode) perl(Text::CSV_XS) perl(Spreadsheet::ParseExcel)
Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:		perl(Unicode::Map)

%description
This script will recode a spreadsheet into a different character set
and output the recoded data as a csv file.

The script came about after many headaches from dealing with Excel
spreadsheets from clients that were being received in various character
sets.


%prep
%setup -q

%build
%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
%{__make} OPTIMIZE="$RPM_OPT_FLAGS"

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install DESTDIR=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

# To avoid name conflict with catdoc package.
%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/convert%{name}
%{__gzip} -c9 %{buildroot}%{_mandir}/man1/%{name}.1 > %{buildroot}%{_mandir}/man1/convert%{name}.1.gz
%{__rm} %{buildroot}%{_mandir}/man1/%{name}.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc
%attr(0755, root, root) %{_bindir}/convert%{name}
%{_mandir}/man1/convert%{name}.1.gz

%changelog
* Thu Sep 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-5
- Rename /usr/bin/xls2csv to /usr/bin/convertxls2csv to avoid name conflict with package catdoc (Thank you Jan Klepek)

* Mon Aug 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-4
- License tag changed to "GPL+ or Artistic"

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-3
- Rewrite all BR from  perl-Unicode-Map form to "perl(Unicode::Map)"
- Add back Requires: perl(:MODULE_COMPAT_%%(eval "`%%{__perl} -V:version`"; echo $version)), perl(Unicode::Map)

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-2
- Delete %%{buildroot} from PREFIX and accordingly my doubleprefix hack.
- Replace all $RPM_BUILD_ROOT by %%{buildroot} for consistency use macroses.
- Replace chmod by %%{__chmod}.
- Remove all explicit perl and perl-modules requires.

* Sat Nov 22 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-1
- Small cosmetics changes like use %%{__rm} instead of plain "rm" and add
	braces in all macroses as it want Jason Tibbitts in BZ review 458866
- Remove file %%{perl_vendorarch}/auto/xls2csv/.packlist and add 3 lines
	(delete .packlist, delete empty directories and change permissions)
	from /etc/rpmdevtools/spectemplate-perl.spec (Jason Tibbitts)

* Tue Aug 12 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Change BuildArch to noarch
- Add BR: perl(Test::Simple)
- Add BuildRequires: perl perl-libintl perl-Text-CSV_XS perl-Spreadsheet-ParseExcel perl-Unicode-Map for tests

* Fri Aug 8 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:07:44 -0000	1.1
+++ .cvsignore	24 Sep 2009 19:28:00 -0000	1.2
@@ -0,0 +1 @@
+xls2csv-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:07:44 -0000	1.1
+++ sources	24 Sep 2009 19:28:00 -0000	1.2
@@ -0,0 +1 @@
+0ed77bd4dd2f9d15fa0b8dc0ad0a0480  xls2csv-1.06.tar.gz



From hubbitus at fedoraproject.org  Thu Sep 24 19:32:49 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 24 Sep 2009 19:32:49 +0000 (UTC)
Subject: rpms/xls2csv/F-10 import.log, NONE, 1.1 xls2csv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924193250.012F911C00DB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/xls2csv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8828/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xls2csv.spec 
Log Message:
Initial import xls2csv int Fedora


--- NEW FILE import.log ---
xls2csv-1_06-5_fc11:F-10:xls2csv-1.06-5.fc11.src.rpm:1253820601


--- NEW FILE xls2csv.spec ---
Name:		xls2csv
Version:		1.06
Release:		5%{?dist}
Summary:		A script that recodes a spreadsheet's charset and saves as CSV

Group:		Applications/Text
License:		GPL+ or Artistic
URL:			http://search.cpan.org/dist/xls2csv/
Source0:		http://search.cpan.org/CPAN/authors/id/K/KE/KEN/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) perl(Test::Harness)
BuildRequires:	perl(Test::Simple) perl(Unicode::Map)
BuildRequires:	perl perl(Locale::Recode) perl(Text::CSV_XS) perl(Spreadsheet::ParseExcel)
Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:		perl(Unicode::Map)

%description
This script will recode a spreadsheet into a different character set
and output the recoded data as a csv file.

The script came about after many headaches from dealing with Excel
spreadsheets from clients that were being received in various character
sets.


%prep
%setup -q

%build
%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
%{__make} OPTIMIZE="$RPM_OPT_FLAGS"

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install DESTDIR=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

# To avoid name conflict with catdoc package.
%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/convert%{name}
%{__gzip} -c9 %{buildroot}%{_mandir}/man1/%{name}.1 > %{buildroot}%{_mandir}/man1/convert%{name}.1.gz
%{__rm} %{buildroot}%{_mandir}/man1/%{name}.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc
%attr(0755, root, root) %{_bindir}/convert%{name}
%{_mandir}/man1/convert%{name}.1.gz

%changelog
* Thu Sep 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-5
- Rename /usr/bin/xls2csv to /usr/bin/convertxls2csv to avoid name conflict with package catdoc (Thank you Jan Klepek)

* Mon Aug 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-4
- License tag changed to "GPL+ or Artistic"

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-3
- Rewrite all BR from  perl-Unicode-Map form to "perl(Unicode::Map)"
- Add back Requires: perl(:MODULE_COMPAT_%%(eval "`%%{__perl} -V:version`"; echo $version)), perl(Unicode::Map)

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-2
- Delete %%{buildroot} from PREFIX and accordingly my doubleprefix hack.
- Replace all $RPM_BUILD_ROOT by %%{buildroot} for consistency use macroses.
- Replace chmod by %%{__chmod}.
- Remove all explicit perl and perl-modules requires.

* Sat Nov 22 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-1
- Small cosmetics changes like use %%{__rm} instead of plain "rm" and add
	braces in all macroses as it want Jason Tibbitts in BZ review 458866
- Remove file %%{perl_vendorarch}/auto/xls2csv/.packlist and add 3 lines
	(delete .packlist, delete empty directories and change permissions)
	from /etc/rpmdevtools/spectemplate-perl.spec (Jason Tibbitts)

* Tue Aug 12 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Change BuildArch to noarch
- Add BR: perl(Test::Simple)
- Add BuildRequires: perl perl-libintl perl-Text-CSV_XS perl-Spreadsheet-ParseExcel perl-Unicode-Map for tests

* Fri Aug 8 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:07:44 -0000	1.1
+++ .cvsignore	24 Sep 2009 19:32:48 -0000	1.2
@@ -0,0 +1 @@
+xls2csv-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:07:44 -0000	1.1
+++ sources	24 Sep 2009 19:32:49 -0000	1.2
@@ -0,0 +1 @@
+0ed77bd4dd2f9d15fa0b8dc0ad0a0480  xls2csv-1.06.tar.gz



From hubbitus at fedoraproject.org  Thu Sep 24 19:35:55 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 24 Sep 2009 19:35:55 +0000 (UTC)
Subject: rpms/xls2csv/F-11 import.log, NONE, 1.1 xls2csv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924193555.CDCA811C00DB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/xls2csv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10085/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xls2csv.spec 
Log Message:
Initial import xls2csv int Fedora


--- NEW FILE import.log ---
xls2csv-1_06-5_fc11:F-11:xls2csv-1.06-5.fc11.src.rpm:1253820909


--- NEW FILE xls2csv.spec ---
Name:		xls2csv
Version:		1.06
Release:		5%{?dist}
Summary:		A script that recodes a spreadsheet's charset and saves as CSV

Group:		Applications/Text
License:		GPL+ or Artistic
URL:			http://search.cpan.org/dist/xls2csv/
Source0:		http://search.cpan.org/CPAN/authors/id/K/KE/KEN/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) perl(Test::Harness)
BuildRequires:	perl(Test::Simple) perl(Unicode::Map)
BuildRequires:	perl perl(Locale::Recode) perl(Text::CSV_XS) perl(Spreadsheet::ParseExcel)
Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:		perl(Unicode::Map)

%description
This script will recode a spreadsheet into a different character set
and output the recoded data as a csv file.

The script came about after many headaches from dealing with Excel
spreadsheets from clients that were being received in various character
sets.


%prep
%setup -q

%build
%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
%{__make} OPTIMIZE="$RPM_OPT_FLAGS"

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install DESTDIR=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

# To avoid name conflict with catdoc package.
%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/convert%{name}
%{__gzip} -c9 %{buildroot}%{_mandir}/man1/%{name}.1 > %{buildroot}%{_mandir}/man1/convert%{name}.1.gz
%{__rm} %{buildroot}%{_mandir}/man1/%{name}.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc
%attr(0755, root, root) %{_bindir}/convert%{name}
%{_mandir}/man1/convert%{name}.1.gz

%changelog
* Thu Sep 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-5
- Rename /usr/bin/xls2csv to /usr/bin/convertxls2csv to avoid name conflict with package catdoc (Thank you Jan Klepek)

* Mon Aug 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-4
- License tag changed to "GPL+ or Artistic"

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-3
- Rewrite all BR from  perl-Unicode-Map form to "perl(Unicode::Map)"
- Add back Requires: perl(:MODULE_COMPAT_%%(eval "`%%{__perl} -V:version`"; echo $version)), perl(Unicode::Map)

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-2
- Delete %%{buildroot} from PREFIX and accordingly my doubleprefix hack.
- Replace all $RPM_BUILD_ROOT by %%{buildroot} for consistency use macroses.
- Replace chmod by %%{__chmod}.
- Remove all explicit perl and perl-modules requires.

* Sat Nov 22 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-1
- Small cosmetics changes like use %%{__rm} instead of plain "rm" and add
	braces in all macroses as it want Jason Tibbitts in BZ review 458866
- Remove file %%{perl_vendorarch}/auto/xls2csv/.packlist and add 3 lines
	(delete .packlist, delete empty directories and change permissions)
	from /etc/rpmdevtools/spectemplate-perl.spec (Jason Tibbitts)

* Tue Aug 12 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Change BuildArch to noarch
- Add BR: perl(Test::Simple)
- Add BuildRequires: perl perl-libintl perl-Text-CSV_XS perl-Spreadsheet-ParseExcel perl-Unicode-Map for tests

* Fri Aug 8 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:07:44 -0000	1.1
+++ .cvsignore	24 Sep 2009 19:35:55 -0000	1.2
@@ -0,0 +1 @@
+xls2csv-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:07:44 -0000	1.1
+++ sources	24 Sep 2009 19:35:55 -0000	1.2
@@ -0,0 +1 @@
+0ed77bd4dd2f9d15fa0b8dc0ad0a0480  xls2csv-1.06.tar.gz



From hubbitus at fedoraproject.org  Thu Sep 24 19:37:40 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 24 Sep 2009 19:37:40 +0000 (UTC)
Subject: rpms/xls2csv/EL-5 import.log, NONE, 1.1 xls2csv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924193740.AB66E11C00DB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/xls2csv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10532/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xls2csv.spec 
Log Message:
Initial import xls2csv int Fedora


--- NEW FILE import.log ---
xls2csv-1_06-5_fc11:EL-5:xls2csv-1.06-5.fc11.src.rpm:1253821028


--- NEW FILE xls2csv.spec ---
Name:		xls2csv
Version:		1.06
Release:		5%{?dist}
Summary:		A script that recodes a spreadsheet's charset and saves as CSV

Group:		Applications/Text
License:		GPL+ or Artistic
URL:			http://search.cpan.org/dist/xls2csv/
Source0:		http://search.cpan.org/CPAN/authors/id/K/KE/KEN/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) perl(Test::Harness)
BuildRequires:	perl(Test::Simple) perl(Unicode::Map)
BuildRequires:	perl perl(Locale::Recode) perl(Text::CSV_XS) perl(Spreadsheet::ParseExcel)
Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:		perl(Unicode::Map)

%description
This script will recode a spreadsheet into a different character set
and output the recoded data as a csv file.

The script came about after many headaches from dealing with Excel
spreadsheets from clients that were being received in various character
sets.


%prep
%setup -q

%build
%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
%{__make} OPTIMIZE="$RPM_OPT_FLAGS"

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install DESTDIR=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

# To avoid name conflict with catdoc package.
%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/convert%{name}
%{__gzip} -c9 %{buildroot}%{_mandir}/man1/%{name}.1 > %{buildroot}%{_mandir}/man1/convert%{name}.1.gz
%{__rm} %{buildroot}%{_mandir}/man1/%{name}.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc
%attr(0755, root, root) %{_bindir}/convert%{name}
%{_mandir}/man1/convert%{name}.1.gz

%changelog
* Thu Sep 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-5
- Rename /usr/bin/xls2csv to /usr/bin/convertxls2csv to avoid name conflict with package catdoc (Thank you Jan Klepek)

* Mon Aug 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-4
- License tag changed to "GPL+ or Artistic"

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-3
- Rewrite all BR from  perl-Unicode-Map form to "perl(Unicode::Map)"
- Add back Requires: perl(:MODULE_COMPAT_%%(eval "`%%{__perl} -V:version`"; echo $version)), perl(Unicode::Map)

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-2
- Delete %%{buildroot} from PREFIX and accordingly my doubleprefix hack.
- Replace all $RPM_BUILD_ROOT by %%{buildroot} for consistency use macroses.
- Replace chmod by %%{__chmod}.
- Remove all explicit perl and perl-modules requires.

* Sat Nov 22 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-1
- Small cosmetics changes like use %%{__rm} instead of plain "rm" and add
	braces in all macroses as it want Jason Tibbitts in BZ review 458866
- Remove file %%{perl_vendorarch}/auto/xls2csv/.packlist and add 3 lines
	(delete .packlist, delete empty directories and change permissions)
	from /etc/rpmdevtools/spectemplate-perl.spec (Jason Tibbitts)

* Tue Aug 12 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Change BuildArch to noarch
- Add BR: perl(Test::Simple)
- Add BuildRequires: perl perl-libintl perl-Text-CSV_XS perl-Spreadsheet-ParseExcel perl-Unicode-Map for tests

* Fri Aug 8 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.06-0
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:07:44 -0000	1.1
+++ .cvsignore	24 Sep 2009 19:37:40 -0000	1.2
@@ -0,0 +1 @@
+xls2csv-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:07:44 -0000	1.1
+++ sources	24 Sep 2009 19:37:40 -0000	1.2
@@ -0,0 +1 @@
+0ed77bd4dd2f9d15fa0b8dc0ad0a0480  xls2csv-1.06.tar.gz



From cebbert at fedoraproject.org  Thu Sep 24 19:48:13 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 19:48:13 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.1126, 1.1127 kernel.spec, 1.1827, 1.1828 sources, 1.1084,
	1.1085 upstream, 1.998, 1.999
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch,
	1.1, NONE
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch,
	1.1, NONE linux-2.6-scsi-sd-fix-oops-during-scanning.patch, 1.1,
	NONE linux-2.6-scsi-sg-fix-oops-in-error-path.patch, 1.1,
	NONE linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch,
	1.1, NONE
Message-ID: <20090924194814.198D811C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13712

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31.1.bz2.sign 
Removed Files:
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch 
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	linux-2.6-scsi-sd-fix-oops-during-scanning.patch 
	linux-2.6-scsi-sg-fix-oops-in-error-path.patch 
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch 
Log Message:
Linux 2.6.31.1
Drop patches merged upstream:
    linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
    linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
    linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
    linux-2.6-scsi-sd-fix-oops-during-scanning.patch
    linux-2.6-scsi-sg-fix-oops-in-error-path.patch


--- NEW FILE patch-2.6.31.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKu7QfyGugalF9Dw4RAsOXAJsFcZg2T7EeVt3LtEOQ9kw1QMUgagCff6bk
9tVlqfN7sHAgL+N2XFIir1o=
=6zvK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1126
retrieving revision 1.1127
diff -u -p -r1.1126 -r1.1127
--- .cvsignore	10 Sep 2009 00:43:48 -0000	1.1126
+++ .cvsignore	24 Sep 2009 19:48:11 -0000	1.1127
@@ -5,3 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
+patch-2.6.31.1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1827
retrieving revision 1.1828
diff -u -p -r1.1827 -r1.1828
--- kernel.spec	24 Sep 2009 16:22:11 -0000	1.1827
+++ kernel.spec	24 Sep 2009 19:48:11 -0000	1.1828
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -692,9 +692,6 @@ Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
-Patch1575: linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
@@ -751,9 +748,6 @@ Patch13000: ppc-hates-my-family-and-swor
 
 # patches headed for -stable
 
-# scsi oops fixes
-Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
-Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
 
@@ -1359,9 +1353,6 @@ ApplyPatch linux-2.6-ksm-fix-munlock.pat
 ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-ApplyPatch linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
@@ -1411,9 +1402,6 @@ ApplyPatch linux-2.6-selinux-module-load
 
 # patches headed for -stable
 
-# scsi oops fixes
-ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
-ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
 
@@ -2073,6 +2061,15 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-41
+- Linux 2.6.31.1
+- Drop patches merged upstream:
+    linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+    linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+    linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+    linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+    linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-40
 - Drop the modules-ro-nx patch: it's causing ftrace to be unable
   to NOP out module function call tracking. (#524042)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1084
retrieving revision 1.1085
diff -u -p -r1.1084 -r1.1085
--- sources	10 Sep 2009 00:43:49 -0000	1.1084
+++ sources	24 Sep 2009 19:48:12 -0000	1.1085
@@ -1 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
+43977a0a264dd7d173b6ef122c62fb20  patch-2.6.31.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -p -r1.998 -r1.999
--- upstream	10 Sep 2009 00:43:49 -0000	1.998
+++ upstream	24 Sep 2009 19:48:13 -0000	1.999
@@ -1 +1,2 @@
 linux-2.6.31.tar.bz2
+patch-2.6.31.1.bz2


--- linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch DELETED ---


--- linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch DELETED ---


--- linux-2.6-scsi-sd-fix-oops-during-scanning.patch DELETED ---


--- linux-2.6-scsi-sg-fix-oops-in-error-path.patch DELETED ---


--- linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch DELETED ---



From cebbert at fedoraproject.org  Thu Sep 24 19:52:26 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 19:52:26 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.8.bz2.sign, NONE, 1.1 .cvsignore,
	1.1056, 1.1057 kernel.spec, 1.1738, 1.1739 sources, 1.1018,
	1.1019 upstream, 1.929, 1.930 patch-2.6.30.7.bz2.sign, 1.1, NONE
Message-ID: <20090924195226.2B3D911C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15588

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.8.bz2.sign 
Removed Files:
	patch-2.6.30.7.bz2.sign 
Log Message:
Linux 2.6.30.8


--- NEW FILE patch-2.6.30.8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKu7PhyGugalF9Dw4RAhyqAKCJroxD7BNFD0k5fIRzMVPkICDbbACeNPks
fx/2HVGvPuVj5t26iwXUYxk=
=Xl6B
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1056
retrieving revision 1.1057
diff -u -p -r1.1056 -r1.1057
--- .cvsignore	15 Sep 2009 19:31:05 -0000	1.1056
+++ .cvsignore	24 Sep 2009 19:52:25 -0000	1.1057
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.7.bz2
+patch-2.6.30.8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1738
retrieving revision 1.1739
diff -u -p -r1.1738 -r1.1739
--- kernel.spec	24 Sep 2009 13:46:38 -0000	1.1738
+++ kernel.spec	24 Sep 2009 19:52:25 -0000	1.1739
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 7
+%define stable_update 8
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -1971,6 +1971,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-60
+- Linux 2.6.30.8
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.7-59
 - Disable sound powersave by default; it still pops when playing sounds. (#523836)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1018
retrieving revision 1.1019
diff -u -p -r1.1018 -r1.1019
--- sources	15 Sep 2009 19:31:07 -0000	1.1018
+++ sources	24 Sep 2009 19:52:25 -0000	1.1019
@@ -1,2 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-7c91fa862b90d74da3aa83446d69a412  patch-2.6.30.7.bz2
+7e9b405b840bf5ecc70d208bfccee5f9  patch-2.6.30.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -p -r1.929 -r1.930
--- upstream	15 Sep 2009 19:31:07 -0000	1.929
+++ upstream	24 Sep 2009 19:52:25 -0000	1.930
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.7.bz2
+patch-2.6.30.8.bz2
 


--- patch-2.6.30.7.bz2.sign DELETED ---



From cebbert at fedoraproject.org  Thu Sep 24 20:03:01 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 20:03:01 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.35.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.21, 1.960.2.22 kernel.spec, 1.1206.2.91,
	1.1206.2.92 sources, 1.922.2.21, 1.922.2.22 upstream, 1.834.2.21,
	1.834.2.22 linux-2.6-nfsd-report-short-writes-fix.patch, 1.1.2.2,
	NONE linux-2.6-nfsd-report-short-writes.patch, 1.1.2.2,
	NONE patch-2.6.27.34.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090924200301.CC83711C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19016

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.35.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-nfsd-report-short-writes-fix.patch 
	linux-2.6-nfsd-report-short-writes.patch 
	patch-2.6.27.34.bz2.sign 
Log Message:
Linux 2.6.27.35
Drop merged patches:
    linux-2.6-nfsd-report-short-writes-fix.patch
    linux-2.6-nfsd-report-short-writes.patch


--- NEW FILE patch-2.6.27.35.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKu7OjyGugalF9Dw4RAgEXAJ4g87+stQAIvlm7krBWQHKe9q5t0gCeJwuM
jffeM78Uuy3fbTjqhBer0hg=
=5G7A
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.21
retrieving revision 1.960.2.22
diff -u -p -r1.960.2.21 -r1.960.2.22
--- .cvsignore	15 Sep 2009 19:42:14 -0000	1.960.2.21
+++ .cvsignore	24 Sep 2009 20:02:57 -0000	1.960.2.22
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.34.bz2
+patch-2.6.27.35.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.91
retrieving revision 1.1206.2.92
diff -u -p -r1.1206.2.91 -r1.1206.2.92
--- kernel.spec	15 Sep 2009 19:42:14 -0000	1.1206.2.91
+++ kernel.spec	24 Sep 2009 20:02:57 -0000	1.1206.2.92
@@ -39,7 +39,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 34
+%define stable_update 35
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -778,10 +778,6 @@ Patch12000: linux-2.6-virtio-blk-dont-bo
 
 Patch13000: make-mmap_min_addr-suck-less.patch
 
-# fix NFS short writes (#493500)
-Patch14000: linux-2.6-nfsd-report-short-writes-fix.patch
-Patch14001: linux-2.6-nfsd-report-short-writes.patch
-
 # send for -stable
 Patch15000: linux-2.6-ppc64-vs-broadcom.patch
 Patch15001: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
@@ -1414,10 +1410,6 @@ ApplyPatch linux-2.6-virtio-blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
-# fix NFS short writes (#493500)
-ApplyPatch linux-2.6-nfsd-report-short-writes.patch
-ApplyPatch linux-2.6-nfsd-report-short-writes-fix.patch
-
 # send for -stable:
 ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
@@ -1998,6 +1990,12 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 24 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.92
+- Linux 2.6.27.35
+- Drop merged patches:
+    linux-2.6-nfsd-report-short-writes-fix.patch
+    linux-2.6-nfsd-report-short-writes.patch
+
 * Tue Sep 15 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.34-170.2.91
 - Linux 2.6.27.34
 - Drop merged patch: linux-2.6-slub-fix-destroy-by-rcu.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.21
retrieving revision 1.922.2.22
diff -u -p -r1.922.2.21 -r1.922.2.22
--- sources	15 Sep 2009 19:42:14 -0000	1.922.2.21
+++ sources	24 Sep 2009 20:02:59 -0000	1.922.2.22
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-e9c937fd29350075634f3b4d1a053825  patch-2.6.27.34.bz2
+6d49b54ff6ed54896db5d9e2ab7a6c0c  patch-2.6.27.35.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.21
retrieving revision 1.834.2.22
diff -u -p -r1.834.2.21 -r1.834.2.22
--- upstream	15 Sep 2009 19:42:14 -0000	1.834.2.21
+++ upstream	24 Sep 2009 20:02:59 -0000	1.834.2.22
@@ -1,3 +1,3 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.34.bz2
+patch-2.6.27.35.bz2
 


--- linux-2.6-nfsd-report-short-writes-fix.patch DELETED ---


--- linux-2.6-nfsd-report-short-writes.patch DELETED ---


--- patch-2.6.27.34.bz2.sign DELETED ---



From bochecha at fedoraproject.org  Thu Sep 24 20:12:14 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Thu, 24 Sep 2009 20:12:14 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 sugar-artwork.spec, 1.30, 1.31
Message-ID: <20090924201214.356A211C00DB@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22445

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
New 0.86 upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	18 Sep 2009 17:07:10 -0000	1.21
+++ .cvsignore	24 Sep 2009 20:12:13 -0000	1.22
@@ -1 +1 @@
-sugar-artwork-0.85.4.tar.bz2
+sugar-artwork-0.86.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Sep 2009 17:07:10 -0000	1.21
+++ sources	24 Sep 2009 20:12:13 -0000	1.22
@@ -1 +1 @@
-8a4b21d851ef128a3613289bb8cbb24f  sugar-artwork-0.85.4.tar.bz2
+360a99ab3ce66c035b19679deb34bad4  sugar-artwork-0.86.0.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sugar-artwork.spec	18 Sep 2009 17:07:10 -0000	1.30
+++ sugar-artwork.spec	24 Sep 2009 20:12:13 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.85.4
-Release: 2%{?dist}
+Version: 0.86.0
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
 # git clone git://dev.laptop.org/artwork
@@ -63,6 +63,9 @@ touch --no-create %{_datadir}/icons/suga
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Thu Sep 24 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.86.0-1
+- New upstream release
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-2
 - Upload sources
 



From pbrobinson at fedoraproject.org  Thu Sep 24 20:14:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 24 Sep 2009 20:14:58 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.12, 1.13 mutter-moblin.spec, 
	1.13, 1.14 sources, 1.12, 1.13
Message-ID: <20090924201458.1C16B11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24411

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.39.3 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	23 Sep 2009 16:08:02 -0000	1.12
+++ .cvsignore	24 Sep 2009 20:14:57 -0000	1.13
@@ -1 +1 @@
-mutter-moblin-0.39.2.tar.bz2
+mutter-moblin-0.39.3.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mutter-moblin.spec	23 Sep 2009 16:08:02 -0000	1.13
+++ mutter-moblin.spec	24 Sep 2009 20:14:57 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.39.2
+Version:        0.39.3
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Thu Sep 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.3-1
+- New 0.39.3 upstream release
+
 * Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.2-1
 - New 0.39.2 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	23 Sep 2009 16:08:02 -0000	1.12
+++ sources	24 Sep 2009 20:14:57 -0000	1.13
@@ -1 +1 @@
-2fad624c0a8b2eb1ffb4a2f5c2aaa9f4  mutter-moblin-0.39.2.tar.bz2
+58a4adeeb0419cf4a5c27f50993ca557  mutter-moblin-0.39.3.tar.bz2



From praveenp at fedoraproject.org  Thu Sep 24 20:23:21 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 20:23:21 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.5,1.6
Message-ID: <20090924202321.DC6CE11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26729

Modified Files:
	openwsman.spec 
Log Message:
Chaged the %files list, to fix the build failures in X86_64 



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openwsman.spec	24 Sep 2009 17:51:45 -0000	1.5
+++ openwsman.spec	24 Sep 2009 20:23:21 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -95,8 +95,7 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
-%{_libdir}/ruby/site_ruby/1.8/openwsman/openwsman.rb
-%{_libdir}/ruby/site_ruby/1.8/openwsman/wsxmlnode.rb
+/usr/lib/ruby/site_ruby/1.8/openwsman/
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
@@ -138,6 +137,8 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
+- *.rb files are hard coded to be installed in /usr/lib in 32/64-bit
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
 - increased the release for re-tagging.
 - one more try



From epienbro at fedoraproject.org  Thu Sep 24 20:36:58 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 20:36:58 +0000 (UTC)
Subject: rpms/mingw32-libxslt/F-11 mingw32-libxslt.spec, 1.2,
	1.3 libexslt-rc4.patch, 1.1, NONE
Message-ID: <20090924203658.6D49711C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29082

Modified Files:
	mingw32-libxslt.spec 
Removed Files:
	libexslt-rc4.patch 
Log Message:
Drop upstreamed patch



Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/mingw32-libxslt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-libxslt.spec	24 Sep 2009 18:45:13 -0000	1.2
+++ mingw32-libxslt.spec	24 Sep 2009 20:36:58 -0000	1.3
@@ -17,9 +17,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-# Fix for CVE-2008-2935
-Patch1:         libexslt-rc4.patch
-
 # Fix compilation on MinGW environments
 Patch1000:      mingw32-libxslt-1.1.24-win32-shared.patch
 
@@ -115,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-1
 - Update to 1.1.26
+- Drop upstreamed patch
 
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.24-7
 - Use %%global instead of %%define


--- libexslt-rc4.patch DELETED ---



From epienbro at fedoraproject.org  Thu Sep 24 20:37:56 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 20:37:56 +0000 (UTC)
Subject: rpms/mingw32-libxslt/F-11 mingw32-libxslt.spec,1.3,1.4
Message-ID: <20090924203756.4537A11C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29439

Modified Files:
	mingw32-libxslt.spec 
Log Message:
It doesn't make sense to apply a non-existing patch



Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/mingw32-libxslt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-libxslt.spec	24 Sep 2009 20:36:58 -0000	1.3
+++ mingw32-libxslt.spec	24 Sep 2009 20:37:56 -0000	1.4
@@ -57,8 +57,6 @@ Static version of the MinGW Windows LibX
 # this isn't interesting for MinGW environments
 #%patch0 -p1
 
-%patch1 -p0
-
 %patch1000 -p1
 
 libtoolize --force --copy



From mjg59 at fedoraproject.org  Thu Sep 24 20:40:27 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Thu, 24 Sep 2009 20:40:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-11 intel-2.7-fix-output-properties.patch, 
	NONE, 1.1 xorg-x11-drv-intel.spec, 1.20, 1.21
Message-ID: <20090924204027.BA9E911C0423@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29930

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.7-fix-output-properties.patch 
Log Message:
* Thu Sep 24 2009  <mjg at redhat.com> - 2.7.0-8
- Add intel-2.7-fix-output-properties.patch, fixes EDID in xrandr properties


intel-2.7-fix-output-properties.patch:
 drmmode_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE intel-2.7-fix-output-properties.patch ---
diff -up xf86-video-intel-2.7.0/src/drmmode_display.c.orig xf86-video-intel-2.7.0/src/drmmode_display.c
--- xf86-video-intel-2.7.0/src/drmmode_display.c.orig	2009-09-24 16:22:22.000000000 -0400
+++ xf86-video-intel-2.7.0/src/drmmode_display.c	2009-09-24 16:22:41.000000000 -0400
@@ -729,7 +729,7 @@ drmmode_output_set_property(xf86OutputPt
 	}
     }
     /* no property found? */
-    return FALSE;
+    return TRUE;
 }
 
 #ifdef RANDR_GET_CRTC_INTERFACE


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.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-drv-intel.spec	28 May 2009 19:24:51 -0000	1.20
+++ xorg-x11-drv-intel.spec	24 Sep 2009 20:40:27 -0000	1.21
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.7.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -32,6 +32,9 @@ Patch21: intel-2.7.0-lvds-default-modes.
 # Disable xv vsync, it locks up the GPU
 Patch22: intel-2.7-dont-vsync-xv.patch
 
+# Backport from upstream
+Patch30: intel-2.7-fix-output-properties.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: autoconf automake libtool
@@ -85,6 +88,8 @@ Debugging tools for Intel graphics chips
 
 %patch22 -p1 -b .xv-vsync
 
+%patch30 -p1 -b .drmmode
+
 %build
 
 # autoreconf -vi
@@ -136,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/intel_*
 
 %changelog
+* Thu Sep 24 2009  <mjg at redhat.com> - 2.7.0-8
+- Add intel-2.7-fix-output-properties.patch, fixes EDID in xrandr properties
+
 * Thu May 28 2009  <krh at redhat.com> - 2.7.0-7
 - Add intel-2.7-dont-vsync-xv.patch to disable Xv vsync, fixes hw
   lockup for full screen Xv (#499895)



From s4504kr at fedoraproject.org  Thu Sep 24 20:42:16 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 24 Sep 2009 20:42:16 +0000 (UTC)
Subject: rpms/stellarium/devel .cvsignore, 1.16, 1.17 sources, 1.18,
	1.19 stellarium.spec, 1.59, 1.60
Message-ID: <20090924204216.E846311C0337@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30389

Modified Files:
	.cvsignore sources stellarium.spec 
Log Message:
Updated program documentation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Mar 2009 21:31:32 -0000	1.16
+++ .cvsignore	24 Sep 2009 20:42:16 -0000	1.17
@@ -1,2 +1,2 @@
 stellarium-0.10.2.tar.gz
-stellarium_user_guide-0.9.1-1.pdf
+stellarium_user_guide-0.10.2-1.pdf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	12 Mar 2009 21:31:32 -0000	1.18
+++ sources	24 Sep 2009 20:42:16 -0000	1.19
@@ -1,2 +1,2 @@
 c544fff9e75e9317055075b658ae5924  stellarium-0.10.2.tar.gz
-0e708c4c0af77712c64b22cbfa398fb4  stellarium_user_guide-0.9.1-1.pdf
+8da17ee33510f57cbfdb321d8ae43c59  stellarium_user_guide-0.10.2-1.pdf


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- stellarium.spec	27 Jul 2009 04:52:48 -0000	1.59
+++ stellarium.spec	24 Sep 2009 20:42:16 -0000	1.60
@@ -1,8 +1,8 @@
-%define guidever 0.9.1-1
+%define guidever 0.10.2-1
 
 Name:           stellarium
 Version:        0.10.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -10,7 +10,7 @@ License:        GPLv2+
 URL:            http://stellarium.free.fr/
 Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf
+Source2:        http://downloads.sourceforge.net/stellarium/stellarium_user_guide-%{guidever}.pdf
 Patch1:		stellarium-0.10.2-cmake.patch
 Patch2:		stellarium-0.10.0-fonts.patch
 
@@ -107,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+<<<<<<< stellarium.spec
+* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-5
+- Updated program documentation (#525302)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From s4504kr at fedoraproject.org  Thu Sep 24 20:43:01 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 24 Sep 2009 20:43:01 +0000 (UTC)
Subject: rpms/stellarium/devel stellarium.spec,1.60,1.61
Message-ID: <20090924204301.5F3CF11C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30934

Modified Files:
	stellarium.spec 
Log Message:
Updated program documentation


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- stellarium.spec	24 Sep 2009 20:42:16 -0000	1.60
+++ stellarium.spec	24 Sep 2009 20:43:01 -0000	1.61
@@ -107,7 +107,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
-<<<<<<< stellarium.spec
 * Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-5
 - Updated program documentation (#525302)
 



From s4504kr at fedoraproject.org  Thu Sep 24 20:44:24 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 24 Sep 2009 20:44:24 +0000 (UTC)
Subject: rpms/stellarium/F-11 sources,1.18,1.19 stellarium.spec,1.57,1.58
Message-ID: <20090924204424.9562011C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31252

Modified Files:
	sources stellarium.spec 
Log Message:
Updated program documentation


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	12 Mar 2009 21:31:32 -0000	1.18
+++ sources	24 Sep 2009 20:44:24 -0000	1.19
@@ -1,2 +1,2 @@
 c544fff9e75e9317055075b658ae5924  stellarium-0.10.2.tar.gz
-0e708c4c0af77712c64b22cbfa398fb4  stellarium_user_guide-0.9.1-1.pdf
+8da17ee33510f57cbfdb321d8ae43c59  stellarium_user_guide-0.10.2-1.pdf


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-11/stellarium.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- stellarium.spec	24 Mar 2009 21:59:06 -0000	1.57
+++ stellarium.spec	24 Sep 2009 20:44:24 -0000	1.58
@@ -1,8 +1,8 @@
-%define guidever 0.9.1-1
+%define guidever 0.10.2-1
 
 Name:           stellarium
 Version:        0.10.2
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -10,7 +10,7 @@ License:        GPLv2+
 URL:            http://stellarium.free.fr/
 Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf
+Source2:        http://downloads.sourceforge.net/stellarium/stellarium_user_guide-%{guidever}.pdf
 Patch1:		stellarium-0.10.2-cmake.patch
 Patch2:		stellarium-0.10.0-fonts.patch
 
@@ -107,6 +107,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-5
+- Updated program documentation (#525302)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-3
+- Rebuild for new boost release
+
 * Tue Mar 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-2
 - Changed desktop file (#491922)
 



From s4504kr at fedoraproject.org  Thu Sep 24 20:45:25 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 24 Sep 2009 20:45:25 +0000 (UTC)
Subject: rpms/stellarium/F-10 sources,1.17,1.18 stellarium.spec,1.52,1.53
Message-ID: <20090924204525.7081911C00DB@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31639

Modified Files:
	sources stellarium.spec 
Log Message:
Updated program documentation


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	12 Mar 2009 21:40:06 -0000	1.17
+++ sources	24 Sep 2009 20:45:25 -0000	1.18
@@ -1,2 +1,2 @@
 c544fff9e75e9317055075b658ae5924  stellarium-0.10.2.tar.gz
-0e708c4c0af77712c64b22cbfa398fb4  stellarium_user_guide-0.9.1-1.pdf
+8da17ee33510f57cbfdb321d8ae43c59  stellarium_user_guide-0.10.2-1.pdf


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-10/stellarium.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- stellarium.spec	12 Mar 2009 21:40:06 -0000	1.52
+++ stellarium.spec	24 Sep 2009 20:45:25 -0000	1.53
@@ -1,8 +1,8 @@
-%define guidever 0.9.1-1
+%define guidever 0.10.2-1
 
 Name:           stellarium
 Version:        0.10.2
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -10,7 +10,7 @@ License:        GPLv2+
 URL:            http://stellarium.free.fr/
 Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf
+Source2:        http://downloads.sourceforge.net/stellarium/stellarium_user_guide-%{guidever}.pdf
 Patch1:		stellarium-0.10.2-cmake.patch
 Patch2:		stellarium-0.10.0-fonts.patch
 
@@ -107,6 +107,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-5
+- Updated program documentation (#525302)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-3
+- Rebuild for new boost release
+
+* Tue Mar 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-2
+- Changed desktop file (#491922)
+
 * Thu Mar 12 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.2-1
 - New upstream release
 



From mclasen at fedoraproject.org  Thu Sep 24 20:49:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 20:49:45 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.489,
	1.490 no-tweaks.patch, 1.5, 1.6
Message-ID: <20090924204945.6940E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32616

Modified Files:
	control-center.spec no-tweaks.patch 
Log Message:
Fix appearance capplet tabs



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -p -r1.489 -r1.490
--- control-center.spec	23 Sep 2009 22:45:47 -0000	1.489
+++ control-center.spec	24 Sep 2009 20:49:45 -0000	1.490
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -89,7 +89,6 @@ Requires: libXrandr >= %{libXrandr_versi
 # for /usr/share/pkgconfig
 Requires: pkgconfig
 
-BuildRequires: autoconf automake libtool
 BuildRequires: pango-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -130,6 +129,7 @@ BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: scrollkeeper
 BuildRequires: libcanberra-devel
 BuildRequires: unique-devel
+BuildRequires: gnome-common
 
 Requires(preun): GConf2
 Requires(pre): GConf2
@@ -184,7 +184,6 @@ for the GNOME desktop.
 %prep
 %setup -q -n gnome-control-center-%{version}
 
-%patch3 -p1 -b .no-gnome-common
 %patch10 -p0 -b .pam-fprintd
 %patch22 -p0 -b .slab-icon-names
 %patch30 -p1 -b .default-layout-toggle
@@ -194,14 +193,12 @@ for the GNOME desktop.
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
-#%patch96 -p1 -b .gecos
+##%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 %patch100 -p1 -b .common-tasks
 
 %patch7 -p1 -b .make-default
 
-#autoreconf -f -i
-
 %build
 
 # Work-around http://bugzilla.gnome.org/show_bug.cgi?id=427939
@@ -380,6 +377,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Fix appearance capplet tabs
+
 * Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 

no-tweaks.patch:
 Makefile.am        |    2 
 appearance-main.c  |    1 
 data/appearance.ui |  365 -----------------------------------------------------
 3 files changed, 1 insertion(+), 367 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- no-tweaks.patch	23 Sep 2009 22:16:29 -0000	1.5
+++ no-tweaks.patch	24 Sep 2009 20:49:45 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.28.0/capplets/appearance/appearance-main.c
 --- gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks	2009-08-24 06:54:41.000000000 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/appearance-main.c	2009-09-23 16:46:07.350650695 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-main.c	2009-09-24 16:43:11.954319878 -0400
 @@ -165,7 +165,6 @@ main (int argc, char **argv)
    desktop_init (data, (const gchar **) wallpaper_files);
    g_strfreev (wallpaper_files);
@@ -10,9 +10,17 @@ diff -up gnome-control-center-2.28.0/cap
    /* prepare the main window */
    w = appearance_capplet_get_widget (data, "appearance_window");
 diff -up gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui
---- gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks	2009-09-23 16:46:29.131395991 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui	2009-09-23 16:46:41.859650290 -0400
-@@ -1549,359 +1549,6 @@
+--- gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks	2009-09-21 06:44:55.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui	2009-09-24 16:45:09.691322901 -0400
+@@ -745,6 +745,7 @@
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
+                         <property name="can_focus">True</property>
++                        <property name="use-underline">True</property>
+                         <property name="receives_default">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="use_stock">True</property>
+@@ -1549,370 +1550,6 @@
                  <property name="tab_fill">False</property>
                </packing>
              </child>
@@ -369,12 +377,23 @@ diff -up gnome-control-center-2.28.0/cap
 -                <property name="position">3</property>
 -              </packing>
 -            </child>
-             <child type="tab">
-               <object class="GtkLabel" id="label40">
-                 <property name="visible">True</property>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label40">
+-                <property name="visible">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="label" translatable="yes">Interface</property>
+-              </object>
+-              <packing>
+-                <property name="position">3</property>
+-                <property name="tab_fill">False</property>
+-              </packing>
+-            </child>
+           </object>
+           <packing>
+             <property name="position">1</property>
 diff -up gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.28.0/capplets/appearance/Makefile.am
 --- gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks	2009-07-16 10:33:13.000000000 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/Makefile.am	2009-09-23 16:46:14.108648780 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/Makefile.am	2009-09-24 16:43:11.961075277 -0400
 @@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
  	appearance-themes.h \
  	appearance-style.c \



From kwizart at fedoraproject.org  Thu Sep 24 20:52:50 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 24 Sep 2009 20:52:50 +0000 (UTC)
Subject: rpms/afflib/devel afflib-3.3.4-gcc44.patch,1.3,NONE
Message-ID: <20090924205250.DA74A11C00DB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1778

Removed Files:
	afflib-3.3.4-gcc44.patch 
Log Message:
Remove old patch



--- afflib-3.3.4-gcc44.patch DELETED ---



From kwizart at fedoraproject.org  Thu Sep 24 20:54:36 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 24 Sep 2009 20:54:36 +0000 (UTC)
Subject: rpms/afflib/devel afflib-3.4.1-gcc43.patch, NONE,
	1.1 afflib-3.4.1-pyver.patch, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.14, 1.15 afflib.spec, 1.31, 1.32 sources, 1.14, 1.15
Message-ID: <20090924205436.1D27E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2497/devel

Modified Files:
	.cvsignore afflib.spec sources 
Added Files:
	afflib-3.4.1-gcc43.patch afflib-3.4.1-pyver.patch import.log 
Log Message:
- Update to 3.4.1
- Update gcc43 (new case)
- Enable python binding.
- Avoid version-info on the python module.


afflib-3.4.1-gcc43.patch:
 hashextent.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE afflib-3.4.1-gcc43.patch ---
diff -up afflib-3.4.1/tools/hashextent.h.gcc43 afflib-3.4.1/tools/hashextent.h
--- afflib-3.4.1/tools/hashextent.h.gcc43	2009-09-21 21:52:51.000000000 +0200
+++ afflib-3.4.1/tools/hashextent.h	2009-09-24 22:39:22.534808641 +0200
@@ -14,6 +14,7 @@
 #include <sstream>
 #include <map>
 #include <set>
+#include <algorithm>
 
 
 using std::string;

afflib-3.4.1-pyver.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afflib-3.4.1-pyver.patch ---
diff -up afflib-3.4.1/pyaff/Makefile.am.pyver afflib-3.4.1/pyaff/Makefile.am
--- afflib-3.4.1/pyaff/Makefile.am.pyver	2009-09-24 22:42:06.534805852 +0200
+++ afflib-3.4.1/pyaff/Makefile.am	2009-09-24 22:45:13.306557135 +0200
@@ -9,5 +9,5 @@ pyexec_LTLIBRARIES 	= pyaff.la
 pyaff_la_SOURCES	= pyaff.c
 pyaff_la_LIBADD		= ../lib/libafflib.la
 pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS)
-pyaff_la_LDFLAGS 	= -module $(PYTHON_LDFLAGS)
+pyaff_la_LDFLAGS 	= -module -avoid-version $(PYTHON_LDFLAGS)
 endif
diff -up afflib-3.4.1/pyaff/Makefile.in.pyver afflib-3.4.1/pyaff/Makefile.in
--- afflib-3.4.1/pyaff/Makefile.in.pyver	2009-09-24 08:08:53.000000000 +0200
+++ afflib-3.4.1/pyaff/Makefile.in	2009-09-24 22:45:15.322807098 +0200
@@ -226,7 +226,7 @@ EXTRA_DIST = PKG-INFO README pyaff.c set
 @HAVE_PYTHON_TRUE at pyaff_la_SOURCES = pyaff.c
 @HAVE_PYTHON_TRUE at pyaff_la_LIBADD = ../lib/libafflib.la
 @HAVE_PYTHON_TRUE at pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
- at HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
+ at HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
 all: all-am
 
 .SUFFIXES:


--- NEW FILE import.log ---
afflib-3_4_1-1_fc11:HEAD:afflib-3.4.1-1.fc11.src.rpm:1253825572


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Sep 2009 08:34:39 -0000	1.14
+++ .cvsignore	24 Sep 2009 20:54:35 -0000	1.15
@@ -1 +1 @@
-afflib-3.3.7.tar.gz
+afflib-3.4.1.tar.gz


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- afflib.spec	2 Sep 2009 08:34:39 -0000	1.31
+++ afflib.spec	24 Sep 2009 20:54:35 -0000	1.32
@@ -1,5 +1,7 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           afflib
-Version:        3.3.7
+Version:        3.4.1
 Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
@@ -7,7 +9,8 @@ Group:          System Environment/Libra
 License:        BSD with advertising
 URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
-Patch0:         afflib-3.3.4-gcc44.patch
+Patch0:         afflib-3.4.1-gcc43.patch
+Patch1:         afflib-3.4.1-pyver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -57,7 +60,8 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .pyver
 # prevent internal lzma to be built - testing
 #rm -rf lzma443
 
@@ -70,6 +74,7 @@ chmod 0644 lib/base64.{h,cpp}
 %configure --enable-shared \
   --disable-static \
   --enable-libewf=yes \
+  --enable-python=yes \
   --enable-qemu=no
 
 #?Remove rpath from libtool
@@ -107,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n afftools
 %defattr(-,root,root,-)
 %{_bindir}/af*
+%{python_sitearch}/pyaff.so
 %{_mandir}/man1/afcat.1.*
 
 %files devel
@@ -118,8 +124,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 3.3.7-1
+* Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 3.4.1-1
+- Update to 3.4.1
+- Update gcc43 (new case)
+- Enable python binding.
+- Avoid version-info on the python module.
+
+* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 3.3.7-2
 - Update to 3.3.7
+- Update gcc44 patch
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-4
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Sep 2009 08:34:39 -0000	1.14
+++ sources	24 Sep 2009 20:54:35 -0000	1.15
@@ -1 +1 @@
-198433e717073d69976ee0b3b9399ab4  afflib-3.3.7.tar.gz
+eb3a44f893cd268f32c91b8eb673ecc7  afflib-3.4.1.tar.gz



From epienbro at fedoraproject.org  Thu Sep 24 20:55:35 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 20:55:35 +0000 (UTC)
Subject: rpms/mingw32-libxslt/F-11 mingw32-libxslt-dont-use-pthread.patch,
	NONE, 1.1 mingw32-libxslt.spec, 1.4,
	1.5 mingw32-libxslt-1.1.24-win32-shared.patch, 1.1, NONE
Message-ID: <20090924205535.A7DFC11C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2744

Modified Files:
	mingw32-libxslt.spec 
Added Files:
	mingw32-libxslt-dont-use-pthread.patch 
Removed Files:
	mingw32-libxslt-1.1.24-win32-shared.patch 
Log Message:
Merged the changes from the F-12 package


mingw32-libxslt-dont-use-pthread.patch:
 configure.in |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE mingw32-libxslt-dont-use-pthread.patch ---
--- libxslt-1.1.25/configure.in.orig	2009-09-17 19:41:13.219723199 +0200
+++ libxslt-1.1.25/configure.in	2009-09-17 19:41:22.887973276 +0200
@@ -137,12 +137,6 @@
 
 dnl Look for pthread.h, needed for testThreads
 THREAD_LIBS=""
-AC_CHECK_HEADER(pthread.h,
-    AC_CHECK_LIB(pthread, pthread_join,[
-       AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
-       AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
-       THREAD_LIBS="-lpthread"]))
-
 AC_SUBST(THREAD_LIBS)
 
 dnl


Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/mingw32-libxslt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libxslt.spec	24 Sep 2009 20:37:56 -0000	1.4
+++ mingw32-libxslt.spec	24 Sep 2009 20:55:35 -0000	1.5
@@ -17,8 +17,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-# Fix compilation on MinGW environments
-Patch1000:      mingw32-libxslt-1.1.24-win32-shared.patch
+# Don't try to use mingw32-pthreads even if it's available 
+Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 
 BuildRequires:  mingw32-filesystem >= 30
 BuildRequires:  mingw32-gcc
@@ -89,8 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/xsltproc.exe
 %{_mingw32_includedir}/libexslt
 %{_mingw32_includedir}/libxslt
-#%{_mingw32_bindir}/libexslt.dll
-#%{_mingw32_libdir}/libexslt.dll.a
+%{_mingw32_bindir}/libexslt-0.dll
+%{_mingw32_libdir}/libexslt.dll.a
 %{_mingw32_libdir}/libexslt.la
 %{_mingw32_bindir}/libxslt-1.dll
 %{_mingw32_libdir}/libxslt.dll.a
@@ -110,7 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-1
 - Update to 1.1.26
-- Drop upstreamed patch
+- Drop upstreamed CVE patch
+- Dropped upstreamed mingw32 patches
+- Added a patch to never use pthreads even if it's available
 
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.24-7
 - Use %%global instead of %%define


--- mingw32-libxslt-1.1.24-win32-shared.patch DELETED ---



From myoung at fedoraproject.org  Thu Sep 24 21:05:45 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 24 Sep 2009 21:05:45 +0000 (UTC)
Subject: rpms/kernel/devel drm-edid-fixes.patch, NONE,
	1.1.2.1 patch-2.6.31.1.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.1014.2.30, 1.1014.2.31 Makefile, 1.97.6.7,
	1.97.6.8 drm-nouveau.patch, 1.8.6.19, 1.8.6.20 kernel.spec,
	1.1294.2.68, 1.1294.2.69 linux-2.6-raidlockdep.patch, 1.1.2.1,
	1.1.2.2 sources, 1.976.2.31, 1.976.2.32 upstream, 1.888.2.30,
	1.888.2.31 xen.pvops.patch, 1.1.2.43,
	1.1.2.44 xen.pvops.post.patch, 1.1.2.28, 1.1.2.29
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch,
	1.1.2.2, NONE
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch,
	1.1.2.2, NONE linux-2.6-scsi-sd-fix-oops-during-scanning.patch,
	1.1.2.1, NONE linux-2.6-scsi-sg-fix-oops-in-error-path.patch, 1.1.2.1,
	NONE linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch,
	1.1.2.2, NONE
Message-ID: <20090924210545.E5FDA11C00DB@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5981

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore Makefile drm-nouveau.patch kernel.spec 
	linux-2.6-raidlockdep.patch sources upstream xen.pvops.patch 
	xen.pvops.post.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-edid-fixes.patch patch-2.6.31.1.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch 
	linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	linux-2.6-scsi-sd-fix-oops-during-scanning.patch 
	linux-2.6-scsi-sg-fix-oops-in-error-path.patch 
	linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch 
Log Message:
Try a dri fix in the latest xen/master


drm-edid-fixes.patch:
 drm_edid.c |   40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

--- NEW FILE drm-edid-fixes.patch ---
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 90d76ba..9888c20 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -109,7 +109,9 @@ static struct edid_quirk {
 
 
 /* Valid EDID header has these bytes */
-static u8 edid_header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 };
+static const u8 edid_header[] = {
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
+};
 
 /**
  * edid_is_valid - sanity check EDID data
@@ -500,6 +502,19 @@ static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
 	}
 	return mode;
 }
+
+/*
+ * 0 is reserved.  The spec says 0x01 fill for unused timings.  Some old
+ * monitors fill with ascii space (0x20) instead.
+ */
+static int
+bad_std_timing(u8 a, u8 b)
+{
+	return (a == 0x00 && b == 0x00) ||
+	       (a == 0x01 && b == 0x01) ||
+	       (a == 0x20 && b == 0x20);
+}
+
 /**
  * drm_mode_std - convert standard mode info (width, height, refresh) into mode
  * @t: standard timing params
@@ -513,6 +528,7 @@ static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
  */
 struct drm_display_mode *drm_mode_std(struct drm_device *dev,
 				      struct std_timing *t,
+				      int revision,
 				      int timing_level)
 {
 	struct drm_display_mode *mode;
@@ -523,14 +539,20 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev,
 	unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
 		>> EDID_TIMING_VFREQ_SHIFT;
 
+	if (bad_std_timing(t->hsize, t->vfreq_aspect))
+		return NULL;
+
 	/* According to the EDID spec, the hdisplay = hsize * 8 + 248 */
 	hsize = t->hsize * 8 + 248;
 	/* vrefresh_rate = vfreq + 60 */
 	vrefresh_rate = vfreq + 60;
 	/* the vdisplay is calculated based on the aspect ratio */
-	if (aspect_ratio == 0)
-		vsize = (hsize * 10) / 16;
-	else if (aspect_ratio == 1)
+	if (aspect_ratio == 0) {
+		if (revision < 3)
+			vsize = hsize;
+		else
+			vsize = (hsize * 10) / 16;
+	} else if (aspect_ratio == 1)
 		vsize = (hsize * 3) / 4;
 	else if (aspect_ratio == 2)
 		vsize = (hsize * 4) / 5;
@@ -779,7 +801,7 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 			continue;
 
 		newmode = drm_mode_std(dev, &edid->standard_timings[i],
-					timing_level);
+				       edid->revision, timing_level);
 		if (newmode) {
 			drm_mode_probed_add(connector, newmode);
 			modes++;
@@ -829,13 +851,13 @@ static int add_detailed_info(struct drm_connector *connector,
 			case EDID_DETAIL_MONITOR_CPDATA:
 				break;
 			case EDID_DETAIL_STD_MODES:
-				/* Five modes per detailed section */
-				for (j = 0; j < 5; i++) {
+				for (j = 0; j < 6; i++) {
 					struct std_timing *std;
 					struct drm_display_mode *newmode;
 
 					std = &data->data.timings[j];
 					newmode = drm_mode_std(dev, std,
+							       edid->revision,
 							       timing_level);
 					if (newmode) {
 						drm_mode_probed_add(connector, newmode);
@@ -964,7 +986,9 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
 				struct drm_display_mode *newmode;
 
 				std = &data->data.timings[j];
-				newmode = drm_mode_std(dev, std, timing_level);
+				newmode = drm_mode_std(dev, std,
+						       edid->revision,
+						       timing_level);
 				if (newmode) {
 					drm_mode_probed_add(connector, newmode);
 					modes++;


--- NEW FILE patch-2.6.31.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKu7QfyGugalF9Dw4RAsOXAJsFcZg2T7EeVt3LtEOQ9kw1QMUgagCff6bk
9tVlqfN7sHAgL+N2XFIir1o=
=6zvK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.30
retrieving revision 1.1014.2.31
diff -u -p -r1.1014.2.30 -r1.1014.2.31
--- .cvsignore	10 Sep 2009 14:00:22 -0000	1.1014.2.30
+++ .cvsignore	24 Sep 2009 21:05:03 -0000	1.1014.2.31
@@ -5,3 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
+patch-2.6.31.1.bz2



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5476 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  540 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  754 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  437 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1262 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  357 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  848 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  296 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  585 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  178 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  950 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  688 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  789 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  224 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2238 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  809 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  479 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  450 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58650 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.19 -r 1.8.6.20 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.19
retrieving revision 1.8.6.20
diff -u -p -r1.8.6.19 -r1.8.6.20
--- drm-nouveau.patch	19 Sep 2009 16:47:26 -0000	1.8.6.19
+++ drm-nouveau.patch	24 Sep 2009 21:05:07 -0000	1.8.6.20
@@ -61,64 +61,6 @@ index 3c8827a..d22e64b 100644
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
 +obj-y			+= i2c/
-diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 6246e3f..436e2fe 100644
---- a/drivers/gpu/drm/drm_bufs.c
-+++ b/drivers/gpu/drm/drm_bufs.c
-@@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
- 
- EXPORT_SYMBOL(drm_get_resource_len);
- 
--static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
--						  struct drm_local_map *map)
-+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+					   struct drm_local_map *map)
- {
- 	struct drm_map_list *entry;
- 	list_for_each_entry(entry, &dev->maplist, head) {
--		/*
--		 * Because the kernel-userspace ABI is fixed at a 32-bit offset
--		 * while PCI resources may live above that, we ignore the map
--		 * offset for maps of type _DRM_FRAMEBUFFER or _DRM_REGISTERS.
--		 * It is assumed that each driver will have only one resource of
--		 * each type.
--		 */
- 		if (!entry->map ||
- 		    map->type != entry->map->type ||
- 		    entry->master != dev->primary->master)
- 			continue;
--		switch (map->type) {
--		case _DRM_SHM:
--			if (map->flags != _DRM_CONTAINS_LOCK)
--				break;
--		case _DRM_REGISTERS:
--		case _DRM_FRAME_BUFFER:
--			return entry;
--		default: /* Make gcc happy */
--			;
--		}
--		if (entry->map->offset == map->offset)
-+
-+		if (entry->map->offset == map->offset ||
-+		    (map->type == _DRM_SHM && map->flags & _DRM_CONTAINS_LOCK))
- 			return entry;
- 	}
- 
- 	return NULL;
- }
-+EXPORT_SYMBOL(drm_find_matching_map);
- 
- static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
- 			  unsigned long user_token, int hashed_handle, int shm)
-@@ -357,7 +343,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
- 	/* We do it here so that dev->struct_mutex protects the increment */
- 	user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle :
- 		map->offset;
--	ret = drm_map_handle(dev, &list->hash, user_token, 0,
-+	ret = drm_map_handle(dev, &list->hash, user_token, 1,
- 			     (map->type == _DRM_SHM));
- 	if (ret) {
- 		if (map->type == _DRM_REGISTERS)
 diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
 new file mode 100644
 index 0000000..6d2abaf
@@ -131,10 +73,10 @@ index 0000000..6d2abaf
 +obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
 new file mode 100644
-index 0000000..0a3f7a0
+index 0000000..9422a74
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,532 @@
+@@ -0,0 +1,531 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -350,12 +292,11 @@ index 0000000..0a3f7a0
 +		priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
 +
 +	drm_connector_property_set_value(connector,
-+					 encoder->dev->mode_config.tv_subconnector_property,
-+					 priv->subconnector);
++			encoder->dev->mode_config.tv_subconnector_property,
++							priv->subconnector);
 +
-+	return priv->subconnector?
-+		connector_status_connected
-+		: connector_status_disconnected;
++	return priv->subconnector ? connector_status_connected :
++					connector_status_disconnected;
 +}
 +
 +static int ch7006_encoder_get_modes(struct drm_encoder *encoder,
@@ -371,7 +312,7 @@ index 0000000..0a3f7a0
 +			continue;
 +
 +		drm_mode_probed_add(connector,
-+				    drm_mode_duplicate(encoder->dev, &mode->mode));
++				drm_mode_duplicate(encoder->dev, &mode->mode));
 +
 +		n++;
 +	}
@@ -644,11 +585,11 @@ index 0000000..0a3f7a0
 +	drm_i2c_encoder_unregister(&ch7006_driver);
 +}
 +
-+int ch7006_debug = 0;
++int ch7006_debug;
 +module_param_named(debug, ch7006_debug, int, 0600);
 +MODULE_PARM_DESC(debug, "Enable debug output.");
 +
-+char *ch7006_tv_norm = NULL;
++char *ch7006_tv_norm;
 +module_param_named(tv_norm, ch7006_tv_norm, charp, 0600);
 +MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
 +		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, PAL-60, NTSC-M, NTSC-J.\n"
@@ -669,7 +610,7 @@ index 0000000..0a3f7a0
 +module_exit(ch7006_exit);
 diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c
 new file mode 100644
-index 0000000..7ffe0bd
+index 0000000..87f5445
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_mode.c
 @@ -0,0 +1,473 @@
@@ -971,8 +912,8 @@ index 0000000..7ffe0bd
 +	uint8_t *power = &priv->state.regs[CH7006_POWER];
 +	int subconnector;
 +
-+	subconnector = priv->select_subconnector?
-+		priv->select_subconnector : priv->subconnector;
++	subconnector = priv->select_subconnector ? priv->select_subconnector :
++							priv->subconnector;
 +
 +	*power = CH7006_POWER_RESET;
 +
@@ -1148,10 +1089,10 @@ index 0000000..7ffe0bd
 +}
 diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h
 new file mode 100644
-index 0000000..576bbea
+index 0000000..b06d3d9
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_priv.h
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,344 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -1252,7 +1193,8 @@ index 0000000..576bbea
 +	int last_dpms;
 +};
 +
-+#define to_ch7006_priv(x) ((struct ch7006_priv *)to_encoder_slave(x)->slave_priv)
++#define to_ch7006_priv(x) \
++	((struct ch7006_priv *)to_encoder_slave(x)->slave_priv)
 +
 +extern int ch7006_debug;
 +extern char *ch7006_tv_norm;
@@ -1286,22 +1228,25 @@ index 0000000..576bbea
 +			dev_printk(KERN_DEBUG, &client->dev,		\
 +				   "%s: " format, __func__, ## __VA_ARGS__); \
 +	} while (0)
-+#define ch7006_info(client, format, ...) dev_info(&client->dev, format, __VA_ARGS__)
-+#define ch7006_err(client, format, ...) dev_err(&client->dev, format, __VA_ARGS__)
++#define ch7006_info(client, format, ...) \
++				dev_info(&client->dev, format, __VA_ARGS__)
++#define ch7006_err(client, format, ...) \
++				dev_err(&client->dev, format, __VA_ARGS__)
 +
-+#define __mask(src, bitfield) (((2 << (1?bitfield)) - 1) & ~((1 << (0?bitfield)) - 1))
++#define __mask(src, bitfield) \
++		(((2 << (1 ? bitfield)) - 1) & ~((1 << (0 ? bitfield)) - 1))
 +#define mask(bitfield) __mask(bitfield)
 +
-+#define __bitf(src, bitfield, x) (((x) >> (src) << (0?bitfield)) &	\
-+				  __mask(src, bitfield))
++#define __bitf(src, bitfield, x) \
++		(((x) >> (src) << (0 ? bitfield)) &  __mask(src, bitfield))
 +#define bitf(bitfield, x) __bitf(bitfield, x)
 +#define bitfs(bitfield, s) __bitf(bitfield, bitfield##_##s)
 +#define setbitf(state, reg, bitfield, x)				\
 +	state->regs[reg] = (state->regs[reg] & ~mask(reg##_##bitfield))	\
 +		| bitf(reg##_##bitfield, x)
 +
-+#define __unbitf(src, bitfield, x) ((x & __mask(src, bitfield)) \
-+				    >> (0?bitfield) << (src))
++#define __unbitf(src, bitfield, x) \
++		((x & __mask(src, bitfield)) >> (0 ? bitfield) << (src))
 +#define unbitf(bitfield, x) __unbitf(bitfield, x)
[...7623 lines suppressed...]
 new file mode 100644
-index 0000000..062d085
+index 0000000..225f301
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
-@@ -0,0 +1,499 @@
+@@ -0,0 +1,508 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + *
@@ -56970,7 +57527,7 @@ index 0000000..062d085
 +
 +/*NOTE: - Assumes 0x1700 already covers the correct MiB of PRAMIN
 + */
-+#define BAR0_WI32(g,o,v) do {                                     \
++#define BAR0_WI32(g, o, v) do {                                   \
 +	uint32_t offset;                                          \
 +	if ((g)->im_backing) {                                    \
 +		offset = (g)->im_backing_start;                   \
@@ -56980,7 +57537,7 @@ index 0000000..062d085
 +	}                                                         \
 +	offset += (o);                                            \
 +	nv_wr32(dev, NV_RAMIN + (offset & 0xfffff), (v));              \
-+} while(0)
++} while (0)
 +
 +int
 +nv50_instmem_init(struct drm_device *dev)
@@ -56998,7 +57555,7 @@ index 0000000..062d085
 +	dev_priv->engine.instmem.priv = priv;
 +
 +	/* Save state, will restore at takedown. */
-+	for (i = 0x1700; i <= 0x1710; i+=4)
++	for (i = 0x1700; i <= 0x1710; i += 4)
 +		priv->save1700[(i-0x1700)/4] = nv_rd32(dev, i);
 +
 +	/* Reserve the last MiB of VRAM, we should probably try to avoid
@@ -57066,24 +57623,27 @@ index 0000000..062d085
 +	dev_priv->fifos[0] = dev_priv->fifos[127] = chan;
 +
 +	/* Channel's PRAMIN object + heap */
-+	if ((ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
-+					   NULL, &chan->ramin)))
++	ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
++							NULL, &chan->ramin);
++	if (ret)
 +		return ret;
 +
 +	if (nouveau_mem_init_heap(&chan->ramin_heap, c_base, c_size - c_base))
 +		return -ENOMEM;
 +
 +	/* RAMFC + zero channel's PRAMIN up to start of VM pagedir */
-+	if ((ret = nouveau_gpuobj_new_fake(dev, c_ramfc, c_offset + c_ramfc,
-+					   0x4000, 0, NULL, &chan->ramfc)))
++	ret = nouveau_gpuobj_new_fake(dev, c_ramfc, c_offset + c_ramfc,
++						0x4000, 0, NULL, &chan->ramfc);
++	if (ret)
 +		return ret;
 +
 +	for (i = 0; i < c_vmpd; i += 4)
 +		BAR0_WI32(chan->ramin->gpuobj, i, 0);
 +
 +	/* VM page directory */
-+	if ((ret = nouveau_gpuobj_new_fake(dev, c_vmpd, c_offset + c_vmpd,
-+					   0x4000, 0, &chan->vm_pd, NULL)))
++	ret = nouveau_gpuobj_new_fake(dev, c_vmpd, c_offset + c_vmpd,
++					   0x4000, 0, &chan->vm_pd, NULL);
++	if (ret)
 +		return ret;
 +	for (i = 0; i < 0x4000; i += 8) {
 +		BAR0_WI32(chan->vm_pd, i + 0x00, 0x00000000);
@@ -57093,11 +57653,12 @@ index 0000000..062d085
 +	/* PRAMIN page table, cheat and map into VM at 0x0000000000.
 +	 * We map the entire fake channel into the start of the PRAMIN BAR
 +	 */
-+	if ((ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pt_size, 0x1000,
-+					  0, &priv->pramin_pt)))
++	ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pt_size, 0x1000,
++							0, &priv->pramin_pt);
++	if (ret)
 +		return ret;
 +
-+	for (i = 0, v = c_offset; i < pt_size; i+=8, v+=0x1000) {
++	for (i = 0, v = c_offset; i < pt_size; i += 8, v += 0x1000) {
 +		if (v < (c_offset + c_size))
 +			BAR0_WI32(priv->pramin_pt->gpuobj, i + 0, v | 1);
 +		else
@@ -57114,13 +57675,15 @@ index 0000000..062d085
 +					     NV50_VM_BLOCK/65536*8, 0, 0,
 +					     &chan->vm_vram_pt[i]);
 +		if (ret) {
-+			NV_ERROR(dev, "Error creating VRAM page tables: %d\n", ret);
++			NV_ERROR(dev, "Error creating VRAM page tables: %d\n",
++									ret);
 +			dev_priv->vm_vram_pt_nr = i;
 +			return ret;
 +		}
 +		dev_priv->vm_vram_pt[i] = chan->vm_vram_pt[i]->gpuobj;
 +
-+		for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size; v+=4)
++		for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size;
++								v += 4)
 +			BAR0_WI32(dev_priv->vm_vram_pt[i], v, 0);
 +
 +		BAR0_WI32(chan->vm_pd, 0x10 + (i*8),
@@ -57129,8 +57692,9 @@ index 0000000..062d085
 +	}
 +
 +	/* DMA object for PRAMIN BAR */
-+	if ((ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
-+					  &priv->pramin_bar)))
++	ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
++							&priv->pramin_bar);
++	if (ret)
 +		return ret;
 +	BAR0_WI32(priv->pramin_bar->gpuobj, 0x00, 0x7fc00000);
 +	BAR0_WI32(priv->pramin_bar->gpuobj, 0x04, dev_priv->ramin_size - 1);
@@ -57140,8 +57704,9 @@ index 0000000..062d085
 +	BAR0_WI32(priv->pramin_bar->gpuobj, 0x14, 0x00000000);
 +
 +	/* DMA object for FB BAR */
-+	if ((ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
-+					  &priv->fb_bar)))
++	ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
++							&priv->fb_bar);
++	if (ret)
 +		return ret;
 +	BAR0_WI32(priv->fb_bar->gpuobj, 0x00, 0x7fc00000);
 +	BAR0_WI32(priv->fb_bar->gpuobj, 0x04, 0x40000000 +
@@ -57167,9 +57732,10 @@ index 0000000..062d085
 +	/* Assume that praying isn't enough, check that we can re-read the
 +	 * entire fake channel back from the PRAMIN BAR */
 +	dev_priv->engine.instmem.prepare_access(dev, false);
-+	for (i = 0; i < c_size; i+=4) {
++	for (i = 0; i < c_size; i += 4) {
 +		if (nv_rd32(dev, NV_RAMIN + i) != nv_ri32(dev, i)) {
-+			NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n", i);
++			NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n",
++									i);
 +			dev_priv->engine.instmem.finish_access(dev);
 +			return -EINVAL;
 +		}
@@ -57206,8 +57772,8 @@ index 0000000..062d085
 +		return;
 +
 +	/* Restore state from before init */
-+	for (i = 0x1700; i <= 0x1710; i+=4)
-+		nv_wr32(dev, i, priv->save1700[(i-0x1700)/4]);
++	for (i = 0x1700; i <= 0x1710; i += 4)
++		nv_wr32(dev, i, priv->save1700[(i - 0x1700) / 4]);
 +
 +	nouveau_gpuobj_ref_del(dev, &priv->fb_bar);
 +	nouveau_gpuobj_ref_del(dev, &priv->pramin_bar);
@@ -57470,7 +58036,7 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..45b0ff7
+index 0000000..a2dee96
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
 @@ -0,0 +1,250 @@
@@ -57526,7 +58092,7 @@ index 0000000..45b0ff7
 +		return;
 +	}
 +	BEGIN_RING(evo, 0, NV50_EVO_SOR(encoder->or, MODE_CTRL), 1);
-+	OUT_RING  (evo, 0);
++	OUT_RING(evo, 0);
 +}
 +
 +static void nv50_sor_dpms(struct drm_encoder *drm_encoder, int mode)
@@ -57645,7 +58211,7 @@ index 0000000..45b0ff7
 +		return;
 +	}
 +	BEGIN_RING(evo, 0, NV50_EVO_SOR(encoder->or, MODE_CTRL), 1);
-+	OUT_RING  (evo, mode_ctl);
++	OUT_RING(evo, mode_ctl);
 +}
 +
 +static const struct drm_encoder_helper_funcs nv50_sor_helper_funcs = {
@@ -58309,19 +58875,6 @@ index b940fdf..cfa6af4 100644
  unifdef-y += savage_drm.h
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index eeefb63..1345c39 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
- extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
- 
- 				/* Buffer management support (drm_bufs.h) */
-+extern struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+						  drm_local_map_t *map);
- extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
- extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
- extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
 diff --git a/include/drm/i2c/ch7006.h b/include/drm/i2c/ch7006.h
 new file mode 100644
 index 0000000..8390b43


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.68
retrieving revision 1.1294.2.69
diff -u -p -r1.1294.2.68 -r1.1294.2.69
--- kernel.spec	19 Sep 2009 16:47:28 -0000	1.1294.2.68
+++ kernel.spec	24 Sep 2009 21:05:13 -0000	1.1294.2.69
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -509,7 +509,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 5
 
 %define fancy_debuginfo 0
 %if %{with_debuginfo}
-%if 0%{?fedora} >= 8
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
 %define fancy_debuginfo 1
 %endif
 %endif
@@ -695,9 +695,6 @@ Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
-Patch1575: linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-Patch1576: linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-Patch1577: linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
@@ -711,6 +708,7 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
+Patch1827: drm-edid-fixes.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -753,9 +751,6 @@ Patch13000: ppc-hates-my-family-and-swor
 
 # patches headed for -stable
 
-# scsi oops fixes
-Patch14000: linux-2.6-scsi-sd-fix-oops-during-scanning.patch
-Patch14001: linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
 
@@ -1334,7 +1329,8 @@ ApplyPatch linux-2.6-iwlwifi-remove-depr
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
-ApplyPatch linux-2.6.31-modules-ro-nx.patch
+# breaks ftrace NOP replacement
+#ApplyPatch linux-2.6.31-modules-ro-nx.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -1363,9 +1359,6 @@ ApplyPatch linux-2.6-ksm-fix-munlock.pat
 ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-ApplyPatch linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-ApplyPatch linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
-ApplyPatch linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
 #ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
@@ -1386,6 +1379,7 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
+ApplyPatch drm-edid-fixes.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -1414,9 +1408,6 @@ ApplyPatch linux-2.6-selinux-module-load
 
 # patches headed for -stable
 
-# scsi oops fixes
-ApplyPatch linux-2.6-scsi-sd-fix-oops-during-scanning.patch
-ApplyPatch linux-2.6-scsi-sg-fix-oops-in-error-path.patch
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
 
@@ -1556,7 +1547,7 @@ EOF
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
 %if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/dracut-$KernelVer.img
+    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
 %else
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
 %endif
@@ -2079,6 +2070,32 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Michael Young <m.a.young at durham.ac.uk>
+- Try a dri fix in the latest xen/master
+
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-41
+- Linux 2.6.31.1
+- Drop patches merged upstream:
+    linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+    linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch
+    linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch
+    linux-2.6-scsi-sd-fix-oops-during-scanning.patch
+    linux-2.6-scsi-sg-fix-oops-in-error-path.patch
+
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-40
+- Drop the modules-ro-nx patch: it's causing ftrace to be unable
+  to NOP out module function call tracking. (#524042)
+
+* Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-39
+- touch initramfs-$foo not dracut-$foo.
+
+* Wed Sep 23 2009 Adam Jackson <ajax at redhat.com> 2.6.31-37
+- drm: Fix various buglets in EDID parsing.
+
+* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: more on rh#522649, added some useful info to debugfs
+- lots of coding style cleanups, which is the reason for the huge commit
+
 * Sat Sep 19 2009 Michael Young <m.a.young at durham.ac.uk>
 - Switch pvops from rebase/master to xen/master branch
 

linux-2.6-raidlockdep.patch:
 file.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Index: linux-2.6-raidlockdep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/linux-2.6-raidlockdep.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- linux-2.6-raidlockdep.patch	19 Sep 2009 16:47:29 -0000	1.1.2.1
+++ linux-2.6-raidlockdep.patch	24 Sep 2009 21:05:14 -0000	1.1.2.2
@@ -117,4 +117,4 @@ index 561a9c0..f5ea468 100644
  }
  EXPORT_SYMBOL_GPL(sysfs_notify_dirent);
  
--- 1.6.0.6 
\ No newline at end of file
+-- 1.6.0.6 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.31
retrieving revision 1.976.2.32
diff -u -p -r1.976.2.31 -r1.976.2.32
--- sources	10 Sep 2009 14:00:31 -0000	1.976.2.31
+++ sources	24 Sep 2009 21:05:14 -0000	1.976.2.32
@@ -1 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
+43977a0a264dd7d173b6ef122c62fb20  patch-2.6.31.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.30
retrieving revision 1.888.2.31
diff -u -p -r1.888.2.30 -r1.888.2.31
--- upstream	10 Sep 2009 14:00:31 -0000	1.888.2.30
+++ upstream	24 Sep 2009 21:05:14 -0000	1.888.2.31
@@ -1 +1,2 @@
 linux-2.6.31.tar.bz2
+patch-2.6.31.1.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/Makefile                          |    2 
 arch/x86/include/asm/agp.h                 |   16 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 ------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 arch/x86/include/asm/processor.h           |    4 
 arch/x86/include/asm/syscalls.h            |    8 
 arch/x86/include/asm/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   44 
 arch/x86/include/asm/xen/interface.h       |    8 
 arch/x86/include/asm/xen/interface_32.h    |    5 
 arch/x86/include/asm/xen/interface_64.h    |   13 
 arch/x86/include/asm/xen/iommu.h           |   12 
 arch/x86/include/asm/xen/page.h            |   16 
 arch/x86/include/asm/xen/pci.h             |   37 
 arch/x86/include/asm/xen/swiotlb.h         |   10 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/processor.c           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   49 
 arch/x86/kernel/cpu/mtrr/Makefile          |    1 
 arch/x86/kernel/cpu/mtrr/amd.c             |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c         |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c           |    6 
 arch/x86/kernel/cpu/mtrr/generic.c         |   10 
 arch/x86/kernel/cpu/mtrr/main.c            |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h            |   11 
 arch/x86/kernel/cpu/mtrr/xen.c             |  104 +
 arch/x86/kernel/e820.c                     |   30 
 arch/x86/kernel/ioport.c                   |   40 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  200 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    6 
 arch/x86/kernel/pci-swiotlb.c              |   25 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/Makefile                       |    7 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/ioremap.c                      |   72 -
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 arch/x86/mm/physaddr.c                     |   70 +
 arch/x86/mm/physaddr.h                     |   10 
 arch/x86/mm/tlb.c                          |   35 
 arch/x86/pci/Makefile                      |    1 
 arch/x86/pci/common.c                      |   18 
 arch/x86/pci/i386.c                        |    3 
 arch/x86/pci/init.c                        |    6 
 arch/x86/pci/xen.c                         |   51 
 arch/x86/xen/Kconfig                       |   33 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |  220 +++
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |  997 ++++++++++++++++++
 arch/x86/xen/pci.c                         |  111 ++
 arch/x86/xen/setup.c                       |  108 +
 arch/x86/xen/smp.c                         |    3 
 arch/x86/xen/spinlock.c                    |   28 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/msi.c                          |    5 
 drivers/pci/xen-iommu.c                    |  271 ++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   23 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  657 +++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 +++++++++
 drivers/xen/events.c                       |  422 +++++++
 drivers/xen/evtchn.c                       |   82 +
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 +++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1602 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +-----
 drivers/xen/xenbus/xenbus_probe.h          |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c  |  298 +++++
 drivers/xen/xenbus/xenbus_probe_frontend.c |  292 +++++
 drivers/xen/xenfs/Makefile                 |    3 
 drivers/xen/xenfs/privcmd.c                |  403 +++++++
 drivers/xen/xenfs/super.c                  |   98 +
 drivers/xen/xenfs/xenfs.h                  |    3 
 drivers/xen/xenfs/xenstored.c              |   67 +
 include/acpi/processor.h                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/swiotlb.h                    |    1 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 +++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |  102 +
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 146 files changed, 12861 insertions(+), 1465 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.43
retrieving revision 1.1.2.44
diff -u -p -r1.1.2.43 -r1.1.2.44
--- xen.pvops.patch	19 Sep 2009 16:47:29 -0000	1.1.2.43
+++ xen.pvops.patch	24 Sep 2009 21:05:14 -0000	1.1.2.44
@@ -27,29 +27,28 @@ index 1b68659..5e7db44 100644
                  stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
                  KBUILD_CFLAGS += $(stackp-y)
 diff --git a/arch/x86/include/asm/agp.h b/arch/x86/include/asm/agp.h
-index 9825cd6..d972b14 100644
+index 9825cd6..8107b71 100644
 --- a/arch/x86/include/asm/agp.h
 +++ b/arch/x86/include/asm/agp.h
-@@ -1,8 +1,11 @@
- #ifndef _ASM_X86_AGP_H
- #define _ASM_X86_AGP_H
+@@ -3,6 +3,10 @@
  
-+#include <linux/swiotlb.h>
-+
  #include <asm/pgtable.h>
  #include <asm/cacheflush.h>
 +#include <asm/dma-mapping.h>
++
++#include <asm/xen/hypervisor.h>
++#include <asm/xen/page.h>
  
  /*
   * Functions to keep the agpgart mappings coherent with the MMU. The
-@@ -23,13 +26,15 @@
+@@ -23,13 +27,15 @@
  #define flush_agp_cache() wbinvd()
  
  /* Convert a physical address to an address suitable for the GART. */
 -#define phys_to_gart(x) (x)
 -#define gart_to_phys(x) (x)
-+#define phys_to_gart(x) swiotlb_phys_to_bus(NULL, (x))
-+#define gart_to_phys(x) swiotlb_bus_to_phys(NULL, (x))
++#define phys_to_gart(x) (xen_pv_domain() ? phys_to_machine(XPADDR(x)).maddr : (x))
++#define gart_to_phys(x) (xen_pv_domain() ? machine_to_phys(XMADDR(x)).paddr : (x))
  
  /* GATT allocation. Returns/accepts GATT kernel virtual address. */
 -#define alloc_gatt_pages(order)		\
@@ -1724,10 +1723,10 @@ index 1674807..3658a86 100644
  static inline int pud_none(pud_t pud)
  {
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index c776826..0bfcf7e 100644
+index e597ecc..f7d2c8f 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -540,6 +540,9 @@ static inline void native_set_iopl_mask(unsigned mask)
+@@ -550,6 +550,9 @@ static inline void native_set_iopl_mask(unsigned mask)
  #endif
  }
  
@@ -1737,7 +1736,7 @@ index c776826..0bfcf7e 100644
  static inline void
  native_load_sp0(struct tss_struct *tss, struct thread_struct *thread)
  {
-@@ -581,6 +584,7 @@ static inline void load_sp0(struct tss_struct *tss,
+@@ -591,6 +594,7 @@ static inline void load_sp0(struct tss_struct *tss,
  }
  
  #define set_iopl_mask native_set_iopl_mask
@@ -1745,6 +1744,34 @@ index c776826..0bfcf7e 100644
  #endif /* CONFIG_PARAVIRT */
  
  /*
+diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
+index 372b76e..5336ce2 100644
+--- a/arch/x86/include/asm/syscalls.h
++++ b/arch/x86/include/asm/syscalls.h
+@@ -33,11 +33,11 @@ long sys_rt_sigreturn(struct pt_regs *);
+ asmlinkage int sys_set_thread_area(struct user_desc __user *);
+ asmlinkage int sys_get_thread_area(struct user_desc __user *);
+ 
+-/* X86_32 only */
+-#ifdef CONFIG_X86_32
+ /* kernel/ioport.c */
+-long sys_iopl(struct pt_regs *);
++asmlinkage long sys_iopl(unsigned int);
+ 
++/* X86_32 only */
++#ifdef CONFIG_X86_32
+ /* kernel/process_32.c */
+ int sys_clone(struct pt_regs *);
+ int sys_execve(struct pt_regs *);
+@@ -70,8 +70,6 @@ int sys_vm86(struct pt_regs *);
+ #else /* CONFIG_X86_32 */
+ 
+ /* X86_64 only */
+-/* kernel/ioport.c */
+-asmlinkage long sys_iopl(unsigned int, struct pt_regs *);
+ 
+ /* kernel/process_64.c */
+ asmlinkage long sys_clone(unsigned long, unsigned long,
 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
 index 7f3eba0..e4fc8ea 100644
 --- a/arch/x86/include/asm/tlbflush.h
@@ -2605,7 +2632,7 @@ index 5cb5725..1e3bd20 100644
   * Drop the i-th range from the early reservation map,
   * by copying any higher ranges down one over it, and
 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 99c4d30..0a421d3 100644
+index 99c4d30..919c1a8 100644
 --- a/arch/x86/kernel/ioport.c
 +++ b/arch/x86/kernel/ioport.c
 @@ -30,13 +30,29 @@ static void set_bitmap(unsigned long *bitmap, unsigned int base,
@@ -2669,6 +2696,30 @@ index 99c4d30..0a421d3 100644
  
  	return 0;
  }
+@@ -119,11 +134,10 @@ static int do_iopl(unsigned int level, struct pt_regs *regs)
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_X86_32
+-long sys_iopl(struct pt_regs *regs)
++asmlinkage long sys_iopl(unsigned int level)
+ {
+-	unsigned int level = regs->bx;
+ 	struct thread_struct *t = &current->thread;
++	struct pt_regs *regs = task_pt_regs(current);
+ 	int rc;
+ 
+ 	rc = do_iopl(level, regs);
+@@ -135,9 +149,3 @@ long sys_iopl(struct pt_regs *regs)
+ out:
+ 	return rc;
+ }
+-#else
+-asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs)
+-{
+-	return do_iopl(level, regs);
+-}
+-#endif
 diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
 index 9371448..4cb6bbd 100644
 --- a/arch/x86/kernel/microcode_core.c
@@ -2911,7 +2962,7 @@ index 70ec9b9..cef3d70 100644
  
  	.start_context_switch = paravirt_nop,
 diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 1a041bc..6b76948 100644
+index 1a041bc..1101a9f 100644
 --- a/arch/x86/kernel/pci-dma.c
 +++ b/arch/x86/kernel/pci-dma.c
 @@ -10,6 +10,8 @@
@@ -2923,15 +2974,15 @@ index 1a041bc..6b76948 100644
  
  static int forbid_dac __read_mostly;
  
-@@ -128,6 +130,8 @@ void __init pci_iommu_alloc(void)
- 
- 	amd_iommu_detect();
- 
+@@ -120,6 +122,8 @@ void __init pci_iommu_alloc(void)
+ 	 * The order of these functions is important for
+ 	 * fall-back/fail-over reasons
+ 	 */
 +	xen_swiotlb_init();
 +
- 	pci_swiotlb_init();
- }
+ 	gart_iommu_hole_init();
  
+ 	detect_calgary();
 @@ -281,6 +285,8 @@ static int __init pci_iommu_init(void)
  	dma_debug_add_bus(&pci_bus_type);
  #endif
@@ -4876,10 +4927,10 @@ index 4ceb285..a654a49 100644
  static struct dentry *d_mmu_debug;
 diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
 new file mode 100644
-index 0000000..5e2c856
+index 0000000..00f2260
 --- /dev/null
 +++ b/arch/x86/xen/pci-swiotlb.c
-@@ -0,0 +1,989 @@
+@@ -0,0 +1,997 @@
 +/*
 + * Dynamic DMA mapping support.
 + *
@@ -4925,6 +4976,10 @@ index 0000000..5e2c856
 +#include <xen/page.h>
 +#include <xen/xen-ops.h>
 +
++
++#include <linux/pci.h>
++#include <asm/gart.h>
++
 +#define OFFSET(val,align) ((unsigned long)	\
 +	                   ( (val) & ( (align) - 1)))
 +
@@ -5867,6 +5922,10 @@ index 0000000..5e2c856
 +		xen_swiotlb_init_with_default_size(64 * (1<<20));	/* default to 64MB */
 +		dma_ops = &xen_swiotlb_dma_ops;
 +		iommu_detected = 1;
++#ifdef CONFIG_GART_IOMMU
++		gart_iommu_aperture_disabled = 1;
++#endif
++
 +	}
 +}
 diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
@@ -6680,7 +6739,7 @@ index 1d886e0..f4a2b10 100644
  	  This driver implements the front-end of the Xen virtual
  	  block device driver.  It communicates with a back-end driver
 diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
-index c585577..b45e7cd 100644
+index dee0f1f..77a202c 100644
 --- a/drivers/char/agp/intel-agp.c
 +++ b/drivers/char/agp/intel-agp.c
 @@ -261,15 +261,19 @@ static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode)
@@ -10362,7 +10421,7 @@ index abad71b..68c287c 100644
 +	xen_setup_pirqs();
  }
 diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
-index af03195..79bedba 100644
+index af03195..2d5e212 100644
 --- a/drivers/xen/evtchn.c
 +++ b/drivers/xen/evtchn.c
 @@ -38,7 +38,6 @@
@@ -10373,6 +10432,172 @@ index af03195..79bedba 100644
  #include <linux/miscdevice.h>
  #include <linux/major.h>
  #include <linux/proc_fs.h>
+@@ -69,10 +68,36 @@ struct per_user_data {
+ 	const char *name;
+ };
+ 
+-/* Who's bound to each port? */
+-static struct per_user_data *port_user[NR_EVENT_CHANNELS];
++/*
++ * Who's bound to each port?  This is logically an array of struct
++ * per_user_data *, but we encode the current enabled-state in bit 0.
++ */
++static unsigned long *port_user;
+ static DEFINE_SPINLOCK(port_user_lock); /* protects port_user[] and ring_prod */
+ 
++static inline struct per_user_data *get_port_user(unsigned port)
++{
++	return (struct per_user_data *)(port_user[port] & ~1);
++}
++
++static inline void set_port_user(unsigned port, struct per_user_data *u)
++{
++	port_user[port] = (unsigned long)u;
++}
++
++static inline bool get_port_enabled(unsigned port)
++{
++	return port_user[port] & 1;
++}
++
++static inline void set_port_enabled(unsigned port, bool enabled)
++{
++	if (enabled)
++		port_user[port] |= 1;
++	else
++		port_user[port] &= ~1;
++}
++
+ irqreturn_t evtchn_interrupt(int irq, void *data)
+ {
+ 	unsigned int port = (unsigned long)data;
+@@ -80,9 +105,14 @@ irqreturn_t evtchn_interrupt(int irq, void *data)
+ 
+ 	spin_lock(&port_user_lock);
+ 
+-	u = port_user[port];
++	u = get_port_user(port);
++
++	WARN(!get_port_enabled(port),
++	     "Interrupt for port %d, but apparently not enabled; per-user %p\n",
++	     port, u);
+ 
+ 	disable_irq_nosync(irq);
++	set_port_enabled(port, false);
+ 
+ 	if ((u->ring_prod - u->ring_cons) < EVTCHN_RING_SIZE) {
+ 		u->ring[EVTCHN_RING_MASK(u->ring_prod)] = port;
+@@ -92,9 +122,8 @@ irqreturn_t evtchn_interrupt(int irq, void *data)
+ 			kill_fasync(&u->evtchn_async_queue,
+ 				    SIGIO, POLL_IN);
+ 		}
+-	} else {
++	} else
+ 		u->ring_overflow = 1;
+-	}
+ 
+ 	spin_unlock(&port_user_lock);
+ 
+@@ -198,9 +227,18 @@ static ssize_t evtchn_write(struct file *file, const char __user *buf,
+ 		goto out;
+ 
+ 	spin_lock_irq(&port_user_lock);
+-	for (i = 0; i < (count/sizeof(evtchn_port_t)); i++)
+-		if ((kbuf[i] < NR_EVENT_CHANNELS) && (port_user[kbuf[i]] == u))
+-			enable_irq(irq_from_evtchn(kbuf[i]));
++
++	for (i = 0; i < (count/sizeof(evtchn_port_t)); i++) {
++		unsigned port = kbuf[i];
++
++		if (port < NR_EVENT_CHANNELS &&
++		    get_port_user(port) == u &&
++		    !get_port_enabled(port)) {
++			set_port_enabled(port, true);
++			enable_irq(irq_from_evtchn(port));
++		}
++	}
++
+ 	spin_unlock_irq(&port_user_lock);
+ 
+ 	rc = count;
+@@ -222,8 +260,9 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port)
+ 	 * interrupt handler yet, and our caller has already
+ 	 * serialized bind operations.)
+ 	 */
+-	BUG_ON(port_user[port] != NULL);
+-	port_user[port] = u;
++	BUG_ON(get_port_user(port) != NULL);
++	set_port_user(port, u);
++	set_port_enabled(port, true); /* start enabled */
+ 
+ 	rc = bind_evtchn_to_irqhandler(port, evtchn_interrupt, IRQF_DISABLED,
+ 				       u->name, (void *)(unsigned long)port);
+@@ -239,10 +278,7 @@ static void evtchn_unbind_from_user(struct per_user_data *u, int port)
+ 
+ 	unbind_from_irqhandler(irq, (void *)(unsigned long)port);
+ 
+-	/* make sure we unbind the irq handler before clearing the port */
+-	barrier();
+-
+-	port_user[port] = NULL;
++	set_port_user(port, NULL);
+ }
+ 
+ static long evtchn_ioctl(struct file *file,
+@@ -333,7 +369,7 @@ static long evtchn_ioctl(struct file *file,
+ 		spin_lock_irq(&port_user_lock);
+ 
+ 		rc = -ENOTCONN;
+-		if (port_user[unbind.port] != u) {
++		if (get_port_user(unbind.port) != u) {
+ 			spin_unlock_irq(&port_user_lock);
+ 			break;
+ 		}
+@@ -355,7 +391,7 @@ static long evtchn_ioctl(struct file *file,
+ 
+ 		if (notify.port >= NR_EVENT_CHANNELS) {
+ 			rc = -EINVAL;
+-		} else if (port_user[notify.port] != u) {
++		} else if (get_port_user(notify.port) != u) {
+ 			rc = -ENOTCONN;
+ 		} else {
+ 			notify_remote_via_evtchn(notify.port);
+@@ -444,10 +480,10 @@ static int evtchn_release(struct inode *inode, struct file *filp)
+ 	free_page((unsigned long)u->ring);
+ 
+ 	for (i = 0; i < NR_EVENT_CHANNELS; i++) {
+-		if (port_user[i] != u)
++		if (get_port_user(i) != u)
+ 			continue;
+ 
+-		evtchn_unbind_from_user(port_user[i], i);
++		evtchn_unbind_from_user(get_port_user(i), i);
+ 	}
+ 
+ 	spin_unlock_irq(&port_user_lock);
+@@ -481,8 +517,11 @@ static int __init evtchn_init(void)
+ 	if (!xen_domain())
+ 		return -ENODEV;
+ 
++	port_user = kcalloc(NR_EVENT_CHANNELS, sizeof(*port_user), GFP_KERNEL);
++	if (port_user == NULL)
++		return -ENOMEM;
++
+ 	spin_lock_init(&port_user_lock);
+-	memset(port_user, 0, sizeof(port_user));
+ 
+ 	/* Create '/dev/misc/evtchn'. */
+ 	err = misc_register(&evtchn_miscdev);
+@@ -498,6 +537,9 @@ static int __init evtchn_init(void)
+ 
+ static void __exit evtchn_cleanup(void)
+ {
++	kfree(port_user);
++	port_user = NULL;
++
+ 	misc_deregister(&evtchn_miscdev);
+ }
+ 
 diff --git a/drivers/xen/features.c b/drivers/xen/features.c
 index 99eda16..9e2b64f 100644
 --- a/drivers/xen/features.c
@@ -15531,6 +15756,18 @@ index e2e5ce5..ca67e2b 100644
  static inline int PageUptodate(struct page *page)
  {
  	int ret = test_bit(PG_uptodate, &(page)->flags);
+diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
+index cb1a663..f4ebffb 100644
+--- a/include/linux/swiotlb.h
++++ b/include/linux/swiotlb.h
+@@ -2,6 +2,7 @@
+ #define __LINUX_SWIOTLB_H
+ 
+ #include <linux/types.h>
++#include <linux/dma-mapping.h>
+ 
+ struct device;
+ struct dma_attrs;
 diff --git a/include/xen/Kbuild b/include/xen/Kbuild
 index 4e65c16..84ad8f0 100644
 --- a/include/xen/Kbuild

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/pci/pci.h                       |    2 ++
 4 files changed, 23 insertions(+)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -p -r1.1.2.28 -r1.1.2.29
--- xen.pvops.post.patch	19 Sep 2009 16:47:33 -0000	1.1.2.28
+++ xen.pvops.post.patch	24 Sep 2009 21:05:21 -0000	1.1.2.29
@@ -68,15 +68,3 @@ index 2202b62..f371fe8 100644
  }
  
  int __init pcibios_init(void)
-diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
-index cb1a663..f4ebffb 100644
---- a/include/linux/swiotlb.h
-+++ b/include/linux/swiotlb.h
-@@ -2,6 +2,7 @@
- #define __LINUX_SWIOTLB_H
- 
- #include <linux/types.h>
-+#include <linux/dma-mapping.h>
- 
- struct device;
- struct dma_attrs;


--- linux-2.6-kvm-pvmmu-do-not-batch-pte-updates-from-interrupt-context.patch DELETED ---


--- linux-2.6-kvm-vmx-check-cpl-before-emulating-debug-register-access.patch DELETED ---


--- linux-2.6-scsi-sd-fix-oops-during-scanning.patch DELETED ---


--- linux-2.6-scsi-sg-fix-oops-in-error-path.patch DELETED ---


--- linux-2.6-use-__pa_symbol-to-calculate-address-of-C-symbol.patch DELETED ---



From ynemoy at fedoraproject.org  Thu Sep 24 21:19:49 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Thu, 24 Sep 2009 21:19:49 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib/devel ghc-xmonad-contrib.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090924211949.86F3D11C00DB@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-xmonad-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11780/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-xmonad-contrib.spec import.log 
Log Message:
Initial Commit



--- NEW FILE ghc-xmonad-contrib.spec ---
%global pkg_name xmonad-contrib

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.8.1
Release:        8%{?dist}
Summary:        Third party extensions for xmonad

Group:          Development/Libraries
License:        BSD3
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc-xmonad-devel = %{version}
BuildRequires:  ghc-utf8-string-devel
BuildRequires:  ghc-X11-xft-devel
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
BuildRequires:  ghc-utf8-string-doc
BuildRequires:  ghc-X11-xft-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
BuildRequires:  ghc-xmonad-prof = %{version}
BuildRequires:  ghc-utf8-string-prof
BuildRequires:  ghc-X11-xft-prof
%endif

%description
Haskell %{pkg_name} library for ghc-%{ghc_version}.

Third party tiling algorithms, configurations and scripts to xmonad,
a tiling window manager for X.

For an introduction to building, configuring and using xmonad
extensions, see "XMonad.Doc". In particular:

"XMonad.Doc.Configuring", a guide to configuring xmonad

"XMonad.Doc.Extending", using the contributed extensions library

"XMonad.Doc.Developing", introduction to xmonad internals and writing
your own extensions.

%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires:       ghc-xmonad-devel
Requires:       ghc-utf8-string-devel
Requires:       ghc-X11-xft-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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}
Requires:       ghc-xmonad-doc
Requires:       ghc-utf8-string-doc
Requires:       ghc-X11-xft-doc
BuildRequires:  ghc-xmonad-doc

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
Requires:       ghc-xmonad-prof
Requires:       ghc-utf8-string-prof
Requires:       ghc-X11-xft-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-8
- added a few more docs

* Thu Aug 27 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-7
- removed bcond since xft will be in fedora soon

* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.8.1-6
- drop ghc-X11 deps since already in xmonad
- drop X lib deps since already in ghc-X11
- add ghc-utf8-string deps
- add bcond for X11-xft
- drop base package requires

* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-5
- added -devel to some BRs

* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-4
- updated to latest cabal2spec 0.16

* Mon Mar  2 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-3
- updated to new guidelines ala cabal2spec 0.12

* Tue Feb 24 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-2
- updated package to new guidelines ala cabal2spec 0.7

* Wed Jan 21 2009 ynemoy <ynemoy at fedoraproject.org> - 0.8.1-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-xmonad-contrib-0_8_1-8_fc11:HEAD:ghc-xmonad-contrib-0.8.1-8.fc11.src.rpm:1253827158


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-xmonad-contrib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 16:36:10 -0000	1.1
+++ .cvsignore	24 Sep 2009 21:19:49 -0000	1.2
@@ -0,0 +1 @@
+xmonad-contrib-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-xmonad-contrib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:36:10 -0000	1.1
+++ sources	24 Sep 2009 21:19:49 -0000	1.2
@@ -0,0 +1 @@
+03f74fda270aca759407787da73e50d9  xmonad-contrib-0.8.1.tar.gz



From tomspur at fedoraproject.org  Thu Sep 24 21:23:26 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Thu, 24 Sep 2009 21:23:26 +0000 (UTC)
Subject: rpms/gbirthday/EL-5 gbirthday.spec,1.2,1.3
Message-ID: <20090924212326.577D411C00DB@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13041

Modified Files:
	gbirthday.spec 
Log Message:
add /usr/bin/lzma to BuildRequires



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/gbirthday.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gbirthday.spec	22 Sep 2009 21:45:05 -0000	1.2
+++ gbirthday.spec	24 Sep 2009 21:23:26 -0000	1.3
@@ -10,6 +10,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	/usr/bin/lzma
 Requires:		evolution
 Requires:		python
 Requires:		pygtk2



From cebbert at fedoraproject.org  Thu Sep 24 21:28:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 24 Sep 2009 21:28:02 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6.30-cpuidle-faster-io.patch, NONE,
	1.1 kernel.spec, 1.1739, 1.1740
Message-ID: <20090924212802.117A811C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14273

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.30-cpuidle-faster-io.patch 
Log Message:
Backport the cpuidle-faster-io fix from Fedora 12 to fix I/O
  performance problems when reading/writing multiple disks.

linux-2.6.30-cpuidle-faster-io.patch:
 drivers/cpuidle/governors/menu.c |  251 ++++++++++++++++++++++++++++++++-------
 include/linux/sched.h            |    4 
 kernel/sched.c                   |   13 ++
 3 files changed, 229 insertions(+), 39 deletions(-)

--- NEW FILE linux-2.6.30-cpuidle-faster-io.patch ---
From: Arjan van de Ven <arjan at infradead.org>
Date: Tue, 22 Sep 2009 00:04:08 +0000 (-0700)
Subject: cpuidle: fix the menu governor to boost IO performance
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=69d25870f20c4b2563304f2b79c5300dd60a067e

cpuidle: fix the menu governor to boost IO performance

[ backported to 2.6.30 ]

Fix the menu idle governor which balances power savings, energy efficiency
and performance impact.

The reason for a reworked governor is that there have been serious
performance issues reported with the existing code on Nehalem server
systems.

To show this I'm sure Andrew wants to see benchmark results:
(benchmark is "fio", "no cstates" is using "idle=poll")

		no cstates	current linux	new algorithm
1 disk		107 Mb/s	85 Mb/s		105 Mb/s
2 disks		215 Mb/s	123 Mb/s	209 Mb/s
12 disks	590 Mb/s	320 Mb/s	585 Mb/s

In various power benchmark measurements, no degredation was found by our
measurement&diagnostics team.  Obviously a small percentage more power was
used in the "fio" benchmark, due to the much higher performance.

While it would be a novel idea to describe the new algorithm in this
commit message, I cheaped out and described it in comments in the code
instead.

[changes since first post: spelling fixes from akpm, review feedback,
folded menu-tng into menu.c]

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Cc: Len Brown <lenb at kernel.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Yanmin Zhang <yanmin_zhang at linux.intel.com>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index f1df59f..9f3d775 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -2,8 +2,12 @@
  * menu.c - the menu idle governor
  *
  * Copyright (C) 2006-2007 Adam Belay <abelay at novell.com>
+ * Copyright (C) 2009 Intel Corporation
+ * Author:
+ *        Arjan van de Ven <arjan at linux.intel.com>
  *
- * This code is licenced under the GPL.
+ * This code is licenced under the GPL version 2 as described
+ * in the COPYING file that acompanies the Linux Kernel.
  */
 
 #include <linux/kernel.h>
@@ -13,20 +17,153 @@
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
+#include <linux/sched.h>
 
-#define BREAK_FUZZ	4	/* 4 us */
-#define PRED_HISTORY_PCT	50
+#define BUCKETS 12
+#define RESOLUTION 1024
+#define DECAY 4
+#define MAX_INTERESTING 50000
+
+/*
+ * Concepts and ideas behind the menu governor
+ *
+ * For the menu governor, there are 3 decision factors for picking a C
+ * state:
+ * 1) Energy break even point
+ * 2) Performance impact
+ * 3) Latency tolerance (from pmqos infrastructure)
+ * These these three factors are treated independently.
+ *
+ * Energy break even point
+ * -----------------------
+ * C state entry and exit have an energy cost, and a certain amount of time in
+ * the  C state is required to actually break even on this cost. CPUIDLE
+ * provides us this duration in the "target_residency" field. So all that we
+ * need is a good prediction of how long we'll be idle. Like the traditional
+ * menu governor, we start with the actual known "next timer event" time.
+ *
+ * Since there are other source of wakeups (interrupts for example) than
+ * the next timer event, this estimation is rather optimistic. To get a
+ * more realistic estimate, a correction factor is applied to the estimate,
+ * that is based on historic behavior. For example, if in the past the actual
+ * duration always was 50% of the next timer tick, the correction factor will
+ * be 0.5.
+ *
+ * menu uses a running average for this correction factor, however it uses a
+ * set of factors, not just a single factor. This stems from the realization
+ * that the ratio is dependent on the order of magnitude of the expected
+ * duration; if we expect 500 milliseconds of idle time the likelihood of
+ * getting an interrupt very early is much higher than if we expect 50 micro
+ * seconds of idle time. A second independent factor that has big impact on
+ * the actual factor is if there is (disk) IO outstanding or not.
+ * (as a special twist, we consider every sleep longer than 50 milliseconds
+ * as perfect; there are no power gains for sleeping longer than this)
+ *
+ * For these two reasons we keep an array of 12 independent factors, that gets
+ * indexed based on the magnitude of the expected duration as well as the
+ * "is IO outstanding" property.
+ *
+ * Limiting Performance Impact
+ * ---------------------------
+ * C states, especially those with large exit latencies, can have a real
+ * noticable impact on workloads, which is not acceptable for most sysadmins,
+ * and in addition, less performance has a power price of its own.
+ *
+ * As a general rule of thumb, menu assumes that the following heuristic
+ * holds:
+ *     The busier the system, the less impact of C states is acceptable
+ *
+ * This rule-of-thumb is implemented using a performance-multiplier:
+ * If the exit latency times the performance multiplier is longer than
+ * the predicted duration, the C state is not considered a candidate
+ * for selection due to a too high performance impact. So the higher
+ * this multiplier is, the longer we need to be idle to pick a deep C
+ * state, and thus the less likely a busy CPU will hit such a deep
+ * C state.
+ *
+ * Two factors are used in determing this multiplier:
+ * a value of 10 is added for each point of "per cpu load average" we have.
+ * a value of 5 points is added for each process that is waiting for
+ * IO on this CPU.
+ * (these values are experimentally determined)
+ *
+ * The load average factor gives a longer term (few seconds) input to the
+ * decision, while the iowait value gives a cpu local instantanious input.
+ * The iowait factor may look low, but realize that this is also already
+ * represented in the system load average.
+ *
+ */
 
 struct menu_device {
 	int		last_state_idx;
 
 	unsigned int	expected_us;
-	unsigned int	predicted_us;
-	unsigned int    current_predicted_us;
-	unsigned int	last_measured_us;
-	unsigned int	elapsed_us;
+	u64		predicted_us;
+	unsigned int	measured_us;
+	unsigned int	exit_us;
+	unsigned int	bucket;
+	u64		correction_factor[BUCKETS];
 };
 
+
+#define LOAD_INT(x) ((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+
+static int get_loadavg(void)
+{
+	unsigned long this = this_cpu_load();
+
+
+	return LOAD_INT(this) * 10 + LOAD_FRAC(this) / 10;
+}
+
+static inline int which_bucket(unsigned int duration)
+{
+	int bucket = 0;
+
+	/*
+	 * We keep two groups of stats; one with no
+	 * IO pending, one without.
+	 * This allows us to calculate
+	 * E(duration)|iowait
+	 */
+	if (nr_iowait_cpu())
+		bucket = BUCKETS/2;
+
+	if (duration < 10)
+		return bucket;
+	if (duration < 100)
+		return bucket + 1;
+	if (duration < 1000)
+		return bucket + 2;
+	if (duration < 10000)
+		return bucket + 3;
+	if (duration < 100000)
+		return bucket + 4;
+	return bucket + 5;
+}
+
+/*
+ * Return a multiplier for the exit latency that is intended
+ * to take performance requirements into account.
+ * The more performance critical we estimate the system
+ * to be, the higher this multiplier, and thus the higher
+ * the barrier to go to an expensive C state.
+ */
+static inline int performance_multiplier(void)
+{
+	int mult = 1;
+
+	/* for higher loadavg, we are more reluctant */
+
+	mult += 2 * get_loadavg();
+
+	/* for IO wait tasks (per cpu!) we add 5x each */
+	mult += 10 * nr_iowait_cpu();
+
+	return mult;
+}
+
 static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
 /**
@@ -38,37 +175,59 @@ static int menu_select(struct cpuidle_device *dev)
 	struct menu_device *data = &__get_cpu_var(menu_devices);
 	int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
 	int i;
+	int multiplier;
+
+	data->last_state_idx = 0;
+	data->exit_us = 0;
 
 	/* Special case when user has set very strict latency requirement */
-	if (unlikely(latency_req == 0)) {
-		data->last_state_idx = 0;
+	if (unlikely(latency_req == 0))
 		return 0;
-	}
 
-	/* determine the expected residency time */
+	/* determine the expected residency time, round up */
 	data->expected_us =
-		(u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
+	    DIV_ROUND_UP((u32)ktime_to_ns(tick_nohz_get_sleep_length()), 1000);
+
+
+	data->bucket = which_bucket(data->expected_us);
+
+	multiplier = performance_multiplier();
+
+	/*
+	 * if the correction factor is 0 (eg first time init or cpu hotplug
+	 * etc), we actually want to start out with a unity factor.
+	 */
+	if (data->correction_factor[data->bucket] == 0)
+		data->correction_factor[data->bucket] = RESOLUTION * DECAY;
+
+	/* Make sure to round up for half microseconds */
+	data->predicted_us = DIV_ROUND_CLOSEST(
+		data->expected_us * data->correction_factor[data->bucket],
+		RESOLUTION * DECAY);
+
+	/*
+	 * We want to default to C1 (hlt), not to busy polling
+	 * unless the timer is happening really really soon.
+	 */
+	if (data->expected_us > 5)
+		data->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
-	/* Recalculate predicted_us based on prediction_history_pct */
-	data->predicted_us *= PRED_HISTORY_PCT;
-	data->predicted_us += (100 - PRED_HISTORY_PCT) *
-				data->current_predicted_us;
-	data->predicted_us /= 100;
 
 	/* find the deepest idle state that satisfies our constraints */
-	for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
+	for (i = CPUIDLE_DRIVER_STATE_START; i < dev->state_count; i++) {
 		struct cpuidle_state *s = &dev->states[i];
 
-		if (s->target_residency > data->expected_us)
-			break;
 		if (s->target_residency > data->predicted_us)
 			break;
 		if (s->exit_latency > latency_req)
 			break;
+		if (s->exit_latency * multiplier > data->predicted_us)
+			break;
+		data->exit_us = s->exit_latency;
+		data->last_state_idx = i;
 	}
 
-	data->last_state_idx = i - 1;
-	return i - 1;
+	return data->last_state_idx;
 }
 
 /**
@@ -85,35 +244,49 @@ static void menu_reflect(struct cpuidle_device *dev)
 	unsigned int last_idle_us = cpuidle_get_last_residency(dev);
 	struct cpuidle_state *target = &dev->states[last_idx];
 	unsigned int measured_us;
+	u64 new_factor;
 
 	/*
 	 * Ugh, this idle state doesn't support residency measurements, so we
 	 * are basically lost in the dark.  As a compromise, assume we slept
-	 * for one full standard timer tick.  However, be aware that this
-	 * could potentially result in a suboptimal state transition.
+	 * for the whole expected time.
 	 */
 	if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID)))
-		last_idle_us = USEC_PER_SEC / HZ;
+		last_idle_us = data->expected_us;
+
+
+	measured_us = last_idle_us;
 
 	/*
-	 * measured_us and elapsed_us are the cumulative idle time, since the
-	 * last time we were woken out of idle by an interrupt.
+	 * We correct for the exit latency; we are assuming here that the
+	 * exit latency happens after the event that we're interested in.
 	 */
-	if (data->elapsed_us <= data->elapsed_us + last_idle_us)
-		measured_us = data->elapsed_us + last_idle_us;
+	if (measured_us > data->exit_us)
+		measured_us -= data->exit_us;
+
+
+	/* update our correction ratio */
+
+	new_factor = data->correction_factor[data->bucket]
+			* (DECAY - 1) / DECAY;
+
+	if (data->expected_us > 0 && data->measured_us < MAX_INTERESTING)
+		new_factor += RESOLUTION * measured_us / data->expected_us;
 	else
-		measured_us = -1;
+		/*
+		 * we were idle so long that we count it as a perfect
+		 * prediction
+		 */
+		new_factor += RESOLUTION;
 
-	/* Predict time until next break event */
-	data->current_predicted_us = max(measured_us, data->last_measured_us);
+	/*
+	 * We don't want 0 as factor; we always want at least
+	 * a tiny bit of estimated time.
+	 */
+	if (new_factor == 0)
+		new_factor = 1;
 
-	if (last_idle_us + BREAK_FUZZ <
-	    data->expected_us - target->exit_latency) {
-		data->last_measured_us = measured_us;
-		data->elapsed_us = 0;
-	} else {
-		data->elapsed_us = measured_us;
-	}
+	data->correction_factor[data->bucket] = new_factor;
 }
 
 /**
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 17e9a8e..97b10da 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -140,6 +140,10 @@ extern int nr_processes(void);
 extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_active(void);
 extern unsigned long nr_iowait(void);
+extern unsigned long nr_iowait_cpu(void);
+extern unsigned long this_cpu_load(void);
+
+
 
 extern unsigned long get_parent_ip(unsigned long addr);
 
diff --git a/kernel/sched.c b/kernel/sched.c
index 91843ba..0ac9053 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2904,6 +2904,19 @@ unsigned long nr_iowait(void)
 	return sum;
 }
 
+unsigned long nr_iowait_cpu(void)
+{
+	struct rq *this = this_rq();
+	return atomic_read(&this->nr_iowait);
+}
+
+unsigned long this_cpu_load(void)
+{
+	struct rq *this = this_rq();
+	return this->cpu_load[0];
+}
+
+
 unsigned long nr_active(void)
 {
 	unsigned long i, running = 0, uninterruptible = 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -p -r1.1739 -r1.1740
--- kernel.spec	24 Sep 2009 19:52:25 -0000	1.1739
+++ kernel.spec	24 Sep 2009 21:28:01 -0000	1.1740
@@ -702,6 +702,9 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 # fs fixes
 Patch3000: linux-2.6-fs-cifs-fix-port-numbers.patch
 
+# ACPI
+Patch4000: linux-2.6.30-cpuidle-faster-io.patch
+
 #snmp fixes
 Patch10000: linux-2.6-missing-rfc2465-stats.patch
 
@@ -1227,6 +1230,7 @@ ApplyPatch linux-2.6-fs-cifs-fix-port-nu
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
+ApplyPatch linux-2.6.30-cpuidle-faster-io.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1971,6 +1975,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-61
+- Backport the cpuidle-faster-io fix from Fedora 12 to fix I/O
+  performance problems when reading/writing multiple disks.
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-60
 - Linux 2.6.30.8
 



From ynemoy at fedoraproject.org  Thu Sep 24 21:33:14 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Thu, 24 Sep 2009 21:33:14 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib/F-11 ghc-xmonad-contrib.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090924213314.DA8A411C00DB@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-xmonad-contrib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15536

Modified Files:
	sources 
Added Files:
	ghc-xmonad-contrib.spec 
Log Message:
Initial Branch for F-11


--- NEW FILE ghc-xmonad-contrib.spec ---
%global pkg_name xmonad-contrib

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.8.1
Release:        8%{?dist}
Summary:        Third party extensions for xmonad

Group:          Development/Libraries
License:        BSD3
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc-xmonad-devel = %{version}
BuildRequires:  ghc-utf8-string-devel
BuildRequires:  ghc-X11-xft-devel
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
BuildRequires:  ghc-utf8-string-doc
BuildRequires:  ghc-X11-xft-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
BuildRequires:  ghc-xmonad-prof = %{version}
BuildRequires:  ghc-utf8-string-prof
BuildRequires:  ghc-X11-xft-prof
%endif

%description
Haskell %{pkg_name} library for ghc-%{ghc_version}.

Third party tiling algorithms, configurations and scripts to xmonad,
a tiling window manager for X.

For an introduction to building, configuring and using xmonad
extensions, see "XMonad.Doc". In particular:

"XMonad.Doc.Configuring", a guide to configuring xmonad

"XMonad.Doc.Extending", using the contributed extensions library

"XMonad.Doc.Developing", introduction to xmonad internals and writing
your own extensions.

%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires:       ghc-xmonad-devel
Requires:       ghc-utf8-string-devel
Requires:       ghc-X11-xft-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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}
Requires:       ghc-xmonad-doc
Requires:       ghc-utf8-string-doc
Requires:       ghc-X11-xft-doc
BuildRequires:  ghc-xmonad-doc

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
Requires:       ghc-xmonad-prof
Requires:       ghc-utf8-string-prof
Requires:       ghc-X11-xft-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-8
- added a few more docs

* Thu Aug 27 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-7
- removed bcond since xft will be in fedora soon

* Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.8.1-6
- drop ghc-X11 deps since already in xmonad
- drop X lib deps since already in ghc-X11
- add ghc-utf8-string deps
- add bcond for X11-xft
- drop base package requires

* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-5
- added -devel to some BRs

* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-4
- updated to latest cabal2spec 0.16

* Mon Mar  2 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-3
- updated to new guidelines ala cabal2spec 0.12

* Tue Feb 24 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-2
- updated package to new guidelines ala cabal2spec 0.7

* Wed Jan 21 2009 ynemoy <ynemoy at fedoraproject.org> - 0.8.1-1
- initial packaging for Fedora created by cabal2spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-xmonad-contrib/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 16:36:10 -0000	1.1
+++ sources	24 Sep 2009 21:33:14 -0000	1.2
@@ -0,0 +1 @@
+03f74fda270aca759407787da73e50d9  xmonad-contrib-0.8.1.tar.gz



From praveenp at fedoraproject.org  Thu Sep 24 21:49:42 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 21:49:42 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.6,1.7
Message-ID: <20090924214942.DA37F11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19546

Modified Files:
	openwsman.spec 
Log Message:
testing to check python_sitelib



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openwsman.spec	24 Sep 2009 20:23:21 -0000	1.6
+++ openwsman.spec	24 Sep 2009 21:49:42 -0000	1.7
@@ -1,9 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
 Version:       2.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -63,6 +63,7 @@ chmod a-x include/*.[ch]
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
 %configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
+echo %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 make %{?_smp_flags}
 
 %install
@@ -137,6 +138,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
+- making the python_sitelib and ruby_sitearch global
+- test build
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
 - *.rb files are hard coded to be installed in /usr/lib in 32/64-bit
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3



From gilboa at fedoraproject.org  Thu Sep 24 21:51:02 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 21:51:02 +0000 (UTC)
Subject: rpms/icewm/devel icewm-configure.patch, 1.2, 1.3 icewm.spec, 1.22,
	1.23
Message-ID: <20090924215102.9C39611C0418@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20577

Modified Files:
	icewm-configure.patch icewm.spec 
Log Message:


icewm-configure.patch:
 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: icewm-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- icewm-configure.patch	6 Jan 2009 12:06:16 -0000	1.2
+++ icewm-configure.patch	24 Sep 2009 21:51:01 -0000	1.3
@@ -15,27 +15,6 @@
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
 -	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
-+	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/
-       fi
- 
-       if test "${GNOME2_CFLAGS}" = ""; then
---- icewm-1.2.30/configure.old	2007-01-16 17:44:10.000000000 +0200
-+++ icewm-1.2.30/configure	2007-01-16 17:44:31.000000000 +0200
-@@ -12564,7 +12564,8 @@
-       if test "${PKG_CONFIG}" != ""; then
- 	GNOME_VER=2
- 	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
--	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
-+	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
-+	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
- 
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -12575,7 +12576,7 @@
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
- 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
 +	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
        fi
  


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- icewm.spec	25 Jul 2009 03:07:32 -0000	1.22
+++ icewm.spec	24 Sep 2009 21:51:01 -0000	1.23
@@ -29,6 +29,7 @@ BuildRequires:	libXft-devel
 BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
+BuildRequires:	fribidi-devel
 %if 0%{?fedora} > 10
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
@@ -46,6 +47,7 @@ Patch0:			icewm-configure.patch
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
 Patch3:			icewm-keys.patch
+Patch4:			icewm-fribidi.patch
 
 
 %description
@@ -95,13 +97,16 @@ older Fedora releases and RHEL.
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
+%patch4 -p0 -b .fribidi
 
 
 %build
 # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx...
 # In general it doesn't seem to break anything. BZ# if you hit something bad.
+./autogen.sh
 %configure --enable-gradients 					\
 			--enable-antialiasing				\
+			--enable-i18n						\
 			--enable-menus-gnome2				\
 			--disable-menus-gnome1				\
 			--with-cfgdir=%{_sysconfdir}/icewm
@@ -201,12 +206,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-2
+- Patch in missing fribidi support. (BZ #515134)
 
 * Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
 - 1.2.37.
-- Fix missing directory ownership. (#483346)
+- Fix missing directory ownership. (#511639)
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.36-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From hadess at fedoraproject.org  Thu Sep 24 21:56:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 24 Sep 2009 21:56:51 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.47, 1.48 bluez.spec, 1.97,
	1.98 sources, 1.47, 1.48
Message-ID: <20090924215651.3FDC411C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23469

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 4.54-1
- Update to 4.54



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	10 Sep 2009 19:50:14 -0000	1.47
+++ .cvsignore	24 Sep 2009 21:56:50 -0000	1.48
@@ -1 +1 @@
-bluez-4.53.tar.gz
+bluez-4.54.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- bluez.spec	16 Sep 2009 10:07:26 -0000	1.97
+++ bluez.spec	24 Sep 2009 21:56:51 -0000	1.98
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.53
-Release: 2%{?dist}
+Version: 4.54
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -271,6 +271,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 4.54-1
+- Update to 4.54
+
 * Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 4.53-2
 - Update cable plugin for gudev changes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	10 Sep 2009 19:50:14 -0000	1.47
+++ sources	24 Sep 2009 21:56:51 -0000	1.48
@@ -1 +1 @@
-432509193ea508da5ce23fe056625d0f  bluez-4.53.tar.gz
+a2d5a88fb1058f2b0422bfcce335b3a2  bluez-4.54.tar.gz



From gilboa at fedoraproject.org  Thu Sep 24 21:58:23 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 21:58:23 +0000 (UTC)
Subject: rpms/icewm/devel icewm.spec,1.23,1.24
Message-ID: <20090924215823.5358811C00DB@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24211

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- icewm.spec	24 Sep 2009 21:51:01 -0000	1.23
+++ icewm.spec	24 Sep 2009 21:58:23 -0000	1.24
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.37
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -206,9 +206,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-2
+* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-3
 - Patch in missing fribidi support. (BZ #515134)
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
 - 1.2.37.
 - Fix missing directory ownership. (#511639)



From gilboa at fedoraproject.org  Thu Sep 24 22:06:41 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 22:06:41 +0000 (UTC)
Subject: rpms/icewm/devel icewm-fribidi.patch,NONE,1.1 icewm.spec,1.24,1.25
Message-ID: <20090924220641.BA8D911C00DB@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27189

Modified Files:
	icewm.spec 
Added Files:
	icewm-fribidi.patch 
Log Message:


icewm-fribidi.patch:
 configure.in    |   14 ++++++++++++++
 src/yfontxft.cc |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

--- NEW FILE icewm-fribidi.patch ---
--- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
+++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
@@ -6,6 +6,11 @@
 #include "ypaint.h"
 #include "yxapp.h"
 #include "intl.h"
+#include <stdio.h>
+
+#ifdef CONFIG_FRIBIDI
+    #include <fribidi/fribidi.h>
+#endif
 
 /******************************************************************************/
 
@@ -68,10 +73,45 @@
                            char_t * str, size_t len)
     {
         XftColor *c = *g.color();
+
+#ifdef CONFIG_FRIBIDI
+
+#define STATIS_STRING_SIZE	256
+
+		// Based around upstream (1.3.2) patch with some optimization
+		//   on my end. (reduce unnecessary memory allocation)
+		// - Gilboa
+
+		char_t static_str[STATIS_STRING_SIZE];
+		char_t *vis_str = static_str;
+
+		if (len >= STATIS_STRING_SIZE)
+		{
+			vis_str = new char_t[len+1];
+			if (!vis_str)
+				return;
+		}
+
+		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
+		fribidi_log2vis(str, len, &pbase_dir, //input
+						vis_str, // output
+						NULL, NULL, NULL // "statistics" that we don't need
+						);
+		str = vis_str;
+#endif
+
         XftDrawString(g.handleXft(), c, font,
                       x - g.xorigin(),
                       y - g.yorigin(),
                       str, len);
+
+#ifdef CONFIG_FRIBIDI
+
+		if (vis_str != static_str)
+			delete[] str;
+
+#endif
+
     }
 
     static void textExtents(XftFont * font, char_t * str, size_t len,
--- configure.in.old	2009-09-25 00:05:08.000000000 +0300
+++ configure.in	2009-09-25 00:07:14.000000000 +0300
@@ -307,6 +307,20 @@
       features="${features} i18n"
 fi
 
+dnl =================================================== Right to left support ===
+dnl
+AC_ARG_ENABLE(fribidi,
+  [  --disable-fribidi       Disable right to left support])
+      
+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
+  PKG_CHECK_MODULES(FRIBIDI, fribidi)
+
+  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
+        
+  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
+  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
+fi
+
 dnl ============================================================ NLS Support ===
 dnl
 AC_ARG_ENABLE(nls,


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- icewm.spec	24 Sep 2009 21:58:23 -0000	1.24
+++ icewm.spec	24 Sep 2009 22:06:41 -0000	1.25
@@ -207,14 +207,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-3
-- Patch in missing fribidi support. (BZ #515134)
+- Patch in missing fribidi support. (#515134)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
 - 1.2.37.
-- Fix missing directory ownership. (#511639)
+- Fix missing directory ownership. (#483346)
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.36-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From prajnoha at fedoraproject.org  Thu Sep 24 22:07:23 2009
From: prajnoha at fedoraproject.org (Peter Rajnoha)
Date: Thu, 24 Sep 2009 22:07:23 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.180,1.181
Message-ID: <20090924220723.BA62811C00DB@cvs1.fedora.phx.redhat.com>

Author: prajnoha

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	lvm2.spec 
Log Message:
Disable udev synchronisation code.



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- lvm2.spec	21 Sep 2009 15:47:01 -0000	1.180
+++ lvm2.spec	24 Sep 2009 22:07:23 -0000	1.181
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.52
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -27,7 +27,6 @@ BuildRequires: corosynclib-devel >= %{co
 BuildRequires: clusterlib-devel >= %{clusterlib_version}
 BuildRequires: module-init-tools
 BuildRequires: pkgconfig
-BuildRequires: libudev-devel
 Requires: device-mapper >= %{device_mapper_version}-%{release}
 Requires: device-mapper-event >= %{device_mapper_version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
@@ -57,10 +56,8 @@ or more physical volumes and creating on
 %define _bindir /bin
 %define _sbindir /sbin
 %define _libdir /%{_lib}
-%define _udevbasedir /lib/udev
-%define _udevdir %{_udevbasedir}/rules.d
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync
+%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd
 
 make %{?_smp_mflags}
 
@@ -91,7 +88,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW udev/12-dm-permissions.rules
+%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
 %{_sbindir}/fsadm
 %{_sbindir}/lvchange
 %{_sbindir}/lvconvert
@@ -183,7 +180,6 @@ fi
 %{_mandir}/man8/vgs.8.gz
 %{_mandir}/man8/vgscan.8.gz
 %{_mandir}/man8/vgsplit.8.gz
-%{_udevdir}/11-lvm.rules
 %dir /etc/lvm
 %ghost /etc/lvm/cache/.cache
 %config(noreplace) /etc/lvm/lvm.conf
@@ -285,8 +281,6 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Requires: device-mapper-libs = %{device_mapper_version}-%{release}
-Requires: libudev
-Requires: util-linux-ng >= 2.15
 
 %description -n device-mapper
 This package contains the supporting userspace utility, dmsetup,
@@ -297,11 +291,6 @@ for the kernel device-mapper.
 %doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL
 %attr(755,root,root) /sbin/dmsetup
 %{_mandir}/man8/dmsetup.8.gz
-%dir %{_udevbasedir}
-%dir %{_udevdir}
-%{_udevdir}/10-dm.rules
-%{_udevdir}/12-dm-disk.rules
-%{_udevdir}/95-dm-notify.rules
 
 %package -n device-mapper-devel
 Summary: Development libraries and headers for device-mapper
@@ -396,6 +385,9 @@ the device-mapper event library.
 
 
 %changelog
+* Thu Sep 24 2009 Peter Rajnoha <prajnoha at redhat.com> - 2.02.52-4
+- Disable udev synchronisation code (revert previous build).
+
 * Mon Sep 21 2009 Peter Rajnoha <prajnoha at redhat.com> - 2.02.52-3
 - Enable udev synchronisation code.
 - Install default udev rules for device-mapper and LVM2.



From gilboa at fedoraproject.org  Thu Sep 24 22:09:50 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 22:09:50 +0000 (UTC)
Subject: rpms/icewm/devel icewm.spec,1.25,1.26
Message-ID: <20090924220950.4908811C00DB@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28750

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- icewm.spec	24 Sep 2009 22:06:41 -0000	1.25
+++ icewm.spec	24 Sep 2009 22:09:50 -0000	1.26
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.37
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops



From gilboa at fedoraproject.org  Thu Sep 24 22:13:15 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 22:13:15 +0000 (UTC)
Subject: rpms/icewm/devel icewm.spec,1.26,1.27
Message-ID: <20090924221316.0115D11C00DB@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29890

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- icewm.spec	24 Sep 2009 22:09:50 -0000	1.26
+++ icewm.spec	24 Sep 2009 22:13:15 -0000	1.27
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.37
-Release:		4%{?dist}
+Release:		5%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -206,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-3
+* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-5
 - Patch in missing fribidi support. (#515134)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2



From nsantos at fedoraproject.org  Thu Sep 24 22:19:06 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 24 Sep 2009 22:19:06 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.23, 1.24 qpidc.spec, 1.97,
	1.98 sources, 1.44, 1.45
Message-ID: <20090924221907.010BA11C00DB@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32464

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 818599; rhm-cpp-server-store obsoletes rhm top-level package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	21 Sep 2009 19:13:21 -0000	1.23
+++ .cvsignore	24 Sep 2009 22:19:06 -0000	1.24
@@ -1 +1,2 @@
-qpidc-0.5.817349.tar.gz
+qpidc-0.5.818599.tar.gz
+rhm-0.5.3641.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- qpidc.spec	21 Sep 2009 19:13:21 -0000	1.97
+++ qpidc.spec	24 Sep 2009 22:19:06 -0000	1.98
@@ -7,16 +7,19 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
+%define qpid_svnrev 818599
+%define rhm_svnrev 3641
+
 Name:           qpidc
-Version:        0.5.817349
+Version:        0.5.%{qpid_svnrev}
 Release:        1%{?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
-#Patch1:		qpidc_f12_new_cpg.diff
+Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
+Source2:	qpidd.pp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -41,6 +44,10 @@ BuildRequires: xerces-c-devel
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
+#RHM
+BuildRequires: db4-devel
+BuildRequires: libaio-devel
+#/RHM
 
 Requires: boost
 
@@ -204,6 +211,20 @@ Requires: qpidc = %version-%release
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
+%package -n rhm-cpp-server-store
+Summary: Red Hat persistence extension to the Qpid messaging system
+Group: System Environment/Libraries
+Requires: qpidd = 0.5.%{qpid_svnrev}
+Requires: db4
+Requires: libaio
+Obsoletes: rhm
+ExclusiveArch: i386 i586 x86_64
+
+%description -n rhm-cpp-server-store
+Red Hat persistence extension to the Qpid AMQP broker: persistent message
+storage using either a libaio-based asynchronous journal, or synchronously
+with Berkeley DB.
+
 %pre -n qpidd
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
@@ -212,21 +233,20 @@ getent passwd qpidd >/dev/null || \
 exit 0
 
 %prep
-%setup -q
-#%patch1 -p1
+%setup
+%setup -T -D -b 1
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
 install -d selinux
-install %{SOURCE1} selinux
+install %{SOURCE2} selinux
 
 %build
+pushd cpp
+./bootstrap
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
 ECHO=echo make #%{?_smp_mflags}
-# Remove this generated perl file, we don't need it and it upsets rpmlint.
-# This is generating an error as of 21 Nov 08 because the file doesn't exist.
-# rm docs/api/html/installdox
 
 # Make perftest utilities
 pushd src/tests
@@ -234,21 +254,36 @@ for ptest in %{perftests}; do
   ECHO=echo make $ptest
 done
 popd
+popd
+
+#RHM
+pushd ../rhm-0.5.%{rhm_svnrev}
+export CXXFLAGS="%{optflags} -DNDEBUG" 
+./bootstrap
+%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{name}-%{version}
+make dist
+make #%{?_smp_mflags}
+popd
+#/RHM
 
 %install
 rm -rf %{buildroot}
 mkdir -p -m0755 %{buildroot}/%_bindir
+pushd %{_builddir}/%{name}-%{version}/cpp
 make install DESTDIR=%{buildroot}
 install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
 install -d -m0755 %{buildroot}%{_libdir}/qpidd
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
-pushd %{_builddir}/%{name}-%{version}/src/tests/
+pushd src/tests/
 for ptest in %{perftests}; do
   libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
 done
 popd
+pushd docs/api
+make html
+popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
 rm -f %{buildroot}%_libdir/*.la
@@ -256,35 +291,54 @@ rm -f %{buildroot}%_libdir/librdmawrap.s
 rm -f %{buildroot}%_libdir/libsslcommon.so
 rm -f %{buildroot}%_libdir/qpid/client/*.la
 rm -f %{buildroot}%_libdir/qpid/daemon/*.la
-# remove examples, are being packages separately in the rhm-docs package
-#rm -fr %{buildroot}/usr/share/qpidc/examples
 
 # disable auth by default
 echo "auth=no" >> %{buildroot}/etc/qpidd.conf
 
 install -d %{buildroot}%{_datadir}/selinux/packages
-install -m 644 selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
-
-install -pm 644 bindings/qmf/ruby/qmf.rb $RPM_BUILD_ROOT%{ruby_sitelib}
-install -pm 755 bindings/qmf/ruby/.libs/qmfengine.so $RPM_BUILD_ROOT%{ruby_sitearch}
+install -m 644 %{_builddir}/%{name}-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
+install -pm 644 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
+install -pm 755 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
 
 rm -f %{buildroot}%_libdir/_*
 rm -fr %{buildroot}%_libdir/qpid/tests
 rm -fr %{buildroot}%_libexecdir/qpid/tests
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
+popd
+
+#RHM
+pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+make install DESTDIR=%{buildroot}
+install -d -m0775 %{buildroot}%{_localstatedir}/rhm
+install -d -m0755 %{buildroot}%{_libdir}/qpid/daemon
+rm -f %{buildroot}%_libdir/qpid/daemon/*.a
+rm -f %{buildroot}%_libdir/qpid/daemon/*.la
+rm -f %{buildroot}%_libdir/*.a
+rm -f %{buildroot}%_libdir/*.la
+rm %{buildroot}%_sysconfdir/rhmd.conf
+popd
+#/RHM
 
 %clean
 rm -rf %{buildroot}
 
 %check
+#pushd %{_builddir}/%{name}-%{version}/cpp
 # LANG=C needs to be in the environment to deal with a libtool issue
 # temporarily disabling make check due to libtool issues
 # needs to be re-enabled asap
-LANG=C ECHO=echo make check
+#LANG=C ECHO=echo make check
+#popd
+
+#RHM
+#pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+#make check
+#popd
+#/RHM
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE NOTICE README INSTALL RELEASE_NOTES DESIGN
+%doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
 %_libdir/libqpidcommon.so.2
 %_libdir/libqpidcommon.so.2.0.0
 %_libdir/libqpidclient.so.2
@@ -403,7 +457,13 @@ LANG=C ECHO=echo make check
 
 %files devel-docs
 %defattr(-,root,root,-)
-%doc docs/api/html
+%doc cpp/docs/api/html
+
+%files -n rhm-cpp-server-store
+%defattr(-,root,root,-)
+%doc ../rhm-0.5.%{rhm_svnrev}/README 
+%{_libdir}/qpid/daemon/msgstore.so*
+%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
 
 %post -p /sbin/ldconfig
 
@@ -443,7 +503,11 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349-1
+* Thu Sep 24 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+- rhm-cpp-server-store obsoletes rhm top-level package
+
+* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349
 - Rebased to svn rev 817349
 
 * Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	21 Sep 2009 19:13:21 -0000	1.44
+++ sources	24 Sep 2009 22:19:06 -0000	1.45
@@ -1 +1,2 @@
-3d8e101731c2f8a8fba5907f9cdb9282  qpidc-0.5.817349.tar.gz
+b9b04d4744f8e1e1bd55e62388b49e29  qpidc-0.5.818599.tar.gz
+5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz



From jjohnstn at fedoraproject.org  Thu Sep 24 22:20:06 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Thu, 24 Sep 2009 22:20:06 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-libhover-local.patch, NONE,
	1.1 eclipse-cdt-libhover.patch, NONE, 1.1 .cvsignore, 1.45,
	1.46 eclipse-cdt.spec, 1.132, 1.133 make-libhover-tarball.sh,
	1.1, 1.2 sources, 1.54, 1.55 eclipse-cdt-libhover-feature.patch,
	1.1, NONE eclipse-cdt-libhover-glibc.patch, 1.1,
	NONE eclipse-cdt-libhover-jar.patch, 1.2, NONE
Message-ID: <20090924222006.0D97211C0418@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32659

Modified Files:
	.cvsignore eclipse-cdt.spec make-libhover-tarball.sh sources 
Added Files:
	eclipse-cdt-libhover-local.patch eclipse-cdt-libhover.patch 
Removed Files:
	eclipse-cdt-libhover-feature.patch 
	eclipse-cdt-libhover-glibc.patch 
	eclipse-cdt-libhover-jar.patch 
Log Message:

* Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-10
- Resolves #290247
- Upgrade libhover to 0.3.0.
- Add libhover patch to fix libstdc++ member resolution and
  to place libhover docs locally within libhover plugin.



eclipse-cdt-libhover-local.patch:
 org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml     |    2 +-
 org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml |    2 +-
 org.eclipse.linuxtools.cdt.libhover/build.properties     |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE eclipse-cdt-libhover-local.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix ./org.eclipse.linuxtools.cdt.libhover/build.properties
--- ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix	2009-09-23 17:07:18.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/build.properties	2009-09-23 17:07:38.000000000 -0400
@@ -3,7 +3,8 @@ output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               libhoverdocs/
 
 javacSource=1.5
 javacTarget=1.5
diff -up ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
--- ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix	2009-09-23 17:12:01.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml	2009-09-23 17:12:26.000000000 -0400
@@ -7,7 +7,7 @@
          point="org.eclipse.linuxtools.cdt.libhover.library">
       <library
             docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
-            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
+            location="libhoverdocs/glibc-2.7-2.libhover"
             name="glibc library"
             type="C">
       </library>
diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
--- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2009-09-23 17:12:43.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2009-09-23 17:13:04.000000000 -0400
@@ -7,7 +7,7 @@
          point="org.eclipse.linuxtools.cdt.libhover.library">
       <library
             docs="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html"
-            location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover"
+            location="libhoverdocs/libstdc++-v3.libhover"
             name="libstdc++ library"
             type="C++">
       </library>

eclipse-cdt-libhover.patch:
 META-INF/MANIFEST.MF                                                  |    1 
 src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java           |    1 
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java        |   22 +++++++---
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java |   10 ++++
 4 files changed, 27 insertions(+), 7 deletions(-)

--- NEW FILE eclipse-cdt-libhover.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix2 ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix2	2009-09-23 17:15:45.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-09-23 17:08:47.000000000 -0400
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text;bundle-version="3.4.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix2	2009-09-23 17:16:59.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-09-23 17:09:54.000000000 -0400
@@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
 	 * The constructor
 	 */
 	public LibhoverPlugin() {
+		plugin = this;
 	}
 
 	/*
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix2	2009-09-23 17:11:05.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-09-23 17:11:21.000000000 -0400
@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP
 			return null;
 		if (methodType != null) {
 			try {
-				args = resolveArgs(info, methodType.getParameterTypes());
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
 				returnType = methodType.getReturnType();
 			} catch (DOMException e) {
 				// TODO Auto-generated catch block
@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP
 		MemberInfo member = info.getMember(memberName);
 		if (member != null) {
 			MemberInfo m = null;
-			if (!isParmMatch(member, args)) {
+			if (!isParmMatch(member, args, templateTypes, info)) {
 				ArrayList<MemberInfo> members = member.getChildren();
 				for (int i = 0; i < members.size(); ++i) {
 					MemberInfo k = members.get(i);
-					if (isParmMatch(k, args)) {
+					if (isParmMatch(k, args, templateTypes, info)) {
 						m = k;
 						break;
 					}
@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP
 	}
      
  	
-	private boolean isParmMatch(MemberInfo m, String[] args) {
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
 		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
 		return Arrays.equals(memberParms, args);
 	}
 
-	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes) {
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
 		String[] templateParms = info.getTemplateParms();
 		String[] result = new String[parameterTypes.length];
 		for (int i = 0; i < parameterTypes.length; ++i) {
@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP
 			while (index >= 0) {
 				// We assume no class has more than 9 template parms.
 				int digit = param.charAt(index + 1) - '0';
-				param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
 				index = param.indexOf("#");
 			}
 			result[i] = param;
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix2	2009-09-23 17:10:32.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-09-23 17:10:55.000000000 -0400
@@ -21,10 +21,12 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
 import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
 import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
 import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
 
 public class LibHoverLibrary {
@@ -98,7 +100,13 @@ public class LibHoverLibrary {
 					URL url = acDoc.toURL();
 					docStream = url.openStream();
 				} else {
-					docStream = new FileInputStream(p.toFile());
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
 				}
 				ObjectInputStream input = new ObjectInputStream(docStream);
 				hoverInfo = (LibHoverInfo)input.readObject();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	24 Jul 2009 18:00:30 -0000	1.45
+++ .cvsignore	24 Sep 2009 22:20:05 -0000	1.46
@@ -28,3 +28,6 @@ eclipse-cdt-fetched-src-v200906161748.ta
 eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
 eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz
 eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
+libstdc++-v3.libhover
+glibc-2.7-2.libhover
+eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- eclipse-cdt.spec	12 Aug 2009 16:00:57 -0000	1.132
+++ eclipse-cdt.spec	24 Sep 2009 22:20:05 -0000	1.133
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -38,7 +38,7 @@ Source4: fetch-cdt.sh
 
 Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -54,6 +54,10 @@ Source2: http://sources.redhat.com/eclip
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
+# Libhover docs to place locally
+Source6: glibc-2.7-2.libhover
+Source7: libstdc++-v3.libhover
+
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -74,12 +78,13 @@ Patch12: %{name}-openpty.patch
 # Add XML -> HTML generation after running tests
 Patch13: %{name}-testaggregation.patch
 
-# FIXME:  investigate for 5.0.1
-#
-# There is a bug in this test that makes it not build.  It looks like
-# it's fixed upstream in 5.0.1
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=130235
-#Patch14: %{name}-noLexerTests.patch
+# Following is a patch to supply libhover docs directory from the libhover
+# plugin and not require html to access them.
+Patch14: %{name}-libhover-local.patch
+
+# Following is a patch to libhover to fix member resolution, plugin loading,
+# and to enable local plugin file support for docs.
+Patch15: %{name}-libhover.patch
 
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
@@ -191,6 +196,15 @@ popd
 mkdir libhover
 pushd libhover
 tar -xzf %{SOURCE2}
+%patch14 -p0
+%patch15 -p0
+pushd org.eclipse.linuxtools.cdt.libhover
+mkdir libhoverdocs
+pushd libhoverdocs
+cp %{SOURCE6} .
+cp %{SOURCE7} .
+popd
+popd
 popd
 
 ## Cppunit stuff
@@ -297,7 +311,7 @@ java -cp $SDK/startup.jar \
      -application org.eclipse.ant.core.antRunner \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.cdt.libhover.feature  \
+     -Did=org.eclipse.linuxtools.cdt.libhover  \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -357,7 +371,7 @@ popd
 
 # Libhover install
 pushd libhover
-unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.zip
 popd
 
 mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
@@ -508,6 +522,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-10
+- Resolves #290247
+- Upgrade libhover to 0.3.0.
+- Add libhover patch to fix libstdc++ member resolution and
+  to place libhover docs locally within libhover plugin.
+
 * Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-9
 - Use launcher jar to run metadata generator instead of eclipse binary.
 


Index: make-libhover-tarball.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/make-libhover-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- make-libhover-tarball.sh	15 Oct 2008 23:10:04 -0000	1.1
+++ make-libhover-tarball.sh	24 Sep 2009 22:20:05 -0000	1.2
@@ -7,5 +7,7 @@ rm -rf libhover
 svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$rel libhover
 cd libhover
 pwd
+# We don't want newlib libhover shipped unconditionally
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib*
 tar -czvf eclipse-cdt-fetched-src-libhover-$tag.tar.gz org.eclipse.linuxtools.cdt.libhover*
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	24 Jul 2009 18:00:30 -0000	1.54
+++ sources	24 Sep 2009 22:20:05 -0000	1.55
@@ -1,5 +1,7 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 d0b0b38accc5547e6209fda23c6c8d49  eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
 6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
+921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
+4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
+2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz


--- eclipse-cdt-libhover-feature.patch DELETED ---


--- eclipse-cdt-libhover-glibc.patch DELETED ---


--- eclipse-cdt-libhover-jar.patch DELETED ---



From gilboa at fedoraproject.org  Thu Sep 24 22:21:43 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 22:21:43 +0000 (UTC)
Subject: rpms/icewm/F-11 icewm-fribidi.patch, NONE, 1.1 icewm-configure.patch,
	1.2, 1.3 icewm.spec, 1.21, 1.22
Message-ID: <20090924222143.120D711C00DB@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv841

Modified Files:
	icewm-configure.patch icewm.spec 
Added Files:
	icewm-fribidi.patch 
Log Message:


icewm-fribidi.patch:
 configure.in    |   14 ++++++++++++++
 src/yfontxft.cc |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

--- NEW FILE icewm-fribidi.patch ---
--- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
+++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
@@ -6,6 +6,11 @@
 #include "ypaint.h"
 #include "yxapp.h"
 #include "intl.h"
+#include <stdio.h>
+
+#ifdef CONFIG_FRIBIDI
+    #include <fribidi/fribidi.h>
+#endif
 
 /******************************************************************************/
 
@@ -68,10 +73,45 @@
                            char_t * str, size_t len)
     {
         XftColor *c = *g.color();
+
+#ifdef CONFIG_FRIBIDI
+
+#define STATIS_STRING_SIZE	256
+
+		// Based around upstream (1.3.2) patch with some optimization
+		//   on my end. (reduce unnecessary memory allocation)
+		// - Gilboa
+
+		char_t static_str[STATIS_STRING_SIZE];
+		char_t *vis_str = static_str;
+
+		if (len >= STATIS_STRING_SIZE)
+		{
+			vis_str = new char_t[len+1];
+			if (!vis_str)
+				return;
+		}
+
+		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
+		fribidi_log2vis(str, len, &pbase_dir, //input
+						vis_str, // output
+						NULL, NULL, NULL // "statistics" that we don't need
+						);
+		str = vis_str;
+#endif
+
         XftDrawString(g.handleXft(), c, font,
                       x - g.xorigin(),
                       y - g.yorigin(),
                       str, len);
+
+#ifdef CONFIG_FRIBIDI
+
+		if (vis_str != static_str)
+			delete[] str;
+
+#endif
+
     }
 
     static void textExtents(XftFont * font, char_t * str, size_t len,
--- configure.in.old	2009-09-25 00:05:08.000000000 +0300
+++ configure.in	2009-09-25 00:07:14.000000000 +0300
@@ -307,6 +307,20 @@
       features="${features} i18n"
 fi
 
+dnl =================================================== Right to left support ===
+dnl
+AC_ARG_ENABLE(fribidi,
+  [  --disable-fribidi       Disable right to left support])
+      
+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
+  PKG_CHECK_MODULES(FRIBIDI, fribidi)
+
+  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
+        
+  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
+  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
+fi
+
 dnl ============================================================ NLS Support ===
 dnl
 AC_ARG_ENABLE(nls,

icewm-configure.patch:
 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: icewm-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-11/icewm-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- icewm-configure.patch	6 Jan 2009 12:06:16 -0000	1.2
+++ icewm-configure.patch	24 Sep 2009 22:21:42 -0000	1.3
@@ -15,27 +15,6 @@
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
 -	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
-+	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/
-       fi
- 
-       if test "${GNOME2_CFLAGS}" = ""; then
---- icewm-1.2.30/configure.old	2007-01-16 17:44:10.000000000 +0200
-+++ icewm-1.2.30/configure	2007-01-16 17:44:31.000000000 +0200
-@@ -12564,7 +12564,8 @@
-       if test "${PKG_CONFIG}" != ""; then
- 	GNOME_VER=2
- 	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
--	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
-+	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
-+	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
- 
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -12575,7 +12576,7 @@
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
- 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
 +	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
        fi
  


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-11/icewm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- icewm.spec	16 Jul 2009 11:08:13 -0000	1.21
+++ icewm.spec	24 Sep 2009 22:21:42 -0000	1.22
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.37
-Release:		1%{?dist}
+Release:		5%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -29,6 +29,7 @@ BuildRequires:	libXft-devel
 BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
+BuildRequires:	fribidi-devel
 %if 0%{?fedora} > 10
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
@@ -46,6 +47,7 @@ Patch0:			icewm-configure.patch
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
 Patch3:			icewm-keys.patch
+Patch4:			icewm-fribidi.patch
 
 
 %description
@@ -95,13 +97,16 @@ older Fedora releases and RHEL.
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
+%patch4 -p0 -b .fribidi
 
 
 %build
 # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx...
 # In general it doesn't seem to break anything. BZ# if you hit something bad.
+./autogen.sh
 %configure --enable-gradients 					\
 			--enable-antialiasing				\
+			--enable-i18n						\
 			--enable-menus-gnome2				\
 			--disable-menus-gnome1				\
 			--with-cfgdir=%{_sysconfdir}/icewm
@@ -201,6 +206,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-5
+- Patch in missing fribidi support. (#515134)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
 - 1.2.37.
 - Fix missing directory ownership. (#483346)



From epienbro at fedoraproject.org  Thu Sep 24 22:22:23 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 22:22:23 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel libxml2-gnome-bug-561340-fix.patch, NONE,
	1.1 mingw32-libxml2.spec, 1.13, 1.14
Message-ID: <20090924222223.6CCB711C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1101

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	libxml2-gnome-bug-561340-fix.patch 
Log Message:
Added a patch to fix GNOME bug #561340


libxml2-gnome-bug-561340-fix.patch:
 xmlexports.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxml2-gnome-bug-561340-fix.patch ---
--- include/libxml/xmlexports.h	2009-09-25 00:00:03.511532978 +0200
+++ include/libxml/xmlexports.h	2009-09-25 00:01:27.058533091 +0200
@@ -115,7 +115,7 @@
    */
   #if !defined(LIBXML_STATIC)
     #define XMLPUBFUN __declspec(dllexport)
-    #define XMLPUBVAR __declspec(dllexport)
+    #define XMLPUBVAR __declspec(dllexport) extern
   #else
     #define XMLPUBFUN
     #if !defined(LIBXML_STATIC)


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mingw32-libxml2.spec	24 Sep 2009 18:41:06 -0000	1.13
+++ mingw32-libxml2.spec	24 Sep 2009 22:22:23 -0000	1.14
@@ -22,6 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
 Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+Patch1002:      libxml2-gnome-bug-561340-fix.patch
 
 BuildArch:      noarch
 
@@ -60,6 +61,7 @@ Static version of the MinGW Windows XML 
 
 %patch1000 -p1
 %patch1001 -p0
+%patch1002 -p0
 
 # Patched configure.in, so rebuild configure.
 libtoolize --force --copy
@@ -131,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.5-2
+- Added a patch to fix GNOME bug #561340
+
 * Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.5-1
 - Update to 2.7.5
 



From gilboa at fedoraproject.org  Thu Sep 24 22:23:27 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Thu, 24 Sep 2009 22:23:27 +0000 (UTC)
Subject: rpms/icewm/F-10 icewm-fribidi.patch, NONE, 1.1 icewm-configure.patch,
	1.1, 1.2 icewm.spec, 1.15, 1.16
Message-ID: <20090924222327.B630911C00DB@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1799

Modified Files:
	icewm-configure.patch icewm.spec 
Added Files:
	icewm-fribidi.patch 
Log Message:


icewm-fribidi.patch:
 configure.in    |   14 ++++++++++++++
 src/yfontxft.cc |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

--- NEW FILE icewm-fribidi.patch ---
--- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
+++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
@@ -6,6 +6,11 @@
 #include "ypaint.h"
 #include "yxapp.h"
 #include "intl.h"
+#include <stdio.h>
+
+#ifdef CONFIG_FRIBIDI
+    #include <fribidi/fribidi.h>
+#endif
 
 /******************************************************************************/
 
@@ -68,10 +73,45 @@
                            char_t * str, size_t len)
     {
         XftColor *c = *g.color();
+
+#ifdef CONFIG_FRIBIDI
+
+#define STATIS_STRING_SIZE	256
+
+		// Based around upstream (1.3.2) patch with some optimization
+		//   on my end. (reduce unnecessary memory allocation)
+		// - Gilboa
+
+		char_t static_str[STATIS_STRING_SIZE];
+		char_t *vis_str = static_str;
+
+		if (len >= STATIS_STRING_SIZE)
+		{
+			vis_str = new char_t[len+1];
+			if (!vis_str)
+				return;
+		}
+
+		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
+		fribidi_log2vis(str, len, &pbase_dir, //input
+						vis_str, // output
+						NULL, NULL, NULL // "statistics" that we don't need
+						);
+		str = vis_str;
+#endif
+
         XftDrawString(g.handleXft(), c, font,
                       x - g.xorigin(),
                       y - g.yorigin(),
                       str, len);
+
+#ifdef CONFIG_FRIBIDI
+
+		if (vis_str != static_str)
+			delete[] str;
+
+#endif
+
     }
 
     static void textExtents(XftFont * font, char_t * str, size_t len,
--- configure.in.old	2009-09-25 00:05:08.000000000 +0300
+++ configure.in	2009-09-25 00:07:14.000000000 +0300
@@ -307,6 +307,20 @@
       features="${features} i18n"
 fi
 
+dnl =================================================== Right to left support ===
+dnl
+AC_ARG_ENABLE(fribidi,
+  [  --disable-fribidi       Disable right to left support])
+      
+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
+  PKG_CHECK_MODULES(FRIBIDI, fribidi)
+
+  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
+        
+  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
+  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
+fi
+
 dnl ============================================================ NLS Support ===
 dnl
 AC_ARG_ENABLE(nls,

icewm-configure.patch:
 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: icewm-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-10/icewm-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icewm-configure.patch	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm-configure.patch	24 Sep 2009 22:23:26 -0000	1.2
@@ -1,17 +1,16 @@
 --- icewm-1.2.30/configure.in.old	2007-01-16 16:12:51.000000000 +0200
 +++ icewm-1.2.30/configure.in	2007-01-16 16:13:31.000000000 +0200
-@@ -814,7 +814,7 @@
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
- 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
-+	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/
-       fi
+@@ -820,15 +820,15 @@
+     
+       if test "${PKG_CONFIG}" != ""; then
+ 	GNOME_VER=2
+-	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+-	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+ 
+ 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
  
-       if test "${GNOME2_CFLAGS}" = ""; then
---- icewm-1.2.30/configure.old	2007-01-16 17:44:10.000000000 +0200
-+++ icewm-1.2.30/configure	2007-01-16 17:44:31.000000000 +0200
-@@ -12000,7 +12000,7 @@
  	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-10/icewm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- icewm.spec	16 Jul 2009 11:06:31 -0000	1.15
+++ icewm.spec	24 Sep 2009 22:23:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.37
-Release:		1%{?dist}
+Release:		5%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -29,6 +29,7 @@ BuildRequires:	libXft-devel
 BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
+BuildRequires:	fribidi-devel
 %if 0%{?fedora} > 10
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
@@ -46,6 +47,7 @@ Patch0:			icewm-configure.patch
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
 Patch3:			icewm-keys.patch
+Patch4:			icewm-fribidi.patch
 
 
 %description
@@ -95,13 +97,16 @@ older Fedora releases and RHEL.
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
+%patch4 -p0 -b .fribidi
 
 
 %build
 # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx...
 # In general it doesn't seem to break anything. BZ# if you hit something bad.
+./autogen.sh
 %configure --enable-gradients 					\
 			--enable-antialiasing				\
+			--enable-i18n						\
 			--enable-menus-gnome2				\
 			--disable-menus-gnome1				\
 			--with-cfgdir=%{_sysconfdir}/icewm
@@ -201,6 +206,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-5
+- Patch in missing fribidi support. (#515134)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
 - 1.2.37.
 - Fix missing directory ownership. (#483346)



From epienbro at fedoraproject.org  Thu Sep 24 22:24:20 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 24 Sep 2009 22:24:20 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel mingw32-libxml2.spec,1.14,1.15
Message-ID: <20090924222420.85E4811C0337@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2311

Modified Files:
	mingw32-libxml2.spec 
Log Message:
Forgot to bump the release tag



Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mingw32-libxml2.spec	24 Sep 2009 22:22:23 -0000	1.14
+++ mingw32-libxml2.spec	24 Sep 2009 22:24:19 -0000	1.15
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT



From praveenp at fedoraproject.org  Thu Sep 24 22:24:25 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 22:24:25 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.7,1.8
Message-ID: <20090924222425.1C3E711C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2265

Modified Files:
	openwsman.spec 
Log Message:
Changed the python_sitelib to python_sitearch in spec file



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openwsman.spec	24 Sep 2009 21:49:42 -0000	1.7
+++ openwsman.spec	24 Sep 2009 22:24:24 -0000	1.8
@@ -1,4 +1,4 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
@@ -111,8 +111,8 @@ rm -rf %{buildroot}
 
 %files python
 %defattr(-,root,root)
-%{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/pywsman.py
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -138,6 +138,8 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-6
+- changing python_sitelib to python_sitearch
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
 - making the python_sitelib and ruby_sitearch global
 - test build



From praveenp at fedoraproject.org  Thu Sep 24 22:26:10 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 22:26:10 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.8,1.9
Message-ID: <20090924222610.54F6A11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3439

Modified Files:
	openwsman.spec 
Log Message:
missed the release update last time



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- openwsman.spec	24 Sep 2009 22:24:24 -0000	1.8
+++ openwsman.spec	24 Sep 2009 22:26:09 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2



From hadess at fedoraproject.org  Thu Sep 24 22:39:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 24 Sep 2009 22:39:24 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.11,1.12
Message-ID: <20090924223924.3274911C0424@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6872

Modified Files:
	rygel.spec 
Log Message:
* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 0.4-5
- Make sure we rebuild the C source code from vala sources



Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rygel.spec	24 Sep 2009 17:34:15 -0000	1.11
+++ rygel.spec	24 Sep 2009 22:39:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -52,6 +52,9 @@ A plugin for rygel to use tracker to loc
 %prep
 %setup -q
 
+# Remove vala stamp files
+find %{buildroot} -name '*_vala.stamp' -exec rm -f {} ';'
+
 %build
 %configure --enable-tracker-plugin --enable-media-export-plugin --enable-external-plugin --enable-mediathek-plugin --enable-gstlaunch-plugin --disable-silent-rules
 make %{?_smp_mflags} V=1
@@ -96,6 +99,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 0.4-5
+- Make sure we rebuild the C source code from vala sources
+
 * Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 0.4-4
 - Make the prefs work
 



From praveenp at fedoraproject.org  Thu Sep 24 22:43:15 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 22:43:15 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.9,1.10
Message-ID: <20090924224315.849CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7515

Modified Files:
	openwsman.spec 
Log Message:
pywsman.py gets installed in %{python_sitelib}



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openwsman.spec	24 Sep 2009 22:26:09 -0000	1.9
+++ openwsman.spec	24 Sep 2009 22:43:14 -0000	1.10
@@ -1,9 +1,10 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
 Version:       2.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -111,7 +112,7 @@ rm -rf %{buildroot}
 
 %files python
 %defattr(-,root,root)
-%{python_sitearch}/pywsman.py
+%{python_sitelib}/pywsman.py
 %{python_sitearch}/*.so
 %doc COPYING
 
@@ -138,6 +139,8 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-7
+- pywsman.py gets installed in python_sitelib - chaning back
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-6
 - changing python_sitelib to python_sitearch
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5



From praveenp at fedoraproject.org  Thu Sep 24 22:48:05 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 22:48:05 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-5 sblim-sfcb.spec,1.1,1.2
Message-ID: <20090924224805.4895D11C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9364

Modified Files:
	sblim-sfcb.spec 
Log Message:
increased the release number for tagging



Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-5/sblim-sfcb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-sfcb.spec	24 Sep 2009 18:03:15 -0000	1.1
+++ sblim-sfcb.spec	24 Sep 2009 22:48:04 -0000	1.2
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 8%{dist}
+Release: 9%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -107,6 +107,8 @@ fi
 #%doc COPYING README
 
 %changelog
+* Thu Sep 24 2009 <praveen_paladugu at dell.com>- 1.3.4-9
+- Increased the release number for tagging
 * Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
 - Removed the devel package and moved the init script to right directory
 * Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7



From praveenp at fedoraproject.org  Thu Sep 24 22:57:22 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 24 Sep 2009 22:57:22 +0000 (UTC)
Subject: rpms/openwsman/EL-5 .cvsignore, 1.2, 1.3 openwsman.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090924225722.B4F5911C00DB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13150

Modified Files:
	.cvsignore openwsman.spec sources 
Log Message:
Added the new openwsman-2.2.0 sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2008 10:34:43 -0000	1.2
+++ .cvsignore	24 Sep 2009 22:57:22 -0000	1.3
@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman.spec	1 Nov 2008 10:34:43 -0000	1.1
+++ openwsman.spec	24 Sep 2009 22:57:22 -0000	1.2
@@ -1,8 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
-Version:       2.1.0
+Version:       2.2.0
 Release:        1%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
@@ -63,6 +64,7 @@ chmod a-x include/*.[ch]
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
 %configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
+echo %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 make %{?_smp_flags}
 
 %install
@@ -95,6 +97,8 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
+/usr/lib/ruby/site_ruby/1.8/openwsman/
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
 %files devel
@@ -109,7 +113,7 @@ rm -rf %{buildroot}
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -135,6 +139,18 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
+- Added the new 2.2.0 sources.
+- Changed the release and version numbers.
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2008 10:34:43 -0000	1.2
+++ sources	24 Sep 2009 22:57:22 -0000	1.3
@@ -1 +1 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 24 23:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 23:08:30 +0000
Subject: [pkgdb] cim-schema: praveenp has requested commit
Message-ID: <20090924230831.206F910F8A1@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on cim-schema (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Thu Sep 24 23:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 23:08:36 +0000
Subject: [pkgdb] cim-schema: praveenp has requested commit
Message-ID: <20090924230836.AECD410F8A8@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on cim-schema (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Thu Sep 24 23:08:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 23:08:39 +0000
Subject: [pkgdb] cim-schema: praveenp has requested commit
Message-ID: <20090924230840.7AB7D10F8AC@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on cim-schema (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Thu Sep 24 23:08:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 23:08:42 +0000
Subject: [pkgdb] cim-schema: praveenp has requested commit
Message-ID: <20090924230843.EDC3D10F8AF@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on cim-schema (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Thu Sep 24 23:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Sep 2009 23:08:47 +0000
Subject: [pkgdb] cim-schema: praveenp has requested commit
Message-ID: <20090924230847.C42D110F8B2@bastion2.fedora.phx.redhat.com>

praveenp has requested the commit acl on cim-schema (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From mclasen at fedoraproject.org  Thu Sep 24 23:18:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Sep 2009 23:18:31 +0000 (UTC)
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.107,1.108
Message-ID: <20090924231831.6048411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21890

Modified Files:
	gnome-menus.spec 
Log Message:
remove an obsolete configure option



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- gnome-menus.spec	22 Sep 2009 01:50:59 -0000	1.107
+++ gnome-menus.spec	24 Sep 2009 23:18:29 -0000	1.108
@@ -6,7 +6,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -45,7 +45,7 @@ writing applications that use the GNOME 
 %setup -q
 
 %build
-%configure --with-monitor-backend=gio \
+%configure \
 %if %{enable_debugging}
    --enable-debug=yes
 %else
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Remove obsolete configure option
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From dwalsh at fedoraproject.org  Thu Sep 24 23:30:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 24 Sep 2009 23:30:17 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.91,
	1.92 selinux-policy.spec, 1.928, 1.929
Message-ID: <20090924233017.03BFB11C0423@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27767

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-10
- Allow sendmail to request kernel modules load


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  242 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  320 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  328 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   12 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   29 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1402 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 319 files changed, 14655 insertions(+), 2585 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- policy-F12.patch	22 Sep 2009 12:49:52 -0000	1.91
+++ policy-F12.patch	24 Sep 2009 23:30:15 -0000	1.92
@@ -338,12 +338,12 @@ diff -b -B --ignore-all-space --exclude-
  files_dontaudit_getattr_all_sockets(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.32/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-09-16 07:03:08.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-09-24 08:56:43.000000000 -0700
 @@ -1,17 +1,17 @@
  
  /bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
 +/usr/bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
-+/usr/bin/debuginfo-install      --      gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/debuginfo-install      --      gen_context(system_u:object_r:debuginfo_exec_t,s0)
  /usr/bin/smart 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  /usr/bin/yum 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -362,7 +362,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  ifdef(`distro_redhat', `
-@@ -21,15 +21,22 @@
+@@ -21,15 +21,23 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -375,6 +375,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /var/lib/rpm(/.*)?			gen_context(system_u:object_r:rpm_var_lib_t,s0)
 +/var/lib/yum(/.*)?			gen_context(system_u:object_r:rpm_var_lib_t,s0)
++/var/cache/yum(/.*)?			gen_context(system_u:object_r:rpm_var_cache_t,s0)
  
  /var/log/rpmpkgs.*		--	gen_context(system_u:object_r:rpm_log_t,s0)
  /var/log/yum\.log.*		--	gen_context(system_u:object_r:rpm_log_t,s0)
@@ -387,8 +388,43 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.32/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-16 07:03:08.000000000 -0700
-@@ -66,6 +66,11 @@
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-24 08:54:37.000000000 -0700
+@@ -13,11 +13,34 @@
+ interface(`rpm_domtrans',`
+ 	gen_require(`
+ 		type rpm_t, rpm_exec_t;
++		type debuginfo_exec_t;
+ 	')
+ 
+ 	files_search_usr($1)
+ 	corecmd_search_bin($1)
+ 	domtrans_pattern($1, rpm_exec_t, rpm_t)
++	domtrans_pattern($1, debuginfo_exec_t, rpm_t)
++')
++
++########################################
++## <summary>
++##	Execute debuginfo_install programs in the rpm domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_domtrans_debuginfo',`
++	gen_require(`
++		type rpm_t;
++		type debuginfo_exec_t;
++	')
++
++	files_search_usr($1)
++	corecmd_search_bin($1)
++	domtrans_pattern($1, debuginfo_exec_t, rpm_t)
+ ')
+ 
+ ########################################
+@@ -66,6 +89,11 @@
  	rpm_domtrans($1)
  	role $2 types rpm_t;
  	role $2 types rpm_script_t;
@@ -400,7 +436,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_run_loadpolicy(rpm_script_t, $2)
  	seutil_run_semanage(rpm_script_t, $2)
  	seutil_run_setfiles(rpm_script_t, $2)
-@@ -146,6 +151,35 @@
+@@ -146,6 +174,35 @@
  
  ########################################
  ## <summary>
@@ -436,7 +472,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +201,48 @@
+@@ -167,6 +224,48 @@
  
  ########################################
  ## <summary>
@@ -485,7 +521,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +262,24 @@
+@@ -186,6 +285,24 @@
  
  ########################################
  ## <summary>
@@ -510,7 +546,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +313,51 @@
+@@ -219,7 +336,51 @@
  	')
  
  	files_search_tmp($1)
@@ -562,7 +598,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -245,6 +383,24 @@
+@@ -245,6 +406,24 @@
  
  ########################################
  ## <summary>
@@ -587,7 +623,34 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM package database.
  ## </summary>
  ## <param name="domain">
-@@ -283,3 +439,46 @@
+@@ -265,6 +444,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Create, read, write, and delete the RPM package database.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_manage_cache',`
++	gen_require(`
++		type rpm_var_cache_t;
++	')
++
++	files_search_var_lib($1)
++	manage_files_pattern($1, rpm_var_cache_t, rpm_var_cache_t)
++	manage_lnk_files_pattern($1, rpm_var_cache_t, rpm_var_cache_t)
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to create, read, 
+ ##	write, and delete the RPM package database.
+ ## </summary>
+@@ -283,3 +482,46 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -636,11 +699,24 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.32/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-09-16 07:03:08.000000000 -0700
-@@ -31,11 +31,15 @@
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-09-24 08:56:31.000000000 -0700
+@@ -15,6 +15,9 @@
+ domain_interactive_fd(rpm_t)
+ role system_r types rpm_t;
+ 
++type debuginfo_exec_t;
++domain_entry_file(rpm_t, debuginfo_exec_t)
++
+ type rpm_file_t;
+ files_type(rpm_file_t)
+ 
+@@ -31,11 +34,18 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
  
++type rpm_var_cache_t;
++files_type(rpm_var_cache_t)
++
 +type rpm_var_run_t;
 +files_pid_file(rpm_var_run_t)
 +
@@ -653,7 +729,7 @@ diff -b -B --ignore-all-space --exclude-
  domain_type(rpm_script_t)
  domain_entry_file(rpm_t, rpm_script_exec_t)
  domain_interactive_fd(rpm_script_t)
-@@ -52,8 +56,9 @@
+@@ -52,8 +62,9 @@
  # rpm Local policy
  #
  
@@ -665,7 +741,7 @@ diff -b -B --ignore-all-space --exclude-
  allow rpm_t self:process { getattr setexec setfscreate setrlimit };
  allow rpm_t self:fd use;
  allow rpm_t self:fifo_file rw_fifo_file_perms;
-@@ -68,6 +73,8 @@
+@@ -68,6 +79,8 @@
  allow rpm_t self:sem create_sem_perms;
  allow rpm_t self:msgq create_msgq_perms;
  allow rpm_t self:msg { send receive };
@@ -674,7 +750,15 @@ diff -b -B --ignore-all-space --exclude-
  
  allow rpm_t rpm_log_t:file manage_file_perms;
  logging_log_filetrans(rpm_t, rpm_log_t, file)
-@@ -87,8 +94,13 @@
+@@ -83,12 +96,21 @@
+ manage_sock_files_pattern(rpm_t, rpm_tmpfs_t, rpm_tmpfs_t)
+ fs_tmpfs_filetrans(rpm_t, rpm_tmpfs_t, { dir file lnk_file sock_file fifo_file })
+ 
++manage_dirs_pattern(rpm_t, rpm_var_cache_t, rpm_var_cache_t)
++manage_files_pattern(rpm_t, rpm_var_cache_t, rpm_var_cache_t)
++files_var_filetrans(rpm_t, rpm_var_cache_t, dir)
++
+ # Access /var/lib/rpm files
  manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
  
@@ -688,7 +772,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -108,12 +120,14 @@
+@@ -108,12 +130,14 @@
  dev_list_sysfs(rpm_t)
  dev_list_usbfs(rpm_t)
  dev_read_urand(rpm_t)
@@ -703,7 +787,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(rpm_t)
  
  mls_file_read_all_levels(rpm_t)
-@@ -132,6 +146,8 @@
+@@ -132,6 +156,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -712,7 +796,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -155,6 +171,7 @@
+@@ -155,6 +181,7 @@
  files_exec_etc_files(rpm_t)
  
  init_domtrans_script(rpm_t)
@@ -720,7 +804,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,17 +191,28 @@
+@@ -174,17 +201,28 @@
  ')
  
  optional_policy(`
@@ -750,7 +834,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ifdef(`TODO',`
-@@ -210,8 +238,8 @@
+@@ -210,8 +248,8 @@
  # rpm-script Local policy
  #
  
@@ -761,7 +845,7 @@ diff -b -B --ignore-all-space --exclude-
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -222,12 +250,15 @@
+@@ -222,12 +260,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -777,7 +861,7 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +270,9 @@
+@@ -239,6 +280,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
@@ -787,7 +871,7 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +289,7 @@
+@@ -255,6 +299,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -795,7 +879,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +307,19 @@
+@@ -272,14 +317,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -815,7 +899,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,6 +331,7 @@
+@@ -291,6 +341,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -823,7 +907,7 @@ diff -b -B --ignore-all-space --exclude-
  
  init_domtrans_script(rpm_script_t)
  
-@@ -308,12 +349,15 @@
+@@ -308,12 +359,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -839,7 +923,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -326,13 +370,22 @@
+@@ -326,13 +380,22 @@
  ')
  
  optional_policy(`
@@ -2338,7 +2422,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.6.32/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2009-07-28 10:28:33.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.if	2009-09-18 07:42:05.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.if	2009-09-23 16:27:38.000000000 -0700
 @@ -45,6 +45,18 @@
  	relabel_dirs_pattern($2, mozilla_home_t, mozilla_home_t)
  	relabel_files_pattern($2, mozilla_home_t, mozilla_home_t)
@@ -2366,7 +2450,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_search_user_home_dirs($1)
  ')
  
-@@ -88,6 +101,24 @@
+@@ -88,6 +101,25 @@
  
  ########################################
  ## <summary>
@@ -2378,12 +2462,13 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`mozilla_dontaudit_write_user_home_files',`
++interface(`mozilla_dontaudit_manage_user_home_files',`
 +	gen_require(`
 +		type mozilla_home_t;
 +	')
 +
-+	dontaudit $1 mozilla_home_t:file write;
++	dontaudit $1 mozilla_home_t:dir manage_dir_perms;
++	dontaudit $1 mozilla_home_t:file manage_file_perms;
 +')
 +
 +########################################
@@ -2486,8 +2571,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.32/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 16:00:00.000000000 -0800
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-18 18:30:00.000000000 -0700
-@@ -0,0 +1,319 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-23 07:34:03.000000000 -0700
+@@ -0,0 +1,320 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2600,6 +2685,7 @@ diff -b -B --ignore-all-space --exclude-
 +	dontaudit nsplugin_t $2:process ptrace;
 +	allow nsplugin_t $2:sem rw_sem_perms;
 +	allow nsplugin_t $2:shm rw_shm_perms;
++	dontaudit nsplugin_t $2:shm destroy;
 +
 +	allow $2 nsplugin_t:process { getattr ptrace signal_perms };
 +	allow $2 nsplugin_t:unix_stream_socket connectto;
@@ -2809,8 +2895,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.32/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 16:00:00.000000000 -0800
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.te	2009-09-16 07:03:08.000000000 -0700
-@@ -0,0 +1,292 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.te	2009-09-24 08:43:03.000000000 -0700
+@@ -0,0 +1,294 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3025,6 +3111,8 @@ diff -b -B --ignore-all-space --exclude-
 +allow nsplugin_config_t self:fifo_file rw_file_perms;
 +allow nsplugin_config_t self:unix_stream_socket create_stream_socket_perms;
 +
++dev_dontaudit_read_rand(nsplugin_config_t)
++
 +fs_search_auto_mountpoints(nsplugin_config_t)
 +fs_list_inotifyfs(nsplugin_config_t)
 +
@@ -3650,8 +3738,8 @@ diff -b -B --ignore-all-space --exclude-
 +# No types are sandbox_exec_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 16:00:00.000000000 -0800
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-21 06:08:50.000000000 -0700
-@@ -0,0 +1,181 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-23 16:34:36.000000000 -0700
+@@ -0,0 +1,182 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -3696,6 +3784,7 @@ diff -b -B --ignore-all-space --exclude-
 +	# Dontaudit leaked file descriptors
 +	dontaudit sandbox_x_domain $1:fifo_file rw_fifo_file_perms;
 +	dontaudit sandbox_x_domain $1:tcp_socket rw_socket_perms;
++	dontaudit sandbox_x_domain $1:udp_socket rw_socket_perms;
 +	
 +	manage_files_pattern($1, sandbox_file_type, sandbox_file_type);
 +	manage_dirs_pattern($1, sandbox_file_type, sandbox_file_type);
@@ -3835,8 +3924,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 16:00:00.000000000 -0800
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-21 05:40:55.000000000 -0700
-@@ -0,0 +1,326 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-09-24 11:21:41.000000000 -0700
+@@ -0,0 +1,328 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -3971,6 +4060,8 @@ diff -b -B --ignore-all-space --exclude-
 +allow sandbox_x_domain sandbox_xserver_t:unix_stream_socket connectto;
 +dontaudit sandbox_x_domain self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 +
++domain_dontaudit_read_all_domains_state(sandbox_x_domain)
++
 +files_search_home(sandbox_x_domain)
 +files_dontaudit_list_tmp(sandbox_x_domain)
 +
@@ -4025,7 +4116,7 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_use_user_ptys(sandbox_x_t)
 +
 +optional_policy(`
-+	mozilla_dontaudit_write_user_home_files(sandbox_x_t)
++	mozilla_dontaudit_manage_user_home_files(sandbox_x_t)
 +')
 +
 +
@@ -4186,8 +4277,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/seunshare	--	gen_context(system_u:object_r:seunshare_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.if serefpolicy-3.6.32/policy/modules/apps/seunshare.if
 --- nsaserefpolicy/policy/modules/apps/seunshare.if	1969-12-31 16:00:00.000000000 -0800
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-18 18:59:52.000000000 -0700
-@@ -0,0 +1,80 @@
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.if	2009-09-23 16:34:12.000000000 -0700
+@@ -0,0 +1,81 @@
 +
 +## <summary>policy for seunshare</summary>
 +
@@ -4239,6 +4330,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	# leaks from firefox
 +	dontaudit seunshare_t $1:tcp_socket rw_socket_perms;
++	dontaudit seunshare_t $1:udp_socket rw_socket_perms;
 +')
 +
 +########################################
@@ -4270,7 +4362,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.6.32/policy/modules/apps/seunshare.te
 --- nsaserefpolicy/policy/modules/apps/seunshare.te	1969-12-31 16:00:00.000000000 -0800
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-09-18 07:46:57.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-09-23 16:28:08.000000000 -0700
 @@ -0,0 +1,45 @@
 +policy_module(seunshare,1.0.0)
 +
@@ -4315,7 +4407,7 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_use_user_terminals(seunshare_t)
 +
 +optional_policy(`
-+	mozilla_dontaudit_write_user_home_files(seunshare_t)
++	mozilla_dontaudit_manage_user_home_files(seunshare_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.6.32/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2009-09-09 06:23:16.000000000 -0700
@@ -6293,8 +6385,16 @@ diff -b -B --ignore-all-space --exclude-
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.6.32/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/kernel/storage.if	2009-09-16 07:03:09.000000000 -0700
-@@ -529,7 +529,7 @@
++++ serefpolicy-3.6.32/policy/modules/kernel/storage.if	2009-09-23 07:29:31.000000000 -0700
+@@ -266,6 +266,7 @@
+ 
+ 	dev_list_all_dev_nodes($1)
+ 	allow $1 fixed_disk_device_t:blk_file relabel_blk_file_perms;
++	dontaudit $1 fixed_disk_device_t:lnk_file relabelto_lnk_file_perms;
+ ')
+ 
+ ########################################
+@@ -529,7 +530,7 @@
  
  	')
  
@@ -8253,7 +8353,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-09-24 08:54:43.000000000 -0700
 @@ -75,6 +75,7 @@
  
  corecmd_exec_bin(abrt_t)
@@ -8262,10 +8362,20 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_tcp_connect_http_port(abrt_t)
  
-@@ -109,9 +110,13 @@
+@@ -105,13 +106,20 @@
+ 	dbus_system_bus_client(abrt_t)
+ ')
+ 
++optional_policy(`
++	nsplugin_read_rw_files(abrt_t)
++')
++
+ # to install debuginfo packages 
  optional_policy(`
- 	rpm_manage_db(abrt_t)
- 	rpm_domtrans(abrt_t)
+-	rpm_manage_db(abrt_t)
+-	rpm_domtrans(abrt_t)
++	rpm_manage_cache(abrt_t)
++	rpm_domtrans_debuginfo(abrt_t)
 +	rpm_signull(abrt_t)
  ')
  
@@ -8275,7 +8385,6 @@ diff -b -B --ignore-all-space --exclude-
  ')
 +
 +permissive abrt_t;
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.fc serefpolicy-3.6.32/policy/modules/services/afs.fc
 --- nsaserefpolicy/policy/modules/services/afs.fc	2009-07-23 11:11:04.000000000 -0700
 +++ serefpolicy-3.6.32/policy/modules/services/afs.fc	2009-09-16 07:03:09.000000000 -0700
@@ -9874,7 +9983,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.32/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-09-21 05:20:47.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-09-22 17:55:58.000000000 -0700
 @@ -56,7 +56,7 @@
  
  allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw sys_tty_config ipc_lock };
@@ -11964,7 +12073,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/cache/hald(/.*)?			gen_context(system_u:object_r:hald_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.32/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2009-07-28 10:28:33.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/hal.if	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/hal.if	2009-09-24 11:39:22.000000000 -0700
 @@ -413,3 +413,21 @@
  	files_search_pids($1)
  	manage_files_pattern($1, hald_var_run_t, hald_var_run_t)
@@ -11989,7 +12098,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.32/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-09-23 07:21:23.000000000 -0700
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -12000,15 +12109,17 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Local policy
-@@ -100,6 +103,7 @@
+@@ -100,7 +103,9 @@
  kernel_rw_irq_sysctls(hald_t)
  kernel_rw_vm_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
 +kernel_search_network_sysctl(hald_t)
  kernel_setsched(hald_t)
++kernel_request_load_module(hald_t)
  
  auth_read_pam_console_data(hald_t)
-@@ -156,6 +160,11 @@
+ 
+@@ -156,6 +161,11 @@
  fs_search_all(hald_t)
  fs_list_inotifyfs(hald_t)
  fs_list_auto_mountpoints(hald_t)
@@ -12020,7 +12131,7 @@ diff -b -B --ignore-all-space --exclude-
  files_getattr_all_mountpoints(hald_t)
  
  mls_file_read_all_levels(hald_t)
-@@ -202,8 +211,10 @@
+@@ -202,8 +212,10 @@
  seutil_read_default_contexts(hald_t)
  seutil_read_file_contexts(hald_t)
  
@@ -12032,7 +12143,7 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -290,6 +301,7 @@
+@@ -290,6 +302,7 @@
  ')
  
  optional_policy(`
@@ -12040,7 +12151,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_t)
  	policykit_domtrans_resolve(hald_t)
  	policykit_read_lib(hald_t)
-@@ -321,6 +333,10 @@
+@@ -321,6 +334,10 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -12051,7 +12162,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Hal acl local policy
-@@ -341,6 +357,7 @@
+@@ -341,6 +358,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -12059,7 +12170,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -357,6 +374,8 @@
+@@ -357,6 +375,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -12068,7 +12179,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -369,6 +388,7 @@
+@@ -369,6 +389,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -12076,7 +12187,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +470,16 @@
+@@ -450,12 +471,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -12095,7 +12206,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +493,22 @@
+@@ -469,10 +494,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -12118,7 +12229,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +520,7 @@
+@@ -484,6 +521,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -12126,7 +12237,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +528,7 @@
+@@ -491,3 +529,7 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -12335,7 +12446,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.6.32/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/mta.te	2009-09-16 10:43:44.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/mta.te	2009-09-22 17:56:19.000000000 -0700
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -12346,7 +12457,7 @@ diff -b -B --ignore-all-space --exclude-
  type sendmail_exec_t;
  mta_agent_executable(sendmail_exec_t)
  
-@@ -57,6 +60,8 @@
+@@ -57,8 +60,11 @@
  
  can_exec(system_mail_t, mta_exec_type)
  
@@ -12354,8 +12465,11 @@ diff -b -B --ignore-all-space --exclude-
 +
  kernel_read_system_state(system_mail_t)
  kernel_read_network_state(system_mail_t)
++kernel_request_load_module(system_mail_t)
  
-@@ -72,16 +77,21 @@
+ dev_read_sysfs(system_mail_t)
+ dev_read_rand(system_mail_t)
+@@ -72,16 +78,21 @@
  
  userdom_use_user_terminals(system_mail_t)
  userdom_dontaudit_search_user_home_dirs(system_mail_t)
@@ -12377,7 +12491,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -100,6 +110,7 @@
+@@ -100,6 +111,7 @@
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
  	cron_dontaudit_write_pipes(system_mail_t)
@@ -12385,7 +12499,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -178,6 +189,10 @@
+@@ -178,6 +190,10 @@
  ')
  
  optional_policy(`
@@ -12396,7 +12510,7 @@ diff -b -B --ignore-all-space --exclude-
  	smartmon_read_tmp_files(system_mail_t)
  ')
  
-@@ -197,6 +212,25 @@
+@@ -197,6 +213,25 @@
  	')
  ')
  
@@ -16761,7 +16875,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/share/setroubleshoot/SetroubleshootFixit\.py* 	--	gen_context(system_u:object_r:setroubleshoot_fixit_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if	2009-09-24 11:40:15.000000000 -0700
 @@ -16,8 +16,8 @@
  	')
  
@@ -16773,7 +16887,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -36,6 +36,84 @@
+@@ -36,6 +36,102 @@
  		type setroubleshootd_t, setroubleshoot_var_run_t;
  	')
  
@@ -16826,6 +16940,24 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Dontaudit read/write to a setroubleshoot unix datagram socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`setroubleshoot_dontaudit_rw_dgram_sockets',`
++	gen_require(`
++		type setroubleshoot_fixit_t;
++	')
++
++	dontaudit $1 setroubleshoot_fixit_t:unix_dgram_socket { read write };
++')
++
++########################################
++## <summary>
 +##	All of the rules required to administrate 
 +##	an setroubleshoot environment
 +## </summary>
@@ -16861,7 +16993,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-09-24 11:38:01.000000000 -0700
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -16923,7 +17055,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,74 @@
+@@ -94,23 +113,72 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -16998,8 +17130,6 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +        policykit_dbus_chat(setroubleshoot_fixit_t)
 +')
-+
-+permissive setroubleshoot_fixit_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.32/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-08-14 13:14:31.000000000 -0700
 +++ serefpolicy-3.6.32/policy/modules/services/smartmon.te	2009-09-16 07:03:09.000000000 -0700
@@ -17132,8 +17262,8 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_sysfs(snmpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.32/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/spamassassin.fc	2009-09-16 07:03:09.000000000 -0700
-@@ -1,15 +1,25 @@
++++ serefpolicy-3.6.32/policy/modules/services/spamassassin.fc	2009-09-24 10:21:09.000000000 -0700
+@@ -1,15 +1,26 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
 +/root/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
@@ -17151,10 +17281,11 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/bin/mimedefang-multiplexor --	gen_context(system_u:object_r:spamd_exec_t,s0)
  
  /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
- 
++/var/lib/spamassassin/compiled(/.*)?	gen_context(system_u:object_r:spamd_compiled_t,s0)
++
 +/var/log/spamd\.log	--	gen_context(system_u:object_r:spamd_log_t,s0)
 +/var/log/mimedefang	--	gen_context(system_u:object_r:spamd_log_t,s0)
-+
+ 
  /var/run/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
  
  /var/spool/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
@@ -17274,7 +17405,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.32/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/spamassassin.te	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/spamassassin.te	2009-09-24 10:20:36.000000000 -0700
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -17311,7 +17442,7 @@ diff -b -B --ignore-all-space --exclude-
  type spamassassin_t;
  type spamassassin_exec_t;
  typealias spamassassin_t alias { user_spamassassin_t staff_spamassassin_t sysadm_spamassassin_t };
-@@ -51,10 +80,18 @@
+@@ -51,10 +80,21 @@
  typealias spamc_tmp_t alias { auditadm_spamc_tmp_t secadm_spamc_tmp_t };
  files_tmp_file(spamc_tmp_t)
  ubac_constrained(spamc_tmp_t)
@@ -17322,6 +17453,9 @@ diff -b -B --ignore-all-space --exclude-
  init_daemon_domain(spamd_t, spamd_exec_t)
 +can_exec(spamd_t, spamd_exec_t)
 +
++type spamd_compiled_t;
++files_type(spamd_compiled_t)
++
 +type spamd_initrc_exec_t;
 +init_script_file(spamd_initrc_exec_t)
 +
@@ -17330,7 +17464,7 @@ diff -b -B --ignore-all-space --exclude-
  
  type spamd_spool_t;
  files_type(spamd_spool_t)
-@@ -110,6 +147,7 @@
+@@ -110,6 +150,7 @@
  dev_read_urand(spamassassin_t)
  
  fs_search_auto_mountpoints(spamassassin_t)
@@ -17338,7 +17472,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # this should probably be removed
  corecmd_list_bin(spamassassin_t)
-@@ -150,6 +188,7 @@
+@@ -150,6 +191,7 @@
  	corenet_udp_sendrecv_all_ports(spamassassin_t)
  	corenet_tcp_connect_all_ports(spamassassin_t)
  	corenet_sendrecv_all_client_packets(spamassassin_t)
@@ -17346,7 +17480,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	sysnet_read_config(spamassassin_t)
  ')
-@@ -186,6 +225,8 @@
+@@ -186,6 +228,8 @@
  optional_policy(`
  	mta_read_config(spamassassin_t)
  	sendmail_stub(spamassassin_t)
@@ -17355,7 +17489,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -207,16 +248,33 @@
+@@ -207,16 +251,33 @@
  allow spamc_t self:unix_stream_socket connectto;
  allow spamc_t self:tcp_socket create_stream_socket_perms;
  allow spamc_t self:udp_socket create_socket_perms;
@@ -17389,7 +17523,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -246,9 +304,15 @@
+@@ -246,9 +307,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -17405,7 +17539,7 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -256,27 +320,40 @@
+@@ -256,27 +323,40 @@
  
  sysnet_read_config(spamc_t)
  
@@ -17452,7 +17586,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -288,7 +365,7 @@
+@@ -288,7 +368,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -17461,12 +17595,16 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -304,10 +381,13 @@
+@@ -304,10 +384,17 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
 -allow spamd_t self:netlink_route_socket r_netlink_socket_perms;
 +
++can_exec(spamd_t, spamd_compiled_t)
++manage_dirs_pattern(spamd_t, spamd_compiled_t, spamd_compiled_t)
++manage_files_pattern(spamd_t, spamd_compiled_t, spamd_compiled_t)
++
 +manage_files_pattern(spamd_t, spamd_log_t, spamd_log_t)
 +logging_log_filetrans(spamd_t, spamd_log_t, file)
  
@@ -17476,7 +17614,7 @@ diff -b -B --ignore-all-space --exclude-
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -316,10 +396,12 @@
+@@ -316,10 +403,12 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -17490,7 +17628,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -369,22 +451,27 @@
+@@ -369,22 +458,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -17522,7 +17660,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -402,23 +489,16 @@
+@@ -402,23 +496,16 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -17547,7 +17685,7 @@ diff -b -B --ignore-all-space --exclude-
  	postfix_read_config(spamd_t)
  ')
  
-@@ -433,6 +513,10 @@
+@@ -433,6 +520,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -17558,7 +17696,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -445,5 +529,9 @@
+@@ -445,5 +536,9 @@
  ')
  
  optional_policy(`
@@ -23738,7 +23876,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.32/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-09-24 11:41:09.000000000 -0700
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -23881,17 +24019,17 @@ diff -b -B --ignore-all-space --exclude-
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
 -allow semanage_t self:unix_dgram_socket create_socket_perms;
 -allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
--
--allow semanage_t policy_config_t:file rw_file_perms;
 +seutil_semanage_policy(semanage_t)
 +allow semanage_t self:fifo_file rw_fifo_file_perms;
  
--allow semanage_t semanage_tmp_t:dir manage_dir_perms;
--allow semanage_t semanage_tmp_t:file manage_file_perms;
--files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
+-allow semanage_t policy_config_t:file rw_file_perms;
 +manage_dirs_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
 +manage_files_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
  
+-allow semanage_t semanage_tmp_t:dir manage_dir_perms;
+-allow semanage_t semanage_tmp_t:file manage_file_perms;
+-files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
+-
 -kernel_read_system_state(semanage_t)
 -kernel_read_kernel_sysctls(semanage_t)
 -
@@ -23917,14 +24055,14 @@ diff -b -B --ignore-all-space --exclude-
 +can_exec(semanage_t, semanage_exec_t)
  
 -term_use_all_terms(semanage_t)
-+# Admins are creating pp files in random locations
-+auth_read_all_files_except_shadow(semanage_t)
- 
+-
 -# Running genhomedircon requires this for finding all users
 -auth_use_nsswitch(semanage_t)
 -
 -locallogin_use_fds(semanage_t)
--
++# Admins are creating pp files in random locations
++auth_read_all_files_except_shadow(semanage_t)
+ 
 -logging_send_syslog_msg(semanage_t)
 -
 -miscfiles_read_localization(semanage_t)
@@ -23967,7 +24105,7 @@ diff -b -B --ignore-all-space --exclude-
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -499,111 +482,36 @@
+@@ -499,111 +482,40 @@
  	userdom_read_user_tmp_files(semanage_t)
  ')
  
@@ -24049,55 +24187,56 @@ diff -b -B --ignore-all-space --exclude-
 -userdom_use_all_users_fds(setfiles_t)
 -# for config files in a home directory
 -userdom_read_user_home_content_files(setfiles_t)
--
++init_dontaudit_use_fds(setsebool_t)
+ 
 -ifdef(`distro_debian',`
 -	# udev tmpfs is populated with static device nodes
 -	# and then relabeled afterwards; thus
 -	# /dev/console has the tmpfs type
 -	fs_rw_tmpfs_chr_files(setfiles_t)
 -')
-+init_dontaudit_use_fds(setsebool_t)
- 
--ifdef(`distro_redhat', `
--	fs_rw_tmpfs_chr_files(setfiles_t)
--	fs_rw_tmpfs_blk_files(setfiles_t)
--	fs_relabel_tmpfs_blk_file(setfiles_t)
--	fs_relabel_tmpfs_chr_file(setfiles_t)
--')
 +# Bug in semanage
 +seutil_domtrans_setfiles(setsebool_t)
 +seutil_manage_file_contexts(setsebool_t)
 +seutil_manage_default_contexts(setsebool_t)
 +seutil_manage_config(setsebool_t)
  
--ifdef(`distro_ubuntu',`
--	optional_policy(`
--		unconfined_domain(setfiles_t)
--	')
+-ifdef(`distro_redhat', `
+-	fs_rw_tmpfs_chr_files(setfiles_t)
+-	fs_rw_tmpfs_blk_files(setfiles_t)
+-	fs_relabel_tmpfs_blk_file(setfiles_t)
+-	fs_relabel_tmpfs_chr_file(setfiles_t)
 -')
 +########################################
 +#
 +# Setfiles local policy
 +#
  
--ifdef(`hide_broken_symptoms',`
+-ifdef(`distro_ubuntu',`
 -	optional_policy(`
--		udev_dontaudit_rw_dgram_sockets(setfiles_t)
+-		unconfined_domain(setfiles_t)
 -	')
+-')
 +seutil_setfiles(setfiles_t)
 +# During boot in Rawhide
 +term_use_generic_ptys(setfiles_t)
  
--	# cjp: cover up stray file descriptors.
+-ifdef(`hide_broken_symptoms',`
 -	optional_policy(`
--		unconfined_dontaudit_read_pipes(setfiles_t)
--		unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
+-		udev_dontaudit_rw_dgram_sockets(setfiles_t)
 -	')
--')
 +seutil_setfiles(setfiles_mac_t)
 +allow setfiles_mac_t self:capability2 mac_admin;
 +kernel_relabelto_unlabeled(setfiles_mac_t)
  
+-	# cjp: cover up stray file descriptors.
+ 	optional_policy(`
+-		unconfined_dontaudit_read_pipes(setfiles_t)
+-		unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
+-	')
++	setroubleshoot_dontaudit_rw_dgram_sockets(setfiles_t)
+ ')
+ 
  optional_policy(`
 -	hotplug_use_fds(setfiles_t)
 +	unconfined_domain(setfiles_mac_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -p -r1.928 -r1.929
--- selinux-policy.spec	22 Sep 2009 12:49:53 -0000	1.928
+++ selinux-policy.spec	24 Sep 2009 23:30:16 -0000	1.929
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -80,6 +80,7 @@ SELinux Base package
 Summary: SELinux policy documentation
 Group: System Environment/Base
 Requires(pre): selinux-policy = %{version}-%{release}
+Requires: /usr/bin/xdg-open
 
 %description doc
 SELinux policy documentation package
@@ -447,6 +448,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-10
+- Allow sendmail to request kernel modules load
+
 * Mon Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-9
 - Fix all kernel_request_load_module domains
 



From jfearn at fedoraproject.org  Thu Sep 24 23:45:52 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Thu, 24 Sep 2009 23:45:52 +0000 (UTC)
Subject: rpms/publican/devel publican.spec,1.26,1.27
Message-ID: <20090924234552.AB54411C00DB@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3237

Modified Files:
	publican.spec 
Log Message:
remove lohit font deps


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- publican.spec	26 Jul 2009 19:38:15 -0000	1.26
+++ publican.spec	24 Sep 2009 23:45:40 -0000	1.27
@@ -8,7 +8,7 @@
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
 Version:	0.44
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
 #	content, Book_Template, Set_Template, Article_Template
@@ -28,45 +28,18 @@ BuildRequires:	%{_bindir}/xml2pot %{_bin
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 BuildRequires:	fop saxon ImageMagick
-#BuildRequires:	xslthl
-# *&%^*&^ decided to rename font packages and change font paths.
-# No actual real changes.
-%if %{PREMOLESTATION}
-Requires:	xslthl
-Requires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
-Requires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
-Requires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
-Requires:	fonts-tamil fonts-telugu liberation-fonts
-BuildRequires:	xslthl
-BuildRequires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
-BuildRequires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
-BuildRequires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
-BuildRequires:	fonts-tamil fonts-telugu liberation-fonts
-%endif
-%if %{FC10}
-Requires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-Requires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
-
-BuildRequires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
-%endif
-%if %{FC11}
+
 Requires:	liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
-Requires:	lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati
-Requires:	lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada
-Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:	lohit-fonts-tamil lohit-fonts-telugu baekmuk-ttf-batang-fonts
+Requires:	cjkuni-uming-fonts 
+Requires:	sazanami-gothic-fonts sazanami-mincho-fonts
+Requires:	lklug-fonts
+Requires:	baekmuk-ttf-batang-fonts
 
 BuildRequires:	liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
-BuildRequires:	lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati
-BuildRequires:	lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada
-BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu baekmuk-ttf-batang-fonts
-%endif
+BuildRequires:	cjkuni-uming-fonts
+BuildRequires:	sazanami-gothic-fonts sazanami-mincho-fonts
+BuildRequires:	lklug-fonts
+BuildRequires:	baekmuk-ttf-batang-fonts
 
 URL:		https://fedorahosted.org/publican
 Obsoletes:	documentation-devel < 0.26-3
@@ -158,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Fri Sep 21 2009  Jeff Fearn <jfearn at redhat.com> 0.44-2
+- remove lohit font deps, they don't work for PDFs generated in FOP
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bojan at fedoraproject.org  Thu Sep 24 23:52:00 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu, 24 Sep 2009 23:52:00 +0000 (UTC)
Subject: rpms/apr/devel apr-1.3.9.tar.bz2.asc, NONE, 1.1 .cvsignore, 1.18,
	1.19 apr.spec, 1.91, 1.92 sources, 1.18,
	1.19 apr-1.3.8.tar.bz2.asc, 1.1, NONE
Message-ID: <20090924235200.682B711C00DB@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5910

Modified Files:
	.cvsignore apr.spec sources 
Added Files:
	apr-1.3.9.tar.bz2.asc 
Removed Files:
	apr-1.3.8.tar.bz2.asc 
Log Message:
Bump up to 1.3.9.


--- NEW FILE apr-1.3.9.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)

iD8DBQBKt/dNNEqETXUdfycRAl7mAKDo689ziRnAAbjhYqNCgKToyk97KgCgpBEG
EjGzexofTLhk4jlz+VLTJg0=
=F4XE
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	6 Aug 2009 00:11:25 -0000	1.18
+++ .cvsignore	24 Sep 2009 23:51:59 -0000	1.19
@@ -1 +1 @@
-apr-1.3.8.tar.bz2
+apr-1.3.9.tar.bz2


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- apr.spec	6 Aug 2009 00:11:25 -0000	1.91
+++ apr.spec	24 Sep 2009 23:52:00 -0000	1.92
@@ -5,7 +5,7 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.8
+Version: 1.3.9
 Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+
 * Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1
 - bump up to 1.3.8
 - CVE-2009-2412


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	6 Aug 2009 00:11:25 -0000	1.18
+++ sources	24 Sep 2009 23:52:00 -0000	1.19
@@ -1 +1 @@
-3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2
+7138ac64d4458eeeaa9b9aefa4e6e51b  apr-1.3.9.tar.bz2


--- apr-1.3.8.tar.bz2.asc DELETED ---



From bojan at fedoraproject.org  Fri Sep 25 00:09:20 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri, 25 Sep 2009 00:09:20 +0000 (UTC)
Subject: rpms/apr/F-11 apr-1.3.9.tar.bz2.asc, NONE, 1.1 apr.spec, 1.86,
	1.87 sources, 1.16, 1.17 apr-1.3.8.tar.bz2.asc, 1.1, NONE
Message-ID: <20090925000921.4AFDD11C00DB@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12888

Modified Files:
	apr.spec sources 
Added Files:
	apr-1.3.9.tar.bz2.asc 
Removed Files:
	apr-1.3.8.tar.bz2.asc 
Log Message:
Bump up to 1.3.9.


--- NEW FILE apr-1.3.9.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)

iD8DBQBKt/dNNEqETXUdfycRAl7mAKDo689ziRnAAbjhYqNCgKToyk97KgCgpBEG
EjGzexofTLhk4jlz+VLTJg0=
=F4XE
-----END PGP SIGNATURE-----


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/apr.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- apr.spec	10 Aug 2009 07:16:11 -0000	1.86
+++ apr.spec	25 Sep 2009 00:09:15 -0000	1.87
@@ -5,8 +5,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.8
-Release: 2%{?dist}
+Version: 1.3.9
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+
 * Mon Aug 10 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-2
 - revert use of accept4(), dup3() and epoll_create1()
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	6 Aug 2009 00:22:11 -0000	1.16
+++ sources	25 Sep 2009 00:09:15 -0000	1.17
@@ -1 +1 @@
-3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2
+7138ac64d4458eeeaa9b9aefa4e6e51b  apr-1.3.9.tar.bz2


--- apr-1.3.8.tar.bz2.asc DELETED ---



From bojan at fedoraproject.org  Fri Sep 25 00:11:43 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri, 25 Sep 2009 00:11:43 +0000 (UTC)
Subject: rpms/apr/F-10 apr-1.3.9.tar.bz2.asc, NONE, 1.1 apr.spec, 1.81,
	1.82 sources, 1.16, 1.17 apr-1.3.8.tar.bz2.asc, 1.1, NONE
Message-ID: <20090925001143.4360311C00DB@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13924

Modified Files:
	apr.spec sources 
Added Files:
	apr-1.3.9.tar.bz2.asc 
Removed Files:
	apr-1.3.8.tar.bz2.asc 
Log Message:
Bump up to 1.3.9.


--- NEW FILE apr-1.3.9.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)

iD8DBQBKt/dNNEqETXUdfycRAl7mAKDo689ziRnAAbjhYqNCgKToyk97KgCgpBEG
EjGzexofTLhk4jlz+VLTJg0=
=F4XE
-----END PGP SIGNATURE-----


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-10/apr.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- apr.spec	6 Aug 2009 00:34:09 -0000	1.81
+++ apr.spec	25 Sep 2009 00:11:43 -0000	1.82
@@ -5,7 +5,7 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.8
+Version: 1.3.9
 Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+
 * Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1
 - bump up to 1.3.8
 - CVE-2009-2412


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	6 Aug 2009 00:34:09 -0000	1.16
+++ sources	25 Sep 2009 00:11:43 -0000	1.17
@@ -1 +1 @@
-3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2
+7138ac64d4458eeeaa9b9aefa4e6e51b  apr-1.3.9.tar.bz2


--- apr-1.3.8.tar.bz2.asc DELETED ---



From mclasen at fedoraproject.org  Fri Sep 25 00:21:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 00:21:30 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.490,1.491
Message-ID: <20090925002130.C2C3D11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17718

Modified Files:
	control-center.spec 
Log Message:
drop a patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- control-center.spec	24 Sep 2009 20:49:45 -0000	1.490
+++ control-center.spec	25 Sep 2009 00:21:30 -0000	1.491
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -44,9 +44,6 @@ Patch22: slab-icon-names.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=555591
 Patch30: default-layout-toggle.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=546036
-Patch33: notification-theme.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=588729
 Patch45: mnemonic.patch
 
@@ -187,13 +184,12 @@ for the GNOME desktop.
 %patch10 -p0 -b .pam-fprintd
 %patch22 -p0 -b .slab-icon-names
 %patch30 -p1 -b .default-layout-toggle
-%patch33 -p1 -b .notification-theme
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
-##%patch96 -p1 -b .gecos
+#%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 %patch100 -p1 -b .common-tasks
 
@@ -377,6 +373,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-9
+- Drop the notification theme patch
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
 - Fix appearance capplet tabs
 



From mclasen at fedoraproject.org  Fri Sep 25 00:33:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 00:33:58 +0000 (UTC)
Subject: rpms/notification-daemon/devel default-theme.patch, NONE,
	1.1 notification-daemon.spec, 1.34, 1.35
Message-ID: <20090925003358.D8FC111C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25389

Modified Files:
	notification-daemon.spec 
Added Files:
	default-theme.patch 
Log Message:
Change default theme


default-theme.patch:
 notification-daemon.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE default-theme.patch ---
diff -up notification-daemon-0.4.0/data/notification-daemon.schemas.in.nodoka notification-daemon-0.4.0/data/notification-daemon.schemas.in
--- notification-daemon-0.4.0/data/notification-daemon.schemas.in.nodoka	2009-04-27 20:55:23.593078616 -0400
+++ notification-daemon-0.4.0/data/notification-daemon.schemas.in	2009-04-27 20:55:38.186830065 -0400
@@ -18,7 +18,7 @@
    <applyto>/apps/notification-daemon/theme</applyto>
    <owner>notification-daemon</owner>
    <type>string</type>
-   <default>standard</default>
+   <default>slider</default>
    <locale name="C">
     <short>Current theme</short>
     <long>The theme used when displaying notifications.</long>


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- notification-daemon.spec	23 Sep 2009 22:08:42 -0000	1.34
+++ notification-daemon.spec	25 Sep 2009 00:33:58 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.1
-Release: 0.20090923.1%{?dist}
+Release: 0.20090923.2%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -37,7 +37,7 @@ Source0: http://www.galago-project.org/f
 
 # drop libsexy dep
 Patch0: sexy.patch
-Patch1: nodoka.patch
+Patch1: default-theme.patch
 Patch2: location.patch
 Patch10: notification-daemon-always-stack.patch
 
@@ -50,7 +50,7 @@ user's way.
 %prep
 %setup -q
 %patch0 -p1 -b .sexy
-%patch1 -p1 -b .nodoka
+%patch1 -p1 -b .default-theme
 %patch2 -p1 -b .location
 %patch10 -p1 -b .always-stack
 
@@ -113,6 +113,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.2
+- Change default theme to 'slider'
+
 * Wed Sep 23 2009 Jon McCann <jmccann at redhat.com> - 0.4.1-0.20090923.1
 - Update to snapshot to fix crashers
 - Add internal API to allow themes to stack only



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:21 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003522.7E84210F86F@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:23 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003523.76E3710F884@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on stardict (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:31 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003531.D548610F890@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict (Fedora 8) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:33 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003533.B03ED10F89A@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on stardict (Fedora devel) to Obsolete for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:37 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003537.B3A8710F89B@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict (Fedora 9) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:41 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003541.397D710F89E@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict (Fedora 10) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:43 +0000
Subject: [pkgdb] stardict had acl change status
Message-ID: <20090925003543.3D24210F8A1@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict (Fedora 11) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict



From pkgdb at fedoraproject.org  Fri Sep 25 00:35:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:35:56 +0000
Subject: [pkgdb] stardict-dic-en had acl change status
Message-ID: <20090925003556.C1EA110F883@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-en (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-en



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:00 +0000
Subject: [pkgdb] stardict-dic-en had acl change status
Message-ID: <20090925003600.57F7A10F890@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-en (Fedora 8) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-en



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:06 +0000
Subject: [pkgdb] stardict-dic-en had acl change status
Message-ID: <20090925003606.887A110F8A4@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-en (Fedora 9) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-en



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:07 +0000
Subject: [pkgdb] stardict-dic-en had acl change status
Message-ID: <20090925003608.938AE10F89A@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-en (Fedora 10) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-en



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:10 +0000
Subject: [pkgdb] stardict-dic-en had acl change status
Message-ID: <20090925003611.03A2810F8A5@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-en (Fedora 11) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-en



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:17 +0000
Subject: [pkgdb] stardict-dic-ja had acl change status
Message-ID: <20090925003618.22A1810F8AB@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ja (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ja



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:20 +0000
Subject: [pkgdb] stardict-dic-ja had acl change status
Message-ID: <20090925003620.8DE7110F89E@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ja (Fedora 8) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ja



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:25 +0000
Subject: [pkgdb] stardict-dic-ja had acl change status
Message-ID: <20090925003625.DA34E10F8AC@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ja (Fedora 9) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ja



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:26 +0000
Subject: [pkgdb] stardict-dic-ja had acl change status
Message-ID: <20090925003626.D325610F8B3@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ja (Fedora 11) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ja



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:26 +0000
Subject: [pkgdb] stardict-dic-ja had acl change status
Message-ID: <20090925003626.408A210F8B0@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ja (Fedora 10) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ja



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:33 +0000
Subject: [pkgdb] stardict-dic-ru had acl change status
Message-ID: <20090925003633.C357D10F883@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ru (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ru



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:36 +0000
Subject: [pkgdb] stardict-dic-ru had acl change status
Message-ID: <20090925003636.EFCF010F8B8@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ru (Fedora 8) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ru



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:39 +0000
Subject: [pkgdb] stardict-dic-ru had acl change status
Message-ID: <20090925003639.3855910F8BD@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ru (Fedora 9) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ru



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:41 +0000
Subject: [pkgdb] stardict-dic-ru had acl change status
Message-ID: <20090925003642.0366210F8BE@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ru (Fedora 10) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ru



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:42 +0000
Subject: [pkgdb] stardict-dic-ru had acl change status
Message-ID: <20090925003643.7609F10F8A2@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-ru (Fedora 11) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-ru



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:51 +0000
Subject: [pkgdb] stardict-dic-zh_CN had acl change status
Message-ID: <20090925003651.154A910F8C1@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_CN (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_CN



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:54 +0000
Subject: [pkgdb] stardict-dic-zh_CN had acl change status
Message-ID: <20090925003654.911E310F8A3@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_CN (Fedora 8) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_CN



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:59 +0000
Subject: [pkgdb] stardict-dic-zh_CN had acl change status
Message-ID: <20090925003659.2E75C10F8C2@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_CN (Fedora 10) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_CN



From pkgdb at fedoraproject.org  Fri Sep 25 00:36:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:36:58 +0000
Subject: [pkgdb] stardict-dic-zh_CN had acl change status
Message-ID: <20090925003659.C460910F8C5@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_CN (Fedora 9) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_CN



From pkgdb at fedoraproject.org  Fri Sep 25 00:37:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:37:01 +0000
Subject: [pkgdb] stardict-dic-zh_CN had acl change status
Message-ID: <20090925003701.6381B10F8C8@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_CN (Fedora 11) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_CN



From pkgdb at fedoraproject.org  Fri Sep 25 00:37:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:37:07 +0000
Subject: [pkgdb] stardict-dic-zh_TW had acl change status
Message-ID: <20090925003707.C3A3610F8A5@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_TW (Fedora devel) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_TW



From pkgdb at fedoraproject.org  Fri Sep 25 00:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:37:09 +0000
Subject: [pkgdb] stardict-dic-zh_TW had acl change status
Message-ID: <20090925003710.D4CD510F8C9@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_TW (Fedora 8) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_TW



From pkgdb at fedoraproject.org  Fri Sep 25 00:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:37:12 +0000
Subject: [pkgdb] stardict-dic-zh_TW had acl change status
Message-ID: <20090925003712.9E11110F8CD@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_TW (Fedora 9) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_TW



From pkgdb at fedoraproject.org  Fri Sep 25 00:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:37:15 +0000
Subject: [pkgdb] stardict-dic-zh_TW had acl change status
Message-ID: <20090925003715.B013110F8A9@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_TW (Fedora 10) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_TW



From pkgdb at fedoraproject.org  Fri Sep 25 00:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 00:37:16 +0000
Subject: [pkgdb] stardict-dic-zh_TW had acl change status
Message-ID: <20090925003717.418E610F8CE@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on stardict-dic-zh_TW (Fedora 11) to Approved for zhu

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/stardict-dic-zh_TW



From bpepple at fedoraproject.org  Fri Sep 25 00:40:39 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 25 Sep 2009 00:40:39 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.37, 1.38 sources, 1.37,
	1.38 telepathy-glib.spec, 1.46, 1.47
Message-ID: <20090925004039.80A8711C0423@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28155

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Thu Sep 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	14 Sep 2009 22:19:22 -0000	1.37
+++ .cvsignore	25 Sep 2009 00:40:38 -0000	1.38
@@ -1 +1 @@
-telepathy-glib-0.7.37.tar.gz
+telepathy-glib-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	14 Sep 2009 22:19:22 -0000	1.37
+++ sources	25 Sep 2009 00:40:38 -0000	1.38
@@ -1 +1 @@
-681b5b82fc3ec65d86a6cb409ec38e5d  telepathy-glib-0.7.37.tar.gz
+ef90ccd7cf6839f359f66918ba2d99d3  telepathy-glib-0.8.0.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- telepathy-glib.spec	14 Sep 2009 22:19:22 -0000	1.46
+++ telepathy-glib.spec	25 Sep 2009 00:40:38 -0000	1.47
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.37
+Version:        0.8.0
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+
 * Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.37-1
 - Update to 0.7.37.
 



From mclasen at fedoraproject.org  Fri Sep 25 00:43:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 00:43:31 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel .cvsignore, 1.7,
	1.8 fedora-gnome-theme.spec, 1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20090925004331.47AC211C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29966

Modified Files:
	.cvsignore fedora-gnome-theme.spec sources 
Log Message:
switch to a new notification theme



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Aug 2009 15:22:16 -0000	1.7
+++ .cvsignore	25 Sep 2009 00:43:28 -0000	1.8
@@ -1 +1 @@
-fedora-gnome-theme-12.2.tar.bz2
+fedora-gnome-theme-12.3.tar.bz2


Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fedora-gnome-theme.spec	25 Aug 2009 15:22:16 -0000	1.16
+++ fedora-gnome-theme.spec	25 Sep 2009 00:43:29 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
-Version: 12.2
+Version: 12.3
 Release: 1%{?dist}
 BuildArch: noarch
 # No version given, no license attribution.
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: nodoka-metacity-theme
 Requires: gtk-nodoka-engine
 Requires: fedora-icon-theme
-Requires: notification-daemon-engine-nodoka
+Requires: notification-daemon-engine-slider
 Requires: bluecurve-cursor-theme
 
 # we require XML::Parser for our in-tree intltool
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 12.3-1
+- Use a new notification theme
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 12.2-1
 - Update the gtkrc file too
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Aug 2009 15:22:16 -0000	1.7
+++ sources	25 Sep 2009 00:43:29 -0000	1.8
@@ -1 +1 @@
-32b312e5ab944b564d79c09ea342735d  fedora-gnome-theme-12.2.tar.bz2
+fe95017a95b707db525fc08309741fd1  fedora-gnome-theme-12.3.tar.bz2



From cchance at fedoraproject.org  Fri Sep 25 00:55:49 2009
From: cchance at fedoraproject.org (cchance)
Date: Fri, 25 Sep 2009 00:55:49 +0000 (UTC)
Subject: rpms/taipeifonts/devel taipeifonts.spec,1.5,1.6
Message-ID: <20090925005549.D18EA11C00DB@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/taipeifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4293

Modified Files:
	taipeifonts.spec 
Log Message:
* Fri Sep 25 2009 Caius kaio Chance <cchance at redhat.com> - 1.2-9.fc12
- rebuild on dist-f12



Index: taipeifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taipeifonts/devel/taipeifonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- taipeifonts.spec	27 Jul 2009 05:30:40 -0000	1.5
+++ taipeifonts.spec	25 Sep 2009 00:55:49 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:       taipeifonts
 Version:    1.2
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    Chinese Bitmap Fonts
 
 Group:      User Interface/X
@@ -72,6 +72,9 @@ fi
 %{catalogue}/%{name}
 
 %changelog
+* Fri Sep 25 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.2-9.fc12
+- rebuild on dist-f12
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From elanthis at fedoraproject.org  Fri Sep 25 01:08:33 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Fri, 25 Sep 2009 01:08:33 +0000 (UTC)
Subject: rpms/clc/devel clc.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925010833.1B68211C00DB@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/clc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10273/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clc.spec import.log 
Log Message:
* Wed Sep 24 2009 Sean Middleditch <sean at middleditch.us> 0.01-4
- Initial import into Fedora CVS.



--- NEW FILE clc.spec ---
Name:		clc
Version:	0.01
Release:	4%{?dist}
Summary:	Command-line client for MUDs

Group:		Applications/Internet
License:	Public Domain
URL:		http://github.com/elanthis/clc/tree/master
Source0:	http://cloud.github.com/downloads/elanthis/clc/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libtelnet-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel

%description
Very simplistic MUD client for command line usage.

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="%{optflags} -DHAVE_ZLIB -DCLC_VERSION='\"%{version}\"'"

%install
rm -rf "%{buildroot}"
install -m 644 -D README "%{buildroot}/%{_docdir}/%{name}-%{version}/README"
install -m 755 -D clc "%{buildroot}/%{_bindir}/clc"

%clean
rm -rf "%{buildroot}"

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/clc

%changelog
* Wed Sep 12 2009 Sean Middleditch <sean at middleditch.us> 0.01-4
- Rebuild with the proper tarball.
- Included RPM optflags in build.
- Use buildroot macro instead of RPM_BUILD_ROOT variable.

* Wed Sep 12 2009 Sean Middleditch <sean at middleditch.us> 0.01-3
- Added build-requires on zlib-devel and ncurses-devel.

* Wed Sep 04 2009 Sean Middleditch <sean at middleditch.us> 0.01-2
- Fixed source location.

* Wed Aug 29 2009 Sean Middleditch <sean at middleditch.us> 0.01-1
- Initial RPM release.


--- NEW FILE import.log ---
clc-0_01-4_fc12:HEAD:clc-0.01-4.fc12.src.rpm:1253840841


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:27:24 -0000	1.1
+++ .cvsignore	25 Sep 2009 01:08:32 -0000	1.2
@@ -0,0 +1 @@
+clc-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:27:24 -0000	1.1
+++ sources	25 Sep 2009 01:08:32 -0000	1.2
@@ -0,0 +1 @@
+b6043dececbaa61e8a3b26a2bda33d38  clc-0.01.tar.gz



From bpepple at fedoraproject.org  Fri Sep 25 01:27:50 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 25 Sep 2009 01:27:50 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.15, 1.16 sources,
	1.15, 1.16 telepathy-mission-control.spec, 1.23, 1.24
Message-ID: <20090925012750.9D0A911C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19430

Modified Files:
	.cvsignore sources telepathy-mission-control.spec 
Log Message:
* Thu Sep 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:5.2.5-1
- Update to 5.2.5.
- Add epoch so we don't ship the devel branch of mission control for F12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	14 Sep 2009 22:39:53 -0000	1.15
+++ .cvsignore	25 Sep 2009 01:27:49 -0000	1.16
@@ -1 +1 @@
-telepathy-mission-control-5.3.0.tar.gz
+telepathy-mission-control-5.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	14 Sep 2009 22:39:53 -0000	1.15
+++ sources	25 Sep 2009 01:27:50 -0000	1.16
@@ -1 +1 @@
-cdf3e9d508121ff5fb994bda9011b520  telepathy-mission-control-5.3.0.tar.gz
+011d1eebe8c580778fccc093be7b3692  telepathy-mission-control-5.2.5.tar.gz


Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- telepathy-mission-control.spec	14 Sep 2009 22:39:53 -0000	1.23
+++ telepathy-mission-control.spec	25 Sep 2009 01:27:50 -0000	1.24
@@ -1,5 +1,6 @@
 Name:           telepathy-mission-control
-Version:        5.3.0
+Version:        5.2.5
+Epoch:          1
 Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
@@ -12,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  libxslt-devel
 BuildRequires:  GConf2-devel 
 BuildRequires:  telepathy-glib-devel >= 0.7.32
-BuildRequires:  gnome-keyring-devel
+
 
 %description
 Mission Control, or MC, is a Telepathy component providing a way for
@@ -30,6 +31,7 @@ Requires:       dbus-devel
 Requires:       dbus-glib-devel
 Requires:       telepathy-glib-devel >= 0.7.32
 
+
 %description    devel
 The %{name}-devel package contains libraries and header
 files for developing applications that use %{name}.
@@ -40,7 +42,7 @@ files for developing applications that u
 
 
 %build
-%configure --disable-static --enable-gnome-keyring=yes
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -49,12 +51,14 @@ 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
 
 
@@ -67,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/mission-control-5
 %{_mandir}/man*/*.gz
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
@@ -76,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:5.2.5-1
+- Update to 5.2.5.
+- Add epoch so we don't ship the devel branch of mission control for F12.
+
 * Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.3.0-1
 - Update to 5.3.0.
 



From elanthis at fedoraproject.org  Fri Sep 25 01:34:58 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Fri, 25 Sep 2009 01:34:58 +0000 (UTC)
Subject: rpms/clc/F-12 clc.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925013458.2AE6311C00DB@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/clc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22749/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	clc.spec import.log 
Log Message:
* Wed Sep 24 2009 Sean Middleditch <sean at middleditch.us> 0.01-4
- Import to F-12.



--- NEW FILE clc.spec ---
Name:		clc
Version:	0.01
Release:	4%{?dist}
Summary:	Command-line client for MUDs

Group:		Applications/Internet
License:	Public Domain
URL:		http://github.com/elanthis/clc/tree/master
Source0:	http://cloud.github.com/downloads/elanthis/clc/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libtelnet-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel

%description
Very simplistic MUD client for command line usage.

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="%{optflags} -DHAVE_ZLIB -DCLC_VERSION='\"%{version}\"'"

%install
rm -rf "%{buildroot}"
install -m 644 -D README "%{buildroot}/%{_docdir}/%{name}-%{version}/README"
install -m 755 -D clc "%{buildroot}/%{_bindir}/clc"

%clean
rm -rf "%{buildroot}"

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/clc

%changelog
* Wed Sep 12 2009 Sean Middleditch <sean at middleditch.us> 0.01-4
- Rebuild with the proper tarball.
- Included RPM optflags in build.
- Use buildroot macro instead of RPM_BUILD_ROOT variable.

* Wed Sep 12 2009 Sean Middleditch <sean at middleditch.us> 0.01-3
- Added build-requires on zlib-devel and ncurses-devel.

* Wed Sep 04 2009 Sean Middleditch <sean at middleditch.us> 0.01-2
- Fixed source location.

* Wed Aug 29 2009 Sean Middleditch <sean at middleditch.us> 0.01-1
- Initial RPM release.


--- NEW FILE import.log ---
clc-0_01-4_fc12:F-12:clc-0.01-4.fc12.src.rpm:1253842406


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clc/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:27:24 -0000	1.1
+++ .cvsignore	25 Sep 2009 01:34:57 -0000	1.2
@@ -0,0 +1 @@
+clc-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clc/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:27:24 -0000	1.1
+++ sources	25 Sep 2009 01:34:57 -0000	1.2
@@ -0,0 +1 @@
+b6043dececbaa61e8a3b26a2bda33d38  clc-0.01.tar.gz



From airlied at fedoraproject.org  Fri Sep 25 01:55:53 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 01:55:53 +0000 (UTC)
Subject: rpms/libpciaccess/devel .cvsignore, 1.8,
	1.9 libpciaccess-fd-cache.patch, 1.3, 1.4 libpciaccess.spec,
	1.26, 1.27 sources, 1.10,
	1.11 libpciaccess-0.10.6-no-rom-fallback.patch, 1.1,
	NONE libpciaccess-boot-vga.patch, 1.1,
	NONE libpciaccess-vga-arbiter.patch, 1.5, NONE
Message-ID: <20090925015553.C558C11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30108

Modified Files:
	.cvsignore libpciaccess-fd-cache.patch libpciaccess.spec 
	sources 
Removed Files:
	libpciaccess-0.10.6-no-rom-fallback.patch 
	libpciaccess-boot-vga.patch libpciaccess-vga-arbiter.patch 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 0.10.9-1
- rebase to latest upstream release - drop patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	27 Jul 2009 05:11:39 -0000	1.8
+++ .cvsignore	25 Sep 2009 01:55:53 -0000	1.9
@@ -1 +1 @@
-libpciaccess-0.10.6.tar.bz2
+libpciaccess-0.10.9.tar.bz2

libpciaccess-fd-cache.patch:
 linux_sysfs.c |   89 +++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 35 deletions(-)

Index: libpciaccess-fd-cache.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-fd-cache.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libpciaccess-fd-cache.patch	21 Apr 2009 14:40:05 -0000	1.3
+++ libpciaccess-fd-cache.patch	25 Sep 2009 01:55:53 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up libpciaccess-0.10.5/src/linux_sysfs.c.cache libpciaccess-0.10.5/src/linux_sysfs.c
---- libpciaccess-0.10.5/src/linux_sysfs.c.cache	2008-10-31 11:40:09.000000000 -0400
-+++ libpciaccess-0.10.5/src/linux_sysfs.c	2009-04-21 09:36:38.000000000 -0400
+diff -up libpciaccess-0.10.9/src/linux_sysfs.c.da libpciaccess-0.10.9/src/linux_sysfs.c
+--- libpciaccess-0.10.9/src/linux_sysfs.c.da	2009-09-24 10:06:55.000000000 +1000
++++ libpciaccess-0.10.9/src/linux_sysfs.c	2009-09-25 11:51:21.000000000 +1000
 @@ -57,6 +57,8 @@
  
  static void pci_device_linux_sysfs_enable(struct pci_device *dev);
@@ -10,8 +10,8 @@ diff -up libpciaccess-0.10.5/src/linux_s
  static int pci_device_linux_sysfs_read_rom( struct pci_device * dev,
      void * buffer );
  
-@@ -76,7 +78,7 @@ static int pci_device_linux_sysfs_write(
-     pciaddr_t * bytes_written );
+@@ -79,7 +81,7 @@ static int pci_device_linux_sysfs_boot_v
+ static int pci_device_linux_sysfs_has_kernel_driver(struct pci_device *dev);
  
  static const struct pci_system_methods linux_sysfs_methods = {
 -    .destroy = NULL,
@@ -19,7 +19,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
      .destroy_device = NULL,
      .read_rom = pci_device_linux_sysfs_read_rom,
      .probe = pci_device_linux_sysfs_probe,
-@@ -368,6 +370,53 @@ pci_device_linux_sysfs_read_rom( struct 
+@@ -382,6 +384,53 @@ pci_device_linux_sysfs_read_rom( struct 
      return err;
  }
  
@@ -73,7 +73,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
  
  static int
  pci_device_linux_sysfs_read( struct pci_device * dev, void * data,
-@@ -384,23 +433,9 @@ pci_device_linux_sysfs_read( struct pci_
+@@ -398,23 +447,9 @@ pci_device_linux_sysfs_read( struct pci_
  	*bytes_read = 0;
      }
  
@@ -99,7 +99,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
  
      while ( temp_size > 0 ) {
  	const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset );
-@@ -422,7 +457,6 @@ pci_device_linux_sysfs_read( struct pci_
+@@ -436,7 +471,6 @@ pci_device_linux_sysfs_read( struct pci_
  	*bytes_read = size - temp_size;
      }
  
@@ -107,7 +107,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
      return err;
  }
  
-@@ -442,23 +476,9 @@ pci_device_linux_sysfs_write( struct pci
+@@ -456,23 +490,9 @@ pci_device_linux_sysfs_write( struct pci
  	*bytes_written = 0;
      }
  
@@ -133,7 +133,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
  
      while ( temp_size > 0 ) {
  	const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset );
-@@ -480,7 +500,6 @@ pci_device_linux_sysfs_write( struct pci
+@@ -494,7 +514,6 @@ pci_device_linux_sysfs_write( struct pci
  	*bytes_written = size - temp_size;
      }
  


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libpciaccess.spec	5 Aug 2009 23:48:16 -0000	1.26
+++ libpciaccess.spec	25 Sep 2009 01:55:53 -0000	1.27
@@ -2,8 +2,8 @@
 %define gitrev e392082abb5696c8837224da86cc0af4f21d7010
 
 Name:           libpciaccess
-Version:        0.10.6
-Release:        7%{?dist}
+Version:        0.10.9
+Release:        1%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -19,9 +19,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Patch0:		libpciaccess-fd-cache.patch
 Patch2:		libpciaccess-rom-size.patch
-Patch3:         libpciaccess-boot-vga.patch
-Patch4:		libpciaccess-vga-arbiter.patch
-Patch5:         libpciaccess-0.10.6-no-rom-fallback.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
 Requires:       hwdata
@@ -43,9 +40,6 @@ Development package for libpciaccess.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .cache
 %patch2 -p1 -b .rom-size
-%patch3 -p1 -b .bootvga
-%patch4 -p1 -b .vgaarb
-%patch5 -p1 -b .romfall
 
 %build
 autoreconf -v --install
@@ -76,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 0.10.9-1
+- rebase to latest upstream release - drop patches
+
 * Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 0.10.6-7
 - disable rom reading fallbacks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Jul 2009 05:11:39 -0000	1.10
+++ sources	25 Sep 2009 01:55:53 -0000	1.11
@@ -1 +1 @@
-ba25eb7582f69428648e8c67564d68e5  libpciaccess-0.10.6.tar.bz2
+685cb20e7a6165bc010972f1183addbd  libpciaccess-0.10.9.tar.bz2


--- libpciaccess-0.10.6-no-rom-fallback.patch DELETED ---


--- libpciaccess-boot-vga.patch DELETED ---


--- libpciaccess-vga-arbiter.patch DELETED ---



From airlied at fedoraproject.org  Fri Sep 25 01:58:05 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 01:58:05 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.26, 1.27 libdrm.spec, 1.86,
	1.87 sources, 1.26, 1.27 intel-busy.patch, 1.1,
	NONE radeon-busy.patch, 1.1, NONE
Message-ID: <20090925015805.59A4411C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31048

Modified Files:
	.cvsignore libdrm.spec sources 
Removed Files:
	intel-busy.patch radeon-busy.patch 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.4.14-1
- rebase to latest upstream release - drop carried patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	20 Aug 2009 06:23:05 -0000	1.26
+++ .cvsignore	25 Sep 2009 01:58:04 -0000	1.27
@@ -1 +1 @@
-libdrm-20090820.tar.bz2
+libdrm-2.4.14.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- libdrm.spec	10 Sep 2009 18:02:20 -0000	1.86
+++ libdrm.spec	25 Sep 2009 01:58:04 -0000	1.87
@@ -2,13 +2,13 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.12
-Release: 0.10%{?dist}
+Version: 2.4.14
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-#Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-Source0: %{name}-%{gitdate}.tar.bz2
+Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{gitdate}.tar.bz2
 Source1: make-git-snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,12 +46,11 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-%setup -q -n %{name}-%{gitdate}
-%patch2 -p1 -b .radeon-busy
+#%setup -q -n %{name}-%{gitdate}
+%setup -q 
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .page-flip
-%patch6 -p1 -b .intel-busy
 
 %build
 autoreconf -v --install || exit 1
@@ -111,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.4.14-1
+- rebase to latest upstream release - drop carried patches
+
 * Thu Sep 10 2009 Kristian H?gsberg <krh at redhat.com> - 2.4.12-0.10
 - Pull in intel bo busy.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	20 Aug 2009 06:23:05 -0000	1.26
+++ sources	25 Sep 2009 01:58:05 -0000	1.27
@@ -1 +1 @@
-5809b178402f94c8ae1eadb9c3afdecb  libdrm-20090820.tar.bz2
+e785b6a6ebd6b8a49dd8210cd8742842  libdrm-2.4.14.tar.bz2


--- intel-busy.patch DELETED ---


--- radeon-busy.patch DELETED ---



From airlied at fedoraproject.org  Fri Sep 25 02:03:11 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 02:03:11 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm.spec,1.87,1.88
Message-ID: <20090925020311.CBFA411C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32762

Modified Files:
	libdrm.spec 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.4.14-1
- rebase to latest upstream release - drop carried patches



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- libdrm.spec	25 Sep 2009 01:58:04 -0000	1.87
+++ libdrm.spec	25 Sep 2009 02:03:11 -0000	1.88
@@ -22,14 +22,12 @@ BuildRequires: libudev-devel
 
 Source2: 91-drm-modeset.rules
 
-Patch2: radeon-busy.patch
 # hardcode the 666 instead of 660 for device nodes
 Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
 Patch4: libdrm-2.4.0-no-bc.patch
 
 Patch5: libdrm-page-flip.patch
-Patch6: intel-busy.patch
 
 
 %description



From salimma at fedoraproject.org  Fri Sep 25 02:20:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:20:16 +0000 (UTC)
Subject: rpms/lua-lunit/EL-5 lua-lunit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925022016.73FED11C0418@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	lua-lunit.spec 
Log Message:
lua-lunit: initial import



--- NEW FILE lua-lunit.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-lunit
Version:        0.4
Release:        1%{?dist}
Summary:        Unit testing framework for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://nessie.de/mroth/lunit/index.html
Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# for running tests
BuildRequires:  lua >= %{luaver}
Requires:       lua >= %{luaver}

BuildArch:      noarch

%description
Lunit is a unit testing framework for lua, written in lua.

Lunit provides 26 assert functions, and a few misc functions for usage
in an easy unit testing framework.

Lunit comes with a test suite to test itself. The testsuite consists
of approximately 710 assertions.


%prep
%setup -q -n lunit-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p lunit $RPM_BUILD_ROOT%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lunit{,-console}.lua $RPM_BUILD_ROOT%{luapkgdir}


%check
./lunit lunit-tests.lua | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE ANNOUNCE CHANGES DOCUMENTATION README* example.lua
%{_bindir}/lunit
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:36:53 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:20:15 -0000	1.2
@@ -0,0 +1 @@
+lunit-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:36:54 -0000	1.1
+++ sources	25 Sep 2009 02:20:16 -0000	1.2
@@ -0,0 +1 @@
+808a743c5594f6491588b42c56262cf9  lunit-0.4.tar.gz



From salimma at fedoraproject.org  Fri Sep 25 02:20:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:20:16 +0000 (UTC)
Subject: rpms/lua-lunit/F-10 lua-lunit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925022016.A604011C0418@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	lua-lunit.spec 
Log Message:
lua-lunit: initial import



--- NEW FILE lua-lunit.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-lunit
Version:        0.4
Release:        1%{?dist}
Summary:        Unit testing framework for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://nessie.de/mroth/lunit/index.html
Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# for running tests
BuildRequires:  lua >= %{luaver}
Requires:       lua >= %{luaver}

BuildArch:      noarch

%description
Lunit is a unit testing framework for lua, written in lua.

Lunit provides 26 assert functions, and a few misc functions for usage
in an easy unit testing framework.

Lunit comes with a test suite to test itself. The testsuite consists
of approximately 710 assertions.


%prep
%setup -q -n lunit-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p lunit $RPM_BUILD_ROOT%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lunit{,-console}.lua $RPM_BUILD_ROOT%{luapkgdir}


%check
./lunit lunit-tests.lua | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE ANNOUNCE CHANGES DOCUMENTATION README* example.lua
%{_bindir}/lunit
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:36:53 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:20:16 -0000	1.2
@@ -0,0 +1 @@
+lunit-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:36:54 -0000	1.1
+++ sources	25 Sep 2009 02:20:16 -0000	1.2
@@ -0,0 +1 @@
+808a743c5594f6491588b42c56262cf9  lunit-0.4.tar.gz



From salimma at fedoraproject.org  Fri Sep 25 02:20:17 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:20:17 +0000 (UTC)
Subject: rpms/lua-lunit/devel lua-lunit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925022017.2732811C0418@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lua-lunit.spec 
Log Message:
lua-lunit: initial import



--- NEW FILE lua-lunit.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-lunit
Version:        0.4
Release:        1%{?dist}
Summary:        Unit testing framework for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://nessie.de/mroth/lunit/index.html
Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# for running tests
BuildRequires:  lua >= %{luaver}
Requires:       lua >= %{luaver}

BuildArch:      noarch

%description
Lunit is a unit testing framework for lua, written in lua.

Lunit provides 26 assert functions, and a few misc functions for usage
in an easy unit testing framework.

Lunit comes with a test suite to test itself. The testsuite consists
of approximately 710 assertions.


%prep
%setup -q -n lunit-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p lunit $RPM_BUILD_ROOT%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lunit{,-console}.lua $RPM_BUILD_ROOT%{luapkgdir}


%check
./lunit lunit-tests.lua | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE ANNOUNCE CHANGES DOCUMENTATION README* example.lua
%{_bindir}/lunit
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:36:53 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:20:16 -0000	1.2
@@ -0,0 +1 @@
+lunit-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:36:54 -0000	1.1
+++ sources	25 Sep 2009 02:20:17 -0000	1.2
@@ -0,0 +1 @@
+808a743c5594f6491588b42c56262cf9  lunit-0.4.tar.gz



From salimma at fedoraproject.org  Fri Sep 25 02:20:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:20:16 +0000 (UTC)
Subject: rpms/lua-lunit/F-11 lua-lunit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925022016.E408411C0418@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	lua-lunit.spec 
Log Message:
lua-lunit: initial import



--- NEW FILE lua-lunit.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-lunit
Version:        0.4
Release:        1%{?dist}
Summary:        Unit testing framework for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://nessie.de/mroth/lunit/index.html
Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# for running tests
BuildRequires:  lua >= %{luaver}
Requires:       lua >= %{luaver}

BuildArch:      noarch

%description
Lunit is a unit testing framework for lua, written in lua.

Lunit provides 26 assert functions, and a few misc functions for usage
in an easy unit testing framework.

Lunit comes with a test suite to test itself. The testsuite consists
of approximately 710 assertions.


%prep
%setup -q -n lunit-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p lunit $RPM_BUILD_ROOT%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lunit{,-console}.lua $RPM_BUILD_ROOT%{luapkgdir}


%check
./lunit lunit-tests.lua | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE ANNOUNCE CHANGES DOCUMENTATION README* example.lua
%{_bindir}/lunit
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:36:53 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:20:16 -0000	1.2
@@ -0,0 +1 @@
+lunit-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:36:54 -0000	1.1
+++ sources	25 Sep 2009 02:20:16 -0000	1.2
@@ -0,0 +1 @@
+808a743c5594f6491588b42c56262cf9  lunit-0.4.tar.gz



From mclasen at fedoraproject.org  Fri Sep 25 02:41:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 02:41:13 +0000 (UTC)
Subject: rpms/redhat-menus/devel .cvsignore, 1.46, 1.47 redhat-menus.spec,
	1.104, 1.105 sources, 1.49, 1.50
Message-ID: <20090925024113.2BA7511C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/redhat-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11773

Modified Files:
	.cvsignore redhat-menus.spec sources 
Log Message:
update for new translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	10 Nov 2008 18:40:00 -0000	1.46
+++ .cvsignore	25 Sep 2009 02:41:12 -0000	1.47
@@ -1 +1 @@
-redhat-menus-10.0.1.tar.gz
+redhat-menus-12.0.1.tar.gz


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- redhat-menus.spec	27 Jul 2009 02:55:08 -0000	1.104
+++ redhat-menus.spec	25 Sep 2009 02:41:12 -0000	1.105
@@ -3,13 +3,13 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 10.0.1
-Release: 4%{?dist}
+Version: 12.0.1
+Release: 1%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 License: GPL+
 Group: User Interface/Desktops
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: intltool automake autoconf libtool
@@ -24,34 +24,15 @@ Conflicts: redhat-artwork < 0.35
 ## old evolution packages point to a no-longer-existing symlink
 Conflicts: evolution <= 2.4.1-5
 
-Patch0: redhat-menus-8.9.11-evolution.patch
-Patch1: redhat-menus-8.9.11-pirut.patch
-# directory files got renamed in gnome-menus for silly reasons
-Patch2: redhat-menus-8.9.11-directory-rename.patch
-Patch3: icon-names.patch
-Patch4: nono.patch
-Patch5: redhat-menus-no-submenus.patch
-Patch6: redhat-menus-preferences-categories.patch
-
 %description
-
-This package contains the XML files that describe the menu layout for 
-GNOME and KDE, and the .desktop files that define the names and icons 
+This package contains the XML files that describe the menu layout for
+GNOME and KDE, and the .desktop files that define the names and icons
 of "subdirectories" in the menus.
 
 %prep
 %setup -q
-%patch0 -p1 -b .evolution
-%patch1 -p1 -b .pirut
-%patch2 -p1 -b .directory-rename
-%patch3 -p1 -b .icon-names
-%patch4 -p1 -b .nono
-%patch5 -p1 -b .no-submenus
-%patch6 -p1 -b .preferences-categories
 
 %build
-intltoolize --force
-autoconf
 %configure
 make
 
@@ -62,9 +43,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{gettext_package}
 
-# this is in gnome-menus now
-rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/System.directory
-
 # create the settings-merged to prevent gamin from looking for it
 # in a loop
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/settings-merged ||:
@@ -91,6 +69,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 12.0.1-1
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Nov 2008 18:40:01 -0000	1.49
+++ sources	25 Sep 2009 02:41:12 -0000	1.50
@@ -1 +1 @@
-5f3423490c584cbafa694bbafcdeaa2f  redhat-menus-10.0.1.tar.gz
+a9fd0988b33d7dc9ea046c774b46a795  redhat-menus-12.0.1.tar.gz



From salimma at fedoraproject.org  Fri Sep 25 02:57:40 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:57:40 +0000 (UTC)
Subject: rpms/lua-json/EL-5 lua-json.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925025740.9738611C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-json/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16428/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	lua-json.spec 
Log Message:
lua-json: initial import



--- NEW FILE lua-json.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-json
Version:        1.0
Release:        1%{?dist}
Summary:        JSON Parser/Constructor for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://luaforge.net/projects/luajson/
Source0:        http://luaforge.net/frs/download.php/4105/luajson-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  lua >= %{luaver}, lua-lpeg >= 0.8.1
# for checks
BuildRequires:  lua-filesystem >= 1.4.1, lua-lunit >= 0.4
Requires:       lua >= %{luaver}, lua-lpeg >= 0.8.1

BuildArch:      noarch

%description
LuaJSON is a customizable JSON decoder/encoder, using LPEG for parsing.


%prep
%setup -q -n luajson-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lua/* $RPM_BUILD_ROOT%{luapkgdir}


%check
make check-regression
make check-unit | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE docs/LuaJSON.txt docs/ReleaseNotes-1.0.txt
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:37:35 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:57:40 -0000	1.2
@@ -0,0 +1 @@
+luajson-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:37:35 -0000	1.1
+++ sources	25 Sep 2009 02:57:40 -0000	1.2
@@ -0,0 +1 @@
+0e3ee192f93d40c4947e828668828e91  luajson-1.0.tar.bz2



From salimma at fedoraproject.org  Fri Sep 25 02:57:40 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:57:40 +0000 (UTC)
Subject: rpms/lua-json/F-10 lua-json.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925025740.D87FB11C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-json/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16428/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	lua-json.spec 
Log Message:
lua-json: initial import



--- NEW FILE lua-json.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-json
Version:        1.0
Release:        1%{?dist}
Summary:        JSON Parser/Constructor for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://luaforge.net/projects/luajson/
Source0:        http://luaforge.net/frs/download.php/4105/luajson-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  lua >= %{luaver}, lua-lpeg >= 0.8.1
# for checks
BuildRequires:  lua-filesystem >= 1.4.1, lua-lunit >= 0.4
Requires:       lua >= %{luaver}, lua-lpeg >= 0.8.1

BuildArch:      noarch

%description
LuaJSON is a customizable JSON decoder/encoder, using LPEG for parsing.


%prep
%setup -q -n luajson-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lua/* $RPM_BUILD_ROOT%{luapkgdir}


%check
make check-regression
make check-unit | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE docs/LuaJSON.txt docs/ReleaseNotes-1.0.txt
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:37:35 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:57:40 -0000	1.2
@@ -0,0 +1 @@
+luajson-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:37:35 -0000	1.1
+++ sources	25 Sep 2009 02:57:40 -0000	1.2
@@ -0,0 +1 @@
+0e3ee192f93d40c4947e828668828e91  luajson-1.0.tar.bz2



From salimma at fedoraproject.org  Fri Sep 25 02:57:41 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:57:41 +0000 (UTC)
Subject: rpms/lua-json/F-11 lua-json.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925025741.25B4711C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-json/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16428/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	lua-json.spec 
Log Message:
lua-json: initial import



--- NEW FILE lua-json.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-json
Version:        1.0
Release:        1%{?dist}
Summary:        JSON Parser/Constructor for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://luaforge.net/projects/luajson/
Source0:        http://luaforge.net/frs/download.php/4105/luajson-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  lua >= %{luaver}, lua-lpeg >= 0.8.1
# for checks
BuildRequires:  lua-filesystem >= 1.4.1, lua-lunit >= 0.4
Requires:       lua >= %{luaver}, lua-lpeg >= 0.8.1

BuildArch:      noarch

%description
LuaJSON is a customizable JSON decoder/encoder, using LPEG for parsing.


%prep
%setup -q -n luajson-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lua/* $RPM_BUILD_ROOT%{luapkgdir}


%check
make check-regression
make check-unit | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE docs/LuaJSON.txt docs/ReleaseNotes-1.0.txt
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:37:35 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:57:40 -0000	1.2
@@ -0,0 +1 @@
+luajson-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:37:35 -0000	1.1
+++ sources	25 Sep 2009 02:57:40 -0000	1.2
@@ -0,0 +1 @@
+0e3ee192f93d40c4947e828668828e91  luajson-1.0.tar.bz2



From salimma at fedoraproject.org  Fri Sep 25 02:57:41 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 25 Sep 2009 02:57:41 +0000 (UTC)
Subject: rpms/lua-json/devel lua-json.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925025741.66CF211C00DB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16428/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lua-json.spec 
Log Message:
lua-json: initial import



--- NEW FILE lua-json.spec ---
%define luaver 5.1
%define luapkgdir %{_datadir}/lua/%{luaver}

Name:           lua-json
Version:        1.0
Release:        1%{?dist}
Summary:        JSON Parser/Constructor for Lua

Group:          Development/Libraries
License:        MIT
URL:            http://luaforge.net/projects/luajson/
Source0:        http://luaforge.net/frs/download.php/4105/luajson-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  lua >= %{luaver}, lua-lpeg >= 0.8.1
# for checks
BuildRequires:  lua-filesystem >= 1.4.1, lua-lunit >= 0.4
Requires:       lua >= %{luaver}, lua-lpeg >= 0.8.1

BuildArch:      noarch

%description
LuaJSON is a customizable JSON decoder/encoder, using LPEG for parsing.


%prep
%setup -q -n luajson-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
cp -pr lua/* $RPM_BUILD_ROOT%{luapkgdir}


%check
make check-regression
make check-unit | tee testlog.txt
grep -q "0 failed, 0 errors" testlog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE docs/LuaJSON.txt docs/ReleaseNotes-1.0.txt
%{luapkgdir}/*


%changelog
* Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 04:37:35 -0000	1.1
+++ .cvsignore	25 Sep 2009 02:57:41 -0000	1.2
@@ -0,0 +1 @@
+luajson-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-json/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 04:37:35 -0000	1.1
+++ sources	25 Sep 2009 02:57:41 -0000	1.2
@@ -0,0 +1 @@
+0e3ee192f93d40c4947e828668828e91  luajson-1.0.tar.bz2



From dwalsh at fedoraproject.org  Fri Sep 25 03:09:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 25 Sep 2009 03:09:52 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 policycoreutils-F11.patch, 1.4,
	1.5 policycoreutils.spec, 1.620, 1.621
Message-ID: <20090925030952.E6E0D11C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20332

Modified Files:
	policycoreutils-F11.patch policycoreutils.spec 
Log Message:
* Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.14
- Fix tight loop in restorecond patch from Martin Orr


policycoreutils-F11.patch:
 restorecond/restorecond.c |   29 +++++----
 scripts/Makefile          |    3 
 scripts/fixfiles          |    2 
 scripts/sandbox           |  139 ++++++++++++++++++++++++++++++++++++++++++++++
 scripts/sandbox.8         |   22 +++++++
 5 files changed, 180 insertions(+), 15 deletions(-)

Index: policycoreutils-F11.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-F11.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- policycoreutils-F11.patch	1 Jun 2009 10:38:26 -0000	1.4
+++ policycoreutils-F11.patch	25 Sep 2009 03:09:52 -0000	1.5
@@ -1,6 +1,47 @@
+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 13:45:01.000000000 -0800
++++ policycoreutils-2.0.62/restorecond/restorecond.c	2009-09-24 20:03:16.000000000 -0700
+@@ -315,21 +315,24 @@
+ 			printf("wd=%d mask=%u cookie=%u len=%u\n",
+ 			       event->wd, event->mask,
+ 			       event->cookie, event->len);
+-		if (event->wd == master_wd)
+-			read_config(fd);
+-		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 */
++		if (event->mask & ~IN_IGNORED) {
++			if (event->wd == master_wd)
+ 				read_config(fd);
+-				break;
+-
+-			default:	/* No users logged in or out */
+-				break;
++			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;
++				}
+ 			}
+ 		}
+ 
 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-05-22 14:10:01.000000000 -0400
-+++ policycoreutils-2.0.62/scripts/fixfiles	2009-06-01 06:37:19.000000000 -0400
+--- nsapolicycoreutils/scripts/fixfiles	2009-05-22 11:10:01.000000000 -0700
++++ policycoreutils-2.0.62/scripts/fixfiles	2009-07-14 09:08:10.000000000 -0700
 @@ -129,7 +129,7 @@
  if [ ! -z "$FILEPATH" ]; then
      if [ -x /usr/bin/find ]; then
@@ -11,8 +52,8 @@ diff --exclude-from=exclude --exclude=se
      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/scripts/Makefile policycoreutils-2.0.62/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2009-02-18 16:45:01.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/Makefile	2009-05-22 14:11:06.000000000 -0400
+--- nsapolicycoreutils/scripts/Makefile	2009-02-18 13:45:01.000000000 -0800
++++ policycoreutils-2.0.62/scripts/Makefile	2009-07-14 09:08:10.000000000 -0700
 @@ -5,11 +5,12 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -28,8 +69,8 @@ diff --exclude-from=exclude --exclude=se
  	install -m 755 genhomedircon  $(SBINDIR)
  	-mkdir -p $(MANDIR)/man8
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.62/scripts/sandbox
---- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/sandbox	2009-06-01 06:31:39.000000000 -0400
+--- nsapolicycoreutils/scripts/sandbox	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.62/scripts/sandbox	2009-07-14 09:08:10.000000000 -0700
 @@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
@@ -171,8 +212,8 @@ diff --exclude-from=exclude --exclude=se
 +        
 +    sys.exit(rc)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.62/scripts/sandbox.8
---- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/sandbox.8	2009-05-22 14:11:10.000000000 -0400
+--- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 16:00:00.000000000 -0800
++++ policycoreutils-2.0.62/scripts/sandbox.8	2009-07-14 09:08:10.000000000 -0700
 @@ -0,0 +1,22 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -p -r1.620 -r1.621
--- policycoreutils.spec	23 Sep 2009 10:59:41 -0000	1.620
+++ policycoreutils.spec	25 Sep 2009 03:09:52 -0000	1.621
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 12.13%{?dist}
+Release: 12.14%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -225,6 +225,9 @@ else
 fi
 
 %changelog
+* Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.14
+- Fix tight loop in restorecond patch from Martin Orr
+
 * Wed Sep 23 2009 Miroslav Grepl <mgrepl at redhat.com> 2.0.62-12.13
 - Fix for setfiles leaks descriptors from Steve Grubb
 



From pkgdb at fedoraproject.org  Fri Sep 25 03:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:27:55 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032755.E751910F87C@bastion2.fedora.phx.redhat.com>

mdomsch has set the commit acl on cim-schema (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:27:58 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032758.5655910F897@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchcommits acl on cim-schema (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:27:59 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032801.3872F10F89E@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchbugzilla acl on cim-schema (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:02 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032802.31AE010F8A2@bastion2.fedora.phx.redhat.com>

mdomsch has set the approveacls acl on cim-schema (Fedora devel) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:05 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032806.8D33D10F8A8@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchbugzilla acl on cim-schema (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:08 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032808.27B7D10F8AB@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchcommits acl on cim-schema (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:09 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032809.9FEFA10F8B1@bastion2.fedora.phx.redhat.com>

mdomsch has set the approveacls acl on cim-schema (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:11 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032811.6C09F10F8B6@bastion2.fedora.phx.redhat.com>

mdomsch has set the commit acl on cim-schema (Fedora 11) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:14 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032814.DBDD310F8BC@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchbugzilla acl on cim-schema (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:15 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032816.5E89410F8C1@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchcommits acl on cim-schema (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:17 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032817.B490F10F8C6@bastion2.fedora.phx.redhat.com>

mdomsch has set the commit acl on cim-schema (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:16 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032817.F10B210F8CC@bastion2.fedora.phx.redhat.com>

mdomsch has set the approveacls acl on cim-schema (Fedora 10) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:22 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032822.89ABB10F8CD@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchbugzilla acl on cim-schema (Fedora EPEL 5) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:24 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032824.54E5C10F8D2@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchcommits acl on cim-schema (Fedora EPEL 5) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:25 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032825.ADA8A10F8D8@bastion2.fedora.phx.redhat.com>

mdomsch has set the commit acl on cim-schema (Fedora EPEL 5) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:25 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032827.29C2C10F8DD@bastion2.fedora.phx.redhat.com>

mdomsch has set the approveacls acl on cim-schema (Fedora EPEL 5) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:30 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032830.6AA6410F8DE@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchbugzilla acl on cim-schema (Fedora EPEL 4) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:31 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032832.17BCB10F8EB@bastion2.fedora.phx.redhat.com>

mdomsch has set the watchcommits acl on cim-schema (Fedora EPEL 4) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:32 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032832.B5D8810F8FA@bastion2.fedora.phx.redhat.com>

mdomsch has set the commit acl on cim-schema (Fedora EPEL 4) to Obsolete for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:35 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032835.A918710F900@bastion2.fedora.phx.redhat.com>

mdomsch has set the commit acl on cim-schema (Fedora EPEL 4) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 03:28:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 03:28:38 +0000
Subject: [pkgdb] cim-schema had acl change status
Message-ID: <20090925032838.330C210F905@bastion2.fedora.phx.redhat.com>

mdomsch has set the approveacls acl on cim-schema (Fedora EPEL 4) to Approved for praveenp

To make changes to this package see:
   https://admin.fedoraproject.org/packages/name/cim-schema



From airlied at fedoraproject.org  Fri Sep 25 03:43:53 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 03:43:53 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.58, 1.59 drm-vga-arb.patch,
	1.7, 1.8 kernel.spec, 1.1828, 1.1829 drm-edid-fixes.patch, 1.1,
	NONE drm-next.patch, 1.18, NONE
Message-ID: <20090925034353.A92F411C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29216

Modified Files:
	drm-nouveau.patch drm-vga-arb.patch kernel.spec 
Removed Files:
	drm-edid-fixes.patch drm-next.patch 
Log Message:
* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
- drm-next update - fix r600 s/r, and command line mode picking and r600 tv


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  127 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5476 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  540 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  754 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  437 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1262 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  357 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  833 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  848 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  296 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  585 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  178 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  950 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  688 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  789 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  224 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2238 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  809 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  479 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  450 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58650 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- drm-nouveau.patch	21 Sep 2009 05:38:42 -0000	1.58
+++ drm-nouveau.patch	25 Sep 2009 03:43:51 -0000	1.59
@@ -9732,7 +9732,7 @@ index 0000000..681a761
 +		    mode->vdisplay <= native->vdisplay) {
 +			m = drm_cvt_mode(dev, mode->hdisplay, mode->vdisplay,
 +					 drm_mode_vrefresh(native), false,
-+					 false);
++					 false, false);
 +			if (!m)
 +				continue;
 +
@@ -12872,7 +12872,7 @@ index 0000000..3397a88
 +static int
 +nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
 +		     uint32_t fb_height, uint32_t surface_width,
-+		     uint32_t surface_height, struct drm_framebuffer **pfb)
++		     uint32_t surface_height, uint32_t surface_depth, uint32_t surface_bpp, struct drm_framebuffer **pfb)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct fb_info *info;
@@ -26940,7 +26940,7 @@ index 0000000..051da27
 +		} else {
 +			mode = drm_cvt_mode(encoder->dev, modes[i].hdisplay,
 +				modes[i].vdisplay, 60, false,
-+				output_mode->flags & DRM_MODE_FLAG_INTERLACE);
++				output_mode->flags & DRM_MODE_FLAG_INTERLACE, false);
 +		}
 +
 +		/* CVT modes are sometimes unsuitable... */

drm-vga-arb.patch:
 drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h        |    1 +
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600d.h         |    1 +
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   21 ++++++++++++++++++++-
 include/drm/drmP.h                     |    4 +++-
 13 files changed, 133 insertions(+), 2 deletions(-)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-vga-arb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drm-vga-arb.patch	8 Sep 2009 04:03:56 -0000	1.7
+++ drm-vga-arb.patch	25 Sep 2009 03:43:52 -0000	1.8
@@ -1,8 +1,18 @@
-From ba0d10c754ca30de35063a5e14c92bb7328a9f32 Mon Sep 17 00:00:00 2001
+From 28d520433b6375740990ab99d69b0d0067fd656b Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
-Date: Tue, 8 Sep 2009 13:54:31 +1000
-Subject: [PATCH] drm-vga-arb.patch
+Date: Mon, 21 Sep 2009 14:33:58 +1000
+Subject: [PATCH] drm/vgaarb: add VGA arbitration support to the drm and kms.
 
+VGA arb requires DRM support for non-kms drivers, to turn on/off
+irqs when disabling the mem/io regions.
+
+VGA arb requires KMS support for GPUs where we can turn off VGA
+decoding. Currently we know how to do this for intel and radeon
+kms drivers, which allows them to be removed from the arbiter.
+
+This patch comes from Fedora rawhide kernel.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
 ---
  drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
  drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
@@ -15,9 +25,9 @@ Subject: [PATCH] drm-vga-arb.patch
  drivers/gpu/drm/radeon/r600d.h         |    1 +
  drivers/gpu/drm/radeon/radeon.h        |    2 ++
  drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
- drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
+ drivers/gpu/drm/radeon/radeon_device.c |   21 ++++++++++++++++++++-
  include/drm/drmP.h                     |    3 +++
- 13 files changed, 132 insertions(+), 0 deletions(-)
+ 13 files changed, 133 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
 index f85aaf2..0a6f0b3 100644
@@ -190,10 +200,10 @@ index b9e47f1..3a0004f 100644
 +
  #endif /* __INTEL_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index 5708c07..386ddbc 100644
+index 737970b..be51c5f 100644
 --- a/drivers/gpu/drm/radeon/r100.c
 +++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1916,6 +1916,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
+@@ -1955,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -215,11 +225,11 @@ index 5708c07..386ddbc 100644
  {
  	r100_vram_get_type(rdev);
 diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index d8fcef4..3417dff 100644
+index 5f42fad..eab31c1 100644
 --- a/drivers/gpu/drm/radeon/r600.c
 +++ b/drivers/gpu/drm/radeon/r600.c
-@@ -1444,6 +1444,20 @@ bool r600_card_posted(struct radeon_device *rdev)
- 	return false;
+@@ -1499,6 +1499,20 @@ int r600_startup(struct radeon_device *rdev)
+ 	return 0;
  }
  
 +void r600_vga_set_state(struct radeon_device *rdev, bool state)
@@ -252,10 +262,10 @@ index 723295f..4a9028a 100644
  #define	CP_COHER_BASE					0x85F8
  #define	CP_DEBUG					0xC1FC
 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 3299733..98a0c7f 100644
+index 817af8e..c839b60 100644
 --- a/drivers/gpu/drm/radeon/radeon.h
 +++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -592,6 +592,7 @@ struct radeon_asic {
+@@ -596,6 +596,7 @@ struct radeon_asic {
  	int (*suspend)(struct radeon_device *rdev);
  	void (*errata)(struct radeon_device *rdev);
  	void (*vram_info)(struct radeon_device *rdev);
@@ -263,7 +273,7 @@ index 3299733..98a0c7f 100644
  	int (*gpu_reset)(struct radeon_device *rdev);
  	int (*mc_init)(struct radeon_device *rdev);
  	void (*mc_fini)(struct radeon_device *rdev);
-@@ -901,6 +902,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
+@@ -954,6 +955,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
  #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
  #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
  #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
@@ -272,7 +282,7 @@ index 3299733..98a0c7f 100644
  #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
  #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
 diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index e87bb91..fd18cd6 100644
+index 5f2a9e6..8968f78 100644
 --- a/drivers/gpu/drm/radeon/radeon_asic.h
 +++ b/drivers/gpu/drm/radeon/radeon_asic.h
 @@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
@@ -283,7 +293,7 @@ index e87bb91..fd18cd6 100644
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -87,6 +88,7 @@ static struct radeon_asic r100_asic = {
+@@ -89,6 +90,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -291,7 +301,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -152,6 +154,7 @@ static struct radeon_asic r300_asic = {
+@@ -158,6 +160,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -299,15 +309,15 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -197,6 +200,7 @@ static struct radeon_asic r420_asic = {
- 	.init = &r300_init,
- 	.errata = &r420_errata,
- 	.vram_info = &r420_vram_info,
+@@ -208,6 +211,7 @@ static struct radeon_asic r420_asic = {
+ 	.resume = &r420_resume,
+ 	.errata = NULL,
+ 	.vram_info = NULL,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &r420_mc_init,
- 	.mc_fini = &r420_mc_fini,
-@@ -249,6 +253,7 @@ static struct radeon_asic rs400_asic = {
+ 	.mc_init = NULL,
+ 	.mc_fini = NULL,
+@@ -262,6 +266,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -315,7 +325,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -306,6 +311,7 @@ static struct radeon_asic rs600_asic = {
+@@ -323,6 +328,7 @@ static struct radeon_asic rs600_asic = {
  	.init = &rs600_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
@@ -323,7 +333,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -353,6 +359,7 @@ static struct radeon_asic rs690_asic = {
+@@ -372,6 +378,7 @@ static struct radeon_asic rs690_asic = {
  	.init = &rs600_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
@@ -331,7 +341,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -407,6 +414,7 @@ static struct radeon_asic rv515_asic = {
+@@ -428,6 +435,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -339,7 +349,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -454,6 +462,7 @@ static struct radeon_asic r520_asic = {
+@@ -477,6 +485,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -347,7 +357,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-@@ -495,6 +504,7 @@ int r600_init(struct radeon_device *rdev);
+@@ -520,6 +529,7 @@ int r600_init(struct radeon_device *rdev);
  void r600_fini(struct radeon_device *rdev);
  int r600_suspend(struct radeon_device *rdev);
  int r600_resume(struct radeon_device *rdev);
@@ -355,7 +365,7 @@ index e87bb91..fd18cd6 100644
  int r600_wb_init(struct radeon_device *rdev);
  void r600_wb_fini(struct radeon_device *rdev);
  void r600_cp_commit(struct radeon_device *rdev);
-@@ -531,6 +541,7 @@ static struct radeon_asic r600_asic = {
+@@ -556,6 +566,7 @@ static struct radeon_asic r600_asic = {
  	.resume = &r600_resume,
  	.cp_commit = &r600_cp_commit,
  	.vram_info = NULL,
@@ -363,7 +373,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r600_gpu_reset,
  	.mc_init = NULL,
  	.mc_fini = NULL,
-@@ -581,6 +592,7 @@ static struct radeon_asic rv770_asic = {
+@@ -606,6 +617,7 @@ static struct radeon_asic rv770_asic = {
  	.cp_commit = &r600_cp_commit,
  	.vram_info = NULL,
  	.gpu_reset = &rv770_gpu_reset,
@@ -372,7 +382,7 @@ index e87bb91..fd18cd6 100644
  	.mc_fini = NULL,
  	.wb_init = &r600_wb_init,
 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index f2469c5..764d2f8 100644
+index 8a40c61..daf5db7 100644
 --- a/drivers/gpu/drm/radeon/radeon_device.c
 +++ b/drivers/gpu/drm/radeon/radeon_device.c
 @@ -29,6 +29,7 @@
@@ -383,9 +393,9 @@ index f2469c5..764d2f8 100644
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
- int radeon_modeset_init(struct radeon_device *rdev);
- void radeon_modeset_fini(struct radeon_device *rdev);
+@@ -480,7 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
+ {
+ }
  
 +/* if we get transitioned to only one device, tak VGA back */
 +static unsigned int radeon_vga_set_decode(void *cookie, bool state)
@@ -402,20 +412,29 @@ index f2469c5..764d2f8 100644
  /*
   * Radeon device.
   */
-@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -578,6 +590,13 @@ int radeon_device_init(struct radeon_device *rdev,
+ 	if (r) {
+ 		return r;
+ 	}
++
++	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
++	r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
++	if (r) {
++		return -EINVAL;
++	}
++
+ 	if (!rdev->new_init_path) {
+ 		/* Setup errata flags */
+ 		radeon_errata(rdev);
+@@ -586,7 +605,6 @@ int radeon_device_init(struct radeon_device *rdev,
  		/* Initialize surface registers */
  		radeon_surface_init(rdev);
  
-+		/* if we have > 1 VGA cards, then disable the radeon VGA resources */
-+		ret = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-+		if (ret) {
-+			return -EINVAL;
-+		}
-+
- 		/* TODO: disable VGA need to use VGA request */
+-		/* TODO: disable VGA need to use VGA request */
  		/* BIOS*/
  		if (!radeon_get_bios(rdev)) {
-@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_device *rdev)
+ 			if (ASIC_IS_AVIVO(rdev))
+@@ -697,6 +715,7 @@ void radeon_device_fini(struct radeon_device *rdev)
  		radeon_agp_fini(rdev);
  #endif
  		radeon_irq_kms_fini(rdev);
@@ -438,5 +457,5 @@ index eeefb63..c8e64bb 100644
  	struct vm_operations_struct *gem_vm_ops;
  
 -- 
-1.6.0.6
+1.6.4.2
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1828
retrieving revision 1.1829
diff -u -p -r1.1828 -r1.1829
--- kernel.spec	24 Sep 2009 19:48:11 -0000	1.1828
+++ kernel.spec	25 Sep 2009 03:43:53 -0000	1.1829
@@ -696,7 +696,7 @@ Patch1578: linux-2.6-xen-stack-protector
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next.patch
+Patch1812: drm-next-31edd4824e.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -705,7 +705,6 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
-Patch1827: drm-edid-fixes.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1362,7 +1361,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
+ApplyPatch drm-next-31edd4824e.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1373,7 +1372,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
-ApplyPatch drm-edid-fixes.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2061,6 +2059,9 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
+- drm-next update - fix r600 s/r, and command line mode picking and r600 tv
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-41
 - Linux 2.6.31.1
 - Drop patches merged upstream:


--- drm-edid-fixes.patch DELETED ---


--- drm-next.patch DELETED ---



From airlied at fedoraproject.org  Fri Sep 25 03:52:38 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 03:52:38 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-31edd4824e.patch,NONE,1.1
Message-ID: <20090925035238.63C7F11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31215

Added Files:
	drm-next-31edd4824e.patch 
Log Message:
* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
- drm-next update - fix r600 s/r, and command line mode picking and r600 tv


drm-next-31edd4824e.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  298 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  929 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  742 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  105 
 b/drivers/gpu/drm/radeon/avivod.h                 |   69 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1290 -
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  607 
 b/drivers/gpu/drm/radeon/r200.c                   |  455 
 b/drivers/gpu/drm/radeon/r300.c                   |  687 
 b/drivers/gpu/drm/radeon/r300d.h                  |  101 
 b/drivers/gpu/drm/radeon/r420.c                   |  301 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r520.c                   |    6 
 b/drivers/gpu/drm/radeon/r600.c                   | 1788 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  850 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  657 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  357 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  228 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  509 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  106 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  404 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  101 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  137 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  682 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   85 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  368 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   74 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |   56 
 b/drivers/gpu/drm/radeon/rs600.c                  |  106 
 b/drivers/gpu/drm/radeon/rs690.c                  |    4 
 b/drivers/gpu/drm/radeon/rv515.c                  |  524 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1050 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  106 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 169 files changed, 36743 insertions(+), 42238 deletions(-)

--- NEW FILE drm-next-31edd4824e.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..8e7b0eb 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...86264 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */



From airlied at fedoraproject.org  Fri Sep 25 03:54:07 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 03:54:07 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1829,1.1830
Message-ID: <20090925035407.7C03A11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31800

Modified Files:
	kernel.spec 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-44
- bump a extra one because I accidentially CVS.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1829
retrieving revision 1.1830
diff -u -p -r1.1829 -r1.1830
--- kernel.spec	25 Sep 2009 03:43:53 -0000	1.1829
+++ kernel.spec	25 Sep 2009 03:54:06 -0000	1.1830
@@ -2059,6 +2059,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-44
+- bump a extra one because I accidentially CVS.
+
 * Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
 - drm-next update - fix r600 s/r, and command line mode picking and r600 tv
 



From cebbert at fedoraproject.org  Fri Sep 25 04:12:11 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 25 Sep 2009 04:12:11 +0000 (UTC)
Subject: rpms/kernel/F-11 hostap-revert-toxic-part-of-conversion.patch, NONE,
	1.1 kernel.spec, 1.1740, 1.1741
Message-ID: <20090925041211.C783911C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27988

Modified Files:
	kernel.spec 
Added Files:
	hostap-revert-toxic-part-of-conversion.patch 
Log Message:
Fix breakage in hostap driver (#522269)

hostap-revert-toxic-part-of-conversion.patch:
 hostap_main.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hostap-revert-toxic-part-of-conversion.patch ---
From: Martin Decky <martin at decky.cz>
Date: Thu, 10 Sep 2009 01:44:47 +0000 (+0200)
Subject: hostap: Revert a toxic part of the conversion to net_device_ops
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e484c16f6212f7f06407382efa4d3ad214b6c589

hostap: Revert a toxic part of the conversion to net_device_ops

As the hostap driver was converted to use net_device_ops, a mistake was
made in hostap_main.c (commit 5ae4efbcd2611562a8b93596be034e63495706a5).
Originally, the tx_queue_len was set to 0 for every other interface than
HOSTAP_INTERFACE_MASTER, but the new fragment of code sets tx_queue_len to
0 only for HOSTAP_INTERFACE_MASTER. The opposite of the previous
behavior makes the driver to drop all packets in AP mode.

Change the way 0 is assigned to tx_queue_len according to the original
logic.

Signed-off-by: Martin Decky <martin at decky.cz>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---

diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 6fe122f..eb57d1e 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
 
 	switch(type) {
 	case HOSTAP_INTERFACE_AP:
+		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_mgmt_netdev_ops;
 		dev->type = ARPHRD_IEEE80211;
 		dev->header_ops = &hostap_80211_ops;
 		break;
 	case HOSTAP_INTERFACE_MASTER:
-		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_master_ops;
 		break;
 	default:
+		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_netdev_ops;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -p -r1.1740 -r1.1741
--- kernel.spec	24 Sep 2009 21:28:01 -0000	1.1740
+++ kernel.spec	25 Sep 2009 04:12:11 -0000	1.1741
@@ -746,6 +746,9 @@ Patch14090: linux-2.6-xen-rearrange-to-f
 Patch14100: linux-2.6-cpufreq-eliminate-lockdep-warnings.patch
 Patch14101: linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch
 
+# fix hostap (#522269)
+Patch14200: hostap-revert-toxic-part-of-conversion.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1368,7 +1371,7 @@ ApplyPatch linux-2.6-virtio_blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
-# ----- send for upstream inclusion -----
+# ----- sent for upstream inclusion -----
 ApplyPatch linux-2.6-cifs-reenable-lanman-security.patch
 
 # ----- patches headed for -stable -----
@@ -1387,6 +1390,9 @@ ApplyPatch linux-2.6-xen-rearrange-to-fi
 ApplyPatch linux-2.6-cpufreq-eliminate-lockdep-warnings.patch
 ApplyPatch linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch
 
+# fix hostap driver (#522269)
+ApplyPatch hostap-revert-toxic-part-of-conversion.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1975,6 +1981,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-62
+- Fix breakage in hostap driver (#522269)
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-61
 - Backport the cpuidle-faster-io fix from Fedora 12 to fix I/O
   performance problems when reading/writing multiple disks.



From wtogami at fedoraproject.org  Fri Sep 25 04:12:16 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 25 Sep 2009 04:12:16 +0000 (UTC)
Subject: rpms/perl-Mail-SPF/EL-5 perl-Mail-SPF.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925041216.BBB3011C00E8@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Mail-SPF/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28017

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mail-SPF.spec 
Log Message:
build for EL-5



--- NEW FILE perl-Mail-SPF.spec ---
Name:           perl-Mail-SPF
Version:        2.006
Release:        1%{?dist}
Summary:        Object-oriented implementation of Sender Policy Framework
License:        BSD
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mail-SPF/
Source0:        http://www.cpan.org/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Error)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(NetAddr::IP) >= 4
BuildRequires:  perl(Net::DNS) >= 0.58
BuildRequires:  perl(Net::DNS::Resolver::Programmable)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(URI) >= 1.13
BuildRequires:  perl(version)
Requires:       perl(Net::DNS) >= 0.58
Requires:       perl(URI) >= 1.13
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Mail::SPF is an object-oriented implementation of Sender Policy Framework
(SPF). See http://www.openspf.org for more information about SPF.

%prep
%setup -q -n Mail-SPF-v%{version}

chmod -x bin/* sbin/*

%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/*

# Don't include the spfd and spfquery scripts in _bindir.
rm -f $RPM_BUILD_ROOT%{_bindir}/spfquery $RPM_BUILD_ROOT%{_sbindir}/spfd
rm -rf $RPM_BUILD_ROOT%{_mandir}/man1

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE README TODO bin/ sbin/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Sep 25 2009 Warren Togami <wtogami at redhat.com> 2.006-1.el5
- build for EL-5

* Fri Dec 12 2008 Steven Pritchard <steve at kspei.com> 2.006-1
- Update to 2.006.

* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.005-2
- Rebuild for new perl

* Mon Jul 09 2007 Steven Pritchard <steve at kspei.com> 2.005-1
- Specfile autogenerated by cpanspec 1.71.
- Add the "v" before version numbers to handle broken upstream packaging.
- Remove redundant perl build dependency.
- Drop bogus version number from Net::DNS::Resolver::Programmable dependency.
- Drop redundant explicit dependencies.
- BR Test::More and Test::Pod.
- Include the spfd and spfquery scripts as %%doc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-SPF/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Jul 2007 17:32:27 -0000	1.1
+++ .cvsignore	25 Sep 2009 04:12:16 -0000	1.2
@@ -0,0 +1 @@
+Mail-SPF-v2.006.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-SPF/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Jul 2007 17:32:27 -0000	1.1
+++ sources	25 Sep 2009 04:12:16 -0000	1.2
@@ -0,0 +1 @@
+4da41591b612560627ddbc6026b047a3  Mail-SPF-v2.006.tar.gz



From wtogami at fedoraproject.org  Fri Sep 25 04:15:56 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 25 Sep 2009 04:15:56 +0000 (UTC)
Subject: rpms/spamassassin/devel sa-update-channels.txt, NONE,
	1.1 sa-update-keys.txt, NONE, 1.1 sought-pubkey.txt, NONE,
	1.1 sa-update.cronscript, 1.4, 1.5 spamassassin.spec, 1.130, 1.131
Message-ID: <20090925041556.54F8811C00E8@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28956

Modified Files:
	sa-update.cronscript spamassassin.spec 
Added Files:
	sa-update-channels.txt sa-update-keys.txt sought-pubkey.txt 
Log Message:
- Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules
  You must enable the sa-update cron job manually in /etc/cron.d/sa-update
- Custom channels may be specified in these config files:
      /etc/mail/spamassassin/sa-update-channels.txt
      /etc/mail/spamassassin/sa-update-keys.txt



--- NEW FILE sa-update-channels.txt ---
updates.spamassassin.org
sought.rules.yerp.org


--- NEW FILE sa-update-keys.txt ---
# SOUGHT anti-fraud ruleset
6C6191E3


--- NEW FILE sought-pubkey.txt ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.1 (GNU/Linux)

mQGiBEa/l+YRBACC+uJfIThEoEWrNxdDD/1tAwb5L8v7H3gGt+LtuOwwn5ZU7XsT
s1DOok1oZVRnTQJYdlth7QlU9wqijwLEVzW1LDWnxXXKwPmlTlkcdGoBcb+cBbYI
miJ/TlAetvbprcZdROS4Ey31GjPRmWPPnVE2Xcwy+e4+RmnhqfZBmOaE7wCgo1GG
pkik2OPD1le4LGGOGHL5HiED/0TyvTiSS3NnUtoDFQAPrnezOCjxv8zMjYEnJs/I
h7uyIgHRsbB75cD2O1LWyO8Vz8r/snVuG35zcZagPf/7Tc9AJoaxVmCIk9DEmWZp
iuvqpMhwHAbNvY3jY2oKsDl1rNx0IIctoJwjXia99kvNTHK/Yz/HqhIyLModhiMB
aYYZA/wIdPOHGHaP5vjlbWBwGlRR9m0Rf4ob5sul8MjCyehOYcRVLwfOEfzX308v
0enOGnbbBKXU2QvA0Z068aBmJkJaaPhlIjZApQJDsb7pt6k8jMPj/Xpr779wAFQ8
IZC7Tw21OtqkjrUb3dZlEljrTwWNc6FVxuIidBBg7HCdP24WKLRESnVzdGluIE1h
c29uIFNpZ25pbmcgS2V5IChDb2RlIFNpZ25pbmcgT25seSkgPHNpZ25pbmdrZXlA
am1hc29uLm9yZz6IZAQTEQIAJAUCRr+X5gIbAwUJEswDAAYLCQgHAwIDFQIDAxYC
AQIeAQIXgAAKCRDchTQfbGGR4/GJAKCC6X6AF8nM+H00b/XeZl9vYihXBgCcDYuU
AtXjWWxndkneakmbnD0O4Z25BA0ERr+YdxAQAIYYUQHMzVsRAzpIRLfni0aeczrr
armwXMJ8y5p74lVLbJyQOjkQyIJWP80twrN8SjNyUFBr/52SlOPOuAbGZY1ZKpux
vkbsug2wWvkoj8xGjnexrSDahRgpNhf/otLRNTyUFZTM6mjZt0ItnYDl6xszY4kd
O5rVzjQuivNB4BsHcd8qQ7zVo9+VZ5R77iM4dtk6t5ycpXlAom5pD8qLb7ZzTVe0
SuhzOeynF51rwjS+wa3hzZisvJqZA5uJcAyYslgP1UTW+2e5wutSktSZmL/XnlEF
p86GPjAgDPL2Q0TgzVL6sPt0blNCyzOJrcBqBHrgZfraYgqtmGepLpk72q4VD23c
aV2wTqjnfJAsNR3y8jgVNwF8LpXtlbxrBByFRwEqsc/gzdMEnJ728XBDqT2IhZLY
maL/WxiDKNWD/Mae69HTyInIYgrfT7nJKDeKQA81+e5+UmqBVoi5/AICMlDm1DgR
gG6bbOXGhLVPh+gHjGG4Jdd/ZLedncUsjW9KyK261sqM3tSDSfgnF99w2/32ToFu
ChN8JOfQ6VZ7QbL1BWRtQWZ3tyauUUXmsrYDv1w1nx51MqxQdlitnmTRWaRW0GmD
b5XapJfSK+FiGXaynl3HHxHHpcUauX9zBa/LRp8oXiGPLfJEWmjWcGCyGZawASj3
pTTJUnbkYs0fUyUXAAQND/42mh8f3mTA+24I3lY4K8mxH9GSFgOkLoYwok8xL5Md
OUJAyvs34ixqvM2u560YJkegEO/xzg2abddfoqL8eNnjfvG3bI7KOCT+m+mM/5Cg
ul8XFSnHIEivuOXNtc/x/dwYSidKM8atkdpKtv++psd6hVbJQMfLlzf0S2QyiaGk
yXur/pM3A97lvkjAgvIKQt8NbJ/sITFlrN2TFxcbE8OED7LC4nBo54TJ1AxVsHlT
LB5XPKU8pBv0fABZrNKxf6a2iXx9jT9sSYdnb0y+hBjnoWZUNbhxo6jpAqt1quUy
buGWugvG8J75JvT6X+lwEEkg1lplmm+HuaFtegOqTUTKmffKduY+E00le+3Kh8gW
bLR8P1qp/xnxQxZJYcQ+mT4QsYpj6Pkcj0ON3NQO5wP6dr2UGhGcSzS2Cxv8TERN
7HSdFbFXQWPCekx+i7OjeRSY/XTUf2zYquPNP2oU0MjgnXhnkHq+6EaQPpM59fMd
MyLeOiUMOxpPOkeaAC8Ku0Oj2aZU/eyizuBDnhq1PAxBprSW5SSkxP4kz9BnA42x
tkMKMzzPohdfMIRI6zSu0chr76w2UeoViSsMtmWnR6qAXbQvzR+HHxhhB/Rzp6Gc
u9gybrv58IBkybn5ztST6NqgIgcQ/E7XIsB0Eooohfw+QiPlCdoghSxspbzwqcEZ
B4hPBBgRAgAPBQJGv5h3AhsMBQkSzAMAAAoJENyFNB9sYZHjUh0AnA3u5TNYHGLQ
DXLPP0qWHkTeOz8dAJ4wkrLBTaXz3CPCjoTdoBiQsNt3fw==
=nK43
-----END PGP PUBLIC KEY BLOCK-----


Index: sa-update.cronscript
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sa-update.cronscript,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sa-update.cronscript	13 Feb 2007 20:58:07 -0000	1.4
+++ sa-update.cronscript	25 Sep 2009 04:15:56 -0000	1.5
@@ -1,5 +1,22 @@
 #!/bin/bash
+# *** DO NOT MODIFY THIS FILE ***
+# Edit /etc/cron.d/sa-update to enable nightly automatic updates
+# /etc/mail/spamassassin/sa-update-channels.txt 
+#     Specify custom channels here
+# /etc/mail/spamassassin/sa-update-keys.txt
+#     Specify trusted GPG keys for custom channels here
 
+# Sleep random amount of time before proceeding to avoid overwhelming the servers
 sleep $(expr $RANDOM % 7200)
-# Only restart spamd if sa-update returns 0, meaning it updated the rules
-/usr/bin/sa-update && /etc/init.d/spamassassin condrestart > /dev/null
+
+# sa-update must create keyring
+if [ ! -d /etc/mail/spamassassin/sa-update-keys ]; then
+    sa-update
+fi
+# Import SOUGHT key
+sa-update --import /usr/share/spamassassin/sought-pubkey.txt
+
+# Update rules with sa-update, restart spamd if rules were updated
+/usr/bin/sa-update --channelfile /etc/mail/spamassassin/sa-update-channels.txt \
+                   --gpgkeyfile  /etc/mail/spamassassin/sa-update-keys.txt     && \
+                   /etc/init.d/spamassassin condrestart > /dev/null


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- spamassassin.spec	18 Sep 2009 01:25:17 -0000	1.130
+++ spamassassin.spec	25 Sep 2009 04:15:56 -0000	1.131
@@ -30,8 +30,8 @@
 %define perl_devel 1
 %endif
 
-# Mail::DKIM by default (F12+)
-%if 0%{?fedora} >= 12
+# Mail::DKIM by default (F11+)
+%if 0%{?fedora} >= 11
 %define dkim_deps 1
 %endif
 
@@ -42,7 +42,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename svn816416
-Release: 0.14.%{prename}%{?dist}
+Release: 0.18.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -56,6 +56,9 @@ Source6: sa-update.logrotate
 Source7: sa-update.crontab
 Source8: sa-update.cronscript
 Source10: spamassassin-helper.sh
+Source11: sa-update-channels.txt
+Source12: sa-update-keys.txt
+Source13: sought-pubkey.txt
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
@@ -159,6 +162,7 @@ install -m 0644 %{SOURCE6} %buildroot/et
 install -m 0644 %{SOURCE7} %buildroot/etc/cron.d/sa-update
 # installed mode 744 as non root users can't run it, but can read it.
 install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron
+install -m 0644 %{SOURCE13} %buildroot%{_datadir}/spamassassin/
 
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
 
@@ -184,6 +188,11 @@ find $RPM_BUILD_ROOT%{perl_vendorlib}/* 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 
+# sa-update channels and keys
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+
+
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 %doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE
@@ -234,12 +243,19 @@ fi
 exit 0
 
 %changelog
+* Thu Sep 24 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.18.svn816416
+- Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules
+  You must enable the sa-update cron job manually in /etc/cron.d/sa-update
+- Custom channels may be specified in these config files:
+      /etc/mail/spamassassin/sa-update-channels.txt
+      /etc/mail/spamassassin/sa-update-keys.txt
+
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.14.svn816416
 - 3.3.0 svn816416 snapshot, pre-alpha3
   Upstream just fixed important bug SA#6206.  Many other bugs fixed since alpha2.
 
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.13.alpha2
-- F12+ requires Mail::DKIM
+- F11+ requires Mail::DKIM
 
 * Sun Sep 13 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.12.alpha2
 - require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL



From pnemade at fedoraproject.org  Fri Sep 25 04:19:21 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Fri, 25 Sep 2009 04:19:21 +0000 (UTC)
Subject: rpms/hyphen-mr/devel .cvsignore, 1.1, 1.2 hyph_mr_IN.dic, 1.1,
	1.2 hyphen-mr.spec, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925041921.153D011C00E8@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-mr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29883

Modified Files:
	.cvsignore hyph_mr_IN.dic hyphen-mr.spec sources 
Log Message:
* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
- update to 20090924




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-mr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:20:32 -0000	1.1
+++ .cvsignore	25 Sep 2009 04:19:20 -0000	1.2
@@ -0,0 +1 @@
+hyph_mr_IN.dic


Index: hyph_mr_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-mr/devel/hyph_mr_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_mr_IN.dic	20 Aug 2009 05:30:42 -0000	1.1
+++ hyph_mr_IN.dic	25 Sep 2009 04:19:20 -0000	1.2
@@ -17,120 +17,81 @@ UTF-8
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
 % GENERAL RULE
-% Do not break either side of ZERO-WIDTH JOINER
-% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D) 
 2?2
-2?2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C) 
+1?1
 % Break before or after any independent vowel.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break after any dependent vowel but not before.
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
-2?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
+?1
 % Break before or after any consonant.
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-1?1
-% Do not break before a final consonant or conjunct.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2??.
-2????.
-2????.
-2????.
-2????.
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
+1?
 % Do not break before chandrabindu, anusvara, visarga, avagraha
 % and accents.
-2?
-2?
-2?
-2?
-2?
-2?
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
 % Do not break either side of virama (may be within conjunct).
 2?2


Index: hyphen-mr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-mr/devel/hyphen-mr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyphen-mr.spec	20 Aug 2009 05:30:42 -0000	1.1
+++ hyphen-mr.spec	25 Sep 2009 04:19:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name: hyphen-mr
 Summary: Marathi hyphenation rules
-%define upstreamid 20090813
+%define upstreamid 20090924
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_mr_IN.dic
@@ -34,5 +34,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Thu Sep 24 2009 Parag <pnemade at redhat.com> - 0.20090924-1
+- update to 20090924
+
 * Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
 - initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-mr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:20:32 -0000	1.1
+++ sources	25 Sep 2009 04:19:20 -0000	1.2
@@ -0,0 +1 @@
+d0679bce3283701937de1de0d2d99520  hyph_mr_IN.dic



From airlied at fedoraproject.org  Fri Sep 25 04:36:02 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 04:36:02 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-adea4796c.patch, NONE, 1.1 kernel.spec,
	1.1830, 1.1831 drm-next-31edd4824e.patch, 1.1, NONE
Message-ID: <20090925043602.6892611C00E8@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428

Modified Files:
	kernel.spec 
Added Files:
	drm-next-adea4796c.patch 
Removed Files:
	drm-next-31edd4824e.patch 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-45
- drm-next-adea4796c.patch: fix r600 glxgears


drm-next-adea4796c.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  298 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  929 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  742 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  105 
 b/drivers/gpu/drm/radeon/avivod.h                 |   69 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1290 -
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  607 
 b/drivers/gpu/drm/radeon/r200.c                   |  455 
 b/drivers/gpu/drm/radeon/r300.c                   |  687 
 b/drivers/gpu/drm/radeon/r300d.h                  |  101 
 b/drivers/gpu/drm/radeon/r420.c                   |  301 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r520.c                   |    6 
 b/drivers/gpu/drm/radeon/r600.c                   | 1788 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  850 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  659 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  357 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  228 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  509 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  106 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  404 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  101 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  137 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  682 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   85 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  368 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   74 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |   56 
 b/drivers/gpu/drm/radeon/rs600.c                  |  106 
 b/drivers/gpu/drm/radeon/rs690.c                  |    4 
 b/drivers/gpu/drm/radeon/rv515.c                  |  524 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1050 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  106 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 169 files changed, 36745 insertions(+), 42238 deletions(-)

--- NEW FILE drm-next-adea4796c.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..8e7b0eb 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...86266 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1830
retrieving revision 1.1831
diff -u -p -r1.1830 -r1.1831
--- kernel.spec	25 Sep 2009 03:54:06 -0000	1.1830
+++ kernel.spec	25 Sep 2009 04:36:02 -0000	1.1831
@@ -696,7 +696,7 @@ Patch1578: linux-2.6-xen-stack-protector
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next-31edd4824e.patch
+Patch1812: drm-next-adea4796c.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1361,7 +1361,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next-31edd4824e.patch
+ApplyPatch drm-next-adea4796c.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2059,6 +2059,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-45
+- drm-next-adea4796c.patch: fix r600 glxgears
+
 * Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-44
 - bump a extra one because I accidentially CVS.
 


--- drm-next-31edd4824e.patch DELETED ---



From wtogami at fedoraproject.org  Fri Sep 25 04:47:39 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 25 Sep 2009 04:47:39 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.19, 1.20 dracut.spec, 1.34,
	1.35 sources, 1.20, 1.21
Message-ID: <20090925044739.AF6DC11C00E8@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4797

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
- revert back to dracut-002-5 tarball 845dd502
  lvm2 was reverted to pre-udev

I'm not 100% sure about this, but it seems safer since this worked with the previous build of lvm2.
Also harald didn't push these changes to upstream git.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	23 Sep 2009 23:55:40 -0000	1.19
+++ .cvsignore	25 Sep 2009 04:47:38 -0000	1.20
@@ -1 +1 @@
-dracut-002-b9c4654a.tar.bz2
+dracut-002-845dd502.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- dracut.spec	23 Sep 2009 23:55:40 -0000	1.34
+++ dracut.spec	25 Sep 2009 04:47:39 -0000	1.35
@@ -1,4 +1,4 @@
-%define gittag b9c4654a 
+%define gittag 845dd502
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 7%{?rdist}
+Release: 8%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -181,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Sep 25 2009 Warren Togami <wtogami at redhat.com> 002-8
+- revert back to dracut-002-5 tarball 845dd502
+  lvm2 was reverted to pre-udev
+
 * Wed Sep 23 2009 harald at redhat.com 002-7
 - build with the correct tarball
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	23 Sep 2009 23:55:40 -0000	1.20
+++ sources	25 Sep 2009 04:47:39 -0000	1.21
@@ -1 +1 @@
-05c8bddde0287a0d94437d7555e500a8  dracut-002-b9c4654a.tar.bz2
+d8d9c7088a414abdc24dc92b463dff6f  dracut-002-845dd502.tar.bz2



From cebbert at fedoraproject.org  Fri Sep 25 05:46:43 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 25 Sep 2009 05:46:43 +0000 (UTC)
Subject: rpms/kernel/F-11 agp-set_memory_ucwb.patch, 1.3, 1.4 kernel.spec,
	1.1741, 1.1742
Message-ID: <20090925054643.540B111C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20795

Modified Files:
	agp-set_memory_ucwb.patch kernel.spec 
Log Message:
Disable the GEM graphics manager on i686 PAE kernels
  (fixes modesetting on Intel graphics.)

agp-set_memory_ucwb.patch:
 generic.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Index: agp-set_memory_ucwb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/agp-set_memory_ucwb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- agp-set_memory_ucwb.patch	25 Jul 2009 04:09:15 -0000	1.3
+++ agp-set_memory_ucwb.patch	25 Sep 2009 05:46:42 -0000	1.4
@@ -52,15 +52,3 @@ index 97e8b41..aeeaf68 100644
  		page = virt_to_page(addr);
  
  #ifndef CONFIG_X86
-diff -up linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c.dma linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c.dma	2009-02-27 13:11:03.000000000 +1000
-+++ linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-02-27 13:11:11.000000000 +1000
-@@ -1104,7 +1104,7 @@ int i915_driver_load(struct drm_device *
- 			 "performance may suffer.\n");
- 	}
- 
--#ifdef CONFIG_HIGHMEM64G
-+#if 0 /* Fedora has AGP workaround patch */
- 	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
- 	dev_priv->has_gem = 0;
- #else


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -p -r1.1741 -r1.1742
--- kernel.spec	25 Sep 2009 04:12:11 -0000	1.1741
+++ kernel.spec	25 Sep 2009 05:46:42 -0000	1.1742
@@ -681,7 +681,6 @@ Patch1824: drm-radeon-cs-oops-fix.patch
 Patch1825: drm-pnp-add-resource-range-checker.patch
 Patch1826: drm-i915-enable-mchbar.patch
 
-
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
@@ -1338,7 +1337,7 @@ ApplyPatch drm-i915-resume-force-mode.pa
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-intel-hdmi-edid-fix.patch
-#ApplyPatch drm-intel-gem-use-dma32-on-pae.patch
+ApplyPatch drm-intel-gem-use-dma32-on-pae.patch
 ApplyPatch drm-modesetting-radeon-fixes.patch
 ApplyPatch drm-radeon-new-pciids.patch
 ApplyPatch drm-dont-frob-i2c.patch
@@ -1981,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-63
+- Disable the GEM graphics manager on i686 PAE kernels
+  (fixes modesetting on Intel graphics.)
+
 * Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-62
 - Fix breakage in hostap driver (#522269)
 



From nb at fedoraproject.org  Fri Sep 25 06:01:13 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Sep 2009 06:01:13 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 znc.spec, 
	1.16, 1.17 znc-0.075-openssl.patch, 1.1, NONE
Message-ID: <20090925060113.4616611C00E8@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25593

Modified Files:
	.cvsignore sources znc.spec 
Removed Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade to ZNC 0.076


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Aug 2009 07:36:51 -0000	1.10
+++ .cvsignore	25 Sep 2009 06:01:10 -0000	1.11
@@ -1 +1 @@
-znc-0.075.svn1613.tar.bz2
+znc-0.076.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Aug 2009 07:36:51 -0000	1.11
+++ sources	25 Sep 2009 06:01:10 -0000	1.12
@@ -1 +1 @@
-285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2
+03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- znc.spec	28 Aug 2009 07:36:51 -0000	1.16
+++ znc.spec	25 Sep 2009 06:01:11 -0000	1.17
@@ -1,13 +1,12 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.075
-Release:        8.svn1613%{?dist}
+Version:        0.076
+Release:        1
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1613.tar.bz2 
-Patch1:         znc-0.075-openssl.patch
+Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Patch1:         znc-0.076-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -44,7 +43,7 @@ Extra modules for ZNC
 
 %prep
 %setup -q
-%patch1 -p1 -b .openssl
+#%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -128,6 +127,10 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076
+- Upgrade to ZNC 0.076
+- http://en.znc.in/wiki/ChangeLog/0.076
+
 * Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
 - Rebuild with new openssl and svn 1613
 - build 0.075-7.svn1610 existed but I had to remove it from the spec because


--- znc-0.075-openssl.patch DELETED ---



From pgordon at fedoraproject.org  Fri Sep 25 06:01:37 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 25 Sep 2009 06:01:37 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkitgtk.spec,1.23,1.24
Message-ID: <20090925060137.0AB8D11C00E8@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25760

Modified Files:
	webkitgtk.spec 
Log Message:
Forcibly disable JIT to workaround bug 516057 (selinux execmem segfaults) until a proper solution can be found.


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- webkitgtk.spec	24 Sep 2009 03:39:07 -0000	1.23
+++ webkitgtk.spec	25 Sep 2009 06:01:36 -0000	1.24
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.15.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -48,7 +48,14 @@ URL:		http://www.webkitgtk.org/
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
 #Patch0: 	webkit-1.1.14-atomic-word.patch
-Patch1: 	webkit-1.1.13-no-execmem.patch
+
+## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
+## FIXME: We forcibly disable the JIT compiler for the time being.
+## This is a temporary workaround which causes a slight performance hit on
+## 32- and 64-bit x86; but until we can fix the JIT to correctly handle WX
+## memory, at least we'll have a WebKit stack that doesn't crash due to this
+## bug. :)
+#Patch1: 	webkit-1.1.13-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,12 +119,12 @@ LICENSE, README, and AUTHORS files.
 %prep
 %setup -qn "webkit-%{version}"
 # %patch0 -p1 -b .atomic-word
-%patch1 -p1 -b .no-execmem
+# %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
 
 %build
 CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
-			--enable-gnomekeyring			\
+			--disable-jit				\
 			--enable-geolocation			\
 %{?with_3dtransforms:	--enable-3D-transforms		}	\
 %{?with_coverage:	--enable-coverage		}	\
@@ -190,7 +197,13 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.1-1
+* Thu Sep 24 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.15.1-3
+- Forcibly disable JIT until we can properly resolve the execmem-caused
+  segfaulting. (Temporary workaround until bug #516057 can be properly fixed.)
+- Remove the gnome-keyring build option (no longer used by the build scripts).
+- Correct release value of previous %%changelog entry.
+
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.1-2
 - Update to 1.1.15.1
 
 * Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3



From nb at fedoraproject.org  Fri Sep 25 06:03:36 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Sep 2009 06:03:36 +0000 (UTC)
Subject: rpms/znc/F-11 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 znc.spec, 1.7, 
	1.8 znc-0.075-openssl.patch, 1.1, NONE
Message-ID: <20090925060336.E7E8611C00E8@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26831

Modified Files:
	.cvsignore sources znc.spec 
Removed Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade to ZNC 0.076


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Aug 2009 07:42:17 -0000	1.6
+++ .cvsignore	25 Sep 2009 06:03:34 -0000	1.7
@@ -1 +1 @@
-znc-0.075.svn1613.tar.bz2
+znc-0.076.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Aug 2009 07:42:17 -0000	1.6
+++ sources	25 Sep 2009 06:03:35 -0000	1.7
@@ -1 +1 @@
-285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2
+03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/znc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- znc.spec	28 Aug 2009 07:42:18 -0000	1.7
+++ znc.spec	25 Sep 2009 06:03:36 -0000	1.8
@@ -1,13 +1,12 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.075
-Release:        8.svn1613%{?dist}
+Version:        0.076
+Release:        1
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1613.tar.bz2 
-Patch1:         znc-0.075-openssl.patch
+Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Patch1:         znc-0.076-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -44,7 +43,7 @@ Extra modules for ZNC
 
 %prep
 %setup -q
-%patch1 -p1 -b .openssl
+#%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -128,6 +127,10 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076
+- Upgrade to ZNC 0.076
+- http://en.znc.in/wiki/ChangeLog/0.076
+
 * Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
 - Rebuild with new openssl and svn 1613
 - build 0.075-7.svn1610 existed but I had to remove it from the spec because


--- znc-0.075-openssl.patch DELETED ---



From nb at fedoraproject.org  Fri Sep 25 06:08:55 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Sep 2009 06:08:55 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.17,1.18
Message-ID: <20090925060855.753CC11C00E8@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28403

Modified Files:
	znc.spec 
Log Message:
Fix missing dist tag



Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- znc.spec	25 Sep 2009 06:01:11 -0000	1.17
+++ znc.spec	25 Sep 2009 06:08:55 -0000	1.18
@@ -1,12 +1,11 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.076
-Release:        1
+Release:	2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
 Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
-#Patch1:         znc-0.076-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,7 +42,6 @@ Extra modules for ZNC
 
 %prep
 %setup -q
-#%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -127,7 +125,10 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
-* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
+- Fix missing dist tag
+
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-1
 - Upgrade to ZNC 0.076
 - http://en.znc.in/wiki/ChangeLog/0.076
 



From phuang at fedoraproject.org  Fri Sep 25 06:10:45 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 25 Sep 2009 06:10:45 +0000 (UTC)
Subject: rpms/ibus/F-11 ibus.spec, 1.83, 1.84 sources, 1.40, 1.41 xinput-ibus,
	1.5, 1.6
Message-ID: <20090925061045.6BD5611C04A6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29391

Modified Files:
	ibus.spec sources xinput-ibus 
Log Message:
Update to 1.2.0.20090915


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ibus.spec	29 Aug 2009 03:13:05 -0000	1.83
+++ ibus.spec	25 Sep 2009 06:10:44 -0000	1.84
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090829
+Version:    1.2.0.20090915
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -15,6 +15,7 @@ Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
+# Source2:    icons.tar.gz
 # Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -115,27 +116,23 @@ The ibus-devel-docs package contains dev
 %prep
 %setup -q
 # %patch0 -p1
-# ./autogen.sh --help
-# aclocal -I m4
-# automake
 
 %build
 %configure --disable-static \
-		   --disable-iso-codes-check \
-		   --enable-gtk-doc \
-		   --disable-qt4-immodule
+	   --disable-iso-codes-check \
+           --enable-gtk-doc \
+           --disable-qt4-immodule
 # make -C po update-gmo
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
 # install xinput config file
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
+install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
 
 # install .desktop files
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
@@ -152,7 +149,11 @@ desktop-file-install --delete-original  
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database -q
+# recreate icon cache
+touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -171,18 +172,20 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-update-desktop-database -q
+# recreate icon cache
+touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 if [ "$1" = "0" ]; then
   %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
   # if alternative was set to manual, reset to auto
   [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
 fi
 
-%post libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %post gtk
 %{_bindir}/update-gtk-immodules %{_host} || :
@@ -201,6 +204,7 @@ fi
 %{_datadir}/ibus/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/status/*
 %{_libexecdir}/ibus-gconf
 %{_libexecdir}/ibus-ui-gtk
 %{_libexecdir}/ibus-x11
@@ -230,104 +234,149 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Sat Aug 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090829-1
-- Update to 1.1.0.20090829
-- Fix some memory leaks
+* Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
+- Update to 1.2.0.20090915
+- Fix bug 521591 - check if the icon filename is a real file before trying to open it
+- Fix bug 522310 - Memory leak on show/hide
+- Fix bug 509518 - ibus-anthy should only override to jp layout for kana input
 
-* Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-3
-- Do not execute autogen.sh to avoid the snapshot date changing.
+* Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-2
+- Refresh the tarball.
 
-* Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-2
-- Update ibus-HEAD.patch.
-- Fix memory leaks.
-- Update some translate
-- Fix typo in src/Makefile.am
-- Do not restore states when focus_in, if the engine is disabled.
+* Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-1
+- Update to 1.2.0.20090904
+
+* Mon Aug 31 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-2
+- Change icon path in ibus.conf
+
+* Fri Aug 28 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-1
+- Update to 1.2.0.20090828
+- Change the icon on systray.
+- Fix segment fault in ibus_hotkey_profile_destroy
+- Fix some memory leaks.
+
+* Wed Aug 12 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090812-1
+- Update to 1.2.0.20090812
+
+* Mon Aug 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-4
+- Update ibus-HEAD.patch
+- Fix Numlock problem.
+- Fix some memory leaks.
+
+* Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-2
+- Update ibus-HEAD.patch
+- Fix bug 516154.
+
+* Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-1
+- Update to 1.2.0.20090807
+
+* Thu Aug 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090806-1
+- Update to 1.2.0.20090806
+- Fix bug 515106 - don't install duplicate files
+
+* Tue Jul 28 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090723-3
+- Update xinput-ibus: setup QT_IM_MODULE if the ibus qt input method plugin exists. 
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090723-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090723-1
+- Update to 1.2.0.20090723
+- Fix dead loop in ibus-gconf
+
+* Wed Jul 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090722-1
+- Update to 1.2.0.20090722
+
+* Sun Jul 19 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090719-1
+- Update to 1.2.0.20090719
+
+* Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-1
+- Update to 1.2.0.20090617
 
-* Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
+* Fri Jun 12 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
 - Update to 1.1.0.20090612
 - Fix bug 504942 - PageUp and PageDown do not work in candidate list
 - Fix bug 491040 - Implememnt mouse selection in candidate list
 
-* Wed Jun 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090609-1
-- Update to 1.1.0.20090609
+* Wed Jun 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090609-1
+- Update to Update to 1.1.0.20090609
 - Fix bug 502414 - Implemented on-screen help facility
 - Fix bug 502561 - iBus should show keymap name on iBus panel
 - Fix bug 498043 - ibus Alt-grave trigger conflicts with openoffice.org
 - Implemented API for setting labels for candidates in LookupTable
 
-* Sun May 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090531-1
-- Update to 1.1.0.20090531
+* Sun May 31 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090531-1
+- Update to Update to 1.1.0.20090531
 
-* Tue May 26 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-5
+* Tue May 26 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090508-5
 - Update ibus-HEAD.patch.
 - Show the default input method with bold text
 - Add information text below input methods list
 
-* Mon May 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-4
+* Mon May 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090508-4
 - Update ibus-HEAD.patch.
 - Fix bug 501211 - ibus-setup window should be raised if running or just stay on top/grab focus
 - Fix bug 501640 - ibus should adds new IMEs at end of engine list not beginning
 - Fix bug 501644 - [IBus] focus-out and disabled IME should hide language panel
 
-* Thu May 14 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-2
+* Thu May 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090508-2
 - Remove requires notification-daemon
 - Fix bug 500588 - Hardcoded requirement for notification-daemon
 
-* Fri May 08 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-1
+* Fri May 08 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090508-1
 - Update to 1.1.0.20090508
 - Fix bug 499533 - [Indic] ibus should allow input in KDE using all supported Indic locales
 - Fix bug 498352 - hotkey config table should list keys in same order as on main setup page
 - Fix bug 497707 - ibus French translation update
 
-* Fri May 08 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090423-3
+* Fri May 08 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090423-3
 - Fix bug 498541 - ibus-libs should not contain devel file libibus.so
 
-* Tue May 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090423-2
+* Tue May 05 2009 Peng Huang <shawn.p.huang at gmail.com> - 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 <shawn.p.huang at gmail.com> - 1.1.0.20090423-1
+* Thu Apr 23 2009 Peng Huang <shawn.p.huang at gmail.com> - 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.
 - Enhance authentication both in daemon & clients
 
-* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
+* Fri Apr 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
 - Update to ibus-1.1.0.20090417.
 - Fix bug 496199 -  cannot remove Ctrl+Space hotkey with ibus-setup
 
-* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
+* Fri Apr 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
 - Update ibus-HEAD.patch.
 - Next Engine hotkey will do nothing if the IM is not active.
 
-* Wed Apr 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-3
+* Wed Apr 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090413-3
 - Update ibus-HEAD.patch.
 - Fix bug 495431 -  ibus Release modifier doesn't work with Alt
 - Fix bug 494445 -  ibus-hangul missing Hangul Han/En mode
   (and Alt_R+release hotkey)
 - Update te.po
 
-* Tue Apr 14 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-2
+* Tue Apr 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090413-2
 - Update ibus-HEAD.patch.
 - Change the mode of /tmp/ibus-$USER to 0700 to improve security
 - Change the mode of /tmp/ibus-$USER/socket-address to 0600 to improve security
 - Update as.po
 
-* Mon Apr 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-1
+* Mon Apr 13 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090413-1
 - Update to ibus-1.1.0.20090413.
 - Fix crash when restart the ibus-daemon
 - Add some translations.
 
-* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-3
+* Tue Apr 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090407-3
 - Update the tarball.
 - Fix bug 494511 - ibus-gtk makes gnome-terminal abort 
   when a key is pressed
 
-* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-2
+* Tue Apr 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090407-2
 - Update default hotkey settings.
 
-* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-1
+* Tue Apr 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090407-1
 - Update to ibus-1.1.0.20090407.
 - Fix bug 491042 - ibus default trigger hotkeys
 - Fix bug 492929 - ibus-hangul can cause gtk app to lockup
@@ -335,25 +384,25 @@ fi
 - Fix bug 493687 -  ibus-hangul should default to vertical candidate selection
 - Fix bug 493449 -  ibus broke Alt-F2 command auto-completion
 
-* Tue Mar 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090331-1
+* Tue Mar 31 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090331-1
 - Update to ibus-1.1.0.20090331.
 - Fix bug 492956 - screws up keyboard input in firefox
 - Fix bug 490143 - ibus issue with gnome-keyring
 
-* Sun Mar 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-3
+* Sun Mar 29 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090311-3
 - Recreate the ibus-HEAD.patch from upstream git source tree
 - Fix bug 491999 - up/down arrow keys broken in xchat
 
-* Sat Mar 28 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-2
+* Sat Mar 28 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090311-2
 - Recreate the ibus-HEAD.patch from upstream git source tree.
 - Fix bug 490009 - Deleting Next Engine shortcuts doesn't work
 - Fix bug 490381 - Change "Next/Previous engine" labels
 
-* Wed Mar 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-1
+* Wed Mar 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090311-1
 - Update to ibus-1.1.0.20090311.
 - Update setup ui follow GNOME Human Interface Guidelines 2.2 (#489497).
 
-* Fri Mar  6 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090306-1
+* Fri Mar  6 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090306-1
 - Update to ibus-1.1.0.20090306.
 
 * Tue Mar  3 2009 Jens Petersen <petersen at redhat.com>
@@ -363,60 +412,60 @@ fi
 - drop the superfluous ibus-0.1 engine obsoletes
 - move glib2 requires to gtk package
 
-* Tue Feb 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
+* Tue Feb 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
 - Update to ibus-1.1.0.20090225.
 - Fix problems in %post and %postun scripts.
 - Hide ibus & ibus preferences menu items.
 
-* Tue Feb 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-10
+* Tue Feb 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-10
 - Recreate the ibus-HEAD.patch from upstream git source tree.
 - Put 'Select an input method' in engine select combobox (#485861).
 
-* Tue Feb 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-9
+* Tue Feb 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-9
 - Add requires im-chooser >= 1.2.5.
 
-* Tue Feb 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-8
+* Tue Feb 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-8
 - Recreate the ibus-HEAD.patch from upstream git source tree.
 - Fix ibus-hangul segfault (#485438).
 
-* Mon Feb 16 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-6
+* Mon Feb 16 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-6
 - Recreate the ibus-HEAD.patch from upstream git source tree.
 - The new patch fixes ibus-x11 segfault (#485661).
 
-* Sun Feb 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-5
+* Sun Feb 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-5
 - Recreate the ibus-HEAD.patch from upstream git source tree.
 
-* Sun Feb 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-4
+* Sun Feb 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-4
 - Remove gnome-python2-gconf from requires.
 
-* Fri Feb 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-3
+* Fri Feb 13 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-3
 - Update ibus-HEAD.patch, to fix bug 484652.
 
-* Fri Feb 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
+* Fri Feb 13 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
 - Add patch ibus-HEAD.patch, to update ibus to HEAD version.
 
-* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+* Wed Feb 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
 - Add --xim argument in xinput-ibus
 - Add Obsoletes:  ibus-qt <= 1.1.0
 - Move libibus.so.* to ibus-libs to make ibus multilib.
 - Update to 1.1.0.20090211.
 
-* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+* Thu Feb 05 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
 - Update to 1.1.0.20090205.
 
-* Tue Feb 03 2009 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20090203-1
+* Tue Feb 03 2009 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20090203-1
 - Update to 0.1.1.20090203.
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081023-3
 - Rebuild for Python 2.6
 
-* Wed Nov 19 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-2
+* Wed Nov 19 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081023-2
 - Move libibus-gtk.so from ibus.rpm to ibus-gtk.rpm to fix bug 472146.
 
-* Thu Oct 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
+* Thu Oct 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - Update to 0.1.1.20081023.
 
-* Thu Oct 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081016-1
+* Thu Oct 16 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081016-1
 - Update to 0.1.1.20081016.
 
 * Tue Oct  7 2008 Jens Petersen <petersen at redhat.com> - 0.1.1.20081006-3
@@ -425,56 +474,56 @@ fi
 * Tue Oct  7 2008 Jens Petersen <petersen at redhat.com> - 0.1.1.20081006-2
 - add xinputrc alternative when installing or uninstalling
 
-* Mon Oct 06 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081006-1
+* Mon Oct 06 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081006-1
 - Update to 0.1.1.20081006.
 
-* Sun Oct 05 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081005-1
+* Sun Oct 05 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081005-1
 - Update to 0.1.1.20081005.
 
-* Sat Oct 04 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081004-1
+* Sat Oct 04 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081004-1
 - Update to 0.1.1.20081004.
 
-* Wed Oct 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081001-1
+* Wed Oct 01 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081001-1
 - Update to 0.1.1.20081001.
 
-* Tue Sep 30 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080930-1
+* Tue Sep 30 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080930-1
 - Update to 0.1.1.20080930.
 
-* Tue Sep 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
+* Tue Sep 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
 - Update to 0.1.1.20080923.
 
-* Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
+* Wed Sep 17 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
 - Update to 0.1.1.20080917.
 
-* Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
+* Tue Sep 16 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
 - Update to 0.1.1.20080916.
 
-* Mon Sep 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080914-1
+* Mon Sep 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080914-1
 - Update to 0.1.1.20080914.
 
-* Mon Sep 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080908-1
+* Mon Sep 08 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080908-1
 - Update to 0.1.1.20080908.
 
-* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+* Mon Sep 01 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 
-* Sat Aug 30 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080830-1
+* Sat Aug 30 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080830-1
 - Update to 0.1.1.20080830.
 
-* Mon Aug 25 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080825-1
+* Mon Aug 25 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080825-1
 - Update to 0.1.1.20080825.
 
-* Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Sat Aug 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update to 0.1.1.20080823.
 
-* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
+* Fri Aug 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
 - Update to 0.1.1.20080815.
 
-* Thu Aug 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
+* Thu Aug 12 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
 - Update to 0.1.1.20080812.
 
-* Mon Aug 11 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.0.20080810-2
+* Mon Aug 11 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.0.20080810-2
 - Add gnome-python2-gconf in Requires.
 
-* Thu Aug 07 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
+* Thu Aug 07 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	29 Aug 2009 03:13:05 -0000	1.40
+++ sources	25 Sep 2009 06:10:44 -0000	1.41
@@ -1 +1 @@
-f00b16c29491b0a86848c2f8d5314e7a  ibus-1.1.0.20090829.tar.gz
+755442695b6f98f3bfa64bad6d778412  ibus-1.2.0.20090915.tar.gz


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/xinput-ibus,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xinput-ibus	11 Feb 2009 03:26:04 -0000	1.5
+++ xinput-ibus	25 Sep 2009 06:10:44 -0000	1.6
@@ -1,8 +1,13 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="/usr/share/ibus/icons/ibus.svg"
+ICON="/usr/share/pixmaps/ibus.svg"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"
 GTK_IM_MODULE=ibus
-# QT_IM_MODULE=ibus
+
+if test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so || \
+   test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so;
+then
+    QT_IM_MODULE=ibus
+fi



From nb at fedoraproject.org  Fri Sep 25 06:10:45 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Sep 2009 06:10:45 +0000 (UTC)
Subject: rpms/znc/F-11 znc.spec,1.8,1.9
Message-ID: <20090925061045.5C78B11C0423@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29168

Modified Files:
	znc.spec 
Log Message:
Fix missing dist tag



Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/znc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- znc.spec	25 Sep 2009 06:03:36 -0000	1.8
+++ znc.spec	25 Sep 2009 06:10:44 -0000	1.9
@@ -1,12 +1,11 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.076
-Release:        1
+Release:	2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
 Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
-#Patch1:         znc-0.076-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,7 +42,6 @@ Extra modules for ZNC
 
 %prep
 %setup -q
-#%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -127,7 +125,10 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
-* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
+- Fix missing dist tag
+
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-1
 - Upgrade to ZNC 0.076
 - http://en.znc.in/wiki/ChangeLog/0.076
 



From nb at fedoraproject.org  Fri Sep 25 06:12:35 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Sep 2009 06:12:35 +0000 (UTC)
Subject: rpms/znc/F-10 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 znc.spec, 1.7, 
	1.8 znc-0.075-openssl.patch, 1.1, NONE
Message-ID: <20090925061235.C025D11C00E8@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30367

Modified Files:
	.cvsignore sources znc.spec 
Removed Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade to ZNC 0.076


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Aug 2009 07:42:17 -0000	1.6
+++ .cvsignore	25 Sep 2009 06:12:33 -0000	1.7
@@ -1 +1 @@
-znc-0.075.svn1613.tar.bz2
+znc-0.076.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Aug 2009 07:42:17 -0000	1.6
+++ sources	25 Sep 2009 06:12:34 -0000	1.7
@@ -1 +1 @@
-285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2
+03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/znc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- znc.spec	28 Aug 2009 07:42:17 -0000	1.7
+++ znc.spec	25 Sep 2009 06:12:34 -0000	1.8
@@ -1,13 +1,11 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.075
-Release:        8.svn1613%{?dist}
+Version:        0.076
+Release:	2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1613.tar.bz2 
-Patch1:         znc-0.075-openssl.patch
+Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -44,7 +42,6 @@ Extra modules for ZNC
 
 %prep
 %setup -q
-%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -128,6 +125,13 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
+- Fix missing dist tag
+
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-1
+- Upgrade to ZNC 0.076
+- http://en.znc.in/wiki/ChangeLog/0.076
+
 * Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
 - Rebuild with new openssl and svn 1613
 - build 0.075-7.svn1610 existed but I had to remove it from the spec because


--- znc-0.075-openssl.patch DELETED ---



From nb at fedoraproject.org  Fri Sep 25 06:15:01 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Sep 2009 06:15:01 +0000 (UTC)
Subject: rpms/znc/EL-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 znc.spec, 1.8, 
	1.9 znc-0.075-openssl.patch, 1.1, NONE
Message-ID: <20090925061501.16C8411C00E8@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31452

Modified Files:
	.cvsignore sources znc.spec 
Removed Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade to ZNC 0.076



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Aug 2009 07:42:17 -0000	1.6
+++ .cvsignore	25 Sep 2009 06:14:57 -0000	1.7
@@ -1 +1 @@
-znc-0.075.svn1613.tar.bz2
+znc-0.076.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Aug 2009 07:42:17 -0000	1.6
+++ sources	25 Sep 2009 06:14:57 -0000	1.7
@@ -1 +1 @@
-285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2
+03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- znc.spec	28 Aug 2009 07:42:17 -0000	1.8
+++ znc.spec	25 Sep 2009 06:14:57 -0000	1.9
@@ -1,13 +1,11 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.075
-Release:        8.svn1613%{?dist}
+Version:        0.076
+Release:	2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1613.tar.bz2 
-Patch1:         znc-0.075-openssl.patch
+Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -44,7 +42,6 @@ Extra modules for ZNC
 
 %prep
 %setup -q
-%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -128,6 +125,13 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
+- Fix missing dist tag
+
+* Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-1
+- Upgrade to ZNC 0.076
+- http://en.znc.in/wiki/ChangeLog/0.076
+
 * Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
 - Rebuild with new openssl and svn 1613
 - build 0.075-7.svn1610 existed but I had to remove it from the spec because


--- znc-0.075-openssl.patch DELETED ---



From phuang at fedoraproject.org  Fri Sep 25 06:32:14 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 25 Sep 2009 06:32:14 +0000 (UTC)
Subject: rpms/ibus-hangul/F-11 .cvsignore, 1.7, 1.8 ibus-hangul.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090925063214.E97E811C00E8@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-hangul/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4240

Modified Files:
	.cvsignore ibus-hangul.spec sources 
Log Message:
back port f12 to f11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	30 Mar 2009 07:07:19 -0000	1.7
+++ .cvsignore	25 Sep 2009 06:32:12 -0000	1.8
@@ -1 +1 @@
-ibus-hangul-1.1.0.20090328.tar.gz
+ibus-hangul-1.2.0.20090617.tar.gz


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-11/ibus-hangul.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ibus-hangul.spec	13 Apr 2009 02:57:12 -0000	1.9
+++ ibus-hangul.spec	25 Sep 2009 06:32:12 -0000	1.10
@@ -1,5 +1,8 @@
+%define require_ibus_version 1.2.0
+%define require_libhangul_version 0.0.9
+
 Name:       ibus-hangul
-Version:    1.1.0.20090328
+Version:    1.2.0.20090617
 Release:    2%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
@@ -13,11 +16,12 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
-BuildRequires:  libhangul-devel
+BuildRequires:  libhangul-devel >= %{require_libhangul_version}
 BuildRequires:  pkgconfig
-BuildRequires:  ibus-devel
+BuildRequires:  ibus-devel >= %{require_ibus_version}
 
-Requires:   ibus
+Requires:   ibus >= %{require_ibus_version}
+Requires:   libhangul >= %{require_libhangul_version}
 
 %description
 The Hangul engine for IBus platform. It provides Korean input method from
@@ -51,13 +55,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090330-1
+- Update version to 1.2.0.20090617.
+
 * Sun Apr 12 2009 Warren Togami <wtogami at redhat.com> - 1.1.0.20090330-2
 - Bug 493706: ibus-hangul Hanja arrow keys are wrong
 - Bug 493509: ibus-hangul missing right Ctrl for Hanja button
   These fixes are not ideal, but they make it usable for Fedora 11.
   These must become configurable in a future version.
 
-* Mon Mar 30 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090330-1
+* Mon Mar 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090330-1
 - Update version to 1.1.0.20090330.
 - Fix bug 486056 - missing options for 2bul, 3bul and other Korean layouts
 - Fix bug 487269 - missing Hanja Conversion
@@ -65,20 +75,20 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+* Wed Feb 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
 - Update version to 1.1.0.20090211.
 
-* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+* Thu Feb 05 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
 - Update version to 1.1.0.20090205.
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081023-2
 - Rebuild for Python 2.6
 
-* Thu Oct 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
+* Thu Oct 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - Update to 0.1.1.20081023.
 
-* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+* Mon Sep 09 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 
-* Fri Aug 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Fri Aug 08 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	30 Mar 2009 07:07:19 -0000	1.7
+++ sources	25 Sep 2009 06:32:13 -0000	1.8
@@ -1 +1 @@
-4b7e737fce25202b6338794988f53a18  ibus-hangul-1.1.0.20090328.tar.gz
+67f19f7290ec91ab2b1e07ff6dd887be  ibus-hangul-1.2.0.20090617.tar.gz



From mmaslano at fedoraproject.org  Fri Sep 25 06:37:48 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 25 Sep 2009 06:37:48 +0000 (UTC)
Subject: rpms/cronie/F-11 nofollow.patch,1.2,1.3 cronie.spec,1.18,1.19
Message-ID: <20090925063748.F0F2811C00E8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6233

Modified Files:
	cronie.spec 
Added Files:
	nofollow.patch 
Log Message:
* Fri Sep 25 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.3-3
- 477100 apply patch also in this branch


nofollow.patch:
 database.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: nofollow.patch
===================================================================
RCS file: nofollow.patch
diff -N nofollow.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nofollow.patch	25 Sep 2009 06:37:43 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up cronie-1.2/src/database.c.old cronie-1.2/src/database.c
+--- cronie-1.2/src/database.c.old	2008-06-26 14:56:00.000000000 +0200
++++ cronie-1.2/src/database.c	2008-12-19 12:21:15.000000000 +0100
+@@ -51,7 +51,7 @@ check_open(const char *tabname, const ch
+ 	int crontab_fd;
+ 	pid_t pid = getpid();
+ 
+-	if ((crontab_fd = open(tabname, O_RDONLY|O_NONBLOCK|O_NOFOLLOW, 0)) == -1) {
++	if ((crontab_fd = open(tabname, O_RDONLY|O_NONBLOCK, 0)) == -1) {
+ 		log_it(uname, pid, "CAN'T OPEN", tabname, errno);
+ 		return(-1);
+ 	}


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/F-11/cronie.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cronie.spec	18 Jun 2009 11:48:26 -0000	1.18
+++ cronie.spec	25 Sep 2009 06:37:43 -0000	1.19
@@ -6,13 +6,13 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT and BSD
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
 Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
 Patch0: reboot-alias-check-the-return-value.patch
-#Source0: http://mmaslano.fedorapeople.org/cronie/%{name}-%{version}.tar.gz
+Patch1: nofollow.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
@@ -49,6 +49,7 @@ SELinux.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -128,6 +129,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %config(noreplace) %{_sysconfdir}/cron.deny
 
 %changelog
+* Fri Sep 25 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.3-3
+- 477100 apply patch also in this branch
+
 * Thu Jun 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.3-2
 - 506560 check return value of access
 



From jkratoch at fedoraproject.org  Fri Sep 25 06:49:23 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 25 Sep 2009 06:49:23 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.40,
	1.41 gdb-6.3-readnever-20050907.patch, 
	1.8, 1.9 gdb-archer.patch, 1.31, 1.32 gdb.spec, 1.386,
	1.387 sources, 1.39, 1.40 gdb-6.8.50.20090921-upstream.patch,
	1.1, NONE
Message-ID: <20090925064923.AAA2B11C00E8@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11426

Modified Files:
	.cvsignore gdb-6.3-readnever-20050907.patch gdb-archer.patch 
	gdb.spec sources 
Removed Files:
	gdb-6.8.50.20090921-upstream.patch 
Log Message:
* Fri Sep 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-1
- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090925
- archer-jankratochvil-fedora12 commit: 4338ea85c798007c32594032f602db9fd230eba9
  - [python] Don't directly reference self.frame (Tom Tromey).
  - [expr] Updates from branch (Keith Seitz).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	21 Sep 2009 15:49:35 -0000	1.40
+++ .cvsignore	25 Sep 2009 06:49:19 -0000	1.41
@@ -1,2 +1,2 @@
 libstdc++-v3-python-r151798.tar.xz
-gdb-6.8.91.20090921.tar.bz2
+gdb-6.8.91.20090925.tar.bz2

gdb-6.3-readnever-20050907.patch:
 doc/gdb.texinfo |    6 ++++++
 dwarf2read.c    |    4 +++-
 main.c          |    2 ++
 symfile.c       |    1 +
 top.h           |    1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

Index: gdb-6.3-readnever-20050907.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-readnever-20050907.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdb-6.3-readnever-20050907.patch	18 Aug 2009 18:51:17 -0000	1.8
+++ gdb-6.3-readnever-20050907.patch	25 Sep 2009 06:49:20 -0000	1.9
@@ -65,7 +65,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2rea
 --- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-13 10:14:15.000000000 +0200
 +++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-13 10:14:29.000000000 +0200
 @@ -53,6 +53,7 @@
- #include "typeprint.h"
+ #include "jv-lang.h"
  #include "vec.h"
  #include "block.h"
 +#include "top.h"

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  763 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  281 +-
 cp-support.c                                             |  123 +
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1758 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  599 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  185 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   73 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   14 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |   10 
 testsuite/gdb.cp/cplusfuncs.exp                          |  220 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   72 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 238 files changed, 18370 insertions(+), 2438 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gdb-archer.patch	21 Sep 2009 15:49:36 -0000	1.31
+++ gdb-archer.patch	25 Sep 2009 06:49:20 -0000	1.32
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 0d5c38dd89050c0ee1cf049656f177c170d675d4
+commit 4338ea85c798007c32594032f602db9fd230eba9
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -3557,19 +3557,26 @@ index d2d8f2e..af0ba28 100644
        if (sym != NULL)
  	return sym;
 diff --git a/gdb/cp-support.c b/gdb/cp-support.c
-index f12d785..ca10007 100644
+index f12d785..23b34c1 100644
 --- a/gdb/cp-support.c
 +++ b/gdb/cp-support.c
-@@ -70,6 +70,21 @@ struct cmd_list_element *maint_cplus_cmd_list = NULL;
+@@ -32,6 +32,9 @@
+ #include "block.h"
+ #include "complaints.h"
+ #include "gdbtypes.h"
++#include "exceptions.h"
++#include "expression.h"
++#include "value.h"
+ 
+ #include "safe-ctype.h"
+ 
+@@ -70,6 +73,18 @@ struct cmd_list_element *maint_cplus_cmd_list = NULL;
  static void maint_cplus_command (char *arg, int from_tty);
  static void first_component_command (char *arg, int from_tty);
  
-+/* Operator validation. This is used by cp_validate_opeartor,
-+   which is in turn used by both the expression parser (clex)
-+   and decode_line (decode_compound, actually).
-+
++/* Operator validation.
 +   NOTE: Multi-byte operators (usually the assignment variety operator)
-+   must appear before the single byte version, i.e., "+=" before "+". */
++   must appear before the single byte version, i.e., "+=" before "+".  */
 +static const char *operator_tokens[] =
 +  {
 +    "++", "+=", "+", "->*", "->", "--", "-=", "-", "*=", "*", "/=", "/",
@@ -3604,7 +3611,7 @@ index f12d785..ca10007 100644
  	    != NULL))
        psymtab_to_symtab (ps);
    }
-@@ -909,6 +925,72 @@ first_component_command (char *arg, int from_tty)
+@@ -909,6 +925,107 @@ first_component_command (char *arg, int from_tty)
  
  extern initialize_file_ftype _initialize_cp_support; /* -Wmissing-prototypes */
  
@@ -3617,18 +3624,23 @@ index f12d785..ca10007 100644
 +  while (0)
 +
 +/* Returns the length of the operator name or 0 if INPUT does not
-+   point to a valid C++ operator. INPUT should start with "operator". */
++   point to a valid C++ operator.  INPUT should start with "operator".  */
 +int
 +cp_validate_operator (const char *input)
 +{
 +  int i;
-+  const char *p = input;
-+  int valid = 0;
++  char *copy;
++  const char *p;
++  struct expression *expr;
++  struct value *val;
++  struct gdb_exception except;
++  struct cleanup *old_chain;
++
++  p = input;
 +
-+  /* Most callers appear to do this already, but since this is not
-+     really time-critical code, it is double-checked here. */
 +  if (strncmp (p, "operator", 8) == 0)
 +    {
++      int valid = 0;
 +      p += 8;
 +
 +      SKIP_SPACE (p);
@@ -3637,7 +3649,7 @@ index f12d785..ca10007 100644
 +	{
 +	  int length = strlen (operator_tokens[i]);
 +	  /* By using strncmp here, we MUST have operator_tokens ordered!
-+	     See additional notes where operator_tokens is defined above. */
++	     See additional notes where operator_tokens is defined above.  */
 +	  if (strncmp (p, operator_tokens[i], length) == 0)
 +	    {
 +	      const char *op = p;
@@ -3648,8 +3660,8 @@ index f12d785..ca10007 100644
 +		  || strncmp (op, "delete", 6) == 0)
 +		{
 +
-+		  /* Special case: new[] and delete[]. We must be careful
-+		     to swallow whitespace before/in "[]".*/
++		  /* Special case: new[] and delete[].  We must be careful
++		     to swallow whitespace before/in "[]".  */
 +		  SKIP_SPACE (p);
 +
 +		  if (*p == '[')
@@ -3663,15 +3675,45 @@ index f12d785..ca10007 100644
 +		    }
 +		}
 +
-+	      break;
++	      if (valid)
++		return (p - input);
 +	    }
 +	}
 +
-+      if (!valid)
-+	p = input;
++      /* Check input for a conversion operator.  */
++
++      /* Skip past base typename */
++      while (*p != '*' && *p != '&' && *p != 0 && *p != ' ')
++	++p;
++      SKIP_SPACE (p);
++
++      /* Add modifiers '*'/'&' */
++      while (*p == '*' || *p == '&')
++	{
++	  ++p;
++	  SKIP_SPACE (p);
++	}
++
++      /* Check for valid type.  [Remember: input starts with 
++	 "operator".]  */
++      copy = savestring (input + 8, p - input - 8);
++      expr = NULL;
++      val = NULL;
++      TRY_CATCH (except, RETURN_MASK_ALL)
++	{
++	  expr = parse_expression (copy);
++	  val = evaluate_type (expr);
++	}
++
++      xfree (copy);
++      if (expr)
++	xfree (expr);
++
++      if (val != NULL && value_type (val) != NULL)
++	return (p - input);
 +    }
 +
-+  return (p - input);
++  return 0;
 +}
 +
  void
@@ -4921,7 +4963,7 @@ index 0bfcfca..01018d6 100644
  
  #endif /* dwarf2loc.h */
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 4cce36b..d394887 100644
+index 4cce36b..c2f5f23 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -48,6 +48,12 @@
@@ -4930,8 +4972,8 @@ index 4cce36b..d394887 100644
  #include "addrmap.h"
 +#include "f-lang.h"
 +#include "c-lang.h"
-+#include "jv-lang.h"
 +#include "typeprint.h"
++#include "jv-lang.h"
 +#include "vec.h"
 +#include "block.h"
  
@@ -5023,20 +5065,18 @@ index 4cce36b..d394887 100644
  static void dwarf2_read_abbrevs (bfd *abfd, struct dwarf2_cu *cu);
  
  static void dwarf2_free_abbrev_table (void *);
-@@ -945,8 +978,13 @@ static struct type *tag_type_to_type (struct die_info *, struct dwarf2_cu *);
+@@ -945,6 +978,11 @@ static struct type *tag_type_to_type (struct die_info *, struct dwarf2_cu *);
  
  static struct type *read_type_die (struct die_info *, struct dwarf2_cu *);
  
++static char *physname_prefix (struct die_info *die, struct dwarf2_cu *);
++
 +static void physname_prefix_1 (struct ui_file *, struct die_info *,
 +			       struct dwarf2_cu *);
 +
  static char *determine_prefix (struct die_info *die, struct dwarf2_cu *);
  
-+static char *physname_prefix (struct die_info *die, struct dwarf2_cu *);
-+
  static char *typename_concat (struct obstack *,
-                               const char *prefix, 
-                               const char *suffix,
 @@ -964,7 +1002,8 @@ static int dwarf2_ranges_read (unsigned, CORE_ADDR *, CORE_ADDR *,
  			       struct dwarf2_cu *, struct partial_symtab *);
  
@@ -5076,16 +5116,18 @@ index 4cce36b..d394887 100644
  static const char *namespace_name (struct die_info *die,
  				   int *is_anonymous, struct dwarf2_cu *);
  
-@@ -1034,6 +1081,9 @@ static void process_die (struct die_info *, struct dwarf2_cu *);
+@@ -1032,7 +1079,10 @@ static gdb_byte *read_full_die (const struct die_reader_specs *reader,
  
- static char *dwarf2_linkage_name (struct die_info *, struct dwarf2_cu *);
+ static void process_die (struct die_info *, struct dwarf2_cu *);
  
+-static char *dwarf2_linkage_name (struct die_info *, struct dwarf2_cu *);
++static char *dwarf2_physname (struct die_info *, struct dwarf2_cu *);
++
 +static char *fortran_module_linkage_name (struct die_info *die,
 +					  struct dwarf2_cu *cu);
-+
+ 
  static char *dwarf2_canonicalize_name (char *, struct dwarf2_cu *,
  				       struct obstack *);
- 
 @@ -1076,7 +1126,7 @@ static int is_ref_attr (struct attribute *);
  
  static unsigned int dwarf2_get_ref_die_offset (struct attribute *);
@@ -5536,7 +5578,7 @@ index 4cce36b..d394887 100644
      case DW_TAG_class_type:
      case DW_TAG_interface_type:
      case DW_TAG_structure_type:
-@@ -2532,22 +2819,6 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
+@@ -2532,34 +2819,17 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
        break;
      }
  
@@ -5559,8 +5601,12 @@ index 4cce36b..d394887 100644
    if (built_actual_name)
      xfree (actual_name);
  }
-@@ -2557,9 +2828,9 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
-    name listed in the die.  */
+ 
+-/* Determine whether a die of type TAG living in a C++ class or
+-   namespace needs to have the name of the scope prepended to the
+-   name listed in the die.  */
++/* Determine whether DIE needs to have the name of the scope prepended
++   to the name listed in the die.  */
  
  static int
 -pdi_needs_namespace (enum dwarf_tag tag)
@@ -5571,7 +5617,7 @@ index 4cce36b..d394887 100644
      {
      case DW_TAG_namespace:
      case DW_TAG_typedef:
-@@ -2569,7 +2840,23 @@ pdi_needs_namespace (enum dwarf_tag tag)
+@@ -2569,7 +2839,23 @@ pdi_needs_namespace (enum dwarf_tag tag)
      case DW_TAG_union_type:
      case DW_TAG_enumeration_type:
      case DW_TAG_enumerator:
@@ -5595,7 +5641,7 @@ index 4cce36b..d394887 100644
      default:
        return 0;
      }
-@@ -2602,12 +2889,12 @@ static void
+@@ -2602,12 +2888,12 @@ static void
  add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc,
  		    CORE_ADDR *highpc, int need_pc, struct dwarf2_cu *cu)
  {
@@ -5612,7 +5658,7 @@ index 4cce36b..d394887 100644
  }
  
  /* Read a partial die corresponding to a subprogram and create a partial
-@@ -2698,27 +2985,6 @@ guess_structure_name (struct partial_die_info *struct_pdi,
+@@ -2698,27 +2984,6 @@ guess_structure_name (struct partial_die_info *struct_pdi,
  
        if (real_pdi->die_parent != NULL)
  	return;
@@ -5640,7 +5686,7 @@ index 4cce36b..d394887 100644
      }
  }
  
-@@ -3295,6 +3561,14 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3295,6 +3560,14 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
      case DW_TAG_imported_declaration:
      case DW_TAG_imported_module:
        processing_has_namespace_info = 1;
@@ -5655,7 +5701,7 @@ index 4cce36b..d394887 100644
        if (die->child != NULL && (die->tag == DW_TAG_imported_declaration
  				 || cu->language != language_fortran))
  	complaint (&symfile_complaints, _("Tag '%s' has unexpected children"),
-@@ -3310,41 +3584,68 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3310,41 +3583,68 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
  /* Return the fully qualified name of DIE, based on its DW_AT_name.
     If scope qualifiers are appropriate they will be added.  The result
     will be allocated on the objfile_obstack, or NULL if the DIE does
@@ -5745,7 +5791,7 @@ index 4cce36b..d394887 100644
  /* Read the import statement specified by the given die and record it.  */
  
  static void
-@@ -3354,9 +3655,15 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3354,9 +3654,15 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
    struct die_info *imported_die;
    const char *imported_name;
    const char *imported_name_prefix;
@@ -5763,7 +5809,7 @@ index 4cce36b..d394887 100644
    import_attr = dwarf2_attr (die, DW_AT_import, cu);
    if (import_attr == NULL)
      {
-@@ -3404,17 +3711,27 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3404,17 +3710,27 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
        return;
      }
  
@@ -5797,7 +5843,7 @@ index 4cce36b..d394887 100644
        canonical_name = alloca (strlen (imported_name_prefix) + 2 + strlen (imported_name) + 1);
        strcpy (canonical_name, imported_name_prefix);
        strcat (canonical_name, "::");
-@@ -3425,8 +3742,14 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3425,8 +3741,14 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
        canonical_name = alloca (strlen (imported_name) + 1);
        strcpy (canonical_name, imported_name);
      }
@@ -5814,7 +5860,7 @@ index 4cce36b..d394887 100644
  }
  
  static void
-@@ -3695,6 +4018,14 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3695,6 +4017,14 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
    struct attribute *attr;
  
    attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
@@ -5829,7 +5875,7 @@ index 4cce36b..d394887 100644
    if (!attr)
      return;
  
-@@ -3793,6 +4124,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3793,6 +4123,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
    char *name;
    CORE_ADDR baseaddr;
    struct block *block;
@@ -5837,7 +5883,7 @@ index 4cce36b..d394887 100644
    int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
  
    if (inlined_func)
-@@ -3811,13 +4143,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3811,13 +4142,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -5864,7 +5910,7 @@ index 4cce36b..d394887 100644
    lowpc += baseaddr;
    highpc += baseaddr;
  
-@@ -3844,14 +4186,19 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3844,14 +4185,19 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  
    cu->list_in_scope = &local_symbols;
  
@@ -5891,7 +5937,7 @@ index 4cce36b..d394887 100644
      }
  
    inherit_abstract_dies (die, cu);
-@@ -3867,6 +4214,13 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3867,6 +4213,13 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  			determine_prefix (die, cu),
  			processing_has_namespace_info);
  
@@ -5905,7 +5951,7 @@ index 4cce36b..d394887 100644
    /* If we have address ranges, record them.  */
    dwarf2_record_block_ranges (die, block, baseaddr, cu);
    
-@@ -3903,7 +4257,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3903,7 +4256,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
       as multiple lexical blocks?  Handling children in a sane way would
       be nasty.  Might be easier to properly extend generic blocks to 
       describe ranges.  */
@@ -5914,7 +5960,7 @@ index 4cce36b..d394887 100644
      return;
    lowpc += baseaddr;
    highpc += baseaddr;
-@@ -3920,7 +4274,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3920,7 +4273,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
      }
    new = pop_context ();
  
@@ -5923,7 +5969,7 @@ index 4cce36b..d394887 100644
      {
        struct block *block
          = finish_block (0, &local_symbols, new->old_blocks, new->start_addr,
-@@ -4075,7 +4429,8 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
+@@ -4075,7 +4428,8 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
     discontinuous, i.e. derived from DW_AT_ranges information.  */
  static int
  dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
@@ -5933,7 +5979,7 @@ index 4cce36b..d394887 100644
  {
    struct attribute *attr;
    CORE_ADDR low = 0;
-@@ -4103,7 +4458,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
+@@ -4103,7 +4457,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
  	{
  	  /* Value of the DW_AT_ranges attribute is the offset in the
  	     .debug_ranges section.  */
@@ -5942,7 +5988,7 @@ index 4cce36b..d394887 100644
  	    return 0;
  	  /* Found discontinuous range of addresses.  */
  	  ret = -1;
-@@ -4142,7 +4497,7 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
+@@ -4142,7 +4496,7 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
    CORE_ADDR low, high;
    struct die_info *child = die->child;
  
@@ -5951,7 +5997,7 @@ index 4cce36b..d394887 100644
      {
        *lowpc = min (*lowpc, low);
        *highpc = max (*highpc, high);
-@@ -4179,7 +4534,7 @@ get_scope_pc_bounds (struct die_info *die,
+@@ -4179,7 +4533,7 @@ get_scope_pc_bounds (struct die_info *die,
    CORE_ADDR best_high = (CORE_ADDR) 0;
    CORE_ADDR current_low, current_high;
  
@@ -5960,7 +6006,25 @@ index 4cce36b..d394887 100644
      {
        best_low = current_low;
        best_high = current_high;
-@@ -4661,7 +5016,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4474,7 +4828,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+ 	return;
+ 
+       /* Get physical name.  */
+-      physname = dwarf2_linkage_name (die, cu);
++      physname = dwarf2_physname (die, cu);
+ 
+       /* The name is already allocated along with this objfile, so we don't
+ 	 need to duplicate it for the type.  */
+@@ -4617,7 +4971,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+     return;
+ 
+   /* Get the mangled name.  */
+-  physname = dwarf2_linkage_name (die, cu);
++  physname = dwarf2_physname (die, cu);
+ 
+   /* Look up member function name in fieldlist.  */
+   for (i = 0; i < fip->nfnfields; i++)
+@@ -4661,7 +5015,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
    /* The name is already allocated along with this objfile, so we don't
       need to duplicate it for the type.  */
    fnp->physname = physname ? physname : "";
@@ -5969,7 +6033,7 @@ index 4cce36b..d394887 100644
    this_type = read_type_die (die, cu);
    if (this_type && TYPE_CODE (this_type) == TYPE_CODE_FUNC)
      {
-@@ -4721,18 +5076,18 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4721,18 +5075,18 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
      {
        /* Support the .debug_loc offsets */
        if (attr_form_is_block (attr))
@@ -5995,7 +6059,7 @@ index 4cce36b..d394887 100644
     }
  }
  
-@@ -4845,7 +5200,7 @@ quirk_gcc_member_function_pointer (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4845,7 +5199,7 @@ quirk_gcc_member_function_pointer (struct die_info *die, struct dwarf2_cu *cu)
      return NULL;
  
    domain_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (pfn_type, 0));
@@ -6004,7 +6068,7 @@ index 4cce36b..d394887 100644
    smash_to_method_type (type, domain_type, TYPE_TARGET_TYPE (pfn_type),
  			TYPE_FIELDS (pfn_type), TYPE_NFIELDS (pfn_type),
  			TYPE_VARARGS (pfn_type));
-@@ -4898,7 +5253,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4898,7 +5252,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
        return set_die_type (die, type, cu);
      }
  
@@ -6013,7 +6077,7 @@ index 4cce36b..d394887 100644
    INIT_CPLUS_SPECIFIC (type);
  
    name = dwarf2_name (die, cu);
-@@ -4907,14 +5262,18 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4907,14 +5261,18 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
        if (cu->language == language_cplus
  	  || cu->language == language_java)
  	{
@@ -6035,7 +6099,7 @@ index 4cce36b..d394887 100644
  	}
      }
  
-@@ -5124,7 +5483,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5124,7 +5482,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
        return set_die_type (die, type, cu);
      }
  
@@ -6044,7 +6108,7 @@ index 4cce36b..d394887 100644
  
    TYPE_CODE (type) = TYPE_CODE_ENUM;
    name = dwarf2_full_name (die, cu);
-@@ -5152,51 +5511,6 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5152,51 +5510,6 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
    return set_die_type (die, type, cu);
  }
  
@@ -6096,7 +6160,7 @@ index 4cce36b..d394887 100644
  /* Given a pointer to a die which begins an enumeration, process all
     the dies that define the members of the enumeration, and create the
     symbol for the enumeration type.
-@@ -5274,6 +5588,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5274,6 +5587,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
    new_symbol (die, this_type, cu);
  }
  
@@ -6126,7 +6190,7 @@ index 4cce36b..d394887 100644
  /* Extract all information from a DW_TAG_array_type DIE and put it in
     the DIE's type field.  For now, this only handles one dimensional
     arrays.  */
-@@ -5287,7 +5624,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5287,7 +5623,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *element_type, *range_type, *index_type;
    struct type **range_types = NULL;
    struct attribute *attr;
@@ -6135,7 +6199,7 @@ index 4cce36b..d394887 100644
    struct cleanup *back_to;
    char *name;
  
-@@ -5334,16 +5671,11 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5334,16 +5670,11 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
    type = element_type;
  
    if (read_array_order (die, cu) == DW_ORD_col_major)
@@ -6157,7 +6221,7 @@ index 4cce36b..d394887 100644
  
    /* Understand Dwarf2 support for vector types (like they occur on
       the PowerPC w/ AltiVec).  Gcc just adds another attribute to the
-@@ -5410,12 +5742,14 @@ read_set_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5410,12 +5741,14 @@ read_set_type (struct die_info *die, struct dwarf2_cu *cu)
    return set_die_type (die, set_type, cu);
  }
  
@@ -6174,7 +6238,7 @@ index 4cce36b..d394887 100644
    struct attribute *attr;
    struct symbol *sym;
    CORE_ADDR base = (CORE_ADDR) 0;
-@@ -5425,25 +5759,55 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5425,25 +5758,55 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
      {
        /* Support the .debug_loc offsets */
        if (attr_form_is_block (attr))
@@ -6237,7 +6301,7 @@ index 4cce36b..d394887 100644
  	  attr = dwarf2_attr (child_die, DW_AT_data_member_location, cu);
  	  if (attr)
  	    {
-@@ -5461,8 +5825,25 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5461,8 +5824,25 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
  	      SYMBOL_VALUE_ADDRESS (sym) = base + byte_offset;
  	      add_symbol_to_list (sym, &global_symbols);
  	    }
@@ -6263,7 +6327,7 @@ index 4cce36b..d394887 100644
      }
  }
  
-@@ -5530,7 +5911,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5530,7 +5910,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
        if (is_anonymous)
  	{
  	  const char *previous_prefix = determine_prefix (die, cu);
@@ -6272,7 +6336,7 @@ index 4cce36b..d394887 100644
  	}
      }
  
-@@ -5546,20 +5927,155 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5546,20 +5926,155 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
      }
  }
  
@@ -6312,18 +6376,18 @@ index 4cce36b..d394887 100644
 +
 +  if (die_is_declaration (die, cu))
 +    return NULL;
-+
+ 
+-  /* FIXME: Support the separate Fortran module namespaces.  */
 +  module_name = dwarf2_name (die, cu);
 +  if (!module_name)
 +    complaint (&symfile_complaints, _("DW_TAG_module has no name, offset 0x%x"),
 +               die->offset);
 +  type = init_type (TYPE_CODE_MODULE, 0, 0, module_name, objfile);
-+
-+  /* Create a context for reading the module variables.  */
  
--  /* FIXME: Support the separate Fortran module namespaces.  */
++  /* Create a context for reading the module variables.  */
++
 +  new = push_context (0, 0);
- 
++
 +  save_file_symbols = file_symbols;
 +  file_symbols = NULL;
 +  save_global_symbols = global_symbols;
@@ -6431,7 +6495,7 @@ index 4cce36b..d394887 100644
  }
  
  /* Return the name of the namespace represented by DIE.  Set
-@@ -5724,29 +6240,113 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5724,29 +6239,113 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
    struct type *type, *range_type, *index_type, *char_type;
    struct attribute *attr;
@@ -6559,7 +6623,7 @@ index 4cce36b..d394887 100644
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -5841,7 +6441,6 @@ static struct type *
+@@ -5841,7 +6440,6 @@ static struct type *
  read_typedef (struct die_info *die, struct dwarf2_cu *cu)
  {
    struct objfile *objfile = cu->objfile;
@@ -6567,7 +6631,7 @@ index 4cce36b..d394887 100644
    const char *name = NULL;
    struct type *this_type;
  
-@@ -5949,8 +6548,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5949,8 +6547,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *base_type;
    struct type *range_type;
    struct attribute *attr;
@@ -6577,7 +6641,7 @@ index 4cce36b..d394887 100644
    char *name;
    
    base_type = die_type (die, cu);
-@@ -5963,42 +6561,89 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5963,42 +6560,89 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  		     0, NULL, cu->objfile);
      }
  
@@ -6696,7 +6760,7 @@ index 4cce36b..d394887 100644
  
    name = dwarf2_name (die, cu);
    if (name)
-@@ -6469,6 +7114,7 @@ load_partial_dies (bfd *abfd, gdb_byte *buffer, gdb_byte *info_ptr,
+@@ -6469,6 +7113,7 @@ load_partial_dies (bfd *abfd, gdb_byte *buffer, gdb_byte *info_ptr,
  	  && abbrev->tag != DW_TAG_lexical_block
  	  && abbrev->tag != DW_TAG_variable
  	  && abbrev->tag != DW_TAG_namespace
@@ -6704,7 +6768,7 @@ index 4cce36b..d394887 100644
  	  && abbrev->tag != DW_TAG_member)
  	{
  	  /* Otherwise we skip to the next sibling, if any.  */
-@@ -6689,9 +7335,6 @@ read_partial_die (struct partial_die_info *part_die,
+@@ -6689,9 +7334,6 @@ read_partial_die (struct partial_die_info *part_die,
  	  if (part_die->dirname == NULL)
  	    part_die->dirname = DW_STRING (&attr);
  	  break;
@@ -6714,7 +6778,7 @@ index 4cce36b..d394887 100644
  	case DW_AT_low_pc:
  	  has_low_pc_attr = 1;
  	  part_die->lowpc = DW_ADDR (&attr);
-@@ -6923,7 +7566,8 @@ fixup_partial_die (struct partial_die_info *part_die,
+@@ -6923,7 +7565,8 @@ fixup_partial_die (struct partial_die_info *part_die,
    /* If we found a reference attribute and the DIE has no name, try
       to find a name in the referred to DIE.  */
  
@@ -6724,7 +6788,7 @@ index 4cce36b..d394887 100644
      {
        struct partial_die_info *spec_die;
  
-@@ -8265,10 +8909,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
+@@ -8265,10 +8908,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
       (i.e. when the value of a register or memory location is
       referenced, or a thread-local block, etc.).  Then again, it might
       not be worthwhile.  I'm assuming that it isn't unless performance
@@ -6739,7 +6803,7 @@ index 4cce36b..d394887 100644
  }
  
  /* Given a pointer to a DWARF information entry, figure out if we need
-@@ -8290,21 +8936,30 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8290,21 +8935,30 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -6766,7 +6830,7 @@ index 4cce36b..d394887 100644
 +
 +      /* Cache this symbol's name and the name's demangled form (if any).  */
 +
-+      linkagename = dwarf2_linkage_name (die, cu);
++      linkagename = dwarf2_physname (die, cu);
 +      SYMBOL_SET_NAMES (sym, linkagename, strlen (linkagename), objfile);
 +      if (cu->language == language_fortran)
 +	{
@@ -6777,7 +6841,7 @@ index 4cce36b..d394887 100644
  
        /* Default assumptions.
           Use the passed type or decode it from the die.  */
-@@ -8402,9 +9057,28 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8402,9 +9056,28 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  if (attr)
  	    {
  	      var_decode_location (attr, sym, cu);
@@ -6807,7 +6871,7 @@ index 4cce36b..d394887 100644
  	      else
  		add_symbol_to_list (sym, cu->list_in_scope);
  	    }
-@@ -8534,7 +9208,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8534,7 +9207,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  add_symbol_to_list (sym, cu->list_in_scope);
  	  break;
  	case DW_TAG_enumerator:
@@ -6816,7 +6880,7 @@ index 4cce36b..d394887 100644
  	  attr = dwarf2_attr (die, DW_AT_const_value, cu);
  	  if (attr)
  	    {
-@@ -8558,6 +9232,16 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8558,6 +9231,16 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  SYMBOL_CLASS (sym) = LOC_TYPEDEF;
  	  add_symbol_to_list (sym, &global_symbols);
  	  break;
@@ -6833,7 +6897,7 @@ index 4cce36b..d394887 100644
  	default:
  	  /* Not a tag we recognize.  Hopefully we aren't processing
  	     trash data, but since we must specifically ignore things
-@@ -8571,8 +9255,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8571,8 +9254,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
        /* For the benefit of old versions of GCC, check for anonymous
  	 namespaces based on the demangled name.  */
        if (!processing_has_namespace_info
@@ -6843,7 +6907,7 @@ index 4cce36b..d394887 100644
  	cp_scan_for_anonymous_namespaces (sym);
      }
    return (sym);
-@@ -8823,12 +9506,18 @@ read_type_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8823,12 +9505,18 @@ read_type_die (struct die_info *die, struct dwarf2_cu *cu)
      case DW_TAG_namespace:
        this_type = read_namespace_type (die, cu);
        break;
@@ -6862,7 +6926,7 @@ index 4cce36b..d394887 100644
    return this_type;
  }
  
-@@ -8910,10 +9599,97 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8910,10 +9598,100 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
  	     So it does not need a prefix.  */
  	  return "";
        default:
@@ -6871,10 +6935,10 @@ index 4cce36b..d394887 100644
        }
  }
  
-+/* Determines the prefix for a symbol's physname. Unlike determine_prefix,
++/* Determines the prefix for a symbol's physname.  Unlike determine_prefix,
 +   this method does not simply look at the DIE's immediate parent.
 +   It will compute the symbol's physname by scanning through all parent
-+   DIEs until it gets to the compilation unit's DIE. */
++   DIEs until it gets to the compilation unit's DIE.  */
 +
 +static char *
 +physname_prefix (struct die_info *die, struct dwarf2_cu *cu)
@@ -6883,6 +6947,7 @@ index 4cce36b..d394887 100644
 +  struct ui_file *buf;
 +  struct die_info *d, *spec_die;
 +  struct dwarf2_cu *spec_cu;
++  char *name;
 +
 +  /* Construct a stack containing all of the DIE's parents.  Caution
 +     must be observed for dealing with DW_AT_specification. */
@@ -6904,7 +6969,7 @@ index 4cce36b..d394887 100644
 +      d = d->parent;
 +    }
 +
-+  /* Now pop all the elements, printing their names as we go */
++  /* Now pop all the elements, printing their names as we go.  */
 +  buf = mem_fileopen ();
 +  while (!VEC_empty (die_info_p, die_list))
 +    {
@@ -6920,7 +6985,9 @@ index 4cce36b..d394887 100644
 +	}
 +    }
 +
-+  return ui_file_obsavestring (buf, &cu->objfile->objfile_obstack, &length);
++  name = ui_file_obsavestring (buf, &cu->objfile->objfile_obstack, &length);
++  ui_file_delete (buf);
++  return name;
 +}
 +
 +static void
@@ -6961,8 +7028,16 @@ index 4cce36b..d394887 100644
  /* Return a newly-allocated string formed by concatenating PREFIX and
     SUFFIX with appropriate separator.  If PREFIX or SUFFIX is NULL or empty, then
     simply copy the SUFFIX or PREFIX, respectively.  If OBS is non-null,
-@@ -8969,11 +9745,105 @@ static char *
- dwarf2_linkage_name (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8963,17 +9741,111 @@ sibling_die (struct die_info *die)
+   return die->sibling;
+ }
+ 
+-/* Get linkage name of a die, return NULL if not found.  */
++/* Construct a physname for the given DIE in CU. */
+ 
+ static char *
+-dwarf2_linkage_name (struct die_info *die, struct dwarf2_cu *cu)
++dwarf2_physname (struct die_info *die, struct dwarf2_cu *cu)
  {
    struct attribute *attr;
 +  char *name;
@@ -7015,11 +7090,7 @@ index 4cce36b..d394887 100644
 +		fputs_unfiltered (" const", buf);
 +	    }
 +	}
- 
--  attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
--  if (attr && DW_STRING (attr))
--    return DW_STRING (attr);
--  return dwarf2_name (die, cu);
++
 +      name = ui_file_obsavestring (buf, &cu->objfile->objfile_obstack,
 +				   &length);
 +      ui_file_delete (buf);
@@ -7056,7 +7127,11 @@ index 4cce36b..d394887 100644
 +      if (module_name)
 +	{
 +	  char *retval;
-+
+ 
+-  attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
+-  if (attr && DW_STRING (attr))
+-    return DW_STRING (attr);
+-  return dwarf2_name (die, cu);
 +	  /* `__modulename_MOD_variablename0'.  */
 +	  retval = obstack_alloc (&cu->objfile->objfile_obstack,
 +				  2 + strlen (module_name) + 5 + strlen (name)
@@ -7071,7 +7146,7 @@ index 4cce36b..d394887 100644
  }
  
  /* Get name of a die, return NULL if not found.  */
-@@ -10200,11 +11070,11 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
+@@ -10200,11 +11072,11 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
    return 0;
  }
  
@@ -7086,7 +7161,7 @@ index 4cce36b..d394887 100644
  {
    if (attr->form == DW_FORM_sdata)
      return DW_SND (attr);
-@@ -11009,8 +11879,6 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11009,8 +11881,6 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
  {
    gdb_byte *mac_ptr, *mac_end;
    struct macro_source_file *current_file = 0;
@@ -7095,7 +7170,7 @@ index 4cce36b..d394887 100644
  
    if (dwarf2_per_objfile->macinfo.buffer == NULL)
      {
-@@ -11018,29 +11886,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11018,29 +11888,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
        return;
      }
  
@@ -7130,7 +7205,7 @@ index 4cce36b..d394887 100644
          }
  
        macinfo_type = read_1_byte (abfd, mac_ptr);
-@@ -11051,92 +11909,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11051,92 +11911,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
            /* A zero macinfo type indicates the end of the macro
               information.  */
          case 0:
@@ -7224,7 +7299,7 @@ index 4cce36b..d394887 100644
  
          case DW_MACINFO_define:
          case DW_MACINFO_undef:
-@@ -11151,31 +11924,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11151,31 +11926,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
              mac_ptr += bytes_read;
  
              if (! current_file)
@@ -7267,7 +7342,7 @@ index 4cce36b..d394887 100644
            }
            break;
  
-@@ -11189,22 +11950,9 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11189,22 +11952,9 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
              file = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
              mac_ptr += bytes_read;
  
@@ -7293,7 +7368,7 @@ index 4cce36b..d394887 100644
            }
            break;
  
-@@ -11258,7 +12006,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11258,7 +12008,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
            }
            break;
          }
@@ -7302,7 +7377,7 @@ index 4cce36b..d394887 100644
  }
  
  /* Check if the attribute's form is a DW_FORM_block*
-@@ -11318,6 +12066,34 @@ attr_form_is_constant (struct attribute *attr)
+@@ -11318,6 +12068,34 @@ attr_form_is_constant (struct attribute *attr)
      }
  }
  
@@ -7337,7 +7412,7 @@ index 4cce36b..d394887 100644
  static void
  dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
  			     struct dwarf2_cu *cu)
-@@ -11347,35 +12123,25 @@ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
+@@ -11347,35 +12125,25 @@ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
        SYMBOL_COMPUTED_OPS (sym) = &dwarf2_loclist_funcs;
        SYMBOL_LOCATION_BATON (sym) = baton;
      }
@@ -7388,7 +7463,7 @@ index 4cce36b..d394887 100644
      }
  }
  
-@@ -11663,6 +12429,31 @@ offset_and_type_eq (const void *item_lhs, const void *item_rhs)
+@@ -11663,6 +12431,31 @@ offset_and_type_eq (const void *item_lhs, const void *item_rhs)
    return ofs_lhs->offset == ofs_rhs->offset;
  }
  
@@ -7420,7 +7495,7 @@ index 4cce36b..d394887 100644
  /* Set the type associated with DIE to TYPE.  Save it in CU's hash
     table if necessary.  For convenience, return TYPE.  */
  
-@@ -11671,6 +12462,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -11671,6 +12464,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  {
    struct dwarf2_offset_and_type **slot, ofs;
  
@@ -7429,7 +7504,7 @@ index 4cce36b..d394887 100644
    if (cu->type_hash == NULL)
      {
        gdb_assert (cu->per_cu != NULL);
-@@ -11813,23 +12606,13 @@ show_dwarf2_cmd (char *args, int from_tty)
+@@ -11813,23 +12608,13 @@ show_dwarf2_cmd (char *args, int from_tty)
    cmd_show_list (show_dwarf2_cmdlist, from_tty, "");
  }
  
@@ -7457,7 +7532,7 @@ index 4cce36b..d394887 100644
  }
  
  /* munmap debug sections for OBJFILE, if necessary.  */
-@@ -11838,15 +12621,15 @@ static void
+@@ -11838,15 +12623,15 @@ static void
  dwarf2_per_objfile_free (struct objfile *objfile, void *d)
  {
    struct dwarf2_per_objfile *data = d;
@@ -7482,7 +7557,7 @@ index 4cce36b..d394887 100644
  }
  
  void _initialize_dwarf2_read (void);
-@@ -11854,6 +12637,7 @@ void _initialize_dwarf2_read (void);
+@@ -11854,6 +12639,7 @@ void _initialize_dwarf2_read (void);
  void
  _initialize_dwarf2_read (void)
  {
@@ -7523,7 +7598,7 @@ index 6e79d4a..198bae3 100644
    default_symfile_offsets,	/* sym_offsets:  Translate ext. to int. relocation */
    elf_symfile_segments,		/* sym_segments: Get segment information from
 diff --git a/gdb/eval.c b/gdb/eval.c
-index 7e41d39..37ffe23 100644
+index 2926465..4c6de78 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
 @@ -39,8 +39,12 @@
@@ -7664,7 +7739,7 @@ index 7e41d39..37ffe23 100644
  	}
        else if (op == OP_VAR_VALUE)
  	{
-@@ -1542,7 +1594,10 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1549,7 +1601,10 @@ evaluate_subexp_standard (struct type *expect_type,
  
        /* First determine the type code we are dealing with.  */
        arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
@@ -7675,7 +7750,7 @@ index 7e41d39..37ffe23 100644
        code = TYPE_CODE (type);
  
        if (code == TYPE_CODE_PTR)
-@@ -1709,6 +1764,37 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1716,6 +1771,37 @@ evaluate_subexp_standard (struct type *expect_type,
  	  error (_("non-pointer-to-member value used in pointer-to-member construct"));
  	}
  
@@ -7713,7 +7788,7 @@ index 7e41d39..37ffe23 100644
      case BINOP_CONCAT:
        arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
        arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
-@@ -1980,13 +2066,19 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1987,13 +2073,19 @@ evaluate_subexp_standard (struct type *expect_type,
        {
  	int subscript_array[MAX_FORTRAN_DIMS];
  	int array_size_array[MAX_FORTRAN_DIMS];
@@ -7733,7 +7808,7 @@ index 7e41d39..37ffe23 100644
  	tmp_type = check_typedef (value_type (arg1));
  	ndimensions = calc_f77_array_dims (type);
  
-@@ -2016,6 +2108,9 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2023,6 +2115,9 @@ evaluate_subexp_standard (struct type *expect_type,
  	    upper = f77_get_upperbound (tmp_type);
  	    lower = f77_get_lowerbound (tmp_type);
  
@@ -7743,7 +7818,7 @@ index 7e41d39..37ffe23 100644
  	    array_size_array[nargs - i - 1] = upper - lower + 1;
  
  	    /* Zero-normalize subscripts so that offsetting will work. */
-@@ -2034,13 +2129,25 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2041,13 +2136,25 @@ evaluate_subexp_standard (struct type *expect_type,
  	      tmp_type = check_typedef (TYPE_TARGET_TYPE (tmp_type));
  	  }
  
@@ -7773,7 +7848,7 @@ index 7e41d39..37ffe23 100644
  
  	/* Let us now play a dirty trick: we will take arg1 
  	   which is a value node pointing to the topmost level
-@@ -2050,7 +2157,7 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2057,7 +2164,7 @@ evaluate_subexp_standard (struct type *expect_type,
  	   returns the correct type value */
  
  	deprecated_set_value_type (arg1, tmp_type);
@@ -7782,7 +7857,7 @@ index 7e41d39..37ffe23 100644
        }
  
      case BINOP_LOGICAL_AND:
-@@ -2591,7 +2698,7 @@ evaluate_subexp_for_address (struct expression *exp, int *pos,
+@@ -2598,7 +2705,7 @@ evaluate_subexp_for_address (struct expression *exp, int *pos,
        (*pos) += 5 + BYTES_TO_EXP_ELEM (tem + 1);
        x = value_aggregate_elt (exp->elts[pc + 1].type,
  			       &exp->elts[pc + 3].string,
@@ -7791,7 +7866,7 @@ index 7e41d39..37ffe23 100644
        if (x == NULL)
  	error (_("There is no field named %s"), &exp->elts[pc + 3].string);
        return x;
-@@ -2636,7 +2743,7 @@ evaluate_subexp_with_coercion (struct expression *exp,
+@@ -2643,7 +2750,7 @@ evaluate_subexp_with_coercion (struct expression *exp,
  {
    enum exp_opcode op;
    int pc;
@@ -7800,7 +7875,7 @@ index 7e41d39..37ffe23 100644
    struct symbol *var;
    struct type *type;
  
-@@ -2647,12 +2754,17 @@ evaluate_subexp_with_coercion (struct expression *exp,
+@@ -2654,12 +2761,17 @@ evaluate_subexp_with_coercion (struct expression *exp,
      {
      case OP_VAR_VALUE:
        var = exp->elts[pc + 2].symbol;
@@ -7819,7 +7894,7 @@ index 7e41d39..37ffe23 100644
  	  return value_cast (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
  			     val);
  	}
-@@ -2704,9 +2816,13 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
+@@ -2711,9 +2823,13 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
  
      case OP_VAR_VALUE:
        (*pos) += 4;
@@ -9787,7 +9862,7 @@ index 79d33fe..d3b4fa1 100644
     once for each known thread.  */
  typedef int (*thread_callback_func) (struct thread_info *, void *);
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 2f77dca..8146175 100644
+index 2f77dca..90abf2c 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
 @@ -38,6 +38,9 @@
@@ -10158,7 +10233,17 @@ index 2f77dca..8146175 100644
    return type;
  }
  
-@@ -2820,33 +2983,42 @@ type_pair_eq (const void *item_lhs, const void *item_rhs)
+@@ -2004,7 +2167,8 @@ rank_one_type (struct type *parm, struct type *arg)
+       switch (TYPE_CODE (arg))
+ 	{
+ 	case TYPE_CODE_PTR:
+-	  if (TYPE_CODE (TYPE_TARGET_TYPE (parm)) == TYPE_CODE_VOID)
++	  if (TYPE_CODE (TYPE_TARGET_TYPE (parm)) == TYPE_CODE_VOID
++	      && TYPE_CODE (TYPE_TARGET_TYPE (arg)) != TYPE_CODE_VOID)
+ 	    return VOID_PTR_CONVERSION_BADNESS;
+ 	  else
+ 	    return rank_one_type (TYPE_TARGET_TYPE (parm), 
+@@ -2820,33 +2984,42 @@ type_pair_eq (const void *item_lhs, const void *item_rhs)
  }
  
  /* Allocate the hash table used by copy_type_recursive to walk
@@ -10216,7 +10301,7 @@ index 2f77dca..8146175 100644
      return type;
  
    /* This type shouldn't be pointing to any types in other objfiles;
-@@ -2861,8 +3033,10 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2861,8 +3034,10 @@ copy_type_recursive (struct objfile *objfile,
    new_type = alloc_type_arch (get_type_arch (type));
  
    /* We must add the new type to the hash table immediately, in case
@@ -10229,7 +10314,7 @@ index 2f77dca..8146175 100644
    stored->old = type;
    stored->new = new_type;
    *slot = stored;
-@@ -2873,6 +3047,19 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2873,6 +3048,19 @@ copy_type_recursive (struct objfile *objfile,
    TYPE_OBJFILE_OWNED (new_type) = 0;
    TYPE_OWNER (new_type).gdbarch = get_type_arch (type);
  
@@ -10249,7 +10334,7 @@ index 2f77dca..8146175 100644
    if (TYPE_NAME (type))
      TYPE_NAME (new_type) = xstrdup (TYPE_NAME (type));
    if (TYPE_TAG_NAME (type))
-@@ -2881,12 +3068,45 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2881,12 +3069,45 @@ copy_type_recursive (struct objfile *objfile,
    TYPE_INSTANCE_FLAGS (new_type) = TYPE_INSTANCE_FLAGS (type);
    TYPE_LENGTH (new_type) = TYPE_LENGTH (type);
  
@@ -10295,7 +10380,7 @@ index 2f77dca..8146175 100644
        TYPE_FIELDS (new_type) = XCALLOC (nfields, struct field);
        for (i = 0; i < nfields; i++)
  	{
-@@ -2895,8 +3115,8 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2895,8 +3116,8 @@ copy_type_recursive (struct objfile *objfile,
  	  TYPE_FIELD_BITSIZE (new_type, i) = TYPE_FIELD_BITSIZE (type, i);
  	  if (TYPE_FIELD_TYPE (type, i))
  	    TYPE_FIELD_TYPE (new_type, i)
@@ -10306,7 +10391,7 @@ index 2f77dca..8146175 100644
  	  if (TYPE_FIELD_NAME (type, i))
  	    TYPE_FIELD_NAME (new_type, i) = 
  	      xstrdup (TYPE_FIELD_NAME (type, i));
-@@ -2915,6 +3135,16 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2915,6 +3136,16 @@ copy_type_recursive (struct objfile *objfile,
  				  xstrdup (TYPE_FIELD_STATIC_PHYSNAME (type,
  								       i)));
  	      break;
@@ -10323,7 +10408,7 @@ index 2f77dca..8146175 100644
  	    default:
  	      internal_error (__FILE__, __LINE__,
  			      _("Unexpected type field location kind: %d"),
-@@ -2923,17 +3153,30 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2923,17 +3154,30 @@ copy_type_recursive (struct objfile *objfile,
  	}
      }
  
@@ -10360,7 +10445,7 @@ index 2f77dca..8146175 100644
    /* Maybe copy the type_specific bits.
  
       NOTE drow/2005-12-09: We do not copy the C++-specific bits like
-@@ -2951,6 +3194,17 @@ copy_type_recursive (struct objfile *objfile,
+@@ -2951,6 +3195,17 @@ copy_type_recursive (struct objfile *objfile,
    return new_type;
  }
  
@@ -10378,7 +10463,7 @@ index 2f77dca..8146175 100644
  /* Make a copy of the given TYPE, except that the pointer & reference
     types are not preserved.
     
-@@ -2973,6 +3227,217 @@ copy_type (const struct type *type)
+@@ -2973,6 +3228,217 @@ copy_type (const struct type *type)
    return new_type;
  }
  
@@ -10596,7 +10681,7 @@ index 2f77dca..8146175 100644
  
  /* Helper functions to initialize architecture-specific types.  */
  
-@@ -3463,6 +3928,11 @@ void
+@@ -3463,6 +3929,11 @@ void
  _initialize_gdbtypes (void)
  {
    gdbtypes_data = gdbarch_data_register_post_init (gdbtypes_post_init);
@@ -11538,7 +11623,7 @@ index c650e07..660fdf6 100644
  						 const domain_enum);
  
 diff --git a/gdb/linespec.c b/gdb/linespec.c
-index 3e943a1..3b8956c 100644
+index 3e943a1..b96d425 100644
 --- a/gdb/linespec.c
 +++ b/gdb/linespec.c
 @@ -30,6 +30,7 @@
@@ -11584,36 +11669,33 @@ index 3e943a1..3b8956c 100644
    /* Keep any template parameters */
    if (*p == '<')
      p = find_template_name_end (p);
-@@ -1257,7 +1278,10 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
+@@ -1257,6 +1278,9 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
        /* Move pointer ahead to next double-colon.  */
        while (*p && (p[0] != ' ') && (p[0] != '\t') && (p[0] != '\''))
  	{
--	  if (p[0] == '<')
-+	  if (current_language->la_language == language_cplus
-+	      && strncmp (p, "operator", 8) == 0)
++	  if (current_language->la_language == language_cplus)
 +	    p += cp_validate_operator (p);
-+	  else if (p[0] == '<')
++
+ 	  if (p[0] == '<')
  	    {
  	      temp_end = find_template_name_end (p);
- 	      if (!temp_end)
-@@ -1334,6 +1358,16 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
+@@ -1334,6 +1358,15 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
  	  while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p != ':')
  	    p++;
  	  /* At this point p->"".  String ended.  */
-+	  /* Nope. C++ operators could have spaces in them
++	  /* Nope, C++ operators could have spaces in them
 +	     ("foo::operator <" or "foo::operator delete []").
-+	     I apologize, this is a bit hacky... */
++	     I apologize, this is a bit hacky...  */
 +	  if (current_language->la_language == language_cplus
-+	      && *p == ' ' && p - 8 - *argptr + 1 > 0
-+	      && strncmp (p - 8, "operator", 8) == 0)
++	      && *p == ' ' && p - 8 - *argptr + 1 > 0)
 +	    {
-+	      /* The above loop has already swallowed "operator" */
++	      /* The above loop has already swallowed "operator".  */
 +	      p += cp_validate_operator (p - 8) - 8;
 +	    }
  	}
  
        /* Allocate our own copy of the substring between argptr and
-@@ -1407,6 +1441,7 @@ lookup_prefix_sym (char **argptr, char *p)
+@@ -1407,6 +1440,7 @@ lookup_prefix_sym (char **argptr, char *p)
  {
    char *p1;
    char *copy;
@@ -11621,7 +11703,7 @@ index 3e943a1..3b8956c 100644
  
    /* Extract the class name.  */
    p1 = p;
-@@ -1425,7 +1460,26 @@ lookup_prefix_sym (char **argptr, char *p)
+@@ -1425,7 +1459,26 @@ lookup_prefix_sym (char **argptr, char *p)
    /* At this point p1->"::inA::fun", p->"inA::fun" copy->"AAA",
       argptr->"inA::fun" */
  
@@ -11649,7 +11731,36 @@ index 3e943a1..3b8956c 100644
  }
  
  /* This finds the method COPY in the class whose type is T and whose
-@@ -1780,7 +1834,7 @@ symbol_found (int funfirstline, char ***canonical, char *copy,
+@@ -1474,26 +1527,16 @@ find_method (int funfirstline, char ***canonical, char *saved_arg,
+     }
+   else
+     {
+-      char *tmp;
+-
+-      if (is_operator_name (copy))
+-	{
+-	  tmp = (char *) alloca (strlen (copy + 3) + 9);
+-	  strcpy (tmp, "operator ");
+-	  strcat (tmp, copy + 3);
+-	}
+-      else
+-	tmp = copy;
+       if (not_found_ptr)
+         *not_found_ptr = 1;
+-      if (tmp[0] == '~')
++      if (copy[0] == '~')
+ 	cplusplus_error (saved_arg,
+ 			 "the class `%s' does not have destructor defined\n",
+ 			 SYMBOL_PRINT_NAME (sym_class));
+       else
+ 	cplusplus_error (saved_arg,
+ 			 "the class %s does not have any method named %s\n",
+-			 SYMBOL_PRINT_NAME (sym_class), tmp);
++			 SYMBOL_PRINT_NAME (sym_class), copy);
+     }
+ }
+ 
+@@ -1780,7 +1823,7 @@ symbol_found (int funfirstline, char ***canonical, char *copy,
  	{
  	  struct blockvector *bv = BLOCKVECTOR (SYMBOL_SYMTAB (sym));
  	  struct block *b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
@@ -12565,7 +12676,7 @@ index 0000000..5654546
 +        return result
 diff --git a/gdb/python/lib/gdb/FrameWrapper.py b/gdb/python/lib/gdb/FrameWrapper.py
 new file mode 100644
-index 0000000..39f8246
+index 0000000..b790a54
 --- /dev/null
 +++ b/gdb/python/lib/gdb/FrameWrapper.py
 @@ -0,0 +1,112 @@
@@ -12601,7 +12712,7 @@ index 0000000..39f8246
 +
 +        stream.write (sym.print_name + "=")
 +        try:
-+            val = self.frame.read_var (sym)
++            val = self.read_var (sym)
 +            if val != None:
 +                val = str (val)
 +        # FIXME: would be nice to have a more precise exception here.
@@ -12646,21 +12757,21 @@ index 0000000..39f8246
 +    # FIXME: this should probably just be a method on gdb.Frame.
 +    # But then we need stream wrappers.
 +    def describe (self, stream, full):
-+        if self.frame.type () == gdb.DUMMY_FRAME:
++        if self.type () == gdb.DUMMY_FRAME:
 +            stream.write (" <function called from gdb>\n")
-+        elif self.frame.type () == gdb.SIGTRAMP_FRAME:
++        elif self.type () == gdb.SIGTRAMP_FRAME:
 +            stream.write (" <signal handler called>\n")
 +        else:
-+            sal = self.frame.find_sal ()
-+            pc = self.frame.pc ()
-+            name = self.frame.name ()
++            sal = self.find_sal ()
++            pc = self.pc ()
++            name = self.name ()
 +            if not name:
 +                name = "??"
 +            if pc != sal.pc or not sal.symtab:
 +                stream.write (" 0x%08x in" % pc)
 +            stream.write (" " + name + " (")
 +
-+            func = self.frame.function ()
++            func = self.function ()
 +            self.print_frame_args (stream, func)
 +
 +            stream.write (")")
@@ -12669,7 +12780,7 @@ index 0000000..39f8246
 +                stream.write (" at " + sal.symtab.filename)
 +                stream.write (":" + str (sal.line))
 +
-+            if not self.frame.name () or (not sal.symtab or not sal.symtab.filename):
++            if not self.name () or (not sal.symtab or not sal.symtab.filename):
 +                lib = gdb.solib_address (pc)
 +                if lib:
 +                    stream.write (" from " + lib)
@@ -17903,7 +18014,7 @@ index 49c0437..84a476e 100644
 +  return 1;
 +}
 diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
-index 714aa11..9fa1c44 100644
+index 58bcee3..b2e7b7d 100644
 --- a/gdb/python/py-value.c
 +++ b/gdb/python/py-value.c
 @@ -25,6 +25,7 @@
@@ -17925,7 +18036,7 @@ index 714aa11..9fa1c44 100644
  #define builtin_type_pybool \
    language_bool_type (python_language, python_gdbarch)
  
-@@ -902,7 +907,34 @@ convert_value_from_python (PyObject *obj)
+@@ -913,7 +918,34 @@ convert_value_from_python (PyObject *obj)
  	{
  	  LONGEST l = PyLong_AsLongLong (obj);
  
@@ -17961,7 +18072,7 @@ index 714aa11..9fa1c44 100644
  	    value = value_from_longest (builtin_type_pylong, l);
  	}
        else if (PyFloat_Check (obj))
-@@ -961,6 +993,25 @@ gdbpy_history (PyObject *self, PyObject *args)
+@@ -972,6 +1004,25 @@ gdbpy_history (PyObject *self, PyObject *args)
    return value_to_value_object (res_val);
  }
  
@@ -17987,7 +18098,7 @@ index 714aa11..9fa1c44 100644
  void
  gdbpy_initialize_values (void)
  {
-@@ -971,6 +1022,8 @@ gdbpy_initialize_values (void)
+@@ -982,6 +1033,8 @@ gdbpy_initialize_values (void)
    PyModule_AddObject (gdb_module, "Value", (PyObject *) &value_object_type);
  
    values_in_python = NULL;
@@ -18749,7 +18860,7 @@ index 6cfaa85..68aadc0 100644
  
  extern initialize_file_ftype _initialize_svr4_solib; /* -Wmissing-prototypes */
 diff --git a/gdb/solib.c b/gdb/solib.c
-index c7fd0fc..6f31852 100644
+index a2ad0c4..3574e62 100644
 --- a/gdb/solib.c
 +++ b/gdb/solib.c
 @@ -1127,13 +1127,12 @@ show_auto_solib_add (struct ui_file *file, int from_tty,
@@ -21695,10 +21806,30 @@ index 4095ccf..03c07d5 100644
 +gdb_test "break *$func2_name" \
      "Breakpoint $decimal at 0x2....: file .*"
 diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.cc b/gdb/testsuite/gdb.cp/cplusfuncs.cc
-index 7f033d6..1a50a32 100644
+index 7f033d6..11dba06 100644
 --- a/gdb/testsuite/gdb.cp/cplusfuncs.cc
 +++ b/gdb/testsuite/gdb.cp/cplusfuncs.cc
-@@ -191,6 +191,12 @@ char *	dm_type_char_star (char * p)		{ return p; }
+@@ -46,7 +46,9 @@ public:
+   void  operator []     (foo&);
+   void  operator ()     (foo&);
+   void* operator new    (size_t) throw ();
++  void* operator new[]  (size_t) throw ();
+   void  operator delete (void *);
++  void  operator delete[] (void *);
+   /**/  operator int    ();
+   /**/  operator char*  ();
+ 
+@@ -115,7 +117,9 @@ void  foo::operator ->*    (foo& afoo) { afoo.ifoo = 0; }
+ void  foo::operator []     (foo& afoo) { afoo.ifoo = 0; }
+ void  foo::operator ()     (foo& afoo) { afoo.ifoo = 0; }
+ void* foo::operator new    (size_t ival) throw () { ival = 0; return 0; }
++void* foo::operator new[]    (size_t ival) throw () { ival = 0; return 0; }
+ void  foo::operator delete (void *ptr) { ptr = 0; }
++void  foo::operator delete[] (void *ptr) { ptr = 0; }
+ /**/  foo::operator int    () { return 0; }
+ /**/  foo::operator char*  () { return 0; }
+ 
+@@ -191,6 +195,12 @@ char *	dm_type_char_star (char * p)		{ return p; }
  int	dm_type_foo_ref (foo & foo)		{ return foo.ifoo; }
  int *	dm_type_int_star (int * p)		{ return p; }
  long *	dm_type_long_star (long * p)		{ return p; }
@@ -21712,11 +21843,15 @@ index 7f033d6..1a50a32 100644
 +typedef int myint;
 +int	dm_type_typedef (myint i)		{ return i; }
 diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
-index 5e08768..8c8e038 100644
+index 5e08768..10ffdf0 100644
 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
 +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
-@@ -66,9 +66,25 @@ set dm_type_unsigned_int	"unsigned"
- set dm_type_void		""
+@@ -63,12 +63,28 @@ set dm_type_foo_ref 		"foo&"
+ set dm_type_int_star		"int*"
+ set dm_type_long_star		"long*"
+ set dm_type_unsigned_int	"unsigned"
+-set dm_type_void		""
++set dm_type_void		"void"
  set dm_type_void_star		"void*"
  
 +# Some other vagaries of GDB's type printing machinery.  The integer types
@@ -21741,7 +21876,7 @@ index 5e08768..8c8e038 100644
      global dm_type_char_star
      global dm_type_char_star_quoted
      global dm_type_foo_ref
-@@ -77,6 +93,11 @@ proc probe_demangler { } {
+@@ -77,8 +93,13 @@ proc probe_demangler { } {
      global dm_type_unsigned_int
      global dm_type_void
      global dm_type_void_star
@@ -21751,13 +21886,16 @@ index 5e08768..8c8e038 100644
 +    global dm_type_unsigned_long
 +    global dm_type_typedef
  
-     send_gdb "print &'foo::operator,(foo&)'\n"
+-    send_gdb "print &'foo::operator,(foo&)'\n"
++    send_gdb "print &foo::operator,(foo&)\n"
      gdb_expect {
+ 	-re ".*foo::operator, \\(.*foo.*&.*\\).*\r\n$gdb_prompt $" {
+ 	    # v2 demangler
 @@ -97,6 +118,26 @@ proc probe_demangler { } {
  	}
      }
  
-+    send_gdb "print &'foo::operator char*()'\n"
++    send_gdb "print &foo::operator char*($dm_type_void)\n"
 +    gdb_expect {
 +	-re ".*foo::operator char \\*\\(void\\).*\r\n$gdb_prompt $" {
 +	    # v2 demangler or GDB type printer
@@ -21894,7 +22032,50 @@ index 5e08768..8c8e038 100644
  }
  
  #
-@@ -345,8 +486,9 @@ proc print_addr { name } {
+@@ -241,6 +382,7 @@ proc info_func_regexp { name demangled } {
+     global gdb_prompt
+ 
+     send_gdb "info function $name\n"
++    set demangled [regsub {\\\(void\\\)} $demangled {\(\)}]
+     gdb_expect {
+ 	-re ".*File .*:\r\n(class |)$demangled\r\n.*$gdb_prompt $" {
+ 	    pass "info function for \"$name\""
+@@ -277,16 +419,16 @@ proc print_addr_2 { name good } {
+ 
+     set good_pattern [string_to_regexp $good]
+ 
+-    send_gdb "print &'$name'\n"
++    send_gdb "print &$name\n"
+     gdb_expect {
+ 	-re ".* = .* $hex <$good_pattern>\r\n$gdb_prompt $" {
+-	    pass "print &'$name'"
++	    pass "print &$name"
+ 	}
+ 	-re ".*$gdb_prompt $" {
+-	    fail "print &'$name'"
++	    fail "print &$name"
+ 	}
+ 	timeout {
+-	    fail "print &'$name' (timeout)"
++	    fail "print &$name (timeout)"
+ 	}
+     }
+ }
+@@ -327,7 +469,12 @@ proc print_addr_2_kfail { name good bad bugid } {
+ #
+ 
+ proc print_addr { name } {
+-    print_addr_2 "$name" "$name"
++    set expected [regsub {\(void\)} $name {()}]
++    if {[string first "::" $name] == -1} {
++	# C function -- must be qutoed
++	set name "'$name'"
++    }
++    print_addr_2 "$name" $expected
+ }
+ 
+ #
+@@ -345,8 +492,9 @@ proc print_addr { name } {
  
  proc test_lookup_operator_functions {} {
      global dm_operator_comma
@@ -21905,7 +22086,7 @@ index 5e08768..8c8e038 100644
      global dm_type_foo_ref
      global dm_type_void
      global dm_type_void_star
-@@ -404,8 +546,8 @@ proc test_lookup_operator_functions {} {
+@@ -404,8 +552,8 @@ proc test_lookup_operator_functions {} {
  
      info_func "operator int("	"int foo::operator int($dm_type_void);"
      info_func "operator()("	"void foo::operator()($dm_type_foo_ref);"
@@ -21916,7 +22097,7 @@ index 5e08768..8c8e038 100644
  
  }
  
-@@ -420,6 +562,7 @@ proc test_paddr_operator_functions {} {
+@@ -420,6 +568,7 @@ proc test_paddr_operator_functions {} {
      global dm_type_unsigned_int
      global dm_type_void
      global dm_type_void_star
@@ -21924,7 +22105,21 @@ index 5e08768..8c8e038 100644
  
      print_addr "foo::operator*($dm_type_foo_ref)"
      print_addr "foo::operator%($dm_type_foo_ref)"
-@@ -470,7 +613,7 @@ proc test_paddr_operator_functions {} {
+@@ -460,17 +609,20 @@ proc test_paddr_operator_functions {} {
+     print_addr "foo::operator\[\]($dm_type_foo_ref)"
+     print_addr "foo::operator()($dm_type_foo_ref)"
+ 
+-    gdb_test "print &'foo::operator new'" \
++    gdb_test "print &foo::operator new" \
+ 	" = .* $hex <foo::operator new\\(.*\\)(| static)>"
++    gdb_test "print &foo::operator new\[\]" \
++	" = .* $hex <foo::operator new\\\[\\\]\\(.*\\)(| static)>"    
+     if { !$hp_aCC_compiler } {
+ 	print_addr "foo::operator delete($dm_type_void_star)"
++	print_addr "foo::operator delete[]($dm_type_void_star)"
+     } else {
+ 	gdb_test "print &'foo::operator delete($dm_type_void_star) static'" \
+ 	    " = .*(0x\[0-9a-f\]+|) <foo::operator delete.*>"
      }
  
      print_addr "foo::operator int($dm_type_void)"
@@ -21933,7 +22128,7 @@ index 5e08768..8c8e038 100644
  }
  
  #
-@@ -480,17 +623,21 @@ proc test_paddr_operator_functions {} {
+@@ -480,17 +632,21 @@ proc test_paddr_operator_functions {} {
  proc test_paddr_overloaded_functions {} {
      global dm_type_unsigned_int
      global dm_type_void
@@ -21959,7 +22154,7 @@ index 5e08768..8c8e038 100644
      print_addr "overload1arg(float)"
      print_addr "overload1arg(double)"
  
-@@ -513,17 +660,31 @@ proc test_paddr_hairy_functions {} {
+@@ -513,17 +669,31 @@ proc test_paddr_hairy_functions {} {
      global dm_type_char_star
      global dm_type_int_star
      global dm_type_long_star
@@ -25592,7 +25787,7 @@ index a67eaa3..5380c0f 100644
 +
 +gdb_test "python print 'result =', f0.block ()" "<gdb.Block object at 0x\[\[:xdigit:\]\]+>" "test Frame.block"
 diff --git a/gdb/testsuite/gdb.python/py-function.exp b/gdb/testsuite/gdb.python/py-function.exp
-index 7feca2b..4ae519f 100644
+index 30fde7d..14cd90c 100644
 --- a/gdb/testsuite/gdb.python/py-function.exp
 +++ b/gdb/testsuite/gdb.python/py-function.exp
 @@ -20,36 +20,15 @@ if $tracelevel then {


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- gdb.spec	21 Sep 2009 15:49:36 -0000	1.386
+++ gdb.spec	25 Sep 2009 06:49:21 -0000	1.387
@@ -10,7 +10,7 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.91.20090921
+Version: 6.8.91.20090925
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
@@ -220,7 +220,7 @@ Patch229: gdb-6.3-bz140532-ppc-unwinding
 Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
 # Backported post gdb-6.8.50.20090991 snapshot fixups.
-Patch232: gdb-6.8.50.20090921-upstream.patch
+#Patch232: gdb-6.8.50.20090921-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -453,7 +453,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-%patch232 -p1
+#patch232 -p1
 %patch349 -p1
 %patch1 -p1
 %patch3 -p1
@@ -847,6 +847,12 @@ fi
 %endif
 
 %changelog
+* Fri Sep 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-1
+- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090925
+- archer-jankratochvil-fedora12 commit: 4338ea85c798007c32594032f602db9fd230eba9
+  - [python] Don't directly reference self.frame (Tom Tromey).
+  - [expr] Updates from branch (Keith Seitz).
+
 * Mon Sep 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090921-1
 - Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090921
 - archer-jankratochvil-fedora12 commit: 0d5c38dd89050c0ee1cf049656f177c170d675d4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	21 Sep 2009 15:49:36 -0000	1.39
+++ sources	25 Sep 2009 06:49:21 -0000	1.40
@@ -1,2 +1,2 @@
 1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz
-67b50a78d03200c6714cafd85b8044e8  gdb-6.8.91.20090921.tar.bz2
+b6ff9aa4c78ca41931052c8658bdabfd  gdb-6.8.91.20090925.tar.bz2


--- gdb-6.8.50.20090921-upstream.patch DELETED ---



From bskeggs at fedoraproject.org  Fri Sep 25 07:13:53 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 25 Sep 2009 07:13:53 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.59, 1.60 kernel.spec, 1.1831, 
	1.1832
Message-ID: <20090925071354.03F4011C00E8@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19403

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-46
- drm-nouveau.patch: cleanups, fixes, pre-G80 s/r fixes, init rework



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5499 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  482 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  761 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  421 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1281 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  360 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  257 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  248 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  949 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  769 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  304 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2247 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  810 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  481 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  472 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58725 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.59 -r 1.60 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- drm-nouveau.patch	25 Sep 2009 03:43:51 -0000	1.59
+++ drm-nouveau.patch	25 Sep 2009 07:13:50 -0000	1.60
@@ -1474,10 +1474,10 @@ index 0000000..ab46e3a
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
 new file mode 100644
-index 0000000..f71789a
+index 0000000..ec0f2f3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,125 @@
 +#include <linux/pci.h>
 +#include <linux/acpi.h>
 +#include <acpi/acpi_drivers.h>
@@ -1508,13 +1508,14 @@ index 0000000..f71789a
 +#define NOUVEAU_DSM_POWER_SPEED 0x01
 +#define NOUVEAU_DSM_POWER_STAMINA 0x02
 +
-+static int nvidia_dsm(struct pci_dev *dev, int func, int arg, int *result)
++static int nouveau_dsm(struct drm_device *dev, int func, int arg, int *result)
 +{
 +	static char muid[] = {
 +		0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
 +		0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
 +	};
 +
++	struct pci_dev *pdev = dev->pdev;
 +	struct acpi_handle *handle;
 +	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
 +	struct acpi_object_list input;
@@ -1522,7 +1523,7 @@ index 0000000..f71789a
 +	union acpi_object *obj;
 +	int err;
 +
-+	handle = DEVICE_ACPI_HANDLE(&dev->dev);
++	handle = DEVICE_ACPI_HANDLE(&pdev->dev);
 +
 +	if (!handle)
 +		return -ENODEV;
@@ -1541,8 +1542,7 @@ index 0000000..f71789a
 +
 +	err = acpi_evaluate_object(handle, "_DSM", &input, &output);
 +	if (err) {
-+		printk(KERN_ERR "nvidia-control: failed to evaluate _DSM: %d\n",
-+		       err);
++		NV_ERROR(dev, "failed to evaluate _DSM: %d\n", err);
 +		return err;
 +	}
 +
@@ -1568,24 +1568,23 @@ index 0000000..f71789a
 +
 +int nouveau_hybrid_setup(struct drm_device *dev)
 +{
-+	struct pci_dev *pdev = dev->pdev;
 +	int result;
 +
-+	if (nvidia_dsm(pdev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
-+		       &result))
++	if (nouveau_dsm(dev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
++								&result))
 +		return -ENODEV;
 +
-+	printk(KERN_INFO "nouveau: _DSM hardware status gave 0x%x\n", result);
++	NV_INFO(dev, "_DSM hardware status gave 0x%x\n", result);
 +
 +	if (result & 0x1) {	/* Stamina mode - disable the external GPU */
-+		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
-+			   NULL);
-+		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
-+			   NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
++									NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
++									NULL);
 +	} else {		/* Ensure that the external GPU is enabled */
-+		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
-+		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
-+			   NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
++									NULL);
 +	}
 +
 +	return 0;
@@ -1593,11 +1592,10 @@ index 0000000..f71789a
 +
 +bool nouveau_dsm_probe(struct drm_device *dev)
 +{
-+	struct pci_dev *pdev = dev->pdev;
 +	int support = 0;
 +
-+	if (nvidia_dsm(pdev, NOUVEAU_DSM_SUPPORTED,
-+		       NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &support))
++	if (nouveau_dsm(dev, NOUVEAU_DSM_SUPPORTED,
++				NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &support))
 +		return false;
 +
 +	if (!support)
@@ -1768,10 +1766,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..585790f
+index 0000000..09ccffd
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5476 @@
+@@ -0,0 +1,5499 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -1961,14 +1959,14 @@ index 0000000..585790f
 +static struct methods nv04_methods[] = {
 +	{ "PROM", load_vbios_prom, false },
 +	{ "PRAMIN", load_vbios_pramin, true },
-+	{ "PCI ROM", load_vbios_pci, true },
++	{ "PCIROM", load_vbios_pci, true },
 +	{ }
 +};
 +
 +static struct methods nv50_methods[] = {
 +	{ "PRAMIN", load_vbios_pramin, true },
 +	{ "PROM", load_vbios_prom, false },
-+	{ "PCI ROM", load_vbios_pci, true },
++	{ "PCIROM", load_vbios_pci, true },
 +	{ }
 +};
 +
@@ -1978,6 +1976,26 @@ index 0000000..585790f
 +	struct methods *methods, *method;
 +	int testscore = 3;
 +
++	if (nouveau_vbios) {
++		method = nv04_methods;
++		while (method->loadbios) {
++			if (!strcasecmp(nouveau_vbios, method->desc))
++				break;
++			method++;
++		}
++
++		if (method->loadbios) {
++			NV_INFO(dev, "Attempting to use BIOS image from %s\n",
++				method->desc);
++
++			method->loadbios(dev, data);
++			if (score_vbios(dev, data, method->rw))
++				return true;
++		}
++
++		NV_ERROR(dev, "VBIOS source \'%s\' invalid\n", nouveau_vbios);
++	}
++
 +	if (dev_priv->card_type < NV_50)
 +		methods = nv04_methods;
 +	else
@@ -7151,9 +7169,12 @@ index 0000000..585790f
 +		parse_init_table(bios, bios->some_script_ptr, &iexec);
 +	}
 +
-+	for (i = 0; i < bios->bdcb.dcb.entries; i++) {
-+		nouveau_bios_run_display_table(dev, &bios->bdcb.dcb.entry[i],
-+					       0, 0);
++	if (dev_priv->card_type >= NV_50) {
++		for (i = 0; i < bios->bdcb.dcb.entries; i++) {
++			nouveau_bios_run_display_table(dev,
++						       &bios->bdcb.dcb.entry[i],
++						       0, 0);
++		}
 +	}
 +
 +	NVLockVgaCrtcs(dev, true);
@@ -8749,10 +8770,10 @@ index 0000000..3f80db8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
 new file mode 100644
-index 0000000..ebc01ad
+index 0000000..1a87041
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,482 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -8865,9 +8886,9 @@ index 0000000..ebc01ad
 +		      uint32_t vram_handle, uint32_t tt_handle)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+	struct nouveau_engine *engine = &dev_priv->engine;
++	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
++	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
 +	struct nouveau_channel *chan;
-+	unsigned fbdev_flags = 0;
[...2848 lines suppressed...]
 +	0x0040a405, 0x00600009, 0x00700005, 0x00700006, 0x0060000e, ~0
 +};
 +
-+static uint32_t nv4e_ctx_prog[] = {
++static uint32_t nv4e_ctxprog[] = {
 +	0x00400889, 0x00200000, 0x0060000a, 0x00200000, 0x00300000, 0x00800001,
 +	0x00700009, 0x0060000e, 0x00400d64, 0x00400d05, 0x00409565, 0x00409a06,
 +	0x0040a868, 0x00200000, 0x0060000a, 0x00700000, 0x00106000, 0x00700080,
@@ -31307,7 +31371,7 @@ index 0000000..ed85386
 +{
 +	struct drm_nouveau_private *dev_priv =
 +		(struct drm_nouveau_private *)dev->dev_private;
-+	uint32_t *ctx_prog = NULL;
++	uint32_t *ctxprog = NULL;
 +	uint32_t vramsz, tmp;
 +	int i, j;
 +
@@ -31318,39 +31382,39 @@ index 0000000..ed85386
 +
 +	switch (dev_priv->chipset) {
 +	case 0x40:
-+		ctx_prog = nv40_ctx_prog;
++		ctxprog = nv40_ctxprog;
 +		break;
 +	case 0x41:
 +	case 0x42:
-+		ctx_prog = nv41_ctx_prog;
++		ctxprog = nv41_ctxprog;
 +		break;
 +	case 0x43:
-+		ctx_prog = nv43_ctx_prog;
++		ctxprog = nv43_ctxprog;
 +		break;
 +	case 0x44:
-+		ctx_prog = nv44_ctx_prog;
++		ctxprog = nv44_ctxprog;
 +		break;
 +	case 0x46:
-+		ctx_prog = nv46_ctx_prog;
++		ctxprog = nv46_ctxprog;
 +		break;
 +	case 0x47:
-+		ctx_prog = nv47_ctx_prog;
++		ctxprog = nv47_ctxprog;
 +		break;
 +	case 0x49:
-+		ctx_prog = nv49_4b_ctx_prog;
++		ctxprog = nv49_4b_ctxprog;
 +		break;
 +	case 0x4a:
-+		ctx_prog = nv4a_ctx_prog;
++		ctxprog = nv4a_ctxprog;
 +		break;
 +	case 0x4b:
-+		ctx_prog = nv49_4b_ctx_prog;
++		ctxprog = nv49_4b_ctxprog;
 +		break;
 +	case 0x4c:
 +	case 0x67:
-+		ctx_prog = nv4c_ctx_prog;
++		ctxprog = nv4c_ctxprog;
 +		break;
 +	case 0x4e:
-+		ctx_prog = nv4e_ctx_prog;
++		ctxprog = nv4e_ctxprog;
 +		break;
 +	default:
 +		NV_ERROR(dev, "Context program for 0x%02x unavailable\n",
@@ -31360,13 +31424,13 @@ index 0000000..ed85386
 +	}
 +
 +	/* Load the context program onto the card */
-+	if (ctx_prog) {
++	if (ctxprog) {
 +		NV_DEBUG(dev, "Loading context program\n");
 +
 +		i = 0;
 +		nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-+		while (ctx_prog[i] != ~0) {
-+			nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, ctx_prog[i]);
++		while (ctxprog[i] != ~0) {
++			nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, ctxprog[i]);
 +			i++;
 +		}
 +	}
@@ -31544,20 +31608,6 @@ index 0000000..ed85386
 +		break;
 +	}
 +
-+	/* per-context state, doesn't belong here */
-+	nv_wr32(dev, 0x400B20, 0x00000000);
-+	nv_wr32(dev, 0x400B04, 0xFFFFFFFF);
-+
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) & 0x0007ff00;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) | 0x00020100;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMAX, 0x7fff);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMAX, 0x7fff);
-+
 +	return 0;
 +}
 +
@@ -31631,10 +31681,10 @@ index 0000000..2a3495e
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..c4bc54a
+index 0000000..5e7df86
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,809 @@
+@@ -0,0 +1,810 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -32191,6 +32241,7 @@ index 0000000..c4bc54a
 +		format = NV50_EVO_CRTC_FB_DEPTH_16;
 +		break;
 +	case 24:
++	case 32:
 +		format = NV50_EVO_CRTC_FB_DEPTH_24;
 +		break;
 +	case 30:
@@ -34245,10 +34296,10 @@ index 0000000..aca9ea6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..bec78d6
+index 0000000..10ed193
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,481 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34457,6 +34508,8 @@ index 0000000..bec78d6
 +	nv50_fifo_init_context_table(dev);
 +	nv50_fifo_init_regs__nv(dev);
 +	nv50_fifo_init_regs(dev);
++	dev_priv->engine.fifo.enable(dev);
++	dev_priv->engine.fifo.reassign(dev, true);
 +
 +	return 0;
 +}
@@ -34730,10 +34783,10 @@ index 0000000..bec78d6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..c163859
+index 0000000..d9c3e21
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,450 @@
+@@ -0,0 +1,472 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34803,7 +34856,7 @@ index 0000000..c163859
 +	nv_wr32(dev, 0x400108, 0xffffffff);
 +
 +	nv_wr32(dev, 0x400824, 0x00004000);
-+	nv_wr32(dev, 0x400500, 0x00000000);
++	nv_wr32(dev, 0x400500, 0x00010001);
 +}
 +
 +static void
@@ -34912,6 +34965,28 @@ index 0000000..c163859
 +		nv_wr32(dev, 0x400500, nv_rd32(dev, 0x400500) & ~mask);
 +}
 +
++struct nouveau_channel *
++nv50_graph_channel(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	uint32_t inst;
++	int i;
++
++	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
++	if (!(inst & NV50_PGRAPH_CTXCTL_CUR_LOADED))
++		return NULL;
++	inst = (inst & NV50_PGRAPH_CTXCTL_CUR_INSTANCE) << 12;
++
++	for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
++		struct nouveau_channel *chan = dev_priv->fifos[i];
++
++		if (chan && chan->ramin && chan->ramin->instance == inst)
++			return chan;
++	}
++
++	return NULL;
++}
++
 +int
 +nv50_graph_create_context(struct nouveau_channel *chan)
 +{


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1831
retrieving revision 1.1832
diff -u -p -r1.1831 -r1.1832
--- kernel.spec	25 Sep 2009 04:36:02 -0000	1.1831
+++ kernel.spec	25 Sep 2009 07:13:51 -0000	1.1832
@@ -2059,6 +2059,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-46
+- drm-nouveau.patch: cleanups, fixes, pre-G80 s/r fixes, init rework
+
 * Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-45
 - drm-next-adea4796c.patch: fix r600 glxgears
 



From bskeggs at fedoraproject.org  Fri Sep 25 07:17:36 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 25 Sep 2009 07:17:36 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.46,
	1.47 nouveau-bicubic-2x.patch, 1.14,
	1.15 nouveau-multiple-xserver.patch, 1.16,
	1.17 nouveau-tile7000.patch, 1.4, 1.5 sources, 1.47,
	1.48 xorg-x11-drv-nouveau.spec, 1.59, 1.60
Message-ID: <20090925071736.90EDB11C00E8@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21225

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-12.20090924gitde0b095
- G80: small performance fix




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	21 Sep 2009 05:16:07 -0000	1.46
+++ .cvsignore	25 Sep 2009 07:17:35 -0000	1.47
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090921gitdf94ebd.tar.bz2
+xf86-video-nouveau-0.0.15-20090924gitde0b095.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nouveau-bicubic-2x.patch	21 Sep 2009 05:11:29 -0000	1.14
+++ nouveau-bicubic-2x.patch	25 Sep 2009 07:17:35 -0000	1.15
@@ -1,4 +1,4 @@
-From 25777010799a8eccde5bf00c61bc2685753db80f Mon Sep 17 00:00:00 2001
+From cdfb2dd95e0c70d0467d6c1c21e1b2a21e8f6d58 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nouveau-multiple-xserver.patch	21 Sep 2009 05:11:29 -0000	1.16
+++ nouveau-multiple-xserver.patch	25 Sep 2009 07:17:35 -0000	1.17
@@ -1,4 +1,4 @@
-From 38c897a1cbc4cd809f8c250a41a03299ec6d08c9 Mon Sep 17 00:00:00 2001
+From 4a82ffa7ea561a68807a1b53e8ebb2f710c3e4a0 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-tile7000.patch	21 Sep 2009 05:11:30 -0000	1.4
+++ nouveau-tile7000.patch	25 Sep 2009 07:17:35 -0000	1.5
@@ -1,4 +1,4 @@
-From f59c4dfa92909d43e1512dfaa4a23a3e7e37ed68 Mon Sep 17 00:00:00 2001
+From 9ca71674c32fec89576e8d469a07b2cbab542e95 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	21 Sep 2009 05:16:08 -0000	1.47
+++ sources	25 Sep 2009 07:17:35 -0000	1.48
@@ -1 +1 @@
-4acb3671cbb414ee27c8babeaea90722  xf86-video-nouveau-0.0.15-20090921gitdf94ebd.tar.bz2
+448ccbf11d9cbe2c7ed19bd5669baf10  xf86-video-nouveau-0.0.15-20090924gitde0b095.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- xorg-x11-drv-nouveau.spec	21 Sep 2009 05:11:30 -0000	1.59
+++ xorg-x11-drv-nouveau.spec	25 Sep 2009 07:17:35 -0000	1.60
@@ -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 20090921
-%define git_version df94ebd
+%define gitdate 20090924
+%define git_version de0b095
 
 %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:   11.%{snapshot}%{?dist}
+Release:   12.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-12.20090924gitde0b095
+- G80: small performance fix
+
 * Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-11.20090921gitdf95ebd
 - fix an accel pitch issue seen in rh#523281
 



From denis at fedoraproject.org  Fri Sep 25 07:20:06 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:20:06 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-dockcrash.patch, NONE,
	1.1 galeon.spec, 1.63, 1.64
Message-ID: <20090925072006.5A87E11C0418@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22121

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-dockcrash.patch 
Log Message:
Added patch from Yanko Kaneti (#525417) to fix crash on startup

galeon-2.0.7-dockcrash.patch:
 egg-dock-box.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE galeon-2.0.7-dockcrash.patch ---
diff -ur galeon-2.0.7/libegg/dock/egg-dock-box.c galeon-2.0.7.dockcrash/libegg/dock/egg-dock-box.c
--- galeon-2.0.7/libegg/dock/egg-dock-box.c	2008-07-04 19:30:51.000000000 +0300
+++ galeon-2.0.7.dockcrash/libegg/dock/egg-dock-box.c	2009-09-24 13:20:02.000000000 +0300
@@ -425,9 +425,6 @@
 
     box = GTK_BOX (EGG_DOCK_ITEM (object)->child);
 
-    if (other_data) g_print("has somesort of value\n");
-    if (G_VALUE_HOLDS(other_data, G_TYPE_FLAGS)) g_print("is a flag\n");
-
     /* see if we can dock the item in our box */
     switch (EGG_DOCK_ITEM (object)->orientation) {
         case GTK_ORIENTATION_HORIZONTAL:


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- galeon.spec	23 Sep 2009 07:51:30 -0000	1.63
+++ galeon.spec	25 Sep 2009 07:20:06 -0000	1.64
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -17,6 +17,7 @@ Patch5:		galeon-2.0.7-moz191.patch
 Patch6:		galeon-2.0.7-jsconsole.patch
 Patch7:         galeon-2.0.7-fix-str-fmt.patch
 Patch8:         galeon-1.3.2-home.patch
+Patch9:         galeon-2.0.7-dockcrash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -57,6 +58,7 @@ makes sense. Galeon was written to do ju
 %patch6 -p1 -b .jsconsole
 %patch7 -p0 -b .fixfmt
 %patch8 -p1 -b .home
+%patch9 -p1 -b .dock
 
 
 %build
@@ -131,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-16
+- Added patch from Yanko Kaneti (#525417) to fix crash on startup
+
 * Wed Sep 23 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-15
 - Sync with F-11 patches
 - Boosted EVR for smooth upgrade



From phuang at fedoraproject.org  Fri Sep 25 07:23:38 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 25 Sep 2009 07:23:38 +0000 (UTC)
Subject: rpms/ibus-m17n/F-11 .cvsignore, 1.10, 1.11 ibus-m17n-HEAD.patch, 1.1,
	1.2 ibus-m17n-iok.patch, 1.2, 1.3 ibus-m17n.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20090925072338.087EA11C00E8@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23423

Modified Files:
	.cvsignore ibus-m17n-HEAD.patch ibus-m17n-iok.patch 
	ibus-m17n.spec sources 
Log Message:
back port f12 to f11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Feb 2009 07:47:32 -0000	1.10
+++ .cvsignore	25 Sep 2009 07:23:34 -0000	1.11
@@ -1 +1 @@
-ibus-m17n-1.1.0.20090211.tar.gz
+ibus-m17n-1.2.0.20090617.tar.gz

ibus-m17n-HEAD.patch:
 0 files changed

Index: ibus-m17n-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n-HEAD.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-m17n-HEAD.patch	18 Feb 2009 09:46:32 -0000	1.1
+++ ibus-m17n-HEAD.patch	25 Sep 2009 07:23:35 -0000	1.2
@@ -1,126 +1 @@
-diff --git a/src/engine.c b/src/engine.c
-index 5c5f56f..06501bb 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -53,9 +53,10 @@ static void ibus_m17n_engine_page_up        (IBusEngine             *engine);
- static void ibus_m17n_engine_page_down      (IBusEngine             *engine);
- static void ibus_m17n_engine_cursor_up      (IBusEngine             *engine);
- static void ibus_m17n_engine_cursor_down    (IBusEngine             *engine);
--static void ibus_m17n_property_activate     (IBusEngine             *engine,
-+static void ibus_m17n_engine_property_activate
-+                                            (IBusEngine             *engine,
-                                              const gchar            *prop_name,
--                                             gint                    prop_state);
-+                                             guint                   prop_state);
- static void ibus_m17n_engine_property_show
- 											(IBusEngine             *engine,
-                                              const gchar            *prop_name);
-@@ -126,6 +127,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
-     engine_class->cursor_up = ibus_m17n_engine_cursor_up;
-     engine_class->cursor_down = ibus_m17n_engine_cursor_down;
- 
-+    // engine_class->property_activate = ibus_m17n_engine_property_activate;
- }
- 
- static void
-@@ -277,47 +279,67 @@ MSymbol
- ibus_m17n_key_event_to_symbol (guint keyval,
-                                guint modifiers)
- {
--    GString *key;
--    MSymbol mkey = Mnil;
-+    GString *keysym;
-+    MSymbol mkeysym = Mnil;
-     guint mask = 0;
- 
-+    if (keyval >= IBUS_Shift_L && keyval <= IBUS_Hyper_R) {
-+        return Mnil;
-+    }
-+
-+    keysym = g_string_new ("");
-+
-     if (keyval >= IBUS_space && keyval <= IBUS_asciitilde) {
-+        gint c = keyval;
-         if (keyval == IBUS_space && modifiers & IBUS_SHIFT_MASK)
-             mask |= IBUS_SHIFT_MASK;
- 
-         if (modifiers & IBUS_CONTROL_MASK) {
--            if (keyval >= IBUS_a && keyval <= IBUS_z)
--                keyval += IBUS_A - IBUS_a;
-+            if (c >= IBUS_a && c <= IBUS_z)
-+                c += IBUS_A - IBUS_a;
-             mask |= IBUS_CONTROL_MASK;
-         }
-+
-+        g_string_append_c (keysym, c);
-     }
--    else if (keyval >= IBUS_Shift_L && keyval <= IBUS_Hyper_R) {
--        return Mnil;
-+    else {
-+        mask |= modifiers & (IBUS_CONTROL_MASK | IBUS_SHIFT_MASK);
-+        g_string_append (keysym, ibus_keyval_name (keyval));
-+        if (keysym->len == 0) {
-+            g_string_free (keysym, TRUE);
-+            return Mnil;
-+        }
-     }
- 
--    mask |= modifiers & (IBUS_MOD1_MASK | IBUS_META_MASK);
-+    mask |= modifiers & (IBUS_MOD1_MASK |
-+                         IBUS_META_MASK |
-+                         IBUS_SUPER_MASK |
-+                         IBUS_HYPER_MASK);
- 
--    key = g_string_new ("");
- 
-+    if (mask & IBUS_HYPER_MASK) {
-+        g_string_prepend (keysym, "H-");
-+    }
-+    if (mask & IBUS_SUPER_MASK) {
-+        g_string_prepend (keysym, "s-");
-+    }
-     if (mask & IBUS_MOD1_MASK) {
--        g_string_append (key, "A-");
-+        g_string_prepend (keysym, "A-");
-     }
-     if (mask & IBUS_META_MASK) {
--        g_string_append (key, "M-");
-+        g_string_prepend (keysym, "M-");
-     }
-     if (mask & IBUS_CONTROL_MASK) {
--        g_string_append (key, "C-");
-+        g_string_prepend (keysym, "C-");
-     }
-     if (mask & IBUS_SHIFT_MASK) {
--        g_string_append (key, "S-");
-+        g_string_prepend (keysym, "S-");
-     }
- 
--    g_string_append (key, ibus_keyval_name (keyval));
--
--    mkey = msymbol (key->str);
--    g_string_free (key, TRUE);
-+    mkeysym = msymbol (keysym->str);
-+    g_string_free (keysym, TRUE);
- 
--    return mkey;
-+    return mkeysym;
- }
- 
- static gboolean
-@@ -457,6 +479,15 @@ ibus_m17n_engine_cursor_down (IBusEngine *engine)
- }
- 
- static void
-+ibus_m17n_engine_property_activate (IBusEngine  *engine,
-+                                    const gchar *prop_name,
-+                                    guint        prop_state)
-+{
-+    g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
-+    parent_class->property_activate (engine, prop_name, prop_state);
-+}
-+
-+static void
- ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n)
- {
-    ibus_lookup_table_clear (m17n->table);
+

ibus-m17n-iok.patch:
 engine.c |   41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n-iok.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-m17n-iok.patch	16 May 2009 07:39:09 -0000	1.2
+++ ibus-m17n-iok.patch	25 Sep 2009 07:23:35 -0000	1.3
@@ -1,5 +1,5 @@
---- src/engine.c.orig	2009-05-16 11:41:06.000000000 +0530
-+++ src/engine.c	2009-05-16 11:42:11.000000000 +0530
+--- src/engine.c.orig	2009-03-02 10:54:14.000000000 +0530
++++ src/engine.c	2009-03-02 13:12:42.000000000 +0530
 @@ -17,6 +17,8 @@
      IBusLookupTable *table;
      IBusProperty    *status_prop;
@@ -66,17 +66,7 @@
          im = minput_open_im (msymbol (lang), msymbol (name), NULL);
          if (im != NULL) {
              mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
-@@ -209,6 +229,9 @@
-         g_strfreev (strv);
-     }
- 
-+    if(strstr(engine_name,":inscript")!=NULL)
-+        ibus_property_set_visible(m17n->show_iok_prop,TRUE);
-+
-     if (im == NULL) {
-         g_warning ("Can not find m17n keymap %s", engine_name);
-         g_object_unref (m17n);
-@@ -247,6 +270,7 @@
+@@ -247,6 +267,7 @@
          m17n->prop_list = NULL;
      }
  
@@ -84,7 +74,7 @@
      if (m17n->status_prop) {
          g_object_unref (m17n->status_prop);
          m17n->status_prop = NULL;
-@@ -398,6 +422,7 @@
+@@ -398,6 +419,7 @@
      IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
  
      ibus_engine_register_properties (engine, m17n->prop_list);
@@ -92,7 +82,7 @@
      ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
  
      parent_class->focus_in (engine);
-@@ -483,7 +508,20 @@
+@@ -483,7 +505,20 @@
                                      const gchar *prop_name,
                                      guint        prop_state)
  {


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ibus-m17n.spec	16 May 2009 07:39:09 -0000	1.16
+++ ibus-m17n.spec	25 Sep 2009 07:23:35 -0000	1.17
@@ -1,23 +1,25 @@
+%define require_ibus_version 1.2.0
+
 Name:       ibus-m17n
-Version:    1.1.0.20090211
-Release:    5%{?dist}
+Version:    1.2.0.20090617
+Release:    2%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
-Patch0:     ibus-m17n-HEAD.patch
-Patch1:     ibus-m17n-iok.patch
+# Patch0:     ibus-m17n-HEAD.patch
+# Patch1:     ibus-m17n-iok.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  m17n-lib-devel
-BuildRequires:  ibus-devel
+BuildRequires:  ibus-devel >= %{require_ibus_version}
 
-Requires:   ibus
+Requires:   ibus >= %{require_ibus_version}
 Requires:   m17n-lib
 Requires:   iok > 1.3.1
 
@@ -27,8 +29,8 @@ the input table maps from m17n-db.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+# %patch0 -p1
+# %patch1 -p0
 
 %build
 %configure --disable-static
@@ -52,9 +54,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
-* Sat May 16 2009 Parag <pnemade at redhat.com> - 1.1.0.20090211-5
-- Resovles: rh#500802 :[indic] icon property on ibus panel display icon only once after its used. 
-- updated ibus-m17n-iok.patch
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-1
+- Update to 1.2.0.20090617.
 
 * Thu Mar 05 2009 Parag <pnemade at redhat.com> - 1.1.0.20090211-4
 - Add iok support to ibus-m17n.
@@ -62,14 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Feb 18 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
+* Wed Feb 18 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
 - Add patch ibus-m17n-HEAD.patch from upstream git tree.
 - Make Control + Alt + ... available. (#482789)
 
-* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+* Wed Feb 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
 - Update to 1.1.0.20090211.
 
-* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+* Thu Feb 05 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
 - Update to 1.1.0.20090205.
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081013-4
@@ -78,26 +82,26 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Oct 16 2008 Jens Petersen <petersen at redhat.com> - 0.1.1.20081013-3
 - move the .engine files to m17n-db and m17n-contrib (#466410)
 
-* Wed Oct 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081013-2
+* Wed Oct 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081013-2
 - Move unicode, rfc1345 to generic package, and syrc-phonetic to syriac package.
 
-* Mon Oct 13 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081013-1
+* Mon Oct 13 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081013-1
 - Update to 0.1.1.20081013.
 
-* Thu Oct 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081009-1
+* Thu Oct 09 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081009-1
 - Update to 0.1.1.20081009.
 
-* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+* Mon Sep 01 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 
-* Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Sat Aug 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update to 0.1.1.20080823.
 
-* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
+* Fri Aug 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
 - Update to 0.1.1.20080815.
 
-* Tue Aug 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
+* Tue Aug 12 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
 - Update to 0.1.1.20080812.
 
-* Thu Aug 07 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
+* Thu Aug 07 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Feb 2009 07:47:32 -0000	1.10
+++ sources	25 Sep 2009 07:23:35 -0000	1.11
@@ -1 +1 @@
-fd3da5bcf3c58aa5266a31882040ca41  ibus-m17n-1.1.0.20090211.tar.gz
+c7cbe6a0359c510e5d678dff8a155ff8  ibus-m17n-1.2.0.20090617.tar.gz



From denis at fedoraproject.org  Fri Sep 25 07:23:50 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:23:50 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.41, 1.42 glibmm.spec, 1.61,
	1.62 sources, 1.42, 1.43
Message-ID: <20090925072350.4233D11C00E8@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23541

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.22.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	14 Sep 2009 09:10:53 -0000	1.41
+++ .cvsignore	25 Sep 2009 07:23:49 -0000	1.42
@@ -1 +1 @@
-glibmm-2.21.5.tar.bz2
+glibmm-2.22.1.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- glibmm.spec	15 Sep 2009 08:07:17 -0000	1.61
+++ glibmm.spec	25 Sep 2009 07:23:50 -0000	1.62
@@ -1,12 +1,12 @@
 Name:           glibmm24
-Version:        2.21.5
-Release:        2%{?dist}
+Version:        2.22.1
+Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.22.1-1
+- Update to upstream 2.22.1
+
 * Tue Sep 15 2009 Denis Leroy <denis at poolshark.org> - 2.21.5-2
 - Better fix for devhelp file broken tags
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	14 Sep 2009 09:10:54 -0000	1.42
+++ sources	25 Sep 2009 07:23:50 -0000	1.43
@@ -1 +1 @@
-9fa38563cbe6bf232ddbbe114f6f3a3f  glibmm-2.21.5.tar.bz2
+1a96c7fde75ddbb421bc23fb4aa7adba  glibmm-2.22.1.tar.bz2



From phuang at fedoraproject.org  Fri Sep 25 07:24:43 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 25 Sep 2009 07:24:43 +0000 (UTC)
Subject: rpms/ibus-pinyin/F-11 .cvsignore, 1.13, 1.14 ibus-pinyin.spec, 1.15,
	1.16 sources, 1.13, 1.14
Message-ID: <20090925072443.E8FC311C00E8@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24045

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
back port f12 to f11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Jun 2009 07:12:20 -0000	1.13
+++ .cvsignore	25 Sep 2009 07:24:43 -0000	1.14
@@ -1,2 +1,2 @@
-ibus-pinyin-1.1.0.20090612.tar.gz
 pinyin-database-0.1.10.6.tar.bz2
+ibus-pinyin-1.2.0.20090915.tar.gz


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-11/ibus-pinyin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ibus-pinyin.spec	12 Jun 2009 07:12:20 -0000	1.15
+++ ibus-pinyin.spec	25 Sep 2009 07:24:43 -0000	1.16
@@ -1,5 +1,7 @@
+%define reqiure_ibus_version 1.2.0
+
 Name:       ibus-pinyin
-Version:    1.1.0.20090612
+Version:    1.2.0.20090915
 Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
@@ -7,14 +9,15 @@ Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
-Patch0:     ibus-pinyin-HEAD.patch
+# Patch0:     ibus-pinyin-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 BuildRequires:  gettext-devel
 
-Requires:   ibus
+Requires:   ibus >= %{reqiure_ibus_version}
+Requires:   python-enchant
 
 %description
 PinYin engine for IBus platform. It provides a Chinese PinYin input method.
@@ -51,50 +54,60 @@ python -c "import pysqlitedb; db = pysql
 %{_libexecdir}/ibus-setup-pinyin
 
 %changelog
-* Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
+* Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
+- Update to 1.2.0.20090915.
+- Fix bug 508006 - The color of English Candidates doesn't work
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-1
+- Update to 1.2.0.20090617.
+
+* Fri Jun 12 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
 - Update to 1.1.0.20090612.
 
-* Mon May 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090303-2
+* Mon May 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090303-2
 - Update to HEAD version in upstream git repository
 - Fix bug 500762 - The iBus input speed becomes much slower after "Fuzzy PinYin" enabled
 - Fix bug 501218 - make the pinyin setup window come to the front
 - Fix bug 500763 - User DB is unavailable in ibus for liveCD
 
-* Tue Mar 3 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090303-1
+* Tue Mar 3 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090303-1
 - Update to 1.1.0.20090303.
 
-* Wed Feb 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
+* Wed Feb 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
 - Update to 1.1.0.20090225.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+* Wed Feb 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
 - Update version to 1.1.0.20090211.
 
-* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+* Thu Feb 05 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
 - Update version to 1.1.0.20090205.
 
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081004-2
 - Rebuild for Python 2.6
 
-* Sat Oct 04 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081004-1
+* Sat Oct 04 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081004-1
 - Update version to 0.1.1.20081004.
 
-* Thu Sep 18 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080918-1
+* Thu Sep 18 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080918-1
 - Update version to 0.1.1.20080918.
 
-* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+* Mon Sep 01 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update version to 0.1.1.20080901.
 
-* Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Sat Aug 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update version to 0.1.1.20080823.
 
-* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
+* Fri Aug 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
 - Update version to 0.1.1.20080815.
 
-* Thu Aug 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
+* Thu Aug 12 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
 - Update version to 0.1.1.20080812.
 
-* Sun Aug 10 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
+* Sun Aug 10 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Jun 2009 07:12:20 -0000	1.13
+++ sources	25 Sep 2009 07:24:43 -0000	1.14
@@ -1,2 +1,2 @@
-161e83587f14150da6d41b815f2450e5  ibus-pinyin-1.1.0.20090612.tar.gz
 ebd8d2381993372bb97a877b549e14a0  pinyin-database-0.1.10.6.tar.bz2
+97b3c95280bec6a56c587d12158139a2  ibus-pinyin-1.2.0.20090915.tar.gz



From denis at fedoraproject.org  Fri Sep 25 07:27:17 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:27:17 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon-2.0.7-dockcrash.patch, NONE, 1.1 galeon.spec,
	1.67, 1.68
Message-ID: <20090925072717.7DD6511C00E8@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24717

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-dockcrash.patch 
Log Message:
Added patch from Yanko Kaneti (#525417) to fix crash on startup

galeon-2.0.7-dockcrash.patch:
 egg-dock-box.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE galeon-2.0.7-dockcrash.patch ---
diff -ur galeon-2.0.7/libegg/dock/egg-dock-box.c galeon-2.0.7.dockcrash/libegg/dock/egg-dock-box.c
--- galeon-2.0.7/libegg/dock/egg-dock-box.c	2008-07-04 19:30:51.000000000 +0300
+++ galeon-2.0.7.dockcrash/libegg/dock/egg-dock-box.c	2009-09-24 13:20:02.000000000 +0300
@@ -425,9 +425,6 @@
 
     box = GTK_BOX (EGG_DOCK_ITEM (object)->child);
 
-    if (other_data) g_print("has somesort of value\n");
-    if (G_VALUE_HOLDS(other_data, G_TYPE_FLAGS)) g_print("is a flag\n");
-
     /* see if we can dock the item in our box */
     switch (EGG_DOCK_ITEM (object)->orientation) {
         case GTK_ORIENTATION_HORIZONTAL:


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- galeon.spec	23 Sep 2009 07:34:19 -0000	1.67
+++ galeon.spec	25 Sep 2009 07:27:17 -0000	1.68
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -17,6 +17,7 @@ Patch5:		galeon-2.0.7-moz191.patch
 Patch6:		galeon-2.0.7-jsconsole.patch
 Patch7:         galeon-2.0.7-fix-str-fmt.patch
 Patch8:         galeon-1.3.2-home.patch
+Patch9:         galeon-2.0.7-dockcrash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -57,6 +58,7 @@ makes sense. Galeon was written to do ju
 %patch6 -p1 -b .jsconsole
 %patch7 -p0 -b .fixfmt
 %patch8 -p1 -b .home
+%patch9 -p1 -b .dock
 
 
 %build
@@ -131,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-16
+- Added patch from Yanko Kaneti (#525417) to fix crash on startup
+
 * Wed Sep 23 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-15
 - Added jsconsole patch
 - Changed default home location, Mandriva patch



From denis at fedoraproject.org  Fri Sep 25 07:28:51 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:28:51 +0000 (UTC)
Subject: rpms/pangomm/devel .cvsignore, 1.6, 1.7 pangomm.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <20090925072851.6D82911C00E8@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25808

Modified Files:
	.cvsignore pangomm.spec sources 
Log Message:
Update to upstream 2.26.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Sep 2009 09:14:51 -0000	1.6
+++ .cvsignore	25 Sep 2009 07:28:51 -0000	1.7
@@ -1 +1 @@
-pangomm-2.25.1.3.tar.bz2
+pangomm-2.26.0.tar.bz2


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pangomm.spec	15 Sep 2009 09:00:58 -0000	1.11
+++ pangomm.spec	25 Sep 2009 07:28:51 -0000	1.12
@@ -1,14 +1,14 @@
 %define apiver 1.4
 
 Name:           pangomm
-Version:        2.25.1.3
+Version:        2.26.0
 Release:        1%{?dist}
 Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.25/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.14.1
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-1
+- Update to upstream 2.26.0
+
 * Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.25.1.3-1
 - Update to upstream 2.25.1.3
 - Package pangomm libdir directory with config include header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Sep 2009 09:14:51 -0000	1.6
+++ sources	25 Sep 2009 07:28:51 -0000	1.7
@@ -1 +1 @@
-e9aac0019cb56350ceb5fcb316f2797c  pangomm-2.25.1.3.tar.bz2
+37f54dc8e6cb73ed923b22f313352156  pangomm-2.26.0.tar.bz2



From pnemade at fedoraproject.org  Fri Sep 25 07:30:11 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Fri, 25 Sep 2009 07:30:11 +0000 (UTC)
Subject: rpms/iok/EL-5 iok.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <20090925073011.9A53111C0423@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26273

Modified Files:
	iok.spec sources 
Log Message:
* Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
- Update to Next release 1.3.7





Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/EL-5/iok.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- iok.spec	20 Mar 2009 04:48:35 -0000	1.5
+++ iok.spec	25 Sep 2009 07:30:11 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           iok
-Version:        1.3.3
+Version:        1.3.7
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
-URL:            https://fedorahosted.org/iok/wiki/
+URL:            http://iok.sourceforge.net
 Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libXtst-devel
-BuildRequires:  gtk2-devel gettext
-Requires: 	xkeyboard-config
+BuildRequires:  gtk2-devel gettext libxml2-devel
+BuildRequires:  intltool
+Requires: 	xkeyboard-config 
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
@@ -48,6 +49,23 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
+- Update to Next release 1.3.7
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Parag Nemade <panemade at gmail.com>- 1.3.6-1
+- Update to Next release 1.3.6
+- Add BR:intltool
+
+* Thu Jun 25 2009 Parag Nemade <panemade at gmail.com>- 1.3.5-1
+- Update to Next release 1.3.5
+- Resolves: rh506623:iok segfaults when changing the language
+
+* Tue Apr 14 2009 Parag Nemade <panemade at gmail.com>- 1.3.4-1
+- Update to Next release 1.3.4
+
 * Fri Mar 20 2009 Parag Nemade <panemade at gmail.com>- 1.3.3-1
 - Update to Next release 1.3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Mar 2009 04:48:35 -0000	1.6
+++ sources	25 Sep 2009 07:30:11 -0000	1.7
@@ -1 +1 @@
-ed3afcc15a163104e47eeb17e632e530  iok-1.3.3.tar.gz
+ec37ab7dc2a22b7ddc93dba0077f43cc  iok-1.3.7.tar.gz



From denis at fedoraproject.org  Fri Sep 25 07:40:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:40:09 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.35, 1.36 gtkmm.spec, 1.55,
	1.56 sources, 1.37, 1.38
Message-ID: <20090925074009.E5ED611C0423@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30053

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to upstream 2.18.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	14 Sep 2009 09:18:56 -0000	1.35
+++ .cvsignore	25 Sep 2009 07:40:07 -0000	1.36
@@ -1 +1 @@
-gtkmm-2.17.11.tar.bz2
+gtkmm-2.18.1.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- gtkmm.spec	15 Sep 2009 08:11:55 -0000	1.55
+++ gtkmm.spec	25 Sep 2009 07:40:07 -0000	1.56
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.17.11
+Version:        2.18.1
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -7,7 +7,7 @@ Summary:        C++ interface for GTK2 (
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.15/gtkmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.21.2
@@ -15,7 +15,7 @@ BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel
 BuildRequires:  gtk2-devel >= 2.17.11
 BuildRequires:  cairomm-devel >= 1.2.2
-BuildRequires:  pangomm-devel >= 2.14.0
+BuildRequires:  pangomm-devel >= 2.25.1.3
 
 
 %description
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.18.1-1
+- Update to upstream 2.18.1
+
 * Mon Sep 14 2009 Denis Leroy <denis at poolshark.org> - 2.17.11-1
 - Update to upstream 2.17.11
 - Added demo code to devel package doc directory


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	14 Sep 2009 09:18:56 -0000	1.37
+++ sources	25 Sep 2009 07:40:07 -0000	1.38
@@ -1 +1 @@
-17c651028978e1ecb182f0d387a253b5  gtkmm-2.17.11.tar.bz2
+7b36f7ea10f183d14b20cad8c1f70daa  gtkmm-2.18.1.tar.bz2



From denis at fedoraproject.org  Fri Sep 25 07:43:55 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:43:55 +0000 (UTC)
Subject: rpms/gconfmm26/devel .cvsignore, 1.12, 1.13 gconfmm.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20090925074355.AAEAD11C00E8@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31634

Modified Files:
	.cvsignore gconfmm.spec sources 
Log Message:
Update to upstream 2.28.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 Sep 2008 03:45:19 -0000	1.12
+++ .cvsignore	25 Sep 2009 07:43:54 -0000	1.13
@@ -1 +1 @@
-gconfmm-2.24.0.tar.bz2
+gconfmm-2.28.0.tar.bz2


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gconfmm.spec	24 Jul 2009 23:38:08 -0000	1.22
+++ gconfmm.spec	25 Sep 2009 07:43:54 -0000	1.23
@@ -1,13 +1,13 @@
 Name:           gconfmm26
-Version:        2.24.0
-Release:        3%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for GConf2
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.18/gconfmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.28.0-1
+- Update to upstream 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Sep 2008 03:45:19 -0000	1.12
+++ sources	25 Sep 2009 07:43:55 -0000	1.13
@@ -1 +1 @@
-cd2c3c919dbf8f90f703680d2fa088b2  gconfmm-2.24.0.tar.bz2
+dad2999d8bbf88cf581fa512041d735e  gconfmm-2.28.0.tar.bz2



From denis at fedoraproject.org  Fri Sep 25 07:50:19 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:50:19 +0000 (UTC)
Subject: rpms/libgnomemm26/devel .cvsignore, 1.13, 1.14 libgnomemm.spec, 1.23,
	1.24 sources, 1.14, 1.15
Message-ID: <20090925075019.E18B611C0418@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3017

Modified Files:
	.cvsignore libgnomemm.spec sources 
Log Message:
Update to upstream 2.28.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	7 Apr 2009 06:35:11 -0000	1.13
+++ .cvsignore	25 Sep 2009 07:50:19 -0000	1.14
@@ -1 +1 @@
-libgnomemm-2.26.0.tar.bz2
+libgnomemm-2.28.0.tar.bz2


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libgnomemm.spec	25 Jul 2009 05:47:33 -0000	1.23
+++ libgnomemm.spec	25 Sep 2009 07:50:19 -0000	1.24
@@ -1,13 +1,13 @@
 Name:           libgnomemm26
-Version:        2.26.0
-Release:        2
+Version:        2.28.0
+Release:        1
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.22/libgnomemm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.28/libgnomemm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.28.0-1
+- Update to upstream 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	7 Apr 2009 06:35:11 -0000	1.14
+++ sources	25 Sep 2009 07:50:19 -0000	1.15
@@ -1 +1 @@
-4801c2b60d73b08ea01fe79aafc678df  libgnomemm-2.26.0.tar.bz2
+7c583094a12159a0bab0134df5e90853  libgnomemm-2.28.0.tar.bz2



From denis at fedoraproject.org  Fri Sep 25 07:54:27 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 25 Sep 2009 07:54:27 +0000 (UTC)
Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.13, 1.14 libgnomeuimm.spec, 
	1.23, 1.24 sources, 1.14, 1.15
Message-ID: <20090925075427.0F00D11C00E8@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4458

Modified Files:
	.cvsignore libgnomeuimm.spec sources 
Log Message:
Update to upstream 2.28.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	7 Apr 2009 06:37:57 -0000	1.13
+++ .cvsignore	25 Sep 2009 07:54:21 -0000	1.14
@@ -1 +1 @@
-libgnomeuimm-2.26.0.tar.bz2
+libgnomeuimm-2.28.0.tar.bz2


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libgnomeuimm.spec	25 Jul 2009 05:48:38 -0000	1.23
+++ libgnomeuimm.spec	25 Sep 2009 07:54:23 -0000	1.24
@@ -1,13 +1,13 @@
 Name:           libgnomeuimm26
-Version:        2.26.0
-Release:        2%{?dist}
+Version:        2.28.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.18/libgnomeuimm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.28/libgnomeuimm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.28.0-1
+- Update to upstream 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	7 Apr 2009 06:37:57 -0000	1.14
+++ sources	25 Sep 2009 07:54:24 -0000	1.15
@@ -1 +1 @@
-7a9c8426a227a80ca70f2c976fcb1ae3  libgnomeuimm-2.26.0.tar.bz2
+6c34dbe07cf9835c36f7d0b7bc38d4fb  libgnomeuimm-2.28.0.tar.bz2



From cebbert at fedoraproject.org  Fri Sep 25 07:59:51 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 25 Sep 2009 07:59:51 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-cfq-choose-new-next-req.patch, NONE,
	1.1 kernel.spec, 1.1742, 1.1743
Message-ID: <20090925075951.622DF11C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7832

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-cfq-choose-new-next-req.patch 
Log Message:
Fix serious CFQ performance regression.

linux-2.6-cfq-choose-new-next-req.patch:
 cfq-iosched.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-cfq-choose-new-next-req.patch ---
From: Jeff Moyer <jmoyer at redhat.com>
Date: Fri, 11 Sep 2009 15:08:59 +0000 (+0200)
Subject: cfq: choose a new next_req when a request is dispatched
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=06d2188644c85c56d243efab914f368d1d23c4a3

cfq: choose a new next_req when a request is dispatched

This patch addresses http://bugzilla.kernel.org/show_bug.cgi?id=13401, a
regression introduced in 2.6.30.

>From the bug report:

Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index a34686f..0e3814b 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1110,6 +1110,7 @@ static void cfq_dispatch_insert(struct request_queue *q, struct request *rq)
 
 	cfq_log_cfqq(cfqd, cfqq, "dispatch_insert");
 
+	cfqq->next_rq = cfq_find_next_rq(cfqd, cfqq, rq);
 	cfq_remove_request(rq);
 	cfqq->dispatched++;
 	elv_dispatch_sort(q, rq);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1742
retrieving revision 1.1743
diff -u -p -r1.1742 -r1.1743
--- kernel.spec	25 Sep 2009 05:46:42 -0000	1.1742
+++ kernel.spec	25 Sep 2009 07:59:50 -0000	1.1743
@@ -748,6 +748,9 @@ Patch14101: linux-2.6-cpufreq-cleanup-lo
 # fix hostap (#522269)
 Patch14200: hostap-revert-toxic-part-of-conversion.patch
 
+# fix cfq performance regression in 2.6.30
+Patch14300: linux-2.6-cfq-choose-new-next-req.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1392,6 +1395,9 @@ ApplyPatch linux-2.6-cpufreq-cleanup-loc
 # fix hostap driver (#522269)
 ApplyPatch hostap-revert-toxic-part-of-conversion.patch
 
+# fix cfq performance regression in 2.6.30
+ApplyPatch linux-2.6-cfq-choose-new-next-req.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1980,6 +1986,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-64
+- Fix serious CFQ performance regression.
+
 * Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-63
 - Disable the GEM graphics manager on i686 PAE kernels
   (fixes modesetting on Intel graphics.)



From peter at fedoraproject.org  Fri Sep 25 08:34:16 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 08:34:16 +0000 (UTC)
Subject: rpms/hfsutils/devel import.log,NONE,1.1 hfsutils.spec,1.21,1.22
Message-ID: <20090925083416.52DCA11C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/hfsutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22367/devel

Modified Files:
	hfsutils.spec 
Added Files:
	import.log 
Log Message:
Small issues, found during merge review, were fixed


--- NEW FILE import.log ---
hfsutils-3_2_6-18_fc11:HEAD:hfsutils-3.2.6-18.fc11.src.rpm:1253867554


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/devel/hfsutils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- hfsutils.spec	25 Jul 2009 02:09:10 -0000	1.21
+++ hfsutils.spec	25 Sep 2009 08:34:13 -0000	1.22
@@ -1,23 +1,23 @@
-Summary: Tools for reading and writing Macintosh HFS volumes.
+Summary: Tools for reading and writing Macintosh HFS volumes
 Name: hfsutils
-Version: 3.2.6  
-Release: 17%{?dist}
+Version: 3.2.6
+Release: 18%{?dist}
 Group: Applications/File
 License: GPLv2+
-Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
+Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz
 Patch0: hfsutils-3.2.6-errno.patch
 Patch1: hfsutils-3.2.6-largefile.patch
-URL: http://www.mars.org/home/rob/proj/hfs/ 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
+URL: http://www.mars.org/home/rob/proj/hfs/
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libXft-devel tcl-devel tk-devel
 
 %package devel
-Summary: A C library for reading and writing Macintosh HFS volumes.
+Summary: A C library for reading and writing Macintosh HFS volumes
 Group: Development/Libraries
 
 %package x11
-Summary: A Tk-based front end for browsing and copying files.
-Group: Applications/File 
+Summary: A Tk-based front end for browsing and copying files
+Group: Applications/File
 
 %description
 HFS (Hierarchical File System) is the native volume format found on
@@ -40,7 +40,7 @@ to volumes.  A C library for low-level a
 hfsutils-devel package.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p0
 
@@ -68,8 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc CHANGES COPYING COPYRIGHT CREDITS INSTALL README TODO
-%config
+%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
 %{_bindir}/hattrib
 %{_bindir}/hcd
 %{_bindir}/hcopy
@@ -122,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-18
+- Fixed issues from the Merge Review (bz #225886)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -202,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 - gzip manpages, strip binaries
 
 * Thu Jul 15 1999 Tim Powers <timp at redhat.com>
-- added %defattr
+- added %%defattr
 - rebuilt for 6.1
 
 * Thu Apr 15 1999 Michael Maher <mike at redhat.com>
@@ -210,5 +212,5 @@ rm -rf $RPM_BUILD_ROOT
 - updated source
 
 * Thu Aug 20 1998 Michael Maher <mike at redhat.com>
-- built package 
+- built package
 



From lonetwin at fedoraproject.org  Fri Sep 25 08:35:39 2009
From: lonetwin at fedoraproject.org (Steven Fernandez)
Date: Fri, 25 Sep 2009 08:35:39 +0000 (UTC)
Subject: rpms/python-sysv_ipc/devel import.log, NONE,
	1.1 python-sysv_ipc.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925083539.A3AF211C00E8@cvs1.fedora.phx.redhat.com>

Author: lonetwin

Update of /cvs/pkgs/rpms/python-sysv_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22425/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-sysv_ipc.spec 
Log Message:
- Initial check-in



--- NEW FILE import.log ---
python-sysv_ipc-0_4_2-1_fc11:HEAD:python-sysv_ipc-0.4.2-1.fc11.src.rpm:1253867503


--- NEW FILE python-sysv_ipc.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define oname sysv_ipc

Name:           python-%{oname}
Version:        0.4.2
Release:        1%{?dist}
Summary:        System V IPC for Python - Semaphores, Shared Memory and Message Queues
Group:          Development/Libraries
License:        GPLv3+
URL:            http://semanchuk.com/philip/%{oname}/
Source0:        http://semanchuk.com/philip/%{oname}/%{oname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:  python-devel

%description
The sysv_ipc module which gives Python access to System V inter-process
semaphores, shared memory and message queues on systems that support them.

%package examples
Summary:    Examples for Python sysv_ipc module
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}

%description examples
This module comes with two demonstration apps. The first (in the directory
demo) shows how to use shared memory and semaphores. The second (in the
directory demo2) shows how to use message queues.

%prep
%setup -q -n sysv_ipc-%{version}

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-examples-%{version}/demo{,2}
install -m 644 demo/*  $RPM_BUILD_ROOT/%{_docdir}/%{name}-examples-%{version}/demo
install -m 644 demo2/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-examples-%{version}/demo2

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE README ReadMe.html VERSION
%{python_sitearch}/%{oname}.so
%{python_sitearch}/%{oname}-%{version}-py2.6.egg-info

%files examples
%defattr(-,root,root,-)
%{_docdir}/%{name}-examples-%{version}/

%changelog
* Sat Aug 29 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:26:38 -0000	1.1
+++ .cvsignore	25 Sep 2009 08:35:38 -0000	1.2
@@ -0,0 +1 @@
+sysv_ipc-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:26:38 -0000	1.1
+++ sources	25 Sep 2009 08:35:39 -0000	1.2
@@ -0,0 +1 @@
+b559fa3bbd7f13ed602eff58c04399c1  sysv_ipc-0.4.2.tar.gz



From peter at fedoraproject.org  Fri Sep 25 08:36:43 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 08:36:43 +0000 (UTC)
Subject: rpms/hfsutils/F-11 import.log,NONE,1.1 hfsutils.spec,1.20,1.21
Message-ID: <20090925083643.9D23811C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/hfsutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23440/F-11

Modified Files:
	hfsutils.spec 
Added Files:
	import.log 
Log Message:
Small issues, found during merge review, were fixed


--- NEW FILE import.log ---
hfsutils-3_2_6-18_fc11:F-11:hfsutils-3.2.6-18.fc11.src.rpm:1253867763


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-11/hfsutils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- hfsutils.spec	25 Feb 2009 03:46:43 -0000	1.20
+++ hfsutils.spec	25 Sep 2009 08:36:43 -0000	1.21
@@ -1,23 +1,23 @@
-Summary: Tools for reading and writing Macintosh HFS volumes.
+Summary: Tools for reading and writing Macintosh HFS volumes
 Name: hfsutils
-Version: 3.2.6  
-Release: 16%{?dist}
+Version: 3.2.6
+Release: 18%{?dist}
 Group: Applications/File
 License: GPLv2+
-Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
+Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz
 Patch0: hfsutils-3.2.6-errno.patch
 Patch1: hfsutils-3.2.6-largefile.patch
-URL: http://www.mars.org/home/rob/proj/hfs/ 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
+URL: http://www.mars.org/home/rob/proj/hfs/
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libXft-devel tcl-devel tk-devel
 
 %package devel
-Summary: A C library for reading and writing Macintosh HFS volumes.
+Summary: A C library for reading and writing Macintosh HFS volumes
 Group: Development/Libraries
 
 %package x11
-Summary: A Tk-based front end for browsing and copying files.
-Group: Applications/File 
+Summary: A Tk-based front end for browsing and copying files
+Group: Applications/File
 
 %description
 HFS (Hierarchical File System) is the native volume format found on
@@ -40,7 +40,7 @@ to volumes.  A C library for low-level a
 hfsutils-devel package.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p0
 
@@ -68,8 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc CHANGES COPYING COPYRIGHT CREDITS INSTALL README TODO
-%config
+%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
 %{_bindir}/hattrib
 %{_bindir}/hcd
 %{_bindir}/hcopy
@@ -122,6 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-18
+- Fixed issues from the Merge Review (bz #225886)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -199,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 - gzip manpages, strip binaries
 
 * Thu Jul 15 1999 Tim Powers <timp at redhat.com>
-- added %defattr
+- added %%defattr
 - rebuilt for 6.1
 
 * Thu Apr 15 1999 Michael Maher <mike at redhat.com>
@@ -207,5 +212,5 @@ rm -rf $RPM_BUILD_ROOT
 - updated source
 
 * Thu Aug 20 1998 Michael Maher <mike at redhat.com>
-- built package 
+- built package
 



From peter at fedoraproject.org  Fri Sep 25 08:38:30 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 08:38:30 +0000 (UTC)
Subject: rpms/hfsutils/F-10 import.log,NONE,1.1 hfsutils.spec,1.19,1.20
Message-ID: <20090925083830.34B3411C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/hfsutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24463/F-10

Modified Files:
	hfsutils.spec 
Added Files:
	import.log 
Log Message:
Small issues, found during merge review, were fixed


--- NEW FILE import.log ---
hfsutils-3_2_6-18_fc11:F-10:hfsutils-3.2.6-18.fc11.src.rpm:1253867870


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-10/hfsutils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- hfsutils.spec	11 Jan 2009 17:12:09 -0000	1.19
+++ hfsutils.spec	25 Sep 2009 08:38:29 -0000	1.20
@@ -1,23 +1,23 @@
-Summary: Tools for reading and writing Macintosh HFS volumes.
+Summary: Tools for reading and writing Macintosh HFS volumes
 Name: hfsutils
-Version: 3.2.6  
-Release: 15%{?dist}
+Version: 3.2.6
+Release: 18%{?dist}
 Group: Applications/File
 License: GPLv2+
-Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
+Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz
 Patch0: hfsutils-3.2.6-errno.patch
 Patch1: hfsutils-3.2.6-largefile.patch
-URL: http://www.mars.org/home/rob/proj/hfs/ 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
+URL: http://www.mars.org/home/rob/proj/hfs/
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libXft-devel tcl-devel tk-devel
 
 %package devel
-Summary: A C library for reading and writing Macintosh HFS volumes.
+Summary: A C library for reading and writing Macintosh HFS volumes
 Group: Development/Libraries
 
 %package x11
-Summary: A Tk-based front end for browsing and copying files.
-Group: Applications/File 
+Summary: A Tk-based front end for browsing and copying files
+Group: Applications/File
 
 %description
 HFS (Hierarchical File System) is the native volume format found on
@@ -40,7 +40,7 @@ to volumes.  A C library for low-level a
 hfsutils-devel package.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p0
 
@@ -68,8 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc CHANGES COPYING COPYRIGHT CREDITS INSTALL README TODO
-%config
+%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
 %{_bindir}/hattrib
 %{_bindir}/hcd
 %{_bindir}/hcopy
@@ -122,6 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-18
+- Fixed issues from the Merge Review (bz #225886)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.2.6-15
 - Updated large file patch. Closes Red Hat Bugzilla bug #465060.
 - Added 'BuildRequires: libXft-devel'.
@@ -196,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 - gzip manpages, strip binaries
 
 * Thu Jul 15 1999 Tim Powers <timp at redhat.com>
-- added %defattr
+- added %%defattr
 - rebuilt for 6.1
 
 * Thu Apr 15 1999 Michael Maher <mike at redhat.com>
@@ -204,5 +212,5 @@ rm -rf $RPM_BUILD_ROOT
 - updated source
 
 * Thu Aug 20 1998 Michael Maher <mike at redhat.com>
-- built package 
+- built package
 



From musolinoa at fedoraproject.org  Fri Sep 25 08:40:21 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Fri, 25 Sep 2009 08:40:21 +0000 (UTC)
Subject: rpms/picprog/devel import.log,1.1,1.2
Message-ID: <20090925084021.97EF311C0423@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/picprog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25675/devel

Modified Files:
	import.log 
Log Message:
Picprog import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Sep 2009 03:05:57 -0000	1.1
+++ import.log	25 Sep 2009 08:40:21 -0000	1.2
@@ -1 +1,2 @@
 picprog-1_9_0-4_fc10:HEAD:picprog-1.9.0-4.fc10.src.rpm:1253588630
+picprog-1_9_0-4_fc10:HEAD:picprog-1.9.0-4.fc10.src.rpm:1253867989



From musolinoa at fedoraproject.org  Fri Sep 25 08:45:10 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Fri, 25 Sep 2009 08:45:10 +0000 (UTC)
Subject: rpms/picprog/F-10 import.log, NONE, 1.1 picprog-1.9.0-stdlib.diff, 
	NONE, 1.1 picprog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090925084511.0C4A111C00E8@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/picprog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27587/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log picprog-1.9.0-stdlib.diff picprog.spec 
Log Message:
Imported picprog to F-10 branch



--- NEW FILE import.log ---
picprog-1_9_0-4_fc10:F-10:picprog-1.9.0-4.fc10.src.rpm:1253868282

picprog-1.9.0-stdlib.diff:
 main.cc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE picprog-1.9.0-stdlib.diff ---
Included standard library header as main.cc contains calls to getenv.
--- main.cc.orig	2009-08-29 19:23:07.000000000 +0930
+++ main.cc	2009-08-29 19:23:36.000000000 +0930
@@ -29,6 +29,7 @@
 
 #include <iostream>
 
+#include <stdlib.h>
 #include <sysexits.h>
 #include <unistd.h>
 #include <getopt.h>


--- NEW FILE picprog.spec ---
Name:           picprog
Version:        1.9.0
Release:        4%{?dist}
Summary:        Microchip PIC serial programmer software

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.iki.fi/hyvatti/pic/picprog.html
Source0:        http://www.iki.fi/hyvatti/pic/%{name}-%{version}.tar.gz

# Include standard library headers as main.cc contains calls to getenv.
Patch0:         picprog-1.9.0-stdlib.diff

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:  %{ix86} x86_64

%description
Picprog is a simple program for burning programs to various
Microchip PIC microcontrollers via several types of serial port
programmers.

%prep
%setup -q
%patch0


%build
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS=""


%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m 755 picprog $RPM_BUILD_ROOT%{_bindir}/%{name}
install -p -D -m 644 picprog.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING picprog.html *.png
%{_bindir}/picprog
%{_mandir}/man1/picprog.1.gz


%changelog
* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-4
- Added missing image files for use with .html documentation
- Added '-p' flag to `install` commands

* Thu Sep 17 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-3
- Made package exlusively for x86 and x86_64 architectures
- Manually install binary and man page (removes the need for Makefile patch)

* Tue Sep 01 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-2
- Removed `install` options from makefile, permissions now handled by RPM
- Added comments to patches
- Removed redundant `make dep` from %%build section
- Removed unnecessary BuildRequires and Requires
- Changed License field from GPLv2+ to GPLv2

* Sat Aug 28 2009 Alex Musolino <musolinoa at gmail.com> - 1.9.0-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 01:48:09 -0000	1.1
+++ .cvsignore	25 Sep 2009 08:45:09 -0000	1.2
@@ -0,0 +1 @@
+picprog-1.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/picprog/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 01:48:10 -0000	1.1
+++ sources	25 Sep 2009 08:45:10 -0000	1.2
@@ -0,0 +1 @@
+a43e33b760952834052695fbbe31b0f1  picprog-1.9.0.tar.gz



From tbzatek at fedoraproject.org  Fri Sep 25 08:46:11 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 25 Sep 2009 08:46:11 +0000 (UTC)
Subject: rpms/nautilus/F-11 .cvsignore, 1.96, 1.97 nautilus.spec, 1.274,
	1.275 sources, 1.101, 1.102 nautilus-properties-ui-crash.patch,
	1.1, NONE
Message-ID: <20090925084611.CF38C11C00E8@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28096

Modified Files:
	.cvsignore nautilus.spec sources 
Removed Files:
	nautilus-properties-ui-crash.patch 
Log Message:
* Fri Sep 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-1
- Update to 2.26.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- .cvsignore	19 May 2009 11:16:51 -0000	1.96
+++ .cvsignore	25 Sep 2009 08:46:11 -0000	1.97
@@ -1 +1 @@
-nautilus-2.26.3.tar.bz2
+nautilus-2.26.4.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- nautilus.spec	18 Sep 2009 11:24:15 -0000	1.274
+++ nautilus.spec	25 Sep 2009 08:46:11 -0000	1.275
@@ -15,8 +15,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.26.3
-Release:	3%{?dist}
+Version: 	2.26.4
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -91,9 +91,6 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # https://bugzilla.redhat.com/show_bug.cgi?id=505919
 Patch18:	nautilus-2.27.2-dark-text-on-dark-bg.patch
 
-# Nautilus Edit > Preferences menu (nautilus-file-management-properties) not opening
-# https://bugzilla.redhat.com/show_bug.cgi?id=523749
-Patch19:	nautilus-properties-ui-crash.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -133,7 +130,6 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .dark-text
-%patch19 -p1 -b .ui-dup-id
 
 %build
 
@@ -271,6 +267,9 @@ fi
 
 
 %changelog
+* Fri Sep 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-1
+- Update to 2.26.4
+
 * Fri Sep 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-3
 - Make nautilus-file-management-properties not crash on start (#523749)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	19 May 2009 11:16:51 -0000	1.101
+++ sources	25 Sep 2009 08:46:11 -0000	1.102
@@ -1 +1 @@
-e05f1b61c27f506451f7d46509631e7b  nautilus-2.26.3.tar.bz2
+cc5bbaf3776662ed45bcf33b3857f662  nautilus-2.26.4.tar.bz2


--- nautilus-properties-ui-crash.patch DELETED ---



From lonetwin at fedoraproject.org  Fri Sep 25 08:54:14 2009
From: lonetwin at fedoraproject.org (Steven Fernandez)
Date: Fri, 25 Sep 2009 08:54:14 +0000 (UTC)
Subject: rpms/python-sysv_ipc/F-11 import.log, NONE, 1.1 python-sysv_ipc.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925085414.AF2DC11C00E8@cvs1.fedora.phx.redhat.com>

Author: lonetwin

Update of /cvs/pkgs/rpms/python-sysv_ipc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32411/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-sysv_ipc.spec 
Log Message:
- Initial check-in



--- NEW FILE import.log ---
python-sysv_ipc-0_4_2-1_fc11:F-11:python-sysv_ipc-0.4.2-1.fc11.src.rpm:1253868802


--- NEW FILE python-sysv_ipc.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define oname sysv_ipc

Name:           python-%{oname}
Version:        0.4.2
Release:        1%{?dist}
Summary:        System V IPC for Python - Semaphores, Shared Memory and Message Queues
Group:          Development/Libraries
License:        GPLv3+
URL:            http://semanchuk.com/philip/%{oname}/
Source0:        http://semanchuk.com/philip/%{oname}/%{oname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:  python-devel

%description
The sysv_ipc module which gives Python access to System V inter-process
semaphores, shared memory and message queues on systems that support them.

%package examples
Summary:    Examples for Python sysv_ipc module
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}

%description examples
This module comes with two demonstration apps. The first (in the directory
demo) shows how to use shared memory and semaphores. The second (in the
directory demo2) shows how to use message queues.

%prep
%setup -q -n sysv_ipc-%{version}

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-examples-%{version}/demo{,2}
install -m 644 demo/*  $RPM_BUILD_ROOT/%{_docdir}/%{name}-examples-%{version}/demo
install -m 644 demo2/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-examples-%{version}/demo2

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE README ReadMe.html VERSION
%{python_sitearch}/%{oname}.so
%{python_sitearch}/%{oname}-%{version}-py2.6.egg-info

%files examples
%defattr(-,root,root,-)
%{_docdir}/%{name}-examples-%{version}/

%changelog
* Sat Aug 29 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:26:38 -0000	1.1
+++ .cvsignore	25 Sep 2009 08:54:13 -0000	1.2
@@ -0,0 +1 @@
+sysv_ipc-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:26:38 -0000	1.1
+++ sources	25 Sep 2009 08:54:14 -0000	1.2
@@ -0,0 +1 @@
+b559fa3bbd7f13ed602eff58c04399c1  sysv_ipc-0.4.2.tar.gz



From lonetwin at fedoraproject.org  Fri Sep 25 08:58:17 2009
From: lonetwin at fedoraproject.org (Steven Fernandez)
Date: Fri, 25 Sep 2009 08:58:17 +0000 (UTC)
Subject: rpms/python-sysv_ipc/F-10 import.log, NONE, 1.1 python-sysv_ipc.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925085817.DA84411C00E8@cvs1.fedora.phx.redhat.com>

Author: lonetwin

Update of /cvs/pkgs/rpms/python-sysv_ipc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1234/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-sysv_ipc.spec 
Log Message:
- Initial check-in



--- NEW FILE import.log ---
python-sysv_ipc-0_4_2-1_fc11:F-10:python-sysv_ipc-0.4.2-1.fc11.src.rpm:1253868975


--- NEW FILE python-sysv_ipc.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define oname sysv_ipc

Name:           python-%{oname}
Version:        0.4.2
Release:        1%{?dist}
Summary:        System V IPC for Python - Semaphores, Shared Memory and Message Queues
Group:          Development/Libraries
License:        GPLv3+
URL:            http://semanchuk.com/philip/%{oname}/
Source0:        http://semanchuk.com/philip/%{oname}/%{oname}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:  python-devel

%description
The sysv_ipc module which gives Python access to System V inter-process
semaphores, shared memory and message queues on systems that support them.

%package examples
Summary:    Examples for Python sysv_ipc module
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}

%description examples
This module comes with two demonstration apps. The first (in the directory
demo) shows how to use shared memory and semaphores. The second (in the
directory demo2) shows how to use message queues.

%prep
%setup -q -n sysv_ipc-%{version}

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-examples-%{version}/demo{,2}
install -m 644 demo/*  $RPM_BUILD_ROOT/%{_docdir}/%{name}-examples-%{version}/demo
install -m 644 demo2/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-examples-%{version}/demo2

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE README ReadMe.html VERSION
%{python_sitearch}/%{oname}.so
%{python_sitearch}/%{oname}-%{version}-py2.6.egg-info

%files examples
%defattr(-,root,root,-)
%{_docdir}/%{name}-examples-%{version}/

%changelog
* Sat Aug 29 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:26:38 -0000	1.1
+++ .cvsignore	25 Sep 2009 08:58:16 -0000	1.2
@@ -0,0 +1 @@
+sysv_ipc-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:26:38 -0000	1.1
+++ sources	25 Sep 2009 08:58:17 -0000	1.2
@@ -0,0 +1 @@
+b559fa3bbd7f13ed602eff58c04399c1  sysv_ipc-0.4.2.tar.gz



From hadess at fedoraproject.org  Fri Sep 25 09:01:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 25 Sep 2009 09:01:01 +0000 (UTC)
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.120,1.121
Message-ID: <20090925090101.958DA11C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2512

Modified Files:
	sound-juicer.spec 
Log Message:
* Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
- Remove old libmusicbrainz BR



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sound-juicer.spec	24 Sep 2009 02:12:00 -0000	1.120
+++ sound-juicer.spec	25 Sep 2009 09:01:00 -0000	1.121
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
@@ -23,7 +23,7 @@ Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
 BuildRequires:  gnome-media-devel >= %{gnome_media_version}
-BuildRequires:	libmusicbrainz3-devel libmusicbrainz-devel
+BuildRequires:	libmusicbrainz3-devel
 BuildRequires:	glib2-devel >= %{glib_version}
 BuildRequires:	gtk2-devel >= %{gtk_version}
 BuildRequires:	gstreamer-devel >= %{gstreamer_version}
@@ -125,6 +125,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
+- Remove old libmusicbrainz BR
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From mcepl at fedoraproject.org  Fri Sep 25 09:08:35 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Fri, 25 Sep 2009 09:08:35 +0000 (UTC)
Subject: rpms/syncevolution/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 syncevolution.spec, 1.14, 1.15
Message-ID: <20090925090835.6FE7311C00E8@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6105

Modified Files:
	.cvsignore sources syncevolution.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Aug 2009 11:11:38 -0000	1.5
+++ .cvsignore	25 Sep 2009 09:08:34 -0000	1.6
@@ -1,2 +1 @@
-syncevolution-0.8.1a.tar.gz
-syncevolution-0.8.1+0.9+beta3+20090723.tar.gz
+syncevolution-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Aug 2009 11:11:39 -0000	1.5
+++ sources	25 Sep 2009 09:08:35 -0000	1.6
@@ -1 +1 @@
-5c84744312f10fa93195c711434b6a0c  syncevolution-0.8.1+0.9+beta3+20090723.tar.gz
+480529e14bc895035824f5d7cce71228  syncevolution-0.9.tar.gz


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- syncevolution.spec	5 Aug 2009 14:19:26 -0000	1.14
+++ syncevolution.spec	25 Sep 2009 09:08:35 -0000	1.15
@@ -1,12 +1,11 @@
 Summary: SyncML client for evolution
 Name: syncevolution
-Version: 0.8.1+0.9+beta3+20090723
-Release: 1.0.3%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
 Source: http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
-Patch0: syncevolution-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -36,7 +35,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .Fedora-build
 # use the ac macros in Makefile.am
 sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
 touch -r Makefile-gen.am Makefile.am
@@ -88,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/syncevolution/*so
 
 %changelog
+* Fri Sep 25 2009 Mat?j Cepl <mcepl at redhat.com> - 0.9-1
+- New upstream release.
+
 * Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.3
 - missing BuildRequires
 



From pkgdb at fedoraproject.org  Fri Sep 25 09:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:16:43 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090925091643.E9C9810F861@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora devel is now owned by atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:16:54 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090925091654.32C4910F841@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 11 is now owned by atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:16:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:16:59 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091659.CF90510F841@bastion2.fedora.phx.redhat.com>

atkac has set the watchbugzilla acl on mtr (Fedora 11) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:02 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091702.5A09D10F87C@bastion2.fedora.phx.redhat.com>

atkac has set the watchcommits acl on mtr (Fedora 11) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:03 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091704.86FE410F841@bastion2.fedora.phx.redhat.com>

atkac has set the commit acl on mtr (Fedora 11) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:06 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091706.954E510F885@bastion2.fedora.phx.redhat.com>

atkac has set the approveacls acl on mtr (Fedora 11) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:10 +0000
Subject: [pkgdb] mtr ownership updated
Message-ID: <20090925091710.6217D10F841@bastion2.fedora.phx.redhat.com>

Package mtr in Fedora 10 is now owned by atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:14 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091714.4A76C10F841@bastion2.fedora.phx.redhat.com>

atkac has set the watchbugzilla acl on mtr (Fedora 10) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:15 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091715.E34BC10F883@bastion2.fedora.phx.redhat.com>

atkac has set the watchcommits acl on mtr (Fedora 10) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:17 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091717.F08E210F86F@bastion2.fedora.phx.redhat.com>

atkac has set the commit acl on mtr (Fedora 10) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:19 +0000
Subject: [pkgdb] mtr had acl change status
Message-ID: <20090925091719.CF40610F861@bastion2.fedora.phx.redhat.com>

atkac has set the approveacls acl on mtr (Fedora 10) to Approved for atkac

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:27 +0000
Subject: [pkgdb] mtr: atkac has requested watchbugzilla
Message-ID: <20090925091728.4121210F861@bastion2.fedora.phx.redhat.com>

atkac has requested the watchbugzilla acl on mtr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:38 +0000
Subject: [pkgdb] mtr: atkac has requested watchcommits
Message-ID: <20090925091738.52F2E10F841@bastion2.fedora.phx.redhat.com>

atkac has requested the watchcommits acl on mtr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:40 +0000
Subject: [pkgdb] mtr: atkac has requested commit
Message-ID: <20090925091740.A8A2810F861@bastion2.fedora.phx.redhat.com>

atkac has requested the commit acl on mtr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mtr



From pkgdb at fedoraproject.org  Fri Sep 25 09:17:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 09:17:42 +0000
Subject: [pkgdb] mtr: atkac has requested approveacls
Message-ID: <20090925091742.933BF10F841@bastion2.fedora.phx.redhat.com>

atkac has requested the approveacls acl on mtr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mtr



From toshio at fedoraproject.org  Fri Sep 25 09:48:47 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 25 Sep 2009 09:48:47 +0000 (UTC)
Subject: rpms/fusecompress/devel fusecompress-log-vsprintf.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 fusecompress-2.5-gcc44.patch, 1.1,
	1.2 fusecompress.spec, 1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20090925094847.DCEFE11C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19867

Modified Files:
	.cvsignore fusecompress-2.5-gcc44.patch fusecompress.spec 
	sources 
Added Files:
	fusecompress-log-vsprintf.patch 
Log Message:

* Thu Sep 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-1
- Update to 2.6.
- Drop portion of gcc patch that's gone upstream.
- Patch for vsprintf bug in new logging code.


fusecompress-log-vsprintf.patch:
 rlog.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE fusecompress-log-vsprintf.patch ---
diff -up tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h.mine tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h.mine	2009-09-25 01:20:19.430963948 -0700
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h	2009-09-25 01:20:42.285632156 -0700
@@ -3,6 +3,7 @@
 
 #include <syslog.h>
 #include <stdarg.h>
+#include <cstdio>
 #include <string>
 
 namespace rlog {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 May 2009 17:59:21 -0000	1.7
+++ .cvsignore	25 Sep 2009 09:48:45 -0000	1.8
@@ -1 +1 @@
-tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.tar.gz
+tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz

fusecompress-2.5-gcc44.patch:
 assert.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: fusecompress-2.5-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress-2.5-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fusecompress-2.5-gcc44.patch	8 May 2009 17:55:50 -0000	1.1
+++ fusecompress-2.5-gcc44.patch	25 Sep 2009 09:48:45 -0000	1.2
@@ -13,15 +13,3 @@ diff -urp tex-fusecompress-ae67acae857c3
  #endif
 -
 +#endif
-diff -urp tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4/src/Memory.cpp tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.goo/src/Memory.cpp
---- tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4/src/Memory.cpp	2009-04-13 16:27:20.000000000 +0200
-+++ tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.goo/src/Memory.cpp	2009-05-08 19:32:17.737886540 +0200
-@@ -269,7 +269,7 @@ ssize_t Memory::readFullParent(char * &b
- 
- ssize_t Memory::readParent(char * &buf, size_t &len, off_t &offset, off_t block_offset) const
- {
--	size_t size = std::min(len, (size_t) block_offset - offset);
-+	size_t size = std::min(len, (size_t) (block_offset - offset));
- 	size_t osize = size;
- 
- 	ssize_t r = readFullParent(buf, size, offset);


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fusecompress.spec	17 Sep 2009 06:19:56 -0000	1.16
+++ fusecompress.spec	25 Sep 2009 09:48:45 -0000	1.17
@@ -1,21 +1,20 @@
 Name:           fusecompress
-Version:        2.5
-Release:        3%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://miio.net/fusecompress/
-Source0:        http://download.github.com/tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.tar.gz
+Source0:        http://download.github.com/tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz
 Patch0:         fusecompress-2.5-gcc44.patch
 Patch1:         fusecompress-2.5-ppc.patch
+# Patch already upstream
+Patch2:         fusecompress-log-vsprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  rlog-devel fuse-devel file-devel boost-devel
+BuildRequires:  fuse-devel file-devel boost-devel
 BuildRequires:  zlib-devel bzip2-devel lzo-devel lzma-devel
-# Ships with link to automake's config.sub
-# to raz pekne vybuchne
-BuildRequires:  automake
 Requires:       fuse
 
 
@@ -27,12 +26,12 @@ compressed files and user applications.
 
 
 %prep
-%setup -q -n tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4
+%setup -q -n tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .ppc
+%patch2 -p1 -b .vsprintf
 find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
 
-
 %build
 %configure --with-boost-libdir=%{_libdir}
 make %{?_smp_mflags}
@@ -53,12 +52,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fusecompress
 %{_bindir}/fusecompress_offline
 %{_bindir}/print_compress
+%{_bindir}/mount.fusecompress
 %{_mandir}/man1/fusecompress.1*
 %{_mandir}/man1/fusecompress_offline.1*
 %doc ChangeLog README AUTHORS COPYING NEWS
 
 
 %changelog
+* Thu Sep 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-1
+- Update to 2.6.
+- Drop portion of gcc patch that's gone upstream.
+- Patch for vsprintf bug in new logging code.
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.5-3
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 May 2009 17:59:21 -0000	1.7
+++ sources	25 Sep 2009 09:48:45 -0000	1.8
@@ -1 +1 @@
-7198d0370b3e7d5d90e0a02bbb8f701b  tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.tar.gz
+758ec3b21d7576b77b22e223abf2bd6d  tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz



From fabbione at fedoraproject.org  Fri Sep 25 09:52:16 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 09:52:16 +0000 (UTC)
Subject: rpms/corosync/devel .cvsignore, 1.10, 1.11 corosync.spec, 1.34,
	1.35 sources, 1.12, 1.13
Message-ID: <20090925095216.730A911C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20911

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release, enable InfiniBand support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	22 Sep 2009 13:15:23 -0000	1.10
+++ .cvsignore	25 Sep 2009 09:52:16 -0000	1.11
@@ -1 +1 @@
-corosync-1.0.1.tar.gz
+corosync-1.1.0.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- corosync.spec	22 Sep 2009 13:15:23 -0000	1.34
+++ corosync.spec	25 Sep 2009 09:52:16 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Conflicts: openais <= 0.89, openais-deve
 BuildRequires: autoconf automake
 %endif
 BuildRequires: nss-devel
+BuildRequires: libibverbs-devel librdmacm-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,7 +35,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{configure}
+export ibverbs_CFLAGS=-I/usr/include/infiniband \
+export ibverbs_LIBS=-libverbs \
+export rdmacm_CFLAGS=-I/usr/include/rdma \
+export rdmacm_LIBS=-lrdmacm \
+%{configure} \
+	--enable-nss \
+	--enable-rdma
 
 %build
 make %{_smp_mflags}
@@ -80,6 +87,8 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
+%{_sbindir}/corosync-cpgtool
+%{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
@@ -199,6 +208,12 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
+- New upstream release
+- spec file updates:
+  * enable IB support
+  * explicitly define built-in features at configure time
+
 * Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
 - New upstream release
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Sep 2009 13:15:23 -0000	1.12
+++ sources	25 Sep 2009 09:52:16 -0000	1.13
@@ -1 +1 @@
-75fe306a8e23c31a3b0a42798e01e466  corosync-1.0.1.tar.gz
+f1ae40281356446d1af31a75068ec3d0  corosync-1.1.0.tar.gz



From fabbione at fedoraproject.org  Fri Sep 25 09:55:19 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 09:55:19 +0000 (UTC)
Subject: rpms/openais/devel .cvsignore, 1.19, 1.20 openais.spec, 1.50,
	1.51 sources, 1.20, 1.21
Message-ID: <20090925095519.B7E2211C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23281

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	22 Sep 2009 13:34:52 -0000	1.19
+++ .cvsignore	25 Sep 2009 09:55:19 -0000	1.20
@@ -1 +1 @@
-openais-1.0.2.tar.gz
+openais-1.1.0.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- openais.spec	22 Sep 2009 13:34:52 -0000	1.50
+++ openais.spec	25 Sep 2009 09:55:19 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.2
+Version: 1.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -150,6 +150,9 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
+- New upstream release.
+
 * Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.2-1
 - New upstream release.
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	22 Sep 2009 13:34:52 -0000	1.20
+++ sources	25 Sep 2009 09:55:19 -0000	1.21
@@ -1 +1 @@
-5cf8a47d53b3df127e21a32c813addba  openais-1.0.2.tar.gz
+6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz



From atkac at fedoraproject.org  Fri Sep 25 10:03:49 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri, 25 Sep 2009 10:03:49 +0000 (UTC)
Subject: rpms/mtr/devel mtr.spec,1.51,1.52
Message-ID: <20090925100349.BCC8A11C00E8@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26430

Modified Files:
	mtr.spec 
Log Message:
- remove unneeded build requires (#525547)



Index: mtr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- mtr.spec	25 Jul 2009 15:20:37 -0000	1.51
+++ mtr.spec	25 Sep 2009 10:03:49 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool
 Name: mtr
 Version: 0.75
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
@@ -11,7 +11,7 @@ Source1: xmtr.consolehelper
 Source2: xmtr.pam
 Source3: net-x%{name}.desktop
 Patch0: mtr-0.75-fd-flags.path
-BuildRequires: ncurses-devel gtk2-devel desktop-file-utils gtk+-devel
+BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Fri Sep 25 2009 Adam Tkac <atkac redhat com> 2:0.75-5
+- remove unneeded build requires (#525547)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:0.75-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Fri Sep 25 10:13:42 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 10:13:42 +0000 (UTC)
Subject: rpms/libgssapi/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 libgssapi.spec, 1.26, 1.27
Message-ID: <20090925101342.D69EF11C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/libgssapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29696/devel

Modified Files:
	.cvsignore libgssapi.spec 
Added Files:
	import.log 
Log Message:
Small issues, found during merge review, were fixed


--- NEW FILE import.log ---
libgssapi-0_11-7_fc11:HEAD:libgssapi-0.11-7.fc11.src.rpm:1253873571


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 May 2007 18:02:45 -0000	1.7
+++ .cvsignore	25 Sep 2009 10:13:42 -0000	1.8
@@ -1,4 +1 @@
-libgssapi-0.7.tar.gz
-libgssapi-0.9.tar.gz
-libgssapi-0.10.tar.gz
 libgssapi-0.11.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libgssapi.spec	25 Jul 2009 05:50:32 -0000	1.26
+++ libgssapi.spec	25 Sep 2009 10:13:42 -0000	1.27
@@ -1,71 +1,77 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.11
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: BSD and MIT
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.11.tar.gz
+Patch0: libgssapi-0.7-gssapi_mech.patch
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: pkgconfig
+BuildRequires: krb5-libs >= 1.5
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: krb5-libs >= 1.5
+
 
 %description
 This library exports a gssapi interface, but doesn't implement any gssapi
 mechanisms itself; instead it calls gssapi routines in other libraries,
 depending on the mechanism.
 
+
 %package devel
 Summary: Development files for the gssapi library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 Requires: pkgconfig
 
-Patch0: libgssapi-0.7-gssapi_mech.patch
 
 %description devel
 This package includes header files and libraries necessary for
 developing programs which use the gssapi library.
 
+
 %prep
 %setup -q
 %patch0 -p1
 
-%configure --prefix=%{buildroot}
+
+%build
+%configure
 # Get rid of rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
-%build
-make all 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/etc
-%makeinstall
-install -m 644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
-sed -i "s|${RPM_BUILD_ROOT}||g" $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgssapi.pc
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+install -D -p -m 0644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libgssapi.so.*
 %{_libdir}/libgssapi.la
 %config(noreplace) /etc/gssapi_mech.conf
 
+
 %files devel
-%defattr(0644,root,root,755)
+%defattr(-,root,root,-)
 %{_libdir}/libgssapi.so
 %{_libdir}/libgssapi.a
 %dir %{_includedir}/gssglue
@@ -73,7 +79,11 @@ rm -rf %{buildroot}
 %{_includedir}/gssglue/gssapi/gssapi.h
 %{_libdir}/pkgconfig/libgssapi.pc
 
+
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.11-7
+- Fixed issues, found during Merge Review (bz #353975)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Fri Sep 25 10:14:58 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 10:14:58 +0000 (UTC)
Subject: rpms/libgssapi/F-11 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 libgssapi.spec, 1.25, 1.26
Message-ID: <20090925101458.CE89211C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/libgssapi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30167/F-11

Modified Files:
	.cvsignore libgssapi.spec 
Added Files:
	import.log 
Log Message:
Small issues, found during merge review, were fixed


--- NEW FILE import.log ---
libgssapi-0_11-7_fc11:F-11:libgssapi-0.11-7.fc11.src.rpm:1253873674


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 May 2007 18:02:45 -0000	1.7
+++ .cvsignore	25 Sep 2009 10:14:58 -0000	1.8
@@ -1,4 +1 @@
-libgssapi-0.7.tar.gz
-libgssapi-0.9.tar.gz
-libgssapi-0.10.tar.gz
 libgssapi-0.11.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/F-11/libgssapi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libgssapi.spec	25 Feb 2009 15:30:27 -0000	1.25
+++ libgssapi.spec	25 Sep 2009 10:14:58 -0000	1.26
@@ -1,71 +1,77 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.11
-Release: 5%{?dist}
+Release: 7%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: BSD and MIT
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.11.tar.gz
+Patch0: libgssapi-0.7-gssapi_mech.patch
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: pkgconfig
+BuildRequires: krb5-libs >= 1.5
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: krb5-libs >= 1.5
+
 
 %description
 This library exports a gssapi interface, but doesn't implement any gssapi
 mechanisms itself; instead it calls gssapi routines in other libraries,
 depending on the mechanism.
 
+
 %package devel
 Summary: Development files for the gssapi library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 Requires: pkgconfig
 
-Patch0: libgssapi-0.7-gssapi_mech.patch
 
 %description devel
 This package includes header files and libraries necessary for
 developing programs which use the gssapi library.
 
+
 %prep
 %setup -q
 %patch0 -p1
 
-%configure --prefix=%{buildroot}
+
+%build
+%configure
 # Get rid of rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
-%build
-make all 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/etc
-%makeinstall
-install -m 644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
-sed -i "s|${RPM_BUILD_ROOT}||g" $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgssapi.pc
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+install -D -p -m 0644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libgssapi.so.*
 %{_libdir}/libgssapi.la
 %config(noreplace) /etc/gssapi_mech.conf
 
+
 %files devel
-%defattr(0644,root,root,755)
+%defattr(-,root,root,-)
 %{_libdir}/libgssapi.so
 %{_libdir}/libgssapi.a
 %dir %{_includedir}/gssglue
@@ -73,7 +79,14 @@ rm -rf %{buildroot}
 %{_includedir}/gssglue/gssapi/gssapi.h
 %{_libdir}/pkgconfig/libgssapi.pc
 
+
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.11-7
+- Fixed issues, found during Merge Review (bz #353975)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From peter at fedoraproject.org  Fri Sep 25 10:15:45 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 10:15:45 +0000 (UTC)
Subject: rpms/libgssapi/F-10 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 libgssapi.spec, 1.24, 1.25
Message-ID: <20090925101545.D89EE11C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/libgssapi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30515/F-10

Modified Files:
	.cvsignore libgssapi.spec 
Added Files:
	import.log 
Log Message:
Small issues, found during merge review, were fixed


--- NEW FILE import.log ---
libgssapi-0_11-7_fc11:F-10:libgssapi-0.11-7.fc11.src.rpm:1253873718


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 May 2007 18:02:45 -0000	1.7
+++ .cvsignore	25 Sep 2009 10:15:45 -0000	1.8
@@ -1,4 +1 @@
-libgssapi-0.7.tar.gz
-libgssapi-0.9.tar.gz
-libgssapi-0.10.tar.gz
 libgssapi-0.11.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/F-10/libgssapi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgssapi.spec	5 Aug 2008 22:05:19 -0000	1.24
+++ libgssapi.spec	25 Sep 2009 10:15:45 -0000	1.25
@@ -1,71 +1,77 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.11
-Release: 4%{?dist}
+Release: 7%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: BSD and MIT
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.11.tar.gz
+Patch0: libgssapi-0.7-gssapi_mech.patch
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: pkgconfig
+BuildRequires: krb5-libs >= 1.5
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: krb5-libs >= 1.5
+
 
 %description
 This library exports a gssapi interface, but doesn't implement any gssapi
 mechanisms itself; instead it calls gssapi routines in other libraries,
 depending on the mechanism.
 
+
 %package devel
 Summary: Development files for the gssapi library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 Requires: pkgconfig
 
-Patch0: libgssapi-0.7-gssapi_mech.patch
 
 %description devel
 This package includes header files and libraries necessary for
 developing programs which use the gssapi library.
 
+
 %prep
 %setup -q
 %patch0 -p1
 
-%configure --prefix=%{buildroot}
+
+%build
+%configure
 # Get rid of rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
-%build
-make all 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/etc
-%makeinstall
-install -m 644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
-sed -i "s|${RPM_BUILD_ROOT}||g" $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgssapi.pc
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+install -D -p -m 0644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libgssapi.so.*
 %{_libdir}/libgssapi.la
 %config(noreplace) /etc/gssapi_mech.conf
 
+
 %files devel
-%defattr(0644,root,root,755)
+%defattr(-,root,root,-)
 %{_libdir}/libgssapi.so
 %{_libdir}/libgssapi.a
 %dir %{_includedir}/gssglue
@@ -73,7 +79,17 @@ rm -rf %{buildroot}
 %{_includedir}/gssglue/gssapi/gssapi.h
 %{_libdir}/pkgconfig/libgssapi.pc
 
+
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.11-7
+- Fixed issues, found during Merge Review (bz #353975)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-4
 - fix license tag
 



From mcepl at fedoraproject.org  Fri Sep 25 10:19:05 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Fri, 25 Sep 2009 10:19:05 +0000 (UTC)
Subject: rpms/syncevolution/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 syncevolution.spec, 1.10,
	1.11 syncevolution-0.8.1a-build.patch, 1.1, NONE
Message-ID: <20090925101905.8350611C00E8@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/syncevolution/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31625

Modified Files:
	.cvsignore sources syncevolution.spec 
Removed Files:
	syncevolution-0.8.1a-build.patch 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Mar 2009 15:05:39 -0000	1.4
+++ .cvsignore	25 Sep 2009 10:19:05 -0000	1.5
@@ -1 +1 @@
-syncevolution-0.8.1a.tar.gz
+syncevolution-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Mar 2009 15:05:39 -0000	1.4
+++ sources	25 Sep 2009 10:19:05 -0000	1.5
@@ -1 +1 @@
-a4bb354520530da4846f3c216d50d42f  syncevolution-0.8.1a.tar.gz
+480529e14bc895035824f5d7cce71228  syncevolution-0.9.tar.gz


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/F-11/syncevolution.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- syncevolution.spec	26 Mar 2009 16:44:38 -0000	1.10
+++ syncevolution.spec	25 Sep 2009 10:19:05 -0000	1.11
@@ -1,56 +1,106 @@
 Summary: SyncML client for evolution
 Name: syncevolution
-Version: 0.8.1a
+Version: 0.9
 Release: 1%{?dist}
-License: GPLv2+
+License: LGPLv2+
 Group: Applications/Productivity
-URL: http://www.estamos.de/projects/SyncML/
-Source0: http://www.estamos.de/download/syncevolution/sources/%{name}-%{version}.tar.gz
-# Patch filed upstream at
-# https://sourceforge.net/tracker/index.php\
-#     ?func=detail&aid=2707496&group_id=146288&atid=764733
-Patch0: syncevolution-0.8.1a-build.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: evolution
-Requires: curl
-BuildRequires: evolution-data-server-devel
-BuildRequires: curl-devel
+URL: http://syncevolution.org/
+Source: http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: boost-devel
 BuildRequires: cppunit-devel
-BuildRequires: gcc-c++
+BuildRequires: evolution-data-server-devel
+BuildRequires: expat-devel
+BuildRequires: glib2-devel
+BuildRequires: libsoup-devel
+BuildRequires: libical-devel
+BuildRequires: pcre-devel
+BuildRequires: libcurl-devel
+BuildRequires: gnome-keyring-devel
+BuildRequires: intltool automake libtool autoconf
 
 %description
 syncevolution is designed to provide a SyncML client that can
 connect to and sync with various SyncML-based servers
 
+%package devel
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Files for development with %{name}.
+
 %prep
 %setup -q
-%patch0 -p1 -b .build
-%configure --enable-unit-tests
+# use the ac macros in Makefile.am
+sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
+touch -r Makefile-gen.am Makefile.am
 
 %build
+intltoolize --automake --copy --force
+autoreconf -fiv
+(cd src/synthesis && mkdir m4 && autoreconf -fi)
+%configure --enable-unit-tests --enable-libsoup  \
+    --enable-dbus-service --enable-shared --with-expat=system \
+    --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
+	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
-%check
-# FIXME: currently doesn't work at all, all tests fail; need to be
-# discussed with upstream.
-#make check
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/share
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/testcases
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+#Remove libtool archives and static libs
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+#make test
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README COPYING HACKING
+%doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
+%{_sysconfdir}/default/syncevolution
 %{_bindir}/*
+%{_libdir}/*so.0*
+%{_libdir}/syncevolution/*so.0*
+%{_libexecdir}/syncevo-dbus-server
+%{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/syncevo-dbus
+%{_includedir}/synthesis
+%{_libdir}/pkgconfig/syncevo-dbus.pc
+%{_libdir}/pkgconfig/synthesis.pc
+%{_libdir}/*so
+%{_libdir}/syncevolution/*so
 
 %changelog
+* Fri Sep 25 2009 Mat?j Cepl <mcepl at redhat.com> - 0.9-1
+- New upstream release.
+
+* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.3
+- missing BuildRequires
+
+* Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.2
+- fixing autoconfigury; now it fails in a later stage of build ;-)
+
+* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.1
+- fixing rpath, currently FTBFS!!!
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 23 2009 Matej Cepl <mcepl at redhat.com> 0.8.1a-1
 - New upstream release.
 - make a fix for one #elif which should be #else


--- syncevolution-0.8.1a-build.patch DELETED ---



From mcepl at fedoraproject.org  Fri Sep 25 10:19:41 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Fri, 25 Sep 2009 10:19:41 +0000 (UTC)
Subject: rpms/syncevolution/devel syncevolution-build.patch,1.1,NONE
Message-ID: <20090925101941.2A4B011C00E8@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31855

Removed Files:
	syncevolution-build.patch 
Log Message:
Forgot to remove old patch


--- syncevolution-build.patch DELETED ---



From fabbione at fedoraproject.org  Fri Sep 25 10:26:38 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 10:26:38 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.29, 1.30 cluster.spec, 1.59,
	1.60 sources, 1.30, 1.31 cp_workaround.diff, 1.1, NONE
Message-ID: <20090925102638.0D4DE11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1975

Modified Files:
	.cvsignore cluster.spec sources 
Removed Files:
	cp_workaround.diff 
Log Message:
New upstream release

spec file updates:
 * drop cp_workaround patch
 * stop shipping rgmanager from cluster
 * move dlm udev rules in clusterlib where they belong
 * enable pacemaker components build
 * ship 2 new rpms: dlm-pcmk and gfs-pcmk for pacemaker integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	24 Aug 2009 04:31:19 -0000	1.29
+++ .cvsignore	25 Sep 2009 10:26:37 -0000	1.30
@@ -1 +1 @@
-cluster-3.0.2.tar.gz
+cluster-3.0.3.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- cluster.spec	24 Aug 2009 06:51:35 -0000	1.59
+++ cluster.spec	25 Sep 2009 10:26:37 -0000	1.60
@@ -18,13 +18,12 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.2
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
-Patch0: cp_workaround.diff
 
 ## Setup/build bits
 
@@ -37,17 +36,19 @@ BuildRequires: libxml2-devel ncurses-dev
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
+BuildRequires: cluster-glue-libs-devel pacemaker-libs-devel glib2-devel
 
 %prep
 %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
-%patch0 -p1
 
 %build
 ./configure \
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
+  --enable_pacemaker \
   --without_fence_agents \
+  --without_rgmanager \
   --without_resource_agents \
   --without_kernel_modules \
   --disable_kernel_check
@@ -94,8 +95,8 @@ Summary: Red Hat Cluster Manager
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 1.0.0-1
-Requires: openais >= 1.0.0-1
+Requires: corosync >= 1.0.1-1
+Requires: openais >= 1.0.2-1
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
 Requires: fence-agents
@@ -119,14 +120,15 @@ fi
 %dir %{_sysconfdir}/cluster
 %{_sysconfdir}/rc.d/init.d/cman
 %dir %{_sysconfdir}/cluster/cman-notify.d
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
 %{_sbindir}/ccs*
 %{_sbindir}/cman*
 %{_sbindir}/confdb2ldif
-%{_sbindir}/dlm*
+%{_sbindir}/dlm_controld
+%{_sbindir}/dlm_tool
 %{_sbindir}/fence*
-%{_sbindir}/gfs_control*
+%{_sbindir}/gfs_control
+%{_sbindir}/gfs_controld
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
 /usr/libexec/*
@@ -148,7 +150,7 @@ fi
 %package -n clusterlib
 Group: System Environment/Libraries
 Summary: The Red Hat Cluster libraries
-Conflicts: cman < 3.0.0-5.alpha4
+Conflicts: cman < 3.0.3-1
 Provides: cmanlib = %{version}
 Obsoletes: cmanlib < 3.0.0-5.alpha4
 
@@ -158,6 +160,7 @@ The Red Hat Cluster libraries package
 %files -n clusterlib
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %{_libdir}/libcman.so.*
 %{_libdir}/libccs*.so.*
 %{_libdir}/libdlm*.so.*
@@ -198,37 +201,33 @@ The Red Hat Cluster libraries developmen
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
 
-%package -n rgmanager
+%package -n dlm-pcmk
 Group: System Environment/Base
-Summary: Open Source HA Resource Group Failover for Red Hat Cluster
+Summary: DLM pacemaker integration layer
 License: GPLv2+ and LGPLv2+
-Requires: chkconfig initscripts
-Requires: cman resource-agents
-Requires(post): chkconfig
-Requires(preun): initscripts
-Requires(preun): chkconfig
 
-%description -n rgmanager
-Red Hat Resource Group Manager provides high availability of critical server
-applications in the event of planned or unplanned system downtime.
+%description -n dlm-pcmk
+The dlm-pcmk package contains the daemon that allows pacemaker
+to drive the Distributed Lock Manager.
 
-%post -n rgmanager
-/sbin/chkconfig --add rgmanager
+%files -n dlm-pcmk
+%defattr(-,root,root,-)
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
+%{_sbindir}/dlm_controld.pcmk
 
-%preun -n rgmanager
-if [ "$1" = 0 ]; then
-	/sbin/service rgmanager stop >/dev/null 2>&1
-	/sbin/chkconfig --del rgmanager
-fi
+%package -n gfs-pcmk
+Group: System Environment/Base
+Summary: GFS pacemaker integration layer
+License: GPLv2+ and LGPLv2+
+
+%description -n gfs-pcmk
+The gfs-pcmk package contains the daemon that allows pacemaker
+to drive the GFS1/GFS2 File Systems.
 
-%files -n rgmanager
+%files -n gfs-pcmk
 %defattr(-,root,root,-)
-%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
-%{_sysconfdir}/rc.d/init.d/rgmanager
-%{_sbindir}/clu*
-%{_sbindir}/rgmanager
-%{_sbindir}/rg_test
-%{_mandir}/man8/clu*
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
+%{_sbindir}/gfs_controld.pcmk
 
 %package -n gfs2-utils
 Group: System Environment/Kernel
@@ -303,6 +302,15 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+- spec file updates:
+  * drop cp_workaround patch
+  * stop shipping rgmanager from cluster
+  * move dlm udev rules in clusterlib where they belong
+  * enable pacemaker components build
+  * ship 2 new rpms: dlm-pcmk and gfs-pcmk for pacemaker integration
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
 - Add temporary workaround to install symlinks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	24 Aug 2009 04:31:19 -0000	1.30
+++ sources	25 Sep 2009 10:26:37 -0000	1.31
@@ -1 +1 @@
-d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz
+fed503b2c44c966dff2adcb206569d79  cluster-3.0.3.tar.gz


--- cp_workaround.diff DELETED ---



From fabbione at fedoraproject.org  Fri Sep 25 10:30:54 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 10:30:54 +0000 (UTC)
Subject: rpms/fence-agents/devel .cvsignore, 1.13, 1.14 fence-agents.spec,
	1.16, 1.17 sources, 1.13, 1.14
Message-ID: <20090925103054.2E49C11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3385

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Aug 2009 04:34:43 -0000	1.13
+++ .cvsignore	25 Sep 2009 10:30:53 -0000	1.14
@@ -1 +1 @@
-fence-agents-3.0.2.tar.gz
+fence-agents-3.0.3.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fence-agents.spec	24 Aug 2009 13:04:28 -0000	1.16
+++ fence-agents.spec	25 Sep 2009 10:30:53 -0000	1.17
@@ -18,8 +18,8 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.2
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -84,6 +84,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
 - Fix changelog.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	24 Aug 2009 04:34:43 -0000	1.13
+++ sources	25 Sep 2009 10:30:54 -0000	1.14
@@ -1 +1 @@
-bbad9ff97a7ce268e43de2cc2aa297f7  fence-agents-3.0.2.tar.gz
+3c418463f61d27e605a979ae2a7ea44c  fence-agents-3.0.3.tar.gz



From fabbione at fedoraproject.org  Fri Sep 25 10:37:44 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 10:37:44 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.14,
	1.15 resource-agents.spec, 1.15, 1.16 sources, 1.14, 1.15
Message-ID: <20090925103745.16A2211C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5335

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New rgmanager resource agents upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	20 Aug 2009 11:09:29 -0000	1.14
+++ .cvsignore	25 Sep 2009 10:37:43 -0000	1.15
@@ -1,2 +1,2 @@
+resource-agents-3.0.3.tar.gz
 2198dc90bec4.tar.bz2
-resource-agents-3.0.1.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- resource-agents.spec	20 Aug 2009 11:09:29 -0000	1.15
+++ resource-agents.spec	25 Sep 2009 10:37:43 -0000	1.16
@@ -24,7 +24,7 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.1
+Version: 3.0.3
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -155,6 +155,9 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New rgmanager resource agents upstream release
+
 * Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
 - New rgmanager resource agents upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	20 Aug 2009 11:09:29 -0000	1.14
+++ sources	25 Sep 2009 10:37:43 -0000	1.15
@@ -1,2 +1,2 @@
+91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
 af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2
-c9fcac80111a360605faecc3b8baa89d  resource-agents-3.0.1.tar.gz



From peter at fedoraproject.org  Fri Sep 25 10:42:32 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 10:42:32 +0000 (UTC)
Subject: rpms/hfsutils/devel hfsutils.spec,1.22,1.23 import.log,1.1,1.2
Message-ID: <20090925104232.BB5DF11C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/hfsutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7375/devel

Modified Files:
	hfsutils.spec import.log 
Log Message:
Another two issues, found during merge review, were fixed


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/devel/hfsutils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- hfsutils.spec	25 Sep 2009 08:34:13 -0000	1.22
+++ hfsutils.spec	25 Sep 2009 10:42:32 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes
 Name: hfsutils
 Version: 3.2.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 Group: Applications/File
 License: GPLv2+
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ BuildRequires: libXft-devel tcl-devel tk
 
 %package devel
 Summary: A C library for reading and writing Macintosh HFS volumes
+Provides: %{name}-static = %{version}-%{release}
 Group: Development/Libraries
 
 %package x11
@@ -59,8 +60,9 @@ make	BINDEST=$RPM_BUILD_ROOT%{_bindir} \
 	LIBDEST=$RPM_BUILD_ROOT%{_libdir} \
 	INCDEST=$RPM_BUILD_ROOT%{_includedir} \
 	MANDEST=$RPM_BUILD_ROOT%{_mandir} \
+	INSTALL="install -p" \
 	install install_lib
-install -m0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
+install -p -m 0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
 ln -sf hfsck $RPM_BUILD_ROOT/%{_bindir}/fsck.hfs
 
 %clean
@@ -121,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-19
+- Added provides hfsutils-static (bz #225886)
+- Use INSTALL="install -p" (bz #225886)
+
 * Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-18
 - Fixed issues from the Merge Review (bz #225886)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 08:34:14 -0000	1.1
+++ import.log	25 Sep 2009 10:42:32 -0000	1.2
@@ -1 +1,2 @@
 hfsutils-3_2_6-18_fc11:HEAD:hfsutils-3.2.6-18.fc11.src.rpm:1253867554
+hfsutils-3_2_6-19_fc11:devel/:hfsutils-3.2.6-19.fc11.src.rpm:1253875246



From sharkcz at fedoraproject.org  Fri Sep 25 10:44:40 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 25 Sep 2009 10:44:40 +0000 (UTC)
Subject: rpms/axis/devel axis-java16.patch,NONE,1.1 axis.spec,1.29,1.30
Message-ID: <20090925104440.1DE8511C00E8@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/axis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118

Modified Files:
	axis.spec 
Added Files:
	axis-java16.patch 
Log Message:
* Fri Sep 25 2009 Dan Horak <dan[at]danny.cz> 0:1.2.1-7
- Backport fix for building with java 1.6, synced from F-11 branch (#511480, #523203)


axis-java16.patch:
 ProjectResourceBundle.java |   63 ++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 23 deletions(-)

--- NEW FILE axis-java16.patch ---
--- src/org/apache/axis/i18n/ProjectResourceBundle.java.orig	2009-05-15 12:01:12.000000000 -0400
+++ src/org/apache/axis/i18n/ProjectResourceBundle.java	2009-05-15 12:03:40.000000000 -0400
@@ -114,14 +114,14 @@ public class ProjectResourceBundle exten
      * 
      * @param projectName The name of the project to which the class belongs.
      *        It must be a proper prefix of the caller's package.
-     * 
-     * @param caller The calling class.
-     *        This is used to get the package name to further construct
-     *        the basename as well as to get the proper ClassLoader.
+     *
+     * @param packageName The name of the package.
      * 
      * @param resourceName The name of the resource without the
      *        ".properties" extension
-     * 
+     *
+     * @return the appropriate ProjectResourceBundle
+     *
      * @throws MissingResourceException if projectName is not a prefix of
      *         the caller's package name, or if the resource could not be
      *         found/loaded.
@@ -146,7 +146,11 @@ public class ProjectResourceBundle exten
      * 
      * @param resourceName The name of the resource without the
      *        ".properties" extension
-     * 
+     *
+     * @param locale the Locale for messages
+     *
+     * @return the appropriate ProjectResourceBundle
+     *
      * @throws MissingResourceException if projectName is not a prefix of
      *         the caller's package name, or if the resource could not be
      *         found/loaded.
@@ -170,15 +174,17 @@ public class ProjectResourceBundle exten
      * @param projectName The name of the project to which the class belongs.
      *        It must be a proper prefix of the caller's package.
      * 
-     * @param caller The calling class.
-     *        This is used to get the package name to further construct
-     *        the basename as well as to get the proper ClassLoader.
-     * 
+     * @param packageName The package name of the resource
+     *
      * @param resourceName The name of the resource without the
      *        ".properties" extension
      * 
      * @param locale The locale
-     * 
+     *
+     * @param loader ClassLoader to use when finding things
+     *
+     * @return the appropriate ProjectResourceBundle
+     *
      * @throws MissingResourceException if projectName is not a prefix of
      *         the caller's package name, or if the resource could not be
      *         found/loaded.
@@ -210,7 +216,9 @@ public class ProjectResourceBundle exten
      * 
      * @param extendsBundle If non-null, then this ExtendMessages will
      *         default to extendsBundle.
-     * 
+     *
+     * @return the appropriate ProjectResourceBundle
+     *
      * @throws MissingResourceException if projectName is not a prefix of
      *         the caller's package name, or if the resource could not be
      *         found/loaded.
@@ -236,18 +244,20 @@ public class ProjectResourceBundle exten
      * @param projectName The name of the project to which the class belongs.
      *        It must be a proper prefix of the caller's package.
      * 
-     * @param caller The calling class.
-     *        This is used to get the package name to further construct
-     *        the basename as well as to get the proper ClassLoader.
-     * 
+     * @param packageName The package name of the resource
+     *
      * @param resourceName The name of the resource without the
      *        ".properties" extension
      * 
      * @param locale The locale
      * 
+     * @param loader ClassLoader to use when finding things
+     *
      * @param extendsBundle If non-null, then this ExtendMessages will
      *         default to extendsBundle.
-     * 
+     *
+     * @return the appropriate ProjectResourceBundle
+     *
      * @throws MissingResourceException if projectName is not a prefix of
      *         the caller's package name, or if the resource could not be
      *         found/loaded.
@@ -276,7 +286,7 @@ public class ProjectResourceBundle exten
 
         packageName = context.validate(packageName);
 
-        ProjectResourceBundle bundle = null;
+        ProjectResourceBundle bundle;
         try {
             bundle = getBundle(context, packageName);
         } catch (RuntimeException e) {
@@ -298,6 +308,11 @@ public class ProjectResourceBundle exten
      * - check cache
      * - try up hierarchy
      * - if at top of hierarchy, use (link to) context.getParentBundle()
+     *
+     * @param context a Context object containing metadata about this call
+     * @param packageName the package name of the resource
+     *
+     * @return the appropriate ProjectResourceBundle
      */
     private static synchronized ProjectResourceBundle getBundle(Context context, String packageName)
         throws MissingResourceException
@@ -339,13 +354,15 @@ public class ProjectResourceBundle exten
         return prb;
     }
 
-    private static final String getPackage(String name) {
+    private static String getPackage(String name) {
         return name.substring(0, name.lastIndexOf('.')).intern();
     }
     
     /**
       * Construct a new ProjectResourceBundle
-      */
+     * @param name the name of this bundle
+     * @param bundle reference to our parent bundle
+     */
     private ProjectResourceBundle(String name, ResourceBundle bundle)
         throws MissingResourceException
     {
@@ -360,7 +377,7 @@ public class ProjectResourceBundle exten
     /**
      * Clears the internal cache
      */
-    public static void clearCache()
+    public static void clearPRBCache()
     {
         bundleCache.clear();
     }
@@ -428,7 +445,7 @@ public class ProjectResourceBundle exten
         ResourceBundle getParentBundle(String packageName)
         {
             ResourceBundle p;
-            if (packageName != _projectName) {
+            if (!packageName.equals(_projectName)) {
                 p = getBundle(this, getPackage(packageName));
             } else {
                 p = _parent;
@@ -456,7 +473,7 @@ public class ProjectResourceBundle exten
             /* Ensure that project is a proper prefix of class.
              * Terminate project name with '.' to ensure proper match.
              */
-            if (packageName != _projectName  &&  !packageName.startsWith(_projectName + '.')) {
+            if (!packageName.equals(_projectName)  &&  !packageName.startsWith(_projectName + '.')) {
                 log.debug("Project not a prefix of Package");
                 throw new MissingResourceException("Project '" + _projectName
                                  + "' must be a prefix of Package '"


Index: axis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/axis/devel/axis.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- axis.spec	24 Jul 2009 17:44:39 -0000	1.29
+++ axis.spec	25 Sep 2009 10:44:39 -0000	1.30
@@ -7,7 +7,7 @@
 
 Name:          axis
 Version:       1.2.1
-Release:       6.1%{?dist}
+Release:       7%{?dist}
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       ASL 2.0
@@ -19,6 +19,7 @@ Patch2:        %{name}-imageio.patch
 Patch3:        %{name}-objectweb.patch
 Patch4:        %{name}-%{version}-DH.patch
 Patch5:        %{name}-build_xml.patch
+Patch6:        %{name}-java16.patch
 BuildRequires: jpackage-utils >= 0:1.5
 BuildRequires: java-devel
 BuildRequires: ant >= 0:1.6, ant-nodeps
@@ -98,6 +99,7 @@ Documentation for %{name}.
 %patch3 -p1 -b .orig
 %patch4
 %patch5
+%patch6 -b .orig
 
 # Remove provided binaries
 find . -name "*.jar" -exec rm -f {} \;
@@ -215,6 +217,9 @@ fi
 %doc docs/*
 
 %changelog
+* Fri Sep 25 2009 Dan Horak <dan[at]danny.cz> 0:1.2.1-7
+- Backport fix for building with java 1.6, synced from F-11 branch (#511480, #523203)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.1-6.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Fri Sep 25 10:44:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 10:44:48 +0000 (UTC)
Subject: rpms/hfsutils/F-11 hfsutils.spec,1.21,1.22 import.log,1.1,1.2
Message-ID: <20090925104448.1F0D911C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/hfsutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8203/F-11

Modified Files:
	hfsutils.spec import.log 
Log Message:
Another two issues, found during merge review, were fixed


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-11/hfsutils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- hfsutils.spec	25 Sep 2009 08:36:43 -0000	1.21
+++ hfsutils.spec	25 Sep 2009 10:44:47 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes
 Name: hfsutils
 Version: 3.2.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 Group: Applications/File
 License: GPLv2+
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ BuildRequires: libXft-devel tcl-devel tk
 
 %package devel
 Summary: A C library for reading and writing Macintosh HFS volumes
+Provides: %{name}-static = %{version}-%{release}
 Group: Development/Libraries
 
 %package x11
@@ -59,8 +60,9 @@ make	BINDEST=$RPM_BUILD_ROOT%{_bindir} \
 	LIBDEST=$RPM_BUILD_ROOT%{_libdir} \
 	INCDEST=$RPM_BUILD_ROOT%{_includedir} \
 	MANDEST=$RPM_BUILD_ROOT%{_mandir} \
+	INSTALL="install -p" \
 	install install_lib
-install -m0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
+install -p -m 0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
 ln -sf hfsck $RPM_BUILD_ROOT/%{_bindir}/fsck.hfs
 
 %clean
@@ -121,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-19
+- Added provides hfsutils-static (bz #225886)
+- Use INSTALL="install -p" (bz #225886)
+
 * Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-18
 - Fixed issues from the Merge Review (bz #225886)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 08:36:43 -0000	1.1
+++ import.log	25 Sep 2009 10:44:47 -0000	1.2
@@ -1 +1,2 @@
 hfsutils-3_2_6-18_fc11:F-11:hfsutils-3.2.6-18.fc11.src.rpm:1253867763
+hfsutils-3_2_6-19_fc11:F-11:hfsutils-3.2.6-19.fc11.src.rpm:1253875391



From peter at fedoraproject.org  Fri Sep 25 10:45:43 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 25 Sep 2009 10:45:43 +0000 (UTC)
Subject: rpms/hfsutils/F-10 hfsutils.spec,1.20,1.21 import.log,1.1,1.2
Message-ID: <20090925104543.64F9411C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/hfsutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8639/F-10

Modified Files:
	hfsutils.spec import.log 
Log Message:
Another two issues, found during merge review, were fixed


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-10/hfsutils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- hfsutils.spec	25 Sep 2009 08:38:29 -0000	1.20
+++ hfsutils.spec	25 Sep 2009 10:45:43 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes
 Name: hfsutils
 Version: 3.2.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 Group: Applications/File
 License: GPLv2+
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ BuildRequires: libXft-devel tcl-devel tk
 
 %package devel
 Summary: A C library for reading and writing Macintosh HFS volumes
+Provides: %{name}-static = %{version}-%{release}
 Group: Development/Libraries
 
 %package x11
@@ -59,8 +60,9 @@ make	BINDEST=$RPM_BUILD_ROOT%{_bindir} \
 	LIBDEST=$RPM_BUILD_ROOT%{_libdir} \
 	INCDEST=$RPM_BUILD_ROOT%{_includedir} \
 	MANDEST=$RPM_BUILD_ROOT%{_mandir} \
+	INSTALL="install -p" \
 	install install_lib
-install -m0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
+install -p -m 0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
 ln -sf hfsck $RPM_BUILD_ROOT/%{_bindir}/fsck.hfs
 
 %clean
@@ -121,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-19
+- Added provides hfsutils-static (bz #225886)
+- Use INSTALL="install -p" (bz #225886)
+
 * Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 3.2.6-18
 - Fixed issues from the Merge Review (bz #225886)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 08:38:29 -0000	1.1
+++ import.log	25 Sep 2009 10:45:43 -0000	1.2
@@ -1 +1,2 @@
 hfsutils-3_2_6-18_fc11:F-10:hfsutils-3.2.6-18.fc11.src.rpm:1253867870
+hfsutils-3_2_6-19_fc11:F-10:hfsutils-3.2.6-19.fc11.src.rpm:1253875500



From fabbione at fedoraproject.org  Fri Sep 25 10:58:55 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 10:58:55 +0000 (UTC)
Subject: rpms/rgmanager/devel .cvsignore, 1.15, 1.16 Makefile, 1.5,
	1.6 rgmanager.spec, 1.45, 1.46 sources, 1.24, 1.25 dead.package,
	1.1, NONE
Message-ID: <20090925105855.EB01311C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13771

Added Files:
	.cvsignore Makefile rgmanager.spec sources 
Removed Files:
	dead.package 
Log Message:
Restore package. BZ#520563



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	25 Sep 2009 10:58:53 -0000	1.16
@@ -0,0 +1 @@
+rgmanager-3.0.3.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	25 Sep 2009 10:58:54 -0000	1.6
@@ -0,0 +1,21 @@
+# Makefile for source rpm: rgmanager
+# $Id$
+NAME := rgmanager
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: rgmanager.spec
===================================================================
RCS file: rgmanager.spec
diff -N rgmanager.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rgmanager.spec	25 Sep 2009 10:58:54 -0000	1.46
@@ -0,0 +1,91 @@
+###############################################################################
+###############################################################################
+##
+##  Copyright (C) 2004-2009 Red Hat, Inc.  All rights reserved.
+##
+##  This copyrighted material is made available to anyone wishing to use,
+##  modify, copy, or redistribute it subject to the terms and conditions
+##  of the GNU General Public License v.2.
+##
+###############################################################################
+###############################################################################
+
+# main (empty) package
+# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
+
+# keep around ready for later user
+## define alphatag rc4
+
+Name: rgmanager
+Summary: Open Source HA Resource Group Failover for Red Hat Cluster
+Version: 3.0.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+License: GPLv2+ and LGPLv2+
+Group: System Environment/Base
+URL: http://sources.redhat.com/cluster/wiki/
+Source0: ftp://sources.redhat.com/pub/cluster/releases/rgmanager-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+
+## runtime
+
+Requires: chkconfig initscripts
+Requires: cman resource-agents
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
+
+## Setup/build bits
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+# Build dependencies
+BuildRequires: clusterlib-devel >= 3.0.0-1
+BuildRequires: libxml2-devel ncurses-devel slang-devel
+
+%prep
+%setup -q -n rgmanager-%{version}%{?alphatag:.%{alphatag}}
+
+%build
+./configure \
+  --sbindir=%{_sbindir} \
+  --initddir=%{_sysconfdir}/rc.d/init.d \
+  --libdir=%{_libdir} \
+  --without_fence_agents \
+  --without_resource_agents \
+  --without_kernel_modules \
+  --disable_kernel_check
+
+##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
+CFLAGS="$(echo '%{optflags}')" make -C rgmanager all
+
+%install
+rm -rf %{buildroot}
+make -C rgmanager install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%description
+Red Hat Resource Group Manager provides high availability of critical server
+applications in the event of planned or unplanned system downtime.
+
+%post
+/sbin/chkconfig --add rgmanager
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/service rgmanager stop >/dev/null 2>&1
+	/sbin/chkconfig --del rgmanager
+fi
+
+%files
+%defattr(-,root,root,-)
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
+%{_sysconfdir}/rc.d/init.d/rgmanager
+%{_sbindir}/clu*
+%{_sbindir}/rgmanager
+%{_sbindir}/rg_test
+%{_mandir}/man8/clu*
+
+%changelog
+* Tue Sep  1 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- Split from cluster srpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	25 Sep 2009 10:58:55 -0000	1.25
@@ -0,0 +1 @@
+3cb25e8ddfd229831a37ba31a8b7ad56  rgmanager-3.0.3.tar.gz


--- dead.package DELETED ---



From jkratoch at fedoraproject.org  Fri Sep 25 11:06:48 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 25 Sep 2009 11:06:48 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.3-pie-20050110.patch, 1.24,
	1.25 gdb-6.6-buildid-locate.patch, 1.26, 1.27 gdb.spec, 1.387, 1.388
Message-ID: <20090925110648.74E8B11C00E8@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16345

Modified Files:
	gdb-6.3-pie-20050110.patch gdb-6.6-buildid-locate.patch 
	gdb.spec 
Log Message:
* Fri Sep 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-2
- Fix buildid-loading libs w/matching name but different build-id (BZ 524572).


gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infcmd.c      |    3 
 infrun.c      |    4 
 linux-tdep.c  |    2 
 objfiles.c    |   11 +
 solib-svr4.c  |  505 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 solib.c       |   83 +++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 +-
 symfile.h     |    8 
 target.h      |    2 
 16 files changed, 628 insertions(+), 126 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gdb-6.3-pie-20050110.patch	21 Sep 2009 15:49:35 -0000	1.24
+++ gdb-6.3-pie-20050110.patch	25 Sep 2009 11:06:47 -0000	1.25
@@ -26,10 +26,10 @@
 
 	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
 
-Index: gdb-6.8.91.20090917/gdb/amd64-tdep.c
+Index: gdb-6.8.91.20090925/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/amd64-tdep.c	2009-09-17 12:48:49.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/amd64-tdep.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/amd64-tdep.c	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/amd64-tdep.c	2009-09-25 10:25:45.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -138,10 +138,10 @@ Index: gdb-6.8.91.20090917/gdb/amd64-tde
    return pc;
  }
  
-Index: gdb-6.8.91.20090917/gdb/auxv.c
+Index: gdb-6.8.91.20090925/gdb/auxv.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/auxv.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/auxv.c	2009-09-25 10:25:45.000000000 +0200
 @@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
@@ -230,10 +230,10 @@ Index: gdb-6.8.91.20090917/gdb/auxv.c
  	break;
      }
  
-Index: gdb-6.8.91.20090917/gdb/auxv.h
+Index: gdb-6.8.91.20090925/gdb/auxv.h
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/auxv.h	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/auxv.h	2009-09-25 10:25:45.000000000 +0200
 @@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -251,10 +251,10 @@ Index: gdb-6.8.91.20090917/gdb/auxv.h
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
-Index: gdb-6.8.91.20090917/gdb/dwarf2read.c
+Index: gdb-6.8.91.20090925/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/dwarf2read.c	2009-09-17 12:49:20.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/dwarf2read.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/dwarf2read.c	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/dwarf2read.c	2009-09-25 10:25:45.000000000 +0200
 @@ -1717,7 +1717,7 @@ dwarf2_build_psymtabs (struct objfile *o
    dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
    dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
@@ -264,10 +264,10 @@ Index: gdb-6.8.91.20090917/gdb/dwarf2rea
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
-Index: gdb-6.8.91.20090917/gdb/elfread.c
+Index: gdb-6.8.91.20090925/gdb/elfread.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/elfread.c	2009-09-17 12:47:07.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/elfread.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/elfread.c	2009-09-25 10:25:38.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/elfread.c	2009-09-25 10:25:45.000000000 +0200
 @@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
@@ -277,10 +277,10 @@ Index: gdb-6.8.91.20090917/gdb/elfread.c
      {
        init_psymbol_list (objfile, 0);
        mainline = 0;
-Index: gdb-6.8.91.20090917/gdb/infrun.c
+Index: gdb-6.8.91.20090925/gdb/infrun.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/infrun.c	2009-09-17 12:48:50.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/infrun.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/infrun.c	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/infrun.c	2009-09-25 10:25:45.000000000 +0200
 @@ -3659,6 +3659,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
@@ -292,10 +292,10 @@ Index: gdb-6.8.91.20090917/gdb/infrun.c
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-Index: gdb-6.8.91.20090917/gdb/objfiles.c
+Index: gdb-6.8.91.20090925/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/objfiles.c	2009-09-17 12:47:07.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/objfiles.c	2009-09-17 12:50:20.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/objfiles.c	2009-09-25 10:25:38.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/objfiles.c	2009-09-25 10:25:45.000000000 +0200
 @@ -53,6 +53,9 @@
  #include "observer.h"
  #include "complaints.h"
@@ -324,10 +324,10 @@ Index: gdb-6.8.91.20090917/gdb/objfiles.
    if (symfile_objfile == NULL)
      return 0;
  
-Index: gdb-6.8.91.20090917/gdb/solib-svr4.c
+Index: gdb-6.8.91.20090925/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/solib-svr4.c	2009-09-17 12:48:50.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/solib-svr4.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/solib-svr4.c	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/solib-svr4.c	2009-09-25 10:28:07.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
@@ -704,11 +704,19 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  	  target_read_string (LM_NAME (new), &buffer,
  			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
  	  if (errcode != 0)
-@@ -1101,47 +1336,60 @@ svr4_current_sos (void)
+@@ -1101,63 +1336,76 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
  	    {
 -	      struct build_id *build_id;
+-
+-	      strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
+-	      new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
+-	      /* May get overwritten below.  */
+-	      strcpy (new->so_name, new->so_original_name);
+-
+-	      build_id = build_id_addr_get (LM_DYNAMIC_FROM_LINK_MAP (new));
+-	      if (build_id != NULL)
 +	      if (debug_solib)
 +		fprintf_unfiltered (gdb_stdlog, 
 +				    "svr4_current_sos: LM_NAME is <%s>\n",
@@ -718,25 +726,25 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
 +	      if (strcmp (buffer, "") == 0)
 +		free_so (new);
 +	      else
-+		{
+ 		{
+-		  char *name, *build_id_filename;
 +		  struct build_id *build_id;
- 
--	      strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
--	      new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
--	      /* May get overwritten below.  */
--	      strcpy (new->so_name, new->so_original_name);
++
 +		  strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
 +		  new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
 +		  /* May get overwritten below.  */
 +		  strcpy (new->so_name, new->so_original_name);
  
--	      build_id = build_id_addr_get (LM_DYNAMIC_FROM_LINK_MAP (new));
--	      if (build_id != NULL)
--		{
--		  char *name, *build_id_filename;
+-		  /* Missing the build-id matching separate debug info file
+-		     would be handled while SO_NAME gets loaded.  */
+-		  name = build_id_to_filename (build_id, &build_id_filename, 0);
+-		  if (name != NULL)
 +		  build_id = build_id_addr_get (LM_DYNAMIC_FROM_LINK_MAP (new));
 +		  if (build_id != NULL)
-+		    {
+ 		    {
+-		      strncpy (new->so_name, name, SO_NAME_MAX_PATH_SIZE - 1);
+-		      new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
+-		      xfree (name);
 +		      char *name, *build_id_filename;
 +
 +		      /* Missing the build-id matching separate debug info file
@@ -749,21 +757,46 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
 +			  xfree (name);
 +			}
 +		      else
-+			debug_print_missing (new->so_name, build_id_filename);
++			{
++			  debug_print_missing (new->so_name, build_id_filename);
++
++			  /* In the case the main executable was found according to
++			     its build-id (from a core file) prevent loading
++			     a different build of a library with accidentally the
++			     same SO_NAME.
++
++			     It suppresses bogus backtraces (and prints "??" there
++			     instead) if the on-disk files no longer match the
++			     running program version.  */
++
++			  if (symfile_objfile != NULL
++			      && (symfile_objfile->flags
++				  & OBJF_BUILD_ID_CORE_LOADED) != 0)
++			    new->so_name[0] = 0;
++			}
 +
 +		      xfree (build_id_filename);
 +		      xfree (build_id);
-+		    }
+ 		    }
+-		  else
+-		    {
+-		      debug_print_missing (new->so_name, build_id_filename);
  
--		  /* Missing the build-id matching separate debug info file
--		     would be handled while SO_NAME gets loaded.  */
--		  name = build_id_to_filename (build_id, &build_id_filename, 0);
--		  if (name != NULL)
+-		      /* In the case the main executable was found according to
+-			 its build-id (from a core file) prevent loading
+-			 a different build of a library with accidentally the
+-			 same SO_NAME.
+-
+-			 It suppresses bogus backtraces (and prints "??" there
+-			 instead) if the on-disk files no longer match the
+-			 running program version.  */
+-
+-		      if (symfile_objfile != NULL
+-			  && (symfile_objfile->flags
+-			      & OBJF_BUILD_ID_CORE_LOADED) != 0)
+-			new->so_name[0] = 0;
 +		  if (debug_solib)
- 		    {
--		      strncpy (new->so_name, name, SO_NAME_MAX_PATH_SIZE - 1);
--		      new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
--		      xfree (name);
++		    {
 +		      fprintf_unfiltered (gdb_stdlog, 
 +					  "svr4_current_sos: Processing DSO: %s\n",
 +					  new->so_name);
@@ -771,8 +804,6 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
 +					  "svr4_current_sos: first link entry %d\n",
 +					  IGNORE_FIRST_LINK_MAP_ENTRY (new));
  		    }
--		  else
--		    debug_print_missing (new->so_name, build_id_filename);
  
 -		  xfree (build_id_filename);
 -		  xfree (build_id);
@@ -798,7 +829,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  	}
  
        /* On Solaris, the dynamic linker is not in the normal list of
-@@ -1157,6 +1405,9 @@ svr4_current_sos (void)
+@@ -1173,6 +1421,9 @@ svr4_current_sos (void)
    if (head == NULL)
      return svr4_default_sos ();
  
@@ -808,7 +839,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
    return head;
  }
  
-@@ -1189,7 +1440,7 @@ svr4_fetch_objfile_link_map (struct objf
+@@ -1205,7 +1456,7 @@ svr4_fetch_objfile_link_map (struct objf
  /* On some systems, the only way to recognize the link map entry for
     the main executable file is by looking at its name.  Return
     non-zero iff SONAME matches one of the known main executable names.  */
@@ -817,7 +848,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  static int
  match_main (char *soname)
  {
-@@ -1203,6 +1454,7 @@ match_main (char *soname)
+@@ -1219,6 +1470,7 @@ match_main (char *soname)
  
    return (0);
  }
@@ -825,7 +856,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  
  /* Return 1 if PC lies in the dynamic symbol resolution code of the
     SVR4 run time loader.  */
-@@ -1354,15 +1606,29 @@ enable_break (struct svr4_info *info)
+@@ -1370,15 +1622,29 @@ enable_break (struct svr4_info *info)
    /* Find the program interpreter; if not found, warn the user and drop
       into the old breakpoint at symbol code.  */
    interp_name = find_program_interpreter ();
@@ -855,7 +886,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  
        sym_addr = 0;
  
-@@ -1379,6 +1645,9 @@ enable_break (struct svr4_info *info)
+@@ -1395,6 +1661,9 @@ enable_break (struct svr4_info *info)
          {
  	  tmp_bfd = solib_bfd_open (interp_name);
  	}
@@ -865,7 +896,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
        if (tmp_bfd == NULL)
  	goto bkpt_at_symbol;
  
-@@ -1436,16 +1705,16 @@ enable_break (struct svr4_info *info)
+@@ -1452,16 +1721,16 @@ enable_break (struct svr4_info *info)
        interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
        if (interp_sect)
  	{
@@ -886,7 +917,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  	  interp_plt_sect_high =
  	    interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
  	}
-@@ -1480,7 +1749,7 @@ enable_break (struct svr4_info *info)
+@@ -1496,7 +1765,7 @@ enable_break (struct svr4_info *info)
  
        if (sym_addr != 0)
  	{
@@ -895,7 +926,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  	  xfree (interp_name);
  	  return 1;
  	}
-@@ -1753,6 +2022,9 @@ svr4_solib_create_inferior_hook (void)
+@@ -1769,6 +2038,9 @@ svr4_solib_create_inferior_hook (void)
    while (tp->stop_signal != TARGET_SIGNAL_TRAP);
    inf->stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
@@ -905,7 +936,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  }
  
  static void
-@@ -1929,6 +2201,76 @@ svr4_lp64_fetch_link_map_offsets (void)
+@@ -1945,6 +2217,76 @@ svr4_lp64_fetch_link_map_offsets (void)
  
    return lmp;
  }
@@ -982,7 +1013,7 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
  

  
  struct target_so_ops svr4_so_ops;
-@@ -1969,4 +2311,7 @@ _initialize_svr4_solib (void)
+@@ -1985,4 +2327,7 @@ _initialize_svr4_solib (void)
    svr4_so_ops.same = svr4_same;
  
    observer_attach_inferior_exit (solib_svr4_inferior_exit);
@@ -990,10 +1021,10 @@ Index: gdb-6.8.91.20090917/gdb/solib-svr
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8.91.20090917/gdb/solib.c
+Index: gdb-6.8.91.20090925/gdb/solib.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/solib.c	2009-09-17 12:47:07.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/solib.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/solib.c	2009-09-25 10:25:38.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/solib.c	2009-09-25 10:25:45.000000000 +0200
 @@ -82,6 +82,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
@@ -1130,10 +1161,10 @@ Index: gdb-6.8.91.20090917/gdb/solib.c
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8.91.20090917/gdb/solist.h
+Index: gdb-6.8.91.20090925/gdb/solist.h
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/solist.h	2009-09-17 12:47:07.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/solist.h	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/solist.h	2009-09-25 10:25:38.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/solist.h	2009-09-25 10:25:45.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1154,10 +1185,10 @@ Index: gdb-6.8.91.20090917/gdb/solist.h
 +extern int debug_solib;
 +
  #endif
-Index: gdb-6.8.91.20090917/gdb/symfile-mem.c
+Index: gdb-6.8.91.20090925/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/symfile-mem.c	2009-09-17 12:48:49.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/symfile-mem.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/symfile-mem.c	2009-09-25 10:25:38.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/symfile-mem.c	2009-09-25 10:25:45.000000000 +0200
 @@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
  	++i;
        }
@@ -1167,10 +1198,10 @@ Index: gdb-6.8.91.20090917/gdb/symfile-m
                                     sai, OBJF_SHARED);
  
    /* This might change our ideas about frames already looked at.  */
-Index: gdb-6.8.91.20090917/gdb/symfile.c
+Index: gdb-6.8.91.20090925/gdb/symfile.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/symfile.c	2009-09-17 12:48:50.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/symfile.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/symfile.c	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/symfile.c	2009-09-25 10:25:45.000000000 +0200
 @@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
@@ -1250,7 +1281,7 @@ Index: gdb-6.8.91.20090917/gdb/symfile.c
  
    free_all_objfiles ();
  
-@@ -3369,6 +3378,8 @@ reread_symbols (void)
+@@ -3367,6 +3376,8 @@ reread_symbols (void)
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
@@ -1259,10 +1290,10 @@ Index: gdb-6.8.91.20090917/gdb/symfile.c
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-Index: gdb-6.8.91.20090917/gdb/target.h
+Index: gdb-6.8.91.20090925/gdb/target.h
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/target.h	2009-09-17 12:48:49.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/target.h	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/target.h	2009-09-25 10:25:38.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/target.h	2009-09-25 10:25:45.000000000 +0200
 @@ -545,7 +545,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
@@ -1272,10 +1303,10 @@ Index: gdb-6.8.91.20090917/gdb/target.h
  
      /* Search SEARCH_SPACE_LEN bytes beginning at START_ADDR for the
         sequence of bytes in PATTERN with length PATTERN_LEN.
-Index: gdb-6.8.91.20090917/gdb/symfile.h
+Index: gdb-6.8.91.20090925/gdb/symfile.h
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/symfile.h	2009-09-17 12:48:50.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/symfile.h	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/symfile.h	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/symfile.h	2009-09-25 10:25:45.000000000 +0200
 @@ -229,7 +229,13 @@ enum symfile_add_flags
      SYMFILE_MAINLINE = 1 << 2,
  
@@ -1291,10 +1322,10 @@ Index: gdb-6.8.91.20090917/gdb/symfile.h
    };
  
  extern void syms_from_objfile (struct objfile *,
-Index: gdb-6.8.91.20090917/gdb/infcmd.c
+Index: gdb-6.8.91.20090925/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/infcmd.c	2009-09-17 12:49:01.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/infcmd.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/infcmd.c	2009-09-25 10:25:39.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/infcmd.c	2009-09-25 10:25:45.000000000 +0200
 @@ -2308,6 +2308,9 @@ attach_command_post_wait (char *args, in
  
    post_create_inferior (&current_target, from_tty);
@@ -1305,10 +1336,10 @@ Index: gdb-6.8.91.20090917/gdb/infcmd.c
    /* Install inferior's terminal modes.  */
    target_terminal_inferior ();
  
-Index: gdb-6.8.91.20090917/gdb/linux-tdep.c
+Index: gdb-6.8.91.20090925/gdb/linux-tdep.c
 ===================================================================
---- gdb-6.8.91.20090917.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
-+++ gdb-6.8.91.20090917/gdb/linux-tdep.c	2009-09-17 12:50:07.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/linux-tdep.c	2009-09-25 10:25:45.000000000 +0200
 @@ -163,5 +163,7 @@ in this session.\n"));
  void
  _initialize_linux_tdep (void)

gdb-6.6-buildid-locate.patch:
 corelow.c                    |   63 ++++
 doc/gdb.texinfo              |   21 +
 objfiles.h                   |    4 
 solib-svr4.c                 |   46 ++-
 symfile.c                    |  637 +++++++++++++++++++++++++++++++++++++++----
 symfile.h                    |    7 
 testsuite/lib/gdb.exp        |   10 
 testsuite/lib/mi-support.exp |   10 
 8 files changed, 745 insertions(+), 53 deletions(-)

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gdb-6.6-buildid-locate.patch	10 Sep 2009 21:37:39 -0000	1.26
+++ gdb-6.6-buildid-locate.patch	25 Sep 2009 11:06:47 -0000	1.27
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090909/gdb/corelow.c
+Index: gdb-6.8.91.20090925/gdb/corelow.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/corelow.c	2009-09-09 19:09:35.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/corelow.c	2009-09-25 09:39:09.000000000 +0200
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -13,7 +13,7 @@ Index: gdb-6.8.50.20090909/gdb/corelow.c
  
  
  #ifndef O_LARGEFILE
-@@ -273,6 +277,50 @@ add_to_thread_list (bfd *abfd, asection 
+@@ -273,6 +277,52 @@ add_to_thread_list (bfd *abfd, asection 
      inferior_ptid = ptid;			 /* Yes, make it current */
  }
  
@@ -28,7 +28,7 @@ Index: gdb-6.8.50.20090909/gdb/corelow.c
 +  char *build_id_filename;
 +  struct cleanup *back_to;
 +
-+  if (exec_bfd != NULL)
++  if (exec_bfd != NULL || symfile_objfile != NULL)
 +    return;
 +
 +  if (target_auxv_search (&current_target, AT_ENTRY, &at_entry) <= 0)
@@ -52,6 +52,8 @@ Index: gdb-6.8.50.20090909/gdb/corelow.c
 +      make_cleanup (xfree, exec_filename);
 +      exec_file_attach (exec_filename, from_tty);
 +      symbol_file_add_main (exec_filename, from_tty);
++      if (symfile_objfile != NULL)
++        symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
 +    }
 +  else
 +    debug_print_missing (_("the main executable file"), build_id_filename);
@@ -64,7 +66,7 @@ Index: gdb-6.8.50.20090909/gdb/corelow.c
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -371,6 +419,12 @@ core_open (char *filename, int from_tty)
+@@ -371,6 +421,12 @@ core_open (char *filename, int from_tty)
    push_target (&core_ops);
    discard_cleanups (old_chain);
  
@@ -77,7 +79,7 @@ Index: gdb-6.8.50.20090909/gdb/corelow.c
    add_inferior_silent (corelow_pid);
  
    /* Do this before acknowledging the inferior, so if
-@@ -878,4 +932,11 @@ _initialize_corelow (void)
+@@ -878,4 +934,11 @@ _initialize_corelow (void)
    init_core_ops ();
  
    add_target (&core_ops);
@@ -89,11 +91,11 @@ Index: gdb-6.8.50.20090909/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-6.8.50.20090909/gdb/doc/gdb.texinfo
+Index: gdb-6.8.91.20090925/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/doc/gdb.texinfo	2009-09-09 19:09:31.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/doc/gdb.texinfo	2009-09-09 19:09:35.000000000 +0200
-@@ -13764,6 +13764,27 @@ information files.
+--- gdb-6.8.91.20090925.orig/gdb/doc/gdb.texinfo	2009-09-25 09:29:58.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/doc/gdb.texinfo	2009-09-25 09:29:58.000000000 +0200
+@@ -13895,6 +13895,27 @@ information files.
  
  @end table
  
@@ -121,11 +123,11 @@ Index: gdb-6.8.50.20090909/gdb/doc/gdb.t
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-Index: gdb-6.8.50.20090909/gdb/solib-svr4.c
+Index: gdb-6.8.91.20090925/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/solib-svr4.c	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/solib-svr4.c	2009-09-09 19:09:35.000000000 +0200
-@@ -1101,9 +1101,33 @@ svr4_current_sos (void)
+--- gdb-6.8.91.20090925.orig/gdb/solib-svr4.c	2009-09-25 09:29:57.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/solib-svr4.c	2009-09-25 09:43:14.000000000 +0200
+@@ -1101,9 +1101,49 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
  	    {
@@ -154,7 +156,23 @@ Index: gdb-6.8.50.20090909/gdb/solib-svr
 +		      xfree (name);
 +		    }
 +		  else
-+		    debug_print_missing (new->so_name, build_id_filename);
++		    {
++		      debug_print_missing (new->so_name, build_id_filename);
++
++		      /* In the case the main executable was found according to
++			 its build-id (from a core file) prevent loading
++			 a different build of a library with accidentally the
++			 same SO_NAME.
++
++			 It suppresses bogus backtraces (and prints "??" there
++			 instead) if the on-disk files no longer match the
++			 running program version.  */
++
++		      if (symfile_objfile != NULL
++			  && (symfile_objfile->flags
++			      & OBJF_BUILD_ID_CORE_LOADED) != 0)
++			new->so_name[0] = 0;
++		    }
 +
 +		  xfree (build_id_filename);
 +		  xfree (build_id);
@@ -162,10 +180,10 @@ Index: gdb-6.8.50.20090909/gdb/solib-svr
  	    }
  	  xfree (buffer);
  
-Index: gdb-6.8.50.20090909/gdb/symfile.c
+Index: gdb-6.8.91.20090925/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/symfile.c	2009-09-09 19:09:31.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/symfile.c	2009-09-09 19:09:55.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/symfile.c	2009-09-25 09:29:57.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/symfile.c	2009-09-25 09:29:58.000000000 +0200
 @@ -56,6 +56,7 @@
  #include "elf-bfd.h"
  #include "solib.h"
@@ -174,7 +192,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -1174,16 +1175,65 @@ symbol_file_clear (int from_tty)
+@@ -1173,16 +1174,65 @@ symbol_file_clear (int from_tty)
      printf_unfiltered (_("No symbol file now.\n"));
  }
  
@@ -242,7 +260,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  {
    struct build_id *retval;
  
-@@ -1199,6 +1249,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -1198,6 +1248,348 @@ build_id_bfd_get (bfd *abfd)
    return retval;
  }
  
@@ -591,7 +609,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value.  */
  
  static int
-@@ -1216,7 +1608,7 @@ build_id_verify (const char *filename, s
+@@ -1215,7 +1607,7 @@ build_id_verify (const char *filename, s
    if (abfd == NULL)
      return 0;
  
@@ -600,7 +618,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1235,8 +1627,9 @@ build_id_verify (const char *filename, s
+@@ -1234,8 +1626,9 @@ build_id_verify (const char *filename, s
    return retval;
  }
  
@@ -612,7 +630,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  {
    char *link, *s, *retval = NULL;
    gdb_byte *data = build_id->data;
-@@ -1244,7 +1637,9 @@ build_id_to_debug_filename (struct build
+@@ -1243,7 +1636,9 @@ build_id_to_debug_filename (struct build
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
    link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
@@ -623,7 +641,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
    s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
    if (size > 0)
      {
-@@ -1255,12 +1650,14 @@ build_id_to_debug_filename (struct build
+@@ -1254,12 +1649,14 @@ build_id_to_debug_filename (struct build
      *s++ = '/';
    while (size-- > 0)
      s += sprintf (s, "%02x", (unsigned) *data++);
@@ -640,7 +658,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1268,9 +1665,150 @@ build_id_to_debug_filename (struct build
+@@ -1267,9 +1664,150 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -791,7 +809,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1353,32 +1891,36 @@ static char *
+@@ -1352,32 +1890,36 @@ static char *
  find_separate_debug_file (struct objfile *objfile)
  {
    asection *sect;
@@ -836,7 +854,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1386,7 +1928,7 @@ find_separate_debug_file (struct objfile
+@@ -1385,7 +1927,7 @@ find_separate_debug_file (struct objfile
    if (basename == NULL)
      /* There's no separate debug info, hence there's no way we could
         load it => no warning.  */
@@ -845,7 +863,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
    dir = xstrdup (objfile->name);
  
-@@ -1408,24 +1950,19 @@ find_separate_debug_file (struct objfile
+@@ -1407,24 +1949,19 @@ find_separate_debug_file (struct objfile
    if (canon_name && strlen (canon_name) > i)
      i = strlen (canon_name);
  
@@ -877,7 +895,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
    /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
    strcpy (debugfile, dir);
-@@ -1434,12 +1971,7 @@ find_separate_debug_file (struct objfile
+@@ -1433,12 +1970,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -891,7 +909,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
-@@ -1448,12 +1980,7 @@ find_separate_debug_file (struct objfile
+@@ -1447,12 +1979,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -905,7 +923,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  
    /* If the file is in the sysroot, try using its base path in the
       global debugfile directory.  */
-@@ -1467,20 +1994,18 @@ find_separate_debug_file (struct objfile
+@@ -1466,20 +1993,18 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, basename);
  
        if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -933,7 +951,7 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
  }
  
  
-@@ -4231,4 +4756,16 @@ the global debug-file directory prepende
+@@ -4229,4 +4754,16 @@ the global debug-file directory prepende
  				     NULL,
  				     show_debug_file_directory,
  				     &setlist, &showlist);
@@ -950,10 +968,10 @@ Index: gdb-6.8.50.20090909/gdb/symfile.c
 + 
 +   observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-6.8.50.20090909/gdb/symfile.h
+Index: gdb-6.8.91.20090925/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/symfile.h	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/symfile.h	2009-09-09 19:09:35.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/symfile.h	2009-09-25 09:29:57.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/symfile.h	2009-09-25 09:29:58.000000000 +0200
 @@ -381,6 +381,13 @@ extern int symfile_map_offsets_to_segmen
  struct symfile_segment_data *get_symfile_segment_data (bfd *abfd);
  void free_symfile_segment_data (struct symfile_segment_data *data);
@@ -968,10 +986,10 @@ Index: gdb-6.8.50.20090909/gdb/symfile.h
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
-Index: gdb-6.8.50.20090909/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.91.20090925/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/lib/gdb.exp	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/lib/gdb.exp	2009-09-09 19:09:35.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/testsuite/lib/gdb.exp	2009-09-25 09:29:57.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/testsuite/lib/gdb.exp	2009-09-25 09:29:58.000000000 +0200
 @@ -1248,6 +1248,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
@@ -989,10 +1007,10 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
      return 0;
  }
  
-Index: gdb-6.8.50.20090909/gdb/testsuite/lib/mi-support.exp
+Index: gdb-6.8.91.20090925/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-6.8.50.20090909.orig/gdb/testsuite/lib/mi-support.exp	2009-09-09 19:05:56.000000000 +0200
-+++ gdb-6.8.50.20090909/gdb/testsuite/lib/mi-support.exp	2009-09-09 19:09:35.000000000 +0200
+--- gdb-6.8.91.20090925.orig/gdb/testsuite/lib/mi-support.exp	2009-09-15 20:51:26.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/testsuite/lib/mi-support.exp	2009-09-25 09:29:58.000000000 +0200
 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } {
  	    }
      	}
@@ -1010,3 +1028,18 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
  
      detect_async
  
+Index: gdb-6.8.91.20090925/gdb/objfiles.h
+===================================================================
+--- gdb-6.8.91.20090925.orig/gdb/objfiles.h	2009-09-25 09:29:57.000000000 +0200
++++ gdb-6.8.91.20090925/gdb/objfiles.h	2009-09-25 09:38:27.000000000 +0200
+@@ -428,6 +428,10 @@ struct objfile
+ 
+ #define OBJF_MAIN (1 << 7)
+ 
++/* This file was loaded according to the BUILD_ID_CORE_LOADS rules.  */
++
++#define OBJF_BUILD_ID_CORE_LOADED (1 << 12)
++
+ /* The object file that the main symbol table was loaded from (e.g. the
+    argument to the "symbol-file" or "file" command).  */
+ 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- gdb.spec	25 Sep 2009 06:49:21 -0000	1.387
+++ gdb.spec	25 Sep 2009 11:06:47 -0000	1.388
@@ -14,7 +14,7 @@ Version: 6.8.91.20090925
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 1%{?_with_upstream:.upstream}%{?dist}
+Release: 2%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -847,6 +847,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-2
+- Fix buildid-loading libs w/matching name but different build-id (BZ 524572).
+
 * Fri Sep 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-1
 - Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090925
 - archer-jankratochvil-fedora12 commit: 4338ea85c798007c32594032f602db9fd230eba9



From sergiopr at fedoraproject.org  Fri Sep 25 11:08:43 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Fri, 25 Sep 2009 11:08:43 +0000 (UTC)
Subject: rpms/pyfits/devel .cvsignore, 1.3, 1.4 pyfits.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20090925110843.2592511C00E8@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/pyfits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17049

Modified Files:
	.cvsignore pyfits.spec sources 
Log Message:
* Fri Sep 25 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyfits/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 May 2009 10:30:51 -0000	1.3
+++ .cvsignore	25 Sep 2009 11:08:42 -0000	1.4
@@ -1 +1 @@
-pyfits-2.1.1.tar.gz
+pyfits-2.2.tar.gz


Index: pyfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyfits/devel/pyfits.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pyfits.spec	26 Jul 2009 19:48:35 -0000	1.7
+++ pyfits.spec	25 Sep 2009 11:08:42 -0000	1.8
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: pyfits
-Version: 2.1.1
-Release: 3%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 Summary: Python interface to FITS
 
 Group: Development/Languages
@@ -42,6 +42,9 @@ rm -fr %{buildroot}
 %{python_sitearch}/*
 
 %changelog
+* Fri Sep 25 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
+- New upstream source
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyfits/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 May 2009 10:30:51 -0000	1.3
+++ sources	25 Sep 2009 11:08:42 -0000	1.4
@@ -1 +1 @@
-8e73d920e8258849104b724bd3dd1388  pyfits-2.1.1.tar.gz
+00d3f40775c3bcc9a74605095b0933dc  pyfits-2.2.tar.gz



From than at fedoraproject.org  Fri Sep 25 11:16:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 25 Sep 2009 11:16:16 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.295,1.296
Message-ID: <20090925111616.9706211C00E8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19276

Modified Files:
	kdebase-workspace.spec 
Log Message:
don't include googlegadgets on RHEL




Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- kdebase-workspace.spec	24 Sep 2009 12:20:06 -0000	1.295
+++ kdebase-workspace.spec	25 Sep 2009 11:16:14 -0000	1.296
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -63,7 +63,10 @@ BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
 BuildRequires: desktop-file-utils
+%if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
+BuildRequires: qedje-devel >= 0.4.0
+%endif
 BuildRequires: glib2-devel
 BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -84,9 +87,6 @@ BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-%if 0%{?fedora}
-BuildRequires: qedje-devel >= 0.4.0
-%endif
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
@@ -478,12 +478,14 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasmaengineexplorer.1*
+%if 0%{?fedora}
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
 %exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
 %exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 #?akonadi
@@ -558,6 +560,7 @@ fi
 %{_kde4_iconsdir}/Oxygen_Zion/
 %{_kde4_iconsdir}/Oxygen_Zion_Big/
 
+%if 0%{?fedora}
 %files googlegadgets
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -565,6 +568,7 @@ fi
 %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
 
 %if 0%{?with_polkit_09}
 %files -n PolicyKit-kde
@@ -596,6 +600,9 @@ fi
 
 
 %changelog
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- don't include googlegadgets on RHEL
+
 * Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
 - rhel cleanup
 



From lonetwin at fedoraproject.org  Fri Sep 25 11:29:02 2009
From: lonetwin at fedoraproject.org (Steven Fernandez)
Date: Fri, 25 Sep 2009 11:29:02 +0000 (UTC)
Subject: rpms/python-sysv_ipc/devel import.log, 1.1, 1.2 python-sysv_ipc.spec,
	1.1, 1.2
Message-ID: <20090925112902.23EAE11C00E8@cvs1.fedora.phx.redhat.com>

Author: lonetwin

Update of /cvs/pkgs/rpms/python-sysv_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23180/devel

Modified Files:
	import.log python-sysv_ipc.spec 
Log Message:
- Spec file fix. Use correct python version for egg-info file



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 08:35:38 -0000	1.1
+++ import.log	25 Sep 2009 11:29:01 -0000	1.2
@@ -1 +1,2 @@
 python-sysv_ipc-0_4_2-1_fc11:HEAD:python-sysv_ipc-0.4.2-1.fc11.src.rpm:1253867503
+python-sysv_ipc-0_4_2-2_fc11:HEAD:python-sysv_ipc-0.4.2-2.fc11.src.rpm:1253878089


Index: python-sysv_ipc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/devel/python-sysv_ipc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-sysv_ipc.spec	25 Sep 2009 08:35:39 -0000	1.1
+++ python-sysv_ipc.spec	25 Sep 2009 11:29:01 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           python-%{oname}
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        System V IPC for Python - Semaphores, Shared Memory and Message Queues
 Group:          Development/Libraries
 License:        GPLv3+
@@ -48,12 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc INSTALL LICENSE README ReadMe.html VERSION
 %{python_sitearch}/%{oname}.so
-%{python_sitearch}/%{oname}-%{version}-py2.6.egg-info
+%{python_sitearch}/%{oname}-%{version}-py2.[56].egg-info
 
 %files examples
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-examples-%{version}/
 
 %changelog
+* Fri Sep 25 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-2
+- Spec file fix. Use correct python version for egg-info file
+
 * Sat Aug 29 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-1
-- First build
+- Initial build



From lonetwin at fedoraproject.org  Fri Sep 25 11:30:39 2009
From: lonetwin at fedoraproject.org (Steven Fernandez)
Date: Fri, 25 Sep 2009 11:30:39 +0000 (UTC)
Subject: rpms/python-sysv_ipc/F-10 import.log, 1.1, 1.2 python-sysv_ipc.spec,
	1.1, 1.2
Message-ID: <20090925113039.A3CD611C02BB@cvs1.fedora.phx.redhat.com>

Author: lonetwin

Update of /cvs/pkgs/rpms/python-sysv_ipc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23795/F-10

Modified Files:
	import.log python-sysv_ipc.spec 
Log Message:
- Spec file fix. Use correct python version for egg-info file



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 08:58:16 -0000	1.1
+++ import.log	25 Sep 2009 11:30:39 -0000	1.2
@@ -1 +1,2 @@
 python-sysv_ipc-0_4_2-1_fc11:F-10:python-sysv_ipc-0.4.2-1.fc11.src.rpm:1253868975
+python-sysv_ipc-0_4_2-2_fc11:F-10:python-sysv_ipc-0.4.2-2.fc11.src.rpm:1253878198


Index: python-sysv_ipc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-10/python-sysv_ipc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-sysv_ipc.spec	25 Sep 2009 08:58:17 -0000	1.1
+++ python-sysv_ipc.spec	25 Sep 2009 11:30:39 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           python-%{oname}
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        System V IPC for Python - Semaphores, Shared Memory and Message Queues
 Group:          Development/Libraries
 License:        GPLv3+
@@ -48,12 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc INSTALL LICENSE README ReadMe.html VERSION
 %{python_sitearch}/%{oname}.so
-%{python_sitearch}/%{oname}-%{version}-py2.6.egg-info
+%{python_sitearch}/%{oname}-%{version}-py2.[56].egg-info
 
 %files examples
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-examples-%{version}/
 
 %changelog
+* Fri Sep 25 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-2
+- Spec file fix. Use correct python version for egg-info file
+
 * Sat Aug 29 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-1
-- First build
+- Initial build



From lonetwin at fedoraproject.org  Fri Sep 25 11:31:52 2009
From: lonetwin at fedoraproject.org (Steven Fernandez)
Date: Fri, 25 Sep 2009 11:31:52 +0000 (UTC)
Subject: rpms/python-sysv_ipc/F-11 import.log, 1.1, 1.2 python-sysv_ipc.spec,
	1.1, 1.2
Message-ID: <20090925113152.387D311C00E8@cvs1.fedora.phx.redhat.com>

Author: lonetwin

Update of /cvs/pkgs/rpms/python-sysv_ipc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24273/F-11

Modified Files:
	import.log python-sysv_ipc.spec 
Log Message:
- Spec file fix. Use correct python version for egg-info file



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 08:54:13 -0000	1.1
+++ import.log	25 Sep 2009 11:31:51 -0000	1.2
@@ -1 +1,2 @@
 python-sysv_ipc-0_4_2-1_fc11:F-11:python-sysv_ipc-0.4.2-1.fc11.src.rpm:1253868802
+python-sysv_ipc-0_4_2-2_fc11:F-11:python-sysv_ipc-0.4.2-2.fc11.src.rpm:1253878266


Index: python-sysv_ipc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sysv_ipc/F-11/python-sysv_ipc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-sysv_ipc.spec	25 Sep 2009 08:54:14 -0000	1.1
+++ python-sysv_ipc.spec	25 Sep 2009 11:31:52 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           python-%{oname}
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        System V IPC for Python - Semaphores, Shared Memory and Message Queues
 Group:          Development/Libraries
 License:        GPLv3+
@@ -48,12 +48,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc INSTALL LICENSE README ReadMe.html VERSION
 %{python_sitearch}/%{oname}.so
-%{python_sitearch}/%{oname}-%{version}-py2.6.egg-info
+%{python_sitearch}/%{oname}-%{version}-py2.[56].egg-info
 
 %files examples
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-examples-%{version}/
 
 %changelog
+* Fri Sep 25 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-2
+- Spec file fix. Use correct python version for egg-info file
+
 * Sat Aug 29 2009 Steven Fernandez <lonetwin at fedoraproject.org> - 0.4.2-1
-- First build
+- Initial build



From pravins at fedoraproject.org  Fri Sep 25 11:46:51 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:46:51 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts/devel lohit-hindi-fonts.spec,1.1,1.2
Message-ID: <20090925114651.6DC1411C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-hindi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29034

Modified Files:
	lohit-hindi-fonts.spec 
Log Message:
* Fri Sep 23 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs




Index: lohit-hindi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-hindi-fonts/devel/lohit-hindi-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-hindi-fonts.spec	11 Sep 2009 10:06:35 -0000	1.1
+++ lohit-hindi-fonts.spec	25 Sep 2009 11:46:51 -0000	1.2
@@ -3,19 +3,18 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Hindi font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
+Source0:        http://pravins.fedorapeople.org/lohit/hindi/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -53,6 +52,9 @@ rm -fr %{buildroot}
 %doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball
 



From pravins at fedoraproject.org  Fri Sep 25 11:49:53 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:49:53 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts/devel lohit-assamese-fonts.spec,1.1,1.2
Message-ID: <20090925114953.7E85F11C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-assamese-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30285

Modified Files:
	lohit-assamese-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs



Index: lohit-assamese-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-assamese-fonts/devel/lohit-assamese-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-assamese-fonts.spec	11 Sep 2009 09:13:50 -0000	1.1
+++ lohit-assamese-fonts.spec	25 Sep 2009 11:49:53 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Assamese font
 
 Group:          User Interface/X
@@ -17,7 +17,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -56,5 +55,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+
 * Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 11:52:08 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:52:08 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts/devel lohit-bengali-fonts.spec,1.1,1.2
Message-ID: <20090925115208.1554B11C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-bengali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31056

Modified Files:
	lohit-bengali-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-bengali-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-bengali-fonts/devel/lohit-bengali-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-bengali-fonts.spec	11 Sep 2009 09:21:05 -0000	1.1
+++ lohit-bengali-fonts.spec	25 Sep 2009 11:52:07 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Bengali font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball
 



From pravins at fedoraproject.org  Fri Sep 25 11:54:41 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:54:41 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/devel lohit-gujarati-fonts.spec,1.1,1.2
Message-ID: <20090925115441.B931111C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32138

Modified Files:
	lohit-gujarati-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-gujarati-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/lohit-gujarati-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-gujarati-fonts.spec	11 Sep 2009 10:04:36 -0000	1.1
+++ lohit-gujarati-fonts.spec	25 Sep 2009 11:54:41 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Gujarati font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball
 



From pravins at fedoraproject.org  Fri Sep 25 11:56:34 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:56:34 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts/devel lohit-kannada-fonts.spec,1.2,1.3
Message-ID: <20090925115634.71D7111C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kannada-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv318

Modified Files:
	lohit-kannada-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
- updated specs
	



Index: lohit-kannada-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/lohit-kannada-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-kannada-fonts.spec	21 Sep 2009 12:03:45 -0000	1.2
+++ lohit-kannada-fonts.spec	25 Sep 2009 11:56:34 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Kannada font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
+- updated specs
+
 * Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
 - upstream release of 2.4.4
 - updated url for upstream tarball



From nbecker at fedoraproject.org  Fri Sep 25 11:57:13 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri, 25 Sep 2009 11:57:13 +0000 (UTC)
Subject: rpms/Cython/devel .cvsignore, 1.10, 1.11 Cython.spec, 1.15,
	1.16 sources, 1.10, 1.11
Message-ID: <20090925115713.F05FC11C00E8@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv639

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
Test update to 0.11.3rc0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 May 2009 01:07:17 -0000	1.10
+++ .cvsignore	25 Sep 2009 11:57:13 -0000	1.11
@@ -1 +1 @@
-Cython-0.11.2.tar.gz
+Cython-0.11.3.rc0.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/Cython.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- Cython.spec	24 Jul 2009 15:06:09 -0000	1.15
+++ Cython.spec	25 Sep 2009 11:57:13 -0000	1.16
@@ -3,14 +3,16 @@
 
 
 Name:		Cython
-Version:	0.11.2
-Release:	2%{?dist}
+Version:	0.11.3
+Release:	1.rc0%{?dist}
 Summary:	A language for writing Python extension modules
 
+%define upstreamversion %{version}.rc0
+
 Group:		Development/Tools
 License:	Python
 URL:		http://www.cython.org
-Source0:	http://www.cython.org/Cython-%{version}.tar.gz
+Source0:	http://www.cython.org/Cython-%{upstreamversion}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel python-setuptools
@@ -29,7 +31,7 @@ For more info, see:
 
 
 %prep
-%setup -q -n Cython-%{version}
+%setup -q -n %{name}-%{upstreamversion}
 
 
 %build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 May 2009 01:07:17 -0000	1.10
+++ sources	25 Sep 2009 11:57:13 -0000	1.11
@@ -1 +1 @@
-31a79d5c7365e1d18ff7be48d6c1026b  Cython-0.11.2.tar.gz
+f76c812a6ced636262bc341ac6b2dc33  Cython-0.11.3.rc0.tar.gz



From pravins at fedoraproject.org  Fri Sep 25 11:58:02 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:58:02 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts/devel lohit-kashmiri-fonts.spec,1.1,1.2
Message-ID: <20090925115802.D17C211C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1379

Modified Files:
	lohit-kashmiri-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-kashmiri-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel/lohit-kashmiri-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-kashmiri-fonts.spec	11 Sep 2009 10:13:56 -0000	1.1
+++ lohit-kashmiri-fonts.spec	25 Sep 2009 11:58:02 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Kashmiri Devanagari Script Font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,5 +53,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 11:59:47 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 11:59:47 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts/devel lohit-konkani-fonts.spec,1.1,1.2
Message-ID: <20090925115948.0149611C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-konkani-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2651

Modified Files:
	lohit-konkani-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs




Index: lohit-konkani-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-konkani-fonts/devel/lohit-konkani-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-konkani-fonts.spec	11 Sep 2009 10:21:08 -0000	1.1
+++ lohit-konkani-fonts.spec	25 Sep 2009 11:59:47 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Konkani Font
 
 Group:          User Interface/X
@@ -16,7 +16,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -55,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball
 



From sharkcz at fedoraproject.org  Fri Sep 25 12:01:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 25 Sep 2009 12:01:06 +0000 (UTC)
Subject: rpms/s390utils/F-11 lib-zfcp-hbaapi-2.0-sgutils.patch, NONE,
	1.1 s390utils.spec, 1.7, 1.8
Message-ID: <20090925120106.2F91E11C00E8@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3193

Modified Files:
	s390utils.spec 
Added Files:
	lib-zfcp-hbaapi-2.0-sgutils.patch 
Log Message:
* Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
- fix issues in lib-zfcp-hbaapi with a patch


lib-zfcp-hbaapi-2.0-sgutils.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 vlib_sg.c   |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE lib-zfcp-hbaapi-2.0-sgutils.patch ---
diff -Nrup lib-zfcp-hbaapi-2.0.orig/Makefile.am lib-zfcp-hbaapi-2.0/Makefile.am
--- lib-zfcp-hbaapi-2.0.orig/Makefile.am	2008-11-21 15:08:13.000000000 +0100
+++ lib-zfcp-hbaapi-2.0/Makefile.am	2009-09-25 12:30:07.000000000 +0200
@@ -60,7 +60,7 @@ lib_LTLIBRARIES		= libzfcphbaapi.la
 
 libzfcphbaapi_la_SOURCES = vlib.c vlib_callbacks.c vlib_aux.c vlib_sysfs.c \
 				vlib_sg.c
-libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils
+libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils2
 libzfcphbaapi_la_LDFLAGS = \
 	-version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
 	-lpthread -Wl,-init,_initvlib,-fini,_finivlib \
diff -Nrup lib-zfcp-hbaapi-2.0.orig/Makefile.in lib-zfcp-hbaapi-2.0/Makefile.in
--- lib-zfcp-hbaapi-2.0.orig/Makefile.in	2008-11-21 15:08:18.000000000 +0100
+++ lib-zfcp-hbaapi-2.0/Makefile.in	2009-09-25 13:22:04.000000000 +0200
@@ -248,7 +248,7 @@ lib_LTLIBRARIES = libzfcphbaapi.la
 libzfcphbaapi_la_SOURCES = vlib.c vlib_callbacks.c vlib_aux.c vlib_sysfs.c \
 				vlib_sg.c
 
-libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils
+libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils2
 libzfcphbaapi_la_LDFLAGS = \
 	-version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
 	-lpthread -Wl,-init,_initvlib,-fini,_finivlib \
diff -Nrup lib-zfcp-hbaapi-2.0.orig/vlib_sg.c lib-zfcp-hbaapi-2.0/vlib_sg.c
--- lib-zfcp-hbaapi-2.0.orig/vlib_sg.c	2008-11-20 10:23:34.000000000 +0100
+++ lib-zfcp-hbaapi-2.0/vlib_sg.c	2009-09-25 13:21:52.000000000 +0200
@@ -19,6 +19,8 @@
  * @brief All calls that use sg_utils library.
  */
 
+#include <scsi/sg_lib.h>
+#include <scsi/sg_cmds.h>
 #include "vlib.h"
 
 #define INTERVAL	10000000


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- s390utils.spec	24 Sep 2009 14:32:03 -0000	1.7
+++ s390utils.spec	25 Sep 2009 12:01:05 -0000	1.8
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,8 @@ Patch101:       cmsfs-1.1.8-kernel26.pat
 
 Patch200:       src_vipa-2.0.4-locations.patch
 
+Patch300:       lib-zfcp-hbaapi-2.0-sgutils.patch
+
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
@@ -145,6 +147,14 @@ pushd src_vipa-%{vipaver}
 %patch200 -p1 -b .locations
 popd
 
+#
+# lib-zfcp-hbaapi
+#
+pushd lib-zfcp-hbaapi-%{hbaapiver}
+# fix for newer sg3_utils and missing function declarations
+%patch300 -p1 -b .sgutils
+popd
+
 # remove --strip from install
 find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
 
@@ -162,8 +172,6 @@ popd
 pushd lib-zfcp-hbaapi-%{hbaapiver}
 # lib-zfcp-hbaapi: fix perms
 chmod a-x *.h AUTHORS README ChangeLog LICENSE
-# update sg3_utils library name
-sed -i 's/-lsgutils/-lsgutils2/g' Makefile.in
 popd
 
 
@@ -768,6 +776,9 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
+- fix issues in lib-zfcp-hbaapi with a patch
+
 * Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-5
 - drop support for Fedora < 10
 



From pravins at fedoraproject.org  Fri Sep 25 12:02:01 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:02:01 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts/devel lohit-maithili-fonts.spec,1.1,1.2
Message-ID: <20090925120201.AC41711C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-maithili-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3486

Modified Files:
	lohit-maithili-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-maithili-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-maithili-fonts/devel/lohit-maithili-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-maithili-fonts.spec	11 Sep 2009 10:40:25 -0000	1.1
+++ lohit-maithili-fonts.spec	25 Sep 2009 12:02:01 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Maithili font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,5 +53,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 12:03:45 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:03:45 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel lohit-malayalam-fonts.spec, 1.2,
	1.3
Message-ID: <20090925120345.B2EAF11C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4857

Modified Files:
	lohit-malayalam-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
- updated specs
	



Index: lohit-malayalam-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/lohit-malayalam-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-malayalam-fonts.spec	21 Sep 2009 12:07:13 -0000	1.2
+++ lohit-malayalam-fonts.spec	25 Sep 2009 12:03:45 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Malayalam font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
+- updated specs
+
 * Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
 - upstream release of 2.4.4
 - updated url for upstream tarball



From pravins at fedoraproject.org  Fri Sep 25 12:05:19 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:05:19 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts/devel lohit-marathi-fonts.spec,1.1,1.2
Message-ID: <20090925120519.A623611C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-marathi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5755

Modified Files:
	lohit-marathi-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-marathi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-marathi-fonts/devel/lohit-marathi-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-marathi-fonts.spec	11 Sep 2009 10:44:09 -0000	1.1
+++ lohit-marathi-fonts.spec	25 Sep 2009 12:05:19 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Marathi font
 
 Group:          User Interface/X
@@ -17,7 +17,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -55,6 +54,9 @@ rm -fr %{buildroot}
 %doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball
 



From pravins at fedoraproject.org  Fri Sep 25 12:07:01 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:07:01 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts/devel lohit-nepali-fonts.spec,1.1,1.2
Message-ID: <20090925120701.09BF811C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-nepali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6253

Modified Files:
	lohit-nepali-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-nepali-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-nepali-fonts/devel/lohit-nepali-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-nepali-fonts.spec	11 Sep 2009 10:44:25 -0000	1.1
+++ lohit-nepali-fonts.spec	25 Sep 2009 12:07:00 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Nepali font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,5 +53,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 12:09:20 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:09:20 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts/devel lohit-oriya-fonts.spec,1.1,1.2
Message-ID: <20090925120920.CB35411C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-oriya-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7758

Modified Files:
	lohit-oriya-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-oriya-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-oriya-fonts/devel/lohit-oriya-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-oriya-fonts.spec	11 Sep 2009 10:47:25 -0000	1.1
+++ lohit-oriya-fonts.spec	25 Sep 2009 12:09:19 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Oriya Font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,5 +53,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 12:11:02 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:11:02 +0000 (UTC)
Subject: rpms/lohit-punjabi-fonts/devel lohit-punjabi-fonts.spec,1.1,1.2
Message-ID: <20090925121102.CEB2D11C0423@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-punjabi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8991

Modified Files:
	lohit-punjabi-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-punjabi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-punjabi-fonts/devel/lohit-punjabi-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-punjabi-fonts.spec	11 Sep 2009 10:48:11 -0000	1.1
+++ lohit-punjabi-fonts.spec	25 Sep 2009 12:11:02 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Punjabi font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,5 +53,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 12:13:15 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:13:15 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts/devel lohit-sindhi-fonts.spec,1.1,1.2
Message-ID: <20090925121315.846B011C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10679

Modified Files:
	lohit-sindhi-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-sindhi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-sindhi-fonts/devel/lohit-sindhi-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lohit-sindhi-fonts.spec	11 Sep 2009 10:54:11 -0000	1.1
+++ lohit-sindhi-fonts.spec	25 Sep 2009 12:13:14 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Sindhi font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,5 +53,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+- updated specs
+	
 * Fri Sep 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1
 - first release after lohit-fonts split in new tarball



From pravins at fedoraproject.org  Fri Sep 25 12:14:48 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:14:48 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel lohit-tamil-fonts.spec,1.2,1.3
Message-ID: <20090925121448.04A7C11C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11581

Modified Files:
	lohit-tamil-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
- updated specs
	



Index: lohit-tamil-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/lohit-tamil-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-tamil-fonts.spec	21 Sep 2009 12:13:20 -0000	1.2
+++ lohit-tamil-fonts.spec	25 Sep 2009 12:14:47 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Tamil font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
+- updated specs
+
 * Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
 - upstream release of 2.4.4
 - updated url for upstream tarball



From pravins at fedoraproject.org  Fri Sep 25 12:19:18 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:19:18 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel lohit-telugu-fonts.spec,1.2,1.3
Message-ID: <20090925121918.4030A11C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13737

Modified Files:
	lohit-telugu-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
- updated specs
	



Index: lohit-telugu-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/lohit-telugu-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-telugu-fonts.spec	21 Sep 2009 12:13:14 -0000	1.2
+++ lohit-telugu-fonts.spec	25 Sep 2009 12:19:10 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Telugu font
 
 Group:          User Interface/X
@@ -15,7 +15,6 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Obsoletes: %{fontname}-fonts < %{version}-%{release}
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -54,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
+- updated specs
+
 * Mon Sep 21 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
 - upstream release of 2.4.4
 - updated url for upstream tarball



From pravins at fedoraproject.org  Fri Sep 25 12:21:13 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 25 Sep 2009 12:21:13 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts/devel lohit-bengali-fonts.spec,1.2,1.3
Message-ID: <20090925122113.D37BC11C00E8@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-bengali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15274

Modified Files:
	lohit-bengali-fonts.spec 
Log Message:
* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- updated specs
	



Index: lohit-bengali-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-bengali-fonts/devel/lohit-bengali-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-bengali-fonts.spec	25 Sep 2009 11:52:07 -0000	1.2
+++ lohit-bengali-fonts.spec	25 Sep 2009 12:21:13 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Bengali font
 
 Group:          User Interface/X
@@ -53,7 +53,7 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
+* Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
 - updated specs
 	
 * Wed Sep 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-1



From sharkcz at fedoraproject.org  Fri Sep 25 12:24:55 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 25 Sep 2009 12:24:55 +0000 (UTC)
Subject: rpms/s390utils/devel lib-zfcp-hbaapi-2.0-sgutils.patch, NONE,
	1.1 s390utils.spec, 1.6, 1.7
Message-ID: <20090925122455.66C5811C00E8@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16543

Modified Files:
	s390utils.spec 
Added Files:
	lib-zfcp-hbaapi-2.0-sgutils.patch 
Log Message:
* Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
- fix issues in lib-zfcp-hbaapi with a patch


lib-zfcp-hbaapi-2.0-sgutils.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 vlib_sg.c   |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE lib-zfcp-hbaapi-2.0-sgutils.patch ---
diff -Nrup lib-zfcp-hbaapi-2.0.orig/Makefile.am lib-zfcp-hbaapi-2.0/Makefile.am
--- lib-zfcp-hbaapi-2.0.orig/Makefile.am	2008-11-21 15:08:13.000000000 +0100
+++ lib-zfcp-hbaapi-2.0/Makefile.am	2009-09-25 12:30:07.000000000 +0200
@@ -60,7 +60,7 @@ lib_LTLIBRARIES		= libzfcphbaapi.la
 
 libzfcphbaapi_la_SOURCES = vlib.c vlib_callbacks.c vlib_aux.c vlib_sysfs.c \
 				vlib_sg.c
-libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils
+libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils2
 libzfcphbaapi_la_LDFLAGS = \
 	-version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
 	-lpthread -Wl,-init,_initvlib,-fini,_finivlib \
diff -Nrup lib-zfcp-hbaapi-2.0.orig/Makefile.in lib-zfcp-hbaapi-2.0/Makefile.in
--- lib-zfcp-hbaapi-2.0.orig/Makefile.in	2008-11-21 15:08:18.000000000 +0100
+++ lib-zfcp-hbaapi-2.0/Makefile.in	2009-09-25 13:22:04.000000000 +0200
@@ -248,7 +248,7 @@ lib_LTLIBRARIES = libzfcphbaapi.la
 libzfcphbaapi_la_SOURCES = vlib.c vlib_callbacks.c vlib_aux.c vlib_sysfs.c \
 				vlib_sg.c
 
-libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils
+libzfcphbaapi_la_LIBADD = -lsysfs -lsgutils2
 libzfcphbaapi_la_LDFLAGS = \
 	-version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
 	-lpthread -Wl,-init,_initvlib,-fini,_finivlib \
diff -Nrup lib-zfcp-hbaapi-2.0.orig/vlib_sg.c lib-zfcp-hbaapi-2.0/vlib_sg.c
--- lib-zfcp-hbaapi-2.0.orig/vlib_sg.c	2008-11-20 10:23:34.000000000 +0100
+++ lib-zfcp-hbaapi-2.0/vlib_sg.c	2009-09-25 13:21:52.000000000 +0200
@@ -19,6 +19,8 @@
  * @brief All calls that use sg_utils library.
  */
 
+#include <scsi/sg_lib.h>
+#include <scsi/sg_cmds.h>
 #include "vlib.h"
 
 #define INTERVAL	10000000


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- s390utils.spec	24 Sep 2009 14:33:01 -0000	1.6
+++ s390utils.spec	25 Sep 2009 12:24:55 -0000	1.7
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,8 @@ Patch101:       cmsfs-1.1.8-kernel26.pat
 
 Patch200:       src_vipa-2.0.4-locations.patch
 
+Patch300:       lib-zfcp-hbaapi-2.0-sgutils.patch
+
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
@@ -145,6 +147,14 @@ pushd src_vipa-%{vipaver}
 %patch200 -p1 -b .locations
 popd
 
+#
+# lib-zfcp-hbaapi
+#
+pushd lib-zfcp-hbaapi-%{hbaapiver}
+# fix for newer sg3_utils and missing function declarations
+%patch300 -p1 -b .sgutils
+popd
+
 # remove --strip from install
 find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
 
@@ -162,8 +172,6 @@ popd
 pushd lib-zfcp-hbaapi-%{hbaapiver}
 # lib-zfcp-hbaapi: fix perms
 chmod a-x *.h AUTHORS README ChangeLog LICENSE
-# update sg3_utils library name
-sed -i 's/-lsgutils/-lsgutils2/g' Makefile.in
 popd
 
 
@@ -768,6 +776,9 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
+- fix issues in lib-zfcp-hbaapi with a patch
+
 * Thu Sep 24 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-5
 - drop support for Fedora < 10
 



From mlichvar at fedoraproject.org  Fri Sep 25 12:35:37 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 25 Sep 2009 12:35:37 +0000 (UTC)
Subject: rpms/screen/devel screen-4.0.3-resize.patch, NONE,
	1.1 screen-4.0.3-screenrc.patch, NONE, 1.1 screen.spec, 1.51,
	1.52 screen-4.0.2-screenrc.patch, 1.3, NONE
Message-ID: <20090925123537.09B8B11C00E8@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/screen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20325

Modified Files:
	screen.spec 
Added Files:
	screen-4.0.3-resize.patch screen-4.0.3-screenrc.patch 
Removed Files:
	screen-4.0.2-screenrc.patch 
Log Message:
- fix crash when resizing (#515055)
- try to improve default config (#523647, #506256, #492729)
- suppress install-info errors (#515999)


screen-4.0.3-resize.patch:
 b/src/resize.c |   60 +++++++++++++++++++++------------------------------------
 src/resize.c   |    2 -
 2 files changed, 24 insertions(+), 38 deletions(-)

--- NEW FILE screen-4.0.3-resize.patch ---
commit 45d0c395945d2ae0f99748d030a8bffcb4cb46f9
Author: Sadrul Habib Chowdhury <sadrul at users.sourceforge.net>
Date:   Wed Sep 23 16:22:06 2009 -0400

    Fix a crash when resizing.
    
    The alternate screen has to be reset after a resize. Thanks to
    Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> for pointing
    this out. Closes savannah bug #26742.

diff --git a/src/resize.c b/src/resize.c
index 0bf5f3d..5477bb7 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -497,6 +497,7 @@ CheckMaxSize(wi)
 int wi;
 {
   unsigned char *oldnull = null;
+  unsigned char *oldblank = blank;
   struct win *p;
   int i;
   struct mline *ml;
@@ -542,49 +543,34 @@ int wi;
 # endif
 #endif
 
+#define RESET_AFC(x, bl) do { if (x == old##bl) x = bl; } while (0)
+
+#define RESET_LINES(lines, count) \
+  do { \
+    ml = lines; \
+    for (i = 0; i < count; i++, ml++) \
+      { \
+	RESET_AFC(ml->image, blank); \
+	RESET_AFC(ml->attr, null); \
+	IFFONT(RESET_AFC(ml->font, null)); \
+	IFCOLOR(RESET_AFC(ml->color, null)); \
+	IFCOLORX(RESET_AFC(ml->colorx, null)); \
+      } \
+  } while (0)
+
   /* We have to run through all windows to substitute
-   * the null references.
+   * the null and blank references.
    */
   for (p = windows; p; p = p->w_next)
     {
-      ml = p->w_mlines;
-      for (i = 0; i < p->w_height; i++, ml++)
-	{
-	  if (ml->attr == oldnull)
-	    ml->attr = null;
-#ifdef FONT
-	  if (ml->font == oldnull)
-	    ml->font = null;
-#endif
-#ifdef COLOR
-	  if (ml->color == oldnull)
-	    ml->color= null;
-#ifdef COLORS256
-	  if (ml->colorx == oldnull)
-	    ml->colorx = null;
-#endif
-#endif
-	}
+      RESET_LINES(p->w_mlines, p->w_height);
+
 #ifdef COPY_PASTE
-      ml = p->w_hlines;
-      for (i = 0; i < p->w_histheight; i++, ml++)
-	{
-	  if (ml->attr == oldnull)
-	    ml->attr = null;
-# ifdef FONT
-	  if (ml->font == oldnull)
-	    ml->font = null;
-# endif
-# ifdef COLOR
-	  if (ml->color == oldnull)
-	    ml->color= null;
-#  ifdef COLORS256
-	  if (ml->colorx == oldnull)
-	    ml->colorx = null;
-#  endif
-# endif
-	}
+      RESET_LINES(p->w_hlines, p->w_histheight);
+      RESET_LINES(p->w_alt_hlines, p->w_alt_histheight);
 #endif
+
+      RESET_LINES(p->w_alt_mlines, p->w_alt_height);
     }
 }
 
commit 7cb17d54cc8fca88e17d6d1e7be2fd49daef1b9d
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Wed Sep 23 16:24:21 2009 -0400

    Typo fix.
    
    Fixing this typo fixes this crash:
    https://bugzilla.redhat.com/show_bug.cgi?id=515055

diff --git a/src/resize.c b/src/resize.c
index 5477bb7..9c7b70f 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -517,7 +517,7 @@ int wi;
 #ifdef COLOR
   mline_old.color = (unsigned char *)xrealloc((char *)mline_old.color, maxwidth);
 # ifdef COLORS256
-  mline_old.colorx = (unsigned char *)xrealloc((char *)mline_old.color, maxwidth);
+  mline_old.colorx = (unsigned char *)xrealloc((char *)mline_old.colorx, maxwidth);
 # endif
 #endif
   if (!(blank && null && mline_old.image && mline_old.attr IFFONT(&& mline_old.font) IFCOLOR(&& mline_old.color) IFCOLORX(&& mline_old.colorx)))

screen-4.0.3-screenrc.patch:
 etcscreenrc |    8 ++++----
 screenrc    |   59 ++++++++++++++---------------------------------------------
 2 files changed, 18 insertions(+), 49 deletions(-)

--- NEW FILE screen-4.0.3-screenrc.patch ---
diff -up screen-4.0.3/etc/etcscreenrc.screenrc screen-4.0.3/etc/etcscreenrc
--- screen-4.0.3/etc/etcscreenrc.screenrc	2003-12-05 14:46:13.000000000 +0100
+++ screen-4.0.3/etc/etcscreenrc	2009-09-25 14:20:31.000000000 +0200
@@ -55,15 +55,15 @@ terminfo sun 'up=^K:AL=\E[%p1%dL:DL=\E[%
 #xterm understands both im/ic and doesn't have a status line.
 #Note: Do not specify im and ic in the real termcap/info file as
 #some programs (e.g. vi) will (no,no, may (jw)) not work anymore.
-termcap  xterm|fptwist hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
-terminfo xterm|fptwist hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
+#termcap  xterm|fptwist hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
+#terminfo xterm|fptwist hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
 
 # Long time I had this in my private screenrc file. But many people
 # seem to want it (jw):
 # we do not want the width to change to 80 characters on startup:
 # on suns, /etc/termcap has :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l:
-termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
-terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
+#termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
+#terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
 
 #
 # Do not use xterms alternate window buffer. 
diff -up screen-4.0.3/etc/screenrc.screenrc screen-4.0.3/etc/screenrc
--- screen-4.0.3/etc/screenrc.screenrc	2006-10-23 15:06:32.000000000 +0200
+++ screen-4.0.3/etc/screenrc	2009-09-25 14:31:30.000000000 +0200
@@ -1,21 +1,11 @@
-#
-# Example of a user's .screenrc file
-#
-
 # This is how one can set a reattach password:
 # password ODSJQf.4IJN7E    # "1234"
 
-# no annoying audible bell, please
-vbell on
-
-# detach on hangup
-autodetach on
-
 # don't display the copyright page
 startup_message off
 
 # emulate .logout message
-pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended."
+pow_detach_msg "Screen session of $LOGNAME $:cr:$:nl:ended."
 
 # advertise hardstatus support to $TERMCAP
 # termcapinfo  * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\'
@@ -40,18 +30,12 @@ defscrollback 1000
 
 ################
 #
-# xterm tweaks
+# more xterm tweaks
 #
 
-#xterm understands both im/ic and doesn't have a status line.
-#Note: Do not specify im and ic in the real termcap/info file as
-#some programs (e.g. vi) will not work anymore.
-termcap  xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
-terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
-
 #80/132 column switching must be enabled for ^AW to work
 #change init sequence to not switch width
-termcapinfo  xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
+#termcapinfo  xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
 
 # Make the output buffer large for (fast) xterms.
 #termcapinfo xterm* OL=10000
@@ -60,14 +44,14 @@ termcapinfo xterm* OL=100
 # tell screen that xterm can switch to dark background and has function
 # keys.
 termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l'
-termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
-termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
+#termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
+#termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
 
 # special xterm hardstatus: use the window title.
 termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
 
 #terminfo xterm 'vb=\E[?5h$<200/>\E[?5l'
-termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
+#termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
 
 # emulate part of the 'K' charset
 termcapinfo   xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
@@ -103,32 +87,12 @@ termcapinfo linux C8
 # old rxvt versions also need this
 # termcapinfo rxvt C8
 
-
-################
-#
-# keybindings
-#
-
-#remove some stupid / dangerous key bindings
-bind k
-bind ^k
-bind .
-bind ^\
-bind \\
-bind ^h
-bind h
-#make them better
-bind 'K' kill
-bind 'I' login on
-bind 'O' login off
-bind '}' history
-
 # Yet another hack:
 # Prepend/append register [/] to the paste if ^a^] is pressed.
 # This lets me have autoindent mode in vi.
-register [ "\033:se noai\015a"
-register ] "\033:se ai\015a"
-bind ^] paste [.]
+#register [ "\033:se noai\015a"
+#register ] "\033:se ai\015a"
+#bind ^] paste [.]
 
 ################
 #
@@ -140,9 +104,14 @@ bind ^] paste [.]
 # screen -t 40 2 rlogin server
 
 # caption always "%3n %t%? @%u%?%? [%h]%?%=%c"
+## alternative caption, gives window list, LOGNAME and current date:
+# caption always "%{wk}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw %=%{mk}@%H %{yk}%D %{ck}%M%{wk} %{ck}%d %{gk}%c"
 # hardstatus alwaysignore
 # hardstatus alwayslastline "%Lw"
 
+# Red Hat's normal status line
+hardstatus string "[screen %n%?: %t%?] %h"
+
 # bind = resize =
 # bind + resize +1
 # bind - resize -1


Index: screen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/screen/devel/screen.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- screen.spec	27 Jul 2009 04:00:42 -0000	1.51
+++ screen.spec	25 Sep 2009 12:35:36 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.0.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -18,13 +18,14 @@ Source1: screen.pam
 
 Patch1: screen-4.0.3-libs.patch
 # Some tweaks of the default screenrc
-Patch2: screen-4.0.2-screenrc.patch
+Patch2: screen-4.0.3-screenrc.patch
 Patch3: screen-4.0.3-configh.patch
 Patch4: screen-4.0.3-stropts.patch
 # Fixes potential buffer overflow when > 2^31 semicolons are passed.
 Patch7: screen-4.0.1-args.patch
 Patch11: screen-4.0.2-maxstr.patch
 Patch12: screen-4.0.3-ipv6.patch
+Patch13: screen-4.0.3-resize.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -45,6 +46,7 @@ support multiple logins on one terminal.
 %patch7 -p0 -b .args
 %patch11 -p1 -b .maxstr
 %patch12 -p1 -b .ipv6
+%patch13 -p2 -b .resize
 
 %build
 autoconf
@@ -96,12 +98,14 @@ rm -rf $RPM_BUILD_ROOT
 :
 
 %post
-/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen).				Terminal multiplexer." ||:
+/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen).				Terminal multiplexer." &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen).				Terminal multiplexer." ||:
+	/sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen).				Terminal multiplexer." &> /dev/null
 fi
+:
 
 %files
 %defattr(-,root,root,-)
@@ -115,6 +119,11 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/screen
 
 %changelog
+* Fri Sep 25 2009 Miroslav Lichvar <mlichvar at redhat.com> - 4.0.3-15
+- fix crash when resizing (#515055)
+- try to improve default config (#523647, #506256, #492729)
+- suppress install-info errors (#515999)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- screen-4.0.2-screenrc.patch DELETED ---



From toshio at fedoraproject.org  Fri Sep 25 12:43:15 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 25 Sep 2009 12:43:15 +0000 (UTC)
Subject: rpms/fusecompress/devel README.fedora, NONE,
	1.1 fusecompress-xz-port.patch, NONE, 1.1 fusecompress.spec,
	1.17, 1.18
Message-ID: <20090925124315.1A48B11C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23214

Modified Files:
	fusecompress.spec 
Added Files:
	README.fedora fusecompress-xz-port.patch 
Log Message:

* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-2
- Port code to newer liblzma as provided by xz.



--- NEW FILE README.fedora ---
If you have fusecompress filesystems created prior to Fedora 12, you will need
to update them to the new on disk format in order to use them with this version
of fusecompress.  Install the fusecompress1 package via yum and read the
README.fedora file there for instructions::

    su -c yum install -y fusecompress1
    less /usr/share/doc/fusecompress1*/README.fedora

fusecompress-xz-port.patch:
 lzma.cpp |   12 ++++++------
 lzma.hpp |   14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE fusecompress-xz-port.patch ---
Index: tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.cpp
===================================================================
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.orig/src/boost/iostreams/filter/lzma.cpp
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.cpp
@@ -28,10 +28,10 @@ namespace lzma {
 
                     // Compression levels
 
-const lzma_easy_level no_compression       = LZMA_EASY_COPY;
-const lzma_easy_level best_speed           = LZMA_EASY_LZMA2_1;
-const lzma_easy_level best_compression     = LZMA_EASY_LZMA_9;
-const lzma_easy_level default_compression  = LZMA_EASY_LZMA_7;
+const uint32_t no_compression       = 0;
+const uint32_t best_speed           = 1;
+const uint32_t best_compression     = 9;
+const uint32_t default_compression  = 2;
 
                     // Status codes
 
@@ -39,7 +39,7 @@ const int okay                 = LZMA_OK
 const int stream_end           = LZMA_STREAM_END;
 const int unsupported_check    = LZMA_UNSUPPORTED_CHECK;
 const int mem_error            = LZMA_MEM_ERROR;
-const int header_error         = LZMA_HEADER_ERROR;
+const int options_error        = LZMA_OPTIONS_ERROR;
 const int data_error           = LZMA_DATA_ERROR;
 const int buf_error            = LZMA_BUF_ERROR;
 const int prog_error           = LZMA_PROG_ERROR;
@@ -135,7 +135,7 @@ void lzma_base::do_init
 
     lzma_error::check(
         compress ?
-            lzma_easy_encoder(s, p.level) :
+            lzma_easy_encoder(s, p.level, LZMA_CHECK_CRC32) :
             lzma_stream_decoder(s, 100 * 1024 * 1024, 0 )
     );
 }
Index: tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.hpp
===================================================================
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.orig/src/boost/iostreams/filter/lzma.hpp
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.hpp
@@ -47,10 +47,10 @@ typedef void (*free_func)(void*, void*);
 
                     // Compression levels
 
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level no_compression;
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level best_speed;
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level best_compression;
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level default_compression;
+BOOST_IOSTREAMS_DECL extern const uint32_t no_compression;
+BOOST_IOSTREAMS_DECL extern const uint32_t best_speed;
+BOOST_IOSTREAMS_DECL extern const uint32_t best_compression;
+BOOST_IOSTREAMS_DECL extern const uint32_t default_compression;
 
                     // Status codes
 
@@ -58,7 +58,7 @@ BOOST_IOSTREAMS_DECL extern const int ok
 BOOST_IOSTREAMS_DECL extern const int stream_end;
 BOOST_IOSTREAMS_DECL extern const int unsupported_check;
 BOOST_IOSTREAMS_DECL extern const int mem_error;
-BOOST_IOSTREAMS_DECL extern const int header_error;
+BOOST_IOSTREAMS_DECL extern const int options_error;
 BOOST_IOSTREAMS_DECL extern const int data_error;
 BOOST_IOSTREAMS_DECL extern const int buf_error;
 BOOST_IOSTREAMS_DECL extern const int prog_error;
@@ -88,10 +88,10 @@ const int null                          
 struct lzma_params {
 
     // Non-explicit constructor.
-    lzma_params( lzma_easy_level level = lzma::default_compression )
+    lzma_params( uint32_t level = lzma::default_compression )
         : level(level)
         { }
-    lzma_easy_level level;
+    uint32_t level;
 };
 
 //


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fusecompress.spec	25 Sep 2009 09:48:45 -0000	1.17
+++ fusecompress.spec	25 Sep 2009 12:43:14 -0000	1.18
@@ -1,20 +1,24 @@
 Name:           fusecompress
 Version:        2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://miio.net/fusecompress/
 Source0:        http://download.github.com/tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz
+Source1:        README.fedora
 Patch0:         fusecompress-2.5-gcc44.patch
 Patch1:         fusecompress-2.5-ppc.patch
 # Patch already upstream
 Patch2:         fusecompress-log-vsprintf.patch
+# Patch in upstream's bugtracker
+Patch3:         fusecompress-xz-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fuse-devel file-devel boost-devel
-BuildRequires:  zlib-devel bzip2-devel lzo-devel lzma-devel
+BuildRequires:  zlib-devel bzip2-devel lzo-devel
+BuildRequires:  xz-devel
 Requires:       fuse
 
 
@@ -30,8 +34,11 @@ compressed files and user applications.
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .vsprintf
+%patch3 -p1 -b .xzup
 find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
 
+cp %{SOURCE1} .
+
 %build
 %configure --with-boost-libdir=%{_libdir}
 make %{?_smp_mflags}
@@ -55,10 +62,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mount.fusecompress
 %{_mandir}/man1/fusecompress.1*
 %{_mandir}/man1/fusecompress_offline.1*
-%doc ChangeLog README AUTHORS COPYING NEWS
+%doc ChangeLog README AUTHORS COPYING NEWS README.fedora
 
 
 %changelog
+* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-2
+- Port code to newer liblzma as provided by xz.
+
 * Thu Sep 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-1
 - Update to 2.6.
 - Drop portion of gcc patch that's gone upstream.



From tbzatek at fedoraproject.org  Fri Sep 25 12:47:43 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 25 Sep 2009 12:47:43 +0000 (UTC)
Subject: rpms/nautilus/F-11 nautilus-2.28.0-thumbnailing-limit.patch, NONE, 
	1.1 nautilus.spec, 1.275, 1.276
Message-ID: <20090925124743.68FC011C00E8@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24581

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.28.0-thumbnailing-limit.patch 
Log Message:
* Fri Sep 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-2
- Don't load files for thumbnailing that we can't thumbnail anyway


nautilus-2.28.0-thumbnailing-limit.patch:
 nautilus-file.c       |    3 ++-
 nautilus-thumbnails.c |   30 ++++++++++++++++++++++++------
 nautilus-thumbnails.h |    2 +-
 3 files changed, 27 insertions(+), 8 deletions(-)

--- NEW FILE nautilus-2.28.0-thumbnailing-limit.patch ---
>From 048473e42ac2e37bd43159cda4394c11f7f68568 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Fri, 25 Sep 2009 12:41:28 +0000
Subject: Don't load files for thumbnailing that we can't thumbnail anyway

When zooming out we read the real image and use that as the thumbnail.
However, we should only do this for files gdk-pixbuf can read as other
things can't be read anyway and may potentially be very large (such as
videos) since the thumbnail size limit only applies for images.

Cherry picked from master
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index fb6d92b..a2a84f0 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -3588,7 +3588,8 @@ nautilus_file_get_icon (NautilusFile *file,
 			   since the zoom level 150% gives thumbnails at 144, which is
 			   ok to scale up from 128. */
 			if (modified_size > 128*1.25 &&
-			    !file->details->thumbnail_wants_original) {
+			    !file->details->thumbnail_wants_original &&
+			    nautilus_can_thumbnail_internally (file)) {
 				/* Invalidate if we resize upward */
 				file->details->thumbnail_wants_original = TRUE;
 				nautilus_file_invalidate_attributes (file, NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL);
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index f064135..2a3fede 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -765,17 +765,35 @@ get_types_table (void)
 	return image_mime_types;
 }
 
-gboolean
-nautilus_thumbnail_is_mimetype_limited_by_size (const char *mime_type)
+static gboolean
+pixbuf_can_load_type (const char *mime_type)
 {
 	GHashTable *image_mime_types;
-	
+
 	image_mime_types = get_types_table ();
-        if (g_hash_table_lookup (image_mime_types, mime_type)) {
-                return TRUE;
+	if (g_hash_table_lookup (image_mime_types, mime_type)) {
+		return TRUE;
 	}
 
-        return FALSE;
+	return FALSE;
+}
+
+gboolean
+nautilus_can_thumbnail_internally (NautilusFile *file)
+{
+	char *mime_type;
+	gboolean res;
+
+	mime_type = nautilus_file_get_mime_type (file);
+	res = pixbuf_can_load_type (mime_type);
+	g_free (mime_type);
+	return res;
+}
+
+gboolean
+nautilus_thumbnail_is_mimetype_limited_by_size (const char *mime_type)
+{
+	return pixbuf_can_load_type (mime_type);
 }
 
 gboolean
diff --git a/libnautilus-private/nautilus-thumbnails.h b/libnautilus-private/nautilus-thumbnails.h
index 82007ba..3028c92 100644
--- a/libnautilus-private/nautilus-thumbnails.h
+++ b/libnautilus-private/nautilus-thumbnails.h
@@ -47,6 +47,7 @@ typedef void (* NautilusThumbnailAsyncLoadFunc) (NautilusThumbnailAsyncLoadHandl
 void       nautilus_create_thumbnail                (NautilusFile *file);
 gboolean   nautilus_can_thumbnail                   (NautilusFile *file);
 gboolean   nautilus_has_valid_failed_thumbnail      (NautilusFile *file);
+gboolean   nautilus_can_thumbnail_internally        (NautilusFile *file);
 gboolean   nautilus_thumbnail_is_mimetype_limited_by_size
 						    (const char *mime_type);
 void       nautilus_thumbnail_frame_image           (GdkPixbuf **pixbuf);
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- nautilus.spec	25 Sep 2009 08:46:11 -0000	1.275
+++ nautilus.spec	25 Sep 2009 12:47:42 -0000	1.276
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -91,6 +91,9 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # https://bugzilla.redhat.com/show_bug.cgi?id=505919
 Patch18:	nautilus-2.27.2-dark-text-on-dark-bg.patch
 
+# Don't load files for thumbnailing that we can't thumbnail anyway
+Patch19:	nautilus-2.28.0-thumbnailing-limit.patch
+
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -130,6 +133,7 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .dark-text
+%patch19 -p1 -b .thumbnail-limit
 
 %build
 
@@ -267,6 +271,9 @@ fi
 
 
 %changelog
+* Fri Sep 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-2
+- Don't load files for thumbnailing that we can't thumbnail anyway
+
 * Fri Sep 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-1
 - Update to 2.26.4
 



From alexl at fedoraproject.org  Fri Sep 25 12:54:36 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Fri, 25 Sep 2009 12:54:36 +0000 (UTC)
Subject: rpms/xdg-user-dirs/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xdg-user-dirs.spec, 1.12, 1.13
Message-ID: <20090925125436.5951D11C00E8@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/xdg-user-dirs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26700

Modified Files:
	.cvsignore sources xdg-user-dirs.spec 
Log Message:
* Fri Sep 25 2009 Alexander Larsson <alexl at redhat.com> - 0.11-1
- Update to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-user-dirs/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Feb 2008 13:32:56 -0000	1.8
+++ .cvsignore	25 Sep 2009 12:54:36 -0000	1.9
@@ -1 +1 @@
-xdg-user-dirs-0.10.tar.gz
+xdg-user-dirs-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-user-dirs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Feb 2008 13:32:56 -0000	1.8
+++ sources	25 Sep 2009 12:54:36 -0000	1.9
@@ -1 +1 @@
-6873f49ea7f568743621ed1e05e52dab  xdg-user-dirs-0.10.tar.gz
+19f2a928fd5069e4cc927ba009ff74d7  xdg-user-dirs-0.11.tar.gz


Index: xdg-user-dirs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-user-dirs/devel/xdg-user-dirs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xdg-user-dirs.spec	27 Jul 2009 07:43:08 -0000	1.12
+++ xdg-user-dirs.spec	25 Sep 2009 12:54:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		xdg-user-dirs
-Version:	0.10
-Release:	5%{?dist}
+Version:	0.11
+Release:	1%{?dist}
 Summary:	Handles user special directories
 
 Group:		User Interface/Desktops
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/X11/xinit/xinitrc.d/*
 
 %changelog
+* Fri Sep 25 2009 Alexander Larsson <alexl at redhat.com> - 0.11-1
+- Update to 0.11
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Sep 25 13:10:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 25 Sep 2009 13:10:36 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/devel .cvsignore, 1.6,
	1.7 perl-Mail-IMAPClient.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090925131036.C396011C0423@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Mail-IMAPClient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32326

Modified Files:
	.cvsignore perl-Mail-IMAPClient.spec sources 
Log Message:
- new upstream source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-IMAPClient/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Sep 2009 13:13:01 -0000	1.6
+++ .cvsignore	25 Sep 2009 13:10:35 -0000	1.7
@@ -1 +1 @@
-Mail-IMAPClient-3.20.tar.gz
+Mail-IMAPClient-3.21.tar.gz


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-IMAPClient/devel/perl-Mail-IMAPClient.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Mail-IMAPClient.spec	5 Sep 2009 13:13:01 -0000	1.10
+++ perl-Mail-IMAPClient.spec	25 Sep 2009 13:10:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Mail-IMAPClient
-Version:        3.20
+Version:        3.21
 Release:        1%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Sep 25 2009 Stepan Kasal <skasal at redhat.com> - 3.21-1
+- new upstream source
+
 * Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 3.20-1
 - new upstream source
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-IMAPClient/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Sep 2009 13:13:01 -0000	1.6
+++ sources	25 Sep 2009 13:10:35 -0000	1.7
@@ -1 +1 @@
-bc5220b5540e4103f2111c94dcb1c938  Mail-IMAPClient-3.20.tar.gz
+6f6f0fcc33140cd06245e0bf8d1b8f51  Mail-IMAPClient-3.21.tar.gz



From mclasen at fedoraproject.org  Fri Sep 25 13:13:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 13:13:00 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel duplicate-id.patch, NONE,
	1.1 krb5-auth-dialog.spec, 1.39, 1.40
Message-ID: <20090925131300.CDAD611C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv710

Modified Files:
	krb5-auth-dialog.spec 
Added Files:
	duplicate-id.patch 
Log Message:
fix prefernces


duplicate-id.patch:
 krb5-auth-dialog-preferences.c   |   10 ++++++++--
 krb5-auth-dialog-preferences.xml |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE duplicate-id.patch ---
--- krb5-auth-dialog-0.12/preferences/krb5-auth-dialog-preferences.c	2009-07-02 07:23:37.000000000 -0400
+++ hacked/preferences/krb5-auth-dialog-preferences.c	2009-09-25 08:59:36.214140570 -0400
@@ -735,10 +735,16 @@
 static gboolean
 ka_preferences_dialog_init(KaPreferencesDialog* dialog)
 {
+  GError *error = NULL;
+
   dialog->xml = gtk_builder_new ();
 
-  g_assert(gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S
-                                     PACKAGE "-preferences.xml", NULL));
+  if (!gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S
+                                     PACKAGE "-preferences.xml", &error))
+    {
+      g_warning ("Failed to load UI: %s", error->message);
+      exit (1);
+    }
 
   dialog->dialog = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "krb5_auth_dialog_prefs"));
   g_assert (dialog->dialog);
--- krb5-auth-dialog-0.12/preferences/krb5-auth-dialog-preferences.xml	2009-07-02 07:23:37.000000000 -0400
+++ hacked/preferences/krb5-auth-dialog-preferences.xml	2009-09-25 09:00:31.423885887 -0400
@@ -712,7 +712,7 @@
       <action-widget response="0">button1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image1">
+  <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="stock">gtk-missing-image</property>
   </object>


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- krb5-auth-dialog.spec	29 Aug 2009 23:59:28 -0000	1.39
+++ krb5-auth-dialog.spec	25 Sep 2009 13:13:00 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -28,12 +28,16 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596306
+Patch0: duplicate-id.patch
+
 %description
 This package contains a dialog that warns the user when their Kerberos
 tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
+%patch0 -p1 -b .duplicate-id
 
 %build
 %configure
@@ -82,6 +86,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-2
+- Fix the preferences dialog
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-1
 - Update to 0.12
 - Rebuild against new libnm_glib



From limb at fedoraproject.org  Fri Sep 25 13:21:06 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 25 Sep 2009 13:21:06 +0000 (UTC)
Subject: rpms/argyllcms/F-11 argyllcms.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <20090925132106.3621711C00E8@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3891

Modified Files:
	argyllcms.spec sources 
Log Message:
New upstream.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-11/argyllcms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- argyllcms.spec	16 Apr 2009 19:07:21 -0000	1.10
+++ argyllcms.spec	25 Sep 2009 13:21:05 -0000	1.11
@@ -4,8 +4,8 @@
 %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
 
 Name:    argyllcms
-Version: 1.0.3
-Release: 5%{?alphatag}%{?dist}
+Version: 1.0.4
+Release: 2%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -18,8 +18,9 @@ Patch1:  http://www.blackfiveservices.co
 Patch2:  %{name}-1.0.3-remove-libusb-fork-check.patch
 # Patch applied for legal reasons
 Patch4:  %{name}-1.0.2-legal.patch
-Patch5: argyllcms-CVE-2009-0583,0584.patch
-Patch6: argyllcms-CVE-2009-0792.patch
+#Patch5: argyllcms-CVE-2009-0583,0584.patch
+#Patch6: argyllcms-CVE-2009-0792.patch
+#Patch7: argyllcms-1.0.3-autotools.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -66,8 +67,9 @@ This package contains the Argyll color m
 %patch2 -p1 -b .sysusb
 # Legal patch required
 %patch4 -p1 -b .legal
-%patch5 -p0
-%patch6 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -82,6 +84,9 @@ chmod u+x configure
 %configure
 make
 
+#%check
+#make check
+
 %install
 rm -rf %{buildroot}
 
@@ -118,8 +123,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 30 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.4-1
+- New upstream, incorporating ICC fixes.
+
 * Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-5
 - Actually *apply* previous patch.
+- Autotools patch from debian to allow for make check.
 
 * Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
 - Patch for ICC library CVE-2009-0792.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Sep 2008 20:59:38 -0000	1.5
+++ sources	25 Sep 2009 13:21:06 -0000	1.6
@@ -1,2 +1,2 @@
 cdb94385421c2fae1cf6fb068069cd9e  Argyll_V1.0.1_autotools.patch.gz
-01915869a2fda1fdaa91174edf57a0c6  Argyll_V1.0.3_src.zip
+de4010412da4f23a0df3de8f4d3d230d  Argyll_V1.0.4_src.zip



From tmraz at fedoraproject.org  Fri Sep 25 13:35:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 25 Sep 2009 13:35:24 +0000 (UTC)
Subject: rpms/pcsc-perl/devel pcsc-perl-1.4.8.tar.gz.asc, NONE,
	1.1 pcsc-perl.spec, 1.19, 1.20
Message-ID: <20090925133524.264D111C00E8@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pcsc-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9055

Modified Files:
	pcsc-perl.spec 
Added Files:
	pcsc-perl-1.4.8.tar.gz.asc 
Log Message:
* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.8-1
- New upstream version



--- NEW FILE pcsc-perl-1.4.8.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkq5/CEACgkQP0qKj+B/HPnS4gCeJpF9WwHtlmiVzUK0f9V1JAp6
ROkAmwSgz5xsE2BYaIigouDM3megyrco
=wmhS
-----END PGP SIGNATURE-----


Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-perl/devel/pcsc-perl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- pcsc-perl.spec	25 Jul 2009 23:23:13 -0000	1.19
+++ pcsc-perl.spec	25 Sep 2009 13:35:23 -0000	1.20
@@ -5,14 +5,15 @@
 %endif
 
 Name:           pcsc-perl
-Version:        1.4.7
-Release:        3%{?dist}
+Version:        1.4.8
+Release:        1%{?dist}
 Summary:        Perl interface to the PC/SC smart card library
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-perl/%{name}-%{version}.tar.gz
+Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-perl/%{name}-%{version}.tar.gz.asc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -66,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.8-1
+- New upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Fri Sep 25 13:38:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 25 Sep 2009 13:38:45 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.296,1.297
Message-ID: <20090925133845.9276A11C00E8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10027

Modified Files:
	kdebase-workspace.spec 
Log Message:
rhel cleanup



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- kdebase-workspace.spec	25 Sep 2009 11:16:14 -0000	1.296
+++ kdebase-workspace.spec	25 Sep 2009 13:38:45 -0000	1.297
@@ -66,9 +66,9 @@ BuildRequires: desktop-file-utils
 %if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: qedje-devel >= 0.4.0
+BuildRequires: gpsd-devel
 %endif
 BuildRequires: glib2-devel
-BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}



From pbrobinson at fedoraproject.org  Fri Sep 25 13:40:24 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 25 Sep 2009 13:40:24 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.13, 1.14 mutter-moblin.spec, 
	1.14, 1.15 sources, 1.13, 1.14
Message-ID: <20090925134024.1C27611C0423@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10778

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.39.5 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Sep 2009 20:14:57 -0000	1.13
+++ .cvsignore	25 Sep 2009 13:40:23 -0000	1.14
@@ -1 +1 @@
-mutter-moblin-0.39.3.tar.bz2
+mutter-moblin-0.39.5.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mutter-moblin.spec	24 Sep 2009 20:14:57 -0000	1.14
+++ mutter-moblin.spec	25 Sep 2009 13:40:23 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.39.3
+Version:        0.39.5
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,12 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Fri Sep 25 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.5-1
+- New 0.39.5 upstream release
+
+* Fri Sep 25 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.4-1
+- New 0.39.4 upstream release
+
 * Thu Sep 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.3-1
 - New 0.39.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	24 Sep 2009 20:14:57 -0000	1.13
+++ sources	25 Sep 2009 13:40:23 -0000	1.14
@@ -1 +1 @@
-58a4adeeb0419cf4a5c27f50993ca557  mutter-moblin-0.39.3.tar.bz2
+1a9473a3684437d6a67a6964492a12ea  mutter-moblin-0.39.5.tar.bz2



From tmraz at fedoraproject.org  Fri Sep 25 13:43:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 25 Sep 2009 13:43:40 +0000 (UTC)
Subject: rpms/pcsc-perl/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090925134340.8CA2411C00E8@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pcsc-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12112

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.8-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-perl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	30 Mar 2008 06:34:46 -0000	1.7
+++ .cvsignore	25 Sep 2009 13:43:39 -0000	1.8
@@ -1 +1 @@
-pcsc-perl-1.4.7.tar.gz
+pcsc-perl-1.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-perl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	30 Mar 2008 06:34:46 -0000	1.7
+++ sources	25 Sep 2009 13:43:39 -0000	1.8
@@ -1 +1 @@
-108e6a789b579deaa1446c2d3c8b43b9  pcsc-perl-1.4.7.tar.gz
+ac842975d904e0acde36d4796ec19ef1  pcsc-perl-1.4.8.tar.gz



From tmraz at fedoraproject.org  Fri Sep 25 13:43:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 25 Sep 2009 13:43:58 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.78, 1.79 authconfig.spec, 1.109,
	1.110 sources, 1.86, 1.87
Message-ID: <20090925134358.B637A11C00E8@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12300

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.13-1
- updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	17 Sep 2009 07:50:42 -0000	1.78
+++ .cvsignore	25 Sep 2009 13:43:58 -0000	1.79
@@ -1 +1 @@
-authconfig-5.4.12.tar.bz2
+authconfig-5.4.13.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- authconfig.spec	17 Sep 2009 07:50:42 -0000	1.109
+++ authconfig.spec	25 Sep 2009 13:43:58 -0000	1.110
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.12
+Version: 5.4.13
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -101,6 +101,9 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.13-1
+- updated translations
+
 * Thu Sep 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.12-1
 - fixed indentation error (#523534)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	17 Sep 2009 07:50:42 -0000	1.86
+++ sources	25 Sep 2009 13:43:58 -0000	1.87
@@ -1 +1 @@
-1f21aeb63aa175ad89143efd78cf846d  authconfig-5.4.12.tar.bz2
+05a18f5745459a9ab1e4ee45afa36720  authconfig-5.4.13.tar.bz2



From jakub at fedoraproject.org  Fri Sep 25 13:47:19 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 25 Sep 2009 13:47:19 +0000 (UTC)
Subject: rpms/prelink/devel .cvsignore, 1.38, 1.39 prelink.spec, 1.57,
	1.58 sources, 1.41, 1.42
Message-ID: <20090925134719.0C47611C00E8@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/prelink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13331

Modified Files:
	.cvsignore prelink.spec sources 
Log Message:
0.4.2-3.fc12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	9 Jul 2009 09:03:41 -0000	1.38
+++ .cvsignore	25 Sep 2009 13:47:18 -0000	1.39
@@ -1 +1 @@
-prelink-20090709.tar.bz2
+prelink-20090925.tar.bz2


Index: prelink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- prelink.spec	26 Jul 2009 19:22:46 -0000	1.57
+++ prelink.spec	25 Sep 2009 13:47:18 -0000	1.58
@@ -1,10 +1,10 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-%define date 20090709
+%define date 20090925
 Source: http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
 Source2: prelink.conf
 Source3: prelink.cron
@@ -85,7 +85,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
+* Fri Sep 25 2009 Jakub Jelinek <jakub at redhat.com> 0.4.2-3
+- fix DW_OP_implicit_value handling
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Jul  9 2009 Jakub Jelinek <jakub at redhat.com> 0.4.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	9 Jul 2009 09:03:41 -0000	1.41
+++ sources	25 Sep 2009 13:47:18 -0000	1.42
@@ -1 +1 @@
-cbb03435985da494dcdbade63420f2bb  prelink-20090709.tar.bz2
+184d3204f510322f704b6695256b707e  prelink-20090925.tar.bz2



From alexl at fedoraproject.org  Fri Sep 25 14:01:25 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Fri, 25 Sep 2009 14:01:25 +0000 (UTC)
Subject: rpms/hicolor-icon-theme/devel .cvsignore, 1.9,
	1.10 hicolor-icon-theme.spec, 1.25, 1.26 sources, 1.9, 1.10
Message-ID: <20090925140125.4569A11C00E8@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/hicolor-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17500

Modified Files:
	.cvsignore hicolor-icon-theme.spec sources 
Log Message:
* Fri Sep 25 2009 Alexander Larsson <alexl at redhat.com> - 0.11-1
- Update to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hicolor-icon-theme/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Nov 2006 13:04:42 -0000	1.9
+++ .cvsignore	25 Sep 2009 14:01:23 -0000	1.10
@@ -1 +1 @@
-hicolor-icon-theme-0.10.tar.gz
+hicolor-icon-theme-0.11.tar.gz


Index: hicolor-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hicolor-icon-theme/devel/hicolor-icon-theme.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- hicolor-icon-theme.spec	25 Jul 2009 02:09:37 -0000	1.25
+++ hicolor-icon-theme.spec	25 Sep 2009 14:01:23 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Basic requirement for icon themes
 Name: hicolor-icon-theme
-Version: 0.10
-Release: 7
+Version: 0.11
+Release: 1%{?dist}
 License: GPL+
 Group: User Interface/Desktops
 URL: http://icon-theme.freedesktop.org/wiki/HicolorTheme 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{_datadir}/icons/hicolor/icon-theme.cache
 
 %changelog
+* Fri Sep 25 2009 Alexander Larsson <alexl at redhat.com> - 0.11-1
+- Update to 0.11
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hicolor-icon-theme/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Nov 2006 13:04:42 -0000	1.9
+++ sources	25 Sep 2009 14:01:23 -0000	1.10
@@ -1 +1 @@
-3534f7b8e59785c7d5bfa923e85510a7  hicolor-icon-theme-0.10.tar.gz
+5cf5527e803a554f43319ee53c771e0b  hicolor-icon-theme-0.11.tar.gz



From tmraz at fedoraproject.org  Fri Sep 25 14:06:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 25 Sep 2009 14:06:23 +0000 (UTC)
Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.3-gssapi-guard.patch, NONE, 
	1.1 ipsec-tools-0.7.3-gssapi-mech.patch, NONE,
	1.1 ipsec-tools.spec, 1.69, 1.70 racoon.pam, 1.1, 1.2
Message-ID: <20090925140624.016A411C00E8@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20460

Modified Files:
	ipsec-tools.spec racoon.pam 
Added Files:
	ipsec-tools-0.7.3-gssapi-guard.patch 
	ipsec-tools-0.7.3-gssapi-mech.patch 
Log Message:
* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-4
- properly check for errors on gssapi_get_token_to_send()
- use proper mechanism when canonicalizing gss names
- use password-auth common PAM configuration instead of system-auth


ipsec-tools-0.7.3-gssapi-guard.patch:
 isakmp_agg.c   |   12 ++++++++++--
 isakmp_ident.c |   12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE ipsec-tools-0.7.3-gssapi-guard.patch ---
diff -up ipsec-tools-0.7.3/src/racoon/isakmp_agg.c.guard ipsec-tools-0.7.3/src/racoon/isakmp_agg.c
--- ipsec-tools-0.7.3/src/racoon/isakmp_agg.c.guard	2006-09-30 23:49:37.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/isakmp_agg.c	2009-09-03 14:15:08.000000000 +0200
@@ -246,7 +246,11 @@ agg_i1send(iph1, msg)
 
 #ifdef HAVE_GSSAPI
 	if (RMAUTHMETHOD(iph1) == OAKLEY_ATTR_AUTH_METHOD_GSSAPI_KRB) {
-		gssapi_get_token_to_send(iph1, &gsstoken);
+		if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+			plog(LLV_ERROR, LOCATION, NULL, 
+			     "Failed to get gssapi token.\n");
+			goto end;
+		}
 		plist = isakmp_plist_append(plist, gsstoken, ISAKMP_NPTYPE_GSS);
 	}
 #endif
@@ -1254,7 +1258,11 @@ agg_r1send(iph1, msg)
 			    iph1->id, ISAKMP_NPTYPE_ID);
 
 			/* create GSS payload */
-			gssapi_get_token_to_send(iph1, &gsstoken);
+			if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+				plog(LLV_ERROR, LOCATION, NULL, 
+				    "Failed to get gssapi token.\n");
+				goto end;
+			}
 			plist = isakmp_plist_append(plist, 
 			    gsstoken, ISAKMP_NPTYPE_GSS);
 
diff -up ipsec-tools-0.7.3/src/racoon/isakmp_ident.c.guard ipsec-tools-0.7.3/src/racoon/isakmp_ident.c
--- ipsec-tools-0.7.3/src/racoon/isakmp_ident.c.guard	2006-10-02 23:41:59.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/isakmp_ident.c	2009-09-03 14:17:00.000000000 +0200
@@ -1721,7 +1721,11 @@ ident_ir2mx(iph1)
 
 #ifdef HAVE_GSSAPI
 	if (AUTHMETHOD(iph1) == OAKLEY_ATTR_AUTH_METHOD_GSSAPI_KRB)
-		gssapi_get_token_to_send(iph1, &gsstoken);
+		if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"Failed to get gssapi token.\n");
+			goto end;
+		}
 #endif
 
 	/* create isakmp KE payload */
@@ -1891,7 +1895,11 @@ ident_ir3mx(iph1)
 			if (gsshash == NULL)
 				goto end;
 		} else {
-			gssapi_get_token_to_send(iph1, &gsstoken);
+			if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+				plog(LLV_ERROR, LOCATION, NULL,
+					"Failed to get gssapi token.\n");
+				goto end;
+			}
 		}
 
 		if (!gssapi_id_sent(iph1)) {

ipsec-tools-0.7.3-gssapi-mech.patch:
 gssapi.c |    4 ++--
 gssapi.h |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ipsec-tools-0.7.3-gssapi-mech.patch ---
diff -up ipsec-tools-0.7.3/src/racoon/doc/README.gssapi ipsec-tools-0.7.3/src/racoon/doc/README
diff -up ipsec-tools-0.7.3/src/racoon/gssapi.c.gssapi ipsec-tools-0.7.3/src/racoon/gssapi.c
--- ipsec-tools-0.7.3/src/racoon/gssapi.c.gssapi	2006-09-09 18:22:09.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/gssapi.c	2009-09-25 15:55:05.000000000 +0200
@@ -215,7 +215,7 @@ gssapi_init(struct ph1handle *iph1)
 	} else
 		gssapi_get_default_name(iph1, 0, &princ);
 
-	maj_stat = gss_canonicalize_name(&min_stat, princ, GSS_C_NO_OID,
+	maj_stat = gss_canonicalize_name(&min_stat, princ, (gss_OID_desc *)gss_mech_krb5,
 	    &canon_princ);
 	if (GSS_ERROR(maj_stat)) {
 		gssapi_error(min_stat, LOCATION, "canonicalize name\n");
@@ -695,7 +695,7 @@ gssapi_get_id(struct ph1handle *iph1)
 	if (gssapi_get_default_name(iph1, 0, &defname) < 0)
 		return NULL;
 
-	maj_stat = gss_canonicalize_name(&min_stat, defname, GSS_C_NO_OID,
+	maj_stat = gss_canonicalize_name(&min_stat, defname, (gss_OID_desc *)gss_mech_krb5,
 	    &canon_name);
 	if (GSS_ERROR(maj_stat)) {
 		gssapi_error(min_stat, LOCATION, "canonicalize name\n");
diff -up ipsec-tools-0.7.3/src/racoon/gssapi.h.gssapi ipsec-tools-0.7.3/src/racoon/gssapi.h
--- ipsec-tools-0.7.3/src/racoon/gssapi.h.gssapi	2006-09-09 18:22:09.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/gssapi.h	2009-09-25 15:53:29.000000000 +0200
@@ -38,6 +38,7 @@
 #include "/usr/include/gssapi.h"
 #else
 #include <gssapi/gssapi.h>
+#include <gssapi/gssapi_krb5.h>
 #endif
 
 #define GSSAPI_DEF_NAME         "host"


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ipsec-tools.spec	21 Aug 2009 13:59:20 -0000	1.69
+++ ipsec-tools.spec	25 Sep 2009 14:06:23 -0000	1.70
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.7.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -23,6 +23,8 @@ Patch13: ipsec-tools-0.7.1-dpd-fixes.pat
 Patch14: ipsec-tools-0.7.2-moreleaks.patch
 Patch15: ipsec-tools-0.7.3-aliasing.patch
 Patch16: ipsec-tools-0.7.2-nodevel.patch
+Patch17: ipsec-tools-0.7.3-gssapi-guard.patch
+Patch18: ipsec-tools-0.7.3-gssapi-mech.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2, pam-devel
@@ -53,6 +55,8 @@ package builds:
 %patch14 -p1 -b .moreleaks
 %patch15 -p1 -b .review
 %patch16 -p1 -b .nodevel
+%patch17 -p1 -b .gssapi-guard
+%patch18 -p1 -b .gssapi-mech
 
 ./bootstrap
 
@@ -129,6 +133,11 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/racoon
 
 %changelog
+* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-4
+- properly check for errors on gssapi_get_token_to_send()
+- use proper mechanism when canonicalizing gss names
+- use password-auth common PAM configuration instead of system-auth
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-3
 - rebuilt with new openssl
 


Index: racoon.pam
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/racoon.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- racoon.pam	19 Aug 2009 13:54:10 -0000	1.1
+++ racoon.pam	25 Sep 2009 14:06:23 -0000	1.2
@@ -1,8 +1,8 @@
 #%PAM-1.0
 # do not allow ipsec xauth for root
 auth       required     pam_succeed_if.so user != root
-auth       include      system-auth
+auth       include      password-auth
 account    required     pam_nologin.so
-account    include      system-auth
-password   include      system-auth
-session    include      system-auth
+account    include      password-auth
+password   include      password-auth
+session    include      password-auth



From trasher at fedoraproject.org  Fri Sep 25 14:10:13 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 25 Sep 2009 14:10:13 +0000 (UTC)
Subject: rpms/BackupPC/devel BackupPC.spec,1.12,1.13
Message-ID: <20090925141014.0208311C0423@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21924

Modified Files:
	BackupPC.spec 
Log Message:
Remove ClientNameAlias directive from CgiUserConfigEdit list to avoid security hole (bug #518412)


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- BackupPC.spec	23 Sep 2009 16:07:49 -0000	1.12
+++ BackupPC.spec	25 Sep 2009 14:10:13 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -150,6 +150,7 @@ sed -i s,$LOGNAME,backuppc,g init.d/linu
 
 sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
+sed -i 's|ClientNameAlias           => 1,|ClientNameAlias           => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
 %if %{useselinux}
      # SElinux 
@@ -226,6 +227,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 25 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-9
+- Fix security bug (bug #518412)
+
 * Wed Sep 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-8
 - Rebuild with latest SELinux policy (bug #524630)
 



From than at fedoraproject.org  Fri Sep 25 14:11:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 25 Sep 2009 14:11:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.297,1.298
Message-ID: <20090925141138.3A4A111C00E8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22444

Modified Files:
	kdebase-workspace.spec 
Log Message:
rhel cleanup



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- kdebase-workspace.spec	25 Sep 2009 13:38:45 -0000	1.297
+++ kdebase-workspace.spec	25 Sep 2009 14:11:37 -0000	1.298
@@ -455,12 +455,12 @@ fi
 %{_kde4_libdir}/kde4/plasma_applet_*.so
 %if 0%{?fedora}
 %{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
 %endif
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
 %{_kde4_libdir}/kde4/plasma_engine_*.so
-%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
 %{_kde4_libdir}/kde4/plasma-geolocation-ip.so
 %{_kde4_libdir}/kde4/plasma_package*_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so



From dwalsh at fedoraproject.org  Fri Sep 25 14:13:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 25 Sep 2009 14:13:14 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.125,
	1.126 setroubleshoot.spec, 1.165, 1.166 sources, 1.138, 1.139
Message-ID: <20090925141314.6CB0E11C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23245

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.31-1
- Fix translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- .cvsignore	23 Sep 2009 01:12:33 -0000	1.125
+++ .cvsignore	25 Sep 2009 14:13:11 -0000	1.126
@@ -42,3 +42,4 @@ setroubleshoot-2.2.26.tar.gz
 setroubleshoot-2.2.27.tar.gz
 setroubleshoot-2.2.28.tar.gz
 setroubleshoot-2.2.30.tar.gz
+setroubleshoot-2.2.31.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- setroubleshoot.spec	23 Sep 2009 01:06:26 -0000	1.165
+++ setroubleshoot.spec	25 Sep 2009 14:13:12 -0000	1.166
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.30
+Version: 2.2.31
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.31-1
+- Fix translations
+
 * Tue Sep 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.30-1
   - Update po and fix translation line
   


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- sources	23 Sep 2009 01:12:33 -0000	1.138
+++ sources	25 Sep 2009 14:13:12 -0000	1.139
@@ -1 +1 @@
-332e4e8630f990cb1f7ba0a9e0df28e2  setroubleshoot-2.2.30.tar.gz
+2fcae31f2c47d992f900c078579f065c  setroubleshoot-2.2.31.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 14:41:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:41:10 +0000
Subject: [pkgdb] nasm: npajkovs has requested watchcommits
Message-ID: <20090925144111.4EA0920846E@bastion1.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on nasm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:41:14 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925144114.49728208C9F@bastion1.fedora.phx.redhat.com>

npajkovs has set the watchcommits acl on nasm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:35:43 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143622.DEE4510F9D0@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchbugzilla acl on nasm (Fedora devel) to Obsolete for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:36:59 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143700.5E60D10F91A@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchcommits acl on nasm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From hadess at fedoraproject.org  Fri Sep 25 14:42:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 25 Sep 2009 14:42:35 +0000 (UTC)
Subject: rpms/rygel/devel .cvsignore, 1.3, 1.4 rygel.spec, 1.12, 1.13 sources,
	1.3, 1.4
Message-ID: <20090925144235.5647711C00EB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1849

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
* Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 0.4.1-1
- Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Sep 2009 20:22:12 -0000	1.3
+++ .cvsignore	25 Sep 2009 14:42:35 -0000	1.4
@@ -1 +1 @@
-rygel-0.4.tar.bz2
+rygel-0.4.1.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rygel.spec	24 Sep 2009 22:39:22 -0000	1.12
+++ rygel.spec	25 Sep 2009 14:42:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           rygel
-Version:        0.4
-Release:        5%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 0.4.1-1
+- Update to 0.4.1
+
 * Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 0.4-5
 - Make sure we rebuild the C source code from vala sources
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Sep 2009 20:22:12 -0000	1.3
+++ sources	25 Sep 2009 14:42:35 -0000	1.4
@@ -1 +1 @@
-078182963508d4461dd44a43beaf2f64  rygel-0.4.tar.bz2
+7b1335ccf4d0f1ede454e094d73ef868  rygel-0.4.1.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:21 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143722.0396210F9E2@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on nasm (Fedora 11) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:02 +0000
Subject: [pkgdb] nasm: npajkovs has given up watchcommits
Message-ID: <20090925143702.425AD10F91B@bastion2.fedora.phx.redhat.com>

npajkovs has given up the watchcommits acl on nasm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:20 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143720.68F6310F9DE@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchcommits acl on nasm (Fedora 11) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:07 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143707.DEC0410F9D6@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on nasm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:50 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090925143823.C83E510F92E@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on gpm (Fedora devel) to Obsolete for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Fri Sep 25 14:35:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:35:34 +0000
Subject: [pkgdb] nasm ownership updated
Message-ID: <20090925143619.3895710F9D4@bastion2.fedora.phx.redhat.com>

Package nasm in Fedora devel is now owned by npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:15 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143715.A496A10F922@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchcommits acl on nasm (Fedora 10) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:09 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143709.35AFB10F9D9@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on nasm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:21 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143723.3148D10F927@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on nasm (Fedora 11) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:40 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090925143803.B7B2A10F92B@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on gpm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:20 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143720.9862D10F9E0@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchbugzilla acl on nasm (Fedora 11) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:36:03 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143628.E4DD510F904@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchbugzilla acl on nasm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:04 +0000
Subject: [pkgdb] nasm: npajkovs has requested approveacls
Message-ID: <20090925143705.8E92210F9C3@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on nasm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:17 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143717.4E80810F9DC@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on nasm (Fedora 10) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:35:42 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143622.D715810F9CE@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchcommits acl on nasm (Fedora devel) to Obsolete for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From jdetaeye at fedoraproject.org  Fri Sep 25 15:03:33 2009
From: jdetaeye at fedoraproject.org (Johan De Taeye)
Date: Fri, 25 Sep 2009 15:03:33 +0000 (UTC)
Subject: rpms/frepple/F-10 frepple.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925150333.94D6511C00E8@cvs1.fedora.phx.redhat.com>

Author: jdetaeye

Update of /cvs/pkgs/rpms/frepple/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9299/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	frepple.spec import.log 
Log Message:



--- NEW FILE frepple.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Free Production Planning Library
Name: frepple
Version: 0.7.1
Release: 1%{?dist}
# Note on the license: frePPle is released with the LGPL license, version 2.1 or higher. 
# The optional plugin module mod_lpsolver depends on the GLPK package which is 
# licensed under GPL. That module is therefore disabled in this build.
License: LGPLv2+
Group: Applications/Productivity
URL: http://www.frepple.com
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
Requires: xerces-c, Django
BuildRequires: doxygen, python-devel, xerces-c-devel, Django

%description
FrePPLe stands for "Free Production Planning Library". It is a toolkit/
framework for modeling and solving production planning problems, targeted
primarily at discrete manufacturing industries.

%package devel
Summary: The libraries and header files needed for frePPLe development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
These are the libraries and header files need for developing plug-ins and
extensions of frePPLe - the Free Production Planning Library.

%package doc
Summary: Documentation subpackage for frePPLe
Group: Documentation
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 5
BuildArch: noarch
%endif

%description doc
Documentation subpackage for frePPLe - the Free Production Planning Library.

%prep
%setup -q

%build
# Temporary patch to the makefile that runs the test suite. Will be removed with the next upstream release.
sed -i 's|./runtest.py|./runtest.py ${TESTARGS}|g' test/Makefile.in
# Configure
%configure \
  --disable-static \
  --disable-dependency-tracking \
  --enable-doc \
  --enable-forecast \
  --disable-lp_solver \
  --disable-webservice 
# Remove rpath from libtool
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
# Avoid linking against unused libraries
sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
# Compile
make %{?_smp_mflags} all

%check
# Run test suite, skipping some long and less interesting tests
TESTARGS="-e xml_remote -e scalability_1 -e scalability_2 -e scalability_3 -e jobshop"
export TESTARGS
make check

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
# Do not package .la files created by libtool
find %{buildroot} -name '*.la' -exec rm {} \;
# Use %doc instead of install to create the documentation
rm -rf %{buildroot}%{_docdir}/%{name}
# Language files; not under /usr/share, need to be handled manually
(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
  's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
  >> %{name}.lang

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/frepple
%dir %{_libdir}/frepple
%{_libdir}/frepple/mod_forecast.so
%{_libdir}/libfrepple.so.0
%{_libdir}/libfrepple.so.0.0.0
%dir %{_datadir}/frepple
%{_datadir}/frepple/*.xsd
%{_datadir}/frepple/*.xml
%{_datadir}/frepple/*.py*
%{_mandir}/man1/frepple.1.*
%attr(0755,root,root) %{python_sitelib}/freppledb/manage.py
%{python_sitelib}/freppledb*
%doc COPYING 

%files devel
%defattr(-,root,root,-)
%{_libdir}/libfrepple.so
%dir %{_includedir}/frepple
%{_includedir}/frepple/*
%{_includedir}/frepple.h
%{_includedir}/freppleinterface.h

%files doc
%defattr(-,root,root,-)
%doc doc/reference doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp

%changelog
* Tue Aug 11 2009 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.7.1-1
- Package submitted for review and initial build.



--- NEW FILE import.log ---
frepple-0_7_1-1_fc11:F-10:frepple-0.7.1-1.fc11.src.rpm:1253890987


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:28:13 -0000	1.1
+++ .cvsignore	25 Sep 2009 15:03:33 -0000	1.2
@@ -0,0 +1 @@
+frepple-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:28:13 -0000	1.1
+++ sources	25 Sep 2009 15:03:33 -0000	1.2
@@ -0,0 +1 @@
+57edad98fd4a49f114c576f5ac10a382  frepple-0.7.1.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:13 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143713.F343410F920@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchbugzilla acl on nasm (Fedora 10) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:03 +0000
Subject: [pkgdb] nasm: npajkovs has requested commit
Message-ID: <20090925143704.0DFBB10F91E@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on nasm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nasm



From pkgdb at fedoraproject.org  Fri Sep 25 14:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 14:37:16 +0000
Subject: [pkgdb] nasm had acl change status
Message-ID: <20090925143716.874B610F9DA@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on nasm (Fedora 10) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/nasm



From chkr at fedoraproject.org  Fri Sep 25 15:04:34 2009
From: chkr at fedoraproject.org (chkr)
Date: Fri, 25 Sep 2009 15:04:34 +0000 (UTC)
Subject: rpms/clutter-sharp/devel clutter-sharp.spec,1.1,1.2
Message-ID: <20090925150434.D56CB11C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/clutter-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9571

Modified Files:
	clutter-sharp.spec 
Log Message:
- some spelling fixes
- correct email address



Index: clutter-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/devel/clutter-sharp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- clutter-sharp.spec	25 Sep 2009 14:59:07 -0000	1.1
+++ clutter-sharp.spec	25 Sep 2009 15:04:34 -0000	1.2
@@ -74,18 +74,18 @@ rm -rf %{buildroot}
 %{_libdir}/monodoc/sources/*
 
 %changelog
-* Wed Sep 16 2009 Christian Krause <chkr at plauener.de> - 0-0.4.20090828
-- add Requires: clutter since it is not picked up automatically
-- add comments about clutter-gtk support in the future
-- exclude clutter-gtk-sharp pkgconfig file for now
-- fix description and summary of devel pacakge
+* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.4.20090828
+- Add Requires: clutter since it is not picked up automatically
+- Add comments about clutter-gtk support in the future
+- Exclude clutter-gtk-sharp pkgconfig file for now
+- Fix description and summary of devel package
 
-* Fri Aug 28 2009 Christian Krause <chkr at plauener.de> - 0-0.3.20090828
-- fix %%defattr usage
-- use %%{buildroot} consistently
+* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.3.20090828
+- Fix %%defattr usage
+- Use %%{buildroot} consistently
 
-* Fri Aug 28 2009 Christian Krause <chkr at plauener.de> - 0-0.2.20090828
-- enhance git snapshot script to retrieve a specific revision
+* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.2.20090828
+- Enhance git snapshot script to retrieve a specific revision
 
 * Thu Aug 27 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.1.20090827
 - Initial spec file for clutter-sharp



From jdetaeye at fedoraproject.org  Fri Sep 25 15:04:30 2009
From: jdetaeye at fedoraproject.org (Johan De Taeye)
Date: Fri, 25 Sep 2009 15:04:30 +0000 (UTC)
Subject: rpms/frepple/F-11 frepple.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925150430.0694911C00E8@cvs1.fedora.phx.redhat.com>

Author: jdetaeye

Update of /cvs/pkgs/rpms/frepple/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9761/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	frepple.spec import.log 
Log Message:



--- NEW FILE frepple.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Free Production Planning Library
Name: frepple
Version: 0.7.1
Release: 1%{?dist}
# Note on the license: frePPle is released with the LGPL license, version 2.1 or higher. 
# The optional plugin module mod_lpsolver depends on the GLPK package which is 
# licensed under GPL. That module is therefore disabled in this build.
License: LGPLv2+
Group: Applications/Productivity
URL: http://www.frepple.com
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
Requires: xerces-c, Django
BuildRequires: doxygen, python-devel, xerces-c-devel, Django

%description
FrePPLe stands for "Free Production Planning Library". It is a toolkit/
framework for modeling and solving production planning problems, targeted
primarily at discrete manufacturing industries.

%package devel
Summary: The libraries and header files needed for frePPLe development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
These are the libraries and header files need for developing plug-ins and
extensions of frePPLe - the Free Production Planning Library.

%package doc
Summary: Documentation subpackage for frePPLe
Group: Documentation
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 5
BuildArch: noarch
%endif

%description doc
Documentation subpackage for frePPLe - the Free Production Planning Library.

%prep
%setup -q

%build
# Temporary patch to the makefile that runs the test suite. Will be removed with the next upstream release.
sed -i 's|./runtest.py|./runtest.py ${TESTARGS}|g' test/Makefile.in
# Configure
%configure \
  --disable-static \
  --disable-dependency-tracking \
  --enable-doc \
  --enable-forecast \
  --disable-lp_solver \
  --disable-webservice 
# Remove rpath from libtool
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
# Avoid linking against unused libraries
sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
# Compile
make %{?_smp_mflags} all

%check
# Run test suite, skipping some long and less interesting tests
TESTARGS="-e xml_remote -e scalability_1 -e scalability_2 -e scalability_3 -e jobshop"
export TESTARGS
make check

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
# Do not package .la files created by libtool
find %{buildroot} -name '*.la' -exec rm {} \;
# Use %doc instead of install to create the documentation
rm -rf %{buildroot}%{_docdir}/%{name}
# Language files; not under /usr/share, need to be handled manually
(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
  's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
  >> %{name}.lang

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/frepple
%dir %{_libdir}/frepple
%{_libdir}/frepple/mod_forecast.so
%{_libdir}/libfrepple.so.0
%{_libdir}/libfrepple.so.0.0.0
%dir %{_datadir}/frepple
%{_datadir}/frepple/*.xsd
%{_datadir}/frepple/*.xml
%{_datadir}/frepple/*.py*
%{_mandir}/man1/frepple.1.*
%attr(0755,root,root) %{python_sitelib}/freppledb/manage.py
%{python_sitelib}/freppledb*
%doc COPYING 

%files devel
%defattr(-,root,root,-)
%{_libdir}/libfrepple.so
%dir %{_includedir}/frepple
%{_includedir}/frepple/*
%{_includedir}/frepple.h
%{_includedir}/freppleinterface.h

%files doc
%defattr(-,root,root,-)
%doc doc/reference doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp

%changelog
* Tue Aug 11 2009 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.7.1-1
- Package submitted for review and initial build.



--- NEW FILE import.log ---
frepple-0_7_1-1_fc11:F-11:frepple-0.7.1-1.fc11.src.rpm:1253891049


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:28:13 -0000	1.1
+++ .cvsignore	25 Sep 2009 15:04:29 -0000	1.2
@@ -0,0 +1 @@
+frepple-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:28:13 -0000	1.1
+++ sources	25 Sep 2009 15:04:29 -0000	1.2
@@ -0,0 +1 @@
+57edad98fd4a49f114c576f5ac10a382  frepple-0.7.1.tar.gz



From mclasen at fedoraproject.org  Fri Sep 25 15:04:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 15:04:59 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.222,1.223
Message-ID: <20090925150459.C66F111C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9913

Modified Files:
	glib2.spec 
Log Message:
avoid multilib conflicts



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- glib2.spec	24 Sep 2009 14:30:56 -0000	1.222
+++ glib2.spec	25 Sep 2009 15:04:59 -0000	1.223
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -81,8 +81,6 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
-# These cause multilib conflicts, and we don't really need precompiled
-# versions of these tiny scripts
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
 
 %find_lang glib20
@@ -115,6 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 %{_libdir}/pkgconfig/*
 %{_datadir}/glib-2.0
+%exclude %{_datadir}/glib-2.0/gdb/*.pyo
+%exclude %{_datadir}/glib-2.0/gdb/*.pyc
 %{_bindir}/*
 %doc %{_datadir}/gtk-doc/html/*
 %doc %{_mandir}/man1/*
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-4
+- Avoid multilib conflicts even harder
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
 - Avoid multilib conflicts (#525213)
 



From than at fedoraproject.org  Fri Sep 25 14:59:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 25 Sep 2009 14:59:30 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.4,
	1.5
Message-ID: <20090925145930.3073711C00E8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7311

Modified Files:
	constantine-kde-theme.spec 
Log Message:
rhel cleanup



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- constantine-kde-theme.spec	12 Sep 2009 22:01:13 -0000	1.4
+++ constantine-kde-theme.spec	25 Sep 2009 14:59:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
 Version:	11.90.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -27,6 +27,13 @@ Provides:	system-kdm-theme = %{version}-
 Provides:	system-ksplash-theme = %{version}-%{release}
 %endif
 
+# replace it later for el6
+if 0%{?rhel} == 6
+Provides:   system-kde-theme = %{version}-%{release}
+Provides:   system-kdm-theme = %{version}-%{release}
+Provides:   system-ksplash-theme = %{version}-%{release}
+%endif
+
 %description
 This is Constantine KDE Theme Artwork containing KSplash theme and KDM theme.
 
@@ -102,6 +109,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 11.90.3-4
+- rhel cleanup
+
 * Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 11.90.3-3
 - Provides: system-kde-theme system-kdm-theme system-ksplash-theme (f12)
 - Provides: constantine-kdm-theme constantine-ksplash-theme



From hadess at fedoraproject.org  Fri Sep 25 14:59:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 25 Sep 2009 14:59:37 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.13,1.14
Message-ID: <20090925145937.3236C11C00EB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7388

Modified Files:
	rygel.spec 
Log Message:
Don't try to remove vala stamp files, it would need vala from git


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rygel.spec	25 Sep 2009 14:42:35 -0000	1.13
+++ rygel.spec	25 Sep 2009 14:59:37 -0000	1.14
@@ -52,9 +52,6 @@ A plugin for rygel to use tracker to loc
 %prep
 %setup -q
 
-# Remove vala stamp files
-find %{buildroot} -name '*_vala.stamp' -exec rm -f {} ';'
-
 %build
 %configure --enable-tracker-plugin --enable-media-export-plugin --enable-external-plugin --enable-mediathek-plugin --enable-gstlaunch-plugin --disable-silent-rules
 make %{?_smp_mflags} V=1



From than at fedoraproject.org  Fri Sep 25 15:00:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 25 Sep 2009 15:00:52 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.5,
	1.6
Message-ID: <20090925150052.40C0011C0374@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7989

Modified Files:
	constantine-kde-theme.spec 
Log Message:
typo



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- constantine-kde-theme.spec	25 Sep 2009 14:59:30 -0000	1.5
+++ constantine-kde-theme.spec	25 Sep 2009 15:00:51 -0000	1.6
@@ -28,7 +28,7 @@ Provides:	system-ksplash-theme = %{versi
 %endif
 
 # replace it later for el6
-if 0%{?rhel} == 6
+%if 0%{?rhel} == 6
 Provides:   system-kde-theme = %{version}-%{release}
 Provides:   system-kdm-theme = %{version}-%{release}
 Provides:   system-ksplash-theme = %{version}-%{release}



From chkr at fedoraproject.org  Fri Sep 25 14:59:08 2009
From: chkr at fedoraproject.org (chkr)
Date: Fri, 25 Sep 2009 14:59:08 +0000 (UTC)
Subject: rpms/clutter-sharp/devel clutter-sharp-make-git-snapshot.sh, NONE, 
	1.1 clutter-sharp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925145908.F30FD11C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/clutter-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6519/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clutter-sharp-make-git-snapshot.sh clutter-sharp.spec 
	import.log 
Log Message:
- initial import of clutter-sharp (git snapshot)



--- NEW FILE clutter-sharp-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./clutter-sharp-make-git-snapshot.sh [COMMIT]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local mesa repo to reduce clone time.

DIRNAME="clutter-sharp-$2"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.clutter-project.org/bindings/clutter-sharp $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME



--- NEW FILE clutter-sharp.spec ---
%define debug_package %{nil}

%define gitdate 20090828
%define gitcommit 349dba602015e07
Summary: C#/.NET bindings to Clutter
Name: clutter-sharp
Version: 0
Release: 0.4.%{gitdate}%{?dist}
URL: http://www.clutter-project.org
Source0: %{name}-%{gitdate}.tar.bz2
# based on libdrm's make-git-snapshot.sh 
# sh clutter-sharp-make-git-snapshot.sh <gitcommit> <gitdate>
Source1: clutter-sharp-make-git-snapshot.sh
License: MIT
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake, libtool
BuildRequires: mono-devel
BuildRequires: gtk-sharp2-devel
BuildRequires: clutter-devel
BuildRequires: monodoc-devel
BuildRequires: gtk-sharp2-gapi
Requires: gtk-sharp2-gapi
Requires: clutter
# clutter-sharp is currently built without
# clutter-gtk support, since it requires version >= 0.10.3
#BuildRequires: clutter-gtk-devel 
#Requires: clutter-gtk

%description
Clutter-sharp offers C#/.NET bindings to Clutter

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %name = %{version}-%{release}
Requires: pkgconfig
Requires: monodoc

%description devel
This package contains the development files for the C#/.NET bindings
to clutter.

%prep
%setup -q -n %{name}-%{gitdate}

sed -i -e 's!$(prefix)/lib!%{_libdir}/!' glib/Makefile.am
sed -i -e 's!$(prefix)/lib!%{_libdir}/!' clutter/Makefile.am
sed -i -e 's!$(prefix)/lib!%{_libdir}/!' build/assembly.mk

%build
./autogen.sh
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/clutter-sharp/
%{_datadir}/gapi-2.0/*

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/clutter-sharp.pc
%exclude %{_libdir}/pkgconfig/clutter-gtk-sharp.pc
%{_libdir}/monodoc/sources/*

%changelog
* Wed Sep 16 2009 Christian Krause <chkr at plauener.de> - 0-0.4.20090828
- add Requires: clutter since it is not picked up automatically
- add comments about clutter-gtk support in the future
- exclude clutter-gtk-sharp pkgconfig file for now
- fix description and summary of devel pacakge

* Fri Aug 28 2009 Christian Krause <chkr at plauener.de> - 0-0.3.20090828
- fix %%defattr usage
- use %%{buildroot} consistently

* Fri Aug 28 2009 Christian Krause <chkr at plauener.de> - 0-0.2.20090828
- enhance git snapshot script to retrieve a specific revision

* Thu Aug 27 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.1.20090827
- Initial spec file for clutter-sharp



--- NEW FILE import.log ---
clutter-sharp-0-0_4_20090828_fc11:HEAD:clutter-sharp-0-0.4.20090828.fc11.src.rpm:1253890590


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:09:47 -0000	1.1
+++ .cvsignore	25 Sep 2009 14:59:07 -0000	1.2
@@ -0,0 +1 @@
+clutter-sharp-20090828.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:09:47 -0000	1.1
+++ sources	25 Sep 2009 14:59:07 -0000	1.2
@@ -0,0 +1 @@
+dd598c47ae0f946131a461d7e9fb076b  clutter-sharp-20090828.tar.bz2



From jdetaeye at fedoraproject.org  Fri Sep 25 15:01:56 2009
From: jdetaeye at fedoraproject.org (Johan De Taeye)
Date: Fri, 25 Sep 2009 15:01:56 +0000 (UTC)
Subject: rpms/frepple/devel frepple.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925150156.9AC7611C00E8@cvs1.fedora.phx.redhat.com>

Author: jdetaeye

Update of /cvs/pkgs/rpms/frepple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8435/devel

Modified Files:
	.cvsignore sources 
Added Files:
	frepple.spec import.log 
Log Message:



--- NEW FILE frepple.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Free Production Planning Library
Name: frepple
Version: 0.7.1
Release: 1%{?dist}
# Note on the license: frePPle is released with the LGPL license, version 2.1 or higher. 
# The optional plugin module mod_lpsolver depends on the GLPK package which is 
# licensed under GPL. That module is therefore disabled in this build.
License: LGPLv2+
Group: Applications/Productivity
URL: http://www.frepple.com
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
Requires: xerces-c, Django
BuildRequires: doxygen, python-devel, xerces-c-devel, Django

%description
FrePPLe stands for "Free Production Planning Library". It is a toolkit/
framework for modeling and solving production planning problems, targeted
primarily at discrete manufacturing industries.

%package devel
Summary: The libraries and header files needed for frePPLe development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
These are the libraries and header files need for developing plug-ins and
extensions of frePPLe - the Free Production Planning Library.

%package doc
Summary: Documentation subpackage for frePPLe
Group: Documentation
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 5
BuildArch: noarch
%endif

%description doc
Documentation subpackage for frePPLe - the Free Production Planning Library.

%prep
%setup -q

%build
# Temporary patch to the makefile that runs the test suite. Will be removed with the next upstream release.
sed -i 's|./runtest.py|./runtest.py ${TESTARGS}|g' test/Makefile.in
# Configure
%configure \
  --disable-static \
  --disable-dependency-tracking \
  --enable-doc \
  --enable-forecast \
  --disable-lp_solver \
  --disable-webservice 
# Remove rpath from libtool
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
# Avoid linking against unused libraries
sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
# Compile
make %{?_smp_mflags} all

%check
# Run test suite, skipping some long and less interesting tests
TESTARGS="-e xml_remote -e scalability_1 -e scalability_2 -e scalability_3 -e jobshop"
export TESTARGS
make check

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
# Do not package .la files created by libtool
find %{buildroot} -name '*.la' -exec rm {} \;
# Use %doc instead of install to create the documentation
rm -rf %{buildroot}%{_docdir}/%{name}
# Language files; not under /usr/share, need to be handled manually
(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
  's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
  >> %{name}.lang

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/frepple
%dir %{_libdir}/frepple
%{_libdir}/frepple/mod_forecast.so
%{_libdir}/libfrepple.so.0
%{_libdir}/libfrepple.so.0.0.0
%dir %{_datadir}/frepple
%{_datadir}/frepple/*.xsd
%{_datadir}/frepple/*.xml
%{_datadir}/frepple/*.py*
%{_mandir}/man1/frepple.1.*
%attr(0755,root,root) %{python_sitelib}/freppledb/manage.py
%{python_sitelib}/freppledb*
%doc COPYING 

%files devel
%defattr(-,root,root,-)
%{_libdir}/libfrepple.so
%dir %{_includedir}/frepple
%{_includedir}/frepple/*
%{_includedir}/frepple.h
%{_includedir}/freppleinterface.h

%files doc
%defattr(-,root,root,-)
%doc doc/reference doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp

%changelog
* Tue Aug 11 2009 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.7.1-1
- Package submitted for review and initial build.



--- NEW FILE import.log ---
frepple-0_7_1-1_fc11:HEAD:frepple-0.7.1-1.fc11.src.rpm:1253890871


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:28:13 -0000	1.1
+++ .cvsignore	25 Sep 2009 15:01:56 -0000	1.2
@@ -0,0 +1 @@
+frepple-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:28:13 -0000	1.1
+++ sources	25 Sep 2009 15:01:56 -0000	1.2
@@ -0,0 +1 @@
+57edad98fd4a49f114c576f5ac10a382  frepple-0.7.1.tar.gz



From jakub at fedoraproject.org  Fri Sep 25 15:02:34 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 25 Sep 2009 15:02:34 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.294, 1.295 gcc.spec, 1.73, 1.74 sources,
	1.298, 1.299
Message-ID: <20090925150234.BFB0D11C00E8@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8795

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.1-17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- .cvsignore	23 Sep 2009 18:21:09 -0000	1.294
+++ .cvsignore	25 Sep 2009 15:02:34 -0000	1.295
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090923.tar.bz2
+gcc-4.4.1-20090925.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gcc.spec	23 Sep 2009 18:21:09 -0000	1.73
+++ gcc.spec	25 Sep 2009 15:02:34 -0000	1.74
@@ -1,9 +1,9 @@
-%global DATE 20090923
-%global SVNREV 152092
+%global DATE 20090925
+%global SVNREV 152158
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 16
+%global gcc_release 17
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -1821,6 +1821,15 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 25 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-17
+- update from gcc-4_4-branch
+  - fix vectorizer for power7 (#463846)
+- VTA backports
+  - fix debug info for parameters passed by reference (#525709)
+  - PR bootstrap/41457
+- remove power7 VSX load/store with update insn support
+- remove SSE5 support
+
 * Wed Sep 23 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-16
 - update from gcc-4_4-branch
   - PRs c/39779, c/41049, debug/41065, libffi/40242, libffi/41443,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- sources	23 Sep 2009 18:21:09 -0000	1.298
+++ sources	25 Sep 2009 15:02:34 -0000	1.299
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-25ef066c0ea8770f562eed45a9e1619f  gcc-4.4.1-20090923.tar.bz2
+fe01be0d467f7de14e7e8e169e52cf72  gcc-4.4.1-20090925.tar.bz2



From jdetaeye at fedoraproject.org  Fri Sep 25 15:11:54 2009
From: jdetaeye at fedoraproject.org (Johan De Taeye)
Date: Fri, 25 Sep 2009 15:11:54 +0000 (UTC)
Subject: rpms/frepple/F-12 sources,1.1,1.2
Message-ID: <20090925151154.1C1A811C00E8@cvs1.fedora.phx.redhat.com>

Author: jdetaeye

Update of /cvs/pkgs/rpms/frepple/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12979

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Sep 2009 16:28:13 -0000	1.1
+++ sources	25 Sep 2009 15:11:52 -0000	1.2
@@ -0,0 +1 @@
+57edad98fd4a49f114c576f5ac10a382  frepple-0.7.1.tar.gz



From trasher at fedoraproject.org  Fri Sep 25 15:16:34 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 25 Sep 2009 15:16:34 +0000 (UTC)
Subject: rpms/BackupPC/F-11 BackupPC.spec,1.10,1.11
Message-ID: <20090925151634.B5DA511C00E8@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14938

Modified Files:
	BackupPC.spec 
Log Message:
Remove ClientNameAlias directive from CgiUserConfigEdit list to avoid security hole (bug #518412)


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/F-11/BackupPC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- BackupPC.spec	18 Sep 2009 21:17:03 -0000	1.10
+++ BackupPC.spec	25 Sep 2009 15:16:34 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -150,6 +150,7 @@ sed -i s,$LOGNAME,backuppc,g init.d/linu
 
 sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
+sed -i 's|ClientNameAlias           => 1,|ClientNameAlias           => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
 %if %{useselinux}
      # SElinux 
@@ -226,6 +227,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 25 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-7
+- Fix security bug (bug #518412)
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-6
 - Fix SELinux policy module for UserEmailInfo.pl file
 



From chkr at fedoraproject.org  Fri Sep 25 15:16:47 2009
From: chkr at fedoraproject.org (chkr)
Date: Fri, 25 Sep 2009 15:16:47 +0000 (UTC)
Subject: rpms/clutter-sharp/devel clutter-sharp.spec,1.2,1.3
Message-ID: <20090925151647.5874511C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/clutter-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15020

Modified Files:
	clutter-sharp.spec 
Log Message:
* Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.5.20090828
- Fix some spelling mistakes
- Correct email address



Index: clutter-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/devel/clutter-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clutter-sharp.spec	25 Sep 2009 15:04:34 -0000	1.2
+++ clutter-sharp.spec	25 Sep 2009 15:16:47 -0000	1.3
@@ -5,7 +5,7 @@
 Summary: C#/.NET bindings to Clutter
 Name: clutter-sharp
 Version: 0
-Release: 0.4.%{gitdate}%{?dist}
+Release: 0.5.%{gitdate}%{?dist}
 URL: http://www.clutter-project.org
 Source0: %{name}-%{gitdate}.tar.bz2
 # based on libdrm's make-git-snapshot.sh 
@@ -74,6 +74,10 @@ rm -rf %{buildroot}
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.5.20090828
+- Fix some spelling mistakes
+- Correct email address
+
 * Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.4.20090828
 - Add Requires: clutter since it is not picked up automatically
 - Add comments about clutter-gtk support in the future



From jdetaeye at fedoraproject.org  Fri Sep 25 15:19:59 2009
From: jdetaeye at fedoraproject.org (Johan De Taeye)
Date: Fri, 25 Sep 2009 15:19:59 +0000 (UTC)
Subject: rpms/frepple/F-12 frepple.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2
Message-ID: <20090925151959.23FED11C00E8@cvs1.fedora.phx.redhat.com>

Author: jdetaeye

Update of /cvs/pkgs/rpms/frepple/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16760/F-12

Modified Files:
	.cvsignore 
Added Files:
	frepple.spec import.log 
Log Message:



--- NEW FILE frepple.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Free Production Planning Library
Name: frepple
Version: 0.7.1
Release: 1%{?dist}
# Note on the license: frePPle is released with the LGPL license, version 2.1 or higher. 
# The optional plugin module mod_lpsolver depends on the GLPK package which is 
# licensed under GPL. That module is therefore disabled in this build.
License: LGPLv2+
Group: Applications/Productivity
URL: http://www.frepple.com
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
Requires: xerces-c, Django
BuildRequires: doxygen, python-devel, xerces-c-devel, Django

%description
FrePPLe stands for "Free Production Planning Library". It is a toolkit/
framework for modeling and solving production planning problems, targeted
primarily at discrete manufacturing industries.

%package devel
Summary: The libraries and header files needed for frePPLe development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
These are the libraries and header files need for developing plug-ins and
extensions of frePPLe - the Free Production Planning Library.

%package doc
Summary: Documentation subpackage for frePPLe
Group: Documentation
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 5
BuildArch: noarch
%endif

%description doc
Documentation subpackage for frePPLe - the Free Production Planning Library.

%prep
%setup -q

%build
# Temporary patch to the makefile that runs the test suite. Will be removed with the next upstream release.
sed -i 's|./runtest.py|./runtest.py ${TESTARGS}|g' test/Makefile.in
# Configure
%configure \
  --disable-static \
  --disable-dependency-tracking \
  --enable-doc \
  --enable-forecast \
  --disable-lp_solver \
  --disable-webservice 
# Remove rpath from libtool
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
# Avoid linking against unused libraries
sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
# Compile
make %{?_smp_mflags} all

%check
# Run test suite, skipping some long and less interesting tests
TESTARGS="-e xml_remote -e scalability_1 -e scalability_2 -e scalability_3 -e jobshop"
export TESTARGS
make check

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
# Do not package .la files created by libtool
find %{buildroot} -name '*.la' -exec rm {} \;
# Use %doc instead of install to create the documentation
rm -rf %{buildroot}%{_docdir}/%{name}
# Language files; not under /usr/share, need to be handled manually
(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
  's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
  >> %{name}.lang

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/frepple
%dir %{_libdir}/frepple
%{_libdir}/frepple/mod_forecast.so
%{_libdir}/libfrepple.so.0
%{_libdir}/libfrepple.so.0.0.0
%dir %{_datadir}/frepple
%{_datadir}/frepple/*.xsd
%{_datadir}/frepple/*.xml
%{_datadir}/frepple/*.py*
%{_mandir}/man1/frepple.1.*
%attr(0755,root,root) %{python_sitelib}/freppledb/manage.py
%{python_sitelib}/freppledb*
%doc COPYING 

%files devel
%defattr(-,root,root,-)
%{_libdir}/libfrepple.so
%dir %{_includedir}/frepple
%{_includedir}/frepple/*
%{_includedir}/frepple.h
%{_includedir}/freppleinterface.h

%files doc
%defattr(-,root,root,-)
%doc doc/reference doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp

%changelog
* Tue Aug 11 2009 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.7.1-1
- Package submitted for review and initial build.



--- NEW FILE import.log ---
frepple-0_7_1-1_fc11:F-12:frepple-0.7.1-1.fc11.src.rpm:1253891969


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 16:28:13 -0000	1.1
+++ .cvsignore	25 Sep 2009 15:19:58 -0000	1.2
@@ -0,0 +1 @@
+frepple-0.7.1.tar.gz



From trasher at fedoraproject.org  Fri Sep 25 15:22:19 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 25 Sep 2009 15:22:19 +0000 (UTC)
Subject: rpms/BackupPC/F-10 BackupPC.spec,1.8,1.9
Message-ID: <20090925152219.299A411C00E8@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17588

Modified Files:
	BackupPC.spec 
Log Message:
Remove ClientNameAlias directive from CgiUserConfigEdit list to avoid security hole (bug #518412)


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/F-10/BackupPC.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- BackupPC.spec	18 Sep 2009 21:17:20 -0000	1.8
+++ BackupPC.spec	25 Sep 2009 15:22:18 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -150,6 +150,7 @@ sed -i s,$LOGNAME,backuppc,g init.d/linu
 
 sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
+sed -i 's|ClientNameAlias           => 1,|ClientNameAlias           => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
 %if %{useselinux}
      # SElinux 
@@ -226,6 +227,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 25 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-6
+- Fix security bug (bug #518412)
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-5
 - Fix SELinux policy module for UserEmailInfo.pl file
 



From jforbes at fedoraproject.org  Fri Sep 25 15:23:32 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri, 25 Sep 2009 15:23:32 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-xen-check-efer-fix.patch, NONE,
	1.1 kernel.spec, 1.1832, 1.1833
Message-ID: <20090925152332.98D2311C00E8@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18048

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xen-check-efer-fix.patch 
Log Message:
Fix xen guest booting when NX is disabled (#525290)

linux-2.6-xen-check-efer-fix.patch:
 mm/Makefile     |    1 +
 xen/enlighten.c |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-xen-check-efer-fix.patch ---
>From b75fe4e5b869f8dbebd36df64a7fcda0c5b318ed Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 21 Sep 2009 13:34:06 -0700
Subject: [PATCH] xen: check EFER for NX before setting up GDT mapping

x86-64 assumes NX is available by default, so we need to
explicitly check for it before using NX.  Some first-generation
Intel x86-64 processors didn't support NX, and even recent systems
allow it to be disabled in BIOS.

[ Impact: prevent Xen crash on NX-less 64-bit machines ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Stable Kernel <stable at kernel.org>

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 9b5a9f5..dd313d0 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -4,6 +4,7 @@ obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
 # Make sure __phys_addr has no stackprotector
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_ioremap.o		:= $(nostackp)
+CFLAGS_init.o			:= $(nostackp)
 
 obj-$(CONFIG_SMP)		+= tlb.o
 
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 0dd0c2c..5d701bf 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1083,6 +1083,11 @@ asmlinkage void __init xen_start_kernel(void)
 
 	__supported_pte_mask |= _PAGE_IOMAP;
 
+#ifdef CONFIG_X86_64
+	/* Work out if we support NX */
+	check_efer();
+#endif
+
 	xen_setup_features();
 
 	/* Get mfn list */
@@ -1123,11 +1128,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	pgd = (pgd_t *)xen_start_info->pt_base;
 
-#ifdef CONFIG_X86_64
-	/* Work out if we support NX */
-	check_efer();
-#endif
-
 	/* Don't do the full vcpu_info placement stuff until we have a
 	   possible map and a non-dummy shared_info. */
 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1832
retrieving revision 1.1833
diff -u -p -r1.1832 -r1.1833
--- kernel.spec	25 Sep 2009 07:13:51 -0000	1.1832
+++ kernel.spec	25 Sep 2009 15:23:31 -0000	1.1833
@@ -694,6 +694,7 @@ Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+Patch1580: linux-2.6-xen-check-efer-fix.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next-adea4796c.patch
@@ -1354,6 +1355,7 @@ ApplyPatch linux-2.6-ksm-kvm.patch
 # Assorted Virt Fixes
 ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+ApplyPatch linux-2.6-xen-check-efer-fix.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -2059,6 +2061,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Justin M. Forbes <bskeggs at redhat.com> 2.6.31.1-47
+- Fix xen guest booting when NX is disabled (#525290)
+
 * Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-46
 - drm-nouveau.patch: cleanups, fixes, pre-G80 s/r fixes, init rework
 



From pkgdb at fedoraproject.org  Fri Sep 25 15:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 15:33:58 +0000
Subject: [pkgdb] eclipse-callgraph was added for chwang
Message-ID: <20090925153359.DC7D310F87C@bastion2.fedora.phx.redhat.com>

ausil has added Package eclipse-callgraph with summary C/C++ Call Graph Visualization Tool
ausil has approved Package eclipse-callgraph
ausil has added a Fedora devel branch for eclipse-callgraph with an owner of chwang
ausil has approved eclipse-callgraph in Fedora devel
ausil has approved Package eclipse-callgraph
ausil has set commit to Approved for 107427 on eclipse-callgraph (Fedora devel)
ausil has set checkout to Approved for 107427 on eclipse-callgraph (Fedora devel)
ausil has set build to Approved for 107427 on eclipse-callgraph (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/eclipse-callgraph



From pkgdb at fedoraproject.org  Fri Sep 25 15:34:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 15:34:01 +0000
Subject: [pkgdb] eclipse-callgraph summary updated by ausil
Message-ID: <20090925153401.86A8810F89A@bastion2.fedora.phx.redhat.com>

ausil set package eclipse-callgraph summary to C/C++ Call Graph Visualization Tool

To make changes to this package see:
  /pkgdb/packages/name/eclipse-callgraph



From pkgdb at fedoraproject.org  Fri Sep 25 15:34:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 15:34:01 +0000
Subject: [pkgdb] eclipse-callgraph (Fedora, devel) updated by ausil
Message-ID: <20090925153401.8F64710F89F@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on eclipse-callgraph (Fedora devel) for chwang
ausil approved watchcommits on eclipse-callgraph (Fedora devel) for chwang
ausil approved watchbugzilla on eclipse-callgraph (Fedora devel) for rgrunber
ausil approved watchcommits on eclipse-callgraph (Fedora devel) for rgrunber
ausil approved watchbugzilla on eclipse-callgraph (Fedora devel) for akurtakov
ausil approved watchcommits on eclipse-callgraph (Fedora devel) for akurtakov
ausil approved watchbugzilla on eclipse-callgraph (Fedora devel) for overholt
ausil approved watchcommits on eclipse-callgraph (Fedora devel) for overholt

To make changes to this package see:
  /pkgdb/packages/name/eclipse-callgraph



From ausil at fedoraproject.org  Fri Sep 25 15:34:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 25 Sep 2009 15:34:08 +0000 (UTC)
Subject: rpms/eclipse-callgraph/devel - New directory
Message-ID: <20090925153408.4F81911C00EB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-callgraph/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsK21737/rpms/eclipse-callgraph/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-callgraph/devel added to the repository




From ausil at fedoraproject.org  Fri Sep 25 15:34:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 25 Sep 2009 15:34:08 +0000 (UTC)
Subject: rpms/eclipse-callgraph - New directory
Message-ID: <20090925153408.2AB3111C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-callgraph
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsK21737/rpms/eclipse-callgraph

Log Message:
Directory /cvs/pkgs/rpms/eclipse-callgraph added to the repository




From ausil at fedoraproject.org  Fri Sep 25 15:34:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 25 Sep 2009 15:34:15 +0000 (UTC)
Subject: rpms/eclipse-callgraph/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090925153415.D550311C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-callgraph/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsK21737/rpms/eclipse-callgraph/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-callgraph


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-callgraph
# $Id: Makefile,v 1.1 2009/09/25 15:34:15 ausil Exp $
NAME := eclipse-callgraph
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 ausil at fedoraproject.org  Fri Sep 25 15:34:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 25 Sep 2009 15:34:15 +0000 (UTC)
Subject: rpms/eclipse-callgraph Makefile,NONE,1.1
Message-ID: <20090925153415.52F2A11C00E8@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-callgraph
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsK21737/rpms/eclipse-callgraph

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-callgraph


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-callgraph
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 mclasen at fedoraproject.org  Fri Sep 25 15:37:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 15:37:02 +0000 (UTC)
Subject: rpms/libcanberra/devel libcanberra.spec,1.36,1.37
Message-ID: <20090925153702.623F911C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22456

Modified Files:
	libcanberra.spec 
Log Message:
don't require vala



Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libcanberra.spec	20 Sep 2009 18:07:11 -0000	1.36
+++ libcanberra.spec	25 Sep 2009 15:37:01 -0000	1.37
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -42,7 +42,6 @@ Requires: %{name} = %{version}-%{release
 Requires: pkgconfig
 Requires: gtk-doc
 Requires: gtk2-devel
-Requires: vala
 
 %description devel
 Development Files for libcanberra Client Development
@@ -121,10 +120,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
 %{_libdir}/pkgconfig/libcanberra.pc
+# co-own these directories to avoid requiring vala
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libcanberra-gtk.vapi
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.18-2
+- Don't require vala in -devel (#523473)
+
 * Sat Sep 19 2009 Lennart Poettering <lpoetter at redhat.com> 0.18-1
 - New version 0.18
 



From nsantos at fedoraproject.org  Fri Sep 25 15:51:16 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 25 Sep 2009 15:51:16 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.98,1.99
Message-ID: <20090925155116.97D5811C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29047

Modified Files:
	qpidc.spec 
Log Message:
conditionally build rhm subpackage


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- qpidc.spec	24 Sep 2009 22:19:06 -0000	1.98
+++ qpidc.spec	25 Sep 2009 15:51:16 -0000	1.99
@@ -211,6 +211,7 @@ Requires: qpidc = %version-%release
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
+%ifarch i686 x_86_64
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
 Group: System Environment/Libraries
@@ -218,12 +219,13 @@ Requires: qpidd = 0.5.%{qpid_svnrev}
 Requires: db4
 Requires: libaio
 Obsoletes: rhm
-ExclusiveArch: i386 i586 x86_64
+#ExclusiveArch: i386 i586 x86_64
 
 %description -n rhm-cpp-server-store
 Red Hat persistence extension to the Qpid AMQP broker: persistent message
 storage using either a libaio-based asynchronous journal, or synchronously
 with Berkeley DB.
+%endif
 
 %pre -n qpidd
 getent group qpidd >/dev/null || groupadd -r qpidd
@@ -256,6 +258,7 @@ done
 popd
 popd
 
+%ifarch i686 x86_64
 #RHM
 pushd ../rhm-0.5.%{rhm_svnrev}
 export CXXFLAGS="%{optflags} -DNDEBUG" 
@@ -265,6 +268,7 @@ make dist
 make #%{?_smp_mflags}
 popd
 #/RHM
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -306,6 +310,7 @@ rm -fr %{buildroot}%_libexecdir/qpid/tes
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
 popd
 
+%ifarch i686 x86_64
 #RHM
 pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 make install DESTDIR=%{buildroot}
@@ -318,6 +323,7 @@ rm -f %{buildroot}%_libdir/*.la
 rm %{buildroot}%_sysconfdir/rhmd.conf
 popd
 #/RHM
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -330,11 +336,13 @@ rm -rf %{buildroot}
 #LANG=C ECHO=echo make check
 #popd
 
+%ifarch i686 x86_64
 #RHM
 #pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 #make check
 #popd
 #/RHM
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -459,11 +467,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc cpp/docs/api/html
 
+%ifarch i686 x86_64
 %files -n rhm-cpp-server-store
 %defattr(-,root,root,-)
 %doc ../rhm-0.5.%{rhm_svnrev}/README 
 %{_libdir}/qpid/daemon/msgstore.so*
 %attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
+%endif
 
 %post -p /sbin/ldconfig
 



From nsantos at fedoraproject.org  Fri Sep 25 15:58:01 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 25 Sep 2009 15:58:01 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.99,1.100
Message-ID: <20090925155801.E14C411C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31355

Modified Files:
	qpidc.spec 
Log Message:
typo


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- qpidc.spec	25 Sep 2009 15:51:16 -0000	1.99
+++ qpidc.spec	25 Sep 2009 15:58:01 -0000	1.100
@@ -211,7 +211,7 @@ Requires: qpidc = %version-%release
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
-%ifarch i686 x_86_64
+%ifarch i686 x86_64
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
 Group: System Environment/Libraries



From pkgdb at fedoraproject.org  Fri Sep 25 16:12:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:12:26 +0000
Subject: [pkgdb] ghc-time was added for petersen
Message-ID: <20090925161226.C6A4C10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package ghc-time with summary Haskell time library
kevin has approved Package ghc-time
kevin has added a Fedora devel branch for ghc-time with an owner of petersen
kevin has approved ghc-time in Fedora devel
kevin has approved Package ghc-time
kevin has set commit to Approved for 107427 on ghc-time (Fedora devel)
kevin has set checkout to Approved for 107427 on ghc-time (Fedora devel)
kevin has set build to Approved for 107427 on ghc-time (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ghc-time



From pkgdb at fedoraproject.org  Fri Sep 25 16:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:12:27 +0000
Subject: [pkgdb] ghc-time summary updated by kevin
Message-ID: <20090925161228.75ACF10F89D@bastion2.fedora.phx.redhat.com>

kevin set package ghc-time summary to Haskell time library

To make changes to this package see:
  /pkgdb/packages/name/ghc-time



From pkgdb at fedoraproject.org  Fri Sep 25 16:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:12:27 +0000
Subject: [pkgdb] ghc-time (Fedora, devel) updated by kevin
Message-ID: <20090925161228.7E48E10F8A2@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ghc-time (Fedora devel) for haskell-sig
kevin approved watchcommits on ghc-time (Fedora devel) for haskell-sig

To make changes to this package see:
  /pkgdb/packages/name/ghc-time



From kevin at fedoraproject.org  Fri Sep 25 16:12:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:12:45 +0000 (UTC)
Subject: rpms/ghc-time - New directory
Message-ID: <20090925161245.2E30811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-time
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoz3697/rpms/ghc-time

Log Message:
Directory /cvs/pkgs/rpms/ghc-time added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:12:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:12:45 +0000 (UTC)
Subject: rpms/ghc-time/devel - New directory
Message-ID: <20090925161245.DD76A11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-time/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoz3697/rpms/ghc-time/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-time/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:13:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:13:00 +0000 (UTC)
Subject: rpms/ghc-time Makefile,NONE,1.1
Message-ID: <20090925161300.D6E4E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-time
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoz3697/rpms/ghc-time

Added Files:
	Makefile 
Log Message:
Setup of module ghc-time


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-time
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  Fri Sep 25 16:13:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:13:01 +0000 (UTC)
Subject: rpms/ghc-time/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925161301.76C1211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-time/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoz3697/rpms/ghc-time/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-time


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-time
# $Id: Makefile,v 1.1 2009/09/25 16:13:01 kevin Exp $
NAME := ghc-time
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 Sep 25 16:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:13:21 +0000
Subject: [pkgdb] kmymoney2-aqbanking was added for rdieter
Message-ID: <20090925161321.1C9B710F89D@bastion2.fedora.phx.redhat.com>

kevin has added Package kmymoney2-aqbanking with summary Online banking plugin for KMyMoney
kevin has approved Package kmymoney2-aqbanking
kevin has added a Fedora devel branch for kmymoney2-aqbanking with an owner of rdieter
kevin has approved kmymoney2-aqbanking in Fedora devel
kevin has approved Package kmymoney2-aqbanking
kevin has set commit to Approved for 107427 on kmymoney2-aqbanking (Fedora devel)
kevin has set checkout to Approved for 107427 on kmymoney2-aqbanking (Fedora devel)
kevin has set build to Approved for 107427 on kmymoney2-aqbanking (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kmymoney2-aqbanking



From pkgdb at fedoraproject.org  Fri Sep 25 16:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:13:21 +0000
Subject: [pkgdb] kmymoney2-aqbanking summary updated by kevin
Message-ID: <20090925161322.2A89F10F8A2@bastion2.fedora.phx.redhat.com>

kevin set package kmymoney2-aqbanking summary to Online banking plugin for KMyMoney

To make changes to this package see:
  /pkgdb/packages/name/kmymoney2-aqbanking



From pkgdb at fedoraproject.org  Fri Sep 25 16:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:13:21 +0000
Subject: [pkgdb] kmymoney2-aqbanking (Fedora EPEL, 5) updated by kevin
Message-ID: <20090925161322.2EF8610F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kmymoney2-aqbanking
kevin has set commit to Approved for 107427 on kmymoney2-aqbanking (Fedora 10)
kevin has set checkout to Approved for 107427 on kmymoney2-aqbanking (Fedora 10)
kevin has set build to Approved for 107427 on kmymoney2-aqbanking (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kmymoney2-aqbanking



From pkgdb at fedoraproject.org  Fri Sep 25 16:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:13:21 +0000
Subject: [pkgdb] kmymoney2-aqbanking (Fedora EPEL, 5) updated by kevin
Message-ID: <20090925161322.3BD7F10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for kmymoney2-aqbanking
kevin has set commit to Approved for 107427 on kmymoney2-aqbanking (Fedora 11)
kevin has set checkout to Approved for 107427 on kmymoney2-aqbanking (Fedora 11)
kevin has set build to Approved for 107427 on kmymoney2-aqbanking (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kmymoney2-aqbanking



From pkgdb at fedoraproject.org  Fri Sep 25 16:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:13:21 +0000
Subject: [pkgdb] kmymoney2-aqbanking (Fedora EPEL, 5) updated by kevin
Message-ID: <20090925161322.476CF10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for kmymoney2-aqbanking
kevin has set commit to Approved for 107427 on kmymoney2-aqbanking (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on kmymoney2-aqbanking (Fedora EPEL 5)
kevin has set build to Approved for 107427 on kmymoney2-aqbanking (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/kmymoney2-aqbanking



From kevin at fedoraproject.org  Fri Sep 25 16:13:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:13:30 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking - New directory
Message-ID: <20090925161330.182F411C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPV4212/rpms/kmymoney2-aqbanking

Log Message:
Directory /cvs/pkgs/rpms/kmymoney2-aqbanking added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:13:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:13:30 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking/devel - New directory
Message-ID: <20090925161330.4D21111C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPV4212/rpms/kmymoney2-aqbanking/devel

Log Message:
Directory /cvs/pkgs/rpms/kmymoney2-aqbanking/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:13:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:13:37 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking Makefile,NONE,1.1
Message-ID: <20090925161337.0CEEB11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPV4212/rpms/kmymoney2-aqbanking

Added Files:
	Makefile 
Log Message:
Setup of module kmymoney2-aqbanking


--- NEW FILE Makefile ---
# Top level Makefile for module kmymoney2-aqbanking
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  Fri Sep 25 16:13:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:13:37 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925161337.522A011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPV4212/rpms/kmymoney2-aqbanking/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kmymoney2-aqbanking


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kmymoney2-aqbanking
# $Id: Makefile,v 1.1 2009/09/25 16:13:37 kevin Exp $
NAME := kmymoney2-aqbanking
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 Sep 25 16:14:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:14:23 +0000
Subject: [pkgdb] netplug was added for jpopelka
Message-ID: <20090925161423.E4F8610F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package netplug with summary Daemon that responds to network cables being plugged in and out
kevin has approved Package netplug
kevin has added a Fedora devel branch for netplug with an owner of jpopelka
kevin has approved netplug in Fedora devel
kevin has approved Package netplug
kevin has set commit to Approved for 107427 on netplug (Fedora devel)
kevin has set checkout to Approved for 107427 on netplug (Fedora devel)
kevin has set build to Approved for 107427 on netplug (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/netplug



From pkgdb at fedoraproject.org  Fri Sep 25 16:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:14:25 +0000
Subject: [pkgdb] netplug summary updated by kevin
Message-ID: <20090925161425.43A7A10F8A8@bastion2.fedora.phx.redhat.com>

kevin set package netplug summary to Daemon that responds to network cables being plugged in and out

To make changes to this package see:
  /pkgdb/packages/name/netplug



From kevin at fedoraproject.org  Fri Sep 25 16:14:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:14:34 +0000 (UTC)
Subject: rpms/netplug - New directory
Message-ID: <20090925161434.1771E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netplug
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstw4729/rpms/netplug

Log Message:
Directory /cvs/pkgs/rpms/netplug added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:14:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:14:34 +0000 (UTC)
Subject: rpms/netplug/devel - New directory
Message-ID: <20090925161434.3C8B911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netplug/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstw4729/rpms/netplug/devel

Log Message:
Directory /cvs/pkgs/rpms/netplug/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:14:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:14:40 +0000 (UTC)
Subject: rpms/netplug Makefile,NONE,1.1
Message-ID: <20090925161440.961DC11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netplug
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstw4729/rpms/netplug

Added Files:
	Makefile 
Log Message:
Setup of module netplug


--- NEW FILE Makefile ---
# Top level Makefile for module netplug
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  Fri Sep 25 16:14:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:14:40 +0000 (UTC)
Subject: rpms/netplug/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090925161440.ECD0C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netplug/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstw4729/rpms/netplug/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netplug


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: netplug
# $Id: Makefile,v 1.1 2009/09/25 16:14:40 kevin Exp $
NAME := netplug
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 Sep 25 16:15:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:15:28 +0000
Subject: [pkgdb] fence-virt was added for lon
Message-ID: <20090925161528.20A4910F884@bastion2.fedora.phx.redhat.com>

kevin has added Package fence-virt with summary Pluggable Virtual Machine Fencing
kevin has approved Package fence-virt
kevin has added a Fedora devel branch for fence-virt with an owner of lon
kevin has approved fence-virt in Fedora devel
kevin has approved Package fence-virt
kevin has set commit to Approved for 107427 on fence-virt (Fedora devel)
kevin has set checkout to Approved for 107427 on fence-virt (Fedora devel)
kevin has set build to Approved for 107427 on fence-virt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From pkgdb at fedoraproject.org  Fri Sep 25 16:15:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:15:29 +0000
Subject: [pkgdb] fence-virt summary updated by kevin
Message-ID: <20090925161529.8E8CE10F890@bastion2.fedora.phx.redhat.com>

kevin set package fence-virt summary to Pluggable Virtual Machine Fencing

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From pkgdb at fedoraproject.org  Fri Sep 25 16:15:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:15:29 +0000
Subject: [pkgdb] fence-virt (Fedora, 12) updated by kevin
Message-ID: <20090925161529.B04C110F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for fence-virt
kevin has set commit to Approved for 107427 on fence-virt (Fedora 12)
kevin has set checkout to Approved for 107427 on fence-virt (Fedora 12)
kevin has set build to Approved for 107427 on fence-virt (Fedora 12)
kevin approved watchbugzilla on fence-virt (Fedora 12) for fabbione
kevin approved watchcommits on fence-virt (Fedora 12) for fabbione

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From pkgdb at fedoraproject.org  Fri Sep 25 16:15:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:15:29 +0000
Subject: [pkgdb] fence-virt (Fedora, 12) updated by kevin
Message-ID: <20090925161529.A5E7310F89A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on fence-virt (Fedora devel) for fabbione
kevin approved watchcommits on fence-virt (Fedora devel) for fabbione

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From kevin at fedoraproject.org  Fri Sep 25 16:15:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:15:37 +0000 (UTC)
Subject: rpms/fence-virt - New directory
Message-ID: <20090925161537.18EAD11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fence-virt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSk5078/rpms/fence-virt

Log Message:
Directory /cvs/pkgs/rpms/fence-virt added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:15:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:15:37 +0000 (UTC)
Subject: rpms/fence-virt/devel - New directory
Message-ID: <20090925161537.412E011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fence-virt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSk5078/rpms/fence-virt/devel

Log Message:
Directory /cvs/pkgs/rpms/fence-virt/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:15:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:15:43 +0000 (UTC)
Subject: rpms/fence-virt Makefile,NONE,1.1
Message-ID: <20090925161543.98CE511C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fence-virt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSk5078/rpms/fence-virt

Added Files:
	Makefile 
Log Message:
Setup of module fence-virt


--- NEW FILE Makefile ---
# Top level Makefile for module fence-virt
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  Fri Sep 25 16:15:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:15:43 +0000 (UTC)
Subject: rpms/fence-virt/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925161543.D2CB011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fence-virt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSk5078/rpms/fence-virt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fence-virt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fence-virt
# $Id: Makefile,v 1.1 2009/09/25 16:15:43 kevin Exp $
NAME := fence-virt
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 dwalsh at fedoraproject.org  Fri Sep 25 16:18:03 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 25 Sep 2009 16:18:03 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.126,
	1.127 setroubleshoot.spec, 1.166, 1.167 sources, 1.139, 1.140
Message-ID: <20090925161803.134D311C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6122

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.32-1
- Fix browser bug handling



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- .cvsignore	25 Sep 2009 14:13:11 -0000	1.126
+++ .cvsignore	25 Sep 2009 16:18:02 -0000	1.127
@@ -43,3 +43,4 @@ setroubleshoot-2.2.27.tar.gz
 setroubleshoot-2.2.28.tar.gz
 setroubleshoot-2.2.30.tar.gz
 setroubleshoot-2.2.31.tar.gz
+setroubleshoot-2.2.32.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- setroubleshoot.spec	25 Sep 2009 14:13:12 -0000	1.166
+++ setroubleshoot.spec	25 Sep 2009 16:18:02 -0000	1.167
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.31
+Version: 2.2.32
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.32-1
+- Fix browser bug handling
+
 * Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.31-1
 - Fix translations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- sources	25 Sep 2009 14:13:12 -0000	1.139
+++ sources	25 Sep 2009 16:18:02 -0000	1.140
@@ -1 +1 @@
-2fcae31f2c47d992f900c078579f065c  setroubleshoot-2.2.31.tar.gz
+fac598f35d2071fea3133ed92bb3031d  setroubleshoot-2.2.32.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 16:22:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:22:47 +0000
Subject: [pkgdb] maximus was added for salimma
Message-ID: <20090925162247.9515810F86F@bastion2.fedora.phx.redhat.com>

kevin has added Package maximus with summary A window management tool
kevin has approved Package maximus
kevin has added a Fedora devel branch for maximus with an owner of salimma
kevin has approved maximus in Fedora devel
kevin has approved Package maximus
kevin has set commit to Approved for 107427 on maximus (Fedora devel)
kevin has set checkout to Approved for 107427 on maximus (Fedora devel)
kevin has set build to Approved for 107427 on maximus (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/maximus



From pkgdb at fedoraproject.org  Fri Sep 25 16:22:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:22:48 +0000
Subject: [pkgdb] maximus summary updated by kevin
Message-ID: <20090925162249.72AB810F885@bastion2.fedora.phx.redhat.com>

kevin set package maximus summary to A window management tool

To make changes to this package see:
  /pkgdb/packages/name/maximus



From pkgdb at fedoraproject.org  Fri Sep 25 16:22:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:22:48 +0000
Subject: [pkgdb] maximus (Fedora, 10) updated by kevin
Message-ID: <20090925162249.7D31610F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for maximus
kevin has set commit to Approved for 107427 on maximus (Fedora 10)
kevin has set checkout to Approved for 107427 on maximus (Fedora 10)
kevin has set build to Approved for 107427 on maximus (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/maximus



From pkgdb at fedoraproject.org  Fri Sep 25 16:22:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:22:48 +0000
Subject: [pkgdb] maximus (Fedora, 10) updated by kevin
Message-ID: <20090925162249.8F9C610F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for maximus
kevin has set commit to Approved for 107427 on maximus (Fedora 11)
kevin has set checkout to Approved for 107427 on maximus (Fedora 11)
kevin has set build to Approved for 107427 on maximus (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/maximus



From kevin at fedoraproject.org  Fri Sep 25 16:22:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:22:56 +0000 (UTC)
Subject: rpms/maximus/devel - New directory
Message-ID: <20090925162256.3871C11C0374@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/maximus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCm8107/rpms/maximus/devel

Log Message:
Directory /cvs/pkgs/rpms/maximus/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:22:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:22:56 +0000 (UTC)
Subject: rpms/maximus - New directory
Message-ID: <20090925162256.1500311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/maximus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCm8107/rpms/maximus

Log Message:
Directory /cvs/pkgs/rpms/maximus added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:23:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:23:03 +0000 (UTC)
Subject: rpms/maximus Makefile,NONE,1.1
Message-ID: <20090925162303.5227911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/maximus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCm8107/rpms/maximus

Added Files:
	Makefile 
Log Message:
Setup of module maximus


--- NEW FILE Makefile ---
# Top level Makefile for module maximus
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  Fri Sep 25 16:23:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:23:03 +0000 (UTC)
Subject: rpms/maximus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090925162303.B9A1D11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/maximus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCm8107/rpms/maximus/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maximus


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maximus
# $Id: Makefile,v 1.1 2009/09/25 16:23:03 kevin Exp $
NAME := maximus
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 Sep 25 16:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:25:12 +0000
Subject: [pkgdb] xfce4-xfswitch-plugin was added for cwickert
Message-ID: <20090925162514.0E9CB10F884@bastion2.fedora.phx.redhat.com>

kevin has added Package xfce4-xfswitch-plugin with summary User switching plugin for the Xfce4 Panel
kevin has approved Package xfce4-xfswitch-plugin
kevin has added a Fedora devel branch for xfce4-xfswitch-plugin with an owner of cwickert
kevin has approved xfce4-xfswitch-plugin in Fedora devel
kevin has approved Package xfce4-xfswitch-plugin
kevin has set commit to Approved for 107427 on xfce4-xfswitch-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on xfce4-xfswitch-plugin (Fedora devel)
kevin has set build to Approved for 107427 on xfce4-xfswitch-plugin (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-xfswitch-plugin



From pkgdb at fedoraproject.org  Fri Sep 25 16:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:25:15 +0000
Subject: [pkgdb] xfce4-xfswitch-plugin summary updated by kevin
Message-ID: <20090925162515.6F5FF10F890@bastion2.fedora.phx.redhat.com>

kevin set package xfce4-xfswitch-plugin summary to User switching plugin for the Xfce4 Panel

To make changes to this package see:
  /pkgdb/packages/name/xfce4-xfswitch-plugin



From pkgdb at fedoraproject.org  Fri Sep 25 16:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:25:15 +0000
Subject: [pkgdb] xfce4-xfswitch-plugin (Fedora, 10) updated by kevin
Message-ID: <20090925162515.7B81D10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xfce4-xfswitch-plugin
kevin has set commit to Approved for 107427 on xfce4-xfswitch-plugin (Fedora 10)
kevin has set checkout to Approved for 107427 on xfce4-xfswitch-plugin (Fedora 10)
kevin has set build to Approved for 107427 on xfce4-xfswitch-plugin (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-xfswitch-plugin



From pkgdb at fedoraproject.org  Fri Sep 25 16:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:25:15 +0000
Subject: [pkgdb] xfce4-xfswitch-plugin (Fedora, 10) updated by kevin
Message-ID: <20090925162515.860A310F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for xfce4-xfswitch-plugin
kevin has set commit to Approved for 107427 on xfce4-xfswitch-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on xfce4-xfswitch-plugin (Fedora 11)
kevin has set build to Approved for 107427 on xfce4-xfswitch-plugin (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-xfswitch-plugin



From kevin at fedoraproject.org  Fri Sep 25 16:25:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:25:23 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin - New directory
Message-ID: <20090925162523.1959611C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszh8936/rpms/xfce4-xfswitch-plugin

Log Message:
Directory /cvs/pkgs/rpms/xfce4-xfswitch-plugin added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:25:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:25:23 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin/devel - New directory
Message-ID: <20090925162523.401DD11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszh8936/rpms/xfce4-xfswitch-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/xfce4-xfswitch-plugin/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:25:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:25:29 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin Makefile,NONE,1.1
Message-ID: <20090925162529.DEE6211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszh8936/rpms/xfce4-xfswitch-plugin

Added Files:
	Makefile 
Log Message:
Setup of module xfce4-xfswitch-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-xfswitch-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  Fri Sep 25 16:25:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:25:30 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090925162530.4530E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszh8936/rpms/xfce4-xfswitch-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-xfswitch-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xfce4-xfswitch-plugin
# $Id: Makefile,v 1.1 2009/09/25 16:25:30 kevin Exp $
NAME := xfce4-xfswitch-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  Fri Sep 25 16:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:25:58 +0000
Subject: [pkgdb] xml-writer was added for red
Message-ID: <20090925162559.C1C5710F897@bastion2.fedora.phx.redhat.com>

kevin has added Package xml-writer with summary Java filter class designed to work with SAX2
kevin has approved Package xml-writer
kevin has added a Fedora devel branch for xml-writer with an owner of red
kevin has approved xml-writer in Fedora devel
kevin has approved Package xml-writer
kevin has set commit to Approved for 107427 on xml-writer (Fedora devel)
kevin has set checkout to Approved for 107427 on xml-writer (Fedora devel)
kevin has set build to Approved for 107427 on xml-writer (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/xml-writer



From pkgdb at fedoraproject.org  Fri Sep 25 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:26:00 +0000
Subject: [pkgdb] xml-writer summary updated by kevin
Message-ID: <20090925162600.D25E310F89A@bastion2.fedora.phx.redhat.com>

kevin set package xml-writer summary to Java filter class designed to work with SAX2

To make changes to this package see:
  /pkgdb/packages/name/xml-writer



From pkgdb at fedoraproject.org  Fri Sep 25 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:26:00 +0000
Subject: [pkgdb] xml-writer (Fedora, 10) updated by kevin
Message-ID: <20090925162600.DAAD310F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xml-writer
kevin has set commit to Approved for 107427 on xml-writer (Fedora 10)
kevin has set checkout to Approved for 107427 on xml-writer (Fedora 10)
kevin has set build to Approved for 107427 on xml-writer (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/xml-writer



From pkgdb at fedoraproject.org  Fri Sep 25 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:26:00 +0000
Subject: [pkgdb] xml-writer (Fedora, 10) updated by kevin
Message-ID: <20090925162600.E593910F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for xml-writer
kevin has set commit to Approved for 107427 on xml-writer (Fedora 11)
kevin has set checkout to Approved for 107427 on xml-writer (Fedora 11)
kevin has set build to Approved for 107427 on xml-writer (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/xml-writer



From kevin at fedoraproject.org  Fri Sep 25 16:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:26:09 +0000 (UTC)
Subject: rpms/xml-writer - New directory
Message-ID: <20090925162609.2B57911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xml-writer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWT9272/rpms/xml-writer

Log Message:
Directory /cvs/pkgs/rpms/xml-writer added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:26:09 +0000 (UTC)
Subject: rpms/xml-writer/devel - New directory
Message-ID: <20090925162609.45B7911C00EB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xml-writer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWT9272/rpms/xml-writer/devel

Log Message:
Directory /cvs/pkgs/rpms/xml-writer/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:26:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:26:15 +0000 (UTC)
Subject: rpms/xml-writer Makefile,NONE,1.1
Message-ID: <20090925162615.861FB11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xml-writer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWT9272/rpms/xml-writer

Added Files:
	Makefile 
Log Message:
Setup of module xml-writer


--- NEW FILE Makefile ---
# Top level Makefile for module xml-writer
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  Fri Sep 25 16:26:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:26:15 +0000 (UTC)
Subject: rpms/xml-writer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925162615.D385411C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xml-writer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWT9272/rpms/xml-writer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xml-writer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xml-writer
# $Id: Makefile,v 1.1 2009/09/25 16:26:15 kevin Exp $
NAME := xml-writer
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 Sep 25 16:28:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:28:06 +0000
Subject: [pkgdb] gnustep-base was added for s4504kr
Message-ID: <20090925162806.DDBE210F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package gnustep-base with summary GNUstep Base library package
kevin has approved Package gnustep-base
kevin has added a Fedora devel branch for gnustep-base with an owner of s4504kr
kevin has approved gnustep-base in Fedora devel
kevin has approved Package gnustep-base
kevin has set commit to Approved for 107427 on gnustep-base (Fedora devel)
kevin has set checkout to Approved for 107427 on gnustep-base (Fedora devel)
kevin has set build to Approved for 107427 on gnustep-base (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-base



From pkgdb at fedoraproject.org  Fri Sep 25 16:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:28:08 +0000
Subject: [pkgdb] gnustep-base summary updated by kevin
Message-ID: <20090925162808.8DE6F10F88A@bastion2.fedora.phx.redhat.com>

kevin set package gnustep-base summary to GNUstep Base library package

To make changes to this package see:
  /pkgdb/packages/name/gnustep-base



From pkgdb at fedoraproject.org  Fri Sep 25 16:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:28:08 +0000
Subject: [pkgdb] gnustep-base (Fedora, 10) updated by kevin
Message-ID: <20090925162808.B0F8910F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gnustep-base
kevin has set commit to Approved for 107427 on gnustep-base (Fedora 10)
kevin has set checkout to Approved for 107427 on gnustep-base (Fedora 10)
kevin has set build to Approved for 107427 on gnustep-base (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-base



From pkgdb at fedoraproject.org  Fri Sep 25 16:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:28:08 +0000
Subject: [pkgdb] gnustep-base (Fedora, 10) updated by kevin
Message-ID: <20090925162808.C7B9510F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gnustep-base
kevin has set commit to Approved for 107427 on gnustep-base (Fedora 11)
kevin has set checkout to Approved for 107427 on gnustep-base (Fedora 11)
kevin has set build to Approved for 107427 on gnustep-base (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-base



From kevin at fedoraproject.org  Fri Sep 25 16:28:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:28:16 +0000 (UTC)
Subject: rpms/gnustep-base - New directory
Message-ID: <20090925162816.1B74611C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-base
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10035/rpms/gnustep-base

Log Message:
Directory /cvs/pkgs/rpms/gnustep-base added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:28:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:28:16 +0000 (UTC)
Subject: rpms/gnustep-base/devel - New directory
Message-ID: <20090925162816.4281111C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-base/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10035/rpms/gnustep-base/devel

Log Message:
Directory /cvs/pkgs/rpms/gnustep-base/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:28:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:28:22 +0000 (UTC)
Subject: rpms/gnustep-base Makefile,NONE,1.1
Message-ID: <20090925162822.B790411C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-base
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10035/rpms/gnustep-base

Added Files:
	Makefile 
Log Message:
Setup of module gnustep-base


--- NEW FILE Makefile ---
# Top level Makefile for module gnustep-base
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  Fri Sep 25 16:28:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:28:22 +0000 (UTC)
Subject: rpms/gnustep-base/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925162822.F0F8211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-base/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI10035/rpms/gnustep-base/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnustep-base


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnustep-base
# $Id: Makefile,v 1.1 2009/09/25 16:28:22 kevin Exp $
NAME := gnustep-base
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 Sep 25 16:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:29:48 +0000
Subject: [pkgdb] webkitkde was added for nucleo
Message-ID: <20090925162948.5A95D10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package webkitkde with summary QtWebKit bindings to KDE
kevin has approved Package webkitkde
kevin has added a Fedora devel branch for webkitkde with an owner of nucleo
kevin has approved webkitkde in Fedora devel
kevin has approved Package webkitkde
kevin has set commit to Approved for 107427 on webkitkde (Fedora devel)
kevin has set checkout to Approved for 107427 on webkitkde (Fedora devel)
kevin has set build to Approved for 107427 on webkitkde (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/webkitkde



From pkgdb at fedoraproject.org  Fri Sep 25 16:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:29:50 +0000
Subject: [pkgdb] webkitkde summary updated by kevin
Message-ID: <20090925162951.0A59B10F88A@bastion2.fedora.phx.redhat.com>

kevin set package webkitkde summary to QtWebKit bindings to KDE

To make changes to this package see:
  /pkgdb/packages/name/webkitkde



From pkgdb at fedoraproject.org  Fri Sep 25 16:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:29:50 +0000
Subject: [pkgdb] webkitkde (Fedora, 10) updated by kevin
Message-ID: <20090925162951.1167310F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for webkitkde
kevin has set commit to Approved for 107427 on webkitkde (Fedora 10)
kevin has set checkout to Approved for 107427 on webkitkde (Fedora 10)
kevin has set build to Approved for 107427 on webkitkde (Fedora 10)
kevin approved watchbugzilla on webkitkde (Fedora 10) for rdieter
kevin approved watchcommits on webkitkde (Fedora 10) for rdieter
kevin approved commit on webkitkde (Fedora 10) for rdieter
kevin approved build on webkitkde (Fedora 10) for rdieter
kevin approved approveacls on webkitkde (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/webkitkde



From pkgdb at fedoraproject.org  Fri Sep 25 16:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:29:50 +0000
Subject: [pkgdb] webkitkde (Fedora, 10) updated by kevin
Message-ID: <20090925162951.1F2E910F8A1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on webkitkde (Fedora devel) for rdieter
kevin approved watchcommits on webkitkde (Fedora devel) for rdieter
kevin approved commit on webkitkde (Fedora devel) for rdieter
kevin approved build on webkitkde (Fedora devel) for rdieter
kevin approved approveacls on webkitkde (Fedora devel) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/webkitkde



From pkgdb at fedoraproject.org  Fri Sep 25 16:29:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:29:51 +0000
Subject: [pkgdb] webkitkde (Fedora, 10) updated by kevin
Message-ID: <20090925162951.CDEA910F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for webkitkde
kevin has set commit to Approved for 107427 on webkitkde (Fedora 11)
kevin has set checkout to Approved for 107427 on webkitkde (Fedora 11)
kevin has set build to Approved for 107427 on webkitkde (Fedora 11)
kevin approved watchbugzilla on webkitkde (Fedora 11) for rdieter
kevin approved watchcommits on webkitkde (Fedora 11) for rdieter
kevin approved commit on webkitkde (Fedora 11) for rdieter
kevin approved build on webkitkde (Fedora 11) for rdieter
kevin approved approveacls on webkitkde (Fedora 11) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/webkitkde



From kevin at fedoraproject.org  Fri Sep 25 16:29:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:29:57 +0000 (UTC)
Subject: rpms/webkitkde - New directory
Message-ID: <20090925162957.1583911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitkde
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU10576/rpms/webkitkde

Log Message:
Directory /cvs/pkgs/rpms/webkitkde added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:29:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:29:57 +0000 (UTC)
Subject: rpms/webkitkde/devel - New directory
Message-ID: <20090925162957.36C6211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU10576/rpms/webkitkde/devel

Log Message:
Directory /cvs/pkgs/rpms/webkitkde/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:30:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:30:04 +0000 (UTC)
Subject: rpms/webkitkde Makefile,NONE,1.1
Message-ID: <20090925163004.29B3711C0423@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitkde
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU10576/rpms/webkitkde

Added Files:
	Makefile 
Log Message:
Setup of module webkitkde


--- NEW FILE Makefile ---
# Top level Makefile for module webkitkde
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  Fri Sep 25 16:30:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:30:04 +0000 (UTC)
Subject: rpms/webkitkde/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925163004.5A89B11C0423@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU10576/rpms/webkitkde/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module webkitkde


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: webkitkde
# $Id: Makefile,v 1.1 2009/09/25 16:30:04 kevin Exp $
NAME := webkitkde
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 Sep 25 16:30:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:30:31 +0000
Subject: [pkgdb] php-doctrine-Doctrine was added for cdamian
Message-ID: <20090925163031.E7BAC10F8A3@bastion2.fedora.phx.redhat.com>

kevin has added Package php-doctrine-Doctrine with summary PHP Object Relational Mapper
kevin has approved Package php-doctrine-Doctrine
kevin has added a Fedora devel branch for php-doctrine-Doctrine with an owner of cdamian
kevin has approved php-doctrine-Doctrine in Fedora devel
kevin has approved Package php-doctrine-Doctrine
kevin has set commit to Approved for 107427 on php-doctrine-Doctrine (Fedora devel)
kevin has set checkout to Approved for 107427 on php-doctrine-Doctrine (Fedora devel)
kevin has set build to Approved for 107427 on php-doctrine-Doctrine (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/php-doctrine-Doctrine



From pkgdb at fedoraproject.org  Fri Sep 25 16:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:30:36 +0000
Subject: [pkgdb] php-doctrine-Doctrine summary updated by kevin
Message-ID: <20090925163036.5D62A10F8A6@bastion2.fedora.phx.redhat.com>

kevin set package php-doctrine-Doctrine summary to PHP Object Relational Mapper

To make changes to this package see:
  /pkgdb/packages/name/php-doctrine-Doctrine



From pkgdb at fedoraproject.org  Fri Sep 25 16:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:30:36 +0000
Subject: [pkgdb] php-doctrine-Doctrine (Fedora, 11) updated by kevin
Message-ID: <20090925163036.64A0110F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-doctrine-Doctrine
kevin has set commit to Approved for 107427 on php-doctrine-Doctrine (Fedora 11)
kevin has set checkout to Approved for 107427 on php-doctrine-Doctrine (Fedora 11)
kevin has set build to Approved for 107427 on php-doctrine-Doctrine (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/php-doctrine-Doctrine



From kevin at fedoraproject.org  Fri Sep 25 16:30:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:30:43 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine - New directory
Message-ID: <20090925163043.1BAF811C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10890/rpms/php-doctrine-Doctrine

Log Message:
Directory /cvs/pkgs/rpms/php-doctrine-Doctrine added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:30:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:30:43 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/devel - New directory
Message-ID: <20090925163043.4C5A811C0416@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10890/rpms/php-doctrine-Doctrine/devel

Log Message:
Directory /cvs/pkgs/rpms/php-doctrine-Doctrine/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:30:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:30:49 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine Makefile,NONE,1.1
Message-ID: <20090925163049.B00FE11C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10890/rpms/php-doctrine-Doctrine

Added Files:
	Makefile 
Log Message:
Setup of module php-doctrine-Doctrine


--- NEW FILE Makefile ---
# Top level Makefile for module php-doctrine-Doctrine
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  Fri Sep 25 16:30:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:30:50 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090925163050.346BE11C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10890/rpms/php-doctrine-Doctrine/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-doctrine-Doctrine


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-doctrine-Doctrine
# $Id: Makefile,v 1.1 2009/09/25 16:30:49 kevin Exp $
NAME := php-doctrine-Doctrine
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 Sep 25 16:32:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:32:28 +0000
Subject: [pkgdb] python-assets was added for jderose
Message-ID: <20090925163229.D903910F897@bastion2.fedora.phx.redhat.com>

kevin has added Package python-assets with summary Cache-friendly asset management via content-hash-naming
kevin has approved Package python-assets
kevin has added a Fedora devel branch for python-assets with an owner of jderose
kevin has approved python-assets in Fedora devel
kevin has approved Package python-assets
kevin has set commit to Approved for 107427 on python-assets (Fedora devel)
kevin has set checkout to Approved for 107427 on python-assets (Fedora devel)
kevin has set build to Approved for 107427 on python-assets (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-assets



From pkgdb at fedoraproject.org  Fri Sep 25 16:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:32:31 +0000
Subject: [pkgdb] python-assets summary updated by kevin
Message-ID: <20090925163231.A81CB10F89B@bastion2.fedora.phx.redhat.com>

kevin set package python-assets summary to Cache-friendly asset management via content-hash-naming

To make changes to this package see:
  /pkgdb/packages/name/python-assets



From pkgdb at fedoraproject.org  Fri Sep 25 16:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:32:31 +0000
Subject: [pkgdb] python-assets (Fedora, 12) updated by kevin
Message-ID: <20090925163231.B211410F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-assets
kevin has set commit to Approved for 107427 on python-assets (Fedora 12)
kevin has set checkout to Approved for 107427 on python-assets (Fedora 12)
kevin has set build to Approved for 107427 on python-assets (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-assets



From kevin at fedoraproject.org  Fri Sep 25 16:32:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:32:40 +0000 (UTC)
Subject: rpms/python-assets/devel - New directory
Message-ID: <20090925163240.3C02C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-assets/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11581/rpms/python-assets/devel

Log Message:
Directory /cvs/pkgs/rpms/python-assets/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:32:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:32:40 +0000 (UTC)
Subject: rpms/python-assets - New directory
Message-ID: <20090925163240.1818E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-assets
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11581/rpms/python-assets

Log Message:
Directory /cvs/pkgs/rpms/python-assets added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:32:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:32:46 +0000 (UTC)
Subject: rpms/python-assets Makefile,NONE,1.1
Message-ID: <20090925163246.B7DA711C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-assets
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11581/rpms/python-assets

Added Files:
	Makefile 
Log Message:
Setup of module python-assets


--- NEW FILE Makefile ---
# Top level Makefile for module python-assets
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  Fri Sep 25 16:32:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:32:47 +0000 (UTC)
Subject: rpms/python-assets/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925163247.027CC11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-assets/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11581/rpms/python-assets/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-assets


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-assets
# $Id: Makefile,v 1.1 2009/09/25 16:32:46 kevin Exp $
NAME := python-assets
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 Sep 25 16:33:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:33:16 +0000
Subject: [pkgdb] python-wehjit was added for jderose
Message-ID: <20090925163316.7DC7F10F86F@bastion2.fedora.phx.redhat.com>

kevin has added Package python-wehjit with summary A Python web-widget library
kevin has approved Package python-wehjit
kevin has added a Fedora devel branch for python-wehjit with an owner of jderose
kevin has approved python-wehjit in Fedora devel
kevin has approved Package python-wehjit
kevin has set commit to Approved for 107427 on python-wehjit (Fedora devel)
kevin has set checkout to Approved for 107427 on python-wehjit (Fedora devel)
kevin has set build to Approved for 107427 on python-wehjit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-wehjit



From pkgdb at fedoraproject.org  Fri Sep 25 16:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:33:17 +0000
Subject: [pkgdb] python-wehjit summary updated by kevin
Message-ID: <20090925163317.CED8110F890@bastion2.fedora.phx.redhat.com>

kevin set package python-wehjit summary to A Python web-widget library

To make changes to this package see:
  /pkgdb/packages/name/python-wehjit



From pkgdb at fedoraproject.org  Fri Sep 25 16:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:33:17 +0000
Subject: [pkgdb] python-wehjit (Fedora, 12) updated by kevin
Message-ID: <20090925163317.DF16A10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-wehjit
kevin has set commit to Approved for 107427 on python-wehjit (Fedora 12)
kevin has set checkout to Approved for 107427 on python-wehjit (Fedora 12)
kevin has set build to Approved for 107427 on python-wehjit (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-wehjit



From kevin at fedoraproject.org  Fri Sep 25 16:33:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:33:25 +0000 (UTC)
Subject: rpms/python-wehjit - New directory
Message-ID: <20090925163325.1B0EB11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wehjit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11860/rpms/python-wehjit

Log Message:
Directory /cvs/pkgs/rpms/python-wehjit added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:33:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:33:25 +0000 (UTC)
Subject: rpms/python-wehjit/devel - New directory
Message-ID: <20090925163325.3B1B311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wehjit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11860/rpms/python-wehjit/devel

Log Message:
Directory /cvs/pkgs/rpms/python-wehjit/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:33:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:33:31 +0000 (UTC)
Subject: rpms/python-wehjit Makefile,NONE,1.1
Message-ID: <20090925163331.C3F7D11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wehjit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11860/rpms/python-wehjit

Added Files:
	Makefile 
Log Message:
Setup of module python-wehjit


--- NEW FILE Makefile ---
# Top level Makefile for module python-wehjit
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  Fri Sep 25 16:33:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:33:32 +0000 (UTC)
Subject: rpms/python-wehjit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090925163332.0CC5011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wehjit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11860/rpms/python-wehjit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-wehjit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-wehjit
# $Id: Makefile,v 1.1 2009/09/25 16:33:31 kevin Exp $
NAME := python-wehjit
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 Sep 25 16:34:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:39 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext was added for rlandmann
Message-ID: <20090925163439.3E2A310F884@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Locale-Maketext-Gettext with summary Joins the gettext and Maketext frameworks
kevin has approved Package perl-Locale-Maketext-Gettext
kevin has added a Fedora devel branch for perl-Locale-Maketext-Gettext with an owner of rlandmann
kevin has approved perl-Locale-Maketext-Gettext in Fedora devel
kevin has approved Package perl-Locale-Maketext-Gettext
kevin has set commit to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora devel)
kevin has set build to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext summary updated by kevin
Message-ID: <20090925163441.8356D10F844@bastion2.fedora.phx.redhat.com>

kevin set package perl-Locale-Maketext-Gettext summary to Joins the gettext and Maketext frameworks

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext (Fedora EPEL,
	4) updated by kevin
Message-ID: <20090925163441.9165910F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Locale-Maketext-Gettext
kevin has set commit to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 10)
kevin has set build to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 10)
kevin approved watchbugzilla on perl-Locale-Maketext-Gettext (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Locale-Maketext-Gettext (Fedora 10) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext (Fedora EPEL,
	4) updated by kevin
Message-ID: <20090925163441.B737C10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Locale-Maketext-Gettext
kevin has set commit to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 11)
kevin has set build to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 11)
kevin approved watchbugzilla on perl-Locale-Maketext-Gettext (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Locale-Maketext-Gettext (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext (Fedora EPEL,
	4) updated by kevin
Message-ID: <20090925163441.BA76B10F8A2@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Locale-Maketext-Gettext (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Locale-Maketext-Gettext (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext (Fedora EPEL,
	4) updated by kevin
Message-ID: <20090925163441.C329110F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Locale-Maketext-Gettext
kevin has set commit to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora EPEL 5)
kevin approved watchbugzilla on perl-Locale-Maketext-Gettext (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Locale-Maketext-Gettext (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext (Fedora EPEL,
	4) updated by kevin
Message-ID: <20090925163441.C61C210F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Locale-Maketext-Gettext
kevin has set commit to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 12)
kevin has set build to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora 12)
kevin approved watchbugzilla on perl-Locale-Maketext-Gettext (Fedora 12) for perl-sig
kevin approved watchcommits on perl-Locale-Maketext-Gettext (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From pkgdb at fedoraproject.org  Fri Sep 25 16:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:34:41 +0000
Subject: [pkgdb] perl-Locale-Maketext-Gettext (Fedora EPEL,
	4) updated by kevin
Message-ID: <20090925163441.DE83510F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-Locale-Maketext-Gettext
kevin has set commit to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora EPEL 4)
kevin has set build to Approved for 107427 on perl-Locale-Maketext-Gettext (Fedora EPEL 4)
kevin approved watchbugzilla on perl-Locale-Maketext-Gettext (Fedora EPEL 4) for perl-sig
kevin approved watchcommits on perl-Locale-Maketext-Gettext (Fedora EPEL 4) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Locale-Maketext-Gettext



From kevin at fedoraproject.org  Fri Sep 25 16:34:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:34:49 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext - New directory
Message-ID: <20090925163449.282D311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP12300/rpms/perl-Locale-Maketext-Gettext

Log Message:
Directory /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:34:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:34:49 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/devel - New directory
Message-ID: <20090925163449.5E96011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP12300/rpms/perl-Locale-Maketext-Gettext/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel added to the repository




From kevin at fedoraproject.org  Fri Sep 25 16:34:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:34:55 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext Makefile,NONE,1.1
Message-ID: <20090925163455.D5E4211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP12300/rpms/perl-Locale-Maketext-Gettext

Added Files:
	Makefile 
Log Message:
Setup of module perl-Locale-Maketext-Gettext


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Locale-Maketext-Gettext
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  Fri Sep 25 16:34:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 25 Sep 2009 16:34:56 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090925163456.1C56D11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP12300/rpms/perl-Locale-Maketext-Gettext/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Locale-Maketext-Gettext


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Locale-Maketext-Gettext
# $Id: Makefile,v 1.1 2009/09/25 16:34:55 kevin Exp $
NAME := perl-Locale-Maketext-Gettext
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 Sep 25 16:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:35:43 +0000
Subject: [pkgdb] rlog (Fedora EPEL, 4) updated by kevin
Message-ID: <20090925163543.CBA0F10F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for rlog
kevin has set commit to Approved for 107427 on rlog (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on rlog (Fedora EPEL 4)
kevin has set build to Approved for 107427 on rlog (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/rlog



From pkgdb at fedoraproject.org  Fri Sep 25 16:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:35:43 +0000
Subject: [pkgdb] rlog (Fedora EPEL, 4) updated by kevin
Message-ID: <20090925163543.DF51B10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rlog
kevin has set commit to Approved for 107427 on rlog (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rlog (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rlog (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/rlog



From pkgdb at fedoraproject.org  Fri Sep 25 16:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:37:37 +0000
Subject: [pkgdb] cim-schema F-12 cloned from devel
Message-ID: <20090925163738.DAAA810F86F@bastion2.fedora.phx.redhat.com>

kevin cloned cim-schema F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/cim-schema



From pkgdb at fedoraproject.org  Fri Sep 25 16:38:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:38:07 +0000
Subject: [pkgdb] openwsman F-12 cloned from devel
Message-ID: <20090925163807.D73B310F87C@bastion2.fedora.phx.redhat.com>

kevin cloned openwsman F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/openwsman



From pkgdb at fedoraproject.org  Fri Sep 25 16:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:39:14 +0000
Subject: [pkgdb] fuse-sshfs (Fedora EPEL, 5) updated by kevin
Message-ID: <20090925163914.C02C610F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for fuse-sshfs
kevin has set commit to Approved for 107427 on fuse-sshfs (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on fuse-sshfs (Fedora EPEL 5)
kevin has set build to Approved for 107427 on fuse-sshfs (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/fuse-sshfs



From pkgdb at fedoraproject.org  Fri Sep 25 16:39:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:39:40 +0000
Subject: [pkgdb] fuse-encfs (Fedora EPEL, 5) updated by kevin
Message-ID: <20090925163940.8134210F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for fuse-encfs
kevin has set commit to Approved for 107427 on fuse-encfs (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on fuse-encfs (Fedora EPEL 5)
kevin has set build to Approved for 107427 on fuse-encfs (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/fuse-encfs



From pkgdb at fedoraproject.org  Fri Sep 25 16:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 16:41:13 +0000
Subject: [pkgdb] libwpg (Fedora EPEL, 5) updated by kevin
Message-ID: <20090925164113.C44ED10F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libwpg
kevin has set commit to Approved for 107427 on libwpg (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on libwpg (Fedora EPEL 5)
kevin has set build to Approved for 107427 on libwpg (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/libwpg



From nucleo at fedoraproject.org  Fri Sep 25 16:43:18 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri, 25 Sep 2009 16:43:18 +0000 (UTC)
Subject: rpms/webkitkde/devel import.log, NONE, 1.1 webkitkde.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925164318.33A4011C00E8@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14583/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log webkitkde.spec 
Log Message:

Initial import webkitkde



--- NEW FILE import.log ---
webkitkde-0_0_1-0_1_20090924svn_fc11:HEAD:webkitkde-0.0.1-0.1.20090924svn.fc11.src.rpm:1253896781


--- NEW FILE webkitkde.spec ---
Name:             webkitkde
Version:          0.0.1
Release:          0.1.20090924svn%{?dist}
Summary:          QtWebKit bindings to KDE
Group:            System Environment/Libraries
License:          LGPLv2+
URL:              http://techbase.kde.org/Projects/WebKit

# To create a tarball from svn use create_tarball.rb script
#
# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/
#
# To use it you will need the script itself and a config.ini in the same directory
# config.ini contents:
#
# [webkitkde]
# mainmodule   = playground
# submodule    = libs
# kde_release  = no
# version      = 0.0.1-svn
# docs         = no
#
# To create a new checkout use it with anonymous svn access
# ./create_tarball.rb -n -a webkitkde
# svn revision 1027811
Source0:          %{name}-%{version}-svn.tar.bz2
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    cmake gettext
BuildRequires:    kdelibs4-devel

%description
This project aims to integrate WebKit (QtWebKit) into KDE.
The project is made up of the following components:
- WebKitKDE: The binding between KDE and QtWebKit
- WebKitPart: A KPart based on it
The WebKitKDE library sits on top of QtWebKit, providing
KDE integration (for example, WebActions using KDE icons
and shortcuts, downloading using KIO, etc).
%package devel
Summary:          Development files for %{name}
Group:            Development/Libraries
Requires:         kdelibs4-devel
Requires:         %{name} = %{version}-%{release}

%description devel
Development files for the %{name}.

%package -n webkitpart
Summary:          A KPart based on WebKitKDE library
Group:            System Environment/Libraries
%description -n webkitpart
WebKitPart is a KPart that allows KPart-based applications,
for example Konqueror, to make use of WebKit for viewing
web pages.

%package -n webkitpart-devel
Summary:          Development files for webkitpart
Group:            Development/Libraries
Requires:         %{name}-devel = %{version}-%{release}
Requires:         webkitpart = %{version}-%{release}
%description -n webkitpart-devel
Development files for the webkitpart.

%prep
%setup -q -n %{name}-%{version}-svn

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT

make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post -n webkitpart
/sbin/ldconfig
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%posttrans -n webkitpart
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%postun -n webkitpart
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING.LIB
%{_kde4_libdir}/libkdewebkit.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_kde4_includedir}/KDE/KdeWebKit
%{_kde4_includedir}/kdewebkit
%{_kde4_libdir}/libkdewebkit.so
%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake

%files -n webkitpart
%defattr(-,root,root,-)
%doc README COPYING.LIB
%{_kde4_libdir}/kde4/webkitkdepart.so
%{_kde4_libdir}/libwebkitkde.so.*
%{_kde4_iconsdir}/hicolor/*/apps/webkit.png
%{_kde4_appsdir}/webkitpart
%{_kde4_datadir}/kde4/services/webkitpart.desktop

%files -n webkitpart-devel
%defattr(-,root,root,-)
%doc README
%{_kde4_includedir}/KDE/WebKitPart
%{_kde4_includedir}/webkitkde
%{_kde4_libdir}/libwebkitkde.so
%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake

%changelog
* Thu Sep 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.1.20090924svn
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:30:04 -0000	1.1
+++ .cvsignore	25 Sep 2009 16:43:17 -0000	1.2
@@ -0,0 +1 @@
+webkitkde-0.0.1-svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:30:04 -0000	1.1
+++ sources	25 Sep 2009 16:43:18 -0000	1.2
@@ -0,0 +1 @@
+eccfb5d3f6c973f18b4b55cb01789756  webkitkde-0.0.1-svn.tar.bz2



From nucleo at fedoraproject.org  Fri Sep 25 16:45:41 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri, 25 Sep 2009 16:45:41 +0000 (UTC)
Subject: rpms/webkitkde/F-10 import.log, NONE, 1.1 webkitkde.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925164541.D544211C00E8@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16963/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log webkitkde.spec 
Log Message:

Initial import webkitkde



--- NEW FILE import.log ---
webkitkde-0_0_1-0_1_20090924svn_fc11:F-10:webkitkde-0.0.1-0.1.20090924svn.fc11.src.rpm:1253897070


--- NEW FILE webkitkde.spec ---
Name:             webkitkde
Version:          0.0.1
Release:          0.1.20090924svn%{?dist}
Summary:          QtWebKit bindings to KDE
Group:            System Environment/Libraries
License:          LGPLv2+
URL:              http://techbase.kde.org/Projects/WebKit

# To create a tarball from svn use create_tarball.rb script
#
# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/
#
# To use it you will need the script itself and a config.ini in the same directory
# config.ini contents:
#
# [webkitkde]
# mainmodule   = playground
# submodule    = libs
# kde_release  = no
# version      = 0.0.1-svn
# docs         = no
#
# To create a new checkout use it with anonymous svn access
# ./create_tarball.rb -n -a webkitkde
# svn revision 1027811
Source0:          %{name}-%{version}-svn.tar.bz2
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    cmake gettext
BuildRequires:    kdelibs4-devel

%description
This project aims to integrate WebKit (QtWebKit) into KDE.
The project is made up of the following components:
- WebKitKDE: The binding between KDE and QtWebKit
- WebKitPart: A KPart based on it
The WebKitKDE library sits on top of QtWebKit, providing
KDE integration (for example, WebActions using KDE icons
and shortcuts, downloading using KIO, etc).
%package devel
Summary:          Development files for %{name}
Group:            Development/Libraries
Requires:         kdelibs4-devel
Requires:         %{name} = %{version}-%{release}

%description devel
Development files for the %{name}.

%package -n webkitpart
Summary:          A KPart based on WebKitKDE library
Group:            System Environment/Libraries
%description -n webkitpart
WebKitPart is a KPart that allows KPart-based applications,
for example Konqueror, to make use of WebKit for viewing
web pages.

%package -n webkitpart-devel
Summary:          Development files for webkitpart
Group:            Development/Libraries
Requires:         %{name}-devel = %{version}-%{release}
Requires:         webkitpart = %{version}-%{release}
%description -n webkitpart-devel
Development files for the webkitpart.

%prep
%setup -q -n %{name}-%{version}-svn

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT

make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post -n webkitpart
/sbin/ldconfig
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%posttrans -n webkitpart
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%postun -n webkitpart
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING.LIB
%{_kde4_libdir}/libkdewebkit.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_kde4_includedir}/KDE/KdeWebKit
%{_kde4_includedir}/kdewebkit
%{_kde4_libdir}/libkdewebkit.so
%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake

%files -n webkitpart
%defattr(-,root,root,-)
%doc README COPYING.LIB
%{_kde4_libdir}/kde4/webkitkdepart.so
%{_kde4_libdir}/libwebkitkde.so.*
%{_kde4_iconsdir}/hicolor/*/apps/webkit.png
%{_kde4_appsdir}/webkitpart
%{_kde4_datadir}/kde4/services/webkitpart.desktop

%files -n webkitpart-devel
%defattr(-,root,root,-)
%doc README
%{_kde4_includedir}/KDE/WebKitPart
%{_kde4_includedir}/webkitkde
%{_kde4_libdir}/libwebkitkde.so
%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake

%changelog
* Thu Sep 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.1.20090924svn
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:30:04 -0000	1.1
+++ .cvsignore	25 Sep 2009 16:45:41 -0000	1.2
@@ -0,0 +1 @@
+webkitkde-0.0.1-svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:30:04 -0000	1.1
+++ sources	25 Sep 2009 16:45:41 -0000	1.2
@@ -0,0 +1 @@
+eccfb5d3f6c973f18b4b55cb01789756  webkitkde-0.0.1-svn.tar.bz2



From red at fedoraproject.org  Fri Sep 25 16:48:37 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 25 Sep 2009 16:48:37 +0000 (UTC)
Subject: rpms/xml-writer/devel import.log, NONE, 1.1 xml-writer.patch, NONE, 
	1.1 xml-writer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090925164837.54BEB11C00E8@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/xml-writer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18257/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xml-writer.patch xml-writer.spec 
Log Message:
initial import (#508549)


--- NEW FILE import.log ---
xml-writer-0_2-2_fc11:HEAD:xml-writer-0.2-2.fc11.src.rpm:1253897295

xml-writer.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xml-writer.patch ---
--- build.xml.old	2009-06-28 15:56:41.909700226 +0200
+++ build.xml	2009-06-28 15:56:54.346542177 +0200
@@ -18,7 +18,7 @@
 </target>
 
 <target name="compile" depends="prepare">
- <javac srcdir="src" destdir="classes" filtering="on"/>
+ <javac srcdir="src" destdir="classes"/>
 </target>
 
 <target name="jar" depends="compile">


--- NEW FILE xml-writer.spec ---
Name:           xml-writer
Version:        0.2
Release:        2%{?dist}
Summary:        Java filter class designed to work with SAX2
Group:          Development/Libraries
License:        Public Domain
URL:            http://www.megginson.com/
Source0:        http://www.megginson.com/downloads/xml-writer-0.2.zip
# The filtering attribute is not supported by javac (IcedTea 1.6, at least). Remove it.
Patch0:         xml-writer.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     ant
BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
With this filter one can use it to take a snapshot of
any point in a SAX2 filter chain, as well as serializing the final
result to XML (this may be important for auditing as well).


%package javadoc
Summary:           Javadocs for xml-writer
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description javadoc
xml-writer development documentation.


%prep
%setup -q
%patch0

rm -f xml-writer.jar

%build
ant clean jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog BUGS
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}/
%{_javadocdir}/%{name}


%changelog
* Mon Sep 21 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-2
- fixed issues that were discovered in the review process

* Sun Jun 28 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xml-writer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:26:15 -0000	1.1
+++ .cvsignore	25 Sep 2009 16:48:36 -0000	1.2
@@ -0,0 +1 @@
+xml-writer-0.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xml-writer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:26:15 -0000	1.1
+++ sources	25 Sep 2009 16:48:37 -0000	1.2
@@ -0,0 +1 @@
+067186abed04ffd5b5788ae8edfe035d  xml-writer-0.2.zip



From nucleo at fedoraproject.org  Fri Sep 25 16:49:13 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri, 25 Sep 2009 16:49:13 +0000 (UTC)
Subject: rpms/webkitkde/F-11 import.log, NONE, 1.1 webkitkde.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925164913.8AF1B11C00E8@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18094/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log webkitkde.spec 
Log Message:

Initial import webkitkde



--- NEW FILE import.log ---
webkitkde-0_0_1-0_1_20090924svn_fc11:F-11:webkitkde-0.0.1-0.1.20090924svn.fc11.src.rpm:1253897177


--- NEW FILE webkitkde.spec ---
Name:             webkitkde
Version:          0.0.1
Release:          0.1.20090924svn%{?dist}
Summary:          QtWebKit bindings to KDE
Group:            System Environment/Libraries
License:          LGPLv2+
URL:              http://techbase.kde.org/Projects/WebKit

# To create a tarball from svn use create_tarball.rb script
#
# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/
#
# To use it you will need the script itself and a config.ini in the same directory
# config.ini contents:
#
# [webkitkde]
# mainmodule   = playground
# submodule    = libs
# kde_release  = no
# version      = 0.0.1-svn
# docs         = no
#
# To create a new checkout use it with anonymous svn access
# ./create_tarball.rb -n -a webkitkde
# svn revision 1027811
Source0:          %{name}-%{version}-svn.tar.bz2
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    cmake gettext
BuildRequires:    kdelibs4-devel

%description
This project aims to integrate WebKit (QtWebKit) into KDE.
The project is made up of the following components:
- WebKitKDE: The binding between KDE and QtWebKit
- WebKitPart: A KPart based on it
The WebKitKDE library sits on top of QtWebKit, providing
KDE integration (for example, WebActions using KDE icons
and shortcuts, downloading using KIO, etc).
%package devel
Summary:          Development files for %{name}
Group:            Development/Libraries
Requires:         kdelibs4-devel
Requires:         %{name} = %{version}-%{release}

%description devel
Development files for the %{name}.

%package -n webkitpart
Summary:          A KPart based on WebKitKDE library
Group:            System Environment/Libraries
%description -n webkitpart
WebKitPart is a KPart that allows KPart-based applications,
for example Konqueror, to make use of WebKit for viewing
web pages.

%package -n webkitpart-devel
Summary:          Development files for webkitpart
Group:            Development/Libraries
Requires:         %{name}-devel = %{version}-%{release}
Requires:         webkitpart = %{version}-%{release}
%description -n webkitpart-devel
Development files for the webkitpart.

%prep
%setup -q -n %{name}-%{version}-svn

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT

make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post -n webkitpart
/sbin/ldconfig
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%posttrans -n webkitpart
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%postun -n webkitpart
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING.LIB
%{_kde4_libdir}/libkdewebkit.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_kde4_includedir}/KDE/KdeWebKit
%{_kde4_includedir}/kdewebkit
%{_kde4_libdir}/libkdewebkit.so
%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake

%files -n webkitpart
%defattr(-,root,root,-)
%doc README COPYING.LIB
%{_kde4_libdir}/kde4/webkitkdepart.so
%{_kde4_libdir}/libwebkitkde.so.*
%{_kde4_iconsdir}/hicolor/*/apps/webkit.png
%{_kde4_appsdir}/webkitpart
%{_kde4_datadir}/kde4/services/webkitpart.desktop

%files -n webkitpart-devel
%defattr(-,root,root,-)
%doc README
%{_kde4_includedir}/KDE/WebKitPart
%{_kde4_includedir}/webkitkde
%{_kde4_libdir}/libwebkitkde.so
%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake

%changelog
* Thu Sep 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.1.20090924svn
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:30:04 -0000	1.1
+++ .cvsignore	25 Sep 2009 16:49:13 -0000	1.2
@@ -0,0 +1 @@
+webkitkde-0.0.1-svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:30:04 -0000	1.1
+++ sources	25 Sep 2009 16:49:13 -0000	1.2
@@ -0,0 +1 @@
+eccfb5d3f6c973f18b4b55cb01789756  webkitkde-0.0.1-svn.tar.bz2



From red at fedoraproject.org  Fri Sep 25 16:51:35 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 25 Sep 2009 16:51:35 +0000 (UTC)
Subject: rpms/xml-writer/F-10 xml-writer.patch, NONE, 1.1 xml-writer.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090925165135.40DE711C00E8@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/xml-writer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19052/F-10

Modified Files:
	sources 
Added Files:
	xml-writer.patch xml-writer.spec 
Log Message:
initial import to non-devel



xml-writer.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xml-writer.patch ---
--- build.xml.old	2009-06-28 15:56:41.909700226 +0200
+++ build.xml	2009-06-28 15:56:54.346542177 +0200
@@ -18,7 +18,7 @@
 </target>
 
 <target name="compile" depends="prepare">
- <javac srcdir="src" destdir="classes" filtering="on"/>
+ <javac srcdir="src" destdir="classes"/>
 </target>
 
 <target name="jar" depends="compile">


--- NEW FILE xml-writer.spec ---
Name:           xml-writer
Version:        0.2
Release:        2%{?dist}
Summary:        Java filter class designed to work with SAX2
Group:          Development/Libraries
License:        Public Domain
URL:            http://www.megginson.com/
Source0:        http://www.megginson.com/downloads/xml-writer-0.2.zip
# The filtering attribute is not supported by javac (IcedTea 1.6, at least). Remove it.
Patch0:         xml-writer.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     ant
BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
With this filter one can use it to take a snapshot of
any point in a SAX2 filter chain, as well as serializing the final
result to XML (this may be important for auditing as well).


%package javadoc
Summary:           Javadocs for xml-writer
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description javadoc
xml-writer development documentation.


%prep
%setup -q
%patch0

rm -f xml-writer.jar

%build
ant clean jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog BUGS
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}/
%{_javadocdir}/%{name}


%changelog
* Mon Sep 21 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-2
- fixed issues that were discovered in the review process

* Sun Jun 28 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-1
- initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xml-writer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:26:15 -0000	1.1
+++ sources	25 Sep 2009 16:51:35 -0000	1.2
@@ -0,0 +1 @@
+067186abed04ffd5b5788ae8edfe035d  xml-writer-0.2.zip



From red at fedoraproject.org  Fri Sep 25 16:51:35 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 25 Sep 2009 16:51:35 +0000 (UTC)
Subject: rpms/xml-writer/F-11 xml-writer.patch, NONE, 1.1 xml-writer.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090925165135.7EFD111C00E8@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/xml-writer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19052/F-11

Modified Files:
	sources 
Added Files:
	xml-writer.patch xml-writer.spec 
Log Message:
initial import to non-devel



xml-writer.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xml-writer.patch ---
--- build.xml.old	2009-06-28 15:56:41.909700226 +0200
+++ build.xml	2009-06-28 15:56:54.346542177 +0200
@@ -18,7 +18,7 @@
 </target>
 
 <target name="compile" depends="prepare">
- <javac srcdir="src" destdir="classes" filtering="on"/>
+ <javac srcdir="src" destdir="classes"/>
 </target>
 
 <target name="jar" depends="compile">


--- NEW FILE xml-writer.spec ---
Name:           xml-writer
Version:        0.2
Release:        2%{?dist}
Summary:        Java filter class designed to work with SAX2
Group:          Development/Libraries
License:        Public Domain
URL:            http://www.megginson.com/
Source0:        http://www.megginson.com/downloads/xml-writer-0.2.zip
# The filtering attribute is not supported by javac (IcedTea 1.6, at least). Remove it.
Patch0:         xml-writer.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     ant
BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
With this filter one can use it to take a snapshot of
any point in a SAX2 filter chain, as well as serializing the final
result to XML (this may be important for auditing as well).


%package javadoc
Summary:           Javadocs for xml-writer
Group:             Documentation
Requires:          %{name} = %{version}-%{release}

%description javadoc
xml-writer development documentation.


%prep
%setup -q
%patch0

rm -f xml-writer.jar

%build
ant clean jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog BUGS
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}/
%{_javadocdir}/%{name}


%changelog
* Mon Sep 21 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-2
- fixed issues that were discovered in the review process

* Sun Jun 28 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-1
- initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xml-writer/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:26:15 -0000	1.1
+++ sources	25 Sep 2009 16:51:35 -0000	1.2
@@ -0,0 +1 @@
+067186abed04ffd5b5788ae8edfe035d  xml-writer-0.2.zip



From jpopelka at fedoraproject.org  Fri Sep 25 17:01:58 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 25 Sep 2009 17:01:58 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev-1.0.1-man8.patch, NONE, 1.1 lockdev.8,
	NONE, 1.1 lockdev.spec, 1.31, 1.32
Message-ID: <20090925170158.E36C611C00E8@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23312

Modified Files:
	lockdev.spec 
Added Files:
	lockdev-1.0.1-man8.patch lockdev.8 
Log Message:
* Fri Sep 25 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-16
- Manual page for /usr/sbin/lockdev


lockdev-1.0.1-man8.patch:
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE lockdev-1.0.1-man8.patch ---
diff -up lockdev-1.0.1/Makefile.man8 lockdev-1.0.1/Makefile
--- lockdev-1.0.1/Makefile.man8	2009-09-25 18:36:19.000000000 +0200
+++ lockdev-1.0.1/Makefile	2009-09-25 18:37:00.000000000 +0200
@@ -72,7 +72,9 @@ install_profile:	${static} ${shared}
 
 install_doc:	docs/lockdev.3
 	install -m755 -d	${mandir}/man3
+	install -m755 -d	${mandir}/man8
 	install -m644 docs/lockdev.3	${mandir}/man3
+	install -m644 docs/lockdev.8	${mandir}/man8
 
 install_run:	${shared}
 	install -m755 -d	${libdir}


--- NEW FILE lockdev.8 ---
.\"
.TH LOCKDEV 8 "SEPTEMBER 2009" "" ""
.\"
.\" Man page written by Jiri Popelka <jpopelka AT redhat DOT com>
.\"
.SH NAME
\fBlockdev\fR demonstrates functionality of liblockdev library.

.SH SYNOPSIS
.B /usr/sbin/lockdev
.RB [< operation >]
.RB < device >

.SH DESCRIPTION
The \fBlockdev\fR command can perform one of the following operations:

\fB-l\fR - lock device with \fBdev_lock()\fR function

\fB-u\fR - unlock device with \fBdev_unlock()\fR function

\fBno operation\fR - test lock with \fBdev_testlock()\fR function

.SH RETURN VALUES
   Value  dev_lock         dev_unlock       dev_testlock
   0      OK               OK               not locked
   1      locked other     locked other     locked
   2      EACCES
   3      EROFS
   4      EFAULT
   5      EINVAL
   6      ENAMETOOLONG
   7      ENOENT
   8      ENOTDIR
   9      ENOMEM
  10      ELOOP
  11      EIO
 255      error               error               error

.SH SEE ALSO
.BR lockdev (3).


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- lockdev.spec	25 Jul 2009 11:13:12 -0000	1.31
+++ lockdev.spec	25 Sep 2009 17:01:58 -0000	1.32
@@ -1,11 +1,12 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
-Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
+Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
+Source1: lockdev.8
 
 Patch0: lockdev-1.0.0-rh.patch
 Patch1: lockdev-1.0.0-shared.patch
@@ -17,6 +18,7 @@ Patch6: lockdev-1.0.1-subdir.patch
 Patch7: lockdev-1.0.1-fcntl.patch
 Patch8: lockdev-1.0.1-32bit.patch
 Patch9: lockdev-1.0.1-gccwarn.patch
+Patch10: lockdev-1.0.1-man8.patch
 
 Requires(pre): shadow-utils
 Requires(post): glibc
@@ -25,7 +27,6 @@ PreReq: filesystem >= 2.1.4-1
 
 BuildRequires: perl
 BuildRequires: perl(ExtUtils::MakeMaker)
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -53,12 +54,14 @@ package contains the development headers
 %patch7 -p1 -b .fcntl
 %patch8 -p1 -b .32bit
 %patch9 -p1 -b .warn
+%patch10 -p1 -b .man8
+
+cp %SOURCE1 ./docs
 
 %build
 make "CFLAGS=${RPM_OPT_FLAGS} -fPIC"
 
 %install
-rm -fr $RPM_BUILD_ROOT
 make \
     sbindir=${RPM_BUILD_ROOT}%{_sbindir} \
     libdir=${RPM_BUILD_ROOT}%{_libdir} \
@@ -82,15 +85,19 @@ rm -fr $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %attr(2711,root,lock)	%{_sbindir}/lockdev
 %{_libdir}/*.so.*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_mandir}/man*/*
+%{_mandir}/man3/*
 %{_includedir}/*
 
 %changelog
+* Fri Sep 25 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-16
+- Manual page for /usr/sbin/lockdev
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From harald at fedoraproject.org  Fri Sep 25 17:05:23 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 25 Sep 2009 17:05:23 +0000 (UTC)
Subject: rpms/udev/devel
	0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch,
	NONE, 1.1 0002-udevd-add-timestamp-to-debug-output.patch, NONE,
	1.1 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch, NONE,
	1.1 0004-fix-single-session-CD-detection.patch, NONE,
	1.1 0005-fix-previous-commit-for-CD-detection.patch, NONE,
	1.1 udev.spec, 1.292,
	1.293 udev.git-3bf768245b98479a14190e1e1d32ef5fae3ddf8a.patch, 1.1,
	NONE udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch,
	1.1, NONE
Message-ID: <20090925170523.E284C11C00E8@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25099

Modified Files:
	udev.spec 
Added Files:
	0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch 
	0002-udevd-add-timestamp-to-debug-output.patch 
	0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch 
	0004-fix-single-session-CD-detection.patch 
	0005-fix-previous-commit-for-CD-detection.patch 
Removed Files:
	udev.git-3bf768245b98479a14190e1e1d32ef5fae3ddf8a.patch 
	udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch 
Log Message:
* Fri Sep 25 2009 harald at redhat.com 145-9
- add patches to fix cdrom_id
- add patch to fix the inotify bug (bug #524752)


0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch:
 libudev-enumerate.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 4 deletions(-)

--- NEW FILE 0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch ---
>From 1dc0ee343df6b6e2ce0591ff08a0aeae2aa2196f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 27 Jul 2009 23:24:27 +0200
Subject: [PATCH 1/5] enumeration: move ALSA control devices to the end of the enumerated devices of each card

Generally ALSA control devices should be the last ones to be processed
for ACL changes and similar operations because they can then be used as
indicators that ACL management finished for all device nodes of a
specific card.

This patch simple moves each controlC device behind all the pcmC devices
(and similar).
---
 libudev/libudev-enumerate.c |   59 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/libudev/libudev-enumerate.c b/libudev/libudev-enumerate.c
index db8c514..e372079 100644
--- a/libudev/libudev-enumerate.c
+++ b/libudev/libudev-enumerate.c
@@ -187,7 +187,8 @@ static int syspath_cmp(const void *p1, const void *p2)
 	return ret;
 }
 
-static int devices_delay(struct udev *udev, const char *syspath)
+/* For devices that should be moved to the absolute end of the list */
+static int devices_delay_end(struct udev *udev, const char *syspath)
 {
 	static const char *delay_device_list[] = {
 		"/block/md",
@@ -207,6 +208,32 @@ static int devices_delay(struct udev *udev, const char *syspath)
 	return 0;
 }
 
+/* For devices that should just be moved a little bit later, just
+ * before the point where some common path prefix changes. Returns the
+ * number of characters that make up that common prefix */
+static size_t devices_delay_later(struct udev *udev, const char *syspath)
+{
+	const char *c;
+
+	/* For sound cards the control device must be enumerated last
+	 * to make sure it's the final device node that gets ACLs
+	 * applied. Applications rely on this fact and use ACL changes
+	 * on the control node as an indicator that the ACL change of
+	 * the entire sound card completed. The kernel makes this
+	 * guarantee when creating those devices, and hence we should
+	 * too when enumerating them. */
+
+	if ((c = strstr(syspath, "/sound/card"))) {
+		c += 11;
+		c += strcspn(c, "/");
+
+		if (strncmp(c, "/controlC", 9) == 0)
+			return c - syspath + 1;
+	}
+
+	return 0;
+}
+
 /**
  * udev_enumerate_get_list_entry:
  * @udev_enumerate: context
@@ -220,7 +247,8 @@ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *ude
 	if (!udev_enumerate->devices_uptodate) {
 		unsigned int i;
 		unsigned int max;
-		struct syspath *prev = NULL;
+		struct syspath *prev = NULL, *move_later = NULL;
+		size_t move_later_prefix;
 
 		udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->devices_list);
 		qsort(udev_enumerate->devices, udev_enumerate->devices_cur, sizeof(struct syspath), syspath_cmp);
@@ -237,14 +265,39 @@ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *ude
 			prev = entry;
 
 			/* skip to be delayed devices, and add them to the end of the list */
-			if (devices_delay(udev_enumerate->udev, entry->syspath)) {
+			if (devices_delay_end(udev_enumerate->udev, entry->syspath)) {
 				syspath_add(udev_enumerate, entry->syspath);
 				continue;
 			}
 
+			/* skip to be delayed devices, and move the to
+			 * the point where the prefix changes. We can
+			 * only move one item at a time. */
+			if (!move_later) {
+				move_later_prefix = devices_delay_later(udev_enumerate->udev, entry->syspath);
+
+				if (move_later_prefix > 0) {
+					move_later = entry;
+					continue;
+				}
+			}
+
+			if (move_later &&
+			    strncmp(entry->syspath, move_later->syspath, move_later_prefix) != 0) {
+
+				udev_list_entry_add(udev_enumerate->udev, &udev_enumerate->devices_list,
+					    move_later->syspath, NULL, 0, 0);
+				move_later = NULL;
+			}
+
 			udev_list_entry_add(udev_enumerate->udev, &udev_enumerate->devices_list,
 					    entry->syspath, NULL, 0, 0);
 		}
+
+		if (move_later)
+			udev_list_entry_add(udev_enumerate->udev, &udev_enumerate->devices_list,
+					    move_later->syspath, NULL, 0, 0);
+
 		/* add and cleanup delayed devices from end of list */
 		for (i = max; i < udev_enumerate->devices_cur; i++) {
 			struct syspath *entry = &udev_enumerate->devices[i];
-- 
1.6.4.4


0002-udevd-add-timestamp-to-debug-output.patch:
 libudev/libudev-util-private.c |    3 ++-
 udev/udevd.c                   |   14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE 0002-udevd-add-timestamp-to-debug-output.patch ---
>From 4db7e84ad817944c624256b310d44bd888121c8e Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 17 Jul 2009 13:24:37 +0200
Subject: [PATCH 2/5] udevd: add timestamp to --debug output

---
 libudev/libudev-util-private.c |    3 ++-
 udev/udevd.c                   |   13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 5f5f4c1..f7daa94 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -249,6 +249,8 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 	int i;
 	int err = 0;
 
+	info(udev, "'%s' started\n", command);
+
 	/* build argv from command */
 	util_strscpy(arg, sizeof(arg), command);
 	i = 0;
@@ -273,7 +275,6 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 		argv[0] = arg;
 		argv[1] = NULL;
 	}
-	info(udev, "'%s'\n", command);
 
 	/* prepare pipes from child to parent */
 	if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
diff --git a/udev/udevd.c b/udev/udevd.c
index 2cdc18b..69d509c 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -31,6 +31,7 @@
 #include <time.h>
 #include <getopt.h>
 #include <dirent.h>
+#include <sys/time.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/signalfd.h>
@@ -53,8 +54,15 @@ static void log_fn(struct udev *udev, int priority,
 		   const char *format, va_list args)
 {
 	if (debug) {
-		fprintf(stderr, "[%d] %s: ", (int) getpid(), fn);
-		vfprintf(stderr, format, args);
+		char buf[1024];
+		struct timeval tv;
+		struct timezone tz;
+
+		vsnprintf(buf, sizeof(buf), format, args);
+		gettimeofday(&tv, &tz);
+		fprintf(stderr, "%llu.%06u [%u] %s: %s",
+			(unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+			(int) getpid(), fn, buf);
 	} else {
 		vsyslog(priority, format, args);
 	}
@@ -266,6 +274,7 @@ static void worker_new(struct event *event)
 			struct worker_message msg;
 			int err;
 
+			info(event->udev, "seq %llu running\n", udev_device_get_seqnum(dev));
 			udev_event = udev_event_new(dev);
 			if (udev_event == NULL)
 				_exit(3);
-- 
1.6.4.4


0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch:
 udevd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch ---
>From 7766066b221302d75002cd5d5a021281388ee56c Mon Sep 17 00:00:00 2001
From: Andrew Church <gentoo4 at achurch.org>
Date: Thu, 24 Sep 2009 10:51:12 -0700
Subject: [PATCH 3/5] fix wrong parameter size on ioctl FIONREAD

On Wed, Sep 23, 2009 at 23:11, Matthias Schwarzott <zzam at gentoo.org> wrote:
> It is about ioctl failures on amd64:
>   http://bugs.gentoo.org/show_bug.cgi?id=286041
>
> A bad parameter type to an ioctl() call causes udev-146 to generate "error
> getting buffer for inotify" messages in syslog.  The offending code is
> roughly:
>
>    ssize_t nbytes, pos;
>    // ...
>    ioctl(fd, FIONREAD, &nbytes);
>
> where ssize_t is 64 bits on amd64, but the kernel code for FIONREAD (at least
> through gentoo-sources-2.6.31) uses type int:
>
>    p = (void __user *) arg;
>    switch (cmd) {
>    case FIONREAD:
>        // ...
>        ret = put_user(send_len, (int __user *) p);
>
> so the upper 32 bits of "nbytes" are left uninitialized, and the subsequent
> malloc(nbytes) fails unless those 32 bits happen to be zero (or the system has
> a LOT of memory).
---
 udev/udevd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev/udevd.c b/udev/udevd.c
index 69d509c..511cb4b 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -656,7 +656,7 @@ static void handle_ctrl_msg(struct udev_ctrl *uctrl)
 /* read inotify messages */
 static int handle_inotify(struct udev *udev)
 {
-	ssize_t nbytes, pos;
+	int nbytes, pos;
 	char *buf;
 	struct inotify_event *ev;
 
-- 
1.6.4.4


0004-fix-single-session-CD-detection.patch:
 60-persistent-storage.rules |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0004-fix-single-session-CD-detection.patch ---
>From 36b35c884fc06bc2babf0ec840cb423b94a45f93 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Sun, 20 Sep 2009 19:07:51 +0200
Subject: [PATCH 4/5] fix single-session CD detection

ID_CDROM_MEDIA_SESSION_LAST_OFFSET is not set for CDs with only a single
session (i. e. for the vast majority of CDs out there). The previous rules ran
blkid with invalid arguments for these, causing CD detection to fail in
DK-disks and gvfs.

Now check whether we actually have ID_CDROM_MEDIA_SESSION_LAST_OFFSET, and if
not, call blkid without -O for specifying the offset.

Many thanks to Maxim Levitsky for tracking this down!

https://launchpad.net/bugs/431055
---
 rules/rules.d/60-persistent-storage.rules |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
index 64e9578..1b85156 100644
--- a/rules/rules.d/60-persistent-storage.rules
+++ b/rules/rules.d/60-persistent-storage.rules
@@ -61,7 +61,9 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA
 ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end"
 
 # probe filesystem metadata of optical drives which have a media inserted
-KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
+KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
+# single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET
+KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"
 
 # probe filesystem metadata of disks
 KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
-- 
1.6.4.4


0005-fix-previous-commit-for-CD-detection.patch:
 60-persistent-storage.rules |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-fix-previous-commit-for-CD-detection.patch ---
>From a09ac6a6ae39512fafe9df331a311113d2a1d9f6 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Sun, 20 Sep 2009 19:21:04 +0200
Subject: [PATCH 5/5] fix previous commit for CD detection

Do not run blkid twice. *brown paperbag*
---
 rules/rules.d/60-persistent-storage.rules |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
index 1b85156..0950847 100644
--- a/rules/rules.d/60-persistent-storage.rules
+++ b/rules/rules.d/60-persistent-storage.rules
@@ -63,7 +63,7 @@ ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_
 # probe filesystem metadata of optical drives which have a media inserted
 KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
 # single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET
-KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"
+KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"
 
 # probe filesystem metadata of disks
 KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
-- 
1.6.4.4



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- udev.spec	23 Sep 2009 17:27:00 -0000	1.292
+++ udev.spec	25 Sep 2009 17:05:23 -0000	1.293
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -14,8 +14,12 @@ Obsoletes: udev-extras < 20090618
 Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 
-Patch1: udev.git-3bf768245b98479a14190e1e1d32ef5fae3ddf8a.patch
-Patch2: udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch
+Patch1: 0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch
+Patch2: 0002-udevd-add-timestamp-to-debug-output.patch
+Patch3: 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch
+Patch4: 0004-fix-single-session-CD-detection.patch
+Patch5: 0005-fix-previous-commit-for-CD-detection.patch
+
 
 Source1: start_udev
 Source3: udev-post.init
@@ -99,6 +103,9 @@ glib-based applications using libudev fu
 %setup -q  
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # get rid of rpath
@@ -350,6 +357,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Sep 25 2009 harald at redhat.com 145-9
+- add patches to fix cdrom_id
+- add patch to fix the inotify bug (bug #524752)
+
 * Wed Sep 23 2009 harald at redhat.com 145-8
 - obsolete libgudev and libgudev-devel (bug #523569)
 


--- udev.git-3bf768245b98479a14190e1e1d32ef5fae3ddf8a.patch DELETED ---


--- udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch DELETED ---



From lkundrak at fedoraproject.org  Fri Sep 25 17:08:18 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 25 Sep 2009 17:08:18 +0000 (UTC)
Subject: rpms/inkscape/devel import.log, NONE,
	1.1 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 inkscape.spec, 1.84, 1.85 sources, 1.25,
	1.26 inkscape-20090226svn-oldcairo.patch, 1.1,
	NONE inkscape-20090227svn-automake.patch, 1.1,
	NONE inkscape-20090508svn-crc32.patch, 1.1, NONE
Message-ID: <20090925170818.8ABFB11C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25923/devel

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	import.log inkscape-20090925svn-el5.patch 
Removed Files:
	inkscape-20090226svn-oldcairo.patch 
	inkscape-20090227svn-automake.patch 
	inkscape-20090508svn-crc32.patch 
Log Message:
Update to a later snapshot.



--- NEW FILE import.log ---
inkscape-0_47-0_16_pre3_20090925svn_fc12:HEAD:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898265

inkscape-20090925svn-el5.patch:
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   14 ++++++++++++--
 6 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE inkscape-20090925svn-el5.patch ---
>From 61ef28dbb939d8a65c17e07834d7e31bae7955f2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 25 Sep 2009 15:15:56 +0200
Subject: [PATCH] Make it possible to build Inkscape 0.47 on RHEL 5

This contains various quirks to build against slightly older libraries
and tools. Specifically:

* Automake prior to 1.10 generated incorrect rules to build assembly files
which resulted in object files being placed in wrong directories.

* Configure required giomm-2.4 pkg-config package, which is provided by
recent gtkmm, but not by older one, though giomm-2.4 itself is present

* Cairo prior to 1.5.1 did not define macros for PostScript language
levels.

* GTK prior to 2.12.0 did not provide
gtk_entry_completion_set_inline_selection () function

* GLib prior to version 2.15.1 did not provide mechanisms for parsing
URIs.
---
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   13 ++++++++++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6a7c631..5c4e34a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ TEST_TYPE=-f
 FILE=inkscape.spec.in
 
 AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
 GLIB_REQUIRED_VERSION=2.0.0
 INTLTOOL_REQUIRED_VERSION=0.17
 
@@ -86,9 +86,9 @@ fi
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.10
-   ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+   ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
 elif (automake --version) < /dev/null > /dev/null 2>&1; then
    # Leave unversioned automake for a last resort: it may be a version earlier
    # than what we require.
@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
 else
     echo
-    echo "  You must have automake 1.10 or newer installed to compile $PROJECT."
+    echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
     DIE=1
 fi
 if test x$AUTOMAKE != x; then
diff --git a/configure.ac b/configure.ac
index fbfa2e5..32ff5a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,7 +649,7 @@ if test $cc_vers_major -gt 3; then
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
 
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d57de8..07339ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -284,3 +284,8 @@ dist-hook:
 
 distclean-local:
 	rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+	$(CCASCOMPILE) -c -o $@ $<
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 9ac1932..d3bda7f 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -38,6 +38,11 @@
 
 #include "io/sys.h"
 
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+#  define CAIRO_PS_LEVEL_2 0
+#  define CAIRO_PS_LEVEL_3 1
+#endif
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 46ad082..5d3cdea 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -6563,7 +6563,9 @@ cbe_add_completion (GtkComboBoxEntry *cbe, GObject *tbl){
     gtk_entry_completion_set_model(completion, model);
     gtk_entry_completion_set_text_column(completion, 0);
     gtk_entry_completion_set_inline_completion(completion, FALSE);
+#if GTK_CHECK_VERSION(2,12,0)
     gtk_entry_completion_set_inline_selection(completion, FALSE);
+#endif
     gtk_entry_completion_set_popup_completion(completion, TRUE);
     gtk_entry_set_completion(entry, completion);
 
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index c387672..69b2c60 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -8,8 +8,12 @@
 #include "xml/attribute-record.h"
 #include "xml/node.h"
 #include <glib/gmem.h>
-#include <glib/gurifuncs.h>
 #include <glib/gutils.h>
+#if GLIB_CHECK_VERSION(2,15,1)
+#include <glib/gurifuncs.h>
+#else
+#include <string.h>
+#endif
 using Inkscape::XML::AttributeRecord;
 
 
@@ -28,6 +32,7 @@ href_needs_rebasing(char const *const href)
          * document, rather than referring to the base URI. */
     }
 
+#if GLIB_CHECK_VERSION(2,15,1)
     /* Don't change data or http hrefs. */
     {
         char *const scheme = g_uri_parse_scheme(href);
@@ -42,6 +47,12 @@ href_needs_rebasing(char const *const href)
             return false;
         }
     }
+#else
+    if (href == strstr (href, "http:") ||
+	href == strstr (href, "https:") ||
+	href == strstr (href, "data:"))
+        return false;
+#endif
 
     /* If absolute then keep it as is.
      *
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	10 Aug 2009 03:43:55 -0000	1.18
+++ .cvsignore	25 Sep 2009 17:08:18 -0000	1.19
@@ -1 +1 @@
-inkscape.tar.xz
+inkscape.tar.gz


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- inkscape.spec	7 Sep 2009 13:51:36 -0000	1.84
+++ inkscape.spec	25 Sep 2009 17:08:18 -0000	1.85
@@ -1,26 +1,19 @@
-%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
-
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre2.20090907svn%{?dist}
+Release:        0.16.pre3.20090925svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22202 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22202 inkscape
+# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
 # tar cf - inkscape |xz -9 -c >inkscape.tar.xz
-# Chuck the SVN snapshot specific blocks when bumping to a release:
-# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0:        %{name}.tar.xz
+Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
-# BEGIN SVN SNAPSHOT SPECIFIC
-Patch3:         inkscape-20090227svn-automake.patch
-# END SVN SNAPSHOT SPECIFIC
+Patch5:         inkscape-20090925svn-el5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,10 +49,8 @@ BuildRequires:  popt-devel
 %else
 BuildRequires:  popt
 %endif
-# BEGIN SVN SNAPSHOT SPECIFIC
 BuildRequires:  autoconf
 BuildRequires:  automake
-# END SVN SNAPSHOT SPECIFIC
 
 # Incompatible license
 BuildConflicts: openssl-devel
@@ -136,11 +127,8 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
-# BEGIN SVN SNAPSHOT SPECIFIC
-%patch3 -p0 -b .automake
-# END SVN SNAPSHOT SPECIFIC
+%patch5 -p1 -b .el5
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -154,9 +142,7 @@ dos2unix -k -q share/extensions/*.py
 
 
 %build
-# BEGIN SVN SNAPSHOT SPECIFIC
 sh autogen.sh
-# END SVN SNAPSHOT SPECIFIC
 %configure                      \
         --with-python           \
         --with-perl             \
@@ -165,7 +151,6 @@ sh autogen.sh
         --enable-lcms           \
         --enable-poppler-cairo  \
         --disable-dependency-tracking
-#        --enable-inkboard       \
 
 make %{?_smp_mflags}
 
@@ -233,6 +218,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
+- Move to a later snapshot
+- Drop debugging compiler flags, enable optimizations again
+- Make it build on everything since EL5 again
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
 - Move inkview man page to -view subpackage (#515358)
 - Add license, etc. to main package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 12:24:08 -0000	1.25
+++ sources	25 Sep 2009 17:08:18 -0000	1.26
@@ -1 +1 @@
-2a5d70e3924f049a5d5b43cd2075cd8c  inkscape.tar.xz
+acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz


--- inkscape-20090226svn-oldcairo.patch DELETED ---


--- inkscape-20090227svn-automake.patch DELETED ---


--- inkscape-20090508svn-crc32.patch DELETED ---



From lkundrak at fedoraproject.org  Fri Sep 25 17:09:47 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 25 Sep 2009 17:09:47 +0000 (UTC)
Subject: rpms/inkscape/F-11 inkscape-20090925svn-el5.patch, NONE,
	1.1 .cvsignore, 1.19, 1.20 import.log, 1.2, 1.3 inkscape.spec,
	1.78, 1.79 sources, 1.26,
	1.27 inkscape-20090226svn-oldcairo.patch, 1.1,
	NONE inkscape-20090227svn-automake.patch, 1.1, NONE
Message-ID: <20090925170947.18EBE11C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594/F-11

Modified Files:
	.cvsignore import.log inkscape.spec sources 
Added Files:
	inkscape-20090925svn-el5.patch 
Removed Files:
	inkscape-20090226svn-oldcairo.patch 
	inkscape-20090227svn-automake.patch 
Log Message:
Merge from devel


inkscape-20090925svn-el5.patch:
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   14 ++++++++++++--
 6 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE inkscape-20090925svn-el5.patch ---
>From 61ef28dbb939d8a65c17e07834d7e31bae7955f2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 25 Sep 2009 15:15:56 +0200
Subject: [PATCH] Make it possible to build Inkscape 0.47 on RHEL 5

This contains various quirks to build against slightly older libraries
and tools. Specifically:

* Automake prior to 1.10 generated incorrect rules to build assembly files
which resulted in object files being placed in wrong directories.

* Configure required giomm-2.4 pkg-config package, which is provided by
recent gtkmm, but not by older one, though giomm-2.4 itself is present

* Cairo prior to 1.5.1 did not define macros for PostScript language
levels.

* GTK prior to 2.12.0 did not provide
gtk_entry_completion_set_inline_selection () function

* GLib prior to version 2.15.1 did not provide mechanisms for parsing
URIs.
---
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   13 ++++++++++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6a7c631..5c4e34a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ TEST_TYPE=-f
 FILE=inkscape.spec.in
 
 AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
 GLIB_REQUIRED_VERSION=2.0.0
 INTLTOOL_REQUIRED_VERSION=0.17
 
@@ -86,9 +86,9 @@ fi
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.10
-   ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+   ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
 elif (automake --version) < /dev/null > /dev/null 2>&1; then
    # Leave unversioned automake for a last resort: it may be a version earlier
    # than what we require.
@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
 else
     echo
-    echo "  You must have automake 1.10 or newer installed to compile $PROJECT."
+    echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
     DIE=1
 fi
 if test x$AUTOMAKE != x; then
diff --git a/configure.ac b/configure.ac
index fbfa2e5..32ff5a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,7 +649,7 @@ if test $cc_vers_major -gt 3; then
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
 
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d57de8..07339ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -284,3 +284,8 @@ dist-hook:
 
 distclean-local:
 	rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+	$(CCASCOMPILE) -c -o $@ $<
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 9ac1932..d3bda7f 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -38,6 +38,11 @@
 
 #include "io/sys.h"
 
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+#  define CAIRO_PS_LEVEL_2 0
+#  define CAIRO_PS_LEVEL_3 1
+#endif
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 46ad082..5d3cdea 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -6563,7 +6563,9 @@ cbe_add_completion (GtkComboBoxEntry *cbe, GObject *tbl){
     gtk_entry_completion_set_model(completion, model);
     gtk_entry_completion_set_text_column(completion, 0);
     gtk_entry_completion_set_inline_completion(completion, FALSE);
+#if GTK_CHECK_VERSION(2,12,0)
     gtk_entry_completion_set_inline_selection(completion, FALSE);
+#endif
     gtk_entry_completion_set_popup_completion(completion, TRUE);
     gtk_entry_set_completion(entry, completion);
 
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index c387672..69b2c60 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -8,8 +8,12 @@
 #include "xml/attribute-record.h"
 #include "xml/node.h"
 #include <glib/gmem.h>
-#include <glib/gurifuncs.h>
 #include <glib/gutils.h>
+#if GLIB_CHECK_VERSION(2,15,1)
+#include <glib/gurifuncs.h>
+#else
+#include <string.h>
+#endif
 using Inkscape::XML::AttributeRecord;
 
 
@@ -28,6 +32,7 @@ href_needs_rebasing(char const *const href)
          * document, rather than referring to the base URI. */
     }
 
+#if GLIB_CHECK_VERSION(2,15,1)
     /* Don't change data or http hrefs. */
     {
         char *const scheme = g_uri_parse_scheme(href);
@@ -42,6 +47,12 @@ href_needs_rebasing(char const *const href)
             return false;
         }
     }
+#else
+    if (href == strstr (href, "http:") ||
+	href == strstr (href, "https:") ||
+	href == strstr (href, "data:"))
+        return false;
+#endif
 
     /* If absolute then keep it as is.
      *
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	10 Aug 2009 05:30:04 -0000	1.19
+++ .cvsignore	25 Sep 2009 17:09:46 -0000	1.20
@@ -1 +1 @@
-inkscape.tar.xz
+inkscape.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Sep 2009 13:55:13 -0000	1.2
+++ import.log	25 Sep 2009 17:09:46 -0000	1.3
@@ -1,2 +1,3 @@
 inkscape-0_47-0_15_pre1_20090810svn_fc12:F-11:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249880790
 inkscape-0_47-0_16_pre2_20090907svn_fc12:F-11:inkscape-0.47-0.16.pre2.20090907svn.fc12.src.rpm:1252331611
+inkscape-0_47-0_16_pre3_20090925svn_fc12:F-11:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898554


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/inkscape.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- inkscape.spec	7 Sep 2009 13:55:13 -0000	1.78
+++ inkscape.spec	25 Sep 2009 17:09:46 -0000	1.79
@@ -1,26 +1,19 @@
-%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
-
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre2.20090907svn%{?dist}
+Release:        0.16.pre3.20090925svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22202 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22202 inkscape
+# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
 # tar cf - inkscape |xz -9 -c >inkscape.tar.xz
-# Chuck the SVN snapshot specific blocks when bumping to a release:
-# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0:        %{name}.tar.xz
+Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
-# BEGIN SVN SNAPSHOT SPECIFIC
-Patch3:         inkscape-20090227svn-automake.patch
-# END SVN SNAPSHOT SPECIFIC
+Patch5:         inkscape-20090925svn-el5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,10 +49,8 @@ BuildRequires:  popt-devel
 %else
 BuildRequires:  popt
 %endif
-# BEGIN SVN SNAPSHOT SPECIFIC
 BuildRequires:  autoconf
 BuildRequires:  automake
-# END SVN SNAPSHOT SPECIFIC
 
 # Incompatible license
 BuildConflicts: openssl-devel
@@ -136,11 +127,8 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
-# BEGIN SVN SNAPSHOT SPECIFIC
-%patch3 -p0 -b .automake
-# END SVN SNAPSHOT SPECIFIC
+%patch5 -p1 -b .el5
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -154,9 +142,7 @@ dos2unix -k -q share/extensions/*.py
 
 
 %build
-# BEGIN SVN SNAPSHOT SPECIFIC
 sh autogen.sh
-# END SVN SNAPSHOT SPECIFIC
 %configure                      \
         --with-python           \
         --with-perl             \
@@ -165,7 +151,6 @@ sh autogen.sh
         --enable-lcms           \
         --enable-poppler-cairo  \
         --disable-dependency-tracking
-#        --enable-inkboard       \
 
 make %{?_smp_mflags}
 
@@ -233,6 +218,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
+- Move to a later snapshot
+- Drop debugging compiler flags, enable optimizations again
+- Make it build on everything since EL5 again
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
 - Move inkview man page to -view subpackage (#515358)
 - Add license, etc. to main package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	7 Sep 2009 13:55:13 -0000	1.26
+++ sources	25 Sep 2009 17:09:46 -0000	1.27
@@ -1 +1 @@
-2a5d70e3924f049a5d5b43cd2075cd8c  inkscape.tar.xz
+acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz


--- inkscape-20090226svn-oldcairo.patch DELETED ---


--- inkscape-20090227svn-automake.patch DELETED ---



From lkundrak at fedoraproject.org  Fri Sep 25 17:09:54 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 25 Sep 2009 17:09:54 +0000 (UTC)
Subject: rpms/inkscape/F-10 inkscape-20090925svn-el5.patch, NONE,
	1.1 .cvsignore, 1.18, 1.19 import.log, 1.1, 1.2 inkscape.spec,
	1.63, 1.64 sources, 1.19,
	1.20 inkscape-20090226svn-oldcairo.patch, 1.1,
	NONE inkscape-20090227svn-automake.patch, 1.1, NONE
Message-ID: <20090925170954.B0F0F11C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26738/F-10

Modified Files:
	.cvsignore import.log inkscape.spec sources 
Added Files:
	inkscape-20090925svn-el5.patch 
Removed Files:
	inkscape-20090226svn-oldcairo.patch 
	inkscape-20090227svn-automake.patch 
Log Message:
Merge from devel


inkscape-20090925svn-el5.patch:
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   14 ++++++++++++--
 6 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE inkscape-20090925svn-el5.patch ---
>From 61ef28dbb939d8a65c17e07834d7e31bae7955f2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 25 Sep 2009 15:15:56 +0200
Subject: [PATCH] Make it possible to build Inkscape 0.47 on RHEL 5

This contains various quirks to build against slightly older libraries
and tools. Specifically:

* Automake prior to 1.10 generated incorrect rules to build assembly files
which resulted in object files being placed in wrong directories.

* Configure required giomm-2.4 pkg-config package, which is provided by
recent gtkmm, but not by older one, though giomm-2.4 itself is present

* Cairo prior to 1.5.1 did not define macros for PostScript language
levels.

* GTK prior to 2.12.0 did not provide
gtk_entry_completion_set_inline_selection () function

* GLib prior to version 2.15.1 did not provide mechanisms for parsing
URIs.
---
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   13 ++++++++++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6a7c631..5c4e34a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ TEST_TYPE=-f
 FILE=inkscape.spec.in
 
 AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
 GLIB_REQUIRED_VERSION=2.0.0
 INTLTOOL_REQUIRED_VERSION=0.17
 
@@ -86,9 +86,9 @@ fi
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.10
-   ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+   ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
 elif (automake --version) < /dev/null > /dev/null 2>&1; then
    # Leave unversioned automake for a last resort: it may be a version earlier
    # than what we require.
@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
 else
     echo
-    echo "  You must have automake 1.10 or newer installed to compile $PROJECT."
+    echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
     DIE=1
 fi
 if test x$AUTOMAKE != x; then
diff --git a/configure.ac b/configure.ac
index fbfa2e5..32ff5a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,7 +649,7 @@ if test $cc_vers_major -gt 3; then
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
 
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d57de8..07339ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -284,3 +284,8 @@ dist-hook:
 
 distclean-local:
 	rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+	$(CCASCOMPILE) -c -o $@ $<
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 9ac1932..d3bda7f 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -38,6 +38,11 @@
 
 #include "io/sys.h"
 
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+#  define CAIRO_PS_LEVEL_2 0
+#  define CAIRO_PS_LEVEL_3 1
+#endif
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 46ad082..5d3cdea 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -6563,7 +6563,9 @@ cbe_add_completion (GtkComboBoxEntry *cbe, GObject *tbl){
     gtk_entry_completion_set_model(completion, model);
     gtk_entry_completion_set_text_column(completion, 0);
     gtk_entry_completion_set_inline_completion(completion, FALSE);
+#if GTK_CHECK_VERSION(2,12,0)
     gtk_entry_completion_set_inline_selection(completion, FALSE);
+#endif
     gtk_entry_completion_set_popup_completion(completion, TRUE);
     gtk_entry_set_completion(entry, completion);
 
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index c387672..69b2c60 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -8,8 +8,12 @@
 #include "xml/attribute-record.h"
 #include "xml/node.h"
 #include <glib/gmem.h>
-#include <glib/gurifuncs.h>
 #include <glib/gutils.h>
+#if GLIB_CHECK_VERSION(2,15,1)
+#include <glib/gurifuncs.h>
+#else
+#include <string.h>
+#endif
 using Inkscape::XML::AttributeRecord;
 
 
@@ -28,6 +32,7 @@ href_needs_rebasing(char const *const href)
          * document, rather than referring to the base URI. */
     }
 
+#if GLIB_CHECK_VERSION(2,15,1)
     /* Don't change data or http hrefs. */
     {
         char *const scheme = g_uri_parse_scheme(href);
@@ -42,6 +47,12 @@ href_needs_rebasing(char const *const href)
             return false;
         }
     }
+#else
+    if (href == strstr (href, "http:") ||
+	href == strstr (href, "https:") ||
+	href == strstr (href, "data:"))
+        return false;
+#endif
 
     /* If absolute then keep it as is.
      *
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	10 Aug 2009 05:26:10 -0000	1.18
+++ .cvsignore	25 Sep 2009 17:09:54 -0000	1.19
@@ -1 +1 @@
-inkscape.tar.xz
+inkscape.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Aug 2009 05:26:10 -0000	1.1
+++ import.log	25 Sep 2009 17:09:54 -0000	1.2
@@ -1 +1,2 @@
 inkscape-0_47-0_15_pre1_20090810svn_fc12:F-10:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249881732
+inkscape-0_47-0_16_pre3_20090925svn_fc12:F-10:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898566


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- inkscape.spec	10 Aug 2009 05:26:10 -0000	1.63
+++ inkscape.spec	25 Sep 2009 17:09:54 -0000	1.64
@@ -1,26 +1,19 @@
-%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
-
 Name:           inkscape
 Version:        0.47
-Release:        0.15.pre1.20090810svn%{?dist}
+Release:        0.16.pre3.20090925svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22040 inkscape
+# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
 # tar cf - inkscape |xz -9 -c >inkscape.tar.xz
-# Chuck the SVN snapshot specific blocks when bumping to a release:
-# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0:        %{name}.tar.xz
+Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
-# BEGIN SVN SNAPSHOT SPECIFIC
-Patch3:         inkscape-20090227svn-automake.patch
-# END SVN SNAPSHOT SPECIFIC
+Patch5:         inkscape-20090925svn-el5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,10 +49,8 @@ BuildRequires:  popt-devel
 %else
 BuildRequires:  popt
 %endif
-# BEGIN SVN SNAPSHOT SPECIFIC
 BuildRequires:  autoconf
 BuildRequires:  automake
-# END SVN SNAPSHOT SPECIFIC
 
 # Incompatible license
 BuildConflicts: openssl-devel
@@ -136,11 +127,8 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
-# BEGIN SVN SNAPSHOT SPECIFIC
-%patch3 -p0 -b .automake
-# END SVN SNAPSHOT SPECIFIC
+%patch5 -p1 -b .el5
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -154,9 +142,7 @@ dos2unix -k -q share/extensions/*.py
 
 
 %build
-# BEGIN SVN SNAPSHOT SPECIFIC
 sh autogen.sh
-# END SVN SNAPSHOT SPECIFIC
 %configure                      \
         --with-python           \
         --with-perl             \
@@ -165,7 +151,6 @@ sh autogen.sh
         --enable-lcms           \
         --enable-poppler-cairo  \
         --disable-dependency-tracking
-#        --enable-inkboard       \
 
 make %{?_smp_mflags}
 
@@ -214,13 +199,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-inkscape.desktop
 %{_datadir}/pixmaps/inkscape.png
 %{_mandir}/man1/inkscape.1*
-%{_mandir}/man1/inkview.1*
 %{_mandir}/fr/man1/inkscape.1*
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %files view
 %defattr(-,root,root,-)
 %{_bindir}/inkview
+%{_mandir}/man1/inkview.1*
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
@@ -232,6 +218,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
+- Move to a later snapshot
+- Drop debugging compiler flags, enable optimizations again
+- Make it build on everything since EL5 again
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
+- Move inkview man page to -view subpackage (#515358)
+- Add license, etc. to main package
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre2.20090907svn
+- Update to a post-pre2 snapshot
+
 * Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
 - Update to a post-pre1 snapshot
 - Drop upstreamed CRC32 fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	10 Aug 2009 05:26:10 -0000	1.19
+++ sources	25 Sep 2009 17:09:54 -0000	1.20
@@ -1 +1 @@
-13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz
+acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz


--- inkscape-20090226svn-oldcairo.patch DELETED ---


--- inkscape-20090227svn-automake.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 25 17:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:10:00 +0000
Subject: [pkgdb] youtube-dl (Fedora, 10) updated by kevin
Message-ID: <20090925171000.9846F10F897@bastion2.fedora.phx.redhat.com>

kevin changed owner of youtube-dl in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 25 17:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:10:00 +0000
Subject: [pkgdb] youtube-dl (Fedora, 10) updated by kevin
Message-ID: <20090925171000.A199510F89C@bastion2.fedora.phx.redhat.com>

kevin changed owner of youtube-dl in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 25 17:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:10:00 +0000
Subject: [pkgdb] youtube-dl (Fedora, 10) updated by kevin
Message-ID: <20090925171000.9D52610F89A@bastion2.fedora.phx.redhat.com>

kevin changed owner of youtube-dl in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From lkundrak at fedoraproject.org  Fri Sep 25 17:10:25 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 25 Sep 2009 17:10:25 +0000 (UTC)
Subject: rpms/inkscape/EL-5 import.log, NONE,
	1.1 inkscape-20090410svn-formats.patch, NONE,
	1.1 inkscape-20090410svn-uniconv.patch, NONE,
	1.1 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 inkscape.spec, 1.39, 1.40 sources, 1.13,
	1.14 inkscape-0.45.1-desktop.patch, 1.2,
	NONE inkscape-0.46-fixlatex.patch, 1.1,
	NONE inkscape-0.46pre2-icons.patch, 1.1,
	NONE inkscape-16571-cxxinclude.patch, 1.1, NONE
Message-ID: <20090925171025.01E3E11C0423@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27108/EL-5

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	import.log inkscape-20090410svn-formats.patch 
	inkscape-20090410svn-uniconv.patch 
	inkscape-20090925svn-el5.patch 
Removed Files:
	inkscape-0.45.1-desktop.patch inkscape-0.46-fixlatex.patch 
	inkscape-0.46pre2-icons.patch inkscape-16571-cxxinclude.patch 
Log Message:
Merge from devel.



--- NEW FILE import.log ---
inkscape-0_47-0_16_pre3_20090925svn_fc12:EL-5:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898601

inkscape-20090410svn-formats.patch:
 inkscape.desktop.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE inkscape-20090410svn-formats.patch ---
See https://bugzilla.redhat.com/show_bug.cgi?id=458845

Lubomir Rintel <lkundrak at v3.sk>

diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in
--- inkscape/inkscape.desktop.in.uniconv	2009-01-06 11:38:13.000000000 +0100
+++ inkscape/inkscape.desktop.in	2009-01-06 11:38:39.000000000 +0100
@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor
 _Comment=Create and edit Scalable Vector Graphics images
 Type=Application
 Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;
+MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
 Exec=inkscape %F
 TryExec=inkscape
 Terminal=false

inkscape-20090410svn-uniconv.patch:
 uniconv-ext.py |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE inkscape-20090410svn-uniconv.patch ---
uniconvertor and uniconv are looked in in reversed order
(therefore we can call uniconv that's different from the uniconvertor one)
https://bugs.launchpad.net/inkscape/+bug/226383

Lubomir Rintel <lkundrak at v3.sk>

diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py
--- inkscape/share/extensions/uniconv-ext.py.uniconv	2009-03-01 18:06:19.000000000 +0100
+++ inkscape/share/extensions/uniconv-ext.py	2009-04-10 15:22:21.916579400 +0200
@@ -28,19 +28,21 @@ cmd = None
 
 try:
     from subprocess import Popen, PIPE
-    p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait()
+    p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
     if p==0 :
-        cmd = 'uniconv'
+        cmd = 'uniconvertor'
     else:
-        p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
+        p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait()
         if p==0 :
-            cmd = 'uniconvertor'
+            cmd = 'uniconv'
 except ImportError:
     from popen2 import Popen3
-    p = Popen3('uniconv', True).wait()
-    if p!=32512 : cmd = 'uniconv'
     p = Popen3('uniconvertor', True).wait()
-    if p!=32512 : cmd = 'uniconvertor'
+    if p!=32512 :
+        cmd = 'uniconvertor'
+    else:
+        p = Popen3('uniconv', True).wait()
+        if p!=32512 : cmd = 'uniconv'
 
 if cmd == None:
     # there's no succeffully-returning uniconv command; try to get the module directly (on Windows)

inkscape-20090925svn-el5.patch:
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   14 ++++++++++++--
 6 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE inkscape-20090925svn-el5.patch ---
>From 61ef28dbb939d8a65c17e07834d7e31bae7955f2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 25 Sep 2009 15:15:56 +0200
Subject: [PATCH] Make it possible to build Inkscape 0.47 on RHEL 5

This contains various quirks to build against slightly older libraries
and tools. Specifically:

* Automake prior to 1.10 generated incorrect rules to build assembly files
which resulted in object files being placed in wrong directories.

* Configure required giomm-2.4 pkg-config package, which is provided by
recent gtkmm, but not by older one, though giomm-2.4 itself is present

* Cairo prior to 1.5.1 did not define macros for PostScript language
levels.

* GTK prior to 2.12.0 did not provide
gtk_entry_completion_set_inline_selection () function

* GLib prior to version 2.15.1 did not provide mechanisms for parsing
URIs.
---
 autogen.sh                              |   10 +++++-----
 configure.ac                            |    2 +-
 src/Makefile.am                         |    5 +++++
 src/extension/internal/cairo-ps-out.cpp |    5 +++++
 src/widgets/toolbox.cpp                 |    2 ++
 src/xml/rebase-hrefs.cpp                |   13 ++++++++++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6a7c631..5c4e34a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ TEST_TYPE=-f
 FILE=inkscape.spec.in
 
 AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
 GLIB_REQUIRED_VERSION=2.0.0
 INTLTOOL_REQUIRED_VERSION=0.17
 
@@ -86,9 +86,9 @@ fi
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.10
-   ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+   ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
 elif (automake --version) < /dev/null > /dev/null 2>&1; then
    # Leave unversioned automake for a last resort: it may be a version earlier
    # than what we require.
@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
 else
     echo
-    echo "  You must have automake 1.10 or newer installed to compile $PROJECT."
+    echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
     DIE=1
 fi
 if test x$AUTOMAKE != x; then
diff --git a/configure.ac b/configure.ac
index fbfa2e5..32ff5a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,7 +649,7 @@ if test $cc_vers_major -gt 3; then
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
 
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d57de8..07339ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -284,3 +284,8 @@ dist-hook:
 
 distclean-local:
 	rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+	$(CCASCOMPILE) -c -o $@ $<
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 9ac1932..d3bda7f 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -38,6 +38,11 @@
 
 #include "io/sys.h"
 
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+#  define CAIRO_PS_LEVEL_2 0
+#  define CAIRO_PS_LEVEL_3 1
+#endif
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 46ad082..5d3cdea 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -6563,7 +6563,9 @@ cbe_add_completion (GtkComboBoxEntry *cbe, GObject *tbl){
     gtk_entry_completion_set_model(completion, model);
     gtk_entry_completion_set_text_column(completion, 0);
     gtk_entry_completion_set_inline_completion(completion, FALSE);
+#if GTK_CHECK_VERSION(2,12,0)
     gtk_entry_completion_set_inline_selection(completion, FALSE);
+#endif
     gtk_entry_completion_set_popup_completion(completion, TRUE);
     gtk_entry_set_completion(entry, completion);
 
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index c387672..69b2c60 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -8,8 +8,12 @@
 #include "xml/attribute-record.h"
 #include "xml/node.h"
 #include <glib/gmem.h>
-#include <glib/gurifuncs.h>
 #include <glib/gutils.h>
+#if GLIB_CHECK_VERSION(2,15,1)
+#include <glib/gurifuncs.h>
+#else
+#include <string.h>
+#endif
 using Inkscape::XML::AttributeRecord;
 
 
@@ -28,6 +32,7 @@ href_needs_rebasing(char const *const href)
          * document, rather than referring to the base URI. */
     }
 
+#if GLIB_CHECK_VERSION(2,15,1)
     /* Don't change data or http hrefs. */
     {
         char *const scheme = g_uri_parse_scheme(href);
@@ -42,6 +47,12 @@ href_needs_rebasing(char const *const href)
             return false;
         }
     }
+#else
+    if (href == strstr (href, "http:") ||
+	href == strstr (href, "https:") ||
+	href == strstr (href, "data:"))
+        return false;
+#endif
 
     /* If absolute then keep it as is.
      *
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Apr 2008 13:51:37 -0000	1.13
+++ .cvsignore	25 Sep 2009 17:10:24 -0000	1.14
@@ -1 +1 @@
-inkscape-0.46.tar.bz2
+inkscape.tar.gz


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- inkscape.spec	11 Apr 2008 09:49:04 -0000	1.39
+++ inkscape.spec	25 Sep 2009 17:10:24 -0000	1.40
@@ -1,16 +1,19 @@
 Name:           inkscape
-Version:        0.46
-Release:        2%{?dist}.1
+Version:        0.47
+Release:        0.16.pre3.20090925svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
-Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-Patch0:         inkscape-16571-cxxinclude.patch
-Patch1:         inkscape-0.45.1-desktop.patch
-Patch2:         inkscape-0.46pre2-icons.patch
-Patch3:         inkscape-0.46-fixlatex.patch
+#Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
+# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+Source0:        %{name}.tar.gz
+
+Patch0:         inkscape-20090410svn-uniconv.patch
+Patch4:         inkscape-20090410svn-formats.patch
+Patch5:         inkscape-20090925svn-el5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,68 +32,125 @@ BuildRequires:  pango-devel
 BuildRequires:  pkgconfig
 BuildRequires:  lcms-devel >= 1.13
 BuildRequires:  cairo-devel
-BuildRequires:  openssl-devel
 BuildRequires:  dos2unix
-BuildRequires:  perl-XML-Parser
 BuildRequires:  python-devel
 BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
-
-# Use popt-devel if Fedora 8, RHEL 6, newer or unknown,
-# rely on popt otherwise
-%if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6
-BuildRequires:  popt
-%else
+BuildRequires:  gsl-devel
+BuildRequires:  libwpg-devel
+BuildRequires:  ImageMagick-c++-devel
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  perl(ExtUtils::Embed)
+BuildRequires:  intltool
+# A packaging bug in EL-5
+%if 0%{?fedora > 6}
 BuildRequires:  popt-devel
+%else
+BuildRequires:  popt
 %endif
+BuildRequires:  autoconf
+BuildRequires:  automake
+
+# Incompatible license
+BuildConflicts: openssl-devel
 
+# Disable all for now. TODO: Be smarter
+%if 0
+Requires:       dia
 Requires:       pstoedit
+Requires:       ghostscript
 Requires:       perl(Image::Magick)
+Requires:       tex(latex)
+Requires:       tex(dvips)
+Requires:       transfig
+Requires:       gimp
 Requires:       numpy
-Requires:       PyXML
 Requires:       python-lxml
+Requires:       uniconvertor
+# TODO: Deal with these (autoreqs, disabled now):
+# perl(Cwd)
+# perl(Exporter)
+# perl(File::Basename)
+# perl(Getopt::Long)
+# perl(Getopt::Std)
+# perl(MIME::Base64)
+# perl(Pod::Usage)
+# perl(SVG)
+# perl(SVG::Parser)
+# perl(XML::XQL)
+# perl(XML::XQL::DOM)
+# perl(strict)
+# perl(vars)
+# perl(warnings)
+%endif
 
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 
+# Filter out perl requires and provides
+# XXX: For now _all_
+%global __perl_provides %{nil}
+%global __perl_requires %{nil}
+
 %description
-Inkscape is a vector-based drawing program, like CorelDraw? or Adobe
-Illustrator? from the proprietary software world, and Sketch or Karbon14 from
-the free software world. It is free software, distributed under the terms of
-the Gnu General Public License, Version 2.
-
-Inkscape uses W3C SVG as its native file format. It is therefore a very useful
-tool for web designers and as an interchange format for desktop publishing.
-
-It has a relatively modern display engine, giving you finely antialiased
-display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
+Inkscape is a vector graphics editor, with capabilities similar to
+Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector
+Graphics (SVG) file format.  It is therefore a very useful tool for web
+designers and as an interchange format for desktop publishing.
+
+Inkscape supports many advanced SVG features (markers, clones, alpha
+blending, etc.) and great care is taken in designing a streamlined
+interface. It is very easy to edit nodes, perform complex path operations,
+trace bitmaps and much more.
+
+
+%package view
+Summary:        Viewing program for SVG files
+Group:          Applications/Productivity
+
+%description view
+Viewer for files in W3C standard Scalable Vector Graphics (SVG) file
+format.
+
+
+%package docs
+Summary:        Documentation for Inkscape
+Group:          Documentation
+Requires:       inkscape
+
+%description docs
+Tutorial and examples for Inkscape, a graphics editor for vector
+graphics in W3C standard Scalable Vector Graphics (SVG) file format.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .cxxinclude
-%patch1 -p1 -b .desktop
-%patch2 -p1 -b .icons
-%patch3 -p1 -b .fixlatex
-find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
-find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
+%setup -q -n %{name}
+%patch0 -p1 -b .uniconv
+%patch4 -p1 -b .formats
+%patch5 -p1 -b .el5
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# A couple of files have executable bits set,
+# despite not being executable
+(find . \( -name '*.cpp' -o -name '*.h' \) -perm +111
+	find share/extensions -name '*.py' -perm +111
+) |xargs chmod -x
+
+# Fix end of line encodings
 dos2unix -k -q share/extensions/*.py
 
 
 %build
-%configure                     \
---disable-dependency-tracking  \
---with-xinerama                \
---enable-static=no             \
---with-python                  \
---with-perl                    \
---with-gnome-vfs               \
---with-inkjar                  \
---enable-inkboard              \
---enable-lcms                  \
---enable-poppler-cairo
+sh autogen.sh
+%configure                      \
+        --with-python           \
+        --with-perl             \
+        --with-gnome-vfs        \
+        --with-xft              \
+        --enable-lcms           \
+        --enable-poppler-cairo  \
+        --disable-dependency-tracking
 
 make %{?_smp_mflags}
 
@@ -98,41 +158,162 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.*
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
+desktop-file-install --vendor fedora --delete-original  \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+# No skencil anymore
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
+
+%find_lang %{name}
+
 
-desktop-file-install --vendor fedora --delete-original     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%check
+# XXX: Tests fail, ignore it for now
+make -k check || :
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/inkscape
+%dir %{_datadir}/inkscape
+%{_datadir}/inkscape/clipart
+%{_datadir}/inkscape/extensions
+%{_datadir}/inkscape/filters
+%{_datadir}/inkscape/fonts
+%{_datadir}/inkscape/gradients
+%{_datadir}/inkscape/icons
+%{_datadir}/inkscape/keys
+%{_datadir}/inkscape/markers
+%{_datadir}/inkscape/palettes
+%{_datadir}/inkscape/patterns
+%{_datadir}/inkscape/screens
+%{_datadir}/inkscape/templates
+%{_datadir}/inkscape/ui
+%{_datadir}/applications/fedora-inkscape.desktop
+%{_datadir}/pixmaps/inkscape.png
+%{_mandir}/man1/inkscape.1*
+%{_mandir}/fr/man1/inkscape.1*
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 
-%postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%files view
+%defattr(-,root,root,-)
+%{_bindir}/inkview
+%{_mandir}/man1/inkview.1*
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 
-%files -f %{name}.lang
+%files docs
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%doc %{_mandir}/man1/*
-%{_bindir}/*
-%{_datadir}/%{name}/
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/fr/man1/*
+%dir %{_datadir}/inkscape
+%{_datadir}/inkscape/tutorials
+%{_datadir}/inkscape/examples
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
+- Move to a later snapshot
+- Drop debugging compiler flags, enable optimizations again
+- Make it build on everything since EL5 again
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
+- Move inkview man page to -view subpackage (#515358)
+- Add license, etc. to main package
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre2.20090907svn
+- Update to a post-pre2 snapshot
+
+* Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
+- Update to a post-pre1 snapshot
+- Drop upstreamed CRC32 fix
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.13.pre0.20090629svn
+- Update to a newer snapshot
+
+* Tue Jun 16 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.12.pre0.20090616svn
+- Update to post-pre0 snapshot
+
+* Tue Jun 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.11.20090602svn
+- More recent snapshot
+- Upstream removed rasterized icons again
+
+* Sat May 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.10.20090518svn
+- Rebuild for new poppler
+
+* Mon May 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.9.20090518svn
+- Update past upstream Beta release
+
+* Mon May 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.8.20090508svn
+- Fix ODG export
+
+* Fri May 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.7.20090508svn
+- Update to a post-alpha snapshot
+- Upstream applied our GCC 4.4 patch
+
+* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.6.20090410svn
+- Update to newer snapshot
+- Fix doc/incview reversed subpackage content
+
+* Wed Mar 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.6.20090301svn
+- Rebuild for new ImageMagick
+
+* Wed Mar 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.5.20090301svn
+- Split documentation and inkview into subpackages
+
+* Mon Mar 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.4.20090301svn
+- Bump to later SVN snapshot to fix inkscape/+bug/331864
+- Fix a startup crash when compiled with GCC 4.4
+- It even runs now! :)
+
+* Fri Feb 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.4.20090227svn
+- Enable the test suite
+
+* Fri Feb 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090227svn
+- Past midnight! :)
+- More recent snapshot, our gcc44 fixes now upstream
+- One more gcc44 fix, it even compiles now
+- We install icons now, update icon cache
+- Disable inkboard, for it won't currently compile
+
+* Thu Feb 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090226svn
+- Later snapshot
+- Compile with GCC 4.4
+
+* Tue Jan 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090105svn
+- Update to newer SVN
+- Drop upstreamed patches
+- Enable WordPerfect Graphics support
+- Enable embedded Perl scripting
+- Enable Imagemagick support
+- Disable OpenSSL due to licensing issues
+
+* Thu Aug 14 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20080814svn
+- Update to today's SVN snapshot
+- Drop the upstreamed poppler patch
+
+* Wed Aug 13 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.2.20080705svn
+- Rediff patches for zero fuzz
+- Use uniconvertor to handle CDR and WMF (#458845)
+
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.1.20080705svn
+- Subversion snapshot
+
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-4
+- Fix compile issues with newer gtk and poppler
+
+* Thu Jun 26 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-3
+- Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio
+
 * Fri Apr 11 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-2.1
 - More buildrequires more flexible, so that this builds on RHEL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Apr 2008 13:51:37 -0000	1.13
+++ sources	25 Sep 2009 17:10:24 -0000	1.14
@@ -1 +1 @@
-59997096c3640b2601c2b4afba8a3d75  inkscape-0.46.tar.bz2
+acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz


--- inkscape-0.45.1-desktop.patch DELETED ---


--- inkscape-0.46-fixlatex.patch DELETED ---


--- inkscape-0.46pre2-icons.patch DELETED ---


--- inkscape-16571-cxxinclude.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:21 +0000
Subject: [pkgdb] gfeed (Fedora, 10) updated by kevin
Message-ID: <20090925171221.F3F6210F86F@bastion2.fedora.phx.redhat.com>

kevin changed owner of gfeed in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:21 +0000
Subject: [pkgdb] gfeed (Fedora, 10) updated by kevin
Message-ID: <20090925171222.0EB2A10F884@bastion2.fedora.phx.redhat.com>

kevin changed owner of gfeed in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:22 +0000
Subject: [pkgdb] greyhounds (Fedora, 10) updated by kevin
Message-ID: <20090925171224.1158B10F897@bastion2.fedora.phx.redhat.com>

kevin changed owner of greyhounds in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/greyhounds



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:21 +0000
Subject: [pkgdb] gfeed (Fedora, 10) updated by kevin
Message-ID: <20090925171222.1B5E910F88A@bastion2.fedora.phx.redhat.com>

kevin changed owner of gfeed in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:22 +0000
Subject: [pkgdb] greyhounds (Fedora, 10) updated by kevin
Message-ID: <20090925171224.174C110F89A@bastion2.fedora.phx.redhat.com>

kevin changed owner of greyhounds in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/greyhounds



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:22 +0000
Subject: [pkgdb] greyhounds (Fedora, 10) updated by kevin
Message-ID: <20090925171224.2287810F89C@bastion2.fedora.phx.redhat.com>

kevin changed owner of greyhounds in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/greyhounds



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:26 +0000
Subject: [pkgdb] incollector (Fedora, 10) updated by kevin
Message-ID: <20090925171226.ADF9610F89F@bastion2.fedora.phx.redhat.com>

kevin changed owner of incollector in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:26 +0000
Subject: [pkgdb] incollector (Fedora, 10) updated by kevin
Message-ID: <20090925171226.A280310F86F@bastion2.fedora.phx.redhat.com>

kevin changed owner of incollector in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:26 +0000
Subject: [pkgdb] incollector (Fedora, 10) updated by kevin
Message-ID: <20090925171226.B871110F8A2@bastion2.fedora.phx.redhat.com>

kevin changed owner of incollector in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:28 +0000
Subject: [pkgdb] netmonitor (Fedora, 10) updated by kevin
Message-ID: <20090925171228.B51D210F8A4@bastion2.fedora.phx.redhat.com>

kevin changed owner of netmonitor in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:28 +0000
Subject: [pkgdb] netmonitor (Fedora, 10) updated by kevin
Message-ID: <20090925171228.BB47D10F8A8@bastion2.fedora.phx.redhat.com>

kevin changed owner of netmonitor in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:28 +0000
Subject: [pkgdb] netmonitor (Fedora, 10) updated by kevin
Message-ID: <20090925171228.C16E110F8AB@bastion2.fedora.phx.redhat.com>

kevin changed owner of netmonitor in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:30 +0000
Subject: [pkgdb] pic2aa (Fedora, 10) updated by kevin
Message-ID: <20090925171231.110AC10F884@bastion2.fedora.phx.redhat.com>

kevin changed owner of pic2aa in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/pic2aa



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:30 +0000
Subject: [pkgdb] pic2aa (Fedora, 10) updated by kevin
Message-ID: <20090925171231.2AF1F10F890@bastion2.fedora.phx.redhat.com>

kevin changed owner of pic2aa in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/pic2aa



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:30 +0000
Subject: [pkgdb] pic2aa (Fedora, 10) updated by kevin
Message-ID: <20090925171231.C926010F8AD@bastion2.fedora.phx.redhat.com>

kevin changed owner of pic2aa in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/pic2aa



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:33 +0000
Subject: [pkgdb] scythia (Fedora, 10) updated by kevin
Message-ID: <20090925171233.2227D10F897@bastion2.fedora.phx.redhat.com>

kevin changed owner of scythia in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/scythia



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:33 +0000
Subject: [pkgdb] scythia (Fedora, 10) updated by kevin
Message-ID: <20090925171233.2A6E810F89A@bastion2.fedora.phx.redhat.com>

kevin changed owner of scythia in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/scythia



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:33 +0000
Subject: [pkgdb] scythia (Fedora, 10) updated by kevin
Message-ID: <20090925171233.3D55210F8B0@bastion2.fedora.phx.redhat.com>

kevin changed owner of scythia in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/scythia



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:35 +0000
Subject: [pkgdb] wavextract (Fedora, 10) updated by kevin
Message-ID: <20090925171235.B5CCF10F8B1@bastion2.fedora.phx.redhat.com>

kevin changed owner of wavextract in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/wavextract



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:35 +0000
Subject: [pkgdb] wavextract (Fedora, 10) updated by kevin
Message-ID: <20090925171235.BDA1010F8B3@bastion2.fedora.phx.redhat.com>

kevin changed owner of wavextract in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/wavextract



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:35 +0000
Subject: [pkgdb] wavextract (Fedora, 10) updated by kevin
Message-ID: <20090925171235.C419A10F8B5@bastion2.fedora.phx.redhat.com>

kevin changed owner of wavextract in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/wavextract



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:37 +0000
Subject: [pkgdb] xhotkeys (Fedora, 10) updated by kevin
Message-ID: <20090925171237.AE10D10F89C@bastion2.fedora.phx.redhat.com>

kevin changed owner of xhotkeys in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/xhotkeys



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:37 +0000
Subject: [pkgdb] xhotkeys (Fedora, 10) updated by kevin
Message-ID: <20090925171237.B48CD10F89F@bastion2.fedora.phx.redhat.com>

kevin changed owner of xhotkeys in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/xhotkeys



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:37 +0000
Subject: [pkgdb] xhotkeys (Fedora, 10) updated by kevin
Message-ID: <20090925171237.BA66110F8B7@bastion2.fedora.phx.redhat.com>

kevin changed owner of xhotkeys in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/xhotkeys



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:40 +0000
Subject: [pkgdb] yoltia (Fedora, 10) updated by kevin
Message-ID: <20090925171240.464A910F8A1@bastion2.fedora.phx.redhat.com>

kevin changed owner of yoltia in Fedora 11 to orphan

To make changes to this package see:
  /pkgdb/packages/name/yoltia



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:40 +0000
Subject: [pkgdb] yoltia (Fedora, 10) updated by kevin
Message-ID: <20090925171240.4DD8C10F8A3@bastion2.fedora.phx.redhat.com>

kevin changed owner of yoltia in Fedora devel to orphan

To make changes to this package see:
  /pkgdb/packages/name/yoltia



From pkgdb at fedoraproject.org  Fri Sep 25 17:12:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:12:40 +0000
Subject: [pkgdb] yoltia (Fedora, 10) updated by kevin
Message-ID: <20090925171240.53FCD10F8B9@bastion2.fedora.phx.redhat.com>

kevin changed owner of yoltia in Fedora 10 to orphan

To make changes to this package see:
  /pkgdb/packages/name/yoltia



From kasal at fedoraproject.org  Fri Sep 25 17:12:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 25 Sep 2009 17:12:41 +0000 (UTC)
Subject: rpms/perl-DBD-Pg/F-11 .cvsignore, 1.22, 1.23 perl-DBD-Pg.spec, 1.50,
	1.51 sources, 1.23, 1.24
Message-ID: <20090925171241.B319811C00E8@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-serv27869

Modified Files:
	.cvsignore perl-DBD-Pg.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	4 May 2009 12:38:06 -0000	1.22
+++ .cvsignore	25 Sep 2009 17:12:41 -0000	1.23
@@ -1 +1 @@
-DBD-Pg-2.13.1.tar.gz
+DBD-Pg-2.15.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.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- perl-DBD-Pg.spec	4 May 2009 12:38:06 -0000	1.50
+++ perl-DBD-Pg.spec	25 Sep 2009 17:12:41 -0000	1.51
@@ -1,5 +1,5 @@
 Name:           perl-DBD-Pg
-Version:        2.13.1
+Version:        2.15.1
 Release:        1%{?dist}
 Summary:        A PostgreSQL interface for perl
 
@@ -10,11 +10,15 @@ Source0:        http://search.cpan.org/C
 Patch0:         perl-DBD-1.31-fixver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl(DBI) >= 1.38
+# Prevent bug #443495
+BuildRequires:  perl(DBI) >= 1.607
+
 BuildRequires:  postgresql-devel >= 7.2
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(DBI) >= 1.38
+
+# Missed by the find provides script:
+Provides:       perl(DBD::Pg) = %{version}
 
 %description 
 An implementation of DBI for PostgreSQL for Perl.
@@ -58,6 +62,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Stepan Kasal <skasal at redhat.com> - 2.15.1-1
+- new upstream version
+- add versioned provide (#525502)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Stepan Kasal <skasal at redhat.com> - 2.13.1-2
+- rebuild against perl-DBI-1.609
+
 * Mon May  4 2009 Stepan Kasal <skasal at redhat.com> - 2.13.1-1
 - new upstream release, also fixes #498899
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-Pg/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	4 May 2009 12:38:06 -0000	1.23
+++ sources	25 Sep 2009 17:12:41 -0000	1.24
@@ -1 +1 @@
-4e16c70109146d18a11a5170d30b305a  DBD-Pg-2.13.1.tar.gz
+b1c5488a68fa61cc3694b0cd4e413e25  DBD-Pg-2.15.1.tar.gz



From nsantos at fedoraproject.org  Fri Sep 25 17:14:57 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 25 Sep 2009 17:14:57 +0000 (UTC)
Subject: rpms/amqp/devel .cvsignore, 1.17, 1.18 amqp.spec, 1.24, 1.25 sources,
	1.20, 1.21
Message-ID: <20090925171457.6256011C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29239

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 818599


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Sep 2009 22:02:56 -0000	1.17
+++ .cvsignore	25 Sep 2009 17:14:57 -0000	1.18
@@ -1 +1 @@
-amqp-1.0.816781.tar.gz
+amqp-1.0.818599.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/amqp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- amqp.spec	18 Sep 2009 22:02:56 -0000	1.24
+++ amqp.spec	25 Sep 2009 17:14:57 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.816781
+Version:        1.0.818599
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.818599-1
+- Rebased to svn rev 818599
+
 * Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.816781-1
 - Rebased to svn rev 816781
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Sep 2009 22:02:56 -0000	1.20
+++ sources	25 Sep 2009 17:14:57 -0000	1.21
@@ -1 +1 @@
-e693d05306a2a969ae00810ec703eff8  amqp-1.0.816781.tar.gz
+3f15cfd454adefca53c1138dade833b1  amqp-1.0.818599.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 17:20:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:20:03 +0000
Subject: [pkgdb] fence-virt: fabbione has requested commit
Message-ID: <20090925172003.6F55710F897@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on fence-virt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From pkgdb at fedoraproject.org  Fri Sep 25 17:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:20:04 +0000
Subject: [pkgdb] fence-virt: fabbione has requested commit
Message-ID: <20090925172006.1A74210F86F@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on fence-virt (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From pkgdb at fedoraproject.org  Fri Sep 25 17:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:20:41 +0000
Subject: [pkgdb] fence-virt (Fedora, 12) updated by kevin
Message-ID: <20090925172042.E8DCF10F87C@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on fence-virt (Fedora 12) for fabbione
kevin approved watchcommits on fence-virt (Fedora 12) for fabbione
kevin approved commit on fence-virt (Fedora 12) for fabbione
kevin approved build on fence-virt (Fedora 12) for fabbione
kevin approved approveacls on fence-virt (Fedora 12) for fabbione

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From pkgdb at fedoraproject.org  Fri Sep 25 17:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:20:41 +0000
Subject: [pkgdb] fence-virt (Fedora, 12) updated by kevin
Message-ID: <20090925172043.0561910F890@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on fence-virt (Fedora devel) for fabbione
kevin approved watchcommits on fence-virt (Fedora devel) for fabbione
kevin approved commit on fence-virt (Fedora devel) for fabbione
kevin approved build on fence-virt (Fedora devel) for fabbione
kevin approved approveacls on fence-virt (Fedora devel) for fabbione

To make changes to this package see:
  /pkgdb/packages/name/fence-virt



From nsantos at fedoraproject.org  Fri Sep 25 17:24:07 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 25 Sep 2009 17:24:07 +0000 (UTC)
Subject: rpms/python-qpid/devel .cvsignore, 1.16, 1.17 python-qpid.spec, 1.30,
	1.31 sources, 1.20, 1.21
Message-ID: <20090925172407.D97E211C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31738

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 818599


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 Sep 2009 22:12:13 -0000	1.16
+++ .cvsignore	25 Sep 2009 17:24:07 -0000	1.17
@@ -1 +1 @@
-python-qpid-0.5.816781.tar.gz
+python-qpid-0.5.818599.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- python-qpid.spec	18 Sep 2009 22:46:11 -0000	1.30
+++ python-qpid.spec	25 Sep 2009 17:24:07 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.5.816781
+Version:        0.5.818599
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.816781
+Requires:       amqp >= 1.0.818599
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+
 * Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
 - Rebased to svn rev 816781
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Sep 2009 22:12:13 -0000	1.20
+++ sources	25 Sep 2009 17:24:07 -0000	1.21
@@ -1 +1 @@
-87c3f926008a8de5d25fdc18e8c368e3  python-qpid-0.5.816781.tar.gz
+bfa1ce6ad9f711f726b3b521694884b8  python-qpid-0.5.818599.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 17:30:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:30:50 +0000
Subject: [pkgdb] greyhounds (Fedora, 10) updated by kevin
Message-ID: <20090925173051.1F0BA10F885@bastion2.fedora.phx.redhat.com>

kevin changed owner of greyhounds in Fedora 10 to kevin

To make changes to this package see:
  /pkgdb/packages/name/greyhounds



From pkgdb at fedoraproject.org  Fri Sep 25 17:30:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:30:50 +0000
Subject: [pkgdb] greyhounds (Fedora, 10) updated by kevin
Message-ID: <20090925173051.29F0E10F890@bastion2.fedora.phx.redhat.com>

kevin changed owner of greyhounds in Fedora devel to kevin

To make changes to this package see:
  /pkgdb/packages/name/greyhounds



From pkgdb at fedoraproject.org  Fri Sep 25 17:30:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:30:50 +0000
Subject: [pkgdb] greyhounds (Fedora, 10) updated by kevin
Message-ID: <20090925173051.11AC810F87C@bastion2.fedora.phx.redhat.com>

kevin changed owner of greyhounds in Fedora 11 to kevin

To make changes to this package see:
  /pkgdb/packages/name/greyhounds



From praveenp at fedoraproject.org  Fri Sep 25 17:31:50 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 25 Sep 2009 17:31:50 +0000 (UTC)
Subject: rpms/openwsman/devel .cvsignore, 1.2, 1.3 openwsman.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090925173150.A029111C00E8@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1197

Modified Files:
	.cvsignore openwsman.spec sources 
Log Message:
Updated the sources to openwsman-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2008 10:57:30 -0000	1.2
+++ .cvsignore	25 Sep 2009 17:31:50 -0000	1.3
@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/devel/openwsman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openwsman.spec	21 Aug 2009 15:09:32 -0000	1.4
+++ openwsman.spec	25 Sep 2009 17:31:50 -0000	1.5
@@ -1,9 +1,10 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
-Version:       2.1.0
-Release:        4%{?dist}
+Version:       2.2.0
+Release:        1%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -63,6 +64,7 @@ chmod a-x include/*.[ch]
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
 %configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
+echo %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 make %{?_smp_flags}
 
 %install
@@ -95,6 +97,8 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
+/usr/lib/ruby/site_ruby/1.8/openwsman/
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
 %files devel
@@ -109,7 +113,7 @@ rm -rf %{buildroot}
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -135,6 +139,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
+- Added the new 2.2.0 sources.
+- Changed the release and version numbers.
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2008 10:57:30 -0000	1.2
+++ sources	25 Sep 2009 17:31:50 -0000	1.3
@@ -1 +1 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2



From nsantos at fedoraproject.org  Fri Sep 25 17:37:55 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 25 Sep 2009 17:37:55 +0000 (UTC)
Subject: rpms/ruby-qpid/devel .cvsignore, 1.13, 1.14 ruby-qpid.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <20090925173755.5FFC811C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3091

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 818599


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	19 Sep 2009 00:26:05 -0000	1.13
+++ .cvsignore	25 Sep 2009 17:37:55 -0000	1.14
@@ -1 +1 @@
-ruby-qpid-0.5.816781.tar.gz
+ruby-qpid-0.5.818599.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ruby-qpid.spec	19 Sep 2009 00:42:25 -0000	1.21
+++ ruby-qpid.spec	25 Sep 2009 17:37:55 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version: 	0.5.816781
+Version: 	0.5.818599
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -22,12 +22,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.816781
+BuildRequires:  amqp >= 1.0.818599
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.816781
+Requires:       amqp >= 1.0.818599
 Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt NOTICE.txt RELEASE_NOTES
 
 %changelog
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+
 * Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
 - Rebased to svn rev 816781
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	19 Sep 2009 00:26:05 -0000	1.13
+++ sources	25 Sep 2009 17:37:55 -0000	1.14
@@ -1 +1 @@
-5c270a6ffaf1527f38bfa3d03f47e413  ruby-qpid-0.5.816781.tar.gz
+51bdde963e7809f72b14cf77a33b3bb6  ruby-qpid-0.5.818599.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 17:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:40:08 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchcommits
Message-ID: <20090925174008.C9E9E10F87C@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on pg_top (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:40:08 +0000
Subject: [pkgdb] pg_top: atorkhov has requested commit
Message-ID: <20090925174009.6FF4110F897@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on pg_top (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:40:09 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchbugzilla
Message-ID: <20090925174009.5C70710F885@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on pg_top (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:40:12 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchcommits
Message-ID: <20090925174014.12A0B10F86F@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on pg_top (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:40:14 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchbugzilla
Message-ID: <20090925174014.7C71610F89A@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on pg_top (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:40:14 +0000
Subject: [pkgdb] pg_top: atorkhov has requested commit
Message-ID: <20090925174014.98E0D10F89D@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on pg_top (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:47:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:47:21 +0000
Subject: [pkgdb] pg_top (Fedora EPEL, 4) updated by kevin
Message-ID: <20090925174721.918B710F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for pg_top
kevin has set commit to Approved for 107427 on pg_top (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on pg_top (Fedora EPEL 4)
kevin has set build to Approved for 107427 on pg_top (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:47:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:47:21 +0000
Subject: [pkgdb] pg_top (Fedora EPEL, 4) updated by kevin
Message-ID: <20090925174721.A153A10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pg_top
kevin has set commit to Approved for 107427 on pg_top (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pg_top (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pg_top (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From nsantos at fedoraproject.org  Fri Sep 25 17:47:50 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 25 Sep 2009 17:47:50 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.100,1.101
Message-ID: <20090925174750.3AE4511C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6596

Modified Files:
	qpidc.spec 
Log Message:
Rebased to svn rev 818599


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- qpidc.spec	25 Sep 2009 15:58:01 -0000	1.100
+++ qpidc.spec	25 Sep 2009 17:47:50 -0000	1.101
@@ -44,10 +44,13 @@ BuildRequires: xerces-c-devel
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
+
+%ifarch i686 x86_64
 #RHM
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 #/RHM
+%endif
 
 Requires: boost
 
@@ -212,6 +215,7 @@ Requires: qpidc = %version-%release
 Tools for performing testing and benchmarking of MRG-Messaging
 
 %ifarch i686 x86_64
+#RHM
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
 Group: System Environment/Libraries
@@ -219,12 +223,12 @@ Requires: qpidd = 0.5.%{qpid_svnrev}
 Requires: db4
 Requires: libaio
 Obsoletes: rhm
-#ExclusiveArch: i386 i586 x86_64
 
 %description -n rhm-cpp-server-store
 Red Hat persistence extension to the Qpid AMQP broker: persistent message
 storage using either a libaio-based asynchronous journal, or synchronously
 with Berkeley DB.
+#/RHM
 %endif
 
 %pre -n qpidd



From pkgdb at fedoraproject.org  Fri Sep 25 17:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:48:03 +0000
Subject: [pkgdb] redir (Fedora EPEL, 4) updated by kevin
Message-ID: <20090925174803.163D610F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for redir
kevin has set commit to Approved for 107427 on redir (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on redir (Fedora EPEL 4)
kevin has set build to Approved for 107427 on redir (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/redir



From mclasen at fedoraproject.org  Fri Sep 25 17:48:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 17:48:56 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel osd-rounded-rectangle.patch, NONE, 
	1.1 osd-visual-refresh.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.126, 1.127
Message-ID: <20090925174856.352F411C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7066

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	osd-rounded-rectangle.patch osd-visual-refresh.patch 
Log Message:
Update the OSD visuals


osd-rounded-rectangle.patch:
 gsd-media-keys-window.c |  104 ++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 55 deletions(-)

--- NEW FILE osd-rounded-rectangle.patch ---
>From 8fe2c6627deb4d783715f3bbd315c65023451775 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 23 Sep 2009 20:23:31 -0400
Subject: [PATCH 1/2] Use a rounded instead of curved rectangle

---
 plugins/media-keys/gsd-media-keys-window.c |  101 +++++++++++++---------------
 1 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index 9306b92..89071b8 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -260,59 +260,54 @@ gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
 }
 
 static void
-curved_rectangle (cairo_t *cr,
-                  double   x0,
-                  double   y0,
-                  double   width,
-                  double   height,
-                  double   radius)
-{
-        double x1;
-        double y1;
-
-        x1 = x0 + width;
-        y1 = y0 + height;
-
-        if (!width || !height) {
-                return;
-        }
-
-        if (width / 2 < radius) {
-                if (height / 2 < radius) {
-                        cairo_move_to  (cr, x0, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1) / 2, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2);
-                } else {
-                        cairo_move_to  (cr, x0, y0 + radius);
-                        cairo_curve_to (cr, x0, y0, x0, y0, (x0 + x1) / 2, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-                        cairo_line_to (cr, x1, y1 - radius);
-                        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius);
-                }
-        } else {
-                if (height / 2 < radius) {
-                        cairo_move_to  (cr, x0, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x0, y0, x0 , y0, x0 + radius, y0);
-                        cairo_line_to (cr, x1 - radius, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-                        cairo_line_to (cr, x0 + radius, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2);
-                } else {
-                        cairo_move_to  (cr, x0, y0 + radius);
-                        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-                        cairo_line_to (cr, x1 - radius, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-                        cairo_line_to (cr, x1, y1 - radius);
-                        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-                        cairo_line_to (cr, x0 + radius, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius);
-                }
-        }
-
+rounded_rectangle (cairo_t* cr,
+                   gdouble  aspect,
+                   gdouble  x,
+                   gdouble  y,
+                   gdouble  corner_radius,
+                   gdouble  width,
+                   gdouble  height)
+{
+        gdouble radius = corner_radius / aspect;
+
+        cairo_move_to (cr, x + radius, y);
+
+        cairo_line_to (cr,
+                       x + width - radius,
+                       y);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + radius,
+                   radius,
+                   -90.0f * G_PI / 180.0f,
+                   0.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + width,
+                       y + height - radius);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + height - radius,
+                   radius,
+                   0.0f * G_PI / 180.0f,
+                   90.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + radius,
+                       y + height);
+        cairo_arc (cr,
+                   x + radius,
+                   y + height - radius,
+                   radius,
+                   90.0f * G_PI / 180.0f,
+                   180.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x,
+                       y + radius);
+        cairo_arc (cr,
+                   x + radius,
+                   y + radius,
+                   radius,
+                   180.0f * G_PI / 180.0f,
+                   270.0f * G_PI / 180.0f);
         cairo_close_path (cr);
 }
 
@@ -795,7 +790,7 @@ on_expose_event (GtkWidget          *widget,
         cairo_paint (cr);
 
         /* draw a box */
-        curved_rectangle (cr, 0.5, 0.5, width-1, height-1, height / 10);
+        rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
         color = GTK_WIDGET (window)->style->bg [GTK_STATE_NORMAL];
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
-- 
1.6.4.4


osd-visual-refresh.patch:
 gsd-media-keys-window.c |   70 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 20 deletions(-)

--- NEW FILE osd-visual-refresh.patch ---
>From cca9a6d853b4c1366cf965750f0a7c6e9c74e3a1 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 23 Sep 2009 21:15:45 -0400
Subject: [PATCH 2/2] Improve the media keys overlay design

---
 plugins/media-keys/gsd-media-keys-window.c |   69 ++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index 89071b8..a31edca 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -33,7 +33,7 @@
 #define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
 #define FADE_TIMEOUT 10        /* timeout in ms between each frame of the fade */
 
-#define BG_ALPHA 0.50
+#define BG_ALPHA 0.75
 #define FG_ALPHA 1.00
 
 static void     gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass);
@@ -593,6 +593,36 @@ render_speaker (GsdMediaKeysWindow *window,
 }
 
 static void
+color_reverse (const GdkColor *a,
+               GdkColor       *b)
+{
+        gdouble red;
+        gdouble green;
+        gdouble blue;
+        gdouble h;
+        gdouble s;
+        gdouble v;
+
+        red = (gdouble) a->red / 65535.0;
+        green = (gdouble) a->green / 65535.0;
+        blue = (gdouble) a->blue / 65535.0;
+
+        gtk_rgb_to_hsv (red, green, blue, &h, &s, &v);
+
+        v = 0.5 + (0.5 - v);
+        if (v > 1.0)
+                v = 1.0;
+        else if (v < 0.0)
+                v = 0.0;
+
+        gtk_hsv_to_rgb (h, s, v, &red, &green, &blue);
+
+        b->red = red * 65535.0;
+        b->green = green * 65535.0;
+        b->blue = blue * 65535.0;
+}
+
+static void
 draw_volume_boxes (GsdMediaKeysWindow *window,
                    cairo_t            *cr,
                    double              percentage,
@@ -605,35 +635,36 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         GdkColor color;
         double   r, g, b;
 
-        x1 = width * percentage;
+        x1 = (width - 2) * percentage;
 
         /* bar background */
-        color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->dark[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, width, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
-        cairo_fill (cr);
+        rounded_rectangle (cr, 1.0, x0, y0, height / 6, width, height);
+        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
+        cairo_fill_preserve (cr);
 
         /* bar border */
-        color = GTK_WIDGET (window)->style->dark [GTK_STATE_SELECTED];
+        color_reverse (&GTK_WIDGET (window)->style->light[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, width, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
+        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
         /* bar progress */
-        color = GTK_WIDGET (window)->style->bg [GTK_STATE_SELECTED];
-        r = (float)color.red / 65535.0;
-        g = (float)color.green / 65535.0;
-        b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, x1, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
-        cairo_fill (cr);
+        if (percentage > 0.01) {
+                color = GTK_WIDGET (window)->style->bg[GTK_STATE_NORMAL];
+                r = (float)color.red / 65535.0;
+                g = (float)color.green / 65535.0;
+                b = (float)color.blue / 65535.0;
+                rounded_rectangle (cr, 1.0, x0 + 1, y0 + 1, height / 8, x1, height - 2);
+                cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
+                cairo_fill (cr);
+        }
 }
 
 static void
@@ -791,18 +822,18 @@ on_expose_event (GtkWidget          *widget,
 
         /* draw a box */
         rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
-        color = GTK_WIDGET (window)->style->bg [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->bg[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
         cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
         cairo_fill_preserve (cr);
 
-        color = GTK_WIDGET (window)->style->fg [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->text_aa[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
+        cairo_set_source_rgba (cr, r, g, b, BG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
-- 
1.6.4.4



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- gnome-settings-daemon.spec	22 Sep 2009 19:35:04 -0000	1.126
+++ gnome-settings-daemon.spec	25 Sep 2009 17:48:56 -0000	1.127
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -32,6 +32,10 @@ BuildRequires:	gettext intltool
 BuildRequires:  fontconfig-devel
 BuildRequires:	libcanberra-devel
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596136
+Patch0: osd-rounded-rectangle.patch
+Patch1: osd-visual-refresh.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -49,6 +53,8 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .osd-rounded-rectangle
+%patch1 -p1 -b .osd-visual-refresh
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -160,6 +166,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Align the OSD visuals with the notification theme
+
 * Tue Sep 22 2009 Adam Jackson <ajax at redhat.com> 2.28.0-2
 - BuildRequires: libcanberra-devel
 



From pkgdb at fedoraproject.org  Fri Sep 25 17:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:49:35 +0000
Subject: [pkgdb] youtube-dl: sundaram has requested watchbugzilla
Message-ID: <20090925174936.71A9510F88A@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on youtube-dl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 25 17:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:49:36 +0000
Subject: [pkgdb] youtube-dl: sundaram has requested watchcommits
Message-ID: <20090925174936.B6ECC10F897@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on youtube-dl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 25 17:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:49:41 +0000
Subject: [pkgdb] youtube-dl: sundaram has requested commit
Message-ID: <20090925174941.D357910F885@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on youtube-dl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Fri Sep 25 17:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:49:42 +0000
Subject: [pkgdb] youtube-dl: sundaram has requested approveacls
Message-ID: <20090925174943.8850C10F898@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on youtube-dl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From jderose at fedoraproject.org  Fri Sep 25 17:49:47 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Fri, 25 Sep 2009 17:49:47 +0000 (UTC)
Subject: rpms/python-assets/F-12 import.log, NONE, 1.1 python-assets.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925174947.8BF2B11C00E8@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-assets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6912/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-assets.spec 
Log Message:



--- NEW FILE import.log ---
python-assets-0_1_0-1_fc11:F-12:python-assets-0.1.0-1.fc11.src.rpm:1253900871


--- NEW FILE python-assets.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-assets
Version:        0.1.0
Release:        1%{?dist}
Summary:        Cache-friendly asset management via content-hash-naming

Group:          Development/Languages
License:        LGPLv3+
URL:            http://jderose.fedorapeople.org/assets/
Source0:        http://jderose.fedorapeople.org/assets/%{version}/assets-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-nose

%description
The assets package does content-hash-naming (aka URL fingerprinting) so you can
use aggressive caching headers without risking that a client might have an
out-of-date version of an asset in its cache.  If the content changes, the
content-hash-name also changes, resulting in a different URL for each
bytewise-unique version of an asset.

%prep
%setup -q -n assets-%{version}

%build
%{__python} setup.py build

%check
nosetests --with-doctest

%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,-)
%doc README COPYING COPYING.LESSER
%{python_sitelib}/assetslib/
%{python_sitelib}/assets-%{version}-py2.6.egg-info

%changelog
* Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:32:46 -0000	1.1
+++ .cvsignore	25 Sep 2009 17:49:47 -0000	1.2
@@ -0,0 +1 @@
+assets-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:32:46 -0000	1.1
+++ sources	25 Sep 2009 17:49:47 -0000	1.2
@@ -0,0 +1 @@
+fbb3736161c8239d187aeb52262bddea  assets-0.1.0.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 17:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:49:59 +0000
Subject: [pkgdb] gfeed: sundaram has requested watchbugzilla
Message-ID: <20090925174959.EC34010F897@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on gfeed (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:01 +0000
Subject: [pkgdb] gfeed: sundaram has requested watchcommits
Message-ID: <20090925175002.549F510F86F@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on gfeed (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:03 +0000
Subject: [pkgdb] gfeed: sundaram has requested commit
Message-ID: <20090925175003.B21B410F897@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on gfeed (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:06 +0000
Subject: [pkgdb] gfeed: sundaram has requested approveacls
Message-ID: <20090925175006.8A7AE10F8A6@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on gfeed (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gfeed



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:38 +0000
Subject: [pkgdb] netmonitor: sundaram has requested watchbugzilla
Message-ID: <20090925175038.2B89E10F898@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on netmonitor (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:39 +0000
Subject: [pkgdb] netmonitor: sundaram has requested watchcommits
Message-ID: <20090925175039.D3EE010F89A@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on netmonitor (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:42 +0000
Subject: [pkgdb] netmonitor: sundaram has requested commit
Message-ID: <20090925175042.3207110F89C@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on netmonitor (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 17:50:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:50:43 +0000
Subject: [pkgdb] netmonitor: sundaram has requested approveacls
Message-ID: <20090925175045.030AA10F89F@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on netmonitor (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From chwang at fedoraproject.org  Fri Sep 25 17:51:02 2009
From: chwang at fedoraproject.org (Charley Wang)
Date: Fri, 25 Sep 2009 17:51:02 +0000 (UTC)
Subject: rpms/eclipse-callgraph/devel eclipse-callgraph-fetch-src.sh, NONE, 
	1.1 eclipse-callgraph.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925175102.CE1CC11C00E8@cvs1.fedora.phx.redhat.com>

Author: chwang

Update of /cvs/pkgs/rpms/eclipse-callgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-callgraph-fetch-src.sh eclipse-callgraph.spec 
	import.log 
Log Message:


Initial import (Review bug #525274)



--- NEW FILE eclipse-callgraph-fetch-src.sh ---
#!/bin/sh
usage='usage: $0 <tag>'
name=eclipse-callgraph
tag=callgraphR0_0_1
tar_name=$name-fetched-src-$tag

fetch_cmd="svn export http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/tags/$tag"

rm -fr $tar_name && mkdir $tar_name
pushd $tar_name

# Fetch plugins
$fetch_cmd
mv $tag/* ./
rmdir $tag

popd
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name


--- NEW FILE eclipse-callgraph.spec ---
%global src_repo_tag   callgraphR0_0_1
%global eclipse_base   %{_libdir}/eclipse
%global install_loc    %{_libdir}/eclipse/dropins/callgraph
%global debug_package %{nil}

Name:           eclipse-callgraph
Version:        0.0.1
Release:        2%{?dist}
Summary:        C/C++ Call Graph Visualization Tool

Group:          Development/Tools
License:        EPL
URL:            http://eclipse.org/linuxtools
# sh %{name}-fetch-src.sh
Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.bz2
Source1:        %{name}-fetch-src.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: eclipse-cdt
BuildRequires: eclipse-gef
BuildRequires: eclipse-pde
BuildRequires: eclipse-linuxprofilingframework
Requires: systemtap
Requires: eclipse-gef
Requires: eclipse-cdt
Requires: eclipse-linuxprofilingframework

%description
Graphically displays the call hierarchy from executing a C/C++ binary, along
with various other runtime statistics.

%prep
%setup -q -n %{name}-fetched-src-%{src_repo_tag}

%build
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.callgraph \
 -d "cdt gef linuxprofilingframework"

%install
#installs to /usr/lib/eclipse/callgraph due to dependency on eclipse-
#linuxprofilingframework, which depends on architecture.
%{__rm} -rf %{buildroot}
install -d -m 755 %{buildroot}%{install_loc}

%{__unzip} -q -d %{buildroot}%{install_loc} \
     build/rpmBuild/org.eclipse.linuxtools.callgraph.zip 

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{install_loc}
%doc org.eclipse.linuxtools.callgraph-feature/epl-v10.html

%changelog
* Thu Sep 24 2009 Roland Grunberg <rgrunber at redhat.com> 0.0.1-2
- Some more changes to spec file

* Thu Sep 24 2009 Charley Wang <chwang at redhat.com> 0.0.1-1
- Make minor changes to spec file

* Thu Sep 24 2009 Charley Wang <chwang at redhat.com> 0.0.1-1
- Initial creation of eclipse-callgraph


--- NEW FILE import.log ---
eclipse-callgraph-0_0_1-2_fc11:HEAD:eclipse-callgraph-0.0.1-2.fc11.src.rpm:1253900608


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-callgraph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 15:34:15 -0000	1.1
+++ .cvsignore	25 Sep 2009 17:51:02 -0000	1.2
@@ -0,0 +1 @@
+eclipse-callgraph-fetched-src-callgraphR0_0_1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-callgraph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 15:34:15 -0000	1.1
+++ sources	25 Sep 2009 17:51:02 -0000	1.2
@@ -0,0 +1 @@
+7cca9a852a446094b5c489f73f98845c  eclipse-callgraph-fetched-src-callgraphR0_0_1.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 25 17:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:51:27 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175127.5EFBD10F885@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on pg_top (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:51:27 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175127.D3C7710F897@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on pg_top (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:51:29 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175129.6EA6610F89A@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on pg_top (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:51:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:51:40 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175140.77DAF10F898@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on pg_top (Fedora 11) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:51:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:51:40 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175141.8D41410F89C@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on pg_top (Fedora 11) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:51:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:51:42 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175142.C97C610F89F@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on pg_top (Fedora 11) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From fabbione at fedoraproject.org  Fri Sep 25 17:53:15 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 17:53:15 +0000 (UTC)
Subject: rpms/fence-virt/F-12 fence-virt.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925175315.3D5E411C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-virt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8416

Modified Files:
	.cvsignore sources 
Added Files:
	fence-virt.spec 
Log Message:
First import



--- NEW FILE fence-virt.spec ---
Name:		fence-virt
Version:	0.1.2
Release:	1%{?dist}
Summary:	A pluggable fencing framework for virtual machines
Group:		System Environment/Base
License:	GPLv2+
URL:		http://voxel.dl.sourceforge.net/project/fence-virt/fence-virt-%{version}.tar.gz
Source0:	%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	corosynclib-devel cman-devel libvirt-devel openaislib-devel
BuildRequires:	automake autoconf libxml2-devel nss-devel nspr-devel
BuildRequires:	flex bison

%description
Fencing agent for virtual machines.


%package -n fence-virtd
Summary:	Daemon which handles requests from fence-virt
Group:		System Environment/Base

%description -n fence-virtd
This package provides the host server framework, fence_virtd,
for fence_virt.  The fence_virtd host daemon is resposible for
processing fencing requests from virtual machines and routing
the requests to the appropriate physical machine for action.


%package -n fence-virtd-multicast
Summary:	Multicast listener for fence-virtd
Group:		System Environment/Base
Requires:	fence-virtd

%description -n fence-virtd-multicast
Provides multicast listener capability for fence-virtd.


%package -n fence-virtd-libvirt
Summary:	Libvirt backend for fence-virtd
Group:		System Environment/Base
Requires:	libvirt > 0.6.0
Requires:	fence-virtd

%description -n fence-virtd-libvirt
Provides fence_virtd with a connection to libvirt to fence
virtual machines.  Useful for running a cluster of virtual
machines on a desktop.


%package -n fence-virtd-checkpoint
Summary:	Libvirt backend for fence-virtd
Group:		System Environment/Base
Requires:	fence-virtd

%description -n fence-virtd-checkpoint
Provides fence_virtd with a connection to libvirt to fence
virtual machines.  Utilizes corosync's CPG framework to route
requests as well as the AIS Checkpoint API to store virtual
machine states across a cluster and make intelligent decisions
about whether a virtual machine is running.


%prep
%setup -q


%build
./autogen.sh
%{configure}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING TODO README
%{_sbindir}/fence_virt

%files -n fence-virtd
%defattr(-,root,root,-)
%{_sbindir}/fence_virtd
%config(noreplace) /etc/fence_virt.conf
%dir %{_libdir}/%{name}
# TODO: init script to start fence_virtd
# TODO: auto-config utility

%files -n fence-virtd-multicast
%defattr(-,root,root,-)
%{_libdir}/%{name}/multicast.so

%files -n fence-virtd-libvirt
%defattr(-,root,root,-)
%{_libdir}/%{name}/libvirt.so

%files -n fence-virtd-checkpoint
%defattr(-,root,root,-)
%{_libdir}/%{name}/checkpoint.so

%changelog
* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.2-1
- Update to latest upstream version
- Fix build issue on i686

* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.1-1
- Update to latest upstream version
- Clean up spec file

* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1-2
- Spec file cleanup

* Thu Sep 17 2009 Lon Hohberger <lhh at redhat.com> 0.1-1
- Initial build for rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:15:43 -0000	1.1
+++ .cvsignore	25 Sep 2009 17:53:15 -0000	1.2
@@ -0,0 +1 @@
+fence-virt-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:15:43 -0000	1.1
+++ sources	25 Sep 2009 17:53:15 -0000	1.2
@@ -0,0 +1 @@
+57b25e050119071ca3a581d55b30a187  fence-virt-0.1.2.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:20 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchcommits
Message-ID: <20090925175721.2C33410F86F@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on pg_top (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:22 +0000
Subject: [pkgdb] pg_top: atorkhov has requested commit
Message-ID: <20090925175722.307D210F885@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on pg_top (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:21 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchbugzilla
Message-ID: <20090925175722.C83ED10F897@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on pg_top (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:23 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchcommits
Message-ID: <20090925175724.0431E10F89B@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on pg_top (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:24 +0000
Subject: [pkgdb] pg_top: atorkhov has requested commit
Message-ID: <20090925175724.5937510F89F@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on pg_top (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:24 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchbugzilla
Message-ID: <20090925175724.8A5A410F8A3@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on pg_top (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:27 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchcommits
Message-ID: <20090925175727.4E2E010F86F@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on pg_top (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:27 +0000
Subject: [pkgdb] pg_top: atorkhov has requested commit
Message-ID: <20090925175727.D577110F8A9@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on pg_top (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:57:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:57:31 +0000
Subject: [pkgdb] pg_top: atorkhov has requested watchbugzilla
Message-ID: <20090925175731.730E410F885@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on pg_top (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:29 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175829.844E410F86F@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on pg_top (Fedora 10) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:31 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175831.9E88310F897@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on pg_top (Fedora 10) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:30 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175830.E400510F885@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on pg_top (Fedora 10) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:38 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175838.5E55310F86F@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on pg_top (Fedora EPEL 4) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:37 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175838.E259110F885@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on pg_top (Fedora EPEL 4) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:40 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175840.81EBC10F898@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on pg_top (Fedora EPEL 4) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:42 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175842.6CE7A10F86F@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on pg_top (Fedora EPEL 5) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:44 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175844.9308510F89F@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on pg_top (Fedora EPEL 5) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:58:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:58:45 +0000
Subject: [pkgdb] pg_top had acl change status
Message-ID: <20090925175846.A4A7510F884@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on pg_top (Fedora EPEL 5) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Sep 25 17:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:59:43 +0000
Subject: [pkgdb] sparse: jlayton has requested watchbugzilla
Message-ID: <20090925175943.28C3610F86F@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchbugzilla acl on sparse (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 17:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:59:47 +0000
Subject: [pkgdb] sparse: jlayton has requested watchcommits
Message-ID: <20090925175947.9B77E10F88A@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchcommits acl on sparse (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 17:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:59:51 +0000
Subject: [pkgdb] sparse: jlayton has requested commit
Message-ID: <20090925175951.1908110F87C@bastion2.fedora.phx.redhat.com>

jlayton has requested the commit acl on sparse (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 17:59:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 17:59:53 +0000
Subject: [pkgdb] sparse: jlayton has requested approveacls
Message-ID: <20090925175953.A50A910F88A@bastion2.fedora.phx.redhat.com>

jlayton has requested the approveacls acl on sparse (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:03 +0000
Subject: [pkgdb] sparse: jlayton has requested watchbugzilla
Message-ID: <20090925180004.D1D8610F87C@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchbugzilla acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:10 +0000
Subject: [pkgdb] sparse: jlayton has requested commit
Message-ID: <20090925180011.3600010F897@bastion2.fedora.phx.redhat.com>

jlayton has requested the commit acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:06 +0000
Subject: [pkgdb] sparse: jlayton has requested watchcommits
Message-ID: <20090925180006.5BFC710F88A@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchcommits acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:13 +0000
Subject: [pkgdb] sparse: jlayton has requested approveacls
Message-ID: <20090925180013.4FB9210F89B@bastion2.fedora.phx.redhat.com>

jlayton has requested the approveacls acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:21 +0000
Subject: [pkgdb] sparse: jlayton has requested watchbugzilla
Message-ID: <20090925180021.3481A10F86F@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchbugzilla acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:23 +0000
Subject: [pkgdb] sparse: jlayton has requested watchcommits
Message-ID: <20090925180023.8A15F10F898@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchcommits acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:24 +0000
Subject: [pkgdb] sparse: jlayton has requested commit
Message-ID: <20090925180025.9049810F8A2@bastion2.fedora.phx.redhat.com>

jlayton has requested the commit acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:30 +0000
Subject: [pkgdb] sparse: jlayton has requested approveacls
Message-ID: <20090925180030.5F3DE10F884@bastion2.fedora.phx.redhat.com>

jlayton has requested the approveacls acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:42 +0000
Subject: [pkgdb] sparse: jlayton has requested watchbugzilla
Message-ID: <20090925180042.0C41D10F86F@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchbugzilla acl on sparse (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:44 +0000
Subject: [pkgdb] sparse: jlayton has requested watchcommits
Message-ID: <20090925180044.A490210F88A@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchcommits acl on sparse (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:46 +0000
Subject: [pkgdb] sparse: jlayton has requested commit
Message-ID: <20090925180046.8AE3E10F86F@bastion2.fedora.phx.redhat.com>

jlayton has requested the commit acl on sparse (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:48 +0000
Subject: [pkgdb] sparse: jlayton has requested approveacls
Message-ID: <20090925180048.6C2EE10F89B@bastion2.fedora.phx.redhat.com>

jlayton has requested the approveacls acl on sparse (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:50 +0000
Subject: [pkgdb] sparse: jlayton has requested watchbugzilla
Message-ID: <20090925180050.B66C210F88A@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchbugzilla acl on sparse (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:52 +0000
Subject: [pkgdb] sparse: jlayton has requested watchcommits
Message-ID: <20090925180052.94C4810F89F@bastion2.fedora.phx.redhat.com>

jlayton has requested the watchcommits acl on sparse (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From fabbione at fedoraproject.org  Fri Sep 25 18:00:50 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 25 Sep 2009 18:00:50 +0000 (UTC)
Subject: rpms/fence-virt/devel fence-virt.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925180050.3DA3111C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-virt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10512

Modified Files:
	.cvsignore sources 
Added Files:
	fence-virt.spec 
Log Message:
First import



--- NEW FILE fence-virt.spec ---
Name:		fence-virt
Version:	0.1.2
Release:	1%{?dist}
Summary:	A pluggable fencing framework for virtual machines
Group:		System Environment/Base
License:	GPLv2+
URL:		http://voxel.dl.sourceforge.net/project/fence-virt/fence-virt-%{version}.tar.gz
Source0:	%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	corosynclib-devel cman-devel libvirt-devel openaislib-devel
BuildRequires:	automake autoconf libxml2-devel nss-devel nspr-devel
BuildRequires:	flex bison

%description
Fencing agent for virtual machines.


%package -n fence-virtd
Summary:	Daemon which handles requests from fence-virt
Group:		System Environment/Base

%description -n fence-virtd
This package provides the host server framework, fence_virtd,
for fence_virt.  The fence_virtd host daemon is resposible for
processing fencing requests from virtual machines and routing
the requests to the appropriate physical machine for action.


%package -n fence-virtd-multicast
Summary:	Multicast listener for fence-virtd
Group:		System Environment/Base
Requires:	fence-virtd

%description -n fence-virtd-multicast
Provides multicast listener capability for fence-virtd.


%package -n fence-virtd-libvirt
Summary:	Libvirt backend for fence-virtd
Group:		System Environment/Base
Requires:	libvirt > 0.6.0
Requires:	fence-virtd

%description -n fence-virtd-libvirt
Provides fence_virtd with a connection to libvirt to fence
virtual machines.  Useful for running a cluster of virtual
machines on a desktop.


%package -n fence-virtd-checkpoint
Summary:	Libvirt backend for fence-virtd
Group:		System Environment/Base
Requires:	fence-virtd

%description -n fence-virtd-checkpoint
Provides fence_virtd with a connection to libvirt to fence
virtual machines.  Utilizes corosync's CPG framework to route
requests as well as the AIS Checkpoint API to store virtual
machine states across a cluster and make intelligent decisions
about whether a virtual machine is running.


%prep
%setup -q


%build
./autogen.sh
%{configure}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING TODO README
%{_sbindir}/fence_virt

%files -n fence-virtd
%defattr(-,root,root,-)
%{_sbindir}/fence_virtd
%config(noreplace) /etc/fence_virt.conf
%dir %{_libdir}/%{name}
# TODO: init script to start fence_virtd
# TODO: auto-config utility

%files -n fence-virtd-multicast
%defattr(-,root,root,-)
%{_libdir}/%{name}/multicast.so

%files -n fence-virtd-libvirt
%defattr(-,root,root,-)
%{_libdir}/%{name}/libvirt.so

%files -n fence-virtd-checkpoint
%defattr(-,root,root,-)
%{_libdir}/%{name}/checkpoint.so

%changelog
* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.2-1
- Update to latest upstream version
- Fix build issue on i686

* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.1-1
- Update to latest upstream version
- Clean up spec file

* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1-2
- Spec file cleanup

* Thu Sep 17 2009 Lon Hohberger <lhh at redhat.com> 0.1-1
- Initial build for rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:15:43 -0000	1.1
+++ .cvsignore	25 Sep 2009 18:00:50 -0000	1.2
@@ -0,0 +1 @@
+fence-virt-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:15:43 -0000	1.1
+++ sources	25 Sep 2009 18:00:50 -0000	1.2
@@ -0,0 +1 @@
+57b25e050119071ca3a581d55b30a187  fence-virt-0.1.2.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:54 +0000
Subject: [pkgdb] sparse: jlayton has requested commit
Message-ID: <20090925180054.7458E10F897@bastion2.fedora.phx.redhat.com>

jlayton has requested the commit acl on sparse (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:00:56 +0000
Subject: [pkgdb] sparse: jlayton has requested approveacls
Message-ID: <20090925180056.7BF7710F89B@bastion2.fedora.phx.redhat.com>

jlayton has requested the approveacls acl on sparse (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:08:29 +0000
Subject: [pkgdb] scythia ownership updated
Message-ID: <20090925180829.82DB910F844@bastion2.fedora.phx.redhat.com>

Package scythia in Fedora devel is now owned by hguemar

To make changes to this package see:
  /pkgdb/packages/name/scythia



From pkgdb at fedoraproject.org  Fri Sep 25 18:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:08:31 +0000
Subject: [pkgdb] scythia ownership updated
Message-ID: <20090925180832.02AEB10F884@bastion2.fedora.phx.redhat.com>

Package scythia in Fedora 10 is now owned by hguemar

To make changes to this package see:
  /pkgdb/packages/name/scythia



From pkgdb at fedoraproject.org  Fri Sep 25 18:08:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:08:32 +0000
Subject: [pkgdb] scythia ownership updated
Message-ID: <20090925180833.2CBA410F88A@bastion2.fedora.phx.redhat.com>

Package scythia in Fedora 11 is now owned by hguemar

To make changes to this package see:
  /pkgdb/packages/name/scythia



From jjohnstn at fedoraproject.org  Fri Sep 25 18:12:00 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 25 Sep 2009 18:12:00 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 eclipse-cdt-libhover-local.patch, NONE,
	1.1 eclipse-cdt-libhover.patch, NONE, 1.1 .cvsignore, 1.43,
	1.44 eclipse-cdt.spec, 1.122, 1.123 sources, 1.52, 1.53
Message-ID: <20090925181200.3782F11C00E8@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14820

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-libhover-local.patch eclipse-cdt-libhover.patch 
Log Message:

* Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-5
- Resolves #525004
- Upgrade libhover to 0.3.0.
- Add libhover patch to fix libstdc++ member resolution and
  to place libhover docs locally within libhover plugin.




eclipse-cdt-libhover-local.patch:
 org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml     |    2 +-
 org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml |    2 +-
 org.eclipse.linuxtools.cdt.libhover/build.properties     |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE eclipse-cdt-libhover-local.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix ./org.eclipse.linuxtools.cdt.libhover/build.properties
--- ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix	2009-09-23 17:07:18.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/build.properties	2009-09-23 17:07:38.000000000 -0400
@@ -3,7 +3,8 @@ output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               libhoverdocs/
 
 javacSource=1.5
 javacTarget=1.5
diff -up ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
--- ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix	2009-09-23 17:12:01.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml	2009-09-23 17:12:26.000000000 -0400
@@ -7,7 +7,7 @@
          point="org.eclipse.linuxtools.cdt.libhover.library">
       <library
             docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
-            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
+            location="libhoverdocs/glibc-2.7-2.libhover"
             name="glibc library"
             type="C">
       </library>
diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
--- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2009-09-23 17:12:43.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2009-09-23 17:13:04.000000000 -0400
@@ -7,7 +7,7 @@
          point="org.eclipse.linuxtools.cdt.libhover.library">
       <library
             docs="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html"
-            location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover"
+            location="libhoverdocs/libstdc++-v3.libhover"
             name="libstdc++ library"
             type="C++">
       </library>

eclipse-cdt-libhover.patch:
 META-INF/MANIFEST.MF                                                  |    1 
 src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java           |    1 
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java        |   22 +++++++---
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java |   10 ++++
 4 files changed, 27 insertions(+), 7 deletions(-)

--- NEW FILE eclipse-cdt-libhover.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix2 ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix2	2009-09-23 17:15:45.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-09-23 17:08:47.000000000 -0400
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text;bundle-version="3.4.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix2	2009-09-23 17:16:59.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-09-23 17:09:54.000000000 -0400
@@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
 	 * The constructor
 	 */
 	public LibhoverPlugin() {
+		plugin = this;
 	}
 
 	/*
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix2	2009-09-23 17:11:05.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-09-23 17:11:21.000000000 -0400
@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP
 			return null;
 		if (methodType != null) {
 			try {
-				args = resolveArgs(info, methodType.getParameterTypes());
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
 				returnType = methodType.getReturnType();
 			} catch (DOMException e) {
 				// TODO Auto-generated catch block
@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP
 		MemberInfo member = info.getMember(memberName);
 		if (member != null) {
 			MemberInfo m = null;
-			if (!isParmMatch(member, args)) {
+			if (!isParmMatch(member, args, templateTypes, info)) {
 				ArrayList<MemberInfo> members = member.getChildren();
 				for (int i = 0; i < members.size(); ++i) {
 					MemberInfo k = members.get(i);
-					if (isParmMatch(k, args)) {
+					if (isParmMatch(k, args, templateTypes, info)) {
 						m = k;
 						break;
 					}
@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP
 	}
      
  	
-	private boolean isParmMatch(MemberInfo m, String[] args) {
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
 		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
 		return Arrays.equals(memberParms, args);
 	}
 
-	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes) {
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
 		String[] templateParms = info.getTemplateParms();
 		String[] result = new String[parameterTypes.length];
 		for (int i = 0; i < parameterTypes.length; ++i) {
@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP
 			while (index >= 0) {
 				// We assume no class has more than 9 template parms.
 				int digit = param.charAt(index + 1) - '0';
-				param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
 				index = param.indexOf("#");
 			}
 			result[i] = param;
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix2	2009-09-23 17:10:32.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-09-23 17:10:55.000000000 -0400
@@ -21,10 +21,12 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
 import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
 import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
 import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
 
 public class LibHoverLibrary {
@@ -98,7 +100,13 @@ public class LibHoverLibrary {
 					URL url = acDoc.toURL();
 					docStream = url.openStream();
 				} else {
-					docStream = new FileInputStream(p.toFile());
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
 				}
 				ObjectInputStream input = new ObjectInputStream(docStream);
 				hoverInfo = (LibHoverInfo)input.readObject();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	8 Apr 2009 21:12:16 -0000	1.43
+++ .cvsignore	25 Sep 2009 18:11:59 -0000	1.44
@@ -24,3 +24,6 @@ eclipse-cdt-fetched-src-autotools-R1_0_2
 eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
 eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
+libstdc++-v3.libhover
+glibc-2.7-2.libhover
+eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- eclipse-cdt.spec	26 Jun 2009 22:16:18 -0000	1.122
+++ eclipse-cdt.spec	25 Sep 2009 18:11:59 -0000	1.123
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,7 +36,7 @@ Source4: fetch-cdt.sh
 
 Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -56,6 +56,10 @@ Source3: %{name}-target_filter.gif.gz
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
+# Libhover docs to place locally
+Source6: glibc-2.7-2.libhover
+Source7: libstdc++-v3.libhover
+
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -98,6 +102,14 @@ Patch16: %{name}-managedConfigurations-f
 # ScannerInfo.
 Patch17: %{name}-autotools-bug281582.patch
 
+# Following is a patch to supply libhover docs directory from the libhover
+# plugin and not require html to access them.
+Patch18: %{name}-libhover-local.patch
+
+# Following is a patch to libhover to fix member resolution, plugin loading,
+# and to enable local plugin file support for docs.
+Patch19: %{name}-libhover.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -235,6 +247,15 @@ popd
 mkdir libhover
 pushd libhover
 tar -xzf %{SOURCE2}
+%patch18 -p0
+%patch19 -p0
+pushd org.eclipse.linuxtools.cdt.libhover
+mkdir libhoverdocs
+pushd libhoverdocs
+cp %{SOURCE6} .
+cp %{SOURCE7} .
+popd
+popd
 popd
 
 ## Cppunit stuff
@@ -339,7 +360,7 @@ java -cp $SDK/startup.jar \
      -application org.eclipse.ant.core.antRunner \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.cdt.libhover.feature  \
+     -Did=org.eclipse.linuxtools.cdt.libhover  \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -395,7 +416,7 @@ popd
 
 # Libhover install
 pushd libhover
-unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.zip
 popd
 
 mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
@@ -573,6 +594,12 @@ fi
 %endif
 
 %changelog
+* Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-5
+- Resolves #525004
+- Upgrade libhover to 0.3.0.
+- Add libhover patch to fix libstdc++ member resolution and
+  to place libhover docs locally within libhover plugin.
+
 * Fri Jun 26 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-4
 - Resolves #281582.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	8 Apr 2009 21:12:16 -0000	1.52
+++ sources	25 Sep 2009 18:12:00 -0000	1.53
@@ -1,5 +1,7 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 1768318e26e5a40e55bb55cc38fedfaa  eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
 25251010257cc1255f9bcec90a9514b7  eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
+921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
+4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
+2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz



From jjohnstn at fedoraproject.org  Fri Sep 25 18:15:04 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 25 Sep 2009 18:15:04 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-11 eclipse-cdt-libhover-local.patch, NONE,
	1.1 eclipse-cdt-libhover.patch, NONE, 1.1 .cvsignore, 1.43,
	1.44 eclipse-cdt.spec, 1.123, 1.124 sources, 1.52, 1.53
Message-ID: <20090925181504.6FABF11C00E8@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16953

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-libhover-local.patch eclipse-cdt-libhover.patch 
Log Message:

* Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-5
- Resolves #525004
- Upgrade libhover to 0.3.0.
- Add libhover patch to fix libstdc++ member resolution and
  to place libhover docs locally within libhover plugin.




eclipse-cdt-libhover-local.patch:
 org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml     |    2 +-
 org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml |    2 +-
 org.eclipse.linuxtools.cdt.libhover/build.properties     |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE eclipse-cdt-libhover-local.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix ./org.eclipse.linuxtools.cdt.libhover/build.properties
--- ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix	2009-09-23 17:07:18.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/build.properties	2009-09-23 17:07:38.000000000 -0400
@@ -3,7 +3,8 @@ output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               libhoverdocs/
 
 javacSource=1.5
 javacTarget=1.5
diff -up ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
--- ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix	2009-09-23 17:12:01.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml	2009-09-23 17:12:26.000000000 -0400
@@ -7,7 +7,7 @@
          point="org.eclipse.linuxtools.cdt.libhover.library">
       <library
             docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
-            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
+            location="libhoverdocs/glibc-2.7-2.libhover"
             name="glibc library"
             type="C">
       </library>
diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
--- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2009-09-23 17:12:43.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2009-09-23 17:13:04.000000000 -0400
@@ -7,7 +7,7 @@
          point="org.eclipse.linuxtools.cdt.libhover.library">
       <library
             docs="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html"
-            location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover"
+            location="libhoverdocs/libstdc++-v3.libhover"
             name="libstdc++ library"
             type="C++">
       </library>

eclipse-cdt-libhover.patch:
 META-INF/MANIFEST.MF                                                  |    1 
 src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java           |    1 
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java        |   22 +++++++---
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java |   10 ++++
 4 files changed, 27 insertions(+), 7 deletions(-)

--- NEW FILE eclipse-cdt-libhover.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix2 ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix2	2009-09-23 17:15:45.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-09-23 17:08:47.000000000 -0400
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text;bundle-version="3.4.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix2	2009-09-23 17:16:59.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-09-23 17:09:54.000000000 -0400
@@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
 	 * The constructor
 	 */
 	public LibhoverPlugin() {
+		plugin = this;
 	}
 
 	/*
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix2	2009-09-23 17:11:05.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-09-23 17:11:21.000000000 -0400
@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP
 			return null;
 		if (methodType != null) {
 			try {
-				args = resolveArgs(info, methodType.getParameterTypes());
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
 				returnType = methodType.getReturnType();
 			} catch (DOMException e) {
 				// TODO Auto-generated catch block
@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP
 		MemberInfo member = info.getMember(memberName);
 		if (member != null) {
 			MemberInfo m = null;
-			if (!isParmMatch(member, args)) {
+			if (!isParmMatch(member, args, templateTypes, info)) {
 				ArrayList<MemberInfo> members = member.getChildren();
 				for (int i = 0; i < members.size(); ++i) {
 					MemberInfo k = members.get(i);
-					if (isParmMatch(k, args)) {
+					if (isParmMatch(k, args, templateTypes, info)) {
 						m = k;
 						break;
 					}
@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP
 	}
      
  	
-	private boolean isParmMatch(MemberInfo m, String[] args) {
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
 		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
 		return Arrays.equals(memberParms, args);
 	}
 
-	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes) {
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
 		String[] templateParms = info.getTemplateParms();
 		String[] result = new String[parameterTypes.length];
 		for (int i = 0; i < parameterTypes.length; ++i) {
@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP
 			while (index >= 0) {
 				// We assume no class has more than 9 template parms.
 				int digit = param.charAt(index + 1) - '0';
-				param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
 				index = param.indexOf("#");
 			}
 			result[i] = param;
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix2 ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix2	2009-09-23 17:10:32.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-09-23 17:10:55.000000000 -0400
@@ -21,10 +21,12 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
 import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
 import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
 import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
 
 public class LibHoverLibrary {
@@ -98,7 +100,13 @@ public class LibHoverLibrary {
 					URL url = acDoc.toURL();
 					docStream = url.openStream();
 				} else {
-					docStream = new FileInputStream(p.toFile());
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
 				}
 				ObjectInputStream input = new ObjectInputStream(docStream);
 				hoverInfo = (LibHoverInfo)input.readObject();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	8 Apr 2009 22:38:58 -0000	1.43
+++ .cvsignore	25 Sep 2009 18:15:04 -0000	1.44
@@ -24,3 +24,6 @@ eclipse-cdt-fetched-src-autotools-R1_0_2
 eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
 eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
+libstdc++-v3.libhover
+glibc-2.7-2.libhover
+eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- eclipse-cdt.spec	26 Jun 2009 22:19:56 -0000	1.123
+++ eclipse-cdt.spec	25 Sep 2009 18:15:04 -0000	1.124
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,7 +36,7 @@ Source4: fetch-cdt.sh
 
 Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -56,6 +56,10 @@ Source3: %{name}-target_filter.gif.gz
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
+# Libhover docs to place locally
+Source6: glibc-2.7-2.libhover
+Source7: libstdc++-v3.libhover
+
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -98,6 +102,14 @@ Patch16: %{name}-managedConfigurations-f
 # ScannerInfo.
 Patch17: %{name}-autotools-bug281582.patch
 
+# Following is a patch to supply libhover docs directory from the libhover
+# plugin and not require html to access them.
+Patch18: %{name}-libhover-local.patch
+
+# Following is a patch to libhover to fix member resolution, plugin loading,
+# and to enable local plugin file support for docs.
+Patch19: %{name}-libhover.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -235,6 +247,15 @@ popd
 mkdir libhover
 pushd libhover
 tar -xzf %{SOURCE2}
+%patch18 -p0
+%patch19 -p0
+pushd org.eclipse.linuxtools.cdt.libhover
+mkdir libhoverdocs
+pushd libhoverdocs
+cp %{SOURCE6} .
+cp %{SOURCE7} .
+popd
+popd
 popd
 
 ## Cppunit stuff
@@ -339,7 +360,7 @@ java -cp $SDK/startup.jar \
      -application org.eclipse.ant.core.antRunner \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.cdt.libhover.feature  \
+     -Did=org.eclipse.linuxtools.cdt.libhover  \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -395,7 +416,7 @@ popd
 
 # Libhover install
 pushd libhover
-unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.zip
 popd
 
 mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
@@ -573,6 +594,12 @@ fi
 %endif
 
 %changelog
+* Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-5
+- Resolves #525004
+- Upgrade libhover to 0.3.0.
+- Add libhover patch to fix libstdc++ member resolution and
+  to place libhover docs locally within libhover plugin.
+
 * Fri Jun 26 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-4
 - Resolves #281582.
 
@@ -586,9 +613,6 @@ fi
 - Rebase autotools to 1.0.3.
 - Rebase CDT to v200903191301 (5.0.2).
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
 - Rebase libhover to 0.1.1 and autotools to 1.0.2.
 - Remove patch for 472731 which is already part of rebased autotools sources.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	8 Apr 2009 22:38:59 -0000	1.52
+++ sources	25 Sep 2009 18:15:04 -0000	1.53
@@ -1,5 +1,7 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 1768318e26e5a40e55bb55cc38fedfaa  eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
 25251010257cc1255f9bcec90a9514b7  eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
+921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
+4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
+2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz



From adamwill at fedoraproject.org  Fri Sep 25 18:17:44 2009
From: adamwill at fedoraproject.org (Adam Williamson)
Date: Fri, 25 Sep 2009 18:17:44 +0000 (UTC)
Subject: rpms/gst-mixer/devel dead.package,NONE,1.1
Message-ID: <20090925181744.20BC411C00E8@cvs1.fedora.phx.redhat.com>

Author: adamwill

Update of /cvs/pkgs/rpms/gst-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18036

Added Files:
	dead.package 
Log Message:
retiring this package: adding dead.package



--- NEW FILE dead.package ---
no longer useful with f12 improvements to gnome-volume-control



From chwang at fedoraproject.org  Fri Sep 25 18:18:55 2009
From: chwang at fedoraproject.org (Charley Wang)
Date: Fri, 25 Sep 2009 18:18:55 +0000 (UTC)
Subject: rpms/eclipse-callgraph/devel eclipse-callgraph.spec,1.1,1.2
Message-ID: <20090925181855.BDE0E11C00E8@cvs1.fedora.phx.redhat.com>

Author: chwang

Update of /cvs/pkgs/rpms/eclipse-callgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19246

Modified Files:
	eclipse-callgraph.spec 
Log Message:
* Fri Sep 25 2009 Charley Wang <chwang at redhat.com> 0.0.1-3
- Added ExcludeArch for ppc64 because eclipse-cdt is not present


Index: eclipse-callgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-callgraph/devel/eclipse-callgraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-callgraph.spec	25 Sep 2009 17:51:02 -0000	1.1
+++ eclipse-callgraph.spec	25 Sep 2009 18:18:55 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           eclipse-callgraph
 Version:        0.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ Call Graph Visualization Tool
 
 Group:          Development/Tools
@@ -15,6 +15,7 @@ URL:            http://eclipse.org/linux
 Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.bz2
 Source1:        %{name}-fetch-src.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    ppc64
 
 BuildRequires: eclipse-cdt
 BuildRequires: eclipse-gef
@@ -54,6 +55,9 @@ install -d -m 755 %{buildroot}%{install_
 %doc org.eclipse.linuxtools.callgraph-feature/epl-v10.html
 
 %changelog
+* Fri Sep 25 2009 Charley Wang <chwang at redhat.com> 0.0.1-3
+- Added ExcludeArch for ppc64 because eclipse-cdt is not present
+
 * Thu Sep 24 2009 Roland Grunberg <rgrunber at redhat.com> 0.0.1-2
 - Some more changes to spec file
 



From adamwill at fedoraproject.org  Fri Sep 25 18:20:26 2009
From: adamwill at fedoraproject.org (Adam Williamson)
Date: Fri, 25 Sep 2009 18:20:26 +0000 (UTC)
Subject: rpms/gst-mixer/devel Makefile, 1.1,
	NONE gst-mixer-2.26.0-help-uri.patch, 1.1,
	NONE gst-mixer-2.26.0-rebrand.patch, 1.1,
	NONE gst-mixer-2.26.0-switch.patch, 1.1, NONE gst-mixer.spec,
	1.4, NONE import.log, 1.1, NONE sources, 1.2, NONE
Message-ID: <20090925182026.04A9011C0418@cvs1.fedora.phx.redhat.com>

Author: adamwill

Update of /cvs/pkgs/rpms/gst-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19901

Removed Files:
	Makefile gst-mixer-2.26.0-help-uri.patch 
	gst-mixer-2.26.0-rebrand.patch gst-mixer-2.26.0-switch.patch 
	gst-mixer.spec import.log sources 
Log Message:
retiring package: remove all files except dead.package



--- Makefile DELETED ---


--- gst-mixer-2.26.0-help-uri.patch DELETED ---


--- gst-mixer-2.26.0-rebrand.patch DELETED ---


--- gst-mixer-2.26.0-switch.patch DELETED ---


--- gst-mixer.spec DELETED ---


--- import.log DELETED ---


--- sources DELETED ---



From mclasen at fedoraproject.org  Fri Sep 25 18:20:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 25 Sep 2009 18:20:42 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.259,1.260
Message-ID: <20090925182042.AEDC111C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19967

Modified Files:
	totem.spec 
Log Message:
Fix requires



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- totem.spec	24 Sep 2009 14:55:52 -0000	1.259
+++ totem.spec	25 Sep 2009 18:20:42 -0000	1.260
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -27,6 +27,8 @@ Requires: gnome-icon-theme
 Requires: pyxdg
 # For all the Python plugins
 Requires: pygtk2
+# For the iplayer plugin
+Requires: python-httplib2
 
 Requires: gstreamer >= %gstreamer_version
 Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
@@ -377,6 +379,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Add requires for iplayer plugin (#522068)
+
 * Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
 - Rebuild for new libgdata
 



From pkgdb at fedoraproject.org  Fri Sep 25 18:29:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:29:53 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925182953.3D55C10F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora devel is now owned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:29:59 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925182959.47EBC10F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora 10 is now owned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:30:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:30:03 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925183003.AB3AD10F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora 11 is now owned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From jderose at fedoraproject.org  Fri Sep 25 18:31:03 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Fri, 25 Sep 2009 18:31:03 +0000 (UTC)
Subject: rpms/python-wehjit/F-12 import.log, NONE, 1.1 python-wehjit.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925183103.6471511C00E8@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-wehjit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24081/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-wehjit.spec 
Log Message:



--- NEW FILE import.log ---
python-wehjit-0_1_0-1_fc11:F-12:python-wehjit-0.1.0-1.fc11.src.rpm:1253903429


--- NEW FILE python-wehjit.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-wehjit
Version:        0.1.0
Release:        1%{?dist}
Summary:        A Python web-widget library

Group:          Development/Languages
License:        GPLv3+
URL:            http://jderose.fedorapeople.org/wehjit/
Source0:        http://jderose.fedorapeople.org/wehjit/%{version}/wehjit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-nose
BuildRequires:  python-assets python-genshi python-paste python-pygments
Requires:       python-assets python-genshi python-paste python-pygments

%description
wehjit is a Python library for for building XHTML widgets for web applications
and web pages.  It encapsulates the XHTML (a Genshi XML template), CSS, and
JavaScript for each widget into a plugin.

%prep
%setup -q -n wehjit-%{version}

%build
%{__python} setup.py build

%check
nosetests --with-doctest

%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,-)
%doc README COPYING
%{python_sitelib}/wehjit/
%{python_sitelib}/wehjit-%{version}-py2.6.egg-info
%{_bindir}/wehjit-demo

%changelog
* Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:33:31 -0000	1.1
+++ .cvsignore	25 Sep 2009 18:31:03 -0000	1.2
@@ -0,0 +1 @@
+wehjit-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:33:31 -0000	1.1
+++ sources	25 Sep 2009 18:31:03 -0000	1.2
@@ -0,0 +1 @@
+2a2391ab302610723eb6c9f91e2e1469  wehjit-0.1.0.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 25 18:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:35:06 +0000
Subject: [pkgdb] incollector: thomasj has requested watchbugzilla
Message-ID: <20090925183506.1576B10F844@bastion2.fedora.phx.redhat.com>

thomasj has requested the watchbugzilla acl on incollector (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:35:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:35:12 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925183512.5238F10F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora devel was orphaned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:37:14 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925183714.6B59210F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora devel is now owned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:37:36 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183736.9887410F844@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on incollector (Fedora devel) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:37:41 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183741.679A710F844@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on incollector (Fedora devel) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:37:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:37:44 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183745.3453910F844@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on incollector (Fedora devel) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:37:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:37:49 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183749.71A3E10F844@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on incollector (Fedora devel) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:29 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925183930.BE27510F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora 10 was orphaned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:37 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925183938.4AF6610F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora 10 is now owned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:42 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183942.860D110F844@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on incollector (Fedora 10) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:44 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183944.EA37B10F884@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on incollector (Fedora 10) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:46 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183947.9520F10F844@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on incollector (Fedora 10) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:50 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925183950.98C6710F884@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on incollector (Fedora 10) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:39:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:39:54 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925183954.E943510F86F@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora 11 was orphaned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:05 +0000
Subject: [pkgdb] incollector ownership updated
Message-ID: <20090925184006.D1F7610F844@bastion2.fedora.phx.redhat.com>

Package incollector in Fedora 11 is now owned by thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:20 +0000
Subject: [pkgdb] incollector: thomasj has requested watchbugzilla
Message-ID: <20090925184020.4E46C10F86F@bastion2.fedora.phx.redhat.com>

thomasj has requested the watchbugzilla acl on incollector (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:24 +0000
Subject: [pkgdb] incollector: thomasj has requested watchcommits
Message-ID: <20090925184024.6641510F86F@bastion2.fedora.phx.redhat.com>

thomasj has requested the watchcommits acl on incollector (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:28 +0000
Subject: [pkgdb] incollector: thomasj has requested approveacls
Message-ID: <20090925184028.6CA5910F890@bastion2.fedora.phx.redhat.com>

thomasj has requested the approveacls acl on incollector (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:26 +0000
Subject: [pkgdb] incollector: thomasj has requested commit
Message-ID: <20090925184026.9183610F885@bastion2.fedora.phx.redhat.com>

thomasj has requested the commit acl on incollector (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:53 +0000
Subject: [pkgdb] incollector: thomasj has given up watchbugzilla
Message-ID: <20090925184053.1A64B10F844@bastion2.fedora.phx.redhat.com>

thomasj has given up the watchbugzilla acl on incollector (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:40:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:40:57 +0000
Subject: [pkgdb] incollector: thomasj has requested watchbugzilla
Message-ID: <20090925184057.13AAF10F884@bastion2.fedora.phx.redhat.com>

thomasj has requested the watchbugzilla acl on incollector (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/incollector



From bochecha at fedoraproject.org  Fri Sep 25 18:41:31 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Fri, 25 Sep 2009 18:41:31 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 sugar-base.spec, 1.23, 1.24
Message-ID: <20090925184131.3E3B511C00E8@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28767

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
New 0.86 upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Sep 2009 16:52:36 -0000	1.17
+++ .cvsignore	25 Sep 2009 18:41:30 -0000	1.18
@@ -1 +1 @@
-sugar-base-0.85.6.tar.bz2
+sugar-base-0.86.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2009 16:52:36 -0000	1.17
+++ sources	25 Sep 2009 18:41:31 -0000	1.18
@@ -1 +1 @@
-51202d8c201c9060163d14f6e2c63a34  sugar-base-0.85.6.tar.bz2
+320f418a4f38d4c15402ff80b7845ab1  sugar-base-0.86.0.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sugar-base.spec	18 Sep 2009 16:52:36 -0000	1.23
+++ sugar-base.spec	25 Sep 2009 18:41:31 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.85.6
+Version: 0.86.0
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 25 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.86.0-1
+- New upstream release
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.6-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:28 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184228.306A910F87C@bastion2.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on sparse (Fedora devel) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:31 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184232.0A6CC10F86F@bastion2.fedora.phx.redhat.com>

roland has set the watchcommits acl on sparse (Fedora devel) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:34 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184234.403CA10F890@bastion2.fedora.phx.redhat.com>

roland has set the commit acl on sparse (Fedora devel) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:37 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184237.24ED410F884@bastion2.fedora.phx.redhat.com>

roland has set the approveacls acl on sparse (Fedora devel) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:51 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184251.E8A3910F86F@bastion2.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on sparse (Fedora EPEL 4) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:53 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184253.F0A4010F885@bastion2.fedora.phx.redhat.com>

roland has set the watchcommits acl on sparse (Fedora EPEL 4) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:56 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184256.4732410F86F@bastion2.fedora.phx.redhat.com>

roland has set the commit acl on sparse (Fedora EPEL 4) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:42:58 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184259.03D6C10F89B@bastion2.fedora.phx.redhat.com>

roland has set the approveacls acl on sparse (Fedora EPEL 4) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:24 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184325.C6D8E10F884@bastion2.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on sparse (Fedora EPEL 5) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:25 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184326.E86B610F890@bastion2.fedora.phx.redhat.com>

roland has set the watchcommits acl on sparse (Fedora EPEL 5) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:29 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184329.D842F10F89A@bastion2.fedora.phx.redhat.com>

roland has set the commit acl on sparse (Fedora EPEL 5) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:31 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184332.B4C1D10F89D@bastion2.fedora.phx.redhat.com>

roland has set the approveacls acl on sparse (Fedora EPEL 5) to Approved for jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:54 +0000
Subject: [pkgdb] sparse: roland has requested watchbugzilla
Message-ID: <20090925184354.4F25C10F890@bastion2.fedora.phx.redhat.com>

roland has requested the watchbugzilla acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:55 +0000
Subject: [pkgdb] sparse: roland has requested watchcommits
Message-ID: <20090925184355.324F110F89A@bastion2.fedora.phx.redhat.com>

roland has requested the watchcommits acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:56 +0000
Subject: [pkgdb] sparse: roland has requested commit
Message-ID: <20090925184356.712E910F89D@bastion2.fedora.phx.redhat.com>

roland has requested the commit acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:43:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:43:57 +0000
Subject: [pkgdb] sparse: roland has requested approveacls
Message-ID: <20090925184357.ED97D10F8A1@bastion2.fedora.phx.redhat.com>

roland has requested the approveacls acl on sparse (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:08 +0000
Subject: [pkgdb] sparse: roland has requested watchbugzilla
Message-ID: <20090925184408.6B0FC10F87C@bastion2.fedora.phx.redhat.com>

roland has requested the watchbugzilla acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:09 +0000
Subject: [pkgdb] sparse: roland has requested watchcommits
Message-ID: <20090925184410.0CC6610F885@bastion2.fedora.phx.redhat.com>

roland has requested the watchcommits acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:11 +0000
Subject: [pkgdb] sparse: roland has requested approveacls
Message-ID: <20090925184411.71FC910F897@bastion2.fedora.phx.redhat.com>

roland has requested the approveacls acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:13 +0000
Subject: [pkgdb] sparse: roland has requested commit
Message-ID: <20090925184413.3139010F87C@bastion2.fedora.phx.redhat.com>

roland has requested the commit acl on sparse (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:34 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184435.01E6E10F86F@bastion2.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on sparse (Fedora EPEL 4) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:36 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184437.08A9910F884@bastion2.fedora.phx.redhat.com>

roland has set the watchcommits acl on sparse (Fedora EPEL 4) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:39 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184439.ABDE510F86F@bastion2.fedora.phx.redhat.com>

roland has set the commit acl on sparse (Fedora EPEL 4) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:41 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184442.4C71310F898@bastion2.fedora.phx.redhat.com>

roland has set the approveacls acl on sparse (Fedora EPEL 4) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:44 +0000
Subject: [pkgdb] sparse ownership updated
Message-ID: <20090925184444.878EA10F885@bastion2.fedora.phx.redhat.com>

Package sparse in Fedora EPEL 4 is now owned by jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:53 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184454.EBB3510F86F@bastion2.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on sparse (Fedora EPEL 5) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:56 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184456.A70B910F885@bastion2.fedora.phx.redhat.com>

roland has set the watchcommits acl on sparse (Fedora EPEL 5) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:44:59 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184459.52DC110F86F@bastion2.fedora.phx.redhat.com>

roland has set the commit acl on sparse (Fedora EPEL 5) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:45:01 +0000
Subject: [pkgdb] sparse had acl change status
Message-ID: <20090925184502.6DB3710F87C@bastion2.fedora.phx.redhat.com>

roland has set the approveacls acl on sparse (Fedora EPEL 5) to Approved for roland

To make changes to this package see:
  /pkgdb/packages/name/sparse



From pkgdb at fedoraproject.org  Fri Sep 25 18:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:45:04 +0000
Subject: [pkgdb] sparse ownership updated
Message-ID: <20090925184504.CB5B410F88A@bastion2.fedora.phx.redhat.com>

Package sparse in Fedora EPEL 5 is now owned by jlayton

To make changes to this package see:
  /pkgdb/packages/name/sparse



From cdamian at fedoraproject.org  Fri Sep 25 18:45:24 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 25 Sep 2009 18:45:24 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/devel import.log, NONE,
	1.1 php-doctrine-Doctrine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925184524.B2B7B11C00E8@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31370/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-doctrine-Doctrine.spec 
Log Message:
new package php-doctrine-Doctrine 



--- NEW FILE import.log ---
php-doctrine-Doctrine-1_1_3-4_fc11:HEAD:php-doctrine-Doctrine-1.1.3-4.fc11.src.rpm:1253904273


--- NEW FILE php-doctrine-Doctrine.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Doctrine

Name:           php-doctrine-Doctrine
Version:        1.1.3
Release:        4%{?dist}
Summary:        PHP Object Relational Mapper

Group:          Development/Libraries
License:        LGPLv2+ and MIT and BSD
URL:            http://www.doctrine-project.org/
Source0:        http://pear.doctrine-project.org/get/Doctrine-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-channel(pear.doctrine-project.com)
BuildRequires:  php-pear(PEAR)
Requires:       php >= 5.2.3
Requires:       php-pear(PEAR)
Requires:       php-channel(pear.doctrine-project.com)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(pear.doctrine-project.com/%{pear_name}) = %{version}

%description

Doctrine is an object relational mapper (ORM) for PHP 5.2.3+ that sits on top
of a powerful database abstraction layer (DBAL). One of its key features is the
option to write database queries in a proprietary object oriented SQL dialect
called Doctrine Query Language (DQL), inspired by Hibernates HQL. This provides
developers with a powerful alternative to SQL that maintains flexibility
without requiring unnecessary code duplication.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*


# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
# Expand this as needed to avoid owning dirs owned by our dependencies
%{pear_phpdir}/%{pear_name}

%changelog
* Thu Sep 24 2009 Christof Damian <christof at damian.net> 1.1.3-4
- fix provide

* Mon Aug 17 2009 Christof Damian <christof at damian.net> 1.1.3-3
- changed LGPL to LGPLv2+

* Mon Aug 17 2009 Christof Damian <christof at damian.net> 1.1.3-2
- added missing licenses

* Sat Aug 15 2009 Christof Damian <christof at damian.net> 1.1.3-1
- initial rpm




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:30:49 -0000	1.1
+++ .cvsignore	25 Sep 2009 18:45:24 -0000	1.2
@@ -0,0 +1 @@
+Doctrine-1.1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:30:50 -0000	1.1
+++ sources	25 Sep 2009 18:45:24 -0000	1.2
@@ -0,0 +1 @@
+cdd9ebb1e146514dac9dc36aaa2db5d7  Doctrine-1.1.3.tgz



From pkgdb at fedoraproject.org  Fri Sep 25 18:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:46:06 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925184606.C441810F86F@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on incollector (Fedora 11) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:46:10 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925184610.695AA10F86F@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on incollector (Fedora 11) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:46:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:46:13 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925184613.55F4010F885@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on incollector (Fedora 11) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From pkgdb at fedoraproject.org  Fri Sep 25 18:46:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 18:46:16 +0000
Subject: [pkgdb] incollector had acl change status
Message-ID: <20090925184616.51D7110F844@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on incollector (Fedora 11) to Approved for thomasj

To make changes to this package see:
  /pkgdb/packages/name/incollector



From dwalsh at fedoraproject.org  Fri Sep 25 18:47:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 25 Sep 2009 18:47:07 +0000 (UTC)
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.53,
	1.54 policy-F12.patch, 1.92, 1.93 policygentool, 1.11,
	1.12 selinux-policy.spec, 1.929, 1.930
Message-ID: <20090925184707.CBCB411C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv300

Modified Files:
	booleans-targeted.conf policy-F12.patch policygentool 
	selinux-policy.spec 
Log Message:
* Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-11
- Allow users to exec restorecond



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- booleans-targeted.conf	7 Sep 2009 01:18:05 -0000	1.53
+++ booleans-targeted.conf	25 Sep 2009 18:47:06 -0000	1.54
@@ -245,7 +245,7 @@ allow_nsplugin_execmem=true
 
 # Allow unconfined domain to transition to confined domain
 # 
-allow_unconfined_nsplugin_transition=true
+allow_unconfined_nsplugin_transition=false
 
 # System uses init upstart program
 # 

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  242 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  320 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  328 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    7 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   12 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  391 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   29 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  214 ++++
 policy/modules/services/rhcs.te           |  336 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1403 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 319 files changed, 14680 insertions(+), 2586 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- policy-F12.patch	24 Sep 2009 23:30:15 -0000	1.92
+++ policy-F12.patch	25 Sep 2009 18:47:06 -0000	1.93
@@ -12909,7 +12909,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.32/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-09-21 19:37:35.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-09-24 17:38:43.000000000 -0700
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -12951,16 +12951,17 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
-@@ -63,6 +70,8 @@
+@@ -63,6 +70,9 @@
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
  kernel_load_module(NetworkManager_t)
++kernel_request_load_module(NetworkManager_t)
 +kernel_read_debugfs(NetworkManager_t)
 +kernel_rw_net_sysctls(NetworkManager_t)
  
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -81,13 +90,18 @@
+@@ -81,13 +91,18 @@
  corenet_sendrecv_isakmp_server_packets(NetworkManager_t)
  corenet_sendrecv_dhcpc_server_packets(NetworkManager_t)
  corenet_sendrecv_all_client_packets(NetworkManager_t)
@@ -12979,7 +12980,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mls_file_read_all_levels(NetworkManager_t)
  
-@@ -98,15 +112,20 @@
+@@ -98,15 +113,20 @@
  
  domain_use_interactive_fds(NetworkManager_t)
  domain_read_confined_domains_state(NetworkManager_t)
@@ -13001,7 +13002,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(NetworkManager_t)
  
  miscfiles_read_localization(NetworkManager_t)
-@@ -116,25 +135,40 @@
+@@ -116,25 +136,40 @@
  
  seutil_read_config(NetworkManager_t)
  
@@ -13049,7 +13050,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -146,8 +180,25 @@
+@@ -146,8 +181,25 @@
  ')
  
  optional_policy(`
@@ -13077,7 +13078,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -155,23 +206,51 @@
+@@ -155,23 +207,51 @@
  ')
  
  optional_policy(`
@@ -13131,7 +13132,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -179,12 +258,15 @@
+@@ -179,12 +259,15 @@
  ')
  
  optional_policy(`
@@ -15843,7 +15844,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.32/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/rpc.if	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/rpc.if	2009-09-25 07:42:34.000000000 -0700
 @@ -54,7 +54,7 @@
  	allow $1_t self:unix_dgram_socket create_socket_perms;
  	allow $1_t self:unix_stream_socket create_stream_socket_perms;
@@ -15853,7 +15854,15 @@ diff -b -B --ignore-all-space --exclude-
  
  	manage_dirs_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
  	manage_files_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
-@@ -109,6 +109,10 @@
+@@ -99,6 +99,7 @@
+ 	files_read_etc_runtime_files($1_t)
+ 	files_search_var($1_t)
+ 	files_search_var_lib($1_t)
++	files_list_home($1_t)
+ 
+ 	auth_use_nsswitch($1_t)
+ 
+@@ -109,6 +110,10 @@
  	userdom_dontaudit_use_unpriv_user_fds($1_t)
  
  	optional_policy(`
@@ -15866,7 +15875,16 @@ 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.32/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/rpc.te	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/rpc.te	2009-09-25 07:42:43.000000000 -0700
+@@ -53,7 +53,7 @@
+ # RPC local policy
+ #
+ 
+-allow rpcd_t self:capability { chown dac_override setgid setuid };
++allow rpcd_t self:capability { sys_admin chown dac_override setgid setuid };
+ allow rpcd_t self:fifo_file rw_fifo_file_perms;
+ 
+ allow rpcd_t rpcd_var_run_t:dir setattr;
 @@ -91,6 +91,8 @@
  
  seutil_dontaudit_search_config(rpcd_t)
@@ -19016,7 +19034,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.32/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-09-16 07:03:09.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-09-25 07:58:35.000000000 -0700
 @@ -3,12 +3,17 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
@@ -19028,7 +19046,7 @@ diff -b -B --ignore-all-space --exclude-
  HOME_DIR/\.xauth.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
  HOME_DIR/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 +HOME_DIR/\.xsession-errors.*	--	gen_context(system_u:object_r:xdm_home_t,s0)
-+HOME_DIR/\.dmrc		--	gen_context(system_u:object_r:xdm_home_t,s0)
++HOME_DIR/\.dmrc.*	--	gen_context(system_u:object_r:xdm_home_t,s0)
  
 +/root/\.Xauth.*		--	gen_context(system_u:object_r:xauth_home_t,s0)
 +/root/\.xauth.*		--	gen_context(system_u:object_r:xauth_home_t,s0)
@@ -23546,8 +23564,36 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.32/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-09-16 07:03:09.000000000 -0700
-@@ -535,6 +535,53 @@
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-09-24 20:11:24.000000000 -0700
+@@ -351,6 +351,27 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute restorecond in the caller domain. 
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`seutil_exec_restorecond',`
++	gen_require(`
++		type restorecond_exec_t;
++	')
++
++	files_search_usr($1)
++	corecmd_search_bin($1)
++	can_exec($1, restorecond_exec_t)
++')
++
++########################################
++## <summary>
+ ##	Execute run_init in the run_init domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -535,6 +556,53 @@
  
  ########################################
  ## <summary>
@@ -23601,7 +23647,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute setfiles in the caller domain.
  ## </summary>
  ## <param name="domain">
-@@ -680,6 +727,7 @@
+@@ -680,6 +748,7 @@
  	')
  
  	files_search_etc($1)
@@ -23609,7 +23655,7 @@ diff -b -B --ignore-all-space --exclude-
  	manage_files_pattern($1, selinux_config_t, selinux_config_t)
  	read_lnk_files_pattern($1, selinux_config_t, selinux_config_t)
  ')
-@@ -999,6 +1047,26 @@
+@@ -999,6 +1068,26 @@
  
  ########################################
  ## <summary>
@@ -23636,7 +23682,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute semanage in the semanage domain, and
  ##	allow the specified role the semanage domain,
  ##	and use the caller's terminal.
-@@ -1010,7 +1078,7 @@
+@@ -1010,7 +1099,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -23645,7 +23691,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -1028,6 +1096,33 @@
+@@ -1028,6 +1117,33 @@
  
  ########################################
  ## <summary>
@@ -23679,7 +23725,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Full management of the semanage
  ##	module store.
  ## </summary>
-@@ -1139,3 +1234,194 @@
+@@ -1139,3 +1255,194 @@
  	selinux_dontaudit_get_fs_mount($1)
  	seutil_dontaudit_read_config($1)
  ')
@@ -25608,7 +25654,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 10:30:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-21 05:24:59.000000000 -0700
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-24 20:12:04.000000000 -0700
 @@ -30,8 +30,9 @@
  	')
  
@@ -26055,7 +26101,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +515,208 @@
+@@ -508,182 +515,209 @@
  	# evolution and gnome-session try to create a netlink socket
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
@@ -26160,6 +26206,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_exec_checkpolicy($1_t)
 -	seutil_exec_setfiles($1_t)
 +	seutil_exec_setfiles($1_usertype)
++	seutil_exec_restorecond($1_usertype)
  	# for when the network connection is killed
  	# this is needed when a login role can change
  	# to this one.
@@ -26337,7 +26384,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +744,26 @@
+@@ -711,13 +745,26 @@
  
  	userdom_base_user_template($1)
  
@@ -26369,7 +26416,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +781,71 @@
+@@ -735,70 +782,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26474,7 +26521,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +882,32 @@
+@@ -835,6 +883,32 @@
  	# Local policy
  	#
  
@@ -26507,7 +26554,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +938,81 @@
+@@ -865,51 +939,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26602,7 +26649,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1046,8 @@
+@@ -943,8 +1047,8 @@
  	# Declarations
  	#
  
@@ -26612,7 +26659,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1056,12 @@
+@@ -953,11 +1057,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26627,7 +26674,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1079,53 @@
+@@ -975,36 +1080,53 @@
  		')
  	')
  
@@ -26695,7 +26742,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1161,7 @@
+@@ -1040,7 +1162,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -26704,7 +26751,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1170,7 @@
+@@ -1049,8 +1171,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26714,7 +26761,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1195,9 @@
+@@ -1075,6 +1196,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26724,7 +26771,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1212,7 @@
+@@ -1089,6 +1213,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -26732,7 +26779,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1220,6 @@
+@@ -1096,8 +1221,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26741,7 +26788,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,6 +1246,8 @@
+@@ -1124,6 +1247,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -26750,7 +26797,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1276,6 @@
+@@ -1152,20 +1277,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26771,7 +26818,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1321,7 @@
+@@ -1211,6 +1322,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26779,7 +26826,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1387,15 @@
+@@ -1276,11 +1388,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26795,7 +26842,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1506,13 @@
+@@ -1391,12 +1507,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26810,7 +26857,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1545,14 @@
+@@ -1429,6 +1546,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26825,7 +26872,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1568,11 @@
+@@ -1444,9 +1569,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26837,7 +26884,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1629,25 @@
+@@ -1503,6 +1630,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26863,7 +26910,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1722,8 @@
+@@ -1577,6 +1723,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26872,7 +26919,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1817,7 @@
+@@ -1670,6 +1818,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26880,7 +26927,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1945,32 @@
+@@ -1797,19 +1946,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26920,7 +26967,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2005,7 @@
+@@ -1844,6 +2006,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26928,7 +26975,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2553,7 @@
+@@ -2391,27 +2554,7 @@
  
  ########################################
  ## <summary>
@@ -26957,7 +27004,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2907,32 @@
+@@ -2765,11 +2908,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -26992,7 +27039,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3060,25 @@
+@@ -2897,7 +3061,25 @@
  		type user_tmp_t;
  	')
  
@@ -27019,7 +27066,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3115,7 @@
+@@ -2934,6 +3116,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27027,7 +27074,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3246,559 @@
+@@ -3064,3 +3247,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: policygentool
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- policygentool	8 Apr 2008 03:17:46 -0000	1.11
+++ policygentool	25 Sep 2009 18:47:07 -0000	1.12
@@ -1,297 +1,3 @@
-#! /usr/bin/env python
-# Copyright (C) 2006 Red Hat 
-# see file 'COPYING' for use and warranty information
-#
-# policygentool is a tool for the initial generation of SELinux policy
-#
-#    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
-#
-#  
-import os, sys, getopt
-import re
-
-########################### Interface File #############################
-interface="""\
-## <summary>policy for TEMPLATETYPE</summary>
-
-########################################
-## <summary>
-##	Execute a domain transition to run TEMPLATETYPE.
-## </summary>
-## <param name=\"domain\">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`TEMPLATETYPE_domtrans',`
-	gen_require(`
-		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
-	')
-
-	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
-
-	allow TEMPLATETYPE_t $1:fd use;
-	allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
-	allow TEMPLATETYPE_t $1:process sigchld;
-')
-"""
-
-########################### Type Enforcement File #############################
-te="""\
-policy_module(TEMPLATETYPE,1.0.0)
-
-########################################
-#
-# Declarations
-#
-
-type TEMPLATETYPE_t;
-type TEMPLATETYPE_exec_t;
-domain_type(TEMPLATETYPE_t)
-init_daemon_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
-"""
-te_logfile="""
-# log files
-type TEMPLATETYPE_var_log_t;
-logging_log_file(TEMPLATETYPE_var_log_t)
-"""
-te_pidfile="""
-# pid files
-type TEMPLATETYPE_var_run_t;
-files_pid_file(TEMPLATETYPE_var_run_t)
-"""
-te_libfile="""
-# var/lib files
-type TEMPLATETYPE_var_lib_t;
-files_type(TEMPLATETYPE_var_lib_t)
-"""
-te_sep="""
-########################################
-#
-# TEMPLATETYPE local policy
-#
-# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.
-
-# Some common macros (you might be able to remove some)
-files_read_etc_files(TEMPLATETYPE_t)
-libs_use_ld_so(TEMPLATETYPE_t)
-libs_use_shared_libs(TEMPLATETYPE_t)
-miscfiles_read_localization(TEMPLATETYPE_t)
-## internal communication is often done using fifo and unix sockets.
-allow TEMPLATETYPE_t self:fifo_file { read write };
-allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
-"""
-te_pidfile2="""
-# pid file
-allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:file manage_file_perms;
-allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:sock_file manage_file_perms;
-allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:dir rw_dir_perms;
-files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file sock_file })
-"""
-te_logfile2="""
-# log files
-allow TEMPLATETYPE_t TEMPLATETYPE_var_log_t:file create_file_perms;
-allow TEMPLATETYPE_t TEMPLATETYPE_var_log_t:sock_file create_file_perms;
-allow TEMPLATETYPE_t TEMPLATETYPE_var_log_t:dir { rw_dir_perms setattr };
-logging_log_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_log_t,{ sock_file file dir })
-"""
-te_libfile2="""
-# var/lib files for TEMPLATETYPE
-allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:file create_file_perms;
-allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file create_file_perms;
-allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:dir create_dir_perms;
-files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, { file dir sock_file })
-"""
-te_network2="""
-## Networking basics (adjust to your needs!)
-sysnet_dns_name_resolve(TEMPLATETYPE_t)
-corenet_tcp_sendrecv_all_if(TEMPLATETYPE_t)
-corenet_tcp_sendrecv_all_nodes(TEMPLATETYPE_t)
-corenet_tcp_sendrecv_all_ports(TEMPLATETYPE_t)
-corenet_non_ipsec_sendrecv(TEMPLATETYPE_t)
-corenet_tcp_connect_http_port(TEMPLATETYPE_t)
-#corenet_tcp_connect_all_ports(TEMPLATETYPE_t)
-## if it is a network daemon, consider these:
-#corenet_tcp_bind_all_ports(TEMPLATETYPE_t)
-#corenet_tcp_bind_all_nodes(TEMPLATETYPE_t)
-allow TEMPLATETYPE_t self:tcp_socket { listen accept };
-"""
-te_initsc2="""
-# Init script handling
-init_use_fds(TEMPLATETYPE_t)
-init_use_script_ptys(TEMPLATETYPE_t)
-domain_use_interactive_fds(TEMPLATETYPE_t)
-"""
-
-########################### File Context ##################################
-fc="""\
-# TEMPLATETYPE executable will have:
-# label: system_u:object_r:TEMPLATETYPE_exec_t
-# MLS sensitivity: s0
-# MCS categories: <none>
-
-EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
-"""
-fc_pidfile="""\
-FILENAME			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
-"""
-fc_logfile="""\
-FILENAME			gen_context(system_u:object_r:TEMPLATETYPE_var_log_t,s0)
-"""
-fc_libfile="""\
-FILENAME			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
-"""
-def errorExit(error):
-	sys.stderr.write("%s: " % sys.argv[0])
-	sys.stderr.write("%s\n" % error)
-	sys.stderr.flush()
-	sys.exit(1)
-
-
-def write_te_file(module, pidfile, logfile, libfile, network, initsc):
-	file="%s.te" % module
-	newte=re.sub("TEMPLATETYPE", module, te)
-	if libfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_libfile)
-	if logfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile)
-	if pidfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile)
-	newte= newte + re.sub("TEMPLATETYPE", module, te_sep)
-	if libfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_libfile2)
-	if logfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile2)
-	if pidfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile2)
-	if network:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_network2)
-	if initsc:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_initsc2)
-	if os.path.exists(file):
-		errorExit("%s already exists" % file)
-	fd = open(file, 'w')
-	fd.write(newte)
-	fd.close()
-
-def write_if_file(module):
-	file="%s.if" % module
-	newif=re.sub("TEMPLATETYPE", module, interface)
-	if os.path.exists(file):
-		errorExit("%s already exists" % file)
-	fd = open(file, 'w')
-	fd.write(newif)
-	fd.close()
-
-def write_fc_file(module, executable, pidfile, logfile, libfile):
-	file="%s.fc" % module
-	temp=re.sub("TEMPLATETYPE", module, fc)
-	newfc=re.sub("EXECUTABLE", executable, temp)
-	if pidfile:
-		temp=re.sub("TEMPLATETYPE", module, fc_pidfile)
-		newfc=newfc + re.sub("FILENAME", pidfile, temp)
-	if logfile:
-		temp=re.sub("TEMPLATETYPE", module, fc_logfile)
-		newfc=newfc + re.sub("FILENAME", logfile, temp)
-	if libfile:
-		temp=re.sub("TEMPLATETYPE", module, fc_libfile)
-		newfc=newfc + re.sub("FILENAME", libfile, temp)
-	if os.path.exists(file):
-		errorExit("%s already exists" % file)
-	fd = open(file, 'w')
-	fd.write(newfc)
-	fd.close()
-
-def gen_policy(module, executable, pidfile, logfile, libfile, initsc, network):
-	write_te_file(module, pidfile, logfile, libfile, initsc, network)
-	write_if_file(module)
-	write_fc_file(module, executable, pidfile, logfile, libfile)
-	
-if __name__ == '__main__':
-	def usage(message = ""):
-		print '%s ModuleName Executable' % sys.argv[0]
-		sys.exit(1)
-		
-	if len(sys.argv) != 3:
-		usage()
-
-	print """\n
-This tool generate three files for policy development, A Type Enforcement (te)
-file, a File Context (fc), and a Interface File(if).  Most of the policy rules
-will be written in the te file.  Use the File Context file to associate file
-paths with security context.  Use the interface rules to allow other protected
-domains to interact with the newly defined domains.
-
-After generating these files use the /usr/share/selinux/devel/Makefile to
-compile your policy package.  Then use the semodule tool to load it.
-
-# /usr/share/selinux/devel/policygentool myapp /usr/bin/myapp
-# make -f /usr/share/selinux/devel/Makefile
-# semodule -i myapp.pp
-# restorecon -R -v /usr/bin/myapp "all files defined in myapp.fc"
-
-Now you can turn on permissive mode, start your application and avc messages
-will be generated.  You can use audit2allow to help translate the avc messages
-into policy.
-
-# setenforce 0
-# service myapp start
-# audit2allow -R -i /var/log/audit/audit.log
-
-Return to continue:"""
-        sys.stdin.readline().rstrip()
-
-	print 'If the module uses pidfiles, what is the pidfile called?'
-	pidfile = sys.stdin.readline().rstrip()
-	if pidfile == "":
-		pidfile = None
-	print 'If the module uses logfiles, where are they stored?'
-	logfile = sys.stdin.readline().rstrip()
-	if logfile == "":
-		logfile = None
-	print 'If the module has var/lib files, where are they stored?'
-	libfile = sys.stdin.readline().rstrip()
-	if libfile == "":
-		libfile = None
-	print 'Does the module have a init script? [yN]'
-	initsc = sys.stdin.readline().rstrip()
-	if initsc == "" or initsc == "n" or initsc == "N":
-		initsc = False
-	elif initsc == "y" or initsc == "Y":
-		initsc = True
-	else:
-		raise "Please answer with 'y' or 'n'!"
-	print 'Does the module use the network? [yN]'
-	network = sys.stdin.readline().rstrip()
-	if network == "" or network == "n" or network == "N":
-		network = False
-	elif network == "y" or network == "Y":
-		network = True
-	else:
-		raise "Please answer with 'y' or 'n'!"
-
-	gen_policy(
-		module=sys.argv[1],
-		executable=sys.argv[2],
-		pidfile=pidfile,
-		logfile=logfile,
-		libfile=libfile,
-		initsc=initsc,
-		network=network
-	)
-
-	
+#!/bin/sh
+echo "$0 is no longer supported, better tools exist for creating policy"
+echo "Please use /usr/bin/sepolgen, slide or polgengui to generate policy"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -p -r1.929 -r1.930
--- selinux-policy.spec	24 Sep 2009 23:30:16 -0000	1.929
+++ selinux-policy.spec	25 Sep 2009 18:47:07 -0000	1.930
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -448,6 +448,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-11
+- Allow users to exec restorecond
+
 * Tue Sep 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-10
 - Allow sendmail to request kernel modules load
 



From cwickert at fedoraproject.org  Fri Sep 25 18:56:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 25 Sep 2009 18:56:21 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin/devel import.log, NONE,
	1.1 xfce4-xfswitch-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925185621.12A4311C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3131/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfce4-xfswitch-plugin.spec 
Log Message:
Initial import of xfce4-xfswitch-plugin. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=524413



--- NEW FILE import.log ---
xfce4-xfswitch-plugin-0_0_1-1_fc12:HEAD:xfce4-xfswitch-plugin-0.0.1-1.fc12.src.rpm:1253904378


--- NEW FILE xfce4-xfswitch-plugin.spec ---
%global upname xfswitch-plugin

Name:           xfce4-xfswitch-plugin
Version:        0.0.1
Release:        1%{?dist}
Summary:        User switching plugin for the Xfce4 Panel

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/panel-plugins/%{upname}
Source0:        http://archive.xfce.org/src/panel-plugins/%{upname}/0.0/%{upname}-0.0.1.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  xfce4-panel-devel >= 4.4
BuildRequires:  gettext intltool
Requires:       xfce4-panel >= 4.4.0
Requires:       gdm
Provides:       %{upname} = %{name}-%{version}

%description
Xfswitch-plugin is a user switching plugin for the Xfce4 Panel. It allows you 
to leave the current session opened and open a new session with another user. 
At the moment it relies on GDM, but other display managers will be supported 
in the future. 


%prep
%setup -qn %{upname}-%{version}


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{upname}


%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc AUTHORS  ChangeLog COPYING NEWS README
%{_libexecdir}/xfce4/panel-plugins/%{upname}
%{_datadir}/xfce4/panel-plugins/*.desktop


%changelog
* Thu Feb 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.1-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfswitch-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:25:29 -0000	1.1
+++ .cvsignore	25 Sep 2009 18:56:20 -0000	1.2
@@ -0,0 +1 @@
+xfswitch-plugin-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfswitch-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:25:30 -0000	1.1
+++ sources	25 Sep 2009 18:56:20 -0000	1.2
@@ -0,0 +1 @@
+cb204f4a507f462d019529af6f547731  xfswitch-plugin-0.0.1.tar.gz



From ajax at fedoraproject.org  Fri Sep 25 18:56:44 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 25 Sep 2009 18:56:44 +0000 (UTC)
Subject: rpms/libtheora/devel .cvsignore, 1.17, 1.18 libtheora.spec, 1.40,
	1.41 sources, 1.17, 1.18
Message-ID: <20090925185644.5F4CE11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libtheora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4393

Modified Files:
	.cvsignore libtheora.spec sources 
Log Message:
* Fri Sep 25 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
- libtheora 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	24 Aug 2009 06:19:18 -0000	1.17
+++ .cvsignore	25 Sep 2009 18:56:44 -0000	1.18
@@ -1 +1 @@
-libtheora-1.1beta3.tar.xz
+libtheora-1.1.0.tar.xz


Index: libtheora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- libtheora.spec	24 Aug 2009 06:19:18 -0000	1.40
+++ libtheora.spec	25 Sep 2009 18:56:44 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
-Version: 1.1beta3
+Version: 1.1.0
 Release: 1%{?dist}
 Epoch: 1
 License: BSD
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
+- libtheora 1.1.0
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1.1beta3
 - 1.1beta3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Aug 2009 06:19:18 -0000	1.17
+++ sources	25 Sep 2009 18:56:44 -0000	1.18
@@ -1 +1 @@
-b9ace22fcb96ec4170a32c29daf41e82  libtheora-1.1beta3.tar.xz
+76931beb93d1cb0c4c7fdfef3f7c4cb0  libtheora-1.1.0.tar.xz



From cwickert at fedoraproject.org  Fri Sep 25 19:01:52 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 25 Sep 2009 19:01:52 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin/F-11 xfce4-xfswitch-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925190152.C331111C02BB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6234/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-xfswitch-plugin.spec 
Log Message:
Initial build of fce4-xfswitch-plugin for this branch


--- NEW FILE xfce4-xfswitch-plugin.spec ---
%global upname xfswitch-plugin

Name:           xfce4-xfswitch-plugin
Version:        0.0.1
Release:        1%{?dist}
Summary:        User switching plugin for the Xfce4 Panel

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/panel-plugins/%{upname}
Source0:        http://archive.xfce.org/src/panel-plugins/%{upname}/0.0/%{upname}-0.0.1.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  xfce4-panel-devel >= 4.4
BuildRequires:  gettext intltool
Requires:       xfce4-panel >= 4.4.0
Requires:       gdm
Provides:       %{upname} = %{name}-%{version}

%description
Xfswitch-plugin is a user switching plugin for the Xfce4 Panel. It allows you 
to leave the current session opened and open a new session with another user. 
At the moment it relies on GDM, but other display managers will be supported 
in the future. 


%prep
%setup -qn %{upname}-%{version}


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{upname}


%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc AUTHORS  ChangeLog COPYING NEWS README
%{_libexecdir}/xfce4/panel-plugins/%{upname}
%{_datadir}/xfce4/panel-plugins/*.desktop


%changelog
* Thu Feb 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.1-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfswitch-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:25:29 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:01:47 -0000	1.2
@@ -0,0 +1 @@
+xfswitch-plugin-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfswitch-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:25:30 -0000	1.1
+++ sources	25 Sep 2009 19:01:49 -0000	1.2
@@ -0,0 +1 @@
+cb204f4a507f462d019529af6f547731  xfswitch-plugin-0.0.1.tar.gz



From cwickert at fedoraproject.org  Fri Sep 25 19:01:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 25 Sep 2009 19:01:55 +0000 (UTC)
Subject: rpms/xfce4-xfswitch-plugin/F-10 xfce4-xfswitch-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925190155.CFC9B11C02BB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xfswitch-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6234/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-xfswitch-plugin.spec 
Log Message:
Initial build of fce4-xfswitch-plugin for this branch


--- NEW FILE xfce4-xfswitch-plugin.spec ---
%global upname xfswitch-plugin

Name:           xfce4-xfswitch-plugin
Version:        0.0.1
Release:        1%{?dist}
Summary:        User switching plugin for the Xfce4 Panel

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/panel-plugins/%{upname}
Source0:        http://archive.xfce.org/src/panel-plugins/%{upname}/0.0/%{upname}-0.0.1.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  xfce4-panel-devel >= 4.4
BuildRequires:  gettext intltool
Requires:       xfce4-panel >= 4.4.0
Requires:       gdm
Provides:       %{upname} = %{name}-%{version}

%description
Xfswitch-plugin is a user switching plugin for the Xfce4 Panel. It allows you 
to leave the current session opened and open a new session with another user. 
At the moment it relies on GDM, but other display managers will be supported 
in the future. 


%prep
%setup -qn %{upname}-%{version}


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{upname}


%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{upname}.lang
%defattr(-,root,root,-)
%doc AUTHORS  ChangeLog COPYING NEWS README
%{_libexecdir}/xfce4/panel-plugins/%{upname}
%{_datadir}/xfce4/panel-plugins/*.desktop


%changelog
* Thu Feb 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.1-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfswitch-plugin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:25:29 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:01:54 -0000	1.2
@@ -0,0 +1 @@
+xfswitch-plugin-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfswitch-plugin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:25:30 -0000	1.1
+++ sources	25 Sep 2009 19:01:55 -0000	1.2
@@ -0,0 +1 @@
+cb204f4a507f462d019529af6f547731  xfswitch-plugin-0.0.1.tar.gz



From praveenp at fedoraproject.org  Fri Sep 25 19:05:03 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 25 Sep 2009 19:05:03 +0000 (UTC)
Subject: rpms/openwsman/F-10 .cvsignore, 1.2, 1.3 openwsman.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090925190503.1BC2F11C00E8@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8576

Modified Files:
	.cvsignore openwsman.spec sources 
Log Message:
updating the sources to openwsman-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2008 10:57:30 -0000	1.2
+++ .cvsignore	25 Sep 2009 19:05:02 -0000	1.3
@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-10/openwsman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman.spec	1 Nov 2008 10:57:30 -0000	1.1
+++ openwsman.spec	25 Sep 2009 19:05:02 -0000	1.2
@@ -1,8 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
-Version:       2.1.0
+Version:       2.2.0
 Release:        1%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
@@ -63,6 +64,7 @@ chmod a-x include/*.[ch]
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
 %configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
+echo %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 make %{?_smp_flags}
 
 %install
@@ -95,6 +97,8 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
+/usr/lib/ruby/site_ruby/1.8/openwsman/
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
 %files devel
@@ -109,7 +113,7 @@ rm -rf %{buildroot}
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -135,6 +139,18 @@ fi
 
 
 %changelog
+* Wed Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
+- Added the new 2.2.0 sources.
+- Changed the release and version numbers.
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2008 10:57:30 -0000	1.2
+++ sources	25 Sep 2009 19:05:02 -0000	1.3
@@ -1 +1 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2



From jderose at fedoraproject.org  Fri Sep 25 19:06:28 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Fri, 25 Sep 2009 19:06:28 +0000 (UTC)
Subject: rpms/python-assets/devel import.log, NONE, 1.1 python-assets.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925190628.A65CB11C00E8@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-assets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9325/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-assets.spec 
Log Message:



--- NEW FILE import.log ---
python-assets-0_1_0-1_fc11:HEAD:python-assets-0.1.0-1.fc11.src.rpm:1253905376


--- NEW FILE python-assets.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-assets
Version:        0.1.0
Release:        1%{?dist}
Summary:        Cache-friendly asset management via content-hash-naming

Group:          Development/Languages
License:        LGPLv3+
URL:            http://jderose.fedorapeople.org/assets/
Source0:        http://jderose.fedorapeople.org/assets/%{version}/assets-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-nose

%description
The assets package does content-hash-naming (aka URL fingerprinting) so you can
use aggressive caching headers without risking that a client might have an
out-of-date version of an asset in its cache.  If the content changes, the
content-hash-name also changes, resulting in a different URL for each
bytewise-unique version of an asset.

%prep
%setup -q -n assets-%{version}

%build
%{__python} setup.py build

%check
nosetests --with-doctest

%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,-)
%doc README COPYING COPYING.LESSER
%{python_sitelib}/assetslib/
%{python_sitelib}/assets-%{version}-py2.6.egg-info

%changelog
* Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:32:46 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:06:28 -0000	1.2
@@ -0,0 +1 @@
+assets-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:32:46 -0000	1.1
+++ sources	25 Sep 2009 19:06:28 -0000	1.2
@@ -0,0 +1 @@
+fbb3736161c8239d187aeb52262bddea  assets-0.1.0.tar.gz



From jderose at fedoraproject.org  Fri Sep 25 19:10:08 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Fri, 25 Sep 2009 19:10:08 +0000 (UTC)
Subject: rpms/python-wehjit/devel import.log, NONE, 1.1 python-wehjit.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925191008.8981011C0418@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-wehjit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10823/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-wehjit.spec 
Log Message:



--- NEW FILE import.log ---
python-wehjit-0_1_0-1_fc11:HEAD:python-wehjit-0.1.0-1.fc11.src.rpm:1253905694


--- NEW FILE python-wehjit.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-wehjit
Version:        0.1.0
Release:        1%{?dist}
Summary:        A Python web-widget library

Group:          Development/Languages
License:        GPLv3+
URL:            http://jderose.fedorapeople.org/wehjit/
Source0:        http://jderose.fedorapeople.org/wehjit/%{version}/wehjit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-nose
BuildRequires:  python-assets python-genshi python-paste python-pygments
Requires:       python-assets python-genshi python-paste python-pygments

%description
wehjit is a Python library for for building XHTML widgets for web applications
and web pages.  It encapsulates the XHTML (a Genshi XML template), CSS, and
JavaScript for each widget into a plugin.

%prep
%setup -q -n wehjit-%{version}

%build
%{__python} setup.py build

%check
nosetests --with-doctest

%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,-)
%doc README COPYING
%{python_sitelib}/wehjit/
%{python_sitelib}/wehjit-%{version}-py2.6.egg-info
%{_bindir}/wehjit-demo

%changelog
* Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:33:31 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:10:08 -0000	1.2
@@ -0,0 +1 @@
+wehjit-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:33:31 -0000	1.1
+++ sources	25 Sep 2009 19:10:08 -0000	1.2
@@ -0,0 +1 @@
+2a2391ab302610723eb6c9f91e2e1469  wehjit-0.1.0.tar.gz



From cdamian at fedoraproject.org  Fri Sep 25 19:13:47 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 25 Sep 2009 19:13:47 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/F-11 import.log, NONE,
	1.1 php-doctrine-Doctrine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925191347.2FFF011C00E8@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11845/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-doctrine-Doctrine.spec 
Log Message:
new package php-doctrine-Doctrine-1.1.3-4



--- NEW FILE import.log ---
php-doctrine-Doctrine-1_1_3-4_fc11:F-11:php-doctrine-Doctrine-1.1.3-4.fc11.src.rpm:1253905973


--- NEW FILE php-doctrine-Doctrine.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Doctrine

Name:           php-doctrine-Doctrine
Version:        1.1.3
Release:        4%{?dist}
Summary:        PHP Object Relational Mapper

Group:          Development/Libraries
License:        LGPLv2+ and MIT and BSD
URL:            http://www.doctrine-project.org/
Source0:        http://pear.doctrine-project.org/get/Doctrine-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-channel(pear.doctrine-project.com)
BuildRequires:  php-pear(PEAR)
Requires:       php >= 5.2.3
Requires:       php-pear(PEAR)
Requires:       php-channel(pear.doctrine-project.com)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(pear.doctrine-project.com/%{pear_name}) = %{version}

%description

Doctrine is an object relational mapper (ORM) for PHP 5.2.3+ that sits on top
of a powerful database abstraction layer (DBAL). One of its key features is the
option to write database queries in a proprietary object oriented SQL dialect
called Doctrine Query Language (DQL), inspired by Hibernates HQL. This provides
developers with a powerful alternative to SQL that maintains flexibility
without requiring unnecessary code duplication.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*


# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
# Expand this as needed to avoid owning dirs owned by our dependencies
%{pear_phpdir}/%{pear_name}

%changelog
* Thu Sep 24 2009 Christof Damian <christof at damian.net> 1.1.3-4
- fix provide

* Mon Aug 17 2009 Christof Damian <christof at damian.net> 1.1.3-3
- changed LGPL to LGPLv2+

* Mon Aug 17 2009 Christof Damian <christof at damian.net> 1.1.3-2
- added missing licenses

* Sat Aug 15 2009 Christof Damian <christof at damian.net> 1.1.3-1
- initial rpm




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:30:49 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:13:46 -0000	1.2
@@ -0,0 +1 @@
+Doctrine-1.1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:30:50 -0000	1.1
+++ sources	25 Sep 2009 19:13:46 -0000	1.2
@@ -0,0 +1 @@
+cdd9ebb1e146514dac9dc36aaa2db5d7  Doctrine-1.1.3.tgz



From praveenp at fedoraproject.org  Fri Sep 25 19:26:19 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 25 Sep 2009 19:26:19 +0000 (UTC)
Subject: rpms/cim-schema/F-10 LICENSE, NONE, 1.1 cim-schema.spec, NONE,
	1.1 import.log, NONE, 1.1 loadmof.sh, NONE, 1.1 rmmof.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090925192619.A13E711C00E8@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/cim-schema/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16871/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE cim-schema.spec import.log loadmof.sh rmmof.sh 
Log Message:
cim-schema in Fedora 10



--- NEW FILE LICENSE ---
// Copyright 1998-2008 Distributed Management Task Force, Inc. (DMTF).
// All rights reserved.
// DMTF is a not-for-profit association of industry members dedicated
// to promoting enterprise and systems management and interoperability.
// DMTF specifications and documents may be reproduced by
// members and non-members, provided that correct attribution is given.
// As DMTF specifications may be revised from time to time,
// the particular version and release date should always be noted.
// 
// Implementation of certain elements of this standard or proposed
// standard may be subject to third party patent rights, including
// provisional patent rights (herein "patent rights"). DMTF makes
// no representations to users of the standard as to the existence
// of such rights, and is not responsible to recognize, disclose, or
// identify any or all such third party patent right, owners or
// claimants, nor for any incomplete or inaccurate identification or
// disclosure of such rights, owners or claimants. DMTF shall have no
// liability to any party, in any manner or circumstance, under any
// legal theory whatsoever, for failure to recognize, disclose, or
// identify any such third party patent rights, or for such party's
// reliance on the standard or incorporation thereof in its product,
// protocols or testing procedures. DMTF shall have no liability to
// any party implementing such standard, whether such implementation
// is foreseeable or not, nor to any patent owner or claimant, and shall
// have no liability or responsibility for costs or losses incurred if
// a standard is withdrawn or modified after publication, and shall be
// indemnified and held harmless by any party implementing the
// standard from any and all claims of infringement by a patent owner
// for such implementations.
// 
// For information about patents held by third-parties which have
// notified the DMTF that, in their opinion, such patent may relate to
// or impact implementations of DMTF standards, visit
// http://www.dmtf.org/about/policies/disclosures.php.


--- NEW FILE cim-schema.spec ---
#
# spec file for package cim-schema
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.
#
# The license for this spec file is the MIT/X11 license:
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#

# norootforbuild

Name:           cim-schema
Url:            http://www.dmtf.org/
Summary:        Common Information Model (CIM) Schema
Version:        2.22.0
Release:        1%{?dist}
Group:          Development/Libraries
License:        DMTF
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Source0:        http://www.dmtf.org/standards/cim/cim_schema_v2220/cim_schema_%{version}Experimental-MOFs.zip
Source1:        http://www.dmtf.org/standards/cim/cim_schema_v2220/cim_schema_%{version}Experimental-Doc.zip
Source2:        loadmof.sh
Source3:        rmmof.sh
Source4:        LICENSE
BuildArch:      noarch

%package docs
Summary:        Common Information Model (CIM) Schema documentation
Group:          Documentation


%description
Common Information Model (CIM) is a model for describing overall
management information in a network or enterprise environment. CIM
consists of a specification and a schema. The specification defines the
details for integration with other management models. The schema
provides the actual model descriptions.



Authors:
--------
    DTMF <http://www.dmtf.org/about/contact>

%description docs
Common Information Model (CIM) schema documentation.

%prep
%setup -q -T -a 1 -c -n %{name}-%{version}-docs
%setup -q -T -a 0 -c -n %{name}-%{version}
cp -a %{SOURCE4} ..

%build
%install
MOFDIR=%{_datadir}/mof
CIMDIR=$MOFDIR/cimv%{version}
%__rm -rf $RPM_BUILD_ROOT
for i in `find . -name "*.mof"`; do
  sed -i -e 's/\r//g' $i
done
install -d $RPM_BUILD_ROOT/$CIMDIR
chmod -R go-wx .
chmod -R a+rX .
%__mv * $RPM_BUILD_ROOT/$CIMDIR/
ln -s cimv%{version} $RPM_BUILD_ROOT/$MOFDIR/cim-current
ln -s cim_schema_%{version}.mof $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
install -d $RPM_BUILD_ROOT/usr/bin
install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/bin/
install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/bin/

%clean
%__rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%dir /usr/share/mof
%dir /usr/share/mof/cimv%{version}
/usr/share/mof/cimv%{version}/*
/usr/share/mof/cim-current
/usr/bin/loadmof.sh
/usr/bin/rmmof.sh
%doc ../LICENSE

%files docs
%defattr(-, root, root)
%doc ../%{name}-%{version}-docs/*

%changelog
* Thu Jul 16 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.22.0-1.fc12
- add dist tag

* Tue Jul 14 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.22.0-1
- spec license change to MIT per Novell
- remove BR: unzip, it's in the default buildroot already
- add MIT license to spec file

* Wed May 20 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.21.0-1
- upgrade to v2.22.0

* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 2.19.1-1
- Upgraded to cimv2.19.1Experimental
- now meets Fedora packaging guidelines too
- added -docs subpackage
* Wed May 14 2008 bwhiteley at suse.de
- Upgraded to cimv2.18Experimental
* Thu Jan 17 2008 bwhiteley at suse.de
- Fixed order of includes so that it will import in pegasus.
* Tue Jan 08 2008 bwhiteley at suse.de
- Updated to cimv2.17Experimental (#341800)
* Wed Nov 28 2007 bwhiteley at suse.de
- Updated to cimv2.16Experimental (#341800)
  Remove carriage returns from MOF files.
  Fix broken comment blocks in 2.16 schema.
* Thu Mar 29 2007 bwhiteley at suse.de
- Added unzip to BuildRequires
* Tue Mar 27 2007 bwhiteley at suse.de
- Fixed inclusion of missing file (#258187)
* Tue Mar 13 2007 bart at novell.com
- Added some classes from 2.15 preliminary needed for Xen
  providers (#228365)
* Fri Jan 19 2007 bwhiteley at suse.de
- update to schema version 2.14 (#228365)
* Mon Jan 08 2007 bwhiteley at suse.de
- Combine all qualifiers back into one file (#232667)
* Tue Dec 19 2006 bwhiteley at suse.de
- added loadmof.sh script. (#228349)
* Wed Dec 13 2006 bwhiteley at suse.de
- Updated to schema version cimv2.13.1 (#228365)
* Fri Oct 06 2006 bwhiteley at suse.de
- Updated to schema version cimv2.13
* Mon May 08 2006 bwhiteley at suse.de
- Updated to schema version cimv2.12, required for SMASH 1.0
  compliance (#173777)
* Fri May 05 2006 bwhiteley at suse.de
- removed non-ascii char from CIM_DNSSettingData.mof (was breaking
  some XML parsers) (#172939)
* Fri Feb 10 2006 bwhiteley at suse.de
- fixed execute bit on directories (#149992)
* Wed Jan 25 2006 mls at suse.de
- converted neededforbuild to BuildRequires
* Tue Jan 17 2006 bwhiteley at suse.de
- Added a symlink cim-current so other packages don't have to hard-
  code cim schema versions.
* Tue Jan 10 2006 bwhiteley at suse.de
- Update to v2.11 Experimental.
- Moved MOFs under /usr/share/mof
* Thu Jan 13 2005 nashif at suse.de
- Update to v2.9 Final
* Tue Oct 12 2004 nashif at suse.de
- Update with cim v2.9
* Tue Feb 17 2004 nashif at suse.de
- Fixed directory permissions
- build as normal user
* Mon Feb 16 2004 nashif at suse.de
- Updated to 2.8 final
* Thu Nov 27 2003 nashif at suse.de
- Initial Release


--- NEW FILE import.log ---
cim-schema-2_22_0-1_el5:F-10:cim-schema-2.22.0-1.el5.src.rpm:1253906789


--- NEW FILE loadmof.sh ---
#!/bin/sh

OWLM=/usr/bin/ow-loadmof.sh
PEGLM=/usr/bin/peg-loadmof.sh

if [ -x $OWLM ]; then
  $OWLM $@
fi

if [ -x $PEGLM ]; then
  $PEGLM $@
fi



--- NEW FILE rmmof.sh ---
#!/bin/sh

OWLM=/usr/bin/ow-rmmof.sh
PEGLM=/usr/bin/peg-rmmof.sh

if [ -x $OWLM ]; then
  $OWLM $@
fi

if [ -x $PEGLM ]; then
  $PEGLM $@
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cim-schema/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Jul 2009 05:46:16 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:26:19 -0000	1.2
@@ -0,0 +1,2 @@
+cim_schema_2.22.0Experimental-Doc.zip
+cim_schema_2.22.0Experimental-MOFs.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cim-schema/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Jul 2009 05:46:16 -0000	1.1
+++ sources	25 Sep 2009 19:26:19 -0000	1.2
@@ -0,0 +1,2 @@
+965a56879d23e82d0cf1b2cb474e6076  cim_schema_2.22.0Experimental-Doc.zip
+3e55062f785a67a8548bae96afbec299  cim_schema_2.22.0Experimental-MOFs.zip



From rstrode at fedoraproject.org  Fri Sep 25 19:27:59 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 25 Sep 2009 19:27:59 +0000 (UTC)
Subject: rpms/gdm/devel 0001-Fix-gdm_slave_get_timed_login_details.patch,
	NONE, 1.1 gdm.spec, 1.487, 1.488
Message-ID: <20090925192759.50D2D11C00E8@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17292

Modified Files:
	gdm.spec 
Added Files:
	0001-Fix-gdm_slave_get_timed_login_details.patch 
Log Message:
- Fix autologin


0001-Fix-gdm_slave_get_timed_login_details.patch:
 gdm-slave.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Fix-gdm_slave_get_timed_login_details.patch ---
>From 9fd603874caa65791cd74aa88daf61f9f196d5c3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 25 Sep 2009 15:07:54 -0400
Subject: [PATCH] Fix gdm_slave_get_timed_login_details

Before it would fail if a NULL username was passed in,
breaking autologin on the multi-stack branch.
---
 daemon/gdm-slave.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index 7bc98c5..94a32ee 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -881,6 +881,16 @@ gdm_slave_get_timed_login_details (GdmSlave   *slave,
         if (usernamep != NULL) {
                 *usernamep = gdm_slave_parse_enriched_login (slave,
                         username, slave->priv->display_name);
+        } else {
+                g_free (username);
+
+                if (enabledp != NULL) {
+                        *enabledp = enabled;
+                }
+                if (delayp != NULL) {
+                        *delayp = delay;
+                }
+                return TRUE;
         }
         g_free (username);
 
-- 
1.6.4.2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- gdm.spec	23 Sep 2009 23:39:05 -0000	1.487
+++ gdm.spec	25 Sep 2009 19:27:58 -0000	1.488
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -99,6 +99,7 @@ Patch3: gdm-2.23.92-save-root-window.pat
 Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
+Patch20: 0001-Fix-gdm_slave_get_timed_login_details.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -143,6 +144,7 @@ The GDM fingerprint plugin provides func
 %patch13 -p1 -b .system-keyboard
 
 %patch19 -p1 -b .multistack
+%patch20 -p1 -b .autologin
 
 %patch99 -p1 -b .fedora-logo
 
@@ -392,6 +394,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Sep 25 2009 Ray Strode <rstrode at redhat.com> 1:2.28.0-2
+- Fix autologin
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 1:2.28.0-1
 - Update to 2.28.0
 



From clumens at fedoraproject.org  Fri Sep 25 19:29:48 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri, 25 Sep 2009 19:29:48 +0000 (UTC)
Subject: rpms/python-meh/devel .cvsignore, 1.4, 1.5 python-meh.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090925192948.DB5C511C00E8@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18331

Modified Files:
	.cvsignore python-meh.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Sep 2009 14:41:19 -0000	1.4
+++ .cvsignore	25 Sep 2009 19:29:48 -0000	1.5
@@ -1,3 +1,4 @@
 python-meh-0.1.tar.gz
 python-meh-0.2.tar.gz
 python-meh-0.3.tar.gz
+python-meh-0.4.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/python-meh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-meh.spec	10 Sep 2009 14:41:19 -0000	1.3
+++ python-meh.spec	25 Sep 2009 19:29:48 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: http://git.fedoraproject.org/git/?p=python-meh.git
-Version: 0.3
+Version: 0.4
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -46,6 +46,11 @@ rm -rf %{buildroot}
 %{_datadir}/python-meh
 
 %changelog
+* Fri Sep 25 2009 Chris Lumens <clumens at redhat.com> - 0.4-1
+- Add a default description to bug reports.
+- Handle the user pressing Escape by continuing to show the dialog.
+- Lots more translation updates.
+
 * Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> - 0.3-1
 - Pull in lots of new translations (#522410).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Sep 2009 14:41:19 -0000	1.4
+++ sources	25 Sep 2009 19:29:48 -0000	1.5
@@ -1 +1 @@
-b42add54722627bb9225a3461a6bd2e7  python-meh-0.3.tar.gz
+8a368a55ad1273a8e9f0872d1807fb66  python-meh-0.4.tar.gz



From itamarjp at fedoraproject.org  Fri Sep 25 19:33:24 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 25 Sep 2009 19:33:24 +0000 (UTC)
Subject: rpms/pg_top/devel import.log,1.2,1.3 pg_top.spec,1.4,1.5
Message-ID: <20090925193324.EA52A11C0374@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/pg_top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19316/devel

Modified Files:
	import.log pg_top.spec 
Log Message:
- start building EPEL branch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jul 2009 03:33:03 -0000	1.2
+++ import.log	25 Sep 2009 19:33:23 -0000	1.3
@@ -1,2 +1,3 @@
 pg_top-3_6_2-3_fc10:HEAD:pg_top-3.6.2-3.fc10.src.rpm:1232983876
 pg_top-3_6_2-5_fc11:HEAD:pg_top-3.6.2-5.fc11.src.rpm:1247628727
+pg_top-3_6_2-7_fc12:HEAD:pg_top-3.6.2-7.fc12.src.rpm:1253907117


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/devel/pg_top.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pg_top.spec	26 Jul 2009 17:53:19 -0000	1.4
+++ pg_top.spec	25 Sep 2009 19:33:24 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
@@ -9,10 +9,13 @@ URL:		http://pgfoundry.org/projects/ptop
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
-BuildRequires:  systemtap-sdt-devel
 Requires:	postgresql-server
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+BuildRequires:  systemtap-sdt-devel
+%endif
+
 
 %description
 pg_top is 'top' for PostgreSQL processes. See running queries, 
@@ -41,6 +44,9 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
+- starting building for EPEL too
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Fri Sep 25 19:35:00 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 25 Sep 2009 19:35:00 +0000 (UTC)
Subject: rpms/pg_top/EL-4 import.log,1.2,1.3 pg_top.spec,1.4,1.5
Message-ID: <20090925193500.9806611C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/pg_top/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20392/EL-4

Modified Files:
	import.log pg_top.spec 
Log Message:
- starting building for EPEL too



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jul 2009 03:33:03 -0000	1.2
+++ import.log	25 Sep 2009 19:35:00 -0000	1.3
@@ -1,2 +1,3 @@
 pg_top-3_6_2-3_fc10:HEAD:pg_top-3.6.2-3.fc10.src.rpm:1232983876
 pg_top-3_6_2-5_fc11:HEAD:pg_top-3.6.2-5.fc11.src.rpm:1247628727
+pg_top-3_6_2-7_fc12:EL-4:pg_top-3.6.2-7.fc12.src.rpm:1253907247


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/EL-4/pg_top.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pg_top.spec	26 Jul 2009 17:53:19 -0000	1.4
+++ pg_top.spec	25 Sep 2009 19:35:00 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
@@ -9,10 +9,13 @@ URL:		http://pgfoundry.org/projects/ptop
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
-BuildRequires:  systemtap-sdt-devel
 Requires:	postgresql-server
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+BuildRequires:  systemtap-sdt-devel
+%endif
+
 
 %description
 pg_top is 'top' for PostgreSQL processes. See running queries, 
@@ -41,6 +44,9 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
+- starting building for EPEL too
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agk at fedoraproject.org  Fri Sep 25 19:38:33 2009
From: agk at fedoraproject.org (agk)
Date: Fri, 25 Sep 2009 19:38:33 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.53.tgz.asc, NONE, 1.1 .cvsignore, 1.71,
	1.72 lvm2.spec, 1.181, 1.182 sources, 1.77, 1.78 upstream, 1.64,
	1.65 lvm2-2_02_53-dmeventd_log_fn.patch, 1.2,
	NONE lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch, 1.1,
	NONE lvm2-2_02_53-lvm2_monitoring_init.patch, 1.1, NONE
Message-ID: <20090925193833.65FB611C00E8@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20974

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.53.tgz.asc 
Removed Files:
	lvm2-2_02_53-dmeventd_log_fn.patch 
	lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch 
	lvm2-2_02_53-lvm2_monitoring_init.patch 
Log Message:
folded patches into tarball & a few more fixes



--- NEW FILE LVM2.2.02.53.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBKvRepIoGRwVZ+LBcRAjPTAKDbxSa/ohWlc9f1sdVuZ8+/34hyXgCeJXUA
MBicW/9WJRiltnFa8FF/kyk=
=XBZd
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	15 Sep 2009 15:29:24 -0000	1.71
+++ .cvsignore	25 Sep 2009 19:38:32 -0000	1.72
@@ -1 +1 @@
-LVM2.2.02.52.tgz
+LVM2.2.02.53.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- lvm2.spec	24 Sep 2009 22:07:23 -0000	1.181
+++ lvm2.spec	25 Sep 2009 19:38:32 -0000	1.182
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.37
+%define device_mapper_version 1.02.38
 %define corosync_version 1.0.0-1
 %define clusterlib_version 3.0.0-20
 
@@ -7,8 +7,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.52
-Release: 4%{?dist}
+Version: 2.02.53
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -16,9 +16,6 @@ Source0: ftp://sources.redhat.com/pub/lv
 
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
-Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch
-Patch2: lvm2-2_02_53-dmeventd_log_fn.patch
-Patch3: lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -47,9 +44,6 @@ or more physical volumes and creating on
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
-%patch1 -p1 -b .lvm2_monitoring
-%patch2 -p1 -b .dmeventd_log_fn
-%patch3 -p1 -b .enable_dmeventd_in_conf
 
 %build
 %define _exec_prefix /
@@ -385,6 +379,11 @@ the device-mapper event library.
 
 
 %changelog
+* Fri Sep 25 2009 Alasdair Kergon <agk at redhat.com> - 2.02.53-1
+- Create any directories in /dev with umask 022. (#507397)
+- Handle paths supplied to dm_task_set_name by getting name from /dev/mapper.
+- Add splitname and --yes to dmsetup man page.
+
 * Thu Sep 24 2009 Peter Rajnoha <prajnoha at redhat.com> - 2.02.52-4
 - Disable udev synchronisation code (revert previous build).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	15 Sep 2009 16:00:30 -0000	1.77
+++ sources	25 Sep 2009 19:38:32 -0000	1.78
@@ -1 +1 @@
-f3b3aed6f6aacd8f351d9a5da097293f  LVM2.2.02.52.tgz
+24d863fdaec51faba79513ad3b537f4e  LVM2.2.02.53.tgz


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- upstream	15 Sep 2009 15:29:24 -0000	1.64
+++ upstream	25 Sep 2009 19:38:32 -0000	1.65
@@ -1 +1 @@
-LVM2.2.02.52.tgz
+LVM2.2.02.53.tgz


--- lvm2-2_02_53-dmeventd_log_fn.patch DELETED ---


--- lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch DELETED ---


--- lvm2-2_02_53-lvm2_monitoring_init.patch DELETED ---



From agk at fedoraproject.org  Fri Sep 25 19:40:37 2009
From: agk at fedoraproject.org (agk)
Date: Fri, 25 Sep 2009 19:40:37 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.52.tgz.asc,1.2,NONE
Message-ID: <20090925194037.39A1611C0423@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22272

Removed Files:
	LVM2.2.02.52.tgz.asc 
Log Message:
old



--- LVM2.2.02.52.tgz.asc DELETED ---



From rdieter at fedoraproject.org  Fri Sep 25 19:40:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Sep 2009 19:40:51 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking/devel import.log, NONE,
	1.1 kmm_kbanking-1.0-libtool.patch, NONE,
	1.1 kmymoney2-aqbanking.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925194051.7C21211C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14519/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kmm_kbanking-1.0-libtool.patch 
	kmymoney2-aqbanking.spec 
Log Message:
import



--- NEW FILE import.log ---
kmymoney2-aqbanking-1_0-2:HEAD:kmymoney2-aqbanking-1.0-2.src.rpm:1253902235

kmm_kbanking-1.0-libtool.patch:
 Makefile.am |    2 +-
 Makefile.in |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE kmm_kbanking-1.0-libtool.patch ---
diff -up kmm_kbanking-1.0/src/Makefile.am.libtool kmm_kbanking-1.0/src/Makefile.am
--- kmm_kbanking-1.0/src/Makefile.am.libtool	2009-02-13 06:36:12.000000000 -0600
+++ kmm_kbanking-1.0/src/Makefile.am	2009-09-03 15:44:14.689090240 -0500
@@ -23,7 +23,7 @@ kmm_kbanking_la_SOURCES = mymoneybanking
 # Libs needed by the plugin
 kmm_kbanking_la_LIBADD = @qbanking_libs@ $(aqbanking_libs) $(gwenhywfar_libs) \
   $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
-  $(kde_libraries)/libkmm_plugin.la $(kde_libraries)/libkmm_mymoney.la \
+  -lkmm_plugin -lkmm_mymoney \
   ./kbanking/libkbanking.la 
 
 # LD flags for the plugin
diff -up kmm_kbanking-1.0/src/Makefile.in.libtool kmm_kbanking-1.0/src/Makefile.in
--- kmm_kbanking-1.0/src/Makefile.in.libtool	2009-08-17 06:07:23.000000000 -0500
+++ kmm_kbanking-1.0/src/Makefile.in	2009-09-03 15:44:58.801843149 -0500
@@ -61,8 +61,7 @@ am__DEPENDENCIES_1 =
 kmm_kbanking_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(kde_libraries)/libkmm_plugin.la \
-	$(kde_libraries)/libkmm_mymoney.la ./kbanking/libkbanking.la
+	./kbanking/libkbanking.la
 am_kmm_kbanking_la_OBJECTS = mymoneybanking.lo
 #>- kmm_kbanking_la_OBJECTS = $(am_kmm_kbanking_la_OBJECTS)
 #>+ 1
@@ -407,7 +406,7 @@ kmm_kbanking_la_SOURCES = mymoneybanking
 # Libs needed by the plugin
 kmm_kbanking_la_LIBADD = @qbanking_libs@ $(aqbanking_libs) $(gwenhywfar_libs) \
   $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
-  $(kde_libraries)/libkmm_plugin.la $(kde_libraries)/libkmm_mymoney.la \
+  -lkmm_plugin -lkmm_mymoney \
   ./kbanking/libkbanking.la 
 
 


--- NEW FILE kmymoney2-aqbanking.spec ---

%if 0%{?fedora} > 6
%define kdelibs3 kdelibs3
%else
%define kdelibs3 kdelibs
BuildRequires: libutempter-devel
%endif

Name:    kmymoney2-aqbanking
Summary: Online banking plugin for KMyMoney
Version: 1.0
Release: 2%{?dist}
License: GPLv2+
Group:   Applications/Productivity
URL:     http://www2.aquamaniac.de/sites/home/index.php
# no direct URL available
Source:  kmm_kbanking-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# workaround assumptions about .la files being available for linking
Patch1: kmm_kbanking-1.0-libtool.patch

BuildRequires: curl-devel
BuildRequires: %{kdelibs3}-devel
BuildRequires: kmymoney2-devel >= %{version}
BuildRequires: qbanking-devel >= 3.7.2

# tarball name, some may expect that to be used
Provides: kmm_kbanking = %{version}-%{release}
Provides: kmymoney-aqbanking = %{version}-%{release}

Requires: kmymoney2 >= %{version}

# FIXME: flesh-out
%description
%{summary}.


%prep
%setup -q -n kmm_kbanking-%{version}

%patch1 -p1 -b .libtool


%build
%configure \
  --disable-rpath \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking \
  --enable-gwenhywfar \
  --enable-aqbanking

make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%find_lang kmm_kbanking 


%clean
rm -rf %{buildroot}


%files -f kmm_kbanking.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/kde3/kmm_kbanking.*
%{_datadir}/apps/kmm_kbanking/
%{_datadir}/services/kmm_kbanking.desktop
%{_docdir}/HTML/en/kmm_kbanking/


%changelog
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-2
- rename to kmymoney2-aqbanking

* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-1
- kmm_kbanking-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2-aqbanking/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:13:37 -0000	1.1
+++ .cvsignore	25 Sep 2009 19:40:51 -0000	1.2
@@ -0,0 +1 @@
+kmm_kbanking-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2-aqbanking/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:13:37 -0000	1.1
+++ sources	25 Sep 2009 19:40:51 -0000	1.2
@@ -0,0 +1 @@
+44ba5beb6a2c5ba9aab2e201810e98a3  kmm_kbanking-1.0.tar.gz



From itamarjp at fedoraproject.org  Fri Sep 25 19:44:33 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 25 Sep 2009 19:44:33 +0000 (UTC)
Subject: rpms/pg_top/EL-5 import.log,1.2,1.3 pg_top.spec,1.4,1.5
Message-ID: <20090925194433.31F9D11C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/pg_top/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23851/EL-5

Modified Files:
	import.log pg_top.spec 
Log Message:
- start building EL branch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jul 2009 03:33:03 -0000	1.2
+++ import.log	25 Sep 2009 19:44:32 -0000	1.3
@@ -1,2 +1,3 @@
 pg_top-3_6_2-3_fc10:HEAD:pg_top-3.6.2-3.fc10.src.rpm:1232983876
 pg_top-3_6_2-5_fc11:HEAD:pg_top-3.6.2-5.fc11.src.rpm:1247628727
+pg_top-3_6_2-7_fc12:EL-5:pg_top-3.6.2-7.fc12.src.rpm:1253907765


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/EL-5/pg_top.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pg_top.spec	26 Jul 2009 17:53:19 -0000	1.4
+++ pg_top.spec	25 Sep 2009 19:44:32 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
@@ -9,10 +9,13 @@ URL:		http://pgfoundry.org/projects/ptop
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
-BuildRequires:  systemtap-sdt-devel
 Requires:	postgresql-server
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+BuildRequires:  systemtap-sdt-devel
+%endif
+
 
 %description
 pg_top is 'top' for PostgreSQL processes. See running queries, 
@@ -41,6 +44,9 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
+- starting building for EPEL too
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From deji at fedoraproject.org  Fri Sep 25 20:00:10 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 25 Sep 2009 20:00:10 +0000 (UTC)
Subject: rpms/texmaker/F-11 sources, 1.10, 1.11 texmaker-tools.patch, 1.10, 
	1.11 texmaker.spec, 1.21, 1.22
Message-ID: <20090925200010.229A311C0423@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/texmaker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28886

Modified Files:
	sources texmaker-tools.patch texmaker.spec 
Log Message:
* Sat Sep 25 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.2-1
- Update to 1.9.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Jun 2009 05:49:54 -0000	1.10
+++ sources	25 Sep 2009 20:00:08 -0000	1.11
@@ -1 +1 @@
-db83c10dc6b737bfc81a108f0ce3f067  texmaker-1.9.1.tar.bz2
+61842ccacf7d843e497aa74f7135d04a  texmaker-1.9.2.tar.bz2

texmaker-tools.patch:
 texmaker.cpp |   26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

Index: texmaker-tools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/F-11/texmaker-tools.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- texmaker-tools.patch	16 Jun 2009 05:49:54 -0000	1.10
+++ texmaker-tools.patch	25 Sep 2009 20:00:09 -0000	1.11
@@ -1,6 +1,6 @@
---- texmaker.cpp	2009-05-24 04:37:51.000000000 -0400
-+++ texmaker.cpp.new	2009-05-27 07:34:34.287172458 -0400
-@@ -2430,28 +2430,10 @@
+--- texmaker.cpp	2009-06-14 12:42:57.000000000 -0400
++++ texmaker.cpp.new	2009-07-15 11:33:27.749640574 -0400
+@@ -2352,27 +2352,9 @@
  metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
  // xdvi %.dvi  -sourceposition @:%.tex
  // kdvi "file:%.dvi#src:@ %.tex"
@@ -25,14 +25,13 @@
 -		viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
 -		}break;
 -	}
- 
 +viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
 +viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
 +viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
  
  
- ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -2601,7 +2583,7 @@
+ 
+@@ -2524,7 +2506,7 @@
  author=config->value("Quick/Author","").toString();
  
  #if defined( Q_WS_X11 )


Index: texmaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/F-11/texmaker.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- texmaker.spec	16 Jun 2009 05:49:54 -0000	1.21
+++ texmaker.spec	25 Sep 2009 20:00:09 -0000	1.22
@@ -1,6 +1,6 @@
 Summary:	LaTeX editor
 Name:		texmaker
-Version:	1.9.1
+Version:	1.9.2
 Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2+
@@ -85,6 +85,9 @@ rm -rf %buildroot
 %exclude %{_datadir}/texmaker/*.aff
 
 %changelog
+* Sat Sep 25 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.2-1
+- Update to 1.9.2
+
 * Tue Jun 16 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.1-1
 - Update to 1.9.1
 



From deji at fedoraproject.org  Fri Sep 25 20:02:11 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 25 Sep 2009 20:02:11 +0000 (UTC)
Subject: rpms/texmaker/F-10 sources, 1.10, 1.11 texmaker-tools.patch, 1.10, 
	1.11 texmaker.spec, 1.20, 1.21
Message-ID: <20090925200211.31E0C11C00E8@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/texmaker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29459

Modified Files:
	sources texmaker-tools.patch texmaker.spec 
Log Message:
* Fri Sep 25 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.2-1
- Update to 1.9.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Jun 2009 05:51:48 -0000	1.10
+++ sources	25 Sep 2009 20:02:10 -0000	1.11
@@ -1 +1 @@
-db83c10dc6b737bfc81a108f0ce3f067  texmaker-1.9.1.tar.bz2
+61842ccacf7d843e497aa74f7135d04a  texmaker-1.9.2.tar.bz2

texmaker-tools.patch:
 texmaker.cpp |   26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

Index: texmaker-tools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/F-10/texmaker-tools.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- texmaker-tools.patch	16 Jun 2009 05:51:48 -0000	1.10
+++ texmaker-tools.patch	25 Sep 2009 20:02:10 -0000	1.11
@@ -1,6 +1,6 @@
---- texmaker.cpp	2009-05-24 04:37:51.000000000 -0400
-+++ texmaker.cpp.new	2009-05-27 07:34:34.287172458 -0400
-@@ -2430,28 +2430,10 @@
+--- texmaker.cpp	2009-06-14 12:42:57.000000000 -0400
++++ texmaker.cpp.new	2009-07-15 11:33:27.749640574 -0400
+@@ -2352,27 +2352,9 @@
  metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
  // xdvi %.dvi  -sourceposition @:%.tex
  // kdvi "file:%.dvi#src:@ %.tex"
@@ -25,14 +25,13 @@
 -		viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
 -		}break;
 -	}
- 
 +viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
 +viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
 +viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
  
  
- ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -2601,7 +2583,7 @@
+ 
+@@ -2524,7 +2506,7 @@
  author=config->value("Quick/Author","").toString();
  
  #if defined( Q_WS_X11 )


Index: texmaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/F-10/texmaker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- texmaker.spec	16 Jun 2009 05:51:48 -0000	1.20
+++ texmaker.spec	25 Sep 2009 20:02:10 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:	LaTeX editor
 Name:		texmaker
-Version:	1.9.1
+Version:	1.9.2
 Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2+
@@ -85,6 +85,9 @@ rm -rf %buildroot
 %exclude %{_datadir}/texmaker/*.aff
 
 %changelog
+* Fri Sep 25 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.2-1
+- Update to 1.9.2
+
 * Tue Jun 16 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.1-1
 - Update to 1.9.1
 



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:18 +0000
Subject: [pkgdb] netmonitor ownership updated
Message-ID: <20090925202918.C4B5410F86F@bastion2.fedora.phx.redhat.com>

Package netmonitor in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:26 +0000
Subject: [pkgdb] netmonitor ownership updated
Message-ID: <20090925202926.716C210F86F@bastion2.fedora.phx.redhat.com>

Package netmonitor in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:30 +0000
Subject: [pkgdb] netmonitor ownership updated
Message-ID: <20090925202930.97F1910F86F@bastion2.fedora.phx.redhat.com>

Package netmonitor in Fedora 11 is now owned by tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:38 +0000
Subject: [pkgdb] netmonitor had acl change status
Message-ID: <20090925202938.A57AE10F87C@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchbugzilla acl on netmonitor (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:43 +0000
Subject: [pkgdb] netmonitor had acl change status
Message-ID: <20090925202943.8B0F110F86F@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchcommits acl on netmonitor (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:45 +0000
Subject: [pkgdb] netmonitor had acl change status
Message-ID: <20090925202946.33BFA10F885@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on netmonitor (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From pkgdb at fedoraproject.org  Fri Sep 25 20:29:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Sep 2009 20:29:49 +0000
Subject: [pkgdb] netmonitor had acl change status
Message-ID: <20090925202949.1909F10F87C@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on netmonitor (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/netmonitor



From rlandmann at fedoraproject.org  Fri Sep 25 20:30:47 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Fri, 25 Sep 2009 20:30:47 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/devel import.log, NONE,
	1.1 perl-Locale-Maketext-Gettext.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925203047.A3DBD11C02BB@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8074/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Locale-Maketext-Gettext.spec 
Log Message:
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.




--- NEW FILE import.log ---
perl-Locale-Maketext-Gettext-1_27-2_fc11:HEAD:perl-Locale-Maketext-Gettext-1.27-2.fc11.src.rpm:1253910438


--- NEW FILE perl-Locale-Maketext-Gettext.spec ---
Name:           perl-Locale-Maketext-Gettext
Version:        1.27
Release:        2%{?dist}
Summary:        Joins the gettext and Maketext frameworks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Gettext/
Source0:        http://www.cpan.org/authors/id/I/IM/IMACAT/Locale-Maketext-Gettext-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Locale::Maketext::Gettext joins the GNU gettext and Maketext frameworks. It
is a subclass of Locale::Maketext(3) that follows the way GNU gettext
works. It works seamlessly, both in the sense of GNU gettext and Maketext.
As a result, you enjoy both their advantages, and get rid of both their
problems, too.

%prep
%setup -q -n Locale-Maketext-Gettext-%{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
rm -f debugsources.list debugfiles.list debuglinks.list
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic BUGS Changes COPYING README THANKS TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/maketext
%{_mandir}/man1/*

%changelog
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:34:55 -0000	1.1
+++ .cvsignore	25 Sep 2009 20:30:47 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Gettext-1.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:34:55 -0000	1.1
+++ sources	25 Sep 2009 20:30:47 -0000	1.2
@@ -0,0 +1 @@
+58019c37c8ad1c4526476a7fb98b64c6  Locale-Maketext-Gettext-1.27.tar.gz



From praveenp at fedoraproject.org  Fri Sep 25 20:40:58 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 25 Sep 2009 20:40:58 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-5 sblim-sfcb.spec,1.2,1.3
Message-ID: <20090925204058.4773811C00E8@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10752

Modified Files:
	sblim-sfcb.spec 
Log Message:
made changes in the spec file to use curl-devel in case of rhel



Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-5/sblim-sfcb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sblim-sfcb.spec	24 Sep 2009 22:48:04 -0000	1.2
+++ sblim-sfcb.spec	25 Sep 2009 20:40:58 -0000	1.3
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 9%{dist}
+Release: 10%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -16,7 +16,11 @@ Source0: http://downloads.sourceforge.ne
 patch0:	%{name}-disable_auto_service_start.patch
 Provides: cim-server
 Requires: cim-schema
+%if 0%{?rhel}
+BuildRequires: curl-devel
+%else
 BuildRequires: libcurl-devel
+%endif
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
@@ -107,6 +111,8 @@ fi
 #%doc COPYING README
 
 %changelog
+* Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-10
+- using curl-devel instead of libcurl-devel on rhel
 * Thu Sep 24 2009 <praveen_paladugu at dell.com>- 1.3.4-9
 - Increased the release number for tagging
 * Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8



From airlied at fedoraproject.org  Fri Sep 25 20:46:37 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 25 Sep 2009 20:46:37 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-8ef8678c8.patch, NONE, 1.1 kernel.spec,
	1.1833, 1.1834 drm-next-adea4796c.patch, 1.1, NONE
Message-ID: <20090925204637.6498211C00E8@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11931

Modified Files:
	kernel.spec 
Added Files:
	drm-next-8ef8678c8.patch 
Removed Files:
	drm-next-adea4796c.patch 
Log Message:
* Sat Sep 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-48
- drm-next-8ef8678c8.patch: fix intel/nouveau kms


drm-next-8ef8678c8.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  939 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  742 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  105 
 b/drivers/gpu/drm/radeon/avivod.h                 |   69 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1290 -
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  607 
 b/drivers/gpu/drm/radeon/r200.c                   |  455 
 b/drivers/gpu/drm/radeon/r300.c                   |  687 
 b/drivers/gpu/drm/radeon/r300d.h                  |  101 
 b/drivers/gpu/drm/radeon/r420.c                   |  301 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r520.c                   |    6 
 b/drivers/gpu/drm/radeon/r600.c                   | 1788 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  850 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  659 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  357 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  228 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  509 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  106 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  404 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  101 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  137 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  682 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   85 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  368 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   74 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |   56 
 b/drivers/gpu/drm/radeon/rs600.c                  |  106 
 b/drivers/gpu/drm/radeon/rs690.c                  |    4 
 b/drivers/gpu/drm/radeon/rv515.c                  |  524 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1050 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  106 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 169 files changed, 36764 insertions(+), 42238 deletions(-)

--- NEW FILE drm-next-8ef8678c8.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..8e7b0eb 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...86285 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1833
retrieving revision 1.1834
diff -u -p -r1.1833 -r1.1834
--- kernel.spec	25 Sep 2009 15:23:31 -0000	1.1833
+++ kernel.spec	25 Sep 2009 20:46:37 -0000	1.1834
@@ -697,7 +697,7 @@ Patch1579: linux-2.6-virtio_blk-revert-Q
 Patch1580: linux-2.6-xen-check-efer-fix.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next-adea4796c.patch
+Patch1812: drm-next-8ef8678c8.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1363,7 +1363,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next-adea4796c.patch
+ApplyPatch drm-next-8ef8678c8.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2061,6 +2061,9 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-48
+- drm-next-8ef8678c8.patch: fix intel/nouveau kms
+
 * Fri Sep 25 2009 Justin M. Forbes <bskeggs at redhat.com> 2.6.31.1-47
 - Fix xen guest booting when NX is disabled (#525290)
 


--- drm-next-adea4796c.patch DELETED ---



From hno at fedoraproject.org  Fri Sep 25 20:49:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Fri, 25 Sep 2009 20:49:45 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.53, 1.54 bzr.spec, 1.73, 1.74 sources, 
	1.53, 1.54
Message-ID: <20090925204945.2467811C00E8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14022

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	10 Sep 2009 17:34:59 -0000	1.53
+++ .cvsignore	25 Sep 2009 20:49:44 -0000	1.54
@@ -1,2 +1,2 @@
-bzr-2.0rc2.tar.gz
-bzr-2.0rc2.tar.gz.sig
+bzr-2.0.0.tar.gz
+bzr-2.0.0.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- bzr.spec	10 Sep 2009 17:34:59 -0000	1.73
+++ bzr.spec	25 Sep 2009 20:49:44 -0000	1.74
@@ -7,14 +7,15 @@
 #   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 bzrmajor 2.0
-%define bzrrc rc2
-%define release 0.1
+%define bzrminor .0
+#define bzrrc rc2
+%define release 1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
 
 Name:           bzr
-Version:        %{bzrmajor}
+Version:        %{bzrmajor}%{?bzrminor}
 Release:        %{release}%{?subrelease}%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -91,7 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 2.0-0.1rc2
+* Fri Sep 25 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-1
+- Update to 2.0.0
+
+* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-0.1rc2
 - Update to 2.0rc2 with new default repository format 2a
 
 * Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	10 Sep 2009 17:34:59 -0000	1.53
+++ sources	25 Sep 2009 20:49:44 -0000	1.54
@@ -1,2 +1,2 @@
-e92a66979192720c07c754bae1fb74a1  bzr-2.0rc2.tar.gz
-6f4ef7a9b1632e6ea479c632ef2050cf  bzr-2.0rc2.tar.gz.sig
+2536b0ef26a5110692e7f32d5a3fd91b  bzr-2.0.0.tar.gz
+a39bc7c1de358edd2010ddc38e6e8399  bzr-2.0.0.tar.gz.sig



From praveenp at fedoraproject.org  Fri Sep 25 21:00:32 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 25 Sep 2009 21:00:32 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-5 sblim-sfcb.spec,1.3,1.4
Message-ID: <20090925210032.836E511C02BB@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17794

Modified Files:
	sblim-sfcb.spec 
Log Message:
changed initddir to initrddir since initddir is not defined in rhel



Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-5/sblim-sfcb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sblim-sfcb.spec	25 Sep 2009 20:40:58 -0000	1.3
+++ sblim-sfcb.spec	25 Sep 2009 21:00:30 -0000	1.4
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 10%{dist}
+Release: 11%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -55,9 +55,9 @@ make 
 rm -rf $RPM_BUILD_ROOT 
 
 make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{_initddir}
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
-sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
+mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initrddir}/sblim-sfcb
+sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initrddir}/sblim-sfcb
 # remove unused static libraries and so files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so
@@ -71,7 +71,7 @@ echo "%config(noreplace) %{_sysconfdir}/
 echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
 echo "%doc %{_datadir}/doc/*" >> _pkg_list
 echo "%{_datadir}/man/man1/*" >> _pkg_list
-echo "%{_initddir}/sblim-sfcb" >> _pkg_list
+echo "%{_initrddir}/sblim-sfcb" >> _pkg_list
 echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
 echo "%{_bindir}/*" >> _pkg_list
 echo "%{_sbindir}/*" >> _pkg_list
@@ -111,6 +111,8 @@ fi
 #%doc COPYING README
 
 %changelog
+* Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-11
+- Changing the initddir to initrddir, since not defined in rhel
 * Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-10
 - using curl-devel instead of libcurl-devel on rhel
 * Thu Sep 24 2009 <praveen_paladugu at dell.com>- 1.3.4-9



From atorkhov at fedoraproject.org  Fri Sep 25 21:01:47 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 25 Sep 2009 21:01:47 +0000 (UTC)
Subject: rpms/pg_top/devel pg_top-3.6.2-fix-totals.patch, NONE,
	1.1 pg_top.spec, 1.5, 1.6
Message-ID: <20090925210147.49D0311C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18314

Modified Files:
	pg_top.spec 
Added Files:
	pg_top-3.6.2-fix-totals.patch 
Log Message:
* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
- Fix display of cumulative statistics (BZ#525763)


pg_top-3.6.2-fix-totals.patch:
 pg.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pg_top-3.6.2-fix-totals.patch ---
diff -Narup pg_top-3.6.2/pg.c pg_top-3.6.2.new/pg.c
--- pg_top-3.6.2/pg.c	2008-04-03 08:37:46.000000000 +0400
+++ pg_top-3.6.2.new/pg.c	2009-09-26 00:48:37.000000000 +0400
@@ -798,9 +798,9 @@ update_index_stats(struct index_node * n
 				   long long idx_tup_read, long long idx_tup_fetch)
 {
 	/* Add to the index totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_read += idx_tup_read;
-	node->total_idx_tup_fetch += idx_tup_fetch;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_read = idx_tup_read;
+	node->total_idx_tup_fetch = idx_tup_fetch;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;
@@ -819,13 +819,13 @@ update_table_stats(struct table_node * n
 			   long long n_tup_ins, long long n_tup_upd, long long n_tup_del)
 {
 	/* Add to the table totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_fetch += idx_tup_fetch;
-	node->total_n_tup_del += n_tup_del;
-	node->total_n_tup_ins += n_tup_ins;
-	node->total_n_tup_upd += n_tup_upd;
-	node->total_seq_scan += seq_scan;
-	node->total_seq_tup_read += seq_tup_read;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_fetch = idx_tup_fetch;
+	node->total_n_tup_del = n_tup_del;
+	node->total_n_tup_ins = n_tup_ins;
+	node->total_n_tup_upd = n_tup_upd;
+	node->total_seq_scan = seq_scan;
+	node->total_seq_tup_read = seq_tup_read;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/devel/pg_top.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pg_top.spec	25 Sep 2009 19:33:24 -0000	1.5
+++ pg_top.spec	25 Sep 2009 21:01:47 -0000	1.6
@@ -1,11 +1,12 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
@@ -23,6 +24,7 @@ query plans, issued locks, and table and
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -44,6 +46,9 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
+- Fix display of cumulative statistics (BZ#525763)
+
 * Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
 - starting building for EPEL too
 



From rlandmann at fedoraproject.org  Fri Sep 25 21:08:45 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Fri, 25 Sep 2009 21:08:45 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/F-11 import.log, NONE,
	1.1 perl-Locale-Maketext-Gettext.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925210845.221CC11C00E8@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20944/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Locale-Maketext-Gettext.spec 
Log Message:
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.




--- NEW FILE import.log ---
perl-Locale-Maketext-Gettext-1_27-2_fc11:F-11:perl-Locale-Maketext-Gettext-1.27-2.fc11.src.rpm:1253912782


--- NEW FILE perl-Locale-Maketext-Gettext.spec ---
Name:           perl-Locale-Maketext-Gettext
Version:        1.27
Release:        2%{?dist}
Summary:        Joins the gettext and Maketext frameworks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Gettext/
Source0:        http://www.cpan.org/authors/id/I/IM/IMACAT/Locale-Maketext-Gettext-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Locale::Maketext::Gettext joins the GNU gettext and Maketext frameworks. It
is a subclass of Locale::Maketext(3) that follows the way GNU gettext
works. It works seamlessly, both in the sense of GNU gettext and Maketext.
As a result, you enjoy both their advantages, and get rid of both their
problems, too.

%prep
%setup -q -n Locale-Maketext-Gettext-%{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
rm -f debugsources.list debugfiles.list debuglinks.list
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic BUGS Changes COPYING README THANKS TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/maketext
%{_mandir}/man1/*

%changelog
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:34:55 -0000	1.1
+++ .cvsignore	25 Sep 2009 21:08:43 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Gettext-1.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:34:55 -0000	1.1
+++ sources	25 Sep 2009 21:08:44 -0000	1.2
@@ -0,0 +1 @@
+58019c37c8ad1c4526476a7fb98b64c6  Locale-Maketext-Gettext-1.27.tar.gz



From praveenp at fedoraproject.org  Fri Sep 25 21:14:07 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 25 Sep 2009 21:14:07 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-4 sblim-sfcb.spec,1.1,1.2
Message-ID: <20090925211407.06D2911C00E8@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24641

Modified Files:
	sblim-sfcb.spec 
Log Message:
couple of changes to build on rhel



Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-4/sblim-sfcb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-sfcb.spec	24 Sep 2009 18:02:49 -0000	1.1
+++ sblim-sfcb.spec	25 Sep 2009 21:14:06 -0000	1.2
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 8%{dist}
+Release: 11%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -16,7 +16,11 @@ Source0: http://downloads.sourceforge.ne
 patch0:	%{name}-disable_auto_service_start.patch
 Provides: cim-server
 Requires: cim-schema
+%if 0%{?rhel}
+BuildRequires: curl-devel
+%else
 BuildRequires: libcurl-devel
+%endif
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
@@ -51,9 +55,9 @@ make 
 rm -rf $RPM_BUILD_ROOT 
 
 make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{_initddir}
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
-sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
+mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initrddir}/sblim-sfcb
+sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initrddir}/sblim-sfcb
 # remove unused static libraries and so files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so
@@ -67,7 +71,7 @@ echo "%config(noreplace) %{_sysconfdir}/
 echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list
 echo "%doc %{_datadir}/doc/*" >> _pkg_list
 echo "%{_datadir}/man/man1/*" >> _pkg_list
-echo "%{_initddir}/sblim-sfcb" >> _pkg_list
+echo "%{_initrddir}/sblim-sfcb" >> _pkg_list
 echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
 echo "%{_bindir}/*" >> _pkg_list
 echo "%{_sbindir}/*" >> _pkg_list
@@ -107,6 +111,12 @@ fi
 #%doc COPYING README
 
 %changelog
+* Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-11
+- Changing the initddir to initrddir, since not defined in rhel
+* Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-10
+- using curl-devel instead of libcurl-devel on rhel
+* Thu Sep 24 2009 <praveen_paladugu at dell.com>- 1.3.4-9
+- Increased the release number for tagging
 * Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
 - Removed the devel package and moved the init script to right directory
 * Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7



From atorkhov at fedoraproject.org  Fri Sep 25 21:15:03 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 25 Sep 2009 21:15:03 +0000 (UTC)
Subject: rpms/pg_top/devel pg_top.spec,1.6,1.7
Message-ID: <20090925211503.C83E911C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24982

Modified Files:
	pg_top.spec 
Log Message:
Add link to upstream tracker.


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/devel/pg_top.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pg_top.spec	25 Sep 2009 21:01:47 -0000	1.6
+++ pg_top.spec	25 Sep 2009 21:15:03 -0000	1.7
@@ -6,6 +6,7 @@ License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+# Reported upstream: http://pgfoundry.org/tracker/index.php?func=detail&aid=1010710&group_id=1000300&atid=1129
 Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel



From cebbert at fedoraproject.org  Fri Sep 25 21:16:39 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 25 Sep 2009 21:16:39 +0000 (UTC)
Subject: rpms/kernel/F-12
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch,
	NONE, 1.1 linux-2.6-xen-spinlock-stronger-barrier.patch, NONE,
	1.1 kernel.spec, 1.1834, 1.1835
Message-ID: <20090925211639.E3D2C11C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25329

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch 
	linux-2.6-xen-spinlock-stronger-barrier.patch 
Log Message:
Add Xen spinlock patches to improve scalability.

linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch:
 spinlock.c |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Wed, 9 Sep 2009 19:33:51 +0000 (-0700)
Subject: xen: only enable interrupts while actually blocking for spinlock
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d576b57b50a92801e6493e76e5243d6cff193d2

xen: only enable interrupts while actually blocking for spinlock

Where possible we enable interrupts while waiting for a spinlock to
become free, in order to reduce big latency spikes in interrupt handling.

However, at present if we manage to pick up the spinlock just before
blocking, we'll end up holding the lock with interrupts enabled for a
while.  This will cause a deadlock if we recieve an interrupt in that
window, and the interrupt handler tries to take the lock too.

Solve this by shrinking the interrupt-enabled region to just around the
blocking call.

[ Impact: avoid race/deadlock when using Xen PV spinlocks ]

Reported-by: "Yang, Xiaowei" <xiaowei.yang at intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 5601506..2f91e56 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -187,7 +187,6 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 	struct xen_spinlock *prev;
 	int irq = __get_cpu_var(lock_kicker_irq);
 	int ret;
-	unsigned long flags;
 	u64 start;
 
 	/* If kicker interrupts not initialized yet, just spin */
@@ -199,16 +198,12 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 	/* announce we're spinning */
 	prev = spinning_lock(xl);
 
-	flags = __raw_local_save_flags();
-	if (irq_enable) {
-		ADD_STATS(taken_slow_irqenable, 1);
-		raw_local_irq_enable();
-	}
-
 	ADD_STATS(taken_slow, 1);
 	ADD_STATS(taken_slow_nested, prev != NULL);
 
 	do {
+		unsigned long flags;
+
 		/* clear pending */
 		xen_clear_irq_pending(irq);
 
@@ -228,6 +223,12 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 			goto out;
 		}
 
+		flags = __raw_local_save_flags();
+		if (irq_enable) {
+			ADD_STATS(taken_slow_irqenable, 1);
+			raw_local_irq_enable();
+		}
+
 		/*
 		 * Block until irq becomes pending.  If we're
 		 * interrupted at this point (after the trylock but
@@ -238,13 +239,15 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 		 * pending.
 		 */
 		xen_poll_irq(irq);
+
+		raw_local_irq_restore(flags);
+
 		ADD_STATS(taken_slow_spurious, !xen_test_irq_pending(irq));
 	} while (!xen_test_irq_pending(irq)); /* check for spurious wakeups */
 
 	kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
 
 out:
-	raw_local_irq_restore(flags);
 	unspinning_lock(xl, prev);
 	spin_time_accum_blocked(start);
 

linux-2.6-xen-spinlock-stronger-barrier.patch:
 spinlock.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-xen-spinlock-stronger-barrier.patch ---
From: Yang Xiaowei <xiaowei.yang at intel.com>
Date: Wed, 9 Sep 2009 19:44:52 +0000 (-0700)
Subject: xen: use stronger barrier after unlocking lock
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2496afbf1e50c70f80992656bcb730c8583ddac3

xen: use stronger barrier after unlocking lock

We need to have a stronger barrier between releasing the lock and
checking for any waiting spinners.  A compiler barrier is not sufficient
because the CPU's ordering rules do not prevent the read xl->spinners
from happening before the unlock assignment, as they are different
memory locations.

We need to have an explicit barrier to enforce the write-read ordering
to different memory locations.

Because of it, I can't bring up > 4 HVM guests on one SMP machine.

[ Code and commit comments expanded -J ]

[ Impact: avoid deadlock when using Xen PV spinlocks ]

Signed-off-by: Yang Xiaowei <xiaowei.yang at intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 2f91e56..36a5141 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -326,8 +326,13 @@ static void xen_spin_unlock(struct raw_spinlock *lock)
 	smp_wmb();		/* make sure no writes get moved after unlock */
 	xl->lock = 0;		/* release lock */
 
-	/* make sure unlock happens before kick */
-	barrier();
+	/*
+	 * Make sure unlock happens before checking for waiting
+	 * spinners.  We need a strong barrier to enforce the
+	 * write-read ordering to different memory locations, as the
+	 * CPU makes no implied guarantees about their ordering.
+	 */
+	mb();
 
 	if (unlikely(xl->spinners))
 		xen_spin_unlock_slow(xl);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1834
retrieving revision 1.1835
diff -u -p -r1.1834 -r1.1835
--- kernel.spec	25 Sep 2009 20:46:37 -0000	1.1834
+++ kernel.spec	25 Sep 2009 21:16:39 -0000	1.1835
@@ -695,6 +695,8 @@ Patch1553: linux-2.6-ksm-fix-munlock.pat
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 Patch1580: linux-2.6-xen-check-efer-fix.patch
+Patch1581: linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
+Patch1582: linux-2.6-xen-spinlock-stronger-barrier.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next-8ef8678c8.patch
@@ -1357,6 +1359,10 @@ ApplyPatch linux-2.6-xen-stack-protector
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 ApplyPatch linux-2.6-xen-check-efer-fix.patch
 
+# improve xen spinlock scalability
+ApplyPatch linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
+ApplyPatch linux-2.6-xen-spinlock-stronger-barrier.patch
+
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
@@ -2061,6 +2067,9 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-49
+- Add Xen spinlock patches to improve scalability.
+
 * Sat Sep 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-48
 - drm-next-8ef8678c8.patch: fix intel/nouveau kms
 



From atorkhov at fedoraproject.org  Fri Sep 25 21:18:12 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 25 Sep 2009 21:18:12 +0000 (UTC)
Subject: rpms/pg_top/F-11 pg_top-3.6.2-fix-totals.patch, NONE,
	1.1 pg_top.spec, 1.3, 1.4
Message-ID: <20090925211812.0EDDA11C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26555

Modified Files:
	pg_top.spec 
Added Files:
	pg_top-3.6.2-fix-totals.patch 
Log Message:
* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
- Fix display of cumulative statistics (BZ#525763)


pg_top-3.6.2-fix-totals.patch:
 pg.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pg_top-3.6.2-fix-totals.patch ---
diff -Narup pg_top-3.6.2/pg.c pg_top-3.6.2.new/pg.c
--- pg_top-3.6.2/pg.c	2008-04-03 08:37:46.000000000 +0400
+++ pg_top-3.6.2.new/pg.c	2009-09-26 00:48:37.000000000 +0400
@@ -798,9 +798,9 @@ update_index_stats(struct index_node * n
 				   long long idx_tup_read, long long idx_tup_fetch)
 {
 	/* Add to the index totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_read += idx_tup_read;
-	node->total_idx_tup_fetch += idx_tup_fetch;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_read = idx_tup_read;
+	node->total_idx_tup_fetch = idx_tup_fetch;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;
@@ -819,13 +819,13 @@ update_table_stats(struct table_node * n
 			   long long n_tup_ins, long long n_tup_upd, long long n_tup_del)
 {
 	/* Add to the table totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_fetch += idx_tup_fetch;
-	node->total_n_tup_del += n_tup_del;
-	node->total_n_tup_ins += n_tup_ins;
-	node->total_n_tup_upd += n_tup_upd;
-	node->total_seq_scan += seq_scan;
-	node->total_seq_tup_read += seq_tup_read;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_fetch = idx_tup_fetch;
+	node->total_n_tup_del = n_tup_del;
+	node->total_n_tup_ins = n_tup_ins;
+	node->total_n_tup_upd = n_tup_upd;
+	node->total_seq_scan = seq_scan;
+	node->total_seq_tup_read = seq_tup_read;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-11/pg_top.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pg_top.spec	15 Jul 2009 03:34:43 -0000	1.3
+++ pg_top.spec	25 Sep 2009 21:18:11 -0000	1.4
@@ -1,18 +1,23 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	5%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+# Reported upstream: http://pgfoundry.org/tracker/index.php?func=detail&aid=1010710&group_id=1000300&atid=1129
+Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
-BuildRequires:  systemtap-sdt-devel
 Requires:	postgresql-server
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+BuildRequires:  systemtap-sdt-devel
+%endif
+
 
 %description
 pg_top is 'top' for PostgreSQL processes. See running queries, 
@@ -20,6 +25,7 @@ query plans, issued locks, and table and
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -41,6 +47,15 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
+- Fix display of cumulative statistics (BZ#525763)
+
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
+- starting building for EPEL too
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-5
 - fix buildrequires, systemtap-sdt-devel is required for <sys/sdt.h>
 



From rlandmann at fedoraproject.org  Fri Sep 25 21:18:42 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Fri, 25 Sep 2009 21:18:42 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/F-12 import.log, NONE,
	1.1 perl-Locale-Maketext-Gettext.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925211842.ABA0011C00E8@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26684/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Locale-Maketext-Gettext.spec 
Log Message:
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE import.log ---
perl-Locale-Maketext-Gettext-1_27-2_fc11:F-12:perl-Locale-Maketext-Gettext-1.27-2.fc11.src.rpm:1253913443


--- NEW FILE perl-Locale-Maketext-Gettext.spec ---
Name:           perl-Locale-Maketext-Gettext
Version:        1.27
Release:        2%{?dist}
Summary:        Joins the gettext and Maketext frameworks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Gettext/
Source0:        http://www.cpan.org/authors/id/I/IM/IMACAT/Locale-Maketext-Gettext-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Locale::Maketext::Gettext joins the GNU gettext and Maketext frameworks. It
is a subclass of Locale::Maketext(3) that follows the way GNU gettext
works. It works seamlessly, both in the sense of GNU gettext and Maketext.
As a result, you enjoy both their advantages, and get rid of both their
problems, too.

%prep
%setup -q -n Locale-Maketext-Gettext-%{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
rm -f debugsources.list debugfiles.list debuglinks.list
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic BUGS Changes COPYING README THANKS TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/maketext
%{_mandir}/man1/*

%changelog
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:34:55 -0000	1.1
+++ .cvsignore	25 Sep 2009 21:18:42 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Gettext-1.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:34:55 -0000	1.1
+++ sources	25 Sep 2009 21:18:42 -0000	1.2
@@ -0,0 +1 @@
+58019c37c8ad1c4526476a7fb98b64c6  Locale-Maketext-Gettext-1.27.tar.gz



From behdad at fedoraproject.org  Fri Sep 25 21:24:21 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 25 Sep 2009 21:24:21 +0000 (UTC)
Subject: rpms/vte/devel vte.spec,1.162,1.163
Message-ID: <20090925212421.9851E11C00E8@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29127

Modified Files:
	vte.spec 
Log Message:
* Fri Sep 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.1-1 
- Update to 0.22.1 



Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- vte.spec	21 Sep 2009 21:30:29 -0000	1.162
+++ vte.spec	25 Sep 2009 21:24:21 -0000	1.163
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.22.0
+Version: 0.22.1
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Sep 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.1-1
+- Update to 0.22.1
+
 * Mon Sep 21 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.0-1
 - Update to 0.22.0
 



From atorkhov at fedoraproject.org  Fri Sep 25 21:26:43 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 25 Sep 2009 21:26:43 +0000 (UTC)
Subject: rpms/pg_top/F-10 pg_top-3.6.2-fix-totals.patch, NONE,
	1.1 pg_top.spec, 1.2, 1.3
Message-ID: <20090925212643.48B9F11C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29651

Modified Files:
	pg_top.spec 
Added Files:
	pg_top-3.6.2-fix-totals.patch 
Log Message:
* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
- Fix display of cumulative statistics (BZ#525763)


pg_top-3.6.2-fix-totals.patch:
 pg.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pg_top-3.6.2-fix-totals.patch ---
diff -Narup pg_top-3.6.2/pg.c pg_top-3.6.2.new/pg.c
--- pg_top-3.6.2/pg.c	2008-04-03 08:37:46.000000000 +0400
+++ pg_top-3.6.2.new/pg.c	2009-09-26 00:48:37.000000000 +0400
@@ -798,9 +798,9 @@ update_index_stats(struct index_node * n
 				   long long idx_tup_read, long long idx_tup_fetch)
 {
 	/* Add to the index totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_read += idx_tup_read;
-	node->total_idx_tup_fetch += idx_tup_fetch;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_read = idx_tup_read;
+	node->total_idx_tup_fetch = idx_tup_fetch;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;
@@ -819,13 +819,13 @@ update_table_stats(struct table_node * n
 			   long long n_tup_ins, long long n_tup_upd, long long n_tup_del)
 {
 	/* Add to the table totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_fetch += idx_tup_fetch;
-	node->total_n_tup_del += n_tup_del;
-	node->total_n_tup_ins += n_tup_ins;
-	node->total_n_tup_upd += n_tup_upd;
-	node->total_seq_scan += seq_scan;
-	node->total_seq_tup_read += seq_tup_read;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_fetch = idx_tup_fetch;
+	node->total_n_tup_del = n_tup_del;
+	node->total_n_tup_ins = n_tup_ins;
+	node->total_n_tup_upd = n_tup_upd;
+	node->total_seq_scan = seq_scan;
+	node->total_seq_tup_read = seq_tup_read;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-10/pg_top.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pg_top.spec	15 Jul 2009 03:37:43 -0000	1.2
+++ pg_top.spec	25 Sep 2009 21:26:43 -0000	1.3
@@ -1,18 +1,23 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	5%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+# Reported upstream: http://pgfoundry.org/tracker/index.php?func=detail&aid=1010710&group_id=1000300&atid=1129
+Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
-BuildRequires:  systemtap-sdt-devel
 Requires:	postgresql-server
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+BuildRequires:  systemtap-sdt-devel
+%endif
+
 
 %description
 pg_top is 'top' for PostgreSQL processes. See running queries, 
@@ -20,6 +25,7 @@ query plans, issued locks, and table and
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -41,6 +47,15 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
+- Fix display of cumulative statistics (BZ#525763)
+
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
+- starting building for EPEL too
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-5
 - fix buildrequires, systemtap-sdt-devel is required for <sys/sdt.h>
 



From rlandmann at fedoraproject.org  Fri Sep 25 21:27:37 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Fri, 25 Sep 2009 21:27:37 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/F-10 import.log, NONE,
	1.1 perl-Locale-Maketext-Gettext.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925212737.1A0A911C00E8@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29841/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Locale-Maketext-Gettext.spec 
Log Message:
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE import.log ---
perl-Locale-Maketext-Gettext-1_27-2_fc11:F-10:perl-Locale-Maketext-Gettext-1.27-2.fc11.src.rpm:1253913966


--- NEW FILE perl-Locale-Maketext-Gettext.spec ---
Name:           perl-Locale-Maketext-Gettext
Version:        1.27
Release:        2%{?dist}
Summary:        Joins the gettext and Maketext frameworks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Gettext/
Source0:        http://www.cpan.org/authors/id/I/IM/IMACAT/Locale-Maketext-Gettext-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Locale::Maketext::Gettext joins the GNU gettext and Maketext frameworks. It
is a subclass of Locale::Maketext(3) that follows the way GNU gettext
works. It works seamlessly, both in the sense of GNU gettext and Maketext.
As a result, you enjoy both their advantages, and get rid of both their
problems, too.

%prep
%setup -q -n Locale-Maketext-Gettext-%{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
rm -f debugsources.list debugfiles.list debuglinks.list
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic BUGS Changes COPYING README THANKS TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/maketext
%{_mandir}/man1/*

%changelog
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:34:55 -0000	1.1
+++ .cvsignore	25 Sep 2009 21:27:36 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Gettext-1.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:34:55 -0000	1.1
+++ sources	25 Sep 2009 21:27:36 -0000	1.2
@@ -0,0 +1 @@
+58019c37c8ad1c4526476a7fb98b64c6  Locale-Maketext-Gettext-1.27.tar.gz



From atorkhov at fedoraproject.org  Fri Sep 25 21:28:36 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 25 Sep 2009 21:28:36 +0000 (UTC)
Subject: rpms/pg_top/EL-5 pg_top-3.6.2-fix-totals.patch, NONE,
	1.1 pg_top.spec, 1.5, 1.6
Message-ID: <20090925212836.A8C0C11C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30223

Modified Files:
	pg_top.spec 
Added Files:
	pg_top-3.6.2-fix-totals.patch 
Log Message:
* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
- Fix display of cumulative statistics (BZ#525763)


pg_top-3.6.2-fix-totals.patch:
 pg.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pg_top-3.6.2-fix-totals.patch ---
diff -Narup pg_top-3.6.2/pg.c pg_top-3.6.2.new/pg.c
--- pg_top-3.6.2/pg.c	2008-04-03 08:37:46.000000000 +0400
+++ pg_top-3.6.2.new/pg.c	2009-09-26 00:48:37.000000000 +0400
@@ -798,9 +798,9 @@ update_index_stats(struct index_node * n
 				   long long idx_tup_read, long long idx_tup_fetch)
 {
 	/* Add to the index totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_read += idx_tup_read;
-	node->total_idx_tup_fetch += idx_tup_fetch;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_read = idx_tup_read;
+	node->total_idx_tup_fetch = idx_tup_fetch;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;
@@ -819,13 +819,13 @@ update_table_stats(struct table_node * n
 			   long long n_tup_ins, long long n_tup_upd, long long n_tup_del)
 {
 	/* Add to the table totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_fetch += idx_tup_fetch;
-	node->total_n_tup_del += n_tup_del;
-	node->total_n_tup_ins += n_tup_ins;
-	node->total_n_tup_upd += n_tup_upd;
-	node->total_seq_scan += seq_scan;
-	node->total_seq_tup_read += seq_tup_read;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_fetch = idx_tup_fetch;
+	node->total_n_tup_del = n_tup_del;
+	node->total_n_tup_ins = n_tup_ins;
+	node->total_n_tup_upd = n_tup_upd;
+	node->total_seq_scan = seq_scan;
+	node->total_seq_tup_read = seq_tup_read;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/EL-5/pg_top.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pg_top.spec	25 Sep 2009 19:44:32 -0000	1.5
+++ pg_top.spec	25 Sep 2009 21:28:36 -0000	1.6
@@ -1,11 +1,13 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+# Reported upstream: http://pgfoundry.org/tracker/index.php?func=detail&aid=1010710&group_id=1000300&atid=1129
+Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
@@ -23,6 +25,7 @@ query plans, issued locks, and table and
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -44,6 +47,9 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
+- Fix display of cumulative statistics (BZ#525763)
+
 * Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
 - starting building for EPEL too
 



From atorkhov at fedoraproject.org  Fri Sep 25 21:29:51 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 25 Sep 2009 21:29:51 +0000 (UTC)
Subject: rpms/pg_top/EL-4 pg_top-3.6.2-fix-totals.patch, NONE,
	1.1 pg_top.spec, 1.5, 1.6
Message-ID: <20090925212951.5974911C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30511

Modified Files:
	pg_top.spec 
Added Files:
	pg_top-3.6.2-fix-totals.patch 
Log Message:
* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
- Fix display of cumulative statistics (BZ#525763)


pg_top-3.6.2-fix-totals.patch:
 pg.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pg_top-3.6.2-fix-totals.patch ---
diff -Narup pg_top-3.6.2/pg.c pg_top-3.6.2.new/pg.c
--- pg_top-3.6.2/pg.c	2008-04-03 08:37:46.000000000 +0400
+++ pg_top-3.6.2.new/pg.c	2009-09-26 00:48:37.000000000 +0400
@@ -798,9 +798,9 @@ update_index_stats(struct index_node * n
 				   long long idx_tup_read, long long idx_tup_fetch)
 {
 	/* Add to the index totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_read += idx_tup_read;
-	node->total_idx_tup_fetch += idx_tup_fetch;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_read = idx_tup_read;
+	node->total_idx_tup_fetch = idx_tup_fetch;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;
@@ -819,13 +819,13 @@ update_table_stats(struct table_node * n
 			   long long n_tup_ins, long long n_tup_upd, long long n_tup_del)
 {
 	/* Add to the table totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_fetch += idx_tup_fetch;
-	node->total_n_tup_del += n_tup_del;
-	node->total_n_tup_ins += n_tup_ins;
-	node->total_n_tup_upd += n_tup_upd;
-	node->total_seq_scan += seq_scan;
-	node->total_seq_tup_read += seq_tup_read;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_fetch = idx_tup_fetch;
+	node->total_n_tup_del = n_tup_del;
+	node->total_n_tup_ins = n_tup_ins;
+	node->total_n_tup_upd = n_tup_upd;
+	node->total_seq_scan = seq_scan;
+	node->total_seq_tup_read = seq_tup_read;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/EL-4/pg_top.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pg_top.spec	25 Sep 2009 19:35:00 -0000	1.5
+++ pg_top.spec	25 Sep 2009 21:29:51 -0000	1.6
@@ -1,11 +1,13 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+# Reported upstream: http://pgfoundry.org/tracker/index.php?func=detail&aid=1010710&group_id=1000300&atid=1129
+Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
@@ -23,6 +25,7 @@ query plans, issued locks, and table and
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -44,6 +47,9 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
+- Fix display of cumulative statistics (BZ#525763)
+
 * Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
 - starting building for EPEL too
 



From behdad at fedoraproject.org  Fri Sep 25 21:30:31 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 25 Sep 2009 21:30:31 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.87, 1.88 sources, 1.89, 1.90 vte.spec, 
	1.163, 1.164
Message-ID: <20090925213031.DF31E11C02BB@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30699

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Fri Sep 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.1-2 
- Second try 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	21 Sep 2009 21:30:28 -0000	1.87
+++ .cvsignore	25 Sep 2009 21:30:31 -0000	1.88
@@ -1 +1 @@
-vte-0.22.0.tar.bz2
+vte-0.22.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	21 Sep 2009 21:30:29 -0000	1.89
+++ sources	25 Sep 2009 21:30:31 -0000	1.90
@@ -1 +1 @@
-09305c3ab0a4bba7c089f55566d2ceb6  vte-0.22.0.tar.bz2
+81fef1b248717f5fa66fe9e9d86508da  vte-0.22.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- vte.spec	25 Sep 2009 21:24:21 -0000	1.163
+++ vte.spec	25 Sep 2009 21:30:31 -0000	1.164
@@ -4,7 +4,7 @@
 
 Name: vte
 Version: 0.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Sep 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.1-2
+- Second try
+
 * Fri Sep 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.1-1
 - Update to 0.22.1
 



From rlandmann at fedoraproject.org  Fri Sep 25 21:41:16 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Fri, 25 Sep 2009 21:41:16 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/EL-5 import.log, NONE,
	1.1 perl-Locale-Maketext-Gettext.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925214116.6A3BA11C00E8@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv782/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Locale-Maketext-Gettext.spec 
Log Message:
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE import.log ---
perl-Locale-Maketext-Gettext-1_27-2_fc11:EL-5:perl-Locale-Maketext-Gettext-1.27-2.fc11.src.rpm:1253914796


--- NEW FILE perl-Locale-Maketext-Gettext.spec ---
Name:           perl-Locale-Maketext-Gettext
Version:        1.27
Release:        2%{?dist}
Summary:        Joins the gettext and Maketext frameworks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Gettext/
Source0:        http://www.cpan.org/authors/id/I/IM/IMACAT/Locale-Maketext-Gettext-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Locale::Maketext::Gettext joins the GNU gettext and Maketext frameworks. It
is a subclass of Locale::Maketext(3) that follows the way GNU gettext
works. It works seamlessly, both in the sense of GNU gettext and Maketext.
As a result, you enjoy both their advantages, and get rid of both their
problems, too.

%prep
%setup -q -n Locale-Maketext-Gettext-%{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
rm -f debugsources.list debugfiles.list debuglinks.list
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic BUGS Changes COPYING README THANKS TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/maketext
%{_mandir}/man1/*

%changelog
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:34:55 -0000	1.1
+++ .cvsignore	25 Sep 2009 21:41:16 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Gettext-1.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:34:55 -0000	1.1
+++ sources	25 Sep 2009 21:41:16 -0000	1.2
@@ -0,0 +1 @@
+58019c37c8ad1c4526476a7fb98b64c6  Locale-Maketext-Gettext-1.27.tar.gz



From rlandmann at fedoraproject.org  Fri Sep 25 21:55:35 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Fri, 25 Sep 2009 21:55:35 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/EL-4 import.log, NONE,
	1.1 perl-Locale-Maketext-Gettext.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925215535.C600611C00E8@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7041/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Locale-Maketext-Gettext.spec 
Log Message:
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE import.log ---
perl-Locale-Maketext-Gettext-1_27-2_fc11:EL-4:perl-Locale-Maketext-Gettext-1.27-2.fc11.src.rpm:1253915652


--- NEW FILE perl-Locale-Maketext-Gettext.spec ---
Name:           perl-Locale-Maketext-Gettext
Version:        1.27
Release:        2%{?dist}
Summary:        Joins the gettext and Maketext frameworks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Gettext/
Source0:        http://www.cpan.org/authors/id/I/IM/IMACAT/Locale-Maketext-Gettext-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Locale::Maketext::Gettext joins the GNU gettext and Maketext frameworks. It
is a subclass of Locale::Maketext(3) that follows the way GNU gettext
works. It works seamlessly, both in the sense of GNU gettext and Maketext.
As a result, you enjoy both their advantages, and get rid of both their
problems, too.

%prep
%setup -q -n Locale-Maketext-Gettext-%{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
rm -f debugsources.list debugfiles.list debuglinks.list
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic BUGS Changes COPYING README THANKS TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/maketext
%{_mandir}/man1/*

%changelog
* Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
- added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
* Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:34:55 -0000	1.1
+++ .cvsignore	25 Sep 2009 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Gettext-1.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:34:55 -0000	1.1
+++ sources	25 Sep 2009 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+58019c37c8ad1c4526476a7fb98b64c6  Locale-Maketext-Gettext-1.27.tar.gz



From rdieter at fedoraproject.org  Fri Sep 25 22:18:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Sep 2009 22:18:18 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking/EL-5 kmm_kbanking-1.0-libtool.patch, NONE, 
	1.1 kmymoney2-aqbanking.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925221818.DE38D11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17997

Modified Files:
	.cvsignore sources 
Added Files:
	kmm_kbanking-1.0-libtool.patch kmymoney2-aqbanking.spec 
Log Message:
sync w/devel branch (import)


kmm_kbanking-1.0-libtool.patch:
 Makefile.am |    2 +-
 Makefile.in |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE kmm_kbanking-1.0-libtool.patch ---
diff -up kmm_kbanking-1.0/src/Makefile.am.libtool kmm_kbanking-1.0/src/Makefile.am
--- kmm_kbanking-1.0/src/Makefile.am.libtool	2009-02-13 06:36:12.000000000 -0600
+++ kmm_kbanking-1.0/src/Makefile.am	2009-09-03 15:44:14.689090240 -0500
@@ -23,7 +23,7 @@ kmm_kbanking_la_SOURCES = mymoneybanking
 # Libs needed by the plugin
 kmm_kbanking_la_LIBADD = @qbanking_libs@ $(aqbanking_libs) $(gwenhywfar_libs) \
   $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
-  $(kde_libraries)/libkmm_plugin.la $(kde_libraries)/libkmm_mymoney.la \
+  -lkmm_plugin -lkmm_mymoney \
   ./kbanking/libkbanking.la 
 
 # LD flags for the plugin
diff -up kmm_kbanking-1.0/src/Makefile.in.libtool kmm_kbanking-1.0/src/Makefile.in
--- kmm_kbanking-1.0/src/Makefile.in.libtool	2009-08-17 06:07:23.000000000 -0500
+++ kmm_kbanking-1.0/src/Makefile.in	2009-09-03 15:44:58.801843149 -0500
@@ -61,8 +61,7 @@ am__DEPENDENCIES_1 =
 kmm_kbanking_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(kde_libraries)/libkmm_plugin.la \
-	$(kde_libraries)/libkmm_mymoney.la ./kbanking/libkbanking.la
+	./kbanking/libkbanking.la
 am_kmm_kbanking_la_OBJECTS = mymoneybanking.lo
 #>- kmm_kbanking_la_OBJECTS = $(am_kmm_kbanking_la_OBJECTS)
 #>+ 1
@@ -407,7 +406,7 @@ kmm_kbanking_la_SOURCES = mymoneybanking
 # Libs needed by the plugin
 kmm_kbanking_la_LIBADD = @qbanking_libs@ $(aqbanking_libs) $(gwenhywfar_libs) \
   $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
-  $(kde_libraries)/libkmm_plugin.la $(kde_libraries)/libkmm_mymoney.la \
+  -lkmm_plugin -lkmm_mymoney \
   ./kbanking/libkbanking.la 
 
 


--- NEW FILE kmymoney2-aqbanking.spec ---

%if 0%{?fedora} > 6
%define kdelibs3 kdelibs3
%else
%define kdelibs3 kdelibs
BuildRequires: libutempter-devel
%endif

Name:    kmymoney2-aqbanking
Summary: Online banking plugin for KMyMoney
Version: 1.0
Release: 2%{?dist}
License: GPLv2+
Group:   Applications/Productivity
URL:     http://www2.aquamaniac.de/sites/home/index.php
# no direct URL available
Source:  kmm_kbanking-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# workaround assumptions about .la files being available for linking
Patch1: kmm_kbanking-1.0-libtool.patch

BuildRequires: curl-devel
BuildRequires: %{kdelibs3}-devel
BuildRequires: kmymoney2-devel >= %{version}
BuildRequires: qbanking-devel >= 3.7.2

# tarball name, some may expect that to be used
Provides: kmm_kbanking = %{version}-%{release}
Provides: kmymoney-aqbanking = %{version}-%{release}

Requires: kmymoney2 >= %{version}

# FIXME: flesh-out
%description
%{summary}.


%prep
%setup -q -n kmm_kbanking-%{version}

%patch1 -p1 -b .libtool


%build
%configure \
  --disable-rpath \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking \
  --enable-gwenhywfar \
  --enable-aqbanking

make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%find_lang kmm_kbanking 


%clean
rm -rf %{buildroot}


%files -f kmm_kbanking.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/kde3/kmm_kbanking.*
%{_datadir}/apps/kmm_kbanking/
%{_datadir}/services/kmm_kbanking.desktop
%{_docdir}/HTML/en/kmm_kbanking/


%changelog
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-2
- rename to kmymoney2-aqbanking

* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-1
- kmm_kbanking-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2-aqbanking/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:13:37 -0000	1.1
+++ .cvsignore	25 Sep 2009 22:18:17 -0000	1.2
@@ -0,0 +1 @@
+kmm_kbanking-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2-aqbanking/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:13:37 -0000	1.1
+++ sources	25 Sep 2009 22:18:17 -0000	1.2
@@ -0,0 +1 @@
+44ba5beb6a2c5ba9aab2e201810e98a3  kmm_kbanking-1.0.tar.gz



From rdieter at fedoraproject.org  Fri Sep 25 22:20:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Sep 2009 22:20:04 +0000 (UTC)
Subject: rpms/kmymoney2-aqbanking/F-11 kmm_kbanking-1.0-libtool.patch, NONE, 
	1.1 kmymoney2-aqbanking.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090925222004.7DB9311C0418@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2-aqbanking/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19244

Modified Files:
	.cvsignore sources 
Added Files:
	kmm_kbanking-1.0-libtool.patch kmymoney2-aqbanking.spec 
Log Message:
import


kmm_kbanking-1.0-libtool.patch:
 Makefile.am |    2 +-
 Makefile.in |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE kmm_kbanking-1.0-libtool.patch ---
diff -up kmm_kbanking-1.0/src/Makefile.am.libtool kmm_kbanking-1.0/src/Makefile.am
--- kmm_kbanking-1.0/src/Makefile.am.libtool	2009-02-13 06:36:12.000000000 -0600
+++ kmm_kbanking-1.0/src/Makefile.am	2009-09-03 15:44:14.689090240 -0500
@@ -23,7 +23,7 @@ kmm_kbanking_la_SOURCES = mymoneybanking
 # Libs needed by the plugin
 kmm_kbanking_la_LIBADD = @qbanking_libs@ $(aqbanking_libs) $(gwenhywfar_libs) \
   $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
-  $(kde_libraries)/libkmm_plugin.la $(kde_libraries)/libkmm_mymoney.la \
+  -lkmm_plugin -lkmm_mymoney \
   ./kbanking/libkbanking.la 
 
 # LD flags for the plugin
diff -up kmm_kbanking-1.0/src/Makefile.in.libtool kmm_kbanking-1.0/src/Makefile.in
--- kmm_kbanking-1.0/src/Makefile.in.libtool	2009-08-17 06:07:23.000000000 -0500
+++ kmm_kbanking-1.0/src/Makefile.in	2009-09-03 15:44:58.801843149 -0500
@@ -61,8 +61,7 @@ am__DEPENDENCIES_1 =
 kmm_kbanking_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(kde_libraries)/libkmm_plugin.la \
-	$(kde_libraries)/libkmm_mymoney.la ./kbanking/libkbanking.la
+	./kbanking/libkbanking.la
 am_kmm_kbanking_la_OBJECTS = mymoneybanking.lo
 #>- kmm_kbanking_la_OBJECTS = $(am_kmm_kbanking_la_OBJECTS)
 #>+ 1
@@ -407,7 +406,7 @@ kmm_kbanking_la_SOURCES = mymoneybanking
 # Libs needed by the plugin
 kmm_kbanking_la_LIBADD = @qbanking_libs@ $(aqbanking_libs) $(gwenhywfar_libs) \
   $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
-  $(kde_libraries)/libkmm_plugin.la $(kde_libraries)/libkmm_mymoney.la \
+  -lkmm_plugin -lkmm_mymoney \
   ./kbanking/libkbanking.la 
 
 


--- NEW FILE kmymoney2-aqbanking.spec ---

%if 0%{?fedora} > 6
%define kdelibs3 kdelibs3
%else
%define kdelibs3 kdelibs
BuildRequires: libutempter-devel
%endif

Name:    kmymoney2-aqbanking
Summary: Online banking plugin for KMyMoney
Version: 1.0
Release: 2%{?dist}
License: GPLv2+
Group:   Applications/Productivity
URL:     http://www2.aquamaniac.de/sites/home/index.php
# no direct URL available
Source:  kmm_kbanking-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# workaround assumptions about .la files being available for linking
Patch1: kmm_kbanking-1.0-libtool.patch

BuildRequires: curl-devel
BuildRequires: %{kdelibs3}-devel
BuildRequires: kmymoney2-devel >= %{version}
BuildRequires: qbanking-devel >= 3.7.2

# tarball name, some may expect that to be used
Provides: kmm_kbanking = %{version}-%{release}
Provides: kmymoney-aqbanking = %{version}-%{release}

Requires: kmymoney2 >= %{version}

# FIXME: flesh-out
%description
%{summary}.


%prep
%setup -q -n kmm_kbanking-%{version}

%patch1 -p1 -b .libtool


%build
%configure \
  --disable-rpath \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking \
  --enable-gwenhywfar \
  --enable-aqbanking

make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%find_lang kmm_kbanking 


%clean
rm -rf %{buildroot}


%files -f kmm_kbanking.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/kde3/kmm_kbanking.*
%{_datadir}/apps/kmm_kbanking/
%{_datadir}/services/kmm_kbanking.desktop
%{_docdir}/HTML/en/kmm_kbanking/


%changelog
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-2
- rename to kmymoney2-aqbanking

* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-1
- kmm_kbanking-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2-aqbanking/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:13:37 -0000	1.1
+++ .cvsignore	25 Sep 2009 22:20:04 -0000	1.2
@@ -0,0 +1 @@
+kmm_kbanking-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2-aqbanking/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:13:37 -0000	1.1
+++ sources	25 Sep 2009 22:20:04 -0000	1.2
@@ -0,0 +1 @@
+44ba5beb6a2c5ba9aab2e201810e98a3  kmm_kbanking-1.0.tar.gz



From itamarjp at fedoraproject.org  Fri Sep 25 22:51:25 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 25 Sep 2009 22:51:25 +0000 (UTC)
Subject: rpms/redir/devel import.log,1.1,1.2 redir.spec,1.2,1.3
Message-ID: <20090925225125.DF8B511C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28148/devel

Modified Files:
	import.log redir.spec 
Log Message:
- start building for EPEL



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/redir/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Apr 2009 10:17:03 -0000	1.1
+++ import.log	25 Sep 2009 22:51:24 -0000	1.2
@@ -1 +1,2 @@
 redir-2_2_1-3_fc11:HEAD:redir-2.2.1-3.fc11.src.rpm:1239099294
+redir-2_2_1-5_fc12:HEAD:redir-2.2.1-5.fc12.src.rpm:1253918869


Index: redir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redir/devel/redir.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- redir.spec	27 Jul 2009 02:55:29 -0000	1.2
+++ redir.spec	25 Sep 2009 22:51:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           redir
 Version:        2.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Redirect TCP connections
 
 Group:          Applications/Internet
@@ -9,7 +9,16 @@ URL:            http://sammy.net/~sammy/
 Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
 BuildRequires:  tcp_wrappers-devel
+%endif
+
+%if 0%{?rhel}
+BuildRequires:  tcp_wrappers
+%endif
+
+
+
 
 #Include Debian Patches
 Patch0:         01_fix_max_bandwidth_docs.dpatch
@@ -109,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.2.1-5
+- start building for EPEL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Fri Sep 25 22:55:51 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 25 Sep 2009 22:55:51 +0000 (UTC)
Subject: rpms/redir/EL-5 import.log,1.1,1.2 redir.spec,1.2,1.3
Message-ID: <20090925225551.6FDF211C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30234/EL-5

Modified Files:
	import.log redir.spec 
Log Message:
- initial build for EPEL



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/redir/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Apr 2009 10:17:03 -0000	1.1
+++ import.log	25 Sep 2009 22:55:51 -0000	1.2
@@ -1 +1,2 @@
 redir-2_2_1-3_fc11:HEAD:redir-2.2.1-3.fc11.src.rpm:1239099294
+redir-2_2_1-5_fc12:EL-5:redir-2.2.1-5.fc12.src.rpm:1253919128


Index: redir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redir/EL-5/redir.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- redir.spec	27 Jul 2009 02:55:29 -0000	1.2
+++ redir.spec	25 Sep 2009 22:55:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           redir
 Version:        2.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Redirect TCP connections
 
 Group:          Applications/Internet
@@ -9,7 +9,16 @@ URL:            http://sammy.net/~sammy/
 Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
 BuildRequires:  tcp_wrappers-devel
+%endif
+
+%if 0%{?rhel}
+BuildRequires:  tcp_wrappers
+%endif
+
+
+
 
 #Include Debian Patches
 Patch0:         01_fix_max_bandwidth_docs.dpatch
@@ -109,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.2.1-5
+- start building for EPEL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Fri Sep 25 22:57:12 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 25 Sep 2009 22:57:12 +0000 (UTC)
Subject: rpms/redir/EL-4 import.log,1.1,1.2 redir.spec,1.2,1.3
Message-ID: <20090925225712.9461411C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30509/EL-4

Modified Files:
	import.log redir.spec 
Log Message:
- initial build for EPEL
CVSl: ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/redir/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Apr 2009 10:17:03 -0000	1.1
+++ import.log	25 Sep 2009 22:57:12 -0000	1.2
@@ -1 +1,2 @@
 redir-2_2_1-3_fc11:HEAD:redir-2.2.1-3.fc11.src.rpm:1239099294
+redir-2_2_1-5_fc12:EL-4:redir-2.2.1-5.fc12.src.rpm:1253919391


Index: redir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redir/EL-4/redir.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- redir.spec	27 Jul 2009 02:55:29 -0000	1.2
+++ redir.spec	25 Sep 2009 22:57:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           redir
 Version:        2.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Redirect TCP connections
 
 Group:          Applications/Internet
@@ -9,7 +9,16 @@ URL:            http://sammy.net/~sammy/
 Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
 BuildRequires:  tcp_wrappers-devel
+%endif
+
+%if 0%{?rhel}
+BuildRequires:  tcp_wrappers
+%endif
+
+
+
 
 #Include Debian Patches
 Patch0:         01_fix_max_bandwidth_docs.dpatch
@@ -109,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.2.1-5
+- start building for EPEL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lutter at fedoraproject.org  Fri Sep 25 23:11:22 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Fri, 25 Sep 2009 23:11:22 +0000 (UTC)
Subject: rpms/netcf/devel .cvsignore, 1.3, 1.4 netcf.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <20090925231122.47E1911C0380@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2929/devel

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Sep 2009 22:58:52 -0000	1.3
+++ .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
@@ -1 +1 @@
-netcf-0.1.1.tar.gz
+netcf-0.1.2.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/netcf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netcf.spec	16 Sep 2009 22:58:52 -0000	1.4
+++ netcf.spec	25 Sep 2009 23:11:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
+- New Version
+
 * Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
 - Remove patch netcf-0.1.0-fix-initialization-of-libxslt.patch,
   included upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Sep 2009 22:58:52 -0000	1.3
+++ sources	25 Sep 2009 23:11:21 -0000	1.4
@@ -1 +1 @@
-01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz
+635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz



From lutter at fedoraproject.org  Fri Sep 25 23:11:22 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Fri, 25 Sep 2009 23:11:22 +0000 (UTC)
Subject: rpms/netcf/F-11 .cvsignore, 1.3, 1.4 netcf.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090925231122.3D1AA11C00E8@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2929/F-11

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Sep 2009 22:58:52 -0000	1.3
+++ .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
@@ -1 +1 @@
-netcf-0.1.1.tar.gz
+netcf-0.1.2.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/netcf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netcf.spec	16 Sep 2009 22:58:52 -0000	1.2
+++ netcf.spec	25 Sep 2009 23:11:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
+- New Version
+
 * Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Sep 2009 22:58:52 -0000	1.3
+++ sources	25 Sep 2009 23:11:21 -0000	1.4
@@ -1 +1 @@
-01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz
+635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz



From lutter at fedoraproject.org  Fri Sep 25 23:11:22 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Fri, 25 Sep 2009 23:11:22 +0000 (UTC)
Subject: rpms/netcf/F-10 .cvsignore, 1.3, 1.4 netcf.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090925231122.4448C11C0374@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2929/F-10

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Sep 2009 22:58:51 -0000	1.3
+++ .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
@@ -1 +1 @@
-netcf-0.1.1.tar.gz
+netcf-0.1.2.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/netcf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netcf.spec	16 Sep 2009 22:58:51 -0000	1.2
+++ netcf.spec	25 Sep 2009 23:11:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
+- New Version
+
 * Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Sep 2009 22:58:51 -0000	1.3
+++ sources	25 Sep 2009 23:11:21 -0000	1.4
@@ -1 +1 @@
-01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz
+635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz



From lutter at fedoraproject.org  Fri Sep 25 23:11:22 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Fri, 25 Sep 2009 23:11:22 +0000 (UTC)
Subject: rpms/netcf/EL-5 .cvsignore, 1.2, 1.3 netcf.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090925231122.407B811C00EB@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2929/EL-5

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Sep 2009 22:58:51 -0000	1.2
+++ .cvsignore	25 Sep 2009 23:11:19 -0000	1.3
@@ -1 +1 @@
-netcf-0.1.1.tar.gz
+netcf-0.1.2.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/netcf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netcf.spec	16 Sep 2009 22:59:16 -0000	1.1
+++ netcf.spec	25 Sep 2009 23:11:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
+- New Version
+
 * Wed Sep 16 2009 David Lutterkort <lutter at redhat.com> - 0.1.1-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Sep 2009 22:58:51 -0000	1.2
+++ sources	25 Sep 2009 23:11:20 -0000	1.3
@@ -1 +1 @@
-01df7055b4e1d4835236a62f3cda8e31  netcf-0.1.1.tar.gz
+635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz



From fschwarz at fedoraproject.org  Sat Sep 26 00:11:54 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sat, 26 Sep 2009 00:11:54 +0000 (UTC)
Subject: rpms/python-beaker/F-11 .cvsignore, 1.9, 1.10 python-beaker.spec,
	1.10, 1.11 sources, 1.9, 1.10 beaker-hmac2.4.patch, 1.1,
	NONE python-beaker-middleware-config.patch, 1.1, NONE
Message-ID: <20090926001154.BFCC711C00E8@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-beaker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27099

Modified Files:
	.cvsignore python-beaker.spec sources 
Removed Files:
	beaker-hmac2.4.patch python-beaker-middleware-config.patch 
Log Message:
update to beaker 1.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 19:02:43 -0000	1.9
+++ .cvsignore	26 Sep 2009 00:11:52 -0000	1.10
@@ -1 +1 @@
-Beaker-1.3.1.tar.gz
+Beaker-1.4.2.tar.gz


Index: python-beaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/F-11/python-beaker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-beaker.spec	30 Jul 2009 19:02:43 -0000	1.10
+++ python-beaker.spec	26 Sep 2009 00:11:52 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-beaker
-Version: 1.3.1
-Release: 6%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 Summary: WSGI middleware layer to provide sessions
 
 Group: Development/Languages
@@ -12,9 +12,7 @@ Source0: http://pypi.python.org/packages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-setuptools-devel
-Patch0: beaker-hmac2.4.patch
 Patch1: %{name}-absimport.patch
-Patch2: %{name}-middleware-config.patch
 
 %description
 Beaker is a caching library that includes Session and Cache objects built on
@@ -24,9 +22,7 @@ manage Session objects and signed cookie
 
 %prep
 %setup -q -n Beaker-%{version}
-%patch0 -p1 -b .hashlib
 %patch1 -p0 -b .absimport
-%patch2 -p1 -b .middleconfig
 
 
 %build
@@ -50,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.4.2-1
+- New upstream release to fix bugs and minor enhancements
+- removed patches for hashlib+middleware
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Jul 2009 19:02:43 -0000	1.9
+++ sources	26 Sep 2009 00:11:52 -0000	1.10
@@ -1 +1 @@
-bdc4237d68f1a0f9b853d202a2d16617  Beaker-1.3.1.tar.gz
+fa65f7cbef01dde83af545c1dd6a5b1b  Beaker-1.4.2.tar.gz


--- beaker-hmac2.4.patch DELETED ---


--- python-beaker-middleware-config.patch DELETED ---



From agk at fedoraproject.org  Sat Sep 26 00:39:04 2009
From: agk at fedoraproject.org (agk)
Date: Sat, 26 Sep 2009 00:39:04 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.53.tgz.asc, 1.1, 1.2 lvm2.spec, 1.182,
	1.183 sources, 1.78, 1.79
Message-ID: <20090926003905.1939E11C00E8@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7417

Modified Files:
	LVM2.2.02.53.tgz.asc lvm2.spec sources 
Log Message:
Reissued upstream release to fix compilation warning.



Index: LVM2.2.02.53.tgz.asc
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/LVM2.2.02.53.tgz.asc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- LVM2.2.02.53.tgz.asc	25 Sep 2009 19:38:32 -0000	1.1
+++ LVM2.2.02.53.tgz.asc	26 Sep 2009 00:39:03 -0000	1.2
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (GNU/Linux)
 
-iD8DBQBKvRepIoGRwVZ+LBcRAjPTAKDbxSa/ohWlc9f1sdVuZ8+/34hyXgCeJXUA
-MBicW/9WJRiltnFa8FF/kyk=
-=XBZd
+iD8DBQBKvWHJIoGRwVZ+LBcRAt+NAKDEHvi7qzQ00t7fHZa6jTVi5R8+iwCgxu4x
+jO0LOdDliisL4wAWGktfQfc=
+=pPUb
 -----END PGP SIGNATURE-----


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- lvm2.spec	25 Sep 2009 19:38:32 -0000	1.182
+++ lvm2.spec	26 Sep 2009 00:39:03 -0000	1.183
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.53
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -379,6 +379,9 @@ the device-mapper event library.
 
 
 %changelog
+* Fri Sep 25 2009 Alasdair Kergon <agk at redhat.com> - 2.02.53-2
+- Reissued tarball to fix compilation warning from lvm2_log_fn prototype.
+
 * Fri Sep 25 2009 Alasdair Kergon <agk at redhat.com> - 2.02.53-1
 - Create any directories in /dev with umask 022. (#507397)
 - Handle paths supplied to dm_task_set_name by getting name from /dev/mapper.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	25 Sep 2009 19:38:32 -0000	1.78
+++ sources	26 Sep 2009 00:39:03 -0000	1.79
@@ -1 +1 @@
-24d863fdaec51faba79513ad3b537f4e  LVM2.2.02.53.tgz
+f9ae3579bf15467b7f1d7aea8b9ed9b3  LVM2.2.02.53.tgz



From mclasen at fedoraproject.org  Sat Sep 26 00:54:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 26 Sep 2009 00:54:54 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.260,1.261
Message-ID: <20090926005454.3D35411C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13491

Modified Files:
	totem.spec 
Log Message:
more requires



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- totem.spec	25 Sep 2009 18:20:42 -0000	1.260
+++ totem.spec	26 Sep 2009 00:54:53 -0000	1.261
@@ -6,12 +6,12 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.28/totem-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
@@ -29,6 +29,7 @@ Requires: pyxdg
 Requires: pygtk2
 # For the iplayer plugin
 Requires: python-httplib2
+Requires: python-BeautifulSoup
 
 Requires: gstreamer >= %gstreamer_version
 Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
@@ -88,8 +89,8 @@ Summary: Mozilla plugin for Totem
 Group: Applications/Internet
 
 %description mozplugin
-Totem is simple movie player for the GNOME desktop. 
-The mozilla plugin for Totem allows it to be embedded into a web browser. 
+Totem is simple movie player for the GNOME desktop.
+The mozilla plugin for Totem allows it to be embedded into a web browser.
 
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Totem
@@ -105,7 +106,7 @@ Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 
 %description mythtv
-This package provides a plugin to give Totem access to recordings on 
+This package provides a plugin to give Totem access to recordings on
 a remote MythTV server.
 
 %package youtube
@@ -114,7 +115,7 @@ Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 
 %description youtube
-This package provides a plugin to allow browsing YouTube videos in Totem, 
+This package provides a plugin to allow browsing YouTube videos in Totem,
 and watching them.
 
 To play back the videos however, you will need codecs that are not
@@ -146,7 +147,7 @@ and watching videos from those.
 #Requires: %{name} = %{version}-%{release}
 
 #%description tracker
-#This package provides a Totem plugin to allow searching local videos, based 
+#This package provides a Totem plugin to allow searching local videos, based
 #on their tags, metadata, or filenames, as indexing by the Tracker indexer.
 
 %package publish
@@ -155,8 +156,8 @@ Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 
 %description publish
-This package provides a plugin to allow you to share your current playlist 
-(and the files included in that playlist) with other Totems on the same 
+This package provides a plugin to allow you to share your current playlist
+(and the files included in that playlist) with other Totems on the same
 local network.
 
 %package devel
@@ -178,7 +179,7 @@ Obsoletes: totem-nautilus-xine < 2.23.0
 Obsoletes: totem-nautilus-gstreamer < 2.23.0
 
 %description nautilus
-This package provides a Nautilus extension that shows the properties of 
+This package provides a Nautilus extension that shows the properties of
 audio and video files in the properties dialog.
 
 %prep
@@ -186,7 +187,7 @@ audio and video files in the properties 
 
 %build
 
-# try to work around a problem where gst-inspect does 
+# 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
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
@@ -379,6 +380,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4
+- More requires
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Add requires for iplayer plugin (#522068)
 



From ebrand at fedoraproject.org  Sat Sep 26 00:58:38 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sat, 26 Sep 2009 00:58:38 +0000 (UTC)
Subject: rpms/sslogger/EL-5 sslogger-0.9.tar.gz,1.1,NONE
Message-ID: <20090926005838.C0D4411C00E8@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13864

Removed Files:
	sslogger-0.9.tar.gz 
Log Message:
Removed src tarball, testing make commands for adding source file



--- sslogger-0.9.tar.gz DELETED ---



From ebrand at fedoraproject.org  Sat Sep 26 01:33:06 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sat, 26 Sep 2009 01:33:06 +0000 (UTC)
Subject: rpms/sslogger/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090926013306.DC7B411C00E8@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24840

Modified Files:
	.cvsignore sources 
Log Message:
Added sslogger  tarball via make new-sources FILES=sslogger-xxx.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:07:39 -0000	1.1
+++ .cvsignore	26 Sep 2009 01:33:04 -0000	1.2
@@ -0,0 +1 @@
+sslogger-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:07:39 -0000	1.1
+++ sources	26 Sep 2009 01:33:04 -0000	1.2
@@ -0,0 +1 @@
+1f384d6c363780cbe4c929ca46ddcdf9  sslogger-0.9.tar.gz



From tmz at fedoraproject.org  Sat Sep 26 01:47:39 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 26 Sep 2009 01:47:39 +0000 (UTC)
Subject: rpms/facter/devel
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 facter.spec, 1.16, 1.17 sources, 1.11,
	1.12 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch,
	1.1, NONE
Message-ID: <20090926014739.6F12A11C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29096

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch 
Removed Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
Log Message:
Update to 1.5.7

- Update #508037 patch from upstream ticket


facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Fri, 11 Sep 2009 01:09:22 -0400
Subject: [PATCH/facter] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7

---
 lib/facter/virtual.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78413a9..6f3f5a2 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -25,9 +25,9 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
-- 
1.6.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 May 2009 21:31:37 -0000	1.11
+++ .cvsignore	26 Sep 2009 01:47:38 -0000	1.12
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- facter.spec	12 Aug 2009 22:58:31 -0000	1.16
+++ facter.spec	26 Sep 2009 01:47:39 -0000	1.17
@@ -5,15 +5,15 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
 
 # Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
-Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+Patch0: facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Todd Zullinger <tmz at pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
 - Fix #508037 or upstream #2355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 May 2009 21:31:37 -0000	1.11
+++ sources	26 Sep 2009 01:47:39 -0000	1.12
@@ -1 +1 @@
-7a783f99f8651095a0b2a8d0b75c48b4  facter-1.5.5.tar.gz
+21db7b613fe14a54e72ef062f3d5e190  facter-1.5.7.tar.gz


--- facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch DELETED ---



From tmz at fedoraproject.org  Sat Sep 26 02:03:09 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 26 Sep 2009 02:03:09 +0000 (UTC)
Subject: rpms/facter/F-11
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 facter.spec, 1.15, 1.16 sources, 1.11,
	1.12 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch,
	1.1, NONE
Message-ID: <20090926020310.0039A11C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv538

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch 
Removed Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
Log Message:
Update to 1.5.7

- Update #508037 patch from upstream ticket


facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Fri, 11 Sep 2009 01:09:22 -0400
Subject: [PATCH/facter] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7

---
 lib/facter/virtual.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78413a9..6f3f5a2 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -25,9 +25,9 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
-- 
1.6.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 May 2009 21:44:10 -0000	1.11
+++ .cvsignore	26 Sep 2009 02:03:07 -0000	1.12
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-11/facter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- facter.spec	12 Aug 2009 22:57:58 -0000	1.15
+++ facter.spec	26 Sep 2009 02:03:08 -0000	1.16
@@ -5,15 +5,15 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
 
 # Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
-Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+Patch0: facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Todd Zullinger <tmz at pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
 - Fix #508037 or upstream #2355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 May 2009 21:44:10 -0000	1.11
+++ sources	26 Sep 2009 02:03:08 -0000	1.12
@@ -1 +1 @@
-7a783f99f8651095a0b2a8d0b75c48b4  facter-1.5.5.tar.gz
+21db7b613fe14a54e72ef062f3d5e190  facter-1.5.7.tar.gz


--- facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch DELETED ---



From tmz at fedoraproject.org  Sat Sep 26 02:03:28 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 26 Sep 2009 02:03:28 +0000 (UTC)
Subject: rpms/facter/F-10
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 facter.spec, 1.14, 1.15 sources, 1.11,
	1.12 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch,
	1.1, NONE
Message-ID: <20090926020328.5B2F011C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv719

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch 
Removed Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
Log Message:
Update to 1.5.7

- Update #508037 patch from upstream ticket


facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Fri, 11 Sep 2009 01:09:22 -0400
Subject: [PATCH/facter] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7

---
 lib/facter/virtual.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78413a9..6f3f5a2 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -25,9 +25,9 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
-- 
1.6.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 May 2009 21:37:24 -0000	1.11
+++ .cvsignore	26 Sep 2009 02:03:27 -0000	1.12
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-10/facter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- facter.spec	12 Aug 2009 22:57:25 -0000	1.14
+++ facter.spec	26 Sep 2009 02:03:28 -0000	1.15
@@ -5,15 +5,15 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
 
 # Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
-Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+Patch0: facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Todd Zullinger <tmz at pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
 - Fix #508037 or upstream #2355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 May 2009 21:37:25 -0000	1.11
+++ sources	26 Sep 2009 02:03:28 -0000	1.12
@@ -1 +1 @@
-7a783f99f8651095a0b2a8d0b75c48b4  facter-1.5.5.tar.gz
+21db7b613fe14a54e72ef062f3d5e190  facter-1.5.7.tar.gz


--- facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch DELETED ---



From tmz at fedoraproject.org  Sat Sep 26 02:03:48 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 26 Sep 2009 02:03:48 +0000 (UTC)
Subject: rpms/facter/EL-5
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 facter.spec, 1.14, 1.15 sources, 1.11,
	1.12 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch,
	1.1, NONE
Message-ID: <20090926020348.3E0FF11C00EB@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv949

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch 
Removed Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
Log Message:
Update to 1.5.7

- Update #508037 patch from upstream ticket


facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Fri, 11 Sep 2009 01:09:22 -0400
Subject: [PATCH/facter] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7

---
 lib/facter/virtual.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78413a9..6f3f5a2 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -25,9 +25,9 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
-- 
1.6.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 May 2009 21:39:10 -0000	1.11
+++ .cvsignore	26 Sep 2009 02:03:47 -0000	1.12
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- facter.spec	12 Aug 2009 22:56:54 -0000	1.14
+++ facter.spec	26 Sep 2009 02:03:48 -0000	1.15
@@ -5,15 +5,15 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
 
 # Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
-Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+Patch0: facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Todd Zullinger <tmz at pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
 - Fix #508037 or upstream #2355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 May 2009 21:39:10 -0000	1.11
+++ sources	26 Sep 2009 02:03:48 -0000	1.12
@@ -1 +1 @@
-7a783f99f8651095a0b2a8d0b75c48b4  facter-1.5.5.tar.gz
+21db7b613fe14a54e72ef062f3d5e190  facter-1.5.7.tar.gz


--- facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch DELETED ---



From tmz at fedoraproject.org  Sat Sep 26 02:04:07 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 26 Sep 2009 02:04:07 +0000 (UTC)
Subject: rpms/facter/EL-4
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 facter.spec, 1.12, 1.13 sources, 1.10,
	1.11 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch,
	1.1, NONE
Message-ID: <20090926020407.33ED511C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1178

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch 
Removed Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
Log Message:
Update to 1.5.7

- Update #508037 patch from upstream ticket


facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Fri, 11 Sep 2009 01:09:22 -0400
Subject: [PATCH/facter] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7

---
 lib/facter/virtual.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78413a9..6f3f5a2 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -25,9 +25,9 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
-- 
1.6.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	26 May 2009 19:46:31 -0000	1.10
+++ .cvsignore	26 Sep 2009 02:04:06 -0000	1.11
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- facter.spec	12 Aug 2009 22:56:23 -0000	1.12
+++ facter.spec	26 Sep 2009 02:04:06 -0000	1.13
@@ -5,15 +5,15 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
 
 # Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
-Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+Patch0: facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Todd Zullinger <tmz at pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
 - Fix #508037 or upstream #2355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	26 May 2009 19:46:31 -0000	1.10
+++ sources	26 Sep 2009 02:04:07 -0000	1.11
@@ -1 +1 @@
-7a783f99f8651095a0b2a8d0b75c48b4  facter-1.5.5.tar.gz
+21db7b613fe14a54e72ef062f3d5e190  facter-1.5.7.tar.gz


--- facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch DELETED ---



From sindrepb at fedoraproject.org  Sat Sep 26 02:13:56 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sat, 26 Sep 2009 02:13:56 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb-4.2-beautifulsoup.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 python-imdb.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20090926021356.17EAE11C00E8@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3778

Modified Files:
	.cvsignore python-imdb.spec sources 
Added Files:
	python-imdb-4.2-beautifulsoup.patch 
Log Message:
new upstream

python-imdb-4.2-beautifulsoup.patch:
 bsoupxpath.py |    2 +-
 etree.py      |    4 ++--
 html.py       |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE python-imdb-4.2-beautifulsoup.patch ---
diff -up ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig ./imdb/parser/http/bsouplxml/bsoupxpath.py
--- ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig	2009-09-26 04:01:34.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/bsoupxpath.py	2009-09-26 04:05:37.000000000 +0200
@@ -26,7 +26,7 @@ __docformat__ = 'restructuredtext'
 
 import re
 import string
-import _bsoup as BeautifulSoup
+import BeautifulSoup
 
 
 # XPath related enumerations and constants
diff -up ./imdb/parser/http/bsouplxml/etree.py.orig ./imdb/parser/http/bsouplxml/etree.py
--- ./imdb/parser/http/bsouplxml/etree.py.orig	2009-09-26 04:05:10.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/etree.py	2009-09-26 04:06:03.000000000 +0200
@@ -21,8 +21,8 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-from _bsoup import Tag as Element
+import BeautifulSoup
+from BeautifulSoup import Tag as Element
 
 import bsoupxpath
 
diff -up ./imdb/parser/http/bsouplxml/html.py.orig ./imdb/parser/http/bsouplxml/html.py
--- ./imdb/parser/http/bsouplxml/html.py.orig	2009-09-26 04:05:14.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/html.py	2009-09-26 04:06:16.000000000 +0200
@@ -21,7 +21,7 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
+import BeautifulSoup
 
 
 def fromstring(html_string):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Apr 2009 03:06:40 -0000	1.3
+++ .cvsignore	26 Sep 2009 02:13:55 -0000	1.4
@@ -1 +1 @@
-IMDbPY-4.0.tar.gz
+IMDbPY-4.2.tar.gz


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-imdb.spec	26 Jul 2009 20:28:01 -0000	1.9
+++ python-imdb.spec	26 Sep 2009 02:13:55 -0000	1.10
@@ -5,8 +5,8 @@
 
 Name:           python-imdb
 Provides:       IMDbPY = %{version}-%{release}
-Version:        4.0
-Release:        6%{?dist}
+Version:        4.2
+Release:        1%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 26 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 4.2-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Apr 2009 03:06:40 -0000	1.3
+++ sources	26 Sep 2009 02:13:55 -0000	1.4
@@ -1 +1 @@
-873fb1550f0fde04acbb297b74c94377  IMDbPY-4.0.tar.gz
+a97fdde99e5810b47a7102e0980e1655  IMDbPY-4.2.tar.gz



From mclasen at fedoraproject.org  Sat Sep 26 02:43:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 26 Sep 2009 02:43:07 +0000 (UTC)
Subject: rpms/bug-buddy/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE bug-buddy-build-id.patch, 1.1, NONE bug-buddy-c++.patch,
	1.3, NONE bug-buddy-gcc44.patch, 1.4, NONE bug-buddy.spec, 1.130,
	NONE make-resident.patch, 1.1, NONE sources, 1.52, NONE
Message-ID: <20090926024308.182E811C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/bug-buddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10488

Added Files:
	dead.package 
Removed Files:
	Makefile bug-buddy-build-id.patch bug-buddy-c++.patch 
	bug-buddy-gcc44.patch bug-buddy.spec make-resident.patch 
	sources 
Log Message:
kill bug-buddy



--- NEW FILE dead.package ---
Obsoleted by abrt-gui


--- Makefile DELETED ---


--- bug-buddy-build-id.patch DELETED ---


--- bug-buddy-c++.patch DELETED ---


--- bug-buddy-gcc44.patch DELETED ---


--- bug-buddy.spec DELETED ---


--- make-resident.patch DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Sat Sep 26 02:45:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:45:44 +0000
Subject: [pkgdb] cmusphinx3 was added for jjames
Message-ID: <20090926024544.77A5D10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package cmusphinx3 with summary Large vocabulary speech recognition in C
kevin has approved Package cmusphinx3
kevin has added a Fedora devel branch for cmusphinx3 with an owner of jjames
kevin has approved cmusphinx3 in Fedora devel
kevin has approved Package cmusphinx3
kevin has set commit to Approved for 107427 on cmusphinx3 (Fedora devel)
kevin has set checkout to Approved for 107427 on cmusphinx3 (Fedora devel)
kevin has set build to Approved for 107427 on cmusphinx3 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cmusphinx3



From pkgdb at fedoraproject.org  Sat Sep 26 02:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:45:45 +0000
Subject: [pkgdb] cmusphinx3 summary updated by kevin
Message-ID: <20090926024545.EE86E10F88A@bastion2.fedora.phx.redhat.com>

kevin set package cmusphinx3 summary to Large vocabulary speech recognition in C

To make changes to this package see:
  /pkgdb/packages/name/cmusphinx3



From pkgdb at fedoraproject.org  Sat Sep 26 02:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:45:45 +0000
Subject: [pkgdb] cmusphinx3 (Fedora, 11) updated by kevin
Message-ID: <20090926024546.08B3D10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cmusphinx3
kevin has set commit to Approved for 107427 on cmusphinx3 (Fedora 11)
kevin has set checkout to Approved for 107427 on cmusphinx3 (Fedora 11)
kevin has set build to Approved for 107427 on cmusphinx3 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cmusphinx3



From kevin at fedoraproject.org  Sat Sep 26 02:45:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:45:53 +0000 (UTC)
Subject: rpms/cmusphinx3 - New directory
Message-ID: <20090926024553.1E7C311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmusphinx3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11248/rpms/cmusphinx3

Log Message:
Directory /cvs/pkgs/rpms/cmusphinx3 added to the repository




From kevin at fedoraproject.org  Sat Sep 26 02:45:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:45:53 +0000 (UTC)
Subject: rpms/cmusphinx3/devel - New directory
Message-ID: <20090926024553.4D08311C00EB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmusphinx3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11248/rpms/cmusphinx3/devel

Log Message:
Directory /cvs/pkgs/rpms/cmusphinx3/devel added to the repository




From kevin at fedoraproject.org  Sat Sep 26 02:46:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:46:00 +0000 (UTC)
Subject: rpms/cmusphinx3 Makefile,NONE,1.1
Message-ID: <20090926024600.0042E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmusphinx3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11248/rpms/cmusphinx3

Added Files:
	Makefile 
Log Message:
Setup of module cmusphinx3


--- NEW FILE Makefile ---
# Top level Makefile for module cmusphinx3
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  Sat Sep 26 02:46:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:46:00 +0000 (UTC)
Subject: rpms/cmusphinx3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090926024600.AEF0E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmusphinx3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11248/rpms/cmusphinx3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cmusphinx3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cmusphinx3
# $Id: Makefile,v 1.1 2009/09/26 02:46:00 kevin Exp $
NAME := cmusphinx3
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  Sat Sep 26 02:46:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:46:33 +0000
Subject: [pkgdb] k3b (Fedora, 12) updated by kevin
Message-ID: <20090926024633.A42B410F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for k3b
kevin has set commit to Approved for 107427 on k3b (Fedora 12)
kevin has set checkout to Approved for 107427 on k3b (Fedora 12)
kevin has set build to Approved for 107427 on k3b (Fedora 12)
kevin changed owner of k3b in Fedora 12 to rrakus
kevin approved watchbugzilla on k3b (Fedora 12) for rdieter
kevin approved watchcommits on k3b (Fedora 12) for rdieter
kevin approved commit on k3b (Fedora 12) for rdieter
kevin approved build on k3b (Fedora 12) for rdieter
kevin approved approveacls on k3b (Fedora 12) for rdieter
kevin approved watchbugzilla on k3b (Fedora 12) for tuxbrewr
kevin approved watchcommits on k3b (Fedora 12) for tuxbrewr
kevin approved commit on k3b (Fedora 12) for tuxbrewr
kevin approved build on k3b (Fedora 12) for tuxbrewr
kevin approved approveacls on k3b (Fedora 12) for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Sat Sep 26 02:47:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:47:22 +0000
Subject: [pkgdb] pigz was added for drago01
Message-ID: <20090926024723.00EDC10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package pigz with summary Parallel implementation of gzip
kevin has approved Package pigz
kevin has added a Fedora devel branch for pigz with an owner of drago01
kevin has approved pigz in Fedora devel
kevin has approved Package pigz
kevin has set commit to Approved for 107427 on pigz (Fedora devel)
kevin has set checkout to Approved for 107427 on pigz (Fedora devel)
kevin has set build to Approved for 107427 on pigz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pigz



From pkgdb at fedoraproject.org  Sat Sep 26 02:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:47:24 +0000
Subject: [pkgdb] pigz (Fedora, 10) updated by kevin
Message-ID: <20090926024724.6212F10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pigz
kevin has set commit to Approved for 107427 on pigz (Fedora 10)
kevin has set checkout to Approved for 107427 on pigz (Fedora 10)
kevin has set build to Approved for 107427 on pigz (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pigz



From pkgdb at fedoraproject.org  Sat Sep 26 02:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:47:24 +0000
Subject: [pkgdb] pigz summary updated by kevin
Message-ID: <20090926024724.59CB010F88A@bastion2.fedora.phx.redhat.com>

kevin set package pigz summary to Parallel implementation of gzip

To make changes to this package see:
  /pkgdb/packages/name/pigz



From pkgdb at fedoraproject.org  Sat Sep 26 02:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:47:24 +0000
Subject: [pkgdb] pigz (Fedora, 10) updated by kevin
Message-ID: <20090926024724.6CE3010F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pigz
kevin has set commit to Approved for 107427 on pigz (Fedora 11)
kevin has set checkout to Approved for 107427 on pigz (Fedora 11)
kevin has set build to Approved for 107427 on pigz (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pigz



From kevin at fedoraproject.org  Sat Sep 26 02:47:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:47:32 +0000 (UTC)
Subject: rpms/pigz - New directory
Message-ID: <20090926024732.1597011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pigz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11688/rpms/pigz

Log Message:
Directory /cvs/pkgs/rpms/pigz added to the repository




From kevin at fedoraproject.org  Sat Sep 26 02:47:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:47:32 +0000 (UTC)
Subject: rpms/pigz/devel - New directory
Message-ID: <20090926024732.38F4011C0375@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pigz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11688/rpms/pigz/devel

Log Message:
Directory /cvs/pkgs/rpms/pigz/devel added to the repository




From kevin at fedoraproject.org  Sat Sep 26 02:47:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:47:38 +0000 (UTC)
Subject: rpms/pigz Makefile,NONE,1.1
Message-ID: <20090926024738.BB49111C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pigz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11688/rpms/pigz

Added Files:
	Makefile 
Log Message:
Setup of module pigz


--- NEW FILE Makefile ---
# Top level Makefile for module pigz
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  Sat Sep 26 02:47:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:47:39 +0000 (UTC)
Subject: rpms/pigz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090926024739.0B18811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pigz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG11688/rpms/pigz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pigz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pigz
# $Id: Makefile,v 1.1 2009/09/26 02:47:38 kevin Exp $
NAME := pigz
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  Sat Sep 26 02:48:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:26 +0000
Subject: [pkgdb] perl-IPC-DirQueue was added for stevetraylen
Message-ID: <20090926024826.A0A1010F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-IPC-DirQueue with summary Disk-based many-to-many task queue
kevin has approved Package perl-IPC-DirQueue
kevin has added a Fedora devel branch for perl-IPC-DirQueue with an owner of stevetraylen
kevin has approved perl-IPC-DirQueue in Fedora devel
kevin has approved Package perl-IPC-DirQueue
kevin has set commit to Approved for 107427 on perl-IPC-DirQueue (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-IPC-DirQueue (Fedora devel)
kevin has set build to Approved for 107427 on perl-IPC-DirQueue (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From pkgdb at fedoraproject.org  Sat Sep 26 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:29 +0000
Subject: [pkgdb] perl-IPC-DirQueue summary updated by kevin
Message-ID: <20090926024829.4CC0E10F89B@bastion2.fedora.phx.redhat.com>

kevin set package perl-IPC-DirQueue summary to Disk-based many-to-many task queue

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From pkgdb at fedoraproject.org  Sat Sep 26 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:29 +0000
Subject: [pkgdb] perl-IPC-DirQueue (Fedora EPEL, 4) updated by kevin
Message-ID: <20090926024829.5687910F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-IPC-DirQueue
kevin has set commit to Approved for 107427 on perl-IPC-DirQueue (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-IPC-DirQueue (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-IPC-DirQueue (Fedora EPEL 5)
kevin approved watchbugzilla on perl-IPC-DirQueue (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-IPC-DirQueue (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From pkgdb at fedoraproject.org  Sat Sep 26 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:29 +0000
Subject: [pkgdb] perl-IPC-DirQueue (Fedora EPEL, 4) updated by kevin
Message-ID: <20090926024829.5B7AC10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-IPC-DirQueue
kevin has set commit to Approved for 107427 on perl-IPC-DirQueue (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-IPC-DirQueue (Fedora 11)
kevin has set build to Approved for 107427 on perl-IPC-DirQueue (Fedora 11)
kevin approved watchbugzilla on perl-IPC-DirQueue (Fedora 11) for perl-sig
kevin approved watchcommits on perl-IPC-DirQueue (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From pkgdb at fedoraproject.org  Sat Sep 26 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:29 +0000
Subject: [pkgdb] perl-IPC-DirQueue (Fedora EPEL, 4) updated by kevin
Message-ID: <20090926024829.663A310F8A8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-IPC-DirQueue (Fedora devel) for perl-sig
kevin approved watchcommits on perl-IPC-DirQueue (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From pkgdb at fedoraproject.org  Sat Sep 26 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:29 +0000
Subject: [pkgdb] perl-IPC-DirQueue (Fedora EPEL, 4) updated by kevin
Message-ID: <20090926024829.6BC4410F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-IPC-DirQueue
kevin has set commit to Approved for 107427 on perl-IPC-DirQueue (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-IPC-DirQueue (Fedora 12)
kevin has set build to Approved for 107427 on perl-IPC-DirQueue (Fedora 12)
kevin approved watchbugzilla on perl-IPC-DirQueue (Fedora 12) for perl-sig
kevin approved watchcommits on perl-IPC-DirQueue (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From pkgdb at fedoraproject.org  Sat Sep 26 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:48:29 +0000
Subject: [pkgdb] perl-IPC-DirQueue (Fedora EPEL, 4) updated by kevin
Message-ID: <20090926024829.8041010F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-IPC-DirQueue
kevin has set commit to Approved for 107427 on perl-IPC-DirQueue (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on perl-IPC-DirQueue (Fedora EPEL 4)
kevin has set build to Approved for 107427 on perl-IPC-DirQueue (Fedora EPEL 4)
kevin approved watchbugzilla on perl-IPC-DirQueue (Fedora EPEL 4) for perl-sig
kevin approved watchcommits on perl-IPC-DirQueue (Fedora EPEL 4) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-IPC-DirQueue



From kevin at fedoraproject.org  Sat Sep 26 02:48:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:48:38 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue - New directory
Message-ID: <20090926024838.1921C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12024/rpms/perl-IPC-DirQueue

Log Message:
Directory /cvs/pkgs/rpms/perl-IPC-DirQueue added to the repository




From kevin at fedoraproject.org  Sat Sep 26 02:48:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:48:38 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/devel - New directory
Message-ID: <20090926024838.3C06B11C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12024/rpms/perl-IPC-DirQueue/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-IPC-DirQueue/devel added to the repository




From kevin at fedoraproject.org  Sat Sep 26 02:48:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:48:45 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue Makefile,NONE,1.1
Message-ID: <20090926024845.5C55011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12024/rpms/perl-IPC-DirQueue

Added Files:
	Makefile 
Log Message:
Setup of module perl-IPC-DirQueue


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-DirQueue
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  Sat Sep 26 02:48:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 02:48:45 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090926024845.AFFD811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12024/rpms/perl-IPC-DirQueue/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-DirQueue


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-IPC-DirQueue
# $Id: Makefile,v 1.1 2009/09/26 02:48:45 kevin Exp $
NAME := perl-IPC-DirQueue
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  Sat Sep 26 02:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 02:49:07 +0000
Subject: [pkgdb] koffice (Fedora, 12) updated by kevin
Message-ID: <20090926024907.2572110F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for koffice
kevin has set commit to Approved for 107427 on koffice (Fedora 12)
kevin has set checkout to Approved for 107427 on koffice (Fedora 12)
kevin has set build to Approved for 107427 on koffice (Fedora 12)
kevin changed owner of koffice in Fedora 12 to rdieter
kevin approved watchbugzilla on koffice (Fedora 12) for awjb
kevin approved watchcommits on koffice (Fedora 12) for awjb
kevin approved commit on koffice (Fedora 12) for awjb
kevin approved build on koffice (Fedora 12) for awjb
kevin approved approveacls on koffice (Fedora 12) for awjb
kevin approved watchbugzilla on koffice (Fedora 12) for tuxbrewr
kevin approved watchcommits on koffice (Fedora 12) for tuxbrewr
kevin approved commit on koffice (Fedora 12) for tuxbrewr
kevin approved build on koffice (Fedora 12) for tuxbrewr
kevin approved approveacls on koffice (Fedora 12) for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/koffice



From bpepple at fedoraproject.org  Sat Sep 26 03:03:26 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 26 Sep 2009 03:03:26 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel telepathy-mission-control.spec,
	1.24, 1.25
Message-ID: <20090926030326.8186511C00E8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15751

Modified Files:
	telepathy-mission-control.spec 
Log Message:
* Fri Sep 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:5.2.5-2
- Add the epoch to the devel requires.



Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- telepathy-mission-control.spec	25 Sep 2009 01:27:50 -0000	1.24
+++ telepathy-mission-control.spec	26 Sep 2009 03:03:25 -0000	1.25
@@ -1,7 +1,7 @@
 Name:           telepathy-mission-control
 Version:        5.2.5
 Epoch:          1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Central control for Telepathy connection manager
 
 Group:          System Environment/Libraries
@@ -26,7 +26,7 @@ account definitions and credentials.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       dbus-devel
 Requires:       dbus-glib-devel
 Requires:       telepathy-glib-devel >= 0.7.32
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:5.2.5-2
+- Add the epoch to the devel requires.
+
 * Thu Sep 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:5.2.5-1
 - Update to 5.2.5.
 - Add epoch so we don't ship the devel branch of mission control for F12.



From dcantrel at fedoraproject.org  Sat Sep 26 03:45:17 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 26 Sep 2009 03:45:17 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.672, 1.673 anaconda.spec, 1.822, 
	1.823 sources, 1.806, 1.807
Message-ID: <20090926034517.E40A411C00E8@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27016

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Sep 25 2009 David Cantrell <dcantrell at redhat.com> - 12.31-1
- Move S390MODS to inside makeBootImages(), remove libiscsi_tcp. (dcantrell)
- Require the latest and greatest python-meh. (clumens)
- Add a stub enableNetwork method for cmdline mode (#525779). (clumens)
- Adapt to python-meh passing a bug description around. (clumens)
- Return None for next part type if all primary slots full. (#524859)
  (dlehman)
- Make sure the Minimal group is selected by default on RHEL installs
  (#524561). (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -p -r1.672 -r1.673
--- .cvsignore	24 Sep 2009 14:14:17 -0000	1.672
+++ .cvsignore	26 Sep 2009 03:45:15 -0000	1.673
@@ -1,2 +1 @@
-anaconda-12.29.tar.bz2
-anaconda-12.30.tar.bz2
+anaconda-12.31.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -p -r1.822 -r1.823
--- anaconda.spec	24 Sep 2009 14:14:17 -0000	1.822
+++ anaconda.spec	26 Sep 2009 03:45:16 -0000	1.823
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.30
+Version: 12.31
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -43,6 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define yumutilsver 1.1.11-3
 %define iscsiver 6.2.0.870-3
 %define pythoncryptsetupver 0.0.6
+%define mehver 0.4
 
 BuildRequires: audit-libs-devel
 BuildRequires: bzip2-devel
@@ -83,7 +84,7 @@ BuildRequires: iscsi-initiator-utils-dev
 BuildRequires: s390utils-devel
 %endif
 
-Requires: python-meh
+Requires: python-meh >= %{mehver}
 Requires: policycoreutils
 Requires: rpm-python >= %{rpmpythonver}
 Requires: comps-extras
@@ -214,6 +215,16 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Sep 25 2009 David Cantrell <dcantrell at redhat.com> - 12.31-1
+- Move S390MODS to inside makeBootImages(), remove libiscsi_tcp. (dcantrell)
+- Require the latest and greatest python-meh. (clumens)
+- Add a stub enableNetwork method for cmdline mode (#525779). (clumens)
+- Adapt to python-meh passing a bug description around. (clumens)
+- Return None for next part type if all primary slots full. (#524859)
+  (dlehman)
+- Make sure the Minimal group is selected by default on RHEL installs
+  (#524561). (clumens)
+
 * Thu Sep 24 2009 Chris Lumens <clumens at redhat.com> - 12.30-1
 - Simplify s390x module list generation. (dcantrell)
 - Read cmsfs* commands from $IMGPATH/usr/sbin in mk-images (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -p -r1.806 -r1.807
--- sources	24 Sep 2009 14:14:17 -0000	1.806
+++ sources	26 Sep 2009 03:45:16 -0000	1.807
@@ -1 +1 @@
-512e0594e6caf2015f0f7d2472061a73  anaconda-12.30.tar.bz2
+8e4a7cf339c3787e781652fe25adc8b3  anaconda-12.31.tar.bz2



From mycae at fedoraproject.org  Sat Sep 26 04:32:11 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 26 Sep 2009 04:32:11 +0000 (UTC)
Subject: rpms/skinlf/devel .cvsignore, 1.2, 1.3 skinlf-nosun-jimi-patch.patch,
	1.1, 1.2 skinlf-sun-jdk1.5-xpath-patch.patch, 1.1,
	1.2 skinlf.spec, 1.3, 1.4 sources, 1.2,
	1.3 skinlf-build-xml-patch.patch, 1.1,
	NONE skinlf-common-xml-patch.patch, 1.1,
	NONE skinlf-generate-tarball.sh, 1.1, NONE
Message-ID: <20090926043211.DFC3811C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29347

Modified Files:
	.cvsignore skinlf-nosun-jimi-patch.patch 
	skinlf-sun-jdk1.5-xpath-patch.patch skinlf.spec sources 
Removed Files:
	skinlf-build-xml-patch.patch skinlf-common-xml-patch.patch 
	skinlf-generate-tarball.sh 
Log Message:
* Update to newer version of skinlf to address bug 524784
* skinlf-generate-tarball.sh moved to lookaside cache
* Removed xml patches, as now using CVS
* Convert build patches to unix endlines



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 12:31:46 -0000	1.2
+++ .cvsignore	26 Sep 2009 04:32:11 -0000	1.3
@@ -1 +1,2 @@
-skinlf-6.7-clean.tar.gz
+skinlf-6.7cvs20090501-clean.tar.gz
+skinlf-generate-cvs-tarball.sh

skinlf-nosun-jimi-patch.patch:
 ImageUtils.java |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Index: skinlf-nosun-jimi-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf-nosun-jimi-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-nosun-jimi-patch.patch	18 Dec 2008 12:31:46 -0000	1.1
+++ skinlf-nosun-jimi-patch.patch	26 Sep 2009 04:32:11 -0000	1.2
@@ -1,77 +1,77 @@
 --- src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
 +++ src/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
 @@ -6,15 +6,11 @@
- 
- import javax.swing.ImageIcon;
- 
--import com.ibm.imageconversion.*;
--import com.sun.jimi.core.*;
--
-+import javax.imageio.*;
- public class ImageUtils {
- 
-   public static Component bitmapCreator = new javax.swing.JLabel();
-   
--  static BMPDecoder decoder = new BMPDecoder();
--  static BMPEncoder encoder = new BMPEncoder();
- 
-   public static Image loadPng(String pathToImage) throws Exception {
-     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
+ 
+ import javax.swing.ImageIcon;
+ 
+-import com.ibm.imageconversion.*;
+-import com.sun.jimi.core.*;
+-
++import javax.imageio.*;
+ public class ImageUtils {
+ 
+   public static Component bitmapCreator = new javax.swing.JLabel();
+   
+-  static BMPDecoder decoder = new BMPDecoder();
+-  static BMPEncoder encoder = new BMPEncoder();
+ 
+   public static Image loadPng(String pathToImage) throws Exception {
+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
 @@ -22,29 +18,34 @@
-   }
- 
-   public static void savePng(Image image, String pathToImage) throws Exception {
--    Jimi.putImage(image, pathToImage);
-+    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
-   }
- 
-+  private static String getFileFmt(String pathToImage) throws Exception {
-+    String fmt;
-+    if (pathToImage.toLowerCase().endsWith(".png")) {
-+      return "png";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".gif")) {
-+      return "gif";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".bmp")) {
-+      return "bmp";
-+    }
-+    return "";
-+  }
-+  
-   public static void createPicture(String pathToImage, int index, int maxParts,
-                                    String filename, boolean horizontal) {
-     try {
-       System.out.println("working with " + pathToImage);
-       Image image = null;
- 
--      if (pathToImage.toLowerCase().endsWith(".png") ||
--        	pathToImage.toLowerCase().endsWith(".gif")) {
--        image = loadPng(pathToImage);
--      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
--        decoder.setInputFilename(pathToImage);
--        decoder.triggerAction();
--        image = decoder.getResult();
--      } else {
--        throw new Error("do not know how to load " + pathToImage);
--      }
- 
-+      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
-       // if only one image, dump it as it
--	    if (index == 0 && maxParts == 1) {
--        Jimi.putImage(image, filename);
-+      if (index == 0 && maxParts == 1) {
-+        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       } else {
-         if (horizontal) {
-           int partHeight = image.getHeight(bitmapCreator) / maxParts;
+   }
+ 
+   public static void savePng(Image image, String pathToImage) throws Exception {
+-    Jimi.putImage(image, pathToImage);
++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
+   }
+ 
++  private static String getFileFmt(String pathToImage) throws Exception {
++    String fmt;
++    if (pathToImage.toLowerCase().endsWith(".png")) {
++      return "png";
++    }
++    if (pathToImage.toLowerCase().endsWith(".gif")) {
++      return "gif";
++    }
++    if (pathToImage.toLowerCase().endsWith(".bmp")) {
++      return "bmp";
++    }
++    return "";
++  }
++  
+   public static void createPicture(String pathToImage, int index, int maxParts,
+                                    String filename, boolean horizontal) {
+     try {
+       System.out.println("working with " + pathToImage);
+       Image image = null;
+ 
+-      if (pathToImage.toLowerCase().endsWith(".png") ||
+-        	pathToImage.toLowerCase().endsWith(".gif")) {
+-        image = loadPng(pathToImage);
+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
+-        decoder.setInputFilename(pathToImage);
+-        decoder.triggerAction();
+-        image = decoder.getResult();
+-      } else {
+-        throw new Error("do not know how to load " + pathToImage);
+-      }
+ 
++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
+       // if only one image, dump it as it
+-	    if (index == 0 && maxParts == 1) {
+-        Jimi.putImage(image, filename);
++      if (index == 0 && maxParts == 1) {
++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+       } else {
+         if (horizontal) {
+           int partHeight = image.getHeight(bitmapCreator) / maxParts;
 @@ -55,8 +56,8 @@
-           image = grab(image, partWidth * index, 0,
-                        partWidth, image.getHeight(bitmapCreator));
-         }
--        Jimi.putImage(image, filename);
-       }
-+	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-     } catch (Exception e) {
-       System.out.println("error while working with " + pathToImage);
- 	    e.printStackTrace();
+           image = grab(image, partWidth * index, 0,
+                        partWidth, image.getHeight(bitmapCreator));
+         }
+-        Jimi.putImage(image, filename);
+       }
++	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+     } catch (Exception e) {
+       System.out.println("error while working with " + pathToImage);
+ 	    e.printStackTrace();

skinlf-sun-jdk1.5-xpath-patch.patch:
 MsStylesToSkinLF.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: skinlf-sun-jdk1.5-xpath-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf-sun-jdk1.5-xpath-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-sun-jdk1.5-xpath-patch.patch	18 Dec 2008 12:31:46 -0000	1.1
+++ skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 04:32:11 -0000	1.2
@@ -1,11 +1,11 @@
 --- src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
 +++ src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
 @@ -9,7 +9,7 @@
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
- 
--import org.apache.xpath.XPathAPI;
-+import com.sun.org.apache.xpath.internal.XPathAPI;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- 
+ import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+ 
+-import org.apache.xpath.XPathAPI;
++import com.sun.org.apache.xpath.internal.XPathAPI;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skinlf.spec	27 Jul 2009 04:24:51 -0000	1.3
+++ skinlf.spec	26 Sep 2009 04:32:11 -0000	1.4
@@ -1,18 +1,20 @@
+%define cvsver cvs20090501
+
 Name:		skinlf	
 Version:	6.7
-Release:	8%{?dist}
+Release:	9.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
-License:	ASL 2.0 and zlib and ASL 1.1
+License:	ASL 2.0
 URL:		http://skinlf.dev.java.net/	
 
-Source0: %{name}-%{version}-clean.tar.gz
+Source0:	%{name}-%{version}%{cvsver}-clean.tar.gz
 # Original Source# Contains code that we cannot ship. 
 # Download the upstream tarball and invoke this script while in the
-# tarball's directory
-# ./skinlf-generate-tarball.sh 6.7-20060722 
-Source1: %{name}-generate-tarball.sh
+# tarball's directory. Must perform co as specified in sh file.
+# ./skinlf-generate-cvs-tarball.sh
+Source1:	%{name}-generate-cvs-tarball.sh
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,23 +24,20 @@ BuildArch:	noarch
 #for patchset maintained by Scilab developer, Sylvestre Ledru.
 # These patches have been modified.
 Patch0:		skinlf-nosun-jimi-patch.patch	
-#Release file does not contain building tools. thats CVS only. Don't know which CVS revision to check out for release CVS.
-Patch1:		skinlf-build-xml-patch.patch
-#Create common.xml as release omits building tools
-Patch2:		skinlf-common-xml-patch.patch
 #org.apache.xpath has been removed from JDK1.5 and above
 #patch to use com.sun.org.apache.xpath.internal.XPathAPI instead 
-Patch3:		skinlf-sun-jdk1.5-xpath-patch.patch
+Patch1:		skinlf-sun-jdk1.5-xpath-patch.patch
 
 BuildRequires:	ant-nodeps
 BuildRequires:	laf-plugin
 BuildRequires:	dos2unix
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  ant
+BuildRequires:	java-devel >= 1:1.6.0
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
+
 #This depends upon laf-plugin
 #https://bugzilla.redhat.com/show_bug.cgi?id=461407
 Requires:	laf-plugin
@@ -47,36 +46,34 @@ Requires:	laf-plugin
 
 
 %description
-Skin Look And Feel is a java framework that is  able to read GTK (The
+Skin Look And Feel is a java framework that is able to read GTK (The
 Gimp ToolKit) and KDE (The K Desktop Environment) skins to enhance
 your application.
 SkinLF supports GUI controls such as Buttons, Checks, Radios, Scrollbars,
-Progress Bar, Lists,  Tables, Internal Frames, Colors, Background
+Progress Bar, Lists, Tables, Internal Frames, Colors, Background
 Textures, Regular Windows.
 
 %prep
-%setup -q
+%setup -q -n %{name} 
 %patch0
-
-#building patches
 %patch1
-%patch2
-#Code fixing
-%patch3
 
-#dos2unix Doc files
-for i in "CHANGES README LICENSE LICENSE_nanoxml" ;
+#convert Doc files to unix format
+for file in AUTHORS README LICENSE LICENSE_nanoxml ;
 do
-	dos2unix -d2u $i;
+	sed 's/\r//' $file > $file.new && \
+	touch -r $file $file.new && \
+	mv $file.new $file
 done
 
 #Remove jar files
 rm -f ./lib/examples.jar 
 rm -f ./lib/nativeskin.jar 
 rm -f ./lib/skinlf.jar 
-
-#rm due to dubious license
-rm -f ./src/examples/Clock.java
+rm -f ./lib/sunawt.jar
+rm -f ./lib/laf-plugin*.jar
+rm -f ./lib/proguard.jar
+rm -f ./lib/imageconversion.jar
 
 #Sanitise package -- disallow jar files
 JAR_files=""
@@ -92,8 +89,10 @@ if [ ! -z "$JAR_files" ] ; then
 	exit 1
 fi
 
+
 %build
-ant 
+export CLASSPATH=$(build-classpath laf-plugin)
+ant -Dbuild.sysclasspath=first
 #Construct-a-jar Dont use ant jar as it tries to unpack laf-plugin
 pushd build/classes
 jar cf %{name}-%{version}.jar .
@@ -113,23 +112,27 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README LICENSE  LICENSE_nanoxml
+%doc README LICENSE LICENSE_nanoxml
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+- Modify to ASL 2.0, upstream has relicenced - fix bug #524784
+- Use CVS co, as upstream does not provide release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-*Sat Dec 06 2008  <mycae(a!t)yahoo.com> 6.7-6
+*Sat Dec 06 2008 <mycae(a!t)yahoo.com> 6.7-6
 - Fixed jar dir
 - Changed primary jar to name-version.jar, & linked.
 - Added clean tarball generator 
 
-* Wed Dec 03 2008  <mycae(a!t)yahoo.com> 6.7-5
+* Wed Dec 03 2008 <mycae(a!t)yahoo.com> 6.7-5
 - Added LICENSE_nanoxml
 - Updated licence spec line to include ASL 1.1 & zlib
 - removed Clock.java due to incompatible license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Dec 2008 12:31:46 -0000	1.2
+++ sources	26 Sep 2009 04:32:11 -0000	1.3
@@ -1 +1,2 @@
-3ef43d0f1941b1e338292ce041e57da0  skinlf-6.7-clean.tar.gz
+8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
+8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh


--- skinlf-build-xml-patch.patch DELETED ---


--- skinlf-common-xml-patch.patch DELETED ---


--- skinlf-generate-tarball.sh DELETED ---



From mycae at fedoraproject.org  Sat Sep 26 04:41:50 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 26 Sep 2009 04:41:50 +0000 (UTC)
Subject: rpms/skinlf/devel skinlf-nosun-jimi-patch.patch, 1.2,
	1.3 skinlf-sun-jdk1.5-xpath-patch.patch, 1.2, 1.3
Message-ID: <20090926044150.451E511C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32520

Modified Files:
	skinlf-nosun-jimi-patch.patch 
	skinlf-sun-jdk1.5-xpath-patch.patch 
Log Message:
* Fix patches tld


skinlf-nosun-jimi-patch.patch:
 ImageUtils.java |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Index: skinlf-nosun-jimi-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf-nosun-jimi-patch.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skinlf-nosun-jimi-patch.patch	26 Sep 2009 04:32:11 -0000	1.2
+++ skinlf-nosun-jimi-patch.patch	26 Sep 2009 04:41:49 -0000	1.3
@@ -1,5 +1,5 @@
---- src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
-+++ src/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
+--- src/main/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
++++ src/main/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
 @@ -6,15 +6,11 @@
  
  import javax.swing.ImageIcon;

skinlf-sun-jdk1.5-xpath-patch.patch:
 MsStylesToSkinLF.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: skinlf-sun-jdk1.5-xpath-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf-sun-jdk1.5-xpath-patch.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 04:32:11 -0000	1.2
+++ skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 04:41:49 -0000	1.3
@@ -1,5 +1,5 @@
---- src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
-+++ src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
+--- src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
++++ src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
 @@ -9,7 +9,7 @@
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;



From mycae at fedoraproject.org  Sat Sep 26 05:08:41 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 26 Sep 2009 05:08:41 +0000 (UTC)
Subject: rpms/skinlf/F-9 .cvsignore, 1.2, 1.3 skinlf-nosun-jimi-patch.patch, 
	1.1, 1.2 skinlf-sun-jdk1.5-xpath-patch.patch, 1.1,
	1.2 skinlf.spec, 1.1, 1.2 sources, 1.2,
	1.3 skinlf-build-xml-patch.patch, 1.1,
	NONE skinlf-common-xml-patch.patch, 1.1,
	NONE skinlf-generate-tarball.sh, 1.1, NONE
Message-ID: <20090926050842.035DF11C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6500

Modified Files:
	.cvsignore skinlf-nosun-jimi-patch.patch 
	skinlf-sun-jdk1.5-xpath-patch.patch skinlf.spec sources 
Removed Files:
	skinlf-build-xml-patch.patch skinlf-common-xml-patch.patch 
	skinlf-generate-tarball.sh 
Log Message:
* Update to CVS : address bug 524784



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2008 10:22:56 -0000	1.2
+++ .cvsignore	26 Sep 2009 05:08:40 -0000	1.3
@@ -1 +1,2 @@
-skinlf-6.7-clean.tar.gz
+skinlf-6.7cvs20090501-clean.tar.gz
+skinlf-generate-cvs-tarball.sh

skinlf-nosun-jimi-patch.patch:
 ImageUtils.java |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Index: skinlf-nosun-jimi-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/skinlf-nosun-jimi-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-nosun-jimi-patch.patch	14 Dec 2008 10:22:57 -0000	1.1
+++ skinlf-nosun-jimi-patch.patch	26 Sep 2009 05:08:41 -0000	1.2
@@ -1,77 +1,77 @@
---- src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
-+++ src/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
+--- src/main/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
++++ src/main/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
 @@ -6,15 +6,11 @@
- 
- import javax.swing.ImageIcon;
- 
--import com.ibm.imageconversion.*;
--import com.sun.jimi.core.*;
--
-+import javax.imageio.*;
- public class ImageUtils {
- 
-   public static Component bitmapCreator = new javax.swing.JLabel();
-   
--  static BMPDecoder decoder = new BMPDecoder();
--  static BMPEncoder encoder = new BMPEncoder();
- 
-   public static Image loadPng(String pathToImage) throws Exception {
-     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
+ 
+ import javax.swing.ImageIcon;
+ 
+-import com.ibm.imageconversion.*;
+-import com.sun.jimi.core.*;
+-
++import javax.imageio.*;
+ public class ImageUtils {
+ 
+   public static Component bitmapCreator = new javax.swing.JLabel();
+   
+-  static BMPDecoder decoder = new BMPDecoder();
+-  static BMPEncoder encoder = new BMPEncoder();
+ 
+   public static Image loadPng(String pathToImage) throws Exception {
+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
 @@ -22,29 +18,34 @@
-   }
- 
-   public static void savePng(Image image, String pathToImage) throws Exception {
--    Jimi.putImage(image, pathToImage);
-+    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
-   }
- 
-+  private static String getFileFmt(String pathToImage) throws Exception {
-+    String fmt;
-+    if (pathToImage.toLowerCase().endsWith(".png")) {
-+      return "png";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".gif")) {
-+      return "gif";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".bmp")) {
-+      return "bmp";
-+    }
-+    return "";
-+  }
-+  
-   public static void createPicture(String pathToImage, int index, int maxParts,
-                                    String filename, boolean horizontal) {
-     try {
-       System.out.println("working with " + pathToImage);
-       Image image = null;
- 
--      if (pathToImage.toLowerCase().endsWith(".png") ||
--        	pathToImage.toLowerCase().endsWith(".gif")) {
--        image = loadPng(pathToImage);
--      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
--        decoder.setInputFilename(pathToImage);
--        decoder.triggerAction();
--        image = decoder.getResult();
--      } else {
--        throw new Error("do not know how to load " + pathToImage);
--      }
- 
-+      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
-       // if only one image, dump it as it
--	    if (index == 0 && maxParts == 1) {
--        Jimi.putImage(image, filename);
-+      if (index == 0 && maxParts == 1) {
-+        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       } else {
-         if (horizontal) {
-           int partHeight = image.getHeight(bitmapCreator) / maxParts;
+   }
+ 
+   public static void savePng(Image image, String pathToImage) throws Exception {
+-    Jimi.putImage(image, pathToImage);
++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
+   }
+ 
++  private static String getFileFmt(String pathToImage) throws Exception {
++    String fmt;
++    if (pathToImage.toLowerCase().endsWith(".png")) {
++      return "png";
++    }
++    if (pathToImage.toLowerCase().endsWith(".gif")) {
++      return "gif";
++    }
++    if (pathToImage.toLowerCase().endsWith(".bmp")) {
++      return "bmp";
++    }
++    return "";
++  }
++  
+   public static void createPicture(String pathToImage, int index, int maxParts,
+                                    String filename, boolean horizontal) {
+     try {
+       System.out.println("working with " + pathToImage);
+       Image image = null;
+ 
+-      if (pathToImage.toLowerCase().endsWith(".png") ||
+-        	pathToImage.toLowerCase().endsWith(".gif")) {
+-        image = loadPng(pathToImage);
+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
+-        decoder.setInputFilename(pathToImage);
+-        decoder.triggerAction();
+-        image = decoder.getResult();
+-      } else {
+-        throw new Error("do not know how to load " + pathToImage);
+-      }
+ 
++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
+       // if only one image, dump it as it
+-	    if (index == 0 && maxParts == 1) {
+-        Jimi.putImage(image, filename);
++      if (index == 0 && maxParts == 1) {
++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+       } else {
+         if (horizontal) {
+           int partHeight = image.getHeight(bitmapCreator) / maxParts;
 @@ -55,8 +56,8 @@
-           image = grab(image, partWidth * index, 0,
-                        partWidth, image.getHeight(bitmapCreator));
-         }
--        Jimi.putImage(image, filename);
-       }
-+	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-     } catch (Exception e) {
-       System.out.println("error while working with " + pathToImage);
- 	    e.printStackTrace();
+           image = grab(image, partWidth * index, 0,
+                        partWidth, image.getHeight(bitmapCreator));
+         }
+-        Jimi.putImage(image, filename);
+       }
++	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+     } catch (Exception e) {
+       System.out.println("error while working with " + pathToImage);
+ 	    e.printStackTrace();

skinlf-sun-jdk1.5-xpath-patch.patch:
 MsStylesToSkinLF.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: skinlf-sun-jdk1.5-xpath-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/skinlf-sun-jdk1.5-xpath-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-sun-jdk1.5-xpath-patch.patch	14 Dec 2008 10:22:57 -0000	1.1
+++ skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 05:08:41 -0000	1.2
@@ -1,11 +1,11 @@
---- src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
-+++ src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
+--- src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
++++ src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
 @@ -9,7 +9,7 @@
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
- 
--import org.apache.xpath.XPathAPI;
-+import com.sun.org.apache.xpath.internal.XPathAPI;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- 
+ import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+ 
+-import org.apache.xpath.XPathAPI;
++import com.sun.org.apache.xpath.internal.XPathAPI;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/skinlf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf.spec	14 Dec 2008 10:22:57 -0000	1.1
+++ skinlf.spec	26 Sep 2009 05:08:41 -0000	1.2
@@ -1,18 +1,20 @@
+%define cvsver cvs20090501
+
 Name:		skinlf	
 Version:	6.7
-Release:	6%{?dist}
+Release:	9.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
-License:	ASL 2.0 and zlib and ASL 1.1
+License:	ASL 2.0
 URL:		http://skinlf.dev.java.net/	
 
-Source0: %{name}-%{version}-clean.tar.gz
+Source0:	%{name}-%{version}%{cvsver}-clean.tar.gz
 # Original Source# Contains code that we cannot ship. 
 # Download the upstream tarball and invoke this script while in the
-# tarball's directory
-# ./skinlf-generate-tarball.sh 6.7-20060722 
-Source1: %{name}-generate-tarball.sh
+# tarball's directory. Must perform co as specified in sh file.
+# ./skinlf-generate-cvs-tarball.sh
+Source1:	%{name}-generate-cvs-tarball.sh
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,23 +24,20 @@ BuildArch:	noarch
 #for patchset maintained by Scilab developer, Sylvestre Ledru.
 # These patches have been modified.
 Patch0:		skinlf-nosun-jimi-patch.patch	
-#Release file does not contain building tools. thats CVS only. Don't know which CVS revision to check out for release CVS.
-Patch1:		skinlf-build-xml-patch.patch
-#Create common.xml as release omits building tools
-Patch2:		skinlf-common-xml-patch.patch
 #org.apache.xpath has been removed from JDK1.5 and above
 #patch to use com.sun.org.apache.xpath.internal.XPathAPI instead 
-Patch3:		skinlf-sun-jdk1.5-xpath-patch.patch
+Patch1:		skinlf-sun-jdk1.5-xpath-patch.patch
 
 BuildRequires:	ant-nodeps
 BuildRequires:	laf-plugin
 BuildRequires:	dos2unix
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  ant
+BuildRequires:	java-devel >= 1:1.6.0
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
+
 #This depends upon laf-plugin
 #https://bugzilla.redhat.com/show_bug.cgi?id=461407
 Requires:	laf-plugin
@@ -47,36 +46,34 @@ Requires:	laf-plugin
 
 
 %description
-Skin Look And Feel is a java framework that is  able to read GTK (The
+Skin Look And Feel is a java framework that is able to read GTK (The
 Gimp ToolKit) and KDE (The K Desktop Environment) skins to enhance
 your application.
 SkinLF supports GUI controls such as Buttons, Checks, Radios, Scrollbars,
-Progress Bar, Lists,  Tables, Internal Frames, Colors, Background
+Progress Bar, Lists, Tables, Internal Frames, Colors, Background
 Textures, Regular Windows.
 
 %prep
-%setup -q
+%setup -q -n %{name} 
 %patch0
-
-#building patches
 %patch1
-%patch2
-#Code fixing
-%patch3
 
-#dos2unix Doc files
-for i in "CHANGES README LICENSE LICENSE_nanoxml" ;
+#convert Doc files to unix format
+for file in AUTHORS README LICENSE LICENSE_nanoxml ;
 do
-	dos2unix -d2u $i;
+	sed 's/\r//' $file > $file.new && \
+	touch -r $file $file.new && \
+	mv $file.new $file
 done
 
 #Remove jar files
 rm -f ./lib/examples.jar 
 rm -f ./lib/nativeskin.jar 
 rm -f ./lib/skinlf.jar 
-
-#rm due to dubious license
-rm -f ./src/examples/Clock.java
+rm -f ./lib/sunawt.jar
+rm -f ./lib/laf-plugin*.jar
+rm -f ./lib/proguard.jar
+rm -f ./lib/imageconversion.jar
 
 #Sanitise package -- disallow jar files
 JAR_files=""
@@ -92,8 +89,10 @@ if [ ! -z "$JAR_files" ] ; then
 	exit 1
 fi
 
+
 %build
-ant 
+export CLASSPATH=$(build-classpath laf-plugin)
+ant -Dbuild.sysclasspath=first
 #Construct-a-jar Dont use ant jar as it tries to unpack laf-plugin
 pushd build/classes
 jar cf %{name}-%{version}.jar .
@@ -113,17 +112,27 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README LICENSE  LICENSE_nanoxml
+%doc README LICENSE LICENSE_nanoxml
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Dec 06 2008  <mycae(a!t)yahoo.com> 6.7-6
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+- Modify to ASL 2.0, upstream has relicenced - fix bug #524784
+- Use CVS co, as upstream does not provide release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+*Sat Dec 06 2008 <mycae(a!t)yahoo.com> 6.7-6
 - Fixed jar dir
 - Changed primary jar to name-version.jar, & linked.
 - Added clean tarball generator 
 
-* Wed Dec 03 2008  <mycae(a!t)yahoo.com> 6.7-5
+* Wed Dec 03 2008 <mycae(a!t)yahoo.com> 6.7-5
 - Added LICENSE_nanoxml
 - Updated licence spec line to include ASL 1.1 & zlib
 - removed Clock.java due to incompatible license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2008 10:22:57 -0000	1.2
+++ sources	26 Sep 2009 05:08:41 -0000	1.3
@@ -1 +1,2 @@
-3ef43d0f1941b1e338292ce041e57da0  skinlf-6.7-clean.tar.gz
+8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
+8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh


--- skinlf-build-xml-patch.patch DELETED ---


--- skinlf-common-xml-patch.patch DELETED ---


--- skinlf-generate-tarball.sh DELETED ---



From mycae at fedoraproject.org  Sat Sep 26 05:11:36 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 26 Sep 2009 05:11:36 +0000 (UTC)
Subject: rpms/skinlf/F-11 .cvsignore, 1.2, 1.3 skinlf-nosun-jimi-patch.patch,
	1.1, 1.2 skinlf-sun-jdk1.5-xpath-patch.patch, 1.1,
	1.2 skinlf.spec, 1.2, 1.3 sources, 1.2,
	1.3 skinlf-build-xml-patch.patch, 1.1,
	NONE skinlf-common-xml-patch.patch, 1.1,
	NONE skinlf-generate-tarball.sh, 1.1, NONE
Message-ID: <20090926051136.677A711C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7306

Modified Files:
	.cvsignore skinlf-nosun-jimi-patch.patch 
	skinlf-sun-jdk1.5-xpath-patch.patch skinlf.spec sources 
Removed Files:
	skinlf-build-xml-patch.patch skinlf-common-xml-patch.patch 
	skinlf-generate-tarball.sh 
Log Message:
* Update to CVS release. Address Bug 524784



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 12:31:46 -0000	1.2
+++ .cvsignore	26 Sep 2009 05:11:35 -0000	1.3
@@ -1 +1,2 @@
-skinlf-6.7-clean.tar.gz
+skinlf-6.7cvs20090501-clean.tar.gz
+skinlf-generate-cvs-tarball.sh

skinlf-nosun-jimi-patch.patch:
 ImageUtils.java |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Index: skinlf-nosun-jimi-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf-nosun-jimi-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-nosun-jimi-patch.patch	18 Dec 2008 12:31:46 -0000	1.1
+++ skinlf-nosun-jimi-patch.patch	26 Sep 2009 05:11:35 -0000	1.2
@@ -1,77 +1,77 @@
---- src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
-+++ src/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
+--- src/main/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
++++ src/main/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
 @@ -6,15 +6,11 @@
- 
- import javax.swing.ImageIcon;
- 
--import com.ibm.imageconversion.*;
--import com.sun.jimi.core.*;
--
-+import javax.imageio.*;
- public class ImageUtils {
- 
-   public static Component bitmapCreator = new javax.swing.JLabel();
-   
--  static BMPDecoder decoder = new BMPDecoder();
--  static BMPEncoder encoder = new BMPEncoder();
- 
-   public static Image loadPng(String pathToImage) throws Exception {
-     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
+ 
+ import javax.swing.ImageIcon;
+ 
+-import com.ibm.imageconversion.*;
+-import com.sun.jimi.core.*;
+-
++import javax.imageio.*;
+ public class ImageUtils {
+ 
+   public static Component bitmapCreator = new javax.swing.JLabel();
+   
+-  static BMPDecoder decoder = new BMPDecoder();
+-  static BMPEncoder encoder = new BMPEncoder();
+ 
+   public static Image loadPng(String pathToImage) throws Exception {
+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
 @@ -22,29 +18,34 @@
-   }
- 
-   public static void savePng(Image image, String pathToImage) throws Exception {
--    Jimi.putImage(image, pathToImage);
-+    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
-   }
- 
-+  private static String getFileFmt(String pathToImage) throws Exception {
-+    String fmt;
-+    if (pathToImage.toLowerCase().endsWith(".png")) {
-+      return "png";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".gif")) {
-+      return "gif";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".bmp")) {
-+      return "bmp";
-+    }
-+    return "";
-+  }
-+  
-   public static void createPicture(String pathToImage, int index, int maxParts,
-                                    String filename, boolean horizontal) {
-     try {
-       System.out.println("working with " + pathToImage);
-       Image image = null;
- 
--      if (pathToImage.toLowerCase().endsWith(".png") ||
--        	pathToImage.toLowerCase().endsWith(".gif")) {
--        image = loadPng(pathToImage);
--      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
--        decoder.setInputFilename(pathToImage);
--        decoder.triggerAction();
--        image = decoder.getResult();
--      } else {
--        throw new Error("do not know how to load " + pathToImage);
--      }
- 
-+      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
-       // if only one image, dump it as it
--	    if (index == 0 && maxParts == 1) {
--        Jimi.putImage(image, filename);
-+      if (index == 0 && maxParts == 1) {
-+        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       } else {
-         if (horizontal) {
-           int partHeight = image.getHeight(bitmapCreator) / maxParts;
+   }
+ 
+   public static void savePng(Image image, String pathToImage) throws Exception {
+-    Jimi.putImage(image, pathToImage);
++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
+   }
+ 
++  private static String getFileFmt(String pathToImage) throws Exception {
++    String fmt;
++    if (pathToImage.toLowerCase().endsWith(".png")) {
++      return "png";
++    }
++    if (pathToImage.toLowerCase().endsWith(".gif")) {
++      return "gif";
++    }
++    if (pathToImage.toLowerCase().endsWith(".bmp")) {
++      return "bmp";
++    }
++    return "";
++  }
++  
+   public static void createPicture(String pathToImage, int index, int maxParts,
+                                    String filename, boolean horizontal) {
+     try {
+       System.out.println("working with " + pathToImage);
+       Image image = null;
+ 
+-      if (pathToImage.toLowerCase().endsWith(".png") ||
+-        	pathToImage.toLowerCase().endsWith(".gif")) {
+-        image = loadPng(pathToImage);
+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
+-        decoder.setInputFilename(pathToImage);
+-        decoder.triggerAction();
+-        image = decoder.getResult();
+-      } else {
+-        throw new Error("do not know how to load " + pathToImage);
+-      }
+ 
++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
+       // if only one image, dump it as it
+-	    if (index == 0 && maxParts == 1) {
+-        Jimi.putImage(image, filename);
++      if (index == 0 && maxParts == 1) {
++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+       } else {
+         if (horizontal) {
+           int partHeight = image.getHeight(bitmapCreator) / maxParts;
 @@ -55,8 +56,8 @@
-           image = grab(image, partWidth * index, 0,
-                        partWidth, image.getHeight(bitmapCreator));
-         }
--        Jimi.putImage(image, filename);
-       }
-+	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-     } catch (Exception e) {
-       System.out.println("error while working with " + pathToImage);
- 	    e.printStackTrace();
+           image = grab(image, partWidth * index, 0,
+                        partWidth, image.getHeight(bitmapCreator));
+         }
+-        Jimi.putImage(image, filename);
+       }
++	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+     } catch (Exception e) {
+       System.out.println("error while working with " + pathToImage);
+ 	    e.printStackTrace();

skinlf-sun-jdk1.5-xpath-patch.patch:
 MsStylesToSkinLF.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: skinlf-sun-jdk1.5-xpath-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf-sun-jdk1.5-xpath-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-sun-jdk1.5-xpath-patch.patch	18 Dec 2008 12:31:46 -0000	1.1
+++ skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 05:11:36 -0000	1.2
@@ -1,11 +1,11 @@
---- src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
-+++ src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
+--- src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
++++ src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
 @@ -9,7 +9,7 @@
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
- 
--import org.apache.xpath.XPathAPI;
-+import com.sun.org.apache.xpath.internal.XPathAPI;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- 
+ import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+ 
+-import org.apache.xpath.XPathAPI;
++import com.sun.org.apache.xpath.internal.XPathAPI;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skinlf.spec	26 Feb 2009 01:22:30 -0000	1.2
+++ skinlf.spec	26 Sep 2009 05:11:36 -0000	1.3
@@ -1,18 +1,20 @@
+%define cvsver cvs20090501
+
 Name:		skinlf	
 Version:	6.7
-Release:	7%{?dist}
+Release:	9.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
-License:	ASL 2.0 and zlib and ASL 1.1
+License:	ASL 2.0
 URL:		http://skinlf.dev.java.net/	
 
-Source0: %{name}-%{version}-clean.tar.gz
+Source0:	%{name}-%{version}%{cvsver}-clean.tar.gz
 # Original Source# Contains code that we cannot ship. 
 # Download the upstream tarball and invoke this script while in the
-# tarball's directory
-# ./skinlf-generate-tarball.sh 6.7-20060722 
-Source1: %{name}-generate-tarball.sh
+# tarball's directory. Must perform co as specified in sh file.
+# ./skinlf-generate-cvs-tarball.sh
+Source1:	%{name}-generate-cvs-tarball.sh
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,23 +24,20 @@ BuildArch:	noarch
 #for patchset maintained by Scilab developer, Sylvestre Ledru.
 # These patches have been modified.
 Patch0:		skinlf-nosun-jimi-patch.patch	
-#Release file does not contain building tools. thats CVS only. Don't know which CVS revision to check out for release CVS.
-Patch1:		skinlf-build-xml-patch.patch
-#Create common.xml as release omits building tools
-Patch2:		skinlf-common-xml-patch.patch
 #org.apache.xpath has been removed from JDK1.5 and above
 #patch to use com.sun.org.apache.xpath.internal.XPathAPI instead 
-Patch3:		skinlf-sun-jdk1.5-xpath-patch.patch
+Patch1:		skinlf-sun-jdk1.5-xpath-patch.patch
 
 BuildRequires:	ant-nodeps
 BuildRequires:	laf-plugin
 BuildRequires:	dos2unix
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  ant
+BuildRequires:	java-devel >= 1:1.6.0
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
+
 #This depends upon laf-plugin
 #https://bugzilla.redhat.com/show_bug.cgi?id=461407
 Requires:	laf-plugin
@@ -47,36 +46,34 @@ Requires:	laf-plugin
 
 
 %description
-Skin Look And Feel is a java framework that is  able to read GTK (The
+Skin Look And Feel is a java framework that is able to read GTK (The
 Gimp ToolKit) and KDE (The K Desktop Environment) skins to enhance
 your application.
 SkinLF supports GUI controls such as Buttons, Checks, Radios, Scrollbars,
-Progress Bar, Lists,  Tables, Internal Frames, Colors, Background
+Progress Bar, Lists, Tables, Internal Frames, Colors, Background
 Textures, Regular Windows.
 
 %prep
-%setup -q
+%setup -q -n %{name} 
 %patch0
-
-#building patches
 %patch1
-%patch2
-#Code fixing
-%patch3
 
-#dos2unix Doc files
-for i in "CHANGES README LICENSE LICENSE_nanoxml" ;
+#convert Doc files to unix format
+for file in AUTHORS README LICENSE LICENSE_nanoxml ;
 do
-	dos2unix -d2u $i;
+	sed 's/\r//' $file > $file.new && \
+	touch -r $file $file.new && \
+	mv $file.new $file
 done
 
 #Remove jar files
 rm -f ./lib/examples.jar 
 rm -f ./lib/nativeskin.jar 
 rm -f ./lib/skinlf.jar 
-
-#rm due to dubious license
-rm -f ./src/examples/Clock.java
+rm -f ./lib/sunawt.jar
+rm -f ./lib/laf-plugin*.jar
+rm -f ./lib/proguard.jar
+rm -f ./lib/imageconversion.jar
 
 #Sanitise package -- disallow jar files
 JAR_files=""
@@ -92,8 +89,10 @@ if [ ! -z "$JAR_files" ] ; then
 	exit 1
 fi
 
+
 %build
-ant 
+export CLASSPATH=$(build-classpath laf-plugin)
+ant -Dbuild.sysclasspath=first
 #Construct-a-jar Dont use ant jar as it tries to unpack laf-plugin
 pushd build/classes
 jar cf %{name}-%{version}.jar .
@@ -113,20 +112,27 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README LICENSE  LICENSE_nanoxml
+%doc README LICENSE LICENSE_nanoxml
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+- Modify to ASL 2.0, upstream has relicenced - fix bug #524784
+- Use CVS co, as upstream does not provide release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-*Sat Dec 06 2008  <mycae(a!t)yahoo.com> 6.7-6
+*Sat Dec 06 2008 <mycae(a!t)yahoo.com> 6.7-6
 - Fixed jar dir
 - Changed primary jar to name-version.jar, & linked.
 - Added clean tarball generator 
 
-* Wed Dec 03 2008  <mycae(a!t)yahoo.com> 6.7-5
+* Wed Dec 03 2008 <mycae(a!t)yahoo.com> 6.7-5
 - Added LICENSE_nanoxml
 - Updated licence spec line to include ASL 1.1 & zlib
 - removed Clock.java due to incompatible license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Dec 2008 12:31:46 -0000	1.2
+++ sources	26 Sep 2009 05:11:36 -0000	1.3
@@ -1 +1,2 @@
-3ef43d0f1941b1e338292ce041e57da0  skinlf-6.7-clean.tar.gz
+8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
+8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh


--- skinlf-build-xml-patch.patch DELETED ---


--- skinlf-common-xml-patch.patch DELETED ---


--- skinlf-generate-tarball.sh DELETED ---



From mycae at fedoraproject.org  Sat Sep 26 05:12:10 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 26 Sep 2009 05:12:10 +0000 (UTC)
Subject: rpms/skinlf/F-10 .cvsignore, 1.2, 1.3 skinlf-nosun-jimi-patch.patch,
	1.1, 1.2 skinlf-sun-jdk1.5-xpath-patch.patch, 1.1,
	1.2 skinlf.spec, 1.1, 1.2 sources, 1.2,
	1.3 skinlf-build-xml-patch.patch, 1.1,
	NONE skinlf-common-xml-patch.patch, 1.1,
	NONE skinlf-generate-tarball.sh, 1.1, NONE
Message-ID: <20090926051210.E0C4E11C0338@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8068

Modified Files:
	.cvsignore skinlf-nosun-jimi-patch.patch 
	skinlf-sun-jdk1.5-xpath-patch.patch skinlf.spec sources 
Removed Files:
	skinlf-build-xml-patch.patch skinlf-common-xml-patch.patch 
	skinlf-generate-tarball.sh 
Log Message:
* Update to CVS release. Address bug 524784



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2008 10:20:15 -0000	1.2
+++ .cvsignore	26 Sep 2009 05:12:09 -0000	1.3
@@ -1 +1,2 @@
-skinlf-6.7-clean.tar.gz
+skinlf-6.7cvs20090501-clean.tar.gz
+skinlf-generate-cvs-tarball.sh

skinlf-nosun-jimi-patch.patch:
 ImageUtils.java |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Index: skinlf-nosun-jimi-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-10/skinlf-nosun-jimi-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-nosun-jimi-patch.patch	14 Dec 2008 10:20:16 -0000	1.1
+++ skinlf-nosun-jimi-patch.patch	26 Sep 2009 05:12:10 -0000	1.2
@@ -1,77 +1,77 @@
---- src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
-+++ src/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
+--- src/main/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +1000
++++ src/main/com/l2fprod/tools/ImageUtils.java.new	2008-11-01 14:03:30.000000000 +1100
 @@ -6,15 +6,11 @@
- 
- import javax.swing.ImageIcon;
- 
--import com.ibm.imageconversion.*;
--import com.sun.jimi.core.*;
--
-+import javax.imageio.*;
- public class ImageUtils {
- 
-   public static Component bitmapCreator = new javax.swing.JLabel();
-   
--  static BMPDecoder decoder = new BMPDecoder();
--  static BMPEncoder encoder = new BMPEncoder();
- 
-   public static Image loadPng(String pathToImage) throws Exception {
-     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
+ 
+ import javax.swing.ImageIcon;
+ 
+-import com.ibm.imageconversion.*;
+-import com.sun.jimi.core.*;
+-
++import javax.imageio.*;
+ public class ImageUtils {
+ 
+   public static Component bitmapCreator = new javax.swing.JLabel();
+   
+-  static BMPDecoder decoder = new BMPDecoder();
+-  static BMPEncoder encoder = new BMPEncoder();
+ 
+   public static Image loadPng(String pathToImage) throws Exception {
+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());
 @@ -22,29 +18,34 @@
-   }
- 
-   public static void savePng(Image image, String pathToImage) throws Exception {
--    Jimi.putImage(image, pathToImage);
-+    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
-   }
- 
-+  private static String getFileFmt(String pathToImage) throws Exception {
-+    String fmt;
-+    if (pathToImage.toLowerCase().endsWith(".png")) {
-+      return "png";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".gif")) {
-+      return "gif";
-+    }
-+    if (pathToImage.toLowerCase().endsWith(".bmp")) {
-+      return "bmp";
-+    }
-+    return "";
-+  }
-+  
-   public static void createPicture(String pathToImage, int index, int maxParts,
-                                    String filename, boolean horizontal) {
-     try {
-       System.out.println("working with " + pathToImage);
-       Image image = null;
- 
--      if (pathToImage.toLowerCase().endsWith(".png") ||
--        	pathToImage.toLowerCase().endsWith(".gif")) {
--        image = loadPng(pathToImage);
--      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
--        decoder.setInputFilename(pathToImage);
--        decoder.triggerAction();
--        image = decoder.getResult();
--      } else {
--        throw new Error("do not know how to load " + pathToImage);
--      }
- 
-+      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
-       // if only one image, dump it as it
--	    if (index == 0 && maxParts == 1) {
--        Jimi.putImage(image, filename);
-+      if (index == 0 && maxParts == 1) {
-+        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-       } else {
-         if (horizontal) {
-           int partHeight = image.getHeight(bitmapCreator) / maxParts;
+   }
+ 
+   public static void savePng(Image image, String pathToImage) throws Exception {
+-    Jimi.putImage(image, pathToImage);
++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));
+   }
+ 
++  private static String getFileFmt(String pathToImage) throws Exception {
++    String fmt;
++    if (pathToImage.toLowerCase().endsWith(".png")) {
++      return "png";
++    }
++    if (pathToImage.toLowerCase().endsWith(".gif")) {
++      return "gif";
++    }
++    if (pathToImage.toLowerCase().endsWith(".bmp")) {
++      return "bmp";
++    }
++    return "";
++  }
++  
+   public static void createPicture(String pathToImage, int index, int maxParts,
+                                    String filename, boolean horizontal) {
+     try {
+       System.out.println("working with " + pathToImage);
+       Image image = null;
+ 
+-      if (pathToImage.toLowerCase().endsWith(".png") ||
+-        	pathToImage.toLowerCase().endsWith(".gif")) {
+-        image = loadPng(pathToImage);
+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {
+-        decoder.setInputFilename(pathToImage);
+-        decoder.triggerAction();
+-        image = decoder.getResult();
+-      } else {
+-        throw new Error("do not know how to load " + pathToImage);
+-      }
+ 
++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);
+       // if only one image, dump it as it
+-	    if (index == 0 && maxParts == 1) {
+-        Jimi.putImage(image, filename);
++      if (index == 0 && maxParts == 1) {
++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+       } else {
+         if (horizontal) {
+           int partHeight = image.getHeight(bitmapCreator) / maxParts;
 @@ -55,8 +56,8 @@
-           image = grab(image, partWidth * index, 0,
-                        partWidth, image.getHeight(bitmapCreator));
-         }
--        Jimi.putImage(image, filename);
-       }
-+	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
-     } catch (Exception e) {
-       System.out.println("error while working with " + pathToImage);
- 	    e.printStackTrace();
+           image = grab(image, partWidth * index, 0,
+                        partWidth, image.getHeight(bitmapCreator));
+         }
+-        Jimi.putImage(image, filename);
+       }
++	   ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));
+     } catch (Exception e) {
+       System.out.println("error while working with " + pathToImage);
+ 	    e.printStackTrace();

skinlf-sun-jdk1.5-xpath-patch.patch:
 MsStylesToSkinLF.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: skinlf-sun-jdk1.5-xpath-patch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-10/skinlf-sun-jdk1.5-xpath-patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf-sun-jdk1.5-xpath-patch.patch	14 Dec 2008 10:20:16 -0000	1.1
+++ skinlf-sun-jdk1.5-xpath-patch.patch	26 Sep 2009 05:12:10 -0000	1.2
@@ -1,11 +1,11 @@
---- src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
-+++ src/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
+--- src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java	2006-07-22 13:46:22.000000000 +1000
++++ src/main/com/l2fprod/tools/msstyles/MsStylesToSkinLF.java.newer	2008-11-01 14:35:47.000000000 +1100
 @@ -9,7 +9,7 @@
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
- 
--import org.apache.xpath.XPathAPI;
-+import com.sun.org.apache.xpath.internal.XPathAPI;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- 
+ import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+ 
+-import org.apache.xpath.XPathAPI;
++import com.sun.org.apache.xpath.internal.XPathAPI;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-10/skinlf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skinlf.spec	14 Dec 2008 10:20:16 -0000	1.1
+++ skinlf.spec	26 Sep 2009 05:12:10 -0000	1.2
@@ -1,18 +1,20 @@
+%define cvsver cvs20090501
+
 Name:		skinlf	
 Version:	6.7
-Release:	6%{?dist}
+Release:	9.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
-License:	ASL 2.0 and zlib and ASL 1.1
+License:	ASL 2.0
 URL:		http://skinlf.dev.java.net/	
 
-Source0: %{name}-%{version}-clean.tar.gz
+Source0:	%{name}-%{version}%{cvsver}-clean.tar.gz
 # Original Source# Contains code that we cannot ship. 
 # Download the upstream tarball and invoke this script while in the
-# tarball's directory
-# ./skinlf-generate-tarball.sh 6.7-20060722 
-Source1: %{name}-generate-tarball.sh
+# tarball's directory. Must perform co as specified in sh file.
+# ./skinlf-generate-cvs-tarball.sh
+Source1:	%{name}-generate-cvs-tarball.sh
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,23 +24,20 @@ BuildArch:	noarch
 #for patchset maintained by Scilab developer, Sylvestre Ledru.
 # These patches have been modified.
 Patch0:		skinlf-nosun-jimi-patch.patch	
-#Release file does not contain building tools. thats CVS only. Don't know which CVS revision to check out for release CVS.
-Patch1:		skinlf-build-xml-patch.patch
-#Create common.xml as release omits building tools
-Patch2:		skinlf-common-xml-patch.patch
 #org.apache.xpath has been removed from JDK1.5 and above
 #patch to use com.sun.org.apache.xpath.internal.XPathAPI instead 
-Patch3:		skinlf-sun-jdk1.5-xpath-patch.patch
+Patch1:		skinlf-sun-jdk1.5-xpath-patch.patch
 
 BuildRequires:	ant-nodeps
 BuildRequires:	laf-plugin
 BuildRequires:	dos2unix
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  ant
+BuildRequires:	java-devel >= 1:1.6.0
+BuildRequires:	jpackage-utils
+BuildRequires:	ant
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
+
 #This depends upon laf-plugin
 #https://bugzilla.redhat.com/show_bug.cgi?id=461407
 Requires:	laf-plugin
@@ -47,36 +46,34 @@ Requires:	laf-plugin
 
 
 %description
-Skin Look And Feel is a java framework that is  able to read GTK (The
+Skin Look And Feel is a java framework that is able to read GTK (The
 Gimp ToolKit) and KDE (The K Desktop Environment) skins to enhance
 your application.
 SkinLF supports GUI controls such as Buttons, Checks, Radios, Scrollbars,
-Progress Bar, Lists,  Tables, Internal Frames, Colors, Background
+Progress Bar, Lists, Tables, Internal Frames, Colors, Background
 Textures, Regular Windows.
 
 %prep
-%setup -q
+%setup -q -n %{name} 
 %patch0
-
-#building patches
 %patch1
-%patch2
-#Code fixing
-%patch3
 
-#dos2unix Doc files
-for i in "CHANGES README LICENSE LICENSE_nanoxml" ;
+#convert Doc files to unix format
+for file in AUTHORS README LICENSE LICENSE_nanoxml ;
 do
-	dos2unix -d2u $i;
+	sed 's/\r//' $file > $file.new && \
+	touch -r $file $file.new && \
+	mv $file.new $file
 done
 
 #Remove jar files
 rm -f ./lib/examples.jar 
 rm -f ./lib/nativeskin.jar 
 rm -f ./lib/skinlf.jar 
-
-#rm due to dubious license
-rm -f ./src/examples/Clock.java
+rm -f ./lib/sunawt.jar
+rm -f ./lib/laf-plugin*.jar
+rm -f ./lib/proguard.jar
+rm -f ./lib/imageconversion.jar
 
 #Sanitise package -- disallow jar files
 JAR_files=""
@@ -92,8 +89,10 @@ if [ ! -z "$JAR_files" ] ; then
 	exit 1
 fi
 
+
 %build
-ant 
+export CLASSPATH=$(build-classpath laf-plugin)
+ant -Dbuild.sysclasspath=first
 #Construct-a-jar Dont use ant jar as it tries to unpack laf-plugin
 pushd build/classes
 jar cf %{name}-%{version}.jar .
@@ -113,17 +112,27 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README LICENSE  LICENSE_nanoxml
+%doc README LICENSE LICENSE_nanoxml
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Dec 06 2008  <mycae(a!t)yahoo.com> 6.7-6
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+- Modify to ASL 2.0, upstream has relicenced - fix bug #524784
+- Use CVS co, as upstream does not provide release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+*Sat Dec 06 2008 <mycae(a!t)yahoo.com> 6.7-6
 - Fixed jar dir
 - Changed primary jar to name-version.jar, & linked.
 - Added clean tarball generator 
 
-* Wed Dec 03 2008  <mycae(a!t)yahoo.com> 6.7-5
+* Wed Dec 03 2008 <mycae(a!t)yahoo.com> 6.7-5
 - Added LICENSE_nanoxml
 - Updated licence spec line to include ASL 1.1 & zlib
 - removed Clock.java due to incompatible license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2008 10:20:16 -0000	1.2
+++ sources	26 Sep 2009 05:12:10 -0000	1.3
@@ -1 +1,2 @@
-3ef43d0f1941b1e338292ce041e57da0  skinlf-6.7-clean.tar.gz
+8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
+8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh


--- skinlf-build-xml-patch.patch DELETED ---


--- skinlf-common-xml-patch.patch DELETED ---


--- skinlf-generate-tarball.sh DELETED ---



From mtasaka at fedoraproject.org  Sat Sep 26 05:41:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 05:41:44 +0000 (UTC)
Subject: rpms/gnome-commander/F-12 .cvsignore, 1.36,
	1.37 gnome-commander.spec, 1.61, 1.62 sources, 1.37, 1.38
Message-ID: <20090926054144.0CDCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16355

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Sat Sep 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.3.git_D20090924T0215_13dev
- Update Russian translation (from mailing list)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	23 Sep 2009 19:16:57 -0000	1.36
+++ .cvsignore	26 Sep 2009 05:41:43 -0000	1.37
@@ -1,2 +1,3 @@
 gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
 gnome-commander-1.2.8.2-po.tar.bz2
+gnome-commander-ru.po.zip


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- gnome-commander.spec	23 Sep 2009 19:16:57 -0000	1.61
+++ gnome-commander.spec	26 Sep 2009 05:41:43 -0000	1.62
@@ -32,7 +32,7 @@
 
 %define        use_autotool          0
 %define        if_pre                1
-%define        main_release          2 
+%define        main_release          3
 %define        extratag              git_%{git_pull_JST}_13dev
 %define        mimeedit_rev          1958
 
@@ -59,6 +59,8 @@ Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 %if %{update_po}
 Source20:      gnome-commander-1.2.8.2-po.tar.bz2
+# From mailing list
+Source21:      gnome-commander-ru.po.zip
 %endif
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -143,6 +145,10 @@ cp -p %SOURCE10 mimeedit.sh
 %if %{update_po}
 %{__cp} -p gnome-commander-1.2.*/po/*.po po/
 pushd po
+cp -p %{SOURCE21} .
+unzip -qq *.po.zip <<EOF
+A
+EOF
 ls -1 *.po | sort | %{__sed} -e 's|\.po||' > LINGUAS
 popd
 %endif
@@ -235,6 +241,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Sat Sep 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.3.git_D20090924T0215_13dev
+- Update Russian translation (from mailing list)
+
 * Thu Sep 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Try latest git
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	23 Sep 2009 19:16:57 -0000	1.37
+++ sources	26 Sep 2009 05:41:43 -0000	1.38
@@ -1,2 +1,3 @@
 52df3ddcafb134c782a7b74369374ec6  gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
 b190627ef20d9fe261c0445bc7d56877  gnome-commander-1.2.8.2-po.tar.bz2
+9b2a8d11008d570b7cb9bf18878d3050  gnome-commander-ru.po.zip



From cweyl at fedoraproject.org  Sat Sep 26 05:43:32 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 26 Sep 2009 05:43:32 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel .cvsignore, 1.8,
	1.9 perl-MooseX-MethodAttributes.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20090926054332.56C9D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16975

Modified Files:
	.cvsignore perl-MooseX-MethodAttributes.spec sources 
Log Message:
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
- auto-update to 0.18 (by cpan-spec-update 0.01)
- altered br on perl(Moose) (0.79 => 0.90)
- altered br on perl(MooseX::Types) (0.06 => 0.20)
- altered br on perl(Test::More) (0 => 0.88)
- added a new br on perl(namespace::autoclean) (version 0)
- altered br on perl(namespace::clean) (0 => 0.10)
- altered req on perl(Moose) (0.79 => 0.90)
- altered req on perl(MooseX::Types) (0.06 => 0.20)
- added a new req on perl(namespace::autoclean) (version 0)
- altered req on perl(namespace::clean) (0 => 0.10)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Sep 2009 18:40:20 -0000	1.8
+++ .cvsignore	26 Sep 2009 05:43:32 -0000	1.9
@@ -1 +1 @@
-MooseX-MethodAttributes-0.16.tar.gz
+MooseX-MethodAttributes-0.18.tar.gz


Index: perl-MooseX-MethodAttributes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/perl-MooseX-MethodAttributes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-MooseX-MethodAttributes.spec	19 Sep 2009 18:40:21 -0000	1.8
+++ perl-MooseX-MethodAttributes.spec	26 Sep 2009 05:43:32 -0000	1.9
@@ -1,29 +1,33 @@
 Name:       perl-MooseX-MethodAttributes
-Version:    0.16
+Version:    0.18
 Release:    1%{?dist}
 # lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Introspect your method code attributes
-Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/MooseX-MethodAttributes-%{version}.tar.gz
+Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-MethodAttributes
 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(Moose) >= 0.79
-BuildRequires: perl(MooseX::Types) >= 0.06
+BuildRequires: perl(Moose) >= 0.90
+BuildRequires: perl(MooseX::Types) >= 0.20
 BuildRequires: perl(MRO::Compat)
-BuildRequires: perl(namespace::clean)
+BuildRequires: perl(namespace::clean) >= 0.10
 # testing
-BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::More) >= 0.88
 BuildRequires: perl(Test::Exception)
+BuildRequires:  perl(namespace::autoclean)
 
 Requires:       perl(MRO::Compat)
-Requires:       perl(Moose) >= 0.79
-Requires:       perl(MooseX::Types) >= 0.06
-Requires:       perl(namespace::clean)
+Requires:       perl(Moose) >= 0.90
+Requires:       perl(MooseX::Types) >= 0.20
+Requires:       perl(namespace::clean) >= 0.10
+Requires:       perl(namespace::autoclean)
+
+%{?perl_default_filter}
 
 %description
 This module allows code attributes of methods to be introspected using
@@ -59,6 +63,18 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
+- auto-update to 0.18 (by cpan-spec-update 0.01)
+- altered br on perl(Moose) (0.79 => 0.90)
+- altered br on perl(MooseX::Types) (0.06 => 0.20)
+- altered br on perl(Test::More) (0 => 0.88)
+- added a new br on perl(namespace::autoclean) (version 0)
+- altered br on perl(namespace::clean) (0 => 0.10)
+- altered req on perl(Moose) (0.79 => 0.90)
+- altered req on perl(MooseX::Types) (0.06 => 0.20)
+- added a new req on perl(namespace::autoclean) (version 0)
+- altered req on perl(namespace::clean) (0 => 0.10)
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
 - auto-update to 0.16 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Sep 2009 18:40:21 -0000	1.8
+++ sources	26 Sep 2009 05:43:32 -0000	1.9
@@ -1 +1 @@
-e670255423f7f25c7146acfdb47c2ff1  MooseX-MethodAttributes-0.16.tar.gz
+7202f1a4bffe36776d16f13130a52cfa  MooseX-MethodAttributes-0.18.tar.gz



From cweyl at fedoraproject.org  Sat Sep 26 05:44:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 26 Sep 2009 05:44:34 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/devel .cvsignore, 1.13,
	1.14 perl-Catalyst-Runtime.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090926054434.9DAB611C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17303

Modified Files:
	.cvsignore perl-Catalyst-Runtime.spec sources 
Log Message:
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80013-1
- auto-update to 5.80013 (by cpan-spec-update 0.01)
- altered br on perl(Moose) (0.78 => 0.90)
- altered br on perl(MooseX::Emulate::Class::Accessor::Fast) (0.00801 => 0.00903)
- altered br on perl(MooseX::MethodAttributes::Inheritable) (0.15 => 0.16)
- altered br on perl(namespace::autoclean) (0 => 0.09)
- altered req on perl(Moose) (0.78 => 0.90)
- altered req on perl(MooseX::Emulate::Class::Accessor::Fast) (0.00801 => 0.00903)
- altered req on perl(MooseX::MethodAttributes::Inheritable) (0.15 => 0.16)
- altered req on perl(namespace::autoclean) (0 => 0.09)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Sep 2009 16:35:06 -0000	1.13
+++ .cvsignore	26 Sep 2009 05:44:34 -0000	1.14
@@ -1 +1 @@
-Catalyst-Runtime-5.80011.tar.gz
+Catalyst-Runtime-5.80013.tar.gz


Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Catalyst-Runtime.spec	3 Sep 2009 16:35:06 -0000	1.20
+++ perl-Catalyst-Runtime.spec	26 Sep 2009 05:44:34 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Runtime
-Version:        5.80011
+Version:        5.80013
 Release:        1%{?dist}
 Summary:        Catalyst Framework Runtime
 License:        GPL+ or Artistic
@@ -35,7 +35,7 @@ BuildRequires:  perl(Tree::Simple::Visit
 BuildRequires:  perl(URI)                   >= 1.35
 BuildRequires:  perl(String::RewritePrefix) >= 0.004
 BuildRequires:  perl(Task::Weaken)
-BuildRequires:  perl(namespace::autoclean)
+BuildRequires:  perl(namespace::autoclean) >= 0.09
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Class::MOP) >= 0.83
 BuildRequires:  perl(Time::HiRes)
@@ -43,13 +43,13 @@ BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Sub::Exporter)
 BuildRequires:  perl(B::Hooks::EndOfScope) >= 0.08
 BuildRequires:  perl(namespace::clean)
-BuildRequires:  perl(Moose) >= 0.78
-BuildRequires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.15
+BuildRequires:  perl(Moose) >= 0.90
+BuildRequires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.16
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Text::Balanced)
 BuildRequires:  perl(Class::C3::Adopt::NEXT) >= 0.07
 BuildRequires:  perl(Test::MockObject) >= 1.07
-BuildRequires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
+BuildRequires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00903
 BuildRequires:  perl(List::MoreUtils)
 # test
 BuildRequires:  perl(Class::C3)
@@ -85,9 +85,9 @@ Requires:  perl(HTTP::Response)
 Requires:  perl(LWP::UserAgent)
 Requires:  perl(MRO::Compat)
 Requires:  perl(Module::Pluggable) >= 3.9
-Requires:  perl(Moose) >= 0.78
-Requires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.15
-Requires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
+Requires:  perl(Moose) >= 0.90
+Requires:  perl(MooseX::MethodAttributes::Inheritable) >= 0.16
+Requires:  perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00903
 Requires:  perl(Path::Class) >= 0.09
 Requires:  perl(Scalar::Util)
 Requires:  perl(Sub::Exporter)
@@ -100,7 +100,7 @@ Requires:  perl(URI) >= 1.35
 Requires:  perl(namespace::clean)
 Requires:  perl(String::RewritePrefix) >= 0.004
 Requires:  perl(Task::Weaken)
-Requires:  perl(namespace::autoclean)
+Requires:  perl(namespace::autoclean) >= 0.09
 Requires:       perl(List::MoreUtils)
 
 # use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
@@ -184,6 +184,17 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80013-1
+- auto-update to 5.80013 (by cpan-spec-update 0.01)
+- altered br on perl(Moose) (0.78 => 0.90)
+- altered br on perl(MooseX::Emulate::Class::Accessor::Fast) (0.00801 => 0.00903)
+- altered br on perl(MooseX::MethodAttributes::Inheritable) (0.15 => 0.16)
+- altered br on perl(namespace::autoclean) (0 => 0.09)
+- altered req on perl(Moose) (0.78 => 0.90)
+- altered req on perl(MooseX::Emulate::Class::Accessor::Fast) (0.00801 => 0.00903)
+- altered req on perl(MooseX::MethodAttributes::Inheritable) (0.15 => 0.16)
+- altered req on perl(namespace::autoclean) (0 => 0.09)
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80011-1
 - switch filtering system
 - auto-update to 5.80011 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Sep 2009 16:35:06 -0000	1.11
+++ sources	26 Sep 2009 05:44:34 -0000	1.12
@@ -1 +1 @@
-96f09897079c6a13e1c0375b3a94ad4f  Catalyst-Runtime-5.80011.tar.gz
+b26b464360594b7eb231caf78c0bb1ef  Catalyst-Runtime-5.80013.tar.gz



From cweyl at fedoraproject.org  Sat Sep 26 05:53:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 26 Sep 2009 05:53:26 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-TT/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-View-TT.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090926055326.8652A11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-View-TT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19628

Modified Files:
	.cvsignore perl-Catalyst-View-TT.spec sources 
Log Message:
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
- update filtering
- auto-update to 0.30 (by cpan-spec-update 0.01)
- altered br on perl(Catalyst) (5.5 => 5.7)
- added a new br on perl(Class::Accessor) (version 0)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new br on CPAN (inc::Module::AutoInstall found)
- altered req on perl(Catalyst) (0 => 5.7)
- added a new req on perl(Class::Accessor) (version 0)
- added a new req on perl(MRO::Compat) (version 0)
- added a new req on perl(Template) (version 0)
- added a new req on perl(Template::Timer) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-TT/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Feb 2009 06:21:26 -0000	1.4
+++ .cvsignore	26 Sep 2009 05:53:25 -0000	1.5
@@ -1 +1 @@
-Catalyst-View-TT-0.29.tar.gz
+Catalyst-View-TT-0.30.tar.gz


Index: perl-Catalyst-View-TT.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-TT/devel/perl-Catalyst-View-TT.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-View-TT.spec	26 Jul 2009 04:18:54 -0000	1.6
+++ perl-Catalyst-View-TT.spec	26 Sep 2009 05:53:25 -0000	1.7
@@ -1,61 +1,46 @@
 Name:           perl-Catalyst-View-TT
-Version:        0.29
-Release:        2%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        Template Toolkit View Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-View-TT/
-Source0:        http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-View-TT-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-View-TT-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Catalyst) >= 5.5
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Catalyst) >= 5.7
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Path::Class)
 BuildRequires:  perl(Template)
 BuildRequires:  perl(Template::Timer)
 BuildRequires:  perl(Test::More)
-
+BuildRequires:  perl(Class::Accessor)
+BuildRequires:  perl(CPAN)
 # optional tests
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 
-# either not auto-pickedup, or to get rpmlint to stop complaining :)
 Requires:       perl(Path::Class)
-Requires:       perl(Catalyst)
+Requires:       perl(Catalyst) >= 5.7
 Requires:       perl(warnings)
+Requires:       perl(Class::Accessor)
+Requires:       perl(MRO::Compat)
+Requires:       perl(Template)
+Requires:       perl(Template::Timer)
+
+%{?perl_default_filter}
 
 %description
-This is the Catalyst view base class for the Template Toolkit. 
+This is the Catalyst view base class for the Template Toolkit.
 
 %prep
 %setup -q -n Catalyst-View-TT-%{version}
 
 find . -type f -exec chmod -x -c {} +
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(TestApp.*)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Catalyst-View-TT-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(FindBin)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Catalyst-View-TT-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -65,7 +50,7 @@ rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} + 
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
@@ -83,6 +68,19 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
+- update filtering
+- auto-update to 0.30 (by cpan-spec-update 0.01)
+- altered br on perl(Catalyst) (5.5 => 5.7)
+- added a new br on perl(Class::Accessor) (version 0)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+- altered req on perl(Catalyst) (0 => 5.7)
+- added a new req on perl(Class::Accessor) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+- added a new req on perl(Template) (version 0)
+- added a new req on perl(Template::Timer) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-TT/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Feb 2009 06:21:26 -0000	1.4
+++ sources	26 Sep 2009 05:53:25 -0000	1.5
@@ -1 +1 @@
-3cbb1db11ba859bb5280547b5d4bd526  Catalyst-View-TT-0.29.tar.gz
+11d69501f57f4a85c541dbd1ab506278  Catalyst-View-TT-0.30.tar.gz



From cweyl at fedoraproject.org  Sat Sep 26 06:56:05 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 26 Sep 2009 06:56:05 +0000 (UTC)
Subject: rpms/perl-Class-C3-XS/devel .cvsignore, 1.7,
	1.8 perl-Class-C3-XS.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090926065605.8AB3411C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10651

Modified Files:
	.cvsignore perl-Class-C3-XS.spec sources 
Log Message:
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
- update filtering
- auto-update to 0.13 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Apr 2009 07:22:28 -0000	1.7
+++ .cvsignore	26 Sep 2009 06:56:03 -0000	1.8
@@ -1,9 +1 @@
-Class-C3-XS-0.11.tar.gz
-Class-C3-XS-*
-i386
-x86_64
-.build*
-clog
-*.rpm
-*.gz
-*.tar
+Class-C3-XS-0.13.tar.gz


Index: perl-Class-C3-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/devel/perl-Class-C3-XS.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Class-C3-XS.spec	26 Jul 2009 04:22:35 -0000	1.12
+++ perl-Class-C3-XS.spec	26 Sep 2009 06:56:03 -0000	1.13
@@ -1,25 +1,22 @@
 Name:           perl-Class-C3-XS
-Version:        0.11
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        XS speedups for Class::C3
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-C3-XS/
-Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Class-C3-XS-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Class-C3-XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Test::More) >= 0.47
 # test
 BuildRequires:  perl(Test::Pod)
 
 # don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
-%global __find_requires /bin/sh -c "%{__deploop R}"
+%{?perl_default_filter}
 
 %description
 This contains XS performance enhancers for Class::C3 version 0.16 and
@@ -29,26 +26,6 @@ it can find it. Do not use this package 
 %prep
 %setup -q -n Class-C3-XS-%{version}
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(t::.*)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Class-C3-XS-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(base)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Class-C3-XS-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -72,11 +49,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README t/
-%{perl_vendorarch}/auto/*
-%{perl_vendorarch}/Class*
 %{_mandir}/man3/*
+%{perl_vendorarch}/*
+%exclude %dir %{perl_vendorarch}/auto
 
 %changelog
+* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update filtering
+- auto-update to 0.13 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Apr 2009 07:22:29 -0000	1.6
+++ sources	26 Sep 2009 06:56:03 -0000	1.7
@@ -1 +1 @@
-6afa4bd20dd179358df6acf8e77037fc  Class-C3-XS-0.11.tar.gz
+92a48fe74206b803315749de29c30b88  Class-C3-XS-0.13.tar.gz



From cweyl at fedoraproject.org  Sat Sep 26 06:59:16 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 26 Sep 2009 06:59:16 +0000 (UTC)
Subject: rpms/perl-Class-C3-Componentised/devel .cvsignore, 1.5,
	1.6 perl-Class-C3-Componentised.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090926065916.C90E011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3-Componentised/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11595

Modified Files:
	.cvsignore perl-Class-C3-Componentised.spec sources 
Log Message:
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0006-1
- update filtering
- auto-update to 1.0006 (by cpan-spec-update 0.01)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(Class::C3) (version 0.20)
- added a new req on perl(Class::Inspector) (version 0)
- added a new req on perl(MRO::Compat) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 May 2009 20:30:52 -0000	1.5
+++ .cvsignore	26 Sep 2009 06:59:16 -0000	1.6
@@ -1 +1 @@
-Class-C3-Componentised-1.0005.tar.gz
+Class-C3-Componentised-1.0006.tar.gz


Index: perl-Class-C3-Componentised.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/devel/perl-Class-C3-Componentised.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-C3-Componentised.spec	26 Jul 2009 04:22:20 -0000	1.8
+++ perl-Class-C3-Componentised.spec	26 Sep 2009 06:59:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3-Componentised
-Version:        1.0005
-Release:        2%{?dist}
+Version:        1.0006
+Release:        1%{?dist}
 Summary:        Load mix-ins or components to your C3-based class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,10 +10,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# core
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires: perl(Test::More)
-# cpan
+BuildRequires: perl(FindBin)
+BuildRequires: perl(Carp)
 BuildRequires: perl(Class::C3) >= 0.20
 BuildRequires: perl(Class::Inspector)
 BuildRequires: perl(MRO::Compat)
@@ -22,10 +22,12 @@ BuildRequires: perl(Test::Exception)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
 
+Requires:       perl(Carp)
+Requires:       perl(Class::C3) >= 0.20
+Requires:       perl(Class::Inspector)
+Requires:       perl(MRO::Compat)
 
-### auto-added brs!
-BuildRequires:  perl(FindBin)
-BuildRequires:  perl(Carp)
+%{?perl_default_filter}
 
 %description
 This will inject base classes to your module using the Class::C3 method
@@ -38,18 +40,7 @@ MooseX::Object::Pluggable.
 
 %prep
 %setup -q -n Class-C3-Componentised-%{version}
-
-perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(base)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Class-C3-Componentised-%{version}/%{name}-req
-chmod +x %{__perl_requires}
+perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -78,6 +69,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0006-1
+- update filtering
+- auto-update to 1.0006 (by cpan-spec-update 0.01)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Class::C3) (version 0.20)
+- added a new req on perl(Class::Inspector) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0005-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 May 2009 20:30:52 -0000	1.5
+++ sources	26 Sep 2009 06:59:16 -0000	1.6
@@ -1 +1 @@
-1c843ffd2737c6db77edcc6b666cfc48  Class-C3-Componentised-1.0005.tar.gz
+daea1eb95cdeda8752b472e5fe6a4c86  Class-C3-Componentised-1.0006.tar.gz



From lkundrak at fedoraproject.org  Sat Sep 26 07:13:44 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 26 Sep 2009 07:13:44 +0000 (UTC)
Subject: rpms/libwpg/EL-5 libwpg.spec,1.4,1.5
Message-ID: <20090926071345.1A57E11C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libwpg/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15289

Modified Files:
	libwpg.spec 
Log Message:
* Sat Sep 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.3-4.1
- Disable ppc for el5



Index: libwpg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwpg/EL-5/libwpg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libwpg.spec	29 Jul 2009 06:13:01 -0000	1.4
+++ libwpg.spec	26 Sep 2009 07:13:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libwpg
 Version:        0.1.3
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Library for reading WordPerfect Graphics images
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  libwpd-devel >= 0.8
 BuildRequires:  doxygen
+ExcludeArch:    ppc
 
 %description
 Libwpg project is a library and to work with graphics in WPG
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.3-4.1
+- Disable ppc for el5
+
 * Tue Jul 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.3-4
 - Fix multilib problem with doxygen documentation (#508940)
 



From lkundrak at fedoraproject.org  Sat Sep 26 07:25:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 26 Sep 2009 07:25:07 +0000 (UTC)
Subject: rpms/inkscape/EL-5 inkscape.spec,1.40,1.41
Message-ID: <20090926072507.BDCFE11C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18741

Modified Files:
	inkscape.spec 
Log Message:
* Sat Sep 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn.1
- Do not use wpg on EL-5 w/o Desktop (ppc)



Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- inkscape.spec	25 Sep 2009 17:10:24 -0000	1.40
+++ inkscape.spec	26 Sep 2009 07:25:07 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}
+Release:        0.16.pre3.20090925svn%{?dist}.1
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -38,7 +38,13 @@ BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
 BuildRequires:  gsl-devel
+%if 0%{el5}
+%ifnarch ppc
 BuildRequires:  libwpg-devel
+%endif
+%else
+BuildRequires:  libwpg-devel
+%endif
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::Embed)
@@ -218,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn.1
+- Do not use wpg on EL-5 w/o Desktop (ppc)
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot
 - Drop debugging compiler flags, enable optimizations again



From denis at fedoraproject.org  Sat Sep 26 07:35:53 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 26 Sep 2009 07:35:53 +0000 (UTC)
Subject: rpms/gtkmm24/devel gtkmm.spec,1.56,1.57
Message-ID: <20090926073553.E20F511C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22656

Modified Files:
	gtkmm.spec 
Log Message:
Removed CHANGES file from devel package


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gtkmm.spec	25 Sep 2009 07:40:07 -0000	1.56
+++ gtkmm.spec	26 Sep 2009 07:35:52 -0000	1.57
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root, -)
-%doc CHANGES PORTING docs-to-include/*
+%doc PORTING docs-to-include/*
 %{_includedir}/gtkmm-2.4
 %{_includedir}/atkmm-1.6
 %{_includedir}/gdkmm-2.4



From kdudka at fedoraproject.org  Sat Sep 26 07:54:45 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat, 26 Sep 2009 07:54:45 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.116,1.117
Message-ID: <20090926075445.433B711C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31245

Modified Files:
	curl.spec 
Log Message:
- let curl test-suite use valgrind
- require libssh2>=1.2 (#525002)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- curl.spec	22 Sep 2009 03:52:18 -0000	1.116
+++ curl.spec	26 Sep 2009 07:54:44 -0000	1.117
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -18,10 +18,17 @@ URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: groff
-BuildRequires: openssh-server openssh-clients
-BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
-BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
+BuildRequires: krb5-devel
+BuildRequires: libidn-devel
+BuildRequires: libssh2-devel >= 1.2
+BuildRequires: nss-devel >= 3.11.7-7
+BuildRequires: openldap-devel
+BuildRequires: openssh-clients
+BuildRequires: openssh-server
+BuildRequires: pkgconfig
 BuildRequires: stunnel
+BuildRequires: valgrind
+BuildRequires: zlib-devel
 Requires: libcurl = %{version}-%{release}
 
 %description
@@ -94,7 +101,7 @@ make %{?_smp_mflags}
 %check
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 make %{?_smp_mflags} -C tests
-cd tests && ./runtests.pl -p -v
+cd tests && ./runtests.pl -k -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -152,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Sat Sep 26 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-9
+- let curl test-suite use valgrind
+- require libssh2>=1.2 (#525002)
+
 * Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 7.19.6-8
 - rebuild for libssh2 1.2
 



From drago01 at fedoraproject.org  Sat Sep 26 08:09:24 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Sep 2009 08:09:24 +0000 (UTC)
Subject: rpms/pigz/devel import.log, NONE, 1.1 pigz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926080924.D4F5011C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pigz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4230/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pigz.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
pigz-2_1_5-2_fc11:HEAD:pigz-2.1.5-2.fc11.src.rpm:1253952548


--- NEW FILE pigz.spec ---
Name:           pigz
Version:        2.1.5
Release:        2%{?dist}
Summary:        Parallel implementation of gzip

Group:          Applications/File
License:        zlib
URL:            http://www.zlib.net/pigz/
Source0:        http://www.zlib.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pigz, which stands for parallel implementation of gzip,
is a fully functional replacement for gzip that exploits
multiple processors and multiple cores to the hilt when compressing data.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS='%{optflags}'


%install
rm -rf $RPM_BUILD_ROOT
install -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
install -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
install -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc pigz.pdf README
%{_bindir}/pigz
%{_bindir}/unpigz
%{_datadir}/man/man1/pigz.*


%changelog
* Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-2
- Fix license tag

* Fri Sep 25 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:47:38 -0000	1.1
+++ .cvsignore	26 Sep 2009 08:09:24 -0000	1.2
@@ -0,0 +1 @@
+pigz-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:47:38 -0000	1.1
+++ sources	26 Sep 2009 08:09:24 -0000	1.2
@@ -0,0 +1 @@
+580873165ef3a369674f0c0af4c96d67  pigz-2.1.5.tar.gz



From drago01 at fedoraproject.org  Sat Sep 26 08:10:21 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Sep 2009 08:10:21 +0000 (UTC)
Subject: rpms/pigz/F-11 import.log, NONE, 1.1 pigz.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926081021.81EF411C0423@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pigz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4612/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pigz.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
pigz-2_1_5-2_fc11:F-11:pigz-2.1.5-2.fc11.src.rpm:1253952607


--- NEW FILE pigz.spec ---
Name:           pigz
Version:        2.1.5
Release:        2%{?dist}
Summary:        Parallel implementation of gzip

Group:          Applications/File
License:        zlib
URL:            http://www.zlib.net/pigz/
Source0:        http://www.zlib.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pigz, which stands for parallel implementation of gzip,
is a fully functional replacement for gzip that exploits
multiple processors and multiple cores to the hilt when compressing data.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS='%{optflags}'


%install
rm -rf $RPM_BUILD_ROOT
install -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
install -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
install -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc pigz.pdf README
%{_bindir}/pigz
%{_bindir}/unpigz
%{_datadir}/man/man1/pigz.*


%changelog
* Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-2
- Fix license tag

* Fri Sep 25 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:47:38 -0000	1.1
+++ .cvsignore	26 Sep 2009 08:10:21 -0000	1.2
@@ -0,0 +1 @@
+pigz-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:47:38 -0000	1.1
+++ sources	26 Sep 2009 08:10:21 -0000	1.2
@@ -0,0 +1 @@
+580873165ef3a369674f0c0af4c96d67  pigz-2.1.5.tar.gz



From drago01 at fedoraproject.org  Sat Sep 26 08:11:10 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Sep 2009 08:11:10 +0000 (UTC)
Subject: rpms/pigz/F-10 import.log, NONE, 1.1 pigz.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926081110.3FF1611C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pigz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4956/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pigz.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
pigz-2_1_5-2_fc11:F-10:pigz-2.1.5-2.fc11.src.rpm:1253952659


--- NEW FILE pigz.spec ---
Name:           pigz
Version:        2.1.5
Release:        2%{?dist}
Summary:        Parallel implementation of gzip

Group:          Applications/File
License:        zlib
URL:            http://www.zlib.net/pigz/
Source0:        http://www.zlib.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pigz, which stands for parallel implementation of gzip,
is a fully functional replacement for gzip that exploits
multiple processors and multiple cores to the hilt when compressing data.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS='%{optflags}'


%install
rm -rf $RPM_BUILD_ROOT
install -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
install -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
install -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc pigz.pdf README
%{_bindir}/pigz
%{_bindir}/unpigz
%{_datadir}/man/man1/pigz.*


%changelog
* Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-2
- Fix license tag

* Fri Sep 25 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:47:38 -0000	1.1
+++ .cvsignore	26 Sep 2009 08:11:09 -0000	1.2
@@ -0,0 +1 @@
+pigz-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:47:38 -0000	1.1
+++ sources	26 Sep 2009 08:11:10 -0000	1.2
@@ -0,0 +1 @@
+580873165ef3a369674f0c0af4c96d67  pigz-2.1.5.tar.gz



From sharkcz at fedoraproject.org  Sat Sep 26 08:15:44 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 26 Sep 2009 08:15:44 +0000 (UTC)
Subject: rpms/hercules/devel hercules.spec,1.27,1.28
Message-ID: <20090926081544.4087311C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6790

Modified Files:
	hercules.spec 
Log Message:
* Sat Sep 26 2009 Dan Hor?k <dan[at]danny.cz> 3.06-6
- rebuilt to use POSIX capabilities



Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- hercules.spec	17 Sep 2009 07:47:45 -0000	1.27
+++ hercules.spec	26 Sep 2009 08:15:43 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -15,8 +15,11 @@ Patch1: %{name}-3.06-ltdl.patch
 Patch2: %{name}-3.06-preproc.patch
 Patch3: %{name}-3.06-extgui.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, zlib-devel, bzip2-devel
-BuildRequires: libtool libtool-ltdl-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libcap-devel
+BuildRequires: libtool
+BuildRequires: libtool-ltdl-devel
 
 %description
 Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -102,6 +105,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Sat Sep 26 2009 Dan Hor?k <dan[at]danny.cz> 3.06-6
+- rebuilt to use POSIX capabilities
+
 * Thu Sep 17 2009 Dan Hor?k <dan[at]danny.cz> 3.06-5
 - fixed module loading with libtool >= 2.0
 



From pkgdb at fedoraproject.org  Sat Sep 26 09:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 09:29:10 +0000
Subject: [pkgdb] cherokee: arbiter has requested watchcommits
Message-ID: <20090926092910.C9AC510F89D@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on cherokee (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep 26 09:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 09:29:11 +0000
Subject: [pkgdb] cherokee: arbiter has requested watchbugzilla
Message-ID: <20090926092911.555FA10F8A8@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on cherokee (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep 26 09:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 09:29:11 +0000
Subject: [pkgdb] cherokee: arbiter has requested commit
Message-ID: <20090926092911.5151D10F8A6@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on cherokee (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From stevetraylen at fedoraproject.org  Sat Sep 26 10:13:13 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 10:13:13 +0000 (UTC)
Subject: rpms/munge/devel munge-correct-service-name.patch, NONE,
	1.1 munge.spec, 1.2, 1.3
Message-ID: <20090926101314.0511111C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13490

Modified Files:
	munge.spec 
Added Files:
	munge-correct-service-name.patch 
Log Message:
Fix rhbz #525732


munge-correct-service-name.patch:
 munge.init.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE munge-correct-service-name.patch ---
diff -uNr munge-0.5.8.ORIG/src/etc/munge.init.in munge-0.5.8/src/etc/munge.init.in
--- munge-0.5.8.ORIG/src/etc/munge.init.in	2009-09-26 11:13:03.929914545 +0200
+++ munge-0.5.8/src/etc/munge.init.in	2009-09-26 11:17:04.830846880 +0200
@@ -42,7 +42,7 @@
 
 PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
 DAEMON_NAME="`basename \"$DAEMON\"`"
-SERVICE_NAME="`basename \"$0\" .init`"
+SERVICE_NAME="munge"
 SIGTERM_TIMEOUT="3"
 
 # Read configuration defaults to override variables:


Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/devel/munge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- munge.spec	21 Aug 2009 14:33:25 -0000	1.2
+++ munge.spec	26 Sep 2009 10:13:09 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -18,6 +18,10 @@ Patch0:         initd-pass-rpmlint.patch
 Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
+# Was loading /etc/sysconfig/munge wrongly on reboot.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
+# Fixed upstream already for next release.
+Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
@@ -53,6 +57,7 @@ Header files for developing using MUNGE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -88,13 +93,14 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUI
 chmod 700 $RPM_BUILD_ROOT%{_var}/lib/munge $RPM_BUILD_ROOT%{_var}/log/munge
 chmod 700 $RPM_BUILD_ROOT%{_sysconfdir}/munge
 
-# Create and empty key file to be marked as a ghost file below.
+# Create and empty key file and pid file to be marked as a ghost file below.
 # i.e it is not actually included in the rpm, only the record 
 # of it is.
 # Can't be done on .el4 or .el5.
 %if ! 0%{?el4}%{?el5}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
-chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+touch $RPM_BUILD_ROOT%{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %clean
@@ -142,11 +148,12 @@ exit 0
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
 
-%attr(0700,munge,munge) %dir  %{_var}/run/munge
+%attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
 %attr(0700,munge,munge) %dir %{_sysconfdir}/munge
 %if ! 0%{?el4}%{?el5}
 %attr(0400,munge,munge) %ghost %{_sysconfdir}/%{name}/%{name}.key
+%attr(-,munge,munge)    %ghost %{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %attr(0700,munge,munge) %dir  %{_var}/lib/munge
@@ -182,6 +189,12 @@ exit 0
 
 
 %changelog
+* Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
+- Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
+  correctly.
+- Mark pid file as ghost file on oses that support that.
+- Permisions on pid directory to 755
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
 - rebuilt with new openssl
 



From drago01 at fedoraproject.org  Sat Sep 26 10:26:23 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Sep 2009 10:26:23 +0000 (UTC)
Subject: rpms/pigz/devel pigz.spec,1.1,1.2
Message-ID: <20090926102624.04FAF11C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pigz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18108

Modified Files:
	pigz.spec 
Log Message:
Preserve timestamps


Index: pigz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/devel/pigz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pigz.spec	26 Sep 2009 08:09:24 -0000	1.1
+++ pigz.spec	26 Sep 2009 10:26:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pigz
 Version:        2.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel implementation of gzip
 
 Group:          Applications/File
@@ -26,9 +26,9 @@ make %{?_smp_mflags} CFLAGS='%{optflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
-install -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
-install -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
+install -p -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
+install -p -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
+install -p -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-3
+- Preserve timestamps  
+
 * Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-2
 - Fix license tag
 



From jussilehtola at fedoraproject.org  Sat Sep 26 10:26:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 26 Sep 2009 10:26:25 +0000 (UTC)
Subject: rpms/noip/EL-4 noip.spec,1.1,1.2
Message-ID: <20090926102625.52ECC11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/noip/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034/EL-4

Modified Files:
	noip.spec 
Log Message:
Removed exit statement from %%post.


Index: noip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/noip/EL-4/noip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- noip.spec	27 Mar 2009 20:47:33 -0000	1.1
+++ noip.spec	26 Sep 2009 10:26:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		noip
 Version:	2.1.9
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A dynamic DNS update client
 Group:		System Environment/Daemons
 License:	GPLv2+
@@ -55,7 +55,6 @@ getent group noip >/dev/null || groupadd
 getent passwd noip >/dev/null || \ 
 	useradd -r -g noip -d /var/run/noip -s /sbin/nologin \
 	-c "No-ip daemon user" noip
-exit 0
 
 %post
 # This adds the proper /etc/rc*.d links for the script
@@ -79,14 +78,20 @@ rm -rf %{buildroot}
 %{_initrddir}/noip
 
 %changelog
-* Sat Mar 14 2009 Jussi Lehtola - 2.1.9-3
+* Sat Sep 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-5
+- Remove exit statement from %%pre.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Mar 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-3
 - Fix initrd file.
 
-* Thu Nov 27 2008 Jussi Lehtola - 2.1.9-2
+* Thu Nov 27 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-2
 - Add forgotten init file patch.
 
-* Tue Nov 25 2008 Jussi Lehtola - 2.1.9-1
+* Tue Nov 25 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-1
 - Update to 2.1.9.
 
-* Thu Nov 06 2008 Jussi Lehtola - 2.1.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.7-1
 - First release.



From jussilehtola at fedoraproject.org  Sat Sep 26 10:26:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 26 Sep 2009 10:26:25 +0000 (UTC)
Subject: rpms/noip/EL-5 noip.spec,1.1,1.2
Message-ID: <20090926102625.8D6EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/noip/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034/EL-5

Modified Files:
	noip.spec 
Log Message:
Removed exit statement from %%post.


Index: noip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/noip/EL-5/noip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- noip.spec	27 Mar 2009 20:47:33 -0000	1.1
+++ noip.spec	26 Sep 2009 10:26:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		noip
 Version:	2.1.9
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A dynamic DNS update client
 Group:		System Environment/Daemons
 License:	GPLv2+
@@ -55,7 +55,6 @@ getent group noip >/dev/null || groupadd
 getent passwd noip >/dev/null || \ 
 	useradd -r -g noip -d /var/run/noip -s /sbin/nologin \
 	-c "No-ip daemon user" noip
-exit 0
 
 %post
 # This adds the proper /etc/rc*.d links for the script
@@ -79,14 +78,20 @@ rm -rf %{buildroot}
 %{_initrddir}/noip
 
 %changelog
-* Sat Mar 14 2009 Jussi Lehtola - 2.1.9-3
+* Sat Sep 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-5
+- Remove exit statement from %%pre.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Mar 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-3
 - Fix initrd file.
 
-* Thu Nov 27 2008 Jussi Lehtola - 2.1.9-2
+* Thu Nov 27 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-2
 - Add forgotten init file patch.
 
-* Tue Nov 25 2008 Jussi Lehtola - 2.1.9-1
+* Tue Nov 25 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-1
 - Update to 2.1.9.
 
-* Thu Nov 06 2008 Jussi Lehtola - 2.1.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.7-1
 - First release.



From jussilehtola at fedoraproject.org  Sat Sep 26 10:26:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 26 Sep 2009 10:26:25 +0000 (UTC)
Subject: rpms/noip/F-10 noip.spec,1.1,1.2
Message-ID: <20090926102625.C023011C02BB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/noip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034/F-10

Modified Files:
	noip.spec 
Log Message:
Removed exit statement from %%post.


Index: noip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/noip/F-10/noip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- noip.spec	27 Mar 2009 20:47:33 -0000	1.1
+++ noip.spec	26 Sep 2009 10:26:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		noip
 Version:	2.1.9
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A dynamic DNS update client
 Group:		System Environment/Daemons
 License:	GPLv2+
@@ -55,7 +55,6 @@ getent group noip >/dev/null || groupadd
 getent passwd noip >/dev/null || \ 
 	useradd -r -g noip -d /var/run/noip -s /sbin/nologin \
 	-c "No-ip daemon user" noip
-exit 0
 
 %post
 # This adds the proper /etc/rc*.d links for the script
@@ -79,14 +78,20 @@ rm -rf %{buildroot}
 %{_initrddir}/noip
 
 %changelog
-* Sat Mar 14 2009 Jussi Lehtola - 2.1.9-3
+* Sat Sep 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-5
+- Remove exit statement from %%pre.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Mar 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-3
 - Fix initrd file.
 
-* Thu Nov 27 2008 Jussi Lehtola - 2.1.9-2
+* Thu Nov 27 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-2
 - Add forgotten init file patch.
 
-* Tue Nov 25 2008 Jussi Lehtola - 2.1.9-1
+* Tue Nov 25 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-1
 - Update to 2.1.9.
 
-* Thu Nov 06 2008 Jussi Lehtola - 2.1.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.7-1
 - First release.



From jussilehtola at fedoraproject.org  Sat Sep 26 10:26:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 26 Sep 2009 10:26:25 +0000 (UTC)
Subject: rpms/noip/F-11 noip.spec,1.1,1.2
Message-ID: <20090926102625.ED50911C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/noip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034/F-11

Modified Files:
	noip.spec 
Log Message:
Removed exit statement from %%post.


Index: noip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/noip/F-11/noip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- noip.spec	27 Mar 2009 20:45:12 -0000	1.1
+++ noip.spec	26 Sep 2009 10:26:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		noip
 Version:	2.1.9
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A dynamic DNS update client
 Group:		System Environment/Daemons
 License:	GPLv2+
@@ -55,7 +55,6 @@ getent group noip >/dev/null || groupadd
 getent passwd noip >/dev/null || \ 
 	useradd -r -g noip -d /var/run/noip -s /sbin/nologin \
 	-c "No-ip daemon user" noip
-exit 0
 
 %post
 # This adds the proper /etc/rc*.d links for the script
@@ -79,14 +78,20 @@ rm -rf %{buildroot}
 %{_initrddir}/noip
 
 %changelog
-* Sat Mar 14 2009 Jussi Lehtola - 2.1.9-3
+* Sat Sep 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-5
+- Remove exit statement from %%pre.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Mar 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-3
 - Fix initrd file.
 
-* Thu Nov 27 2008 Jussi Lehtola - 2.1.9-2
+* Thu Nov 27 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-2
 - Add forgotten init file patch.
 
-* Tue Nov 25 2008 Jussi Lehtola - 2.1.9-1
+* Tue Nov 25 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-1
 - Update to 2.1.9.
 
-* Thu Nov 06 2008 Jussi Lehtola - 2.1.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.7-1
 - First release.



From jussilehtola at fedoraproject.org  Sat Sep 26 10:26:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 26 Sep 2009 10:26:26 +0000 (UTC)
Subject: rpms/noip/devel noip.spec,1.2,1.3
Message-ID: <20090926102626.26B8E11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/noip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034/devel

Modified Files:
	noip.spec 
Log Message:
Removed exit statement from %%post.


Index: noip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/noip/devel/noip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- noip.spec	25 Jul 2009 19:28:53 -0000	1.2
+++ noip.spec	26 Sep 2009 10:26:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		noip
 Version:	2.1.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A dynamic DNS update client
 Group:		System Environment/Daemons
 License:	GPLv2+
@@ -55,7 +55,6 @@ getent group noip >/dev/null || groupadd
 getent passwd noip >/dev/null || \ 
 	useradd -r -g noip -d /var/run/noip -s /sbin/nologin \
 	-c "No-ip daemon user" noip
-exit 0
 
 %post
 # This adds the proper /etc/rc*.d links for the script
@@ -79,17 +78,20 @@ rm -rf %{buildroot}
 %{_initrddir}/noip
 
 %changelog
+* Sat Sep 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-5
+- Remove exit statement from %%pre.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sat Mar 14 2009 Jussi Lehtola - 2.1.9-3
+* Sat Mar 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-3
 - Fix initrd file.
 
-* Thu Nov 27 2008 Jussi Lehtola - 2.1.9-2
+* Thu Nov 27 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-2
 - Add forgotten init file patch.
 
-* Tue Nov 25 2008 Jussi Lehtola - 2.1.9-1
+* Tue Nov 25 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.9-1
 - Update to 2.1.9.
 
-* Thu Nov 06 2008 Jussi Lehtola - 2.1.7-1
+* Thu Nov 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.7-1
 - First release.



From drago01 at fedoraproject.org  Sat Sep 26 10:26:41 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Sep 2009 10:26:41 +0000 (UTC)
Subject: rpms/pigz/F-11 pigz.spec,1.1,1.2
Message-ID: <20090926102641.AD3CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pigz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18309

Modified Files:
	pigz.spec 
Log Message:
Preserve timestamps


Index: pigz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/F-11/pigz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pigz.spec	26 Sep 2009 08:10:21 -0000	1.1
+++ pigz.spec	26 Sep 2009 10:26:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pigz
 Version:        2.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel implementation of gzip
 
 Group:          Applications/File
@@ -26,9 +26,9 @@ make %{?_smp_mflags} CFLAGS='%{optflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
-install -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
-install -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
+install -p -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
+install -p -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
+install -p -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-3
+- Preserve timestamps  
+
 * Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-2
 - Fix license tag
 



From drago01 at fedoraproject.org  Sat Sep 26 10:26:57 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Sep 2009 10:26:57 +0000 (UTC)
Subject: rpms/pigz/F-10 pigz.spec,1.1,1.2
Message-ID: <20090926102657.3AEDE11C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pigz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18461

Modified Files:
	pigz.spec 
Log Message:
Preserve timestamps


Index: pigz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pigz/F-10/pigz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pigz.spec	26 Sep 2009 08:11:09 -0000	1.1
+++ pigz.spec	26 Sep 2009 10:26:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pigz
 Version:        2.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel implementation of gzip
 
 Group:          Applications/File
@@ -26,9 +26,9 @@ make %{?_smp_mflags} CFLAGS='%{optflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
-install -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
-install -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
+install -p -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
+install -p -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
+install -p -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-3
+- Preserve timestamps  
+
 * Sat Sep 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.1.5-2
 - Fix license tag
 



From stevetraylen at fedoraproject.org  Sat Sep 26 10:28:51 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 10:28:51 +0000 (UTC)
Subject: rpms/munge/EL-4 munge-correct-service-name.patch, NONE,
	1.1 munge.spec, 1.1, 1.2
Message-ID: <20090926102851.C3FA011C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19307

Modified Files:
	munge.spec 
Added Files:
	munge-correct-service-name.patch 
Log Message:
Fix rhbz #525732

munge-correct-service-name.patch:
 munge.init.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE munge-correct-service-name.patch ---
diff -uNr munge-0.5.8.ORIG/src/etc/munge.init.in munge-0.5.8/src/etc/munge.init.in
--- munge-0.5.8.ORIG/src/etc/munge.init.in	2009-09-26 11:13:03.929914545 +0200
+++ munge-0.5.8/src/etc/munge.init.in	2009-09-26 11:17:04.830846880 +0200
@@ -42,7 +42,7 @@
 
 PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
 DAEMON_NAME="`basename \"$DAEMON\"`"
-SERVICE_NAME="`basename \"$0\" .init`"
+SERVICE_NAME="munge"
 SIGTERM_TIMEOUT="3"
 
 # Read configuration defaults to override variables:


Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/EL-4/munge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- munge.spec	30 Jul 2009 08:22:13 -0000	1.1
+++ munge.spec	26 Sep 2009 10:28:51 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -18,6 +18,10 @@ Patch0:         initd-pass-rpmlint.patch
 Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
+# Was loading /etc/sysconfig/munge wrongly on reboot.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
+# Fixed upstream already for next release.
+Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
@@ -53,6 +57,7 @@ Header files for developing using MUNGE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -88,13 +93,14 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUI
 chmod 700 $RPM_BUILD_ROOT%{_var}/lib/munge $RPM_BUILD_ROOT%{_var}/log/munge
 chmod 700 $RPM_BUILD_ROOT%{_sysconfdir}/munge
 
-# Create and empty key file to be marked as a ghost file below.
+# Create and empty key file and pid file to be marked as a ghost file below.
 # i.e it is not actually included in the rpm, only the record 
 # of it is.
 # Can't be done on .el4 or .el5.
 %if ! 0%{?el4}%{?el5}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
-chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+touch $RPM_BUILD_ROOT%{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %clean
@@ -142,11 +148,12 @@ exit 0
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
 
-%attr(0700,munge,munge) %dir  %{_var}/run/munge
+%attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
 %attr(0700,munge,munge) %dir %{_sysconfdir}/munge
 %if ! 0%{?el4}%{?el5}
 %attr(0400,munge,munge) %ghost %{_sysconfdir}/%{name}/%{name}.key
+%attr(-,munge,munge)    %ghost %{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %attr(0700,munge,munge) %dir  %{_var}/lib/munge
@@ -182,6 +189,15 @@ exit 0
 
 
 %changelog
+* Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
+- Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
+  correctly.
+- Mark pid file as ghost file on oses that support that.
+- Permisions on pid directory to 755
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
+- rebuilt with new openssl
+
 * Thu Jul 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-4
 - Expand defattr with 4th argument for default directory perms.
 - Explict attr for non 0644 files and 0755 directories.



From stevetraylen at fedoraproject.org  Sat Sep 26 10:29:11 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 10:29:11 +0000 (UTC)
Subject: rpms/munge/EL-5 munge-correct-service-name.patch, NONE,
	1.1 munge.spec, 1.1, 1.2
Message-ID: <20090926102911.D571611C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19462

Modified Files:
	munge.spec 
Added Files:
	munge-correct-service-name.patch 
Log Message:
Fix rhbz #525732

munge-correct-service-name.patch:
 munge.init.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE munge-correct-service-name.patch ---
diff -uNr munge-0.5.8.ORIG/src/etc/munge.init.in munge-0.5.8/src/etc/munge.init.in
--- munge-0.5.8.ORIG/src/etc/munge.init.in	2009-09-26 11:13:03.929914545 +0200
+++ munge-0.5.8/src/etc/munge.init.in	2009-09-26 11:17:04.830846880 +0200
@@ -42,7 +42,7 @@
 
 PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
 DAEMON_NAME="`basename \"$DAEMON\"`"
-SERVICE_NAME="`basename \"$0\" .init`"
+SERVICE_NAME="munge"
 SIGTERM_TIMEOUT="3"
 
 # Read configuration defaults to override variables:


Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/EL-5/munge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- munge.spec	30 Jul 2009 08:22:14 -0000	1.1
+++ munge.spec	26 Sep 2009 10:29:11 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -18,6 +18,10 @@ Patch0:         initd-pass-rpmlint.patch
 Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
+# Was loading /etc/sysconfig/munge wrongly on reboot.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
+# Fixed upstream already for next release.
+Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
@@ -53,6 +57,7 @@ Header files for developing using MUNGE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -88,13 +93,14 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUI
 chmod 700 $RPM_BUILD_ROOT%{_var}/lib/munge $RPM_BUILD_ROOT%{_var}/log/munge
 chmod 700 $RPM_BUILD_ROOT%{_sysconfdir}/munge
 
-# Create and empty key file to be marked as a ghost file below.
+# Create and empty key file and pid file to be marked as a ghost file below.
 # i.e it is not actually included in the rpm, only the record 
 # of it is.
 # Can't be done on .el4 or .el5.
 %if ! 0%{?el4}%{?el5}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
-chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+touch $RPM_BUILD_ROOT%{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %clean
@@ -142,11 +148,12 @@ exit 0
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
 
-%attr(0700,munge,munge) %dir  %{_var}/run/munge
+%attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
 %attr(0700,munge,munge) %dir %{_sysconfdir}/munge
 %if ! 0%{?el4}%{?el5}
 %attr(0400,munge,munge) %ghost %{_sysconfdir}/%{name}/%{name}.key
+%attr(-,munge,munge)    %ghost %{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %attr(0700,munge,munge) %dir  %{_var}/lib/munge
@@ -182,6 +189,15 @@ exit 0
 
 
 %changelog
+* Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
+- Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
+  correctly.
+- Mark pid file as ghost file on oses that support that.
+- Permisions on pid directory to 755
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
+- rebuilt with new openssl
+
 * Thu Jul 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-4
 - Expand defattr with 4th argument for default directory perms.
 - Explict attr for non 0644 files and 0755 directories.



From stevetraylen at fedoraproject.org  Sat Sep 26 10:29:31 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 10:29:31 +0000 (UTC)
Subject: rpms/munge/F-10 munge-correct-service-name.patch, NONE,
	1.1 munge.spec, 1.1, 1.2
Message-ID: <20090926102931.EA19211C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19607

Modified Files:
	munge.spec 
Added Files:
	munge-correct-service-name.patch 
Log Message:
Fix rhbz #525732

munge-correct-service-name.patch:
 munge.init.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE munge-correct-service-name.patch ---
diff -uNr munge-0.5.8.ORIG/src/etc/munge.init.in munge-0.5.8/src/etc/munge.init.in
--- munge-0.5.8.ORIG/src/etc/munge.init.in	2009-09-26 11:13:03.929914545 +0200
+++ munge-0.5.8/src/etc/munge.init.in	2009-09-26 11:17:04.830846880 +0200
@@ -42,7 +42,7 @@
 
 PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
 DAEMON_NAME="`basename \"$DAEMON\"`"
-SERVICE_NAME="`basename \"$0\" .init`"
+SERVICE_NAME="munge"
 SIGTERM_TIMEOUT="3"
 
 # Read configuration defaults to override variables:


Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-10/munge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- munge.spec	30 Jul 2009 08:22:14 -0000	1.1
+++ munge.spec	26 Sep 2009 10:29:31 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -18,6 +18,10 @@ Patch0:         initd-pass-rpmlint.patch
 Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
+# Was loading /etc/sysconfig/munge wrongly on reboot.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
+# Fixed upstream already for next release.
+Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
@@ -53,6 +57,7 @@ Header files for developing using MUNGE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -88,13 +93,14 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUI
 chmod 700 $RPM_BUILD_ROOT%{_var}/lib/munge $RPM_BUILD_ROOT%{_var}/log/munge
 chmod 700 $RPM_BUILD_ROOT%{_sysconfdir}/munge
 
-# Create and empty key file to be marked as a ghost file below.
+# Create and empty key file and pid file to be marked as a ghost file below.
 # i.e it is not actually included in the rpm, only the record 
 # of it is.
 # Can't be done on .el4 or .el5.
 %if ! 0%{?el4}%{?el5}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
-chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+touch $RPM_BUILD_ROOT%{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %clean
@@ -142,11 +148,12 @@ exit 0
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
 
-%attr(0700,munge,munge) %dir  %{_var}/run/munge
+%attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
 %attr(0700,munge,munge) %dir %{_sysconfdir}/munge
 %if ! 0%{?el4}%{?el5}
 %attr(0400,munge,munge) %ghost %{_sysconfdir}/%{name}/%{name}.key
+%attr(-,munge,munge)    %ghost %{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %attr(0700,munge,munge) %dir  %{_var}/lib/munge
@@ -182,6 +189,15 @@ exit 0
 
 
 %changelog
+* Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
+- Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
+  correctly.
+- Mark pid file as ghost file on oses that support that.
+- Permisions on pid directory to 755
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
+- rebuilt with new openssl
+
 * Thu Jul 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-4
 - Expand defattr with 4th argument for default directory perms.
 - Explict attr for non 0644 files and 0755 directories.



From stevetraylen at fedoraproject.org  Sat Sep 26 10:29:52 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 10:29:52 +0000 (UTC)
Subject: rpms/munge/F-11 munge-correct-service-name.patch, NONE,
	1.1 munge.spec, 1.1, 1.2
Message-ID: <20090926102952.F057911C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19751

Modified Files:
	munge.spec 
Added Files:
	munge-correct-service-name.patch 
Log Message:
Fix rhbz #525732

munge-correct-service-name.patch:
 munge.init.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE munge-correct-service-name.patch ---
diff -uNr munge-0.5.8.ORIG/src/etc/munge.init.in munge-0.5.8/src/etc/munge.init.in
--- munge-0.5.8.ORIG/src/etc/munge.init.in	2009-09-26 11:13:03.929914545 +0200
+++ munge-0.5.8/src/etc/munge.init.in	2009-09-26 11:17:04.830846880 +0200
@@ -42,7 +42,7 @@
 
 PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
 DAEMON_NAME="`basename \"$DAEMON\"`"
-SERVICE_NAME="`basename \"$0\" .init`"
+SERVICE_NAME="munge"
 SIGTERM_TIMEOUT="3"
 
 # Read configuration defaults to override variables:


Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-11/munge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- munge.spec	30 Jul 2009 08:22:15 -0000	1.1
+++ munge.spec	26 Sep 2009 10:29:52 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -18,6 +18,10 @@ Patch0:         initd-pass-rpmlint.patch
 Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
+# Was loading /etc/sysconfig/munge wrongly on reboot.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
+# Fixed upstream already for next release.
+Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
@@ -53,6 +57,7 @@ Header files for developing using MUNGE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -88,13 +93,14 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUI
 chmod 700 $RPM_BUILD_ROOT%{_var}/lib/munge $RPM_BUILD_ROOT%{_var}/log/munge
 chmod 700 $RPM_BUILD_ROOT%{_sysconfdir}/munge
 
-# Create and empty key file to be marked as a ghost file below.
+# Create and empty key file and pid file to be marked as a ghost file below.
 # i.e it is not actually included in the rpm, only the record 
 # of it is.
 # Can't be done on .el4 or .el5.
 %if ! 0%{?el4}%{?el5}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
-chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/munge/munge.key
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+chmod 400 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.key
+touch $RPM_BUILD_ROOT%{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %clean
@@ -142,11 +148,12 @@ exit 0
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
 
-%attr(0700,munge,munge) %dir  %{_var}/run/munge
+%attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
 %attr(0700,munge,munge) %dir %{_sysconfdir}/munge
 %if ! 0%{?el4}%{?el5}
 %attr(0400,munge,munge) %ghost %{_sysconfdir}/%{name}/%{name}.key
+%attr(-,munge,munge)    %ghost %{_var}/run/%{name}/%{name}d.pid
 %endif
 
 %attr(0700,munge,munge) %dir  %{_var}/lib/munge
@@ -182,6 +189,15 @@ exit 0
 
 
 %changelog
+* Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
+- Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
+  correctly.
+- Mark pid file as ghost file on oses that support that.
+- Permisions on pid directory to 755
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
+- rebuilt with new openssl
+
 * Thu Jul 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-4
 - Expand defattr with 4th argument for default directory perms.
 - Explict attr for non 0644 files and 0755 directories.



From hadess at fedoraproject.org  Sat Sep 26 11:05:55 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 26 Sep 2009 11:05:55 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.16, 1.17 obexd.spec, 1.17,
	1.18 sources, 1.16, 1.17
Message-ID: <20090926110555.3653A11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30292

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Sat Sep 26 2009 Bastien Nocera <bnocera at redhat.com> 0.18-1
- Update to 0.18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	1 Sep 2009 14:59:24 -0000	1.16
+++ .cvsignore	26 Sep 2009 11:05:54 -0000	1.17
@@ -1 +1 @@
-obexd-0.17.tar.gz
+obexd-0.18.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- obexd.spec	10 Sep 2009 17:45:14 -0000	1.17
+++ obexd.spec	26 Sep 2009 11:05:54 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		obexd
-Version:	0.17
-Release:	2%{?dist}
+Version:	0.18
+Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Sat Sep 26 2009 Bastien Nocera <bnocera at redhat.com> 0.18-1
+- Update to 0.18
+
 * Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 0.17-2
 - ExcludeArch s390 s390x where we don't have openobex
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	1 Sep 2009 14:59:24 -0000	1.16
+++ sources	26 Sep 2009 11:05:55 -0000	1.17
@@ -1 +1 @@
-e4abc602c9ba34a862d97951acab8ae7  obexd-0.17.tar.gz
+5674f746b55439d32bc765d2c5baad16  obexd-0.18.tar.gz



From peter at fedoraproject.org  Sat Sep 26 12:31:40 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 26 Sep 2009 12:31:40 +0000 (UTC)
Subject: rpms/libgssapi/devel libgssapi.spec,1.27,1.28
Message-ID: <20090926123140.4A76211C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/libgssapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28543

Modified Files:
	libgssapi.spec 
Log Message:
Removed and obsoleted static libraries


Index: libgssapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libgssapi.spec	25 Sep 2009 10:13:42 -0000	1.27
+++ libgssapi.spec	26 Sep 2009 12:31:38 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.11
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: BSD and MIT
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.11.tar.gz
@@ -24,7 +24,7 @@ depending on the mechanism.
 Summary: Development files for the gssapi library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-static = %{version}-%{release}
+Obsoletes: %{name}-static < 0.11-8
 Requires: pkgconfig
 
 
@@ -51,6 +51,10 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 install -D -p -m 0644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
 
+# rm unused files
+rm -f %{buildroot}%{_libdir}/libgssapi.a
+rm -f %{buildroot}%{_libdir}/libgssapi.la
+
 
 %post -p /sbin/ldconfig
 
@@ -66,14 +70,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libgssapi.so.*
-%{_libdir}/libgssapi.la
+#%{_libdir}/libgssapi.la
 %config(noreplace) /etc/gssapi_mech.conf
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libgssapi.so
-%{_libdir}/libgssapi.a
+#%{_libdir}/libgssapi.a
 %dir %{_includedir}/gssglue
 %dir %{_includedir}/gssglue/gssapi
 %{_includedir}/gssglue/gssapi/gssapi.h
@@ -81,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.11-8
+- Removed and obsoleted static libraries.
+
 * Fri Sep 25 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.11-7
 - Fixed issues, found during Merge Review (bz #353975)
 



From mtasaka at fedoraproject.org  Sat Sep 26 12:52:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 12:52:59 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 .cvsignore, 1.8, 1.9 ruby-gnome2.spec, 1.47, 
	1.48 sources, 1.8, 1.9 ruby-gnome2-0.19.1-vte-depend.patch, 1.1,
	NONE
Message-ID: <20090926125259.95B8011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1411

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Removed Files:
	ruby-gnome2-0.19.1-vte-depend.patch 
Log Message:
* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
- Update to 0.19.3
- Released source does not support gio yet



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Aug 2009 19:02:22 -0000	1.8
+++ .cvsignore	26 Sep 2009 12:52:59 -0000	1.9
@@ -1 +1 @@
-ruby-gnome2-all-0.19.1.tar.gz
+ruby-gnome2-all-0.19.3.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ruby-gnome2.spec	9 Sep 2009 18:18:52 -0000	1.47
+++ ruby-gnome2.spec	26 Sep 2009 12:52:59 -0000	1.48
@@ -2,13 +2,13 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
+#%%define         betaver                svn3690_trunk
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                2
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -16,7 +16,7 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.1
+Version:        0.19.3
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
@@ -29,10 +29,9 @@ Group:          System Environment/Libra
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
+#Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# Will report upstream
-Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -764,8 +763,8 @@ This package provides libraries and head
 
 %prep
 %setup -q -n %{name}-all-%{version}
+#%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
-%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -778,6 +777,9 @@ find . -name \*.rb -or -name \*.c | whil
 done
 set -x
 
+# cleanup
+# find . -type d -path '*/sample/*.svn' | sort -r | xargs rm -rf
+
 %build
 ruby extconf.rb
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -804,7 +806,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnome2.pc
 
 %files -n ruby-atk
 %defattr(-,root,root,-)
@@ -816,7 +818,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
-%{_libdir}/pkgconfig/atk-ruby.pc
+%{_libdir}/pkgconfig/ruby-atk.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -826,7 +828,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonobo2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonobo2.pc
 
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
@@ -836,7 +838,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonoboui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonoboui2.pc
 
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
@@ -846,7 +848,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gconf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gconf2.pc
 
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
@@ -856,7 +858,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gdkpixbuf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gdkpixbuf2.pc
 
 %files -n ruby-glib2
 %defattr(-,root,root,-)
@@ -874,7 +876,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
-%{_libdir}/pkgconfig/glib-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-glib2.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -884,7 +886,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomecanvas2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomecanvas2.pc
 
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
@@ -895,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-gnomeprint2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rblibgnomeprintversion.h
-%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprint2.pc
 
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
@@ -905,7 +907,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomeprintui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprintui2.pc
 
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
@@ -915,7 +917,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomevfs-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomevfs.pc
 
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
@@ -925,7 +927,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-goocanvas-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/goocanvas-ruby.pc
+%{_libdir}/pkgconfig/ruby-goocanvas.pc
 
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
@@ -935,7 +937,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gstreamer-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+%{_libdir}/pkgconfig/ruby-gstreamer.pc
 
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
@@ -946,6 +948,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/gtk2/base.rb
 #%{ruby_sitelib}/gtk2/base.rb
 %{ruby_sitearch}/gtk2.so
+# For now include gio here
+%if 0
+%{ruby_sitelib}/gio2.rb
+%{ruby_sitearch}/gio2.so
+%endif
 
 %files -n ruby-gtk2-devel
 %defattr(-,root,root,-)
@@ -954,7 +961,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
-%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtk2.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -964,7 +971,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkglext-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkglext.pc
 
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
@@ -974,7 +981,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkhtml2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkhtml2.pc
 
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
@@ -984,7 +991,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkmozembed-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkmozembed.pc
 
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
@@ -994,7 +1001,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview.pc
 
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
@@ -1004,7 +1011,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview2.pc
 
 %files -n ruby-libart2
 %defattr(-,root,root,-)
@@ -1015,7 +1022,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
-%{_libdir}/pkgconfig/libart-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libart2.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -1027,7 +1034,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-libglade2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libglade2.pc
 
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
@@ -1037,7 +1044,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-panelapplet2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-panelapplet2.pc
 
 %files -n ruby-pango
 %defattr(-,root,root,-)
@@ -1049,7 +1056,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
-%{_libdir}/pkgconfig/pango-ruby.pc
+%{_libdir}/pkgconfig/ruby-pango.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -1059,7 +1066,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-poppler-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/poppler-ruby.pc
+%{_libdir}/pkgconfig/ruby-poppler.pc
 
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
@@ -1069,7 +1076,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-rsvg-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-rsvg2.pc
 
 %files -n ruby-vte
 %defattr(-,root,root,-)
@@ -1077,13 +1084,16 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
-%if 0
 %files -n ruby-vte-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/vte-ruby.pc
-%endif
+%{_libdir}/pkgconfig/ruby-vte.pc
+
 
 %changelog
+* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
+- Update to 0.19.3
+- Released source does not support gio yet
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Aug 2009 19:02:22 -0000	1.8
+++ sources	26 Sep 2009 12:52:59 -0000	1.9
@@ -1 +1 @@
-d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz
+771b0cb607a27bddd02860d38e94666f  ruby-gnome2-all-0.19.3.tar.gz


--- ruby-gnome2-0.19.1-vte-depend.patch DELETED ---



From sdz at fedoraproject.org  Sat Sep 26 13:09:08 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 13:09:08 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 zyx-liveinstaller.spec, 1.3, 1.4
Message-ID: <20090926130908.9BB0F11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6628

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2009 14:35:32 -0000	1.3
+++ .cvsignore	26 Sep 2009 13:09:08 -0000	1.4
@@ -1 +1 @@
-zyx-liveinstaller-0.1.11.tar.bz2
+zyx-liveinstaller-0.1.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2009 14:35:32 -0000	1.3
+++ sources	26 Sep 2009 13:09:08 -0000	1.4
@@ -1 +1 @@
-d6ed919c23b4fdb8cf616413aa65962a  zyx-liveinstaller-0.1.11.tar.bz2
+3b7fd11e81bdae310077f56952a47ccc  zyx-liveinstaller-0.1.12.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/zyx-liveinstaller.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zyx-liveinstaller.spec	12 Sep 2009 14:35:32 -0000	1.3
+++ zyx-liveinstaller.spec	26 Sep 2009 13:09:08 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.11
+Version:        0.1.12
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.12-1
+- update to new upstream release
+
 * Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.11-1
 - update to new upstream release
 



From sdz at fedoraproject.org  Sat Sep 26 13:10:11 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 13:10:11 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 zyx-liveinstaller.spec, 1.4, 1.5
Message-ID: <20090926131011.7268C11C0423@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7089

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2009 14:36:01 -0000	1.3
+++ .cvsignore	26 Sep 2009 13:10:11 -0000	1.4
@@ -1 +1 @@
-zyx-liveinstaller-0.1.11.tar.bz2
+zyx-liveinstaller-0.1.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2009 14:36:01 -0000	1.3
+++ sources	26 Sep 2009 13:10:11 -0000	1.4
@@ -1 +1 @@
-d6ed919c23b4fdb8cf616413aa65962a  zyx-liveinstaller-0.1.11.tar.bz2
+3b7fd11e81bdae310077f56952a47ccc  zyx-liveinstaller-0.1.12.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zyx-liveinstaller.spec	12 Sep 2009 14:38:41 -0000	1.4
+++ zyx-liveinstaller.spec	26 Sep 2009 13:10:11 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.11
+Version:        0.1.12
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.12-1
+- update to new upstream release
+
 * Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.11-1
 - update to new upstream release
 



From olea at fedoraproject.org  Sat Sep 26 13:20:42 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 26 Sep 2009 13:20:42 +0000 (UTC)
Subject: rpms/purple-microblog/devel .cvsignore, 1.7, 1.8 import.log, 1.4,
	1.5 purple-microblog.spec, 1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20090926132042.273FC11C00E6@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9637/devel

Modified Files:
	.cvsignore import.log purple-microblog.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2009 11:30:15 -0000	1.7
+++ .cvsignore	26 Sep 2009 13:20:41 -0000	1.8
@@ -1 +1 @@
-mbpurple-0.2.3.tar.gz
+mbpurple-0.2.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	13 Sep 2009 14:48:26 -0000	1.4
+++ import.log	26 Sep 2009 13:20:41 -0000	1.5
@@ -2,3 +2,4 @@ purple-microblog-0_1_2-2_20080911svn148_
 purple-microblog-0_2_2-1olea:HEAD:purple-microblog-0.2.2-1olea.src.rpm:1245015253
 purple-microblog-0_2_3-1_olea:HEAD:purple-microblog-0.2.3-1.olea.src.rpm:1252754970
 purple-microblog-0_2_3-3_olea:HEAD:purple-microblog-0.2.3-3.olea.src.rpm:1252852861
+purple-microblog-0_2_4-1_olea:HEAD:purple-microblog-0.2.4-1.olea.src.rpm:1253971168


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/purple-microblog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- purple-microblog.spec	13 Sep 2009 14:48:26 -0000	1.13
+++ purple-microblog.spec	26 Sep 2009 13:20:41 -0000	1.14
@@ -1,8 +1,8 @@
 %define upstream_name mbpurple
 
 Name:           purple-microblog
-Version:        0.2.3
-Release:        3%{?dist}
+Version:        0.2.4
+Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sat Sep 26 2009 Ismael Olea <ismael at olea.org> - 0.2.4-1
+- New upstream release
+
 * Sun Sep 13 2009 Ismael Olea <ismael at olea.org> - 0.2.3-3
 - fixing make invocation avoiding call to subversion
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 11:30:15 -0000	1.8
+++ sources	26 Sep 2009 13:20:41 -0000	1.9
@@ -1 +1 @@
-f7d208e67b9cec9088f25aac658b72e5  mbpurple-0.2.3.tar.gz
+2a7a29ec69a9e3d99a55c24ebf5aeae3  mbpurple-0.2.4.tar.gz



From olea at fedoraproject.org  Sat Sep 26 13:24:33 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 26 Sep 2009 13:24:33 +0000 (UTC)
Subject: rpms/purple-microblog/F-11 .cvsignore, 1.7, 1.8 import.log, 1.4,
	1.5 purple-microblog.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20090926132434.00ABC11C00E6@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11284/F-11

Modified Files:
	.cvsignore import.log purple-microblog.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2009 11:35:45 -0000	1.7
+++ .cvsignore	26 Sep 2009 13:24:33 -0000	1.8
@@ -1 +1 @@
-mbpurple-0.2.3.tar.gz
+mbpurple-0.2.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	13 Sep 2009 14:39:16 -0000	1.4
+++ import.log	26 Sep 2009 13:24:33 -0000	1.5
@@ -2,3 +2,4 @@ purple-microblog-0_1_2-2_20080911svn148_
 purple-microblog-0_2_2-1olea:F-11:purple-microblog-0.2.2-1olea.src.rpm:1245015255
 purple-microblog-0_2_3-1_olea:F-11:purple-microblog-0.2.3-1.olea.src.rpm:1252755184
 purple-microblog-0_2_3-3_olea:F-11:purple-microblog-0.2.3-3.olea.src.rpm:1252852551
+purple-microblog-0_2_4-1_olea:F-11:purple-microblog-0.2.4-1.olea.src.rpm:1253971411


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/purple-microblog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- purple-microblog.spec	13 Sep 2009 14:39:17 -0000	1.12
+++ purple-microblog.spec	26 Sep 2009 13:24:33 -0000	1.13
@@ -1,8 +1,8 @@
 %define upstream_name mbpurple
 
 Name:           purple-microblog
-Version:        0.2.3
-Release:        3%{?dist}
+Version:        0.2.4
+Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sat Sep 26 2009 Ismael Olea <ismael at olea.org> - 0.2.4-1
+- New upstream release
+
 * Sun Sep 13 2009 Ismael Olea <ismael at olea.org> - 0.2.3-3
 - fixing make invocation avoiding call to subversion
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 11:35:45 -0000	1.8
+++ sources	26 Sep 2009 13:24:33 -0000	1.9
@@ -1 +1 @@
-f7d208e67b9cec9088f25aac658b72e5  mbpurple-0.2.3.tar.gz
+2a7a29ec69a9e3d99a55c24ebf5aeae3  mbpurple-0.2.4.tar.gz



From olea at fedoraproject.org  Sat Sep 26 13:26:05 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Sat, 26 Sep 2009 13:26:05 +0000 (UTC)
Subject: rpms/purple-microblog/F-10 .cvsignore, 1.6, 1.7 import.log, 1.5,
	1.6 purple-microblog.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20090926132605.B9B7811C00E6@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11806/F-10

Modified Files:
	.cvsignore import.log purple-microblog.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Sep 2009 11:38:42 -0000	1.6
+++ .cvsignore	26 Sep 2009 13:26:05 -0000	1.7
@@ -1 +1 @@
-mbpurple-0.2.3.tar.gz
+mbpurple-0.2.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	13 Sep 2009 14:34:59 -0000	1.5
+++ import.log	26 Sep 2009 13:26:05 -0000	1.6
@@ -3,3 +3,4 @@ purple-microblog-0_2_2-1olea:F-10:purple
 purple-microblog-0_2_3-1_olea:F-10:purple-microblog-0.2.3-1.olea.src.rpm:1252755464
 purple-microblog-0_2_3-2_olea:F-10:purple-microblog-0.2.3-2.olea.src.rpm:1252776946
 purple-microblog-0_2_3-3_olea:F-10:purple-microblog-0.2.3-3.olea.src.rpm:1252852370
+purple-microblog-0_2_4-1_olea:F-10:purple-microblog-0.2.4-1.olea.src.rpm:1253971501


Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/purple-microblog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- purple-microblog.spec	13 Sep 2009 14:34:59 -0000	1.12
+++ purple-microblog.spec	26 Sep 2009 13:26:05 -0000	1.13
@@ -1,8 +1,8 @@
 %define upstream_name mbpurple
 
 Name:           purple-microblog
-Version:        0.2.3
-Release:        3%{?dist}
+Version:        0.2.4
+Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Sat Sep 26 2009 Ismael Olea <ismael at olea.org> - 0.2.4-1
+- New upstream release
+
 * Sun Sep 13 2009 Ismael Olea <ismael at olea.org> - 0.2.3-3
 - fixing make invocation avoiding call to subversion
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 11:38:42 -0000	1.8
+++ sources	26 Sep 2009 13:26:05 -0000	1.9
@@ -1 +1 @@
-f7d208e67b9cec9088f25aac658b72e5  mbpurple-0.2.3.tar.gz
+2a7a29ec69a9e3d99a55c24ebf5aeae3  mbpurple-0.2.4.tar.gz



From mtasaka at fedoraproject.org  Sat Sep 26 13:35:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 13:35:11 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 .cvsignore, 1.8, 1.9 ruby-gnome2.spec, 1.50, 
	1.51 sources, 1.8, 1.9 ruby-gnome2-0.19.1-vte-depend.patch, 1.1,
	NONE
Message-ID: <20090926133511.AA1C811C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14672

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Removed Files:
	ruby-gnome2-0.19.1-vte-depend.patch 
Log Message:
* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
- Update to 0.19.3
- Released source does not support gio yet



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Aug 2009 19:12:30 -0000	1.8
+++ .cvsignore	26 Sep 2009 13:35:10 -0000	1.9
@@ -1 +1 @@
-ruby-gnome2-all-0.19.1.tar.gz
+ruby-gnome2-all-0.19.3.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ruby-gnome2.spec	9 Sep 2009 18:18:52 -0000	1.50
+++ ruby-gnome2.spec	26 Sep 2009 13:35:11 -0000	1.51
@@ -2,13 +2,13 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
+#%%define         betaver                svn3690_trunk
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                2
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -16,12 +16,12 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.1
-R#
+Version:        0.19.3
+#
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-elease:        %{mainrel}%{?dist}
+Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -29,10 +29,9 @@ Group:          System Environment/Libra
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
+#Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# Will report upstream
-Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -764,8 +763,8 @@ This package provides libraries and head
 
 %prep
 %setup -q -n %{name}-all-%{version}
+#%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
-%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -778,6 +777,9 @@ find . -name \*.rb -or -name \*.c | whil
 done
 set -x
 
+# cleanup
+# find . -type d -path '*/sample/*.svn' | sort -r | xargs rm -rf
+
 %build
 ruby extconf.rb
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -804,7 +806,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnome2.pc
 
 %files -n ruby-atk
 %defattr(-,root,root,-)
@@ -816,7 +818,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
-%{_libdir}/pkgconfig/atk-ruby.pc
+%{_libdir}/pkgconfig/ruby-atk.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -826,7 +828,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonobo2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonobo2.pc
 
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
@@ -836,7 +838,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-bonoboui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-bonoboui2.pc
 
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
@@ -846,7 +848,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gconf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gconf2.pc
 
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
@@ -856,7 +858,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gdkpixbuf2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gdkpixbuf2.pc
 
 %files -n ruby-glib2
 %defattr(-,root,root,-)
@@ -874,7 +876,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
-%{_libdir}/pkgconfig/glib-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-glib2.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -884,7 +886,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomecanvas2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomecanvas2.pc
 
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
@@ -895,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-gnomeprint2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rblibgnomeprintversion.h
-%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprint2.pc
 
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
@@ -905,7 +907,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomeprintui2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomeprintui2.pc
 
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
@@ -915,7 +917,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gnomevfs-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gnomevfs.pc
 
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
@@ -925,7 +927,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-goocanvas-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/goocanvas-ruby.pc
+%{_libdir}/pkgconfig/ruby-goocanvas.pc
 
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
@@ -935,7 +937,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gstreamer-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+%{_libdir}/pkgconfig/ruby-gstreamer.pc
 
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
@@ -946,6 +948,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/gtk2/base.rb
 #%{ruby_sitelib}/gtk2/base.rb
 %{ruby_sitearch}/gtk2.so
+# For now include gio here
+%if 0
+%{ruby_sitelib}/gio2.rb
+%{ruby_sitearch}/gio2.so
+%endif
 
 %files -n ruby-gtk2-devel
 %defattr(-,root,root,-)
@@ -954,7 +961,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
-%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtk2.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -964,7 +971,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkglext-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkglext.pc
 
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
@@ -974,7 +981,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkhtml2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkhtml2.pc
 
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
@@ -984,7 +991,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtkmozembed-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtkmozembed.pc
 
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
@@ -994,7 +1001,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview.pc
 
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
@@ -1004,7 +1011,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-gtksourceview2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-gtksourceview2.pc
 
 %files -n ruby-libart2
 %defattr(-,root,root,-)
@@ -1015,7 +1022,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
-%{_libdir}/pkgconfig/libart-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libart2.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -1027,7 +1034,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-libglade2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-libglade2.pc
 
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
@@ -1037,7 +1044,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-panelapplet2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-panelapplet2.pc
 
 %files -n ruby-pango
 %defattr(-,root,root,-)
@@ -1049,7 +1056,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
-%{_libdir}/pkgconfig/pango-ruby.pc
+%{_libdir}/pkgconfig/ruby-pango.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -1059,7 +1066,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-poppler-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/poppler-ruby.pc
+%{_libdir}/pkgconfig/ruby-poppler.pc
 
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
@@ -1069,7 +1076,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-rsvg-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+%{_libdir}/pkgconfig/ruby-rsvg2.pc
 
 %files -n ruby-vte
 %defattr(-,root,root,-)
@@ -1077,13 +1084,16 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
-%if 0
 %files -n ruby-vte-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/vte-ruby.pc
-%endif
+%{_libdir}/pkgconfig/ruby-vte.pc
+
 
 %changelog
+* Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
+- Update to 0.19.3
+- Released source does not support gio yet
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Aug 2009 19:12:30 -0000	1.8
+++ sources	26 Sep 2009 13:35:11 -0000	1.9
@@ -1 +1 @@
-d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz
+771b0cb607a27bddd02860d38e94666f  ruby-gnome2-all-0.19.3.tar.gz


--- ruby-gnome2-0.19.1-vte-depend.patch DELETED ---



From stevetraylen at fedoraproject.org  Sat Sep 26 13:47:36 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 13:47:36 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/devel import.log, NONE,
	1.1 perl-IPC-DirQueue.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090926134736.831C911C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17921/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-IPC-DirQueue.spec 
Log Message:
Initial Import #525077


--- NEW FILE import.log ---
perl-IPC-DirQueue-1_0-2_fc11:HEAD:perl-IPC-DirQueue-1.0-2.fc11.src.rpm:1253972798


--- NEW FILE perl-IPC-DirQueue.spec ---
Name:           perl-IPC-DirQueue
Version:        1.0
Release:        2%{?dist}
Summary:        Disk-based many-to-many task queue
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-DirQueue/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-DirQueue-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)

%if %{?rhel}%{!?rhel:0} == 4
BuildRequires:  perl(Time::HiRes) 
%endif

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a FIFO queueing infrastructure, using a directory as
the communications and storage media. No daemon process is required to
manage the queue; all communication takes place via the filesystem.

%prep
%setup -q -n IPC-DirQueue-%{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 BUGS CHANGES README.dist TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
%{_bindir}/*

%changelog
* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-2
- Build requires perl(Time::HiRes) explicitly on RHEL4.

* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:48:45 -0000	1.1
+++ .cvsignore	26 Sep 2009 13:47:35 -0000	1.2
@@ -0,0 +1 @@
+IPC-DirQueue-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:48:45 -0000	1.1
+++ sources	26 Sep 2009 13:47:35 -0000	1.2
@@ -0,0 +1 @@
+1fc4640118a333f2d4a8a45f37297995  IPC-DirQueue-1.0.tar.gz



From stevetraylen at fedoraproject.org  Sat Sep 26 13:53:16 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 13:53:16 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/EL-4 perl-IPC-DirQueue.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926135316.3106A11C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19514/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-DirQueue.spec 
Log Message:
Populate branches.



--- NEW FILE perl-IPC-DirQueue.spec ---
Name:           perl-IPC-DirQueue
Version:        1.0
Release:        2%{?dist}
Summary:        Disk-based many-to-many task queue
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-DirQueue/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-DirQueue-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)

%if %{?rhel}%{!?rhel:0} == 4
BuildRequires:  perl(Time::HiRes) 
%endif

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a FIFO queueing infrastructure, using a directory as
the communications and storage media. No daemon process is required to
manage the queue; all communication takes place via the filesystem.

%prep
%setup -q -n IPC-DirQueue-%{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 BUGS CHANGES README.dist TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
%{_bindir}/*

%changelog
* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-2
- Build requires perl(Time::HiRes) explicitly on RHEL4.

* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:48:45 -0000	1.1
+++ .cvsignore	26 Sep 2009 13:53:15 -0000	1.2
@@ -0,0 +1 @@
+IPC-DirQueue-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:48:45 -0000	1.1
+++ sources	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+1fc4640118a333f2d4a8a45f37297995  IPC-DirQueue-1.0.tar.gz



From stevetraylen at fedoraproject.org  Sat Sep 26 13:53:16 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 13:53:16 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/F-12 perl-IPC-DirQueue.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926135316.C004C11C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19514/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-DirQueue.spec 
Log Message:
Populate branches.



--- NEW FILE perl-IPC-DirQueue.spec ---
Name:           perl-IPC-DirQueue
Version:        1.0
Release:        2%{?dist}
Summary:        Disk-based many-to-many task queue
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-DirQueue/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-DirQueue-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)

%if %{?rhel}%{!?rhel:0} == 4
BuildRequires:  perl(Time::HiRes) 
%endif

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a FIFO queueing infrastructure, using a directory as
the communications and storage media. No daemon process is required to
manage the queue; all communication takes place via the filesystem.

%prep
%setup -q -n IPC-DirQueue-%{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 BUGS CHANGES README.dist TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
%{_bindir}/*

%changelog
* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-2
- Build requires perl(Time::HiRes) explicitly on RHEL4.

* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:48:45 -0000	1.1
+++ .cvsignore	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+IPC-DirQueue-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:48:45 -0000	1.1
+++ sources	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+1fc4640118a333f2d4a8a45f37297995  IPC-DirQueue-1.0.tar.gz



From stevetraylen at fedoraproject.org  Sat Sep 26 13:53:16 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 13:53:16 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/EL-5 perl-IPC-DirQueue.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926135316.5648311C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19514/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-DirQueue.spec 
Log Message:
Populate branches.



--- NEW FILE perl-IPC-DirQueue.spec ---
Name:           perl-IPC-DirQueue
Version:        1.0
Release:        2%{?dist}
Summary:        Disk-based many-to-many task queue
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-DirQueue/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-DirQueue-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)

%if %{?rhel}%{!?rhel:0} == 4
BuildRequires:  perl(Time::HiRes) 
%endif

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a FIFO queueing infrastructure, using a directory as
the communications and storage media. No daemon process is required to
manage the queue; all communication takes place via the filesystem.

%prep
%setup -q -n IPC-DirQueue-%{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 BUGS CHANGES README.dist TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
%{_bindir}/*

%changelog
* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-2
- Build requires perl(Time::HiRes) explicitly on RHEL4.

* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:48:45 -0000	1.1
+++ .cvsignore	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+IPC-DirQueue-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:48:45 -0000	1.1
+++ sources	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+1fc4640118a333f2d4a8a45f37297995  IPC-DirQueue-1.0.tar.gz



From stevetraylen at fedoraproject.org  Sat Sep 26 13:53:16 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat, 26 Sep 2009 13:53:16 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/F-11 perl-IPC-DirQueue.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926135316.8736311C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19514/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-DirQueue.spec 
Log Message:
Populate branches.



--- NEW FILE perl-IPC-DirQueue.spec ---
Name:           perl-IPC-DirQueue
Version:        1.0
Release:        2%{?dist}
Summary:        Disk-based many-to-many task queue
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-DirQueue/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-DirQueue-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)

%if %{?rhel}%{!?rhel:0} == 4
BuildRequires:  perl(Time::HiRes) 
%endif

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a FIFO queueing infrastructure, using a directory as
the communications and storage media. No daemon process is required to
manage the queue; all communication takes place via the filesystem.

%prep
%setup -q -n IPC-DirQueue-%{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 BUGS CHANGES README.dist TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
%{_bindir}/*

%changelog
* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-2
- Build requires perl(Time::HiRes) explicitly on RHEL4.

* Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:48:45 -0000	1.1
+++ .cvsignore	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+IPC-DirQueue-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:48:45 -0000	1.1
+++ sources	26 Sep 2009 13:53:16 -0000	1.2
@@ -0,0 +1 @@
+1fc4640118a333f2d4a8a45f37297995  IPC-DirQueue-1.0.tar.gz



From remi at fedoraproject.org  Sat Sep 26 13:55:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 26 Sep 2009 13:55:32 +0000 (UTC)
Subject: rpms/yum-arch/devel yum-arch-python26.patch, 1.1, 1.2 yum-arch.spec,
	1.6, 1.7
Message-ID: <20090926135532.E26EC11C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/yum-arch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20500

Modified Files:
	yum-arch-python26.patch yum-arch.spec 
Log Message:
fix python 2.6 warnings (#521869)

yum-arch-python26.patch:
 rpmUtils/oldUtils.py |    5 ++++-
 yum/__init__.py      |    2 +-
 yum/depsolve.py      |    2 +-
 yum/pgpmsg.py        |    9 +++++++--
 yum/repos.py         |    8 ++++----
 5 files changed, 17 insertions(+), 9 deletions(-)

Index: yum-arch-python26.patch
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/devel/yum-arch-python26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yum-arch-python26.patch	16 May 2009 19:01:30 -0000	1.1
+++ yum-arch-python26.patch	26 Sep 2009 13:55:32 -0000	1.2
@@ -52,3 +52,42 @@ diff -up yum-2.2.2/yum/repos.py.p26 yum-
          
          for repo in myrepos:
              if not hasattr(repo, 'cacheHandler'):
+--- yum-2.2.2/rpmUtils/oldUtils.py.orig	2009-05-16 20:10:54.000000000 +0100
++++ yum-2.2.2/rpmUtils/oldUtils.py	2009-09-08 15:19:47.494521706 +0100
+@@ -151,7 +151,10 @@
+     def _write_gzip_header(self):
+         self.fileobj.write('\037\213')             # magic header
+         self.fileobj.write('\010')                 # compression method
+-        fname = self.filename[:-3]
++        if self.name[-3:] != ".gz":
++            fname = self.name
++        else:
++            fname = self.name[:-3]
+         flags = 0
+         if fname:
+             flags = FNAME
+--- yum-2.2.2/yum/pgpmsg.py.orig	2009-05-16 20:10:54.000000000 +0100
++++ yum-2.2.2/yum/pgpmsg.py		2009-09-08 15:31:53.921273337 +0100
+@@ -13,7 +13,12 @@
+ ##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.
+-import string, struct, time, cStringIO, base64, types, sha
++import string, struct, time, cStringIO, base64, types
++try:
++    from hashlib import sha1 as sha
++except:
++    from sha import new as sha
++
+ 
+ debug = None
+ 
+@@ -385,7 +390,7 @@
+             #XXX do the v3 fingerprint here
+         
+         elif self.version == 4:
+-            s = sha.new()
++            s = sha()
+             s.update(self.pkttag)
+             s.update(struct.pack(">H", pkt_len))
+             s.update(msg[idx_save:idx_save+pkt_len])


Index: yum-arch.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/devel/yum-arch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- yum-arch.spec	27 Jul 2009 08:56:58 -0000	1.6
+++ yum-arch.spec	26 Sep 2009 13:55:32 -0000	1.7
@@ -1,10 +1,11 @@
 Summary:  Extract headers from rpm in a old yum repository
 Name:     yum-arch
 Version:  2.2.2
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  GPLv2+
 Group:    System Environment/Base
 Source0:  http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz
+
 Patch1:   yum-arch-folder.patch
 Patch2:   yum-arch-python26.patch
 
@@ -52,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Sat Sep 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-8
+- fix python 2.6 warnings (#521869)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From remi at fedoraproject.org  Sat Sep 26 14:12:37 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 26 Sep 2009 14:12:37 +0000 (UTC)
Subject: rpms/yum-arch/F-11 yum-arch-python26.patch, 1.1, 1.2 yum-arch.spec, 
	1.5, 1.6
Message-ID: <20090926141237.4357B11C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/yum-arch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25850

Modified Files:
	yum-arch-python26.patch yum-arch.spec 
Log Message:
fix python 2.6 warnings (#521869)

yum-arch-python26.patch:
 rpmUtils/oldUtils.py |    5 ++++-
 yum/__init__.py      |    2 +-
 yum/depsolve.py      |    2 +-
 yum/pgpmsg.py        |    9 +++++++--
 yum/repos.py         |    8 ++++----
 5 files changed, 17 insertions(+), 9 deletions(-)

Index: yum-arch-python26.patch
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/F-11/yum-arch-python26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yum-arch-python26.patch	16 May 2009 19:06:40 -0000	1.1
+++ yum-arch-python26.patch	26 Sep 2009 14:12:34 -0000	1.2
@@ -52,3 +52,42 @@ diff -up yum-2.2.2/yum/repos.py.p26 yum-
          
          for repo in myrepos:
              if not hasattr(repo, 'cacheHandler'):
+--- yum-2.2.2/rpmUtils/oldUtils.py.orig	2009-05-16 20:10:54.000000000 +0100
++++ yum-2.2.2/rpmUtils/oldUtils.py	2009-09-08 15:19:47.494521706 +0100
+@@ -151,7 +151,10 @@
+     def _write_gzip_header(self):
+         self.fileobj.write('\037\213')             # magic header
+         self.fileobj.write('\010')                 # compression method
+-        fname = self.filename[:-3]
++        if self.name[-3:] != ".gz":
++            fname = self.name
++        else:
++            fname = self.name[:-3]
+         flags = 0
+         if fname:
+             flags = FNAME
+--- yum-2.2.2/yum/pgpmsg.py.orig	2009-05-16 20:10:54.000000000 +0100
++++ yum-2.2.2/yum/pgpmsg.py		2009-09-08 15:31:53.921273337 +0100
+@@ -13,7 +13,12 @@
+ ##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.
+-import string, struct, time, cStringIO, base64, types, sha
++import string, struct, time, cStringIO, base64, types
++try:
++    from hashlib import sha1 as sha
++except:
++    from sha import new as sha
++
+ 
+ debug = None
+ 
+@@ -385,7 +390,7 @@
+             #XXX do the v3 fingerprint here
+         
+         elif self.version == 4:
+-            s = sha.new()
++            s = sha()
+             s.update(self.pkttag)
+             s.update(struct.pack(">H", pkt_len))
+             s.update(msg[idx_save:idx_save+pkt_len])


Index: yum-arch.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/F-11/yum-arch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- yum-arch.spec	16 May 2009 19:06:40 -0000	1.5
+++ yum-arch.spec	26 Sep 2009 14:12:35 -0000	1.6
@@ -1,10 +1,11 @@
 Summary:  Extract headers from rpm in a old yum repository
 Name:     yum-arch
 Version:  2.2.2
-Release:  6%{?dist}
+Release:  8%{?dist}
 License:  GPLv2+
 Group:    System Environment/Base
 Source0:  http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz
+
 Patch1:   yum-arch-folder.patch
 Patch2:   yum-arch-python26.patch
 
@@ -52,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Sat Sep 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-8
+- fix python 2.6 warnings (#521869)
+
 * Sat May 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-6
 - fix python 2.6 issue
 



From pkgdb at fedoraproject.org  Sat Sep 26 14:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 14:22:56 +0000
Subject: [pkgdb] fedora-gnome-theme: mccann has requested watchbugzilla
Message-ID: <20090926142256.F181910F8A1@bastion2.fedora.phx.redhat.com>

mccann has requested the watchbugzilla acl on fedora-gnome-theme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnome-theme



From pkgdb at fedoraproject.org  Sat Sep 26 14:22:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 14:22:58 +0000
Subject: [pkgdb] fedora-gnome-theme: mccann has requested watchcommits
Message-ID: <20090926142258.7AD8D10F8A6@bastion2.fedora.phx.redhat.com>

mccann has requested the watchcommits acl on fedora-gnome-theme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnome-theme



From pkgdb at fedoraproject.org  Sat Sep 26 14:23:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 14:23:00 +0000
Subject: [pkgdb] fedora-gnome-theme: mccann has requested commit
Message-ID: <20090926142301.0E2AE10F8A9@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on fedora-gnome-theme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnome-theme



From pkgdb at fedoraproject.org  Sat Sep 26 14:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 14:23:03 +0000
Subject: [pkgdb] fedora-gnome-theme: mccann has requested approveacls
Message-ID: <20090926142303.8AB6710F8AF@bastion2.fedora.phx.redhat.com>

mccann has requested the approveacls acl on fedora-gnome-theme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnome-theme



From myoung at fedoraproject.org  Sat Sep 26 15:28:09 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat, 26 Sep 2009 15:28:09 +0000 (UTC)
Subject: rpms/kernel/devel drm-next-8ef8678c8.patch, NONE,
	1.1.2.1 linux-2.6-xen-check-efer-fix.patch, NONE, 1.1.2.1
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch,
	NONE, 1.1.2.1 linux-2.6-xen-spinlock-stronger-barrier.patch,
	NONE, 1.1.2.1 config-generic, 1.238.6.39,
	1.238.6.40 drm-nouveau.patch, 1.8.6.20,
	1.8.6.21 drm-vga-arb.patch, 1.5.2.4, 1.5.2.5 kernel.spec,
	1.1294.2.69, 1.1294.2.70 drm-edid-fixes.patch, 1.1.2.1,
	NONE drm-next.patch, 1.6.6.10, NONE
Message-ID: <20090926152809.C213511C00E6@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15091

Modified Files:
      Tag: private-myoung-dom0-branch
	config-generic drm-nouveau.patch drm-vga-arb.patch kernel.spec 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-next-8ef8678c8.patch linux-2.6-xen-check-efer-fix.patch 
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch 
	linux-2.6-xen-spinlock-stronger-barrier.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	drm-edid-fixes.patch drm-next.patch 
Log Message:
disable DRM_RADEON and DRM_NOUVEAU due to pvops build problem


drm-next-8ef8678c8.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  939 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  742 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  105 
 b/drivers/gpu/drm/radeon/avivod.h                 |   69 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1290 -
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  607 
 b/drivers/gpu/drm/radeon/r200.c                   |  455 
 b/drivers/gpu/drm/radeon/r300.c                   |  687 
 b/drivers/gpu/drm/radeon/r300d.h                  |  101 
 b/drivers/gpu/drm/radeon/r420.c                   |  301 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r520.c                   |    6 
 b/drivers/gpu/drm/radeon/r600.c                   | 1788 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  850 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  659 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  357 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  228 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  509 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  106 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  404 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  101 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  137 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  682 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   85 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  368 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   74 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   79 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |   56 
 b/drivers/gpu/drm/radeon/rs600.c                  |  106 
 b/drivers/gpu/drm/radeon/rs690.c                  |    4 
 b/drivers/gpu/drm/radeon/rv515.c                  |  524 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1050 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |    3 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  106 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 169 files changed, 36764 insertions(+), 42238 deletions(-)

--- NEW FILE drm-next-8ef8678c8.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..8e7b0eb 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...86285 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */

linux-2.6-xen-check-efer-fix.patch:
 mm/Makefile     |    1 +
 xen/enlighten.c |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-xen-check-efer-fix.patch ---
>From b75fe4e5b869f8dbebd36df64a7fcda0c5b318ed Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 21 Sep 2009 13:34:06 -0700
Subject: [PATCH] xen: check EFER for NX before setting up GDT mapping

x86-64 assumes NX is available by default, so we need to
explicitly check for it before using NX.  Some first-generation
Intel x86-64 processors didn't support NX, and even recent systems
allow it to be disabled in BIOS.

[ Impact: prevent Xen crash on NX-less 64-bit machines ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Stable Kernel <stable at kernel.org>

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 9b5a9f5..dd313d0 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -4,6 +4,7 @@ obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
 # Make sure __phys_addr has no stackprotector
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_ioremap.o		:= $(nostackp)
+CFLAGS_init.o			:= $(nostackp)
 
 obj-$(CONFIG_SMP)		+= tlb.o
 
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 0dd0c2c..5d701bf 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1083,6 +1083,11 @@ asmlinkage void __init xen_start_kernel(void)
 
 	__supported_pte_mask |= _PAGE_IOMAP;
 
+#ifdef CONFIG_X86_64
+	/* Work out if we support NX */
+	check_efer();
+#endif
+
 	xen_setup_features();
 
 	/* Get mfn list */
@@ -1123,11 +1128,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	pgd = (pgd_t *)xen_start_info->pt_base;
 
-#ifdef CONFIG_X86_64
-	/* Work out if we support NX */
-	check_efer();
-#endif
-
 	/* Don't do the full vcpu_info placement stuff until we have a
 	   possible map and a non-dummy shared_info. */
 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];

linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch:
 spinlock.c |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Wed, 9 Sep 2009 19:33:51 +0000 (-0700)
Subject: xen: only enable interrupts while actually blocking for spinlock
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d576b57b50a92801e6493e76e5243d6cff193d2

xen: only enable interrupts while actually blocking for spinlock

Where possible we enable interrupts while waiting for a spinlock to
become free, in order to reduce big latency spikes in interrupt handling.

However, at present if we manage to pick up the spinlock just before
blocking, we'll end up holding the lock with interrupts enabled for a
while.  This will cause a deadlock if we recieve an interrupt in that
window, and the interrupt handler tries to take the lock too.

Solve this by shrinking the interrupt-enabled region to just around the
blocking call.

[ Impact: avoid race/deadlock when using Xen PV spinlocks ]

Reported-by: "Yang, Xiaowei" <xiaowei.yang at intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 5601506..2f91e56 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -187,7 +187,6 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 	struct xen_spinlock *prev;
 	int irq = __get_cpu_var(lock_kicker_irq);
 	int ret;
-	unsigned long flags;
 	u64 start;
 
 	/* If kicker interrupts not initialized yet, just spin */
@@ -199,16 +198,12 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 	/* announce we're spinning */
 	prev = spinning_lock(xl);
 
-	flags = __raw_local_save_flags();
-	if (irq_enable) {
-		ADD_STATS(taken_slow_irqenable, 1);
-		raw_local_irq_enable();
-	}
-
 	ADD_STATS(taken_slow, 1);
 	ADD_STATS(taken_slow_nested, prev != NULL);
 
 	do {
+		unsigned long flags;
+
 		/* clear pending */
 		xen_clear_irq_pending(irq);
 
@@ -228,6 +223,12 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 			goto out;
 		}
 
+		flags = __raw_local_save_flags();
+		if (irq_enable) {
+			ADD_STATS(taken_slow_irqenable, 1);
+			raw_local_irq_enable();
+		}
+
 		/*
 		 * Block until irq becomes pending.  If we're
 		 * interrupted at this point (after the trylock but
@@ -238,13 +239,15 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 		 * pending.
 		 */
 		xen_poll_irq(irq);
+
+		raw_local_irq_restore(flags);
+
 		ADD_STATS(taken_slow_spurious, !xen_test_irq_pending(irq));
 	} while (!xen_test_irq_pending(irq)); /* check for spurious wakeups */
 
 	kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
 
 out:
-	raw_local_irq_restore(flags);
 	unspinning_lock(xl, prev);
 	spin_time_accum_blocked(start);
 

linux-2.6-xen-spinlock-stronger-barrier.patch:
 spinlock.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-xen-spinlock-stronger-barrier.patch ---
From: Yang Xiaowei <xiaowei.yang at intel.com>
Date: Wed, 9 Sep 2009 19:44:52 +0000 (-0700)
Subject: xen: use stronger barrier after unlocking lock
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2496afbf1e50c70f80992656bcb730c8583ddac3

xen: use stronger barrier after unlocking lock

We need to have a stronger barrier between releasing the lock and
checking for any waiting spinners.  A compiler barrier is not sufficient
because the CPU's ordering rules do not prevent the read xl->spinners
from happening before the unlock assignment, as they are different
memory locations.

We need to have an explicit barrier to enforce the write-read ordering
to different memory locations.

Because of it, I can't bring up > 4 HVM guests on one SMP machine.

[ Code and commit comments expanded -J ]

[ Impact: avoid deadlock when using Xen PV spinlocks ]

Signed-off-by: Yang Xiaowei <xiaowei.yang at intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 2f91e56..36a5141 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -326,8 +326,13 @@ static void xen_spin_unlock(struct raw_spinlock *lock)
 	smp_wmb();		/* make sure no writes get moved after unlock */
 	xl->lock = 0;		/* release lock */
 
-	/* make sure unlock happens before kick */
-	barrier();
+	/*
+	 * Make sure unlock happens before checking for waiting
+	 * spinners.  We need a strong barrier to enforce the
+	 * write-read ordering to different memory locations, as the
+	 * CPU makes no implied guarantees about their ordering.
+	 */
+	mb();
 
 	if (unlikely(xl->spinners))
 		xen_spin_unlock_slow(xl);


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.39
retrieving revision 1.238.6.40
diff -u -p -r1.238.6.39 -r1.238.6.40
--- config-generic	10 Sep 2009 14:00:23 -0000	1.238.6.39
+++ config-generic	26 Sep 2009 15:27:37 -0000	1.238.6.40
@@ -2234,8 +2234,8 @@ CONFIG_VGA_ARB=y
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
@@ -2244,9 +2244,9 @@ CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_VIA=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_KMS=y
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_NOUVEAU_KMS is not set
+# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
 CONFIG_DRM_I2C_CH7006=m
 
 #

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5499 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  482 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  761 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  421 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1281 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  360 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  257 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  248 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  949 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  769 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  304 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2247 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  810 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  481 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  472 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58725 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.20 -r 1.8.6.21 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.20
retrieving revision 1.8.6.21
diff -u -p -r1.8.6.20 -r1.8.6.21
--- drm-nouveau.patch	24 Sep 2009 21:05:07 -0000	1.8.6.20
+++ drm-nouveau.patch	26 Sep 2009 15:27:46 -0000	1.8.6.21
@@ -1474,10 +1474,10 @@ index 0000000..ab46e3a
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
 new file mode 100644
-index 0000000..f71789a
+index 0000000..ec0f2f3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,125 @@
 +#include <linux/pci.h>
 +#include <linux/acpi.h>
 +#include <acpi/acpi_drivers.h>
@@ -1508,13 +1508,14 @@ index 0000000..f71789a
 +#define NOUVEAU_DSM_POWER_SPEED 0x01
 +#define NOUVEAU_DSM_POWER_STAMINA 0x02
 +
-+static int nvidia_dsm(struct pci_dev *dev, int func, int arg, int *result)
++static int nouveau_dsm(struct drm_device *dev, int func, int arg, int *result)
 +{
 +	static char muid[] = {
 +		0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
 +		0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
 +	};
 +
++	struct pci_dev *pdev = dev->pdev;
 +	struct acpi_handle *handle;
 +	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
 +	struct acpi_object_list input;
@@ -1522,7 +1523,7 @@ index 0000000..f71789a
 +	union acpi_object *obj;
 +	int err;
 +
-+	handle = DEVICE_ACPI_HANDLE(&dev->dev);
++	handle = DEVICE_ACPI_HANDLE(&pdev->dev);
 +
 +	if (!handle)
 +		return -ENODEV;
@@ -1541,8 +1542,7 @@ index 0000000..f71789a
 +
 +	err = acpi_evaluate_object(handle, "_DSM", &input, &output);
 +	if (err) {
-+		printk(KERN_ERR "nvidia-control: failed to evaluate _DSM: %d\n",
-+		       err);
++		NV_ERROR(dev, "failed to evaluate _DSM: %d\n", err);
 +		return err;
 +	}
 +
@@ -1568,24 +1568,23 @@ index 0000000..f71789a
 +
 +int nouveau_hybrid_setup(struct drm_device *dev)
 +{
-+	struct pci_dev *pdev = dev->pdev;
 +	int result;
 +
-+	if (nvidia_dsm(pdev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
-+		       &result))
++	if (nouveau_dsm(dev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
++								&result))
 +		return -ENODEV;
 +
-+	printk(KERN_INFO "nouveau: _DSM hardware status gave 0x%x\n", result);
++	NV_INFO(dev, "_DSM hardware status gave 0x%x\n", result);
 +
 +	if (result & 0x1) {	/* Stamina mode - disable the external GPU */
-+		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
-+			   NULL);
-+		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
-+			   NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
++									NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
++									NULL);
 +	} else {		/* Ensure that the external GPU is enabled */
-+		nvidia_dsm(pdev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
-+		nvidia_dsm(pdev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
-+			   NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
++		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
++									NULL);
 +	}
 +
 +	return 0;
@@ -1593,11 +1592,10 @@ index 0000000..f71789a
 +
 +bool nouveau_dsm_probe(struct drm_device *dev)
 +{
-+	struct pci_dev *pdev = dev->pdev;
 +	int support = 0;
 +
-+	if (nvidia_dsm(pdev, NOUVEAU_DSM_SUPPORTED,
-+		       NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &support))
++	if (nouveau_dsm(dev, NOUVEAU_DSM_SUPPORTED,
++				NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &support))
 +		return false;
 +
 +	if (!support)
@@ -1768,10 +1766,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..585790f
+index 0000000..09ccffd
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5476 @@
+@@ -0,0 +1,5499 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -1961,14 +1959,14 @@ index 0000000..585790f
 +static struct methods nv04_methods[] = {
 +	{ "PROM", load_vbios_prom, false },
 +	{ "PRAMIN", load_vbios_pramin, true },
-+	{ "PCI ROM", load_vbios_pci, true },
++	{ "PCIROM", load_vbios_pci, true },
 +	{ }
 +};
 +
 +static struct methods nv50_methods[] = {
 +	{ "PRAMIN", load_vbios_pramin, true },
 +	{ "PROM", load_vbios_prom, false },
-+	{ "PCI ROM", load_vbios_pci, true },
++	{ "PCIROM", load_vbios_pci, true },
 +	{ }
 +};
 +
@@ -1978,6 +1976,26 @@ index 0000000..585790f
 +	struct methods *methods, *method;
 +	int testscore = 3;
 +
++	if (nouveau_vbios) {
++		method = nv04_methods;
++		while (method->loadbios) {
++			if (!strcasecmp(nouveau_vbios, method->desc))
++				break;
++			method++;
++		}
++
++		if (method->loadbios) {
++			NV_INFO(dev, "Attempting to use BIOS image from %s\n",
++				method->desc);
++
++			method->loadbios(dev, data);
++			if (score_vbios(dev, data, method->rw))
++				return true;
++		}
++
++		NV_ERROR(dev, "VBIOS source \'%s\' invalid\n", nouveau_vbios);
++	}
++
 +	if (dev_priv->card_type < NV_50)
 +		methods = nv04_methods;
 +	else
@@ -7151,9 +7169,12 @@ index 0000000..585790f
 +		parse_init_table(bios, bios->some_script_ptr, &iexec);
 +	}
 +
-+	for (i = 0; i < bios->bdcb.dcb.entries; i++) {
-+		nouveau_bios_run_display_table(dev, &bios->bdcb.dcb.entry[i],
-+					       0, 0);
++	if (dev_priv->card_type >= NV_50) {
++		for (i = 0; i < bios->bdcb.dcb.entries; i++) {
++			nouveau_bios_run_display_table(dev,
++						       &bios->bdcb.dcb.entry[i],
++						       0, 0);
++		}
 +	}
 +
 +	NVLockVgaCrtcs(dev, true);
@@ -8749,10 +8770,10 @@ index 0000000..3f80db8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
 new file mode 100644
-index 0000000..ebc01ad
+index 0000000..1a87041
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,482 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -8865,9 +8886,9 @@ index 0000000..ebc01ad
 +		      uint32_t vram_handle, uint32_t tt_handle)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+	struct nouveau_engine *engine = &dev_priv->engine;
++	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
++	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
 +	struct nouveau_channel *chan;
-+	unsigned fbdev_flags = 0;
[...2857 lines suppressed...]
 +	0x0040a405, 0x00600009, 0x00700005, 0x00700006, 0x0060000e, ~0
 +};
 +
-+static uint32_t nv4e_ctx_prog[] = {
++static uint32_t nv4e_ctxprog[] = {
 +	0x00400889, 0x00200000, 0x0060000a, 0x00200000, 0x00300000, 0x00800001,
 +	0x00700009, 0x0060000e, 0x00400d64, 0x00400d05, 0x00409565, 0x00409a06,
 +	0x0040a868, 0x00200000, 0x0060000a, 0x00700000, 0x00106000, 0x00700080,
@@ -31307,7 +31371,7 @@ index 0000000..ed85386
 +{
 +	struct drm_nouveau_private *dev_priv =
 +		(struct drm_nouveau_private *)dev->dev_private;
-+	uint32_t *ctx_prog = NULL;
++	uint32_t *ctxprog = NULL;
 +	uint32_t vramsz, tmp;
 +	int i, j;
 +
@@ -31318,39 +31382,39 @@ index 0000000..ed85386
 +
 +	switch (dev_priv->chipset) {
 +	case 0x40:
-+		ctx_prog = nv40_ctx_prog;
++		ctxprog = nv40_ctxprog;
 +		break;
 +	case 0x41:
 +	case 0x42:
-+		ctx_prog = nv41_ctx_prog;
++		ctxprog = nv41_ctxprog;
 +		break;
 +	case 0x43:
-+		ctx_prog = nv43_ctx_prog;
++		ctxprog = nv43_ctxprog;
 +		break;
 +	case 0x44:
-+		ctx_prog = nv44_ctx_prog;
++		ctxprog = nv44_ctxprog;
 +		break;
 +	case 0x46:
-+		ctx_prog = nv46_ctx_prog;
++		ctxprog = nv46_ctxprog;
 +		break;
 +	case 0x47:
-+		ctx_prog = nv47_ctx_prog;
++		ctxprog = nv47_ctxprog;
 +		break;
 +	case 0x49:
-+		ctx_prog = nv49_4b_ctx_prog;
++		ctxprog = nv49_4b_ctxprog;
 +		break;
 +	case 0x4a:
-+		ctx_prog = nv4a_ctx_prog;
++		ctxprog = nv4a_ctxprog;
 +		break;
 +	case 0x4b:
-+		ctx_prog = nv49_4b_ctx_prog;
++		ctxprog = nv49_4b_ctxprog;
 +		break;
 +	case 0x4c:
 +	case 0x67:
-+		ctx_prog = nv4c_ctx_prog;
++		ctxprog = nv4c_ctxprog;
 +		break;
 +	case 0x4e:
-+		ctx_prog = nv4e_ctx_prog;
++		ctxprog = nv4e_ctxprog;
 +		break;
 +	default:
 +		NV_ERROR(dev, "Context program for 0x%02x unavailable\n",
@@ -31360,13 +31424,13 @@ index 0000000..ed85386
 +	}
 +
 +	/* Load the context program onto the card */
-+	if (ctx_prog) {
++	if (ctxprog) {
 +		NV_DEBUG(dev, "Loading context program\n");
 +
 +		i = 0;
 +		nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-+		while (ctx_prog[i] != ~0) {
-+			nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, ctx_prog[i]);
++		while (ctxprog[i] != ~0) {
++			nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, ctxprog[i]);
 +			i++;
 +		}
 +	}
@@ -31544,20 +31608,6 @@ index 0000000..ed85386
 +		break;
 +	}
 +
-+	/* per-context state, doesn't belong here */
-+	nv_wr32(dev, 0x400B20, 0x00000000);
-+	nv_wr32(dev, 0x400B04, 0xFFFFFFFF);
-+
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) & 0x0007ff00;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) | 0x00020100;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMAX, 0x7fff);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMAX, 0x7fff);
-+
 +	return 0;
 +}
 +
@@ -31631,10 +31681,10 @@ index 0000000..2a3495e
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..c4bc54a
+index 0000000..5e7df86
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,809 @@
+@@ -0,0 +1,810 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -32191,6 +32241,7 @@ index 0000000..c4bc54a
 +		format = NV50_EVO_CRTC_FB_DEPTH_16;
 +		break;
 +	case 24:
++	case 32:
 +		format = NV50_EVO_CRTC_FB_DEPTH_24;
 +		break;
 +	case 30:
@@ -34245,10 +34296,10 @@ index 0000000..aca9ea6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..bec78d6
+index 0000000..10ed193
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,481 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34457,6 +34508,8 @@ index 0000000..bec78d6
 +	nv50_fifo_init_context_table(dev);
 +	nv50_fifo_init_regs__nv(dev);
 +	nv50_fifo_init_regs(dev);
++	dev_priv->engine.fifo.enable(dev);
++	dev_priv->engine.fifo.reassign(dev, true);
 +
 +	return 0;
 +}
@@ -34730,10 +34783,10 @@ index 0000000..bec78d6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..c163859
+index 0000000..d9c3e21
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,450 @@
+@@ -0,0 +1,472 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34803,7 +34856,7 @@ index 0000000..c163859
 +	nv_wr32(dev, 0x400108, 0xffffffff);
 +
 +	nv_wr32(dev, 0x400824, 0x00004000);
-+	nv_wr32(dev, 0x400500, 0x00000000);
++	nv_wr32(dev, 0x400500, 0x00010001);
 +}
 +
 +static void
@@ -34912,6 +34965,28 @@ index 0000000..c163859
 +		nv_wr32(dev, 0x400500, nv_rd32(dev, 0x400500) & ~mask);
 +}
 +
++struct nouveau_channel *
++nv50_graph_channel(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	uint32_t inst;
++	int i;
++
++	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
++	if (!(inst & NV50_PGRAPH_CTXCTL_CUR_LOADED))
++		return NULL;
++	inst = (inst & NV50_PGRAPH_CTXCTL_CUR_INSTANCE) << 12;
++
++	for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
++		struct nouveau_channel *chan = dev_priv->fifos[i];
++
++		if (chan && chan->ramin && chan->ramin->instance == inst)
++			return chan;
++	}
++
++	return NULL;
++}
++
 +int
 +nv50_graph_create_context(struct nouveau_channel *chan)
 +{

drm-vga-arb.patch:
 drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h        |    1 +
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600d.h         |    1 +
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   21 ++++++++++++++++++++-
 include/drm/drmP.h                     |    4 +++-
 13 files changed, 133 insertions(+), 2 deletions(-)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -p -r1.5.2.4 -r1.5.2.5
--- drm-vga-arb.patch	10 Sep 2009 14:00:29 -0000	1.5.2.4
+++ drm-vga-arb.patch	26 Sep 2009 15:27:52 -0000	1.5.2.5
@@ -1,8 +1,18 @@
-From ba0d10c754ca30de35063a5e14c92bb7328a9f32 Mon Sep 17 00:00:00 2001
+From 28d520433b6375740990ab99d69b0d0067fd656b Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
-Date: Tue, 8 Sep 2009 13:54:31 +1000
-Subject: [PATCH] drm-vga-arb.patch
+Date: Mon, 21 Sep 2009 14:33:58 +1000
+Subject: [PATCH] drm/vgaarb: add VGA arbitration support to the drm and kms.
 
+VGA arb requires DRM support for non-kms drivers, to turn on/off
+irqs when disabling the mem/io regions.
+
+VGA arb requires KMS support for GPUs where we can turn off VGA
+decoding. Currently we know how to do this for intel and radeon
+kms drivers, which allows them to be removed from the arbiter.
+
+This patch comes from Fedora rawhide kernel.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
 ---
  drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
  drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
@@ -15,9 +25,9 @@ Subject: [PATCH] drm-vga-arb.patch
  drivers/gpu/drm/radeon/r600d.h         |    1 +
  drivers/gpu/drm/radeon/radeon.h        |    2 ++
  drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
- drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
+ drivers/gpu/drm/radeon/radeon_device.c |   21 ++++++++++++++++++++-
  include/drm/drmP.h                     |    3 +++
- 13 files changed, 132 insertions(+), 0 deletions(-)
+ 13 files changed, 133 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
 index f85aaf2..0a6f0b3 100644
@@ -190,10 +200,10 @@ index b9e47f1..3a0004f 100644
 +
  #endif /* __INTEL_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index 5708c07..386ddbc 100644
+index 737970b..be51c5f 100644
 --- a/drivers/gpu/drm/radeon/r100.c
 +++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1916,6 +1916,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
+@@ -1955,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -215,11 +225,11 @@ index 5708c07..386ddbc 100644
  {
  	r100_vram_get_type(rdev);
 diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index d8fcef4..3417dff 100644
+index 5f42fad..eab31c1 100644
 --- a/drivers/gpu/drm/radeon/r600.c
 +++ b/drivers/gpu/drm/radeon/r600.c
-@@ -1444,6 +1444,20 @@ bool r600_card_posted(struct radeon_device *rdev)
- 	return false;
+@@ -1499,6 +1499,20 @@ int r600_startup(struct radeon_device *rdev)
+ 	return 0;
  }
  
 +void r600_vga_set_state(struct radeon_device *rdev, bool state)
@@ -252,10 +262,10 @@ index 723295f..4a9028a 100644
  #define	CP_COHER_BASE					0x85F8
  #define	CP_DEBUG					0xC1FC
 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 3299733..98a0c7f 100644
+index 817af8e..c839b60 100644
 --- a/drivers/gpu/drm/radeon/radeon.h
 +++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -592,6 +592,7 @@ struct radeon_asic {
+@@ -596,6 +596,7 @@ struct radeon_asic {
  	int (*suspend)(struct radeon_device *rdev);
  	void (*errata)(struct radeon_device *rdev);
  	void (*vram_info)(struct radeon_device *rdev);
@@ -263,7 +273,7 @@ index 3299733..98a0c7f 100644
  	int (*gpu_reset)(struct radeon_device *rdev);
  	int (*mc_init)(struct radeon_device *rdev);
  	void (*mc_fini)(struct radeon_device *rdev);
-@@ -901,6 +902,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
+@@ -954,6 +955,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
  #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
  #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
  #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
@@ -272,7 +282,7 @@ index 3299733..98a0c7f 100644
  #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
  #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
 diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index e87bb91..fd18cd6 100644
+index 5f2a9e6..8968f78 100644
 --- a/drivers/gpu/drm/radeon/radeon_asic.h
 +++ b/drivers/gpu/drm/radeon/radeon_asic.h
 @@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
@@ -283,7 +293,7 @@ index e87bb91..fd18cd6 100644
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -87,6 +88,7 @@ static struct radeon_asic r100_asic = {
+@@ -89,6 +90,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -291,7 +301,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -152,6 +154,7 @@ static struct radeon_asic r300_asic = {
+@@ -158,6 +160,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -299,15 +309,15 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -197,6 +200,7 @@ static struct radeon_asic r420_asic = {
- 	.init = &r300_init,
- 	.errata = &r420_errata,
- 	.vram_info = &r420_vram_info,
+@@ -208,6 +211,7 @@ static struct radeon_asic r420_asic = {
+ 	.resume = &r420_resume,
+ 	.errata = NULL,
+ 	.vram_info = NULL,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &r420_mc_init,
- 	.mc_fini = &r420_mc_fini,
-@@ -249,6 +253,7 @@ static struct radeon_asic rs400_asic = {
+ 	.mc_init = NULL,
+ 	.mc_fini = NULL,
+@@ -262,6 +266,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -315,7 +325,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -306,6 +311,7 @@ static struct radeon_asic rs600_asic = {
+@@ -323,6 +328,7 @@ static struct radeon_asic rs600_asic = {
  	.init = &rs600_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
@@ -323,7 +333,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -353,6 +359,7 @@ static struct radeon_asic rs690_asic = {
+@@ -372,6 +378,7 @@ static struct radeon_asic rs690_asic = {
  	.init = &rs600_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
@@ -331,7 +341,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -407,6 +414,7 @@ static struct radeon_asic rv515_asic = {
+@@ -428,6 +435,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -339,7 +349,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -454,6 +462,7 @@ static struct radeon_asic r520_asic = {
+@@ -477,6 +485,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -347,7 +357,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-@@ -495,6 +504,7 @@ int r600_init(struct radeon_device *rdev);
+@@ -520,6 +529,7 @@ int r600_init(struct radeon_device *rdev);
  void r600_fini(struct radeon_device *rdev);
  int r600_suspend(struct radeon_device *rdev);
  int r600_resume(struct radeon_device *rdev);
@@ -355,7 +365,7 @@ index e87bb91..fd18cd6 100644
  int r600_wb_init(struct radeon_device *rdev);
  void r600_wb_fini(struct radeon_device *rdev);
  void r600_cp_commit(struct radeon_device *rdev);
-@@ -531,6 +541,7 @@ static struct radeon_asic r600_asic = {
+@@ -556,6 +566,7 @@ static struct radeon_asic r600_asic = {
  	.resume = &r600_resume,
  	.cp_commit = &r600_cp_commit,
  	.vram_info = NULL,
@@ -363,7 +373,7 @@ index e87bb91..fd18cd6 100644
  	.gpu_reset = &r600_gpu_reset,
  	.mc_init = NULL,
  	.mc_fini = NULL,
-@@ -581,6 +592,7 @@ static struct radeon_asic rv770_asic = {
+@@ -606,6 +617,7 @@ static struct radeon_asic rv770_asic = {
  	.cp_commit = &r600_cp_commit,
  	.vram_info = NULL,
  	.gpu_reset = &rv770_gpu_reset,
@@ -372,7 +382,7 @@ index e87bb91..fd18cd6 100644
  	.mc_fini = NULL,
  	.wb_init = &r600_wb_init,
 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index f2469c5..764d2f8 100644
+index 8a40c61..daf5db7 100644
 --- a/drivers/gpu/drm/radeon/radeon_device.c
 +++ b/drivers/gpu/drm/radeon/radeon_device.c
 @@ -29,6 +29,7 @@
@@ -383,9 +393,9 @@ index f2469c5..764d2f8 100644
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
- int radeon_modeset_init(struct radeon_device *rdev);
- void radeon_modeset_fini(struct radeon_device *rdev);
+@@ -480,7 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
+ {
+ }
  
 +/* if we get transitioned to only one device, tak VGA back */
 +static unsigned int radeon_vga_set_decode(void *cookie, bool state)
@@ -402,20 +412,29 @@ index f2469c5..764d2f8 100644
  /*
   * Radeon device.
   */
-@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -578,6 +590,13 @@ int radeon_device_init(struct radeon_device *rdev,
+ 	if (r) {
+ 		return r;
+ 	}
++
++	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
++	r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
++	if (r) {
++		return -EINVAL;
++	}
++
+ 	if (!rdev->new_init_path) {
+ 		/* Setup errata flags */
+ 		radeon_errata(rdev);
+@@ -586,7 +605,6 @@ int radeon_device_init(struct radeon_device *rdev,
  		/* Initialize surface registers */
  		radeon_surface_init(rdev);
  
-+		/* if we have > 1 VGA cards, then disable the radeon VGA resources */
-+		ret = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-+		if (ret) {
-+			return -EINVAL;
-+		}
-+
- 		/* TODO: disable VGA need to use VGA request */
+-		/* TODO: disable VGA need to use VGA request */
  		/* BIOS*/
  		if (!radeon_get_bios(rdev)) {
-@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_device *rdev)
+ 			if (ASIC_IS_AVIVO(rdev))
+@@ -697,6 +715,7 @@ void radeon_device_fini(struct radeon_device *rdev)
  		radeon_agp_fini(rdev);
  #endif
  		radeon_irq_kms_fini(rdev);
@@ -438,5 +457,5 @@ index eeefb63..c8e64bb 100644
  	struct vm_operations_struct *gem_vm_ops;
  
 -- 
-1.6.0.6
+1.6.4.2
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.69
retrieving revision 1.1294.2.70
diff -u -p -r1.1294.2.69 -r1.1294.2.70
--- kernel.spec	24 Sep 2009 21:05:13 -0000	1.1294.2.69
+++ kernel.spec	26 Sep 2009 15:27:53 -0000	1.1294.2.70
@@ -697,9 +697,12 @@ Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
 Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+Patch1580: linux-2.6-xen-check-efer-fix.patch
+Patch1581: linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
+Patch1582: linux-2.6-xen-spinlock-stronger-barrier.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next.patch
+Patch1812: drm-next-8ef8678c8.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -708,7 +711,6 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
-Patch1827: drm-edid-fixes.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1361,6 +1363,11 @@ ApplyPatch linux-2.6-ksm-kvm.patch
 # Assorted Virt Fixes
 #ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+#ApplyPatch linux-2.6-xen-check-efer-fix.patch
+
+# improve xen spinlock scalability
+#ApplyPatch linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
+#ApplyPatch linux-2.6-xen-spinlock-stronger-barrier.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1368,7 +1375,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
+ApplyPatch drm-next-8ef8678c8.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1379,7 +1386,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
-ApplyPatch drm-edid-fixes.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2070,6 +2076,30 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 26 2009 Michael Young <m.a.young at durham.ac.uk>
+- disable DRM_RADEON  and DRM_NOUVEAU due to build problems
+
+* Sat Sep 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-49
+- Add Xen spinlock patches to improve scalability.
+
+* Sat Sep 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-48
+- drm-next-8ef8678c8.patch: fix intel/nouveau kms
+
+* Fri Sep 25 2009 Justin M. Forbes <bskeggs at redhat.com> 2.6.31.1-47
+- Fix xen guest booting when NX is disabled (#525290)
+
+* Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-46
+- drm-nouveau.patch: cleanups, fixes, pre-G80 s/r fixes, init rework
+
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-45
+- drm-next-adea4796c.patch: fix r600 glxgears
+
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-44
+- bump a extra one because I accidentially CVS.
+
+* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
+- drm-next update - fix r600 s/r, and command line mode picking and r600 tv
+
 * Thu Sep 24 2009 Michael Young <m.a.young at durham.ac.uk>
 - Try a dri fix in the latest xen/master
 


--- drm-edid-fixes.patch DELETED ---


--- drm-next.patch DELETED ---



From sdz at fedoraproject.org  Sat Sep 26 16:10:08 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 16:10:08 +0000 (UTC)
Subject: rpms/avogadro/devel .cvsignore, 1.9, 1.10 avogadro.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090926161008.3D46E11C0423@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29796

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
update to new release and enable optional components



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Jun 2009 17:48:41 -0000	1.9
+++ .cvsignore	26 Sep 2009 16:10:06 -0000	1.10
@@ -1 +1 @@
-avogadro-0.9.6.tar.bz2
+avogadro-0.9.8.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- avogadro.spec	24 Jul 2009 17:41:36 -0000	1.13
+++ avogadro.spec	26 Sep 2009 16:10:06 -0000	1.14
@@ -1,6 +1,9 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           avogadro
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -10,12 +13,15 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
-BuildRequires:  qt4-devel >= 4.4.0
-BuildRequires:  eigen2-devel >= 2.0.0
-BuildRequires:  openbabel-devel >= 2.2.0
+BuildRequires:  qt4-devel >= 4.5.1
+BuildRequires:  eigen2-devel >= 2.0.3
+BuildRequires:  openbabel-devel >= 2.2.2
+BuildRequires:  boost-devel >= 1.35
+BuildRequires:  glew-devel >= 1.5.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
-BuildRequires:  python
+BuildRequires:  sip-devel
+BuildRequires:  numpy
 
 %description
 An advanced molecular editor designed for 
@@ -51,7 +57,7 @@ Avogadros libraries.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?BUILD_TESTS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
+%{cmake} %{?BUILD_TESTS} -DENABLE_GLSL=ON -DENABLE_PYTHON=ON -DENABLE_UPDATE_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
@@ -86,17 +92,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%{_datadir}/lib%{name}
 %{_includedir}/%{name}
 %{_libdir}/*.so
 
 
 %files libs
 %defattr(-,root,root,-)
+%{python_sitelib}/Avogadro.so
 %{_libdir}/%{name}
 %{_libdir}/*.so.*
 
 
 %changelog
+* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> 0.9.8-1
+- update to new upstream release
+- enable python and glsl support again
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Jun 2009 17:48:41 -0000	1.9
+++ sources	26 Sep 2009 16:10:06 -0000	1.10
@@ -1 +1 @@
-4b12a8c750837e12c884ac3cb80ce766  avogadro-0.9.6.tar.bz2
+ff3a982c3196789a3aa6c7c4b16733dd  avogadro-0.9.8.tar.bz2



From jjames at fedoraproject.org  Sat Sep 26 16:12:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sat, 26 Sep 2009 16:12:37 +0000 (UTC)
Subject: rpms/cmusphinx3/devel cmusphinx3.spec, NONE, 1.1 import.log, NONE, 
	1.1 sphinx3-doxygen.patch, NONE, 1.1 sphinx3-link.patch, NONE,
	1.1 sphinx3-python.patch, NONE, 1.1 sphinx3-string.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926161237.95B9411C00E6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cmusphinx3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30772/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cmusphinx3.spec import.log sphinx3-doxygen.patch 
	sphinx3-link.patch sphinx3-python.patch sphinx3-string.patch 
Log Message:
Initial import.



--- NEW FILE cmusphinx3.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           cmusphinx3
Version:        0.8
Release:        3%{?dist}
Summary:        Large vocabulary speech recognition in C

Group:          Applications/Multimedia
License:        BSD
URL:            http://www.cmusphinx.org/
Source0:        http://downloads.sourceforge.net/cmusphinx/sphinx3/%{version}/sphinx3-%{version}.zip
# This patch was sent upstream on 2009 Aug 26, and has been applied.  It fixes
# several cases of missing prototypes for functions declared in string.h
# (strcpy, memset, etc.)
Patch0:         sphinx3-string.patch
# This patch was sent upstream on 2009 Aug 26, and has been applied.  It fixes
# a number of broken links and unescaped special characters in the doxygen
# source.
Patch1:         sphinx3-doxygen.patch
# This patch has not been sent upstream, because it is specific to a Fedora
# build environment.  It fixes a Python include path.
Patch2:         sphinx3-python.patch
# This patch has not been sent upstream, because it is specific to the way we
# build shared libraries in Fedora.  It adds a link necessary to avoid
# undefined weak symbols in one library.
Patch3:         sphinx3-link.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  alsa-lib-devel, doxygen, pkgconfig
BuildRequires:  python-devel, sphinxbase-devel

%description
Sphinx-3 is CMU's state-of-the-art large vocabulary speech recognition system.
It uses Hidden Markov Models (HMM) with continuous output probability density
functions (PDF).  It supports several modes of operation.  The more accurate
mode, known as the "flat decoder", is descended from the original Sphinx-3
release.  The faster mode, known as the "tree decoder", was developed
separately.  The two decoders were merged in Sphinx 3.5, though the flat
decoder was not fully functional until Sphinx 3.7.

%package devel
Summary:        Header files for developing with cmusphinx3
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
Requires:       sphinxbase-devel

%description devel
Header files for developing with cmusphinx3.

%package libs
Summary:        Shared libraries for cmusphinx3 executables
Group:          Applications/Multimedia

%description libs
Shared libraries for cmusphinx3 executables.

%package python
Summary:        Python interface to cmusphinx3
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, sphinxbase-python

%description python
Python interface to cmusphinx3.

%package doc
Summary:        Doxygen documentation for cmusphinx3
Group:          Documentation
Requires:       %{name}-libs = %{version}-%{release}

%description doc
Doxygen documentation for cmusphinx3.

%prep
%setup -q -n sphinx3-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Remove executable bits from the documentation
find doc -type f | xargs chmod a-x

# Dispose of version control files in the documentation
rm -fr doc/images/.svn doc/s3/.svn doc/s3-2_files/.svn

# Convert the encoding of one file
cd doc/s3-2_files
iconv -f WINDOWS-1252 -t UTF-8 master03_stylesheet.css > x.css
touch -r master03_stylesheet.css x.css
mv -f x.css master03_stylesheet.css

%build
%configure --disable-dependency-tracking --disable-static

# Get rid of undesirable hardcoded runpaths
sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
    libtool

# Build the C code and its documentation
make %{?_smp_mflags}
make doxygen

# Build the Python interface
cd python
python setup.py build

%install
rm -rf $RPM_BUILD_ROOT

# Install the libraries, programs, and scripts
make install DESTDIR=$RPM_BUILD_ROOT

# Install the Python egg
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
cd python
python setup.py install --skip-build --root $RPM_BUILD_ROOT

# Get rid of files we don't want packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -fr $RPM_BUILD_ROOT%{_datadir}/sphinx3/doc
rm -f doc/images/Makefile doc/s3/*.fig

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/sphinx3

%files devel
%defattr(-,root,root,-)
%{_includedir}/sphinx3
%{_libdir}/libs3decoder.so
%{_libdir}/pkgconfig/sphinx3.pc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libs3decoder.so.*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/Sphinx3*.egg-info
%{python_sitearch}/_sphinx3.so

%files doc
%defattr(-,root,root,-)
%doc doc/images doc/s3 doc/s3-2_files doc/*.doc doc/*.htm* doc/*.pdf doc/*.ppt
%doc doc/*.txt doc/sphinx3.4.code.tracing doc/sphinx3.5_refactoring.note html

%changelog
* Fri Sep 18 2009 Jerry James <loganjerry at gmail.com> - 0.8-3
- Drop unnecessary BRs
- Preserve timestamp on iconv'd file

* Tue Sep 15 2009 Jerry James <loganjerry at gmail.com> - 0.8-2
- Fix issues raised in review

* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 0.8-1
- Initial RPM


--- NEW FILE import.log ---
cmusphinx3-0_8-3_fc11:HEAD:cmusphinx3-0.8-3.fc11.src.rpm:1253981527

sphinx3-doxygen.patch:
 include/ascr.h                                      |   10 ++--
 include/confidence.h                                |    2 
 include/cont_mgau.h                                 |   23 +++++----
 include/corpus.h                                    |    2 
 include/ctxt_table.h                                |    2 
 include/dag.h                                       |    8 +--
 include/dict.h                                      |    4 -
 include/dict2pid.h                                  |    4 -
 include/fast_algo_struct.h                          |    2 
 include/fillpen.h                                   |    8 +--
 include/gmm_wrap.h                                  |   10 ++--
 include/interp.h                                    |    2 
 include/lextree.h                                   |    2 
 include/lm.h                                        |   48 ++++++++++----------
 include/lmclass.h                                   |   12 ++---
 include/mdef.h                                      |   12 ++---
 include/ms_gauden.h                                 |   10 ++--
 include/ms_mllr.h                                   |    8 +--
 include/ms_senone.h                                 |   10 ++--
 include/s3_cfg.h                                    |    4 -
 include/s3_decode.h                                 |   43 +++++++++--------
 include/srch_output.h                               |    2 
 include/srch_word_switch_tree.h                     |    2 
 include/subvq.h                                     |   18 +++----
 include/tmat.h                                      |    6 +-
 include/vector.h                                    |   22 ++++-----
 include/vithist.h                                   |   10 ++--
 include/wid.h                                       |    4 -
 src/libs3decoder/libsearch/srch_flat_fwd_internal.h |    8 +--
 src/programs/main_decode.c                          |    2 
 src/programs/main_gausubvq.c                        |    2 
 src/programs/s3_align.c                             |    6 +-
 32 files changed, 155 insertions(+), 153 deletions(-)

--- NEW FILE sphinx3-doxygen.patch ---
diff -dur sphinx3-0.8.ORIG/include/ascr.h sphinx3-0.8/include/ascr.h
--- sphinx3-0.8.ORIG/include/ascr.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ascr.h	2009-08-26 12:45:02.689957552 -0600
@@ -121,12 +121,12 @@
  * @return Pointer to created structure if successful, NULL otherwise.
  */
 S3DECODER_EXPORT
-ascr_t *ascr_init (int32 n_sen,		/**< Input: #Ordinary senones */
-		   int32 n_comsen,	/**< Input: #Composite senones */
-		   int32 n_sseq,        /**< Input: # of senone sequences */ 
-		   int32 n_comsseq,     /**< Input: # of composite senone sequences */ 
+ascr_t *ascr_init (int32 n_sen,		/**< Input: \#Ordinary senones */
+		   int32 n_comsen,	/**< Input: \#Composite senones */
+		   int32 n_sseq,        /**< Input: \# of senone sequences */ 
+		   int32 n_comsseq,     /**< Input: \# of composite senone sequences */ 
 		   int32 pl_win,        /**< Input: size of phoneme lookahead windows */
-		   int32 n_cisen        /**< Input: # of CI senones */
+		   int32 n_cisen        /**< Input: \# of CI senones */
     );
 
 /**
diff -dur sphinx3-0.8.ORIG/include/confidence.h sphinx3-0.8/include/confidence.h
--- sphinx3-0.8.ORIG/include/confidence.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/confidence.h	2009-08-26 12:45:02.689957552 -0600
@@ -85,7 +85,7 @@
 #endif
 
 /**
-   \struct structure specific for node of DAG for confidence
+   structure specific for node of DAG for confidence
    annotation.
    
 */
diff -dur sphinx3-0.8.ORIG/include/cont_mgau.h sphinx3-0.8/include/cont_mgau.h
--- sphinx3-0.8.ORIG/include/cont_mgau.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/cont_mgau.h	2009-08-26 12:45:20.192010034 -0600
@@ -169,7 +169,7 @@
  * \brief A single mixture-Gaussian model for one senone (see above comment).
  */
 typedef struct {
-    int32 n_comp;	/**< #Component Gaussians in this mixture.  NOTE: May be 0 (for the
+    int32 n_comp;	/**< \#Component Gaussians in this mixture.  NOTE: May be 0 (for the
 			   untrained states). */
 
     int32 bstidx;         /**< Index for the most likely Gaussians in this mixture of component. It persists through time. */ 
@@ -205,7 +205,7 @@
  * \brief The set of mixture-Gaussians in an acoustic model used in Sphinx 3.X family of tool
  */
 typedef struct {
-    int32 n_mgau;	/**< #Mixture Gaussians in this model (i.e., #senones) */
+    int32 n_mgau;	/**< \#Mixture Gaussians in this model (i.e., \#senones) */
     int32 max_comp;	/**< Max components in any mixture */
     int32 veclen;	/**< Vector length of the Gaussian density means (and diagonal vars) */
     mgau_t *mgau;	/**< The n_mgau mixture Gaussians */
@@ -215,10 +215,10 @@
     int32 verbose;    /**< Whether to display information */
 
     /* Used only in the flat lexicon decoder, statistics */
-    int32 frm_sen_eval;		/**< #Senones evaluated in the most recent frame */
-    int32 frm_gau_eval;		/**< #Gaussian densities evaluated in the most recent frame */
-    int32 frm_ci_sen_eval;        /**< #CI Senones evaluated in most recent frame*/
-    int32 frm_ci_gau_eval;        /**< #CI Senones evaluated in most recent frame*/
+    int32 frm_sen_eval;		/**< \#Senones evaluated in the most recent frame */
+    int32 frm_gau_eval;		/**< \#Gaussian densities evaluated in the most recent frame */
+    int32 frm_ci_sen_eval;        /**< \#CI Senones evaluated in most recent frame*/
+    int32 frm_ci_gau_eval;        /**< \#CI Senones evaluated in most recent frame*/
 
     int32 gau_type; /**< gau_type=CONTHMM if it is fully continous HMM, 
                        gau_type=SEMIHMM if it is semi continous HMM. Currently SEMIHMM is not supported. */
@@ -248,9 +248,9 @@
     Number of senones evaluated in this frame
     \def mgau_frm_gau_eval
     Number of gaussians evaluated in this frame
-    \def mgau_frm_ci_sen_eval
+    \def mgau_frm_cisen_eval
     Number of CI senones evaluated in this frame
-    \def mgau_frm_ci_gau_eval
+    \def mgau_frm_cigau_eval
     Number of CI gaussians evaluated in this frame
 
 */
@@ -326,15 +326,16 @@
     );		
 
 /**
- * Like mgau_eval, but return the scores of the individual components, instead of combining
+ * Like mgau_eval(), but return the scores of the individual components, instead of combining
  * them into a senone score.  
  * @return: Best component score.
  */
 S3DECODER_EXPORT
 int32 mgau_comp_eval (mgau_model_t *g,	/**< In: Set of mixture Gaussians */
-		      int32 m,		/**< In: Mixture being considered */
+		      int32 s,		/**< In: Mixture being considered */
 		      float32 *x,	/**< In: Input vector being compared to the components */
-		      int32 *score);	/**< Out: Array of scores for each component */
+		      int32 *score	/**< Out: Array of scores for each component */
+    );
 
 /**
  * A routine that dump all mean and variance parameters of a set of gaussian distribution.   
diff -dur sphinx3-0.8.ORIG/include/corpus.h sphinx3-0.8/include/corpus.h
--- sphinx3-0.8.ORIG/include/corpus.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/corpus.h	2009-08-26 12:45:02.691987630 -0600
@@ -168,7 +168,7 @@
  */
 typedef struct {
     hash_table_t *ht;	/**< Hash table for IDs; CASE-SENSITIVE */
-    int32 n;		/**< #IDs (and corresponding argument strings) in the corpus */
+    int32 n;		/**< \#IDs (and corresponding argument strings) in the corpus */
     char **str;		/**< The argument strings */
 } corpus_t;
 
diff -dur sphinx3-0.8.ORIG/include/ctxt_table.h sphinx3-0.8/include/ctxt_table.h
--- sphinx3-0.8.ORIG/include/ctxt_table.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ctxt_table.h	2009-08-26 12:45:02.692970928 -0600
@@ -111,7 +111,7 @@
 typedef struct {
     s3ssid_t  *ssid;	/**< Senone Sequence ID list for all context ciphones */
     s3cipid_t *cimap;	/**< Index into ssid[] above for each ci phone */
-    int32     n_ssid;	/**< #Unique ssid in above, compressed ssid list */
+    int32     n_ssid;	/**< \#Unique ssid in above, compressed ssid list */
 } xwdssid_t;
 
 
diff -dur sphinx3-0.8.ORIG/include/dag.h sphinx3-0.8/include/dag.h
--- sphinx3-0.8.ORIG/include/dag.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/dag.h	2009-08-26 12:45:02.693953379 -0600
@@ -203,10 +203,10 @@
 */
 typedef struct {
     dagnode_t *list;		/**< Linear list of nodes allocated */
-    dagnode_t *root;            /**< Corresponding to the node of (<s>,0)  */
-    dagnode_t *end;             /**< Final node (</s>,nfrm) */
+    dagnode_t *root;            /**< Corresponding to the node of (\<s\>,0)  */
+    dagnode_t *end;             /**< Final node (\</s\>,nfrm) */
 
-    daglink_t entry;		/**< Entering (<s>,0) */
+    daglink_t entry;		/**< Entering (\<s\>,0) */
     daglink_t final;            /**< Exit link from final DAG node */
 
     s3wid_t orig_exitwid;	/**< If original exit node is not a filler word */
@@ -220,7 +220,7 @@
                                    parts of the dag code will exceed the maximum no of edge 
                                 */
 
-    int32 lmop;		        /**< (Temporary Variable): #LM ops actually made */
+    int32 lmop;		        /**< (Temporary Variable): \#LM ops actually made */
     int32 maxlmop;		/**< Max LM ops allowed before utterance aborted 
 				 */
 
diff -dur sphinx3-0.8.ORIG/include/dict2pid.h sphinx3-0.8/include/dict2pid.h
--- sphinx3-0.8.ORIG/include/dict2pid.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/dict2pid.h	2009-08-26 12:45:02.694986001 -0600
@@ -221,8 +221,8 @@
 				   composite phone (composite sseq). */
     int32 *comwt;		/**< Weight associated with each composite state (logs3 value).
 				   Final composite state score weighted by this amount */
-    int32 n_comstate;		/**< #Composite states */
-    int32 n_comsseq;		/**< #Composite senone sequences */
+    int32 n_comstate;		/**< \#Composite states */
+    int32 n_comsseq;		/**< \#Composite senone sequences */
     int32 n_ci;   /**< Number of CI phone in */
     int32 n_dictsize; /**< Dictionary size */
 
diff -dur sphinx3-0.8.ORIG/include/dict.h sphinx3-0.8/include/dict.h
--- sphinx3-0.8.ORIG/include/dict.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/dict.h	2009-08-26 12:45:02.694986001 -0600
@@ -150,8 +150,8 @@
     int32 n_ciphone;	/**< Used only if CI phones handled internally (mdef == NULL) */
     dictword_t *word;	/**< Array of entries in dictionary */
     hash_table_t *ht;	/**< Hash table for mapping word strings to word ids */
-    int32 max_words;	/**< #Entries allocated in dict, including empty slots */
-    int32 n_word;	/**< #Occupied entries in dict; ie, excluding empty slots */
+    int32 max_words;	/**< \#Entries allocated in dict, including empty slots */
+    int32 n_word;	/**< \#Occupied entries in dict; ie, excluding empty slots */
     int32 filler_start;	/**< First filler word id (read from filler dict) */
     int32 filler_end;	/**< Last filler word id (read from filler dict) */
     s3wid_t *comp_head;	/**< comp_head[w] = wid of a compound word with 1st component = w;
diff -dur sphinx3-0.8.ORIG/include/fast_algo_struct.h sphinx3-0.8/include/fast_algo_struct.h
--- sphinx3-0.8.ORIG/include/fast_algo_struct.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/fast_algo_struct.h	2009-08-26 12:45:02.696274894 -0600
@@ -193,7 +193,7 @@
     int32 maxhmmpf;        /**< Max active HMMs per frame*/
     int32 hmm_hist_binsize;/**< Hmm histogram bin size */
     int32 hmm_hist_bins;   /**< Number of histogram bins*/
-    int32 *hmm_hist;	   /**< Histogram: #frames in which a given no. of HMMs are active */
+    int32 *hmm_hist;	   /**< Histogram: \#frames in which a given no. of HMMs are active */
     
 } histprune_t;
 
diff -dur sphinx3-0.8.ORIG/include/fillpen.h sphinx3-0.8/include/fillpen.h
--- sphinx3-0.8.ORIG/include/fillpen.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/fillpen.h	2009-08-26 12:45:02.697279436 -0600
@@ -115,10 +115,10 @@
  * Initialize filler probabilities (penalties, whatever) module and return a pointer to the
  * structure created.  Filler word probabilities are simple unigram probabilities.  Here is an
  * example of such a file (one entry per line; a word and a probability):
- *   <sil>  0.10792
- *   <uh>   0.00866
- *   <um>   0.00147
- * If the first character in a line is a '#', the line is treated as a comment and ignored.
+ *   \<sil\>  0.10792
+ *   \<uh\>   0.00866
+ *   \<um\>   0.00147
+ * If the first character in a line is a '\#', the line is treated as a comment and ignored.
  * If no filler probabilities file is provided, the silence word gets silprob, and all other
  * filler words get fillprob.  As with the trigram LM, the resulting log-probabilities are
  * multiplied by a language weight and finally a word insertion penalty is tacked on.
diff -dur sphinx3-0.8.ORIG/include/gmm_wrap.h sphinx3-0.8/include/gmm_wrap.h
--- sphinx3-0.8.ORIG/include/gmm_wrap.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/gmm_wrap.h	2009-08-26 12:45:02.697279436 -0600
@@ -108,7 +108,7 @@
 */
 int32 approx_cd_gmm_compute_sen(
     void *srch, /**< a pointer to a srch_t */
-    float32 **feat, /**< feature vector #stream x #coeff*/
+    float32 **feat, /**< feature vector \#stream x \#coeff*/
     int32 wav_idx  /**< frame index */
     );
 
@@ -120,7 +120,7 @@
 
 int32 ms_cd_gmm_compute_sen_comp(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
     );
 
@@ -131,7 +131,7 @@
 
 int32 ms_cd_gmm_compute_sen(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
     );
 
@@ -146,7 +146,7 @@
 
 int32 s3_cd_gmm_compute_sen_comp(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
 
     );
@@ -163,7 +163,7 @@
 
 int32 s3_cd_gmm_compute_sen(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
     );
 
diff -dur sphinx3-0.8.ORIG/include/interp.h sphinx3-0.8/include/interp.h
--- sphinx3-0.8.ORIG/include/interp.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/interp.h	2009-08-26 12:45:02.698235093 -0600
@@ -101,7 +101,7 @@
  */
 typedef struct {
     logmath_t *logmath;
-    int32 n_sen;	/**< #senones */
+    int32 n_sen;	/**< \#senones */
 
     /**
      * \struct interp_wt_s
diff -dur sphinx3-0.8.ORIG/include/lextree.h sphinx3-0.8/include/lextree.h
--- sphinx3-0.8.ORIG/include/lextree.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/lextree.h	2009-08-26 12:45:02.699266386 -0600
@@ -152,7 +152,7 @@
  * A lextree can be built for a specific history (e.g., for all bigram successors of a given
  * word or trigram successors of a word-pair in a given LM).  The history provides a set of left
  * context CIphones (if the final history word has multiple pronunciations; and there is always
- * <sil>).
+ * \<sil\>).
  * A lextree is usually a set of trees, one for each distinct root model for the given set of
  * words.  Furthermore, the root node of each tree can itself actually be a SET of nodes,
  * required by the different left contexts.  If there is no history (i.e., the unigram lextree),
diff -dur sphinx3-0.8.ORIG/include/lmclass.h sphinx3-0.8/include/lmclass.h
--- sphinx3-0.8.ORIG/include/lmclass.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/lmclass.h	2009-08-26 12:45:02.699949946 -0600
@@ -133,14 +133,14 @@
  * updated set.  Note that the input file can contain several class definitions.
  * File format:
  * 
- *    LMCLASS <classname1>
- * 	<word1> [<prob1>]
- * 	<word2> [<prob2>]
+ *    LMCLASS \<classname1\>
+ * 	\<word1\> [\<prob1\>]
+ * 	\<word2\> [\<prob2\>]
  * 	... (each word, and its associated probability, in one line)
- *    END <classname1>
- *    LMCLASS <classname2>
+ *    END \<classname1\>
+ *    LMCLASS \<classname2\>
  *      ...
- *    END <classname2>
+ *    END \<classname2\>
  *    ... (as many classes as desired)
  * 
  * By convention, classname strings begin and end with [ and ] (Roni Rosenfeld).
diff -dur sphinx3-0.8.ORIG/include/lm.h sphinx3-0.8/include/lm.h
--- sphinx3-0.8.ORIG/include/lm.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/lm.h	2009-08-26 12:45:02.701195066 -0600
@@ -448,7 +448,7 @@
 typedef struct tginfo_s {
     s3lmwid_t w1;		/**< w1 component of bigram w1,w2.  All bigrams with
 				   same w2 linked together. */
-    int32 n_tg;			/**< #tg for parent bigram w1,w2 */
+    int32 n_tg;			/**< \#tg for parent bigram w1,w2 */
     tg_t *tg;			/**< Trigrams for w1,w2 */
     int32 bowt;			/**< tg bowt for w1,w2 */
     int32 used;			/**< whether used since last lm_reset */
@@ -463,7 +463,7 @@
 typedef struct tginfo32_s {
     s3lmwid32_t w1;		/**< w1 component of bigram w1,w2.  All bigrams with
 				   same w2 linked together. */
-    int32 n_tg;			/**< #tg for parent bigram w1,w2 */
+    int32 n_tg;			/**< \#tg for parent bigram w1,w2 */
     tg32_t *tg32;			/**< Trigrams for w1,w2 */
     int32 bowt;			/**< tg bowt for w1,w2 */
     int32 used;			/**< whether used since last lm_reset */
@@ -558,9 +558,9 @@
  */
 typedef struct lm_s {
     char *name ;        /**< The name of the LM */
-    int32 n_ug;         /**< #unigrams in LM */
-    int32 n_bg;         /**< #bigrams in entire LM */
-    int32 n_tg;         /**< #trigrams in entire LM */
+    int32 n_ug;         /**< \#unigrams in LM */
+    int32 n_bg;         /**< \#bigrams in entire LM */
+    int32 n_tg;         /**< \#trigrams in entire LM */
     int32 max_ug;       /**< To which n_ug can grow with dynamic addition of words */
 
     int32 n_ng;           /**< if unigram, n_ng=1, if bigram n_bg=2 and so one */
@@ -625,15 +625,15 @@
     
     
     /* Statistics */
-    int32 n_bg_fill;    /**< #bg fill operations */
-    int32 n_bg_inmem;   /**< #bg in memory */
-    int32 n_bg_score;   /**< #bg_score operations */
-    int32 n_bg_bo;	/**< #bg_score ops backed off to ug */
+    int32 n_bg_fill;    /**< \#bg fill operations */
+    int32 n_bg_inmem;   /**< \#bg in memory */
+    int32 n_bg_score;   /**< \#bg_score operations */
+    int32 n_bg_bo;	/**< \#bg_score ops backed off to ug */
     int32 n_tg_fill;	/**< Similar stats for trigrams */
-    int32 n_tg_inmem;   /**< #tg in memory */
-    int32 n_tg_score;   /**< #tg_score operations */
-    int32 n_tg_bo;      /**< #tg_score ops backed off to bg */
-    int32 n_tgcache_hit;  /**< # of trigram cache hit ops backed off to bg */
+    int32 n_tg_inmem;   /**< \#tg in memory */
+    int32 n_tg_score;   /**< \#tg_score operations */
+    int32 n_tg_bo;      /**< \#tg_score ops backed off to bg */
+    int32 n_tgcache_hit;  /**< \# of trigram cache hit ops backed off to bg */
     
     int32 access_type;	/**< Updated on every lm_{tg,bg,ug}_score call to reflect the kind of
                            n-gram accessed: 3 for 3-gram, 2 for 2-gram and 1 for 1-gram */
@@ -649,7 +649,7 @@
   
     /* Data structure that maintains the class information */
     lmclass_t **lmclass;   /**< LM class for this LM */
-    int32 n_lmclass;      /**< # LM class */
+    int32 n_lmclass;      /**< \# LM class */
     int32 *inclass_ugscore; /**< An array of inter-class unigram probability */
 
 
@@ -876,7 +876,7 @@
 
 /**
  * Return trigram followers for given two words.  Both w1 and w2 must be valid.
- * Return value: #trigrams in returned list.
+ * Return value: \#trigrams in returned list.
  */
 int32 lm_tglist (lm_t *lmp,	/**< In: LM being queried */
 		 s3lmwid32_t w1,	/**< In: LM word id of the first of a 2-word history */
@@ -894,7 +894,7 @@
 
 /**
  * Return the bigram followers for the given word w.
- * Return value: #bigrams in returned list.
+ * Return value: \#bigrams in returned list.
  */
 int32 lm_bglist (lm_t *lmp,	/**< In: LM being queried */
 		 s3lmwid32_t w,	/**< In: LM word id of the 1-word history */
@@ -915,7 +915,7 @@
  * of simply returning the bglist.  The wordprob array contains dictionary word IDs.  But note
  * that only the base IDs are entered; the caller is responsible for filling out the alternative
  * pronunciations.
- * Return value:  #entries filled in the wordprob array.
+ * Return value:  \#entries filled in the wordprob array.
  */
 int32 lm_bg_wordprob(lm_t *lm,		/**< In: LM being queried */
 		     s3lmwid32_t w,	/**< In: LM word ID of the 1-word history */
@@ -938,7 +938,7 @@
 
 /**
  * Like lm_bg_wordprob, but for unigrams.
- * Return value:  #entries filled in the wordprob array.
+ * Return value:  \#entries filled in the wordprob array.
  */
 int32 lm_ug_wordprob(lm_t *lm, /**< In: LM being queried */
 		     dict_t *dict, /**< In : The dictionary */
@@ -946,7 +946,7 @@
 		     wordprob_t *wp /**< In/out: Array to be filled */
     );
 
-/** Return the unigrams in LM.  Return value: #unigrams in returned list. */
+/** Return the unigrams in LM.  Return value: \#unigrams in returned list. */
 int32 lm_uglist (lm_t *lmp,	/**< In: LM being queried */
 		 ug_t **ug	/**< Out: *ug = unigram array */
     );
@@ -1157,7 +1157,7 @@
    x: not supported yet
    y: supported
 
-   i\o 0 1 2
+   i\\o 0 1 2
    0 - n n
    1 n - y
    2 n x -
@@ -1190,10 +1190,10 @@
    Add word list to the LM 
    For each word in the file, call lm_add_wordlist. 
    The file is assume to have a format like this:
-   <word1> 
-   <word2>
-   <word3>
-   <word4>
+   \<word1\> 
+   \<word2\>
+   \<word3\>
+   \<word4\>
      
    If the lmwid2dictid mapping is not updated, or the dictionary
    itself is not used in the context.  Just specify dict=NULL;
diff -dur sphinx3-0.8.ORIG/include/mdef.h sphinx3-0.8/include/mdef.h
--- sphinx3-0.8.ORIG/include/mdef.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/mdef.h	2009-08-26 12:45:02.702266353 -0600
@@ -182,12 +182,12 @@
    \brief strcture for storing the model definition. 
 */
 typedef struct {
-    int32 n_ciphone;		/**< #basephones actually present */
-    int32 n_phone;		/**< #basephones + #triphones actually present */
-    int32 n_emit_state;		/**< #emitting states per phone */
-    int32 n_ci_sen;		/**< #CI senones; these are the first */
-    int32 n_sen;		/**< #senones (CI+CD) */
-    int32 n_tmat;		/**< #transition matrices */
+    int32 n_ciphone;		/**< \#basephones actually present */
+    int32 n_phone;		/**< \#basephones + \#triphones actually present */
+    int32 n_emit_state;		/**< \#emitting states per phone */
+    int32 n_ci_sen;		/**< \#CI senones; these are the first */
+    int32 n_sen;		/**< \#senones (CI+CD) */
+    int32 n_tmat;		/**< \#transition matrices */
     
     hash_table_t *ciphone_ht;	/**< Hash table for mapping ciphone strings to ids */
     ciphone_t *ciphone;		/**< CI-phone information for all ciphones */
diff -dur sphinx3-0.8.ORIG/include/ms_gauden.h sphinx3-0.8/include/ms_gauden.h
--- sphinx3-0.8.ORIG/include/ms_gauden.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ms_gauden.h	2009-08-26 12:45:02.702266353 -0600
@@ -139,9 +139,9 @@
     vector_t ***var;	/**< like mean; diagonal covariance vector only */
     float32 ***det;	/**< log(determinant) for each variance vector;
 			   actually, log(sqrt(2*pi*det)) */
-    int32 n_mgau;	/**< #codebooks */
-    int32 n_feat;	/**< #feature streams in each codebook */
-    int32 n_density;	/**< #gaussian densities in each codebook-feature stream */
+    int32 n_mgau;	/**< \#codebooks */
+    int32 n_feat;	/**< \#feature streams in each codebook */
+    int32 n_density;	/**< \#gaussian densities in each codebook-feature stream */
     int32 *featlen;	/**< feature length for each feature */
 } gauden_t;
 
@@ -193,7 +193,7 @@
 gauden_dist (gauden_t *g,	/**< In: handle to entire ensemble of codebooks */
 	     s3mgauid_t mgau,	/**< In: codebook for which density values to be evaluated
 				   (g->{mean,var}[mgau]) */
-	     int32 n_top,	/**< In: #top densities to be evaluated */
+	     int32 n_top,	/**< In: \#top densities to be evaluated */
 	     vector_t *obs,	/**< In: Observation vector; obs[f] = for feature f */
 	     gauden_dist_t **out_dist
 	     /**< Out: n_top best codewords and density values,
@@ -213,7 +213,7 @@
  */
 int32
 gauden_dist_norm (gauden_t *g,		/**< In: handle to all collection of codebooks */
-		  int32 n_top,		/**< In: #density values computed per feature */
+		  int32 n_top,		/**< In: \#density values computed per feature */
 		  gauden_dist_t ***dist,/**< In/Out: n_top density indices and values for
 					   each feature.  On return, density values are
 					   normalized. */
diff -dur sphinx3-0.8.ORIG/include/ms_mllr.h sphinx3-0.8/include/ms_mllr.h
--- sphinx3-0.8.ORIG/include/ms_mllr.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ms_mllr.h	2009-08-26 12:45:02.703328150 -0600
@@ -97,7 +97,7 @@
 			   float32 *****A,		/**< Out: [*A][stream][nclass][streamlen][streamlen] */
 			   float32 ****B,		/**< Out: [*B][stream][nclass][streamlen] */
 			   int32 *streamlen,	/**< In: Dimension of each feature stream */
-			   int32 n_stream,	/**< In: #Feature streams */
+			   int32 n_stream,	/**< In: \#Feature streams */
 			   int32 *nclass	/**< Out: number of classes */
     );
 
@@ -107,7 +107,7 @@
  */
 int32 ms_mllr_free_regmat (float32 ****A,	/**< In: A[stream][nclass][streamlen][streamlen] */
 			   float32 ***B,	/**< In: B[stream][nclass][streamlen] */
-			   int32 n_stream	/**< In: #Feature streams */
+			   int32 n_stream	/**< In: \#Feature streams */
     );
 
 /**
@@ -116,11 +116,11 @@
  */
 int32 ms_mllr_norm_mgau (float32 ***mean,	/**<< In/Out: Set of vectors to be transformed:
 						   mean[stream][density] */
-			 int32 n_density,	/**< In: #densities in above mean matrix */
+			 int32 n_density,	/**< In: \#densities in above mean matrix */
 			 float32 ****A,	/**< In: "matrix" portion of regression matrix */
 			 float32 ***B,	/**< In: "vector" portion of regression matrix */
 			 int32 *streamlen,	/**< In: Dimension of each feature stream */
-			 int32 n_stream,	/**< In: #Feature streams */
+			 int32 n_stream,	/**< In: \#Feature streams */
 			 int32 _class	/**< In: number of classes */
     );
 
diff -dur sphinx3-0.8.ORIG/include/ms_senone.h sphinx3-0.8/include/ms_senone.h
--- sphinx3-0.8.ORIG/include/ms_senone.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ms_senone.h	2009-08-26 12:45:02.704256679 -0600
@@ -147,10 +147,10 @@
                                    evaluating the many codebooks will be more costly.
                                    if (n_gauden == 1): pdf[feat][codeword][sen].  Optimized
                                    for the shared-distribution semi-continuous case. */
-    int32 n_sen;		/**< #senones in this set */
-    int32 n_feat;		/**< #feature streams */ 
-    int32 n_cw;			/**< #codewords per codebook,stream */
-    int32 n_gauden;		/**< #gaussian density codebooks referred to by senones */
+    int32 n_sen;		/**< \#senones in this set */
+    int32 n_feat;		/**< \#feature streams */ 
+    int32 n_cw;			/**< \#codewords per codebook,stream */
+    int32 n_gauden;		/**< \#gaussian density codebooks referred to by senones */
     float32 mixwfloor;		/**< floor applied to each PDF entry */
     int32 shift;		/**< LSB bits truncated from original logs3 value */
     s3mgauid_t *mgau;		/**< senone-id -> mgau-id mapping for senones in this set */
@@ -189,7 +189,7 @@
 
 /**
  * Like senone_eval, but compute all senone scores for the shared density case (ie,
- * #codebooks = 1).
+ * \#codebooks = 1).
  */
 void senone_eval_all (senone_t *s,		/**< In: Senone structure */
 		      gauden_dist_t **dist,	/**< In: as in senone_eval above */
diff -dur sphinx3-0.8.ORIG/include/s3_cfg.h sphinx3-0.8/include/s3_cfg.h
--- sphinx3-0.8.ORIG/include/s3_cfg.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/s3_cfg.h	2009-08-26 12:45:02.705131259 -0600
@@ -353,8 +353,8 @@
    already exist, assign it a new id.
 
    @param _cfg A CFG parser.
-   @param _id A term id.
-   @return A string representation of the term.
+   @param _item A term string representation.
+   @return A term id.
  */
 s3_cfg_id_t
 s3_cfg_str2id(s3_cfg_t *_cfg, char *_item);
diff -dur sphinx3-0.8.ORIG/include/s3_decode.h sphinx3-0.8/include/s3_decode.h
--- sphinx3-0.8.ORIG/include/s3_decode.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/s3_decode.h	2009-08-26 12:45:02.706327239 -0600
@@ -122,7 +122,7 @@
 #ifndef __S3_DECODE_H
 #define __S3_DECODE_H
 
-/** \file live_decode_API.h
+/** \file s3_decode.h
  * \brief header for live mode decoding API 
  */
 #ifdef __cplusplus
@@ -230,8 +230,8 @@
     <I>cmd_ln_parse_file_r()</I>.  The user is responsible for calling
     <I>cmd_ln_free_r()</I> when he/she is done with the decoder.
 
-    @param decoder Pointer to the decoder.
-    @param config Pointer to the command-line object
+    @param _decode Pointer to the decoder.
+    @param _config Pointer to the command-line object
                   returned by <i>cmd_ln_parse_r()</i>.
     @return 0 for success.  -1 for failure.
 */
@@ -243,7 +243,7 @@
     function should be called once the user is finished with the Sphinx3
     decoder.
 
-    @param decoder Pointer to the decoder.
+    @param _decode Pointer to the decoder.
     @see s3_decode_init
 */
 S3DECODER_EXPORT
@@ -251,19 +251,19 @@
 
 /** Marks the start of the current utterance.  An utterance is a session of
     speech decoding that starts with a call to <I>s3_decode_begin_utt()</I> and
-    ends with a call to <I>{@link s3_decode_end_utt s3_decode_end_utt()}</I>.
+    ends with a call to <I>s3_decode_end_utt()</I>.
     In the duration of an utterance, speech data is processed with either
-    <I>{@link s3_decode_process_raw s3_decode_process_raw()}</I> or
-    <I>{@link s3_decode_process_ceps s3_decode_process_ceps()}</I>.  Decoding
+    <I>s3_decode_process_raw()</I> or
+    <I>s3_decode_process_ceps(}</I>.  Decoding
     results (hypothesis) can be retrieved any time after the start of an
-    utterance using <I>{@link s3_decode_hypothesis s3_decode_hypothesis()}</I>.
+    utterance using <I>s3_decode_hypothesis()</I>.
     All previous results will be clobbered at the start of a new utterance.
 
     At the moment, there is an undocumented time limit to the length of an
     utterance.  (Yitao: there is?)
 
-    @param decoder Pointer to the decoder.
-    @param uttid Utterance ID string.  If <I>null</I>, a somewhat unique 
+    @param _decode Pointer to the decoder.
+    @param _uttid Utterance ID string.  If <I>null</I>, a somewhat unique 
     utterance id will be generated instead.
     @return 0 for success.  -1 for failure.
     @see s3_decode_end_utt
@@ -277,10 +277,10 @@
     process speech data until the start of the next utterance.  Any hypothesis
     retrieved prior to the end of the utterance is called a partial hypothesis.
     Any hypothesis retrieved after the end of the utterance is called the final
-    hypothesis.  See <I>{@link s3_decode_hypothesis s3_decode_hypothesis()}</I>
+    hypothesis.  See <I>s3_decode_hypothesis()</I>
     on how to retrieve hypothesis.
 
-    @param decoder Pointer to the decoder
+    @param _decode Pointer to the decoder
     @see s3_decode_begin_utt
     @see s3_decode_process
     @see s3_decode_hypothesis
@@ -290,17 +290,17 @@
 
 /** Process a buffer of cepstrum frames for the current utterance.  This 
     function has to be called in the duration of an utterance.  That is, in
-    between calls to <I>{@link s3_decode_begin_utt s3_decode_begin_utt()}</I>
-    and <I>{@link s3_decode_end_utt s3_decode_end_utt()}</I>.
+    between calls to <I>s3_decode_begin_utt()</I>
+    and <I>s3_decode_end_utt()</I>.
 
     One common issue with Sphinx3 decoder is the mismatch of parameters to
     the signal processor and accoustic model.  Please double check with the
     accoustic model training scripts and your signal processing front-end to
     make sure the cepstrals are generated consistently.
 
-    @param decoder Pointer to the decoder.
-    @param frames Buffer of audio feature frames.
-    @param num_frames Number of frames in the buffer.
+    @param _decode Pointer to the decoder.
+    @param _frames Buffer of audio feature frames.
+    @param _num_frames Number of frames in the buffer.
     @return 0 for success.  -1 for failure.
     @see s3_decode_begin_utt
     @see s3_decode_end_utt
@@ -338,10 +338,11 @@
     }
     </PRE>
     
-    @param decoder Pointer to the decoder.
-    @param hyp_str Return pointer to a READ-ONLY string.  If <I>null</I>,
+    @param _decode Pointer to the decoder.
+    @param _uttid Pointer to utterance ID string.
+    @param _hyp_str Return pointer to a READ-ONLY string.  If <I>null</I>,
     the string is not returned.
-    @param hyp_segs Return pointer to a null-terminated array of word
+    @param _hyp_segs Return pointer to a null-terminated array of word
     segments.  If <I>null</I>, the array is not returned.
     @return 0 for success.  -1 for failure.
 */
@@ -353,7 +354,7 @@
  * s3_decode_end_utt() before this.  See {@link dag.h} and {@link
  * astar.h} for information on what to do with this structure.
  *
- * @param decoder Pointer to the decoder.
+ * @param _decode Pointer to the decoder.
  * @return A dag_t structure, or NULL on failure.  This pointer
  * becomes invalid after a call to s3_decode_begin_utt().
  */
diff -dur sphinx3-0.8.ORIG/include/srch_output.h sphinx3-0.8/include/srch_output.h
--- sphinx3-0.8.ORIG/include/srch_output.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/srch_output.h	2009-08-26 12:45:02.706327239 -0600
@@ -176,7 +176,7 @@
 void log_hypseg (char *uttid,   /**< Input; uttid */
 		 FILE *fp,	/**< Out: output file */
 		 srch_hyp_t *hypptr,	/**< In: Hypothesis */
-		 int32 nfrm,	/**< In: #frames in utterance */
+		 int32 nfrm,	/**< In: \#frames in utterance */
 		 int32 scl,	/**< In: Acoustic scaling for entire utt */
 		 float64 lwf,	/**< In: LM score scale-factor (in dagsearch) */
 		 dict_t* dict,  /**< In: dictionary */
diff -dur sphinx3-0.8.ORIG/include/srch_word_switch_tree.h sphinx3-0.8/include/srch_word_switch_tree.h
--- sphinx3-0.8.ORIG/include/srch_word_switch_tree.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/srch_word_switch_tree.h	2009-08-26 12:45:02.707011056 -0600
@@ -130,7 +130,7 @@
 
 
     lextree_t **roottree;           /**< The pool of trees that stores all
-                                       word trees. An array with dimension. #lm*/
+                                       word trees. An array with dimension. \#lm*/
 
     hash_table_t *active_word;    /**< Hash table that map word end to the index of the expandtree. */
 
diff -dur sphinx3-0.8.ORIG/include/subvq.h sphinx3-0.8/include/subvq.h
--- sphinx3-0.8.ORIG/include/subvq.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/subvq.h	2009-08-26 12:45:02.707011056 -0600
@@ -112,10 +112,10 @@
  * \brief Wrapper structures of sub-vector quantization
  */
 typedef struct {
-    arraysize_t origsize;	/**< origsize.r = #codebooks (or states) in original model;
-				   origsize.c = max #codewords/codebook in original model. */
-    int32 n_sv;			/**< #Subvectors */
-    int32 vqsize;		/**< #Codewords in each subvector quantized mean/var table */
+    arraysize_t origsize;	/**< origsize.r = \#codebooks (or states) in original model;
+				   origsize.c = max \#codewords/codebook in original model. */
+    int32 n_sv;			/**< \#Subvectors */
+    int32 vqsize;		/**< \#Codewords in each subvector quantized mean/var table */
     int32 **featdim;		/**< featdim[s] = Original feature dimensions in subvector s */
     vector_gautbl_t *gautbl;	/**< Vector-quantized Gaussians table for each sub-vector */
     int32 ***map;		/**< map[i][j] = map from original codebook(i)/codeword(j) to
@@ -144,9 +144,9 @@
 
 /**
  * SubVQ file format:
- *   VQParam #Original-Codebooks #Original-Codewords/codebook(max) -> #Subvectors #VQ-codewords
- *   Subvector 0 length <length> <feature-dim> <feature-dim> <feature-dim> ...
- *   Subvector 1 length <length> <feature-dim> <feature-dim> <feature-dim> ...
+ *   VQParam \#Original-Codebooks \#Original-Codewords/codebook(max) -> \#Subvectors \#VQ-codewords
+ *   Subvector 0 length \<length\> \<feature-dim\> \<feature-dim\> \<feature-dim\> ...
+ *   Subvector 1 length \<length\> \<feature-dim\> \<feature-dim\> \<feature-dim\> ...
  *   ...
  *   Codebook 0
  *   Row 0 of mean/var values (interleaved) for subvector 0 codebook (in 1 line)
@@ -237,7 +237,7 @@
  */
 int32 subvq_mgau_shortlist (subvq_t *vq,        /**< In subvq */
 			    int32 m,	/**< In: GMM index */
-			    int32 n,	/**< In: #Components in specified mixture */
+			    int32 n,	/**< In: \#Components in specified mixture */
 			    int32 beam	/**< In: Threshold to select active components */
     );
 
@@ -250,7 +250,7 @@
 int32 subvq_mgau_eval (mgau_model_t *g, /**< In: Gaussian */
 		       subvq_t *vq, /**< In: the SVQ */
 		       int32 m, /**< In: GMM Index */
-		       int32 n, /**< In :#Components in a specified mixture */
+		       int32 n, /**< In :\#Components in a specified mixture */
 		       int32 *active /**< In:Active list of mixture */
     );
 
diff -dur sphinx3-0.8.ORIG/include/tmat.h sphinx3-0.8/include/tmat.h
--- sphinx3-0.8.ORIG/include/tmat.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/tmat.h	2009-08-26 12:45:02.708327341 -0600
@@ -114,9 +114,9 @@
     logmath_t *logmath;
     int32 ***tp;	/**< The transition matrices; int32 since probs in logs3 domain:
 			   tp[tmatid][from-state][to-state] */
-    int32 n_tmat;	/**< #matrices */
-    int32 n_state;	/**< #source states in matrix (only the emitting states);
-			   #destination states = n_state+1, it includes the exit state */
+    int32 n_tmat;	/**< \#matrices */
+    int32 n_state;	/**< \#source states in matrix (only the emitting states);
+			   \#destination states = n_state+1, it includes the exit state */
 } tmat_t;
 
 
diff -dur sphinx3-0.8.ORIG/include/vector.h sphinx3-0.8/include/vector.h
--- sphinx3-0.8.ORIG/include/vector.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/vector.h	2009-08-26 12:45:02.709225798 -0600
@@ -84,8 +84,8 @@
  * \brief wrapper of array size 
  */
 typedef struct {
-    int32 r;		/**< #rows, */
-    int32 c;		/**< #cols in an array */
+    int32 r;		/**< \#rows, */
+    int32 c;		/**< \#cols in an array */
 } arraysize_t;
 
 /** \struct point_t
@@ -187,7 +187,7 @@
 int32 vector_mean (float32 *mean,	/**< Out: Computed mean; caller should allocate
 					   this memory */
 		   float32 **data,	/**< In: Set of data over which mean is computed */
-		   int32 n_vec,		/**< In: #Vectors in data */
+		   int32 n_vec,		/**< In: \#Vectors in data */
 		   int32 n_dim	/**< In: Dimensionality of each vector (and mean) */
     );
 
@@ -241,14 +241,14 @@
  */
 S3DECODER_EXPORT
 float64 vector_vqgen (float32 **data,	/**< In: Input Data to be quantized */
-		      int32 rows,	/**< In: #Rows in input data */
-		      int32 cols,	/**< In: #Cols in input data (and output VQ table) */
-		      int32 vqrows,	/**< In: #Rows in vector quantized result */
+		      int32 rows,	/**< In: \#Rows in input data */
+		      int32 cols,	/**< In: \#Cols in input data (and output VQ table) */
+		      int32 vqrows,	/**< In: \#Rows in vector quantized result */
 		      float64 epsilon,	/**< In: Convergence limit; stop k-means iterations when
 					   the relative reduction in total squared error in
 					   successive iterations ((sqerr[t]-sqerr[t+1])/sqerr[t])
 					   is below this value. */
-		      int32 maxiter,	/**< In: Max #iterations, regardless of convlimit */
+		      int32 maxiter,	/**< In: Max \#iterations, regardless of convlimit */
 		      float32 **mean,	/**< Out: Vector quantized array of centroids.  Caller
 					   must allocate this array */
 		      int32 *map,       /**< Out: data->mean mapping; mean[map[i]] is the closest
@@ -269,8 +269,8 @@
  */
 int32 vector_vqlabel (float32 *vec,	/**< In: Vector to be compared against VQ table */
 		      float32 **mean,	/**< In: Table of centroids */
-		      int32 rows,	/**< In: #Rows in mean */
-		      int32 cols,	/**< In: #Cols in mean (and vec) */
+		      int32 rows,	/**< In: \#Rows in mean */
+		      int32 cols,	/**< In: \#Cols in mean (and vec) */
 		      float64 *sqerr	/**< Out: Squared error (distance) between vec and the
 					   selected codeword.  May be NULL if not needed. */
     );
@@ -296,7 +296,7 @@
  * only the diagonal is maintained, as a vector).
  */
 typedef struct {
-    int32 n_gau;	/**< #Gaussians in table */
+    int32 n_gau;	/**< \#Gaussians in table */
     int32 veclen;	/**< Vector length */
     float32 **mean;	/**< n_cw x veclen mean values */
     float32 **var;	/**< n_cw x veclen corresponding (diagonal) variance values */
@@ -338,7 +338,7 @@
 void
 vector_gautbl_eval_logs3 (vector_gautbl_t *gau,	/**< In: Table of Gaussians */
 			  int32 offset,	/**< In: First VQ codeword in the range to be evaluated */
-			  int32 count,	/**< In: #Codewords to be evaluated (range size) */
+			  int32 count,	/**< In: \#Codewords to be evaluated (range size) */
 			  float32 *x,	/**< In: Input vector being compared to codewords */
 			  int32 *scr,	/**< Out: Mahalanobis distance scores (logs3 values).
 					   Caller must allocate this array.  Note that only
diff -dur sphinx3-0.8.ORIG/include/vithist.h sphinx3-0.8/include/vithist.h
--- sphinx3-0.8.ORIG/include/vithist.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/vithist.h	2009-08-26 12:45:02.709225798 -0600
@@ -239,7 +239,7 @@
     vithist_entry_t **entry;	/**< entry[i][j]= j-th entry in the i-th block allocated */
     int32 *frame_start;		/**< For each frame, the first vithist ID in that frame; (the
                                    last is just before the first of the next frame) */
-    int32 n_entry;		/**< Total #entries used (generates global seq no. or ID) */
+    int32 n_entry;		/**< Total \#entries used (generates global seq no. or ID) */
     int32 n_frm;		/**< No. of frames processed so far in this utterance */
     int32 n_ci;                 /**< No. of CI phones */
     int32 bghist;		/**< If TRUE (bigram-mode) only one entry/word/frame; otherwise
@@ -301,8 +301,8 @@
 
 
 /**
- * Invoked at the beginning of each utterance; vithist initialized with a root <s> entry.
- * @return Vithist ID of the root <s> entry.
+ * Invoked at the beginning of each utterance; vithist initialized with a root \<s\> entry.
+ * @return Vithist ID of the root \<s\> entry.
  */
 int32 vithist_utt_begin (vithist_t *vh, /**< In: a Viterbi history data structure*/
 			 kbcore_t *kbc  /**< In: a KBcore */
@@ -310,8 +310,8 @@
 
 
 /**
- * Invoked at the end of each utterance; append a final </s> entry that results in the best
- * path score (i.e., LM including LM transition to </s>).
+ * Invoked at the end of each utterance; append a final \</s\> entry that results in the best
+ * path score (i.e., LM including LM transition to \</s\>).
  * Return the ID of the appended entry if successful, -ve if error (empty utterance).
  */
 int32 vithist_utt_end (vithist_t *vh, /**< In: a Viterbi history data structure*/
diff -dur sphinx3-0.8.ORIG/include/wid.h sphinx3-0.8/include/wid.h
--- sphinx3-0.8.ORIG/include/wid.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/wid.h	2009-08-26 12:45:02.710324924 -0600
@@ -95,14 +95,14 @@
 
 /**
  * Augment the given wordprob array with alternative pronunciations from the dictionary.
- * Return value: #entries in the augmented wordprob array (including the original ones).
+ * Return value: \#entries in the augmented wordprob array (including the original ones).
  */
 int32 wid_wordprob2alt (dict_t *dict,	/**< In: Dictionary */
 			wordprob_t *wp,	/**< In/Out: Input wordprob array, to be augmented with
 					   alternative pronunciations for the entries that
 					   already exist in it.  Caller must have allocated
 					   this array. */
-			int32 n	/**< In: #Input entries in the wordprob array */
+			int32 n	/**< In: \#Input entries in the wordprob array */
     );
 
 #if 0
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_flat_fwd_internal.h sphinx3-0.8/src/libs3decoder/libsearch/srch_flat_fwd_internal.h
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_flat_fwd_internal.h	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch_flat_fwd_internal.h	2009-08-26 12:45:02.711326770 -0600
@@ -117,7 +117,7 @@
  * \struct backoff_t
  *
  * Backoff node when backing off all the way to unigrams.  Since each
- * word exits with #ciphones different scores (for so many different
+ * word exits with \#ciphones different scores (for so many different
  * right contexts), a separate node exists for each context.
  */
 typedef struct {
@@ -150,7 +150,7 @@
      * this forward pass can also consider words starting at a number of neighbouring frames
      * within a given window.
      * 
-     * Input lattice file format:  Each line contains a single <word> <startframe> info.  The
+     * Input lattice file format:  Each line contains a single \<word\> \<startframe\> info.  The
      * line may contain other info following these two fields; these are ignored.  Empty lines
      * and lines beginning with a # char in the first column (ie, comment lines) are ignored.
      */
@@ -163,13 +163,13 @@
 				   entire run */
   
     char const *latfile_ext;	/**< Complete word candidate filename for an utterance formed
-                           by word_cand_dir/<uttid>.latfile_ext */
+                           by word_cand_dir/\<uttid\>.latfile_ext */
     int32 word_cand_win;	/**< In frame f, candidate words in input lattice from frames
 				   [(f - word_cand_win) .. (f + word_cand_win)] will be
 				   the actual candidates to be started(entered) */
     word_cand_t **word_cand;	/**< Word candidates for each frame.  (NOTE!! Another array
                                    with a hard limit on its size.) */
-    int32 n_word_cand;	/**< #candidate entries in word_cand for current utterance.
+    int32 n_word_cand;	/**< \#candidate entries in word_cand for current utterance.
                            If <= 0; full search performed for current utterance */
 
 
diff -dur sphinx3-0.8.ORIG/src/programs/main_decode.c sphinx3-0.8/src/programs/main_decode.c
--- sphinx3-0.8.ORIG/src/programs/main_decode.c	2008-12-31 11:27:58.000000000 -0700
+++ sphinx3-0.8/src/programs/main_decode.c	2009-08-26 12:45:02.711326770 -0600
@@ -56,7 +56,7 @@
  * 		Started.
  */
 
-/** \file decode.c
+/** \file main_decode.c
  * \brief main function for application decode
  */
 #include "info.h"
diff -dur sphinx3-0.8.ORIG/src/programs/main_gausubvq.c sphinx3-0.8/src/programs/main_gausubvq.c
--- sphinx3-0.8.ORIG/src/programs/main_gausubvq.c	2008-12-31 11:27:58.000000000 -0700
+++ sphinx3-0.8/src/programs/main_gausubvq.c	2009-08-26 12:45:02.712327401 -0600
@@ -76,7 +76,7 @@
 #include "feat.h"
 #include "cmdln_macro.h"
 
-/** \file gausubvq.c 
+/** \file main_gausubvq.c 
  * \brief Compute the SVQ map 
  */
 
diff -dur sphinx3-0.8.ORIG/src/programs/s3_align.c sphinx3-0.8/src/programs/s3_align.c
--- sphinx3-0.8.ORIG/src/programs/s3_align.c	2008-12-31 11:27:58.000000000 -0700
+++ sphinx3-0.8/src/programs/s3_align.c	2009-08-26 12:45:02.712327401 -0600
@@ -804,15 +804,15 @@
 /**
  * Build a sentence HMM for the given transcription (wordstr).  A two-level DAG is
  * built: phone-level and state-level.
- *   - <s> and </s> always added at the beginning and end of sentence to form an
+ *   - \<s\> and \</s\> always added at the beginning and end of sentence to form an
  *     augmented transcription.
- *   - Optional <sil> and noise words added between words in the augmented
+ *   - Optional \<sil\> and noise words added between words in the augmented
  *     transcription.
  * wordstr must contain only the transcript; no extraneous stuff such as utterance-id.
  * Phone-level HMM structure has replicated nodes to allow for different left and right
  * context CI phones; hence, each pnode corresponds to a unique triphone in the sentence
  * HMM.
- * Return 0 if successful, <0 if any error (eg, OOV word encountered).
+ * Return 0 if successful, \<0 if any error (eg, OOV word encountered).
  */
 int32
 align_build_sent_hmm(char *wordstr, int insert_sil)

sphinx3-link.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sphinx3-link.patch ---
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/Makefile.in sphinx3-0.8/src/libs3decoder/Makefile.in
--- sphinx3-0.8.ORIG/src/libs3decoder/Makefile.in	2008-12-31 21:23:33.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/Makefile.in	2009-09-15 15:47:49.599310099 -0600
@@ -197,7 +197,7 @@
 tidigitsdata = @tidigitsdata@
 SUBDIRS = libam libconfidence libcommon  libdict libep liblm libsearch libAPI libcfg
 lib_LTLIBRARIES = libs3decoder.la
-libs3decoder_la_LDFLAGS = -version-info 0:6:0
+libs3decoder_la_LDFLAGS = -version-info 0:6:0 -lsphinxbase
 libs3decoder_la_SOURCES = 
 libs3decoder_la_LIBADD = \
 	libam/libam.la \

sphinx3-python.patch:
 setup.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sphinx3-python.patch ---
diff -dur sphinx3-0.8.ORIG/python/setup.py sphinx3-0.8/python/setup.py
--- sphinx3-0.8.ORIG/python/setup.py	2008-12-31 21:20:08.000000000 -0700
+++ sphinx3-0.8/python/setup.py	2009-08-26 12:46:43.559003453 -0600
@@ -10,8 +10,8 @@
 module = Extension('_sphinx3',
                    include_dirs = ['../../sphinxbase/include',
                                    '../include',
-                                   '/usr/local/include/sphinxbase/',
-                                   '/usr/local/include/sphinx3',
+                                   '/usr/include/sphinxbase/',
+                                   '/usr/include/sphinx3',
                                    ],
 		   define_macros = define_macros,
 		   library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',

sphinx3-string.patch:
 libAPI/s3_decode.c                |    1 +
 libAPI/utt.c                      |    1 +
 libsearch/kb.c                    |    2 +-
 libsearch/lextree.c               |    1 +
 libsearch/srch.c                  |    1 +
 libsearch/srch_fsg.c              |    1 +
 libsearch/srch_time_switch_tree.c |    1 +
 libsearch/vithist.c               |    1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE sphinx3-string.patch ---
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libAPI/s3_decode.c sphinx3-0.8/src/libs3decoder/libAPI/s3_decode.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libAPI/s3_decode.c	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libAPI/s3_decode.c	2009-08-26 10:57:50.691952472 -0600
@@ -150,6 +150,7 @@
 =============================================================================
 */
 
+#include <string.h>
 #include <time.h>
 #include <feat.h>
 #include "s3_decode.h"
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libAPI/utt.c sphinx3-0.8/src/libs3decoder/libAPI/utt.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libAPI/utt.c	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libAPI/utt.c	2009-08-26 10:58:10.739950084 -0600
@@ -101,6 +101,7 @@
 #include <direct.h>             /* RAH, added */
 #endif
 
+#include <string.h>
 #include "kb.h"
 #include "utt.h"
 #include "srch.h"
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/kb.c sphinx3-0.8/src/libs3decoder/libsearch/kb.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/kb.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/kb.c	2009-08-26 10:54:38.093005711 -0600
@@ -152,7 +152,7 @@
 #include "kb.h"
 #include "srch.h"
 #include "mllr.h"
-
+#include <string.h>
 
 #define REPORT_KB 1
 
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/lextree.c sphinx3-0.8/src/libs3decoder/libsearch/lextree.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/lextree.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/lextree.c	2009-08-26 10:55:12.853091485 -0600
@@ -136,6 +136,7 @@
 
 #include "lextree.h"
 #include "wid.h"
+#include <string.h>
 
 /*
  * Lextree nodes, and the HMMs contained within, are cleared upon creation, and whenever
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch.c sphinx3-0.8/src/libs3decoder/libsearch/srch.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch.c	2009-08-26 10:55:48.605155067 -0600
@@ -217,6 +217,7 @@
 #include "pio.h"
 #include "srch.h"
 #include "corpus.h"
+#include <string.h>
 
 #define COMPUTE_HEURISTIC 1
 #define SHOW_SENONE_SCORE_FOR_FRAME 0
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_fsg.c sphinx3-0.8/src/libs3decoder/libsearch/srch_fsg.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_fsg.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch_fsg.c	2009-08-26 10:56:04.988016715 -0600
@@ -81,6 +81,7 @@
 #include "kbcore.h"
 #include "word_fsg.h"
 #include "fsg_search.h"
+#include <string.h>
 
 static word_fsg_t *srch_FSG_read_fsgfile(void *srch, const char *fsgfilename);
 
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_time_switch_tree.c sphinx3-0.8/src/libs3decoder/libsearch/srch_time_switch_tree.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_time_switch_tree.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch_time_switch_tree.c	2009-08-26 10:56:28.845010375 -0600
@@ -152,6 +152,7 @@
 #include "lextree.h"
 #include "lm.h"
 #include "vithist.h"
+#include <string.h>
 
 /** 
     \file srch_time_switch_tree.h 
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/vithist.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c	2009-08-26 10:57:04.115947097 -0600
@@ -127,6 +127,7 @@
 #include <listelem_alloc.h>
 #include <pio.h>
 #include <heap.h>
+#include <string.h>
 
 #include "vithist.h"
 #include "lextree.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmusphinx3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:46:00 -0000	1.1
+++ .cvsignore	26 Sep 2009 16:12:36 -0000	1.2
@@ -0,0 +1 @@
+sphinx3-0.8.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmusphinx3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:46:00 -0000	1.1
+++ sources	26 Sep 2009 16:12:37 -0000	1.2
@@ -0,0 +1 @@
+cbbcbb86d8aac41085ddeaa953a06298  sphinx3-0.8.zip



From jjames at fedoraproject.org  Sat Sep 26 16:14:15 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sat, 26 Sep 2009 16:14:15 +0000 (UTC)
Subject: rpms/cmusphinx3/F-11 cmusphinx3.spec, NONE,
	1.1 sphinx3-doxygen.patch, 
	NONE, 1.1 sphinx3-link.patch, NONE, 1.1 sphinx3-python.patch,
	NONE, 1.1 sphinx3-string.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090926161415.13A3B11C00E6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cmusphinx3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31325/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	cmusphinx3.spec sphinx3-doxygen.patch sphinx3-link.patch 
	sphinx3-python.patch sphinx3-string.patch 
Log Message:
Initial import into F-11.



--- NEW FILE cmusphinx3.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           cmusphinx3
Version:        0.8
Release:        3%{?dist}
Summary:        Large vocabulary speech recognition in C

Group:          Applications/Multimedia
License:        BSD
URL:            http://www.cmusphinx.org/
Source0:        http://downloads.sourceforge.net/cmusphinx/sphinx3/%{version}/sphinx3-%{version}.zip
# This patch was sent upstream on 2009 Aug 26, and has been applied.  It fixes
# several cases of missing prototypes for functions declared in string.h
# (strcpy, memset, etc.)
Patch0:         sphinx3-string.patch
# This patch was sent upstream on 2009 Aug 26, and has been applied.  It fixes
# a number of broken links and unescaped special characters in the doxygen
# source.
Patch1:         sphinx3-doxygen.patch
# This patch has not been sent upstream, because it is specific to a Fedora
# build environment.  It fixes a Python include path.
Patch2:         sphinx3-python.patch
# This patch has not been sent upstream, because it is specific to the way we
# build shared libraries in Fedora.  It adds a link necessary to avoid
# undefined weak symbols in one library.
Patch3:         sphinx3-link.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  alsa-lib-devel, doxygen, pkgconfig
BuildRequires:  python-devel, sphinxbase-devel

%description
Sphinx-3 is CMU's state-of-the-art large vocabulary speech recognition system.
It uses Hidden Markov Models (HMM) with continuous output probability density
functions (PDF).  It supports several modes of operation.  The more accurate
mode, known as the "flat decoder", is descended from the original Sphinx-3
release.  The faster mode, known as the "tree decoder", was developed
separately.  The two decoders were merged in Sphinx 3.5, though the flat
decoder was not fully functional until Sphinx 3.7.

%package devel
Summary:        Header files for developing with cmusphinx3
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
Requires:       sphinxbase-devel

%description devel
Header files for developing with cmusphinx3.

%package libs
Summary:        Shared libraries for cmusphinx3 executables
Group:          Applications/Multimedia

%description libs
Shared libraries for cmusphinx3 executables.

%package python
Summary:        Python interface to cmusphinx3
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, sphinxbase-python

%description python
Python interface to cmusphinx3.

%package doc
Summary:        Doxygen documentation for cmusphinx3
Group:          Documentation
Requires:       %{name}-libs = %{version}-%{release}

%description doc
Doxygen documentation for cmusphinx3.

%prep
%setup -q -n sphinx3-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Remove executable bits from the documentation
find doc -type f | xargs chmod a-x

# Dispose of version control files in the documentation
rm -fr doc/images/.svn doc/s3/.svn doc/s3-2_files/.svn

# Convert the encoding of one file
cd doc/s3-2_files
iconv -f WINDOWS-1252 -t UTF-8 master03_stylesheet.css > x.css
touch -r master03_stylesheet.css x.css
mv -f x.css master03_stylesheet.css

%build
%configure --disable-dependency-tracking --disable-static

# Get rid of undesirable hardcoded runpaths
sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
    libtool

# Build the C code and its documentation
make %{?_smp_mflags}
make doxygen

# Build the Python interface
cd python
python setup.py build

%install
rm -rf $RPM_BUILD_ROOT

# Install the libraries, programs, and scripts
make install DESTDIR=$RPM_BUILD_ROOT

# Install the Python egg
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
cd python
python setup.py install --skip-build --root $RPM_BUILD_ROOT

# Get rid of files we don't want packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -fr $RPM_BUILD_ROOT%{_datadir}/sphinx3/doc
rm -f doc/images/Makefile doc/s3/*.fig

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/sphinx3

%files devel
%defattr(-,root,root,-)
%{_includedir}/sphinx3
%{_libdir}/libs3decoder.so
%{_libdir}/pkgconfig/sphinx3.pc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libs3decoder.so.*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/Sphinx3*.egg-info
%{python_sitearch}/_sphinx3.so

%files doc
%defattr(-,root,root,-)
%doc doc/images doc/s3 doc/s3-2_files doc/*.doc doc/*.htm* doc/*.pdf doc/*.ppt
%doc doc/*.txt doc/sphinx3.4.code.tracing doc/sphinx3.5_refactoring.note html

%changelog
* Fri Sep 18 2009 Jerry James <loganjerry at gmail.com> - 0.8-3
- Drop unnecessary BRs
- Preserve timestamp on iconv'd file

* Tue Sep 15 2009 Jerry James <loganjerry at gmail.com> - 0.8-2
- Fix issues raised in review

* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 0.8-1
- Initial RPM

sphinx3-doxygen.patch:
 include/ascr.h                                      |   10 ++--
 include/confidence.h                                |    2 
 include/cont_mgau.h                                 |   23 +++++----
 include/corpus.h                                    |    2 
 include/ctxt_table.h                                |    2 
 include/dag.h                                       |    8 +--
 include/dict.h                                      |    4 -
 include/dict2pid.h                                  |    4 -
 include/fast_algo_struct.h                          |    2 
 include/fillpen.h                                   |    8 +--
 include/gmm_wrap.h                                  |   10 ++--
 include/interp.h                                    |    2 
 include/lextree.h                                   |    2 
 include/lm.h                                        |   48 ++++++++++----------
 include/lmclass.h                                   |   12 ++---
 include/mdef.h                                      |   12 ++---
 include/ms_gauden.h                                 |   10 ++--
 include/ms_mllr.h                                   |    8 +--
 include/ms_senone.h                                 |   10 ++--
 include/s3_cfg.h                                    |    4 -
 include/s3_decode.h                                 |   43 +++++++++--------
 include/srch_output.h                               |    2 
 include/srch_word_switch_tree.h                     |    2 
 include/subvq.h                                     |   18 +++----
 include/tmat.h                                      |    6 +-
 include/vector.h                                    |   22 ++++-----
 include/vithist.h                                   |   10 ++--
 include/wid.h                                       |    4 -
 src/libs3decoder/libsearch/srch_flat_fwd_internal.h |    8 +--
 src/programs/main_decode.c                          |    2 
 src/programs/main_gausubvq.c                        |    2 
 src/programs/s3_align.c                             |    6 +-
 32 files changed, 155 insertions(+), 153 deletions(-)

--- NEW FILE sphinx3-doxygen.patch ---
diff -dur sphinx3-0.8.ORIG/include/ascr.h sphinx3-0.8/include/ascr.h
--- sphinx3-0.8.ORIG/include/ascr.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ascr.h	2009-08-26 12:45:02.689957552 -0600
@@ -121,12 +121,12 @@
  * @return Pointer to created structure if successful, NULL otherwise.
  */
 S3DECODER_EXPORT
-ascr_t *ascr_init (int32 n_sen,		/**< Input: #Ordinary senones */
-		   int32 n_comsen,	/**< Input: #Composite senones */
-		   int32 n_sseq,        /**< Input: # of senone sequences */ 
-		   int32 n_comsseq,     /**< Input: # of composite senone sequences */ 
+ascr_t *ascr_init (int32 n_sen,		/**< Input: \#Ordinary senones */
+		   int32 n_comsen,	/**< Input: \#Composite senones */
+		   int32 n_sseq,        /**< Input: \# of senone sequences */ 
+		   int32 n_comsseq,     /**< Input: \# of composite senone sequences */ 
 		   int32 pl_win,        /**< Input: size of phoneme lookahead windows */
-		   int32 n_cisen        /**< Input: # of CI senones */
+		   int32 n_cisen        /**< Input: \# of CI senones */
     );
 
 /**
diff -dur sphinx3-0.8.ORIG/include/confidence.h sphinx3-0.8/include/confidence.h
--- sphinx3-0.8.ORIG/include/confidence.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/confidence.h	2009-08-26 12:45:02.689957552 -0600
@@ -85,7 +85,7 @@
 #endif
 
 /**
-   \struct structure specific for node of DAG for confidence
+   structure specific for node of DAG for confidence
    annotation.
    
 */
diff -dur sphinx3-0.8.ORIG/include/cont_mgau.h sphinx3-0.8/include/cont_mgau.h
--- sphinx3-0.8.ORIG/include/cont_mgau.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/cont_mgau.h	2009-08-26 12:45:20.192010034 -0600
@@ -169,7 +169,7 @@
  * \brief A single mixture-Gaussian model for one senone (see above comment).
  */
 typedef struct {
-    int32 n_comp;	/**< #Component Gaussians in this mixture.  NOTE: May be 0 (for the
+    int32 n_comp;	/**< \#Component Gaussians in this mixture.  NOTE: May be 0 (for the
 			   untrained states). */
 
     int32 bstidx;         /**< Index for the most likely Gaussians in this mixture of component. It persists through time. */ 
@@ -205,7 +205,7 @@
  * \brief The set of mixture-Gaussians in an acoustic model used in Sphinx 3.X family of tool
  */
 typedef struct {
-    int32 n_mgau;	/**< #Mixture Gaussians in this model (i.e., #senones) */
+    int32 n_mgau;	/**< \#Mixture Gaussians in this model (i.e., \#senones) */
     int32 max_comp;	/**< Max components in any mixture */
     int32 veclen;	/**< Vector length of the Gaussian density means (and diagonal vars) */
     mgau_t *mgau;	/**< The n_mgau mixture Gaussians */
@@ -215,10 +215,10 @@
     int32 verbose;    /**< Whether to display information */
 
     /* Used only in the flat lexicon decoder, statistics */
-    int32 frm_sen_eval;		/**< #Senones evaluated in the most recent frame */
-    int32 frm_gau_eval;		/**< #Gaussian densities evaluated in the most recent frame */
-    int32 frm_ci_sen_eval;        /**< #CI Senones evaluated in most recent frame*/
-    int32 frm_ci_gau_eval;        /**< #CI Senones evaluated in most recent frame*/
+    int32 frm_sen_eval;		/**< \#Senones evaluated in the most recent frame */
+    int32 frm_gau_eval;		/**< \#Gaussian densities evaluated in the most recent frame */
+    int32 frm_ci_sen_eval;        /**< \#CI Senones evaluated in most recent frame*/
+    int32 frm_ci_gau_eval;        /**< \#CI Senones evaluated in most recent frame*/
 
     int32 gau_type; /**< gau_type=CONTHMM if it is fully continous HMM, 
                        gau_type=SEMIHMM if it is semi continous HMM. Currently SEMIHMM is not supported. */
@@ -248,9 +248,9 @@
     Number of senones evaluated in this frame
     \def mgau_frm_gau_eval
     Number of gaussians evaluated in this frame
-    \def mgau_frm_ci_sen_eval
+    \def mgau_frm_cisen_eval
     Number of CI senones evaluated in this frame
-    \def mgau_frm_ci_gau_eval
+    \def mgau_frm_cigau_eval
     Number of CI gaussians evaluated in this frame
 
 */
@@ -326,15 +326,16 @@
     );		
 
 /**
- * Like mgau_eval, but return the scores of the individual components, instead of combining
+ * Like mgau_eval(), but return the scores of the individual components, instead of combining
  * them into a senone score.  
  * @return: Best component score.
  */
 S3DECODER_EXPORT
 int32 mgau_comp_eval (mgau_model_t *g,	/**< In: Set of mixture Gaussians */
-		      int32 m,		/**< In: Mixture being considered */
+		      int32 s,		/**< In: Mixture being considered */
 		      float32 *x,	/**< In: Input vector being compared to the components */
-		      int32 *score);	/**< Out: Array of scores for each component */
+		      int32 *score	/**< Out: Array of scores for each component */
+    );
 
 /**
  * A routine that dump all mean and variance parameters of a set of gaussian distribution.   
diff -dur sphinx3-0.8.ORIG/include/corpus.h sphinx3-0.8/include/corpus.h
--- sphinx3-0.8.ORIG/include/corpus.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/corpus.h	2009-08-26 12:45:02.691987630 -0600
@@ -168,7 +168,7 @@
  */
 typedef struct {
     hash_table_t *ht;	/**< Hash table for IDs; CASE-SENSITIVE */
-    int32 n;		/**< #IDs (and corresponding argument strings) in the corpus */
+    int32 n;		/**< \#IDs (and corresponding argument strings) in the corpus */
     char **str;		/**< The argument strings */
 } corpus_t;
 
diff -dur sphinx3-0.8.ORIG/include/ctxt_table.h sphinx3-0.8/include/ctxt_table.h
--- sphinx3-0.8.ORIG/include/ctxt_table.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ctxt_table.h	2009-08-26 12:45:02.692970928 -0600
@@ -111,7 +111,7 @@
 typedef struct {
     s3ssid_t  *ssid;	/**< Senone Sequence ID list for all context ciphones */
     s3cipid_t *cimap;	/**< Index into ssid[] above for each ci phone */
-    int32     n_ssid;	/**< #Unique ssid in above, compressed ssid list */
+    int32     n_ssid;	/**< \#Unique ssid in above, compressed ssid list */
 } xwdssid_t;
 
 
diff -dur sphinx3-0.8.ORIG/include/dag.h sphinx3-0.8/include/dag.h
--- sphinx3-0.8.ORIG/include/dag.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/dag.h	2009-08-26 12:45:02.693953379 -0600
@@ -203,10 +203,10 @@
 */
 typedef struct {
     dagnode_t *list;		/**< Linear list of nodes allocated */
-    dagnode_t *root;            /**< Corresponding to the node of (<s>,0)  */
-    dagnode_t *end;             /**< Final node (</s>,nfrm) */
+    dagnode_t *root;            /**< Corresponding to the node of (\<s\>,0)  */
+    dagnode_t *end;             /**< Final node (\</s\>,nfrm) */
 
-    daglink_t entry;		/**< Entering (<s>,0) */
+    daglink_t entry;		/**< Entering (\<s\>,0) */
     daglink_t final;            /**< Exit link from final DAG node */
 
     s3wid_t orig_exitwid;	/**< If original exit node is not a filler word */
@@ -220,7 +220,7 @@
                                    parts of the dag code will exceed the maximum no of edge 
                                 */
 
-    int32 lmop;		        /**< (Temporary Variable): #LM ops actually made */
+    int32 lmop;		        /**< (Temporary Variable): \#LM ops actually made */
     int32 maxlmop;		/**< Max LM ops allowed before utterance aborted 
 				 */
 
diff -dur sphinx3-0.8.ORIG/include/dict2pid.h sphinx3-0.8/include/dict2pid.h
--- sphinx3-0.8.ORIG/include/dict2pid.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/dict2pid.h	2009-08-26 12:45:02.694986001 -0600
@@ -221,8 +221,8 @@
 				   composite phone (composite sseq). */
     int32 *comwt;		/**< Weight associated with each composite state (logs3 value).
 				   Final composite state score weighted by this amount */
-    int32 n_comstate;		/**< #Composite states */
-    int32 n_comsseq;		/**< #Composite senone sequences */
+    int32 n_comstate;		/**< \#Composite states */
+    int32 n_comsseq;		/**< \#Composite senone sequences */
     int32 n_ci;   /**< Number of CI phone in */
     int32 n_dictsize; /**< Dictionary size */
 
diff -dur sphinx3-0.8.ORIG/include/dict.h sphinx3-0.8/include/dict.h
--- sphinx3-0.8.ORIG/include/dict.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/dict.h	2009-08-26 12:45:02.694986001 -0600
@@ -150,8 +150,8 @@
     int32 n_ciphone;	/**< Used only if CI phones handled internally (mdef == NULL) */
     dictword_t *word;	/**< Array of entries in dictionary */
     hash_table_t *ht;	/**< Hash table for mapping word strings to word ids */
-    int32 max_words;	/**< #Entries allocated in dict, including empty slots */
-    int32 n_word;	/**< #Occupied entries in dict; ie, excluding empty slots */
+    int32 max_words;	/**< \#Entries allocated in dict, including empty slots */
+    int32 n_word;	/**< \#Occupied entries in dict; ie, excluding empty slots */
     int32 filler_start;	/**< First filler word id (read from filler dict) */
     int32 filler_end;	/**< Last filler word id (read from filler dict) */
     s3wid_t *comp_head;	/**< comp_head[w] = wid of a compound word with 1st component = w;
diff -dur sphinx3-0.8.ORIG/include/fast_algo_struct.h sphinx3-0.8/include/fast_algo_struct.h
--- sphinx3-0.8.ORIG/include/fast_algo_struct.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/fast_algo_struct.h	2009-08-26 12:45:02.696274894 -0600
@@ -193,7 +193,7 @@
     int32 maxhmmpf;        /**< Max active HMMs per frame*/
     int32 hmm_hist_binsize;/**< Hmm histogram bin size */
     int32 hmm_hist_bins;   /**< Number of histogram bins*/
-    int32 *hmm_hist;	   /**< Histogram: #frames in which a given no. of HMMs are active */
+    int32 *hmm_hist;	   /**< Histogram: \#frames in which a given no. of HMMs are active */
     
 } histprune_t;
 
diff -dur sphinx3-0.8.ORIG/include/fillpen.h sphinx3-0.8/include/fillpen.h
--- sphinx3-0.8.ORIG/include/fillpen.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/fillpen.h	2009-08-26 12:45:02.697279436 -0600
@@ -115,10 +115,10 @@
  * Initialize filler probabilities (penalties, whatever) module and return a pointer to the
  * structure created.  Filler word probabilities are simple unigram probabilities.  Here is an
  * example of such a file (one entry per line; a word and a probability):
- *   <sil>  0.10792
- *   <uh>   0.00866
- *   <um>   0.00147
- * If the first character in a line is a '#', the line is treated as a comment and ignored.
+ *   \<sil\>  0.10792
+ *   \<uh\>   0.00866
+ *   \<um\>   0.00147
+ * If the first character in a line is a '\#', the line is treated as a comment and ignored.
  * If no filler probabilities file is provided, the silence word gets silprob, and all other
  * filler words get fillprob.  As with the trigram LM, the resulting log-probabilities are
  * multiplied by a language weight and finally a word insertion penalty is tacked on.
diff -dur sphinx3-0.8.ORIG/include/gmm_wrap.h sphinx3-0.8/include/gmm_wrap.h
--- sphinx3-0.8.ORIG/include/gmm_wrap.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/gmm_wrap.h	2009-08-26 12:45:02.697279436 -0600
@@ -108,7 +108,7 @@
 */
 int32 approx_cd_gmm_compute_sen(
     void *srch, /**< a pointer to a srch_t */
-    float32 **feat, /**< feature vector #stream x #coeff*/
+    float32 **feat, /**< feature vector \#stream x \#coeff*/
     int32 wav_idx  /**< frame index */
     );
 
@@ -120,7 +120,7 @@
 
 int32 ms_cd_gmm_compute_sen_comp(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
     );
 
@@ -131,7 +131,7 @@
 
 int32 ms_cd_gmm_compute_sen(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
     );
 
@@ -146,7 +146,7 @@
 
 int32 s3_cd_gmm_compute_sen_comp(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
 
     );
@@ -163,7 +163,7 @@
 
 int32 s3_cd_gmm_compute_sen(
     void *srch,   /**< a pointer to a srch_t */
-    float32 **feat,  /**< feature vector #stream x #coeff*/
+    float32 **feat,  /**< feature vector \#stream x \#coeff*/
     int32 wav_idx    /**< frame index */
     );
 
diff -dur sphinx3-0.8.ORIG/include/interp.h sphinx3-0.8/include/interp.h
--- sphinx3-0.8.ORIG/include/interp.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/interp.h	2009-08-26 12:45:02.698235093 -0600
@@ -101,7 +101,7 @@
  */
 typedef struct {
     logmath_t *logmath;
-    int32 n_sen;	/**< #senones */
+    int32 n_sen;	/**< \#senones */
 
     /**
      * \struct interp_wt_s
diff -dur sphinx3-0.8.ORIG/include/lextree.h sphinx3-0.8/include/lextree.h
--- sphinx3-0.8.ORIG/include/lextree.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/lextree.h	2009-08-26 12:45:02.699266386 -0600
@@ -152,7 +152,7 @@
  * A lextree can be built for a specific history (e.g., for all bigram successors of a given
  * word or trigram successors of a word-pair in a given LM).  The history provides a set of left
  * context CIphones (if the final history word has multiple pronunciations; and there is always
- * <sil>).
+ * \<sil\>).
  * A lextree is usually a set of trees, one for each distinct root model for the given set of
  * words.  Furthermore, the root node of each tree can itself actually be a SET of nodes,
  * required by the different left contexts.  If there is no history (i.e., the unigram lextree),
diff -dur sphinx3-0.8.ORIG/include/lmclass.h sphinx3-0.8/include/lmclass.h
--- sphinx3-0.8.ORIG/include/lmclass.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/lmclass.h	2009-08-26 12:45:02.699949946 -0600
@@ -133,14 +133,14 @@
  * updated set.  Note that the input file can contain several class definitions.
  * File format:
  * 
- *    LMCLASS <classname1>
- * 	<word1> [<prob1>]
- * 	<word2> [<prob2>]
+ *    LMCLASS \<classname1\>
+ * 	\<word1\> [\<prob1\>]
+ * 	\<word2\> [\<prob2\>]
  * 	... (each word, and its associated probability, in one line)
- *    END <classname1>
- *    LMCLASS <classname2>
+ *    END \<classname1\>
+ *    LMCLASS \<classname2\>
  *      ...
- *    END <classname2>
+ *    END \<classname2\>
  *    ... (as many classes as desired)
  * 
  * By convention, classname strings begin and end with [ and ] (Roni Rosenfeld).
diff -dur sphinx3-0.8.ORIG/include/lm.h sphinx3-0.8/include/lm.h
--- sphinx3-0.8.ORIG/include/lm.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/lm.h	2009-08-26 12:45:02.701195066 -0600
@@ -448,7 +448,7 @@
 typedef struct tginfo_s {
     s3lmwid_t w1;		/**< w1 component of bigram w1,w2.  All bigrams with
 				   same w2 linked together. */
-    int32 n_tg;			/**< #tg for parent bigram w1,w2 */
+    int32 n_tg;			/**< \#tg for parent bigram w1,w2 */
     tg_t *tg;			/**< Trigrams for w1,w2 */
     int32 bowt;			/**< tg bowt for w1,w2 */
     int32 used;			/**< whether used since last lm_reset */
@@ -463,7 +463,7 @@
 typedef struct tginfo32_s {
     s3lmwid32_t w1;		/**< w1 component of bigram w1,w2.  All bigrams with
 				   same w2 linked together. */
-    int32 n_tg;			/**< #tg for parent bigram w1,w2 */
+    int32 n_tg;			/**< \#tg for parent bigram w1,w2 */
     tg32_t *tg32;			/**< Trigrams for w1,w2 */
     int32 bowt;			/**< tg bowt for w1,w2 */
     int32 used;			/**< whether used since last lm_reset */
@@ -558,9 +558,9 @@
  */
 typedef struct lm_s {
     char *name ;        /**< The name of the LM */
-    int32 n_ug;         /**< #unigrams in LM */
-    int32 n_bg;         /**< #bigrams in entire LM */
-    int32 n_tg;         /**< #trigrams in entire LM */
+    int32 n_ug;         /**< \#unigrams in LM */
+    int32 n_bg;         /**< \#bigrams in entire LM */
+    int32 n_tg;         /**< \#trigrams in entire LM */
     int32 max_ug;       /**< To which n_ug can grow with dynamic addition of words */
 
     int32 n_ng;           /**< if unigram, n_ng=1, if bigram n_bg=2 and so one */
@@ -625,15 +625,15 @@
     
     
     /* Statistics */
-    int32 n_bg_fill;    /**< #bg fill operations */
-    int32 n_bg_inmem;   /**< #bg in memory */
-    int32 n_bg_score;   /**< #bg_score operations */
-    int32 n_bg_bo;	/**< #bg_score ops backed off to ug */
+    int32 n_bg_fill;    /**< \#bg fill operations */
+    int32 n_bg_inmem;   /**< \#bg in memory */
+    int32 n_bg_score;   /**< \#bg_score operations */
+    int32 n_bg_bo;	/**< \#bg_score ops backed off to ug */
     int32 n_tg_fill;	/**< Similar stats for trigrams */
-    int32 n_tg_inmem;   /**< #tg in memory */
-    int32 n_tg_score;   /**< #tg_score operations */
-    int32 n_tg_bo;      /**< #tg_score ops backed off to bg */
-    int32 n_tgcache_hit;  /**< # of trigram cache hit ops backed off to bg */
+    int32 n_tg_inmem;   /**< \#tg in memory */
+    int32 n_tg_score;   /**< \#tg_score operations */
+    int32 n_tg_bo;      /**< \#tg_score ops backed off to bg */
+    int32 n_tgcache_hit;  /**< \# of trigram cache hit ops backed off to bg */
     
     int32 access_type;	/**< Updated on every lm_{tg,bg,ug}_score call to reflect the kind of
                            n-gram accessed: 3 for 3-gram, 2 for 2-gram and 1 for 1-gram */
@@ -649,7 +649,7 @@
   
     /* Data structure that maintains the class information */
     lmclass_t **lmclass;   /**< LM class for this LM */
-    int32 n_lmclass;      /**< # LM class */
+    int32 n_lmclass;      /**< \# LM class */
     int32 *inclass_ugscore; /**< An array of inter-class unigram probability */
 
 
@@ -876,7 +876,7 @@
 
 /**
  * Return trigram followers for given two words.  Both w1 and w2 must be valid.
- * Return value: #trigrams in returned list.
+ * Return value: \#trigrams in returned list.
  */
 int32 lm_tglist (lm_t *lmp,	/**< In: LM being queried */
 		 s3lmwid32_t w1,	/**< In: LM word id of the first of a 2-word history */
@@ -894,7 +894,7 @@
 
 /**
  * Return the bigram followers for the given word w.
- * Return value: #bigrams in returned list.
+ * Return value: \#bigrams in returned list.
  */
 int32 lm_bglist (lm_t *lmp,	/**< In: LM being queried */
 		 s3lmwid32_t w,	/**< In: LM word id of the 1-word history */
@@ -915,7 +915,7 @@
  * of simply returning the bglist.  The wordprob array contains dictionary word IDs.  But note
  * that only the base IDs are entered; the caller is responsible for filling out the alternative
  * pronunciations.
- * Return value:  #entries filled in the wordprob array.
+ * Return value:  \#entries filled in the wordprob array.
  */
 int32 lm_bg_wordprob(lm_t *lm,		/**< In: LM being queried */
 		     s3lmwid32_t w,	/**< In: LM word ID of the 1-word history */
@@ -938,7 +938,7 @@
 
 /**
  * Like lm_bg_wordprob, but for unigrams.
- * Return value:  #entries filled in the wordprob array.
+ * Return value:  \#entries filled in the wordprob array.
  */
 int32 lm_ug_wordprob(lm_t *lm, /**< In: LM being queried */
 		     dict_t *dict, /**< In : The dictionary */
@@ -946,7 +946,7 @@
 		     wordprob_t *wp /**< In/out: Array to be filled */
     );
 
-/** Return the unigrams in LM.  Return value: #unigrams in returned list. */
+/** Return the unigrams in LM.  Return value: \#unigrams in returned list. */
 int32 lm_uglist (lm_t *lmp,	/**< In: LM being queried */
 		 ug_t **ug	/**< Out: *ug = unigram array */
     );
@@ -1157,7 +1157,7 @@
    x: not supported yet
    y: supported
 
-   i\o 0 1 2
+   i\\o 0 1 2
    0 - n n
    1 n - y
    2 n x -
@@ -1190,10 +1190,10 @@
    Add word list to the LM 
    For each word in the file, call lm_add_wordlist. 
    The file is assume to have a format like this:
-   <word1> 
-   <word2>
-   <word3>
-   <word4>
+   \<word1\> 
+   \<word2\>
+   \<word3\>
+   \<word4\>
      
    If the lmwid2dictid mapping is not updated, or the dictionary
    itself is not used in the context.  Just specify dict=NULL;
diff -dur sphinx3-0.8.ORIG/include/mdef.h sphinx3-0.8/include/mdef.h
--- sphinx3-0.8.ORIG/include/mdef.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/mdef.h	2009-08-26 12:45:02.702266353 -0600
@@ -182,12 +182,12 @@
    \brief strcture for storing the model definition. 
 */
 typedef struct {
-    int32 n_ciphone;		/**< #basephones actually present */
-    int32 n_phone;		/**< #basephones + #triphones actually present */
-    int32 n_emit_state;		/**< #emitting states per phone */
-    int32 n_ci_sen;		/**< #CI senones; these are the first */
-    int32 n_sen;		/**< #senones (CI+CD) */
-    int32 n_tmat;		/**< #transition matrices */
+    int32 n_ciphone;		/**< \#basephones actually present */
+    int32 n_phone;		/**< \#basephones + \#triphones actually present */
+    int32 n_emit_state;		/**< \#emitting states per phone */
+    int32 n_ci_sen;		/**< \#CI senones; these are the first */
+    int32 n_sen;		/**< \#senones (CI+CD) */
+    int32 n_tmat;		/**< \#transition matrices */
     
     hash_table_t *ciphone_ht;	/**< Hash table for mapping ciphone strings to ids */
     ciphone_t *ciphone;		/**< CI-phone information for all ciphones */
diff -dur sphinx3-0.8.ORIG/include/ms_gauden.h sphinx3-0.8/include/ms_gauden.h
--- sphinx3-0.8.ORIG/include/ms_gauden.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ms_gauden.h	2009-08-26 12:45:02.702266353 -0600
@@ -139,9 +139,9 @@
     vector_t ***var;	/**< like mean; diagonal covariance vector only */
     float32 ***det;	/**< log(determinant) for each variance vector;
 			   actually, log(sqrt(2*pi*det)) */
-    int32 n_mgau;	/**< #codebooks */
-    int32 n_feat;	/**< #feature streams in each codebook */
-    int32 n_density;	/**< #gaussian densities in each codebook-feature stream */
+    int32 n_mgau;	/**< \#codebooks */
+    int32 n_feat;	/**< \#feature streams in each codebook */
+    int32 n_density;	/**< \#gaussian densities in each codebook-feature stream */
     int32 *featlen;	/**< feature length for each feature */
 } gauden_t;
 
@@ -193,7 +193,7 @@
 gauden_dist (gauden_t *g,	/**< In: handle to entire ensemble of codebooks */
 	     s3mgauid_t mgau,	/**< In: codebook for which density values to be evaluated
 				   (g->{mean,var}[mgau]) */
-	     int32 n_top,	/**< In: #top densities to be evaluated */
+	     int32 n_top,	/**< In: \#top densities to be evaluated */
 	     vector_t *obs,	/**< In: Observation vector; obs[f] = for feature f */
 	     gauden_dist_t **out_dist
 	     /**< Out: n_top best codewords and density values,
@@ -213,7 +213,7 @@
  */
 int32
 gauden_dist_norm (gauden_t *g,		/**< In: handle to all collection of codebooks */
-		  int32 n_top,		/**< In: #density values computed per feature */
+		  int32 n_top,		/**< In: \#density values computed per feature */
 		  gauden_dist_t ***dist,/**< In/Out: n_top density indices and values for
 					   each feature.  On return, density values are
 					   normalized. */
diff -dur sphinx3-0.8.ORIG/include/ms_mllr.h sphinx3-0.8/include/ms_mllr.h
--- sphinx3-0.8.ORIG/include/ms_mllr.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ms_mllr.h	2009-08-26 12:45:02.703328150 -0600
@@ -97,7 +97,7 @@
 			   float32 *****A,		/**< Out: [*A][stream][nclass][streamlen][streamlen] */
 			   float32 ****B,		/**< Out: [*B][stream][nclass][streamlen] */
 			   int32 *streamlen,	/**< In: Dimension of each feature stream */
-			   int32 n_stream,	/**< In: #Feature streams */
+			   int32 n_stream,	/**< In: \#Feature streams */
 			   int32 *nclass	/**< Out: number of classes */
     );
 
@@ -107,7 +107,7 @@
  */
 int32 ms_mllr_free_regmat (float32 ****A,	/**< In: A[stream][nclass][streamlen][streamlen] */
 			   float32 ***B,	/**< In: B[stream][nclass][streamlen] */
-			   int32 n_stream	/**< In: #Feature streams */
+			   int32 n_stream	/**< In: \#Feature streams */
     );
 
 /**
@@ -116,11 +116,11 @@
  */
 int32 ms_mllr_norm_mgau (float32 ***mean,	/**<< In/Out: Set of vectors to be transformed:
 						   mean[stream][density] */
-			 int32 n_density,	/**< In: #densities in above mean matrix */
+			 int32 n_density,	/**< In: \#densities in above mean matrix */
 			 float32 ****A,	/**< In: "matrix" portion of regression matrix */
 			 float32 ***B,	/**< In: "vector" portion of regression matrix */
 			 int32 *streamlen,	/**< In: Dimension of each feature stream */
-			 int32 n_stream,	/**< In: #Feature streams */
+			 int32 n_stream,	/**< In: \#Feature streams */
 			 int32 _class	/**< In: number of classes */
     );
 
diff -dur sphinx3-0.8.ORIG/include/ms_senone.h sphinx3-0.8/include/ms_senone.h
--- sphinx3-0.8.ORIG/include/ms_senone.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/ms_senone.h	2009-08-26 12:45:02.704256679 -0600
@@ -147,10 +147,10 @@
                                    evaluating the many codebooks will be more costly.
                                    if (n_gauden == 1): pdf[feat][codeword][sen].  Optimized
                                    for the shared-distribution semi-continuous case. */
-    int32 n_sen;		/**< #senones in this set */
-    int32 n_feat;		/**< #feature streams */ 
-    int32 n_cw;			/**< #codewords per codebook,stream */
-    int32 n_gauden;		/**< #gaussian density codebooks referred to by senones */
+    int32 n_sen;		/**< \#senones in this set */
+    int32 n_feat;		/**< \#feature streams */ 
+    int32 n_cw;			/**< \#codewords per codebook,stream */
+    int32 n_gauden;		/**< \#gaussian density codebooks referred to by senones */
     float32 mixwfloor;		/**< floor applied to each PDF entry */
     int32 shift;		/**< LSB bits truncated from original logs3 value */
     s3mgauid_t *mgau;		/**< senone-id -> mgau-id mapping for senones in this set */
@@ -189,7 +189,7 @@
 
 /**
  * Like senone_eval, but compute all senone scores for the shared density case (ie,
- * #codebooks = 1).
+ * \#codebooks = 1).
  */
 void senone_eval_all (senone_t *s,		/**< In: Senone structure */
 		      gauden_dist_t **dist,	/**< In: as in senone_eval above */
diff -dur sphinx3-0.8.ORIG/include/s3_cfg.h sphinx3-0.8/include/s3_cfg.h
--- sphinx3-0.8.ORIG/include/s3_cfg.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/s3_cfg.h	2009-08-26 12:45:02.705131259 -0600
@@ -353,8 +353,8 @@
    already exist, assign it a new id.
 
    @param _cfg A CFG parser.
-   @param _id A term id.
-   @return A string representation of the term.
+   @param _item A term string representation.
+   @return A term id.
  */
 s3_cfg_id_t
 s3_cfg_str2id(s3_cfg_t *_cfg, char *_item);
diff -dur sphinx3-0.8.ORIG/include/s3_decode.h sphinx3-0.8/include/s3_decode.h
--- sphinx3-0.8.ORIG/include/s3_decode.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/s3_decode.h	2009-08-26 12:45:02.706327239 -0600
@@ -122,7 +122,7 @@
 #ifndef __S3_DECODE_H
 #define __S3_DECODE_H
 
-/** \file live_decode_API.h
+/** \file s3_decode.h
  * \brief header for live mode decoding API 
  */
 #ifdef __cplusplus
@@ -230,8 +230,8 @@
     <I>cmd_ln_parse_file_r()</I>.  The user is responsible for calling
     <I>cmd_ln_free_r()</I> when he/she is done with the decoder.
 
-    @param decoder Pointer to the decoder.
-    @param config Pointer to the command-line object
+    @param _decode Pointer to the decoder.
+    @param _config Pointer to the command-line object
                   returned by <i>cmd_ln_parse_r()</i>.
     @return 0 for success.  -1 for failure.
 */
@@ -243,7 +243,7 @@
     function should be called once the user is finished with the Sphinx3
     decoder.
 
-    @param decoder Pointer to the decoder.
+    @param _decode Pointer to the decoder.
     @see s3_decode_init
 */
 S3DECODER_EXPORT
@@ -251,19 +251,19 @@
 
 /** Marks the start of the current utterance.  An utterance is a session of
     speech decoding that starts with a call to <I>s3_decode_begin_utt()</I> and
-    ends with a call to <I>{@link s3_decode_end_utt s3_decode_end_utt()}</I>.
+    ends with a call to <I>s3_decode_end_utt()</I>.
     In the duration of an utterance, speech data is processed with either
-    <I>{@link s3_decode_process_raw s3_decode_process_raw()}</I> or
-    <I>{@link s3_decode_process_ceps s3_decode_process_ceps()}</I>.  Decoding
+    <I>s3_decode_process_raw()</I> or
+    <I>s3_decode_process_ceps(}</I>.  Decoding
     results (hypothesis) can be retrieved any time after the start of an
-    utterance using <I>{@link s3_decode_hypothesis s3_decode_hypothesis()}</I>.
+    utterance using <I>s3_decode_hypothesis()</I>.
     All previous results will be clobbered at the start of a new utterance.
 
     At the moment, there is an undocumented time limit to the length of an
     utterance.  (Yitao: there is?)
 
-    @param decoder Pointer to the decoder.
-    @param uttid Utterance ID string.  If <I>null</I>, a somewhat unique 
+    @param _decode Pointer to the decoder.
+    @param _uttid Utterance ID string.  If <I>null</I>, a somewhat unique 
     utterance id will be generated instead.
     @return 0 for success.  -1 for failure.
     @see s3_decode_end_utt
@@ -277,10 +277,10 @@
     process speech data until the start of the next utterance.  Any hypothesis
     retrieved prior to the end of the utterance is called a partial hypothesis.
     Any hypothesis retrieved after the end of the utterance is called the final
-    hypothesis.  See <I>{@link s3_decode_hypothesis s3_decode_hypothesis()}</I>
+    hypothesis.  See <I>s3_decode_hypothesis()</I>
     on how to retrieve hypothesis.
 
-    @param decoder Pointer to the decoder
+    @param _decode Pointer to the decoder
     @see s3_decode_begin_utt
     @see s3_decode_process
     @see s3_decode_hypothesis
@@ -290,17 +290,17 @@
 
 /** Process a buffer of cepstrum frames for the current utterance.  This 
     function has to be called in the duration of an utterance.  That is, in
-    between calls to <I>{@link s3_decode_begin_utt s3_decode_begin_utt()}</I>
-    and <I>{@link s3_decode_end_utt s3_decode_end_utt()}</I>.
+    between calls to <I>s3_decode_begin_utt()</I>
+    and <I>s3_decode_end_utt()</I>.
 
     One common issue with Sphinx3 decoder is the mismatch of parameters to
     the signal processor and accoustic model.  Please double check with the
     accoustic model training scripts and your signal processing front-end to
     make sure the cepstrals are generated consistently.
 
-    @param decoder Pointer to the decoder.
-    @param frames Buffer of audio feature frames.
-    @param num_frames Number of frames in the buffer.
+    @param _decode Pointer to the decoder.
+    @param _frames Buffer of audio feature frames.
+    @param _num_frames Number of frames in the buffer.
     @return 0 for success.  -1 for failure.
     @see s3_decode_begin_utt
     @see s3_decode_end_utt
@@ -338,10 +338,11 @@
     }
     </PRE>
     
-    @param decoder Pointer to the decoder.
-    @param hyp_str Return pointer to a READ-ONLY string.  If <I>null</I>,
+    @param _decode Pointer to the decoder.
+    @param _uttid Pointer to utterance ID string.
+    @param _hyp_str Return pointer to a READ-ONLY string.  If <I>null</I>,
     the string is not returned.
-    @param hyp_segs Return pointer to a null-terminated array of word
+    @param _hyp_segs Return pointer to a null-terminated array of word
     segments.  If <I>null</I>, the array is not returned.
     @return 0 for success.  -1 for failure.
 */
@@ -353,7 +354,7 @@
  * s3_decode_end_utt() before this.  See {@link dag.h} and {@link
  * astar.h} for information on what to do with this structure.
  *
- * @param decoder Pointer to the decoder.
+ * @param _decode Pointer to the decoder.
  * @return A dag_t structure, or NULL on failure.  This pointer
  * becomes invalid after a call to s3_decode_begin_utt().
  */
diff -dur sphinx3-0.8.ORIG/include/srch_output.h sphinx3-0.8/include/srch_output.h
--- sphinx3-0.8.ORIG/include/srch_output.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/srch_output.h	2009-08-26 12:45:02.706327239 -0600
@@ -176,7 +176,7 @@
 void log_hypseg (char *uttid,   /**< Input; uttid */
 		 FILE *fp,	/**< Out: output file */
 		 srch_hyp_t *hypptr,	/**< In: Hypothesis */
-		 int32 nfrm,	/**< In: #frames in utterance */
+		 int32 nfrm,	/**< In: \#frames in utterance */
 		 int32 scl,	/**< In: Acoustic scaling for entire utt */
 		 float64 lwf,	/**< In: LM score scale-factor (in dagsearch) */
 		 dict_t* dict,  /**< In: dictionary */
diff -dur sphinx3-0.8.ORIG/include/srch_word_switch_tree.h sphinx3-0.8/include/srch_word_switch_tree.h
--- sphinx3-0.8.ORIG/include/srch_word_switch_tree.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/srch_word_switch_tree.h	2009-08-26 12:45:02.707011056 -0600
@@ -130,7 +130,7 @@
 
 
     lextree_t **roottree;           /**< The pool of trees that stores all
-                                       word trees. An array with dimension. #lm*/
+                                       word trees. An array with dimension. \#lm*/
 
     hash_table_t *active_word;    /**< Hash table that map word end to the index of the expandtree. */
 
diff -dur sphinx3-0.8.ORIG/include/subvq.h sphinx3-0.8/include/subvq.h
--- sphinx3-0.8.ORIG/include/subvq.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/subvq.h	2009-08-26 12:45:02.707011056 -0600
@@ -112,10 +112,10 @@
  * \brief Wrapper structures of sub-vector quantization
  */
 typedef struct {
-    arraysize_t origsize;	/**< origsize.r = #codebooks (or states) in original model;
-				   origsize.c = max #codewords/codebook in original model. */
-    int32 n_sv;			/**< #Subvectors */
-    int32 vqsize;		/**< #Codewords in each subvector quantized mean/var table */
+    arraysize_t origsize;	/**< origsize.r = \#codebooks (or states) in original model;
+				   origsize.c = max \#codewords/codebook in original model. */
+    int32 n_sv;			/**< \#Subvectors */
+    int32 vqsize;		/**< \#Codewords in each subvector quantized mean/var table */
     int32 **featdim;		/**< featdim[s] = Original feature dimensions in subvector s */
     vector_gautbl_t *gautbl;	/**< Vector-quantized Gaussians table for each sub-vector */
     int32 ***map;		/**< map[i][j] = map from original codebook(i)/codeword(j) to
@@ -144,9 +144,9 @@
 
 /**
  * SubVQ file format:
- *   VQParam #Original-Codebooks #Original-Codewords/codebook(max) -> #Subvectors #VQ-codewords
- *   Subvector 0 length <length> <feature-dim> <feature-dim> <feature-dim> ...
- *   Subvector 1 length <length> <feature-dim> <feature-dim> <feature-dim> ...
+ *   VQParam \#Original-Codebooks \#Original-Codewords/codebook(max) -> \#Subvectors \#VQ-codewords
+ *   Subvector 0 length \<length\> \<feature-dim\> \<feature-dim\> \<feature-dim\> ...
+ *   Subvector 1 length \<length\> \<feature-dim\> \<feature-dim\> \<feature-dim\> ...
  *   ...
  *   Codebook 0
  *   Row 0 of mean/var values (interleaved) for subvector 0 codebook (in 1 line)
@@ -237,7 +237,7 @@
  */
 int32 subvq_mgau_shortlist (subvq_t *vq,        /**< In subvq */
 			    int32 m,	/**< In: GMM index */
-			    int32 n,	/**< In: #Components in specified mixture */
+			    int32 n,	/**< In: \#Components in specified mixture */
 			    int32 beam	/**< In: Threshold to select active components */
     );
 
@@ -250,7 +250,7 @@
 int32 subvq_mgau_eval (mgau_model_t *g, /**< In: Gaussian */
 		       subvq_t *vq, /**< In: the SVQ */
 		       int32 m, /**< In: GMM Index */
-		       int32 n, /**< In :#Components in a specified mixture */
+		       int32 n, /**< In :\#Components in a specified mixture */
 		       int32 *active /**< In:Active list of mixture */
     );
 
diff -dur sphinx3-0.8.ORIG/include/tmat.h sphinx3-0.8/include/tmat.h
--- sphinx3-0.8.ORIG/include/tmat.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/tmat.h	2009-08-26 12:45:02.708327341 -0600
@@ -114,9 +114,9 @@
     logmath_t *logmath;
     int32 ***tp;	/**< The transition matrices; int32 since probs in logs3 domain:
 			   tp[tmatid][from-state][to-state] */
-    int32 n_tmat;	/**< #matrices */
-    int32 n_state;	/**< #source states in matrix (only the emitting states);
-			   #destination states = n_state+1, it includes the exit state */
+    int32 n_tmat;	/**< \#matrices */
+    int32 n_state;	/**< \#source states in matrix (only the emitting states);
+			   \#destination states = n_state+1, it includes the exit state */
 } tmat_t;
 
 
diff -dur sphinx3-0.8.ORIG/include/vector.h sphinx3-0.8/include/vector.h
--- sphinx3-0.8.ORIG/include/vector.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/vector.h	2009-08-26 12:45:02.709225798 -0600
@@ -84,8 +84,8 @@
  * \brief wrapper of array size 
  */
 typedef struct {
-    int32 r;		/**< #rows, */
-    int32 c;		/**< #cols in an array */
+    int32 r;		/**< \#rows, */
+    int32 c;		/**< \#cols in an array */
 } arraysize_t;
 
 /** \struct point_t
@@ -187,7 +187,7 @@
 int32 vector_mean (float32 *mean,	/**< Out: Computed mean; caller should allocate
 					   this memory */
 		   float32 **data,	/**< In: Set of data over which mean is computed */
-		   int32 n_vec,		/**< In: #Vectors in data */
+		   int32 n_vec,		/**< In: \#Vectors in data */
 		   int32 n_dim	/**< In: Dimensionality of each vector (and mean) */
     );
 
@@ -241,14 +241,14 @@
  */
 S3DECODER_EXPORT
 float64 vector_vqgen (float32 **data,	/**< In: Input Data to be quantized */
-		      int32 rows,	/**< In: #Rows in input data */
-		      int32 cols,	/**< In: #Cols in input data (and output VQ table) */
-		      int32 vqrows,	/**< In: #Rows in vector quantized result */
+		      int32 rows,	/**< In: \#Rows in input data */
+		      int32 cols,	/**< In: \#Cols in input data (and output VQ table) */
+		      int32 vqrows,	/**< In: \#Rows in vector quantized result */
 		      float64 epsilon,	/**< In: Convergence limit; stop k-means iterations when
 					   the relative reduction in total squared error in
 					   successive iterations ((sqerr[t]-sqerr[t+1])/sqerr[t])
 					   is below this value. */
-		      int32 maxiter,	/**< In: Max #iterations, regardless of convlimit */
+		      int32 maxiter,	/**< In: Max \#iterations, regardless of convlimit */
 		      float32 **mean,	/**< Out: Vector quantized array of centroids.  Caller
 					   must allocate this array */
 		      int32 *map,       /**< Out: data->mean mapping; mean[map[i]] is the closest
@@ -269,8 +269,8 @@
  */
 int32 vector_vqlabel (float32 *vec,	/**< In: Vector to be compared against VQ table */
 		      float32 **mean,	/**< In: Table of centroids */
-		      int32 rows,	/**< In: #Rows in mean */
-		      int32 cols,	/**< In: #Cols in mean (and vec) */
+		      int32 rows,	/**< In: \#Rows in mean */
+		      int32 cols,	/**< In: \#Cols in mean (and vec) */
 		      float64 *sqerr	/**< Out: Squared error (distance) between vec and the
 					   selected codeword.  May be NULL if not needed. */
     );
@@ -296,7 +296,7 @@
  * only the diagonal is maintained, as a vector).
  */
 typedef struct {
-    int32 n_gau;	/**< #Gaussians in table */
+    int32 n_gau;	/**< \#Gaussians in table */
     int32 veclen;	/**< Vector length */
     float32 **mean;	/**< n_cw x veclen mean values */
     float32 **var;	/**< n_cw x veclen corresponding (diagonal) variance values */
@@ -338,7 +338,7 @@
 void
 vector_gautbl_eval_logs3 (vector_gautbl_t *gau,	/**< In: Table of Gaussians */
 			  int32 offset,	/**< In: First VQ codeword in the range to be evaluated */
-			  int32 count,	/**< In: #Codewords to be evaluated (range size) */
+			  int32 count,	/**< In: \#Codewords to be evaluated (range size) */
 			  float32 *x,	/**< In: Input vector being compared to codewords */
 			  int32 *scr,	/**< Out: Mahalanobis distance scores (logs3 values).
 					   Caller must allocate this array.  Note that only
diff -dur sphinx3-0.8.ORIG/include/vithist.h sphinx3-0.8/include/vithist.h
--- sphinx3-0.8.ORIG/include/vithist.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/vithist.h	2009-08-26 12:45:02.709225798 -0600
@@ -239,7 +239,7 @@
     vithist_entry_t **entry;	/**< entry[i][j]= j-th entry in the i-th block allocated */
     int32 *frame_start;		/**< For each frame, the first vithist ID in that frame; (the
                                    last is just before the first of the next frame) */
-    int32 n_entry;		/**< Total #entries used (generates global seq no. or ID) */
+    int32 n_entry;		/**< Total \#entries used (generates global seq no. or ID) */
     int32 n_frm;		/**< No. of frames processed so far in this utterance */
     int32 n_ci;                 /**< No. of CI phones */
     int32 bghist;		/**< If TRUE (bigram-mode) only one entry/word/frame; otherwise
@@ -301,8 +301,8 @@
 
 
 /**
- * Invoked at the beginning of each utterance; vithist initialized with a root <s> entry.
- * @return Vithist ID of the root <s> entry.
+ * Invoked at the beginning of each utterance; vithist initialized with a root \<s\> entry.
+ * @return Vithist ID of the root \<s\> entry.
  */
 int32 vithist_utt_begin (vithist_t *vh, /**< In: a Viterbi history data structure*/
 			 kbcore_t *kbc  /**< In: a KBcore */
@@ -310,8 +310,8 @@
 
 
 /**
- * Invoked at the end of each utterance; append a final </s> entry that results in the best
- * path score (i.e., LM including LM transition to </s>).
+ * Invoked at the end of each utterance; append a final \</s\> entry that results in the best
+ * path score (i.e., LM including LM transition to \</s\>).
  * Return the ID of the appended entry if successful, -ve if error (empty utterance).
  */
 int32 vithist_utt_end (vithist_t *vh, /**< In: a Viterbi history data structure*/
diff -dur sphinx3-0.8.ORIG/include/wid.h sphinx3-0.8/include/wid.h
--- sphinx3-0.8.ORIG/include/wid.h	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/include/wid.h	2009-08-26 12:45:02.710324924 -0600
@@ -95,14 +95,14 @@
 
 /**
  * Augment the given wordprob array with alternative pronunciations from the dictionary.
- * Return value: #entries in the augmented wordprob array (including the original ones).
+ * Return value: \#entries in the augmented wordprob array (including the original ones).
  */
 int32 wid_wordprob2alt (dict_t *dict,	/**< In: Dictionary */
 			wordprob_t *wp,	/**< In/Out: Input wordprob array, to be augmented with
 					   alternative pronunciations for the entries that
 					   already exist in it.  Caller must have allocated
 					   this array. */
-			int32 n	/**< In: #Input entries in the wordprob array */
+			int32 n	/**< In: \#Input entries in the wordprob array */
     );
 
 #if 0
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_flat_fwd_internal.h sphinx3-0.8/src/libs3decoder/libsearch/srch_flat_fwd_internal.h
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_flat_fwd_internal.h	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch_flat_fwd_internal.h	2009-08-26 12:45:02.711326770 -0600
@@ -117,7 +117,7 @@
  * \struct backoff_t
  *
  * Backoff node when backing off all the way to unigrams.  Since each
- * word exits with #ciphones different scores (for so many different
+ * word exits with \#ciphones different scores (for so many different
  * right contexts), a separate node exists for each context.
  */
 typedef struct {
@@ -150,7 +150,7 @@
      * this forward pass can also consider words starting at a number of neighbouring frames
      * within a given window.
      * 
-     * Input lattice file format:  Each line contains a single <word> <startframe> info.  The
+     * Input lattice file format:  Each line contains a single \<word\> \<startframe\> info.  The
      * line may contain other info following these two fields; these are ignored.  Empty lines
      * and lines beginning with a # char in the first column (ie, comment lines) are ignored.
      */
@@ -163,13 +163,13 @@
 				   entire run */
   
     char const *latfile_ext;	/**< Complete word candidate filename for an utterance formed
-                           by word_cand_dir/<uttid>.latfile_ext */
+                           by word_cand_dir/\<uttid\>.latfile_ext */
     int32 word_cand_win;	/**< In frame f, candidate words in input lattice from frames
 				   [(f - word_cand_win) .. (f + word_cand_win)] will be
 				   the actual candidates to be started(entered) */
     word_cand_t **word_cand;	/**< Word candidates for each frame.  (NOTE!! Another array
                                    with a hard limit on its size.) */
-    int32 n_word_cand;	/**< #candidate entries in word_cand for current utterance.
+    int32 n_word_cand;	/**< \#candidate entries in word_cand for current utterance.
                            If <= 0; full search performed for current utterance */
 
 
diff -dur sphinx3-0.8.ORIG/src/programs/main_decode.c sphinx3-0.8/src/programs/main_decode.c
--- sphinx3-0.8.ORIG/src/programs/main_decode.c	2008-12-31 11:27:58.000000000 -0700
+++ sphinx3-0.8/src/programs/main_decode.c	2009-08-26 12:45:02.711326770 -0600
@@ -56,7 +56,7 @@
  * 		Started.
  */
 
-/** \file decode.c
+/** \file main_decode.c
  * \brief main function for application decode
  */
 #include "info.h"
diff -dur sphinx3-0.8.ORIG/src/programs/main_gausubvq.c sphinx3-0.8/src/programs/main_gausubvq.c
--- sphinx3-0.8.ORIG/src/programs/main_gausubvq.c	2008-12-31 11:27:58.000000000 -0700
+++ sphinx3-0.8/src/programs/main_gausubvq.c	2009-08-26 12:45:02.712327401 -0600
@@ -76,7 +76,7 @@
 #include "feat.h"
 #include "cmdln_macro.h"
 
-/** \file gausubvq.c 
+/** \file main_gausubvq.c 
  * \brief Compute the SVQ map 
  */
 
diff -dur sphinx3-0.8.ORIG/src/programs/s3_align.c sphinx3-0.8/src/programs/s3_align.c
--- sphinx3-0.8.ORIG/src/programs/s3_align.c	2008-12-31 11:27:58.000000000 -0700
+++ sphinx3-0.8/src/programs/s3_align.c	2009-08-26 12:45:02.712327401 -0600
@@ -804,15 +804,15 @@
 /**
  * Build a sentence HMM for the given transcription (wordstr).  A two-level DAG is
  * built: phone-level and state-level.
- *   - <s> and </s> always added at the beginning and end of sentence to form an
+ *   - \<s\> and \</s\> always added at the beginning and end of sentence to form an
  *     augmented transcription.
- *   - Optional <sil> and noise words added between words in the augmented
+ *   - Optional \<sil\> and noise words added between words in the augmented
  *     transcription.
  * wordstr must contain only the transcript; no extraneous stuff such as utterance-id.
  * Phone-level HMM structure has replicated nodes to allow for different left and right
  * context CI phones; hence, each pnode corresponds to a unique triphone in the sentence
  * HMM.
- * Return 0 if successful, <0 if any error (eg, OOV word encountered).
+ * Return 0 if successful, \<0 if any error (eg, OOV word encountered).
  */
 int32
 align_build_sent_hmm(char *wordstr, int insert_sil)

sphinx3-link.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sphinx3-link.patch ---
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/Makefile.in sphinx3-0.8/src/libs3decoder/Makefile.in
--- sphinx3-0.8.ORIG/src/libs3decoder/Makefile.in	2008-12-31 21:23:33.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/Makefile.in	2009-09-15 15:47:49.599310099 -0600
@@ -197,7 +197,7 @@
 tidigitsdata = @tidigitsdata@
 SUBDIRS = libam libconfidence libcommon  libdict libep liblm libsearch libAPI libcfg
 lib_LTLIBRARIES = libs3decoder.la
-libs3decoder_la_LDFLAGS = -version-info 0:6:0
+libs3decoder_la_LDFLAGS = -version-info 0:6:0 -lsphinxbase
 libs3decoder_la_SOURCES = 
 libs3decoder_la_LIBADD = \
 	libam/libam.la \

sphinx3-python.patch:
 setup.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sphinx3-python.patch ---
diff -dur sphinx3-0.8.ORIG/python/setup.py sphinx3-0.8/python/setup.py
--- sphinx3-0.8.ORIG/python/setup.py	2008-12-31 21:20:08.000000000 -0700
+++ sphinx3-0.8/python/setup.py	2009-08-26 12:46:43.559003453 -0600
@@ -10,8 +10,8 @@
 module = Extension('_sphinx3',
                    include_dirs = ['../../sphinxbase/include',
                                    '../include',
-                                   '/usr/local/include/sphinxbase/',
-                                   '/usr/local/include/sphinx3',
+                                   '/usr/include/sphinxbase/',
+                                   '/usr/include/sphinx3',
                                    ],
 		   define_macros = define_macros,
 		   library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',

sphinx3-string.patch:
 libAPI/s3_decode.c                |    1 +
 libAPI/utt.c                      |    1 +
 libsearch/kb.c                    |    2 +-
 libsearch/lextree.c               |    1 +
 libsearch/srch.c                  |    1 +
 libsearch/srch_fsg.c              |    1 +
 libsearch/srch_time_switch_tree.c |    1 +
 libsearch/vithist.c               |    1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE sphinx3-string.patch ---
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libAPI/s3_decode.c sphinx3-0.8/src/libs3decoder/libAPI/s3_decode.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libAPI/s3_decode.c	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libAPI/s3_decode.c	2009-08-26 10:57:50.691952472 -0600
@@ -150,6 +150,7 @@
 =============================================================================
 */
 
+#include <string.h>
 #include <time.h>
 #include <feat.h>
 #include "s3_decode.h"
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libAPI/utt.c sphinx3-0.8/src/libs3decoder/libAPI/utt.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libAPI/utt.c	2008-12-31 11:27:54.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libAPI/utt.c	2009-08-26 10:58:10.739950084 -0600
@@ -101,6 +101,7 @@
 #include <direct.h>             /* RAH, added */
 #endif
 
+#include <string.h>
 #include "kb.h"
 #include "utt.h"
 #include "srch.h"
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/kb.c sphinx3-0.8/src/libs3decoder/libsearch/kb.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/kb.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/kb.c	2009-08-26 10:54:38.093005711 -0600
@@ -152,7 +152,7 @@
 #include "kb.h"
 #include "srch.h"
 #include "mllr.h"
-
+#include <string.h>
 
 #define REPORT_KB 1
 
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/lextree.c sphinx3-0.8/src/libs3decoder/libsearch/lextree.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/lextree.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/lextree.c	2009-08-26 10:55:12.853091485 -0600
@@ -136,6 +136,7 @@
 
 #include "lextree.h"
 #include "wid.h"
+#include <string.h>
 
 /*
  * Lextree nodes, and the HMMs contained within, are cleared upon creation, and whenever
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch.c sphinx3-0.8/src/libs3decoder/libsearch/srch.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch.c	2009-08-26 10:55:48.605155067 -0600
@@ -217,6 +217,7 @@
 #include "pio.h"
 #include "srch.h"
 #include "corpus.h"
+#include <string.h>
 
 #define COMPUTE_HEURISTIC 1
 #define SHOW_SENONE_SCORE_FOR_FRAME 0
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_fsg.c sphinx3-0.8/src/libs3decoder/libsearch/srch_fsg.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_fsg.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch_fsg.c	2009-08-26 10:56:04.988016715 -0600
@@ -81,6 +81,7 @@
 #include "kbcore.h"
 #include "word_fsg.h"
 #include "fsg_search.h"
+#include <string.h>
 
 static word_fsg_t *srch_FSG_read_fsgfile(void *srch, const char *fsgfilename);
 
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_time_switch_tree.c sphinx3-0.8/src/libs3decoder/libsearch/srch_time_switch_tree.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/srch_time_switch_tree.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/srch_time_switch_tree.c	2009-08-26 10:56:28.845010375 -0600
@@ -152,6 +152,7 @@
 #include "lextree.h"
 #include "lm.h"
 #include "vithist.h"
+#include <string.h>
 
 /** 
     \file srch_time_switch_tree.h 
diff -dur sphinx3-0.8.ORIG/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
--- sphinx3-0.8.ORIG/src/libs3decoder/libsearch/vithist.c	2008-12-31 11:27:56.000000000 -0700
+++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c	2009-08-26 10:57:04.115947097 -0600
@@ -127,6 +127,7 @@
 #include <listelem_alloc.h>
 #include <pio.h>
 #include <heap.h>
+#include <string.h>
 
 #include "vithist.h"
 #include "lextree.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmusphinx3/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 02:46:00 -0000	1.1
+++ .cvsignore	26 Sep 2009 16:14:14 -0000	1.2
@@ -0,0 +1 @@
+sphinx3-0.8.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmusphinx3/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 02:46:00 -0000	1.1
+++ sources	26 Sep 2009 16:14:14 -0000	1.2
@@ -0,0 +1 @@
+cbbcbb86d8aac41085ddeaa953a06298  sphinx3-0.8.zip



From mtasaka at fedoraproject.org  Sat Sep 26 16:19:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 16:19:12 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-11 rubygem-actionmailer.spec,1.11,1.12
Message-ID: <20090926161912.7AB6011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionmailer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603/rubygem-actionmailer/F-11

Modified Files:
	rubygem-actionmailer.spec 
Log Message:
Force rebuild


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/F-11/rubygem-actionmailer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-actionmailer.spec	20 Aug 2009 16:13:25 -0000	1.11
+++ rubygem-actionmailer.spec	26 Sep 2009 16:19:12 -0000	1.12
@@ -7,7 +7,7 @@
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-3
+- Force rebuild
+
 * Thu Aug 02 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-2
 - Disable test
 



From mtasaka at fedoraproject.org  Sat Sep 26 16:19:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 16:19:12 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-11 rubygem-activerecord.spec,1.11,1.12
Message-ID: <20090926161912.A308411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activerecord/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603/rubygem-activerecord/F-11

Modified Files:
	rubygem-activerecord.spec 
Log Message:
Force rebuild


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activerecord/F-11/rubygem-activerecord.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-activerecord.spec	26 Jul 2009 10:50:43 -0000	1.11
+++ rubygem-activerecord.spec	26 Sep 2009 16:19:12 -0000	1.12
@@ -7,7 +7,7 @@
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
+- Force rebuild
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 



From mtasaka at fedoraproject.org  Sat Sep 26 16:19:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 16:19:12 +0000 (UTC)
Subject: rpms/rubygem-activeresource/F-11 rubygem-activeresource.spec, 1.9, 
	1.10
Message-ID: <20090926161912.DF1DF11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activeresource/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603/rubygem-activeresource/F-11

Modified Files:
	rubygem-activeresource.spec 
Log Message:
Force rebuild


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeresource/F-11/rubygem-activeresource.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-activeresource.spec	26 Jul 2009 10:20:11 -0000	1.9
+++ rubygem-activeresource.spec	26 Sep 2009 16:19:12 -0000	1.10
@@ -7,9 +7,9 @@
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
-License: GPLv2+ or Ruby
+License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
+- Force rebuild
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 2.3.3-1
 - New upstream version
 



From mtasaka at fedoraproject.org  Sat Sep 26 16:19:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 16:19:13 +0000 (UTC)
Subject: rpms/rubygem-rails/F-11 rubygem-rails.spec,1.14,1.15
Message-ID: <20090926161913.2ED9A11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-rails/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603/rubygem-rails/F-11

Modified Files:
	rubygem-rails.spec 
Log Message:
Force rebuild


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rails/F-11/rubygem-rails.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rubygem-rails.spec	12 Aug 2009 21:33:53 -0000	1.14
+++ rubygem-rails.spec	26 Sep 2009 16:19:12 -0000	1.15
@@ -7,7 +7,7 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-3
+- Force rebuild
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-2
 - Don't delete zero-length files (#496480, mtasaka)
 



From cebbert at fedoraproject.org  Sat Sep 26 16:20:46 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 26 Sep 2009 16:20:46 +0000 (UTC)
Subject: rpms/kernel/F-10
	kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.92, 1.1206.2.93
Message-ID: <20090926162046.1180111C0418@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv570

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch 
Log Message:
Backport "KVM: x86: Disallow hypercalls for guest callers in rings > 0"

kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch:
 arch/x86/kvm/x86.c       |    6 ++++++
 include/linux/kvm_para.h |    1 +
 2 files changed, 7 insertions(+)

--- NEW FILE kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch ---
>From 07708c4af1346ab1521b26a202f438366b7bcffd Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka at siemens.com>
Date: Mon, 3 Aug 2009 18:43:28 +0200
Subject: KVM: x86: Disallow hypercalls for guest callers in rings > 0

From: Jan Kiszka <jan.kiszka at siemens.com>

[ backport to 2.6.27 by <cebbert at redhat.com> ]

commit 07708c4af1346ab1521b26a202f438366b7bcffd upstream.

So far unprivileged guest callers running in ring 3 can issue, e.g., MMU
hypercalls. Normally, such callers cannot provide any hand-crafted MMU
command structure as it has to be passed by its physical address, but
they can still crash the guest kernel by passing random addresses.

To close the hole, this patch considers hypercalls valid only if issued
from guest ring 0. This may still be relaxed on a per-hypercall base in
the future once required.

Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/kvm/x86.c       |    6 ++++++
 include/linux/kvm_para.h |    1 +
 2 files changed, 7 insertions(+)

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2576,6 +2576,11 @@ int kvm_emulate_hypercall(struct kvm_vcp
 		a3 &= 0xFFFFFFFF;
 	}
 
+	if (kvm_x86_ops->get_cpl(vcpu) != 0) {
+		ret = -KVM_EPERM;
+		goto out;
+	}
+
 	switch (nr) {
 	case KVM_HC_VAPIC_POLL_IRQ:
 		ret = 0;
@@ -2587,6 +2592,7 @@ int kvm_emulate_hypercall(struct kvm_vcp
 		ret = -KVM_ENOSYS;
 		break;
 	}
+out:
 	vcpu->arch.regs[VCPU_REGS_RAX] = ret;
 	kvm_x86_ops->decache_regs(vcpu);
 	++vcpu->stat.hypercalls;
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -13,6 +13,7 @@
 #define KVM_ENOSYS		1000
 #define KVM_EFAULT		EFAULT
 #define KVM_E2BIG		E2BIG
+#define KVM_EPERM		EPERM
 
 #define KVM_HC_VAPIC_POLL_IRQ		1
 #define KVM_HC_MMU_OP			2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.92
retrieving revision 1.1206.2.93
diff -u -p -r1.1206.2.92 -r1.1206.2.93
--- kernel.spec	24 Sep 2009 20:02:57 -0000	1.1206.2.92
+++ kernel.spec	26 Sep 2009 16:20:45 -0000	1.1206.2.93
@@ -783,6 +783,9 @@ Patch15000: linux-2.6-ppc64-vs-broadcom.
 Patch15001: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
 Patch15002: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
+# kvm hypercall must be from cpl0 on guest
+Patch15100: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1415,6 +1418,9 @@ ApplyPatch linux-2.6-ppc64-vs-broadcom.p
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
+# kvm hypercall must be from cpl0 on guest
+ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1990,6 +1996,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.93
+- Backport "KVM: x86: Disallow hypercalls for guest callers in rings > 0"
+
 * Thu Sep 24 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.92
 - Linux 2.6.27.35
 - Drop merged patches:



From denisarnaud at fedoraproject.org  Sat Sep 26 16:29:28 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 16:29:28 +0000 (UTC)
Subject: rpms/rmol/devel .cvsignore, 1.5, 1.6 import.log, 1.7, 1.8 rmol.spec,
	1.7, 1.8 sources, 1.8, 1.9
Message-ID: <20090926162928.D8E1111C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3151/devel

Modified Files:
	.cvsignore import.log rmol.spec sources 
Log Message:
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Jun 2009 16:53:49 -0000	1.5
+++ .cvsignore	26 Sep 2009 16:29:28 -0000	1.6
@@ -1 +1 @@
-rmol-0.22.0.tar.gz
+rmol-0.23.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	6 Jun 2009 16:53:50 -0000	1.7
+++ import.log	26 Sep 2009 16:29:28 -0000	1.8
@@ -5,3 +5,4 @@ rmol-0_20_0-2_fc10:HEAD:rmol-0.20.0-2.fc
 rmol-0_20_0-3_fc10:HEAD:rmol-0.20.0-3.fc10.src.rpm:1241398758
 rmol-0_21_0-2_fc11:HEAD:rmol-0.21.0-2.fc11.src.rpm:1241914851
 rmol-0_22_0-1_fc10:HEAD:rmol-0.22.0-1.fc10.src.rpm:1244307166
+rmol-0_23_0-1_fc11:HEAD:rmol-0.23.0-1.fc11.src.rpm:1253982485


Index: rmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/devel/rmol.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rmol.spec	27 Jul 2009 03:05:22 -0000	1.7
+++ rmol.spec	26 Sep 2009 16:29:28 -0000	1.8
@@ -2,8 +2,8 @@
 %define mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.22.0
-Release:        2%{?dist}
+Version:        0.23.0
+Release:        1%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
 
@@ -130,8 +130,8 @@ fi
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
+- Upstream integration
 
 * Mon May 11 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.22.0-1
 - Upstream integration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Jun 2009 16:53:50 -0000	1.8
+++ sources	26 Sep 2009 16:29:28 -0000	1.9
@@ -1 +1 @@
-5588e3b1f545c4a6bf2a63ceffdcc008  rmol-0.22.0.tar.gz
+4efd1c6a4edff1a0e35decabb2e1e6ef  rmol-0.23.0.tar.gz



From sdz at fedoraproject.org  Sat Sep 26 16:37:01 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 16:37:01 +0000 (UTC)
Subject: rpms/avogadro/devel avogadro.spec,1.14,1.15
Message-ID: <20090926163701.8611211C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5705

Modified Files:
	avogadro.spec 
Log Message:
fix typo in file list



Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- avogadro.spec	26 Sep 2009 16:10:06 -0000	1.14
+++ avogadro.spec	26 Sep 2009 16:37:01 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           avogadro
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}_icon.png
+%{_datadir}/pixmaps/%{name}-icon.png
 %{_datadir}/applications/%{name}.desktop
 
 
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> 0.9.8-2
+- fix typo in file list
+
 * Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> 0.9.8-1
 - update to new upstream release
 - enable python and glsl support again



From ndim at fedoraproject.org  Sat Sep 26 16:47:46 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat, 26 Sep 2009 16:47:46 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.12, 1.13 nted.spec, 1.20, 1.21 sources,
	1.12, 1.13
Message-ID: <20090926164746.EF08411C00E6@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9450

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
- update to upstream's nted-1.8.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Jul 2009 11:51:48 -0000	1.12
+++ .cvsignore	26 Sep 2009 16:47:46 -0000	1.13
@@ -1 +1 @@
-nted-1.6.2.tar.gz
+nted-1.8.1.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nted.spec	23 Sep 2009 06:27:13 -0000	1.20
+++ nted.spec	26 Sep 2009 16:47:46 -0000	1.21
@@ -14,8 +14,8 @@
 
 
 Name:           nted
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
+- update to upstream's nted-1.8.1 release
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6.2-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Jul 2009 11:51:48 -0000	1.12
+++ sources	26 Sep 2009 16:47:46 -0000	1.13
@@ -1 +1 @@
-dd4290b9e5d8f513d37772cb801e636f  nted-1.6.2.tar.gz
+eb3fda356ddb8c3686926d201d04adc7  nted-1.8.1.tar.gz



From denisarnaud at fedoraproject.org  Sat Sep 26 16:49:50 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 16:49:50 +0000 (UTC)
Subject: rpms/rmol/F-11 .cvsignore, 1.5, 1.6 import.log, 1.6, 1.7 rmol.spec, 
	1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090926164950.F34A311C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10109/F-11

Modified Files:
	.cvsignore import.log rmol.spec sources 
Log Message:
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Jun 2009 16:55:57 -0000	1.5
+++ .cvsignore	26 Sep 2009 16:49:50 -0000	1.6
@@ -1 +1 @@
-rmol-0.22.0.tar.gz
+rmol-0.23.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	6 Jun 2009 16:55:57 -0000	1.6
+++ import.log	26 Sep 2009 16:49:50 -0000	1.7
@@ -4,3 +4,4 @@ rmol-0_20_0-2_fc10:F-11:rmol-0.20.0-2.fc
 rmol-0_20_0-3_fc10:F-11:rmol-0.20.0-3.fc10.src.rpm:1241398864
 rmol-0_21_0-2_fc11:F-11:rmol-0.21.0-2.fc11.src.rpm:1241915074
 rmol-0_22_0-1_fc10:F-11:rmol-0.22.0-1.fc10.src.rpm:1244307321
+rmol-0_23_0-1_fc11:F-11:rmol-0.23.0-1.fc11.src.rpm:1253982620


Index: rmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-11/rmol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rmol.spec	6 Jun 2009 16:55:57 -0000	1.6
+++ rmol.spec	26 Sep 2009 16:49:50 -0000	1.7
@@ -2,7 +2,7 @@
 %define mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.22.0
+Version:        0.23.0
 Release:        1%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
@@ -130,6 +130,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
+- Upstream integration
+
 * Mon May 11 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.22.0-1
 - Upstream integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Jun 2009 16:55:57 -0000	1.7
+++ sources	26 Sep 2009 16:49:50 -0000	1.8
@@ -1 +1 @@
-5588e3b1f545c4a6bf2a63ceffdcc008  rmol-0.22.0.tar.gz
+4efd1c6a4edff1a0e35decabb2e1e6ef  rmol-0.23.0.tar.gz



From denisarnaud at fedoraproject.org  Sat Sep 26 16:50:51 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 16:50:51 +0000 (UTC)
Subject: rpms/rmol/F-10 .cvsignore, 1.5, 1.6 import.log, 1.6, 1.7 rmol.spec, 
	1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090926165051.EDF3B11C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10547/F-10

Modified Files:
	.cvsignore import.log rmol.spec sources 
Log Message:
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Jun 2009 16:57:46 -0000	1.5
+++ .cvsignore	26 Sep 2009 16:50:51 -0000	1.6
@@ -1 +1 @@
-rmol-0.22.0.tar.gz
+rmol-0.23.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	6 Jun 2009 16:57:46 -0000	1.6
+++ import.log	26 Sep 2009 16:50:51 -0000	1.7
@@ -4,3 +4,4 @@ rmol-0_20_0-2_fc10:F-10:rmol-0.20.0-2.fc
 rmol-0_20_0-3_fc10:F-10:rmol-0.20.0-3.fc10.src.rpm:1241398959
 rmol-0_21_0-2_fc11:F-10:rmol-0.21.0-2.fc11.src.rpm:1241915138
 rmol-0_22_0-1_fc10:F-10:rmol-0.22.0-1.fc10.src.rpm:1244307435
+rmol-0_23_0-1_fc11:F-10:rmol-0.23.0-1.fc11.src.rpm:1253983827


Index: rmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-10/rmol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rmol.spec	6 Jun 2009 16:57:46 -0000	1.6
+++ rmol.spec	26 Sep 2009 16:50:51 -0000	1.7
@@ -2,7 +2,7 @@
 %define mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.22.0
+Version:        0.23.0
 Release:        1%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
@@ -130,6 +130,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
+- Upstream integration
+
 * Mon May 11 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.22.0-1
 - Upstream integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Jun 2009 16:57:46 -0000	1.7
+++ sources	26 Sep 2009 16:50:51 -0000	1.8
@@ -1 +1 @@
-5588e3b1f545c4a6bf2a63ceffdcc008  rmol-0.22.0.tar.gz
+4efd1c6a4edff1a0e35decabb2e1e6ef  rmol-0.23.0.tar.gz



From ebrand at fedoraproject.org  Sat Sep 26 16:53:02 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sat, 26 Sep 2009 16:53:02 +0000 (UTC)
Subject: rpms/sslogger/F-10 sslogger-0.9.tar.gz,1.1,NONE
Message-ID: <20090926165303.015C311C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11439

Removed Files:
	sslogger-0.9.tar.gz 
Log Message:
remove sslogger-0.9.tar.gz



--- sslogger-0.9.tar.gz DELETED ---



From ebrand at fedoraproject.org  Sat Sep 26 16:56:24 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sat, 26 Sep 2009 16:56:24 +0000 (UTC)
Subject: rpms/sslogger/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090926165624.2E16A11C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12562

Modified Files:
	.cvsignore sources 
Log Message:
Updated to use lookaside cache for ssloger-0.9.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:07:39 -0000	1.1
+++ .cvsignore	26 Sep 2009 16:56:23 -0000	1.2
@@ -0,0 +1 @@
+sslogger-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:07:39 -0000	1.1
+++ sources	26 Sep 2009 16:56:23 -0000	1.2
@@ -0,0 +1 @@
+1f384d6c363780cbe4c929ca46ddcdf9  sslogger-0.9.tar.gz



From ebrand at fedoraproject.org  Sat Sep 26 16:58:25 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sat, 26 Sep 2009 16:58:25 +0000 (UTC)
Subject: rpms/sslogger/F-11 sslogger-0.9.tar.gz,1.1,NONE
Message-ID: <20090926165825.19C0311C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13205

Removed Files:
	sslogger-0.9.tar.gz 
Log Message:
Removed sslogger-0.9.tar.gz



--- sslogger-0.9.tar.gz DELETED ---



From ebrand at fedoraproject.org  Sat Sep 26 16:59:54 2009
From: ebrand at fedoraproject.org (Edward Brand)
Date: Sat, 26 Sep 2009 16:59:54 +0000 (UTC)
Subject: rpms/sslogger/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090926165954.C01C911C00E6@cvs1.fedora.phx.redhat.com>

Author: ebrand

Update of /cvs/pkgs/rpms/sslogger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13580

Modified Files:
	.cvsignore sources 
Log Message:
Added sslogger-0.9.tar.gz lookaside cache



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Sep 2009 22:07:39 -0000	1.1
+++ .cvsignore	26 Sep 2009 16:59:54 -0000	1.2
@@ -0,0 +1 @@
+sslogger-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sslogger/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Sep 2009 22:07:39 -0000	1.1
+++ sources	26 Sep 2009 16:59:54 -0000	1.2
@@ -0,0 +1 @@
+1f384d6c363780cbe4c929ca46ddcdf9  sslogger-0.9.tar.gz



From denisarnaud at fedoraproject.org  Sat Sep 26 17:04:48 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 17:04:48 +0000 (UTC)
Subject: rpms/rmol/EL-5 .cvsignore, 1.5, 1.6 import.log, 1.7, 1.8 rmol.spec, 
	1.7, 1.8 sources, 1.8, 1.9
Message-ID: <20090926170448.4804811C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14973/EL-5

Modified Files:
	.cvsignore import.log rmol.spec sources 
Log Message:
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Jun 2009 17:02:06 -0000	1.5
+++ .cvsignore	26 Sep 2009 17:04:47 -0000	1.6
@@ -1 +1 @@
-rmol-0.22.0.tar.gz
+rmol-0.23.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-5/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	6 Jun 2009 17:02:07 -0000	1.7
+++ import.log	26 Sep 2009 17:04:48 -0000	1.8
@@ -5,3 +5,4 @@ rmol-0_20_0-3_fc10:EL-5:rmol-0.20.0-3.fc
 rmol-0_21_0-2_fc11:EL-5:rmol-0.21.0-2.fc11.src.rpm:1241914736
 rmol-0_21_0-3_fc11:EL-5:rmol-0.21.0-3.fc11.src.rpm:1241917525
 rmol-0_22_0-1_fc10:EL-5:rmol-0.22.0-1.fc10.src.rpm:1244307691
+rmol-0_23_0-1_fc11:EL-5:rmol-0.23.0-1.fc11.src.rpm:1253984663


Index: rmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-5/rmol.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rmol.spec	6 Jun 2009 17:02:07 -0000	1.7
+++ rmol.spec	26 Sep 2009 17:04:48 -0000	1.8
@@ -2,7 +2,7 @@
 %define mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.22.0
+Version:        0.23.0
 Release:        1%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
@@ -130,6 +130,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
+- Upstream integration
+
 * Mon May 11 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.22.0-1
 - Upstream integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Jun 2009 17:02:07 -0000	1.8
+++ sources	26 Sep 2009 17:04:48 -0000	1.9
@@ -1 +1 @@
-5588e3b1f545c4a6bf2a63ceffdcc008  rmol-0.22.0.tar.gz
+4efd1c6a4edff1a0e35decabb2e1e6ef  rmol-0.23.0.tar.gz



From denisarnaud at fedoraproject.org  Sat Sep 26 17:05:40 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 17:05:40 +0000 (UTC)
Subject: rpms/rmol/EL-4 .cvsignore, 1.4, 1.5 import.log, 1.5, 1.6 rmol.spec, 
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090926170540.7DA4F11C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15304/EL-4

Modified Files:
	.cvsignore import.log rmol.spec sources 
Log Message:
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jun 2009 17:03:41 -0000	1.4
+++ .cvsignore	26 Sep 2009 17:05:40 -0000	1.5
@@ -1 +1 @@
-rmol-0.22.0.tar.gz
+rmol-0.23.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-4/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	6 Jun 2009 17:03:41 -0000	1.5
+++ import.log	26 Sep 2009 17:05:40 -0000	1.6
@@ -3,3 +3,4 @@ rmol-0_20_0-1_fc10:EL-4:rmol-0.20.0-1.fc
 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
 rmol-0_22_0-1_fc10:EL-4:rmol-0.22.0-1.fc10.src.rpm:1244307787
+rmol-0_23_0-1_fc11:EL-4:rmol-0.23.0-1.fc11.src.rpm:1253984719


Index: rmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-4/rmol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rmol.spec	6 Jun 2009 17:03:41 -0000	1.5
+++ rmol.spec	26 Sep 2009 17:05:40 -0000	1.6
@@ -2,7 +2,7 @@
 %define mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.22.0
+Version:        0.23.0
 Release:        1%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
@@ -130,6 +130,9 @@ fi
 
 
 %changelog
+* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
+- Upstream integration
+
 * Mon May 11 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.22.0-1
 - Upstream integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Jun 2009 17:03:41 -0000	1.6
+++ sources	26 Sep 2009 17:05:40 -0000	1.7
@@ -1 +1 @@
-5588e3b1f545c4a6bf2a63ceffdcc008  rmol-0.22.0.tar.gz
+4efd1c6a4edff1a0e35decabb2e1e6ef  rmol-0.23.0.tar.gz



From mtasaka at fedoraproject.org  Sat Sep 26 17:06:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 26 Sep 2009 17:06:38 +0000 (UTC)
Subject: rpms/fantasdic/devel
	fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch, NONE,
	1.1 fantasdic.spec, 1.6, 1.7
Message-ID: <20090926170638.076D911C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/fantasdic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665

Modified Files:
	fantasdic.spec 
Added Files:
	fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.7.beta7
- Add workaround for ruby-gnome2-Bugs-2865895


fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch:
 result_text_view.rb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch ---
--- fantasdic-1.0-beta7/lib/fantasdic/ui/result_text_view.rb.orig	2009-03-25 01:14:57.000000000 +0900
+++ fantasdic-1.0-beta7/lib/fantasdic/ui/result_text_view.rb	2009-09-27 01:32:54.000000000 +0900
@@ -544,10 +544,10 @@
 
                 window = self.get_window(Gtk::TextView::WINDOW_TEXT)
 
-                window.cursor = if @hovering
-                    @hand_cursor
+                if @hovering
+                    window.set_cursor(@hand_cursor)
                 else
-                    @regular_cursor
+                    window.set_cursor(@regular_cursor)
                 end
             end
         end


Index: fantasdic.spec
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/devel/fantasdic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fantasdic.spec	24 Jul 2009 17:04:13 -0000	1.6
+++ fantasdic.spec	26 Sep 2009 17:06:37 -0000	1.7
@@ -5,7 +5,7 @@
 %define		betaver		beta7
 %define		rubyabi		1.8
 
-%define		fedorarel	6
+%define		fedorarel	7
 
 
 %define		fullrel		%{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -19,6 +19,8 @@ Group:		Applications/Text
 License:	GPLv2+
 URL:		http://www.gnome.org/projects/fantasdic/
 Source0:	http://www.mblondel.org/files/fantasdic/%{name}-%{mainver}%{?betaver:-%betaver}.tar.gz
+# ruby-gnome2-Bugs-2865895
+Patch0:		fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -48,6 +50,7 @@ Fantasdic is Free Software.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{?betaver:-%betaver}
+%patch0 -p1
 
 %{__chmod} 0644 tools/*.rb
 %{__sed} -i.path -e 's|%{_bindir}/||' fantasdic.desktop
@@ -166,6 +169,9 @@ exit 0
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.7.beta7
+- Add workaround for ruby-gnome2-Bugs-2865895
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.6.beta7
 - F-12: Mass rebuild
 



From cebbert at fedoraproject.org  Sat Sep 26 17:17:47 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 26 Sep 2009 17:17:47 +0000 (UTC)
Subject: rpms/kernel/F-10
	appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.93, 1.1206.2.94
Message-ID: <20090926171747.F1FB911C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19208

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch 
Log Message:
Backport "appletalk: Fix skb leak when ipddp interface is not loaded"
  (fixes CVE-2009-2903)

appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch:
 drivers/net/appletalk/ipddp.c |    3 --
 net/appletalk/aarp.c          |   16 +++++++++-----
 net/appletalk/ddp.c           |   47 +++++++++++++++++++++---------------------
 3 files changed, 36 insertions(+), 30 deletions(-)

--- NEW FILE appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch ---
From: Arnaldo Carvalho de Melo <acme at redhat.com>
Date: Fri, 11 Sep 2009 18:35:22 +0000 (-0700)
Subject: Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ffcfb8db540ff879c2a85bf7e404954281443414

Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded

[ backport to 2.6.27 : Chuck Ebbert <cebbert at redhat.com ]

And also do a better job of returning proper NET_{RX,XMIT}_ values.

Based on a patch and suggestions by Mark Smith.

This fixes CVE-2009-2903

Reported-by: Mark Smith <lk-netdev at lk-netdev.nosense.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index bea87da..aaf14d3 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -173,8 +173,7 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
 	((struct net_device_stats *) dev->priv)->tx_packets++;
         ((struct net_device_stats *) dev->priv)->tx_bytes+=skb->len;
 
-        if(aarp_send_ddp(rt->dev, skb, &rt->at, NULL) < 0)
-                dev_kfree_skb(skb);
+	aarp_send_ddp(rt->dev, skb, &rt->at, NULL);
 
         return 0;
 }
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 89f99d3..9d4adfd 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -598,7 +598,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
 
 	/* Non ELAP we cannot do. */
 	if (dev->type != ARPHRD_ETHER)
-		return -1;
+		goto free_it;
 
 	skb->dev = dev;
 	skb->protocol = htons(ETH_P_ATALK);
@@ -633,7 +633,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
 	if (!a) {
 		/* Whoops slipped... good job it's an unreliable protocol 8) */
 		write_unlock_bh(&aarp_lock);
-		return -1;
+		goto free_it;
 	}
 
 	/* Set up the queue */
@@ -662,15 +662,21 @@ out_unlock:
 	write_unlock_bh(&aarp_lock);
 
 	/* Tell the ddp layer we have taken over for this frame. */
-	return 0;
+	goto sent;
 
 sendit:
 	if (skb->sk)
 		skb->priority = skb->sk->sk_priority;
-	dev_queue_xmit(skb);
+	if (dev_queue_xmit(skb))
+		goto drop;
 sent:
-	return 1;
+	return NET_XMIT_SUCCESS;
+free_it:
+	kfree_skb(skb);
+drop:
+	return NET_XMIT_DROP;
 }
+EXPORT_SYMBOL(aarp_send_ddp);
 
 /*
  *	An entry in the aarp unresolved queue has become resolved. Send
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 0d42d5d..4a6ff2b 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1277,8 +1277,10 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
 	struct net_device_stats *stats;
 
 	/* This needs to be able to handle ipddp"N" devices */
-	if (!dev)
-		return -ENODEV;
+	if (!dev) {
+		kfree_skb(skb);
+		return NET_RX_DROP;
+	}
 
 	skb->protocol = htons(ETH_P_IP);
 	skb_pull(skb, 13);
@@ -1288,8 +1290,7 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
 	stats = dev->priv;
 	stats->rx_packets++;
 	stats->rx_bytes += skb->len + 13;
-	netif_rx(skb);  /* Send the SKB up to a higher place. */
-	return 0;
+	return netif_rx(skb);  /* Send the SKB up to a higher place. */
 }
 #else
 /* make it easy for gcc to optimize this test out, i.e. kill the code */
@@ -1297,9 +1298,8 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
 #define handle_ip_over_ddp(skb) 0
 #endif
 
-static void atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
-			       struct ddpehdr *ddp, __u16 len_hops,
-			       int origlen)
+static int atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
+			      struct ddpehdr *ddp, __u16 len_hops, int origlen)
 {
 	struct atalk_route *rt;
 	struct atalk_addr ta;
@@ -1366,8 +1366,6 @@ static void atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
 		/* 22 bytes - 12 ether, 2 len, 3 802.2 5 snap */
 		struct sk_buff *nskb = skb_realloc_headroom(skb, 32);
 		kfree_skb(skb);
-		if (!nskb)
-			goto out;
 		skb = nskb;
 	} else
 		skb = skb_unshare(skb, GFP_ATOMIC);
@@ -1376,12 +1374,16 @@ static void atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
 	 * If the buffer didn't vanish into the lack of space bitbucket we can
 	 * send it.
 	 */
-	if (skb && aarp_send_ddp(rt->dev, skb, &ta, NULL) == -1)
-		goto free_it;
-out:
-	return;
+	if (skb == NULL)
+		goto drop;
+
+	if (aarp_send_ddp(rt->dev, skb, &ta, NULL) == NET_XMIT_DROP)
+		return NET_RX_DROP;
+	return NET_XMIT_SUCCESS;
 free_it:
 	kfree_skb(skb);
+drop:
+	return NET_RX_DROP;
 }
 
 /**
@@ -1455,8 +1457,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev,
 		/* Not ours, so we route the packet via the correct
 		 * AppleTalk iface
 		 */
-		atalk_route_packet(skb, dev, ddp, len_hops, origlen);
-		goto out;
+		return atalk_route_packet(skb, dev, ddp, len_hops, origlen);
 	}
 
 	/* if IP over DDP is not selected this code will be optimized out */
@@ -1663,10 +1664,10 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 		if (skb2) {
 			loopback = 1;
 			SOCK_DEBUG(sk, "SK %p: send out(copy).\n", sk);
-			if (aarp_send_ddp(dev, skb2,
-					  &usat->sat_addr, NULL) == -1)
-				kfree_skb(skb2);
-				/* else queued/sent above in the aarp queue */
+			/*
+			 * If it fails it is queued/sent above in the aarp queue
+			 */
+			aarp_send_ddp(dev, skb2, &usat->sat_addr, NULL);
 		}
 	}
 
@@ -1696,9 +1697,10 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 		    usat = &gsat;
 		}
 
-		if (aarp_send_ddp(dev, skb, &usat->sat_addr, NULL) == -1)
-			kfree_skb(skb);
-		/* else queued/sent above in the aarp queue */
+		/*
+		 * If it fails it is queued/sent above in the aarp queue
+		 */
+		aarp_send_ddp(dev, skb, &usat->sat_addr, NULL);
 	}
 	SOCK_DEBUG(sk, "SK %p: Done write (%Zd).\n", sk, len);
 
@@ -1877,7 +1879,6 @@ static struct packet_type ppptalk_packet_type __read_mostly = {
 static unsigned char ddp_snap_id[] = { 0x08, 0x00, 0x07, 0x80, 0x9B };
 
 /* Export symbols for use by drivers when AppleTalk is a module */
-EXPORT_SYMBOL(aarp_send_ddp);
 EXPORT_SYMBOL(atrtr_get_dev);
 EXPORT_SYMBOL(atalk_find_dev_addr);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.93
retrieving revision 1.1206.2.94
diff -u -p -r1.1206.2.93 -r1.1206.2.94
--- kernel.spec	26 Sep 2009 16:20:45 -0000	1.1206.2.93
+++ kernel.spec	26 Sep 2009 17:17:46 -0000	1.1206.2.94
@@ -786,6 +786,9 @@ Patch15002: linux-2.6-ppc64-vs-broadcom-
 # kvm hypercall must be from cpl0 on guest
 Patch15100: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
 
+# appletalk: fix skb leak (CVE-2009-2903)
+Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1418,9 +1421,12 @@ ApplyPatch linux-2.6-ppc64-vs-broadcom.p
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
-# kvm hypercall must be from cpl0 on guest
+# kvm hypercall must be from cpl0 on guest (CVE-2009-3290)
 ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
 
+# appletalk: fix skb leak (CVE-2009-2903)
+ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1996,8 +2002,13 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.94
+- Backport "appletalk: Fix skb leak when ipddp interface is not loaded"
+  (fixes CVE-2009-2903)
+
 * Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.93
 - Backport "KVM: x86: Disallow hypercalls for guest callers in rings > 0"
+  (fixes CVE-2009-3290)
 
 * Thu Sep 24 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.92
 - Linux 2.6.27.35



From emaldonado at fedoraproject.org  Sat Sep 26 17:18:23 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Sep 2009 17:18:23 +0000 (UTC)
Subject: rpms/nss/devel system-pkcs11.txt,1.1,1.2
Message-ID: <20090926171823.C8E4D11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19362

Modified Files:
	system-pkcs11.txt 
Log Message:
Fix the configdir to be the system one


Index: system-pkcs11.txt
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/system-pkcs11.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-pkcs11.txt	19 Sep 2009 16:27:11 -0000	1.1
+++ system-pkcs11.txt	26 Sep 2009 17:18:23 -0000	1.2
@@ -1,5 +1,5 @@
 library=
 name=NSS Internal PKCS #11 Module
-parameters=configdir='sql:/home/test/.pki/nssdb'  certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+parameters=configdir='sql:/etc/pki/nssdb'  certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
 NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
 



From emaldonado at fedoraproject.org  Sat Sep 26 17:19:43 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Sep 2009 17:19:43 +0000 (UTC)
Subject: rpms/nss/devel setup-nsssysinit.sh,NONE,1.1
Message-ID: <20090926171943.61DA811C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19700

Added Files:
	setup-nsssysinit.sh 
Log Message:
nss-sysinit activation script


--- NEW FILE setup-nsssysinit.sh ---
#!/bin/sh
#
# Turns on or off the nss-sysinit module db by editing the
# global PKCS #11 congiguration file.
#
# This script can be invoked by the user as super user.
# It is invoked at nss-sysinit post install time with argument on
# and at nss-sysinit pre uninstall with argument off. 
#
usage()
{
  cat <<EOF
Usage: setup-nsssysinit [on|off]
  on  - turns on nsssysinit
  off - turns off nsssysinit
EOF
  exit $1
}

# validate
if test $# -eq 0; then
  usage 1 1>&2
fi

on="1"
case "$1" in
  on  | ON )  on="1";;
  off | OFF ) on="";;
  * )         usage 1 1>&2;;
esac

# the system-wide configuration file
p11conf="/etc/pki/nssdb/pkcs11.txt"
# must exist, otherwise report it and exit with failure
if [ ! -f $p11conf ]; then
  echo "Could not find ${p11conf}"
  exit 1
fi

# turn on or off
if [ on = "1" ]; then 
  cat ${p11conf} | sed -e 's/^library=$/library=libnsssysinit.so/' \
                       -e 'g/^NSS/ s; Flags=internal,critical; Flags=internal,moduleDBOnly,critical;' > \
                       ${p11conf}.on
  mv ${p11conf}.on ${p11conf}
else
  if [ `grep "^library=libnsssysinit" ${p11conf}` == ""]; then
    exit 0
  if
  cat ${p11conf} | sed -e 's/^library=libnsssysinit.so/library=/' \
                       -e 'g/^NSS/ s; Flags=internal,moduleDBOnly,critical; Flags=internal,critical;' > \
                       ${p11conf}.off
  mv ${p11conf}.off ${p11conf}
fi




From emaldonado at fedoraproject.org  Sat Sep 26 17:22:20 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Sep 2009 17:22:20 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.118,1.119
Message-ID: <20090926172220.6798811C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20373

Modified Files:
	nss.spec 
Log Message:
Add nss-sysinit activation/deactivation script


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- nss.spec	19 Sep 2009 16:35:44 -0000	1.118
+++ nss.spec	26 Sep 2009 17:22:20 -0000	1.119
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          9%{?dist}
+Release:          10%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -34,6 +34,7 @@ Source5:          blank-secmod.db
 Source6:          blank-cert9.db
 Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
+Source9:          setup-nsssysinit.sh
 Source12:         %{name}-pem-20090907.tar.bz2
 
 Patch2:           nss-nolocalsql.patch
@@ -186,6 +187,9 @@ export NSS_VPATCH
 
 chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
+%{__cat} %{SOURCE9} > ./mozilla/dist/pkgconfig/setup-nsssysinit.sh
+chmod 755 ./mozilla/dist/pkgconfig/setup-nsssysinit.sh
+
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
 
@@ -295,6 +299,8 @@ done
 # Copy the package configuration files
 %{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
 %{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
+# Copy the pkcs #11 configuration script
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
 
 #remove the nss-util-devel headers
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h
@@ -340,9 +346,15 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig 
+%post sysinit
+%{_bindir}/setup-nsssysinit.sh on
+
+%preun sysinit
+%{_bindir}/setup-nsssysinit.sh off
 
 %files
 %defattr(-,root,root)
@@ -362,6 +374,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert9.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key4.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/pkcs11.txt
+%{_bindir}/setup-nsssysinit.sh
 
 %files tools
 %defattr(-,root,root)
@@ -456,6 +469,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Sep 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-10
+- Add nss-sysinit activation/deactivation script
+
 * Fri Sep 18 2009 Elio Maldonado<emaldona at redhat.com - 3.12.4-9
 - Install blank databases and configuration file for system shared database
 - nsssysinit queries system for fips mode before relying on environment variable



From cebbert at fedoraproject.org  Sat Sep 26 17:49:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 26 Sep 2009 17:49:02 +0000 (UTC)
Subject: rpms/kernel/F-11
	kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch,
	NONE,
	1.1 kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch,
	NONE,
	1.1 kvm-vmx-check-cpl-before-emulating-debug-register-access.patch,
	NONE, 1.1 kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch,
	NONE,
	1.1 kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch,
	NONE, 1.1 kernel.spec, 1.1743, 1.1744
Message-ID: <20090926174902.BE60511C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27947

Modified Files:
	kernel.spec 
Added Files:
	kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch 
	kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch 
	kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch 
	kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch 
Log Message:
KVM fixes from 2.6.31.1, including fix for CVE-2009-3290

kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch:
 kvmclock.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch ---
>From a20316d2aa41a8f4fd171648bad8f044f6060826 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Mon, 31 Aug 2009 03:04:31 -0400
Subject: KVM guest: fix bogus wallclock physical address calculation

From: Glauber Costa <glommer at redhat.com>

commit a20316d2aa41a8f4fd171648bad8f044f6060826 upstream.

The use of __pa() to calculate the address of a C-visible symbol
is wrong, and can lead to unpredictable results. See arch/x86/include/asm/page.h
for details.

It should be replaced with __pa_symbol(), that does the correct math here,
by taking relocations into account.  This ensures the correct wallclock data
structure physical address is passed to the hypervisor.

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/kernel/kvmclock.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -50,8 +50,8 @@ static unsigned long kvm_get_wallclock(v
 	struct timespec ts;
 	int low, high;
 
-	low = (int)__pa(&wall_clock);
-	high = ((u64)__pa(&wall_clock) >> 32);
+	low = (int)__pa_symbol(&wall_clock);
+	high = ((u64)__pa_symbol(&wall_clock) >> 32);
 	native_write_msr(MSR_KVM_WALL_CLOCK, low, high);
 
 	vcpu_time = &get_cpu_var(hv_clock);

kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch:
 mmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch ---
>From 3b80fffe2b31fb716d3ebe729c54464ee7856723 Mon Sep 17 00:00:00 2001
From: Izik Eidus <ieidus at redhat.com>
Date: Tue, 28 Jul 2009 15:26:58 -0300
Subject: KVM: MMU: make __kvm_mmu_free_some_pages handle empty list

From: Izik Eidus <ieidus at redhat.com>

commit 3b80fffe2b31fb716d3ebe729c54464ee7856723 upstream.

First check if the list is empty before attempting to look at list
entries.

Signed-off-by: Izik Eidus <ieidus at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/kvm/mmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2612,7 +2612,8 @@ EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page
 
 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
 {
-	while (vcpu->kvm->arch.n_free_mmu_pages < KVM_REFILL_PAGES) {
+	while (vcpu->kvm->arch.n_free_mmu_pages < KVM_REFILL_PAGES &&
+	       !list_empty(&vcpu->kvm->arch.active_mmu_pages)) {
 		struct kvm_mmu_page *sp;
 
 		sp = container_of(vcpu->kvm->arch.active_mmu_pages.prev,

kvm-vmx-check-cpl-before-emulating-debug-register-access.patch:
 include/asm/kvm_host.h |    1 +
 kvm/vmx.c              |    2 ++
 kvm/x86.c              |   13 +++++++++++++
 3 files changed, 16 insertions(+)

--- NEW FILE kvm-vmx-check-cpl-before-emulating-debug-register-access.patch ---
>From 0a79b009525b160081d75cef5dbf45817956acf2 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi at redhat.com>
Date: Tue, 1 Sep 2009 12:03:25 +0300
Subject: KVM: VMX: Check cpl before emulating debug register access

From: Avi Kivity <avi at redhat.com>

commit 0a79b009525b160081d75cef5dbf45817956acf2 upstream.

Debug registers may only be accessed from cpl 0.  Unfortunately, vmx will
code to emulate the instruction even though it was issued from guest
userspace, possibly leading to an unexpected trap later.

Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/vmx.c              |    2 ++
 arch/x86/kvm/x86.c              |   13 +++++++++++++
 3 files changed, 16 insertions(+)

--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -620,6 +620,7 @@ void kvm_queue_exception(struct kvm_vcpu
 void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);
 void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long cr2,
 			   u32 error_code);
+bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl);
 
 int kvm_pic_set_irq(void *opaque, int irq, int level);
 
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2865,6 +2865,8 @@ static int handle_dr(struct kvm_vcpu *vc
 	unsigned long val;
 	int dr, reg;
 
+	if (!kvm_require_cpl(vcpu, 0))
+		return 1;
 	dr = vmcs_readl(GUEST_DR7);
 	if (dr & DR7_GD) {
 		/*
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -217,6 +217,19 @@ static void __queue_exception(struct kvm
 }
 
 /*
+ * Checks if cpl <= required_cpl; if true, return true.  Otherwise queue
+ * a #GP and return false.
+ */
+bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl)
+{
+	if (kvm_x86_ops->get_cpl(vcpu) <= required_cpl)
+		return true;
+	kvm_queue_exception_e(vcpu, GP_VECTOR, 0);
+	return false;
+}
+EXPORT_SYMBOL_GPL(kvm_require_cpl);
+
+/*
  * Load the pae pdptrs.  Return true is they are all valid.
  */
 int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3)

kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch:
 vmx.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch ---
>From 5fff7d270bd6a4759b6d663741b729cdee370257 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb at redhat.com>
Date: Thu, 27 Aug 2009 18:41:30 +0300
Subject: KVM: VMX: Fix cr8 exiting control clobbering by EPT

From: Gleb Natapov <gleb at redhat.com>

commit 5fff7d270bd6a4759b6d663741b729cdee370257 upstream.

Don't call adjust_vmx_controls() two times for the same control.
It restores options that were dropped earlier.  This loses us the cr8
exit control, which causes a massive performance regression Windows x64.

Signed-off-by: Gleb Natapov <gleb at redhat.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/kvm/vmx.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1206,12 +1206,9 @@ static __init int setup_vmcs_config(stru
 	if (_cpu_based_2nd_exec_control & SECONDARY_EXEC_ENABLE_EPT) {
 		/* CR3 accesses and invlpg don't need to cause VM Exits when EPT
 		   enabled */
-		min &= ~(CPU_BASED_CR3_LOAD_EXITING |
-			 CPU_BASED_CR3_STORE_EXITING |
-			 CPU_BASED_INVLPG_EXITING);
-		if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS,
-					&_cpu_based_exec_control) < 0)
-			return -EIO;
+		_cpu_based_exec_control &= ~(CPU_BASED_CR3_LOAD_EXITING |
+					     CPU_BASED_CR3_STORE_EXITING |
+					     CPU_BASED_INVLPG_EXITING);
 		rdmsr(MSR_IA32_VMX_EPT_VPID_CAP,
 		      vmx_capability.ept, vmx_capability.vpid);
 	}

kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch:
 arch/x86/kvm/x86.c       |    6 ++++++
 include/linux/kvm_para.h |    1 +
 2 files changed, 7 insertions(+)

--- NEW FILE kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch ---
>From 07708c4af1346ab1521b26a202f438366b7bcffd Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka at siemens.com>
Date: Mon, 3 Aug 2009 18:43:28 +0200
Subject: KVM: x86: Disallow hypercalls for guest callers in rings > 0

From: Jan Kiszka <jan.kiszka at siemens.com>

commit 07708c4af1346ab1521b26a202f438366b7bcffd upstream.

So far unprivileged guest callers running in ring 3 can issue, e.g., MMU
hypercalls. Normally, such callers cannot provide any hand-crafted MMU
command structure as it has to be passed by its physical address, but
they can still crash the guest kernel by passing random addresses.

To close the hole, this patch considers hypercalls valid only if issued
from guest ring 0. This may still be relaxed on a per-hypercall base in
the future once required.

Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/kvm/x86.c       |    6 ++++++
 include/linux/kvm_para.h |    1 +
 2 files changed, 7 insertions(+)

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2885,6 +2885,11 @@ int kvm_emulate_hypercall(struct kvm_vcp
 		a3 &= 0xFFFFFFFF;
 	}
 
+	if (kvm_x86_ops->get_cpl(vcpu) != 0) {
+		ret = -KVM_EPERM;
+		goto out;
+	}
+
 	switch (nr) {
 	case KVM_HC_VAPIC_POLL_IRQ:
 		ret = 0;
@@ -2896,6 +2901,7 @@ int kvm_emulate_hypercall(struct kvm_vcp
 		ret = -KVM_ENOSYS;
 		break;
 	}
+out:
 	kvm_register_write(vcpu, VCPU_REGS_RAX, ret);
 	++vcpu->stat.hypercalls;
 	return r;
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -13,6 +13,7 @@
 #define KVM_ENOSYS		1000
 #define KVM_EFAULT		EFAULT
 #define KVM_E2BIG		E2BIG
+#define KVM_EPERM		EPERM
 
 #define KVM_HC_VAPIC_POLL_IRQ		1
 #define KVM_HC_MMU_OP			2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1743
retrieving revision 1.1744
diff -u -p -r1.1743 -r1.1744
--- kernel.spec	25 Sep 2009 07:59:50 -0000	1.1743
+++ kernel.spec	26 Sep 2009 17:49:00 -0000	1.1744
@@ -751,6 +751,13 @@ Patch14200: hostap-revert-toxic-part-of-
 # fix cfq performance regression in 2.6.30
 Patch14300: linux-2.6-cfq-choose-new-next-req.patch
 
+# kvm fixes from 2.6.31.1, including fix for CVE-2009-3290
+Patch14400: kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch
+Patch14401: kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch
+Patch14402: kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+Patch14403: kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
+Patch14404: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1398,6 +1405,13 @@ ApplyPatch hostap-revert-toxic-part-of-c
 # fix cfq performance regression in 2.6.30
 ApplyPatch linux-2.6-cfq-choose-new-next-req.patch
 
+# kvm fixes from 2.6.31.1, including fix for CVE-2009-3290
+ApplyPatch kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch
+ApplyPatch kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch
+ApplyPatch kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+ApplyPatch kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
+ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1986,6 +2000,9 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-65
+- KVM fixes from 2.6.31.1, including fix for CVE-2009-3290
+
 * Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-64
 - Fix serious CFQ performance regression.
 



From rdieter at fedoraproject.org  Sat Sep 26 18:03:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 26 Sep 2009 18:03:02 +0000 (UTC)
Subject: rpms/k3b/F-12 k3b-1.0.3-umount.patch, 1.3,
	1.4 k3b-1.0.4-kde#151816.patch, 1.2,
	1.3 k3b-1.0.4-manualbufsize.patch, 1.2,
	1.3 k3b-1.0.5-desktopfile.patch, NONE,
	1.1 k3b-1.0.5-hidden.patch, 1.4, 1.5 k3b-1.0.5-kde#156684.patch,
	1.2, 1.3 k3brc, 1.3, 1.4 reload-for-verification.diff, NONE,
	1.1 .cvsignore, 1.22, 1.23 k3b.spec, 1.76, 1.77 sources, 1.23, 1.24
Message-ID: <20090926180302.5BD3711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29656

Modified Files:
	.cvsignore k3b.spec sources 
Added Files:
	k3b-1.0.3-umount.patch k3b-1.0.4-kde#151816.patch 
	k3b-1.0.4-manualbufsize.patch k3b-1.0.5-desktopfile.patch 
	k3b-1.0.5-hidden.patch k3b-1.0.5-kde#156684.patch k3brc 
	reload-for-verification.diff 
Log Message:
revert to k3b-1.0.5

* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-10
- Epoch: 1 (increment Release too, to minimize confusion)
- -common: noarch subpkg


k3b-1.0.3-umount.patch:
 k3bglobals.cpp |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

Index: k3b-1.0.3-umount.patch
===================================================================
RCS file: k3b-1.0.3-umount.patch
diff -N k3b-1.0.3-umount.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.3-umount.patch	26 Sep 2009 18:03:01 -0000	1.4
@@ -0,0 +1,48 @@
+--- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount	2007-07-27 21:26:30.000000000 +0200
++++ k3b-1.0.3/libk3b/core/k3bglobals.cpp	2007-07-27 21:31:26.000000000 +0200
+@@ -569,7 +569,24 @@
+       return true;
+   }
+ 
+-  // now try pmount
++#ifdef HAVE_HAL
++    if (!K3bDevice::HalConnection::instance()->unmount( dev ))
++      return true;
++#endif
++
++  QString gumountBin = K3b::findExe( "gnome-umount" );
++  if( !gumountBin.isEmpty() ) {
++    KProcess p;
++    p << gumountBin;
++    p << "-u";
++    p << "-d";
++    p << dev->blockDeviceName();
++    p.start( KProcess::Block );
++    if( !p.exitStatus() )
++      return true;
++  }
++  
++// now try pmount
+   QString pumountBin = K3b::findExe( "pumount" );
+   if( !pumountBin.isEmpty() ) {
+     KProcess p;
+@@ -577,15 +592,11 @@
+     p << "-l"; // lazy unmount
+     p << dev->blockDeviceName();
+     p.start( KProcess::Block );
+-    return !p.exitStatus();
+-  }
+-  else {
+-#ifdef HAVE_HAL
+-    return !K3bDevice::HalConnection::instance()->unmount( dev );
+-#else
+-    return false;
+-#endif
++    if( !p.exitStatus() )
++      return true;
+   }
++
++  return false;
+ }
+ 
+ 

k3b-1.0.4-kde#151816.patch:
 ChangeLog                          |    3 --
 libk3b/jobs/k3bverificationjob.cpp |   38 ++++++++++++-------------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

Index: k3b-1.0.4-kde#151816.patch
===================================================================
RCS file: k3b-1.0.4-kde#151816.patch
diff -N k3b-1.0.4-kde#151816.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.4-kde#151816.patch	26 Sep 2009 18:03:01 -0000	1.3
@@ -0,0 +1,90 @@
+diff -ur k3b-1.0.4/ChangeLog k3b-1.0.4-verification-always-reload/ChangeLog
+--- k3b-1.0.4/ChangeLog	2007-11-02 10:55:57.000000000 +0100
++++ k3b-1.0.4-verification-always-reload/ChangeLog	2007-12-07 19:33:18.000000000 +0100
+@@ -4,9 +4,6 @@
+  * Unmount medium before DVD formatting
+  * Silently (without introducing new strings for translation) allow the burning of files
+    bigger than 4 GB with appropriate versions of genisoimage or mkisofs.
+- * Do only reload the medium before verification if necessary, i.e. if the newly written
+-   track cannot be read otherwise (many old drives depend on this). Hopefully this will
+-   at least work around the aweful "DMA disabled" bug for many users.
+ 	
+ 1.0.3
+ =====
+diff -ur k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp
+--- k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp	2007-11-02 10:55:53.000000000 +0100
++++ k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp	2007-07-21 21:53:53.000000000 +0200
+@@ -84,8 +84,6 @@
+   K3bPipe pipe;
+ 
+   bool readSuccessful;
+-
+-  bool mediumHasBeenReloaded;
+ };
+ 
+ 
+@@ -151,13 +149,11 @@
+   d->currentTrackIndex = 0;
+   d->alreadyReadSectors = 0;
+ 
+-  emit newTask( i18n("Checking medium") );
++  // first we need to reload and mount the device
++  emit newTask( i18n("Reloading the medium") );
+ 
+-  d->mediumHasBeenReloaded = false;
+-  connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
+-           SIGNAL(finished(K3bDevice::DeviceHandler*)),
+-           this,
+-           SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
++  connect( K3bDevice::reload( d->device ), SIGNAL(finished(bool)),
++	   this, SLOT(slotMediaReloaded(bool)) );
+ }
+ 
+ 
+@@ -169,8 +165,6 @@
+ 		  K3bDevice::MEDIA_WRITABLE,
+ 		  i18n("Unable to Close the Tray") );
+ 
+-  d->mediumHasBeenReloaded = true;
+-
+   emit newTask( i18n("Checking medium") );
+ 
+   connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
+@@ -191,6 +185,12 @@
+   d->toc = dh->toc();
+   d->totalSectors = 0;
+ 
++  if ( d->toc.isEmpty() ) {
++      emit infoMessage( i18n( "No tracks to verify found." ), ERROR );
++      jobFinished( false );
++      return;
++  }
++
+   // just to be sure check if we actually have all the tracks
+   int i = 0;
+   for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
+@@ -201,21 +201,9 @@
+       (*it).trackNumber = d->toc.count();
+ 
+     if( (int)d->toc.count() < (*it).trackNumber ) {
+-        if ( d->mediumHasBeenReloaded ) {
+-            emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
+-                              .arg( "Specified track number not found on medium" ), ERROR );
+-            jobFinished( false );
+-            return;
+-        }
+-        else {
+-            // many drives need to reload the medium to return to a proper state
+-            emit newTask( i18n("Reloading the medium") );
+-            connect( K3bDevice::reload( d->device ),
+-                     SIGNAL(finished(bool)),
+-                     this,
+-                     SLOT(slotMediaReloaded(bool)) );
+-            return;
+-        }
++      emit infoMessage( i18n("Internal Error: Verification job improperly initialized"), ERROR );
++      jobFinished( false );
++      return;
+     }
+ 
+     d->totalSectors += trackLength( i );

k3b-1.0.4-manualbufsize.patch:
 k3bglobalsettings.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: k3b-1.0.4-manualbufsize.patch
===================================================================
RCS file: k3b-1.0.4-manualbufsize.patch
diff -N k3b-1.0.4-manualbufsize.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.4-manualbufsize.patch	26 Sep 2009 18:03:01 -0000	1.3
@@ -0,0 +1,21 @@
+diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
+--- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize	2007-11-02 10:55:39.000000000 +0100
++++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp	2008-04-22 14:15:06.000000000 +0200
+@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
+   : m_eject(true),
+     m_burnfree(true),
+     m_overburn(false),
+-    m_useManualBufferSize(false),
++    m_useManualBufferSize(true),
+     m_bufferSize(4),
+     m_force(false)
+ {
+@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
+   m_eject = !c->readBoolEntry( "No cd eject", false );
+   m_burnfree = c->readBoolEntry( "burnfree", true );
+   m_overburn = c->readBoolEntry( "Allow overburning", false );
+-  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
++  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
+   m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
+   m_force = c->readBoolEntry( "Force unsafe operations", false );
+ 

k3b-1.0.5-desktopfile.patch:
 k3b.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE k3b-1.0.5-desktopfile.patch ---
diff -up k3b-1.0.5/src/k3b.desktop.dt k3b-1.0.5/src/k3b.desktop
--- k3b-1.0.5/src/k3b.desktop.dt	2008-05-27 03:24:04.000000000 -0500
+++ k3b-1.0.5/src/k3b.desktop	2009-06-13 23:12:17.077063401 -0500
@@ -117,8 +117,8 @@ Name=K3b
 Name[ar]= K3b
 Name[bn]=??-????-??
 Name[hi]=??3??
-MimeType=application/x-k3b
+MimeType=application/x-k3b;
 X-KDE-StartupNotify=true
-X-KDE-NativeMimeType=application/x-k3b;application/x-iso
+X-KDE-NativeMimeType=application/x-k3b;application/x-iso;
 Categories=KDE;Application;AudioVideo;DiscBurning;
 X-DCOP-ServiceType=Unique

k3b-1.0.5-hidden.patch:
 Makefile.am |    5 +----
 Makefile.in |    6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

Index: k3b-1.0.5-hidden.patch
===================================================================
RCS file: k3b-1.0.5-hidden.patch
diff -N k3b-1.0.5-hidden.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.5-hidden.patch	26 Sep 2009 18:03:01 -0000	1.5
@@ -0,0 +1,31 @@
+diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
+--- k3b-1.0.5/src/Makefile.in.hidden	2008-05-27 03:34:44.000000000 -0500
++++ k3b-1.0.5/src/Makefile.in	2008-08-27 14:18:54.000000000 -0500
+@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
+ 	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+-xdg_apps_DATA = k3b.desktop
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
++#silent_DATA = k3b-iso.desktop k3b-cue.desktop
++#silentdir = $(kde_appsdir)/.hidden/
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:
+diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
+--- k3b-1.0.5/src/Makefile.am.hidden	2008-05-27 03:24:04.000000000 -0500
++++ k3b-1.0.5/src/Makefile.am	2008-08-27 14:13:36.000000000 -0500
+@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+ 
+-xdg_apps_DATA = k3b.desktop
+-
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:

k3b-1.0.5-kde#156684.patch:
 k3bcdrecordwriter.cpp |    2 ++
 1 file changed, 2 insertions(+)

Index: k3b-1.0.5-kde#156684.patch
===================================================================
RCS file: k3b-1.0.5-kde#156684.patch
diff -N k3b-1.0.5-kde#156684.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.5-kde#156684.patch	26 Sep 2009 18:03:01 -0000	1.3
@@ -0,0 +1,15 @@
+diff -up k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684 k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp
+--- k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684	2008-05-27 03:24:19.000000000 -0500
++++ k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp	2008-07-31 08:17:39.000000000 -0500
+@@ -243,9 +243,11 @@ void K3bCdrecordWriter::prepareProcess()
+     *m_process << "textfile=" + d->cdTextFile->name();
+   }
+ 
++#if 0
+   if( k3bcore->globalSettings()->ejectMedia() &&
+       !m_forceNoEject )
+     *m_process << "-eject";
++#endif
+ 
+   bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
+   if( manualBufferSize ) {


Index: k3brc
===================================================================
RCS file: k3brc
diff -N k3brc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ k3brc	26 Sep 2009 18:03:01 -0000	1.4
@@ -0,0 +1,6 @@
+[General Options]
+check system config=false
+Manual buffer size=true
+
+[Notification Messages]
+Don't prompt me again.=No

reload-for-verification.diff:
 k3bverificationjob.cpp |   14 ++++++++++++++
 k3bverificationjob.h   |    1 +
 2 files changed, 15 insertions(+)

--- NEW FILE reload-for-verification.diff ---
--- libk3b/jobs/k3bverificationjob.cpp.sav	2008-05-27 10:24:20.000000000 +0200
+++ libk3b/jobs/k3bverificationjob.cpp	2009-06-11 17:58:58.000000000 +0200
@@ -154,6 +154,20 @@ void K3bVerificationJob::start()
   emit newTask( i18n("Checking medium") );
 
   d->mediumHasBeenReloaded = false;
+  connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::LOAD, d->device ),
+           SIGNAL(finished(K3bDevice::DeviceHandler*)),
+           this,
+           SLOT(slotMediaLoaded()) );
+}
+
+void K3bVerificationJob::slotMediaLoaded()
+{
+    // we always need to wait for the medium. Otherwise the diskinfo below
+    // may run before the drive is ready!
+    waitForMedia( d->device,
+                  K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
+                  K3bDevice::MEDIA_WRITABLE );
+
   connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
            SIGNAL(finished(K3bDevice::DeviceHandler*)),
            this,
--- libk3b/jobs/k3bverificationjob.h.sav	2008-05-27 10:24:20.000000000 +0200
+++ libk3b/jobs/k3bverificationjob.h	2009-06-11 17:13:37.000000000 +0200
@@ -75,6 +75,7 @@ class K3bVerificationJob : public K3bJob
   void setGrownSessionSize( const K3b::Msf& );
 
  private slots:
+  void slotMediaLoaded();
   void slotMediaReloaded( bool success );
   void slotDiskInfoReady( K3bDevice::DeviceHandler* dh );
   void readTrack( int trackIndex );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	27 May 2009 13:30:33 -0000	1.22
+++ .cvsignore	26 Sep 2009 18:03:01 -0000	1.23
@@ -1 +1,2 @@
-k3b-1.66.0alpha2.tar.bz2
+k3b-1.0.5.tar.bz2
+k3b-i18n-1.0.5.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- k3b.spec	25 Jul 2009 04:15:18 -0000	1.76
+++ k3b.spec	26 Sep 2009 18:03:01 -0000	1.77
@@ -1,43 +1,104 @@
 
-%define pre alpha2
+## distro/release specific support
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define _with_hal --with-hal
+%endif
+
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
+# include sub pkgs
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+%define common 1
+%endif
+%define devel 1
+%define i18n 1
 
 Name:    k3b
 Summary: CD/DVD burning application
-Epoch:   0
-Version: 1.66.0
-Release: 4%{?dist}
+Epoch:   1
+Version: 1.0.5
+Release: 10%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
-URL:     http://www.k3b.org/
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
+URL:     http://www.k3b.org
+Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
+%{?i18n:Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: bugzilla/document
 ExcludeArch: s390 s390x
 
-# FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
+Source2: k3brc
 
-BuildRequires: cmake
+Patch2: k3b-1.0.3-umount.patch
+# manual bufsize (upstream?)
+Patch4: k3b-1.0.4-manualbufsize.patch
+
+# upstream patches
+# http://bugs.kde.org/151816 , k3b can't reload media for verification
+Patch100: k3b-1.0.4-kde#151816.patch
+# http://bugs.kde.org/156684 , alternative to patch100
+Patch101: k3b-1.0.5-kde#156684.patch
+# 3rd time is a charm, https://bugs.kde.org/show_bug.cgi?id=156684#c30 
+Patch102: reload-for-verification.diff
+# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
+# upstreamed 2008-08-27
+Patch105: k3b-1.0.5-hidden.patch
+# 
+Patch106: k3b-1.0.5-desktopfile.patch
+
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: desktop-file-utils
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
 BuildRequires: flac-devel
 BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: kdemultimedia-devel
 BuildRequires: libdvdread-devel
 BuildRequires: libmpcdec-devel
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libvorbis-devel
-# needed by k3bsetup
-#BuildRequires: polkit-qt-devel
 BuildRequires: taglib-devel
+BuildRequires: zlib-devel
+
+Obsoletes: k3b-extras < 0:1.0-1
+Provides:  k3b-extras = %{epoch}:%{version}-%{release} 
 
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%if 0%{?i18n}
+# imo, should be packaged separately, tis a shame to duplicate all 
+# this noarch build/data on *every* arch.  -- Rex
+Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
+Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
+%endif
+
+%if ! 0%{?devel}
+Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
+%endif
+
+Requires(post): coreutils
+Requires(postun): coreutils
+
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+%if 0%{?common}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%else
+Obsoletes: %{name}-common < %{epoch}:%{version}-%{release}
+Provides:  %{name}-common = %{epoch}:%{version}-%{release}
+%endif
 
 Requires: cdrecord mkisofs
+%if 0%{?fedora} > 3
 Requires(hint): cdrdao
 Requires(hint): dvd+rw-tools
+#Requires(hint): gnome-mount
+%endif
 
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
@@ -46,6 +107,14 @@ steps of the burning process the beginne
 automatic settings and the reasonable k3b defaults which allow a quick
 start.
 
+%package common
+Summary:  Common files of %{name}
+Group:    Applications/Archiving
+Requires: %{name} = %{epoch}:%{version}-%{release}
+BuildArch: noarch
+%description common
+{summary}.
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
@@ -56,34 +125,92 @@ Requires: %{name} = %{epoch}:%{version}-
 %package devel
 Summary: Files for the development of applications which will use %{name} 
 Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %description devel
 %{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?i18n:-a 1} -n %{name}-%{version}
+
+%patch2 -p1 -b .umount
+# set in k3brc too 
+%patch4 -p1 -b .manualbufsize
+
+#patch100 -p1 -b .kde#151816
+#patch101 -p1 -b .kde#156684
+%patch102 -p0 -b .kde#156684
+%patch105 -p1 -b .hidden
+%patch106 -p1 -b .desktopfile
 
 
 %build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} \
-  -DK3B_BUILD_K3BSETUP=OFF \
-  ..
+%configure \
+  --includedir=%{_includedir}/k3b \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-k3bsetup=no \
+  --without-cdrecord-suid-root \
+  --with-oggvorbis \
+  --with-flac \
+  --with-external-libsamplerate \
+  --with-libdvdread \
+  --with-musicbrainz \
+  --with-sndfile \
+  --without-ffmpeg --without-lame --without-libmad \
+  --with-musepack \
+  %{?_with_hal} %{!?_with_hal:--without-hal} 
+
+make %{?_smp_mflags}
+
+%if 0%{?i18n}
+# Build for i18n tarball
+pushd %{name}-i18n-%{version}
+%configure
+make %{?_smp_mflags}
 popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+%endif
 
 
 %install
 rm -rf %{buildroot}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install DESTDIR=%{buildroot}
+
+%if 0%{?i18n}
+make install DESTDIR=%{buildroot} -C %{name}-i18n-%{version}
+%endif
+
+%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
+
+# remove the .la files
+rm -f %{buildroot}%{_libdir}/libk3b*.la 
+
+# remove i18n for Plattdeutsch (Low Saxon)
+rm -fr %{buildroot}%{_datadir}/locale/nds
+
+%if 0%{?i18n}
+%find_lang k3b --with-kde
+%find_lang k3bsetup 
+%find_lang libk3b
+%find_lang libk3bdevice
+cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
+%endif
+
+# unpackaged files
+%if ! 0%{?devel}
+rm -rf %{buildroot}%{_includedir}/k3b/
+rm -f  %{buildroot}%{_libdir}/libk3b*.so
+%endif
 
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k3b.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b-cue.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b-iso.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
 
 
 %clean
@@ -94,62 +221,65 @@ rm -rf %{buildroot}
 
 %postun libs -p /sbin/ldconfig
 
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor ||:
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+%post %{?common:common}
+touch --no-create %{_datadir}/icons/hicolor ||:
 
-%postun
+%postun %{?common:common}
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
 fi
 
+%posttrans %{?common:common}
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+
 
-%files 
+%files %{?!common:-f all.lang}
 %defattr(-,root,root,-)
 %doc AUTHORS README COPYING TODO ChangeLog
-%{_kde4_bindir}/k3b
-%{_kde4_appsdir}/k3b/
-%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/k3b.desktop
-%{_kde4_datadir}/kde4/services/*.desktop
-%{_kde4_datadir}/kde4/services/*.protocol
-%{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop
-%{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
-%{_kde4_datadir}/sounds/k3b_*
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/*.so
+%{_bindir}/k3b
+%{_libdir}/kde3/*.so
+%{_libdir}/kde3/*.la
+
+%if 0%{?common}
+%files common -f all.lang
+%endif
+%{_datadir}/applications/kde/k3b-cue.desktop
+%{_datadir}/applications/kde/k3b-iso.desktop
+%{_datadir}/applications/kde/k3b.desktop
+%{_datadir}/apps/k3b/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+%{_datadir}/config/k3brc
+%{_datadir}/mimelnk/application/x-k3b.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/services/kfile_k3b.desktop
+%{_datadir}/services/videodvd.protocol
+%{_datadir}/sounds/k3b_*.wav
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libk3b*.so.*
+%{_libdir}/libk3b.so.3*
+%{_libdir}/libk3bdevice.so.5*
 
+%if 0%{?devel}
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_includedir}/k3b*
-%{_kde4_libdir}/libk3b*.so
+%{_includedir}/k3b/
+%{_libdir}/libk3b.so
+%{_libdir}/libk3bdevice.so
+%endif
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.66.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.66.0-3
-- -extras-freeworld avail now, drop Obsoletes
-
-* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.66.0-2
-- Obsoletes: k3b-extras-freeworld (at least until it's ready)
-
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.66.0-1
-- k3b-1.66.0 (alpha2)
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-10
+- Epoch: 1 (increment Release too, to minimize confusion)
+- -common: noarch subpkg
 
-* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.65.0-1
-- k3b-1.65.0 (alpha1)
+* Sat Jun 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-9
+- another try at a reload patch that works (kde#156684#c30)
 - optimize scriptlets
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.5-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	27 May 2009 13:30:33 -0000	1.23
+++ sources	26 Sep 2009 18:03:01 -0000	1.24
@@ -1 +1,2 @@
-60717ca718da93ee65f5fc2c0d9e8c71  k3b-1.66.0alpha2.tar.bz2
+e3b37d0d009af3dd149215d6ae0d54f3  k3b-1.0.5.tar.bz2
+610b1fd9356c89cbb38b6dda1f115c86  k3b-i18n-1.0.5.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 26 18:04:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 26 Sep 2009 18:04:51 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.76,1.77
Message-ID: <20090926180451.88E6B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32307

Modified Files:
	k3b.spec 
Log Message:
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.66.0-5
- Epoch: 1 (increment Release too, to minimize confusion)



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- k3b.spec	25 Jul 2009 04:15:18 -0000	1.76
+++ k3b.spec	26 Sep 2009 18:04:51 -0000	1.77
@@ -3,9 +3,9 @@
 
 Name:    k3b
 Summary: CD/DVD burning application
-Epoch:   0
+Epoch:   1
 Version: 1.66.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 ExcludeArch: s390 s390x
 
 # FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
+# FIXME/TODO: sync -common changes from F-12
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -33,7 +34,7 @@ BuildRequires: libvorbis-devel
 #BuildRequires: polkit-qt-devel
 BuildRequires: taglib-devel
 
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 Requires: cdrecord mkisofs
 Requires(hint): cdrdao
@@ -56,7 +57,7 @@ Requires: %{name} = %{epoch}:%{version}-
 %package devel
 Summary: Files for the development of applications which will use %{name} 
 Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %description devel
 %{summary}.
 
@@ -136,6 +137,9 @@ fi
 
 
 %changelog
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.66.0-5
+- Epoch: 1 (increment Release too, to minimize confusion)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.66.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:39 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchbugzilla
Message-ID: <20090926180639.1FCBC10F89C@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on koffice-langpack (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:42 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchcommits
Message-ID: <20090926180642.4A94B10F8A2@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on koffice-langpack (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:43 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested commit
Message-ID: <20090926180643.B023A10F89C@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on koffice-langpack (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:45 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested approveacls
Message-ID: <20090926180645.8C0A210F8A8@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on koffice-langpack (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:52 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchbugzilla
Message-ID: <20090926180652.923F010F89C@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on koffice-langpack (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:54 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchcommits
Message-ID: <20090926180654.65FC010F8A2@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on koffice-langpack (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:54 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested commit
Message-ID: <20090926180656.13EFD10F8A4@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on koffice-langpack (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:06:57 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested approveacls
Message-ID: <20090926180657.9073E10F8AB@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on koffice-langpack (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From hno at fedoraproject.org  Sat Sep 26 18:06:59 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 26 Sep 2009 18:06:59 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.33, 1.34 bzrtools.spec, 1.52,
	1.53 sources, 1.34, 1.35
Message-ID: <20090926180659.A5ED011C00E6@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv366

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
2.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	10 Sep 2009 17:34:17 -0000	1.33
+++ .cvsignore	26 Sep 2009 18:06:58 -0000	1.34
@@ -1,2 +1,2 @@
-bzrtools-2.0.0.tar.gz
-bzrtools-2.0.0.tar.gz.sig
+bzrtools-2.0.1.tar.gz
+bzrtools-2.0.1.tar.gz.sig


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- bzrtools.spec	10 Sep 2009 17:34:17 -0000	1.52
+++ bzrtools.spec	26 Sep 2009 18:06:59 -0000	1.53
@@ -9,7 +9,7 @@
 %define bzrnextver 2.1
 
 Name:           bzrtools
-Version:        %{bzrver}.0
+Version:        %{bzrver}.1
 Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Sep 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.1-1
+- Update to 2.0.1
+
 * Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 2.0.0-1
 - Update to 2.0.0 for bzr 2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	10 Sep 2009 17:34:17 -0000	1.34
+++ sources	26 Sep 2009 18:06:59 -0000	1.35
@@ -1,2 +1,2 @@
-a44eec17b85abc54886ab5d762e17b66  bzrtools-2.0.0.tar.gz
-a1e62666524f4b5e03e437d1d7adf0f9  bzrtools-2.0.0.tar.gz.sig
+a4a14e3ed4a6fa404123ee22662fa0a5  bzrtools-2.0.1.tar.gz
+d434fd716a4bfbd43eb2f7265bbfc037  bzrtools-2.0.1.tar.gz.sig



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:02 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchbugzilla
Message-ID: <20090926180702.A091F10F8A2@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on koffice-langpack (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:04 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchcommits
Message-ID: <20090926180704.7E00810F8A6@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on koffice-langpack (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:05 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested commit
Message-ID: <20090926180706.6522710F89C@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on koffice-langpack (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:07 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested approveacls
Message-ID: <20090926180707.C56F810F8AB@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on koffice-langpack (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:14 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchbugzilla
Message-ID: <20090926180714.1A9E210F8BD@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on koffice-langpack (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:15 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested watchcommits
Message-ID: <20090926180715.6F63910F8A4@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on koffice-langpack (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:16 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested commit
Message-ID: <20090926180716.A29FD10F8A6@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on koffice-langpack (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 18:07:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 18:07:17 +0000
Subject: [pkgdb] koffice-langpack: rdieter has requested approveacls
Message-ID: <20090926180718.D251510F8AB@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on koffice-langpack (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From cebbert at fedoraproject.org  Sat Sep 26 18:10:16 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 26 Sep 2009 18:10:16 +0000 (UTC)
Subject: rpms/kernel/F-11
	appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch,
	NONE, 1.1 kernel.spec, 1.1744, 1.1745
Message-ID: <20090926181016.3A4C311C0423@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2460

Modified Files:
	kernel.spec 
Added Files:
	appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch 
Log Message:
Backport "appletalk: Fix skb leak when ipddp interface is not loaded"
  (fixes CVE-2009-2903)

appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch:
 drivers/net/appletalk/ipddp.c |    3 --
 net/appletalk/aarp.c          |   16 +++++++++-----
 net/appletalk/ddp.c           |   47 +++++++++++++++++++++---------------------
 3 files changed, 36 insertions(+), 30 deletions(-)

--- NEW FILE appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch ---
From: Arnaldo Carvalho de Melo <acme at redhat.com>
Date: Fri, 11 Sep 2009 18:35:22 +0000 (-0700)
Subject: Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ffcfb8db540ff879c2a85bf7e404954281443414

Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded

[ backport to 2.6.30 : Chuck Ebbert <cebbert at redhat.com ]

And also do a better job of returning proper NET_{RX,XMIT}_ values.

Based on a patch and suggestions by Mark Smith.

This fixes CVE-2009-2903

Reported-by: Mark Smith <lk-netdev at lk-netdev.nosense.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index bea87da..aaf14d3 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -170,8 +170,7 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
 	dev->stats.tx_packets++;
 	dev->stats.tx_bytes += skb->len;
 
-        if(aarp_send_ddp(rt->dev, skb, &rt->at, NULL) < 0)
-                dev_kfree_skb(skb);
+	aarp_send_ddp(rt->dev, skb, &rt->at, NULL);
 
         return 0;
 }
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 89f99d3..9d4adfd 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -599,7 +599,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
 
 	/* Non ELAP we cannot do. */
 	if (dev->type != ARPHRD_ETHER)
-		return -1;
+		goto free_it;
 
 	skb->dev = dev;
 	skb->protocol = htons(ETH_P_ATALK);
@@ -634,7 +634,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
 	if (!a) {
 		/* Whoops slipped... good job it's an unreliable protocol 8) */
 		write_unlock_bh(&aarp_lock);
-		return -1;
+		goto free_it;
 	}
 
 	/* Set up the queue */
@@ -663,15 +663,21 @@ out_unlock:
 	write_unlock_bh(&aarp_lock);
 
 	/* Tell the ddp layer we have taken over for this frame. */
-	return 0;
+	goto sent;
 
 sendit:
 	if (skb->sk)
 		skb->priority = skb->sk->sk_priority;
-	dev_queue_xmit(skb);
+	if (dev_queue_xmit(skb))
+		goto drop;
 sent:
-	return 1;
+	return NET_XMIT_SUCCESS;
+free_it:
+	kfree_skb(skb);
+drop:
+	return NET_XMIT_DROP;
 }
+EXPORT_SYMBOL(aarp_send_ddp);
 
 /*
  *	An entry in the aarp unresolved queue has become resolved. Send
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 0d42d5d..4a6ff2b 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1274,8 +1274,10 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
 	struct net_device_stats *stats;
 
 	/* This needs to be able to handle ipddp"N" devices */
-	if (!dev)
-		return -ENODEV;
+	if (!dev) {
+		kfree_skb(skb);
+		return NET_RX_DROP;
+	}
 
 	skb->protocol = htons(ETH_P_IP);
 	skb_pull(skb, 13);
@@ -1285,8 +1287,7 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
 	stats = netdev_priv(dev);
 	stats->rx_packets++;
 	stats->rx_bytes += skb->len + 13;
-	netif_rx(skb);  /* Send the SKB up to a higher place. */
-	return 0;
+	return netif_rx(skb);  /* Send the SKB up to a higher place. */
 }
 #else
 /* make it easy for gcc to optimize this test out, i.e. kill the code */
@@ -1294,9 +1295,8 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
 #define handle_ip_over_ddp(skb) 0
 #endif
 
-static void atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
-			       struct ddpehdr *ddp, __u16 len_hops,
-			       int origlen)
+static int atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
+			      struct ddpehdr *ddp, __u16 len_hops, int origlen)
 {
 	struct atalk_route *rt;
 	struct atalk_addr ta;
@@ -1363,8 +1363,6 @@ static void atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
 		/* 22 bytes - 12 ether, 2 len, 3 802.2 5 snap */
 		struct sk_buff *nskb = skb_realloc_headroom(skb, 32);
 		kfree_skb(skb);
-		if (!nskb)
-			goto out;
 		skb = nskb;
 	} else
 		skb = skb_unshare(skb, GFP_ATOMIC);
@@ -1373,12 +1371,16 @@ static void atalk_route_packet(struct sk_buff *skb, struct net_device *dev,
 	 * If the buffer didn't vanish into the lack of space bitbucket we can
 	 * send it.
 	 */
-	if (skb && aarp_send_ddp(rt->dev, skb, &ta, NULL) == -1)
-		goto free_it;
-out:
-	return;
+	if (skb == NULL)
+		goto drop;
+
+	if (aarp_send_ddp(rt->dev, skb, &ta, NULL) == NET_XMIT_DROP)
+		return NET_RX_DROP;
+	return NET_XMIT_SUCCESS;
 free_it:
 	kfree_skb(skb);
+drop:
+	return NET_RX_DROP;
 }
 
 /**
@@ -1452,8 +1454,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev,
 		/* Not ours, so we route the packet via the correct
 		 * AppleTalk iface
 		 */
-		atalk_route_packet(skb, dev, ddp, len_hops, origlen);
-		goto out;
+		return atalk_route_packet(skb, dev, ddp, len_hops, origlen);
 	}
 
 	/* if IP over DDP is not selected this code will be optimized out */
@@ -1656,10 +1657,10 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 		if (skb2) {
 			loopback = 1;
 			SOCK_DEBUG(sk, "SK %p: send out(copy).\n", sk);
-			if (aarp_send_ddp(dev, skb2,
-					  &usat->sat_addr, NULL) == -1)
-				kfree_skb(skb2);
-				/* else queued/sent above in the aarp queue */
+			/*
+			 * If it fails it is queued/sent above in the aarp queue
+			 */
+			aarp_send_ddp(dev, skb2, &usat->sat_addr, NULL);
 		}
 	}
 
@@ -1689,9 +1690,10 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 		    usat = &gsat;
 		}
 
-		if (aarp_send_ddp(dev, skb, &usat->sat_addr, NULL) == -1)
-			kfree_skb(skb);
-		/* else queued/sent above in the aarp queue */
+		/*
+		 * If it fails it is queued/sent above in the aarp queue
+		 */
+		aarp_send_ddp(dev, skb, &usat->sat_addr, NULL);
 	}
 	SOCK_DEBUG(sk, "SK %p: Done write (%Zd).\n", sk, len);
 
@@ -1870,7 +1872,6 @@ static struct packet_type ppptalk_packet_type __read_mostly = {
 static unsigned char ddp_snap_id[] = { 0x08, 0x00, 0x07, 0x80, 0x9B };
 
 /* Export symbols for use by drivers when AppleTalk is a module */
-EXPORT_SYMBOL(aarp_send_ddp);
 EXPORT_SYMBOL(atrtr_get_dev);
 EXPORT_SYMBOL(atalk_find_dev_addr);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1744
retrieving revision 1.1745
diff -u -p -r1.1744 -r1.1745
--- kernel.spec	26 Sep 2009 17:49:00 -0000	1.1744
+++ kernel.spec	26 Sep 2009 18:10:15 -0000	1.1745
@@ -758,6 +758,9 @@ Patch14402: kvm-vmx-check-cpl-before-emu
 Patch14403: kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
 Patch14404: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
 
+# appletalk: fix skb leak (CVE-2009-2903)
+Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1412,6 +1415,9 @@ ApplyPatch kvm-vmx-check-cpl-before-emul
 ApplyPatch kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
 ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
 
+# appletalk: fix skb leak (CVE-2009-2903)
+ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2000,6 +2006,10 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-66
+- Backport "appletalk: Fix skb leak when ipddp interface is not loaded"
+  (fixes CVE-2009-2903)
+
 * Sat Sep 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-65
 - KVM fixes from 2.6.31.1, including fix for CVE-2009-3290
 



From rdieter at fedoraproject.org  Sat Sep 26 18:18:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 26 Sep 2009 18:18:40 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.120,1.121
Message-ID: <20090926181840.CF6C111C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6323

Modified Files:
	koffice.spec 
Log Message:
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.82-2
- Epoch++ 



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- koffice.spec	11 Sep 2009 15:57:23 -0000	1.120
+++ koffice.spec	26 Sep 2009 18:18:40 -0000	1.121
@@ -10,9 +10,9 @@
 %endif
 
 Name:           koffice
-Epoch:          2 
+Epoch:          3 
 Version:        2.0.82
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -808,6 +808,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.82-2
+- Epoch++ 
+
 * Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
 - koffice-2.0.82 (2.1beta2)
 



From rdieter at fedoraproject.org  Sat Sep 26 18:19:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 26 Sep 2009 18:19:03 +0000 (UTC)
Subject: rpms/koffice/F-12 koffice-1.6.3-dejavu_fonts.patch, NONE,
	1.1 koffice-1.6.3-gcc43.patch, 1.6,
	1.7 koffice-1.6.3-glibc_strrchr.patch, 1.2,
	1.3 koffice-1.6.3-magick_version.patch, NONE,
	1.1 koffice-1.6.3-quint32.patch, 1.2,
	1.3 koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.6,
	1.7 koffice-20090306svn.patch, 1.2, 1.3 koffice-svn_checkout.sh,
	1.2, 1.3 koffice-xpdf-CVE-2007-3387.diff, 1.6, 1.7 .cvsignore,
	1.34, 1.35 koffice.spec, 1.120, 1.121 sources, 1.34, 1.35
Message-ID: <20090926181903.2492311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6436

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.3-dejavu_fonts.patch koffice-1.6.3-gcc43.patch 
	koffice-1.6.3-glibc_strrchr.patch 
	koffice-1.6.3-magick_version.patch koffice-1.6.3-quint32.patch 
	koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 
	koffice-20090306svn.patch koffice-svn_checkout.sh 
	koffice-xpdf-CVE-2007-3387.diff 
Log Message:
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 3:1.6.3-26.20090306svn
- Epoch++ (revert koffice2 -> koffice1)


koffice-1.6.3-dejavu_fonts.patch:
 Makefile.am     |    2 +-
 contextstyle.cc |    2 +-
 fontstyle.cc    |    8 +++++++-
 symboltable.cc  |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE koffice-1.6.3-dejavu_fonts.patch ---
diff -up koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu koffice-1.6.3/lib/kformula/contextstyle.cc
--- koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/contextstyle.cc	2009-07-28 15:29:06.420292073 -0500
@@ -106,7 +106,7 @@ void ContextStyle::readConfig( KConfig* 
     if ( ! FontStyle::missingFonts( init ).isEmpty() ) {
         kdWarning( DEBUGID) << "Not all basic fonts found\n";
     }
-    mathFont.fromString("Arev Sans");
+    mathFont.fromString("DejaVu Sans");
     bracketFont.fromString("cmex10");
 
 
diff -up koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu koffice-1.6.3/lib/kformula/fontstyle.cc
--- koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/fontstyle.cc	2009-07-28 15:35:51.457543630 -0500
@@ -102,7 +102,7 @@ QStringList FontStyle::missingFontsInter
     QStringList missing;
 
     testFont( missing, "cmex10" );
-    testFont( missing, "arev sans");
+    testFont( missing, "dejavu sans");
 
     return missing;
 }
@@ -111,9 +111,12 @@ void FontStyle::installFonts()
 {
     if (m_installed)
         return;
+
     QStringList missing = missingFontsInternal();
     if (!missing.isEmpty())
     {
+// don't install local copies of fonts -- Rex
+/*
         QStringList urlList;
         for (QStringList::iterator it = missing.begin(); it != missing.end(); ++it)
         {
@@ -135,6 +138,9 @@ void FontStyle::installFonts()
         KIO::copy(urlList, "fonts:/Personal/", false);
         KMessageBox::information(qApp->mainWidget(), 
                                  i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
+*/
+        KMessageBox::information(qApp->mainWidget(),
+                                 i18n("Some symbol fonts for formulas are missing")); 
     }
     m_installed = true;
 }
diff -up koffice-1.6.3/lib/kformula/Makefile.am.dejavu koffice-1.6.3/lib/kformula/Makefile.am
--- koffice-1.6.3/lib/kformula/Makefile.am.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/Makefile.am	2009-07-28 15:41:35.306393788 -0500
@@ -1,7 +1,7 @@
 
 INCLUDES= $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
 
-SUBDIRS = pics fonts dtd
+SUBDIRS = pics dtd
 
 ####### 
 # We have to name it kformulalib, not just kformula, since that's the name of the kdeinit module for kformula.
diff -up koffice-1.6.3/lib/kformula/symboltable.cc.dejavu koffice-1.6.3/lib/kformula/symboltable.cc
--- koffice-1.6.3/lib/kformula/symboltable.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/symboltable.cc	2009-07-28 15:29:06.421292200 -0500
@@ -101,7 +101,7 @@ QFont SymbolTable::font( QChar symbol, c
     if ( fm.inFont( symbol ) ) {
         return f;
     }
-    return QFont("Arev Sans");
+    return QFont("DejaVu Sans");
 }
 
 CharClass SymbolTable::charClass( QChar symbol ) const

koffice-1.6.3-gcc43.patch:
 krita/core/kis_perspective_math.cpp                |   24 ++++++++++-----------
 kspread/plugins/scripting/kspreadcore/krs_cell.cpp |    9 +------
 kspread/plugins/scripting/kspreadcore/krs_cell.h   |    7 ++----
 3 files changed, 17 insertions(+), 23 deletions(-)

Index: koffice-1.6.3-gcc43.patch
===================================================================
RCS file: koffice-1.6.3-gcc43.patch
diff -N koffice-1.6.3-gcc43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-gcc43.patch	26 Sep 2009 18:19:01 -0000	1.7
@@ -0,0 +1,126 @@
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+
+Index: koffice/krita/core/kis_perspective_math.cpp
+===================================================================
+--- koffice/krita/core/kis_perspective_math.cpp	(revision 738928)
++++ koffice/krita/core/kis_perspective_math.cpp	(revision 738929)
+@@ -24,7 +24,7 @@
+ 
+ #if 1
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ #include <math.h>
+ //#define NDEBUG // uncomment to remove checking of assert()
+@@ -57,9 +57,9 @@
+         void  rprint()const;  //print entries on a single line
+         void resize(int n);
+         int operator==(const vector<ElType>& v)const;
+-        friend   vector<ElType> operator*(ElType c,vector<ElType>& v );
+-        friend   vector<ElType> operator*(vector<ElType>& v,ElType c );
+-        friend ostream& operator<<(ostream& s,vector<ElType>& v);
++        friend vector<ElType> operator* (ElType c,vector<ElType>& v );
++        friend vector<ElType> operator*(vector<ElType>& v,ElType c );
++        friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
+ };
+ template <class ElType>
+         void vector<ElType>::zero()
+@@ -129,10 +129,10 @@
+         void  vector<ElType>::rprint()const  //print entries on a single line
+ {
+     int i;
+-    cout << "VECTOR: ";
+-    cout << "(";
+-    for(i=0;i<len-1;i++) cout << data[i] << ",";
+-    cout << data[len-1] << ")" << endl;
++    std::cout << "VECTOR: ";
++    std::cout << "(";
++    for(i=0;i<len-1;i++) std::cout << data[i] << ",";
++    std::cout << data[len-1] << ")" << std::endl;
+     return;
+ }
+ template <class ElType>
+@@ -164,7 +164,7 @@
+     return ans;
+ }
+ template <class ElType>
+-        ostream& operator<<(ostream& s,vector<ElType>& v)
++        std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
+ {
+     s << "(";
+     for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
+@@ -192,7 +192,7 @@
+         matrix<ElType> operator-(const matrix<ElType>& a);
+         matrix<ElType> transpose();
+     //matrix<ElType> inverse();
+-        friend ostream& operator<<(ostream& s,matrix<ElType>& m);
++        friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
+         friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
+         friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
+ };
+@@ -357,7 +357,7 @@
+     return ans;
+ }
+ template <class ElType>
+-        ostream& operator<<(ostream& s,matrix<ElType>& m)
++        std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
+ {
+     for(int i=0; i<m.rows;i++) s << m[i];
+     return s;
+@@ -381,7 +381,7 @@
+ //         kdDebug() << "new search" << endl;
+         for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
+ /*            kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
+-            if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
++            if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
+             vv[i]=1.0/big;
+     }
+     for (j=0;j<n;j++)
+Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
+===================================================================
+--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729275)
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729276)
+@@ -174,12 +174,7 @@
+ 	return m_cell->text();
+ }
+ 
+-bool Cell::setText(const QString& text, bool asString) {
+-
+-	//FIXME: there is some problem with asString parameter, when it's set
+-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
+-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
+-
++bool Cell::setText(const QString& text) {
+ 	KSpread::ProtectedCheck prot;
+ 	prot.setSheet (m_sheet);
+ 	prot.add (QPoint (m_col, m_row));
+@@ -189,7 +184,7 @@
+ 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
+ 	dm->setSheet (m_sheet);
+ 	dm->setValue (text);
+-	dm->setParsing (!asString);
++	dm->setParsing (true);
+ 	dm->add (QPoint (m_col, m_row));
+ 	dm->execute ();
+ 
+Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
+===================================================================
+--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729275)
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729276)
+@@ -131,11 +131,10 @@
+ 		*/
+ 		const QString text() const;
+ 		/**
+-		* Set the text of the cell. If asString is true, the text
+-		* will be handled as string else we try to parse the
+-		* string to the expected value.
++		* Set the text of the cell. the text
++		* will be handled as string
+ 		*/
+-		bool setText(const QString& text, bool asString = false);
++		bool setText(const QString& text);
+ 
+ 		/**
+ 		* Return the textcolor as RGB-value in the format "#RRGGBB".

koffice-1.6.3-glibc_strrchr.patch:
 gfile.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: koffice-1.6.3-glibc_strrchr.patch
===================================================================
RCS file: koffice-1.6.3-glibc_strrchr.patch
diff -N koffice-1.6.3-glibc_strrchr.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-glibc_strrchr.patch	26 Sep 2009 18:19:01 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc
+--- koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc	2007-05-30 16:39:18.000000000 -0500
++++ koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc	2009-03-06 15:56:35.000000000 -0600
+@@ -315,7 +315,7 @@ GString *grabPath(const char *fileName) 
+ 
+ #else
+   //---------- Unix ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '/')))
+     return new GString(fileName, p - fileName);

koffice-1.6.3-magick_version.patch:
 kis_image_magick_converter.cc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE koffice-1.6.3-magick_version.patch ---
diff -up koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc
--- koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version	2009-08-26 15:42:15.323637145 -0500
+++ koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc	2009-08-26 15:47:18.470639483 -0500
@@ -457,7 +457,11 @@ KisImageBuilder_Result KisImageMagickCon
 
             for (Q_UINT32 y = 0; y < image->rows; y ++)
             {
+#if MagickLibVersion >  0x630 
                 const PixelPacket *pp = AcquireCacheViewPixels(vi, 0, y, image->columns, 1, &ei);
+#else 
+                const PixelPacket *pp = AcquireCacheView(vi, 0, y, image->columns, 1, &ei);
+#endif
 
                 if(!pp)
                 {

koffice-1.6.3-quint32.patch:
 kis_tiff_converter.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: koffice-1.6.3-quint32.patch
===================================================================
RCS file: koffice-1.6.3-quint32.patch
diff -N koffice-1.6.3-quint32.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-quint32.patch	26 Sep 2009 18:19:01 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32 koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc
+--- koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32	2009-03-06 15:55:16.000000000 -0600
++++ koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc	2009-03-07 13:42:40.000000000 -0600
+@@ -242,7 +242,7 @@ KisImageBuilder_Result KisTIFFConverter:
+     // Read image profile
+     kdDebug() << "Reading profile" << endl;
+     KisProfile* profile = 0;
+-    quint32 EmbedLen;
++    DWORD EmbedLen;
+     LPBYTE EmbedBuffer;
+ 
+     if (TIFFGetField(image, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) {

koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff:
 Stream.cc |  615 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Stream.h  |   12 -
 2 files changed, 623 insertions(+), 4 deletions(-)

Index: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
===================================================================
RCS file: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
diff -N koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff	26 Sep 2009 18:19:02 -0000	1.7
@@ -0,0 +1,669 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -1239,6 +1239,7 @@
+ // CCITTFaxStream
+ //------------------------------------------------------------------------
+ 
++#if 0
+ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
+ 			       GBool byteAlignA, int columnsA, int rowsA,
+ 			       GBool endOfBlockA, GBool blackA):
+@@ -1748,6 +1749,609 @@
+   }
+   return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
+ }
++#else // secfix
++CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
++			       GBool byteAlignA, int columnsA, int rowsA,
++			       GBool endOfBlockA, GBool blackA):
++    FilterStream(strA) {
++  encoding = encodingA;
++  endOfLine = endOfLineA;
++  byteAlign = byteAlignA;
++  columns = columnsA;
++  if (columns < 1) {
++    columns = 1;
++  } else if (columns > (INT_MAX - 2)/sizeof(int)) {
++    columns = (INT_MAX - 2)/sizeof(int);
++  }
++  rows = rowsA;
++  endOfBlock = endOfBlockA;
++  black = blackA;
++  // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
++  // ---> max codingLine size = columns + 1
++  // refLine has one extra guard entry at the end
++  // ---> max refLine size = columns + 2
++  codingLine = (int *)gmalloc((columns + 1) * sizeof(int));
++  refLine = (int *)gmalloc((columns + 2) * sizeof(int));
++
++  eof = gFalse;
++  row = 0;
++  nextLine2D = encoding < 0;
++  inputBits = 0;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
++
++  buf = EOF;
++}
++
++CCITTFaxStream::~CCITTFaxStream() {
++  delete str;
++  gfree(refLine);
++  gfree(codingLine);
++}
++
++void CCITTFaxStream::reset() {
++  short code1;
++
++  str->reset();
++  eof = gFalse;
++  row = 0;
++  nextLine2D = encoding < 0;
++  inputBits = 0;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
++  buf = EOF;
++
++  // skip any initial zero bits and end-of-line marker, and get the 2D
++  // encoding tag
++  while ((code1 = lookBits(12)) == 0) {
++    eatBits(1);
++  }
++  if (code1 == 0x001) {
++    eatBits(12);
++  }
++  if (encoding > 0) {
++    nextLine2D = !lookBits(1);
++    eatBits(1);
++  }
++}
++
++inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
++  if (a1 > codingLine[a0i]) {
++    if (a1 > columns) {
++      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
++      err = gTrue;
++      a1 = columns;
++    }
++    if ((a0i & 1) ^ blackPixels) {
++      ++a0i;
++    }
++    codingLine[a0i] = a1;
++  }
++}
++
++inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
++  if (a1 > codingLine[a0i]) {
++    if (a1 > columns) {
++      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
++      err = gTrue;
++      a1 = columns;
++    }
++    if ((a0i & 1) ^ blackPixels) {
++      ++a0i;
++    }
++    codingLine[a0i] = a1;
++  } else if (a1 < codingLine[a0i]) {
++    if (a1 < 0) {
++      error(getPos(), "Invalid CCITTFax code");
++      err = gTrue;
++      a1 = 0;
++    }
++    while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
++      --a0i;
++    }
++    codingLine[a0i] = a1;
++  }
++}
++
++int CCITTFaxStream::lookChar() {
++  short code1, code2, code3;
++  int b1i, blackPixels, i, bits;
++  GBool gotEOL;
++
++  if (buf != EOF) {
++    return buf;
++  }
++
++  // read the next row
++  if (outputBits == 0) {
++
++    // if at eof just return EOF
++    if (eof) {
++      return EOF;
++    }
++
++    err = gFalse;
++
++    // 2-D encoding
++    if (nextLine2D) {
++      for (i = 0; codingLine[i] < columns; ++i) {
++	refLine[i] = codingLine[i];
++      }
++      refLine[i++] = columns;
++      refLine[i] = columns;
++      codingLine[0] = 0;
++      a0i = 0;
++      b1i = 0;
++      blackPixels = 0;
++      // invariant:
++      // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
++      //                                                             <= columns
++      // exception at left edge:
++      //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
++      // exception at right edge:
++      //   refLine[b1i] = refLine[b1i+1] = columns is possible
++      while (codingLine[a0i] < columns) {
++	code1 = getTwoDimCode();
++	switch (code1) {
++	case twoDimPass:
++	  addPixels(refLine[b1i + 1], blackPixels);
++	  if (refLine[b1i + 1] < columns) {
++	    b1i += 2;
++	  }
++	  break;
++	case twoDimHoriz:
++	  code1 = code2 = 0;
++	  if (blackPixels) {
++	    do {
++	      code1 += code3 = getBlackCode();
++	    } while (code3 >= 64);
++	    do {
++	      code2 += code3 = getWhiteCode();
++	    } while (code3 >= 64);
++	  } else {
++	    do {
++	      code1 += code3 = getWhiteCode();
++	    } while (code3 >= 64);
++	    do {
++	      code2 += code3 = getBlackCode();
++	    } while (code3 >= 64);
++	  }
++	  addPixels(codingLine[a0i] + code1, blackPixels);
++	  if (codingLine[a0i] < columns) {
++	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
++	  }
++	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	    b1i += 2;
++	  }
++	  break;
++	case twoDimVertR3:
++	  addPixels(refLine[b1i] + 3, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertR2:
++	  addPixels(refLine[b1i] + 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertR1:
++	  addPixels(refLine[b1i] + 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVert0:
++	  addPixels(refLine[b1i], blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL3:
++	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL2:
++	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL1:
++	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case EOF:
++	  addPixels(columns, 0);
++	  eof = gTrue;
++	  break;
++	default:
++	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
++	  addPixels(columns, 0);
++	  err = gTrue;
++	  break;
++	}
++      }
++
++    // 1-D encoding
++    } else {
++      codingLine[0] = 0;
++      a0i = 0;
++      blackPixels = 0;
++      while (codingLine[a0i] < columns) {
++	code1 = 0;
++	if (blackPixels) {
++	  do {
++	    code1 += code3 = getBlackCode();
++	  } while (code3 >= 64);
++	} else {
++	  do {
++	    code1 += code3 = getWhiteCode();
++	  } while (code3 >= 64);
++	}
++	addPixels(codingLine[a0i] + code1, blackPixels);
++	blackPixels ^= 1;
++      }
++    }
++
++    // byte-align the row
++    if (byteAlign) {
++      inputBits &= ~7;
++    }
++
++    // check for end-of-line marker, skipping over any extra zero bits
++    gotEOL = gFalse;
++    if (!endOfBlock && row == rows - 1) {
++      eof = gTrue;
++    } else {
++      code1 = lookBits(12);
++      while (code1 == 0) {
++	eatBits(1);
++	code1 = lookBits(12);
++      }
++      if (code1 == 0x001) {
++	eatBits(12);
++	gotEOL = gTrue;
++      } else if (code1 == EOF) {
++	eof = gTrue;
++      }
++    }
++
++    // get 2D encoding tag
++    if (!eof && encoding > 0) {
++      nextLine2D = !lookBits(1);
++      eatBits(1);
++    }
++
++    // check for end-of-block marker
++    if (endOfBlock && gotEOL) {
++      code1 = lookBits(12);
++      if (code1 == 0x001) {
++	eatBits(12);
++	if (encoding > 0) {
++	  lookBits(1);
++	  eatBits(1);
++	}
++	if (encoding >= 0) {
++	  for (i = 0; i < 4; ++i) {
++	    code1 = lookBits(12);
++	    if (code1 != 0x001) {
++	      error(getPos(), "Bad RTC code in CCITTFax stream");
++	    }
++	    eatBits(12);
++	    if (encoding > 0) {
++	      lookBits(1);
++	      eatBits(1);
++	    }
++	  }
++	}
++	eof = gTrue;
++      }
++
++    // look for an end-of-line marker after an error -- we only do
++    // this if we know the stream contains end-of-line markers because
++    // the "just plow on" technique tends to work better otherwise
++    } else if (err && endOfLine) {
++      while (1) {
++	code1 = lookBits(13);
++	if (code1 == EOF) {
++	  eof = gTrue;
++	  return EOF;
++	}
++	if ((code1 >> 1) == 0x001) {
++	  break;
++	}
++	eatBits(1);
++      }
++      eatBits(12); 
++      if (encoding > 0) {
++	eatBits(1);
++	nextLine2D = !(code1 & 1);
++      }
++    }
++
++    // set up for output
++    if (codingLine[0] > 0) {
++      outputBits = codingLine[a0i = 0];
++    } else {
++      outputBits = codingLine[a0i = 1];
++    }
++
++    ++row;
++  }
++
++  // get a byte
++  if (outputBits >= 8) {
++    buf = (a0i & 1) ? 0x00 : 0xff;
++    outputBits -= 8;
++    if (outputBits == 0 && codingLine[a0i] < columns) {
++      ++a0i;
++      outputBits = codingLine[a0i] - codingLine[a0i - 1];
++    }
++  } else {
++    bits = 8;
++    buf = 0;
++    do {
++      if (outputBits > bits) {
++	buf <<= bits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - bits);
++	}
++	outputBits -= bits;
++	bits = 0;
++      } else {
++	buf <<= outputBits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - outputBits);
++	}
++	bits -= outputBits;
++	outputBits = 0;
++	if (codingLine[a0i] < columns) {
++	  ++a0i;
++	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
++	} else if (bits > 0) {
++	  buf <<= bits;
++	  bits = 0;
++	}
++      }
++    } while (bits);
++  }
++  if (black) {
++    buf ^= 0xff;
++  }
++  return buf;
++}
++
++short CCITTFaxStream::getTwoDimCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(7);
++    p = &twoDimTab1[code];
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 1; n <= 7; ++n) {
++      code = lookBits(n);
++      if (n < 7) {
++	code <<= 7 - n;
++      }
++      p = &twoDimTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad two dim code (%04x) in CCITTFax stream", code);
++  return EOF;
++}
++
++short CCITTFaxStream::getWhiteCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(12);
++    if (code == EOF) {
++      return 1;
++    }
++    if ((code >> 5) == 0) {
++      p = &whiteTab1[code];
++    } else {
++      p = &whiteTab2[code >> 3];
++    }
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 1; n <= 9; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 9) {
++	code <<= 9 - n;
++      }
++      p = &whiteTab2[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++    for (n = 11; n <= 12; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 12) {
++	code <<= 12 - n;
++      }
++      p = &whiteTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad white code (%04x) in CCITTFax stream", code);
++  // eat a bit and return a positive number so that the caller doesn't
++  // go into an infinite loop
++  eatBits(1);
++  return 1;
++}
++
++short CCITTFaxStream::getBlackCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(13);
++    if (code == EOF) {
++      return 1;
++    }
++    if ((code >> 7) == 0) {
++      p = &blackTab1[code];
++    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
++      p = &blackTab2[(code >> 1) - 64];
++    } else {
++      p = &blackTab3[code >> 7];
++    }
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 2; n <= 6; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 6) {
++	code <<= 6 - n;
++      }
++      p = &blackTab3[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++    for (n = 7; n <= 12; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 12) {
++	code <<= 12 - n;
++      }
++      if (code >= 64) {
++	p = &blackTab2[code - 64];
++	if (p->bits == n) {
++	  eatBits(n);
++	  return p->n;
++	}
++      }
++    }
++    for (n = 10; n <= 13; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 13) {
++	code <<= 13 - n;
++      }
++      p = &blackTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad black code (%04x) in CCITTFax stream", code);
++  // eat a bit and return a positive number so that the caller doesn't
++  // go into an infinite loop
++  eatBits(1);
++  return 1;
++}
++
++short CCITTFaxStream::lookBits(int n) {
++  int c;
++
++  while (inputBits < n) {
++    if ((c = str->getChar()) == EOF) {
++      if (inputBits == 0) {
++	return EOF;
++      }
++      // near the end of the stream, the caller may ask for more bits
++      // than are available, but there may still be a valid code in
++      // however many bits are available -- we need to return correct
++      // data in this case
++      return (inputBuf << (n - inputBits)) & (0xffff >> (16 - n));
++    }
++    inputBuf = (inputBuf << 8) + c;
++    inputBits += 8;
++  }
++  return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
++}
++
++#endif
+ 
+ GString *CCITTFaxStream::getPSFilter(const char *indent) {
+   GString *s;
+@@ -1929,6 +2533,12 @@
+     // allocate a buffer for the whole image
+     bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
+     bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
++    if (bufWidth <= 0 || bufHeight <= 0 ||
++	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
++      error(getPos(), "Invalid image size in DCT stream");
++      y = height;
++      return;
++    }
+     for (i = 0; i < numComps; ++i) {
+       frameBuf[i] = (int *)gmalloc(bufWidth * bufHeight * sizeof(int));
+       memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
+@@ -2975,6 +3585,11 @@
+   }
+   scanInfo.firstCoeff = str->getChar();
+   scanInfo.lastCoeff = str->getChar();
++  if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
++      scanInfo.firstCoeff > scanInfo.lastCoeff) {
++    error(getPos(), "Bad DCT coefficient numbers in scan info block");
++    return gFalse;
++  }
+   c = str->getChar();
+   scanInfo.ah = (c >> 4) & 0x0f;
+   scanInfo.al = c & 0x0f;
+--- filters/kword/pdf/xpdf/xpdf/Stream.h
++++ filters/kword/pdf/xpdf/xpdf/Stream.h
+@@ -513,13 +513,17 @@
+   int row;			// current row
+   int inputBuf;			// input buffer
+   int inputBits;		// number of bits in input buffer
+-  short *refLine;		// reference line changing elements
+-  int b1;			// index into refLine
+-  short *codingLine;		// coding line changing elements
+-  int a0;			// index into codingLine
++  int *codingLine;             // coding line changing elements
++  int *refLine;                        // reference line changing elements
++  int a0i;                     // index into codingLine
++  GBool err;                   // error on current line
++
+   int outputBits;		// remaining output bits
+   int buf;			// character buffer
+ 
++  void addPixels(int a1, int black);
++  void addPixelsNeg(int a1, int black);
++
+   short getTwoDimCode();
+   short getWhiteCode();
+   short getBlackCode();

koffice-20090306svn.patch:
 koffice-1.6-branch/admin/Doxyfile.am                                                                   |    4 
 koffice-1.6-branch/admin/acinclude.m4.in                                                               |   39 
 koffice-1.6-branch/admin/cvs.sh                                                                        |    2 
 koffice-1.6-branch/admin/detect-autoconf.pl                                                            |  107 +
 koffice-1.6-branch/configure.in.in                                                                     |    4 
 koffice-1.6-branch/doc/Makefile.am                                                                     |    4 
 koffice-1.6-branch/doc/koffice.desktop                                                                 |    1 
 koffice-1.6-branch/doc/krita/dialogs-imagerestoration.png                                              |binary
 koffice-1.6-branch/doc/krita/tutorial-select-layer.docbook                                             |    6 
 koffice-1.6-branch/example/example.desktop                                                             |    6 
 koffice-1.6-branch/example/examplepart.desktop                                                         |    3 
 koffice-1.6-branch/example/x-vnd.kde.example.desktop                                                   |    1 
 koffice-1.6-branch/filters/generic_wrapper/generic_filter.desktop                                      |    9 
 koffice-1.6-branch/filters/karbon/ai/karbon_ai_import.desktop                                          |    6 
 koffice-1.6-branch/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop                  |    7 
 koffice-1.6-branch/filters/karbon/eps/karbon_eps_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/eps/karbon_eps_import.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/eps/karbon_ps_import.desktop                                         |    6 
 koffice-1.6-branch/filters/karbon/kontour/karbon_kontour_import.desktop                                |    8 
 koffice-1.6-branch/filters/karbon/msod/karbon_msod_import.desktop                                      |    7 
 koffice-1.6-branch/filters/karbon/oodraw/karbon_oodraw_import.desktop                                  |    7 
 koffice-1.6-branch/filters/karbon/png/karbon_png_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/svg/karbon_svg_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/svg/karbon_svg_import.desktop                                        |    7 
 koffice-1.6-branch/filters/karbon/wmf/karbon_wmf_export.desktop                                        |    7 
 koffice-1.6-branch/filters/karbon/wmf/karbon_wmf_import.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/xaml/karbon_xaml_export.desktop                                      |    8 
 koffice-1.6-branch/filters/karbon/xaml/karbon_xaml_import.desktop                                      |    8 
 koffice-1.6-branch/filters/karbon/xcf/karbon_xcf_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/xfig/karbon_xfig_import.desktop                                      |    7 
 koffice-1.6-branch/filters/kchart/bmp/kchart_bmp_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/jpeg/kchart_jpeg_export.desktop                                      |    8 
 koffice-1.6-branch/filters/kchart/mng/kchart_mng_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/png/kchart_png_export.desktop                                        |    9 
 koffice-1.6-branch/filters/kchart/svg/kchart_svg_export.desktop                                        |    9 
 koffice-1.6-branch/filters/kchart/xbm/kchart_xbm_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/xpm/kchart_xpm_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kformula/latex/kformula_latex_export.desktop                                |    7 
 koffice-1.6-branch/filters/kformula/mathml/kformula_mathml_export.desktop                              |    7 
 koffice-1.6-branch/filters/kformula/mathml/kformula_mathml_import.desktop                              |    7 
 koffice-1.6-branch/filters/kformula/png/kformula_png_export.desktop                                    |    7 
 koffice-1.6-branch/filters/kformula/svg/kformula_svg_export.desktop                                    |    8 
 koffice-1.6-branch/filters/kivio/imageexport/kivio_image_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/bmp/kpresenter_bmp_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop                              |    8 
 koffice-1.6-branch/filters/kpresenter/kword/kprkword.desktop                                           |    7 
 koffice-1.6-branch/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop                  |    7 
 koffice-1.6-branch/filters/kpresenter/mng/kpresenter_mng_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop                    |    6 
 koffice-1.6-branch/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop                    |    6 
 koffice-1.6-branch/filters/kpresenter/png/kpresenter_png_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop           |    7 
 koffice-1.6-branch/filters/kpresenter/svg/kpresenter_svg_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/xbm/kpresenter_xbm_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/xpm/kpresenter_xpm_export.desktop                                |    8 
 koffice-1.6-branch/filters/krita/gmagick/kis_image_magick_converter.cc                                 |   52 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick.desktop                                          |    7 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick_export.desktop                                   |   11 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick_import.desktop                                   |    9 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg.desktop                                               |    8 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg_export.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg_import.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/magick/Makefile.am                                                    |    2 
 koffice-1.6-branch/filters/krita/magick/kis_image_magick_converter.cc                                  |    2 
 koffice-1.6-branch/filters/krita/magick/krita_magick.desktop                                           |    7 
 koffice-1.6-branch/filters/krita/magick/krita_magick_export.desktop                                    |    9 
 koffice-1.6-branch/filters/krita/magick/krita_magick_import.desktop                                    |    9 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr.desktop                                         |    7 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr_export.desktop                                  |    8 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr_import.desktop                                  |    8 
 koffice-1.6-branch/filters/krita/pdf/krita_pdf.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/pdf/krita_pdf_import.desktop                                          |   11 
 koffice-1.6-branch/filters/krita/png/krita_png.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/png/krita_png_export.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/png/krita_png_import.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/raw/krita_raw.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/raw/krita_raw_import.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/tiff/kis_tiff_converter.cc                                            |    8 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff.desktop                                               |    7 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff_export.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff_import.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/xcf/krita_xcf_export.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/xcf/krita_xcf_import.desktop                                          |    8 
 koffice-1.6-branch/filters/kspread/applixspread/kspread_applixspread_import.desktop                    |    9 
 koffice-1.6-branch/filters/kspread/csv/kspread_csv_export.desktop                                      |    9 
 koffice-1.6-branch/filters/kspread/csv/kspread_csv_import.desktop                                      |    9 
 koffice-1.6-branch/filters/kspread/dbase/kspread_dbase_import.desktop                                  |   12 
 koffice-1.6-branch/filters/kspread/excel/import/kspread_excel_import.desktop                           |    9 
 koffice-1.6-branch/filters/kspread/excel/kspread_excel_export.desktop                                  |    9 
 koffice-1.6-branch/filters/kspread/gnumeric/gnumericimport.cc                                          |  118 -
 koffice-1.6-branch/filters/kspread/gnumeric/kspread_gnumeric_export.desktop                            |    9 
 koffice-1.6-branch/filters/kspread/gnumeric/kspread_gnumeric_import.desktop                            |    9 
 koffice-1.6-branch/filters/kspread/html/kspread_html_export.desktop                                    |    9 
 koffice-1.6-branch/filters/kspread/kexi/kspread_kexi_import.desktop                                    |   10 
 koffice-1.6-branch/filters/kspread/latex/export/kspread_latex_export.desktop                           |    9 
 koffice-1.6-branch/filters/kspread/opencalc/kspread_opencalc_export.desktop                            |   11 
 koffice-1.6-branch/filters/kspread/opencalc/kspread_opencalc_import.desktop                            |   11 
 koffice-1.6-branch/filters/kspread/qpro/kspread_qpro_import.desktop                                    |    9 
 koffice-1.6-branch/filters/kugar/kugarnop/kugar_kugar_import.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/abiword/kword_abiword_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/abiword/kword_abiword_import.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/amipro/kword_amipro_export.desktop                                    |    7 
 koffice-1.6-branch/filters/kword/amipro/kword_amipro_import.desktop                                    |    7 
 koffice-1.6-branch/filters/kword/applixword/kword_applixword_import.desktop                            |    7 
 koffice-1.6-branch/filters/kword/ascii/kword_ascii_export.desktop                                      |    9 
 koffice-1.6-branch/filters/kword/ascii/kword_ascii_import.desktop                                      |    7 
 koffice-1.6-branch/filters/kword/docbook/kword_docbook_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/hancomword/kword_hancomword_import.desktop                            |    8 
 koffice-1.6-branch/filters/kword/html/export/kword_html_export.desktop                                 |    7 
 koffice-1.6-branch/filters/kword/html/import/kword_html_import.desktop                                 |    7 
 koffice-1.6-branch/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop                       |    7 
 koffice-1.6-branch/filters/kword/kword1.3/import/uninstall.desktop                                     |    1 
 koffice-1.6-branch/filters/kword/latex/export/kword_latex_export.desktop                               |    7 
 koffice-1.6-branch/filters/kword/latex/import/kword_latex_import.desktop                               |   11 
 koffice-1.6-branch/filters/kword/msword/kword_msword_import.desktop                                    |    9 
 koffice-1.6-branch/filters/kword/mswrite/IMPERFECT                                                     |    2 
 koffice-1.6-branch/filters/kword/mswrite/ROADMAP                                                       |    5 
 koffice-1.6-branch/filters/kword/mswrite/config.libmswrite.h                                           |   35 
 koffice-1.6-branch/filters/kword/mswrite/kword_mswrite_export.desktop                                  |    9 
 koffice-1.6-branch/filters/kword/mswrite/kword_mswrite_import.desktop                                  |    9 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite.cpp                                                |   90 +
 koffice-1.6-branch/filters/kword/mswrite/libmswrite.h                                                  |   44 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite_defs.cpp                                           |   37 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite_defs.h                                             |   99 -
 koffice-1.6-branch/filters/kword/mswrite/list.h                                                        |   45 
 koffice-1.6-branch/filters/kword/mswrite/mswriteexport.cc                                              |   36 
 koffice-1.6-branch/filters/kword/mswrite/mswriteexport.h                                               |   32 
 koffice-1.6-branch/filters/kword/mswrite/mswriteimport.cc                                              |   36 
 koffice-1.6-branch/filters/kword/mswrite/mswriteimport.h                                               |   32 
 koffice-1.6-branch/filters/kword/mswrite/status.html                                                   |   25 
 koffice-1.6-branch/filters/kword/mswrite/structures.cpp                                                |  149 +-
 koffice-1.6-branch/filters/kword/mswrite/structures.h                                                  |   61 
 koffice-1.6-branch/filters/kword/mswrite/structures_generated.cpp                                      |   89 -
 koffice-1.6-branch/filters/kword/mswrite/structures_generated.h                                        |  100 -
 koffice-1.6-branch/filters/kword/mswrite/structures_private.cpp                                        |   47 
 koffice-1.6-branch/filters/kword/mswrite/structures_private.h                                          |   45 
 koffice-1.6-branch/filters/kword/oowriter/kword_oowriter_export.desktop                                |    7 
 koffice-1.6-branch/filters/kword/oowriter/kword_oowriter_import.desktop                                |    7 
 koffice-1.6-branch/filters/kword/palmdoc/kword_palmdoc_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/palmdoc/kword_palmdoc_import.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/pdf/kword_pdf_import.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/pdf/pdfimport.cpp                                                     |   11 
 koffice-1.6-branch/filters/kword/pdf/xpdf/goo/gmem.c                                                   |   19 
 koffice-1.6-branch/filters/kword/pdf/xpdf/goo/gmem.h                                                   |    1 
 koffice-1.6-branch/filters/kword/pdf/xpdf/xpdf/Stream.cc                                               |  634 +++++++++-
 koffice-1.6-branch/filters/kword/pdf/xpdf/xpdf/Stream.h                                                |   12 
 koffice-1.6-branch/filters/kword/rtf/export/kword_rtf_export.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/rtf/import/kword_rtf_import.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/starwriter/kword_starwriter_import.desktop                            |    7 
 koffice-1.6-branch/filters/kword/wml/kword_wml_export.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/wml/kword_wml_import.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/wordperfect/export/kword_wp_export.desktop                            |    7 
 koffice-1.6-branch/filters/kword/wordperfect/import/TableStyle.cxx                                     |    2 
 koffice-1.6-branch/filters/kword/wordperfect/import/TextRunStyle.cxx                                   |    2 
 koffice-1.6-branch/filters/kword/wordperfect/import/kword_wp_import.desktop                            |    7 
 koffice-1.6-branch/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop                     |    8 
 koffice-1.6-branch/filters/xsltfilter/export/xslt_export.desktop                                       |    9 
 koffice-1.6-branch/filters/xsltfilter/import/xslt_import.desktop                                       |    9 
 koffice-1.6-branch/karbon/data/karbon.desktop                                                          |   11 
 koffice-1.6-branch/karbon/data/karbon_module.desktop                                                   |    5 
 koffice-1.6-branch/karbon/data/karbonpart.desktop                                                      |   16 
 koffice-1.6-branch/karbon/plugins/imagetool/karbonimagetool.desktop                                    |    7 
 koffice-1.6-branch/karbon/plugins/zoomtool/karbonzoomtool.desktop                                      |    8 
 koffice-1.6-branch/karbon/templates/basic/.directory                                                   |    6 
 koffice-1.6-branch/karbon/templates/basic/empty.desktop                                                |   14 
 koffice-1.6-branch/karbon/tools/karbondefaulttools.desktop                                             |    7 
 koffice-1.6-branch/kchart/kchart.desktop                                                               |   15 
 koffice-1.6-branch/kchart/kchartpart.desktop                                                           |   12 
 koffice-1.6-branch/kchart/templates/.directory                                                         |    7 
 koffice-1.6-branch/kchart/templates/BarChart.desktop                                                   |   14 
 koffice-1.6-branch/kchart/templates/Empty.desktop                                                      |    5 
 koffice-1.6-branch/kdgantt/KDGanttView.cpp                                                             |   35 
 koffice-1.6-branch/kdgantt/KDGanttView.h                                                               |   24 
 koffice-1.6-branch/kdgantt/KDGanttViewItem.cpp                                                         |   26 
 koffice-1.6-branch/kdgantt/KDGanttViewItem.h                                                           |   13 
 koffice-1.6-branch/kdgantt/KDGanttViewSubwidgets.cpp                                                   |  280 +++-
 koffice-1.6-branch/kdgantt/KDGanttViewSubwidgets.h                                                     |   59 
 koffice-1.6-branch/kdgantt/KDGanttViewTaskItem.h                                                       |    6 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/alter.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/analyze.c                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/attach.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/auth.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/btree.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/btree.h                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/build.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/callback.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/complete.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/date.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/delete.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/expr.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/func.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/hash.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/hash.h                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/insert.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/legacy.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/main.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pager.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pager.h                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/patches/kexisql-3.2.8.patch                              |  469 ++++++-
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/patches/mk_patch.sh                                      |    3 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pragma.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/prepare.c                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/random.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/select.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/shell.c                                                  |    3 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/sqlite3.h                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/sqliteInt.h                                              |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/tclsqlite.c                                              |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/tokenize.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/update.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/utf.c                                                    |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/util.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vacuum.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vdbe.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vdbe.h                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/where.c                                                  |    1 
 koffice-1.6-branch/kexi/Makefile.global                                                                |    2 
 koffice-1.6-branch/kexi/core/kexidbconnectionset.cpp                                                   |    2 
 koffice-1.6-branch/kexi/data/kde34compat/x-sqlite2.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/kde34compat/x-sqlite3.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/kexihandler.desktop                                                       |    3 
 koffice-1.6-branch/kexi/data/x-kexi-connectiondata.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/x-kexiproject-shortcut.desktop                                            |    6 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite.desktop                                              |    5 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite2.desktop                                             |    5 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite3.desktop                                             |    5 
 koffice-1.6-branch/kexi/doc/dev/CHANGELOG-Kexi-js                                                      |   83 +
 koffice-1.6-branch/kexi/doc/dev/TODO-Kexi-js                                                           |    4 
 koffice-1.6-branch/kexi/formeditor/factories/kformdesigner_containers.desktop                          |    3 
 koffice-1.6-branch/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop                          |    6 
 koffice-1.6-branch/kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop                     |    9 
 koffice-1.6-branch/kexi/formeditor/test/kformdesigner.desktop                                          |    5 
 koffice-1.6-branch/kexi/formeditor/test/kformdesigner_part.desktop                                     |    5 
 koffice-1.6-branch/kexi/formeditor/widgetfactory.desktop                                               |    2 
 koffice-1.6-branch/kexi/formeditor/widgetlibrary.cpp                                                   |    2 
 koffice-1.6-branch/kexi/kexi.desktop                                                                   |   13 
 koffice-1.6-branch/kexi/kexidb/alter.cpp                                                               |    2 
 koffice-1.6-branch/kexi/kexidb/connection.cpp                                                          |   10 
 koffice-1.6-branch/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop                                |    1 
 koffice-1.6-branch/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop                                  |    3 
 koffice-1.6-branch/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop                               |    1 
 koffice-1.6-branch/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp                                             |    9 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop                             |    2 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp                                     |    3 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp                                         |    8 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop                            |    2 
 koffice-1.6-branch/kexi/kexidb/expression.cpp                                                          |    8 
 koffice-1.6-branch/kexi/kexidb/field.cpp                                                               |    4 
 koffice-1.6-branch/kexi/kexidb/field.h                                                                 |    2 
 koffice-1.6-branch/kexi/kexidb/fieldlist.cpp                                                           |    2 
 koffice-1.6-branch/kexi/kexidb/fieldvalidator.cpp                                                      |    2 
 koffice-1.6-branch/kexi/kexidb/kexidb_driver.desktop                                                   |   11 
 koffice-1.6-branch/kexi/kexidb/queryschema.cpp                                                         |    7 
 koffice-1.6-branch/kexi/kexidb/queryschema.h                                                           |    3 
 koffice-1.6-branch/kexi/kexidb/relationship.cpp                                                        |    6 
 koffice-1.6-branch/kexi/kexidb/tableschema.cpp                                                         |    2 
 koffice-1.6-branch/kexi/kexiutils/utils.cpp                                                            |    3 
 koffice-1.6-branch/kexi/main/keximainwindowimpl.cpp                                                    |    9 
 koffice-1.6-branch/kexi/main/printing/kexisimpleprintingengine.cpp                                     |  236 +++
 koffice-1.6-branch/kexi/main/printing/kexisimpleprintingengine.h                                       |   39 
 koffice-1.6-branch/kexi/migration/keximigrate.cpp                                                      |    3 
 koffice-1.6-branch/kexi/migration/keximigration_driver.desktop                                         |    6 
 koffice-1.6-branch/kexi/migration/mysql/keximigrate_mysql.desktop                                      |    6 
 koffice-1.6-branch/kexi/migration/mysql/mysqlmigrate.cpp                                               |    5 
 koffice-1.6-branch/kexi/migration/pqxx/keximigrate_pqxx.desktop                                        |    6 
 koffice-1.6-branch/kexi/migration/pqxx/pqxxmigrate.cpp                                                 |    8 
 koffice-1.6-branch/kexi/plugins/forms/kexidataprovider.cpp                                             |    4 
 koffice-1.6-branch/kexi/plugins/forms/kexiformhandler.desktop                                          |   12 
 koffice-1.6-branch/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop                              |    6 
 koffice-1.6-branch/kexi/plugins/forms/widgets/kexidblabel.cpp                                          |    2 
 koffice-1.6-branch/kexi/plugins/forms/widgets/kexiframe.cpp                                            |    2 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop                   |   13 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvexport.cpp                                     |    2 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp                               |  168 +-
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportdialog.h                                 |   15 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp                           |   97 +
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h                             |   17 
 koffice-1.6-branch/kexi/plugins/macros/kexipart/keximacrohandler.desktop                               |   13 
 koffice-1.6-branch/kexi/plugins/migration/keximigrationhandler.desktop                                 |   23 
 koffice-1.6-branch/kexi/plugins/queries/kexiquerydesignerguieditor.cpp                                 |    9 
 koffice-1.6-branch/kexi/plugins/queries/kexiqueryhandler.desktop                                       |   11 
 koffice-1.6-branch/kexi/plugins/relations/kexirelationhandler.desktop                                  |   11 
 koffice-1.6-branch/kexi/plugins/reports/kexireporthandler.desktop                                      |   13 
 koffice-1.6-branch/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop                        |    6 
 koffice-1.6-branch/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop                      |   13 
 koffice-1.6-branch/kexi/plugins/tables/kexitabledesignerview.cpp                                       |    2 
 koffice-1.6-branch/kexi/plugins/tables/kexitablehandler.desktop                                        |   13 
 koffice-1.6-branch/kexi/widget/relations/kexirelationviewconnection.cpp                                |    2 
 koffice-1.6-branch/kexi/widget/tableview/kexidataawarepropertyset.cpp                                  |    2 
 koffice-1.6-branch/kexi/widget/tableview/kexitableviewdata.cpp                                         |    2 
 koffice-1.6-branch/kexi/widget/utils/kexicomboboxdropdownbutton.cpp                                    |    1 
 koffice-1.6-branch/kexi/widget/utils/kexisharedactionclient.cpp                                        |    2 
 koffice-1.6-branch/kformula/kformula.desktop                                                           |    7 
 koffice-1.6-branch/kformula/kformulapart.desktop                                                       |   13 
 koffice-1.6-branch/kivio/kiviopart/kivio.desktop                                                       |    6 
 koffice-1.6-branch/kivio/kiviopart/kiviopart.desktop                                                   |   11 
 koffice-1.6-branch/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop                         |    2 
 koffice-1.6-branch/kivio/plugins/kivioselecttool/kivioselecttool.desktop                               |    2 
 koffice-1.6-branch/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop                           |    3 
 koffice-1.6-branch/kivio/plugins/kiviotargettool/kiviotargettool.desktop                               |    3 
 koffice-1.6-branch/kivio/plugins/kiviotexttool/kiviotexttool.desktop                                   |    5 
 koffice-1.6-branch/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop                                   |    5 
 koffice-1.6-branch/kivio/templates/basic/.directory                                                    |    6 
 koffice-1.6-branch/kivio/templates/basic/basicflow.desktop                                             |    3 
 koffice-1.6-branch/kivio/templates/basic/empty.desktop                                                 |   10 
 koffice-1.6-branch/koshell/koshell.desktop                                                             |   11 
 koffice-1.6-branch/kounavail/kounavail.desktop                                                         |    7 
 koffice-1.6-branch/kplato/kplato.desktop                                                               |   11 
 koffice-1.6-branch/kplato/kplatopart.desktop                                                           |   15 
 koffice-1.6-branch/kplato/reports/resourcelist.desktop                                                 |    7 
 koffice-1.6-branch/kplato/reports/tasklist.desktop                                                     |    8 
 koffice-1.6-branch/kplato/templates/Simple/.directory                                                  |    5 
 koffice-1.6-branch/kplato/templates/Simple/8HourDay-40HourWeek.desktop                                 |    7 
 koffice-1.6-branch/kplato/templates/Simple/Plain.desktop                                               |    7 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/.directory                                              |   20 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowDown.desktop                                       |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeft.desktop                                       |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeftDown.desktop                                   |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeftUp.desktop                                     |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRight.desktop                                      |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRightDown.desktop                                  |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRightUp.desktop                                    |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowUp.desktop                                         |    6 
 koffice-1.6-branch/kpresenter/autoforms/Connections/.directory                                         |   20 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection1.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection10.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection11.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection12.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection2.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection3.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection4.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection5.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection6.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection7.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection8.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection9.desktop                                |    5 
 koffice-1.6-branch/kpresenter/kpresenter.desktop                                                       |    7 
 koffice-1.6-branch/kpresenter/kpresenterpart.desktop                                                   |    7 
 koffice-1.6-branch/kpresenter/templates/Screen/.directory                                              |    5 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/.directory                                 |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop                   |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop                  |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop                   |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/CopperPlain.desktop                        |    3 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/GradientBlueRed.desktop                    |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/SnowyMountains.desktop                     |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop                  |    7 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/classroom.desktop                          |   12 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde.desktop                                |    5 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde2.desktop                               |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde3.desktop                               |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/savannah.desktop                           |    9 
 koffice-1.6-branch/kpresenter/templates/common_desktop/OneColumnLandscape.desktop                      |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/OneColumnPortrait.desktop                       |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TitleLandscape.desktop                          |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TitlePortrait.desktop                           |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop                      |   10 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop                       |   10 
 koffice-1.6-branch/kpresenter/templates/common_desktop/emptyLandscape.desktop                          |   13 
 koffice-1.6-branch/kpresenter/templates/common_desktop/emptyPortrait.desktop                           |    9 
 koffice-1.6-branch/kpresenter/templates/letter/.directory                                              |    5 
 koffice-1.6-branch/krita/colorspaces/cmyk_u16/krita_cmyk_u16_plugin.desktop                            |   12 
 koffice-1.6-branch/krita/colorspaces/cmyk_u8/kritacmykplugin.desktop                                   |    9 
 koffice-1.6-branch/krita/colorspaces/cmyk_u8/templates/white_2000x800.desktop                          |   12 
 koffice-1.6-branch/krita/colorspaces/gray_u16/krita_gray_u16_plugin.desktop                            |   10 
 koffice-1.6-branch/krita/colorspaces/gray_u8/kritagrayplugin.desktop                                   |    8 
 koffice-1.6-branch/krita/colorspaces/gray_u8/templates/.directory                                      |    7 
 koffice-1.6-branch/krita/colorspaces/gray_u8/templates/white_640x480.desktop                           |   11 
 koffice-1.6-branch/krita/colorspaces/lms_f32/krita_lms_f32_plugin.desktop                              |    9 
 koffice-1.6-branch/krita/colorspaces/rgb_f16half/krita_rgb_f16half_plugin.desktop                      |    7 
 koffice-1.6-branch/krita/colorspaces/rgb_f32/krita_rgb_f32_plugin.desktop                              |    7 
 koffice-1.6-branch/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc                                 |    4 
 koffice-1.6-branch/krita/colorspaces/rgb_u16/krita_rgb_u16_plugin.desktop                              |    8 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc                                      |    4 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/kritargbplugin.desktop                                     |    8 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1024x768.desktop                     |   12 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1280x1024.desktop                    |   13 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1600x1200.desktop                    |   11 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_640x480.desktop                      |   13 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1024x768.desktop                           |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1280x1024.desktop                          |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1600x1200.desktop                          |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_640x480.desktop                            |   15 
 koffice-1.6-branch/krita/colorspaces/wet/kritawetplugin.desktop                                        |   10 
 koffice-1.6-branch/krita/colorspaces/wetsticky/brushop/kritawsbrushpaintop.desktop                     |    5 
 koffice-1.6-branch/krita/colorspaces/wetsticky/kritawsplugin.desktop                                   |    3 
 koffice-1.6-branch/krita/colorspaces/ycbcr_u16/krita_ycbcr_u16_plugin.desktop                          |    8 
 koffice-1.6-branch/krita/colorspaces/ycbcr_u8/krita_ycbcr_u8_plugin.desktop                            |    8 
 koffice-1.6-branch/krita/core/kis_paint_layer.cc                                                       |    4 
 koffice-1.6-branch/krita/core/kis_perspective_math.cpp                                                 |   22 
 koffice-1.6-branch/krita/data/brushes/Makefile.am                                                      |    2 
 koffice-1.6-branch/krita/data/krita_filter.desktop                                                     |   12 
 koffice-1.6-branch/krita/data/krita_paintop.desktop                                                    |    9 
 koffice-1.6-branch/krita/data/krita_plugin.desktop                                                     |    5 
 koffice-1.6-branch/krita/data/krita_tool.desktop                                                       |   14 
 koffice-1.6-branch/krita/data/palettes/Makefile.am                                                     |    2 
 koffice-1.6-branch/krita/data/templates/.directory                                                     |    6 
 koffice-1.6-branch/krita/krita.desktop                                                                 |   14 
 koffice-1.6-branch/krita/kritacolor/kis_abstract_colorspace.cc                                         |    4 
 koffice-1.6-branch/krita/kritacolor/krita_colorspace.desktop                                           |    2 
 koffice-1.6-branch/krita/kritapart.desktop                                                             |   12 
 koffice-1.6-branch/krita/plugins/filters/blur/kritablurfilter.desktop                                  |    2 
 koffice-1.6-branch/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop                            |    3 
 koffice-1.6-branch/krita/plugins/filters/cimg/kritacimg.desktop                                        |    3 
 koffice-1.6-branch/krita/plugins/filters/colorify/kritacolorifyfilter.desktop                          |    7 
 koffice-1.6-branch/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop                    |    7 
 koffice-1.6-branch/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop                       |   15 
 koffice-1.6-branch/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop            |    9 
 koffice-1.6-branch/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop                        |   15 
 koffice-1.6-branch/krita/plugins/filters/embossfilter/kritaembossfilter.desktop                        |    5 
 koffice-1.6-branch/krita/plugins/filters/example/kritaexample.desktop                                  |   12 
 koffice-1.6-branch/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop              |   10 
 koffice-1.6-branch/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop                |   15 
 koffice-1.6-branch/krita/plugins/filters/lenscorrectionfilter/kritalenscorrectionfilter.desktop        |    7 
 koffice-1.6-branch/krita/plugins/filters/levelfilter/kritalevelfilter.desktop                          |    9 
 koffice-1.6-branch/krita/plugins/filters/noisefilter/kritanoisefilter.desktop                          |   13 
 koffice-1.6-branch/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop                    |    5 
 koffice-1.6-branch/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop                    |   11 
 koffice-1.6-branch/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop                  |   13 
 koffice-1.6-branch/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop                |    3 
 koffice-1.6-branch/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc                      |    5 
 koffice-1.6-branch/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop                  |    3 
 koffice-1.6-branch/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop                |    2 
 koffice-1.6-branch/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop                          |    3 
 koffice-1.6-branch/krita/plugins/filters/threadtest/kritathreadtest.desktop                            |    2 
 koffice-1.6-branch/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop                            |    6 
 koffice-1.6-branch/krita/plugins/filters/wavefilter/kritawavefilter.desktop                            |    8 
 koffice-1.6-branch/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc                              |   15 
 koffice-1.6-branch/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop                 |   11 
 koffice-1.6-branch/krita/plugins/tools/defaulttools/kritadefaulttools.desktop                          |    7 
 koffice-1.6-branch/krita/plugins/tools/selectiontools/kritaselectiontools.desktop                      |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_crop/kritatoolcrop.desktop                                 |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_curves/kritatoolcurves.desktop                             |    4 
 koffice-1.6-branch/krita/plugins/tools/tool_filter/kritatoolfilter.desktop                             |    8 
 koffice-1.6-branch/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop           |    3 
 koffice-1.6-branch/krita/plugins/tools/tool_perspectivetransform/kritatoolperspectivetransform.desktop |    3 
 koffice-1.6-branch/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop                           |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop                         |    6 
 koffice-1.6-branch/krita/plugins/tools/tool_selectsimilar/kritatoolselectsimilar.desktop               |    4 
 koffice-1.6-branch/krita/plugins/tools/tool_star/kritatoolstar.desktop                                 |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_transform/kritatooltransform.desktop                       |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/colorrange/kritacolorrange.desktop                        |    4 
 koffice-1.6-branch/krita/plugins/viewplugins/colorspaceconversion/kritacolorspaceconversion.desktop    |    4 
 koffice-1.6-branch/krita/plugins/viewplugins/dropshadow/kritadropshadow.desktop                        |    8 
 koffice-1.6-branch/krita/plugins/viewplugins/filtersgallery/kritafiltersgallery.desktop                |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/histogram/kritahistogram.desktop                          |   14 
 koffice-1.6-branch/krita/plugins/viewplugins/histogram_docker/kritahistogramdocker.desktop             |    6 
 koffice-1.6-branch/krita/plugins/viewplugins/history_docker/kritahistorydocker.desktop                 |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/imagesize/kritaimagesize.desktop                          |    9 
 koffice-1.6-branch/krita/plugins/viewplugins/modify_selection/kritamodifyselection.desktop             |    3 
 koffice-1.6-branch/krita/plugins/viewplugins/performancetest/kritaperftest.desktop                     |    5 
 koffice-1.6-branch/krita/plugins/viewplugins/rotateimage/kritarotateimage.desktop                      |   11 
 koffice-1.6-branch/krita/plugins/viewplugins/screenshot/kritascreenshot.desktop                        |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/scripting/kritascripting.desktop                          |   17 
 koffice-1.6-branch/krita/plugins/viewplugins/selectopaque/kritaselectopaque.desktop                    |    2 
 koffice-1.6-branch/krita/plugins/viewplugins/separate_channels/kritaseparatechannels.desktop           |   12 
 koffice-1.6-branch/krita/plugins/viewplugins/shearimage/kritashearimage.desktop                        |    8 
 koffice-1.6-branch/krita/plugins/viewplugins/substrate/kritasubstrate.desktop                          |    2 
 koffice-1.6-branch/krita/plugins/viewplugins/variations/kritavariations.desktop                        |   12 
 koffice-1.6-branch/krita/ui/squeezedcombobox.cpp                                                       |    3 
 koffice-1.6-branch/kspread/Makefile.am                                                                 |    2 
 koffice-1.6-branch/kspread/digest.cc                                                                   |    2 
 koffice-1.6-branch/kspread/digest.h                                                                    |    2 
 koffice-1.6-branch/kspread/kspread.desktop                                                             |   11 
 koffice-1.6-branch/kspread/kspreadpart.desktop                                                         |   15 
 koffice-1.6-branch/kspread/plugins/calculator/uninstall.desktop                                        |    1 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadcore/krs_cell.cpp                                  |    9 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadcore/krs_cell.h                                    |    7 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadscripting.desktop                                  |   17 
 koffice-1.6-branch/kspread/templates/Business/.directory                                               |    4 
 koffice-1.6-branch/kspread/templates/Business/BalanceSheet.desktop                                     |    7 
 koffice-1.6-branch/kspread/templates/Business/ExpenseReport.desktop                                    |    5 
 koffice-1.6-branch/kspread/templates/Business/Invoice.desktop                                          |    2 
 koffice-1.6-branch/kspread/templates/Business/PackingSlip.desktop                                      |    7 
 koffice-1.6-branch/kspread/templates/Business/PriceQuotation.desktop                                   |    2 
 koffice-1.6-branch/kspread/templates/General/.directory                                                |    7 
 koffice-1.6-branch/kspread/templates/General/StudentIDCard.desktop                                     |    5 
 koffice-1.6-branch/kspread/templates/General/Worksheet.desktop                                         |    5 
 koffice-1.6-branch/kspread/templates/HomeFamily/.directory                                             |    9 
 koffice-1.6-branch/kspread/templates/HomeFamily/BMI.desktop                                            |    5 
 koffice-1.6-branch/kspread/templates/HomeFamily/CreditCardTracker.desktop                              |    3 
 koffice-1.6-branch/kspread/templates/HomeFamily/MenuPlan.desktop                                       |    9 
 koffice-1.6-branch/kspread/templates/HomeFamily/VacationChecklist.desktop                              |    6 
 koffice-1.6-branch/kugar/kudesigner/kudesigner.desktop                                                 |   17 
 koffice-1.6-branch/kugar/kudesigner/templates/General/.directory                                       |    7 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A0.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A1.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A2.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A3.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A4.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A5.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A6.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A7.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A8.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A9.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B0.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B1.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B10.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B2.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B3.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B4.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B5.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B6.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B7.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B8.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B9.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/C5E.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Comm10E.desktop                                  |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/DLE.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Executive.desktop                                |    3 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Folio.desktop                                    |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Ledger.desktop                                   |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Legal.desktop                                    |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Letter.desktop                                   |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/NPageSize.desktop                                |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Tabloid.desktop                                  |    1 
 koffice-1.6-branch/kugar/part/kugar.desktop                                                            |    6 
 koffice-1.6-branch/kugar/part/kugarpart.desktop                                                        |   10 
 koffice-1.6-branch/kword/KWAnchor.cpp                                                                  |    4 
 koffice-1.6-branch/kword/KWDocument.cpp                                                                |   20 
 koffice-1.6-branch/kword/kwmailmerge.desktop                                                           |    6 
 koffice-1.6-branch/kword/kword.desktop                                                                 |    7 
 koffice-1.6-branch/kword/kwordpart.desktop                                                             |   14 
 koffice-1.6-branch/kword/mailmerge/kabc/kwmailmerge_kabc.desktop                                       |   11 
 koffice-1.6-branch/kword/mailmerge/kspread/kwmailmerge_kspread.desktop                                 |   13 
 koffice-1.6-branch/kword/mailmerge/kwserialletter_classic.desktop                                      |    8 
 koffice-1.6-branch/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop                                  |   11 
 koffice-1.6-branch/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop                            |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/.directory                                           |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/BusinessCards10.desktop                              |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/LabelsL16.desktop                                    |    5 
 koffice-1.6-branch/kword/templates/Envelopes/.directory                                                |    7 
 koffice-1.6-branch/kword/templates/Envelopes/EnvelopeC6.desktop                                        |    7 
 koffice-1.6-branch/kword/templates/Envelopes/EnvelopeDL.desktop                                        |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/.directory                                           |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/A4.desktop                                           |   17 
 koffice-1.6-branch/kword/templates/Wordprocessing/ColorfulA4.desktop                                   |   10 
 koffice-1.6-branch/kword/templates/Wordprocessing/ColorfulLetter.desktop                               |   10 
 koffice-1.6-branch/kword/templates/Wordprocessing/FaxA4.desktop                                        |    8 
 koffice-1.6-branch/kword/templates/Wordprocessing/FaxLetter.desktop                                    |    8 
 koffice-1.6-branch/kword/templates/Wordprocessing/Letter.desktop                                       |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/Memo.desktop                                         |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/ProfessionalA4.desktop                               |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/ProfessionalLetter.desktop                           |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/TwoColumns.desktop                                   |   15 
 koffice-1.6-branch/kword/templates/Wordprocessing/TwoColumnsLetter.desktop                             |   15 
 koffice-1.6-branch/lib/kofficecore/kodocinfopropspage.desktop                                          |    5 
 koffice-1.6-branch/lib/kotext/KoTextDocument.cpp                                                       |   10 
 koffice-1.6-branch/lib/kotext/KoTextObject.cpp                                                         |    5 
 koffice-1.6-branch/lib/kross/python/cxx/Objects.hxx                                                    |    9 
 koffice-1.6-branch/lib/kross/python/pythonconfig.h                                                     |    9 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.chart.desktop                                |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.formula.desktop                              |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop                    |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop                             |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.image.desktop                                |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop                |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop                         |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop                 |    8 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop                          |    8 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop                        |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.text.desktop                                 |    6 
 koffice-1.6-branch/mimetypes/kde351/x-raw.desktop                                                      |    4 
 koffice-1.6-branch/servicetypes/kochart.desktop                                                        |    1 
 koffice-1.6-branch/servicetypes/kofficepart.desktop                                                    |    7 
 koffice-1.6-branch/servicetypes/kofilter.desktop                                                       |    7 
 koffice-1.6-branch/servicetypes/kofilterwrapper.desktop                                                |    3 
 koffice-1.6-branch/servicetypes/koplugin.desktop                                                       |    9 
 koffice-1.6-branch/templates/Illustration.desktop                                                      |   15 
 koffice-1.6-branch/templates/Presentation.desktop                                                      |   18 
 koffice-1.6-branch/templates/SpreadSheet.desktop                                                       |   21 
 koffice-1.6-branch/templates/TextDocument.desktop                                                      |   20 
 koffice-1.6-branch/tools/kfile-plugins/abiword/kfile_abiword.desktop                                   |    8 
 koffice-1.6-branch/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop                                 |   10 
 koffice-1.6-branch/tools/kfile-plugins/koffice/kfile_koffice.desktop                                   |    8 
 koffice-1.6-branch/tools/kfile-plugins/ooo/kfile_ooo.desktop                                           |    7 
 koffice-1.6-branch/tools/kthesaurus/KThesaurus.desktop                                                 |   10 
 koffice-1.6-branch/tools/quickprint/karbon_konqi.desktop                                               |   10 
 koffice-1.6-branch/tools/quickprint/kchart_konqi.desktop                                               |   10 
 koffice-1.6-branch/tools/quickprint/kexi_konqi.desktop                                                 |   10 
 koffice-1.6-branch/tools/quickprint/kformula_konqi.desktop                                             |   10 
 koffice-1.6-branch/tools/quickprint/kivio_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/quickprint/kpresenter_konqi.desktop                                           |   10 
 koffice-1.6-branch/tools/quickprint/krita_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/quickprint/kspread_konqi.desktop                                              |   10 
 koffice-1.6-branch/tools/quickprint/kword_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/spell/kspelltool.desktop                                                      |   10 
 koffice-1.6-branch/tools/spell/uninstall.desktop                                                       |    1 
 koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop                                               |   18 
 koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop                                            |    4 
 koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop                                            |    7 
 koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop                                        |    7 
 koffice-1.6.3//Makefile.am                                                                             |only
 koffice-1.6.3//Makefile.in                                                                             |only
 koffice-1.6.3//acinclude.m4                                                                            |only
 koffice-1.6.3//aclocal.m4                                                                              |only
 koffice-1.6.3//config.h.in                                                                             |only
 koffice-1.6.3//configure                                                                               |only
 koffice-1.6.3//configure.files                                                                         |only
 koffice-1.6.3//configure.in                                                                            |only
 koffice-1.6.3//stamp-h.in                                                                              |only
 koffice-1.6.3//subdirs                                                                                 |only
 koffice-1.6.3/autocorrect/Makefile.in                                                                  |only
 koffice-1.6.3/doc/Makefile.in                                                                          |only
 koffice-1.6.3/doc/karbon/Makefile.in                                                                   |only
 koffice-1.6.3/doc/karbon/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kchart/Makefile.in                                                                   |only
 koffice-1.6.3/doc/kchart/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kexi/Makefile.in                                                                     |only
 koffice-1.6.3/doc/kexi/index.cache.bz2                                                                 |only
 koffice-1.6.3/doc/kformula/Makefile.in                                                                 |only
 koffice-1.6.3/doc/kformula/index.cache.bz2                                                             |only
 koffice-1.6.3/doc/kivio/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kivio/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/koffice/Makefile.in                                                                  |only
 koffice-1.6.3/doc/koffice/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/koshell/Makefile.in                                                                  |only
 koffice-1.6.3/doc/koshell/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/kplato/Makefile.in                                                                   |only
 koffice-1.6.3/doc/kplato/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kpresenter/Makefile.in                                                               |only
 koffice-1.6.3/doc/kpresenter/index.cache.bz2                                                           |only
 koffice-1.6.3/doc/krita/Makefile.in                                                                    |only
 koffice-1.6.3/doc/krita/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/kspread/Makefile.in                                                                  |only
 koffice-1.6.3/doc/kspread/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/kugar/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kugar/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/kword/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kword/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/thesaurus/Makefile.in                                                                |only
 koffice-1.6.3/doc/thesaurus/index.cache.bz2                                                            |only
 koffice-1.6.3/example/Makefile.in                                                                      |only
 koffice-1.6.3/filters/Makefile.in                                                                      |only
 koffice-1.6.3/filters/generic_wrapper/Makefile.in                                                      |only
 koffice-1.6.3/filters/karbon/Makefile.in                                                               |only
 koffice-1.6.3/filters/karbon/ai/Makefile.in                                                            |only
 koffice-1.6.3/filters/karbon/applixgraphics/Makefile.in                                                |only
 koffice-1.6.3/filters/karbon/eps/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/kontour/Makefile.in                                                       |only
 koffice-1.6.3/filters/karbon/msod/Makefile.in                                                          |only
 koffice-1.6.3/filters/karbon/oodraw/Makefile.in                                                        |only
 koffice-1.6.3/filters/karbon/png/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/svg/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/wmf/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/xaml/Makefile.in                                                          |only
 koffice-1.6.3/filters/karbon/xcf/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/Makefile.in                                                               |only
 koffice-1.6.3/filters/kchart/bmp/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/jpeg/Makefile.in                                                          |only
 koffice-1.6.3/filters/kchart/libimageexport/Makefile.in                                                |only
 koffice-1.6.3/filters/kchart/mng/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/png/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/svg/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/xbm/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/xpm/Makefile.in                                                           |only
 koffice-1.6.3/filters/kformula/Makefile.in                                                             |only
 koffice-1.6.3/filters/kformula/latex/Makefile.in                                                       |only
 koffice-1.6.3/filters/kformula/mathml/Makefile.in                                                      |only
 koffice-1.6.3/filters/kformula/png/Makefile.in                                                         |only
 koffice-1.6.3/filters/kformula/svg/Makefile.in                                                         |only
 koffice-1.6.3/filters/kivio/Makefile.in                                                                |only
 koffice-1.6.3/filters/kivio/imageexport/Makefile.in                                                    |only
 koffice-1.6.3/filters/kpresenter/Makefile.in                                                           |only
 koffice-1.6.3/filters/kpresenter/bmp/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/jpeg/Makefile.in                                                      |only
 koffice-1.6.3/filters/kpresenter/kword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kpresenter/libimageexport/Makefile.in                                            |only
 koffice-1.6.3/filters/kpresenter/magicpoint/Makefile.in                                                |only
 koffice-1.6.3/filters/kpresenter/mng/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/ooimpress/Makefile.in                                                 |only
 koffice-1.6.3/filters/kpresenter/png/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/powerpoint/Makefile.in                                                |only
 koffice-1.6.3/filters/kpresenter/powerpoint/import/Makefile.in                                         |only
 koffice-1.6.3/filters/kpresenter/powerpoint/libppt/Makefile.in                                         |only
 koffice-1.6.3/filters/kpresenter/svg/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/xbm/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/xpm/Makefile.in                                                       |only
 koffice-1.6.3/filters/krita/Makefile.in                                                                |only
 koffice-1.6.3/filters/krita/gmagick/Makefile.in                                                        |only
 koffice-1.6.3/filters/krita/jpeg/Makefile.in                                                           |only
 koffice-1.6.3/filters/krita/libkisexif/Makefile.in                                                     |only
 koffice-1.6.3/filters/krita/magick/Makefile.in                                                         |only
 koffice-1.6.3/filters/krita/openexr/Makefile.in                                                        |only
 koffice-1.6.3/filters/krita/pdf/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/png/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/raw/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/tiff/Makefile.in                                                           |only
 koffice-1.6.3/filters/krita/xcf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kspread/Makefile.in                                                              |only
 koffice-1.6.3/filters/kspread/applixspread/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/csv/Makefile.in                                                          |only
 koffice-1.6.3/filters/kspread/dbase/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/excel/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/excel/import/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/excel/sidewinder/Makefile.in                                             |only
 koffice-1.6.3/filters/kspread/gnumeric/Makefile.in                                                     |only
 koffice-1.6.3/filters/kspread/html/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/kexi/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/latex/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/latex/export/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/libkspreadexport/Makefile.in                                             |only
 koffice-1.6.3/filters/kspread/opencalc/Makefile.in                                                     |only
 koffice-1.6.3/filters/kspread/qpro/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/qpro/Makefile.in                                            |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/src/Makefile.in                                             |only
 koffice-1.6.3/filters/kugar/Makefile.in                                                                |only
 koffice-1.6.3/filters/kugar/kugarnop/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/Makefile.in                                                                |only
 koffice-1.6.3/filters/kword/abiword/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/amipro/Makefile.in                                                         |only
 koffice-1.6.3/filters/kword/applixword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/ascii/Makefile.in                                                          |only
 koffice-1.6.3/filters/kword/docbook/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/hancomword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/html/Makefile.in                                                           |only
 koffice-1.6.3/filters/kword/html/export/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/html/import/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/kword1.3/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/kword1.3/import/Makefile.in                                                |only
 koffice-1.6.3/filters/kword/latex/Makefile.in                                                          |only
 koffice-1.6.3/filters/kword/latex/export/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/latex/import/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/latex/import/generator/Makefile.in                                         |only
 koffice-1.6.3/filters/kword/latex/import/parser/Makefile.in                                            |only
 koffice-1.6.3/filters/kword/libexport/Makefile.in                                                      |only
 koffice-1.6.3/filters/kword/msword/Makefile.in                                                         |only
 koffice-1.6.3/filters/kword/mswrite/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/oowriter/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/palmdoc/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/pdf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/pdf/xpdf/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/pdf/xpdf/goo/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/pdf/xpdf/xpdf/Makefile.in                                                  |only
 koffice-1.6.3/filters/kword/pdf/xpdf/xpdf/pdftops.cc                                                   |only
 koffice-1.6.3/filters/kword/rtf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/rtf/export/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/rtf/import/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/starwriter/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/wml/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/wordperfect/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/wordperfect/export/Makefile.in                                             |only
 koffice-1.6.3/filters/kword/wordperfect/import/Makefile.in                                             |only
 koffice-1.6.3/filters/libdialogfilter/Makefile.in                                                      |only
 koffice-1.6.3/filters/liboofilter/Makefile.in                                                          |only
 koffice-1.6.3/filters/olefilters/Makefile.in                                                           |only
 koffice-1.6.3/filters/olefilters/lib/Makefile.in                                                       |only
 koffice-1.6.3/filters/olefilters/powerpoint97/Makefile.in                                              |only
 koffice-1.6.3/filters/xsltfilter/Makefile.in                                                           |only
 koffice-1.6.3/filters/xsltfilter/export/Makefile.in                                                    |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/Makefile.in                                                |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/kword/Makefile.in                                          |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in                                    |only
 koffice-1.6.3/filters/xsltfilter/import/Makefile.in                                                    |only
 koffice-1.6.3/interfaces/Makefile.in                                                                   |only
 koffice-1.6.3/karbon/Makefile.in                                                                       |only
 koffice-1.6.3/karbon/commands/Makefile.in                                                              |only
 koffice-1.6.3/karbon/core/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/data/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/dialogs/Makefile.in                                                               |only
 koffice-1.6.3/karbon/dockers/Makefile.in                                                               |only
 koffice-1.6.3/karbon/pics/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/plugins/Makefile.in                                                               |only
 koffice-1.6.3/karbon/plugins/flattenpath/Makefile.in                                                   |only
 koffice-1.6.3/karbon/plugins/imagetool/Makefile.in                                                     |only
 koffice-1.6.3/karbon/plugins/insertknots/Makefile.in                                                   |only
 koffice-1.6.3/karbon/plugins/roundcorners/Makefile.in                                                  |only
 koffice-1.6.3/karbon/plugins/shadoweffect/Makefile.in                                                  |only
 koffice-1.6.3/karbon/plugins/whirlpinch/Makefile.in                                                    |only
 koffice-1.6.3/karbon/plugins/zoomtool/Makefile.in                                                      |only
 koffice-1.6.3/karbon/render/Makefile.in                                                                |only
 koffice-1.6.3/karbon/render/xrgbrender/Makefile.in                                                     |only
 koffice-1.6.3/karbon/shapes/Makefile.in                                                                |only
 koffice-1.6.3/karbon/templates/Makefile.in                                                             |only
 koffice-1.6.3/karbon/templates/basic/Makefile.in                                                       |only
 koffice-1.6.3/karbon/tools/Makefile.in                                                                 |only
 koffice-1.6.3/karbon/visitors/Makefile.in                                                              |only
 koffice-1.6.3/karbon/widgets/Makefile.in                                                               |only
 koffice-1.6.3/kchart/Makefile.in                                                                       |only
 koffice-1.6.3/kchart/kdchart/Makefile.in                                                               |only
 koffice-1.6.3/kchart/pics/Makefile.in                                                                  |only
 koffice-1.6.3/kchart/templates/Makefile.in                                                             |only
 koffice-1.6.3/kchart/toolbar/Makefile.in                                                               |only
 koffice-1.6.3/kchart/toolbar/crystalsvg/Makefile.in                                                    |only
 koffice-1.6.3/kchart/toolbar/locolor/Makefile.in                                                       |only
 koffice-1.6.3/kdgantt/Makefile.in                                                                      |only
 koffice-1.6.3/kexi/3rdparty/Makefile.in                                                                |only
 koffice-1.6.3/kexi/3rdparty/kexisql/Makefile.in                                                        |only
 koffice-1.6.3/kexi/3rdparty/kexisql/src/Makefile.in                                                    |only
 koffice-1.6.3/kexi/3rdparty/kexisql/tool/Makefile.in                                                   |only
 koffice-1.6.3/kexi/3rdparty/kexisql3/Makefile.in                                                       |only
 koffice-1.6.3/kexi/3rdparty/kexisql3/src/Makefile.in                                                   |only
 koffice-1.6.3/kexi/3rdparty/kolibs/Makefile.in                                                         |only
 koffice-1.6.3/kexi/3rdparty/uuid/Makefile.in                                                           |only
 koffice-1.6.3/kexi/Makefile.in                                                                         |only
 koffice-1.6.3/kexi/core/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/data/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/data/kde34compat/Makefile.in                                                        |only
 koffice-1.6.3/kexi/examples/Makefile.in                                                                |only
 koffice-1.6.3/kexi/formeditor/Makefile.in                                                              |only
 koffice-1.6.3/kexi/formeditor/factories/Makefile.in                                                    |only
 koffice-1.6.3/kexi/formeditor/kdevelop_plugin/Makefile.in                                              |only
 koffice-1.6.3/kexi/formeditor/scripting/Makefile.in                                                    |only
 koffice-1.6.3/kexi/formeditor/test/Makefile.in                                                         |only
 koffice-1.6.3/kexi/kexidb/Makefile.in                                                                  |only
 koffice-1.6.3/kexi/kexidb/drivers/Makefile.in                                                          |only
 koffice-1.6.3/kexi/kexidb/drivers/mySQL/Makefile.in                                                    |only
 koffice-1.6.3/kexi/kexidb/drivers/odbc/Makefile.in                                                     |only
 koffice-1.6.3/kexi/kexidb/drivers/pqxx/Makefile.in                                                     |only
 koffice-1.6.3/kexi/kexidb/drivers/sqlite/Makefile.in                                                   |only
 koffice-1.6.3/kexi/kexidb/drivers/sqlite2/Makefile.in                                                  |only
 koffice-1.6.3/kexi/kexidb/parser/Makefile.in                                                           |only
 koffice-1.6.3/kexi/kexiutils/Makefile.in                                                               |only
 koffice-1.6.3/kexi/main/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/main/printing/Makefile.in                                                           |only
 koffice-1.6.3/kexi/main/startup/Makefile.in                                                            |only
 koffice-1.6.3/kexi/migration/Makefile.in                                                               |only
 koffice-1.6.3/kexi/migration/mysql/Makefile.in                                                         |only
 koffice-1.6.3/kexi/migration/pqxx/Makefile.in                                                          |only
 koffice-1.6.3/kexi/migration/txt/Makefile.in                                                           |only
 koffice-1.6.3/kexi/pics/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/plugins/Makefile.in                                                                 |only
 koffice-1.6.3/kexi/plugins/forms/Makefile.in                                                           |only
 koffice-1.6.3/kexi/plugins/forms/widgets/Makefile.in                                                   |only
 koffice-1.6.3/kexi/plugins/importexport/Makefile.in                                                    |only
 koffice-1.6.3/kexi/plugins/importexport/csv/Makefile.in                                                |only
 koffice-1.6.3/kexi/plugins/macros/Makefile.in                                                          |only
 koffice-1.6.3/kexi/plugins/macros/kexiactions/Makefile.in                                              |only
 koffice-1.6.3/kexi/plugins/macros/kexipart/Makefile.in                                                 |only
 koffice-1.6.3/kexi/plugins/macros/lib/Makefile.in                                                      |only
 koffice-1.6.3/kexi/plugins/macros/tests/Makefile.in                                                    |only
 koffice-1.6.3/kexi/plugins/migration/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/queries/Makefile.in                                                         |only
 koffice-1.6.3/kexi/plugins/relations/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/reports/Makefile.in                                                         |only
 koffice-1.6.3/kexi/plugins/scripting/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/scripting/kexiapp/Makefile.in                                               |only
 koffice-1.6.3/kexi/plugins/scripting/kexidb/Makefile.in                                                |only
 koffice-1.6.3/kexi/plugins/scripting/kexiscripting/Makefile.in                                         |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/Makefile.in                                               |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/copycenter/Makefile.in                                    |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/exportxhtml/Makefile.in                                   |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/importxhtml/Makefile.in                                   |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in                             |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/python/Makefile.in                                        |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in                                |only
 koffice-1.6.3/kexi/plugins/tables/Makefile.in                                                          |only
 koffice-1.6.3/kexi/tests/Makefile.in                                                                   |only
 koffice-1.6.3/kexi/tests/altertable/Makefile.in                                                        |only
 koffice-1.6.3/kexi/tests/newapi/Makefile.in                                                            |only
 koffice-1.6.3/kexi/tests/parser/Makefile.in                                                            |only
 koffice-1.6.3/kexi/tests/startup/Makefile.in                                                           |only
 koffice-1.6.3/kexi/tests/tableview/Makefile.in                                                         |only
 koffice-1.6.3/kexi/tests/widgets/Makefile.in                                                           |only
 koffice-1.6.3/kexi/tools/Makefile.in                                                                   |only
 koffice-1.6.3/kexi/tools/add_column/Makefile.in                                                        |only
 koffice-1.6.3/kexi/tools/delete_column/Makefile.in                                                     |only
 koffice-1.6.3/kexi/widget/Makefile.in                                                                  |only
 koffice-1.6.3/kexi/widget/relations/Makefile.in                                                        |only
 koffice-1.6.3/kexi/widget/tableview/Makefile.in                                                        |only
 koffice-1.6.3/kexi/widget/utils/Makefile.in                                                            |only
 koffice-1.6.3/kformula/Makefile.in                                                                     |only
 koffice-1.6.3/kformula/pics/Makefile.in                                                                |only
 koffice-1.6.3/kivio/Makefile.in                                                                        |only
 koffice-1.6.3/kivio/kiviopart/Makefile.in                                                              |only
 koffice-1.6.3/kivio/kiviopart/config/Makefile.in                                                       |only
 koffice-1.6.3/kivio/kiviopart/kiviosdk/Makefile.in                                                     |only
 koffice-1.6.3/kivio/kiviopart/pics/Makefile.in                                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in                                           |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Civil/Makefile.in                                           |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Contact/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Electric/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/MSE/Makefile.in                                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Makefile.in                                                 |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Network/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in                                       |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/SDL/Makefile.in                                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in                      |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in                               |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in                                  |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in                                    |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in                                     |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in                                   |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Makefile.in                                            |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in                              |only
 koffice-1.6.3/kivio/kiviopart/stencils/Makefile.in                                                     |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in                                    |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Makefile.in                                       |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in                      |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in                                   |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/Makefile.in                                                 |only
 koffice-1.6.3/kivio/kiviopart/tiles/Makefile.in                                                        |only
 koffice-1.6.3/kivio/kiviopart/tools/Makefile.in                                                        |only
 koffice-1.6.3/kivio/kiviopart/ui/Makefile.in                                                           |only
 koffice-1.6.3/kivio/plugins/Makefile.in                                                                |only
 koffice-1.6.3/kivio/plugins/kivioconnectortool/Makefile.in                                             |only
 koffice-1.6.3/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in                          |only
 koffice-1.6.3/kivio/plugins/kivioselecttool/Makefile.in                                                |only
 koffice-1.6.3/kivio/plugins/kivioselecttool/select_pics/Makefile.in                                    |only
 koffice-1.6.3/kivio/plugins/kiviosmlconnector/Makefile.in                                              |only
 koffice-1.6.3/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in                                |only
 koffice-1.6.3/kivio/plugins/kiviotargettool/Makefile.in                                                |only
 koffice-1.6.3/kivio/plugins/kiviotexttool/Makefile.in                                                  |only
 koffice-1.6.3/kivio/plugins/kiviozoomtool/Makefile.in                                                  |only
 koffice-1.6.3/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in                                        |only
 koffice-1.6.3/kivio/templates/Makefile.in                                                              |only
 koffice-1.6.3/kivio/templates/basic/Makefile.in                                                        |only
 koffice-1.6.3/koshell/Makefile.in                                                                      |only
 koffice-1.6.3/kounavail/Makefile.in                                                                    |only
 koffice-1.6.3/kplato/Makefile.in                                                                       |only
 koffice-1.6.3/kplato/pics/Makefile.in                                                                  |only
 koffice-1.6.3/kplato/reports/Makefile.in                                                               |only
 koffice-1.6.3/kplato/templates/Makefile.in                                                             |only
 koffice-1.6.3/kplato/templates/Simple/Makefile.in                                                      |only
 koffice-1.6.3/kplato/tests/Makefile.in                                                                 |only
 koffice-1.6.3/kplato/toolbar/Makefile.in                                                               |only
 koffice-1.6.3/kpresenter/Makefile.in                                                                   |only
 koffice-1.6.3/kpresenter/autoformEdit/Makefile.in                                                      |only
 koffice-1.6.3/kpresenter/autoforms/Arrows/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/autoforms/Connections/Makefile.in                                             |only
 koffice-1.6.3/kpresenter/autoforms/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/dtd/Makefile.in                                                               |only
 koffice-1.6.3/kpresenter/pics/Makefile.in                                                              |only
 koffice-1.6.3/kpresenter/pics/rotate/Makefile.in                                                       |only
 koffice-1.6.3/kpresenter/slideshow/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/templates/A4/Makefile.in                                                      |only
 koffice-1.6.3/kpresenter/templates/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/templates/Screen/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/templates/Screenpresentations/Makefile.in                                     |only
 koffice-1.6.3/kpresenter/templates/common_icon/Makefile.in                                             |only
 koffice-1.6.3/kpresenter/templates/legal/Makefile.in                                                   |only
 koffice-1.6.3/kpresenter/templates/letter/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/toolbar/Makefile.in                                                           |only
 koffice-1.6.3/krita/Makefile.in                                                                        |only
 koffice-1.6.3/krita/colorspaces/Makefile.in                                                            |only
 koffice-1.6.3/krita/colorspaces/cmyk_u16/Makefile.in                                                   |only
 koffice-1.6.3/krita/colorspaces/cmyk_u8/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/cmyk_u8/templates/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/gray_u16/Makefile.in                                                   |only
 koffice-1.6.3/krita/colorspaces/gray_u8/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/gray_u8/templates/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/gray_u8/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/lms_f32/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_f16half/Makefile.in                                                |only
 koffice-1.6.3/krita/colorspaces/rgb_f16half/tests/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/rgb_f32/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_f32/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/rgb_u16/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_u16/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/Makefile.in                                                     |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/templates/Makefile.in                                           |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/tests/Makefile.in                                               |only
 koffice-1.6.3/krita/colorspaces/wet/Makefile.in                                                        |only
 koffice-1.6.3/krita/colorspaces/wetsticky/Makefile.in                                                  |only
 koffice-1.6.3/krita/colorspaces/wetsticky/brushop/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/ycbcr_u16/Makefile.in                                                  |only
 koffice-1.6.3/krita/colorspaces/ycbcr_u8/Makefile.in                                                   |only
 koffice-1.6.3/krita/core/Makefile.in                                                                   |only
 koffice-1.6.3/krita/core/tests/Makefile.in                                                             |only
 koffice-1.6.3/krita/core/tiles/Makefile.in                                                             |only
 koffice-1.6.3/krita/core/tiles/tests/Makefile.in                                                       |only
 koffice-1.6.3/krita/data/Makefile.in                                                                   |only
 koffice-1.6.3/krita/data/brushes/Makefile.in                                                           |only
 koffice-1.6.3/krita/data/gradients/Makefile.in                                                         |only
 koffice-1.6.3/krita/data/images/Makefile.in                                                            |only
 koffice-1.6.3/krita/data/palettes/Makefile.in                                                          |only
 koffice-1.6.3/krita/data/patterns/Makefile.in                                                          |only
 koffice-1.6.3/krita/data/profiles/Makefile.in                                                          |only
 koffice-1.6.3/krita/dtd/Makefile.in                                                                    |only
 koffice-1.6.3/krita/kritacolor/Makefile.in                                                             |only
 koffice-1.6.3/krita/kritacolor/colorspaces/Makefile.in                                                 |only
 koffice-1.6.3/krita/kritacolor/tests/Makefile.in                                                       |only
 koffice-1.6.3/krita/pics/Makefile.in                                                                   |only
 koffice-1.6.3/krita/plugins/Makefile.in                                                                |only
 koffice-1.6.3/krita/plugins/filters/Makefile.in                                                        |only
 koffice-1.6.3/krita/plugins/filters/blur/Makefile.in                                                   |only
 koffice-1.6.3/krita/plugins/filters/bumpmap/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/cimg/Makefile.in                                                   |only
 koffice-1.6.3/krita/plugins/filters/colorify/Makefile.in                                               |only
 koffice-1.6.3/krita/plugins/filters/colors/Makefile.in                                                 |only
 koffice-1.6.3/krita/plugins/filters/colorsfilters/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/filters/convolutionfilters/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/filters/cubismfilter/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/embossfilter/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/example/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/fastcolortransfer/Makefile.in                                      |only
 koffice-1.6.3/krita/plugins/filters/imageenhancement/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/lenscorrectionfilter/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/filters/levelfilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/noisefilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/oilpaintfilter/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/filters/pixelizefilter/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/filters/raindropsfilter/Makefile.in                                        |only
 koffice-1.6.3/krita/plugins/filters/randompickfilter/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/roundcorners/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/smalltilesfilter/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/sobelfilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/threadtest/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/filters/unsharp/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/wavefilter/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/paintops/Makefile.in                                                       |only
 koffice-1.6.3/krita/plugins/paintops/defaultpaintops/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/tools/Makefile.in                                                          |only
 koffice-1.6.3/krita/plugins/tools/defaulttools/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/tools/selectiontools/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/tools/tool_crop/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/tools/tool_curves/Makefile.in                                              |only
 koffice-1.6.3/krita/plugins/tools/tool_filter/Makefile.in                                              |only
 koffice-1.6.3/krita/plugins/tools/tool_perspectivegrid/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/tools/tool_perspectivetransform/Makefile.in                                |only
 koffice-1.6.3/krita/plugins/tools/tool_polygon/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/tools/tool_polyline/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/tools/tool_selectsimilar/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/tools/tool_star/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/tools/tool_transform/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/viewplugins/Makefile.in                                                    |only
 koffice-1.6.3/krita/plugins/viewplugins/colorrange/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/colorspaceconversion/Makefile.in                               |only
 koffice-1.6.3/krita/plugins/viewplugins/dropshadow/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/filtersgallery/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/viewplugins/histogram/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/histogram_docker/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/viewplugins/history_docker/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/viewplugins/imagesize/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/modify_selection/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/viewplugins/performancetest/Makefile.in                                    |only
 koffice-1.6.3/krita/plugins/viewplugins/rotateimage/Makefile.in                                        |only
 koffice-1.6.3/krita/plugins/viewplugins/screenshot/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/kritacore/Makefile.in                                |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/kritascripting/Makefile.in                           |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/Makefile.in                                  |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/python/Makefile.in                           |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in                             |only
 koffice-1.6.3/krita/plugins/viewplugins/selectopaque/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/viewplugins/separate_channels/Makefile.in                                  |only
 koffice-1.6.3/krita/plugins/viewplugins/shearimage/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/substrate/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/variations/Makefile.in                                         |only
 koffice-1.6.3/krita/sdk/Makefile.in                                                                    |only
 koffice-1.6.3/krita/ui/Makefile.in                                                                     |only
 koffice-1.6.3/kspread/Makefile.in                                                                      |only
 koffice-1.6.3/kspread/dialogs/Makefile.in                                                              |only
 koffice-1.6.3/kspread/dtd/Makefile.in                                                                  |only
 koffice-1.6.3/kspread/extensions/Makefile.in                                                           |only
 koffice-1.6.3/kspread/pics/Makefile.in                                                                 |only
 koffice-1.6.3/kspread/plugins/Makefile.in                                                              |only
 koffice-1.6.3/kspread/plugins/calculator/Makefile.in                                                   |only
 koffice-1.6.3/kspread/plugins/calculator/pics/Makefile.in                                              |only
 koffice-1.6.3/kspread/plugins/insertcalendar/Makefile.in                                               |only
 koffice-1.6.3/kspread/plugins/scripting/Makefile.in                                                    |only
 koffice-1.6.3/kspread/plugins/scripting/kspreadcore/Makefile.in                                        |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/Makefile.in                                            |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/exporthtml/Makefile.in                                 |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/scripteditor/Makefile.in                               |only
 koffice-1.6.3/kspread/sheetstyles/Makefile.in                                                          |only
 koffice-1.6.3/kspread/templates/Business/Makefile.in                                                   |only
 koffice-1.6.3/kspread/templates/General/Makefile.in                                                    |only
 koffice-1.6.3/kspread/templates/HomeFamily/Makefile.in                                                 |only
 koffice-1.6.3/kspread/templates/Makefile.in                                                            |only
 koffice-1.6.3/kspread/tests/Makefile.in                                                                |only
 koffice-1.6.3/kspread/toolbar/Makefile.in                                                              |only
 koffice-1.6.3/kspread/toolbar/crystalsvg/Makefile.in                                                   |only
 koffice-1.6.3/kugar/Makefile.in                                                                        |only
 koffice-1.6.3/kugar/kudesigner/Makefile.in                                                             |only
 koffice-1.6.3/kugar/kudesigner/pics/Makefile.in                                                        |only
 koffice-1.6.3/kugar/kudesigner/templates/General/Makefile.in                                           |only
 koffice-1.6.3/kugar/kudesigner/templates/Makefile.in                                                   |only
 koffice-1.6.3/kugar/kudesigner/toolbar/Makefile.in                                                     |only
 koffice-1.6.3/kugar/kudesigner_lib/Makefile.in                                                         |only
 koffice-1.6.3/kugar/lib/Makefile.in                                                                    |only
 koffice-1.6.3/kugar/part/Makefile.in                                                                   |only
 koffice-1.6.3/kugar/samples/Makefile.in                                                                |only
 koffice-1.6.3/kword/Makefile.in                                                                        |only
 koffice-1.6.3/kword/data/Makefile.in                                                                   |only
 koffice-1.6.3/kword/dtd/Makefile.in                                                                    |only
 koffice-1.6.3/kword/expression/Makefile.in                                                             |only
 koffice-1.6.3/kword/horizontalline/Makefile.in                                                         |only
 koffice-1.6.3/kword/mailmerge/Makefile.in                                                              |only
 koffice-1.6.3/kword/mailmerge/kabc/Makefile.in                                                         |only
 koffice-1.6.3/kword/mailmerge/kspread/Makefile.in                                                      |only
 koffice-1.6.3/kword/mailmerge/sql/Makefile.in                                                          |only
 koffice-1.6.3/kword/pics/Makefile.in                                                                   |only
 koffice-1.6.3/kword/templates/CardsAndLabels/Makefile.in                                               |only
 koffice-1.6.3/kword/templates/Envelopes/Makefile.in                                                    |only
 koffice-1.6.3/kword/templates/Makefile.in                                                              |only
 koffice-1.6.3/kword/templates/Wordprocessing/Makefile.in                                               |only
 koffice-1.6.3/kword/tests/Makefile.in                                                                  |only
 koffice-1.6.3/kword/toolbar/Makefile.in                                                                |only
 koffice-1.6.3/lib/Makefile.in                                                                          |only
 koffice-1.6.3/lib/kformula/Makefile.in                                                                 |only
 koffice-1.6.3/lib/kformula/config/Makefile.in                                                          |only
 koffice-1.6.3/lib/kformula/dtd/Makefile.in                                                             |only
 koffice-1.6.3/lib/kformula/fonts/Makefile.in                                                           |only
 koffice-1.6.3/lib/kformula/pics/Makefile.in                                                            |only
 koffice-1.6.3/lib/kformula/pics/crystalsvg/Makefile.in                                                 |only
 koffice-1.6.3/lib/kofficecore/Makefile.in                                                              |only
 koffice-1.6.3/lib/kofficecore/tests/Makefile.in                                                        |only
 koffice-1.6.3/lib/kofficeui/Makefile.in                                                                |only
 koffice-1.6.3/lib/kofficeui/pics/Makefile.in                                                           |only
 koffice-1.6.3/lib/kofficeui/tests/Makefile.in                                                          |only
 koffice-1.6.3/lib/kopainter/Makefile.in                                                                |only
 koffice-1.6.3/lib/kopalette/Makefile.in                                                                |only
 koffice-1.6.3/lib/koproperty/Makefile.in                                                               |only
 koffice-1.6.3/lib/koproperty/editors/Makefile.in                                                       |only
 koffice-1.6.3/lib/koproperty/test/Makefile.in                                                          |only
 koffice-1.6.3/lib/kotext/Makefile.in                                                                   |only
 koffice-1.6.3/lib/kotext/kohyphen/Makefile.in                                                          |only
 koffice-1.6.3/lib/kotext/kohyphen/hyphdicts/Makefile.in                                                |only
 koffice-1.6.3/lib/kotext/tests/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/Makefile.in                                                                    |only
 koffice-1.6.3/lib/kross/api/Makefile.in                                                                |only
 koffice-1.6.3/lib/kross/main/Makefile.in                                                               |only
 koffice-1.6.3/lib/kross/python/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/python/cxx/Makefile.in                                                         |only
 koffice-1.6.3/lib/kross/python/scripts/Makefile.in                                                     |only
 koffice-1.6.3/lib/kross/python/scripts/RestrictedPython/Makefile.in                                    |only
 koffice-1.6.3/lib/kross/ruby/Makefile.in                                                               |only
 koffice-1.6.3/lib/kross/runner/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/test/Makefile.in                                                               |only
 koffice-1.6.3/lib/kwmf/Makefile.in                                                                     |only
 koffice-1.6.3/lib/store/Makefile.in                                                                    |only
 koffice-1.6.3/lib/store/tests/Makefile.in                                                              |only
 koffice-1.6.3/mimetypes/Makefile.in                                                                    |only
 koffice-1.6.3/mimetypes/kde33/Makefile.in                                                              |only
 koffice-1.6.3/mimetypes/kde351/Makefile.in                                                             |only
 koffice-1.6.3/pics/Makefile.in                                                                         |only
 koffice-1.6.3/pics/crystalsvg/Makefile.in                                                              |only
 koffice-1.6.3/plugins/Makefile.in                                                                      |only
 koffice-1.6.3/plugins/scan/Makefile.in                                                                 |only
 koffice-1.6.3/servicetypes/Makefile.in                                                                 |only
 koffice-1.6.3/templates/Makefile.in                                                                    |only
 koffice-1.6.3/tools/Makefile.in                                                                        |only
 koffice-1.6.3/tools/converter/Makefile.in                                                              |only
 koffice-1.6.3/tools/kfile-plugins/Makefile.in                                                          |only
 koffice-1.6.3/tools/kfile-plugins/abiword/Makefile.in                                                  |only
 koffice-1.6.3/tools/kfile-plugins/gnumeric/Makefile.in                                                 |only
 koffice-1.6.3/tools/kfile-plugins/koffice/Makefile.in                                                  |only
 koffice-1.6.3/tools/kfile-plugins/ooo/Makefile.in                                                      |only
 koffice-1.6.3/tools/kthesaurus/Makefile.in                                                             |only
 koffice-1.6.3/tools/quickprint/Makefile.in                                                             |only
 koffice-1.6.3/tools/spell/Makefile.in                                                                  |only
 koffice-1.6.3/tools/thesaurus/Makefile.in                                                              |only
 koffice-1.6.3/tools/thumbnail/Makefile.in                                                              |only
 1156 files changed, 5215 insertions(+), 2017 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 koffice-20090306svn.patchIndex: koffice-20090306svn.patch
===================================================================
RCS file: koffice-20090306svn.patch
diff -N koffice-20090306svn.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-20090306svn.patch	26 Sep 2009 18:19:02 -0000	1.3
@@ -0,0 +1,26063 @@
+Only in koffice-1.6.3/: acinclude.m4
+Only in koffice-1.6.3/: aclocal.m4
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/acinclude.m4.in koffice-1.6-branch/admin/acinclude.m4.in
+--- koffice-1.6.3/admin/acinclude.m4.in	2007-05-30 16:50:22.000000000 -0500
++++ koffice-1.6-branch/admin/acinclude.m4.in	2008-11-03 12:17:22.000000000 -0600
+@@ -1226,7 +1226,15 @@
+   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
+ fi
+ if test $kde_qtver = 3; then
+-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
++  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
++  if test -z "$PKG_CONFIG"; then
++      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++  fi
++  if test "$PKG_CONFIG" != "no" ; then
++    if $PKG_CONFIG --exists qt-mt ; then
++       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
++    fi
++  fi
+ fi
+ if test $kde_qtver = 2; then
+    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
+@@ -1443,6 +1451,14 @@
+ for dir in $kde_qt_dirs; do
+    qt_incdirs="$qt_incdirs $dir/include $dir"
+ done
++if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++fi
++if test "$PKG_CONFIG" != "no" ; then
++  if $PKG_CONFIG --exists qt-mt ; then
++      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
++  fi
++fi
+ qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
+ if test ! "$ac_qt_includes" = "NO"; then
+    qt_incdirs="$ac_qt_includes $qt_incdirs"
+@@ -1459,8 +1475,16 @@
+ 
+ qt_libdirs=""
+ for dir in $kde_qt_dirs; do
+-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
++   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
+ done
++if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++fi
++if test "$PKG_CONFIG" != "no" ; then
++  if $PKG_CONFIG --exists qt-mt ; then
++      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
++  fi
++fi
+ qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
+ if test ! "$ac_qt_libraries" = "NO"; then
+   qt_libdir=$ac_qt_libraries
+@@ -2631,6 +2655,7 @@
+ AC_TRY_LINK(dnl
+ [
+ #include<zlib.h>
++#include<string.h>
+ ],
+ [
+   char buf[42];
+@@ -2638,7 +2663,7 @@
+   /* this would segfault.. but we only link, don't run */
+   (void) gzgets(f, buf, sizeof(buf));
+ 
+-  return (zlibVersion() == ZLIB_VERSION); 
++  return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
+ ],
+             eval "ac_cv_lib_z='-lz'",
+             eval "ac_cv_lib_z=no")
+@@ -2738,11 +2763,11 @@
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+-     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
++     if ! $PKG_CONFIG --exists OpenEXR ; then
+         AC_MSG_RESULT(no)
+         EXRSTATUS=no
+      else
+-        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
++        if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
+            AC_MSG_RESULT(no)
+            EXRSTATUS=old
+         else
+@@ -4624,7 +4649,8 @@
+ 
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.5",
++  KDE_CHECK_PYTHON_INTERN("2.6",
++    [KDE_CHECK_PYTHON_INTERN("2.5",
+     [KDE_CHECK_PYTHON_INTERN("2.4",
+      [KDE_CHECK_PYTHON_INTERN("2.3", 
+        [KDE_CHECK_PYTHON_INTERN("2.2", 
+@@ -4636,6 +4662,7 @@
+        ])
+      ])
+   ])
++    ])
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_STL],
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/cvs.sh koffice-1.6-branch/admin/cvs.sh
+--- koffice-1.6.3/admin/cvs.sh	2007-05-30 16:50:22.000000000 -0500
++++ koffice-1.6-branch/admin/cvs.sh	2008-11-03 12:17:22.000000000 -0600
+@@ -316,7 +316,7 @@
+    fi
+ fi
+ if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
+-     VERSION="\"3.5.7\""
++     VERSION="\"3.5.10\""
+ fi
+ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
+    modulename=`pwd`; 
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/detect-autoconf.pl koffice-1.6-branch/admin/detect-autoconf.pl
+--- koffice-1.6.3/admin/detect-autoconf.pl	2007-05-30 16:50:22.000000000 -0500
++++ koffice-1.6-branch/admin/detect-autoconf.pl	2008-11-03 12:17:22.000000000 -0600
+@@ -21,6 +21,73 @@
+     return "";
+ }
+ 
++# Subroutine to lexicographically compare two version strings, a and b.
++# If a > b, 1 is returned.
++# If a == b, 0 is returned.
++# If a < b, -1 is returned.
++#
++# If the strings are of uneven number length then the shorter string is
++# prepended by enough zeroes to make the two string lengths equal in order to
++# allow an accurate comparison.  Note that the zero-padding only occurs in
++# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
++# Parts of the version ending in -foo (or any other text) are not considered
++# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
++# 2.053)
++sub compareVersions
++{
++    my ($a, $b) = @_;
++
++    # Split the strings up by '.' (version separator) and start comparing digit
++    # length.
++
++    my @aParts = split(/\./, $a);
++    my @bParts = split(/\./, $b);
++
++    # Make the arrays equal in length by adding missing zeroes to the end of the
++    # version.
++    push @aParts, '0' while scalar @aParts < scalar @bParts;
++    push @bParts, '0' while scalar @bParts < scalar @aParts;
++
++    # Now compare each individual portion.
++    for (my $i = 0; $i < scalar @aParts; ++$i)
++    {
++	# Make sure that any portion that has numbers is contiguous.  I'm sure
++	# there's a technique for saving stuff like 2.52a2 but I don't feel
++	# like implementing it.
++	if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
++	    $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
++	{
++	    die "Not able to compare $a to $b!\n";
++	}
++
++	my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
++	my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
++
++	# Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
++	# the delta calculation below.
++	my $delta = (length $aDigits) - (length $bDigits);
++	if ($delta < 0) # b is longer
++	{
++	    my $replacement = ('0' x (-$delta)) . $aDigits;
++	    $aParts[$i] =~ s/$aDigits/$replacement/;
++	}
++	elsif ($delta > 0) # a is longer
++	{
++	    my $replacement = ('0' x $delta) . $bDigits;
++	    $bParts[$i] =~ s/$bDigits/$replacement/;
++	}
++    }
++
++    # Arrays now have standardized version components, let's re-merge them
++    # to strings to do the compare.
++    my $newA = join('.', @aParts);
++    my $newB = join('.', @bParts);
++
++    return 1 if ($newA gt $newB);
++    return -1 if ($newA lt $newB);
++    return 0;
++}
++
+ # Subroutine to determine the highest installed version of the given program,
+ # searching from the given paths.
+ sub findBest
[...25670 lines suppressed...]
++Comment[lt]=Patikrinti ?io ?od?io ra?yb?
+ Comment[lv]=P?rbaud?t ?? v?rda pareizrakst?bu
+ Comment[ms]=Semak Ejaan Kata ini
+ Comment[mt]=I??ekkja kif tispelli dil-kelma
+@@ -119,7 +122,8 @@
+ Comment[th]=?????????????????????
+ Comment[tr]=Bu Kelimenin ?mla Denetimini Yap
+ Comment[uk]=?????????? ???????? ????? ?????
+-Comment[uz]=?? ??????? ???????? ????????
++Comment[uz]=Shu so?zning imlosini tekshirish
++Comment[uz at cyrillic]=?? ??????? ???????? ????????
+ Comment[wa]=Coridj? l'?ortografeye di ?'?mot ci...
+ Comment[xh]=Khangela olu Pelo Magama
+ Comment[zh_CN]=??????
+Only in koffice-1.6.3/tools/spell: Makefile.in
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/spell/uninstall.desktop koffice-1.6-branch/tools/spell/uninstall.desktop
+--- koffice-1.6.3/tools/spell/uninstall.desktop	2007-05-30 16:36:09.000000000 -0500
++++ koffice-1.6-branch/tools/spell/uninstall.desktop	2008-11-03 11:55:08.000000000 -0600
+@@ -1,3 +1,2 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Hidden=true
+Only in koffice-1.6.3/tools/thesaurus: Makefile.in
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thesaurus/thesaurustool.desktop koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop
+--- koffice-1.6.3/tools/thesaurus/thesaurustool.desktop	2007-05-30 16:36:11.000000000 -0500
++++ koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop	2008-11-03 11:55:11.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Icon=
+ Name=Thesaurus Tool
+ Name[af]=Thesaurus Program
+@@ -14,13 +13,14 @@
+ Name[da]=Thesaurusv?rkt?j
+ Name[de]=Thesaurus-Werkzeug
+ Name[el]=???????? ?????????
+-Name[eo]=Teza?ro
++Name[eo]=Teza?rilo
+ Name[es]=Herramienta de Thesaurus
+ Name[et]=Tesaurus
+ Name[eu]=Thesaurus tresna
+ Name[fa]=????? Thesaurus
+ Name[fi]=Synonyymisanakirja
+ Name[fr]=Outil Th?saurus
++Name[fy]=Thesaurus ark
+ Name[gl]=Ferramenta de Sin?nimos
+ Name[he]=??? ?????
+ Name[hi]=?????? ??????? ?? ????
+@@ -40,7 +40,7 @@
+ Name[ne]=????????? ?????
+ Name[nl]=Thesaurus hulpprogramma
+ Name[nn]=Synonymordbok
+-Name[pl]=Thesaurus
++Name[pl]=Tezaurus
+ Name[pt]=Ferramenta de Sin?nimos
+ Name[pt_BR]=Ferramenta Thesaurus
+ Name[ru]=????????
+@@ -55,7 +55,8 @@
+ Name[th]=????????????????
+ Name[tr]=Thesaurus Arac?
+ Name[uk]=????? ?????????
+-Name[uz]=???????? ????????
++Name[uz]=Tezaurus vositasi
++Name[uz at cyrillic]=???????? ????????
+ Name[xh]=Isixhobo se Thesaurus
+ Name[zh_CN]=????
+ Name[zh_TW]=?????
+@@ -65,7 +66,7 @@
+ Comment=Show Related Words
+ Comment[af]=Vertoon Verwanter Woorde
+ Comment[ar]=????? ??????? ??? ???????
+-Comment[bg]=??????? ?? ???????? ?? ??????
++Comment[bg]=??????? ?? ????????
+ Comment[bs]=Prika?i srodne rije?i
+ Comment[ca]=Mostra paraules relacionades
+ Comment[cs]=Zobrazit podobn? slova
+@@ -80,6 +81,7 @@
+ Comment[fa]=????? ???????? ?????
+ Comment[fi]=N?yt? samankaltaiset sanat
+ Comment[fr]=Afficher les mots li?s
++Comment[fy]=Ferlykbere wurden sjen litte
+ Comment[gl]=Mostrar as Palabras Relacionadas
+ Comment[he]=??? ????? ??????
+ Comment[hi]=????????? ???? ??????
+@@ -90,11 +92,12 @@
+ Comment[ja]=??????
+ Comment[km]=???????????????????????
+ Comment[lo]=????????????????????
++Comment[lt]=Parodyti susijusius ?od?ius
+ Comment[lv]=R?d?t saist?tos v?rdus
+ Comment[ms]=Tayang Kata Berkaitan
+ Comment[mt]=Uri kliem relatati
+ Comment[nb]=Vis ord som ligner
+-Comment[nds]=Toh?ren W??r wiesen
++Comment[nds]=Lieke W??r wiesen
+ Comment[ne]=????????? ??????? ???????????
+ Comment[nl]=Toon gerelateerde woorden
+ Comment[nn]=Vis n?rskylde ord
+@@ -112,7 +115,8 @@
+ Comment[th]=????????????????????
+ Comment[tr]=?lgili Kelimeleri G?ster
+ Comment[uk]=???????? ???'????? ?????
+-Comment[uz]=?????? ?????? ???????? ????????
++Comment[uz]=Bog?liq bo?lgan so?zlarni ko?rsatish
++Comment[uz at cyrillic]=?????? ?????? ???????? ????????
+ Comment[wa]=Mostrer les mots k'?ont-st a vey avou
+ Comment[xh]=Bonisa Amagama Ahlobeneyo
+ Comment[zh_CN]=??????
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop
+--- koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
++++ koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop	2008-11-03 11:55:13.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=Clipart
+ Name[af]=Kitskuns
+@@ -36,7 +35,8 @@
+ Name[sr at Latn]=Ise?ci
+ Name[th]=?????????
+ Name[uk]=??????????
+-Name[uz]=???????
++Name[uz]=Klipart
++Name[uz at cyrillic]=???????
+ Name[zh_CN]=???
+ Name[zh_TW]=???
+ ServiceTypes=ThumbCreator
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop
+--- koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
++++ koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop	2008-11-03 11:55:13.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=KOffice Files
+ Name[af]=Koffice L?ers
+@@ -13,7 +12,7 @@
+ Name[da]=KOffice-filer
+ Name[de]=KOffice-Dateien
+ Name[el]=?????? KOffice
+-Name[eo]=KOficejo-dosieroj
++Name[eo]=KOffice-dosieroj
+ Name[es]=Archivos de KOffice
+ Name[et]=KOffice'i failid
+ Name[eu]=KOffice-en fitxategiak
+@@ -21,6 +20,7 @@
+ Name[fi]=KOffice-tiedostot
+ Name[fo]=KSkrivstovu-f?lir
+ Name[fr]=Fichiers KOffice
++Name[fy]=KOffice-triemmen
+ Name[ga]=Comhaid KOffice
+ Name[gl]=Ficheiros de KOffice
+ Name[he]=???? KOffice
+@@ -58,7 +58,8 @@
+ Name[th]=????????????????????????? K
+ Name[tr]=KOffice Dosyalar?
+ Name[uk]=????? KOffice
+-Name[uz]=KOffice ????????
++Name[uz]=KOffice fayllari
++Name[uz at cyrillic]=KOffice ????????
+ Name[wa]=Fitch?s KOffice
+ Name[xh]=Iifayile ze KOffice
+ Name[zh_CN]=KOffice ??
+Only in koffice-1.6.3/tools/thumbnail: Makefile.in
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop
+--- koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
++++ koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop	2009-03-06 14:55:19.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=Other Office Files
+ Name[af]=Ander Kantoor L?ers
+@@ -21,6 +20,7 @@
+ Name[fi]=Muut toimistotiedostot
+ Name[fo]=A?rar skrivstovuf?lir
+ Name[fr]=Autres documents bureautiques
++Name[fy]=Oare office triemmen
+ Name[gl]=Outros Ficheiros de KOffice
+ Name[he]=???? Office ?????
+ Name[hi]=???? ????? ???????
+@@ -43,7 +43,7 @@
+ Name[pa]=??? ????? ??????
+ Name[pl]=Inne pliki biurowe
+ Name[pt]=Outros Ficheiros de Escrit?rio
+-Name[pt_BR]=Outros Arquivos Office
++Name[pt_BR]=Outros arquivos Office
+ Name[ro]=Alte fi?iere KOffice
+ Name[ru]=?????? ????? Office
+ Name[se]=Ear? Office-fiillat
+@@ -57,7 +57,8 @@
+ Name[th]=??????????????????????????
+ Name[tr]=Di?er Ofis Dosyalar?
+ Name[uk]=???? ????? KOffice
+-Name[uz]=????? ???? ????? ???????
++Name[uz]=Idora uchun boshqa fayllar
++Name[uz at cyrillic]=????? ???? ????? ???????
+ Name[wa]=?tes fitch?s di buro
+ Name[xh]=Ezinye Iifayile ze Office
+ Name[zh_CN]=?? Office ??


Index: koffice-svn_checkout.sh
===================================================================
RCS file: koffice-svn_checkout.sh
diff -N koffice-svn_checkout.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-svn_checkout.sh	26 Sep 2009 18:19:02 -0000	1.3
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+DATE=$(date +%Y%m%d)
+EXPORT_DIR=koffice
+
+set -x
+rm -rf $EXPORT_DIR
+
+# app
+svn export svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice/ $EXPORT_DIR/
+
+tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR
+
+# cleanup
+rm -rf $EXPORT_DIR
+

koffice-xpdf-CVE-2007-3387.diff:
 Stream.cc |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Index: koffice-xpdf-CVE-2007-3387.diff
===================================================================
RCS file: koffice-xpdf-CVE-2007-3387.diff
diff -N koffice-xpdf-CVE-2007-3387.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-xpdf-CVE-2007-3387.diff	26 Sep 2009 18:19:02 -0000	1.7
@@ -0,0 +1,20 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream 
+   predLine = NULL;
+   ok = gFalse;
+ 
+-  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+-     nComps >= INT_MAX / nBits ||
+-      width >= INT_MAX / nComps / nBits)
+-    return;
+-
+   nVals = width * nComps;
+-  if (nVals * nBits + 7 <= 0)
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++     nComps >= 4 || nBits > 16 ||
++      width >= INT_MAX / nComps ||
++      nVals >= (INT_MAX - 7) / nBits)
+     return;
+ 
+   pixBytes = (nComps * nBits + 7) >> 3;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	24 Sep 2009 13:33:41 -0000	1.34
+++ .cvsignore	26 Sep 2009 18:19:01 -0000	1.35
@@ -1 +1,5 @@
-koffice-2.0.82.tar.bz2
+koffice-1.6.0.tar.bz2
+koffice-1.6.1.tar.bz2
+koshell.png
+koffice-1.6.2.tar.bz2
+koffice-1.6.3.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/koffice.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- koffice.spec	11 Sep 2009 15:57:23 -0000	1.120
+++ koffice.spec	26 Sep 2009 18:19:02 -0000	1.121
@@ -1,72 +1,101 @@
 
-#define kchart 1
-#define kexi 1
-#define kformula 1
-#define kivio 1
-#define kugar 1
-
-%if 0%{?fedora} > 10
-%define external_lilypond_fonts 1
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
 %endif
 
+%define svn 20090306
+
 Name:           koffice
-Epoch:          2 
-Version:        2.0.82
-Release:        1%{?dist}
+Epoch:          3
+Version:        1.6.3
+Release:        26.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
-# apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#-- The following OPTIONAL packages could NOT be located on your system.
-#-- Consider installing them to enable more features from this software.
-#+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
-#+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
-
-BuildRequires: boost-devel
-BuildRequires: bzip2-devel
-BuildRequires: cmake
-BuildRequires: desktop-file-utils
-BuildRequires: doxygen
-BuildRequires: eigen2-devel
-BuildRequires: exiv2-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freeglut-devel
-BuildRequires: freetype-devel
-BuildRequires: gettext-devel
-BuildRequires: glew-devel
-BuildRequires: gmm-devel
-BuildRequires: GraphicsMagick-devel
-BuildRequires: gsl-devel
-BuildRequires: kdelibs4-devel
-BuildRequires: kdepimlibs-devel
-BuildRequires: lcms-devel
-BuildRequires: libGL-devel libGLU-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libkdcraw-devel >= 0.2.0
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
+Source100:      koshell.png
+
+Patch50: koffice-1.6.3-glibc_strrchr.patch
+
+## hand-crafted patch, pretty close to:
+# LANG=en_US.UTF-8 svn diff \
+#  svn://anonsvn.kde.org/home/kde/tags/koffice/1.6.3/koffice \
+#  svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \
+#  > koffice-%{svn}svn.patch
+Patch100: koffice-%{svn}svn.patch
+# Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
+Patch101: koffice-1.6.3-quint32.patch
+# fix for older ImageMagick
+Patch102: koffice-1.6.3-magick_version.patch
+
+# http://www.kde.org/info/security/advisory-20070730-1.txt
+Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
+
+# http://www.kde.org/info/security/advisory-20071107-1.txt
+Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
+
+# upstream patch pulled via: svn diff -c 738929 
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+Patch3: koffice-1.6.3-gcc43.patch
+
+# drop need/use of local fonts, use dejavu instead of arev
+Patch4: koffice-1.6.3-dejavu_fonts.patch
+
+# BuildRequires: world-devel ;)
+BuildRequires:  %{kdelibs3}-devel
+# See http://bugzilla.redhat.com/244091
+%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+BuildRequires: automake libtool
+BuildRequires:  freetype-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  GraphicsMagick-devel
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
+BuildRequires:  python-devel
+BuildRequires:  pcre-devel
+BuildRequires:  lcms-devel
+BuildRequires:  gettext-devel
+BuildRequires:  mysql-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  perl
+BuildRequires:  wv2-devel
+BuildRequires:  libpqxx-devel
+BuildRequires:  doxygen
+BuildRequires:  aspell-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  libGL-devel libGLU-devel
+BuildRequires:  readline-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define ruby 1
+BuildRequires:  ruby ruby-devel >= 1.8.2
+%endif
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:  libpaper-devel
+BuildRequires:  libXi-devel
+%endif
+# FIXME: work to get these into EPEL
+%if 0%{?fedora} > 6
 BuildRequires: libwpd-devel
-BuildRequires: libwpg-devel
-BuildRequires: libxslt-devel
-%if 0%{?kexi}
-BuildRequires: mysql-devel
-BuildRequires: libpqxx-devel
+%define libwpd 1
+BuildRequires: poppler-qt-devel
 %endif
-## when OpenCTL/OpenGTL is ready
-#BuildRequires: OpenGTL-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: perl
-BuildRequires: poppler-qt4-devel
-BuildRequires: pstoedit
-BuildRequires: qca2-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: readline-devel
-BuildRequires: wv2-devel >= 0.4.0
+
 
 %description
 KOffice is an integrated office suite.
@@ -76,176 +105,135 @@ Summary:        An integrated office sui
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
-Requires:       %{name}-core = %{epoch}:%{version}-%{release} 
-Requires:       %{name}-kword = %{epoch}:%{version}-%{release} 
-Requires:       %{name}-kspread = %{epoch}:%{version}-%{release} 
-Requires:       %{name}-kpresenter = %{epoch}:%{version}-%{release}
-%if 0%{?kivio}
-Requires:       %{name}-kivio = %{epoch}:%{version}-%{release}
-%endif
-Requires:       %{name}-karbon = %{epoch}:%{version}-%{release}
-Requires:       %{name}-krita = %{epoch}:%{version}-%{release}
-%if 0%{?kugar}
-Requires:       %{name}-kugar = %{epoch}:%{version}-%{release}
-%endif
-%if 0%{?kexi}
-Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-Requires:       %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release}
-Requires:       %{name}-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
-%endif
-%if 0%{?kchart}
-Requires:       %{name}-kchart = %{epoch}:%{version}-%{release}
-%endif
-%if 0%{?kformula}
-Requires:       %{name}-kformula = %{epoch}:%{version}-%{release}
-%endif
-Requires:       %{name}-filters = %{epoch}:%{version}-%{release}
-Requires:       %{name}-kplato = %{epoch}:%{version}-%{release}
+Requires:       koffice-core = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kword = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kspread = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kpresenter = %{epoch}:%{version}-%{release}
+Requires:       koffice-kivio = %{epoch}:%{version}-%{release}
+Requires:       koffice-karbon = %{epoch}:%{version}-%{release}
+Requires:       koffice-krita = %{epoch}:%{version}-%{release}
+Requires:       koffice-kugar = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-mysql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kchart = %{epoch}:%{version}-%{release}
+Requires:       koffice-kformula = %{epoch}:%{version}-%{release}
+Requires:       koffice-filters = %{epoch}:%{version}-%{release}
+Requires:       koffice-kplato = %{epoch}:%{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
 
 %package core
-Summary:        Core support files for koffice
+Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
-%if 0%{?external_lilypond_fonts}
-Requires:       lilypond-emmentaler-fonts
-%endif
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-%if ! 0%{?kchart}
-Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kexi}
-Obsoletes: koffice-kexi < %{epoch}:%{version}-%{release}
-Obsoletes: koffice-kexi-driver-mysql < %{epoch}:%{version}-%{release}
-Obsoletes: koffice-kexi-driver-pgsql < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kivio}
-Obsoletes: koffice-kivio < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kformula}
-Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kukar}
-Obsoletes: koffice-kugar < %{epoch}:%{version}-%{release}
-%endif
-
+Requires:       perl
+Conflicts:      koffice-i18n < 4:%{version}
 %description core
 %{summary}.
 
 %package libs
-Summary:        Runtime libraries for koffice
+Summary:        Runtime libraries for %{name} 
 Group:          System Environment/Libraries
+Conflicts:      koffice <= 4:%{version}-%{release}
+Requires:       %{kdelibs3} >= %{kdelibs3_ver}
+License:        LGPLv2+
 %description libs
 %{summary}.
-
 %package devel
-Summary:        Libraries needed for koffice development
+Summary:        Development files for %{name} 
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:       kdelibs4-devel
-
+License:        LGPLv2+
 %description devel
-%{summary}
+%{summary}.
 
 %package kword
-Summary:A frame-based word processor capable of professional standard documents
+Summary:	A frame-based word processor capable of professional standard documents
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kword
-%{summary}
+%{summary}.
 
 %package kspread
 Summary:        A powerful spreadsheet application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kspread
-%{summary}
+%{summary}.
 
 %package kpresenter
 Summary:        A full-featured presentation program
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kpresenter
-%{summary}
+%{summary}.
 
 %package kivio
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:      kivio < %{version}-%{release}
-
 %description kivio
-%{summary}
+%{summary}.
 
 %package karbon
 Summary:        A vector drawing application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description karbon
-%{summary}
+%{summary}.
 
 %package krita
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-filters
-
+Requires:       %{name}-filters
 %description krita
-%{summary}
+%{summary}.
 
 %package kugar
 Summary:        A tool for generating business quality reports
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kugar
-%{summary}
+%{summary}.
 
 %package kexi
 Summary:        An integrated environment for managing data
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kexi
-%{summary}
+%{summary}.
 For additional database drivers take a look at %{name}-kexi-driver-*
 
 %package kexi-driver-mysql
-Summary:        mysql-driver for kexi
+Summary:        Mysql-driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-
 %description kexi-driver-mysql
-%{summary}
+%{summary}.
 
 %package kexi-driver-pgsql
-Summary:        pgsql-driver for kexi
+Summary:        Postgresql driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-
 %description kexi-driver-pgsql
-%{summary}
+%{summary}.
 
-%if 0%{?kchart}
 %package kchart
 Summary:        An integrated graph and chart drawing tool
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kchart
-%{summary}
-%endif
+%{summary}.
 
 %package kformula
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-#if 0%{?fedora} > 9
+#if 0%{?fedora} > 9 
 Requires:       lyx-cmex10-fonts
 #else
 #Requires:       mathml-fonts
@@ -253,174 +241,182 @@ Requires:       lyx-cmex10-fonts
 %if 0%{?fedora} > 10
 Requires:       dejavu-lgc-sans-fonts
 %else
-Requires:       dejavu-lgc-fonts
+Requires:       dejavu-lgc-fonts 
 %endif
 %description kformula
-%{summary}
+%{summary}.
 
 %package filters
 Summary:        Import and Export Filters for KOffice
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-# for karbon eps import filter
-Requires:       pstoedit
-
 %description filters
-%{summary}
+%{summary}.
 
 %package kplato
 Summary:         An integrated project management and planning tool
 Group:           Applications/Productivity
 Requires:        %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kplato
-%{summary}
+%{summary}.
 
 
 %prep
 %setup -q
 
+%if 0%{?svn:1}
+%patch100 -p1 -b .svn
+%patch101 -p1 -b .quint32
+%patch102 -p1 -b .magick_version
+%else
+%patch1 -p0 -b .CVE-2007-3387
+%patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
+%endif
+
+%patch4 -p1 -b .dejavu
+# use LGC variant instead
+sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
+
+%patch50 -p1 -b glibc_strrchr
+
+# hack/fix for newer automake
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+make -f admin/Makefile.common
+
 
 %build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
-%{cmake_kde4} \
-  -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
-  ..
-popd
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --disable-final
 
-make %{?_smp_mflags} -C %{_target_platform} 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-
-## unpackaged files
-# fonts
-%if 0%{?external_lilypond_fonts}
-rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
-%endif
-rm -rfv %{buildroot}%{_kde4_appsdir}/apps/kformula/fonts/
-# conflicts with oxygen-icon-theme  
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
-# extraneous stuff we don't want in -devel
-rm -fv %{buildroot}%{_kde4_libdir}/lib*common.so
-rm -fv %{buildroot}%{_kde4_libdir}/lib*filters.so
-rm -fv %{buildroot}%{_kde4_libdir}/lib*private.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkformdesigner.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
-%if ! 0%{?kchart}
-rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
-rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
-rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
-%endif
-%if ! 0%{?kexi}
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
-%endif
-%if ! 0%{?kformula}
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
-%endif
-%if ! 0%{?kivio}
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
-%endif
+[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
+install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
 
-rm -f devel.list
-for lib in %{buildroot}%{_kde4_libdir}/lib*.so ; do
-if [ -L ${lib} ]; then
-  echo $lib | sed -e "s|^%{buildroot}||" >> devel.list
-fi
+# Replace absolute symlinks with relative ones
+pushd %{buildroot}%{_docdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in */*; do
+      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+    done
+    popd
+  fi
 done
+popd
 
-
-%check
-## FIXME: fix validation errors
-for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
-desktop-file-validate ${desktop_file} ||:
+desktop-file-install \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
+  --vendor="" \
+  --delete-original \
+  %{buildroot}%{_datadir}/applnk/Office/*.desktop
+
+## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
+## until http://bugzilla.redhat.com/245190 is fixed
+for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
+  grep "^NoDisplay=" ${desktop_file} || \
+    echo "NoDisplay=True" >> ${desktop_file}
 done
 
+## unpackaged files
+# fonts
+rm -rfv %{buildroot}%{_datadir}/apps/kformula/fonts/
+# libtool archives
+rm -f %{buildroot}%{_libdir}/lib*.la
+# shouldn't these be in koffice-l10n? 
+rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# -devel symlinks to nuke
+rm -f %{buildroot}%{_libdir}/lib*common.so
+rm -f %{buildroot}%{_libdir}/lib*filters.so
+rm -f %{buildroot}%{_libdir}/lib*private.so
+rm -f %{buildroot}%{_libdir}/libkarbon*.so
+rm -f %{buildroot}%{_libdir}/libkchart*.so
+rm -f %{buildroot}%{_libdir}/libkexi*.so
+rm -f %{buildroot}%{_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{_libdir}/libkplato*.so
+rm -f %{buildroot}%{_libdir}/libkpresenter*.so
+rm -f %{buildroot}%{_libdir}/libkword*.so
+rm -f %{buildroot}%{_libdir}/libkrita*.so
+rm -f %{buildroot}%{_libdir}/libkross*.so
+rm -f %{buildroot}%{_libdir}/libkugar*.so
+
 
 %clean
-rm -rf %{buildroot} 
-
+rm -rf %{buildroot}
 
 %post core
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans core
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
 
 %postun core
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
 fi
 
-%post kword
-/sbin/ldconfig
+%posttrans core
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 
-%postun kword
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%post kword -p /sbin/ldconfig
 
-%post kpresenter
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%postun kword -p /sbin/ldconfig
 
-%postun kpresenter
-/sbin/ldconfig
+%posttrans kword
 update-desktop-database -q &> /dev/null ||:
 
-%post kugar
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%post kpresenter -p /sbin/ldconfig
 
-%postun kugar
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%postun kpresenter -p /sbin/ldconfig
 
-%post kexi
-/sbin/ldconfig
+%posttrans kpresenter
 update-desktop-database -q &> /dev/null ||:
 
-%postun kexi
-/sbin/ldconfig
+%post kugar -p /sbin/ldconfig
+
+%postun kugar -p /sbin/ldconfig
+
+%posttrans kugar
 update-desktop-database -q &> /dev/null ||:
 
-%if 0%{?kchart}
-%post kchart
-/sbin/ldconfig
+%post kexi -p /sbin/ldconfig
+
+%postun kexi -p /sbin/ldconfig
+
+%posttrans kexi
 update-desktop-database -q &> /dev/null ||:
 
-%postun kchart
-/sbin/ldconfig
+%post kchart -p /sbin/ldconfig
+
+%postun kchart -p /sbin/ldconfig
+
+%posttrans kchart
 update-desktop-database -q &> /dev/null ||:
-%endif
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -433,473 +429,378 @@ update-desktop-database -q &> /dev/null 
 
 %files core
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB README
-%{_kde4_bindir}/kthesaurus
-%{_kde4_bindir}/koconverter
-%{_kde4_libdir}/libkdeinit4_kthesaurus.so
-%{_kde4_libdir}/kde4/autocorrect.so
-%{_kde4_libdir}/kde4/changecase.so
-%{_kde4_libdir}/kde4/clipartthumbnail.*
-%{_kde4_libdir}/kde4/defaulttools.so
-%{_kde4_libdir}/kde4/kodocinfopropspage.*
-%{_kde4_libdir}/kde4/kofficescan.*
-%{_kde4_libdir}/kde4/kofficethumbnail.*
-%{_kde4_libdir}/kde4/kopabackgroundtool.*
-%{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
-%{_kde4_libdir}/kde4/kofficegrayau8plugin.so
-%{_kde4_libdir}/kde4/kofficedockers.so
-%{_kde4_libdir}/kde4/kofficesimpletextedit.so
-%{_kde4_libdir}/kde4/libkounavailpart.*
-%{_kde4_libdir}/kde4/paragraphtool.so
-%{_kde4_libdir}/kde4/spellcheck.so
-%{_kde4_libdir}/kde4/textvariables.so
-%{_kde4_libdir}/kde4/thesaurustool.so
-%{_kde4_appsdir}/koffice/
-%{_kde4_docdir}/HTML/en/koffice/
-%{_kde4_docdir}/HTML/en/thesaurus/
-%{_kde4_datadir}/applications/kde4/KThesaurus.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/autocorrect.desktop
-%{_kde4_datadir}/kde4/services/changecase.desktop
-%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
-%{_kde4_datadir}/kde4/services/defaulttools.desktop
-%{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop
-%{_kde4_datadir}/kde4/services/kofficethumbnail.desktop
-%{_kde4_datadir}/kde4/services/koffice_graya_u16_plugin.desktop
-%{_kde4_datadir}/kde4/services/kofficegrayaplugin.desktop
-%{_kde4_datadir}/kde4/services/kofficedockers.desktop
-%{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
-%{_kde4_datadir}/kde4/services/kounavail.desktop
-%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
-%{_kde4_datadir}/kde4/services/paragraphtool.desktop
-%{_kde4_datadir}/kde4/services/spellcheck.desktop
-%{_kde4_datadir}/kde4/services/textvariables.desktop
-%{_kde4_datadir}/kde4/services/thesaurustool.desktop
-%{_kde4_datadir}/kde4/servicetypes/filtereffect.desktop
-%{_kde4_datadir}/kde4/servicetypes/kochart.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
-%{_kde4_datadir}/kde4/servicetypes/koplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
-%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop
-%{_kde4_datadir}/applications/kde4/*koffice.desktop
-%{_kde4_datadir}/kde4/services/*shape.desktop
-%if 0%{?kformula}
-%{_kde4_appsdir}/formulashape/
-%endif
-%{_kde4_appsdir}/musicshape/
-%dir %{_datadir}/color/
-%dir %{_datadir}/color/icc/
-%{_datadir}/color/icc/pigment/
-%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
-%{_kde4_libdir}/kde4/pathshapes.so
-%{_kde4_datadir}/kde4/services/pathshapes.desktop
+%doc AUTHORS COPYING README
+%{_bindir}/koshell
+%{_bindir}/kthesaurus
+%{_bindir}/koconverter
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/kde3/kfile_koffice.*
+%{_libdir}/kde3/kfile_ooo.*
+%{_libdir}/kde3/kfile_abiword.*
+%{_libdir}/kde3/kfile_gnumeric.*
+%{_libdir}/kde3/kodocinfopropspage.*
+%{_libdir}/kde3/kofficescan.*
+%{_libdir}/kde3/kofficethumbnail.*
+%{_libdir}/kde3/koshell.*
+%{_libdir}/kde3/kthesaurus.*
+%{_libdir}/kde3/kwmailmerge_classic.*
+%{_libdir}/kde3/kwmailmerge_kabc.*
+%{_libdir}/kde3/kwmailmerge_qtsqldb_power.*
+%{_libdir}/kde3/kwmailmerge_qtsqldb.*
+%{_libdir}/kde3/libkounavailpart.*
+%{_libdir}/kde3/libkprkword.*
+%{_libdir}/kde3/libthesaurustool.*
+%{_libdir}/kde3/clipartthumbnail.*
+%{_datadir}/apps/koffice/
+%{_datadir}/apps/konqueror/servicemenus/*
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
+%{_datadir}/config.kcfg/koshell.kcfg
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/services/clipartthumbnail.desktop
+%{_datadir}/services/kfile*.desktop
+%{_datadir}/services/kwmailmerge*.desktop
+%{_datadir}/services/kodocinfopropspage.desktop
+%{_datadir}/services/kofficethumbnail.desktop
+%{_datadir}/services/kounavail.desktop
+%{_datadir}/services/kprkword.desktop
+%{_datadir}/services/thesaurustool.desktop
+%{_datadir}/servicetypes/kochart.desktop
+%{_datadir}/servicetypes/kofficepart.desktop
+%{_datadir}/servicetypes/koplugin.desktop
+%{_datadir}/servicetypes/kwmailmerge.desktop
+%{_datadir}/servicetypes/widgetfactory.desktop
+%{_datadir}/applications/kde/*koffice.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
+%{_datadir}/apps/kofficewidgets/
+%{_datadir}/apps/kross/
+%{_libdir}/kde3/krosspython.*
+%{?ruby:%{_libdir}/kde3/krossruby.*}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_datadir}/kde4/servicetypes/flake*.desktop
-%{_kde4_libdir}/libflake.so.*
-%{_kde4_libdir}/kde4/*shape.so
-%if 0%{?kformula}
-%exclude %{_kde4_libdir}/kde4/formulashape.*
-%endif
-%exclude %{_kde4_libdir}/kde4/kritashape.*
-%{_kde4_libdir}/libchartshapelib.so.*
-%{_kde4_libdir}/libkdchart.so.*
-%{_kde4_libdir}/libkoaction.so.*
-#{_kde4_libdir}/libkoaspectbutton.so.*
-%{_kde4_libdir}/libkobase.so.*
-#{_kde4_libdir}/libkocharacterselectiondialog.so.*
-%{_kde4_libdir}/libkochart.so.*
-%{_kde4_libdir}/libkocolorwidgets.so.*
-#{_kde4_libdir}/libkocvsimport.so.*
-#{_kde4_libdir}/libkodocumentsectionbox.so.*
-%{_kde4_libdir}/libkoffice_graya_u16.so.*
-%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
-#{_kde4_libdir}/libkoinput.so.*
-%{_kde4_libdir}/libkokross.so.*
-#{_kde4_libdir}/libkolinestyleselector.so.*
-%{_kde4_libdir}/libkomain.so.*
-%{_kde4_libdir}/libkoodf.so.*
-#{_kde4_libdir}/libkoopenpane.so.*
-%{_kde4_libdir}/libkopageapp.so.*
-#{_kde4_libdir}/libkopagelayout.so.*
-#{_kde4_libdir}/libkopicture.so.*
-%{_kde4_libdir}/libkoplugin.so.*
-#{_kde4_libdir}/libkoprogress.so.*
-%{_kde4_libdir}/libkoresources.so.*
-#{_kde4_libdir}/libkoresourcewidget.so.*
-%{_kde4_libdir}/libkostore.so.*
-%{_kde4_libdir}/libkotext.so.*
-%{_kde4_libdir}/libkowidgets.so.*
-%{_kde4_libdir}/libkowmf.so.*
-#{_kde4_libdir}/libkozoomaction.so.*
-%{_kde4_libdir}/libkspreadcommon.so.*
-%{_kde4_libdir}/libkwmf.so.*
-%if 0%{?kformula}
-%{_kde4_libdir}/libkformulalib.so.*
-%endif
-%{_kde4_libdir}/libpigmentcms.so.*
+%doc COPYING.LIB
+#_libdir/libk*common.so.*
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/libkspreadcommon.so.*
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
 
-%files -f devel.list devel
+%files devel
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
 %{_includedir}/*
-%{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
+# FIXME: include only shlib symlinks we know/want to export
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkudesignercore.so
+
+%files kword
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kword/
+%{_bindir}/kword
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
+%{_libdir}/kde3/libkwordpart.*
+%{_libdir}/kde3/kword.*
+%{_datadir}/apps/kword/
+%{_datadir}/services/kword*.desktop
+%{_datadir}/services/kwserial*.desktop
+%{_datadir}/templates/TextDocument.desktop
+%{_datadir}/templates/.source/TextDocument.kwt
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kspread
-%{_kde4_libdir}/libkdeinit4_kspread.so
-%{_kde4_libdir}/kde4/krossmodulekspread.so
-%{_kde4_libdir}/kde4/kspread*.so
-%{_kde4_libdir}/kde4/libkspreadpart.*
-%{_kde4_libdir}/kde4/libcsvexport.*
-%{_kde4_libdir}/kde4/libcsvimport.*
-%{_kde4_libdir}/kde4/libgnumericexport.*
-%{_kde4_libdir}/kde4/libgnumericimport.*
-%{_kde4_libdir}/kde4/libkspreadhtmlexport.*
-%{_kde4_libdir}/kde4/libkspreadsolver.so
-%{_kde4_libdir}/kde4/libopencalcexport.*
-%{_kde4_libdir}/kde4/libopencalcimport.*
-%{_kde4_libdir}/kde4/libqproimport.*
-%{_kde4_appsdir}/kspread/
-%{_kde4_docdir}/HTML/en/kspread/
-%{_kde4_datadir}/config.kcfg/kspread.kcfg
-%{_kde4_datadir}/kde4/services/kspread*.desktop
-%{_kde4_datadir}/templates/SpreadSheet.desktop
-%{_kde4_datadir}/templates/.source/SpreadSheet.kst
-%{_kde4_datadir}/applications/kde4/*kspread.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
-%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
-%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop
+%lang(en) %{_docdir}/HTML/en/kspread/
+%{_bindir}/kspread
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/kde3/kspread.*
+%{_libdir}/kde3/libkspreadpart.*
+%{_libdir}/kde3/kwmailmerge_kspread.*
+%{_libdir}/kde3/libcsvexport.*
+%{_libdir}/kde3/libcsvimport.*
+%{_libdir}/kde3/libgnumericexport.*
+%{_libdir}/kde3/libgnumericimport.*
+%{_libdir}/kde3/libkspreadhtmlexport.*
+%{_libdir}/kde3/libkspreadinsertcalendar.*
+%{_libdir}/kde3/libopencalcexport.*
+%{_libdir}/kde3/libopencalcimport.*
+%{_libdir}/kde3/libqproimport.*
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/services/kspread*.desktop
+%{_datadir}/templates/SpreadSheet.desktop
+%{_datadir}/templates/.source/SpreadSheet.kst
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kpresenter
-%{_kde4_libdir}/libkdeinit4_kpresenter.so
-%{_kde4_libdir}/libkpresenterprivate.so.*
-%{_kde4_libdir}/kde4/*kpresenter*.*
-%{_kde4_libdir}/kde4/kpr_*.*
-%{_kde4_libdir}/kde4/libFilterkpr2odf.so
-%{_kde4_appsdir}/kpresenter/
-%{_kde4_configdir}/kpresenterrc
-%{_kde4_docdir}/HTML/en/kpresenter/
-%{_kde4_datadir}/kde4/services/kpr*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
-%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop
-%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop
-%{_kde4_datadir}/templates/Presentation.desktop
-%{_kde4_datadir}/templates/.source/Presentation.kpt
-%{_kde4_datadir}/applications/kde4/*kpresenter.desktop
-%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kpresenter/
+%{_bindir}/kpresenter
+%{_bindir}/kprconverter.pl
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
+%{_libdir}/kde3/*kpresenter*.*
+%{_datadir}/apps/kpresenter/
+%{_datadir}/services/kpresenter*.desktop
+%{_datadir}/templates/Presentation.desktop
+%{_datadir}/templates/.source/Presentation.kpt
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
-%{_kde4_bindir}/karbon
-%{_kde4_configdir}/karbonrc
-%{_kde4_libdir}/libkdeinit4_karbon.so
-%{_kde4_libdir}/libkarboncommon.so.*
-%{_kde4_libdir}/libkarbonui.so.*
-%{_kde4_libdir}/kde4/*karbon*.*
-%{_kde4_libdir}/kde4/libwmfexport.*
-%{_kde4_libdir}/kde4/libwmfimport.*
-%{_kde4_appsdir}/karbon/
-%{_kde4_datadir}/kde4/services/karbon*
-%{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop
-%{_kde4_datadir}/templates/Illustration.desktop
-%{_kde4_datadir}/templates/.source/Illustration.karbon
-%{_kde4_datadir}/applications/kde4/*karbon.desktop
-%{_kde4_docdir}/HTML/en/karbon/
-%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/karbon/
+%{_bindir}/karbon
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/kde3/*karbon*.*
+%{_libdir}/kde3/libwmfexport.*
+%{_libdir}/kde3/libwmfimport.*
+%{_datadir}/apps/karbon/
+%{_datadir}/services/karbon*
+%{_datadir}/servicetypes/karbon_module.desktop
+%{_datadir}/templates/Illustration.desktop
+%{_datadir}/templates/.source/Illustration.karbon
+%{_datadir}/applications/kde/*karbon.desktop
 
 %files krita
 %defattr(-,root,root,-)
-%{_kde4_bindir}/krita
-%{_kde4_configdir}/kritarc
-%{_kde4_libdir}/libkdeinit4_krita.so
-%{_kde4_libdir}/libkrita*.so.*
-%{_kde4_libdir}/kde4/*krita*.*
-%{_kde4_libdir}/libkrossmodulekrita.so.*
-%{_kde4_appsdir}/krita/
-%{_kde4_datadir}/kde4/services/krita*.desktop
-%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
-%{_kde4_datadir}/applications/kde4/*krita*.desktop
-# FIXME: add scriptlet
-%{_datadir}/mime/packages/krita_ora.xml
-%{_kde4_appsdir}/kritaplugins/
-%{_kde4_docdir}/HTML/en/krita/
-%{_datadir}/color/icc/krita/
-%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/krita/
+%{_bindir}/krita
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita*.so.*
+%{_libdir}/kde3/*krita*.*
+%{_datadir}/apps/krita/
+%{_datadir}/services/krita*.desktop
+%{_datadir}/servicetypes/krita*.desktop
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/applnk/.hidden/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
 
-%if 0%{?kexi}
 %files kugar
 %defattr(-,root,root,-)
-%{_kde4_docdir}/HTML/en/kugar/
-%endif
+%lang(en) %{_docdir}/HTML/en/kugar/
+%{_bindir}/kugar
+%{_bindir}/kudesigner
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
+%{_libdir}/kde3/kudesigner.*
+%{_libdir}/kde3/kugar.*
+%{_libdir}/kde3/libkudesignerpart.*
+%{_libdir}/kde3/libkugarpart.*
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/services/kugar*.desktop
+%{_datadir}/applications/kde/*kugar.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
-%if 0%{?kexi}
 %files kexi
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kexi*
-%{_kde4_bindir}/ksqlite*
-%{_kde4_libdir}/libkexi*.so.*
-%{_kde4_libdir}/libkformdesigner.so.*
-%{_kde4_libdir}/kde4/kformdesigner_*.*
-%{_kde4_libdir}/kde4/kexidb_sqlite3driver.*
-%{_kde4_libdir}/kde4/kexihandler_*.*
-%{_kde4_libdir}/kde4/krossmodulekexidb.so
-%{_kde4_libdir}/kde4/pgzkexireportpart2.so
-%{_kde4_datadir}/config/kexirc
-%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
-%{_kde4_datadir}/kde4/services/kexi
-%{_kde4_appsdir}/kexi/
-%{_kde4_datadir}/kde4/services/kformdesigner/*
-%{_kde4_docdir}/HTML/en/kexi/
-%{_kde4_datadir}/applications/kde4/*kexi.desktop
-%{_kde4_datadir}/kde4/services/kexidb_sqlite*driver.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kexi/
+%{_bindir}/kexi*
+%{_bindir}/ksqlite*
+%{_bindir}/krossrunner
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexi*.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/kde3/kformdesigner_*.*
+%{_libdir}/kde3/kexidb_sqlite2driver.*
+%{_libdir}/kde3/kexidb_sqlite3driver.*
+%{_libdir}/kde3/kexihandler_*.*
+%{_libdir}/kde3/kexi.*
+%{_libdir}/kde3/krosskexiapp.*
+%{_libdir}/kde3/krosskexidb.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_datadir}/config/kexirc
+%{_datadir}/config/magic/kexi.magic
+%{_datadir}/mimelnk/application/*
+%{_datadir}/servicetypes/kexi*.desktop
+%{_datadir}/services/kexi/
+%{_datadir}/apps/kexi/
+%{_datadir}/services/kformdesigner/*
+%{_datadir}/applications/kde/*kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kexidb_mysqldriver.*
-%{_kde4_libdir}/kde4/keximigrate_mysql.*
-%{_kde4_datadir}/kde4/services/keximigrate_mysql.desktop
-%{_kde4_datadir}/kde4/services/kexidb_mysqldriver.desktop
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
 %files kexi-driver-pgsql
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kexidb_pqxxsqldriver.*
-%{_kde4_libdir}/kde4/keximigrate_pqxx.*
-%{_kde4_datadir}/kde4/services/kexidb_pqxxsqldriver.desktop
-%{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop
-%endif
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
-%if 0%{?kchart}
 %files kchart
 %defattr(-,root,root,-)
-## Some parts of kchart went awol 1.9.98.1 -> 1.9.98.2, bug?
-#{_kde4_bindir}/kchart
-%{_kde4_libdir}/libkchartcommon.so.*
-#{_kde4_libdir}/libkdeinit4_kchart.so
-%{_kde4_libdir}/kde4/*kchart*.*
-%{_kde4_appsdir}/kchart/
-%{_kde4_datadir}/config.kcfg/kchart.kcfg
-%{_kde4_datadir}/kde4/services/kchart*.desktop
-%{_kde4_docdir}/HTML/en/kchart/
-#{_kde4_datadir}/applications/kde4/*kchart.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
-%endif
+%lang(en) %{_docdir}/HTML/en/kchart/
+%{_bindir}/kchart
+%{_libdir}/libkchart*.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/kde3/*kchart*.*
+%{_datadir}/apps/kchart/
+%{_datadir}/services/kchart*.desktop
+%{_datadir}/applications/kde/*kchart.desktop
 
-%if 0%{?kformula}
 %files kformula
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit_kformula.so
-%{_kde4_libdir}/libkformulaprivate.so.*
-%{_kde4_libdir}/kde4/*kformula*.*
-%{_kde4_libdir}/kde4/formulashape.*
-%{_kde4_appsdir}/kformula/
-%{_kde4_datadir}/kde4/services/kformula*.desktop
-%{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_kde4_docdir}/HTML/en/kformula/
-%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
-%endif
+%lang(en) %{_docdir}/HTML/en/kformula/
+%{_bindir}/kformula
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/kde3/*kformula*.*
+%{_datadir}/apps/kformula/
+%{_datadir}/services/kformula*.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
-%if 0%{?kivio}
 %files kivio
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kivio
-%{_kde4_libdir}/libkdeinit4_kivio.so
-%{_kde4_libdir}/libkivioprivate.so.*
-%{_kde4_libdir}/kde4/*kivio*.*
-%{_kde4_appsdir}/kivio/
-%{_kde4_docdir}/HTML/en/kivio/
-%{_kde4_datadir}/kde4/services/kivio*.desktop
-%{_kde4_datadir}/applications/kde4/kivio.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
-%{_kde4_docdir}/HTML/en/kivio/
-%endif
+%lang(en) %{_docdir}/HTML/en/kivio/
+%{_bindir}/kivio
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
+%{_libdir}/kde3/*kivio*.*
+%{_libdir}/kde3/straight_connector.*
+%{_datadir}/apps/kivio/
+%{_datadir}/config.kcfg/kivio.kcfg
+%{_datadir}/services/kivio*.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libkwordexportfilters.so.*
-%{_kde4_libdir}/kde4/libabiwordexport.*
-%{_kde4_libdir}/kde4/libabiwordimport.*
-%{_kde4_libdir}/kde4/libamiproexport.*
-%{_kde4_libdir}/kde4/libamiproimport.*
-%{_kde4_libdir}/kde4/libapplixspreadimport.*
-%{_kde4_libdir}/kde4/libapplixwordimport.*
-%{_kde4_libdir}/kde4/libasciiexport.*
-%{_kde4_libdir}/kde4/libasciiimport.*
-%{_kde4_libdir}/kde4/libdbaseimport.*
-%{_kde4_libdir}/kde4/libdocbookexport.*
-%{_kde4_libdir}/kde4/libexcelimport.*
-%{_kde4_libdir}/kde4/libgenerickofilter.*
-%{_kde4_libdir}/kde4/libhtmlexport.*
-%{_kde4_libdir}/kde4/libhtmlimport.*
-%{_kde4_libdir}/kde4/libkspreadlatexexport.*
-%{_kde4_libdir}/kde4/libkwordkword1dot3import.*
-%{_kde4_libdir}/kde4/libmswordodf_import.*
-%{_kde4_libdir}/kde4/libmswriteexport.*
-%{_kde4_libdir}/kde4/libmswriteimport.*
-%{_kde4_libdir}/kde4/liboowriterexport.*
-%{_kde4_libdir}/kde4/liboowriterimport.*
-%{_kde4_libdir}/kde4/libpalmdocexport.*
-%{_kde4_libdir}/kde4/libpalmdocimport.*
-%{_kde4_libdir}/kde4/libpowerpointimport.*
-%{_kde4_libdir}/kde4/librtfexport.*
-%{_kde4_libdir}/kde4/librtfimport.*
-%{_kde4_libdir}/kde4/libwmlexport.*
-%{_kde4_libdir}/kde4/libwmlimport.*
-%{_kde4_libdir}/kde4/libwpexport.*
-%{_kde4_libdir}/kde4/libwpgimport.*
-%{_kde4_libdir}/kde4/libwpimport.*
-#{_kde4_libdir}/kde4/libmswordimport.*
-#{_kde4_libdir}/kde4/libmswordodf_import.*
-%{_kde4_libdir}/kde4/libxsltimport.*
-%{_kde4_libdir}/kde4/libxsltexport.*
-%{_kde4_libdir}/kde4/libhancomwordimport.*
-%{_kde4_appsdir}/xsltfilter/
-%{_kde4_datadir}/kde4/services/generic_filter.desktop
-%{_kde4_datadir}/kde4/services/xslt*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofilter*.desktop
+%{_libdir}/libkwordexportfilters.so.*
+%{_libdir}/kde3/libabiwordexport.*
+%{_libdir}/kde3/libabiwordimport.*
+%{_libdir}/kde3/libamiproexport.*
+%{_libdir}/kde3/libamiproimport.*
+%{_libdir}/kde3/libapplixspreadimport.*
+%{_libdir}/kde3/libapplixwordimport.*
+%{_libdir}/kde3/libasciiexport.*
+%{_libdir}/kde3/libasciiimport.*
+%{_libdir}/kde3/libdbaseimport.*
+%{_libdir}/kde3/libdocbookexport.*
+%{_libdir}/kde3/libexcelimport.*
+%{_libdir}/kde3/libgenerickofilter.*
+%{_libdir}/kde3/libhtmlexport.*
+%{_libdir}/kde3/libhtmlimport.*
+%{_libdir}/kde3/libkarbonepsimport.*
+%{_libdir}/kde3/libkfolatexexport.*
+%{_libdir}/kde3/libkfomathmlexport.*
+%{_libdir}/kde3/libkfomathmlimport.*
+%{_libdir}/kde3/libkfopngexport.*
+%{_libdir}/kde3/libkspreadlatexexport.*
+%{_libdir}/kde3/libkugarnopimport.*
+%{_libdir}/kde3/libkwordkword1dot3import.*
+%{_libdir}/kde3/libkwordlatexexport.*
+%{_libdir}/kde3/libmswriteexport.*
+%{_libdir}/kde3/libmswriteimport.*
+%{_libdir}/kde3/libooimpressexport.*
+%{_libdir}/kde3/libooimpressimport.*
+%{_libdir}/kde3/liboowriterexport.*
+%{_libdir}/kde3/liboowriterimport.*
+%{_libdir}/kde3/libpalmdocexport.*
+%{_libdir}/kde3/libpalmdocimport.*
+%{_libdir}/kde3/libpdfimport.*
+%{_libdir}/kde3/librtfexport.*
+%{_libdir}/kde3/librtfimport.*
+%{_libdir}/kde3/libwmlexport.*
+%{_libdir}/kde3/libwmlimport.*
+%{_libdir}/kde3/libwpexport.*
+%if 0%{?libwpd}
+%{_libdir}/kde3/libwpimport.*
+%endif
+%{_libdir}/kde3/libmswordimport.*
+%{_libdir}/kde3/libxsltimport.*
+%{_libdir}/kde3/libxsltexport.*
+%{_libdir}/kde3/libhancomwordimport.*
+%{_libdir}/kde3/libkfosvgexport.*
+%{_libdir}/kde3/liboodrawimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
+%{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
+%{_datadir}/services/xslt*.desktop
+%{_datadir}/servicetypes/kofilter*.desktop
 
 %files kplato
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kplato
-%{_kde4_bindir}/kplatowork
-%{_kde4_configdir}/kplatorc
-%{_kde4_configdir}/kplatoworkrc
-%{_kde4_datadir}/config.kcfg/kplatosettings.kcfg
-%{_kde4_libdir}/libkdeinit4_kplato.so
-%{_kde4_libdir}/libkdeinit4_kplatowork.so
-%{_kde4_libdir}/kde4/libkplatopart.*
-%{_kde4_libdir}/kde4/libkplatoworkpart.so
-%{_kde4_libdir}/libkplato*.so.*
-%{_kde4_libdir}/kde4/libicalendarexport.*
-%{_kde4_libdir}/kde4/krossmodulekplato.so
-%{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
-%{_kde4_appsdir}/kplato/
-%{_kde4_appsdir}/kplatowork/
-%{_kde4_docdir}/HTML/en/kplato/
-%{_kde4_datadir}/kde4/services/kplato*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kplato*.desktop
-%{_kde4_datadir}/applications/kde4/kplato.desktop
-%{_kde4_datadir}/applications/kde4/kplatowork.desktop
-
-%files kword
-%defattr(-,root,root,-)
-%{_kde4_bindir}/kword
-%{_kde4_configdir}/kwordrc
-%{_kde4_libdir}/libkdeinit4_kword.so
-%{_kde4_libdir}/libkwordprivate.so.*
-%{_kde4_libdir}/kde4/krossmodulekword.so
-%{_kde4_libdir}/kde4/libkwordpart.*
-%{_kde4_appsdir}/kword/
-#{_kde4_docdir}/HTML/en/kword/
-%{_kde4_datadir}/kde4/services/*kword*.desktop
-%{_kde4_datadir}/templates/TextDocument.desktop
-%{_kde4_datadir}/templates/.source/TextDocument.kwt
-%{_kde4_datadir}/applications/kde4/*kword.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kplato/
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato/
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 
 %changelog
-* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
-- koffice-2.0.82 (2.1beta2)
-
-* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-3
-- fixup some cross dependencies between -filters -kplato -krita
-
-* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-2
-- fix %%files
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 3:1.6.3-26.20090306svn
+- Epoch++ (revert koffice2 -> koffice1)
 
-* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
-- koffice-2.0.81 (2.1beta1)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.1-3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.1-2 
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
 - rebuild (GraphicsMagick)
 
-* Wed Jun 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.1-1
-- koffice-2.0.1
-- KOffice 2 ships private copy of Emmentaler music font (#507741)
-
-* Fri May 22 2009 Luk?? Tinkl <ltinkl at redhat.com> - 2:2.0.0-1
-- KOffice 2.0.0
-
-* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:1.0.99.0-1
-- koffice-1.0.99.0, koffice2 RC1
-- optimize/fix scriptlets
-
-* Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.7-1
-- koffice-1.9.98.7, koffice2 beta 7
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.98.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.6-1
-- koffice-1.9.98.6, koffice2 beta 6
-
-* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-2 
-- respin (mysql)
-
-* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-1
-- koffice-1.9.98.5, koffice2 beta 5 (take 2)
-
-* Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.4-1
-- koffice-1.9.98.4 (koffice2 beta5) 
-
-* Sun Dec 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-2
-- respin (omit broken eviv2 support, for now)
-
-* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-1
-- koffice-1.9.98.3 (koffice2 beta4)
-
-* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:1.9.98.2-4
-- Rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
-
-* Wed Dec 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.2-3
-- Conflicts with oxygen-icon-theme-4.1.80 (#474268)
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:1.9.98.2-2
-- Rebuild for Python 2.6
-
-* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-2
-- fix conflicts with oxygen-icon-theme
-
-* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-1
-- koffice-1.9.98.2 (koffice2 beta3)
-- kchart awol
-
-* Thu Oct 09 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.1-1
-- koffice-1.9.98.1 (koffice2 beta2)
-
-* Wed Oct 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-2
-- -krita: move %%{_kde4_libdir}/libKrita*.so here
-- BR: libkdcraw-devel >= 0.2.0
-
-* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-1
-- koffice-1.9.98.0 (koffice2 beta1)
-- Epoch: 1
-
-* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1
-- koffice-1.9.95.10
-
-* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
-- koffice-1.9.95.9
-- fix pkg interdependencies, multilib issues
-
-* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8.2
-- respin (eviv2)
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
+- -kformula: Requires: lyx-cmex10-fonts
 
-* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
-- koffice-1.9.95.8
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-23.20090306svn
+- -kformula: use dejavu-lgc-sans-fonts
+- optimize scriptlets
+
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
+- -kformula: omit bundled fonts
+- koffice kword crash with formulas (#514217)
+
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-21.20090306svn
+- -krita: revert/re-add dropped Requires: -filters
+
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:1.6.3-20.20090306svn
+- rebuild for new ImageMagick
+
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-19.20090306svn
+- revert koffice2 -> koffice1, Epoch bump
+- 20090306svn
+
+* Mon Nov 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-18
+- pull in svn updates
+
+* Mon Oct 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-17
+- move libkiviocommon to -kivio (avoids libpython/multilib issues)
+
+* Thu Sep 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-16
+- revert koffice2->koffice1, introduce Epoch (F-10)
+- fix pkg interdependencies (#394101), multilib issues
+- -krita: drop Requires: %%name-filters (#394101)
+- cleanup scriptlets
 
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-15
 - upstream gcc43 patch (#433994)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	24 Sep 2009 13:33:41 -0000	1.34
+++ sources	26 Sep 2009 18:19:02 -0000	1.35
@@ -1 +1,2 @@
-25080954dd83b0d7d480b66bd89d1374  koffice-2.0.82.tar.bz2
+03382edf62db9913b57ad8760c7d5f52  koshell.png
+386d388094734f9759977c3267098e30  koffice-1.6.3.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 26 18:19:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 26 Sep 2009 18:19:13 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.19,
	1.20 koffice-langpack.spec, 1.25, 1.26 sources, 1.20, 1.21
Message-ID: <20090926181913.A12DD11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6600

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.1.6-4
- Epoch++ (revert koffice2 -> koffice1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	11 Sep 2009 16:49:00 -0000	1.19
+++ .cvsignore	26 Sep 2009 18:19:13 -0000	1.20
@@ -1,27 +1,76 @@
-koffice-l10n-ca-2.0.82.tar.bz2
-koffice-l10n-cs-2.0.82.tar.bz2
-koffice-l10n-da-2.0.82.tar.bz2
-koffice-l10n-de-2.0.82.tar.bz2
-koffice-l10n-el-2.0.82.tar.bz2
-koffice-l10n-en_GB-2.0.82.tar.bz2
-koffice-l10n-es-2.0.82.tar.bz2
-koffice-l10n-et-2.0.82.tar.bz2
-koffice-l10n-fr-2.0.82.tar.bz2
-koffice-l10n-fy-2.0.82.tar.bz2
-koffice-l10n-gl-2.0.82.tar.bz2
-koffice-l10n-hi-2.0.82.tar.bz2
-koffice-l10n-it-2.0.82.tar.bz2
-koffice-l10n-ja-2.0.82.tar.bz2
-koffice-l10n-kk-2.0.82.tar.bz2
-koffice-l10n-nb-2.0.82.tar.bz2
-koffice-l10n-nds-2.0.82.tar.bz2
-koffice-l10n-nl-2.0.82.tar.bz2
-koffice-l10n-pl-2.0.82.tar.bz2
-koffice-l10n-pt-2.0.82.tar.bz2
-koffice-l10n-pt_BR-2.0.82.tar.bz2
-koffice-l10n-sv-2.0.82.tar.bz2
-koffice-l10n-tr-2.0.82.tar.bz2
-koffice-l10n-uk-2.0.82.tar.bz2
-koffice-l10n-wa-2.0.82.tar.bz2
-koffice-l10n-zh_CN-2.0.82.tar.bz2
-koffice-l10n-zh_TW-2.0.82.tar.bz2
+clog
+koffice-l10n-ca-1.6.2.tar.bz2
+koffice-l10n-cs-1.6.2.tar.bz2
+koffice-l10n-cy-1.6.2.tar.bz2
+koffice-l10n-da-1.6.2.tar.bz2
+koffice-l10n-de-1.6.2.tar.bz2
+koffice-l10n-el-1.6.2.tar.bz2
+koffice-l10n-en_GB-1.6.2.tar.bz2
+koffice-l10n-es-1.6.2.tar.bz2
+koffice-l10n-et-1.6.2.tar.bz2
+koffice-l10n-eu-1.6.2.tar.bz2
+koffice-l10n-fa-1.6.2.tar.bz2
+koffice-l10n-fi-1.6.2.tar.bz2
+koffice-l10n-fr-1.6.2.tar.bz2
+koffice-l10n-ga-1.6.2.tar.bz2
+koffice-l10n-gl-1.6.2.tar.bz2
+koffice-l10n-hu-1.6.2.tar.bz2
+koffice-l10n-it-1.6.2.tar.bz2
+koffice-l10n-ja-1.6.2.tar.bz2
+koffice-l10n-km-1.6.2.tar.bz2
+koffice-l10n-lv-1.6.2.tar.bz2
+koffice-l10n-ms-1.6.2.tar.bz2
+koffice-l10n-nb-1.6.2.tar.bz2
+koffice-l10n-nl-1.6.2.tar.bz2
+koffice-l10n-pl-1.6.2.tar.bz2
+koffice-l10n-pt-1.6.2.tar.bz2
+koffice-l10n-pt_BR-1.6.2.tar.bz2
+koffice-l10n-ru-1.6.2.tar.bz2
+koffice-l10n-sk-1.6.2.tar.bz2
+koffice-l10n-sl-1.6.2.tar.bz2
+koffice-l10n-sr-1.6.2.tar.bz2
+koffice-l10n-sr at Latn-1.6.2.tar.bz2
+koffice-l10n-sv-1.6.2.tar.bz2
+koffice-l10n-tr-1.6.2.tar.bz2
+koffice-l10n-uk-1.6.2.tar.bz2
+koffice-l10n-zh_CN-1.6.2.tar.bz2
+koffice-l10n-zh_TW-1.6.2.tar.bz2
+koffice-l10n-bg-1.6.3.tar.bz2
+koffice-l10n-ca-1.6.3.tar.bz2
+koffice-l10n-cs-1.6.3.tar.bz2
+koffice-l10n-cy-1.6.3.tar.bz2
+koffice-l10n-da-1.6.3.tar.bz2
+koffice-l10n-de-1.6.3.tar.bz2
+koffice-l10n-el-1.6.3.tar.bz2
+koffice-l10n-en_GB-1.6.3.tar.bz2
+koffice-l10n-es-1.6.3.tar.bz2
+koffice-l10n-et-1.6.3.tar.bz2
+koffice-l10n-eu-1.6.3.tar.bz2
+koffice-l10n-fa-1.6.3.tar.bz2
+koffice-l10n-fi-1.6.3.tar.bz2
+koffice-l10n-fr-1.6.3.tar.bz2
+koffice-l10n-ga-1.6.3.tar.bz2
+koffice-l10n-gl-1.6.3.tar.bz2
+koffice-l10n-hu-1.6.3.tar.bz2
+koffice-l10n-it-1.6.3.tar.bz2
+koffice-l10n-ja-1.6.3.tar.bz2
+koffice-l10n-km-1.6.3.tar.bz2
+koffice-l10n-lv-1.6.3.tar.bz2
+koffice-l10n-ms-1.6.3.tar.bz2
+koffice-l10n-nb-1.6.3.tar.bz2
+koffice-l10n-nds-1.6.3.tar.bz2
+koffice-l10n-ne-1.6.3.tar.bz2
+koffice-l10n-nl-1.6.3.tar.bz2
+koffice-l10n-pl-1.6.3.tar.bz2
+koffice-l10n-pt-1.6.3.tar.bz2
+koffice-l10n-pt_BR-1.6.3.tar.bz2
+koffice-l10n-ru-1.6.3.tar.bz2
+koffice-l10n-sk-1.6.3.tar.bz2
+koffice-l10n-sl-1.6.3.tar.bz2
+koffice-l10n-sr-1.6.3.tar.bz2
+koffice-l10n-sr at Latn-1.6.3.tar.bz2
+koffice-l10n-sv-1.6.3.tar.bz2
+koffice-l10n-tr-1.6.3.tar.bz2
+koffice-l10n-uk-1.6.3.tar.bz2
+koffice-l10n-zh_CN-1.6.3.tar.bz2
+koffice-l10n-zh_TW-1.6.3.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- koffice-langpack.spec	11 Sep 2009 16:49:00 -0000	1.25
+++ koffice-langpack.spec	26 Sep 2009 18:19:13 -0000	1.26
@@ -1,10 +1,14 @@
 
-%define koffice_core_version 2:2.0
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+%endif
 
 Name:           koffice-langpack
-Epoch:          1
-Version:        2.0.82
-Release:        1%{?dist}
+Epoch:          2 
+Version:        1.6.3
+Release:        4%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
@@ -12,511 +16,471 @@ License:        GPLv2+
 URL:            http://www.koffice.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+
 # borrowed from kdelibs' tarball, help with locale=Full Name mappings
 Source0: teamnames
-#Source1: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ar-%{version}.tar.bz2
-#Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
-#Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
-#Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
-#Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eo-%{version}.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
-#Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
-#Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fa-%{version}.tar.bz2
-#Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fi-%{version}.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fr-%{version}.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fy-%{version}.tar.bz2
-#Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
-#Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-he-%{version}.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hi-%{version}.tar.bz2
-#Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hne-%{version}.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-kk-%{version}.tar.bz2
-#Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
-#Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
-#Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
-#Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
-#Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
-#Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-se-%{version}.tar.bz2
-#Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
-#Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
-#Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
-#Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr at Latn-%{version}.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sv-%{version}.tar.bz2
-#Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ta-%{version}.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-wa-%{version}.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fa-%{version}.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fi-%{version}.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fr-%{version}.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hu-%{version}.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr at Latn-%{version}.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sv-%{version}.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
 
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel
+BuildRequires:  %{kdelibs3}-devel
 BuildRequires:  libxml2
 
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description af
-Provides additional Afrikaans translations for koffice
-
-%package ar
-Summary:        Arabic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description ar
-Provides additional Arabic translations for koffice
-
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description bs
-Provides additional Bosnian translations for koffice
-
-%package br
-Summary:        Breton language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description br
-Provides additional Breton translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description af
+#Provides additional afrikaans translations for koffice
+
+#%package ar
+#Summary:        Arabic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description bs
+#Provides additional bosnian translations for koffice
+
+#%package br
+#Summary:        Breton language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description br
+#Provides additional breton translations for koffice
 
 %package bg
 Summary:        Bulgarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description bg
-Provides additional Bulgarian translations for koffice
+Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description ca
-Provides additional Catalan translations for koffice
+Provides additional catalan translations for koffice
 
 %package cs
 Summary:        Czech language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description cs
-Provides additional Czech translations for koffice
+Provides additional czech translations for koffice
 
 %package cy
 Summary:        Welsh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description cy
-Provides additional Delsh translations for koffice
+Provides additional welsh translations for koffice
 
 %package da
 Summary:        Danish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description da
-Provides additional Danish translations for koffice
+Provides additional danish translations for koffice
 
 %package de
 Summary:        German language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description de
-Provides additional German translations for koffice
+Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description eo
-Provides additional Esperanto translations for koffice
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description el
-Provides additional Greek translations for koffice
+Provides additional greek translations for koffice
 
 %package en_GB
 Summary:        British English language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description en_GB
-Provides additional British English translations for koffice
+Provides additional british english translations for koffice
 
 %package es
 Summary:        Spanish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description es
-Provides additional Spanish translations for koffice
+Provides additional spanish translations for koffice
 
 %package et
 Summary:        Estonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description et
-Provides additional Estonian translations for koffice
+Provides additional estonian translations for koffice
 
 %package eu
 Summary:        Basque language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description eu
-Provides additional Basque translations for koffice
+Provides additional basque translations for koffice
 
 %package fa
 Summary:        Farsi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description fa 
-Provides additional Farsi translations for koffice
+Provides additional farsi translations for koffice
 
 %package fi
 Summary:        Finish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description fi
-Provides additional Finish translations for koffice
+Provides additional finish translations for koffice
 
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description fr
-Provides additional French translations for koffice
-
-%package fy
-Summary:        Frisian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description fy
-Provides additional Frisian translations for koffice
+Provides additional french translations for koffice
 
 %package ga
 Summary:        Irish-Gaelic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description ga
-Provides additional Irish-Gaelic translations for koffice
+Provides additional irish-gaelic translations for koffice
 
 %package gl
 Summary:        Galician language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description gl
-Provides additional Galician translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description he
-Provides additional Hebrew translations for koffice
-
-%package hi
-Summary:        Hindi language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description hi
-Provides additional Hindi translations for koffice
+Provides additional galician translations for koffice
 
-%package hne
-Summary:        Chhattisgarhi language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description hne
-Provides additional Chhattisgarhi translations for koffice
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description he
+#Provides additional hebrew translations for koffice
+
+#%package hi
+#Summary:        Hindi language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description hu
-Provides additional Hungarian translations for koffice
+Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description is
-Provides additional Icelandic translations for koffice
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description it
-Provides additional Italian translations for koffice
+Provides additional italian translations for koffice
 
 %package ja
 Summary:        Japanese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description ja
-Provides additional Japanese translations for koffice
-
-%package kk
-Summary:        Kazakh language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description kk
-Provides additional Kazakh translations for koffice
+Provides additional japanese translations for koffice
 
 %package km
 Summary:        Khmer language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description km 
-Provides additional Khmer translations for koffice
+Provides additional khmer translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description lt
-Provides additional Lithuanian translations for koffice
-
-%package lv
-Summary:        Lativian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description lv
-Provides additional Lativian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description mk
-Provides additional Macedonian translations for koffice
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description ms
-Provides additional Malay translations for koffice
+Provides additional malay translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description nb
-Provides additional Bokmal translations for koffice
+Provides additional bokmal translations for koffice
 
 %package nds 
 Summary:        Low Saxon language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description nds 
-Provides additional Low Saxon translations for koffice
+Provides additional low saxon translations for koffice
 
 %package ne
 Summary:        Nepali language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description ne 
-Provides additional Nepali translations for koffice
+Provides additional nepali translations for koffice
 
 %package nl
 Summary:        Dutch language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description nl
-Provides additional Dutch translations for koffice
+Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description nn
-Provides additional Nynorsk translations for koffice
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description pl
-Provides additional Polish translations for koffice
+Provides additional polish translations for koffice
 
 %package pt_BR
 Summary:        Brazilian Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description pt_BR
-Provides additional Brazilian Portuguese translations for koffice
+Provides additional brazilian portuguese translations for koffice
 
 %package pt
 Summary:        Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description pt
-Provides additional Portuguese translations for koffice
+Provides additional portuguese translations for koffice
 
 %package ru
 Summary:        Russian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description ru
-Provides additional Russian translations for koffice
+Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description ro
-Provides additional Romanian translations for koffice
-
-%package se
-Summary:        Northern Sami language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description se
-Provides additional Northern Sami translations for koffice
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description ro
+#Provides additional romanian translations for koffice
+
+#%package se
+#Summary:        Northern Sami language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description sk
-Provides additional Slovak translations for koffice
+Provides additional slovak translations for koffice
 
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description sl
-Provides additional Slovenian translations for koffice
+Provides additional slovenian translations for koffice
 
 %package sr-Latn
 Summary:        Serbian in Latin language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description sr-Latn
-Provides additional Serbian in latin translations for koffice
+Provides additional serbian in latin translations for koffice
 
 %package sr
 Summary:        Serbian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description sr
-Provides additional Serbian translations for koffice
+Provides additional serbian translations for koffice
 
 %package sv
 Summary:        Swedish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description ta
-Provides additional Tamil translations for koffice
-
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description tg
-Provides additional Tajik translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description ta
+#Provides additional tamil translations for koffice
+
+#%package tg
+#Summary:        Tajik language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description tr
-Provides additional Turkish translations for koffice
+Provides additional turkish translations for koffice
 
 %package uk
 Summary:        Ukrainian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description uk
-Provides additional Ukrainian translations for koffice
+Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
-%description uz
-Provides additional Uzbek translations for koffice
-
-%package wa
-Summary:	Walloon language pack for koffice 
-Group:		Applications/Productivity 
-Requires:	koffice-core >= %{koffice_core_version}
-%description wa 
-Provides additional Walloon translations for koffice
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description zh_CN
 Provides additional simplified chinese translations for koffice
 
 %package zh_TW
 Summary:        Traditional Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       koffice-core >= %{version}
 %description zh_TW
-Provides additional traditional Chinese translations for koffice
+Provides additional traditional chinese translations for koffice
+
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+%description lv
+Provides additional lativian translations for koffice
 
 
 %prep
-%setup -T -c -q -n %{name} -a 4 -a 5 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 -a 46
+%setup -T -c -q -n %{name} -a 1  -a 2  -a 3  -a 4  -a 5  -a 6  -a 7  -a 8  -a 9  -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39
 
 
 %build
 for koffice_lang in * ; do
-  if [ -f $koffice_lang/CMakeLists.txt ]; then
+  if [ -x $koffice_lang/configure ]; then
     pushd $koffice_lang
-     mkdir -p %{_target_platform}
-     pushd %{_target_platform}
-      %{cmake_kde4} .. 
-      make %{?_smp_mflags}
-     popd
+    %configure
+    make %{?_smp_mflags}
     popd
   fi
 done
 
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 for koffice_lang in * ; do
-  if [ -f $koffice_lang/CMakeLists.txt ]; then
-    make -C $koffice_lang/%{_target_platform} install/fast DESTDIR=%{buildroot} 
+  if [ -x $koffice_lang/configure ]; then
+    make -C $koffice_lang install DESTDIR=$RPM_BUILD_ROOT 
   fi
 done
 
-%if 0
-HTML_DIR=$(kde4-config --expandvars --install html)
+HTML_DIR=$(kde-config --expandvars --install html)
+
 # Replace absolute symlinks with relative ones
-if [ -d %{buildroot}$HTML_DIR ]; then
-pushd %{buildroot}%{_docdir}/HTML
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+pushd $RPM_BUILD_ROOT%{_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
@@ -528,46 +492,42 @@ for lang in *; do
 done
 popd
 fi
-%endif
 
+# remove file conflict (kdgantt.mo) with kde-i18n (kde bug #75096)
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
 
-%clean
-rm -rf %{buildroot}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-#files ar 
-#lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-#files bg
-#lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
-#files br
-#lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+%files bg
+%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
-%lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
-%lang(ca) %{_kde4_docdir}/HTML/ca/*
+%lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
+%lang(ca) %{_datadir}/doc/HTML/ca/*
 
 %files cs
 %defattr(-,root,root,-)
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
+%lang(cs) %{_datadir}/apps/koffice/autocorrect/cs.xml
 
-#files cy
-#defattr(-,root,root,-)
-#lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%files cy
+%defattr(-,root,root,-)
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
 
 %files da
 %defattr(-,root,root,-)
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
-%lang(da) %{_kde4_docdir}/HTML/da/*
+%lang(da) %{_datadir}/doc/HTML/da/*
 
 %files de
 %defattr(-,root,root,-)
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
-%lang(de) %{_kde4_appsdir}/koffice/autocorrect/de.xml
-%lang(de) %{_kde4_docdir}/HTML/de/*
+%lang(de) %{_datadir}/apps/koffice/autocorrect/de.xml
+%lang(de) %{_datadir}/doc/HTML/de/*
 
 %files el
 %defattr(-,root,root,-)
@@ -576,149 +536,120 @@ rm -rf %{buildroot}
 %files en_GB
 %defattr(-,root,root,-)
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
-
-#files eo
-#defattr(-,root,root,-)
-#lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+%lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
-%lang(es) %{_kde4_appsdir}/koffice/autocorrect/es.xml
-%lang(es) %{_kde4_docdir}/HTML/es/*
+%lang(es) %{_datadir}/apps/koffice/autocorrect/es.xml
+%lang(es) %{_datadir}/doc/HTML/es/*
 
 %files et
 %defattr(-,root,root,-)
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
-%lang(et) %{_kde4_docdir}/HTML/et/
+%lang(et) %{_datadir}/doc/HTML/et/
 
-#files eu
-#defattr(-,root,root,-)
-#lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
-
-#files fa 
-#defattr(-,root,root,-)
-#lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-
-#files fi
-#defattr(-,root,root,-)
-#lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+%files eu
+%defattr(-,root,root,-)
+%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+
+%files fa 
+%defattr(-,root,root,-)
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+
+%files fi
+%defattr(-,root,root,-)
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 
 %files fr
 %defattr(-,root,root,-)
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
-%lang(fr) %{_kde4_appsdir}/koffice/autocorrect/fr.xml
-%lang(fr) %{_kde4_docdir}/HTML/fr/*
+%lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
+%lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files fy
+%files ga
 %defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
-
-#files ga
-#defattr(-,root,root,-)
-#lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
 
 %files gl
 %defattr(-,root,root,-)
 %lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
-%lang(gl) %{_kde4_docdir}/HTML/gl/*
+%lang(fr) %{_datadir}/doc/HTML/gl/*
 
-#files he 
-#defattr(-,root,root,-)
-#lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi 
+%files hu
 %defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
-#files hne
-#defattr(-,root,root,-)
-#lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
-
-#files hu
-#defattr(-,root,root,-)
-#lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
-#lang(hu) %{_kde4_appsdir}/koffice/autocorrect/hu.xml
+%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+%lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
-%lang(it) %{_kde4_appsdir}/koffice/autocorrect/it.xml
-%lang(it) %{_kde4_docdir}/HTML/it/*
+%lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
+%lang(it) %{_datadir}/doc/HTML/it/*
 
-%if 0
 %files lv
 %defattr(-,root,root,-)
 %lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%endif
 
 %files ja
 %defattr(-,root,root,-)
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
-%files kk 
+%files km 
 %defattr(-,root,root,-)
-%lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
+%lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
 
-#files km 
-#defattr(-,root,root,-)
-#lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
-
-#files ms
-#defattr(-,root,root,-)
-#lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
+%files ms
+%defattr(-,root,root,-)
+%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
 
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
-%lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
 
 %files nds
 %defattr(-,root,root,-)
 %lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/*
-%lang(nds) %{_kde4_appsdir}/koffice/autocorrect/nds.xml
 
-#files ne
-#defattr(-,root,root,-)
-#lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
+%files ne
+%defattr(-,root,root,-)
+%lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
 
 %files nl
 %defattr(-,root,root,-)
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
-%lang(nl) %{_kde4_docdir}/HTML/nl/*
+%lang(nl) %{_datadir}/doc/HTML/nl/*
 
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
 
+%files pt_BR
+%defattr(-,root,root,-)
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_datadir}/doc/HTML/pt_BR/*
+
 %files pt
 %defattr(-,root,root,-)
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
-%lang(pt) %{_kde4_docdir}/HTML/pt/*
+%lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files pt_BR
+%files ru
 %defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
-%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/*
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_datadir}/doc/HTML/ru/*
 
-#files ru
-#defattr(-,root,root,-)
-#lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
-#lang(ru) %{_kde4_docdir}/HTML/ru/*
-
-#files se
-#defattr(-,root,root,-)
-#lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
-#files sk
-#defattr(-,root,root,-)
-#lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-
-#files sl
-#defattr(-,root,root,-)
-#lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%files sk
+%defattr(-,root,root,-)
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
+%files sl
+%defattr(-,root,root,-)
+%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%lang(sl) %{_datadir}/doc/HTML/sl/*
 
-%if 0
 %files sr-Latn
 %defattr(-,root,root,-)
 %lang(sr at Latn) %{_datadir}/locale/sr at Latn/LC_MESSAGES/*
@@ -726,16 +657,11 @@ rm -rf %{buildroot}
 %files sr
 %defattr(-,root,root,-)
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%endif
 
 %files sv
 %defattr(-,root,root,-)
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
-%lang(sv) %{_kde4_docdir}/HTML/sv/*
-
-#files ta
-#defattr(-,root,root,-)
-#lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(sv) %{_datadir}/doc/HTML/sv/*
 
 %files tr
 %defattr(-,root,root,-)
@@ -744,11 +670,6 @@ rm -rf %{buildroot}
 %files uk
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
-%lang(uk) %{_kde4_docdir}/HTML/uk/*
-
-%files wa 
-%defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
 
 %files zh_CN
 %defattr(-,root,root,-)
@@ -760,26 +681,11 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.82-1
-- koffice-l10n-2.0.82
-
-* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.81-1
-- koffice-l10n-2.0.81
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun May 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.0-1
-- koffice-l10n-2.0.0
-
-* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.99.0-1
-- koffice-l10n-1.9.99.0
-
-* Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.6-1
-- koffice-l10n-1.9.98.6
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.1.6-4
+- Epoch++ (revert koffice2 -> koffice1)
 
-* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.5-1
-- koffice-l10n-1.9.98.5
+* Fri Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.1.6-3
+- revert koffice2 -> koffice1, Epoch bump
 
 * Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.3-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Sep 2009 16:49:00 -0000	1.20
+++ sources	26 Sep 2009 18:19:13 -0000	1.21
@@ -1,27 +1,39 @@
-a489da403b2306846cab2650961057b2  koffice-l10n-ca-2.0.82.tar.bz2
-060b87a69478cbd8d87f3c253c4480d7  koffice-l10n-cs-2.0.82.tar.bz2
-3632169afc6d704bd5e76c62bcf45a19  koffice-l10n-da-2.0.82.tar.bz2
-b7cbb66193a64717bdbfbb3d3c9d7203  koffice-l10n-de-2.0.82.tar.bz2
-4b99c7c2c329c8a51dc7065ad5fa8f85  koffice-l10n-el-2.0.82.tar.bz2
-23786ccad766f23a1c5138123d074218  koffice-l10n-en_GB-2.0.82.tar.bz2
-c0728cad572b4085fa383d7b5180a3dd  koffice-l10n-es-2.0.82.tar.bz2
-feebd286f5ab1635f610789d3249a197  koffice-l10n-et-2.0.82.tar.bz2
-081c93ab407a88a69be4c2aa5d5f40c1  koffice-l10n-fr-2.0.82.tar.bz2
-8df7c56c831d4372fdc5dddd89899cff  koffice-l10n-fy-2.0.82.tar.bz2
-4e4a11bb33a68ecf743f5e207c049f72  koffice-l10n-gl-2.0.82.tar.bz2
-0d34cacccdd4515f36d1267de2ed7d0a  koffice-l10n-hi-2.0.82.tar.bz2
-f22d04e383da3865a1f6d316306e9c44  koffice-l10n-it-2.0.82.tar.bz2
-765192519046200c874bf94abb2beb55  koffice-l10n-ja-2.0.82.tar.bz2
-4de456734b51f20dba6ea7c73e033847  koffice-l10n-kk-2.0.82.tar.bz2
-344324029f2c8c334242c2baa7180352  koffice-l10n-nb-2.0.82.tar.bz2
-c36a9a0f800be7af524e20bf014245bf  koffice-l10n-nds-2.0.82.tar.bz2
-fa1c11cad5e209578e724267ede76a33  koffice-l10n-nl-2.0.82.tar.bz2
-2b1ef56854f8968e9ad18a0ecc360730  koffice-l10n-pl-2.0.82.tar.bz2
-750e610587d1b1eb1892fbd0bbe8049c  koffice-l10n-pt-2.0.82.tar.bz2
-9be672574f4a33af0ddd88ea2f8e2199  koffice-l10n-pt_BR-2.0.82.tar.bz2
-2ced61b1eab5600a3f419b7e71bf2d8d  koffice-l10n-sv-2.0.82.tar.bz2
-ee989ed1918474cd587184934ede22d8  koffice-l10n-tr-2.0.82.tar.bz2
-e06154decc45b9f29be3918bfb86b322  koffice-l10n-uk-2.0.82.tar.bz2
-14b76f545364f4e07d045070e7ed18be  koffice-l10n-wa-2.0.82.tar.bz2
-35cf6ff2923b540043a449f995effd4c  koffice-l10n-zh_CN-2.0.82.tar.bz2
-d649d535b4c34581623a9eb1475d0fdc  koffice-l10n-zh_TW-2.0.82.tar.bz2
+da3167fc536f51d8e32998ae203cd4b9  koffice-l10n-bg-1.6.3.tar.bz2
+5ec6aa3c1c613466a545e26bdb9dfd72  koffice-l10n-ca-1.6.3.tar.bz2
+d893774830fa05b2450018ae70fcd267  koffice-l10n-cs-1.6.3.tar.bz2
+6a100e050c3e6ae95733b24ce4d4f4cf  koffice-l10n-cy-1.6.3.tar.bz2
+fa9c878f7672d1b9881722f93a1dc1ce  koffice-l10n-da-1.6.3.tar.bz2
+9153728550bc6101094bac42aefb7663  koffice-l10n-de-1.6.3.tar.bz2
+be97b80ccaa0da028d8d04f263be5fed  koffice-l10n-el-1.6.3.tar.bz2
+468c3ac77b57de10e1cb7c99d184a443  koffice-l10n-en_GB-1.6.3.tar.bz2
+23f246f5bc86f8831e595f98c24c154e  koffice-l10n-es-1.6.3.tar.bz2
+fdc1c81ae65bec5f7e56d76bcdbaa1af  koffice-l10n-et-1.6.3.tar.bz2
+3ca81163f7242bcad450342e1105ad89  koffice-l10n-eu-1.6.3.tar.bz2
+63f5d0570660e47455e8ccd1a8c4bf02  koffice-l10n-fa-1.6.3.tar.bz2
+98b3b306061c127b92d9e73d3641f687  koffice-l10n-fi-1.6.3.tar.bz2
+01219310196ac9c8325c3d8c7456bcb3  koffice-l10n-fr-1.6.3.tar.bz2
+80f28f345dbae9b108b97701ab2a3b7b  koffice-l10n-ga-1.6.3.tar.bz2
+84b9c65886a99599d99c7ea077875a88  koffice-l10n-gl-1.6.3.tar.bz2
+088e5c503a9dedfa8d23a3fa11f596ca  koffice-l10n-hu-1.6.3.tar.bz2
+1aa3d67279e63f7c7919908c686f2281  koffice-l10n-it-1.6.3.tar.bz2
+b0d886c7504a8b0bafb5095835e78c8a  koffice-l10n-ja-1.6.3.tar.bz2
+527e698b2907f90712239681f0ae0a9e  koffice-l10n-km-1.6.3.tar.bz2
+62386e1713216bd2709e1ce3fd150c8e  koffice-l10n-lv-1.6.3.tar.bz2
+1bf2fcf2c82464e038eed026eaa13fca  koffice-l10n-ms-1.6.3.tar.bz2
+462ecb27a008482801ca3bd9e803b2d1  koffice-l10n-nb-1.6.3.tar.bz2
+50702ef6c8d586e89280a2b42d2c5225  koffice-l10n-nds-1.6.3.tar.bz2
+bd95494b15f647dfcbe39d514811504a  koffice-l10n-ne-1.6.3.tar.bz2
+a63c40510c0bb322dc1f6bb057759772  koffice-l10n-nl-1.6.3.tar.bz2
+a174b73f3e2c0e579bf3775e481958dd  koffice-l10n-pl-1.6.3.tar.bz2
+e74540534eae3d0b1cb4bbabf3da0ed0  koffice-l10n-pt-1.6.3.tar.bz2
+fe49fa2405b44044b69b5d1e2bcb15cf  koffice-l10n-pt_BR-1.6.3.tar.bz2
+e6be9bcea5e2b6e6aa4662f1530841ef  koffice-l10n-ru-1.6.3.tar.bz2
+aa49a6c5497dc201359c577ab77c8361  koffice-l10n-sk-1.6.3.tar.bz2
+18e3f2e81be91170fe551e4b47c2f907  koffice-l10n-sl-1.6.3.tar.bz2
+3eb97f2ef5f65b3637af397dca0d8fcb  koffice-l10n-sr-1.6.3.tar.bz2
+217064c12d6efe969a1bbdac2ef8aef0  koffice-l10n-sr at Latn-1.6.3.tar.bz2
+c6c530010a64fb9e2880a3f33bb9276e  koffice-l10n-sv-1.6.3.tar.bz2
+301f3a665f12d1b7f56fe9be93403812  koffice-l10n-tr-1.6.3.tar.bz2
+f8a50375d4f280131a27e0bdfb0deb83  koffice-l10n-uk-1.6.3.tar.bz2
+a21490ebc1d0beedc565c070d4bdad25  koffice-l10n-zh_CN-1.6.3.tar.bz2
+7c7c3787a45743ae9d06938829381d2e  koffice-l10n-zh_TW-1.6.3.tar.bz2



From pkgdb at fedoraproject.org  Sat Sep 26 19:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:07:07 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090926190707.C2A1E10F89D@bastion2.fedora.phx.redhat.com>

pali has set the watchcommits acl on cherokee (Fedora EPEL 5) to Approved for arbiter

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep 26 19:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:07:07 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090926190708.1408F10F8A3@bastion2.fedora.phx.redhat.com>

pali has set the watchbugzilla acl on cherokee (Fedora EPEL 5) to Approved for arbiter

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep 26 19:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:07:10 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090926190710.BEFFB10F8A9@bastion2.fedora.phx.redhat.com>

pali has set the commit acl on cherokee (Fedora EPEL 5) to Approved for arbiter

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sat Sep 26 19:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:07:18 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20090926190718.48BDA10F8A2@bastion2.fedora.phx.redhat.com>

pali has set the approveacls acl on cherokee (Fedora EPEL 5) to Approved for arbiter

To make changes to this package see:
  /pkgdb/packages/name/cherokee



From hno at fedoraproject.org  Sat Sep 26 19:31:47 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 26 Sep 2009 19:31:47 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.49, 1.50 sources, 1.52,
	1.53 squid.spec, 1.145, 1.146
Message-ID: <20090926193147.59B5911C00E6@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1621

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Import important upstream bugfixes and enable ESI support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	4 Sep 2009 03:42:16 -0000	1.49
+++ .cvsignore	26 Sep 2009 19:31:47 -0000	1.50
@@ -4,3 +4,8 @@ b9694.patch
 b9696.patch
 b9704.patch
 b9707.patch
+b9719.patch
+b9720.patch
+squid-3.1-9737.patch
+squid-3.1-9743.patch
+squid-3-10002.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	4 Sep 2009 03:42:16 -0000	1.52
+++ sources	26 Sep 2009 19:31:47 -0000	1.53
@@ -4,3 +4,8 @@ c764a5ffa0171ffadf61011dc8dd4cad  b9694.
 e7a8c54548fa45519d8c9d7a885a821a  b9696.patch
 bf71774b13a1506d9a1dffd2cd6daf34  b9704.patch
 a31a23ec33542a9ed2c486ee44c60550  b9707.patch
+1665438b177324cf666562a36d9234f4  b9719.patch
+307067bdf851610c1c663067948fb5dc  b9720.patch
+b6603141eeef4d119aa52dfc7e694538  squid-3.1-9737.patch
+0376008be9d4de6da28907484ac4eaee  squid-3.1-9743.patch
+a83ca39085d085ed5a79fe4553b87a66  squid-3-10002.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- squid.spec	18 Sep 2009 00:30:49 -0000	1.145
+++ squid.spec	26 Sep 2009 19:31:47 -0000	1.146
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  6%{?dist}
+Release:  7%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -26,13 +26,11 @@ Patch001: http://www.squid-cache.org/Ver
 Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
 Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
 Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
-# Upstream fix, but have not reached 3.1 yet
-Patch005: squid-3.1.0.13-alias-link.patch
-
-# External patches
-# Submitted upstream on squid-dev by Markus Moeller <huaraz at moeller.plus.com>
-Patch101: squid_kerb_auth-configure.in.patch
-
+Patch005: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9719.patch
+Patch006: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9720.patch
+Patch007: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9737.patch
+Patch008: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9743.patch
+Patch009: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10002.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -49,7 +47,7 @@ Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel db4-devel
+BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel db4-devel expat-devel
 Obsoletes: squid-novm
 
 %description
@@ -71,8 +69,11 @@ lookup program (dnsserver), a program fo
 %patch002 -p0 -b .b9696
 %patch003 -p0 -b .b9704
 %patch004 -p0 -b .b9707
-%patch005 -p0 -b .alias-link
-%patch101 -p1 -b .kerb_auth_configure
+%patch005 -p0 -b .b9719
+%patch006 -p0 -b .b9720
+%patch007 -p0 -b .3.1-9737
+%patch008 -p0 -b .3.1-9743
+%patch009 -p0 -b .3-10002
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch204 -p1 -b .perlpath
@@ -115,6 +116,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --enable-storeio="aufs,diskd,ufs" \
    --enable-useragent-log \
    --enable-wccpv2 \
+   --enable-esi \
    --with-aio \
    --with-default-user="squid" \
    --with-filedescriptors=16384 \
@@ -166,6 +168,10 @@ chmod 644 contrib/url-normalizer.pl cont
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
+# Move the MIB definition to the proper place (and name)
+mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs
+mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt
+
 # squid.conf.documented is documentation. We ship that in doc/
 rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
 
@@ -207,12 +213,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons
-%{_datadir}/squid/mib.txt
 %{_sbindir}/squid
 %{_bindir}/squidclient
 %{_mandir}/man8/*
 %{_mandir}/man1/*
 %{_libdir}/squid/*
+/usr/share/snmp/mibs/SQUID-MIB.txt
 
 %pre
 if ! getent group squid >/dev/null 2>&1; then
@@ -253,6 +259,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Sep 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-7
+- Include upstream patches fixing important operational issues
+- Enable ESI support now that it does not conflict with normal operation
+
 * Fri Sep 18 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-6
 - Rotate store.log if enabled
 



From pkgdb at fedoraproject.org  Sat Sep 26 19:35:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:35:40 +0000
Subject: [pkgdb] gstreamer-plugins-espeak was added for sdz
Message-ID: <20090926193540.C4B6610F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package gstreamer-plugins-espeak with summary A simple gstreamer plugin to use espeak
kevin has approved Package gstreamer-plugins-espeak
kevin has added a Fedora devel branch for gstreamer-plugins-espeak with an owner of sdz
kevin has approved gstreamer-plugins-espeak in Fedora devel
kevin has approved Package gstreamer-plugins-espeak
kevin has set commit to Approved for 107427 on gstreamer-plugins-espeak (Fedora devel)
kevin has set checkout to Approved for 107427 on gstreamer-plugins-espeak (Fedora devel)
kevin has set build to Approved for 107427 on gstreamer-plugins-espeak (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gstreamer-plugins-espeak



From pkgdb at fedoraproject.org  Sat Sep 26 19:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:35:42 +0000
Subject: [pkgdb] gstreamer-plugins-espeak summary updated by kevin
Message-ID: <20090926193542.777B110F8A2@bastion2.fedora.phx.redhat.com>

kevin set package gstreamer-plugins-espeak summary to A simple gstreamer plugin to use espeak

To make changes to this package see:
  /pkgdb/packages/name/gstreamer-plugins-espeak



From pkgdb at fedoraproject.org  Sat Sep 26 19:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:35:42 +0000
Subject: [pkgdb] gstreamer-plugins-espeak (Fedora, 10) updated by kevin
Message-ID: <20090926193542.88AF110F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gstreamer-plugins-espeak
kevin has set commit to Approved for 107427 on gstreamer-plugins-espeak (Fedora 10)
kevin has set checkout to Approved for 107427 on gstreamer-plugins-espeak (Fedora 10)
kevin has set build to Approved for 107427 on gstreamer-plugins-espeak (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gstreamer-plugins-espeak



From pkgdb at fedoraproject.org  Sat Sep 26 19:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:35:42 +0000
Subject: [pkgdb] gstreamer-plugins-espeak (Fedora, 10) updated by kevin
Message-ID: <20090926193542.965AE10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gstreamer-plugins-espeak
kevin has set commit to Approved for 107427 on gstreamer-plugins-espeak (Fedora 11)
kevin has set checkout to Approved for 107427 on gstreamer-plugins-espeak (Fedora 11)
kevin has set build to Approved for 107427 on gstreamer-plugins-espeak (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gstreamer-plugins-espeak



From kevin at fedoraproject.org  Sat Sep 26 19:35:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 19:35:50 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak/devel - New directory
Message-ID: <20090926193550.59B6E11C02BB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5588/rpms/gstreamer-plugins-espeak/devel

Log Message:
Directory /cvs/pkgs/rpms/gstreamer-plugins-espeak/devel added to the repository




From kevin at fedoraproject.org  Sat Sep 26 19:35:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 19:35:50 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak - New directory
Message-ID: <20090926193550.2C9E011C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5588/rpms/gstreamer-plugins-espeak

Log Message:
Directory /cvs/pkgs/rpms/gstreamer-plugins-espeak added to the repository




From kevin at fedoraproject.org  Sat Sep 26 19:35:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 19:35:56 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak Makefile,NONE,1.1
Message-ID: <20090926193556.7968111C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5588/rpms/gstreamer-plugins-espeak

Added Files:
	Makefile 
Log Message:
Setup of module gstreamer-plugins-espeak


--- NEW FILE Makefile ---
# Top level Makefile for module gstreamer-plugins-espeak
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  Sat Sep 26 19:35:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 19:35:56 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090926193556.C770A11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5588/rpms/gstreamer-plugins-espeak/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gstreamer-plugins-espeak


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gstreamer-plugins-espeak
# $Id: Makefile,v 1.1 2009/09/26 19:35:56 kevin Exp $
NAME := gstreamer-plugins-espeak
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  Sat Sep 26 19:36:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:36:22 +0000
Subject: [pkgdb] R-msm (Fedora, 12) updated by kevin
Message-ID: <20090926193623.5358810F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for R-msm
kevin has set commit to Approved for 107427 on R-msm (Fedora 12)
kevin has set checkout to Approved for 107427 on R-msm (Fedora 12)
kevin has set build to Approved for 107427 on R-msm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/R-msm



From pkgdb at fedoraproject.org  Sat Sep 26 19:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:36:53 +0000
Subject: [pkgdb] R-RM2 (Fedora, 12) updated by kevin
Message-ID: <20090926193653.D93B810F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for R-RM2
kevin has set commit to Approved for 107427 on R-RM2 (Fedora 12)
kevin has set checkout to Approved for 107427 on R-RM2 (Fedora 12)
kevin has set build to Approved for 107427 on R-RM2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/R-RM2



From pkgdb at fedoraproject.org  Sat Sep 26 19:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:37:40 +0000
Subject: [pkgdb] koffice-langpack F-12 cloned from devel
Message-ID: <20090926193740.3D9E810F8A1@bastion2.fedora.phx.redhat.com>

kevin cloned koffice-langpack F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Sat Sep 26 19:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 26 Sep 2009 19:38:17 +0000
Subject: [pkgdb] rmol (Fedora, 12) updated by kevin
Message-ID: <20090926193817.E53FE10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rmol
kevin has set commit to Approved for 107427 on rmol (Fedora 12)
kevin has set checkout to Approved for 107427 on rmol (Fedora 12)
kevin has set build to Approved for 107427 on rmol (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rmol



From denisarnaud at fedoraproject.org  Sat Sep 26 19:48:30 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 19:48:30 +0000 (UTC)
Subject: rpms/rmol/F-12 import.log,1.8,1.9
Message-ID: <20090926194830.D368D11C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11697/F-12

Modified Files:
	import.log 
Log Message:
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-12/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	26 Sep 2009 16:29:28 -0000	1.8
+++ import.log	26 Sep 2009 19:48:30 -0000	1.9
@@ -6,3 +6,4 @@ rmol-0_20_0-3_fc10:HEAD:rmol-0.20.0-3.fc
 rmol-0_21_0-2_fc11:HEAD:rmol-0.21.0-2.fc11.src.rpm:1241914851
 rmol-0_22_0-1_fc10:HEAD:rmol-0.22.0-1.fc10.src.rpm:1244307166
 rmol-0_23_0-1_fc11:HEAD:rmol-0.23.0-1.fc11.src.rpm:1253982485
+rmol-0_23_0-1_fc11:F-12:rmol-0.23.0-1.fc11.src.rpm:1253994467



From denisarnaud at fedoraproject.org  Sat Sep 26 19:54:05 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Sat, 26 Sep 2009 19:54:05 +0000 (UTC)
Subject: rpms/R-msm/F-12 R-msm.spec,1.4,1.5 import.log,1.3,1.4
Message-ID: <20090926195405.AC47211C00E6@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/R-msm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12651/F-12

Modified Files:
	R-msm.spec import.log 
Log Message:
* Tue Sep 26 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.9.1-2
- New F-12 branch




Index: R-msm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-msm/F-12/R-msm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-msm.spec	24 Jul 2009 16:13:16 -0000	1.4
+++ R-msm.spec	26 Sep 2009 19:54:05 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          0.9.1
-Release:          3%{?dist}
+Release:          2%{?dist}
 Source0:          ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License:          GPLv2+
 URL:              http://cran.r-project.org/web/packages/msm/
@@ -81,9 +81,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/libs/%{packname}.so
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Jul 14 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.9.1-2
 - Suppressed the unused definition of the packrel variable
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-msm/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	14 Jul 2009 10:27:33 -0000	1.3
+++ import.log	26 Sep 2009 19:54:05 -0000	1.4
@@ -1,3 +1,4 @@
 R-msm-0_8_2-2_fc10:HEAD:R-msm-0.8.2-2.fc10.src.rpm:1244670809
 R-msm-0_9_1-1_fc10:HEAD:R-msm-0.9.1-1.fc10.src.rpm:1244817014
 R-msm-0_9_1-2_fc11:HEAD:R-msm-0.9.1-2.fc11.src.rpm:1247567225
+R-msm-0_9_1-2_fc11:F-12:R-msm-0.9.1-2.fc11.src.rpm:1253994671



From hno at fedoraproject.org  Sat Sep 26 20:21:48 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 26 Sep 2009 20:21:48 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.146,1.147
Message-ID: <20090926202148.57A9011C00E6@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26332

Modified Files:
	squid.spec 
Log Message:
Clean up dependencies. ESI requires libxml2 as well


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- squid.spec	26 Sep 2009 19:31:47 -0000	1.146
+++ squid.spec	26 Sep 2009 20:21:48 -0000	1.147
@@ -47,7 +47,18 @@ Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel db4-devel expat-devel
+# squid_ldap_auth and other LDAP helpers require OpenLDAP
+BuildRequires: openldap-devel
+# squid_pam_auth requires PAM development libs
+BuildRequires: pam-devel
+# SSL support requires OpenSSL
+BuildRequires: openssl-devel
+# squid_kerb_aut requires Kerberos development libs
+BuildRequires: krb5-devel
+# squid_session_auth requires DB4
+BuildRequires: db4-devel
+# ESI support requires Expat & libxml2
+BuildRequires: expat-devel libxml2-devel
 Obsoletes: squid-novm
 
 %description



From kevin at fedoraproject.org  Sat Sep 26 20:42:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 20:42:17 +0000 (UTC)
Subject: rpms/xfce4-settings/devel
	xfce4-settings-4.6.1-restore-display-settings.patch, NONE,
	1.1 xfce4-settings.spec, 1.17, 1.18
Message-ID: <20090926204217.A402511C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv858

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.1-restore-display-settings.patch 
Log Message:
Add patch for restoring display resolution on login (bug #504908)


xfce4-settings-4.6.1-restore-display-settings.patch:
 displays.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE xfce4-settings-4.6.1-restore-display-settings.patch ---
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index bcc713c..1e57ce5 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -46,6 +46,8 @@
 static void            xfce_displays_helper_class_init                     (XfceDisplaysHelperClass *klass);
 static void            xfce_displays_helper_init                           (XfceDisplaysHelper      *helper);
 static void            xfce_displays_helper_finalize                       (GObject                 *object);
+static void            xfce_displays_helper_channel_apply_legacy           (XfceDisplaysHelper      *helper,
+                                                                            const gchar             *scheme);
 static void            xfce_displays_helper_channel_property_changed       (XfconfChannel           *channel,
                                                                             const gchar             *property_name,
                                                                             const GValue            *value,
@@ -112,6 +114,9 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
             /* monitor channel changes */
             g_signal_connect (G_OBJECT (helper->channel), "property-changed", 
                               G_CALLBACK (xfce_displays_helper_channel_property_changed), helper);
+
+            /* restore the default scheme */
+            xfce_displays_helper_channel_apply_legacy (helper, "Default");
         }
         else
         {


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-settings.spec	10 Sep 2009 02:18:06 -0000	1.17
+++ xfce4-settings.spec	26 Sep 2009 20:42:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -14,6 +14,9 @@ Patch1:         xfce4-settings-4.6.1-xkl
 Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
 # Fix typo in xfce-keyboard-settings
 Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
+# Always restore the display on login: 
+# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
+Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +51,7 @@ This package includes the settings manag
 %endif
 %patch2 -p1 -b .timeout
 %patch3 -p1 -b .keyrepeat
+%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -124,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
+- Add patch for restoring display resolution on login (bug #504908)
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Fix xfconf channel for keyboard repeat rate setting
 - Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)



From sdz at fedoraproject.org  Sat Sep 26 20:50:58 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 20:50:58 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak/devel gstreamer-plugins-espeak.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090926205058.550CB11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3884/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer-plugins-espeak.spec import.log 
Log Message:
initial import



--- NEW FILE gstreamer-plugins-espeak.spec ---
Name:           gstreamer-plugins-espeak
Version:        0.3.3
Release:        2%{?dist}
Summary:        A simple gstreamer plugin to use espeak

Group:          Applications/Multimedia
License:        LGPLv2+
URL:            http://wiki.sugarlabs.org/go/Activity_Team/gst-plugins-espeak
Source0:        http://download.sugarlabs.org/sources/honey/gst-plugins-espeak/gst-plugins-espeak-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  espeak-devel
BuildRequires:  glib2-devel
BuildRequires:  gstreamer-plugins-base-devel
BuildRequires:  gstreamer-devel

%description
A simple gstreamer plugin to use espeak as a sound source.
It was developed to simplify the espeak usage in the Sugar Speak activity.
The plugin uses given text to produce audio output. 

%prep
%setup -q -n gst-plugins-espeak-%{version}


%build
# make sure to build the plugin for release
sed -i 's/NANO=1/NANO=0/g' configure
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# remove libtool archives
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/gstreamer-0.10/libgstespeak.so


%changelog
* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.3-2
- make sure to build the plugin for release
- build on ppc and ppc64 again

* Sun Sep 20 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.3-1
- intial packaging


--- NEW FILE import.log ---
gstreamer-plugins-espeak-0_3_3-2_fc11:HEAD:gstreamer-plugins-espeak-0.3.3-2.fc11.src.rpm:1253998186


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-espeak/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 19:35:56 -0000	1.1
+++ .cvsignore	26 Sep 2009 20:50:58 -0000	1.2
@@ -0,0 +1 @@
+gst-plugins-espeak-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-espeak/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 19:35:56 -0000	1.1
+++ sources	26 Sep 2009 20:50:58 -0000	1.2
@@ -0,0 +1 @@
+4e4a2d2363c50be72ed5d26a319439c3  gst-plugins-espeak-0.3.3.tar.bz2



From cebbert at fedoraproject.org  Sat Sep 26 20:52:13 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 26 Sep 2009 20:52:13 +0000 (UTC)
Subject: rpms/kernel/F-11 sched-deal-with-low-load-in-wake-affine.patch, NONE,
	1.1 sched-disable-NEW-FAIR-SLEEPERS-for-now.patch, NONE, 1.1
	sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch,
	NONE, 1.1 sched-remove-shortcut-from-select-task-rq-fair.patch,
	NONE, 1.1 sched-retune-scheduler-latency-defaults.patch, NONE,
	1.1 kernel.spec, 1.1745, 1.1746
Message-ID: <20090926205213.74A9C11C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4426

Modified Files:
	kernel.spec 
Added Files:
	sched-deal-with-low-load-in-wake-affine.patch 
	sched-disable-NEW-FAIR-SLEEPERS-for-now.patch 
	sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch 
	sched-remove-shortcut-from-select-task-rq-fair.patch 
	sched-retune-scheduler-latency-defaults.patch 
Log Message:
Scheduler fixes cherry-picked from 2.6.32

sched-deal-with-low-load-in-wake-affine.patch:
 sched_fair.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE sched-deal-with-low-load-in-wake-affine.patch ---
From: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon, 7 Sep 2009 16:28:05 +0000 (+0200)
Subject: sched: Deal with low-load in wake_affine()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=71a29aa7b600595d0ef373ea605ac656876d1f2f

sched: Deal with low-load in wake_affine()

wake_affine() would always fail under low-load situations where
both prev and this were idle, because adding a single task will
always be a significant imbalance, even if there's nothing
around that could balance it.

Deal with this by allowing imbalance when there's nothing you
can do about it.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index d7fda41..cc97ea4 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1262,7 +1262,17 @@ wake_affine(struct sched_domain *this_sd, struct rq *this_rq,
 	tg = task_group(p);
 	weight = p->se.load.weight;
 
-	balanced = 100*(tl + effective_load(tg, this_cpu, weight, weight)) <=
+	/*
+	 * In low-load situations, where prev_cpu is idle and this_cpu is idle
+	 * due to the sync cause above having dropped tl to 0, we'll always have
+	 * an imbalance, but there's really nothing you can do about that, so
+	 * that's good too.
+	 *
+	 * Otherwise check if either cpus are near enough in load to allow this
+	 * task to be woken on this_cpu.
+	 */
+	balanced = !tl ||
+		100*(tl + effective_load(tg, this_cpu, weight, weight)) <=
 		imbalance*(load + effective_load(tg, prev_cpu, 0, weight));
 
 	/*

sched-disable-NEW-FAIR-SLEEPERS-for-now.patch:
 sched_features.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sched-disable-NEW-FAIR-SLEEPERS-for-now.patch ---
From: Ingo Molnar <mingo at elte.hu>
Date: Thu, 10 Sep 2009 18:34:48 +0000 (+0200)
Subject: sched: Disable NEW_FAIR_SLEEPERS for now
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3f2aa307c4d26b4ed6509d0a79e8254c9e07e921

sched: Disable NEW_FAIR_SLEEPERS for now

Nikos Chantziaras and Jens Axboe reported that turning off
NEW_FAIR_SLEEPERS improves desktop interactivity visibly.

Nikos described his experiences the following way:

  " With this setting, I can do "nice -n 19 make -j20" and
    still have a very smooth desktop and watch a movie at
    the same time.  Various other annoyances (like the
    "logout/shutdown/restart" dialog of KDE not appearing
    at all until the background fade-out effect has finished)
    are also gone.  So this seems to be the single most
    important setting that vastly improves desktop behavior,
    at least here. "

Jens described it the following way, referring to a 10-seconds
xmodmap scheduling delay he was trying to debug:

  " Then I tried switching NO_NEW_FAIR_SLEEPERS on, and then
    I get:

    Performance counter stats for 'xmodmap .xmodmap-carl':

         9.009137  task-clock-msecs         #      0.447 CPUs
               18  context-switches         #      0.002 M/sec
                1  CPU-migrations           #      0.000 M/sec
              315  page-faults              #      0.035 M/sec

    0.020167093  seconds time elapsed

    Woot! "

So disable it for now. In perf trace output i can see weird
delta timestamps:

  cc1-9943  [001]  2802.059479616: sched_stat_wait: task: as:9944 wait: 2801938766276 [ns]

That nsec field is not supposed to be that large. More digging
is needed - but lets turn it off while the real bug is found.

Reported-by: Nikos Chantziaras <realnc at arcor.de>
Tested-by: Nikos Chantziaras <realnc at arcor.de>
Reported-by: Jens Axboe <jens.axboe at oracle.com>
Tested-by: Jens Axboe <jens.axboe at oracle.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Mike Galbraith <efault at gmx.de>
LKML-Reference: <4AA93D34.8040500 at arcor.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_features.h b/kernel/sched_features.h
index 4569bfa..e2dc63a 100644
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
@@ -1,4 +1,4 @@
-SCHED_FEAT(NEW_FAIR_SLEEPERS, 1)
+SCHED_FEAT(NEW_FAIR_SLEEPERS, 0)
 SCHED_FEAT(NORMALIZED_SLEEPER, 0)
 SCHED_FEAT(ADAPTIVE_GRAN, 1)
 SCHED_FEAT(WAKEUP_PREEMPT, 1)

sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch:
 sched_fair.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch ---
From: Mike Galbraith <efault at gmx.de>
Date: Tue, 8 Sep 2009 09:12:28 +0000 (+0200)
Subject: sched: Ensure that a child can't gain time over it's parent after fork()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b5d9d734a53e0204aab0089079cbde2a1285a38f

sched: Ensure that a child can't gain time over it's parent after fork()

A fork/exec load is usually "pass the baton", so the child
should never be placed behind the parent.  With START_DEBIT we
make room for the new task, but with child_runs_first, that
room comes out of the _parent's_ hide. There's nothing to say
that the parent wasn't ahead of min_vruntime at fork() time,
which means that the "baton carrier", who is essentially the
parent in drag, can gain time and increase scheduling latencies
for waiters.

With NEW_FAIR_SLEEPERS + START_DEBIT + child_runs_first
enabled, we essentially pass the sleeper fairness off to the
child, which is fine, but if we don't base placement on the
parent's updated vruntime, we can end up compounding latency
woes if the child itself then does fork/exec.  The debit
incurred at fork doesn't hurt the parent who is then going to
sleep and maybe exit, but the child who acquires the error
harms all comers.

This improves latencies of make -j<n> kernel build workloads.

Reported-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Mike Galbraith <efault at gmx.de>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index cc97ea4..e386e5d 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -728,11 +728,11 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
 			vruntime -= thresh;
 		}
-
-		/* ensure we never gain time by being placed backwards. */
-		vruntime = max_vruntime(se->vruntime, vruntime);
 	}
 
+	/* ensure we never gain time by being placed backwards. */
+	vruntime = max_vruntime(se->vruntime, vruntime);
+
 	se->vruntime = vruntime;
 }
 
@@ -1756,6 +1756,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 	sched_info_queued(p);
 
 	update_curr(cfs_rq);
+	if (curr)
+		se->vruntime = curr->vruntime;
 	place_entity(cfs_rq, se, 1);
 
 	/* 'curr' will be NULL if the child belongs to a different group */

sched-remove-shortcut-from-select-task-rq-fair.patch:
 sched_fair.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE sched-remove-shortcut-from-select-task-rq-fair.patch ---
From: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon, 7 Sep 2009 16:12:06 +0000 (+0200)
Subject: sched: Remove short cut from select_task_rq_fair()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cdd2ab3de4301728b20efd6225681d3ff591a938

sched: Remove short cut from select_task_rq_fair()

select_task_rq_fair() incorrectly skips the wake_affine()
logic, remove this.

When prev_cpu == this_cpu, the code jumps straight to the
wake_idle() logic, this doesn't give the wake_affine() logic
the chance to pin the task to this cpu.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 2ff850f..d7fda41 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1305,8 +1305,6 @@ static int select_task_rq_fair(struct task_struct *p, int sync)
 	this_rq		= cpu_rq(this_cpu);
 	new_cpu		= prev_cpu;
 
-	if (prev_cpu == this_cpu)
-		goto out;
 	/*
 	 * 'this_sd' is the first domain that both
 	 * this_cpu and prev_cpu are present in:

sched-retune-scheduler-latency-defaults.patch:
 sched_fair.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE sched-retune-scheduler-latency-defaults.patch ---
From: Mike Galbraith <efault at gmx.de>
Date: Wed, 9 Sep 2009 13:41:37 +0000 (+0200)
Subject: sched: Re-tune the scheduler latency defaults to decrease worst-case latencies
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=172e082a9111ea504ee34cbba26284a5ebdc53a7

sched: Re-tune the scheduler latency defaults to decrease worst-case latencies

[ cebbert : modified to change the target from 5 to 10 ]

Reduce the latency target from 20 msecs to 5 msecs.

Why? Larger latencies increase spread, which is good for scaling,
but bad for worst case latency.

We still have the ilog(nr_cpus) rule to scale up on bigger
server boxes.

Signed-off-by: Mike Galbraith <efault at gmx.de>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <1252486344.28645.18.camel at marge.simson.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index af325a3..26fadb4 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -24,7 +24,7 @@
 
 /*
  * Targeted preemption latency for CPU-bound tasks:
- * (default: 20ms * (1 + ilog(ncpus)), units: nanoseconds)
+ * (default: 10ms * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * NOTE: this latency value is not the same as the concept of
  * 'timeslice length' - timeslices in CFS are of variable length
@@ -34,13 +34,13 @@
  * (to see the precise effective timeslice length of your workload,
  *  run vmstat and monitor the context-switches (cs) field)
  */
-unsigned int sysctl_sched_latency = 20000000ULL;
+unsigned int sysctl_sched_latency = 10000000ULL;
 
 /*
  * Minimal preemption granularity for CPU-bound tasks:
- * (default: 4 msec * (1 + ilog(ncpus)), units: nanoseconds)
+ * (default: 2 msec * (1 + ilog(ncpus)), units: nanoseconds)
  */
-unsigned int sysctl_sched_min_granularity = 4000000ULL;
+unsigned int sysctl_sched_min_granularity = 2000000ULL;
 
 /*
  * is kept at sysctl_sched_latency / sysctl_sched_min_granularity
@@ -63,13 +63,13 @@ unsigned int __read_mostly sysctl_sched_compat_yield;
 
 /*
  * SCHED_OTHER wake-up granularity.
- * (default: 5 msec * (1 + ilog(ncpus)), units: nanoseconds)
+ * (default: 2.5 msec * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * This option delays the preemption effects of decoupled workloads
  * and reduces their over-scheduling. Synchronous workloads will still
  * have immediate wakeup/sleep latencies.
  */
-unsigned int sysctl_sched_wakeup_granularity = 5000000UL;
+unsigned int sysctl_sched_wakeup_granularity = 2500000UL;
 
 const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1745
retrieving revision 1.1746
diff -u -p -r1.1745 -r1.1746
--- kernel.spec	26 Sep 2009 18:10:15 -0000	1.1745
+++ kernel.spec	26 Sep 2009 20:52:12 -0000	1.1746
@@ -726,6 +726,14 @@ Patch13000: linux-2.6-kvm-skip-pit-check
 Patch13001: linux-2.6.29-xen-disable-gbpages.patch
 Patch13002: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
+# sched fixes cherry-picked from 2.6.32
+Patch13100: sched-deal-with-low-load-in-wake-affine.patch
+Patch13101: sched-disable-NEW-FAIR-SLEEPERS-for-now.patch
+Patch13102: sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch
+Patch13103: sched-remove-shortcut-from-select-task-rq-fair.patch
+# latency defaults from 2.6.32 but changed to be not so aggressive
+Patch13104: sched-retune-scheduler-latency-defaults.patch
+
 Patch14000: make-mmap_min_addr-suck-less.patch
 
 # ----- send for upstream inclusion -----
@@ -1381,6 +1389,14 @@ ApplyPatch linux-2.6.29-xen-disable-gbpa
 # v12n
 ApplyPatch linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
+# sched fixes cherry-picked from 2.6.32
+ApplyPatch sched-deal-with-low-load-in-wake-affine.patch
+ApplyPatch sched-disable-NEW-FAIR-SLEEPERS-for-now.patch
+ApplyPatch sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch
+ApplyPatch sched-remove-shortcut-from-select-task-rq-fair.patch
+# latency defaults from 2.6.32 but changed to be not so aggressive
+ApplyPatch sched-retune-scheduler-latency-defaults.patch
+
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
 # ----- sent for upstream inclusion -----
@@ -2006,6 +2022,9 @@ fi
 # and build.
 
 %changelog
+* Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-67
+- Scheduler fixes cherry-picked from 2.6.32
+
 * Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-66
 - Backport "appletalk: Fix skb leak when ipddp interface is not loaded"
   (fixes CVE-2009-2903)



From sdz at fedoraproject.org  Sat Sep 26 20:53:01 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 20:53:01 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak/F-11 gstreamer-plugins-espeak.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926205301.048B611C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4618/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer-plugins-espeak.spec import.log 
Log Message:
initial import



--- NEW FILE gstreamer-plugins-espeak.spec ---
Name:           gstreamer-plugins-espeak
Version:        0.3.3
Release:        2%{?dist}
Summary:        A simple gstreamer plugin to use espeak

Group:          Applications/Multimedia
License:        LGPLv2+
URL:            http://wiki.sugarlabs.org/go/Activity_Team/gst-plugins-espeak
Source0:        http://download.sugarlabs.org/sources/honey/gst-plugins-espeak/gst-plugins-espeak-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  espeak-devel
BuildRequires:  glib2-devel
BuildRequires:  gstreamer-plugins-base-devel
BuildRequires:  gstreamer-devel

%description
A simple gstreamer plugin to use espeak as a sound source.
It was developed to simplify the espeak usage in the Sugar Speak activity.
The plugin uses given text to produce audio output. 

%prep
%setup -q -n gst-plugins-espeak-%{version}


%build
# make sure to build the plugin for release
sed -i 's/NANO=1/NANO=0/g' configure
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# remove libtool archives
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/gstreamer-0.10/libgstespeak.so


%changelog
* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.3-2
- make sure to build the plugin for release
- build on ppc and ppc64 again

* Sun Sep 20 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.3-1
- intial packaging


--- NEW FILE import.log ---
gstreamer-plugins-espeak-0_3_3-2_fc11:F-11:gstreamer-plugins-espeak-0.3.3-2.fc11.src.rpm:1253998339


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-espeak/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 19:35:56 -0000	1.1
+++ .cvsignore	26 Sep 2009 20:53:00 -0000	1.2
@@ -0,0 +1 @@
+gst-plugins-espeak-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-espeak/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 19:35:56 -0000	1.1
+++ sources	26 Sep 2009 20:53:00 -0000	1.2
@@ -0,0 +1 @@
+4e4a2d2363c50be72ed5d26a319439c3  gst-plugins-espeak-0.3.3.tar.bz2



From sdz at fedoraproject.org  Sat Sep 26 20:56:02 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 26 Sep 2009 20:56:02 +0000 (UTC)
Subject: rpms/gstreamer-plugins-espeak/F-10 gstreamer-plugins-espeak.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090926205602.657D911C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/gstreamer-plugins-espeak/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5883/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer-plugins-espeak.spec import.log 
Log Message:
initial import



--- NEW FILE gstreamer-plugins-espeak.spec ---
Name:           gstreamer-plugins-espeak
Version:        0.3.3
Release:        2%{?dist}
Summary:        A simple gstreamer plugin to use espeak

Group:          Applications/Multimedia
License:        LGPLv2+
URL:            http://wiki.sugarlabs.org/go/Activity_Team/gst-plugins-espeak
Source0:        http://download.sugarlabs.org/sources/honey/gst-plugins-espeak/gst-plugins-espeak-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  espeak-devel
BuildRequires:  glib2-devel
BuildRequires:  gstreamer-plugins-base-devel
BuildRequires:  gstreamer-devel

%description
A simple gstreamer plugin to use espeak as a sound source.
It was developed to simplify the espeak usage in the Sugar Speak activity.
The plugin uses given text to produce audio output. 

%prep
%setup -q -n gst-plugins-espeak-%{version}


%build
# make sure to build the plugin for release
sed -i 's/NANO=1/NANO=0/g' configure
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# remove libtool archives
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/gstreamer-0.10/libgstespeak.so


%changelog
* Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.3-2
- make sure to build the plugin for release
- build on ppc and ppc64 again

* Sun Sep 20 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.3-1
- intial packaging


--- NEW FILE import.log ---
gstreamer-plugins-espeak-0_3_3-2_fc11:F-10:gstreamer-plugins-espeak-0.3.3-2.fc11.src.rpm:1253998449


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-espeak/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Sep 2009 19:35:56 -0000	1.1
+++ .cvsignore	26 Sep 2009 20:56:02 -0000	1.2
@@ -0,0 +1 @@
+gst-plugins-espeak-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-espeak/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Sep 2009 19:35:56 -0000	1.1
+++ sources	26 Sep 2009 20:56:02 -0000	1.2
@@ -0,0 +1 @@
+4e4a2d2363c50be72ed5d26a319439c3  gst-plugins-espeak-0.3.3.tar.bz2



From kevin at fedoraproject.org  Sat Sep 26 20:56:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 26 Sep 2009 20:56:49 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11
	xfce4-settings-4.6.1-restore-display-settings.patch, NONE,
	1.1 xfce4-settings.spec, 1.13, 1.14
Message-ID: <20090926205649.B8B0911C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6298

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.1-restore-display-settings.patch 
Log Message:
Add patch for restoring display resolution on login (bug #504908)


xfce4-settings-4.6.1-restore-display-settings.patch:
 displays.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE xfce4-settings-4.6.1-restore-display-settings.patch ---
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index bcc713c..1e57ce5 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -46,6 +46,8 @@
 static void            xfce_displays_helper_class_init                     (XfceDisplaysHelperClass *klass);
 static void            xfce_displays_helper_init                           (XfceDisplaysHelper      *helper);
 static void            xfce_displays_helper_finalize                       (GObject                 *object);
+static void            xfce_displays_helper_channel_apply_legacy           (XfceDisplaysHelper      *helper,
+                                                                            const gchar             *scheme);
 static void            xfce_displays_helper_channel_property_changed       (XfconfChannel           *channel,
                                                                             const gchar             *property_name,
                                                                             const GValue            *value,
@@ -112,6 +114,9 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
             /* monitor channel changes */
             g_signal_connect (G_OBJECT (helper->channel), "property-changed", 
                               G_CALLBACK (xfce_displays_helper_channel_property_changed), helper);
+
+            /* restore the default scheme */
+            xfce_displays_helper_channel_apply_legacy (helper, "Default");
         }
         else
         {


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfce4-settings.spec	10 Sep 2009 02:35:08 -0000	1.13
+++ xfce4-settings.spec	26 Sep 2009 20:56:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -14,6 +14,9 @@ Patch1:         xfce4-settings-4.6.1-xkl
 Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
 # Fix typo in xfce-keyboard-settings
 Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
+# Always restore the display on login: 
+# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
+Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +51,7 @@ This package includes the settings manag
 %endif
 %patch2 -p1 -b .timeout
 %patch3 -p1 -b .keyrepeat
+%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -124,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
+- Add patch for restoring display resolution on login (bug #504908)
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Fix xfconf channel for keyboard repeat rate setting
 - Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)



From nim at fedoraproject.org  Sat Sep 26 21:00:06 2009
From: nim at fedoraproject.org (nim)
Date: Sat, 26 Sep 2009 21:00:06 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.13, 1.14 fontpackages.spec,
	1.19, 1.20 import.log, 1.15, 1.16 sources, 1.13, 1.14
Message-ID: <20090926210006.42EC311C0423@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8187/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	13 Sep 2009 13:36:13 -0000	1.13
+++ .cvsignore	26 Sep 2009 21:00:05 -0000	1.14
@@ -1 +1 @@
-fontpackages-1.23.tar.xz
+fontpackages-1.24.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fontpackages.spec	13 Sep 2009 13:36:13 -0000	1.19
+++ fontpackages.spec	26 Sep 2009 21:00:05 -0000	1.20
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.23
+Version: 1.24
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -100,6 +100,11 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sat Sep 26 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.24-1
+? improve repo-font-audit (make WWS check more accurate, support file://
+  local repositories?)
+
 * Sun Sep 13 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.23-1
 ? cleanups + add merging/remapping templates


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	13 Sep 2009 13:36:13 -0000	1.15
+++ import.log	26 Sep 2009 21:00:05 -0000	1.16
@@ -13,3 +13,4 @@ fontpackages-1_20-1_fc11:HEAD:fontpackag
 fontpackages-1_21-1_fc12:HEAD:fontpackages-1.21-1.fc12.src.rpm:1243980659
 fontpackages-1_22-1_fc12:HEAD:fontpackages-1.22-1.fc12.src.rpm:1245574642
 fontpackages-1_23-1_fc12:HEAD:fontpackages-1.23-1.fc12.src.rpm:1252848946
+fontpackages-1_24-1_fc12:HEAD:fontpackages-1.24-1.fc12.src.rpm:1253998725


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	13 Sep 2009 13:36:13 -0000	1.13
+++ sources	26 Sep 2009 21:00:05 -0000	1.14
@@ -1 +1 @@
-508caf81a8cffd7bbd3ee3208720d19b  fontpackages-1.23.tar.xz
+5faa75d10ad961c34b71d67201f3ebc7  fontpackages-1.24.tar.xz



From kkofler at fedoraproject.org  Sat Sep 26 21:27:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 26 Sep 2009 21:27:20 +0000 (UTC)
Subject: rpms/phonon/F-10 phonon-4.3.2-kdebug#172242-2.patch, NONE,
	1.1 phonon.spec, 1.19, 1.20
Message-ID: <20090926212720.3E9D111C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/phonon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19631/F-10

Modified Files:
	phonon.spec 
Added Files:
	phonon-4.3.2-kdebug#172242-2.patch 
Log Message:
* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
- fix for '#' in filenames

phonon-4.3.2-kdebug#172242-2.patch:
 mediaobject.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE phonon-4.3.2-kdebug#172242-2.patch ---
diff -up phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2 phonon-4.3.1/xine/mediaobject.cpp
--- phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2	2009-06-18 12:37:45.641000922 -0500
+++ phonon-4.3.1/xine/mediaobject.cpp	2009-06-18 12:39:15.917231311 -0500
@@ -321,7 +321,7 @@ static QByteArray mrlEncode(QByteArray m
 {
     for (int i = 0; i < mrl.size(); ++i) {
         const unsigned char c = static_cast<unsigned char>(mrl.at(i));
-        if (c & 0x80 || c == '\\' || c < 32 || c == '%') {
+        if (c & 0x80 || c == '\\' || c < 32 || c == '%' || c == '#') {
             char enc[4];
             qsnprintf(enc, 4, "%%%02X", c);
             mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1);


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- phonon.spec	20 May 2009 21:08:12 -0000	1.19
+++ phonon.spec	26 Sep 2009 21:27:20 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -24,6 +24,8 @@ Patch100: phonon-4.3.2-gstreamer-utf8-ur
 Patch101: phonon-4.3.2-gstreamer-volumefader.patch
 # fix for non-ascii filenames in xine backend
 Patch102: phonon-4.3.2-kdebug#172242.patch
+# escape '#' too
+Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -80,6 +82,7 @@ Requires: pkgconfig
 %patch100 -p0 -b .gstreamer-utf8-url
 %patch101 -p0 -b .gstreamer-volumefader
 %patch102 -p1 -b .xine_nonascii
+%patch103 -p1 -b .xine_nonascii-2
 
 
 %build
@@ -173,6 +176,9 @@ fi
 
 
 %changelog
+* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
+- fix for '#' in filenames
+
 * Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
 - phonon-backend-gstreamer multilib conflict (#501816)
 



From kkofler at fedoraproject.org  Sat Sep 26 21:27:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 26 Sep 2009 21:27:20 +0000 (UTC)
Subject: rpms/phonon/F-11 phonon-4.3.2-kdebug#172242-2.patch, NONE,
	1.1 phonon.spec, 1.37, 1.38
Message-ID: <20090926212720.7D9FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19631/F-11

Modified Files:
	phonon.spec 
Added Files:
	phonon-4.3.2-kdebug#172242-2.patch 
Log Message:
* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
- fix for '#' in filenames

phonon-4.3.2-kdebug#172242-2.patch:
 mediaobject.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE phonon-4.3.2-kdebug#172242-2.patch ---
diff -up phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2 phonon-4.3.1/xine/mediaobject.cpp
--- phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2	2009-06-18 12:37:45.641000922 -0500
+++ phonon-4.3.1/xine/mediaobject.cpp	2009-06-18 12:39:15.917231311 -0500
@@ -321,7 +321,7 @@ static QByteArray mrlEncode(QByteArray m
 {
     for (int i = 0; i < mrl.size(); ++i) {
         const unsigned char c = static_cast<unsigned char>(mrl.at(i));
-        if (c & 0x80 || c == '\\' || c < 32 || c == '%') {
+        if (c & 0x80 || c == '\\' || c < 32 || c == '%' || c == '#') {
             char enc[4];
             qsnprintf(enc, 4, "%%%02X", c);
             mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1);


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- phonon.spec	6 Jun 2009 00:00:19 -0000	1.37
+++ phonon.spec	26 Sep 2009 21:27:20 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -24,6 +24,8 @@ Patch100: phonon-4.3.2-gstreamer-utf8-ur
 Patch101: phonon-4.3.2-gstreamer-volumefader.patch
 # fix for non-ascii filenames in xine backend
 Patch102: phonon-4.3.2-kdebug#172242.patch
+# escape '#' too
+Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -80,6 +82,7 @@ Requires: pkgconfig
 %patch100 -p0 -b .gstreamer-utf8-url
 %patch101 -p0 -b .gstreamer-volumefader
 %patch102 -p1 -b .xine_nonascii
+%patch103 -p1 -b .xine_nonascii-2
 
 
 %build
@@ -173,6 +176,9 @@ fi
 
 
 %changelog
+* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
+- fix for '#' in filenames
+
 * Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
 - phonon-backend-gstreamer multilib conflict (#501816)
 



From rathann at fedoraproject.org  Sat Sep 26 23:40:37 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 26 Sep 2009 23:40:37 +0000 (UTC)
Subject: rpms/libdvdread/devel libdvdread-endian.patch, NONE,
	1.1 libdvdread-multilib.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 libdvdread.spec, 1.12, 1.13 sources, 1.6,
	1.7 libdvdread-4.1.3-multilib.patch, 1.1, NONE
Message-ID: <20090926234037.A80CA11C0423@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9260

Modified Files:
	.cvsignore libdvdread.spec sources 
Added Files:
	libdvdread-endian.patch libdvdread-multilib.patch 
Removed Files:
	libdvdread-4.1.3-multilib.patch 
Log Message:
* Sun Sep 27 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
- updated to SVN r1183
- simplified multilib patch
- fixed endianness issues (rhbz#442508)
- added some docs


libdvdread-endian.patch:
 configure2 |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE libdvdread-endian.patch ---
diff -up libdvdread-4.1.4/configure2.endian libdvdread-4.1.4/configure2
--- libdvdread-4.1.4/configure2.endian	2009-09-27 00:23:58.000000000 +0200
+++ libdvdread-4.1.4/configure2	2009-09-27 01:26:56.000000000 +0200
@@ -108,6 +108,19 @@
   ;;
 esac
 
+echo -n "Checking if we're big-endian... "
+bigendian=no
+TMPD=`mktemp -d`
+TMPC=$TMPD/endian.c
+TMPO=$TMPD/endian.o
+cat > $TMPC <<EOF
+unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; 
+EOF
+$cc $optimizations $cflags -c -o $TMPO $TMPC
+od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && bigendian=yes
+rm -rf $TMPD
+echo "$bigendian"
+
 cat > config.mak << EOF
 # Automatically generated by configure, do not edit
 PREFIX=$PREFIX
@@ -136,6 +149,7 @@
 /* Automatically generated by configure, do not edit */
 #include "version.h"
 EOF
+test "$bigendian" == "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
 
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" != "no"; then

libdvdread-multilib.patch:
 Makefile               |    3 ---
 misc/dvdread-config.sh |    9 ++++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE libdvdread-multilib.patch ---
diff -up libdvdread-4.1.4/Makefile.multilib libdvdread-4.1.4/Makefile
--- libdvdread-4.1.4/Makefile.multilib	2008-12-31 09:43:03.000000000 +0100
+++ libdvdread-4.1.4/Makefile	2009-09-27 00:41:34.000000000 +0200
@@ -131,9 +131,6 @@ distclean: clean
 dvdread-config: $(.OBJDIR)/dvdread-config
 $(.OBJDIR)/dvdread-config: $(BUILDDEPS)
 	@echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
-	@echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
-	@echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
-	@echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
 	@echo >> $(.OBJDIR)/dvdread-config
 	cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
 	chmod 0755 $(.OBJDIR)/dvdread-config
diff -up libdvdread-4.1.4/misc/dvdread-config.sh.multilib libdvdread-4.1.4/misc/dvdread-config.sh
--- libdvdread-4.1.4/misc/dvdread-config.sh.multilib	2008-09-23 11:14:45.000000000 +0200
+++ libdvdread-4.1.4/misc/dvdread-config.sh	2009-09-27 00:39:39.000000000 +0200
@@ -1,4 +1,3 @@
-dvdreadlib="-ldvdread"
 
 usage()
 {
@@ -28,7 +27,7 @@ while test $# -gt 0; do
       echo_prefix=yes
       ;;
     --version)
-      echo $version
+      echo `pkg-config --modversion dvdread`
       ;;
     --cflags)
       echo_cflags=yes
@@ -44,13 +43,13 @@ while test $# -gt 0; do
 done
 
 if test "$echo_prefix" = "yes"; then
-        echo $prefix
+        echo `pkg-config --variable=prefix dvdread`
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I$prefix/include $extracflags
+      echo `pkg-config --cflags dvdread`
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L$libdir $dvdreadlib
+      echo `pkg-config --libs dvdread`
 fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Sep 2008 17:47:34 -0000	1.5
+++ .cvsignore	26 Sep 2009 23:40:35 -0000	1.6
@@ -1 +1 @@
-libdvdread-4.1.3.tar.bz2
+libdvdread-svn1183.tar.bz2


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/libdvdread.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libdvdread.spec	25 Jul 2009 05:32:39 -0000	1.12
+++ libdvdread.spec	26 Sep 2009 23:40:36 -0000	1.13
@@ -1,18 +1,19 @@
 Name:           libdvdread
-Version:        4.1.3
-Release:        4%{?dist}
+Version:        4.1.4
+Release:        0.1.svn1183%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
+#Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
-#Source:         %{name}-4.1.3rc1.tar.bz2
+Source:         %{name}-svn1183.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+# fix endianness issues on bigendian platforms
+Patch0:         %{name}-endian.patch
 # dvdread-config: use pkg-config instead of hard-coded 
 # multilib-conflicting values
-Patch1: libdvdread-4.1.3-multilib.patch
+Patch1:         %{name}-multilib.patch
 
 %description
 libdvdread provides a simple foundation for reading DVD video disks.
@@ -32,7 +33,7 @@ This package contains development files 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .endian
 %patch1 -p1 -b .multilib
 
 %build
@@ -60,16 +61,24 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog README
 %{_libdir}/libdvdread.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc DEVELOPMENT-POLICY.txt TODO
 %{_bindir}/dvdread-config
 %{_includedir}/dvdread
 %{_libdir}/libdvdread.so
 %{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Sun Sep 27 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
+- updated to SVN r1183
+- simplified multilib patch
+- fixed endianness issues (rhbz#442508)
+- added some docs
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Sep 2008 17:47:34 -0000	1.6
+++ sources	26 Sep 2009 23:40:36 -0000	1.7
@@ -1 +1 @@
-6dc068d442c85a3cdd5ad3da75f6c6e8  libdvdread-4.1.3.tar.bz2
+0fdb0cfb8655abecfb1498a4ea73ef71  libdvdread-svn1183.tar.bz2


--- libdvdread-4.1.3-multilib.patch DELETED ---



From jussilehtola at fedoraproject.org  Sat Sep 26 23:48:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 26 Sep 2009 23:48:45 +0000 (UTC)
Subject: rpms/jmol/devel jmol-11.8-fedorabuild.patch, NONE, 1.1 .cvsignore,
	1.5, 
	1.6 jmol.spec, 1.11, 1.12 sources, 1.5, 1.6 jmol.patch, 1.1, NONE
Message-ID: <20090926234845.680C411C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12068

Modified Files:
	.cvsignore jmol.spec sources 
Added Files:
	jmol-11.8-fedorabuild.patch 
Removed Files:
	jmol.patch 
Log Message:
Update to 11.8 series.

jmol-11.8-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8-fedorabuild.patch ---
diff -up Jmol/build.xml.fedorabuild Jmol/build.xml
--- Jmol/build.xml.fedorabuild	2009-09-17 05:37:36.000000000 +0300
+++ Jmol/build.xml	2009-09-23 17:25:56.101688225 +0300
@@ -20,7 +20,7 @@
   <property name="jvxl_version" value="0.1" />
 
   <property name="tests.source.dir" value="source-tests" />
-  <property name="lib.dir" value="jars" />
+  <property name="lib.dir" value="/usr/share/java" />
   <property name="plugin.dir" value="plugin-jars" />
   <property name="appjars.dir" value="build/appjars" />
   <property name="classes.dir" value="build/classes" />
@@ -34,9 +34,9 @@
   <property name="jmol.build.dir" value="build" />
   <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
   <property name="docbook-xml" value="docbook-xml-4.4" />
-  <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
-  <property name="itext.jar" value="itext-1.4.5.jar" />
-  <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+  <property name="vecmath.jar" value="vecmath.jar" />
+  <property name="itext.jar" value="itext.jar" />
+  <property name="commons-cli.jar" value="commons-cli.jar" />
 
   <!-- you can set this by defining it in ~/.jmol.build.properties -->
   <property name="keystore.name" value="Must be set by user." />


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Jul 2009 14:24:22 -0000	1.5
+++ .cvsignore	26 Sep 2009 23:48:44 -0000	1.6
@@ -1 +1 @@
-jmol-11.6.11223.tar.bz2
+jmol-11.8.11564.tar.xz


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/jmol.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- jmol.spec	25 Jul 2009 04:03:51 -0000	1.11
+++ jmol.spec	26 Sep 2009 23:48:45 -0000	1.12
@@ -1,8 +1,8 @@
-%define svnrel 11223
+%define svnrel 11564
 
 Name:		jmol
-Version:	11.6
-Release:	12.%{svnrel}svn%{?dist}
+Version:	11.8
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
@@ -14,19 +14,27 @@ BuildArch:	noarch
 
 # The source package has been created from SVN sources:
 # svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_6/Jmol
-Source0:	%{name}-%{version}.%{svnrel}.tar.bz2
+# tar cvf jmol-%{name}-%{version}.%{svnrel}.tar
+# xz %{name}-%{version}.%{svnrel}.tar
+Source0:	%{name}-%{version}.%{svnrel}.tar.xz
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
-Source2:	Jmol_icon_128.png
-# Patch disabling jar signing
-Patch0:		jmol.patch
+Source1:	Jmol_icon_128.png
+# Patch to get Jmol to build in Fedora
+Patch0:		jmol-11.8-fedorabuild.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ant
+BuildRequires:	ant, ant-contrib
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
+# For javax.vecmath
+BuildRequires:	vecmath
+
+%if 0%{?rhel} == 5
+BuildRequires:	xz
+%endif
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
@@ -56,8 +64,9 @@ The documentation for %{name}.
 
 %prep
 %setup -q -n Jmol
-%patch0 -p1
-find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+%patch0 -p1 -b .fedorabuild
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
 # Remove executable permissions from documentation
 chmod 644 README.txt
@@ -82,9 +91,10 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
+#install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
+install -D -p -m 644 build/Jmol.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Install desktop file
 desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
@@ -113,6 +123,9 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11564
+- Update to 11.8 series, svn revision 11564.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.6-12.11223svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 14:24:22 -0000	1.5
+++ sources	26 Sep 2009 23:48:45 -0000	1.6
@@ -1 +1 @@
-6cdf1f77df024e9a0c07a6df6643002e  jmol-11.6.11223.tar.bz2
+3f772a8fe552f9bcedca0d071be1e496  jmol-11.8.11564.tar.xz


--- jmol.patch DELETED ---



From rathann at fedoraproject.org  Sat Sep 26 23:49:39 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 26 Sep 2009 23:49:39 +0000 (UTC)
Subject: rpms/libdvdread/devel libdvdread-endian.patch,1.1,1.2
Message-ID: <20090926234939.C298611C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12271

Modified Files:
	libdvdread-endian.patch 
Log Message:
fix patch to actually do what it was supposed to


libdvdread-endian.patch:
 configure2 |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Index: libdvdread-endian.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/libdvdread-endian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libdvdread-endian.patch	26 Sep 2009 23:40:36 -0000	1.1
+++ libdvdread-endian.patch	26 Sep 2009 23:49:39 -0000	1.2
@@ -25,7 +25,7 @@ diff -up libdvdread-4.1.4/configure2.end
  /* Automatically generated by configure, do not edit */
  #include "version.h"
  EOF
-+test "$bigendian" == "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
++test "$bigendian" == "yes" && echo "#define WORDS_BIGENDIAN" >> config.h || echo "#undef WORDS_BIGENDIAN" >> config.h
  
  # build tree in object directory if source path is different from current one
  if test "$source_path_used" != "no"; then



From rathann at fedoraproject.org  Sun Sep 27 00:14:40 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 27 Sep 2009 00:14:40 +0000 (UTC)
Subject: rpms/libdvdnav/devel libdvdnav-multilib.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 libdvdnav.spec, 1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20090927001441.B8B9311C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdnav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19226

Modified Files:
	.cvsignore libdvdnav.spec sources 
Added Files:
	libdvdnav-multilib.patch 
Log Message:
* Sat Sep 26 2009 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.4-0.1.svn1184
- fix multilib conflict, based on a patch by Rex Dieter (rhbz#477684)
- update to SVN r1184
- move TODO to devel docs


libdvdnav-multilib.patch:
 Makefile               |    6 ------
 misc/dvdnav-config2.sh |   12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

--- NEW FILE libdvdnav-multilib.patch ---
diff -up libdvdnav-4.1.3/Makefile.multilib libdvdnav-4.1.3/Makefile
--- libdvdnav-4.1.3/Makefile.multilib	2008-12-30 15:48:46.000000000 +0100
+++ libdvdnav-4.1.3/Makefile	2009-09-27 00:36:48.000000000 +0200
@@ -143,12 +143,6 @@ distclean: clean
 dvdnav-config: $(.OBJDIR)/dvdnav-config
 $(.OBJDIR)/dvdnav-config: $(BUILDDEPS)
 	@echo '#!/bin/sh' > $(.OBJDIR)/dvdnav-config
-	@echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdnav-config
-	@echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdnav-config
-	@echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdnav-config
-	@echo 'dvdread_cflags="'$(DVDREAD_CFLAGS)'"' >> $(.OBJDIR)/dvdnav-config
-	@echo 'dvdread_libs="'$(DVDREAD_LIBS)'"' >> $(.OBJDIR)/dvdnav-config
-	@echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config
 	@echo >> $(.OBJDIR)/dvdnav-config
 	cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config
 	chmod 0755 $(.OBJDIR)/dvdnav-config
diff -up libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib libdvdnav-4.1.3/misc/dvdnav-config2.sh
--- libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib	2008-10-10 00:20:01.000000000 +0200
+++ libdvdnav-4.1.3/misc/dvdnav-config2.sh	2009-09-27 00:34:39.000000000 +0200
@@ -30,7 +30,7 @@ while test $# -gt 0; do
       echo_prefix=yes
       ;;
     --version)
-      echo $version
+      echo `pkg-config --modversion dvdnav`
       ;;
     --cflags)
       echo_cflags=yes
@@ -52,21 +52,21 @@ while test $# -gt 0; do
 done
 
 if test "$echo_prefix" = "yes"; then
-	echo $prefix
+      echo `pkg-config --variable=prefix dvdnav`
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
+      echo `pkg-config --cflags dvdnav`
 fi
 
 if test "$echo_minicflags" = "yes"; then
-      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
+      echo `pkg-config --cflags dvdnavmini`
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
+      echo `pkg-config --libs dvdnav`
 fi
 
 if test "$echo_minilibs" = "yes"; then
-      echo -L$libdir -ldvdnavmini $threadlib
+      echo `pkg-config --libs dvdnavmini`
 fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2008 17:51:27 -0000	1.7
+++ .cvsignore	27 Sep 2009 00:14:38 -0000	1.8
@@ -1 +1 @@
-libdvdnav-4.1.3.tar.bz2
+libdvdnav-svn1184.tar.bz2


Index: libdvdnav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/libdvdnav.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libdvdnav.spec	25 Jul 2009 05:32:23 -0000	1.15
+++ libdvdnav.spec	27 Sep 2009 00:14:38 -0000	1.16
@@ -1,13 +1,14 @@
 Name:           libdvdnav
-Version:        4.1.3
-Release:        3%{?dist}
+Version:        4.1.4
+Release:        0.1.svn1184%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
+#Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-#Source:         %{name}-4.1.3rc1.tar.bz2
+Source:         %{name}-svn1184.tar.bz2
+Patch0:         %{name}-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -30,6 +31,7 @@ libdvdnav library.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 %build
 ./configure2 \
@@ -62,13 +64,13 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libdvdnav.so.*
 %{_libdir}/libdvdnavmini.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html/*
+%doc TODO doc/html/*
 %{_bindir}/dvdnav-config
 %{_libdir}/libdvdnav.so
 %{_libdir}/libdvdnavmini.so
@@ -78,6 +80,11 @@ popd
 %{_libdir}/pkgconfig/dvdnavmini.pc
 
 %changelog
+* Sat Sep 26 2009 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.4-0.1.svn1184
+- fix multilib conflict, based on a patch by Rex Dieter (rhbz#477684)
+- update to SVN r1184
+- move TODO to devel docs
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2008 17:51:27 -0000	1.7
+++ sources	27 Sep 2009 00:14:38 -0000	1.8
@@ -1 +1 @@
-d62383c45b28816771e283515f2c27fa  libdvdnav-4.1.3.tar.bz2
+9e25093d010e007145f7d220f6a3c595  libdvdnav-svn1184.tar.bz2



From cweyl at fedoraproject.org  Sun Sep 27 00:43:38 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 00:43:38 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.36, 1.37 perl-Class-MOP.spec,
	1.42, 1.43 sources, 1.34, 1.35
Message-ID: <20090927004338.0788511C00E6@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-serv31984

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.94-1
- auto-update to 0.94 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	19 Sep 2009 18:39:52 -0000	1.36
+++ .cvsignore	27 Sep 2009 00:43:36 -0000	1.37
@@ -1 +1 @@
-Class-MOP-0.93.tar.gz
+Class-MOP-0.94.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- perl-Class-MOP.spec	19 Sep 2009 18:39:53 -0000	1.42
+++ perl-Class-MOP.spec	27 Sep 2009 00:43:36 -0000	1.43
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.93
+Version:        0.94
 Release:        1%{?dist}
 Summary:        A Meta Object Protocol for Perl 5
 License:        GPL+ or Artistic
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.94-1
+- auto-update to 0.94 (by cpan-spec-update 0.01)
+
 * Fri Sep 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.93-1
 - switch filtering systems
 - auto-update to 0.93 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	19 Sep 2009 18:39:53 -0000	1.34
+++ sources	27 Sep 2009 00:43:36 -0000	1.35
@@ -1 +1 @@
-ad212d53b085389638ead45b0192b69d  Class-MOP-0.93.tar.gz
+19fa19752df27396cfb9d826002ccdce  Class-MOP-0.94.tar.gz



From rathann at fedoraproject.org  Sun Sep 27 00:48:59 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 27 Sep 2009 00:48:59 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.18,1.19
Message-ID: <20090927004859.6B0EC11C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2489

Modified Files:
	comps-f13.xml.in 
Log Message:
add some of my missing packages to appropriate groups


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- comps-f13.xml.in	22 Sep 2009 00:22:04 -0000	1.18
+++ comps-f13.xml.in	27 Sep 2009 00:48:59 -0000	1.19
@@ -1118,6 +1118,7 @@
       <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">patchy</packagereq>
+      <packagereq type="optional">pax-utils</packagereq>
       <packagereq type="optional">perl-perlmenu</packagereq>
       <packagereq type="optional">perltidy</packagereq>
       <packagereq type="optional">phpcs</packagereq>
@@ -1351,6 +1352,7 @@
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
       <packagereq type="optional">kdeedu-math</packagereq>
+      <packagereq type="optional">mnemosyne</packagereq>
       <packagereq type="optional">moodle</packagereq>
       <packagereq type="optional">nightview</packagereq>
       <packagereq type="optional">saoimage</packagereq>
@@ -2953,6 +2955,7 @@
       <packagereq type="optional">hddtemp</packagereq>
       <packagereq type="optional">hdparm</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
+      <packagereq type="optional">iscan-firmware</packagereq>
       <packagereq type="optional">isight-firmware-tools</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
@@ -5114,6 +5117,7 @@
       <packagereq type="optional">xmms-adplug</packagereq>
       <packagereq type="optional">xmms-cdread</packagereq>
       <packagereq type="optional">xmms-flac</packagereq>
+      <packagereq type="optional">xmp</packagereq>
     </packagelist>
   </group>
   <group>



From rathann at fedoraproject.org  Sun Sep 27 00:49:38 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 27 Sep 2009 00:49:38 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.128,1.129
Message-ID: <20090927004938.3142611C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2629

Modified Files:
	comps-f12.xml.in 
Log Message:
add some of my missing packages to appropriate groups


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- comps-f12.xml.in	22 Sep 2009 06:01:37 -0000	1.128
+++ comps-f12.xml.in	27 Sep 2009 00:49:38 -0000	1.129
@@ -1119,6 +1119,7 @@
       <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">patchy</packagereq>
+      <packagereq type="optional">pax-utils</packagereq>
       <packagereq type="optional">perl-perlmenu</packagereq>
       <packagereq type="optional">perltidy</packagereq>
       <packagereq type="optional">phpcs</packagereq>
@@ -1352,6 +1353,7 @@
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
       <packagereq type="optional">kdeedu-math</packagereq>
+      <packagereq type="optional">mnemosyne</packagereq>
       <packagereq type="optional">moodle</packagereq>
       <packagereq type="optional">nightview</packagereq>
       <packagereq type="optional">saoimage</packagereq>
@@ -2957,6 +2959,7 @@
       <packagereq type="optional">hddtemp</packagereq>
       <packagereq type="optional">hdparm</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
+      <packagereq type="optional">iscan-firmware</packagereq>
       <packagereq type="optional">isight-firmware-tools</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
@@ -5122,6 +5125,7 @@
       <packagereq type="optional">xmms-adplug</packagereq>
       <packagereq type="optional">xmms-cdread</packagereq>
       <packagereq type="optional">xmms-flac</packagereq>
+      <packagereq type="optional">xmp</packagereq>
     </packagelist>
   </group>
   <group>



From rathann at fedoraproject.org  Sun Sep 27 00:50:37 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 27 Sep 2009 00:50:37 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.301,1.302
Message-ID: <20090927005037.A746011C0418@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2805

Modified Files:
	comps-f11.xml.in 
Log Message:
add some of my missing packages to appropriate groups


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- comps-f11.xml.in	19 Sep 2009 01:02:47 -0000	1.301
+++ comps-f11.xml.in	27 Sep 2009 00:50:37 -0000	1.302
@@ -1033,6 +1033,7 @@
       <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">patchy</packagereq>
+      <packagereq type="optional">pax-utils</packagereq>
       <packagereq type="optional">perl-perlmenu</packagereq>
       <packagereq type="optional">perltidy</packagereq>
       <packagereq type="optional">phpcs</packagereq>
@@ -1241,6 +1242,7 @@
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
       <packagereq type="optional">kdeedu-math</packagereq>
+      <packagereq type="optional">mnemosyne</packagereq>
       <packagereq type="optional">moodle</packagereq>
       <packagereq type="optional">nightview</packagereq>
       <packagereq type="optional">saoimage</packagereq>
@@ -2801,6 +2803,7 @@
       <packagereq type="optional">hddtemp</packagereq>
       <packagereq type="optional">hdparm</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
+      <packagereq type="optional">iscan-firmware</packagereq>
       <packagereq type="optional">isight-firmware-tools</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
@@ -4928,6 +4931,7 @@
       <packagereq type="optional">xmms-adplug</packagereq>
       <packagereq type="optional">xmms-cdread</packagereq>
       <packagereq type="optional">xmms-flac</packagereq>
+      <packagereq type="optional">xmp</packagereq>
     </packagelist>
   </group>
   <group>



From rathann at fedoraproject.org  Sun Sep 27 00:51:42 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 27 Sep 2009 00:51:42 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.275,1.276
Message-ID: <20090927005142.0FAD011C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2963

Modified Files:
	comps-f10.xml.in 
Log Message:
add some of my missing packages to appropriate groups


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- comps-f10.xml.in	19 Sep 2009 01:02:47 -0000	1.275
+++ comps-f10.xml.in	27 Sep 2009 00:51:41 -0000	1.276
@@ -953,6 +953,7 @@
       <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">patchy</packagereq>
+      <packagereq type="optional">pax-utils</packagereq>
       <packagereq type="optional">perl-perlmenu</packagereq>
       <packagereq type="optional">perltidy</packagereq>
       <packagereq type="optional">pgadmin3</packagereq>
@@ -1141,6 +1142,7 @@
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
       <packagereq type="optional">kdeedu-math</packagereq>
+      <packagereq type="optional">mnemosyne</packagereq>
       <packagereq type="optional">moodle</packagereq>
       <packagereq type="optional">stellarium</packagereq>
       <packagereq type="optional">tuxtype2</packagereq>
@@ -2424,6 +2426,7 @@
       <packagereq type="optional">gypsy</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
+      <packagereq type="optional">iscan-firmware</packagereq>
       <packagereq type="optional">isight-firmware-tools</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
@@ -4253,6 +4256,7 @@
       <packagereq type="optional">xmms-adplug</packagereq>
       <packagereq type="optional">xmms-cdread</packagereq>
       <packagereq type="optional">xmms-flac</packagereq>
+      <packagereq type="optional">xmp</packagereq>
     </packagelist>
   </group>
   <group>



From deji at fedoraproject.org  Sun Sep 27 01:04:34 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 27 Sep 2009 01:04:34 +0000 (UTC)
Subject: rpms/atlas/devel .cvsignore, 1.5, 1.6 atlas.spec, 1.28, 1.29 sources,
	1.5, 1.6
Message-ID: <20090927010434.5A90F11C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8899

Modified Files:
	.cvsignore atlas.spec sources 
Log Message:
* Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-10
- Use the new arch. default for Pentium PRO (Fedora bug #510498)
- (Re-)Introduce 3dNow subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Feb 2009 10:21:42 -0000	1.5
+++ .cvsignore	27 Sep 2009 01:04:33 -0000	1.6
@@ -1 +1,3 @@
 atlas3.8.3.tar.bz2
+PPRO32.tgz
+K7323DNow.tgz


Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- atlas.spec	7 Sep 2009 05:14:03 -0000	1.28
+++ atlas.spec	27 Sep 2009 01:04:33 -0000	1.29
@@ -2,14 +2,16 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://math-atlas.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/math-atlas/%{name}%{version}.tar.bz2
-Source1:        README.Fedora
+Source1:        PPRO32.tgz
+Source2:        K7323DNow.tgz
+Source3:        README.Fedora
 Patch0:		atlas-fedora_shared.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +40,7 @@ Requires:       %{name} = %{version}-%{r
 Obsoletes:	%name-header = %version-%release
 
 %description devel
-This package contains the libraries and headers for development
+This package contains the static libraries and headers for development
 with ATLAS (Automatically Tuned Linear Algebra Software).
 
 %define types base
@@ -46,17 +48,33 @@ with ATLAS (Automatically Tuned Linear A
 %if "%{?enable_native_atlas}" == "0"
 ############## Subpackages for architecture extensions #################
 #
-# Because a set of ATLAS libraries is a ~5 MB package, separate packages
-# are created for SSE, SSE2, and SSE3 extensions to ix86.
-
 %ifarch %{ix86}
-%define types sse sse2 sse3
+%define types base 3dnow sse sse2 sse3
+
+%package 3dnow
+Summary:        ATLAS libraries for 3DNow extensions
+Group:          System Environment/Libraries
+
+%description 3dnow
+This package contains the ATLAS (Automatically Tuned Linear Algebra
+Software) libraries compiled with optimizations for the 3DNow extension
+to the ix86 architecture. Fedora also produces ATLAS build with SSE, SSE2
+and SSE3 extensions.
+
+%package 3dnow-devel
+Summary:        Development libraries for ATLAS with 3DNow extensions
+Group:          Development/Libraries
+Requires:       %{name}-3dnow = %{version}-%{release}
+Obsoletes:	%name-header = %version-%release
+
+%description 3dnow-devel
+This package contains headers and shared and static versions of the ATLAS
+(Automatically Tuned Linear Algebra Software) libraries compiled with
+optimizations for the 3DNow extensions to the ix86 architecture.
 
 %package sse
 Summary:        ATLAS libraries for SSE extensions
 Group:          System Environment/Libraries
-Obsoletes:	%{name}-3dnow < 3.7
-Provides:	%{name}-3dnow = %{version}-%{release}
 
 %description sse
 This package contains the ATLAS (Automatically Tuned Linear Algebra
@@ -69,8 +87,6 @@ Summary:        Development libraries fo
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
 Obsoletes:	%name-header = %version-%release
-Obsoletes:	%{name}-3dnow-devel < 3.7
-Provides:	%{name}-3dnow-devel = %{version}-%{release}
 
 %description sse-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -80,8 +96,6 @@ optimizations for the SSE(1) extensions 
 %package sse2
 Summary:        ATLAS libraries for SSE2 extensions
 Group:          System Environment/Libraries
-Obsoletes:	%{name} < 3.7
-Provides:	%{name} = %{version}-%{release}
 
 %description sse2
 This package contains the ATLAS (Automatically Tuned Linear Algebra
@@ -94,8 +108,6 @@ Summary:        Development libraries fo
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
 Obsoletes:	%name-header = %version-%release
-Obsoletes:	%{name}-devel < 3.7
-Provides:	%{name}-devel = %{version}-%{release}
 
 %description sse2-devel
 This package contains shared and static versions of the ATLAS
@@ -134,7 +146,9 @@ optimizations for the sse3 extensions to
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
-cp %{SOURCE1} doc
+cp %{SOURCE1} CONFIG/ARCHS/
+cp %{SOURCE2} CONFIG/ARCHS/
+cp %{SOURCE3} doc
 
 %build
 for type in %{types}; do
@@ -151,7 +165,16 @@ for type in %{types}; do
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
 	--with-netlib-lapack=%{_libdir}/liblapack_pic.a
 
-	if [ "$type" = "sse" ]; then
+%ifarch %{ix86}
+	if [ "$type" = "base" ]; then
+		sed -i 's#ARCH =.*#ARCH = PPRO32#' Make.inc
+		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
+		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+	elif [ "$type" = "3dnow" ]; then
+		sed -i 's#ARCH =.*#ARCH = K7323DNow#' Make.inc
+		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
+		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+	elif [ "$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 
@@ -162,6 +185,7 @@ for type in %{types}; do
 	elif [ "$type" = "sse3" ]; then
 		sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
 	fi
+%endif
 	make build
 	cd lib
 	make shared
@@ -190,20 +214,34 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
-%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
-cp -pr %{buildroot}%{_libdir}/atlas-sse2 %{buildroot}%{_libdir}/atlas
-echo "%{_libdir}/atlas"	>> %{buildroot}/etc/ld.so.conf.d/atlas-sse2.conf
-%endif
 
 %clean
 rm -rf %{buildroot}
 
-%ifnarch %{ix86} || %if "%{?enable_native_atlas}" == "1"
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
+
+%post -n atlas-3dnow -p /sbin/ldconfig
+
+%postun -n atlas-3dnow -p /sbin/ldconfig
+
+%post -n atlas-sse -p /sbin/ldconfig
+
+%postun -n atlas-sse -p /sbin/ldconfig
+
+%post -n atlas-sse2 -p /sbin/ldconfig
+
+%postun -n atlas-sse2 -p /sbin/ldconfig
+
+%post -n atlas-sse3 -p /sbin/ldconfig
+
+%postun -n atlas-sse3 -p /sbin/ldconfig
+
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
@@ -219,19 +257,22 @@ rm -rf %{buildroot}
 %{_includedir}/atlas
 %{_includedir}/*.h
 
-%else
-
-%post -n atlas-sse -p /sbin/ldconfig
-
-%postun -n atlas-sse -p /sbin/ldconfig
-
-%post -n atlas-sse2 -p /sbin/ldconfig
-
-%postun -n atlas-sse2 -p /sbin/ldconfig
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
-%post -n atlas-sse3 -p /sbin/ldconfig
+%files 3dnow
+%defattr(-,root,root,-)
+%doc doc/README.Fedora
+%dir %{_libdir}/atlas-3dnow
+%{_libdir}/atlas-3dnow/*.so.*
+%config(noreplace) /etc/ld.so.conf.d/atlas-3dnow.conf
 
-%postun -n atlas-sse3 -p /sbin/ldconfig
+%files 3dnow-devel
+%defattr(-,root,root,-)
+%doc doc
+%{_libdir}/atlas-3dnow/*.so
+%{_libdir}/atlas-3dnow/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %files sse
 %defattr(-,root,root,-)
@@ -252,9 +293,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
 %dir %{_libdir}/atlas-sse2
-%dir %{_libdir}/atlas
 %{_libdir}/atlas-sse2/*.so.*
-%{_libdir}/atlas/*.so.*
 %config(noreplace) /etc/ld.so.conf.d/atlas-sse2.conf
 
 %files sse2-devel
@@ -262,8 +301,6 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse2/*.so
 %{_libdir}/atlas-sse2/*.a
-%{_libdir}/atlas/*.so
-%{_libdir}/atlas/*.a
 %{_includedir}/atlas
 %{_includedir}/*.h
 
@@ -285,6 +322,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-10
+- Use the new arch. default for Pentium PRO (Fedora bug #510498)
+- (Re-)Introduce 3dNow subpackage
+
 * Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.8.3-9
 - Rebuild against fixed lapack (see #520518)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Feb 2009 10:21:42 -0000	1.5
+++ sources	27 Sep 2009 01:04:34 -0000	1.6
@@ -1 +1,3 @@
 6c13be94a87178e7582111c08e9503bc  atlas3.8.3.tar.bz2
+676548252837b1e458181111443f340f  PPRO32.tgz
+3f174cdcb4c964843f27dbfc4ad4b1c8  K7323DNow.tgz



From rdieter at fedoraproject.org  Sun Sep 27 01:18:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 01:18:22 +0000 (UTC)
Subject: rpms/koffice-langpack/devel koffice-langpack.spec,1.26,1.27
Message-ID: <20090927011822.4098411C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11491

Modified Files:
	koffice-langpack.spec 
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.82-1
- koffice-l10n-2.0.82



Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- koffice-langpack.spec	26 Sep 2009 18:19:13 -0000	1.26
+++ koffice-langpack.spec	27 Sep 2009 01:18:20 -0000	1.27
@@ -1,14 +1,10 @@
 
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%else
-%define kdelibs3 kdelibs
-%endif
+%define koffice_core_version 2:2.0
 
 Name:           koffice-langpack
-Epoch:          2 
-Version:        1.6.3
-Release:        4%{?dist}
+Epoch:          1
+Version:        2.0.82
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
@@ -16,471 +12,511 @@ License:        GPLv2+
 URL:            http://www.koffice.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-
 # borrowed from kdelibs' tarball, help with locale=Full Name mappings
 Source0: teamnames
-Source1: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fa-%{version}.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fi-%{version}.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fr-%{version}.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hu-%{version}.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr at Latn-%{version}.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sv-%{version}.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
+#Source1: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ar-%{version}.tar.bz2
+#Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
+#Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
+#Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
+#Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eo-%{version}.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
+#Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
+#Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fa-%{version}.tar.bz2
+#Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fi-%{version}.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fr-%{version}.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fy-%{version}.tar.bz2
+#Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
+#Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-he-%{version}.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hi-%{version}.tar.bz2
+#Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hne-%{version}.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-kk-%{version}.tar.bz2
+#Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
+#Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
+#Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
+#Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
+#Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
+#Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-se-%{version}.tar.bz2
+#Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
+#Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
+#Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
+#Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr at Latn-%{version}.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sv-%{version}.tar.bz2
+#Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ta-%{version}.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-wa-%{version}.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
 
 BuildRequires:  gettext
-BuildRequires:  %{kdelibs3}-devel
+BuildRequires:  kdelibs4-devel
 BuildRequires:  libxml2
 
 %description
 Language files for koffice
 
-#%package af
-#Summary:        Afrikaans language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description af
-#Provides additional afrikaans translations for koffice
-
-#%package ar
-#Summary:        Arabic language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description ar
-#Provides additional arabic translations for koffice
-
-#%package bs
-#Summary:        Bosnian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description bs
-#Provides additional bosnian translations for koffice
-
-#%package br
-#Summary:        Breton language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description br
-#Provides additional breton translations for koffice
+%package af
+Summary:        Afrikaans language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description af
+Provides additional Afrikaans translations for koffice
+
+%package ar
+Summary:        Arabic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description ar
+Provides additional Arabic translations for koffice
+
+%package bs
+Summary:        Bosnian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description bs
+Provides additional Bosnian translations for koffice
+
+%package br
+Summary:        Breton language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description br
+Provides additional Breton translations for koffice
 
 %package bg
 Summary:        Bulgarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description bg
-Provides additional bulgarian translations for koffice
+Provides additional Bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ca
-Provides additional catalan translations for koffice
+Provides additional Catalan translations for koffice
 
 %package cs
 Summary:        Czech language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description cs
-Provides additional czech translations for koffice
+Provides additional Czech translations for koffice
 
 %package cy
 Summary:        Welsh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description cy
-Provides additional welsh translations for koffice
+Provides additional Delsh translations for koffice
 
 %package da
 Summary:        Danish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description da
-Provides additional danish translations for koffice
+Provides additional Danish translations for koffice
 
 %package de
 Summary:        German language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description de
-Provides additional german translations for koffice
+Provides additional German translations for koffice
 
-#%package eo
-#Summary:        Esperanto language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description eo
-#Provides additional esperanto translations for koffice
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description eo
+Provides additional Esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description el
-Provides additional greek translations for koffice
+Provides additional Greek translations for koffice
 
 %package en_GB
 Summary:        British English language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description en_GB
-Provides additional british english translations for koffice
+Provides additional British English translations for koffice
 
 %package es
 Summary:        Spanish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description es
-Provides additional spanish translations for koffice
+Provides additional Spanish translations for koffice
 
 %package et
 Summary:        Estonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description et
-Provides additional estonian translations for koffice
+Provides additional Estonian translations for koffice
 
 %package eu
 Summary:        Basque language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description eu
-Provides additional basque translations for koffice
+Provides additional Basque translations for koffice
 
 %package fa
 Summary:        Farsi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fa 
-Provides additional farsi translations for koffice
+Provides additional Farsi translations for koffice
 
 %package fi
 Summary:        Finish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fi
-Provides additional finish translations for koffice
+Provides additional Finish translations for koffice
 
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fr
-Provides additional french translations for koffice
+Provides additional French translations for koffice
+
+%package fy
+Summary:        Frisian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description fy
+Provides additional Frisian translations for koffice
 
 %package ga
 Summary:        Irish-Gaelic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ga
-Provides additional irish-gaelic translations for koffice
+Provides additional Irish-Gaelic translations for koffice
 
 %package gl
 Summary:        Galician language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description gl
-Provides additional galician translations for koffice
+Provides additional Galician translations for koffice
+
+%package he
+Summary:        Hebrew language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description he
+Provides additional Hebrew translations for koffice
+
+%package hi
+Summary:        Hindi language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description hi
+Provides additional Hindi translations for koffice
 
-#%package he
-#Summary:        Hebrew language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description he
-#Provides additional hebrew translations for koffice
-
-#%package hi
-#Summary:        Hindi language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description hi
-#Provides additional hindi translations for koffice
+%package hne
+Summary:        Chhattisgarhi language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description hne
+Provides additional Chhattisgarhi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description hu
-Provides additional hungarian translations for koffice
+Provides additional Hungarian translations for koffice
 
-#%package is
-#Summary:        Icelandic language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description is
-#Provides additional icelandic translations for koffice
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description is
+Provides additional Icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description it
-Provides additional italian translations for koffice
+Provides additional Italian translations for koffice
 
 %package ja
 Summary:        Japanese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ja
-Provides additional japanese translations for koffice
+Provides additional Japanese translations for koffice
+
+%package kk
+Summary:        Kazakh language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description kk
+Provides additional Kazakh translations for koffice
 
 %package km
 Summary:        Khmer language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description km 
-Provides additional khmer translations for koffice
+Provides additional Khmer translations for koffice
 
-#%package lt
-#Summary:        Lithuanian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description lt
-#Provides additional lithuanian translations for koffice
-
-#%package mk
-#Summary:        Macedonian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description mk
-#Provides additional macedonian translations for koffice
+%package lt
+Summary:        Lithuanian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description lt
+Provides additional Lithuanian translations for koffice
+
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description lv
+Provides additional Lativian translations for koffice
+
+%package mk
+Summary:        Macedonian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description mk
+Provides additional Macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ms
-Provides additional malay translations for koffice
+Provides additional Malay translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nb
-Provides additional bokmal translations for koffice
+Provides additional Bokmal translations for koffice
 
 %package nds 
 Summary:        Low Saxon language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nds 
-Provides additional low saxon translations for koffice
+Provides additional Low Saxon translations for koffice
 
 %package ne
 Summary:        Nepali language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ne 
-Provides additional nepali translations for koffice
+Provides additional Nepali translations for koffice
 
 %package nl
 Summary:        Dutch language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nl
-Provides additional dutch translations for koffice
+Provides additional Dutch translations for koffice
 
-#%package nn
-#Summary:        Nynorsk language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description nn
-#Provides additional nynorsk translations for koffice
+%package nn
+Summary:        Nynorsk language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description nn
+Provides additional Nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pl
-Provides additional polish translations for koffice
+Provides additional Polish translations for koffice
 
 %package pt_BR
 Summary:        Brazilian Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pt_BR
-Provides additional brazilian portuguese translations for koffice
+Provides additional Brazilian Portuguese translations for koffice
 
 %package pt
 Summary:        Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pt
-Provides additional portuguese translations for koffice
+Provides additional Portuguese translations for koffice
 
 %package ru
 Summary:        Russian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ru
-Provides additional russian translations for koffice
+Provides additional Russian translations for koffice
 
-#%package ro
-#Summary:        Romanian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description ro
-#Provides additional romanian translations for koffice
-
-#%package se
-#Summary:        Northern Sami language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description se
-#Provides additional northern sami translations for koffice
+%package ro
+Summary:        Romanian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description ro
+Provides additional Romanian translations for koffice
+
+%package se
+Summary:        Northern Sami language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description se
+Provides additional Northern Sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sk
-Provides additional slovak translations for koffice
+Provides additional Slovak translations for koffice
 
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sl
-Provides additional slovenian translations for koffice
+Provides additional Slovenian translations for koffice
 
 %package sr-Latn
 Summary:        Serbian in Latin language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sr-Latn
-Provides additional serbian in latin translations for koffice
+Provides additional Serbian in latin translations for koffice
 
 %package sr
 Summary:        Serbian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sr
-Provides additional serbian translations for koffice
+Provides additional Serbian translations for koffice
 
 %package sv
 Summary:        Swedish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sv
 Provides additional Swedish translations for koffice
 
-#%package ta
-#Summary:        Tamil language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description ta
-#Provides additional tamil translations for koffice
-
-#%package tg
-#Summary:        Tajik language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description tg
-#Provides additional tajik translations for koffice
+%package ta
+Summary:        Tamil language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description ta
+Provides additional Tamil translations for koffice
+
+%package tg
+Summary:        Tajik language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description tg
+Provides additional Tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description tr
-Provides additional turkish translations for koffice
+Provides additional Turkish translations for koffice
 
 %package uk
 Summary:        Ukrainian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description uk
-Provides additional ukrainian translations for koffice
+Provides additional Ukrainian translations for koffice
 
-#%package uz
-#Summary:        Uzbek language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description uz
-#Provides additional uzbek translations for koffice
+%package uz
+Summary:        Uzbek language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description uz
+Provides additional Uzbek translations for koffice
+
+%package wa
+Summary:	Walloon language pack for koffice 
+Group:		Applications/Productivity 
+Requires:	koffice-core >= %{koffice_core_version}
+%description wa 
+Provides additional Walloon translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description zh_CN
 Provides additional simplified chinese translations for koffice
 
 %package zh_TW
 Summary:        Traditional Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description zh_TW
-Provides additional traditional chinese translations for koffice
-
-%package lv
-Summary:        Lativian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-%description lv
-Provides additional lativian translations for koffice
+Provides additional traditional Chinese translations for koffice
 
 
 %prep
-%setup -T -c -q -n %{name} -a 1  -a 2  -a 3  -a 4  -a 5  -a 6  -a 7  -a 8  -a 9  -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39
+%setup -T -c -q -n %{name} -a 4 -a 5 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 -a 46
 
 
 %build
 for koffice_lang in * ; do
-  if [ -x $koffice_lang/configure ]; then
+  if [ -f $koffice_lang/CMakeLists.txt ]; then
     pushd $koffice_lang
-    %configure
-    make %{?_smp_mflags}
+     mkdir -p %{_target_platform}
+     pushd %{_target_platform}
+      %{cmake_kde4} .. 
+      make %{?_smp_mflags}
+     popd
     popd
   fi
 done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 for koffice_lang in * ; do
-  if [ -x $koffice_lang/configure ]; then
-    make -C $koffice_lang install DESTDIR=$RPM_BUILD_ROOT 
+  if [ -f $koffice_lang/CMakeLists.txt ]; then
+    make -C $koffice_lang/%{_target_platform} install/fast DESTDIR=%{buildroot} 
   fi
 done
 
-HTML_DIR=$(kde-config --expandvars --install html)
-
+%if 0
+HTML_DIR=$(kde4-config --expandvars --install html)
 # Replace absolute symlinks with relative ones
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
+if [ -d %{buildroot}$HTML_DIR ]; then
+pushd %{buildroot}%{_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
@@ -492,42 +528,46 @@ for lang in *; do
 done
 popd
 fi
-
-# remove file conflict (kdgantt.mo) with kde-i18n (kde bug #75096)
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
+%endif
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+#files ar 
+#lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
 
+#files bg
+#lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
-%files bg
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+#files br
+#lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
 
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
-%lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
-%lang(ca) %{_datadir}/doc/HTML/ca/*
+%lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
+%lang(ca) %{_kde4_docdir}/HTML/ca/*
 
 %files cs
 %defattr(-,root,root,-)
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_datadir}/apps/koffice/autocorrect/cs.xml
+%lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
 
-%files cy
-%defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+#files cy
+#defattr(-,root,root,-)
+#lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
 
 %files da
 %defattr(-,root,root,-)
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
-%lang(da) %{_datadir}/doc/HTML/da/*
+%lang(da) %{_kde4_docdir}/HTML/da/*
 
 %files de
 %defattr(-,root,root,-)
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
-%lang(de) %{_datadir}/apps/koffice/autocorrect/de.xml
-%lang(de) %{_datadir}/doc/HTML/de/*
+%lang(de) %{_kde4_appsdir}/koffice/autocorrect/de.xml
+%lang(de) %{_kde4_docdir}/HTML/de/*
 
 %files el
 %defattr(-,root,root,-)
@@ -536,120 +576,149 @@ rm -rf $RPM_BUILD_ROOT
 %files en_GB
 %defattr(-,root,root,-)
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
-%lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
+
+#files eo
+#defattr(-,root,root,-)
+#lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
 
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
-%lang(es) %{_datadir}/apps/koffice/autocorrect/es.xml
-%lang(es) %{_datadir}/doc/HTML/es/*
+%lang(es) %{_kde4_appsdir}/koffice/autocorrect/es.xml
+%lang(es) %{_kde4_docdir}/HTML/es/*
 
 %files et
 %defattr(-,root,root,-)
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
-%lang(et) %{_datadir}/doc/HTML/et/
+%lang(et) %{_kde4_docdir}/HTML/et/
 
-%files eu
-%defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
-
-%files fa 
-%defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-
-%files fi
-%defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+#files eu
+#defattr(-,root,root,-)
+#lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+
+#files fa 
+#defattr(-,root,root,-)
+#lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+
+#files fi
+#defattr(-,root,root,-)
+#lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 
 %files fr
 %defattr(-,root,root,-)
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
-%lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
-%lang(fr) %{_datadir}/doc/HTML/fr/*
+%lang(fr) %{_kde4_appsdir}/koffice/autocorrect/fr.xml
+%lang(fr) %{_kde4_docdir}/HTML/fr/*
 
-%files ga
+%files fy
 %defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+
+#files ga
+#defattr(-,root,root,-)
+#lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
 
 %files gl
 %defattr(-,root,root,-)
 %lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
-%lang(fr) %{_datadir}/doc/HTML/gl/*
+%lang(gl) %{_kde4_docdir}/HTML/gl/*
 
-%files hu
+#files he 
+#defattr(-,root,root,-)
+#lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+
+%files hi 
 %defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
-%lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+
+#files hne
+#defattr(-,root,root,-)
+#lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
+
+#files hu
+#defattr(-,root,root,-)
+#lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+#lang(hu) %{_kde4_appsdir}/koffice/autocorrect/hu.xml
 
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
-%lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
-%lang(it) %{_datadir}/doc/HTML/it/*
+%lang(it) %{_kde4_appsdir}/koffice/autocorrect/it.xml
+%lang(it) %{_kde4_docdir}/HTML/it/*
 
+%if 0
 %files lv
 %defattr(-,root,root,-)
 %lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%endif
 
 %files ja
 %defattr(-,root,root,-)
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
-%files km 
+%files kk 
 %defattr(-,root,root,-)
-%lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
+%lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
 
-%files ms
-%defattr(-,root,root,-)
-%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
+#files km 
+#defattr(-,root,root,-)
+#lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
+
+#files ms
+#defattr(-,root,root,-)
+#lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
 
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
 
 %files nds
 %defattr(-,root,root,-)
 %lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/*
+%lang(nds) %{_kde4_appsdir}/koffice/autocorrect/nds.xml
 
-%files ne
-%defattr(-,root,root,-)
-%lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
+#files ne
+#defattr(-,root,root,-)
+#lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
 
 %files nl
 %defattr(-,root,root,-)
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
-%lang(nl) %{_datadir}/doc/HTML/nl/*
+%lang(nl) %{_kde4_docdir}/HTML/nl/*
 
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
 
-%files pt_BR
-%defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
-%lang(pt_BR) %{_datadir}/doc/HTML/pt_BR/*
-
 %files pt
 %defattr(-,root,root,-)
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
-%lang(pt) %{_datadir}/doc/HTML/pt/*
+%lang(pt) %{_kde4_docdir}/HTML/pt/*
 
-%files ru
-%defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
-%lang(ru) %{_datadir}/doc/HTML/ru/*
-
-%files sk
+%files pt_BR
 %defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %{_datadir}/doc/HTML/sk/*
-%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/*
 
-%files sl
-%defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
-%lang(sl) %{_datadir}/doc/HTML/sl/*
+#files ru
+#defattr(-,root,root,-)
+#lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+#lang(ru) %{_kde4_docdir}/HTML/ru/*
+
+#files se
+#defattr(-,root,root,-)
+#lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
+
+#files sk
+#defattr(-,root,root,-)
+#lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+
+#files sl
+#defattr(-,root,root,-)
+#lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 
+%if 0
 %files sr-Latn
 %defattr(-,root,root,-)
 %lang(sr at Latn) %{_datadir}/locale/sr at Latn/LC_MESSAGES/*
@@ -657,11 +726,16 @@ rm -rf $RPM_BUILD_ROOT
 %files sr
 %defattr(-,root,root,-)
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%endif
 
 %files sv
 %defattr(-,root,root,-)
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
-%lang(sv) %{_datadir}/doc/HTML/sv/*
+%lang(sv) %{_kde4_docdir}/HTML/sv/*
+
+#files ta
+#defattr(-,root,root,-)
+#lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
 
 %files tr
 %defattr(-,root,root,-)
@@ -670,6 +744,11 @@ rm -rf $RPM_BUILD_ROOT
 %files uk
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_kde4_docdir}/HTML/uk/*
+
+%files wa 
+%defattr(-,root,root,-)
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
 
 %files zh_CN
 %defattr(-,root,root,-)
@@ -681,11 +760,26 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.1.6-4
-- Epoch++ (revert koffice2 -> koffice1)
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.82-1
+- koffice-l10n-2.0.82
+
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.81-1
+- koffice-l10n-2.0.81
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun May 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.0-1
+- koffice-l10n-2.0.0
+
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.99.0-1
+- koffice-l10n-1.9.99.0
+
+* Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.6-1
+- koffice-l10n-1.9.98.6
 
-* Fri Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.1.6-3
-- revert koffice2 -> koffice1, Epoch bump
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.5-1
+- koffice-l10n-1.9.98.5
 
 * Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.3-2



From cweyl at fedoraproject.org  Sun Sep 27 01:39:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 01:39:17 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/devel perl-Catalyst-Runtime.spec, 1.21, 
	1.22
Message-ID: <20090927013917.8098311C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16724

Modified Files:
	perl-Catalyst-Runtime.spec 
Log Message:
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80013-2
- dis-enable certain optional tests until a couple RT tix are resolved



Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Catalyst-Runtime.spec	26 Sep 2009 05:44:34 -0000	1.21
+++ perl-Catalyst-Runtime.spec	27 Sep 2009 01:39:16 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Runtime
 Version:        5.80013
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst Framework Runtime
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -161,11 +161,13 @@ find %{buildroot} -depth -type d -exec r
 
 export TEST_POD=1
 export TEST_LIGHTTPD=1
-export TEST_HTTP=1
+# still bombs, sadly.  Could patch but not too concerned right now: rt49415
+#export TEST_HTTP=1
 # fails weirdly.  see http://rt.cpan.org/Ticket/Display.html?id=26732
 #export TEST_MEMLEAK=1
 export TEST_STRESS=1
-export TEST_THREADS=1
+# until rt50039 is resolved
+#export TEST_THREADS=1
 make test
 make clean
 
@@ -184,6 +186,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80013-2
+- dis-enable certain optional tests until a couple RT tix are resolved
+
 * Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.80013-1
 - auto-update to 5.80013 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0.78 => 0.90)



From cweyl at fedoraproject.org  Sun Sep 27 01:45:47 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 01:45:47 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.34, 1.35 perl-Moose.spec, 1.46, 
	1.47 sources, 1.34, 1.35
Message-ID: <20090927014547.D1CA311C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18475

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.92-1
- auto-update to 0.92 (by cpan-spec-update 0.01)
- altered br on perl(Class::MOP) (0.93 => 0.94)
- altered req on perl(Class::MOP) (0.93 => 0.94)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	19 Sep 2009 18:39:55 -0000	1.34
+++ .cvsignore	27 Sep 2009 01:45:47 -0000	1.35
@@ -1 +1 @@
-Moose-0.90.tar.gz
+Moose-0.92.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- perl-Moose.spec	19 Sep 2009 18:39:55 -0000	1.46
+++ perl-Moose.spec	27 Sep 2009 01:45:47 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.90
+Version:        0.92
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
@@ -12,7 +12,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(Class::MOP)         >= 0.93
+BuildRequires:  perl(Class::MOP)         >= 0.94
 BuildRequires:  perl(Data::OptList)
 BuildRequires:  perl(Filter::Simple)
 BuildRequires:  perl(List::MoreUtils)    >= 0.12
@@ -55,7 +55,7 @@ BuildRequires:  perl(Test::Warn)
 BuildRequires:  perl(Test::Output)
 
 Requires:  perl(Carp)
-Requires:  perl(Class::MOP) >= 0.93
+Requires:  perl(Class::MOP) >= 0.94
 Requires:  perl(Data::OptList)
 Requires:  perl(List::MoreUtils) >= 0.12
 Requires:  perl(Scalar::Util) >= 1.19
@@ -133,6 +133,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Test::Moose*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.92-1
+- auto-update to 0.92 (by cpan-spec-update 0.01)
+- altered br on perl(Class::MOP) (0.93 => 0.94)
+- altered req on perl(Class::MOP) (0.93 => 0.94)
+
 * Fri Sep 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.90-1
 - switch filtering systems...
 - auto-update to 0.90 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	19 Sep 2009 18:39:55 -0000	1.34
+++ sources	27 Sep 2009 01:45:47 -0000	1.35
@@ -1 +1 @@
-11f738724ea32a143a36af6e2e6e7d71  Moose-0.90.tar.gz
+c6dfb7bc8b3ae2bb677e0ce53818348e  Moose-0.92.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 03:45:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 03:45:13 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize/F-11 perl-WWW-Mechanize.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090927034513.956CF11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Mechanize/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5863

Modified Files:
	perl-WWW-Mechanize.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
- auto-update to 1.60 (by cpan-spec-update 0.01)
- added a new br on perl(Carp) (version 0)
- added a new br on perl(File::Temp) (version 0)
- added a new br on perl(FindBin) (version 0)
- added a new br on perl(Getopt::Long) (version 0)
- added a new br on perl(HTML::Form) (version 1.038)
- added a new br on perl(HTML::HeadParser) (version 0)
- added a new br on perl(HTML::Parser) (version 3.33)
- altered br on perl(HTML::TokeParser) (0 => 2.28)
- added a new br on perl(HTTP::Daemon) (version 0)
- added a new br on perl(HTTP::Request) (version 1.3)
- altered br on perl(HTTP::Server::Simple) (0 => 0.35)
- added a new br on perl(HTTP::Server::Simple::CGI) (version 0)
- added a new br on perl(HTTP::Status) (version 0)
- added a new br on perl(LWP) (version 5.829)
- altered br on perl(LWP::UserAgent) (0 => 5.829)
- added a new br on perl(Pod::Usage) (version 0)
- altered br on perl(Test::More) (0 => 0.34)
- altered br on perl(Test::Warn) (0 => 0.11)
- added a new br on perl(URI::file) (version 0)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(File::Temp) (version 0)
- added a new req on perl(FindBin) (version 0)
- added a new req on perl(Getopt::Long) (version 0)
- added a new req on perl(HTML::Form) (version 1.038)
- added a new req on perl(HTML::HeadParser) (version 0)
- added a new req on perl(HTML::Parser) (version 3.33)
- added a new req on perl(HTML::TokeParser) (version 2.28)
- added a new req on perl(HTTP::Daemon) (version 0)
- added a new req on perl(HTTP::Request) (version 1.3)
- added a new req on perl(HTTP::Server::Simple) (version 0.35)
- added a new req on perl(HTTP::Server::Simple::CGI) (version 0)
- added a new req on perl(HTTP::Status) (version 0)
- added a new req on perl(LWP) (version 5.829)
- added a new req on perl(LWP::UserAgent) (version 5.829)
- added a new req on perl(Pod::Usage) (version 0)
- added a new req on perl(URI) (version 1.36)
- added a new req on perl(URI::URL) (version 0)
- added a new req on perl(URI::file) (version 0)



Index: perl-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/F-11/perl-WWW-Mechanize.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-WWW-Mechanize.spec	27 Feb 2009 04:18:10 -0000	1.18
+++ perl-WWW-Mechanize.spec	27 Sep 2009 03:45:10 -0000	1.19
@@ -6,29 +6,71 @@
 %bcond_with livetests
 
 Name:           perl-WWW-Mechanize
-Version:        1.54
-Release:        2%{?dist}
+Version:        1.60
+Release:        1%{?dist}
 Summary:        Automates web page form & link interaction
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/WWW-Mechanize/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/WWW-Mechanize-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/WWW-Mechanize-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::More) >= 0.34
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Test::Memory::Cycle), perl(Test::Taint), perl(Test::Warn)
-BuildRequires:  perl(HTML::TokeParser), perl(LWP::UserAgent), perl(URI::URL)
+BuildRequires:  perl(Test::Memory::Cycle)
+BuildRequires:  perl(Test::Taint)
+BuildRequires:  perl(Test::Warn) >= 0.11
+BuildRequires:  perl(HTML::TokeParser) >= 2.28
+BuildRequires:  perl(LWP::UserAgent) >= 5.829
+BuildRequires:  perl(URI::URL)
 BuildRequires:  perl(IO::Socket::SSL)
 BuildRequires:  perl(URI) >= 1.36
-BuildRequires:  perl(HTTP::Server::Simple)
+BuildRequires:  perl(HTTP::Server::Simple) >= 0.35
 BuildRequires:  perl(HTTP::Response::Encoding) >= 0.05
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(File::Temp)
+Requires:       perl(FindBin)
+Requires:       perl(Getopt::Long)
+Requires:       perl(HTML::Form) >= 1.038
+Requires:       perl(HTML::HeadParser)
+Requires:       perl(HTML::Parser) >= 3.33
+Requires:       perl(HTML::TokeParser) >= 2.28
+Requires:       perl(HTTP::Daemon)
+Requires:       perl(HTTP::Request) >= 1.3
+Requires:       perl(HTTP::Server::Simple) >= 0.35
+Requires:       perl(HTTP::Server::Simple::CGI)
+Requires:       perl(HTTP::Status)
+Requires:       perl(LWP) >= 5.829
+Requires:       perl(LWP::UserAgent) >= 5.829
+Requires:       perl(Pod::Usage)
+Requires:       perl(URI) >= 1.36
+Requires:       perl(URI::URL)
+Requires:       perl(URI::file)
+
+### auto-added brs!
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(HTML::Form) >= 1.038
+BuildRequires:  perl(HTML::HeadParser)
+BuildRequires:  perl(HTML::Parser) >= 3.33
+BuildRequires:  perl(HTTP::Daemon)
+BuildRequires:  perl(HTTP::Request) >= 1.3
+BuildRequires:  perl(HTTP::Server::Simple::CGI)
+BuildRequires:  perl(HTTP::Status)
+BuildRequires:  perl(LWP) >= 5.829
+BuildRequires:  perl(Pod::Usage)
+BuildRequires:  perl(URI::file)
+
 %description
 "WWW::Mechanize", or Mech for short, helps you automate interaction
 with a website.  It supports performing a sequence of page fetches
@@ -62,7 +104,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} + 
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 
 %{_fixperms} %{buildroot}/*
@@ -78,14 +120,58 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes etc/www-mechanize-logo.png  
+%doc Changes etc/www-mechanize-logo.png
 %{_bindir}/mech-dump
-%{perl_vendorlib}/WWW/
+%{perl_vendorlib}/*
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
+- auto-update to 1.60 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp) (version 0)
+- added a new br on perl(File::Temp) (version 0)
+- added a new br on perl(FindBin) (version 0)
+- added a new br on perl(Getopt::Long) (version 0)
+- added a new br on perl(HTML::Form) (version 1.038)
+- added a new br on perl(HTML::HeadParser) (version 0)
+- added a new br on perl(HTML::Parser) (version 3.33)
+- altered br on perl(HTML::TokeParser) (0 => 2.28)
+- added a new br on perl(HTTP::Daemon) (version 0)
+- added a new br on perl(HTTP::Request) (version 1.3)
+- altered br on perl(HTTP::Server::Simple) (0 => 0.35)
+- added a new br on perl(HTTP::Server::Simple::CGI) (version 0)
+- added a new br on perl(HTTP::Status) (version 0)
+- added a new br on perl(LWP) (version 5.829)
+- altered br on perl(LWP::UserAgent) (0 => 5.829)
+- added a new br on perl(Pod::Usage) (version 0)
+- altered br on perl(Test::More) (0 => 0.34)
+- altered br on perl(Test::Warn) (0 => 0.11)
+- added a new br on perl(URI::file) (version 0)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(File::Temp) (version 0)
+- added a new req on perl(FindBin) (version 0)
+- added a new req on perl(Getopt::Long) (version 0)
+- added a new req on perl(HTML::Form) (version 1.038)
+- added a new req on perl(HTML::HeadParser) (version 0)
+- added a new req on perl(HTML::Parser) (version 3.33)
+- added a new req on perl(HTML::TokeParser) (version 2.28)
+- added a new req on perl(HTTP::Daemon) (version 0)
+- added a new req on perl(HTTP::Request) (version 1.3)
+- added a new req on perl(HTTP::Server::Simple) (version 0.35)
+- added a new req on perl(HTTP::Server::Simple::CGI) (version 0)
+- added a new req on perl(HTTP::Status) (version 0)
+- added a new req on perl(LWP) (version 5.829)
+- added a new req on perl(LWP::UserAgent) (version 5.829)
+- added a new req on perl(Pod::Usage) (version 0)
+- added a new req on perl(URI) (version 1.36)
+- added a new req on perl(URI::URL) (version 0)
+- added a new req on perl(URI::file) (version 0)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.54-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.54-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Feb 2009 04:01:03 -0000	1.12
+++ sources	27 Sep 2009 03:45:10 -0000	1.13
@@ -1 +1 @@
-27257ee2a33348df181c866d865925fb  WWW-Mechanize-1.54.tar.gz
+bd3bf56f28881c5363d1c599ff43a632  WWW-Mechanize-1.60.tar.gz



From mclasen at fedoraproject.org  Sun Sep 27 04:27:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 27 Sep 2009 04:27:06 +0000 (UTC)
Subject: rpms/gtk2/devel fix-anchors.patch,NONE,1.1 gtk2.spec,1.405,1.406
Message-ID: <20090927042706.2225B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15175

Modified Files:
	gtk2.spec 
Added Files:
	fix-anchors.patch 
Log Message:
Fix a crash


fix-anchors.patch:
 gtktextlayout.c |   63 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

--- NEW FILE fix-anchors.patch ---
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 319b8ce..8c5d419 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1812,56 +1812,59 @@ allocate_child_widgets (GtkTextLayout      *text_layout,
 {
   PangoLayout *layout = display->layout;
   PangoLayoutIter *run_iter;
-  
+
   run_iter = pango_layout_get_iter (layout);
-  
   do
     {
       PangoLayoutRun *run = pango_layout_iter_get_run_readonly (run_iter);
-      
+
       if (run && is_shape (run))
         {
           gint byte_index;
           GtkTextIter text_iter;
-          GtkTextChildAnchor *anchor = 0;
-          GList *widgets = 0;
-          
-          /* The pango iterator iterates in visual order. 
+          GtkTextChildAnchor *anchor = NULL;
+          GList *widgets = NULL;
+          GList *l;
+
+          /* The pango iterator iterates in visual order.
            * We use the byte index to find the child widget.
            */
-          
           byte_index = pango_layout_iter_get_index (run_iter);
           line_display_index_to_iter (text_layout, display, &text_iter, byte_index, 0);
           anchor = gtk_text_iter_get_child_anchor (&text_iter);
-          widgets = gtk_text_child_anchor_get_widgets (anchor);
-          
-          if (widgets)
+	  if (anchor)
+            widgets = gtk_text_child_anchor_get_widgets (anchor);
+
+          for (l = widgets; l; l = l->next)
             {
               PangoRectangle extents;
-              GtkWidget *child = widgets->data;
+              GtkWidget *child = l->data;
 
-              /* We emit "allocate_child" with the x,y of
-               * the widget with respect to the top of the line
-               * and the left side of the buffer
-               */
-              
-              pango_layout_iter_get_run_extents (run_iter,
-                                                 NULL,
-                                                 &extents);
-              
-              g_signal_emit (text_layout,
-                             signals[ALLOCATE_CHILD],
-                             0,
-                             child,
-                             PANGO_PIXELS (extents.x) + display->x_offset,
-                             PANGO_PIXELS (extents.y) + display->top_margin);
-              
-              g_list_free (widgets);
+              if (_gtk_anchored_child_get_layout (child) == text_layout)
+                {
+
+                  /* We emit "allocate_child" with the x,y of
+                   * the widget with respect to the top of the line
+                   * and the left side of the buffer
+                   */
+                  pango_layout_iter_get_run_extents (run_iter,
+                                                     NULL,
+                                                     &extents);
+
+                  g_signal_emit (text_layout,
+                                 signals[ALLOCATE_CHILD],
+                                 0,
+                                 child,
+                                 PANGO_PIXELS (extents.x) + display->x_offset,
+                                 PANGO_PIXELS (extents.y) + display->top_margin);
+                }
             }
+
+          g_list_free (widgets);
         }
     }
   while (pango_layout_iter_next_run (run_iter));
-  
+
   pango_layout_iter_free (run_iter);
 }
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- gtk2.spec	23 Sep 2009 05:33:38 -0000	1.405
+++ gtk2.spec	27 Sep 2009 04:27:04 -0000	1.406
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -32,6 +32,8 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch1: gtk2-printing-smb-auth.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=586207
 Patch2: gtk2-printing-nonblocking-printer-list.patch
+# from upstream
+Patch3: fix-anchors.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -145,6 +147,7 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .printing-smb-auth
 %patch2 -p1 -b .printing-nonblocking-printer-list
+%patch3 -p1 -b .fix-anchors
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -386,6 +389,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Fix anchor handling in text views (#525910)
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 - Add some patches for improved printing support



From cweyl at fedoraproject.org  Sun Sep 27 04:29:31 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 04:29:31 +0000 (UTC)
Subject: rpms/perl-YAML-Tiny/devel .cvsignore, 1.11, 1.12 perl-YAML-Tiny.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <20090927042931.DF67011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-YAML-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15829

Modified Files:
	.cvsignore perl-YAML-Tiny.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.40-1
- auto-update to 1.40 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Tiny/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	23 May 2009 19:54:51 -0000	1.11
+++ .cvsignore	27 Sep 2009 04:29:31 -0000	1.12
@@ -1 +1 @@
-YAML-Tiny-1.39.tar.gz
+YAML-Tiny-1.40.tar.gz


Index: perl-YAML-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Tiny/devel/perl-YAML-Tiny.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-YAML-Tiny.spec	26 Jul 2009 17:43:24 -0000	1.13
+++ perl-YAML-Tiny.spec	27 Sep 2009 04:29:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-YAML-Tiny
-Version:        1.39
-Release:        2%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        Read/Write YAML files with as little code as possible
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,8 +17,10 @@ BuildRequires:  perl(YAML)
 BuildRequires:  perl(YAML::Syck)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
-YAML::Tiny is a perl class for reading and writing YAML-style files,
+YAML::Tiny is a Perl class for reading and writing YAML-style files,
 written with as little code as possible, reducing load time and
 memory overhead.
 
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.40-1
+- auto-update to 1.40 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.39-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Tiny/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 May 2009 19:54:51 -0000	1.11
+++ sources	27 Sep 2009 04:29:31 -0000	1.12
@@ -1 +1 @@
-549d0d26bc4d9609ed43b84aec20cf19  YAML-Tiny-1.39.tar.gz
+412bba484e5a3ab53308a0d731d853a6  YAML-Tiny-1.40.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 04:33:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 04:33:46 +0000 (UTC)
Subject: rpms/perl-YAML-Syck/devel .cvsignore, 1.11, 1.12 perl-YAML-Syck.spec,
	1.17, 1.18 sources, 1.11, 1.12
Message-ID: <20090927043346.A578511C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-YAML-Syck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17531

Modified Files:
	.cvsignore perl-YAML-Syck.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
- auto-update to 1.07 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Syck/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Jun 2008 18:04:59 -0000	1.11
+++ .cvsignore	27 Sep 2009 04:33:46 -0000	1.12
@@ -1 +1 @@
-YAML-Syck-1.05.tar.gz
+YAML-Syck-1.07.tar.gz


Index: perl-YAML-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Syck/devel/perl-YAML-Syck.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-YAML-Syck.spec	26 Jul 2009 17:43:09 -0000	1.17
+++ perl-YAML-Syck.spec	27 Sep 2009 04:33:46 -0000	1.18
@@ -1,17 +1,19 @@
 Name:           perl-YAML-Syck
-Version:        1.05
-Release:        3%{?dist}
+Version:        1.07 
+Release:        1%{?dist}
 Summary:        Fast, lightweight YAML loader and dumper
 License:        MIT
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/YAML-Syck/
-Source0:        http://www.cpan.org/authors/id/A/AU/AUDREYT/YAML-Syck-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/YAML-Syck-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Devel::Leak)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 This module provides a Perl interface to the libsyck data serialization
 library. It exports the Dump and Load functions for converting Perl data
@@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
+- auto-update to 1.07 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Syck/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Jun 2008 18:04:59 -0000	1.11
+++ sources	27 Sep 2009 04:33:46 -0000	1.12
@@ -1 +1 @@
-f74aaf6f275eb922bbf58cdb2cb02895  YAML-Syck-1.05.tar.gz
+410ef7e24185de2a04390e0543876cad  YAML-Syck-1.07.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 04:33:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 04:33:56 +0000 (UTC)
Subject: rpms/perl-YAML-Tiny/F-11 perl-YAML-Tiny.spec, 1.12, 1.13 sources,
	1.11, 1.12
Message-ID: <20090927043356.7DDE111C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-YAML-Tiny/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17624

Modified Files:
	perl-YAML-Tiny.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.40-1
- auto-update to 1.40 (by cpan-spec-update 0.01)



Index: perl-YAML-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Tiny/F-11/perl-YAML-Tiny.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-YAML-Tiny.spec	23 May 2009 19:59:12 -0000	1.12
+++ perl-YAML-Tiny.spec	27 Sep 2009 04:33:56 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-YAML-Tiny
-Version:        1.39
+Version:        1.40
 Release:        1%{?dist}
 Summary:        Read/Write YAML files with as little code as possible
 License:        GPL+ or Artistic
@@ -17,8 +17,10 @@ BuildRequires:  perl(YAML)
 BuildRequires:  perl(YAML::Syck)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
-YAML::Tiny is a perl class for reading and writing YAML-style files,
+YAML::Tiny is a Perl class for reading and writing YAML-style files,
 written with as little code as possible, reducing load time and
 memory overhead.
 
@@ -52,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.40-1
+- auto-update to 1.40 (by cpan-spec-update 0.01)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.39-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.39-1
 - auto-update to 1.39 (by cpan-spec-update 0.01)
 - added a new br on perl(File::Spec) (version 0.80)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Tiny/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 May 2009 19:59:12 -0000	1.11
+++ sources	27 Sep 2009 04:33:56 -0000	1.12
@@ -1 +1 @@
-549d0d26bc4d9609ed43b84aec20cf19  YAML-Tiny-1.39.tar.gz
+412bba484e5a3ab53308a0d731d853a6  YAML-Tiny-1.40.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 04:35:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 04:35:54 +0000 (UTC)
Subject: rpms/perl-Variable-Magic/devel .cvsignore, 1.4,
	1.5 perl-Variable-Magic.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090927043554.8179011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Variable-Magic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210

Modified Files:
	.cvsignore perl-Variable-Magic.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
- auto-update to 0.37 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Variable-Magic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 May 2009 06:59:04 -0000	1.4
+++ .cvsignore	27 Sep 2009 04:35:54 -0000	1.5
@@ -1 +1 @@
-Variable-Magic-0.34.tar.gz
+Variable-Magic-0.37.tar.gz


Index: perl-Variable-Magic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Variable-Magic/devel/perl-Variable-Magic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Variable-Magic.spec	26 Jul 2009 17:25:29 -0000	1.5
+++ perl-Variable-Magic.spec	27 Sep 2009 04:35:54 -0000	1.6
@@ -1,11 +1,11 @@
 Name:           perl-Variable-Magic
-Version:        0.34
-Release:        2%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Associate user-defined magic to variables from Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Variable-Magic/
-Source0:        http://www.cpan.org/authors/id/V/VP/VPIT/Variable-Magic-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/V/VP/VPIT/Variable-Magic-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Config)
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -16,11 +16,7 @@ BuildRequires:  perl(Test::Portability::
 BuildRequires:  perl(Test::Kwalitee)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%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}"
+%{?perl_default_filter}
 
 %description
 Magic is Perl way of enhancing objects. This mechanism let the user add
@@ -60,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
+- auto-update to 0.37 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Variable-Magic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 May 2009 06:59:05 -0000	1.4
+++ sources	27 Sep 2009 04:35:54 -0000	1.5
@@ -1 +1 @@
-4c51e055f560083aaf9902ae655f08cb  Variable-Magic-0.34.tar.gz
+ae3c43f2bc855f035c2781d0af16f6b8  Variable-Magic-0.37.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 04:40:21 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 04:40:21 +0000 (UTC)
Subject: rpms/perl-Text-Diff/devel .cvsignore, 1.2, 1.3 perl-Text-Diff.spec, 
	1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20090927044021.D025011C0424@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279

Modified Files:
	.cvsignore perl-Text-Diff.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.37-1
- add filtering
- auto-update to 1.37 (by cpan-spec-update 0.01)
- altered br on perl(Algorithm::Diff) (0 => 1.19)
- added a new br on perl(Exporter) (version 0)
- added a new br on perl(Test) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 21:24:01 -0000	1.2
+++ .cvsignore	27 Sep 2009 04:40:21 -0000	1.3
@@ -1 +1 @@
-Text-Diff-0.35.tar.gz
+Text-Diff-1.37.tar.gz


Index: perl-Text-Diff.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/perl-Text-Diff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-Diff.spec	26 Jul 2009 17:05:16 -0000	1.7
+++ perl-Text-Diff.spec	27 Sep 2009 04:40:21 -0000	1.8
@@ -1,17 +1,21 @@
 Name:           perl-Text-Diff
-Version:        0.35
-Release:        8%{?dist}
+Version:        1.37
+Release:        1%{?dist}
 Summary:        Perform diffs on files and record sets
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Text-Diff/
-Source0:        http://www.cpan.org/authors/id/R/RB/RBS/Text-Diff-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Text-Diff-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(Algorithm::Diff)
+BuildRequires:  perl(Algorithm::Diff) >= 1.19
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(Test)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 Text::Diff provides a basic set of services akin to the GNU diff utility.
 It is not anywhere near as feature complete as GNU diff, but it is better
@@ -49,6 +53,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.37-1
+- add filtering
+- auto-update to 1.37 (by cpan-spec-update 0.01)
+- altered br on perl(Algorithm::Diff) (0 => 1.19)
+- added a new br on perl(Exporter) (version 0)
+- added a new br on perl(Test) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jan 2006 21:24:01 -0000	1.2
+++ sources	27 Sep 2009 04:40:21 -0000	1.3
@@ -1 +1 @@
-4931662ea353384dec2a54a71b26ee8c  Text-Diff-0.35.tar.gz
+52c1cba785ecfbbca242b57742173665  Text-Diff-1.37.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 04:52:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 04:52:24 +0000 (UTC)
Subject: rpms/perl-Text-Diff/devel perl-Text-Diff.spec,1.8,1.9
Message-ID: <20090927045224.B87EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21925

Modified Files:
	perl-Text-Diff.spec 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.37-2
- add Test::More as a BR (rt#50040)



Index: perl-Text-Diff.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/perl-Text-Diff.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Text-Diff.spec	27 Sep 2009 04:40:21 -0000	1.8
+++ perl-Text-Diff.spec	27 Sep 2009 04:52:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Text-Diff
 Version:        1.37
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perform diffs on files and record sets
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ BuildRequires:  perl(Algorithm::Diff) >=
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Test)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %{?perl_default_filter}
@@ -53,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.37-2
+- add Test::More as a BR (rt#50040)
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.37-1
 - add filtering
 - auto-update to 1.37 (by cpan-spec-update 0.01)



From cweyl at fedoraproject.org  Sun Sep 27 05:00:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 05:00:03 +0000 (UTC)
Subject: rpms/perl-SQL-Abstract/devel .cvsignore, 1.10,
	1.11 perl-SQL-Abstract.spec, 1.16, 1.17 sources, 1.10, 1.11
Message-ID: <20090927050003.6FADA11C0424@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Abstract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24037

Modified Files:
	.cvsignore perl-SQL-Abstract.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
- auto-update to 1.60 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Sep 2009 16:15:16 -0000	1.10
+++ .cvsignore	27 Sep 2009 05:00:03 -0000	1.11
@@ -1 +1 @@
-SQL-Abstract-1.58.tar.gz
+SQL-Abstract-1.60.tar.gz


Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-SQL-Abstract.spec	11 Sep 2009 16:15:16 -0000	1.16
+++ perl-SQL-Abstract.spec	27 Sep 2009 05:00:03 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           perl-SQL-Abstract
-Version:        1.58
+Version:        1.60
 Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
+- auto-update to 1.60 (by cpan-spec-update 0.01)
+
 * Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.58-1
 - add default filtering (pro forma)
 - auto-update to 1.58 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Sep 2009 16:15:16 -0000	1.10
+++ sources	27 Sep 2009 05:00:03 -0000	1.11
@@ -1 +1 @@
-4ab50f21c4795a7ec988efa7b21e6270  SQL-Abstract-1.58.tar.gz
+1f24c3367f8841ec3780284712f7622a  SQL-Abstract-1.60.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 05:06:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 05:06:23 +0000 (UTC)
Subject: rpms/perl-SQL-Translator/devel .cvsignore, 1.8,
	1.9 perl-SQL-Translator.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090927050623.CD76011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Translator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26608

Modified Files:
	.cvsignore perl-SQL-Translator.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11002-1
- auto-update to 0.11002 (by cpan-spec-update 0.01)
- altered br on perl(Parse::RecDescent) (1.096 => 1.962002)
- altered req on perl(Parse::RecDescent) (1.096 => 1.962002)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Aug 2009 02:49:43 -0000	1.8
+++ .cvsignore	27 Sep 2009 05:06:23 -0000	1.9
@@ -1 +1 @@
-SQL-Translator-0.11001.tar.gz
+SQL-Translator-0.11002.tar.gz


Index: perl-SQL-Translator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/perl-SQL-Translator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-SQL-Translator.spec	24 Aug 2009 02:49:43 -0000	1.11
+++ perl-SQL-Translator.spec	27 Sep 2009 05:06:23 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-SQL-Translator
-Version:        0.11001
+Version:        0.11002
 Release:        1%{?dist}
 Summary:        Manipulate structured data definitions (SQL and more)
 # see, e.g., lib/SQL/Translator.pm
@@ -14,7 +14,6 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 Requires:       perl(Class::Accessor::Fast)
 Requires:       perl(Class::Data::Inheritable) >= 0.02
 
-# core
 BuildRequires: perl(File::Basename)
 BuildRequires: perl(File::Spec)
 BuildRequires: perl(IO::Dir)
@@ -22,7 +21,6 @@ BuildRequires: perl(IO::File)
 BuildRequires: perl(Pod::Usage)
 BuildRequires: perl(Test::More)                 >= 0.6
 #BuildRequires: perl(Text::ParseWords)
-# cpan
 BuildRequires:  perl(Class::Accessor::Fast)
 BuildRequires:  perl(Class::Base)
 BuildRequires:  perl(Class::Data::Inheritable)  >= 0.02
@@ -35,7 +33,7 @@ BuildRequires:  perl(GraphViz)
 BuildRequires:  perl(IO::Scalar) >= 2.11
 BuildRequires:  perl(Log::Log4perl)
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Parse::RecDescent)         >= 1.096
+BuildRequires:  perl(Parse::RecDescent)         >= 1.962002
 # >= 0.2602 avail in FC-5+
 BuildRequires:  perl(Spreadsheet::ParseExcel)
 BuildRequires:  perl(Template)                  >= 2.1
@@ -43,6 +41,10 @@ BuildRequires:  perl(Text::RecordParser)
 BuildRequires:  perl(XML::Writer)               >= 0.5
 BuildRequires:  perl(XML::XPath)                >= 1.13
 BuildRequires:  perl(YAML)                      >= 0.66
+BuildRequires:  perl(Carp::Clan)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(File::ShareDir) >= 1
+BuildRequires:  perl(CPAN)
 # test
 BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::Exception)
@@ -58,16 +60,10 @@ Requires:       perl(File::ShareDir) >= 
 Requires:       perl(File::Spec)
 Requires:       perl(IO::Dir)
 Requires:       perl(IO::Scalar) >= 2.11
-Requires:       perl(Parse::RecDescent) >= 1.096
+Requires:       perl(Parse::RecDescent) >= 1.962002
 Requires:       perl(Pod::Usage)
 Requires:       perl(XML::Writer) >= 0.5
 
-### auto-added brs!
-BuildRequires:  perl(Carp::Clan)
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires:  perl(File::ShareDir) >= 1
-BuildRequires:  perl(CPAN)
-
 %{?perl_default_filter:
 %filter_from_requires /perl(:)/d
 %perl_default_filter
@@ -121,6 +117,11 @@ rm -rf %{buildroot}
 %{_mandir}/man[13]/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11002-1
+- auto-update to 0.11002 (by cpan-spec-update 0.01)
+- altered br on perl(Parse::RecDescent) (1.096 => 1.962002)
+- altered req on perl(Parse::RecDescent) (1.096 => 1.962002)
+
 * Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11001-1
 - auto-update to 0.11001 (by cpan-spec-update 0.01)
 - added a new br on perl(Carp::Clan) (version 0)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Aug 2009 02:49:43 -0000	1.7
+++ sources	27 Sep 2009 05:06:23 -0000	1.8
@@ -1 +1 @@
-09475b116f9d4f160418955225b99bdb  SQL-Translator-0.11001.tar.gz
+72de264f0b2ffac5cc6dafd9be05fb77  SQL-Translator-0.11002.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 05:08:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 05:08:18 +0000 (UTC)
Subject: rpms/perl-Parse-RecDescent/devel .cvsignore, 1.5,
	1.6 perl-Parse-RecDescent.spec, 1.20, 1.21 sources, 1.5, 1.6
Message-ID: <20090927050818.68BEE11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Parse-RecDescent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27167

Modified Files:
	.cvsignore perl-Parse-RecDescent.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.962.2-1
- updated for latest GA SQL::Translator
- add default filtering
- auto-update to 1.962.2 (by cpan-spec-update 0.01)
- added a new br on perl(Text::Balanced) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-RecDescent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Feb 2009 18:57:40 -0000	1.5
+++ .cvsignore	27 Sep 2009 05:08:18 -0000	1.6
@@ -1 +1 @@
-Parse-RecDescent-1.96.0.tar.gz
+Parse-RecDescent-1.962.2.tar.gz


Index: perl-Parse-RecDescent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-RecDescent/devel/perl-Parse-RecDescent.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Parse-RecDescent.spec	26 Jul 2009 16:09:17 -0000	1.20
+++ perl-Parse-RecDescent.spec	27 Sep 2009 05:08:18 -0000	1.21
@@ -1,23 +1,25 @@
 Name:           perl-Parse-RecDescent
-Version:        1.96
-%define	tarname Parse-RecDescent-%{version}.0
-Release:        3%{?dist}
+Version:        1.962.2
+Release:        1%{?dist}
 Summary:        Parse-RecDescent Perl module
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Parse-RecDescent/
-Source0:        http://www.cpan.org/authors/id/D/DC/DCONWAY/%{tarname}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Parse-RecDescent-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(version), perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Text::Balanced)
+
+%{?perl_default_filter}
 
 %description
 Parse::RecDescent incrementally generates top-down recursive-descent
 text parsers from simple yacc-like grammar specifications. It
-provides: 
+provides:
     * Regular expressions or literal strings as terminals (tokens),
     * Multiple (non-contiguous) productions for any rule,
     * Repeated and optional subrules within productions,
@@ -38,7 +40,7 @@ matching productions.
 
 
 %prep
-%setup -q -n %{tarname}
+%setup -q -n Parse-RecDescent-%{version}
 chmod a-x demo/* tutorial/*
 %{__perl} -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!%{__perl}|' demo/*
 for f in demo/demo_dot.pl; do
@@ -75,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.962.2-1
+- updated for latest GA SQL::Translator
+- add default filtering
+- auto-update to 1.962.2 (by cpan-spec-update 0.01)
+- added a new br on perl(Text::Balanced) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.96-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -147,4 +155,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Jun 07 2002 cturner at redhat.com
 - Specfile autogenerated
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-RecDescent/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Feb 2009 18:57:41 -0000	1.5
+++ sources	27 Sep 2009 05:08:18 -0000	1.6
@@ -1 +1 @@
-373dc01e102d81d01a4fb1431c5ff3fb  Parse-RecDescent-1.96.0.tar.gz
+9f84bf1a0519d31ae904339ebaa581d2  Parse-RecDescent-1.962.2.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 05:23:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 05:23:02 +0000 (UTC)
Subject: rpms/perl-SUPER/devel .cvsignore, 1.4, 1.5 perl-SUPER.spec, 1.8,
	1.9 sources, 1.4, 1.5 filter-provides.sh, 1.1, NONE
Message-ID: <20090927052302.7BBE311C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30698

Modified Files:
	.cvsignore perl-SUPER.spec sources 
Removed Files:
	filter-provides.sh 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.17-1
- update filtering
- auto-update to 1.17 (by cpan-spec-update 0.01)
- added a new br on perl(Scalar::Util) (version 1.20)
- altered br on perl(Sub::Identify) (0 => 0.03)
- altered br on perl(Test::Simple) (0 => 0.61)
- added a new req on perl(Scalar::Util) (version 1.20)
- added a new req on perl(Sub::Identify) (version 0.03)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Apr 2007 22:26:51 -0000	1.4
+++ .cvsignore	27 Sep 2009 05:23:01 -0000	1.5
@@ -1 +1 @@
-SUPER-1.16.tar.gz
+SUPER-1.17.tar.gz


Index: perl-SUPER.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/perl-SUPER.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-SUPER.spec	26 Jul 2009 16:25:23 -0000	1.8
+++ perl-SUPER.spec	27 Sep 2009 05:23:02 -0000	1.9
@@ -1,31 +1,33 @@
 Name:           perl-SUPER
-Version:        1.16
-Release:        5%{?dist}
+Version:        1.17
+Release:        1%{?dist}
 Summary:        Sane superclass method dispatcher
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/SUPER/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHROMATIC/SUPER-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHROMATIC/SUPER-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# We don't really want to provide: perl(UNIVERSAL)
-Source98: filter-provides.sh
-%define __perl_provides %{SOURCE98}
-
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Test::Simple)
-BuildRequires:  perl(Sub::Identify)
+BuildRequires:  perl(Module::Build) 
+BuildRequires:  perl(Test::Simple) >= 0.61
+BuildRequires:  perl(Sub::Identify) >= 0.03
+BuildRequires:  perl(Scalar::Util) >= 1.20
 
-# not picked up due to use base
 Requires:       perl(Exporter)
+Requires:       perl(Scalar::Util) >= 1.20
+Requires:       perl(Sub::Identify) >= 0.03
 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%{?perl_default_filter:
+%filter_from_provides /perl(UNIVERSAL)/d; /perl(DB)/d
+%perl_default_filter
+}
 
 %description
 When subclassing a class, you occasionally want to dispatch control to the
 superclass -- at least conditionally and temporarily.   This module provides
-an easier, cleaner way for class methods to access their ancestor's 
+an easier, cleaner way for class methods to access their ancestor's
 implementation.
 
 %prep
@@ -56,6 +58,15 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.17-1
+- update filtering
+- auto-update to 1.17 (by cpan-spec-update 0.01)
+- added a new br on perl(Scalar::Util) (version 1.20)
+- altered br on perl(Sub::Identify) (0 => 0.03)
+- altered br on perl(Test::Simple) (0 => 0.61)
+- added a new req on perl(Scalar::Util) (version 1.20)
+- added a new req on perl(Sub::Identify) (version 0.03)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	18 Apr 2007 22:26:51 -0000	1.4
+++ sources	27 Sep 2009 05:23:02 -0000	1.5
@@ -1 +1 @@
-3a0584598514f471f5df9480e12573c0  SUPER-1.16.tar.gz
+aa54aa7e9148c368091e34559587f3b2  SUPER-1.17.tar.gz


--- filter-provides.sh DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 27 05:32:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 05:32:30 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-12
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch, NONE,
	1.1 ruby-gnome2.spec, 1.47, 1.48
Message-ID: <20090927053230.21E1F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1692

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
- Fix crash when moving cursor on fantasdic 1.0 beta 7
  (ruby-gnome2-Bugs-2865895)


ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch:
 rbgdkwindow.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch ---
Index: gtk/src/rbgdkwindow.c
===================================================================
--- gtk/src/rbgdkwindow.c	(revision 3712)
+++ gtk/src/rbgdkwindow.c	(revision 3713)
@@ -1093,8 +1093,11 @@
 void
 Init_gtk_gdk_window()
 {
+    GObjectClass *g_class;
     VALUE gdkWindow = G_DEF_CLASS(GDK_TYPE_WINDOW, "Window", mGdk);
 
+    g_class = g_type_class_peek(GDK_TYPE_WINDOW);
+
     rb_define_method(gdkWindow, "initialize", gdkwin_initialize, 3);
     rb_define_method(gdkWindow, "destroy", gdkwin_destroy, 0);
     rb_define_method(gdkWindow, "window_type", gdkwin_get_window_type, 0);
@@ -1178,6 +1181,10 @@
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
+    if (g_object_class_find_property(g_class, "cursor")) {
+        rb_undef_method(gdkWindow, "cursor");
+        rb_undef_method(gdkWindow, "cursor=");
+    }
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-12/ruby-gnome2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ruby-gnome2.spec	24 Sep 2009 18:37:17 -0000	1.47
+++ ruby-gnome2.spec	27 Sep 2009 05:32:29 -0000	1.48
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -31,7 +31,13 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 #Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
+# Fix shebang on sample files
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
+# Patch from upstream
+# Fix crash when moving curson on fantasdic 1.0 beta 7 
+# (ruby-gnome2-Bugs-2865895)
+Patch10:        ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -765,6 +771,7 @@ This package provides libraries and head
 %setup -q -n %{name}-all-%{version}
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
+%patch10 -p0
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -1090,6 +1097,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
+- Fix crash when moving cursor on fantasdic 1.0 beta 7
+  (ruby-gnome2-Bugs-2865895)
+
 * Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
 - Update to 0.19.3
 - Released source does not support gio yet



From cweyl at fedoraproject.org  Sun Sep 27 05:40:32 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 05:40:32 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/devel .cvsignore, 1.3,
	1.4 perl-POE-Test-Loops.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090927054032.2EFF411C0424@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Test-Loops/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4091

Modified Files:
	.cvsignore perl-POE-Test-Loops.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.022-1
- update filtering
- auto-update to 1.022 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 08:08:56 -0000	1.3
+++ .cvsignore	27 Sep 2009 05:40:31 -0000	1.4
@@ -1 +1 @@
-POE-Test-Loops-1.021.tar.gz
+POE-Test-Loops-1.022.tar.gz


Index: perl-POE-Test-Loops.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/perl-POE-Test-Loops.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-POE-Test-Loops.spec	11 Aug 2009 08:08:56 -0000	1.3
+++ perl-POE-Test-Loops.spec	27 Sep 2009 05:40:31 -0000	1.4
@@ -1,5 +1,5 @@
 Name:       perl-POE-Test-Loops
-Version:    1.021
+Version:    1.022
 Release:    1%{?dist}
 # META.yml, bin/poe-gen-tests -> perl
 License:    GPL+ or Artistic
@@ -14,6 +14,11 @@ BuildArch:  noarch
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Test::More)
 
+%{?perl_default_filter:
+%filter_from_provides /perl([DIFMOSU].*)/d; /perl(POE::MySession)/d
+%perl_default_filter
+}
+
 %description
 POE::Test::Loops contains one function, generate(), which will generate
 all the loop tests for one or more POE::Loop subclasses. The SYNOPSIS
@@ -21,25 +26,11 @@ example is a version of poe-gen-tests, w
 to generate the actual tests. The poe-gen-tests manpage also documents
 the POE::Test::Loops system in more detail.
 
-
 %prep
 %setup -q -n POE-Test-Loops-%{version}
 
 find . -type f -exec chmod -c -x {} ';'
 
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` | \
-    sed -e '/perl([DIFMOSU].*)/d; /perl(POE::MySession)/d'
-    #sed -e '/perl((?!(POE)).*)/d'
-    #perl -p -e '/^(?!POE)/d'
-EOF
-
-%define __perl_provides %{_builddir}/POE-Test-Loops-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -68,6 +59,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/poe-gen-tests.1.gz
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.022-1
+- update filtering
+- auto-update to 1.022 (by cpan-spec-update 0.01)
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.021-1
 - auto-update to 1.021 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 08:08:56 -0000	1.3
+++ sources	27 Sep 2009 05:40:31 -0000	1.4
@@ -1 +1 @@
-1a77a4d9891fd5bed316fad45131e766  POE-Test-Loops-1.021.tar.gz
+d663b5d958cc74990b30a021cc555dfd  POE-Test-Loops-1.022.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 05:49:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 05:49:40 +0000 (UTC)
Subject: rpms/perl-POE/devel .cvsignore, 1.12, 1.13 perl-POE.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090927054940.1DFCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6668

Modified Files:
	.cvsignore perl-POE.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.269-1
- update filtering...
- auto-update to 1.269 (by cpan-spec-update 0.01)
- added a new br on perl(Module::Build)
- altered br on perl(POE::Test::Loops) (1.021 => 1.022)
- altered req on perl(POE::Test::Loops) (1.021 => 1.022)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	25 Aug 2009 06:32:06 -0000	1.12
+++ .cvsignore	27 Sep 2009 05:49:39 -0000	1.13
@@ -1 +1 @@
-POE-1.007.tar.gz
+POE-1.269.tar.gz


Index: perl-POE.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/perl-POE.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-POE.spec	25 Aug 2009 06:32:07 -0000	1.18
+++ perl-POE.spec	27 Sep 2009 05:49:39 -0000	1.19
@@ -1,5 +1,5 @@
 Name:      perl-POE
-Version:   1.007
+Version:   1.269
 Release:   1%{?dist}
 Summary:   POE - portable multitasking and networking framework for Perl
 
@@ -11,10 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# core
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
-# cpan
 BuildRequires:  perl(Compress::Zlib) >= 1.33
 BuildRequires:  perl(Curses) >= 1.08
 BuildRequires:  perl(IO::Poll) >= 0.01
@@ -33,37 +31,36 @@ BuildRequires:  perl(URI) >= 1.30
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 
-# not picked up automatically
-Requires:       perl(Compress::Zlib)
-Requires:       perl(Event)
-Requires:       perl(IO::Pty)
-Requires:       perl(Socket6)
-
-### auto-added brs!
+BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Storable) >= 2.16
 BuildRequires:  perl(Errno) >= 1.09
 BuildRequires:  perl(IO::Handle) >= 1.27
 BuildRequires:  perl(Socket) >= 1.7
 BuildRequires:  perl(IO::Tty) >= 1.08
-BuildRequires:  perl(POE::Test::Loops) >= 1.021
+BuildRequires:  perl(POE::Test::Loops) >= 1.022
 BuildRequires:  perl(POSIX) >= 1.02
 BuildRequires:  perl(File::Spec) >= 0.87
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Test::Harness) >= 2.26
 BuildRequires:  perl(Carp)
 
-### auto-added reqs!
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Event)
+Requires:       perl(IO::Pty)
+Requires:       perl(Socket6)
 Requires:       perl(Carp)
 Requires:       perl(Errno) >= 1.09
 Requires:       perl(Exporter)
 Requires:       perl(File::Spec) >= 0.87
 Requires:       perl(IO::Handle) >= 1.27
 Requires:       perl(IO::Tty) >= 1.08
-Requires:       perl(POE::Test::Loops) >= 1.021
+Requires:       perl(POE::Test::Loops) >= 1.022
 Requires:       perl(POSIX) >= 1.02
 Requires:       perl(Socket) >= 1.7
 Requires:       perl(Storable) >= 2.16
 
+%{?perl_default_filter}
+
 %description
 POE is a framework for cooperative, event driven multitasking in Perl.
 Other languages have similar frameworks. Python has Twisted. TCL has "the
@@ -84,29 +81,7 @@ possible to use POE at varying levels of
 # make rpmlint happy...
 chmod -c -x examples/*
 find t/ -type f -exec chmod -c -x {} +
-find t/ -type f -name '*.t' -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-  sed -e '/perl(Tk)/d; /perl(Test::More)/d; /perl(lib)/d'
-EOF
-
-%define __perl_requires %{_builddir}/POE-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
-
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` |\
-  sed -e '/^perl(POE::Kernel)$/d; /^perl(POE::Loop::Tk)$/d'
-EOF
-
-%define __perl_provides %{_builddir}/POE-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
+find t/ -type f -name '*.t' -exec perl -pi -e 's|^#!perl|#!%{__perl}|' {} +
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor --default
@@ -154,6 +129,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.269-1
+- update filtering...
+- auto-update to 1.269 (by cpan-spec-update 0.01)
+- added a new br on perl(Module::Build)
+- altered br on perl(POE::Test::Loops) (1.021 => 1.022)
+- altered req on perl(POE::Test::Loops) (1.021 => 1.022)
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
 - auto-update to 1.007 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Aug 2009 06:32:07 -0000	1.12
+++ sources	27 Sep 2009 05:49:39 -0000	1.13
@@ -1 +1 @@
-c7e8822bd11ed36a2f716f60e58da2e6  POE-1.007.tar.gz
+1e368c2c9ff34cf79c31359c002936d7  POE-1.269.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 06:06:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 06:06:18 +0000 (UTC)
Subject: rpms/perl-Mouse/devel .cvsignore, 1.12, 1.13 perl-Mouse.spec, 1.14, 
	1.15 sources, 1.12, 1.13
Message-ID: <20090927060618.A24D711C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13421

Modified Files:
	.cvsignore perl-Mouse.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
- update filtering
- drop our soft-requires (except 1).  Anything using Mouse by this point
  should know to require them if their bits are needed.
- add benchmarks/ to doc
- auto-update to 0.35 (by cpan-spec-update 0.01)
- altered br on perl(Test::Exception) (0.21 => 0.27)
- altered br on perl(Test::More) (0.8 => 0.88)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Sep 2009 18:45:02 -0000	1.12
+++ .cvsignore	27 Sep 2009 06:06:16 -0000	1.13
@@ -1 +1 @@
-Mouse-0.29.tar.gz
+Mouse-0.35.tar.gz


Index: perl-Mouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/perl-Mouse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Mouse.spec	19 Sep 2009 18:45:02 -0000	1.14
+++ perl-Mouse.spec	27 Sep 2009 06:06:17 -0000	1.15
@@ -1,10 +1,10 @@
 Name:       perl-Mouse
-Version:    0.28
+Version:    0.35
 Release:    1%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Moose minus the antlers
-Source:     http://search.cpan.org/CPAN/authors/id/S/SU/SUNNAVY/Mouse-%{version}.tar.gz
+Source:     http://search.cpan.org/CPAN/authors/id/G/GF/GFUJI/Mouse-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/Mouse
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -16,18 +16,13 @@ BuildRequires: perl(MRO::Compat)
 BuildRequires: perl(Scalar::Util) >= 1.14
 # tests
 BuildRequires: perl(Moose)
-BuildRequires: perl(Test::Exception) >= 0.21
-BuildRequires: perl(Test::More) >= 0.8
+BuildRequires: perl(Test::Exception) >= 0.27
+BuildRequires: perl(Test::More) >= 0.88
 
-# Strictly speaking, since 0.09 these are "soft dependencies", that is, Mouse
-# will take advantage of them (and run faster) if they're there; but can cope
-# otherwise.  As they're already all in Fedora, and we don't have a
-# "recommends" in rpm yet, let's manually require them here.
-Requires:      perl(Class::Method::Modifiers) >= 1.01
-Requires:      perl(Test::Exception)          >= 0.27
-Requires:      perl(Scalar::Util)             >= 1.14
-Requires:      perl(MRO::Compat)              >= 0.09
+# "soft requires"
+BuildRequires: perl(MRO::Compat)
 
+%{?perl_default_filter}
 
 %description
 Moose, a powerful metaobject-fuelled extension of the Perl 5 object system,
@@ -42,18 +37,9 @@ functionality, faster.
 %prep
 %setup -q -n Mouse-%{version}
 
-find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +
-
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_provides %{_builddir}/Mouse-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
+find .           -type f -exec chmod -c -x {} +
+find t/          -type f -exec perl -pi -e 's|^#!perl|#!%{__perl}|' {} +
+find benchmarks/ -type f -exec perl -pi -e 's|^#!perl|#!%{__perl}|' {} +
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -76,11 +62,20 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes t/
+%doc Changes benchmarks/ t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- update filtering
+- drop our soft-requires (except 1).  Anything using Mouse by this point
+  should know to require them if their bits are needed.
+- add benchmarks/ to doc
+- auto-update to 0.35 (by cpan-spec-update 0.01)
+- altered br on perl(Test::Exception) (0.21 => 0.27)
+- altered br on perl(Test::More) (0.8 => 0.88)
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.28-1
 - auto-update to 0.28 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Sep 2009 18:45:02 -0000	1.12
+++ sources	27 Sep 2009 06:06:17 -0000	1.13
@@ -1 +1 @@
-fa8f93156c9d466763c6d7d4b4b416b9  Mouse-0.29.tar.gz
+86575b25595fd50ed363ac678fcb4720  Mouse-0.35.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 06:15:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 06:15:01 +0000 (UTC)
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.20,
	1.21 perl-Module-ScanDeps.spec, 1.24, 1.25 sources, 1.20, 1.21
Message-ID: <20090927061501.7AF2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17162

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.95-1
- auto-update to 0.95 (by cpan-spec-update 0.01)
- add perl_default_filter (pro forma)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	15 Dec 2008 20:25:16 -0000	1.20
+++ .cvsignore	27 Sep 2009 06:15:01 -0000	1.21
@@ -1 +1 @@
-Module-ScanDeps-0.89.tar.gz
+Module-ScanDeps-0.95.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Module-ScanDeps.spec	26 Jul 2009 11:20:29 -0000	1.24
+++ perl-Module-ScanDeps.spec	27 Sep 2009 06:15:01 -0000	1.25
@@ -1,14 +1,14 @@
 Name:           perl-Module-ScanDeps
-Version:        0.89
-Release:        3%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Module-ScanDeps/
-Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/Module-ScanDeps-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Module-ScanDeps-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Module::Build::ModuleInfo)
 BuildRequires:  perl(Module::Pluggable)
 BuildRequires:  perl(Test::More)
@@ -17,6 +17,8 @@ BuildRequires:  perl(prefork)
 BuildRequires:  perl(version)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 This module scans potential modules used by perl programs and returns a
 hash reference.  Its keys are the module names as appears in %INC (e.g.
@@ -54,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.95-1
+- auto-update to 0.95 (by cpan-spec-update 0.01)
+- add perl_default_filter (pro forma)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.89-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	15 Dec 2008 20:25:16 -0000	1.20
+++ sources	27 Sep 2009 06:15:01 -0000	1.21
@@ -1 +1 @@
-97eccc0184030d598c84c544f3507a53  Module-ScanDeps-0.89.tar.gz
+9181f1d8b521e698064610917094f89a  Module-ScanDeps-0.95.tar.gz



From oget at fedoraproject.org  Sun Sep 27 06:25:31 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 06:25:31 +0000 (UTC)
Subject: rpms/alevt/devel alevt.desktop,1.2,1.3 alevt.spec,1.11,1.12
Message-ID: <20090927062531.5B5D111C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21035

Modified Files:
	alevt.desktop alevt.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6.2-15
- Update desktop file according to F-12 FedoraStudio feature



Index: alevt.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- alevt.desktop	5 Dec 2008 08:16:33 -0000	1.2
+++ alevt.desktop	27 Sep 2009 06:25:30 -0000	1.3
@@ -6,5 +6,5 @@ Exec=alevt
 Icon=mini-alevt
 Terminal=false
 Type=Application
-Categories=Video;
+Categories=Video;X-AudioVideoCapture;
 Version=1.0


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- alevt.spec	24 Jul 2009 16:42:04 -0000	1.11
+++ alevt.spec	27 Sep 2009 06:25:31 -0000	1.12
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Teletext decoder/browser
 Group: Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6.2-15
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 06:29:43 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 06:29:43 +0000 (UTC)
Subject: rpms/camstream/devel camstream.spec,1.22,1.23
Message-ID: <20090927062943.E371C11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/camstream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22596

Modified Files:
	camstream.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.26.3-18
- Update desktop file according to F-12 FedoraStudio feature



Index: camstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- camstream.spec	24 Jul 2009 18:39:43 -0000	1.22
+++ camstream.spec	27 Sep 2009 06:29:43 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           camstream
 Version:        0.26.3
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        Set of programs to make use of your webcam
 
@@ -76,6 +76,8 @@ desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode 644 \
   --add-category X-Fedora \
+  --add-category X-AudioVideoCapture \
+  --add-category X-Streamer \
   %{SOURCE1}
 
 
@@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.26.3-18
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26.3-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 06:34:33 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 06:34:33 +0000 (UTC)
Subject: rpms/cheese/devel cheese.spec,1.63,1.64
Message-ID: <20090927063433.E5E0611C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24108

Modified Files:
	cheese.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.28.0-2
- Update desktop file according to F-12 FedoraStudio feature



Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- cheese.spec	22 Sep 2009 03:23:32 -0000	1.63
+++ cheese.spec	27 Sep 2009 06:34:33 -0000	1.64
@@ -1,6 +1,6 @@
 Name:           cheese
 Version:        2.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
@@ -58,6 +58,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 
 desktop-file-install --delete-original --vendor="" 	\
  	--dir=$RPM_BUILD_ROOT%{_datadir}/applications 	\
+	--add-category X-AudioVideoImport		\
 	$RPM_BUILD_ROOT%{_datadir}/applications/cheese.desktop
 
 # save space by linking identical images in translated docs
@@ -126,6 +127,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.28.0-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Sep 21 2009 Matthias Clasen  <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From oget at fedoraproject.org  Sun Sep 27 06:57:20 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 06:57:20 +0000 (UTC)
Subject: rpms/coriander/devel coriander.spec,1.6,1.7
Message-ID: <20090927065720.A2CA911C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/coriander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31929

Modified Files:
	coriander.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.0.0-0.12.rc6
- Update desktop file according to F-12 FedoraStudio feature



Index: coriander.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coriander/devel/coriander.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coriander.spec	24 Jul 2009 19:30:18 -0000	1.6
+++ coriander.spec	27 Sep 2009 06:57:16 -0000	1.7
@@ -7,7 +7,7 @@
 Summary: Control a 1394 digital camera interactively
 Name: coriander
 Version: 2.0.0
-Release: 0.11.rc6%{?cvs_snapshot}%{?dist}
+Release: 0.12.rc6%{?cvs_snapshot}%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://damien.douxchamps.net/ieee1394/coriander/
@@ -39,7 +39,7 @@ Exec=coriander
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=AudioVideo;
+Categories=AudioVideo;X-AudioVideoImport;X-Streamer;
 Icon=%{_datadir}/pixmaps/%{name}/%{name}-icon.png
 EOF
 
@@ -71,6 +71,9 @@ desktop-file-install --vendor fedora    
 %{_datadir}/applications/*-coriander.desktop
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.0.0-0.12.rc6
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-0.11.rc6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Sun Sep 27 07:07:19 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 07:07:19 +0000 (UTC)
Subject: rpms/fantasdic/devel fantasdic.spec,1.7,1.8
Message-ID: <20090927070719.4AF8B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/fantasdic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2451

Modified Files:
	fantasdic.spec 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.8.beta7
- Revert the last change; fixed in ruby-gnome2 side



Index: fantasdic.spec
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/devel/fantasdic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fantasdic.spec	26 Sep 2009 17:06:37 -0000	1.7
+++ fantasdic.spec	27 Sep 2009 07:07:18 -0000	1.8
@@ -5,7 +5,7 @@
 %define		betaver		beta7
 %define		rubyabi		1.8
 
-%define		fedorarel	7
+%define		fedorarel	8
 
 
 %define		fullrel		%{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -20,7 +20,7 @@ License:	GPLv2+
 URL:		http://www.gnome.org/projects/fantasdic/
 Source0:	http://www.mblondel.org/files/fantasdic/%{name}-%{mainver}%{?betaver:-%betaver}.tar.gz
 # ruby-gnome2-Bugs-2865895
-Patch0:		fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch
+# Patch0:		fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -50,7 +50,7 @@ Fantasdic is Free Software.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{?betaver:-%betaver}
-%patch0 -p1
+#%%patch0 -p1
 
 %{__chmod} 0644 tools/*.rb
 %{__sed} -i.path -e 's|%{_bindir}/||' fantasdic.desktop
@@ -169,6 +169,9 @@ exit 0
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.8.beta7
+- Revert the last change; fixed in ruby-gnome2 side
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.7.beta7
 - Add workaround for ruby-gnome2-Bugs-2865895
 



From mtasaka at fedoraproject.org  Sun Sep 27 07:09:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 07:09:03 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch, NONE,
	1.1 ruby-gnome2.spec, 1.48, 1.49
Message-ID: <20090927070903.B17FE11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
- Fix crash when moving cursor on fantasdic 1.0 beta 7
  (ruby-gnome2-Bugs-2865895)


ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch:
 rbgdkwindow.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch ---
Index: gtk/src/rbgdkwindow.c
===================================================================
--- gtk/src/rbgdkwindow.c	(revision 3712)
+++ gtk/src/rbgdkwindow.c	(revision 3713)
@@ -1093,8 +1093,11 @@
 void
 Init_gtk_gdk_window()
 {
+    GObjectClass *g_class;
     VALUE gdkWindow = G_DEF_CLASS(GDK_TYPE_WINDOW, "Window", mGdk);
 
+    g_class = g_type_class_peek(GDK_TYPE_WINDOW);
+
     rb_define_method(gdkWindow, "initialize", gdkwin_initialize, 3);
     rb_define_method(gdkWindow, "destroy", gdkwin_destroy, 0);
     rb_define_method(gdkWindow, "window_type", gdkwin_get_window_type, 0);
@@ -1178,6 +1181,10 @@
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
+    if (g_object_class_find_property(g_class, "cursor")) {
+        rb_undef_method(gdkWindow, "cursor");
+        rb_undef_method(gdkWindow, "cursor=");
+    }
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ruby-gnome2.spec	24 Sep 2009 18:37:17 -0000	1.48
+++ ruby-gnome2.spec	27 Sep 2009 07:09:03 -0000	1.49
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -31,7 +31,13 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 #Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
+# Fix shebang on sample files
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
+# Patch from upstream
+# Fix crash when moving curson on fantasdic 1.0 beta 7 
+# (ruby-gnome2-Bugs-2865895)
+Patch10:        ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -765,6 +771,7 @@ This package provides libraries and head
 %setup -q -n %{name}-all-%{version}
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
+%patch10 -p0
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -1090,6 +1097,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
+- Fix crash when moving cursor on fantasdic 1.0 beta 7
+  (ruby-gnome2-Bugs-2865895)
+
 * Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
 - Update to 0.19.3
 - Released source does not support gio yet



From oget at fedoraproject.org  Sun Sep 27 07:09:12 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:09:12 +0000 (UTC)
Subject: rpms/gaupol/devel gaupol.spec,1.8,1.9
Message-ID: <20090927070912.3DD2811C0332@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3737

Modified Files:
	gaupol.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.15-5
- Update desktop file according to F-12 FedoraStudio feature



Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/gaupol.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gaupol.spec	10 Aug 2009 19:20:59 -0000	1.8
+++ gaupol.spec	27 Sep 2009 07:09:11 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
 Version:	0.15
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
@@ -40,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %find_lang %{name}
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
+--add-category AudioVideoEditing			\
 $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 
@@ -62,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.15-5
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15-4
 - Use bzipped upstream tarball.
 



From oget at fedoraproject.org  Sun Sep 27 07:12:17 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:12:17 +0000 (UTC)
Subject: rpms/camstream/devel camstream.spec,1.23,1.24
Message-ID: <20090927071217.C1EE011C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/camstream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4750

Modified Files:
	camstream.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.26.3-19
- Workaround for build failure: Don't enable MMX on i686 and athlon for now



Index: camstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- camstream.spec	27 Sep 2009 06:29:43 -0000	1.23
+++ camstream.spec	27 Sep 2009 07:12:17 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           camstream
 Version:        0.26.3
-Release:        18%{?dist}
+Release:        19%{?dist}
 
 Summary:        Set of programs to make use of your webcam
 
@@ -16,7 +16,7 @@ Patch2:         camstream-0.26.3-x86_64-
 Patch3:         camstream-0.26.3-libv4l.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt3-devel, autoconf, desktop-file-utils, libv4l-devel
+BuildRequires:  qt3-devel, autoconf, desktop-file-utils, libv4l-devel, kernel-headers
 ExclusiveArch:  %{ix86} x86_64 
 
 %description
@@ -42,9 +42,10 @@ is based on Qt, an excellent GUI framewo
 # Use our homebrew CPU flags for sane builds.
 %ifarch %{ix86}
 export HAVE_IX86=1
-%ifarch i686 athlon
-export HAVE_MMX=1
-%endif
+# Disable MMX for now. Otherwise, package fails to build.
+#%%ifarch i686 athlon
+#export HAVE_MMX=1
+#%%endif
 %endif
 
 # Do autoconfs due to patch0 and to nuke old autoconf 2.13 stuff in lib/ccvt.
@@ -95,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.26.3-19
+- Workaround for build failure: Don't enable MMX on i686 and athlon for now
+
 * Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.26.3-18
 - Update desktop file according to F-12 FedoraStudio feature
 



From phuang at fedoraproject.org  Sun Sep 27 07:14:13 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 27 Sep 2009 07:14:13 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.43, 1.44 ibus.spec, 1.91, 1.92 sources,
	1.49, 1.50
Message-ID: <20090927071413.6079E11C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5375

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
update 1.2.0.20090927


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	15 Sep 2009 06:04:52 -0000	1.43
+++ .cvsignore	27 Sep 2009 07:14:13 -0000	1.44
@@ -1 +1 @@
-ibus-1.2.0.20090915.tar.gz
+ibus-1.2.0.20090927.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ibus.spec	15 Sep 2009 06:04:57 -0000	1.91
+++ ibus.spec	27 Sep 2009 07:14:13 -0000	1.92
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090915
+Version:    1.2.0.20090927
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -234,6 +234,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 27 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090927-1
+- Update to 1.2.0.20090927
+
 * Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
 - Update to 1.2.0.20090915
 - Fix bug 521591 - check if the icon filename is a real file before trying to open it


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	15 Sep 2009 06:04:57 -0000	1.49
+++ sources	27 Sep 2009 07:14:13 -0000	1.50
@@ -1 +1 @@
-755442695b6f98f3bfa64bad6d778412  ibus-1.2.0.20090915.tar.gz
+300bf18ac0a4d3f1364412a52c9e9746  ibus-1.2.0.20090927.tar.gz



From phuang at fedoraproject.org  Sun Sep 27 07:18:16 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 27 Sep 2009 07:18:16 +0000 (UTC)
Subject: rpms/ibus/F-11 .cvsignore,1.36,1.37 sources,1.41,1.42
Message-ID: <20090927071816.372CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6729

Modified Files:
	.cvsignore sources 
Log Message:
Update to 1.2.0.20090927


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Aug 2009 03:13:05 -0000	1.36
+++ .cvsignore	27 Sep 2009 07:18:15 -0000	1.37
@@ -1 +1 @@
-ibus-1.1.0.20090829.tar.gz
+ibus-1.2.0.20090927.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	25 Sep 2009 06:10:44 -0000	1.41
+++ sources	27 Sep 2009 07:18:16 -0000	1.42
@@ -1 +1 @@
-755442695b6f98f3bfa64bad6d778412  ibus-1.2.0.20090915.tar.gz
+300bf18ac0a4d3f1364412a52c9e9746  ibus-1.2.0.20090927.tar.gz



From phuang at fedoraproject.org  Sun Sep 27 07:19:16 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 27 Sep 2009 07:19:16 +0000 (UTC)
Subject: rpms/ibus/F-11 ibus.spec,1.84,1.85
Message-ID: <20090927071916.0E8B211C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7032

Modified Files:
	ibus.spec 
Log Message:
Update to 1.2.0.20090927


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ibus.spec	25 Sep 2009 06:10:44 -0000	1.84
+++ ibus.spec	27 Sep 2009 07:19:15 -0000	1.85
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090915
+Version:    1.2.0.20090927
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -234,6 +234,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 27 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090927-1
+- Update to 1.2.0.20090927
+
 * Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
 - Update to 1.2.0.20090915
 - Fix bug 521591 - check if the icon filename is a real file before trying to open it



From oget at fedoraproject.org  Sun Sep 27 07:20:53 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:20:53 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel mkvinfo.desktop, 1.1, 1.2 mkvtoolnix.spec,
	1.29, 1.30 mmg.desktop, 1.1, 1.2
Message-ID: <20090927072053.8548211C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7571

Modified Files:
	mkvinfo.desktop mkvtoolnix.spec mmg.desktop 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.9.8-2
- Update desktop file according to F-12 FedoraStudio feature



Index: mkvinfo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvinfo.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mkvinfo.desktop	6 Dec 2006 12:16:36 -0000	1.1
+++ mkvinfo.desktop	27 Sep 2009 07:20:53 -0000	1.2
@@ -7,4 +7,4 @@ Terminal=false
 Encoding=UTF-8
 Type=Application
 MimeType=video/x-matroska;audio/x-matroska;application/x-matroska;
-Categories=AudioVideo;GTK;
+Categories=AudioVideo;GTK;X-AudioVideoImport;


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mkvtoolnix.spec	26 Aug 2009 01:35:44 -0000	1.29
+++ mkvtoolnix.spec	27 Sep 2009 07:20:53 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
 Version: 2.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
@@ -116,6 +116,9 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.9.8-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.8-1
 - updated to 2.9.8
 - improved summary and description for gui subpackage


Index: mmg.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mmg.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mmg.desktop	6 Dec 2006 12:16:36 -0000	1.1
+++ mmg.desktop	27 Sep 2009 07:20:53 -0000	1.2
@@ -6,4 +6,4 @@ Icon=mmg
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=AudioVideo;GTK;
+Categories=AudioVideo;GTK;X-OutputGeneration;



From oget at fedoraproject.org  Sun Sep 27 07:26:09 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:26:09 +0000 (UTC)
Subject: rpms/oggconvert/devel oggconvert.spec,1.10,1.11
Message-ID: <20090927072609.0E36E11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/oggconvert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9173

Modified Files:
	oggconvert.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.2-7
- Update desktop file according to F-12 FedoraStudio feature



Index: oggconvert.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oggconvert/devel/oggconvert.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- oggconvert.spec	25 Jul 2009 20:37:06 -0000	1.10
+++ oggconvert.spec	27 Sep 2009 07:26:08 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           oggconvert
 Version:        0.3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Convert media files to Free formats
 
 Group:          Applications/Multimedia
@@ -50,6 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 desktop-file-install --vendor="fedora" --delete-original        \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications               \
+  --add-category X-OutputGeneration                           \
   %{buildroot}/%{_datadir}/applications/oggconvert.desktop
 %find_lang %{name}
 
@@ -70,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/oggconvert-%{version}-py?.?.egg-info
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.2-7
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From phuang at fedoraproject.org  Sun Sep 27 07:29:23 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 27 Sep 2009 07:29:23 +0000 (UTC)
Subject: rpms/ibus-anthy/F-11 .cvsignore, 1.16, 1.17 ibus-anthy.spec, 1.18, 
	1.19 sources, 1.16, 1.17
Message-ID: <20090927072923.C02CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10179

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
back port from f12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	14 Aug 2009 05:20:54 -0000	1.16
+++ .cvsignore	27 Sep 2009 07:29:23 -0000	1.17
@@ -1 +1 @@
-ibus-anthy-1.1.0.20090814.tar.gz
+ibus-anthy-1.2.0.20090917.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/ibus-anthy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ibus-anthy.spec	14 Aug 2009 05:20:54 -0000	1.18
+++ ibus-anthy.spec	27 Sep 2009 07:29:23 -0000	1.19
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-1.1
+%define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
-Version:    1.1.0.20090814
+Version:    1.2.0.20090917
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -19,8 +19,9 @@ BuildRequires:  anthy-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 
-Requires:   ibus
+Requires:   ibus >= %{require_ibus_version}
 Requires:   anthy
+Requires:   kasumi
 
 %description
 The Anthy engine for IBus platform. It provides Japanese input method from
@@ -51,29 +52,50 @@ rm -rf $RPM_BUILD_ROOT
 # %dir %{python_sitearch}/ibus
 %{python_sitearch}/anthy.py*
 %{python_sitearch}/_anthy.so
-%{_libexecdir}/*
+%{_libexecdir}/ibus-*-anthy
 %{_datadir}/ibus-anthy
 %{_datadir}/ibus/component/*
 
 %changelog
-* Fri Aug 14 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.1.0.20090814-1
-- Update to 1.1.0.20090814
-- Fix bug 509480 - No prediction feature work
-- Fix bug 509487 - convert_to_char_type_forward feature doesn't work
-- Fix bug 509488 - dict_admin feature doesn't work
-- Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word
+* Thu Sep 17 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090917-1
+- Update to 1.2.0.20090917
+- Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward()
+
+* Mon Sep 07 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090907-2
+- Fix a build issue
+
+* Mon Sep 07 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090907-1
+- Update to 1.2.0.20090907
+- Fix bug 510978 - "Typing Method" configuration doesn't work
+- Fix bug 518373 - ibus setup tools need to set gettext textdomain dir.
+
+* Thu Aug 13 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090813-1
+- Update to 1.2.0.20090813
 - Fix bug 509483 - reconversion feature doesn't work
 - Fix bug 509485 - commit_first_segment feature doesn't work
 
-* Wed Jun 03 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090603-1
+* Tue Aug 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090804-1
+- Update to 1.2.0.20090804
+- Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-1
+- Update to 1.2.0.20090617
+
+* Wed Jun 17 2009 Jens Petersen <petersen at redhat.com> - 1.1.0.20090603-2
+- require kasumi to pull in dictionary tool
+
+* Wed Jun 03 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090603-1
 - Update to 1.1.0.20090603
 - Implement setup ui.
 
-* Thu Apr 30 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090402-2
+* Thu Apr 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090402-2
 - Update to upstream HEAD version
 - Fix bug 498250 - Cannot type zenkaku-space
 
-* Thu Apr 02 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090402-1
+* Thu Apr 02 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090402-1
 - Update to 1.1.0.20090402.
 - Fix bug 490747 - Muhenkan (no-conversion) key does not undo conversion
 - Fix bug 490750 - Henkan key for candidate conversion doesn't do anything
@@ -82,41 +104,41 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+* Wed Feb 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
 - Update to 1.1.0.20090211.
 
-* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+* Thu Feb 05 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
 - Update to 1.1.0.20090205.
 
-* Tue Feb 03 2009 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20090203-1
+* Tue Feb 03 2009 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20090203-1
 - Update to 0.1.1.20090203.
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20080912-2
 - Rebuild for Python 2.6
 
-* Fri Sep 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080912-1
+* Fri Sep 12 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080912-1
 - Update to 0.1.1.20080912.
 
-* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+* Mon Sep 01 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 
-* Thu Aug 28 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080828-1
+* Thu Aug 28 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080828-1
 - Update to 0.1.1.20080828.
 
-* Wed Aug 27 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080827-1
+* Wed Aug 27 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080827-1
 - Update to 0.1.1.20080827.
 
-* Tue Aug 26 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080826-1
+* Tue Aug 26 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080826-1
 - Update to 0.1.1.20080826.
 
-* Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Sat Aug 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update to 0.1.1.20080823.
 
-* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
+* Fri Aug 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
 - Update to 0.1.1.20080815.
 
-* Thu Aug 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
+* Thu Aug 12 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
 - Update to 0.1.1.20080812.
 
-* Fri Aug 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
+* Fri Aug 08 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	14 Aug 2009 05:20:54 -0000	1.16
+++ sources	27 Sep 2009 07:29:23 -0000	1.17
@@ -1 +1 @@
-a410c8c85513705b24edfa36c6f0b00c  ibus-anthy-1.1.0.20090814.tar.gz
+b6f1d830346e447908d670bc267391a9  ibus-anthy-1.2.0.20090917.tar.gz



From oget at fedoraproject.org  Sun Sep 27 07:34:48 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:34:48 +0000 (UTC)
Subject: rpms/subdownloader/devel subdownloader.spec,1.8,1.9
Message-ID: <20090927073448.7EF3E11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12299

Modified Files:
	subdownloader.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.0.9.3-4
- Update desktop file according to F-12 FedoraStudio feature



Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- subdownloader.spec	30 Jul 2009 22:41:05 -0000	1.8
+++ subdownloader.spec	27 Sep 2009 07:34:47 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		subdownloader
 Version:	2.0.9.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Program for download/upload subtitles for videofiles and DVDs
 
 Group:		Applications/Multimedia
@@ -51,7 +51,8 @@ cp -pR locale %{buildroot}%{_datadir}
 rm -rf %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.mo
 rm -rf %{buildroot}%{_datadir}/locale/*/*/*.po
 chmod +x %{buildroot}%{python_sitelib}/%{name}/run.py
-desktop-file-install subdownloader.desktop --dir %{buildroot}%{_datadir}/applications
+desktop-file-install subdownloader.desktop --dir %{buildroot}%{_datadir}/applications \
+  --add-category X-AudioVideoImport
 install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
 install -pm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/
 ln -s ../..%{python_sitelib}/%{name}/run.py %{buildroot}%{_bindir}/subdownloader
@@ -71,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.0.9.3-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.9.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sun Sep 27 07:39:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 07:39:59 +0000 (UTC)
Subject: rpms/perl-JavaScript-Minifier-XS/devel .cvsignore, 1.2,
	1.3 perl-JavaScript-Minifier-XS.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090927073959.6762D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JavaScript-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15047

Modified Files:
	.cvsignore perl-JavaScript-Minifier-XS.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- update filtering
- auto-update to 0.06 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-JavaScript-Minifier-XS/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Jun 2009 17:03:26 -0000	1.2
+++ .cvsignore	27 Sep 2009 07:39:58 -0000	1.3
@@ -1 +1 @@
-JavaScript-Minifier-XS-0.05.tar.gz
+JavaScript-Minifier-XS-0.06.tar.gz


Index: perl-JavaScript-Minifier-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JavaScript-Minifier-XS/devel/perl-JavaScript-Minifier-XS.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-JavaScript-Minifier-XS.spec	26 Jul 2009 08:51:40 -0000	1.2
+++ perl-JavaScript-Minifier-XS.spec	27 Sep 2009 07:39:58 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-JavaScript-Minifier-XS
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        XS based JavaScript minifier
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/JavaScript-Minifier-XS/
-Source0:        http://www.cpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::More)
@@ -13,14 +13,10 @@ BuildRequires:  perl(JavaScript::Minifie
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
-%global __find_requires /bin/sh -c "%{__deploop R}"
+%{?perl_default_filter}
 
 %description
-JavaScript::Minifier::XS is a JavaScript "minifier"; its designed
+JavaScript::Minifier::XS is a JavaScript "minifier"; it's designed
 to remove un-necessary whitespace and comments from JavaScript
 files without breaking the JavaScript.
 
@@ -54,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
+- update filtering
+- auto-update to 0.06 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-JavaScript-Minifier-XS/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Jun 2009 17:03:26 -0000	1.2
+++ sources	27 Sep 2009 07:39:58 -0000	1.3
@@ -1 +1 @@
-be844769f0c65ec3ef0e8390331d58d3  JavaScript-Minifier-XS-0.05.tar.gz
+f77bb263e4851227086112aecbf14ac9  JavaScript-Minifier-XS-0.06.tar.gz



From oget at fedoraproject.org  Sun Sep 27 07:42:12 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:42:12 +0000 (UTC)
Subject: rpms/ucview/devel ucview.desktop,1.1,1.2 ucview.spec,1.10,1.11
Message-ID: <20090927074212.0B56211C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ucview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15793

Modified Files:
	ucview.desktop ucview.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.23-4
- Update desktop file according to F-12 FedoraStudio feature



Index: ucview.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/ucview/devel/ucview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ucview.desktop	27 Jul 2008 16:21:09 -0000	1.1
+++ ucview.desktop	27 Sep 2009 07:42:11 -0000	1.2
@@ -8,5 +8,5 @@ Exec=ucview
 TryExec=ucview
 Icon=ucview
 Terminal=false
-Categories=Application;AudioVideo;Video;
+Categories=AudioVideo;Video;X-AudioVideoCapture;
 StartupNotify=true


Index: ucview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucview/devel/ucview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ucview.spec	27 Jul 2009 06:27:04 -0000	1.10
+++ ucview.spec	27 Sep 2009 07:42:11 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:          Image and video capture application using unicap toolkit
 Name:             ucview
 Version:          0.23
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2+
 Group:            Applications/Multimedia
 URL:              http://www.unicap-imaging.org/
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.23-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 07:49:47 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 07:49:47 +0000 (UTC)
Subject: rpms/v4l2ucp/devel v4l2ucp.desktop,1.1,1.2 v4l2ucp.spec,1.6,1.7
Message-ID: <20090927074947.5269611C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/v4l2ucp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18336

Modified Files:
	v4l2ucp.desktop v4l2ucp.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.3-4
- Update desktop file according to F-12 FedoraStudio feature



Index: v4l2ucp.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/v4l2ucp/devel/v4l2ucp.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- v4l2ucp.desktop	24 Oct 2008 09:13:14 -0000	1.1
+++ v4l2ucp.desktop	27 Sep 2009 07:49:44 -0000	1.2
@@ -6,4 +6,4 @@ Icon=v4l2ucp
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=AudioVideo;
+Categories=AudioVideo;X-AudioVideoTools;


Index: v4l2ucp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/v4l2ucp/devel/v4l2ucp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- v4l2ucp.spec	27 Jul 2009 06:42:37 -0000	1.6
+++ v4l2ucp.spec	27 Sep 2009 07:49:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           v4l2ucp
 Version:        1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Video4linux universal control panel
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -79,6 +79,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.3-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 08:09:21 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:09:21 +0000 (UTC)
Subject: rpms/DivFix++/devel DivFix++.spec,1.5,1.6
Message-ID: <20090927080921.8A2F611C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/DivFix++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24921

Modified Files:
	DivFix++.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.30-8
- Update desktop file according to F-12 FedoraStudio feature



Index: DivFix++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DivFix++/devel/DivFix++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- DivFix++.spec	24 Jul 2009 15:07:48 -0000	1.5
+++ DivFix++.spec	27 Sep 2009 08:09:19 -0000	1.6
@@ -9,7 +9,7 @@
 Name:		DivFix++
 Summary:		Repair broken AVI file streams by rebuilding index part of file
 Version:		0.30
-Release:		7%{?dist}
+Release:		8%{?dist}
 License:		GPLv2+
 Group:		Applications/Multimedia
 URL:			http://divfixpp.sourceforge.net/
@@ -73,7 +73,7 @@ Type=Application
 Exec=%{name}
 Icon=%{name}
 Encoding=UTF-8
-Categories=Video;
+Categories=Video;AudioVideo;X-AudioVideoTools;
 EOF
 
 desktop-file-install --delete-original \
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.30-8
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 08:17:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:17:07 +0000 (UTC)
Subject: rpms/flumotion/devel flumotion.spec,1.19,1.20
Message-ID: <20090927081707.F19DC11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/flumotion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28237

Modified Files:
	flumotion.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.2-10
- Update desktop file according to F-12 FedoraStudio feature



Index: flumotion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flumotion/devel/flumotion.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- flumotion.spec	24 Jul 2009 22:57:28 -0000	1.19
+++ flumotion.spec	27 Sep 2009 08:17:06 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           flumotion
 Version:        0.4.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Streaming Server based on GStreamer and Twisted
 
 Group:          Applications/Internet
@@ -88,6 +88,7 @@ desktop-file-install \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
+  --add-category X-Streamer \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/flumotion-admin.desktop
 
@@ -251,6 +252,9 @@ fi
 %{_sysconfdir}/rc.d/init.d/flumotion
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.2-10
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sun Sep 27 08:21:58 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 08:21:58 +0000 (UTC)
Subject: rpms/perl-JavaScript-Minifier-XS/F-11
	perl-JavaScript-Minifier-XS.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090927082158.D746811C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JavaScript-Minifier-XS/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30504

Modified Files:
	perl-JavaScript-Minifier-XS.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- update filtering
- auto-update to 0.06 (by cpan-spec-update 0.01)



Index: perl-JavaScript-Minifier-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JavaScript-Minifier-XS/F-11/perl-JavaScript-Minifier-XS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-JavaScript-Minifier-XS.spec	3 Jun 2009 17:06:01 -0000	1.1
+++ perl-JavaScript-Minifier-XS.spec	27 Sep 2009 08:21:58 -0000	1.2
@@ -1,11 +1,11 @@
 Name:           perl-JavaScript-Minifier-XS
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        XS based JavaScript minifier
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/JavaScript-Minifier-XS/
-Source0:        http://www.cpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::More)
@@ -13,14 +13,10 @@ BuildRequires:  perl(JavaScript::Minifie
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# don't "provide" private Perl libs
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
-%global __find_requires /bin/sh -c "%{__deploop R}"
+%{?perl_default_filter}
 
 %description
-JavaScript::Minifier::XS is a JavaScript "minifier"; its designed
+JavaScript::Minifier::XS is a JavaScript "minifier"; it's designed
 to remove un-necessary whitespace and comments from JavaScript
 files without breaking the JavaScript.
 
@@ -54,6 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
+- update filtering
+- auto-update to 0.06 (by cpan-spec-update 0.01)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May  5 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.05-2
 - add BR, remove useless provides
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-JavaScript-Minifier-XS/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Jun 2009 17:06:01 -0000	1.2
+++ sources	27 Sep 2009 08:21:58 -0000	1.3
@@ -1 +1 @@
-be844769f0c65ec3ef0e8390331d58d3  JavaScript-Minifier-XS-0.05.tar.gz
+f77bb263e4851227086112aecbf14ac9  JavaScript-Minifier-XS-0.06.tar.gz



From oget at fedoraproject.org  Sun Sep 27 08:24:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:24:10 +0000 (UTC)
Subject: rpms/soundconverter/devel soundconverter.spec,1.22,1.23
Message-ID: <20090927082410.E1B5B11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/soundconverter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31333

Modified Files:
	soundconverter.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.2-4
- Update desktop file according to F-12 FedoraStudio feature



Index: soundconverter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- soundconverter.spec	27 Jul 2009 04:36:12 -0000	1.22
+++ soundconverter.spec	27 Sep 2009 08:24:10 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           soundconverter
 Version:        1.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -47,6 +47,7 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
+  --add-category X-OutputGeneration \
   --delete-original \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
 
@@ -83,6 +84,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.2-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sun Sep 27 08:28:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 08:28:33 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-DNS/devel .cvsignore, 1.5,
	1.6 perl-POE-Component-Client-DNS.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090927082833.C324211C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32702

Modified Files:
	.cvsignore perl-POE-Component-Client-DNS.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.050-1
- auto-update to 1.050 (by cpan-spec-update 0.01)
- added a new br on perl(Test::NoWarnings) (version 0.084)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 06:50:56 -0000	1.5
+++ .cvsignore	27 Sep 2009 08:28:33 -0000	1.6
@@ -1 +1 @@
-POE-Component-Client-DNS-1.04.tar.gz
+POE-Component-Client-DNS-1.050.tar.gz


Index: perl-POE-Component-Client-DNS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel/perl-POE-Component-Client-DNS.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-POE-Component-Client-DNS.spec	25 Aug 2009 06:50:56 -0000	1.9
+++ perl-POE-Component-Client-DNS.spec	27 Sep 2009 08:28:33 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-POE-Component-Client-DNS
-Version:        1.04
+Version:        1.050
 Release:        1%{?dist}
 Summary:        Non-blocking/concurrent DNS queries using Net::DNS and POE
 
@@ -15,11 +15,13 @@ BuildRequires:  perl(POE) >= 1.007
 BuildRequires:  perl(Net::DNS) >= 0.59
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::NoWarnings) >= 0.084
 
-### auto-added reqs!
 Requires:       perl(Net::DNS) >= 0.59
 Requires:       perl(POE) >= 1.007
 
+%{?perl_default_filter}
+
 %description
 POE::Component::Client::DNS provides a facility for non-blocking, concurrent
 DNS requests. Using POE, it allows other tasks to run while waiting for name
@@ -66,6 +68,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.050-1
+- auto-update to 1.050 (by cpan-spec-update 0.01)
+- added a new br on perl(Test::NoWarnings) (version 0.084)
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
 - auto-update to 1.04 (by cpan-spec-update 0.01)
 - added a new br on perl(ExtUtils::MakeMaker) (version 0)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 06:50:56 -0000	1.5
+++ sources	27 Sep 2009 08:28:33 -0000	1.6
@@ -1 +1 @@
-81328c4af17a40e34d5f37fe5768f428  POE-Component-Client-DNS-1.04.tar.gz
+c07de9f13818a9d8bf467831282df55c  POE-Component-Client-DNS-1.050.tar.gz



From oget at fedoraproject.org  Sun Sep 27 08:29:08 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:29:08 +0000 (UTC)
Subject: rpms/themonospot/devel themonospot.spec,1.7,1.8
Message-ID: <20090927082908.B07F511C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/themonospot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv469

Modified Files:
	themonospot.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7.3.1-3
- Update desktop file according to F-12 FedoraStudio feature



Index: themonospot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/themonospot/devel/themonospot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- themonospot.spec	27 Jul 2009 05:54:11 -0000	1.7
+++ themonospot.spec	27 Sep 2009 08:29:08 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Avi and Mkv parser/editor and content descriptor
 Name: themonospot
 Version: 0.7.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://www.integrazioneweb.com/themonospot/packages/%{name}-%{version}.tar.gz
@@ -57,6 +57,7 @@ rm -rf %{buildroot}%{_datadir}/applicati
 rm -rf %{buildroot}%{_libdir}/pkgconfig/%{name}-base.pc
 desktop-file-install --vendor="fedora"               \
   --dir=%{buildroot}%{_datadir}/applications    \
+  --add-category X-AudioVideoImport             \
   %{name}-gui/resources/%{name}.desktop
 
 %clean
@@ -74,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7.3.1-3
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 08:40:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:40:07 +0000 (UTC)
Subject: rpms/istanbul/devel istanbul.spec,1.18,1.19
Message-ID: <20090927084007.CD9C211C0424@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/istanbul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4364

Modified Files:
	istanbul.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2.2-11
- Update desktop file according to F-12 FedoraStudio feature



Index: istanbul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/istanbul/devel/istanbul.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- istanbul.spec	25 Jul 2009 03:40:31 -0000	1.18
+++ istanbul.spec	27 Sep 2009 08:40:07 -0000	1.19
@@ -7,7 +7,7 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
@@ -70,6 +70,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreame
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
   --add-category X-Fedora-Extra					\
+  --add-category X-AudioVideoCapture				\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
@@ -113,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{python_sitelib}/%{name}/extern/pytrayicon/*.so*
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2.2-11
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 08:44:37 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:44:37 +0000 (UTC)
Subject: rpms/pyvnc2swf/devel pyvnc2swf.desktop, 1.1, 1.2 pyvnc2swf.spec, 1.5,
	1.6
Message-ID: <20090927084437.A9B5E11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pyvnc2swf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6798

Modified Files:
	pyvnc2swf.desktop pyvnc2swf.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.5-4
- Update desktop file according to F-12 FedoraStudio feature



Index: pyvnc2swf.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/devel/pyvnc2swf.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pyvnc2swf.desktop	6 Sep 2008 11:58:07 -0000	1.1
+++ pyvnc2swf.desktop	27 Sep 2009 08:44:37 -0000	1.2
@@ -10,6 +10,6 @@ Icon=pyvnc2swf
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;AudioVideo;Video;Player;
+Categories=GNOME;GTK;AudioVideo;Video;Player;X-AudioVideoCapture;
 X-Desktop-File-Install-Version=0.15
 Name[en_AU]=Vnc2swf Screen Recorder


Index: pyvnc2swf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/devel/pyvnc2swf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pyvnc2swf.spec	27 Jul 2009 01:37:04 -0000	1.5
+++ pyvnc2swf.spec	27 Sep 2009 08:44:37 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Vnc screen recorder
 Name:    pyvnc2swf
 Version: 0.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 URL:     http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html
@@ -97,6 +97,9 @@ fi
 %exclude %{_bindir}/recordwin.sh
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.5-4
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Sep 27 08:52:03 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 08:52:03 +0000 (UTC)
Subject: rpms/kradio4/devel kradio4.spec,1.1,1.2
Message-ID: <20090927085203.DCDCD11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kradio4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9316

Modified Files:
	kradio4.spec 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 4.0.0-2
- Update desktop file according to F-12 FedoraStudio feature



Index: kradio4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kradio4/devel/kradio4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kradio4.spec	31 Jul 2009 01:22:41 -0000	1.1
+++ kradio4.spec	27 Sep 2009 08:52:03 -0000	1.2
@@ -2,7 +2,7 @@ Name:      kradio4
 License:   GPLv2
 Summary:   V4L/V4L2-Radio Application for KDE4
 Version:   4.0.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Url:       http://kradio.sourceforge.net/
 Group:     Applications/Multimedia
 Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -13,7 +13,7 @@ Patch0:    pulse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: cmake >= 2.6.2 
 Buildrequires: alsa-lib-devel
-Buildrequires: gettext flex doxygen graphviz dbus-devel
+Buildrequires: gettext flex doxygen graphviz dbus-devel desktop-file-utils
 Buildrequires: kdelibs-devel >= 4.2
 Buildrequires: lirc-devel 
 Buildrequires: libsndfile-devel
@@ -65,8 +65,11 @@ cp -R %{_builddir}/%{name}-%{version}/ht
 
 %find_lang %{name}.\*
 
-%check
-desktop-file-validate %{buildroot}/%{_kde4_datadir}/applications/kde4/%{name}.desktop
+desktop-file-install \
+      --add-category X-AudioVideoCapture \
+      --add-category X-Streamer \
+      --dir %{buildroot}/%{_kde4_datadir}/applications/kde4/ \
+      %{buildroot}/%{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -101,6 +104,8 @@ gtk-update-icon-cache %{_kde4_datadir}/i
 %exclude %{_kde4_datadir}/doc/%{name}
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 4.0.0-2
+- Update desktop file according to F-12 FedoraStudio feature
 
 * Mon Jun 01 2009 Paulo Roma <roma at lcg.ufrj.br> - 4.0.0-1
 - Updated to 4.0.0 final.



From jussilehtola at fedoraproject.org  Sun Sep 27 08:53:51 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Sep 2009 08:53:51 +0000 (UTC)
Subject: rpms/jmol/devel jmol.spec,1.12,1.13
Message-ID: <20090927085351.CE5B411C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10050

Modified Files:
	jmol.spec 
Log Message:
Fix location of jar files.


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/jmol.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- jmol.spec	26 Sep 2009 23:48:45 -0000	1.12
+++ jmol.spec	27 Sep 2009 08:53:51 -0000	1.13
@@ -91,9 +91,8 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-#install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
-install -D -p -m 644 build/Jmol.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
-install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
+install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
+install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_javadir}/JmolApplet.jar
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Install desktop file
@@ -110,7 +109,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc build/doc/* README.txt COPYRIGHT.txt LICENSE.txt
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_javadir}/Jmol.jar
+%{_javadir}/JmolApplet.jar
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 



From cweyl at fedoraproject.org  Sun Sep 27 09:01:19 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:01:19 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/devel .cvsignore, 1.5,
	1.6 perl-POE-Component-Client-Keepalive.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <20090927090119.1C33711C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12383

Modified Files:
	.cvsignore perl-POE-Component-Client-Keepalive.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-1
- update filtering
- auto-update to 0.260 (by cpan-spec-update 0.01)
- added a new br on perl(Net::IP) (version 1.25)
- altered br on perl(POE) (0.31 => 1.007)
- altered br on perl(POE::Component::Client::DNS) (1.01 => 1.04)
- added a new req on perl(Net::IP) (version 1.25)
- added a new req on perl(POE) (version 1.007)
- added a new req on perl(POE::Component::Client::DNS) (version 1.04)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 May 2009 07:20:42 -0000	1.5
+++ .cvsignore	27 Sep 2009 09:01:18 -0000	1.6
@@ -1 +1 @@
-POE-Component-Client-Keepalive-0.25.tar.gz
+POE-Component-Client-Keepalive-0.260.tar.gz


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-POE-Component-Client-Keepalive.spec	26 Jul 2009 13:56:51 -0000	1.11
+++ perl-POE-Component-Client-Keepalive.spec	27 Sep 2009 09:01:18 -0000	1.12
@@ -1,15 +1,12 @@
 Name:           perl-POE-Component-Client-Keepalive
-%define real_ver 0.25
-# Keep four digits to stay above the unfortunate 0.0901,
-# so that epoch need not be changed.
-Version:        %{real_ver}00
-Release:        3%{?dist}
+Version:        0.260
+Release:        1%{?dist}
 Summary:        Manages and keeps alive client connections
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/POE-Component-Client-Keepalive
-Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{real_ver}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -17,14 +14,20 @@ Requires:  perl(:MODULE_COMPAT_%(eval "`
 # core
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
-# cpan
-BuildRequires:  perl(POE) >= 0.31
-BuildRequires:  perl(POE::Component::Client::DNS) >= 1.01
+BuildRequires:  perl(POE) >= 1.007
+BuildRequires:  perl(POE::Component::Client::DNS) >= 1.04
+BuildRequires:  perl(Net::IP) >= 1.25
 
 # Satisfy automaticly generated requires that want this module >= 0.0901
-# (So the package has this provide in two versions, oh well.)
 Provides:       perl(POE::Component::Client::Keepalive) = %{version}
 
+### auto-added reqs!
+Requires:       perl(Net::IP) >= 1.25
+Requires:       perl(POE) >= 1.007
+Requires:       perl(POE::Component::Client::DNS) >= 1.04
+
+%{?perl_default_filter}
+
 %description
 POE::Component::Client::Keepalive creates and manages connections for other
 components. It maintains a cache of kept-alive connections for quick reuse. It
@@ -33,25 +36,13 @@ connections, such as HTTP clients. Using
 probably be silly.
 
 %prep
-%setup -q -n POE-Component-Client-Keepalive-%{real_ver}
-
+%setup -q -n POE-Component-Client-Keepalive-%{version}
 chmod -c -x mylib/* t/*
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(TestServer)/d'
-EOF
-
-%define __perl_provides %{_builddir}/POE-Component-Client-Keepalive-%{real_ver}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 
@@ -61,27 +52,33 @@ find %{buildroot} -type d -depth -exec r
 
 %{_fixperms} %{buildroot}/*
 
-
 %check
 # I'm leaving all tests active for now, even though 09_timeout.t runs a test
 # which is _supposed_ to timeout against google.com.  This may or may not
 # work inside the buildsys; if it doesn't the cure should be as easy as nixing
 # this one test.
-#make test
-
+make test
 
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
 %doc CHANGES README mylib/ t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-1
+- update filtering
+- auto-update to 0.260 (by cpan-spec-update 0.01)
+- added a new br on perl(Net::IP) (version 1.25)
+- altered br on perl(POE) (0.31 => 1.007)
+- altered br on perl(POE::Component::Client::DNS) (1.01 => 1.04)
+- added a new req on perl(Net::IP) (version 1.25)
+- added a new req on perl(POE) (version 1.007)
+- added a new req on perl(POE::Component::Client::DNS) (version 1.04)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2500-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 May 2009 07:20:42 -0000	1.5
+++ sources	27 Sep 2009 09:01:18 -0000	1.6
@@ -1 +1 @@
-ecc86743c52c7ca70c207583f681a071  POE-Component-Client-Keepalive-0.25.tar.gz
+4841d341b0a1e9ebcdf9ef573b388236  POE-Component-Client-Keepalive-0.260.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 09:01:29 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:01:29 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-HTTP/devel .cvsignore, 1.8,
	1.9 perl-POE-Component-Client-HTTP.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <20090927090129.9062611C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12491

Modified Files:
	.cvsignore perl-POE-Component-Client-HTTP.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.890-1
- auto-update to 0.890 (by cpan-spec-update 0.01)
- altered br on perl(POE) (0.3202 => 1.007)
- altered br on perl(POE::Component::Client::Keepalive) (0.25 => 0.26)
- added a new req on perl(HTTP::Request) (version 1.3)
- added a new req on perl(HTTP::Response) (version 1.37)
- added a new req on perl(Net::HTTP::Methods) (version 0.02)
- added a new req on perl(POE) (version 1.007)
- altered req on perl(POE::Component::Client::Keepalive) (0.0901 => 0.26)
- added a new req on perl(URI) (version 1.24)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 May 2009 05:21:22 -0000	1.8
+++ .cvsignore	27 Sep 2009 09:01:29 -0000	1.9
@@ -1 +1 @@
-POE-Component-Client-HTTP-0.88.tar.gz
+POE-Component-Client-HTTP-0.890.tar.gz


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-POE-Component-Client-HTTP.spec	26 Jul 2009 13:56:37 -0000	1.15
+++ perl-POE-Component-Client-HTTP.spec	27 Sep 2009 09:01:29 -0000	1.16
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.88
-Release:        2%{?dist}
+Version:        0.890
+Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -23,11 +23,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  sed
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(POE) >= 0.3202
+BuildRequires:  perl(POE) >= 1.007
 BuildRequires:  perl(HTTP::Request) >= 1.3
 BuildRequires:  perl(HTTP::Response) >= 1.37
 BuildRequires:  perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.25
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.26
 
 # tests...
 BuildRequires:  perl(Test::Pod)
@@ -37,7 +37,7 @@ BuildRequires:  perl(Test::More)
 # use base...
 Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
 # use POE qw{ ... }
-Requires:       perl(POE::Component::Client::Keepalive) >= 0.0901
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.26
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,6 +45,15 @@ Requires:  perl(:MODULE_COMPAT_%(eval "`
 BuildRequires:  perl(Test::POE::Server::TCP)
 BuildRequires:  perl(Net::HTTP::Methods) >= 0.02
 
+### auto-added reqs!
+Requires:       perl(HTTP::Request) >= 1.3
+Requires:       perl(HTTP::Response) >= 1.37
+Requires:       perl(Net::HTTP::Methods) >= 0.02
+Requires:       perl(POE) >= 1.007
+Requires:       perl(URI) >= 1.24
+
+%{?perl_default_filter}
+
 %description
 POE::Component::Client::HTTP is an HTTP user-agent for POE. It lets other
 sessions run while HTTP transactions are being processed, and it lets several
@@ -94,6 +103,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.890-1
+- auto-update to 0.890 (by cpan-spec-update 0.01)
+- altered br on perl(POE) (0.3202 => 1.007)
+- altered br on perl(POE::Component::Client::Keepalive) (0.25 => 0.26)
+- added a new req on perl(HTTP::Request) (version 1.3)
+- added a new req on perl(HTTP::Response) (version 1.37)
+- added a new req on perl(Net::HTTP::Methods) (version 0.02)
+- added a new req on perl(POE) (version 1.007)
+- altered req on perl(POE::Component::Client::Keepalive) (0.0901 => 0.26)
+- added a new req on perl(URI) (version 1.24)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.88-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 May 2009 05:21:22 -0000	1.8
+++ sources	27 Sep 2009 09:01:29 -0000	1.9
@@ -1 +1 @@
-27b4988e1749054838ce7672e217c1d0  POE-Component-Client-HTTP-0.88.tar.gz
+88508c5d66be9a7a56ed576ea17e661d  POE-Component-Client-HTTP-0.890.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 09:04:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:04:00 +0000 (UTC)
Subject: rpms/perl-POE-Component-IRC/devel .cvsignore, 1.19,
	1.20 perl-POE-Component-IRC.spec, 1.23, 1.24 sources, 1.19, 1.20
Message-ID: <20090927090400.24C1711C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13122

Modified Files:
	.cvsignore perl-POE-Component-IRC.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 6.14-1
- auto-update to 6.14 (by cpan-spec-update 0.01)
- altered br on perl(POE::Component::Pluggable) (1.12 => 1.24)
- altered req on perl(POE::Component::Pluggable) (1.12 => 1.24)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	21 May 2009 05:25:51 -0000	1.19
+++ .cvsignore	27 Sep 2009 09:03:59 -0000	1.20
@@ -1 +1 @@
-POE-Component-IRC-6.06.tar.gz
+POE-Component-IRC-6.14.tar.gz


Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-POE-Component-IRC.spec	26 Jul 2009 13:57:48 -0000	1.23
+++ perl-POE-Component-IRC.spec	27 Sep 2009 09:03:59 -0000	1.24
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        6.06
-Release:        2%{?dist}
+Version:        6.14
+Release:        1%{?dist}
 Summary:        A POE component for building IRC clients
 
 Group:          Development/Libraries
@@ -22,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(POE) >= 0.3202
 BuildRequires:  perl(POE::Component::Client::DNS)
 BuildRequires:  perl(POE::Filter::IRCD) >= 1.7
@@ -35,14 +35,11 @@ BuildRequires:  perl(Test::Pod::Coverage
 BuildRequires:  perl(Socket6)
 BuildRequires:  perl(POE::Component::Client::DNS)
 
-# optional test -- perl(Test::Kwalitee) not yet packaged in Fedora
-#BuildRequires: perl(Test::Kwalitee)
-
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ### auto-added brs!
 BuildRequires:  perl(Encode)
-BuildRequires:  perl(POE::Component::Pluggable) >= 1.12
+BuildRequires:  perl(POE::Component::Pluggable) >= 1.24
 BuildRequires:  perl(POE::Filter::Stream)
 BuildRequires:  perl(POE::Filter::Stackable)
 BuildRequires:  perl(POE::Wheel::ReadWrite)
@@ -51,6 +48,21 @@ BuildRequires:  perl(POE::Driver::SysRW)
 BuildRequires:  perl(POE::Filter::Line)
 BuildRequires:  perl(Encode::Guess)
 
+### auto-added reqs!
+Requires:       perl(Encode)
+Requires:       perl(Encode::Guess)
+Requires:       perl(POE) >= 0.3202
+Requires:       perl(POE::Component::Pluggable) >= 1.24
+Requires:       perl(POE::Driver::SysRW)
+Requires:       perl(POE::Filter::IRCD) >= 1.7
+Requires:       perl(POE::Filter::Line)
+Requires:       perl(POE::Filter::Stackable)
+Requires:       perl(POE::Filter::Stream)
+Requires:       perl(POE::Wheel::ReadWrite)
+Requires:       perl(POE::Wheel::SocketFactory)
+
+%{?perl_default_filter}
+
 %description
 POE::Component::IRC is a POE component (who'd have guessed?) which acts as an
 easily controllable IRC client for your other POE components and sessions. You
@@ -102,6 +114,26 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 6.14-1
+- auto-update to 6.14 (by cpan-spec-update 0.01)
+- altered br on perl(POE::Component::Pluggable) (1.12 => 1.24)
+- altered req on perl(POE::Component::Pluggable) (1.12 => 1.24)
+
+* Wed Aug 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 6.10-1
+- auto-update to 6.10 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(Encode) (version 0)
+- added a new req on perl(Encode::Guess) (version 0)
+- added a new req on perl(POE) (version 0.3202)
+- added a new req on perl(POE::Component::Pluggable) (version 1.12)
+- added a new req on perl(POE::Driver::SysRW) (version 0)
+- added a new req on perl(POE::Filter::IRCD) (version 1.7)
+- added a new req on perl(POE::Filter::Line) (version 0)
+- added a new req on perl(POE::Filter::Stackable) (version 0)
+- added a new req on perl(POE::Filter::Stream) (version 0)
+- added a new req on perl(POE::Wheel::ReadWrite) (version 0)
+- added a new req on perl(POE::Wheel::SocketFactory) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	21 May 2009 05:25:51 -0000	1.19
+++ sources	27 Sep 2009 09:03:59 -0000	1.20
@@ -1 +1 @@
-4b7b551b93adc67cf6ec9fbaee51880f  POE-Component-IRC-6.06.tar.gz
+d29749cee479d0a60fe2ec694262a29b  POE-Component-IRC-6.14.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 09:06:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:06:03 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-SimpleHTTP/devel .cvsignore, 1.6,
	1.7 perl-POE-Component-Server-SimpleHTTP.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090927090603.64D7C11C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13755

Modified Files:
	.cvsignore perl-POE-Component-Server-SimpleHTTP.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
- auto-update to 2.0 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new br on perl(Moose) (version 0.81)
- added a new br on perl(MooseX::AttributeHelpers) (version 0)
- added a new br on perl(MooseX::POE) (version 0.205)
- added a new req on perl(Moose) (version 0.81)
- added a new req on perl(MooseX::AttributeHelpers) (version 0)
- added a new req on perl(MooseX::POE) (version 0.205)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Jun 2009 07:25:42 -0000	1.6
+++ .cvsignore	27 Sep 2009 09:06:03 -0000	1.7
@@ -1 +1 @@
-POE-Component-Server-SimpleHTTP-1.58.tar.gz
+POE-Component-Server-SimpleHTTP-2.0.tar.gz


Index: perl-POE-Component-Server-SimpleHTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel/perl-POE-Component-Server-SimpleHTTP.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-POE-Component-Server-SimpleHTTP.spec	26 Aug 2009 00:50:54 -0000	1.13
+++ perl-POE-Component-Server-SimpleHTTP.spec	27 Sep 2009 09:06:03 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SimpleHTTP
-Version:        1.58
-Release:        2%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Serve HTTP requests in POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,7 +12,7 @@ BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(HTTP::Date)
 BuildRequires:  perl(HTTP::Request)
 BuildRequires:  perl(HTTP::Response)
@@ -23,21 +23,17 @@ BuildRequires:  perl(POE::Driver::SysRW)
 BuildRequires:  perl(POE::Filter::HTTPD)
 BuildRequires:  perl(POE::Wheel::ReadWrite)
 BuildRequires:  perl(POE::Wheel::SocketFactory)
-
 # tests
 BuildRequires:  perl(Test::More) >= 0.47
 BuildRequires:  perl(POE::Component::Client::HTTP)
-
 # optional tests
 BuildRequires:  perl(Test::Pod)
 #BuildRequires:  perl(Test::Pod::Coverage)
 #BuildRequires:  perl(Test::Kwalitee)
 
-# missed due to a use base construct
-Requires:       perl(HTTP::Response)
-
-
-### auto-added brs!
+BuildRequires:  perl(Moose) >= 0.81
+BuildRequires:  perl(MooseX::AttributeHelpers)
+BuildRequires:  perl(MooseX::POE) >= 0.205
 BuildRequires:  perl(Storable)
 BuildRequires:  perl(Sys::Hostname)
 BuildRequires:  perl(POE::Filter::HTTP::Parser) >= 0.02
@@ -45,10 +41,13 @@ BuildRequires:  perl(Socket)
 BuildRequires:  perl(Test::POE::Client::TCP) >= 0.1
 BuildRequires:  perl(Carp)
 
-### auto-added reqs!
+Requires:       perl(Moose) >= 0.81
+Requires:       perl(MooseX::AttributeHelpers)
+Requires:       perl(MooseX::POE) >= 0.205
 Requires:       perl(Carp)
 Requires:       perl(HTTP::Date)
 Requires:       perl(HTTP::Request)
+Requires:       perl(HTTP::Response)
 Requires:       perl(POE) >= 1.0000
 Requires:       perl(Socket)
 Requires:       perl(Storable)
@@ -62,8 +61,6 @@ This module makes serving up HTTP reques
 
 %prep
 %setup -q -n POE-Component-Server-SimpleHTTP-%{version}
-
-# dos encoding, eww
 sed -i 's/\r//' examples/*
 
 %build
@@ -95,6 +92,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
+- auto-update to 2.0 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new br on perl(Moose) (version 0.81)
+- added a new br on perl(MooseX::AttributeHelpers) (version 0)
+- added a new br on perl(MooseX::POE) (version 0.205)
+- added a new req on perl(Moose) (version 0.81)
+- added a new req on perl(MooseX::AttributeHelpers) (version 0)
+- added a new req on perl(MooseX::POE) (version 0.205)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.58-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Jun 2009 07:25:43 -0000	1.6
+++ sources	27 Sep 2009 09:06:03 -0000	1.7
@@ -1 +1 @@
-9c252b837cf11fb1ae23bcc052deba9e  POE-Component-Server-SimpleHTTP-1.58.tar.gz
+8c711a208427e6d556aa7e082858f455  POE-Component-Server-SimpleHTTP-2.0.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 09:12:53 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:12:53 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/devel .cvsignore, 1.7,
	1.8 perl-Git-CPAN-Patch.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090927091253.0E81511C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16725

Modified Files:
	.cvsignore perl-Git-CPAN-Patch.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.1-1
- auto-update to 0.2.1 (by cpan-spec-update 0.01)
- altered br on perl(CPANPLUS) (0 => 0.84)
- added a new br on perl(File::chdir) (version 0)
- altered req on perl(CPANPLUS) (0 => 0.84)
- added a new req on perl(File::chdir) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Aug 2009 07:52:02 -0000	1.7
+++ .cvsignore	27 Sep 2009 09:12:52 -0000	1.8
@@ -1 +1 @@
-Git-CPAN-Patch-0.2.0.tar.gz
+Git-CPAN-Patch-0.2.1.tar.gz


Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Git-CPAN-Patch.spec	18 Aug 2009 21:25:56 -0000	1.7
+++ perl-Git-CPAN-Patch.spec	27 Sep 2009 09:12:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.2.0
-Release:        2%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,7 +11,7 @@ BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(autodie)
-BuildRequires:  perl(CPANPLUS)
+BuildRequires:  perl(CPANPLUS) >= 0.84
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Parse::BACKPAN::Packages)
 BuildRequires:  perl(Pod::Usage)
@@ -20,8 +20,9 @@ BuildRequires:  perl(Test::More)
 # for install paths
 BuildRequires:  git
 
-### auto-added reqs!
-Requires:       perl(CPANPLUS)
+Requires:       perl(File::chdir)
+
+Requires:       perl(CPANPLUS) >= 0.84
 Requires:       perl(Module::Build)
 Requires:       perl(Parse::BACKPAN::Packages)
 Requires:       perl(Pod::Usage)
@@ -29,6 +30,11 @@ Requires:       perl(autodie)
 
 Requires:       git-cpan-patch = %{version}-%{release}
 
+### auto-added brs!
+BuildRequires:  perl(File::chdir)
+
+%{?perl_default_filter}
+
 %description
 Git::CPAN::Patch provides a suite of git commands aimed at making trivially
 easy the process of grabbing any distribution off CPAN, stuffing it in a
@@ -87,6 +93,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.1-1
+- auto-update to 0.2.1 (by cpan-spec-update 0.01)
+- altered br on perl(CPANPLUS) (0 => 0.84)
+- added a new br on perl(File::chdir) (version 0)
+- altered req on perl(CPANPLUS) (0 => 0.84)
+- added a new req on perl(File::chdir) (version 0)
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-2
 - add a BR on git, for command paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 07:52:02 -0000	1.7
+++ sources	27 Sep 2009 09:12:52 -0000	1.8
@@ -1 +1 @@
-058d90fcde4516d8ed7b1def3fad0610  Git-CPAN-Patch-0.2.0.tar.gz
+155809b8ae498481e2b70cbf85186d4d  Git-CPAN-Patch-0.2.1.tar.gz



From oget at fedoraproject.org  Sun Sep 27 09:18:40 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 09:18:40 +0000 (UTC)
Subject: rpms/multimedia-menus/devel .cvsignore, 1.3,
	1.4 multimedia-menus.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090927091840.85D7C11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19455

Modified Files:
	.cvsignore multimedia-menus.spec sources 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.1-1
- Version bump with new translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Sep 2009 04:53:26 -0000	1.3
+++ .cvsignore	27 Sep 2009 09:18:40 -0000	1.4
@@ -1 +1 @@
-multimedia-menus-0.3.tar.gz
+multimedia-menus-0.3.1.tar.gz


Index: multimedia-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/multimedia-menus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- multimedia-menus.spec	15 Sep 2009 05:01:56 -0000	1.3
+++ multimedia-menus.spec	27 Sep 2009 09:18:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           multimedia-menus
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        Categorization for the GNOME/KDE Sound&Video/Multimedia menu
 Group:          User Interface/Desktops
 # Licensing of individual parts is explained in licensing.txt file
@@ -62,6 +62,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.1-1
+- Version bump with new translations
+
 * Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-2
 - Add missing BR: intltool
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Sep 2009 04:53:27 -0000	1.3
+++ sources	27 Sep 2009 09:18:40 -0000	1.4
@@ -1 +1 @@
-b4d4f92d6ecc960b0cc0df3633d1da9c  multimedia-menus-0.3.tar.gz
+a074feb4fb73882e795f6720fed84c9c  multimedia-menus-0.3.1.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 09:19:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:19:08 +0000 (UTC)
Subject: rpms/perl-DBIx-Class/devel .cvsignore, 1.7, 1.8 perl-DBIx-Class.spec,
	1.18, 1.19 sources, 1.7, 1.8
Message-ID: <20090927091908.85EC011C00E6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19693

Modified Files:
	.cvsignore perl-DBIx-Class.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08112-1
- auto-update to 0.08112 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Sep 2009 06:05:47 -0000	1.7
+++ .cvsignore	27 Sep 2009 09:19:08 -0000	1.8
@@ -1 +1 @@
-DBIx-Class-0.08111.tar.gz
+DBIx-Class-0.08112.tar.gz


Index: perl-DBIx-Class.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/devel/perl-DBIx-Class.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-DBIx-Class.spec	11 Sep 2009 06:05:47 -0000	1.18
+++ perl-DBIx-Class.spec	27 Sep 2009 09:19:08 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-Class
-Version:        0.08111
+Version:        0.08112
 Release:        1%{?dist}
 Summary:        Extensible and flexible object <-> relational mapper
 License:        GPL+ or Artistic
@@ -159,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08112-1
+- auto-update to 0.08112 (by cpan-spec-update 0.01)
+
 * Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08111-1
 - update filtering
 - auto-update to 0.08111 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Sep 2009 06:05:47 -0000	1.7
+++ sources	27 Sep 2009 09:19:08 -0000	1.8
@@ -1 +1 @@
-cdca0d2d974d9c583a266375ee4ab941  DBIx-Class-0.08111.tar.gz
+bf4f4dd040c5f994606c33ee5fcdc9f6  DBIx-Class-0.08112.tar.gz



From oget at fedoraproject.org  Sun Sep 27 09:19:45 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 27 Sep 2009 09:19:45 +0000 (UTC)
Subject: rpms/multimedia-menus/F-11 .cvsignore, 1.3,
	1.4 multimedia-menus.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090927091945.280C211C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19932

Modified Files:
	.cvsignore multimedia-menus.spec sources 
Log Message:
* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.1-1
- Version bump with new translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Sep 2009 04:55:26 -0000	1.3
+++ .cvsignore	27 Sep 2009 09:19:45 -0000	1.4
@@ -1 +1 @@
-multimedia-menus-0.3.tar.gz
+multimedia-menus-0.3.1.tar.gz


Index: multimedia-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/multimedia-menus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- multimedia-menus.spec	15 Sep 2009 05:03:24 -0000	1.3
+++ multimedia-menus.spec	27 Sep 2009 09:19:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           multimedia-menus
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        Categorization for the GNOME/KDE Sound&Video/Multimedia menu
 Group:          User Interface/Desktops
 # Licensing of individual parts is explained in licensing.txt file
@@ -62,6 +62,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.1-1
+- Version bump with new translations
+
 * Tue Sep 15 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3-2
 - Add missing BR: intltool
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Sep 2009 04:55:26 -0000	1.3
+++ sources	27 Sep 2009 09:19:45 -0000	1.4
@@ -1 +1 @@
-b4d4f92d6ecc960b0cc0df3633d1da9c  multimedia-menus-0.3.tar.gz
+a074feb4fb73882e795f6720fed84c9c  multimedia-menus-0.3.1.tar.gz



From cweyl at fedoraproject.org  Sun Sep 27 09:20:19 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 27 Sep 2009 09:20:19 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/F-11 perl-Git-CPAN-Patch.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090927092019.99CCF11C0419@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20175

Modified Files:
	perl-Git-CPAN-Patch.spec sources 
Log Message:
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.1-1
- auto-update to 0.2.1 (by cpan-spec-update 0.01)
- altered br on perl(CPANPLUS) (0 => 0.84)
- added a new br on perl(File::chdir) (version 0)
- altered req on perl(CPANPLUS) (0 => 0.84)
- added a new req on perl(File::chdir) (version 0)



Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-11/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Git-CPAN-Patch.spec	18 Aug 2009 21:37:30 -0000	1.5
+++ perl-Git-CPAN-Patch.spec	27 Sep 2009 09:20:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.2.0
-Release:        2%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,7 +11,7 @@ BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(autodie)
-BuildRequires:  perl(CPANPLUS)
+BuildRequires:  perl(CPANPLUS) >= 0.84
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Parse::BACKPAN::Packages)
 BuildRequires:  perl(Pod::Usage)
@@ -20,8 +20,9 @@ BuildRequires:  perl(Test::More)
 # for install paths
 BuildRequires:  git
 
-### auto-added reqs!
-Requires:       perl(CPANPLUS)
+Requires:       perl(File::chdir)
+
+Requires:       perl(CPANPLUS) >= 0.84
 Requires:       perl(Module::Build)
 Requires:       perl(Parse::BACKPAN::Packages)
 Requires:       perl(Pod::Usage)
@@ -29,6 +30,11 @@ Requires:       perl(autodie)
 
 Requires:       git-cpan-patch = %{version}-%{release}
 
+### auto-added brs!
+BuildRequires:  perl(File::chdir)
+
+%{?perl_default_filter}
+
 %description
 Git::CPAN::Patch provides a suite of git commands aimed at making trivially
 easy the process of grabbing any distribution off CPAN, stuffing it in a
@@ -87,6 +93,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.1-1
+- auto-update to 0.2.1 (by cpan-spec-update 0.01)
+- altered br on perl(CPANPLUS) (0 => 0.84)
+- added a new br on perl(File::chdir) (version 0)
+- altered req on perl(CPANPLUS) (0 => 0.84)
+- added a new req on perl(File::chdir) (version 0)
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-2
 - add a BR on git, for command paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Aug 2009 21:37:30 -0000	1.6
+++ sources	27 Sep 2009 09:20:19 -0000	1.7
@@ -1 +1 @@
-058d90fcde4516d8ed7b1def3fad0610  Git-CPAN-Patch-0.2.0.tar.gz
+155809b8ae498481e2b70cbf85186d4d  Git-CPAN-Patch-0.2.1.tar.gz



From mtasaka at fedoraproject.org  Sun Sep 27 09:41:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 09:41:21 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch, NONE,
	1.1 ruby-gnome2.spec, 1.48, 1.49
Message-ID: <20090927094121.A800E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25211

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
- Fix crash when moving cursor on fantasdic 1.0 beta 7
  (ruby-gnome2-Bugs-2865895)


ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch:
 rbgdkwindow.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch ---
Index: gtk/src/rbgdkwindow.c
===================================================================
--- gtk/src/rbgdkwindow.c	(revision 3712)
+++ gtk/src/rbgdkwindow.c	(revision 3713)
@@ -1093,8 +1093,11 @@
 void
 Init_gtk_gdk_window()
 {
+    GObjectClass *g_class;
     VALUE gdkWindow = G_DEF_CLASS(GDK_TYPE_WINDOW, "Window", mGdk);
 
+    g_class = g_type_class_peek(GDK_TYPE_WINDOW);
+
     rb_define_method(gdkWindow, "initialize", gdkwin_initialize, 3);
     rb_define_method(gdkWindow, "destroy", gdkwin_destroy, 0);
     rb_define_method(gdkWindow, "window_type", gdkwin_get_window_type, 0);
@@ -1178,6 +1181,10 @@
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
+    if (g_object_class_find_property(g_class, "cursor")) {
+        rb_undef_method(gdkWindow, "cursor");
+        rb_undef_method(gdkWindow, "cursor=");
+    }
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ruby-gnome2.spec	26 Sep 2009 12:52:59 -0000	1.48
+++ ruby-gnome2.spec	27 Sep 2009 09:41:21 -0000	1.49
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -31,7 +31,13 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 #Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
+# Fix shebang on sample files
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
+# Patch from upstream
+# Fix crash when moving curson on fantasdic 1.0 beta 7 
+# (ruby-gnome2-Bugs-2865895)
+Patch10:        ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -765,6 +771,7 @@ This package provides libraries and head
 %setup -q -n %{name}-all-%{version}
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
+%patch10 -p0
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -1090,6 +1097,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
+- Fix crash when moving cursor on fantasdic 1.0 beta 7
+  (ruby-gnome2-Bugs-2865895)
+
 * Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
 - Update to 0.19.3
 - Released source does not support gio yet



From mtasaka at fedoraproject.org  Sun Sep 27 09:43:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 09:43:13 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch, NONE,
	1.1 ruby-gnome2.spec, 1.51, 1.52
Message-ID: <20090927094313.B7B7011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25744

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
- Fix crash when moving cursor on fantasdic 1.0 beta 7
  (ruby-gnome2-Bugs-2865895)


ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch:
 rbgdkwindow.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch ---
Index: gtk/src/rbgdkwindow.c
===================================================================
--- gtk/src/rbgdkwindow.c	(revision 3712)
+++ gtk/src/rbgdkwindow.c	(revision 3713)
@@ -1093,8 +1093,11 @@
 void
 Init_gtk_gdk_window()
 {
+    GObjectClass *g_class;
     VALUE gdkWindow = G_DEF_CLASS(GDK_TYPE_WINDOW, "Window", mGdk);
 
+    g_class = g_type_class_peek(GDK_TYPE_WINDOW);
+
     rb_define_method(gdkWindow, "initialize", gdkwin_initialize, 3);
     rb_define_method(gdkWindow, "destroy", gdkwin_destroy, 0);
     rb_define_method(gdkWindow, "window_type", gdkwin_get_window_type, 0);
@@ -1178,6 +1181,10 @@
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
+    if (g_object_class_find_property(g_class, "cursor")) {
+        rb_undef_method(gdkWindow, "cursor");
+        rb_undef_method(gdkWindow, "cursor=");
+    }
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ruby-gnome2.spec	26 Sep 2009 13:35:11 -0000	1.51
+++ ruby-gnome2.spec	27 Sep 2009 09:43:13 -0000	1.52
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -31,7 +31,13 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 #Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
+# Fix shebang on sample files
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
+# Patch from upstream
+# Fix crash when moving curson on fantasdic 1.0 beta 7 
+# (ruby-gnome2-Bugs-2865895)
+Patch10:        ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -765,6 +771,7 @@ This package provides libraries and head
 %setup -q -n %{name}-all-%{version}
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
+%patch10 -p0
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -1090,6 +1097,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
+- Fix crash when moving cursor on fantasdic 1.0 beta 7
+  (ruby-gnome2-Bugs-2865895)
+
 * Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
 - Update to 0.19.3
 - Released source does not support gio yet



From pkgdb at fedoraproject.org  Sun Sep 27 10:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 10:19:39 +0000
Subject: [pkgdb] youtube-dl ownership updated
Message-ID: <20090927101939.8B14D10F85F@bastion2.fedora.phx.redhat.com>

Package youtube-dl in Fedora devel is now owned by rafalzaq

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Sun Sep 27 10:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 10:19:51 +0000
Subject: [pkgdb] youtube-dl ownership updated
Message-ID: <20090927101951.2AB7F10F85F@bastion2.fedora.phx.redhat.com>

Package youtube-dl in Fedora 10 is now owned by rafalzaq

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From pkgdb at fedoraproject.org  Sun Sep 27 10:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 10:19:58 +0000
Subject: [pkgdb] youtube-dl ownership updated
Message-ID: <20090927101958.4A57810F86A@bastion2.fedora.phx.redhat.com>

Package youtube-dl in Fedora 11 is now owned by rafalzaq

To make changes to this package see:
  /pkgdb/packages/name/youtube-dl



From chkr at fedoraproject.org  Sun Sep 27 10:55:05 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 27 Sep 2009 10:55:05 +0000 (UTC)
Subject: rpms/f-spot/F-10 0001-fix-parallel-build.patch, NONE,
	1.1 facebook-exporter-duplicate-label-fix.patch, NONE,
	1.1 0001-use-system-Mono.Addins-if-available.patch, 1.1,
	1.2 f-spot.spec, 1.85, 1.86
Message-ID: <20090927105505.AC28C11C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16656

Modified Files:
	0001-use-system-Mono.Addins-if-available.patch f-spot.spec 
Added Files:
	0001-fix-parallel-build.patch 
	facebook-exporter-duplicate-label-fix.patch 
Log Message:
* Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
- Add upstream patches (
  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
  to fix crash in facebook exporter (BZ 524860)
- Update to 0.6.1.2
- Move the screensaver plugin into a sub-package (BZ 519640)
- Let f-spot-screensaver obsolete older f-spot version so that it
  is pulled in during update (fresh installations of f-spot will not
  pull in gnome-screensaver)
- Remove upstreamed patches
- Updated use-system-Mono.Addins-if-available patch
- Add a patch to enable parallel build 


0001-fix-parallel-build.patch:
 extensions/Exporters/FlickrExport/Makefile.am    |    3 ---
 extensions/Exporters/PicasaWebExport/Makefile.am |    3 ---
 extensions/Exporters/SmugMugExport/Makefile.am   |    4 ----
 extensions/Exporters/TabbloExport/Makefile.am    |    3 ---
 src/Makefile.am                                  |    5 ++---
 5 files changed, 2 insertions(+), 16 deletions(-)

--- NEW FILE 0001-fix-parallel-build.patch ---
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 812904c..6457ffd 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -34,13 +34,10 @@ RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 45e3bac..b617fc8 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -35,13 +35,10 @@ RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 397461f..f96d603 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -34,14 +34,10 @@ RESOURCES =				\
 SUBDIRS =                      \
 	SmugMugNet
 
-
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b7465d6..915a95f 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -44,13 +44,10 @@ RESOURCES = \
 	-resource:$(srcdir)/$(PLUGIN_NAME).glade \
 	-resource:$(srcdir)/TrustError.glade
 
-all: $(PLUGIN_ASSEMBLY)
-
 mpack: $(PLUGIN_ASSEMBLY)
 	mautil p $(PLUGIN_ASSEMBLY)
 
 $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(MAKE) -C $(SUBDIRS)
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 plugindir = $(pkglibdir)/extensions
diff --git a/src/Makefile.am b/src/Makefile.am
index 02add7d..ba9bcaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -509,13 +509,13 @@ FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
 
 FSpot.Bling.dll.mdb: FSpot.Bling.dll
 
-FSpot.Bling.dll: $(BLING_CSFILES)
+FSpot.Bling.dll: $(BLING_CSFILES) FSpot.Utils.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(BLING_CSFILES) $(BLING_ASSEMBLIES)
 
 FSpot.Widgets.dll.mdb: FSpot.Widgets.dll
 
-FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
+FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll Cms.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
 
-- 
1.6.0.6


facebook-exporter-duplicate-label-fix.patch:
 FacebookExport.addin.xml |    2 +-
 FacebookExport.ui        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE facebook-exporter-duplicate-label-fix.patch ---
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
index 1146e7d..e660246 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+++ b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
@@ -1,6 +1,6 @@
 <Addin 	namespace="FSpot"
 	id="FacebookExport"
-	version="0.6.0.5"
+	version="0.6.0.6"
 	name="FacebookExport"
 	description="Export pictures to facebook"
 	author="George Talusan, Jim Ramsay, Stephane Delcroix"
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.ui b/extensions/Exporters/FacebookExport/FacebookExport.ui
index 382ba45..ec413ae 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.ui
+++ b/extensions/Exporters/FacebookExport/FacebookExport.ui
@@ -76,7 +76,7 @@
                   <object class="GtkHBox" id="permissions_hbox">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="label_permissions">
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
                         <property name="xpad">2</property>

0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

Index: 0001-use-system-Mono.Addins-if-available.patch
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/0001-use-system-Mono.Addins-if-available.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-use-system-Mono.Addins-if-available.patch	9 Aug 2009 17:49:05 -0000	1.1
+++ 0001-use-system-Mono.Addins-if-available.patch	27 Sep 2009 10:55:03 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/Makefile.include b/Makefile.include
-index efd6d72..4be9a8b 100644
+index ca739b8..43e748f 100644
 --- a/Makefile.include
 +++ b/Makefile.include
 @@ -3,9 +3,6 @@
@@ -12,7 +12,7 @@ index efd6d72..4be9a8b 100644
  DIR_DOCS = $(top_builddir)/docs
  DIR_EXTENSIONS = $(top_builddir)/extensions
  DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+@@ -24,10 +21,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
  LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
@@ -21,10 +21,10 @@ index efd6d72..4be9a8b 100644
 -	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
 -	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = 								\
- 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+ LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
 diff --git a/configure.ac b/configure.ac
-index e31bd27..1acaaa6 100644
+index fe0bdc9..237e6bd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
@@ -35,9 +35,9 @@ index e31bd27..1acaaa6 100644
  MONO_CAIRO_REQUIRED=1.2.4
  dnl -- this check is 	
  LCMS_REQUIRED=1.12
-@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
- 
- AC_SUBST(CSC_DEFINES)
+@@ -146,6 +147,33 @@ AC_SUBST(DIR_DBUS_GLIB)
+ AC_SUBST(LINK_DBUS)
+ AC_SUBST(PATH_DBUS)
  
 +dnl -- mono-addins link or bundle ?
 +PKG_CHECK_MODULES(MONO_ADDINS, 
@@ -66,11 +66,11 @@ index e31bd27..1acaaa6 100644
 +AC_SUBST(DIR_ADDINS_GUI)
 +AC_SUBST(LINK_MONO_ADDINS)
 +
- dnl -- dbus-sharp: link or bundle ?
- PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
- [
+ dnl -- nunit
+ PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED, 
+ 	do_tests="yes", do_tests="no")
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c6d69f9..d0b9a6c 100644
+index f2adf82..ea888d8 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
@@ -78,21 +78,21 @@ index c6d69f9..d0b9a6c 100644
  	libfspot			\
  	libgphoto2-sharp	\
 -	mono-addins			\
- 	semweb				\
- 	Tao
+ 	semweb
  
-@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
+ # Depending on whether the packaged ndesk-dbus is used, we might not want to
+@@ -20,11 +19,13 @@ UNCONDITIONAL_SUBDIRS = \
  SUBDIRS = 				\
  	$(DIR_DBUS)			\
  	$(DIR_DBUS_GLIB)	\
-+	$(DIR_ADDINS)	\
++	$(DIR_ADDINS)			\
  	$(UNCONDITIONAL_SUBDIRS)
  
  DIST_SUBDIRS = 			\
  	dbus-sharp			\
  	dbus-sharp-glib		\
-+	mono-addins		\
  	dpap-sharp			\
++	mono-addins			\
  	$(UNCONDITIONAL_SUBDIRS)
  
 -- 


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- f-spot.spec	15 Sep 2009 19:54:19 -0000	1.85
+++ f-spot.spec	27 Sep 2009 10:55:03 -0000	1.86
@@ -1,23 +1,26 @@
 Name:           f-spot
-Version:        0.6.0.0
-Release:        1%{?dist}.1
+Version:        0.6.1.2
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=591223
-Patch1:         0001-use-the-correct-stock-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593243
+Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
 # I'm told this is fixed in SVN
 Patch4:         f-spot-0.6.0.0-gtk-deprecated.patch
-# Patch for gtk+-2.14 compatibility already applied upstream (f-spot > 0.6.1.1)
-Patch5:         0001-gtk-version.patch
+# upstream patch to fix crash in facebook exporter:
+# commit 807dab4344ecdadc7e46793369821de8b49692e5
+# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+Patch5:         facebook-exporter-duplicate-label-fix.patch        
+
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +37,6 @@ BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  mono-addins-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme 
-Requires:       gnome-screensaver
 Requires:       yelp
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
@@ -56,21 +58,31 @@ F-Spot is an application designed to pro
 to the GNOME desktop. Features include import, export, printing and advanced
 sorting and tagging of digital images. 
 
+%package screensaver
+Summary: F-Spot gnome-screensaver plugin
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-screensaver
+Obsoletes: f-spot < 0.6.1.1
+
+%description screensaver
+F-Spot provides a plugin for gnome-screensaver which displays parts of the
+photo collection in a slideshow as a screensaver.
+
 %prep
 %setup -q
 
-%patch1 -p1 -b .missing-icon
+%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
-%patch5 -p1 -b .gtk-api-version
+%patch5 -p1 -b .faceboox-exporter-crash
 
 %build
 autoreconf -f -i
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-scrollkeeper
-# parallel build broken in 0.6.0.0, try again with next release
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -116,15 +128,42 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/f-spot/
-%{_libdir}/f-spot/
+%dir %{_libdir}/f-spot/
+%{_libdir}/f-spot/*.dll
+%{_libdir}/f-spot/*.exe
+%{_libdir}/f-spot/*.addins
+%{_libdir}/f-spot/*.config
+%{_libdir}/f-spot/*.mdb
+%{_libdir}/f-spot/*.so
+%{_libdir}/f-spot/*.so.*
+%exclude %{_libdir}/f-spot/extensions/ScreensaverConfig.dll
+%{_libdir}/f-spot/extensions/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
+%{_datadir}/omf/f-spot/
+
+%files screensaver
+%defattr(-,root,root,-)
+%{_libdir}/f-spot/extensions/ScreensaverConfig.dll
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot/
 
 %changelog
+* Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
+- Add upstream patches (
+  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
+  to fix crash in facebook exporter (BZ 524860)
+- Update to 0.6.1.2
+- Move the screensaver plugin into a sub-package (BZ 519640)
+- Let f-spot-screensaver obsolete older f-spot version so that it
+  is pulled in during update (fresh installations of f-spot will not
+  pull in gnome-screensaver)
+- Remove upstreamed patches
+- Updated use-system-Mono.Addins-if-available patch
+- Add a patch to enable parallel build 
+
 * Tue Sep 15 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1.1
 - Fix crash due to incorrect GTK+ version (BZ #523236)
 



From kkofler at fedoraproject.org  Sun Sep 27 11:17:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 27 Sep 2009 11:17:13 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE,
	1.1 kdebase-workspace.spec, 1.298, 1.299
Message-ID: <20090927111713.8E9CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24073/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
- support "Leave..." which brings up complete shutdown dialog in classic menu

kdebase-workspace-4.3.0-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    4 ++++
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-08-25 23:56:08.000000000 +0200
@@ -160,6 +160,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-08-25 23:44:22.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-08-25 23:40:02.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- kdebase-workspace.spec	25 Sep 2009 14:11:37 -0000	1.298
+++ kdebase-workspace.spec	27 Sep 2009 11:17:13 -0000	1.299
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -31,6 +31,10 @@ Patch14: kdebase-workspace-4.2.0-klipper
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
 # show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
 Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
+# allow adding a "Leave..." button which brings up the complete shutdown dialog
+# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
+# default Leave submenu
+Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -263,6 +267,7 @@ Requires: akonadi
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
+%patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
 %patch100 -p5 -b .plasmaCrash
@@ -600,6 +605,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- support "Leave..." which brings up complete shutdown dialog in classic menu
+
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
 - don't include googlegadgets on RHEL
 



From chkr at fedoraproject.org  Sun Sep 27 11:32:23 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 27 Sep 2009 11:32:23 +0000 (UTC)
Subject: rpms/f-spot/F-10 .cvsignore,1.21,1.22 sources,1.21,1.22
Message-ID: <20090927113223.D2A8511C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28608

Modified Files:
	.cvsignore sources 
Log Message:
- Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Aug 2009 17:49:04 -0000	1.21
+++ .cvsignore	27 Sep 2009 11:32:23 -0000	1.22
@@ -1 +1 @@
-f-spot-0.6.0.0.tar.bz2
+f-spot-0.6.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Aug 2009 17:49:05 -0000	1.21
+++ sources	27 Sep 2009 11:32:23 -0000	1.22
@@ -1 +1 @@
-9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2
+ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2



From robert at fedoraproject.org  Sun Sep 27 11:53:47 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 27 Sep 2009 11:53:47 +0000 (UTC)
Subject: rpms/duplicity/devel .cvsignore, 1.14, 1.15 duplicity.spec, 1.29,
	1.30 sources, 1.14, 1.15
Message-ID: <20090927115347.A1FA711C00E6@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3807

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.05 (#525940)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 May 2009 01:48:45 -0000	1.14
+++ .cvsignore	27 Sep 2009 11:53:47 -0000	1.15
@@ -1 +1 @@
-duplicity-0.5.18.tar.gz
+duplicity-0.6.05.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- duplicity.spec	24 Jul 2009 20:38:20 -0000	1.29
+++ duplicity.spec	27 Sep 2009 11:53:47 -0000	1.30
@@ -2,8 +2,8 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.18
-Release:        2%{?dist}
+Version:        0.6.05
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
+- Upgrade to 0.6.05 (#525940)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 May 2009 01:48:45 -0000	1.14
+++ sources	27 Sep 2009 11:53:47 -0000	1.15
@@ -1 +1 @@
-77fcbe30b300450af17d811eec339765  duplicity-0.5.18.tar.gz
+d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz



From robert at fedoraproject.org  Sun Sep 27 11:57:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 27 Sep 2009 11:57:10 +0000 (UTC)
Subject: rpms/duplicity/F-10 .cvsignore, 1.12, 1.13 duplicity.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20090927115710.6228B11C00E6@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4854/F-10

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.05 (#525940)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 May 2009 01:48:44 -0000	1.12
+++ .cvsignore	27 Sep 2009 11:57:10 -0000	1.13
@@ -1 +1 @@
-duplicity-0.5.18.tar.gz
+duplicity-0.6.05.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-10/duplicity.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- duplicity.spec	24 May 2009 01:48:44 -0000	1.24
+++ duplicity.spec	27 Sep 2009 11:57:10 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.18
+Version:        0.6.05
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
+- Upgrade to 0.6.05 (#525940)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 24 2009 Robert Scheck <robert at fedoraproject.org> 0.5.18-1
 - Upgrade to 0.5.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 May 2009 01:48:44 -0000	1.12
+++ sources	27 Sep 2009 11:57:10 -0000	1.13
@@ -1 +1 @@
-77fcbe30b300450af17d811eec339765  duplicity-0.5.18.tar.gz
+d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz



From robert at fedoraproject.org  Sun Sep 27 11:57:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 27 Sep 2009 11:57:10 +0000 (UTC)
Subject: rpms/duplicity/F-11 .cvsignore, 1.13, 1.14 duplicity.spec, 1.27,
	1.28 sources, 1.13, 1.14
Message-ID: <20090927115710.87A8811C02C9@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4854/F-11

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.05 (#525940)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 May 2009 01:48:44 -0000	1.13
+++ .cvsignore	27 Sep 2009 11:57:10 -0000	1.14
@@ -1 +1 @@
-duplicity-0.5.18.tar.gz
+duplicity-0.6.05.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-11/duplicity.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- duplicity.spec	24 May 2009 01:48:44 -0000	1.27
+++ duplicity.spec	27 Sep 2009 11:57:10 -0000	1.28
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.18
+Version:        0.6.05
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
+- Upgrade to 0.6.05 (#525940)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 24 2009 Robert Scheck <robert at fedoraproject.org> 0.5.18-1
 - Upgrade to 0.5.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	24 May 2009 01:48:44 -0000	1.13
+++ sources	27 Sep 2009 11:57:10 -0000	1.14
@@ -1 +1 @@
-77fcbe30b300450af17d811eec339765  duplicity-0.5.18.tar.gz
+d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz



From robert at fedoraproject.org  Sun Sep 27 12:05:51 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 27 Sep 2009 12:05:51 +0000 (UTC)
Subject: rpms/duplicity/EL-4 .cvsignore, 1.11, 1.12 duplicity.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20090927120551.2D98E11C00E6@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8840/EL-4

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.05 (#525940)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 May 2009 01:48:43 -0000	1.11
+++ .cvsignore	27 Sep 2009 12:05:50 -0000	1.12
@@ -1 +1 @@
-duplicity-0.5.18.tar.gz
+duplicity-0.6.05.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/duplicity.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- duplicity.spec	24 May 2009 01:48:43 -0000	1.20
+++ duplicity.spec	27 Sep 2009 12:05:50 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.18
+Version:        0.6.05
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
+- Upgrade to 0.6.05 (#525940)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 24 2009 Robert Scheck <robert at fedoraproject.org> 0.5.18-1
 - Upgrade to 0.5.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 May 2009 01:48:43 -0000	1.11
+++ sources	27 Sep 2009 12:05:51 -0000	1.12
@@ -1 +1 @@
-77fcbe30b300450af17d811eec339765  duplicity-0.5.18.tar.gz
+d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz



From robert at fedoraproject.org  Sun Sep 27 12:05:51 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 27 Sep 2009 12:05:51 +0000 (UTC)
Subject: rpms/duplicity/EL-5 .cvsignore, 1.12, 1.13 duplicity.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20090927120551.6800011C00E6@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8840/EL-5

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.05 (#525940)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 May 2009 01:48:44 -0000	1.12
+++ .cvsignore	27 Sep 2009 12:05:51 -0000	1.13
@@ -1 +1 @@
-duplicity-0.5.18.tar.gz
+duplicity-0.6.05.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/duplicity.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- duplicity.spec	24 May 2009 01:48:44 -0000	1.24
+++ duplicity.spec	27 Sep 2009 12:05:51 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.18
+Version:        0.6.05
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
+- Upgrade to 0.6.05 (#525940)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 24 2009 Robert Scheck <robert at fedoraproject.org> 0.5.18-1
 - Upgrade to 0.5.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 May 2009 01:48:44 -0000	1.12
+++ sources	27 Sep 2009 12:05:51 -0000	1.13
@@ -1 +1 @@
-77fcbe30b300450af17d811eec339765  duplicity-0.5.18.tar.gz
+d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz



From peter at fedoraproject.org  Sun Sep 27 12:24:37 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 12:24:37 +0000 (UTC)
Subject: rpms/rlog/devel import.log,1.3,1.4 rlog.spec,1.13,1.14
Message-ID: <20090927122437.0FF2E11C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17909/devel

Modified Files:
	import.log rlog.spec 
Log Message:
fixed building agains valgring


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Dec 2008 18:14:18 -0000	1.3
+++ import.log	27 Sep 2009 12:24:36 -0000	1.4
@@ -1,3 +1,4 @@
 rlog-1_4-1_fc9:HEAD:rlog-1.4-1.fc9.src.rpm:1215870506
 rlog-1_4-2_fc9:HEAD:rlog-1.4-2.fc9.src.rpm:1220337766
 rlog-1_4-3_fc10:HEAD:rlog-1.4-3.fc10.src.rpm:1228760001
+rlog-1_4-7_fc11:HEAD:rlog-1.4-7.fc11.src.rpm:1254054232


Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/devel/rlog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rlog.spec	27 Jul 2009 03:04:25 -0000	1.13
+++ rlog.spec	27 Sep 2009 12:24:36 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
-%if "%{?fedora}" > "8"
+%if 0%{?fedora} > 8
 BuildRequires:	valgrind-devel
 %else
 BuildRequires:	valgrind
@@ -41,8 +41,8 @@ Files needed for developing apps using r
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -rf %{buildroot}/%{_docdir}/rlog
+%{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}%{_docdir}/rlog
 
 %post -p /sbin/ldconfig
 
@@ -64,6 +64,9 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 1.4-7
+- Fixed building against valgrind
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Sun Sep 27 12:25:39 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 12:25:39 +0000 (UTC)
Subject: rpms/rlog/F-11 import.log,1.3,1.4 rlog.spec,1.12,1.13
Message-ID: <20090927122539.5923A11C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rlog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18317/F-11

Modified Files:
	import.log rlog.spec 
Log Message:
fixed building agains valgring


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Dec 2008 18:14:18 -0000	1.3
+++ import.log	27 Sep 2009 12:25:39 -0000	1.4
@@ -1,3 +1,4 @@
 rlog-1_4-1_fc9:HEAD:rlog-1.4-1.fc9.src.rpm:1215870506
 rlog-1_4-2_fc9:HEAD:rlog-1.4-2.fc9.src.rpm:1220337766
 rlog-1_4-3_fc10:HEAD:rlog-1.4-3.fc10.src.rpm:1228760001
+rlog-1_4-7_fc11:F-11:rlog-1.4-7.fc11.src.rpm:1254054307


Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/F-11/rlog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rlog.spec	29 Apr 2009 00:37:31 -0000	1.12
+++ rlog.spec	27 Sep 2009 12:25:39 -0000	1.13
@@ -1,13 +1,13 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
-%if "%{?fedora}" > "8"
+%if 0%{?fedora} > 8
 BuildRequires:	valgrind-devel
 %else
 BuildRequires:	valgrind
@@ -41,8 +41,8 @@ Files needed for developing apps using r
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -rf %{buildroot}/%{_docdir}/rlog
+%{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}%{_docdir}/rlog
 
 %post -p /sbin/ldconfig
 
@@ -64,6 +64,12 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 1.4-7
+- Fixed building against valgrind
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.4-5
 - Fix FTBFS: do not rebuild docs as it fails on latex
 



From peter at fedoraproject.org  Sun Sep 27 12:27:14 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 12:27:14 +0000 (UTC)
Subject: rpms/rlog/F-10 import.log,1.3,1.4 rlog.spec,1.10,1.11
Message-ID: <20090927122714.037C911C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rlog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19020/F-10

Modified Files:
	import.log rlog.spec 
Log Message:
fixed building agains valgring


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Dec 2008 18:17:05 -0000	1.3
+++ import.log	27 Sep 2009 12:27:13 -0000	1.4
@@ -1,3 +1,4 @@
 rlog-1_4-1_fc9:HEAD:rlog-1.4-1.fc9.src.rpm:1215870506
 rlog-1_4-2_fc9:HEAD:rlog-1.4-2.fc9.src.rpm:1220337766
 rlog-1_4-3_fc10:F-10:rlog-1.4-3.fc10.src.rpm:1228760168
+rlog-1_4-7_fc11:F-10:rlog-1.4-7.fc11.src.rpm:1254054361


Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/F-10/rlog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rlog.spec	8 Dec 2008 18:17:05 -0000	1.10
+++ rlog.spec	27 Sep 2009 12:27:13 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	3%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
-%if "%{?fedora}" > "8"
+%if 0%{?fedora} > 8
 BuildRequires:	valgrind-devel
 %else
 BuildRequires:	valgrind
@@ -30,8 +30,9 @@ Files needed for developing apps using r
 
 %prep
 %setup -q
-%{__rm} -rf docs/html
-%{__rm} -rf docs/latex
+# Disabled: rebuilding docs fails on latex
+#%{__rm} -rf docs/html
+#%{__rm} -rf docs/latex
 
 %build
 %configure --disable-static --enable-valgrind
@@ -40,8 +41,8 @@ Files needed for developing apps using r
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -rf %{buildroot}/%{_docdir}/rlog
+%{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}%{_docdir}/rlog
 
 %post -p /sbin/ldconfig
 
@@ -63,6 +64,18 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 1.4-7
+- Fixed building against valgrind
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.4-5
+- Fix FTBFS: do not rebuild docs as it fails on latex
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-3
 - Fixed url (BZ# 472665)
 



From peter at fedoraproject.org  Sun Sep 27 12:29:41 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 12:29:41 +0000 (UTC)
Subject: rpms/rlog/EL-5 import.log, NONE, 1.1 rlog-1.4.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.2, 1.3 rlog.spec, 1.3, 1.4 sources, 1.2,
	1.3 rlog-1.3.7.tgz.asc, 1.1, NONE
Message-ID: <20090927122941.33A8911C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rlog/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20170/EL-5

Modified Files:
	.cvsignore rlog.spec sources 
Added Files:
	import.log rlog-1.4.tar.gz.asc 
Removed Files:
	rlog-1.3.7.tgz.asc 
Log Message:
fixed building agains valgring


--- NEW FILE import.log ---
rlog-1_4-7_fc11:EL-5:rlog-1.4-7.fc11.src.rpm:1254054510


--- NEW FILE rlog-1.4.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBIVK4qWp20Ay6vTYARAkSsAJ9zp14R5x6sJLqZTZaeycgzV7vgCACfdSbb
ofyhawtIVs+wdXwgy2yQfsE=
=8f+3
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2005 22:22:16 -0000	1.2
+++ .cvsignore	27 Sep 2009 12:29:40 -0000	1.3
@@ -1 +1 @@
-rlog-1.3.7.tgz
+rlog-1.4.tar.gz


Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/EL-5/rlog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rlog.spec	12 Sep 2006 05:14:03 -0000	1.3
+++ rlog.spec	27 Sep 2009 12:29:40 -0000	1.4
@@ -1,16 +1,18 @@
-Name: 		rlog
-Summary: 	Runtime Logging for C++
-Version: 	1.3.7
-Release: 	3%{?dist}
-License: 	LGPL
-Group: 		Development/Libraries
-Url: 		http://arg0.net/wiki/rlog
-Source0: 	http://arg0.net/users/vgough/download/%{name}-%{version}.tgz
-Source1:	http://arg0.net/users/vgough/download/%{name}-%{version}.tgz.asc
-%ifarch i386
+Name:		rlog
+Summary:	Runtime Logging for C++
+Version:	1.4
+Release:	7%{?dist}
+License:	LGPLv2+
+Group:		Development/Libraries
+Url:		http://arg0.net/rlog
+Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
+Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
+%if 0%{?fedora} > 8
+BuildRequires:	valgrind-devel
+%else
 BuildRequires:	valgrind
 %endif
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 RLog provides a flexible message logging facility for C++ programs and
@@ -28,24 +30,19 @@ Files needed for developing apps using r
 
 %prep
 %setup -q
-%{__rm} -rf docs/html
-%{__rm} -rf docs/latex
+# Disabled: rebuilding docs fails on latex
+#%{__rm} -rf docs/html
+#%{__rm} -rf docs/latex
 
 %build
-%configure \
-	--disable-static \
-%ifarch i386
-	--enable-valgrind
-%else
-	--disable-valgrind
-%endif
+%configure --disable-static --enable-valgrind
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -rf %{buildroot}/%{_docdir}/rlog
+%{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}%{_docdir}/rlog
 
 %post -p /sbin/ldconfig
 
@@ -57,7 +54,7 @@ Files needed for developing apps using r
 %files
 %defattr(-,root,root,-)
 %{_libdir}/librlog.so.*
-%doc README AUTHORS COPYING 
+%doc README AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -67,6 +64,43 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 1.4-7
+- Fixed building against valgrind
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.4-5
+- Fix FTBFS: do not rebuild docs as it fails on latex
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-3
+- Fixed url (BZ# 472665)
+
+* Tue Sep  2 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-2
+- Fix build for F-8
+- Fixed license header (LGLV21+ -> LGPLv2+)
+
+* Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-1
+- Ver. 1.4
+- Dropped upstreamed patch
+- Enabled valgrind on all supported platforms
+
+* Fri Jun  6 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.7-7
+- Get rid of whitespaces (cosmetic)
+- Note about patch status (applied upstream)
+
+* Fri Feb 22 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.7-6
+- Changed source paths
+- Fixed build with GCC 4.3
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.7-5
+- Autorebuild for GCC 4.3
+
+* Sat Feb  9 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.7-4
+- Proper license header (LGPL v 2.1 or any later version)
 
 * Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.3.7-3%{?dist}
 - Rebuild for FC6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2005 22:22:16 -0000	1.2
+++ sources	27 Sep 2009 12:29:40 -0000	1.3
@@ -1 +1 @@
-a3bc4e4d9d2b838fdc32e6de64270b68  rlog-1.3.7.tgz
+c29f74e0f50d66b20312d049b683ff82  rlog-1.4.tar.gz


--- rlog-1.3.7.tgz.asc DELETED ---



From peter at fedoraproject.org  Sun Sep 27 12:30:46 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 12:30:46 +0000 (UTC)
Subject: rpms/rlog/EL-4 import.log,1.3,1.4 rlog.spec,1.13,1.14
Message-ID: <20090927123046.B6D4C11C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rlog/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20594/EL-4

Modified Files:
	import.log rlog.spec 
Log Message:
fixed building agains valgring


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Dec 2008 18:14:18 -0000	1.3
+++ import.log	27 Sep 2009 12:30:46 -0000	1.4
@@ -1,3 +1,4 @@
 rlog-1_4-1_fc9:HEAD:rlog-1.4-1.fc9.src.rpm:1215870506
 rlog-1_4-2_fc9:HEAD:rlog-1.4-2.fc9.src.rpm:1220337766
 rlog-1_4-3_fc10:HEAD:rlog-1.4-3.fc10.src.rpm:1228760001
+rlog-1_4-7_fc11:EL-4:rlog-1.4-7.fc11.src.rpm:1254054597


Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/EL-4/rlog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rlog.spec	27 Jul 2009 03:04:25 -0000	1.13
+++ rlog.spec	27 Sep 2009 12:30:46 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
-%if "%{?fedora}" > "8"
+%if 0%{?fedora} > 8
 BuildRequires:	valgrind-devel
 %else
 BuildRequires:	valgrind
@@ -41,8 +41,8 @@ Files needed for developing apps using r
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -rf %{buildroot}/%{_docdir}/rlog
+%{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}%{_docdir}/rlog
 
 %post -p /sbin/ldconfig
 
@@ -64,6 +64,9 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 1.4-7
+- Fixed building against valgrind
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nbecker at fedoraproject.org  Sun Sep 27 12:48:42 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 27 Sep 2009 12:48:42 +0000 (UTC)
Subject: rpms/Cython/devel .cvsignore, 1.11, 1.12 Cython.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <20090927124842.CC49011C00E6@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25886

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
update to 0.11.3rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Sep 2009 11:57:13 -0000	1.11
+++ .cvsignore	27 Sep 2009 12:48:42 -0000	1.12
@@ -1 +1 @@
-Cython-0.11.3.rc0.tar.gz
+Cython-0.11.3.rc1.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/Cython.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- Cython.spec	25 Sep 2009 11:57:13 -0000	1.16
+++ Cython.spec	27 Sep 2009 12:48:42 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:		Cython
 Version:	0.11.3
-Release:	1.rc0%{?dist}
+Release:	1.rc1%{?dist}
 Summary:	A language for writing Python extension modules
 
 %define upstreamversion %{version}.rc0
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.3-1.rc1
+- Update to 0.11.3rc1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	25 Sep 2009 11:57:13 -0000	1.11
+++ sources	27 Sep 2009 12:48:42 -0000	1.12
@@ -1 +1 @@
-f76c812a6ced636262bc341ac6b2dc33  Cython-0.11.3.rc0.tar.gz
+9a6fd9041b613f47c786ddc0c3c946ac  Cython-0.11.3.rc1.tar.gz



From nbecker at fedoraproject.org  Sun Sep 27 12:49:32 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 27 Sep 2009 12:49:32 +0000 (UTC)
Subject: rpms/Cython/devel Cython.spec,1.17,1.18
Message-ID: <20090927124932.15CA511C00E6@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26163

Modified Files:
	Cython.spec 
Log Message:
update to 0.11.3rc1


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/Cython.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Cython.spec	27 Sep 2009 12:48:42 -0000	1.17
+++ Cython.spec	27 Sep 2009 12:49:31 -0000	1.18
@@ -7,7 +7,7 @@ Version:	0.11.3
 Release:	1.rc1%{?dist}
 Summary:	A language for writing Python extension modules
 
-%define upstreamversion %{version}.rc0
+%define upstreamversion %{version}.rc1
 
 Group:		Development/Tools
 License:	Python



From peter at fedoraproject.org  Sun Sep 27 13:15:21 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 13:15:21 +0000 (UTC)
Subject: rpms/fuse-sshfs/devel fuse-sshfs.spec,1.17,1.18 import.log,1.2,1.3
Message-ID: <20090927131521.3653911C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-sshfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2136/devel

Modified Files:
	fuse-sshfs.spec import.log 
Log Message:
No need for versioning in (Build)Requires for openssh-clients


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fuse-sshfs.spec	17 Sep 2009 05:36:46 -0000	1.17
+++ fuse-sshfs.spec	27 Sep 2009 13:15:19 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fuse-sshfs
 Version:        2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
@@ -10,10 +10,10 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:       sshfs = %{version}-%{release}
 Requires:       fuse >= 2.2
-Requires:	openssh-clients >= 4.4
+Requires:	openssh-clients
 BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  glib2-devel >= 2.0
-BuildRequires:	openssh-clients >= 4.4
+BuildRequires:	openssh-clients
 
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
@@ -39,9 +39,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
+%if 0%{?rhel}
+# if openssh-clients < 4.4
+%{_libdir}/sshnodelay.so
+%endif
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-5
+- No need for versioning in (Build)Requires for openssh-clients
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-4
 - Rebuilt with new fuse
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Dec 2008 09:30:54 -0000	1.2
+++ import.log	27 Sep 2009 13:15:19 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-sshfs-2_1-1_fc9:HEAD:fuse-sshfs-2.1-1.fc9.src.rpm:1222598620
 fuse-sshfs-2_2-1_fc10:HEAD:fuse-sshfs-2.2-1.fc10.src.rpm:1228814993
+fuse-sshfs-2_2-5_fc11:HEAD:fuse-sshfs-2.2-5.fc11.src.rpm:1254057266



From peter at fedoraproject.org  Sun Sep 27 13:19:29 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 13:19:29 +0000 (UTC)
Subject: rpms/fuse-sshfs/F-11 fuse-sshfs.spec,1.15,1.16 import.log,1.2,1.3
Message-ID: <20090927131929.C09AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-sshfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3485/F-11

Modified Files:
	fuse-sshfs.spec import.log 
Log Message:
No need for versioning in (Build)Requires for openssh-clients


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/F-11/fuse-sshfs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fuse-sshfs.spec	24 Feb 2009 18:57:22 -0000	1.15
+++ fuse-sshfs.spec	27 Sep 2009 13:19:29 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           fuse-sshfs
 Version:        2.2
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
@@ -8,12 +8,12 @@ License:        GPLv2
 URL:            http://fuse.sourceforge.net/sshfs.html
 Source0:        http://downloads.sourceforge.net/fuse/sshfs-fuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       sshfs = %{version}
+Provides:       sshfs = %{version}-%{release}
 Requires:       fuse >= 2.2
-Requires:	openssh-clients >= 4.4
+Requires:	openssh-clients
 BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  glib2-devel >= 2.0
-BuildRequires:	openssh-clients >= 4.4
+BuildRequires:	openssh-clients
 
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
@@ -39,9 +39,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
+%if 0%{?rhel}
+# if openssh-clients < 4.4
+%{_libdir}/sshnodelay.so
+%endif
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-5
+- No need for versioning in (Build)Requires for openssh-clients
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-4
+- Rebuilt with new fuse
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -65,10 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 - Added provides: sshfs
 - Modified License field according to Fedora policy.
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2
 - Rebuild for FC6
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1
 - New version
 - Rebuild for FC6
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Dec 2008 09:30:54 -0000	1.2
+++ import.log	27 Sep 2009 13:19:29 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-sshfs-2_1-1_fc9:HEAD:fuse-sshfs-2.1-1.fc9.src.rpm:1222598620
 fuse-sshfs-2_2-1_fc10:HEAD:fuse-sshfs-2.2-1.fc10.src.rpm:1228814993
+fuse-sshfs-2_2-5_fc11:F-11:fuse-sshfs-2.2-5.fc11.src.rpm:1254057378



From peter at fedoraproject.org  Sun Sep 27 13:20:25 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 13:20:25 +0000 (UTC)
Subject: rpms/fuse-sshfs/F-10 fuse-sshfs.spec,1.14,1.15 import.log,1.2,1.3
Message-ID: <20090927132025.40BB211C0419@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-sshfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3874/F-10

Modified Files:
	fuse-sshfs.spec import.log 
Log Message:
No need for versioning in (Build)Requires for openssh-clients


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/F-10/fuse-sshfs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fuse-sshfs.spec	9 Dec 2008 09:34:46 -0000	1.14
+++ fuse-sshfs.spec	27 Sep 2009 13:20:25 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fuse-sshfs
 Version:        2.2
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
@@ -8,12 +8,12 @@ License:        GPLv2
 URL:            http://fuse.sourceforge.net/sshfs.html
 Source0:        http://downloads.sourceforge.net/fuse/sshfs-fuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       sshfs = %{version}
+Provides:       sshfs = %{version}-%{release}
 Requires:       fuse >= 2.2
-Requires:	openssh-clients >= 4.4
+Requires:	openssh-clients
 BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  glib2-devel >= 2.0
-BuildRequires:	openssh-clients >= 4.4
+BuildRequires:	openssh-clients
 
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
@@ -39,9 +39,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
+%if 0%{?rhel}
+# if openssh-clients < 4.4
+%{_libdir}/sshnodelay.so
+%endif
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-5
+- No need for versioning in (Build)Requires for openssh-clients
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-4
+- Rebuilt with new fuse
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec  9 2008 Peter Lemenkov <lemenkov at gmail.com> 2.2-1
 - Ver. 2.2
 
@@ -62,10 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 - Added provides: sshfs
 - Modified License field according to Fedora policy.
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2
 - Rebuild for FC6
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1
 - New version
 - Rebuild for FC6
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Dec 2008 09:34:46 -0000	1.2
+++ import.log	27 Sep 2009 13:20:25 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-sshfs-2_1-1_fc9:HEAD:fuse-sshfs-2.1-1.fc9.src.rpm:1222598620
 fuse-sshfs-2_2-1_fc10:F-10:fuse-sshfs-2.2-1.fc10.src.rpm:1228815135
+fuse-sshfs-2_2-5_fc11:F-10:fuse-sshfs-2.2-5.fc11.src.rpm:1254057596



From peter at fedoraproject.org  Sun Sep 27 13:22:16 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 27 Sep 2009 13:22:16 +0000 (UTC)
Subject: rpms/fuse-sshfs/EL-5 import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 fuse-sshfs.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090927132216.AEFC711C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-sshfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5283/EL-5

Modified Files:
	.cvsignore fuse-sshfs.spec sources 
Added Files:
	import.log 
Log Message:
No need for versioning in (Build)Requires for openssh-clients


--- NEW FILE import.log ---
fuse-sshfs-2_2-5_fc11:EL-5:fuse-sshfs-2.2-5.fc11.src.rpm:1254057668


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Sep 2006 05:41:30 -0000	1.5
+++ .cvsignore	27 Sep 2009 13:22:16 -0000	1.6
@@ -1 +1 @@
-sshfs-fuse-1.7.tar.gz
+sshfs-fuse-2.2.tar.gz


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/EL-5/fuse-sshfs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fuse-sshfs.spec	12 Sep 2006 06:26:14 -0000	1.8
+++ fuse-sshfs.spec	27 Sep 2009 13:22:16 -0000	1.9
@@ -1,22 +1,24 @@
 Name:           fuse-sshfs
-Version:        1.7
-Release:        2%{?dist}
+Version:        2.2
+Release:        5%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
-License:        GPL
+License:        GPLv2
 URL:            http://fuse.sourceforge.net/sshfs.html
-Source0:        http://dl.sourceforge.net/sourceforge/fuse/sshfs-fuse-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/fuse/sshfs-fuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Provides:       sshfs = %{version}-%{release}
 Requires:       fuse >= 2.2
+Requires:	openssh-clients
 BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  glib2-devel >= 2.0
+BuildRequires:	openssh-clients
 
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
 Since most SSH servers already support this protocol it is very easy to set
-up: i.e. on the server side there's nothing to do.  On the client side 
+up: i.e. on the server side there's nothing to do.  On the client side
 mounting the filesystem is as easy as logging into the server with ssh.
 
 %prep
@@ -35,16 +37,51 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
+%if 0%{?rhel}
+# if openssh-clients < 4.4
 %{_libdir}/sshnodelay.so
+%endif
+%{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 27 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-5
+- No need for versioning in (Build)Requires for openssh-clients
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.2-4
+- Rebuilt with new fuse
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Dec  9 2008 Peter Lemenkov <lemenkov at gmail.com> 2.2-1
+- Ver. 2.2
+
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 2.1-1
+- Ver. 2.1
+
+* Mon May 19 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0-1
+- Ver. 2.0
+
+* Sat Feb  9 2008 Peter Lemenkov <lemenkov at gmail.com> 1.9-2
+- Rebuild for GCC 4.3
+
+* Wed Jan 23 2008 Peter Lemenkov <lemenkov at gmail.com> 1.9-2
+- Added missing Requires and BuildRequires - openssh-clients >= 4.4
+
+* Wed Jan 23 2008 Peter Lemenkov <lemenkov at gmail.com> 1.9-1
+- Ver. 1.9
+- Added provides: sshfs
+- Modified License field according to Fedora policy.
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-2
 - Rebuild for FC6
 
-* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1%{?dist}
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 1.7-1
 - New version
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-sshfs/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Sep 2006 05:41:30 -0000	1.5
+++ sources	27 Sep 2009 13:22:16 -0000	1.6
@@ -1 +1 @@
-e91a2fed1da952a375798408dc6e41a0  sshfs-fuse-1.7.tar.gz
+26e9206eb5169e87e6f95f54bc005a4f  sshfs-fuse-2.2.tar.gz



From drago01 at fedoraproject.org  Sun Sep 27 13:37:53 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sun, 27 Sep 2009 13:37:53 +0000 (UTC)
Subject: rpms/fsarchiver/devel .cvsignore, 1.11, 1.12 fsarchiver.spec, 1.18, 
	1.19 sources, 1.11, 1.12
Message-ID: <20090927133753.EA83211C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10390

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Sep 2009 16:32:55 -0000	1.11
+++ .cvsignore	27 Sep 2009 13:37:51 -0000	1.12
@@ -1 +1 @@
-fsarchiver-0.5.9.tar.gz
+fsarchiver-0.6.0.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fsarchiver.spec	3 Sep 2009 16:32:56 -0000	1.18
+++ fsarchiver.spec	27 Sep 2009 13:37:51 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.5.9
+Version:	0.6.0
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -14,7 +14,7 @@ BuildRequires:	libuuid-devel
 BuildRequires:	libblkid-devel
 BuildRequires:	e2fsprogs
 BuildRequires:	libattr-devel
-BuildRequires:	openssl-devel
+BuildRequires:	libgcrypt-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
@@ -49,9 +49,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/%{name}
+%{_mandir}/man8/%{name}*
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
+- Update to 0.6.0
+- Fixes licensing issue (no longer links against openssl)
+
 * Thu Sep 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.9-1
 - Update to 0.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Sep 2009 16:32:56 -0000	1.11
+++ sources	27 Sep 2009 13:37:51 -0000	1.12
@@ -1 +1 @@
-03af22d9dca5bec4154e1a4c1e569714  fsarchiver-0.5.9.tar.gz
+f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz



From drago01 at fedoraproject.org  Sun Sep 27 13:39:17 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sun, 27 Sep 2009 13:39:17 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 .cvsignore, 1.11, 1.12 fsarchiver.spec, 1.15, 
	1.16 sources, 1.11, 1.12
Message-ID: <20090927133917.E6FD811C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10879

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Sep 2009 16:33:01 -0000	1.11
+++ .cvsignore	27 Sep 2009 13:39:17 -0000	1.12
@@ -1 +1 @@
-fsarchiver-0.5.9.tar.gz
+fsarchiver-0.6.0.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fsarchiver.spec	3 Sep 2009 16:33:01 -0000	1.15
+++ fsarchiver.spec	27 Sep 2009 13:39:17 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.5.9
+Version:	0.6.0
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -12,7 +12,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	e2fsprogs
 BuildRequires:	libattr-devel
-BuildRequires:	openssl-devel
+BuildRequires:	libgcrypt-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
@@ -47,9 +47,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/%{name}
+%{_mandir}/man8/%{name}*
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
+- Update to 0.6.0
+- Fixes licensing issue (no longer links against openssl)
+
 * Thu Sep 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.9-1
 - Update to 0.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Sep 2009 16:33:01 -0000	1.11
+++ sources	27 Sep 2009 13:39:17 -0000	1.12
@@ -1 +1 @@
-03af22d9dca5bec4154e1a4c1e569714  fsarchiver-0.5.9.tar.gz
+f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz



From drago01 at fedoraproject.org  Sun Sep 27 13:39:56 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sun, 27 Sep 2009 13:39:56 +0000 (UTC)
Subject: rpms/fsarchiver/F-10 .cvsignore, 1.10, 1.11 fsarchiver.spec, 1.11, 
	1.12 sources, 1.10, 1.11
Message-ID: <20090927133956.336AB11C00E6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11139

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Sep 2009 16:33:04 -0000	1.10
+++ .cvsignore	27 Sep 2009 13:39:56 -0000	1.11
@@ -1 +1 @@
-fsarchiver-0.5.9.tar.gz
+fsarchiver-0.6.0.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/fsarchiver.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fsarchiver.spec	3 Sep 2009 16:33:04 -0000	1.11
+++ fsarchiver.spec	27 Sep 2009 13:39:56 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.5.9
+Version:	0.6.0
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -12,7 +12,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	e2fsprogs
 BuildRequires:	libattr-devel
-BuildRequires:	openssl-devel
+BuildRequires:	libgcrypt-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
@@ -47,9 +47,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/%{name}
+%{_mandir}/man8/%{name}*
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
+- Update to 0.6.0
+- Fixes licensing issue (no longer links against openssl)
+
 * Thu Sep 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.9-1
 - Update to 0.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Sep 2009 16:33:04 -0000	1.10
+++ sources	27 Sep 2009 13:39:56 -0000	1.11
@@ -1 +1 @@
-03af22d9dca5bec4154e1a4c1e569714  fsarchiver-0.5.9.tar.gz
+f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz



From nbecker at fedoraproject.org  Sun Sep 27 13:46:34 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 27 Sep 2009 13:46:34 +0000 (UTC)
Subject: rpms/Cython/devel .cvsignore, 1.12, 1.13 Cython.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090927134634.2275B11C00E6@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12711

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
update to 0.11.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Sep 2009 12:48:42 -0000	1.12
+++ .cvsignore	27 Sep 2009 13:46:33 -0000	1.13
@@ -1 +1 @@
-Cython-0.11.3.rc1.tar.gz
+Cython-0.11.3.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/Cython.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Cython.spec	27 Sep 2009 12:49:31 -0000	1.18
+++ Cython.spec	27 Sep 2009 13:46:33 -0000	1.19
@@ -4,10 +4,12 @@
 
 Name:		Cython
 Version:	0.11.3
-Release:	1.rc1%{?dist}
+#Release:	1.rc1%{?dist}
+Release:	1%{?dist}
 Summary:	A language for writing Python extension modules
 
-%define upstreamversion %{version}.rc1
+#%define upstreamversion %{version}.rc1
+%define upstreamversion %{version}
 
 Group:		Development/Tools
 License:	Python
@@ -64,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Sep 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.3-1.rc1
 - Update to 0.11.3rc1
+- Update to 0.11.3
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Sep 2009 12:48:42 -0000	1.12
+++ sources	27 Sep 2009 13:46:33 -0000	1.13
@@ -1 +1 @@
-9a6fd9041b613f47c786ddc0c3c946ac  Cython-0.11.3.rc1.tar.gz
+470d1f928886f4e59463d7ead5d5e300  Cython-0.11.3.tar.gz



From kkofler at fedoraproject.org  Sun Sep 27 13:47:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 27 Sep 2009 13:47:49 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE,
	1.1 kdebase-workspace.spec, 1.242, 1.243
Message-ID: <20090927134749.C701411C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094/F-11

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
Sync from devel:

* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
- support "Leave..." which brings up complete shutdown dialog in classic menu

* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
- don't include googlegadgets on RHEL

* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
- rhel cleanup

kdebase-workspace-4.3.0-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    4 ++++
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-08-25 23:56:08.000000000 +0200
@@ -160,6 +160,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-08-25 23:44:22.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-08-25 23:40:02.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- kdebase-workspace.spec	23 Sep 2009 12:47:07 -0000	1.242
+++ kdebase-workspace.spec	27 Sep 2009 13:47:49 -0000	1.243
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 5%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -31,6 +31,10 @@ Patch14: kdebase-workspace-4.2.0-klipper
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
 # show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
 Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
+# allow adding a "Leave..." button which brings up the complete shutdown dialog
+# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
+# default Leave submenu
+Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -63,9 +67,12 @@ BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
 BuildRequires: desktop-file-utils
+%if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
-BuildRequires: glib2-devel
+BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: gpsd-devel
+%endif
+BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -84,7 +91,6 @@ BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
@@ -261,6 +267,7 @@ Requires: akonadi
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
+%patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
 %patch100 -p5 -b .plasmaCrash
@@ -451,12 +458,14 @@ fi
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
+%if 0%{?fedora}
 %{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
+%endif
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
 %{_kde4_libdir}/kde4/plasma_engine_*.so
-%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
 %{_kde4_libdir}/kde4/plasma-geolocation-ip.so
 %{_kde4_libdir}/kde4/plasma_package*_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
@@ -474,12 +483,14 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasmaengineexplorer.1*
+%if 0%{?fedora}
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
 %exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
 %exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 #?akonadi
@@ -554,6 +565,7 @@ fi
 %{_kde4_iconsdir}/Oxygen_Zion/
 %{_kde4_iconsdir}/Oxygen_Zion_Big/
 
+%if 0%{?fedora}
 %files googlegadgets
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -561,6 +573,7 @@ fi
 %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
 
 %if 0%{?with_polkit_09}
 %files -n PolicyKit-kde
@@ -592,6 +605,15 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- support "Leave..." which brings up complete shutdown dialog in classic menu
+
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- don't include googlegadgets on RHEL
+
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
 * Wed Sep 23 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-5
 - fix spontaneous Plasma crashes due to uninitialized vars
 



From kkofler at fedoraproject.org  Sun Sep 27 13:47:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 27 Sep 2009 13:47:49 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE,
	1.1 kdebase-workspace.spec, 1.192, 1.193
Message-ID: <20090927134749.9CE9E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
Sync from devel:

* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
- support "Leave..." which brings up complete shutdown dialog in classic menu

* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
- don't include googlegadgets on RHEL

* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
- rhel cleanup

kdebase-workspace-4.3.0-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    4 ++++
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-08-25 23:56:08.000000000 +0200
@@ -160,6 +160,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-08-25 23:44:22.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-08-25 23:40:02.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- kdebase-workspace.spec	23 Sep 2009 12:47:06 -0000	1.192
+++ kdebase-workspace.spec	27 Sep 2009 13:47:49 -0000	1.193
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 5%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -31,6 +31,10 @@ Patch14: kdebase-workspace-4.2.0-klipper
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
 # show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
 Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
+# allow adding a "Leave..." button which brings up the complete shutdown dialog
+# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
+# default Leave submenu
+Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -63,9 +67,12 @@ BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
 BuildRequires: desktop-file-utils
+%if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
-BuildRequires: glib2-devel
+BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: gpsd-devel
+%endif
+BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -84,7 +91,6 @@ BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
@@ -261,6 +267,7 @@ Requires: akonadi
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
+%patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
 %patch100 -p5 -b .plasmaCrash
@@ -451,12 +458,14 @@ fi
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
+%if 0%{?fedora}
 %{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
+%endif
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
 %{_kde4_libdir}/kde4/plasma_engine_*.so
-%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
 %{_kde4_libdir}/kde4/plasma-geolocation-ip.so
 %{_kde4_libdir}/kde4/plasma_package*_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
@@ -474,12 +483,14 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasmaengineexplorer.1*
+%if 0%{?fedora}
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
 %exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
 %exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 #?akonadi
@@ -554,6 +565,7 @@ fi
 %{_kde4_iconsdir}/Oxygen_Zion/
 %{_kde4_iconsdir}/Oxygen_Zion_Big/
 
+%if 0%{?fedora}
 %files googlegadgets
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -561,6 +573,7 @@ fi
 %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
 
 %if 0%{?with_polkit_09}
 %files -n PolicyKit-kde
@@ -592,6 +605,15 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- support "Leave..." which brings up complete shutdown dialog in classic menu
+
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- don't include googlegadgets on RHEL
+
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
 * Wed Sep 23 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-5
 - fix spontaneous Plasma crashes due to uninitialized vars
 



From nbecker at fedoraproject.org  Sun Sep 27 14:16:39 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 27 Sep 2009 14:16:39 +0000 (UTC)
Subject: rpms/Cython/F-11 .cvsignore, 1.9, 1.10 Cython.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090927141639.79CDB11C00E6@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23051

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
update to 0.11.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 May 2009 17:34:05 -0000	1.9
+++ .cvsignore	27 Sep 2009 14:16:34 -0000	1.10
@@ -1 +1 @@
-Cython-0.11.2.tar.gz
+Cython-0.11.3.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-11/Cython.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Cython.spec	21 May 2009 17:34:05 -0000	1.13
+++ Cython.spec	27 Sep 2009 14:16:34 -0000	1.14
@@ -3,14 +3,18 @@
 
 
 Name:		Cython
-Version:	0.11.2
+Version:	0.11.3
+#Release:	1.rc1%{?dist}
 Release:	1%{?dist}
 Summary:	A language for writing Python extension modules
 
+#%define upstreamversion %{version}.rc1
+%define upstreamversion %{version}
+
 Group:		Development/Tools
 License:	Python
 URL:		http://www.cython.org
-Source0:	http://www.cython.org/Cython-%{version}.tar.gz
+Source0:	http://www.cython.org/Cython-%{upstreamversion}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel python-setuptools
@@ -29,7 +33,7 @@ For more info, see:
 
 
 %prep
-%setup -q -n Cython-%{version}
+%setup -q -n %{name}-%{upstreamversion}
 
 
 %build
@@ -60,6 +64,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.3-1.rc1
+- Update to 0.11.3rc1
+- Update to 0.11.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 20 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.2-1
 - Update to 0.11.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 May 2009 17:34:05 -0000	1.9
+++ sources	27 Sep 2009 14:16:34 -0000	1.10
@@ -1 +1 @@
-31a79d5c7365e1d18ff7be48d6c1026b  Cython-0.11.2.tar.gz
+470d1f928886f4e59463d7ead5d5e300  Cython-0.11.3.tar.gz



From mtasaka at fedoraproject.org  Sun Sep 27 14:38:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 14:38:04 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.404, 1.405 jd.spec, 1.465, 1.466 sources,
	1.405, 1.406
Message-ID: <20090927143804.39A4911C0332@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30769/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
- 2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- .cvsignore	21 Sep 2009 14:06:57 -0000	1.404
+++ .cvsignore	27 Sep 2009 14:38:01 -0000	1.405
@@ -1 +1 @@
-jd-2.4.2-rc090921.tgz
+jd-2.4.2-090927.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -p -r1.465 -r1.466
--- jd.spec	21 Sep 2009 14:06:57 -0000	1.465
+++ jd.spec	27 Sep 2009 14:38:01 -0000	1.466
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        rc090921
-%define         repoid        43681
+%define         strtag        090927
+%define         repoid        43788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
+- 2.4.2
+
 * Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
 - 2.4.2 rc 090921
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- sources	21 Sep 2009 14:06:58 -0000	1.405
+++ sources	27 Sep 2009 14:38:01 -0000	1.406
@@ -1 +1 @@
-a003ce351a59e64640adbebcd59dc1cf  jd-2.4.2-rc090921.tgz
+7ec83cf1b1ed910293953e4c0fc29a6e  jd-2.4.2-090927.tgz



From mtasaka at fedoraproject.org  Sun Sep 27 14:38:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 14:38:04 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.398, 1.399 jd.spec, 1.461, 1.462 sources,
	1.399, 1.400
Message-ID: <20090927143804.3461211C02C9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30769/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
- 2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- .cvsignore	21 Sep 2009 14:06:58 -0000	1.398
+++ .cvsignore	27 Sep 2009 14:38:02 -0000	1.399
@@ -1 +1 @@
-jd-2.4.2-rc090921.tgz
+jd-2.4.2-090927.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- jd.spec	21 Sep 2009 14:06:58 -0000	1.461
+++ jd.spec	27 Sep 2009 14:38:03 -0000	1.462
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        rc090921
-%define         repoid        43681
+%define         strtag        090927
+%define         repoid        43788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
+- 2.4.2
+
 * Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
 - 2.4.2 rc 090921
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- sources	21 Sep 2009 14:06:58 -0000	1.399
+++ sources	27 Sep 2009 14:38:03 -0000	1.400
@@ -1 +1 @@
-a003ce351a59e64640adbebcd59dc1cf  jd-2.4.2-rc090921.tgz
+7ec83cf1b1ed910293953e4c0fc29a6e  jd-2.4.2-090927.tgz



From mtasaka at fedoraproject.org  Sun Sep 27 14:38:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 27 Sep 2009 14:38:04 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.398, 1.399 jd.spec, 1.462, 1.463 sources,
	1.399, 1.400
Message-ID: <20090927143804.3454A11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30769/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
- 2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- .cvsignore	21 Sep 2009 14:06:58 -0000	1.398
+++ .cvsignore	27 Sep 2009 14:38:03 -0000	1.399
@@ -1 +1 @@
-jd-2.4.2-rc090921.tgz
+jd-2.4.2-090927.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- jd.spec	21 Sep 2009 14:06:58 -0000	1.462
+++ jd.spec	27 Sep 2009 14:38:03 -0000	1.463
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        rc090921
-%define         repoid        43681
+%define         strtag        090927
+%define         repoid        43788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
+- 2.4.2
+
 * Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
 - 2.4.2 rc 090921
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- sources	21 Sep 2009 14:06:58 -0000	1.399
+++ sources	27 Sep 2009 14:38:03 -0000	1.400
@@ -1 +1 @@
-a003ce351a59e64640adbebcd59dc1cf  jd-2.4.2-rc090921.tgz
+7ec83cf1b1ed910293953e4c0fc29a6e  jd-2.4.2-090927.tgz



From nbecker at fedoraproject.org  Sun Sep 27 14:38:40 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 27 Sep 2009 14:38:40 +0000 (UTC)
Subject: rpms/Cython/F-10 .cvsignore, 1.7, 1.8 Cython.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20090927143840.1877911C00E6@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31095

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
update to 0.11.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 May 2009 17:54:56 -0000	1.7
+++ .cvsignore	27 Sep 2009 14:38:39 -0000	1.8
@@ -1 +1 @@
-Cython-0.11.2.tar.gz
+Cython-0.11.3.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-10/Cython.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- Cython.spec	21 May 2009 17:54:56 -0000	1.9
+++ Cython.spec	27 Sep 2009 14:38:39 -0000	1.10
@@ -3,14 +3,18 @@
 
 
 Name:		Cython
-Version:	0.11.2
+Version:	0.11.3
+#Release:	1.rc1%{?dist}
 Release:	1%{?dist}
 Summary:	A language for writing Python extension modules
 
+#%define upstreamversion %{version}.rc1
+%define upstreamversion %{version}
+
 Group:		Development/Tools
 License:	Python
 URL:		http://www.cython.org
-Source0:	http://www.cython.org/Cython-%{version}.tar.gz
+Source0:	http://www.cython.org/Cython-%{upstreamversion}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel python-setuptools
@@ -29,7 +33,7 @@ For more info, see:
 
 
 %prep
-%setup -q -n Cython-%{version}
+%setup -q -n %{name}-%{upstreamversion}
 
 
 %build
@@ -60,6 +64,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.3-1.rc1
+- Update to 0.11.3rc1
+- Update to 0.11.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 20 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.2-1
 - Update to 0.11.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 May 2009 17:54:56 -0000	1.8
+++ sources	27 Sep 2009 14:38:39 -0000	1.9
@@ -1 +1 @@
-31a79d5c7365e1d18ff7be48d6c1026b  Cython-0.11.2.tar.gz
+470d1f928886f4e59463d7ead5d5e300  Cython-0.11.3.tar.gz



From giallu at fedoraproject.org  Sun Sep 27 14:49:04 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Sun, 27 Sep 2009 14:49:04 +0000 (UTC)
Subject: rpms/sysprof/devel sources, 1.7, 1.8 sysprof.desktop, 1.2,
	1.3 sysprof.spec, 1.12, 1.13 .cvsignore, 1.6, 1.7 dead.package,
	1.1, NONE
Message-ID: <20090927144904.6B1CF11C00E6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1933

Modified Files:
	.cvsignore 
Added Files:
	sources sysprof.desktop sysprof.spec 
Removed Files:
	dead.package 
Log Message:
Revive sysprof package



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	27 Sep 2009 14:49:02 -0000	1.8
@@ -0,0 +1 @@
+386a4002b3fc9f96be52ca69240a8729  sysprof-1.1.2.tar.gz


Index: sysprof.desktop
===================================================================
RCS file: sysprof.desktop
diff -N sysprof.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysprof.desktop	27 Sep 2009 14:49:02 -0000	1.3
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Sysprof
+Comment=a sampling CPU profiler
+Exec=sysprof
+Icon=sysprof-icon
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Profiling;


Index: sysprof.spec
===================================================================
RCS file: sysprof.spec
diff -N sysprof.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysprof.spec	27 Sep 2009 14:49:02 -0000	1.13
@@ -0,0 +1,107 @@
+Name:           sysprof
+Version:        1.1.2
+Release:        2%{?dist}
+Summary:        A system-wide Linux profiler
+Group:          Development/System
+License:        GPLv2+
+URL:            http://www.daimi.au.dk/~sandmann/sysprof/
+Source0:        http://www.daimi.au.dk/~sandmann/sysprof/sysprof-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source1:        sysprof.desktop
+
+BuildRequires:  gtk2-devel => 2.6
+BuildRequires:  libglade2-devel
+BuildRequires:  binutils-devel
+BuildRequires:  desktop-file-utils
+
+ExclusiveArch:  %{ix86} x86_64
+
+%description
+Sysprof is a sampling CPU profiler for Linux that uses a kernel module
+to profile the entire system, not just a single application.
+Sysprof handles shared libraries and applications do not need to be
+recompiled. In fact they don't even have to be restarted.
+
+%prep
+%setup -q -n sysprof-%{version}
+
+# Fix README
+iconv --from=ISO-8859-1 --to=UTF-8 README > README.new && \
+touch -r README README.new && \
+mv README.new README
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT}
+
+desktop-file-install                                            \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        %{SOURCE1}
+
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+
+%files
+%defattr(-,root,root,-)
+%doc NEWS README COPYING TODO AUTHORS
+%{_sysconfdir}/udev/rules.d/60-sysprof.rules
+%{_bindir}/sysprof
+%{_bindir}/sysprof-cli
+%{_datadir}/pixmaps/sysprof-*.png
+%{_datadir}/sysprof/
+%{_datadir}/applications/*.desktop
+
+
+%changelog
+* Sun Sep 27 2009 Gianluca Sforna <giallu gmail com> - 1.1.2-2
+- Incorporate suggestions from package review
+
+* Sat Sep 26 2009 Gianluca Sforna <giallu gmail com> - 1.1.2-1
+- New upstream release
+
+* Wed Apr  9 2008 Gianluca Sforna <giallu gmail com> - 1.0.9-1
+- version update to 1.0.9
+
+* Tue Aug 28 2007 Gianluca Sforna <giallu gmail com> 1.0.8-2
+- update License field
+
+* Thu Dec 21 2006 Gianluca Sforna <giallu gmail com> 1.0.8-1
+- version update to 1.0.8
+
+* Tue Nov 21 2006 Gianluca Sforna <giallu gmail com> 1.0.7-1
+- version update to 1.0.7
+
+* Wed Nov  1 2006 Gianluca Sforna <giallu gmail com> 1.0.5-1
+- version update
+
+* Sun Oct  8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-6
+- better to use ExclusiveArch %%{ix86} (thanks Ville)
+
+* Thu Oct  5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
+- add ExclusiveArch to match sysprof-kmod supported archs
+
+* Tue Oct  2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
+- add .desktop file
+
+* Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
+- versioned Provides
+- add BR: binutils-devel
+
+* Fri Sep 29 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
+- own sysprof directory
+
+* Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
+- version update
+- use standard %%configure macro
+
+* Sun May 14 2006 Gianluca Sforna <giallu gmail com> 1.0.2-1
+- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Dec 2007 23:06:22 -0000	1.6
+++ .cvsignore	27 Sep 2009 14:49:02 -0000	1.7
@@ -1 +1 @@
-sysprof-1.0.9.tar.gz
+sysprof-1.1.2.tar.gz


--- dead.package DELETED ---



From giallu at fedoraproject.org  Sun Sep 27 14:58:42 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Sun, 27 Sep 2009 14:58:42 +0000 (UTC)
Subject: rpms/sysprof/devel Makefile,1.2,1.3
Message-ID: <20090927145842.E13CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6203

Added Files:
	Makefile 
Log Message:
Forgot to revive Makefile



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	27 Sep 2009 14:58:42 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: sysprof
+# $Id$
+NAME := sysprof
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From kdudka at fedoraproject.org  Sun Sep 27 15:06:59 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 27 Sep 2009 15:06:59 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.117,1.118
Message-ID: <20090927150659.AC4CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8986

Modified Files:
	curl.spec 
Log Message:
- require libssh2>=1.2 properly (#525002)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- curl.spec	26 Sep 2009 07:54:44 -0000	1.117
+++ curl.spec	27 Sep 2009 15:06:58 -0000	1.118
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -21,7 +21,7 @@ BuildRequires: groff
 BuildRequires: krb5-devel
 BuildRequires: libidn-devel
 BuildRequires: libssh2-devel >= 1.2
-BuildRequires: nss-devel >= 3.11.7-7
+BuildRequires: nss-devel
 BuildRequires: openldap-devel
 BuildRequires: openssh-clients
 BuildRequires: openssh-server
@@ -42,6 +42,10 @@ user authentication, FTP upload, HTTP po
 Summary: A library for getting files from web servers
 Group: Development/Libraries
 
+# libssh2 ABI has been changed since libssh2-1.0
+# this forces update of libssh2 before update of libcurl
+Requires: libssh2 >= 1.2
+
 %description -n libcurl
 This package provides a way for applications to use FTP, HTTP, Gopher and
 other servers for getting files.
@@ -49,8 +53,10 @@ other servers for getting files.
 %package -n libcurl-devel
 Summary: Files needed for building applications with libcurl
 Group: Development/Libraries
+Requires: automake
 Requires: libcurl = %{version}-%{release}
-Requires: libidn-devel, pkgconfig, automake
+Requires: libidn-devel
+Requires: pkgconfig
 
 Provides: curl-devel = %{version}-%{release}
 Obsoletes: curl-devel < %{version}-%{release}
@@ -159,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Sun Sep 27 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-10
+- require libssh2>=1.2 properly (#525002)
+
 * Sat Sep 26 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-9
 - let curl test-suite use valgrind
 - require libssh2>=1.2 (#525002)



From jkratoch at fedoraproject.org  Sun Sep 27 15:51:48 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sun, 27 Sep 2009 15:51:48 +0000 (UTC)
Subject: rpms/gdb/devel gdb-simultaneous-step-resume-breakpoint-test.patch, 
	NONE, 1.1 gdb.spec, 1.388, 1.389
Message-ID: <20090927155148.839BF11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24979

Modified Files:
	gdb.spec 
Added Files:
	gdb-simultaneous-step-resume-breakpoint-test.patch 
Log Message:
* Sun Sep 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-3
- New test for step-resume breakpoint placed in multiple threads at once.


gdb-simultaneous-step-resume-breakpoint-test.patch:
 simultaneous-step-resume-breakpoint.c   |   79 ++++++++++++++++++++++++++++++++
 simultaneous-step-resume-breakpoint.exp |   65 ++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

--- NEW FILE gdb-simultaneous-step-resume-breakpoint-test.patch ---
--- /dev/null	2009-09-25 12:44:54.497650251 +0200
+++ ./gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp	2009-09-25 17:27:12.000000000 +0200
@@ -0,0 +1,65 @@
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+# Test multiple threads stepping into a .debug_line-less function with
+# a breakpoint placed on its return-to-caller point.
+
+set testfile simultaneous-step-resume-breakpoint
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+
+# Ensure we have no debuginfo for the `sleep' call itself (=for libc).
+gdb_test "set debug-file-directory /DoesNotExist"
+
+gdb_load ${binfile}
+if ![runto_main] {
+   return -1
+}
+
+# Red Hat vendor patch does set it to "step" by default.
+gdb_test "set scheduler-locking off"
+
+gdb_breakpoint [gdb_get_line_number "final-exit"]
+
+gdb_breakpoint [gdb_get_line_number "sleep-call"]
+gdb_continue_to_breakpoint "sleep-call"
+
+gdb_test "step" "sleep-call.*" "step thread 1"
+gdb_test "step" "sleep-call.*" "step thread 2"
+gdb_test "step" "sleep-after.*" "step thread 3"
+
+set test "first continue"
+gdb_test_multiple "continue" $test {
+    -re "final-exit.*$gdb_prompt $" {
+	# gdb-7.0.
+	pass $test
+	return
+    }
+    -re "sleep-after.*$gdb_prompt $" {
+	# Fedora/RHEL branch.
+	pass $test
+    }
+}
+
+gdb_test "continue" "sleep-after.*" "second continue"
+gdb_test "continue" "final-exit.*" "third continue"
--- /dev/null	2009-09-25 12:44:54.497650251 +0200
+++ ./gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c	2009-09-25 17:29:42.000000000 +0200
@@ -0,0 +1,79 @@
+/* Copyright 2009 Free Software Foundation, Inc.
+
+   Written by Fred Fish of Cygnus Support
+   Contributed by Cygnus Support
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Test multiple threads stepping into a .debug_line-less function with
+   a breakpoint placed on its return-to-caller point.  */
+
+#include <pthread.h>
+#include <assert.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+
+#define THREADS 3
+
+static void *
+func (void *unused)
+{
+  int i;
+
+  errno = 0;
+  i = 0xdeadf00d;
+  i = sleep (THREADS);	/* sleep-call */
+  if (errno != 0)	/* sleep-after */
+    perror ("sleep");
+
+  /* The GDB bug with forgotten step-resume breakpoint could leave stale
+     breakpoint on the I assignment making it a nop.  */
+  if (i == 0xdeadf00d)
+    assert (0);
+
+  assert (i == 0);
+
+  pthread_exit (NULL);
+}
+
+int
+main (void)
+{
+  pthread_t threads[THREADS];
+  int threadi;
+
+  for (threadi = 0; threadi < THREADS; threadi++)
+    {
+      int i;
+
+      i = pthread_create (&threads[threadi], NULL, func, NULL);
+      assert (i == 0);
+
+      i = sleep (1);
+      assert (i == 0);
+    }
+
+  for (threadi = 0; threadi < THREADS; threadi++)
+    {
+      int i;
+
+      i = pthread_join (threads[threadi], NULL);
+      assert (i == 0);
+    }
+
+  return 0;	/* final-exit */
+}


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- gdb.spec	25 Sep 2009 11:06:47 -0000	1.388
+++ gdb.spec	27 Sep 2009 15:51:46 -0000	1.389
@@ -14,7 +14,7 @@ Version: 6.8.91.20090925
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 2%{?_with_upstream:.upstream}%{?dist}
+Release: 3%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -364,6 +364,9 @@ Patch375: gdb-readline-6.0.patch
 # Fix python pretty printers lookup on x86_64.
 Patch376: libstdc++-v3-python-common-prefix.patch
 
+# New test for step-resume breakpoint placed in multiple threads at once.
+Patch381: gdb-simultaneous-step-resume-breakpoint-test.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -557,6 +560,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch360 -p1
 %patch375 -p1
 %patch376 -p1
+%patch381 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -847,6 +851,9 @@ fi
 %endif
 
 %changelog
+* Sun Sep 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-3
+- New test for step-resume breakpoint placed in multiple threads at once.
+
 * Fri Sep 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-2
 - Fix buildid-loading libs w/matching name but different build-id (BZ 524572).
 



From pkgdb at fedoraproject.org  Sun Sep 27 16:01:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 16:01:47 +0000
Subject: [pkgdb] fusecompress_offline1 was added for lmacken
Message-ID: <20090927160147.EEDCF10F86A@bastion2.fedora.phx.redhat.com>

toshio has added Package fusecompress_offline1 with summary Utility to help migrate off of fusecompress-1.x
toshio has approved Package fusecompress_offline1
toshio has added a Fedora devel branch for fusecompress_offline1 with an owner of lmacken
toshio has approved fusecompress_offline1 in Fedora devel
toshio has approved Package fusecompress_offline1
toshio has set commit to Approved for 107427 on fusecompress_offline1 (Fedora devel)
toshio has set checkout to Approved for 107427 on fusecompress_offline1 (Fedora devel)
toshio has set build to Approved for 107427 on fusecompress_offline1 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fusecompress_offline1



From pkgdb at fedoraproject.org  Sun Sep 27 16:01:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 16:01:49 +0000
Subject: [pkgdb] fusecompress_offline1 summary updated by toshio
Message-ID: <20090927160149.9087A10F88C@bastion2.fedora.phx.redhat.com>

toshio set package fusecompress_offline1 summary to Utility to help migrate off of fusecompress-1.x

To make changes to this package see:
  /pkgdb/packages/name/fusecompress_offline1



From pkgdb at fedoraproject.org  Sun Sep 27 16:02:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 16:02:59 +0000
Subject: [pkgdb] fusecompress_offline1 (Fedora, devel) updated by toshio
Message-ID: <20090927160259.2154B10F874@bastion2.fedora.phx.redhat.com>

toshio changed owner of fusecompress_offline1 in Fedora devel to toshio
toshio approved watchbugzilla on fusecompress_offline1 (Fedora devel) for lkundrak
toshio approved watchcommits on fusecompress_offline1 (Fedora devel) for lkundrak
toshio approved commit on fusecompress_offline1 (Fedora devel) for lkundrak
toshio approved build on fusecompress_offline1 (Fedora devel) for lkundrak
toshio approved approveacls on fusecompress_offline1 (Fedora devel) for lkundrak
toshio approved watchbugzilla on fusecompress_offline1 (Fedora devel) for lmacken
toshio approved watchcommits on fusecompress_offline1 (Fedora devel) for lmacken
toshio approved commit on fusecompress_offline1 (Fedora devel) for lmacken
toshio approved build on fusecompress_offline1 (Fedora devel) for lmacken
toshio approved approveacls on fusecompress_offline1 (Fedora devel) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/fusecompress_offline1



From toshio at fedoraproject.org  Sun Sep 27 16:03:50 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 27 Sep 2009 16:03:50 +0000 (UTC)
Subject: rpms/fusecompress_offline1 - New directory
Message-ID: <20090927160350.2636511C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress_offline1
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ29310/rpms/fusecompress_offline1

Log Message:
Directory /cvs/pkgs/rpms/fusecompress_offline1 added to the repository




From toshio at fedoraproject.org  Sun Sep 27 16:03:50 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 27 Sep 2009 16:03:50 +0000 (UTC)
Subject: rpms/fusecompress_offline1/devel - New directory
Message-ID: <20090927160350.7B2F411C02C9@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress_offline1/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ29310/rpms/fusecompress_offline1/devel

Log Message:
Directory /cvs/pkgs/rpms/fusecompress_offline1/devel added to the repository




From toshio at fedoraproject.org  Sun Sep 27 16:03:58 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 27 Sep 2009 16:03:58 +0000 (UTC)
Subject: rpms/fusecompress_offline1 Makefile,NONE,1.1
Message-ID: <20090927160358.0686211C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress_offline1
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ29310/rpms/fusecompress_offline1

Added Files:
	Makefile 
Log Message:
Setup of module fusecompress_offline1


--- NEW FILE Makefile ---
# Top level Makefile for module fusecompress_offline1
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 toshio at fedoraproject.org  Sun Sep 27 16:03:58 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 27 Sep 2009 16:03:58 +0000 (UTC)
Subject: rpms/fusecompress_offline1/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090927160358.73CEA11C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress_offline1/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ29310/rpms/fusecompress_offline1/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fusecompress_offline1


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fusecompress_offline1
# $Id: Makefile,v 1.1 2009/09/27 16:03:58 toshio Exp $
NAME := fusecompress_offline1
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 toshio at fedoraproject.org  Sun Sep 27 16:07:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 27 Sep 2009 16:07:09 +0000 (UTC)
Subject: rpms/fusecompress/devel README.fedora, 1.1, 1.2 fusecompress.spec, 
	1.18, 1.19
Message-ID: <20090927160709.586BB11C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29908

Modified Files:
	README.fedora fusecompress.spec 
Log Message:

* Sun Sep 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-3
- Update README.fedora for new name of migration package.



Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.fedora	25 Sep 2009 12:43:14 -0000	1.1
+++ README.fedora	27 Sep 2009 16:07:08 -0000	1.2
@@ -1,7 +1,7 @@
 If you have fusecompress filesystems created prior to Fedora 12, you will need
 to update them to the new on disk format in order to use them with this version
-of fusecompress.  Install the fusecompress1 package via yum and read the
-README.fedora file there for instructions::
+of fusecompress.  Install the fusecompress_offline1 package via yum and read
+the README.fedora file there for instructions::
 
-    su -c yum install -y fusecompress1
-    less /usr/share/doc/fusecompress1*/README.fedora
+    su -c yum install -y fusecompress_offline1
+    less /usr/share/doc/fusecompress_offline1*/README.fedora


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fusecompress.spec	25 Sep 2009 12:43:14 -0000	1.18
+++ fusecompress.spec	27 Sep 2009 16:07:09 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           fusecompress
 Version:        2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-3
+- Update README.fedora for new name of migration package.
+
 * Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-2
 - Port code to newer liblzma as provided by xz.
 



From toshio at fedoraproject.org  Sun Sep 27 16:10:27 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 27 Sep 2009 16:10:27 +0000 (UTC)
Subject: rpms/fusecompress_offline1/devel README.fedora, NONE,
	1.1 fusecompress-1.99.19-gcc44.patch, NONE,
	1.1 fusecompress-1.99.19-types.patch, NONE,
	1.1 fusecompress-offline-decompress.patch, NONE,
	1.1 fusecompress_offline1.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090927161027.3253211C0424@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress_offline1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30896/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora fusecompress-1.99.19-gcc44.patch 
	fusecompress-1.99.19-types.patch 
	fusecompress-offline-decompress.patch 
	fusecompress_offline1.spec import.log 
Log Message:
Initial import



--- NEW FILE README.fedora ---
This package exists to allow people to upgrade from the fusecompress-1.x
on-disk format to fusecompress-2.x.

Let's say that in Fedora 11 your old fusecompress rootDir (where the files are
actually stored) is in ~/.fusestorage and you mount it on ~/storage. Now you've
updated to Fedora 12 and need to get your fusecompress filesystems updated to
the new on-disk format.  Here's the basic steps::

    # Make sure the old fusecompress filesystem is unmounted
    fusermount -u ~/storage
    # Move it to a new location
    mv ~/.fusestorage ~/.fusestorage.old
    # Create a new directory for our new format data
    mkdir ~/.fusestorage
    # Mount the new directory.  It's now a new format fusecompress filesystem
    fusecompress ~/.fusestorage ~/storage
    # Decompress all the files in the old fusecompress data directory
    fusecompress_offline1 ~/.fusestorage.old
    # Move the files into the new format storage
    mv .fusestorage.old/* ~/storage
    # If you have any hidden files, remember to move them too
    mv .fusestorage.old/.?* ~/storage

Note that to use this exact procedure you need to have enough disk space to
uncompress all of the files stored in ~/.fusestorage.old.  If you don't have
that much space, you'll have to run fusecompress_offline1 on portions of
~/.fusestorage.old and move them to ~/storage where they'll be recompressed,
freeing up the space for you to run fusecompress_offline1 on more files.

fusecompress-1.99.19-gcc44.patch:
 main.cpp         |    1 +
 main_offline.cpp |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE fusecompress-1.99.19-gcc44.patch ---
The STL headers in gcc-4.4 have been cleaned up, so that the headers don't drag in
unnecessary dependencies which aren't requested by the standard.
This fixes build for gcc-4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -urp fusecompress-1.99.19.orig/src/main.cpp fusecompress-1.99.19/src/main.cpp
--- fusecompress-1.99.19.orig/src/main.cpp	2008-08-11 14:25:10.000000000 +0200
+++ fusecompress-1.99.19/src/main.cpp	2009-02-03 19:48:16.000000000 +0100
@@ -11,6 +11,7 @@
 #include "CompressedTable.hpp"
 #include "CompressedMagic.hpp"
 
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
diff -urp fusecompress-1.99.19.orig/src/main_offline.cpp fusecompress-1.99.19/src/main_offline.cpp
--- fusecompress-1.99.19.orig/src/main_offline.cpp	2008-07-14 14:32:58.000000000 +0200
+++ fusecompress-1.99.19/src/main_offline.cpp	2009-02-03 19:58:39.000000000 +0100
@@ -16,6 +16,7 @@
 #include "Compress.hpp"
 #include "TransformTable.hpp"
 
+#include <cstdio>
 #include <iostream>
 #include <vector>
 #include <sstream>

fusecompress-1.99.19-types.patch:
 Memory.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fusecompress-1.99.19-types.patch ---
For some reason this is required on i386, but not on x86_64.

Lubomir Rintel <lkundrak at v3.sk>

diff -up fusecompress-1.99.19/src/Memory.cpp.types fusecompress-1.99.19/src/Memory.cpp
--- fusecompress-1.99.19/src/Memory.cpp.types	2008-09-28 10:37:28.000000000 +0200
+++ fusecompress-1.99.19/src/Memory.cpp	2008-09-28 10:37:35.000000000 +0200
@@ -181,11 +181,11 @@ ssize_t Memory::read(char *buf, size_t s
 		{
 			// m_FileSize, offset, size, block_offset
 			//
-			cs = min(block_offset - offset, len);
+			cs = min((ssize_t) (block_offset - offset), len);
 			cs = Parent::read(buf, cs, offset);
 			if (cs == 0)
 			{
-				cs = min(block_offset - offset, len);
+				cs = min((ssize_t) (block_offset - offset), len);
 				memset(buf, 0, cs);
 			}
 		}

fusecompress-offline-decompress.patch:
 main_offline.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fusecompress-offline-decompress.patch ---
diff -up fusecompress-1.99.19/src/main_offline.cpp.mine fusecompress-1.99.19/src/main_offline.cpp
--- fusecompress-1.99.19/src/main_offline.cpp.mine	2009-09-25 05:50:49.271880984 -0700
+++ fusecompress-1.99.19/src/main_offline.cpp	2009-09-25 05:52:20.348642922 -0700
@@ -226,7 +226,7 @@ inline bool test(const char *input)
 	{
 		// File is compressed with FuseCompress.
 		//
-		if (fh.type == g_TransformTable->getDefaultIndex())
+		if (fh.type == g_TransformTable->getDefaultIndex() && !g_RawOutput)
 		{
 			// File is compressed with the same compression
 			// method.


--- NEW FILE fusecompress_offline1.spec ---
Name:           fusecompress_offline1
Version:        1.99.19
Release:        6%{?dist}
Summary:        Utility to help migrate off of fusecompress-1.x

Group:          System Environment/Libraries
License:        GPLv2
URL:            http://miio.net/fusecompress/
Source0:        http://miio.net/files/fusecompress-%{version}.tar.gz
Source1:        README.fedora
Patch0:         fusecompress-1.99.19-types.patch
Patch1:         fusecompress-1.99.19-gcc44.patch
Patch2:         fusecompress-offline-decompress.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  rlog-devel fuse-devel zlib-devel bzip2-devel file-devel
BuildRequires:  autoconf
Requires:       fuse


%description
FuseCompress provides a mountable Linux filesystem which transparently
compresses its content.  Files stored in this filesystem are compressed
on the fly and Fuse allows to create a transparent interface between
compressed files and user applications.

This package provides fusecompress_offline1, a utility which enables users
of fusecompress-1.x filesystems to decompress their files.  This is a
necessary step in preparing their files for use with fusecompress-2.x
filesystems.  Instructions for performing an upgrade are in README.fedora or
the Fedora 12 release notes.

%prep
%setup -q -n fusecompress-%{version}
%patch0 -p1 -b .types
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .offline
cp %{SOURCE1} .
chmod a-x ChangeLog

find src -type f -exec chmod 0644 \{\} \;

%build
autoconf
autoheader
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mv $RPM_BUILD_ROOT%{_bindir}/fusecompress_offline $RPM_BUILD_ROOT%{_bindir}/fusecompress_offline1
mv $RPM_BUILD_ROOT%{_mandir}/man1/fusecompress_offline.1 $RPM_BUILD_ROOT%{_mandir}/man1/fusecompress_offline1.1

# This package is just for upgrading to fusecompress2.  So we don't want the
# binaries that enable mounting the old format
rm -f $RPM_BUILD_ROOT%{_bindir}/fusecompress
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fusecompress.1*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/fusecompress_offline1
%{_mandir}/man1/fusecompress_offline1.1*
%doc ChangeLog README AUTHORS COPYING NEWS README.fedora


%changelog
* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.99.19-6
- Remove executable bit from source files
- Rename package to fusecompress_offline1 to more closely match what's actually
  in it.

* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.99.19-5
- Fix build as a package just to enable migration from old on-disk format.
- Patch to fix offline decompression when the old compression format was lzo.

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.99.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Feb 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.99.19-3
- Fix build with gcc44

* Sun Sep 28 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.19-2
- Fix build
- Drop silly mount wrapper

* Sat Sep 27 2008 Luke Macken <lmacken at redhat.com> - 1.99.19-1
- Update to 1.99.19
- Remove fusecompress-1.99.17-attr.patch and fusecompress-1.99.17-gcc43.patch,
  as they are now upstream in this release.

* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.18-1
- New upstream release, bugfix

* Wed Jul 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.17-2
- Fix build:
- Upstream added manual
- Upstream looks for xattr.h in a little non-standard place
- GCC 4.3 fix

* Wed Jul 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.17-1
- Upstream integrated our fix

* Sun Jul 13 2008 Lubomir Rintel <lkundrak at v3.sk> 1.99.16-1
- New upstream release
- Fedora patches integrated upstream
- Rebuild against newer librlog

* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-3
- Fix build with gcc43

* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-2
- move mount helper to doc

* Mon Mar 10 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-1
- mount helper
- new upstream

* Fri Nov 02 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.99.13-1
- Initial package


--- NEW FILE import.log ---
fusecompress_offline1-1_99_19-6_fc11:HEAD:fusecompress_offline1-1.99.19-6.fc11.src.rpm:1254067501


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress_offline1/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Sep 2009 16:03:58 -0000	1.1
+++ .cvsignore	27 Sep 2009 16:10:26 -0000	1.2
@@ -0,0 +1 @@
+fusecompress-1.99.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress_offline1/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Sep 2009 16:03:58 -0000	1.1
+++ sources	27 Sep 2009 16:10:26 -0000	1.2
@@ -0,0 +1 @@
+2d1e10397f888ac46697070790a06ddc  fusecompress-1.99.19.tar.gz



From sailer at fedoraproject.org  Sun Sep 27 16:31:10 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 27 Sep 2009 16:31:10 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel .cvsignore, 1.3, 1.4 mingw32-pangomm.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090927163111.0946B11C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5289

Modified Files:
	.cvsignore mingw32-pangomm.spec sources 
Log Message:
update to 2.26.0 to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Sep 2009 22:26:53 -0000	1.3
+++ .cvsignore	27 Sep 2009 16:31:08 -0000	1.4
@@ -1,2 +1,3 @@
 pangomm-2.24.0.tar.bz2
 pangomm-2.25.1.3.tar.bz2
+pangomm-2.26.0.tar.bz2


Index: mingw32-pangomm.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/mingw32-pangomm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-pangomm.spec	19 Sep 2009 23:10:50 -0000	1.6
+++ mingw32-pangomm.spec	27 Sep 2009 16:31:08 -0000	1.7
@@ -8,8 +8,8 @@
 %global apiver 1.4
 
 Name:           mingw32-pangomm
-Version:        2.25.1.3
-Release:        2%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for Pango
 
 License:        LGPLv2+
@@ -73,11 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.26.0-1
+- update to 2.26.0 to match native package
+
 * Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.25.1.3-2
 - also package pangommconfig.h
 
 * Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.25.1.3-1
-- update to 2.25.1.3 match native package
+- update to 2.25.1.3 to match native package
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Sep 2009 22:26:54 -0000	1.3
+++ sources	27 Sep 2009 16:31:08 -0000	1.4
@@ -1 +1 @@
-e9aac0019cb56350ceb5fcb316f2797c  pangomm-2.25.1.3.tar.bz2
+37f54dc8e6cb73ed923b22f313352156  pangomm-2.26.0.tar.bz2



From sailer at fedoraproject.org  Sun Sep 27 16:31:24 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 27 Sep 2009 16:31:24 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel .cvsignore, 1.6,
	1.7 mingw32-glibmm24.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20090927163124.EF58D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5410

Modified Files:
	.cvsignore mingw32-glibmm24.spec sources 
Log Message:
update to 2.22.1 to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Sep 2009 22:13:12 -0000	1.6
+++ .cvsignore	27 Sep 2009 16:31:24 -0000	1.7
@@ -3,3 +3,4 @@ glibmm-2.20.0.tar.bz2
 glibmm-2.21.3.tar.bz2
 glibmm-2.21.4.tar.bz2
 glibmm-2.21.5.tar.bz2
+glibmm-2.22.1.tar.bz2


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-glibmm24.spec	19 Sep 2009 22:13:12 -0000	1.9
+++ mingw32-glibmm24.spec	27 Sep 2009 16:31:24 -0000	1.10
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glibmm24
-Version:        2.21.5
+Version:        2.22.1
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -82,14 +82,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.22.1-1
+- update to 2.22.1 to match native package
+
 * Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.5-1
-- update to 2.21.5 match native package
+- update to 2.21.5 to match native package
 
 * Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.4-1
-- update to 2.21.4 match native package
+- update to 2.21.4 to match native package
 
 * Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.3-1
-- update to 2.21.3 match native package
+- update to 2.21.3 to match native package
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 Sep 2009 22:13:12 -0000	1.6
+++ sources	27 Sep 2009 16:31:24 -0000	1.7
@@ -1 +1 @@
-9fa38563cbe6bf232ddbbe114f6f3a3f  glibmm-2.21.5.tar.bz2
+1a96c7fde75ddbb421bc23fb4aa7adba  glibmm-2.22.1.tar.bz2



From sailer at fedoraproject.org  Sun Sep 27 16:40:19 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 27 Sep 2009 16:40:19 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel .cvsignore, 1.4, 1.5 mingw32-gtkmm24.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090927164019.ADDB511C0424@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8456

Modified Files:
	.cvsignore mingw32-gtkmm24.spec sources 
Log Message:
update to 2.18.1 to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Sep 2009 00:07:12 -0000	1.4
+++ .cvsignore	27 Sep 2009 16:40:18 -0000	1.5
@@ -1,3 +1,4 @@
 gtkmm-2.16.0.tar.bz2
 gtkmm-2.17.2.tar.bz2
 gtkmm-2.17.11.tar.bz2
+gtkmm-2.18.1.tar.bz2


Index: mingw32-gtkmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/mingw32-gtkmm24.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-gtkmm24.spec	20 Sep 2009 00:07:12 -0000	1.5
+++ mingw32-gtkmm24.spec	27 Sep 2009 16:40:19 -0000	1.6
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtkmm24
-Version:        2.17.11
+Version:        2.18.1
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.18.1-1
+- update to 2.18.1 to match native
+
 * Sat Sep 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.17.11-1
 - update to 2.17.11 to match native
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Sep 2009 00:07:12 -0000	1.4
+++ sources	27 Sep 2009 16:40:19 -0000	1.5
@@ -1 +1 @@
-17c651028978e1ecb182f0d387a253b5  gtkmm-2.17.11.tar.bz2
+7b36f7ea10f183d14b20cad8c1f70daa  gtkmm-2.18.1.tar.bz2



From cdamian at fedoraproject.org  Sun Sep 27 17:03:04 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun, 27 Sep 2009 17:03:04 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/devel .cvsignore, 1.2,
	1.3 php-doctrine-Doctrine.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090927170305.0884C11C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16027

Modified Files:
	.cvsignore php-doctrine-Doctrine.spec sources 
Log Message:
upstream 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 18:45:24 -0000	1.2
+++ .cvsignore	27 Sep 2009 17:02:59 -0000	1.3
@@ -1 +1 @@
-Doctrine-1.1.3.tgz
+Doctrine-1.1.4.tgz


Index: php-doctrine-Doctrine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/php-doctrine-Doctrine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-doctrine-Doctrine.spec	25 Sep 2009 18:45:24 -0000	1.1
+++ php-doctrine-Doctrine.spec	27 Sep 2009 17:03:00 -0000	1.2
@@ -2,8 +2,8 @@
 %global pear_name Doctrine
 
 Name:           php-doctrine-Doctrine
-Version:        1.1.3
-Release:        4%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        PHP Object Relational Mapper
 
 Group:          Development/Libraries
@@ -85,6 +85,9 @@ fi
 %{pear_phpdir}/%{pear_name}
 
 %changelog
+* Sun Sep 27 2009 Christof Damian <christof at damian.net> 1.1.4-1
+- upstream 1.1.4
+
 * Thu Sep 24 2009 Christof Damian <christof at damian.net> 1.1.3-4
 - fix provide
 
@@ -96,5 +99,3 @@ fi
 
 * Sat Aug 15 2009 Christof Damian <christof at damian.net> 1.1.3-1
 - initial rpm
-
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 18:45:24 -0000	1.2
+++ sources	27 Sep 2009 17:03:00 -0000	1.3
@@ -1 +1 @@
-cdd9ebb1e146514dac9dc36aaa2db5d7  Doctrine-1.1.3.tgz
+1832e9e655019689b2caa8296c73e58f  Doctrine-1.1.4.tgz



From sailer at fedoraproject.org  Sun Sep 27 17:07:53 2009
From: sailer at fedoraproject.org (sailer)
Date: Sun, 27 Sep 2009 17:07:53 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel mingw32-gtkmm24.spec,1.6,1.7
Message-ID: <20090927170753.2836711C00E6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18572

Modified Files:
	mingw32-gtkmm24.spec 
Log Message:
relax BR



Index: mingw32-gtkmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/mingw32-gtkmm24.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-gtkmm24.spec	27 Sep 2009 16:40:19 -0000	1.6
+++ mingw32-gtkmm24.spec	27 Sep 2009 17:07:52 -0000	1.7
@@ -25,7 +25,7 @@ BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-glibmm24 >= 2.21.2
 BuildRequires:  mingw32-atk
 BuildRequires:  mingw32-pango
-BuildRequires:  mingw32-gtk2 >= %{version}
+BuildRequires:  mingw32-gtk2
 BuildRequires:  mingw32-cairomm
 BuildRequires:  mingw32-pangomm
 



From mtruch at fedoraproject.org  Sun Sep 27 17:14:58 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 17:14:58 +0000 (UTC)
Subject: rpms/getdata/F-11 getdata-mstrings.diff, NONE, 1.1 getdata.spec, 1.7,
	1.8
Message-ID: <20090927171458.4BCE411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20649

Modified Files:
	getdata.spec 
Added Files:
	getdata-mstrings.diff 
Log Message:
Apply bugfix patch from upstream.


getdata-mstrings.diff:
 meta_list.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE getdata-mstrings.diff ---
diff -ur getdata-0.5.0/src/meta_list.c getdata-0.5.0-tests-fixed/src/meta_list.c
--- getdata-0.5.0/src/meta_list.c	2008-11-23 19:08:56.000000000 -0500
+++ getdata-0.5.0-tests-fixed/src/meta_list.c	2009-09-18 23:01:01.000000000 -0400
@@ -123,7 +123,7 @@
     if (e->meta_entry[i]->field_type == GD_STRING_ENTRY)
       fl[n++] = e->meta_entry[i]->e->string;
   }
-  fl[i] = NULL;
+  fl[n] = NULL;
 
   e->string_value_list = (const char**)fl;
 


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-11/getdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- getdata.spec	17 Aug 2009 02:31:15 -0000	1.7
+++ getdata.spec	27 Sep 2009 17:14:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://getdata.sourcefor
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         getdata-mstrings.diff
+
 BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
@@ -51,6 +53,7 @@ Does not yet allow writing of bzip2 enco
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
@@ -102,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 0.5.0-4
+- Apply mstrings bugfix from upstream.
+
 * Sun Aug 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-3
 - Disable verbose debugging output.
 



From mtruch at fedoraproject.org  Sun Sep 27 17:18:59 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 17:18:59 +0000 (UTC)
Subject: rpms/getdata/F-10 getdata-mstrings.diff, NONE, 1.1 getdata.spec, 1.6,
	1.7
Message-ID: <20090927171859.82A2411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22371

Modified Files:
	getdata.spec 
Added Files:
	getdata-mstrings.diff 
Log Message:
Apply upstream bugfix patch.


getdata-mstrings.diff:
 meta_list.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE getdata-mstrings.diff ---
diff -ur getdata-0.5.0/src/meta_list.c getdata-0.5.0-tests-fixed/src/meta_list.c
--- getdata-0.5.0/src/meta_list.c	2008-11-23 19:08:56.000000000 -0500
+++ getdata-0.5.0-tests-fixed/src/meta_list.c	2009-09-18 23:01:01.000000000 -0400
@@ -123,7 +123,7 @@
     if (e->meta_entry[i]->field_type == GD_STRING_ENTRY)
       fl[n++] = e->meta_entry[i]->e->string;
   }
-  fl[i] = NULL;
+  fl[n] = NULL;
 
   e->string_value_list = (const char**)fl;
 


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-10/getdata.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- getdata.spec	17 Aug 2009 02:33:11 -0000	1.6
+++ getdata.spec	27 Sep 2009 17:18:58 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://getdata.sourcefor
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         getdata-mstrings.diff
+
 BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
@@ -51,6 +53,7 @@ Does not yet allow writing of bzip2 enco
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
@@ -102,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 0.5.0-3
+- Apply upstream bugfix patch for mstrings.
+
 * Sun Aug 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-2
 - Disable verbose debugging output.
 



From sdz at fedoraproject.org  Sun Sep 27 17:19:44 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 27 Sep 2009 17:19:44 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.39, 1.40 sources, 1.43,
	1.44 sugar-toolkit.spec, 1.55, 1.56
Message-ID: <20090927171944.6D97D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22721

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	18 Sep 2009 16:55:08 -0000	1.39
+++ .cvsignore	27 Sep 2009 17:19:44 -0000	1.40
@@ -1 +1 @@
-sugar-toolkit-0.85.8.tar.bz2
+sugar-toolkit-0.86.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	18 Sep 2009 16:55:08 -0000	1.43
+++ sources	27 Sep 2009 17:19:44 -0000	1.44
@@ -1 +1 @@
-eae3fbec9e4321c2f1d6dc6d5ee9d74f  sugar-toolkit-0.85.8.tar.bz2
+56db1b52cabc49fe31eb2ddca7e116c6  sugar-toolkit-0.86.0.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sugar-toolkit.spec	18 Sep 2009 16:55:08 -0000	1.55
+++ sugar-toolkit.spec	27 Sep 2009 17:19:44 -0000	1.56
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.85.8
+Version: 0.86.0
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
+- New upstream release
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-1
 - New upstream release
 



From sdz at fedoraproject.org  Sun Sep 27 17:22:07 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 27 Sep 2009 17:22:07 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel .cvsignore, 1.16, 1.17 sources,
	1.16, 1.17 sugar-presence-service.spec, 1.23, 1.24
Message-ID: <20090927172207.5600D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-presence-service/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23533

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 Sep 2009 17:27:45 -0000	1.16
+++ .cvsignore	27 Sep 2009 17:22:06 -0000	1.17
@@ -1 +1 @@
-sugar-presence-service-0.85.3.tar.bz2
+sugar-presence-service-0.86.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	18 Sep 2009 17:27:45 -0000	1.16
+++ sources	27 Sep 2009 17:22:07 -0000	1.17
@@ -1 +1 @@
-c89d4486bd4eafb57a07c516c89a81bd  sugar-presence-service-0.85.3.tar.bz2
+744c0486d7acdccbb0b6331827a1c165  sugar-presence-service-0.86.0.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sugar-presence-service.spec	18 Sep 2009 17:27:45 -0000	1.23
+++ sugar-presence-service.spec	27 Sep 2009 17:22:07 -0000	1.24
@@ -1,5 +1,5 @@
 Name: sugar-presence-service
-Version: 0.85.3
+Version: 0.86.0
 Release: 1%{?dist}
 Summary: The Sugar presence service
 
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
+- New upstream release
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
 - New upstream release
 



From mtruch at fedoraproject.org  Sun Sep 27 17:22:14 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 17:22:14 +0000 (UTC)
Subject: rpms/getdata/EL-4 getdata-mstrings.diff, NONE, 1.1 getdata.spec, 1.7,
	1.8
Message-ID: <20090927172214.3B85011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23546

Modified Files:
	getdata.spec 
Added Files:
	getdata-mstrings.diff 
Log Message:
Disable verbose debugging output; enable upstream bugfix patch.


getdata-mstrings.diff:
 meta_list.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE getdata-mstrings.diff ---
diff -ur getdata-0.5.0/src/meta_list.c getdata-0.5.0-tests-fixed/src/meta_list.c
--- getdata-0.5.0/src/meta_list.c	2008-11-23 19:08:56.000000000 -0500
+++ getdata-0.5.0-tests-fixed/src/meta_list.c	2009-09-18 23:01:01.000000000 -0400
@@ -123,7 +123,7 @@
     if (e->meta_entry[i]->field_type == GD_STRING_ENTRY)
       fl[n++] = e->meta_entry[i]->e->string;
   }
-  fl[i] = NULL;
+  fl[n] = NULL;
 
   e->string_value_list = (const char**)fl;
 


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/EL-4/getdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- getdata.spec	24 Jul 2009 23:54:16 -0000	1.7
+++ getdata.spec	27 Sep 2009 17:22:14 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://getdata.sourceforge.net/
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         getdata-mstrings.diff
 
 BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
@@ -51,10 +52,11 @@ Does not yet allow writing of bzip2 enco
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static --enable-modules --enable-debug
+%configure --disable-static --enable-modules
 make %{?_smp_mflags}
 
 %check
@@ -102,6 +104,10 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 0.5.0-4
+- Disable verbose debugging output.
+- Apply bugfix patch from upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nim at fedoraproject.org  Sun Sep 27 17:25:07 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 27 Sep 2009 17:25:07 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.14, 1.15 fontpackages.spec,
	1.20, 1.21 import.log, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20090927172507.4A22911C00E6@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24539/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	26 Sep 2009 21:00:05 -0000	1.14
+++ .cvsignore	27 Sep 2009 17:25:06 -0000	1.15
@@ -1 +1 @@
-fontpackages-1.24.tar.xz
+fontpackages-1.25.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fontpackages.spec	26 Sep 2009 21:00:05 -0000	1.20
+++ fontpackages.spec	27 Sep 2009 17:25:06 -0000	1.21
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.24
+Version: 1.25
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -100,6 +100,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.25-1
+? Add short test summary to repo-font-audit
+
 * Sat Sep 26 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.24-1
 ? improve repo-font-audit (make WWS check more accurate, support file://


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	26 Sep 2009 21:00:05 -0000	1.16
+++ import.log	27 Sep 2009 17:25:06 -0000	1.17
@@ -14,3 +14,4 @@ fontpackages-1_21-1_fc12:HEAD:fontpackag
 fontpackages-1_22-1_fc12:HEAD:fontpackages-1.22-1.fc12.src.rpm:1245574642
 fontpackages-1_23-1_fc12:HEAD:fontpackages-1.23-1.fc12.src.rpm:1252848946
 fontpackages-1_24-1_fc12:HEAD:fontpackages-1.24-1.fc12.src.rpm:1253998725
+fontpackages-1_25-1_fc12:HEAD:fontpackages-1.25-1.fc12.src.rpm:1254072286


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	26 Sep 2009 21:00:05 -0000	1.14
+++ sources	27 Sep 2009 17:25:06 -0000	1.15
@@ -1 +1 @@
-5faa75d10ad961c34b71d67201f3ebc7  fontpackages-1.24.tar.xz
+04f9517f577d0fd806276daeed14b844  fontpackages-1.25.tar.xz



From sdz at fedoraproject.org  Sun Sep 27 17:26:02 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 27 Sep 2009 17:26:02 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 sugar-datastore.spec, 1.22, 1.23
Message-ID: <20090927172602.7F75D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24824

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 Sep 2009 17:02:55 -0000	1.16
+++ .cvsignore	27 Sep 2009 17:26:02 -0000	1.17
@@ -1 +1 @@
-sugar-datastore-0.85.4.tar.bz2
+sugar-datastore-0.86.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	18 Sep 2009 17:02:56 -0000	1.16
+++ sources	27 Sep 2009 17:26:02 -0000	1.17
@@ -1 +1 @@
-6b3ad85cdcc3304f27596ce8a91f5112  sugar-datastore-0.85.4.tar.bz2
+4be2be494d90ccc77749c364bf757e08  sugar-datastore-0.86.0.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sugar-datastore.spec	18 Sep 2009 17:22:37 -0000	1.22
+++ sugar-datastore.spec	27 Sep 2009 17:26:02 -0000	1.23
@@ -4,8 +4,8 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.85.4
-Release: 3%{?dist}
+Version: 0.86.0
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
 Summary: Sugar Datastore
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
+- New upstream release
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-3
 - Rename files in docs accordingly
 



From sdz at fedoraproject.org  Sun Sep 27 17:29:05 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 27 Sep 2009 17:29:05 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.45, 1.46 sources, 1.47,
	1.48 sugar.spec, 1.73, 1.74
Message-ID: <20090927172905.A240811C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26468

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	18 Sep 2009 17:01:15 -0000	1.45
+++ .cvsignore	27 Sep 2009 17:29:03 -0000	1.46
@@ -1 +1 @@
-sugar-0.85.8.tar.bz2
+sugar-0.86.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	18 Sep 2009 17:01:15 -0000	1.47
+++ sources	27 Sep 2009 17:29:04 -0000	1.48
@@ -1 +1 @@
-e21ec8ce785a0126606ccd9057826e9f  sugar-0.85.8.tar.bz2
+ca3f9b617946f5f60e45121fcecbfead  sugar-0.86.0.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sugar.spec	18 Sep 2009 17:12:46 -0000	1.73
+++ sugar.spec	27 Sep 2009 17:29:04 -0000	1.74
@@ -5,8 +5,8 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.85.8
-Release: 2%{?dist}
+Version: 0.86.0
+Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -143,6 +143,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/sugar-emulator.desktop
 
 %changelog
+* Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
+- New upstream release
+
 * Fri Sep 18 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.8-2
 - Package /usr/share/applications/sugar-emulator.desktop
 



From nucleo at fedoraproject.org  Sun Sep 27 17:30:56 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sun, 27 Sep 2009 17:30:56 +0000 (UTC)
Subject: rpms/webkitkde/devel webkitkde.spec,1.1,1.2
Message-ID: <20090927173056.719C311C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27093

Modified Files:
	webkitkde.spec 
Log Message:
webkitpart should owns kpartplugins


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webkitkde.spec	25 Sep 2009 16:43:18 -0000	1.1
+++ webkitkde.spec	27 Sep 2009 17:30:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             webkitkde
 Version:          0.0.1
-Release:          0.1.20090924svn%{?dist}
+Release:          0.2.20090924svn%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -76,6 +76,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
 
 %find_lang %{name}
 
@@ -131,5 +132,8 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Sun Sep 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.2.20090924svn
+- webkitpart should owns kpartplugins in webkitpart apps dir
+
 * Thu Sep 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.1.20090924svn
 - Initial RPM release



From nucleo at fedoraproject.org  Sun Sep 27 17:31:59 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sun, 27 Sep 2009 17:31:59 +0000 (UTC)
Subject: rpms/webkitkde/F-10 webkitkde.spec,1.1,1.2
Message-ID: <20090927173159.696AC11C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27487

Modified Files:
	webkitkde.spec 
Log Message:
webkitpart should owns kpartplugins


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-10/webkitkde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webkitkde.spec	25 Sep 2009 16:45:41 -0000	1.1
+++ webkitkde.spec	27 Sep 2009 17:31:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             webkitkde
 Version:          0.0.1
-Release:          0.1.20090924svn%{?dist}
+Release:          0.2.20090924svn%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -76,6 +76,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
 
 %find_lang %{name}
 
@@ -131,5 +132,8 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Sun Sep 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.2.20090924svn
+- webkitpart should owns kpartplugins in webkitpart apps dir
+
 * Thu Sep 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.1.20090924svn
 - Initial RPM release



From nucleo at fedoraproject.org  Sun Sep 27 17:32:42 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sun, 27 Sep 2009 17:32:42 +0000 (UTC)
Subject: rpms/webkitkde/F-11 webkitkde.spec,1.1,1.2
Message-ID: <20090927173242.0D06411C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27804

Modified Files:
	webkitkde.spec 
Log Message:
webkitpart should owns kpartplugins


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-11/webkitkde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webkitkde.spec	25 Sep 2009 16:49:13 -0000	1.1
+++ webkitkde.spec	27 Sep 2009 17:32:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             webkitkde
 Version:          0.0.1
-Release:          0.1.20090924svn%{?dist}
+Release:          0.2.20090924svn%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -76,6 +76,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
 
 %find_lang %{name}
 
@@ -131,5 +132,8 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Sun Sep 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.2.20090924svn
+- webkitpart should owns kpartplugins in webkitpart apps dir
+
 * Thu Sep 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.1.20090924svn
 - Initial RPM release



From pkgdb at fedoraproject.org  Sun Sep 27 17:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 17:32:55 +0000
Subject: [pkgdb] hulahop: sdz has requested watchbugzilla
Message-ID: <20090927173255.D124310F88B@bastion2.fedora.phx.redhat.com>

sdz has requested the watchbugzilla acl on hulahop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Sun Sep 27 17:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 17:32:59 +0000
Subject: [pkgdb] hulahop: sdz has requested commit
Message-ID: <20090927173259.0E72C10F8A9@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on hulahop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Sun Sep 27 17:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 17:32:59 +0000
Subject: [pkgdb] hulahop: sdz has requested watchcommits
Message-ID: <20090927173300.2D9CB10F8AC@bastion2.fedora.phx.redhat.com>

sdz has requested the watchcommits acl on hulahop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Sun Sep 27 17:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 17:33:01 +0000
Subject: [pkgdb] hulahop: sdz has requested approveacls
Message-ID: <20090927173301.9342710F8B1@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on hulahop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pbrobinson at fedoraproject.org  Sun Sep 27 17:44:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 27 Sep 2009 17:44:39 +0000 (UTC)
Subject: rpms/pwlib/devel Makefile, 1.2, NONE pwlib-1.10-libperms.patch, 1.1,
	NONE pwlib-1.10.10-libv4l.patch, 1.1,
	NONE pwlib-1.10.10.rescale.patch, 1.1, NONE pwlib.spec, 1.59, NONE
Message-ID: <20090927174440.06DA811C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32493

Removed Files:
	Makefile pwlib-1.10-libperms.patch pwlib-1.10.10-libv4l.patch 
	pwlib-1.10.10.rescale.patch pwlib.spec 
Log Message:
- remove all files


--- Makefile DELETED ---


--- pwlib-1.10-libperms.patch DELETED ---


--- pwlib-1.10.10-libv4l.patch DELETED ---


--- pwlib-1.10.10.rescale.patch DELETED ---


--- pwlib.spec DELETED ---



From sdz at fedoraproject.org  Sun Sep 27 17:45:00 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 27 Sep 2009 17:45:00 +0000 (UTC)
Subject: rpms/sugar-imageviewer/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-imageviewer.spec, 1.9, 1.10
Message-ID: <20090927174500.D025E11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-imageviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32578

Modified Files:
	.cvsignore sources sugar-imageviewer.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Sep 2009 17:27:55 -0000	1.5
+++ .cvsignore	27 Sep 2009 17:45:00 -0000	1.6
@@ -1 +1 @@
-ImageViewer-11.tar.bz2
+ImageViewer-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Sep 2009 17:27:55 -0000	1.5
+++ sources	27 Sep 2009 17:45:00 -0000	1.6
@@ -1 +1 @@
-0e453a701ff4658a03906540d3b50818  ImageViewer-11.tar.bz2
+e98e2e7124f6fd104432852f65a5c65b  ImageViewer-13.tar.bz2


Index: sugar-imageviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/sugar-imageviewer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sugar-imageviewer.spec	11 Sep 2009 17:27:55 -0000	1.9
+++ sugar-imageviewer.spec	27 Sep 2009 17:45:00 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           sugar-imageviewer
-Version:        11
+Version:        13
 Release:        1%{?dist}
 Summary:        Simple Image viewer for Sugar
 
@@ -45,6 +45,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
+- Updated translations for German, Portuguese and Mongolian
+
 * Fri Sep 09 2009 Simon Schampijer <simon at schampijer.de> - 11-1
 - Switch to new toolbar system
 - Show transfer progress



From pbrobinson at fedoraproject.org  Sun Sep 27 17:46:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 27 Sep 2009 17:46:41 +0000 (UTC)
Subject: rpms/pwlib/F-10 Makefile, 1.2, NONE config.guess, 1.1,
	NONE pwlib-1.10-libperms.patch, 1.1,
	NONE pwlib-1.10.10-libv4l.patch, 1.1,
	NONE pwlib-1.10.10.rescale.patch, 1.1, NONE pwlib.spec, 1.58,
	NONE sources, 1.20, NONE
Message-ID: <20090927174642.0163D11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pwlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv630

Removed Files:
	Makefile config.guess pwlib-1.10-libperms.patch 
	pwlib-1.10.10-libv4l.patch pwlib-1.10.10.rescale.patch 
	pwlib.spec sources 
Log Message:
- remove all files


--- Makefile DELETED ---


--- config.guess DELETED ---


--- pwlib-1.10-libperms.patch DELETED ---


--- pwlib-1.10.10-libv4l.patch DELETED ---


--- pwlib-1.10.10.rescale.patch DELETED ---


--- pwlib.spec DELETED ---


--- sources DELETED ---



From sdz at fedoraproject.org  Sun Sep 27 17:47:24 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 27 Sep 2009 17:47:24 +0000 (UTC)
Subject: rpms/sugar-read/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sugar-read.spec, 1.4, 1.5
Message-ID: <20090927174724.C371E11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-read/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv813

Modified Files:
	.cvsignore sources sugar-read.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Sep 2009 10:00:31 -0000	1.4
+++ .cvsignore	27 Sep 2009 17:47:24 -0000	1.5
@@ -1 +1 @@
-Read-73.tar.bz2
+Read-75.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Sep 2009 10:00:31 -0000	1.4
+++ sources	27 Sep 2009 17:47:24 -0000	1.5
@@ -1 +1 @@
-a0373f4ceb16a25632fe1441ad1700bd  Read-73.tar.bz2
+4bf1f0eca8d27523e6f5270a810fada5  Read-75.tar.bz2


Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sugar-read.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sugar-read.spec	12 Sep 2009 10:00:31 -0000	1.4
+++ sugar-read.spec	27 Sep 2009 17:47:24 -0000	1.5
@@ -1,5 +1,5 @@
 Name: sugar-read
-Version: 73
+Version: 75
 Release: 1%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
@@ -50,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 75-1
+- Fix search in Epub files (dslo #1319)
+- Updated translations for German, Mongolian and Portuguese
+
 * Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 73-1
 - New toolbars
 - Support for Epub files



From emaldonado at fedoraproject.org  Sun Sep 27 17:50:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 27 Sep 2009 17:50:54 +0000 (UTC)
Subject: rpms/nss/devel sysinit.patch,1.2,1.3 nss.spec,1.119,1.120
Message-ID: <20090927175054.1F2B311C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1766

Modified Files:
	sysinit.patch nss.spec 
Log Message:
Fix sysinit to be under mozilla/security/nss/lib

sysinit.patch:
 manifest.mn          |    1 
 pk11wrap/pk11load.c  |  133 ++++++++++++++---
 pk11wrap/pk11pars.c  |  394 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 pk11wrap/pk11util.c  |   82 +++-------
 pk11wrap/secmodi.h   |   21 ++
 pki/pki3hack.c       |   10 +
 sysinit/Makefile     |   80 ++++++++++
 sysinit/config.mk    |  121 +++++++++++++++
 sysinit/manifest.mn  |   50 ++++++
 sysinit/nsssysinit.c |  356 ++++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 1169 insertions(+), 79 deletions(-)

Index: sysinit.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sysinit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sysinit.patch	19 Sep 2009 16:29:16 -0000	1.2
+++ sysinit.patch	27 Sep 2009 17:50:52 -0000	1.3
@@ -1,24 +1,24 @@
-Index: ./mozilla/security/nss/cmd/manifest.mn
+Index: ./mozilla/security/nss/lib/manifest.mn
 ===================================================================
-RCS file: /cvsroot/mozilla/security/nss/cmd/manifest.mn,v
-retrieving revision 1.27
-diff -u -p -r1.27 manifest.mn
---- ./mozilla/security/nss/cmd/manifest.mn	4 Sep 2008 22:15:21 -0000	1.27
-+++ ./mozilla/security/nss/cmd/manifest.mn	18 Sep 2009 23:38:36 -0000
-@@ -75,6 +75,7 @@ DIRS = lib  \
-  ssltap  \
-  strsclnt \
-  symkeyutil \
-+ sysinit \
-  tests \
-  tstclnt  \
-  vfychain \
-Index: mozilla/security/nss/cmd/sysinit/Makefile
+RCS file: /cvsroot/mozilla/security/nss/lib/manifest.mn,v
+retrieving revision 1.19
+diff -u -p -r1.19 manifest.mn
+--- ./mozilla/security/nss/lib/manifest.mn	16 Nov 2007 05:29:23 -0000	1.19
++++ ./mozilla/security/nss/lib/manifest.mn	27 Sep 2009 16:38:49 -0000
+@@ -56,6 +56,7 @@ DIRS =  util freebl softoken \
+ 	pkcs12 pkcs7 smime \
+ 	crmf jar \
+ 	ckfw      \
++	sysinit \
+ 	$(NULL)
+ 
+ #  fortcrypt  is no longer built
+Index: ./mozilla/security/nss/lib/sysinit/Makefile
 ===================================================================
-RCS file: security/nss/cmd/sysinit/Makefile
-diff -N security/nss/cmd/sysinit/Makefile
+RCS file: ./mozilla/security/nss/lib/sysinit/Makefile
+diff -N ./mozilla/security/nss/lib/sysinit/Makefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/Makefile	18 Sep 2009 23:38:36 -0000
++++ ./mozilla/security/nss/lib/sysinit/Makefile	27 Sep 2009 16:38:50 -0000
 @@ -0,0 +1,80 @@
 +#! gmake
 +#
@@ -100,12 +100,12 @@ diff -N security/nss/cmd/sysinit/Makefil
 +
 +#include ../platrules.mk
 +
-Index: mozilla/security/nss/cmd/sysinit/config.mk
+Index: ./mozilla/security/nss/lib/sysinit/config.mk
 ===================================================================
-RCS file: security/nss/cmd/sysinit/config.mk
-diff -N security/nss/cmd/sysinit/config.mk
+RCS file: ./mozilla/security/nss/lib/sysinit/config.mk
+diff -N ./mozilla/security/nss/lib/sysinit/config.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/config.mk	18 Sep 2009 23:38:36 -0000
++++ ./mozilla/security/nss/lib/sysinit/config.mk	27 Sep 2009 16:38:50 -0000
 @@ -0,0 +1,121 @@
 +#
 +# ***** BEGIN LICENSE BLOCK *****
@@ -228,12 +228,12 @@ diff -N security/nss/cmd/sysinit/config.
 +DLLFLAGS += -EXPORT:mktemp=nss_mktemp,PRIVATE
 +endif
 +endif
-Index: mozilla/security/nss/cmd/sysinit/manifest.mn
+Index: ./mozilla/security/nss/lib/sysinit/manifest.mn
 ===================================================================
-RCS file: security/nss/cmd/sysinit/manifest.mn
-diff -N security/nss/cmd/sysinit/manifest.mn
+RCS file: ./mozilla/security/nss/lib/sysinit/manifest.mn
+diff -N ./mozilla/security/nss/lib/sysinit/manifest.mn
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/manifest.mn	18 Sep 2009 23:38:36 -0000
++++ ./mozilla/security/nss/lib/sysinit/manifest.mn	27 Sep 2009 16:38:50 -0000
 @@ -0,0 +1,50 @@
 +#
 +# ***** BEGIN LICENSE BLOCK *****
@@ -285,12 +285,12 @@ diff -N security/nss/cmd/sysinit/manifes
 +LIBRARY_NAME = nsssysinit
 +#LIBRARY_VERSION = 3
 +
-Index: mozilla/security/nss/cmd/sysinit/nsssysinit.c
+Index: ./mozilla/security/nss/lib/sysinit/nsssysinit.c
 ===================================================================
-RCS file: security/nss/cmd/sysinit/nsssysinit.c
-diff -N security/nss/cmd/sysinit/nsssysinit.c
+RCS file: ./mozilla/security/nss/lib/sysinit/nsssysinit.c
+diff -N ./mozilla/security/nss/lib/sysinit/nsssysinit.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./mozilla/security/nss/cmd/sysinit/nsssysinit.c	18 Sep 2009 23:38:36 -0000
++++ ./mozilla/security/nss/lib/sysinit/nsssysinit.c	27 Sep 2009 16:38:50 -0000
 @@ -0,0 +1,356 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- nss.spec	26 Sep 2009 17:22:20 -0000	1.119
+++ nss.spec	27 Sep 2009 17:50:52 -0000	1.120
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          10%{?dist}
+Release:          11%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -469,6 +469,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sun Sep 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-11
+- Fix sysinit to be under mozilla/security/nss/lib
+
 * Sat Sep 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-10
 - Add nss-sysinit activation/deactivation script
 



From s4504kr at fedoraproject.org  Sun Sep 27 18:06:44 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 27 Sep 2009 18:06:44 +0000 (UTC)
Subject: rpms/gnustep-base/devel gnustep-base.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090927180644.EA9B111C00E6@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6278/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnustep-base.spec import.log 
Log Message:

Initial import




--- NEW FILE gnustep-base.spec ---
%global	gsb_vers 1.18
%global gslibdir %{_libdir}/GNUstep/Libraries

Name:		gnustep-base
Version:	%{gsb_vers}.0
Release:	5%{?dist}
License:	LGPLv2+ and GPLv2+ and GPLv3+
Group:		Development/Libraries
Summary:	GNUstep Base library package
URL:		http://www.gnustep.org/
Source:		ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/-%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gcc-objc
BuildRequires:	libffi-devel
BuildRequires:	gnutls-devel
BuildRequires:	libxml2-devel libxslt-devel
BuildRequires:	pkgconfig
# To avoid issues with x86_64 architectures
BuildRequires:	gnustep-make >= 2.2.0
BuildRequires:	avahi-compat-libdns_sd-devel
BuildRequires:	gmp-devel
BuildRequires:	texi2html texinfo-tex

Requires:	gnustep-make

%description
The GNUstep Base Library is a powerful fast library of general-purpose,
non-graphical Objective C classes, inspired by the superb OpenStep API but
implementing Apple and GNU additions to the API as well.  It includes for
example classes for unicode strings, arrays, dictionaries, sets, byte
streams, typed coders, invocations, notifications, notification dispatchers,
scanners, tasks, files, networking, threading, remote object messaging
support (distributed objects), event loops, loadable bundles, attributed
unicode strings, xml, mime, user defaults. This package includes development
headers too.

#Library combo is %{libcombo}.

%package devel
Summary:	Header of the GNUstep Base library packes
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires(post):	/sbin/install-info
Requires(preun): /sbin/install-info

%description devel
This package contains the header files of the gnustep-base package.

%package doc
Summary:	Documentation for %{name}
Group:		Documentation
BuildArch:	noarch
Requires:	%{name} = %{version}-%{release}

%description doc
The GNUstep Base Library is a powerful fast library of general-purpose,
non-graphical Objective C classes, inspired by the superb OpenStep API but
implementing Apple and GNU additions to the API as well.  It includes for
example classes for unicode strings, arrays, dictionaries, sets, byte
streams, typed coders, invocations, notifications, notification dispatchers,
scanners, tasks, files, networking, threading, remote object messaging
support (distributed objects), event loops, loadable bundles, attributed
unicode strings, xml, mime, user defaults. This package includes development
headers too.


This package contains the documentation for %{name}

%prep
%setup -q

iconv -f iso-8859-1 -t utf-8 ChangeLog.2 -o ChangeLog.2.utf8
mv ChangeLog.2.utf8 ChangeLog.2

%build
ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
%configure --disable-ffcall --with-ffi-include=$ffi_include \
	   --with-installation-domain=SYSTEM

# gnustep-base don't likes parallel builds
make # %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM

# Rename pl to pllist to fix naming conflict
mv ${RPM_BUILD_ROOT}%{_bindir}/pl ${RPM_BUILD_ROOT}%{_bindir}/pllist

rm ${RPM_BUILD_ROOT}%{gslibdir}/%{name}/Versions/%{gsb_vers}/Resources/NSTimeZones/.README.swp
rm -f Examples/.cvsignore
rm -f Examples/.gdbinit

export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} dtddir=Tools
make -C Documentation dtddir=../Tools
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM 

%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/coding-standards %{_infodir}/dir || :
/sbin/install-info %{_infodir}/manual %{_infodir}/dir || :

%postun -p /sbin/ldconfig

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/coding-standards %{_infodir}/dir || :
   /sbin/install-info --delete %{_infodir}/manual %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%{_bindir}/HTMLLinker
%{_bindir}/autogsdoc
%{_bindir}/cvtenc
%{_bindir}/defaults
%{_bindir}/gdnc
#%attr(1755,root,root) %{_bindir}/gdomap
%{_bindir}/gdomap
%{_bindir}/gspath
%{_bindir}/make_strings
%{_bindir}/pl2link
%{_bindir}/pldes
%{_bindir}/plget
%{_bindir}/pllist
%{_bindir}/plmerge
%{_bindir}/plparse
%{_bindir}/plser
%{_bindir}/sfparse
%{_bindir}/xmlparse
%{_mandir}/man1/*
%{_mandir}/man8/*
%{_libdir}/GNUstep/DTDs/
%{gslibdir}
%{_libdir}/libgnustep-base.so.*

%doc ANNOUNCE ChangeLog* COPYING* NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/Foundation/
%{_includedir}/GNUstepBase/
%{_includedir}/gnustep/
%{_libdir}/libgnustep-base.so
%{_libdir}/GNUstep/Makefiles/Additional/base.make
%doc Examples

%files doc
%defattr (-,root,root,-)
%{_infodir}/*
%{_datadir}/GNUstep/Documentation/*

%changelog
* Wed Sep 16 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-5
- Renove suid-bit on gdomap
- Create separate doc subpackage
- Fix license tag

* Mon Sep 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-4
- Rebuild agains gnustep-make 2.2.0

* Thu Mar 26 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-3
- Set GNUSTEP_INSTALLATION_DOMAIN=SYSTEM for make install

* Wed Mar 25 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-2
- Specify installation-domain=SYSTEM
- fix UTF-8 issue in ChangeLog.2

* Wed Mar  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-1
- Fallback to last stable release

* Wed Mar  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.19.0-2
- Switch to libffi

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.19.0-1
- New upstream release

* Sun Dec  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.16.5-1
- Initional release


--- NEW FILE import.log ---
gnustep-base-1_18_0-5_fc11:HEAD:gnustep-base-1.18.0-5.fc11.src.rpm:1254074761


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnustep-base/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:28:22 -0000	1.1
+++ .cvsignore	27 Sep 2009 18:06:42 -0000	1.2
@@ -0,0 +1 @@
+gnustep-base-1.18.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-base/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:28:22 -0000	1.1
+++ sources	27 Sep 2009 18:06:43 -0000	1.2
@@ -0,0 +1 @@
+880491e0fc64ab3507887f43faa67572  gnustep-base-1.18.0.tar.gz



From pbrobinson at fedoraproject.org  Sun Sep 27 18:11:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 27 Sep 2009 18:11:04 +0000 (UTC)
Subject: rpms/hulahop/devel .cvsignore, 1.6, 1.7 hulahop.spec, 1.16,
	1.17 sources, 1.8, 1.9
Message-ID: <20090927181104.66E5E11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hulahop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8095

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
- New upstream 0.6.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Sep 2009 12:37:37 -0000	1.6
+++ .cvsignore	27 Sep 2009 18:11:03 -0000	1.7
@@ -1 +1 @@
-hulahop-0.5.2.tar.bz2
+hulahop-0.6.0.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/hulahop.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hulahop.spec	19 Sep 2009 12:37:38 -0000	1.16
+++ hulahop.spec	27 Sep 2009 18:11:04 -0000	1.17
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: hulahop
-Version: 0.5.2
+Version: 0.6.0
 Release: 1%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
 License: LGPL
-URL: http://dev.laptop.org
-Source0: http://dev.laptop.org/pub/sugar/hulahop-%{version}.tar.bz2
+URL: http://www.sugarlabs.org
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/hulahop/%{name}-%{source}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xulrunner-devel-unstable
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Sun Sep 27 2009 Peter Robinson <pbrobinson at gmail.com> - 0.6.0-1
+- New upstream 0.6.0 release
+
 * Sat Sep 19 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.5.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Sep 2009 12:37:38 -0000	1.8
+++ sources	27 Sep 2009 18:11:04 -0000	1.9
@@ -1 +1 @@
-4025af83766d506b1fbf57a4e0c5a6df  hulahop-0.5.2.tar.bz2
+72104085814008bbe914a248594f0b49  hulahop-0.6.0.tar.bz2



From pbrobinson at fedoraproject.org  Sun Sep 27 18:14:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 27 Sep 2009 18:14:57 +0000 (UTC)
Subject: rpms/hulahop/devel hulahop.spec,1.17,1.18
Message-ID: <20090927181457.4014D11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hulahop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9816

Modified Files:
	hulahop.spec 
Log Message:
- fix the source url


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/hulahop.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- hulahop.spec	27 Sep 2009 18:11:04 -0000	1.17
+++ hulahop.spec	27 Sep 2009 18:14:56 -0000	1.18
@@ -2,13 +2,13 @@
 
 Name: hulahop
 Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
 License: LGPL
 URL: http://www.sugarlabs.org
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/hulahop/%{name}-%{source}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/hulahop/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xulrunner-devel-unstable
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Sun Sep 27 2009 Peter Robinson <pbrobinson at gmail.com> - 0.6.0-2
+- Fix source url
+
 * Sun Sep 27 2009 Peter Robinson <pbrobinson at gmail.com> - 0.6.0-1
 - New upstream 0.6.0 release
 



From s4504kr at fedoraproject.org  Sun Sep 27 18:55:31 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 27 Sep 2009 18:55:31 +0000 (UTC)
Subject: rpms/gnustep-base/F-11 gnustep-base.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090927185531.6D14F11C00E6@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/gnustep-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25553

Modified Files:
	sources 
Added Files:
	gnustep-base.spec 
Log Message:
Initial import


--- NEW FILE gnustep-base.spec ---
%global	gsb_vers 1.18
%global gslibdir %{_libdir}/GNUstep/Libraries

Name:		gnustep-base
Version:	%{gsb_vers}.0
Release:	5%{?dist}
License:	LGPLv2+ and GPLv2+ and GPLv3+
Group:		Development/Libraries
Summary:	GNUstep Base library package
URL:		http://www.gnustep.org/
Source:		ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/-%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gcc-objc
BuildRequires:	libffi-devel
BuildRequires:	gnutls-devel
BuildRequires:	libxml2-devel libxslt-devel
BuildRequires:	pkgconfig
# To avoid issues with x86_64 architectures
BuildRequires:	gnustep-make >= 2.2.0
BuildRequires:	avahi-compat-libdns_sd-devel
BuildRequires:	gmp-devel
BuildRequires:	texi2html texinfo-tex

Requires:	gnustep-make

%description
The GNUstep Base Library is a powerful fast library of general-purpose,
non-graphical Objective C classes, inspired by the superb OpenStep API but
implementing Apple and GNU additions to the API as well.  It includes for
example classes for unicode strings, arrays, dictionaries, sets, byte
streams, typed coders, invocations, notifications, notification dispatchers,
scanners, tasks, files, networking, threading, remote object messaging
support (distributed objects), event loops, loadable bundles, attributed
unicode strings, xml, mime, user defaults. This package includes development
headers too.

#Library combo is %{libcombo}.

%package devel
Summary:	Header of the GNUstep Base library packes
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires(post):	/sbin/install-info
Requires(preun): /sbin/install-info

%description devel
This package contains the header files of the gnustep-base package.

%package doc
Summary:	Documentation for %{name}
Group:		Documentation
BuildArch:	noarch
Requires:	%{name} = %{version}-%{release}

%description doc
The GNUstep Base Library is a powerful fast library of general-purpose,
non-graphical Objective C classes, inspired by the superb OpenStep API but
implementing Apple and GNU additions to the API as well.  It includes for
example classes for unicode strings, arrays, dictionaries, sets, byte
streams, typed coders, invocations, notifications, notification dispatchers,
scanners, tasks, files, networking, threading, remote object messaging
support (distributed objects), event loops, loadable bundles, attributed
unicode strings, xml, mime, user defaults. This package includes development
headers too.


This package contains the documentation for %{name}

%prep
%setup -q

iconv -f iso-8859-1 -t utf-8 ChangeLog.2 -o ChangeLog.2.utf8
mv ChangeLog.2.utf8 ChangeLog.2

%build
ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
%configure --disable-ffcall --with-ffi-include=$ffi_include \
	   --with-installation-domain=SYSTEM

# gnustep-base don't likes parallel builds
make # %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM

# Rename pl to pllist to fix naming conflict
mv ${RPM_BUILD_ROOT}%{_bindir}/pl ${RPM_BUILD_ROOT}%{_bindir}/pllist

rm ${RPM_BUILD_ROOT}%{gslibdir}/%{name}/Versions/%{gsb_vers}/Resources/NSTimeZones/.README.swp
rm -f Examples/.cvsignore
rm -f Examples/.gdbinit

export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} dtddir=Tools
make -C Documentation dtddir=../Tools
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM 

%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/coding-standards %{_infodir}/dir || :
/sbin/install-info %{_infodir}/manual %{_infodir}/dir || :

%postun -p /sbin/ldconfig

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/coding-standards %{_infodir}/dir || :
   /sbin/install-info --delete %{_infodir}/manual %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%{_bindir}/HTMLLinker
%{_bindir}/autogsdoc
%{_bindir}/cvtenc
%{_bindir}/defaults
%{_bindir}/gdnc
#%attr(1755,root,root) %{_bindir}/gdomap
%{_bindir}/gdomap
%{_bindir}/gspath
%{_bindir}/make_strings
%{_bindir}/pl2link
%{_bindir}/pldes
%{_bindir}/plget
%{_bindir}/pllist
%{_bindir}/plmerge
%{_bindir}/plparse
%{_bindir}/plser
%{_bindir}/sfparse
%{_bindir}/xmlparse
%{_mandir}/man1/*
%{_mandir}/man8/*
%{_libdir}/GNUstep/DTDs/
%{gslibdir}
%{_libdir}/libgnustep-base.so.*

%doc ANNOUNCE ChangeLog* COPYING* NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/Foundation/
%{_includedir}/GNUstepBase/
%{_includedir}/gnustep/
%{_libdir}/libgnustep-base.so
%{_libdir}/GNUstep/Makefiles/Additional/base.make
%doc Examples

%files doc
%defattr (-,root,root,-)
%{_infodir}/*
%{_datadir}/GNUstep/Documentation/*

%changelog
* Wed Sep 16 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-5
- Renove suid-bit on gdomap
- Create separate doc subpackage
- Fix license tag

* Mon Sep 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-4
- Rebuild agains gnustep-make 2.2.0

* Thu Mar 26 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-3
- Set GNUSTEP_INSTALLATION_DOMAIN=SYSTEM for make install

* Wed Mar 25 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-2
- Specify installation-domain=SYSTEM
- fix UTF-8 issue in ChangeLog.2

* Wed Mar  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-1
- Fallback to last stable release

* Wed Mar  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.19.0-2
- Switch to libffi

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.19.0-1
- New upstream release

* Sun Dec  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.16.5-1
- Initional release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:28:22 -0000	1.1
+++ sources	27 Sep 2009 18:55:29 -0000	1.2
@@ -0,0 +1 @@
+880491e0fc64ab3507887f43faa67572  gnustep-base-1.18.0.tar.gz



From s4504kr at fedoraproject.org  Sun Sep 27 18:56:30 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 27 Sep 2009 18:56:30 +0000 (UTC)
Subject: rpms/gnustep-base/F-10 gnustep-base.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090927185630.1BF3911C00E6@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/gnustep-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25832

Modified Files:
	sources 
Added Files:
	gnustep-base.spec 
Log Message:
Initial import


--- NEW FILE gnustep-base.spec ---
%global	gsb_vers 1.18
%global gslibdir %{_libdir}/GNUstep/Libraries

Name:		gnustep-base
Version:	%{gsb_vers}.0
Release:	5%{?dist}
License:	LGPLv2+ and GPLv2+ and GPLv3+
Group:		Development/Libraries
Summary:	GNUstep Base library package
URL:		http://www.gnustep.org/
Source:		ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/-%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gcc-objc
BuildRequires:	libffi-devel
BuildRequires:	gnutls-devel
BuildRequires:	libxml2-devel libxslt-devel
BuildRequires:	pkgconfig
# To avoid issues with x86_64 architectures
BuildRequires:	gnustep-make >= 2.2.0
BuildRequires:	avahi-compat-libdns_sd-devel
BuildRequires:	gmp-devel
BuildRequires:	texi2html texinfo-tex

Requires:	gnustep-make

%description
The GNUstep Base Library is a powerful fast library of general-purpose,
non-graphical Objective C classes, inspired by the superb OpenStep API but
implementing Apple and GNU additions to the API as well.  It includes for
example classes for unicode strings, arrays, dictionaries, sets, byte
streams, typed coders, invocations, notifications, notification dispatchers,
scanners, tasks, files, networking, threading, remote object messaging
support (distributed objects), event loops, loadable bundles, attributed
unicode strings, xml, mime, user defaults. This package includes development
headers too.

#Library combo is %{libcombo}.

%package devel
Summary:	Header of the GNUstep Base library packes
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires(post):	/sbin/install-info
Requires(preun): /sbin/install-info

%description devel
This package contains the header files of the gnustep-base package.

%package doc
Summary:	Documentation for %{name}
Group:		Documentation
BuildArch:	noarch
Requires:	%{name} = %{version}-%{release}

%description doc
The GNUstep Base Library is a powerful fast library of general-purpose,
non-graphical Objective C classes, inspired by the superb OpenStep API but
implementing Apple and GNU additions to the API as well.  It includes for
example classes for unicode strings, arrays, dictionaries, sets, byte
streams, typed coders, invocations, notifications, notification dispatchers,
scanners, tasks, files, networking, threading, remote object messaging
support (distributed objects), event loops, loadable bundles, attributed
unicode strings, xml, mime, user defaults. This package includes development
headers too.


This package contains the documentation for %{name}

%prep
%setup -q

iconv -f iso-8859-1 -t utf-8 ChangeLog.2 -o ChangeLog.2.utf8
mv ChangeLog.2.utf8 ChangeLog.2

%build
ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
%configure --disable-ffcall --with-ffi-include=$ffi_include \
	   --with-installation-domain=SYSTEM

# gnustep-base don't likes parallel builds
make # %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM

# Rename pl to pllist to fix naming conflict
mv ${RPM_BUILD_ROOT}%{_bindir}/pl ${RPM_BUILD_ROOT}%{_bindir}/pllist

rm ${RPM_BUILD_ROOT}%{gslibdir}/%{name}/Versions/%{gsb_vers}/Resources/NSTimeZones/.README.swp
rm -f Examples/.cvsignore
rm -f Examples/.gdbinit

export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} dtddir=Tools
make -C Documentation dtddir=../Tools
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM 

%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/coding-standards %{_infodir}/dir || :
/sbin/install-info %{_infodir}/manual %{_infodir}/dir || :

%postun -p /sbin/ldconfig

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/coding-standards %{_infodir}/dir || :
   /sbin/install-info --delete %{_infodir}/manual %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%{_bindir}/HTMLLinker
%{_bindir}/autogsdoc
%{_bindir}/cvtenc
%{_bindir}/defaults
%{_bindir}/gdnc
#%attr(1755,root,root) %{_bindir}/gdomap
%{_bindir}/gdomap
%{_bindir}/gspath
%{_bindir}/make_strings
%{_bindir}/pl2link
%{_bindir}/pldes
%{_bindir}/plget
%{_bindir}/pllist
%{_bindir}/plmerge
%{_bindir}/plparse
%{_bindir}/plser
%{_bindir}/sfparse
%{_bindir}/xmlparse
%{_mandir}/man1/*
%{_mandir}/man8/*
%{_libdir}/GNUstep/DTDs/
%{gslibdir}
%{_libdir}/libgnustep-base.so.*

%doc ANNOUNCE ChangeLog* COPYING* NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/Foundation/
%{_includedir}/GNUstepBase/
%{_includedir}/gnustep/
%{_libdir}/libgnustep-base.so
%{_libdir}/GNUstep/Makefiles/Additional/base.make
%doc Examples

%files doc
%defattr (-,root,root,-)
%{_infodir}/*
%{_datadir}/GNUstep/Documentation/*

%changelog
* Wed Sep 16 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-5
- Renove suid-bit on gdomap
- Create separate doc subpackage
- Fix license tag

* Mon Sep 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-4
- Rebuild agains gnustep-make 2.2.0

* Thu Mar 26 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-3
- Set GNUSTEP_INSTALLATION_DOMAIN=SYSTEM for make install

* Wed Mar 25 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-2
- Specify installation-domain=SYSTEM
- fix UTF-8 issue in ChangeLog.2

* Wed Mar  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.18.0-1
- Fallback to last stable release

* Wed Mar  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.19.0-2
- Switch to libffi

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.19.0-1
- New upstream release

* Sun Dec  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.16.5-1
- Initional release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-base/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:28:22 -0000	1.1
+++ sources	27 Sep 2009 18:56:29 -0000	1.2
@@ -0,0 +1 @@
+880491e0fc64ab3507887f43faa67572  gnustep-base-1.18.0.tar.gz



From pkgdb at fedoraproject.org  Sun Sep 27 19:01:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 19:01:41 +0000
Subject: [pkgdb] hulahop had acl change status
Message-ID: <20090927190142.3FA4E10F874@bastion2.fedora.phx.redhat.com>

tomeu has set the watchbugzilla acl on hulahop (Fedora devel) to Approved for sdz

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Sun Sep 27 19:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 19:01:45 +0000
Subject: [pkgdb] hulahop had acl change status
Message-ID: <20090927190145.660B610F895@bastion2.fedora.phx.redhat.com>

tomeu has set the commit acl on hulahop (Fedora devel) to Approved for sdz

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Sun Sep 27 19:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 19:01:45 +0000
Subject: [pkgdb] hulahop had acl change status
Message-ID: <20090927190145.CB16210F8AD@bastion2.fedora.phx.redhat.com>

tomeu has set the watchcommits acl on hulahop (Fedora devel) to Approved for sdz

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Sun Sep 27 19:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 19:01:46 +0000
Subject: [pkgdb] hulahop had acl change status
Message-ID: <20090927190147.7E46A10F8AF@bastion2.fedora.phx.redhat.com>

tomeu has set the approveacls acl on hulahop (Fedora devel) to Approved for sdz

To make changes to this package see:
  /pkgdb/packages/name/hulahop



From mtruch at fedoraproject.org  Sun Sep 27 19:04:23 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 19:04:23 +0000 (UTC)
Subject: rpms/kst/EL-5 .cvsignore, 1.5, 1.6 kst.spec, 1.14, 1.15 sources, 1.5,
	1.6
Message-ID: <20090927190423.BFC3511C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29140

Modified Files:
	.cvsignore kst.spec sources 
Log Message:
New kst with appropriate tweaks to get it to compile on EL-5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Oct 2006 22:31:25 -0000	1.5
+++ .cvsignore	27 Sep 2009 19:04:19 -0000	1.6
@@ -1 +1 @@
-kst-1.3.1.tar.gz
+kst-1.8.0.tar.gz


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kst.spec	25 Jan 2009 17:26:34 -0000	1.14
+++ kst.spec	27 Sep 2009 19:04:20 -0000	1.15
@@ -1,23 +1,25 @@
 Name:       kst
-Version:    1.3.1
-Release:    6%{?dist}
+Version:    1.8.0
+Release:    4%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
-License:    GPLv2+
+License:    GPLv3
 URL:        http://kst.kde.org/
 Source0:    ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/scientific/kst-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:     kst-autotools.diff
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: gettext 
-BuildRequires: gsl-devel readline-devel ncurses-devel
-BuildRequires: kdebindings-devel kdebase-devel
+BuildRequires: gsl-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: kdelibs-devel
 BuildRequires: cfitsio-devel netcdf-devel
+BuildRequires: getdata-devel muParser-devel
 BuildRequires: desktop-file-utils
-BuildRequires: libutempter-devel
 
 %description
 Kst is a real-time data viewing and plotting tool with basic data analysis 
@@ -42,6 +44,7 @@ Main features of kst include:
 Summary:    Documentation for kst
 Group:      Applications/Engineering
 Requires:   %{name} = %{version}-%{release}
+#BuildArch:  noarch
 
 %description docs
 Documentation, tutorial, and sample data for kst.
@@ -69,18 +72,29 @@ Requires:   %{name} = %{version}-%{relea
 # Hack because cfitsio won't run if it's internal library version
 # doesn't perfectly match between installed library and compiled
 # against library.  Meh.
-Requires:   cfitsio = %(rpm -q cfitsio --qf %{V})
+#Requires:   cfitsio = %(rpm -q cfitsio --qf %{V})
+Requires:   cfitsio = %(pkg-config --modversion cfitsio 2>/dev/null || echo 0)
 
 %description fits
 A plugin allowing kst to open and read data and images contained within 
 fits files.  This includes healpix encoded fits files, and lfiio data.
 
+%package getdata
+Summary:    getdata datasource plugin for kst
+Group:      Applications/Engineering
+Requires:   %{name} = %{version}-%{release}
+
+%description getdata
+A plugin allowing kst to open and read data in getdata (dirfile) format.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export KDEDIR=%{_prefix}
+#autoreconf
 %configure --disable-dependency-tracking --disable-static \
   --disable-rpath \
   --with-qt-libraries=$QTDIR/lib \
@@ -98,9 +112,20 @@ make DESTDIR=%{buildroot} SUID_ROOT="" i
 # which we can't do as kst doesn't run without them.
 #find %{buildroot} -wholename '*.la' | xargs rm -f
 
+# Delete wmap and scuba2 datasources; it's a packaging bug at the 
+# kst upstream end that they are installed in 1.8.0 (they are unfinished?).
+rm -f  %{buildroot}%{_libdir}/kde3/kstdata_scuba.la \
+       %{buildroot}%{_libdir}/kde3/kstdata_scuba.so \
+       %{buildroot}%{_libdir}/kde3/kstdata_wmap.la \
+       %{buildroot}%{_libdir}/kde3/kstdata_wmap.so \
+       %{buildroot}%{_libdir}/kde3/kstdata_planckIDEF.so \
+       %{buildroot}%{_libdir}/kde3/kstdata_planckIDEF.la \
+       %{buildroot}%{_datadir}/services/kst/kstdata_scuba.desktop \
+       %{buildroot}%{_datadir}/services/kst/kstdata_wmap.desktop \
+       %{buildroot}%{_datadir}/services/kst/kstdata_planckIDEF.desktop \
+       %{buildroot}%{_datadir}/applications/kde/kst.desktop
+
 %find_lang %{name}
-%find_lang kstplugineditor
-cat kstplugineditor.lang >> %{name}.lang
 
 # Make documentation symlinks relative
 for x in %{buildroot}%{_defaultdocdir}/HTML/*/%{name}/
@@ -115,8 +140,10 @@ desktop-file-install --vendor=fedora \
   --add-category Qt \
   --add-category KDE \
   --delete-original \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{buildroot}%{_datadir}/applnk/Applications/Sciences/kst.desktop
+  --dir %{buildroot}%{_datadir}/applications/ \
+  %{buildroot}%{_datadir}/applnk/Graphics/kst.desktop
+mv %{buildroot}%{_datadir}/applications/fedora-kst.desktop \
+   %{buildroot}%{_datadir}/applications/kst.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -126,8 +153,8 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc ChangeLog INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
+%defattr(-,root,root,-)
+%doc INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
 
 #binaries
 %{_bindir}/kst
@@ -153,9 +180,13 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_frame.desktop
 %{_datadir}/services/kst/kstdata_indirect.desktop
 %{_datadir}/services/kst/kstdata_qimagesource.desktop
+%{_datadir}/services/kst/kstobject_*.desktop
 %{_datadir}/servicetypes/kst/kstdatasourceplugin.desktop
+%{_datadir}/servicetypes/kst/kstbasicplugin.desktop
+%{_datadir}/servicetypes/kst/kstdataobjectplugin.desktop
 #plugins
 %{_libdir}/kde3/kstplugins
+%{_libdir}/kde3/kstobject_*
 %dir %{_datadir}/servicetypes/kst
 %{_datadir}/servicetypes/kst/kstplugin.desktop
 %{_datadir}/servicetypes/kst/kstfilter.desktop
@@ -170,7 +201,7 @@ rm -rf %{buildroot}
 %{_datadir}/apps/kst/kstui.rc
 #desktop file
 %{_datadir}/mimelnk/application/x-kst.desktop
-%{_datadir}/applications/fedora-kst.desktop
+%{_datadir}/applications/kst.desktop
 #icons
 %{_datadir}/icons/hicolor/22x22/actions/*.png
 %{_datadir}/icons/locolor/16x16/apps/kst.png
@@ -185,7 +216,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/kst.1.gz
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kstdatasource.h
 %{_includedir}/kstobject.h
 %{_includedir}/kst_export.h
@@ -194,15 +225,16 @@ rm -rf %{buildroot}
 %{_includedir}/kstdateparser.h
 %{_includedir}/kstwaitcondition.h
 %{_includedir}/kstext*.h
+%{_includedir}/kstobjectcollection.h
 %{_libdir}/lib*.so
 
 %files docs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/doc/HTML/*/kst
 %{_datadir}/apps/kst/tutorial
 
 %files fits
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/kde3/kstdata_fitsimage.*
 %{_libdir}/kde3/kstdata_healpix.*
 %{_libdir}/kde3/kstdata_lfiio.*
@@ -211,25 +243,120 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_lfiio.desktop
 
 %files netcdf
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/kde3/kstdata_netcdf.*
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
+%files getdata
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kstdata_dirfile.*
+%{_datadir}/services/kst/kstdata_dirfile.desktop
+
 %changelog
-* Sun Jan 25 2009 Matthew Truch <matt at truch.net> - 1.3.1-5
-- Bump to pick up proper kjsembed.so.
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-4
+- Drop exception patch; it's not needed on EPEL-5.
+- Include autotools patch from upstream for proper building.
+- Set build for netcdf-3 libraries.
+
+* Fri Jul 24 2009 Matthew Truch <matt at truch.net> - 1.8.0-3
+- Really fix the patch.  Don't know how it wasn't fixed the first time.
+
+* Fri Jul 24 2009 Matthew Truch <matt at truch.net> - 1.8.0-2
+- Fix patch so it doesn't require fuzz.
+
+* Sat Jul 18 2009 Matthew Truch <matt at truch.net> - 1.8.0-1
+- Upstream kst 1.8.0
+- Drop patch for saveperiod as it's included in upstream 1.8.0
+- Separate out getdata support to subpackage (requires getdata)
+- Include muParser support for general non-linear fit plugin.
+- Bump for mass rebuild.
+
+* Tue Mar 10 2009 Matthew Truch <matt at truch.net> - 1.7.0-6
+- Make cfitsio explicit version check work.
+
+* Thu Feb 26 2009 Matthew Truch <matt at truch.net> - 1.7.0-5
+- Make documentation noarch.
+
+* Mon Feb 23 2009 Matthew Truch <matt at truch.net> - 1.7.0-4
+- Bump for mass rebuild.
+
+* Fri Oct 17 2008 Matthew Truch <matt at truch.net> - 1.7.0-3
+- Include patch from upstream to fix savePeriod.
 
-* Tue Dec 16 2008 Matthew Truch <matt at truch.net> - 1.3.1-4
-- Include utempter for EPEL build.
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-2
+- Allow build from netcdf version 4.  
 
-* Thu Aug 2 2007 Matthew Truch <matt at truch.net> - 1.3.1-4
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-1
+- Update to upstream 1.7.0.  
+- Re-enable ppc64 build of netcdf subpackage.
+
+* Sat May 10 2008 Matthew Truch <matt at truch.net> - 1.6.0-4
+- ExcludeArch ppc64 for netcdf subpackage as netcdf is disabled on ppc64.
+
+* Sat May 10 2008 Matthew Truch <matt at truch.net> - 1.6.0-3
+- Pick up patch from upstream fixing -F command line option
+  Upstream KDE svn revision 805176
+  Fixes upstream reported KDE BUG:161766
+
+* Thu Apr 24 2008 Matthew Truch <matt at truch.net> - 1.6.0-2
+- Also remove PlanckIDEF datasoure.
+
+* Thu Apr 24 2008 Matthew Truch <matt at truch.net> - 1.6.0-1
+- New version of kst.
+- Re-add gsl-devel as qt is now compatable with GPLv3.
+
+* Mon Feb 11 2008 Matthew Truch <matt at truch.net> - 1.5.0-3
+- Bump release for rebuild.
+
+* Wed Dec 12 2007 Matthew Truch <matt at truch.net> - 1.5.0-2
+- Remove BR kdebindings-devel; it is no longer provided for KDE3 in Fedora.
+  kst will use its internal kdebindings branch which is older, but should suffice.
+
+* Sun Nov 18 2007 Matthew Truch <matt at truch.net> - 1.5.0-1
+- Update to kst 1.5.0 [primarily] bugfix release
+- Remove patch to fix open() call; fix was pushed upstream.
+- Add autoreconf (and associated BR) as 1.5.0 tarball requires such.
+
+* Tue Nov 13 2007 Matthew Truch <matt at truch.net> - 1.4.0-10
+- Remove gsl-devel BuildRequires as gsl is GPLv3+ which is incompatable with qt.
+
+* Sat Nov 10 2007 Matthew Truch <matt at truch.net> - 1.4.0-9
+- Bump build to pick up new cfitsio
+
+* Tue Aug 21 2007 Matthew Truch <matt at truch.net> - 1.4.0-8
+- Add patch to fix open() call that was not compliant.  
+
+* Thu Aug 2 2007 Matthew Truch <matt at truch.net> - 1.4.0-7
 - Update License tag
 
+* Mon Jul 23 2007 Matthew Truch <matt at truch.net> - 1.4.0-6
+- Readd kdebindings-devel: KDE4 slipped; will readjust when appropriate.
+
+* Mon Jul 23 2007 Matthew Truch <matt at truch.net> - 1.4.0-5
+- kst never needed BR kdebase-devel
+- Change BR to kdelibs3-devel for upcoming switch to KDE4 as primary.
+- Remove BR kdebindings-devel; kst will use it's internal bindings which
+  should suffice until kst 2.0 is released (and switch to KDE4).  
+- Fix typo in version of Jesse's changelog entry below from 1.3.0-4 to 1.4.0-4
+
+* Thu Jul 19 2007 Jesse Keating <jkeating at redhat.com> - 1.4.0-4
+- Rebuild for new cfitsio
+
+* Tue May 29 2007 Matthew Truch <matt at truch.net> - 1.4.0-3
+- Recall that things get installed into %%{buildroot}
+
+* Tue May 29 2007 Matthew Truch <matt at truch.net> - 1.4.0-2
+- Remove wmap and scuba2 datasources.  They shouldn't have been included
+  in the upstream release.  
+
+* Thu May 17 2007 Matthew Truch <matt at truch.net> - 1.4.0-1
+- Update to kst 1.4.0 release.  
+
 * Mon Jan 8 2007 Matthew Truch <matt at truch.net> - 1.3.1-3
-- Bump release to pick up newest cfistio (3.030).
+- Bump release to pick up newest cfitsio (3.030).
 
-* Sat Jan 6 2007 Matthew Truch <matt at truch.net> - 1.3.1-2
-- Make kst-fits explicitly require cfitsio version compiled against.
+* Fri Jan 5 2007 Matthew Truch <matt at truch.net> - 1.3.1-2
+- Include explicit Requires: for cfitsio exact version compiled against.  
 
 * Fri Oct 20 2006 Matthew Truch <matt at truch.net> - 1.3.1-1
 - Update to kst 1.3.1 bugfix release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Oct 2006 22:31:25 -0000	1.5
+++ sources	27 Sep 2009 19:04:20 -0000	1.6
@@ -1 +1 @@
-b18013223dc4cc2d1d0c8c4197bf8f97  kst-1.3.1.tar.gz
+fd137c317d46e268cff630e2a9bc3461  kst-1.8.0.tar.gz



From mtruch at fedoraproject.org  Sun Sep 27 19:05:56 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 19:05:56 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff,NONE,1.1
Message-ID: <20090927190556.5255911C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29708

Added Files:
	kst-autotools.diff 
Log Message:
Patch from upstream to make kst 1.8.0 tarball work with older autotools.


kst-autotools.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'kst-autotools.diff'



From emaldonado at fedoraproject.org  Sun Sep 27 19:08:21 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 27 Sep 2009 19:08:21 +0000 (UTC)
Subject: rpms/nss/devel setup-nsssysinit.sh,1.1,1.2
Message-ID: <20090927190821.494D311C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30622

Modified Files:
	setup-nsssysinit.sh 
Log Message:
Fix a syntax error


Index: setup-nsssysinit.sh
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/setup-nsssysinit.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- setup-nsssysinit.sh	26 Sep 2009 17:19:43 -0000	1.1
+++ setup-nsssysinit.sh	27 Sep 2009 19:08:11 -0000	1.2
@@ -46,7 +46,7 @@ if [ on = "1" ]; then 
 else
   if [ `grep "^library=libnsssysinit" ${p11conf}` == ""]; then
     exit 0
-  if
+  fi
   cat ${p11conf} | sed -e 's/^library=libnsssysinit.so/library=/' \
                        -e 'g/^NSS/ s; Flags=internal,moduleDBOnly,critical; Flags=internal,critical;' > \
                        ${p11conf}.off



From emaldonado at fedoraproject.org  Sun Sep 27 19:15:09 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 27 Sep 2009 19:15:09 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.120,1.121
Message-ID: <20090927191509.3C1D911C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2634

Modified Files:
	nss.spec 
Log Message:
Fix syntax error in setup-nsssysinit.sh that prevented uninstall


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- nss.spec	27 Sep 2009 17:50:52 -0000	1.120
+++ nss.spec	27 Sep 2009 19:15:08 -0000	1.121
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          11%{?dist}
+Release:          12%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -469,6 +469,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sun Sep 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-12
+- Fix syntax error in setup-nsssysinit.sh
+
 * Sun Sep 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-11
 - Fix sysinit to be under mozilla/security/nss/lib
 



From mtruch at fedoraproject.org  Sun Sep 27 19:24:28 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 19:24:28 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff,1.1,1.2 kst.spec,1.15,1.16
Message-ID: <20090927192428.1CD2411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6029

Modified Files:
	kst-autotools.diff kst.spec 
Log Message:
Fix patch which was mangled.


kst-autotools.diff:
 kst-1.8.0-aw/Makefile.in                                                            |  224 
 kst-1.8.0-aw/aclocal.m4                                                             |  186 
 kst-1.8.0-aw/config.h.in                                                            |   12 
 kst-1.8.0-aw/configure                                                              |19112 ++++------
 kst-1.8.0-aw/configure.in                                                           |    2 
 kst-1.8.0-aw/doc/Makefile.in                                                        |  203 
 kst-1.8.0-aw/doc/da/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/de/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/es/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/fr/Makefile.in                                                     |  145 
 kst-1.8.0-aw/doc/it/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/kst/Makefile.in                                                    |  157 
 kst-1.8.0-aw/doc/kst/kst.1.gz                                                       |only
 kst-1.8.0-aw/doc/nl/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/sv/Makefile.in                                                     |  155 
 kst-1.8.0-aw/kst/Makefile.in                                                        |  201 
 kst-1.8.0-aw/kst/misc/Makefile.in                                                   |  203 
 kst-1.8.0-aw/kst/misc/fonts/Makefile.in                                             |  144 
 kst-1.8.0-aw/kst/misc/tutorial/Makefile.in                                          |  144 
 kst-1.8.0-aw/kst/src/Makefile.in                                                    |  201 
 kst-1.8.0-aw/kst/src/d2asc/Makefile.in                                              |  212 
 kst-1.8.0-aw/kst/src/d2d/Makefile.in                                                |  212 
 kst-1.8.0-aw/kst/src/datasources/Makefile.in                                        |  201 
 kst-1.8.0-aw/kst/src/datasources/ascii/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/cdf/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/dirfile/Makefile.in                                |  247 
 kst-1.8.0-aw/kst/src/datasources/dmc/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/fitsimage/Makefile.in                              |  224 
 kst-1.8.0-aw/kst/src/datasources/frame/Makefile.in                                  |  247 
 kst-1.8.0-aw/kst/src/datasources/healpix/Makefile.in                                |  224 
 kst-1.8.0-aw/kst/src/datasources/indirect/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/lfiio/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/libfitstools/Makefile.in                           |  205 
 kst-1.8.0-aw/kst/src/datasources/nad/Makefile.in                                    |  264 
 kst-1.8.0-aw/kst/src/datasources/nad/nadslave/Makefile.in                           |  260 
 kst-1.8.0-aw/kst/src/datasources/naddirect/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/datasources/naddirect/nadslave/Makefile.in                     |  260 
 kst-1.8.0-aw/kst/src/datasources/netcdf/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planck/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planckIDEF/Makefile.in                             |  224 
 kst-1.8.0-aw/kst/src/datasources/qimagesource/Makefile.in                           |  226 
 kst-1.8.0-aw/kst/src/datasources/scuba2/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/template/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/wmap/Makefile.in                                   |  224 
 kst-1.8.0-aw/kst/src/extdate/Makefile.in                                            |  256 
 kst-1.8.0-aw/kst/src/extensions/Makefile.in                                         |  201 
 kst-1.8.0-aw/kst/src/extensions/elog/Makefile.in                                    |  231 
 kst-1.8.0-aw/kst/src/extensions/js/Makefile.in                                      |  294 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/Makefile.in                             |  275 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/bindings/Makefile.in                    |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/builtins/Makefile.in                    |  205 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugin/Makefile.in                      |  241 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugins/Makefile.in                     |  350 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/qtbindings/Makefile.in                  |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/stdlib/Makefile.in                      |  146 
 kst-1.8.0-aw/kst/src/extensions/rana/Makefile.in                                    |  249 
 kst-1.8.0-aw/kst/src/kst/Makefile.in                                                |  299 
 kst-1.8.0-aw/kst/src/kst/pics/Makefile.in                                           |  152 
 kst-1.8.0-aw/kst/src/libkst/Makefile.in                                             |  322 
 kst-1.8.0-aw/kst/src/libkstapp/Makefile.in                                          |  631 
 kst-1.8.0-aw/kst/src/libkstkmdi/Makefile.in                                         |  231 
 kst-1.8.0-aw/kst/src/libkstmath/Makefile.in                                         |  286 
 kst-1.8.0-aw/kst/src/plugins/Makefile.in                                            |  201 
 kst-1.8.0-aw/kst/src/plugins/bin/Makefile.in                                        |  224 
 kst-1.8.0-aw/kst/src/plugins/binnedmap/Makefile.in                                  |  244 
 kst-1.8.0-aw/kst/src/plugins/chop/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/plugins/combine/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/convert_time/Makefile.in                               |  226 
 kst-1.8.0-aw/kst/src/plugins/convolution/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/convolution/convolve/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/convolution/deconvolve/Makefile.in                     |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/correlation/autocorrelation/Makefile.in                |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/crosscorrelation/Makefile.in               |  226 
 kst-1.8.0-aw/kst/src/plugins/crosscorrelation_bruteforce/Makefile.in                |  228 
 kst-1.8.0-aw/kst/src/plugins/crossspectrum/Makefile.in                              |  251 
 kst-1.8.0-aw/kst/src/plugins/cumulative_sum/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/despike/Makefile.in                                    |  242 
 kst-1.8.0-aw/kst/src/plugins/differentiation/Makefile.in                            |  226 
 kst-1.8.0-aw/kst/src/plugins/discretizing_filters/Makefile.in                       |  226 
 kst-1.8.0-aw/kst/src/plugins/editor/Makefile.in                                     |  212 
 kst-1.8.0-aw/kst/src/plugins/effective_bandwidth/Makefile.in                        |  226 
 kst-1.8.0-aw/kst/src/plugins/fits/Makefile.in                                       |  201 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/kneefrequency_unweighted/Makefile.in              |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_unweighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_weighted/Makefile.in                       |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_unweighted/Makefile.in                 |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_weighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential/Makefile.in                 |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential_weighted/Makefile.in        |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian/Makefile.in                    |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian_weighted/Makefile.in           |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in |  246 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian/Makefile.in                  |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian_weighted/Makefile.in         |  244 
 kst-1.8.0-aw/kst/src/plugins/interpolations/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima_periodic/Makefile.in              |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline/Makefile.in                     |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline_periodic/Makefile.in            |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/linear/Makefile.in                      |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/polynomial/Makefile.in                  |  226 
 kst-1.8.0-aw/kst/src/plugins/lfidifference/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/noise_addition/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/normalization/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/Makefile.in                               |  201 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandstop/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_highpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_lowpass/Makefile.in           |  242 
 kst-1.8.0-aw/kst/src/plugins/periodogram/Makefile.in                                |  226 
 kst-1.8.0-aw/kst/src/plugins/phase/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/shift/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/spectral_normalization/Makefile.in                     |  228 
 kst-1.8.0-aw/kst/src/plugins/statistics/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/syncbin/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/testplugin/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/trim/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/widgets/Makefile.in                                            |  292 
 kst-1.8.0-aw/kst/tests/Makefile.in                                                  |  264 
 kst-1.8.0-aw/kst/tests/healpix/Makefile.in                                          |  197 
 kst-1.8.0-aw/kst/tests/kstXbench/Makefile.in                                        |  199 
 kst-1.8.0-aw/kst/tests/planck/Makefile.in                                           |  195 
 kst-1.8.0-aw/po/Makefile.in                                                         |  203 
 kst-1.8.0-aw/po/ar/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/bg/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/br/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cs/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cy/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/da/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/de/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/el/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/en_GB/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/es/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/et/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/fr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ga/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/gl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/hi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/is/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/it/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ka/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/lt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ms/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/mt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nb/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nds/Makefile.in                                                     |  201 
 kst-1.8.0-aw/po/nl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pa/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt_BR/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/ro/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ru/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/rw/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr at Latn/Makefile.in                                                 |  201 
 kst-1.8.0-aw/po/sv/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ta/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/tr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/uk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/vi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/zh_CN/Makefile.in                                                   |  201 
 kst-1.8.0/kst-1.8.0.tar                                                             |only
 170 files changed, 29044 insertions(+), 26453 deletions(-)

Index: kst-autotools.diff
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst-autotools.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kst-autotools.diff	27 Sep 2009 19:05:55 -0000	1.1
+++ kst-autotools.diff	27 Sep 2009 19:24:26 -0000	1.2
@@ -377,6 +377,38 @@ diff -ur kst-1.8.0/aclocal.m4 kst-1.8.0-
  # Check how to create a tarball.                            -*- Autoconf -*-
  
  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+diff -ur kst-1.8.0/config.h.in kst-1.8.0-aw/config.h.in
+--- kst-1.8.0/config.h.in	2009-07-02 15:45:52.000000000 -0400
++++ kst-1.8.0-aw/config.h.in	2009-09-22 19:31:54.000000000 -0400
+@@ -189,22 +189,22 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+-/* The size of `char *', as computed by sizeof. */
++/* The size of a `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+ 
+-/* The size of `int', as computed by sizeof. */
++/* The size of a `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+-/* The size of `long', as computed by sizeof. */
++/* The size of a `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
+-/* The size of `short', as computed by sizeof. */
++/* The size of a `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+ 
+-/* The size of `size_t', as computed by sizeof. */
++/* The size of a `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+ 
+-/* The size of `unsigned long', as computed by sizeof. */
++/* The size of a `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+ 
+ /* Define to 1 if you have the ANSI C header files. */
 diff -ur kst-1.8.0/configure kst-1.8.0-aw/configure
 --- kst-1.8.0/configure	2009-07-03 07:54:34.000000000 -0400
 +++ kst-1.8.0-aw/configure	2009-09-22 19:31:53.000000000 -0400


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kst.spec	27 Sep 2009 19:04:20 -0000	1.15
+++ kst.spec	27 Sep 2009 19:24:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.8.0
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -253,6 +253,9 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_dirfile.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-5
+- Fix autotools patch which was somehow damaged.
+
 * Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-4
 - Drop exception patch; it's not needed on EPEL-5.
 - Include autotools patch from upstream for proper building.



From mtruch at fedoraproject.org  Sun Sep 27 19:54:33 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 19:54:33 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff,1.2,1.3 kst.spec,1.16,1.17
Message-ID: <20090927195434.16F2411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17410

Modified Files:
	kst-autotools.diff kst.spec 
Log Message:
Fix patch.


kst-autotools.diff:
 kst-1.8.0-aw/Makefile.in                                                            |  224 
 kst-1.8.0-aw/aclocal.m4                                                             |  186 
 kst-1.8.0-aw/autom4te.cache                                                         |only
 kst-1.8.0-aw/config.h.in                                                            |   12 
 kst-1.8.0-aw/config.h.in~                                                           |only
 kst-1.8.0-aw/configure                                                              |19112 ++++------
 kst-1.8.0-aw/configure.in                                                           |    2 
 kst-1.8.0-aw/doc/Makefile.in                                                        |  203 
 kst-1.8.0-aw/doc/da/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/de/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/es/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/fr/Makefile.in                                                     |  145 
 kst-1.8.0-aw/doc/it/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/kst/Makefile.in                                                    |  157 
 kst-1.8.0-aw/doc/kst/kst.1.gz                                                       |only
 kst-1.8.0-aw/doc/nl/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/sv/Makefile.in                                                     |  155 
 kst-1.8.0-aw/kst/Makefile.in                                                        |  201 
 kst-1.8.0-aw/kst/misc/Makefile.in                                                   |  203 
 kst-1.8.0-aw/kst/misc/fonts/Makefile.in                                             |  144 
 kst-1.8.0-aw/kst/misc/tutorial/Makefile.in                                          |  144 
 kst-1.8.0-aw/kst/src/Makefile.in                                                    |  201 
 kst-1.8.0-aw/kst/src/d2asc/Makefile.in                                              |  212 
 kst-1.8.0-aw/kst/src/d2d/Makefile.in                                                |  212 
 kst-1.8.0-aw/kst/src/datasources/Makefile.in                                        |  201 
 kst-1.8.0-aw/kst/src/datasources/ascii/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/cdf/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/dirfile/Makefile.in                                |  247 
 kst-1.8.0-aw/kst/src/datasources/dmc/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/fitsimage/Makefile.in                              |  224 
 kst-1.8.0-aw/kst/src/datasources/frame/Makefile.in                                  |  247 
 kst-1.8.0-aw/kst/src/datasources/healpix/Makefile.in                                |  224 
 kst-1.8.0-aw/kst/src/datasources/indirect/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/lfiio/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/libfitstools/Makefile.in                           |  205 
 kst-1.8.0-aw/kst/src/datasources/nad/Makefile.in                                    |  264 
 kst-1.8.0-aw/kst/src/datasources/nad/nadslave/Makefile.in                           |  260 
 kst-1.8.0-aw/kst/src/datasources/naddirect/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/datasources/naddirect/nadslave/Makefile.in                     |  260 
 kst-1.8.0-aw/kst/src/datasources/netcdf/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planck/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planckIDEF/Makefile.in                             |  224 
 kst-1.8.0-aw/kst/src/datasources/qimagesource/Makefile.in                           |  226 
 kst-1.8.0-aw/kst/src/datasources/scuba2/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/template/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/wmap/Makefile.in                                   |  224 
 kst-1.8.0-aw/kst/src/extdate/Makefile.in                                            |  256 
 kst-1.8.0-aw/kst/src/extensions/Makefile.in                                         |  201 
 kst-1.8.0-aw/kst/src/extensions/elog/Makefile.in                                    |  231 
 kst-1.8.0-aw/kst/src/extensions/js/Makefile.in                                      |  294 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/Makefile.in                             |  275 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/bindings/Makefile.in                    |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/builtins/Makefile.in                    |  205 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugin/Makefile.in                      |  241 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugins/Makefile.in                     |  350 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/qtbindings/Makefile.in                  |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/stdlib/Makefile.in                      |  146 
 kst-1.8.0-aw/kst/src/extensions/rana/Makefile.in                                    |  249 
 kst-1.8.0-aw/kst/src/kst/Makefile.in                                                |  299 
 kst-1.8.0-aw/kst/src/kst/pics/Makefile.in                                           |  152 
 kst-1.8.0-aw/kst/src/libkst/Makefile.in                                             |  322 
 kst-1.8.0-aw/kst/src/libkstapp/Makefile.in                                          |  631 
 kst-1.8.0-aw/kst/src/libkstkmdi/Makefile.in                                         |  231 
 kst-1.8.0-aw/kst/src/libkstmath/Makefile.in                                         |  286 
 kst-1.8.0-aw/kst/src/plugins/Makefile.in                                            |  201 
 kst-1.8.0-aw/kst/src/plugins/bin/Makefile.in                                        |  224 
 kst-1.8.0-aw/kst/src/plugins/binnedmap/Makefile.in                                  |  244 
 kst-1.8.0-aw/kst/src/plugins/chop/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/plugins/combine/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/convert_time/Makefile.in                               |  226 
 kst-1.8.0-aw/kst/src/plugins/convolution/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/convolution/convolve/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/convolution/deconvolve/Makefile.in                     |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/correlation/autocorrelation/Makefile.in                |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/crosscorrelation/Makefile.in               |  226 
 kst-1.8.0-aw/kst/src/plugins/crosscorrelation_bruteforce/Makefile.in                |  228 
 kst-1.8.0-aw/kst/src/plugins/crossspectrum/Makefile.in                              |  251 
 kst-1.8.0-aw/kst/src/plugins/cumulative_sum/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/despike/Makefile.in                                    |  242 
 kst-1.8.0-aw/kst/src/plugins/differentiation/Makefile.in                            |  226 
 kst-1.8.0-aw/kst/src/plugins/discretizing_filters/Makefile.in                       |  226 
 kst-1.8.0-aw/kst/src/plugins/editor/Makefile.in                                     |  212 
 kst-1.8.0-aw/kst/src/plugins/effective_bandwidth/Makefile.in                        |  226 
 kst-1.8.0-aw/kst/src/plugins/fits/Makefile.in                                       |  201 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/kneefrequency_unweighted/Makefile.in              |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_unweighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_weighted/Makefile.in                       |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_unweighted/Makefile.in                 |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_weighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential/Makefile.in                 |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential_weighted/Makefile.in        |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian/Makefile.in                    |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian_weighted/Makefile.in           |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in |  246 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian/Makefile.in                  |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian_weighted/Makefile.in         |  244 
 kst-1.8.0-aw/kst/src/plugins/interpolations/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima_periodic/Makefile.in              |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline/Makefile.in                     |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline_periodic/Makefile.in            |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/linear/Makefile.in                      |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/polynomial/Makefile.in                  |  226 
 kst-1.8.0-aw/kst/src/plugins/lfidifference/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/noise_addition/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/normalization/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/Makefile.in                               |  201 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandstop/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_highpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_lowpass/Makefile.in           |  242 
 kst-1.8.0-aw/kst/src/plugins/periodogram/Makefile.in                                |  226 
 kst-1.8.0-aw/kst/src/plugins/phase/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/shift/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/spectral_normalization/Makefile.in                     |  228 
 kst-1.8.0-aw/kst/src/plugins/statistics/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/syncbin/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/testplugin/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/trim/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/widgets/Makefile.in                                            |  292 
 kst-1.8.0-aw/kst/tests/Makefile.in                                                  |  264 
 kst-1.8.0-aw/kst/tests/healpix/Makefile.in                                          |  197 
 kst-1.8.0-aw/kst/tests/kstXbench/Makefile.in                                        |  199 
 kst-1.8.0-aw/kst/tests/planck/Makefile.in                                           |  195 
 kst-1.8.0-aw/po/Makefile.in                                                         |  203 
 kst-1.8.0-aw/po/ar/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/bg/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/br/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cs/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cy/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/da/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/de/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/el/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/en_GB/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/es/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/et/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/fr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ga/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/gl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/hi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/is/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/it/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ka/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/lt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ms/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/mt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nb/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nds/Makefile.in                                                     |  201 
 kst-1.8.0-aw/po/nl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pa/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt_BR/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/ro/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ru/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/rw/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr at Latn/Makefile.in                                                 |  201 
 kst-1.8.0-aw/po/sv/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ta/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/tr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/uk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/vi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/zh_CN/Makefile.in                                                   |  201 
 kst-1.8.0/kst-1.8.0.tar                                                             |only
 172 files changed, 29044 insertions(+), 26453 deletions(-)

Index: kst-autotools.diff
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst-autotools.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kst-autotools.diff	27 Sep 2009 19:24:26 -0000	1.2
+++ kst-autotools.diff	27 Sep 2009 19:54:30 -0000	1.3
@@ -377,6 +377,7 @@ diff -ur kst-1.8.0/aclocal.m4 kst-1.8.0-
  # Check how to create a tarball.                            -*- Autoconf -*-
  
  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+Only in kst-1.8.0-aw: autom4te.cache
 diff -ur kst-1.8.0/config.h.in kst-1.8.0-aw/config.h.in
 --- kst-1.8.0/config.h.in	2009-07-02 15:45:52.000000000 -0400
 +++ kst-1.8.0-aw/config.h.in	2009-09-22 19:31:54.000000000 -0400
@@ -409,6 +410,7 @@ diff -ur kst-1.8.0/config.h.in kst-1.8.0
  #undef SIZEOF_UNSIGNED_LONG
  
  /* Define to 1 if you have the ANSI C header files. */
+Only in kst-1.8.0-aw: config.h.in~
 diff -ur kst-1.8.0/configure kst-1.8.0-aw/configure
 --- kst-1.8.0/configure	2009-07-03 07:54:34.000000000 -0400
 +++ kst-1.8.0-aw/configure	2009-09-22 19:31:53.000000000 -0400


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kst.spec	27 Sep 2009 19:24:27 -0000	1.16
+++ kst.spec	27 Sep 2009 19:54:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.8.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -253,6 +253,9 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_dirfile.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-6
+- Really fix patch.  
+
 * Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-5
 - Fix autotools patch which was somehow damaged.
 



From kyle at fedoraproject.org  Sun Sep 27 19:57:57 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sun, 27 Sep 2009 19:57:57 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1835,
	1.1836 ppc-hates-my-family-and-swore-revenge.patch, 1.3, NONE
Message-ID: <20090927195757.C639811C00E6@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18291

Modified Files:
	kernel.spec 
Removed Files:
	ppc-hates-my-family-and-swore-revenge.patch 
Log Message:
nuke dead patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1835
retrieving revision 1.1836
diff -u -p -r1.1835 -r1.1836
--- kernel.spec	25 Sep 2009 21:16:39 -0000	1.1835
+++ kernel.spec	27 Sep 2009 19:57:56 -0000	1.1836
@@ -746,8 +746,6 @@ Patch12012: linux-2.6-rtc-show-hctosys.p
 Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
-Patch13000: ppc-hates-my-family-and-swore-revenge.patch
-
 # patches headed for -stable
 
 # Raid10 lockdep fix
@@ -1404,8 +1402,6 @@ ApplyPatch linux-2.6-rtc-show-hctosys.pa
 ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
-#ApplyPatch ppc-hates-my-family-and-swore-revenge.patch
-
 # patches headed for -stable
 
 # Raid10 lockdep fix


--- ppc-hates-my-family-and-swore-revenge.patch DELETED ---



From mtruch at fedoraproject.org  Sun Sep 27 20:28:46 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 20:28:46 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff,1.3,1.4 kst.spec,1.17,1.18
Message-ID: <20090927202846.5898F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30985

Modified Files:
	kst-autotools.diff kst.spec 
Log Message:
Adjust patch again.


kst-autotools.diff:
 kst-1.8.0-aw/Makefile.in                                                            |  224 
 kst-1.8.0-aw/aclocal.m4                                                             |  186 
 kst-1.8.0-aw/autom4te.cache                                                         |only
 kst-1.8.0-aw/config.h.in                                                            |   12 
 kst-1.8.0-aw/config.h.in~                                                           |only
 kst-1.8.0-aw/configure                                                              |19112 ++++------
 kst-1.8.0-aw/configure.in                                                           |    2 
 kst-1.8.0-aw/doc/Makefile.in                                                        |  203 
 kst-1.8.0-aw/doc/da/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/de/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/es/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/fr/Makefile.in                                                     |  145 
 kst-1.8.0-aw/doc/it/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/kst/Makefile.in                                                    |  157 
 kst-1.8.0-aw/doc/kst/kst.1.gz                                                       |only
 kst-1.8.0-aw/doc/nl/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/sv/Makefile.in                                                     |  155 
 kst-1.8.0-aw/kst/Makefile.in                                                        |  201 
 kst-1.8.0-aw/kst/misc/Makefile.in                                                   |  203 
 kst-1.8.0-aw/kst/misc/fonts/Makefile.in                                             |  144 
 kst-1.8.0-aw/kst/misc/tutorial/Makefile.in                                          |  144 
 kst-1.8.0-aw/kst/src/Makefile.in                                                    |  201 
 kst-1.8.0-aw/kst/src/d2asc/Makefile.in                                              |  212 
 kst-1.8.0-aw/kst/src/d2d/Makefile.in                                                |  212 
 kst-1.8.0-aw/kst/src/datasources/Makefile.in                                        |  201 
 kst-1.8.0-aw/kst/src/datasources/ascii/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/cdf/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/dirfile/Makefile.in                                |  247 
 kst-1.8.0-aw/kst/src/datasources/dmc/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/fitsimage/Makefile.in                              |  224 
 kst-1.8.0-aw/kst/src/datasources/frame/Makefile.in                                  |  247 
 kst-1.8.0-aw/kst/src/datasources/healpix/Makefile.in                                |  224 
 kst-1.8.0-aw/kst/src/datasources/indirect/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/lfiio/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/libfitstools/Makefile.in                           |  205 
 kst-1.8.0-aw/kst/src/datasources/nad/Makefile.in                                    |  264 
 kst-1.8.0-aw/kst/src/datasources/nad/nadslave/Makefile.in                           |  260 
 kst-1.8.0-aw/kst/src/datasources/naddirect/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/datasources/naddirect/nadslave/Makefile.in                     |  260 
 kst-1.8.0-aw/kst/src/datasources/netcdf/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planck/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planckIDEF/Makefile.in                             |  224 
 kst-1.8.0-aw/kst/src/datasources/qimagesource/Makefile.in                           |  226 
 kst-1.8.0-aw/kst/src/datasources/scuba2/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/template/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/wmap/Makefile.in                                   |  224 
 kst-1.8.0-aw/kst/src/extdate/Makefile.in                                            |  256 
 kst-1.8.0-aw/kst/src/extensions/Makefile.in                                         |  201 
 kst-1.8.0-aw/kst/src/extensions/elog/Makefile.in                                    |  231 
 kst-1.8.0-aw/kst/src/extensions/js/Makefile.in                                      |  294 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/Makefile.in                             |  275 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/bindings/Makefile.in                    |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/builtins/Makefile.in                    |  205 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugin/Makefile.in                      |  241 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugins/Makefile.in                     |  350 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/qtbindings/Makefile.in                  |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/stdlib/Makefile.in                      |  146 
 kst-1.8.0-aw/kst/src/extensions/rana/Makefile.in                                    |  249 
 kst-1.8.0-aw/kst/src/kst/Makefile.in                                                |  299 
 kst-1.8.0-aw/kst/src/kst/pics/Makefile.in                                           |  152 
 kst-1.8.0-aw/kst/src/libkst/Makefile.in                                             |  322 
 kst-1.8.0-aw/kst/src/libkstapp/Makefile.in                                          |  631 
 kst-1.8.0-aw/kst/src/libkstkmdi/Makefile.in                                         |  231 
 kst-1.8.0-aw/kst/src/libkstmath/Makefile.in                                         |  286 
 kst-1.8.0-aw/kst/src/plugins/Makefile.in                                            |  201 
 kst-1.8.0-aw/kst/src/plugins/bin/Makefile.in                                        |  224 
 kst-1.8.0-aw/kst/src/plugins/binnedmap/Makefile.in                                  |  244 
 kst-1.8.0-aw/kst/src/plugins/chop/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/plugins/combine/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/convert_time/Makefile.in                               |  226 
 kst-1.8.0-aw/kst/src/plugins/convolution/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/convolution/convolve/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/convolution/deconvolve/Makefile.in                     |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/correlation/autocorrelation/Makefile.in                |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/crosscorrelation/Makefile.in               |  226 
 kst-1.8.0-aw/kst/src/plugins/crosscorrelation_bruteforce/Makefile.in                |  228 
 kst-1.8.0-aw/kst/src/plugins/crossspectrum/Makefile.in                              |  251 
 kst-1.8.0-aw/kst/src/plugins/cumulative_sum/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/despike/Makefile.in                                    |  242 
 kst-1.8.0-aw/kst/src/plugins/differentiation/Makefile.in                            |  226 
 kst-1.8.0-aw/kst/src/plugins/discretizing_filters/Makefile.in                       |  226 
 kst-1.8.0-aw/kst/src/plugins/editor/Makefile.in                                     |  212 
 kst-1.8.0-aw/kst/src/plugins/effective_bandwidth/Makefile.in                        |  226 
 kst-1.8.0-aw/kst/src/plugins/fits/Makefile.in                                       |  201 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/kneefrequency_unweighted/Makefile.in              |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_unweighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_weighted/Makefile.in                       |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_unweighted/Makefile.in                 |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_weighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential/Makefile.in                 |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential_weighted/Makefile.in        |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian/Makefile.in                    |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian_weighted/Makefile.in           |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in |  246 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian/Makefile.in                  |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian_weighted/Makefile.in         |  244 
 kst-1.8.0-aw/kst/src/plugins/interpolations/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima_periodic/Makefile.in              |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline/Makefile.in                     |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline_periodic/Makefile.in            |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/linear/Makefile.in                      |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/polynomial/Makefile.in                  |  226 
 kst-1.8.0-aw/kst/src/plugins/lfidifference/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/noise_addition/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/normalization/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/Makefile.in                               |  201 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandstop/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_highpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_lowpass/Makefile.in           |  242 
 kst-1.8.0-aw/kst/src/plugins/periodogram/Makefile.in                                |  226 
 kst-1.8.0-aw/kst/src/plugins/phase/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/shift/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/spectral_normalization/Makefile.in                     |  228 
 kst-1.8.0-aw/kst/src/plugins/statistics/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/syncbin/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/testplugin/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/trim/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/widgets/Makefile.in                                            |  292 
 kst-1.8.0-aw/kst/tests/Makefile.in                                                  |  264 
 kst-1.8.0-aw/kst/tests/healpix/Makefile.in                                          |  197 
 kst-1.8.0-aw/kst/tests/kstXbench/Makefile.in                                        |  199 
 kst-1.8.0-aw/kst/tests/planck/Makefile.in                                           |  195 
 kst-1.8.0-aw/po/Makefile.in                                                         |  203 
 kst-1.8.0-aw/po/ar/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/bg/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/br/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cs/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cy/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/da/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/de/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/el/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/en_GB/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/es/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/et/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/fr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ga/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/gl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/hi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/is/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/it/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ka/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/lt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ms/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/mt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nb/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nds/Makefile.in                                                     |  201 
 kst-1.8.0-aw/po/nl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pa/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt_BR/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/ro/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ru/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/rw/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr at Latn/Makefile.in                                                 |  201 
 kst-1.8.0-aw/po/sv/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ta/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/tr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/uk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/vi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/zh_CN/Makefile.in                                                   |  201 
 kst-1.8.0/kst-1.8.0.tar                                                             |only
 172 files changed, 29044 insertions(+), 26453 deletions(-)



Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kst.spec	27 Sep 2009 19:54:31 -0000	1.17
+++ kst.spec	27 Sep 2009 20:28:44 -0000	1.18
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.8.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -253,6 +253,9 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_dirfile.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-7
+- Bump.
+
 * Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-6
 - Really fix patch.  
 



From mtruch at fedoraproject.org  Sun Sep 27 20:34:49 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 20:34:49 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff,1.4,1.5
Message-ID: <20090927203449.7411911C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv626

Modified Files:
	kst-autotools.diff 
Log Message:
Patch adjustment.


kst-autotools.diff:
 kst-1.8.0-aw/Makefile.in                                                            |  224 
 kst-1.8.0-aw/aclocal.m4                                                             |  186 
 kst-1.8.0-aw/autom4te.cache                                                         |only
 kst-1.8.0-aw/config.h.in                                                            |   12 
 kst-1.8.0-aw/config.h.in~                                                           |only
 kst-1.8.0-aw/configure                                                              |19112 ++++------
 kst-1.8.0-aw/configure.in                                                           |    2 
 kst-1.8.0-aw/doc/Makefile.in                                                        |  203 
 kst-1.8.0-aw/doc/da/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/de/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/es/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/fr/Makefile.in                                                     |  145 
 kst-1.8.0-aw/doc/it/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/kst/Makefile.in                                                    |  157 
 kst-1.8.0-aw/doc/kst/kst.1.gz                                                       |only
 kst-1.8.0-aw/doc/nl/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/sv/Makefile.in                                                     |  155 
 kst-1.8.0-aw/kst/Makefile.in                                                        |  201 
 kst-1.8.0-aw/kst/misc/Makefile.in                                                   |  203 
 kst-1.8.0-aw/kst/misc/fonts/Makefile.in                                             |  144 
 kst-1.8.0-aw/kst/misc/tutorial/Makefile.in                                          |  144 
 kst-1.8.0-aw/kst/src/Makefile.in                                                    |  201 
 kst-1.8.0-aw/kst/src/d2asc/Makefile.in                                              |  212 
 kst-1.8.0-aw/kst/src/d2d/Makefile.in                                                |  212 
 kst-1.8.0-aw/kst/src/datasources/Makefile.in                                        |  201 
 kst-1.8.0-aw/kst/src/datasources/ascii/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/cdf/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/dirfile/Makefile.in                                |  247 
 kst-1.8.0-aw/kst/src/datasources/dmc/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/fitsimage/Makefile.in                              |  224 
 kst-1.8.0-aw/kst/src/datasources/frame/Makefile.in                                  |  247 
 kst-1.8.0-aw/kst/src/datasources/healpix/Makefile.in                                |  224 
 kst-1.8.0-aw/kst/src/datasources/indirect/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/lfiio/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/libfitstools/Makefile.in                           |  205 
 kst-1.8.0-aw/kst/src/datasources/nad/Makefile.in                                    |  264 
 kst-1.8.0-aw/kst/src/datasources/nad/nadslave/Makefile.in                           |  260 
 kst-1.8.0-aw/kst/src/datasources/naddirect/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/datasources/naddirect/nadslave/Makefile.in                     |  260 
 kst-1.8.0-aw/kst/src/datasources/netcdf/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planck/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planckIDEF/Makefile.in                             |  224 
 kst-1.8.0-aw/kst/src/datasources/qimagesource/Makefile.in                           |  226 
 kst-1.8.0-aw/kst/src/datasources/scuba2/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/template/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/wmap/Makefile.in                                   |  224 
 kst-1.8.0-aw/kst/src/extdate/Makefile.in                                            |  256 
 kst-1.8.0-aw/kst/src/extensions/Makefile.in                                         |  201 
 kst-1.8.0-aw/kst/src/extensions/elog/Makefile.in                                    |  231 
 kst-1.8.0-aw/kst/src/extensions/js/Makefile.in                                      |  294 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/Makefile.in                             |  275 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/bindings/Makefile.in                    |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/builtins/Makefile.in                    |  205 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugin/Makefile.in                      |  241 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugins/Makefile.in                     |  350 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/qtbindings/Makefile.in                  |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/stdlib/Makefile.in                      |  146 
 kst-1.8.0-aw/kst/src/extensions/rana/Makefile.in                                    |  249 
 kst-1.8.0-aw/kst/src/kst/Makefile.in                                                |  299 
 kst-1.8.0-aw/kst/src/kst/pics/Makefile.in                                           |  152 
 kst-1.8.0-aw/kst/src/libkst/Makefile.in                                             |  322 
 kst-1.8.0-aw/kst/src/libkstapp/Makefile.in                                          |  631 
 kst-1.8.0-aw/kst/src/libkstkmdi/Makefile.in                                         |  231 
 kst-1.8.0-aw/kst/src/libkstmath/Makefile.in                                         |  286 
 kst-1.8.0-aw/kst/src/plugins/Makefile.in                                            |  201 
 kst-1.8.0-aw/kst/src/plugins/bin/Makefile.in                                        |  224 
 kst-1.8.0-aw/kst/src/plugins/binnedmap/Makefile.in                                  |  244 
 kst-1.8.0-aw/kst/src/plugins/chop/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/plugins/combine/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/convert_time/Makefile.in                               |  226 
 kst-1.8.0-aw/kst/src/plugins/convolution/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/convolution/convolve/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/convolution/deconvolve/Makefile.in                     |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/correlation/autocorrelation/Makefile.in                |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/crosscorrelation/Makefile.in               |  226 
 kst-1.8.0-aw/kst/src/plugins/crosscorrelation_bruteforce/Makefile.in                |  228 
 kst-1.8.0-aw/kst/src/plugins/crossspectrum/Makefile.in                              |  251 
 kst-1.8.0-aw/kst/src/plugins/cumulative_sum/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/despike/Makefile.in                                    |  242 
 kst-1.8.0-aw/kst/src/plugins/differentiation/Makefile.in                            |  226 
 kst-1.8.0-aw/kst/src/plugins/discretizing_filters/Makefile.in                       |  226 
 kst-1.8.0-aw/kst/src/plugins/editor/Makefile.in                                     |  212 
 kst-1.8.0-aw/kst/src/plugins/effective_bandwidth/Makefile.in                        |  226 
 kst-1.8.0-aw/kst/src/plugins/fits/Makefile.in                                       |  201 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/kneefrequency_unweighted/Makefile.in              |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_unweighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_weighted/Makefile.in                       |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_unweighted/Makefile.in                 |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_weighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential/Makefile.in                 |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential_weighted/Makefile.in        |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian/Makefile.in                    |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian_weighted/Makefile.in           |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in |  246 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian/Makefile.in                  |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian_weighted/Makefile.in         |  244 
 kst-1.8.0-aw/kst/src/plugins/interpolations/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima_periodic/Makefile.in              |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline/Makefile.in                     |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline_periodic/Makefile.in            |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/linear/Makefile.in                      |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/polynomial/Makefile.in                  |  226 
 kst-1.8.0-aw/kst/src/plugins/lfidifference/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/noise_addition/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/normalization/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/Makefile.in                               |  201 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandstop/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_highpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_lowpass/Makefile.in           |  242 
 kst-1.8.0-aw/kst/src/plugins/periodogram/Makefile.in                                |  226 
 kst-1.8.0-aw/kst/src/plugins/phase/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/shift/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/spectral_normalization/Makefile.in                     |  228 
 kst-1.8.0-aw/kst/src/plugins/statistics/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/syncbin/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/testplugin/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/trim/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/widgets/Makefile.in                                            |  292 
 kst-1.8.0-aw/kst/tests/Makefile.in                                                  |  264 
 kst-1.8.0-aw/kst/tests/healpix/Makefile.in                                          |  197 
 kst-1.8.0-aw/kst/tests/kstXbench/Makefile.in                                        |  199 
 kst-1.8.0-aw/kst/tests/planck/Makefile.in                                           |  195 
 kst-1.8.0-aw/po/Makefile.in                                                         |  203 
 kst-1.8.0-aw/po/ar/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/bg/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/br/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cs/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cy/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/da/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/de/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/el/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/en_GB/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/es/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/et/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/fr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ga/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/gl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/hi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/is/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/it/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ka/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/lt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ms/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/mt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nb/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nds/Makefile.in                                                     |  201 
 kst-1.8.0-aw/po/nl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pa/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt_BR/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/ro/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ru/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/rw/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr at Latn/Makefile.in                                                 |  201 
 kst-1.8.0-aw/po/sv/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ta/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/tr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/uk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/vi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/zh_CN/Makefile.in                                                   |  201 
 kst-1.8.0/kst-1.8.0.tar                                                             |only
 172 files changed, 29044 insertions(+), 26453 deletions(-)




From rdieter at fedoraproject.org  Sun Sep 27 20:35:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 20:35:41 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.392,1.393
Message-ID: <20090927203541.B2A7711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1002

Modified Files:
	kdebase.spec 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- own %_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
- %lang'ify HTML docs



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- kdebase.spec	2 Sep 2009 11:46:19 -0000	1.392
+++ kdebase.spec	27 Sep 2009 20:35:41 -0000	1.393
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -142,6 +142,18 @@ popd
 # konquerorsu only show in KDE
 echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
 
+# create/own some dirs 
+mkdir -p %{buildroot}%{_kde4_appsdir}/konqueror/{kpartplugins,icons,opensearch}
+
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/*/" >> %{name}.lang
+  fi
+done
+fi
 
 
 %clean
@@ -172,7 +184,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*.desktop
@@ -186,7 +198,6 @@ fi
 %{_kde4_datadir}/kde4/services/kded/*.desktop
 %{_kde4_datadir}/kde4/services/useragentstrings/
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
@@ -215,6 +226,10 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
+- %%lang'ify HTML docs
+
 * Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
 - fix context menus in Konsole (kdebug:186745)
 



From rdieter at fedoraproject.org  Sun Sep 27 20:46:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 20:46:07 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.30,1.31
Message-ID: <20090927204607.0E9E411C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4129

Modified Files:
	konq-plugins.spec 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- BR: webkitpart-devel
- use %find_lang --all-names --with-kde
- s/kdebase4/kdebase/ 



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- konq-plugins.spec	2 Sep 2009 18:49:20 -0000	1.30
+++ konq-plugins.spec	27 Sep 2009 20:46:06 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -11,12 +11,15 @@ URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
+BuildRequires: kdebase-devel >= %{version}
+BuildRequires: webkitpart-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdebase4 >= 4.2
+# not using kdebase4 here: that kdebase4 Provides currently lacks %_isa, and
+# it only ever supports the native (non-compat) kdebase/konqueror anyway
+Requires: kdebase%{?_isa} >= %{version} 
 
 %description
 Some additional plugins that interact with konqueror
@@ -61,6 +64,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 1
+%find_lang %{name} --all-name --with-kde
+%else
 # locale
 for locale in adblock akregator_konqplugin autorefresh babelfish crashesplugin \
   dirfilterplugin domtreeviewer \
@@ -82,6 +88,7 @@ for lang_dir in %{buildroot}${HTML_DIR}/
   fi
 done
 fi
+%endif
 
 
 %clean
@@ -110,22 +117,28 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
+# co-owned with kdepim, since there's no shared dep
 %{_kde4_appsdir}/akregator/
-%{_kde4_appsdir}/dolphinpart/kpartplugins/
+%{_kde4_appsdir}/dolphinpart/kpartplugins/*
 %{_kde4_appsdir}/domtreeviewer/
 %{_kde4_appsdir}/fsview/
 %{_kde4_appsdir}/khtml/kpartplugins/*
-%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
+%{_kde4_appsdir}/konqueror/icons/*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
 %{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- BR: webkitpart-devel
+- use %%find_lang --all-names --with-kde
+- s/kdebase4/kdebase/ 
+
 * Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
 - 4.3.1
 - use scriplet for HTML docdirs



From rdieter at fedoraproject.org  Sun Sep 27 20:47:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 20:47:39 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.393,1.394
Message-ID: <20090927204739.108B311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4523

Modified Files:
	kdebase.spec 
Log Message:
Provides: kdebase4%%{?_isa}



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- kdebase.spec	27 Sep 2009 20:35:41 -0000	1.393
+++ kdebase.spec	27 Sep 2009 20:47:38 -0000	1.394
@@ -22,6 +22,7 @@ Requires: eject
 
 Provides:  dolphin = 1.0.2-1
 Provides:  kdebase4 = %{version}-%{release}
+%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
@@ -229,6 +230,7 @@ fi
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
 - %%lang'ify HTML docs
+- Provides: kdelibs4%%{?_isa} 
 
 * Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
 - fix context menus in Konsole (kdebug:186745)



From hno at fedoraproject.org  Sun Sep 27 20:49:39 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sun, 27 Sep 2009 20:49:39 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.50, 1.51 sources, 1.53,
	1.54 squid.spec, 1.147, 1.148
Message-ID: <20090927204939.5B9B211C00E6@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5955

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.1.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	26 Sep 2009 19:31:47 -0000	1.50
+++ .cvsignore	27 Sep 2009 20:49:38 -0000	1.51
@@ -1,11 +1,2 @@
-squid-3.1.0.13.tar.bz2
-squid-3.1.0.13.tar.bz2.asc
-b9694.patch
-b9696.patch
-b9704.patch
-b9707.patch
-b9719.patch
-b9720.patch
-squid-3.1-9737.patch
-squid-3.1-9743.patch
-squid-3-10002.patch
+squid-3.1.0.14.tar.bz2
+squid-3.1.0.14.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	26 Sep 2009 19:31:47 -0000	1.53
+++ sources	27 Sep 2009 20:49:39 -0000	1.54
@@ -1,11 +1,2 @@
-a7e3f6c35853a8ad200ba448004417da  squid-3.1.0.13.tar.bz2
-56e2fc1fc8bc3c24d77daf4d5bb8c768  squid-3.1.0.13.tar.bz2.asc
-c764a5ffa0171ffadf61011dc8dd4cad  b9694.patch
-e7a8c54548fa45519d8c9d7a885a821a  b9696.patch
-bf71774b13a1506d9a1dffd2cd6daf34  b9704.patch
-a31a23ec33542a9ed2c486ee44c60550  b9707.patch
-1665438b177324cf666562a36d9234f4  b9719.patch
-307067bdf851610c1c663067948fb5dc  b9720.patch
-b6603141eeef4d119aa52dfc7e694538  squid-3.1-9737.patch
-0376008be9d4de6da28907484ac4eaee  squid-3.1-9743.patch
-a83ca39085d085ed5a79fe4553b87a66  squid-3-10002.patch
+0e76bc406495b010ac898937e19528c3  squid-3.1.0.14.tar.bz2
+87a0a414d9c4709610a249c75eadbc28  squid-3.1.0.14.tar.bz2.asc


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- squid.spec	26 Sep 2009 20:21:48 -0000	1.147
+++ squid.spec	27 Sep 2009 20:49:39 -0000	1.148
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.0.13
-Release:  7%{?dist}
+Version:  3.1.0.14
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -21,16 +21,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
-Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
-Patch005: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9719.patch
-Patch006: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9720.patch
-Patch007: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9737.patch
-Patch008: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9743.patch
-Patch009: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10002.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXXX.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -76,15 +67,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .b9694
-%patch002 -p0 -b .b9696
-%patch003 -p0 -b .b9704
-%patch004 -p0 -b .b9707
-%patch005 -p0 -b .b9719
-%patch006 -p0 -b .b9720
-%patch007 -p0 -b .3.1-9737
-%patch008 -p0 -b .3.1-9743
-%patch009 -p0 -b .3-10002
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch204 -p1 -b .perlpath
@@ -270,6 +252,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Sep 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.14-1
+- Update to 3.1.0.14
+
 * Sat Sep 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-7
 - Include upstream patches fixing important operational issues
 - Enable ESI support now that it does not conflict with normal operation



From rdieter at fedoraproject.org  Sun Sep 27 20:49:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 20:49:55 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.31,1.32
Message-ID: <20090927204955.37C6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6016

Modified Files:
	konq-plugins.spec 
Log Message:
revert the s/kdebase4/kdebase/ part



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- konq-plugins.spec	27 Sep 2009 20:46:06 -0000	1.31
+++ konq-plugins.spec	27 Sep 2009 20:49:54 -0000	1.32
@@ -13,13 +13,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires: cmake
 BuildRequires: gettext
-BuildRequires: kdebase-devel >= %{version}
+BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: webkitpart-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-# not using kdebase4 here: that kdebase4 Provides currently lacks %_isa, and
-# it only ever supports the native (non-compat) kdebase/konqueror anyway
-Requires: kdebase%{?_isa} >= %{version} 
+Requires: kdebase4%{?_isa} >= %{version} 
 
 %description
 Some additional plugins that interact with konqueror
@@ -137,7 +135,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - BR: webkitpart-devel
 - use %%find_lang --all-names --with-kde
-- s/kdebase4/kdebase/ 
+- Requires: kdebase4%%{_?isa} >= %%version
 
 * Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
 - 4.3.1



From pghmcfc at fedoraproject.org  Sun Sep 27 21:01:01 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sun, 27 Sep 2009 21:01:01 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.21,
	1.22 perl-IO-Socket-SSL.spec, 1.25, 1.26 sources, 1.21, 1.22
Message-ID: <20090927210101.95C6111C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10733

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Update to 1.31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	20 Aug 2009 08:37:15 -0000	1.21
+++ .cvsignore	27 Sep 2009 21:01:01 -0000	1.22
@@ -1 +1 @@
-IO-Socket-SSL-1.30.tar.gz
+IO-Socket-SSL-1.31.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-IO-Socket-SSL.spec	20 Aug 2009 08:37:15 -0000	1.25
+++ perl-IO-Socket-SSL.spec	27 Sep 2009 21:01:01 -0000	1.26
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.30
+Version:	1.31
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -61,6 +61,9 @@ done
 %{_mandir}/man3/IO::Socket::SSL.3pm*
 
 %changelog
+* Sun Sep 27 2009 Paul Howarth <paul at city-fan.org> - 1.31-1
+- Update to 1.31 (see Changes for details)
+
 * Thu Aug 20 2009 Paul Howarth <paul at city-fan.org> - 1.30-1
 - Update to 1.30 (fix memleak when SSL handshake failed)
 - Add buildreq procps needed for memleak test


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	20 Aug 2009 08:37:15 -0000	1.21
+++ sources	27 Sep 2009 21:01:01 -0000	1.22
@@ -1 +1 @@
-374f74487ef6fedc9326e20ac1e20dc0  IO-Socket-SSL-1.30.tar.gz
+3a51c3f603ee242d5869e8ffd51b989b  IO-Socket-SSL-1.31.tar.gz



From mtruch at fedoraproject.org  Sun Sep 27 21:01:21 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 27 Sep 2009 21:01:21 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff,1.5,1.6 kst.spec,1.18,1.19
Message-ID: <20090927210121.10CF711C00E6@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10786

Modified Files:
	kst-autotools.diff kst.spec 
Log Message:
Bump.


kst-autotools.diff:
 kst-1.8.0-aw/Makefile.in                                                            |  224 
 kst-1.8.0-aw/aclocal.m4                                                             |  186 
 kst-1.8.0-aw/autom4te.cache                                                         |only
 kst-1.8.0-aw/config.h.in                                                            |   12 
 kst-1.8.0-aw/config.h.in~                                                           |only
 kst-1.8.0-aw/configure                                                              |19112 ++++------
 kst-1.8.0-aw/configure.in                                                           |    2 
 kst-1.8.0-aw/doc/Makefile.in                                                        |  203 
 kst-1.8.0-aw/doc/da/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/de/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/es/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/fr/Makefile.in                                                     |  145 
 kst-1.8.0-aw/doc/it/Makefile.in                                                     |  155 
 kst-1.8.0-aw/doc/kst/Makefile.in                                                    |  157 
 kst-1.8.0-aw/doc/kst/kst.1.gz                                                       |only
 kst-1.8.0-aw/doc/nl/Makefile.in                                                     |  153 
 kst-1.8.0-aw/doc/sv/Makefile.in                                                     |  155 
 kst-1.8.0-aw/kst/Makefile.in                                                        |  201 
 kst-1.8.0-aw/kst/misc/Makefile.in                                                   |  203 
 kst-1.8.0-aw/kst/misc/fonts/Makefile.in                                             |  144 
 kst-1.8.0-aw/kst/misc/tutorial/Makefile.in                                          |  144 
 kst-1.8.0-aw/kst/src/Makefile.in                                                    |  201 
 kst-1.8.0-aw/kst/src/d2asc/Makefile.in                                              |  212 
 kst-1.8.0-aw/kst/src/d2d/Makefile.in                                                |  212 
 kst-1.8.0-aw/kst/src/datasources/Makefile.in                                        |  201 
 kst-1.8.0-aw/kst/src/datasources/ascii/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/cdf/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/dirfile/Makefile.in                                |  247 
 kst-1.8.0-aw/kst/src/datasources/dmc/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/datasources/fitsimage/Makefile.in                              |  224 
 kst-1.8.0-aw/kst/src/datasources/frame/Makefile.in                                  |  247 
 kst-1.8.0-aw/kst/src/datasources/healpix/Makefile.in                                |  224 
 kst-1.8.0-aw/kst/src/datasources/indirect/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/lfiio/Makefile.in                                  |  224 
 kst-1.8.0-aw/kst/src/datasources/libfitstools/Makefile.in                           |  205 
 kst-1.8.0-aw/kst/src/datasources/nad/Makefile.in                                    |  264 
 kst-1.8.0-aw/kst/src/datasources/nad/nadslave/Makefile.in                           |  260 
 kst-1.8.0-aw/kst/src/datasources/naddirect/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/datasources/naddirect/nadslave/Makefile.in                     |  260 
 kst-1.8.0-aw/kst/src/datasources/netcdf/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planck/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/planckIDEF/Makefile.in                             |  224 
 kst-1.8.0-aw/kst/src/datasources/qimagesource/Makefile.in                           |  226 
 kst-1.8.0-aw/kst/src/datasources/scuba2/Makefile.in                                 |  224 
 kst-1.8.0-aw/kst/src/datasources/template/Makefile.in                               |  224 
 kst-1.8.0-aw/kst/src/datasources/wmap/Makefile.in                                   |  224 
 kst-1.8.0-aw/kst/src/extdate/Makefile.in                                            |  256 
 kst-1.8.0-aw/kst/src/extensions/Makefile.in                                         |  201 
 kst-1.8.0-aw/kst/src/extensions/elog/Makefile.in                                    |  231 
 kst-1.8.0-aw/kst/src/extensions/js/Makefile.in                                      |  294 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/Makefile.in                             |  275 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/bindings/Makefile.in                    |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/builtins/Makefile.in                    |  205 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugin/Makefile.in                      |  241 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/plugins/Makefile.in                     |  350 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/qtbindings/Makefile.in                  |  207 
 kst-1.8.0-aw/kst/src/extensions/js/kjsembed/stdlib/Makefile.in                      |  146 
 kst-1.8.0-aw/kst/src/extensions/rana/Makefile.in                                    |  249 
 kst-1.8.0-aw/kst/src/kst/Makefile.in                                                |  299 
 kst-1.8.0-aw/kst/src/kst/pics/Makefile.in                                           |  152 
 kst-1.8.0-aw/kst/src/libkst/Makefile.in                                             |  322 
 kst-1.8.0-aw/kst/src/libkstapp/Makefile.in                                          |  631 
 kst-1.8.0-aw/kst/src/libkstkmdi/Makefile.in                                         |  231 
 kst-1.8.0-aw/kst/src/libkstmath/Makefile.in                                         |  286 
 kst-1.8.0-aw/kst/src/plugins/Makefile.in                                            |  201 
 kst-1.8.0-aw/kst/src/plugins/bin/Makefile.in                                        |  224 
 kst-1.8.0-aw/kst/src/plugins/binnedmap/Makefile.in                                  |  244 
 kst-1.8.0-aw/kst/src/plugins/chop/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/plugins/combine/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/convert_time/Makefile.in                               |  226 
 kst-1.8.0-aw/kst/src/plugins/convolution/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/convolution/convolve/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/convolution/deconvolve/Makefile.in                     |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/Makefile.in                                |  201 
 kst-1.8.0-aw/kst/src/plugins/correlation/autocorrelation/Makefile.in                |  226 
 kst-1.8.0-aw/kst/src/plugins/correlation/crosscorrelation/Makefile.in               |  226 
 kst-1.8.0-aw/kst/src/plugins/crosscorrelation_bruteforce/Makefile.in                |  228 
 kst-1.8.0-aw/kst/src/plugins/crossspectrum/Makefile.in                              |  251 
 kst-1.8.0-aw/kst/src/plugins/cumulative_sum/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/despike/Makefile.in                                    |  242 
 kst-1.8.0-aw/kst/src/plugins/differentiation/Makefile.in                            |  226 
 kst-1.8.0-aw/kst/src/plugins/discretizing_filters/Makefile.in                       |  226 
 kst-1.8.0-aw/kst/src/plugins/editor/Makefile.in                                     |  212 
 kst-1.8.0-aw/kst/src/plugins/effective_bandwidth/Makefile.in                        |  226 
 kst-1.8.0-aw/kst/src/plugins/fits/Makefile.in                                       |  201 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/gradient_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/kneefrequency_unweighted/Makefile.in              |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_unweighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/linear_weighted/Makefile.in                       |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_unweighted/Makefile.in                 |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/polynomial_weighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_unweighted/Makefile.in                   |  244 
 kst-1.8.0-aw/kst/src/plugins/fits/sinusoid_weighted/Makefile.in                     |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential/Makefile.in                 |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/exponential_weighted/Makefile.in        |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian/Makefile.in                    |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/gaussian_weighted/Makefile.in           |  244 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in |  246 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian/Makefile.in                  |  242 
 kst-1.8.0-aw/kst/src/plugins/fits_nonlinear/lorentzian_weighted/Makefile.in         |  244 
 kst-1.8.0-aw/kst/src/plugins/interpolations/Makefile.in                             |  201 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima/Makefile.in                       |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/akima_periodic/Makefile.in              |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline/Makefile.in                     |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/cspline_periodic/Makefile.in            |  226 
 kst-1.8.0-aw/kst/src/plugins/interpolations/linear/Makefile.in                      |  224 
 kst-1.8.0-aw/kst/src/plugins/interpolations/polynomial/Makefile.in                  |  226 
 kst-1.8.0-aw/kst/src/plugins/lfidifference/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/noise_addition/Makefile.in                             |  226 
 kst-1.8.0-aw/kst/src/plugins/normalization/Makefile.in                              |  226 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/Makefile.in                               |  201 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_bandstop/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_highpass/Makefile.in          |  244 
 kst-1.8.0-aw/kst/src/plugins/pass_filters/butterworth_lowpass/Makefile.in           |  242 
 kst-1.8.0-aw/kst/src/plugins/periodogram/Makefile.in                                |  226 
 kst-1.8.0-aw/kst/src/plugins/phase/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/shift/Makefile.in                                      |  224 
 kst-1.8.0-aw/kst/src/plugins/spectral_normalization/Makefile.in                     |  228 
 kst-1.8.0-aw/kst/src/plugins/statistics/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/syncbin/Makefile.in                                    |  224 
 kst-1.8.0-aw/kst/src/plugins/testplugin/Makefile.in                                 |  226 
 kst-1.8.0-aw/kst/src/plugins/trim/Makefile.in                                       |  224 
 kst-1.8.0-aw/kst/src/widgets/Makefile.in                                            |  292 
 kst-1.8.0-aw/kst/tests/Makefile.in                                                  |  264 
 kst-1.8.0-aw/kst/tests/healpix/Makefile.in                                          |  197 
 kst-1.8.0-aw/kst/tests/kstXbench/Makefile.in                                        |  199 
 kst-1.8.0-aw/kst/tests/planck/Makefile.in                                           |  195 
 kst-1.8.0-aw/po/Makefile.in                                                         |  203 
 kst-1.8.0-aw/po/ar/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/bg/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/br/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cs/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/cy/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/da/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/de/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/el/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/en_GB/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/es/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/et/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/fr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ga/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/gl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/hi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/is/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/it/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ka/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/lt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ms/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/mt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nb/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/nds/Makefile.in                                                     |  201 
 kst-1.8.0-aw/po/nl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pa/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pl/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/pt_BR/Makefile.in                                                   |  201 
 kst-1.8.0-aw/po/ro/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ru/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/rw/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/sr at Latn/Makefile.in                                                 |  201 
 kst-1.8.0-aw/po/sv/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/ta/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/tr/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/uk/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/vi/Makefile.in                                                      |  201 
 kst-1.8.0-aw/po/zh_CN/Makefile.in                                                   |  201 
 kst-1.8.0/kst-1.8.0.tar                                                             |only
 172 files changed, 29044 insertions(+), 26453 deletions(-)



Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- kst.spec	27 Sep 2009 20:28:44 -0000	1.18
+++ kst.spec	27 Sep 2009 21:01:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.8.0
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -253,6 +253,9 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_dirfile.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-8
+- Bump.
+
 * Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-7
 - Bump.
 



From deji at fedoraproject.org  Sun Sep 27 21:14:24 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 27 Sep 2009 21:14:24 +0000 (UTC)
Subject: rpms/atlas/F-11 .cvsignore, 1.5, 1.6 atlas.spec, 1.23, 1.24 sources,
	1.5, 1.6
Message-ID: <20090927211424.9ABE111C02C9@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16377

Modified Files:
	.cvsignore atlas.spec sources 
Log Message:
* Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-8
- Use the new arch. default for Pentium PRO (Fedora bug #510498)
- (Re-)Introduce 3dNow subpackage
- Revert the last change, it doesn't solve the problem. 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Feb 2009 10:21:42 -0000	1.5
+++ .cvsignore	27 Sep 2009 21:14:21 -0000	1.6
@@ -1 +1,3 @@
 atlas3.8.3.tar.bz2
+PPRO32.tgz
+K7323DNow.tgz


Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-11/atlas.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- atlas.spec	4 Aug 2009 22:31:55 -0000	1.23
+++ atlas.spec	27 Sep 2009 21:14:21 -0000	1.24
@@ -2,14 +2,16 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://math-atlas.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/math-atlas/%{name}%{version}.tar.bz2
-Source1:        README.Fedora
+Source1:        PPRO32.tgz
+Source2:        K7323DNow.tgz
+Source3:        README.Fedora
 Patch0:		atlas-fedora_shared.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,36 +37,44 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	%name-header = %version-%release
+Obsoletes:	%name-header = %version-%release
 
 %description devel
-This package contains the shared and static libraries for development
+This package contains the static libraries and headers for development
 with ATLAS (Automatically Tuned Linear Algebra Software).
 
-%package header
-Summary:	atlas header files
-Group:		Development/Libraries
-BuildArch:	noarch
-
-%description header
-This package contains the header files for for development with ATLAS.
-
 %define types base
 
 %if "%{?enable_native_atlas}" == "0"
 ############## Subpackages for architecture extensions #################
 #
-# Because a set of ATLAS libraries is a ~5 MB package, separate packages
-# are created for SSE, SSE2, and SSE3 extensions to ix86.
-
 %ifarch %{ix86}
-%define types sse sse2 sse3
+%define types base 3dnow sse sse2 sse3
+
+%package 3dnow
+Summary:        ATLAS libraries for 3DNow extensions
+Group:          System Environment/Libraries
+
+%description 3dnow
+This package contains the ATLAS (Automatically Tuned Linear Algebra
+Software) libraries compiled with optimizations for the 3DNow extension
+to the ix86 architecture. Fedora also produces ATLAS build with SSE, SSE2
+and SSE3 extensions.
+
+%package 3dnow-devel
+Summary:        Development libraries for ATLAS with 3DNow extensions
+Group:          Development/Libraries
+Requires:       %{name}-3dnow = %{version}-%{release}
+Obsoletes:	%name-header = %version-%release
+
+%description 3dnow-devel
+This package contains headers and shared and static versions of the ATLAS
+(Automatically Tuned Linear Algebra Software) libraries compiled with
+optimizations for the 3DNow extensions to the ix86 architecture.
 
 %package sse
 Summary:        ATLAS libraries for SSE extensions
 Group:          System Environment/Libraries
-Obsoletes:	%{name}-3dnow < 3.7
-Provides:	%{name}-3dnow = %{version}-%{release}
 
 %description sse
 This package contains the ATLAS (Automatically Tuned Linear Algebra
@@ -76,20 +86,16 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Requires:	%name-header = %version-%release
-Obsoletes:	%{name}-3dnow-devel < 3.7
-Provides:	%{name}-3dnow-devel = %{version}-%{release}
+Obsoletes:	%name-header = %version-%release
 
 %description sse-devel
-This package contains shared and static versions of the ATLAS
+This package contains headers and shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE(1) extensions to the ix86 architecture.
 
 %package sse2
 Summary:        ATLAS libraries for SSE2 extensions
 Group:          System Environment/Libraries
-Obsoletes:	%{name} < 3.7
-Provides:	%{name} = %{version}-%{release}
 
 %description sse2
 This package contains the ATLAS (Automatically Tuned Linear Algebra
@@ -101,9 +107,7 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Requires:	%name-header = %version-%release
-Obsoletes:	%{name}-devel < 3.7
-Provides:	%{name}-devel = %{version}-%{release}
+Obsoletes:	%name-header = %version-%release
 
 %description sse2-devel
 This package contains shared and static versions of the ATLAS
@@ -123,7 +127,7 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
-Requires:	%name-header = %version-%release
+Obsoletes:	%name-header = %version-%release
 
 %description sse3-devel
 This package contains shared and static versions of the ATLAS
@@ -142,7 +146,9 @@ optimizations for the sse3 extensions to
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
-cp %{SOURCE1} doc
+cp %{SOURCE1} CONFIG/ARCHS/
+cp %{SOURCE2} CONFIG/ARCHS/
+cp %{SOURCE3} doc
 
 %build
 for type in %{types}; do
@@ -159,7 +165,16 @@ for type in %{types}; do
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
 	--with-netlib-lapack=%{_libdir}/liblapack_pic.a
 
-	if [ "$type" = "sse" ]; then
+%ifarch %{ix86}
+	if [ "$type" = "base" ]; then
+		sed -i 's#ARCH =.*#ARCH = PPRO32#' Make.inc
+		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
+		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+	elif [ "$type" = "3dnow" ]; then
+		sed -i 's#ARCH =.*#ARCH = K7323DNow#' Make.inc
+		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
+		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+	elif [ "$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 
@@ -170,6 +185,7 @@ for type in %{types}; do
 	elif [ "$type" = "sse3" ]; then
 		sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
 	fi
+%endif
 	make build
 	cd lib
 	make shared
@@ -198,20 +214,34 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
-%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
-cp -pr %{buildroot}%{_libdir}/atlas-sse2 %{buildroot}%{_libdir}/atlas
-echo "%{_libdir}/atlas"	>> %{buildroot}/etc/ld.so.conf.d/atlas-sse2.conf
-%endif
 
 %clean
 rm -rf %{buildroot}
 
-%ifnarch %{ix86} || %if "%{?enable_native_atlas}" == "1"
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
+
+%post -n atlas-3dnow -p /sbin/ldconfig
+
+%postun -n atlas-3dnow -p /sbin/ldconfig
+
+%post -n atlas-sse -p /sbin/ldconfig
+
+%postun -n atlas-sse -p /sbin/ldconfig
+
+%post -n atlas-sse2 -p /sbin/ldconfig
+
+%postun -n atlas-sse2 -p /sbin/ldconfig
+
+%post -n atlas-sse3 -p /sbin/ldconfig
+
+%postun -n atlas-sse3 -p /sbin/ldconfig
+
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
@@ -224,20 +254,25 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
-%else
-
-%post -n atlas-sse -p /sbin/ldconfig
-
-%postun -n atlas-sse -p /sbin/ldconfig
-
-%post -n atlas-sse2 -p /sbin/ldconfig
-
-%postun -n atlas-sse2 -p /sbin/ldconfig
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
-%post -n atlas-sse3 -p /sbin/ldconfig
+%files 3dnow
+%defattr(-,root,root,-)
+%doc doc/README.Fedora
+%dir %{_libdir}/atlas-3dnow
+%{_libdir}/atlas-3dnow/*.so.*
+%config(noreplace) /etc/ld.so.conf.d/atlas-3dnow.conf
 
-%postun -n atlas-sse3 -p /sbin/ldconfig
+%files 3dnow-devel
+%defattr(-,root,root,-)
+%doc doc
+%{_libdir}/atlas-3dnow/*.so
+%{_libdir}/atlas-3dnow/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %files sse
 %defattr(-,root,root,-)
@@ -251,14 +286,14 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse/*.so
 %{_libdir}/atlas-sse/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %files sse2
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
 %dir %{_libdir}/atlas-sse2
-%dir %{_libdir}/atlas
 %{_libdir}/atlas-sse2/*.so.*
-%{_libdir}/atlas/*.so.*
 %config(noreplace) /etc/ld.so.conf.d/atlas-sse2.conf
 
 %files sse2-devel
@@ -266,8 +301,8 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse2/*.so
 %{_libdir}/atlas-sse2/*.a
-%{_libdir}/atlas/*.so
-%{_libdir}/atlas/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %files sse3
 %defattr(-,root,root,-)
@@ -281,15 +316,17 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse3/*.so
 %{_libdir}/atlas-sse3/*.a
-
-%endif
-
-%files header
-%defattr(-,root,root,-)
 %{_includedir}/atlas
 %{_includedir}/*.h
 
+%endif
+
 %changelog
+* Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-8
+- Use the new arch. default for Pentium PRO (Fedora bug #510498)
+- (Re-)Introduce 3dNow subpackage
+- Revert the last change, it doesn't solve the problem. 
+
 * Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-7
 - Create a -header subpackage to avoid multilib conflicts (BZ#508565). 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Feb 2009 10:21:42 -0000	1.5
+++ sources	27 Sep 2009 21:14:22 -0000	1.6
@@ -1 +1,3 @@
 6c13be94a87178e7582111c08e9503bc  atlas3.8.3.tar.bz2
+676548252837b1e458181111443f340f  PPRO32.tgz
+3f174cdcb4c964843f27dbfc4ad4b1c8  K7323DNow.tgz



From scop at fedoraproject.org  Sun Sep 27 21:14:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 27 Sep 2009 21:14:24 +0000 (UTC)
Subject: rpms/system-config-kickstart/devel system-config-kickstart.spec,
	1.84, 1.85
Message-ID: <20090927211424.9AAD211C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16321

Modified Files:
	system-config-kickstart.spec 
Log Message:
Convert specfile to UTF-8 again.


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- system-config-kickstart.spec	14 Sep 2009 19:34:00 -0000	1.84
+++ system-config-kickstart.spec	27 Sep 2009 21:14:21 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
 Version: 2.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
@@ -69,6 +69,9 @@ fi
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Mon Sep 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.8.2-2
+- Convert specfile to UTF-8.
+
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> - 2.8.1-1
 - Change the skipx blurb to make more sense (#493835).
 - Update to using python-meh for exception handling instead of rhpl.
@@ -663,7 +666,7 @@ fi
 * Mon May 13 2002 Brent Fox <bfox at redhat.com> 2.0-8
 - Fixed bug #64835 to make UK keyboard 'uk' not 'gb'
 
-* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0-7
+* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0-7
 - Update translations
 
 * Thu Apr 11 2002 Brent Fox <bfox at redhat.com>



From rdieter at fedoraproject.org  Sun Sep 27 21:26:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 21:26:34 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.32,1.33
Message-ID: <20090927212634.867FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21617

Modified Files:
	konq-plugins.spec 
Log Message:
fix %%files



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- konq-plugins.spec	27 Sep 2009 20:49:54 -0000	1.32
+++ konq-plugins.spec	27 Sep 2009 21:26:34 -0000	1.33
@@ -127,6 +127,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*.so



From rdieter at fedoraproject.org  Sun Sep 27 21:27:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 21:27:06 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.198,1.199
Message-ID: <20090927212706.D7CAA11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21896

Modified Files:
	kdenetwork.spec 
Log Message:
* Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- %?_isa'ize -libs deps
- BR: webkitpart-devel



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- kdenetwork.spec	14 Sep 2009 13:42:51 -0000	1.198
+++ kdenetwork.spec	27 Sep 2009 21:27:06 -0000	1.199
@@ -50,10 +50,11 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+BuildRequires: webkitpart-devel
 # FIXME/TODO: libnxcl-devel
 
-Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: kdepimlibs%{?_isa} >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: mozilla-filesystem
 
 # kopete/yahoo
@@ -88,7 +89,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -145,7 +146,6 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -158,6 +158,7 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
+%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
 %{_kde4_appsdir}/krfb/
@@ -191,6 +192,10 @@ fi
 
 
 %changelog
+* Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- %%?_isa'ize -libs deps
+- BR: webkitpart-devel
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - kopete/bonjour patch
 - krfb produces garbled display (#523131, kde#162493)



From rdieter at fedoraproject.org  Sun Sep 27 21:27:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 21:27:44 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.199,1.200
Message-ID: <20090927212744.8AB6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22076

Modified Files:
	kdenetwork.spec 
Log Message:
Release++



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- kdenetwork.spec	27 Sep 2009 21:27:06 -0000	1.199
+++ kdenetwork.spec	27 Sep 2009 21:27:44 -0000	1.200
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet



From rdieter at fedoraproject.org  Sun Sep 27 21:40:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 21:40:37 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.394,1.395
Message-ID: <20090927214038.3E05911C0424@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26889

Modified Files:
	kdebase.spec 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
- BR: webkitpart-devel



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- kdebase.spec	27 Sep 2009 20:47:38 -0000	1.394
+++ kdebase.spec	27 Sep 2009 21:40:36 -0000	1.395
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -59,8 +59,9 @@ BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
 BuildRequires: libsmbclient-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel 
+BuildRequires: strigi-devel 
+BuildRequires: webkitpart-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -227,6 +228,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- BR: webkitpart-devel
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
 - %%lang'ify HTML docs



From mclasen at fedoraproject.org  Sun Sep 27 21:45:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 27 Sep 2009 21:45:17 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi-fixed-sm.patch, NONE, 1.1 at-spi.spec,
	1.122, 1.123
Message-ID: <20090927214517.A9C8E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28214

Modified Files:
	at-spi.spec 
Added Files:
	at-spi-fixed-sm.patch 
Log Message:
fix segfaults at logout


at-spi-fixed-sm.patch:
 registry-main.c |  377 +++++++++++++++++++-------------------------------------
 1 file changed, 131 insertions(+), 246 deletions(-)

--- NEW FILE at-spi-fixed-sm.patch ---
diff -up at-spi-1.28.0/registryd/registry-main.c.fixed-sm at-spi-1.28.0/registryd/registry-main.c
--- at-spi-1.28.0/registryd/registry-main.c.fixed-sm	2009-09-22 02:50:10.000000000 -0400
+++ at-spi-1.28.0/registryd/registry-main.c	2009-09-27 16:36:17.805030309 -0400
@@ -33,28 +33,133 @@
 #include "registry.h"
 #include <dbus/dbus-glib.h>
 
-#ifdef HAVE_SM
-#include <X11/SM/SMlib.h>
-#include <X11/ICE/ICElib.h>
-#include <fcntl.h>
-#endif
-
 #define spi_get_display() GDK_DISPLAY()
 
 static void registry_set_ior (SpiRegistry *registry);
-static void registry_session_init (const char *previous_client_id, const char *exe);
 static void set_gtk_modules (DBusGProxy *gsm);
-#ifdef HAVE_SM
-static void die_callback (SmcConn smc_conn, SmPointer client_data);
-static void save_yourself_callback      (SmcConn   smc_conn,
-                                         SmPointer client_data,
-                                         int       save_style,
-                                         Bool      shutdown,
-                                         int       interact_style,
-                                         Bool      fast);
 
-static SmcConn session_connection;
-#endif
+#define SM_DBUS_NAME      "org.gnome.SessionManager"
+#define SM_DBUS_PATH      "/org/gnome/SessionManager"
+#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
+
+#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"
+
+static DBusGConnection *bus_connection = NULL;
+static DBusGProxy      *sm_proxy = NULL;
+static char            *client_id = NULL;
+static DBusGProxy      *client_proxy = NULL;
+
+static gboolean
+session_manager_connect (void)
+{
+
+        if (bus_connection == NULL) {
+                GError *error;
+
+                error = NULL;
+                bus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+                if (bus_connection == NULL) {
+                        g_message ("Failed to connect to the session bus: %s",
+                                   error->message);
+                        g_error_free (error);
+                        exit (1);
+                }
+        }
+
+        sm_proxy = dbus_g_proxy_new_for_name (bus_connection,
+                                              SM_DBUS_NAME,
+                                              SM_DBUS_PATH,
+                                              SM_DBUS_INTERFACE);
+        return (sm_proxy != NULL);
+}
+
+static void
+stop_cb (gpointer data)
+{
+        gtk_main_quit ();
+}
+
+static gboolean
+end_session_response (gboolean is_okay, const gchar *reason)
+{
+        gboolean ret;
+        GError *error = NULL;
+
+        ret = dbus_g_proxy_call (client_proxy, "EndSessionResponse",
+                                 &error,
+                                 G_TYPE_BOOLEAN, is_okay,
+                                 G_TYPE_STRING, reason,
+                                 G_TYPE_INVALID,
+                                 G_TYPE_INVALID);
+
+        if (!ret) {
+                g_warning ("Failed to send session response %s", error->message);
+                g_error_free (error);
+        }
+
+        return ret;
+}
+
+static void
+query_end_session_cb (guint flags, gpointer data)
+{
+        end_session_response (TRUE, NULL);
+}
+
+static void
+end_session_cb (guint flags, gpointer data)
+{
+        end_session_response (TRUE, NULL);
+        gtk_main_quit ();
+}
+static gboolean
+register_client (void)
+{
+        GError     *error;
+        gboolean    res;
+        const char *startup_id;
+        const char *app_id;
+
+        startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+        app_id = "at-spi-registryd.desktop";
+
+        error = NULL;
+        res = dbus_g_proxy_call (sm_proxy,
+                                 "RegisterClient",
+                                 &error,
+                                 G_TYPE_STRING, app_id,
+                                 G_TYPE_STRING, startup_id,
+                                 G_TYPE_INVALID,
+                                 DBUS_TYPE_G_OBJECT_PATH, &client_id,
+                                 G_TYPE_INVALID);
+        if (! res) {
+                g_warning ("Failed to register client: %s", error->message);
+                g_error_free (error);
+                return FALSE;
+        }
+
+        g_debug ("Client registered with session manager: %s", client_id);
+        client_proxy = dbus_g_proxy_new_for_name (bus_connection,
+                                                  SM_DBUS_NAME,
+                                                  client_id,
+                                                  SM_CLIENT_DBUS_INTERFACE);
+
+        dbus_g_proxy_add_signal (client_proxy, "Stop", G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (client_proxy, "Stop",
+                                     G_CALLBACK (stop_cb), NULL, NULL);
+
+        dbus_g_proxy_add_signal (client_proxy, "QueryEndSession", G_TYPE_UINT, G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (client_proxy, "QueryEndSession",
+                                     G_CALLBACK (query_end_session_cb), NULL, NULL);
+
+        dbus_g_proxy_add_signal (client_proxy, "EndSession", G_TYPE_UINT, G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (client_proxy, "EndSession",
+                                     G_CALLBACK (end_session_cb), NULL, NULL);
+
+        g_unsetenv ("DESKTOP_AUTOSTART_ID");
+
+        return TRUE;
+}
 
 int
 main (int argc, char **argv)
@@ -116,17 +221,15 @@ main (int argc, char **argv)
 
       registry_set_ior (registry);
 
-      /* If DESKTOP_AUTOSTART_ID exists, assume we're started by session
-       * manager and connect to it. */
-      const char *desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
-      if (desktop_autostart_id != NULL) {
-        char *client_id = g_strdup (desktop_autostart_id);
-        /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes to
-         * use the same client id. */
-        g_unsetenv ("DESKTOP_AUTOSTART_ID");
-        registry_session_init (client_id, argv[0]);
-        g_free (client_id);
-      }
+      if (!session_manager_connect ())
+        {
+          g_warning ("Unable to connect to session manager");
+        }
+
+      if (!register_client ())
+        {
+          g_warning ("Unable to register client with session manager");
+        }
 
       bonobo_main ();
     }
@@ -164,224 +267,6 @@ registry_set_ior (SpiRegistry *registry)
 
 }
 
-#ifdef HAVE_SM
-/* This is called when data is available on an ICE connection.  */
-static gboolean
-process_ice_messages (GIOChannel *channel,
-                      GIOCondition condition,
-                      gpointer client_data)
-{
-  IceConn connection = (IceConn) client_data;
-  IceProcessMessagesStatus status;
-
-  /* This blocks infinitely sometimes. I don't know what
-   * to do about it. Checking "condition" just breaks
-   * session management.
-   */
-  status = IceProcessMessages (connection, NULL, NULL);
-
-  if (status == IceProcessMessagesIOError)
-    {
-#if 0
-      IcePointer context = IceGetConnectionContext (connection);
-#endif
-
-      /* We were disconnected */
-      IceSetShutdownNegotiation (connection, False);
-      IceCloseConnection (connection);
-
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-/* This is called when a new ICE connection is made.  It arranges for
-   the ICE connection to be handled via the event loop.  */
-static void
-new_ice_connection (IceConn connection, IcePointer client_data, Bool opening,
-                    IcePointer *watch_data)
-{
-  guint input_id;
-
-  if (opening)
-    {
-      /* Make sure we don't pass on these file descriptors to any
-       * exec'ed children
-       */
-      GIOChannel *channel;
-
-      fcntl (IceConnectionNumber (connection), F_SETFD,
-             fcntl (IceConnectionNumber (connection), F_GETFD, 0) | FD_CLOEXEC);
-
-      channel = g_io_channel_unix_new (IceConnectionNumber (connection));
-
-      input_id = g_io_add_watch (channel,
-                                 G_IO_IN | G_IO_ERR,
-                                 process_ice_messages,
-                                 connection);
-
-      g_io_channel_unref (channel);
-
-      *watch_data = (IcePointer) GUINT_TO_POINTER (input_id);
-    }
-  else
-    {
-      input_id = GPOINTER_TO_UINT ((gpointer) *watch_data);
-
-      g_source_remove (input_id);
-    }
-}
-
-static IceIOErrorHandler ice_installed_handler;
-
-/* We call any handler installed before (or after) gnome_ice_init but 
-   avoid calling the default libICE handler which does an exit() */
-static void
-ice_io_error_handler (IceConn connection)
-{
-    if (ice_installed_handler)
-      (*ice_installed_handler) (connection);
-}
-
-static void
-ice_init (void)
-{
-  static gboolean ice_initted = FALSE;
-
-  if (! ice_initted)
-    {
-      IceIOErrorHandler default_handler;
-
-      ice_installed_handler = IceSetIOErrorHandler (NULL);
-      default_handler = IceSetIOErrorHandler (ice_io_error_handler);
-
-      if (ice_installed_handler == default_handler)
-        ice_installed_handler = NULL;
-
-      IceAddConnectionWatch (new_ice_connection, NULL);
-
-      ice_initted = TRUE;
-    }
-}
-#endif
-
-void
-registry_session_init (const char *previous_client_id, const char *exe)
-{
-#ifdef HAVE_SM
-  char buf[256];
-  char *client_id;
-  unsigned long mask;
-  SmcCallbacks callbacks;
-
-  ice_init();
-
-  callbacks.save_yourself.callback = save_yourself_callback;
-  callbacks.save_yourself.client_data = NULL;
-  callbacks.die.callback = die_callback;
-  callbacks.die.client_data = NULL;
-
-  mask = SmcSaveYourselfProcMask | SmcDieProcMask;
-
-  session_connection =
-    SmcOpenConnection (NULL, /* use SESSION_MANAGER env */
-                       NULL, /* means use existing ICE connection */
-                       SmProtoMajor,
-                       SmProtoMinor,
-                       mask,
-                       &callbacks,
-                       (char*) previous_client_id,
-                       &client_id,
-                       255, buf);
-
-  if (session_connection != NULL) {
-    SmProp prop1, prop2, prop3, prop4, prop5, prop6, *props[6];
-    SmPropValue prop1val, prop2val, prop3val, prop4val, prop5val, prop6val;
-    char pid[32];
-    char hint = SmRestartImmediately;
-    char priority = 1; /* low to run before other apps */
-
-    prop1.name = SmProgram;
-    prop1.type = SmARRAY8;
-    prop1.num_vals = 1;
-    prop1.vals = &prop1val;
-    prop1val.value = exe;
-    prop1val.length = strlen (exe);
-
-    /* twm sets getuid() for this, but the SM spec plainly
-     * says pw_name, twm is on crack
-     */
-    prop2.name = SmUserID;
-    prop2.type = SmARRAY8;
-    prop2.num_vals = 1;
-    prop2.vals = &prop2val;
-    prop2val.value = (char*) g_get_user_name ();
-    prop2val.length = strlen (prop2val.value);
-
-    prop3.name = SmRestartStyleHint;
-    prop3.type = SmCARD8;
-    prop3.num_vals = 1;
-    prop3.vals = &prop3val;
-    prop3val.value = &hint;
-    prop3val.length = 1;
-
-    sprintf (pid, "%d", getpid ());
-    prop4.name = SmProcessID;
-    prop4.type = SmARRAY8;
-    prop4.num_vals = 1;
-    prop4.vals = &prop4val;
-    prop4val.value = pid;
-    prop4val.length = strlen (prop4val.value);
-
-    /* Always start in home directory */
-    prop5.name = SmCurrentDirectory;
-    prop5.type = SmARRAY8;
-    prop5.num_vals = 1;
-    prop5.vals = &prop5val;
-    prop5val.value = (char*) g_get_home_dir ();
-    prop5val.length = strlen (prop5val.value);
-
-    prop6.name = "_GSM_Priority";
-    prop6.type = SmCARD8;
-    prop6.num_vals = 1;
-    prop6.vals = &prop6val;
-    prop6val.value = &priority;
-    prop6val.length = 1;
-
-    props[0] = &prop1;
-    props[1] = &prop2;
-    props[2] = &prop3;
-    props[3] = &prop4;
-    props[4] = &prop5;
-    props[5] = &prop6;
-
-    SmcSetProperties (session_connection, 6, props);
-  }
-
-#endif
-}
-
-#ifdef HAVE_SM
-static void
-die_callback (SmcConn smc_conn, SmPointer client_data)
-{
-  SmcCloseConnection (session_connection, 0, NULL);
-  bonobo_main_quit ();
-}
-
-static void
-save_yourself_callback      (SmcConn   smc_conn,
-                             SmPointer client_data,
-                             int       save_style,
-                             Bool      shutdown,
-                             int       interact_style,
-                             Bool      fast)
-{
-  SmcSaveYourselfDone (session_connection, TRUE);
-}
-#endif
-
 static void
 set_gtk_modules (DBusGProxy *gsm)
 {


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- at-spi.spec	24 Sep 2009 00:03:51 -0000	1.122
+++ at-spi.spec	27 Sep 2009 21:45:17 -0000	1.123
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
 Version: 1.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.28/%{name}-%{version}.tar.bz2
 
@@ -47,7 +47,9 @@ BuildRequires: gnome-common
 BuildRequires: automake, autoconf, libtool, intltool
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=548782
-Patch4: evo-crash.patch
+Patch0: evo-crash.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=578334
+Patch1: at-spi-fixed-sm.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -84,7 +86,8 @@ This package contains Python bindings al
 
 %prep
 %setup -q
-%patch4 -p1 -b .evo-crash
+%patch0 -p1 -b .evo-crash
+%patch1 -p1 -b .fixed-sm
 
 autoreconf -i -f
 
@@ -154,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-2
+- Use dbus sm api instead of xsmp, avoid segfault at logout (#519239)
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-1
 - Update to 1.28.0
 



From rdieter at fedoraproject.org  Sun Sep 27 21:58:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 21:58:16 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.395,1.396
Message-ID: <20090927215816.DD10111C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5133

Modified Files:
	kdebase.spec 
Log Message:
- fix Provides: kdebase4%{?_isa} (not kdelibs)



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- kdebase.spec	27 Sep 2009 21:40:36 -0000	1.395
+++ kdebase.spec	27 Sep 2009 21:58:16 -0000	1.396
@@ -22,7 +22,7 @@ Requires: eject
 
 Provides:  dolphin = 1.0.2-1
 Provides:  kdebase4 = %{version}-%{release}
-%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
+%{?_isa:Provides: kdebase4%{?_isa} = %{version}-%{release}}
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
@@ -230,6 +230,7 @@ fi
 %changelog
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - BR: webkitpart-devel
+- fix Provides: kdebase4%%{?_isa} (not kdelibs)
 
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}



From nim at fedoraproject.org  Sun Sep 27 22:49:18 2009
From: nim at fedoraproject.org (nim)
Date: Sun, 27 Sep 2009 22:49:18 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.15, 1.16 fontpackages.spec,
	1.21, 1.22 import.log, 1.17, 1.18 sources, 1.15, 1.16
Message-ID: <20090927224919.236DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25826/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Sep 2009 17:25:06 -0000	1.15
+++ .cvsignore	27 Sep 2009 22:49:17 -0000	1.16
@@ -1 +1 @@
-fontpackages-1.25.tar.xz
+fontpackages-1.26.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fontpackages.spec	27 Sep 2009 17:25:06 -0000	1.21
+++ fontpackages.spec	27 Sep 2009 22:49:17 -0000	1.22
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.25
+Version: 1.26
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -101,6 +101,8 @@ rm -fr %{buildroot}
 
 %changelog
 * Sun Sep 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.26-1
+? Brownpaper bag release
 - 1.25-1
 ? Add short test summary to repo-font-audit
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	27 Sep 2009 17:25:06 -0000	1.17
+++ import.log	27 Sep 2009 22:49:17 -0000	1.18
@@ -15,3 +15,4 @@ fontpackages-1_22-1_fc12:HEAD:fontpackag
 fontpackages-1_23-1_fc12:HEAD:fontpackages-1.23-1.fc12.src.rpm:1252848946
 fontpackages-1_24-1_fc12:HEAD:fontpackages-1.24-1.fc12.src.rpm:1253998725
 fontpackages-1_25-1_fc12:HEAD:fontpackages-1.25-1.fc12.src.rpm:1254072286
+fontpackages-1_26-1_fc12:HEAD:fontpackages-1.26-1.fc12.src.rpm:1254091733


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	27 Sep 2009 17:25:06 -0000	1.15
+++ sources	27 Sep 2009 22:49:17 -0000	1.16
@@ -1 +1 @@
-04f9517f577d0fd806276daeed14b844  fontpackages-1.25.tar.xz
+04432ee25dd0b907504bb0a7aacf0724  fontpackages-1.26.tar.xz



From mclasen at fedoraproject.org  Sun Sep 27 23:15:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 27 Sep 2009 23:15:51 +0000 (UTC)
Subject: rpms/vino/devel restart-command.patch, NONE, 1.1 vino.spec, 1.107,
	1.108
Message-ID: <20090927231551.A272311C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1970

Modified Files:
	vino.spec 
Added Files:
	restart-command.patch 
Log Message:
Fix restart command


restart-command.patch:
 vino-main.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE restart-command.patch ---
diff -up vino-2.28.0/server/vino-main.c.restart-command vino-2.28.0/server/vino-main.c
--- vino-2.28.0/server/vino-main.c.restart-command	2009-09-27 19:05:09.499279814 -0400
+++ vino-2.28.0/server/vino-main.c	2009-09-27 19:02:39.674034961 -0400
@@ -58,6 +58,7 @@ main (int argc, char **argv)
   int             i, n_screens;
   GError         *error = NULL;
   EggSMClient    *client;
+  const char     *restart_command[1];
 
   setlocale (LC_ALL, "");
   bindtextdomain (GETTEXT_PACKAGE, VINO_LOCALEDIR);
@@ -78,6 +79,8 @@ main (int argc, char **argv)
     }
 
   client = egg_sm_client_get ();
+  restart_command[0] = "/usr/libexec/vino-server";
+  egg_sm_client_set_restart_command (client, 1, restart_command);
   g_signal_connect (client, "quit",
 		    G_CALLBACK (gtk_main_quit), NULL);
 


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- vino.spec	23 Sep 2009 22:39:04 -0000	1.107
+++ vino.spec	27 Sep 2009 23:15:49 -0000	1.108
@@ -10,11 +10,13 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.28/%{name}-%{version}.tar.bz2
 
 Patch0: vino-smclient.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=596548
+Patch1: restart-command.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -52,6 +54,7 @@ connect to a running GNOME session using
 %prep
 %setup -q
 %patch0 -p1 -b .smclient
+%patch1 -p1 -b .restart-command
 
 autoreconf -i -f
 
@@ -129,6 +132,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Make vino-server set a proper restart command
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:44 +0000
Subject: [pkgdb] python-gpod ownership updated
Message-ID: <20090927232444.572AD10F86A@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora devel was orphaned by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:44 +0000
Subject: [pkgdb] python-gpod (un)retirement
Message-ID: <20090927232444.6762910F88B@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora devel has been retired by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:48 +0000
Subject: [pkgdb] python-gpod ownership updated
Message-ID: <20090927232448.E168D10F88C@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora 7 was orphaned by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:48 +0000
Subject: [pkgdb] python-gpod (un)retirement
Message-ID: <20090927232448.EEC6410F895@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora 7 has been retired by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:51 +0000
Subject: [pkgdb] python-gpod ownership updated
Message-ID: <20090927232452.3D60F10F86A@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora 6 was orphaned by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:51 +0000
Subject: [pkgdb] python-gpod (un)retirement
Message-ID: <20090927232452.4C37410F88B@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora 6 has been retired by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:53 +0000
Subject: [pkgdb] python-gpod ownership updated
Message-ID: <20090927232454.BBD5110F88C@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora 9 was orphaned by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From pkgdb at fedoraproject.org  Sun Sep 27 23:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Sep 2009 23:24:53 +0000
Subject: [pkgdb] python-gpod (un)retirement
Message-ID: <20090927232454.CB8FE10F8A8@bastion2.fedora.phx.redhat.com>

Package python-gpod in Fedora 9 has been retired by tmz

To make changes to this package see:
  /pkgdb/packages/name/python-gpod



From kkofler at fedoraproject.org  Sun Sep 27 23:25:06 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 27 Sep 2009 23:25:06 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.3.1-classicmenu-logout.patch, NONE,
	1.1 kdebase-workspace.spec, 1.193,
	1.194 kdebase-workspace-4.3.0-classicmenu-logout.patch, 1.1, NONE
Message-ID: <20090927232506.A8F1111C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.1-classicmenu-logout.patch 
Removed Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
- fix classicmenu-logout ("Leave...") patch

kdebase-workspace-4.3.1-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    7 ++++++-
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.3.1-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-09-28 01:19:26.000000000 +0200
@@ -109,7 +109,8 @@
         QTimer::singleShot(0, this, SLOT(switchUser()));
         return true;
     } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
-               m_logoutAction == "restart" || m_logoutAction == "shutdown") {
+               m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
+               m_logoutAction == "leave") {
         // decouple dbus call, otherwise we'll run into a dead-lock
         QTimer::singleShot(0, this, SLOT(logout()));
         return true;
@@ -160,6 +161,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-09-28 01:18:25.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-09-28 01:18:25.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- kdebase-workspace.spec	27 Sep 2009 13:47:49 -0000	1.193
+++ kdebase-workspace.spec	27 Sep 2009 23:25:06 -0000	1.194
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -34,7 +34,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -605,6 +605,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
+- fix classicmenu-logout ("Leave...") patch
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
 - support "Leave..." which brings up complete shutdown dialog in classic menu
 


--- kdebase-workspace-4.3.0-classicmenu-logout.patch DELETED ---



From kkofler at fedoraproject.org  Sun Sep 27 23:25:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 27 Sep 2009 23:25:07 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.3.1-classicmenu-logout.patch, NONE,
	1.1 kdebase-workspace.spec, 1.243,
	1.244 kdebase-workspace-4.3.0-classicmenu-logout.patch, 1.1, NONE
Message-ID: <20090927232507.2C82C11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/F-11

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.1-classicmenu-logout.patch 
Removed Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
- fix classicmenu-logout ("Leave...") patch

kdebase-workspace-4.3.1-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    7 ++++++-
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.3.1-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-09-28 01:19:26.000000000 +0200
@@ -109,7 +109,8 @@
         QTimer::singleShot(0, this, SLOT(switchUser()));
         return true;
     } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
-               m_logoutAction == "restart" || m_logoutAction == "shutdown") {
+               m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
+               m_logoutAction == "leave") {
         // decouple dbus call, otherwise we'll run into a dead-lock
         QTimer::singleShot(0, this, SLOT(logout()));
         return true;
@@ -160,6 +161,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-09-28 01:18:25.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-09-28 01:18:25.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- kdebase-workspace.spec	27 Sep 2009 13:47:49 -0000	1.243
+++ kdebase-workspace.spec	27 Sep 2009 23:25:06 -0000	1.244
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -34,7 +34,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -605,6 +605,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
+- fix classicmenu-logout ("Leave...") patch
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
 - support "Leave..." which brings up complete shutdown dialog in classic menu
 


--- kdebase-workspace-4.3.0-classicmenu-logout.patch DELETED ---



From kkofler at fedoraproject.org  Sun Sep 27 23:25:08 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 27 Sep 2009 23:25:08 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.1-classicmenu-logout.patch, NONE,
	1.1 kdebase-workspace.spec, 1.299,
	1.300 kdebase-workspace-4.3.0-classicmenu-logout.patch, 1.1, NONE
Message-ID: <20090927232508.40D9111C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.1-classicmenu-logout.patch 
Removed Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
- fix classicmenu-logout ("Leave...") patch

kdebase-workspace-4.3.1-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    7 ++++++-
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.3.1-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-09-28 01:19:26.000000000 +0200
@@ -109,7 +109,8 @@
         QTimer::singleShot(0, this, SLOT(switchUser()));
         return true;
     } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
-               m_logoutAction == "restart" || m_logoutAction == "shutdown") {
+               m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
+               m_logoutAction == "leave") {
         // decouple dbus call, otherwise we'll run into a dead-lock
         QTimer::singleShot(0, this, SLOT(logout()));
         return true;
@@ -160,6 +161,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-09-28 01:18:25.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-09-28 01:18:25.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- kdebase-workspace.spec	27 Sep 2009 11:17:13 -0000	1.299
+++ kdebase-workspace.spec	27 Sep 2009 23:25:07 -0000	1.300
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -34,7 +34,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -605,6 +605,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
+- fix classicmenu-logout ("Leave...") patch
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
 - support "Leave..." which brings up complete shutdown dialog in classic menu
 


--- kdebase-workspace-4.3.0-classicmenu-logout.patch DELETED ---



From rdieter at fedoraproject.org  Sun Sep 27 23:41:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 23:41:33 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.32, 1.33 ktorrent.spec, 1.105,
	1.106 sources, 1.32, 1.33
Message-ID: <20090927234133.8ECA311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13428

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
- ktorrent-3.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	24 Aug 2009 14:41:52 -0000	1.32
+++ .cvsignore	27 Sep 2009 23:41:33 -0000	1.33
@@ -1 +1 @@
-ktorrent-3.2.3-1.tar.bz2
+ktorrent-3.2.4.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ktorrent.spec	24 Aug 2009 14:41:52 -0000	1.105
+++ ktorrent.spec	27 Sep 2009 23:41:33 -0000	1.106
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.3
-Release:        3%{?dist}
+Version:        3.2.4
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
+- ktorrent-3.2.4
+
 * Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
 - upstream tarball respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	24 Aug 2009 14:41:52 -0000	1.32
+++ sources	27 Sep 2009 23:41:33 -0000	1.33
@@ -1 +1 @@
-f1430998c17925e4c6a08ce062f53ff2  ktorrent-3.2.3-1.tar.bz2
+e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 27 23:43:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 23:43:32 +0000 (UTC)
Subject: rpms/ktorrent/F-11 .cvsignore, 1.32, 1.33 ktorrent.spec, 1.100,
	1.101 sources, 1.32, 1.33
Message-ID: <20090927234332.4384E11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14336

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
- ktorrent-3.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	24 Aug 2009 15:12:48 -0000	1.32
+++ .cvsignore	27 Sep 2009 23:43:31 -0000	1.33
@@ -1 +1 @@
-ktorrent-3.2.3-1.tar.bz2
+ktorrent-3.2.4.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- ktorrent.spec	24 Aug 2009 15:12:48 -0000	1.100
+++ ktorrent.spec	27 Sep 2009 23:43:31 -0000	1.101
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.3
-Release:        3%{?dist}
+Version:        3.2.4
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
+- ktorrent-3.2.4
+
 * Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
 - upstream tarball respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	24 Aug 2009 15:12:48 -0000	1.32
+++ sources	27 Sep 2009 23:43:32 -0000	1.33
@@ -1 +1 @@
-f1430998c17925e4c6a08ce062f53ff2  ktorrent-3.2.3-1.tar.bz2
+e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 27 23:45:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 23:45:25 +0000 (UTC)
Subject: rpms/ktorrent/devel ktorrent.spec,1.106,1.107
Message-ID: <20090927234525.41E9D11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15286

Modified Files:
	ktorrent.spec 
Log Message:
fix SOURCE0



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- ktorrent.spec	27 Sep 2009 23:41:33 -0000	1.106
+++ ktorrent.spec	27 Sep 2009 23:45:24 -0000	1.107
@@ -8,7 +8,7 @@ Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ktorrent.org/
-Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}-1.tar.bz2
+Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel



From rdieter at fedoraproject.org  Sun Sep 27 23:47:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 23:47:02 +0000 (UTC)
Subject: rpms/ktorrent/F-11 ktorrent.spec,1.101,1.102
Message-ID: <20090927234702.CDEB311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15689

Modified Files:
	ktorrent.spec 
Log Message:
fix SOURCE0



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- ktorrent.spec	27 Sep 2009 23:43:31 -0000	1.101
+++ ktorrent.spec	27 Sep 2009 23:47:02 -0000	1.102
@@ -8,7 +8,7 @@ Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ktorrent.org/
-Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}-1.tar.bz2
+Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel



From rdieter at fedoraproject.org  Sun Sep 27 23:49:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Sep 2009 23:49:09 +0000 (UTC)
Subject: rpms/ktorrent/F-10 .cvsignore, 1.31, 1.32 ktorrent.spec, 1.91,
	1.92 sources, 1.31, 1.32
Message-ID: <20090927234910.0874A11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16995

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
- ktorrent-3.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	24 Aug 2009 14:58:54 -0000	1.31
+++ .cvsignore	27 Sep 2009 23:49:09 -0000	1.32
@@ -1 +1 @@
-ktorrent-3.2.3-1.tar.bz2
+ktorrent-3.2.4.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ktorrent.spec	24 Aug 2009 14:58:54 -0000	1.91
+++ ktorrent.spec	27 Sep 2009 23:49:09 -0000	1.92
@@ -2,13 +2,13 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.3
-Release:        3%{?dist}
+Version:        3.2.4
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ktorrent.org/
-Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}-1.tar.bz2
+Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
+- ktorrent-3.2.4
+
 * Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
 - upstream tarball respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	24 Aug 2009 14:58:54 -0000	1.31
+++ sources	27 Sep 2009 23:49:09 -0000	1.32
@@ -1 +1 @@
-f1430998c17925e4c6a08ce062f53ff2  ktorrent-3.2.3-1.tar.bz2
+e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2



From bojan at fedoraproject.org  Sun Sep 27 23:53:08 2009
From: bojan at fedoraproject.org (bojan)
Date: Sun, 27 Sep 2009 23:53:08 +0000 (UTC)
Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.17,1.18
Message-ID: <20090927235308.A568F11C00E6@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18017

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.9.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- apr-api-docs.spec	3 Sep 2009 09:13:28 -0000	1.17
+++ apr-api-docs.spec	27 Sep 2009 23:53:08 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           apr-api-docs
-Version:        1.3.8
+Version:        1.3.9
 Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Mon Sep 28 2009 Bojan Smojver <bojan at rexursive.com> 1.3.9-1
+- Bump up to 1.3.9
+
 * Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-1
 - Bump up to 1.3.8
 - Add search



From mclasen at fedoraproject.org  Mon Sep 28 00:03:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 28 Sep 2009 00:03:04 +0000 (UTC)
Subject: rpms/vino/devel restart-command.patch, 1.1, 1.2 vino.spec, 1.108,
	1.109
Message-ID: <20090928000304.948B811C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20006

Modified Files:
	restart-command.patch vino.spec 
Log Message:
better fix


restart-command.patch:
 vino-main.c |    1 +
 1 file changed, 1 insertion(+)

Index: restart-command.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/restart-command.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- restart-command.patch	27 Sep 2009 23:15:49 -0000	1.1
+++ restart-command.patch	28 Sep 2009 00:03:00 -0000	1.2
@@ -1,20 +1,11 @@
 diff -up vino-2.28.0/server/vino-main.c.restart-command vino-2.28.0/server/vino-main.c
 --- vino-2.28.0/server/vino-main.c.restart-command	2009-09-27 19:05:09.499279814 -0400
-+++ vino-2.28.0/server/vino-main.c	2009-09-27 19:02:39.674034961 -0400
-@@ -58,6 +58,7 @@ main (int argc, char **argv)
-   int             i, n_screens;
-   GError         *error = NULL;
-   EggSMClient    *client;
-+  const char     *restart_command[1];
- 
-   setlocale (LC_ALL, "");
-   bindtextdomain (GETTEXT_PACKAGE, VINO_LOCALEDIR);
-@@ -78,6 +79,8 @@ main (int argc, char **argv)
++++ vino-2.28.0/server/vino-main.c	2009-09-27 19:52:28.846036969 -0400
+@@ -78,6 +79,7 @@ main (int argc, char **argv)
      }
  
    client = egg_sm_client_get ();
-+  restart_command[0] = "/usr/libexec/vino-server";
-+  egg_sm_client_set_restart_command (client, 1, restart_command);
++  egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_NO_RESTART);
    g_signal_connect (client, "quit",
  		    G_CALLBACK (gtk_main_quit), NULL);
  


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- vino.spec	27 Sep 2009 23:15:49 -0000	1.108
+++ vino.spec	28 Sep 2009 00:03:00 -0000	1.109
@@ -10,7 +10,7 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.28/%{name}-%{version}.tar.bz2
 
@@ -132,6 +132,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Even better, just rely on autostart
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Make vino-server set a proper restart command
 



From petersen at fedoraproject.org  Mon Sep 28 00:22:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 00:22:39 +0000 (UTC)
Subject: rpms/ghc-time/devel ghc-time.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090928002239.802B311C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-time/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26088/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-time.spec import.log 
Log Message:
initial import



--- NEW FILE ghc-time.spec ---
%global pkg_name time

%bcond_without doc
%bcond_without prof

# override for ghc-6.10 since it has older time in extralibs
%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        1.1.2.4
Release:        2%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Provides:       ghc-%{pkg_name} = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package 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 doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%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 %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 1.1.2.4-2
- version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)

* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 1.1.2.4-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-time-1_1_2_4-2_fc11:HEAD:ghc-time-1.1.2.4-2.fc11.src.rpm:1254097316


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-time/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:13:01 -0000	1.1
+++ .cvsignore	28 Sep 2009 00:22:37 -0000	1.2
@@ -0,0 +1 @@
+time-1.1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-time/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:13:01 -0000	1.1
+++ sources	28 Sep 2009 00:22:37 -0000	1.2
@@ -0,0 +1 @@
+816af2b7792b3b5465f2d566c9811721  time-1.1.2.4.tar.gz



From petersen at fedoraproject.org  Mon Sep 28 01:02:22 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 01:02:22 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel ghc-HTTP.spec,1.13,1.14
Message-ID: <20090928010223.0209911C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8508

Modified Files:
	ghc-HTTP.spec 
Log Message:
build against the new ghc-network library


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/ghc-HTTP.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ghc-HTTP.spec	14 Sep 2009 02:20:28 -0000	1.13
+++ ghc-HTTP.spec	28 Sep 2009 01:02:21 -0000	1.14
@@ -9,7 +9,7 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        4000.0.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Haskell HTTP client library
 
 Group:          Development/Libraries
@@ -20,11 +20,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc-network-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-network-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-network-prof
 %endif
 
 %description
@@ -38,6 +41,7 @@ Provides:       ghc-%{pkg_name} = %{vers
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-network-devel
 
 %description devel
 A Haskell library for client-side HTTP.
@@ -53,6 +57,7 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
+Requires:       ghc-network-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -65,6 +70,7 @@ Summary:        Profiling libraries for 
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-network-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -138,6 +144,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-5
+- build against the new ghc-network library
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4000.0.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Mon Sep 28 01:22:27 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 01:22:27 +0000 (UTC)
Subject: rpms/ghc-cgi/devel ghc-cgi.spec,1.1,1.2
Message-ID: <20090928012228.8699C11C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-cgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15399

Modified Files:
	ghc-cgi.spec 
Log Message:
buildrequire the new ghc-network library


Index: ghc-cgi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-cgi/devel/ghc-cgi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-cgi.spec	24 Sep 2009 07:33:45 -0000	1.1
+++ ghc-cgi.spec	28 Sep 2009 01:22:27 -0000	1.2
@@ -9,7 +9,7 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        3001.1.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -20,11 +20,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc-network-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-network-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-network-prof
 %endif
 
 %description
@@ -39,6 +42,7 @@ Provides:       ghc-%{pkg_name} = %{vers
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-network-devel
 
 %description devel
 This package contains the development files for %{name}
@@ -52,6 +56,7 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
+Requires:       ghc-network-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -64,6 +69,7 @@ Summary:        Profiling libraries for 
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-network-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -137,5 +143,8 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 3001.1.7.1-2
+- buildrequire the new ghc-network library
+
 * Mon Sep 14 2009 Jens Petersen <petersen at redhat.com> - 3001.1.7.1-1
 - initial packaging for Fedora created by cabal2spec



From mtruch at fedoraproject.org  Mon Sep 28 01:22:28 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Mon, 28 Sep 2009 01:22:28 +0000 (UTC)
Subject: rpms/kst/EL-5 kst-autotools.diff.gz, NONE, 1.1 kst.spec, 1.19,
	1.20 kst-autotools.diff, 1.6, NONE
Message-ID: <20090928012228.A474911C02C9@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15316

Modified Files:
	kst.spec 
Added Files:
	kst-autotools.diff.gz 
Removed Files:
	kst-autotools.diff 
Log Message:
Another stab at the secret changing patch.



--- NEW FILE kst-autotools.diff.gz ---
???J
????`9?5???L}???1]g??v?[Bi?/??{???????$d?f	?>?W??????Ha??
???^??=z?)??R????~@????????;
?????9P?:
k;???#??????????r??8<????p?7b@????9S{f#?<??? ??,t?	,`?c??>?? ???(?iBa?v8ap??(d3??G?c?(???u??"??@4z>???-Ml???u?v?????q?H?g????r?p?sG?c???ht?????g???=???}v???"?j????e????{W?~8???jC{?X|T?m4???A????
l???n????[??.???F???yk9?e??J?3???#
?H at ir+??\3??X@?G???s??O*?=????????QQ{V?pM?V?j??2?-t??M?PO?G????UP??T?/?? ??????3}??Rg???8'w???s?? >p.?]
???hy0
t??H|???6??l??E?X?@??\?	?!3?"2F?T?M?m^G?!?~6_hH???e???%? CX?"Thnw???pBU?S+?P..mm?????$"?!????A???%?1f
????????????`\?
N?5?<@XD:u???l'?Aa??mN???`??
? ?"<v(fO?o?x@?.??_?$?B?r?
d
?l0???%?? k??????????K5?^??FHKAbR?W?
???C??^t?X??Uy???<?/??u>?>%_9??dLm?Xd6?:?8???<k\?[R???
c????~Hsg\??Jw??? ?fi??
)??9?.??;????p?1&????4???? ?]?#???}LB???AD?p??p??g?(?u?/9O?#Oqa?;?dK;??????+j???[a????QJ=?z G???????2?	??N?9Ri<? ?S?????u???f
??????B?bN??+?-S P3d?????a!?e at -?w???j???Ob??????!??=?<???????#l?8???????Q?`77?m????%`?3??06?=o?e?*\_5??????=o?-
???V??r}	?????????Z
y^?$???Q?O??a?g??P???k?e???_?<Yx??"01?=L???q???O????@u???0S??P=?:?v???1???w?%???["	B]???|??????m????????W0????WQi>35`???h6z
%??H~?!???G?J??????>@???l?/N
???????[?>?c??<w??)?????:?b?
?#?m?}{??????f?mvYY??????8?<?K,???0HY??%?,?P{%D^?U??#??QM???<???????L3{G???`??S2????
?

@"?e$???sRh?r???I?ra?????W???g???}????E"?t??I??(?q!b?5?????t>s??h?\???*qihMr?^[?3H
???K??kf???b???????j?%E%?E|m?Xmr]6??	U??	???Ha6??aA??,???k???~h?xV
?Io?r?T!????L???T?S?	E???B!?????
?=<w:?P?HA??r??9???p???c??b???JQB2\????????H?b?)&
??q?sK:Q??????k
?`???c?|??????m
Y?D???Jh?v????????Qw?W???	 H????q2)j.?S???Q0G??T??'??b?*+z| C/e?]????_W?r???)?%????`????5????21?qAi?
)2
?L
_dd?%??d?aGT^????)a:??m?H??9mu??V?yu);??? ???????U?
/??H?0l?y??u??6??X??0??9
v?"?h*?W?????_????7?/?tA??
??#{?N?N?X????/p?.?2??%8|??97'.??6
??????c?????\r??t?K??????TXz?D??#D?eD?6k[???H?u?
?kI#??8y?c?ViL???t?1??\?t8?z?'	?????5?k?H??#/??!:09B
&???7
oY????F?m?8???~H?\?`?????????????8V??!???,??y?(??u"
0???d*3?z?=}%?_??]O%\??d?c??ow?I???~?5>nq$%$?F?xu`ul??#<e??K??+-?1???c???Q???????0C[W??????????C????0X"?
?n???'9G???c'????7&????~"?????[nG??	[$\L?0?E`:k?;????%N???????*?r??/1??>$?>?]?M+x??????+Jux???J???l??P?2d?X?urB??GL.T? xB7? ~yW'Srn)l&?
bU?s?(m,
????c???k?(?V?u?*?:`
??*2?qZ??/???y\??'lr??8????E?54?1????"?"1??p?!A`]???C???d.??????
1&Ts?`?/?n$???0??`?X#??jA??0M?????VU?i
i:K!????8v?+?c????*\
??DS??O???P
?|[6????V?%b?????8F!??L????M?
????E??^+?F?????Bm??	j?
pQ"?%?%i?	e??? ?
L?$KC??&????9???U???.?x?
	?????uM:????????/j????X?????S?X??
?42??"T5??xp????He?k?W???W?Z?]a?i??
?GOye??R??Ag??????!??kt!????,)??H?	?????@<A?
tp2'q?+nC??T?@!*???????????Ee
N??X#???J???h,??\Q?????B
?g???%F8???TZJ?;???}??t???&uJ???2?I???$?G?????[?2.U??5?8<???f7?V\?)?IOr@??N,?5}?? _Zk?????U?H?V??????A ?????]????V??????,???6??`???X?I?e"Mv?	&S??Ny??8???KU?31lj+?*?T?$??'?S???N?cj???j?6z?????kO;??+S?p?C?X?8??8?F?N????{??TX?|?A?h??p??N-?????
g???(g????
??/?????C^R
dm?vg?51?????*??????y????_?????f?_t{?K?/????u?u?c?IA??c??????s????;??x_V?JGW?<eJ???x?d?????m?
J???6???eX??iz???????
????vc??Y??????????yv????[??`;???z>#??E>.B ?P??|?p????P8*?C???B????,?4V?.yH????Y?3U:d??????e\V?l???8??*`o???R"??O)^+??? ?(????l>??|
?Oz9???,???!????U*?D
9-vj(=??Z????d06??:f?g?????l<?h?u?????????
????p
?
?#???YyR????r:???
@gM?]O?Jt3"????????????Wt?_?]!F?l?`???!m?'?fj?Xx?%?L.K5?)?w?6??
t?Y^J-2=u?9?!VY??'???k0?0@??:?F??[???@???y*=?D??/?%???-??-?2
I?>'?$lm??-J[1O?Msm8?hE?=?)?c??p?I"
??W??L?8x?????G9?c?????Y???p??I?G?Y?{???[??`?rU??!?fnE???^=????J?L??????????GE?c?=1+_?&???U??A< JW??|?'>z$?W?
?g????sG??"p???_?????,'0?X???/DH???,?AV
???
??c(%?=???/?+?\V?????}?W?n./??-??4????/	) ?????9??
?T????&?"????l?~,?U\W??k????X?Kz?W<d?,bNa?????$???x(r'?'????	O??o??%?
?)??<(?JP?-??7?X?D	`????-??G==???A?????????5J??D3ov3?????A1??PW]????b??z??n?|?V?4Z????9?e?I?7k???i??-@??j
??'???+Fax?
?!??
?$??h??[=????.???uIY??^@?V? h4Q:B??"?j?&??~??	?:?D??y?E?????u?3?rI?r??l-]??????B?x_a|?$???????bu??X?"?F???m[?tIq?????p??y
]?Of7?\/??????Giy?F???l???;<?????n?&[%[???H??b>??w??V?$6???Nz???/????%~
I??syGR^????q??F???W???o@?-?
???	?
#o??n???	?????	??????J???iD?U??Z=?$??M?????GIy]x??b??L?Zz?9??r?)??????k?m??'??=SF>=(??F??x?!?'7??W?@?H?qj??$n?K?9?Z????????=?`t???????'6?G?|?t?I5?????<=?.??wJ?V????88?MZ??z??|B%?t?p?8R@??GW
?I?W??hY????????\-??a?6?)![???5??J????%???}&????IQ???????P?#w??X?
??&?O??dc??
???????Z?(?,?a?"???3<T#On?g?i?4[<;?Ri??
????5P?<?-??j#??
???b?q3x???#??*|pH1*??
?"4J*,c_E?`0?]!??6???0nW;?????R?Z?@T???? SK?K?z?+??%!?A??????????????Y???ZECP<??????X???L?????????~|???r????)[}???c[?`O?c?????%A???????yP??*?J??? l???ys
?Y????????????????v?IN|??????5}\u????Bu?>Qz??N?C????mqW??q????T]<??%?y?=??iX4Z?e?3?\??????d??A	-?N?'?????hN![(??CA`?w
???]????????????P4???????(6qF77?F????E?
??DZ?a=????
wr
#????J?????AO#??KHy??N@
???w=???T???7?C|???'@]?&h|hXwI]??8?T???P??????t?}.???J???4??]?%???dg?S?????? ?V?v????????????W????????b/?$??$??X???&%???_?52?M
?n????{??0d????w???w?k?c7.????v?e?.???p?$?????V????dq?-5??C????e??)?0??tn?"?X?6??AO??}??m???e??d?t?????????E?y????d????????{0?g??.?hQ???"??,=?Z???2??xtj??GY`==????:???M?6???Fo?Q?????P]K??]X??#O?g?k??,408?"??PI?7q$*k?$U?c?|0D6??
)?Xc2:?k?x?z?K?=???m??`
?????^?q?^???=??"?????Gq??!?\??l	=?C?????,??(??Ux_?IGc}La$???_0i????~yx??q??'Q??x4??o??S??2W*??0<???P??Uq?C????y/?/0?kh
??#???#??Co1Ae?)+ M??GJ4<??-^???M????d?yT??
??z??????'?_b??rAl??@?M?	?X???J,??.`m 
??K?Q1Uz0]???0??L????D??J?????B%??*+o????&??i??^?|?????SLf??*??	???3b???????/?a????|?d??8??V?=?B?2?U?Pp??`??@??e_?.?6?????
=??f5????^,&t???C??[?wC$<??;???????zF?
?yx??k
??j?????}???G?:????????C???????x?az????@^?Q??*l??C+??!?{?W?4(?u
2?RfD?????G???????.??'???d??ux?Z?????????r?s??{y?+Bs??~??e??????O??=1
o???????fp??p?N?#??o???r?>zv?
j#
{#+M??:!/?nG}(\????"D????`?
?J@
????*??'?????R?FI?nJ
HeH?s?AW?$tm?P?&.??Ih?&!M?M?????e??I?tL?T1	]?$\????O???R)	?Q?BI(}???I??G??`?U,????I(???)????T)	W?$\??????_?$<m?88???????$	?H?G?F?E?I?:$?????A?I??#T????y#??E??#?)?D???????h?D??HD????0pSc$??H??H??"?k?D??HtE"?*AM?Q?0=Q??WT??0%Q?!?%??@?-|??F.XC$????VK<?GHU??4E??(?RM$??HxJ"!uD?U	?!??H(??Q	W;$t??`?? ???5CBS)??????[?:HHm???A??3?????	?"Hhz ?????	O	$4?0U at B?
 @u???qR-h?3????????Yl>??B??S??aK@?@z????`?J?U??E???ju6c?D?
???????>??2??)6?X??@9?q???????s?v?"???10:&???VH?O???qSn:?4.?nJ??c?????%??xM???\??????Y????2???	f?:???x???
)O4???\????zf???????+PB??\X??:??k?????s[y?????K??B'?;C????????m?_??C??~????????)?74u????o????Kw??.??%?|?2G??9?H?^D??k?36^?=s?????t`?or?.?Cwj??u~F???^P
?%I??.?????nq?A???
wt@?D?*H?T:U???A]?,??C??'??Js??p?X???p?*HlN?^?y?u&?}fK#??t?????X*a?vQ?S?o???{?p??oz???????????t?s5?????U?H???}???
?6?*??}????%???'sqps>Y???$?U?????Q?|bc????%?W??
?@???	aw????v!*-I??
??]?S?|?F?R?T?SI???\????@B???ve?>.??y?]J??????%9a'.?^????m
?	??????;????S?Z??w	W'?o0??`e?Yj???,.??{????B?]{???s;M??u???v???????x??2??~????????U?	*?Ee]u???0?wT%??g?+???8B?g?.????^??
/????????? ?C????o??m??????]?W?B??M?sqp???wk???#}?x???|???q'9???????^??.?+oY?_?}?"	??/?+u!???m^??F??m???]|O&W??L?'M??????l??V?zf-	??]?W?B???cYM.b?u?? ?7??w?^??WVc?????W?B??#??8:V?k?????r????#???y?.?_???|??	?_?W?B/?SM?z???????Ib???OV??d
???Ob8??????m?-?m?????\2???vHWEq???+w????4???*??'?8?<?_,7???!??????Bz??Qx???????M??m????????I?6S?????#O?>5${?T???>5??\M??2??z?????????vg?U?????;Q9????+?B??p?sE??
??878??Q??\??)Je6?d?bhoQ?TR????&??L?Mc??Pv?J???
?z??3	J????*?B???9
y??8??>7J?M?F??;G??r?????|??g*N?JM%d*5?Uu??{???(8??p?"?[?S8
?1,? z?O??k??1????<=u[y??@???,?^?s-9?`???l??????c?c?O?}???!I????????%O?.3Mc?$	??*+4?z.?|????????%??
?4?)?!???9?
,
??>?uj??????}???=N,&??P6??%????"
????????t??H????j??O?????Z???s??3kc????g?kq><?
????S???eo?????0vms?`???l?[Tl +?
???
?
?@???G"?.?J???d?]??J??
??&?c?oN*??F,'?fL3?A{?33?(???n???fnB?!?#?b1?
????????????6??Qn&?x@?ra?d
???&???m??a?
?,??/?Z?6\?m?+Y	?D4?????z?X???!=??????^?`?1aQ??nP#Q,R.)??O?4?U?N?i?
e?4)@??]??{???ZJ?Z?8?\?X?0z???3S?C|2???3?????R)?;???`??<???????#????"?bY?C>????_?:||??E?M?:\??P-Z??L~"????{ ??F??F???e??:?jz?SS1??u???}<?,#??#~;?V???w?????P??????

0?|???~6?????|0Z?R??a_"????a?????a????B
??-kk?;?q
]?g?jS??5M?Y?W???=)??7?7?w?y??????q.{?,?}?\???A?F????r?1??C7\<?|?*9????E??cZ??F??2???bp???Kl?$????????????`?%?
?,5?X???j???}???V?v at f%?D??????U'?????6?????4Bm|????|?T??(?E?R?W??f??c???yi?n?y1J+?????T????#T,?x&?Q????z?KN4$?)?????V)ajA?&?:???
????/zr???A???N???g"????????0??D?FX?n????D???K
?*?b9????]r??
?????{?b]?g}?S;Hu?????j??????v??"
?	?o?????#@??????s??????L?+?t^??????=?Bo?[?x?S????uq??	??&?x????/h?`??4?
?U?????T?I?T?
[S??A@??V
??{?M????&R?0_bd #???.?
?Y??E?"?+????o????W??dB!???x?ok.?'???@?Vs?$<????IVI<b??i???g?f?V??F??m??C??t?
9y???*?B
9Fd
[????l4??epacX.??)?n?[W????6e?x???x??????u??|??Z_3???*CFI2l?f??qu??T?<?7?????[??d?LD???t?2?UAY???_c?????(???=?????g>O??:???`?1m???c???x??z????d????zE?zY?(@#???N!?=?x?X???????????5?n?x???	??6o?8??GW?K??]???8?)?qR??B?m???}??1?W????Oyt??U?8
???di??]>??)??J??=x??w-??0??`&??jw??_???vv?(
?;??'?z??<?v_?_??????????+\dH?a}qN??%
e???????C?{(6KG???d?wuD????3???????????=?4Y9G??????0u??`Ev??~X3?????
????+R?l???????r4?8??s?)???W?i?_P???n?:?8?0B??G?&U??'?????????1cW? ????_??F?????X????2??^sws?????=??o$>?|_R"???mTo~i$AH????v#
??S?d?K??/=?#e??"?I??#
????*?|????9??F%BV??(?????}{H?&`?'H???$?QE%7v???k??vk%`??*^??Mb?????
c"????????u?????O?75?t?2??????{&???
#aH??An-!?????????lA??0??]v?aF??F??Mg????V~Y?2i????&??S?????VQj?X[?????????Zj??{z3#7?????T??F????A????M?;Q-????R?*??*???w?~7?wS<?Y?8???W(q<F??RAM??L??*?V???T0????B{?H	k?G?XL???v???G*??V
??J?#2???
AT?-h????B;l??e??}?Yzpr????7???????bQ:????F??8?k.<?Ja????????w{?@J??P??>?:?f?">???:????P;??
??W?6~~a???{??$5??<?j??j7:Kj??gVd?"???>Mv??????kms?3???????p??f?????t??L?x?/???x??}eZ?@K?~-&?&???-
h?????zo?u??W	k,&#$?V??U?
?<;[u?????E??8??????]?E???YE
UF:??w???o????G$Dp?-?ob???\???????n??r??J???YS~{?p??w?5?M??y??O{?T??n?Q%i??S?c?j???X;z???S<Wj?|?wNr?A?eFdv?????????v????wr?${????';'N?O>?|<99??d?????O?y?9????G~???$v??$]?A???~???q?*5???$?????}?1????{T?|???y?????D??Q<_?zY?'????????}??.s?	?()i??4??P??????wJ?C?2?JK?"H7-???[Lq{B?0???a??VS2???@[z????;1?A ??????e?>FGj*N9l?W}????c4??0?\??1????????K???;?8??????9W???x0j98???}
?vfO?<??&?/lj?:`?m-a??:????u?{0?F
??'???G?^*`/J??q
??UZ_?1??k1?4?QT??`?????^????EZ8???	'???[?U?r?1?93?p
'?1?????
u%%TQ(??? ??|???
??M?;??pC?(`?????????K?????}t??M"??z???}?o?????6m??eo??7?poU{???
??>??0`So ?C???e????[?m?(?UN???XS?
???~8??s?'B???]??)?????e??W???.?K?????'0U? K4U??N`????????I?? ?m?Q??C????3?75?????q?ZexSw?R??"dgdv?H?PW??v#}?????????%?g????????N?w!?
D??v???6?h??N??A?]/?a????????7???`"???'
???O?44?"?wY?:??7	/?aZf)?	?3?#& 
G#????Z??R??LE]?-?/?z?|.??l??^E???_??/4??RdIc??'J?T1<rp????(?s????3??g???;??#?B?d0???_?\?????hTe?????.w?????u??.t??*?;?ho????????|?????(kQ????[??????m?f????Q)Z?[f?????p????*!??Ui?=P??E??????|?????~?{X9???|v?*@?H?gms?,?!G:E^??X4???4?d2?y?2???au-?i???Wy
??X:???11?!E????P????1"??V?V???"?K?
N0?8a?PR?Imp??>?]???U????guO1R.vPB??J'?V-
??????????????+,Y4?2??zH/????ae?A?????????1B??)d??db??????Z?2j??[???????O?7??tr???^?<U?|nW'??t
vRT~?LPO??????.?}Z?????_/;?]?t???????Y~?"??g??vh(*??x??C?4??s??:??V-:QjT?^N?e??)????;???)????:??>???82B?W??.KY??3?????h???????T?? ?,%?uA?????d??K?|???H?????j?J??5 ???????Q????-:???:???#?La?_\???H??????{??????%?tE?e
? ??j?|????
aer???
=???YN$%]?2"j0????O	??2Kn??
X:s?/??K?;?A?a(?j???&}X?M??????gB?%wB??9z"'i???@W?>r`??~??,????
??*-???@?n?? ??P?w???????g?????k?@?x ?WA?-?)P3??
=?b?????0=]4,rVXJ???|?^%??h??{_??^?Y<L???[|?w??mX??UI?????
?V??#???????a???U(??dl???D0?e????ZEmPP??J???V1
)
R?
???X?o??????_???Lt?R?$??j
???k3?n????????`?=f+HXn?
h?%}?oP???Z???Q??*vlh???mR?Ki?P?Y??a[4??M???I??RH?w???U`$ }?dE?=???x??h???D^?? Wt'?G??????N??h?
m??
Z8?4?8??b?????{?/(?
[?=T??@jw????5jB?B?um??[Mi????~W?1i?LJ???>?;gw??[m??(????_aD?,j}???????U5`??????D"?m???%???p%?-F1%?Z?I??X????M??'?{
???????7>????~??`?~??%u??*VI???gp??%_os_R?????m???????????]????XaW?vb7UU ????????&????nxC?0??O????R????)???#
??J????I??%?,??????F?}?.?~??]??Zi?{imPU?]?
?'gNH??????F???.o5d?J??I?D?{)0???????S???m?:??o???MU/?O??)1|%)???????????_???????????1=??}?[??i?"??V?????a8%?o???qu?"?\???????.?????
UN?????~??
/???R??UT???$f?>?????[i/6????:8???(wO?Nq????
???+?1??x??5,p|?u?5p??j?^)T?P??p???M:??S?????U?tC?>???f9??????Vo1f??n?=???q???[_?o??????*P???P!t$z~?????e]{??????!F??}?
S???N??????m'??R?????
???%????&??B'?)?LbH???x1j???-M?\A9?Y?f??V0???8??????o''??w??v?|????i??????G|?\+?o???g????U?h%o"EFA??^:Rqa??J?R??9??M?R?dx?y?????????O?R?wCKR8~??0?]UF??V??q????<}???:TXN??
2?8m????=?hm??|>?S??
gg4?/?w?x?????E]7???ztvfQ~c?????Q?????????^8PS?qB???c?4??R????????*??R8?q5?)?c%\?????F?%Xd??Ly??Dx?uZd??*7?@????%??n???T??x?>M??jU0???A???x????5?%????????BQ?
U?mg5???8??n??
qnlOu?A?X?;??'??r0?Kpw$ci??:?K?|???????(.??w?'D+?l???.,2T?
N?c\?4)U?Um???F?N??4:???tE[c?<??W?I*%X?B?@ct.?-???.Ys??????
z????A|_?`^'?lW?g?+?!?b?
}?EcW??VC?Wew?p?P?S?GE?A4??hz
??b??????8??CGd????????':B/?????I?W?U?
??v2A?V???)?Z??kqo???CF?K
v??
??m????????
??F?x2??????Q0&0???S
??N??g???A??l???)?7?`???[q?6??p?y|%+e????0I??z?:;@????????????yn4?K??lj^Z????H? ??	????????<^??C?Stb?l????W??|??????Z???=?????????????c?mu9zua??3fk?~\.??")t??%*????aG?5?W?	i?????K
Hncx??????.a???S9?I?"oI?F?J?????????
? ????????????M?\???qB??{??]?pM?
ZSa?;????%@nT??ofy?[9?4??B???Uk??14"??[??99?i
;??M?6?_????	?<?,h????%.?!??i?+?^?$/???O??^?^j???&Aa4??????	??f???w|?r?????????<[?????=??:gW????
x??..+XHV?u??G?DkJR??>?$e$???8?????E?D1+?i???
?0???)??m?Co??????RC)7V????!?Uc??????dl?{R??e?&B?*?!Kq??.?\.?L?_W)y??;??K
?qoj??3??????(!???c4C%w?-?0?s?*?U
G??a???????Md>???t!?(aJ-UD?}G???????>??rp??/?(9??Tp?b??oL??<
0?????:??W???3\R?+??w`?<?-WJ??C???j?>s?W at s?Q0??nQ??0??
???pY?Z???ZC?q?
??5C??$?X?[c^?m??c#?>?1?bh??a?M|?R????y??fl,

??kTo9?;???????M??i?BL7?M???d??x??x?q?`?~1?&x??[o?Z?
??????Xm?O0)'?Rn??#???S??P?k???<?Rj??d???-???T?'??1?
W'}.#?W

??r5?K?????????R{?x*
?\?HE?a??P=?@?'Cw??,?#2u"???7??tp??o+?m/	;??????/z???G????=?s?Z?????~[?e?a+?.?x??#`P?4???F??????????.?_??Kl1|<?=??9???>%B?X? S????F????*?????c,?R)?&d?P??72?????????&%???????pv?G?sG????HQ1#?????2y????%b??H?????o??2@??m=$I?????d???Z}f;X?9V5?y.g?????L??$S!????\
?????pV<H??C'k3?:?%????'u?d???4???G????.?-l??(??|????u???i?&`$f?:1????ge??`??L??D???bl@?9??? ??6?V!%?R???a}???FV8tM?.5????!m?Q??"???????????$.?q_?C?I?K?'??$f?????
?`h~?r?Hm*%^???????}N?/????^<?VJ??T???3U&S+5J??4?$N@??%h#$[eN????ZI?G???D/?(n^???V??#v(??P?-?U??wSD??A?2$vXizT??*??G?zx4?????(a?!*<???Sx????t?c??????????%5=?????H?Ny
?P???9???1??2??8?x????GBe=I(??Tcr???????LZ?*%???a????$?????5??n
c????????U4)\!\???K?M?`?)?;??*?
??44zZ?6?j.?KV???>???I????!??j??B?2F???D?Q??????E??0???@?a?#??"??`??VV ?r???Z???6
Gf?d??%w??Dp??T
Eb?
>??D?,?:?s>Y??????}?????9??Q?~?i??$)(?C??
j???}%a???5(?7??N??S??(b????H
/?X?aN?y2w?m????[*4?wW????\????????L?4,?????y??E????	2F-?	??H??A?
F?[?Lw?v?"??T?f? ??n*??/l?O?"?
??V?-???a?F?5?:?????<?<J ??lG?[?e,L^&Wx??????_:????f?uPl?Iyv?Qay?^?	?B??x?G?o??u??X?#f^????I????	?p??????L??F?w?0J@????^v??1[??
?5????G??????5;/0/Kn7???N')?B?8?frYWk?J
?u?.?<[??$?u????3/B3c"???n$??U?Q?89??t3W?a????%?R?g?_a?T??*
???53??d?]????"h8??b????
6?M?NGS?
tz?BFr3?????#U?3?>?"??0?^?*???????W]>???????{C{?qhMI??!$?lL??!??)'`G)ieN~v????????f?6?ZM9&?^??????????????Gt??V??r2q???b??=`???KZ?r?gy??C+i?#g~3?H?
8??????????_
b??????I	+????S\??????]?s??%zp????q???????????7??,?0?????mH??3@?}0??@?{y??G?C????k2?)?1$s-]??AQ?@??^???????T?#?NYC???g2?1H1?)U????w/??nfn<????g@?~???????????I?5?k?????D???~?3?|????O????9???V??
\???G???C?taN#v?-??<>???$? Px/r:?????>r???t??n?z C\?????A?Z?o5?/?$??^??Vgbg?BA?W%?3s?g???=I??Ez%s$?????W2??xUb??W?[??3?s??/+m|wB?'s??_???&!?ug? ??? ??\????I?
?z??P "????(??z???????BD?d?u?XgR6??!?????t:??1N:???1?!0BFS?J:?????i?
????`3??
??Y??????6????A?I-N?????x?????*F^??Aq
e8?=?????K??^B??w3???)4??iT??Z3%w+??"??4?[o!(?Z??F??:qv?+Q@b?E?]??!??????'Hj????????UKK??`5???1Y???????l?n??@j?Z?U??U6?|"$???8????'6?I??M??j???p???tx?Tn?????M?????OnZFW????Q?????W?d????f&???G0??v_<???{???[??h????F5?OO:Oz+?Q;?.??$??#???S?H??S??RR???<?,???n?_?xZ??M?"^T?[???
??
?0?$??j?he?lUt??;?tZm??&??}q???Wm??^ L?0oiPb?15???Q+??????r?P???f??*?Ww#?v*?~1DUav??X?
?'??,?"?Mc?>???zs_??-?D?I?????w?z?K??!?'????W????q?G?|?\.????,[I?}_????Q?J?m0????????Z?l?f%?????ny!3??+???'?-?
;????[d?0y?g{rS?????
dHh??????1????????,?X.&
?h???]O?p????Z? ???????;????>??>
??2?j?sBk??*?sf_A?7??w?q

@V??????z[?	q.?72?<?VZ
ck?G?q4SkF??A??/|E???T?86?i?/?????(&s	?lNf`????]???|??t??zEe^f??+???N???9?????>;??9??????????]????????????x?_???G?l??? r???*o\?2\???K????F?<?@[?? >???@ZmN?mK?'?n??????{??>F	q?j?R???Y?i'?j????lD;,??;G??#?`f?V?<?@??m???^?()?)&?H?
???H?I??Q?Xc???
??oP??E?^A'?-?????????F?_?eF?w??`??7??
????v?D5?/???????x9?????,???;u?6<?N????????t1?\d7?C??????`#??S-??xmAM==C??nxeY?E??xbcr{?z???T??s?????t????"????wN??J;'????C?Z?tl? H????L??1U?"5??d???????L#B?-??W??F???'e\?o?H3
???????u-??H6H??????*?S??"<J?????
??6?h???y?????????n<????T?4?F?b>????@qv?@?-x??NA??????g?kc???????
?%?@??
??E??7??O	? 0Gih?8k3?A?Sg??_Q???
O"L??V?7I?????j?#6/?dYN?$?`J
2?)?o0?;qF?S???
3?????h1??8?.?4?????9>C{?y?4???dD"Aj??/???-Jra????h???????P?W???Rj?,5jB??LU4fPM?????I?g?NQjJ??=?O]??b
B??NF???f?^???B?.R??'???l+aU?/W??V??p??g??q??f??},?Z???N?
??2??F???`M?O8??6.??~??6:Ux?
E??v??,???8,B?9??uX0???8[?G???$?????????hk???	?n%????
??=d??3????#???c????e?O??V??>;Q
?	??~?k~?Vm9????-D?4????/t????t?@nJ??4????z?AC???`9M"0b???
{?7bo??n???K?
??
?m?L??K??'?/d????z???fv?N]???r?\?.?=?? i;??r?*?C?!??????i^??????P\??gX?7$???????????J|?-Jy*E3?F??R>????s/???D?1?|??	?
???????Z??	?
?dl??? ?????z?W???
??v??2?\?=??r?m]?*'b??6c95??j?????e2b?Nq??`D???v?O???x?s???JaU?;?M??'????R?Q@???6#`
?aX?????q%?}h??w?d???X`??b??[??%?F_?7?M??1g/
?wD?:G?,?lM?^L?-
??????'?????q??1L??????????X?3pQa??h?`?Mu?K?NE|??v???\{???????
??;??,?v?.?0;??w?1!?? ????[???K
+??6???o??r??????zI?%
??t????????#Z?
?6?i????'?v\?
?^?? ??@0?
_??c?5???oq??
?w?ve??Ck0F?cD<??-????????O??????6p????8 ????A<Ll????x?hF8,??????|??\???e?#?X????=A???R%??g????L???????%?
2??l+?*?M?I?G???0&A~J?eL"#G??|4crw??~???Fo???|???B???Xp??\N]??2c? #??#T?>$?(
o??}????t??%?B??v??^(?eA	?:??V???9F>??xt?Z?0?
f???D
?`?g*p??--8????;&??X????U?????ff%2?`X?;A???4O??x?C?b?!z1?!z1???v?n?g???a?????F
U??=W???_~&~t?B?;	R_???r??U?;!???d??E?X??I???*?s?,?>???????3?a??????b?q}1???????b?q}q???b?q}?w\_??????8?/~?AZ???!???E???<?/??????~\_??9?/n????????z???????N???<?/????U??????????hr???7???_Pa?@p??3/???-?0???5??
#D??3@??D??K??GK<~????6???x?t??7|??F????/?37(.17(.77(~s??gnP4?
???"????E?X:????aS??3??Z?????Q??yT]?;????"?	}?0I&????C???*?l^?Oz:????$p?=@????5fgsS???`?'
*J|??EC;????
???Yy????w???? z?
?	?]'BK??X6'??$u?}??;????????S????./?k)g-O??3!f?3M?:?Z%+?D?,&?b?
??????MDX?'?!??h?d9#???$\k?Dk?V?2?k????t??e^???TT9=??<?????^?P?r?uT??;?V?T?/?Z????yk?N]z??(dw??,??
X?d
?=/u??+??????Gv?8?J?B???{?C??B?LD?????~?H???:,^??Y??????,PKs??W??B?????*5-?a2M??IE??L`!)AS??X`??G?/??xt????_?&?L?_?L
?????d?	%!?V{f?S??a;?????H?lm?kZ.??^??b?5???_?|?????+D|??$?? ?*???????R>:+??QP??=??x? 	v??
5t]?c?Oa??l???K??V]goH?K???.???DGT`???b?????/???5?????/S4????8?O??wj.??H<`2??r2I?@q?Q???????\O_??N???Q
?!???L??PH??BA?c?AG?8??fA???/~?????:?@v??????<??P?TbI9/???
??
?:??E???~K??)?8/(n`?=?|??E25??@?
(??l??????%G?9???R??xn???;2??V[???#@???
t?S??-]c_??Wj?s7?M?sC3????w??[Ji??jbm7Pcf?Y??9???????????!m???|???s?x7??g}B]??x?0?:?T??	aL[??F?W]??Jw??lu????5[?t??V?t?Zj7?,]c8'?*?`-??>??h?0????*J?B??7???y????4?????;C???M??????%???d?!(??NT???	????g??\&h?"??A??[|?
?L?E??&,??=]gA?????????9L??????
O1?g?1%>y?~???????7???3???????%mF???M??l???5ji8???<D???l<C90GsEj??>p????????../oD?=?"l???&??5X~?????0[????RT?M?uQ]7+?B
??V??
)y??z?&????7^^???/?f???.??rvaN"Z??R?E,????*_u~??U??? R?X@?7]R??N??^]?????????\:|vp???????YT?oG??????
F??["CZ?"??{??:??	??"j??g???d???????R?~+*??mwl?x???n
?Q???6-?)zX?k
G???o?sx?[y??M??'~???L?"?|?`??+[???u?y?.
j`6?p0??z)cpK:?SoD?k5d??N9M;???O?!F?????}|?%?????<????;?4?`?Vx???>x??C
???0????amm?' ????P?g??K"B???Z)??7b?l?F??t????j		C?Y??0????0N?Ihn,????
?+???sS?Y\n`??$'??k29a??&'L??M?????3??f??@??N?Qh??QzBw?Z+A???????h?8??Xx?Be?R?re~>-2S!6???O?)5? ,Y???E?+\;???0???<????0???r~)??r~)???s~?j????|??
G*?N??S?P?(S??4q???v????!?{o???{o???{?g??C?2????????Qahv??%4??P2?????	E<?Wl?EW??R$T?U??yE%	????z)e??[?X?]d?h????_??Q?`\?|?R-c=?W??W?????'??(??m?^i7?`??{??F???`??j??~???Y?qi?U?=&?#*??r<??8*?cl?O?q	?q1????Q?6?
W??
?#?
?6?t:??L[K|T????(661?
m?????T???`??z??H?GR=F??b-F???,???????;?J)t???????Z??????$UI?S???7D???????y[V,?7}x
?-??CO
?????C?
z?3?Z???pG??.???]?j?,?Q ?>?????x>??`?Z?6?e??Jd???-??Crf?-A?
e?v??(uw???7=???z???J	??}?% ??%?B?L?h6 q???:$
N???2V?[??????a?9?Z?Fq??????}???
jBf?U??lcAFY??9??|??},::??e??:?j??-0???Y???3?=??2^??e7????U'?g????[???????q???FbW%?
QV?q??W??5???5,?????x-<?Y?H,Wd?`d?C*}5,zQ?	??k>w6??j1?^o4S6=e?S6=e?S6??????+
f?1%c??l:?)??"?z?iZ0|?l??/~9|??????G?_?^??y?)p?a????M?_1?,?F?Pi?@6?5T??t?Z?X8rg6??__??#D??AF?J`?8?l??<???????1??X-4I???\{???\{???u\{9S??n???k?\{??b??fl~?\????afL:Jd?w????ji??#?q??V?9???????;?aw???v??????E?W??????EVt??`6?@w?:??}S{4?[?b??	??^??R?90???KS?
hao??Q??????{?/~~up?m??????G?I?????8?p
B? ?
B? ?
BwitA?Y?? ?L!? ?l?U??@???hAH?w?/?*4?,?????!??0??
??&9?D?n????oW?;??>)w??8s?7H????*???n
O????N?ZS??????????z?y?V??u??&??_?????Z???A????v??/???1lU????i????;"???/&C?l=?:U??&]?eU?y(.!L4?K?_?B?]????Z????z?O?)?~??Ag??ui??n~%?zr?x?YA=8?M??~%
q??}?????8?A??_?q?:?M2?A?V???0a???)?%p??r?9?N??r?)?r?)?r?wgt?So2???S???;?*s?t?q?K??3?{??????=[???0[????2<??t??W?x?f??!^?Q??S^=??S^=??S^?????7??+ZFZ]k?????7????4????&?|<?E??,;???k???? B????P??7??n?5f????8 at .?e??E?.T?.pI???{kR??[?????	???????DHb1?0G?av?^?=!?0>??
Q?
?>?p??+?r?_G_??GB?ZI??R?>??S?>????0?=&m$?3?????W;????6?&{(?????M??VQ??T?8?????]f?}????Gb????SN?K??k5?Lh????S????x?????????3?Q???N>N??a??F?^?z9q??Rq???????S?M??N????8E0?T6?????^?~?vj??r?)??r?)?}??A???-?gP??V->??N?]???b????/????-??1D???J&(?????{7?????j??w?{??w?{??????n??Ey?\Myo??nt?Ey????-?>>??98|????st?=???'~t=+?&D???~m-??????O{/_=;:>>???????9?f????Q9?=T?????ZT???y????c??3??8,1VE?`?%??B????e????{?????\xoFg???x-E	?+&??Z?w'??h?{?{?x??Px?{3??7?qC???~n?? ???I????%Z???g?b??Hw?!?V???"????j>??????\7?dC???v???p???i????Z?????Y?]?,?f#???n?|??kw??%^????a????]h???????%X*H??gn]??	BF???????/??[M`'???
??u??p_?~o??~D2??t???\?w???F#?(??kI?Q??:/?????G_??(U}??y??AW?@???7w??4????^?V??O>???Kj'.????????P??#??1q???g?????&m???-i1?d???
x?0?1?S??K`???3??V??=e?S??e?S??
???w*5f???4?????T;?6??|M??u???u??B??Y??bn?[???	???????b????<????wZM??????(??S?>??S??
???????2O?N?!?<}?\+3O?)????9?/??]N???hn2??[??0?
s???,~B???
B??	????V??Z?9??S????S??
???W+?m?Yn?1?}????V???W?y)?%??6|?????????d?
|Ve?#?	a?e???X?j???4+?4?s???,x???,???U8?J??HC??X?Z?F???????9?W???d?i???&???(?"???/???????'?f0?p???? ????b?????<?t??;??^"?,?????(dE|?`????$??y-?%?/?i.?~?K???*O?Z?!I?}k2???x?H???d?????|s'80W>?8??9?0h?lX??????oHw?f?^)t?v{_?0??Y?jaO ;??M?????&K??A???????x?SA\??w??O`??????x?V?+?O??_???5????u+)??Gb??SK??5????q?????}??}???ww????S??vwveV%??5jr-AQXM????h2/????k?Z??>]c_?kt
?8??+r????g???p:???V[MbSF6?j?\?:?<]??l]??$??(??PJ{?(^?+?Q?????>}??=RU/???		?0?E.??%vwJ?\??X?V?]??Zq?Z?w?z???j??????\K?r???k??D?M?Z???4?Z???????_5??I???/_?d????2>?]$??????????????8O?^??d????W?La?l?N$?9Vz???c??Xwi?s??La?l?N$?s?V?^?V?o????e?cInU???w??J(Y??4?E??P???Y???y*?G??I???e?m|89?P??
?2B9?
?)???d0???j~3?(???`P?S?!????U(???????l
?????l?E?+????
?_???XW?????$? zc?D?
?&Z??3E??'Tr??*u"??V8?E?
?:??LW??a?C???? ???RBo?Z???J????J???~w?A??;)????TB7%?N?4C?TZ_|??V8?I????m9???i
???,?b????u??H?"?s?|??	ly?]e???L?R?<e?S?<e???0hly?\-K???:??ly?\???????
??U????????U>???.*???c?/Z.??A?xl_????t?n(??
qq?g?$?????P?r?OH??;??
??J????g??d?????B???0E??s??????hYYc???C??%.?'?????????9,???d?1.\??%??v???v??????
??l??zb??Nl|????U??v/?!???4
???F????????????=?
})89?{/??????????2?R???c???z???*
`X?V?TW???f<?K????a???QH^w??X#?????7?c????3/?&@???d;?Q?42??fkE{?hb?#??J;?^q??.j?0?h{H?[G?}??x??=???o?_?????$??/`?m?W?|????????O?xB ?h?W?/J??&~???I???/z????????i
?P???SWki?64???M&?
?"???7?????????a??p}6???L?C???"
??iQF,?nx??0,^y1Y??<???|??)???h
]?34?D?0>??????t??,?p?=Qrw{@I??7?????
????iu??O?q???;??????m?h????};|?,??@?Ah??Y?v??W/?<?vX|zt?z???4HG???Y??'?????a???????+?A???l??w??Wfw??v?????S?nmD?`iM?3MAL
;_????aYY???D?=l^???dr???.
V???C??O??G?sB??wH??a????r5?I????)??^??=??????E1th?2$t????Y}??/\??\??O?/???<??tMU?>Rw??H??=?|???N?i???e?
??E?w?@({???!R1Q?}??s?!????S!1?h1????b+p{?Q?AC)N*E?L|?????????DC?|_?)h?????=??y???Sh?????wL7??2?S????J??F???Jlm?(???~????Q?VM?????$\??>+?????k???9?Cwqh????
???d???$.?????????
?j~N?EGce??F??????d;????Y?J?=????s\InH!??sU??+?-?[2??A?I?_?F????|4?h???????ZtUn?0;???p??.c??K&??+L?l8?:???j4?@???x?=?^?V`??????X
?o???X??_??{??|??`?
??
?YE???!?
LR ?????w?.guw<???????O?y?uP?|0??l4??r??\?+?' s?[?x9'H??O NoD??`??d?=:?:C\?n?D?????F'?K?|??#???V?;
D???????w???b6A?????l?F0?????t?N??M??y?Oc@?2??%?,^??Co'n???$?D?Y??~?Wv?????????	X????[???????N?Z/?\??# ?F3-??D`?????nO?N??>Z??
(???????a%????t??y????????8!.C]'?\??"+"bY??K	'??%8??x
ae?B??x????=t?Y
???vs?Yn??i??????+L??v"?iH;[B???r[???????EFdv?]?V?A????2??U-?.?N7cn?*???"Z=?	??/???K????0?\?$U?]m?M??mG?A??m????B?+??:^0??p?E???'???Vr??,?J{eV??:?(??A???o\??~<A/>J???^?p?@????c???y??[?I??'? 3i????????.\????4???
%e?C??? ???ig/?+???d?`vf?45G?Y6Z??'????L?Y?]??????Gp
????.?S?whk???>???.?FUX?F?A#??"??w??
p?V???tK?
??
???U?a???_?r??????z?&
K?vX??8(M??s???ZH?N????4??S?!i???1xN??x~?"?-N?(???=?h??Q???????????tE????XY.Pr!.???-????:^??@???p=r?l??)??7t?_-?K??????????O,??{xGl%????0?I?????V?????c??A????#`?.???dG!????F???M??????@5?a?2??;M?
???7??????p
??@?????R60e?6P?
??v?????cQ/]g>Ce???ah
????.w
??2??nP?sI???2v??'??????wj????d(??6%???[??h2/???n0??Z??????3?<:??P?L<x?9??(_????.^U???B??n???????????x????w]???~K?.?9?????|)?ku?)r?9????(
???V???????VJ??^???O??&F????????@????-M?5??S?{??*?TqG?_??????g?L?t????h???`???XG_?D2~D?"??o????x?????IRkH??[X?s???<
\p,?@??r????}??<?J?-???^??I??eX?s?Iji<???~?J??+????'??L?oEE?LLpM,'??????D???&b8>L6?kn??K?zy7????d?????u/}???G??????&?q?3?X?
?X8???x4????a5?9{?n9j?%iyk???:??~W???F?J'?R?(?R?(???8??Q?R+T?j??]????J??u0?G?!?7!%Rk????\B
?N????@#?\?J<9v;1??)@?&?y?5X?>??-9???MT???k??
e_iW???{?qw???L?????08a?????@?`}BJ?|??f?S??vK????B???R?	????`???+?\?s??b????ru???b???)?S?	-???
?$Z?02$?zW???
???n??????q???????=??C???5$W%?~D
)???X??!z??H?7?????
/???`z?]??c1???F???qI?_2!d????I"}????V??}QL?#????,??,??z2SP#
????;@e??P?!???O?;?d9=?????^?4&u????K?9???B??'!$?k?R???VRSylU???c???<?l???e?Ze&??$??]Y?O?E?s?b?9??\?K?Y??s*1??!k?^?0????)?S?
?????q?*???S?r?J???)???
(???T?
????l ,????^??I?????HDmZU??ZAu?{??????fV??)`Xf?????????????E!??A?n???b?d?K?s?hi?k)???B??"???I??(?????v?"v ??X
_????#~??U??? F??????V????=?+?????[&??0?#?~D????0 ??P?""??p??"?5???8x?J?L,?'?7	?e?p\??s?e??$???z???N?F?i?h?,g??&?H7????????V??W?]??o3?F?Sh??Q+??v?i$?4<
??3{?F??0
???|????m???O???`?Zc{0?????????(?;/?k?dW\?iOhfQ?/?+?3?q??????????D?????Ud?j????F)?U<??5?x??f[q??W6?A??u?r?}?\=????F??5/
197?58?w???*?hN}
@;r0??b?
(ZP??j6?[??/Q??J???d??_C?????qU9??N]?o
B!?|?e?cT?????GC??s????^_2?J????J??
??K????)????@??Z?a?V???KWt?";?F?P??;_???,:fZB*
?n??s?S????=???z?qaxc7u????????b? u???	=^!??H??&l)d?H?0)??D?^
?e?
??8Dn???7"9?[u????j????0??Lm/??^???j?/???_~.Cz??A???T??j?u????????qL???????i?[b7?C4q??px???
?? ???8?m?YV???!?U?????|A???????wK??X;??\b?(?'??|?n??????[?~???????x	?8?t?^M???J???J?;5??jp,?z??v??0????h???w`?UR?????Pf??'???t?|}{7??????#?_?3(??UV??
?ln??uW??dUK?Z?AC??????k??????!?]??d?5v???4u^??| t??[P?t??]..?????/?D?^"PJ????I???.??[?:????F????4$-?s??1?S?m?y???*?C?^??
e0Y/????_?+?[g5??s???5???|l???=??t4?6???????[???mT?s?7???[?8\#_*?+X1????w?V????4X????.1~?)?????8%?z?cdr??l???k???g??J???????*1D??Jb??7??D	?s????\$?????+?B:?`w??????5^??P?????y.???RK?f????zF?A8_?}??????Z?]??
?jj???2w?U7tN?????W?@??z?_?b?????H??+(
?$??Qc?
?U?y?x?2?5???V??
?????!????'Xyc??U?\)Wi+Z-cW?
y??T??l??D?l?G??iJ??g?????b?v;????MS????.?????66??s?4_????>?rt?;x?(???d???mE?	???j??@4?O?G,g????i~?s?m3LB?Z/TZ0?t?j?dn#]eSm???m???
?R?Fa?O?M?`6	?]?"??}???v???	WU?Et?5?l???+??,T?m?V*x????{E}x???Tke???6???c{jMp?t]?&?*??#?VQy#???",?????8??m????????OV????K???Y??EC?/?~T?}????
f?7{?X&?\???????|??
?m?G???E?qXi?Gr_??>?W?????D?U1??u??g`???!)_	?????p?????9??'V+????c0?????
6?@?[7?(e?????X?????r?
?????
)??nP?????k]GOs+??v?
?????j???fv?N??S???E?G???YO?y?I???w?/R|???I?Z?VZ???v]g?U
??cb??D	?K?}^?!?x?jt?
?lUD??$5WpEM?E???r,??y? ?_J?C?_?R?F?%wr??<
tv?|b?QB?P??*??6
ve)&	?[?J?qN?-??s??2???R?`?1d??????&
?????f????I?J???Mj?[_
?T?t?A???46?&E,?(?mE?????t%?w'???`()?I?+?j???f????????v????
h~Q??$?0@?r??\Q?M??R?*n?TW?D???$Z@{u????D?n7!???"??U$???$[???+o???????5?O?6^l\??oXAj????T??I??5??w??
)???@_??[????#at???r????o:???????????[3i???ya?!?W?$L?FQ?????fq??:!??hV?iZ???	????:?n?!???!?+??=?
#?&3???[?{??zD0N
????????B????
??^?I??k?,??8?5??|PM	^i???r
?N?fr?]o?????<??%I?????7h???8?3i?????9?h-&?h??
[???myY?SN?t?c[\?3??d?>??8z???p:??F???}???????,K???/au?l1!????Y???1jo1Zg?	#??X7?
?????*?????g?P9"?~?g?^??];?????o???
??7???????-??w<??0??+?j?P)??W?}??n?Qa?D	'?3#?Hy/d?dM0??F?hH???T?	?Q7??pf?p?A	?Od?5+j?kU?.???.????n?????u??U??t?K??U+U??+?F????j0?9??????'?h??:L?????+E???!S|?0??pGhc?>? ???Y?u3/?_?(?H	?"?I??y?????f??Zi?G?]?|t9?????w??+??M??'??/-?s???K?
??m
?? ????dL?M??^
?-?C????2???Ev?S????e?6???=?3?U
y?
3~x?3V??c<??;&??!?~?DJ?!??L???????-?~?t<S@
?E?&?
b?B?t???
Y??B???j?Y)T;???6^?k,I?a?!?q??????????#???v???2???@nsp??e\????F??09t)???xW
???2?'??&??{t???'???D
D8???d1?g?06o??
??G}???"?B%g?8u?r>?W=??V^???Wu[?? Py;?~g?K??"?SO??9??^??(??a
?!s'???/"Z\2?//?????J*;??S*;??S*;??a0d?N?^?0???*???^???N??wHvZA:2>#V:
?\A:
i%B:
????"???hy??P)B?
? ??U?s?i=???z???p?"P?\Q?Nzp??\?RR2^?????)???)???wmt?Vn?
U????kmd?????0?{u??
b?q?a?W>???{?1\???K%??CO5?^?????????OVi'??b?fE5???
E?<???R??3<??-????	??aGr
?L???c	?r??????n??H?RY(??RY(??RY??
?!UZ?8?Q?K?#?\??wHZ?("???????	L??-?A?`?????aW?/?Q?V????F#=o???RG???N????N??/???6?IC????4??_???:,??>?????f?t????zX??:?(?^m)f?Y???z????z????z??????????d????_??k??]???Rv?3?????+2???b?vK???V??;1?+3???i??@?????????KZ?1?Wu7???.?)??W???y????J??:)???)???)?????????&-At"?Q	1??_}??????????k???m-1?7??4?w??%???m???????
?,j????n7???2?X>	??P?G*?r?????Wi???5>K*:??????,L?
???z????7#Y?[?B?F??ihk8^L?M??I??????pp?w+?	?}?????"?:??Sl???,h?>?LK 6
?2(4:_?,?g???f?
$??j??????? ???zI?
?hm?"4Ze??v????V-?"?;??Q?&???????oI?$%Z??????r"???+????????????3??Z
I9;??N9??W?1gO&???? ?uk?y&?Z?	I?3?c??m{?n??$?(??a??????b??Q$??(b???/?}???u???Z*z???p?|?Q?o?T>????????1
vcWd0????
k?)??D{??????zS4AZG^??CTb???A???05???+????(?V??&^??0??0??7b??$??!?2y?????Ug???ffc(N?g??pZ=???Y???FT??Oa{??A???Nd_??t?J3?V?0??v?@??&R?~???}?s?1?
???????t???Om{??g}N=?U??05???y??~?
?{?gP????M??B????eZ?Vac??2m?kx?????%q???
nJ?T?2,??8??;?@??????UL9[???y????b??GA??????n?-???D?
?F??U?????YE???G?b?U;?q???????l4?>ft]??jw\mt?.wL?+J$??dA?^?y??%?Y????M?
???????????X??`:E??{;??Kx??aU`?DVqm9~??-??(????*? ?????u?0?\8W??%5C?N?
?]A?????%r;??b1E??>?N?????b?)}Y??>?,???iY??????y
Ez???m???%?Tu5E9/!?A???L??<?????????hu???????{???AT]7???E??Z??E??

XL???????bRC-V#?+??*2?B???????s?????~???+?,+-???/^?~v???c??}???l4????JO3??8s?2?I??????`?d%W=3???Z??@??a?/Y?\???l	?W7:uz c0O??????
??S?YijM?+?
??v??[j???????Wl???????3????
??
?*)A	?Q7??pf?p?A	byd?u?j??4?].???].???]??????j
??j?j+????r??y???k???X??+?"
?|?4??!Z1Y<?~0??05at{???r?!a$.]??6?x??=C?+{?MP???+"?Q??dzoor?MG?f\???W???|]?c??????WV?j`#J?F?Y???z?Q?S???K;d?????????V???=?fsr[???????;j3<)I??^??`?lH????df?s8??x7?Z????l?]{D%???JBxl??:c?=3.?????????
?[?(*(]/7#KK??
h?b??[4a???X?&5?Zm???????K???*??1?b*nTZ????NF???u?????????@$??M?]????T5f?;T[????
?F?l?X??}<?[??$x&"???uL??T?-o??aL?R-F??]??N?+??J????nBz?/E????
4?R?,????HU?YG?7M???jT
?M?:]??vG?????a5V=?o5??>?U??
1?]??n:??f?%G	??,????
????w????????[???h?CS|A?U??(??
?B?,k??"???h?  N??H????????Y?%?'?`????6?t???B?'???.O????????x????b???^.??K?}?@?k
Fs????6T?3??
A?y?ra???C9.S??rp3?-"?(IMC4I'
x???5??J???*?????l?,?B?????8???t?q???g?V????ZU??D?<4XQ?1???/?W???
m?2??????????6[*?k??{x????x??9???-?N??=???w*?
?????t?3X??c<$???Q?Y?bR%???`?^lw???????O??
	<r?H1????i!??sx~?d.?
	
????=??^?_???H?????h??p5}?>?f44?	???
rV?[?$?m)??[m7?9????J?1?I?A2??H?E?(??????R??	#_~???_j?f?\????v??F???"??9?R?05P?C??P?>_?E???a?????W??O??~?Ih??S???F?;???ci????s1???~?xC??m?x??8?=????l1?T??p??r?? ?U?]+4T<???	2????'?????"[??m???(??????M,????0?u:2
tX??:L
???W??h=,?????14~??"Zc?? x #m?Q?m?
??f6'u ????'??=??????<Z???"Fg??P??/N?u????U?}???k>?U???>T?????Y??8?????v????q-??{X?'D???t?????????gh?????O????O????Owr???la6?|?Q?iqv???dp???x~???$$?3b%?@?$??V"$?`+
	?(/!??V???BO??7Pe???'}?I??a1?#0?fz???`??R2~?????)???)???wq6?]o?
?Q)??!????p?a??3?????????k??M??????wE?=&??J,}?(?h}?=x
?J;QG?41j??AE?RTpK)??S??@_?!????#
9?C(?]???|??p?n?hB???&T?<??C?<??C?<t'????:uu,Q??%?
?.??;$?z$??d?Wn????Z???"V0?ZKf?????8?i?s?j5=w???R????N9???N9?/??n???????kNR????qb6?y??X?_c3???vRf=??v?n?ao?.????{???{???{???????W??a??*
??q)>????Ke???\???????Z?a??-?2?Z?[??????s????Un??????/i=??_??_?).??h?\?W???y????J??:)/???)/???)/?????2jQ???-A?"?Y	1??_}??????????k???m-1?7??4?w??%,??m??"???5N?????PF??f???O??'
?BJ?HEY???3S)m????g??H?
??-D$????!???`?a??Pa?>?\????
2M?????????/?????
s?%???g?Y??/?[|A<)????P???"4???"???p??h?nG???q?Z????.=?#??,h???F{?????|J?GW/_*@????9?Z?j?)g5Q?r?I:?Z???
<?NA>@????,a?&????`??7??R??o?(??~?M?m?<??N?m{?nv?$??????ON1??%?????cr|???K'd?g&b?g????&=?p?t?Q?o?s1??????fF
vcWd0/???
Xq?c?L?w_?????7?@??db?=D?&?2?
??U???*`aE?u?L??????????!?r????z?*???(????@?? ?5'???W????????8%??Kp??3?:?5kD????????zC)???????? N>????@??&R?n??kT~???v?e9??Zl??qi#?????S??qky%9{~?`B?i??VfA?Tb???/???-
???N?W?1??x1????O2~??v????;W?u\??(?+?2??l?=G??p1+:???hd???hL{a?ht{?W!?8?1???t??G0%P??????C"q??Z+?5.??Lo:?MG?f\?????\g1?????????`U??
?>??I|<???QC?#7G??????u??Z^?5W???zkUZ?p7!=?????zy?^oTnC?u?????????rJ5??*)3??^??vG??XMpd???1?F???[e?7f?#b??????????????DWY????d3????|?C???~o??f?9L???yUQ{?ZCqzCe?5Kdt
H_Y4U??????\{L???P??C?W?{XJ??'8????{??@W???8?(V?????B????
?????|?T?Y?F?4$K???[?j?	???Z???_?_=?z?????A??e?????g?
????D??r C??SX*?&?Z?L?6???QQ?vY?b????y+Y???B??q*td:?Om?{t??R???%Ku???j??i~?{??u??m<??z?????ZC?H?5R`?@???]?[??yjb???hb|?j}?&???OM???????????N?????v?]?4
?????{J@?lt?????I??u3?g?w?? ~E?[?*w?v???v?n??v?n??vwo????P?]???vIw?N???|???i?*??&??-?
Q?d*? ???3
.F?
????c?`??R\????????]\???????p?#????I???CG??`n?F?|4X???????2	6Q}5l?T?????5??C????e?6??=?3????a???*^??x???M????2X(?f;0?B`????]?~?|?]?WH??P)???7-cL??Z2W
?q^
?E^???J?y?N?;I?/
kb/?/X1?&xnI>??gW?????4?
??`??^?v}???I?O$a	????$????~Xa???dc?`???0?4?[??0w9+??e?j??J??\??1c??+?????t?????b+?E???H?h?HA?&?s???W?}?a8T7H?|???WR????6m?:??2??=??7r@?????]??s?????i6?????Xd???/?r`41??wE3???.55E =??&LNa?(??v???? ?????????}
???Ij(?LS???,??+HD?CB???E5??O?]????4??h?M~??i?E~???{~??r]?i??????4??I??#?????????G????4??O???u?~?.?O????}~???'??
??????v????c?????f??y+?j??????TR??o???"?c??R?dte??
?9?kY?	P"?????fj?????!??f???@~P?
c???~>T?!?_??!z??t?p?????L}6:?v~%??5?q?	y?????|?
????Gx?%>le?Z??^????p??^z?????a?iXz?w?~V????T?Z?U??J?????OP1??x~?N???pL3?X3B?2??????????p??L?N?l%???h??(???]???_?YF???b}??!f?d*;R??4O,??\!&!7?\?{c??\??????????x???B????d?S?7??W??B?W?f???I)?>?????x,???pYr5x?d^?????W??F??
?3NF?aB\]?
??????B?L?|????'???q?a??#??C?a2N=???G??bO3?KXv??\{????+?????8???????*?DQl???^V?j???[J????xB?
??u'xe??=?`??r?=??x?}I?1????f8xL??|?^N9??????p	????uR>>??S>>??S>??
?????*:QMZ???D?b????R9y?;?????0?7?Zb?o?i??n?K?y+????Z?jT9dQ??'?w?6~?????I
?????????{?
??f?	?Y??de???KUr???????Q-??')????'??????u???"????5??????????l8?K}!?JD?W5???2YlZ`)i??????|	??-V??W?L?lt?4??Z??I?]???]G?Q????=??g????
G3J???]J{??2o?????????9fj??D?????t?????z%?A?<4P@?7]R??e?????{\ip????bX?3{1????*!NgV?? ?????X?w18R??
 ???-.???a??H4?f
??du??$?p>Y?r>?%?O?:????????V?-??????=S?????o?????j<???$X&?B?????'?d??{c-0f??O??????Sq??]???????Z!????KV?F???????vJU?+?*?<9|????f??z?R-T*4??^)?R5cr?????t??@!?:?$R??F?D??x7???j??U?\?????{???O
??u`q??KF>?C6????,???j??????R??+??????7????I?????GO2??0??N??YE?Q???d?????J??>1?g??N??DB?7???-Z?(???? ??G?"?~???????~??]??.??E5???????????5?S?+?u=r???????nkP?4[???VI???R??*??t
?7
H?o?????7/_??????}9?-~/?????*j?????@???L????W
?t?????:??UM?p-3H?-??ZW?ra{o?2?u???l/??????>XS
????6??7??A>?m?r????d[Ry?S?D8E?x+??;??~x7???8?1??w?f?@?m]k????Xe?$??a???[>?G????@???|???A^_??????*L!5*??????????
??Z??V???????d??5???I?!?&???:??9?????+?rk5??C???Xo???????????xG?C>qNM?vMeq?`?????&?:2??a/Y?'??U??f	og+?7??,\???O/???0??ZE?}?N3e?R?/e?R?/e???8l_??)T????I?>?'{???3~??/?????TfK9^ ?N??]32?}?@u)?????z?????H~NO??x~?_2??kd+Q,e??D?lw??@SeX?gn_z??K?l????
??e[
?0>?
o???YW??Y?\w?04???v?AA??v?h??^W??F??
O?:f???)k?5?????|G???????-?F5?m?Q?%kjl???????{h
?2.?????{?.????
??Q??f?VO??xR???\??????0?!?Dq??v(SQ?/2?[?oSuP?#??
??S{No?=?7?R{?v??=????=?7??3??l???lVR?g??Ly????khG??/??rG[??<?eoYJ??R??????^j?&q6NJ??????aK?l??i)?wK????F??F???n?;Q?q?2m??l5>??sr#w{??_???eu???j???M?,?$?\??)J
R
?='7K?=S?/????)????S??syC???f??=[%?'T?s{??l)?m???S?=?i?MS???;? X?m?N??v???????>???J???=??????-????Y??=?????<?'5??n?v???i'?-?????qL???S8?U?_<?\??,?h???
???????M?????n9?x8L?b????
??x<?d???BY0?xLJF?qQ?4?xH?4?
????>??f?7????"&I?f?-,\?&?O??q?vY??`vY???2m?i?L?e?.?wvY???Z???v?B?e???b?Y??}???l?Zg1???YBR???$??8"???s??h??4j?pa??wE???Lf[?????\?[o?KXor?Y?[??4?
h??r????"g:Z]???t|`g:?V?y?cD??Qk?]???f?6????Z5?6{?N?d????g8??3O?6??????Q6?mv??????e??$?m??Hf???????????????[??????_O?T??U??m?f?m???msm?k?\???6??????~??Yo??1?v?n~?c??r??
??????????k????T[??$?? ?J?u???S?
? 
Y??
)??2L^|?6??`????/<0?B?3!"?z,??2h(??2h(??2??jx8.?"#}??[Ek%?hH????1????$yA??L^?A"O
z????w??w???=n??ev1?}P??B?o?i?>???B??r9?v?>'	R}?f
@_?t??????????.????.????.???=?.4?&?.?-?sMD?E6gHR?????]??C2?"S???y?Dr?dB$.>? ?47???U?)x?"???!???????8?W??????f??F]1??????P?6?3??????????8R?	}}???1?w9u?7?"?/?
2DL?W???h2tAp@?G(???s?
???fW?N?s????#?c???????pxc???; <D?d??
*J?_?2???H?r+[?`?X?@A_?,O????????	?????P????????????j?Fmw??%Zf?s,K?"?(?=?C3??K?]?P?]????22?"?X??^?;?I????h??Z(?j??HY? ???s??.]?h5,????#?????-??????????mmm??j???iW-??i???-?D?vJl)"??Y???E?9?]?H?\????X?????G?t???5?????D?(LSw?t?-{B???/(?x?J[? ????f?.H??VbA?H??W?A???,G???V#h?.F?w)k?e?R!,c%??3a!?I?3#=3?3#=3?3?;W
???k??:D?c~?u2@??!??wh.Tt"i??"??kI#=WB?
?\??????'?I
?d???
?g/?,<`?Rg3??I?:??^vx`???G?????e?-kmYk?Z[?w?D????G?v??p?-o??V?????]?z?????8q?????????,?:OUl??~qy???????N+:L$Z?xl?p?r?l???i?]w N???
?w?w??C??s???\\!J??3 [???HL?ae21iK????U??t????&V*? m?????:??l???_?*~??HA???Q`?2?(??V((=???(=???(=??s??O?Zf?^5?-?m?HN??@?????D??M??.O$ls??AHVtq"a???OL??????sj_???C???h'$!}??dA??3?T?)??????i?#????^?x`+??F????????gm?k?Y??w?D???%???Y???q[???!+???0???e??????uQ?t?!$)??
Y??c<!I?4??g8kF???UT?????
(???V?Xd??????l?????????T??????*??|???x?@?????xC?|??#?'+0?<47q???7??n??????????d:????&??????F?n???iW-2~>?????????Na?#???r????w?	e 7??K=?????3??z???B?~=????I?m2??y5Pi?5e???f=????l$&;?z???Zq??POa#UN6??)?a41g????YA?????l??$X???*7ir??m:??i?o???0?4?~??#?k&?D??z????[<n)????s?B?=??!?C{0-????5#???PcD?e???????uZTBn?????Od2:^?wN???W??s?????????sD-[?q=O?|N!z??v?cl??@??nS???hW-2|??????{???=???????$???]h?@???dN??"?1?z1???n_??"???1s>`?}w?t*?/??P#?????c?1~??Yo????w+??5????8??;????g>?e{?w???????????]c?3@??e0?@????Lw0<*`x$J
?m?,?JC??A????ku_?O??????y&?T????a???D?o?v????????s?????Y????Y??S%aW???SW?UojW?v5kW?v5kW?]??mX?j?
P8?@"?AUd??>?l????C???????M?.6?FS?]|`{q???R?G?z??????????7.??j??n?n\?;????Z&???????q1??B?D??p?DAJf?D^JJ?DJ???
?wt???1a?>??????F????q???x??h????h?????]?H??R?H?jk?????	???h??]?a??j?)n???5nD?F4n$i??)
7?h?5n???F?V??F?eh????????4-S?F4nD?F???I?F>3n?
?G???l6???7??l??????d?????~?
2?^?X???!ea&W??|???Uu??$^dn??OZ?-?O	s?N??#l?%??
i??v
k??v
k???p
wl???U?[
?k8??P?g?-?(R????????L???9???(??r??v"?z'??(wM?	????Q?m??s9EZ?~??h???????`??\??B??}?v?qN4????N?{?6?
??v???YT?#?(?=o??)?\x??~??0??-?!??#??P?????x??8.??
G[????dLy?yc??q???=???????A???????H??k??a?-??//.?????x9Q???#???Y?*X?6S??0?&??(??????"i???d???,=??&-)???d?????E?
?]?Z[?y?n???XE^?o?>Y#??<??7j}~???R??Ir08XZ_V?2v??/S?Ss??h?????rU?F?R???Z??O??????0?j?g_?m??I?:?:]B(???
?x?6?E?/?l?C?K??++??z????6l?B??U????j????e[J??NV()??4R%o`????/U????tj????E???:???1U?Rw??i%3)1qi6%m~M?????.?w
??*2??????8?S?c??,?Z?"???jj??6S???=???J?PM?nC^n?LG??J8????G?l??????r?En<l??//a?Z?Y????p???l????`??ELX??4V"	??4?b?.???P]???
\J?z?YZ?Mz????)2???
[?V????'?$L????4?%X"??Tt?5GtJD]D?#)?1|?N???m??????B??6?T??Y??u`]=??p????V
?<?nXU?\h`?o;?nd??"??/??m??Z7?e&65IZ0?n\NFt??ix??F_?????
?6???9???+d5??g?g?????<3?2????????MR?1?Sd??? ???H?f?g?q??I3?????a???ra?^?z???????/w{
=??@?-???\M0m?tgP??7cg????y0??i??-PI?\????K?z??`?|N-?)?:D??3???-6??t????????9?K??KR?)????)????)?]?a????U?5M??Z?mO??Kl?'}_'??????)
NS?f?
?R????d??Vo??L????/??6
:?P?n ?%n???'E?d??!c??"-?~o4??F???n-g?%?v?????h?-????`?^?d?"???'??????y?x?{?L???w?b??4%{?<?%^?????????ks?
??????f?S?L<Ju?U???F???????/??/`*2?3?C???A(?N?
?J?t??M?k?q????r???9???e?f?9^??i\??????A?3????GFD????G??c??/Y????c?F???Z?0??}1??*?|t?
?Q??Q?j4?Z?4~?0M??e?????GU????_!&???????5?????????3?g????????h??Kh??*??)????????X? ,N!??4
?>?eU??????M??*????Z,?LOVE?j???H?p?[?=??????1?A??????}9??g????+??r????q????{??w?1?/??V???????
6D?;?v
??(?>2? _4?v5azE?T??????=???m?u???A@?Ro|)?????V??????l?b?F?~e]?2K?diP?Y%?????eO?nwZ?*?'??tiT??og3?:D????O?S???k???!??w??uL??#n??$??
?sg?3v???l????0Q??nW
\?
?s9???|f??????V?7?d6B?g??????'-
$fxu???F?(q?Vb???f?8????1???j?G????????&?E??z?????*D??dKD???d????I??????}??1?v??c?`???C?,7???c??^"?Kz???o?w??6???2?9???1??/??(=&a??c??dE#?$??<????(k?2?d,?LY??dJ????x2TmQ???2??? ?-??}DN?B??1e??U?So0hz?{5G?????f?6???????Q??Yp?_b?[??}????^g#`GcQ??G@=?????0?v?F?i???,?#???2w??[???]?c?Yp?vC?&?6??	?M?/^?	g?6ub???}ub,_?w?qbXV?????
??G@=??K??8?l?r??uaFG??fx????ex?????F?[?????it?Q??bmk?X?_???n4h??N????,e?@?	??qf???\???67?2-????f??~?????&?7??[?!?L??}?"?PS}??3\???t?v?F??L?k?:#?wEqg??8?L?"??gt?{??M@???m?_0?3d???c?,?????B??%9NX<M?????"?hN~<<???????4J
i`???GT)?h
??
F#???hK	E?i4?4M?c?r(l9KF??L?
D??;?F/"?E????n=6|??"qhZu??qh`????a??<??H???#??????[79?E????x?e????hY?????a?)?g??:?Ly?g?6?????????&?]=C,??g?
Yo???????6??a?
?/]?a?i?1??Y??_`?[??F????&?B???F???O?z?????a?k?mw?e?[wF??)???q??/a?-??P?:?j???-??jNp????????p???avZ????t??u_????l????????=???O?_????et;,f??3:???9??c????b5?{j?5?N?aZ,?x?I?Mbmk?X??w?$?@??:??;qf??3?N?
8??????`????X8?6?P?4?L????fZ????fR???k???????R/i???H3-?!_K?~??+
4C?~?qf
??3????03wm???h??????/f?????!fxq?!f??o?3???ct????n9?K(]f????D??e`;??,???[<?/'+??\NZ???M??2?m6H????m?r??????P6KE?!<t??|?????^>??????z?Ic?4????5C??x??????U?7C???8??9?K??:?I(wF?ri??=?b?eKK??S?g?D?a??c????[??????N?`??Qh?U???[o0{?mj??6?????nmt?z?n?????f??`V????4j5???V??n???MS?V???@=?1????0?v???i??F????h???O?b<???b
?-PPq???F?6??x=F?e??????[G??i7~GD9 c`???1P??z?c??t=?c`??P????1itL????????Q???j?[??????u?qi???,?f?6??Y???/]?Yl7,??]7u\?%??P|<!Y62
w??MC?????P??5
?q?#?t??M"????g?P?j|??5?b_4J
?~?85]???qj?
?E?E?n3???V????Qk??ZC????Q????,?Fa?rRJ??5;?n???R?6??~hh??!6??Q???lD?E?E?I??m?-U???????G?????h??M????v???
?J
?9????????x????;?!M at g>?z?A???{DCz?
???E?'?????3G7`U???+???????ij-a>??r@N}>??3T??N?ax3?s}9??'???F0??C??L?7D?????????<??cJ??????<??PQ??Fe????2?.???]c?P^A'??.?Y"??@0??LT6G???/?^?????[?z?F?????=e??S?& {?x?o6???????	(?|???3???3???3???????	n1?4???G??Y?B&3-?e
?\"%?"OJY0\qa1???r??MY????R???x??(?????7}g???A?m.I????*??JW??j?zQ?r??f?b?z????f?sm1?f?????i?]???v??????Z5??{?Em????,?;o?$????k??9U0????????L?>!/????2??
??[&???
??!??b?xp??f
&=?[<x</'?t??IO??1?[v??????<???t?x?f??????1????v?????z?V????????O?x??????
?W??D?e????o??????c?)????:x|y?????d??[?e?m?`?????U] x|????????7?j?[????F????n?,6????v?[:?D4?.?n7??n?1P??z?c??t=c`??H???Y?t?x<^??
L?<???;?&5?L??F?6????8m?}?z??N?:2??}oK???E?n????????@=?1?K??0v?6	???u<^????z??n??Z,?so??/????0??e?s?Y??bmk????g????!???V????/<???	???????\?x??6?X?z.?H?W??{<u=?(????k}????????,?E??????G5?????m@#_K?xq??lo?*??????????@????u??;7???<l4L#??????6?u???8???t:?p?x?m?	?????.'?	??S?T!x?j?T?f#?/?F"5+?M???7,Q?????,?M?&?mn1??h?9K???-?F`????E
?H?)?"??ab`??7??i}??7?8??x???Eb?????I???#?? ')?P????4?2Qs
X?J??c??j')?tb5?#??Q??[aD???Y?G)??]?????????4{??zm?k?^??_???
??4???>
.
?M????????h;?n]??zD?#??????A?0?N?l?h;:??????x?y9?b???"???l??I?M:m?i?N?t_?D?.???l????c?<2?'?F?iv:zD?#????G?/]???#???????#??H<;??H<??u???/??????:d?6?????dm$?z??f??????<K??!??r??<?(?\???m??k?xZ?G?n?i??&????>C??<k??E????????Y$?O3???X???G???????????,R:?????????
?!?C?? ?_ ?O????
h?????v?L[
???!??y???R?^J?K	z)?X??#?o?@nP???X?K?D`\n	?a0/E^6??<??9???Z
q>?|R>??7?`t??d?L?1?#???????M0sG\:A0M &????n`?<??L?7?????l?J??0pk??;?]m??K???]2????#?gN?Gl??6?&?;?:\?E?t???????;K?+?2?T?ho??????e??1??J&$f????(?	Bu
?3?kz???$K?
?4R?[??de?~2?QO~&?????w?v???U???????5???4??Q????G??O?$7K??fp2v??/S??Z???p'??m??T8???????,?|_???i?}z?Vm,????????Hn??Q?????????
?????!?????????????Q?a.$?????>??
?1????????v+I5%?U?>?=??????LfzW???/p5???&?p)+?*'q8e??
???GV???/<??H?2U!	+??????BXCP???UH?.%?j??t9?oR&??O/w{oOv{?P???T?G?	??:V?j?%?n+???$	?zW?3 at m????@w:6?V?$???I????JI?[
9 ????????=????Gg????A3^<??j?A??UB???m?%??0??u???F????D????%	9?2????gxAU????#N????Jk??	2??Z?f?;(?m????^??yZ??L?T?????h??s#{?8???9?<c?o??n???,?"???%?56?+???u?lKN?c1?C?????N????5????????]pBt:??	?v?!???????????3)$??????O??N?^$?d?^t]H
?$UN`?)????3A?????}CR?]e??%X???*7irK?m??V???7b5?n??? ?&????L???1rd?/n?H??????a??`?????Dw??$???#?,?Qo?d6]???r?,?NB)?????H?s???0~?B??sP??+B????u?u\??<?C???????C?1??h??????[U?_?????????k>o?a(???
ez??Q8??8w????&??wy??:?>???>???0??S????
$*	?kx38??r>BsN????`?
????????????gv?.d?
?
??J/v??????????k??.????%?KD5??}?<

jx??x?M??a???ip??\?????N6w??c???
? 2$6T???,?nz=?oc?OG?? ??j?zN at rYC?B??D?l~.~&????)???x"c????D??)???????8?x	?
?<?x
;????x
T??HZ??_ak2$??h?I??:?m?ec???]?H;????????(????6?/`6?M?????^N???????wjW`[o2/??z??????K???"oEM+?fP?t???6?z?Xf??)?????c0?a=???
??
`%0???7?V????EK???y???b?t?k?eT?"ke\?V??gw?Jt':7?q????YY2yoP\?i??-??mYU??CC?U?#wt??9?[????]I2??I?Lu?'??????m??'???&%ybaGnqcRz??6?'??Vz?V(?dzI?"?r#??R?M??(??HbI?%????+R?#??V~@(^,????j?!R???}~q!?xY????	H?%d<?i?
G????N???n???????Z{?&?d[M
?[v(M-EG??|??E??}M	?b?H%W?GT??h?w?c?????O??7u??(???k??????v?Sm????V?Ad?A?<? SD?::??F?G????n*??![?:?n?#H?D{A?D{A?????? xA6?V????#?v
??( p#\}Ef,??g??w0?????&R?s?7 at F?_???3V??????FX?d????;??	Gv? ????F?M"?t??F?2qv???????g?t@????5k?r?\?????P??P??c??2H?yl???
?|??
!??d???zZa???????nP5Tm?q????>??9?????uH(???g?Q???	?`km???????????<???C?E??# }{r?????c ?SFd!???????O??@??P?x?_????yI?????K?f-???!$?'?-cg??????7??yU?4?0???Z????x>??*?fs7T?oh
F?/?%N?@r?~????lX??F?ib4D at j?????.? {8?w?JWL??,4??
Y?f??G??4???u??u?VI?OJp?zn??????f??????A?9#}Em?;K?pss?v??Bx?~`=??^`I@?%3???=+?C8??gD?_.n?BQ=??!s???T8?o0s?
?r??c??
H??j?8?H??6}#????????p??7<?Q/????B?=V?,UV??	%?*?????|???}????/?Y??w%3)Z???lZ
2?????
?t?_??wv?PH?
^????
P??????Q@??
2??uK?n?r?|?W??#?I_????Iwq%??m?3??MK?lr%????Ac??F?	G??3?9[@0???v???2?.\????T?=?D? Z`P?p?JV???q?xn	h?
?d??>m!e??OA????e?U??3|YZ??-?H??2^`?j?Z????tl.X??x?e|:8<??e??#????s?1?????
???k?a?@???)]?/?j??C???|??C?(?.????????U0?ks??wq?b?{x???n?j?5u??????|?d????????U?????`c>:?p?
E??^????c??Pb?6?????g?^?M??Q???F?mj??z??'aS?~??????c0K?Z?!???;?g??NmL??%XO???t??????????w?D????h?v???nq?T?Q?m????CNW?	??*X~X??%^hOUF?37W??+??*W???Vy$?]e$?C???lUj??7????J?m?I?E?V#D??=4??Z?sc?	?8??i????2?\K?-??tP?E?????D??T@
?/g???ip???
????????%w'?A???-d???Sw?&)??Ce????Q&???K?2^??d@??
???a??x??????F???"#d{?W????_?omX?^???C?H?????3??????Q?\?1?A?1;Fj?Q\?,???v??&?'S ??U??a?dKD??6?f?DU?????
[X?Vi?}?\??
???YJ??}?:???u????j?C[
?????	??,?^???f=i??f=i?k? L??V????m????6
??q9???'}??E?^???B?.??B?.??B?.???^?.??? ??n????*??V?}Us??*y?s?U??
???g??2?KaUr???HdaG??n?
'?z?[`b?YH?YH?v?W^? ?_p?b_I??????	?6??v?M9???mDm#jQ??w?F4?$?5z?????f!D????M????K????4d???+?4(+????7j,???,??Z???@?12???I???????2??'?=R{???79Nd?<???????'?"0jJ?[v?E??*??Ym??Y?v?R?%?x????[??????P?I??7X??!<n?H???So5?X?#A???/
IC;,?:???	?+??W0?f2?Z???9:B?zt??_k?9???7j}\??}D)?Hr??XZ_?	??1
?)?!n<?E??{l9?D1?jeMY???<_???????w??j7??pGe?2Y??2 at m??
?G3]?f<??u???@b?p??G9;\S??h??rv?*????G3m????j??(??	?Q??rm?k?\?w????(?:?6?cF?]o3???~`F9????
n7?|	b?vm_E?)?P5OC?T???!#???P??*?*b??p?ZxhL??a?>{??g?xp6P?0i"U~????$)?s????s???!b?EE?C8f,?M???)?v?<?1*.z???N??i??IOEK+????Q
?B?c??L???v@?H2Y???????dIC????E???6??lH??U?r_t$-?k?I???!??W??%_p?K??d?_.P??Z??????+.???*&N?J1????I%e??&??39,8??l???k2|?Ba?y?~?p??/?(?e??????R????????R?????mC???C?j4???a??G???p=
???;R
????0G?????ni?87???????7?????NH?? 	_?P	-?.9q??h?X?l??;??`K?]Q:`?O????wEY?o???c??r#??9h?|<??`??q??w>??????!0?? ?,??3Cm??;???h?6?-W,??G??_*?c|n??Y(%?&?HI??=?,?.k6??.k?????]??2m?i??nT?`?5?6?~?m6;??6n???Fn??w*????Y?tq???pE	?=???`??XN )E???f?|3,?)l????L????)-P-?B0kG???M?????GH?0?xY9v?\V?)???y9?\??
Sf????E?^wl5;????Az??V?@?G?
H???vEk?Ru??dy6!GW?.dd????;f3???%?@e??
8??#gX??n????h#P???F?6?F5F`???F`?j|V#??7? G???]znX?m????1HJ??AHR,d??J?aD??q???39Yw?HdK??:B?a?????n???>?qld????A?P7?p?a??+"??????j???6W?Wa???$?V,DXN???]??">3???+g??5????x??U????t~?!3?h??P
N?N??&3P??,$$3??D??Pr?M=?=???????gv??H?[?t5#?I???nl???;ga?,?J??	Zj?,?;m?(??-???t?.AKt????0??7??%2?b?????Q1U???H????g??pM?<W??7?es?*?q-'????O?????7V?3
qc????;v?3?G0F?
?-~??+????`"??\;?V
?jU?V??T?4G?^?I?i?1???????f-???m4??x?N?b??/Kb???s>tk?Y???????H???q??7??*?????H??2???6C??
?G)*Q
??H?x??G\r??>???m?|?6[?Eu?t???h
??b?=?;x???i??)Yn?,?l?^?l?
{|???
?(&A&P???j[7.??J(??tB?)%?N?GR?!?jM?	?

?WjH*???AbgG?Q?BMF
??i5??l???1i??p?S6?o?=?C???&9i???F;Z?5??S??_?8h???
]?Us??K???-|?????Or????}????lc???^$D#???"??????n?F6?G??4?????????vO+??[????9?^??p5??!?t?L=??W??=y???O???'3U??D)?}O???=OHD????P? ?i!???M?L??????
*?
??%Wx)z??,??3???+??????%8????4???????U??s?+?????6nj???#?0JJe=????????=>;?<?ZT,??>^?RN?"
	?4??????R
?\?????????X#M?4????Y7?s	?W?ulr????????????????W{????cc6??g?<?o?????
?j!=??Ds??5?????6??x?1???7D?0x?M?_??7Y??r?D ??Mr??q$?p??aK?a+;?J?|??4?3:????????
??n????de??K?7?=y??#?0??rrF9H??W?c???????WQ:?	??q??m??s|S??F?3X?@5Xh?L?>y?,@?%L????m?:?=??f?)????i?
?=?i??6????u?v???w??f??c?e?q?~?cV??c???????8?
???W9???????-????J????:QG?1??T"[??m ???Y?aA?j?>|D?A'v??????;?pk7j;???
?&?A=Y??r?te?\????$?,??`??B?
W`
E,????O??H?PD??M""??ys????
($???p??E?V???p???4????c
???0~Q?L?????.???$?}#??IK????Z?????z???A@? |PZ??????{????D%?,?6??h?nEs?N??@???????\?<?D?B?
k80w??g??LY?(?.2g2U 3c_?.?'?Q?<???B]C???"?S??"U'y???n?SoR?w???
???fq???07\?A?
? ?`f??d??~???`@?&:??????N?[??_K"u?n?SR????SdO<?wO????????|??h?M??.????v?*???qW?????d?m??^?D??SL??
?9'?Gl	???????4???Q?????zDphS"i???P?P?"?7?j?b???d??E]R??J???pqf1,????^??3?^	?i?b`? ]?_??t??z?: I@??EI???G??F "??'@???"*????.?jPt!M???E4%k??O?|??$??fb?}q?L??h-??~ZMY?C???h{?"?????q?lid?t|2??h?
?l?=3???t?2\??4????di?Rv?5,q
*3??R?,lQ?l?I?P?^??4J\??,??V?o?@?+7?c{?|?%4n??I??
?^??U?g?%???p_J??B"q)?????d6?!^?PuJ?x?2?(*??N0?5?7???? /?|r?T?????B?xSYe?|mZ?ZnJ??N
??"?
????KL?xY9???,X?|JV.Np?d=7???6M$-??p?n??[?Ji?L
?2??????,?yi?#	???BL?????
??????k"U????O????)?k?e??????N????/?G??/??K.3:?????+??g??8=<?????????
?x???XD?X????X1A????X????????E?;???|x3???(???(_hz???4???q?3????????0?
?3h??(??,i???j??C??;d?	?Hf??/???2GM?m??,??fI?fU???Y?????N????mK?%_?Y???U???u???;?Y?D??3??:??'?(???s?:`9???L#'???:=???????????N??O???*?{???q>??|??b?JB??{????????b?b?zh?D?F?c??????=2jd??tl?????????????W??'?[k???5?n??Vt???#d???I???5????X???RS???????7>??o?pR
%\b?? *k K??G?r??h?e??5!??.r*???$o??/??]p?b??Sd?z#X?u???????@?2V??
?g?n?h?3q?????	?A???
Ye????2?9?T$+b????????T??R?e,AAX?)?"Lb?????
?T?A*??u???$??,??|??&?K??~Vx???????jw?k?? -:v????dp`8?i~?O?D$???	OvH?????s??ho?8?cJ?+tPq?^G??k????Z[?ZK4???z
??3W?a>??k?s.q?c?0
I?_?+?\S??.l?MZ9:?E?????6Z?v;?\rIc??dU??u??^&????w|?w?ih6:??l????????%????&????~?t(?t?e??????L?????O?????????I?8F?2?yp],?2????F???#b#*??m6MZ9?!???g???6a?1?l?????????h8??????.?m
????Q?????}$?4????F*????-??????????????iX?????]???,?c?????$??\??3??f????;?<
I?U??!e??????w'???????????{?Nkv???o?u??0B????t_? ???n8?d??)rHH??p???v
r&?<?N??? ?V?&?)h?a?V?[??p?j6?m"S)? ??*??????????c?aXV????5??$?s?U1?)]?Z)H??/????/????W?
?2?)_?&???8??l
L?????
?iw?
??w?
p_?|??3??N??mu?&?J?c??n.????n.?Up????(Y?????wr?
J??u`????6???? ?{?}?f???t??B????????ta?0???`A3_????5????????q???j?99M~?E?mU???S?J??I?~/?.%?e????#????-r$???%???????]?&?@~^}y??bz?'1=?s???????_|??V??`}4iu??h?G?>Z??w???Z??0???D?A????%&
p?????g?%N?S=2/y,???????,d?h???g??
??LR???W??=.?????1?.?n?xx???p{~???	??P?? n??PD???G?b????c???#8z?f?a????qM???+????$?????2#a?(???@??J-???3??p????F?_~E????jX?n~??&??v
??m???i?o????d?y!?V????F??i?v([??K??b??n??+C3??rZ}o`?0+??S???L?g
b??\>
u~aH{>?/*,??????^??K??]{?v?]??m?`?:??????????"??vp???;M??A????~?????????D^??E???J??PT???`?*?c?xc??}?V???v??ks[???????6??t=?6l??gS??V+??km?[v??]???e?iT???t?[7%??Ef?-c#????
,?Qy^??????? ? ????a???#?Ggz????'3??DJ={>??? ?kCVR??3|A????K?????????/??~0?7b Do?2??w?1?????????c?H???&?k)?)???(h?O????O_dQ4u??
?m_????e??"q?????jq??!`c3Y#???L}?e?U??&????fO?XJ???d???C??u??6h?>u7?^??q9???|f??????F?HTY??
?AJ??L??@:?%??????[?|Q?D
?)????
<??o?? ?????????????h\????:z??1R??o???G???+?L??3rq|m??^`????|4?1X????????F^?)??Y?rQ8?()??&Iy?\?????S
??e?[`A?5?Q,??W'[??
E?q@?Z?J0??????[q}??A?r?(L/???+??"N??'??????li at 6u??$l?*C??E?>, at h???X?????=i7N?O??-???=d??{???C???+????n?n????U???R?????????]?wDO?t?@.????1??????c??????5?q?x^????z???z?W?B?pss=u&?	??
??E????r?:?l???k???.?=???>?U?6
?n[v??????E?Z??????hF?
?`4?1^????????}`3v3?G?9xm

[????Qo?.xg????3G7??y?W??3?_???z?04: ????3?v9?C??Y
??0???z\??~?RS?????a?z??p????Ar????c?']`9?????+???qKf???-?	???G*??Y???gg?>;???{??[h0?U?
?e????mA?$?????j}?k|7???mk?[??????6??????{b|wd??????.?y?????ly/ax+???fw??
F7?j?Ga7[B???J?D??????s??????>????c??E???X?jO??f???N[?Ci{@_????l?TA???????F???X?7?P?D??????b:?^8??I?b??V?dV]???:??Y?r?
?j'$4??^(AY??HI???R3?!^???==z{?;>?
?Z?h?fu%?,b?$?Yb???a
?8O?W	???o?=??>mrV?D+?M?5????cd??????7?rQ??()k?&M?`?????q??,k????qo?'??u????>?>3?l????{?std??????_???wd37yo????????&??ai}??'c???2??*|??;m*m??????????7 ?}z?&d,????[??????G????[B???O??????n?d#|????+?%Q???X???p?f?j?h)8?????;?$.Z(????	R%?3]NZ|??%?
z,?1v?
????5?!? ?O?????U??X\+?I??K?)i?k???||d?[??
??h,?hBp???v?E??V?P?)???~Nm?>d3U?:??????U?j??z?f?82nU?Q~>v>"?O???j???s??6??;&l?A?!???*Bvc*???0?,?$mV&)??????En?"??w??R?????B???;??????q?A??M?IoG??q???`?=????=?8?e??j??>????e?+???0)????N|b+v?	
??????k????S?v?u?K_?|?yZ??Y?T?(??cc???A?5b????
?????y??{Cov???e)???KNkl*?W?+m??Y?MJ??`??N??o#-??=Q?=Q??;0Qi??]???i?l????g???T$????(?6b???	!??)LT???f*2??????3A?????}CR?s ?KZ7?\?&M???M??<x2???????$????5?I?}|=F?L??-	??GB?9l!??m
R?X-
R?????#?,?Qo?d6]???r?,?N?E"?????H?s???0~?B??s'?????B??B??:??I???!D?z??t??!?hU????(??????????{???=???????
????b? ??k
-???????i?T?7&Q???????k?U$s84f?,????NE?E8Cj???'?????/u??????????????c?????Q~??g>?e{?w???????????]c??
????8???Pwg???+?Z??Sx,Bx???Sy??*r`~??D??t????Z????/??M<bt???*?1?o?L=?|??????.??j?k?5??K??;???fQ??
$???s???H????8?V9?dNd???J?+????>m?t-y?i?Vm?n????	j???????
????f????????(?r<?X??%O??(?A,
?
?X^?5\"?Z?q??'??????)t????{Va?I?C0?]?
O4BL?7??@f$????1?@?"{??A???e???]n??????m?b?#?H???o???+??>?+yS?#n????U??-I?xX?T
?a
??Dj%XdQ????D??rmJ???????s????2$?S?%????xStIk??t)??b??t???l$W?$??e$???7E?Mz)??,%Yf?.%u;u??????,	?5???e?Cj?LE4)???&]n?v???M?6?^w??NV?I??u???N????????'?k
l*???Yy?|???%?U?ZTi"???????z???9w?Dl%??K,C????C?6????w?????V?k88??cT??y?R?yXen?
?~??????&?7?!???;;D?s??>{r]?????R?8?S?W???????r?]??s*e?j?n?s??i?s???O???y??z]?C?
????}z_???s??A0?????
?0???p*T?-;$*?????q?93*%?????tO??? ???,
??M?$??E?*'d??C????-4??UJ??S?n?
j??(B)=H?>L??????	??"
F???)??
???Y,]e???
5?sB
?
7?m??\?"??BA&S'??????EEn?????M????{r at +I??:/???D????Sg\????f3??R[!&??xg?.+z??q?	T*8"?X?#Q?!?JM????e9??,?)?Z?c????
????K?vq??l?e?X???r???r???ruW3+M?(@$C?,t??%@C?@V??mX??'???1?#?1?#?1?w?/?l?#?????Y??MZ??XY?2Lu\??e>mO?a??B?X?=????
???Uk7?e??-?*?]W??r???ba9??`?f?1?0??{???*???/??U;????\
	????\k?2???8?????h
*g?(??e?U??
???
dm?M
d?@V
d?@????}?>?????@????m?9-??h???Uf??P?i$??*?o.~5-QA?j???j?l)lUF???9H?Y??Jf??O??e???TR??*??CY?h???%?z'????BYcd4N?X????F&7q?6-|EA?cg?@??3E,"UA?
?????K ??{?"?h/1?>???P??????z?J?CyI?y??.?$?7l^=

??}??*.6L?8??????JIw?????@\X???+$,???dd{?"e??p??B?b??x]???H???;6
N?h??Ft??P+
??P+
??P?;3s??i8?F???P+
???5??H??!????V???a-?V?P??
??????	???N}Y?T??	?Z???o
.E???Z???F)B????|??)?	3-	?tg];Y?%L'
+u?4_?l~f????????h??s?$?R
u?]?S????X?T?P????Z	?<???:f?C=?????t<??$?TX??f?r??&???(?|?4?U????5c[?Z??1??$uE}eQ?f?h???????S%?n?:U? (O?\??,}?6?????P??o???????????&?`?6e????~?hXy???YV????-????????i?++?J??4?K??4?K????/????????e5?+??P????d?I=?VA?J??,???n????yf?????X?j?7???
?_7??Z??6U????{+Md?a????ag"r}&??C?????K*1?????????'N??:?iat]?^??G???sJ?`L?Q?Vs?????K!?r??UJA?EkQ?r?w??"??f??g?>4??.3?w1??x:????;????;???k? Zs?:??5???q???l?!??H?+O??\4^Z????t???T?R|??:??;=?>8y??`??$@+!??j???5?6q?6???!????&?)???
?\,]??????????P????DX?|?-VB?!??^???mb?Z?7si??z?
~lRvhJ??^?*X??????0???3NJ?[*%????????a?*?????_????B?d??????
??/???Kk 9?JXgl?,??j??v???,
??,
???;3%n????4???`iVd-???D??
5U??????a??n].?n42?> ??pL
?,?TPj??J?????C?t????+|@????d9?\I??C???b????i??VyR??sG>??~
M???0[.U.?n?`_???V=????r?2.J??#?%?$?K?v?.1#?}f???????}??/?>./'?}L^i?Fu?|??,?B????N=HEv	k??
??l C9y?a??bi ?bi ?b?/G??????vC?4+n9(p(I????x??????N???j6?????2?G???L???
??M??aZ_????
???0???0??k???i]80? ?Z???8CQ?S?g(&^?Wd???\tX????yYg(&???P?g(??
??8
(?q{?????X??q0?n?A?????S#?+&h8?U,y?"y.??u??&U??c?tq9\v??j??)?Az???2`?d?]??H$???j?5eT? ?y?V?????W???$+?I???'I?_(GR???????x?tIk??tY~=?[??(h?mI?&I???
???
????;3!?S?	x???Q?4x'??P?d?,?R???c?lX??n?G_???4???|?f?? ?vW?b?? ????R?O????$?6o
?#?U.??4????U??oIAB%????s,L$I?u-?????:?T4??C??'=
|?^?]?Cu??
??
???G???Q4?U??i)p???d??:K??\)??f????gr??&
o??&
o????V
??h?Y??.??o??g??
??0)5?2?SJ:I?Ty)??*T????/!3h?Z?
??)??0???l???\'?V??????
q???2??_f?a??????????hfVS#??hZ?a????????)U???
q?\????d??F?CJb?|Q?^????5g??`l????n?4?8?\???[4?T?ci\!??fa??][
w????R?7?c??Q?	
????$R?<?R?}?yet{?6A???.????N"3?]??Y?M?/U?ZJ?E\???????h?.
1????$ZMPD??4NM??4NM????g?a? S?z??qj????j?4?<j?45?%?;?&
6??7??x?+H#???????Z????h_????pS-]e#?????0h1)???J`?qg?????K???$E?	?K??}?.?,??@/A?5?*???
?q`?zK?R????(z???%??h??Z?4r-R0\|!c????-???Zf??A[?%??L?V?t]?Z??4,K??4,K???Z5??,?eA??[?e%??K??????EZIS?V?H??R??J?S	?8?%?(?????????????](??'??P????,[??V??jZ???????j??f??Y?"L?<?????r?J?w9?????Y??"??0???N??? ?Y6??WQ8K,?2?;R?y?;9?KX?i?m
g?Z??E4?E?Y4?E?Y4???????I?,VW????,???EL???S??-?s?mu)??6??NK??4??>?Y??.????>=??Y?????M????[??P)?gY????????]?w??L8f^2???sI??Y0????????w??????L?Y$	?
?????hQ?#?q(???????t ???i??d.?%F?.K?a-??a-??a-w?D??kSXK??9?
%
?\?Hp??-Qn??-b??-q?
????Lpg??n?Zu?nit??R?????????-#?~<??1???????O"?py??TOE?&?>??R?}dLL?"	I??]R=??2=?F????(?&5?2?L9:??7)?T??S?iR?M????61?4?Fcn4?Fcn4???L?|?bn?????h?M?EQ}???L?"GU??
?F?A?16??j????M????tP???????5J?K?tPe???e???"J'?}?:^'!?v?;??????[??=0?Y&?'&?d???u????b)??F???1?jY?#?By???~D?,'??2h"E??E?u?A??+w???lS?Q??????;Jm??(??????5BI#?4BI#?4B??U?h	?M?Pj????PJ<R?JY?????we,S??M?:)??2u?D=??e`????T?????F?????????(dQ???^?DX??????D?*??4?????"?}d^????Y??"JV????F/?,
[J?[f1.M??e?|-JX???.E(???t??EC?44IC?44IC???<?j?)4?S?44IC??6D1LR"Y)?O1R?eX??&?u?na?Q?(?????;?!?5?u
?;???#?aQ?Q?]W????
G???A-?_C?
B?J?O?_?T&~??/8?U??T?A,?dwL?
????QA[1A?hnQ$K??']?<???&9?E9?8&??z`???<<P?*sq<q?u)???h???h???k? Xh?F??u?m?3?u??"?????.??0?X??7	?
`???L|
o??i?[R??v4????
Q?????z???Y???u????E?
p?)???|?`???"g???k"?Eb?%"??+?3??~?VX??????\???TMrO?P????f?M?6??]?8z+?Fn4?Fn4?Fn??T??h?M??li??????J&,?*xW?e?A-?
??????U'???i5T?
??????uKGt-)Ap???U?/??{???
%?}??}??)??&??rZ?n????z	?{1Q??GwN??????Y??/5s+?c??`)????????q=m???????Im??G?e?\?????????????w?K?m?	??mY??y?X???v?X?}??]%??`?c?2uR9?,K??#????r?E?f#??V????B??6D?&e^r?,???1????E_Y??4)???44?H#?4?H#?4?????0??X6E?f]#?4?H#?
?A??I?E????"?,b??icd???4???"?:?E???Fid?F?=O?F}9dQ?ndQ?jhd??Eu?&E5??Fid?Fid???~?n????????6??&E5:u?,????,2??E?E?zK#?? ??:??&eg?5??+??<p??F}d?Yo?Y??;Y??EY??EYt??A?E?u?"???.??"?,????v?iv)???????"?,??BcdQ?????/?,2?v?"?Z???EY??Ew????E_YdZf? ?Z??F?Wd?iY]?,ju-?,??"?,?????1?????)??E??'lul?,j?
?,?????,?M??n?5?????P???`?e!dQ?y?EqE%?^S????@b/E?j?(?(?n?u?4-?????(a??n?=??Z??!???i???i?????y???R?P??h???Im?b??D?R??b??\??~?m????????Q?C?
1??h?1?i?5b??"??Eu:-E??0o/	???r?5V? V?d????Ne"????A_?_K??HPA??MPA]?ZDyc4?(??\???I?GE????PO?????n??A=????\O?x]?A?u4ZG?u4ZG?u?Z5Z?eR?N????hn?H
??(?;&???2'?fA?MB??&.9_???@j???,?S7RSR??????f?`=???8=????& /!:O$Ui;?L??N??2?}
?\hK????H????Pf??w??
G?-??\&?w?y????Zf?
????
s??Gn`?|=?B??????Y?????u?sy?8?M???i?e?5?E?\4?E?\4???U?`?u?.
?t,8?????	??? 4?}??D?U4#$Y4?LL?J0Qnv???((??i???:V?????
?@?
A?@}?GF
???F?????!?l	?????N???r??BU^??)QX?8O{c???
????:3?gTw
]J???"???"???^G?''?V?Q??J #
???	T+C?SF??T??w?????d?3???|??????o?"?2?N?i?:???pu??mQJ?i|??m%s??&+??????*f:?^Pd:uI???t?(-???mY????g??????????g;+?0~LG???='?r???[?????*?Qz?????r-!??O????~????JK{YI?m?(??n?{	c??/?%,TV8???YQV??7MV??FFQ?V?	UY??i?/G???W"Ie?bY??Bb??-?HMm;?RK
mX??I
m5?k?|)?F
??+sy????6??6?G&??r?(W?S'(?FK?eQ?V?[?(?F7??H?A??5P.?u9???,????{{??U??$??W???2?$>?2?.??6?%?h?????1?u??D???L?pCM???f????Q)u?p(?j?
?bQ?M}??C??????A?h?yz?9??S?9??S?9?k? Z[?cN???q?h???????k*?4g?$/?1?????J?I??"???
??????p.??@?8?E"5kR?)5??WF??$?x9	??:$2??I?e?b??RE??$Z?{?)???)?/aI?j?S;?v=	??h???h???h?;3????H?N???h??IZj?y??
5????????(v?????I??4??>?h?&=C???;F?ea4v????i?90???5,MLJ????kT?"??t????-I?6??07_?K*?#?K?8?s#`??Y_????2?O?L???H?p?N????s??
V???@]?4y?Vd???????d?i ??H?.???l5??w?a??om?kk^?v??nm??j,?V???&??[X??E?>H9K^xf?%?W?H?Fl$?{jD?1??%Cw?h?8P?#?"?s?(*c_jZ?sv#?g>30s?6%?NnH?l????g?l5????M??Oo^?mUjC?EK	??v????E%Y!6P??K?:??#?????,?????z??<??>???lT???MT??????%w?1t?d?]??>(e
??DS??????7G??X#?r??b#?UKm???r
?i?????!??g?/9??S?????dwt?
?A??K?~?5R?y?i$?t|?_?'???V?"??n????=???=?????S
???m????[?4oy????Cxv?&??Z??N????m?CZ?&????fqc>,??1??Ll???)C8?????\????r????????arz'??????t??i?????v??????j?r???S????Q??????G??X#???m??e???????2EuVS?U?????Aqqi??????vhF???=S?b8[?????"??m
?:???5?????zK??????z???d??	#>z????\o???
j?1%	??p?vb*?-??i?m?]???\f??=??V?W????{0???C??=?]????Z??P??'yk0y???\???z??a?D??}?I?ZF?K?h?Uy??6WF?????F????n?<"??j?u,x?W?`u??>?4"
?JJ
??e????3D???Z?Q??.???????7dQ???L??????????????????|^PN???_x/X'F???????'`N/??!??
_??l??}??z8S??\??????????????Fw?NI?????(??????C?#???4????xv<'kJ/t????x?m??????u?S?`???RA??.=O:????	??F%)6^~YeX??]"?pD??`?_?;?B?C??j???=E??vo???2k^???s?z?IN??l?by??[?????9????????????$Q?? ???W%rn	xG?R;
???[
????{.?0KC?.;?c?9???hK?1<??????e5?u
},}?MX? e?2???&?B>R*???tq?cL???R???U???C?*^j????:&+?G-?*???*?Q?`?E???F? wy0?m?4G????`?P	?u?XG?u?XG?u?+XG?l????4?Qc?A
???_??Q:?K-?????????8G???a??
H?-?RCo????C?3?1^??,j?A3v3q??t>??
z???
z???
w??iC?????v???
t?H?1po??d?fUy???/8E$*?x??6??7'h???F???)?|Z????b+%B?v???l?????0???4&??4?dZ?????l???s?m??`~?ff?n???l	???
?????k????T?A??uH?+?? l$??$??U?????Q?{f[8?7y
???\?/????'????K?V?m??iX???h?	?7?X??15J??)??S?\~?+(???z[?I-xh????????Km}??_?????{a;L?Ev????9????%c?m?
????l????w;????P??d
??e^L??)?V?????)?V?	???*&W?:.#TH?,3???L!???%Jv?R?$#/X???/&????NS??a6??S?Y?qe1R??-!_L^H??r?k
/<?/S?8??5????|X????wa=????f*???B?C?c??m
?e?,??1-A?[*?t?????J6?m2t??e?????n{/w_??_???:???trW??)|?3????L
?m??P??J-?	????9?2u??+???	???.?$??Z???%(????.???,Q??E??_????2?	1?scG????R.?2t<{|Yr9f?/Ekb?5?????z2?_z?[?9??<?o?????????-?i??24f4g?%???x??^??gWH?%W/?,
K?x?????O!=??Kj?????dicN?h
M>?K?????e?????%???.%u?K??,???????????A	S?,?i???KS*?k1}????s?tvj5??N??M??&???~?p>C^??%Y.??^????{i}?mj,??????;t?m
2?Kk??g?-k?.bi??S?nY?????;??g??_???????&n6??J?W?t1
??9d???JT1??B:?`?}(????????p??x???1??]P???ug??hJ$3wZ????{!}??7?Fn?r[L'T#}???????,?eQc?????]?z1^??s9uj?????????{??/A????T???]?b??6w????*p!??`??=???T???????q??N????y????9OB)??????x?y?{??*?l?%?}?Z??so???gS??R?e??~??cl?-}/,?d?o????*#7??<<?4{>?}?Z?vd?)%?????????;?????osg:Xz
g)?e?m??????k[R
?j~??+[?By???????????R??????-?????4}{w??o??E????~0??t???D?o??3????r??<?eh?nIk???4^x??X??<??B?}/p{
?5;?f?Xo?-?Y?????5.??????I??H}=?fpL?N#/?r??~?^?#?#F>:??T???|f\????
,??q?O?8S?O?C???h2t????3??????????.????c???bFp???
t??????A+????:?????1A
???CkT?
P??p6?>???S&qv?}#?
??%P??
??|???%'??1????2?'p?
???Z	z??A|?QZ&;?d???:{??S?}???_?E????????????3ss????c?`.?u?u??J??W?l2?d?!?????????gO??t??"b8D????Sa~?>>?;x???j"dF??5??
??z???|??5\????,?Py??:Aq1<E??5@??
K/?o?<?6??????T3?^??
?FL??y0?fx??
j???r???J??A???y??x??l???l?m?A?????p$?
??0zP??i????_q???;C?	"?????3sq??6'V??????
??x???%??
?P?00?o?????w?x>.???6?(????U4?%?c????p?Q???f6l??m??^?=E?????????=?b?ff??0?}??????s8B??E???e}?????l<??h?p???-?????????H???????3??????f(D?????.0?:???d??$k?l7?Y??Z
U???x??????????9??q	?rx???9????u-????`??P ^?#8?-d^??????u?????#4?L?&?A??[/????U?????d5?(?uV??$??\
????WR/FZz?_???W?#F?eU|?????	<B??N??ae?i?)n????IR_?Flw?&????ma???????\??4???'???L?a?	u??"???t????]\????????_k??D?????OD?orT?l?????!???Xp???k??F?G??'
>
?ix??A???????{?b??(???S?@+?Y??&?
????????C?	v56????????ni?h2?
Fh
?IR4??r??G?????4 at CnQ??F?????????????3?????ce=?|??,,???6?o?`OYQ?OY?E??g????
dZR??MJ???g?R?Q?Z_1^??:????'c???{??f?|???/?"7???Z??T????~8???'`???
?qi<??V?7??/??an?Q5????u??j?NQ????
?
??????-d`???=????|?.7|??8??\???T?
?????0??????a!??'?y?w?a?C??C??!?4????
?Q??5???4=:s ????;ui?N?????]r?:?!+f?%?1Ps???S=?}???
K<???T????F?i????hz?nfQ????#mP???H?_?V^????? ?8??????a?????????VM??????4??7>???@?w??(??/?l'Co?{gd???a?WV????f?W^??0???v??
E5????}8?.j,/?
~q;E?????????????'?h???'@???0M<?x6?????"?Oi??a8:??.?a?????w?O??????'|?????'#???w?;?q??????d??**?%N??Vu2o??w?Ov????=??o~:A3|p??[
??c???1<???{hJ??P<zNP
?\9S?}?S??_b{???C?????s???W??>Gc??4???^??}????????Z??a??????O?o??u|r????????E???? fU`?h??7C*?M?nw?!l?3&???x{P??GBgx?????????/3???z'?G???????Ra?;2e??????#W??Z]?@e??|?w????w????????)??	???l??'??PO>{??l??.?9aM?}k??".??9????m#??j?O?Fm?d>????????F?5??????~b<y????????Dp??(??4}?3???-???4?F?a???e	?&C??:???]??
<o????????&E>ddd???E????????N?_h&??"??!?$???? {bA???C?ws?????!y?Y?d???m??p??????y??s<???)8{H'T|???
????6Q/????_BB?1???n?)n????U?D?U1*?o??B?+????m
????`????tB?v?2??*?!5p'?@?(?;SG	j ?~9;??????mt?
?b?$S?g?)>??ZE^?Jlq?Y????=??x?R#>;L???g????L?=??Wr??LC???:?aJ?/??92?>?DpL%%??'????p[???P?h?B|??a>??????G???]\???|"????s??????5?????=2
?z??#??P?[?g%<??=?p?r?3???Q????b?
??????w?N???"79+?2#?bB???$S?A6P????Ev[U????8
???????5??O??6?1?wgO67???W??+?f?b?7??6	:?
????8?N?-????*???0??/j???gH???@-?O?????
????n???C??"E???R?%6????`?????.%???M?????`l?%t???D}yD?Z?T?? ??0|????3??3??3F?2YO?????D?!??3??B3?????z?Ld]:Y_n&??2Y7B?d&??????Ld?Z????~???-?~[??u????Fa??V9?:?T???
?Z??o?{d?U
J?^?????thV?(??c??I??	???S4?A3?????)?????dE4??'?U??u??????u????g??/j???/D??|I)>?T????{??|??`???J???N?m?n???4Y?YWqge?%???C$???R???????????=
K?x??~3F?9????7`*?)??????nb?
?fBX?m??:?????U1j}cM??LyW?d)??R{???? ??_lqs?n?9??(??	?#?6C????J????c,?)?9?Ms+^G????i?Wn	?_U????	??}?7a???^????8???wPW8#?
??H?C'???b?aoQ?Q%p6?b?Q??1{??G=????>?{@g????a	??<d?k?l]?5'w
+3dY?k??$t.??s?q??y
??s???
mG%SR?DVV`??a??1)z????0wTb?:?T?#\6]????.?O??#e
??????!a??xD?#?d<Ihx??QQ%G,??X?$?R&?p?T??????4H?BE")
???;?s?c?G1?&?_??
@??hk?hs????.z5p#??fW.)g???d????
ba\??	q?9??7~?????G??????.e??a???q?P?'f?6kf??}?{v(??nP???>?=%?Q?H????????$??[?d??6?????X?Du^^???+?#?S???H%4??{?A?Rc???????9????????y???Z?
?i?&?_?yf??gC?Au?Z????f??uz??L???|???y??
r?v?)?3D?kgcT
?*??j?.=?Rnk?wb7K?
?D?"????&fS?%?h\?
I?,??U???b?aq?9&??A???e(???%?C??r2R?0???W??`??R???!7xY
hwC?c?>?t???<???p
q4'?o???hR???!Ay???F??6>`g|
?\??
a?exxf?q?a?
???)6?9??W?C???:???{?B??`C???p?
?fT?5????a?(?""??k?1?^?4?@1!?g}4??O??U??WC?)???N???U??X
?;?0zr???
?zj?????#?[???7??Q??u5???`r=3r*.Q
??{
?F?
]L&?c~???R???6???G??X(?H?-rl?c?c?b4J?????ot:?%^??u??????$kq!J?&?M???E?F?EW???v?M?9Ba??s
T?l????I?~Z[#M	0paU:?????????w4????M?F
?1??d??<??=Fmq?????|4h???????mv?
3??1????}[?j?????R?J???? ?:K?y??}???*4uE???d?zT,|=??E?????<??A??????&0
?M	V=q????>>??
?g?^???z<???3q??oG????^?????????v?Va?????
?nP?	???
?b???6?d04?vG.????qF???g???[??t
p}??-T????8?<?/Q?
??v?
?~aX~????
<
?s??U
??ia????[???h?Dl`???c?,?y??-l??Kz????E???Y??D??E#?????????????????O????8|?t{l????Ef
?k?
 ???L??8\l?5???}????oOpCa[?_?M?d?5i?tn??r????????+!???`??'??""Z?"{X??1;.*?6.hv????T%@?k???1?S$???I??J]O????4Y??(	?Z at NX?)???9???(N#???
??x_L
(0DlU?V????[Y#W???.??(F?>?!?B??h??;??N$o>??\?x
F?OvP'W???WS?5N???5?`_??:??*?h?L$?????M???J	z?8????K?????Z?|<?F??L????%?*????y??0t!#???1?nJ`HL?[k??M??V5??\
?u`o???}$?????]?_??>?L)?????"????:????%????m?\?v????D
\4*??p?.?/???????j????<??U????z??>;??B?
????]?:?f8??\????????Q???T?sZ???F?:e???a????
@?????e??????A???\????h???,X?2??Z?

? 
?lx?'?????%Xe=?5?M?kvM;?8??[q
?U??I?g?>?J?	?????RjZJ????k?s???ZZ-&?I?i?????=???b???
???[??L?????W-d????????????
?\|3???sDAI????????g????!o*?b?~?.??k$}N?#??
?%?V?[?B??>?l+?O?6????g??L???
???*Vh??????!???l\U???!i??2p'??4?????G??
8C??l?y#d?*???8???|*?i#n?m?qy??C@?S?"???|&<u??[??????e!?O-??O2???S?|????|xj????r?I<?O-??c???????C?IJ??????r?^??????QZ*	??|?O?aY'&??<?$???+PI"?Aq??L???	??????g&?????y???1???\,#KH?-	??@????????+-y?$8?????2?$Lr?N??rE?????`?-??P'??L???9??<?19??s??????Z?|?e????dZ?|I??`?|\??????^?I??J-)???r?pgKv?q????,???"o?????e?\?????ir??d9?l?A~?X?H?s??????????-?z?L??'?O?r??d)?L????,???Rf?w???B??????Lf???D???;:wLy\???{8?????`??	E??jF???5?5??qf?(?8????mVr?1T?&?
??W?&qf?ZL???K.7yRRA?M"???D8e^???.??Z?s<U_gRx0?$L??a4(?n??L??rfW??S&?/?%(|????x?'M?)a?0w2?K?_??f??GH???Uj?,I???t???????xd???8?[Fd???Dr]|6??KM??[?2nYzLIH?eJ_?BM"???A*K5??S?JV)?g?N?4???|?O?O??????????R:$?dH???$b[/XBl
?t?7?x.?D?I???0}o???&Kr???3?wd*?^?????,^?:?x??J?????J????3\{??&??t
????H1m????3??{???
???RvI?h7??oE???po?_N????R??`?~+?8]
?????X?)???,?R??<nz?i0[`
<?C???q??D?tIg1?J?ySo?AL??q?
`?YQ??d"g?_!??2n ?S????w???(??NM*?P?*O??(C?'R?8z?n???.????????.?i??w71b??M.7)\????E.?#S?X??*?b?"?q??E??"?"5%??/?G???E}cd?X?rY??/????HM]????2?*F,p?????VG??Ec??EJ?CZ???2L?eT?\Fi?2*??(M??2"3F,r??@-?)?z??p??I????????.?T]???$??&????	??i???6?O?E????\?r??%P6?b?"?"?x?????????m/K!?S?R#???|??/bV??fi%4/R[????Xd???6B?~??9(?(F/Z???
??*?!i??0)2
???H??2?????t???xKi?
CA?D?????HQ"????d?^PQGL2??a,??:?d??u"??cY??$[1?E???I???E?'C_$???Wa??|??_?#?????+?1O ?R$?V#{!\QLN2??TD"hEA)??rA?pE????H?WQ\?4?E?@Ip??%?#M?? ?P??i
/?j??0???!O`zh???w??PF`??5??v!UI)0EA?T?]?*$?R??
?XR?i1*
J?u!??TQL?4??TPj????]?g??(*=/??L?D??bBea.?b2#S???B?@,NE1?? ?"?CR, 67?E?*%+RP
?Xh??"U???h??"O?R?(?B^,?Qo??N??T%;?????W?dE??!?IQ\|Zh??0K?????:??L??

J?P,??<?E
EJ/???*?)??XNI??
?JCP,?]ZP?B??^??1-d????(?JVH?? K	?D?PUAXay]R?5((?@??6?x?j?^:??,[rlU?f???4??R????)?????,dBScP???B.V????????2?)1(??Ld?+2'??z???(?\,?D??%?XRNk?$??Q,
)??5Q?n? R???'
j??B*0????d??x?bB$,?B?"N???B??,?DA?)?+???'
?????	???(&+-z?T????D?
^D2?wi?
?8?"??$t??l?vF?
??I?	U???	
?J??V?b??f??4y
U??29WG?I?V0&?4????L
?0????M!&7R&??IV0&???$^e?????p?I,?D>?d?
??P?v??O?3??????Ld???'r??#U0&??(??2?R?DI?TP&^?????`L
??l?f<?D.?x?
?dXH?x?
?dT?L?!*?B??#TP&cu??$@c2(??D|
??P??m~????e?N???$??1)T???!1???Dh
?jZhl?G?`L?????L?1??2	??IX
??P??J2?G?P?$	J?????????Lf?>?xH
??P??#RP&?B?HA?|,4??QP&???|$?(???!?0?or??Q?p?	??,$??'????y?}??K??5MNXl\q???~?{?????V?F?
tt???J???????????!?F???W??v??t?O????3?a????$.?wo??l
&?^?
!e?????a>}a???_???8?c???c??b<6?.???k?wj??????0b?|??wq?_x3w??????1?
???1?p??:S;?/?>J

?????1#.
?????%b?)???P_?F?ph\{??
^_y?+R?aQ_{?Z??k???3v???s???Kr??}>*????????
4@?P?#??@??_E?[??????)?L
?J-??*?1??s??"? [?w?L?5??z???[??????0j????VPJ???Qp?P?]L????;?zW9?+?5???L??cza
?0m?D??_+?????{????}
y?}%?7?
????y?d>r?F???F??q?7
<???rO??e?F?pI??I!?S?LC?M{~????_B????g??;??.*u???3?w>????????&??C?	?w
?
W?d???<2`???F
Rjh?&-4?Wj?9?;?-?:`?
?z?;????
????;?F[k{?{??X[??@?x??????3D?[???/??5?G}?w?!??`???o???w?????U&w?v?}?c?d?h?x??????x/????z?w??f??;	????HGHH?????????>???????(????????w??O#??G?~r???Y???r7	{+y??P9?
r? ???q????,a??*????n?$>+?Y?????F?I&Y?M??QQ??NN???{G??????<Z?=??????F??^B?r?t;"?;???=MJ??+???^?A??G??e?O{r?U8t$???????m4??????C??;z{?f??]??b/?4??&?
???:|????>	???a/??n?]s0??~dU
??u'<??0?z???>???2??O?????7??U??@??????Z??????1???"IJt{5?/?%???????z?^r????e?p?=???#@?	?(? b?=Z??y???????????@????%}C/?4GG,??????z ?]?=????w???_?????/??0???;?A~?']??Inb$???D??K??????[?l??????????I~@????????*?
?xs?r??^?T?@??????P???RP%?j?5??z?=z?N|?*?^%+R??b?(??u????I?IrI???a???{?#?t%??x???n??D3??\?O?r???l?x???2?m6????9??}?K??{??????;??????F??b?(????=!??????|??_#?=p???????????EHq??5:v????/?X??m?
??z??????`?6????X
??? 	?JT~?1+
6??????M?g???l~?????{????y	????o??G??W?w+???f?h??????nV/?^?"??z?R;
?????>???????$%I?U??x7&???(&IxKvp?{{???h?zIR?O$2??????SL1?iF??b?c.x???_?Q??????=?6?7? ^
???/_??????w?wOO?5???y?O?
??7???????/w?Tv-?????{?????G???@???Sg????#??)??dh?????_?_?????K??^??]?????&?"??F9?%????Q?1W??m?,???y??????e?2?????G??
\p?~??????DQer7BUqY?nD?0[???!22???N?p???????z??????????X?m?:??8??o???|8??>????/cUM??c?,????H9???w????+?Gb#???????bZ-X?|?????qw8???w1"Nq???????;>!^O???????'?^6|?F?g?g|???i?????h>!????/??u??}h??@??u???t?;{? ??x???????}?`????A'X?v?h?
q?E]+?v???Z1V?c?*?????B;???Hv-vp71?Xg?x???L???0?aw?????S?????^???w'???T????? ?L0??Q73(r????*<u&t???????Cz#	??x???Q??n??<^??c<???@
?&F??q??????!	???\??z?L?iH???3hIt???????????Cz#	?^!?$?;?!?]?I????G???r????I??=?????g?"?7?f??^?E?n86?.^qx?mTk?6f??D?s?*?&??{?I???	??gb????^?_?????g|?z??L??"?j??B?W;?????O?Po???>9?e?r'8?~???dA?>??????q??.{o"{o?u????J????v>9}???b?	a''a??uB???????)v?(????l???7q)
\&^?<??g8*?X??????^kfW?/?<?c??<Tr?w?0G.??
G?=?J???0A??Oh{??=?H??
K???H'r?I?v????}'>??V?+???==z{?;>?R?=??=9?
?0`b?"re??R?$,?Xp)Jfq,5????\???[Y_|??:?;?n\Y??????M??-??.>???+?B?P#?dO#????o<????*??~??=qG}_eW?3c?????????3p??r????
?&?jV???M??BW????0??5????F?3g????T???b????18~,n?A??<a??E?I"????O????H??$)??Q?I?p'G>????0????H????M0?P?"JH|??\D/??Mm?Ao????zr?[z??
w?
7???W??zD???????^?7??KCw?@*zoX???Y???Y|? {K?r???????p!V
?/Q'????Y?<??s??3?????I?{???U??i2	?%??????%	??d<????%e?XrN?8=Q\1?9W?0???_??z????h?S[??j?
/)????7?hL??t@?wb?G8sZ???$!?%?Nw??p#???B???????c7!?^
???2?sd?,?<??F?6%???????\??P?P4?G<qd??c??	5????]'^G/?,2[??D??.?g\??????qHRl??w\j
&???RlY"???/?!?Q4)|?Jl???%?x?????????$e??I????[?(Z??b_1???O???*w'?P$)%?w"	E?Rz'?? RJ????E????#$)????HB??????$<?????D?x)????E??0z"%eR??=?7???g???zM??L&??U???Zc??p??????K????p? y???Z?a?^?^?????g?0=yC?q????f??U??N?n'????-\?^c(){?obJ??M? 0?4*|#?PRF?o?\??p<????
U?e0?c?A??2?f?????,M?2?F?]b,I%?t<?????C^??K#Qc????hd??S??s?nr5fI?Rhd?9wjiz?F??0??R%YN??W)|?B=???;E??K?;????????i??u#IF??CB??z????H??????|?L?<?7p'?x???????t"U??ldP%Y??t>?^\?????q??bs?7/??6??lpt'8b?{?????v?cg??/?$l??[Y!????E??%HX??37vO
??m?(?=?8???????`4T??W??YR?q???????;??~?G2?zh????N??K}????Y???W?????wQ???&:?MfR&8??????Vp??:?^???????u?]fv)???8c4???d2?fd????fx??@*?8?fn-?~w??s?.???????fW?9????
?U?"?Cc?????5???0U????????
^e??ldIX??!???$?Ic*???#?y??\?+>?
?y$zId
2??G^?\?@???B`?G/Ij?D?????_???%???{>zJ?/?Q??$'1?C?+>*M?y?yI8?4_??T/INb?\?+.y?/?Q??$'1????K??y??%?NJ???C?~<b^??i??4??(;????
E??????B??s!f?z>?s??E?J???V???7@?Q{????????|?b$>???????k?K????`
A9?V?????/?e???|O?w'?Q?#O?#T?? v??71?~pH?fS?????&???+?????+a??}88?Mf7?????????tFB>????&I????hO???V?~ ?O?D?
??>m???	??-???????3?????J?????????|???????
????/??B?0?3`pfR??MB??G???f??Z??7
:?9?06??2*????		xp?????????7?/O??"???k	Ox???W??????86?}??Y<????????%?~}???S????3?G=??'?????#???v??Q?Y?@}^?OuC??Z{J?w????=>???3
?X,
???F??{u?????3?~?;3>1???U.	&??.f????VM?q??YQ?c?%??j???,?"i?? w?M??P???H?\lU??0CD????????
3?
???S?
;?!v?L\?J?????_???A|?+??8?????????@p?n????	Q???k?<<?a?v??B}?@Iv(?eI?|m??wwAVV??????G???e?v6A
|C?? ?&?????r????tBy?6???C=0?J\??
*+?F?K???F??%???_???g???Hd%a???h???C??g??F?Pm?'a??Sw
???W4??????ql?U??6c?HC??V???O`??V?9,fL'S/ k?T<g????ga?6??^??p(?M,???M?.T?dr???Ck?=??Q???X}Fm???O4B<???????|N?????k?+?L?{??>?E[1?a?????5?{5??????>*???HI??R?h+2??)t&?????y?9?
?}J?FY??4?d??V???o??8???7?B?PI=??It??????????
?/??1??????????|?3I^l????l??f?C??Y?d??E????~s?>pW?????rM??????$'?Uq?y^????Rd???x????A?? I?{???=??C$?r
:??~q?=?,t
???ZM??'??4?>??fU??????w??????'??s???s????=a?"AO
?????qs<G???{<?z????X{w?d??/???????&????m>[]3??4?V?o$I67??]
cR??=??7???gQ???
???H{x?-?]??????u??_.?g?g\???*X??`?Mb?????_?/f
?uB
yW? ??t????NJ\??ce?p?9????P_D??_g??sE?Q?~???????
??????)??|?????6B&?3???0'[3?????,??
?o)??X?{V!???=??'??9%??
1?s
??F?)?B4???M???d???l
?b?????Q???`??u??5*4 ?
|7???P^G?9?????>?nnlT/_?L~4????3?J?i???????L?????????9j?|r=_?_???1????p????y_9???wx?4?&??/??>?@??&????o2?m?<???IHO?{t?TIUR??6?m?,????????Us???t?y??v&_?X*???Y???D??m????{???l??tHNm?%?(FQ??(??Y?Q??Y?W?d?r??????A?t!???>?OZb??j??&T?????vU???b?:,???=????@n??LdGW??*???ue?P?v????????*
???????|???w?p???h4]4^+??k?G??~??\0???????7??????#'4???????r;@+??LL1 ??"??d??v?AH	?)????
??3l,??j?!c
????_??3?'H?*?>P?'?r??Jj)sd?W_?X.R+$?m?????"??g?j|?H?????.??ToIx7c:?ugk?O?,L[??,?E ?&?1?? ??????>?T6??+Y??9??&?#?qT?H"?+???=Q=M??!
FN%0??A???L?^m?A???(?1?"????~R???????????C??	?i??*????y???????O(??y???????v ???o????@?Od|'???nD?4????|??????*?Tr;\?=H?
?_?$!????_q}?^?zEJ?]?(????????#Yh?C?4h????!h????6?s
q???T???yE????????????2?;?
??sa?z??"G??#?`]%?	?MY??o??w^?????v???0ZU5F???Ied
Oa?;j1?`W??A<_?????u?????????S??[???????:??6+k???&]?4?\	??DnRm1F57nv?,????U!?fT${?Z[?A?????Xh?????.~?,??W?????TT??D??<??'c?A?????NP?r???s?0DU?? g??d?A???dw?.*h???l??????l???S?????K?	???_?????0?z?t\?????p?	L}n??L????j?rJ&???BUs?l?W????l?\)????2????Bi?X????D?I?7Y?5)^???\hT?????,
g??
???uP???????K
<?????nAX=??IOK??D?
?????&_1S???A?n?Ak???D???^???\/??U?{?^B??k?????3m?2???L??DM(?4?" 4?[?u????_?F
y?????L7????2?m???2????vd`?,
?D?*?E????`?Q????BO'Nw???{[,???0???/=???[4Msx9?l+???5
??)/?]?2?R:sF?T?;??K?3???oM?%?B?J{?pc'=?`??=j{CR?0?&??p??_j?????	/?^B??p~????P????
	?{?????G&	????
6???hgk??)?$0???W??)	?\??;N???k??"
?h????&??7'??O+???6>????{OP}?u?X??d??oy??j???%p??K?M?`?B??p?3l???M>?x???W>??????e????d??.;b4?c%W&???????6dt????Z??
~]???? w??i???/?Q?1?^??
????A??@C???????{?z!?w???8)?_???t??~@?FM~"p??KrH~=8}L???,??X???p?+P???`l?x"?N?I??n????&??M"??9?U?M????????PA?,??
h
U?[Y?}A???b???I??z??v?ms???M??W????<????????D?6?}?ik?????S=2%_???
7Z`:?????\g=????y.??~?x,?)<6ypZK???bc?c?????W?D????-B???+?)?wO???N^?`???:???o?o~w?m?????}??{K??n??????{?w?k??E??s?~?9???fg???L????
???????>??>????&?Z???kJ??=?+??????[k?"t?C????/<??*????2????	?????cf=K?I`Ut?qs?uFC6??????????2?c?
s7?[?????pn??????
X??(m
????<?yp? 1??bI??+?-?.?????3????y??Nsp?@????i???{??5G?;bCHz?fF
??X?????7~?pD??3]jARk?=??N???#`
????Td???????????O?????>?????o??	?ux????.?e??
?????d??`?.H?W?<??$????m?3?F???6?II?Jq()E?h0?M_?6^?????F????&B&???/?
UA1???k	U?wo7???"7??J?l????j?c?8??N???C?{???K?.??/O>4.??_+?N?w??{??q??N??I???_?????{p?H3E?M?0m???DtTO?M=?A|??zC??0???-?m?@x[???I???-^
;[?n??~???{?
?}A~$/v??_\v???=
R9??MtJw9?#????.???3y?$`R?/?{??uv*???
??%	%????????????KH????G?1?]j?M!?>?e?o_???????T?u??!)??Um?b??Pe>???Q?%	CP?&?F??\^???;?y????wH?v??)??n?3?Y\???w*??<??8k
???????%?g??_?Fz?7+??a???&?| ?u@?^o?=??H?????I??k}????N|;}?????)????>?$w?"?,??vc?*6)??Vc=?2??Zv??
????????0?c?1??d???m?9?D?s(?g?A???~?:???CM2??]???=?K???4????~????mX?BC?1L??|??'*?pI?l?[o?????????M?yK??o???tndNS???
?&??L?&r7b3VM+A??M???\?G?z?b??y)?6????a??II?/?B?????31???N4????Xe?kJ9~Y?j?F?v+??M?Ii??2???9??K
?M???-??`Le`8?a??u6??x?>?|?g?~?*????M5??Tb?? ??C???u?4y?F:?
???U<?X????
d?C?	??-n ?a?5??Tj????u????aDw??hU5?y-??
??+?%????u??E?=ebBO?9	?3H?Q?HorRyY???LQY?\t at f??h?????X4J?L??G?B?H\-?%&??????cr?o?5??L???????"???w3?+35??L??I7?0?????d???ox?L????9"?W~-??@)?"??dD??R?????OGZb??7]-5D'?????(??R9U??|?`?W?WU?Vt?0oPZU???,?'*?"?~8?O????R?????????9??3?????:x"t???????Z???5???WA???NGz?F?N?'??k?|?y4CB?;?+?h?y?7???_?OP?????j????h>?J??LqGz??*??!g????|!?[???@`VL?7*bQ??`bu(?=\?2?tE	
f?0????pY9v%xh?]?????Hp???QM???&??h??~?B?3C????????3k??5??R>?<?;??O???u?i??j?f?]|x?V?
4?
?B?:|????????w??4?;??*	?=????'p<??9%?3????j?X?	?|?R?r?oq???Xp??h?T??D?`??4??L??7?r[???>??O(??"?_u,?4??s
?Iv8??!O??qd?w?yB?4?`?????A!d0??d?YV???~Y?????e?_)O? 3??A[(?????\u?Z?;x"B???r????O??m?MP/?PF?o??#8?nC
?cBJ?\????fGt?????[???)??.??l3J
???cM~?Yg4l?&??;z7?%E??8?g	U?#????5[???F????e?l(?B????< ??wy???x???V??G4`??;X?????%]
??
?X??????????N?a/??N?&?y????`???=x?89;?j??:{????O`??????{?Q?N????H??
nG??sS???d??S????]??????qy|Ex???u14-?n???n?h??5e4@???9?{?*?_r?Z?????W???????8?C5????d????????92???1??K??N???=Z??v??????Y?I????L???i?????sg???H?V??kd?@"???*??????p?VH??
??o?????5???Mh????<?[?????????????
?[ek??y??L????k0?a?mr?o?Z
?????Z?
hw???
tZ?????g??b?V???????la???????????w???p"M???A??_????W???keO??v?????+????????:o<??v???r????v?e?3??ou???<?
3?	?+????CD%??j???#???o???]?????????,????s??c@$??/??>F{-#??y\???
??????qtpu r$??H?E?=R)???b?6???]^???2??F,??+$S.m?x?O?????????g????}??m?GN??????'g?????W

O0?????9=?<`???a????????#x?=?8"??'?^????\?p?O????!??s7?q?????Z:
?"?9??Jo?>=x??]? ?'?i
???^?y??????t?}sq????!??i]?????z?xsx???????????? ???&i??K
????x??rR??????????0k???Td???G?&????V2????;9bY?????????????x?)p?zV?$?gY???{??.?/???D????
9?E??_??1?'?:?w????x? \????7h/8?8;8mHA?E??i?(???G?t???R/?Q'1??[0??_????H?_\)??#??B?M??hj1?A??:????>=?8:>??zq???o?3
??f?JdT??????/o_37?
???????c?,???g?}rvx???Xx?'Y??v??T??s
?
}g?|? ?????@lk??c????
???9a?
nJZ8??y?(?$?g?k?:X?M?"??$q???fB??u?L?R?.?)??/k?????=??}0????U?`x?g*r?D?H???;??v????9?2+.M?N?;?????5z?q??'??t,h??%?l?-?O?!??H=?
qt?v??{lH?(!???-a?dF#?E?K?????1?Q?i?Z????????????3???E
?*?????v?????? ????
J?????Js_	?`????d?$??O??p?!?u??%'?ZL0%?O????f7?%??5r8Q_5?x???
/T???#????t?@=>???h?a?s??{B^Z?????5?s$p4q???????7j??`??-:???'&Xbb?|?C)I???F?C
?o?nj0ob????????g5??C%???????F|?????????	??X4??PJRp????+?l?C%%??5??Pg@;?!?{4x?M??x??7?)????T}G%?C>M?w'(???????<1/vE0w????w?]>?y??]??L?T?a?????
3l??H.?&?u???D
#x
?/[q????<??R?
????9?,?7????E?Uf?3G?f??-m?/a?	Xc"??
????|?cY?1???&??]y????]}??????[???#?????B3=!
???:?W?j7?aE`&??W???v?-??Db????iU?d?D(kI????_??JVw????d]?????"???#;??.???
}A![<??/??H?
^???????_?J?t??G56??9?r?P??????X?	jX??J?u?h?3?? %?.i%
???lP
S.?Q?????*i??y?tM?/??/?F?l[??r???U)?]F	??7????????Q?a????s}??PkOL*???????XI?d67?/?V;P?]?>d?T???Rn?b?)?2#Z@???J?T?x1?BkH???h?23?=?,&#?2???????	M%>@???^??~?w??W?X???{D?R?1??NK????$???????a????2K?L?P????u????-?2?a????
S~???<???Ab0??? 
l!q?)	>?{$?9??H':!?R??? <}???c?w?????E?[??QV4d?"s?????K???
???=Zk??|?&???b??
?N???l??^????d????????????????????????????????????????????l
??m???m???m???m???m??????????????????????????/????????a??Gs4?Gs4??5?g?F??](?Q?R?a?He??B?X?EV??9??u??T??4???w?L>???
m?6?C?W??i???xu??8?]2??V??*??8^E]?7???
?WQ7??*????*????*????*????*????*????*????*????*????*?JTQGuTQGuTQGuTQGuTQGuTQGuTQGuTQGuTQ_L?R????????*????*?3?Hw?y^|7?dA??u???
?l?|g??%?`?????4?????;?q??NV?????????_?5?}?????}?z?G?m@?nw???m?yM?????)?)>%?]??;}??k?z?e>o??^?????^C?E?????=
?H???????????h?g!"?????????~???,??g*4??"UZn??w?n?m*???
??C??F????dbi?v????? ?_c????:?w???;-?os4a?6~8?
R?K????{@???O?z?VjE??????`ln?^???I?p@{,???BM?K??6??????i?Q??
????$?q??<t??=*?	?t?^s????`??????&???
G???u???|ea|?J?]j??g??I70?u^??b?{??????]???Jw0???3yd??&??}???/??~C at f?????????????!??H?w??;8/?x????P O4???0??z?>????TM,T?gS?Ho???|????m~?O`D???R??;^?6??y ??B???C??y?[??_]q?3?i???c?%??????G??h??]?&??<?`???$b?a??+???k? 0???ZL??????Y^+
??????!?
?
z???yU?????(??????Qdq?ja?/|W/s[i?iW8n??k???[?Lq??>??????]??7????Y?$-pF?????#\??i?c\??VC?.|??5??#\???3?"\?|???myc_}??O???:)y?????[9.|??5??"\??>ZP?t??~l??xr;?=c???????????(??~????Y???S????)v?c??4????*??t?K?$:??Oy"?0?HIl???q??)?}??.?
C???*f??<?	>?????H?9?a?;	???I?????l?3	??5`\|??Z?????>?SG??????}??^?:=a?c]?$???[?[M)v?&??kk?~J?v?ma?n3 aw?8?u?????s???lzN????l{,	+C??@?????H??2?s?7??j?$?i~???e/???[5????uk?1????y5??o^2:*?v?Rm??
?4??1<?????????-??????????x?4U5??? ;??md&????}N???MO?7?3A???erY?:?cz<?D?a??/l????
???q?*v+??b?????? ??????<?O??L?I?~??n?wg?sk???????%?L??W???-??P???sCuzd?????p?
W???Xq?,???iqJ????
:?d(i???v?;Y	m?g???m?=E??????r?y?(???U??C?b7"VE?I?#f)^??Z??n????????.uSo???
??????????h???ZC????{6??????D9jwnnH?~D ??Nm'?K?|?f??^
L??na??i????v???r????v?e?3??ou??\?@????????m?p;;?;?@Tr?6}><???Z???????????????Yf???????<?rpu~??N~????ka	E??}Vgc|??&E?????H?G*????????????Z?????wW?P????v?d???oB?????????%?O????o???????????Kx?:?pr????>?puq?n??'y???98<=?<`??i??=:~?x}pzy?<?G??????O4?o???1W???yuyxx~???
w??Y????Q???
B?i?F?Q?m??x??rR???????????UZs?<?9?????qrD+??Lw? ???N?X??Op<>9?/?d??7-??_?N.???O+?A???f??=?b??~?j"??{@?????????^??x????RdA}??|.Tn???_??6???"n??D??o??Y:?????????-????O?A$?/?????X????.?????Q?O???s????????
???{??
?4???+?Q??6?????}????{{zzr????????l2??y?????:??I?????/??\
??gH?(!???-a?d?????X%$??9??L?????w?/??`?f/X??5???g(bg???=????bC??DLY??%????G|%X?%&f??9??T???F?
??????\8k1???>?{,????h?????D}???I??6?Pq???"pV?9???kw????????	yi??????????????w?l????A??c??[t?}OL???????R??7
??;??? ??`????Q???#	?j?A?J??????#/??jQG=:?3?+,1?h~l???`??X]?#cF!{??????R?h?2?Bq???)pV???f4??54????|???I????????S???'?u3???Om;???'1??W??9?)?J?/???4?
3l??H.?&???5?t?
:???+?hQ??h??[=-e]??hV?
?}??;?=pOt????]Y???????&??t?
?????_?????27??:?|\kF??fa??>?-?p`?2??9??0?li??	31???????9????x?b,?0?u??D[?+??S[????{|??u+~????-???LDO????????D??:??/8?_?S?\S?o?d???m??	?n??tx'?{c??????w??^?y??\?.???-???'-????j?>?m??5?C????R?<???X???L?P?M?}v`??z?~??2?pYl?F7d???	??^??U|?N?????(??h???r^c??{??????K?xf???B???T?.??FVZ???v????|???? ??f?	???????Ds??z^'???&????k??????????~???q?v?w8??>?"`L$
???4??6?nr???`?<?~W5?76 ;9?


?2??f?K??_???????????????b?_????????gs??njR???"??Do?N??U???~;?"3??????<?Z{bR??/eU?J?&??)?x?????h?j?!{?R?]?rKM9?P#KN_	?V*[???a?5$??E?F+34?????|?~^F?K?
?C?s5????????'??????X??U?????Dcj-?????I")????=?????]??:G/J???z?.?_L-^?;Zc??N0`?????
??
??0?Q`9?O?H?
?#??)G:?	??"????O/?+?c?e?;??I???????eEC?] 2WN(?j,???
 ???z3}??z????????????%?(?%?7???%?(My??y????x_?a\w?;???a?I?????a??s??	!8?aCp?|?a%?=pX??VArXJrX=??a?%#?ryN+!9??V????*?????a$?!9le?a?? ?????0$?!9?aHCr????a	i!9???????"?syA?!9?aHCr????pY*????oES(y07?o???}????f???????????
7??Ll ?`8?????U?(????qU:?).??$Bi?e?*????m?S?nAD??5D?b??	?C
>{?5?_K?m???&?KE.?1
?S?@
???d??>W?m?$S?????>??SAM&??B?5s,V?#??$?]?u???f????9h?0?.$??(?R????T!K?:V?sQ?7??XL???%????4A?}&9??C?(u????6o?=???\??R?KZu*z??0?Opl??m????5h??2??gG^k???v=?`e?NZ?>????L??iwR???A???3
u?,???B_nT?f/?6??.?Ke??=S8??=???Z=o?[&#??z0??w???s?????????t???m??T\?GL{??8??????I$C??`<N??T??>f
6b?Y??mM??O?????J;>?z?I??C)?????9??m)????V?c?A?^??w???A?M?@?4???'?????u?5?????5???????x?ng8?LA???@Dy?M??#\#\Z????7hS?K???_????????????]3?????h?!??hU????GjM!l6T3:b?>y???e?^??????	K????pE?[????Z???}_????go???f7x??;???t?T?d?Ml^?0????l':?8i??{??=xs??&7"?
??6??@?????`?G??h]MF_;-Q??x
???"?)Y?????a?+:???t????:7V{??m?&????m?~<?4?????k?u?????T?^	U3v?????x?)?2}??????:\??3F?????7??o
?lM?\E??8?J=d???`?K'?????1???,?U????Yv??????6??v??b?H?????m~???????i??u?/th?x#?<*2??i??G??jh?Th?vn??????L?b(??????G[??X??? &??sPc??-h?XV?Y6????J?Q???5??sI??jrC??A*??+y???????"7?:Od!??R?7????[???]
k?????uG??0B??t??g?>u?[	64???P?%|Vo??????fL??#/J?fY?-?m??Sc0????%??G/v(??G?'A/?kD|??{?V??k????v????I????=b'_???P??s???6??>?mZ?k#&?]#???????O???89P
???????W'	??h???	c??X???3
Z?jLV????v?9?j~D???,???$HIl??t?G?vToD??????2?.;?
:UV???M?M?y???????Qg??U?0u_l?O|?/i^??_??????'?E?C
h#?Z,X?i?u????yS??3?]l????Gsf?E?????f??$Y?s.?_m?Y=?????h`??6??????Q?e??? ???$4??m?>{_???}??f????,Y2???+???'?51???Y)!IG,<?f??5?(???WQ
dF
0????{4Cza?/[T??E?l???b??l*c?2?^??-?^?MB??W???????O?:_?*??*{???U/?Y???1f?g???J??
e?66??}?^?+?C???e?K+3I?Q??4
dOG/???????m[????L?
?????VV/L??J
S???R??X??6???m????}????8??????????X5?????3??Y}?????n??yC??X???=????Js?*????c???y??IA??t%Y1??hw?9JKi?????U??j???}???b?(9i??=??????'F?t{b??j???2??a?2Z?8oW??<q??5 Lc???u????]??H+&??????N???]Q-f??A??T???7?S2?B$Y?:'???&??;?d8o???S?????VOS?V???????8?lJ???????^?*???O?"](%Vr?S?3???\? -<??T#?I????7?^?????ma\?R\???Nu-k,\????4:??.??+qT?J?l?/2????;3??:rqc??MaL2???????n$????+?HoH?????o;'IX6????R?+]OS[b%???MI??s????N?gP?s??1N?????c-?l?Z?na??k?-iZ?q?P?N?}5g>???1O.?^6]?2%?l???&ScYR?}??M??
%?&?6
?g???MW?Rd?????y??g?R ?%ns?Y?&v??t?????0?avHk%Nm)??(%|6?`t?sO?????????M?,?E}ND"'<???Ng?N?6'm???WO?mS?
o??NsMc?ih<??0??????i:k?9j???u:?C?{?S??g??$?8)?%?C????	Ysb?o???=?-????????????D???'???\????8??U???fV
????e?.A??Q?=%????;?l
?DG??????*?6^c'?????N??	
"?;????)hj%?I?m??t???%?<5fZeZ???f7??I?)y??wL?lwC=??0?m???t?>?F]
7??z?a?????????
'?;Mk????F?Q??Q?GP??H??)??"??7????tv??#a?????b???E???oS??(	I?????d???q??E??t?F?%6?????kV??f??A9??{m6p????j%??h??dk?x?o
???i?S???8?Tc?0???????2??V??i/?2???>9???4??Z??????6?n?8?5??q?7???i) ????vC?t ?4??????OI#Uj??????????9??????nr?v??X5/???3?V'???w??d??t:??,??P8???b??>???????y???a??$?'???????8??ZI&w^?x??
Q?I?~???'?T?HH????r>??t??F??fo/om?d+??v!G2?J?????|q???w?{???{??}?x?????????bk?????????,\???????.?????????\7???4??$????
m)7,?6??=?!?

mhC@????6?!?

mS??"?

mh?F&?!?

mhC@???z?????6%Y?!?

mhK?? ?

mh3?
m?f?h?]_???|\??bH]?????5??!u-??R???6?T?kAM!u
?kH]C?R???"R??	R????;a?H@????????5???mK?DH]C?Z0?F?Zt???5?kjT??!u
?k1?:??Y?#u
?k??"u
?k??!??!u-??H]s?"?5?!F?IW;9??:8=m\l??
?5?
#??_?$#??(?Y?m?????C-?1h?AC???Ab?????!
1h?AC?1h?ACb?L_:???X?As}???i?4?B?>?Gb?b?4?id??1h?A?O???4??'b?RM:?
b???
??!
1h	?
??!M??4??=uR???)hHAC
R??????i#R???t??!
)h?B
R????4???{+R????4??!
)hHA?Q???4???L???f	?4??E
?4??%O?????P?#?!??Q?F=????K?F~??)??6???X*?d?d?'C<??O?x2????9?'C<?\?U?'S???C<??O?x2??!??d??yI?.??????!?? ??'s?F?.-O?x2?T?d?'s?y"?,??#?? ??dQ?@<??O??@<?????'C<??1??M??@<??O????d?'?j&?x???O?x2??!??d?a?d???d?'?????# ??Te?'C<???v??"??!?,?e#?,:?C<??x25*??O?x??I??,?O?x?HaO?x?????Ojr??9?^=<YkH6??G-#?`?b?hl?%Q8dPD???jH6?S????????&?!?v:??'???\?f????
?\=??fsE????{??NN??ds?\n-????B$R?
$_?+???H"??$???????_??@?"?m<?M???&?QO????v???Ah?U\?????T?????c2i???|j?u?~????W?L?
??d?????#?)???r?l
????d??3???R???&]???{?l?k-?^?? ????I?]??_????`*?F?c??????OG'?l?????^?mWH????o3?Qy????1??R8<???lK>?????????>g???\]4 <
???^#??????&~???????w??????#x?=?.?+~?Dsy??Jw???????W????g?O?p7?q?OG???|??G?5Qf*??Em?>????(ANO~??3x??|????????????;?B??0??At??:?|@{??????'?'????\?!?4I??@????}?Y?f?!'%????]x????J2?O????h???Ht?}????;9bY?????????????xo?r?`?&~BXB???e5??????????\?Ad<9?h??&?;?:<z-cO?u~??J??9???!@?P?=;o?np|qvp????????Q????f?????^???Nbj
n?tV?j??D???J?E??s???y??b?
Q?O???s????????
???{??
?4???+?Q??6?????}????{{zzr???????#?l2??y?????:??I???????
?????t?7%-???"P?Q????W???m?=??
?tf???!?s e??????~???~b?"??????Q?????&??????<@H??z??Y)???????v?c??????s?[:???lP??#?q-???i?D?0?	j#?*?qT??7?$}?P?p??M
? 6???!}[???"?????????c	??P4??0J2?^+?~?10??tS?????`Q_[???"????A#8j4??$6S?!BI?*???`	???)O?PJR??ML???KN.???`Jb??=A??n4Kok?p??jT?j??
/T???#????t?@=>???h?a?s??{B^Z?????5?s$p4q???????7j??X??[t?}OL???????R??7
??;??? ??`????Q???#	?j`P??w7??5r??_-??Gg&|eb?%&??-???7??E?(d??T8S?@jB?
?\?\(????7?J?Q????????S????|4I?10??tcg7?)?~???n?;????pw?????|u??#?b%???.??B??Co$???`L?D
#x
N?4???Vh3???gY??ptCv???@U???Z&8???fx?"\?????f???>h?2?????\????<??3?????K?upOZ?>??T?\|
V@??x??'^?%????$??????t??/?f????E????|???+?????G?,!???!???w?r??O?Y???3???!????;?Y{???????|
??E??x??T?W^*S Z?b?AQ?ZT9=???(>CjK?P?Mw8????
????A?9du??v???1;`?t?z?~????\????e??\???
yO(dp???.????9|?;k?u?ui?"c?M6????????oc??????H????-???3:;5&?Z??dp??
?~?5?a	?T?X?)??????????/?b%????r???H/??_?0r~???D???9? ?FC?/v_@;??-"kF	?.2?r?jh?????_?l??????w????z?????????|??N^?y?f???+*x??<ul??v?oe/K??zTc[??wU9??????a????????Z???K%%?.i%
???l????*JC?
?????
??W;b?m???)???
#s??njR????L?F???^q?1??#?~YO???]B?=??
?p_V?P??$??)????_;P?]?>d?T???R??7????%???R+?-^,?d0??/?L?X????????J	?4?|I,u?? 5?d??k8??ZiLj?~?v?%?^i?? ??[????)[?L???ZX"??+D?~???s????T#4I0?a????E??????`?^)?6?hG?2hi???????u-?F???3????
>{~?{???Sg??z???]?ih2?H?j?"?W%?T?*t???&k??t??T
fr???
?5{{D?RbkL???.2SD?L?B?A??w?t?k?????-(]??????5l????f?G:&???l????b?JEU??V??f??????????P??o?h?
0M=5V??9???<????8}gV???v?*?%9?\dQ???o??????????L????;?j:??3????Y????????~K???'???:9bULdEs	'?h???N?D>?J????= V????C?=X??
???d*??x??AL.^do????MQ???????P?0?:?\!?R?T!S
?0??"???
 ?Z\1?h??>?(?,?j?Pna?Pm?u??X%?4X??F
?j!\XV"[iD?3N6?8d?D?	?f!A??+pd4???l?j"j?R???A??
???+?	YH?!???u?b??u?e??iS?C?tK??d,E1???????@w
?T???6?????ZXVH??W????YV?A?j4?F???k\??j??ef??C??
^]???
h???/_c??z~?L??un????	??	^?????`?W&x????	??????	^??&xh??&xh??&xh??&xh??&xh??&x+j?W??R	M??M??oqL?jyf?V?????2???i?5??B?w?y??^*?6????????+~d??1A=w?sG=w?sG=?o??^*3??r?&??-???[4??,J???1Sqb???jq?P??????/?@?>:????M?U??H]c????d???ik/K?VL#s???F???&?g}ua?ffD???rL???l??Y:eUU??V4Q]?P???aY??B
+?Z?6?Z?a???TY?P??q%h?jX??ZXci???N?/?O?"?i??N??Q;?????????x??l?(0=?r??r@???U?3n?xM??>zw?z-\+?W????/??.4
??[??%?t?%??o???????)?f??????????w??]1h{???3?1???nv}?n???u????2i?_?B	>>??V??????{?|C?6WF?py?????N?>>??J??H??Dc?)????$???????fJ??2'??b?Jf??
????Rqy6??V?I?gmw[?D?X]????	bol?$??%6u'
???
@?s?,???$w????2?????&//???M?-8?i/???bJ[/???????????`???%???????????s??J"te????????.??????[y
?
r?>???8r-?????J???=y???k???_JQ(5e?e?t?U??l??C|C???Jp$Y????n????\???n???<??/m?M?]|I???WB???[0??f=?????f?lL-???-???-???-???-???-???-???-???-???-??h???h???h???h???h???h???h???h???h???Ea?\@f?`Ff?`??`&;g??@?a?7t]??&???????w?It.??	}?????E?w?=4{???3???P???\?3i?o?(/?Bi??????c4
=?,??.[???X?????uIX(d?d??????8
??1??n??N??t#?3?%??b??8?????I?d6??N'U???6s?V
??pl?]?????:M??JzC?<?"hy??&j???2???OT?=^|{^i&?PY????R[?r?t????u?<?F?N?7?~??? l?'?*'?k!?=?oh3[BR????m?~<?4????j?????P??k?A?!6??G+????[?K????M??K;0????????C??c'???i??u??k?:???6i
???`?RX????M???i??"MXd?5?EfZ??x????????{?


?J???[??????n???~"Jb6????UC???
YIf??3???????#hC*c???A?????<???????[?g????5n??b?S???-??????(Y?_??^?<?*
????x?i??
G?<?y0d??)???h<U??s??}????+?o?H?91K??A??x????????7'?d???????e3???R???:?wp???0??+f????'?????R?p<????c<??Y? f?;???G?L??????\??6?}2b?Z?M?,?G(&&\h???!???rM?#??????0?5??[b?H?e4i??K????x?>?????
J????q?????o??A???w??G??z*??>w?\$9????z5?j#?-w]?%????4??9??????i???i?8?~-n??uHJ??J?O??h?ff3?L????72O7?t^???~???s??????]??&???5?%B?????ei??{?????????u?}-?D*?*>?
i??og?+????n????i?????u??i*??????9NE?wg??I?Rs^/Z7jmk??D??dS|??<?L}?0???eij???rJ??t??.?w????f<?v9???%??;??y?:?????k???+?9????<6E??y????]Tf??uR?AI?%?3?~???{?M??:)?pp??q=3pQ???*=????j?)h?????J??_???L???????E?I?}??f?O????u?3??y???w?1O?<u?]r?(s?@??f???F5?}%??Up?:o??j??VR?i?\:&??????3?9?[b6??]?????r?9???y?8?q???/????i?:Ro?O5?NsD?x?c?{K??6?^??:???,)V?n??)O
S?V??uS?g8????_?=??U?L??w?4?????!?}??e?????5?%??~?4?^3?c ?`"?
??m??Pg?????s??zZ
?f???????^lJ??4[?)?.w???????k?n?q??????yK????g[?x???i??c7?l??k??????O^y?%????k??d?-E??&?m?m6??O"7???P???`?r????e????z??<??B??r??0?????M?P?*am?4??n???U?^??U3???z?W?c????5E??)7?P?*?&?W?z?W?z?W?z?W)gw?U+??L???L??T??S???y=?:S?3?:S????L???KE??T]u?Pgj?}????i??J???Mt???*t?N?.?NOGW[dc?m
?????/y????+J?O.O???r<?
?/F%&TbB%&TbJ?p}?*1?m??o?*1??????P?	??P?	?????C%??mu?*1%o????0??0??0???:L???:L???:L???:L???:L?-s?aB?p??S??o??4????lZE??T^#t)L??HU.?~??E?\??E?\??E?\??E?l.?r??&k?\4??*??D?"T.B?"T.B?"T.B?"?r???A?"T.B?"T.J?}??E3/Q???P???T.B?"T.r???\??K?r*?????E1???E?w8??rQk?
??f??s?&???(ZD???
???$??????????'?u?N???6??=????=??B.W????\???{??^????!?\)?[?d2??????H}?X?+V#??t??:???????D-??bymr???d?G=I~'???
?????e?b?w*??????1?4o?tl6aGB??
?????~
????7k,b??	A????????tm
??D?5?	??T\?7?$?7?<?
?eH?Bj?CUa-?+?-?2?
w???t$_????|$_e?b_????S^q??????'-
?
?/?NRP|?zZ"J????,??????_?ILM?-???_????H?_\)?????r?5u? ?Z?[!??I?qN??QA??z?;????@?}%2*?F?????????poOOO?x0?|d?M?>3??????G??S>????????/?T?????????	??:?vp???????o??D?g??cu
??>?`?<	??
b????SQ?A?f???4?`(?????
<??????????????Wt?|?#$J?b?4f?????K?Qs?	?}H?.?n??I??a??O?H`??????>?????????>_?2?@?Qx??J???m?@q???L???A?u-??)?
?e??C??4Z?{????q?>????~{0
??39U"I$??z_??a??h0?(?<Rf?/p???N??[?'&*???A{X=-e???h9`R??????T?????+?+?n?9???Iz?:???? >????<?*F?????e?n?D&???k8?,?Q	?j?D??C
?	J75Xp?????m????FK??~???%PBB????(??{???}?P?p??M	?A??E}mQ???x?"v
????????_l??)??$??>?7??K???Ly2?R???hcZ'.\rr???S?????ov?Y2x[#?3?U??U{?mx??
yE???s?????D????????"??L???#???KW%h?~???Q?N@1???s??{b?%&??=??T?ih4?10????&?O??
I8pV?r??????#/??jQG=:?3?+,1?h~l???@?????bF!{??????R?h?2?Bq???)pV???f4??54????|???I??????;?QN???'?u3???O?????'>?/?k???+y??????B??Co$???`???7Q?H
? ???S:?
??????!F???;????g?lW?e???nd2?i-BC????5??	?-??Li??k??6?K????f????:???e?l?q??olpq?5?N???x?	?s????K2?????4;?uZ?????#?-Z?Ngr????4??D?r??^m?\n?l?1X?=??
?l???]n??????V?u?)s???|?q????@???.???
!?Q7P?u?E?w?m?????E???@7?z at M?T@'???G?U?????3&?sc#?/?9h??????????Ex?????d?93?|??????,?,?-??}??????d???!??[????$?S%?z?:mZ''G?x5?1??=??T`??????re?k???2??_-?/??C????[??o??du??z???c??BE0???566X
?t?A??x???!F6??JFD?+????m?Ju;_d?????????7??||pt|???????<:~G+???????M?=>?????\?????+^?w?????K[T???M%y??2??+F??EU??C????S1???U?t?CM?x?n01??C??V?n
|????@??7??????oo?_v??? |????a??Ak]L3A
r??w???~??~E?^?l?w??????????/????????[^A?gtBgL$??9&$?;???K!??k".??t]c!???R?Cxs?#??????????????"|~ ?H????)??.???? ??
I??}
?,?????%????3?
????????~I??W??M_8??????????????k0??y?;y?3???-?K????>??????????,Us?Q?
liN?U??G??????????*?ojq?n/?t?\???(J??!?g+c?(
*?K?Z6??_??????/?b3?+??9????I??,??3????z????????e=?;?wy???
??}Y?C??v?????
?~?@]?w????S)??K?C??v??A???J?T?x???R";????`e/> */#?+X?T????? ??d??k8??ZiLj?~?v?%?^i?? ??[????)[?L???ZX"??+D?~???s?&??T#4I0?a????E???????`?^)???hG?2hi???????u-?F???3????
>{~?{???Sg??z???]?)52?H?j?"?W??RA?*R?k-X??????B.???A?fo??_Jlf??i).lv??"???`RJ??????)?5X?X?.?hA??7_%??a[?.???=?1?)?e??LC6??????6c??'-??O??????}D??fi?A??hl?
W????(???????%???*rn?j??6?M'???=?z?=???????w?????g6??y?Z???w?????>\u?O?!4u"r??????Nt??5???|x????{@?h????{?.B??	=?Trc??E???\????????I??i?-?
?-u
}Q<Y????????`?&??:J(i?????????D???g?2l|q??'?
j???z?.V??h&?I????*????K???J+?W?? C|?!?8H+??+???*2)??????+?E?X?b??^m?f???[?7??dolg06??R86=4F?a4??F????e:\??qp??d??? ???r?.Kg]??Ua???????,_g:t?F?2G??b?Y???`]V?q??R
????le????d?P)?uZ??uZ??uZ??uZ??uZ??u??Z??Un]V*?uZ??uZ?-?uY?Zg?e???.s?/?Lo_??0???UM?<?
h?K?!T2G%sT2G%sT2?nJ?`{\%?r? ??-z???3??,??z/?/b????^o9_????l???KSO???G2(?r?(g?^??M?W{YZ=^??+?8????r?o???5?BFtmm:?D*???"K???U?>YlE??U?3??2??i??a??????O
????q??!vX??	V?LSb????*?:??????Jh?:(3???:??????&??X]?t?????W?LV?tP????$*K??$*K.???jiJ??}{
/Y?KV???d%??dey/YaZ?????????|??j?i/Y??KV?K????KV*??z?
W?/?WA
?,???_T?G5?Q??
5?Z??Q
??Q
??Q
??Q
??Q
??WT
??j?????<????????r???R?????z?J?]?R??%+?KV?v?G???W~??%+?Z??B_k?$7W,?%+Eq?J/Yy??????%+y?d????
????m??????d%???<?%+vb%_{:???%+??d?P???T?h??????])???+9?w?]?{W
p?1%$???????h?????8\??5l-k?Z
??:<??????J?????K??Vp~??:??W????w????)??AS?{4???U
???^?23?Nu???)?&?????
f?????d?????\???|Xx?G?T?_??dt?OJ$??g??%A?????jx3?y?3???????????#?[?
?{???F
??j?'c???u?W)??^%??L?:3b(???^?Pd???b?U?U??
Z??V?^????*?2????????syn?R???
????
????
????
????
?????????un?R???
????
??,??J???e?R? ?n???$|??????n??Y*?#o|(?R????`fB??5?j<??x~v~????!????D?Q???z?}t|yE???0`?`????b??H3-??a1C
???
?2???????p??j?X0'??E??C??,??)?j?/}????,r????g???o?????|1?7?M???@?????/?????D!?.??+???????#???k[???I??@iu_????r?;???[????{???4CFQ?O?Lr!E?7??:e?v????^b???0??????.0G?B??4>?8??p1a?\?J{?op?????Lo!L??p?n.\?kM??Z?R?5}J???????????nM??%??E???*?1??=??tA?A?"]??R?T?=?y?G*??*?&???(?X??0?jv????Bt?????o??	??<??J????????
??,{????TreV?R]??k?`????!??i/?t ?r3?R at 3??????3+E;?f
???8l??6?rq?@?Xp???6
pC??Yp7J:??[U??t??????_???H
?0?$hN?
?,	W??R?*_F-?W??X?$Bt4?N?????@??????Q?6??<??
?????????:????u ???B&?????Sg???N???h???
ys??0>?d
?X?O????vb???I?1%?\?? ??>???ikT????iOA?i/????Sp???9???6dI>H?A??|???$$?<
????i#?)>H?A?R|????? ?)>H?A?R|????? ?)>H?A?R|????? ?)>H?A??????C????i??{?azO[a?D?I???ujOR??D?i#?y=??A^?*J?I.?????? ?y=????0Q??#?2?zM6?????? ?y=??A^?z?????? ?y=??Q ;??x?9nu:???(6?O\??>I#?9????p?OE*!i????????Q????#Tl??:?n???t?? 
?*?bq???Q	?V?h????p?????N?J?EUa????~U+???/MM???????/!??_?'y&?@????,?:?8????H??LO?
???F???g????????Z@}?oH?????P?z?]???|?+0>?"@????,!????`???[??"??V
vV???*?????$`gu??=?\
"W?&??F5!B-??w?_IXcS`?e
?X????3?m?<2?-? o???w??%??!?
?mo??o{??6?)v@?EB?????t?m?W??me?????VZ6p[???mE????????jm%?m9
n+#?
?m?n?sp[???6?!?
?mnCp?????6?!?mU?m??
?mnCp??????mn?Mnc???-????A?)j.0??W?k?j?M?f??V?????6h??!?
!mi[E?3?AHB??V??8?????e???9?????????q,^u??xK?Z"H[?C??JX??=?\H[?C?rU??!?
!m!mi[:H[????5??%B?xUUkK
i?	H[	!m??V??B????6??!?m? m???{??f??
??1o????bOq&[???K???U??E???J?u'?W$??????in8?H????$wB?z`????0??w?UL?R????????B2{??H6D?!?
?l? O?l??@c??0K???X?4??<C?s???:,?a???????g????:,s?a???CG?a??k?`s?u???:D?????u??"?Y??:D?!??u??Cd"?Y??:\U?aY??d"?Y??:\?aI?kEd"?Y??:D?!????*X???Y?????;4???}c??!}X6??kgd ??ag?I?C???KE???<?;?64_F&b??x???C
?	N????9?n??0??w???S?9???dMp??)?`~?j??|??	|8????=???d?#
?<?$\??|?@?|??o:bE????????Zs?:UJ??cJ?Z?&r+?????<`?
/??Y???F?#?????
W??^Rp??????"?iW?\
3??\?_??????U???k?~??
g?V????????:2T???2?|Y0T?PE?*2T???Ud?"C??PE?*2TW??Z?<2T???Ud?.C5???2T???Ud?"C??????????UP???????A{.????9?L?^5++5??7??Ij>j?????????J?G??&<*"????8D?-????? "q?????&@??
??[RD\??q??"?V
W????????<??r?!???""???l.
G??GD??G?U???+???8D?!"q???c?"????g????3??4..yD?!:?q??3?N??+0tS????????>aB???0[?j#!%??sY???????6ca??Z(??|?V9????7?!?
?o???oO??}??o????o
?o??~?s?[???7d?!?
?o?~C???????7d?!?mU?o?:g????~C??????8??bE??J?~C???????7d?}'?[???r???=E?
?.??T/??g??K^Hzb\Q??S??&EhB????U?<?\??!4???q?z?A????-+4.??q?EF??4?Xb5^?,r?/	?ky?q?2?????{??
?qI??"??jmI?q9??]?-????
????u+??a????&.L???x?_
1?????d8 ????ED/"z1A,?zQ??]????i???"????'?\,?9s???????2???PZ:?b%???ed.?2?E???U`.sy?\?#s????\,8s1??Ed."s???\D?"2????Ed."sqe???g.?????Ed."sq???%?\?????Ed."s???\?>???`.?g`.r?a????5???qU?W'???ge+t^gz?I?S???KE?^??;O?W?6??0???y7??Lp*?????vs??????N???c?'k??N??T???SM??Y???D^???'CQ??)`&!?E#?k??+BE?D,>O?d???Y?R?S???7A_%?@WD	#Jx?%???D?0??%\.2BA?RC??????l[//2?v?P??*?Tr?E??%??.J?Zc(?J??(??!???W9J?XG?0??%L%?(?%C	W
U???!J8	%\aUU???%\?W?UD	?p???J???%?(aD	#JQ?+?????a?!L??
'l?5???=qD
#R???6?N????????2J8
?f?????
?yr?
?T?G??	??g??B???a@???????YE?*rV????U??F???Uc?4?U??b???b?k5???????,?P?/k?\b??R
Y????Z??V?+?Ze?U?Z?!kY?+?Z??=?Z-"kY??ZE?*?V????Ud?"kY??Z]U?j?$X?d?"kY??Z] ?jQ?V??ZE?*?V????Ud?~?j??Y???Y???=D[??7Z4?b??!?@??kg???Ug?IO_?&y?B^??????gMVd?!Yt??[v?3?A???E??1]??,?%e???EW-.2m?Xt%N??U??????<,?r???
?.?xt??XJ??69??Ao??1A??uF|:?8vY?k??e?
7[Q?
?X$?????V8??p8??!?p???pO?~??p????py?f?+O?W?r:??A:\:\???p?e???j?W@:?+.???Z]:\???p?????:t?????H?C:????t8??!?pH?C:??V?W?q:\??t8??!?p?C?+r3?R??t8??!?pH?C:?w?????T?MO?5<?I????k???R?yFF?E5p!?1q?<????Sc???D8???p?U?<?\??!???p?z??????p?	??????_dT?J?????+-r?/	?ky?p?"?????{??
??s?@???C?r??????~s)??f?U9????7?!?
?o???oO????o????o?|?>!?[M ???|K?|?s?[i??ou?|+"???V????* ??9?|+#?
?o??|??[
?o?|C?"????7D?!?
?o?|C???"???VE?"?????B?U????7D?!?
?o?|C??wB??3?r.7=?M?"j???R??/???)
????^8#????7??Iz?[?s?????n????P7??!?m%?$?nu{t?[?C?*u[R?[!??n?EF??????n?E??%
g-??,?nU??=
?\?[I@??uC?B?B???tP??????u?UU?-'???P?B????"?n??!?
?nuC??JA?:?`?
5?N?v??tA?Y??????!?m??oe|+K?[????E??9????????{?x?7{|??'???~w?[$C??????H??EA?????
??U????7??!?
ioH{S	n?oq?????0?l??N=??Z???@'
?n?"?R?
U??*???V?2?[1?D7G?[5???RY?[???n?"????*D?B???n?z?nHtC?????D7$?!?
?nHtC?????UNt?????D7$?!?m??n??S?NA?Q?-D??)b?2 tLz??1E????x????S?8?RmzNP???A$"q????g?D? ???8?:
0
???a???$?4Y16I???0??4??I?
?7)??????
N	H?Xp?F?4J???ywpqur??????{????x'?X	??j15J5??R?'??'G\??E???qup!???s0?Z?t????)X?????#O??N??k?>*?w52?4V'4?H??o?y??=???e4?hF???kF?<(???d?????????????R????"?2.??`??%??1????<Doj?K-r??mfQ?Q?E??{???Ck???O????R'?J????hF???
F&??????9???rn?q??
???u?+?V??5??dc??t??^???SI?[b:7#??d??^kB????f???>]??m?j,????c???r??|??S???j?h???d??????W?>??>??gM].??}~?????u??G????????}~????h????h????h????h????h?????j???q??J???>???>q???E?i-???	?
~?1}?????|?r?:????1???$_????mH?N_???M
2??????6}???A?KC???w\W?W?`???]??1m????=}??F&??@q?H??OP??deJ?maq??kKuy4??A`]_?Oa{?V ??F??j????\?x??t?Aus???o?V??????#?l=???????W?<???????N???????H?y?7??j?d???7????`9????????ki??q?<??5#Av"?t~?\MQ]
W???wv[a???R??$??????e??xh??yff??bN(??v?-!???_????|\??)a??P?>????????'????u???????5?$????f.R??pU?,??*??QLM?LKU?qj6?85j???P???te?V?????_a?Y?????????ojVc\???k??.??UM?f?j?AZ?? 
~5b~?P-???[?m\X??}?E??5??n?????Y?????M???????6j???k?????6???l?m???=?Trc??E???\????????I??i?-?
??C??8??V3}0??H?7k??e????????d???`?&???^?.?hYl+??p?)???l?B???
??C???M?,????jd?o?1???:???L???
Z????8%c)?I?T???f;??s(??
t(?????	?!4B/?!t?BW?!?b?L?4sl?W???R???
pX??????R?4?2?h??h?U?()-??Re4?2?hi4?\?5u}h4?\??h?H?A???h?&??b
i4H?A
?h?F?4?? ?i4H?A???h*UF?)??F?4?? ?f?h4?23/???/3?k?IX???fq?^6Kx???3&?z??}?Sn???????
m?h?.?pS???a.o?o?a`Ao????yf??i??????U?????}'??6?CS?{w<h?|?m?h?+?R;??^TJ*?G}t?Sc3(r?J
??;.i?W????I?W?2}E?l?7?p??????????s~<?5Ju~?m?P????vV??|(W?*????t??f?5??????^OB??V??+?A3???????k?e????p??$@??l??-??g?-???
?2???????p??j?XO3'??<?4?CY\<?[j^?H?????"?f?x3?a??7????^???M?|??T~:8??????g?<D???z?g?? }x{~???B[???9?P(??K???C?~?qc??????????/??2???x?g?)???NU???c\7^?3?m???????tM?8?j??9y?
??r^"???????!??????L^????{-???7?a^??i(?z=????u>?`.??@?v?U??q??Z??]f*?m-@?J?C?J?E?????????J???5?$???
?VJU???*?}???????9???j??@[?"?? ???K????%?b?????????L?T|*@?j?W?(?K?M?ST?K ?'??B????c???f?Y????2m?0V??,??D??k?`??wO{RB?j+?j??j?????WY?[???D-?D?D?i,??Z???Z??*?6????
??O?N
???0D?AW???x?R??<?8??	,??IpaX??#P?eQ??????NNf;??~??.?4?<2'?r
f2h?t?????dSLG??)?|q?1o@?2r???\?\???*?My????mT??@???S??( eS,9p? ???'+yIf'?????&;
?????g???Ee???$?C?d{??'+~;W)N?P??^??????*Ud??Wd??0???"?0W?@Z.?????]?_???Ha?bRP??????)??9Z???e*?2"G9??Q??QD?.r4_g?(????I??I??hN?`???????I??""???yI?????^,0?z??A?W??b?'???@Gc	i?%??^??_??|`?p??t?Y?l?/7?{g??
TsO?k.	?????J??Nm?????S???vZ
?&?%ba?4????_???M???d????????8EG??????r??z?	U7-?Sk8n?x????{E
Fg(}??????$?hR?-???Y?j?&F??Y??a?P7kDr2???f>(I?Uq?dj?%y???4b-??mi?K?4??
micO
?f????23S?V?63V???????T?L??2J?SG?d??G??N???ZI#?u???~Q??O???`P#??D?d?(??O?????LN"??;'@%M??.F_:t?????#??G???????W??Z???M?+??hb-?k8????
m?????!Lw0???1>?4???A?)??	my*??Rl- ??@:????????|?;??z{~?e??#I5
A?/o????o?*LLX^???N???5?Miv??[?????W(?p4?Z?o?u??h??J???J0%????`<???\??%?rLj?YY???%?u|?[??N??b????>)C?J??Z?*????F???C???|zc????Q?\Ei_??Df??6???C??d??f???i_?e????H]AA\???yY?h??2s?????????1?L?z?w???\S???i??I??Y??i?2}*z??a????-/;??????M_??&???hn??h??????#?????p4vE???/???E??JA?W??]'????BP?
???Gp?
??F???????k??`a?n??	?????)i?????H???c??C)s??)???ys????Oa???P????]?q?wQ??
?H??pU?_? ? ????FV?_?,8d?!??|??p?P??4???
?????? ?ou?????9???t??"??U???J}?p?[a%?o%A}?#?
?o?C}+?[
?oH}C?R?????7??!?
?oH}C???R?????G?R??????????J??V+ ?
?oH}C?R??????ouS?1?Q?}?????h??}\?%??'??$.?????(p?`,?-)??M???2?RE??
X?P?C?S??`
??-b?XF ?
????t?S???SL?{^???:????2?*????
?S???
Z{???w?c????[F_8?T????ry?P???^)TU??$??R?w?|??k???????#}#	?P??h0?h???? 2??7?4?`J?~L?x)?E?<?K???\????AKN?????????????}R?:??R???U????v???ba
4?:??,

??4?????bW???!m????|E?2???????B??[
)???????eK??p???e? ??o+?n??Wc??&???D/??+??/???E??i??I?<je?T??c?fy
??[^v?
1y????rS"?#q\0??HsDc??F6??
?]?8???a?__1+???c?[?*TT*?x?+?8?-????I????H?????f)?=?b<=;Mq?=+D??!?%?h#D!??????~????8??X??*?
??L??t????`j??????]?s?vi????:gj?????.????V???L?22????:L?<gj?j??F?62????Lmdj#S????F?62??+??.?9S?VE?62????L??aj+??]-!S????F?62???????????yz???????8[???&t?Q0?????QC17?t?"??Y ????"?K?????y?!Z????F??*J?I.??-??h?R????t??????j#3I??,d!q??????4?~=
e??g???????\).2?w??????je?k|I???G.??\?"?i????+?V?J??|d?##? ??K?G.?K??\???#???-[?\?UU?U?dL?r?mvW?>?7???????
F??L??J??]
?
?Z`????X?oF??LQ?P??:V?8??gt???
?`???&l,?w@?jX?#?j?Q????&?A?u??
??~?S:?[4??-i~?7k?{C????f??Va?7??Q????P??n:`????P??/?<
??
7???????'@.?G???U?\???"?????????sA??A?)YrF??R?GF?9?s3"?jy???!r?s??C??u?F??SF?_c??)p*?\`\?\??0???F???#s.%s?T?????1??E???"s??9WaM]+?s?$?sud?!snu?se????9??9d?!s?s??C?2??9??9d??*s?\???z?s??C?2??9W?	?\
?s??C?2??9???????p?\iz??????s?F?2]sNWt??9?sF??Qp?,?????`?U?f?????C?b?;???g???9??=2v?T??+;????*?????R??R??x???5?$h??????;W/"v?i??`??|??/"v?s??#??C???a?*???L?TB?\v????VZR?\??wWi?#v?;`?????!v?s??C?b?V;wrt?z?\8?3~.??????????:??!?1t??i0te?????:z?Pt?
??\yue??????(xu5??!?nuxu%???#?yu??C^???W??:??!?yu??[Y^]A??r??C^???W?@???????W??:??!?yu???N??*???g??q?K?.??hW?Kd?????d9????cg??SvHz?]M0?*32?X?"??v?C??*J?I.B?j??P?"???j??P?
?????RP?b?C???\?K["?]N@?
?{??
?C?B?B?j?dP?r???vE??%A????j?%?????w??8B???./?vU??!??v?C??*A??????J????t
?'"?>?
*W?V????r9??+#S.-S.??r??c??9S??L9W?\?5u??L??`???)?L??a?9S.WC?2??)?L9d?!S?r??C?2??)??L?<g?????C?2??)?8L?bU0????C?2??)?L9d?}'???eJ???L9]?Q????$c????L??.??)r1#_.F?p??"?)s%A??MM??Z9s??C?r?VQ?LrA?3???G???\8s?2r???3W????"S?V?3Wf5^-/r?/	?ky8s?
???*??{????2???*??C?r?r??3?t??2?????K?????V??3???"r??g?V??<r??3??9??!gn?8s???u???0?????F?U??6???'?<9??B????`?????J*??a4{?????t8?????S%??0???q??	p??b$? ?@?????H??D4]??5??ha(vA??	?C!?W?R???	RWAHB?R??:??????????t:C?)?t?'???"?nJ,]eY?te??????r+???"??t+????K?X:??!??t??C,b?K?X:???<???X:??!??t???,]?t??C,b?K?X????cFg?\qz,????xta]F?]?NSt
?9?pF??I?o????\??????????B??(?@?U?<?\?!P???r?\????[V?\??*??7[-?\????\?K?Z"?\???9?=
?\???@?(?@9?!P?r???2J3?A?\<P?WU-??@??
~?p?[?o~C????c7???2?M?;????S???^y:??RU??J?K?+?8???l??R???
?s??q?_??
??Z]??J?C?????r???"?
?o?C??????7??!?
?o?[U?[?&?o??!?
?o?[ ?[I??
?C??????7??}'?[??J?????@AQ#??T-?1??f??-??g?YT??????d?\}j2????C8?????g??p8??=2?T?p8\	?pK
???9.???????8???5?$
??.p??????p8??!?p????k????1?p?(??YRVap5??!ap?K?+p\?
{?W?TK{C????f????ao?[?
!oyC?B?V?V??*B????7??-??" o%??!?
!oyC?B?????a?s??!o\	Q??U
^1`7U??????an??^N??????O
pc???6??!?
?m?(y&? oCx????j?VAx????
yo+.2Jl??m%o?,r?/	 k??me
o?"??i??"??J?VEx???F????????8?????Dx??jm9?m???????]?m
o+ ?
?moCx?????=?????l3???!g#??D0??????l?Ee????Z?k":??
???D??????q??	 ???t?????gp?
????J?^?K3?"?D}w?[4G???9??poi
???yo5?_+"?????+?P[&?]??b????7?[???}?	+??????~?~???+??<?[???o???R??J5?+???V?1?[???7G?[=???V]	?[?????
?oH[?[!??o?*??????7??!?
?oHC????????U???k??V? ?
?oHC??????|??T?s}5??*m?F?N/v?????Gp??O:=h?	zx?M?0L???q;?n?N???`?]wC.?N??7
?/u?????????.?Uy?3?????.???h^?L9???????r$?07?k[m[$?d??????s?$+??Voq/?W??nsON?2???????????_??m?d?.?'?
????-?????? ????W???????I(q;?Rm??C???0??\ B.? ???=??z??T??L.0?P??)?|R;q???t?2P??l???B???s/??0??(???m?????;T?????H?dx
?`87a?`XB8T????:(J? /?G#\???/???lx??g??P?|??????@E??}S?@?!?!?Ru?W:><=?|qlP;fo?????????5??t??Q\#?1??U????&8????X?MMp??Z???4G?9"?q%?$i?Hs|d?c9_`4?r?;?u?d????\63;??

5???M??????ln?3??y??2[?
?L\)?c??j?^^?_f????u?s??*?s|??
????n?X?\4{``2M.2?o's~q??
?rOc`.9?R?.?H??????o]D????hf??i>#^9f?N3??V???b????W??D}F??*P??f2_
fl?C???RkL
???1??|q? ??L?HF
#????%?7?H?
Z{??)????eo??bC???)mN;,?
cQN???\9???????%?K??Z???????:?jm??Z[????		#??????????8??"1?0?x??>~&???|E?Mv>n??;?P????N???=?/L?5p#?N????k??)??\%?r?T?G???-sg%?V91????o@?]*?,Ya?/?r???\T?????M??Cv?????/????g???+????*?rS?r??Z?,+?????2?r]Y??N?B=???"l?2VnY???]Vn??r9d?"+Y???EV.?r????\d?"+Y??????+???\d?"+Y???-?3?^?'3????}??B???#-A4??N?n????
c:f?F8?a)?CF?M2ZS??9#G??????d:
Nj????????*???}{bi?z\}???R[????Z???ZD?sp?U?????3?4??(??q??V?:????P1????Q?
???]?2?\?BRC9???C9?SC9!3????l???{?r"????\M?3?A('B9?Y(1(g??=??R???8?A?<&?
???A??3??b+;
A??@???6|??m>?T0U??o???b<U\5Pj?T?.?t???%wP??L	?L??0?!?)g??rd&?????)$rs???3?,??,V_48gT?$?5?2:????t??*?4m?%?I]????~
??X?z??#5?+v????%3bg?+vV?Fe?X???E???fK`3?,Yx?Q???]0)?]{?]?;???"L&%?L?LJ!J?,??"P:???H?\("e?)??HbR?
?r???
?R???r?????????H1J?A*?z?qIN??	&i	??q??|%%?V?GBJ?/B%g?J???I??P?o
??U9??P??5???4????\.?r!?k%?$?\??zl.????.??|b???"?c?2k??&_&?????Y6?J????T?.4?iI?+K*?
T????d???????^???` !h??@?UK	????O!G?_?????6?(?f?P2?j??~?i?fE???z	J?O??ZaO?
?N? ?%?b???T?B%$?v????S?s??O???8??	i?A&?I?g"??qUm???0Nh????(=si9#tB3????3bH %g????pF?/B?rF?3????pF
?3R???? ???1J??@? ?A#??O?(A
4??+hd?}??[?42#h?Z????F?
hd?hd??(HA?FRF?O?#a??D?1?H??FJA)"a$%a?X?????FJUN?#a??0???+T+?@??a???$??a$W???\	#HA?F?0??$? a	#HA???FJUA)#a	#HA???F?l??T??F??HT?$F!?0????@R?+
a??b1?W?'?Ta$7=ad?=L???G}4??? hdU%?$A??c?FJu
)"hA#S?F?4RF??S?h????'"?
G??7f?n???f??9???1??^Sd?X"?"??Af??2C???pk??b?!?Af2C???
???????8>|O'??7?.?
v	F^?~4??3<?fT???'???2?l?A}T?}??\>?}?h$?d?y???a??'?H?????H?f?=%?U?LB{S?9???.Z?j?
kY?X?n????d??S?X????C????"?^?f??,Q?H?N?:???u?9???"g7?R????K~????+k?@NO??iU?t?????? ?
C0????H?7???W?|C???:?gZ??*??b8?B?????u?z????T???J~?PO54??#??	?T??????
????<C=??D=!?iEPO?G=??zB??????'D=!?	QO?zB???V?T?1?S)_B????????A=U?m
c?%?? {Og(7t??&Y??????{9??\?*??l?N??<^?pZ?qL??=;o??;:~}rv|????Q?E?<?W???4(???m????4c?D??&??WR?;??z>/?^???[}4?>??K?2G?*Q???????q????p?Bb6c?&???zxz~???8??????????????????Ftwg-???f???k????2?W1??|}j??C??l??????A??x????Q????<?\ ??g?
<?????L?TE?o?;?yt?J?n0??9&??k?k%???B??bWu??|????!?N2
?Z(/2m?xt?\??x9??5?$?????U?5????=???)?*??t?)??OW-???k??!??t?t??[2<]?R?5M-???7HS?!????V??Z?_??D???W?g7?'??}??a?6?5??????
?_????3J??j?&	&;,??w?(Z4V?U at F???#
???%d????Y???Z8%????g????|??????????????3?b?????Ej3?Z??)?:??-??>?p/D?s#?I?Xu=?-~?
'???J?X?\0{`?2eF2?/?K?w?d??i`I??J~?+?@Y???$P*???A?????k???TS??)M9H??`5Z?Q?\e?XM`U:?(%???}?y??I/?C???7???$??9P????t??(r0??^??4????|?????|?g?"??????'??D
?N????2?p??????
??????c?E?Lj=???H5?5{???
15?D5?fRMB|;??:4???&u#?Z??@??LC??[?????'??????????T????????o$S8?i?l?*???>????????|??g?M?G}?{??:???J?x'#Cl?i`lE???;x?#?Y?(???E???&?]G6{?P?h??i$?2??&????x?7h?)?f?|? no??L?p??$?Qre?xF???si5h	na?'p??6G?>3??p4x????????oP???L?)??I?/?WH3??Y_?QGjD6&_??N??kL????;k?????	T
?x???c????Y	T?HP?4X??Za?o3#???1??a??????J?ld-_?=vTP?\;????&?;Cx/u?cf????????3y??s?{?8?]?
U???????RWi??J?nU????\c?u???`?????????&=	?w???????????Q<v973???d#%{?(?UN??JJ6$?}?eS?60????e?0?Rd????8i6

?l??7???_?=8m??l?(l? f?[??mZ??/??/T??Q?]???LJ?^K9?u?0?????CV?7???+3?h?Pn??u??#.?C at q?%??+??????
<z?\??????`????yf??i??W????U
???}?sD?Qb?c$?
??g?? ????9?#?:???6*?c2mz??YG?#kv?????j???uC?y
I??.UK?C]????P??9???F5r?WQ?LrA?C??G?P?	r?~?K??|?[??O?`?dB???	0?ec???????uV?????:.?t\??|tl????K.???l\.q??r??dc$#?? ???KF6.W?Q?P?
???4?rTs???????i?q????d????~??{??2V??,?"D?8(??T???????s?B???5?wD???
?????
????^KA?ee?????????,5??]??b??4?,?(o7??? ?j	?^??@/o(g2/K????^???+?e5?](?L5W?q,?7?l?*??f??k??&????
GkB?B?q?l-?,:;n?<!???\?&*
A?b?l?Q5???cl???:?ul?T????>A???O????h?
?8?\??D?????M??U?kL?^??Z???qql8X?6"a#??????????D?\??o
???U?|?B??vF?H?!P&qe??O??I?&f?gDf?gef??4???f"5s???N??????????g
???E?e????R\?Ql??0[?c?W?F@<36$}?????1????U=?IwX]??=???37`Y?)?NU?Y
??Z?h
?f?#Q??
W?y~2F???f}??pX????w(?].3e?l?i[???"?XG??r??b<?U????V??Qj??."4|???7O?????'??4???H????I????:e??,???+h?<
?x??4??????????<?4?d #?K????D?"j?Ih??gm/_??f?E:?P???E?f?C??1O?????3?g\4)??0????@???E?QC?\?t?y<)MU(???H}???????????
???F?/?^??#???5?????????????A??`????z??UI?o\:?/??0??/r`|????t??b??(????
????W+?w?Kp{X????
??]e?!???%5??'2??ME?4F??Yu?-??r???????B??A???6s????	K?r?=?d?I??????~????i????T??-	6?s?3v??G??%???I`???$????Rj?l?????m????K???M??|??-?T<^U8?A???\&?m??&??}??Qo?Y?do?G?????;??)c????4)??
o6???={??-?xU????f\s????W@??u??????*l#?W@?Px^
???g??W@?P?|T%W? ??].?w at e??*????z???`?S'???&???j??i????Z[j??ZCj?y??<?g???(C???_??O???^<c<?e?\??=M?ra??iZ???*???Jy?k|InZ???*?<???6x3?S???3?? O??^????f,????Xx3????U?????Z????5_MwCV?f?o?????j%?7h?
Zq7hU?5vQ??????Rn??nK??Z3??U??@?2S?????????1??Yr???IWwe????}?VXh?;??x?{?bo?R"??7]Yo???I7]?n?
????*tODMs?U(B??-??ejh?Y??z?Yf???23^g????nx???>{#v??gq?\?.?T?[dpC???'????
?M??M.???x?????UkL-??????mm?X??7|
m??	m.???3O ?9CNHfz??{?c?'????Nf???G?*]?b???????TK??J%??[>?{?Xc+??q`42A? ?X? c??p`????P???G-???D???A??	?14!pX??aM????|o??5??8?\??f?????5?LZ????4!p[??a^?k?8?A?0?? p??a8?A?????	
?'
??a8?-M?? ??? ???K??+vc????kz?k?`??????D???h?K???/, at eFp1???????6K?40??

???g?@????A+ ?	????V)20??\?D?O?Z???,???F?\'n???Z???????7l???F>0p??n>>7?,?x????E????1p?F????~,M????????`1?&w??I?%H?&Et?h?Q??p-Ox?9i?D?"g???,????8????<N?v?s&N?
ZT??????M??)q ?J?1?K?>e
n??&
n??&
n??&
n??&
n???&?h17?07Qp7Qp]7Q???#? h;??????Rs?Mq2?3J?I??6??M??}????Y?ol#S?????6?Z?m)dw???s??g??X at(????VCh?z?????fy?????l?|?b??:??mr??~?UQK??M.???M.???M?#??
??????f??d?????&???7?????w?z????J?I?S?)?cM,?i?X@?d?
?jf{????A????3!Y*F???z?Q27???)MQ?!r?J?!rH?]???JL?????????xu?&K??Y.?\?Z?d?\?l9????	?loLs?[?o3?"?c??X?[ls????????z??9o??o?O?a^+??!?????3}?'.+f7\?N??]p?p????~??w??~???w??{?0?</?=6?V,??'Q???????s???dtG??*?u'??t<????????&M??3?]?t?_q???k??;???i??????_z??F:??`:??UI??H
?TM??S?????#3-?"?V? FQ?
???w??T??RL???HFo?l??????O???85?I?U??(???)E|??lr
??+??)?uUs?	.?Q+??!??ftHF??P??????UW??UmN5+T14?????]?? eTo
j7?????L-??K}:m????l????iQ?t?i?e??q4????3??>;=z+??|? 
???\$?\e	????j?b?z??=?C??U??@?<D??\x?'????[?S????^?S???H5?V?S?OD???O?r??????n%k??4=??4B?TO?u?T??4?TOu?TOu?TOu?TOu?TOu?T_SO? iPO????:x???:x?/??z???(?<?/???^"?????%?W?????L?sS?c????????nF?w?????Rg7???2??Y??"u-???n-?????#??;?Q?w}{{?9MZ???#'????%J?p;
??"K,	???t~F7
)??m??Y&???5??>?c?????m??HvosK???%G????C???-&?_?"???Vs?_?iN???H??gx???5?9r??E????aw{?? ?#?/??w??)?u??0^?)?b?e??????????s??k???X??L??{??]?M@????wg?q?w?????V?
???P&?{N?iK?J?*????V?Q???9/w:??H??Z?%"?]:?vo.S?;??_?YC?*??$yl???P?\?\?S???{
?y??-?p?(U)??
??????b??J????k5BA?2???sa??W?x?]??G?)0a)t?????+?=?r^xz=N?:?Q(Jo?T#??\q??W?P*K?{I.:???)??g)cKq??~?????y:???B???*???i?>???%/??;??b8???/.???"?? ????	???nP????Ej} ?z?U??uz???O???2?????r*?EP????<?^U??p?o???q?|?+?a????k???t??M????????p???pMf?~(?????I???D??Q???}D>??G???V?Kj????L?B????i?_??"Cac*	?&??aoX??yU???#|?#D?t???5??N=???a????l???3?W?.+??"?xjt;E?-E"
?*^?0)w??vIZ?n??nR#?%?]??v????
?????C?????wW_t???Nc?%?a_?8??????e????9??????E/Hq????w???t?!?U??KDyF??o????D?gTnZ?.Op["???????????$???;???r
?7_???M^??F`??I?F??x??oJ???X???2?9n?Uh??Y??E=??x^???y*:B4??s?
E)???/E22?yolo?
????D?????d/Z??$H:??w|??c??t?<??)`????G'??iQ??qH"??;
D?
~??o????9yQ?r_????M?????
'fi??)}?(
)??y?ufe?4????????{,??XW7????n|?????EL	?????FSl??u?????_?}??????_?8????
?o ~????F????~?x?'?!?? ??????Q???O/?e,?~??[?K(???CY>????5m-Kk?y%-i?&??_??????RC?N?<T??F?d?n(?hc??]?{~K0Y_?>'??V?E????????????? ?Nz7??????????????o??@o????))??qZ\?$????C???/?? 'a^7.??S[wprvVo???Y??bm?6NDg?q?
??[?
i?Ue??I?dW????ag?KI????????????l??(iK??G?? R???W.?^??0????RK??)??HlK?o?Y@?W??7G5????2?<??/??B??$?J?????y{M2
6???Q?/7j??R??BE???8???
H?J[??a??f????p?*?????H???????1T

?????O?
M-?1Nj???????M???R^?J?{??????F??d?U?7???cK
T??$???-??~?U:?????MR?q??5?Y??j???z???Y??
7y?&!?$?\?@?
4?@?B?G???>?xv??|???t??????????z??\? ?A?"|7E?o5????00???Hy??%O$?L??,???1"c*??q???e????e????T?B??bT#??VXv?F? ,K??,??F?i???ei?	
?B???,?e=???
.?aY?(,???p,5?j at X?aY ,???e!??I
*?u?;??=j???3???]?b??V$?=?{?Kr????bEI?=??~Dv`??^???G??%?.!Yfr?:???FD[<???W??2??/8	*/?B ?=IU}|R^?_??-	???<??
'8y?????|?D^
\???YM5??ayj?Fx9|?D?(???
??
????Ss??????????L??(Jb??f?^=co?C?j? jeg?^[A??5???;QPd?B???i??4Ys??:F?
J?+?E\Q??r??X??~? \\???????V?????"?s???p?C??Cm!??)k??F##:??#??"?Vm?.?s?*)?D+???Y??3??d4?M?k%?????fyq???=?????<??m?+	J	7???0A??8??????R???"????u??
??
?N?t
a?
a???????U4?-
h}
?h??4?^?

?4?
???????????h?6v
?y?Pf????;x????<-?3??S?K?g??a??Yd??*'
?Hd??A?????q0??z?n?(?????????]X3???`
j????3wn????>7???	?b??lfz?d??Y?7???0???q?;?d?
A?I\?j???t?e?r?"????:'?u`1?m???#?|KFB ??7???????	7??h?????????????????????????m??T.??6k???+T(??^??,???????g)cKq?;IK[??<????[??8x?`??x"?i? ????;???b8??????ogG??t?,???"?? ????	]?rs?][??"?>?z=??O????
??'e???A???????f4??4??By3?l???s? _?
{?in?????/??i? u?
d??

=?}/@?-mHr????b+c?I?6d?`K??Y?
?????????JX???+s?-??)????<???J>{?|R?	???B?6]+?7q??w{?6????Qd(lL%????2?
??!5?*??7rP?Ldk)?{kE?Lb??i-s???puh????8????8?7?S7?I?Z??(????&?7?7
??b??(`???????N
R?(3?mH?Q??h%=JPD'?1???? -??\?????=???Me???????? ??))?????5'?t?k3T<?@6?cA??d$???(-?IT?)t?f.Ix?q???(????L,u??"?8???'?Z?	-j??}w??7??+0q?nF?Ciu?LwM?k??;?-??W?=s?f7???'???6?,??D??D57??^???????{??Yz???????????????D?????3k??????Z?? ??? }??nz?yV???A????????m??Y??r??????????0??.{?/????x???1??2P??_??r?"?2^[?'????????<?
I?j????T?}?TDl@??d???+
n"NYZG???j?i?mG????o?Zr?????=hgN???m?\????\???
??????a:?:????/6??f`??I??
+??=??k????+?????\???8????%r???T?1???
??K?O<\??I at B???1\?/???^??!?????.I-????^w0?W??w??%???NF???`?????}??_?Q??n?????k|?@??Gb??w??3u??&?(???+?h??a???x??????X??????O??K?O#??????
?='R;??????
*?????K?`???????r?N?X|???L~TeO?P?}8;???x????
?7!?B???<?;??]??Fn?zQ?93?>?-???%/l^)???F~{???????}?f???G??"?rn?n^:?g??c??<K??^u??-???~??C?=$????Vt??t???8?D?{?????
?&??
7oZ7???9	P'_??f??0Y????#B??I??-?"!V&?GF4?G?
?p?{D??c=U?????uH?$^?? ?D??<$!?D?X??I?ALA?RF???bzGM????p??T[???o](???R?d?D?_????,?????H????~????^?J?H?$[?P?G????E??d?M?Q??$?y?]??YO????]??R?Ii??Z?nY'????^Z?avg??z????m?jNo????))W?)W$??$??C???-_?;???2???}?;g???X5
?s??????mi?R???=?m?V??J?j???Z$?^????l??#Z}s[??`?? ?M?6?rc?H?Kt?9\AHky??4r?? ????????$??F?????!?? ???Wk???x\Qb???vI:&B?N????Z????-??V???eI#tT???fL?T
m&/?]
??w5????~?*??|?Y?-?l?9?0
b???Un??6G2;?|??C????J G3""tJE4???~2*??-????$?5????J???t?K?<??|??x???Gb??[??????Qi'????B9??I?$%??B&?}?w??I?R?b59^??????)?6?E'?@??????>O0??????,??????R?S'm]??????BpL?jv??`;?*9??>?m??z2Lo???'g?s?/*???6????r???_?0?r??B?0 y?????23?p??J???)?????Q?S???Y? b?K L???Hb?o????b?e?!???")???!fIJ??3uG??????y?
??]??I?f????"4????s??x???M>???????]$$IZU???T?*My?ge??o~S5?=??~??????jUV????RV??????u????????(>?6?
 ?VViJ?
^?<
??
&??????S??????u{?O??;?6??,N?????iy.7f?aU???
D?^/??F???Z??r??w??iv-m?z?pj?D2?G?6}G?D?;?S?5??f)?L?r????h?"?H?s???X?????????Q?Q????dk?2C?\?\%?<#y?s?T|?\??Y???K?G??d?0??r?*?I?H??
??^Q]?q#{\?????B?o???BL?S???0)|A??_}k?G???GC?Z@?u?&_q???^ ??u???7I??tp??S}t?_?<?????\f?N/????d4i7??_{???DN???qO?o???fgNe?#??e{?3?????Lt???????3?|W~}??=^I???%kU??=AP?u???????m?6?4K???VNLeH?
??t>+?AdF?Y??????-	??IJ??l??????	K5eu??~?;X??h??~?????_?J??`????=U?d???????:Cb????8?8????P???K_????U?"????+?.iD?a\???A????T#?r?K??k???G?,?k????a7{??N??V_?	??????J????v6k0?a??0?[}l??0N_?????> r\??]E??????ne&????Y?Z???R?ZE??*?V?????Z???U??f=k?S
{??Fd>?*?:??I??W9?e??s7?/a???????	?T??"7??^'G?"????-u???E?????Prlv??y???S?????????T??AN???b?/O??;??y?kT??(Y|??OF??#??<b?*?&.Y?V????????cK??>?!????k? d?f?CS?mt3I???,~m???O??v?s???Mx???????-??????????G5??3?????""?&?M???\??????vwgm??>???????z??^??+?<?Dg???_B?Z???2?J???T??e??????ND??v
??m+F?q6p?g?O?a???Z?@??6?{R?g??5?/?T??g???&???t}=??=]???\,?-?0?Z????????V??uke??/????7?z?U????????_?^????
K	?????L	y??????e?*?6c???}I?AgR_O?%?????fYE???56?????a????w_:

an??c^>0.q??O???U?4mA???n??I?]??%?A;????????t*%?X???%q
?6{???
r??E??p??e?C??H]?P??VL??H?b???9?iP?]z???g??l?qt?8???<??S??????j?6lZVI?LKRaEC?d???0i?
??f??K?T$??S>??? ?????G?????|?I????f?vbK????x?
????'????PV?????#??A,???O?o???dJF?????-s???hK/xK?????r??f)bK?n????F??<??????S?	?[????O;?????/w???p??????.??.~?)?Q,??E*i?c???w't??=vm?[???K??+??-Z}~???W??????i????'???`?T0?0???W????X?\???A&???+???tY?Jn???2????O?????)-t?)+????|??jTZ??LS???????\?J???:????M????"?????$?V????(?s?-?*??KIe?????????{??=?4??7gym????gu??A?|??`G%??)W<p(?\=N),?X
??r)?-7Jp`????t]???nGA??vE-?????}?c???U]??????\?Sb??e???????
?]?????lo7?/zA??'??g??????oO??(?h????]??????MK?E?Ix??c????#?'???????k??)Xp{o??/q??>????q?Rd????^pk5I???d?[??*?x?,t0??fn??????6ix?
????3Ji??M,???{c{?V?}??&???`W?!{?$A?8?}B???^KL??$?!)V~?g??gB?"?-K"?????t?????}??/X?_?&X???_?V???\??`<???????b at og?[Ii??J??O?*?B??u?S/+??9???lR?
?b?b?%?-??/)?I??????g?\??
?/u?"?Ah?
#\R?[?hYv??r"??+?????@??l13?8?13?f?????q2???>#?$lF-	Y???3??u?z?I?????U?`?SX??-???? ??????e}C???3r?a???
%l???d.?C	????(?????cxT?Q-R????:d????#y?D?P#u??./??\?O????9U??????
??
?!?R????????oq???????C???=???????????39m??Y???++:?-??I??4?????.??U]U8???V?d??t??]??I??n2D??l??K??!???F????WZ???L2-?????'h????@??NV??T??????f????QWs!?7?)7??;
??&G*J1Le?x??W?????@???PK?R?a?(b
"<H???)H?`???!/Q??Mn?e?de???????6xV????]?p6??g???G????i?7Y?K?:??K~<P\}?J?|?????"P_U?BU?Z)e?UT?Zj?kS~???`y8??jq??<+??C????-?!?????K
Q????p+??!????E?i?K1-6n?????!?L??P???>T+??nj&b?l?!}???2j=Rs??r????Cr???O???>M?I?????23?e9?e?<?A??/9*??#?Z????????5?t?o??g4Y%o?K?.?<'r???\P1????????????Z???????;????????Z??P?!&X???d?O??(?]???Gy]9Q(??r??2?3?-+?$??Cf????????hF2k5??L|?.M?Rn?-?]dd??s????47???#?/?2H?!O?????F??7
???=??.?!??=E???qP?U
$>C!???@:???7rN,G:j&????
?H?G^<?@9?fH?4?M?S-P?=eU??M?o6 PN?@9a?vu?C??(f?r?&??@9k('IX??$?@9(?@???r P??@9(??i????@9Q
?b_F?M???e?3}?7?!+??f'z?{G???WW?Iox?'a]???????o??uzK???3????|?W???Q
?[?:?~???X????;????	?4?[B?j??]??y?????`t+]????/??I{$?$?|??%?^?F?^w4=?J%???o??w?r?\?L??gjh'???4???????T?JMd?????????=?2??SjB????Dp????|????U???no?????}??????????G????F?|??
.?=b??G?vNJl????????????v?-_???AG?}s?zW?<??I????y?c?O?RD???
??2?g??L?	?3-Op????wWBS"8S? ??XB?%?a????$?R??*(='\?|r???$? ????7U|ln?9?T*??iK>SG??Q?ZMJ=??"_??*Gu???????????v??d
??N?ZQ?H???N??V?H^??,?
=Xp???VD9???ZP??F??x?
?9 ??
???W???A??e?<!??z{<??????;??kp?k?p??5}???OZ?l???"3?W(??<?JF[?FZ?"8?-?EZP"1X?-?FZ?3g?-{??????N??a'u}j1?%c2??eC9????)?u|?????g	e[??f???$?0?????)???Q#???????[???wW???XH?????????????'??^/Y?2??W??h?Z*7??bE????????s??aMn???RI?#t????????? "7??????nS?-?{?sCi?>??? %|{?Hk?5?c`???V=?$?C????R<?P?vq9???.?k?-????H+???i?F?I*?VaKI2??%???P??????x;?M?????&??2??]????e?????O	????????q?w??)???^*5m??!?e4??EjE?qG?l?b?-W?e	D??0[????????????w5???Ke??6Z?F?"??l??f??Y?k	\M?'?"???????5???a???????\`???????n36?9sJ?m????H?V3?^?????l?\b???r<?&nQ?,??\c????Qn???I???E??$Zb@????{Z??!???_???n??????????L8????i?D?@8??b??>J
?????????[??g??c?\#9??9O?n??QN???ik7?<i{???????:??????m?$ ?j??????{???rF{???????63$UW???E??r??sQOo?/?YeQ/?L?n????O?c????J?H?J?CM??%o?(?F??z?N^s?????$????U}??????????%*???+}????9_??_h?3??t3O???sj??F?
??0?`?W~.?7U?\J&u
?/m????Q????Z??qtY???=/i??;??42?U???EKC?5J?
C4??&????I???=+?l?
?e??lzb?Ci#w6??}?????G-?R???s>??D?
eI?|N??r?=???????x??????7 ?X*??v5???W@/Xz?9?lo4?M?j???k?l??o^{K???W?J[p?5?dy?/3?????Z?&??sye????=,?_????q????U?Y?KMA???p???+'?`???ul'?x??9JC?8&)3?{???M?)??l?f+?S?????2oi?[?[?nH??????=?%S"i??*U?????uk???C?*????L????b?~????R?-?N??_??I??Uv??V????h??d???f???????%-??P?JK?7a?:??g{C??"	?d??Q8w??d?k?(??F?w??Y?w???????{?i)???>+??3???????qm??z?9?K?8?Zs???=??xh?f?*{?*??-???v??,?tY????
Za?ci??1i???????)?%?5?f4??xU??||??]X?K,????????R!hN?U??5??Pj ?!??????+Al'???%?6??&?E?5????????Y?n???.?T???]????h?v?k???oXc]K9R??fzS?i1?8?*??&
U???\e?Al?S????????M???X??????RJ??`?h??s?U?~??}lY????X?f???7}z???j"?=/??&K??8? sMj,?cJ?i?%+o?N?3P?;[DM%/&?
??\?^???\?^??V?h?????d?y???x?zm??ksMj)???????z??
?v:o?ZKK"WmmI???G?????p?W3??XZ?%w??,(L?*?Q???S?QB????6???????m??????????&??Y?6I?U???U?U??9$1?u???\??5)^????J??X???N??????#????????*?"??????..??+*g???f???+???,yX?Bo????T??[?[????.a^*&d?P??%@M?\i?l?e????
??{???????U?f??2{3?|?$B+?o??????M?I?t/???{'???)?+??m<W?V??x.??`???7?|;1??v6??M?d?}?m?z???)w~J&x?? ??%??L??_??? 
?a????^]a17?(t7)?k??a?{??a??
???;C?&????2??????eI*v????:H????????3?k????Jz~?&?VLC
37?h%?n>????{?}"?a?Sa??^1>f?_??T????%????,2g?mw?s??Uf
?u?n?$R?6>?S?>?U???qo???|????????e?G??K?\???]Ico??+e??1?????Mj?,]v?XtZWz?w???1'Y?5???rM???sF?.?=Z?@?tg?????MR?)?2???9??c???1?g
s?(=T?s??a?q?"?|?;_?????b?????i?????s???^???????(?(=u;'?n????-s?c?-?K-?}??$
?\?RXq?K??_????
??e??k????w??(?i<P????;????6??xJ+?k??w??m??D7???o???[,?V<UD<???nB;.?!?????,???/__?????L????????V9Y??f??]u??JF?ja????Li?"?~q~?^[???w??Tz????????"?jk4????1????????0?9? )?b?<??????IS??.Q?YuIq??????'JI???m?`?^j?n???<??gZ?????2??b?/?m???V???????g?nY?W[???V??b?+v?????+v}????a?+??Z???s???X????`3gt?MH??y13%?!????+???I??????????oU?I??\????????8C@?OEZ????^q??1?Dx?f]?"???$??fx#/:
?Fm?K????,3???V???????s??b87?+#??>U??c[?????tQd????D?'?qS^7?????
f??~1Y???_Y<????\????m?}?"?z?pm{\:??+?^oy"Y}z*e??????????
??d?x?[??4W09I??>??[?W??FY;w??ZQ?????	?Rk["cEbKd????}????_(?T?Ok5?/kE?e?9???;??}???\??Q?????t??????,5??R6???8gf;(?`???J??n?-??m-?>!?7????t????z????????+m????y??
CS??'???ZY?n??rW>{?????g??2???j?me?I?%?????y?_?e^z?i?-T{"m???H?Trh???fM?|c:?W?{4u???oId??:?????-?????)????X???7?G?4??C??l_??zv?n?X'??c???-?,?????Sw????-<?(???Y?y_=?0?+/
????yN=????5!??????3`?Gn????a????????o??????????P???<??$L????^??k????o??27??='?????d????DX?o1????}S@?+?m%???pm?????????]?S?u????1??\?m?
?q???6gE????ylq???\?6?l#?P???????<?!?#[?????=BZt???2?E?,_????-??'2n?m???q)}|??%?63l?G??}?$???(/?42?7???i????S??mi`@??x
?8H?W?????0`I??????42???'hk??O??#??'0??
 _??[%?	???T??????py0????+c.C
???
?M5?O`???0??;?F??:|?4????MW_?m??nM????u???<???J????d??Y?l?*???Fy
}?	E????f?'0???Ua
??N???N??0.`\<?q?YXf+)???????O????FL???V??8??7>9?<???C7?gin??
m??_???:MF5??'0??=??
[Jz-????????	??SN????Oi1J?v?z*???9?75-~??kP?#?r????;???A0?a?????"???????7??N?F???~7!???~?? c?
????M?;????????h6?z#?7????0????z#h46k?Z
x??z??:???~?(????Zx1???W???)??q??&x?_?O?Q??vt?o"o?k?{?
??;p?V.wk??dF"~????y?G?/?qF?????w??s?&???????}2?Q??I??m?????W??w?1>???`}B????I???-zv??????????oL??????n???G???#????????7????c???W?^]??n?Lz???n?Gt?vi+???????V?y??+?k?s=G??=gA??????)??7}?-?????%m?nG??[?f?M?e????n{??G?????F??wtw??">?_(?mu?h0~&??A?2??#2?'?i????L??=?????	y$????o??vJ~????@/?_/7k??q;??????~~??g91???T?x??{?????????z???1#R????awp?U?'?~?	?d????K?n????M????%?t|B$|??????????????x??mm???g?F????????w?w??????f????Ggg?V?O,RH?f????}r???%???z?oPJ?????????%?????????T??"?W
?E"????????S?|\?T<?????.N_f?R{?i?????????hq??pD??E?]?????/M+??????????????g??????3\?:?u^???x?????:;???.?????????u<z/???
g>;?e???F???.??Iz#??>B?d2?aL?????????Sf???????g????}<9%?V????>?X?^o??G??yE{?m?????|
<K?x?5??n???/~>=;#?f?????Mx???q?P
E????SgH??:?mv??????SZ*?I???_??z?k???<?4??x???=???E???J&jI???<?9?oEr4????M?r??k?0\CI???^71?f?_:?W??????????|?em	?#tV??D???;??9r??????H???Z???`h?N??x?????f!?? ??v??6??h?r/???-???h2??????l?$?????????????????v???p?8E?|???:?N?P????????
GV-?7??????P????/???zG?>?????6I!?J??DG?g??????????????9[M????&Yf??J????{v?A.?_???????z?Wv-????8h???5/n?=?@V??c??$?zEJ??@I@~??o.????z?????_????+?_???,?????>??i????????x???g??????\?EZ??_?????[??})??.I???????t????jM??:CZ?|??>???? ?f???????*2??\<}????^?????????m?h?O??'#)P????????????}???.x? Z??i????x???/r?????.????|?J	???o???08}O>m???:????(??u?D??~???????,??}?????HT??????"o???]?xW??Z????/?????????	V??>?
n????????N?????????$??3<??d?Or??f?e?oz[?Lx????iy{??$???????T*M?????=?'????c???_,?????'??z??T?)x)????-?????3???I??R???Z??????d(?????Y???e?"????Kz?Ug7?????GoqSe??????<cdw?OR?`???,SzW??o????3?g???p?!v?!c<-???r?H,??yUK??/???u3??h~?%?x?u??O~s??\??????[?@????nt?????Z?^??s?o??B??H??????????h?]M??_{???$??~c??52?D?m????????ht+???????Y????/.??p??{???!3??????y??Q????|?u??I??????~????)??/????????~?[??????(K>J?f?-??Mr}{3?m???u?B??B&k
???T???(%?^^?E???z????l4?:??-?6;?Z?w%*(?x?#?R?d?t??q$*(????F*???k>???%????d???]1??+??(?????jgG??[??b?L?1
	??3?oG???l2?SIE?????x?!?w??????L*????<)?C7D??vf?0??Y????K???fr??e)???k????g????R2
????^6????R???qg2?M?N3	(9??5????d???r?SIE
;?NK/j	?'?kr?????#_7?g????>?@?p??vf6h?U?Nn?J??o??d?????RIE?;?i???sf!w???t??????#<?,RH???????R?Ig?1K???I?R??R?o?g?^???k?lW:k~?????F?u??r???_|?6??^?'	??z???????;c??_????F\`	???t??zI?6??s?MGF?V?{X??
?? y??????p?????a?K_???1????Gx=?t?r
?0???w?_??????\???D?9n???;&??O??^????
OmR?%??!???:LY[??V?j?~???7????~????????I?R??
??A??Sb?#.???-?????\f????5?wv??e??[#9?H??}?)?????{?6q??
?{??N?{C?9?w?3=q?ue??????M??or?~S??????.??;?TK??ln
bDR?X?? ??;??????M? ]?n??
??aoS???t?ca?a?89=?}{r???59??GI?E?.*_????????/rP?Np?H?73????3???w????9q??Y??????????V???f?B?'??v?H??&y?h??????????|?????????!??????uc?5???E?7?6???	??9??+?=f?????^"Zh?'W?7_IU??????f????
??????"??(???7DL>K[??X?{?i/?{=????????o?8c?q?}
?0??????;^?,??i? u>yE?
???
?????B???+???'Wh_?"???ib??????
????????????W?q??K!KC???B?,?????`;?E??????/C??
q????w???????4D?%?<?i???w?o"?3*7-i?????????,=??d>??JzPN??T?q??????	n????+??f?dN?!??#??,,e???\?O???d??VP???x???M^t?h?C?N?=X?!iP????"?????m??-???`W?!z?$A?!p?7?<????"
R????{?P??/y;?M+7??nJ?y?TL^}?w<???C?V.+???
?/5????x=E?Y???y ??7?q6???EiL{$4?]?????????????????=???>??o????B$??r	???y?U????]?t????1?Sr??????????/~?$???????-I??Dj??WwZ ????????D,V????~??r?H???x??A$?-t??????|???O??F8?;???w??????Qr?&X??~C??@?i???R*{(?????????>?QV?????vt'??u?}1~???0???A????z??s????DY??!/:??lin???S?r?*-?n/_?????EZM1???P??%????hI:-??S??l???"?????}1??v"??:`)?????????????{:+fgG???i????<P?C?N??e????.?w?
Qs?HRk????????cT?7??L?T|P??????????k5??k?u?m?e??3e37????H?%]>??????????WAm??zAZ?????$?????/|?
,??_8??~???zz?!? E??,?dH?Bl??<????|I"??J??3TJ_^e??V^v{*????^??_?????W??I?6??q?d??t?7n4???&?eS???Br
??O?3)p????#G??7?*?^?????????D?R
s	U??ZXN??E9???????A??7-nR??T?????A???b?????'????M????????????E?+???E2????>?.??)?kg?'g?S?x??H????U?!'???D?Y=]|??un???v??}?j???????????J????nF]<??#????q$???????Y?}??cr?Pzjw?????w??9i??Y*??;W]??J?o"?TL?(?sM]kui??T?$???????A???IO?5?e?r???qm6[JO?h,#k/K?????S??s??u?g?b???siC??d?_MnlM$n]?~h%?!(ib?%{?THV|m?~??K?~H=s[Gx????k?????v????&???????BT?C??'
?M|
?H;????????????-G?B	F??{???w??????W????9?np
?OC?i)??=?????%?-D1d6'Et?X0???n????Ta:?^'?r????o???l????6???k??jO?9??3[??p???+??0??j?^???Vd???Zm?k{K????
?Ji?k?Yy?8????-???v?uN?_???????b???5u'w?KJ????n0????4Aa???Ek?l6??R???r?i)???$?????????W???%9?L?l>???2K??Y3h?-QG
?i?=?N??~?U,9u]4?d?l-??Bf?Li?{?2;??j???jj^u?!
1r????????#?i???^{l????;],af"??B????6???d?G?{?????????H??!o???EEB7o:??e??z?\???x?MG?
F?7?v???WN??E at N2e???N gqin ?H?$@?T??@????W g?j<a ???<.?`??????33?*??<??.<??G9~d?K?#
?kE????0??!:>p?c????W?m??;????lT?J?#P?'?
?????-?????????s?????k?B?????m??x??|:Zb?H ?i?C?????F!%???U???!??F	@h?Ah?FB??Om?VB?{????? ?
???Rc\%?????3??$f??????^???nt/?nh???????Y?O~??????l4?M?3?H?p?p[?D`/???}????Y??D??l?F?[???x(
??!ndi???S??XrbA?F?n?V??B?k?????o?m?k??m(X(?\>o,q"?"?;U?4mAz ??u??l??'d????????Pv????=?X[X?-k??$X??f? 5?A???H at w3.?woJ?mt)C??[i0UWl????G??s4????~???
???m?L??GO?3<?K+?	\??iY%i2-I	?????2?e ?i?~?B??J5?$j^z?+?y?????u??e[a?@?BK[?????z?KZaQ?{??????T7??Q~?w????7???g????L?6?
???+?*???Z{??j???g???
6f?I??????!Y?gb?????@??(?Qh???w????X??xvuZ?????o???>?B?_?,2??-R?lJ?4???g
?z'<??e?????A&??Q?K+UE??}j?????"???@??W????|[B??Ws??j??
??&?,???,????O<??A?^h)j?O???~?Yu)????h??#?AB?#??h????p?6)N?{??|h??A~?$??"?)?G??*ei?(Kr???PF9????Lz
??n?|q?,?c ?l?w????Q??[????9 5???RcO;/?d#fO6????S?r????ni???m??H;7c?9??d+?G?aNo??`?????????T???V6g??("?B?6?
?_-????????M???(E?={<+%?K??G??z???X? I??q???x?03r?????-k?r????/^?B???_???P%p??Bv??~W??3???M?+	<>-?3?u??R6?5???U??)?s??3?"?gj?@?@DS</t>?X?\@????.:????????K2?k?~J??2}?0Glv_)?
6?)z????h?G$?)F????????K?T&?j??%q??????o=?xz???Q?????IF?Y??T?A?S/??????:?im?HA? ?x?&???p???!??=-????u????????R??k?.?F???!^
????R?X;???z?#?#?}QJ??}??-???3X?[Ch?%??S????b?Z~?????b#?dM???u???*?qGk,???FNIs?I?h
?5??8?]?T?,D_F?l0??:
es?Y-YC???,a?Jg??T?[|,?Z?o??????u?-c????^??<?]>????
?	??Zy?bv???z?/??\?0r?`?V]b"G,(?Pv???S????{?cA9???U
??M?
g}QK??Rm????u????K?s??mkD????eim???E"?? <???X????????K???D??Y?H7?l?????6??????2?i??[t???[J:)
?Sk?
"??w3??K<??L????Ao????M??M?|Y8?5%?^??????{	[Y[???
????L??h??Q??T.?%????lQ?V??~g#oI??&????e?k
n?R?|?|??\??e??*?++??[??&!?5?bm??q?H?r??(????G67@^??]&?T
??4?????#qi??????o\N	???`?x?d?H?"???????a??-???????
??L?e?j??S?????[?nb??P??_?>?B
?"as???p
+???k???~AzU[H???9mo??d?E??1??1?;q????O?R????:????E??V?Y???j????x????[[??^????c{?)???????{J????$,?K?.[?7(??=nA??A
zRLUb???h?A?I?????9:' ?CQ???rr/3?o%?<?%%~k??>-?r???o?Q??3?u??~`c?????p???m???<t???|?U?L??	KOYbI?????&?
?&???,??q7
q???z???Bna!??z?)???????U???[	????????????>??????4\g??????yF??5??B??4s????q6????g??.??I???M;g?-S+f??P)?.?????.??A?????q0??z?n?(?+????????]
m?S
???j?c2&!?W}??Z
?]????\?'df4???Y????g??r?Sh<?5V-?=&??+?'?Y??
Q?s?5?
~?|0?OJ?$????p?n=?a????
mcq????????BY???????-??@???
??J??zN???h?f???B?Rm??o?r?Qg/???|?2?4???4D??SG??????#?
??????vS!???
?z1?R?rt???????m?`???z?
?Z?x????3?????x{?ZH??j????^?????B7?? ??v~[NE?
?w?g?????N6?|?9n??{??=?47xxm?????G??~?:???[?#? ?*	$??$???%sF????f????"C????P????a??W??>?U??~?o??/???4??s?%3?????=?????[f??Z1??&m?8X?_p??0??1??Pc?!????n.
?/???????~
???6;?<??J??:T~??H????ESe???f?K?
?r?????`u??-@G	8T|0?#??^ ????9?????\*~L?9??H:?1???h/@???0???4??????)??????S?lr??N/??J?Sz?f?????G?1?5A??V?f??q?s????R??@l??2??nC%1mVD?D3sb??mz???P3??B???3????vvA?j?uC?$-?
l???jN`????*?	?T??J??????W
Gs???Hkh??Ts
?-`@7a???????GW}?????????(?q??F??}?E?\@`n?%??|?8m?zM ????d&WN?]?
?u????M]?t??t?\??t?T?!?t?*??yu-????Q?
??
??u??l`?
?\?]??w??;@?
?
??w+??K(?-h??}??*i?&?.8?.
??c??Z?? "??h/
????{(-??????????dd?Z?f-3.p=
?????tZ*??:???|?gk7??r{?I?W?d??Z9??eZ???v?e??I?MO?#?Ur]?
???????Tv??`(??wv8?]??ok$?]?eo?`??A??????x!_"?<?E??'???$?O?WYx??????K??+M??iRGv?5?Y?2??m????;?I?s?~v???????}???T? ??*L4?X????O????=??????????e?L??0???"??????r:??????Q??.??????`??#p??F???lS^??????;0\??9mR?{?VO]????/??(@?
?T??,`?
?n
??%_&??$U??<???[?J
?
?o
?o?~???
?o?~???
?o?~???
q?l??????8??
,`q??U`qM?CE,n???????C?H8[JD?p?
+N???pQR?L?T????r?o?????**?J???X(R?JZ*??y?q-??
z?>?,>.`??d?q?&?????|????|??K
a?"???
f.??90s???`?
?9{
?'??>Xs??????g????>?%?????f???5!"?????i??r?`vTLZ?2^n???;`?l7
6g7??I??3-?A?*K17v?iB?@?Pu?\??s???sR_~?s????:j?M/??
?\?\??s	??
?s???????|??
??(??????????
4w?t9@?
Rn??r
C?)?'t~??????gG???????.N?I?I??u???d.H?^b???????1a??O??????????=GH???????o??=???~??T??W??+??2}W???????au?5????G???'KoKw.??63?w?y?Y??2?
E??>I?<){[??Y(??GS8???22?\?V?!?C[?((?\????v?U?????js?Y?????^?'??f=???????RW??c????X$}f	???? ??}
?>???t?L?"z????6????.??&k?h?P?ofj7M???0???0???Q?Q
??J?Y1f?Sf?
3?$3*l???u`F?	cF?????`F?aF5?Q??f0???(`F?t?fTAY???
.`F
3j??Q^??QQ?Q??f0???? ?? ?&;??J9????Bk?????M??L?????I?AL$?1?[????9?>?C]b?xIJ??????!?hr7D????Im!>????8?dt???????T??^w??{?B?kgp??=???vO????$7??)V?4???-?!?[?Y99[[???#n?-?????Kf?W??`??n?s???F-u&g=??gv??Q>??;?y?????f???X?C??i?$o3????:&??S6????<XM??ac?[|E?W?????k?i???Y?????????uH??Z??Z??ZW??5?V%??^??hFjb@?o8??Z?L?j????%?V^???,?h[dM[????]I?DZ?Ax??12O?rWjF?%?b???"?K????551o?M?p???O????n??.~n)??4?O?]7??????k/-?0?3????????65j?7??e?????+??T?\x??p???????jq???>???w???'XM?#???%yY=??^?A|?#?*g5?|?s??%?\??????????+K-{??;?????}mTu???`??????(??-??%9???{?E??^?<??F}??x???u??[U?3??P?;XWk?0?y?+1?.r????;}?H???Z=w??x,???7F%?y+T?h6???4
?e?]???z_??<??N?u??/?J?Bt?`9?&???,O?0q;8?.???????U.p????kN?????T?o???????mn?4??????)??~?x&?qK??|iC	m??V???+%?RsT?:????sj?v@?j????KR?]??E9GWy8K???R9KG?Y:???O4"??k??v???F?|C????o?,8?<)!Rw?????????????d%A ??R?<?? ?{?|??A??q??Nv?????s???$O?,?D?'?L3??`?>{??\^??_?R??+yr??????}??z?
 y????5??o???????f?^(??w?f)q?8m???OY?!y??sy??dl??t????2???????JF??????????W?m$?f?>I?????J=X??s?,??<??????F?Rw?k	U?????
U??<p+??????O?????H?!?"??RU?7??k???~AzU[H????H:?N?????*Z??P??\?H?'Z)?w???:???{???V?Y????.??m?&om1O?(??$(%?????0 ?y6es?@?v?0???1+]??o"?Ll%O?z?D?Y??Y??g?W
?6)f!
0-?1?L"?,
yZ~g?3?P?R?$~m???????UN??C?.??V???S'J??_\??Q?????R???}?9???&???T?D???????6wn???2?7???	?!b????x?d?p??'???0???q?;
?Mq<$?i?5??lO?????,R??U
?#?4K????G??u?QkOn??????{s??w???
eO??q??xDm??????U??W???s*?G?5{??*?jK/|K???l{?t-???????????i@??<????[??8??`[?x??i1???????/?/G??8;????f?L??????7?N?Z?????????????V}??}??o8??)??????i???T4???y??y6??8???d???????W(??Ls??????~y?M????????~,X^%?????G?d2IVx?77?,?NP???m&(	??K???iA????[\s?M
??hC[2F???@{??ka??????BZ<????W?%?:?? a??$???8????K?9?b??5??8?8??9\5?a?J????0A??_?????????9?P?K?@?;???l???????????????5??ib???%?Pm?#c??_?6(???ESe????????
?{????1??}??1??G?@??=???y???????Z??sA}?1u?(oR????(?0???????c4??<?Z???<?*?O?O??}M??WtB*?Wz???,?4?g?>Z
??)P?r?:??????<?m?"?um?X6??(I??R?$???\?G?S?vr].?N?l%???,g????k??????k'i?????P??Ws2????PYMh?R.UX^(????t?Rd<??<??
P??U|,?]?j??v???`?
???5????? Y.??nUX27?Ds??rM?A@??;M
U
o???i6?Y'?????J^K]????? ??0Kh??%?????Y????e??3G??=??t?v?O6YS?$???3s??A?;??O?-E???-?%?????j?MV???????????R%?Ra?vu??[*L[??l)`K?[???[??x??????-l)`K
[?????
???mp
[
?R????b?????????-?<l??0?A at 6???T?)??ZKm&????h?}g??w??ORb"?????*V<??????+?KR
^???m?
??@??!??4?Nj?y?~?)&??????!5??b?P??3???_;?;????(&?{b&???%?I?\H?????t?@A???????". at Dq?l?6???\2????[??u???Hn7j?39?q??8??D?r??????&%w7?>?B???N?&y?	???!P!???	????h????+?%?:???<X#O?`?G??????T?%ph??Cj??x??
???
????r??*??????G?0R?}?Y_?Rg?T[???o](???R?d?D? k?Z????JZ$??
?S????y???R3?.?;T???X?H7?l???yn????~t}Bf=?>p??w?sKI'??j??Ad??nF_{i????????=?
??^??Q#?i?/g?f?\^??????{p?????OU?;p????Qd??3d?<?j???$,???????
???U9????w??,Y????????_Yj??/??W.???k????oV??????F??o??.???|?;,????????4?{_????O?????D?j???Z??!]??_??Gp?S???????G???????F?cq???1*?[??E??m???	?/??]????2X\??	?t??;?~?T??{??5i
gy???????t	?
??n???p?k??>Xs????e?|?pM&.??lsC??-??N7dM??c?37?[*??K?Hh????Ou^)Y???*?}???e?51?4???????
???
)r?.W????+=???Yz???#?,	gi?'??Q??^B???I?????fPGU???????JrL????Z>,??b???K?C?F??IQ??T???????aL??F?>;?U??(N?N?D???f?*??E!?N??????b`???U?yF*
1w#?89}u?????U??|O?t?????????]?)?f?^(???g)q,9????OY?#y7?sy??dl????~??>c&q????YNK?????????RTI?????
???`?k?>???9K??<???????]F???????C??? U??<?+??y???O??P$l??YNa?*???????m? ??-??l?
s&?g'?PdJ?C!-nL??z?x?h??$M???	k?B?AH??cm
\+??e??F????G??????o?oC??nP???0O?i9?? ????*8????KwE??????p??!
?P??#????!?)?
?@?r@?$?]'?
???????????h?6v
?y?PfG????;x????<-?3???K?g??a??Yd??*'??!{E!E??? ?(}??q?LGm???&J?%?????????v?|Q???????F??;??Ho??w???	?Eb%??($?dp?`5 ??f????????g??u7??????:????|?#??=??t?#???????G??u??ktn???????%{s??w???
e???q??xD????
???U??W???s*?G?5{??*?jK/|K??N#??????g)cKq??{Ks???y?2|??t?q&?????;???t??rG`?^G?????????g?R??2?^??????;?gn??k+?^??R??Z??_??W?????x??????????S?,????????B?? o???Ov???^?`3?
^????K?nZ?H???t?c/?C?(+???????}%?L????]f????P?s?$T?-,e?w-?2?=U??[[l%??=)?'?(l?t4?>?A?q??Qs???kEs?c??q??-?"????9	?9&?FsD?o\O?\|c?c??
????oD?o|???[4?k??|?]@???~-gG1d?f@?????/?1?<5?????z?v?O??????????
????
?<#??L?:T~??
????ESe?????@?
9?????????,55HYG????M????y??H????Z??s???1u??o????(?r?
-H8?9he>Z?j?)??rX>?????cC????L
m?X6H?(	????$n????S`} _.?O?l???,g??????????'i	?P{???	kN4????*?	?Tx??
?Gs?'??zh?I?s?? `??G?3???o:?uo'w7?|?le0|?|???=@?
jP{??UP{?^???bo???<?\?;???v0BWW????k??%
s? ?<???L>^??_?&v?????*u??>??
GW}?2??????????=?????/+?O??I???????U?????JV?	????qy?c?=???u????}?C???????*?^
?f?^+=W??1????????v???m+?q??????p?r????
r`a?c(?@E?U?'?????U"q?X?
?2L
)?2?
fS?q&?1S????Ag,???X?L2i-??XZ?*??S????m???Z?$'y?5???N2p?????'????I^QNr?jo?h,3?w?8?1%SG???-?",???$'!?$G?
_??#HV@?????x/?c??d?e?_6x?????5l0&k??"?5?(??V??z????d-?dM??\3N????l???&??&+0Y????????H??
LV`?????d&+0Y??
LV`??+?5?(??Ob`?????d]&?3&k?????d&+0Y???8L??'gXA?5?U3r???Nc??d?XV?UaI>???Of?31?
Qe8kL=?k??.c????>????Zp??S???g??:???3???????S????f?P???????????!m?8\?_??p???r??$N????????Q?8u?8u??NNp?V?S?B???c??q?|?Tq????????Q?N?#p??$f????:??
?8u??[N?eo:????Y2??,9??s,:`?
?Xt??UXt
??Q??E???#G??;????_L?sR??T	?S?a3?0u?F?%&?o??|V?H6?*
TDw?":?;??(??
M,G?U!?Y??">??TE$X??S?r$P??K?t?v??B?QLv?IH?????????x?-Q??h?%p?U????8?{x??????}4?6'??%??G?l:
7?????????Z????????f?A???\/c? ??2?????V?qc?????
j?
.?
$?Z??7P?
??!?x??Z?Lc=?AZ?F????b???G?2MA???????f??,??d???
?E???D?>??6Ce5??$?????2?e6Y?a)|??;????C???t?]~?B?]~?E??J=?v??? ?,???3'?B?]n,
??{V???????9D??????G??\e??
?pw?????
?SrV?H??b????[?8?@??;???????`u*T?u???|?k
???%[??wh9?T?SN??]D%??q/_?	?????????\??T??U?hE	?he??)Z?~??Y??v???O?lz?????{gg?S????F??YhvtVm?>!?+p?J?)@??9f?8R#w?
p??G??3?TG?i??p??&uV	?8R????p?V?#7)???)???$<J?,=?k????j????^??????c??:??? <YN???&{M?`??k[?$??<?&???4?I.:?2	???0?
?????-??d!??"?RK?f?YDlISm7xI&U??l?%U?'IK?u?~?>HW?stu????????:????????G???H??-8?hR??
	?H??F????4_L-???E@??Q:?a?R???????Im0J?G??y??R?J%??+?!K?#b>)?0???7O?*@x?????y!I-I

?T
B@*UD*?????!?B?"??J%?JI??J?: ?Z?S????T??? ?<?#?@*
R	?J?T? ?
=?T?
?H%@*
Riy?J~L?!hQH%kpG?ZIo??0?%0Kz?????T?.Y?????r$???0&??d?X2j???.|AR??\?!k?d????n
?v?"[?V9A?9??g?????B?????K??`:j?? ?4Q????:??g?*
??Hc~?Q$W}2??^#?U??7?6?SUT?"E?????3??l?????
Oxb?[???????'v?<?qi?T(V?(??@K??d}'~s;?????p'AI??#X???"?eH{??e??????3RxFF29??E?}?vbD????D??b??!m?8\?_N??0???1??jOC7????t[??P??P?0?????a??????5?h?L???$NM?
u?,=p?gM??	\=????=/??t?QP?Wp	q???l?cRR[?I??A??x??Z???r????6?}?????	?V??U0S????~?T^`????????7??2????
o?w??{Q??,?+SB
??L?A?Uxp??[????????g??????R?2??u????t2?.??e????Y?h7{5?j7[U?l7'?.i0?]d; ?
??v?Ld; ?????v?2?5c)?]H
w??yp
??*???
>??&????ic????hU?c?aO?????u+???$????fW???0??jW`K(1???\?P?.???^[D?j?$F/N??g?.>??e+??ro?w????w?2???c??RXE?TJ?}h?N+?8?0??V??
?
F+ly at +|???B?(?<??h?h?@+\9ZaL|?%?>h????????
??g at X?^???#?A(?Q?S)d???+???M?aGu??O??5??jzy?<c????jH??C?????
=R(8????j??-????GM?????M?ol?~i~???yf7??Uk??](??p?
?qVh???3?a??BA)j?Hm????O??Xz??'-V??AYD?o???B???|J
#jG]l?p_V??????~Q?g???????d????B.@?q
??)?rxP%?d?P.?`?V??l?TN????d}s???????8?;?????J?:^h?NW1???-?#?PV_,Y?BU:?)-??r?+????y??s?G?;
?Q??u????Im2?hTH??-G-???mt>????F?3?0????Z?
pF?3
?Q??f?8pF?3??^?@??1P?h???
?
?1Z?1?1?h?r?Q?1F}`??e??1??c???!0F?1?>?Q?3F`?c???(0F?1
?Q`?c?k??8c4?(0F?1
??%b?&?1
??'?%'u???zh?h
???AE???l??)???V?F??????.@??$??o??%}i?O?:=4???`a?P`?;???]k???v(?C?????P????c???-3?r???m????-?"|?b????
???c?F??
;4??????
;???C?;t?????C=`?;??vev(?C??Z?:??,?????3CK?B???I
-?	??Z????PA????????A?{????w?a?? ??	-SLZh?r
??8?4?
?P`?;?^???I)!Z"zQ?X???l\?\Y??E????PFg?4?F
6
?Q??l`?
????(?G
=
?Q@?z????(?G
=
?Q@?z??????????G}@?z??s6?G
=?$??M?M=??~???e?0??v?H??
?h???1R???U?\?+cq?cz????>vc?G???=?wUE???
?????O??T??0???y6?@?A?=cPIp?AM

??0?ve*`P?A-aq????ye?F??/?$???+S??NB??????lg????
??U5inY
m?"a???s?V?+??????e???,??Z?9
4??@C???
h?@C*?P??
4T??
h?@C*?P??
4T??
uNj?i?
?P??
4?9h?@C}?4T??P[DC?3???\???dn???z?:9?8y???k?R8S?897M??"E?G?>`?????}??>?? ???H?yA?f
HcF m5?@?4ts?#?z
 ????@ ]9i??Hs	????H?= ?>9i?????$??@?
??@ ?+H?@?xi?=?}?T??Z+M-?????f????`??#Dse????J>44?gIZ?Y?<???????G??
?0dP??????].h*h&h
tx???@W?
$P ?	H?@(?@??:(?@

(P@?
P??(?@

(P@?
P??(?@

(P@/?*??(?@

(P@?
P??(??????X????sF?geAJ?????U??9??2???E-??????L?,?
3?????{???@???Zk?M/?=??	t???
?'?=???W??tOt?%?M?{???@??'?=??	t??g
?????2???@??'?=?.???s>???\?y??30=K=?????,C?????
g]?\F?r??b?
8w?`?]8D??P??????UW??UmN5+T14?????]??g?t|vz?V?*??N?2??I?YB?KSR????
?c;???g??d?5u?dX<?7?u??0???d8z?	N8z^??=??%p5???q???r??8z%9za?v5?<G/LG??=???G??(G??x???p???=??
G???p?
???mp
G8z????b??????p????<??X
?d'SS)Ol4?'v-???B???????)??}?I=??;f?s?X??>G?Gw?K?j/I)x?:"?7?:M???7?|;?-??Q?????>_3???P??1B????s?Zh|????GW???v??:??&1s!????{?H?$;?A??K<W???-?~G??????A|9$7??N?E????9??vq??:?????3;O?(c?H????aRrWO?OE?C?????n?????bU???|???2?2???x?I[<l,s??????x???-?{<?4?qz?,
~p&_OU]gr?:?Fh????L???L??+?LQ?a???hFjb@?o8??Z?L?j????%?V^???,?h[?eM[????]I?DZ?Ax??1*V?rWjF?%?b???"?,K????551o?M-a?~t}Bf=?>p??w?sKI'??j??Ad??nF_{i????????=?
??^??Q#?i?/g?f?\^???????
[??%?I???^?On:?2??2J???#??e.??Q1s6?_?Ng?\?q?*???5???\?ZvP?w)?Kwy??$??`?????[{??X???"??y?G8?????;,??????????{_??????????D?j???Z??!]??_??z??ap:???d???z????X\=co?JF?V?n?l`?k+h?????ghI??IC?e???????^w:?S??)D???sk?R?vi???????]??;?l?ou?w??\+%???????K/;?[?[=?p)?z?=?lq?w??k????+^??A?R9'_??EB????|??J???U???K??_??y<|?n??A?n(??+?9?Q??????D?}??(4?Q??Q:b???p????)aM|???-:??WI????J??9??:#??????d,I^????9G '?VR`$<?? ? ???|??A??a??Nv???+?c?????P????I????9H? ?Z?y??WE???Ty?????:?x?A?s???g.%x?cu|?+4???Mf??Y?J3?m?Y?E?O????S?M?d?\???<???/????O?FI\`?*C??R?O??z???????E?????A???p?k?????9Kz~~?)??wY?`B&?t???????V@?*?M???????'_H??_$l??YNa???????????>???+L?t<???C?)!?r-nL?sy?x?????k?B?AH?ecm
\+??e??F????G??z?y?F??0$A)??????N?????q??r6w?????
?&8?F?:"Q????5e
{?????|?U?EX???J??-+*???6)c?`)w???-?S????T?o???J??\??6|???
?p?G???0?:g?K7sc?*C??[i?6
(y?^#Q@
 ?1Z?~??:?I??N\??Q?,?????[??
?,?dIr
??)]??e??*?????W??;??Hi???f?+?????/????Z?????S??)? ?>??v?U0dg+??mW9???e?$^?f?????????g??{7E55	B????l9?????iR?????9??c8, ????:??[?
???\??|?+A=?r?|??????
???????o{?te?????????}??????y??}??t?q>???
???4???^?,^????????????]?]?lS?\&??T@?????w'?#?[??????????V}??}??o8??)?????i???T4???y??y6??8????P?8?
?u?P?????m?{?%R7#Vr????G=!??!?o%q???q???????????*?%Q??n"m?2NAJ!H??`KF?Yw?h?5?wZ/3?q???~L[<
4?SBc	Cc?t4&?z???0??N?r"X???&?0???z,?
?Q?????????~&g?hd?f?>#????/'??]????V=]7?'?y??I?Gkb?????d??4C?????:T~?????>B???????UF?yze???C??&?????^:??f}VM/??pLS?Y
????????u?,??x???1?~
?????=??l??.m[9*?hL???LL5????DB??S0iy.??????K1??p??_-q?????K????o??
??#0%?????YZ1???*?6{?"??,G{????*9??)?Q

x?3[!?z?J???r?d???t<m?T??L
?QAM?$?l?jJ?? ?6?$??ud)???RzX??6?(E7Q?C??+??<??_N#??????M?Sj.?P{?2v?ic@??????jUz???;???M?????-??Bx??>??,??J?l?f????
LS`?^?tI????ey?%h?+?2??d?BS???(?@1?)PL?b?L???@0?)L?`
S ???@0?)L?`
S ???@0?)L?`z	S???@0?)L?`
S ???@05L$??N	???s?Kg?$??AZ?*???VZ?U??KsJ?%g"????Y????`????@&2?Zk?M/?I?L
d??#2)?I???W??dRd?%?M ????@&2)?I?L
d??g
?????2???@&2)?I?6??4?t~??????Ig??V??>??C??,?t??????.?>:??????D6?H-(?}????G?=	??@?(?G??>j??????????t:}?Q???G]b????V?G??V?*?G?>
?Q??}??@??????\L-?(m?
}??@??K??}??G?>
?Q??}??@?(?G?>
?Q??}??@?(?G?>
?Q??}??@?????ZMeBd?IeaB7}4???9?Py???n?R?Q?P??M???E???>xK????????G??????@?(?G?Q?lz??>
?Q?????G?>?4-?"?G??"??.?n}??@?(?G?>
?Q?????@E@??@?(?G?>????6?eUP?>?(?4}?T~?>Z?M??>???N-???rv-?????%???b???????????????(PG?:z	?????6u4*??Vb??#??FW?6:kteH??}?h?|??
(c4~B??g??????c4X9????>0F?2F?M??1??????]????	0F?1
?Q`?c???(0F?1
???e?z?1c????1F?
?1
?Q`???@????d????Z?j=4c??Y???"]tf???????{+T#???D??D rI????????4?'T?rzh?0z(?C?
?P`??????
;????mPv??v???C}????d?^????x?Z?_>?
?Cc?m
??????
?
??Hvh????C?
?P?2
;????-I???`j?|??????y?g??$?????N	]#t???E?A???
??????Tc??Q?Z\??X????P??/x???B=?{J?P>?K3????q??DH?Y?y_??jY+b?$rZ1W??|?-?1?X??P??/??:?V?
0P??t]a?A?a??@

0P??.4?0P`?
0P??>Ih??@???*f?2??a??L?FZ?
?X?U??????z??^6Q????????)?ta.HPu4g??9?y??r????
N??????|&v??\n??????t??c??H>R?????dQ??x-?+F?)??
?)?s$Mka3#5???7[3??
?q6?J?=?]?2?U????S@#~i.??5?l?P??????N?8M4\ M4???V???]G????(`E?+6??c4
?\?h????XQ??V
V??+??V?	X?<????>)V4?????????F?]$V4?X?&`E
+
XQ?2
V?????Y;??q???Q?????????|.?C???qJmr?????/M.?g?!L5????k:;??!?B???;w?i?3?dj+???V??
Zj/E???I?L?i????i`??h?M?|????)?W?Y+Q?>?V!
 Q
 Q
	?M??X????

*@3?2J?2??L8?-???/;vi?????|??5CI?e?wx?]??+S(???JkI?!,?E?+?2??
?I??$F?R?;??z?x??P)?R??*?J??Y?]Y?\!?i??I??P?y?W
????XM``???l1f
N???Y??0T??3??*fY*f????:P1[MN???	T???b????
j??`????,???"54+d?P?H???RB??=?}?
??&??7????:??????????-W??PF+=x???(?F????<%N??{^?%????^?Ho?H??^:.i??v?XZg?????\?f??M?
?L0??`
S ??4???`
??o?,??H?~?T??RM[O?jp?iT??T??QM??????j??,?4?]?4??jq?iTS????4fTS?
TS?????@5?)PM?j
TS???tm??!????j
TS???ty??A?SM#?????s6PM?j?$??1e?4??????G*t?r???3?0O????6???$-X??Z l?d??=W????,=P??Z?p??4Ug??8?5?????@g:+?Y?????g?tV???;?5?t??:???Y??a?,3+t???A??x?-s??
su??????M??>
?\:k??t?&?Y??
tVtV????5j4??:k?????5?:???????u?t???Y}?????ve:+?Y???Z?f?????[??-Oq?R???Z.?Bv]6+
??Z?N?V??)`??,?F?%??????B6DlN?s?b???l?`4?
o???g????????q/??G
????|????W?m????O???BZe ?5??u?d????j??H9?RWL45?ju??.???&hx???)@?U?X?$?2o?Z???@`?s??&??/?b??+??mW?W?(_5z:|U???U??V????????W
?Wm_?,_??]???WMZ??
|U??_???W?*?U????|? ?|????W?*?U????????_???W?????
|?'?W?4???<_U?G?Q?vcG?}7,?4,BOV{r??^?V
c?=?v????'V>??~??<O?iq??NG???M????J-,P`?X???y6?@??=?@?VLY?~,??c?22e.3?r?X??O[<^j????W??J?=??ts	X???X???@?
,P,P`??4l???
?????q<??U?????????C la?@??fr la???\	?i?(m?27C??L?s??i???????A?17?Ucn?M????Y??2?fk??-?37#`nss}??
gn???	?M`ns?????&07??	?M`n?+s3lr?f?M`ns??K??lq?f?M`nss??&07?$s3???F?????i???h3?,LX
???V at 8?$T9R???HE??*T??\??BD/?|????
?0?'MC?????????f?
?P??'8???y6?@?	N?=sB??g?pBW?????x?????	?i?'?en?a1?'4a??????????	?'???
?P??"??'t?8?1??6???	???'???{?	}r??????8???????N(pB?jW&??'?>9?6???*?
!*7K???*j????>??Cx?&??@j???(R{^?4'?$????Ib-?R:+?tf??}?F?*
T?%???*????????????G?????8?'}&?F?5?^?? ??as?c{L*??m???=??????????DX?^???????R??|d??^
]?g??ZN?)??????&x???????x???t?"k[3^?????-#??????D???umz???bMs4???j.#C9?E1j?;D???.2??E???jWY??????6?????E?.l??N:>;=z+u???(u??{????,??%+)Hu}_?????6/?????????c???~???:????;wx%??????ekq~?S\????z	?6
P???{
P???6??1?d'SS)7p4?x-5??B???????)??}?I=??;??s?X??>G?Gw?K?z/I)x?:"?7?tM???7?|;????Q?????>_3??????1B????s??o|????GW???p?Y;?:??&??!????{?H???8??N?v????#??[dKw&!?$??U???"?????u??QK?Y??~????uG$??n^?0)??)u?"?)???vZ7??T8t1o.
jQG?&?????z#?-????+??:??^?\??@s]?????O??T?%?d?Cf?????????????r???O=?=?{?+?AX??
????/j?3Y?-?v??.?PZy??|?m
??5m-Kk?w%-i???_???\??]?I?d?*??
^??U%??????u??C????3?"$??
?:_?7????E?<???/?O??S?[????[:b????????)OaM???7P?\?7-x??lo??GB??Rp??)vS7??R?????9
[?&
}??	O"/?G?%???&v????_)??Dl?s?&9ov?Q?2?J?'%?3e?Fa??"?VB?
?ldHZ*?I?CO_]??z?u?o?{???q???R?????%-%?~~??2I+*??L?erQ??S????U?nb?P??d_?>?B
o?"as???p
??l???????W????????????N??PdJ??\??S?*)?D+???Y??3??[4?M?k%???k?fyW???=??[??^????9c?PS??,???|J???f5???:?A???? ?DB@"TD"?????D!?
?P??0$B?????IH@"????o$?D
???e??`!?K???9h??D]??????<C?r????9?0?*????? ?F?????i[K?Mt?M??E;X???n?i???<??1???Bn??R??3?????7?C????s8p?)????2X????????x??wB??s4???<C(??f?X?<?F?B??????????3?_??i?,?ej???*E?E=?

????m?????t?&?A?i?????:??Sw5f?~W?@PC?I n???s{?????X3>?W??s??q?IA???????g???????.G?P?Z?y?UM?P?S??)?/3??????,	????:??[?nX{eA??|@?X?7'????P??????G?&?Xu???\??|??j=?r?|?Y???_?B?????d??H?N?L>K[??[??X?J?????U??g????????O;??????`a??x)9:???????6]0?er?Hd-??ywB???t?V??H??^O?????C?~?y?I????O;?-??Y???????P?A??*}?9n??{??=?47xxm?????G??H?i???s+!.e!???D??R????????T2q$+3???6????JB???R???_-C??W?.????????c2???????nPlF?b3?d?
wk????q??-?"???A
!C
&??D?\O?\?`Dw?kQ#? 0?!??!?Uc??y???-H\?A????2Q? ??s?????/?w$?????W=];?'?}??I?KkbI??b??K?a??FF*??mF?cM????=??`???_j????
?^
??w??a??uG???@???iwDA-_??<??:sd7	x?c?
??^@?c?A?1?PiV-??SV??'?'???,???hJ?????<??
?0????#?4??M????6A?Be???6JR??D8	??????b??
?K??3[?pz/????b?)?8?+f?IZ"??*7????|<Gek3TV?ID???{7:y?u??44+????????)T?j??</,f6YiN\{?;ft?????39?Z??!??,9`?
KXr???|?v?Kn????Q)p?%1????%'g???(??R?v*)F?WY?9Y?\!?!s?	??P?y?W?????XM@????K=z?s???\6?z?s???
:{?J0???????=??
a???K
??????^?? u????t???????tP:]t??t:z?Uk?????????@?+K?c ?8Y:]???B??
?n}?t??%@?:???Nt:??
??t@?:????N?8?.:???Nt?%??E?N
??SU?O%???++^'KR f>?.?!?*Ts?*V 0??3W@us?????

(@?
?c?"3?????
?N#?Il?;[9???u?%?????>??7ES??p?B???|?g7OUf?F
Q?b??[7'?.f[?q
,??????]R????
?c?M??g??d?5u&b?'?73???????d?P?ZK?P^\??\?
?A?Y1.?S.?
?$*l???u?B?	?B??\???B5??B5?P??.p??\(?B?t?.TAY???
.?B
j??P^??PQ?P??.p???? ?? ?&;??J9???Dk?????M??L?????I?AL$?1?[????9?>?C]b?xIJ??????!?hr7D????Im!>????8?dt???????T??^w??{?B?kgp??=???6P????$7??)V?4???-J5	??pDN??q"??[dK?/'???I?U???"???Gr??QK??Y??~???'r?
D$??n^?0)???? ?????vZ7??L?x0???oe3Xf????fm4i???en??\oV?g????y??#fi??s?z??8???!5BK<pn?Vpn?Vpn]9???Z?D^Jj?G?0R?}?Y_?Rg?T[???o](???R?d?D?@ k?Z????JZ$??
?S???Qz???R3?.?;T?a?X?H7?l???ynj?????2?i??[t???[J:)
?Sk?
"??w3??K<??L????Ao????M??M?|Y8?53???*?(W??o??????jq
??????	x???WXM?)??%yy?x?? ~?Y???j?y?????U??\??k?k?????????~??]??6	??
=??uI????aQn?5????Q??2?,7x]x?V?@?&"T???/?B^?J????????N?`<?l5?V?]52??g??Q?h?
?-?
l{mM?}tw?"_????-O ?p??
?'g??#????D?=PY??x?xA?;,AD???#??????x?g'b???7?y?kr<M?,?D?g}????'???Um?jiU"???U?V?????????R??>s??+?k=l?q%}?1?????P??o??R,??p??????A??p????<????????z/W>?"q???(NK????????R?H??6v?=???=??:?67?,?(0Q????0J?[???`z,s?+????bTp}x??ut??1w?2??R??	?#dV?SX?
?f}q???/H?j??9????
??W??????!Z?????U?H?'Z)?-?>X?"?B?/MhS?Z?f-???Y^???m?&om1O/x??J?R?L?{Y????RYd?Y;[}f??u?.???^????P=?P"`(Td(???????P????P(?PHB??qk
-???L"`(
>?&??7Z?P
?P
~?xqH????K?????????sS?c???????5?1??n???r%Bj???r?jkI????r????rPZ?Q??1???????5?6?bNX??W?B~0&?Ne?%??????`???v??;h??(?5kg?y*?cI???Rr?3?????7?C?????79??Y??P??J?u??A\c?;???9?g??]?h?!??n3??g?a!O???q???R????m??s?2????w??E=?
???D?????K??`:j?? ?4Q????:?9???H2'?
??y????&???5?[c>)p3??p?!?:??a?'J???????3??????????CB??^S6P_??)??d?>??-X???x??:??[{Xr?'??o>?m,????s??W({?????#j?K,B??O?Bo?????S?p>???s??P?T[z?[?\t????
&???-M?-??,
t%???5??o?8? n?m
?????
??rG??^G?????????g?B??2?^????????{w?8?`?N>?????bG_????t?????$'?????Y?c)??l??G??{??/
?
??K?R?g?:	?
??????E????wY????_??u???|Y`)????,C{Q`V????-u?jR?M&z??[??/?????`-?)kat???.?xOTp??ze-?Lr?BM?f??h
?P???4?h
?:h
??MS8????4~??????|Z????z
?/J?r?IV8???k?|j?V>%3j?????y?????%?g???n?y??????C?????>+???N??M??w???8????l?9q?V|????RC\"
s?49?l2:?NC??U:???J?sU?9CJg?UJ???V?\~/???\??3<tJ?V???F???k?Q??oP??+i?`???*???J?uW????n?r?Fb;???U??;??Sj?+Q???vg?????IoTt???D?????`?\?W??F9W?o=????Q???C-w?j?
????W.???g??\Y?h??*?`?????b8???z?Yeu?dI??X??)j??6p???)???k$??es???=ds????!??N?????U]???*r?R?yR9?"??0V??(??*?FJ9??N97R?9?\S????s??P??c???r???(??X97A9?r??9?s(?P???C9?r???*?F?r.D9?r???)??X9???C9?r??9?s_I9??oX?t??r.??????PV??t?Y?	??????????????io??b?pi?9?!?CH??nG?m\8??]??N??I!?????B??????G?,!???t~?{?'??	??XH ??c?B:????!?s?!?????WB?!]??NuU?TH7??t.B??"?c!?!B:?t??m???????t?Z3????U???)b9?r_[,?)???????y??????????;???wo???#??f????f????|1??????i-Q?	?^>?5?o/?~|?.?E?k????*:??????oqW???)V????l??????	=????7\?L???<Sa????<??3E????B?=??nhK?-%E[?.??2?
c?NIW????U????I1fJ*^R[???'???????k=?????????v?9?'???????v??W/???v?~???2????"????%,?zk??x_?X_v???x??u???#??m???????N??)K?F?????????-8Z?$+???????z???":jg?{?0~??o?Ej<V???E??Ej$????=?H?]i???H5?H????~?	??S)?/),R?a???h??$?"?E
?),RX??H=-[?E??,,R????.Y????H
),RX??Hu?"5???V????????u?Ai\ET??????????????h??P_??skr?s???}q?????(%?}]???A??_?:??????K|^?~?R?/?>??4?CVc???~??(?/??W????b?X'?9????"F??t?P??(J2???????-??????V>?\??k???????D ??oJ??=?:???;?W???????1H??`q????e??I?CD???????M#??C??;J???t???(ju(N??r?????:??9jU~??~ ????X????U??@?@?@?@?@???XC97Y0?2S??X???P?p???3U?????c?Qr??k??Q?/??????v????w#????wH??????s0{?u??%?????B?z,Y?F6??i?	?q????G?lO????{?s?H???????Q??????<-p7[s?????????????}?+???+?f6??q??????
???GU?]?
???Y?G??\?#?????rE???-?b?J??>c???*lY?????m[?UhG??utc(o??O?\????R?7:?l-?6??i?x?o^?????????ug????.???<?\G???{?O E?w????2N!y
X???m
j?O???j.b?:`E??ZWx????
?????????,?I???2??.E?s?@?
9???Z??|eG?U??K?L??aS%M????8?X??????8m?;??????3Zh??=
][?G{C?h???
G
?8Zc???s8??C?W""A???l?|???70OE?4)8? qTs???B!?U??????T?????7b???"?G??(1????	?????I??JfsG?JS?b????+4q??U5Ma?FS?o????=???GG??~G??

???3j???@?zw`/Tf???-S???e????K5???.xvrt?(N????|}???|?D?u?d?pYj?S?/?{?k?CM^?????L??3???8M????KN?????
R????yHJj??X?p????&?pO???U??s??S?u?qZ??QI9y??????b?xg
??u?=?$|?n?????????k?^k??????a?k??o??U?????h?C(??V?V?>????l?zg?e?g??^???;???L??aU1i??????%???n????R???b?'??K????;???5???`??d?E?>X????:??l??????zju??/??$?yT??*[??!????+NW??
?????F}U?^(???qB?????s?6?j.????B?.Ui???lg?{w??QH?i"u??:?????"??m??wN??{???x????"??????BO????|Nc?????=??'??V[????z?c?^??+Q???????V=k'#?????td?y?vw????????X??O?'.?'?????={????????mP?U?z?VP?`???7/?]mo??V????>??z:?>??:???Q??????????s7??????y?q????3?z??????W[??9???h?=z???p??m?K??P?n?&??????????v??'??^?;???`L2_?Z?Hh?T??a?`???P0???=??????5??&3	=??a??J???@??QJ??`=?]???x???4?&Ji8???????p?|?'8q?0tp?0???p?4s?4~9???s?|Z?????z
????????|?L??#O????=1 at -O???h3?
?/?r?IV8???k?}j??>e:j?????I??????%?g2UZ??[????V??7??v*??x?
?=???v????
?$??fn:??N??????T???;M,??????Jg5?i??R+]???0?Y?t?F:=??J???z{??9?I?r??;??Q???ZwT?????J;X???J;????UI?????????N?,~?l!?s??*?J|q????G?/??l?#O???FSW???RW??"????U??G?:u??muc??*u:?R????u??N[e???v?O??c+=]?~=;]?F"?[QN???CN??9r??4??9]?e????4W+5?'?t?-R?
c5??????n??t^??t#??sQ?5U?yJM7?5?8V????P?m?????t?t??P???CM??5j:?t??P?m??n??B?t??P??????.??t.j:?t??P???CM???t????M??????????$??:U???N?T?Tu? ?+?,\{???F:/6?
W0???
?TW?aO?t?XH?"??*B?0???!?CH??!????X?G?.???r??q?t&V6???*?F\????????$?;w?n^pw?w?3?UpW?0??-E*?+??R??y~?%p'????SZ1??&-$????i?6?F????w?!?Cl??????	?v????b???r???>K|????F;?v?0?a??h???F;?v?0?a??h???F;?v?0?a??h???$6?y?4????tv?????.???f??t&z^,?N?%h??????{	??k?????????^;a??uP????Z?LRg92?Z
??#??????@k_?
D?*U?&?<??pP?
?fU??*U??+??PT??MSQ`w??|%G???A??u???#p??????G??P9?C??clv?(G`&???#G ?@??qR|'???p?/?k:?G??zS????7?%????CN??$1P??????
????8?u?
?g9uo,?^?!???_?????Sg???[??J?????K??G?f9?X?????\?Z?ny???m]|I???G'?]???YY????K?N????5?o??U??i?D'^nr???Zj?[T%??lq???????????????3_?
?9K6???'~N??7??g?F~?\B???)J??I???9??-??\?i7???o"~N???9?s???????????u?????E{???'~N??O?s??|???'~N???9?s???????'~N???9?s???????'~N???9?s????y???*`?jd??EV$i???#k[T????ZZ????V?dE??s?*6?s^O?,????k?ql8]?s???????'~?My?q?????????j?s???L???????????????'~N???9?s????Y?-???9?????'~N???9o??3???X?e??IA?????~?|???z#J???????????Y?e?s???k
??sY?g?*k?s}>+????????V?5?9+6???'~N??7??L?D?~NKB??5????g??????R~???v~?fM?????'~N???9?s???S?.7?s??h???s???????)~N??O?s???????'~N???9?s???????'~N???9?s???????'~N???9o??3X,ma?Ij????F???U??s^[k??9?*??(?s?X?~?????~??p?5?
?k?9???????'~?My?q?????????j?s???L???????????????'~N???9?s????Y?-???9?????'~N???9o??????X??~N??v~???%~N[?????#?~N[????/i????j??LX??i???????_?????????R?5?9????7'nN????9G?????9-? ??YpwS?????,	??N-s???z?J?[?0mm
?
[g??!?\U??>??.?ND??:u???u?vQ?vIn????????j:??p?M?????NMgKM?;Q?N?o?No?4?c4?M5????????LcM???M??h:???3D???M'?N4?h:?t??D???M??j:?I???t??D????C?N??t?h:?t??\???t????????tNnR??F'???
:??????????K??+U?????:??????????wr?c'??'g??(9Qr??D???#?6.??(9?Y??MC????????s???~?????T?p??????GJNO)9'S???clvA??*%?p??%'JN%'J??)9]?????TrJ:!?w???M??????C??N%?(VrQr??D?iL(9Qr^?????? ??>N??v:???%6NK???????&NK????%i???e?i8my?ftc????Z?5H8?n.)??^?&?L???fzJ??%???p?>{??????z??y????7?_??}??47???YMo"?????#???t2?W?^>?5?o/?~|?.???????Uto?e??d??={?+y?!o????K???a???!L(f?w???
[????s?;?b????????|?h???RsKI?????t?????0??+J?j?*dhV???
%/???e??"???????k=?????????v?9?'???????v??W/???v??<??2????"??"KXx??H???????8???&]????QG??{?????S??%6??v??*?9
7X8?=<????^K^t?+?h??o?Q(
x?
3????J?"?MJ?x???
?N<W?*vk?????p?zd+Oq?C?>?o???{??|?{uj?or??q?E?K??I;???????}U????`B~s??K????	I?0*??	$?<??L0o3>???]???p??a?G?b??|?3.?1k??f? ???P?MF ? ? ? ? ??C?U???8? ???P?p???3U?????c?Qr??k??Q?/???r??v????w#????wH??????u0{?u??%?????B??,Y?F6??"?-??I????G?lO????{?s?H???????Q??????<-p7[s????????????j?+???+?f6????D7????B?Z?d?"?????8????????y?\g??????1??~K?Jf\??m??[?Zr??:?Z
???????????2d????cOD??{?R???9b???
??*]?cS
7????e?????m
t]T???????????%f?y????^(???#??rk???&??????????-?[w6??k????e???	?
2??a??^?????R?]??8???w=w??d?Ny???#? ?q????o???ZWx????
???A?C??L/?????2??/?s?
?>???Z??|eG?U?N??Lx?aS%M???;??7
??N[??????=S?l??&???p`g`?N??????v??f???k? ??%??	????l?\?{?yHx??\]?h???????vK?		???6?Pt?x"0??m>q????/?????3,?^??????H_$?????]?????e?J??%@????4?????}x??Nm?????X???????
K?K??3?;?*3?/??)???????????M???;9:}'SGv?C???n=>?H?d?:82??,5?)y??????5??f`K?V/i????zG?8?]??dH?}??}???C?k? T6X??(?l"?j?6??m?>??7iOu%??????(???A??????~M?j??}?b??8C??????PT?0Vd???0O???E7??D#h-]????L???
tk?jdGW??m?????g?w?wD?&N*???0'?y?L?<?^=?s???tv???L??V>z|?n
???[cD??????Z????]?oF	??????a??]N6??0U?????
#??\?:q?p?
#F?0"`D???
#F?M5"?#eD??0"`D???#??O?^(???(???????J??????h
??u?=?$??n????E?j!????8X?????
?F????;?age?*?P??p??|?
k?Z??<?(??A?T?wl?s??e?J??)y-
$"?M?	?????????X???A???(???}?x???6?Yi?
!?$*??:???<t?=?jE?S?i??-?M-?a???[q???g?v??7???????	?m??R?M?0????T?w?x??????KT1???b????????lR?~t?E???E???????l;?????l!?~Et?s??e??|???|Nc?????=??'??V[????z???^???P???????V?+k????q??~:????'?;??pt???}G
?????????E\???=???W????6"???z=I+?z0??????5?%}`+?^dnh{=U?q???(?K=??????????RQF???<??H??q?.7??
?????^m?n?4w|?????y?;??03m???5:?'?F?h?O[
?????????G????wY?? ?P???Hh?6??ai`???20???M??????3?w&?
?????+P????K?8Q? M????gJMX?9???%>???{??{???d?Kkbm?????q?3?????v?]??X-????0????3{)l?9???o?S)?^??P?IW?2?IK? ??G????Eyb?Z??+?y?f?_???6??p????H??+l{JR?X?'?+??k+?K??$TF?????W?5T[o?????gQ??yVW_???Y?s?I\s??r6??8N+????s??-??9w?X6??s??P?*???k?B?*??!???*erzf?P.????~.??~9????i?DW????X?7(U??4v?Dcs?vL????????w7yi]#a??Y????	??)??????]???~^X???????????\.??N+?O?&?\I???P???C%gI?F%7????TrZ@?8??R??f.??*?+?"??rI??M?So]+h`?-[?JU0??g-
Y?5.?v
B??0.P?8a?8?q?JO??n?0.?7S?S???I}?4?=?8/?%q????8w?$qn?$q?DI??H??J??07A7???8I?????
cI\?$I?8$qH???!?C?$I??M??y?X ?C?$I\?$q^,?#?C?$I?8$q_I7T???J?8???????k??pzH`C1[???.??D?\???M?o?p???M?>Do???!z???g?7Do?.z???C??S??h?Do?.k?6K???z?????L?G?77????n?????m??|Do???9????N?6V??
??7Do??6E?vqx????????F?VH??[Y????!zC?fI?6??<?T???)l?7K)r?E??&???-?S??

?v?[?!zC???
??7Do???U??^???,??!zC???
??7Do???"zC???
??7Do???!zC???
??7Do???!zC???
??7Do??L?[?????k+EoFH`3
[???,z?E?\?k????C???
???My?q? zC???
??7Do?*?B?? z???D???
??7Do???!zC???
??7Do???????l~py?lFN?0????S???&7\?? ?C?,Y?%uY?/
?`??????p?SR?!?.ST#{?C???*????jjg?bL????%iTY?G&-$?
~??
?C?t?????????????5?F7?5???`7n?Q?Tvkv?+?&(?Z*??@)???)??@)?vMvS??'?MP?M?Xa7Aa??nsv???P???Ca???
;v(?P???Ca??
;?P
???
;v(??????Xa??Ca???
;v_Ia'?a?Cw%?]I?d?iW??0y???2$???n]5]]??$^?*??v?M???7??w????=d{????m???????k???C_?????z*?O?l/???m?d{?H???]?????#???J?7"??c??=a??????=d{?=d{=????4?y#d{u?=Ou?d?O??????????M?X??#?C??l?????Id{??????????`???N?g??&?^U?????!?C?gI?F?7?DT????P?0??0?r??&?32??h??z+\?K?m???V????3?w+6m?f??v?7??:?v?T??<?v????!?+=?#???r;???LhW?????v??q??8??????a??a7R;?w??r??8??:?<????F8??????a??nsv?r?
'8?p????a???;v8?p????X??H9?&!;v8?p?u?a??????a???;v8????N???t???Nd?{??A?I??t????&???X?=WB??J9??r?{???{??}?K?.9\r?8?l???%?K??]r?NL??|\r}u???Kn?e??F??\_???.?xO|]?q?y?r?M\r?clv?%??%7p????%????%?3????? ?
q????\?Ua?S??(v??????Kn?.?.9\r??p?????????N[????,r?kR?????8?q??m?q#??1|???????i????
i?j9[I?B?T.K?%??V?R%L"?YSc??!??Q??V??J?"?C?<y\??y?-??e?f?8[?V?8)???G???6?C?R?N?6???6??(m?m\Sm?2??&h?&?X???C?9??a??????C?6m?8?qh?????C???8ok??qh???????6???qc?qh?????C?6?+i??J7YI??)??q???????83@??????W??Yc?R??N?r?p??.?????!?C??#?6.?p???](1????b??T??F]??m?N??B??=??V??pn,???????1?8?????!?s?!???n??p
b?Z1???0?????b?1b??"??b1?1b8?p???m?N????????yj?p?L?1?U??$I?8$q??m$qc???&?????e???5a??l??gf??.W1??%-$6?x?n??]? ?i???[?'n?<q?8<qx?????????nO?y]n??+????I[\x{lq?0?????Z??<?s??????????????<e??l?-n:?mq>?8lq?c?sc[?[?8lq????a???-[?8lq?j??G?-.??-[???????b???-[?8lq_??*[?t[??????$+?Tj?????ln?k????4?p??r???<%?
??i??.9\r??6q?????K???????%?????Kn??f???f??r???%?w??{????K.?]r
.??16????c?\?K?.9?.????|??q????TW?a?]r?(v??????K.?]r#\r??p????%?1.?????\?:\.???q?Rq?????3????3n$?1??9??P???c???:93?U$W(C,?????]??%U*??$??u4??q??A??.Pb81b8?p??J????n?.?7S????IMV?4tkdp^??<dp-ep?D?????????????5??)?_n?n2?ep28dp?#??2?28dp????!?C?28dp?*??&?.@?2????X7F?28dp????n?dp??dp2$1???7ZWV???X??
?&?\]?V\?
N{??????ty???k??!tC???#?6.?n??]?(??????B??T	?F]??m??M)?B??=?iV??nn,t????????8????!ts?!t???m??n
B?Z????0??????B?1B??"t?b???B7?n???]??Z/?]n??%7K??n?"oC??)y???m~"o???6B??a???x?<????ej?9?nm+?4?m???r???%???M?NW?J??>O[?f?Q?>?9O$7a??'I?@.?z?*stN????9??#m??aa?e~p?8o???????-?????o?g????8J???Bq?:?,??s?;?|&?????%Q%??~???-?KT??Q????????\u???Ut?;;?????O/s?????????Z?O????<?f?$??5B??8^????//????S???_?}???y????]??????OG????\?2h?]????TH???b?j??54???6?????}q???bv-????/b_???}Q*jWb-j?p???2?.DFE???3?|?M??n4o??1??????2??2??T?y^???A ????????q:??z2?
 ?????$i?K???~?Hsj?|%;|?0{x?3^???????Z???V?vW??wH????mv??]
N??????????{???zF?6????P?%?????O??"???X??I?W???U?&~?J??J?fC?????[24]?%?O???q9)tv)k????y;???k????????[!???>l???.?d?V??$?5Es??z??????eOn#?????????|?M??^M??e?R???c
??X??'k\?{????m_?T??=???Zw]???????,???]???????hD|??????????g>x|??????S%?p'GJ?H?,???u?!n?le???F??7?&??????A0??~{????$??}8??~;???w????LG??q??Fwp??F??=C?????????z????v?u??h??l????????<??V'??H???X??????T????[=?'??E???(??c???????iU?A?m?/?/????zH???*??	?C7??F.?
????D???
?
????[?iv?0??}g0?????#?,?????#?Ni????5hp??"r??f??S{??j?Ef?????n??-?z?(????Ke??V???4???v????K?sm-<Yms;???ru?05J(??
?zKl?ZB?Z?????????z??>????????1??C_?o????E?,}Rs??~??r??????C?rX?N?,?a??9?s0?yV?????k?T?9????1+?????o^?]X??e%V?*?w?s?8????mIe??o???K(?#?lDEeL$?X?X6pE<??'?nJd?<p?u>??:?u??????g?"?7(????,|?J?EZ??/?#J??Su?h????P??o.?N?????3?;??? ?n??}????E'1k:?@??8??=??????M?i??Xm?XT?????v??A?UwK?.??????????\]??p6W?b*QK[??M???)$&7o?.\Uo???2%?cY??jQIM??B	??fM??,M)?k?J????[nVr??'_M?QWxB??QU??Ak9??#?\?&=;^\???C,??k?NY???}'=9????x?P?G??????#???\Z???RK6'nD???>?H?n??	y?????
?.:????/?>}???[bt??#??DD?d2Y	KG??D?vZIe??j??B7?o??%??,?????\??D#??RT!????1M?V3??M????D??(!?
?P?????1??C????/?N?$7y???U?b8J??+?Q?A8??C?[??y????G????????gz*Mj???4???=??|O??????<5????????g?~????W??9o??{??????4PL??I?|O|'???y?i(>	???'??lj?????'????2g`v6???{?o?g`??U':	?*???N??$WY&:a?&:????wS???'+???5?-?????J\?*i;U???????????J\?*i:UI??]l?T%??US??LU?T%3U?x???J?S?*a??*a??*a??*a??*a??*???J????$d??*a??*??T%cWNU$?1?}?	^
O?n?3?|[????_?f+R~BJ???E.???
?a?r?W?9:??????????m?7.{????	V??[??mY?[?l?+?h??V?b2N???P?!i?J??K5k7`K[?7hT?M?????)z??y?0?????????}???g??????D?/?????_e?????.vV??U?????q~zp?D?`M\?k??^U?PU(??
(P6?]????????8?I??T(????T?Mc??D??D??kau???\\7?Z??`}A?4?????
??u?B?`Kd?-?R?0?E?7?-????<?[z?[??n?G??T? ?E????-??n!D??nast??-??!?t??-?[@??n
??t?6V?????)?t??-tH? 5?^84u??C??}?0?#????bay?BM???=?>{b???+?J?0//W??N?
86q???N?
??Tpc???N??N??H:?!N?[?T???SA??8n????Sa4RN?`?S
?N?N??9???r?=u*??S???P?T?S!?T???S
??Ww*40)4?'????+
W???6K?0?????Y?s??????????J?V6?"??Q?i?| :j??;????h9J???
bZm?Rl?N?*??T?W?
g?
??)`Sh`S????B|~???5?.f?"u????7?'r??;?KXk?t??q~l???x|??m@? H"??????? ??????D?^{????w1?/?A??W?3??y?j'?-?hd?~R???(?b????^??????,)f?/?3??=D?????L?s|qai!????LhK?-%E[???e???KIW????U????I1fJ*^R[??
?]??[z??r????Cm?aV;????|?s?ng;?????^k?J+??2????"??26KXxK?
???}
c}?qn?M?6??????Q??3??6??'u?:?\x?t?Z??h????K??O+????t????x\???M??p???x?@z<???
??|???.?A???v?jC?????!???,???????P?????(1c0?,/fL???A#?F??8?l??A???????H?'bIo??????sy]????sq?1?)^?	\Y?j8G?????????+?`?Tp?Q)G???9?R?9?:u~o	??\??????(??????b?ShZVc???~?KZ????U?????????!???X)?sQlR???x?i9?c??*Mi"?4j??????????Q?l??6?f????}??:?V?{?????:?Q?5
?'?U-c??4J	]?o??{i?4?]b?RJ)?E???9???e??&?3??'{<??y????????0??3%T???47s?~}?f?)?2???D??N?&:???4?p,?i&?T??
	????z??v?J?]?v?7JN?xm?<??%}+/[?i?,? Kk??FZ'I???8??????`?@?F?K??Y????f?V?dWO?-z????S??c?#d???
n??=??e????????????d?e????????l?x~???pOb?re?|?r????DJZ?0???U?U+?}?0j?t???U??[?[?y-W???t?????^?s?????5+C?h8y8???t?k?????5?????1V?5'??1(cUw?????:?m
t???B?n?????{????sa???N???[?X^?q".?cU????k??:?*???A??/?J??V]?6PJ??eY??????`6????ym?}6g??+s?#>??-????Z?e??huAd[*???8q?^q???
???xP?
?m?_?????8??????r:?????????E;'?Ym)?N|&OD?=1?N???_\???B???bw??5+??:?h???J?beD???? ?
????E??FO??/?????????d??GGqI??]:?Q??R???3????????>??R?	??N??????e+2hf??i?????;?K???????wI:\???u?Ui??6z?Kv1e???tU-vi????cw???+;????

??
"??sa?J??	?????Qtl'??Q6?@??t??k?I???#[0Y2q?????B?y&??
'?+???G???;3'?	?(
??????????0??FO?*?_????k?U???{??~???g??????N??;5?la?/??(???4"&?,??.XrFI???1?qfE2?F1?r?????9?T?t???G?b?@gYt????xEE????g??z?v?}????h%??????*?(a??RT????
a????=???5?Kb?d?%}??H?~T???}K????VZ?????-? u????m}?2h?)??b'a?v3?W9[c???
??M???Zi????
-??T?e?!??jQ?????rytgW?R???.?S?.o:\????[,?????y&SZ??&)p)oR?Yi??h?I
?*??????Ii?6a??%|5i?z??:.??k???s?????'K`?`?A?F\???
?4X?F?X??1???t#'?????????Uz??[^?
???3???c???>?fw?*Wj<-}??l???????N????????{??????v?6?|l~}i??)~!?"mB????A????g?&?I?0??9JBDF?i14o?n?u?)???cC|?l??C?Lwh?#??{?????&N?????d3????
??/?ZM90??w'}?
I??T?]?
???:??(?G??E??-dd?
)Bc??,?L#dl???(???
a? 'G?jq?&u?{d;?Y??Oi9veD??i???u9z????d2??
??,?N?cQ????Q-?,?d?&??U?????~?`?)?????3??cS??????K???1??}y??.oN??>SX?f?\???D???r?F?U?k`???h???h ??a?F?$Ad(4??R???????7?^???>??rt??yG?:O?xi??????????&O9?i??8??]8?/c?@_??xr?|%&???/?/??ML?????~?\2?J??@?j?;"???"?u?]O????????u?????/?;(K'?I??_??u???H,??A??n???|?\N?!~^????*-???????(??e???d?Q5??X?<??????R????1E????4???????K3????L?-kw????~?X\XZH?g?}k??,E?Y?w??U??????:??m5s24?xR??????T????hYpwCo?a?z??n+??Y?sNO?E?-??]???vU???????u??
????x_?X_v???x????X?O????d?????{???Y??,W???j?
??7?????????q?/??;??????lk??;?W7?????2?
????y\?@z\?]?????%?w??p?	?0T?0????ec<.??????!<.x\???q?????i?:<.5e?q?\x\??t?????N???q?????;??D9F?g?????????????.$???K???5?U`o?:?:??/z???N_????"h$Y??Ej'??2?o???~?L_?x?$z?n1?Rs5T??N?mKNN????x.^?S?????E???????????9a?3QJt??=y"?r??Q??b??O?p>/?N?G)?W?U?M!??5????????L????Qy?pv-d???????-?Bs????wA?'?h??;????????}U??v?H?????w/m??%X?bJcH?3u??$???????a?{?'?b
nnn????`$??? ??Y??????Px?K??3U???z?c?!s??k??Q?/??????v????w#????wH??????w0??Sb?dwR????e???0????AL???x??=?f{????<???[F:-M?g?_?/?Ov?5????O?_??(I??P?^?Boj?k????O?hh?u?????w*?q??0t?xpx??9???_s??v=?+???U??y??-&?pF??d?Xy?????\6
?TL|n?????Pvi b??h??$????4?1??????&W??.????m???&G?GY??RF??V?v\???o???????B!rqEU?'?????Y??*+C?}?Z?m?????k??e?d?y?Mrg??????C	
???g?;?t4P??[????6>{??/??-?[??g?????A??at(??????'?>??????&o??X???}y?Hn*F?:|?z|?????N??K?????????7:????[?????xy??_??????Q??}0??Eb"?-?H??g?J???f?5.	k^?RBcZ?%??????LdeHb4y8?F?$?c??nBut?E"a????LQ?
?X?.?1?? ?E?P}?l'??5???
??B??W	0t??Mw??'?u?????]?j??d'??????,?????d?r???b?????-J??)&??d???Q?$??U?????d??p??????iV?[?n???uFS????P????
?F
??Dc;h?Gf?Q)??+???QY??v???????6??gvl&???z.?7??c6?m9nk?Y?$????cV?-?m??)7?`;?*?-???;~???R?L??W?[????3?U?h&7R
??<??\??T?A2?s??Z?}=EU`??[W????Et?n]u??g?1?#?????)?(*????'o??~(????0???y???????s???n???K?Ox?C?c????wf????X?h????X??\\J}Bf at P????d????t?W?????*?????F"?.????? %??-:w%-SA"?A?F??M????F[??-ka????u?k??-???[?
?s.??????o`$*+F?yC?Dx?????S^"/????????????w?????y?rG?3MX?o?????MSM?.{???
?<7K?X??t?s?E?v8?cF?5Ry???o????4??m??,???~x?:??E???????????[?
?B?J?$t?w3?(???f?????f?$(?i?|7#)y?&?n?n|?3??M??C??????w?!???H?n??
?|7?n?????w??l???????.|7?n???M??&???w???Mw|7#%??]??]
o?1e??????#_???/f?_????98???<?!_????m/>%??3??H???L?q/???????'=9??7???)Q?x_?P\??"??R??F???i?{?'????g?r????R???o???Jf<W??M?B6?B??43qtC?6?c????1?"???B?0a??????A0!??f!?J?????!L??0^?d?hwm???6y?V?L@??_?\??,???h?H???????xc?B??D????h?? nzn?	A?'??!a d??p&???6?Z???????rn??B`Z??,??`?????C?sM??wkL\55??6w%???1??@?`
[??;??
5?v	E??@|???G	???jy??ow??>tw??x????I?^.6)?W??*?N???o????_??{?}???r~?H???F?????o???5???AT????yT??|>???\????\6W?es??????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????1r?z???5s.\????b ?!?!?!?!?a????????????????????????????????????9!?!?!?!?!?!?!?!?!?!?!?!??J?e?e?e??N?xOpP?e???U?e?e?e?e???2?2?2?2?2?2?2?2?2?2?2?r?????Jr?\]$???K???b ?!?!?!?!?a????????????????????????????????????9!?!?!?!?!?!?!?!?!?!?!?!??J?e?e?e??N?xOpP?e???U?e?e?e?e???2?2?2?2?2?2?2?2?2?2?2?r????????k???k??I3r?V?2?2?2?2?r#?rrrrrrrrrrrrrrrrr?4'?2?2?2?2?2?2?2?2?2?2?2??\	???????	
?????
?????<?\?\?\?\?\?\?\?\?\?\?\?\??<??$???Er?\?4?l-rrrrr?F
?????????????????\?rrrrrrrrrrrrY??\?\?\?\?T???\?\??P?\?\?\?\?\?A.C.C.C.C.C.C.C.C.C.C.C.w?\?W???ry?r?V?2?2?2?2?r#?rrrrrrrrrrrrrrrrr?4'?2?2?2?2?2?2?2?2?2?2?2??\	???????	
?????
?????<?\?\?\?\?\?\?\?\?\?\?\?\??<??$???Er?\?4?l-rrrrr?F
?????????????????\?rrrrrrrrrrrrY??\?\?\?\?T???\?\??P?\?\?\?\?\?A.C.C.C.C.C.C.C.C.C.C.C.w?\>???????|
??O?<?\R3333s#???????????????????4'33333333333?\	???????	
?????
?????<?b?b?b?b?b?b?b?b?b?b?b?b??|Q?0_??????m?@.C.C.C.C.7?H!?!?!?!?!?!?!?!?!?!?!?!?!?!?!?!?!?KsB.C.C.C.C.C.C.C.C.C.C.C.????????????????????=???????????3?e?e?e?e?e?e?e?e?e?e?e?????????e
?|?r?V?2?2?2?2?r#?rrrrrrrrrrrrrrrrr?4'?2?2?2?2?2?2?2?2?2?2?2??\	???????	
?????
?????<?\?\?\?\?\?\?\?\?\?\?\?\??????\6W?es??????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????-r??~%?l?.??????ek1???????????0R?e?e?e?e?e?e?e?e?e?e?e?e?e?e?e?e????????????????????????????r%?2?2?2?r?z?'8(?2?rO?*?2?2?2?2??rrrrrrrrrrrr?c??q5?|\C.??\???????#?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\.?	????????????,WB.C.C.C.w??{??B.C.?d?B.C.C.C.C.? ?!?!?!?!?!?!?!?!?!?!?!??E.U????"?l?_?\???????#?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\.?	????????????,WB.C.C.C.w??{??B.C.?d?B.C.C.C.C.? ?!?!?!?!?!?!?!?!?!?!?!??E.]T????"?l?_?\???????#?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\.?	????????????,WB.C.C.C.w??{??B.C.?d?B.C.C.C.C.? ?!?!?!?!?!?!?!?!?!?!?!?;F._V???5???z?e[1???????????0R?e?e?e?e?e?e?e?e?e?e?e?e?e?e?e?e????????????????????????????r%?2?2?2?r?z?'8(?2?rO?*?2?2?2?2??rrrrrrrrrrrr?[??/??????H.???&???@.C.C.C.C.7?H!?!?!?!?!?!?!?!?!?!?!?!?!?!?
 !?!?!?KsB.C.C.C.C.C.C.C.C.C.C.C.????????????????????=???????????3?e?e?e?e?e?e?e?e?e?e?e??n????s.???|??9???@.C.C.C.C.7?H!?!?!?!?!?!?!?!?!?!?!?!?!?!?!?!?!?KsB.C.C.C.C.C.C.C.C.C.C.C.????????????????????=???????????3?e?e?e?e?e?e?e?e?e?e?e??n??U?r%?\
,???eheheh????????????????G?eQ8?B?7?I???0????P1?a???P1?
LrS&y????&0??D1??_?d??
a??i?$?`?a?a?a?a?a?a?????I?)&?vp?$?$w?Ic&y?????&??&???;M??E??????!?SE???g~|?>M?"???;??????\?;????}?j???9?t.?????G?l???????]??;?c?????????_:Qc?u????????sf?"R??????????ON4????_??/G???sx?tNg?????s???{?_;g?wZ???D[?????F??DU??U.?|???*+?w??hQ???E????j?+?h???cQ??fGI????
??G???
?????????~????~???f???K#??]	?{
 ?? ??)?|H^???5??.c??=?????=?s???|?. ???
?
G??S??GO??q????o?#??@?@?@?@?e?
?4~rQ????????~?????
Z?t????????3?5h9h9h9h9h9h9h9h9h9h?-@????	h9h???kh9?]3?5?]o.??t???Rf??[>T;@)3?5?2?2?2?roe???9F???7?Qf?k???\?\?\?\?\?\.!?/????r?r=????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????-r??c%?l?.??????ek1???????????0R?e?e?e?e?e?e?e?e?e?e?e?e?e?e?e?e????????????????????????????r%?2?2?2?r?z?'8(?2?rO?*?2?2?2?2??rrrrrrrrrrrr?c????]6?[?e3??????e?e?e?e??F()?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?zzzz?S=?$zz?'Czzzzzy?????????????1z??^>?a????.???\?\?\?\?\n??B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.???\?\?\?\?\?\?\?\?\?\?\?\?+!?!?!?!?;??=?A!?!?{2T!?!?!?!?!?g?????????????????????????"???+?esu?\6?/M.[??\?\?\?\?\n??B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.???\?\?\?\?\?\?\?\?\?\?\?\?+!?!?!?!?;??=?A!?!?{2T!?!?!?!?!?g????????????????????????#???\>??s?l=s.[??\?\?\?\?\n??B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.???\?\?\?\?\?\?\?\?\?\?\?\?+!?!?!?!?;??=?A!?!?{2T!?!?!?!?!?g???
 ?????????????????????#?/????r?r=????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????5ry?O?j??\
??K??l/	??????R
?????????????????\?????????????Y??b?b?b?b?T??
?b?b??P?b?b?b?b?b?A1C1C1C1C1C1C1C1C1C1C1C1w?b>_T"???"?l?_^???????#?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\?\.?	????????????,WB.C.C.C.w??{??B.C.?d?B.C.C.C.C.? ?!?!?!?!?!?!?!?!?!?!?!?;F._U??W5??U
?<mF.???\?\?\?\?\n??B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.???\?\?\?\?\?\?\?\?\?\?\?\?+!?!?!?!?;??=?A!?!?{2T!?!?!?!?!?g????????????????????????#??&??!?]?l+rrrrr?F
?????????????????\?rrrrrrrrrrrrY??\?\?\?\?T???\?\??P?\?\?\?\?\?A.C.C.C.C.C.C.C.C.C.C.C.w?\????\6W?es??????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????1r???\>?!???C.???\?\?\?\?\n??B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.???\?\?\?\?\?\?\?\?\?\?\?\?+!?!?!?!?;??=?A!?!?{2T!?!?!?!?!?g????????????????????????]#?????<???ils!?
 sYY????????????Rhfhfhfhfhfhfhfhfhfhfhfhfhfhfhfhfh???????????????????????????r%4343434s?z?'?(434sO?*434343434??????????????c4??j??K
??e=????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????-r?r??\6W?es??????e?e?e?e??F)?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?2?riN?e?e?e?e?e?e?e?e?e?e?e?e?rrrr?S=?rr?'Crrrrry?????????????1r???\>?!???C.???\?\?\?\?\n??B.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.???\?\?\?\?\?\?\?\?\?\?\?\?+!?!?!?!?;??=?A!?!?{2T!?!?!?!?!?g?????????????????????????"??~?$???Er?\?4?l-rrrrr?F
?????????????????\?rrrrrrrrrrrrY??\?\?\?\?T???\?\??P?\?\?\?\?\?A.C.C.C.C.C.C.C.C.C.C.C.w?\?rTI.??????~ir?Z?2?2?2?2?r#?rrrrrrrrrrrrrrrrr?4'?2?2?2?2?2?2?2?2?2?2?2??\	???????	
?????
?????<?\?\?\?\?\?\?\?\?\?\?\?\????????+??B?"?\H?4?\V3333s#???????????????????4'33333333333?\	???????	
?????
?????<?b?b?b?b?b?b?b?b?b?b?b?b?Z???
,>5?C

Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kst.spec	27 Sep 2009 21:01:20 -0000	1.19
+++ kst.spec	28 Sep 2009 01:22:27 -0000	1.20
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.8.0
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -8,7 +8,7 @@ License:    GPLv3
 URL:        http://kst.kde.org/
 Source0:    ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/scientific/kst-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:     kst-autotools.diff
+Patch0:     kst-autotools.diff.gz
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -20,6 +20,7 @@ BuildRequires: kdelibs-devel
 BuildRequires: cfitsio-devel netcdf-devel
 BuildRequires: getdata-devel muParser-devel
 BuildRequires: desktop-file-utils
+BuildRequires: autoconf automake
 
 %description
 Kst is a real-time data viewing and plotting tool with basic data analysis 
@@ -253,6 +254,9 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_dirfile.desktop
 
 %changelog
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-9
+- Bump again.
+
 * Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-8
 - Bump.
 


--- kst-autotools.diff DELETED ---



From petersen at fedoraproject.org  Mon Sep 28 01:33:15 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 01:33:15 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel ghc-HTTP.spec,1.14,1.15
Message-ID: <20090928013317.94CF711C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19652

Modified Files:
	ghc-HTTP.spec 
Log Message:
update changelog to mention BR of ghc-network


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/ghc-HTTP.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ghc-HTTP.spec	28 Sep 2009 01:02:21 -0000	1.14
+++ ghc-HTTP.spec	28 Sep 2009 01:33:04 -0000	1.15
@@ -145,7 +145,7 @@ fi
 
 %changelog
 * Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-5
-- build against the new ghc-network library
+- buildrequire the new ghc-network library
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4000.0.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From tgl at fedoraproject.org  Mon Sep 28 03:24:26 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Mon, 28 Sep 2009 03:24:26 +0000 (UTC)
Subject: rpms/mysql/F-11 mysql-strmov.patch, NONE, 1.1 .cvsignore, 1.41,
	1.42 mysql-ndb-stacksize.patch, 1.1, 1.2 mysql-plugin-bug.patch,
	1.9, 1.10 mysql-testing.patch, 1.13, 1.14 mysql.spec, 1.122,
	1.123 sources, 1.41, 1.42
Message-ID: <20090928032426.BA55911C00E6@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12557

Modified Files:
	.cvsignore mysql-ndb-stacksize.patch mysql-plugin-bug.patch 
	mysql-testing.patch mysql.spec sources 
Added Files:
	mysql-strmov.patch 
Log Message:
Update to MySQL 5.1.39

mysql-strmov.patch:
 m_string.h |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE mysql-strmov.patch ---
Remove overly optimistic definition of strmov() as stpcpy().

mysql uses this macro with overlapping source and destination strings,
which is verboten per spec, and fails on some Red Hat platforms.
Deleting the definition is sufficient to make it fall back to a
byte-at-a-time copy loop, which should consistently give the
expected behavior.


diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h
--- mysql-5.1.37.orig/include/m_string.h	2009-07-13 19:08:50.000000000 -0400
+++ mysql-5.1.37/include/m_string.h	2009-08-31 21:49:49.000000000 -0400
@@ -81,13 +81,6 @@
 extern void *(*my_str_malloc)(size_t);
 extern void (*my_str_free)(void *);
 
-#if defined(HAVE_STPCPY)
-#define strmov(A,B) stpcpy((A),(B))
-#ifndef stpcpy
-extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
-#endif
-#endif
-
 /* Declared in int2str() */
 extern char NEAR _dig_vec_upper[];
 extern char NEAR _dig_vec_lower[];


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	3 Aug 2009 02:29:35 -0000	1.41
+++ .cvsignore	28 Sep 2009 03:24:24 -0000	1.42
@@ -1 +1 @@
-mysql-5.1.37.tar.gz
+mysql-5.1.39.tar.gz

mysql-ndb-stacksize.patch:
 AsyncFile.cpp |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Index: mysql-ndb-stacksize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-ndb-stacksize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-ndb-stacksize.patch	15 Apr 2009 22:07:42 -0000	1.1
+++ mysql-ndb-stacksize.patch	28 Sep 2009 03:24:24 -0000	1.2
@@ -11,17 +11,21 @@ elsewhere.  At some point we might want 
 hack in NdbThread_Create().
 
 
-diff -Naur mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
---- mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-03-13 17:54:07.000000000 -0400
-+++ mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-04-15 14:00:04.000000000 -0400
-@@ -106,8 +106,8 @@
+diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-04 12:21:19.000000000 -0400
++++ mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-21 22:33:08.000000000 -0400
+@@ -106,13 +106,8 @@
  AsyncFile::doStart() 
  {
    // Stacksize for filesystem threads
--  // An 8k stack should be enough
--  const NDB_THREAD_STACKSIZE stackSize = 8192;
+-#if !defined(DBUG_OFF) && defined (__hpux)
+-  // Empirical evidence indicates at least 32k
 +  // don't make this too small
-+  const NDB_THREAD_STACKSIZE stackSize = 32768;
+   const NDB_THREAD_STACKSIZE stackSize = 32768;
+-#else
+-  // Otherwise an 8k stack should be enough
+-  const NDB_THREAD_STACKSIZE stackSize = 8192;
+-#endif
  
    char buf[16];
    numAsyncFiles++;

mysql-plugin-bug.patch:
 disabled.def |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-plugin-bug.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mysql-plugin-bug.patch	3 Aug 2009 02:29:35 -0000	1.9
+++ mysql-plugin-bug.patch	28 Sep 2009 03:24:24 -0000	1.10
@@ -6,14 +6,19 @@ http://bugs.mysql.com/bug.php?id=42144
 
 For the moment, just disable this test.
 
+Also, disable the outfile_loaddata test, which as of 5.1.38 is giving
+platform-dependent results, with the "expected" results being arguably the
+wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
-diff -Naur mysql-5.1.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
---- mysql-5.1.37.orig/mysql-test/t/disabled.def	2009-07-13 19:43:47.000000000 -0400
-+++ mysql-5.1.37/mysql-test/t/disabled.def	2009-08-02 20:43:36.000000000 -0400
-@@ -13,4 +13,5 @@
+
+diff -Naur mysql-5.1.39.orig/mysql-test/t/disabled.def mysql-5.1.39/mysql-test/t/disabled.def
+--- mysql-5.1.39.orig/mysql-test/t/disabled.def	2009-09-04 13:01:56.000000000 -0400
++++ mysql-5.1.39/mysql-test/t/disabled.def	2009-09-23 19:23:42.000000000 -0400
+@@ -13,4 +13,6 @@
  innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
  init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
 -
 +#
-+plugin_load     : gives wrong answer on PPC64
++plugin_load         : gives wrong answer on PPC64
++outfile_loaddata    : gives different results on different platforms

mysql-testing.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-testing.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mysql-testing.patch	5 Mar 2009 02:50:07 -0000	1.13
+++ mysql-testing.patch	28 Sep 2009 03:24:24 -0000	1.14
@@ -1,6 +1,13 @@
 Hack the top-level Makefile to enable the openssl regression tests.
 (Why doesn't this happen automatically given the configure option??)
 
+Also, increase the overall timeout for the regression tests to 12 hours,
+because on a slow or heavily-loaded build machine sometimes the default of
+5 hours isn't enough.  (This has been demonstrated to fail in mass-rebuild
+scenarios, which aren't that uncommon for Fedora.)  Similarly increase the
+per-testcase timeout to 30 minutes, since the default of 15 hasn't got a
+great deal of headroom either.
+
 
 diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am
 --- mysql-5.1.32.orig/Makefile.am	2009-02-13 19:51:56.000000000 -0500
@@ -10,7 +17,7 @@ diff -Naur mysql-5.1.32.orig/Makefile.am
  test-ns:
  	cd mysql-test ; \
 -	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed
++	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed --suite-timeout=720 --testcase-timeout=30
  
  test-binlog-statement:
  	cd mysql-test ; \


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- mysql.spec	3 Aug 2009 02:29:35 -0000	1.122
+++ mysql.spec	28 Sep 2009 03:24:25 -0000	1.123
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.37
-Release: 1%{?dist}
+Version: 5.1.39
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -32,6 +32,7 @@ Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
+Patch10: mysql-strmov.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -174,6 +175,7 @@ the MySQL sources.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 libtoolize --force
 aclocal
@@ -205,13 +207,13 @@ export CFLAGS CXXFLAGS
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
 	--with-big-tables \
-	--with-innodb \
-	--with-ndbcluster \
+	--with-pic \
+	--with-plugin-innobase \
+	--with-plugin-ndbcluster \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
-	--disable-dependency-tracking \
-	--with-named-thread-libs="-lpthread"
+	--disable-dependency-tracking
 
 gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
 
@@ -249,6 +251,7 @@ make check
 
   # note: "make test" invokes two largely-duplicate sets of tests,
   # which makes the runtime really unacceptably long ...
+  # if you want to change this, look at mysql-testing.patch too.
   make test-ns
 %endif
 
@@ -639,6 +642,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sun Sep 27 2009 Tom Lane <tgl at redhat.com> 5.1.39-2
+- Update to MySQL 5.1.39, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html
+- Sync with F-12 release 5.1.39-2
+
 * Sun Aug  2 2009 Tom Lane <tgl at redhat.com> 5.1.37-1
 - Update to MySQL 5.1.37, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	3 Aug 2009 02:29:35 -0000	1.41
+++ sources	28 Sep 2009 03:24:25 -0000	1.42
@@ -1 +1 @@
-cbdb8783b053019755ee9196f67ea04c  mysql-5.1.37.tar.gz
+55a398daeb69a778fc46573623143268  mysql-5.1.39.tar.gz



From jfearn at fedoraproject.org  Mon Sep 28 04:05:08 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Mon, 28 Sep 2009 04:05:08 +0000 (UTC)
Subject: rpms/perl-XML-TreeBuilder/devel XML-TreeBuilder-NoExpand.patch, 1.3,
	1.4 perl-XML-TreeBuilder.spec, 1.6, 1.7
Message-ID: <20090928040508.7EFF911C02BD@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703/devel

Modified Files:
	XML-TreeBuilder-NoExpand.patch perl-XML-TreeBuilder.spec 
Log Message:
always remove NoExpand and ErrorContext attributes from output

XML-TreeBuilder-NoExpand.patch:
 Changes                |    7 ++-
 lib/XML/TreeBuilder.pm |  106 +++++++++++++++++++++++++++++++------------------
 t/10main.t             |   26 ++++++++++--
 3 files changed, 98 insertions(+), 41 deletions(-)

Index: XML-TreeBuilder-NoExpand.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/XML-TreeBuilder-NoExpand.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- XML-TreeBuilder-NoExpand.patch	16 Mar 2009 05:07:00 -0000	1.3
+++ XML-TreeBuilder-NoExpand.patch	28 Sep 2009 04:05:07 -0000	1.4
@@ -1,4 +1,3 @@
-Only in XML-TreeBuilder-patched: blib
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
 --- XML-TreeBuilder-3.09/Changes	2004-06-11 14:28:41.000000000 +1000
 +++ XML-TreeBuilder-patched/Changes	2009-03-16 14:30:51.000000000 +1000
@@ -16,7 +15,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
 --- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-03-16 13:55:57.000000000 +1000
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-28 13:51:25.000000000 +1000
 @@ -5,6 +7,7 @@
  use strict;
  use XML::Element ();
@@ -43,7 +42,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,44 +31,51 @@
+@@ -21,44 +31,53 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
@@ -66,6 +65,8 @@ diff -rubB --exclude=.svn --exclude='*.s
      'Start' => sub {
        shift;
 -      if(@stack) {
++                $self->attr('NoExpand', undef);
++                $self->attr('ErrorContext', undef);
 +                if (@stack) {
           push @stack, $self->{'_element_class'}->new(@_);
           $stack[-2]->push_content( $stack[-1] );
@@ -110,7 +111,7 @@ diff -rubB --exclude=.svn --exclude='*.s
         return;
      },
      
-@@ -67,11 +84,11 @@
+@@ -67,11 +86,11 @@
      'Attlist' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -127,7 +128,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -80,11 +97,11 @@
+@@ -80,11 +99,11 @@
      'Element' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -144,7 +145,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -93,17 +110,32 @@
+@@ -93,17 +112,32 @@
      'Doctype' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -183,7 +184,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    return $self;
  }
-@@ -110,15 +143,15 @@
+@@ -110,15 +145,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -203,11 +204,9 @@ diff -rubB --exclude=.svn --exclude='*.s
  
  #==========================================================================
  
-Only in XML-TreeBuilder-patched: Makefile
-Only in XML-TreeBuilder-patched: pm_to_blib
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
 --- XML-TreeBuilder-3.09/t/10main.t	2004-06-11 14:22:53.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t	2009-03-16 13:33:49.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 13:59:55.000000000 +1000
 @@ -2,7 +2,7 @@
  # Time-stamp: "2004-06-10 20:22:53 ADT" 
  
@@ -227,7 +226,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
-@@ -45,6 +44,28 @@
+@@ -45,6 +44,27 @@
  $x->delete;
  $y->delete;
  
@@ -242,7 +241,6 @@ diff -rubB --exclude=.svn --exclude='*.s
 +
 +$y = XML::Element->new_from_lol(
 + ['Gee',
-+   { 'NoExpand' => "1", 'ErrorContext' => "2" },
 +   ['~comment', {'text' => ' myorp '}],
 +   ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
 +   ['lor'],


Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/perl-XML-TreeBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-TreeBuilder.spec	26 Jul 2009 17:39:37 -0000	1.6
+++ perl-XML-TreeBuilder.spec	28 Sep 2009 04:05:08 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	Parser that builds a tree of XML::Element objects
 Name:		perl-XML-TreeBuilder
 Version:	3.09
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/XML-TreeBuilder/
@@ -50,6 +50,9 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{perl_vendorlib}/XML/
 
 %changelog
+* Mon Sep 28 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-15
+- Always remove NoExpand and ErrorContext from output
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.09-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jfearn at fedoraproject.org  Mon Sep 28 04:05:08 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Mon, 28 Sep 2009 04:05:08 +0000 (UTC)
Subject: rpms/perl-XML-TreeBuilder/F-11 XML-TreeBuilder-NoExpand.patch, 1.3, 
	1.4 perl-XML-TreeBuilder.spec, 1.5, 1.6
Message-ID: <20090928040508.80C5011C0333@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703/F-11

Modified Files:
	XML-TreeBuilder-NoExpand.patch perl-XML-TreeBuilder.spec 
Log Message:
always remove NoExpand and ErrorContext attributes from output

XML-TreeBuilder-NoExpand.patch:
 Changes                |    7 ++-
 lib/XML/TreeBuilder.pm |  106 +++++++++++++++++++++++++++++++------------------
 t/10main.t             |   26 ++++++++++--
 3 files changed, 98 insertions(+), 41 deletions(-)

Index: XML-TreeBuilder-NoExpand.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-11/XML-TreeBuilder-NoExpand.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- XML-TreeBuilder-NoExpand.patch	16 Mar 2009 05:07:00 -0000	1.3
+++ XML-TreeBuilder-NoExpand.patch	28 Sep 2009 04:05:07 -0000	1.4
@@ -1,4 +1,3 @@
-Only in XML-TreeBuilder-patched: blib
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
 --- XML-TreeBuilder-3.09/Changes	2004-06-11 14:28:41.000000000 +1000
 +++ XML-TreeBuilder-patched/Changes	2009-03-16 14:30:51.000000000 +1000
@@ -16,7 +15,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
 --- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-03-16 13:55:57.000000000 +1000
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-28 13:51:25.000000000 +1000
 @@ -5,6 +7,7 @@
  use strict;
  use XML::Element ();
@@ -43,7 +42,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,44 +31,51 @@
+@@ -21,44 +31,53 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
@@ -66,6 +65,8 @@ diff -rubB --exclude=.svn --exclude='*.s
      'Start' => sub {
        shift;
 -      if(@stack) {
++                $self->attr('NoExpand', undef);
++                $self->attr('ErrorContext', undef);
 +                if (@stack) {
           push @stack, $self->{'_element_class'}->new(@_);
           $stack[-2]->push_content( $stack[-1] );
@@ -110,7 +111,7 @@ diff -rubB --exclude=.svn --exclude='*.s
         return;
      },
      
-@@ -67,11 +84,11 @@
+@@ -67,11 +86,11 @@
      'Attlist' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -127,7 +128,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -80,11 +97,11 @@
+@@ -80,11 +99,11 @@
      'Element' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -144,7 +145,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -93,17 +110,32 @@
+@@ -93,17 +112,32 @@
      'Doctype' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -183,7 +184,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    return $self;
  }
-@@ -110,15 +143,15 @@
+@@ -110,15 +145,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -203,11 +204,9 @@ diff -rubB --exclude=.svn --exclude='*.s
  
  #==========================================================================
  
-Only in XML-TreeBuilder-patched: Makefile
-Only in XML-TreeBuilder-patched: pm_to_blib
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
 --- XML-TreeBuilder-3.09/t/10main.t	2004-06-11 14:22:53.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t	2009-03-16 13:33:49.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 13:59:55.000000000 +1000
 @@ -2,7 +2,7 @@
  # Time-stamp: "2004-06-10 20:22:53 ADT" 
  
@@ -227,7 +226,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
-@@ -45,6 +44,28 @@
+@@ -45,6 +44,27 @@
  $x->delete;
  $y->delete;
  
@@ -242,7 +241,6 @@ diff -rubB --exclude=.svn --exclude='*.s
 +
 +$y = XML::Element->new_from_lol(
 + ['Gee',
-+   { 'NoExpand' => "1", 'ErrorContext' => "2" },
 +   ['~comment', {'text' => ' myorp '}],
 +   ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
 +   ['lor'],


Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-11/perl-XML-TreeBuilder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-XML-TreeBuilder.spec	16 Mar 2009 05:10:10 -0000	1.5
+++ perl-XML-TreeBuilder.spec	28 Sep 2009 04:05:07 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Parser that builds a tree of XML::Element objects
 Name:		perl-XML-TreeBuilder
 Version:	3.09
-Release:	13%{?dist}
+Release:	15%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/XML-TreeBuilder/
@@ -50,6 +50,12 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{perl_vendorlib}/XML/
 
 %changelog
+* Mon Sep 28 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-15
+- Always remove NoExpand and ErrorContext from output
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.09-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 16 2009 Jeff Fearn <jfearn at redhat.com> - 3.09-13
 - Remove NoExpand and ErrorContext from output if they aren't set.
 



From braden at fedoraproject.org  Mon Sep 28 04:29:10 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon, 28 Sep 2009 04:29:10 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.72,1.73
Message-ID: <20090928042910.6375911C02BD@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15308/devel

Modified Files:
	openvrml.spec 
Log Message:
Arch-independent Requires are not safe for multilib systems when a specific architecture is needed.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- openvrml.spec	12 Sep 2009 20:26:23 -0000	1.72
+++ openvrml.spec	28 Sep 2009 04:29:09 -0000	1.73
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -19,20 +19,13 @@ BuildRequires:  freetype-devel >= 2.1.2
 BuildRequires:  gecko-devel >= 1.9.1
 BuildRequires:  glib2-devel >= 2.6
 BuildRequires:  dbus-glib-devel
-BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  gtk2-devel >= 2.12
 BuildRequires:  gtkglext-devel
+BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-# You cannot use %%{?isa} to map these requires to an architecture target
-# The only Requires which have %%{?isa} are those matching the name of the package
-# Since both "gecko-libs" and "java" are not the name of the packages that provide them
-# (they're manually defined Provides) they do not have %%{?isa}. You should ask the maintainer
-# of those packages to add explicit provides that use %%{?isa} (in addition to the normal ones).
-# Alternately, you could use a file dependency here, at least for "java", to force an architecture
-# match. -Tom Callaway <tcallawa at redhat.com>
-Requires:       gecko-libs >= 1.9.1
-Requires:       java
+Requires:       xulrunner%{?_isa} >= 1.9.1
+Requires:       java-1.6.0-openjdk%{?_isa}
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -42,9 +35,9 @@ for reading and displaying VRML and X3D 
 %package devel
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       boost-devel >= 1.37.0
+Requires:       boost-devel%{?_isa} >= 1.37.0
 %description devel
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
@@ -52,17 +45,17 @@ OpenVRML.
 %package gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description gl
 OpenGL renderer for OpenVRML.
 
 %package gl-devel
 Summary:        OpenVRML OpenGL renderer headers
 Group:          Development/Libraries
-Requires:       %{name}-gl = %{version}-%{release}
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       libGLU-devel
+Requires:       libGLU-devel%{?_isa}
 %description gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -71,7 +64,7 @@ OpenVRML OpenGL renderer.
 Summary:        VRML/X3D browser XEmbed component for embedding in X11 applications
 Group:          Applications/Internet
 License:        GPLv3+
-Requires:       %{name}-gl = %{version}-%{release}
+Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-gtkplug
 %description xembed
 VRML/X3D browser XEmbed component for embedding in X11 applications.
@@ -195,6 +188,10 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-4
+- Arch-independent Requires are not safe for multilib systems when a
+  specific architecture is needed.
+
 * Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.18.3-3
 - undo arch-specific deps on gecko-libs and java (%%{?isa} doesn't work like you think it works)
   for more details, see the comment in the spec file



From braden at fedoraproject.org  Mon Sep 28 04:29:10 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon, 28 Sep 2009 04:29:10 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.68,1.69
Message-ID: <20090928042910.5E8A311C00E4@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15308/F-11

Modified Files:
	openvrml.spec 
Log Message:
Arch-independent Requires are not safe for multilib systems when a specific architecture is needed.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- openvrml.spec	13 Aug 2009 07:37:40 -0000	1.68
+++ openvrml.spec	28 Sep 2009 04:29:08 -0000	1.69
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -24,8 +24,8 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-Requires:       gecko-libs%{?_isa} >= 1.9.1
-Requires:       java%{?_isa}
+Requires:       xulrunner%{?_isa} >= 1.9.1
+Requires:       java-1.6.0-openjdk%{?_isa}
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -35,9 +35,9 @@ for reading and displaying VRML and X3D 
 %package devel
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       boost-devel >= 1.37.0
+Requires:       boost-devel%{?_isa} >= 1.37.0
 %description devel
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
@@ -45,17 +45,17 @@ OpenVRML.
 %package gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description gl
 OpenGL renderer for OpenVRML.
 
 %package gl-devel
 Summary:        OpenVRML OpenGL renderer headers
 Group:          Development/Libraries
-Requires:       %{name}-gl = %{version}-%{release}
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       libGLU-devel
+Requires:       libGLU-devel%{?_isa}
 %description gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -64,7 +64,7 @@ OpenVRML OpenGL renderer.
 Summary:        VRML/X3D browser XEmbed component for embedding in X11 applications
 Group:          Applications/Internet
 License:        GPLv3+
-Requires:       %{name}-gl = %{version}-%{release}
+Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-gtkplug
 %description xembed
 VRML/X3D browser XEmbed component for embedding in X11 applications.
@@ -182,12 +182,16 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_datadir}/openvrml-player
 %dir %{_datadir}/openvrml-player/ui
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
-  
+
 %files doc
 %doc doc/manual
 %{_javadocdir}/%{name}-%{version}
-  
+
 %changelog
+* Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-2
+- Arch-independent Requires are not safe for multilib systems when a
+  specific architecture is needed.
+
 * Thu Aug 13 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-1
 - Updated to 0.18.3.
 



From mdomsch at fedoraproject.org  Mon Sep 28 05:08:40 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Mon, 28 Sep 2009 05:08:40 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 .cvsignore, 1.11, 1.12 mirrormanager.spec, 
	1.11, 1.12 sources, 1.11, 1.12
Message-ID: <20090928050840.96F5211C00E4@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22025

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
version bump, add BGP lookups


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	18 Sep 2009 22:10:27 -0000	1.11
+++ .cvsignore	28 Sep 2009 05:08:40 -0000	1.12
@@ -1 +1 @@
-mirrormanager-1.3.1.tar.bz2
+mirrormanager-1.3.2.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mirrormanager.spec	18 Sep 2009 22:10:27 -0000	1.11
+++ mirrormanager.spec	28 Sep 2009 05:08:40 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           mirrormanager
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.2-1
+- add BGP ASN lookups
+
 * Fri Sep 18 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.1-1
 - fix publiclist html
 - fix Host netblock creation via web UI


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2009 22:10:27 -0000	1.11
+++ sources	28 Sep 2009 05:08:40 -0000	1.12
@@ -1 +1 @@
-112f95242036ada28c0a6dc54bfb31fe  mirrormanager-1.3.1.tar.bz2
+60c62a1a7ac403df654e6d93d154d1b4  mirrormanager-1.3.2.tar.bz2



From kyle at fedoraproject.org  Mon Sep 28 05:09:50 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 28 Sep 2009 05:09:50 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-git18.bz2.sign, NONE, 1.1 .cvsignore,
	1.1128, 1.1129 hdpvr-ir-enable.patch, 1.5, 1.6 kernel.spec,
	1.1808, 1.1809 linux-2.6-build-nonintconfig.patch, 1.16,
	1.17 linux-2.6-debug-sizeof-structs.patch, 1.7,
	1.8 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.4,
	1.5 linux-2.6-execshield.patch, 1.109,
	1.110 linux-2.6-makefile-after_link.patch, 1.1,
	1.2 linux-2.6-serial-460800.patch, 1.2,
	1.3 linux-2.6-utrace.patch, 1.117, 1.118 sources, 1.1086,
	1.1087 upstream, 1.1000, 1.1001 via-hwmon-temp-sensor.patch, 1.3,
	1.4 linux-2.6-die-closed-source-bios-muppets-die.patch, 1.2,
	NONE linux-2.6-intel-iommu-updates.patch, 1.1,
	NONE linux-2.6-ksm-fix-munlock.patch, 1.1,
	NONE linux-2.6-ksm-updates.patch, 1.1, NONE linux-2.6-ksm.patch,
	1.3, NONE linux-2.6-rtc-show-hctosys.patch, 1.1,
	NONE patch-2.6.31-git4.bz2.sign, 1.1, NONE
Message-ID: <20090928050950.0E67F11C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22205

Modified Files:
	.cvsignore hdpvr-ir-enable.patch kernel.spec 
	linux-2.6-build-nonintconfig.patch 
	linux-2.6-debug-sizeof-structs.patch 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
	linux-2.6-execshield.patch linux-2.6-makefile-after_link.patch 
	linux-2.6-serial-460800.patch linux-2.6-utrace.patch sources 
	upstream via-hwmon-temp-sensor.patch 
Added Files:
	patch-2.6.31-git18.bz2.sign 
Removed Files:
	linux-2.6-die-closed-source-bios-muppets-die.patch 
	linux-2.6-intel-iommu-updates.patch 
	linux-2.6-ksm-fix-munlock.patch linux-2.6-ksm-updates.patch 
	linux-2.6-ksm.patch linux-2.6-rtc-show-hctosys.patch 
	patch-2.6.31-git4.bz2.sign 
Log Message:
* Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.31-git18
- rebased:
 - hdpvr-ir-enable.patch
 - linux-2.6-build-nonintconfig.patch
 - linux-2.6-debug-sizeof-structs.patch
 - linux-2.6-debug-vm-would-have-oomkilled.patch
 - linux-2.6-execshield.patch
 - linux-2.6-makefile-after_link.patch
 - linux-2.6-serial-460800.patch
 - linux-2.6-utrace.patch
 - via-hwmon-temp-sensor.patch
- merged:
 - linux-2.6-tracehook.patch
 - linux-2.6-die-closed-source-bios-muppets-die.patch
 - linux-2.6-intel-iommu-updates.patch
 - linux-2.6-ksm.patch
 - linux-2.6-ksm-updates.patch
 - linux-2.6-ksm-fix-munlock.patch
 - linux-2.6-vga-arb.patch
 - v4l-dvb-fix-cx25840-firmware-loading.patch
 - linux-2.6-rtc-show-hctosys.patch



--- NEW FILE patch-2.6.31-git18.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKvq6lyGugalF9Dw4RAthHAJ9CjmPMOEMp/jv65FfTeEwuz5eTKACfRx+1
2P4sY9VbCfvSX+l6wfTbhVY=
=mSp6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -p -r1.1128 -r1.1129
--- .cvsignore	15 Sep 2009 14:47:35 -0000	1.1128
+++ .cvsignore	28 Sep 2009 05:09:48 -0000	1.1129
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31-git4.bz2
+patch-2.6.31-git18.bz2

hdpvr-ir-enable.patch:
 0 files changed

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hdpvr-ir-enable.patch	5 Sep 2009 01:22:31 -0000	1.5
+++ hdpvr-ir-enable.patch	28 Sep 2009 05:09:48 -0000	1.6
@@ -1,227 +0,0 @@
-From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
-
----
- drivers/media/video/hdpvr/Makefile     |    4 +-
- drivers/media/video/hdpvr/hdpvr-core.c |   12 ++---
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   88 ++++++++++++++++++++++---------
- drivers/media/video/hdpvr/hdpvr.h      |    2 +-
- 4 files changed, 68 insertions(+), 38 deletions(-)
-
-diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
-index e0230fc..79ad2e1 100644
---- a/drivers/media/video/hdpvr/Makefile
-+++ b/drivers/media/video/hdpvr/Makefile
-@@ -1,6 +1,4 @@
--hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
--
--hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
-+hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o
- 
- obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
- 
-diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..d2bb4c2 100644
---- a/drivers/media/video/hdpvr/hdpvr-core.c
-+++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
- 		goto error;
- 	}
- 
--#ifdef CONFIG_I2C
--	/* until i2c is working properly */
--	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+	retval = hdpvr_register_i2c_adapter(dev);
- 	if (retval < 0) {
- 		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
- 		goto error;
-@@ -414,12 +413,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
- 	mutex_unlock(&dev->io_mutex);
- 
- 	/* deregister I2C adapter */
--#ifdef CONFIG_I2C
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- 	mutex_lock(&dev->i2c_mutex);
--	if (dev->i2c_adapter)
--		i2c_del_adapter(dev->i2c_adapter);
--	kfree(dev->i2c_adapter);
--	dev->i2c_adapter = NULL;
-+	i2c_del_adapter(&dev->i2c_adapter);
- 	mutex_unlock(&dev->i2c_mutex);
- #endif /* CONFIG_I2C */
- 
-diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..7cd977f 100644
---- a/drivers/media/video/hdpvr/hdpvr-i2c.c
-+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -10,6 +10,7 @@
-  *
-  */
- 
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- #include <linux/i2c.h>
- 
- #include "hdpvr.h"
-@@ -19,10 +20,13 @@
- 
- #define REQTYPE_I2C_READ	0xb1
- #define REQTYPE_I2C_WRITE	0xb0
--#define REQTYPE_I2C_WRITE_STATT	0xd0
-+#define REQTYPE_I2C_WRITE_STAT	0xd0
-+
-+#define HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR	0x70
-+#define HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR	0x71
- 
- static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
--			  char *data, int len)
-+			  char *data, int len, int bus)
- {
- 	int ret;
- 	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +36,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
- 	ret = usb_control_msg(dev->udev,
- 			      usb_rcvctrlpipe(dev->udev, 0),
- 			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
--			      0x100|addr, 0, buf, len, 1000);
-+			      bus<<8 | addr, 0, buf, len, 1000);
- 
- 	if (ret == len) {
- 		memcpy(data, buf, len);
-@@ -46,7 +50,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
- }
- 
- static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
--			   char *data, int len)
-+			   char *data, int len, int bus)
- {
- 	int ret;
- 	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,17 +61,17 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
- 	ret = usb_control_msg(dev->udev,
- 			      usb_sndctrlpipe(dev->udev, 0),
- 			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
--			      0x100|addr, 0, buf, len, 1000);
-+			      bus<<8 | addr, 0, buf, len, 1000);
- 
- 	if (ret < 0)
- 		goto error;
- 
- 	ret = usb_control_msg(dev->udev,
- 			      usb_rcvctrlpipe(dev->udev, 0),
--			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-+			      REQTYPE_I2C_WRITE_STAT, CTRL_READ_REQUEST,
- 			      0, 0, buf, 2, 1000);
- 
--	if (ret == 2)
-+	if ((ret == 2) && (buf[1] == (len - 1)))
- 		ret = 0;
- 	else if (ret >= 0)
- 		ret = -EIO;
-@@ -93,10 +97,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
- 
- 		if (msgs[i].flags & I2C_M_RD)
- 			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
--						msgs[i].len);
-+						msgs[i].len, 1);
- 		else
- 			retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
--						 msgs[i].len);
-+						 msgs[i].len, 1);
- 	}
- 
- 	mutex_unlock(&dev->i2c_mutex);
-@@ -114,32 +118,64 @@ static struct i2c_algorithm hdpvr_algo = {
- 	.functionality = hdpvr_functionality,
- };
- 
-+static struct i2c_adapter hdpvr_i2c_adap_template = {
-+	.name		= "Hauppauge HD PVR I2C",
-+	.owner		= THIS_MODULE,
-+	.id		= I2C_HW_B_HDPVR,
-+	.algo		= &hdpvr_algo,
-+	.class		= I2C_CLASS_TV_ANALOG,
-+};
-+
-+#if 1
-+static struct i2c_board_info hdpvr_i2c_board_info = {
-+	I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
-+	I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
-+};
-+#endif
-+
-+static int hdpvr_activate_ir(struct hdpvr_device *dev)
-+{
-+	char buffer[8];
-+
-+	mutex_lock(&dev->i2c_mutex);
-+
-+	hdpvr_i2c_read(dev, 0x54, buffer, 1, 0);
-+
-+	buffer[0] = 0;
-+	buffer[1] = 0x8;
-+	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
-+
-+	buffer[1] = 0x18;
-+	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
-+
-+	mutex_unlock(&dev->i2c_mutex);
-+	return 0;
-+}
-+
- int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
- {
--	struct i2c_adapter *i2c_adap;
- 	int retval = -ENOMEM;
- 
--	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
--	if (i2c_adap == NULL)
--		goto error;
-+	hdpvr_activate_ir(dev);
-+
-+	memcpy(&dev->i2c_adapter, &hdpvr_i2c_adap_template,
-+	       sizeof(struct i2c_adapter));
- 
--	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
--		sizeof(i2c_adap->name));
--	i2c_adap->algo  = &hdpvr_algo;
--	i2c_adap->class = I2C_CLASS_TV_ANALOG;
--	i2c_adap->id    = I2C_HW_B_HDPVR;
--	i2c_adap->owner = THIS_MODULE;
--	i2c_adap->dev.parent = &dev->udev->dev;
-+	dev->i2c_adapter.dev.parent = &dev->udev->dev;
- 
--	i2c_set_adapdata(i2c_adap, dev);
-+	i2c_set_adapdata(&dev->i2c_adapter, dev);
- 
--	retval = i2c_add_adapter(i2c_adap);
-+	retval = i2c_add_adapter(&dev->i2c_adapter);
- 
--	if (!retval)
--		dev->i2c_adapter = i2c_adap;
--	else
--		kfree(i2c_adap);
-+	if (retval)
-+		goto error;
-+
-+#if 1
-+	i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
-+#endif
- 
- error:
- 	return retval;
- }
-+
-+#endif /* CONFIG_I2C */
-diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
-index 1edd875..173aefa 100644
---- a/drivers/media/video/hdpvr/hdpvr.h
-+++ b/drivers/media/video/hdpvr/hdpvr.h
-@@ -101,7 +101,7 @@ struct hdpvr_device {
- 	struct work_struct	worker;
- 
- 	/* I2C adapter */
--	struct i2c_adapter	*i2c_adapter;
-+	struct i2c_adapter	i2c_adapter;
- 	/* I2C lock */
- 	struct mutex		i2c_mutex;
- 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1808
retrieving revision 1.1809
diff -u -p -r1.1808 -r1.1809
--- kernel.spec	21 Sep 2009 17:55:22 -0000	1.1808
+++ kernel.spec	28 Sep 2009 05:09:48 -0000	1.1809
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 4
+%define gitrev 18
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -611,10 +611,6 @@ Patch22: linux-2.6-utrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
-# Intel IOMMU fixes/workarounds
-Patch100: linux-2.6-die-closed-source-bios-muppets-die.patch
-Patch101: linux-2.6-intel-iommu-updates.patch
-
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -673,10 +669,7 @@ Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 
 # virt + ksm patches
-Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
-Patch1552: linux-2.6-ksm-updates.patch
-Patch1553: linux-2.6-ksm-fix-munlock.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
@@ -691,7 +684,6 @@ Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 
 # vga arb
-Patch1900: linux-2.6-vga-arb.patch
 Patch1901: drm-vga-arb.patch
 
 # kludge to make ich9 e1000 work
@@ -709,7 +701,6 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
-Patch2904: v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # fs fixes
 
@@ -722,7 +713,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
-Patch12012: linux-2.6-rtc-show-hctosys.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
 %endif
@@ -1141,7 +1131,7 @@ ApplyOptionalPatch linux-2.6-upstream-re
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-tracehook.patch
+#ApplyPatch linux-2.6-tracehook.patch # merged
 ApplyPatch linux-2.6-utrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
@@ -1155,12 +1145,6 @@ ApplyPatch linux-2.6-dell-laptop-rfkill-
 #
 # Intel IOMMU
 #
-# Quiesce USB host controllers before setting up the IOMMU
-ApplyPatch linux-2.6-die-closed-source-bios-muppets-die.patch
-# Some performance fixes, unify hardware/software passthrough support, and
-# most importantly: notice when the BIOS points us to a region that returns
-# all 0xFF, and claims that there's an IOMMU there.
-ApplyPatch linux-2.6-intel-iommu-updates.patch
 
 #
 # PowerPC
@@ -1200,11 +1184,11 @@ ApplyPatch linux-2.6-execshield.patch
 # eCryptfs
 
 # NFSv4
-ApplyPatch linux-2.6-nfsd4-proots.patch
+#ApplyPatch linux-2.6-nfsd4-proots.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
-ApplyPatch linux-2.6-fix-usb-serial-autosuspend.diff
+#ApplyPatch linux-2.6-fix-usb-serial-autosuspend.diff
 ApplyPatch linux-2.6-qcserial-autosuspend.diff
 ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
 
@@ -1283,9 +1267,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
 # Mark kernel data as NX
-ApplyPatch linux-2.6.31-nx-data.patch
+#ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
-ApplyPatch linux-2.6.31-modules-ro-nx.patch
+#ApplyPatch linux-2.6.31-modules-ro-nx.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -1299,9 +1283,6 @@ ApplyPatch lirc-2.6.31.patch
 ApplyPatch hdpvr-ir-enable.patch
 
 # Add kernel KSM support
-ApplyPatch linux-2.6-ksm.patch
-ApplyPatch linux-2.6-ksm-updates.patch
-ApplyPatch linux-2.6-ksm-fix-munlock.patch
 # Optimize KVM for KSM support
 #ApplyPatch linux-2.6-ksm-kvm.patch
 
@@ -1319,7 +1300,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 #ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
-ApplyPatch drm-i915-resume-force-mode.patch
+#ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 #ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
@@ -1327,7 +1308,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
-ApplyPatch linux-2.6-vga-arb.patch
 #ApplyPatch drm-vga-arb.patch
 
 # linux1394 git patches
@@ -1342,10 +1322,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-update.patch
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
-ApplyPatch v4l-dvb-fix-cx25840-firmware-loading.patch
 
 # Patches headed upstream
-ApplyPatch linux-2.6-rtc-show-hctosys.patch
 ApplyPatch linux-2.6-rfkill-all.patch
 
 # END OF PATCH APPLICATIONS
@@ -2005,6 +1983,29 @@ fi
 # ##############################################################
 
 %changelog
+* Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.31-git18
+- rebased:
+ - hdpvr-ir-enable.patch
+ - linux-2.6-build-nonintconfig.patch
+ - linux-2.6-debug-sizeof-structs.patch
+ - linux-2.6-debug-vm-would-have-oomkilled.patch
+ - linux-2.6-execshield.patch
+ - linux-2.6-makefile-after_link.patch
+ - linux-2.6-serial-460800.patch
+ - linux-2.6-utrace.patch
+ - via-hwmon-temp-sensor.patch
+- merged:
+ - linux-2.6-tracehook.patch
+ - linux-2.6-die-closed-source-bios-muppets-die.patch
+ - linux-2.6-intel-iommu-updates.patch
+ - linux-2.6-ksm.patch
+ - linux-2.6-ksm-updates.patch
+ - linux-2.6-ksm-fix-munlock.patch
+ - linux-2.6-vga-arb.patch
+ - v4l-dvb-fix-cx25840-firmware-loading.patch
+ - linux-2.6-rtc-show-hctosys.patch
+
 * Fri Sep 18 2009 Dave Jones <davej at redhat.com>
 - %ghost the dracut initramfs file.
 

linux-2.6-build-nonintconfig.patch:
 Makefile |    5 +++++
 conf.c   |   36 ++++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 4 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- linux-2.6-build-nonintconfig.patch	15 Sep 2009 14:47:35 -0000	1.16
+++ linux-2.6-build-nonintconfig.patch	28 Sep 2009 05:09:48 -0000	1.17
@@ -15,7 +15,7 @@ index 6d69c7c..ff84d12 100644
  # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
  # The symlink is used to repair a deficiency in arch/um
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 3baaaec..2a81742 100644
+index 9960d1c..ac8d455 100644
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
 @@ -23,6 +23,8 @@ enum {
@@ -27,16 +27,7 @@ index 3baaaec..2a81742 100644
  	set_default,
  	set_yes,
  	set_mod,
-@@ -40,6 +42,8 @@ static struct menu *rootEntry;
- 
- static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
- 
-+static int return_value = 0;
-+
- static const char *get_help(struct menu *menu)
- {
- 	if (menu_has_help(menu))
-@@ -360,7 +364,10 @@ static void conf(struct menu *menu)
+@@ -360,7 +362,10 @@ static void conf(struct menu *menu)
  
  		switch (prop->type) {
  		case P_MENU:
@@ -48,6 +39,15 @@ index 3baaaec..2a81742 100644
  				check_conf(menu);
  				return;
  			}
+@@ -406,6 +411,8 @@ conf_childs:
+ 		indent -= 2;
+ }
+ 
++static int return_value;
++
+ static void check_conf(struct menu *menu)
+ {
+ 	struct symbol *sym;
 @@ -418,12 +425,21 @@ static void check_conf(struct menu *menu)
  	if (sym && !sym_has_value(sym)) {
  		if (sym_is_changable(sym) ||

linux-2.6-debug-sizeof-structs.patch:
 main.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Index: linux-2.6-debug-sizeof-structs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-sizeof-structs.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- linux-2.6-debug-sizeof-structs.patch	8 Jul 2009 17:28:48 -0000	1.7
+++ linux-2.6-debug-sizeof-structs.patch	28 Sep 2009 05:09:48 -0000	1.8
@@ -1,19 +1,10 @@
-From 3def38bec43d38391d0c9e910dee10317b2ef250 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Wed, 8 Jul 2009 13:01:42 -0400
-Subject: [PATCH 1/6] fedora: linux-2.6-debug-sizeof-structs.patch
-
----
- init/main.c |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
 diff --git a/init/main.c b/init/main.c
-index 2c5ade7..1c25f08 100644
+index 7449819..98cfaae 100644
 --- a/init/main.c
 +++ b/init/main.c
-@@ -397,6 +397,10 @@ static void __init setup_per_cpu_areas(void)
+@@ -369,6 +369,10 @@ static void __init setup_nr_cpu_ids(void)
+ 	nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
  }
- #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
  
 +#include <linux/ext3_fs_i.h>
 +#include <linux/skbuff.h>
@@ -22,7 +13,7 @@ index 2c5ade7..1c25f08 100644
  /* Called by boot processor to activate the rest. */
  static void __init smp_init(void)
  {
-@@ -419,6 +423,15 @@ static void __init smp_init(void)
+@@ -391,6 +395,15 @@ static void __init smp_init(void)
  	/* Any cleanup work */
  	printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
  	smp_cpus_done(setup_max_cpus);
@@ -38,6 +29,3 @@ index 2c5ade7..1c25f08 100644
  }
  
  #endif
--- 
-1.6.2.5
-

linux-2.6-debug-vm-would-have-oomkilled.patch:
 kernel/sysctl.c |    9 +++++++++
 mm/oom_kill.c   |   15 +++++++++++++++
 2 files changed, 24 insertions(+)

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-debug-vm-would-have-oomkilled.patch	19 Aug 2009 12:46:27 -0000	1.4
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	28 Sep 2009 05:09:48 -0000	1.5
@@ -1,8 +1,8 @@
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index b2a2d68..3b132ee 100644
+index 0d949c5..8fb2bd9 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -67,6 +67,7 @@ extern int sysctl_overcommit_ratio;
+@@ -72,6 +72,7 @@ extern int sysctl_overcommit_ratio;
  extern int sysctl_panic_on_oom;
  extern int sysctl_oom_kill_allocating_task;
  extern int sysctl_oom_dump_tasks;
@@ -10,7 +10,7 @@ index b2a2d68..3b132ee 100644
  extern int max_threads;
  extern int core_uses_pid;
  extern int suid_dumpable;
-@@ -861,6 +862,14 @@ static struct ctl_table vm_table[] = {
+@@ -1073,6 +1074,14 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -26,7 +26,7 @@ index b2a2d68..3b132ee 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index f255eda..3335a94 100644
+index ea2147d..3b31a4a 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -37,7 +37,7 @@ index f255eda..3335a94 100644
  static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
-@@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
+@@ -356,6 +357,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
  		return;
  	}
  
@@ -50,16 +50,18 @@ index f255eda..3335a94 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -363,6 +370,12 @@ static int oom_kill_task(struct task_struct *p)
- 			return 1;
- 	} while_each_thread(g, q);
+@@ -384,6 +391,14 @@ static int oom_kill_task(struct task_struct *p)
+ 	if (!p->mm || p->signal->oom_adj == OOM_DISABLE)
+ 		return 1;
  
-+	if (sysctl_would_have_oomkilled == 1) {
-+		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
-+				task_pid_nr(p), p->comm);
-+		return 1;
-+	}
++	/*
++	 * Don't kill the process if any threads are set to OOM_DISABLE
++	 */
++	do_each_thread(g, q) {
++		if (q->mm == mm && q->oomkilladj == OOM_DISABLE)
++			return 1;
++	} while_each_thread(g, q);
 +
  	__oom_kill_task(p, 1);
  
- 	/*
+ 	return 0;

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  129 +++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c                    |    6 +
 arch/x86/mm/init_32.c                 |   48 ++++++++++++
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 24 files changed, 507 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- linux-2.6-execshield.patch	15 Sep 2009 14:47:35 -0000	1.109
+++ linux-2.6-execshield.patch	28 Sep 2009 05:09:48 -0000	1.110
@@ -71,10 +71,10 @@ index 80a1dee..8314c66 100644
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 40d6586..c75290e 100644
+index 8aebcc4..cbbd2b0 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
-@@ -306,6 +306,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+@@ -289,6 +289,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
  {
  	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
  }
@@ -88,10 +88,10 @@ index 40d6586..c75290e 100644
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index 25402d0..d825de0 100644
+index dd0f5b3..c2727ef 100644
 --- a/arch/x86/include/asm/paravirt_types.h
 +++ b/arch/x86/include/asm/paravirt_types.h
-@@ -132,6 +132,9 @@ struct pv_cpu_ops {
+@@ -118,6 +118,9 @@ struct pv_cpu_ops {
  	void (*store_gdt)(struct desc_ptr *);
  	void (*store_idt)(struct desc_ptr *);
  	void (*set_ldt)(const void *desc, unsigned entries);
@@ -102,10 +102,10 @@ index 25402d0..d825de0 100644
  	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
  #ifdef CONFIG_X86_64
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index e08ea04..329836f 100644
+index c3429e8..62cc460 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -160,6 +160,9 @@ static inline int hlt_works(int cpu)
+@@ -161,6 +161,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -116,10 +116,10 @@ index e08ea04..329836f 100644
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 2055fc2..68c1e79 100644
+index cc25c2b..6ce4863 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -799,6 +799,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -798,6 +798,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	/* Filter out anything that depends on CPUID levels we don't have */
  	filter_cpuid_features(c, true);
  
@@ -141,10 +141,10 @@ index 2055fc2..68c1e79 100644
  	if (!c->x86_model_id[0]) {
  		const char *p;
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index f5b0b4a..b102671 100644
+index 1b1739d..c2dda16 100644
 --- a/arch/x86/kernel/paravirt.c
 +++ b/arch/x86/kernel/paravirt.c
-@@ -370,6 +370,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -345,6 +345,9 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.read_tscp = native_read_tscp,
  	.load_tr_desc = native_load_tr_desc,
  	.set_ldt = native_set_ldt,
@@ -233,10 +233,10 @@ index 4cf7956..b2407dc 100644
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 8326492..4b645d3 100644
+index 7e37dce..92ae538 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -118,6 +118,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
+@@ -115,6 +115,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
  	if (!user_mode_vm(regs))
  		die(str, regs, err);
  }
@@ -313,7 +313,7 @@ index 8326492..4b645d3 100644
  #endif
  
  static void __kprobes
-@@ -276,6 +346,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -273,6 +343,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -343,7 +343,7 @@ index 8326492..4b645d3 100644
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -884,19 +977,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -881,19 +974,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -391,10 +391,10 @@ index 8326492..4b645d3 100644
  #endif
  
 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 0607119..a48b69c 100644
+index 73ffd55..0cf2a7b 100644
 --- a/arch/x86/mm/init.c
 +++ b/arch/x86/mm/init.c
-@@ -212,6 +212,12 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -149,6 +149,12 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
  	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
@@ -408,7 +408,7 @@ index 0607119..a48b69c 100644
  	/* Enable PSE if available */
  	if (cpu_has_pse)
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 3cd7711..771b1e5 100644
+index 30938c1..599e0a4 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
 @@ -591,6 +591,54 @@ void zap_low_mappings(bool early)
@@ -467,10 +467,10 @@ index 3cd7711..771b1e5 100644
  static unsigned int highmem_pages = -1;
  
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 1658296..72056cf 100644
+index c8191de..7d84d01 100644
 --- a/arch/x86/mm/mmap.c
 +++ b/arch/x86/mm/mmap.c
-@@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void)
+@@ -124,13 +124,16 @@ static unsigned long mmap_legacy_base(void)
   */
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
@@ -489,7 +489,7 @@ index 1658296..72056cf 100644
  	}
  }
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index c814e14..d4dd851 100644
+index 36fe08e..3806a45 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -6,6 +6,7 @@
@@ -500,7 +500,7 @@ index c814e14..d4dd851 100644
  #include <asm/tlbflush.h>
  #include <asm/mmu_context.h>
  #include <asm/apic.h>
-@@ -129,6 +130,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -130,6 +131,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	union smp_flush_state *f;
  
  	cpu = smp_processor_id();
@@ -527,7 +527,7 @@ index 58bc00f..1fdafb5 100644
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 0dd0c2c..661ecf1 100644
+index 3439616..31e5c6f 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -323,6 +323,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
@@ -555,7 +555,7 @@ index 0dd0c2c..661ecf1 100644
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long va = dtr->address;
-@@ -959,6 +977,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -949,6 +967,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -566,7 +566,7 @@ index 0dd0c2c..661ecf1 100644
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 7c1e65d..8d25676 100644
+index b9b3bb5..1e55926 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
 @@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
@@ -626,10 +626,10 @@ index 7c1e65d..8d25676 100644
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 9a72cc7..d571ff3 100644
+index 24c3956..88f944d 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1118,7 +1118,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1129,7 +1129,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -645,7 +645,7 @@ index 9a72cc7..d571ff3 100644
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 0042090..c675fb7 100644
+index 84a524a..a81e0db 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -206,6 +206,9 @@ struct mm_struct {
@@ -676,12 +676,12 @@ index 40fc7e6..68c2549 100644
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index f3d74bd..26417ac 100644
+index 75e6e60..0bce489 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -102,6 +102,9 @@ struct fs_struct;
  struct bts_context;
- struct perf_counter_context;
+ struct perf_event_context;
  
 +extern int exec_shield;
 +extern int print_fatal_signals;
@@ -689,7 +689,7 @@ index f3d74bd..26417ac 100644
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -373,6 +376,10 @@ extern int sysctl_max_map_count;
+@@ -378,6 +381,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -701,7 +701,7 @@ index f3d74bd..26417ac 100644
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 6bb59f7..58b2801 100644
+index 0d949c5..12ca319 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -88,6 +88,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
@@ -731,7 +731,7 @@ index 6bb59f7..58b2801 100644
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -403,6 +423,14 @@ static struct ctl_table kern_table[] = {
+@@ -408,6 +428,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -747,13 +747,13 @@ index 6bb59f7..58b2801 100644
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 8101de4..543272b 100644
+index 73f5e4b..814b95f 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -29,6 +29,7 @@
  #include <linux/rmap.h>
  #include <linux/mmu_notifier.h>
- #include <linux/perf_counter.h>
+ #include <linux/perf_event.h>
 +#include <linux/random.h>
  
  #include <asm/uaccess.h>
@@ -795,7 +795,7 @@ index 8101de4..543272b 100644
  }
  
  /*
-@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -798,6 +815,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -804,7 +804,7 @@ index 8101de4..543272b 100644
  		return prev;
  	}
  
-@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -970,7 +989,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -814,7 +814,7 @@ index 8101de4..543272b 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1453,13 +1473,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -835,7 +835,7 @@ index 8101de4..543272b 100644
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1473,8 +1497,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -913,7 +913,7 @@ index 8101de4..543272b 100644
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1535,6 +1627,14 @@ out:
+@@ -1549,6 +1641,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -928,7 +928,7 @@ index 8101de4..543272b 100644
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1565,7 +1665,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -937,7 +937,7 @@ index 8101de4..543272b 100644
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1875,10 +1975,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -954,8 +954,8 @@ index 8101de4..543272b 100644
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2113,6 +2217,7 @@ void exit_mmap(struct mm_struct *mm)
- 	vm_unacct_memory(nr_accounted);
+@@ -2128,6 +2232,7 @@ void exit_mmap(struct mm_struct *mm)
+ 
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
 +	arch_flush_exec_range(mm);
@@ -963,11 +963,11 @@ index 8101de4..543272b 100644
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index d80311b..032423d 100644
+index 8bc969d..3c9b4fc 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
 @@ -26,9 +26,14 @@
- #include <linux/perf_counter.h>
+ #include <linux/perf_event.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
@@ -1001,10 +1001,10 @@ index d80311b..032423d 100644
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index a39b7b9..6bebfde 100644
+index 97bff25..17a9fd7 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,
+@@ -414,8 +414,8 @@ unsigned long do_mremap(unsigned long addr,
  			if (vma->vm_flags & VM_MAYSHARE)
  				map_flags |= MAP_SHARED;
  

linux-2.6-makefile-after_link.patch:
 Makefile                            |    4 ++++
 arch/powerpc/kernel/vdso32/Makefile |    3 ++-
 arch/powerpc/kernel/vdso64/Makefile |    3 ++-
 arch/x86/vdso/Makefile              |    3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

Index: linux-2.6-makefile-after_link.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-makefile-after_link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-makefile-after_link.patch	7 Oct 2008 21:58:20 -0000	1.1
+++ linux-2.6-makefile-after_link.patch	28 Sep 2009 05:09:49 -0000	1.2
@@ -1,24 +1,8 @@
-From f072f7db2194c8255c003d985b61ad2f97ebbee0 Mon Sep 17 00:00:00 2001
-From: Roland McGrath <roland at redhat.com>
-Date: Mon, 6 Oct 2008 23:03:03 -0700
-Subject: [PATCH] kbuild: AFTER_LINK
-
-If the make variable AFTER_LINK is set, it is a command line to run
-after each final link.  This includes vmlinux itself and vDSO images.
-
-Signed-off-by: Roland McGrath <roland at redhat.com>
----
- Makefile                            |    4 ++++
- arch/powerpc/kernel/vdso32/Makefile |    3 ++-
- arch/powerpc/kernel/vdso64/Makefile |    3 ++-
- arch/x86/vdso/Makefile              |    3 ++-
- 4 files changed, 10 insertions(+), 3 deletions(-)
-
 diff --git a/Makefile b/Makefile
-index ce9eceb..b27b1b7 100644
+index f908acc..960ff6f 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -679,6 +679,10 @@ quiet_cmd_vmlinux__ ?= LD      $@
+@@ -746,6 +746,10 @@ quiet_cmd_vmlinux__ ?= LD      $@
        --start-group $(vmlinux-main) --end-group                  \
        $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^)
  
@@ -30,10 +14,10 @@ index ce9eceb..b27b1b7 100644
  quiet_cmd_vmlinux_version = GEN     .version
        cmd_vmlinux_version = set -e;                     \
 diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
-index c3d57bd..c9519c5 100644
+index 51ead52..ad21273 100644
 --- a/arch/powerpc/kernel/vdso32/Makefile
 +++ b/arch/powerpc/kernel/vdso32/Makefile
-@@ -40,7 +40,8 @@ $(obj-vdso32): %.o: %.S
+@@ -41,7 +41,8 @@ $(obj-vdso32): %.o: %.S
  
  # actual build commands
  quiet_cmd_vdso32ld = VDSO32L $@
@@ -44,10 +28,10 @@ index c3d57bd..c9519c5 100644
        cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
-index fa7f1b8..712fe1d 100644
+index 79da65d..f11c21b 100644
 --- a/arch/powerpc/kernel/vdso64/Makefile
 +++ b/arch/powerpc/kernel/vdso64/Makefile
-@@ -34,7 +34,8 @@ $(obj-vdso64): %.o: %.S
+@@ -36,7 +36,8 @@ $(obj-vdso64): %.o: %.S
  
  # actual build commands
  quiet_cmd_vdso64ld = VDSO64L $@
@@ -58,7 +42,7 @@ index fa7f1b8..712fe1d 100644
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 4d6ef0a..5203ae9 100644
+index 6b4ffed..cbc3d05 100644
 --- a/arch/x86/vdso/Makefile
 +++ b/arch/x86/vdso/Makefile
 @@ -120,7 +120,8 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
@@ -69,8 +53,5 @@ index 4d6ef0a..5203ae9 100644
 +		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \
 +		 $(if $(AFTER_LINK),; $(AFTER_LINK))
  
- VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
- 
--- 
-1.5.5.1
-
+ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+ GCOV_PROFILE := n

linux-2.6-serial-460800.patch:
 8250.c |   29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

Index: linux-2.6-serial-460800.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-serial-460800.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-serial-460800.patch	28 May 2007 01:22:43 -0000	1.2
+++ linux-2.6-serial-460800.patch	28 Sep 2009 05:09:49 -0000	1.3
@@ -1,9 +1,7 @@
-http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
-http://lkml.org/lkml/2006/8/2/208
-
---- linux-2.6.13-org/drivers/serial/8250.c	2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/serial/8250.c	2005-09-16 12:18:14.000000000 +0200
+diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
+index 2209620..659c1bb 100644
+--- a/drivers/serial/8250.c
++++ b/drivers/serial/8250.c
 @@ -7,6 +7,9 @@
   *
   *  Copyright (C) 2001 Russell King.
@@ -14,7 +12,7 @@ http://lkml.org/lkml/2006/8/2/208
   * 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
-@@ -1652,6 +1655,14 @@
+@@ -2227,6 +2230,14 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int
  	else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
  		 baud == (port->uartclk/8))
  		quot = 0x8002;
@@ -29,7 +27,7 @@ http://lkml.org/lkml/2006/8/2/208
  	else
  		quot = uart_get_divisor(port, baud);
  
-@@ -1665,7 +1676,7 @@
+@@ -2240,7 +2251,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
  	struct uart_8250_port *up = (struct uart_8250_port *)port;
  	unsigned char cval, fcr = 0;
  	unsigned long flags;
@@ -38,21 +36,22 @@ http://lkml.org/lkml/2006/8/2/208
  
  	switch (termios->c_cflag & CSIZE) {
  	case CS5:
-@@ -2034,7 +2034,8 @@ serial8250_set_termios(struct uart_port 
+@@ -2272,9 +2283,10 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
  	/*
  	 * Ask the core to calculate the divisor for us.
  	 */
--	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
 +	max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16);
-+	baud = uart_get_baud_rate(port, termios, old, 0, max_baud);
+ 	baud = uart_get_baud_rate(port, termios, old,
+ 				  port->uartclk / 16 / 0xffff,
+-				  port->uartclk / 16);
++				  max_baud);
  	quot = serial8250_get_divisor(port, baud);
  
  	/*
-@@ -1733,6 +1745,19 @@
- 	 */
+@@ -2311,6 +2323,19 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
  	spin_lock_irqsave(&up->port.lock, flags);
  
-+	/*
+ 	/*
 +	 * 16C950 supports additional prescaler ratios between 1:16 and 1:4
 +	 * thus increasing max baud rate to uartclk/4.
 +	 */
@@ -65,7 +64,7 @@ http://lkml.org/lkml/2006/8/2/208
 +			serial_icr_write(up, UART_TCR, 0);
 +	}
 +
- 	/*
++	/*
  	 * Update the per-port timeout.
  	 */
-
+ 	uart_update_timeout(port, termios->c_cflag, baud);

linux-2.6-utrace.patch:
 Documentation/DocBook/Makefile    |    2 
 Documentation/DocBook/utrace.tmpl |  590 +++++++++
 fs/proc/array.c                   |    3 
 include/linux/init_task.h         |    1 
 include/linux/sched.h             |    6 
 include/linux/tracehook.h         |   62 
 include/linux/utrace.h            |  692 +++++++++++
 include/linux/utrace_struct.h     |   58 
 init/Kconfig                      |    9 
 kernel/Makefile                   |    1 
 kernel/ptrace.c                   |   32 
 kernel/utrace.c                   | 2357 ++++++++++++++++++++++++++++++++++++++
 12 files changed, 3809 insertions(+), 4 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- linux-2.6-utrace.patch	25 Jun 2009 01:27:31 -0000	1.117
+++ linux-2.6-utrace.patch	28 Sep 2009 05:09:49 -0000	1.118
@@ -1,5 +1,5 @@
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 9632444..bf4b9e8 100644
+index ab8300f..95f59e4 100644
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
@@ -608,18 +608,18 @@ index 0000000..6cc58a1
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 725a650..e299a63 100644
+index 07f77a7..882dc90 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
-@@ -82,6 +82,7 @@
- #include <linux/pid_namespace.h>
+@@ -83,6 +83,7 @@
  #include <linux/ptrace.h>
  #include <linux/tracehook.h>
+ #include <linux/swapops.h>
 +#include <linux/utrace.h>
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
+@@ -189,6 +190,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);
  
@@ -629,22 +629,22 @@ index 725a650..e299a63 100644
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index 5368fbd..aecd24e 100644
+index 21a6f5d..a598a6b 100644
 --- a/include/linux/init_task.h
 +++ b/include/linux/init_task.h
-@@ -167,6 +167,7 @@ extern struct cred init_cred;
+@@ -177,6 +177,7 @@ extern struct cred init_cred;
  		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
  	},								\
  	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
 +	INIT_UTRACE(tsk)						\
  	INIT_IDS							\
- 	INIT_PERF_COUNTERS(tsk)						\
+ 	INIT_PERF_EVENTS(tsk)						\
  	INIT_TRACE_IRQFLAGS						\
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 4d07542..2060aa1 100644
+index 75e6e60..94ca5c5 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -59,6 +59,7 @@ struct sched_param {
+@@ -61,6 +61,7 @@ struct sched_param {
  #include <linux/errno.h>
  #include <linux/nodemask.h>
  #include <linux/mm_types.h>
@@ -652,7 +652,7 @@ index 4d07542..2060aa1 100644
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -1313,6 +1314,11 @@ struct task_struct {
+@@ -1393,6 +1394,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -665,7 +665,7 @@ index 4d07542..2060aa1 100644
     	u32 parent_exec_id;
     	u32 self_exec_id;
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 7c2bfd9..a91d9a4 100644
+index 1eb44a9..17c103e 100644
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -811,16 +811,17 @@ index 7c2bfd9..a91d9a4 100644
  	return 0;
  }
  
-@@ -485,6 +516,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
+@@ -485,6 +516,9 @@ static inline int tracehook_get_signal(struct task_struct *task,
   */
  static inline int tracehook_notify_jctl(int notify, int why)
  {
 +	if (task_utrace_flags(current) & UTRACE_EVENT(JCTL))
 +		utrace_report_jctl(notify, why);
++
  	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
  }
  
-@@ -508,6 +541,8 @@ static inline int tracehook_notify_jctl(int notify, int why)
+@@ -517,6 +551,8 @@ static inline void tracehook_finish_jctl(void)
  static inline int tracehook_notify_death(struct task_struct *task,
  					 void **death_cookie, int group_dead)
  {
@@ -829,7 +830,7 @@ index 7c2bfd9..a91d9a4 100644
  	if (task_detached(task))
  		return task->ptrace ? SIGCHLD : DEATH_REAP;
  
-@@ -544,6 +579,20 @@ static inline void tracehook_report_death(struct task_struct *task,
+@@ -553,6 +589,20 @@ static inline void tracehook_report_death(struct task_struct *task,
  					  int signal, void *death_cookie,
  					  int group_dead)
  {
@@ -850,7 +851,7 @@ index 7c2bfd9..a91d9a4 100644
  }
  
  #ifdef TIF_NOTIFY_RESUME
-@@ -573,10 +622,20 @@ static inline void set_notify_resume(struct task_struct *task)
+@@ -582,10 +632,20 @@ static inline void set_notify_resume(struct task_struct *task)
   * asynchronously, this will be called again before we return to
   * user mode.
   *
@@ -1635,10 +1636,10 @@ index 0000000..aba7e09
 +
 +#endif	/* linux/utrace_struct.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 1ce05a4..f720929 100644
+index c7bac39..96993b2 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1191,6 +1191,15 @@ config STOP_MACHINE
+@@ -1187,6 +1187,15 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1655,10 +1656,10 @@ index 1ce05a4..f720929 100644
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 780c8dc..cd16d49 100644
+index b8d4cd8..8f41620 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -69,6 +69,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
  obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
  obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -1667,7 +1668,7 @@ index 780c8dc..cd16d49 100644
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_GCOV_KERNEL) += gcov/
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 61c78b2..935eeee 100644
+index 23bd09c..470f604 100644
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1718,7 +1719,7 @@ index 61c78b2..935eeee 100644
  		ret = security_ptrace_traceme(current->parent);
  		/*
  		 * Check PF_EXITING to ensure ->real_parent has not passed
-@@ -577,7 +595,17 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -580,7 +598,17 @@ int ptrace_request(struct task_struct *child, long request,
  	return ret;
  }
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -u -p -r1.1086 -r1.1087
--- sources	15 Sep 2009 14:47:35 -0000	1.1086
+++ sources	28 Sep 2009 05:09:49 -0000	1.1087
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-3894e5c148d260a7cb891b86a1939f69  patch-2.6.31-git4.bz2
+53e607f1d8eab73b69d3ad6ebfd1bc71  patch-2.6.31-git18.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -p -r1.1000 -r1.1001
--- upstream	15 Sep 2009 14:47:35 -0000	1.1000
+++ upstream	28 Sep 2009 05:09:49 -0000	1.1001
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31-git4.bz2
+patch-2.6.31-git18.bz2

via-hwmon-temp-sensor.patch:
 Kconfig       |    8 +
 Makefile      |    1 
 via-cputemp.c |  354 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 363 insertions(+)

Index: via-hwmon-temp-sensor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/via-hwmon-temp-sensor.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- via-hwmon-temp-sensor.patch	19 Jun 2009 21:49:01 -0000	1.3
+++ via-hwmon-temp-sensor.patch	28 Sep 2009 05:09:49 -0000	1.4
@@ -1,14 +1,10 @@
-Subject: hwmon: Add driver for VIA CPU core temperature
-Now at patch ../patches/1-linux-2.6-via.git-bb3796c7c8d2209e7c3ab112f32ec4dec63e0d48.patch
-
-Subject: hwmon: Make sure via-cputemp complies with hwmon conventions
-Now at patch ../patches/2-linux-2.6-via.git-d2891d15eeef1033893dcc524543e8ad8fef019f.patch
-
---- work-2.6.29.4.orig/drivers/hwmon/Kconfig
-+++ work-2.6.29.4/drivers/hwmon/Kconfig
-@@ -720,6 +720,14 @@ config SENSORS_THMC50
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 6857560..4414182 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -795,6 +795,14 @@ config SENSORS_TMP421
  	  This driver can also be built as a module.  If so, the module
- 	  will be called tmp401.
+ 	  will be called tmp421.
  
 +config SENSORS_VIA_CPUTEMP
 +	tristate "VIA CPU temperature sensor"
@@ -21,18 +17,23 @@ Now at patch ../patches/2-linux-2.6-via.
  config SENSORS_VIA686A
  	tristate "VIA686A"
  	depends on PCI
---- work-2.6.29.4.orig/drivers/hwmon/Makefile
-+++ work-2.6.29.4/drivers/hwmon/Makefile
-@@ -75,6 +75,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc4
- obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 9f46cb0..32ed56a 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -85,6 +85,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
  obj-$(CONFIG_SENSORS_THMC50)	+= thmc50.o
  obj-$(CONFIG_SENSORS_TMP401)	+= tmp401.o
+ obj-$(CONFIG_SENSORS_TMP421)	+= tmp421.o
 +obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o
  obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o
  obj-$(CONFIG_SENSORS_VT1211)	+= vt1211.o
  obj-$(CONFIG_SENSORS_VT8231)	+= vt8231.o
+diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
+new file mode 100644
+index 0000000..2abe516
 --- /dev/null
-+++ work-2.6.29.4/drivers/hwmon/via-cputemp.c
++++ b/drivers/hwmon/via-cputemp.c
 @@ -0,0 +1,354 @@
 +/*
 + * via-cputemp.c - Driver for VIA CPU core temperature monitoring


--- linux-2.6-die-closed-source-bios-muppets-die.patch DELETED ---


--- linux-2.6-intel-iommu-updates.patch DELETED ---


--- linux-2.6-ksm-fix-munlock.patch DELETED ---


--- linux-2.6-ksm-updates.patch DELETED ---


--- linux-2.6-ksm.patch DELETED ---


--- linux-2.6-rtc-show-hctosys.patch DELETED ---


--- patch-2.6.31-git4.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Mon Sep 28 05:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 05:13:56 +0000
Subject: [pkgdb] ghc-cgi F-11 cloned from devel
Message-ID: <20090928051356.8807410F86A@bastion2.fedora.phx.redhat.com>

petersen cloned ghc-cgi F-11 from devel

To make changes to this package see:
  /pkgdb/packages/name/ghc-cgi



From pkgdb at fedoraproject.org  Mon Sep 28 05:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 05:15:40 +0000
Subject: [pkgdb] ghc-network F-11 cloned from devel
Message-ID: <20090928051540.73ABB10F85F@bastion2.fedora.phx.redhat.com>

petersen cloned ghc-network F-11 from devel

To make changes to this package see:
  /pkgdb/packages/name/ghc-network



From pkgdb at fedoraproject.org  Mon Sep 28 05:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 05:15:49 +0000
Subject: [pkgdb] ghc-time F-11 cloned from devel
Message-ID: <20090928051549.1DAB610F85F@bastion2.fedora.phx.redhat.com>

petersen cloned ghc-time F-11 from devel

To make changes to this package see:
  /pkgdb/packages/name/ghc-time



From petersen at fedoraproject.org  Mon Sep 28 05:32:13 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:32:13 +0000 (UTC)
Subject: rpms/alex/F-11 alex.spec,1.13,1.14
Message-ID: <20090928053213.3146511C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/alex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25910

Modified Files:
	alex.spec 
Log Message:
- sync with devel: BR ghc-rpm-macros
- add comment for haskell-platform-2009.2.0.1



Index: alex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alex/F-11/alex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- alex.spec	9 Mar 2009 22:28:23 -0000	1.13
+++ alex.spec	28 Sep 2009 05:32:12 -0000	1.14
@@ -2,8 +2,9 @@
 %global debug_package %{nil}
 
 Name:           alex
+# part of haskell-platform-2009.2.0.1
 Version:        2.3.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A lexer generator for Haskell
 
 Group:          Development/Tools
@@ -13,7 +14,7 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
+BuildRequires:  ghc, ghc-rpm-macros
 BuildRequires:  autoconf docbook-style-xsl libxslt
 
 %description
@@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 17 2009 Jens Petersen <petersen at redhat.com> - 2.3.1-5
+- buildrequires ghc-rpm-macros
+
 * Tue Mar 10 2009 Jens Petersen <petersen at redhat.com> - 2.3.1-3
 - update arch list and bring closer to cabal2spec-0.12
 



From petersen at fedoraproject.org  Mon Sep 28 05:34:33 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:34:33 +0000 (UTC)
Subject: rpms/cabal-install/F-11 cabal-install.spec,1.5,1.6
Message-ID: <20090928053433.E582F11C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal-install/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26584

Modified Files:
	cabal-install.spec 
Log Message:
downgrade haskell-platform comment to 2009.2.0.1


Index: cabal-install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal-install/F-11/cabal-install.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cabal-install.spec	22 Sep 2009 08:39:10 -0000	1.5
+++ cabal-install.spec	28 Sep 2009 05:34:33 -0000	1.6
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 Name:           cabal-install
-# part of haskell-platform-2009.2.0.2
+# part of haskell-platform-2009.2.0.1
 Version:        0.6.2
 Release:        5%{?dist}
 Summary:        Haskell package tool



From petersen at fedoraproject.org  Mon Sep 28 05:39:09 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:39:09 +0000 (UTC)
Subject: rpms/ghc/F-11 ghc.spec,1.83,1.84
Message-ID: <20090928053909.2105011C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27479/F-11

Modified Files:
	ghc.spec 
Log Message:
version haskell-platform note


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/F-11/ghc.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ghc.spec	31 May 2009 23:45:58 -0000	1.83
+++ ghc.spec	28 Sep 2009 05:39:08 -0000	1.84
@@ -27,7 +27,7 @@
 %global package_debugging 0
 
 Name: ghc
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.1
 Version: 6.10.3
 Release: 3%{?dist}
 Summary: Glasgow Haskell Compilation system



From petersen at fedoraproject.org  Mon Sep 28 05:39:09 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:39:09 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.95,1.96
Message-ID: <20090928053909.4C09A11C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27479/devel

Modified Files:
	ghc.spec 
Log Message:
version haskell-platform note


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ghc.spec	25 Jul 2009 00:03:07 -0000	1.95
+++ ghc.spec	28 Sep 2009 05:39:09 -0000	1.96
@@ -27,7 +27,7 @@
 %global package_debugging 0
 
 Name: ghc
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.2
 Version: 6.10.4
 Release: 2%{?dist}
 Summary: Glasgow Haskell Compilation system



From petersen at fedoraproject.org  Mon Sep 28 05:47:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:47:17 +0000 (UTC)
Subject: rpms/ghc-fgl/F-11 ghc-fgl.spec,1.1,1.2
Message-ID: <20090928054717.72B1311C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-fgl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28768

Modified Files:
	ghc-fgl.spec 
Log Message:
add note on haskell-platform


Index: ghc-fgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-fgl/F-11/ghc-fgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-fgl.spec	14 Sep 2009 05:55:35 -0000	1.1
+++ ghc-fgl.spec	28 Sep 2009 05:47:16 -0000	1.2
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.1
 Version:        5.4.2.2
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Mon Sep 28 05:49:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:49:25 +0000 (UTC)
Subject: rpms/ghc-GLUT/F-11 ghc-GLUT.spec,1.2,1.3
Message-ID: <20090928054925.1D19011C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-GLUT/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29145

Modified Files:
	ghc-GLUT.spec 
Log Message:
version haskell-platform comment


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-GLUT/F-11/ghc-GLUT.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-GLUT.spec	11 Sep 2009 19:25:08 -0000	1.2
+++ ghc-GLUT.spec	28 Sep 2009 05:49:24 -0000	1.3
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.1
 Version:        2.1.1.2
 Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Mon Sep 28 05:53:44 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 05:53:44 +0000 (UTC)
Subject: rpms/ghc-OpenGL/F-11 ghc-OpenGL.spec,1.1,1.2
Message-ID: <20090928055344.B300D11C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-OpenGL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30481

Modified Files:
	ghc-OpenGL.spec 
Log Message:
- sync with devel
- add haskell-platform-2009.2.0.1 note



Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-OpenGL/F-11/ghc-OpenGL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-OpenGL.spec	27 Aug 2009 19:52:37 -0000	1.1
+++ ghc-OpenGL.spec	28 Sep 2009 05:53:44 -0000	1.2
@@ -7,6 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.1
 Version:        2.2.1.1
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
@@ -20,6 +21,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc
 BuildRequires:  ghc-rpm-macros
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -35,10 +37,10 @@ These provide bindings to the OpenGL gra
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel
+Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
+Requires:       mesa-libGL-devel, mesa-libGLU-devel
 
 %description devel
 This package contains the development files for %{name}



From petersen at fedoraproject.org  Mon Sep 28 06:00:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 06:00:05 +0000 (UTC)
Subject: rpms/ghc-zlib/F-11 ghc-zlib.spec,1.11,1.12
Message-ID: <20090928060005.7B65B11C0424@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31700

Modified Files:
	ghc-zlib.spec 
Log Message:
version haskell-platform comment


Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/F-11/ghc-zlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ghc-zlib.spec	30 May 2009 10:08:40 -0000	1.11
+++ ghc-zlib.spec	28 Sep 2009 06:00:05 -0000	1.12
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.1
 Version:        0.5.0.0
 Release:        9%{?dist}
 Summary:        Haskell compression and decompression library binding



From petersen at fedoraproject.org  Mon Sep 28 06:05:45 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 06:05:45 +0000 (UTC)
Subject: rpms/ghc-time/F-11 ghc-time.spec,1.1,1.2
Message-ID: <20090928060545.B742011C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-time/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv702

Modified Files:
	ghc-time.spec 
Log Message:
lower haskell-platform version


Index: ghc-time.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-time/F-11/ghc-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-time.spec	28 Sep 2009 00:22:37 -0000	1.1
+++ ghc-time.spec	28 Sep 2009 06:05:45 -0000	1.2
@@ -10,6 +10,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.1
 Version:        1.1.2.4
 Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Mon Sep 28 06:17:52 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 06:17:52 +0000 (UTC)
Subject: rpms/ghc-network/F-11 ghc-network.spec,1.2,1.3
Message-ID: <20090928061752.C937411C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-network/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3559

Modified Files:
	ghc-network.spec 
Log Message:
version 2.2.1.1 for haskell-platform-2009.2.0.1


Index: ghc-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-network/F-11/ghc-network.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-network.spec	24 Sep 2009 04:07:38 -0000	1.2
+++ ghc-network.spec	28 Sep 2009 06:17:51 -0000	1.3
@@ -10,9 +10,9 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2009.2.0.2
-Version:        2.2.1.4
-Release:        2%{?dist}
+# part of haskell-platform-2009.2.0.1
+Version:        2.2.1.1
+Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -139,8 +139,11 @@ fi
 
 
 %changelog
-* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.4-2
+* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.1-1
+- 2.2.1.1 for haskell-platform-2009.2.0.1
+
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com>
 - version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)
 
-* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.4-1
+* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com>
 - initial packaging for Fedora created by cabal2spec



From petersen at fedoraproject.org  Mon Sep 28 06:19:19 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 06:19:19 +0000 (UTC)
Subject: rpms/ghc-network/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090928061919.C6AAB11C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-network/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4172

Modified Files:
	.cvsignore sources 
Log Message:
2.2.1.1 src


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-network/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 02:41:48 -0000	1.2
+++ .cvsignore	28 Sep 2009 06:19:19 -0000	1.3
@@ -1 +1 @@
-network-2.2.1.4.tar.gz
+network-2.2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-network/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 02:41:48 -0000	1.2
+++ sources	28 Sep 2009 06:19:19 -0000	1.3
@@ -1 +1 @@
-639baaeeb9ccc2f2013bbfa3b376f14b  network-2.2.1.4.tar.gz
+5dd1dd5ad97df134bc01e1d796daeb4c  network-2.2.1.1.tar.gz



From nim at fedoraproject.org  Mon Sep 28 07:24:38 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 28 Sep 2009 07:24:38 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts/devel apanov-edrip-fonts-bolditalic.patch, 
	NONE, 1.1 apanov-edrip-fonts.spec, 1.8, 1.9 import.log, 1.5, 1.6
Message-ID: <20090928072438.CB10B11C00E4@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19520/devel

Modified Files:
	apanov-edrip-fonts.spec import.log 
Added Files:
	apanov-edrip-fonts-bolditalic.patch 
Log Message:
fix bolditalic

apanov-edrip-fonts-bolditalic.patch:
 Edrip-BoldItalic.sfd |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE apanov-edrip-fonts-bolditalic.patch ---
--- orig/Edrip-BoldItalic.sfd	2008-10-06 14:27:35.000000000 +0200
+++ new/Edrip-BoldItalic.sfd	2009-09-28 08:53:05.292888804 +0200
@@ -65,8 +65,8 @@
   68
   1297
 EndShort
-LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "" "" "Copyright (c) 2007-2008, Andrey V. Panov (panov at canopus.iacp.dvo.ru),+AAoA-with Reserved Font Name Edrip.+AAoACgAA-This Font Software is licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is copied together with this font package in OFL.txt, +AAoA-and is also available with a FAQ at:+AAoA-http://scripts.sil.org/OFL" "http://scripts.sil.org/ofl" 
 LangName: 1049 "" "+BBUENARABDgEPwAA" 
+LangName: 1033 "" "" "Bold Italic" "" "" "" "" "" "" "" "" "" "" "Copyright (c) 2007-2008, Andrey V. Panov (panov at canopus.iacp.dvo.ru),+AAoA-with Reserved Font Name Edrip.+AAoACgAA-This Font Software is licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is copied together with this font package in OFL.txt, +AAoA-and is also available with a FAQ at:+AAoA-http://scripts.sil.org/OFL" "http://scripts.sil.org/ofl" 
 Encoding: UnicodeBmp
 Compacted: 1
 UnicodeInterp: none


Index: apanov-edrip-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/apanov-edrip-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- apanov-edrip-fonts.spec	24 Jul 2009 16:56:50 -0000	1.8
+++ apanov-edrip-fonts.spec	28 Sep 2009 07:24:37 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:    %{fontname}-fonts
 Version: 20081007
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A decorative contrast sans-serif font
 
 Group:     User Interface/X
@@ -14,6 +14,7 @@ URL:       ftp://ftp.dvo.ru/pub/Font/edr
 Source0:   %{url}%{archivename}.tar.bz2
 Source1:   %{name}-fontconfig.conf
 Patch0:    %{name}-license.patch
+Patch1:    %{name}-bolditalic.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:     noarch
@@ -32,6 +33,7 @@ Latin alphabets.
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags} all
@@ -61,14 +63,21 @@ rm -fr %{buildroot}
 %doc *.txt README
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081007-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 25 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20081007-10
+? fix BoldItalic naming
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20081007-9
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 20081007-8
+* Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20081007-8
 ? Make sure F11 font packages have been built with F11 fontforge
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081007-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20081007-7
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Feb 22 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20081007-6


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Mar 2009 19:16:03 -0000	1.5
+++ import.log	28 Sep 2009 07:24:37 -0000	1.6
@@ -3,3 +3,4 @@ apanov-edrip-fonts-20081007-4_fc11:HEAD:
 apanov-edrip-fonts-20081007-6_fc11:HEAD:apanov-edrip-fonts-20081007-6.fc11.src.rpm:1235299600
 apanov-edrip-fonts-20081007-6_fc11:HEAD:apanov-edrip-fonts-20081007-6.fc11.src.rpm:1235377546
 apanov-edrip-fonts-20081007-8_fc11:HEAD:apanov-edrip-fonts-20081007-8.fc11.src.rpm:1237144512
+apanov-edrip-fonts-20081007-10_fc12:HEAD:apanov-edrip-fonts-20081007-10.fc12.src.rpm:1254122643



From markmc at fedoraproject.org  Mon Sep 28 07:30:15 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 28 Sep 2009 07:30:15 +0000 (UTC)
Subject: rpms/qemu/devel qemu-add-ksm-support.patch, 1.4,
	1.5 qemu-allow-pulseaudio-to-be-the-default.patch, 1.2,
	1.3 qemu-bios-bigger-roms.patch, 1.11,
	1.12 qemu-correctly-free-nic-info-structure.patch, 1.1,
	1.2 qemu-fix-linux-user-build-on-ppc.patch, 1.7, 1.8 qemu.spec,
	1.131, 1.132 sources, 1.21,
	1.22 qemu-fix-msix-error-handling-on-older-kernels.patch, 1.3,
	NONE qemu-fix-no-kvm-segfault.patch, 1.4, NONE
Message-ID: <20090928073015.F1BDD11C0424@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21108

Modified Files:
	qemu-add-ksm-support.patch 
	qemu-allow-pulseaudio-to-be-the-default.patch 
	qemu-bios-bigger-roms.patch 
	qemu-correctly-free-nic-info-structure.patch 
	qemu-fix-linux-user-build-on-ppc.patch qemu.spec sources 
Removed Files:
	qemu-fix-msix-error-handling-on-older-kernels.patch 
	qemu-fix-no-kvm-segfault.patch 
Log Message:
* Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-1
- Update to 0.11.0 release
- Drop a couple of upstreamed patches


qemu-add-ksm-support.patch:
 exec.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: qemu-add-ksm-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-ksm-support.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qemu-add-ksm-support.patch	16 Sep 2009 22:20:32 -0000	1.4
+++ qemu-add-ksm-support.patch	28 Sep 2009 07:30:15 -0000	1.5
@@ -1,4 +1,4 @@
-From ef44e9475ab38ec73b30e83241279170fac06b22 Mon Sep 17 00:00:00 2001
+From c6c94b043e8b3593d0beb52966dce43069233840 Mon Sep 17 00:00:00 2001
 From: Izik Eidus <ieidus at redhat.com>
 Date: Tue, 28 Jul 2009 19:14:26 +0300
 Subject: [PATCH] kvm userspace: ksm support

qemu-allow-pulseaudio-to-be-the-default.patch:
 paaudio.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: qemu-allow-pulseaudio-to-be-the-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-allow-pulseaudio-to-be-the-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-allow-pulseaudio-to-be-the-default.patch	7 Sep 2009 14:22:20 -0000	1.2
+++ qemu-allow-pulseaudio-to-be-the-default.patch	28 Sep 2009 07:30:15 -0000	1.3
@@ -1,4 +1,4 @@
-From 4f5019c88e710be0aa597c81017b683d494c532d Mon Sep 17 00:00:00 2001
+From 8ab0d97572264051176ff45171484fa463d1287f Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 4 Sep 2009 11:24:03 +0100
 Subject: [PATCH] Allow pulseaudio backend to be the default

qemu-bios-bigger-roms.patch:
 rombios.c |   34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- qemu-bios-bigger-roms.patch	7 Sep 2009 14:22:20 -0000	1.11
+++ qemu-bios-bigger-roms.patch	28 Sep 2009 07:30:15 -0000	1.12
@@ -1,4 +1,4 @@
-From f751c8937a81116469149357359c767a71ee8ebd Mon Sep 17 00:00:00 2001
+From b5c99e96655e8dc938f801e1ac0dbdf2d6dfba37 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:31:41 +0100
 Subject: [PATCH] compute checksum for roms bigger than a segment

qemu-correctly-free-nic-info-structure.patch:
 net.c |   16 +++++++++++-----
 net.h |    8 ++++----
 vl.c  |    3 +--
 3 files changed, 16 insertions(+), 11 deletions(-)

Index: qemu-correctly-free-nic-info-structure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-correctly-free-nic-info-structure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-correctly-free-nic-info-structure.patch	23 Sep 2009 11:31:31 -0000	1.1
+++ qemu-correctly-free-nic-info-structure.patch	28 Sep 2009 07:30:15 -0000	1.2
@@ -1,4 +1,4 @@
-From 2b76390876db26fb279d26de86b2c0b8260ff142 Mon Sep 17 00:00:00 2001
+From 3675a0dde74f890404f392e194f1adc6b24285f7 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 23 Sep 2009 09:49:43 +0100
 Subject: [PATCH] Correctly free nd structure
@@ -29,10 +29,10 @@ Fedora-patch: qemu-correctly-free-nic-in
  3 files changed, 16 insertions(+), 10 deletions(-)
 
 diff --git a/net.c b/net.c
-index 61c9649..b58945f 100644
+index a1c1111..da2f428 100644
 --- a/net.c
 +++ b/net.c
-@@ -2564,7 +2564,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
+@@ -2559,7 +2559,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
      int i, exit_status = 0;
  
      if (!nd->model)
@@ -41,7 +41,7 @@ index 61c9649..b58945f 100644
  
      if (strcmp(nd->model, "?") != 0) {
          for (i = 0 ; models[i]; i++)
-@@ -2634,6 +2634,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
+@@ -2629,6 +2629,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
              goto out;
          }
          nd = &nd_table[idx];
@@ -49,7 +49,7 @@ index 61c9649..b58945f 100644
          macaddr = nd->macaddr;
          macaddr[0] = 0x52;
          macaddr[1] = 0x54;
-@@ -2650,13 +2651,13 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
+@@ -2645,13 +2646,13 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
              }
          }
          if (get_param_value(buf, sizeof(buf), "model", p)) {
@@ -66,7 +66,7 @@ index 61c9649..b58945f 100644
          }
          nd->nvectors = NIC_NVECTORS_UNSPECIFIED;
          if (get_param_value(buf, sizeof(buf), "vectors", p)) {
-@@ -3003,8 +3004,13 @@ void net_client_uninit(NICInfo *nd)
+@@ -2998,8 +2999,13 @@ void net_client_uninit(NICInfo *nd)
  {
      nd->vlan->nb_guest_devs--;
      nb_nics--;
@@ -82,10 +82,10 @@ index 61c9649..b58945f 100644
  
  static int net_host_check_device(const char *device)
 diff --git a/net.h b/net.h
-index b172691..ec78d0a 100644
+index 57ab031..94db0d7 100644
 --- a/net.h
 +++ b/net.h
-@@ -100,10 +100,10 @@ enum {
+@@ -101,10 +101,10 @@ enum {
  
  struct NICInfo {
      uint8_t macaddr[6];

qemu-fix-linux-user-build-on-ppc.patch:
 elf.h                |    2 ++
 linux-user/elfload.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: qemu-fix-linux-user-build-on-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-linux-user-build-on-ppc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qemu-fix-linux-user-build-on-ppc.patch	7 Sep 2009 14:22:20 -0000	1.7
+++ qemu-fix-linux-user-build-on-ppc.patch	28 Sep 2009 07:30:15 -0000	1.8
@@ -1,4 +1,4 @@
-From 22c6c8c5dfe66a5e7f81dd4a296e1b2b245c5d28 Mon Sep 17 00:00:00 2001
+From 8f4d4cb4e4e73d0533aa2cb421c14210c75f6edc Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 29 Jun 2009 14:49:03 +0100
 Subject: [PATCH] Fix linux-user build on ppc


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- qemu.spec	23 Sep 2009 11:31:31 -0000	1.131
+++ qemu.spec	28 Sep 2009 07:30:15 -0000	1.132
@@ -1,16 +1,14 @@
-%define kvmverfull kvm-0.11.0-rc2
-
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10.92
-Release: 5%{?dist}
+Version: 0.11.0
+Release: 1%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
 
-Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-kvm-%{version}.tar.gz
 Source1: qemu.init
 
 # Loads kvm kernel modules at boot
@@ -38,14 +36,8 @@ Patch03: qemu-allow-pulseaudio-to-be-the
 # Add KSM support - see https://fedoraproject.org/wiki/Features/KSM
 Patch04: qemu-add-ksm-support.patch
 
-# Fix MSI-X error handling on older kernels (#519787)
-Patch05: qemu-fix-msix-error-handling-on-older-kernels.patch
-
-# Fix segfault when qemu-kvm is invoked inside a VM (bug #516543)
-Patch06: qemu-fix-no-kvm-segfault.patch
-
 # Fix issue causing NIC hotplug confusion when no model is specified (#524022)
-Patch07: qemu-correctly-free-nic-info-structure.patch
+Patch05: qemu-correctly-free-nic-info-structure.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -235,8 +227,6 @@ such as kvmtrace and kvm_stat.
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
-%patch06 -p1
-%patch07 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -530,6 +520,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-1
+- Update to 0.11.0 release
+- Drop a couple of upstreamed patches
+
 * Wed Sep 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-5
 - Fix issue causing NIC hotplug confusion when no model is specified (#524022)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Sep 2009 14:22:20 -0000	1.21
+++ sources	28 Sep 2009 07:30:15 -0000	1.22
@@ -1 +1 @@
-35294f8c77250eae6ef48c713fe92803  qemu-kvm-0.11.0-rc2.tar.gz
+440837a062967102a68e634d57eaf719  qemu-kvm-0.11.0.tar.gz


--- qemu-fix-msix-error-handling-on-older-kernels.patch DELETED ---


--- qemu-fix-no-kvm-segfault.patch DELETED ---



From markmc at fedoraproject.org  Mon Sep 28 07:39:30 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 28 Sep 2009 07:39:30 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.132,1.133
Message-ID: <20090928073930.BC63411C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22863

Modified Files:
	qemu.spec 
Log Message:
Remove another use of %{kvmverfull}


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- qemu.spec	28 Sep 2009 07:30:15 -0000	1.132
+++ qemu.spec	28 Sep 2009 07:39:30 -0000	1.133
@@ -220,7 +220,7 @@ such as kvmtrace and kvm_stat.
 %endif
 
 %prep
-%setup -q -n qemu-%{kvmverfull}
+%setup -q -n qemu-kvm-%{version}
 
 %patch01 -p1
 %patch02 -p1



From pbrobinson at fedoraproject.org  Mon Sep 28 07:46:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 28 Sep 2009 07:46:01 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.14, 1.15 mutter-moblin.spec, 
	1.15, 1.16 sources, 1.14, 1.15
Message-ID: <20090928074601.5782E11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25228

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.40.0 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Sep 2009 13:40:23 -0000	1.14
+++ .cvsignore	28 Sep 2009 07:46:00 -0000	1.15
@@ -1 +1 @@
-mutter-moblin-0.39.5.tar.bz2
+mutter-moblin-0.40.0.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mutter-moblin.spec	25 Sep 2009 13:40:23 -0000	1.15
+++ mutter-moblin.spec	28 Sep 2009 07:46:01 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.39.5
+Version:        0.40.0
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.40.0-1
+- New 0.40.0 upstream release
+
 * Fri Sep 25 2009 Peter Robinson <pbrobinson at gmail.com> 0.39.5-1
 - New 0.39.5 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 13:40:23 -0000	1.14
+++ sources	28 Sep 2009 07:46:01 -0000	1.15
@@ -1 +1 @@
-1a9473a3684437d6a67a6964492a12ea  mutter-moblin-0.39.5.tar.bz2
+19c91d5a6da2c03a38cab08fcf67d3a5  mutter-moblin-0.40.0.tar.bz2



From than at fedoraproject.org  Mon Sep 28 08:29:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 28 Sep 2009 08:29:34 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.116,1.117
Message-ID: <20090928082934.8DBE211C00E4@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8439

Modified Files:
	kdeartwork.spec 
Log Message:
rhel cleanup




Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- kdeartwork.spec	2 Sep 2009 14:35:04 -0000	1.116
+++ kdeartwork.spec	28 Sep 2009 08:29:29 -0000	1.117
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -59,6 +59,7 @@ Group:   User Interface/Desktops
 %description -n kde-style-phase
 %{summary}.
 
+%if 0%{?fedora}
 %package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
@@ -69,6 +70,7 @@ Requires:      xscreensaver-extras xscre
 Requires: %{name}-kxs = %{version}-%{release}
 %description screensavers
 %{summary}.
+%endif
 
 %package kxs
 Summary: Support for xscreensaver-based screensavers
@@ -101,10 +103,12 @@ BuildArch: noarch
 
 %build
 
+%if 0%{?fedora}
 # create missing xscreensavers desktop files
 if [ -f kscreensaver/kxsconfig/screensaver.sh ] ; then
  sh kscreensaver/kxsconfig/screensaver.sh
 fi
+%endif
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -189,12 +193,14 @@ fi
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
 
+%if 0%{?fedora}
 %files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
 %{_kde4_bindir}/*.kss
 %{_kde4_datadir}/kde4/services/ScreenSavers/*
+%endif
 
 %files sounds
 %defattr(-,root,root,-)
@@ -206,6 +212,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- rhel cleanup
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - add missing screensavers bz#472886



From nim at fedoraproject.org  Mon Sep 28 08:29:37 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 28 Sep 2009 08:29:37 +0000 (UTC)
Subject: rpms/senamirmir-washra-fonts/devel import.log, 1.2,
	1.3 senamirmir-washra-fonts-fontconfig.conf, 1.1,
	1.2 senamirmir-washra-fonts.spec, 1.3, 1.4
Message-ID: <20090928082937.6CAD011C00E4@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8741/devel

Modified Files:
	import.log senamirmir-washra-fonts-fontconfig.conf 
	senamirmir-washra-fonts.spec 
Log Message:
tweak fontconfig fixing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	13 Sep 2009 17:09:39 -0000	1.2
+++ import.log	28 Sep 2009 08:29:35 -0000	1.3
@@ -1,2 +1,3 @@
 senamirmir-washra-fonts-4_1-1_fc12:HEAD:senamirmir-washra-fonts-4.1-1.fc12.src.rpm:1244670473
 senamirmir-washra-fonts-4_1-3_fc12:HEAD:senamirmir-washra-fonts-4.1-3.fc12.src.rpm:1252861746
+senamirmir-washra-fonts-4_1-5_fc12:HEAD:senamirmir-washra-fonts-4.1-5.fc12.src.rpm:1254126506


Index: senamirmir-washra-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- senamirmir-washra-fonts-fontconfig.conf	13 Sep 2009 17:09:39 -0000	1.1
+++ senamirmir-washra-fonts-fontconfig.conf	28 Sep 2009 08:29:36 -0000	1.2
@@ -9,7 +9,10 @@
       <string>Bold</string>
     </test>
     <edit name="family">
-      <string>Ethiopic WashRa</string>
+      <string>Ethiopic Washra</string>
+    </edit>
+    <edit name="fullname">
+      <string>Ethiopic Washra Bold</string>
     </edit>
     <edit name="weight">
       <int>700</int>
@@ -18,7 +21,7 @@
   <alias binding="same">
     <family>Ethiopic WashRa Bold</family>
     <accept>
-      <family>Ethiopic WashRa</family>
+      <family>Ethiopic Washra</family>
     </accept>
   </alias>
   <match target="scan">
@@ -29,31 +32,32 @@
       <string>Bold</string>
     </test>
     <edit name="family">
-      <string>Ethiopic WashRa</string>
+      <string>Ethiopic Washra</string>
     </edit>
     <edit name="style">
       <string>DemiBold</string>
     </edit>
+    <edit name="fullname">
+      <string>Ethiopic Washra DemiBold</string>
+    </edit>
     <edit name="weight">
       <int>600</int>
     </edit>
   </match>
   <alias binding="same">
     <family>Ethiopic WashRa SemiBold</family>
-    <style>Bold</style>
     <accept>
-      <family>Ethiopic WashRa</family>
-      <style>DemiBold</style>
+      <family>Ethiopic Washra</family>
     </accept>
   </alias>
   <alias>
     <family>serif</family>
     <prefer>
-      <family>Ethiopic WashRa</family>
+      <family>Ethiopic Washra</family>
     </prefer>
   </alias>
   <alias>
-    <family>Ethiopic WashRa</family>
+    <family>Ethiopic Washra</family>
     <default>
       <family>serif</family>
     </default>


Index: senamirmir-washra-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- senamirmir-washra-fonts.spec	13 Sep 2009 17:09:39 -0000	1.3
+++ senamirmir-washra-fonts.spec	28 Sep 2009 08:29:36 -0000	1.4
@@ -11,7 +11,7 @@ Eritrean languages (Amharic, Blin, Ge?e
 
 Name:    %{fontname}-fonts
 Version: 4.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: Fonts for the Ge?ez (Ethiopic) script
 
 Group:   User Interface/X
@@ -208,7 +208,13 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 28 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 4.1-5
+? Tweak fontconfig fixing
+
 * Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 4.1-4
+? Kill camelcase WashRa capitalization too
 - 4.1-3
 ? Fix WashRa Bold and SemiBold naming
 



From nim at fedoraproject.org  Mon Sep 28 08:34:33 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 28 Sep 2009 08:34:33 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts-fontconfig.conf, 
	1.5, 1.6 ecolier-court-fonts-lignes-fontconfig.conf, 1.4,
	1.5 ecolier-court-fonts.spec, 1.11, 1.12 import.log, 1.8, 1.9
Message-ID: <20090928083433.B91B111C00E4@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10331/devel

Modified Files:
	ecolier-court-fonts-fontconfig.conf 
	ecolier-court-fonts-lignes-fontconfig.conf 
	ecolier-court-fonts.spec import.log 
Log Message:
tweak fontconfig fixing


Index: ecolier-court-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ecolier-court-fonts-fontconfig.conf	13 Sep 2009 18:07:36 -0000	1.5
+++ ecolier-court-fonts-fontconfig.conf	28 Sep 2009 08:34:33 -0000	1.6
@@ -8,6 +8,9 @@
     <edit name="family">
       <string>?colier court</string>
     </edit>
+    <edit name="fullname">
+      <string>?colier court</string>
+    </edit>
   </match>
   <alias binding="same">
     <family>Ecolier_court</family>


Index: ecolier-court-fonts-lignes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-lignes-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ecolier-court-fonts-lignes-fontconfig.conf	13 Sep 2009 18:07:36 -0000	1.4
+++ ecolier-court-fonts-lignes-fontconfig.conf	28 Sep 2009 08:34:33 -0000	1.5
@@ -8,6 +8,9 @@
     <edit name="family">
       <string>?colier lignes court</string>
     </edit>
+    <edit name="fullname">
+      <string>?colier lignes court</string>
+    </edit>
   </match>
   <alias binding="same">
     <family>Ecolier_lignes_court</family>


Index: ecolier-court-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ecolier-court-fonts.spec	13 Sep 2009 18:07:36 -0000	1.11
+++ ecolier-court-fonts.spec	28 Sep 2009 08:34:33 -0000	1.12
@@ -11,7 +11,7 @@ this package.
 
 Name:    %{fontname}-fonts
 Version: 20070702
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Schoolchildren cursive fonts
 
 Group:     User Interface/X
@@ -107,6 +107,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 28 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20070702-12
+? Tweak the fontconfig fixing
+
 * Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20070702-11
 ? Fix the font naming to something more user friendly (remove PS1 legacy


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	13 Sep 2009 18:07:36 -0000	1.8
+++ import.log	28 Sep 2009 08:34:33 -0000	1.9
@@ -6,3 +6,4 @@ ecolier-court-fonts-20070702-6_fc11:HEAD
 ecolier-court-fonts-20070702-7_fc11:HEAD:ecolier-court-fonts-20070702-7.fc11.src.rpm:1232193736
 ecolier-court-fonts-20070702-8_fc11:HEAD:ecolier-court-fonts-20070702-8.fc11.src.rpm:1235377848
 ecolier-court-fonts-20070702-11_fc12:HEAD:ecolier-court-fonts-20070702-11.fc12.src.rpm:1252865221
+ecolier-court-fonts-20070702-12_fc12:HEAD:ecolier-court-fonts-20070702-12.fc12.src.rpm:1254126844



From pkgdb at fedoraproject.org  Mon Sep 28 08:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:42:43 +0000
Subject: [pkgdb] libtar (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20090928084243.7652010F888@bastion2.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for libtar
huzaifas has set commit to Approved for 107427 on libtar (Fedora EPEL 5)
huzaifas has set checkout to Approved for 107427 on libtar (Fedora EPEL 5)
huzaifas has set build to Approved for 107427 on libtar (Fedora EPEL 5)
huzaifas changed owner of libtar in Fedora EPEL 5 to huzaifas

To make changes to this package see:
  /pkgdb/packages/name/libtar



From pkgdb at fedoraproject.org  Mon Sep 28 08:47:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:47:41 +0000
Subject: [pkgdb] sssd had acl change status
Message-ID: <20090928084741.BCFDF10F888@bastion2.fedora.phx.redhat.com>

simo has set the commit acl on sssd (Fedora devel) to Approved for sbose

To make changes to this package see:
  /pkgdb/packages/name/sssd



From pkgdb at fedoraproject.org  Mon Sep 28 08:47:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:47:42 +0000
Subject: [pkgdb] sssd had acl change status
Message-ID: <20090928084743.E38A510F895@bastion2.fedora.phx.redhat.com>

simo has set the approveacls acl on sssd (Fedora devel) to Approved for sbose

To make changes to this package see:
  /pkgdb/packages/name/sssd



From pkgdb at fedoraproject.org  Mon Sep 28 08:47:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:47:48 +0000
Subject: [pkgdb] sssd had acl change status
Message-ID: <20090928084748.4210010F8AB@bastion2.fedora.phx.redhat.com>

simo has set the approveacls acl on sssd (Fedora devel) to Approved for sgallagh

To make changes to this package see:
  /pkgdb/packages/name/sssd



From pkgdb at fedoraproject.org  Mon Sep 28 08:47:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:47:56 +0000
Subject: [pkgdb] sssd had acl change status
Message-ID: <20090928084756.56C6510F888@bastion2.fedora.phx.redhat.com>

simo has set the commit acl on sssd (Fedora 11) to Approved for sbose

To make changes to this package see:
  /pkgdb/packages/name/sssd



From pkgdb at fedoraproject.org  Mon Sep 28 08:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:47:57 +0000
Subject: [pkgdb] sssd had acl change status
Message-ID: <20090928084757.A6E5A10F895@bastion2.fedora.phx.redhat.com>

simo has set the approveacls acl on sssd (Fedora 11) to Approved for sbose

To make changes to this package see:
  /pkgdb/packages/name/sssd



From pkgdb at fedoraproject.org  Mon Sep 28 08:47:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 08:47:59 +0000
Subject: [pkgdb] sssd had acl change status
Message-ID: <20090928084759.A209D10F8AD@bastion2.fedora.phx.redhat.com>

simo has set the approveacls acl on sssd (Fedora 11) to Approved for sgallagh

To make changes to this package see:
  /pkgdb/packages/name/sssd



From nim at fedoraproject.org  Mon Sep 28 08:49:02 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 28 Sep 2009 08:49:02 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel
	google-droid-fonts-sans-fontconfig.conf, 
	1.6, 1.7 google-droid-fonts.spec, 1.13, 1.14 import.log, 1.10, 1.11
Message-ID: <20090928084903.1ACF111C00E4@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14525/devel

Modified Files:
	google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts.spec import.log 
Log Message:
tweak fontconfig fixing


Index: google-droid-fonts-sans-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-fontconfig.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- google-droid-fonts-sans-fontconfig.conf	13 Sep 2009 13:41:26 -0000	1.6
+++ google-droid-fonts-sans-fontconfig.conf	28 Sep 2009 08:49:01 -0000	1.7
@@ -16,6 +16,9 @@
     <edit name="family">
       <string>Droid Sans</string>
     </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
     <edit name="fontversion">
       <int>2</int>
     </edit>
@@ -27,6 +30,9 @@
     <edit name="family">
       <string>Droid Sans</string>
     </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
     <edit name="fontversion">
       <int>1</int>
     </edit>


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- google-droid-fonts.spec	13 Sep 2009 13:41:26 -0000	1.13
+++ google-droid-fonts.spec	28 Sep 2009 08:49:01 -0000	1.14
@@ -12,7 +12,7 @@ other screen text.
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use the date we did a git dump
 Version: 20090906
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -138,6 +138,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 28 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-5
+? Tweak the fontconfig fixing
+
 * Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090906-4
 ? follow the fontpackages template more closely


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log	13 Sep 2009 13:41:26 -0000	1.10
+++ import.log	28 Sep 2009 08:49:01 -0000	1.11
@@ -8,3 +8,4 @@ google-droid-fonts-20090906-1_fc12:HEAD:
 google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.rpm:1252351928
 google-droid-fonts-20090906-3_fc12:HEAD:google-droid-fonts-20090906-3.fc12.src.rpm:1252833055
 google-droid-fonts-20090906-4_fc12:HEAD:google-droid-fonts-20090906-4.fc12.src.rpm:1252849244
+google-droid-fonts-20090906-5_fc12:HEAD:google-droid-fonts-20090906-5.fc12.src.rpm:1254127710



From sbose at fedoraproject.org  Mon Sep 28 08:51:25 2009
From: sbose at fedoraproject.org (sbose)
Date: Mon, 28 Sep 2009 08:51:25 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.9, 1.10 sources, 1.10,
	1.11 sssd.conf.default, 1.4, 1.5 sssd.spec, 1.18, 1.19
Message-ID: <20090928085125.526FB11C00E4@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15048

Modified Files:
	.cvsignore sources sssd.conf.default sssd.spec 
Log Message:
New upstream release 0.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Aug 2009 18:56:24 -0000	1.9
+++ .cvsignore	28 Sep 2009 08:51:23 -0000	1.10
@@ -1 +1 @@
-sssd-0.5.0.tar.gz
+sssd-0.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Aug 2009 18:56:24 -0000	1.10
+++ sources	28 Sep 2009 08:51:24 -0000	1.11
@@ -1 +1 @@
-7566dcac75e7248ca99b4dd0bb49c1ee  sssd-0.5.0.tar.gz
+2a2e118d9f29dda15dd4b8202b9cac62  sssd-0.6.0.tar.gz


Index: sssd.conf.default
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.conf.default,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sssd.conf.default	11 Jun 2009 14:13:16 -0000	1.4
+++ sssd.conf.default	28 Sep 2009 08:51:24 -0000	1.5
@@ -1,90 +1,57 @@
-[services]
-description = Local Service Configuration
-activeServices = nss, dp, pam
+[sssd]
+config_file_version = 2
+# Number of times services should attempt to reconnect in the
+# event of a crash or restart before they give up
+reconnection_retries = 3
+# if a backend is particularly slow you can raise this timeout here
+sbus_timeout = 30
+services = nss, dp, pam
+; domains = LOCAL,LDAP
+# SSSD will not start if you don't configure any domain.
+# Add new domains condifgurations as [domain/<NAME>] sections.
+# Then add the list of domains (in the order you want them to be
+# queried in the 'domains" attribute above and uncomment it
 
-[services/nss]
-description = NSS Responder Configuration
+
+[nss]
 # the following prevents sssd for searching for the root user/group in
 # all domains (you can add here a comma separated list of system accounts are
 # always going to be /etc/passwd users, or that you want to filter out)
-filterGroups = root
-filterUsers = root
-
-[services/dp]
-description = Data Provider Configuration
-
-[services/pam]
-description = PAM Responder Configuration
+filter_groups = root
+filter_users = root
+reconnection_retries = 3
+
+# The EntryCacheTimeout indicates the number of seconds to retain before
+# an entry in cache is considered stale and must block to refresh.
+# The EntryCacheNoWaitRefreshTimeout indicates the number of seconds to
+# wait before updating the cache out-of-band. (NSS requests will still
+# be returned from cache until the full EntryCacheTimeout). Setting this
+# value to 0 turns this feature off (default)
+; entry_cache_timeout = 600
+; entry_cache_nowait_timeout = 300
 
-[services/monitor]
-description = Service Monitor Configuration
-#if a backend is particularly slow you can raise this timeout here
-sbusTimeout = 30
+[pam]
+reconnection_retries = 3
 
-[domains]
-description = Domains served by SSSD
-; domains = LOCAL,LDAP
-
-# SSSD will not start if you don't configure any domain.
-# Add new domains condifgurations as [domains/<NAME>] sections.
-# Then add the list of domains (in the order you want them to be
-# queried in the 'domains" attribute above and uncomment it
-
-# Example LOCAL domain that proxies to /etc/passwd and /etc/group files
-# This configuration is meant mostly as a migration path to be able to store
-# additional information about users while still keeping /etc/passwd
-# authoritative.
-
-; [domains/LOCAL]
-; description = LOCAL migration domain
-; enumerate = 3
-; minId = 500
-; magicPrivateGroups = FALSE
-; legacy = TRUE
-;
-; provider = proxy
-; libName = files
-; libPath = libnss_files.so.2
-
-# optionally a file named sssdproxylocal can be place in pam.d configured to
-# check pam_unix only and pam_sss can be used in the normal pam stack
-; auth-module = proxy
-; pam-target = sssdproxylocal
+[dp]
+reconnection_retries = 3
 
 # Example LOCAL domain that stores all users natively in the SSSD internal
 # directory. These local users and groups are not visibile in /etc/passwd, it
 # now contains only root and system accounts.
-
-; [domains/LOCAL]
+; [domain/LOCAL]
 ; description = LOCAL Users domain
-; enumerate = 3
-; minId = 500
-; maxId = 999
-; legacy = FALSE
-; magicPrivateGroups = TRUE
-; provider = local
-
-# Example LDAP domain that uses the proxy backend and the standard nss_ldap
-# and pam_ldap modules (Useful until we have good working native ldap backends).
-# For this to work the /etc/ldap.conf file needs to be correctly configured just
-# like you would do when using nss_ldap in nsswitch.conf, but instead of setting
-# passwd: files ldap, set passwd: files, sss instead there.
-# Also consider using the following setting in /etc/ldap.conf to avoid needless
-# delays if the ldap server is offline:
-# timelimit 10
-# bind_timelimit 5
-# nss_reconnect_maxsleeptime 2
-# nss_reconnect_sleeptime 1
-
-; [domains/LDAP]
-; description = Proxy request to our LDAP server
-; enumerate = 0
-; minId = 1000
-; legacy = TRUE
-;
-; provider = proxy
-; libName = ldap
-; libPath = libnss_ldap.so.2
-;
-#if a backend is particularly slow you can raise this timeout here
-; timeout = 60
+; id_provider = local
+; enumerate = true
+; min_id = 500
+; max_id = 999
+
+# Example native LDAP domain
+; [domain/LDAP]
+; id_provider = ldap
+; auth_provider = ldap
+; ldap_uri = ldap://ldap.mydomain.org
+; ldap_user_search_base = dc=mydomain,dc=org
+; ldap_tls_reqcert = demand
+; cache_credentials = true
+; enumerate = true


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sssd.spec	24 Aug 2009 18:56:24 -0000	1.18
+++ sssd.spec	28 Sep 2009 08:51:24 -0000	1.19
@@ -1,5 +1,7 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name: sssd
-Version: 0.5.0
+Version: 0.6.0
 Release: 0%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -18,6 +20,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
 
+Requires: sssd-client = 0.6.0
+Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
 
@@ -32,7 +36,8 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: m4
-BuildRequires: popt-devel
+%{?fedora:BuildRequires: popt-devel}
+%{?rhel:BuildRequires: popt}
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
@@ -49,6 +54,7 @@ BuildRequires: libxml2
 BuildRequires: docbook-style-xsl
 BuildRequires: krb5-devel
 BuildRequires: c-ares-devel
+BuildRequires: python-devel
 
 %description
 Provides a set of daemons to manage access to remote directories and
@@ -57,6 +63,14 @@ the system and a pluggable backend syste
 account sources. It is also the basis to provide client auditing and policy
 services for projects like FreeIPA.
 
+%package client
+Summary: SSSD Client libraries for NSS and PAM
+Group: Applications/System
+
+%description client
+Provides the libraries needed by the PAM and NSS stacks to connect to the SSSD
+service.
+
 %prep
 %setup -q
 
@@ -83,15 +97,22 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_krb5.la \
-    $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la
+    $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
+    $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
 
+touch locator.filelist
+if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
+then
+    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so > locator.filelist
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f locator.filelist
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %{_initrddir}/%{name}
@@ -105,23 +126,40 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{servicename}/
 %{_libdir}/%{name}/
 %{_libdir}/ldb/memberof.so
-%{_libdir}/krb5/plugins/libkrb5/*
 %dir %{sssdstatedir}
 %attr(700,root,root) %dir %{dbpath}
 %attr(755,root,root) %dir %{pipepath}
 %attr(700,root,root) %dir %{pipepath}/private
+%attr(750,root,root) %dir %{_var}/log/%{name}
 %dir %{_sysconfdir}/sssd
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
-/%{_lib}/libnss_sss.so.2
-/%{_lib}/security/pam_sss.so
-%{_mandir}/man5/*
-%{_mandir}/man8/*
+%{_mandir}/man5/sssd.conf.5*
+%{_mandir}/man5/sssd-krb5.5*
+%{_mandir}/man5/sssd-ldap.5*
+%{_mandir}/man8/sssd.8*
+%{_mandir}/man8/sss_groupadd.8*
+%{_mandir}/man8/sss_groupdel.8*
+%{_mandir}/man8/sss_groupmod.8*
+%{_mandir}/man8/sss_useradd.8*
+%{_mandir}/man8/sss_userdel.8*
+%{_mandir}/man8/sss_usermod.8*
+%{_mandir}/man8/sssd_krb5_locator_plugin.8*
 %{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
 %{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
+%{python_sitearch}/pysss.so
+
+%files client
+/%{_lib}/libnss_sss.so.2
+/%{_lib}/security/pam_sss.so
+%{_mandir}/man8/pam_sss.8*
 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add %{servicename}
+if [ $1 -ge 2 ] ; then
+# a one-time upgrade from confdb v1 to v2, only if upgrading
+    python %{_libexecdir}/%{servicename}/upgrade_config.py
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -136,6 +174,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Mon Sep 28 2009 Sumit Bose <sbose at redhat.com> - 0.6.0-0
+- New upstream release 0.6.0
+
 * Mon Aug 24 2009 Simo Sorce <ssorce at redhat.com> - 0.5.0-0
 - New upstream release 0.5.0
 



From nim at fedoraproject.org  Mon Sep 28 09:05:16 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 28 Sep 2009 09:05:16 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.16, 1.17 fontpackages.spec,
	1.22, 1.23 import.log, 1.18, 1.19 sources, 1.16, 1.17
Message-ID: <20090928090516.5907D11C00E4@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.27


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	27 Sep 2009 22:49:17 -0000	1.16
+++ .cvsignore	28 Sep 2009 09:05:15 -0000	1.17
@@ -1 +1 @@
-fontpackages-1.26.tar.xz
+fontpackages-1.27.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- fontpackages.spec	27 Sep 2009 22:49:17 -0000	1.22
+++ fontpackages.spec	28 Sep 2009 09:05:16 -0000	1.23
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.26
+Version: 1.27
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -100,6 +100,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.27-1
+? Brownpaper bag release ?2
+
 * Sun Sep 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.26-1
 ? Brownpaper bag release


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- import.log	27 Sep 2009 22:49:17 -0000	1.18
+++ import.log	28 Sep 2009 09:05:16 -0000	1.19
@@ -16,3 +16,4 @@ fontpackages-1_23-1_fc12:HEAD:fontpackag
 fontpackages-1_24-1_fc12:HEAD:fontpackages-1.24-1.fc12.src.rpm:1253998725
 fontpackages-1_25-1_fc12:HEAD:fontpackages-1.25-1.fc12.src.rpm:1254072286
 fontpackages-1_26-1_fc12:HEAD:fontpackages-1.26-1.fc12.src.rpm:1254091733
+fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	27 Sep 2009 22:49:17 -0000	1.16
+++ sources	28 Sep 2009 09:05:16 -0000	1.17
@@ -1 +1 @@
-04432ee25dd0b907504bb0a7aacf0724  fontpackages-1.26.tar.xz
+c2987bf1553807157ad681c253335dfd  fontpackages-1.27.tar.xz



From peter at fedoraproject.org  Mon Sep 28 09:17:01 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 28 Sep 2009 09:17:01 +0000 (UTC)
Subject: rpms/fuse/devel .cvsignore, 1.15, 1.16 fuse.spec, 1.38,
	1.39 import.log, 1.4, 1.5 sources, 1.15, 1.16
Message-ID: <20090928091701.2B01C11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24996/devel

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
Ver. 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	16 Sep 2009 08:28:01 -0000	1.15
+++ .cvsignore	28 Sep 2009 09:17:00 -0000	1.16
@@ -1 +1 @@
-fuse-2.8.0.tar.gz
+fuse-2.8.1.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- fuse.spec	16 Sep 2009 08:28:02 -0000	1.38
+++ fuse.spec	28 Sep 2009 09:17:00 -0000	1.39
@@ -1,5 +1,5 @@
 Name:           fuse
-Version:        2.8.0
+Version:        2.8.1
 Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
@@ -17,11 +17,9 @@ Requires:       kernel >= 2.6.14
 Requires:       which
 BuildRequires:  libselinux-devel
 
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/MAKEDEV
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun):/sbin/service
+Requires(post):  MAKEDEV
+Requires(preun): chkconfig
+Requires(preun): initscripts
 
 %description
 With FUSE it is possible to implement a fully functional filesystem in a
@@ -61,7 +59,6 @@ sed -i 's|mknod|echo Disabled: mknod |g'
 %build
 # Can't pass --disable-static here, or else the utils don't build
 %configure \
- --disable-kernel-module \
  --libdir=/%{_lib} \
  --bindir=/bin \
  --exec-prefix=/
@@ -137,6 +134,9 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.1-1
+- Ver. 2.8.1
+
 * Wed Aug 19 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-1
 - Ver. 2.8.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 Sep 2009 08:28:02 -0000	1.4
+++ import.log	28 Sep 2009 09:17:00 -0000	1.5
@@ -2,3 +2,4 @@ fuse-2_7_3-3_fc9:HEAD:fuse-2.7.3-3.fc9.s
 fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.src.rpm:1222597934
 fuse-2_7_4-2_fc10:HEAD:fuse-2.7.4-2.fc10.src.rpm:1233157758
 fuse-2_8_0-1_fc11:HEAD:fuse-2.8.0-1.fc11.src.rpm:1253089638
+fuse-2_8_1-1_fc11:HEAD:fuse-2.8.1-1.fc11.src.rpm:1254129320


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Sep 2009 08:28:02 -0000	1.15
+++ sources	28 Sep 2009 09:17:00 -0000	1.16
@@ -1 +1 @@
-faa62f2cf051866c61242f28e88d0832  fuse-2.8.0.tar.gz
+0e3505ce90155983f1bc995eb2cf6fa7  fuse-2.8.1.tar.gz



From peter at fedoraproject.org  Mon Sep 28 09:18:26 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 28 Sep 2009 09:18:26 +0000 (UTC)
Subject: rpms/fuse/F-11 .cvsignore, 1.14, 1.15 fuse.spec, 1.36,
	1.37 import.log, 1.3, 1.4 sources, 1.14, 1.15
Message-ID: <20090928091826.26DF911C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25730/F-11

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
Ver. 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	28 Sep 2008 10:32:57 -0000	1.14
+++ .cvsignore	28 Sep 2009 09:18:25 -0000	1.15
@@ -1 +1 @@
-fuse-2.7.4.tar.gz
+fuse-2.8.1.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-11/fuse.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- fuse.spec	24 Feb 2009 18:48:41 -0000	1.36
+++ fuse.spec	28 Sep 2009 09:18:25 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.7.4
-Release:        3%{?dist}
+Version:        2.8.1
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -17,11 +17,9 @@ Requires:       kernel >= 2.6.14
 Requires:       which
 BuildRequires:  libselinux-devel
 
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/MAKEDEV
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun):/sbin/service
+Requires(post):  MAKEDEV
+Requires(preun): chkconfig
+Requires(preun): initscripts
 
 %description
 With FUSE it is possible to implement a fully functional filesystem in a
@@ -61,7 +59,6 @@ sed -i 's|mknod|echo Disabled: mknod |g'
 %build
 # Can't pass --disable-static here, or else the utils don't build
 %configure \
- --disable-kernel-module \
  --libdir=/%{_lib} \
  --bindir=/bin \
  --exec-prefix=/
@@ -137,6 +134,15 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.1-1
+- Ver. 2.8.1
+
+* Wed Aug 19 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-1
+- Ver. 2.8.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Jan 2009 15:50:11 -0000	1.3
+++ import.log	28 Sep 2009 09:18:25 -0000	1.4
@@ -1,3 +1,4 @@
 fuse-2_7_3-3_fc9:HEAD:fuse-2.7.3-3.fc9.src.rpm:1215842579
 fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.src.rpm:1222597934
 fuse-2_7_4-2_fc10:HEAD:fuse-2.7.4-2.fc10.src.rpm:1233157758
+fuse-2_8_1-1_fc11:F-11:fuse-2.8.1-1.fc11.src.rpm:1254129459


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	28 Sep 2008 10:32:57 -0000	1.14
+++ sources	28 Sep 2009 09:18:25 -0000	1.15
@@ -1 +1 @@
-4879f06570d2225667534c37fea04213  fuse-2.7.4.tar.gz
+0e3505ce90155983f1bc995eb2cf6fa7  fuse-2.8.1.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 28 09:18:44 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 28 Sep 2009 09:18:44 +0000 (UTC)
Subject: rpms/perl-Test-Script/devel .cvsignore, 1.3,
	1.4 perl-Test-Script.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090928091844.7974411C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25974

Modified Files:
	.cvsignore perl-Test-Script.spec sources 
Log Message:
* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
- Upstream update.
- BR: perl(Probe::Perl)
- Activate AUTOMATED_TESTING=1 RELEASE_TESTING=1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Mar 2008 06:54:16 -0000	1.3
+++ .cvsignore	28 Sep 2009 09:18:42 -0000	1.4
@@ -1 +1 @@
-Test-Script-1.03.tar.gz
+Test-Script-1.06.tar.gz


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/perl-Test-Script.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-Script.spec	26 Jul 2009 16:56:30 -0000	1.6
+++ perl-Test-Script.spec	28 Sep 2009 09:18:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Test-Script
-Version:        1.03
-Release:        3%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Cross-platform basic tests for scripts
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,8 +11,15 @@ BuildArch:      noarch
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IPC::Run3) >= 0.034
+BuildRequires:  perl(Probe::Perl)
 BuildRequires:  perl(Test::More)
 
+# For improved tests
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Perl::MinimumVersion) >= 1.20
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +44,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test AUTOMATED_TESTING=1 RELEASE_TESTING=1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
+- Upstream update.
+- BR: perl(Probe::Perl)
+- Activate AUTOMATED_TESTING=1 RELEASE_TESTING=1.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Mar 2008 06:54:16 -0000	1.3
+++ sources	28 Sep 2009 09:18:43 -0000	1.4
@@ -1 +1 @@
-fa3018d63bc54ebb8d4d244fb1dc4c35  Test-Script-1.03.tar.gz
+43e8f1429472da66a853be819b11a5b9  Test-Script-1.06.tar.gz



From peter at fedoraproject.org  Mon Sep 28 09:19:20 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 28 Sep 2009 09:19:20 +0000 (UTC)
Subject: rpms/fuse/F-10 .cvsignore, 1.14, 1.15 fuse.spec, 1.35,
	1.36 import.log, 1.3, 1.4 sources, 1.14, 1.15
Message-ID: <20090928091920.E150511C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26555/F-10

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
Ver. 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	28 Sep 2008 10:32:57 -0000	1.14
+++ .cvsignore	28 Sep 2009 09:19:20 -0000	1.15
@@ -1 +1 @@
-fuse-2.7.4.tar.gz
+fuse-2.8.1.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-10/fuse.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- fuse.spec	28 Jan 2009 15:59:17 -0000	1.35
+++ fuse.spec	28 Sep 2009 09:19:20 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.7.4
-Release:        2%{?dist}
+Version:        2.8.1
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -17,11 +17,9 @@ Requires:       kernel >= 2.6.14
 Requires:       which
 BuildRequires:  libselinux-devel
 
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/MAKEDEV
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun):/sbin/service
+Requires(post):  MAKEDEV
+Requires(preun): chkconfig
+Requires(preun): initscripts
 
 %description
 With FUSE it is possible to implement a fully functional filesystem in a
@@ -61,7 +59,6 @@ sed -i 's|mknod|echo Disabled: mknod |g'
 %build
 # Can't pass --disable-static here, or else the utils don't build
 %configure \
- --disable-kernel-module \
  --libdir=/%{_lib} \
  --bindir=/bin \
  --exec-prefix=/
@@ -137,6 +134,18 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.1-1
+- Ver. 2.8.1
+
+* Wed Aug 19 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-1
+- Ver. 2.8.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jan 28 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-2
 - Fixed BZ#479581
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Jan 2009 15:59:17 -0000	1.3
+++ import.log	28 Sep 2009 09:19:20 -0000	1.4
@@ -1,3 +1,4 @@
 fuse-2_7_3-3_fc9:HEAD:fuse-2.7.3-3.fc9.src.rpm:1215842579
 fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.src.rpm:1222597934
 fuse-2_7_4-2_fc10:F-10:fuse-2.7.4-2.fc10.src.rpm:1233157867
+fuse-2_8_1-1_fc11:F-10:fuse-2.8.1-1.fc11.src.rpm:1254129532


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	28 Sep 2008 10:32:57 -0000	1.14
+++ sources	28 Sep 2009 09:19:20 -0000	1.15
@@ -1 +1 @@
-4879f06570d2225667534c37fea04213  fuse-2.7.4.tar.gz
+0e3505ce90155983f1bc995eb2cf6fa7  fuse-2.8.1.tar.gz



From huzaifas at fedoraproject.org  Mon Sep 28 09:21:20 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 28 Sep 2009 09:21:20 +0000 (UTC)
Subject: rpms/libtar/EL-5 import.log, NONE,
	1.1 libtar-1.2.11-missing-protos.patch, NONE, 1.1 libtar.spec,
	1.11, 1.12
Message-ID: <20090928092120.4558511C0333@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/libtar/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27308/EL-5

Modified Files:
	libtar.spec 
Added Files:
	import.log libtar-1.2.11-missing-protos.patch 
Log Message:



--- NEW FILE import.log ---
libtar-1_2_11-11_rhis:EL-5:libtar-1.2.11-11.rhis.src.rpm:1254115054

libtar-1.2.11-missing-protos.patch:
 configure     |   13 +++++++------
 lib/append.c  |    2 ++
 lib/output.c  |    1 +
 lib/wrapper.c |    1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE libtar-1.2.11-missing-protos.patch ---
diff -up libtar-1.2.11/lib/append.c.foo libtar-1.2.11/lib/append.c
--- libtar-1.2.11/lib/append.c.foo	2003-01-07 02:40:59.000000000 +0100
+++ libtar-1.2.11/lib/append.c	2008-04-03 15:08:07.000000000 +0200
@@ -13,6 +13,8 @@
 #include <internal.h>
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/param.h>
diff -up libtar-1.2.11/configure.foo libtar-1.2.11/configure
--- libtar-1.2.11/configure.foo	2008-04-03 15:08:07.000000000 +0200
+++ libtar-1.2.11/configure	2008-04-03 15:09:20.000000000 +0200
@@ -4943,8 +4943,8 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -20083,8 +20083,8 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return (2);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -22411,6 +22411,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <stdio.h>
+#include <string.h>
 
 typedef struct {
   int length;
@@ -22437,10 +22438,10 @@ int main() {
     if ((snprintf(test1, tests[i].length, "%s", tests[i].test)
          != tests[i].retval) ||
         (tests[i].result && strcmp(tests[i].result, test1)))
-      exit(1);
+      return (1);
   }
 
-  exit(0);
+  return (0);
 }
 
 _ACEOF
diff -up libtar-1.2.11/lib/output.c~ libtar-1.2.11/lib/output.c
--- libtar-1.2.11/lib/output.c~	2008-04-03 15:11:07.000000000 +0200
+++ libtar-1.2.11/lib/output.c	2008-04-03 15:11:07.000000000 +0200
@@ -13,6 +13,7 @@
 #include <internal.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>
diff -up libtar-1.2.11/lib/wrapper.c~ libtar-1.2.11/lib/wrapper.c
--- libtar-1.2.11/lib/wrapper.c~	2008-04-03 15:11:28.000000000 +0200
+++ libtar-1.2.11/lib/wrapper.c	2008-04-03 15:11:28.000000000 +0200
@@ -13,6 +13,7 @@
 #include <internal.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/param.h>
 #include <dirent.h>
 #include <errno.h>


Index: libtar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-5/libtar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libtar.spec	28 Aug 2006 11:55:44 -0000	1.11
+++ libtar.spec	28 Sep 2009 09:21:19 -0000	1.12
@@ -1,12 +1,13 @@
 Summary:        Tar file manipulation API
 Name:           libtar
 Version:        1.2.11
-Release:        8%{?dist}
-License:        BSD
+Release:        11%{?dist}
+License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.feep.net/libtar/
 Source0:        ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz
 Patch0:         http://ftp.debian.org/debian/pool/main/libt/libtar/libtar_1.2.11-4.diff.gz
+Patch1:         libtar-1.2.11-missing-protos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel libtool
 
@@ -29,6 +30,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -z .deb
+%patch1 -p1
 # set correct version for .so build
 %define ltversion %(echo %{version} | tr '.' ':')
 sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
@@ -75,6 +77,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-11
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.11-10
+- Autorebuild for GCC 4.3
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-9
+- Update License tag for new Licensing Guidelines compliance
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-8
 - FE6 Rebuild
 



From nphilipp at fedoraproject.org  Mon Sep 28 09:33:27 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 09:33:27 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.20, 1.21 python-slip.spec, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <20090928093327.D96D911C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32676

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	24 Sep 2009 14:40:08 -0000	1.20
+++ .cvsignore	28 Sep 2009 09:33:27 -0000	1.21
@@ -1 +1 @@
-python-slip-0.2.5.tar.bz2
+python-slip-0.2.6.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-slip.spec	24 Sep 2009 14:40:08 -0000	1.23
+++ python-slip.spec	28 Sep 2009 09:33:27 -0000	1.24
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.5
+Version:    0.2.6
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -92,6 +92,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 0.2.6-1
+- ship all slip.dbus modules (#525790)
+
 * Thu Sep 24 2009 Nils Philippsen <nils at redhat.com> - 0.2.5-1
 - make polkit checks in dbus services non-blocking
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	24 Sep 2009 14:40:08 -0000	1.23
+++ sources	28 Sep 2009 09:33:27 -0000	1.24
@@ -1 +1 @@
-028492e702c32202dd862d0e7a81ed5b  python-slip-0.2.5.tar.bz2
+7fa0124473a4e888083de7b02857a57c  python-slip-0.2.6.tar.bz2



From atorkhov at fedoraproject.org  Mon Sep 28 09:52:24 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 09:52:24 +0000 (UTC)
Subject: rpms/ogre/devel ogre-1.6.4-system-tinyxml.patch, NONE,
	1.1 ogre-make-clean.sh, 1.1, 1.2 ogre.spec, 1.52,
	1.53 ogre-1.4.7-system-tinyxml.patch, 1.2, NONE
Message-ID: <20090928095224.DDB7611C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5144

Modified Files:
	ogre-make-clean.sh ogre.spec 
Added Files:
	ogre-1.6.4-system-tinyxml.patch 
Removed Files:
	ogre-1.4.7-system-tinyxml.patch 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.4-1
- New upstream release 1.6.4


ogre-1.6.4-system-tinyxml.patch:
 include/Makefile.am |    4 --
 include/Makefile.in |    4 --
 src/Makefile.am     |    8 +----
 src/Makefile.in     |   74 ++--------------------------------------------------
 4 files changed, 7 insertions(+), 83 deletions(-)

--- NEW FILE ogre-1.6.4-system-tinyxml.patch ---
diff -urp ogre.old/Tools/XMLConverter/include/Makefile.am ogre/Tools/XMLConverter/include/Makefile.am
--- ogre.old/Tools/XMLConverter/include/Makefile.am	2008-06-12 18:10:57.000000000 +0400
+++ ogre/Tools/XMLConverter/include/Makefile.am	2009-09-28 12:04:10.000000000 +0400
@@ -1,5 +1,3 @@
 noinst_HEADERS = OgreXMLMeshSerializer.h \
                  OgreXMLPrerequisites.h \
-                 OgreXMLSkeletonSerializer.h \
-                 tinystr.h \
-                 tinyxml.h
+                 OgreXMLSkeletonSerializer.h
diff -urp ogre.old/Tools/XMLConverter/include/Makefile.in ogre/Tools/XMLConverter/include/Makefile.in
--- ogre.old/Tools/XMLConverter/include/Makefile.in	2009-09-28 01:01:55.000000000 +0400
+++ ogre/Tools/XMLConverter/include/Makefile.in	2009-09-28 12:05:10.000000000 +0400
@@ -207,9 +207,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_HEADERS = OgreXMLMeshSerializer.h \
                  OgreXMLPrerequisites.h \
-                 OgreXMLSkeletonSerializer.h \
-                 tinystr.h \
-                 tinyxml.h
+                 OgreXMLSkeletonSerializer.h
 
 all: all-am
 
?????? ? ogre/Tools/XMLConverter/include: Makefile.in.orig
diff -urp ogre.old/Tools/XMLConverter/src/Makefile.am ogre/Tools/XMLConverter/src/Makefile.am
--- ogre.old/Tools/XMLConverter/src/Makefile.am	2008-08-08 12:58:28.000000000 +0400
+++ ogre/Tools/XMLConverter/src/Makefile.am	2009-09-28 12:04:10.000000000 +0400
@@ -3,10 +3,6 @@ bin_PROGRAMS=OgreXMLConverter
 OgreXMLConverter_CXXFLAGS=-DTIXML_USE_STL
 OgreXMLConverter_SOURCES= OgreXMLMeshSerializer.cpp \
                       OgreXMLSkeletonSerializer.cpp \
-                      main.cpp \
-                      tinystr.cpp \
-                      tinyxml.cpp \
-                      tinyxmlerror.cpp \
-                      tinyxmlparser.cpp
+                      main.cpp
 OgreXMLConverter_LDFLAGS= -L$(top_builddir)/OgreMain/src
-OgreXMLConverter_LDADD= -lOgreMain
+OgreXMLConverter_LDADD= -lOgreMain -ltinyxml
diff -urp ogre.old/Tools/XMLConverter/src/Makefile.in ogre/Tools/XMLConverter/src/Makefile.in
--- ogre.old/Tools/XMLConverter/src/Makefile.in	2009-09-28 01:01:55.000000000 +0400
+++ ogre/Tools/XMLConverter/src/Makefile.in	2009-09-28 12:05:10.000000000 +0400
@@ -50,11 +50,7 @@ PROGRAMS = $(bin_PROGRAMS)
 am_OgreXMLConverter_OBJECTS =  \
 	OgreXMLConverter-OgreXMLMeshSerializer.$(OBJEXT) \
 	OgreXMLConverter-OgreXMLSkeletonSerializer.$(OBJEXT) \
-	OgreXMLConverter-main.$(OBJEXT) \
-	OgreXMLConverter-tinystr.$(OBJEXT) \
-	OgreXMLConverter-tinyxml.$(OBJEXT) \
-	OgreXMLConverter-tinyxmlerror.$(OBJEXT) \
-	OgreXMLConverter-tinyxmlparser.$(OBJEXT)
+	OgreXMLConverter-main.$(OBJEXT)
 OgreXMLConverter_OBJECTS = $(am_OgreXMLConverter_OBJECTS)
 OgreXMLConverter_DEPENDENCIES =
 OgreXMLConverter_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -237,14 +233,10 @@ INCLUDES = $(STLPORT_CFLAGS) -I$(top_src
 OgreXMLConverter_CXXFLAGS = -DTIXML_USE_STL
 OgreXMLConverter_SOURCES = OgreXMLMeshSerializer.cpp \
                       OgreXMLSkeletonSerializer.cpp \
-                      main.cpp \
-                      tinystr.cpp \
-                      tinyxml.cpp \
-                      tinyxmlerror.cpp \
-                      tinyxmlparser.cpp
+                      main.cpp
 
 OgreXMLConverter_LDFLAGS = -L$(top_builddir)/OgreMain/src
-OgreXMLConverter_LDADD = -lOgreMain
+OgreXMLConverter_LDADD = -lOgreMain -ltinyxml
 all: all-am
 
 .SUFFIXES:
@@ -319,10 +311,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-OgreXMLMeshSerializer.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-OgreXMLSkeletonSerializer.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinystr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinyxml.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinyxmlerror.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreXMLConverter-tinyxmlparser.Po at am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -387,62 +375,6 @@ OgreXMLConverter-main.obj: main.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
 
-OgreXMLConverter-tinystr.o: tinystr.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinystr.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinystr.Tpo -c -o OgreXMLConverter-tinystr.o `test -f 'tinystr.cpp' || echo '$(srcdir)/'`tinystr.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinystr.Tpo $(DEPDIR)/OgreXMLConverter-tinystr.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinystr.cpp' object='OgreXMLConverter-tinystr.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinystr.o `test -f 'tinystr.cpp' || echo '$(srcdir)/'`tinystr.cpp
-
-OgreXMLConverter-tinystr.obj: tinystr.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinystr.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinystr.Tpo -c -o OgreXMLConverter-tinystr.obj `if test -f 'tinystr.cpp'; then $(CYGPATH_W) 'tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/tinystr.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinystr.Tpo $(DEPDIR)/OgreXMLConverter-tinystr.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinystr.cpp' object='OgreXMLConverter-tinystr.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinystr.obj `if test -f 'tinystr.cpp'; then $(CYGPATH_W) 'tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/tinystr.cpp'; fi`
-
-OgreXMLConverter-tinyxml.o: tinyxml.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxml.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo -c -o OgreXMLConverter-tinyxml.o `test -f 'tinyxml.cpp' || echo '$(srcdir)/'`tinyxml.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo $(DEPDIR)/OgreXMLConverter-tinyxml.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxml.cpp' object='OgreXMLConverter-tinyxml.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxml.o `test -f 'tinyxml.cpp' || echo '$(srcdir)/'`tinyxml.cpp
-
-OgreXMLConverter-tinyxml.obj: tinyxml.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxml.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo -c -o OgreXMLConverter-tinyxml.obj `if test -f 'tinyxml.cpp'; then $(CYGPATH_W) 'tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxml.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxml.Tpo $(DEPDIR)/OgreXMLConverter-tinyxml.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxml.cpp' object='OgreXMLConverter-tinyxml.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxml.obj `if test -f 'tinyxml.cpp'; then $(CYGPATH_W) 'tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxml.cpp'; fi`
-
-OgreXMLConverter-tinyxmlerror.o: tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlerror.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo -c -o OgreXMLConverter-tinyxmlerror.o `test -f 'tinyxmlerror.cpp' || echo '$(srcdir)/'`tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlerror.cpp' object='OgreXMLConverter-tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlerror.o `test -f 'tinyxmlerror.cpp' || echo '$(srcdir)/'`tinyxmlerror.cpp
-
-OgreXMLConverter-tinyxmlerror.obj: tinyxmlerror.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlerror.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo -c -o OgreXMLConverter-tinyxmlerror.obj `if test -f 'tinyxmlerror.cpp'; then $(CYGPATH_W) 'tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlerror.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlerror.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlerror.cpp' object='OgreXMLConverter-tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlerror.obj `if test -f 'tinyxmlerror.cpp'; then $(CYGPATH_W) 'tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlerror.cpp'; fi`
-
-OgreXMLConverter-tinyxmlparser.o: tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlparser.o -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo -c -o OgreXMLConverter-tinyxmlparser.o `test -f 'tinyxmlparser.cpp' || echo '$(srcdir)/'`tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlparser.cpp' object='OgreXMLConverter-tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlparser.o `test -f 'tinyxmlparser.cpp' || echo '$(srcdir)/'`tinyxmlparser.cpp
-
-OgreXMLConverter-tinyxmlparser.obj: tinyxmlparser.cpp
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -MT OgreXMLConverter-tinyxmlparser.obj -MD -MP -MF $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo -c -o OgreXMLConverter-tinyxmlparser.obj `if test -f 'tinyxmlparser.cpp'; then $(CYGPATH_W) 'tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlparser.cpp'; fi`
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Tpo $(DEPDIR)/OgreXMLConverter-tinyxmlparser.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tinyxmlparser.cpp' object='OgreXMLConverter-tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OgreXMLConverter_CXXFLAGS) $(CXXFLAGS) -c -o OgreXMLConverter-tinyxmlparser.obj `if test -f 'tinyxmlparser.cpp'; then $(CYGPATH_W) 'tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/tinyxmlparser.cpp'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: ogre-make-clean.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre-make-clean.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ogre-make-clean.sh	16 Apr 2009 13:13:18 -0000	1.1
+++ ogre-make-clean.sh	28 Sep 2009 09:52:24 -0000	1.2
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-version=1.6.2
+version=1.6.4
 
 [ ! -e ogre ]
 


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ogre.spec	25 Jul 2009 20:37:48 -0000	1.52
+++ ogre.spec	28 Sep 2009 09:52:24 -0000	1.53
@@ -1,6 +1,6 @@
 Name:           ogre
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # LGPLv2+ with exceptions - main library
 # CC-BY-SA - devel docs
@@ -10,7 +10,7 @@ License:        LGPLv2+ with exceptions 
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is modified http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
-# with non-free files striped:
+# with non-free files striped (see ogre-make-clean.sh):
 # - Non-free licensed headers under RenderSystems/GL/include/GL removed
 # - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 1.5.1 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
@@ -21,7 +21,7 @@ Patch0:         ogre-1.2.1-rpath.patch
 #Patch1:         ogre-1.6.0-system-glew.patch
 # Upstream patch to GLEW applied to new version
 Patch1:         ogre-1.6.0rc1-glew.patch
-Patch2:         ogre-1.4.7-system-tinyxml.patch
+Patch2:         ogre-1.6.4-system-tinyxml.patch
 Patch3:         ogre-1.6.1-fix-ppc-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel
@@ -29,6 +29,8 @@ BuildRequires:  libXaw-devel libXrandr-d
 BuildRequires:  ois-devel freeimage-devel openexr-devel
 #BuildRequires:  glew-devel
 BuildRequires:  tinyxml-devel
+# For drawing config dialog
+Requires:       xorg-x11-fonts-misc
 
 %description
 OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
@@ -215,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.4-1
+- New upstream release 1.6.4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- ogre-1.4.7-system-tinyxml.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep 28 09:53:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 09:53:33 +0000
Subject: [pkgdb] libtar (Fedora EPEL, 4) updated by huzaifas
Message-ID: <20090928095334.8D3E310F86A@bastion2.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for libtar
huzaifas has set commit to Approved for 107427 on libtar (Fedora EPEL 4)
huzaifas has set checkout to Approved for 107427 on libtar (Fedora EPEL 4)
huzaifas has set build to Approved for 107427 on libtar (Fedora EPEL 4)
huzaifas changed owner of libtar in Fedora EPEL 4 to huzaifas

To make changes to this package see:
  /pkgdb/packages/name/libtar



From petersen at fedoraproject.org  Mon Sep 28 09:54:20 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 09:54:20 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.19,1.20
Message-ID: <20090928095420.8B0D111C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5836

Modified Files:
	comps-f13.xml.in 
Log Message:
remove leading-space from @books description


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- comps-f13.xml.in	27 Sep 2009 00:48:59 -0000	1.19
+++ comps-f13.xml.in	28 Sep 2009 09:54:20 -0000	1.20
@@ -478,7 +478,7 @@
   <group>
     <id>books</id>
     <_name>Books and Guides</_name>
-    <_description> Books and Guides for Fedora users and developers</_description>
+    <_description>Books and Guides for Fedora users and developers</_description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>



From atorkhov at fedoraproject.org  Mon Sep 28 09:55:31 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 09:55:31 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.53,1.54
Message-ID: <20090928095531.E72A211C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6217

Modified Files:
	ogre.spec 
Log Message:
not needed


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ogre.spec	28 Sep 2009 09:52:24 -0000	1.53
+++ ogre.spec	28 Sep 2009 09:55:31 -0000	1.54
@@ -29,8 +29,6 @@ BuildRequires:  libXaw-devel libXrandr-d
 BuildRequires:  ois-devel freeimage-devel openexr-devel
 #BuildRequires:  glew-devel
 BuildRequires:  tinyxml-devel
-# For drawing config dialog
-Requires:       xorg-x11-fonts-misc
 
 %description
 OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,



From huzaifas at fedoraproject.org  Mon Sep 28 09:56:19 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 28 Sep 2009 09:56:19 +0000 (UTC)
Subject: rpms/libtar/EL-4 import.log, NONE,
	1.1 libtar-1.2.11-missing-protos.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libtar.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090928095619.BD6BE11C00E4@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/libtar/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563/EL-4

Modified Files:
	.cvsignore libtar.spec sources 
Added Files:
	import.log libtar-1.2.11-missing-protos.patch 
Log Message:



--- NEW FILE import.log ---
libtar-1_2_11-11_rhis:EL-4:libtar-1.2.11-11.rhis.src.rpm:1254117181

libtar-1.2.11-missing-protos.patch:
 configure     |   13 +++++++------
 lib/append.c  |    2 ++
 lib/output.c  |    1 +
 lib/wrapper.c |    1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE libtar-1.2.11-missing-protos.patch ---
diff -up libtar-1.2.11/lib/append.c.foo libtar-1.2.11/lib/append.c
--- libtar-1.2.11/lib/append.c.foo	2003-01-07 02:40:59.000000000 +0100
+++ libtar-1.2.11/lib/append.c	2008-04-03 15:08:07.000000000 +0200
@@ -13,6 +13,8 @@
 #include <internal.h>
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/param.h>
diff -up libtar-1.2.11/configure.foo libtar-1.2.11/configure
--- libtar-1.2.11/configure.foo	2008-04-03 15:08:07.000000000 +0200
+++ libtar-1.2.11/configure	2008-04-03 15:09:20.000000000 +0200
@@ -4943,8 +4943,8 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -20083,8 +20083,8 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return (2);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -22411,6 +22411,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <stdio.h>
+#include <string.h>
 
 typedef struct {
   int length;
@@ -22437,10 +22438,10 @@ int main() {
     if ((snprintf(test1, tests[i].length, "%s", tests[i].test)
          != tests[i].retval) ||
         (tests[i].result && strcmp(tests[i].result, test1)))
-      exit(1);
+      return (1);
   }
 
-  exit(0);
+  return (0);
 }
 
 _ACEOF
diff -up libtar-1.2.11/lib/output.c~ libtar-1.2.11/lib/output.c
--- libtar-1.2.11/lib/output.c~	2008-04-03 15:11:07.000000000 +0200
+++ libtar-1.2.11/lib/output.c	2008-04-03 15:11:07.000000000 +0200
@@ -13,6 +13,7 @@
 #include <internal.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>
diff -up libtar-1.2.11/lib/wrapper.c~ libtar-1.2.11/lib/wrapper.c
--- libtar-1.2.11/lib/wrapper.c~	2008-04-03 15:11:28.000000000 +0200
+++ libtar-1.2.11/lib/wrapper.c	2008-04-03 15:11:28.000000000 +0200
@@ -13,6 +13,7 @@
 #include <internal.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/param.h>
 #include <dirent.h>
 #include <errno.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:49 -0000	1.2
+++ .cvsignore	28 Sep 2009 09:56:19 -0000	1.3
@@ -1 +1,2 @@
 libtar-1.2.11.tar.gz
+libtar_1.2.11-4.diff.gz


Index: libtar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-4/libtar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libtar.spec	10 Dec 2004 22:03:06 -0000	1.5
+++ libtar.spec	28 Sep 2009 09:56:19 -0000	1.6
@@ -1,16 +1,15 @@
-Summary: 	Tar file manipulation API
-Name: 		libtar
-Version: 	1.2.11
-Release: 	3
-Epoch: 		0
-License: 	BSD
-Group: 		System Environment/Libraries
-URL: 		http://www-dev.cites.uiuc.edu/libtar/
-Source0: 	%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	libtar-devel = %{epoch}:%{name}-%{version}
-BuildRequires:	zlib-devel
-
+Summary:        Tar file manipulation API
+Name:           libtar
+Version:        1.2.11
+Release:        11%{?dist}
+License:        MIT
+Group:          System Environment/Libraries
+URL:            http://www.feep.net/libtar/
+Source0:        ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/libt/libtar/libtar_1.2.11-4.diff.gz
+Patch1:         libtar-1.2.11-missing-protos.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  zlib-devel libtool
 
 %description
 libtar is a C library for manipulating tar archives. It supports both
@@ -18,38 +17,96 @@ the strict POSIX tar format and many of 
 extensions.
 
 
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
+%patch0 -p1 -z .deb
+%patch1 -p1
+# set correct version for .so build
+%define ltversion %(echo %{version} | tr '.' ':')
+sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
+  lib/Makefile.in
 
 
 %build
-%configure
+cp /usr/share/libtool/config.sub /usr/share/libtool/ltmain.sh autoconf
+%configure --disable-static
+# Don't use 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
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+# Without this we get no debuginfo and stripping
+chmod +x $RPM_BUILD_ROOT%{_libdir}/libtar.so.%{version}
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT TODO README ChangeLog*
 %{_bindir}/%{name}
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root,-)
 %{_includedir}/libtar.h
 %{_includedir}/libtar_listhash.h
-%{_libdir}/lib*.a
+%{_libdir}/lib*.so
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-11
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.11-10
+- Autorebuild for GCC 4.3
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-9
+- Update License tag for new Licensing Guidelines compliance
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-8
+- FE6 Rebuild
+
+* Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-7
+- Taking over as maintainer since Anvil has other priorities
+- Add a bunch of patches from Debian, which build a .so instead of a .a
+  and fix a bunch of memory leaks.
+- Reinstate a proper devel package as we now build a .so
+
+* Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 1.2.11-6.fc5
+- Modified URL and added one in Source0
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.11-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sat Aug 16 2003 Dams <anvil[AT]livna.org> 0:1.2.11-0.fdr.3
 - Merged devel and main packages
 - Package provide now libtar-devel
 
-* Tue Jul  8 2003 Dams <anvil[AT]livna.org> 
+* Tue Jul  8 2003 Dams <anvil[AT]livna.org>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:49 -0000	1.2
+++ sources	28 Sep 2009 09:56:19 -0000	1.3
@@ -1 +1,2 @@
 604238e8734ce6e25347a58c4f1a1d7e  libtar-1.2.11.tar.gz
+8149a09f4baef9a879ef5f74dab1c32e  libtar_1.2.11-4.diff.gz



From atorkhov at fedoraproject.org  Mon Sep 28 09:57:48 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 09:57:48 +0000 (UTC)
Subject: rpms/ogre/devel .cvsignore,1.18,1.19 sources,1.19,1.20
Message-ID: <20090928095748.6C62B11C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7156

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.4-1
- New upstream release 1.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	16 Apr 2009 13:13:18 -0000	1.18
+++ .cvsignore	28 Sep 2009 09:57:48 -0000	1.19
@@ -1 +1 @@
-ogre-1.6.2-clean.tar.bz2
+ogre-1.6.4-clean.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Apr 2009 13:13:18 -0000	1.19
+++ sources	28 Sep 2009 09:57:48 -0000	1.20
@@ -1 +1 @@
-41cf1af6c7ec587a2029298b774dcaf8  ogre-1.6.2-clean.tar.bz2
+d18102768f42ab769f295241e7e2503e  ogre-1.6.4-clean.tar.bz2



From petersen at fedoraproject.org  Mon Sep 28 10:03:43 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 28 Sep 2009 10:03:43 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.129,1.130
Message-ID: <20090928100343.BAE1011C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6145

Modified Files:
	comps-f12.xml.in 
Log Message:
@chinese-support:
- add new ibus-table tables for array30, quick, xinhua, yong
- add back scim-tables-chinese

@fonts[ja]
- revert to vlgothic as default for 
- make ipa-fonts optional

@haskell
- add lots of new libraries

@input-methods
- add ibus-qt and ibus-table tables

@japanese-fonts
- revert to vlgothic as default for 
- make ipa-fonts optional

@russian-support
- add ibus-table-translit



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- comps-f12.xml.in	27 Sep 2009 00:49:38 -0000	1.129
+++ comps-f12.xml.in	28 Sep 2009 10:03:43 -0000	1.130
@@ -664,7 +664,6 @@
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-table-chinese</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese-Big5</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Chinese</packagereq>
@@ -677,9 +676,14 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
       <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">gcin</packagereq>
+      <packagereq type="optional">ibus-table-array30</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
+      <packagereq type="optional">ibus-table-extraphrase</packagereq>
+      <packagereq type="optional">ibus-table-quick</packagereq>
       <packagereq type="optional">ibus-table-wubi</packagereq>
+      <packagereq type="optional">ibus-table-xinhua</packagereq>
+      <packagereq type="optional">ibus-table-yong</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">scim-array</packagereq>
@@ -690,6 +694,7 @@
       <packagereq type="optional">scim-python-xingma-erbi</packagereq>
       <packagereq type="optional">scim-python-xingma-wubi</packagereq>
       <packagereq type="optional">scim-python-xingma-zhengma</packagereq>
+      <packagereq type="optional">scim-tables-chinese</packagereq>
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">stardict-dic-zh_CN</packagereq>
       <packagereq type="optional">stardict-dic-zh_TW</packagereq>
@@ -1790,7 +1795,6 @@
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
-      <packagereq type="default">ipa-pgothic-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">kacst-art-fonts</packagereq>
       <packagereq type="default">kacst-book-fonts</packagereq>
@@ -1830,6 +1834,7 @@
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
+      <packagereq type="default">vlgothic-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
       <packagereq type="optional">allgeyer-musisync-fonts</packagereq>
@@ -1908,6 +1913,7 @@
       <packagereq type="optional">icelandic-fonts</packagereq>
       <packagereq type="optional">inkboy-fonts</packagereq>
       <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
       <packagereq type="optional">ipa-mincho-fonts</packagereq>
       <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
@@ -2020,7 +2026,6 @@
       <packagereq type="optional">un-extra-fonts-taza</packagereq>
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
-      <packagereq type="optional">vlgothic-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
@@ -2985,10 +2990,24 @@
       <packagereq type="default">ghc-doc</packagereq>
       <packagereq type="default">happy</packagereq>
       <packagereq type="optional">cpphs</packagereq>
-      <packagereq type="optional">ghc-gtk</packagereq>
+      <packagereq type="optional">ghc-cgi-devel</packagereq>
+      <packagereq type="optional">ghc-editline-devel</packagereq>
+      <packagereq type="optional">ghc-ghc-paths-devel</packagereq>
+      <packagereq type="optional">ghc-gtk-devek</packagereq>
       <packagereq type="optional">ghc-gtk2hs-doc</packagereq>
+      <packagereq type="optional">ghc-haskell-src-exts-devel</packagereq>
+      <packagereq type="optional">ghc-HTTP-devel</packagereq>
+      <packagereq type="optional">ghc-HUnit-devel</packagereq>
+      <packagereq type="optional">ghc-network-devel</packagereq>
       <packagereq type="optional">ghc-prof</packagereq>
+      <packagereq type="optional">ghc-uniplate-devel</packagereq>
+      <packagereq type="optional">ghc-utf8-string-devel</packagereq>
+      <packagereq type="optional">ghc-X11-devel</packagereq>
+      <packagereq type="optional">ghc-X11-xft-devel</packagereq>
+      <packagereq type="optional">ghc-X11-zlib-devel</packagereq>
+      <packagereq type="optional">ghc-xmonad-contrib-devel</packagereq>
       <packagereq type="optional">haddock</packagereq>
+      <packagereq type="optional">hscolour</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
       <packagereq type="optional">xmonad</packagereq>
@@ -3123,8 +3142,8 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="qt">ibus</packagereq>
       <packagereq type="conditional" requires="gtk2">ibus-gtk</packagereq>
+      <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
       <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
       <packagereq type="default">ibus-anthy</packagereq>
       <packagereq type="default">ibus-chewing</packagereq>
@@ -3154,9 +3173,14 @@
       <packagereq type="optional">gok</packagereq>
       <packagereq type="optional">ibus-sayura</packagereq>
       <packagereq type="optional">ibus-table-additional</packagereq>
+      <packagereq type="optional">ibus-table-array30</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
+      <packagereq type="optional">ibus-table-quick</packagereq>
+      <packagereq type="optional">ibus-table-translit</packagereq>
       <packagereq type="optional">ibus-table-wubi</packagereq>
+      <packagereq type="optional">ibus-table-xinhua</packagereq>
+      <packagereq type="optional">ibus-table-yong</packagereq>
       <packagereq type="optional">iok</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">m17n-contrib-esperanto</packagereq>
@@ -3328,16 +3352,18 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-ja</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
-      <packagereq type="default">ipa-gothic-fonts</packagereq>
-      <packagereq type="default">ipa-mincho-fonts</packagereq>
-      <packagereq type="default">ipa-pgothic-fonts</packagereq>
-      <packagereq type="default">ipa-pmincho-fonts</packagereq>
+      <packagereq type="default">vlgothic-fonts</packagereq>
+      <packagereq type="default">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">cmigemo</packagereq>
       <packagereq type="optional">ddskk</packagereq>
       <packagereq type="optional">ddskk-xemacs</packagereq>
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
@@ -3364,8 +3390,6 @@
       <packagereq type="optional">stardict-dic-ja</packagereq>
       <packagereq type="optional">uim-canna</packagereq>
       <packagereq type="optional">uim-skk</packagereq>
-      <packagereq type="optional">vlgothic-fonts</packagereq>
-      <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">wkf</packagereq>
     </packagelist>
   </group>
@@ -4809,6 +4833,7 @@
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">ibus-table-translit</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
       <packagereq type="optional">scim-tables-russian</packagereq>



From atorkhov at fedoraproject.org  Mon Sep 28 10:16:16 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 10:16:16 +0000 (UTC)
Subject: rpms/ember/devel ember.spec,1.17,1.18
Message-ID: <20090928101616.AAC2111C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ember/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13387

Modified Files:
	ember.spec 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.6-3
- Rebuilt for new OGRE



Index: ember.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ember.spec	24 Jul 2009 22:06:48 -0000	1.17
+++ ember.spec	28 Sep 2009 10:16:15 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           ember
 Version:        0.5.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3D client for WorldForge
 
 Group:          Amusements/Games
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.6-3
+- Rebuilt for new OGRE
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atorkhov at fedoraproject.org  Mon Sep 28 10:17:54 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 10:17:54 +0000 (UTC)
Subject: rpms/chess/devel chess.spec,1.29,1.30
Message-ID: <20090928101754.9149F11C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/chess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14378

Modified Files:
	chess.spec 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.0-27
- Rebuild for new ogre



Index: chess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chess/devel/chess.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- chess.spec	24 Jul 2009 18:53:57 -0000	1.29
+++ chess.spec	28 Sep 2009 10:17:54 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           chess
 Version:        1.0
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        3D chess game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -87,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.0-27
+- Rebuild for new ogre
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atorkhov at fedoraproject.org  Mon Sep 28 10:26:57 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 10:26:57 +0000 (UTC)
Subject: rpms/meshmagick/devel meshmagick.spec,1.3,1.4
Message-ID: <20090928102657.746CC11C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/meshmagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16621

Modified Files:
	meshmagick.spec 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-7.20090124svn2618
- Rebuilt for new OGRE



Index: meshmagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/devel/meshmagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- meshmagick.spec	25 Jul 2009 12:05:03 -0000	1.3
+++ meshmagick.spec	28 Sep 2009 10:26:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           meshmagick
 Version:        0.5.2
-Release:        6.20090124svn2618%{?dist}
+Release:        7.20090124svn2618%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-7.20090124svn2618
+- Rebuilt for new OGRE
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-6.20090124svn2618
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atorkhov at fedoraproject.org  Mon Sep 28 10:27:21 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 28 Sep 2009 10:27:21 +0000 (UTC)
Subject: rpms/vegastrike/devel vegastrike.spec,1.22,1.23
Message-ID: <20090928102721.99BB211C00E4@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/vegastrike/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16850

Modified Files:
	vegastrike.spec 
Log Message:
* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.0-14
- Rebuild for new ogre



Index: vegastrike.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- vegastrike.spec	16 Aug 2009 10:05:54 -0000	1.22
+++ vegastrike.spec	28 Sep 2009 10:27:21 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.0-14
+- Rebuild for new ogre
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-13
 - Switch to openal-soft
 



From peter at fedoraproject.org  Mon Sep 28 10:56:07 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 28 Sep 2009 10:56:07 +0000 (UTC)
Subject: rpms/wavpack/devel .cvsignore, 1.7, 1.8 import.log, 1.3, 1.4 sources,
	1.7, 1.8 wavpack.spec, 1.14, 1.15
Message-ID: <20090928105607.E202B11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/wavpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25355/devel

Modified Files:
	.cvsignore import.log sources wavpack.spec 
Log Message:
Ver. 4.60


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Aug 2008 09:53:22 -0000	1.7
+++ .cvsignore	28 Sep 2009 10:56:06 -0000	1.8
@@ -1 +1 @@
-wavpack-4.50.1.tar.bz2
+wavpack-4.60.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	30 Aug 2008 11:17:22 -0000	1.3
+++ import.log	28 Sep 2009 10:56:07 -0000	1.4
@@ -1,3 +1,4 @@
 wavpack-4_50-1_fc9:HEAD:wavpack-4.50-1.fc9.src.rpm:1213791201
 wavpack-4_50_1-1_fc9:HEAD:wavpack-4.50.1-1.fc9.src.rpm:1219571566
 wavpack-4_50_1-2_fc9:HEAD:wavpack-4.50.1-2.fc9.src.rpm:1220095019
+wavpack-4_60-1_fc11:HEAD:wavpack-4.60-1.fc11.src.rpm:1254135327


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Aug 2008 09:53:22 -0000	1.7
+++ sources	28 Sep 2009 10:56:07 -0000	1.8
@@ -1 +1 @@
-2c9d7e3672f60070d4fd2c86c924a3b4  wavpack-4.50.1.tar.bz2
+722f90393b292cd1413e8af8250a3783  wavpack-4.60.0.tar.bz2


Index: wavpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/devel/wavpack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- wavpack.spec	27 Jul 2009 07:04:32 -0000	1.14
+++ wavpack.spec	28 Sep 2009 10:56:07 -0000	1.15
@@ -1,11 +1,11 @@
 Name:		wavpack
 Summary:	A completely open audiocodec
-Version:	4.50.1
-Release:	4%{?dist}
+Version:	4.60
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Multimedia
 Url:		http://www.wavpack.com/
-Source:		http://www.wavpack.com/%{name}-%{version}.tar.bz2
+Source:		http://www.wavpack.com/%{name}-%{version}.0.tar.bz2
 Patch0:		wavpack-wavpack_pc_in.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +26,7 @@ Requires:	pkgconfig
 Files needed for developing apps using wavpack
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.0
 %patch0 -p0 -b .libs
 
 %build
@@ -35,7 +35,7 @@ Files needed for developing apps using w
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} DESTDIR=%{buildroot} install
 %{__rm} -f %{buildroot}/%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
@@ -56,9 +56,12 @@ Files needed for developing apps using w
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/libwavpack.so
-%doc ChangeLog README doc
+%doc ChangeLog README doc/*
 
 %changelog
+* Mon Sep 28 2009 Peter Lemenkov <lemenkov at gmail.com> 4.60-1
+- Version 4.60
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.50.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Mon Sep 28 11:25:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 28 Sep 2009 11:25:10 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.71,1.72
Message-ID: <20090928112510.F3CB311C00E4@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2900

Modified Files:
	kdelibs3.spec 
Log Message:
rhel cleanup



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- kdelibs3.spec	23 Sep 2009 19:39:16 -0000	1.71
+++ kdelibs3.spec	28 Sep 2009 11:25:10 -0000	1.72
@@ -4,23 +4,20 @@
 
 %define distname "Fedora"
 
+%if 0%{?rhel}
+%define distname "EL"
+%endif
+
 %define kde_settings 1 
 
-%define arts 1
 %define arts_ev 8:1.5.10
 %define qt3 qt3
 %define qt3_version 3.3.8b
 %define qt3_ev %{?qt3_epoch}%{qt3_version} 
-# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
-%define qt3_ver %{qt3_version}
-# fix this?... -- Rex
-%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
 
 %define kde_major_version 3
 
-%define make_cvs 1
-
 %define apidocs 1
 
 # We always include this here now because kdeartwork 4 has moved on to
@@ -30,7 +27,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -99,8 +96,6 @@ Patch204: kdelibs-3.5.10-cve-2009-1698.p
 # fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
 Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 
-#{?arts:Requires: arts >= %{arts_ev}}
-#Requires: %{qt3} >= %{qt3_ev}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -112,9 +107,9 @@ Requires: shadow-utils
 BuildRequires: sudo
 Requires(hint): sudo
 
-%define   libkdnssd libkdnssd
-# omit for now, may contribute to http://bugzilla.redhat.com/441222 
-#Requires: %{libkdnssd}
+%if 0%{?fedora}
+%define libkdnssd libkdnssd
+%endif
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
@@ -122,12 +117,13 @@ Requires: iceauth
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires: hunspell
 
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
 BuildRequires: %{qt3}-devel %{qt3}-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
+BuildRequires: arts-devel >= %{arts_ev}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -150,21 +146,17 @@ BuildRequires: bzip2-devel
 BuildRequires: libtiff-devel
 BuildRequires: libacl-devel libattr-devel
 BuildRequires: enchant-devel
-Requires: hunspell
 BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
-%define _with_libutempter 1
 BuildRequires: libutempter-devel
 BuildRequires: findutils
 BuildRequires: jasper-devel
 BuildRequires: OpenEXR-devel
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
 
 %if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
@@ -194,7 +186,7 @@ Provides:  kdelibs-devel = 6:%{version}-
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{qt3}-devel
 Requires: openssl-devel
-%{?arts:Requires: arts-devel}
+Requires: arts-devel
 %{?libkdnssd:Requires: libkdnssd-devel}
 %description devel
 This package includes the header files you will need to compile
@@ -229,7 +221,7 @@ format for easy browsing
 %patch38 -p1 -b .cupsdconf2-group
 %patch39 -p1 -b .kabc-make
 %patch40 -p1 -b .kdeprint-utf8
-%{?_with_libutempter:%patch41 -p1 -b .utempter}
+%patch41 -p1 -b .utempter
 %patch43 -p1 -b .lang
 %patch45 -p1 -b .xdg-autostart
 %patch46 -p1 -b .kate-vhdl
@@ -257,11 +249,9 @@ format for easy browsing
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
-%if %{make_cvs}
 # hack/fix for newer automake
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-%endif
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+make -f admin/Makefile.common cvs
 
 
 %build
@@ -302,7 +292,6 @@ export DO_NOT_COMPILE="libkscreensaver"
    --enable-dnotify \
    --enable-inotify \
    --with-utempter \
-   %{!?arts:--without-arts} \
    %{?_with_rgbfile} \
    --with-jasper \
    --with-openexr \
@@ -580,6 +569,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Mon Sep 28 2009 Than Ngo <than at redhat.com> - 3.5.10-18
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17 
 - move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
 



From vpv at fedoraproject.org  Mon Sep 28 11:29:00 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 28 Sep 2009 11:29:00 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel .cvsignore, 1.11,
	1.12 malaga-suomi-voikko.spec, 1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20090928112900.D31AE11C00E4@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4707

Modified Files:
	.cvsignore malaga-suomi-voikko.spec sources 
Log Message:
* Mon Sep 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.3.rc3
- New release candidate.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	18 Sep 2009 10:05:04 -0000	1.11
+++ .cvsignore	28 Sep 2009 11:29:00 -0000	1.12
@@ -1 +1 @@
-suomi-malaga-1.4rc2.tar.gz
+suomi-malaga-1.4rc3.tar.gz


Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- malaga-suomi-voikko.spec	18 Sep 2009 10:05:04 -0000	1.16
+++ malaga-suomi-voikko.spec	28 Sep 2009 11:29:00 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           malaga-suomi-voikko
 Version:        1.4
-Release:        0.2.rc2%{?dist}
+Release:        0.3.rc3%{?dist}
 Summary:        A description of Finnish morphology written in Malaga (Voikko edition)
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@ URL:            http://voikko.sourceforg
 # The usual format of stable release source URLs
 #Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
 # The usual format of testing release source URLs
-Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc2.tar.gz
+Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga >= 7.8 python
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.3.rc3
+- New release candidate.
+
 * Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.2.rc2
 - New release candidate.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2009 10:05:04 -0000	1.11
+++ sources	28 Sep 2009 11:29:00 -0000	1.12
@@ -1 +1 @@
-295acf3af67a6ee5f7bde8fa336b5d0f  suomi-malaga-1.4rc2.tar.gz
+2cb4a87c1a02cd708dbeddcb352aeb54  suomi-malaga-1.4rc3.tar.gz



From nphilipp at fedoraproject.org  Mon Sep 28 11:43:35 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 11:43:35 +0000 (UTC)
Subject: rpms/system-config-date-docs/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 system-config-date-docs.spec, 1.6, 1.7
Message-ID: <20090928114335.9577A11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10631

Modified Files:
	.cvsignore sources system-config-date-docs.spec 
Log Message:
version 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 15:51:39 -0000	1.4
+++ .cvsignore	28 Sep 2009 11:43:35 -0000	1.5
@@ -1 +1 @@
-system-config-date-docs-1.0.7.tar.bz2
+system-config-date-docs-1.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Apr 2009 15:51:39 -0000	1.5
+++ sources	28 Sep 2009 11:43:35 -0000	1.6
@@ -1 +1 @@
-eb70e0cc1ef456fc62e5ff35df897190  system-config-date-docs-1.0.7.tar.bz2
+c2da4e86a0635ca62954e4ab64fa288f  system-config-date-docs-1.0.8.tar.bz2


Index: system-config-date-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/system-config-date-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- system-config-date-docs.spec	27 Jul 2009 05:22:05 -0000	1.6
+++ system-config-date-docs.spec	28 Sep 2009 11:43:35 -0000	1.7
@@ -8,14 +8,14 @@
 
 Summary: Documentation for setting the system date and time
 Name: system-config-date-docs
-Version: 1.0.7
-Release: 2%{?dist}
+Version: 1.0.8
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: gettext
 BuildRequires: pkgconfig
 BuildRequires: gnome-doc-utils
@@ -26,6 +26,10 @@ BuildRequires: rarian-compat
 BuildRequires: scrollkeeper
 %endif
 
+# Until version 1.9.34, system-config-date contained online documentation.
+# From version 1.9.35 on, online documentation is split off into its own
+# package system-config-date-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-date < 1.9.35
 Requires: system-config-date >= 1.9.35
 %if %{with rarian_compat}
@@ -66,8 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gnome/help/system-config-date
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.0.8-1
+- pick up new translations
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
+* Wed Jun 10 2009 Nils Philippsen <nils at redhat.com>
+- document keyboard navigation (#251822)
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.7-1
 - add sr at latin structure (#495591)



From stingray at fedoraproject.org  Mon Sep 28 12:04:38 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Mon, 28 Sep 2009 12:04:38 +0000 (UTC)
Subject: rpms/libnfnetlink/devel .cvsignore, 1.8, 1.9 libnfnetlink.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20090928120438.F074811C00E4@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnfnetlink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20502

Modified Files:
	.cvsignore libnfnetlink.spec sources 
Log Message:
libnfnetlink-1.0.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Mar 2009 18:01:02 -0000	1.8
+++ .cvsignore	28 Sep 2009 12:04:38 -0000	1.9
@@ -1 +1 @@
-libnfnetlink-0.0.41.tar.bz2
+libnfnetlink-1.0.0.tar.bz2


Index: libnfnetlink.spec
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/devel/libnfnetlink.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libnfnetlink.spec	25 Jul 2009 06:12:28 -0000	1.17
+++ libnfnetlink.spec	28 Sep 2009 12:04:38 -0000	1.18
@@ -1,9 +1,6 @@
-# %define rev 7211
-# %define basever 0.0.30
-
 Name:           libnfnetlink
-Version:        0.0.41
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Netfilter netlink userspace library
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -69,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libnfnetlink/*.h
 
 %changelog
+* Mon Sep 28 2009 Paul P. Komkoff Jr <i at stingr.net> - 1.0.0-1
+- upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.41-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Mar 2009 18:01:02 -0000	1.8
+++ sources	28 Sep 2009 12:04:38 -0000	1.9
@@ -1 +1 @@
-5d844ea1f557bad0364d5b85cd10c796  libnfnetlink-0.0.41.tar.bz2
+016fdec8389242615024c529acc1adb8  libnfnetlink-1.0.0.tar.bz2



From bojan at fedoraproject.org  Mon Sep 28 12:04:48 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 28 Sep 2009 12:04:48 +0000 (UTC)
Subject: rpms/apr/devel apr.spec,1.92,1.93
Message-ID: <20090928120448.CCD2111C00E4@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20612

Modified Files:
	apr.spec 
Log Message:
Revert use of accept4(), dup3() and epoll_create1().


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- apr.spec	24 Sep 2009 23:52:00 -0000	1.92
+++ apr.spec	28 Sep 2009 12:04:48 -0000	1.93
@@ -52,12 +52,6 @@ C data structures and routines.
 # does not use -lrt).
 export ac_cv_search_shm_open=no
 
-# We know we have these on new Fedoras (kernel >= 2.6.28)
-export apr_cv_epoll_create1=yes
-export apr_cv_dup3=yes
-export apr_cv_accept4=yes
-export apr_cv_sock_cloexec=yes
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
@@ -127,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Sep 28 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
+- revert use of accept4(), dup3() and epoll_create1()
+
 * Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
 - bump up to 1.3.9
 



From nphilipp at fedoraproject.org  Mon Sep 28 12:04:57 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 12:04:57 +0000 (UTC)
Subject: rpms/system-config-nfs-docs/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 system-config-nfs-docs.spec, 1.6, 1.7
Message-ID: <20090928120457.DF36B11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20683

Modified Files:
	.cvsignore sources system-config-nfs-docs.spec 
Log Message:
version 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 16:13:02 -0000	1.4
+++ .cvsignore	28 Sep 2009 12:04:57 -0000	1.5
@@ -1 +1 @@
-system-config-nfs-docs-1.0.6.tar.bz2
+system-config-nfs-docs-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Apr 2009 16:13:02 -0000	1.5
+++ sources	28 Sep 2009 12:04:57 -0000	1.6
@@ -1 +1 @@
-0517efb560fe1a11a55c7790f3c44f72  system-config-nfs-docs-1.0.6.tar.bz2
+97e9c1f81e5e09c0fbb38a42b57db14f  system-config-nfs-docs-1.0.7.tar.bz2


Index: system-config-nfs-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/system-config-nfs-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- system-config-nfs-docs.spec	27 Jul 2009 05:24:44 -0000	1.6
+++ system-config-nfs-docs.spec	28 Sep 2009 12:04:57 -0000	1.7
@@ -8,14 +8,14 @@
 
 Summary: Documentation for configuring an NFS server
 Name: system-config-nfs-docs
-Version: 1.0.6
-Release: 2%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: gettext
 BuildRequires: pkgconfig
 BuildRequires: gnome-doc-utils
@@ -26,7 +26,11 @@ BuildRequires: rarian-compat
 BuildRequires: scrollkeeper
 %endif
 
-Obsoletes: system-config-nfs < 1.3.41
+# Until version 1.3.41, system-config-nfs contained online documentation.
+# From version 1.3.42 on, online documentation is split off into its own
+# package system-config-nfs-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
+Obsoletes: system-config-nfs < 1.3.42
 Requires: system-config-nfs >= 1.3.42
 %if %{with rarian_compat}
 Requires: rarian-compat
@@ -66,8 +70,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gnome/help/system-config-nfs
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.0.7-1
+- pick up new translations
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
 - add sr at latin structure (#495593)



From bojan at fedoraproject.org  Mon Sep 28 12:06:52 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 28 Sep 2009 12:06:52 +0000 (UTC)
Subject: rpms/apr/devel apr.spec,1.93,1.94
Message-ID: <20090928120652.BFD0311C00E4@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21907

Modified Files:
	apr.spec 
Log Message:
Bump revision.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- apr.spec	28 Sep 2009 12:04:48 -0000	1.93
+++ apr.spec	28 Sep 2009 12:06:52 -0000	1.94
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/



From jnovy at fedoraproject.org  Mon Sep 28 12:08:43 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 28 Sep 2009 12:08:43 +0000 (UTC)
Subject: rpms/libusb1/devel .cvsignore, 1.8, 1.9 libusb1.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20090928120844.0024811C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libusb1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23776

Modified Files:
	.cvsignore libusb1.spec sources 
Log Message:
* Mon Sep 28 2009 Jindrich Novy <jnovy at redhat.com> 1.0.3-1
- update to 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	15 Jun 2009 05:34:28 -0000	1.8
+++ .cvsignore	28 Sep 2009 12:08:43 -0000	1.9
@@ -1 +1 @@
-libusb-1.0.2.tar.bz2
+libusb-1.0.3.tar.bz2


Index: libusb1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/libusb1.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libusb1.spec	25 Jul 2009 08:50:22 -0000	1.9
+++ libusb1.spec	28 Sep 2009 12:08:43 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices
 Name: libusb1
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 28 2009 Jindrich Novy <jnovy at redhat.com> 1.0.3-1
+- update to 1.0.3
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	15 Jun 2009 05:34:28 -0000	1.8
+++ sources	28 Sep 2009 12:08:43 -0000	1.9
@@ -1 +1 @@
-dc8865eaff167aabe78e5799762b8067  libusb-1.0.2.tar.bz2
+03af26d0c49705fa46c1f732e1018e73  libusb-1.0.3.tar.bz2



From whot at fedoraproject.org  Mon Sep 28 12:10:42 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 28 Sep 2009 12:10:42 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.76, 1.77 sources, 1.71,
	1.72 xorg-x11-server.spec, 1.489, 1.490
Message-ID: <20090928121042.E1F5B11C0424@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24512

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Log Message:
* Mon Sep 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.903-1
- xserver 1.6.99.903 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	22 Sep 2009 05:59:02 -0000	1.76
+++ .cvsignore	28 Sep 2009 12:10:42 -0000	1.77
@@ -1 +1 @@
-xorg-server-1.6.99.902.tar.bz2
+xorg-server-1.6.99.903.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	22 Sep 2009 05:59:02 -0000	1.71
+++ sources	28 Sep 2009 12:10:42 -0000	1.72
@@ -1 +1 @@
-ca914aa3b9a01c037fedcf7bc5964d73  xorg-server-1.6.99.902.tar.bz2
+3a2f20ebbeeae5c13f7a78df314b1164  xorg-server-1.6.99.903.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -p -r1.489 -r1.490
--- xorg-x11-server.spec	22 Sep 2009 05:59:02 -0000	1.489
+++ xorg-x11-server.spec	28 Sep 2009 12:10:42 -0000	1.490
@@ -18,7 +18,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.99.902
+Version:   1.6.99.903
 Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
@@ -500,6 +500,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Sep 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.903-1
+- xserver 1.6.99.903 
+
 * Tue Sep 22 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.902-1
 - xserver 1.6.99.902 
 - cvs rm the now obsolete autoconf endian patch.



From corsepiu at fedoraproject.org  Mon Sep 28 12:19:48 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 28 Sep 2009 12:19:48 +0000 (UTC)
Subject: rpms/perl-Test-Script/F-10 .cvsignore, 1.3,
	1.4 perl-Test-Script.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090928121948.5B03911C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28121/F-10

Modified Files:
	.cvsignore perl-Test-Script.spec sources 
Log Message:
* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
- Upstream update.
- BR: perl(Probe::Perl)
- Activate AUTOMATED_TESTING=1 RELEASE_TESTING=1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Mar 2008 06:54:16 -0000	1.3
+++ .cvsignore	28 Sep 2009 12:19:47 -0000	1.4
@@ -1 +1 @@
-Test-Script-1.03.tar.gz
+Test-Script-1.06.tar.gz


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-10/perl-Test-Script.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-Script.spec	11 Mar 2008 06:54:16 -0000	1.4
+++ perl-Test-Script.spec	28 Sep 2009 12:19:47 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Test-Script
-Version:        1.03
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Cross-platform basic tests for scripts
 License:        GPL+ or Artistic
@@ -11,8 +11,15 @@ BuildArch:      noarch
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IPC::Run3) >= 0.034
+BuildRequires:  perl(Probe::Perl)
 BuildRequires:  perl(Test::More)
 
+# For improved tests
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Perl::MinimumVersion) >= 1.20
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +44,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test AUTOMATED_TESTING=1 RELEASE_TESTING=1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
+- Upstream update.
+- BR: perl(Probe::Perl)
+- Activate AUTOMATED_TESTING=1 RELEASE_TESTING=1.
+
 * Tue Mar 11 2008 Ralf Cors?pius <rc040203 at freenet.de> - 1.03-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Mar 2008 06:54:16 -0000	1.3
+++ sources	28 Sep 2009 12:19:47 -0000	1.4
@@ -1 +1 @@
-fa3018d63bc54ebb8d4d244fb1dc4c35  Test-Script-1.03.tar.gz
+43e8f1429472da66a853be819b11a5b9  Test-Script-1.06.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 28 12:19:48 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 28 Sep 2009 12:19:48 +0000 (UTC)
Subject: rpms/perl-Test-Script/F-11 .cvsignore, 1.3,
	1.4 perl-Test-Script.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090928121948.13D7511C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28121/F-11

Modified Files:
	.cvsignore perl-Test-Script.spec sources 
Log Message:
* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
- Upstream update.
- BR: perl(Probe::Perl)
- Activate AUTOMATED_TESTING=1 RELEASE_TESTING=1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Mar 2008 06:54:16 -0000	1.3
+++ .cvsignore	28 Sep 2009 12:19:47 -0000	1.4
@@ -1 +1 @@
-Test-Script-1.03.tar.gz
+Test-Script-1.06.tar.gz


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-11/perl-Test-Script.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-Script.spec	27 Feb 2009 02:51:43 -0000	1.5
+++ perl-Test-Script.spec	28 Sep 2009 12:19:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-Script
-Version:        1.03
-Release:        2%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Cross-platform basic tests for scripts
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,8 +11,15 @@ BuildArch:      noarch
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IPC::Run3) >= 0.034
+BuildRequires:  perl(Probe::Perl)
 BuildRequires:  perl(Test::More)
 
+# For improved tests
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Perl::MinimumVersion) >= 1.20
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +44,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test AUTOMATED_TESTING=1 RELEASE_TESTING=1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
+- Upstream update.
+- BR: perl(Probe::Perl)
+- Activate AUTOMATED_TESTING=1 RELEASE_TESTING=1.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Mar 2008 06:54:16 -0000	1.3
+++ sources	28 Sep 2009 12:19:47 -0000	1.4
@@ -1 +1 @@
-fa3018d63bc54ebb8d4d244fb1dc4c35  Test-Script-1.03.tar.gz
+43e8f1429472da66a853be819b11a5b9  Test-Script-1.06.tar.gz



From schwab at fedoraproject.org  Mon Sep 28 12:31:33 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 28 Sep 2009 12:31:33 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.290, 1.291 glibc-fedora.patch, 1.324,
	1.325 glibc.spec, 1.417, 1.418 import.log, 1.33, 1.34 sources,
	1.315, 1.316
Message-ID: <20090928123133.AA4B211C00E4@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31953/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- .cvsignore	21 Sep 2009 10:39:32 -0000	1.290
+++ .cvsignore	28 Sep 2009 12:31:32 -0000	1.291
@@ -1,2 +1,2 @@
-glibc-2.10-340-gae0f0db-fedora.tar.bz2
-glibc-2.10-340-gae0f0db.tar.bz2
+glibc-2.10-343-gf450806-fedora.tar.bz2
+glibc-2.10-343-gf450806.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   32 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 768 insertions(+), 469 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- glibc-fedora.patch	21 Sep 2009 10:39:32 -0000	1.324
+++ glibc-fedora.patch	28 Sep 2009 12:31:32 -0000	1.325
@@ -1,6 +1,6 @@
---- glibc-2.10-340-gae0f0db/ChangeLog
-+++ glibc-2.10.90-22/ChangeLog
-@@ -625,6 +625,11 @@
+--- glibc-2.10-343-gf450806/ChangeLog
++++ glibc-2.10.90-23/ChangeLog
+@@ -639,6 +639,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -890,6 +895,11 @@
+@@ -904,6 +909,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9288,6 +9298,13 @@
+@@ -9302,6 +9312,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9583,6 +9600,10 @@
+@@ -9597,6 +9614,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10840,6 +10861,15 @@
+@@ -10854,6 +10875,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,8 +65,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-340-gae0f0db/ChangeLog.15
-+++ glibc-2.10.90-22/ChangeLog.15
+--- glibc-2.10-343-gf450806/ChangeLog.15
++++ glibc-2.10.90-23/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -132,8 +132,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-340-gae0f0db/ChangeLog.16
-+++ glibc-2.10.90-22/ChangeLog.16
+--- glibc-2.10-343-gf450806/ChangeLog.16
++++ glibc-2.10.90-23/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -305,8 +305,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-340-gae0f0db/Makeconfig
-+++ glibc-2.10.90-22/Makeconfig
+--- glibc-2.10-343-gf450806/Makeconfig
++++ glibc-2.10.90-23/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -323,8 +323,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-340-gae0f0db/csu/Makefile
-+++ glibc-2.10.90-22/csu/Makefile
+--- glibc-2.10-343-gf450806/csu/Makefile
++++ glibc-2.10.90-23/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -335,8 +335,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-340-gae0f0db/csu/elf-init.c
-+++ glibc-2.10.90-22/csu/elf-init.c
+--- glibc-2.10-343-gf450806/csu/elf-init.c
++++ glibc-2.10.90-23/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -361,8 +361,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-340-gae0f0db/debug/tst-chk1.c
-+++ glibc-2.10.90-22/debug/tst-chk1.c
+--- glibc-2.10-343-gf450806/debug/tst-chk1.c
++++ glibc-2.10.90-23/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -391,8 +391,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-340-gae0f0db/elf/ldconfig.c
-+++ glibc-2.10.90-22/elf/ldconfig.c
+--- glibc-2.10-343-gf450806/elf/ldconfig.c
++++ glibc-2.10.90-23/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -474,8 +474,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-340-gae0f0db/elf/tst-stackguard1.c
-+++ glibc-2.10.90-22/elf/tst-stackguard1.c
+--- glibc-2.10-343-gf450806/elf/tst-stackguard1.c
++++ glibc-2.10.90-23/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -500,16 +500,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-340-gae0f0db/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-22/include/bits/stdlib-ldbl.h
+--- glibc-2.10-343-gf450806/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-23/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-340-gae0f0db/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-22/include/bits/wchar-ldbl.h
+--- glibc-2.10-343-gf450806/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-23/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-340-gae0f0db/include/features.h
-+++ glibc-2.10.90-22/include/features.h
+--- glibc-2.10-343-gf450806/include/features.h
++++ glibc-2.10.90-23/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -526,8 +526,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-340-gae0f0db/intl/locale.alias
-+++ glibc-2.10.90-22/intl/locale.alias
+--- glibc-2.10-343-gf450806/intl/locale.alias
++++ glibc-2.10.90-23/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -537,8 +537,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-340-gae0f0db/libio/stdio.h
-+++ glibc-2.10.90-22/libio/stdio.h
+--- glibc-2.10-343-gf450806/libio/stdio.h
++++ glibc-2.10.90-23/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -552,8 +552,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-340-gae0f0db/locale/iso-4217.def
-+++ glibc-2.10.90-22/locale/iso-4217.def
+--- glibc-2.10-343-gf450806/locale/iso-4217.def
++++ glibc-2.10.90-23/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -645,8 +645,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-340-gae0f0db/locale/programs/locarchive.c
-+++ glibc-2.10.90-22/locale/programs/locarchive.c
+--- glibc-2.10-343-gf450806/locale/programs/locarchive.c
++++ glibc-2.10.90-23/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -678,8 +678,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-340-gae0f0db/localedata/Makefile
-+++ glibc-2.10.90-22/localedata/Makefile
+--- glibc-2.10-343-gf450806/localedata/Makefile
++++ glibc-2.10.90-23/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -688,8 +688,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-340-gae0f0db/localedata/SUPPORTED
-+++ glibc-2.10.90-22/localedata/SUPPORTED
+--- glibc-2.10-343-gf450806/localedata/SUPPORTED
++++ glibc-2.10.90-23/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -731,8 +731,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-340-gae0f0db/localedata/locales/cy_GB
-+++ glibc-2.10.90-22/localedata/locales/cy_GB
+--- glibc-2.10-343-gf450806/localedata/locales/cy_GB
++++ glibc-2.10.90-23/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -747,8 +747,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-340-gae0f0db/localedata/locales/en_GB
-+++ glibc-2.10.90-22/localedata/locales/en_GB
+--- glibc-2.10-343-gf450806/localedata/locales/en_GB
++++ glibc-2.10.90-23/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -760,8 +760,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10-340-gae0f0db/localedata/locales/no_NO
-+++ glibc-2.10.90-22/localedata/locales/no_NO
+--- glibc-2.10-343-gf450806/localedata/locales/no_NO
++++ glibc-2.10.90-23/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -832,8 +832,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-340-gae0f0db/localedata/locales/zh_TW
-+++ glibc-2.10.90-22/localedata/locales/zh_TW
+--- glibc-2.10-343-gf450806/localedata/locales/zh_TW
++++ glibc-2.10.90-23/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -861,8 +861,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-340-gae0f0db/malloc/mcheck.c
-+++ glibc-2.10.90-22/malloc/mcheck.c
+--- glibc-2.10-343-gf450806/malloc/mcheck.c
++++ glibc-2.10.90-23/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -938,8 +938,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-340-gae0f0db/manual/libc.texinfo
-+++ glibc-2.10.90-22/manual/libc.texinfo
+--- glibc-2.10-343-gf450806/manual/libc.texinfo
++++ glibc-2.10.90-23/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -949,8 +949,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-340-gae0f0db/misc/sys/cdefs.h
-+++ glibc-2.10.90-22/misc/sys/cdefs.h
+--- glibc-2.10-343-gf450806/misc/sys/cdefs.h
++++ glibc-2.10.90-23/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -994,16 +994,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-340-gae0f0db/nis/nss
-+++ glibc-2.10.90-22/nis/nss
+--- glibc-2.10-343-gf450806/nis/nss
++++ glibc-2.10.90-23/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-340-gae0f0db/nptl/ChangeLog
-+++ glibc-2.10.90-22/nptl/ChangeLog
+--- glibc-2.10-343-gf450806/nptl/ChangeLog
++++ glibc-2.10.90-23/nptl/ChangeLog
 @@ -3717,6 +3717,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1044,8 +1044,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-340-gae0f0db/nptl/Makefile
-+++ glibc-2.10.90-22/nptl/Makefile
+--- glibc-2.10-343-gf450806/nptl/Makefile
++++ glibc-2.10.90-23/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1078,8 +1078,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-340-gae0f0db/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-22/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-343-gf450806/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-23/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1088,8 +1088,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-340-gae0f0db/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-22/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-343-gf450806/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-23/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1097,8 +1097,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-340-gae0f0db/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-22/nptl/tst-stackguard1.c
+--- glibc-2.10-343-gf450806/nptl/tst-stackguard1.c
++++ glibc-2.10.90-23/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1123,8 +1123,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-340-gae0f0db/nscd/nscd.conf
-+++ glibc-2.10.90-22/nscd/nscd.conf
+--- glibc-2.10-343-gf450806/nscd/nscd.conf
++++ glibc-2.10.90-23/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1134,8 +1134,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-340-gae0f0db/nscd/nscd.init
-+++ glibc-2.10.90-22/nscd/nscd.init
+--- glibc-2.10-343-gf450806/nscd/nscd.init
++++ glibc-2.10.90-23/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1207,8 +1207,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-340-gae0f0db/posix/Makefile
-+++ glibc-2.10.90-22/posix/Makefile
+--- glibc-2.10-343-gf450806/posix/Makefile
++++ glibc-2.10.90-23/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1229,8 +1229,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-340-gae0f0db/posix/getconf.speclist.h
-+++ glibc-2.10.90-22/posix/getconf.speclist.h
+--- glibc-2.10-343-gf450806/posix/getconf.speclist.h
++++ glibc-2.10.90-23/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1271,8 +1271,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-340-gae0f0db/streams/Makefile
-+++ glibc-2.10.90-22/streams/Makefile
+--- glibc-2.10-343-gf450806/streams/Makefile
++++ glibc-2.10.90-23/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1282,8 +1282,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-340-gae0f0db/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-22/sysdeps/generic/dl-cache.h
+--- glibc-2.10-343-gf450806/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-23/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1299,8 +1299,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10-340-gae0f0db/sysdeps/i386/Makefile
-+++ glibc-2.10.90-22/sysdeps/i386/Makefile
+--- glibc-2.10-343-gf450806/sysdeps/i386/Makefile
++++ glibc-2.10.90-23/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1325,8 +1325,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-340-gae0f0db/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-22/sysdeps/ia64/Makefile
+--- glibc-2.10-343-gf450806/sysdeps/ia64/Makefile
++++ glibc-2.10.90-23/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1338,8 +1338,8 @@
  endif
  endif
  
---- glibc-2.10-340-gae0f0db/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-22/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-343-gf450806/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-23/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1691,8 +1691,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-340-gae0f0db/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-22/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-343-gf450806/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-23/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1778,8 +1778,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-340-gae0f0db/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-22/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-343-gf450806/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-23/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1788,8 +1788,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-340-gae0f0db/sysdeps/unix/nice.c
-+++ glibc-2.10.90-22/sysdeps/unix/nice.c
+--- glibc-2.10-343-gf450806/sysdeps/unix/nice.c
++++ glibc-2.10.90-23/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1804,8 +1804,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1821,8 +1821,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1870,8 +1870,8 @@
      }
    else
  #endif
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1914,8 +1914,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1934,8 +1934,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1996,8 +1996,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2030,29 +2030,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2078,8 +2078,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2089,8 +2089,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2136,8 +2136,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-340-gae0f0db/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-22/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2156,8 +2156,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-340-gae0f0db/timezone/zic.c
-+++ glibc-2.10.90-22/timezone/zic.c
+--- glibc-2.10-343-gf450806/timezone/zic.c
++++ glibc-2.10.90-23/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- glibc.spec	21 Sep 2009 10:39:33 -0000	1.417
+++ glibc.spec	28 Sep 2009 12:31:33 -0000	1.418
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-340-gae0f0db
+%define glibcsrcdir glibc-2.10-343-gf450806
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 23
+Release: 24
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1029,6 +1029,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Sep 28 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-24
+- Update from master.
+  - Fix missing reloc dependency (#517001).
+
 * Mon Sep 21 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-23
 - Update from master.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- import.log	21 Sep 2009 10:39:33 -0000	1.33
+++ import.log	28 Sep 2009 12:31:33 -0000	1.34
@@ -31,3 +31,4 @@ glibc-2_10_90-20:HEAD:glibc-2.10.90-20.s
 glibc-2_10_90-21:HEAD:glibc-2.10.90-21.src.rpm:1252314102
 glibc-2_10_90-22:HEAD:glibc-2.10.90-22.src.rpm:1252930886
 glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881
+glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- sources	21 Sep 2009 10:39:33 -0000	1.315
+++ sources	28 Sep 2009 12:31:33 -0000	1.316
@@ -1,2 +1,2 @@
-c28c9d6bc56e7603f240324a481f761c  glibc-2.10-340-gae0f0db-fedora.tar.bz2
-ca11781e7b849d0f4a317f1e5b78f0dc  glibc-2.10-340-gae0f0db.tar.bz2
+be1259fdd4fa0ec48668085c15bcd6d0  glibc-2.10-343-gf450806-fedora.tar.bz2
+65cd71dd2818a4de21a3eba59a20c180  glibc-2.10-343-gf450806.tar.bz2



From tagoh at fedoraproject.org  Mon Sep 28 12:50:03 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 28 Sep 2009 12:50:03 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.18, 1.19 imsettings.spec, 1.42, 
	1.43 sources, 1.17, 1.18 imsettings-close-fd.patch, 1.1,
	NONE imsettings-unref-later.patch, 1.1,
	NONE imsettings-unref-notify.patch, 1.1,
	NONE imsettings-update-info.patch, 1.1, NONE
Message-ID: <20090928125003.0AD4C11C0419@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6472

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	imsettings-close-fd.patch imsettings-unref-later.patch 
	imsettings-unref-notify.patch imsettings-update-info.patch 
Log Message:
* Mon Sep 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-1
- New upstream release.
  - Update the translations.
  - Remove the unnecessary patches:
    - imsettings-unref-notify.patch
    - imsettings-unref-later.patch
    - imsettings-update-info.patch
    - imsettings-close-fd.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	1 Sep 2009 13:39:10 -0000	1.18
+++ .cvsignore	28 Sep 2009 12:50:02 -0000	1.19
@@ -17,3 +17,4 @@ imsettings-0.107.0.tar.bz2
 imsettings-0.107.1.tar.bz2
 imsettings-0.107.2.tar.bz2
 imsettings-0.107.3.tar.bz2
+imsettings-0.107.4.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- imsettings.spec	17 Sep 2009 03:20:02 -0000	1.42
+++ imsettings.spec	28 Sep 2009 12:50:02 -0000	1.43
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	0.107.3
-Release:	5%{?dist}
+Version:	0.107.4
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,10 +18,6 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
-Patch2:		imsettings-unref-notify.patch
-Patch3:		imsettings-unref-later.patch
-Patch4:		imsettings-update-info.patch
-Patch5:		imsettings-close-fd.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -90,10 +86,6 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
-%patch2 -p0 -b .2-unref
-%patch3 -p0 -b .3-zombie
-%patch4 -p0 -b .4-update-info
-%patch5 -p0 -b .5-close-fd
 
 %build
 %configure	\
@@ -219,6 +211,15 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-1
+- New upstream release.
+  - Update the translations.
+  - Remove the unnecessary patches:
+    - imsettings-unref-notify.patch
+    - imsettings-unref-later.patch
+    - imsettings-update-info.patch
+    - imsettings-close-fd.patch
+
 * Thu Sep 17 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-5
 - Fix taking too much CPU issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	1 Sep 2009 13:39:10 -0000	1.17
+++ sources	28 Sep 2009 12:50:02 -0000	1.18
@@ -1 +1 @@
-c6201e25cbd670d0784bd998e80b5684  imsettings-0.107.3.tar.bz2
+7be7991a26ffee3bc2dac48e0421ad3a  imsettings-0.107.4.tar.bz2


--- imsettings-close-fd.patch DELETED ---


--- imsettings-unref-later.patch DELETED ---


--- imsettings-unref-notify.patch DELETED ---


--- imsettings-update-info.patch DELETED ---



From akurtakov at fedoraproject.org  Mon Sep 28 12:59:26 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 28 Sep 2009 12:59:26 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse-jdt-264843.patch, NONE,
	1.1 eclipse-jdt-257716.patch, NONE, 1.1 eclipse-jdt-249930.patch,
	NONE, 1.1 eclipse-jdt-266582.patch, NONE,
	1.1 eclipse-jdt-265962.patch, NONE, 1.1 eclipse-jdt-263877.patch,
	NONE, 1.1 eclipse-jdt-265103.patch, NONE,
	1.1 eclipse-jdt-261510.patch, NONE, 1.1 eclipse.spec, 1.634, 1.635
Message-ID: <20090928125926.A874811C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9331/F-11

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-jdt-264843.patch eclipse-jdt-257716.patch 
	eclipse-jdt-249930.patch eclipse-jdt-266582.patch 
	eclipse-jdt-265962.patch eclipse-jdt-263877.patch 
	eclipse-jdt-265103.patch eclipse-jdt-261510.patch 
Log Message:
* Mon Sep 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-16
- Add post 3.4.2 jdt.core patches. Fixes #525737.

eclipse-jdt-264843.patch:
 ArrayInitializer.java |    7 +------
 Assignment.java       |    7 +------
 CaseStatement.java    |    6 +-----
 FieldDeclaration.java |    6 +-----
 LocalDeclaration.java |    6 +-----
 ReturnStatement.java  |    7 +------
 Statement.java        |   13 ++++++++++++-
 7 files changed, 18 insertions(+), 34 deletions(-)

--- NEW FILE eclipse-jdt-264843.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java,v
retrieving revision 1.64
diff -u -r1.64 LocalDeclaration.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java	27 May 2008 22:21:13 -0000	1.64
+++ compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java	17 Feb 2009 19:32:06 -0000
@@ -198,11 +198,7 @@
 								&& (this.initialization.bits & ASTNode.UnnecessaryCast) == 0) {
 							CastExpression.checkNeedForAssignedCast(scope, variableType, (CastExpression) this.initialization);
 						}	
-					} else if (scope.isBoxingCompatibleWith(initializationType, variableType) 
-										|| (initializationType.isBaseType()  // narrowing then boxing ?
-												&& scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5 // autoboxing
-												&& !variableType.isBaseType()
-												&& initialization.isConstantValueOfTypeAssignableToType(initializationType, scope.environment().computeBoxingType(variableType)))) {
+					} else if (isBoxingCompatible(initializationType, variableType, this.initialization, scope)) {
 						this.initialization.computeConversion(scope, variableType, initializationType);
 						if (this.initialization instanceof CastExpression 
 								&& (this.initialization.bits & ASTNode.UnnecessaryCast) == 0) {
Index: compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java,v
retrieving revision 1.41
diff -u -r1.41 Statement.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java	28 Mar 2006 20:29:57 -0000	1.41
+++ compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java	17 Feb 2009 19:32:06 -0000
@@ -104,7 +104,18 @@
 	}
 
 	public abstract void generateCode(BlockScope currentScope, CodeStream codeStream);
-	
+
+	protected boolean isBoxingCompatible(TypeBinding expressionType, TypeBinding targetType, Expression expression, Scope scope) {
+		if (scope.isBoxingCompatibleWith(expressionType, targetType))
+			return true;
+
+		return expressionType.isBaseType() // narrowing then boxing ?
+				&& !targetType.isBaseType()
+				&& !targetType.isTypeVariable()
+				&& scope.compilerOptions().sourceLevel >= org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants.JDK1_5 // autoboxing
+				&& expression.isConstantValueOfTypeAssignableToType(expressionType, scope.environment().computeBoxingType( targetType));
+	}
+
 	public boolean isEmptyBlock() {
 		return false;
 	}
Index: compiler/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java,v
retrieving revision 1.88
diff -u -r1.88 FieldDeclaration.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java	27 May 2008 22:21:13 -0000	1.88
+++ compiler/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java	17 Feb 2009 19:32:06 -0000
@@ -230,11 +230,7 @@
 							&& (this.initialization.bits & ASTNode.UnnecessaryCast) == 0) {
 						CastExpression.checkNeedForAssignedCast(initializationScope, fieldType, (CastExpression) this.initialization);
 					}								
-				} else if (initializationScope.isBoxingCompatibleWith(initializationType, fieldType) 
-									|| (initializationType.isBaseType()  // narrowing then boxing ?
-											&& initializationScope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5 // autoboxing
-											&& !fieldType.isBaseType()
-											&& initialization.isConstantValueOfTypeAssignableToType(initializationType, initializationScope.environment().computeBoxingType(fieldType)))) {
+				} else if (isBoxingCompatible(initializationType, fieldType, this.initialization, initializationScope)) {
 					this.initialization.computeConversion(initializationScope, fieldType, initializationType);
 					if (this.initialization instanceof CastExpression 
 							&& (this.initialization.bits & ASTNode.UnnecessaryCast) == 0) {
Index: compiler/org/eclipse/jdt/internal/compiler/ast/CaseStatement.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CaseStatement.java,v
retrieving revision 1.30
diff -u -r1.30 CaseStatement.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/CaseStatement.java	27 May 2008 22:21:13 -0000	1.30
+++ compiler/org/eclipse/jdt/internal/compiler/ast/CaseStatement.java	17 Feb 2009 19:32:06 -0000
@@ -127,11 +127,7 @@
 		} else {
 			return this.constantExpression.constant;
 		}
-	} else if (scope.isBoxingCompatibleWith(caseType, switchExpressionType)
-					|| (caseType.isBaseType()  // narrowing then boxing ?
-							&& scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5 // autoboxing
-							&& !switchExpressionType.isBaseType()
-							&& this.constantExpression.isConstantValueOfTypeAssignableToType(caseType, scope.environment().computeBoxingType(switchExpressionType)))) {
+	} else if (isBoxingCompatible(caseType, switchExpressionType, this.constantExpression, scope)) {
 		// constantExpression.computeConversion(scope, caseType, switchExpressionType); - do not report boxing/unboxing conversion
 		return this.constantExpression.constant;
 	}
Index: compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java,v
retrieving revision 1.62
diff -u -r1.62 ReturnStatement.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java	27 May 2008 22:21:13 -0000	1.62
+++ compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java	17 Feb 2009 19:32:06 -0000
@@ -11,7 +11,6 @@
 package org.eclipse.jdt.internal.compiler.ast;
 
 import org.eclipse.jdt.internal.compiler.ASTVisitor;
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.codegen.*;
 import org.eclipse.jdt.internal.compiler.flow.*;
 import org.eclipse.jdt.internal.compiler.impl.Constant;
@@ -239,11 +238,7 @@
 			CastExpression.checkNeedForAssignedCast(scope, methodType, (CastExpression) this.expression);
 		}			
 		return;
-	} else if (scope.isBoxingCompatibleWith(expressionType, methodType)
-						|| (expressionType.isBaseType()  // narrowing then boxing ?
-								&& scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5 // autoboxing
-								&& !methodType.isBaseType()
-								&& this.expression.isConstantValueOfTypeAssignableToType(expressionType, scope.environment().computeBoxingType(methodType)))) {
+	} else if (isBoxingCompatible(expressionType, methodType, this.expression, scope)) {
 		this.expression.computeConversion(scope, methodType, expressionType);
 		if (this.expression instanceof CastExpression 
 				&& (this.expression.bits & (ASTNode.UnnecessaryCast|ASTNode.DisableUnnecessaryCastCheck)) == 0) {
Index: compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java,v
retrieving revision 1.82
diff -u -r1.82 Assignment.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java	27 May 2008 22:21:13 -0000	1.82
+++ compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java	17 Feb 2009 19:32:06 -0000
@@ -12,7 +12,6 @@
 package org.eclipse.jdt.internal.compiler.ast;
 
 import org.eclipse.jdt.internal.compiler.ASTVisitor;
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.codegen.*;
 import org.eclipse.jdt.internal.compiler.flow.*;
 import org.eclipse.jdt.internal.compiler.impl.Constant;
@@ -214,11 +213,7 @@
 			CastExpression.checkNeedForAssignedCast(scope, lhsType, (CastExpression) this.expression);
 		}			
 		return this.resolvedType;
-	} else if (scope.isBoxingCompatibleWith(rhsType, lhsType) 
-						|| (rhsType.isBaseType()  // narrowing then boxing ?
-								&& scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5 // autoboxing
-								&& !lhsType.isBaseType()
-								&& this.expression.isConstantValueOfTypeAssignableToType(rhsType, scope.environment().computeBoxingType(lhsType)))) {
+	} else if (isBoxingCompatible(rhsType, lhsType, this.expression, scope)) {
 		this.expression.computeConversion(scope, lhsType, rhsType);
 		if (this.expression instanceof CastExpression 
 				&& (this.expression.bits & ASTNode.UnnecessaryCast) == 0) {
Index: compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java,v
retrieving revision 1.50
diff -u -r1.50 ArrayInitializer.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java	27 May 2008 22:21:13 -0000	1.50
+++ compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java	17 Feb 2009 19:32:06 -0000
@@ -11,7 +11,6 @@
 package org.eclipse.jdt.internal.compiler.ast;
 
 import org.eclipse.jdt.internal.compiler.ASTVisitor;
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.codegen.*;
 import org.eclipse.jdt.internal.compiler.flow.*;
 import org.eclipse.jdt.internal.compiler.impl.Constant;
@@ -169,11 +168,7 @@
 						|| (elementType.isBaseType() && BaseTypeBinding.isWidening(elementType.id, expressionType.id)))
 						|| expressionType.isCompatibleWith(elementType)) {
 					expression.computeConversion(scope, elementType, expressionType);
-				} else if (scope.isBoxingCompatibleWith(expressionType, elementType) 
-									|| (expressionType.isBaseType()  // narrowing then boxing ?
-											&& scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5 // autoboxing
-											&& !elementType.isBaseType()
-											&& expression.isConstantValueOfTypeAssignableToType(expressionType, scope.environment().computeBoxingType(elementType)))) {
+				} else if (isBoxingCompatible(expressionType, elementType, expression, scope)) {
 					expression.computeConversion(scope, elementType, expressionType);
 				} else {
 					scope.problemReporter().typeMismatchError(expressionType, elementType, expression, null);


eclipse-jdt-257716.patch:
 compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java                        |    1 
 compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java        |    1 
 compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java                |   12 +
 compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java             |    1 
 compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java        |   23 ++-
 compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java           |    6 
 compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java                  |    2 
 compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java               |   13 --
 compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java |    5 
 compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java                  |   61 ++++++----
 compiler/org/eclipse/jdt/internal/compiler/flow/InitializationFlowContext.java    |    8 -
 eval/org/eclipse/jdt/internal/eval/CodeSnippetSingleNameReference.java            |    3 
 12 files changed, 85 insertions(+), 51 deletions(-)

--- NEW FILE eclipse-jdt-257716.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java,v
retrieving revision 1.57
diff -u -r1.57 FlowContext.java
--- compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java	2 Apr 2007 11:05:51 -0000	1.57
+++ compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java	29 Jan 2009 17:06:52 -0000
@@ -18,6 +18,7 @@
 import org.eclipse.jdt.internal.compiler.ast.Reference;
 import org.eclipse.jdt.internal.compiler.ast.SubRoutineStatement;
 import org.eclipse.jdt.internal.compiler.ast.TryStatement;
+import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
 import org.eclipse.jdt.internal.compiler.codegen.BranchLabel;
 import org.eclipse.jdt.internal.compiler.lookup.Binding;
 import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
@@ -44,6 +45,25 @@
 		
 boolean deferNullDiagnostic, preemptNullDiagnostic;
 
+public static final int 
+  CAN_ONLY_NULL_NON_NULL = 0x0000, 
+  	// check against null and non null, with definite values -- comparisons
+  CAN_ONLY_NULL = 0x0001,
+  	// check against null, with definite values -- comparisons
+  CAN_ONLY_NON_NULL = 0x0002,
+	// check against non null, with definite values -- comparisons
+  MAY_NULL = 0x0003,
+	// check against null, with potential values -- NPE guard
+  CHECK_MASK = 0x00FF,
+  IN_COMPARISON_NULL = 0x0100,
+  IN_COMPARISON_NON_NULL = 0x0200,
+    // check happened in a comparison
+  IN_ASSIGNMENT = 0x0300,
+    // check happened in an assignment
+  IN_INSTANCEOF = 0x0400,
+    // check happened in an instanceof expression
+  CONTEXT_MASK = ~CHECK_MASK;
+
 public FlowContext(FlowContext parent, ASTNode associatedNode) {
 	this.parent = parent;
 	this.associatedNode = associatedNode;
@@ -287,6 +307,28 @@
 	return null;
 }
 
+public FlowInfo getInitsForFinalBlankInitializationCheck(TypeBinding declaringType, FlowInfo flowInfo) {
+	FlowContext current = this;
+	FlowInfo inits = flowInfo;
+	do {
+		if (current instanceof InitializationFlowContext) {
+			InitializationFlowContext initializationContext = (InitializationFlowContext) current;
+			if (((TypeDeclaration)initializationContext.associatedNode).binding == declaringType) {
+				return inits;
+			}
+			inits = initializationContext.initsBeforeContext;
+			current = initializationContext.initializationParent;
+		} else if (current instanceof ExceptionHandlingFlowContext) {
+			ExceptionHandlingFlowContext exceptionContext = (ExceptionHandlingFlowContext) current;
+			current = exceptionContext.initializationParent == null ? exceptionContext.parent : exceptionContext.initializationParent;
+		} else {
+			current = current.parent;
+		}
+	} while (current != null);
+	// not found
+	return null;
+}
+
 /*
  * lookup through break labels
  */
@@ -468,25 +510,6 @@
 	}
 }
 
-public static final int 
-  CAN_ONLY_NULL_NON_NULL = 0x0000, 
-  	// check against null and non null, with definite values -- comparisons
-  CAN_ONLY_NULL = 0x0001,
-  	// check against null, with definite values -- comparisons
-  CAN_ONLY_NON_NULL = 0x0002,
-	// check against non null, with definite values -- comparisons
-  MAY_NULL = 0x0003,
-	// check against null, with potential values -- NPE guard
-  CHECK_MASK = 0x00FF,
-  IN_COMPARISON_NULL = 0x0100,
-  IN_COMPARISON_NON_NULL = 0x0200,
-    // check happened in a comparison
-  IN_ASSIGNMENT = 0x0300,
-    // check happened in an assignment
-  IN_INSTANCEOF = 0x0400,
-    // check happened in an instanceof expression
-  CONTEXT_MASK = ~CHECK_MASK;
-
 /**
  * Record a null reference for use by deferred checks. Only looping or 
  * finally contexts really record that information. The context may
Index: compiler/org/eclipse/jdt/internal/compiler/flow/InitializationFlowContext.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/InitializationFlowContext.java,v
retrieving revision 1.16
diff -u -r1.16 InitializationFlowContext.java
--- compiler/org/eclipse/jdt/internal/compiler/flow/InitializationFlowContext.java	28 Mar 2006 20:32:37 -0000	1.16
+++ compiler/org/eclipse/jdt/internal/compiler/flow/InitializationFlowContext.java	29 Jan 2009 17:06:52 -0000
@@ -26,17 +26,17 @@
 	public TypeBinding[] thrownExceptions = new TypeBinding[5];
 	public ASTNode[] exceptionThrowers = new ASTNode[5];
 	public FlowInfo[] exceptionThrowerFlowInfos = new FlowInfo[5];
+	public FlowInfo	initsBeforeContext;
 	
-	public InitializationFlowContext(
-		FlowContext parent,
-		ASTNode associatedNode,
-		BlockScope scope) {
+	public InitializationFlowContext(FlowContext parent, ASTNode associatedNode, FlowInfo initsBeforeContext, FlowContext initializationParent, BlockScope scope) {
 		super(
 			parent,
 			associatedNode,
 			Binding.NO_EXCEPTIONS, // no exception allowed by default
+			initializationParent,
 			scope, 
 			FlowInfo.DEAD_END);
+		this.initsBeforeContext = initsBeforeContext;
 	}
 
 	public void checkInitializerExceptions(
Index: compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java,v
retrieving revision 1.42
diff -u -r1.42 ExceptionHandlingFlowContext.java
--- compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java	5 Mar 2008 07:57:20 -0000	1.42
+++ compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java	29 Jan 2009 17:06:52 -0000
@@ -41,7 +41,8 @@
 	boolean isMethodContext;
 
 	public UnconditionalFlowInfo initsOnReturn;
-
+	public FlowContext initializationParent; // special parent relationship only for initialization purpose
+	
 	// for dealing with anonymous constructor thrown exceptions
 	public ArrayList extendedExceptions;
 	
@@ -49,6 +50,7 @@
 		FlowContext parent,
 		ASTNode associatedNode,
 		ReferenceBinding[] handledExceptions,
+		FlowContext initializationParent,
 		BlockScope scope,
 		UnconditionalFlowInfo flowInfo) {
 
@@ -79,6 +81,7 @@
 		System.arraycopy(this.isReached, 0, this.isNeeded, 0, cacheSize);
 	}
 	this.initsOnReturn = FlowInfo.DEAD_END;	
+	this.	initializationParent = initializationParent;	
 }
 
 public void complainIfUnusedExceptionHandlers(AbstractMethodDeclaration method) {
Index: compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java,v
retrieving revision 1.148
diff -u -r1.148 TypeDeclaration.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	27 May 2008 22:21:13 -0000	1.148
+++ compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	29 Jan 2009 17:06:52 -0000
@@ -594,8 +594,8 @@
 			this.scope.problemReporter().unusedPrivateType(this);
 		}
 	}
-	InitializationFlowContext initializerContext = new InitializationFlowContext(null, this, this.initializerScope);
-	InitializationFlowContext staticInitializerContext = new InitializationFlowContext(null, this, this.staticInitializerScope);
+	InitializationFlowContext initializerContext = new InitializationFlowContext(null, this, flowInfo, flowContext, this.initializerScope);
+	InitializationFlowContext staticInitializerContext = new InitializationFlowContext(null, this, flowInfo, flowContext, this.staticInitializerScope);
 	FlowInfo nonStaticFieldInfo = flowInfo.unconditionalFieldLessCopy();
 	FlowInfo staticFieldInfo = flowInfo.unconditionalFieldLessCopy();
 	if (this.fields != null) {
@@ -610,11 +610,7 @@
 				} else {*/
 				staticInitializerContext.handledExceptions = Binding.ANY_EXCEPTION; // tolerate them all, and record them
 				/*}*/
-				staticFieldInfo =
-					field.analyseCode(
-						this.staticInitializerScope,
-						staticInitializerContext,
-						staticFieldInfo);
+				staticFieldInfo = field.analyseCode(this.staticInitializerScope, staticInitializerContext, staticFieldInfo);
 				// in case the initializer is not reachable, use a reinitialized flowInfo and enter a fake reachable
 				// branch, since the previous initializer already got the blame.
 				if (staticFieldInfo == FlowInfo.DEAD_END) {
@@ -630,8 +626,7 @@
 				} else {*/
 					initializerContext.handledExceptions = Binding.ANY_EXCEPTION; // tolerate them all, and record them
 				/*}*/
-				nonStaticFieldInfo =
-					field.analyseCode(this.initializerScope, initializerContext, nonStaticFieldInfo);
+				nonStaticFieldInfo = field.analyseCode(this.initializerScope, initializerContext, nonStaticFieldInfo);
 				// in case the initializer is not reachable, use a reinitialized flowInfo and enter a fake reachable
 				// branch, since the previous initializer already got the blame.
 				if (nonStaticFieldInfo == FlowInfo.DEAD_END) {
Index: compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java,v
retrieving revision 1.51.2.1
diff -u -r1.51.2.1 Clinit.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java	1 Jul 2008 11:24:16 -0000	1.51.2.1
+++ compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java	29 Jan 2009 17:06:49 -0000
@@ -53,6 +53,7 @@
 					staticInitializerFlowContext.parent,
 					this,
 					Binding.NO_EXCEPTIONS,
+					staticInitializerFlowContext,
 					scope,
 					FlowInfo.DEAD_END);
 
Index: compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java,v
retrieving revision 1.108
diff -u -r1.108 TryStatement.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java	31 Aug 2007 19:41:31 -0000	1.108
+++ compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java	29 Jan 2009 17:06:51 -0000
@@ -87,6 +87,7 @@
 				flowContext,
 				this,
 				this.caughtExceptionTypes,
+				null,
 				this.scope,
 				flowInfo.unconditionalInits());
 		handlingContext.initsOnFinally =
@@ -198,6 +199,7 @@
 				insideSubContext,
 				this,
 				this.caughtExceptionTypes,
+				null,
 				this.scope,
 				flowInfo.unconditionalInits());
 		handlingContext.initsOnFinally =
Index: compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java,v
retrieving revision 1.92.2.2
diff -u -r1.92.2.2 ConstructorDeclaration.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java	8 Jul 2008 13:22:06 -0000	1.92.2.2
+++ compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java	29 Jan 2009 17:06:50 -0000
@@ -77,6 +77,7 @@
 				initializerFlowContext.parent,
 				this,
 				this.binding.thrownExceptions,
+				initializerFlowContext,
 				this.scope,
 				FlowInfo.DEAD_END);
 		initializerFlowContext.checkInitializerExceptions(
Index: compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java,v
retrieving revision 1.103.2.3
diff -u -r1.103.2.3 SingleNameReference.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java	27 Nov 2008 10:13:10 -0000	1.103.2.3
+++ compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java	29 Jan 2009 17:06:51 -0000
@@ -62,7 +62,8 @@
 				FieldBinding fieldBinding;
 				if ((fieldBinding = (FieldBinding) this.binding).isBlankFinal() 
 						&& currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)) {
-					if (!flowInfo.isDefinitelyAssigned(fieldBinding)) {
+					FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(fieldBinding.declaringClass.original(), flowInfo);
+					if (!fieldInits.isDefinitelyAssigned(fieldBinding)) {
 						currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this);
 					}
 				}
@@ -148,7 +149,8 @@
 			// check if reading a final blank field
 			FieldBinding fieldBinding = (FieldBinding) this.binding;
 			if (fieldBinding.isBlankFinal() && currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)) {
-				if (!flowInfo.isDefinitelyAssigned(fieldBinding)) {
+				FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(fieldBinding.declaringClass.original(), flowInfo);
+				if (!fieldInits.isDefinitelyAssigned(fieldBinding)) {
 					currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this);
 				}
 			}
Index: compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java,v
retrieving revision 1.116.2.2
diff -u -r1.116.2.2 FieldReference.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java	2 Oct 2008 15:29:33 -0000	1.116.2.2
+++ compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java	29 Jan 2009 17:06:50 -0000
@@ -57,15 +57,17 @@
 
 }
 
-public FlowInfo analyseAssignment(BlockScope currentScope, 	FlowContext flowContext, 	FlowInfo flowInfo, Assignment assignment, boolean isCompound) {
+public FlowInfo analyseAssignment(BlockScope currentScope, FlowContext flowContext, FlowInfo flowInfo, Assignment assignment, boolean isCompound) {
 	// compound assignment extra work
 	if (isCompound) { // check the variable part is initialized if blank final
 		if (this.binding.isBlankFinal()
 			&& this.receiver.isThis()
-			&& currentScope.needBlankFinalFieldInitializationCheck(this.binding)
-			&& (!flowInfo.isDefinitelyAssigned(this.binding))) {
-			currentScope.problemReporter().uninitializedBlankFinalField(this.binding, this);
-			// we could improve error msg here telling "cannot use compound assignment on final blank field"
+			&& currentScope.needBlankFinalFieldInitializationCheck(this.binding)) {
+			FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(this.binding.declaringClass.original(), flowInfo);
+			if (!fieldInits.isDefinitelyAssigned(this.binding)) {
+				currentScope.problemReporter().uninitializedBlankFinalField(this.binding, this);
+				// we could improve error msg here telling "cannot use compound assignment on final blank field"
+			}
 		}
 		manageSyntheticAccessIfNecessary(currentScope, flowInfo, true /*read-access*/);
 	}
Index: compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java,v
retrieving revision 1.125.2.3
diff -u -r1.125.2.3 QualifiedNameReference.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java	27 Nov 2008 10:13:10 -0000	1.125.2.3
+++ compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java	29 Jan 2009 17:06:50 -0000
@@ -74,10 +74,9 @@
 			if (lastFieldBinding.isBlankFinal()
 				    && this.otherBindings != null // the last field binding is only assigned
 	 				&& currentScope.needBlankFinalFieldInitializationCheck(lastFieldBinding)) {
-				if (!flowInfo.isDefinitelyAssigned(lastFieldBinding)) {
-					currentScope.problemReporter().uninitializedBlankFinalField(
-						lastFieldBinding,
-						this);
+				FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(lastFieldBinding.declaringClass.original(), flowInfo);
+				if (!fieldInits.isDefinitelyAssigned(lastFieldBinding)) {
+					currentScope.problemReporter().uninitializedBlankFinalField(lastFieldBinding, this);
 				}
 			}
 			break;
@@ -122,9 +121,11 @@
 	if (isCompound) {
 		if (otherBindingsCount == 0
 				&& lastFieldBinding.isBlankFinal()
-				&& currentScope.needBlankFinalFieldInitializationCheck(lastFieldBinding)
-				&& (!flowInfo.isDefinitelyAssigned(lastFieldBinding))) {
-			currentScope.problemReporter().uninitializedBlankFinalField(lastFieldBinding, this);
+				&& currentScope.needBlankFinalFieldInitializationCheck(lastFieldBinding)) {
+			FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(lastFieldBinding.declaringClass.original(), flowInfo);
+			if (!fieldInits.isDefinitelyAssigned(lastFieldBinding)) {
+				currentScope.problemReporter().uninitializedBlankFinalField(lastFieldBinding, this);
+			}
 		}
 		TypeBinding lastReceiverType;
 		switch (otherBindingsCount) {
@@ -212,9 +213,11 @@
 				FieldBinding fieldBinding = (FieldBinding) this.binding;
 				// check if reading a final blank field
 				if (fieldBinding.isBlankFinal()
-						&& currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)
-						&& !flowInfo.isDefinitelyAssigned(fieldBinding)) {
-					currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this);
+						&& currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)) {
+					FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(fieldBinding.declaringClass.original(), flowInfo);
+					if (!fieldInits.isDefinitelyAssigned(fieldBinding)) {
+						currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this);
+					}
 				}
 			}
 			break;
Index: compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java,v
retrieving revision 1.65
diff -u -r1.65 MethodDeclaration.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java	27 May 2008 22:21:13 -0000	1.65
+++ compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java	29 Jan 2009 17:06:50 -0000
@@ -72,6 +72,7 @@
 					initializationContext,
 					this,
 					this.binding.thrownExceptions,
+					null,
 					this.scope,
 					FlowInfo.DEAD_END);
 
Index: eval/org/eclipse/jdt/internal/eval/CodeSnippetSingleNameReference.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSingleNameReference.java,v
retrieving revision 1.52
diff -u -r1.52 CodeSnippetSingleNameReference.java
--- eval/org/eclipse/jdt/internal/eval/CodeSnippetSingleNameReference.java	27 May 2008 22:27:12 -0000	1.52
+++ eval/org/eclipse/jdt/internal/eval/CodeSnippetSingleNameReference.java	29 Jan 2009 17:06:52 -0000
@@ -45,7 +45,8 @@
 			FieldBinding fieldBinding;
 			if ((fieldBinding = (FieldBinding) this.binding).isBlankFinal() 
 					&& currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)) {
-				if (!flowInfo.isDefinitelyAssigned(fieldBinding)) {
+				FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(fieldBinding.declaringClass.original(), flowInfo);
+				if (!fieldInits.isDefinitelyAssigned(fieldBinding)) {
 					currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this);
 				}
 			}


eclipse-jdt-249930.patch:
 JavaModelManager.java      |   44 +++++++++++---------------------------------
 SetClasspathOperation.java |   18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 33 deletions(-)

--- NEW FILE eclipse-jdt-249930.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/internal/core/SetClasspathOperation.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java,v
retrieving revision 1.153
diff -u -r1.153 SetClasspathOperation.java
--- model/org/eclipse/jdt/internal/core/SetClasspathOperation.java	27 May 2008 23:40:18 -0000	1.153
+++ model/org/eclipse/jdt/internal/core/SetClasspathOperation.java	6 Feb 2009 11:35:03 -0000
@@ -10,7 +10,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
+import org.eclipse.core.resources.IResourceRuleFactory;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.MultiRule;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaModelStatus;
@@ -64,6 +68,20 @@
 			done();
 		}
 	}
+	
+	protected ISchedulingRule getSchedulingRule() {
+		if (this.canChangeResources) {
+			IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
+			return new MultiRule(new ISchedulingRule[] {
+				// use project modification rule as this is needed to create the .classpath file if it doesn't exist yet, or to update project references
+				ruleFactory.modifyRule(this.project.getProject()),
+				
+				// and external project modification rule in case the external folders are modified
+				ruleFactory.modifyRule(JavaModelManager.getExternalManager().getExternalFoldersProject())
+			});
+		}
+		return super.getSchedulingRule();
+	}
 
 	public String toString(){
 		StringBuffer buffer = new StringBuffer(20);
Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
retrieving revision 1.397.2.4
diff -u -r1.397.2.4 JavaModelManager.java
--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	8 Dec 2008 14:41:23 -0000	1.397.2.4
+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	6 Feb 2009 11:35:03 -0000
@@ -1188,41 +1188,19 @@
 			return buffer.toString();
 		}
 		
-		public boolean writeAndCacheClasspath(final JavaProject javaProject, final IClasspathEntry[] newRawClasspath, final IPath newOutputLocation) throws JavaModelException {
-			final boolean[] result = new boolean[1];
+		public boolean writeAndCacheClasspath(JavaProject javaProject, final IClasspathEntry[] newRawClasspath, final IPath newOutputLocation) throws JavaModelException {
 			try {
-				// use a workspace runnable so that the notification of .classpath file change is done outside the synchronized block (to avoid deadlocks)
-				IWorkspace workspace = 	ResourcesPlugin.getWorkspace();
-				workspace.run(new IWorkspaceRunnable() {
-					public void run(IProgressMonitor monitor) throws CoreException {
-						// ensure that the writing of the .classpath file and the caching in memory are synchronized (see also readAnCacheClasspath which is synchronized)
-						try {
-							PerProjectInfo.this.writtingRawClasspath = true;
-							synchronized (PerProjectInfo.this) {
-								if (!javaProject.writeFileEntries(newRawClasspath, newOutputLocation)) {
-									result[0] = false;
-									return;
-								}
-								// store new raw classpath, new output and new status, and null out resolved info
-								setClasspath(newRawClasspath, newOutputLocation, JavaModelStatus.VERIFIED_OK, null, null, null, null);
-								result[0] = true;
-							}
-						} finally {
-							PerProjectInfo.this.writtingRawClasspath = false;
-						}
-					}
-				}, 
-				workspace.getRuleFactory().modifyRule(this.project), // use project modification rule as this is needed to create the .classpath file if it doesn't exist yet
-				IWorkspace.AVOID_UPDATE,
-				null);
-			} catch (JavaModelException e) {
-			    // rethrow exception (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=245576 )
-				throw e;
-			} catch (CoreException e) {
-			    // rethrow exception (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=245576 )
-				throw new JavaModelException(e);
+				this.writtingRawClasspath = true;
+				// write .classpath
+				if (!javaProject.writeFileEntries(newRawClasspath, newOutputLocation)) {
+					return false;
+				}
+				// store new raw classpath, new output and new status, and null out resolved info
+				setClasspath(newRawClasspath, newOutputLocation, JavaModelStatus.VERIFIED_OK, null, null, null, null);
+			} finally {
+				this.writtingRawClasspath = false;
 			}
-			return result[0];
+			return true;
 		}
 	}
 	

eclipse-jdt-266582.patch:
 compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java |   21 -
 compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java          |    8 
 compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java |  201 ++++++----
 eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java              |    3 
 model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java   |    3 
 5 files changed, 159 insertions(+), 77 deletions(-)

--- NEW FILE eclipse-jdt-266582.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java,v
retrieving revision 1.111.2.2
diff -u -r1.111.2.2 BinaryTypeBinding.java
--- compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java	23 Oct 2008 07:14:42 -0000	1.111.2.2
+++ compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java	3 Mar 2009 16:39:27 -0000
@@ -243,91 +243,101 @@
 	return availableMethods;
 }
 void cachePartsFrom(IBinaryType binaryType, boolean needFieldsAndMethods) {
-	// default initialization for super-interfaces early, in case some aborting compilation error occurs,
-	// and still want to use binaries passed that point (e.g. type hierarchy resolver, see bug 63748).
-	this.typeVariables = Binding.NO_TYPE_VARIABLES;
-	this.superInterfaces = Binding.NO_SUPERINTERFACES;
-
-	// must retrieve member types in case superclass/interfaces need them
-	this.memberTypes = Binding.NO_MEMBER_TYPES;
-	IBinaryNestedType[] memberTypeStructures = binaryType.getMemberTypes();
-	if (memberTypeStructures != null) {
-		int size = memberTypeStructures.length;
-		if (size > 0) {
-			this.memberTypes = new ReferenceBinding[size];
-			for (int i = 0; i < size; i++)
-				// attempt to find each member type if it exists in the cache (otherwise - resolve it when requested)
-				this.memberTypes[i] = environment.getTypeFromConstantPoolName(memberTypeStructures[i].getName(), 0, -1, false, null /* could not be missing */);
-			this.tagBits |= 	TagBits.HasUnresolvedMemberTypes;
-		}
-	}
-
-	
-	long sourceLevel = environment.globalOptions.sourceLevel;
-	char[] typeSignature = null;
-	if (sourceLevel >= ClassFileConstants.JDK1_5) {
-		typeSignature = binaryType.getGenericSignature();
-		this.tagBits |= binaryType.getTagBits();
-	}
-	char[][][] missingTypeNames = binaryType.getMissingTypeNames();	
-	if (typeSignature == null) {
-		char[] superclassName = binaryType.getSuperclassName();
-		if (superclassName != null) {
-			// attempt to find the superclass if it exists in the cache (otherwise - resolve it when requested)
-			this.superclass = environment.getTypeFromConstantPoolName(superclassName, 0, -1, false, missingTypeNames);
-			this.tagBits |= TagBits.HasUnresolvedSuperclass;
-		}
-
+	try {
+		// default initialization for super-interfaces early, in case some aborting compilation error occurs,
+		// and still want to use binaries passed that point (e.g. type hierarchy resolver, see bug 63748).
+		this.typeVariables = Binding.NO_TYPE_VARIABLES;
 		this.superInterfaces = Binding.NO_SUPERINTERFACES;
-		char[][] interfaceNames = binaryType.getInterfaceNames();
-		if (interfaceNames != null) {
-			int size = interfaceNames.length;
+
+		// must retrieve member types in case superclass/interfaces need them
+		this.memberTypes = Binding.NO_MEMBER_TYPES;
+		IBinaryNestedType[] memberTypeStructures = binaryType.getMemberTypes();
+		if (memberTypeStructures != null) {
+			int size = memberTypeStructures.length;
 			if (size > 0) {
-				this.superInterfaces = new ReferenceBinding[size];
+				this.memberTypes = new ReferenceBinding[size];
 				for (int i = 0; i < size; i++)
-					// attempt to find each superinterface if it exists in the cache (otherwise - resolve it when requested)
-					this.superInterfaces[i] = environment.getTypeFromConstantPoolName(interfaceNames[i], 0, -1, false, missingTypeNames);
-				this.tagBits |= TagBits.HasUnresolvedSuperinterfaces;
+					// attempt to find each member type if it exists in the cache (otherwise - resolve it when requested)
+					this.memberTypes[i] = environment.getTypeFromConstantPoolName(memberTypeStructures[i].getName(), 0, -1, false, null /* could not be missing */);
+				this.tagBits |= 	TagBits.HasUnresolvedMemberTypes;
 			}
 		}
-	} else {
-		// ClassSignature = ParameterPart(optional) super_TypeSignature interface_signature
-		SignatureWrapper wrapper = new SignatureWrapper(typeSignature);
-		if (wrapper.signature[wrapper.start] == '<') {
-			// ParameterPart = '<' ParameterSignature(s) '>'
-			wrapper.start++; // skip '<'
-			this.typeVariables = createTypeVariables(wrapper, true, missingTypeNames);
-			wrapper.start++; // skip '>'
-			this.tagBits |=  TagBits.HasUnresolvedTypeVariables;
-			this.modifiers |= ExtraCompilerModifiers.AccGenericSignature;
-		}
 
-		// attempt to find the superclass if it exists in the cache (otherwise - resolve it when requested)
-		this.superclass = (ReferenceBinding) environment.getTypeFromTypeSignature(wrapper, Binding.NO_TYPE_VARIABLES, this, missingTypeNames);
-		this.tagBits |= TagBits.HasUnresolvedSuperclass;
+		long sourceLevel = environment.globalOptions.sourceLevel;
+		char[] typeSignature = null;
+		if (sourceLevel >= ClassFileConstants.JDK1_5) {
+			typeSignature = binaryType.getGenericSignature();
+			this.tagBits |= binaryType.getTagBits();
+		}
+		char[][][] missingTypeNames = binaryType.getMissingTypeNames();	
+		if (typeSignature == null) {
+			char[] superclassName = binaryType.getSuperclassName();
+			if (superclassName != null) {
+				// attempt to find the superclass if it exists in the cache (otherwise - resolve it when requested)
+				this.superclass = environment.getTypeFromConstantPoolName(superclassName, 0, -1, false, missingTypeNames);
+				this.tagBits |= TagBits.HasUnresolvedSuperclass;
+			}
+
+			this.superInterfaces = Binding.NO_SUPERINTERFACES;
+			char[][] interfaceNames = binaryType.getInterfaceNames();
+			if (interfaceNames != null) {
+				int size = interfaceNames.length;
+				if (size > 0) {
+					this.superInterfaces = new ReferenceBinding[size];
+					for (int i = 0; i < size; i++)
+						// attempt to find each superinterface if it exists in the cache (otherwise - resolve it when requested)
+						this.superInterfaces[i] = environment.getTypeFromConstantPoolName(interfaceNames[i], 0, -1, false, missingTypeNames);
+					this.tagBits |= TagBits.HasUnresolvedSuperinterfaces;
+				}
+			}
+		} else {
+			// ClassSignature = ParameterPart(optional) super_TypeSignature interface_signature
+			SignatureWrapper wrapper = new SignatureWrapper(typeSignature);
+			if (wrapper.signature[wrapper.start] == '<') {
+				// ParameterPart = '<' ParameterSignature(s) '>'
+				wrapper.start++; // skip '<'
+				this.typeVariables = createTypeVariables(wrapper, true, missingTypeNames);
+				wrapper.start++; // skip '>'
+				this.tagBits |=  TagBits.HasUnresolvedTypeVariables;
+				this.modifiers |= ExtraCompilerModifiers.AccGenericSignature;
+			}
+			TypeVariableBinding[] typeVars = Binding.NO_TYPE_VARIABLES;
+			char[] methodDescriptor = binaryType.getEnclosingMethod();
+			if (methodDescriptor != null) {
+				MethodBinding enclosingMethod = findMethod(methodDescriptor, missingTypeNames);
+				typeVars = enclosingMethod.typeVariables;
+			}
 
-		this.superInterfaces = Binding.NO_SUPERINTERFACES;
-		if (!wrapper.atEnd()) {
-			// attempt to find each superinterface if it exists in the cache (otherwise - resolve it when requested)
-			java.util.ArrayList types = new java.util.ArrayList(2);
-			do {
-				types.add(environment.getTypeFromTypeSignature(wrapper, Binding.NO_TYPE_VARIABLES, this, missingTypeNames));
-			} while (!wrapper.atEnd());
-			this.superInterfaces = new ReferenceBinding[types.size()];
-			types.toArray(this.superInterfaces);
-			this.tagBits |= TagBits.HasUnresolvedSuperinterfaces;
+			// attempt to find the superclass if it exists in the cache (otherwise - resolve it when requested)
+			this.superclass = (ReferenceBinding) environment.getTypeFromTypeSignature(wrapper, typeVars, this, missingTypeNames);
+			this.tagBits |= TagBits.HasUnresolvedSuperclass;
+
+			this.superInterfaces = Binding.NO_SUPERINTERFACES;
+			if (!wrapper.atEnd()) {
+				// attempt to find each superinterface if it exists in the cache (otherwise - resolve it when requested)
+				java.util.ArrayList types = new java.util.ArrayList(2);
+				do {
+					types.add(environment.getTypeFromTypeSignature(wrapper, typeVars, this, missingTypeNames));
+				} while (!wrapper.atEnd());
+				this.superInterfaces = new ReferenceBinding[types.size()];
+				types.toArray(this.superInterfaces);
+				this.tagBits |= TagBits.HasUnresolvedSuperinterfaces;
+			}
 		}
-	}
 
-	if (needFieldsAndMethods) {
-		createFields(binaryType.getFields(), sourceLevel, missingTypeNames);
-		createMethods(binaryType.getMethods(), sourceLevel, missingTypeNames);
-	} else { // protect against incorrect use of the needFieldsAndMethods flag, see 48459
-		this.fields = Binding.NO_FIELDS;
-		this.methods = Binding.NO_METHODS;
-	}
-	if (this.environment.globalOptions.storeAnnotations)
-		setAnnotations(createAnnotations(binaryType.getAnnotations(), this.environment, missingTypeNames));	
+		if (needFieldsAndMethods) {
+			createFields(binaryType.getFields(), sourceLevel, missingTypeNames);
+			createMethods(binaryType.getMethods(), sourceLevel, missingTypeNames);
+		}
+		if (this.environment.globalOptions.storeAnnotations)
+			setAnnotations(createAnnotations(binaryType.getAnnotations(), this.environment, missingTypeNames));	
+	} finally {
+		// protect against incorrect use of the needFieldsAndMethods flag, see 48459
+		if (this.fields == null)
+			this.fields = Binding.NO_FIELDS;
+		if (this.methods == null)
+			this.methods = Binding.NO_METHODS;
+ 	}
 }
 private void createFields(IBinaryField[] iFields, long sourceLevel, char[][][] missingTypeNames) {
 	this.fields = Binding.NO_FIELDS;
@@ -647,6 +657,45 @@
 	this.tagBits |= TagBits.AreFieldsComplete;
 	return fields;
 }
+private MethodBinding findMethod(char[] methodDescriptor, char[][][] missingTypeNames) {
+	int index = -1;
+	while (methodDescriptor[++index] != '(') {
+		// empty
+	}
+	char[] selector = new char[index];
+	System.arraycopy(methodDescriptor, 0, selector, 0, index);
+	TypeBinding[] parameters = Binding.NO_PARAMETERS;
+	int numOfParams = 0;
+	char nextChar;
+	while ((nextChar = methodDescriptor[++index]) != ')') {
+		if (nextChar != '[') {
+			numOfParams++;
+			if (nextChar == 'L')
+				while ((nextChar = methodDescriptor[++index]) != ';'){/*empty*/}
+		}
+	}
+
+	int startIndex = 0;
+	if (numOfParams > 0) {
+		parameters = new TypeBinding[numOfParams];
+		index = 1;
+		int end = 0;   // first character is always '(' so skip it
+		for (int i = 0; i < numOfParams; i++) {
+			while ((nextChar = methodDescriptor[++end]) == '['){/*empty*/}
+			if (nextChar == 'L')
+				while ((nextChar = methodDescriptor[++end]) != ';'){/*empty*/}
+
+			if (i >= startIndex) {   // skip the synthetic arg if necessary
+				parameters[i - startIndex] = this.environment.getTypeFromSignature(methodDescriptor, index, end, false, this, missingTypeNames);
+			}
+			index = end + 1;
+		}
+	}
+
+	return CharOperation.equals(selector, TypeConstants.INIT)
+		? this.enclosingType.getExactConstructor(parameters)
+		: this.enclosingType.getExactMethod(selector, parameters, null);
+}
 /**
  * @see org.eclipse.jdt.internal.compiler.lookup.TypeBinding#genericTypeSignature()
  */
Index: model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java,v
retrieving revision 1.37
diff -u -r1.37 HierarchyBinaryType.java
--- model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java	27 May 2008 23:40:22 -0000	1.37
+++ model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java	3 Mar 2009 16:39:27 -0000
@@ -51,6 +51,9 @@
 public IBinaryAnnotation[] getAnnotations() {
 	return null;
 }
+public char[] getEnclosingMethod() {
+	return null;
+}
 /**
  * Answer the resolved name of the enclosing type in the
  * class file format as specified in section 4.2 of the Java 2 VM spec
Index: eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java,v
retrieving revision 1.41
diff -u -r1.41 CodeSnippetSkeleton.java
--- eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java	27 May 2008 22:27:12 -0000	1.41
+++ eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java	3 Mar 2009 16:39:27 -0000
@@ -108,6 +108,9 @@
 public IBinaryAnnotation[] getAnnotations() {
 	return null;
 }
+public char[] getEnclosingMethod() {
+	return null;
+}
 public char[] getEnclosingTypeName() {
 	return null;
 }
Index: compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java,v
retrieving revision 1.85
diff -u -r1.85 ClassFileReader.java
--- compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java	27 May 2008 22:21:14 -0000	1.85
+++ compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java	3 Mar 2009 16:39:27 -0000
@@ -50,6 +50,7 @@
 	private long version;
 	private char[] enclosingTypeName;
 	private char[][][] missingTypeNames;
+	private int enclosingNameAndTypeIndex;
 	
 private static String printTypeModifiers(int modifiers) {
 	java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
@@ -276,8 +277,9 @@
 				case 'E' :
 					if (CharOperation.equals(attributeName, AttributeNamesConstants.EnclosingMethodName)) {
 						utf8Offset = 
-							constantPoolOffsets[u2At(constantPoolOffsets[u2At(readOffset + 6)] - structOffset + 1)] - structOffset; 
+							this.constantPoolOffsets[u2At(this.constantPoolOffsets[u2At(readOffset + 6)] + 1)];
 						this.enclosingTypeName = utf8At(utf8Offset + 3, u2At(utf8Offset + 1));
+						this.enclosingNameAndTypeIndex = u2At(readOffset + 8);
 					}
 					break;
 				case 'D' :
@@ -445,6 +447,23 @@
 	return this.constantPoolOffsets;
 }
 
+public char[] getEnclosingMethod() {
+	if (this.enclosingNameAndTypeIndex <= 0) {
+		return null;
+	}
+	// read the name
+	StringBuffer buffer = new StringBuffer();
+	
+	int nameAndTypeOffset = this.constantPoolOffsets[this.enclosingNameAndTypeIndex];
+	int utf8Offset = this.constantPoolOffsets[u2At(nameAndTypeOffset + 1)];
+	buffer.append(utf8At(utf8Offset + 3, u2At(utf8Offset + 1)));
+
+	utf8Offset = this.constantPoolOffsets[u2At(nameAndTypeOffset + 3)];
+	buffer.append(utf8At(utf8Offset + 3, u2At(utf8Offset + 1)));
+
+	return String.valueOf(buffer).toCharArray();
+}
+
 /*
  * Answer the resolved compoundName of the enclosing type
  * or null if the receiver is a top level type.
Index: compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java,v
retrieving revision 1.30
diff -u -r1.30 IBinaryType.java
--- compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java	27 May 2008 22:21:14 -0000	1.30
+++ compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java	3 Mar 2009 16:39:27 -0000
@@ -24,6 +24,14 @@
 
 IBinaryAnnotation[] getAnnotations();
 /**
+ * Answer the enclosing method (including method selector and method descriptor), or
+ * null if none.
+ *
+ * For example, "foo()Ljava/lang/Object;V"
+ */
+
+char[] getEnclosingMethod();
+/**
  * Answer the resolved name of the enclosing type in the
  * class file format as specified in section 4.2 of the Java 2 VM spec
  * or null if the receiver is a top level type.

eclipse-jdt-265962.patch:
 ast/DoStatement.java            |   26 +++++++++++++-------------
 flow/FlowInfo.java              |    2 +-
 flow/UnconditionalFlowInfo.java |    5 ++++-
 3 files changed, 18 insertions(+), 15 deletions(-)

--- NEW FILE eclipse-jdt-265962.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java,v
retrieving revision 1.60
diff -u -r1.60 UnconditionalFlowInfo.java
--- compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java	5 Dec 2006 11:46:08 -0000	1.60
+++ compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java	4 Mar 2009 16:56:17 -0000
@@ -1544,7 +1544,10 @@
 }
 
 public FlowInfo setReachMode(int reachMode) {
-	if (reachMode == REACHABLE && this != DEAD_END) { // cannot modify DEAD_END
+	if (this == DEAD_END) {
+		return this; // cannot modify DEAD_END
+	}
+	if (reachMode == REACHABLE) { 
 		this.tagBits &= ~UNREACHABLE;
 	}
 	else {
Index: compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java,v
retrieving revision 1.35
diff -u -r1.35 FlowInfo.java
--- compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java	26 Sep 2006 12:04:03 -0000	1.35
+++ compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java	4 Mar 2009 16:56:16 -0000
@@ -58,7 +58,7 @@
 	}
 
 	public static FlowInfo conditional(FlowInfo initsWhenTrue, FlowInfo initsWhenFalse){
-
+		if (initsWhenTrue == initsWhenFalse) return initsWhenTrue;
 		// if (initsWhenTrue.equals(initsWhenFalse)) return initsWhenTrue; -- could optimize if #equals is defined
 		return new ConditionalFlowInfo(initsWhenTrue, initsWhenFalse);
 	}
Index: compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java,v
retrieving revision 1.56
diff -u -r1.56 DoStatement.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java	6 Mar 2007 02:38:48 -0000	1.56
+++ compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java	4 Mar 2009 16:56:16 -0000
@@ -144,19 +144,19 @@
 	// continue label (135602)
 	if (hasContinueLabel) {
 		this.continueLabel.place();
-	}
-	// generate condition
-	Constant cst = this.condition.optimizedBooleanConstant();
-	boolean isConditionOptimizedFalse = cst != Constant.NotAConstant && cst.booleanValue() == false;		
-	if (isConditionOptimizedFalse){
-		this.condition.generateCode(currentScope, codeStream, false);
-	} else if (hasContinueLabel) {
-		this.condition.generateOptimizedBoolean(
-			currentScope,
-			codeStream,
-			actionLabel,
-			null,
-			true);
+		// generate condition
+		Constant cst = this.condition.optimizedBooleanConstant();
+		boolean isConditionOptimizedFalse = cst != Constant.NotAConstant && cst.booleanValue() == false;		
+		if (isConditionOptimizedFalse){
+			this.condition.generateCode(currentScope, codeStream, false);
+		} else {
+			this.condition.generateOptimizedBoolean(
+				currentScope,
+				codeStream,
+				actionLabel,
+				null,
+				true);
+		}
 	}
 	// May loose some local variable initializations : affecting the local variable attributes
 	if (this.mergedInitStateIndex != -1) {

eclipse-jdt-263877.patch:
 QualifiedNameReference.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE eclipse-jdt-263877.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java,v
retrieving revision 1.125.2.3
diff -u -r1.125.2.3 QualifiedNameReference.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java	27 Nov 2008 10:13:10 -0000	1.125.2.3
+++ compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java	6 Feb 2009 12:34:15 -0000
@@ -780,8 +780,8 @@
 			}
 
 			if (field.isStatic()) {
-				ReferenceBinding declaringClass = field.original().declaringClass;
-				if (declaringClass.isEnum()) {
+				if ((field.modifiers & ClassFileConstants.AccEnum) != 0) { // enum constants are checked even when qualified)
+					ReferenceBinding declaringClass = field.original().declaringClass;
 					MethodScope methodScope = scope.methodScope();
 					SourceTypeBinding sourceType = methodScope.enclosingSourceType();
 					if ((this.bits & ASTNode.IsStrictlyAssigned) == 0
@@ -1014,13 +1014,13 @@
 					MethodScope methodScope = scope.methodScope();
 					TypeBinding declaringClass = fieldBinding.original().declaringClass;
 					// check for forward references
-					if ((this.indexOfFirstFieldBinding == 1 || declaringClass.isEnum())
+					if ((this.indexOfFirstFieldBinding == 1 || (fieldBinding.modifiers & ClassFileConstants.AccEnum) != 0) // enum constants are checked even when qualified
 							&& methodScope.enclosingSourceType() == declaringClass
 							&& methodScope.lastVisibleFieldID >= 0
 							&& fieldBinding.id >= methodScope.lastVisibleFieldID
 							&& (!fieldBinding.isStatic() || methodScope.isStatic)) {
 						scope.problemReporter().forwardReference(this, 0, fieldBinding);
-					}
+					}					
 					if (fieldBinding.isStatic()) {
 						// check if accessing enum static field in initializer					
 						if (declaringClass.isEnum()) {

eclipse-jdt-265103.patch:
 ClasspathJar.java |   64 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 14 deletions(-)

--- NEW FILE eclipse-jdt-265103.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java,v
retrieving revision 1.45.2.1
diff -u -r1.45.2.1 ClasspathJar.java
--- batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java	10 Nov 2008 17:46:09 -0000	1.45.2.1
+++ batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java	4 Mar 2009 16:09:54 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Fabrice Matrat - fix for 265103
  *******************************************************************************/
 package org.eclipse.jdt.internal.compiler.batch;
 
@@ -54,18 +55,20 @@
 		READING_JAR = 4,
 		CONTINUING = 5,
 		SKIP_LINE = 6;
-	private static final char[] CLASSPATH_HEADER_TOKEN = 
+	private static final char[] CLASSPATH_HEADER_TOKEN =
 		"Class-Path:".toCharArray(); //$NON-NLS-1$
-	private int ClasspathSectionsCount;
+	private int classpathSectionsCount;
 	private ArrayList calledFilesNames;
 	public boolean analyzeManifestContents(Reader reader) throws IOException {
 		int state = START, substate = 0;
 		StringBuffer currentJarToken = new StringBuffer();
 		int currentChar;
-		this.ClasspathSectionsCount = 0;
+		this.classpathSectionsCount = 0;
 		this.calledFilesNames = null;
 		for (;;) {
 			currentChar = reader.read();
+			if (currentChar == '\r')  // skip \r, will consider \n later (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=251079 )
+				currentChar = reader.read();
 			switch (state) {
 				case START:
 					if (currentChar == -1) {
@@ -91,50 +94,71 @@
 				case PAST_CLASSPATH_HEADER:
 					if (currentChar == ' ') {
 						state = SKIPPING_WHITESPACE;
-						this.ClasspathSectionsCount++;
+						this.classpathSectionsCount++;
 					} else {
 						return false;
 					}
 					break;
 				case SKIPPING_WHITESPACE:
 					if (currentChar == -1) {
+						// >>>>>>>>>>>>>>>>>> Add the latest jar read
+						addCurrentTokenJarWhenNecessary(currentJarToken);
 						return true;
 					} else if (currentChar == '\n') {
 						state = CONTINUING;
 					} else if (currentChar != ' ') {
 						currentJarToken.append((char) currentChar);
 						state = READING_JAR;
+					} else {
+						// >>>>>>>>>>>>>>>>>> Add the latest jar read
+						addCurrentTokenJarWhenNecessary(currentJarToken);
 					}
 					break;
 				case CONTINUING:
 					if (currentChar == -1) {
+						// >>>>>>>>>>>>>>>>>> Add the latest jar read
+						addCurrentTokenJarWhenNecessary(currentJarToken);
 						return true;
 					} else if (currentChar == '\n') {
+						addCurrentTokenJarWhenNecessary(currentJarToken);
 						state = START;
 					} else if (currentChar == ' ') {
 						state = SKIPPING_WHITESPACE;
 					} else if (currentChar == CLASSPATH_HEADER_TOKEN[0]) {
+						addCurrentTokenJarWhenNecessary(currentJarToken);
 						state = IN_CLASSPATH_HEADER;
 						substate = 1;
 					} else if (this.calledFilesNames == null) {
-						return false;
+						// >>>>>>>>>>>>>>>>>> Add the latest jar read
+						addCurrentTokenJarWhenNecessary(currentJarToken);
+						state = START;
 					} else {
+						// >>>>>>>>>>>>>>>>>> Add the latest jar read
+						addCurrentTokenJarWhenNecessary(currentJarToken);
 						state = SKIP_LINE;
 					}
 					break;
 				case SKIP_LINE:
 					if (currentChar == -1) {
+						if (this.classpathSectionsCount != 0) {
+							if (this.calledFilesNames == null) {
+								return false;
+							}
+						}
 						return true;
 					} else if (currentChar == '\n') {
 						state = START;
 					}
 					break;
-				case READING_JAR:	
+				case READING_JAR:
 					if (currentChar == -1) {
+						// >>>>>>>>>>>>>>>>>> Add the latest jar read
 						return false;
 					} else if (currentChar == '\n') {
 						// appends token below
 						state = CONTINUING;
+						// >>>>>>>>>>> Add a break to not add the jar yet as it can continue on the next line
+						break;
 					} else if (currentChar == ' ') {
 						// appends token below
 						state = SKIPPING_WHITESPACE;
@@ -142,17 +166,29 @@
 						currentJarToken.append((char) currentChar);
 						break;
 					}
-					if (this.calledFilesNames == null) {
-						this.calledFilesNames = new ArrayList();
-					}
-					this.calledFilesNames.add(currentJarToken.toString());
-					currentJarToken.setLength(0);
+					addCurrentTokenJarWhenNecessary(currentJarToken);
 					break;
 			}
-		}	
+		}
+	}	
+	
+	// >>>>>>>>>>>>>>>> Method Extracted from analyzeManifestContents in the READING_JAR Block
+	private boolean addCurrentTokenJarWhenNecessary(StringBuffer currentJarToken) {
+		if (currentJarToken != null && currentJarToken.length() > 0) {
+			if (this.calledFilesNames == null) {
+				this.calledFilesNames = new ArrayList();
+			}
+			this.calledFilesNames.add(currentJarToken.toString());
+			currentJarToken.setLength(0);
+			return true;
+		}
+		return false;
 	}
+	// <<<<<<<<<<<<<<<<<<<<<<
+	
+	
 	public int getClasspathSectionsCount() {
-		return this.ClasspathSectionsCount;
+		return this.classpathSectionsCount;
 	}
 	public List getCalledFileNames() {
 		return this.calledFilesNames;

eclipse-jdt-261510.patch:
 ast/IntLiteral.java          |   18 ++----------------
 ast/IntLiteralMinValue.java  |    5 ++---
 ast/LongLiteral.java         |   18 ++----------------
 ast/LongLiteralMinValue.java |    3 +--
 impl/IntConstant.java        |    4 +++-
 impl/LongConstant.java       |    3 +++
 6 files changed, 13 insertions(+), 38 deletions(-)

--- NEW FILE eclipse-jdt-261510.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java,v
retrieving revision 1.25
diff -u -r1.25 IntConstant.java
--- compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java	28 Mar 2006 20:33:18 -0000	1.25
+++ compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java	2 Feb 2009 15:15:01 -0000
@@ -13,7 +13,8 @@
 public class IntConstant extends Constant {
 	
 	int value;
-	
+
+	private static final IntConstant MIN_VALUE = new IntConstant(Integer.MIN_VALUE);
 	private static final IntConstant MINUS_FOUR = new IntConstant(-4);
 	private static final IntConstant MINUS_THREE = new IntConstant(-3);
 	private static final IntConstant MINUS_TWO = new IntConstant(-2);
@@ -33,6 +34,7 @@
 	public static Constant fromValue(int value) {
 
 		switch (value) {
+			case Integer.MIN_VALUE : return IntConstant.MIN_VALUE;
 			case -4 : return IntConstant.MINUS_FOUR;
 			case -3 : return IntConstant.MINUS_THREE;
 			case -2 : return IntConstant.MINUS_TWO;
Index: compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java,v
retrieving revision 1.23
diff -u -r1.23 LongConstant.java
--- compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java	28 Mar 2006 20:33:18 -0000	1.23
+++ compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java	2 Feb 2009 15:15:01 -0000
@@ -12,12 +12,15 @@
 
 public class LongConstant extends Constant {
 private static final LongConstant ZERO = new LongConstant(0L);
+private static final LongConstant MIN_VALUE = new LongConstant(Long.MIN_VALUE); 
 
 private long value;
 
 public static Constant fromValue(long value) {
 	if (value == 0L) {
 		return ZERO;
+	} else if (value == Long.MIN_VALUE) {
+		return MIN_VALUE;
 	}
 	return new LongConstant(value);
 }
Index: compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteral.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteral.java,v
retrieving revision 1.25
diff -u -r1.25 LongLiteral.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteral.java	6 Mar 2007 02:38:48 -0000	1.25
+++ compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteral.java	2 Feb 2009 15:15:01 -0000
@@ -17,7 +17,6 @@
 import org.eclipse.jdt.internal.compiler.parser.ScannerHelper;
 
 public class LongLiteral extends NumberLiteral {
-	static final Constant FORMAT_ERROR = DoubleConstant.fromValue(1.0/0.0); // NaN;	
 		
 public LongLiteral(char[] token, int s,int e) {
 	super(token, s,e);
@@ -52,7 +51,7 @@
 				
 		int digitValue ;
 		if ((digitValue = ScannerHelper.digit(source[j++],radix)) < 0 ) {
-			constant = FORMAT_ERROR; return ;
+			return /*constant stays null*/ ;
 		}
 		if (digitValue >= 8)
 			nbDigit = 4;
@@ -65,7 +64,7 @@
 		computedValue = digitValue ;
 		while (j<length) {
 			if ((digitValue = ScannerHelper.digit(source[j++],radix)) < 0) {
-				constant = FORMAT_ERROR; return ;
+				return /*constant stays null*/ ;
 			}
 			if ((nbDigit += shift) > 64)
 				return /*constant stays null*/ ;
@@ -137,19 +136,6 @@
 			(source[18] == '8') &&
 			(((this.bits & ASTNode.ParenthesizedMASK) >> ASTNode.ParenthesizedSHIFT) == 0));
 }
-public TypeBinding resolveType(BlockScope scope) {
-	// the format may be incorrect while the scanner could detect
-	// such error only on painfull tests...easier and faster here
-
-	TypeBinding tb = super.resolveType(scope);
-	if (constant == FORMAT_ERROR) {
-		constant = Constant.NotAConstant;
-		scope.problemReporter().constantOutOfFormat(this);
-		this.resolvedType = null;
-		return null;
-	}
-	return tb;
-}
 public void traverse(ASTVisitor visitor, BlockScope scope) {
 	visitor.visit(this, scope);
 	visitor.endVisit(this, scope);
Index: compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteralMinValue.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteralMinValue.java,v
retrieving revision 1.12
diff -u -r1.12 LongLiteralMinValue.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteralMinValue.java	6 Mar 2007 02:38:48 -0000	1.12
+++ compiler/org/eclipse/jdt/internal/compiler/ast/LongLiteralMinValue.java	2 Feb 2009 15:15:01 -0000
@@ -15,11 +15,10 @@
 public class LongLiteralMinValue extends LongLiteral {
 
 	final static char[] CharValue = new char[]{'-', '9','2','2','3','3','7','2','0','3','6','8','5','4','7','7','5','8','0','8','L'};
-	final static Constant MIN_VALUE = LongConstant.fromValue(Long.MIN_VALUE) ; 
 
 public LongLiteralMinValue(){
 	super(CharValue,0,0);
-	constant = MIN_VALUE;
+	constant = LongConstant.fromValue(Long.MIN_VALUE);
 }
 public void computeConstant() {
 
Index: compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteralMinValue.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteralMinValue.java,v
retrieving revision 1.10
diff -u -r1.10 IntLiteralMinValue.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteralMinValue.java	28 Mar 2006 20:29:57 -0000	1.10
+++ compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteralMinValue.java	2 Feb 2009 15:15:01 -0000
@@ -15,11 +15,10 @@
 public class IntLiteralMinValue extends IntLiteral {
 
 	final static char[] CharValue = new char[]{'-','2','1','4','7','4','8','3','6','4','8'};
-	final static Constant MIN_VALUE = IntConstant.fromValue(Integer.MIN_VALUE) ; 
 
 public IntLiteralMinValue() {
-	super(CharValue,0,0,Integer.MIN_VALUE);
-	constant = MIN_VALUE;
+	super(CharValue, 0,0, Integer.MIN_VALUE);
+	constant = IntConstant.fromValue(Integer.MIN_VALUE);
 }
 public void computeConstant(){
 	
Index: compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteral.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteral.java,v
retrieving revision 1.23
diff -u -r1.23 IntLiteral.java
--- compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteral.java	28 Oct 2006 04:11:27 -0000	1.23
+++ compiler/org/eclipse/jdt/internal/compiler/ast/IntLiteral.java	2 Feb 2009 15:15:01 -0000
@@ -22,7 +22,6 @@
 	public static final IntLiteral
 		One = new IntLiteral(new char[]{'1'},0,0,1);//used for ++ and -- 
 
-	static final Constant FORMAT_ERROR = DoubleConstant.fromValue(1.0/0.0); // NaN;
 public IntLiteral(char[] token, int s, int e) {
 	super(token, s,e);
 }
@@ -71,7 +70,7 @@
 		while (j<length)
 		{	int digitValue ;
 			if ((digitValue = ScannerHelper.digit(source[j++],radix))	< 0 ) 	
-			{	constant = FORMAT_ERROR; return ;}
+			{	return /*constant stays null*/ ;}
 			computedValue = (computedValue<<shift) | digitValue ;
 			if (computedValue > MAX) return /*constant stays null*/ ;}}
 	else
@@ -79,7 +78,7 @@
 		for (int i = 0 ; i < length;i++)
 		{	int digitValue ;
 			if ((digitValue = ScannerHelper.digit(source[i],10))	< 0 ) 
-			{	constant = FORMAT_ERROR; return ;}
+			{	return /*constant stays null*/ ; }
 			computedValue = 10*computedValue + digitValue;
 			if (computedValue > MAX) return /*constant stays null*/ ; }}
 
@@ -122,19 +121,6 @@
 			(source[9] == '8') &&
 			(((this.bits & ASTNode.ParenthesizedMASK) >> ASTNode.ParenthesizedSHIFT) == 0));
 }
-public TypeBinding resolveType(BlockScope scope) {
-	// the format may be incorrect while the scanner could detect
-	// such an error only on painfull tests...easier and faster here
-
-	TypeBinding tb = super.resolveType(scope);
-	if (constant == FORMAT_ERROR) {
-		constant = Constant.NotAConstant;
-		scope.problemReporter().constantOutOfFormat(this);
-		this.resolvedType = null;
-		return null;
-	}
-	return tb;
-}
 public StringBuffer printExpression(int indent, StringBuffer output){
 
 	if (source == null) {


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -p -r1.634 -r1.635
--- eclipse.spec	9 Sep 2009 14:07:25 -0000	1.634
+++ eclipse.spec	28 Sep 2009 12:59:26 -0000	1.635
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -160,6 +160,16 @@ Patch45:        %{name}-swt-buildagainst
 # https://bugs.eclipse.org/bugs/attachment.cgi?id=130611
 Patch46:        %{name}-swt-xulrunner191.patch
 
+#Post 3.4.2 ecj patches
+Patch47:        %{name}-jdt-261510.patch
+Patch48:        %{name}-jdt-249930.patch
+Patch49:        %{name}-jdt-263877.patch
+Patch50:        %{name}-jdt-257716.patch
+Patch51:        %{name}-jdt-264843.patch
+Patch52:        %{name}-jdt-266582.patch
+Patch53:        %{name}-jdt-265103.patch
+Patch54:        %{name}-jdt-265962.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -663,6 +673,17 @@ popd
 %patch43
 %patch44
 
+pushd plugins/org.eclipse.jdt.core
+%patch47
+%patch48
+%patch49
+%patch50
+%patch51
+%patch52
+%patch53
+%patch54
+popd
+
 %build
 ORIGCLASSPATH=$CLASSPATH
 
@@ -1491,6 +1512,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Sep 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-16
+- Add post 3.4.2 jdt.core patches. Fixes #525737.
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-15
 - Rebuild against newer gecko
 



From than at fedoraproject.org  Mon Sep 28 13:01:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 28 Sep 2009 13:01:12 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.72,1.73
Message-ID: <20090928130112.7DCCC11C00E4@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9970

Modified Files:
	kdelibs3.spec 
Log Message:
rhel cleanup




Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- kdelibs3.spec	28 Sep 2009 11:25:10 -0000	1.72
+++ kdelibs3.spec	28 Sep 2009 13:01:12 -0000	1.73
@@ -331,7 +331,7 @@ for i in *; do
 done
 popd
 
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 || 0%{?rhel} < 6
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
 %endif
@@ -470,7 +470,7 @@ touch --no-create %{_datadir}/icons/crys
 %defattr(-,root,root,-)
 %doc README
 %doc COPYING.LIB
-%if 0%{?fedora} < 12
+%if 0%{?fedora} < 12 || 0%{?rhel} < 6
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %endif
 %{_bindir}/artsmessage



From jknife at fedoraproject.org  Mon Sep 28 13:02:17 2009
From: jknife at fedoraproject.org (Wesley S. Hearn)
Date: Mon, 28 Sep 2009 13:02:17 +0000 (UTC)
Subject: rpms/bespin/devel .cvsignore, 1.3, 1.4 bespin.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090928130217.169ED11C00E4@cvs1.fedora.phx.redhat.com>

Author: jknife

Update of /cvs/pkgs/rpms/bespin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10163/devel

Modified Files:
	.cvsignore bespin.spec import.log sources 
Log Message:
Updateed to latest SVN
Enabled expermintal ARGB windows (not enabled by default)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Jun 2009 17:57:10 -0000	1.3
+++ .cvsignore	28 Sep 2009 13:02:16 -0000	1.4
@@ -1 +1 @@
-bespin-0.1-svn500.tar.bz2
+bespin-0.1-svn668.tar.bz2


Index: bespin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/devel/bespin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bespin.spec	24 Jul 2009 17:59:05 -0000	1.3
+++ bespin.spec	28 Sep 2009 13:02:16 -0000	1.4
@@ -1,15 +1,15 @@
 Name:		bespin
 Version:	0.1
-Release:	0.2.20090627svn500%{?dist}
+Release:	0.2.20090828svn668%{?dist}
 Summary:	A style for Qt/KDE4/KDM
 Group:		User Interface/Desktops
 License:	GPLv2  and LGPLv2 and BSD
 URL:		https://cloudcity.svn.sourceforge.net/svnroot/cloudcity/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 500 https://cloudcity.svn.sourceforge.net/svnroot/cloudcity bespin-0.1-svn500
-#  tar -c bespin-0.1-svn500 | bzip2 --best -c > bespin-0.1-svn500.tar.bz2
-Source0:	%{name}-%{version}-svn500.tar.bz2
+#  svn export -r 668 https://cloudcity.svn.sourceforge.net/svnroot/cloudcity bespin-0.1-svn668
+#  tar -c bespin-0.1-svn668 | bzip2 --best -c > bespin-0.1-svn668.tar.bz2
+Source0:	%{name}-%{version}-svn668.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	kdebase-workspace-devel >= 4.1.96
@@ -21,12 +21,12 @@ Requires:	bespin-kwin-theme = %{version}
 A Qt/KDE4/KDM theme.
 
 %prep
-%setup -q -n bespin-0.1-svn500
+%setup -q -n bespin-0.1-svn668
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4}  ..
+%{cmake_kde4}  -DENABLE_ARGB=ON ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -120,6 +120,10 @@ A KDM theme
 %{_kde4_datadir}/kde4/apps/kdm/themes/bespin/KdmGreeterTheme.desktop
 
 %changelog
+* Mon Sep 28 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> - 0.1-0.2.20090928svn668
+- Updated to revision 668
+- Enable support for ARGB windows (expermintal - not turned on by default) 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.2.20090627svn500
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Jun 2009 17:57:10 -0000	1.2
+++ import.log	28 Sep 2009 13:02:16 -0000	1.3
@@ -1,2 +1,3 @@
 bespin-0_1-0_1_20090615svn485_fc12:HEAD:bespin-0.1-0.1.20090615svn485.fc12.src.rpm:1245357022
 bespin-0_1-0_1_20090627svn500_fc11:HEAD:bespin-0.1-0.1.20090627svn500.fc11.src.rpm:1246125355
+bespin-0_1-0_2_20090828svn668_fc11:HEAD:bespin-0.1-0.2.20090828svn668.fc11.src.rpm:1254142824


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Jun 2009 17:57:10 -0000	1.3
+++ sources	28 Sep 2009 13:02:16 -0000	1.4
@@ -1 +1 @@
-ba146c06e149bcd3259e06153c316f45  bespin-0.1-svn500.tar.bz2
+94f3d7bf6ab57cbf13fbd563a7a2d550  bespin-0.1-svn668.tar.bz2



From jknife at fedoraproject.org  Mon Sep 28 13:06:57 2009
From: jknife at fedoraproject.org (Wesley S. Hearn)
Date: Mon, 28 Sep 2009 13:06:57 +0000 (UTC)
Subject: rpms/bespin/F-10 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 bespin.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090928130657.C590611C00E4@cvs1.fedora.phx.redhat.com>

Author: jknife

Update of /cvs/pkgs/rpms/bespin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12048/F-10

Modified Files:
	.cvsignore bespin.spec sources 
Added Files:
	import.log 
Log Message:
Backported r500



--- NEW FILE import.log ---
bespin-0_1-0_2_20090928svn500_fc11:F-10:bespin-0.1-0.2.20090928svn500.fc11.src.rpm:1254143191


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 Jun 2009 20:12:54 -0000	1.1
+++ .cvsignore	28 Sep 2009 13:06:57 -0000	1.2
@@ -0,0 +1 @@
+bespin-0.1-svn500.tar.bz2


Index: bespin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/F-10/bespin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bespin.spec	18 Jun 2009 20:37:32 -0000	1.1
+++ bespin.spec	28 Sep 2009 13:06:57 -0000	1.2
@@ -1,15 +1,15 @@
 Name:		bespin
 Version:	0.1
-Release:	0.1.20090615svn485%{?dist}
+Release:	0.2.20090928svn500%{?dist}
 Summary:	A style for Qt/KDE4/KDM
 Group:		User Interface/Desktops
 License:	GPLv2  and LGPLv2 and BSD
 URL:		https://cloudcity.svn.sourceforge.net/svnroot/cloudcity/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 485 https://cloudcity.svn.sourceforge.net/svnroot/cloudcity bespin-0.1-svn485
-#  tar -c bespin-0.1-svn485 | bzip2 --best -c > bespin-0.1-svn485.tar.bz2
-Source0:	%{name}-%{version}-svn485.tar.bz2
+#  svn export -r 500 https://cloudcity.svn.sourceforge.net/svnroot/cloudcity bespin-0.1-svn500
+#  tar -c bespin-0.1-svn500 | bzip2 --best -c > bespin-0.1-svn500.tar.bz2
+Source0:	%{name}-%{version}-svn500.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	kdebase-workspace-devel >= 4.1.96
@@ -21,7 +21,7 @@ Requires:	bespin-kwin-theme = %{version}
 A Qt/KDE4/KDM theme.
 
 %prep
-%setup -q -n bespin-0.1-svn485
+%setup -q -n bespin-0.1-svn500
 
 %build
 mkdir -p %{_target_platform}
@@ -102,6 +102,7 @@ A mac like menu for KDE4
 %package -n bespin-kdm-theme
 Summary:	Bespin KDM theme
 License:	GPLv2
+BuildArch:	noarch
 %description -n bespin-kdm-theme
 A KDM theme
 
@@ -119,6 +120,15 @@ A KDM theme
 %{_kde4_datadir}/kde4/apps/kdm/themes/bespin/KdmGreeterTheme.desktop
 
 %changelog
+* Mon Sep 28 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> 0.1-0.2.20090928svn500
+- Backported to F11 ad F10
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.2.20090627svn500
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> 0.1-0.1.20090627svn500
+- Updated to revision 500
+
 * Thu Jun 18 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> 0.1-0.1.20090618svn485
 - Update to include COPYING.BSD
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jun 2009 20:37:32 -0000	1.2
+++ sources	28 Sep 2009 13:06:57 -0000	1.3
@@ -1 +1 @@
-695ec1d2ee983e4f11e0af8336b2b655  bespin-0.1-svn485.tar.bz2
+ba146c06e149bcd3259e06153c316f45  bespin-0.1-svn500.tar.bz2



From jknife at fedoraproject.org  Mon Sep 28 13:08:28 2009
From: jknife at fedoraproject.org (Wesley S. Hearn)
Date: Mon, 28 Sep 2009 13:08:28 +0000 (UTC)
Subject: rpms/bespin/devel bespin.spec,1.4,1.5
Message-ID: <20090928130828.8C44D11C00E4@cvs1.fedora.phx.redhat.com>

Author: jknife

Update of /cvs/pkgs/rpms/bespin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12640/devel

Modified Files:
	bespin.spec 
Log Message:
Backported r500



Index: bespin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/devel/bespin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bespin.spec	28 Sep 2009 13:02:16 -0000	1.4
+++ bespin.spec	28 Sep 2009 13:08:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		bespin
 Version:	0.1
-Release:	0.2.20090828svn668%{?dist}
+Release:	0.2.20090928svn668%{?dist}
 Summary:	A style for Qt/KDE4/KDM
 Group:		User Interface/Desktops
 License:	GPLv2  and LGPLv2 and BSD



From jknife at fedoraproject.org  Mon Sep 28 13:08:28 2009
From: jknife at fedoraproject.org (Wesley S. Hearn)
Date: Mon, 28 Sep 2009 13:08:28 +0000 (UTC)
Subject: rpms/bespin/F-11 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 bespin.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090928130828.66CBE11C00E4@cvs1.fedora.phx.redhat.com>

Author: jknife

Update of /cvs/pkgs/rpms/bespin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12640/F-11

Modified Files:
	.cvsignore bespin.spec sources 
Added Files:
	import.log 
Log Message:
Backported r500



--- NEW FILE import.log ---
bespin-0_1-0_2_20090928svn500_fc11:F-11:bespin-0.1-0.2.20090928svn500.fc11.src.rpm:1254143239


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 Jun 2009 20:12:54 -0000	1.1
+++ .cvsignore	28 Sep 2009 13:08:28 -0000	1.2
@@ -0,0 +1 @@
+bespin-0.1-svn500.tar.bz2


Index: bespin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/F-11/bespin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bespin.spec	18 Jun 2009 20:37:32 -0000	1.1
+++ bespin.spec	28 Sep 2009 13:08:28 -0000	1.2
@@ -1,15 +1,15 @@
 Name:		bespin
 Version:	0.1
-Release:	0.1.20090615svn485%{?dist}
+Release:	0.2.20090928svn500%{?dist}
 Summary:	A style for Qt/KDE4/KDM
 Group:		User Interface/Desktops
 License:	GPLv2  and LGPLv2 and BSD
 URL:		https://cloudcity.svn.sourceforge.net/svnroot/cloudcity/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 485 https://cloudcity.svn.sourceforge.net/svnroot/cloudcity bespin-0.1-svn485
-#  tar -c bespin-0.1-svn485 | bzip2 --best -c > bespin-0.1-svn485.tar.bz2
-Source0:	%{name}-%{version}-svn485.tar.bz2
+#  svn export -r 500 https://cloudcity.svn.sourceforge.net/svnroot/cloudcity bespin-0.1-svn500
+#  tar -c bespin-0.1-svn500 | bzip2 --best -c > bespin-0.1-svn500.tar.bz2
+Source0:	%{name}-%{version}-svn500.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	kdebase-workspace-devel >= 4.1.96
@@ -21,7 +21,7 @@ Requires:	bespin-kwin-theme = %{version}
 A Qt/KDE4/KDM theme.
 
 %prep
-%setup -q -n bespin-0.1-svn485
+%setup -q -n bespin-0.1-svn500
 
 %build
 mkdir -p %{_target_platform}
@@ -102,6 +102,7 @@ A mac like menu for KDE4
 %package -n bespin-kdm-theme
 Summary:	Bespin KDM theme
 License:	GPLv2
+BuildArch:	noarch
 %description -n bespin-kdm-theme
 A KDM theme
 
@@ -119,6 +120,15 @@ A KDM theme
 %{_kde4_datadir}/kde4/apps/kdm/themes/bespin/KdmGreeterTheme.desktop
 
 %changelog
+* Mon Sep 28 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> 0.1-0.2.20090928svn500
+- Backported to F11 ad F10
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.2.20090627svn500
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> 0.1-0.1.20090627svn500
+- Updated to revision 500
+
 * Thu Jun 18 2009 Wesley Hearn <gr33nn1nj4 at gr33nn1nj4.com> 0.1-0.1.20090618svn485
 - Update to include COPYING.BSD
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jun 2009 20:37:32 -0000	1.2
+++ sources	28 Sep 2009 13:08:28 -0000	1.3
@@ -1 +1 @@
-695ec1d2ee983e4f11e0af8336b2b655  bespin-0.1-svn485.tar.bz2
+ba146c06e149bcd3259e06153c316f45  bespin-0.1-svn500.tar.bz2



From jknife at fedoraproject.org  Mon Sep 28 13:10:45 2009
From: jknife at fedoraproject.org (Wesley S. Hearn)
Date: Mon, 28 Sep 2009 13:10:45 +0000 (UTC)
Subject: rpms/bespin/devel import.log,1.3,1.4
Message-ID: <20090928131045.D436E11C00E4@cvs1.fedora.phx.redhat.com>

Author: jknife

Update of /cvs/pkgs/rpms/bespin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13988/devel

Modified Files:
	import.log 
Log Message:
Was a typo in the SPEC, Version date was different the the changelog date.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bespin/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Sep 2009 13:02:16 -0000	1.3
+++ import.log	28 Sep 2009 13:10:45 -0000	1.4
@@ -1,3 +1,4 @@
 bespin-0_1-0_1_20090615svn485_fc12:HEAD:bespin-0.1-0.1.20090615svn485.fc12.src.rpm:1245357022
 bespin-0_1-0_1_20090627svn500_fc11:HEAD:bespin-0.1-0.1.20090627svn500.fc11.src.rpm:1246125355
 bespin-0_1-0_2_20090828svn668_fc11:HEAD:bespin-0.1-0.2.20090828svn668.fc11.src.rpm:1254142824
+bespin-0_1-0_2_20090928svn668_fc11:HEAD:bespin-0.1-0.2.20090928svn668.fc11.src.rpm:1254143389



From kkofler at fedoraproject.org  Mon Sep 28 13:10:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 28 Sep 2009 13:10:58 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.73,1.74
Message-ID: <20090928131058.0183C11C00E4@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14374/devel

Modified Files:
	kdelibs3.spec 
Log Message:
These need to be &&, not ||.


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- kdelibs3.spec	28 Sep 2009 13:01:12 -0000	1.73
+++ kdelibs3.spec	28 Sep 2009 13:10:57 -0000	1.74
@@ -331,7 +331,7 @@ for i in *; do
 done
 popd
 
-%if 0%{?fedora} < 12 || 0%{?rhel} < 6
+%if 0%{?fedora} < 12 && 0%{?rhel} < 6
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
 %endif
@@ -470,7 +470,7 @@ touch --no-create %{_datadir}/icons/crys
 %defattr(-,root,root,-)
 %doc README
 %doc COPYING.LIB
-%if 0%{?fedora} < 12 || 0%{?rhel} < 6
+%if 0%{?fedora} < 12 && 0%{?rhel} < 6
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %endif
 %{_bindir}/artsmessage



From stingray at fedoraproject.org  Mon Sep 28 13:12:03 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Mon, 28 Sep 2009 13:12:03 +0000 (UTC)
Subject: rpms/libnetfilter_conntrack/devel .cvsignore, 1.12,
	1.13 libnetfilter_conntrack.spec, 1.23, 1.24 sources, 1.12, 1.13
Message-ID: <20090928131203.B9F0A11C00E4@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_conntrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14770

Modified Files:
	.cvsignore libnetfilter_conntrack.spec sources 
Log Message:
libnetfilter_conntrack-0.0.100-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	13 Jan 2009 01:02:53 -0000	1.12
+++ .cvsignore	28 Sep 2009 13:12:03 -0000	1.13
@@ -1 +1 @@
-libnetfilter_conntrack-0.0.99.tar.bz2
+libnetfilter_conntrack-0.0.100.tar.bz2


Index: libnetfilter_conntrack.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/libnetfilter_conntrack.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libnetfilter_conntrack.spec	25 Jul 2009 06:11:41 -0000	1.23
+++ libnetfilter_conntrack.spec	28 Sep 2009 13:12:03 -0000	1.24
@@ -1,9 +1,6 @@
-# %define rev 7356
-# %define basever 0.0.82
-
 Name:           libnetfilter_conntrack
-Version:        0.0.99
-Release:        3%{?dist}
+Version:        0.0.100
+Release:        1%{?dist}
 Summary:        Netfilter conntrack userspace library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -12,7 +9,7 @@ Source0:        http://netfilter.org/pro
 Patch0:		libnetfilter_conntrack-sysheader.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libnfnetlink-devel >= 0.0.39, pkgconfig, kernel-headers
+BuildRequires:  libnfnetlink-devel >= 1.0.0, pkgconfig, kernel-headers
 
 %description
 libnetfilter_conntrack is a userspace library providing a programming 
@@ -21,7 +18,7 @@ interface (API) to the in-kernel connect
 %package        devel
 Summary:        Netfilter conntrack userspace library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, libnfnetlink-devel >= 0.0.39
+Requires:       %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.0
 Requires:	kernel-headers
 
 %description    devel
@@ -61,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libnetfilter_conntrack/*.h
 
 %changelog
+* Mon Sep 28 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.0.100-1
+- new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.99-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Jan 2009 01:02:53 -0000	1.12
+++ sources	28 Sep 2009 13:12:03 -0000	1.13
@@ -1 +1 @@
-960c3d347d7f4e3fe7437aa198f36e6e  libnetfilter_conntrack-0.0.99.tar.bz2
+c047cea509621cf2abed0718cb210972  libnetfilter_conntrack-0.0.100.tar.bz2



From nphilipp at fedoraproject.org  Mon Sep 28 13:13:25 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:13:25 +0000 (UTC)
Subject: rpms/system-config-samba-docs/devel .cvsignore, 1.4, 1.5 sources,
	1.5, 1.6 system-config-samba-docs.spec, 1.6, 1.7
Message-ID: <20090928131325.6402C11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15197

Modified Files:
	.cvsignore sources system-config-samba-docs.spec 
Log Message:
version 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 15:46:30 -0000	1.4
+++ .cvsignore	28 Sep 2009 13:13:25 -0000	1.5
@@ -1 +1 @@
-system-config-samba-docs-1.0.6.tar.bz2
+system-config-samba-docs-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Apr 2009 15:46:31 -0000	1.5
+++ sources	28 Sep 2009 13:13:25 -0000	1.6
@@ -1 +1 @@
-137be52404a050568788db7cc48c4245  system-config-samba-docs-1.0.6.tar.bz2
+7f7f8a3d0050b4aa11347315930e8e59  system-config-samba-docs-1.0.7.tar.bz2


Index: system-config-samba-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/system-config-samba-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- system-config-samba-docs.spec	27 Jul 2009 05:25:22 -0000	1.6
+++ system-config-samba-docs.spec	28 Sep 2009 13:13:25 -0000	1.7
@@ -8,14 +8,14 @@
 
 Summary: Documentation for configuring a Samba server
 Name: system-config-samba-docs
-Version: 1.0.6
-Release: 2%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: gettext
 BuildRequires: pkgconfig
 BuildRequires: gnome-doc-utils
@@ -25,6 +25,10 @@ BuildRequires: rarian-compat
 %else
 BuildRequires: scrollkeeper
 %endif
+# Until version 1.2.67, system-config-samba contained online documentation.
+# From version 1.2.68 on, online documentation is split off into its own
+# package system-config-samba-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-samba < 1.2.68
 Requires: system-config-samba >= 1.2.68
 Requires: yelp
@@ -65,8 +69,14 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gnome/help/system-config-samba
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.0.7-1
+- pick up new translations
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
 - add sr at latin structure (#495589, sr at latin.po by Milo? Komar?evi?)



From nphilipp at fedoraproject.org  Mon Sep 28 13:20:14 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:20:14 +0000 (UTC)
Subject: rpms/system-config-services-docs/devel .cvsignore, 1.4, 1.5 sources,
	1.5, 1.6 system-config-services-docs.spec, 1.6, 1.7
Message-ID: <20090928132014.173C311C0419@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17341

Modified Files:
	.cvsignore sources system-config-services-docs.spec 
Log Message:
version 1.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 13:18:26 -0000	1.4
+++ .cvsignore	28 Sep 2009 13:20:13 -0000	1.5
@@ -1 +1 @@
-system-config-services-docs-1.1.6.tar.bz2
+system-config-services-docs-1.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Apr 2009 13:18:27 -0000	1.5
+++ sources	28 Sep 2009 13:20:13 -0000	1.6
@@ -1 +1 @@
-6a29015b54ba7d4c440a12f899995b1f  system-config-services-docs-1.1.6.tar.bz2
+b31ed102d8a1e66859b693080213b76b  system-config-services-docs-1.1.7.tar.bz2


Index: system-config-services-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/system-config-services-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- system-config-services-docs.spec	27 Jul 2009 05:25:47 -0000	1.6
+++ system-config-services-docs.spec	28 Sep 2009 13:20:13 -0000	1.7
@@ -8,10 +8,10 @@
 
 Summary: Documentation for configuring system services
 Name: system-config-services-docs
-Version: 1.1.6
-Release: 2%{?dist}
+Version: 1.1.7
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Documentation
 BuildArch: noarch
@@ -25,6 +25,10 @@ BuildRequires: rarian-compat
 %else
 BuildRequires: scrollkeeper
 %endif
+# Until version 0.99.28, system-config-services contained online documentation.
+# From version 0.99.29 on, online documentation is split off into its own
+# package system-config-services-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-services < 0.99.29
 Requires: system-config-services >= 0.99.29
 Requires: yelp
@@ -66,8 +70,14 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gnome/help/system-config-services
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.1.7-1
+- pick up new translations
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.1.6-1
 - add sr at latin structure, move po file (#495460)



From nphilipp at fedoraproject.org  Mon Sep 28 13:24:02 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:24:02 +0000 (UTC)
Subject: rpms/system-config-users-docs/devel .cvsignore, 1.4, 1.5 sources,
	1.5, 1.6 system-config-users-docs.spec, 1.6, 1.7
Message-ID: <20090928132402.C7FAF11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18638

Modified Files:
	.cvsignore sources system-config-users-docs.spec 
Log Message:
version 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 11:10:21 -0000	1.4
+++ .cvsignore	28 Sep 2009 13:24:02 -0000	1.5
@@ -1 +1 @@
-system-config-users-docs-1.0.6.tar.bz2
+system-config-users-docs-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Apr 2009 11:10:21 -0000	1.5
+++ sources	28 Sep 2009 13:24:02 -0000	1.6
@@ -1 +1 @@
-dd948419edd15802e1476e0c2abf6950  system-config-users-docs-1.0.6.tar.bz2
+70937aa88c0d1e45ce0d360aaea48a5c  system-config-users-docs-1.0.7.tar.bz2


Index: system-config-users-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/system-config-users-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- system-config-users-docs.spec	27 Jul 2009 05:26:11 -0000	1.6
+++ system-config-users-docs.spec	28 Sep 2009 13:24:02 -0000	1.7
@@ -8,14 +8,14 @@
 
 Summary: Documentation for administering users and groups
 Name: system-config-users-docs
-Version: 1.0.6
-Release: 2%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: gettext
 BuildRequires: pkgconfig
 BuildRequires: gnome-doc-utils
@@ -25,6 +25,10 @@ BuildRequires: rarian-compat
 %else
 BuildRequires: scrollkeeper
 %endif
+# Until version 1.2.81, system-config-users contained online documentation.
+# From version 1.2.82 on, online documentation is split off into its own
+# package system-config-users-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-users < 1.2.82
 Requires: system-config-users >= 1.2.82
 %if %{with rarian_compat}
@@ -65,8 +69,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gnome/help/system-config-users
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.0.7-1
+- pick up new translations
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
 - add sr at latin structure (#495293, sr at latin.po by Milo? Komar?evi?)



From pbrobinson at fedoraproject.org  Mon Sep 28 13:25:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 28 Sep 2009 13:25:14 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.6, 1.7 anjal.spec, 1.7, 1.8 sources, 
	1.6, 1.7
Message-ID: <20090928132514.75BDC11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19113

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
 - New git snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Sep 2009 11:48:04 -0000	1.6
+++ .cvsignore	28 Sep 2009 13:25:14 -0000	1.7
@@ -1 +1 @@
-anjal-0.1.0-20090923.tar.bz2
+anjal-0.1.0-20090928.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- anjal.spec	23 Sep 2009 11:48:04 -0000	1.7
+++ anjal.spec	28 Sep 2009 13:25:14 -0000	1.8
@@ -2,14 +2,14 @@
 # git clone git://git.gnome.org/anjal
 # git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090923
-%define git_version 89078ae
+%define gitdate 20090928
+%define git_version a7a5264
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.10.%{snapshot}%{?dist}
+Release:        0.11.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -93,8 +93,12 @@ rm -rf %{buildroot}
 %{_bindir}/anjal
 %{_datadir}/anjal
 %{_datadir}/applications/anjal.desktop
+%{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.11
+- New git snapshot
+
 * Wed Sep 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.10
 - New git snapshot to pull in lots of new translations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Sep 2009 11:48:04 -0000	1.6
+++ sources	28 Sep 2009 13:25:14 -0000	1.7
@@ -1 +1 @@
-80250f5961750a81bad6a3536a1605a4  anjal-0.1.0-20090923.tar.bz2
+78b581fb13788a466fe6403ed109309f  anjal-0.1.0-20090928.tar.bz2



From nphilipp at fedoraproject.org  Mon Sep 28 13:26:23 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:26:23 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.108, 1.109 sources,
	1.120, 1.121
Message-ID: <20090928132623.A481B11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19529

Modified Files:
	.cvsignore sources 
Log Message:
version 1.9.50


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- .cvsignore	14 Sep 2009 13:09:01 -0000	1.108
+++ .cvsignore	28 Sep 2009 13:26:23 -0000	1.109
@@ -1 +1 @@
-system-config-date-1.9.49.tar.bz2
+system-config-date-1.9.50.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	14 Sep 2009 13:09:01 -0000	1.120
+++ sources	28 Sep 2009 13:26:23 -0000	1.121
@@ -1 +1 @@
-c0a537c04cd685fd534672f155bd8c3a  system-config-date-1.9.49.tar.bz2
+287321c637325217d66f4c5a2785c5de  system-config-date-1.9.50.tar.bz2



From nphilipp at fedoraproject.org  Mon Sep 28 13:29:02 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:29:02 +0000 (UTC)
Subject: rpms/system-config-nfs/devel .cvsignore, 1.54, 1.55 sources, 1.62, 
	1.63 system-config-nfs.spec, 1.69, 1.70
Message-ID: <20090928132902.ADB1A11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20255

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
version 1.3.49


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	2 Sep 2009 08:56:28 -0000	1.54
+++ .cvsignore	28 Sep 2009 13:29:02 -0000	1.55
@@ -1 +1 @@
-system-config-nfs-1.3.48.tar.bz2
+system-config-nfs-1.3.49.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	2 Sep 2009 08:56:28 -0000	1.62
+++ sources	28 Sep 2009 13:29:02 -0000	1.63
@@ -1 +1 @@
-5bc0cb00b01d4b0c4a099fa37e8080fa  system-config-nfs-1.3.48.tar.bz2
+7d0de15f41e0f34a82e30c09c696efb7  system-config-nfs-1.3.49.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- system-config-nfs.spec	2 Sep 2009 08:56:28 -0000	1.69
+++ system-config-nfs.spec	28 Sep 2009 13:29:02 -0000	1.70
@@ -8,7 +8,7 @@
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.48
+Version: 1.3.49
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -85,6 +85,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.3.49-1
+- pick up new translations
+
 * Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.3.48-1
 - initialize gettext correctly
 



From nphilipp at fedoraproject.org  Mon Sep 28 13:31:18 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:31:18 +0000 (UTC)
Subject: rpms/system-config-date/devel system-config-date.spec,1.128,1.129
Message-ID: <20090928133118.ADA3B11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20864

Modified Files:
	system-config-date.spec 
Log Message:
version 1.9.50


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- system-config-date.spec	14 Sep 2009 13:09:01 -0000	1.128
+++ system-config-date.spec	28 Sep 2009 13:31:17 -0000	1.129
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.49
+Version: 1.9.50
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.50-1
+- pick up new translations
+
 * Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.9.49-1
 - pick up updated translations
 



From pkgdb at fedoraproject.org  Mon Sep 28 13:31:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 13:31:31 +0000
Subject: [pkgdb] wavextract ownership updated
Message-ID: <20090928133131.C9E1710F857@bastion2.fedora.phx.redhat.com>

Package wavextract in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/wavextract



From pkgdb at fedoraproject.org  Mon Sep 28 13:31:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 13:31:34 +0000
Subject: [pkgdb] wavextract ownership updated
Message-ID: <20090928133135.0088710F888@bastion2.fedora.phx.redhat.com>

Package wavextract in Fedora 10 is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/wavextract



From pkgdb at fedoraproject.org  Mon Sep 28 13:31:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 13:31:35 +0000
Subject: [pkgdb] wavextract ownership updated
Message-ID: <20090928133135.B89FE10F88C@bastion2.fedora.phx.redhat.com>

Package wavextract in Fedora 11 is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/wavextract



From than at fedoraproject.org  Mon Sep 28 13:33:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 28 Sep 2009 13:33:07 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.242,1.243
Message-ID: <20090928133307.8712911C00E4@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21958

Modified Files:
	kdebindings.spec 
Log Message:
rhel cleanup



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- kdebindings.spec	3 Sep 2009 21:55:13 -0000	1.242
+++ kdebindings.spec	28 Sep 2009 13:33:07 -0000	1.243
@@ -24,6 +24,15 @@
 %define pykde4_akonadi 1
 %define pyqt4_version 4.5.2
 
+%if 0%{?rhel}
+%define falcon 0
+%define php 0
+%define ruby 0
+%define smoke 0
+%define java 0
+%define csharp 0
+%endif
+
 %if 0%{?ruby}%{?smoke}
 %define devel 1
 %endif
@@ -36,7 +45,7 @@
 
 Name: kdebindings
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -66,7 +75,9 @@ BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
+%if 0%{?fedora}
 BuildRequires:  qscintilla-devel >= 2.4
+%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
@@ -515,6 +526,9 @@ fi
 
 
 %changelog
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
+- rhel cleanup
+
 * Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - also disable polkit-qt on EL6+
 - also remove polkit-qt sip files and examples on F12+/EL6+



From rdieter at fedoraproject.org  Mon Sep 28 13:33:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 28 Sep 2009 13:33:30 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.61, 1.62 linguist.desktop, 1.3,
	1.4 qt.spec, 1.329, 1.330 sources, 1.63, 1.64
Message-ID: <20090928133330.5757111C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22249

Modified Files:
	.cvsignore linguist.desktop qt.spec sources 
Log Message:
* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-20
- use internal Qt Assistant/Designer icons
- -devel: move designer.qch,linguist.qch here
- move ownership of %_qt4_docdir, %_qt4_docdir/qch to main pkg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	20 Sep 2009 23:32:08 -0000	1.61
+++ .cvsignore	28 Sep 2009 13:33:29 -0000	1.62
@@ -9,6 +9,3 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-ox16-app-designer.png
-ox32-app-designer.png
-ox48-app-designer.png


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linguist.desktop	14 Jun 2008 02:32:46 -0000	1.3
+++ linguist.desktop	28 Sep 2009 13:33:30 -0000	1.4
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist4
+Icon=linguist
 MimeType=application/x-linguist;
 Terminal=false
 Encoding=UTF-8


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -r1.329 -r1.330
--- qt.spec	20 Sep 2009 23:32:09 -0000	1.329
+++ qt.spec	28 Sep 2009 13:33:30 -0000	1.330
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -87,11 +87,6 @@ Source24: qtconfig.desktop
 Source30: hi128-app-qt4-logo.png
 Source31: hi48-app-qt4-logo.png
 
-# copied from kdebase-4.3.1
-Source33: ox16-app-designer.png
-Source34: ox32-app-designer.png
-Source35: ox48-app-designer.png
-
 ## BOOTSTRAPPING, undef docs, demos, examples, phonon, webkit
 
 ## optional plugin bits
@@ -584,14 +579,15 @@ install -p -m644 -D %{SOURCE4} %{buildro
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
-# designer icon(s)
-install -p -m644 -D %{SOURCE33} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/designer.png
-install -p -m644 -D %{SOURCE34} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/designer.png
-install -p -m644 -D %{SOURCE35} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/designer.png
+# assistant icons
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant.png
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant.png
+# designer icons
+install -p -m644 -D tools/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer.png
 # linguist icons
 for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
-  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
+  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist.png
 done
 
 # Qt.pc
@@ -727,6 +723,10 @@ fi
 %else
 %dir %{_qt4_datadir}
 %endif
+%if 0%{?docs}
+%dir %{_qt4_docdir}
+%dir %{_qt4_docdir}/qch/
+%endif
 %if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
 %dir %{_qt4_sysconfdir}
 %endif
@@ -824,22 +824,26 @@ fi
 # Qt designer
 %{_qt4_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
-%{_datadir}/icons/hicolor/*/apps/designer.*
+%{_datadir}/icons/hicolor/*/apps/designer*
+%{?docs:%{_qt4_docdir}/qch/designer.qch}
 # Qt Linguist
 %{_qt4_bindir}/linguist*
 %{_datadir}/applications/*linguist.desktop
-%{_datadir}/icons/hicolor/*/apps/linguist4.*
+%{_datadir}/icons/hicolor/*/apps/linguist*
+%{?docs:%{_qt4_docdir}/qch/linguist.qch}
 
 %if 0%{?docs}
 %files doc
 %defattr(-,root,root,-)
-%dir %{_qt4_docdir}/
 %{_qt4_docdir}/html
-%{_qt4_docdir}/qch/
+%{_qt4_docdir}/qch/*.qch
+%exclude %{_qt4_docdir}/qch/designer.qch
+%exclude %{_qt4_docdir}/qch/linguist.qch
 %{_qt4_docdir}/src/
 #{_qt4_prefix}/doc
 # Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant.desktop
+%{_datadir}/icons/hicolor/*/apps/assistant*
 %endif
 
 %if 0%{?examples}
@@ -902,6 +906,11 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-20
+- use internal Qt Assistant/Designer icons
+- -devel: move designer.qch,linguist.qch here
+- move ownership of %%_qt4_docdir, %%_qt4_docdir/qch to main pkg
+
 * Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-19
 - Missing Qt Designer icon (#476605)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	20 Sep 2009 23:32:09 -0000	1.63
+++ sources	28 Sep 2009 13:33:30 -0000	1.64
@@ -8,6 +8,3 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-d75b300d1b89dab6f56b6f6b3669d62b  ox16-app-designer.png
-af2df60aa84a51b3905e95d69ff8a6bf  ox32-app-designer.png
-75f64f8b4a130ac0e19f5f9149e1d63a  ox48-app-designer.png



From nphilipp at fedoraproject.org  Mon Sep 28 13:33:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 28 Sep 2009 13:33:58 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.80, 1.81 sources, 1.89,
	1.90 system-config-users.spec, 1.97, 1.98
Message-ID: <20090928133358.AD76211C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22497

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.94


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	16 Sep 2009 12:53:16 -0000	1.80
+++ .cvsignore	28 Sep 2009 13:33:58 -0000	1.81
@@ -1 +1 @@
-system-config-users-1.2.93.tar.bz2
+system-config-users-1.2.94.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	16 Sep 2009 12:53:17 -0000	1.89
+++ sources	28 Sep 2009 13:33:58 -0000	1.90
@@ -1 +1 @@
-e2261b183bd97a738ac099165be3bb30  system-config-users-1.2.93.tar.bz2
+80238aeb8c8e1827e2d720922edf1986  system-config-users-1.2.94.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- system-config-users.spec	16 Sep 2009 12:53:17 -0000	1.97
+++ system-config-users.spec	28 Sep 2009 13:33:58 -0000	1.98
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.93
+Version: 1.2.94
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -127,6 +127,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.94-1
+- pick up new translations
+
 * Wed Sep 16 2009 Nils Philippsen <nils at redhat.com> - 1.2.93-1
 - remove simple files as well as directories
 - don't use deprecated gtk.Label.set_use_markup()



From rhughes at fedoraproject.org  Mon Sep 28 13:36:27 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 28 Sep 2009 13:36:27 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.58, 1.59 PackageKit.spec, 1.119,
	1.120 sources, 1.59, 1.60
Message-ID: <20090928133627.F229D11C00E4@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23362

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090928git
- Update to a newer git snapshot from the 0.5.x series.
- Fixes command-not-found functionality
- Lots of updated translations
- Lots of updates and bugfixes to the experimental glib2 library



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	21 Sep 2009 12:04:24 -0000	1.58
+++ .cvsignore	28 Sep 2009 13:36:27 -0000	1.59
@@ -1 +1 @@
-PackageKit-0.5.3-20090921.tar.gz
+PackageKit-0.5.3-20090928.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- PackageKit.spec	21 Sep 2009 12:04:24 -0000	1.119
+++ PackageKit.spec	28 Sep 2009 13:36:27 -0000	1.120
@@ -3,7 +3,7 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090921
+%define alphatag			20090928
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -448,6 +448,12 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090928git
+- Update to a newer git snapshot from the 0.5.x series.
+- Fixes command-not-found functionality
+- Lots of updated translations
+- Lots of updates and bugfixes to the experimental glib2 library
+
 * Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090921git
 - Update to a newer git snapshot from the 0.5.x series.
 - Updates to the experimental glib2 bindings


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	21 Sep 2009 12:04:24 -0000	1.59
+++ sources	28 Sep 2009 13:36:27 -0000	1.60
@@ -1 +1 @@
-b6711dbe4d77d91f9b9fcf8ef00ed102  PackageKit-0.5.3-20090921.tar.gz
+c9d457d6a75ea9b376d6541cec210e88  PackageKit-0.5.3-20090928.tar.gz



From ssp at fedoraproject.org  Mon Sep 28 13:52:56 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Mon, 28 Sep 2009 13:52:56 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.28, 1.29 pixman.spec, 1.43,
	1.44 sources, 1.30, 1.31
Message-ID: <20090928135256.5D57F11C00E4@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28829

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
Pixman 0.16.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	28 Aug 2009 13:05:06 -0000	1.28
+++ .cvsignore	28 Sep 2009 13:52:56 -0000	1.29
@@ -2,3 +2,4 @@ pixman-0.15.18.tar.bz2
 pixman-0.15.20.tar.gz
 pixman-0.15.20.tar.bz2
 pixman-0.16.0.tar.bz2
+pixman-0.16.2.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- pixman.spec	28 Aug 2009 13:05:06 -0000	1.43
+++ pixman.spec	28 Sep 2009 13:52:56 -0000	1.44
@@ -2,7 +2,7 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.16.0
+Version:        0.16.2
 Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
@@ -61,7 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
-* Mon Aug 28 2009 Soren Sandmann <ssp at redhat.com> - 0.16.0-1
+* Mon Sep 28 2009 Soren Sandmann <ssp at redhat.com> - 0.16.2-1
+- pixman 0.16.2
+
+* Fri Aug 28 2009 Soren Sandmann <ssp at redhat.com> - 0.16.0-1
 - pixman 0.16.0
 
 * Mon Aug 11 2009 Soren Sandmann <ssp at redhat.com> - 0.15.20-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	28 Aug 2009 13:05:06 -0000	1.30
+++ sources	28 Sep 2009 13:52:56 -0000	1.31
@@ -2,3 +2,4 @@
 613c95e7ddc8069b7aa2708f93219b7d  pixman-0.15.20.tar.gz
 8cca7bdf45bd3c31cf95ecea0f05bddc  pixman-0.15.20.tar.bz2
 183dea8a100c1d9732cdb2146ec90f68  pixman-0.16.0.tar.bz2
+0ce7de6d649f1a80d328b05e403730b6  pixman-0.16.2.tar.bz2



From ndim at fedoraproject.org  Mon Sep 28 13:54:05 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon, 28 Sep 2009 13:54:05 +0000 (UTC)
Subject: rpms/nted/F-11 .cvsignore, 1.12, 1.13 nted.spec, 1.18, 1.19 sources,
	1.12, 1.13
Message-ID: <20090928135405.E0A6C11C00E4@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29297

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
- update to upstream's nted-1.8.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Jul 2009 12:27:35 -0000	1.12
+++ .cvsignore	28 Sep 2009 13:54:05 -0000	1.13
@@ -1 +1 @@
-nted-1.6.2.tar.gz
+nted-1.8.1.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nted.spec	27 Jul 2009 12:27:35 -0000	1.18
+++ nted.spec	28 Sep 2009 13:54:05 -0000	1.19
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.6.2
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
+- update to upstream's nted-1.8.1 release
+
 * Mon Jul 27 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.6.2-1
 - update to bugfix release 1.6.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Jul 2009 12:27:35 -0000	1.12
+++ sources	28 Sep 2009 13:54:05 -0000	1.13
@@ -1 +1 @@
-dd4290b9e5d8f513d37772cb801e636f  nted-1.6.2.tar.gz
+eb3fda356ddb8c3686926d201d04adc7  nted-1.8.1.tar.gz



From julian at fedoraproject.org  Mon Sep 28 14:09:46 2009
From: julian at fedoraproject.org (julian)
Date: Mon, 28 Sep 2009 14:09:46 +0000 (UTC)
Subject: rpms/entertainer/devel entertainer.spec,1.2,1.3
Message-ID: <20090928140946.4D53311C00E4@cvs1.fedora.phx.redhat.com>

Author: julian

Update of /cvs/pkgs/rpms/entertainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2664/devel

Modified Files:
	entertainer.spec 
Log Message:
Issued update for rawhide due to dependency problems (needs to require the pyclutter subpackages)



Index: entertainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/entertainer/devel/entertainer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- entertainer.spec	23 Aug 2009 12:29:55 -0000	1.2
+++ entertainer.spec	28 Sep 2009 14:09:46 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		entertainer
 Version:	0.4.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A simple mediacenter based on clutter
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -36,8 +36,10 @@ Requires:	python-eyed3
 #We need python-storm-sqlite because python-storm pulls in the mysql backend by default
 Requires:	python-storm-sqlite
 Requires:	python-twisted
-#The pyclutter-cairo subpackage was removed and we need all pyclutter subpackages anyway
+#We need the python clutter bindings
 Requires:	pyclutter
+Requires:	pyclutter-gtk
+Requires:	pyclutter-gst
 #Needed for hicolor directory ownership
 Requires:	hicolor-icon-theme
 
@@ -133,6 +135,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 #Icon Cache updated
 
 %changelog
+* Mon Sep 28 2009 Julian Aloofi <julian at, fedoraproject.org> 0.4.2-7
+- Added explicit Requires for the pyclutter subpackages due to problems with the package in Rawhide
+
+
 * Sun Aug 23 2009 Julian Aloofi <julian at, fedoraproject.org> 0.4.2-6
 - Requires the whole pyclutter package now due to the cairo subpackage removal
 



From rhughes at fedoraproject.org  Mon Sep 28 14:12:02 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 28 Sep 2009 14:12:02 +0000 (UTC)
Subject: rpms/sound-juicer/devel
	sound-juicer-2.28.0-use-gnome-session-inhibit.patch, NONE,
	1.1 sound-juicer.spec, 1.121, 1.122
Message-ID: <20090928141202.F031411C00E4@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4476

Modified Files:
	sound-juicer.spec 
Added Files:
	sound-juicer-2.28.0-use-gnome-session-inhibit.patch 
Log Message:
* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-3
- Apply a patch from upstream to inhibit gnome-session, rather than
  gnome-power-manager. This fixes a warning on rawhide when using sound-juicer.


sound-juicer-2.28.0-use-gnome-session-inhibit.patch:
 sj-extracting.c |    4 +++-
 sj-inhibit.c    |   16 +++++++++-------
 sj-inhibit.h    |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE sound-juicer-2.28.0-use-gnome-session-inhibit.patch ---
diff --git a/src/sj-extracting.c b/src/sj-extracting.c
index e44a589..b7118b1 100644
--- a/src/sj-extracting.c
+++ b/src/sj-extracting.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #include <brasero-volume.h>
 #include <canberra-gtk.h>
@@ -821,7 +822,8 @@ on_extract_activate (GtkWidget *button, gpointer user_data)
   }
   
   cookie = sj_inhibit (g_get_application_name (),
-                       _("Extracting audio from CD"));
+                       _("Extracting audio from CD"),
+                       GDK_WINDOW_XID(main_window->window));
 
   /* Save the genre */
   save_genre (genre_entry);
diff --git a/src/sj-inhibit.c b/src/sj-inhibit.c
index 7fc60e0..fc804d2 100644
--- a/src/sj-inhibit.c
+++ b/src/sj-inhibit.c
@@ -26,13 +26,13 @@
 #include "sj-inhibit.h"
  
 /* PowerManagent defines */
-#define	PM_DBUS_SERVICE    "org.freedesktop.PowerManagement"
-#define	PM_DBUS_INHIBIT_PATH   "/org/freedesktop/PowerManagement/Inhibit"
-#define	PM_DBUS_INHIBIT_INTERFACE    "org.freedesktop.PowerManagement.Inhibit"
+#define	PM_DBUS_SERVICE    "org.gnome.SessionManager"
+#define	PM_DBUS_INHIBIT_PATH   "/org/gnome/SessionManager"
+#define	PM_DBUS_INHIBIT_INTERFACE    "org.gnome.SessionManager"
 
 /** cookie is returned as an unsigned integer */
 guint
-sj_inhibit (const gchar * appname, const gchar * reason)
+sj_inhibit (const gchar * appname, const gchar * reason, guint xid)
 {
   gboolean res;
   guint cookie;
@@ -60,8 +60,10 @@ sj_inhibit (const gchar * appname, const gchar * reason)
 
   res = dbus_g_proxy_call (proxy,
 			    "Inhibit", &error,
-			    G_TYPE_STRING, appname,
+			    G_TYPE_STRING, appname, /* app-id */
+			    G_TYPE_UINT, xid,
 			    G_TYPE_STRING, reason,
+			    G_TYPE_UINT, 4+8, /* flags, inhibit being marked idle and allowing suspend */
 			    G_TYPE_INVALID,
 			    G_TYPE_UINT, &cookie,
                             G_TYPE_INVALID);
@@ -116,7 +118,7 @@ sj_uninhibit (guint cookie)
   }
 
   res = dbus_g_proxy_call (proxy,
-			    "UnInhibit",
+			    "Uninhibit",
 			    &error,
 			    G_TYPE_UINT, cookie,
 			    G_TYPE_INVALID,
@@ -124,7 +126,7 @@ sj_uninhibit (guint cookie)
 
   /* check the return value */
   if (!res) {
-    g_warning ("UnInhibit method failed");
+    g_warning ("Uninhibit method failed");
   }
 
   /* check the error value */
diff --git a/src/sj-inhibit.h b/src/sj-inhibit.h
index b93fbf9..3498cfe 100644
--- a/src/sj-inhibit.h
+++ b/src/sj-inhibit.h
@@ -25,7 +25,7 @@
 
 #include <glib.h>
  
-guint sj_inhibit (const gchar * appname, const gchar * reason);
+guint sj_inhibit (const gchar * appname, const gchar * reason, guint xid);
 void sj_uninhibit (guint cookie);
 
 #endif /* SJ_INHIBIT_H */


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sound-juicer.spec	25 Sep 2009 09:01:00 -0000	1.121
+++ sound-juicer.spec	28 Sep 2009 14:11:58 -0000	1.122
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
@@ -40,6 +40,9 @@ BuildRequires:  gnome-common
 BuildRequires:  automake autoconf libtool
 BuildRequires:  desktop-file-utils
 
+# already upstream, bfc60ae0bc2e8e41a234f4017600088b22af13d6
+Patch0: sound-juicer-2.28.0-use-gnome-session-inhibit.patch
+
 ExcludeArch: s390 s390x
 
 %description
@@ -47,6 +50,7 @@ GStreamer-based CD ripping tool. Saves a
 
 %prep
 %setup -q
+%patch0 -p1 -b .inhibit-gnome-session
 
 %build
 # work around a gstreamer problem where it
@@ -125,6 +129,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-3
+- Apply a patch from upstream to inhibit gnome-session, rather than
+  gnome-power-manager. This fixes a warning on rawhide when using sound-juicer.
+
 * Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
 - Remove old libmusicbrainz BR
 



From astokes at fedoraproject.org  Mon Sep 28 14:21:54 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 28 Sep 2009 14:21:54 +0000 (UTC)
Subject: rpms/sos/F-10 sos.spec,1.11,1.12 sources,1.10,1.11
Message-ID: <20090928142154.08CF011C00E4@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9139

Modified Files:
	sos.spec sources 
Log Message:
resolves rhbz:523274


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sos.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sos.spec	14 Sep 2009 16:41:50 -0000	1.11
+++ sos.spec	28 Sep 2009 14:21:51 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -53,7 +53,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
+* Mon Sep 28 2009 Adam Stokes <ajs at redhat dot com> - 1.8-17
+- resolves: rhbz523274 crash on nooptionerror
+- more translations added
+
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> - 1.8-16
 - Update rh-upload-core to rh-upload and allows general files
 - Fix cluster plugin with pwd mangling invalidating xml
 - Cluster support detecting invalid fence_id and fence states
@@ -62,7 +66,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14
+* Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> - 1.8-14
 - resolves: rhbz512536 wrong group in spec file
 - resolves: rhbz498398 A series of refactoring patches to sos
 - resolves: rhbz501149 A series of refactoring patches to sos (2)
@@ -70,7 +74,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - resolves: rhbz502455 tricking sosreport into rm -rf /
 - resolves: rhbz501146 branding in fedora
 
-* Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> = 1.8-13
+* Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> - 1.8-13
 - Add requirements for tar,bzip2 during minimal installs
 - More merges from reports against RHEL version of plugins
 - Remove unecessary definition of localdir in spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	14 Sep 2009 16:41:50 -0000	1.10
+++ sources	28 Sep 2009 14:21:52 -0000	1.11
@@ -1 +1 @@
-f2a05a90adfc4799ff65425488c5ae16  sos-1.8.tar.gz
+93e11b5e09ec9305ed1b021208f2ce0d  sos-1.8.tar.gz



From astokes at fedoraproject.org  Mon Sep 28 14:22:45 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 28 Sep 2009 14:22:45 +0000 (UTC)
Subject: rpms/sos/F-11 sos.spec,1.13,1.14 sources,1.9,1.10
Message-ID: <20090928142245.309FE11C00E4@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9705

Modified Files:
	sos.spec sources 
Log Message:
resolves rhbz:523274


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-11/sos.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sos.spec	14 Sep 2009 16:41:23 -0000	1.13
+++ sos.spec	28 Sep 2009 14:22:42 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -53,7 +53,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
+* Mon Sep 28 2009 Adam Stokes <ajs at redhat dot com> - 1.8-17
+- resolves: rhbz523274 crash on nooptionerror
+- more translations added
+
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> - 1.8-16
 - Update rh-upload-core to rh-upload and allows general files
 - Fix cluster plugin with pwd mangling invalidating xml
 - Cluster support detecting invalid fence_id and fence states
@@ -62,7 +66,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14
+* Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> - 1.8-14
 - resolves: rhbz512536 wrong group in spec file
 - resolves: rhbz498398 A series of refactoring patches to sos
 - resolves: rhbz501149 A series of refactoring patches to sos (2)
@@ -70,7 +74,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - resolves: rhbz502455 tricking sosreport into rm -rf /
 - resolves: rhbz501146 branding in fedora
 
-* Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> = 1.8-13
+* Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> - 1.8-13
 - Add requirements for tar,bzip2 during minimal installs
 - More merges from reports against RHEL version of plugins
 - Remove unecessary definition of localdir in spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Sep 2009 16:41:23 -0000	1.9
+++ sources	28 Sep 2009 14:22:43 -0000	1.10
@@ -1 +1 @@
-f2a05a90adfc4799ff65425488c5ae16  sos-1.8.tar.gz
+93e11b5e09ec9305ed1b021208f2ce0d  sos-1.8.tar.gz



From astokes at fedoraproject.org  Mon Sep 28 14:23:47 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 28 Sep 2009 14:23:47 +0000 (UTC)
Subject: rpms/sos/devel sos.spec,1.14,1.15 sources,1.9,1.10
Message-ID: <20090928142347.9DEB811C00E4@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10239

Modified Files:
	sos.spec sources 
Log Message:
resolves rhbz523274


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sos.spec	14 Sep 2009 15:29:53 -0000	1.14
+++ sos.spec	28 Sep 2009 14:23:47 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -53,7 +53,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
+* Mon Sep 28 2009 Adam Stokes <ajs at redhat dot com> - 1.8-17
+- resolves: rhbz523274 crash on nooptionerror
+- more translations added
+
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> - 1.8-16
 - Update rh-upload-core to rh-upload and allows general files
 - Fix cluster plugin with pwd mangling invalidating xml
 - Cluster support detecting invalid fence_id and fence states
@@ -62,7 +66,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14
+* Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> - 1.8-14
 - resolves: rhbz512536 wrong group in spec file
 - resolves: rhbz498398 A series of refactoring patches to sos
 - resolves: rhbz501149 A series of refactoring patches to sos (2)
@@ -70,7 +74,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - resolves: rhbz502455 tricking sosreport into rm -rf /
 - resolves: rhbz501146 branding in fedora
 
-* Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> = 1.8-13
+* Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> - 1.8-13
 - Add requirements for tar,bzip2 during minimal installs
 - More merges from reports against RHEL version of plugins
 - Remove unecessary definition of localdir in spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Sep 2009 15:29:53 -0000	1.9
+++ sources	28 Sep 2009 14:23:47 -0000	1.10
@@ -1 +1 @@
-f2a05a90adfc4799ff65425488c5ae16  sos-1.8.tar.gz
+93e11b5e09ec9305ed1b021208f2ce0d  sos-1.8.tar.gz



From spot at fedoraproject.org  Mon Sep 28 14:33:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 14:33:10 +0000 (UTC)
Subject: rpms/perl-HTML-Tree/EL-4 missing_close_tag.patch, NONE,
	1.1 perl-HTML-Tree.spec, 1.2, 1.3
Message-ID: <20090928143310.0ED3311C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Tree/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14112/EL-4

Modified Files:
	perl-HTML-Tree.spec 
Added Files:
	missing_close_tag.patch 
Log Message:
fix missing close tag issue (bz 525587)

missing_close_tag.patch:
 Element.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE missing_close_tag.patch ---
diff -ur HTML-Tree-3.23/lib/HTML/Element.pm HTML-Tree-3.23-fix/lib/HTML/Element.pm
--- HTML-Tree-3.23/lib/HTML/Element.pm	2006-11-13 03:13:33.000000000 +1000
+++ HTML-Tree-3.23-fix/lib/HTML/Element.pm	2009-09-23 14:22:12.000000000 +1000
@@ -2041,7 +2041,7 @@
          and ref($this) # sanity
          and not(
                  $this->{'_empty_element'}
-                 || $empty_element_map->{$this->{'_tag'} || ''}
+                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
                 ) # things that don't get post-order callbacks
       ) {
         shift @I;


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tree/EL-4/perl-HTML-Tree.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-Tree.spec	26 Aug 2007 15:53:36 -0000	1.2
+++ perl-HTML-Tree.spec	28 Sep 2009 14:33:09 -0000	1.3
@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        2%{?dist}
+Release:        9%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tree/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
+# Upstream bug filed:
+# https://rt.cpan.org/Ticket/Display.html?id=49932
+Patch0:         missing_close_tag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Parser) >= 2.19
@@ -25,6 +28,7 @@ a separate development track.
 
 %prep
 %setup -q -n HTML-Tree-%{version}
+%patch0 -p1 -b .missing-close-tag
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
 cat << \EOF > %{name}-prov
@@ -59,6 +63,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-9
+- apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-5
+- fix source url
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-4
+- Rebuild for perl 5.10 (again)
+
+* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.23-3
+- rebuild for new perl
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 3.23-2
 - license tag fix
 



From spot at fedoraproject.org  Mon Sep 28 14:33:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 14:33:10 +0000 (UTC)
Subject: rpms/perl-HTML-Tree/EL-5 missing_close_tag.patch, NONE,
	1.1 perl-HTML-Tree.spec, 1.10, 1.11
Message-ID: <20090928143310.3852711C02BD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Tree/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14112/EL-5

Modified Files:
	perl-HTML-Tree.spec 
Added Files:
	missing_close_tag.patch 
Log Message:
fix missing close tag issue (bz 525587)

missing_close_tag.patch:
 Element.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE missing_close_tag.patch ---
diff -ur HTML-Tree-3.23/lib/HTML/Element.pm HTML-Tree-3.23-fix/lib/HTML/Element.pm
--- HTML-Tree-3.23/lib/HTML/Element.pm	2006-11-13 03:13:33.000000000 +1000
+++ HTML-Tree-3.23-fix/lib/HTML/Element.pm	2009-09-23 14:22:12.000000000 +1000
@@ -2041,7 +2041,7 @@
          and ref($this) # sanity
          and not(
                  $this->{'_empty_element'}
-                 || $empty_element_map->{$this->{'_tag'} || ''}
+                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
                 ) # things that don't get post-order callbacks
       ) {
         shift @I;


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tree/EL-5/perl-HTML-Tree.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-HTML-Tree.spec	26 Aug 2007 15:53:39 -0000	1.10
+++ perl-HTML-Tree.spec	28 Sep 2009 14:33:10 -0000	1.11
@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        2%{?dist}
+Release:        9%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tree/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
+# Upstream bug filed:
+# https://rt.cpan.org/Ticket/Display.html?id=49932
+Patch0:         missing_close_tag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Parser) >= 2.19
@@ -25,6 +28,7 @@ a separate development track.
 
 %prep
 %setup -q -n HTML-Tree-%{version}
+%patch0 -p1 -b .missing-close-tag
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
 cat << \EOF > %{name}-prov
@@ -59,6 +63,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-9
+- apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-5
+- fix source url
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-4
+- Rebuild for perl 5.10 (again)
+
+* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.23-3
+- rebuild for new perl
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 3.23-2
 - license tag fix
 



From spot at fedoraproject.org  Mon Sep 28 14:33:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 14:33:10 +0000 (UTC)
Subject: rpms/perl-HTML-Tree/F-10 missing_close_tag.patch, NONE,
	1.1 perl-HTML-Tree.spec, 1.12, 1.13
Message-ID: <20090928143310.5A9AC11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Tree/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14112/F-10

Modified Files:
	perl-HTML-Tree.spec 
Added Files:
	missing_close_tag.patch 
Log Message:
fix missing close tag issue (bz 525587)

missing_close_tag.patch:
 Element.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE missing_close_tag.patch ---
diff -ur HTML-Tree-3.23/lib/HTML/Element.pm HTML-Tree-3.23-fix/lib/HTML/Element.pm
--- HTML-Tree-3.23/lib/HTML/Element.pm	2006-11-13 03:13:33.000000000 +1000
+++ HTML-Tree-3.23-fix/lib/HTML/Element.pm	2009-09-23 14:22:12.000000000 +1000
@@ -2041,7 +2041,7 @@
          and ref($this) # sanity
          and not(
                  $this->{'_empty_element'}
-                 || $empty_element_map->{$this->{'_tag'} || ''}
+                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
                 ) # things that don't get post-order callbacks
       ) {
         shift @I;


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tree/F-10/perl-HTML-Tree.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-HTML-Tree.spec	28 Feb 2008 13:06:25 -0000	1.12
+++ perl-HTML-Tree.spec	28 Sep 2009 14:33:10 -0000	1.13
@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        4%{?dist}
+Release:        9%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tree/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
+# Upstream bug filed:
+# https://rt.cpan.org/Ticket/Display.html?id=49932
+Patch0:         missing_close_tag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Parser) >= 2.19
@@ -25,6 +28,7 @@ a separate development track.
 
 %prep
 %setup -q -n HTML-Tree-%{version}
+%patch0 -p1 -b .missing-close-tag
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
 cat << \EOF > %{name}-prov
@@ -59,6 +63,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-9
+- apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-5
+- fix source url
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-4
 - Rebuild for perl 5.10 (again)
 



From spot at fedoraproject.org  Mon Sep 28 14:33:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 14:33:10 +0000 (UTC)
Subject: rpms/perl-HTML-Tree/devel missing_close_tag.patch, NONE,
	1.1 perl-HTML-Tree.spec, 1.16, 1.17
Message-ID: <20090928143310.B7C2B11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14112/devel

Modified Files:
	perl-HTML-Tree.spec 
Added Files:
	missing_close_tag.patch 
Log Message:
fix missing close tag issue (bz 525587)

missing_close_tag.patch:
 Element.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE missing_close_tag.patch ---
diff -ur HTML-Tree-3.23/lib/HTML/Element.pm HTML-Tree-3.23-fix/lib/HTML/Element.pm
--- HTML-Tree-3.23/lib/HTML/Element.pm	2006-11-13 03:13:33.000000000 +1000
+++ HTML-Tree-3.23-fix/lib/HTML/Element.pm	2009-09-23 14:22:12.000000000 +1000
@@ -2041,7 +2041,7 @@
          and ref($this) # sanity
          and not(
                  $this->{'_empty_element'}
-                 || $empty_element_map->{$this->{'_tag'} || ''}
+                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
                 ) # things that don't get post-order callbacks
       ) {
         shift @I;


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-HTML-Tree.spec	26 Jul 2009 06:32:18 -0000	1.16
+++ perl-HTML-Tree.spec	28 Sep 2009 14:33:10 -0000	1.17
@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tree/
 Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
+# Upstream bug filed:
+# https://rt.cpan.org/Ticket/Display.html?id=49932
+Patch0:         missing_close_tag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Parser) >= 2.19
@@ -25,6 +28,7 @@ a separate development track.
 
 %prep
 %setup -q -n HTML-Tree-%{version}
+%patch0 -p1 -b .missing-close-tag
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
 cat << \EOF > %{name}-prov
@@ -59,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-9
+- apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Sep 28 14:33:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 14:33:10 +0000 (UTC)
Subject: rpms/perl-HTML-Tree/F-11 missing_close_tag.patch, NONE,
	1.1 perl-HTML-Tree.spec, 1.15, 1.16
Message-ID: <20090928143310.8E54011C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Tree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14112/F-11

Modified Files:
	perl-HTML-Tree.spec 
Added Files:
	missing_close_tag.patch 
Log Message:
fix missing close tag issue (bz 525587)

missing_close_tag.patch:
 Element.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE missing_close_tag.patch ---
diff -ur HTML-Tree-3.23/lib/HTML/Element.pm HTML-Tree-3.23-fix/lib/HTML/Element.pm
--- HTML-Tree-3.23/lib/HTML/Element.pm	2006-11-13 03:13:33.000000000 +1000
+++ HTML-Tree-3.23-fix/lib/HTML/Element.pm	2009-09-23 14:22:12.000000000 +1000
@@ -2041,7 +2041,7 @@
          and ref($this) # sanity
          and not(
                  $this->{'_empty_element'}
-                 || $empty_element_map->{$this->{'_tag'} || ''}
+                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
                 ) # things that don't get post-order callbacks
       ) {
         shift @I;


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tree/F-11/perl-HTML-Tree.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-HTML-Tree.spec	26 Feb 2009 19:59:42 -0000	1.15
+++ perl-HTML-Tree.spec	28 Sep 2009 14:33:10 -0000	1.16
@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tree/
 Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
+# Upstream bug filed:
+# https://rt.cpan.org/Ticket/Display.html?id=49932
+Patch0:         missing_close_tag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Parser) >= 2.19
@@ -25,6 +28,7 @@ a separate development track.
 
 %prep
 %setup -q -n HTML-Tree-%{version}
+%patch0 -p1 -b .missing-close-tag
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
 cat << \EOF > %{name}-prov
@@ -59,6 +63,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-9
+- apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.23-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Sep 28 14:33:46 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 28 Sep 2009 14:33:46 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.28.0-use-devicekit-power.patch, NONE,
	1.1 gdm.spec, 1.488, 1.489
Message-ID: <20090928143346.D298611C00E4@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14700

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.28.0-use-devicekit-power.patch 
Log Message:
* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 1:2.28.0-3
- Add a patch to use DeviceKit-power rather than the removed methods in
  gnome-power-manager.


gdm-2.28.0-use-devicekit-power.patch:
 configure.ac                                  |    7 ++
 gui/simple-greeter/Makefile.am                |    4 +
 gui/simple-greeter/gdm-greeter-login-window.c |   81 +++++---------------------
 3 files changed, 29 insertions(+), 63 deletions(-)

--- NEW FILE gdm-2.28.0-use-devicekit-power.patch ---
>From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Mon, 28 Sep 2009 09:14:33 +0100
Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power

---
 configure.ac                                  |    7 ++
 gui/simple-greeter/Makefile.am                |    4 +
 gui/simple-greeter/gdm-greeter-login-window.c |   84 ++++++-------------------
 3 files changed, 31 insertions(+), 64 deletions(-)

diff --git a/configure.ac b/configure.ac
index 756890a..2cae1cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
 LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
 #FONTCONFIG_REQUIRED_VERSION=2.6.0
 FONTCONFIG_REQUIRED_VERSION=2.5.0
+DEVKIT_POWER_REQUIRED_VERSION=008
 
 EXTRA_COMPILE_WARNINGS(yes)
 
@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF,
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
+PKG_CHECK_MODULES(DEVKIT_POWER,
+        devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION
+)
+AC_SUBST(DEVKIT_POWER_CFLAGS)
+AC_SUBST(DEVKIT_POWER_LIBS)
+
 PKG_CHECK_MODULES(SIMPLE_GREETER,
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index 8c9ae46..4c06bc3 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -18,6 +18,8 @@ AM_CPPFLAGS = \
 	-DSBINDIR=\""$(sbindir)"\"		 	\
 	-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\"	\
 	-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""	\
+	$(DEVKIT_POWER_CFLAGS)				\
+	-DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE	\
 	$(DISABLE_DEPRECATED_CFLAGS)			\
 	$(GTK_CFLAGS)					\
 	$(SIMPLE_GREETER_CFLAGS)			\
@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD =	\
 	libgdmuser.la			\
 	$(COMMON_LIBS)			\
 	$(SIMPLE_GREETER_LIBS)		\
+	$(DEVKIT_POWER_LIBS)		\
 	$(RBAC_LIBS)			\
 	$(NULL)
 
@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = 		\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(RBAC_LIBS)			\
 	$(LIBXKLAVIER_LIBS)		\
+	$(DEVKIT_POWER_LIBS)		\
 	$(NULL)
 
 gladedir = $(pkgdatadir)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index c7ea5d6..7d4ef83 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -56,6 +56,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include <devkit-power-gobject/devicekit-power.h>
+
 #include "gdm-settings-client.h"
 #include "gdm-settings-keys.h"
 #include "gdm-profile.h"
@@ -79,10 +81,6 @@
 #define CK_SEAT_INTERFACE    "org.freedesktop.ConsoleKit.Seat"
 #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
 
-#define GPM_DBUS_NAME      "org.freedesktop.PowerManagement"
-#define GPM_DBUS_PATH      "/org/freedesktop/PowerManagement"
-#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
-
 #define GLADE_XML_FILE       "gdm-greeter-login-window.glade"
 
 #define KEY_GREETER_DIR             "/apps/gdm/simple-greeter"
@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window)
 static gboolean
 can_suspend (GdmGreeterLoginWindow *login_window)
 {
-        DBusGConnection *connection;
-        DBusGProxy      *proxy;
-        GError          *error;
-        gboolean         ret;
-        gboolean         res;
-
-        error = NULL;
-        connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-        if (error != NULL) {
-                g_warning ("Couldn't connect to power manager: %s", error->message);
-                g_error_free (error);
-                return FALSE;
-        }
-        proxy = dbus_g_proxy_new_for_name (connection,
-                                           GPM_DBUS_NAME,
-                                           GPM_DBUS_PATH,
-                                           GPM_DBUS_INTERFACE);
-        ret = FALSE;
-
-        res = dbus_g_proxy_call (proxy, "CanSuspend",
-                                 &error,
-                                 G_TYPE_INVALID,
-                                 G_TYPE_BOOLEAN,
-                                 &ret,
-                                 G_TYPE_INVALID);
-        if (! res) {
-                if (error != NULL) {
-                        g_warning ("Could not ask power manager if user can suspend: %s",
-                                   error->message);
-                        g_error_free (error);
-                }
-                ret = FALSE;
-        }
+        gboolean ret;
+        DkpClient *dkp_client;
 
+        /* use DeviceKit-power to get data */
+        dkp_client = dkp_client_new ();
+        g_object_get (dkp_client,
+                      "can-suspend", &ret,
+                      NULL);
+        g_object_unref (dkp_client);
         return ret;
 }
 
@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window)
 static void
 do_suspend (GdmGreeterLoginWindow *login_window)
 {
-        GError          *error;
-        DBusGConnection *connection;
-        DBusGProxy      *proxy;
+        gboolean ret;
+        DkpClient *dkp_client;
+        GError *error = NULL;
 
-        g_debug ("GdmGreeterLoginWindow: Suspend button clicked");
-
-        error = NULL;
-        connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-        if (error != NULL) {
+        /* use DeviceKit-power to get data */
+        dkp_client = dkp_client_new ();
+        ret = dkp_client_suspend (dkp_client, &error);
+        if (!ret) {
                 g_warning ("Couldn't suspend: %s", error->message);
                 g_error_free (error);
                 return;
         }
-        proxy = dbus_g_proxy_new_for_name (connection,
-                                           GPM_DBUS_NAME,
-                                           GPM_DBUS_PATH,
-                                           GPM_DBUS_INTERFACE);
-        error = NULL;
-        dbus_g_proxy_call (proxy,
-                           "Suspend",
-                           &error,
-                           G_TYPE_INVALID,
-                           G_TYPE_INVALID);
-        if (error != NULL) {
-                g_warning ("Couldn't suspend: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        g_object_unref (proxy);
+        g_object_unref (dkp_client);
 }
 
 static void
-- 
1.6.4.4



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -p -r1.488 -r1.489
--- gdm.spec	25 Sep 2009 19:27:58 -0000	1.488
+++ gdm.spec	28 Sep 2009 14:33:46 -0000	1.489
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -87,6 +87,7 @@ BuildRequires: check-devel
 BuildRequires: iso-codes-devel
 BuildRequires: gnome-panel-devel
 BuildRequires: libxklavier-devel >= 4.0
+BuildRequires: DeviceKit-power-devel >= 008
 
 Provides: service(graphical-login)
 
@@ -94,6 +95,9 @@ Requires: audit-libs >= %{libauditver}
 Patch2: gdm-2.26.0-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596569
+Patch4: gdm-2.28.0-use-devicekit-power.patch
+
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
@@ -141,6 +145,7 @@ The GDM fingerprint plugin provides func
 %setup -q
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
+%patch4 -p1 -b .use-devicekit-power
 %patch13 -p1 -b .system-keyboard
 
 %patch19 -p1 -b .multistack
@@ -394,6 +399,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 1:2.28.0-3
+- Add a patch to use DeviceKit-power rather than the removed methods in
+  gnome-power-manager.
+
 * Fri Sep 25 2009 Ray Strode <rstrode at redhat.com> 1:2.28.0-2
 - Fix autologin
 



From rdieter at fedoraproject.org  Mon Sep 28 14:35:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 28 Sep 2009 14:35:14 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.31, 1.32 kipi-plugins.spec,
	1.100, 1.101 sources, 1.31,
	1.32 kipi-plugins-0.4.0-dt_validation.patch, 1.1,
	NONE kipi-plugins-0.6.0-s390x.patch, 1.1, NONE
Message-ID: <20090928143514.A2D6011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15312

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Removed Files:
	kipi-plugins-0.4.0-dt_validation.patch 
	kipi-plugins-0.6.0-s390x.patch 
Log Message:
* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-1
- kipi-plugins-0.7.0
- -libs pkg, multilib friendly
- use %find_lang



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	29 Aug 2009 17:50:22 -0000	1.31
+++ .cvsignore	28 Sep 2009 14:35:14 -0000	1.32
@@ -1 +1 @@
-kipi-plugins-0.6.0.tar.bz2
+kipi-plugins-0.7.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kipi-plugins.spec	12 Sep 2009 17:42:23 -0000	1.100
+++ kipi-plugins.spec	28 Sep 2009 14:35:14 -0000	1.101
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.6.0
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -11,10 +11,6 @@ Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamed patches
-Patch100: kipi-plugins-0.4.0-dt_validation.patch
-Patch101: kipi-plugins-0.6.0-s390x.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 ## DNG converter
@@ -40,8 +36,9 @@ BuildRequires: expat-devel
 ## RemoveRedeye
 BuildRequires: opencv-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+# when -libs split happened
+Obsoletes: kipi-plugins < 0.7.0
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 ## jpeglossless plugin
 Requires: ImageMagick
@@ -70,13 +67,17 @@ FbExport           : export images to a 
 TimeAdjust         : adjust date and time
 PrintWizard        : print images in various format
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch100 -p1 -b .dt_validation
-%patch101 -p1 -b .s390x
-
 
 %build
 mkdir -p %{_target_platform}
@@ -92,17 +93,7 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-
-## File lists
-touch  %{name}.lang
-# locale's
-for app_file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/*.mo ; do
-   app=$(basename $app_file .mo)
-   # don't repeat
-   [ ! -f ${app}.lang ] && %find_lang ${app}
-done
-
-cat *.lang > %{name}-all.lang
+%find_lang %{name} --all-name --with-kde
 
 ## unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/lib*.so
@@ -118,12 +109,10 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null  ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -137,12 +126,15 @@ update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor >& /dev/null ||:
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
-%files -f %{name}-all.lang
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
-%{_kde4_libdir}/libkipiplugins.so.1*
 %ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %endif
@@ -185,8 +177,17 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkipiplugins.so.1*
+
 
 %changelog
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-1
+- kipi-plugins-0.7.0
+- -libs pkg, multilib friendly
+- use %%find_lang
+
 * Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.6.0-2
 - add endian info for s390, s390x
 - kipiplugin_acquireimages.so is not available as kdegraphics is compiled


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	29 Aug 2009 17:50:22 -0000	1.31
+++ sources	28 Sep 2009 14:35:14 -0000	1.32
@@ -1 +1 @@
-105cc1f802db4b082c0ad8ee31262fd5  kipi-plugins-0.6.0.tar.bz2
+564e766f7afac6169ff0cc591667183c  kipi-plugins-0.7.0.tar.bz2


--- kipi-plugins-0.4.0-dt_validation.patch DELETED ---


--- kipi-plugins-0.6.0-s390x.patch DELETED ---



From ssp at fedoraproject.org  Mon Sep 28 14:45:04 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Mon, 28 Sep 2009 14:45:04 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.130,1.131 comps-f13.xml.in,1.20,1.21
Message-ID: <20090928144504.2339711C00E4@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19293

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Add sysprof to development tools


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- comps-f12.xml.in	28 Sep 2009 10:03:43 -0000	1.130
+++ comps-f12.xml.in	28 Sep 2009 14:45:02 -0000	1.131
@@ -1014,6 +1014,7 @@
       <packagereq type="default">rcs</packagereq>
       <packagereq type="default">subversion</packagereq>
       <packagereq type="default">swig</packagereq>
+      <packagereq type="default">sysprof</packagereq>
       <packagereq type="default">systemtap</packagereq>
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">valgrind</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- comps-f13.xml.in	28 Sep 2009 09:54:20 -0000	1.20
+++ comps-f13.xml.in	28 Sep 2009 14:45:02 -0000	1.21
@@ -1008,6 +1008,7 @@
       <packagereq type="default">rcs</packagereq>
       <packagereq type="default">subversion</packagereq>
       <packagereq type="default">swig</packagereq>
+      <packagereq type="default">sysprof</packagereq>
       <packagereq type="default">systemtap</packagereq>
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">valgrind</packagereq>



From rhughes at fedoraproject.org  Mon Sep 28 14:46:21 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 28 Sep 2009 14:46:21 +0000 (UTC)
Subject: rpms/rhythmbox/devel
	rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch, NONE,
	1.1 rhythmbox.spec, 1.264, 1.265
Message-ID: <20090928144621.7A70E11C00E4@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19848

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch 
Log Message:
* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 0.12.5-2
- Apply a patch from upstream to inhibit gnome-session, rather than
  gnome-power-manager. This fixes a warning on rawhide.


rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch:
 rb-power-manager-plugin.c |   46 +++++++++++++++++++---------------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

--- NEW FILE rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch ---
diff --git a/plugins/power-manager/rb-power-manager-plugin.c b/plugins/power-manager/rb-power-manager-plugin.c
index c8dea1d..b6912e9 100644
--- a/plugins/power-manager/rb-power-manager-plugin.c
+++ b/plugins/power-manager/rb-power-manager-plugin.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * gnome-power-manager integration.
+ * gnome-session integration.
  * currently consists of inhibiting suspend while playing.
  */
 
@@ -35,6 +35,7 @@
 
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
+#include <gdk/gdkx.h>
 
 #include "rb-plugin.h"
 #include "rb-debug.h"
@@ -55,6 +56,7 @@ typedef struct
 	guint32 cookie;
 	gint handler_id;
 	gint timeout_id;
+	RBShell *shell;
 } RBGPMPlugin;
 
 typedef struct
@@ -120,33 +122,15 @@ create_dbus_proxy (RBGPMPlugin *plugin)
 
 	/* try new name first */
 	plugin->proxy = dbus_g_proxy_new_for_name_owner (plugin->bus,
-						   "org.freedesktop.PowerManagement",
-						   "/org/freedesktop/PowerManagement/Inhibit",
-						   "org.freedesktop.PowerManagement.Inhibit",
+						   "org.gnome.SessionManager",
+						   "/org/gnome/SessionManager",
+						   "org.gnome.SessionManager",
 						   &error);
 	if (error != NULL && ignore_error (error) == FALSE) {
-		g_warning ("Failed to create dbus proxy for org.gnome.PowerManager: %s",
+		g_warning ("Failed to create dbus proxy for org.gnome.SessionManager: %s",
 			   error->message);
 		g_error_free (error);
 		return FALSE;
-	} else if (error != NULL) {
-		g_error_free (error);
-		error = NULL;
-
-		/* fall back to original name */
-		plugin->proxy = dbus_g_proxy_new_for_name_owner (plugin->bus,
-							   "org.gnome.PowerManager",
-							   "/org/gnome/PowerManager",
-							   "org.gnome.PowerManager",
-							   &error);
-		if (error != NULL) {
-			if (ignore_error (error) == FALSE) {
-				g_warning ("Failed to create dbus proxy for org.gnome.PowerManager: %s",
-					   error->message);
-			}
-			g_error_free (error);
-			return FALSE;
-		}
 	}
 
 	g_signal_connect_object (plugin->proxy,
@@ -187,10 +171,12 @@ inhibit_cb (DBusGProxy *proxy,
 static gboolean
 inhibit (RBGPMPlugin *plugin)
 {
+	GtkWindow *window;
 	plugin->timeout_id = 0;
+	gulong xid = 0;
 
 	if (plugin->cookie != 0) {
-		rb_debug ("Was going to inhibit gnome-power-manager, but we already have done");
+		rb_debug ("Was going to inhibit gnome-session, but we already have done");
 		return FALSE;
 	}
 
@@ -200,12 +186,16 @@ inhibit (RBGPMPlugin *plugin)
 
 	rb_debug ("inhibiting");
 	g_object_ref (plugin);
+	g_object_get (plugin->shell, "window", &window, NULL);
+	xid = GDK_WINDOW_XWINDOW (GTK_WIDGET (window)->window);
 	dbus_g_proxy_begin_call (plugin->proxy, "Inhibit",
 				 (DBusGProxyCallNotify) inhibit_cb,
 				 plugin,
 				 NULL,
-				 G_TYPE_STRING, _("Music Player"),
+				 G_TYPE_STRING, "rhythmbox",
+				 G_TYPE_UINT, xid,
 				 G_TYPE_STRING, _("Playing"),
+				 G_TYPE_UINT, 8, /* flags */
 				 G_TYPE_INVALID);
 
 	return FALSE;
@@ -245,7 +235,7 @@ uninhibit (RBGPMPlugin *plugin)
 	plugin->timeout_id = 0;
 
 	if (plugin->cookie == 0) {
-		rb_debug ("Was going to uninhibit power manager, but we haven't inhibited it");
+		rb_debug ("Was going to uninhibit session manager, but we haven't inhibited it");
 		return FALSE;
 	}
 
@@ -255,7 +245,7 @@ uninhibit (RBGPMPlugin *plugin)
 
 	rb_debug ("uninhibiting; cookie = %u", plugin->cookie);
 	g_object_ref (plugin);
-	dbus_g_proxy_begin_call (plugin->proxy, "UnInhibit",
+	dbus_g_proxy_begin_call (plugin->proxy, "Uninhibit",
 				 (DBusGProxyCallNotify) uninhibit_cb,
 				 plugin,
 				 NULL,
@@ -291,6 +281,7 @@ impl_activate (RBPlugin *rbplugin,
 
 	plugin = RB_GPM_PLUGIN (rbplugin);
 
+	plugin->shell = g_object_ref (shell);
 	plugin->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (plugin->bus == NULL) {
 		g_warning ("Couldn't connect to system bus: %s", (error) ? error->message : "(null)");
@@ -338,6 +329,7 @@ impl_deactivate (RBPlugin *rbplugin,
 		plugin->handler_id = 0;
 	}
 
+	g_object_unref (plugin->shell);
 	g_object_unref (shell_player);
 
 	if (plugin->proxy != NULL) {


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- rhythmbox.spec	18 Sep 2009 13:38:41 -0000	1.264
+++ rhythmbox.spec	28 Sep 2009 14:46:19 -0000	1.265
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -47,6 +47,9 @@ BuildRequires: perl(XML::Parser) intltoo
 
 ExcludeArch:    s390 s390x
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596573
+Patch0: rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -78,6 +81,7 @@ from, and sending media to UPnP/DLNA net
 
 %prep
 %setup -q
+%patch0 -p1 -b .inhibit-gnome-session
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -208,6 +212,10 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 0.12.5-2
+- Apply a patch from upstream to inhibit gnome-session, rather than
+  gnome-power-manager. This fixes a warning on rawhide.
+
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-1
 - Update to 0.12.5
 



From pkgdb at fedoraproject.org  Mon Sep 28 14:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 14:58:44 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090928145844.8BE4D10F85F@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Mon Sep 28 14:58:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 14:58:59 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090928145859.7F23010F888@bastion2.fedora.phx.redhat.com>

Package trac in Fedora 7 is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Mon Sep 28 14:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 14:59:12 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090928145912.7DDF810F85F@bastion2.fedora.phx.redhat.com>

Package trac in Fedora 10 is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Mon Sep 28 14:59:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 14:59:17 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090928145918.1685A10F88B@bastion2.fedora.phx.redhat.com>

Package trac in Fedora 11 is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From tmz at fedoraproject.org  Mon Sep 28 15:01:56 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon, 28 Sep 2009 15:01:56 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.81, 1.82 git.spec, 1.95, 1.96 sources, 
	1.81, 1.82
Message-ID: <20090928150156.6691A11C00E4@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25226

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.5.rc2

Enable Linus' block-sha1 implementation.  This allows git to not link most
binaries with libcrypto (from openssl).  Combined with the upstream changes to
not link to libcurl except when needed, this slims down the git binaries a bit.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	17 Sep 2009 01:47:16 -0000	1.81
+++ .cvsignore	28 Sep 2009 15:01:53 -0000	1.82
@@ -1 +1 @@
-git-1.6.4.4.tar.bz2
+git-1.6.5.rc2.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- git.spec	17 Sep 2009 01:47:17 -0000	1.95
+++ git.spec	28 Sep 2009 15:01:53 -0000	1.96
@@ -1,12 +1,13 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
+%global snap .rc2
 Name:           git
-Version:        1.6.4.4
-Release:        1%{?dist}
+Version:        1.6.5
+Release:        0.2%{?snap}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
 URL:            http://git-scm.com/
-Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
+Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2
 Source1:        git-init.el
 Source2:        git.xinetd
 Source3:        git.conf.httpd
@@ -186,7 +187,7 @@ Requires:       git = %{version}-%{relea
 %endif
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?snap}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -196,6 +197,7 @@ Requires:       git = %{version}-%{relea
 %define make_git \
 make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
      ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
+     BLK_SHA1=1 \\\
      ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
      DESTDIR=$RPM_BUILD_ROOT \\\
      INSTALL="install -p" \\\
@@ -211,7 +213,7 @@ cat << \EOF > %{name}-req
 sed -e '/perl(packed-refs)/d'
 EOF
 
-%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req
 chmod +x %{__perl_requires}
 
 %build
@@ -386,6 +388,10 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Mon Sep 28 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-0.2.rc2
+- git-1.6.5.rc2
+- Enable Linus' block-sha1 implementation
+
 * Wed Sep 16 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.4-1
 - git-1.6.4.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	17 Sep 2009 01:47:17 -0000	1.81
+++ sources	28 Sep 2009 15:01:54 -0000	1.82
@@ -1 +1 @@
-b150352782998ca1f84185e6af53ec26  git-1.6.4.4.tar.bz2
+e9cfec47e38232948dc90188927f7782  git-1.6.5.rc2.tar.bz2



From mtasaka at fedoraproject.org  Mon Sep 28 15:12:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 15:12:38 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.38, 1.39 kazehakase.spec, 1.95, 
	1.96 sources, 1.38, 1.39 kazehakase-0.5.7-rev3832-dbus.patch,
	1.1, NONE
Message-ID: <20090928151238.3574011C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30129

Modified Files:
	.cvsignore kazehakase.spec sources 
Removed Files:
	kazehakase-0.5.7-rev3832-dbus.patch 
Log Message:
* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3859



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	13 Sep 2009 17:45:30 -0000	1.38
+++ .cvsignore	28 Sep 2009 15:12:36 -0000	1.39
@@ -1 +1 @@
-kazehakase-0.5.7-svn3846_trunk.tar.gz
+kazehakase-0.5.7-svn3859_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kazehakase.spec	13 Sep 2009 17:45:30 -0000	1.95
+++ kazehakase.spec	28 Sep 2009 15:12:37 -0000	1.96
@@ -12,11 +12,6 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-# Kill ruby extension for F-13 until it gets compiled
-%if 0%{?fedora} >= 13
-%define		support_ruby	0
-%endif
-
 %define		usesvn		1
 %define		need_autogen	0
 
@@ -36,7 +31,7 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		43338
-%define		svnver		3846_trunk
+%define		svnver		3859_trunk
 
 
 %define		fedorarel	3
@@ -62,7 +57,6 @@ Patch14:	kazehakase-0.5.6-rev3769-embed-
 %if 0%{?fedora} <= 11
 Patch15:	kazehakase-0.5.7-gtk0218.patch
 %endif
-Patch16:	kazehakase-0.5.7-rev3832-dbus.patch
 Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -195,7 +189,6 @@ This package uses WebKit for HTML render
 # Reverse!!
 %patch15 -p0 -b .gtk -R
 %endif
-%patch16 -p0 -b .dbus_mak
 %patch17 -p0 -b .libegg_mak
 
 %if %{need_autogen}
@@ -249,8 +242,13 @@ EOF
 %build
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
+rm -rf builddir ; mkdir builddir
+pushd builddir
+ln -sf ../configure
+
 # --disable-shave is to make build.log more verbose
 %configure \
+	--srcdir=$(pwd)/.. \
 	--disable-shave \
 	--enable-migemo \
 %if %{support_ruby} < 1
@@ -260,11 +258,15 @@ export CFLAGS="%{optflags} -DVERSION_VEN
 	--disable-gtkmozembed
 
 %{__make} %{?_smp_mflags} -k
+popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
+
+pushd builddir
 %{__make} install DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL="%{__install} -c -p"
+popd
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.so
 find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f
@@ -342,8 +344,8 @@ desktop-file-install \
 %endif
 
 %changelog
-* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3846
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3859
 
 * Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
 - Try rev 3832 for new dbus feature


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	13 Sep 2009 17:45:30 -0000	1.38
+++ sources	28 Sep 2009 15:12:37 -0000	1.39
@@ -1 +1 @@
-78ad88120148bf370d040707b23e72ad  kazehakase-0.5.7-svn3846_trunk.tar.gz
+eebb97bac5216d812d864af5ebb22893  kazehakase-0.5.7-svn3859_trunk.tar.gz


--- kazehakase-0.5.7-rev3832-dbus.patch DELETED ---



From rstrode at fedoraproject.org  Mon Sep 28 15:15:16 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 28 Sep 2009 15:15:16 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.489,1.490
Message-ID: <20090928151516.E212F11C00E4@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31674

Modified Files:
	gdm.spec 
Log Message:
- Add cache dir to package manifest



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -p -r1.489 -r1.490
--- gdm.spec	28 Sep 2009 14:33:46 -0000	1.489
+++ gdm.spec	28 Sep 2009 15:15:16 -0000	1.490
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -378,6 +378,7 @@ fi
 %attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.path
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
+%attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
 
 %files user-switch-applet
 %defattr(-, root, root)
@@ -399,6 +400,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-4
+- Add cache dir to package manifest
+
 * Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 1:2.28.0-3
 - Add a patch to use DeviceKit-power rather than the removed methods in
   gnome-power-manager.



From notting at fedoraproject.org  Mon Sep 28 15:24:39 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 28 Sep 2009 15:24:39 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel
	redhat-rpm-config-9.0.3-xz-payload.patch, 
	1.1, 1.2 redhat-rpm-config.spec, 1.75, 1.76
Message-ID: <20090928152439.C33AF11C00E4@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2215

Modified Files:
	redhat-rpm-config-9.0.3-xz-payload.patch 
	redhat-rpm-config.spec 
Log Message:
Drop XZ compression level to 2.

redhat-rpm-config-9.0.3-xz-payload.patch:
 macros |    3 +++
 1 file changed, 3 insertions(+)

Index: redhat-rpm-config-9.0.3-xz-payload.patch
===================================================================
RCS file: /cvs/extras/rpms/redhat-rpm-config/devel/redhat-rpm-config-9.0.3-xz-payload.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- redhat-rpm-config-9.0.3-xz-payload.patch	22 Jul 2009 20:26:37 -0000	1.1
+++ redhat-rpm-config-9.0.3-xz-payload.patch	28 Sep 2009 15:24:39 -0000	1.2
@@ -6,7 +6,7 @@ diff -up redhat-rpm-config-9.0.3/macros.
  %_binary_filedigest_algorithm 8
  
 +# Use XZ compression for binary payloads
-+%_binary_payload w7.xzdio
++%_binary_payload w2.xzdio
 +
  %__find_provides        /usr/lib/rpm/redhat/find-provides
  %__find_requires        /usr/lib/rpm/redhat/find-requires


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- redhat-rpm-config.spec	3 Sep 2009 13:44:22 -0000	1.75
+++ redhat-rpm-config.spec	28 Sep 2009 15:24:39 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 17%{?dist}
+Release: 18%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -50,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Mon Sep 28 2009 Bill Nottingham <notting at redhat.com>
+- Drop xz compression level to 2
+
 * Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
 - Delete *.orig in %%install
 



From jsanders at fedoraproject.org  Mon Sep 28 15:32:02 2009
From: jsanders at fedoraproject.org (Jeremy Sanders)
Date: Mon, 28 Sep 2009 15:32:02 +0000 (UTC)
Subject: rpms/veusz/devel .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 veusz.spec, 
	1.26, 1.27
Message-ID: <20090928153202.ADE3311C00E4@cvs1.fedora.phx.redhat.com>

Author: jsanders

Update of /cvs/pkgs/rpms/veusz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5090

Modified Files:
	.cvsignore sources veusz.spec 
Log Message:
Update to Veusz 1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Jun 2009 19:05:51 -0000	1.7
+++ .cvsignore	28 Sep 2009 15:32:01 -0000	1.8
@@ -1 +1 @@
-veusz-1.4.tar.gz
+veusz-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Jun 2009 19:05:51 -0000	1.8
+++ sources	28 Sep 2009 15:32:01 -0000	1.9
@@ -1 +1 @@
-a8c72b77eb3f2811581fce69805f1336  veusz-1.4.tar.gz
+0d016d55c9af8b95c246f444a2502318  veusz-1.5.tar.gz


Index: veusz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/veusz.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- veusz.spec	27 Jul 2009 06:50:20 -0000	1.26
+++ veusz.spec	28 Sep 2009 15:32:01 -0000	1.27
@@ -3,8 +3,8 @@
 %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
 
 Name:           veusz
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        GUI scientific plotting package
 
 Group:          Applications/Productivity
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/veusz.png
 
 %changelog
+* Mon Sep 28 2009 Jeremy Sanders <jeremy at jeremysanders.net> - 1.5-1
+- Update to Veusz 1.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Sep 28 15:32:15 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 28 Sep 2009 15:32:15 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.56,
	1.57 gnome-packagekit.spec, 1.100, 1.101 sources, 1.57, 1.58
Message-ID: <20090928153215.103D011C00E4@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5347

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-0.1.20090928git
- New snapshot from the gnome-2-28 branch
- Many updated translations.
- Fixes #525810 and #524873



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	21 Sep 2009 12:50:51 -0000	1.56
+++ .cvsignore	28 Sep 2009 15:32:14 -0000	1.57
@@ -1 +1 @@
-gnome-packagekit-2.28.0.tar.bz2
+gnome-packagekit-2.28.1-20090928.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gnome-packagekit.spec	21 Sep 2009 12:50:51 -0000	1.100
+++ gnome-packagekit.spec	28 Sep 2009 15:32:14 -0000	1.101
@@ -8,20 +8,20 @@
 %define devicekit_version		003
 %define devicekit_power_version		007
 %define libcanberra_version		0.10
-#%define alphatag			20090727
+%define alphatag			20090928
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.28.0
-#Release:   0.1.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Version:   2.28.1
+Release:   0.1.%{?alphatag}git%{?dist}
+#Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.bz2
-#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.bz2
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.bz2
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
@@ -88,8 +88,8 @@ Requires: %{name} = %{version}-%{release
 Extra GNOME applications for using PackageKit that are not normally needed.
 
 %prep
-#%setup -q -n %{?name}-%{?version}-%{?alphatag}
-%setup -q
+%setup -q -n %{?name}-%{?version}-%{?alphatag}
+#%setup -q
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -223,6 +223,11 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-0.1.20090928git
+- New snapshot from the gnome-2-28 branch
+- Many updated translations.
+- Fixes #525810 and #524873
+
 * Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
 - New upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	21 Sep 2009 12:50:51 -0000	1.57
+++ sources	28 Sep 2009 15:32:14 -0000	1.58
@@ -1 +1 @@
-fec6038dcf0b295fb3c4e6534f6415bf  gnome-packagekit-2.28.0.tar.bz2
+5ee4201b8d4aad9b0617e4426eb726bf  gnome-packagekit-2.28.1-20090928.tar.gz



From braden at fedoraproject.org  Mon Sep 28 15:33:17 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon, 28 Sep 2009 15:33:17 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.73,1.74
Message-ID: <20090928153317.C176B11C02BD@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5958/devel

Modified Files:
	openvrml.spec 
Log Message:
Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- openvrml.spec	28 Sep 2009 04:29:09 -0000	1.73
+++ openvrml.spec	28 Sep 2009 15:33:17 -0000	1.74
@@ -55,7 +55,7 @@ Group:          Development/Libraries
 Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       libGLU-devel%{?_isa}
+Requires:       mesa-libGLU-devel%{?_isa}
 %description gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -188,6 +188,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-5
+- Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.
+
 * Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-4
 - Arch-independent Requires are not safe for multilib systems when a
   specific architecture is needed.



From braden at fedoraproject.org  Mon Sep 28 15:33:17 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon, 28 Sep 2009 15:33:17 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.69,1.70
Message-ID: <20090928153317.8A70D11C00E4@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5958/F-11

Modified Files:
	openvrml.spec 
Log Message:
Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- openvrml.spec	28 Sep 2009 04:29:08 -0000	1.69
+++ openvrml.spec	28 Sep 2009 15:33:17 -0000	1.70
@@ -55,7 +55,7 @@ Group:          Development/Libraries
 Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       libGLU-devel%{?_isa}
+Requires:       mesa-libGLU-devel%{?_isa}
 %description gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -188,6 +188,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-3
+- Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.
+
 * Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-2
 - Arch-independent Requires are not safe for multilib systems when a
   specific architecture is needed.



From braden at fedoraproject.org  Mon Sep 28 15:33:50 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon, 28 Sep 2009 15:33:50 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.70,1.71
Message-ID: <20090928153350.C632B11C00E4@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6102/F-11

Modified Files:
	openvrml.spec 
Log Message:
Bump release.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- openvrml.spec	28 Sep 2009 15:33:17 -0000	1.70
+++ openvrml.spec	28 Sep 2009 15:33:50 -0000	1.71
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries



From braden at fedoraproject.org  Mon Sep 28 15:33:51 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon, 28 Sep 2009 15:33:51 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.74,1.75
Message-ID: <20090928153351.04C9F11C00E4@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6102/devel

Modified Files:
	openvrml.spec 
Log Message:
Bump release.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- openvrml.spec	28 Sep 2009 15:33:17 -0000	1.74
+++ openvrml.spec	28 Sep 2009 15:33:50 -0000	1.75
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries



From rjones at fedoraproject.org  Mon Sep 28 15:35:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 28 Sep 2009 15:35:05 +0000 (UTC)
Subject: rpms/ocaml-lablgtk/devel .cvsignore, 1.8, 1.9 ocaml-lablgtk.spec,
	1.18, 1.19 sources, 1.8,
	1.9 ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch, 1.1, NONE
Message-ID: <20090928153505.829E111C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6576

Modified Files:
	.cvsignore ocaml-lablgtk.spec sources 
Removed Files:
	ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch 
Log Message:
New upstream 2.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Feb 2009 12:12:38 -0000	1.8
+++ .cvsignore	28 Sep 2009 15:35:05 -0000	1.9
@@ -1 +1 @@
-lablgtk-2.12.0.tar.gz
+lablgtk-2.14.0.tar.gz


Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ocaml-lablgtk.spec	25 Jul 2009 19:58:30 -0000	1.18
+++ ocaml-lablgtk.spec	28 Sep 2009 15:35:05 -0000	1.19
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-lablgtk
-Version:        2.12.0
-Release:        4%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -12,15 +12,13 @@ License:        LGPLv2 with exceptions
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-%{version}.tar.gz
 
-Patch0:         ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 Obsoletes:      lablgtk <= 2.6.0-7
 Provides:       lablgtk = 2.6.0-7
 
-BuildRequires:	ncurses-devel
+BuildRequires:  ncurses-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtkglarea2-devel
@@ -74,8 +72,6 @@ developing applications that use %{name}
 %prep
 %setup -q -n lablgtk-%{version}
 
-%patch0 -p1
-
 # version information in META file is wrong
 perl -pi -e 's|version="1.3.1"|version="%{version}"|' META
 
@@ -124,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/lablgtk2/*.cmi
 %{_libdir}/ocaml/lablgtk2/*.cma
+%{_libdir}/ocaml/lablgtk2/*.cmxs
 %{_libdir}/ocaml/stublibs/*.so
 %{_bindir}/gdk_pixbuf_mlsource
 %{_bindir}/lablgladecc2
@@ -156,6 +153,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-1
+- New upstream version 2.14.0.
+- Patch to fix ml_panel.c is now upstream, so removed.
+- New *.cmxs files (dynamically linked OCaml native code) added to
+  the base package.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Feb 2009 12:12:38 -0000	1.8
+++ sources	28 Sep 2009 15:35:05 -0000	1.9
@@ -1 +1 @@
-0e253128afee3cdc6e9b43c34b35984d  lablgtk-2.12.0.tar.gz
+8a26ab3b749ea86d06b2868112332c33  lablgtk-2.14.0.tar.gz


--- ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch DELETED ---



From rjones at fedoraproject.org  Mon Sep 28 15:44:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 28 Sep 2009 15:44:19 +0000 (UTC)
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.19,1.20
Message-ID: <20090928154419.B77C011C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10656

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
Ignore GtkSourceView2_types dependency (pure type-only *.cmi file).


Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ocaml-lablgtk.spec	28 Sep 2009 15:35:05 -0000	1.19
+++ ocaml-lablgtk.spec	28 Sep 2009 15:44:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgtk
 Version:        2.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -37,7 +37,7 @@ BuildRequires:  gtksourceview-devel
 
 
 %define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i GtkSourceView_types
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i GtkSourceView_types -i GtkSourceView2_types
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 
@@ -153,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-2
+- Ignore GtkSourceView2_types dependency (pure type-only *.cmi file).
+
 * Mon Sep 28 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-1
 - New upstream version 2.14.0.
 - Patch to fix ml_panel.c is now upstream, so removed.



From avesh at fedoraproject.org  Mon Sep 28 15:51:06 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Mon, 28 Sep 2009 15:51:06 +0000 (UTC)
Subject: rpms/pam_ccreds/devel .cvsignore, 1.5,
	1.6 pam_ccreds-3-inst-no-root.patch, 1.1,
	1.2 pam_ccreds-7-no-filename.patch, 1.1, 1.2 pam_ccreds.spec,
	1.27, 1.28 sources, 1.5, 1.6
Message-ID: <20090928155106.1DE3F11C00E4@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/pam_ccreds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13291

Modified Files:
	.cvsignore pam_ccreds-3-inst-no-root.patch 
	pam_ccreds-7-no-filename.patch pam_ccreds.spec sources 
Log Message:
* Mon Sep 28 2009 Avesh Agarwal <avagarwa at redhat.com> - 10-1
- Upgrade to latest upstream
- Updated patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ccreds/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Dec 2007 17:25:05 -0000	1.5
+++ .cvsignore	28 Sep 2009 15:51:04 -0000	1.6
@@ -1 +1,2 @@
 pam_ccreds-7.tar.gz
+pam_ccreds-10.tar.gz

pam_ccreds-3-inst-no-root.patch:
 Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: pam_ccreds-3-inst-no-root.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ccreds/devel/pam_ccreds-3-inst-no-root.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pam_ccreds-3-inst-no-root.patch	18 Jan 2006 15:48:19 -0000	1.1
+++ pam_ccreds-3-inst-no-root.patch	28 Sep 2009 15:51:04 -0000	1.2
@@ -1,6 +1,6 @@
---- pam_ccreds-3/Makefile.am.inst-no-root	2005-10-29 03:21:50.000000000 +0200
-+++ pam_ccreds-3/Makefile.am	2006-01-18 16:35:32.000000000 +0100
-@@ -29,12 +29,12 @@
+--- pam_ccreds-10-orig/Makefile.am	2009-04-02 21:39:32.000000000 -0400
++++ pam_ccreds-10/Makefile.am	2009-09-28 11:17:22.000000000 -0400
+@@ -38,12 +38,12 @@ install-exec-local: pam_ccreds.so
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
  if EXTENSION_SO

pam_ccreds-7-no-filename.patch:
 README |    6 ++++++
 1 file changed, 6 insertions(+)

Index: pam_ccreds-7-no-filename.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ccreds/devel/pam_ccreds-7-no-filename.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pam_ccreds-7-no-filename.patch	5 Dec 2007 17:25:05 -0000	1.1
+++ pam_ccreds-7-no-filename.patch	28 Sep 2009 15:51:04 -0000	1.2
@@ -1,48 +1,5 @@
-diff -up pam_ccreds-7/ccreds_chkpwd.c.no-filename pam_ccreds-7/ccreds_chkpwd.c
---- pam_ccreds-7/ccreds_chkpwd.c.no-filename	2007-11-05 14:24:51.000000000 +0100
-+++ pam_ccreds-7/ccreds_chkpwd.c	2007-12-04 20:46:19.000000000 +0100
-@@ -134,7 +134,6 @@ int main(int argc, char *argv[])
- 	char *user;
- 	char *user_arg;
- 	char *service;
--	char *ccredsfile;
- 
- 	/*
- 	 * Catch or ignore as many signal as possible.
-@@ -167,7 +166,7 @@ int main(int argc, char *argv[])
- 	 */
- 	user = getuidname(getuid());
- 
--	if (argc < 2 || argc > 4) {
-+	if (argc < 2 || argc > 3) {
- 		_log_err(LOG_NOTICE
- 		      ,"inappropriate use of ccreds helper binary [UID=%d,bad argv]"
- 			 ,getuid());
-@@ -180,7 +179,6 @@ int main(int argc, char *argv[])
- 
- 	user_arg = argv[1];
- 	service = (argc > 2) ? argv[2] : NULL;
--	ccredsfile = (argc > 3) ? argv[3] : NULL;
- 
- 	/* Verify that user matches */
-         if (strcmp(user, user_arg)) {
-@@ -197,11 +195,11 @@ int main(int argc, char *argv[])
- 	} else {
- 		if (npass == 0) {
- 			/* the password is blank */
--			retval = _ccreds_verify_password(service, user, ccredsfile, "");
-+			retval = _ccreds_verify_password(service, user, NULL, "");
- 		} else {
- 			/* does pass agree with the official one? */
- 			pass[npass] = '\0';	/* NUL terminate */
--			retval = _ccreds_verify_password(service, user, ccredsfile, pass);
-+			retval = _ccreds_verify_password(service, user, NULL, pass);
- 		}
- 	}
- 	memset(pass, '\0', MAXPASS);	/* clear memory of the password */
-diff -up pam_ccreds-7/README.no-filename pam_ccreds-7/README
---- pam_ccreds-7/README.no-filename	2007-11-05 14:24:51.000000000 +0100
-+++ pam_ccreds-7/README	2007-12-04 20:50:23.000000000 +0100
+--- pam_ccreds-10-orig/README	2009-04-02 21:39:32.000000000 -0400
++++ pam_ccreds-10/README	2009-09-28 11:26:26.000000000 -0400
 @@ -54,6 +54,12 @@ following module options are also recogn
  The "cc_test" and "cc_dump" utilities are also provided;
  cc_dump may be removed in a future version.


Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- pam_ccreds.spec	25 Jul 2009 23:08:49 -0000	1.27
+++ pam_ccreds.spec	28 Sep 2009 15:51:04 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
-Version: 7
-Release: 5%{?dist}
+Version: 10
+Release: 1%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://www.padl.com/OSS/pam_ccreds.html
@@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/cc_dump
 
 %changelog
+* Mon Sep 28 2009 Avesh Agarwal <avagarwa at redhat.com> - 10-1
+- Upgrade to latest upstream
+- Updated patches
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ccreds/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Dec 2007 17:25:05 -0000	1.5
+++ sources	28 Sep 2009 15:51:04 -0000	1.6
@@ -1 +1 @@
-4186f607334432e283c883b11c365ae1  pam_ccreds-7.tar.gz
+21b008071ee8bfb998bd499c0fa92ba1  pam_ccreds-10.tar.gz



From liquidat at fedoraproject.org  Mon Sep 28 16:14:45 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Mon, 28 Sep 2009 16:14:45 +0000 (UTC)
Subject: rpms/audex/devel .cvsignore, 1.3, 1.4 audex.spec, 1.6, 1.7 sources, 
	1.3, 1.4
Message-ID: <20090928161445.6A6EE11C00E4@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/pkgs/rpms/audex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22644

Modified Files:
	.cvsignore audex.spec sources 
Log Message:
Update to v0.72beta1, involving minor bugfixes and google cover fetch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 21:09:45 -0000	1.3
+++ .cvsignore	28 Sep 2009 16:14:44 -0000	1.4
@@ -1 +1 @@
-audex-0.71b5.tar.bz2
+audex-0.72b1.tar.bz2


Index: audex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audex/devel/audex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- audex.spec	23 Sep 2009 07:23:20 -0000	1.6
+++ audex.spec	28 Sep 2009 16:14:45 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           audex
-Version:        0.71
-Release:        0.5.beta5%{?dist}
+Version:        0.72
+Release:        0.1.beta1%{?dist}
 Summary:        Audio ripper
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://opensource.maniatek.de/audex/
-Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b5.tar.bz2
+Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel desktop-file-utils gettext
@@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/kde4/apps/audex
 
 %changelog
+* Mon Sep 28 2009 Roland Wolters <wolters.liste at gmx.net> 0.72-0.1.beta1
+- Update to 0.72.beta1:
+  * Cover fetch from google
+  * Minor bugfixes
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.71-0.5.beta5
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 21:09:46 -0000	1.3
+++ sources	28 Sep 2009 16:14:45 -0000	1.4
@@ -1 +1 @@
-089486abb548a670dc44454e9eb7aee5  audex-0.71b5.tar.bz2
+1953587ebc8e08f5de1eb782ecf92788  audex-0.72b1.tar.bz2



From corsepiu at fedoraproject.org  Mon Sep 28 16:16:16 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 28 Sep 2009 16:16:16 +0000 (UTC)
Subject: rpms/Coin2/devel Coin2.spec,1.42,1.43
Message-ID: <20090928161616.D94F311C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/Coin2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24066

Modified Files:
	Coin2.spec 
Log Message:
* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.5.0-7
- Reflect openal/openal-soft changes.
- Work-around "file" reporting bogus results (BZ 526054).



Index: Coin2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- Coin2.spec	24 Jul 2009 15:05:08 -0000	1.42
+++ Coin2.spec	28 Sep 2009 16:16:16 -0000	1.43
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -7,13 +7,17 @@
 %define coin_includedir %{_includedir}/Coin2
 %define coin_htmldir %{_datadir}/Coin2
 
+%if 0%{fedora} < 12
 %define libopenal_SONAME libopenal.so.0
+%else
+%define libopenal_SONAME libopenal.so.1
+%endif
 %define libsimage_SONAME libsimage.so.20
 
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.5.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2+
 Group: System Environment/Libraries
@@ -68,7 +72,7 @@ for a in $(find . \( -name '*.h' -o -nam
 done
 
 # convert sources to utf-8
-for a in $(find . -type f -exec file {} \; | grep -i iso | sed -e 's,:.*,,'); do \
+for a in $(find . -type f -exec file -i {} \; | grep -i iso | sed -e 's,:.*,,'); do \
   /usr/bin/iconv -f ISO-8859-1 -t utf-8 $a > $a~; \
   mv $a~ $a; \
 done
@@ -108,8 +112,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 /usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/*
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
-install -d -m 755 ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/Coin2
-mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/conf ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/Coin2
+install -d -m 755 ${RPM_BUILD_ROOT}%{_libdir}/Coin2
+mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/conf ${RPM_BUILD_ROOT}%{_libdir}/Coin2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/Coin.pc
 
 %changelog
+* Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.5.0-7
+- Reflect openal/openal-soft changes.
+- Work-around "file" reporting bogus results (BZ 526054).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjames at fedoraproject.org  Mon Sep 28 16:25:29 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 28 Sep 2009 16:25:29 +0000 (UTC)
Subject: rpms/check/F-10 .cvsignore, 1.3, 1.4 check.spec, 1.12, 1.13 sources,
	1.4, 1.5 check-0.9.6-strdup.patch, 1.1, NONE
Message-ID: <20090928162529.AC56A11C00E4@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27560/F-10

Modified Files:
	.cvsignore check.spec sources 
Removed Files:
	check-0.9.6-strdup.patch 
Log Message:
* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
- Update to 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Dec 2008 19:44:50 -0000	1.3
+++ .cvsignore	28 Sep 2009 16:25:29 -0000	1.4
@@ -1 +1 @@
-check-0.9.5.tar.gz
+check-0.9.8.tar.gz


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/check.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- check.spec	6 Aug 2009 15:29:07 -0000	1.12
+++ check.spec	28 Sep 2009 16:25:29 -0000	1.13
@@ -1,11 +1,8 @@
 Name:           check
-Version:        0.9.6
-Release:        3%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        A unit test framework for C
-Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
-# This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
-# usage.  Debian sent this patch upstream already.
-Patch0:         check-0.9.6-strdup.patch
+Source0:        http://downloads.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
@@ -38,7 +35,6 @@ Static libraries of check.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
@@ -78,7 +74,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING.LESSER doc/example
+%doc doc/example
 %{_includedir}/check.h
 %{_libdir}/libcheck.so
 %{_libdir}/pkgconfig/check.pc
@@ -90,6 +86,9 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
+- Update to 0.9.8
+
 * Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
 - Support --excludedocs (bz 515933)
 - Replace broken upstream info dir entry


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 22:08:59 -0000	1.4
+++ sources	28 Sep 2009 16:25:29 -0000	1.5
@@ -1 +1 @@
-6f80cd4a24d14ad706117a7714222420  check-0.9.6.tar.gz
+5d75e9a6027cde79d2c339ef261e7470  check-0.9.8.tar.gz


--- check-0.9.6-strdup.patch DELETED ---



From jjames at fedoraproject.org  Mon Sep 28 16:25:29 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 28 Sep 2009 16:25:29 +0000 (UTC)
Subject: rpms/check/F-11 .cvsignore, 1.4, 1.5 check.spec, 1.13, 1.14 sources,
	1.4, 1.5 check-0.9.6-strdup.patch, 1.1, NONE
Message-ID: <20090928162529.F131D11C00E4@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27560/F-11

Modified Files:
	.cvsignore check.spec sources 
Removed Files:
	check-0.9.6-strdup.patch 
Log Message:
* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
- Update to 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 22:08:59 -0000	1.4
+++ .cvsignore	28 Sep 2009 16:25:29 -0000	1.5
@@ -1 +1 @@
-check-0.9.6.tar.gz
+check-0.9.8.tar.gz


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-11/check.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- check.spec	6 Aug 2009 15:29:07 -0000	1.13
+++ check.spec	28 Sep 2009 16:25:29 -0000	1.14
@@ -1,11 +1,8 @@
 Name:           check
-Version:        0.9.6
-Release:        4%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        A unit test framework for C
-Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
-# This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
-# usage.  Debian sent this patch upstream already.
-Patch0:         check-0.9.6-strdup.patch
+Source0:        http://downloads.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
@@ -38,7 +35,6 @@ Static libraries of check.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
@@ -78,7 +74,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING.LESSER doc/example
+%doc doc/example
 %{_includedir}/check.h
 %{_libdir}/libcheck.so
 %{_libdir}/pkgconfig/check.pc
@@ -90,6 +86,9 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
+- Update to 0.9.8
+
 * Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-4
 - Support --excludedocs (bz 515933)
 - Replace broken upstream info dir entry


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 22:09:00 -0000	1.4
+++ sources	28 Sep 2009 16:25:29 -0000	1.5
@@ -1 +1 @@
-6f80cd4a24d14ad706117a7714222420  check-0.9.6.tar.gz
+5d75e9a6027cde79d2c339ef261e7470  check-0.9.8.tar.gz


--- check-0.9.6-strdup.patch DELETED ---



From jjames at fedoraproject.org  Mon Sep 28 16:25:30 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 28 Sep 2009 16:25:30 +0000 (UTC)
Subject: rpms/check/devel .cvsignore, 1.4, 1.5 check.spec, 1.14, 1.15 sources,
	1.4, 1.5 check-0.9.6-strdup.patch, 1.1, NONE
Message-ID: <20090928162530.5F49A11C00E4@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27560/devel

Modified Files:
	.cvsignore check.spec sources 
Removed Files:
	check-0.9.6-strdup.patch 
Log Message:
* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
- Update to 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 22:08:59 -0000	1.4
+++ .cvsignore	28 Sep 2009 16:25:30 -0000	1.5
@@ -1 +1 @@
-check-0.9.6.tar.gz
+check-0.9.8.tar.gz


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/check.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- check.spec	6 Aug 2009 15:29:07 -0000	1.14
+++ check.spec	28 Sep 2009 16:25:30 -0000	1.15
@@ -1,11 +1,8 @@
 Name:           check
-Version:        0.9.6
-Release:        5%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        A unit test framework for C
-Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
-# This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
-# usage.  Debian sent this patch upstream already.
-Patch0:         check-0.9.6-strdup.patch
+Source0:        http://downloads.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
@@ -38,7 +35,6 @@ Static libraries of check.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
@@ -78,7 +74,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING.LESSER doc/example
+%doc doc/example
 %{_includedir}/check.h
 %{_libdir}/libcheck.so
 %{_libdir}/pkgconfig/check.pc
@@ -90,6 +86,9 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
+- Update to 0.9.8
+
 * Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-5
 - Support --excludedocs (bz 515933)
 - Replace broken upstream info dir entry


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 22:09:00 -0000	1.4
+++ sources	28 Sep 2009 16:25:30 -0000	1.5
@@ -1 +1 @@
-6f80cd4a24d14ad706117a7714222420  check-0.9.6.tar.gz
+5d75e9a6027cde79d2c339ef261e7470  check-0.9.8.tar.gz


--- check-0.9.6-strdup.patch DELETED ---



From liquidat at fedoraproject.org  Mon Sep 28 16:38:35 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Mon, 28 Sep 2009 16:38:35 +0000 (UTC)
Subject: rpms/audex/F-11 .cvsignore, 1.2, 1.3 audex.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090928163835.368E911C00E4@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/pkgs/rpms/audex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31680

Modified Files:
	.cvsignore audex.spec sources 
Log Message:
Update to v0.72-beta1, various bug fxies and google cover fetching.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audex/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 21:26:57 -0000	1.2
+++ .cvsignore	28 Sep 2009 16:38:34 -0000	1.3
@@ -1 +1 @@
-audex-0.71b5.tar.bz2
+audex-0.72b1.tar.bz2


Index: audex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audex/F-11/audex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- audex.spec	1 Jul 2009 21:26:57 -0000	1.3
+++ audex.spec	28 Sep 2009 16:38:35 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           audex
-Version:        0.71
-Release:        0.3.beta5%{?dist}
+Version:        0.72
+Release:        0.1.beta1%{?dist}
 Summary:        Audio ripper
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://opensource.maniatek.de/audex/
-Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b5.tar.bz2
+Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel desktop-file-utils gettext
@@ -34,8 +34,10 @@ make install/fast DESTDIR=%{buildroot} -
 
 %find_lang %{name}
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/audex.desktop
+desktop-file-install \
+    --dir %{buildroot}%{_datadir}/applications/kde4 \
+    --add-category X-AudioVideoImport \
+    %{buildroot}%{_datadir}/applications/kde4/audex.desktop
 
 %post
 update-desktop-database &> /dev/null || :
@@ -64,6 +66,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/kde4/apps/audex
 
 %changelog
+* Mon Sep 28 2009 Roland Wolters <wolters.liste at gmx.net> 0.72-0.1.beta1
+- Update to 0.72.beta1:
+  * Cover fetch from google
+  * Minor bugfixes
+
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.71-0.5.beta5
+- Update desktop file according to F-12 FedoraStudio feature
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71-0.4.beta5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 01 2009 Roland Wolters <wolters.liste at gmx.net> 0.71-0.3.beta5
 - update to upstream version beta5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audex/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 21:26:57 -0000	1.3
+++ sources	28 Sep 2009 16:38:35 -0000	1.4
@@ -1 +1 @@
-089486abb548a670dc44454e9eb7aee5  audex-0.71b5.tar.bz2
+1953587ebc8e08f5de1eb782ecf92788  audex-0.72b1.tar.bz2



From liquidat at fedoraproject.org  Mon Sep 28 16:38:59 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Mon, 28 Sep 2009 16:38:59 +0000 (UTC)
Subject: rpms/audex/F-10 .cvsignore, 1.2, 1.3 audex.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090928163859.2E2B811C00E4@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/pkgs/rpms/audex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31910

Modified Files:
	.cvsignore audex.spec sources 
Log Message:
Update to v0.72-beta1, various bug fxies and google cover fetching.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audex/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 21:27:07 -0000	1.2
+++ .cvsignore	28 Sep 2009 16:38:58 -0000	1.3
@@ -1 +1 @@
-audex-0.71b5.tar.bz2
+audex-0.72b1.tar.bz2


Index: audex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audex/F-10/audex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- audex.spec	1 Jul 2009 21:27:07 -0000	1.3
+++ audex.spec	28 Sep 2009 16:38:58 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           audex
-Version:        0.71
-Release:        0.3.beta5%{?dist}
+Version:        0.72
+Release:        0.1.beta1%{?dist}
 Summary:        Audio ripper
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://opensource.maniatek.de/audex/
-Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b5.tar.bz2
+Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel desktop-file-utils gettext
@@ -34,8 +34,10 @@ make install/fast DESTDIR=%{buildroot} -
 
 %find_lang %{name}
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/audex.desktop
+desktop-file-install \
+    --dir %{buildroot}%{_datadir}/applications/kde4 \
+    --add-category X-AudioVideoImport \
+    %{buildroot}%{_datadir}/applications/kde4/audex.desktop
 
 %post
 update-desktop-database &> /dev/null || :
@@ -64,6 +66,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/kde4/apps/audex
 
 %changelog
+* Mon Sep 28 2009 Roland Wolters <wolters.liste at gmx.net> 0.72-0.1.beta1
+- Update to 0.72.beta1:
+  * Cover fetch from google
+  * Minor bugfixes
+
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.71-0.5.beta5
+- Update desktop file according to F-12 FedoraStudio feature
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71-0.4.beta5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 01 2009 Roland Wolters <wolters.liste at gmx.net> 0.71-0.3.beta5
 - update to upstream version beta5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audex/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 21:27:07 -0000	1.3
+++ sources	28 Sep 2009 16:38:58 -0000	1.4
@@ -1 +1 @@
-089486abb548a670dc44454e9eb7aee5  audex-0.71b5.tar.bz2
+1953587ebc8e08f5de1eb782ecf92788  audex-0.72b1.tar.bz2



From markmc at fedoraproject.org  Mon Sep 28 16:42:19 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 28 Sep 2009 16:42:19 +0000 (UTC)
Subject: rpms/qemu/devel qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch, 
	NONE, 1.1 qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch,
	NONE, 1.1 qemu.spec, 1.133, 1.134
Message-ID: <20090928164219.EBD9A11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1253

Modified Files:
	qemu.spec 
Added Files:
	qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch 
	qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch 
Log Message:
* Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-2
- Fix pci hotplug to not exit if supplied an invalid NIC model (#524022)


qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch:
 hw/pci.c |   25 +++++++++----------------
 net.c    |    6 +++---
 net.h    |    5 ++---
 3 files changed, 14 insertions(+), 22 deletions(-)

--- NEW FILE qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch ---
>From 0ce1af6e7d4b1e2ffa4dedf6d415c4d86a1af490 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru at redhat.com>
Date: Fri, 25 Sep 2009 03:53:50 +0200
Subject: [PATCH] Make it obvious that pci_nic_init() can't fail

Before this patch, pci_nic_init() returns NULL when it can't find the
model in pci_nic_models[].  Except this can't happen, because
qemu_check_nic_model_list() just searched for model in
pci_nic_models[], and terminated the program on failure.

Repeating the search here is pointless.  Instead, change
qemu_check_nic_model_list() to return the model's array index.

Signed-off-by: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com
Fedora-patch: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
---
 hw/pci.c |   25 +++++++++----------------
 net.c    |    6 +++---
 net.h    |    4 ++--
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index a575d4a..eb990f9 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -937,22 +937,15 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
     DeviceState *dev;
     int i;
 
-    qemu_check_nic_model_list(nd, pci_nic_models, default_model);
-
-    for (i = 0; pci_nic_models[i]; i++) {
-        if (strcmp(nd->model, pci_nic_models[i]) == 0) {
-            pci_dev = pci_create(pci_nic_names[i], devaddr);
-            dev = &pci_dev->qdev;
-            if (nd->id)
-                dev->id = qemu_strdup(nd->id);
-            dev->nd = nd;
-            qdev_init(dev);
-            nd->private = dev;
-            return pci_dev;
-        }
-    }
-
-    return NULL;
+    i = qemu_check_nic_model_list(nd, pci_nic_models, default_model);
+    pci_dev = pci_create(pci_nic_names[i], devaddr);
+    dev = &pci_dev->qdev;
+    if (nd->id)
+        dev->id = qemu_strdup(nd->id);
+    dev->nd = nd;
+    qdev_init(dev);
+    nd->private = dev;
+    return pci_dev;
 }
 
 typedef struct {
diff --git a/net.c b/net.c
index da2f428..047e72e 100644
--- a/net.c
+++ b/net.c
@@ -2553,8 +2553,8 @@ void qemu_check_nic_model(NICInfo *nd, const char *model)
     qemu_check_nic_model_list(nd, models, model);
 }
 
-void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
-                               const char *default_model)
+int qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
+                              const char *default_model)
 {
     int i, exit_status = 0;
 
@@ -2564,7 +2564,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
     if (strcmp(nd->model, "?") != 0) {
         for (i = 0 ; models[i]; i++)
             if (strcmp(nd->model, models[i]) == 0)
-                return;
+                return i;
 
         fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model);
         exit_status = 1;
diff --git a/net.h b/net.h
index 94db0d7..9662988 100644
--- a/net.h
+++ b/net.h
@@ -80,8 +80,8 @@ void qemu_purge_queued_packets(VLANClientState *vc);
 void qemu_flush_queued_packets(VLANClientState *vc);
 void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]);
 void qemu_check_nic_model(NICInfo *nd, const char *model);
-void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
-                               const char *default_model);
+int qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
+                              const char *default_model);
 void qemu_handler_true(void *opaque);
 
 void do_info_network(Monitor *mon);
-- 
1.6.2.5


qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch:
 hw/mips_malta.c        |    2 +-
 hw/pc.c                |    2 +-
 hw/pci.c               |   19 ++++++++++++++++++-
 hw/pci.h               |    2 ++
 hw/ppc440_bamboo.c     |    2 +-
 hw/ppc_newworld.c      |    2 +-
 hw/ppc_oldworld.c      |    2 +-
 hw/ppc_prep.c          |    2 +-
 hw/ppce500_mpc8544ds.c |    2 +-
 hw/r2d.c               |    2 +-
 hw/realview.c          |    2 +-
 hw/sun4u.c             |    2 +-
 hw/versatilepb.c       |    2 +-
 net.c                  |   41 +++++++++++++++++++++++++----------------
 net.h                  |    6 +++---
 15 files changed, 59 insertions(+), 31 deletions(-)

--- NEW FILE qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch ---
>From 0ba615f4e6ecf13839b7688c762961aa1d092504 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru at redhat.com>
Date: Fri, 25 Sep 2009 03:53:51 +0200
Subject: [PATCH] Fix pci_add nic not to exit on bad model

Monitor command "pci_add ADDR nic model=MODEL" uses pci_nic_init() to
create the NIC.  When MODEL is unknown or "?", this prints to stderr
and terminates the program.

Change pci_nic_init() not to treat "?" specially, and to return NULL
on failure.  Switch uses during startup to new convenience wrapper
pci_nic_init_nofail(), which behaves just like pci_nic_init() used to
do.

[markmc:

  - rebase to stable-0.11
  - drop qemu_error() usage
  - go back to pci_create() in pci_nic_init
  - qdev_init() doesn't have an error return
]

Signed-off-by: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch
---
 hw/mips_malta.c        |    2 +-
 hw/pc.c                |    2 +-
 hw/pci.c               |   19 ++++++++++++++++++-
 hw/pci.h               |    2 ++
 hw/ppc440_bamboo.c     |    2 +-
 hw/ppc_newworld.c      |    2 +-
 hw/ppc_oldworld.c      |    2 +-
 hw/ppc_prep.c          |    2 +-
 hw/ppce500_mpc8544ds.c |    2 +-
 hw/r2d.c               |    2 +-
 hw/realview.c          |    2 +-
 hw/sun4u.c             |    2 +-
 hw/versatilepb.c       |    2 +-
 net.c                  |   41 +++++++++++++++++++++++++----------------
 net.h                  |    5 +++--
 15 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 7728e58..ed86d4b 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -486,7 +486,7 @@ static void network_init(void)
             /* The malta board has a PCNet card using PCI SLOT 11 */
             default_devaddr = "0b";
 
-        pci_nic_init(nd, "pcnet", default_devaddr);
+        pci_nic_init_nofail(nd, "pcnet", default_devaddr);
     }
 }
 
diff --git a/hw/pc.c b/hw/pc.c
index bcd2989..3b226f4 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1360,7 +1360,7 @@ static void pc_init1(ram_addr_t ram_size,
         if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
             pc_init_ne2k_isa(nd, i8259);
         else
-            pci_nic_init(nd, "rtl8139", NULL);
+            pci_nic_init_nofail(nd, "rtl8139", NULL);
     }
 
     piix4_acpi_system_hot_add_init(cpu_model);
diff --git a/hw/pci.c b/hw/pci.c
index eb990f9..9bcf49d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -937,7 +937,10 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
     DeviceState *dev;
     int i;
 
-    i = qemu_check_nic_model_list(nd, pci_nic_models, default_model);
+    i = qemu_find_nic_model(nd, pci_nic_models, default_model);
+    if (i < 0)
+        return NULL;
+
     pci_dev = pci_create(pci_nic_names[i], devaddr);
     dev = &pci_dev->qdev;
     if (nd->id)
@@ -948,6 +951,20 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
     return pci_dev;
 }
 
+PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
+                               const char *default_devaddr)
+{
+    PCIDevice *res;
+
+    if (qemu_show_nic_models(nd->model, pci_nic_models))
+        exit(0);
+
+    res = pci_nic_init(nd, default_model, default_devaddr);
+    if (!res)
+        exit(1);
+    return res;
+}
+
 typedef struct {
     PCIDevice dev;
     PCIBus *bus;
diff --git a/hw/pci.h b/hw/pci.h
index 7ca3ba9..18a05f5 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -291,6 +291,8 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name,
 
 PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
                         const char *default_devaddr);
+PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
+                               const char *default_devaddr);
 void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len);
 uint32_t pci_data_read(void *opaque, uint32_t addr, int len);
 int pci_bus_num(PCIBus *s);
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index c74aa2f..9f22623 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -128,7 +128,7 @@ static void bamboo_init(ram_addr_t ram_size,
         for (i = 0; i < nb_nics; i++) {
             /* There are no PCI NICs on the Bamboo board, but there are
              * PCI slots, so we can pick whatever default model we want. */
-            pci_nic_init(&nd_table[i], "e1000", NULL);
+            pci_nic_init_nofail(&nd_table[i], "e1000", NULL);
         }
     }
 
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 45480ea..5fa9e82 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -304,7 +304,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
                                serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
 
     for(i = 0; i < nb_nics; i++)
-        pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
+        pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL);
 
     if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
         fprintf(stderr, "qemu: too many IDE bus\n");
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 5c745a0..49c8a00 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -315,7 +315,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
                                serial_hds[1], ESCC_CLOCK, 4);
 
     for(i = 0; i < nb_nics; i++)
-        pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
+        pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL);
 
 
     if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 7a21977..a8f0002 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -681,7 +681,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
         if (strcmp(nd_table[i].model, "ne2k_isa") == 0) {
             isa_ne2000_init(ne2000_io[i], i8259[ne2000_irq[i]], &nd_table[i]);
         } else {
-            pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
+            pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL);
         }
     }
 
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index db52cdd..5f2b526 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -228,7 +228,7 @@ static void mpc8544ds_init(ram_addr_t ram_size,
 
         /* Register network interfaces. */
         for (i = 0; i < nb_nics; i++) {
-            pci_nic_init(&nd_table[i], "virtio", NULL);
+            pci_nic_init_nofail(&nd_table[i], "virtio", NULL);
         }
     }
 
diff --git a/hw/r2d.c b/hw/r2d.c
index 8ce6832..af229d4 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -231,7 +231,7 @@ static void r2d_init(ram_addr_t ram_size,
 
     /* NIC: rtl8139 on-board, and 2 slots. */
     for (i = 0; i < nb_nics; i++)
-        pci_nic_init(&nd_table[i], "rtl8139", i==0 ? "2" : NULL);
+        pci_nic_init_nofail(&nd_table[i], "rtl8139", i==0 ? "2" : NULL);
 
     /* Todo: register on board registers */
     if (kernel_filename) {
diff --git a/hw/realview.c b/hw/realview.c
index 8e176b9..70c129b 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -125,7 +125,7 @@ static void realview_init(ram_addr_t ram_size,
             smc91c111_init(nd, 0x4e000000, pic[28]);
             done_smc = 1;
         } else {
-            pci_nic_init(nd, "rtl8139", NULL);
+            pci_nic_init_nofail(nd, "rtl8139", NULL);
         }
     }
 
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 9d2a7f5..9fb5dcd 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -497,7 +497,7 @@ static void sun4uv_init(ram_addr_t RAM_size,
     }
 
     for(i = 0; i < nb_nics; i++)
-        pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
+        pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL);
 
     if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
         fprintf(stderr, "qemu: too many IDE bus\n");
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 3371121..8e06c31 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -212,7 +212,7 @@ static void versatile_init(ram_addr_t ram_size,
             smc91c111_init(nd, 0x10010000, sic[25]);
             done_smc = 1;
         } else {
-            pci_nic_init(nd, "rtl8139", NULL);
+            pci_nic_init_nofail(nd, "rtl8139", NULL);
         }
     }
     if (usb_enabled) {
diff --git a/net.c b/net.c
index 047e72e..3572c48 100644
--- a/net.c
+++ b/net.c
@@ -2543,6 +2543,19 @@ static int nic_get_free_idx(void)
     return -1;
 }
 
+int qemu_show_nic_models(const char *arg, const char *const *models)
+{
+    int i;
+
+    if (!arg || strcmp(arg, "?"))
+        return 0;
+
+    fprintf(stderr, "qemu: Supported NIC models: ");
+    for (i = 0 ; models[i]; i++)
+        fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n');
+    return 1;
+}
+
 void qemu_check_nic_model(NICInfo *nd, const char *model)
 {
     const char *models[2];
@@ -2550,31 +2563,27 @@ void qemu_check_nic_model(NICInfo *nd, const char *model)
     models[0] = model;
     models[1] = NULL;
 
-    qemu_check_nic_model_list(nd, models, model);
+    if (qemu_show_nic_models(nd->model, models))
+        exit(0);
+    if (qemu_find_nic_model(nd, models, model) < 0)
+        exit(1);
 }
 
-int qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
-                              const char *default_model)
+int qemu_find_nic_model(NICInfo *nd, const char * const *models,
+                        const char *default_model)
 {
-    int i, exit_status = 0;
+    int i;
 
     if (!nd->model)
         nd->model = qemu_strdup(default_model);
 
-    if (strcmp(nd->model, "?") != 0) {
-        for (i = 0 ; models[i]; i++)
-            if (strcmp(nd->model, models[i]) == 0)
-                return i;
-
-        fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model);
-        exit_status = 1;
+    for (i = 0 ; models[i]; i++) {
+        if (strcmp(nd->model, models[i]) == 0)
+            return i;
     }
 
-    fprintf(stderr, "qemu: Supported NIC models: ");
-    for (i = 0 ; models[i]; i++)
-        fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n');
-
-    exit(exit_status);
+    fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model);
+    return -1;
 }
 
 static int net_handle_fd_param(Monitor *mon, const char *param)
diff --git a/net.h b/net.h
index 9662988..07b4c9a 100644
--- a/net.h
+++ b/net.h
@@ -79,9 +79,10 @@ ssize_t qemu_send_packet_async(VLANClientState *vc, const uint8_t *buf,
 void qemu_purge_queued_packets(VLANClientState *vc);
 void qemu_flush_queued_packets(VLANClientState *vc);
 void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]);
+int qemu_show_nic_models(const char *arg, const char *const *models);
 void qemu_check_nic_model(NICInfo *nd, const char *model);
-int qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
-                              const char *default_model);
+int qemu_find_nic_model(NICInfo *nd, const char * const *models,
+                        const char *default_model);
 void qemu_handler_true(void *opaque);
 
 void do_info_network(Monitor *mon);
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- qemu.spec	28 Sep 2009 07:39:30 -0000	1.133
+++ qemu.spec	28 Sep 2009 16:42:19 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -39,6 +39,10 @@ Patch04: qemu-add-ksm-support.patch
 # Fix issue causing NIC hotplug confusion when no model is specified (#524022)
 Patch05: qemu-correctly-free-nic-info-structure.patch
 
+# Do not exit during PCI hotplug when an invalid NIC model is passed (#524022)
+Patch06: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
+Patch07: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -227,6 +231,8 @@ such as kvmtrace and kvm_stat.
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
+%patch06 -p1
+%patch07 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -520,6 +526,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-2
+- Fix pci hotplug to not exit if supplied an invalid NIC model (#524022)
+
 * Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-1
 - Update to 0.11.0 release
 - Drop a couple of upstreamed patches



From mclasen at fedoraproject.org  Mon Sep 28 16:47:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 28 Sep 2009 16:47:25 +0000 (UTC)
Subject: rpms/gtk2/devel iconview-crash.patch, NONE, 1.1 gtk2.spec, 1.406,
	1.407
Message-ID: <20090928164725.AB43D11C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3035

Modified Files:
	gtk2.spec 
Added Files:
	iconview-crash.patch 
Log Message:
fix a crash in the appearance capplet


iconview-crash.patch:
 gtkiconview.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE iconview-crash.patch ---
diff -up gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash gtk+-2.18.0/gtk/gtkiconview.c
--- gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash	2009-09-28 12:38:46.956098207 -0400
+++ gtk+-2.18.0/gtk/gtkiconview.c	2009-09-28 12:40:03.636858596 -0400
@@ -3469,6 +3469,9 @@ gtk_icon_view_get_item_at_coords (GtkIco
   GList *items, *l;
   GdkRectangle box;
 
+  if (cell_at_pos)
+    *cell_at_pos = NULL;
+
   for (items = icon_view->priv->items; items; items = items->next)
     {
       GtkIconViewItem *item = items->data;
@@ -3503,9 +3506,6 @@ gtk_icon_view_get_item_at_coords (GtkIco
 		    }
 		}
 
-	      if (cell_at_pos)
-		*cell_at_pos = NULL;
-
 	      if (only_in_cell)
 		return NULL;
 	    }


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- gtk2.spec	27 Sep 2009 04:27:04 -0000	1.406
+++ gtk2.spec	28 Sep 2009 16:47:25 -0000	1.407
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,6 +34,8 @@ Patch1: gtk2-printing-smb-auth.patch
 Patch2: gtk2-printing-nonblocking-printer-list.patch
 # from upstream
 Patch3: fix-anchors.patch
+# from upstream
+Patch4: iconview-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -148,6 +150,7 @@ This package contains developer document
 %patch1 -p1 -b .printing-smb-auth
 %patch2 -p1 -b .printing-nonblocking-printer-list
 %patch3 -p1 -b .fix-anchors
+%patch4 -p1 -b .iconview-crash
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -389,6 +392,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
+- Fix a crash in the appearance capplet
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
 - Fix anchor handling in text views (#525910)
 



From spot at fedoraproject.org  Mon Sep 28 16:48:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 16:48:22 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.56, 1.57 asymptote.spec, 1.70,
	1.71 sources, 1.56, 1.57
Message-ID: <20090928164822.809EE11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4685

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.87


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	6 Sep 2009 18:52:07 -0000	1.56
+++ .cvsignore	28 Sep 2009 16:48:22 -0000	1.57
@@ -1 +1 @@
-asymptote-1.86.src.tgz
+asymptote-1.87.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- asymptote.spec	6 Sep 2009 18:52:07 -0000	1.70
+++ asymptote.spec	28 Sep 2009 16:48:22 -0000	1.71
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.86
+Version:        1.87
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -150,6 +150,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.87-1
+- update to 1.87
+
 * Sun Sep  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.86-1
 - update to 1.86
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	6 Sep 2009 18:52:07 -0000	1.56
+++ sources	28 Sep 2009 16:48:22 -0000	1.57
@@ -1 +1 @@
-0dc9c827a5e6f3577b5bc5966cb90ca8  asymptote-1.86.src.tgz
+20caf50879b6173e18c03c4857fbd64b  asymptote-1.87.src.tgz



From cebbert at fedoraproject.org  Mon Sep 28 16:48:32 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 28 Sep 2009 16:48:32 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1746,
	1.1747 sched-disable-NEW-FAIR-SLEEPERS-for-now.patch, 1.1, NONE
Message-ID: <20090928164832.4180411C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4791

Modified Files:
	kernel.spec 
Removed Files:
	sched-disable-NEW-FAIR-SLEEPERS-for-now.patch 
Log Message:
Drop sched-disable-NEW-FAIR-SLEEPERS-for-now.patch, reported to
  cause problems on 2.6.30.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1746
retrieving revision 1.1747
diff -u -p -r1.1746 -r1.1747
--- kernel.spec	26 Sep 2009 20:52:12 -0000	1.1746
+++ kernel.spec	28 Sep 2009 16:48:31 -0000	1.1747
@@ -728,7 +728,6 @@ Patch13002: linux-2.6-virtio_blk-dont-bo
 
 # sched fixes cherry-picked from 2.6.32
 Patch13100: sched-deal-with-low-load-in-wake-affine.patch
-Patch13101: sched-disable-NEW-FAIR-SLEEPERS-for-now.patch
 Patch13102: sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch
 Patch13103: sched-remove-shortcut-from-select-task-rq-fair.patch
 # latency defaults from 2.6.32 but changed to be not so aggressive
@@ -1391,7 +1390,6 @@ ApplyPatch linux-2.6-virtio_blk-dont-bou
 
 # sched fixes cherry-picked from 2.6.32
 ApplyPatch sched-deal-with-low-load-in-wake-affine.patch
-ApplyPatch sched-disable-NEW-FAIR-SLEEPERS-for-now.patch
 ApplyPatch sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch
 ApplyPatch sched-remove-shortcut-from-select-task-rq-fair.patch
 # latency defaults from 2.6.32 but changed to be not so aggressive
@@ -2022,6 +2020,10 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 28 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-68
+- Drop sched-disable-NEW-FAIR-SLEEPERS-for-now.patch, reported to
+  cause problems on 2.6.30.
+
 * Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-67
 - Scheduler fixes cherry-picked from 2.6.32
 


--- sched-disable-NEW-FAIR-SLEEPERS-for-now.patch DELETED ---



From twaugh at fedoraproject.org  Mon Sep 28 16:53:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 28 Sep 2009 16:53:26 +0000 (UTC)
Subject: rpms/gutenprint/devel cups-genppdupdate.py.in, NONE,
	1.1 gutenprint.spec, 1.56, 1.57
Message-ID: <20090928165326.AA90711C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6422

Modified Files:
	gutenprint.spec 
Added Files:
	cups-genppdupdate.py.in 
Log Message:
* Mon Sep 28 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-6
- Reimplemented PPD upgrade script in Python to avoid perl
  dependency (bug #524978).



***** Error reading new file: [Errno 2] No such file or directory: 'cups-genppdupdate.py.in'

Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gutenprint.spec	23 Sep 2009 17:31:17 -0000	1.56
+++ gutenprint.spec	28 Sep 2009 16:53:26 -0000	1.57
@@ -4,11 +4,12 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
 Source1:        gutenprint-foomaticppdupdate
+Source2:        cups-genppdupdate.py.in
 Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
 Patch2:         gutenprint-selinux.patch
@@ -139,6 +140,8 @@ Epson, HP and compatible printers.
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .deviceid
 
+cp %{SOURCE2} src/cups/cups-genppdupdate.in
+
 %build
 %configure --disable-static --disable-dependency-tracking  \
             --with-foomatic --with-ghostscript \
@@ -264,6 +267,10 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Sep 28 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-6
+- Reimplemented PPD upgrade script in Python to avoid perl
+  dependency (bug #524978).
+
 * Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-5
 - Provide IEEE 1284 Device IDs in CUPS model list.
 



From cebbert at fedoraproject.org  Mon Sep 28 16:54:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 28 Sep 2009 16:54:12 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch, NONE,
	1.1 kernel.spec, 1.1747, 1.1748
Message-ID: <20090928165412.E5F4911C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6750

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch 
Log Message:
Add linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch, from
  2.6.32-rc, fixes bug #525743

linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch:
 x86.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch ---
From: Jan Kiszka <jan.kiszka at web.de>
Date: Wed, 1 Jul 2009 18:52:03 +0000 (+0200)
Subject: Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dc7e795e3dd2a763e5ceaa1615f307e808cf3932

Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs"

This reverts commit 6c20e1442bb1c62914bb85b7f4a38973d2a423ba.

To my understanding, it became obsolete with the advent of the more
robust check in mmu_alloc_roots (89da4ff17f). Moreover, it prevents
the conceptually safe pattern

 1. set sregs
 2. register mem-slots
 3. run vcpu

by setting a sticky triple fault during step 1.

Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6dde99c..0e74d98 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4326,13 +4326,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
 
 	vcpu->arch.cr2 = sregs->cr2;
 	mmu_reset_needed |= vcpu->arch.cr3 != sregs->cr3;
-
-	down_read(&vcpu->kvm->slots_lock);
-	if (gfn_to_memslot(vcpu->kvm, sregs->cr3 >> PAGE_SHIFT))
-		vcpu->arch.cr3 = sregs->cr3;
-	else
-		set_bit(KVM_REQ_TRIPLE_FAULT, &vcpu->requests);
-	up_read(&vcpu->kvm->slots_lock);
+	vcpu->arch.cr3 = sregs->cr3;
 
 	kvm_set_cr8(vcpu, sregs->cr8);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1747
retrieving revision 1.1748
diff -u -p -r1.1747 -r1.1748
--- kernel.spec	28 Sep 2009 16:48:31 -0000	1.1747
+++ kernel.spec	28 Sep 2009 16:54:12 -0000	1.1748
@@ -765,6 +765,9 @@ Patch14402: kvm-vmx-check-cpl-before-emu
 Patch14403: kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
 Patch14404: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
 
+# fixes bug #525743, send for -stable
+Patch14410: linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch
+
 # appletalk: fix skb leak (CVE-2009-2903)
 Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
@@ -1429,6 +1432,9 @@ ApplyPatch kvm-vmx-check-cpl-before-emul
 ApplyPatch kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
 ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
 
+# fixes bug #525743, send for -stable
+ApplyPatch linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch
+
 # appletalk: fix skb leak (CVE-2009-2903)
 ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
@@ -2020,6 +2026,10 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 28 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-69
+- Add linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch, from
+  2.6.32-rc, fixes bug #525743
+
 * Mon Sep 28 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-68
 - Drop sched-disable-NEW-FAIR-SLEEPERS-for-now.patch, reported to
   cause problems on 2.6.30.



From orion at fedoraproject.org  Mon Sep 28 17:00:56 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Sep 2009 17:00:56 +0000 (UTC)
Subject: rpms/netcdf/F-11 netcdf.spec,1.34,1.35 sources,1.8,1.9
Message-ID: <20090928170056.1B1E811C00E4@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8936

Modified Files:
	netcdf.spec sources 
Log Message:
* Mon Sep 28 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
- Update to 4.0.1
- Fix up URL and Source urls
- Re-enable parallel builds
- Add pkgconfig file
- Add more tests to make check



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-11/netcdf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- netcdf.spec	26 Feb 2009 05:06:01 -0000	1.34
+++ netcdf.spec	28 Sep 2009 17:00:55 -0000	1.35
@@ -1,17 +1,18 @@
 Name:           netcdf
-Version:        4.0.0
-Release:        2%{?dist}
+Version:        4.0.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
 License:        NetCDF
-URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.0.tar.gz
+URL:            http://www.unidata.ucar.edu/software/netcdf/
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%{version}.tar.gz
 Patch0:         netcdf-4.0.0-gcc4.3-cstring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
 BuildRequires:  hdf5-devel
+BuildRequires:  valgrind
 
 %package devel
 Summary:        Development files for netcdf
@@ -25,16 +26,16 @@ Requires:       %{name} = %{version}-%{r
 
 %description
 
-NetCDF (network Common Data Form) is an interface for array-oriented 
-data access and a freely-distributed collection of software libraries 
-for C, Fortran, C++, and perl that provides an implementation of the 
-interface.  The NetCDF library also defines a machine-independent 
-format for representing scientific data.  Together, the interface, 
-library, and format support the creation, access, and sharing of 
-scientific data. The NetCDF software was developed at the Unidata 
+NetCDF (network Common Data Form) is an interface for array-oriented
+data access and a freely-distributed collection of software libraries
+for C, Fortran, C++, and perl that provides an implementation of the
+interface.  The NetCDF library also defines a machine-independent
+format for representing scientific data.  Together, the interface,
+library, and format support the creation, access, and sharing of
+scientific data. The NetCDF software was developed at the Unidata
 Program Center in Boulder, Colorado.
 
-NetCDF data is: 
+NetCDF data is:
 
    o Self-Describing: A NetCDF file includes information about the
      data it contains.
@@ -56,26 +57,29 @@ NetCDF data is: 
      access the same NetCDF file.
 
 %description devel
-This package contains the netCDF header files, shared devel libs, and 
+This package contains the netCDF header files, shared devel libs, and
 man pages.
 
 %description static
 This package contains the netCDF static libs.
 
+
 %prep
-%setup -q -n netcdf-4.0
+%setup -q
 %patch0 -p1
 
+
 %build
-export FC="gfortran"
-export F90="gfortran"
-export CPPFLAGS="-fPIC"
 export FFLAGS="-fPIC ${RPM_OPT_FLAGS}"
-export F90FLAGS="$FFLAGS"
 export FCFLAGS="$FFLAGS"
-%configure --enable-shared
+%configure CPPFLAGS=-I%{_includedir}/hdf \
+           LDFLAGS=-L%{_libdir}/hdf \
+           --enable-shared \
+           --enable-extra-example-tests \
+           --enable-valgrind-tests \
 # parallel build is broken, .mod file hasn't right deps %%{?_smp_mflags}
-make
+make %{?_smp_mflags}
+
 
 %install
 make install DESTDIR=${RPM_BUILD_ROOT}
@@ -88,6 +92,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
 /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
+
 %check
 make check
 
@@ -95,6 +100,7 @@ make check
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/netcdf.info \
@@ -107,6 +113,7 @@ if [ "$1" = 0 ]; then
     %{_infodir}/dir 2>/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README
@@ -120,6 +127,7 @@ fi
 %{_includedir}/netcdf
 %{_fmoddir}/*.mod
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/netcdf.pc
 %{_mandir}/man3/*
 
 %files static
@@ -128,6 +136,13 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
+- Update to 4.0.1
+- Fix up URL and Source urls
+- Re-enable parallel builds
+- Add pkgconfig file
+- Add more tests to make check
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -196,7 +211,7 @@ fi
 - rebuild for gcc4.1
 
 * Sun Oct 16 2005 Ed Hill <ed at eh3.com> - 3.6.0-8.p1
-- building the library twice (once each for g77 and gfortran) 
+- building the library twice (once each for g77 and gfortran)
   fixes an annoying problem for people who need both compilers
 
 * Fri Sep 29 2005 Ed Hill <ed at eh3.com> - 3.6.0-7.p1
@@ -233,8 +248,8 @@ fi
 
 * Sat Dec  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0beta6-0.fdr.0
 - upgrade to 3.6.0beta6
-- create separate devel package that does *not* depend upon 
-  the non-devel package and put the headers/libs in "netcdf-3" 
+- create separate devel package that does *not* depend upon
+  the non-devel package and put the headers/libs in "netcdf-3"
   subdirs for easy co-existance with upcoming netcdf-4
 
 * Thu Dec  2 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.12
@@ -244,7 +259,7 @@ fi
 - headers in /usr/include/netcdf, libs in /usr/lib/netcdf
 
 * Mon Oct  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.10
-- Put headers in their own directory but leave the libraries in the 
+- Put headers in their own directory but leave the libraries in the
   %%{_libdir} -- there are only two libs and the majority of other
   "*-devel" packages follow this pattern
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Sep 2008 20:57:47 -0000	1.8
+++ sources	28 Sep 2009 17:00:55 -0000	1.9
@@ -1 +1 @@
-afc057b07b6e6843556dcfbc4ced402c  netcdf-4.0.tar.gz
+a251453c5477599f050fa4e593295186  netcdf-4.0.1.tar.gz



From markmc at fedoraproject.org  Mon Sep 28 17:13:52 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 28 Sep 2009 17:13:52 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.134,1.135
Message-ID: <20090928171352.473EE11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14375

Modified Files:
	qemu.spec 
Log Message:
typo



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- qemu.spec	28 Sep 2009 16:42:19 -0000	1.134
+++ qemu.spec	28 Sep 2009 17:13:52 -0000	1.135
@@ -41,7 +41,7 @@ Patch05: qemu-correctly-free-nic-info-st
 
 # Do not exit during PCI hotplug when an invalid NIC model is passed (#524022)
 Patch06: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
-Patch07: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
+Patch07: qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel



From sgrubb at fedoraproject.org  Mon Sep 28 17:24:50 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Mon, 28 Sep 2009 17:24:50 +0000 (UTC)
Subject: rpms/libcap-ng/devel .cvsignore, 1.7, 1.8 libcap-ng.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090928172450.BF78211C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libcap-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18284

Modified Files:
	.cvsignore libcap-ng.spec sources 
Log Message:
* Mon Sep 28 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Jul 2009 13:48:10 -0000	1.7
+++ .cvsignore	28 Sep 2009 17:24:50 -0000	1.8
@@ -4,3 +4,4 @@ libcap-ng-0.5.tar.gz
 libcap-ng-0.5.1.tar.gz
 libcap-ng-0.6.tar.gz
 libcap-ng-0.6.1.tar.gz
+libcap-ng-0.6.2.tar.gz


Index: libcap-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/devel/libcap-ng.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libcap-ng.spec	26 Jul 2009 13:48:10 -0000	1.11
+++ libcap-ng.spec	28 Sep 2009 17:24:50 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: An alternate posix capabilities library
 Name: libcap-ng
-Version: 0.6.1
+Version: 0.6.2
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -65,6 +65,9 @@ VLIBNAME=$(ls $RPM_BUILD_ROOT/%{_lib}/%{
 LIBNAME=$(basename $VLIBNAME)
 ln -s ../../%{_lib}/$LIBNAME $RPM_BUILD_ROOT%{_libdir}/%{name}.so
 
+# Move the pkgconfig file
+mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
+
 # Remove a couple things so they don't get picked up
 rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.la
 rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.a
@@ -90,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_includedir}/cap-ng.h
 %attr(0755,root,root) %{_libdir}/libcap-ng.so
 %attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4
+%{_libdir}/pkgconfig/libcap-ng.pc
 
 %files python
 %defattr(-,root,root,-)
@@ -103,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 28 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-1
+- New upstream release
+
 * Sun Jul 26 2009 Steve Grubb <sgrubb at redhat.com> 0.6.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Jul 2009 13:48:10 -0000	1.7
+++ sources	28 Sep 2009 17:24:50 -0000	1.8
@@ -1 +1 @@
-5b96878df29d123d461c3296f46aa49e  libcap-ng-0.6.1.tar.gz
+f9af01f4ec602506da717632b94354fd  libcap-ng-0.6.2.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:32 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:32 +0000 (UTC)
Subject: rpms/mecab/F-10 .cvsignore, 1.7, 1.8 mecab.spec, 1.19, 1.20 sources,
	1.7, 1.8
Message-ID: <20090928173232.60ACA11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/mecab/F-10

Modified Files:
	.cvsignore mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Jun 2009 19:46:25 -0000	1.7
+++ .cvsignore	28 Sep 2009 17:32:32 -0000	1.8
@@ -1 +1 @@
-mecab-0.98pre3.tar.gz
+mecab-0.98.tar.gz


Index: mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-10/mecab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mecab.spec	3 Jun 2009 19:46:25 -0000	1.19
+++ mecab.spec	28 Sep 2009 17:32:32 -0000	1.20
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		fedorarel	3
+#%%define		betaver		pre3
+%define		fedorarel	1
 
 # Note:
 # mecab dictionary requires mecab-devel to rebuild it,
@@ -115,6 +115,15 @@ cd ..
 %{_includedir}/%{name}.h
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.5.pre3
+- Enable tests on ppc{,64} again
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.4.pre3
+- Kill tests on ppc, ppc64 for now as tests hang
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
 - 0.98 pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Jun 2009 19:46:25 -0000	1.7
+++ sources	28 Sep 2009 17:32:32 -0000	1.8
@@ -1 +1 @@
-893df2df8656487929922f9a669e86de  mecab-0.98pre3.tar.gz
+b3d8d79e35acf0ca178e8d885309f5fd  mecab-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:33 +0000 (UTC)
Subject: rpms/mecab/devel .cvsignore, 1.9, 1.10 mecab.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <20090928173233.114BA11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/mecab/devel

Modified Files:
	.cvsignore mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 19:46:26 -0000	1.9
+++ .cvsignore	28 Sep 2009 17:32:32 -0000	1.10
@@ -1 +1 @@
-mecab-0.98pre3.tar.gz
+mecab-0.98.tar.gz


Index: mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab/devel/mecab.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mecab.spec	28 Jul 2009 16:44:43 -0000	1.25
+++ mecab.spec	28 Sep 2009 17:32:32 -0000	1.26
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		fedorarel	5
+#%%define		betaver		pre3
+%define		fedorarel	1
 
 # Note:
 # mecab dictionary requires mecab-devel to rebuild it,
@@ -115,6 +115,9 @@ cd ..
 %{_includedir}/%{name}.h
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
 * Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.5.pre3
 - Enable tests on ppc{,64} again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 19:46:26 -0000	1.9
+++ sources	28 Sep 2009 17:32:32 -0000	1.10
@@ -1 +1 @@
-893df2df8656487929922f9a669e86de  mecab-0.98pre3.tar.gz
+b3d8d79e35acf0ca178e8d885309f5fd  mecab-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:32 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:32 +0000 (UTC)
Subject: rpms/mecab/F-11 .cvsignore, 1.9, 1.10 mecab.spec, 1.22, 1.23 sources,
	1.9, 1.10
Message-ID: <20090928173232.ABA4A11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/mecab/F-11

Modified Files:
	.cvsignore mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 19:46:25 -0000	1.9
+++ .cvsignore	28 Sep 2009 17:32:32 -0000	1.10
@@ -1 +1 @@
-mecab-0.98pre3.tar.gz
+mecab-0.98.tar.gz


Index: mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-11/mecab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mecab.spec	3 Jun 2009 19:46:25 -0000	1.22
+++ mecab.spec	28 Sep 2009 17:32:32 -0000	1.23
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		fedorarel	3
+#%%define		betaver		pre3
+%define		fedorarel	1
 
 # Note:
 # mecab dictionary requires mecab-devel to rebuild it,
@@ -115,6 +115,15 @@ cd ..
 %{_includedir}/%{name}.h
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.5.pre3
+- Enable tests on ppc{,64} again
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.4.pre3
+- Kill tests on ppc, ppc64 for now as tests hang
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
 - 0.98 pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 19:46:25 -0000	1.9
+++ sources	28 Sep 2009 17:32:32 -0000	1.10
@@ -1 +1 @@
-893df2df8656487929922f9a669e86de  mecab-0.98pre3.tar.gz
+b3d8d79e35acf0ca178e8d885309f5fd  mecab-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:33 +0000 (UTC)
Subject: rpms/mecab-java/F-10 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090928173233.66BEA11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab-java/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/mecab-java/F-10

Modified Files:
	.cvsignore sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jun 2009 19:46:26 -0000	1.4
+++ .cvsignore	28 Sep 2009 17:32:33 -0000	1.5
@@ -1 +1 @@
-mecab-java-0.98pre3.tar.gz
+mecab-java-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jun 2009 19:46:26 -0000	1.4
+++ sources	28 Sep 2009 17:32:33 -0000	1.5
@@ -1 +1 @@
-d58341dea6ee745a1e4dece8e4372a90  mecab-java-0.98pre3.tar.gz
+f80b44c75d271d1076b18bba9af5922d  mecab-java-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:33 +0000 (UTC)
Subject: rpms/mecab-java/F-11 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090928173233.ABE7611C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab-java/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/mecab-java/F-11

Modified Files:
	.cvsignore sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Jun 2009 19:46:26 -0000	1.5
+++ .cvsignore	28 Sep 2009 17:32:33 -0000	1.6
@@ -1 +1 @@
-mecab-java-0.98pre3.tar.gz
+mecab-java-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Jun 2009 19:46:27 -0000	1.5
+++ sources	28 Sep 2009 17:32:33 -0000	1.6
@@ -1 +1 @@
-d58341dea6ee745a1e4dece8e4372a90  mecab-java-0.98pre3.tar.gz
+f80b44c75d271d1076b18bba9af5922d  mecab-java-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:33 +0000 (UTC)
Subject: rpms/mecab-java/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090928173233.DA0E211C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/mecab-java/devel

Modified Files:
	.cvsignore sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Jun 2009 19:46:27 -0000	1.5
+++ .cvsignore	28 Sep 2009 17:32:33 -0000	1.6
@@ -1 +1 @@
-mecab-java-0.98pre3.tar.gz
+mecab-java-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Jun 2009 19:46:27 -0000	1.5
+++ sources	28 Sep 2009 17:32:33 -0000	1.6
@@ -1 +1 @@
-d58341dea6ee745a1e4dece8e4372a90  mecab-java-0.98pre3.tar.gz
+f80b44c75d271d1076b18bba9af5922d  mecab-java-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:34 +0000 (UTC)
Subject: rpms/perl-mecab/F-11 .cvsignore, 1.6, 1.7 perl-mecab.spec, 1.15,
	1.16 sources, 1.6, 1.7
Message-ID: <20090928173234.7425211C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/perl-mecab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/perl-mecab/F-11

Modified Files:
	.cvsignore perl-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Jun 2009 19:46:28 -0000	1.6
+++ .cvsignore	28 Sep 2009 17:32:34 -0000	1.7
@@ -1 +1 @@
-mecab-perl-0.98pre3.tar.gz
+mecab-perl-0.98.tar.gz


Index: perl-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/F-11/perl-mecab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-mecab.spec	3 Jun 2009 19:46:28 -0000	1.15
+++ perl-mecab.spec	28 Sep 2009 17:32:34 -0000	1.16
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-perl
 
 Name:		perl-mecab
@@ -60,6 +60,12 @@ find $RPM_BUILD_ROOT -depth -type d | xa
 %{perl_vendorarch}/auto/MeCab/
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Jun 2009 19:46:28 -0000	1.6
+++ sources	28 Sep 2009 17:32:34 -0000	1.7
@@ -1 +1 @@
-751e6e2facac05bea723398d20ba31f7  mecab-perl-0.98pre3.tar.gz
+100812d3a17f52900e39b8133d74009e  mecab-perl-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:34 +0000 (UTC)
Subject: rpms/perl-mecab/devel .cvsignore, 1.6, 1.7 perl-mecab.spec, 1.16,
	1.17 sources, 1.6, 1.7
Message-ID: <20090928173234.AACD811C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/perl-mecab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/perl-mecab/devel

Modified Files:
	.cvsignore perl-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Jun 2009 19:46:28 -0000	1.6
+++ .cvsignore	28 Sep 2009 17:32:34 -0000	1.7
@@ -1 +1 @@
-mecab-perl-0.98pre3.tar.gz
+mecab-perl-0.98.tar.gz


Index: perl-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/devel/perl-mecab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-mecab.spec	24 Jul 2009 19:22:34 -0000	1.16
+++ perl-mecab.spec	28 Sep 2009 17:32:34 -0000	1.17
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	3
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-perl
 
 Name:		perl-mecab
@@ -60,6 +60,9 @@ find $RPM_BUILD_ROOT -depth -type d | xa
 %{perl_vendorarch}/auto/MeCab/
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Jun 2009 19:46:28 -0000	1.6
+++ sources	28 Sep 2009 17:32:34 -0000	1.7
@@ -1 +1 @@
-751e6e2facac05bea723398d20ba31f7  mecab-perl-0.98pre3.tar.gz
+100812d3a17f52900e39b8133d74009e  mecab-perl-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:35 +0000 (UTC)
Subject: rpms/python-mecab/F-10 .cvsignore, 1.5, 1.6 python-mecab.spec, 1.9, 
	1.10 sources, 1.5, 1.6
Message-ID: <20090928173235.00E6811C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/python-mecab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/python-mecab/F-10

Modified Files:
	.cvsignore python-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Jun 2009 19:46:28 -0000	1.5
+++ .cvsignore	28 Sep 2009 17:32:34 -0000	1.6
@@ -1 +1 @@
-mecab-python-0.98pre3.tar.gz
+mecab-python-0.98.tar.gz


Index: python-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/F-10/python-mecab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-mecab.spec	3 Jun 2009 19:46:28 -0000	1.9
+++ python-mecab.spec	28 Sep 2009 17:32:34 -0000	1.10
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-python
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -61,6 +61,12 @@ cd ..
 %endif
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Jun 2009 19:46:28 -0000	1.5
+++ sources	28 Sep 2009 17:32:34 -0000	1.6
@@ -1 +1 @@
-6c80e0ee108c847c632082c80dba099a  mecab-python-0.98pre3.tar.gz
+c20ac4576190f219c6e07f2e52803f1e  mecab-python-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:35 +0000 (UTC)
Subject: rpms/python-mecab/devel .cvsignore, 1.6, 1.7 python-mecab.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090928173235.A16F511C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/python-mecab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/python-mecab/devel

Modified Files:
	.cvsignore python-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Jun 2009 19:46:29 -0000	1.6
+++ .cvsignore	28 Sep 2009 17:32:35 -0000	1.7
@@ -1 +1 @@
-mecab-python-0.98pre3.tar.gz
+mecab-python-0.98.tar.gz


Index: python-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/devel/python-mecab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-mecab.spec	24 Jul 2009 19:24:40 -0000	1.13
+++ python-mecab.spec	28 Sep 2009 17:32:35 -0000	1.14
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	3
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-python
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -61,6 +61,9 @@ cd ..
 %endif
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Jun 2009 19:46:29 -0000	1.6
+++ sources	28 Sep 2009 17:32:35 -0000	1.7
@@ -1 +1 @@
-6c80e0ee108c847c632082c80dba099a  mecab-python-0.98pre3.tar.gz
+c20ac4576190f219c6e07f2e52803f1e  mecab-python-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:35 +0000 (UTC)
Subject: rpms/python-mecab/F-11 .cvsignore, 1.6, 1.7 python-mecab.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090928173235.7040511C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/python-mecab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/python-mecab/F-11

Modified Files:
	.cvsignore python-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Jun 2009 19:46:29 -0000	1.6
+++ .cvsignore	28 Sep 2009 17:32:35 -0000	1.7
@@ -1 +1 @@
-mecab-python-0.98pre3.tar.gz
+mecab-python-0.98.tar.gz


Index: python-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/F-11/python-mecab.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-mecab.spec	3 Jun 2009 19:46:29 -0000	1.12
+++ python-mecab.spec	28 Sep 2009 17:32:35 -0000	1.13
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-python
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -61,6 +61,12 @@ cd ..
 %endif
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mecab/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Jun 2009 19:46:29 -0000	1.6
+++ sources	28 Sep 2009 17:32:35 -0000	1.7
@@ -1 +1 @@
-6c80e0ee108c847c632082c80dba099a  mecab-python-0.98pre3.tar.gz
+c20ac4576190f219c6e07f2e52803f1e  mecab-python-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:34 +0000 (UTC)
Subject: rpms/perl-mecab/F-10 .cvsignore, 1.5, 1.6 perl-mecab.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <20090928173234.38CCD11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/perl-mecab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/perl-mecab/F-10

Modified Files:
	.cvsignore perl-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Jun 2009 19:46:27 -0000	1.5
+++ .cvsignore	28 Sep 2009 17:32:33 -0000	1.6
@@ -1 +1 @@
-mecab-perl-0.98pre3.tar.gz
+mecab-perl-0.98.tar.gz


Index: perl-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/F-10/perl-mecab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-mecab.spec	3 Jun 2009 19:46:27 -0000	1.13
+++ perl-mecab.spec	28 Sep 2009 17:32:34 -0000	1.14
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-perl
 
 Name:		perl-mecab
@@ -60,6 +60,12 @@ find $RPM_BUILD_ROOT -depth -type d | xa
 %{perl_vendorarch}/auto/MeCab/
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Jun 2009 19:46:27 -0000	1.5
+++ sources	28 Sep 2009 17:32:34 -0000	1.6
@@ -1 +1 @@
-751e6e2facac05bea723398d20ba31f7  mecab-perl-0.98pre3.tar.gz
+100812d3a17f52900e39b8133d74009e  mecab-perl-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:35 +0000 (UTC)
Subject: rpms/ruby-mecab/F-10 .cvsignore, 1.5, 1.6 ruby-mecab.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <20090928173235.E4AED11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mecab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/ruby-mecab/F-10

Modified Files:
	.cvsignore ruby-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Jun 2009 19:46:30 -0000	1.5
+++ .cvsignore	28 Sep 2009 17:32:35 -0000	1.6
@@ -1 +1 @@
-mecab-ruby-0.98pre3.tar.gz
+mecab-ruby-0.98.tar.gz


Index: ruby-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/F-10/ruby-mecab.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ruby-mecab.spec	3 Jun 2009 19:46:30 -0000	1.12
+++ ruby-mecab.spec	28 Sep 2009 17:32:35 -0000	1.13
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-ruby
 
 %define		rubyver		1.8
@@ -61,6 +61,12 @@ ruby test.rb
 %{ruby_sitearch}/*MeCab*
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Jun 2009 19:46:30 -0000	1.5
+++ sources	28 Sep 2009 17:32:35 -0000	1.6
@@ -1 +1 @@
-ee5f5bfe673d1e574f4ab75c8f5f4082  mecab-ruby-0.98pre3.tar.gz
+d486f70f30cbaf2cf5fbbc17eb268371  mecab-ruby-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:36 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:36 +0000 (UTC)
Subject: rpms/ruby-mecab/F-11 .cvsignore, 1.6, 1.7 ruby-mecab.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20090928173236.37CBB11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mecab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/ruby-mecab/F-11

Modified Files:
	.cvsignore ruby-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Jun 2009 19:46:30 -0000	1.6
+++ .cvsignore	28 Sep 2009 17:32:35 -0000	1.7
@@ -1 +1 @@
-mecab-ruby-0.98pre3.tar.gz
+mecab-ruby-0.98.tar.gz


Index: ruby-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/F-11/ruby-mecab.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ruby-mecab.spec	3 Jun 2009 19:46:30 -0000	1.14
+++ ruby-mecab.spec	28 Sep 2009 17:32:36 -0000	1.15
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-ruby
 
 %define		rubyver		1.8
@@ -61,6 +61,12 @@ ruby test.rb
 %{ruby_sitearch}/*MeCab*
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Jun 2009 19:46:30 -0000	1.6
+++ sources	28 Sep 2009 17:32:36 -0000	1.7
@@ -1 +1 @@
-ee5f5bfe673d1e574f4ab75c8f5f4082  mecab-ruby-0.98pre3.tar.gz
+d486f70f30cbaf2cf5fbbc17eb268371  mecab-ruby-0.98.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 28 17:32:36 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:32:36 +0000 (UTC)
Subject: rpms/ruby-mecab/devel .cvsignore, 1.6, 1.7 ruby-mecab.spec, 1.15,
	1.16 sources, 1.6, 1.7
Message-ID: <20090928173236.8895711C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mecab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20759/ruby-mecab/devel

Modified Files:
	.cvsignore ruby-mecab.spec sources 
Log Message:
mecab 0.98


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Jun 2009 19:46:30 -0000	1.6
+++ .cvsignore	28 Sep 2009 17:32:36 -0000	1.7
@@ -1 +1 @@
-mecab-ruby-0.98pre3.tar.gz
+mecab-ruby-0.98.tar.gz


Index: ruby-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/devel/ruby-mecab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ruby-mecab.spec	25 Jul 2009 07:33:36 -0000	1.15
+++ ruby-mecab.spec	28 Sep 2009 17:32:36 -0000	1.16
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	3
+#%%define		betaver		pre3
+%define		relnumber	1
 %define		srcname		mecab-ruby
 
 %define		rubyver		1.8
@@ -61,6 +61,9 @@ ruby test.rb
 %{ruby_sitearch}/*MeCab*
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-mecab/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Jun 2009 19:46:31 -0000	1.6
+++ sources	28 Sep 2009 17:32:36 -0000	1.7
@@ -1 +1 @@
-ee5f5bfe673d1e574f4ab75c8f5f4082  mecab-ruby-0.98pre3.tar.gz
+d486f70f30cbaf2cf5fbbc17eb268371  mecab-ruby-0.98.tar.gz



From spot at fedoraproject.org  Mon Sep 28 17:33:31 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 28 Sep 2009 17:33:31 +0000 (UTC)
Subject: rpms/asymptote/devel asymptote-1.63-gcc44.patch, 1.2,
	1.3 asymptote.spec, 1.71, 1.72
Message-ID: <20090928173331.7F64C11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21504

Modified Files:
	asymptote-1.63-gcc44.patch asymptote.spec 
Log Message:
fix gcc44 patch

asymptote-1.63-gcc44.patch:
 PRCdouble.cc |    2 +-
 PRCdouble.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: asymptote-1.63-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote-1.63-gcc44.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- asymptote-1.63-gcc44.patch	18 Feb 2009 17:09:00 -0000	1.2
+++ asymptote-1.63-gcc44.patch	28 Sep 2009 17:33:31 -0000	1.3
@@ -1,22 +1,22 @@
-diff -up asymptote-1.63/prc/PRCdouble.cc.gcc44 asymptote-1.63/prc/PRCdouble.cc
---- asymptote-1.63/prc/PRCdouble.cc.gcc44	2009-02-18 12:05:36.000000000 -0500
-+++ asymptote-1.63/prc/PRCdouble.cc	2009-02-18 12:05:47.000000000 -0500
+diff -up asymptote-1.87/prc/PRCdouble.cc.gcc44 asymptote-1.87/prc/PRCdouble.cc
+--- asymptote-1.87/prc/PRCdouble.cc.gcc44	2009-09-20 01:28:23.000000000 -0400
++++ asymptote-1.87/prc/PRCdouble.cc	2009-09-28 13:31:46.455112363 -0400
 @@ -23,7 +23,7 @@ int stCOFDOECompare(const void* pcofdoe1
  }
  
- #if defined(WORDS_BIG_ENDIAN)
+ #ifdef WORDS_BIGENDIAN
 -void *memrchr(const void *buf,int c,size_t count)
 +const void *memrchr(const void *buf,int c,size_t count)
  {
    unsigned char
        *pcBuffer=(unsigned char *)buf,
-diff -up asymptote-1.63/prc/PRCdouble.h.gcc44 asymptote-1.63/prc/PRCdouble.h
---- asymptote-1.63/prc/PRCdouble.h.gcc44	2009-02-17 21:55:30.000000000 -0500
-+++ asymptote-1.63/prc/PRCdouble.h	2009-02-18 12:05:06.000000000 -0500
-@@ -110,7 +110,7 @@ struct sCodageOfFrequentDoubleOrExponent
+diff -up asymptote-1.87/prc/PRCdouble.h.gcc44 asymptote-1.87/prc/PRCdouble.h
+--- asymptote-1.87/prc/PRCdouble.h.gcc44	2009-09-20 01:28:23.000000000 -0400
++++ asymptote-1.87/prc/PRCdouble.h	2009-09-28 13:32:03.111986199 -0400
+@@ -106,7 +106,7 @@ struct sCodageOfFrequentDoubleOrExponent
  int stCOFDOECompare(const void*,const void*);
  
- #if defined(WORDS_BIG_ENDIAN)
+ #ifdef WORDS_BIGENDIAN
 -void *memrchr(const void *,int,size_t);
 +const void *memrchr(const void *,int,size_t);
  #endif


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- asymptote.spec	28 Sep 2009 16:48:22 -0000	1.71
+++ asymptote.spec	28 Sep 2009 17:33:31 -0000	1.72
@@ -5,7 +5,7 @@
 
 Name:           asymptote
 Version:        1.87
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Descriptive vector graphics language
 
 Group:          Applications/Publishing
@@ -150,6 +150,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.87-2
+- fix gcc44 patch
+
 * Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.87-1
 - update to 1.87
 



From mtasaka at fedoraproject.org  Mon Sep 28 17:36:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:36:02 +0000 (UTC)
Subject: rpms/mecab-java/F-11 mecab-java.spec,1.11,1.12
Message-ID: <20090928173602.13E8911C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab-java/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22464/F-11

Modified Files:
	mecab-java.spec 
Log Message:
Actually upgrade mecab-java


Index: mecab-java.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/F-11/mecab-java.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mecab-java.spec	3 Jun 2009 19:46:27 -0000	1.11
+++ mecab-java.spec	28 Sep 2009 17:36:01 -0000	1.12
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -38,7 +38,7 @@ Requires:	mecab = %{version}
 %build
 # Failed with -j4 on Matt's mass build
 %{__make} -j1 \
-	CXX="g++ $RPM_OPT_FLAGS" \
+	CXX="g++ $RPM_OPT_FLAGS -fno-strict-aliasing" \
 	JAVAC="%{_bindir}/gcj -C" \
 	JAR="%{_bindir}/fastjar"
 
@@ -67,6 +67,12 @@ export JAVA=%{java}
 %{_javadir}/MeCab.jar
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 



From mtasaka at fedoraproject.org  Mon Sep 28 17:36:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:36:02 +0000 (UTC)
Subject: rpms/mecab-java/devel mecab-java.spec,1.12,1.13
Message-ID: <20090928173602.2F45C11C02BD@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22464/devel

Modified Files:
	mecab-java.spec 
Log Message:
Actually upgrade mecab-java


Index: mecab-java.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/devel/mecab-java.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mecab-java.spec	24 Jul 2009 18:26:26 -0000	1.12
+++ mecab-java.spec	28 Sep 2009 17:36:02 -0000	1.13
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	3
+#%%define		betaver		pre3
+%define		relnumber	1
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -38,7 +38,7 @@ Requires:	mecab = %{version}
 %build
 # Failed with -j4 on Matt's mass build
 %{__make} -j1 \
-	CXX="g++ $RPM_OPT_FLAGS" \
+	CXX="g++ $RPM_OPT_FLAGS -fno-strict-aliasing" \
 	JAVAC="%{_bindir}/gcj -C" \
 	JAR="%{_bindir}/fastjar"
 
@@ -67,6 +67,9 @@ export JAVA=%{java}
 %{_javadir}/MeCab.jar
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
 - F-12: Mass rebuild
 



From mclasen at fedoraproject.org  Mon Sep 28 17:36:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 28 Sep 2009 17:36:11 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/devel prelight-buttons.patch,
	NONE, 1.1 notification-daemon-engine-slider.spec, 1.1, 1.2
Message-ID: <20090928173611.8559F11C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22480

Modified Files:
	notification-daemon-engine-slider.spec 
Added Files:
	prelight-buttons.patch 
Log Message:
make buttons prelight


prelight-buttons.patch:
 theme.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE prelight-buttons.patch ---
--- notification-daemon-engine-slider-0.1.0/src/theme.c	2009-09-23 20:38:29.000000000 -0400
+++ hacked/src/theme.c	2009-09-27 21:04:05.975316431 -0400
@@ -335,8 +335,9 @@
                 color_reverse (&style->bg[GTK_STATE_NORMAL], &bg);
 
                 state = (GtkStateType) 0;
-                while (state < (GtkStateType) G_N_ELEMENTS (widget->style->bg)) {
-                        gtk_widget_modify_bg (widget, state, &bg);
+                while (state < (GtkStateType) G_N_ELEMENTS (widget->style->bg))  {
+                        if (state != GTK_STATE_PRELIGHT)
+                                gtk_widget_modify_bg (widget, state, &bg);
                         state++;
                 }
 
@@ -352,7 +353,8 @@
 
                 state = (GtkStateType) 0;
                 while (state < (GtkStateType) G_N_ELEMENTS (widget->style->fg)) {
-                        gtk_widget_modify_fg (widget, state, &fg);
+                        if (state != GTK_STATE_PRELIGHT)
+                                gtk_widget_modify_fg (widget, state, &fg);
                         state++;
                 }
         }


Index: notification-daemon-engine-slider.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/notification-daemon-engine-slider.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- notification-daemon-engine-slider.spec	24 Sep 2009 18:49:36 -0000	1.1
+++ notification-daemon-engine-slider.spec	28 Sep 2009 17:36:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-slider
 Version:        0.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Slider theme engine for the notification daemon
 
 Group:          System Environment/Libraries
@@ -12,12 +12,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  gtk2-devel >= 2.17.1
 Requires:       notification-daemon
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=525864
+Patch0:		prelight-buttons.patch
+
 %description
 The Slider theme engine for the notification daemon.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .prelight
 
 %build
 %configure
@@ -42,5 +46,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libslider.so
 
 %changelog
+* Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> - 0.1.0-2
+- Make actions prelight
+
 * Tue Sep 22 2009 Jon McCann <jmccann at redhat.com> - 0.1.0-1
 - Initial build



From mtasaka at fedoraproject.org  Mon Sep 28 17:36:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Sep 2009 17:36:33 +0000 (UTC)
Subject: rpms/mecab-java/F-10 mecab-java.spec,1.9,1.10
Message-ID: <20090928173633.B294A11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab-java/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22737/F-10

Modified Files:
	mecab-java.spec 
Log Message:



Index: mecab-java.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab-java/F-10/mecab-java.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mecab-java.spec	3 Jun 2009 19:46:26 -0000	1.9
+++ mecab-java.spec	28 Sep 2009 17:36:33 -0000	1.10
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre3
-%define		relnumber	2
+#%%define		betaver		pre3
+%define		relnumber	1
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -38,7 +38,7 @@ Requires:	mecab = %{version}
 %build
 # Failed with -j4 on Matt's mass build
 %{__make} -j1 \
-	CXX="g++ $RPM_OPT_FLAGS" \
+	CXX="g++ $RPM_OPT_FLAGS -fno-strict-aliasing" \
 	JAVAC="%{_bindir}/gcj -C" \
 	JAR="%{_bindir}/fastjar"
 
@@ -67,6 +67,12 @@ export JAVA=%{java}
 %{_javadir}/MeCab.jar
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
+- 0.98
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.3.pre3
+- F-12: Mass rebuild
+
 * Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.2.pre3
 - 0.98pre3
 



From chitlesh at fedoraproject.org  Mon Sep 28 17:45:49 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 28 Sep 2009 17:45:49 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.131,1.132 comps-f13.xml.in,1.21,1.22
Message-ID: <20090928174549.8D94011C00E4@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25495

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
sync FEL kickstart file and FEL comps groups


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- comps-f12.xml.in	28 Sep 2009 14:45:02 -0000	1.131
+++ comps-f12.xml.in	28 Sep 2009 17:45:49 -0000	1.132
@@ -1393,7 +1393,11 @@
       <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
+      <packagereq type="default">eclipse-cdt</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
+      <packagereq type="default">eclipse-epic</packagereq>
+      <packagereq type="default">eclipse-dltk-tcl</packagereq>
+      <packagereq type="default">eclipse-subclipse</packagereq>
       <packagereq type="default">eclipse-texlipse</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">electric</packagereq>
@@ -1416,6 +1420,8 @@
       <packagereq type="default">gnucap</packagereq>
       <packagereq type="default">gnuradio</packagereq>
       <packagereq type="default">gnusim8085</packagereq>
+      <packagereq type="default">gpsim</packagereq>
+      <packagereq type="default">gputils</packagereq>
       <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gsim85</packagereq>
       <packagereq type="default">gspiceui</packagereq>
@@ -1453,6 +1459,7 @@
       <packagereq type="default">pharosc-synopsys</packagereq>
       <packagereq type="default">pharosc-xcircuit</packagereq>
       <packagereq type="default">picocom</packagereq>
+      <packagereq type="default">picprog</packagereq>
       <packagereq type="default">pikdev</packagereq>
       <packagereq type="default">piklab</packagereq>
       <packagereq type="default">pikloops</packagereq>
@@ -1470,7 +1477,6 @@
       <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
       <packagereq type="default">vrq</packagereq>
-      <packagereq type="default">vym</packagereq>
       <packagereq type="default">xcircuit</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
@@ -1480,8 +1486,6 @@
       <packagereq type="optional">kdesvn</packagereq>
       <packagereq type="optional">minicom</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
-      <packagereq type="optional">planner</packagereq>
-      <packagereq type="optional">qemu</packagereq>
       <packagereq type="optional">rfdump</packagereq>
     </packagelist>
   </group>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- comps-f13.xml.in	28 Sep 2009 14:45:02 -0000	1.21
+++ comps-f13.xml.in	28 Sep 2009 17:45:49 -0000	1.22
@@ -1387,7 +1387,11 @@
       <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
+      <packagereq type="default">eclipse-cdt</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
+      <packagereq type="default">eclipse-epic</packagereq>
+      <packagereq type="default">eclipse-dltk-tcl</packagereq>
+      <packagereq type="default">eclipse-subclipse</packagereq>
       <packagereq type="default">eclipse-texlipse</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">electric</packagereq>
@@ -1410,6 +1414,8 @@
       <packagereq type="default">gnucap</packagereq>
       <packagereq type="default">gnuradio</packagereq>
       <packagereq type="default">gnusim8085</packagereq>
+      <packagereq type="default">gpsim</packagereq>
+      <packagereq type="default">gputils</packagereq>
       <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gsim85</packagereq>
       <packagereq type="default">gspiceui</packagereq>
@@ -1447,6 +1453,7 @@
       <packagereq type="default">pharosc-synopsys</packagereq>
       <packagereq type="default">pharosc-xcircuit</packagereq>
       <packagereq type="default">picocom</packagereq>
+      <packagereq type="default">picprog</packagereq>
       <packagereq type="default">pikdev</packagereq>
       <packagereq type="default">piklab</packagereq>
       <packagereq type="default">pikloops</packagereq>
@@ -1464,7 +1471,6 @@
       <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
       <packagereq type="default">vrq</packagereq>
-      <packagereq type="default">vym</packagereq>
       <packagereq type="default">xcircuit</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
@@ -1474,8 +1480,6 @@
       <packagereq type="optional">kdesvn</packagereq>
       <packagereq type="optional">minicom</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
-      <packagereq type="optional">planner</packagereq>
-      <packagereq type="optional">qemu</packagereq>
       <packagereq type="optional">rfdump</packagereq>
     </packagelist>
   </group>



From hadess at fedoraproject.org  Mon Sep 28 17:50:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 17:50:51 +0000 (UTC)
Subject: rpms/rhythmbox/devel 0001-Use-C-only-for-the-browser-plugin.patch, 
	NONE, 1.1 rhythmbox.spec, 1.265, 1.266
Message-ID: <20090928175051.59CB911C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27872

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Use-C-only-for-the-browser-plugin.patch 
Log Message:
* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-3
- Fix the symbols for the browser plugin being mangled (#525826)


0001-Use-C-only-for-the-browser-plugin.patch:
 b/configure.ac                    |    1 
 b/podcast/Makefile.am             |    4 
 b/podcast/rhythmbox-itms-plugin.c |  215 ++++++++++++++++++++++++++++++++++++++
 podcast/rhythmbox-itms-plugin.cpp |  215 --------------------------------------
 4 files changed, 217 insertions(+), 218 deletions(-)

--- NEW FILE 0001-Use-C-only-for-the-browser-plugin.patch ---
>From 3e162c21ccf892a02a81f5b737862d0eb82c2b15 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 28 Sep 2009 18:46:12 +0100
Subject: [PATCH] Use C-only for the browser plugin

Because C++ sucks, and mangles our nice symbol names, which
means the browsers can't find them.

I'm not debugging C++ linkers.
---
 configure.ac                      |    1 -
 podcast/Makefile.am               |    4 +-
 podcast/rhythmbox-itms-plugin.c   |  215 +++++++++++++++++++++++++++++++++++++
 podcast/rhythmbox-itms-plugin.cpp |  214 ------------------------------------
 4 files changed, 217 insertions(+), 217 deletions(-)
 create mode 100644 podcast/rhythmbox-itms-plugin.c
 delete mode 100644 podcast/rhythmbox-itms-plugin.cpp

diff --git a/configure.ac b/configure.ac
index e92aa3a..db6ed1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,6 @@ IT_PROG_INTLTOOL([0.35.0])
 
 AC_ISC_POSIX
 AC_PROG_CC
-AC_PROG_CXX
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
diff --git a/podcast/Makefile.am b/podcast/Makefile.am
index f944c58..2c0801a 100644
--- a/podcast/Makefile.am
+++ b/podcast/Makefile.am
@@ -41,13 +41,13 @@ AM_CFLAGS =						\
 
 librbpodcast_la_LDFLAGS = -export-dynamic
 
-PLUGIN_FILES = rhythmbox-itms-plugin.cpp npapi.h npupp.h npruntime.h
+PLUGIN_FILES = rhythmbox-itms-plugin.c npapi.h npupp.h npruntime.h
 
 if ENABLE_BROWSER_PLUGIN
 plugindir = $(MOZILLA_PLUGINDIR)
 plugin_LTLIBRARIES = librhythmbox-itms-detection-plugin.la
 librhythmbox_itms_detection_plugin_la_SOURCES = $(PLUGIN_FILES)
-librhythmbox_itms_detection_plugin_la_CXXFLAGS = -I$(top_srcdir)/podcast
+librhythmbox_itms_detection_plugin_la_CFLAGS = -I$(top_srcdir)/podcast
 
 librhythmbox_itms_detection_plugin_la_LDFLAGS = \
 	-avoid-version	\
diff --git a/podcast/rhythmbox-itms-plugin.c b/podcast/rhythmbox-itms-plugin.c
new file mode 100644
index 0000000..a4be72a
--- /dev/null
+++ b/podcast/rhythmbox-itms-plugin.c
@@ -0,0 +1,215 @@
+/*
+ *  Copyright ? 2007 Bastien Nocera <hadess at hadess.net>
+ *  Copyright ? 2005 Jorn Baayen <jbaayen at gnome.org>
+ *  Copyright ? 2005 Christian Persch
+ *
+ *  Based on the work of:
+ *
+ *  Copyright ? 2004 Bastien Nocera <hadess at hadess.net>
+ *  Copyright ? 2002 David A. Schleef <ds at schleef.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#define bool int
+#include <string.h>
+#include <npupp.h>
+
+static NPNetscapeFuncs mozilla_functions;
+
+static NPError
+plugin_new_instance (NPMIMEType mime_type,
+		     NPP instance,
+		     uint16 mode,
+		     int16 argc,
+		     char **argn,
+		     char **argv,
+		     NPSavedData *saved)
+{
+	return NPERR_INVALID_INSTANCE_ERROR;
+}
+
+static NPError
+plugin_destroy_instance (NPP instance,
+			 NPSavedData **save)
+{
+	return NPERR_NO_ERROR;
+}
+
+static NPError
+plugin_new_stream (NPP instance,
+		   NPMIMEType type,
+		   NPStream *stream_ptr,
+		   NPBool seekable,
+		   uint16 *stype)
+{
+	return NPERR_INVALID_PARAM;
+}
+
+static NPError
+plugin_stream_as_file (NPP instance,
+		       NPStream* stream,
+		       const char *filename)
+{
+	return NPERR_INVALID_PARAM;
+}
+
+static NPError
+plugin_destroy_stream (NPP instance,
+		       NPStream *stream,
+		       NPError reason)
+{
+	return NPERR_NO_ERROR;
+}
+
+static int32
+plugin_write_ready (NPP instance,
+		    NPStream *stream)
+{
+	return 0;
+}
+
+static int32
+plugin_write (NPP instance,
+	      NPStream *stream,
+	      int32 offset,
+	      int32 len,
+	      void *buffer)
+{
+	return -1;
+}
+
+static NPError
+plugin_get_value (NPP instance,
+		  NPPVariable variable,
+		  void *value)
+{
+	NPError err = NPERR_NO_ERROR;
+
+	switch (variable) {
+	case NPPVpluginNameString:
+		*((char **) value) = "iTunes Application Detector";
+		break;
+
+	case NPPVpluginDescriptionString:
+		*((char **) value) = "This plug-in detects the presence of iTunes when opening iTunes Store URLs in a web page with Firefox.";
+		break;
+
+	case NPPVpluginNeedsXEmbed:
+		*((NPBool *) value) = FALSE;
+		break;
+
+	default:
+		err = NPERR_INVALID_PARAM;
+		break;
+	}
+
+	return err;
+}
+
+NPError
+NP_GetValue (void *future,
+	     NPPVariable variable,
+	     void *value)
+{
+	return plugin_get_value (NULL, variable, value);
+}
+
+char *
+NP_GetMIMEDescription (void)
+{
+	return "application/itunes-plugin::;";
+}
+
+NPError
+NP_Initialize (NPNetscapeFuncs *moz_funcs,
+               NPPluginFuncs *plugin_funcs)
+{
+	if (moz_funcs == NULL || plugin_funcs == NULL)
+		return NPERR_INVALID_FUNCTABLE_ERROR;
+
+	if ((moz_funcs->version >> 8) > NP_VERSION_MAJOR)
+		return NPERR_INCOMPATIBLE_VERSION_ERROR;
+	if (moz_funcs->size < sizeof (NPNetscapeFuncs))
+		return NPERR_INVALID_FUNCTABLE_ERROR;
+	if (plugin_funcs->size < sizeof (NPPluginFuncs))
+		return NPERR_INVALID_FUNCTABLE_ERROR;
+
+	/*
+	 * Copy all of the fields of the Mozilla function table into our
+	 * copy so we can call back into Mozilla later.  Note that we need
+	 * to copy the fields one by one, rather than assigning the whole
+	 * structure, because the Mozilla function table could actually be
+	 * bigger than what we expect.
+	 */
+	mozilla_functions.size             = moz_funcs->size;
+	mozilla_functions.version          = moz_funcs->version;
+	mozilla_functions.geturl           = moz_funcs->geturl;
+	mozilla_functions.posturl          = moz_funcs->posturl;
+	mozilla_functions.requestread      = moz_funcs->requestread;
+	mozilla_functions.newstream        = moz_funcs->newstream;
+	mozilla_functions.write            = moz_funcs->write;
+	mozilla_functions.destroystream    = moz_funcs->destroystream;
+	mozilla_functions.status           = moz_funcs->status;
+	mozilla_functions.uagent           = moz_funcs->uagent;
+	mozilla_functions.memalloc         = moz_funcs->memalloc;
+	mozilla_functions.memfree          = moz_funcs->memfree;
+	mozilla_functions.memflush         = moz_funcs->memflush;
+	mozilla_functions.reloadplugins    = moz_funcs->reloadplugins;
+	mozilla_functions.getJavaEnv       = moz_funcs->getJavaEnv;
+	mozilla_functions.getJavaPeer      = moz_funcs->getJavaPeer;
+	mozilla_functions.geturlnotify     = moz_funcs->geturlnotify;
+	mozilla_functions.posturlnotify    = moz_funcs->posturlnotify;
+	mozilla_functions.getvalue         = moz_funcs->getvalue;
+	mozilla_functions.setvalue         = moz_funcs->setvalue;
+	mozilla_functions.invalidaterect   = moz_funcs->invalidaterect;
+	mozilla_functions.invalidateregion = moz_funcs->invalidateregion;
+	mozilla_functions.forceredraw      = moz_funcs->forceredraw;
+	mozilla_functions.geturl           = moz_funcs->geturl;
+
+	/*
+	 * Set up a plugin function table that Mozilla will use to call
+	 * into us.  Mozilla needs to know about our version and size and
+	 * have a UniversalProcPointer for every function we implement.
+	 */
+
+	plugin_funcs->size = sizeof (NPPluginFuncs);
+	plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+	plugin_funcs->newp = NewNPP_NewProc (plugin_new_instance);
+	plugin_funcs->destroy = NewNPP_DestroyProc (plugin_destroy_instance);
+	plugin_funcs->setwindow = NewNPP_SetWindowProc (NULL);
+	plugin_funcs->newstream = NewNPP_NewStreamProc (plugin_new_stream);
+	plugin_funcs->destroystream = NewNPP_DestroyStreamProc (plugin_destroy_stream);
+	plugin_funcs->asfile = NewNPP_StreamAsFileProc (plugin_stream_as_file);
+	plugin_funcs->writeready = NewNPP_WriteReadyProc (plugin_write_ready);
+	plugin_funcs->write = NewNPP_WriteProc (plugin_write);
+	plugin_funcs->print = NewNPP_PrintProc (NULL);
+	plugin_funcs->event = NewNPP_HandleEventProc (NULL);
+	plugin_funcs->urlnotify = NewNPP_URLNotifyProc (NULL);
+	plugin_funcs->javaClass = NULL;
+	plugin_funcs->getvalue = NewNPP_GetValueProc (plugin_get_value);
+	plugin_funcs->setvalue = NewNPP_SetValueProc (NULL);
+
+	return NPERR_NO_ERROR;
+}
+
+NPError
+NP_Shutdown (void)
+{
+	return NPERR_NO_ERROR;
+}
diff --git a/podcast/rhythmbox-itms-plugin.cpp b/podcast/rhythmbox-itms-plugin.cpp
deleted file mode 100644
index fbe0de1..0000000
--- a/podcast/rhythmbox-itms-plugin.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  Copyright ? 2007 Bastien Nocera <hadess at hadess.net>
- *  Copyright ? 2005 Jorn Baayen <jbaayen at gnome.org>
- *  Copyright ? 2005 Christian Persch
- *
- *  Based on the work of:
- *
- *  Copyright ? 2004 Bastien Nocera <hadess at hadess.net>
- *  Copyright ? 2002 David A. Schleef <ds at schleef.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-#include <npupp.h>
-
-static NPNetscapeFuncs mozilla_functions;
-
-static NPError
-plugin_new_instance (NPMIMEType mime_type,
-		     NPP instance,
-		     uint16 mode,
-		     int16 argc,
-		     char **argn,
-		     char **argv,
-		     NPSavedData *saved)
-{
-	return NPERR_INVALID_INSTANCE_ERROR;
-}
-
-static NPError
-plugin_destroy_instance (NPP instance,
-			 NPSavedData **save)
-{
-	return NPERR_NO_ERROR;
-}
-
-static NPError
-plugin_new_stream (NPP instance,
-		   NPMIMEType type,
-		   NPStream *stream_ptr,
-		   NPBool seekable,
-		   uint16 *stype)
-{
-	return NPERR_INVALID_PARAM;
-}
-
-static NPError
-plugin_stream_as_file (NPP instance,
-		       NPStream* stream,
-		       const char *filename)
-{
-	return NPERR_INVALID_PARAM;
-}
-
-static NPError
-plugin_destroy_stream (NPP instance,
-		       NPStream *stream,
-		       NPError reason)
-{
-	return NPERR_NO_ERROR;
-}
-
-static int32
-plugin_write_ready (NPP instance,
-		    NPStream *stream)
-{
-	return 0;
-}
-
-static int32
-plugin_write (NPP instance,
-	      NPStream *stream,
-	      int32 offset,
-	      int32 len,
-	      void *buffer)
-{
-	return -1;
-}
-
-static NPError
-plugin_get_value (NPP instance,
-		  NPPVariable variable,
-		  void *value)
-{
-	NPError err = NPERR_NO_ERROR;
-
-	switch (variable) {
-	case NPPVpluginNameString:
-		*((char **) value) = "iTunes Application Detector";
-		break;
-
-	case NPPVpluginDescriptionString:
-		*((char **) value) = "This plug-in detects the presence of iTunes when opening iTunes Store URLs in a web page with Firefox.";
-		break;
-
-	case NPPVpluginNeedsXEmbed:
-		*((NPBool *) value) = FALSE;
-		break;
-
-	default:
-		err = NPERR_INVALID_PARAM;
-		break;
-	}
-
-	return err;
-}
-
-NPError
-NP_GetValue (void *future,
-	     NPPVariable variable,
-	     void *value)
-{
-	return plugin_get_value (NULL, variable, value);
-}
-
-char *
-NP_GetMIMEDescription (void)
-{
-	return "application/itunes-plugin::;";
-}
-
-NPError
-NP_Initialize (NPNetscapeFuncs *moz_funcs,
-               NPPluginFuncs *plugin_funcs)
-{
-	if (moz_funcs == NULL || plugin_funcs == NULL)
-		return NPERR_INVALID_FUNCTABLE_ERROR;
-
-	if ((moz_funcs->version >> 8) > NP_VERSION_MAJOR)
-		return NPERR_INCOMPATIBLE_VERSION_ERROR;
-	if (moz_funcs->size < sizeof (NPNetscapeFuncs))
-		return NPERR_INVALID_FUNCTABLE_ERROR;
-	if (plugin_funcs->size < sizeof (NPPluginFuncs))
-		return NPERR_INVALID_FUNCTABLE_ERROR;
-
-	/*
-	 * Copy all of the fields of the Mozilla function table into our
-	 * copy so we can call back into Mozilla later.  Note that we need
-	 * to copy the fields one by one, rather than assigning the whole
-	 * structure, because the Mozilla function table could actually be
-	 * bigger than what we expect.
-	 */
-	mozilla_functions.size             = moz_funcs->size;
-	mozilla_functions.version          = moz_funcs->version;
-	mozilla_functions.geturl           = moz_funcs->geturl;
-	mozilla_functions.posturl          = moz_funcs->posturl;
-	mozilla_functions.requestread      = moz_funcs->requestread;
-	mozilla_functions.newstream        = moz_funcs->newstream;
-	mozilla_functions.write            = moz_funcs->write;
-	mozilla_functions.destroystream    = moz_funcs->destroystream;
-	mozilla_functions.status           = moz_funcs->status;
-	mozilla_functions.uagent           = moz_funcs->uagent;
-	mozilla_functions.memalloc         = moz_funcs->memalloc;
-	mozilla_functions.memfree          = moz_funcs->memfree;
-	mozilla_functions.memflush         = moz_funcs->memflush;
-	mozilla_functions.reloadplugins    = moz_funcs->reloadplugins;
-	mozilla_functions.getJavaEnv       = moz_funcs->getJavaEnv;
-	mozilla_functions.getJavaPeer      = moz_funcs->getJavaPeer;
-	mozilla_functions.geturlnotify     = moz_funcs->geturlnotify;
-	mozilla_functions.posturlnotify    = moz_funcs->posturlnotify;
-	mozilla_functions.getvalue         = moz_funcs->getvalue;
-	mozilla_functions.setvalue         = moz_funcs->setvalue;
-	mozilla_functions.invalidaterect   = moz_funcs->invalidaterect;
-	mozilla_functions.invalidateregion = moz_funcs->invalidateregion;
-	mozilla_functions.forceredraw      = moz_funcs->forceredraw;
-	mozilla_functions.geturl           = moz_funcs->geturl;
-
-	/*
-	 * Set up a plugin function table that Mozilla will use to call
-	 * into us.  Mozilla needs to know about our version and size and
-	 * have a UniversalProcPointer for every function we implement.
-	 */
-
-	plugin_funcs->size = sizeof (NPPluginFuncs);
-	plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-	plugin_funcs->newp = NewNPP_NewProc (plugin_new_instance);
-	plugin_funcs->destroy = NewNPP_DestroyProc (plugin_destroy_instance);
-	plugin_funcs->setwindow = NewNPP_SetWindowProc (NULL);
-	plugin_funcs->newstream = NewNPP_NewStreamProc (plugin_new_stream);
-	plugin_funcs->destroystream = NewNPP_DestroyStreamProc (plugin_destroy_stream);
-	plugin_funcs->asfile = NewNPP_StreamAsFileProc (plugin_stream_as_file);
-	plugin_funcs->writeready = NewNPP_WriteReadyProc (plugin_write_ready);
-	plugin_funcs->write = NewNPP_WriteProc (plugin_write);
-	plugin_funcs->print = NewNPP_PrintProc (NULL);
-	plugin_funcs->event = NewNPP_HandleEventProc (NULL);
-	plugin_funcs->urlnotify = NewNPP_URLNotifyProc (NULL);
-	plugin_funcs->javaClass = NULL;
-	plugin_funcs->getvalue = NewNPP_GetValueProc (plugin_get_value);
-	plugin_funcs->setvalue = NewNPP_SetValueProc (NULL);
-
-	return NPERR_NO_ERROR;
-}
-
-NPError
-NP_Shutdown (void)
-{
-	return NPERR_NO_ERROR;
-}
-- 
1.6.4.4



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- rhythmbox.spec	28 Sep 2009 14:46:19 -0000	1.265
+++ rhythmbox.spec	28 Sep 2009 17:50:51 -0000	1.266
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -45,10 +45,14 @@ BuildRequires: gstreamer-python-devel
 BuildRequires: libgudev-devel
 BuildRequires: perl(XML::Parser) intltool
 
+
 ExcludeArch:    s390 s390x
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596573
 Patch0: rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=525826
+BuildRequires: automake autoconf
+Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -83,6 +87,9 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
 
+%patch1 -p1 -b .itms
+autoreconf -i
+
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
 
@@ -212,6 +219,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-3
+- Fix the symbols for the browser plugin being mangled (#525826)
+
 * Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 0.12.5-2
 - Apply a patch from upstream to inhibit gnome-session, rather than
   gnome-power-manager. This fixes a warning on rawhide.



From orion at fedoraproject.org  Mon Sep 28 17:54:30 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Sep 2009 17:54:30 +0000 (UTC)
Subject: rpms/plplot/devel .cvsignore, 1.17, 1.18 plplot.spec, 1.87,
	1.88 sources, 1.17, 1.18
Message-ID: <20090928175430.D085511C00E4@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29893

Modified Files:
	.cvsignore plplot.spec sources 
Log Message:
* Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
- Update to 5.9.5
- Disable qt tests for now until Xvfb bug is fixed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	26 May 2009 15:07:45 -0000	1.17
+++ .cvsignore	28 Sep 2009 17:54:30 -0000	1.18
@@ -1 +1 @@
-plplot-5.9.4.tar.gz
+plplot-5.9.5.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- plplot.spec	26 Aug 2009 17:53:53 -0000	1.87
+++ plplot.spec	28 Sep 2009 17:54:30 -0000	1.88
@@ -9,8 +9,8 @@
 %bcond_without pdl
 
 Name:           plplot
-Version:        5.9.4
-Release:        8%{?dist}
+Version:        5.9.5
+Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -21,7 +21,7 @@ Patch1:         plplot-5.9.3-multiarch.p
 Patch2:         plplot-5.9.2-info.patch
 Patch3:         plplot-5.9.4-octave32.patch
 Patch4:         plplot-5.9.4-transform_version.patch
-Patch5:         plplot-5.9.3-test.patch
+Patch5:         plplot-5.9.5-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +59,11 @@ BuildRequires:  texlive, texinfo, openja
 BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
 %endif
 BuildRequires:  lua-devel
+BuildRequires:  qt-devel
+#For pyqt4
+BuildRequires:  PyQt4-devel
+#For Qt tests
+BuildRequires:  xorg-x11-xauth, xorg-x11-server-Xvfb
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires:       gnu-free-mono-fonts
@@ -258,8 +263,8 @@ Requires:       pkgconfig
 %setup -q
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .info
-%patch3 -p1 -b .octave32
-%patch4 -p1 -b .transform_version
+#%patch3 -p1 -b .octave32
+#patch4 -p1 -b .transform_version
 %patch5 -p1 -b .test
 %patch6 -p1 -b .jni
 # Convert to UTF-8
@@ -279,50 +284,49 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 export FFLAGS="$RPM_OPT_FLAGS"
 #Needed for octave output to not have control characters
 unset TERM
+printenv
 %cmake .. \
-	-DCMAKE_SKIP_RPATH:BOOL=OFF \
-	-DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
-	-DUSE_RPATH:BOOL=OFF \
+        -DCMAKE_SKIP_RPATH:BOOL=OFF \
+        -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
+        -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_tk:BOOL=ON \
-	-DHAVE_PTHREAD:BOOL=ON \
-	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
-	-DPLD_aqt:BOOL=ON \
-	-DPLD_conex:BOOL=ON \
-	-DPLD_dg300:BOOL=ON \
-	-DPLD_imp:BOOL=ON \
-	-DPLD_linuxvga:BOOL=ON \
-	-DPLD_ljii:BOOL=ON \
-	-DPLD_ljiip:BOOL=ON \
-	-DPLD_mskermit:BOOL=ON \
-	-DPLD_ntk:BOOL=ON \
-	-DPLD_pstex:BOOL=ON \
-	-DPLD_svg:BOOL=ON \
-	-DPLD_tek4010:BOOL=ON \
-	-DPLD_tek4010f:BOOL=ON \
-	-DPLD_tek4107:BOOL=ON \
-	-DPLD_tek4107f:BOOL=ON \
-	-DPLD_versaterm:BOOL=ON \
-	-DPLD_vlt:BOOL=ON \
-	-DPLD_xterm:BOOL=ON \
-	-DPLD_wxwidgets: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_tk:BOOL=ON \
+        -DHAVE_PDL_GRAPHICS_PLPLOT_40:BOOL=ON \
+        -DHAVE_PTHREAD:BOOL=ON \
+        -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
+        -DPLD_aqt:BOOL=ON \
+        -DPLD_conex:BOOL=ON \
+        -DPLD_imp:BOOL=ON \
+        -DPLD_linuxvga:BOOL=ON \
+        -DPLD_mskermit:BOOL=ON \
+        -DPLD_ntk:BOOL=ON \
+        -DPLD_pstex:BOOL=ON \
+        -DPLD_svg:BOOL=ON \
+        -DPLD_tek4010:BOOL=ON \
+        -DPLD_tek4010f:BOOL=ON \
+        -DPLD_tek4107:BOOL=ON \
+        -DPLD_tek4107f:BOOL=ON \
+        -DPLD_versaterm:BOOL=ON \
+        -DPLD_vlt:BOOL=ON \
+        -DPLD_xterm:BOOL=ON \
+        -DPLD_wxwidgets:BOOL=ON \
 %if %{with doc}
-	-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
-	-DBUILD_DOC:BOOL=ON \
+        -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
+        -DBUILD_DOC:BOOL=ON \
 %else
-	-DPREBUILT_DOC:BOOL=ON \
+        -DPREBUILT_DOC:BOOL=ON \
 %endif
-	-DBUILD_TEST:BOOL=ON
+        -DBUILD_TEST:BOOL=ON
 # --debug-output --debug-trycompile \
 #
 make %{?_smp_flags} VERBOSE=1
@@ -346,11 +350,13 @@ done
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
-# Exclude perl and compare tests for now, and ocaml from ppc/ppc64
+# Exclude compare tests for now, and ocaml from ppc/ppc64
+# The *qt tests requires an X server, but Xvfb is segfaulting
+# http://bugs.freedesktop.org/show_bug.cgi?id=23815
 %ifarch ppc ppc64
-ctest -V -E 'compare|ocaml'
+xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|ocaml|qt'
 %else
-ctest -V -E 'compare'
+xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|qt'
 %endif
 
 
@@ -413,7 +419,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libcsirocsa.so.*
 %{_libdir}/libcsironn.so.*
-%{_libdir}/libnistcd.so.*
 %{_libdir}/libplplotcxxd.so.*
 %{_libdir}/libplplotd.so.*
 %{_libdir}/libplplotf77cd.so.*
@@ -425,30 +430,16 @@ fi
 %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/hpgl.rc
-%{_libdir}/plplot%{version}/driversd/hpgl.so
-%{_libdir}/plplot%{version}/driversd/impress.rc
-%{_libdir}/plplot%{version}/driversd/impress.so
 %ifarch %{ix86} x86_64
 %{_libdir}/plplot%{version}/driversd/linuxvga.rc
 %{_libdir}/plplot%{version}/driversd/linuxvga.so
 %endif
-%{_libdir}/plplot%{version}/driversd/ljii.rc
-%{_libdir}/plplot%{version}/driversd/ljii.so
-%{_libdir}/plplot%{version}/driversd/ljiip.rc
-%{_libdir}/plplot%{version}/driversd/ljiip.so
 %{_libdir}/plplot%{version}/driversd/mem.rc
 %{_libdir}/plplot%{version}/driversd/mem.so
 %{_libdir}/plplot%{version}/driversd/ntk.rc
 %{_libdir}/plplot%{version}/driversd/ntk.so
 %{_libdir}/plplot%{version}/driversd/null.rc
 %{_libdir}/plplot%{version}/driversd/null.so
-%{_libdir}/plplot%{version}/driversd/pbm.rc
-%{_libdir}/plplot%{version}/driversd/pbm.so
 %{_libdir}/plplot%{version}/driversd/ps.rc
 %{_libdir}/plplot%{version}/driversd/ps.so
 %{_libdir}/plplot%{version}/driversd/pstex.rc
@@ -457,8 +448,6 @@ fi
 %{_libdir}/plplot%{version}/driversd/psttf.so
 %{_libdir}/plplot%{version}/driversd/svg.rc
 %{_libdir}/plplot%{version}/driversd/svg.so
-%{_libdir}/plplot%{version}/driversd/tek.rc
-%{_libdir}/plplot%{version}/driversd/tek.so
 %{_libdir}/plplot%{version}/driversd/xfig.rc
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
@@ -470,7 +459,6 @@ fi
 %{_includedir}/plplot/
 %{_libdir}/libcsirocsa.so
 %{_libdir}/libcsironn.so
-%{_libdir}/libnistcd.so
 %{_libdir}/libplplotcxxd.so
 %{_libdir}/libplplotd.so
 %{_libdir}/libplplotf77cd.so
@@ -562,7 +550,7 @@ fi
 %files perl
 %defattr(-,root,root,-)
 %{_datadir}/plplot%{version}/examples/perl/
-%{_datadir}/plplot%{version}/examples/test_perl.sh
+%{_datadir}/plplot%{version}/examples/test_pdl.sh
 %endif
 
 %files tk
@@ -596,11 +584,16 @@ fi
 %{_libdir}/plplot%{version}/driversd/wxwidgets.so
 
 %files wxGTK-devel
+%defattr(-,root,root,-)
 %{_libdir}/libplplotwxwidgetsd.so
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 
 %changelog
+* Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
+- Update to 5.9.5
+- Disable qt tests for now until Xvfb bug is fixed.
+
 * Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-8
 - Update octave patch to hopefully fix remaining issue.
 - Re-enable tests


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	26 May 2009 15:07:45 -0000	1.17
+++ sources	28 Sep 2009 17:54:30 -0000	1.18
@@ -1 +1 @@
-db172aaf0a7aa429b63d9bbd28637fd4  plplot-5.9.4.tar.gz
+214c9f984f046bee18f6a3cce2cdec39  plplot-5.9.5.tar.gz



From orion at fedoraproject.org  Mon Sep 28 17:57:13 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Sep 2009 17:57:13 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.5-test.patch, NONE,
	1.1 plplot-5.9.3-test.patch, 1.1, NONE
Message-ID: <20090928175713.88A5611C00E4@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31121

Added Files:
	plplot-5.9.5-test.patch 
Removed Files:
	plplot-5.9.3-test.patch 
Log Message:
Update the patch


plplot-5.9.5-test.patch:
 plplot-test.sh.cmake |   45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE plplot-5.9.5-test.patch ---
--- plplot-5.9.4/plplot_test/plplot-test.sh.cmake.test	2009-08-26 13:43:29.454693200 -0600
+++ plplot-5.9.4/plplot_test/plplot-test.sh.cmake	2009-08-26 13:46:14.464631523 -0600
@@ -35,8 +35,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
@@ -148,18 +149,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
@@ -295,21 +284,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 pdl"
-   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
@@ -335,9 +321,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
 


--- plplot-5.9.3-test.patch DELETED ---



From fschwarz at fedoraproject.org  Mon Sep 28 18:41:13 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Mon, 28 Sep 2009 18:41:13 +0000 (UTC)
Subject: rpms/python-TurboMail/devel .cvsignore, 1.4, 1.5 LICENSE.txt, 1.1, 
	1.2 python-TurboMail.spec, 1.11, 1.12 sources, 1.4,
	1.5 python-TurboMail-tgreq.patch, 1.1, NONE
Message-ID: <20090928184114.0899711C00E4@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-TurboMail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16738

Modified Files:
	.cvsignore LICENSE.txt python-TurboMail.spec sources 
Removed Files:
	python-TurboMail-tgreq.patch 
Log Message:
update to TurboMail 3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Nov 2007 23:53:45 -0000	1.4
+++ .cvsignore	28 Sep 2009 18:41:10 -0000	1.5
@@ -1 +1 @@
-TurboMail-2.1.tar.gz
+TurboMail-3.0.tar.gz


Index: LICENSE.txt
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/devel/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- LICENSE.txt	16 Dec 2006 02:56:11 -0000	1.1
+++ LICENSE.txt	28 Sep 2009 18:41:10 -0000	1.2
@@ -1,10 +1,10 @@
 This is the MIT license:
 http://www.opensource.org/licenses/mit-license.php
 
-Copyright (c) 2005, 2006 Kevin Dangoor and contributors. TurboGears is a trademark of Kevin Dangoor.
+Copyright (c) 2007-2009 Alice Bevan-McGregor and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


Index: python-TurboMail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/devel/python-TurboMail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-TurboMail.spec	26 Jul 2009 20:06:04 -0000	1.11
+++ python-TurboMail.spec	28 Sep 2009 18:41:10 -0000	1.12
@@ -2,37 +2,33 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-TurboMail
-Version:        2.1
-Release:        7%{?dist}
+Version:        3.0
+Release:        1%{?dist}
 Summary:        Multi-threaded mail queue manager for TurboGears applications
 
 Group:          Development/Libraries
 License:        MIT
-URL:            http://trac.orianagroup.com/turbomail
-Source0:        http://cheeseshop.python.org/packages/source/T/TurboMail/TurboMail-%{version}.tar.gz
+URL:            http://www.python-turbomail.org
+Source0:        http://pypi.python.org/packages/source/T/TurboMail/TurboMail-%{version}.tar.gz
 Source1:        LICENSE.txt
-Patch0:         %{name}-tgreq.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  TurboGears python-devel
-Requires:       TurboGears
+BuildRequires:  python-setuptools-devel
+Requires:       python-setuptools
 
 
 %description
-TurboMail is a TurboGears extension, meaning that it starts up and shuts down
-alongside any TurboGears applications you write, in the same way that visit
-tracking and identity do. TurboMail uses built-in Python modules for SMTP
+TurboMail is a multi-threaded mail delivery subsystem and MIME message
+generation framework for Python. TurboMail uses built-in Python modules for SMTP
 communication and MIME e-mail creation, but greatly simplifies these tasks by
-performing the grunt-work for you. Additionally, TurboMail is multi-threaded,
-allowing for single or batch enqueueing and background delivery of mail.
+performing the grunt-work for you.
 
 %prep
 %setup -q -n TurboMail-%{version}
-%patch0
-cp %{SOURCE1} .
+find . -type f -name '.*' | xargs rm -rf
 rm -fr tests
-
+cp %{SOURCE1} .
 
 %build
 %{__python} setup.py build
@@ -50,10 +46,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README.txt LICENSE.txt
 %{python_sitelib}/TurboMail-%{version}-py%{pyver}.egg-info
-%dir %{python_sitelib}/turbomail
-%{python_sitelib}/turbomail/*.py*
+%{python_sitelib}/turbomail/
+
 
 %changelog
+* Mon Sep 28 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 3.0-1
+- Update to new major version 3.0
+- fixed copyright attribution in LICENSE.txt
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2007 23:53:45 -0000	1.4
+++ sources	28 Sep 2009 18:41:10 -0000	1.5
@@ -1 +1 @@
-36087c074e7943e8a352ef6cdd3dc04f  TurboMail-2.1.tar.gz
+d70fa65c5e64d863b001898209e92607  TurboMail-3.0.tar.gz


--- python-TurboMail-tgreq.patch DELETED ---



From hadess at fedoraproject.org  Mon Sep 28 18:43:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 18:43:45 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.266,1.267
Message-ID: <20090928184345.0B95B11C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18809

Modified Files:
	rhythmbox.spec 
Log Message:
add missing libtool BR


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- rhythmbox.spec	28 Sep 2009 17:50:51 -0000	1.266
+++ rhythmbox.spec	28 Sep 2009 18:43:44 -0000	1.267
@@ -51,7 +51,7 @@ ExcludeArch:    s390 s390x
 # https://bugzilla.gnome.org/show_bug.cgi?id=596573
 Patch0: rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=525826
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
 
 %description



From jgreguske at fedoraproject.org  Mon Sep 28 18:47:11 2009
From: jgreguske at fedoraproject.org (Jay Greguske)
Date: Mon, 28 Sep 2009 18:47:11 +0000 (UTC)
Subject: rpms/pycdio/devel pycdio-remove-get-devices-compensation.patch, NONE,
	1.1 pycdio.spec, 1.1, 1.2
Message-ID: <20090928184711.DDA6511C00E4@cvs1.fedora.phx.redhat.com>

Author: jgreguske

Update of /cvs/pkgs/rpms/pycdio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19873

Modified Files:
	pycdio.spec 
Added Files:
	pycdio-remove-get-devices-compensation.patch 
Log Message:
added patch to remove get_device* compensations no longer needed


pycdio-remove-get-devices-compensation.patch:
 cdio.py |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

--- NEW FILE pycdio-remove-get-devices-compensation.patch ---
--- cdio.py
+++ cdio.py2
@@ -1,6 +1,4 @@
-#  $Id: cdio.py,v 1.6 2008/05/01 16:55:03 karl Exp $
-#
-#  Copyright (C) 2006, 2008 Rocky Bernstein <rocky at gnu.org>
+#  Copyright (C) 2006, 2008, 2009 Rocky Bernstein <rocky at gnu.org>
 #
 #  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
@@ -138,9 +136,7 @@ def get_devices_ret(driver_id=pycdio.DRIVER_UNKNOWN):
     afterwards. Giving the driver back facilitates this, and speeds things
     up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_ret(driver_id)[1:]
+    return pycdio.get_devices_ret(driver_id)
 
 def get_devices_with_cap(capabilities, any=False):
     """
@@ -160,9 +156,7 @@ def get_devices_with_cap(capabilities, any=False):
     dereferencing the the value is NULL. This also means nothing was
     found.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap(capabilities, any)
 
 def get_devices_with_cap_ret(capabilities, any=False):
     """
@@ -174,9 +168,7 @@ def get_devices_with_cap_ret(capabilities, any=False):
     and then *open* it afterwards. Giving the driver back facilitates this,
       and speeds things up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap_ret(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap_ret(capabilities, any)
 
 def have_driver(driver_id):
     """


Index: pycdio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/devel/pycdio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pycdio.spec	29 Jul 2009 19:19:22 -0000	1.1
+++ pycdio.spec	28 Sep 2009 18:47:11 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pycdio
 Version:	0.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Python interface to the CD Input and Control library
 
 Group:		Development/Libraries
@@ -13,6 +13,7 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/libcd
 # Remove shebangs in the modules
 # a patch was emailed and accepted on libcdio-pycdio-devel at gnu.org
 Patch0:		pycdio-remove-shebangs.patch
+Patch1:		pycdio-remove-get-devices-compensation.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	python-devel,python-setuptools,libcdio-devel,swig
@@ -26,6 +27,7 @@ device-dependent properties of a CD-ROM 
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,8 @@ rm -rf %{buildroot}
 %doc README.txt
 
 %changelog
+* Mon Sep 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-4
+- Off-by-one compensation in get_devices_* not needed anymore
 * Tue Jul 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-3
 - Added a patch to remove unnecessary shebangs
 * Mon Jul 27 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-2



From jforbes at fedoraproject.org  Mon Sep 28 19:22:06 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Mon, 28 Sep 2009 19:22:06 +0000 (UTC)
Subject: rpms/kernel/F-12
	linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch,
	NONE, 1.1 linux-2.6-xen-improvement-to-wait_for_devices.patch,
	NONE, 1.1 linux-2.6-xen-increase-device-connection-timeout.patch,
	NONE, 1.1 kernel.spec, 1.1836, 1.1837
Message-ID: <20090928192206.E1DD811C00E4@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6150

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch 
	linux-2.6-xen-improvement-to-wait_for_devices.patch 
	linux-2.6-xen-increase-device-connection-timeout.patch 
Log Message:
Increase timeout for xen frontend devices to connect.

linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch:
 xenbus_probe.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch ---
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Wed, 8 Jul 2009 10:27:37 +0000 (+0200)
Subject: xen: fix is_disconnected_device/exists_disconnected_device
X-Git-Tag: xen-dom0-2.6.31-rc3~3^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=8800a1de3df00fa994f72ad0d7c1eda9b5a0b514

xen: fix is_disconnected_device/exists_disconnected_device

The logic of is_disconnected_device/exists_disconnected_device is wrong
in that they are used to test whether a device is trying to connect (i.e.
connecting).  For this reason the patch fixes them to not consider a
Closing or Closed device to be connecting.  At the same time the patch
also renames the functions according to what they really do; you could
say a closed device is "disconnected" (the old name), but not "connecting"
(the new name).

This patch is a backport of changeset 909 from the Xenbits tree.

Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index d42e25d..c543766 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -843,7 +843,7 @@ postcore_initcall(xenbus_probe_init);
 
 MODULE_LICENSE("GPL");
 
-static int is_disconnected_device(struct device *dev, void *data)
+static int is_device_connecting(struct device *dev, void *data)
 {
 	struct xenbus_device *xendev = to_xenbus_device(dev);
 	struct device_driver *drv = data;
@@ -861,14 +861,15 @@ static int is_disconnected_device(struct device *dev, void *data)
 		return 0;
 
 	xendrv = to_xenbus_driver(dev->driver);
-	return (xendev->state != XenbusStateConnected ||
-		(xendrv->is_ready && !xendrv->is_ready(xendev)));
+	return (xendev->state < XenbusStateConnected ||
+		(xendev->state == XenbusStateConnected &&
+		 xendrv->is_ready && !xendrv->is_ready(xendev)));
 }
 
-static int exists_disconnected_device(struct device_driver *drv)
+static int exists_connecting_device(struct device_driver *drv)
 {
 	return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
-				is_disconnected_device);
+				is_device_connecting);
 }
 
 static int print_device_status(struct device *dev, void *data)
@@ -918,7 +919,7 @@ static void wait_for_devices(struct xenbus_driver *xendrv)
 	if (!ready_to_wait_for_devices || !xen_domain())
 		return;
 
-	while (exists_disconnected_device(drv)) {
+	while (exists_connecting_device(drv)) {
 		if (time_after(jiffies, timeout))
 			break;
 		schedule_timeout_interruptible(HZ/10);

linux-2.6-xen-improvement-to-wait_for_devices.patch:
 xenbus_probe.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-xen-improvement-to-wait_for_devices.patch ---
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Wed, 8 Jul 2009 10:27:38 +0000 (+0200)
Subject: xen: improvement to wait_for_devices()
X-Git-Tag: xen-dom0-2.6.31-rc3~3^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=ed9ef1e71122628b50b0a526607509511b0d9135

xen: improvement to wait_for_devices()

When printing a warning about a timed-out device, print the
current state of both ends of the device connection (i.e., backend as
well as frontend).  This backports half of changeset 146 from the
Xenbits tree.

Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index c543766..3a867a5 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -885,10 +885,13 @@ static int print_device_status(struct device *dev, void *data)
 		/* Information only: is this too noisy? */
 		printk(KERN_INFO "XENBUS: Device with no driver: %s\n",
 		       xendev->nodename);
-	} else if (xendev->state != XenbusStateConnected) {
+	} else if (xendev->state < XenbusStateConnected) {
+		enum xenbus_state rstate = XenbusStateUnknown;
+		if (xendev->otherend)
+			rstate = xenbus_read_driver_state(xendev->otherend);
 		printk(KERN_WARNING "XENBUS: Timeout connecting "
-		       "to device: %s (state %d)\n",
-		       xendev->nodename, xendev->state);
+		       "to device: %s (local state %d, remote state %d)\n",
+		       xendev->nodename, xendev->state, rstate);
 	}
 
 	return 0;

linux-2.6-xen-increase-device-connection-timeout.patch:
 xenbus_probe.c |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-xen-increase-device-connection-timeout.patch ---
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Wed, 8 Jul 2009 10:27:39 +0000 (+0200)
Subject: xen: wait up to 5 minutes for device connetion
X-Git-Tag: xen-dom0-2.6.31-rc3~3^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=11b84f69d36b518ff862a1bcd61ace7f8dac76b5;hp=ed9ef1e71122628b50b0a526607509511b0d9135

xen: wait up to 5 minutes for device connetion

Increases the device timeout from 10s to 5 minutes, giving the user a
visual indication during that time in case there are problems.  The patch
is a backport of changesets 144 and 150 in the Xenbits tree.

Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 3a867a5..4f69159 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -901,7 +901,7 @@ static int print_device_status(struct device *dev, void *data)
 static int ready_to_wait_for_devices;
 
 /*
- * On a 10 second timeout, wait for all devices currently configured.  We need
+ * On a 5-minute timeout, wait for all devices currently configured.  We need
  * to do this to guarantee that the filesystems and / or network devices
  * needed for boot are available, before we can allow the boot to proceed.
  *
@@ -916,18 +916,30 @@ static int ready_to_wait_for_devices;
  */
 static void wait_for_devices(struct xenbus_driver *xendrv)
 {
-	unsigned long timeout = jiffies + 10*HZ;
+	unsigned long start = jiffies;
 	struct device_driver *drv = xendrv ? &xendrv->driver : NULL;
+	unsigned int seconds_waited = 0;
 
 	if (!ready_to_wait_for_devices || !xen_domain())
 		return;
 
 	while (exists_connecting_device(drv)) {
-		if (time_after(jiffies, timeout))
-			break;
+		if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {
+			if (!seconds_waited)
+				printk(KERN_WARNING "XENBUS: Waiting for "
+				       "devices to initialise: ");
+			seconds_waited += 5;
+			printk("%us...", 300 - seconds_waited);
+			if (seconds_waited == 300)
+				break;
+		}
+
 		schedule_timeout_interruptible(HZ/10);
 	}
 
+	if (seconds_waited)
+		printk("\n");
+
 	bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
 			 print_device_status);
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1836
retrieving revision 1.1837
diff -u -p -r1.1836 -r1.1837
--- kernel.spec	27 Sep 2009 19:57:56 -0000	1.1836
+++ kernel.spec	28 Sep 2009 19:22:04 -0000	1.1837
@@ -697,6 +697,9 @@ Patch1579: linux-2.6-virtio_blk-revert-Q
 Patch1580: linux-2.6-xen-check-efer-fix.patch
 Patch1581: linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
 Patch1582: linux-2.6-xen-spinlock-stronger-barrier.patch
+Patch1583: linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
+Patch1584: linux-2.6-xen-improvement-to-wait_for_devices.patch
+Patch1585: linux-2.6-xen-increase-device-connection-timeout.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next-8ef8678c8.patch
@@ -1356,6 +1359,9 @@ ApplyPatch linux-2.6-ksm-kvm.patch
 ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 ApplyPatch linux-2.6-xen-check-efer-fix.patch
+ApplyPatch linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
+ApplyPatch linux-2.6-xen-improvement-to-wait_for_devices.patch
+ApplyPatch linux-2.6-xen-increase-device-connection-timeout.patch
 
 # improve xen spinlock scalability
 ApplyPatch linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
@@ -2063,6 +2069,9 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 28 2009 Justin M. Forbes <jmforbes at redhat.com> 2.6.31.1-50
+- Increase timeout for xen frontend devices to connect.
+
 * Sat Sep 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-49
 - Add Xen spinlock patches to improve scalability.
 



From wtogami at fedoraproject.org  Mon Sep 28 19:41:57 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 28 Sep 2009 19:41:57 +0000 (UTC)
Subject: rpms/ltspfs/devel .cvsignore, 1.6, 1.7 ltspfs.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20090928194158.0FF5F11C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltspfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12788

Modified Files:
	.cvsignore ltspfs.spec sources 
Log Message:
0.5.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Jan 2009 04:27:31 -0000	1.6
+++ .cvsignore	28 Sep 2009 19:41:57 -0000	1.7
@@ -1 +1 @@
-ltspfs-0.5.8.tar.bz2
+ltspfs-0.5.13.tar.bz2


Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/ltspfs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ltspfs.spec	17 Sep 2009 06:31:51 -0000	1.8
+++ ltspfs.spec	28 Sep 2009 19:41:57 -0000	1.9
@@ -1,8 +1,8 @@
 Name:           ltspfs
-Version:        0.5.8
+Version:        0.5.13
 %define _datestamp .20081211.20
 #Release:        2%{_datestamp}%{?dist}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        LTSP file system, daemon that runs on thin clients
 
 Group:          System Environment/Base
@@ -14,9 +14,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: fuse-devel
 BuildRequires: libX11-devel
 BuildRequires: glib2-devel
-%if 0%{?rhel} == 5
-Requires:      dkms-fuse
-%endif
 
 %package -n ltspfsd
 Group:          System Environment/Base
@@ -74,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ltspfs_umount
 %{_sysconfdir}/udev/rules.d/88-ltsp.rules
 /lib/udev/ltspfs_entry
+%{_datadir}/ltsp/xinitrc.d/
 %{_datadir}/ldm/
 %{_mandir}/man1/ltspfsd.1.gz
 %{_mandir}/man1/cdpinger.1.gz
@@ -82,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/run/devices/
 
 %changelog
+* Mon Sep 28 2009 Warren Togami <wtogami at redhat.com> - 0.5.13-1
+- 0.5.13
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.5.8-4
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Jan 2009 04:27:31 -0000	1.6
+++ sources	28 Sep 2009 19:41:57 -0000	1.7
@@ -1 +1 @@
-484f5cf26db069c012a1b97480405626  ltspfs-0.5.8.tar.bz2
+9b571fa3dbeb0b0f186f5b7d18ba8c9c  ltspfs-0.5.13.tar.bz2



From jgreguske at fedoraproject.org  Mon Sep 28 19:42:27 2009
From: jgreguske at fedoraproject.org (Jay Greguske)
Date: Mon, 28 Sep 2009 19:42:27 +0000 (UTC)
Subject: rpms/pycdio/F-10 pycdio-remove-get-devices-compensation.patch, NONE,
	1.1 pycdio.spec, 1.1, 1.2
Message-ID: <20090928194227.63C3411C00E4@cvs1.fedora.phx.redhat.com>

Author: jgreguske

Update of /cvs/pkgs/rpms/pycdio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13590

Modified Files:
	pycdio.spec 
Added Files:
	pycdio-remove-get-devices-compensation.patch 
Log Message:
Off-by-one compensation in get_devices_* not needed anymore


pycdio-remove-get-devices-compensation.patch:
 cdio.py |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

--- NEW FILE pycdio-remove-get-devices-compensation.patch ---
--- cdio.py
+++ cdio.py2
@@ -1,6 +1,4 @@
-#  $Id: cdio.py,v 1.6 2008/05/01 16:55:03 karl Exp $
-#
-#  Copyright (C) 2006, 2008 Rocky Bernstein <rocky at gnu.org>
+#  Copyright (C) 2006, 2008, 2009 Rocky Bernstein <rocky at gnu.org>
 #
 #  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
@@ -138,9 +136,7 @@ def get_devices_ret(driver_id=pycdio.DRIVER_UNKNOWN):
     afterwards. Giving the driver back facilitates this, and speeds things
     up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_ret(driver_id)[1:]
+    return pycdio.get_devices_ret(driver_id)
 
 def get_devices_with_cap(capabilities, any=False):
     """
@@ -160,9 +156,7 @@ def get_devices_with_cap(capabilities, any=False):
     dereferencing the the value is NULL. This also means nothing was
     found.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap(capabilities, any)
 
 def get_devices_with_cap_ret(capabilities, any=False):
     """
@@ -174,9 +168,7 @@ def get_devices_with_cap_ret(capabilities, any=False):
     and then *open* it afterwards. Giving the driver back facilitates this,
       and speeds things up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap_ret(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap_ret(capabilities, any)
 
 def have_driver(driver_id):
     """


Index: pycdio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/F-10/pycdio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pycdio.spec	29 Jul 2009 19:21:09 -0000	1.1
+++ pycdio.spec	28 Sep 2009 19:42:27 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pycdio
 Version:	0.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Python interface to the CD Input and Control library
 
 Group:		Development/Libraries
@@ -13,6 +13,7 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/libcd
 # Remove shebangs in the modules
 # a patch was emailed and accepted on libcdio-pycdio-devel at gnu.org
 Patch0:		pycdio-remove-shebangs.patch
+Patch1:		pycdio-remove-get-devices-compensation.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	python-devel,python-setuptools,libcdio-devel,swig
@@ -26,6 +27,7 @@ device-dependent properties of a CD-ROM 
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,8 @@ rm -rf %{buildroot}
 %doc README.txt
 
 %changelog
+* Mon Sep 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-4
+- Off-by-one compensation in get_devices_* not needed anymore
 * Tue Jul 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-3
 - Added a patch to remove unnecessary shebangs
 * Mon Jul 27 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-2



From behdad at fedoraproject.org  Mon Sep 28 19:45:25 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 28 Sep 2009 19:45:25 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.88, 1.89 sources, 1.90, 1.91 vte.spec, 
	1.164, 1.165
Message-ID: <20090928194525.2283711C00E4@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14633

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore	25 Sep 2009 21:30:31 -0000	1.88
+++ .cvsignore	28 Sep 2009 19:45:24 -0000	1.89
@@ -1 +1 @@
-vte-0.22.1.tar.bz2
+vte-0.22.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	25 Sep 2009 21:30:31 -0000	1.90
+++ sources	28 Sep 2009 19:45:24 -0000	1.91
@@ -1 +1 @@
-81fef1b248717f5fa66fe9e9d86508da  vte-0.22.1.tar.bz2
+c278925fd7da427998c506d5ba99478e  vte-0.22.2.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- vte.spec	25 Sep 2009 21:30:31 -0000	1.164
+++ vte.spec	28 Sep 2009 19:45:24 -0000	1.165
@@ -3,8 +3,8 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.22.1
-Release: 2%{?dist}
+Version: 0.22.2
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep 28 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.2-1
+- Update to 0.22.2
+
 * Fri Sep 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.1-2
 - Second try
 



From jgreguske at fedoraproject.org  Mon Sep 28 19:51:39 2009
From: jgreguske at fedoraproject.org (Jay Greguske)
Date: Mon, 28 Sep 2009 19:51:39 +0000 (UTC)
Subject: rpms/pycdio/F-11 pycdio-remove-get-devices-compensation.patch, NONE,
	1.1 pycdio.spec, 1.1, 1.2
Message-ID: <20090928195139.EF25F11C00E4@cvs1.fedora.phx.redhat.com>

Author: jgreguske

Update of /cvs/pkgs/rpms/pycdio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17287

Modified Files:
	pycdio.spec 
Added Files:
	pycdio-remove-get-devices-compensation.patch 
Log Message:
Off-by-one compensation in get_devices_* not needed anymore



pycdio-remove-get-devices-compensation.patch:
 cdio.py |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

--- NEW FILE pycdio-remove-get-devices-compensation.patch ---
--- cdio.py
+++ cdio.py2
@@ -1,6 +1,4 @@
-#  $Id: cdio.py,v 1.6 2008/05/01 16:55:03 karl Exp $
-#
-#  Copyright (C) 2006, 2008 Rocky Bernstein <rocky at gnu.org>
+#  Copyright (C) 2006, 2008, 2009 Rocky Bernstein <rocky at gnu.org>
 #
 #  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
@@ -138,9 +136,7 @@ def get_devices_ret(driver_id=pycdio.DRIVER_UNKNOWN):
     afterwards. Giving the driver back facilitates this, and speeds things
     up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_ret(driver_id)[1:]
+    return pycdio.get_devices_ret(driver_id)
 
 def get_devices_with_cap(capabilities, any=False):
     """
@@ -160,9 +156,7 @@ def get_devices_with_cap(capabilities, any=False):
     dereferencing the the value is NULL. This also means nothing was
     found.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap(capabilities, any)
 
 def get_devices_with_cap_ret(capabilities, any=False):
     """
@@ -174,9 +168,7 @@ def get_devices_with_cap_ret(capabilities, any=False):
     and then *open* it afterwards. Giving the driver back facilitates this,
       and speeds things up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap_ret(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap_ret(capabilities, any)
 
 def have_driver(driver_id):
     """


Index: pycdio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/F-11/pycdio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pycdio.spec	29 Jul 2009 20:21:58 -0000	1.1
+++ pycdio.spec	28 Sep 2009 19:51:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pycdio
 Version:	0.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Python interface to the CD Input and Control library
 
 Group:		Development/Libraries
@@ -13,6 +13,7 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/libcd
 # Remove shebangs in the modules
 # a patch was emailed and accepted on libcdio-pycdio-devel at gnu.org
 Patch0:		pycdio-remove-shebangs.patch
+Patch1:		pycdio-remove-get-devices-compensation.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	python-devel,python-setuptools,libcdio-devel,swig
@@ -26,6 +27,7 @@ device-dependent properties of a CD-ROM 
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,8 @@ rm -rf %{buildroot}
 %doc README.txt
 
 %changelog
+* Mon Sep 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-4
+- Off-by-one compensation in get_devices_* not needed anymore
 * Tue Jul 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-3
 - Added a patch to remove unnecessary shebangs
 * Mon Jul 27 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-2



From wtogami at fedoraproject.org  Mon Sep 28 19:54:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 28 Sep 2009 19:54:54 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.27, 1.28 ltsp.spec, 1.36, 1.37 sources,
	1.31, 1.32
Message-ID: <20090928195454.A663511C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20292

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
5.1.89



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	17 Sep 2009 16:11:34 -0000	1.27
+++ .cvsignore	28 Sep 2009 19:54:54 -0000	1.28
@@ -1 +1 @@
-ltsp-5.1.86.tar.bz2
+ltsp-5.1.89.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ltsp.spec	17 Sep 2009 16:11:34 -0000	1.36
+++ ltsp.spec	28 Sep 2009 19:54:54 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.86
-%define _datestamp .20090917.06
+Version:        5.1.89
+%define _datestamp .20090928.15
 #Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -412,6 +412,9 @@ fi
 %endif
 
 %changelog
+* Mon Sep 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.89-1
+- 5.1.89
+
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 5.1.86-1
 - Fix dracut install yet again, requires dracut-002
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	17 Sep 2009 16:11:34 -0000	1.31
+++ sources	28 Sep 2009 19:54:54 -0000	1.32
@@ -1 +1 @@
-cbe186d980e51542f9564d8ac4f019e3  ltsp-5.1.86.tar.bz2
+d8383c97d982967477855c589ba09721  ltsp-5.1.89.tar.bz2



From sgrubb at fedoraproject.org  Mon Sep 28 19:55:04 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Mon, 28 Sep 2009 19:55:04 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.104, 1.105 audit.spec, 1.219,
	1.220 sources, 1.129, 1.130
Message-ID: <20090928195504.4C6C511C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20354

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Mon Sep 28 2009 Steve Grubb <sgrubb at redhat.com> 2.0.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	19 Aug 2009 18:51:56 -0000	1.104
+++ .cvsignore	28 Sep 2009 19:55:04 -0000	1.105
@@ -101,3 +101,4 @@ audit-1.7.12.tar.gz
 audit-1.7.13.tar.gz
 audit-2.0.tar.gz
 audit-1.8.tar.gz
+audit-2.0.1.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- audit.spec	21 Aug 2009 14:57:14 -0000	1.219
+++ audit.spec	28 Sep 2009 19:55:04 -0000	1.220
@@ -2,8 +2,8 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0
-Release: 3%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -172,6 +172,7 @@ fi
 %attr(644,root,root) %{_mandir}/man8/aulast.8.gz
 %attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
 %attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz
+%attr(644,root,root) %{_mandir}/man7/audit.rules.7.gz
 %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
@@ -181,8 +182,8 @@ fi
 %attr(755,root,root) /sbin/aureport
 %attr(750,root,root) /sbin/autrace
 %attr(750,root,root) /sbin/audispd
-%attr(750,root,root) %{_bindir}/aulast
-%attr(750,root,root) %{_bindir}/aulastlog
+%attr(755,root,root) %{_bindir}/aulast
+%attr(755,root,root) %{_bindir}/aulastlog
 %attr(755,root,root) %{_bindir}/ausyscall
 %attr(755,root,root) /etc/rc.d/init.d/auditd
 %attr(750,root,root) %{_var}/log/audit
@@ -216,6 +217,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
+* Mon Sep 28 2009 Steve Grubb <sgrubb at redhat.com> 2.0.1-1
+- New upstream release
+
 * Fri Aug 21 2009 Steve Grubb <sgrubb at redhat.com> 2.0-3
 - New upstream release
 
@@ -357,246 +361,3 @@ fi
 - Fix buffer overflow in audit_log_user_command
 - Add basic remote logging plugin - only sends & no flow control
 - Update ausearch with interpret fixes from auparse
-
-* Sun Mar 09 2008 Steve Grubb <sgrubb at redhat.com> 1.6.9-1
-- Apply hidden attribute cleanup patch (Miloslav Trmac)
-- Apply auparse expression interface patch (Miloslav Trmac)
-- Fix potential memleak in audit event dispatcher
-- Update system-config-audit to version 0.4.6 (Miloslav Trmac)
-- audisp-prelude alerts now controlled by config file
-- Updated syscall table for 2.6.25 kernel
-- Apply patch correcting acct field being misencoded (Miloslav Trmac)
-- Added watched account login detection for prelude plugin
-
-* Thu Feb 14 2008 Steve Grubb <sgrubb at redhat.com> 1.6.8-1
-- Update for gcc 4.3
-- Cleanup descriptors in audispd before running plugin
-- Fix 'recent' keyword for aureport/search
-- Fix SE Linux policy for zos_remote plugin
-- Add event type for group password authentication attempts
-- Couple of updates to the translation tables
-- Add detection of failed group authentication to audisp-prelude
-
-* Thu Jan 31 2008 Steve Grubb <sgrubb at redhat.com> 1.6.7-2
-- In ausearch/report, prefer -if to stdin
-- In ausearch/report, add new command line option --input-logs (#428860)
-- Updated audisp-prelude based on feedback from prelude-devel
-- Added prelude alert for promiscuous socket being opened
-- Added prelude alert for SE Linux policy enforcement changes
-- Added prelude alerts for Forbidden Login Locations and Time
-- Applied patch to auparse fixing error handling of searching by
-  interpreted value (Miloslav Trmac)
-
-* Sat Jan 19 2008 Steve Grubb <sgrubb at redhat.com> 1.6.6-1
-- Add prelude IDS plugin for IDMEF alerts
-- Add --user option to aulastlog command
-- Use desktop-file-install for system-config-audit
-- Avoid touching auditd.conf most of the time (#408501)
-
-* Fri Jan 11 2008 Steve Grubb <sgrubb at redhat.com> 1.6.5-3
-- Updates for spec file review
-- Adjust permission on selinux policy file
-
-* Mon Jan 07 2008 Steve Grubb <sgrubb at redhat.com> 1.6.5-1
-- Fix config parser to allow either 0640 or 0600 for audit logs (#427062)
-- Check for audit log being writable by owner in auditd
-- If auditd logging was suspended, it can be resumed with SIGUSR2 (#251639)
-- Updated CAPP, LSPP, and NISPOM rules for new capabilities
-- Added aulastlog utility
-
-* Sun Dec 30 2007 Steve Grubb <sgrubb at redhat.com> 1.6.4-3
-- Allow 0600 file perms for audit logs
-
-* Sat Dec 29 2007 Steve Grubb <sgrubb at redhat.com> 1.6.4-1
-- fchmod of log file was on wrong variable (#426934)
-- Allow use of errno strings for exit codes in audit rules
-
-* Sat Dec 29 2007 Miloslav Trma? <mitr at redhat.com> - 1.6.3-2
-- Don't fchmod() /dev/null to mode 0400 (#426934)
-
-* Thu Dec 27 2007 Steve Grubb <sgrubb at redhat.com> 1.6.3-1
-- Add kernel release string to DEAMON_START events
-- Fix keep_logs when num_logs option disabled (#325561)
-- Fix auparse to handle node fields for syscall records
-- Update system-config-audit to version 0.4.5 (Miloslav Trmac)
-- Add keyword week-ago to aureport & ausearch start/end times
-- Fix audit log permissions on rotate. If group is root 0400, otherwise 0440
-- Add RACF zos remote audispd plugin (Klaus Kiwi)
-- Add event queue overflow action to audispd
-
-* Mon Oct 1 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-2
-- Don't retry if the rt queue is full.
-
-* Tue Sep 25 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-1
-- Add support for searching by posix regular expressions in auparse
-- Route DEAMON events into rt interface
-- If event pipe is full, try again after doing local logging
-- Optionally add node/machine name to records in audit daemon
-- Update ausearch/aureport to specify nodes to search on
-- Fix segfault interpretting saddr fields in avcs
-
-* Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
-- Fix uninitialized variable in auparse (John Dennis)
-
-* Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
-- External plugin support in place
-- Fix reference counting in auparse python bindings (#263961)
-- Moved default af_unix plugin socket to /var/run/audispd_events
-
-* Wed Aug 29 2007 Steve Grubb <sgrubb at redhat.com> 1.6-3
-- Add newline to audispd string formatted events
-
-* Tue Aug 28 2007 Steve Grubb <sgrubb at redhat.com> 1.6-2
-- spec file cleanups
-- Update to s-c-audit 0.4.3
-
-* Mon Aug 27 2007 Steve Grubb <sgrubb at redhat.com> 1.6-1
-- Update Licence tags
-- Adding perm field should not set syscall added flag in auditctl
-- Fix segfault when aureport -if option is used
-- Fix auditctl to better check keys on rule lines
-- Add support for audit by TTY and other new event types
-- Auditd config option for group permission of audit logs
-- Swig messed up a variable in ppc's python bindings causing crashes. (#251327)
-- New audit event dispatcher
-- Update syscall tables for 2.6.23 kernel
-
-* Wed Jul 25 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-1
-- Fix potential buffer overflow in print clone flags of auparse
-- Fix python traceback parsing watches without perm statement (Miloslav Trmac)
-- Update auditctl to handle legacy kernels when putting a watch on a dir
-- Fix acct interpretation in auparse
-
-* Tue Jul 17 2007 Miloslav Trma? <mitr at redhat.com> - 1.5.5-5
-- Fix a double free when auditd receives SIGHUP
-- Move the system-config-audit menu entry to the Administration menu
-
-* Tue Jul 10 2007 Steve Grubb <sgrubb at redhat.com> 1.5.5-1
-- Add system-config-audit (Miloslav Trmac)
-- Correct bug in audit_make_equivalent function (Al Viro)
-
-* Tue Jun 26 2007 Steve Grubb <sgrubb at redhat.com> 1.5.4-1
-- Add feed interface to auparse library (John Dennis)
-- Apply patch to libauparse for unresolved symbols (#241178)
-- Apply patch to add line numbers for file events in libauparse (John Dennis)
-- Change seresults to seresult in libauparse (John Dennis)
-- Add unit32_t definition to swig (#244210)
-- Add support for directory auditing
-- Update acct field to be escaped
-
-* Tue May 01 2007 Steve Grubb <sgrubb at redhat.com> 1.5.3-1
-- Change buffer size to prevent truncation of DAEMON events with large labels
-- Fix memory leaks in auparse (John Dennis)
-- Update syscall tables for 2.6.21 kernel
-- Update capp & lspp rules
-- New python bindings for libauparse (John Dennis)
-
-* Thu Apr 04 2007 Steve Grubb <sgrubb at redhat.com> 1.5.2-1
-- New event dispatcher (James Antill)
-- Apply patches fixing man pages and Makefile.am (Philipp Hahn)
-- Apply patch correcting python libs permissions (Philipp Hahn)
-- Fix auditd segfault on reload
-- Fix bug in auparse library for file pointers and descriptors
-- Extract subject information out of daemon events for ausearch
-
-* Thu Mar 29 2007 Steve Grubb <sgrubb at redhat.com> 1.5.1-2
-- Remove requires kernel-headers for python-libs
-- Apply patch to prevent segfaults on auditd reload
-
-* Tue Mar 20 2007 Steve Grubb <sgrubb at redhat.com> 1.5.1-1
-- Updated autrace to monitor *at syscalls
-- Add support in libaudit for AUDIT_BIT_TEST(^) and AUDIT_MASK_TEST (&)
-- Finish reworking auditd config parser
-- In auparse, interpret open, fcntl, and clone flags
-- In auparse, when interpreting execve record types, run args through unencode
-- Add support for OBJ_PID message type
-- Event dispatcher updates
-
-* Fri Mar 2 2007 Steve Grubb <sgrubb at redhat.com> 1.5-2
-- rebuild
-
-* Fri Mar 2 2007 Steve Grubb <sgrubb at redhat.com> 1.5-1
-- NEW audit dispatcher program & plugin framework
-- Correct hidden variables in libauparse
-- Added NISPOM sample rules
-- Verify accessibility of files passed in auparse_init
-- Fix bug in parser library interpreting socketcalls
-- Add support for stdio FILE pointer in auparse_init
-- Adjust init script to allow anyone to status auditd (#230626)
-
-* Tue Feb 20 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-1
-- Add man pages
-- Reduce text relocations in parser library
-- Add -n option to auditd for no fork
-- Add exec option to space_left, admin_space_left, disk_full,
-  and disk_error - eg EXEC /usr/local/script
-
-* Fri Feb 16 2007 Steve Grubb <sgrubb at redhat.com> 1.4.1-1
-- updated audit_rule_fieldpair_data to handle perm correctly (#226780)
-- Finished search options for audit parsing library
-- Fix ausearch -se to work correctly
-- Fix auditd init script for /usr on netdev (#228528)
-- Parse avc seperms better when there are more than one
-
-* Sun Feb 04 2007 Steve Grubb <sgrubb at redhat.com> 1.4-1
-- New report about authentication attempts
-- Updates for python 2.5
-- update autrace to have resource usage mode
-- update auditctl to support immutable config
-- added audit_log_user_command function to libaudit api
-- interpret capabilities
-- added audit event parsing library
-- updates for 2.6.20 kernel
-
-* Sun Dec 10 2006 Steve Grubb <sgrubb at redhat.com> 1.3.1-2
-- Make more adjustments for python 2.5
-
-* Sun Dec 10 2006 Steve Grubb <sgrubb at redhat.com> 1.3.1-1
-- Fix a couple parsing problems (#217952)
-- Add tgkill to S390* syscall tables (#218484)
-- Fix error messages in ausearch/aureport
-
-* Wed Dec  6 2006 Jeremy Katz <katzj at redhat.com> - 1.3-4
-- rebuild against python 2.5
-
-* Thu Nov 30 2006 Steve Grubb <sgrubb at redhat.com> 1.3-3
-- Fix timestamp for libaudit.conf (#218053)
-
-* Thu Nov 30 2006 Steve Grubb <sgrubb at redhat.com> 1.3-2
-- Fix minor parsing problem and add new msg types
-
-* Tue Nov 28 2006 Steve Grubb <sgrubb at redhat.com> 1.3-1
-- ausearch & aureport implement uid/gid caching
-- In ausearch & aureport, extract addr when hostname is unknown
-- In ausearch & aureport, test audit log presence O_RDONLY
-- New ausearch/aureport time keywords: recent, this-week, this-month, this-year
-- Added --add & --delete option to aureport
-- Update res parsing in config change events
-- Increase the size on audit daemon buffers
-- Parse avc_path records in ausearch/aureport
-- ausearch has new output mode, raw, for extracting events
-- ausearch/aureport can now read stdin
-- Rework AVC processing in ausearch/aureport
-- Added long options to ausearch and aureport
-
-* Tue Oct 24 2006 Steve Grubb <sgrubb at redhat.com> 1.2.9-1
-- In auditd if num_logs is zero, don't rotate on SIGUSR1 (#208834)
-- Fix some defines in libaudit.h
-- Some auditd config strings were not initialized in aureport (#211443)
-- Updated man pages
-- Add Netlabel event types to libaudit
-- Update aureports to current audit event types
-- Update autrace a little
-- Deprecated all the old audit_rule functions from public API
-- Drop auparse library for the moment
-
-* Fri Sep 29 2006 Steve Grubb <sgrubb at redhat.com> 1.2.8-1
-- Add dist tag and bump version (#208532)
-- Make internal auditd buffers bigger for context info
-- Correct address resolving of hostname in logging functions
-- Do not allow multiple msgtypes in same audit rule in auditctl (#207666)
-- Only =, != operators for arch & inode fields in auditctl (#206427)
-- Updated audit message type table
-- Remove watches from aureport since FS_WATCH is deprecated
-- Add audit_log_avc back temporarily (#208152)
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	21 Aug 2009 14:57:14 -0000	1.129
+++ sources	28 Sep 2009 19:55:04 -0000	1.130
@@ -1 +1 @@
-d0c064c4646f8fe5c50de789c627f2da  audit-2.0.tar.gz
+5624f99dc1ce3a62b5e7622f98747ada  audit-2.0.1.tar.gz



From mccann at fedoraproject.org  Mon Sep 28 20:00:55 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Mon, 28 Sep 2009 20:00:55 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/devel .cvsignore, 1.2,
	1.3 notification-daemon-engine-slider.spec, 1.2, 1.3 sources,
	1.2, 1.3 prelight-buttons.patch, 1.1, NONE
Message-ID: <20090928200055.0ACE811C00E4@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22759

Modified Files:
	.cvsignore notification-daemon-engine-slider.spec sources 
Removed Files:
	prelight-buttons.patch 
Log Message:
Update to 0.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Sep 2009 18:49:36 -0000	1.2
+++ .cvsignore	28 Sep 2009 20:00:54 -0000	1.3
@@ -1 +1 @@
-notification-daemon-engine-slider-0.1.0.tar.bz2
+notification-daemon-engine-slider-0.2.0.tar.bz2


Index: notification-daemon-engine-slider.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/notification-daemon-engine-slider.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- notification-daemon-engine-slider.spec	28 Sep 2009 17:36:11 -0000	1.2
+++ notification-daemon-engine-slider.spec	28 Sep 2009 20:00:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-slider
-Version:        0.1.0
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        The Slider theme engine for the notification daemon
 
 Group:          System Environment/Libraries
@@ -12,16 +12,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  gtk2-devel >= 2.17.1
 Requires:       notification-daemon
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=525864
-Patch0:		prelight-buttons.patch
-
 %description
 The Slider theme engine for the notification daemon.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .prelight
 
 %build
 %configure
@@ -46,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libslider.so
 
 %changelog
+* Mon Sep 28 2009 Jon McCann <jmccann at redhat.com> - 0.2.0-1
+- Update to 0.2.0
+
 * Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> - 0.1.0-2
 - Make actions prelight
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Sep 2009 18:49:36 -0000	1.2
+++ sources	28 Sep 2009 20:00:54 -0000	1.3
@@ -1 +1 @@
-81ee01d288cac6dc41468f0dbbc768f5  notification-daemon-engine-slider-0.1.0.tar.bz2
+ab5fc47d0aa235ac1a55db7ea7105a65  notification-daemon-engine-slider-0.2.0.tar.bz2


--- prelight-buttons.patch DELETED ---



From hadess at fedoraproject.org  Mon Sep 28 20:10:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 20:10:39 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.38, 1.39 sources, 1.38,
	1.39 telepathy-glib.spec, 1.47, 1.48
Message-ID: <20090928201039.9948811C0424@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26839

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.9.0-1
- Update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	25 Sep 2009 00:40:38 -0000	1.38
+++ .cvsignore	28 Sep 2009 20:10:39 -0000	1.39
@@ -1 +1 @@
-telepathy-glib-0.8.0.tar.gz
+telepathy-glib-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	25 Sep 2009 00:40:38 -0000	1.38
+++ sources	28 Sep 2009 20:10:39 -0000	1.39
@@ -1 +1 @@
-ef90ccd7cf6839f359f66918ba2d99d3  telepathy-glib-0.8.0.tar.gz
+1ebb5b089db66db42647d62df5194327  telepathy-glib-0.9.0.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- telepathy-glib.spec	25 Sep 2009 00:40:38 -0000	1.47
+++ telepathy-glib.spec	28 Sep 2009 20:10:39 -0000	1.48
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.8.0
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.9.0-1
+- Update to 0.9.0
+
 * Thu Sep 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
 - Update to 0.8.0.
 



From salimma at fedoraproject.org  Mon Sep 28 20:23:31 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 28 Sep 2009 20:23:31 +0000 (UTC)
Subject: rpms/maximus/F-10 maximus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090928202331.945F011C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/maximus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32765/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	maximus.spec 
Log Message:
maximus: initial import



--- NEW FILE maximus.spec ---
Name:           maximus
Version:        0.4.12
Release:        1%{?dist}
Summary:        A window management tool

Group:          User Interface/Desktops
License:        GPLv3
URL:            https://launchpad.net/maximus/
Source0:        http://launchpad.net/maximus/0.4/ubuntu-9.10-beta-freeze/+download/maximus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  GConf2-devel
BuildRequires:  libwnck-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libXtst-devel
BuildRequires:  libfakekey-devel
BuildRequires:  unique-devel
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

%description
A desktop daemon which will automatically maximise and, optionally,
un-decorate windwos. Has support for exclusion lists and will work
with any EWMH-spec compliant window-manager.

Created for netbook environments where normally every window is
maximised and removing the titlebar would give an extra 24px for the
application to display.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{_bindir}/maximus
%config(noreplace) %{_sysconfdir}/gconf/schemas/maximus.schemas
%config(noreplace) %{_sysconfdir}/xdg/autostart/maximus-autostart.desktop
%doc COPYING AUTHORS

%changelog
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.12-1
- Update to 0.4.12
- Mark /etc files as %%config(noreplace)

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.11-1
- Update to 0.4.11

* Wed May 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.9-1
- Update to 0.4.9

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.8-1
- Update to 0.4.8
- Register GConf schemas

* Fri Oct 24 2008 Jonathan Roberts <jonrob at fedoraproject.org> 0.4.0-1
- Updated to latest upstream version
- Fixed spec file for review comments

* Thu Sep 18 2008 Jonathan Roberts <jonrob at fedoraproject.org> 0.3.14-1
- Created initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maximus/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:23:03 -0000	1.1
+++ .cvsignore	28 Sep 2009 20:23:27 -0000	1.2
@@ -0,0 +1 @@
+maximus-0.4.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maximus/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:23:03 -0000	1.1
+++ sources	28 Sep 2009 20:23:28 -0000	1.2
@@ -0,0 +1 @@
+fbc8567195462983809fa0e220ca1ce7  maximus-0.4.12.tar.gz



From salimma at fedoraproject.org  Mon Sep 28 20:23:33 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 28 Sep 2009 20:23:33 +0000 (UTC)
Subject: rpms/maximus/F-11 maximus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090928202333.5BCF511C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/maximus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32765/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	maximus.spec 
Log Message:
maximus: initial import



--- NEW FILE maximus.spec ---
Name:           maximus
Version:        0.4.12
Release:        1%{?dist}
Summary:        A window management tool

Group:          User Interface/Desktops
License:        GPLv3
URL:            https://launchpad.net/maximus/
Source0:        http://launchpad.net/maximus/0.4/ubuntu-9.10-beta-freeze/+download/maximus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  GConf2-devel
BuildRequires:  libwnck-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libXtst-devel
BuildRequires:  libfakekey-devel
BuildRequires:  unique-devel
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

%description
A desktop daemon which will automatically maximise and, optionally,
un-decorate windwos. Has support for exclusion lists and will work
with any EWMH-spec compliant window-manager.

Created for netbook environments where normally every window is
maximised and removing the titlebar would give an extra 24px for the
application to display.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{_bindir}/maximus
%config(noreplace) %{_sysconfdir}/gconf/schemas/maximus.schemas
%config(noreplace) %{_sysconfdir}/xdg/autostart/maximus-autostart.desktop
%doc COPYING AUTHORS

%changelog
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.12-1
- Update to 0.4.12
- Mark /etc files as %%config(noreplace)

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.11-1
- Update to 0.4.11

* Wed May 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.9-1
- Update to 0.4.9

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.8-1
- Update to 0.4.8
- Register GConf schemas

* Fri Oct 24 2008 Jonathan Roberts <jonrob at fedoraproject.org> 0.4.0-1
- Updated to latest upstream version
- Fixed spec file for review comments

* Thu Sep 18 2008 Jonathan Roberts <jonrob at fedoraproject.org> 0.3.14-1
- Created initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maximus/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:23:03 -0000	1.1
+++ .cvsignore	28 Sep 2009 20:23:30 -0000	1.2
@@ -0,0 +1 @@
+maximus-0.4.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maximus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:23:03 -0000	1.1
+++ sources	28 Sep 2009 20:23:31 -0000	1.2
@@ -0,0 +1 @@
+fbc8567195462983809fa0e220ca1ce7  maximus-0.4.12.tar.gz



From salimma at fedoraproject.org  Mon Sep 28 20:23:33 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 28 Sep 2009 20:23:33 +0000 (UTC)
Subject: rpms/maximus/devel maximus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090928202333.C173C11C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/maximus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32765/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maximus.spec 
Log Message:
maximus: initial import



--- NEW FILE maximus.spec ---
Name:           maximus
Version:        0.4.12
Release:        1%{?dist}
Summary:        A window management tool

Group:          User Interface/Desktops
License:        GPLv3
URL:            https://launchpad.net/maximus/
Source0:        http://launchpad.net/maximus/0.4/ubuntu-9.10-beta-freeze/+download/maximus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  GConf2-devel
BuildRequires:  libwnck-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libXtst-devel
BuildRequires:  libfakekey-devel
BuildRequires:  unique-devel
Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

%description
A desktop daemon which will automatically maximise and, optionally,
un-decorate windwos. Has support for exclusion lists and will work
with any EWMH-spec compliant window-manager.

Created for netbook environments where normally every window is
maximised and removing the titlebar would give an extra 24px for the
application to display.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
            %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{_bindir}/maximus
%config(noreplace) %{_sysconfdir}/gconf/schemas/maximus.schemas
%config(noreplace) %{_sysconfdir}/xdg/autostart/maximus-autostart.desktop
%doc COPYING AUTHORS

%changelog
* Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.12-1
- Update to 0.4.12
- Mark /etc files as %%config(noreplace)

* Mon Sep 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.11-1
- Update to 0.4.11

* Wed May 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.9-1
- Update to 0.4.9

* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.4.8-1
- Update to 0.4.8
- Register GConf schemas

* Fri Oct 24 2008 Jonathan Roberts <jonrob at fedoraproject.org> 0.4.0-1
- Updated to latest upstream version
- Fixed spec file for review comments

* Thu Sep 18 2008 Jonathan Roberts <jonrob at fedoraproject.org> 0.3.14-1
- Created initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maximus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:23:03 -0000	1.1
+++ .cvsignore	28 Sep 2009 20:23:32 -0000	1.2
@@ -0,0 +1 @@
+maximus-0.4.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maximus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:23:03 -0000	1.1
+++ sources	28 Sep 2009 20:23:32 -0000	1.2
@@ -0,0 +1 @@
+fbc8567195462983809fa0e220ca1ce7  maximus-0.4.12.tar.gz



From dwalsh at fedoraproject.org  Mon Sep 28 20:33:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 28 Sep 2009 20:33:26 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.187, 1.188 libselinux-rhat.patch,
	1.198, 1.199 libselinux.spec, 1.377, 1.378 sources, 1.190, 1.191
Message-ID: <20090928203326.7E60B11C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6807

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.87-1
- Update to upstream 
	* Add exception handling in libselinux from Dan Walsh. This uses a
	  shell script called exception.sh to generate a swig interface file.
	* make swigify
	* Make matchpathcon print <<none>> if path not found in fcontext file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- .cvsignore	8 Sep 2009 13:09:19 -0000	1.187
+++ .cvsignore	28 Sep 2009 20:33:24 -0000	1.188
@@ -170,3 +170,4 @@ libselinux-2.0.83.tgz
 libselinux-2.0.84.tgz
 libselinux-2.0.85.tgz
 libselinux-2.0.86.tgz
+libselinux-2.0.87.tgz

libselinux-rhat.patch:
 man/man8/selinuxconlist.8 |   18 ++++++++++++++++++
 man/man8/selinuxdefcon.8  |   19 +++++++++++++++++++
 src/callbacks.c           |    1 +
 src/matchpathcon.c        |    3 ++-
 4 files changed, 40 insertions(+), 1 deletion(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.198 -r 1.199 libselinux-rhat.patchIndex: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- libselinux-rhat.patch	15 Sep 2009 19:24:21 -0000	1.198
+++ libselinux-rhat.patch	28 Sep 2009 20:33:24 -0000	1.199
@@ -54,55 +54,6 @@ diff --exclude-from=exclude -N -u -r nsa
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.86/src/exception.sh
---- nsalibselinux/src/exception.sh	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.86/src/exception.sh	2009-09-15 15:20:59.000000000 -0400
-@@ -0,0 +1,12 @@
-+function except() {
-+echo "
-+%exception $1 {
-+  \$action 
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+"
-+}
-+for i in `grep "extern *int" ../include/selinux/selinux.h | awk '{ print $3 }' | cut -d '(' -f 1`; do except $i ; done 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.86/src/Makefile
---- nsalibselinux/src/Makefile	2009-07-14 11:16:03.000000000 -0400
-+++ libselinux-2.0.86/src/Makefile	2009-09-15 15:21:17.000000000 -0400
-@@ -82,6 +82,9 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
- 	ln -sf $@ $(TARGET) 
- 
-+selinuxswig_exception.i: ../include/selinux/selinux.h
-+	sh exception.sh > $@ 
-+
- audit2why.lo: audit2why.c
- 	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
- 
-@@ -100,8 +103,8 @@
- $(SWIGRUBYCOUT): $(SWIGRUBYIF)
- 	$(SWIGRUBY) $^
- 
--swigify: $(SWIGIF)
--	$(SWIG) $^
-+swigify: $(SWIGIF) selinuxswig_exception.i
-+	$(SWIG) $<
- 
- install: all 
- 	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
-@@ -124,7 +127,7 @@
- 	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
- 
- clean: 
--	-rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~
-+	-rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ selinuxswig_exception.i
- 
- distclean: clean
- 	rm -f $(GENERATED) $(SWIGFILES)
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.86/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2009-03-06 14:41:45.000000000 -0500
 +++ libselinux-2.0.86/src/matchpathcon.c	2009-09-15 15:20:59.000000000 -0400
@@ -123,16686 +74,3 @@ diff --exclude-from=exclude -N -u -r nsa
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.86/src/selinux.py
---- nsalibselinux/src/selinux.py	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.86/src/selinux.py	2009-09-15 15:20:59.000000000 -0400
-@@ -1,12 +1,26 @@
- # This file was automatically generated by SWIG (http://www.swig.org).
--# Version 1.3.35
-+# Version 1.3.38
- #
--# Don't modify this file, modify the SWIG interface instead.
-+# Do not make changes to this file unless you know what you are doing--modify
-+# the SWIG interface file instead.
- # This file is compatible with both classic and new-style classes.
- 
--import _selinux
--import new
--new_instancemethod = new.instancemethod
-+from sys import version_info
-+if version_info >= (2,6,0):
-+    def swig_import_helper():
-+        from os.path import dirname
-+        import imp
-+        try:
-+            fp, pathname, description = imp.find_module('_selinux', [dirname(__file__)])
-+            _mod = imp.load_module('_selinux', fp, pathname, description)
-+        finally:
-+            if fp is not None: fp.close()
-+        return _mod
-+    _selinux = swig_import_helper()
-+    del swig_import_helper
-+else:
-+    import _selinux
-+del version_info
- try:
-     _swig_property = property
- except NameError:
-@@ -14,7 +28,7 @@
- def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-     if (name == "thisown"): return self.this.own(value)
-     if (name == "this"):
--        if type(value).__name__ == 'PySwigObject':
-+        if type(value).__name__ == 'SwigPyObject':
-             self.__dict__[name] = value
-             return
-     method = class_type.__swig_setmethods__.get(name,None)
-@@ -31,21 +45,19 @@
-     if (name == "thisown"): return self.this.own()
-     method = class_type.__swig_getmethods__.get(name,None)
-     if method: return method(self)
--    raise AttributeError,name
-+    raise AttributeError(name)
- 
- def _swig_repr(self):
-     try: strthis = "proxy of " + self.this.__repr__()
-     except: strthis = ""
-     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
- 
--import types
- try:
--    _object = types.ObjectType
-+    _object = object
-     _newclass = 1
- except AttributeError:
-     class _object : pass
-     _newclass = 0
--del types
- 
- 
- import shutil, os, stat
-@@ -61,46 +73,1507 @@
-                              map(restorecon, [os.path.join(dirname, fname)
-                                               for fname in fnames]), None)
- 
-+def copytree(src, dest):
-+    """ An SELinux-friendly shutil.copytree method """
-+    shutil.copytree(src, dest)
-+    restorecon(dest, recursive=True)
-+
-+def install(src, dest):
-+    """ An SELinux-friendly shutil.move method """
-+    shutil.move(src, dest)
-+    restorecon(dest, recursive=True)
- 
-+
-+def avc_sid_to_context(*args):
-+  return _selinux.avc_sid_to_context(*args)
-+avc_sid_to_context = _selinux.avc_sid_to_context
-+
-+def avc_sid_to_context_raw(*args):
-+  return _selinux.avc_sid_to_context_raw(*args)
-+avc_sid_to_context_raw = _selinux.avc_sid_to_context_raw
-+
-+def avc_context_to_sid(*args):
-+  return _selinux.avc_context_to_sid(*args)
-+avc_context_to_sid = _selinux.avc_context_to_sid
-+
-+def avc_context_to_sid_raw(*args):
-+  return _selinux.avc_context_to_sid_raw(*args)
-+avc_context_to_sid_raw = _selinux.avc_context_to_sid_raw
-+
-+def sidget(*args):
-+  return _selinux.sidget(*args)
-+sidget = _selinux.sidget
-+
-+def sidput(*args):
-+  return _selinux.sidput(*args)
-+sidput = _selinux.sidput
-+
-+def avc_get_initial_sid(*args):
-+  return _selinux.avc_get_initial_sid(*args)
-+avc_get_initial_sid = _selinux.avc_get_initial_sid
-+AVC_OPT_UNUSED = _selinux.AVC_OPT_UNUSED
-+AVC_OPT_SETENFORCE = _selinux.AVC_OPT_SETENFORCE
-+
-+def avc_init(*args):
-+  return _selinux.avc_init(*args)
-+avc_init = _selinux.avc_init
-+
-+def avc_open(*args):
-+  return _selinux.avc_open(*args)
-+avc_open = _selinux.avc_open
-+
-+def avc_reset():
-+  return _selinux.avc_reset()
-+avc_reset = _selinux.avc_reset
-+
-+def avc_has_perm_noaudit(*args):
-+  return _selinux.avc_has_perm_noaudit(*args)
-+avc_has_perm_noaudit = _selinux.avc_has_perm_noaudit
-+
-+def avc_has_perm(*args):
-+  return _selinux.avc_has_perm(*args)
-+avc_has_perm = _selinux.avc_has_perm
[...16351 lines suppressed...]
-+  SWIG_Python_SetConstant(d, "DB_TABLE__USE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+  SWIG_Python_SetConstant(d, "DB_TABLE__SELECT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+  SWIG_Python_SetConstant(d, "DB_TABLE__UPDATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000100UL)));
-+  SWIG_Python_SetConstant(d, "DB_TABLE__INSERT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000200UL)));
-+  SWIG_Python_SetConstant(d, "DB_TABLE__DELETE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000400UL)));
-+  SWIG_Python_SetConstant(d, "DB_TABLE__LOCK",SWIG_From_unsigned_SS_long((unsigned long)(0x00000800UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__CREATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__DROP",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__GETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__SETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__EXECUTE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+  SWIG_Python_SetConstant(d, "DB_PROCEDURE__ENTRYPOINT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__CREATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__DROP",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__GETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__SETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__USE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__SELECT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__UPDATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000100UL)));
-+  SWIG_Python_SetConstant(d, "DB_COLUMN__INSERT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000200UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__USE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__SELECT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__UPDATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__INSERT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+  SWIG_Python_SetConstant(d, "DB_TUPLE__DELETE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__CREATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__DROP",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__GETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__SETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__READ",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__WRITE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__IMPORT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000100UL)));
-+  SWIG_Python_SetConstant(d, "DB_BLOB__EXPORT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000200UL)));
-+  SWIG_Python_SetConstant(d, "PEER__RECV",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+  SWIG_Python_SetConstant(d, "X_APPLICATION_DATA__PASTE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+  SWIG_Python_SetConstant(d, "X_APPLICATION_DATA__PASTE_AFTER_CONFIRM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+  SWIG_Python_SetConstant(d, "X_APPLICATION_DATA__COPY",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_SECURITY",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_PROCESS",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_SYSTEM",SWIG_From_int((int)(3)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_CAPABILITY",SWIG_From_int((int)(4)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_FILESYSTEM",SWIG_From_int((int)(5)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_FILE",SWIG_From_int((int)(6)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DIR",SWIG_From_int((int)(7)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_FD",SWIG_From_int((int)(8)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_LNK_FILE",SWIG_From_int((int)(9)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_CHR_FILE",SWIG_From_int((int)(10)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_BLK_FILE",SWIG_From_int((int)(11)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_SOCK_FILE",SWIG_From_int((int)(12)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_FIFO_FILE",SWIG_From_int((int)(13)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_SOCKET",SWIG_From_int((int)(14)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_TCP_SOCKET",SWIG_From_int((int)(15)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_UDP_SOCKET",SWIG_From_int((int)(16)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_RAWIP_SOCKET",SWIG_From_int((int)(17)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NODE",SWIG_From_int((int)(18)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETIF",SWIG_From_int((int)(19)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_SOCKET",SWIG_From_int((int)(20)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_PACKET_SOCKET",SWIG_From_int((int)(21)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_KEY_SOCKET",SWIG_From_int((int)(22)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_UNIX_STREAM_SOCKET",SWIG_From_int((int)(23)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_UNIX_DGRAM_SOCKET",SWIG_From_int((int)(24)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_SEM",SWIG_From_int((int)(25)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_MSG",SWIG_From_int((int)(26)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_MSGQ",SWIG_From_int((int)(27)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_SHM",SWIG_From_int((int)(28)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_IPC",SWIG_From_int((int)(29)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_PASSWD",SWIG_From_int((int)(30)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_DRAWABLE",SWIG_From_int((int)(31)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_SCREEN",SWIG_From_int((int)(32)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_GC",SWIG_From_int((int)(33)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_FONT",SWIG_From_int((int)(34)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_COLORMAP",SWIG_From_int((int)(35)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_PROPERTY",SWIG_From_int((int)(36)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_SELECTION",SWIG_From_int((int)(37)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_CURSOR",SWIG_From_int((int)(38)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_CLIENT",SWIG_From_int((int)(39)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_DEVICE",SWIG_From_int((int)(40)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_SERVER",SWIG_From_int((int)(41)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_EXTENSION",SWIG_From_int((int)(42)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_ROUTE_SOCKET",SWIG_From_int((int)(43)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_FIREWALL_SOCKET",SWIG_From_int((int)(44)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_TCPDIAG_SOCKET",SWIG_From_int((int)(45)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_NFLOG_SOCKET",SWIG_From_int((int)(46)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_XFRM_SOCKET",SWIG_From_int((int)(47)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_SELINUX_SOCKET",SWIG_From_int((int)(48)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_AUDIT_SOCKET",SWIG_From_int((int)(49)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_IP6FW_SOCKET",SWIG_From_int((int)(50)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_DNRT_SOCKET",SWIG_From_int((int)(51)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DBUS",SWIG_From_int((int)(52)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NSCD",SWIG_From_int((int)(53)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_ASSOCIATION",SWIG_From_int((int)(54)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET",SWIG_From_int((int)(55)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_APPLETALK_SOCKET",SWIG_From_int((int)(56)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_PACKET",SWIG_From_int((int)(57)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_KEY",SWIG_From_int((int)(58)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_CONTEXT",SWIG_From_int((int)(59)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DCCP_SOCKET",SWIG_From_int((int)(60)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_MEMPROTECT",SWIG_From_int((int)(61)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DB_DATABASE",SWIG_From_int((int)(62)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DB_TABLE",SWIG_From_int((int)(63)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DB_PROCEDURE",SWIG_From_int((int)(64)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DB_COLUMN",SWIG_From_int((int)(65)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DB_TUPLE",SWIG_From_int((int)(66)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_DB_BLOB",SWIG_From_int((int)(67)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_PEER",SWIG_From_int((int)(68)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_CAPABILITY2",SWIG_From_int((int)(69)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_RESOURCE",SWIG_From_int((int)(70)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_EVENT",SWIG_From_int((int)(71)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_SYNTHETIC_EVENT",SWIG_From_int((int)(72)));
-+  SWIG_Python_SetConstant(d, "SECCLASS_X_APPLICATION_DATA",SWIG_From_int((int)(73)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_KERNEL",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SECURITY",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_UNLABELED",SWIG_From_int((int)(3)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_FS",SWIG_From_int((int)(4)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_FILE",SWIG_From_int((int)(5)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_FILE_LABELS",SWIG_From_int((int)(6)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_INIT",SWIG_From_int((int)(7)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_ANY_SOCKET",SWIG_From_int((int)(8)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_PORT",SWIG_From_int((int)(9)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_NETIF",SWIG_From_int((int)(10)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_NETMSG",SWIG_From_int((int)(11)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_NODE",SWIG_From_int((int)(12)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_IGMP_PACKET",SWIG_From_int((int)(13)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_ICMP_SOCKET",SWIG_From_int((int)(14)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_TCP_SOCKET",SWIG_From_int((int)(15)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_MODPROBE",SWIG_From_int((int)(16)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL",SWIG_From_int((int)(17)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_FS",SWIG_From_int((int)(18)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_KERNEL",SWIG_From_int((int)(19)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_NET",SWIG_From_int((int)(20)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_NET_UNIX",SWIG_From_int((int)(21)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_VM",SWIG_From_int((int)(22)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_DEV",SWIG_From_int((int)(23)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_KMOD",SWIG_From_int((int)(24)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_POLICY",SWIG_From_int((int)(25)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_SCMP_PACKET",SWIG_From_int((int)(26)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_DEVNULL",SWIG_From_int((int)(27)));
-+  SWIG_Python_SetConstant(d, "SECINITSID_NUM",SWIG_From_int((int)(27)));
-   SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
-+  SWIG_Python_SetConstant(d, "SELABEL_CTX_FILE",SWIG_From_int((int)(0)));
-+  SWIG_Python_SetConstant(d, "SELABEL_CTX_MEDIA",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SELABEL_CTX_X",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SELABEL_OPT_UNUSED",SWIG_From_int((int)(0)));
-+  SWIG_Python_SetConstant(d, "SELABEL_OPT_VALIDATE",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SELABEL_OPT_BASEONLY",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SELABEL_OPT_PATH",SWIG_From_int((int)(3)));
-+  SWIG_Python_SetConstant(d, "SELABEL_OPT_SUBSET",SWIG_From_int((int)(4)));
-+  SWIG_Python_SetConstant(d, "SELABEL_NOPT",SWIG_From_int((int)(5)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_PROP",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_EXT",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_CLIENT",SWIG_From_int((int)(3)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_EVENT",SWIG_From_int((int)(4)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_SELN",SWIG_From_int((int)(5)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_POLYPROP",SWIG_From_int((int)(6)));
-+  SWIG_Python_SetConstant(d, "SELABEL_X_POLYSELN",SWIG_From_int((int)(7)));
-+  SWIG_Python_SetConstant(d, "SELINUX_CB_LOG",SWIG_From_int((int)(0)));
-+  SWIG_Python_SetConstant(d, "SELINUX_CB_AUDIT",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SELINUX_CB_VALIDATE",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SELINUX_ERROR",SWIG_From_int((int)(0)));
-+  SWIG_Python_SetConstant(d, "SELINUX_WARNING",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "SELINUX_INFO",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "SELINUX_AVC",SWIG_From_int((int)(3)));
-+  SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
-+  SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
-+  SWIG_Python_SetConstant(d, "MATCHPATHCON_VALIDATE",SWIG_From_int((int)(4)));
-+#if PY_VERSION_HEX >= 0x03000000
-+  return m;
-+#else
-+  return;
-+#endif
- }
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.86/utils/matchpathcon.c
---- nsalibselinux/utils/matchpathcon.c	2009-05-18 13:53:14.000000000 -0400
-+++ libselinux-2.0.86/utils/matchpathcon.c	2009-09-15 15:20:59.000000000 -0400
-@@ -22,9 +22,13 @@
- 	char *buf;
- 	int rc = matchpathcon(path, mode, &buf);
- 	if (rc < 0) {
--		fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
--			strerror(errno));
--		return 1;
-+		if (errno == ENOENT) {
-+			buf=strdup("<<none>>");
-+		} else {
-+			fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
-+				strerror(errno));
-+			return 1;
-+		}
- 	}
- 	if (header)
- 		printf("%s\t%s\n", path, buf);


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- libselinux.spec	15 Sep 2009 19:24:22 -0000	1.377
+++ libselinux.spec	28 Sep 2009 20:33:26 -0000	1.378
@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.86
-Release: 2%{?dist}
+Version: 2.0.87
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -165,6 +165,13 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.87-1
+- Update to upstream 
+	* Add exception handling in libselinux from Dan Walsh. This uses a
+	  shell script called exception.sh to generate a swig interface file.
+	* make swigify
+	* Make matchpathcon print <<none>> if path not found in fcontext file.
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-2
 - Eliminate -pthread switch in Makefile
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- sources	8 Sep 2009 13:09:19 -0000	1.190
+++ sources	28 Sep 2009 20:33:26 -0000	1.191
@@ -1 +1 @@
-c9939f17d81cb62f4050db0a0f2a54f6  libselinux-2.0.86.tgz
+f70774d224d4e36ffcccd89ff03648cb  libselinux-2.0.87.tgz



From dwalsh at fedoraproject.org  Mon Sep 28 20:36:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 28 Sep 2009 20:36:14 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.105, 1.106 libsemanage.spec,
	1.186, 1.187 sources, 1.108, 1.109
Message-ID: <20090928203615.8BBDD11C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7779

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Mon Sep 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.39-1
- Update to upstream
	* make swigify



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	17 Sep 2009 13:02:58 -0000	1.105
+++ .cvsignore	28 Sep 2009 20:36:12 -0000	1.106
@@ -111,3 +111,4 @@ libsemanage-2.0.35.tgz
 libsemanage-2.0.36.tgz
 libsemanage-2.0.37.tgz
 libsemanage-2.0.38.tgz
+libsemanage-2.0.39.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- libsemanage.spec	20 Sep 2009 11:43:05 -0000	1.186
+++ libsemanage.spec	28 Sep 2009 20:36:12 -0000	1.187
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.38
-Release: 2%{?dist}
+Version: 2.0.39
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Mon Sep 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.39-1
+- Update to upstream
+	* make swigify
+
 * Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-2
 - Dont relabel /root with genhomedircon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	17 Sep 2009 13:02:59 -0000	1.108
+++ sources	28 Sep 2009 20:36:12 -0000	1.109
@@ -1 +1 @@
-e4cde213b36fe94b30704600026c39f2  libsemanage-2.0.38.tgz
+706e61f0081bb8522589481db873b0d1  libsemanage-2.0.39.tgz



From mccann at fedoraproject.org  Mon Sep 28 20:36:36 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Mon, 28 Sep 2009 20:36:36 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel .cvsignore, 1.8,
	1.9 sound-theme-freedesktop.spec, 1.14, 1.15 sources, 1.8, 1.9
Message-ID: <20090928203636.8C45E11C00E4@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/sound-theme-freedesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8003

Modified Files:
	.cvsignore sound-theme-freedesktop.spec sources 
Log Message:
Update to 0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Sep 2009 20:39:27 -0000	1.8
+++ .cvsignore	28 Sep 2009 20:36:35 -0000	1.9
@@ -1 +1 @@
-sound-theme-freedesktop-0.6.99.lennart.tar.bz2
+sound-theme-freedesktop-0.7.tar.bz2


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sound-theme-freedesktop.spec	10 Sep 2009 20:39:27 -0000	1.14
+++ sound-theme-freedesktop.spec	28 Sep 2009 20:36:35 -0000	1.15
@@ -1,10 +1,10 @@
 Name: sound-theme-freedesktop
-Version: 0.6.99.lennart
+Version: 0.7
 Release: 1%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
 Source0: http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-%{version}.tar.bz2
-# For details on the licenses used, see README
+# For details on the licenses used, see CREDITS
 License: GPLv2+ and LGPLv2+ and CC-BY-SA and CC-BY
 Url: http://www.freedesktop.org/wiki/Specifications/sound-theme-spec
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,13 +39,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README licenses/ARTISTIC licenses/CC-BY-3 licenses/CC-BY-SA-2 licenses/CC-BY-SA-3 licenses/GPL2 licenses/LGPL21
+%doc README
 %dir %{_datadir}/sounds/freedesktop
 %dir %{_datadir}/sounds/freedesktop/stereo
 %{_datadir}/sounds/freedesktop/index.theme
 %{_datadir}/sounds/freedesktop/stereo/*.oga
 
 %changelog
+* Mon Sep 28 2009 Jon McCann <jmccann at redhat.com> 0.7-1
+- Update to 0.7
+
 * Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.6.99-1
 - Snapshot from Lennart's git tree
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	10 Sep 2009 20:39:27 -0000	1.8
+++ sources	28 Sep 2009 20:36:36 -0000	1.9
@@ -1 +1 @@
-04f955252dcf11c3dfabbe9f4945efde  sound-theme-freedesktop-0.6.99.lennart.tar.bz2
+7bcad4fa54570f80c612012bce66f60f  sound-theme-freedesktop-0.7.tar.bz2



From cebbert at fedoraproject.org  Mon Sep 28 20:40:27 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 28 Sep 2009 20:40:27 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.110, 1.111 config-nodebug, 1.39,
	1.40 kernel.spec, 1.1809, 1.1810
Message-ID: <20090928204027.03F1011C0424@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9649

Modified Files:
	Makefile config-nodebug kernel.spec 
Log Message:
Fix up some items missing in make debug vs. make release,
  rearrange so the options are in the same order.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- Makefile	23 Sep 2009 14:30:33 -0000	1.110
+++ Makefile	28 Sep 2009 20:40:26 -0000	1.111
@@ -51,6 +51,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_FAIL_IO_TIMEOUT is not set/CONFIG_FAIL_IO_TIMEOUT=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAIL_MAKE_REQUEST is not set/CONFIG_FAIL_MAKE_REQUEST=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
@@ -73,13 +74,16 @@ debug:
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
-	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 	@perl -pi -e 's/CONFIG_NR_CPUS=64/CONFIG_NR_CPUS=512/' config-x86_64-generic
 
+	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
+	@perl -pi -e 's/^%define rawhide_skip_docs 0/%define rawhide_skip_docs 1/' kernel.spec
+
 release:
 	@perl -pi -e 's/CONFIG_SLUB_DEBUG_ON=y/# CONFIG_SLUB_DEBUG_ON is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_LOCK_STAT=y/# CONFIG_LOCK_STAT is not set/' config-nodebug
@@ -91,13 +95,12 @@ release:
 	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_PROVE_LOCKING=y/# CONFIG_PROVE_LOCKING is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SPINLOCK=y/# CONFIG_DEBUG_SPINLOCK is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SLEEP_IN_IRQ=y/# CONFIG_DEBUG_SLEEP_IN_IRQ is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION=y/# CONFIG_FAULT_INJECTION is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAILSLAB=y/# CONFIG_FAILSLAB is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAIL_PAGE_ALLOC=y/# CONFIG_FAIL_PAGE_ALLOC is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_FAIL_IO_TIMEOUT=y/# CONFIG_FAIL_IO_TIMEOUT is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAIL_MAKE_REQUEST=y/# CONFIG_FAIL_MAKE_REQUEST is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
@@ -120,6 +123,10 @@ release:
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
+
+	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
+	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- config-nodebug	14 Sep 2009 21:33:54 -0000	1.39
+++ config-nodebug	28 Sep 2009 20:40:26 -0000	1.40
@@ -15,7 +15,7 @@ CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
-# CONFIG_FAIL_IO_TIMEOUT is not set
+CONFIG_FAIL_IO_TIMEOUT=y
 
 CONFIG_SLUB_DEBUG_ON=y
 
@@ -23,7 +23,8 @@ CONFIG_LOCK_STAT=y
 
 CONFIG_DEBUG_STACK_USAGE=y
 
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
+# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
 
 CONFIG_DEBUG_SG=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1809
retrieving revision 1.1810
diff -u -p -r1.1809 -r1.1810
--- kernel.spec	28 Sep 2009 05:09:48 -0000	1.1809
+++ kernel.spec	28 Sep 2009 20:40:26 -0000	1.1810
@@ -1983,6 +1983,10 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix up some items missing in make debug vs. make release,
+  rearrange so the options are in the same order.
+
 * Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.31-git18
 - rebased:



From hadess at fedoraproject.org  Mon Sep 28 20:51:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 20:51:31 +0000 (UTC)
Subject: rpms/telepathy-glib/devel telepathy-glib-broken-pkgconfig.patch, 1.4,
	1.5
Message-ID: <20090928205131.C784A11C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13476

Modified Files:
	telepathy-glib-broken-pkgconfig.patch 
Log Message:
Update pkg-config patch

telepathy-glib-broken-pkgconfig.patch:
 telepathy-glib-uninstalled.pc.in |    3 +--
 telepathy-glib.pc.in             |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: telepathy-glib-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib-broken-pkgconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- telepathy-glib-broken-pkgconfig.patch	19 Sep 2008 20:38:02 -0000	1.4
+++ telepathy-glib-broken-pkgconfig.patch	28 Sep 2009 20:51:31 -0000	1.5
@@ -6,8 +6,8 @@ diff -urp telepathy-glib-0.7.15.OLD/tele
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
-+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
  Libs: -L${libdir} -ltelepathy-glib
  Cflags: -I${includedir}/telepathy-1.0
 diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in
@@ -18,7 +18,7 @@ diff -urp telepathy-glib-0.7.15.OLD/tele
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
-+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
  Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
  Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}



From lmacken at fedoraproject.org  Mon Sep 28 20:52:42 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 28 Sep 2009 20:52:42 +0000 (UTC)
Subject: rpms/python-repoze-what-plugins-sql/devel
	python-repoze-what-plugins-sql.spec, 1.3, 1.4
Message-ID: <20090928205242.3F0D011C00E4@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what-plugins-sql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895/devel

Modified Files:
	python-repoze-what-plugins-sql.spec 
Log Message:
Remove a duplicate python-nose BR



Index: python-repoze-what-plugins-sql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-plugins-sql/devel/python-repoze-what-plugins-sql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-repoze-what-plugins-sql.spec	26 Jul 2009 21:00:02 -0000	1.3
+++ python-repoze-what-plugins-sql.spec	28 Sep 2009 20:52:41 -0000	1.4
@@ -15,7 +15,7 @@ Patch0:         %{name}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-devel python-setuptools-devel python-nose
+BuildRequires:  python-devel python-setuptools-devel
 BuildRequires:  python-nose python-coverage
 BuildRequires:  python-repoze-what 
 BuildRequires:  python-sqlalchemy >= 0.5



From davej at fedoraproject.org  Mon Sep 28 21:01:13 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 28 Sep 2009 21:01:13 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6.31-copy_from_user-bounds.patch, NONE,
	1.1 kernel.spec, 1.1837, 1.1838
Message-ID: <20090928210113.90E4711C00E4@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18582

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.31-copy_from_user-bounds.patch 
Log Message:
Use __builtin_object_size to validate the buffer size for copy_from_user
  + associated fixes to various copy_from_user invocations.

linux-2.6.31-copy_from_user-bounds.patch:
 b/arch/x86/include/asm/uaccess_32.h               |   19 ++++++++
 b/arch/x86/include/asm/uaccess_64.h               |   19 ++++++++
 b/arch/x86/kernel/x8664_ksyms_64.c                |    2 
 b/arch/x86/lib/copy_user_64.S                     |    4 -
 b/arch/x86/lib/usercopy_32.c                      |    4 -
 b/drivers/acpi/proc.c                             |    4 -
 b/drivers/acpi/video.c                            |   20 ++++++---
 b/drivers/char/nvram.c                            |   12 ++++-
 b/fs/cifs/cifs_debug.c                            |   10 ++--
 b/include/linux/compiler-gcc4.h                   |    2 
 b/include/linux/compiler.h                        |    8 +--
 b/kernel/capability.c                             |   11 ++---
 b/mm/migrate.c                                    |   47 ++++++++++++++++++++--
 b/net/socket.c                                    |    9 ++--
 b/net/wireless/wext.c                             |   11 ++---
 linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c |   21 ++++++---
 16 files changed, 152 insertions(+), 51 deletions(-)

--- NEW FILE linux-2.6.31-copy_from_user-bounds.patch ---
>From davej  Sat Sep 26 11:56:25 2009
Return-Path: BATV+801d9f966e814c9eff35+2225+infradead.org+arjan at casper.srs.infradead.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.1 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 11:56:25 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A7DF39E640
	for <davej at redhat.com>; Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id hkbfP756iXek for <davej at redhat.com>;
	Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8FFA39E63B
	for <davej at mail.corp.redhat.com>; Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.6])
	by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QCX7cQ016845
	for <davej at redhat.com>; Sat, 26 Sep 2009 08:33:07 -0400
Received: from casper.infradead.org (casper.infradead.org [85.118.1.10])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QCWsOO027686
	for <davej at redhat.com>; Sat, 26 Sep 2009 08:32:55 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrWS9-00025Y-Q2; Sat, 26 Sep 2009 12:32:42 +0000
Date: Sat, 26 Sep 2009 14:33:01 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: linux-kernel at vger.kernel.org
Cc: mingo at elte.hu, tglx at tglx.de, hpa at zytor.com
Subject: [PATCH] x86: Use __builtin_object_size to validate the buffer size
 for copy_from_user
Message-ID: <20090926143301.2c396b94 at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
X-RedHat-Spam-Score: -3.884  (AWL,RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.6
Status: RO
Content-Length: 6453
Lines: 191

=46rom 524a1da3c45683cec77480acc6cab1d33ae8d5cb Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan at linux.intel.com>
Date: Sat, 26 Sep 2009 12:36:21 +0200
Subject: [PATCH] x86: Use __builtin_object_size to validate the buffer size for copy_from_user

gcc (4.x) supports the __builtin_object_size() builtin, which reports the
size of an object that a pointer point to, when known at compile time.
If the buffer size is not known at compile time, a constant -1 is returned.

This patch uses this feature to add a sanity check to copy_from_user();
if the target buffer is known to be smaller than the copy size, the copy
is aborted and a WARNing is emitted in memory debug mode.

These extra checks compile away when the object size is not known,
or if both the buffer size and the copy length are constants.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Reviewed-by: Ingo Molnar <mingo at elte.hu>
---
 arch/x86/include/asm/uaccess_32.h |   19 ++++++++++++++++++-
 arch/x86/include/asm/uaccess_64.h |   19 ++++++++++++++++++-
 arch/x86/kernel/x8664_ksyms_64.c  |    2 +-
 arch/x86/lib/copy_user_64.S       |    4 ++--
 arch/x86/lib/usercopy_32.c        |    4 ++--
 include/linux/compiler-gcc4.h     |    2 ++
 include/linux/compiler.h          |    4 ++++
 7 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index 632fb44..582d6ae 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -187,9 +187,26 @@ __copy_from_user_inatomic_nocache(void *to, const void __user *from,
 
 unsigned long __must_check copy_to_user(void __user *to,
 					const void *from, unsigned long n);
-unsigned long __must_check copy_from_user(void *to,
+unsigned long __must_check _copy_from_user(void *to,
 					  const void __user *from,
 					  unsigned long n);
+
+static inline unsigned long __must_check copy_from_user(void *to,
+					  const void __user *from,
+					  unsigned long n)
+{
+	int sz = __compiletime_object_size(to);
+	int ret = -EFAULT;
+
+	if (likely(sz == -1 || sz >= n))
+		ret = _copy_from_user(to, from, n);
+#ifdef CONFIG_DEBUG_VM
+	else
+		WARN(1, "Buffer overflow detected!\n");
+#endif
+	return ret;
+}
+
 long __must_check strncpy_from_user(char *dst, const char __user *src,
 				    long count);
 long __must_check __strncpy_from_user(char *dst,
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index db24b21..ce6fec7 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -21,10 +21,27 @@ copy_user_generic(void *to, const void *from, unsigned len);
 __must_check unsigned long
 copy_to_user(void __user *to, const void *from, unsigned len);
 __must_check unsigned long
-copy_from_user(void *to, const void __user *from, unsigned len);
+_copy_from_user(void *to, const void __user *from, unsigned len);
 __must_check unsigned long
 copy_in_user(void __user *to, const void __user *from, unsigned len);
 
+static inline unsigned long __must_check copy_from_user(void *to,
+					  const void __user *from,
+					  unsigned long n)
+{
+	int sz = __compiletime_object_size(to);
+	int ret = -EFAULT;
+
+	if (likely(sz == -1 || sz >= n))
+		ret = _copy_from_user(to, from, n);
+#ifdef CONFIG_DEBUG_VM
+	else
+		WARN(1, "Buffer overflow detected!\n");
+#endif
+	return ret;
+}
+
+
 static __always_inline __must_check
 int __copy_from_user(void *dst, const void __user *src, unsigned size)
 {
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index 3909e3b..a0cdd8c 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -30,7 +30,7 @@ EXPORT_SYMBOL(__put_user_8);
 
 EXPORT_SYMBOL(copy_user_generic);
 EXPORT_SYMBOL(__copy_user_nocache);
-EXPORT_SYMBOL(copy_from_user);
+EXPORT_SYMBOL(_copy_from_user);
 EXPORT_SYMBOL(copy_to_user);
 EXPORT_SYMBOL(__copy_from_user_inatomic);
 
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
index 6ba0f7b..4be3c41 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
@@ -78,7 +78,7 @@ ENTRY(copy_to_user)
 ENDPROC(copy_to_user)
 
 /* Standard copy_from_user with segment limit checking */
-ENTRY(copy_from_user)
+ENTRY(_copy_from_user)
 	CFI_STARTPROC
 	GET_THREAD_INFO(%rax)
 	movq %rsi,%rcx
@@ -88,7 +88,7 @@ ENTRY(copy_from_user)
 	jae bad_from_user
 	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
 	CFI_ENDPROC
-ENDPROC(copy_from_user)
+ENDPROC(_copy_from_user)
 
 ENTRY(copy_user_generic)
 	CFI_STARTPROC
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index 1f118d4..8498684 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -874,7 +874,7 @@ EXPORT_SYMBOL(copy_to_user);
  * data to the requested size using zero bytes.
  */
 unsigned long
-copy_from_user(void *to, const void __user *from, unsigned long n)
+_copy_from_user(void *to, const void __user *from, unsigned long n)
 {
 	if (access_ok(VERIFY_READ, from, n))
 		n = __copy_from_user(to, from, n);
@@ -882,4 +882,4 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
 		memset(to, 0, n);
 	return n;
 }
-EXPORT_SYMBOL(copy_from_user);
+EXPORT_SYMBOL(_copy_from_user);
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 450fa59..a3aef5d 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -37,3 +37,5 @@
 #define __cold			__attribute__((__cold__))
 
 #endif
+
+#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 9d4c4b0..9c42853 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -185,6 +185,10 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
 #endif
 
+/* Compile time object size, -1 for unknown */
+#ifndef __compiletime_object_size
+# define __compiletime_object_size(obj) -1
+#endif
 /*
  * Prevent the compiler from merging or refetching accesses.  The compiler
  * is also forbidden from reordering successive instances of ACCESS_ONCE(),
-- 
1.6.0.6



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

>From davej  Sat Sep 26 14:57:33 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:33 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:56:34 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 13A2C9C7CF;
	Sat, 26 Sep 2009 14:56:34 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 4zEaK-kQ3gyD; Sat, 26 Sep 2009 14:56:33 -0400 (EDT)
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id CEC9D9CE2F;
	Sat, 26 Sep 2009 14:56:33 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIuR4l002317;
	Sat, 26 Sep 2009 14:56:27 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPK007277;
	Sat, 26 Sep 2009 14:56:14 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752513AbZIZSyU (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1751887AbZIZSyT
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from casper.infradead.org ([85.118.1.10]:36387 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750795AbZIZSyS (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:18 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPU-0002Uh-8u; Sat, 26 Sep 2009 18:54:20 +0000
Date: 	Sat, 26 Sep 2009 20:49:51 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: linux-kernel at vger.kernel.org
Cc: torvalds at linux-foundation.org, mingo at elte.hu
Subject: [PATCH 0/9] Series to make copy_from_user to a stack slot provable
 right
Message-ID: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1430
Lines: 32

[PATCH 0/9] Series to make copy_from_user to a stack slot provable right

This series contains a series of patches that, when applied, make every
copy_from_user() in a make allyesconfig to a (direct) stack slot
provable-by-gcc to have a correct size.

This is useful because if we fix all of these, we can make the non-provable
case an error, as an indication of a possible security hole.

Now the series has 4 types of patches
1) changes where the original code really was missing checks
2) changes where the checks were coded so complex and games were played with
   types, that I (and the compiler) couldn't be sure if it was correct or
   not
3) changes where we're hitting a small gcc missing optimization, but where
   a simplification of the code allows gcc to prove things anyway.
   (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41477 is filed for this)
4) a case in sys_socketcall where Dave Miller and co were very smart in
   optimizing the code to the point where it's not reasonable for gcc
   to realize the result is ok.



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:34 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:34 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 54BEB92827;
	Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id UtrSlSnoRSKJ; Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1994391AC5;
	Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.5])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIuWCe012052;
	Sat, 26 Sep 2009 14:56:32 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIiTd1002301;
	Sat, 26 Sep 2009 14:56:26 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752887AbZIZS4M (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:56:12 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752401AbZIZSyU
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: from casper.infradead.org ([85.118.1.10]:36390 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750867AbZIZSyT (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPU-0002Uh-MA; Sat, 26 Sep 2009 18:54:20 +0000
Date: 	Sat, 26 Sep 2009 20:50:25 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        lenb at kernel.org
Subject: [PATCH 1/9] Fix bound checks for copy_from_user in the acpi /proc
 code
Message-ID: <20090926205025.3befecf6 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
Status: RO
Content-Length: 1269
Lines: 38


From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 1/9] Fix bound checks for copy_from_user in the acpi /proc code
CC: Len Brown <lenb at kernel.org>

The ACPI /proc write() code takes an unsigned length argument like any write()
function, but then assigned it to a *signed* integer called "len".
Only after this is a sanity check for len done to make it not larger than 4.

Due to the type change a len < 0 is in principle also possible; this patch
adds a check for this.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index d0d550d..f8b6f55 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
 
 	if (len > 4)
 		len = 4;
+	if (len < 0)
+		return -EFAULT;
 
 	if (copy_from_user(strbuf, buffer, len))
 		return -EFAULT;


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:19 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:19 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:08 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1CF509E536;
	Sat, 26 Sep 2009 14:55:08 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 3zTyP7cuh4ce; Sat, 26 Sep 2009 14:55:07 -0400 (EDT)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D77239DB9F;
	Sat, 26 Sep 2009 14:55:07 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIt1Ks015507;
	Sat, 26 Sep 2009 14:55:01 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPD007277;
	Sat, 26 Sep 2009 14:54:56 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753121AbZIZSyo (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:44 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752997AbZIZSye
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:34 -0400
Received: from casper.infradead.org ([85.118.1.10]:36421 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752837AbZIZSyZ (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:25 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPV-0002Uh-2m; Sat, 26 Sep 2009 18:54:21 +0000
Date: 	Sat, 26 Sep 2009 20:50:49 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu
Subject: [PATCH 2/9] Simplify bound checks in nvram for copy_from_user
Message-ID: <20090926205049.33703eea at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1655
Lines: 52


From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 2/9] Simplify bound checks in nvram for copy_from_user

The nvram driver's write() function has an interesting bound check.
Not only does it use the always-hard-to-read ? C operator, it also
has a magic "i" in there, which comes from the file position of
the file.

On first sight the check looks sane, however the value of "i" is not 
checked at all and I as human don't know if the C type rules guarantee
that the result is always within bounds.. and neither does gcc seem to
know.

This patch simplifies the checks and guarantees that the copy will not
overflow the destination buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 88cee40..b2a7eaf 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -267,7 +267,15 @@ static ssize_t nvram_write(struct file *file, const char __user *buf,
 	unsigned char *tmp;
 	int len;
 
-	len = (NVRAM_BYTES - i) < count ? (NVRAM_BYTES - i) : count;
+	len = count;
+	if (count > NVRAM_BYTES - i)
+		len = NVRAM_BYTES - i;
+
+	if (len > NVRAM_BYTES)
+		len = NVRAM_BYTES;
+	if (len < 0)
+		return -EINVAL;
+
 	if (copy_from_user(contents, buf, len))
 		return -EFAULT;
 


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:18 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:18 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A27AB9E536;
	Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id qOnejO9jCrDH; Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 675CA9DB9F;
	Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.5])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIsw7o015502;
	Sat, 26 Sep 2009 14:54:58 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIiTcx002301;
	Sat, 26 Sep 2009 14:54:45 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753027AbZIZSye (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:34 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752975AbZIZSyc
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:32 -0400
Received: from casper.infradead.org ([85.118.1.10]:36410 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752691AbZIZSyW (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:22 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPV-0002Uh-GY; Sat, 26 Sep 2009 18:54:21 +0000
Date: 	Sat, 26 Sep 2009 20:51:14 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        linux-wireless at vger.kernel.org
Subject: [PATCH 3/9] Add bound checks in wext for copy_from_user
Message-ID: <20090926205114.4ec62382 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
Status: RO
Content-Length: 1551
Lines: 47

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 3/9] Add bound checks in wext for copy_from_user
CC: linux-wireless at vger.kernel.org

The wireless extensions have a copy_from_user to a local stack
array "essid", but both me and gcc have failed to find where
the bounds for this copy are located in the code.

This patch adds some basic sanity checks for the copy length
to make sure that we don't overflow the stack buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index 5b4a0ce..34beae6 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -773,10 +773,13 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
 			essid_compat = 1;
 		else if (IW_IS_SET(cmd) && (iwp->length != 0)) {
 			char essid[IW_ESSID_MAX_SIZE + 1];
+			unsigned int len;
+			len = iwp->length * descr->token_size;
 
-			err = copy_from_user(essid, iwp->pointer,
-					     iwp->length *
-					     descr->token_size);
+			if (len > IW_ESSID_MAX_SIZE)
+				return -EFAULT;
+
+			err = copy_from_user(essid, iwp->pointer, len);
 			if (err)
 				return -EFAULT;
 



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:15 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:15 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:54:53 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 089D89E536;
	Sat, 26 Sep 2009 14:54:53 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 42yBhVM1-bIT; Sat, 26 Sep 2009 14:54:52 -0400 (EDT)
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id C205B9DB9F;
	Sat, 26 Sep 2009 14:54:52 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.5])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIsj7c001906;
	Sat, 26 Sep 2009 14:54:46 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIiTcw002301;
	Sat, 26 Sep 2009 14:54:33 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752928AbZIZSy1 (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:27 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752675AbZIZSy0
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:26 -0400
Received: from casper.infradead.org ([85.118.1.10]:36396 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750795AbZIZSyT (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPW-0002Uh-1I; Sat, 26 Sep 2009 18:54:22 +0000
Date: 	Sat, 26 Sep 2009 20:51:50 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        hpa at zytor.com, tglx at tglx.de
Subject: [PATCH 4/9] Simplify bound checks in the MTRR code
Message-ID: <20090926205150.30797709 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
Status: RO
Content-Length: 1683
Lines: 61

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 4/9] Simplify bound checks in the MTRR code
CC: mingo at elte.hu
CC: hpa at zytor.com
CC: tglx at tglx.de

The current bound checks for copy_from_user in the MTRR driver
are not as obvious as they could be, and gcc agrees with that.

This patch simplifies the boundary checks to the point that gcc
can now prove to itself that the copy_from_user() is never going
past its bounds.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

--- linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c~	2009-09-28 16:51:07.000000000 -0400
+++ linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c	2009-09-28 16:52:30.000000000 -0400
@@ -94,17 +94,26 @@ mtrr_write(struct file *file, const char
 	unsigned long long base, size;
 	char *ptr;
 	char line[LINE_SIZE];
+	int length;
 	size_t linelen;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
-	if (!len)
-		return -EINVAL;
+
 	memset(line, 0, LINE_SIZE);
-	if (len > LINE_SIZE)
-		len = LINE_SIZE;
-	if (copy_from_user(line, buf, len - 1))
+
+	length = len;
+	length--;
+
+	if (length > LINE_SIZE - 1)
+		length = LINE_SIZE - 1;
+
+	if (length < 0)
+		return -EINVAL;
+
+	if (copy_from_user(line, buf, length))
 		return -EFAULT;
+
 	linelen = strlen(line);
 	ptr = line + linelen - 1;
 	if (linelen && *ptr == '\n')

-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:28 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:28 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:56:09 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3BB159CE2F;
	Sat, 26 Sep 2009 14:56:09 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id w5I9rbKDiOVg; Sat, 26 Sep 2009 14:56:09 -0400 (EDT)
Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 00D0E9C7CF;
	Sat, 26 Sep 2009 14:56:08 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIu1VY022597;
	Sat, 26 Sep 2009 14:56:02 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPI007277;
	Sat, 26 Sep 2009 14:55:55 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752826AbZIZSyY (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:24 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752675AbZIZSyW
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:22 -0400
Received: from casper.infradead.org ([85.118.1.10]:36394 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751800AbZIZSyT (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPW-0002Uh-Ga; Sat, 26 Sep 2009 18:54:22 +0000
Date: 	Sat, 26 Sep 2009 20:52:23 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        lenb at kernel.org
Subject: [PATCH 5/9] Add bound checks in acpi/video for copy_from_user
Message-ID: <20090926205223.61dd0844 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 2065
Lines: 75

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 5/9] Add bound checks in acpi/video for copy_from_user
CC: Len Brown <lenb at kernel.org>

The ACPI video driver has a few boundary checks for copy_from_user
that unfortunately confuse the GCC optimizer.

This patch simplifies these boundary checks to the point that
gcc knows they copy_from_user() is always within bounds.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 94b1a4c..0dd2cc8 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1218,7 +1218,9 @@ acpi_video_device_write_state(struct file *file,
 	u32 state = 0;
 
 
-	if (!dev || count + 1 > sizeof str)
+	if (!dev)
+		return -EINVAL;
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	if (copy_from_user(str, buffer, count))
@@ -1275,7 +1277,10 @@ acpi_video_device_write_brightness(struct file *file,
 	int i;
 
 
-	if (!dev || !dev->brightness || count + 1 > sizeof str)
+	if (!dev || !dev->brightness)
+		return -EINVAL;
+
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	if (copy_from_user(str, buffer, count))
@@ -1557,7 +1562,10 @@ acpi_video_bus_write_POST(struct file *file,
 	unsigned long long opt, options;
 
 
-	if (!video || count + 1 > sizeof str)
+	if (!video)
+		return -EINVAL;
+
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	status = acpi_video_bus_POST_options(video, &options);
@@ -1597,7 +1605,9 @@ acpi_video_bus_write_DOS(struct file *file,
 	unsigned long opt;
 
 
-	if (!video || count + 1 > sizeof str)
+	if (!video)
+		return -EINVAL;
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	if (copy_from_user(str, buffer, count))



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:21 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:21 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id C573B92827;
	Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id kOeSnU2O0+Pc; Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8614591AC5;
	Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QItOv6015831;
	Sat, 26 Sep 2009 14:55:25 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPE007277;
	Sat, 26 Sep 2009 14:55:09 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753137AbZIZSzA (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:55:00 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752707AbZIZSya
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:30 -0400
Received: from casper.infradead.org ([85.118.1.10]:36400 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750867AbZIZSyU (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPX-0002Uh-53; Sat, 26 Sep 2009 18:54:23 +0000
Date: 	Sat, 26 Sep 2009 20:52:55 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        sfrench at samba.org
Subject: [PATCH 6/9] Simplify bound checks in cifs for copy_from_user
Message-ID: <20090926205255.1d9de6c7 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1436
Lines: 46

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 6/9] Simplify bound checks in cifs for copy_from_user
CC: Steve French <sfrench at samba.org>

The CIFS code unfortunately hits a missed optimization in gcc
(http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41477)
where gcc can't prove to itself that count will not be larger than 11.

This patch simplifies the expression so that GCC does realize this,
giving slightly better code soon when copy_from_user() grows some checks.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 42cec2a..94b86da 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -732,11 +732,13 @@ static ssize_t cifs_security_flags_proc_write(struct file *file,
 	char flags_string[12];
 	char c;
 
-	if ((count < 1) || (count > 11))
-		return -EINVAL;
-
 	memset(flags_string, 0, 12);
 
+	if (count < 1)
+		return -EINVAL;
+	if (count > 11)
+		return -EINVAL;
+
 	if (copy_from_user(flags_string, buffer, count))
 		return -EFAULT;
 



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:16 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:16 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
 zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 76D154E5A4;
	Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id UcwzvLLoE+tE; Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 31D294E591;
	Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIsuQR011097;
	Sat, 26 Sep 2009 14:54:56 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPC007277;
	Sat, 26 Sep 2009 14:54:43 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752970AbZIZSyb (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:31 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752675AbZIZSy3
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:29 -0400
Received: from casper.infradead.org ([85.118.1.10]:36404 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751887AbZIZSyU (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPX-0002Uh-KU; Sat, 26 Sep 2009 18:54:23 +0000
Date: 	Sat, 26 Sep 2009 20:53:36 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        jmorris at nami.org
Subject: [PATCH 7/9] Simplify bound checks in capabilities for
 copy_from_user
Message-ID: <20090926205336.77bc5b21 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1883
Lines: 51

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 7/9] Simplify bound checks in capabilities for copy_from_user
CC: James Morris <jmorris at namei.org>

The capabilities syscall has a copy_from_user() call where gcc currently
cannot prove to itself that the copy is always within bounds.

This patch adds a very explicity bound check to prove to gcc that 
this copy_from_user cannot overflow its destination buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/kernel/capability.c b/kernel/capability.c
index 4e17041..204f11f 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -238,7 +241,7 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
 SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
 {
 	struct __user_cap_data_struct kdata[_KERNEL_CAPABILITY_U32S];
-	unsigned i, tocopy;
+	unsigned i, tocopy, copybytes;
 	kernel_cap_t inheritable, permitted, effective;
 	struct cred *new;
 	int ret;
@@ -255,8 +258,11 @@ SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
 	if (pid != 0 && pid != task_pid_vnr(current))
 		return -EPERM;
 
-	if (copy_from_user(&kdata, data,
-			   tocopy * sizeof(struct __user_cap_data_struct)))
+	copybytes = tocopy * sizeof(struct __user_cap_data_struct);
+	if (copybytes > _KERNEL_CAPABILITY_U32S)
+		return -EFAULT;
+
+	if (copy_from_user(&kdata, data, copybytes))
 		return -EFAULT;
 
 	for (i = 0; i < tocopy; i++) {



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 14:57:23 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:23 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8839792827;
	Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 7Yts36SyUiSk; Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4C9C691AC5;
	Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QItiGJ022579;
	Sat, 26 Sep 2009 14:55:44 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPG007277;
	Sat, 26 Sep 2009 14:55:31 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753086AbZIZSzQ (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:55:16 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752878AbZIZSy1
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:27 -0400
Received: from casper.infradead.org ([85.118.1.10]:36406 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752669AbZIZSyV (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:21 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPY-0002Uh-56; Sat, 26 Sep 2009 18:54:24 +0000
Date: 	Sat, 26 Sep 2009 20:54:06 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        akpm at linux-foundation.org
Subject: [PATCH 8/9] Add explicit bound checks in mm/migrate.c
Message-ID: <20090926205406.30d55b08 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1531
Lines: 47

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 8/9] Add explicit bound checks in mm/migrate.c
CC: akpm at linux-foundation.org

The memory migration code has some curious copy_from_user bounds,
that are likely ok, but are not immediately obvious to me or to GCC.

This patch adds a simple explicit bound check; this allows GCC
and me to be more assured that the copy_from_user will never overwrite
its destination buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/mm/migrate.c b/mm/migrate.c
index 1a4bf48..5b9ebc5 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1044,11 +1044,15 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages,
 	int err;
 
 	for (i = 0; i < nr_pages; i += chunk_nr) {
+		unsigned int copy;
 		if (chunk_nr + i > nr_pages)
 			chunk_nr = nr_pages - i;
 
-		err = copy_from_user(chunk_pages, &pages[i],
-				     chunk_nr * sizeof(*chunk_pages));
+		copy = chunk_nr * sizeof(*chunk_pages);
+		if (copy > DO_PAGES_STAT_CHUNK_NR)
+			return -EFAULT;
+
+		err = copy_from_user(chunk_pages, &pages[i], copy);
 		if (err) {
 			err = -EFAULT;
 			goto out;


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

>From davej  Sat Sep 26 15:24:03 2009
Return-Path: netdev-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 15:24:03 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7BD039D92F;
	Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id TPGJET5LrlkZ; Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4D4C49D7C8;
	Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.12])
	by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QJN1Th008926;
	Sat, 26 Sep 2009 15:23:01 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIxDQS027750;
	Sat, 26 Sep 2009 15:22:49 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752510AbZIZTWm (ORCPT <rfc822;dnelson at redhat.com> + 16 others);
	Sat, 26 Sep 2009 15:22:42 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752371AbZIZTWl
	(ORCPT <rfc822;netdev-outgoing>); Sat, 26 Sep 2009 15:22:41 -0400
Received: from casper.infradead.org ([85.118.1.10]:41083 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752224AbZIZTWl (ORCPT
	<rfc822;netdev at vger.kernel.org>); Sat, 26 Sep 2009 15:22:41 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1Mrcqx-0003Pe-Cb; Sat, 26 Sep 2009 19:22:43 +0000
Date: 	Sat, 26 Sep 2009 21:23:02 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        netdev at vger.kernel.org
Subject: Re: [PATCH 9/9] Add explicit bound checks in net/socket.c
Message-ID: <20090926212302.0ce64a5c at infradead.org>
In-Reply-To: <20090926190103.GB4356 at lenovo>
References: <20090926204951.424e567e at infradead.org>
	<20090926205432.24aa1023 at infradead.org>
	<20090926190103.GB4356 at lenovo>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: netdev-owner at vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: 	netdev at vger.kernel.org
X-RedHat-Spam-Score: -3.762  (AWL,RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.12
Status: RO
Content-Length: 3053
Lines: 93

On Sat, 26 Sep 2009 23:01:03 +0400
Cyrill Gorcunov <gorcunov at gmail.com> wrote:

> [Arjan van de Ven - Sat, Sep 26, 2009 at 08:54:32PM +0200]
> | From: Arjan van de Ven <arjan at linux.intel.com>
> | Subject: [PATCH 9/9] Add explicit bound checks in net/socket.c
> | CC: netdev at vger.kernel.org
> | 
> | The sys_socketcall() function has a very clever system for the copy
> | size of its arguments. Unfortunately, gcc cannot deal with this in
> | terms of proving that the copy_from_user() is then always in bounds.
> | This is the last (well 9th of this series, but last in the kernel)
> such | case around.
> | 
> | With this patch, we can turn on code to make having the boundary
> provably | right for the whole kernel, and detect introduction of new
> security | accidents of this type early on.
> | 
> | Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
> | 
> | 
> | diff --git a/net/socket.c b/net/socket.c
> | index 49917a1..13a8d67 100644
> | --- a/net/socket.c
> | +++ b/net/socket.c
> | @@ -2098,12 +2098,17 @@ SYSCALL_DEFINE2(socketcall, int, call,
> unsigned long __user *, args) |  	unsigned long a[6];
> |  	unsigned long a0, a1;
> |  	int err;
> | +	unsigned int len;
> |  
> |  	if (call < 1 || call > SYS_ACCEPT4)
> |  		return -EINVAL;
> |  
> | +	len = nargs[call];
> | +	if (len > 6)
> 
> Hi Arjan, wouldn't ARRAY_SIZE suffice beter there?
> Or I miss something?
> 

goof once goof twice, make it sizeof.. that's nicer.

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 9/9] Add explicit bound checks in net/socket.c
CC: netdev at vger.kernel.org

The sys_socketcall() function has a very clever system for the copy
size of its arguments. Unfortunately, gcc cannot deal with this in
terms of proving that the copy_from_user() is then always in bounds.
This is the last (well 9th of this series, but last in the kernel) such
case around.

With this patch, we can turn on code to make having the boundary provably
right for the whole kernel, and detect introduction of new security
accidents of this type early on.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/net/socket.c b/net/socket.c
index 49917a1..13a8d67 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2098,12 +2098,17 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
 	unsigned long a[6];
 	unsigned long a0, a1;
 	int err;
+	unsigned int len;
 
 	if (call < 1 || call > SYS_ACCEPT4)
 		return -EINVAL;
 
+	len = nargs[call];
+	if (len > sizeof(a))
+		return -EINVAL;
+
 	/* copy_from_user should be SMP safe. */
-	if (copy_from_user(a, args, nargs[call]))
+	if (copy_from_user(a, args, len))
 		return -EFAULT;
 
 	audit_socketcall(nargs[call] / sizeof(unsigned long), a);


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1837
retrieving revision 1.1838
diff -u -p -r1.1837 -r1.1838
--- kernel.spec	28 Sep 2009 19:22:04 -0000	1.1837
+++ kernel.spec	28 Sep 2009 21:01:12 -0000	1.1838
@@ -650,6 +650,8 @@ Patch460: linux-2.6-serial-460800.patch
 
 Patch470: die-floppy-die.patch
 
+Patch500: linux-2.6.31-copy_from_user-bounds.patch
+
 Patch510: linux-2.6-silence-noise.patch
 Patch520: linux-2.6.30-hush-rom-warning.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1283,6 +1285,9 @@ ApplyPatch linux-2.6-input-kill-stupid-m
 # stop floppy.ko from autoloading during udev...
 ApplyPatch die-floppy-die.patch
 
+# make copy_from_user to a stack slot provable right
+ApplyPatch linux-2.6.31-copy_from_user-bounds.patch
+
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
@@ -2069,6 +2074,10 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 28 2009 Dave Jones <davej at redhat.com> 2.6.31.1-52
+- Use __builtin_object_size to validate the buffer size for copy_from_user
+  + associated fixes to various copy_from_user invocations.
+
 * Mon Sep 28 2009 Justin M. Forbes <jmforbes at redhat.com> 2.6.31.1-50
 - Increase timeout for xen frontend devices to connect.
 



From hadess at fedoraproject.org  Mon Sep 28 21:21:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 21:21:01 +0000 (UTC)
Subject: rpms/anerley/devel anerley-mc5-port.patch, NONE, 1.1 anerley.spec,
	1.5, 1.6
Message-ID: <20090928212101.46F8511C0419@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26033

Modified Files:
	anerley.spec 
Added Files:
	anerley-mc5-port.patch 
Log Message:
* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.1.1-2
- Add patch to port to Mission Control 5


anerley-mc5-port.patch:
 b/anerley/Makefile.am                 |    4 
 b/anerley/anerley-aggregate-tp-feed.c |  210 +++++++++++++---------------------
 b/anerley/anerley-aggregate-tp-feed.h |    3 
 b/anerley/anerley-tp-feed.c           |  208 +++++++++++----------------------
 b/anerley/anerley-tp-feed.h           |    6 
 b/anerley/anerley-tp-item.c           |  173 ++++++++++++++++++++++------
 b/anerley/anerley-tp-item.h           |    4 
 b/configure.ac                        |    1 
 b/tests/Makefile.am                   |    4 
 b/tests/test-aggregate-tp-feed.c      |   65 +++++++---
 b/tests/test-simple-grid-view.c       |   63 ++++++----
 b/tests/test-simple-ui.c              |   26 +---
 b/tests/test-tile-view.c              |   69 +++++++----
 b/tests/test-tp-feed.c                |   59 ++++++---
 configure.ac                          |    2 
 15 files changed, 495 insertions(+), 402 deletions(-)

--- NEW FILE anerley-mc5-port.patch ---
commit f76297e57d4368ef4e289716e03cd8e256532fad
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:08:32 2009 +0100

    Stop building against libmissioncontrol.
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/anerley/Makefile.am b/anerley/Makefile.am
index f2043f9..9d9254c 100644
--- a/anerley/Makefile.am
+++ b/anerley/Makefile.am
@@ -30,10 +30,10 @@ libanerley_la_SOURCES = anerley-tp-feed.c \
 libanerley_ladir = $(includedir)/anerley/anerley
 
 libanerley_la_CFLAGS = -I$(top_srcdir) \
-		       $(GLIB_CFLAGS) $(TELEPATHY_CFLAGS) $(MC_CFLAGS) \
+		       $(GLIB_CFLAGS) $(TELEPATHY_CFLAGS) \
 		       $(NBTK_CFLAGS) $(EBOOK_CFLAGS) \
 		       -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
 		       -D_GNU_SOURCE
-libanerley_la_LIBADD = $(GLIB_LIBS) $(TELEPATHY_LIBS) $(MC_LIBS) \
+libanerley_la_LIBADD = $(GLIB_LIBS) $(TELEPATHY_LIBS) \
 		       $(NBTK_LIBS) $(EBOOK_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 90444e3..8974038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ CFLAGS="$CFLAGS -Wall"
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0)
 PKG_CHECK_MODULES(TELEPATHY, telepathy-glib)
-PKG_CHECK_MODULES(MC, libmissioncontrol)
 PKG_CHECK_MODULES(NBTK, nbtk-1.2)
 PKG_CHECK_MODULES(EBOOK, libebook-1.2)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a5508a..00c44d5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,9 @@
 noinst_PROGRAMS = test-tp-feed test-simple-grid-view test-tile-view test-aggregate-tp-feed test-simple-ui
 
-AM_CFLAGS = $(GLIB_CFLAGS) $(TELEPATHY_CFLAGS) $(MC_CFLAGS) $(NBTK_CFLAGS) \
+AM_CFLAGS = $(GLIB_CFLAGS) $(TELEPATHY_CFLAGS) $(NBTK_CFLAGS) \
 	    -I$(top_srcdir) \
 	    -DPKG_DATA_DIR=\"$(pkgdatadir)\"
-AM_LDFLAGS = $(GLIB_LIBS) $(TELEPATHY_LIBS) $(MC_LIBS) $(NBTK_LIBS)
+AM_LDFLAGS = $(GLIB_LIBS) $(TELEPATHY_LIBS) $(NBTK_LIBS)
 
 test_tp_feed_SOURCES = test-tp-feed.c
 test_tp_feed_LDADD = ../anerley/libanerley.la
commit 3aa84f86a5c0d33d3dc3199b3891ac6a30c8fae0
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Sep 28 15:33:21 2009 +0100

    configure.ac: add a versioned depends on telepathy-glib
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index 8974038..41d662a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AM_PROG_CC_C_O
 CFLAGS="$CFLAGS -Wall"
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0)
-PKG_CHECK_MODULES(TELEPATHY, telepathy-glib)
+PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.9.0)
 PKG_CHECK_MODULES(NBTK, nbtk-1.2)
 PKG_CHECK_MODULES(EBOOK, libebook-1.2)
 

commit 90c0a5428a743abbaa30215f34c25bea813dabf9
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:45:45 2009 +0100

    test-simple-ui: update to use new account manager/anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/tests/test-simple-ui.c b/tests/test-simple-ui.c
index c8ea91b..52c7f36 100644
--- a/tests/test-simple-ui.c
+++ b/tests/test-simple-ui.c
@@ -26,9 +26,9 @@
 #include <anerley/anerley-tile.h>
 #include <anerley/anerley-aggregate-tp-feed.h>
 #include <anerley/anerley-feed-model.h>
+#include <anerley/anerley-tile-view.h>
 
 #include <clutter/clutter.h>
-#include <libmissioncontrol/mission-control.h>
 #include <telepathy-glib/contact.h>
 
 #include <glib.h>
@@ -49,9 +49,7 @@ int
 main (int    argc,
       char **argv)
 {
-  MissionControl *mc;
-  AnerleyTpFeed *feed;
-  DBusGConnection *conn;
+  AnerleyFeed *feed;
   ClutterActor *stage;
   NbtkWidget *scroll_view;
   NbtkWidget *icon_view;
@@ -84,23 +82,21 @@ main (int    argc,
 
   g_free (path);
 
-  conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-  feed = anerley_aggregate_tp_feed_new (mc);
+  feed = anerley_aggregate_tp_feed_new ();
   model = anerley_feed_model_new (feed);
   stage = clutter_stage_get_default ();
-  icon_view = anerley_tile_view_new (model);
+  icon_view = anerley_tile_view_new (ANERLEY_FEED_MODEL (model));
 
   table = nbtk_table_new ();
   entry = nbtk_entry_new (NULL);
-  tmp = nbtk_entry_get_clutter_text (entry);
+  tmp = nbtk_entry_get_clutter_text (NBTK_ENTRY (entry));
   g_signal_connect (tmp,
                     "text-changed",
-                    _entry_text_changed_cb,
+                    G_CALLBACK (_entry_text_changed_cb),
                     model);
 
   nbtk_table_add_actor_with_properties (NBTK_TABLE (table),
-                                        entry,
+                                        CLUTTER_ACTOR (entry),
                                         0,
                                         0,
                                         "x-fill",
@@ -113,12 +109,12 @@ main (int    argc,
 
   scroll_view = nbtk_scroll_view_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage),
-                               table);
+                               CLUTTER_ACTOR (table));
   clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
-                               icon_view);
+                               CLUTTER_ACTOR (icon_view));
   clutter_actor_show_all (stage);
   nbtk_table_add_actor_with_properties (NBTK_TABLE (table),
-                                        scroll_view,
+                                        CLUTTER_ACTOR (scroll_view),
                                         1,
                                         0,
                                         "x-fill",
@@ -131,7 +127,7 @@ main (int    argc,
                                         TRUE,
                                         NULL);
 
-  clutter_actor_set_size (table, 640, 480);
+  clutter_actor_set_size (CLUTTER_ACTOR (table), 640, 480);
   clutter_main ();
 
   return 0;

commit 8a5d5d69bb504c2fc4a8da3e931f0d7bf82b4706
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:45:37 2009 +0100

    test-simple-grid-view: update to use new account manager/anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/tests/test-simple-grid-view.c b/tests/test-simple-grid-view.c
index 87be65b..092ac13 100644
--- a/tests/test-simple-grid-view.c
+++ b/tests/test-simple-grid-view.c
@@ -25,23 +25,55 @@
 #include <anerley/anerley-simple-grid-view.h>
 
 #include <clutter/clutter.h>
-#include <libmissioncontrol/mission-control.h>
+
+#include <telepathy-glib/account.h>
+#include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/contact.h>
 
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 
-int
-main (int    argc,
-      char **argv)
+static void
+am_ready_cb (GObject      *source_object,
+             GAsyncResult *result,
+             gpointer      userdata)
 {
-  MissionControl *mc;
-  McAccount *account;
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  TpAccount *account;
   AnerleyTpFeed *feed;
-  DBusGConnection *conn;
   ClutterActor *stage;
   NbtkWidget *scroll_view;
   ClutterActor *grid;
+  const gchar **argv = userdata;
+  GError *error = NULL;
+
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to prepare account manager: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  account = tp_account_manager_ensure_account (account_manager, argv[1]);
+
+  feed = anerley_tp_feed_new (account);
+
+  stage = clutter_stage_get_default ();
+  grid = CLUTTER_ACTOR (anerley_simple_grid_view_new (ANERLEY_FEED (feed)));
+  scroll_view = nbtk_scroll_view_new ();
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage),
+                               CLUTTER_ACTOR (scroll_view));
+  clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
+                               grid);
+  clutter_actor_set_size (CLUTTER_ACTOR (scroll_view), 640, 480);
+  clutter_actor_show_all (stage);
+}
+
+int
+main (int    argc,
+      char **argv)
+{
+  TpAccountManager *account_manager;
   gchar *path;
   NbtkStyle *style;
   GError *error = NULL;
@@ -71,19 +103,10 @@ main (int    argc,
 
   g_free (path);
 
-  conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-  account = mc_account_lookup (argv[1]);
-  feed = anerley_tp_feed_new (mc, account);
-  stage = clutter_stage_get_default ();
-  grid = anerley_simple_grid_view_new (feed);
-  scroll_view = nbtk_scroll_view_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage),
-                               scroll_view);
-  clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
-                               grid);
-  clutter_actor_set_size (scroll_view, 640, 480);
-  clutter_actor_show_all (stage);
+  account_manager = tp_account_manager_dup ();
+
+  tp_account_manager_prepare_async (account_manager, NULL,
+                                    am_ready_cb, argv);
 
   clutter_main ();
 

commit ecca57f39bb4c1b824e99127478da3abd76643a0
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:45:24 2009 +0100

    test-aggregate-tp-feed: update to use new account manager/anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/tests/test-aggregate-tp-feed.c b/tests/test-aggregate-tp-feed.c
index 93cecad..cb33f9c 100644
--- a/tests/test-aggregate-tp-feed.c
+++ b/tests/test-aggregate-tp-feed.c
@@ -25,30 +25,61 @@
 #include <anerley/anerley-simple-grid-view.h>
 #include <anerley/anerley-tile.h>
 #include <anerley/anerley-aggregate-tp-feed.h>
+#include <anerley/anerley-feed-model.h>
+#include <anerley/anerley-tile-view.h>
 
 #include <clutter/clutter.h>
-#include <libmissioncontrol/mission-control.h>
+
+#include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/contact.h>
 
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 
-int
-main (int    argc,
-      char **argv)
+static void
+am_ready_cb (GObject      *source_object,
+             GAsyncResult *result,
+             gpointer      userdata)
+
 {
-  MissionControl *mc;
-  AnerleyTpFeed *feed;
-  DBusGConnection *conn;
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  AnerleyFeed *feed;
   ClutterActor *stage;
   NbtkWidget *scroll_view;
   NbtkWidget *icon_view;
   ClutterModel *model;
+  GError *error = NULL;
+
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to make account manager ready: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  feed = ANERLEY_FEED (anerley_aggregate_tp_feed_new ());
+  model = CLUTTER_MODEL (anerley_feed_model_new (feed));
+  stage = clutter_stage_get_default ();
+  icon_view = anerley_tile_view_new (ANERLEY_FEED_MODEL (model));
+
+  scroll_view = nbtk_scroll_view_new ();
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage),
+                               CLUTTER_ACTOR (scroll_view));
+  clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
+                               CLUTTER_ACTOR (icon_view));
+  clutter_actor_set_size (CLUTTER_ACTOR (scroll_view), 640, 480);
+  clutter_actor_show_all (stage);
+}
+
+int
+main (int    argc,
+      char **argv)
+{
+  TpAccountManager *account_manager;
   gchar *path;
   NbtkStyle *style;
   GError *error = NULL;
 
-
   clutter_init (&argc, &argv);
 
   path = g_build_filename (PKG_DATA_DIR,
@@ -68,23 +99,15 @@ main (int    argc,
 
   g_free (path);
 
-  conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-  feed = anerley_aggregate_tp_feed_new (mc);
-  model = anerley_feed_model_new (feed);
-  stage = clutter_stage_get_default ();
-  icon_view = anerley_tile_view_new (model);
+  account_manager = tp_account_manager_dup ();
 
-  scroll_view = nbtk_scroll_view_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage),
-                               scroll_view);
-  clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
-                               icon_view);
-  clutter_actor_set_size (scroll_view, 640, 480);
-  clutter_actor_show_all (stage);
+  tp_account_manager_prepare_async (account_manager, NULL,
+                                   am_ready_cb, NULL);
 
   clutter_main ();
 
+  g_object_unref (account_manager);
+
   return 0;
 }
 

commit c9e59f1b8c7866e384365ef0cdeeeeb233a68926
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:18:31 2009 +0100

    test-tile-view: update to use new account manager/anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/tests/test-tile-view.c b/tests/test-tile-view.c
index 9b67191..152193f 100644
--- a/tests/test-tile-view.c
+++ b/tests/test-tile-view.c
@@ -19,34 +19,66 @@
  *
  */
 
-
+#include <anerley/anerley-feed-model.h>
 #include <anerley/anerley-tp-feed.h>
 #include <anerley/anerley-item.h>
 #include <anerley/anerley-simple-grid-view.h>
 #include <anerley/anerley-tile.h>
+#include <anerley/anerley-tile-view.h>
 
 #include <clutter/clutter.h>
-#include <libmissioncontrol/mission-control.h>
+
+#include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/contact.h>
 
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 
-int
-main (int    argc,
-      char **argv)
+static void
+am_ready_cb (GObject      *source_object,
+             GAsyncResult *result,
+             gpointer      userdata)
 {
-  MissionControl *mc;
-  McAccount *account;
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  TpAccount *account;
   AnerleyTpFeed *feed;
-  DBusGConnection *conn;
   ClutterActor *stage;
   NbtkWidget *scroll_view;
   NbtkWidget *icon_view;
   ClutterModel *model;
+  const gchar **argv = userdata;
+  GError *error = NULL;
+
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to prepare account manager: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  account = tp_account_manager_ensure_account (account_manager, argv[1]);
+  feed = anerley_tp_feed_new (account);
+  model = anerley_feed_model_new (ANERLEY_FEED (feed));
+  stage = clutter_stage_get_default ();
+  icon_view = anerley_tile_view_new (ANERLEY_FEED_MODEL (model));
+
+  scroll_view = nbtk_scroll_view_new ();
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage),
+                               CLUTTER_ACTOR (scroll_view));
+  clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
+                               CLUTTER_ACTOR (icon_view));
+  clutter_actor_set_size (CLUTTER_ACTOR (scroll_view), 640, 480);
+  clutter_actor_show_all (stage);
+}
+
+int
+main (int    argc,
+      char **argv)
+{
+  TpAccountManager *account_manager;
+  GError *error = NULL;
   gchar *path;
   NbtkStyle *style;
-  GError *error = NULL;
 
   if (argc < 2)
   {
@@ -73,24 +105,15 @@ main (int    argc,
 
   g_free (path);
 
-  conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-  account = mc_account_lookup (argv[1]);
-  feed = anerley_tp_feed_new (mc, account);
-  model = anerley_feed_model_new (feed);
-  stage = clutter_stage_get_default ();
-  icon_view = anerley_tile_view_new (model);
+  account_manager = tp_account_manager_dup ();
 
-  scroll_view = nbtk_scroll_view_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage),
-                               scroll_view);
-  clutter_container_add_actor (CLUTTER_CONTAINER (scroll_view),
-                               icon_view);
-  clutter_actor_set_size (scroll_view, 640, 480);
-  clutter_actor_show_all (stage);
+  tp_account_manager_prepare_async (account_manager, NULL,
+      am_ready_cb, argv);
 
   clutter_main ();
 
+  g_object_unref (account_manager);
+
   return 0;
 }
 

commit 52bedaac86c3787f218547e788f11a68ae8871e1
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:18:03 2009 +0100

    test-tp-feed: update to use new account manager/anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/tests/test-tp-feed.c b/tests/test-tp-feed.c
index 664ef7c..f044727 100644
--- a/tests/test-tp-feed.c
+++ b/tests/test-tp-feed.c
@@ -19,11 +19,11 @@
  *
  */
 
-
 #include <anerley/anerley-tp-feed.h>
 #include <anerley/anerley-item.h>
 
-#include <libmissioncontrol/mission-control.h>
+#include <telepathy-glib/account.h>
+#include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/contact.h>
 
 #include <glib.h>
@@ -73,15 +73,46 @@ _feed_items_removed_cb (AnerleyTpFeed *feed,
   }
 }
 
+static void
+am_ready_cb (GObject      *source_object,
+             GAsyncResult *result,
+             gpointer      userdata)
+{
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  TpAccount *account;
+  AnerleyTpFeed *feed;
+  const GHashTable *props;
+  const char **argv = userdata;
+  GError *error = NULL;
+
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to prepare account manager: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  account = tp_account_manager_ensure_account (account_manager, argv[1]);
+
+  props = tp_account_get_parameters (account);
+
+  feed = anerley_tp_feed_new (account);
+  g_signal_connect (feed,
+                    "items-added",
+                    G_CALLBACK (_feed_items_added_cb),
+                    NULL);
+  g_signal_connect (feed,
+                    "items-removed",
+                    G_CALLBACK (_feed_items_removed_cb),
+                    NULL);
+}
 
 int
 main (int    argc,
       char **argv)
 {
   GMainLoop *main_loop;
-  MissionControl *mc;
-  McAccount *account;
-  AnerleyTpFeed *feed;
+  TpAccountManager *account_manager;
   DBusGConnection *conn;
 
   if (argc < 2)
@@ -94,20 +125,16 @@ main (int    argc,
 
   main_loop = g_main_loop_new (NULL, FALSE);
   conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-  account = mc_account_lookup (argv[1]);
-  feed = anerley_tp_feed_new (mc, account);
-  g_signal_connect (feed,
-                    "items-added",
-                    _feed_items_added_cb,
-                    NULL);
-  g_signal_connect (feed,
-                    "items-removed",
-                    _feed_items_removed_cb,
-                    NULL);
+
+  account_manager = tp_account_manager_dup ();
+
+  tp_account_manager_prepare_async (account_manager, NULL,
+                                    am_ready_cb, argv);
 
   g_main_loop_run (main_loop);
 
+  g_object_unref (account_manager);
+
   return 0;
 }
 

commit d32c496fb2f13033602e1571ade18049a57537d3
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:10:17 2009 +0100

    aggregate-tp-feed: update to use new tp-glib account helper API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/anerley/anerley-aggregate-tp-feed.c b/anerley/anerley-aggregate-tp-feed.c
index 4027be8..b0af818 100644
--- a/anerley/anerley-aggregate-tp-feed.c
+++ b/anerley/anerley-aggregate-tp-feed.c
@@ -23,7 +23,8 @@
 #include "anerley-aggregate-tp-feed.h"
 
 #include <anerley/anerley-tp-feed.h>
-#include <libmissioncontrol/mc-account-monitor.h>
+
+#include <telepathy-glib/account-manager.h>
 
 G_DEFINE_TYPE (AnerleyAggregateTpFeed, anerley_aggregate_tp_feed, ANERLEY_TYPE_AGGREGATE_FEED)
 
@@ -33,47 +34,10 @@ G_DEFINE_TYPE (AnerleyAggregateTpFeed, anerley_aggregate_tp_feed, ANERLEY_TYPE_A
 typedef struct _AnerleyAggregateTpFeedPrivate AnerleyAggregateTpFeedPrivate;
 
 struct _AnerleyAggregateTpFeedPrivate {
-  MissionControl *mc;
-  McAccountMonitor *account_monitor;
   GHashTable *feeds;
+  TpAccountManager *account_manager;
 };
 
-enum
-{
-  PROP_0,
-  PROP_MC
-};
-
-static void
-anerley_aggregate_tp_feed_get_property (GObject *object, guint property_id,
-                              GValue *value, GParamSpec *pspec)
-{
-  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (object);
-
-  switch (property_id) {
-    case PROP_MC:
-      g_value_set_object (value, priv->mc);
-      break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-  }
-}
-
-static void
-anerley_aggregate_tp_feed_set_property (GObject *object, guint property_id,
-                              const GValue *value, GParamSpec *pspec)
-{
-  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (object);
-
-  switch (property_id) {
-    case PROP_MC:
-      priv->mc = g_value_dup_object (value);
-      break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-  }
-}
-
 static void
 anerley_aggregate_tp_feed_dispose (GObject *object)
 {
@@ -85,16 +49,10 @@ anerley_aggregate_tp_feed_dispose (GObject *object)
     priv->feeds = NULL;
   }
 
-  if (priv->mc)
+  if (priv->account_manager != NULL)
   {
-    g_object_unref (priv->mc);
-    priv->mc = NULL;
-  }
-
-  if (priv->account_monitor)
-  {
-    g_object_unref (priv->account_monitor);
-    priv->account_monitor = NULL;
+    g_object_unref (priv->account_manager);
+    priv->account_manager = NULL;
   }
 
   G_OBJECT_CLASS (anerley_aggregate_tp_feed_parent_class)->dispose (object);
@@ -106,118 +64,125 @@ anerley_aggregate_tp_feed_finalize (GObject *object)
   G_OBJECT_CLASS (anerley_aggregate_tp_feed_parent_class)->finalize (object);
 }
 
-
 static void
-anerley_aggregate_tp_feed_constructed (GObject *object)
+_account_manager_account_enabled_cb (TpAccountManager *account_manager,
+                                     TpAccount        *account,
+                                     gpointer          userdata)
 {
-  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (object);
-  McAccount *account;
-  GList *accounts, *l;
-  const gchar *account_name;
+  AnerleyAggregateTpFeed *aggregate = ANERLEY_AGGREGATE_TP_FEED (userdata);
+  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (aggregate);
   AnerleyTpFeed *feed;
+  const gchar *account_name;
+
+  account_name = tp_proxy_get_object_path (account);
 
-  accounts = mc_accounts_list_by_enabled (TRUE);
+  feed = g_hash_table_lookup (priv->feeds, account_name);
 
-  for (l = accounts; l; l = l->next)
+  if (!feed)
   {
-    account = (McAccount *)l->data;
-    feed = anerley_tp_feed_new (priv->mc, account);
-    account_name = mc_account_get_unique_name (account);
+    feed = anerley_tp_feed_new (account);
+
     g_hash_table_insert (priv->feeds,
                          g_strdup (account_name),
                          feed);
 
-    anerley_aggregate_feed_add_feed (ANERLEY_AGGREGATE_FEED (object),
-                                     (AnerleyFeed *)feed);
+    anerley_aggregate_feed_add_feed (ANERLEY_AGGREGATE_FEED (aggregate),
+                                     ANERLEY_FEED (feed));
   }
-
-  mc_accounts_list_free (accounts);
-
-  if (G_OBJECT_CLASS (anerley_aggregate_tp_feed_parent_class)->constructed)
-    G_OBJECT_CLASS (anerley_aggregate_tp_feed_parent_class)->constructed (object);
 }
 
 static void
-anerley_aggregate_tp_feed_class_init (AnerleyAggregateTpFeedClass *klass)
+_account_manager_account_disabled_cb (TpAccountManager *account_manager,
+                                      TpAccount        *account,
+                                      gpointer          userdata)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *pspec;
-
-  g_type_class_add_private (klass, sizeof (AnerleyAggregateTpFeedPrivate));
-
-  object_class->get_property = anerley_aggregate_tp_feed_get_property;
-  object_class->set_property = anerley_aggregate_tp_feed_set_property;
-  object_class->dispose = anerley_aggregate_tp_feed_dispose;
-  object_class->finalize = anerley_aggregate_tp_feed_finalize;
-  object_class->constructed = anerley_aggregate_tp_feed_constructed;
-
-  pspec = g_param_spec_object ("mc",
-                               "Misssion Control",
-                               "The mission control instance",
-                               MISSIONCONTROL_TYPE,
-                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (object_class, PROP_MC, pspec);
+  /* For TP feeds we don't actually want to remove the feed from aggregator
+   * because otherwise the removals get lost when the TP connection gets
+   * disconnect on MC account disablement.
+   *
+   * If the aggregator becomes cleverer and thus knows which items come from
+   * which feed then it can issue the removals and we will then remove the
+   * feed here. But for now it isn't.
+   */
 }
 
 static void
-_mc_account_monitor_account_enabled (McAccountMonitor *monitor,
-                                     gchar            *account_name,
-                                     gpointer          userdata)
+_account_manager_ready_cb (GObject      *source_object,
+                           GAsyncResult *result,
+                           gpointer      userdata)
 {
-  AnerleyAggregateTpFeed *aggregate = (AnerleyAggregateTpFeed *)userdata;
-  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (userdata);
-  McAccount *account;
-  AnerleyTpFeed *feed;
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  AnerleyAggregateTpFeed *aggregate = ANERLEY_AGGREGATE_TP_FEED (userdata);
+  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (aggregate);
+  GList *accounts, *l;
+  GError *error = NULL;
 
-  feed = g_hash_table_lookup (priv->feeds, account_name);
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to prepare account manager: %s", error->message);
+    g_error_free (error);
+    return;
+  }
 
-  if (!feed)
+  accounts = tp_account_manager_get_valid_accounts (account_manager);
+
+  for (l = accounts; l != NULL; l = l->next)
   {
-    account = mc_account_lookup (account_name);
-    feed = anerley_tp_feed_new (priv->mc, account);
-    g_object_unref (account);
+    TpAccount *account = TP_ACCOUNT (l->data);
+    AnerleyTpFeed *feed;
+    const gchar *account_name;
+
+    if (!tp_account_is_enabled (account))
+      continue;
 
+    feed = anerley_tp_feed_new (account);
+    account_name = tp_proxy_get_object_path (account);
     g_hash_table_insert (priv->feeds,
                          g_strdup (account_name),
                          feed);
 
     anerley_aggregate_feed_add_feed (ANERLEY_AGGREGATE_FEED (aggregate),
-                                     (AnerleyFeed *)feed);
+                                     ANERLEY_FEED (feed));
   }
+
+  g_list_free (accounts);
 }
 
-  static void
-_mc_account_monitor_account_disabled (McAccountMonitor *monitor,
-                                      gchar            *account_name,
-                                      gpointer          userdata)
+static void
+anerley_aggregate_tp_feed_constructed (GObject *object)
 {
-  /* For TP feeds we don't actually want to remove the feed from aggregator
-   * because otherwise the removals get lost when the TP connection gets
-   * disconnect on MC account disablement.
-   *
-   * If the aggregator becomes cleverer and thus knows which items come from
-   * which feed then it can issue the removals and we will then remove the
-   * feed here. But for now it isn't.
-   */
+  AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (object);
+
+  priv->account_manager = tp_account_manager_dup ();
+  g_signal_connect (priv->account_manager, "account-enabled",
+                    G_CALLBACK (_account_manager_account_enabled_cb), object);
+  g_signal_connect (priv->account_manager, "account-disabled",
+                    G_CALLBACK (_account_manager_account_disabled_cb), object);
+
+  tp_account_manager_prepare_async (priv->account_manager, NULL,
+                                    _account_manager_ready_cb, object);
+
+  if (G_OBJECT_CLASS (anerley_aggregate_tp_feed_parent_class)->constructed)
+    G_OBJECT_CLASS (anerley_aggregate_tp_feed_parent_class)->constructed (object);
 }
 
+static void
+anerley_aggregate_tp_feed_class_init (AnerleyAggregateTpFeedClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  g_type_class_add_private (klass, sizeof (AnerleyAggregateTpFeedPrivate));
+
+  object_class->dispose = anerley_aggregate_tp_feed_dispose;
+  object_class->finalize = anerley_aggregate_tp_feed_finalize;
+  object_class->constructed = anerley_aggregate_tp_feed_constructed;
+}
 
 static void
 anerley_aggregate_tp_feed_init (AnerleyAggregateTpFeed *self)
 {
   AnerleyAggregateTpFeedPrivate *priv = GET_PRIVATE (self);
 
-  priv->account_monitor = mc_account_monitor_new ();
-  g_signal_connect (priv->account_monitor,
-                    "account-enabled",
-                    (GCallback)_mc_account_monitor_account_enabled,
-                    self);
-  g_signal_connect (priv->account_monitor,
-                    "account-disabled",
-                    (GCallback)_mc_account_monitor_account_disabled,
-                    self);
-
   priv->feeds = g_hash_table_new_full (g_str_hash,
                                        g_str_equal,
                                        g_free,
@@ -225,12 +190,9 @@ anerley_aggregate_tp_feed_init (AnerleyAggregateTpFeed *self)
 }
 
 AnerleyFeed *
-anerley_aggregate_tp_feed_new (MissionControl *mc)
+anerley_aggregate_tp_feed_new (void)
 {
-  return g_object_new (ANERLEY_TYPE_AGGREGATE_TP_FEED,
-                       "mc",
-                       mc,
-                       NULL);
+  return g_object_new (ANERLEY_TYPE_AGGREGATE_TP_FEED, NULL);
 }
 
 
diff --git a/anerley/anerley-aggregate-tp-feed.h b/anerley/anerley-aggregate-tp-feed.h
index 37ccf09..a1b1062 100644
--- a/anerley/anerley-aggregate-tp-feed.h
+++ b/anerley/anerley-aggregate-tp-feed.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 #include <anerley/anerley-aggregate-feed.h>
-#include <libmissioncontrol/mission-control.h>
 
 G_BEGIN_DECLS
 
@@ -56,7 +55,7 @@ typedef struct {
 
 GType anerley_aggregate_tp_feed_get_type (void);
 
-AnerleyFeed *anerley_aggregate_tp_feed_new (MissionControl *mc);
+AnerleyFeed *anerley_aggregate_tp_feed_new (void);
 
 G_END_DECLS
 

commit 0823a1a6e89a55c7716c872a92000a7a14a7184f
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:09:49 2009 +0100

    tp-feed: update to use new tp-glib account helper API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/anerley/anerley-tp-feed.c b/anerley/anerley-tp-feed.c
index 70fa2d8..1935f2b 100644
--- a/anerley/anerley-tp-feed.c
+++ b/anerley/anerley-tp-feed.c
@@ -19,9 +19,11 @@
  *
  */
 
-
-#include <libmissioncontrol/mission-control.h>
+#include <telepathy-glib/account.h>
 #include <telepathy-glib/contact.h>
+#include <telepathy-glib/connection.h>
+#include <telepathy-glib/channel.h>
+#include <telepathy-glib/interfaces.h>
 
 #include "anerley-feed.h"
 #include "anerley-item.h"
@@ -41,8 +43,7 @@ G_DEFINE_TYPE_WITH_CODE (AnerleyTpFeed,
 typedef struct _AnerleyTpFeedPrivate AnerleyTpFeedPrivate;
 
 struct _AnerleyTpFeedPrivate {
-  MissionControl *mc;
-  McAccount *account;
+  TpAccount *account;
   TpConnection *conn;
   TpChannel *subscribe_channel;
 
@@ -54,7 +55,6 @@ struct _AnerleyTpFeedPrivate {
 enum
 {
   PROP_0,
-  PROP_MC,
   PROP_ACCOUNT
 };
 
@@ -65,9 +65,6 @@ anerley_tp_feed_get_property (GObject *object, guint property_id,
   AnerleyTpFeedPrivate *priv = GET_PRIVATE (object);
 
   switch (property_id) {
-    case PROP_MC:
-      g_value_set_object (value, priv->mc);
-      break;
     case PROP_ACCOUNT:
       g_value_set_object (value, priv->account);
       break;
@@ -83,9 +80,6 @@ anerley_tp_feed_set_property (GObject *object, guint property_id,
   AnerleyTpFeedPrivate *priv = GET_PRIVATE (object);
 
   switch (property_id) {
-    case PROP_MC:
-      priv->mc = g_value_dup_object (value);
-      break;
     case PROP_ACCOUNT:
       priv->account = g_value_dup_object (value);
       break;
@@ -94,6 +88,14 @@ anerley_tp_feed_set_property (GObject *object, guint property_id,
   }
 }
 
+static void _account_status_changed_cb (TpAccount                *account,
+                                        TpConnectionStatus        old_status,
+                                        TpConnectionStatus        new_status,
+                                        TpConnectionStatusReason  reason,
+                                        const gchar              *dbus_error_name,
+                                        const GHashTable         *details,
+                                        gpointer                  userdata);
+
 static void
 anerley_tp_feed_dispose (GObject *object)
 {
@@ -135,16 +137,14 @@ anerley_tp_feed_dispose (GObject *object)
 
   if (priv->account)
   {
+    g_signal_handlers_disconnect_by_func (priv->account,
+                                          _account_status_changed_cb,
+                                          object);
+
     g_object_unref (priv->account);
     priv->account = NULL;
   }
 
-  if (priv->mc)
-  {
-    g_object_unref (priv->mc);
-    priv->mc = NULL;
-  }
-
   G_OBJECT_CLASS (anerley_tp_feed_parent_class)->dispose (object);
 }
 
@@ -172,14 +172,9 @@ _make_item_from_contact (AnerleyTpFeed *feed,
                          TpContact     *contact)
 {
   AnerleyTpFeedPrivate *priv = GET_PRIVATE (feed);
-  gchar *uid;
   AnerleyTpItem *item;
 
-  uid = g_strdup_printf ("%s/%s",
-                         mc_account_get_normalized_name (priv->account),
-                         tp_contact_get_identifier (contact));
-  item = anerley_tp_item_new (priv->mc,
-                              priv->account,
+  item = anerley_tp_item_new (priv->account,
                               contact);
 
 
@@ -751,71 +746,60 @@ _tp_connection_ready_cb (TpConnection *connection,
 }
 
 static void
-_mc_account_status_changed_cb (MissionControl           *mc,
-                               TpConnectionStatus        status,
-                               McPresence                presence,
-                               TpConnectionStatusReason  reason,
-                               const gchar              *account_name,
-                               gpointer                  userdata)
+_account_status_changed_cb (TpAccount                *account,
+                            TpConnectionStatus        old_status,
+                            TpConnectionStatus        status,
+                            TpConnectionStatusReason  reason,
+                            const gchar              *dbus_error_name,
+                            const GHashTable         *details,
+                            gpointer                  userdata)
 {
-  AnerleyTpFeed *feed = (AnerleyTpFeed *)userdata;
+  AnerleyTpFeed *feed = ANERLEY_TP_FEED (userdata);
   AnerleyTpFeedPrivate *priv = GET_PRIVATE (feed);
   GList *items;
-  GError *error = NULL;
 
-  /* This is so lame. I hear this should get better with MC5 though */
-  if (g_str_equal (account_name, mc_account_get_unique_name (priv->account)))
+  g_debug (G_STRLOC ": Connection is in state: %s",
+           status==TP_CONNECTION_STATUS_CONNECTED ? "connected" :
+           status==TP_CONNECTION_STATUS_CONNECTING ? "connecting" :
+           status==TP_CONNECTION_STATUS_DISCONNECTED ? "disconnected" :
+           "other");
+
+  if (status == TP_CONNECTION_STATUS_CONNECTED)
   {
-    g_debug (G_STRLOC ": Connection is in state: %s",
-             status==TP_CONNECTION_STATUS_CONNECTED ? "connected" :
-             status==TP_CONNECTION_STATUS_CONNECTING ? "connecting" :
-             status==TP_CONNECTION_STATUS_DISCONNECTED ? "disconnected" :
-             "other");
-    if (status == TP_CONNECTION_STATUS_CONNECTED)
-    {
-      priv->conn = mission_control_get_tpconnection (priv->mc,
-                                                     priv->account,
-                                                     &error);
-      if (!priv->conn)
-      {
-        g_warning (G_STRLOC ": Error getting TP connection: %s",
-                   error->message);
-        g_clear_error (&error);
-        return;
-      }
+    priv->conn = g_object_ref (tp_account_get_connection (account));
 
-      tp_connection_call_when_ready (priv->conn,
-                                     _tp_connection_ready_cb,
-                                     feed);
-    } else if (status == TP_CONNECTION_STATUS_DISCONNECTED) {
-      /*
-       * This means our connection has been disconnected. That is :-( so lets
-       * remove these things from our internal store and emit the signals on
-       * the feed.
-       */
+    tp_connection_call_when_ready (priv->conn,
+                                   _tp_connection_ready_cb,
+                                   feed);
 
-      items = g_hash_table_get_values (priv->ids_to_items);
+  } else if (status == TP_CONNECTION_STATUS_DISCONNECTED) {
+    /*
+     * This means our connection has been disconnected. That is :-( so lets
+     * remove these things from our internal store and emit the signals on
+     * the feed.
+     */
 
-      g_signal_emit_by_name (feed, "items-removed", items);
-      g_list_free (items);
-      g_hash_table_remove_all (priv->handles_to_contacts);
-      g_hash_table_remove_all (priv->ids_to_items);
-      g_hash_table_remove_all (priv->handles_to_ids);
+    items = g_hash_table_get_values (priv->ids_to_items);
 
-      if (priv->subscribe_channel)
-      {
-        g_object_unref (priv->subscribe_channel);
-        priv->subscribe_channel = NULL;
-      }
+    g_signal_emit_by_name (feed, "items-removed", items);
+    g_list_free (items);
+    g_hash_table_remove_all (priv->handles_to_contacts);
+    g_hash_table_remove_all (priv->ids_to_items);
+    g_hash_table_remove_all (priv->handles_to_ids);
 
-      if (priv->conn)
-      {
-        g_object_unref (priv->conn);
-        priv->conn = NULL;
-      }
-    } else {
-      /* CONNECTING */
+    if (priv->subscribe_channel)
+    {
+      g_object_unref (priv->subscribe_channel);
+      priv->subscribe_channel = NULL;
+    }
+
+    if (priv->conn)
+    {
+      g_object_unref (priv->conn);
+      priv->conn = NULL;
     }
+  } else {
+    /* CONNECTING */
   }
 }
 
@@ -824,33 +808,11 @@ anerley_tp_feed_setup_tp_connection (AnerleyTpFeed *feed)
 {
   AnerleyTpFeedPrivate *priv = GET_PRIVATE (feed);
   guint res;
-  GError *error = NULL;
 
-  /* So. Deep breath. It may be that MC is not actually running. So what we
-   * can do here is setup a signal on the proxy. Note that this proxy might
-   * not be pointing to a valid remote object yet. However once it is then we
-   * will get this signal and we can actually connect and stuff */
-  dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
-                               "AccountStatusChanged",
-                               G_CALLBACK (_mc_account_status_changed_cb),
-                               feed,
-                               NULL);
-
-  /* This may fail if MC is not running. If it does, boohoo. But the above
-   * signal handler hook up will come alive when we do go online
-   */
-  res = mission_control_get_connection_status (priv->mc,
-                                               priv->account,
-                                               &error);
+  g_signal_connect (priv->account, "status-changed",
+                    G_CALLBACK (_account_status_changed_cb), feed);
 
-  if (error)
-  {
-    g_warning (G_STRLOC ": Error requesting connection status: %s. "
-               "This may just be because MC is not running",
-               error->message);
-    g_clear_error (&error);
-    return;
-  }
+  res = tp_account_get_connection_status (priv->account, NULL);
 
   g_debug (G_STRLOC ": Connection is in state: %s",
            res==TP_CONNECTION_STATUS_CONNECTED ? "connected" :
@@ -858,31 +820,15 @@ anerley_tp_feed_setup_tp_connection (AnerleyTpFeed *feed)
            res==TP_CONNECTION_STATUS_DISCONNECTED ? "disconnected" :
            "other");
 
+
   if (res != TP_CONNECTION_STATUS_CONNECTED)
     return;
 
-  /* 
-   * Since we've established that the connection is either connected or
-   * connecting then there will a connection available for us to grab
-   */
-  priv->conn = mission_control_get_tpconnection (priv->mc,
-                                                 priv->account,
-                                                 &error);
-  if (!priv->conn)
-  {
-    g_warning (G_STRLOC ": Error getting TP connection: %s",
-               error->message);
-    g_clear_error (&error);
-    return;
-  }
 
-  /* 
-   * The connection may or may not be ready, let's get ourselves called when
-   * it is.
-   */
-  tp_connection_call_when_ready (priv->conn,
-                                 _tp_connection_ready_cb,
-                                 feed);
+  _account_status_changed_cb (priv->account,
+                              0, TP_CONNECTION_STATUS_CONNECTED,
+                              TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED,
+                              NULL, NULL, feed);
 }
 
 static void
@@ -910,17 +856,10 @@ anerley_tp_feed_class_init (AnerleyTpFeedClass *klass)
   object_class->finalize = anerley_tp_feed_finalize;
   object_class->constructed = anerley_tp_feed_constructed;
 
-  pspec = g_param_spec_object ("mc",
-                               "mission control",
-                               "The mission control object",
-                               MISSIONCONTROL_TYPE,
-                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (object_class, PROP_MC, pspec);
-
   pspec = g_param_spec_object ("account",
                                "account",
-                               "The mission control account to use",
-                               MC_TYPE_ACCOUNT,
+                               "The Telepathy account to use",
+                               TP_TYPE_ACCOUNT,
                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (object_class, PROP_ACCOUNT, pspec);
 }
@@ -956,12 +895,9 @@ anerley_tp_feed_init (AnerleyTpFeed *self)
 }
 
 AnerleyTpFeed *
-anerley_tp_feed_new (MissionControl *mc,
-                     McAccount      *account)
+anerley_tp_feed_new (TpAccount *account)
 {
   return g_object_new (ANERLEY_TYPE_TP_FEED, 
-                       "mc",
-                       mc,
                        "account",
                        account,
                        NULL);
diff --git a/anerley/anerley-tp-feed.h b/anerley/anerley-tp-feed.h
index 59d6236..0dfe7c4 100644
--- a/anerley/anerley-tp-feed.h
+++ b/anerley/anerley-tp-feed.h
@@ -23,8 +23,9 @@
 #ifndef _ANERLEY_TP_FEED
 #define _ANERLEY_TP_FEED
 
+#include <telepathy-glib/account.h>
+
 #include <glib-object.h>
-#include <libmissioncontrol/mission-control.h>
 
 G_BEGIN_DECLS
 
@@ -55,8 +56,7 @@ typedef struct {
 
 GType anerley_tp_feed_get_type (void);
 
-AnerleyTpFeed *anerley_tp_feed_new (MissionControl *mc,
-                                    McAccount      *account);
+AnerleyTpFeed *anerley_tp_feed_new (TpAccount *account);
 
 G_END_DECLS
 

commit 03be2d335bf4bff7452cdfee8c04768104366728
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:09:20 2009 +0100

    tp-item: update to new tp-glib account helper API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/anerley/anerley-tp-item.c b/anerley/anerley-tp-item.c
index 9530497..2f8edc8 100644
--- a/anerley/anerley-tp-item.c
+++ b/anerley/anerley-tp-item.c
@@ -19,8 +19,10 @@
  *
  */
 
+#include <telepathy-glib/channel-dispatcher.h>
+#include <telepathy-glib/channel-request.h>
+#include <telepathy-glib/interfaces.h>
 
-#include <libmissioncontrol/mission-control.h>
 #include "anerley-tp-item.h"
 
 G_DEFINE_TYPE (AnerleyTpItem, anerley_tp_item, ANERLEY_TYPE_ITEM)
@@ -32,10 +34,12 @@ G_DEFINE_TYPE (AnerleyTpItem, anerley_tp_item, ANERLEY_TYPE_ITEM)
     ((AnerleyTpItem *)o)->priv
 
 struct _AnerleyTpItemPrivate {
-  MissionControl *mc;
-  McAccount *account;
+  TpAccount *account;
   TpContact *contact;
 
+  GSList *channel_requests;
+  GSList *signal_connections;
+
   gchar *display_name;
   gchar *avatar_path;
   gchar *presence_status;
@@ -50,7 +54,6 @@ enum
   PROP_0,
   PROP_CONTACT,
   PROP_ACCOUNT,
-  PROP_MC
 };
 
 static void anerley_tp_item_update_contact (AnerleyTpItem *item,
@@ -69,9 +72,6 @@ anerley_tp_item_get_property (GObject *object, guint property_id,
     case PROP_ACCOUNT:
       g_value_set_object (value, priv->account);
       break;
-    case PROP_MC:
-      g_value_set_object (value, priv->mc);
-      break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
   }
@@ -91,9 +91,6 @@ anerley_tp_item_set_property (GObject *object, guint property_id,
     case PROP_ACCOUNT:
       priv->account = g_value_dup_object (value);
       break;
-    case PROP_MC:
-      priv->mc = g_value_dup_object (value);
-      break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
   }
@@ -113,10 +110,19 @@ anerley_tp_item_dispose (GObject *object)
     priv->account = NULL;
   }
 
-  if (priv->mc)
+  if (priv->channel_requests != NULL)
+  {
+    g_slist_foreach (priv->channel_requests, (GFunc) g_object_unref, NULL);
+    g_slist_free (priv->channel_requests);
+    priv->channel_requests = NULL;
+  }
+
+  if (priv->signal_connections != NULL)
   {
-    g_object_unref (priv->mc);
-    priv->mc = NULL;
+    g_slist_foreach (priv->signal_connections,
+                     (GFunc) tp_proxy_signal_connection_disconnect, NULL);
+    g_slist_free (priv->signal_connections);
+    priv->signal_connections = NULL;
   }
 
   G_OBJECT_CLASS (anerley_tp_item_parent_class)->dispose (object);
@@ -169,17 +175,123 @@ anerley_tp_item_get_presence_message (AnerleyItem *item)
 }
 
 static void
+_item_activate_proceed_cb (TpChannelRequest *proxy,
+                           const GError     *error,
+                           gpointer          userdata,
+                           GObject          *weak_object)
+{
+  if (error != NULL)
+    g_warning ("Failed to call Proceed on the channel request: %s",
+               error->message);
+}
+
+static void
+_item_activate_failed_cb (TpChannelRequest *proxy,
+                          const gchar      *arg_Error,
+                          const gchar      *arg_Message,
+                          gpointer          userdata,
+                          GObject          *weak_object)
+{
+  if (arg_Error != NULL)
+  {
+    g_warning ("Channel request failed: %s: %s", arg_Error, arg_Message);
+    return;
+  }
+}
+
+static void
+_item_activate_succeeded_cb (TpChannelRequest *proxy,
+                             gpointer          userdata,
+                             GObject          *weak_object)
+{
+  g_debug ("Channel request succeeded\n");
+}
+
+static void
+_item_activate_ensure_channel_cb (TpChannelDispatcher *proxy,
+                                  const gchar         *out_Request,
+                                  const GError        *error,
+                                  gpointer             userdata,
+                                  GObject             *weak_object)
+{
+  TpChannelRequest *request;
+  TpDBusDaemon *dbus;
+  AnerleyTpItemPrivate *priv = GET_PRIVATE (weak_object);
+  TpProxySignalConnection *signal;
+
+  if (error != NULL)
+  {
+    g_warning ("Failed to CreateChannel: %s", error->message);
+    return;
+  }
+
+  dbus = tp_dbus_daemon_dup (NULL);
+
+  request = tp_channel_request_new (dbus, out_Request, NULL, NULL);
+
+  /* Connect to Succeeded and add it to the list */
+  signal = tp_cli_channel_request_connect_to_succeeded (request, _item_activate_succeeded_cb,
+                                                        NULL, NULL, weak_object, NULL);
+
+  priv->signal_connections = g_slist_append (priv->signal_connections, signal);
+
+  /* Connect to Failed and add it to the list */
+  signal = tp_cli_channel_request_connect_to_failed (request, _item_activate_failed_cb,
+                                                     NULL, NULL, weak_object, NULL);
+
+  priv->signal_connections = g_slist_append (priv->signal_connections, signal);
+
+  /* Call Proceed and add the request to the list */
+  tp_cli_channel_request_call_proceed (request, -1, _item_activate_proceed_cb,
+                                       NULL, NULL, weak_object);
+
+  priv->channel_requests = g_slist_append (priv->channel_requests, request);
+
+  g_object_unref (dbus);
+}
+
+static void
 anerley_tp_item_activate (AnerleyItem *item)
 {
   AnerleyTpItemPrivate *priv = GET_PRIVATE (item);
-
-  mission_control_request_channel (priv->mc,
-                                   priv->account,
-                                   TP_IFACE_CHANNEL_TYPE_TEXT,
-                                   tp_contact_get_handle (priv->contact),
-                                   TP_HANDLE_TYPE_CONTACT,
-                                   NULL,
-                                   NULL);
+  TpChannelDispatcher *dispatcher;
+  TpDBusDaemon *dbus;
+  GTimeVal t;
+  GHashTable *properties;
+
+  dbus = tp_dbus_daemon_dup (NULL);
+  dispatcher = tp_channel_dispatcher_new (dbus);
+
+  g_get_current_time (&t);
+
+  properties = tp_asv_new (TP_IFACE_CHANNEL ".ChannelType",
+                           G_TYPE_STRING,
+                           TP_IFACE_CHANNEL_TYPE_TEXT,
+
+                           TP_IFACE_CHANNEL ".TargetHandleType",
+                           G_TYPE_UINT,
+                           TP_HANDLE_TYPE_CONTACT,
+
+                           TP_IFACE_CHANNEL ".TargetHandle",
+                           G_TYPE_UINT,
+                           tp_contact_get_handle (priv->contact),
+
+                           NULL);
+
+  tp_cli_channel_dispatcher_call_ensure_channel (dispatcher,
+                                                 -1,
+                                                 tp_proxy_get_object_path (priv->account),
+                                                 properties,
+                                                 t.tv_sec,
+                                                 "",
+                                                 _item_activate_ensure_channel_cb,
+                                                 NULL,
+                                                 NULL,
+                                                 item);
+
+  g_hash_table_destroy (properties);
+  g_object_unref (dispatcher);
+  g_object_unref (dbus);
 }
 
 static const gchar *
@@ -221,17 +333,10 @@ anerley_tp_item_class_init (AnerleyTpItemClass *klass)
   item_class->get_last_name = anerley_tp_item_get_last_name;
   item_class->activate = anerley_tp_item_activate;
 
-  pspec = g_param_spec_object ("mc",
-                               "Mission control",
-                               "The mission control instance",
-                               MISSIONCONTROL_TYPE,
-                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (object_class, PROP_MC, pspec);
-
   pspec = g_param_spec_object ("account",
                                "The account",
                                "The mission control account",
-                               MC_TYPE_ACCOUNT,
+                               TP_TYPE_ACCOUNT,
                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (object_class, PROP_ACCOUNT, pspec);
 
@@ -248,16 +353,16 @@ anerley_tp_item_init (AnerleyTpItem *self)
 {
   AnerleyTpItemPrivate *priv = GET_PRIVATE_REAL (self);
   self->priv = priv;
+
+  priv->channel_requests = NULL;
+  priv->signal_connections = NULL;
 }
 
 AnerleyTpItem *
-anerley_tp_item_new (MissionControl *mc,
-                     McAccount      *account,
-                     TpContact      *contact)
+anerley_tp_item_new (TpAccount *account,
+                     TpContact *contact)
 {
   return g_object_new (ANERLEY_TYPE_TP_ITEM,
-                       "mc",
-                       mc,
                        "account",
                        account,
                        "contact",
diff --git a/anerley/anerley-tp-item.h b/anerley/anerley-tp-item.h
index 7f99a17..6cf4f21 100644
--- a/anerley/anerley-tp-item.h
+++ b/anerley/anerley-tp-item.h
@@ -25,6 +25,7 @@
 
 #include <glib-object.h>
 #include <anerley/anerley-item.h>
+#include <telepathy-glib/account.h>
 #include <telepathy-glib/contact.h>
 
 G_BEGIN_DECLS
@@ -59,8 +60,7 @@ typedef struct {
 
 GType anerley_tp_item_get_type (void);
 
-AnerleyTpItem *anerley_tp_item_new (MissionControl *mc,
-                                    McAccount      *account,
+AnerleyTpItem *anerley_tp_item_new (TpAccount      *account,
                                     TpContact      *contact);
 void anerley_tp_item_set_avatar_path (AnerleyTpItem *item,
                                       const gchar   *avatar_path);


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- anerley.spec	19 Sep 2009 13:48:27 -0000	1.5
+++ anerley.spec	28 Sep 2009 21:20:57 -0000	1.6
@@ -1,6 +1,8 @@
+%define _default_patch_fuzz 2
+
 Name:           anerley
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -9,6 +11,12 @@ URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Created with:
+# git show -p f76297e57d4368ef4e289716e03cd8e256532fad
+# git show -p 3aa84f86a5c0d33d3dc3199b3891ac6a30c8fae0~9..
+# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/anerley.git
+Patch0:        anerley-mc5-port.patch
+
 BuildRequires: evolution-data-server-devel
 BuildRequires: glib2-devel
 BuildRequires: nbtk-devel
@@ -35,6 +43,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .mc5
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -72,6 +81,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.1.1-2
+- Add patch to port to Mission Control 5
+
 * Sat Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-1
 - New upstream 0.1.1 release
 



From hadess at fedoraproject.org  Mon Sep 28 21:34:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 21:34:31 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel mps-mc5-port.patch, NONE,
	1.1 moblin-panel-status.spec, 1.3, 1.4
Message-ID: <20090928213431.4657E11C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1436

Modified Files:
	moblin-panel-status.spec 
Added Files:
	mps-mc5-port.patch 
Log Message:
* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.5-2
- Add patch for new Mission Control support


mps-mc5-port.patch:
 b/configure.ac                |    2 
 b/src/mnb-im-status-row.c     |  150 ++++++++++++++--------
 b/src/mnb-status-marshal.list |    2 
 b/src/moblin-panel-status.c   |  285 ++++++++++++++++++------------------------
 configure.ac                  |    3 
 5 files changed, 228 insertions(+), 214 deletions(-)

--- NEW FILE mps-mc5-port.patch ---
commit 419ffd4e56794e2b5ab068586d55419b7a808356
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Sep 28 15:35:49 2009 +0100

    configure.ac: add a versioned depends on telepathy-glib
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index 555a04b..4bd087b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ PKG_CHECK_MODULES([STATUS],
                    clutter-x11-1.0 >= 1.0.0     dnl
                    clutter-gtk-0.10
                    mojito-client >= 0.20.1      dnl
-                   telepathy-glib
+                   telepathy-glib >= 0.9.0
                    nbtk-1.2])
 
 AC_ARG_ENABLE([cache],

commit 937414d951216d1bb5399ef33d9777f66c09869a
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:03:59 2009 +0100

    moblin-panel-status: update to use new tp-glib account helper API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/src/moblin-panel-status.c b/src/moblin-panel-status.c
index 84f2b17..950179c 100644
--- a/src/moblin-panel-status.c
+++ b/src/moblin-panel-status.c
@@ -37,10 +37,9 @@
 
 #include <mojito-client/mojito-client.h>
 
+#include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/util.h>
-#include <libmissioncontrol/mission-control.h>
-#include <libmissioncontrol/mc-account-monitor.h>
 
 #include <moblin-panel/mpl-panel-clutter.h>
 #include <moblin-panel/mpl-panel-common.h>
@@ -61,9 +60,7 @@ typedef struct _MoblinStatusPanel
   ClutterActor *header_label;
 
   MojitoClient *mojito_client;
-
-  MissionControl *mc;
-  McAccountMonitor *account_monitor;
+  TpAccountManager *account_manager;
 
   GSList *services;
   GSList *accounts;
@@ -100,7 +97,7 @@ typedef struct _AccountInfo
 
   MoblinStatusPanel *panel;
 
-  McAccount *account;
+  TpAccount *account;
   ClutterActor *row;
   ClutterActor *box;
 
@@ -155,14 +152,13 @@ account_find_by_name (MoblinStatusPanel *panel,
 }
 
 static void
-on_row_status_changed (MnbIMStatusRow *row,
-                       gint            presence,
-                       const gchar    *status,
-                       AccountInfo    *a_info)
+on_row_status_changed (MnbIMStatusRow           *row,
+                       TpConnectionPresenceType  presence,
+                       const gchar              *status,
+                       AccountInfo              *a_info)
 {
-  MissionControl *mc = a_info->panel->mc;
-
-  mission_control_set_presence (mc, presence, status, NULL, NULL);
+  tp_account_manager_set_all_requested_presences (a_info->panel->account_manager,
+                                                  presence, status, NULL);
 }
 
 static void
@@ -180,10 +176,11 @@ add_account_row (MoblinStatusPanel *panel,
 }
 
 static void
-on_mc_presence_changed (MissionControl           *mc,
-                        TpConnectionPresenceType  state,
-                        gchar                    *status,
-                        MoblinStatusPanel        *panel)
+on_presence_changed (TpAccountManager         *account_manager,
+                     TpConnectionPresenceType  state,
+                     const gchar              *status,
+                     const gchar              *status_message,
+                     MoblinStatusPanel        *panel)
 {
   const gchar *state_str = NULL;
   GSList *a;
@@ -226,8 +223,8 @@ on_mc_presence_changed (MissionControl           *mc,
     }
 
   g_free (panel->im_status);
-  panel->im_status = ((status != NULL && *status != '\0') ? g_strdup (status)
-                                                          : NULL);
+  panel->im_status = ((status_message != NULL && *status_message != '\0') ? g_strdup (status_message)
+                                                                          : NULL);
 
   g_debug ("%s: PresenceChanged ['%s'[%d], '%s']",
            G_STRLOC,
@@ -474,82 +471,42 @@ update_header (NbtkLabel *header,
 }
 
 static void
-update_mc (MoblinStatusPanel *panel,
-           gboolean           is_online)
+update_im_status (MoblinStatusPanel *panel,
+                  gboolean           is_online)
 {
-  McPresence cur_state, mc_state = MC_PRESENCE_UNSET;
-  const gchar *mc_status = NULL;
+  TpConnectionPresenceType cur_state, actual_state = TP_CONNECTION_PRESENCE_TYPE_UNSET;
+  gchar *actual_status = NULL;
   const gchar *state_str = NULL;
   GError *error = NULL;
 
-  switch (panel->im_presence)
+  cur_state = panel->im_presence;
+
+  actual_state = tp_account_manager_get_most_available_presence (panel->account_manager,
+                                                                 NULL, &actual_status);
+
+  switch (cur_state)
     {
     case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
-      cur_state = MC_PRESENCE_OFFLINE;
+      state_str = _("Offline");
       break;
 
     case TP_CONNECTION_PRESENCE_TYPE_AVAILABLE:
-      cur_state = MC_PRESENCE_AVAILABLE;
-      break;
-
-    case TP_CONNECTION_PRESENCE_TYPE_AWAY:
-      cur_state = MC_PRESENCE_AWAY;
-      break;
-
-    case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
-      cur_state = MC_PRESENCE_EXTENDED_AWAY;
-      break;
-
-    case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
-      cur_state = MC_PRESENCE_HIDDEN;
-      break;
-
-    case TP_CONNECTION_PRESENCE_TYPE_BUSY:
-      cur_state = MC_PRESENCE_DO_NOT_DISTURB;
-      break;
-
-    default:
-      cur_state = MC_PRESENCE_UNSET;
-      break;
-    }
-
-  mc_state = mission_control_get_presence_actual (panel->mc, &error);
-  if (error)
-    {
-      g_warning ("Unable to get the actual presence: %s", error->message);
-      g_clear_error (&error);
-
-      mc_state = MC_PRESENCE_UNSET;
-    }
-
-  mc_status = mission_control_get_presence_message_actual (panel->mc, &error);
-  if (error)
-    {
-      g_warning ("Unable to get the actual status: %s", error->message);
-      g_clear_error (&error);
-
-      mc_status = NULL;
-    }
-
-  switch (cur_state)
-    {
-    case MC_PRESENCE_AVAILABLE:
       state_str = _("Available");
       break;
 
-    case MC_PRESENCE_AWAY:
+    case TP_CONNECTION_PRESENCE_TYPE_AWAY:
       state_str = _("Away");
       break;
 
-    case MC_PRESENCE_EXTENDED_AWAY:
+    case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
       state_str = _("Away");
       break;
 
-    case MC_PRESENCE_HIDDEN:
+    case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
       state_str = _("Busy");
       break;
 
-    case MC_PRESENCE_DO_NOT_DISTURB:
+    case TP_CONNECTION_PRESENCE_TYPE_BUSY:
       state_str = _("Busy");
       break;
 
@@ -564,35 +521,39 @@ update_mc (MoblinStatusPanel *panel,
   g_debug ("%s: cur_state [%d], mc_state [%d]",
            G_STRLOC,
            cur_state,
-           mc_state);
+           actual_state);
 
-  if (cur_state == MC_PRESENCE_UNSET || cur_state == mc_state)
+  if (cur_state == TP_CONNECTION_PRESENCE_TYPE_UNSET || cur_state == actual_state)
     {
-      on_mc_presence_changed (panel->mc,
-                              panel->im_presence,
-                              (gchar *) state_str,
-                              panel);
+      on_presence_changed (panel->account_manager,
+                           panel->im_presence,
+                           state_str, NULL,
+                           panel);
     }
-  else if (cur_state != mc_state && cur_state == MC_PRESENCE_AVAILABLE)
+  else if (cur_state != actual_state && cur_state == TP_CONNECTION_PRESENCE_TYPE_AVAILABLE)
     {
-      mission_control_set_presence (panel->mc, cur_state, state_str,
-                                    NULL,
-                                    NULL);
+      tp_account_manager_set_all_requested_presences (panel->account_manager,
+                                                      cur_state, NULL, state_str);
     }
   else
     {
-      mission_control_set_presence (panel->mc, mc_state, mc_status,
-                                    NULL,
-                                    NULL);
+      tp_account_manager_set_all_requested_presences (panel->account_manager,
+                                                      actual_state,
+                                                      NULL, actual_status);
     }
+
+  g_free (actual_status);
 }
 
 static void
-on_mc_account_enabled (McAccountMonitor  *monitor,
-                       gchar             *name,
-                       MoblinStatusPanel *panel)
+on_account_enabled (TpAccountManager  *account_manager,
+                    TpAccount         *account,
+                    MoblinStatusPanel *panel)
 {
   AccountInfo *a_info;
+  const gchar *name;
+
+  name = tp_proxy_get_object_path (account);
 
   a_info = account_find_by_name (panel, name);
   if (a_info == NULL)
@@ -600,7 +561,7 @@ on_mc_account_enabled (McAccountMonitor  *monitor,
       a_info = g_slice_new (AccountInfo);
       a_info->name = g_strdup (name);
       a_info->panel = panel;
-      a_info->account = mc_account_lookup (name);
+      a_info->account = g_object_ref (account);
       a_info->row = NULL;
       a_info->box = panel->box;
       a_info->is_visible = FALSE;
@@ -617,15 +578,18 @@ on_mc_account_enabled (McAccountMonitor  *monitor,
 
   clutter_actor_hide (panel->empty_im_bin);
 
-  update_mc (panel, panel->is_online);
+  update_im_status (panel, panel->is_online);
 }
 
 static void
-on_mc_account_disabled (McAccountMonitor  *monitor,
-                        gchar             *name,
-                        MoblinStatusPanel *panel)
+on_account_disabled (TpAccountManager  *account_manager,
+                     TpAccount         *account,
+                     MoblinStatusPanel *panel)
 {
   AccountInfo *a_info;
+  const gchar *name;
+
+  name = tp_proxy_get_object_path (account);
 
   a_info = account_find_by_name (panel, name);
   if (a_info == NULL)
@@ -638,22 +602,7 @@ on_mc_account_disabled (McAccountMonitor  *monitor,
   if (panel->n_im_available == 0)
     clutter_actor_show (panel->empty_im_bin);
 
-  update_mc (panel, panel->is_online);
-}
-
-static void
-on_mc_account_changed (McAccountMonitor  *monitor,
-                       gchar             *name,
-                       MoblinStatusPanel *panel)
-{
-  AccountInfo *a_info;
-
-  a_info = account_find_by_name (panel, name);
-  if (a_info == NULL)
-    return;
-
-  if (a_info->row)
-    mnb_im_status_row_update (MNB_IM_STATUS_ROW (a_info->row));
+  update_im_status (panel, panel->is_online);
 }
 
 static void
@@ -668,25 +617,18 @@ on_mojito_online_changed (MojitoClient      *client,
 
   panel->is_online = is_online;
 
-  /* if we are online but MC reports an unset presence then we
-   * should assume we are offline
-   */
-  if (panel->is_online &&
-      panel->im_presence == TP_CONNECTION_PRESENCE_TYPE_UNSET)
-    {
-      panel->im_presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
-      panel->im_status = NULL;
-    }
-
   cur_accounts = NULL;
-  accounts = mc_accounts_list_by_enabled (TRUE);
+  accounts = tp_account_manager_get_valid_accounts (panel->account_manager);
   for (l = accounts; l != NULL; l = l->next)
     {
-      McAccount *account = l->data;
+      TpAccount *account = l->data;
       AccountInfo *a_info;
       const gchar *name;
 
-      name = mc_account_get_unique_name (account);
+      if (!tp_account_is_enabled (account))
+        continue;
+
+      name = tp_proxy_get_object_path (account);
       if (account_find_by_name (panel, name) != NULL)
         continue;
 
@@ -704,7 +646,7 @@ on_mojito_online_changed (MojitoClient      *client,
       cur_accounts = g_slist_prepend (cur_accounts, a_info);
     }
 
-  mc_accounts_list_free (accounts);
+  g_list_free (accounts);
 
   if (panel->accounts == NULL)
     panel->accounts = g_slist_reverse (cur_accounts);
@@ -726,37 +668,55 @@ on_mojito_online_changed (MojitoClient      *client,
     }
 
   update_header (NBTK_LABEL (panel->header_label), is_online);
-  update_mc (panel, is_online);
+
+  update_im_status (panel, is_online);
+
 }
 
 static void
-on_mojito_is_online (MojitoClient *client,
-                     gboolean      is_online,
-                     gpointer      data)
+on_account_manager_ready (GObject      *source_object,
+                          GAsyncResult *result,
+                          gpointer      userdata)
 {
-  MoblinStatusPanel *panel = data;
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
   GList *accounts, *l;
   GSList *cur_accounts, *a;
+  MoblinStatusPanel *panel = userdata;
+  GError *error = NULL;
 
-  g_debug ("%s: We are now %s", G_STRLOC, is_online ? "online" : "offline");
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to prepare account manager: %s", error->message);
+    g_error_free (error);
+    return;
+  }
 
-  panel->is_online = is_online;
+  g_debug ("%s: Account manager is ready\n", G_STRLOC);
+
+  /* Get initial presence */
+  g_free (panel->im_status);
+  panel->im_presence = tp_account_manager_get_most_available_presence (account_manager, NULL,
+                                                                       &(panel->im_status));
 
   if (panel->is_online)
     {
       panel->im_presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
+      g_free (panel->im_status);
       panel->im_status = NULL;
     }
 
   cur_accounts = NULL;
-  accounts = mc_accounts_list_by_enabled (TRUE);
+  accounts = tp_account_manager_get_valid_accounts (panel->account_manager);
   for (l = accounts; l != NULL; l = l->next)
     {
-      McAccount *account = l->data;
+      TpAccount *account = l->data;
       AccountInfo *a_info;
       const gchar *name;
 
-      name = mc_account_get_unique_name (account);
+      if (!tp_account_is_enabled (account))
+        continue;
+
+      name = tp_proxy_get_object_path (account);
       if (account_find_by_name (panel, name) != NULL)
         continue;
 
@@ -774,7 +734,7 @@ on_mojito_is_online (MojitoClient *client,
       cur_accounts = g_slist_prepend (cur_accounts, a_info);
     }
 
-  mc_accounts_list_free (accounts);
+  g_list_free (accounts);
 
   if (panel->accounts == NULL)
     panel->accounts = g_slist_reverse (cur_accounts);
@@ -795,13 +755,29 @@ on_mojito_is_online (MojitoClient *client,
                                     panel->is_online);
     }
 
-  update_header (NBTK_LABEL (panel->header_label), is_online);
-  update_mc (panel, is_online);
+  update_header (NBTK_LABEL (panel->header_label), panel->is_online);
+  update_im_status (panel, panel->is_online);
 
   /* get notification when the online state changes */
   g_signal_connect (panel->mojito_client, "online-changed",
                     G_CALLBACK (on_mojito_online_changed),
                     panel);
+
+}
+
+static void
+on_mojito_is_online (MojitoClient *client,
+                     gboolean      is_online,
+                     gpointer      data)
+{
+  MoblinStatusPanel *panel = data;
+
+  g_debug ("%s: We are now %s", G_STRLOC, is_online ? "online" : "offline");
+
+  panel->is_online = is_online;
+
+  tp_account_manager_prepare_async (panel->account_manager, NULL,
+                                    on_account_manager_ready, panel);
 }
 
 #if 0
@@ -1044,32 +1020,24 @@ make_status (MoblinStatusPanel *panel)
   nbtk_box_layout_set_vertical (NBTK_BOX_LAYOUT (panel->box), TRUE);
   clutter_container_add_actor (CLUTTER_CONTAINER (scroll), panel->box);
 
-  /* mission control: instant messaging
-   *
-   * we need MC first because the online/offline notification is
-   * managed through Mojito; XXX yes, this is dumb - Moblin needs
+  /*
+   * we need an account manager first because the online/offline notification
+   * is managed through Mojito; XXX yes, this is dumb - Moblin needs
    * a "shell" library that notifies when we're online or offline
    */
-  panel->mc = mission_control_new (tp_get_bus ());
+  panel->account_manager = tp_account_manager_dup ();
   panel->im_presence = TP_CONNECTION_PRESENCE_TYPE_UNSET;
   panel->im_status = NULL;
 
-  panel->account_monitor = mc_account_monitor_new ();
-  g_signal_connect (panel->account_monitor,
-                    "account-enabled", G_CALLBACK (on_mc_account_enabled),
-                    panel);
-  g_signal_connect (panel->account_monitor,
-                    "account-changed", G_CALLBACK (on_mc_account_changed),
+  g_signal_connect (panel->account_manager,
+                    "account-enabled", G_CALLBACK (on_account_enabled),
                     panel);
-  g_signal_connect (panel->account_monitor,
-                    "account-disabled", G_CALLBACK (on_mc_account_disabled),
+  g_signal_connect (panel->account_manager,
+                    "account-disabled", G_CALLBACK (on_account_disabled),
                     panel);
-
-  /* update the status when the presence changes */
-  dbus_g_proxy_connect_signal (DBUS_G_PROXY (panel->mc),
-                               "PresenceChanged",
-                               G_CALLBACK (on_mc_presence_changed),
-                               panel, NULL);
+  g_signal_connect (panel->account_manager,
+                    "most-available-presence-changed",
+                    G_CALLBACK (on_presence_changed), panel);
 
   /* mojito: web services */
   panel->mojito_client = mojito_client_new ();
@@ -1211,8 +1179,7 @@ main (int argc, char *argv[])
   g_slist_foreach (panel->services, (GFunc) service_info_destroy, NULL);
   g_slist_free (panel->services);
 
-  g_object_unref (panel->account_monitor);
-  g_object_unref (panel->mc);
+  g_object_unref (panel->account_manager);
   g_object_unref (panel->mojito_client);
   g_free (panel->im_status);
   g_free (panel);

commit 422dd0ab585fed35760751079293f985ac602b7a
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:00:46 2009 +0100

    mnb-im-status-row: update to use new telepathy-glib account helper API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/src/mnb-im-status-row.c b/src/mnb-im-status-row.c
index 0cdffd2..6ebd5cd 100644
--- a/src/mnb-im-status-row.c
+++ b/src/mnb-im-status-row.c
@@ -25,9 +25,14 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
-#include "penge-magic-texture.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include <clutter-gtk/clutter-gtk.h>
 
-#include <libmissioncontrol/mission-control.h>
+#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/enums.h>
+
+#include "penge-magic-texture.h"
 
 #include "mnb-im-status-row.h"
 #include "mnb-status-marshal.h"
@@ -65,7 +70,7 @@ struct _MnbIMStatusRowPrivate
   guint is_online   : 1;
   guint is_expanded : 1;
 
-  McAccount *account;
+  TpAccount *account;
 
   TpConnectionPresenceType presence;
   gchar *status;
@@ -588,18 +593,82 @@ mnb_im_status_row_get_property (GObject    *gobject,
 }
 
 static void
-mnb_im_status_row_constructed (GObject *gobject)
+_account_got_avatar_cb (GObject      *source_object,
+                        GAsyncResult *result,
+                        gpointer      userdata)
 {
-  MnbIMStatusRow *row = MNB_IM_STATUS_ROW (gobject);
+  TpAccount *account = TP_ACCOUNT (source_object);
+  MnbIMStatusRow *row = MNB_IM_STATUS_ROW (userdata);
+  MnbIMStatusRowPrivate *priv = row->priv;
+  const GArray *avatar;
+  GError *error = NULL;
+  GdkPixbufLoader *loader = NULL;
+  gboolean avatar_set = FALSE;
+
+  avatar = tp_account_get_avatar_finish (account, result, &error);
+
+  if (avatar != NULL && avatar->len > 0)
+    {
+      GdkPixbuf *pixbuf;
+
+      loader = gdk_pixbuf_loader_new ();
+      if (!gdk_pixbuf_loader_write (loader, avatar->data, avatar->len, &error))
+        goto error;
+
+      if (!gdk_pixbuf_loader_close (loader, &error))
+        goto error;
+
+      pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+
+      if (!gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (priv->user_icon),
+                                                pixbuf, &error))
+        goto error;
+
+      avatar_set = TRUE;
+    }
+
+error:
+  if (error)
+    {
+      g_warning ("Unable to load avatar image: %s", error->message);
+      g_error_free (error);
+    }
+
+  if (!avatar_set)
+    {
+      clutter_texture_set_load_async (CLUTTER_TEXTURE (priv->user_icon), FALSE);
+      clutter_texture_set_from_file (CLUTTER_TEXTURE (priv->user_icon),
+                                     priv->no_icon_file,
+                                     NULL);
+    }
+
+  if (loader != NULL)
+    g_object_unref (loader);
+}
+
+static void
+_account_manager_ready_cb (GObject      *source_object,
+                           GAsyncResult *result,
+                           gpointer      userdata)
+{
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  MnbIMStatusRow *row = userdata;
   MnbIMStatusRowPrivate *priv = row->priv;
   gchar *name;
+  GError *error = NULL;
 
-  g_assert (priv->account_name != NULL);
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  {
+    g_warning ("Failed to prepare account manager: %s", error->message);
+    g_error_free (error);
+    return;
+  }
 
-  priv->account = mc_account_lookup (priv->account_name);
+  priv->account = tp_account_manager_ensure_account (account_manager,
+                                                     priv->account_name);
 
   if (priv->display_name == NULL)
-    priv->display_name = g_strdup (mc_account_get_display_name (priv->account));
+    priv->display_name = g_strdup (tp_account_get_display_name (priv->account));
 
   priv->is_online = FALSE;
 
@@ -607,27 +676,24 @@ mnb_im_status_row_constructed (GObject *gobject)
   nbtk_label_set_text (NBTK_LABEL (priv->account_label), name);
   g_free (name);
 
-  if (mc_account_get_avatar (priv->account, &name, NULL, NULL))
-    {
-      GError *error = NULL;
+  tp_account_get_avatar_async (priv->account, _account_got_avatar_cb, row);
 
-      clutter_texture_set_load_async (CLUTTER_TEXTURE (priv->user_icon), TRUE);
-      clutter_texture_set_from_file (CLUTTER_TEXTURE (priv->user_icon),
-                                     name,
-                                     &error);
-      if (error)
-        {
-          g_warning ("Unable to load avatar image: %s", error->message);
-          g_error_free (error);
+  g_object_unref (account_manager);
+}
 
-          clutter_texture_set_load_async (CLUTTER_TEXTURE (priv->user_icon), FALSE);
-          clutter_texture_set_from_file (CLUTTER_TEXTURE (priv->user_icon),
-                                         priv->no_icon_file,
-                                         NULL);
-        }
+static void
+mnb_im_status_row_constructed (GObject *gobject)
+{
+  MnbIMStatusRow *row = MNB_IM_STATUS_ROW (gobject);
+  MnbIMStatusRowPrivate *priv = row->priv;
+  TpAccountManager *account_manager;
 
-      g_free (name);
-    }
+  g_assert (priv->account_name != NULL);
+
+  account_manager = tp_account_manager_dup ();
+
+  tp_account_manager_prepare_async (account_manager, NULL,
+                                    _account_manager_ready_cb, row);
 
   if (G_OBJECT_CLASS (mnb_im_status_row_parent_class)->constructed)
     G_OBJECT_CLASS (mnb_im_status_row_parent_class)->constructed (gobject);
@@ -657,14 +723,14 @@ mnb_im_status_row_class_init (MnbIMStatusRowClass *klass)
 
   pspec = g_param_spec_string ("account-name",
                                "Account Name",
-                               "The unique name of the MissionControl account",
+                               "The unique name of the Telepathy account",
                                NULL,
                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (gobject_class, PROP_ACCOUNT_NAME, pspec);
 
   pspec = g_param_spec_string ("display-name",
                                "Display Name",
-                               "The display name of the MissionControl account",
+                               "The display name of the Telepathy account",
                                NULL,
                                G_PARAM_READWRITE);
   g_object_class_install_property (gobject_class, PROP_DISPLAY_NAME, pspec);
@@ -675,9 +741,9 @@ mnb_im_status_row_class_init (MnbIMStatusRowClass *klass)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL,
-                  mnb_status_marshal_VOID__INT_STRING,
+                  mnb_status_marshal_VOID__UINT_STRING,
                   G_TYPE_NONE, 2,
-                  G_TYPE_INT,
+                  G_TYPE_UINT,
                   G_TYPE_STRING);
 }
 
@@ -948,31 +1014,11 @@ mnb_im_status_row_update (MnbIMStatusRow *row)
   priv = row->priv;
 
   g_free (priv->display_name);
-  priv->display_name = g_strdup (mc_account_get_display_name (priv->account));
+  priv->display_name = g_strdup (tp_account_get_display_name (priv->account));
 
   str = g_strconcat (" - ", priv->display_name, NULL);
   nbtk_label_set_text (NBTK_LABEL (priv->account_label), str);
   g_free (str);
 
-  if (mc_account_get_avatar (priv->account, &name, NULL, NULL))
-    {
-      GError *error = NULL;
-
-      clutter_texture_set_load_async (CLUTTER_TEXTURE (priv->user_icon), TRUE);
-      clutter_texture_set_from_file (CLUTTER_TEXTURE (priv->user_icon),
-                                     name,
-                                     &error);
-      if (error)
-        {
-          g_warning ("Unable to load avatar image: %s", error->message);
-          g_error_free (error);
-
-          clutter_texture_set_load_async (CLUTTER_TEXTURE (priv->user_icon), FALSE);
-          clutter_texture_set_from_file (CLUTTER_TEXTURE (priv->user_icon),
-                                         priv->no_icon_file,
-                                         NULL);
-        }
-
-      g_free (name);
-    }
+  tp_account_get_avatar_async (priv->account, _account_got_avatar_cb, row);
 }
diff --git a/src/mnb-status-marshal.list b/src/mnb-status-marshal.list
index 7095c6c..844df91 100644
--- a/src/mnb-status-marshal.list
+++ b/src/mnb-status-marshal.list
@@ -1,3 +1,3 @@
-VOID:INT,STRING
+VOID:UINT,STRING
 VOID:STRING
 VOID:VOID

commit 48450fd1db8689547bb3516c1251217f74c6f057
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Sat Sep 26 17:00:04 2009 +0100

    Build with clutter-gtk and telepathy-glib.
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index b29fbc1..555a04b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,9 @@ PKG_CHECK_MODULES([MPL], [moblin-panel])
 PKG_CHECK_MODULES([STATUS],
                   [dbus-glib-1                  dnl
                    clutter-x11-1.0 >= 1.0.0     dnl
-                   libmissioncontrol            dnl
+                   clutter-gtk-0.10
                    mojito-client >= 0.20.1      dnl
+                   telepathy-glib
                    nbtk-1.2])
 
 AC_ARG_ENABLE([cache],


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-panel-status.spec	19 Sep 2009 13:53:02 -0000	1.3
+++ moblin-panel-status.spec	28 Sep 2009 21:34:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
 Version:        0.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -18,6 +18,11 @@ BuildRequires: nbtk-devel
 BuildRequires: telepathy-mission-control-devel
 BuildRequires: intltool
 
+# Generated with:
+# git show -p 419ffd4e56794e2b5ab068586d55419b7a808356~4..
+# in mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-status.git
+Patch0:        mps-mc5-port.patch
+
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 BuildRequires: gnome-common
@@ -29,6 +34,7 @@ status.
 
 %prep
 %setup -q
+%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -54,6 +60,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.5-2
+- Add patch for new Mission Control support
+
 * Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
 - New upstream 0.0.5 release
 



From hadess at fedoraproject.org  Mon Sep 28 21:37:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 28 Sep 2009 21:37:23 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel mpp-mc5-port.patch, NONE,
	1.1 moblin-panel-people.spec, 1.1, 1.2
Message-ID: <20090928213723.6733211C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2871

Modified Files:
	moblin-panel-people.spec 
Added Files:
	mpp-mc5-port.patch 
Log Message:
* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
- Add patch to port to new Mission Control


mpp-mc5-port.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

--- NEW FILE mpp-mc5-port.patch ---
commit 51b916b3dbf79f6729591f7567c34e1ac2aef98d
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Sep 28 15:41:46 2009 +0100

    configure.ac: add a versioned depends on anerley
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index 930e188..2687e21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ CFLAGS="$CFLAGS -Wall"
 
 PKG_CHECK_MODULES(MPL, moblin-panel)
 PKG_CHECK_MODULES(PEOPLE,
-                  anerley
+                  anerley >= 0.1.3
                   gtk+-2.0 >= 2.14
                   nbtk-1.2
                   gio-2.0

commit 90ccb81fd3c13c22410f19943fc8b725cbedb821
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Fri Sep 18 13:33:00 2009 +0100

    mnb-people-panel: update to new anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/src/mnb-people-panel.c b/src/mnb-people-panel.c
index f7ea2ff..3f3bd5e 100644
--- a/src/mnb-people-panel.c
+++ b/src/mnb-people-panel.c
@@ -524,9 +524,7 @@ mnb_people_panel_init (MnbPeoplePanel *self)
   MnbPeoplePanelPrivate *priv = GET_PRIVATE (self);
   NbtkWidget *hbox, *label;
   NbtkWidget *scroll_view;
-  MissionControl *mc;
   AnerleyFeed *feed, *tp_feed, *ebook_feed;
-  DBusGConnection *conn;
   EBook *book;
   GError *error = NULL;
 
@@ -581,12 +579,9 @@ mnb_people_panel_init (MnbPeoplePanel *self)
                     (GCallback)_entry_text_changed_cb,
                     self);
 
-  conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-
   feed = anerley_aggregate_feed_new ();
 
-  tp_feed = anerley_aggregate_tp_feed_new (mc);
+  tp_feed = anerley_aggregate_tp_feed_new ();
   anerley_aggregate_feed_add_feed (ANERLEY_AGGREGATE_FEED (feed),
                                    tp_feed);
 


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-people.spec	26 Aug 2009 22:37:59 -0000	1.1
+++ moblin-panel-people.spec	28 Sep 2009 21:37:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -21,6 +21,11 @@ BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: gnome-common
 
+# Generated with:
+# git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
+# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
+Patch0:        mpp-mc5-port.patch
+
 Requires: dbus
 
 %description
@@ -28,6 +33,7 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
+%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -53,5 +59,8 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
+- Add patch to port to new Mission Control
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
 - Initial packaging



From giallu at fedoraproject.org  Mon Sep 28 22:05:02 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Mon, 28 Sep 2009 22:05:02 +0000 (UTC)
Subject: rpms/sysprof/devel sysprof.spec,1.13,1.14
Message-ID: <20090928220502.6004011C0333@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16813

Modified Files:
	sysprof.spec 
Log Message:
* Sun Sep 27 2009 Gianluca Sforna <giallu gmail com> - 1.1.2-3
- Incorporate suggestions from package review
- Require kernel 2.6.31
- Updated description



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sysprof.spec	27 Sep 2009 14:49:02 -0000	1.13
+++ sysprof.spec	28 Sep 2009 22:05:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           sysprof
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A system-wide Linux profiler
 Group:          Development/System
 License:        GPLv2+
@@ -15,13 +15,15 @@ BuildRequires:  libglade2-devel
 BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
+Requires:       kernel => 2.6.31
+
 ExclusiveArch:  %{ix86} x86_64
 
 %description
-Sysprof is a sampling CPU profiler for Linux that uses a kernel module
-to profile the entire system, not just a single application.
-Sysprof handles shared libraries and applications do not need to be
-recompiled. In fact they don't even have to be restarted.
+Sysprof is a sampling CPU profiler for Linux that collects accurate,
+high-precision data and provides efficient access to the sampled
+calltrees.
+
 
 %prep
 %setup -q -n sysprof-%{version}
@@ -62,8 +64,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-* Sun Sep 27 2009 Gianluca Sforna <giallu gmail com> - 1.1.2-2
+* Sun Sep 27 2009 Gianluca Sforna <giallu gmail com> - 1.1.2-3
 - Incorporate suggestions from package review
+- Require kernel 2.6.31
+- Updated description
 
 * Sat Sep 26 2009 Gianluca Sforna <giallu gmail com> - 1.1.2-1
 - New upstream release



From rstrode at fedoraproject.org  Mon Sep 28 22:21:40 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 28 Sep 2009 22:21:40 +0000 (UTC)
Subject: rpms/plymouth/devel .cvsignore, 1.14, 1.15 plymouth.spec, 1.144,
	1.145 sources, 1.58, 1.59
Message-ID: <20090928222140.4B88A11C0333@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24877

Modified Files:
	.cvsignore plymouth.spec sources 
Log Message:
- Add prerelease of 0.8.0 for multihead support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Aug 2009 17:54:28 -0000	1.14
+++ .cvsignore	28 Sep 2009 22:21:38 -0000	1.15
@@ -1 +1 @@
-plymouth-0.7.1.tar.bz2
+plymouth-0.8.0.tar.bz2


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- plymouth.spec	11 Sep 2009 20:35:43 -0000	1.144
+++ plymouth.spec	28 Sep 2009 22:21:39 -0000	1.145
@@ -4,8 +4,8 @@
 
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
-Version: 0.7.1
-Release: 7%{?dist}
+Version: 0.8.0
+Release: 0.2009.28.09%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -24,9 +24,6 @@ Obsoletes: plymouth-text-and-details-onl
 Obsoletes: plymouth-plugin-pulser < 0.7.0-0.2009.05.08.2
 Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
-Patch0: 0001-populate-initrd-Get-plugin-path-from-plymouth.patch
-Patch1: 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch
-
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -232,8 +229,6 @@ plugin.
 
 %prep
 %setup -q
-%patch0 -p1 -b .plugin-path
-%patch1 -p1 -b .inst-function
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -349,6 +344,7 @@ fi
 %{_bindir}/rhgb-client
 %{_libdir}/plymouth/details.so
 %{_libdir}/plymouth/text.so
+%{_libdir}/plymouth/renderers
 %{_datadir}/plymouth/default-boot-duration
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
@@ -374,6 +370,7 @@ fi
 %{_sbindir}/plymouth-set-default-theme
 %{_sbindir}/plymouth-set-default-plugin
 %{_libexecdir}/plymouth/plymouth-update-initrd
+%{_libexecdir}/plymouth/plymouth-generate-initrd
 %{_libexecdir}/plymouth/plymouth-populate-initrd
 
 %files utils
@@ -449,6 +446,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.28.09
+- Add prerelease of 0.8.0 for multihead support
+
 * Fri Sep 11 2009 Ray Strode <rstrode at redhat.com> 0.7.1-7
 - Go back to blue charge background (bug 522460)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	25 Aug 2009 17:54:28 -0000	1.58
+++ sources	28 Sep 2009 22:21:39 -0000	1.59
@@ -1 +1 @@
-5a526059ad26e0a6ed0896c9d48a8557  plymouth-0.7.1.tar.bz2
+029968e91ff135b522c06b606d8cbf87  plymouth-0.8.0.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 28 22:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:23:40 +0000
Subject: [pkgdb] trac: jkeating has requested watchcommits
Message-ID: <20090928222340.15DE010F85F@bastion2.fedora.phx.redhat.com>

jkeating has requested the watchcommits acl on trac (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Mon Sep 28 22:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:23:40 +0000
Subject: [pkgdb] trac: jkeating has requested watchbugzilla
Message-ID: <20090928222340.A56CF10F88B@bastion2.fedora.phx.redhat.com>

jkeating has requested the watchbugzilla acl on trac (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Mon Sep 28 22:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:23:41 +0000
Subject: [pkgdb] trac: jkeating has requested commit
Message-ID: <20090928222341.22D5410F895@bastion2.fedora.phx.redhat.com>

jkeating has requested the commit acl on trac (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Mon Sep 28 22:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:23:42 +0000
Subject: [pkgdb] trac: jkeating has requested approveacls
Message-ID: <20090928222342.635C710F8AB@bastion2.fedora.phx.redhat.com>

jkeating has requested the approveacls acl on trac (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trac



From michich at fedoraproject.org  Mon Sep 28 22:35:06 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 28 Sep 2009 22:35:06 +0000 (UTC)
Subject: rpms/gajim/EL-5 gajim-gdk-color-to_string.diff, NONE, 1.1 gajim.spec,
	1.18, 1.19 sources, 1.11, 1.12
Message-ID: <20090928223506.A902C11C0333@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/gajim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039

Modified Files:
	gajim.spec sources 
Added Files:
	gajim-gdk-color-to_string.diff 
Log Message:
* Mon Sep 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.5-1
- Update to 0.12.5, backport from Debarshi Ray's devel/ branch.
- Avoid bug caused by dependency on newer Gtk (gajim-gdk-color-to_string.diff)
- Use el5 instead of rhel macro for conditional checks.


gajim-gdk-color-to_string.diff:
 config.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gajim-gdk-color-to_string.diff ---
Avoid this bug when entering Preferences:
AttributeError: 'gtk.gdk.Color' object has no attribute 'to_string'
This attribute was introduced in newer Gtk than what we have in RHEL5.
Index: gajim-0.12.5/src/config.py
===================================================================
--- gajim-0.12.5.orig/src/config.py
+++ gajim-0.12.5/src/config.py
@@ -394,7 +394,7 @@ class PreferencesWindow:
 
 		# Default Status messages
 		self.default_msg_tree = self.xml.get_widget('default_msg_treeview')
-		col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string()
+#		col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string()
 		# (status, translated_status, message, enabled)
 		model = gtk.ListStore(str, str, str, bool)
 		self.default_msg_tree.set_model(model)
@@ -412,7 +412,7 @@ class PreferencesWindow:
 		col.set_attributes(renderer, text = 2)
 		renderer.connect('edited', self.on_default_msg_cell_edited)
 		renderer.set_property('editable', True)
-		renderer.set_property('cell-background', col2)
+#		renderer.set_property('cell-background', col2)
 		col = gtk.TreeViewColumn(_('Enabled'))
 		col.set_resizable(True)
 		self.default_msg_tree.append_column(col)


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gajim.spec	11 Mar 2009 17:02:12 -0000	1.18
+++ gajim.spec	28 Sep 2009 22:35:06 -0000	1.19
@@ -2,13 +2,14 @@
 
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-Version:	0.12.1
-Release:	1%{?dist}.2
-License:	GPLv2
+Version:	0.12.5
+Release:	1%{?dist}
+License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-keyring.diff
+Patch1:		%{name}-gdk-color-to_string.diff
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -16,21 +17,25 @@ Requires:	avahi-tools
 Requires:	bind-utils
 Requires:	dbus-python
 
-%if 0%{?fc8}%{?fc9}%{?rhel}
+%if 0%{?fc8}%{?fc9}%{?el5}
 %else
 Requires:	gnome-python2-gnome
 %endif
 
+Requires:	gnome-python2-bonobo
 Requires:	gnome-python2-canvas
+Requires:	gnupg
 Requires:	notify-python
 Requires:	pygtk2-libglade
 Requires:	pyOpenSSL
+Requires:	python-crypto
 Requires:	python-docutils
+Requires:	python-GnuPGInterface
 Requires:	python-kerberos
 %if 0%{?fedora}
 Requires:	python-sexy
 %endif
-%if 0%{?rhel}
+%if 0%{?el5}
 Requires:	python-sqlite2
 %endif
 
@@ -51,10 +56,7 @@ Gajim does not require GNOME to run, eve
 %prep
 %setup -q
 %patch0 -p0
-
-# Suppress error.
-sed --in-place --expression '1d' ./src/gajim.py
-sed --in-place --expression '1d' ./src/gajim-remote.py
+%patch1 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -71,9 +73,6 @@ make install INSTALL="%{__install} -p" D
 
 rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la
 
-# Suppress rpmlint error.
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/src/history_manager.py
-
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --remove-category=Application \
@@ -91,12 +90,15 @@ rm -rf %{buildroot}
 %doc COPYING
 %doc README.html
 %doc THANKS
+%doc THANKS.artists
 %doc %{_mandir}/man1/%{name}.1*
 %doc %{_mandir}/man1/%{name}-remote.1*
 %{_bindir}/%{name}
+%{_bindir}/%{name}-history-manager
 %{_bindir}/%{name}-remote
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/pixmaps/%{name}_about.png
 
 %dir %{_datadir}/%{name}
@@ -109,6 +111,11 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Mon Sep 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.5-1
+- Update to 0.12.5, backport from Debarshi Ray's devel/ branch.
+- Avoid bug caused by dependency on newer Gtk (gajim-gdk-color-to_string.diff)
+- Use el5 instead of rhel macro for conditional checks.
+
 * Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.2
 - Took the current version of Gajim and modified the spec for EL-5.
 - Added workaround for a gnomekeyring binding bug.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	11 Mar 2009 16:21:51 -0000	1.11
+++ sources	28 Sep 2009 22:35:06 -0000	1.12
@@ -1 +1 @@
-195a7973d3fbfb538e2ee74156aa6e9e  gajim-0.12.1.tar.gz
+aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2



From orion at fedoraproject.org  Mon Sep 28 22:35:31 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Sep 2009 22:35:31 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.88,1.89
Message-ID: <20090928223531.2B4E311C0333@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003

Modified Files:
	plplot.spec 
Log Message:
Add qt and pyqt subpackages.
Add other missing files.
Remove ocaml dep stuff.



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- plplot.spec	28 Sep 2009 17:54:30 -0000	1.88
+++ plplot.spec	28 Sep 2009 22:35:29 -0000	1.89
@@ -177,9 +177,6 @@ Summary:        Functions for scientific
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       ocaml-plplot = %{version}-%{release}
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description    ocaml
 %{summary}.
@@ -219,6 +216,35 @@ Requires:       %{name} = %{version}-%{r
 %endif
 
 
+%package        pyqt
+Summary:        Functions for scientific plotting with PyQt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    pyqt
+%{summary}.
+
+
+%package        qt
+Summary:        Functions for scientific plotting with Qt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    qt
+%{summary}.
+
+%package        qt-devel
+Summary:        Development files for using PLplot with Qt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-qt = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    qt-devel
+%{summary}.
+
+
 %package        tk
 Summary:        Functions for scientific plotting with Tk
 Group:          Development/Libraries
@@ -346,6 +372,9 @@ do
    cat tclIndex.hd tclIndex > ${file}
 done
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/{CMakeLists.txt,cmake}
+
+
 %check
 cd fedora
 #Hack
@@ -383,6 +412,9 @@ fi
 %postun octave -p /sbin/ldconfig
 %endif
 
+%post   qt -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
+
 %post   tk -p /sbin/ldconfig
 %postun tk -p /sbin/ldconfig
 
@@ -401,14 +433,17 @@ fi
 %{python_sitearch}/plplot.py*
 %{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
+%{python_sitearch}/Plframe.py*
+%{python_sitearch}/TclSup.py*
 %{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/pltek.1.gz
 %{_mandir}/man1/pstex2eps.1.gz
 %dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
 %{_datadir}/plplot%{version}/*.fnt
+%{_datadir}/plplot%{version}/*.map
+%{_datadir}/plplot%{version}/*.pal
 %dir %{_datadir}/plplot%{version}/examples
 %{_datadir}/plplot%{version}/examples/python/
 %{_datadir}/plplot%{version}/examples/test_python.sh
@@ -553,6 +588,21 @@ fi
 %{_datadir}/plplot%{version}/examples/test_pdl.sh
 %endif
 
+%files pyqt
+%defattr(-,root,root,-)
+%{python_sitearch}/plplot_pyqt4.so
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so.*
+%{_libdir}/plplot%{version}/driversd/qt.rc
+%{_libdir}/plplot%{version}/driversd/qt.so
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so
+%{_libdir}/pkgconfig/plplotd-qt.pc
+
 %files tk
 %defattr(-,root,root,-)
 %{_bindir}/plserver
@@ -593,6 +643,7 @@ fi
 * Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
 - Update to 5.9.5
 - Disable qt tests for now until Xvfb bug is fixed.
+- Remove ocaml dep code for now - breaks other dep generation
 
 * Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-8
 - Update octave patch to hopefully fix remaining issue.



From cebbert at fedoraproject.org  Mon Sep 28 22:41:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 28 Sep 2009 22:41:53 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.111, 1.112 config-debug, 1.30,
	1.31 config-generic, 1.326, 1.327 config-nodebug, 1.40,
	1.41 kernel.spec, 1.1810, 1.1811
Message-ID: <20090928224153.79A4811C0333@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1433

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
Fix up some items missing in make debug vs. make release,
  rearrange so the options are in the same order.
Add new debug options:
  CONFIG_EXT4_DEBUG
  CONFIG_DEBUG_FORCE_WEAK_PER_CPU


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- Makefile	28 Sep 2009 20:40:26 -0000	1.111
+++ Makefile	28 Sep 2009 22:41:52 -0000	1.112
@@ -75,6 +75,7 @@ debug:
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -124,6 +125,7 @@ release:
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- config-debug	14 Sep 2009 21:33:54 -0000	1.30
+++ config-debug	28 Sep 2009 22:41:52 -0000	1.31
@@ -52,3 +52,5 @@ CONFIG_DMA_API_DEBUG=y
 CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
+
+CONFIG_EXT4_DEBUG=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- config-generic	15 Sep 2009 15:12:45 -0000	1.326
+++ config-generic	28 Sep 2009 22:41:52 -0000	1.327
@@ -4073,6 +4073,9 @@ CONFIG_PPS=m
 # This generates a huge amount of dmesg spew
 # CONFIG_DEBUG_KOBJECT is not set
 #
+# This is for ensuring alpha and s390 don't get broken by certain percpu problems
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+#
 #
 # These debug options are deliberatly left on (even in 'make release' kernels).
 # They aren't that much of a performance impact, and the value


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- config-nodebug	28 Sep 2009 20:40:26 -0000	1.40
+++ config-nodebug	28 Sep 2009 22:41:52 -0000	1.41
@@ -52,3 +52,5 @@ CONFIG_DMA_API_DEBUG=y
 CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
+
+CONFIG_EXT4_DEBUG=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1810
retrieving revision 1.1811
diff -u -p -r1.1810 -r1.1811
--- kernel.spec	28 Sep 2009 20:40:26 -0000	1.1810
+++ kernel.spec	28 Sep 2009 22:41:52 -0000	1.1811
@@ -1986,6 +1986,9 @@ fi
 * Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix up some items missing in make debug vs. make release,
   rearrange so the options are in the same order.
+- Add new debug options:
+  CONFIG_EXT4_DEBUG
+  CONFIG_DEBUG_FORCE_WEAK_PER_CPU
 
 * Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.31-git18



From pkgdb at fedoraproject.org  Mon Sep 28 22:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:42:30 +0000
Subject: [pkgdb] cairo-clock: twittery has requested watchcommits
Message-ID: <20090928224231.6876010F888@bastion2.fedora.phx.redhat.com>

twittery has requested the watchcommits acl on cairo-clock (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cairo-clock



From pkgdb at fedoraproject.org  Mon Sep 28 22:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:42:32 +0000
Subject: [pkgdb] cairo-clock: twittery has requested watchbugzilla
Message-ID: <20090928224232.3B63410F894@bastion2.fedora.phx.redhat.com>

twittery has requested the watchbugzilla acl on cairo-clock (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cairo-clock



From pkgdb at fedoraproject.org  Mon Sep 28 22:42:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:42:40 +0000
Subject: [pkgdb] cairo-clock: twittery has given up watchcommits
Message-ID: <20090928224240.BDF8B10F86A@bastion2.fedora.phx.redhat.com>

twittery has given up the watchcommits acl on cairo-clock (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cairo-clock



From pkgdb at fedoraproject.org  Mon Sep 28 22:42:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Sep 2009 22:42:41 +0000
Subject: [pkgdb] cairo-clock: twittery has given up watchbugzilla
Message-ID: <20090928224242.492D910F88C@bastion2.fedora.phx.redhat.com>

twittery has given up the watchbugzilla acl on cairo-clock (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cairo-clock



From orion at fedoraproject.org  Mon Sep 28 22:45:49 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Sep 2009 22:45:49 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.89,1.90
Message-ID: <20090928224550.9E8B511C02BD@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2884

Modified Files:
	plplot.spec 
Log Message:
Ship the cmake files



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- plplot.spec	28 Sep 2009 22:35:29 -0000	1.89
+++ plplot.spec	28 Sep 2009 22:45:43 -0000	1.90
@@ -372,7 +372,7 @@ do
    cat tclIndex.hd tclIndex > ${file}
 done
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/{CMakeLists.txt,cmake}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
 
 
 %check
@@ -506,6 +506,15 @@ fi
 %{_libdir}/pkgconfig/plplotd-c++.pc
 %{_libdir}/pkgconfig/plplotd-f77.pc
 %{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/CMakeLists.txt
+%dir %{_datadir}/plplot%{version}/examples/cmake
+%dir %{_datadir}/plplot%{version}/examples/cmake/modules
+%{_datadir}/plplot%{version}/examples/cmake/modules/FindPkgConfig.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeFortranInformation.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot-noconfig.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
 %{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
@@ -535,6 +544,10 @@ fi
 #%{_datadir}/ada/adainclude/plplotadad/
 %{_datadir}/plplot%{version}/examples/ada/
 %{_datadir}/plplot%{version}/examples/test_ada.sh
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaCompiler.cmake.in
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaInformation.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeDetermineAdaCompiler.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeTestAdaCompiler.cmake
 
 %files java
 %defattr(-,root,root,-)



From rdieter at fedoraproject.org  Mon Sep 28 22:47:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 28 Sep 2009 22:47:21 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.74,1.75
Message-ID: <20090928224721.8AFE411C02BD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3892

Modified Files:
	kdelibs3.spec 
Log Message:
* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-19
- Conflicts with kde-settings (#526109)



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- kdelibs3.spec	28 Sep 2009 13:10:57 -0000	1.74
+++ kdelibs3.spec	28 Sep 2009 22:47:21 -0000	1.75
@@ -27,7 +27,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -569,6 +569,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-19
+- Conflicts with kde-settings (#526109)
+
 * Mon Sep 28 2009 Than Ngo <than at redhat.com> - 3.5.10-18
 - rhel cleanup
 



From kyle at fedoraproject.org  Mon Sep 28 22:57:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 28 Sep 2009 22:57:24 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.112, 1.113 config-generic, 1.327,
	1.328 config-ia64-generic, 1.26, 1.27 config-nodebug, 1.41,
	1.42 config-powerpc-generic, 1.50, 1.51 config-powerpc32-generic,
	1.35, 1.36 config-powerpc64, 1.34, 1.35 config-s390x, 1.19,
	1.20 config-sparc64-generic, 1.29, 1.30 config-x86-generic, 1.88,
	1.89 config-x86_64-generic, 1.90, 1.91 kernel.spec, 1.1811,
	1.1812 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.5,
	1.6 linux-2.6-execshield.patch, 1.110, 1.111
Message-ID: <20090928225724.EA49B11C0347@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8704

Modified Files:
	Makefile config-generic config-ia64-generic config-nodebug 
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 config-s390x config-sparc64-generic 
	config-x86-generic config-x86_64-generic kernel.spec 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
	linux-2.6-execshield.patch 
Log Message:
* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
- sick of rejects.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- Makefile	28 Sep 2009 22:41:52 -0000	1.112
+++ Makefile	28 Sep 2009 22:57:20 -0000	1.113
@@ -74,6 +74,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
 
@@ -124,6 +125,7 @@ release:
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- config-generic	28 Sep 2009 22:41:52 -0000	1.327
+++ config-generic	28 Sep 2009 22:57:21 -0000	1.328
@@ -12,6 +12,8 @@ CONFIG_LOCALVERSION=""
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
 CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
@@ -236,6 +238,7 @@ CONFIG_MTD_SCB2_FLASH=m
 # CONFIG_MTD_L440GX is not set
 CONFIG_MTD_PCI=m
 CONFIG_MTD_TS5500=m
+# CONFIG_MTD_GPIO_ADDR is not set
 
 #
 # Self-contained MTD device drivers
@@ -613,6 +616,7 @@ CONFIG_PATA_SIS=m
 CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
+CONFIG_PATA_ATP867X=m
 
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
@@ -674,6 +678,8 @@ CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG=y
@@ -1418,6 +1424,7 @@ CONFIG_ATMEL=m
 # CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
 CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 # CONFIG_B43_FORCE_PIO is not set
@@ -1563,6 +1570,7 @@ CONFIG_CAN_SJA1000=m
 CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
@@ -1840,6 +1848,10 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_QT2160=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -1901,6 +1913,7 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_W90X900=m
+CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
@@ -1913,6 +1926,8 @@ CONFIG_INPUT_KEYSPAN_REMOTE=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
 
+CONFIG_INPUT_WM831X_ON=m
+
 #
 # Character devices
 #
@@ -1983,6 +1998,7 @@ CONFIG_PPDEV=m
 # I2C support
 #
 CONFIG_I2C=m
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 
 #
@@ -2128,6 +2144,9 @@ CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_WM831X=m
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2196,6 +2215,7 @@ CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 CONFIG_WM8350_WATCHDOG=m
+CONFIG_WM831X_WATCHDOG=m
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2239,6 +2259,8 @@ CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_M48T35=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_WM831X=m
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -2362,6 +2384,7 @@ CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_SAA7164=m
 
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -2381,6 +2404,7 @@ CONFIG_MEDIA_ATTACH=y
 #
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -2399,6 +2423,7 @@ CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_DM1105=m
 CONFIG_DVB_DRX397XD=m
 CONFIG_DVB_LGDT3304=m
@@ -2454,6 +2479,8 @@ CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
 
+CONFIG_DVB_PT1=m
+
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_TUNER=m
@@ -2765,6 +2792,7 @@ CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_ISP1362_HCD=m
 
 #
 # USB Device Class drivers
@@ -2866,6 +2894,9 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_GSPCA_SQ905=m
 CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_JEILINJ=m
+
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 # CONFIG_USB_OV511 is not set
@@ -3043,7 +3074,10 @@ CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
 CONFIG_USB_MR800=m
 CONFIG_USB_STKWEBCAM=m
 # CONFIG_USB_TEST is not set
@@ -3086,6 +3120,8 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8350_I2C=m
 CONFIG_MFD_WM8350=m
+CONFIG_MFD_WM831X=m
+CONFIG_AB3100_OTP=m
 
 #
 # File systems
@@ -3108,6 +3144,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4DEV_COMPAT=y
 CONFIG_JBD2=y
 CONFIG_JBD2_DEBUG=y
@@ -3217,6 +3254,7 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
 CONFIG_FUSE_FS=m
 CONFIG_OMFS_FS=m
 CONFIG_CUSE=m
@@ -3517,6 +3555,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
 # CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BACKLIGHT_WM831X=m
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -3752,6 +3791,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_WM831X_STATUS=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -3799,6 +3839,7 @@ CONFIG_CFAG12864B_RATE=20
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_APM_POWER=m
+CONFIG_WM831X_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_PMU=m
@@ -3815,6 +3856,7 @@ CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
 
 CONFIG_INSTRUMENTATION=y
 CONFIG_MARKERS=y
@@ -3939,6 +3981,10 @@ CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_WM831X=m
 
 CONFIG_WM8350_POWER=m
 
@@ -3995,6 +4041,17 @@ CONFIG_USB_ATMEL=m
 # CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
 # CONFIG_RT3070 is not set
 # CONFIG_RTL8192SU is not set
+# CONFIG_COWLOOP is not set
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_VT6656 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_HYPERV is not set
 
 #
 # Android
@@ -4095,3 +4152,5 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- config-ia64-generic	18 Jun 2009 19:05:53 -0000	1.26
+++ config-ia64-generic	28 Sep 2009 22:57:22 -0000	1.27
@@ -210,3 +210,6 @@ CONFIG_PARAVIRT=y
 CONFIG_DMAR_DEFAULT_ON=y
 
 CONFIG_RCU_FANOUT=64
+
+CONFIG_ACPI_POWER_METER=m
+CONFIG_I2C_SCMI=m


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- config-nodebug	28 Sep 2009 22:41:52 -0000	1.41
+++ config-nodebug	28 Sep 2009 22:57:22 -0000	1.42
@@ -53,4 +53,6 @@ CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
 
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+
 CONFIG_EXT4_DEBUG=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- config-powerpc-generic	15 Sep 2009 15:12:45 -0000	1.50
+++ config-powerpc-generic	28 Sep 2009 22:57:22 -0000	1.51
@@ -333,3 +333,9 @@ CONFIG_SWIOTLB=y
 CONFIG_PPC_DISABLE_WERROR=y
 
 CONFIG_XILINX_EMACLITE=m
+
+CONFIG_GPIO_WM831X=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_UCB1400 is not set
+CONFIG_EDAC_MPC85XX=m
+


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- config-powerpc32-generic	23 Jul 2009 17:45:33 -0000	1.35
+++ config-powerpc32-generic	28 Sep 2009 22:57:22 -0000	1.36
@@ -187,5 +187,6 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_RCU_FANOUT=32
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- config-powerpc64	23 Jul 2009 17:45:33 -0000	1.34
+++ config-powerpc64	28 Sep 2009 22:57:22 -0000	1.35
@@ -185,4 +185,5 @@ CONFIG_RELOCATABLE=y
 CONFIG_RCU_FANOUT=64
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- config-s390x	14 Sep 2009 21:33:54 -0000	1.19
+++ config-s390x	28 Sep 2009 22:57:22 -0000	1.20
@@ -231,5 +231,6 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="/dev/jokes"
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- config-sparc64-generic	15 Sep 2009 15:12:45 -0000	1.29
+++ config-sparc64-generic	28 Sep 2009 22:57:22 -0000	1.30
@@ -207,4 +207,5 @@ CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- config-x86-generic	20 Aug 2009 16:03:17 -0000	1.88
+++ config-x86-generic	28 Sep 2009 22:57:23 -0000	1.89
@@ -169,11 +169,13 @@ CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_THERMAL=y
+CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_PNPACPI=y
+CONFIG_ACPI_POWER_METER=m
 
 
 #
@@ -473,6 +475,7 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_OLD_MCE is not set
@@ -480,3 +483,15 @@ CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_X86_MCE_INJECT is not set
+
+CONFIG_X86_MRST=y
+CONFIG_SFI=y
+
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_I2C_SCMI=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EDAC_I3200=m
+
+CONFIG_GPIO_LANGWELL=y
+
+# CONFIG_INTEL_TXT is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- config-x86_64-generic	20 Aug 2009 16:03:17 -0000	1.90
+++ config-x86_64-generic	28 Sep 2009 22:57:23 -0000	1.91
@@ -107,6 +107,7 @@ CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_VIDEO=m
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_POWER_METER=m
 
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
@@ -377,6 +378,16 @@ CONFIG_RCU_FANOUT=64
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_MCE_INJECT is not set
+
+CONFIG_SFI=y
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_I2C_SCMI=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EDAC_I3200=m
+CONFIG_TOPSTAR_LAPTOP=m
+# CONFIG_INTEL_TXT is not set
+CONFIG_GPIO_LANGWELL=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -p -r1.1811 -r1.1812
--- kernel.spec	28 Sep 2009 22:41:52 -0000	1.1811
+++ kernel.spec	28 Sep 2009 22:57:23 -0000	1.1812
@@ -1358,6 +1358,8 @@ do
   make ARCH=$Arch %{oldconfig_target} > /dev/null
   echo "# $Arch" > configs/$i
   cat .config >> configs/$i
+  rm -f include/generated/kernel.arch
+  rm -f include/generated/kernel.cross
 done
 # end of kernel config
 %endif
@@ -1454,7 +1456,7 @@ BuildKernel() {
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
 %if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/dracut-$KernelVer.img
+    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
 %else
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
 %endif
@@ -1983,6 +1985,9 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
+- sick of rejects.
+
 * Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix up some items missing in make debug vs. make release,
   rearrange so the options are in the same order.
@@ -1991,6 +1996,10 @@ fi
   CONFIG_DEBUG_FORCE_WEAK_PER_CPU
 
 * Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
+- Must now make mrproper after each config pass, due to Kbuild
+  stashing away the $ARCH variable.
+
+* Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.31-git18
 - rebased:
  - hdpvr-ir-enable.patch

linux-2.6-debug-vm-would-have-oomkilled.patch:
 kernel/sysctl.c |    9 +++++++++
 mm/oom_kill.c   |    7 +++++++
 2 files changed, 16 insertions(+)

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-debug-vm-would-have-oomkilled.patch	28 Sep 2009 05:09:48 -0000	1.5
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	28 Sep 2009 22:57:23 -0000	1.6
@@ -26,7 +26,7 @@ index 0d949c5..8fb2bd9 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index ea2147d..3b31a4a 100644
+index ea2147d..788fe84 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -50,18 +50,3 @@ index ea2147d..3b31a4a 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -384,6 +391,14 @@ static int oom_kill_task(struct task_struct *p)
- 	if (!p->mm || p->signal->oom_adj == OOM_DISABLE)
- 		return 1;
- 
-+	/*
-+	 * Don't kill the process if any threads are set to OOM_DISABLE
-+	 */
-+	do_each_thread(g, q) {
-+		if (q->mm == mm && q->oomkilladj == OOM_DISABLE)
-+			return 1;
-+	} while_each_thread(g, q);
-+
- 	__oom_kill_task(p, 1);
- 
- 	return 0;

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  129 +++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c                    |    6 +
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/setup_nx.c                |    4 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 24 files changed, 463 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- linux-2.6-execshield.patch	28 Sep 2009 05:09:48 -0000	1.110
+++ linux-2.6-execshield.patch	28 Sep 2009 22:57:23 -0000	1.111
@@ -407,65 +407,6 @@ index 73ffd55..0cf2a7b 100644
  
  	/* Enable PSE if available */
  	if (cpu_has_pse)
-diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 30938c1..599e0a4 100644
---- a/arch/x86/mm/init_32.c
-+++ b/arch/x86/mm/init_32.c
-@@ -591,6 +591,54 @@ void zap_low_mappings(bool early)
- pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
- EXPORT_SYMBOL_GPL(__supported_pte_mask);
- 
-+#ifdef CONFIG_X86_PAE
-+
-+static int disable_nx __initdata;
-+
-+/*
-+ * noexec = on|off
-+ *
-+ * Control non executable mappings.
-+ *
-+ * on      Enable
-+ * off     Disable (disables exec-shield too)
-+ */
-+static int __init noexec_setup(char *str)
-+{
-+	if (!str || !strcmp(str, "on")) {
-+		if (cpu_has_nx) {
-+			__supported_pte_mask |= _PAGE_NX;
-+			disable_nx = 0;
-+		}
-+	} else if (!strcmp(str, "off")) {
-+		disable_nx = 1;
-+		__supported_pte_mask &= ~_PAGE_NX;
-+		exec_shield = 0;
-+	} else
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+early_param("noexec", noexec_setup);
-+
-+void __init set_nx(void)
-+{
-+	unsigned int v[4], l, h;
-+
-+	if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
-+		cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
-+
-+		if ((v[3] & (1 << 20)) && !disable_nx) {
-+			rdmsr(MSR_EFER, l, h);
-+			l |= EFER_NX;
-+			wrmsr(MSR_EFER, l, h);
-+			nx_enabled = 1;
-+			__supported_pte_mask |= _PAGE_NX;
-+		}
-+	}
-+}
-+#endif
-+
- /* user-defined highmem size */
- static unsigned int highmem_pages = -1;
- 
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
 index c8191de..7d84d01 100644
 --- a/arch/x86/mm/mmap.c
@@ -488,6 +429,25 @@ index c8191de..7d84d01 100644
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
  }
+diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
+index 513d8ed..c614a90 100644
+--- a/arch/x86/mm/setup_nx.c
++++ b/arch/x86/mm/setup_nx.c
+@@ -1,3 +1,4 @@
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+@@ -27,6 +28,9 @@ static int __init noexec_setup(char *str)
+ 	} else if (!strncmp(str, "off", 3)) {
+ 		disable_nx = 1;
+ 		__supported_pte_mask &= ~_PAGE_NX;
++#ifdef CONFIG_X86_32
++		exec_shield = 0;
++#endif
+ 	}
+ 	return 0;
+ }
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
 index 36fe08e..3806a45 100644
 --- a/arch/x86/mm/tlb.c



From rstrode at fedoraproject.org  Mon Sep 28 23:30:49 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 28 Sep 2009 23:30:49 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.145,1.146
Message-ID: <20090928233049.AF82611C0335@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23814

Modified Files:
	plymouth.spec 
Log Message:
Add BuildRequires for libdrm



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- plymouth.spec	28 Sep 2009 22:21:39 -0000	1.145
+++ plymouth.spec	28 Sep 2009 23:30:47 -0000	1.146
@@ -20,6 +20,11 @@ Requires: system-logos
 Requires(post): plymouth-scripts
 Requires: initscripts >= 8.83-1
 
+BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(libdrm_intel)
+BuildRequires: pkgconfig(libdrm_radeon)
+BuildRequires: pkgconfig(libdrm_nouveau)
+
 Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 Obsoletes: plymouth-plugin-pulser < 0.7.0-0.2009.05.08.2
 Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2



From jfearn at fedoraproject.org  Mon Sep 28 23:41:25 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Mon, 28 Sep 2009 23:41:25 +0000 (UTC)
Subject: rpms/perl-XML-TreeBuilder/devel XML-TreeBuilder-NoExpand.patch, 1.4,
	1.5 perl-XML-TreeBuilder.spec, 1.7, 1.8
Message-ID: <20090928234126.1A54D11C02BD@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29187

Modified Files:
	XML-TreeBuilder-NoExpand.patch perl-XML-TreeBuilder.spec 
Log Message:
sigh, previous patch was eating entities


XML-TreeBuilder-NoExpand.patch:
 Changes                |    7 ++
 lib/XML/TreeBuilder.pm |  116 +++++++++++++++++++++++++++++++++----------------
 t/10main.t             |   26 +++++++++-
 3 files changed, 108 insertions(+), 41 deletions(-)

Index: XML-TreeBuilder-NoExpand.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/XML-TreeBuilder-NoExpand.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- XML-TreeBuilder-NoExpand.patch	28 Sep 2009 04:05:07 -0000	1.4
+++ XML-TreeBuilder-NoExpand.patch	28 Sep 2009 23:41:24 -0000	1.5
@@ -15,7 +15,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
 --- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-28 13:51:25.000000000 +1000
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-29 09:21:18.000000000 +1000
 @@ -5,6 +7,7 @@
  use strict;
  use XML::Element ();
@@ -33,7 +33,7 @@ diff -rubB --exclude=.svn --exclude='*.s
 +    my ( $this, $arg ) = @_;
 +    my $class = ref($this) || $this;
 +
-+    my $NoExpand = ( delete $arg->{'NoExpand'} || undef );
++    my $NoExpand     = ( delete $arg->{'NoExpand'}     || undef );
 +    my $ErrorContext = ( delete $arg->{'ErrorContext'} || undef );
 +
 +    if ( %{$arg} ) {
@@ -42,7 +42,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,44 +31,53 @@
+@@ -21,57 +31,76 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
@@ -65,8 +65,6 @@ diff -rubB --exclude=.svn --exclude='*.s
      'Start' => sub {
        shift;
 -      if(@stack) {
-+                $self->attr('NoExpand', undef);
-+                $self->attr('ErrorContext', undef);
 +                if (@stack) {
           push @stack, $self->{'_element_class'}->new(@_);
           $stack[-2]->push_content( $stack[-1] );
@@ -111,7 +109,20 @@ diff -rubB --exclude=.svn --exclude='*.s
         return;
      },
      
-@@ -67,11 +86,11 @@
++            'Final' => sub {
++                $self->root()->traverse(
++                    sub {
++                        my ( $node, $start ) = @_;
++                        if ( ref $node ) {    # it's an element
++                            $node->attr( 'NoExpand',     undef );
++                            $node->attr( 'ErrorContext', undef );
++                        }
++                    }
++                );
++            },
++
+     # And now, declarations:
+     
      'Attlist' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -128,7 +139,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -80,11 +99,11 @@
+@@ -80,11 +109,11 @@
      'Element' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -145,7 +156,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -93,17 +112,32 @@
+@@ -93,17 +122,32 @@
      'Doctype' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -184,7 +195,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    return $self;
  }
-@@ -110,15 +145,15 @@
+@@ -110,15 +155,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -205,8 +216,8 @@ diff -rubB --exclude=.svn --exclude='*.s
  #==========================================================================
  
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
---- XML-TreeBuilder-3.09/t/10main.t	2004-06-11 14:22:53.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 13:59:55.000000000 +1000
+--- XML-TreeBuilder-3.09/t/10main.t	2009-09-28 14:00:50.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 14:00:54.000000000 +1000
 @@ -2,7 +2,7 @@
  # Time-stamp: "2004-06-10 20:22:53 ADT" 
  
@@ -226,7 +237,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
-@@ -45,6 +44,27 @@
+@@ -43,6 +44,27 @@
  $x->delete;
  $y->delete;
  


Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/perl-XML-TreeBuilder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-XML-TreeBuilder.spec	28 Sep 2009 04:05:08 -0000	1.7
+++ perl-XML-TreeBuilder.spec	28 Sep 2009 23:41:24 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	Parser that builds a tree of XML::Element objects
 Name:		perl-XML-TreeBuilder
 Version:	3.09
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/XML-TreeBuilder/
@@ -50,6 +50,9 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{perl_vendorlib}/XML/
 
 %changelog
+* Tue Sep 29 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-16
+- Stupid man! Don't eat entities :(
+
 * Mon Sep 28 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-15
 - Always remove NoExpand and ErrorContext from output
 



From jfearn at fedoraproject.org  Mon Sep 28 23:44:22 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Mon, 28 Sep 2009 23:44:22 +0000 (UTC)
Subject: rpms/perl-XML-TreeBuilder/F-11 XML-TreeBuilder-NoExpand.patch, 1.4, 
	1.5 perl-XML-TreeBuilder.spec, 1.6, 1.7
Message-ID: <20090928234423.237B311C0333@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30185/F-11

Modified Files:
	XML-TreeBuilder-NoExpand.patch perl-XML-TreeBuilder.spec 
Log Message:
fix entites being eaten by NoExpnad switch


XML-TreeBuilder-NoExpand.patch:
 Changes                |    7 ++
 lib/XML/TreeBuilder.pm |  116 +++++++++++++++++++++++++++++++++----------------
 t/10main.t             |   26 +++++++++-
 3 files changed, 108 insertions(+), 41 deletions(-)

Index: XML-TreeBuilder-NoExpand.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-11/XML-TreeBuilder-NoExpand.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- XML-TreeBuilder-NoExpand.patch	28 Sep 2009 04:05:07 -0000	1.4
+++ XML-TreeBuilder-NoExpand.patch	28 Sep 2009 23:44:22 -0000	1.5
@@ -15,7 +15,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
 --- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-28 13:51:25.000000000 +1000
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-29 09:21:18.000000000 +1000
 @@ -5,6 +7,7 @@
  use strict;
  use XML::Element ();
@@ -33,7 +33,7 @@ diff -rubB --exclude=.svn --exclude='*.s
 +    my ( $this, $arg ) = @_;
 +    my $class = ref($this) || $this;
 +
-+    my $NoExpand = ( delete $arg->{'NoExpand'} || undef );
++    my $NoExpand     = ( delete $arg->{'NoExpand'}     || undef );
 +    my $ErrorContext = ( delete $arg->{'ErrorContext'} || undef );
 +
 +    if ( %{$arg} ) {
@@ -42,7 +42,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,44 +31,53 @@
+@@ -21,57 +31,76 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
@@ -65,8 +65,6 @@ diff -rubB --exclude=.svn --exclude='*.s
      'Start' => sub {
        shift;
 -      if(@stack) {
-+                $self->attr('NoExpand', undef);
-+                $self->attr('ErrorContext', undef);
 +                if (@stack) {
           push @stack, $self->{'_element_class'}->new(@_);
           $stack[-2]->push_content( $stack[-1] );
@@ -111,7 +109,20 @@ diff -rubB --exclude=.svn --exclude='*.s
         return;
      },
      
-@@ -67,11 +86,11 @@
++            'Final' => sub {
++                $self->root()->traverse(
++                    sub {
++                        my ( $node, $start ) = @_;
++                        if ( ref $node ) {    # it's an element
++                            $node->attr( 'NoExpand',     undef );
++                            $node->attr( 'ErrorContext', undef );
++                        }
++                    }
++                );
++            },
++
+     # And now, declarations:
+     
      'Attlist' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -128,7 +139,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -80,11 +99,11 @@
+@@ -80,11 +109,11 @@
      'Element' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -145,7 +156,7 @@ diff -rubB --exclude=.svn --exclude='*.s
           )
         );
         return;
-@@ -93,17 +112,32 @@
+@@ -93,17 +122,32 @@
      'Doctype' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -184,7 +195,7 @@ diff -rubB --exclude=.svn --exclude='*.s
    
    return $self;
  }
-@@ -110,15 +145,15 @@
+@@ -110,15 +155,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -205,8 +216,8 @@ diff -rubB --exclude=.svn --exclude='*.s
  #==========================================================================
  
 diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
---- XML-TreeBuilder-3.09/t/10main.t	2004-06-11 14:22:53.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 13:59:55.000000000 +1000
+--- XML-TreeBuilder-3.09/t/10main.t	2009-09-28 14:00:50.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 14:00:54.000000000 +1000
 @@ -2,7 +2,7 @@
  # Time-stamp: "2004-06-10 20:22:53 ADT" 
  
@@ -226,7 +237,7 @@ diff -rubB --exclude=.svn --exclude='*.s
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
-@@ -45,6 +44,27 @@
+@@ -43,6 +44,27 @@
  $x->delete;
  $y->delete;
  


Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-11/perl-XML-TreeBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-TreeBuilder.spec	28 Sep 2009 04:05:07 -0000	1.6
+++ perl-XML-TreeBuilder.spec	28 Sep 2009 23:44:22 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	Parser that builds a tree of XML::Element objects
 Name:		perl-XML-TreeBuilder
 Version:	3.09
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/XML-TreeBuilder/
@@ -50,6 +50,9 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{perl_vendorlib}/XML/
 
 %changelog
+* Tue Sep 29 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-16
+- Stupid man! Don't eat entities :(
+
 * Mon Sep 28 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-15
 - Always remove NoExpand and ErrorContext from output
 



From jfearn at fedoraproject.org  Mon Sep 28 23:44:22 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Mon, 28 Sep 2009 23:44:22 +0000 (UTC)
Subject: rpms/perl-XML-TreeBuilder/F-10 XML-TreeBuilder-NoExpand.patch, 1.2, 
	1.3 perl-XML-TreeBuilder.spec, 1.2, 1.3
Message-ID: <20090928234423.1E8D211C02BD@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30185/F-10

Modified Files:
	XML-TreeBuilder-NoExpand.patch perl-XML-TreeBuilder.spec 
Log Message:
fix entites being eaten by NoExpnad switch


XML-TreeBuilder-NoExpand.patch:
 Changes                |    7 ++
 lib/XML/TreeBuilder.pm |  116 +++++++++++++++++++++++++++++++++----------------
 t/10main.t             |   26 +++++++++-
 3 files changed, 108 insertions(+), 41 deletions(-)

Index: XML-TreeBuilder-NoExpand.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-10/XML-TreeBuilder-NoExpand.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- XML-TreeBuilder-NoExpand.patch	15 Oct 2008 03:29:04 -0000	1.2
+++ XML-TreeBuilder-NoExpand.patch	28 Sep 2009 23:44:21 -0000	1.3
@@ -1,22 +1,22 @@
-diff -rubB --exclude=.svn XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
+diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
 --- XML-TreeBuilder-3.09/Changes	2004-06-11 14:28:41.000000000 +1000
-+++ XML-TreeBuilder-patched/Changes	2008-10-15 12:17:13.000000000 +1000
-@@ -1,5 +1,11 @@
- # Time-stamp: "2004-06-10 20:28:41 ADT"
++++ XML-TreeBuilder-patched/Changes	2009-03-16 14:30:51.000000000 +1000
+@@ -1,5 +1,10 @@
+-# Time-stamp: "2004-06-10 20:28:41 ADT"
++2009-16-03 Jeff Fearn <jfearn at redhat.com>
  
-+2007-12-01   Jeff Fearn <jfearn at redhat.com>
-+
-+   Release 3.10
++   Release 3.09.x
 +
 +   Added NoExpand option to allow entities to be left untouched in xml.
-+
++   Added ErrorContext option to allow better reporting of error locations.
++   Expanded tests to test these options.
  
  2004-06-10   Sean M. Burke <sburke at cpan.org>
  
-diff -rubB --exclude=.svn XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
+diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
 --- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2008-10-15 12:38:59.000000000 +1000
-@@ -5,6 +5,7 @@
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-29 09:21:18.000000000 +1000
+@@ -5,6 +7,7 @@
  use strict;
  use XML::Element ();
  use XML::Parser ();
@@ -24,81 +24,210 @@ diff -rubB --exclude=.svn XML-TreeBuilde
  use vars qw(@ISA $VERSION);
  
  $VERSION = '3.09';
-@@ -12,8 +13,15 @@
+@@ -12,8 +15,15 @@
  
  #==========================================================================
  sub new {
 -  my $class = ref($_[0]) || $_[0];
 -  # that's the only parameter it knows
-+  my ($this, $arg) = @_;
-+  my $class = ref($this) || $this;
++    my ( $this, $arg ) = @_;
++    my $class = ref($this) || $this;
 +
-+  my $NoExpand = defined $arg->{'NoExpand'} ? delete $arg->{'NoExpand'} : 0;
-+  my $ErrorContext = defined $arg->{'ErrorContext'} ? delete $arg->{'ErrorContext'} : 0;
++    my $NoExpand     = ( delete $arg->{'NoExpand'}     || undef );
++    my $ErrorContext = ( delete $arg->{'ErrorContext'} || undef );
 +
-+  if ( %{$arg} ) {
-+    croak "unknown args: " . join( ", ", keys %{$arg} );
-+  }
++    if ( %{$arg} ) {
++        croak "unknown args: " . join( ", ", keys %{$arg} );
++    }
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,11 +29,19 @@
+@@ -21,57 +31,76 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
-+  $self->{'NoExpand'}            = $NoExpand;
-+  $self->{'ErrorContext'}        = $ErrorContext;
++    $self->{'NoExpand'}            = $NoExpand if ($NoExpand);
++    $self->{'ErrorContext'}        = $ErrorContext if ($ErrorContext);
    
    my @stack;
++
    # Compare the simplicity of this to the sheer nastiness of HTML::TreeBuilder!
    
-   $self->{'_xml_parser'} = XML::Parser->new( 'Handlers' => {
-+    'Default' => sub {
-+        if ( ( $self->{'NoExpand'} ) && ( $_[1] =~ /&.*\;/ ) ) {
-+            $stack[-1]->push_content( $_[1] );
-+        }
-+        return;
-+    },
+-  $self->{'_xml_parser'} = XML::Parser->new( 'Handlers' => {
++    $self->{'_xml_parser'} = XML::Parser->new(
++        'Handlers' => {
++            'Default' => sub {
++                if ( ( $self->{'NoExpand'} ) && ( $_[1] =~ /&.*\;/ ) ) {
++                    $stack[-1]->push_content( $_[1] );
++                }
++                return;
++            },
      'Start' => sub {
        shift;
-       if(@stack) {
-@@ -103,7 +119,22 @@
+-      if(@stack) {
++                if (@stack) {
+          push @stack, $self->{'_element_class'}->new(@_);
+          $stack[-2]->push_content( $stack[-1] );
+-       } else {
++                }
++                else {
+          $self->tag(shift);
+-         while(@_) { $self->attr(splice(@_,0,2)) };
++                    while (@_) { $self->attr( splice( @_, 0, 2 ) ) }
+          push @stack, $self;
+        }
+     },
+     
+     'End'  => sub { pop @stack; return },
+     
+-    'Char' => sub { $stack[-1]->push_content($_[1]) },
++            'Char' => sub { $stack[-1]->push_content( $_[1] ) },
+     
+     'Comment' => sub {
+        return unless $self->{'_store_comments'};
+-       (
+-        @stack ? $stack[-1] : $self
+-       )->push_content(
+-         $self->{'_element_class'}->new('~comment', 'text' => $_[1])
+-       );
++                ( @stack ? $stack[-1] : $self )
++                    ->push_content( $self->{'_element_class'}
++                        ->new( '~comment', 'text' => $_[1] ) );
+        return;
+     },
+     
+     'Proc' => sub {
+        return unless $self->{'_store_pis'};
+-       (
+-        @stack ? $stack[-1] : $self
+-       )->push_content(
+-         $self->{'_element_class'}->new('~pi', 'text' => "$_[1] $_[2]")
+-       );
++                ( @stack ? $stack[-1] : $self )
++                    ->push_content( $self->{'_element_class'}
++                        ->new( '~pi', 'text' => "$_[1] $_[2]" ) );
+        return;
+     },
+     
++            'Final' => sub {
++                $self->root()->traverse(
++                    sub {
++                        my ( $node, $start ) = @_;
++                        if ( ref $node ) {    # it's an element
++                            $node->attr( 'NoExpand',     undef );
++                            $node->attr( 'ErrorContext', undef );
++                        }
++                    }
++                );
++            },
++
+     # And now, declarations:
+     
+     'Attlist' => sub {
+        return unless $self->{'_store_declarations'};
+        shift;
+-       (
+-        @stack ? $stack[-1] : $self
+-       )->push_content(
+-         $self->{'_element_class'}->new('~declaration',
+-          'text' => join ' ', 'ATTLIST', @_
++                ( @stack ? $stack[-1] : $self )->push_content(
++                    $self->{'_element_class'}->new(
++                        '~declaration',
++                        'text' => join ' ',
++                        'ATTLIST', @_
+          )
+        );
+        return;
+@@ -80,11 +109,11 @@
+     'Element' => sub {
+        return unless $self->{'_store_declarations'};
+        shift;
+-       (
+-        @stack ? $stack[-1] : $self
+-       )->push_content(
+-         $self->{'_element_class'}->new('~declaration',
+-          'text' => join ' ', 'ELEMENT', @_
++                ( @stack ? $stack[-1] : $self )->push_content(
++                    $self->{'_element_class'}->new(
++                        '~declaration',
++                        'text' => join ' ',
++                        'ELEMENT', @_
+          )
+        );
+        return;
+@@ -93,17 +122,32 @@
+     'Doctype' => sub {
+        return unless $self->{'_store_declarations'};
+        shift;
+-       (
+-        @stack ? $stack[-1] : $self
+-       )->push_content(
+-         $self->{'_element_class'}->new('~declaration',
+-          'text' => join ' ', 'DOCTYPE', @_
++                ( @stack ? $stack[-1] : $self )->push_content(
++                    $self->{'_element_class'}->new(
++                        '~declaration',
++                        'text' => join ' ',
++                        'DOCTYPE', @_
+          )
+        );
         return;
      },
      
 -  });
-+    'Entity' => sub {
-+       return unless $self->{'_store_declarations'};
-+       shift;
-+       (
-+        @stack ? $stack[-1] : $self
-+       )->push_content(
-+         $self->{'_element_class'}->new('~declaration',
-+          'text' => join ' ', 'ENTITY', @_
-+         )
-+       );
-+       return;
-+    },
-+  },
-+  'NoExpand' => $self->{'NoExpand'},
-+  'ErrorContext' => $self->{'ErrorContext'}
-+  );
++            'Entity' => sub {
++                return unless $self->{'_store_declarations'};
++                shift;
++                ( @stack ? $stack[-1] : $self )->push_content(
++                    $self->{'_element_class'}->new(
++                        '~declaration',
++                        'text' => join ' ',
++                        'ENTITY', @_
++                    )
++                );
++                return;
++            },
++        },
++        'NoExpand'     => $self->{'NoExpand'},
++        'ErrorContext' => $self->{'ErrorContext'}
++    );
    
    return $self;
  }
-Only in XML-TreeBuilder-patched/lib/XML: .TreeBuilder.pm.swp
-diff -rubB --exclude=.svn XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
---- XML-TreeBuilder-3.09/t/10main.t	2004-06-11 14:22:53.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t	2008-10-15 12:17:13.000000000 +1000
-@@ -21,6 +21,7 @@
- 
- my $y = XML::Element->new_from_lol(
-  ['Gee',
-+   { 'NoExpand' => '0', 'ErrorContext' => '0'},
-    ['~comment', {'text' => ' myorp '}],
-    ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
-    ['lor'],
-@@ -29,8 +30,7 @@
+@@ -110,15 +155,15 @@
+ #==========================================================================
+ sub _elem # universal accessor...
+ {
+-  my($self, $elem, $val) = @_;
++    my ( $self, $elem, $val ) = @_;
+   my $old = $self->{$elem};
+   $self->{$elem} = $val if defined $val;
+   return $old;
+ }
+ 
+-sub store_comments { shift->_elem('_store_comments', @_); }
+-sub store_declarations { shift->_elem('_store_declarations', @_); }
+-sub store_pis      { shift->_elem('_store_pis', @_); }
++sub store_comments     { shift->_elem( '_store_comments',     @_ ); }
++sub store_declarations { shift->_elem( '_store_declarations', @_ ); }
++sub store_pis          { shift->_elem( '_store_pis',          @_ ); }
+ 
+ #==========================================================================
+ 
+diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
+--- XML-TreeBuilder-3.09/t/10main.t	2009-09-28 14:00:50.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 14:00:54.000000000 +1000
+@@ -2,7 +2,7 @@
+ # Time-stamp: "2004-06-10 20:22:53 ADT" 
+ 
+ use Test;
+-BEGIN { plan tests => 3 }
++BEGIN { plan tests => 4 }
+ 
+ use XML::TreeBuilder;
+ 
+@@ -29,8 +29,7 @@
   ]
  );
  
@@ -108,3 +237,31 @@ diff -rubB --exclude=.svn XML-TreeBuilde
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
+@@ -43,6 +44,27 @@
+ $x->delete;
+ $y->delete;
+ 
++$x = XML::TreeBuilder->new({ 'NoExpand' => "1", 'ErrorContext' => "2" });
++$x->store_comments(1);
++$x->store_pis(1);
++$x->store_declarations(1);
++$x->parse(
++  qq{<!-- myorp --><Gee><foo Id="me" xml:foo="lal">Hello World</foo>} .
++  qq{<lor/><!-- foo --></Gee><!-- glarg -->}
++);
++
++$y = XML::Element->new_from_lol(
++ ['Gee',
++   ['~comment', {'text' => ' myorp '}],
++   ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
++   ['lor'],
++   ['~comment', {'text' => ' foo '}],
++   ['~comment', {'text' => ' glarg '}],
++ ]
++);
++
++ok($x->same_as($y));
++
+ ok 1;
+ print "# Bye from ", __FILE__, "\n";
+ 


Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/F-10/perl-XML-TreeBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-TreeBuilder.spec	15 Oct 2008 03:29:05 -0000	1.2
+++ perl-XML-TreeBuilder.spec	28 Sep 2009 23:44:22 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Parser that builds a tree of XML::Element objects
 Name:		perl-XML-TreeBuilder
 Version:	3.09
-Release:	11%{?dist}
+Release:	16%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/XML-TreeBuilder/
@@ -50,6 +50,21 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{perl_vendorlib}/XML/
 
 %changelog
+* Tue Sep 29 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-16
+- Stupid man! Don't eat entities :(
+
+* Mon Sep 28 2009  Jeff Fearn <jfearn at redhat.com> - 3.09-15
+- Always remove NoExpand and ErrorContext from output
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.09-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Mar 16 2009 Jeff Fearn <jfearn at redhat.com> - 3.09-13
+- Remove NoExpand and ErrorContext from output if they aren't set.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.09-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Oct 15 2008 Jeff Fearn <jfearn at redhat.com> - 3.09-11
 - Add ErrorContext pass through
 - Fix crash on Entity declaration. BZ #461557



From kyle at fedoraproject.org  Mon Sep 28 23:50:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 28 Sep 2009 23:50:53 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1129, 1.1130 kernel.spec, 1.1812,
	1.1813 linux-2.6-crash-driver.patch, 1.15, 1.16 sources, 1.1087,
	1.1088 upstream, 1.1001, 1.1002 patch-2.6.31-git18.bz2.sign, 1.1, NONE
Message-ID: <20090928235053.A62F911C0423@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1919

Modified Files:
	.cvsignore kernel.spec linux-2.6-crash-driver.patch sources 
	upstream 
Added Files:
	patch-2.6.32-rc1.bz2.sign 
Removed Files:
	patch-2.6.31-git18.bz2.sign 
Log Message:
* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.32-rc1
- rebased crash-driver patchset, ia64_ksyms.c conflicts. move x86 crash.h
  file to the right place.
- full changelog forthcoming & to fedora-kernel-list.



--- NEW FILE patch-2.6.32-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKv+bByGugalF9Dw4RAklMAKCKD4wOVPC0iK6cRAEFFavNILKY1QCfXo4o
UrAmA57sdC4SMI48GbHN+fw=
=aLuQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1129
retrieving revision 1.1130
diff -u -p -r1.1129 -r1.1130
--- .cvsignore	28 Sep 2009 05:09:48 -0000	1.1129
+++ .cvsignore	28 Sep 2009 23:50:51 -0000	1.1130
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31-git18.bz2
+patch-2.6.32-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1812
retrieving revision 1.1813
diff -u -p -r1.1812 -r1.1813
--- kernel.spec	28 Sep 2009 22:57:23 -0000	1.1812
+++ kernel.spec	28 Sep 2009 23:50:52 -0000	1.1813
@@ -59,9 +59,9 @@ 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 0
+%define rcrev 1
 # The git snapshot level
-%define gitrev 18
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1986,6 +1986,12 @@ fi
 
 %changelog
 * Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.32-rc1
+- rebased crash-driver patchset, ia64_ksyms.c conflicts. move x86 crash.h
+  file to the right place.
+- full changelog forthcoming & to fedora-kernel-list.
+
+* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
 - sick of rejects.
 
 * Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-crash-driver.patch:
 arch/ia64/include/asm/crash.h |   90 +++++++++++++++++++++++++++++
 arch/ia64/kernel/ia64_ksyms.c |    3 
 arch/x86/include/asm/crash.h  |   75 ++++++++++++++++++++++++
 arch/x86/mm/ioremap.c         |    1 
 drivers/char/Kconfig          |    2 
 drivers/char/Makefile         |    2 
 drivers/char/crash.c          |  128 ++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 301 insertions(+)

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- linux-2.6-crash-driver.patch	9 Apr 2009 14:04:41 -0000	1.15
+++ linux-2.6-crash-driver.patch	28 Sep 2009 23:50:52 -0000	1.16
@@ -95,24 +95,105 @@ index 0000000..541af84
 +
 +#endif /* _ASM_IA64_CRASH_H */
 diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 6da1f20..2984fb3 100644
+index 14d39e3..cf3d040 100644
 --- a/arch/ia64/kernel/ia64_ksyms.c
 +++ b/arch/ia64/kernel/ia64_ksyms.c
-@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+@@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
  #include <asm/unwind.h>
  EXPORT_SYMBOL(unw_init_running);
  
 +#include <linux/efi.h>
 +EXPORT_SYMBOL_GPL(efi_mem_type);
 +
- #ifdef ASM_SUPPORTED
- # ifdef CONFIG_SMP
- #  if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+ #if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)
+ extern void esi_call_phys (void);
+ EXPORT_SYMBOL_GPL(esi_call_phys);
+diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/arch/x86/include/asm/crash.h
+@@ -0,0 +1,75 @@
++#ifndef _ASM_I386_CRASH_H
++#define _ASM_I386_CRASH_H
++
++/*
++ * linux/include/asm-i386/crash.h
++ *
++ * Copyright (c) 2004 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, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <asm/mmzone.h>
++
++extern int page_is_ram(unsigned long);
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	void *vaddr;
++
++	pfn = (unsigned long)(offset >> PAGE_SHIFT);
++
++	if (!page_is_ram(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
++		return NULL;
++	}
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	vaddr = kmap(page);
++	if (!vaddr) {
++		printk(KERN_INFO
++		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
++			pfn, (unsigned long)page);
++		return NULL;
++	}
++
++	*pp = page;
++	return (vaddr + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	kunmap(page);
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_I386_CRASH_H */
 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index d4c4307..d1c968f 100644
+index 334e63c..8e1ccbc 100644
 --- a/arch/x86/mm/ioremap.c
 +++ b/arch/x86/mm/ioremap.c
-@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+@@ -60,6 +60,7 @@ int page_is_ram(unsigned long pagenr)
  	}
  	return 0;
  }
@@ -121,10 +202,10 @@ index d4c4307..d1c968f 100644
  /*
   * Fix up the linear direct mapping of the kernel to avoid cache attribute
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 43d6ba8..0d81c9a 100644
+index 08a6f50..8bc5e9a 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
-@@ -460,6 +460,8 @@ config LEGACY_PTYS
+@@ -484,6 +484,8 @@ config LEGACY_PTYS
  	  security.  This option enables these legacy devices; on most
  	  systems, it is safe to say N.
  
@@ -134,10 +215,10 @@ index 43d6ba8..0d81c9a 100644
  config LEGACY_PTY_COUNT
  	int "Maximum number of legacy PTY in use"
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 438f713..1b7767b 100644
+index 19a79dd..0bee860 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+@@ -112,6 +112,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
  obj-$(CONFIG_JS_RTC)		+= js-rtc.o
  js-rtc-y = rtc.o
  
@@ -280,84 +361,3 @@ index 0000000..e5437de
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
-diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
-new file mode 100644
-index 0000000..dfcc006
---- /dev/null
-+++ b/include/asm-x86/crash.h
-@@ -0,0 +1,75 @@
-+#ifndef _ASM_I386_CRASH_H
-+#define _ASM_I386_CRASH_H
-+
-+/*
-+ * linux/include/asm-i386/crash.h
-+ *
-+ * Copyright (c) 2004 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, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/mm.h>
-+#include <linux/highmem.h>
-+#include <asm/mmzone.h>
-+
-+extern int page_is_ram(unsigned long);
-+
-+static inline void *
-+map_virtual(u64 offset, struct page **pp)
-+{
-+	struct page *page;
-+	unsigned long pfn;
-+	void *vaddr;
-+
-+	pfn = (unsigned long)(offset >> PAGE_SHIFT);
-+
-+	if (!page_is_ram(pfn)) {
-+		printk(KERN_INFO
-+		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
-+		return NULL;
-+	}
-+
-+	if (!pfn_valid(pfn)) {
-+		printk(KERN_INFO
-+		    "crash memory driver: invalid pfn: %lx )\n", pfn);
-+		return NULL;
-+	}
-+
-+	page = pfn_to_page(pfn);
-+
-+	vaddr = kmap(page);
-+	if (!vaddr) {
-+		printk(KERN_INFO
-+		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
-+			pfn, (unsigned long)page);
-+		return NULL;
-+	}
-+
-+	*pp = page;
-+	return (vaddr + (offset & (PAGE_SIZE-1)));
-+}
-+
-+static inline void unmap_virtual(struct page *page) 
-+{ 
-+	kunmap(page);
-+}
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _ASM_I386_CRASH_H */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1087
retrieving revision 1.1088
diff -u -p -r1.1087 -r1.1088
--- sources	28 Sep 2009 05:09:49 -0000	1.1087
+++ sources	28 Sep 2009 23:50:52 -0000	1.1088
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-53e607f1d8eab73b69d3ad6ebfd1bc71  patch-2.6.31-git18.bz2
+9485dc509d52494d3b323161ed8a6f64  patch-2.6.32-rc1.bz2.sign


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -p -r1.1001 -r1.1002
--- upstream	28 Sep 2009 05:09:49 -0000	1.1001
+++ upstream	28 Sep 2009 23:50:52 -0000	1.1002
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31-git18.bz2
+patch-2.6.32-rc1.bz2


--- patch-2.6.31-git18.bz2.sign DELETED ---



From kyle at fedoraproject.org  Mon Sep 28 23:57:54 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 28 Sep 2009 23:57:54 +0000 (UTC)
Subject: rpms/kernel/devel sources,1.1088,1.1089
Message-ID: <20090928235754.4EA2011C02BD@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4627

Modified Files:
	sources 
Log Message:
oops. -ETOOTIRED.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1088
retrieving revision 1.1089
diff -u -p -r1.1088 -r1.1089
--- sources	28 Sep 2009 23:50:52 -0000	1.1088
+++ sources	28 Sep 2009 23:57:53 -0000	1.1089
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-9485dc509d52494d3b323161ed8a6f64  patch-2.6.32-rc1.bz2.sign
+b6c7c6545e30099c35c04a91ada8d779  patch-2.6.32-rc1.bz2



From mclasen at fedoraproject.org  Tue Sep 29 00:10:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 00:10:55 +0000 (UTC)
Subject: rpms/control-center/devel fix-background-tooltips.patch, NONE,
	1.1 control-center.spec, 1.491, 1.492
Message-ID: <20090929001056.2C3FA11C02BD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7579

Modified Files:
	control-center.spec 
Added Files:
	fix-background-tooltips.patch 
Log Message:
fix tooltips on the background tab


fix-background-tooltips.patch:
 appearance-desktop.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE fix-background-tooltips.patch ---
--- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c	2009-09-28 20:01:16.896708487 -0400
+++ hacked/capplets/appearance/appearance-desktop.c	2009-09-28 19:56:21.977442977 -0400
@@ -1246,8 +1246,6 @@
   GtkWidget *widget, *box, *button;
   char *url;
 
-  g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
-
   data->wp_update_gconf = TRUE;
 
   data->wp_uris = NULL;
@@ -1387,6 +1385,7 @@
                     (GCallback) wp_props_wp_selected, data);
   g_signal_connect (data->wp_view, "query-tooltip",
                     (GCallback) wp_view_tooltip_cb, data);
+  gtk_widget_set_has_tooltip (data->wp_view, TRUE);
 
   wp_set_sensitivities (data);
 


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -p -r1.491 -r1.492
--- control-center.spec	25 Sep 2009 00:21:30 -0000	1.491
+++ control-center.spec	29 Sep 2009 00:10:54 -0000	1.492
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -53,6 +53,9 @@ Patch46: no-tweaks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=590349
 Patch47: save-as.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596369
+Patch50: fix-background-tooltips.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -186,6 +189,7 @@ for the GNOME desktop.
 %patch30 -p1 -b .default-layout-toggle
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
+%patch50 -p1 -b .fix-background-tooltips
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -373,6 +377,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-10
+- Fix tooltips on the background tab
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-9
 - Drop the notification theme patch
 



From hadess at fedoraproject.org  Tue Sep 29 01:12:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 01:12:23 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.21,
	1.22 gnome-bluetooth.spec, 1.92, 1.93 sources, 1.22, 1.23
Message-ID: <20090929011223.B7D6411C02BD@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6087

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	19 Sep 2009 14:52:40 -0000	1.21
+++ .cvsignore	29 Sep 2009 01:12:21 -0000	1.22
@@ -1 +1 @@
-gnome-bluetooth-2.28.0.tar.bz2
+gnome-bluetooth-2.28.1.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- gnome-bluetooth.spec	19 Sep 2009 14:52:40 -0000	1.92
+++ gnome-bluetooth.spec	29 Sep 2009 01:12:22 -0000	1.93
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.0
+Version:	2.28.1
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -194,6 +194,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Sat Sep 19 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	19 Sep 2009 14:52:40 -0000	1.22
+++ sources	29 Sep 2009 01:12:22 -0000	1.23
@@ -1 +1 @@
-0d10dbdb53d302aa3e34e391ef6b142b  gnome-bluetooth-2.28.0.tar.bz2
+a94d95bf4b3a0084bd6eb397bbe92b10  gnome-bluetooth-2.28.1.tar.bz2



From mtasaka at fedoraproject.org  Tue Sep 29 01:22:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 01:22:12 +0000 (UTC)
Subject: rpms/cmigemo/devel cmigemo.spec,1.10,1.11
Message-ID: <20090929012212.C57C011C02BD@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cmigemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9609/cmigemo/devel

Modified Files:
	cmigemo.spec 
Log Message:
Update skkdic for F12Beta


Index: cmigemo.spec
===================================================================
RCS file: /cvs/extras/rpms/cmigemo/devel/cmigemo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cmigemo.spec	4 Aug 2009 18:29:52 -0000	1.10
+++ cmigemo.spec	29 Sep 2009 01:22:12 -0000	1.11
@@ -14,7 +14,7 @@
 
 Name:		cmigemo
 Version:	%{mainver}
-Release:	%{rel}%{?dist}.3
+Release:	%{rel}%{?dist}.4
 Summary:	C interface of Ruby/Migemo Japanese incremental search tool
 
 Group:		System Environment/Libraries
@@ -137,6 +137,9 @@ cd ..
 %{_libdir}/libmigemo.so
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-12: Rebuild for updated skkdic (for F12Beta)
+
 * Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-12: Rebuild for updated skkdic (for F12Alpha)
 



From mtasaka at fedoraproject.org  Tue Sep 29 01:22:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 01:22:13 +0000 (UTC)
Subject: rpms/skkdic/devel .cvsignore, 1.4, 1.5 skkdic.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090929012213.7C03A11C02BD@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/skkdic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9609/skkdic/devel

Modified Files:
	.cvsignore skkdic.spec sources 
Log Message:
Update skkdic for F12Beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skkdic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Aug 2009 18:29:53 -0000	1.4
+++ .cvsignore	29 Sep 2009 01:22:12 -0000	1.5
@@ -1 +1 @@
-skkdic-20090805T0306.tar.bz2
+skkdic-20090929T0800.tar.bz2


Index: skkdic.spec
===================================================================
RCS file: /cvs/extras/rpms/skkdic/devel/skkdic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- skkdic.spec	4 Aug 2009 18:29:53 -0000	1.7
+++ skkdic.spec	29 Sep 2009 01:22:13 -0000	1.8
@@ -1,5 +1,5 @@
-%global	cvsDATE	20090805
-%global	cvsTIME	0306
+%global	cvsDATE	20090929
+%global	cvsTIME	0800
 
 Summary:	Dictionaries for SKK (Simple Kana-Kanji conversion program)
 Name:		skkdic
@@ -52,6 +52,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 20090929-1.T0800
+- Update for F12Beta
+
 * Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 20090805-1.T0306
 - Update for F12Alpha
 - A bit clean up for spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skkdic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Aug 2009 18:29:53 -0000	1.4
+++ sources	29 Sep 2009 01:22:13 -0000	1.5
@@ -1 +1 @@
-7bd871b047f5818dc254e7b7d5647d01  skkdic-20090805T0306.tar.bz2
+4a9b6de7d9f2f0a0797c055e9315e479  skkdic-20090929T0800.tar.bz2



From bskeggs at fedoraproject.org  Tue Sep 29 01:38:16 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 29 Sep 2009 01:38:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.47,
	1.48 nouveau-bicubic-2x.patch, 1.15,
	1.16 nouveau-multiple-xserver.patch, 1.17,
	1.18 nouveau-tile7000.patch, 1.5, 1.6 sources, 1.48,
	1.49 xorg-x11-drv-nouveau.spec, 1.60, 1.61
Message-ID: <20090929013816.E7C9711C02BD@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15740

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Sep 29 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-13.20090929gitdd8339f
- fix driver to work again with recent EXA changes




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	25 Sep 2009 07:17:35 -0000	1.47
+++ .cvsignore	29 Sep 2009 01:38:15 -0000	1.48
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090924gitde0b095.tar.bz2
+xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nouveau-bicubic-2x.patch	25 Sep 2009 07:17:35 -0000	1.15
+++ nouveau-bicubic-2x.patch	29 Sep 2009 01:38:15 -0000	1.16
@@ -1,4 +1,4 @@
-From cdfb2dd95e0c70d0467d6c1c21e1b2a21e8f6d58 Mon Sep 17 00:00:00 2001
+From 0c60f12c250e244d5d6a245c0df3b941a176aa59 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nouveau-multiple-xserver.patch	25 Sep 2009 07:17:35 -0000	1.17
+++ nouveau-multiple-xserver.patch	29 Sep 2009 01:38:15 -0000	1.18
@@ -1,4 +1,4 @@
-From 4a82ffa7ea561a68807a1b53e8ebb2f710c3e4a0 Mon Sep 17 00:00:00 2001
+From e81556ab7611efd9977f16a00ee09a194eb5bce1 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] f12: hack to suppor
  1 files changed, 57 insertions(+), 27 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 9317b5e..37a8da7 100644
+index 879d971..e57a696 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -48,7 +48,7 @@ index 9317b5e..37a8da7 100644
  	ret = drmDropMaster(nouveau_device(pNv->dev)->fd);
  	if (ret)
  		ErrorF("Error dropping master: %d\n", ret);
-@@ -1185,6 +1191,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1187,6 +1193,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  
  
  static Bool
@@ -101,7 +101,7 @@ index 9317b5e..37a8da7 100644
  NVMapMem(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
-@@ -1224,6 +1276,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1226,6 +1278,9 @@ NVMapMem(ScrnInfoPtr pScrn)
  		goto skip_offscreen_gart;
  
  	if (!pNv->exa_driver_pixmaps) {
@@ -111,7 +111,7 @@ index 9317b5e..37a8da7 100644
  		size = (pNv->VRAMPhysicalSize / 2) - size;
  
  		if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1240,6 +1295,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1242,6 +1297,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  			return FALSE;
  		}
  
@@ -119,7 +119,7 @@ index 9317b5e..37a8da7 100644
  		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
  			   "Allocated %dMiB VRAM for offscreen pixmaps\n",
  			   (uint32_t)(pNv->offscreen->size >> 20));
-@@ -1249,32 +1305,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1251,32 +1307,6 @@ NVMapMem(ScrnInfoPtr pScrn)
  		nouveau_bo_unmap(pNv->offscreen);
  	}
  

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-tile7000.patch	25 Sep 2009 07:17:35 -0000	1.5
+++ nouveau-tile7000.patch	29 Sep 2009 01:38:15 -0000	1.6
@@ -1,4 +1,4 @@
-From 9ca71674c32fec89576e8d469a07b2cbab542e95 Mon Sep 17 00:00:00 2001
+From 682b24f8d6fb5053ed8b89cacaaca4dd25c03a16 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
@@ -32,7 +32,7 @@ index 82b86c4..1157221 100644
  		pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
  	} else {
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 37a8da7..b2a24d7 100644
+index e57a696..e0c1c10 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
@@ -54,9 +54,9 @@ index 37a8da7..b2a24d7 100644
  	/* Check if KMS is enabled before we do anything, we don't want to
  	 * go stomping on registers behind its back
  	 */
-@@ -1254,7 +1259,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1256,7 +1261,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  	size = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
- 	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
+ 	if (pNv->Architecture >= NV_ARCH_50 && pNv->tiled_scanout) {
  		tile_mode = 4;
 -		tile_flags = pScrn->bitsPerPixel == 16 ? 0x7000 : 0x7a00;
 +		tile_flags = (pScrn->bitsPerPixel == 16 || pNv->pf_ok) ? 0x7000 : 0x7a00;
@@ -64,7 +64,7 @@ index 37a8da7..b2a24d7 100644
  	} else {
  		size *= pScrn->virtualY;
 diff --git a/src/nv_type.h b/src/nv_type.h
-index 68c415f..e24f30c 100644
+index ddf121c..6e1f2f3 100644
 --- a/src/nv_type.h
 +++ b/src/nv_type.h
 @@ -113,6 +113,8 @@ typedef struct _NVRec {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	25 Sep 2009 07:17:35 -0000	1.48
+++ sources	29 Sep 2009 01:38:15 -0000	1.49
@@ -1 +1 @@
-448ccbf11d9cbe2c7ed19bd5669baf10  xf86-video-nouveau-0.0.15-20090924gitde0b095.tar.bz2
+e98437442d84c9ca595adc6ae9665eff  xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- xorg-x11-drv-nouveau.spec	25 Sep 2009 07:17:35 -0000	1.60
+++ xorg-x11-drv-nouveau.spec	29 Sep 2009 01:38:15 -0000	1.61
@@ -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 20090924
-%define git_version de0b095
+%define gitdate 20090929
+%define git_version dd8339f
 
 %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:   12.%{snapshot}%{?dist}
+Release:   13.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Sep 29 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-13.20090929gitdd8339f
+- fix driver to work again with recent EXA changes
+
 * Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-12.20090924gitde0b095
 - G80: small performance fix
 



From mclasen at fedoraproject.org  Tue Sep 29 02:22:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 02:22:34 +0000 (UTC)
Subject: rpms/control-center/devel apply-extra-translations, NONE,
	1.1 extra-translations, NONE, 1.1 control-center.spec, 1.492, 1.493
Message-ID: <20090929022234.78A4B11C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31312

Modified Files:
	control-center.spec 
Added Files:
	apply-extra-translations extra-translations 
Log Message:
Steal translations



--- NEW FILE apply-extra-translations ---
#! /bin/bash

# This script is a hack to extract translations for "Make Default" from
# the gnome-power-manager translations and append them to the
# gnome-control-center translations.
#
# To apply translations, use:
# ./apply-extra-translations --apply gnome-control-center-2.28.0 extra-translations
#
# To update the translations, use:
# ./apply-extra-translations --update gnome-control-center-2.28.0 extra-translations

if [ $# -ne 3 ]; then
  echo "Usage: apply-extra-translations [--update|--apply] DIRECTORY FILE"
  exit 1
fi

mode=$1
dir=$2
translations=$3

if [ "$mode" = "--update" ]; then
  if ! rpm -q gnome-power-manager >/dev/null ; then
    echo "Please install gnome-power-manager"
    exit 1
  fi
  for i in `cat $dir/po/LINGUAS`; do
    msgstr=`env LANGUAGE="$i.UTF-8" gettext --domain=gnome-power-manager "Make Default"`
    echo "$i:$msgstr"
  done >$translations

elif [ "$mode" = "--apply" ]; then

  for i in `cat $dir/po/LINGUAS`; do
    msgstr=`grep "^$i:" $translations | cut -d: -f2`
    if [ "$msgstr" != "Make Default" ]; then
      cat >>$dir/po/$i.po <<EOF

msgid "Make Default"
msgstr "$msgstr"
EOF
    fi
  done

fi

exit


--- NEW FILE extra-translations ---
ar:????? ???????
as:??????
ast:Facer predeterminao
be:?????????????
be at latin:?????????????
bg:?? ? ??????????
bn:?????? ?????? ??????? ????
bn_IN:?????? ?????? ??????? ????
ca:Marca com a predeterminat
ca at valencia:Marca com a predeterminat
cs:Nastavit jako v?choz?
da:G?r til forvalg
de:Als Vorgabe verwenden
el:?? ????? ?????????????
es:Hacer predeterminado
et:M??ra vaikimisi
eu:Lehenetsi
fi:Aseta oletukseksi
fr:D?finir par d?faut
ga:Socraigh mar R?amhshocr?
gl:Definir como predeterminado
gu:?????? ?????
he:???? ?????? ????
hi:?????? ?????
hu:Be?ll?t?s alap?rtelmezettk?nt
it:Rendi predefinito
ja:?????????
kn:??????????????????
ko:????? ??
lt:Padaryti numatyt?ja
lv:Padar?t par noklus?to
mai:?????? ?????
ml:??????????
mr:?????? ????
nb:Sett til forvalg
nl:Als standaard instellen
or:????? ????? ??
pa:?????? ????
pl:Ustaw domy?lnym
pt:Tornar Omiss?o
pt_BR:Tornar padr?o
ro:Configureaz? ca implicit
ru:?????????? ?? ?????????
sl:Naredi privzeto
sr:??????? ??? ?????????????
sr at latin:??????? ??? ?????????????
sv:G?r till standard
ta:???????????? ?????
te:??????? ????
th:????????????????
tr:?_ntan?ml? Yap
uk:??????? ???????
vi:L?m m?c ??nh
zh_CN:????
zh_HK:?????
zh_TW:?????


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- control-center.spec	29 Sep 2009 00:10:54 -0000	1.492
+++ control-center.spec	29 Sep 2009 02:22:33 -0000	1.493
@@ -24,12 +24,14 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 Source: http://download.gnome.org/sources/gnome-control-center/2.28/gnome-control-center-%{version}.tar.bz2
 Source1: org.gnome.control-center.defaultbackground.policy
+Source2: apply-extra-translations
+Source3: extra-translations
 
 Patch3: control-center-2.19.3-no-gnome-common.patch
 # http://bugzilla.gnome.org/536531
@@ -215,6 +217,9 @@ sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' hel
 # libtool doesn't make this easy, so we do it the hard way
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
+# patch in translations for "Make Default", taken from gnome-power-manager
+%{SOURCE2} --apply . %{SOURCE3}
+
 make %{?_smp_mflags}
 
 %install
@@ -377,6 +382,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
+- Steal translations for "Make Default" from gnome-power-manager
+
 * Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-10
 - Fix tooltips on the background tab
 



From phuang at fedoraproject.org  Tue Sep 29 02:28:34 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 29 Sep 2009 02:28:34 +0000 (UTC)
Subject: rpms/scim/devel scim.spec, 1.145, 1.146 scim-1.4.9-fix-dlclose.patch,
	1.1, NONE
Message-ID: <20090929022834.74A2A11C00EC@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv487

Modified Files:
	scim.spec 
Removed Files:
	scim-1.4.9-fix-dlclose.patch 
Log Message:
Remove workaround patch added in 1.4.9-3


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- scim.spec	27 Aug 2009 06:16:24 -0000	1.145
+++ scim.spec	29 Sep 2009 02:28:34 -0000	1.146
@@ -1,6 +1,6 @@
 Name:      scim
 Version:   1.4.9
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -43,7 +43,6 @@ Patch29:   scim-1.4.7-bz462820.patch
 Patch30:   scim-1.4.7-imdkit-read-property-properly.patch
 Patch31:   scim-1.4.7-syslibltdl.patch
 Patch32:   scim-1.4.8-fix-dlopen.patch
-Patch33:   scim-1.4.9-fix-dlclose.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -175,7 +174,6 @@ cp -p %{SOURCE4} configs/global
 %patch30 -p1 -b .30-bz466657
 %patch31 -p1 -b .31-sysltdl
 %patch32 -E -p1 -b .fix-dlopen
-%patch33 -E -p1 -b .fix-dlclose
 
 # patch17 touches configure.ac and Makefile.am
 ./bootstrap
@@ -301,7 +299,11 @@ fi
 
 
 %changelog
-* Thu Aug 27 2009 Huang Peng <phuang at redhat.com> - 1.4.9-3
+* Tue Sep 29 2009 Peng Huang <phuang at redhat.com> - 1.4.9-4
+- Remove workaround patch added in 1.4.9-3.
+- The bug 517001 has been fixed in glibc.
+
+* Thu Aug 27 2009 Peng Huang <phuang at redhat.com> - 1.4.9-3
 - Fix bug 517001 dlopen/dlclose of im-scim.so causes segfault.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.9-2
@@ -312,7 +314,7 @@ fi
 - ta.po is now upstream and scim-1.4.7-translation-update-431995.patch
   no longer needed
 
-* Wed Mar 25 2009 Huang Peng <phuang at redhat.com> - 1.4.8-3
+* Wed Mar 25 2009 Peng Huang <phuang at redhat.com> - 1.4.8-3
 - Use lt_dlopenadvise to replace lt_dlopenext to fix bug 491841
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.8-2
@@ -330,20 +332,20 @@ fi
 * Tue Dec  2 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-37
 - make libs subpackage own its dirs for multilib (#473664)
 
-* Fri Nov 21 2008 Huang Peng <phuang at redhat.com> - 1.4.7-36
+* Fri Nov 21 2008 Peng Huang <phuang at redhat.com> - 1.4.7-36
 - Redownload scim-1.4.7.tar.gz from upstream to fix BADSOURCE.
 
-* Thu Oct 16 2008 Huang Peng <phuang at redhat.com> - 1.4.7-35
+* Thu Oct 16 2008 Peng Huang <phuang at redhat.com> - 1.4.7-35
 - Read data from WindowProperty properly (#466657) by Tagoh.
 
 * Fri Oct 10 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-34
 - require im-chooser (#466252)
 - add scim-thai to the Thai meta package
 
-* Sun Oct 05 2008 Huang Peng <phuang at redhat.com> - 1.4.7-33
+* Sun Oct 05 2008 Peng Huang <phuang at redhat.com> - 1.4.7-33
 - Add ICON="/usr/share/scim/icons/trademark.png" in xinput-scim
 
-* Fri Sep 19 2008 Huang Peng <phuang at redhat.com> - 1.4.7-32
+* Fri Sep 19 2008 Peng Huang <phuang at redhat.com> - 1.4.7-32
 - Resolve: bug 462820 by Parag.
 
 * Wed Aug 27 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-31.fc10
@@ -354,13 +356,13 @@ fi
 * Tue Aug 26 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-30.fc10
 - restore scim_x11_frontend-ic-focus-LTC27940-215953.patch (#440163)
 
-* Sat Aug 02 2008 Huang Peng <phuang at redhat.com> - 1.4.7-29.fc10
+* Sat Aug 02 2008 Peng Huang <phuang at redhat.com> - 1.4.7-29.fc10
 - add patch scim-1.4.7-xim-wrong-format.patch to fix bug 457566 by Akira TAGOH.
 
-* Thu Jul 17 2008 Huang Peng <phuang at redhat.com> - 1.4.7-28.fc10
+* Thu Jul 17 2008 Peng Huang <phuang at redhat.com> - 1.4.7-28.fc10
 - add patch scim-1.4.7-menu-pos.patch to fix bug 444711.
 
-* Thu Jul 17 2008 Huang Peng <phuang at redhat.com> - 1.4.7-27.fc10
+* Thu Jul 17 2008 Peng Huang <phuang at redhat.com> - 1.4.7-27.fc10
 - add patch scim-1.4.7-timeout.patch to fix bug 444150.
 - add patch scim-1.4.7-trayicon.patch to fix bug 447848.
 
@@ -385,45 +387,45 @@ fi
 - updated translations for de, it, ja, ko, pa, zh_CN (Red Hat L10n Team)
 - scim-1.4.7-ja-sinhala-236715.patch is no longer required
 
-* Wed Apr 02 2008 Huang Peng <phuang at redhat.com> - 1.4.7-21.fc9
+* Wed Apr 02 2008 Peng Huang <phuang at redhat.com> - 1.4.7-21.fc9
 - Update scim.conf to check qtimm in qt4 folder for qtimm.
 - Re-add scim-1.4.7-fix-capslock.patch to fix bug #431222.
 
-* Thu Mar 20 2008 Huang Peng <phuang at redhat.com> - 1.4.7-20.fc9
+* Thu Mar 20 2008 Peng Huang <phuang at redhat.com> - 1.4.7-20.fc9
 - Replase scim-system-config.patch with scim-system-global.
 
-* Thu Mar 20 2008 Huang Peng <phuang at redhat.com> - 1.4.7-19.fc9
+* Thu Mar 20 2008 Peng Huang <phuang at redhat.com> - 1.4.7-19.fc9
 - Drop scim-system-config.patch and scim-1.4.7-fix-capslock.patch.
 - Ignore capslock mask to fix bug #431222.
 
-* Thu Mar 13 2008 Huang Peng <phuang at redhat.com> - 1.4.7-18.fc9
+* Thu Mar 13 2008 Peng Huang <phuang at redhat.com> - 1.4.7-18.fc9
 - Replace scim-pinyin to scim-python-pinyin for scim-lang-chinese
 
 * Mon Mar 10 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-17.fc9
 - remove the frame around the help text in the help dialog
 
-* Wed Mar 5 2008 Huang Peng <phuang at redhat.com> - 1.4.7-16.fc9
+* Wed Mar 5 2008 Peng Huang <phuang at redhat.com> - 1.4.7-16.fc9
 - Remove scim-restart script for fixing #435889.
 
-* Tue Mar 4 2008 Huang Peng <phuang at redhat.com> - 1.4.7-15.fc9
+* Tue Mar 4 2008 Peng Huang <phuang at redhat.com> - 1.4.7-15.fc9
 - Let scim gtkim context work with gtk plug widget #251878.
 
-* Mon Mar 3 2008 Huang Peng <phuang at redhat.com> - 1.4.7-14.fc9
+* Mon Mar 3 2008 Peng Huang <phuang at redhat.com> - 1.4.7-14.fc9
 - Fix capslock problem #431222.
 
-* Mon Mar 3 2008 Huang Peng <phuang at redhat.com> - 1.4.7-13,fc9
+* Mon Mar 3 2008 Peng Huang <phuang at redhat.com> - 1.4.7-13,fc9
 - Fix fallback problem in gtkim module #235147.
 
-* Tue Feb 26 2008 Huang Peng <phuang at redhat.com> - 1.4.7-12.fc9
+* Tue Feb 26 2008 Peng Huang <phuang at redhat.com> - 1.4.7-12.fc9
 - Update to scim.conf to use /usr/bin/scim to start scim processes.
 
-* Thu Feb 21 2008 Huang Peng <phuang at redhat.com> - 1.4.7-11.fc9
+* Thu Feb 21 2008 Peng Huang <phuang at redhat.com> - 1.4.7-11.fc9
 - Update to scim.conf to make scim can work with imsettings.
 
 * Fri Feb 15 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-10.fc9
 - make Wijesekera the default input method for Sinhala
 
-* Thu Feb 14 2008 Huang Peng <phuang at redhat.com> - 1.4.7-9.fc9
+* Thu Feb 14 2008 Peng Huang <phuang at redhat.com> - 1.4.7-9.fc9
 - remove support locales in gtk im-scim module to avoid gtk automatically
   picking up scim im module.
 - rebuild for gcc43


--- scim-1.4.9-fix-dlclose.patch DELETED ---



From dcbw at fedoraproject.org  Tue Sep 29 02:52:16 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 29 Sep 2009 02:52:16 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.109,
	1.110 NetworkManager.spec, 1.287, 1.288 sources, 1.150, 1.151
Message-ID: <20090929025216.2028B11C00EC@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7595

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Mon Sep 28 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-3.git20090928
- nm: fix connection takeover when carrier is not on
- nm: handle certificate paths (CA chain PEM files are now fully usable)
- nm: defer action for 4 seconds when wired carrier drops
- ifcfg-rh: fix writing WPA passphrases with odd characters
- editor: fix editing of IPv4 settings with new connections (rh #525819)
- editor: fix random crashes when editing due to bad widget refcounting
- applet: debut reworked menu layout (not final yet...)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- .cvsignore	21 Sep 2009 21:24:31 -0000	1.109
+++ .cvsignore	29 Sep 2009 02:52:15 -0000	1.110
@@ -163,3 +163,5 @@ NetworkManager-0.7.996.git20090826.tar.b
 network-manager-applet-0.7.996.git20090826.tar.bz2
 NetworkManager-0.7.996.git20090921.tar.bz2
 network-manager-applet-0.7.996.git20090921.tar.bz2
+NetworkManager-0.7.996.git20090928.tar.bz2
+network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- NetworkManager.spec	24 Sep 2009 01:42:23 -0000	1.287
+++ NetworkManager.spec	29 Sep 2009 02:52:15 -0000	1.288
@@ -9,8 +9,8 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090921
-%define applet_snapshot .git20090921
+%define snapshot .git20090928
+%define applet_snapshot .git20090928-menu-rework
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -342,6 +342,15 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Sep 28 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-3.git20090928
+- nm: fix connection takeover when carrier is not on
+- nm: handle certificate paths (CA chain PEM files are now fully usable)
+- nm: defer action for 4 seconds when wired carrier drops
+- ifcfg-rh: fix writing WPA passphrases with odd characters
+- editor: fix editing of IPv4 settings with new connections (rh #525819)
+- editor: fix random crashes when editing due to bad widget refcounting
+- applet: debut reworked menu layout (not final yet...)
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.7.996-3.git20090921
 - Install GConf schemas
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- sources	21 Sep 2009 21:24:31 -0000	1.150
+++ sources	29 Sep 2009 02:52:15 -0000	1.151
@@ -1,2 +1,2 @@
-da3c5fe3dce54f6a1af72ddbe5d3ea64  NetworkManager-0.7.996.git20090921.tar.bz2
-4df8022dcfe43e7865b0bbbcaaab97ca  network-manager-applet-0.7.996.git20090921.tar.bz2
+e8d776c04616764042ba94f85d51dcaa  NetworkManager-0.7.996.git20090928.tar.bz2
+138060af68f9cdd057f83dcebfb71a50  network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2



From zaitcev at fedoraproject.org  Tue Sep 29 03:00:22 2009
From: zaitcev at fedoraproject.org (Pete Zaitcev)
Date: Tue, 29 Sep 2009 03:00:22 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.15,1.16
Message-ID: <20090929030023.0A9A411C0335@cvs1.fedora.phx.redhat.com>

Author: zaitcev

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9754

Modified Files:
	tabled.spec 
Log Message:
Drop ExcludeArch.



Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tabled.spec	5 Sep 2009 14:11:06 -0000	1.15
+++ tabled.spec	29 Sep 2009 03:00:22 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -23,10 +23,6 @@ BuildRequires:	chunkd-devel >= 0.4
 Requires:	cld >= 0.2.1
 Requires:	chunkd >= 0.4
 
-# chunkd is broken on big-endian... embarrassing!!!
-# FIXME: remove this when chunkd is fixed
-ExcludeArch:	ppc ppc64
-
 %description
 tabled provides an infinitely scalable, lexicographically sorted
 key/value lookup table. Keys cannot exceed 1024 bytes; values can be
@@ -105,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Sep 28 2009 Pete Zaitcev <zaitcev at redhat.com> - 0.3-6
+- Drop ExcludeArch, fixed in bz#514651.
+
 * Sat Sep 05 2009 Caol?n McNamara <caolanm at redhat.com> - 0.3-5
 - rebuild for dependencies
 



From airlied at fedoraproject.org  Tue Sep 29 03:21:21 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 29 Sep 2009 03:21:21 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-4c57edba4.patch, NONE,
	1.1 drm-nouveau.patch, 
	1.60, 1.61 kernel.spec, 1.1838, 1.1839 drm-next-8ef8678c8.patch,
	1.1, NONE
Message-ID: <20090929032121.8854011C00EC@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15573

Modified Files:
	drm-nouveau.patch kernel.spec 
Added Files:
	drm-next-4c57edba4.patch 
Removed Files:
	drm-next-8ef8678c8.patch 
Log Message:
* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-53
- drm-next-4c57edba4.patch: fix r600 dri1 memory leak and r600 bugs


drm-next-4c57edba4.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 |  938 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  607 
 b/drivers/gpu/drm/i915/intel_drv.h                |    7 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  742 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  331 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  105 
 b/drivers/gpu/drm/radeon/avivod.h                 |   69 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1299 -
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  607 
 b/drivers/gpu/drm/radeon/r200.c                   |  455 
 b/drivers/gpu/drm/radeon/r300.c                   |  687 
 b/drivers/gpu/drm/radeon/r300d.h                  |  101 
 b/drivers/gpu/drm/radeon/r420.c                   |  301 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r500_reg.h               |    3 
 b/drivers/gpu/drm/radeon/r520.c                   |    6 
 b/drivers/gpu/drm/radeon/r600.c                   | 1795 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  850 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  784 
 b/drivers/gpu/drm/radeon/r600d.h                  |  661 
 b/drivers/gpu/drm/radeon/radeon.h                 |  357 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  228 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  545 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  413 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  101 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  137 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  682 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |    1 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   85 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  368 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   74 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   80 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   96 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs400.c                  |   56 
 b/drivers/gpu/drm/radeon/rs600.c                  |  106 
 b/drivers/gpu/drm/radeon/rs690.c                  |    4 
 b/drivers/gpu/drm/radeon/rv515.c                  |  524 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  220 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1057 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    4 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  104 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |    7 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  106 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 170 files changed, 36943 insertions(+), 42257 deletions(-)

--- NEW FILE drm-next-4c57edba4.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..8e7b0eb 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...86561 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5499 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  482 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  755 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  421 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1281 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  360 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  257 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  248 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  949 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  769 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  304 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2247 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  810 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  481 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  472 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58719 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- drm-nouveau.patch	25 Sep 2009 07:13:50 -0000	1.60
+++ drm-nouveau.patch	29 Sep 2009 03:21:19 -0000	1.61
@@ -9261,7 +9261,7 @@ new file mode 100644
 index 0000000..3346f49
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,761 @@
+@@ -0,0 +1,755 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -10007,12 +10007,6 @@ index 0000000..3346f49
 +
 +	drm_sysfs_connector_add(connector);
 +
-+	ret = drm_fb_helper_add_connector(connector);
-+	if (ret) {
-+		connector->funcs->destroy(connector);
-+		return ret;
-+	}
-+
 +	if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
 +		ret = nouveau_connector_create_lvds(dev, connector);
 +		if (ret) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1838
retrieving revision 1.1839
diff -u -p -r1.1838 -r1.1839
--- kernel.spec	28 Sep 2009 21:01:12 -0000	1.1838
+++ kernel.spec	29 Sep 2009 03:21:19 -0000	1.1839
@@ -704,7 +704,7 @@ Patch1584: linux-2.6-xen-improvement-to-
 Patch1585: linux-2.6-xen-increase-device-connection-timeout.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next-8ef8678c8.patch
+Patch1812: drm-next-4c57edba4.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1378,7 +1378,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next-8ef8678c8.patch
+ApplyPatch drm-next-4c57edba4.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2074,6 +2074,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-53
+- drm-next-4c57edba4.patch: fix r600 dri1 memory leak and r600 bugs
+
 * Mon Sep 28 2009 Dave Jones <davej at redhat.com> 2.6.31.1-52
 - Use __builtin_object_size to validate the buffer size for copy_from_user
   + associated fixes to various copy_from_user invocations.


--- drm-next-8ef8678c8.patch DELETED ---



From airlied at fedoraproject.org  Tue Sep 29 03:26:31 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 29 Sep 2009 03:26:31 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.31, 1.32 sources, 1.31,
	1.32 xorg-x11-drv-ati.spec, 1.186,
	1.187 r600-fix-exa-crash.patch, 1.1,
	NONE radeon-6.12.1-r600-fb-size.patch, 1.3,
	NONE radeon-powerpc-fix.patch, 1.1, NONE
Message-ID: <20090929032631.4780C11C00EC@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17448

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Removed Files:
	r600-fix-exa-crash.patch radeon-6.12.1-r600-fb-size.patch 
	radeon-powerpc-fix.patch 
Log Message:
* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.5.20090929git7968e1fb8
- rebase to latest upstream for vline fixes and zaphod fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	8 Sep 2009 03:38:52 -0000	1.31
+++ .cvsignore	29 Sep 2009 03:26:30 -0000	1.32
@@ -1 +1 @@
-xf86-video-ati-20090908.tar.xz
+xf86-video-ati-20090929.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	8 Sep 2009 03:38:52 -0000	1.31
+++ sources	29 Sep 2009 03:26:31 -0000	1.32
@@ -1 +1 @@
-673b162543e819092e15cc3aa9648aae  xf86-video-ati-20090908.tar.xz
+55a7141d73902a4d35837f4c59f4e6de  xf86-video-ati-20090929.tar.xz


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- xorg-x11-drv-ati.spec	10 Sep 2009 01:57:37 -0000	1.186
+++ xorg-x11-drv-ati.spec	29 Sep 2009 03:26:31 -0000	1.187
@@ -1,13 +1,13 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20090908
-%define gitversion 651fe5a47
+%define gitdate 20090929
+%define gitversion 7968e1fb8
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.4.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.5.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,7 +22,6 @@ Patch6:     radeon-6.9.0-bgnr-enable.pat
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
 Patch14:    r600-enable-mixed.patch
-Patch15:    r600-fix-exa-crash.patch
 
 ExcludeArch: s390 s390x
 
@@ -50,7 +49,6 @@ X.Org X11 ati video driver.
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
 %patch14 -p1 -b .mix
-%patch15 -p1 -b .fixexa
 
 %build
 autoreconf -iv
@@ -84,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.5.20090929git7968e1fb8
+- rebase to latest upstream for vline fixes and zaphod fixes
+
 * Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.4.20090908git651fe5a47
 - fix EXA server crasher + use mixed pixmaps for speed ups
 


--- r600-fix-exa-crash.patch DELETED ---


--- radeon-6.12.1-r600-fb-size.patch DELETED ---


--- radeon-powerpc-fix.patch DELETED ---



From lennart at fedoraproject.org  Tue Sep 29 03:44:18 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 29 Sep 2009 03:44:18 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.16, 1.17 libatasmart.spec, 1.19,
	1.20 sources, 1.16, 1.17
Message-ID: <20090929034418.E7BE011C00EC@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22567

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 Sep 2009 03:28:49 -0000	1.16
+++ .cvsignore	29 Sep 2009 03:44:18 -0000	1.17
@@ -1 +1 @@
-libatasmart-0.15.tar.gz
+libatasmart-0.16.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libatasmart.spec	18 Sep 2009 03:28:11 -0000	1.19
+++ libatasmart.spec	29 Sep 2009 03:44:18 -0000	1.20
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.15
+Version: 0.16
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -58,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA*
 
 %changelog
+
+* Tue Sep 29 2009 Lennart Poettering <lpoetter at redhat.com> 0.16-1
+- New upstream release
+- Second try at fixing #515881
+
 * Fri Sep 18 2009 Lennart Poettering <lpoetter at redhat.com> 0.15-1
 - New upstream release
 - Fixes #515881


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	18 Sep 2009 03:28:49 -0000	1.16
+++ sources	29 Sep 2009 03:44:18 -0000	1.17
@@ -1 +1 @@
-9d3bdd99592a567abcda1c28df73963a  libatasmart-0.15.tar.gz
+165b9b8c228a30b4f9cb10f0e42f7b67  libatasmart-0.16.tar.gz



From mtasaka at fedoraproject.org  Tue Sep 29 04:00:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 04:00:38 +0000 (UTC)
Subject: rpms/gnome-commander/F-12 .cvsignore, 1.37,
	1.38 gnome-commander.spec, 1.62, 1.63 sources, 1.38, 1.39
Message-ID: <20090929040038.A39B111C0335@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28133

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Mon Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Try latest git



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	26 Sep 2009 05:41:43 -0000	1.37
+++ .cvsignore	29 Sep 2009 04:00:38 -0000	1.38
@@ -1,3 +1,3 @@
-gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
 gnome-commander-1.2.8.2-po.tar.bz2
+gnome-commander-1.3-git_D20090929T1100_13dev.tar.bz2
 gnome-commander-ru.po.zip


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gnome-commander.spec	26 Sep 2009 05:41:43 -0000	1.62
+++ gnome-commander.spec	29 Sep 2009 04:00:38 -0000	1.63
@@ -28,7 +28,7 @@
 %define        POPPLER_REQ           0.6
 %define        VTE_REQ               0.11
 
-%define        git_pull_JST          D20090924T0215
+%define        git_pull_JST          D20090929T1100
 
 %define        use_autotool          0
 %define        if_pre                1
@@ -241,6 +241,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Mon Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try latest git
+
 * Sat Sep 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.3.git_D20090924T0215_13dev
 - Update Russian translation (from mailing list)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	26 Sep 2009 05:41:43 -0000	1.38
+++ sources	29 Sep 2009 04:00:38 -0000	1.39
@@ -1,3 +1,3 @@
-52df3ddcafb134c782a7b74369374ec6  gnome-commander-1.3-git_D20090924T0215_13dev.tar.bz2
 b190627ef20d9fe261c0445bc7d56877  gnome-commander-1.2.8.2-po.tar.bz2
+9592e0e971f13757d1211f1d3b0198e0  gnome-commander-1.3-git_D20090929T1100_13dev.tar.bz2
 9b2a8d11008d570b7cb9bf18878d3050  gnome-commander-ru.po.zip



From huzaifas at fedoraproject.org  Tue Sep 29 04:01:16 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 29 Sep 2009 04:01:16 +0000 (UTC)
Subject: rpms/gnome-applet-sensors/devel import.log, NONE, 1.1 .cvsignore,
	1.9, 1.10 gnome-applet-sensors.spec, 1.21, 1.22 sources, 1.9, 1.10
Message-ID: <20090929040116.A26BA11C0335@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnome-applet-sensors/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27761/devel

Modified Files:
	.cvsignore gnome-applet-sensors.spec sources 
Added Files:
	import.log 
Log Message:



--- NEW FILE import.log ---
gnome-applet-sensors-2_2_4-1_fc10:HEAD:gnome-applet-sensors-2.2.4-1.fc10.src.rpm:1254196590


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-sensors/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Nov 2008 11:08:40 -0000	1.9
+++ .cvsignore	29 Sep 2009 04:01:15 -0000	1.10
@@ -1 +1 @@
-sensors-applet-2.2.1.tar.gz
+sensors-applet-2.2.4.tar.gz


Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-applet-sensors.spec	25 Jul 2009 00:33:57 -0000	1.21
+++ gnome-applet-sensors.spec	29 Sep 2009 04:01:15 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
-Version:        2.2.1
-Release:        3%{?dist}
+Version:        2.2.4
+Release:        1%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 Group:          User Interface/Desktops
 License:        GPLv2+ and CC-BY-SA
@@ -97,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 2.2.4
+- New upstream release
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-sensors/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Nov 2008 11:08:40 -0000	1.9
+++ sources	29 Sep 2009 04:01:15 -0000	1.10
@@ -1 +1 @@
-4ba94415125db147efcc1ae76f9703ee  sensors-applet-2.2.1.tar.gz
+778f637524a90a9b6475ab77b0e90dd9  sensors-applet-2.2.4.tar.gz



From mtasaka at fedoraproject.org  Tue Sep 29 04:12:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 04:12:48 +0000 (UTC)
Subject: rpms/kazehakase/F-12
	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch,
	NONE, 1.1 .cvsignore, 1.36, 1.37 kazehakase.spec, 1.94,
	1.95 sources, 1.36, 1.37 kazehakase-rev3773-gtk021705.patch, 1.1, NONE
Message-ID: <20090929041248.0AD6E11C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22463

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch 
Removed Files:
	kazehakase-rev3773-gtk021705.patch 
Log Message:
* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
- Update to 0.5.8


kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch ---
Index: libegg/pixbufthumbnail/Makefile.am
===================================================================
--- libegg/pixbufthumbnail/Makefile.am	(revision 938)
+++ libegg/pixbufthumbnail/Makefile.am	(working copy)
@@ -26,7 +26,7 @@
 
 testeggpixbufthumbnail_LDADD = \
 	$(EGG_LIBS) \
-	$(top_builddir)/libegg/pixbufthumbnail/libeggpixbufthumbnail.la
+	libeggpixbufthumbnail.la
 
 testeggpixbufthumbnail_SOURCES = \
 	testeggpixbufthumbnail.c


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Aug 2009 05:37:09 -0000	1.36
+++ .cvsignore	29 Sep 2009 04:12:47 -0000	1.37
@@ -1 +1 @@
-kazehakase-0.5.7.tar.gz
+kazehakase-0.5.8.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-12/kazehakase.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kazehakase.spec	9 Sep 2009 18:15:01 -0000	1.94
+++ kazehakase.spec	29 Sep 2009 04:12:47 -0000	1.95
@@ -12,13 +12,13 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%undefine		usesvn		
+#%%define		usesvn		0
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1
+%define		Geckover	1.9.1.2
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -30,15 +30,15 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		43338
-%define		svnver		3783_trunk
+%define		repoid		43802
+%define		svnver		3859_trunk
 
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define		fedorarel	2
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -48,7 +48,7 @@
 
 
 Name:		kazehakase
-Version:	0.5.7
+Version:	0.5.8
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
@@ -62,8 +62,13 @@ URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
+%if 0%{?fedora} <= 11
+Patch15:	kazehakase-0.5.7-gtk0218.patch
+%endif
+Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	dbus-devel
 BuildRequires:	expat-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	gtk2-devel
@@ -120,6 +125,9 @@ This package uses Gecko for HTML renderi
 %package	base
 Summary:	Base package of Kazehakase
 Group:		Applications/Internet
+%if %{support_ruby} < 1
+Obsoletes:	%{name}-ruby < %{version}-%{release}
+%endif
 
 %description	base
 This package contains base files for Kazehakase.
@@ -185,6 +193,11 @@ This package uses WebKit for HTML render
 
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
+%if 0%{?fedora} <= 11
+# Reverse!!
+%patch15 -p0 -b .gtk -R
+%endif
+%patch17 -p0 -b .libegg_mak
 
 %if %{need_autogen}
 sh autogen.sh
@@ -237,20 +250,31 @@ EOF
 %build
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
+rm -rf builddir ; mkdir builddir
+pushd builddir
+ln -sf ../configure
+
 # --disable-shave is to make build.log more verbose
 %configure \
+	--srcdir=$(pwd)/.. \
 	--disable-shave \
 	--enable-migemo \
+%if %{support_ruby} < 1
+	--with-ruby=no \
+%endif
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
-%{__make} -C libegg -k # not parallel make
 %{__make} %{?_smp_mflags} -k
+popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
+
+pushd builddir
 %{__make} install DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL="%{__install} -c -p"
+popd
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.so
 find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f
@@ -278,10 +302,13 @@ desktop-file-install \
 %config(noreplace) %{_sysconfdir}/%{name}/mozilla/*.xml
 
 %{_bindir}/%{name}
+%{_bindir}/kz-embed-process
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/embed/
 %dir %{_libdir}/%{name}/search/
+
 %{_libdir}/%{name}/libkazehakase.so.*
+%{_libdir}/%{name}/embed/per_process.so
 
 %dir %{_datadir}/%{name}/
 %if %{support_ruby}
@@ -325,8 +352,16 @@ desktop-file-install \
 %endif
 
 %changelog
-* Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- release++
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
+- Update to 0.5.8
+
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3859
+- Enable ruby support again
+
+* Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
+- Try rev 3832 for new dbus feature
+- Kill ruby support until it gets compiled
 
 * Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
 - Update to 0.5.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	29 Aug 2009 05:37:10 -0000	1.36
+++ sources	29 Sep 2009 04:12:47 -0000	1.37
@@ -1 +1 @@
-1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz
+22d831982ebe010338907381caee8fdf  kazehakase-0.5.8.tar.gz


--- kazehakase-rev3773-gtk021705.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Sep 29 04:14:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 04:14:22 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.39, 1.40 kazehakase.spec, 1.96, 
	1.97 sources, 1.39, 1.40
Message-ID: <20090929041422.181DC11C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23060

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
- Update to 0.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	28 Sep 2009 15:12:36 -0000	1.39
+++ .cvsignore	29 Sep 2009 04:14:21 -0000	1.40
@@ -1 +1 @@
-kazehakase-0.5.7-svn3859_trunk.tar.gz
+kazehakase-0.5.8.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kazehakase.spec	28 Sep 2009 15:12:37 -0000	1.96
+++ kazehakase.spec	29 Sep 2009 04:14:21 -0000	1.97
@@ -12,7 +12,7 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%define		usesvn		1
+#%%define		usesvn		0
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
@@ -30,11 +30,15 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		43338
+%define		repoid		43802
 %define		svnver		3859_trunk
 
 
-%define		fedorarel	3
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -44,7 +48,11 @@
 
 
 Name:		kazehakase
-Version:	0.5.7
+Version:	0.5.8
+#
+# When changing release number, please make it sure that
+# the new EVR won't be higher than the one of higher branch!!
+#
 Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
@@ -344,8 +352,12 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
+- Update to 0.5.8
+
 * Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 3859
+- Enable ruby support again
 
 * Mon Sep  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-3.svn3832_trunk
 - Try rev 3832 for new dbus feature


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	28 Sep 2009 15:12:37 -0000	1.39
+++ sources	29 Sep 2009 04:14:21 -0000	1.40
@@ -1 +1 @@
-eebb97bac5216d812d864af5ebb22893  kazehakase-0.5.7-svn3859_trunk.tar.gz
+22d831982ebe010338907381caee8fdf  kazehakase-0.5.8.tar.gz



From huzaifas at fedoraproject.org  Tue Sep 29 04:15:05 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 29 Sep 2009 04:15:05 +0000 (UTC)
Subject: rpms/gnome-applet-sensors/F-11 import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 gnome-applet-sensors.spec, 1.20, 1.21 sources, 1.9, 1.10
Message-ID: <20090929041505.5033911C00E8@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnome-applet-sensors/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23370/F-11

Modified Files:
	.cvsignore gnome-applet-sensors.spec sources 
Added Files:
	import.log 
Log Message:



--- NEW FILE import.log ---
gnome-applet-sensors-2_2_4-1_fc10:F-11:gnome-applet-sensors-2.2.4-1.fc10.src.rpm:1254197597


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-sensors/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Nov 2008 11:08:40 -0000	1.9
+++ .cvsignore	29 Sep 2009 04:15:05 -0000	1.10
@@ -1 +1 @@
-sensors-applet-2.2.1.tar.gz
+sensors-applet-2.2.4.tar.gz


Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-sensors/F-11/gnome-applet-sensors.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gnome-applet-sensors.spec	24 Feb 2009 22:40:10 -0000	1.20
+++ gnome-applet-sensors.spec	29 Sep 2009 04:15:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.2.4
+Release:        1%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 Group:          User Interface/Desktops
 License:        GPLv2+ and CC-BY-SA
@@ -97,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 2.2.4
+- New upstream release
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-sensors/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Nov 2008 11:08:40 -0000	1.9
+++ sources	29 Sep 2009 04:15:05 -0000	1.10
@@ -1 +1 @@
-4ba94415125db147efcc1ae76f9703ee  sensors-applet-2.2.1.tar.gz
+778f637524a90a9b6475ab77b0e90dd9  sensors-applet-2.2.4.tar.gz



From mtasaka at fedoraproject.org  Tue Sep 29 04:21:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 04:21:44 +0000 (UTC)
Subject: rpms/kazehakase/F-12 kazehakase.spec,1.95,1.96
Message-ID: <20090929042144.AFEA711C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25762

Modified Files:
	kazehakase.spec 
Log Message:
need autotools


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-12/kazehakase.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kazehakase.spec	29 Sep 2009 04:12:47 -0000	1.95
+++ kazehakase.spec	29 Sep 2009 04:21:44 -0000	1.96
@@ -46,6 +46,8 @@
 %define		support_webkit	0
 %endif
 
+# Patch17 needs autotools
+%define		need_autogen	1
 
 Name:		kazehakase
 Version:	0.5.8



From mtasaka at fedoraproject.org  Tue Sep 29 04:22:45 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 04:22:45 +0000 (UTC)
Subject: rpms/kazehakase/devel kazehakase.spec,1.97,1.98
Message-ID: <20090929042245.4E4B711C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26041

Modified Files:
	kazehakase.spec 
Log Message:
need autotools


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kazehakase.spec	29 Sep 2009 04:14:21 -0000	1.97
+++ kazehakase.spec	29 Sep 2009 04:22:45 -0000	1.98
@@ -46,6 +46,8 @@
 %define		support_webkit	0
 %endif
 
+# Patch17 needs autotools
+%define		need_autogen	1
 
 Name:		kazehakase
 Version:	0.5.8



From pkgdb at fedoraproject.org  Tue Sep 29 04:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:43:45 +0000
Subject: [pkgdb] alsa-plugins ownership updated
Message-ID: <20090929044345.651D910F88B@bastion2.fedora.phx.redhat.com>

Package alsa-plugins in Fedora devel was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From pkgdb at fedoraproject.org  Tue Sep 29 04:43:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:43:57 +0000
Subject: [pkgdb] alsa-plugins ownership updated
Message-ID: <20090929044357.29ED110F85F@bastion2.fedora.phx.redhat.com>

Package alsa-plugins in Fedora 11 was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From pkgdb at fedoraproject.org  Tue Sep 29 04:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:43:59 +0000
Subject: [pkgdb] alsa-plugins ownership updated
Message-ID: <20090929044359.501CC10F888@bastion2.fedora.phx.redhat.com>

Package alsa-plugins in Fedora 10 was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From pkgdb at fedoraproject.org  Tue Sep 29 04:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:44:24 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929044424.6E55510F874@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora devel was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:44:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:44:33 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929044433.CC18010F85F@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora 12 was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:44:35 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929044435.C5A0C10F888@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora 11 was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:44:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:44:37 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929044437.D613B10F88B@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora 10 was orphaned by emoret

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:03 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044804.9252A10F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchbugzilla acl on evolution (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:06 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044806.E219410F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchcommits acl on evolution (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:09 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044809.9535410F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the commit acl on evolution (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:12 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044812.662DF10F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the approveacls acl on evolution (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:45 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044845.C056110F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchbugzilla acl on evolution (Fedora 10) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:48 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044848.323C910F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchcommits acl on evolution (Fedora 10) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:50 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044851.1E64310F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the commit acl on evolution (Fedora 10) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:48:54 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044854.48D1310F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the approveacls acl on evolution (Fedora 10) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:03 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044903.60DE910F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchbugzilla acl on evolution (Fedora 11) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:04 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044904.D143A10F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchcommits acl on evolution (Fedora 11) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:06 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044907.6C7D510F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the commit acl on evolution (Fedora 11) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:09 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044909.BCE7E10F894@bastion2.fedora.phx.redhat.com>

mbarnes has set the approveacls acl on evolution (Fedora 11) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:16 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044916.404F310F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchbugzilla acl on evolution (Fedora 12) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:16 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044917.6C19410F88B@bastion2.fedora.phx.redhat.com>

mbarnes has set the watchcommits acl on evolution (Fedora 12) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:20 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044921.0323E10F85F@bastion2.fedora.phx.redhat.com>

mbarnes has set the commit acl on evolution (Fedora 12) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:49:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:49:23 +0000
Subject: [pkgdb] evolution had acl change status
Message-ID: <20090929044923.2D4CB10F888@bastion2.fedora.phx.redhat.com>

mbarnes has set the approveacls acl on evolution (Fedora 12) to Approved for mbarnes

To make changes to this package see:
  /pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:02 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929045203.36EAF10F85F@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora devel is now owned by lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:09 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045209.2EF3A10F85F@bastion2.fedora.phx.redhat.com>

lennart has set the watchbugzilla acl on paprefs (Fedora devel) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:11 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045211.A421A10F88C@bastion2.fedora.phx.redhat.com>

lennart has set the commit acl on paprefs (Fedora devel) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:10 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045210.9A79C10F874@bastion2.fedora.phx.redhat.com>

lennart has set the watchcommits acl on paprefs (Fedora devel) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:12 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045213.90D8110F895@bastion2.fedora.phx.redhat.com>

lennart has set the approveacls acl on paprefs (Fedora devel) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:23 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929045223.1A29610F874@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora 10 is now owned by lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:23 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929045223.A9ECE10F88B@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora 11 is now owned by lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:24 +0000
Subject: [pkgdb] paprefs ownership updated
Message-ID: <20090929045225.532D610F895@bastion2.fedora.phx.redhat.com>

Package paprefs in Fedora 12 is now owned by lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:29 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045229.BC14C10F85F@bastion2.fedora.phx.redhat.com>

lennart has set the watchbugzilla acl on paprefs (Fedora 11) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:30 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045230.1D15F10F888@bastion2.fedora.phx.redhat.com>

lennart has set the watchcommits acl on paprefs (Fedora 11) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:31 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045231.3C95610F894@bastion2.fedora.phx.redhat.com>

lennart has set the approveacls acl on paprefs (Fedora 11) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:33 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045233.B8ACA10F85F@bastion2.fedora.phx.redhat.com>

lennart has set the commit acl on paprefs (Fedora 12) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:31 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045232.2418310F8A8@bastion2.fedora.phx.redhat.com>

lennart has set the commit acl on paprefs (Fedora 11) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:35 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045235.3CE5410F8AC@bastion2.fedora.phx.redhat.com>

lennart has set the approveacls acl on paprefs (Fedora 12) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:36 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045236.BFC4910F8AD@bastion2.fedora.phx.redhat.com>

lennart has set the watchcommits acl on paprefs (Fedora 12) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 04:52:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 04:52:38 +0000
Subject: [pkgdb] paprefs had acl change status
Message-ID: <20090929045238.8625210F894@bastion2.fedora.phx.redhat.com>

lennart has set the watchbugzilla acl on paprefs (Fedora 12) to Approved for lennart

To make changes to this package see:
  /pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Sep 29 05:12:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 05:12:34 +0000
Subject: [pkgdb] dsniff: dramsey has requested watchcommits
Message-ID: <20090929051234.C805310F85F@bastion2.fedora.phx.redhat.com>

dramsey has requested the watchcommits acl on dsniff (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dsniff



From pkgdb at fedoraproject.org  Tue Sep 29 05:57:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 05:57:17 +0000
Subject: [pkgdb] aide: dramsey has requested watchcommits
Message-ID: <20090929055718.3021610F888@bastion2.fedora.phx.redhat.com>

dramsey has requested the watchcommits acl on aide (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/aide



From pkgdb at fedoraproject.org  Tue Sep 29 06:25:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 06:25:55 +0000
Subject: [pkgdb] tclx: npajkovs has given up approveacls
Message-ID: <20090929062555.874B010F85F@bastion2.fedora.phx.redhat.com>

npajkovs has given up the approveacls acl on tclx (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/tclx



From pkgdb at fedoraproject.org  Tue Sep 29 06:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 06:25:58 +0000
Subject: [pkgdb] tclx: npajkovs has requested approveacls
Message-ID: <20090929062558.2583210F888@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on tclx (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/tclx



From pkgdb at fedoraproject.org  Tue Sep 29 06:30:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 06:30:23 +0000
Subject: [pkgdb] tclx had acl change status
Message-ID: <20090929063027.7649610F85F@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on tclx (Fedora 11) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/tclx



From rjones at fedoraproject.org  Tue Sep 29 08:12:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 08:12:31 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.102,1.103
Message-ID: <20090929081231.BFF3911C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv487

Modified Files:
	libguestfs.spec 
Log Message:
Force rebuild.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- libguestfs.spec	23 Sep 2009 15:31:14 -0000	1.102
+++ libguestfs.spec	29 Sep 2009 08:12:31 -0000	1.103
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.72
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -536,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-2
+- Force rebuild.
+
 * Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
 - New upstream release 1.0.72.
 - New tools: virt-edit, virt-rescue.



From npajkovs at fedoraproject.org  Tue Sep 29 08:14:12 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Tue, 29 Sep 2009 08:14:12 +0000 (UTC)
Subject: rpms/tclx/devel tclx.spec,1.25,1.26
Message-ID: <20090929081412.CBB1511C00C1@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/tclx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2881

Modified Files:
	tclx.spec 
Log Message:
Bug 525058 -  ld.so not correctly configured after install


Index: tclx.spec
===================================================================
RCS file: /cvs/extras/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- tclx.spec	27 Jul 2009 05:38:56 -0000	1.25
+++ tclx.spec	29 Sep 2009 08:14:11 -0000	1.26
@@ -11,7 +11,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -56,10 +56,11 @@ applications embedding tclx.
    --with-tclinclude=%{_includedir} \
    --with-tkinclude=%{_includedir} \
    --enable-gcc \
+   --disable-threads \
    --enable-64bit \
    --libdir=%{tcl_sitearch}
 # smp building doesn't work
-make all
+make %{?_smp_mflags}
 
 %check
 # run "make test" by default
@@ -72,13 +73,21 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo '%{_libdir}/tcl8.5/%{name}%{major_ver}' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %{_libdir}/tcl8.5/tclx8.4/
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %exclude %{_mandir}/man3/CmdWrite.*
 %exclude %{_mandir}/man3/Handles.*
 %exclude %{_mandir}/man3/TclXInit.3*
@@ -93,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Keylist.3*
 
 %changelog
+* Tue Sep 29 2009 Nikola Pajkovsky <npajkovs at redhat.com> 8.4.0-15
+- resolved: Bug 525058 -  ld.so not correctly configured after install
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Tue Sep 29 08:15:27 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 08:15:27 +0000 (UTC)
Subject: rpms/jetty/F-12 jetty.spec,1.20,1.21
Message-ID: <20090929081527.28A4611C0423@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4131/F-12

Modified Files:
	jetty.spec 
Log Message:
No need to require the whole tomcat5.


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-12/jetty.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- jetty.spec	18 Sep 2009 19:42:06 -0000	1.20
+++ jetty.spec	29 Sep 2009 08:15:26 -0000	1.21
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -96,8 +96,6 @@ Requires:  jakarta-commons-logging
 Requires:  tomcat5-jasper >= 5.5.26-1.5
 Requires:  jsp
 Requires:  mx4j >= 0:3.0
-Requires: tomcat5
-Requires: tomcat5-jasper
 Requires: tomcat6-servlet-2.5-api
 Requires: tomcat6-jsp-2.1-api
 Requires: slf4j
@@ -363,6 +361,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-4
+- No need to require the whole tomcat5.
+
 * Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
 - Add djetty script source and fix init script to work properly.
 



From hguemar at fedoraproject.org  Tue Sep 29 08:18:21 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 29 Sep 2009 08:18:21 +0000 (UTC)
Subject: rpms/bygfoot/devel .cvsignore, 1.4, 1.5 bygfoot.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20090929081821.5029011C00C1@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/bygfoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10372

Modified Files:
	.cvsignore bygfoot.spec sources 
Log Message:
Updated to 2.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jun 2007 15:31:29 -0000	1.4
+++ .cvsignore	29 Sep 2009 08:18:21 -0000	1.5
@@ -1 +1 @@
-bygfoot-2.2.0-source.tar.bz2
+bygfoot-2.3.2.tar.bz2


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/bygfoot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bygfoot.spec	24 Jul 2009 18:31:32 -0000	1.9
+++ bygfoot.spec	29 Sep 2009 08:18:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bygfoot
-Version:        2.2.0
-Release:        5%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPLv2
@@ -47,7 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/bygfoot*
 %{_datadir}/bygfoot
 %{_datadir}/applications/fedora-bygfoot.desktop
+
 %changelog
+* Tue Sep 29 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.3.2-1
+- Updated to 2.3.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jun 2007 15:31:29 -0000	1.4
+++ sources	29 Sep 2009 08:18:21 -0000	1.5
@@ -1 +1 @@
-ba8732d53b463a9e97c79a24f89ee857  bygfoot-2.2.0-source.tar.bz2
+152c0c729c2b5e4428d32b89edc6dd14  bygfoot-2.3.2.tar.bz2



From tmraz at fedoraproject.org  Tue Sep 29 08:22:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 29 Sep 2009 08:22:13 +0000 (UTC)
Subject: rpms/at/devel at-3.1.10-pam.patch,1.6,1.7 at.spec,1.78,1.79
Message-ID: <20090929082213.400A711C00C1@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/at/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12923

Modified Files:
	at-3.1.10-pam.patch at.spec 
Log Message:
* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-38
- authentication PAM modules have to be configured for pam_setcred()


at-3.1.10-pam.patch:
 Makefile.in  |    5 -
 atd.c        |  251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 config.h.in  |    6 +
 configure.in |   15 +++
 pam_atd      |    9 ++
 perm.c       |   51 +++++++++++
 6 files changed, 314 insertions(+), 23 deletions(-)

Index: at-3.1.10-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at-3.1.10-pam.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- at-3.1.10-pam.patch	16 Sep 2009 09:31:39 -0000	1.6
+++ at-3.1.10-pam.patch	29 Sep 2009 08:22:12 -0000	1.7
@@ -1,10 +1,11 @@
 --- at-3.1.10/pam_atd.pam   2007-07-03 13:29:24.000000000 +0200
 +++ at-3.1.10/pam_atd   2007-07-03 13:29:24.000000000 +0200
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
 +# The PAM configuration file for the at daemon
 +#
 +#
-+# PAM authentication not called, no auth modules needed
++auth       required    pam_env.so
++auth       include     password-auth
 +account    required    pam_access.so
 +account    include     password-auth
 +session    required    pam_loginuid.so


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- at.spec	16 Sep 2009 09:31:40 -0000	1.78
+++ at.spec	29 Sep 2009 08:22:12 -0000	1.79
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -196,6 +196,9 @@ fi
 %attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-38
+- authentication PAM modules have to be configured for pam_setcred()
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-37
 - improve the PAM configuration, use password-auth common stack
 



From hguemar at fedoraproject.org  Tue Sep 29 08:25:00 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 29 Sep 2009 08:25:00 +0000 (UTC)
Subject: rpms/bygfoot/F-12 bygfoot.spec,1.9,1.10 sources,1.4,1.5
Message-ID: <20090929082500.AFFE211C00C1@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/bygfoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15511

Modified Files:
	bygfoot.spec sources 
Log Message:
Updated to 2.3.2


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/F-12/bygfoot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bygfoot.spec	24 Jul 2009 18:31:32 -0000	1.9
+++ bygfoot.spec	29 Sep 2009 08:24:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bygfoot
-Version:        2.2.0
-Release:        5%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPLv2
@@ -47,7 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/bygfoot*
 %{_datadir}/bygfoot
 %{_datadir}/applications/fedora-bygfoot.desktop
+
 %changelog
+* Tue Sep 29 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.3.2-1
+- Updated to 2.3.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jun 2007 15:31:29 -0000	1.4
+++ sources	29 Sep 2009 08:24:59 -0000	1.5
@@ -1 +1 @@
-ba8732d53b463a9e97c79a24f89ee857  bygfoot-2.2.0-source.tar.bz2
+152c0c729c2b5e4428d32b89edc6dd14  bygfoot-2.3.2.tar.bz2



From airlied at fedoraproject.org  Tue Sep 29 08:26:15 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 29 Sep 2009 08:26:15 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1839,
	1.1840 linux-2.6.31-copy_from_user-bounds.patch, 1.1, 1.2
Message-ID: <20090929082615.2500311C00C1@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16121

Modified Files:
	kernel.spec linux-2.6.31-copy_from_user-bounds.patch 
Log Message:
* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-54
- Fix broken capabilties that stopped dbus working due to copy from user
  fixups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1839
retrieving revision 1.1840
diff -u -p -r1.1839 -r1.1840
--- kernel.spec	29 Sep 2009 03:21:19 -0000	1.1839
+++ kernel.spec	29 Sep 2009 08:26:12 -0000	1.1840
@@ -2074,6 +2074,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-54
+- Fix broken capabilties that stopped dbus working due to copy from user
+  fixups.
+
 * Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-53
 - drm-next-4c57edba4.patch: fix r600 dri1 memory leak and r600 bugs
 

linux-2.6.31-copy_from_user-bounds.patch:
 b/arch/x86/include/asm/uaccess_32.h               |   19 ++++++++
 b/arch/x86/include/asm/uaccess_64.h               |   19 ++++++++
 b/arch/x86/kernel/x8664_ksyms_64.c                |    2 
 b/arch/x86/lib/copy_user_64.S                     |    4 -
 b/arch/x86/lib/usercopy_32.c                      |    4 -
 b/drivers/acpi/proc.c                             |    4 -
 b/drivers/acpi/video.c                            |   20 ++++++---
 b/drivers/char/nvram.c                            |   12 ++++-
 b/fs/cifs/cifs_debug.c                            |   10 ++--
 b/include/linux/compiler-gcc4.h                   |    2 
 b/include/linux/compiler.h                        |    8 +--
 b/kernel/capability.c                             |   11 ++---
 b/mm/migrate.c                                    |   47 ++++++++++++++++++++--
 b/net/socket.c                                    |    9 ++--
 b/net/wireless/wext.c                             |   11 ++---
 linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c |   21 ++++++---
 16 files changed, 152 insertions(+), 51 deletions(-)

Index: linux-2.6.31-copy_from_user-bounds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6.31-copy_from_user-bounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.31-copy_from_user-bounds.patch	28 Sep 2009 21:01:12 -0000	1.1
+++ linux-2.6.31-copy_from_user-bounds.patch	29 Sep 2009 08:26:13 -0000	1.2
@@ -1163,7 +1163,7 @@ index 4e17041..204f11f 100644
 -	if (copy_from_user(&kdata, data,
 -			   tocopy * sizeof(struct __user_cap_data_struct)))
 +	copybytes = tocopy * sizeof(struct __user_cap_data_struct);
-+	if (copybytes > _KERNEL_CAPABILITY_U32S)
++	if (copybytes > (_KERNEL_CAPABILITY_U32S * sizeof(u32)))
 +		return -EFAULT;
 +
 +	if (copy_from_user(&kdata, data, copybytes))



From mhlavink at fedoraproject.org  Tue Sep 29 08:28:41 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 29 Sep 2009 08:28:41 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel .cvsignore, 1.29,
	1.30 ecryptfs-utils-75-nocryptdisks.patch, 1.2,
	1.3 ecryptfs-utils.spec, 1.54, 1.55 sources, 1.30, 1.31
Message-ID: <20090929082841.5545B11C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17462

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
- updated to 81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	18 Aug 2009 06:56:17 -0000	1.29
+++ .cvsignore	29 Sep 2009 08:28:38 -0000	1.30
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_79.orig.tar.gz
+ecryptfs-utils_81.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 06:56:17 -0000	1.2
+++ ecryptfs-utils-75-nocryptdisks.patch	29 Sep 2009 08:28:39 -0000	1.3
@@ -1,18 +1,42 @@
-diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
---- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
-+++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
-@@ -158,13 +158,5 @@ for swap in $swaps; do
+diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-81/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-09-19 01:41:21.000000000 +0200
++++ ecryptfs-utils-81/src/utils/ecryptfs-setup-swap	2009-09-29 10:25:07.481996541 +0200
+@@ -37,23 +37,20 @@ warn() {
+ usage() {
+ 	echo
+ 	echo `gettext "Usage:"`
+-	echo "  $0 [-f|--force] [-n|--no-reload]"
++	echo "  $0 [-f|--force]"
+ 	echo
+ 	exit 1
+ }
+ 
+ # Handle command line options
+ FORCE=0
++NO_RELOAD=1
+ while [ ! -z "$1" ]; do
+ 	case "$1" in
+ 		-f|--force)
+ 			FORCE=1
+ 			shift 1
+ 		;;
+-		-n|--no-reload)
+-			NO_RELOAD=1
+-			shift 1
+-		;;
+ 		*)
+ 			usage
+ 		;;
+@@ -166,7 +163,6 @@ for swap in $swaps; do
+ 	# Add fstab entry
  	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
  done
- 
--# Turn swap off
--swapoff -a
--
--# Restart cryptdisks
--/etc/init.d/cryptdisks restart
--
--# Turn the swap on
--swapon -a
 -
+ if [ "$NO_RELOAD" != 1 ]; then
+ 	# Turn swap off
+ 	swapoff -a
+@@ -179,3 +175,4 @@ if [ "$NO_RELOAD" != 1 ]; then
+ fi
+ 
  info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ecryptfs-utils.spec	21 Aug 2009 13:10:21 -0000	1.54
+++ ecryptfs-utils.spec	29 Sep 2009 08:28:39 -0000	1.55
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 79
-Release: 2%{?dist}
+Version: 81
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
+- updated to 81
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 79-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	18 Aug 2009 06:56:17 -0000	1.30
+++ sources	29 Sep 2009 08:28:40 -0000	1.31
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz
+7a8cf5c1cc638bb21036c2088806fc9d  ecryptfs-utils_81.orig.tar.gz



From akurtakov at fedoraproject.org  Tue Sep 29 08:29:12 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 08:29:12 +0000 (UTC)
Subject: rpms/jetty/devel jetty.spec, 1.20, 1.21 disable-modules.patch, 1.1, 
	1.2 jetty-depmap.xml, 1.1, 1.2
Message-ID: <20090929082912.236C611C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17946/devel

Modified Files:
	jetty.spec disable-modules.patch jetty-depmap.xml 
Log Message:
Update to upstream 6.1.21 release.


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- jetty.spec	18 Sep 2009 19:42:06 -0000	1.20
+++ jetty.spec	29 Sep 2009 08:29:09 -0000	1.21
@@ -41,14 +41,14 @@
 %define appdir      %{jettylibdir}/webapps
 
 Name:           jetty
-Version:        6.1.20
-Release:        3%{?dist}
+Version:        6.1.21
+Release:        1%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
 License:        ASL 2.0
 URL:            http://jetty.mortbay.org/jetty/
-Source0:        http://dist.codehaus.org/jetty/jetty-6.1.20/jetty-6.1.20-src.zip
+Source0:        http://dist.codehaus.org/%{name}/%{name}-%{version}/%{name}-%{version}-src.zip
 Source1:	djetty.script
 Source2:        jetty.init
 Source3:        jetty.logrotate
@@ -87,6 +87,7 @@ BuildRequires: tomcat6-jsp-2.1-api
 BuildRequires: slf4j
 BuildRequires: objectweb-asm
 BuildRequires: jakarta-commons-el
+BuildRequires: jakarta-commons-daemon
 
 Requires:  chkconfig
 Requires:  jpackage-utils >= 0:1.6
@@ -96,8 +97,6 @@ Requires:  jakarta-commons-logging
 Requires:  tomcat5-jasper >= 5.5.26-1.5
 Requires:  jsp
 Requires:  mx4j >= 0:3.0
-Requires: tomcat5
-Requires: tomcat5-jasper
 Requires: tomcat6-servlet-2.5-api
 Requires: tomcat6-jsp-2.1-api
 Requires: slf4j
@@ -363,6 +362,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.21-1
+- Update to upstream 6.1.21 release.
+
 * Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
 - Add djetty script source and fix init script to work properly.
 

disable-modules.patch:
 pom.xml |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Index: disable-modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/disable-modules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- disable-modules.patch	15 Sep 2009 12:51:05 -0000	1.1
+++ disable-modules.patch	29 Sep 2009 08:29:09 -0000	1.2
@@ -1,5 +1,5 @@
---- pom.xml.sav	2009-09-01 21:19:01.000000000 +0300
-+++ pom.xml	2009-09-14 12:59:01.723285440 +0300
+--- pom.xml.sav	2009-09-22 10:17:54.000000000 +0300
++++ pom.xml	2009-09-29 11:01:34.323185945 +0300
 @@ -61,12 +61,12 @@
            <target>1.4</target>
          </configuration>
@@ -15,7 +15,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-jar-plugin</artifactId>
-@@ -110,47 +110,47 @@
+@@ -110,24 +110,24 @@
      <module>modules/util</module>
      <module>modules/util5</module>
      <module>modules/jetty</module>
@@ -45,35 +45,25 @@
 +    <!--module>extras/ajp</module>
 +    <module>extras/win32service</module-->
      <!--module>extras/gwt</module-->
--    <module>extras/threadpool</module>
-+    <!--module>extras/threadpool</module-->
+     <module>extras/threadpool</module>
      <module>extras/client</module>
--    <module>extras/jetty-java5-stats</module>
-+    <!--module>extras/jetty-java5-stats</module-->
+@@ -141,16 +141,16 @@
+     <module>examples/tests</module>
  
-     <module>examples/test-webapp</module>
--    <module>examples/test-jaas-webapp</module>
-+    <!--module>examples/test-jaas-webapp</module>
-     <module>examples/test-jndi-webapp</module>
--    <module>examples/embedded</module>
-+    <module>examples/embedded</module-->
-     <!-- <module>examples/spring-ebj3-demo</module> -->
--    <module>examples/tests</module>
-+    <!--module>examples/tests</module>
  
- 
-     <module>contrib/cometd</module>
+-    <module>contrib/cometd</module>
++    <!--module>contrib/cometd</module-->
      <module>contrib/jetty-ant</module>
      <module>contrib/jetty-rewrite-handler</module>
      <module>contrib/jetty-ldap-jaas</module>
--    <module>contrib/start-daemon</module>
-+    <module>contrib/start-daemon</module-->
+     <module>contrib/start-daemon</module>
      <!--module>contrib/grizzly</module-->
      <!--module>contrib/wadi</module-->
-     <!--<module>contrib/terracotta</module-->
- 
+-    <module>contrib/terracotta</module>
++    <!--module>contrib/terracotta</module>
+     <module>contrib/sweeper</module>
 -    <module>extras/setuid</module>
-+    <!--module>extras/setuid</module-->
++    <module>extras/setuid</module-->
    </modules>
    <dependencyManagement>
      <dependencies>


Index: jetty-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jetty-depmap.xml	15 Sep 2009 12:51:05 -0000	1.1
+++ jetty-depmap.xml	29 Sep 2009 08:29:09 -0000	1.2
@@ -133,6 +133,18 @@
 	</dependency>
 	<dependency>
 		<maven>
+			<groupId>commons-daemon</groupId>
+			<artifactId>commons-daemon</artifactId>
+			<version>1.0.1</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-daemon</artifactId>
+			<version>1.0.1</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-release-plugin</artifactId>
 			<version>1.0.1</version>



From npajkovs at fedoraproject.org  Tue Sep 29 08:32:58 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Tue, 29 Sep 2009 08:32:58 +0000 (UTC)
Subject: rpms/tclx/F-11 tclx.spec,1.24,1.25
Message-ID: <20090929083258.AEBB011C00C1@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/tclx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20864

Modified Files:
	tclx.spec 
Log Message:
Bug 525058 -  ld.so not correctly configured after install


Index: tclx.spec
===================================================================
RCS file: /cvs/extras/rpms/tclx/F-11/tclx.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- tclx.spec	25 Feb 2009 18:56:59 -0000	1.24
+++ tclx.spec	29 Sep 2009 08:32:58 -0000	1.25
@@ -11,7 +11,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -56,10 +56,11 @@ applications embedding tclx.
    --with-tclinclude=%{_includedir} \
    --with-tkinclude=%{_includedir} \
    --enable-gcc \
+   --disable-threads \
    --enable-64bit \
    --libdir=%{tcl_sitearch}
 # smp building doesn't work
-make all
+make %{?_smp_mflags}
 
 %check
 # run "make test" by default
@@ -69,16 +70,24 @@ make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo '%{_libdir}/tcl8.5/%{name}%{major_ver}' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %{_libdir}/tcl8.5/tclx8.4/
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %exclude %{_mandir}/man3/CmdWrite.*
 %exclude %{_mandir}/man3/Handles.*
 %exclude %{_mandir}/man3/TclXInit.3*
@@ -93,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Keylist.3*
 
 %changelog
+* Tue Sep 29 2009 Nikola Pajkovsky <npajkovs at redhat.com> 8.4.0-14
+- resolved: Bug 525058 -  ld.so not correctly configured after install
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Tue Sep 29 08:33:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 08:33:41 +0000 (UTC)
Subject: rpms/jetty/devel sources,1.5,1.6 .cvsignore,1.5,1.6
Message-ID: <20090929083341.2486611C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21193/devel

Modified Files:
	sources .cvsignore 
Log Message:
New sources.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Sep 2009 12:51:05 -0000	1.5
+++ sources	29 Sep 2009 08:33:40 -0000	1.6
@@ -1 +1 @@
-716cc87428b90ef88b0461bc54856379  jetty-6.1.20-src.zip
+e89beb5020232aeabdcd8ce85cfa79e1  jetty-6.1.21-src.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Sep 2009 12:51:05 -0000	1.5
+++ .cvsignore	29 Sep 2009 08:33:40 -0000	1.6
@@ -2,3 +2,4 @@ jetty-5.1.12.fedora.zip
 jetty-5.1.14.fedora.tgz
 jetty-5.1.15.fedora.tgz
 jetty-6.1.20-src.zip
+jetty-6.1.21-src.zip



From hguemar at fedoraproject.org  Tue Sep 29 08:44:20 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 29 Sep 2009 08:44:20 +0000 (UTC)
Subject: rpms/bygfoot/devel bygfoot.spec,1.10,1.11
Message-ID: <20090929084421.1AE5111C00C1@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/bygfoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23920

Modified Files:
	bygfoot.spec 
Log Message:
forgot to commit tarball's change of name


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/bygfoot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bygfoot.spec	29 Sep 2009 08:18:21 -0000	1.10
+++ bygfoot.spec	29 Sep 2009 08:44:19 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           bygfoot
 Version:        2.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://www.bygfoot.com
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/bygfoot/bygfoot-%{version}-source.tar.bz2
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/bygfoot/bygfoot-%{version}.tar.bz2
 Source3:        bygfoot.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
@@ -20,7 +20,7 @@ sell players, get promoted or relegated 
 of course try to be successful.
 
 %prep
-%setup -q -n %{name}-%{version}-source
+%setup -q -n %{name}-%{version}
 
 
 %build



From npajkovs at fedoraproject.org  Tue Sep 29 08:49:38 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Tue, 29 Sep 2009 08:49:38 +0000 (UTC)
Subject: rpms/tclx/F-12 tclx.spec,1.25,1.26
Message-ID: <20090929084938.B299C11C00C1@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/tclx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25373

Modified Files:
	tclx.spec 
Log Message:
Bug 525058 -  ld.so not correctly configured after install


Index: tclx.spec
===================================================================
RCS file: /cvs/extras/rpms/tclx/F-12/tclx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- tclx.spec	27 Jul 2009 05:38:56 -0000	1.25
+++ tclx.spec	29 Sep 2009 08:49:38 -0000	1.26
@@ -11,7 +11,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -56,10 +56,11 @@ applications embedding tclx.
    --with-tclinclude=%{_includedir} \
    --with-tkinclude=%{_includedir} \
    --enable-gcc \
+   --disable-threads \
    --enable-64bit \
    --libdir=%{tcl_sitearch}
 # smp building doesn't work
-make all
+make %{?_smp_mflags}
 
 %check
 # run "make test" by default
@@ -72,13 +73,21 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo '%{_libdir}/tcl8.5/%{name}%{major_ver}' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %{_libdir}/tcl8.5/tclx8.4/
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %exclude %{_mandir}/man3/CmdWrite.*
 %exclude %{_mandir}/man3/Handles.*
 %exclude %{_mandir}/man3/TclXInit.3*
@@ -93,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Keylist.3*
 
 %changelog
+* Tue Sep 29 2009 Nikola Pajkovsky <npajkovs at redhat.com> 8.4.0-15
+- resolved: Bug 525058 -  ld.so not correctly configured after install
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hguemar at fedoraproject.org  Tue Sep 29 08:51:01 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 29 Sep 2009 08:51:01 +0000 (UTC)
Subject: rpms/bygfoot/F-12 bygfoot.spec,1.10,1.11
Message-ID: <20090929085101.493E211C048A@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/bygfoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25708

Modified Files:
	bygfoot.spec 
Log Message:
forgot to commit tarball's change of name


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/F-12/bygfoot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bygfoot.spec	29 Sep 2009 08:24:59 -0000	1.10
+++ bygfoot.spec	29 Sep 2009 08:51:00 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           bygfoot
 Version:        2.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://www.bygfoot.com
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/bygfoot/bygfoot-%{version}-source.tar.bz2
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/bygfoot/bygfoot-%{version}.tar.bz2
 Source3:        bygfoot.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
@@ -20,7 +20,7 @@ sell players, get promoted or relegated 
 of course try to be successful.
 
 %prep
-%setup -q -n %{name}-%{version}-source
+%setup -q -n %{name}-%{version}
 
 
 %build



From mhlavink at fedoraproject.org  Tue Sep 29 09:00:06 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 29 Sep 2009 09:00:06 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-12 .cvsignore, 1.29, 1.30 ecryptfs-utils.spec,
	1.54, 1.55 sources, 1.30, 1.31
Message-ID: <20090929090006.802F811C048B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29375

Modified Files:
	.cvsignore ecryptfs-utils.spec sources 
Log Message:
* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
- updated to 81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	18 Aug 2009 06:56:17 -0000	1.29
+++ .cvsignore	29 Sep 2009 09:00:04 -0000	1.30
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_79.orig.tar.gz
+ecryptfs-utils_81.orig.tar.gz


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-12/ecryptfs-utils.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ecryptfs-utils.spec	21 Aug 2009 13:10:21 -0000	1.54
+++ ecryptfs-utils.spec	29 Sep 2009 09:00:04 -0000	1.55
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 79
-Release: 2%{?dist}
+Version: 81
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
+- updated to 81
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 79-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	18 Aug 2009 06:56:17 -0000	1.30
+++ sources	29 Sep 2009 09:00:04 -0000	1.31
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz
+7a8cf5c1cc638bb21036c2088806fc9d  ecryptfs-utils_81.orig.tar.gz



From atorkhov at fedoraproject.org  Tue Sep 29 09:05:57 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 09:05:57 +0000 (UTC)
Subject: rpms/gtranslator/devel
	gtranslator-1.9.6-fix-update-desktop-database.patch, NONE,
	1.1 gtranslator.spec, 1.28, 1.29 sources, 1.8,
	1.9 gtranslator-1.1.7-desktop.patch, 1.1,
	NONE gtranslator-1.1.7-scrollkeeper-rarian.patch, 1.1,
	NONE gtranslator-1.9.5-fix-update-desktop-database.patch, 1.1,
	NONE gtranslator-1.9.5-gdl2.27.patch, 1.1, NONE
Message-ID: <20090929090557.5092311C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/gtranslator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31761

Modified Files:
	gtranslator.spec sources 
Added Files:
	gtranslator-1.9.6-fix-update-desktop-database.patch 
Removed Files:
	gtranslator-1.1.7-desktop.patch 
	gtranslator-1.1.7-scrollkeeper-rarian.patch 
	gtranslator-1.9.5-fix-update-desktop-database.patch 
	gtranslator-1.9.5-gdl2.27.patch 
Log Message:
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.6-1
- Update to 1.9.6


gtranslator-1.9.6-fix-update-desktop-database.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gtranslator-1.9.6-fix-update-desktop-database.patch ---
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.am gtranslator-1.9.5/data/desktop/Makefile.am
--- gtranslator-1.9.5.orig/data/desktop/Makefile.am	2009-04-11 05:03:51.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.am	2009-05-30 16:41:48.000000000 +0400
@@ -22,9 +22,9 @@
 CLEANFILES = $(Application_DATA)
 
 UPDATE_DESKTOP = \
-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+	if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
 		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database $(Applicationdir); \
+			update-desktop-database $(DESTDIR)$(Applicationdir); \
 		fi \
 	fi
 
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.in gtranslator-1.9.5/data/desktop/Makefile.in
--- gtranslator-1.9.5.orig/data/desktop/Makefile.in	2009-04-11 05:38:53.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.in	2009-05-30 16:42:04.000000000 +0400
@@ -252,9 +252,9 @@
 
 CLEANFILES = $(Application_DATA)
 UPDATE_DESKTOP = \
-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+	if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
 		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database $(Applicationdir); \
+			update-desktop-database $(DESTDIR)$(Applicationdir); \
 		fi \
 	fi
 


Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gtranslator.spec	25 Jul 2009 01:49:33 -0000	1.28
+++ gtranslator.spec	29 Sep 2009 09:05:56 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           gtranslator
-Version:        1.9.5
-Release:        3%{?dist}
+Version:        1.9.6
+Release:        1%{?dist}
 Summary:        Gettext po file editor for GNOME
 
 Group:          Development/Tools
@@ -8,9 +8,7 @@ License:        GPLv2+
 URL:            http://gtranslator.sourceforge.net
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.9/%{name}-%{version}.tar.bz2
 # Bug reported: http://bugzilla.gnome.org/show_bug.cgi?id=584608
-Patch0:         %{name}-1.9.5-fix-update-desktop-database.patch
-# Compatibility with new gdl, may not be suitable for upstream
-Patch1:         %{name}-1.9.5-gdl2.27.patch
+Patch0:         %{name}-1.9.6-fix-update-desktop-database.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -55,7 +53,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -z .fix-update
-%patch1 -p1 -z .gdl
 
 
 %build
@@ -132,6 +129,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.6-1
+- Update to 1.9.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Jun 2009 18:30:05 -0000	1.8
+++ sources	29 Sep 2009 09:05:57 -0000	1.9
@@ -1 +1 @@
-66c7cc9c5cf2c085f3c7e74d9cb0cba9  gtranslator-1.9.5.tar.bz2
+a801d18edf63ee53b48495089d8935fe  gtranslator-1.9.6.tar.bz2


--- gtranslator-1.1.7-desktop.patch DELETED ---


--- gtranslator-1.1.7-scrollkeeper-rarian.patch DELETED ---


--- gtranslator-1.9.5-fix-update-desktop-database.patch DELETED ---


--- gtranslator-1.9.5-gdl2.27.patch DELETED ---



From atorkhov at fedoraproject.org  Tue Sep 29 09:09:02 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 09:09:02 +0000 (UTC)
Subject: rpms/gtranslator/F-12
	gtranslator-1.9.6-fix-update-desktop-database.patch, NONE,
	1.1 gtranslator.spec, 1.28, 1.29 sources, 1.8,
	1.9 gtranslator-1.1.7-desktop.patch, 1.1,
	NONE gtranslator-1.1.7-scrollkeeper-rarian.patch, 1.1,
	NONE gtranslator-1.9.5-fix-update-desktop-database.patch, 1.1,
	NONE gtranslator-1.9.5-gdl2.27.patch, 1.1, NONE
Message-ID: <20090929090902.C058B11C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/gtranslator/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32756

Modified Files:
	gtranslator.spec sources 
Added Files:
	gtranslator-1.9.6-fix-update-desktop-database.patch 
Removed Files:
	gtranslator-1.1.7-desktop.patch 
	gtranslator-1.1.7-scrollkeeper-rarian.patch 
	gtranslator-1.9.5-fix-update-desktop-database.patch 
	gtranslator-1.9.5-gdl2.27.patch 
Log Message:
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.6-1
- Update to 1.9.6


gtranslator-1.9.6-fix-update-desktop-database.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gtranslator-1.9.6-fix-update-desktop-database.patch ---
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.am gtranslator-1.9.5/data/desktop/Makefile.am
--- gtranslator-1.9.5.orig/data/desktop/Makefile.am	2009-04-11 05:03:51.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.am	2009-05-30 16:41:48.000000000 +0400
@@ -22,9 +22,9 @@
 CLEANFILES = $(Application_DATA)
 
 UPDATE_DESKTOP = \
-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+	if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
 		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database $(Applicationdir); \
+			update-desktop-database $(DESTDIR)$(Applicationdir); \
 		fi \
 	fi
 
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.in gtranslator-1.9.5/data/desktop/Makefile.in
--- gtranslator-1.9.5.orig/data/desktop/Makefile.in	2009-04-11 05:38:53.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.in	2009-05-30 16:42:04.000000000 +0400
@@ -252,9 +252,9 @@
 
 CLEANFILES = $(Application_DATA)
 UPDATE_DESKTOP = \
-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+	if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
 		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database $(Applicationdir); \
+			update-desktop-database $(DESTDIR)$(Applicationdir); \
 		fi \
 	fi
 


Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-12/gtranslator.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gtranslator.spec	25 Jul 2009 01:49:33 -0000	1.28
+++ gtranslator.spec	29 Sep 2009 09:09:01 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           gtranslator
-Version:        1.9.5
-Release:        3%{?dist}
+Version:        1.9.6
+Release:        1%{?dist}
 Summary:        Gettext po file editor for GNOME
 
 Group:          Development/Tools
@@ -8,9 +8,7 @@ License:        GPLv2+
 URL:            http://gtranslator.sourceforge.net
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.9/%{name}-%{version}.tar.bz2
 # Bug reported: http://bugzilla.gnome.org/show_bug.cgi?id=584608
-Patch0:         %{name}-1.9.5-fix-update-desktop-database.patch
-# Compatibility with new gdl, may not be suitable for upstream
-Patch1:         %{name}-1.9.5-gdl2.27.patch
+Patch0:         %{name}-1.9.6-fix-update-desktop-database.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -55,7 +53,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -z .fix-update
-%patch1 -p1 -z .gdl
 
 
 %build
@@ -132,6 +129,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.6-1
+- Update to 1.9.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Jun 2009 18:30:05 -0000	1.8
+++ sources	29 Sep 2009 09:09:01 -0000	1.9
@@ -1 +1 @@
-66c7cc9c5cf2c085f3c7e74d9cb0cba9  gtranslator-1.9.5.tar.bz2
+a801d18edf63ee53b48495089d8935fe  gtranslator-1.9.6.tar.bz2


--- gtranslator-1.1.7-desktop.patch DELETED ---


--- gtranslator-1.1.7-scrollkeeper-rarian.patch DELETED ---


--- gtranslator-1.9.5-fix-update-desktop-database.patch DELETED ---


--- gtranslator-1.9.5-gdl2.27.patch DELETED ---



From chitlesh at fedoraproject.org  Tue Sep 29 09:09:15 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 29 Sep 2009 09:09:15 +0000 (UTC)
Subject: rpms/electronics-menu/devel electronics-menu-1.0-makefile.patch, 1.1,
	1.2 electronics-menu-1.0-submenus.patch, 1.2,
	1.3 electronics-menu.spec, 1.6, 1.7 import.log, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090929090915.2625511C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv310/devel

Modified Files:
	electronics-menu-1.0-makefile.patch 
	electronics-menu-1.0-submenus.patch electronics-menu.spec 
	import.log sources 
Log Message:
fedora 12 fix


electronics-menu-1.0-makefile.patch:
 Makefile |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Index: electronics-menu-1.0-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/electronics-menu-1.0-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- electronics-menu-1.0-makefile.patch	9 Jul 2009 22:37:41 -0000	1.1
+++ electronics-menu-1.0-makefile.patch	29 Sep 2009 09:09:14 -0000	1.2
@@ -5,7 +5,7 @@
  	install -m 0644 -D applications-electronics-24.png $(DESTDIR)$(themedir)/24x24/categories/applications-electronics.png
  	install -m 0644 -D applications-electronics-48.png $(DESTDIR)$(themedir)/48x48/categories/applications-electronics.png
 +	pushd electronics-menu-1.0-submenu;\
-+	for SUBMENU in Automation Analog Digital Embedded SchematicPCB Spice Waveform; do \
++	for SUBMENU in Automation Analog Digital Embedded SchematicPCB Spice ; do \
 +		echo "Submenu $${SUBMENU}";\
 +		install -m 0644 electronics-$${SUBMENU}.directory $(DESTDIR)/usr/share/desktop-directories;\
 +		install -m 0644 -D applications-electronics-$${SUBMENU}.svg \

electronics-menu-1.0-submenus.patch:
 electronics.menu |   98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

Index: electronics-menu-1.0-submenus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/electronics-menu-1.0-submenus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- electronics-menu-1.0-submenus.patch	28 Aug 2009 18:30:53 -0000	1.2
+++ electronics-menu-1.0-submenus.patch	29 Sep 2009 09:09:14 -0000	1.3
@@ -1,6 +1,6 @@
 --- electronics.menu	2007-12-07 19:25:39.000000000 +0100
 +++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
-@@ -8,5 +8,112 @@
+@@ -8,5 +8,103 @@
      <Include>
        <Category>Electronics</Category>
      </Include>
@@ -28,7 +28,6 @@
 +      <Filename>kicad.desktop</Filename>
 +      <Filename>gspiceui.desktop</Filename>
 +      <Filename>gwave.desktop</Filename>
-+      <Filename>LabPlot.desktop</Filename>
 +      <Filename>dinotrace.desktop</Filename>
 +      <Filename>GNUSim8085.desktop</Filename>
 +      <Filename>gsim85.desktop</Filename>
@@ -100,15 +99,7 @@
 +      <Include>
 +        <Category>Spice</Category>
 +        <Filename>gspiceui.desktop</Filename>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Waveform Viewers</Name>
-+      <Directory>electronics-Waveform.directory</Directory>
-+      <Include>
-+        <Category>Waveform</Category>
 +        <Filename>gwave.desktop</Filename>
-+        <Filename>LabPlot.desktop</Filename>
 +      </Include>
 +    </Menu>
    </Menu>


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/electronics-menu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- electronics-menu.spec	28 Aug 2009 18:30:53 -0000	1.6
+++ electronics-menu.spec	29 Sep 2009 09:09:14 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -41,7 +41,8 @@ sed -i 's|install|install -p|g' Makefile
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
 for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
-                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped \
+                gspiceui geda-gschem geda-gattrib ktechlab gerbv piklab; do
 sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
 done
 
@@ -76,6 +77,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Tue Sep 29 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-7
+- Improved submenus structure for F-12
+
 * Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
 - Improved submenus structure for F-12
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Aug 2009 18:30:53 -0000	1.3
+++ import.log	29 Sep 2009 09:09:14 -0000	1.4
@@ -1,3 +1,4 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
 electronics-menu-1_0-4_fc11:HEAD:electronics-menu-1.0-4.fc11.src.rpm:1247178953
 electronics-menu-1_0-6_fc11:HEAD:electronics-menu-1.0-6.fc11.src.rpm:1251484109
+electronics-menu-1_0-7_fc11:HEAD:electronics-menu-1.0-7.fc11.src.rpm:1254214969


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 18:30:53 -0000	1.4
+++ sources	29 Sep 2009 09:09:14 -0000	1.5
@@ -1,2 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
-3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2
+5a4eed42e706d5d5e5a55f6a7d649f85  electronics-menu-1.0-submenu.tar.bz2



From chitlesh at fedoraproject.org  Tue Sep 29 09:10:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue, 29 Sep 2009 09:10:12 +0000 (UTC)
Subject: rpms/electronics-menu/F-12 electronics-menu-1.0-makefile.patch, 1.1,
	1.2 electronics-menu-1.0-submenus.patch, 1.2,
	1.3 electronics-menu.spec, 1.6, 1.7 import.log, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090929091012.2DE4411C0492@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv785/F-12

Modified Files:
	electronics-menu-1.0-makefile.patch 
	electronics-menu-1.0-submenus.patch electronics-menu.spec 
	import.log sources 
Log Message:
F-12 fix


electronics-menu-1.0-makefile.patch:
 Makefile |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Index: electronics-menu-1.0-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-12/electronics-menu-1.0-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- electronics-menu-1.0-makefile.patch	9 Jul 2009 22:37:41 -0000	1.1
+++ electronics-menu-1.0-makefile.patch	29 Sep 2009 09:10:11 -0000	1.2
@@ -5,7 +5,7 @@
  	install -m 0644 -D applications-electronics-24.png $(DESTDIR)$(themedir)/24x24/categories/applications-electronics.png
  	install -m 0644 -D applications-electronics-48.png $(DESTDIR)$(themedir)/48x48/categories/applications-electronics.png
 +	pushd electronics-menu-1.0-submenu;\
-+	for SUBMENU in Automation Analog Digital Embedded SchematicPCB Spice Waveform; do \
++	for SUBMENU in Automation Analog Digital Embedded SchematicPCB Spice ; do \
 +		echo "Submenu $${SUBMENU}";\
 +		install -m 0644 electronics-$${SUBMENU}.directory $(DESTDIR)/usr/share/desktop-directories;\
 +		install -m 0644 -D applications-electronics-$${SUBMENU}.svg \

electronics-menu-1.0-submenus.patch:
 electronics.menu |   98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

Index: electronics-menu-1.0-submenus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-12/electronics-menu-1.0-submenus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- electronics-menu-1.0-submenus.patch	28 Aug 2009 18:30:53 -0000	1.2
+++ electronics-menu-1.0-submenus.patch	29 Sep 2009 09:10:11 -0000	1.3
@@ -1,6 +1,6 @@
 --- electronics.menu	2007-12-07 19:25:39.000000000 +0100
 +++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
-@@ -8,5 +8,112 @@
+@@ -8,5 +8,103 @@
      <Include>
        <Category>Electronics</Category>
      </Include>
@@ -28,7 +28,6 @@
 +      <Filename>kicad.desktop</Filename>
 +      <Filename>gspiceui.desktop</Filename>
 +      <Filename>gwave.desktop</Filename>
-+      <Filename>LabPlot.desktop</Filename>
 +      <Filename>dinotrace.desktop</Filename>
 +      <Filename>GNUSim8085.desktop</Filename>
 +      <Filename>gsim85.desktop</Filename>
@@ -100,15 +99,7 @@
 +      <Include>
 +        <Category>Spice</Category>
 +        <Filename>gspiceui.desktop</Filename>
-+      </Include>
-+    </Menu>
-+    <Menu>
-+      <Name>Waveform Viewers</Name>
-+      <Directory>electronics-Waveform.directory</Directory>
-+      <Include>
-+        <Category>Waveform</Category>
 +        <Filename>gwave.desktop</Filename>
-+        <Filename>LabPlot.desktop</Filename>
 +      </Include>
 +    </Menu>
    </Menu>


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-12/electronics-menu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- electronics-menu.spec	28 Aug 2009 18:30:53 -0000	1.6
+++ electronics-menu.spec	29 Sep 2009 09:10:11 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -41,7 +41,8 @@ sed -i 's|install|install -p|g' Makefile
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
 for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
-                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped \
+                gspiceui geda-gschem geda-gattrib ktechlab gerbv piklab; do
 sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
 done
 
@@ -76,6 +77,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Tue Sep 29 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-7
+- Improved submenus structure for F-12
+
 * Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
 - Improved submenus structure for F-12
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 Aug 2009 18:30:53 -0000	1.3
+++ import.log	29 Sep 2009 09:10:11 -0000	1.4
@@ -1,3 +1,4 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
 electronics-menu-1_0-4_fc11:HEAD:electronics-menu-1.0-4.fc11.src.rpm:1247178953
 electronics-menu-1_0-6_fc11:HEAD:electronics-menu-1.0-6.fc11.src.rpm:1251484109
+electronics-menu-1_0-7_fc11:F-12:electronics-menu-1.0-7.fc11.src.rpm:1254215222


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 18:30:53 -0000	1.4
+++ sources	29 Sep 2009 09:10:11 -0000	1.5
@@ -1,2 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
-3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2
+5a4eed42e706d5d5e5a55f6a7d649f85  electronics-menu-1.0-submenu.tar.bz2



From atorkhov at fedoraproject.org  Tue Sep 29 09:13:56 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 09:13:56 +0000 (UTC)
Subject: rpms/gtranslator/F-11
	gtranslator-1.9.6-fix-update-desktop-database.patch, NONE,
	1.1 gtranslator.spec, 1.25, 1.26 sources, 1.8,
	1.9 gtranslator-1.1.7-desktop.patch, 1.1,
	NONE gtranslator-1.1.7-scrollkeeper-rarian.patch, 1.1,
	NONE gtranslator-1.9.5-fix-update-desktop-database.patch, 1.1, NONE
Message-ID: <20090929091356.5E9F711C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/gtranslator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1663

Modified Files:
	gtranslator.spec sources 
Added Files:
	gtranslator-1.9.6-fix-update-desktop-database.patch 
Removed Files:
	gtranslator-1.1.7-desktop.patch 
	gtranslator-1.1.7-scrollkeeper-rarian.patch 
	gtranslator-1.9.5-fix-update-desktop-database.patch 
Log Message:
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.6-1
- Update to 1.9.6


gtranslator-1.9.6-fix-update-desktop-database.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gtranslator-1.9.6-fix-update-desktop-database.patch ---
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.am gtranslator-1.9.5/data/desktop/Makefile.am
--- gtranslator-1.9.5.orig/data/desktop/Makefile.am	2009-04-11 05:03:51.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.am	2009-05-30 16:41:48.000000000 +0400
@@ -22,9 +22,9 @@
 CLEANFILES = $(Application_DATA)
 
 UPDATE_DESKTOP = \
-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+	if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
 		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database $(Applicationdir); \
+			update-desktop-database $(DESTDIR)$(Applicationdir); \
 		fi \
 	fi
 
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.in gtranslator-1.9.5/data/desktop/Makefile.in
--- gtranslator-1.9.5.orig/data/desktop/Makefile.in	2009-04-11 05:38:53.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.in	2009-05-30 16:42:04.000000000 +0400
@@ -252,9 +252,9 @@
 
 CLEANFILES = $(Application_DATA)
 UPDATE_DESKTOP = \
-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+	if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
 		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database $(Applicationdir); \
+			update-desktop-database $(DESTDIR)$(Applicationdir); \
 		fi \
 	fi
 


Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-11/gtranslator.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gtranslator.spec	4 Jun 2009 21:19:28 -0000	1.25
+++ gtranslator.spec	29 Sep 2009 09:13:56 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           gtranslator
-Version:        1.9.5
+Version:        1.9.6
 Release:        1%{?dist}
 Summary:        Gettext po file editor for GNOME
 
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://gtranslator.sourceforge.net
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.9/%{name}-%{version}.tar.bz2
 # Bug reported: http://bugzilla.gnome.org/show_bug.cgi?id=584608
-Patch0:         %{name}-1.9.5-fix-update-desktop-database.patch
+Patch0:         %{name}-1.9.6-fix-update-desktop-database.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -21,8 +21,7 @@ BuildRequires:  perl(XML::Parser)
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper, intltool
 BuildRequires:  gnome-doc-utils
-# For libuuid:
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  libuuid-devel
 
 Requires:       yelp
 Requires:       which
@@ -130,6 +129,15 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.6-1
+- Update to 1.9.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 14 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.5-2
+- Update for new gdl and requiring libuuid directly
+
 * Sat May 30 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.5-1
 - Update to 1.9.5 with help of patch by Arkady Shane. New version required a bunch of changes:
 - Dropped old patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Jun 2009 20:52:34 -0000	1.8
+++ sources	29 Sep 2009 09:13:56 -0000	1.9
@@ -1 +1 @@
-66c7cc9c5cf2c085f3c7e74d9cb0cba9  gtranslator-1.9.5.tar.bz2
+a801d18edf63ee53b48495089d8935fe  gtranslator-1.9.6.tar.bz2


--- gtranslator-1.1.7-desktop.patch DELETED ---


--- gtranslator-1.1.7-scrollkeeper-rarian.patch DELETED ---


--- gtranslator-1.9.5-fix-update-desktop-database.patch DELETED ---



From jpopelka at fedoraproject.org  Tue Sep 29 09:20:59 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 29 Sep 2009 09:20:59 +0000 (UTC)
Subject: rpms/netplug/devel import.log, NONE,
	1.1 netplug-1.2.9.1-execshield.patch, NONE,
	1.1 netplug-1.2.9.1-init.patch, NONE, 1.1 netplug.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929092059.18E8011C00C1@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/netplug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3308/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log netplug-1.2.9.1-execshield.patch 
	netplug-1.2.9.1-init.patch netplug.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
netplug-1_2_9_1-1_fc11:HEAD:netplug-1.2.9.1-1.src.rpm:1254215937

netplug-1.2.9.1-execshield.patch:
 Makefile            |   12 ++++++----
 if_info.c           |   27 +++++++++++-------------
 main.c              |   58 ++++++++++++++++++++++++++--------------------------
 man/man8/netplugd.8 |    2 -
 netplug.h           |    2 -
 5 files changed, 51 insertions(+), 50 deletions(-)

--- NEW FILE netplug-1.2.9.1-execshield.patch ---
diff -up netplug-1.2.9.1/if_info.c.execshield netplug-1.2.9.1/if_info.c
--- netplug-1.2.9.1/if_info.c.execshield	2008-12-23 00:36:23.000000000 +0100
+++ netplug-1.2.9.1/if_info.c	2009-09-09 10:02:12.000000000 +0200
@@ -95,15 +95,16 @@ flags_str(char *buf, unsigned int fl)
     return buf;
 }
 
-void
-for_each_iface(int (*func)(struct if_info *))
+struct if_info *
+for_each_iface(int (*func)(struct if_info *, long), long param)
 {
     for(int i = 0; i < INFOHASHSZ; i++) {
         for(struct if_info *info = if_info[i]; info != NULL; info = info->next) {
-            if ((*func)(info))
-                return;
+            if ((*func)(info, param))
+                return info;
         }
     }
+    return NULL;
 }
 
 /* Reevaluate the state machine based on the current state and flag settings */
@@ -285,22 +286,20 @@ ifsm_flagchange(struct if_info *info, un
 }
 
 /* handle a script termination and update the state accordingly */
+int find_pid(struct if_info *i, long param) {
+    if (i->worker == param) {
+        return 1;
+    }
+    return 0;
+}
+
 void ifsm_scriptdone(pid_t pid, int exitstatus)
 {
     int exitok = WIFEXITED(exitstatus) && WEXITSTATUS(exitstatus) == 0;
     struct if_info *info;
     assert(WIFEXITED(exitstatus) || WIFSIGNALED(exitstatus));
 
-    int find_pid(struct if_info *i) {
-        if (i->worker == pid) {
-            info = i;
-            return 1;
-        }
-        return 0;
-    }
-
-    info = NULL;
-    for_each_iface(find_pid);
+    info = for_each_iface(find_pid, pid);
 
     if (info == NULL) {
         do_log(LOG_INFO, "Unexpected child %d exited with status %d",
diff -up netplug-1.2.9.1/main.c.execshield netplug-1.2.9.1/main.c
--- netplug-1.2.9.1/main.c.execshield	2008-12-23 00:36:23.000000000 +0100
+++ netplug-1.2.9.1/main.c	2009-09-09 10:02:12.000000000 +0200
@@ -161,11 +161,28 @@ child_handler(int sig, siginfo_t *info, 
     ce.pid = info->si_pid;
     ret = waitpid(info->si_pid, &ce.status, 0);
     if (ret == info->si_pid)
-        write(child_handler_pipe[1], &ce, sizeof(ce));
+        (void)write(child_handler_pipe[1], &ce, sizeof(ce));
 }
 
 /* Poll the existing interface state, so we can catch any state
    changes for which we may not have neen a netlink message. */
+static int pollflags(struct if_info *info, long param) {
+    struct ifreq ifr;
+
+    if (!if_match(info->name))
+        return 0;
+
+    memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name));
+    if (ioctl(param, SIOCGIFFLAGS, &ifr) < 0)
+        do_log(LOG_ERR, "%s: can't get flags: %m", info->name);
+    else {
+        ifsm_flagchange(info, ifr.ifr_flags);
+        ifsm_flagpoll(info);
+    }
+
+    return 0;
+}
+
 static void
 poll_interfaces(void)
 {
@@ -180,24 +197,13 @@ poll_interfaces(void)
         close_on_exec(sockfd);
     }
 
-    int pollflags(struct if_info *info) {
-        struct ifreq ifr;
-
-        if (!if_match(info->name))
-            return 0;
-
-        memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name));
-        if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
-            do_log(LOG_ERR, "%s: can't get flags: %m", info->name);
-        else {
-            ifsm_flagchange(info, ifr.ifr_flags);
-            ifsm_flagpoll(info);
-        }
-
-        return 0;
-    }
+    for_each_iface(pollflags, sockfd);
+}
 
-    for_each_iface(pollflags);
+static int poll_flags(struct if_info *i, long param) {
+    if (if_match(i->name))
+        ifsm_flagpoll(i);
+    return 0;
 }
 
 int debug = 0;
@@ -331,17 +337,11 @@ main(int argc, char *argv[])
         { child_handler_pipe[0], POLLIN, 0 },
     };
 
-    {
-        /* Run over each of the interfaces we know and care about, and
-           make sure the state machine has done the appropriate thing
-           for their current state. */
-        int poll_flags(struct if_info *i) {
-            if (if_match(i->name))
-                ifsm_flagpoll(i);
-            return 0;
-        }
-        for_each_iface(poll_flags);
-    }
+    /* Run over each of the interfaces we know and care about, and
+       make sure the state machine has done the appropriate thing
+       for their current state. */
+    for_each_iface(poll_flags, 0);
+
 
     for(;;) {
         int ret;
diff -up netplug-1.2.9.1/Makefile.execshield netplug-1.2.9.1/Makefile
--- netplug-1.2.9.1/Makefile.execshield	2008-12-23 00:41:38.000000000 +0100
+++ netplug-1.2.9.1/Makefile	2009-09-09 10:02:12.000000000 +0200
@@ -4,15 +4,15 @@ DESTDIR ?=
 
 prefix ?=
 bindir ?= $(prefix)/sbin
-etcdir ?= $(prefix)/etc/netplug
+etcdir ?= $(prefix)/etc/netplug.d
 initdir ?= $(prefix)/etc/rc.d/init.d
 scriptdir ?= $(prefix)/etc/netplug.d
 mandir ?= $(prefix)/usr/share/man
 
 install_opts :=
 
-CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
-	-DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"'
+CFLAGS += -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
+	-DNP_SCRIPT_DIR='"$(scriptdir)"' -DNP_VERSION='"$(version)"'
 
 netplugd: config.o netlink.o lib.o if_info.o main.o
 	$(CC) $(LDFLAGS) -o $@ $^
@@ -30,10 +30,12 @@ install:
 	install $(install_opts) -m 755 scripts/rc.netplugd $(DESTDIR)/$(initdir)/netplugd
 	install $(install_opts) -m 444 man/man8/netplugd.8 $(DESTDIR)/$(mandir)/man8
 
-hg_root := $(shell hg root)
+#hg_root := $(shell hg root)
+hg_root := $(shell)
 tar_root := netplug-$(version)
 tar_file := $(hg_root)/$(tar_root).tar.bz2
-files := $(shell hg manifest)
+#files := $(shell hg manifest)
+files := $(shell)
 
 tarball: $(tar_file)
 
diff -up netplug-1.2.9.1/man/man8/netplugd.8.execshield netplug-1.2.9.1/man/man8/netplugd.8
--- netplug-1.2.9.1/man/man8/netplugd.8.execshield	2008-12-23 00:36:23.000000000 +0100
+++ netplug-1.2.9.1/man/man8/netplugd.8	2009-09-09 10:07:33.000000000 +0200
@@ -134,7 +134,7 @@ to run in the foreground, this option is
 .\"
 .Sh FILES
 .Bl -tag -width Ds
-.It Pa /etc/netplug/netplugd.conf
+.It Pa /etc/netplug.d/netplugd.conf
 Default config file to read, if none is specified on the command line.
 The config file format is one pattern per line, with white space,
 empty lines, and comments starting with a
diff -up netplug-1.2.9.1/netplug.h.execshield netplug-1.2.9.1/netplug.h
--- netplug-1.2.9.1/netplug.h.execshield	2008-12-23 00:36:23.000000000 +0100
+++ netplug-1.2.9.1/netplug.h	2009-09-09 10:02:12.000000000 +0200
@@ -83,7 +83,7 @@ struct if_info *if_info_update_interface
                                          struct rtattr *attrs[]);
 int if_info_save_interface(struct nlmsghdr *hdr, void *arg);
 void parse_rtattrs(struct rtattr *tb[], int max, struct rtattr *rta, int len);
-void for_each_iface(int (*func)(struct if_info *));
+struct if_info *for_each_iface(int (*func)(struct if_info *, long), long param);
 
 void ifsm_flagpoll(struct if_info *info);
 void ifsm_flagchange(struct if_info *info, unsigned int newflags);

netplug-1.2.9.1-init.patch:
 rc.netplugd |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE netplug-1.2.9.1-init.patch ---
diff -up netplug-1.2.9.1/scripts/rc.netplugd.init netplug-1.2.9.1/scripts/rc.netplugd
--- netplug-1.2.9.1/scripts/rc.netplugd.init	2008-12-23 00:36:23.000000000 +0100
+++ netplug-1.2.9.1/scripts/rc.netplugd	2009-09-08 11:55:03.000000000 +0200
@@ -17,11 +17,6 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -x /sbin/netplugd ] || exit 0
-
 if [ -f /etc/sysconfig/netplugd ]; then
     . /etc/sysconfig/netplugd
 fi
@@ -30,6 +25,8 @@ fi
 case "$1" in
   start)
 	# Start daemon.
+	[ ${NETWORKING} = "no" ] && exit 1
+	[ -x /sbin/netplugd ] || exit 1
 	echo -n $"Starting network plug daemon: "
 	daemon /sbin/netplugd ${NETPLUGDARGS} -p /var/run/netplugd.pid
 	RETVAL=$?
@@ -57,7 +54,7 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart}"
-	RETVAL=1
+	RETVAL=3
 	;;
 esac
 


--- NEW FILE netplug.spec ---
Summary: Daemon that responds to network cables being plugged in and out
Name: netplug
Version: 1.2.9.1
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://www.red-bean.com/~bos/
Source0: http://www.red-bean.com/~bos/netplug/netplug-%{version}.tar.bz2

#execshield patch for netplug <t8m at redhat.com>
Patch1: netplug-1.2.9.1-execshield.patch

#fix netplugd init script (#242919)
Patch2: netplug-1.2.9.1-init.patch

Requires: iproute >= 2.4.7
Conflicts: net-tools < 1.60-96
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service
BuildRequires: gettext

%description
Netplug is a daemon that manages network interfaces in response to
link-level events such as cables being plugged in and out.  When a
cable is plugged into an interface, the netplug daemon brings that
interface up.  When the cable is unplugged, the daemon brings that
interface back down.

This is extremely useful for systems such as laptops, which are
constantly being unplugged from one network and plugged into another,
and for moving systems in a machine room from one switch to another
without a need for manual intervention.

%prep
%setup -q
%patch1 -p1 -b .execshield
%patch2 -p1 -b .init

%build
export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
make

%install
make install prefix=%{buildroot} \
             initdir=%{buildroot}/%{_initrddir} \
             mandir=%{buildroot}/%{_mandir}

mkdir -p %{buildroot}/%{_mandir}/man5
ln -fs %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplug.5.gz
ln -fs %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplug.d.5.gz
ln -fs %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplugd.conf.5.gz

%clean
rm -rf %{buildroot}

%post
  /sbin/chkconfig --add netplugd
  exit 0

%preun
if [ "$1" = "0" ]; then
  /sbin/chkconfig --del netplugd || :
  /sbin/service netplugd stop &> /dev/null || :
fi
exit 0

%postun
  /sbin/service netplugd condrestart >/dev/null 2>&1 || :
  exit 0

%files
%defattr(-,root,root)
%doc COPYING README TODO
/sbin/netplugd
%{_mandir}/man[58]/*
%{_sysconfdir}/netplug.d
%config(noreplace) %{_sysconfdir}/netplug.d/netplugd.conf
%{_initrddir}/netplugd

%changelog

* Tue Sep 8 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-1
- Initial standalone package. Up to now netplug has been part of net-tools.

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netplug/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Sep 2009 16:14:40 -0000	1.1
+++ .cvsignore	29 Sep 2009 09:20:57 -0000	1.2
@@ -0,0 +1 @@
+netplug-1.2.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netplug/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Sep 2009 16:14:40 -0000	1.1
+++ sources	29 Sep 2009 09:20:58 -0000	1.2
@@ -0,0 +1 @@
+1e439dc3fc5a52de0b85467efbd25a57  netplug-1.2.9.1.tar.bz2



From atorkhov at fedoraproject.org  Tue Sep 29 09:21:55 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 09:21:55 +0000 (UTC)
Subject: rpms/gtranslator/F-11 gtranslator.spec,1.26,1.27
Message-ID: <20090929092155.8193D11C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/gtranslator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4374

Modified Files:
	gtranslator.spec 
Log Message:
Need to BR e2fsprogs on F-11.


Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-11/gtranslator.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gtranslator.spec	29 Sep 2009 09:13:56 -0000	1.26
+++ gtranslator.spec	29 Sep 2009 09:21:55 -0000	1.27
@@ -21,7 +21,8 @@ BuildRequires:  perl(XML::Parser)
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper, intltool
 BuildRequires:  gnome-doc-utils
-BuildRequires:  libuuid-devel
+# For libuuid:
+BuildRequires:  e2fsprogs-devel
 
 Requires:       yelp
 Requires:       which



From pbrobinson at fedoraproject.org  Tue Sep 29 09:24:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 09:24:06 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel mpp-nbtk12.patch, NONE,
	1.1 moblin-panel-people.spec, 1.2, 1.3
Message-ID: <20090929092406.BAA7211C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	moblin-panel-people.spec 
Added Files:
	mpp-nbtk12.patch 
Log Message:
- Add patch for nbtk-1.2 api

mpp-nbtk12.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE mpp-nbtk12.patch ---
>From 2209855447809359f400ac64b1cd5a530fb51171 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Tue, 15 Sep 2009 15:23:14 +0000
Subject: Update for API changes in nbtk-1.2

---
diff --git a/configure.ac b/configure.ac
index 31db938..9a05d5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ PKG_CHECK_MODULES(MPL, moblin-panel)
 PKG_CHECK_MODULES(PEOPLE,
                   anerley
                   gtk+-2.0 >= 2.14
-                  nbtk-1.0
+                  nbtk-1.2
                   gio-2.0
                   gio-unix-2.0)
 
diff --git a/src/mnb-people-panel.c b/src/mnb-people-panel.c
index 833f9a0..f7ea2ff 100644
--- a/src/mnb-people-panel.c
+++ b/src/mnb-people-panel.c
@@ -329,7 +329,7 @@ _make_empty_people_tile (MnbPeoplePanel *people_panel,
                                         "x-align",
                                         0.0,
                                         NULL);
-  nbtk_bin_set_alignment (NBTK_BIN (bin), NBTK_ALIGN_LEFT, NBTK_ALIGN_CENTER);
+  nbtk_bin_set_alignment (NBTK_BIN (bin), NBTK_ALIGN_START, NBTK_ALIGN_MIDDLE);
 
   priv->app_info = (GAppInfo *)g_desktop_app_info_new ("empathy-accounts.desktop");
 
@@ -748,8 +748,8 @@ mnb_people_panel_init (MnbPeoplePanel *self)
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->nobody_selected_box),
                                (ClutterActor *)label);
   nbtk_bin_set_alignment (NBTK_BIN (priv->nobody_selected_box),
-                          NBTK_ALIGN_CENTER,
-                          NBTK_ALIGN_TOP);
+                          NBTK_ALIGN_MIDDLE,
+                          NBTK_ALIGN_START);
   nbtk_bin_set_fill (NBTK_BIN (priv->nobody_selected_box),
                      FALSE,
                      FALSE);
--
cgit v0.8.2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-people.spec	28 Sep 2009 21:37:23 -0000	1.2
+++ moblin-panel-people.spec	29 Sep 2009 09:24:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -25,6 +25,8 @@ BuildRequires: gnome-common
 # git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
 # On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
 Patch0:        mpp-mc5-port.patch
+# http://git.moblin.org/cgit.cgi/moblin-panel-people/commit/?id=2209855447809359f400ac64b1cd5a530fb51171
+Patch1:        mpp-nbtk12.patch
 
 Requires: dbus
 
@@ -33,6 +35,7 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
+%patch1 -p1 -b .nbtk12
 %patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
@@ -59,6 +62,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
+- Add patch for nbtk-1.2 api
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
 - Add patch to port to new Mission Control
 



From pkgdb at fedoraproject.org  Tue Sep 29 09:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 09:29:10 +0000
Subject: [pkgdb] haskell-platform was added for petersen
Message-ID: <20090929092910.B4F5510F85F@bastion2.fedora.phx.redhat.com>

petersen has added Package haskell-platform with summary Standard Haskell distribution
petersen has approved Package haskell-platform
petersen has added a Fedora devel branch for haskell-platform with an owner of petersen
petersen has approved haskell-platform in Fedora devel
petersen has approved Package haskell-platform
petersen has set commit to Approved for 107427 on haskell-platform (Fedora devel)
petersen has set checkout to Approved for 107427 on haskell-platform (Fedora devel)
petersen has set build to Approved for 107427 on haskell-platform (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/haskell-platform



From pkgdb at fedoraproject.org  Tue Sep 29 09:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 09:29:13 +0000
Subject: [pkgdb] haskell-platform summary updated by petersen
Message-ID: <20090929092913.E6B2A10F88B@bastion2.fedora.phx.redhat.com>

petersen set package haskell-platform summary to Standard Haskell distribution

To make changes to this package see:
  /pkgdb/packages/name/haskell-platform



From pkgdb at fedoraproject.org  Tue Sep 29 09:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 09:29:13 +0000
Subject: [pkgdb] haskell-platform (Fedora, 12) updated by petersen
Message-ID: <20090929092914.2609710F8A8@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 12 branch for haskell-platform
petersen has set commit to Approved for 107427 on haskell-platform (Fedora 12)
petersen has set checkout to Approved for 107427 on haskell-platform (Fedora 12)
petersen has set build to Approved for 107427 on haskell-platform (Fedora 12)
petersen approved watchbugzilla on haskell-platform (Fedora 12) for haskell-sig
petersen approved watchcommits on haskell-platform (Fedora 12) for haskell-sig
petersen approved watchbugzilla on haskell-platform (Fedora 12) for bos
petersen approved watchcommits on haskell-platform (Fedora 12) for bos
petersen approved commit on haskell-platform (Fedora 12) for bos
petersen approved build on haskell-platform (Fedora 12) for bos
petersen approved approveacls on haskell-platform (Fedora 12) for bos

To make changes to this package see:
  /pkgdb/packages/name/haskell-platform



From pkgdb at fedoraproject.org  Tue Sep 29 09:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 09:29:13 +0000
Subject: [pkgdb] haskell-platform (Fedora, 12) updated by petersen
Message-ID: <20090929092914.4C90610F8AB@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 11 branch for haskell-platform
petersen has set commit to Approved for 107427 on haskell-platform (Fedora 11)
petersen has set checkout to Approved for 107427 on haskell-platform (Fedora 11)
petersen has set build to Approved for 107427 on haskell-platform (Fedora 11)
petersen approved watchbugzilla on haskell-platform (Fedora 11) for haskell-sig
petersen approved watchcommits on haskell-platform (Fedora 11) for haskell-sig
petersen approved watchbugzilla on haskell-platform (Fedora 11) for bos
petersen approved watchcommits on haskell-platform (Fedora 11) for bos
petersen approved commit on haskell-platform (Fedora 11) for bos
petersen approved build on haskell-platform (Fedora 11) for bos
petersen approved approveacls on haskell-platform (Fedora 11) for bos

To make changes to this package see:
  /pkgdb/packages/name/haskell-platform



From pkgdb at fedoraproject.org  Tue Sep 29 09:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 09:29:13 +0000
Subject: [pkgdb] haskell-platform (Fedora, 12) updated by petersen
Message-ID: <20090929092914.B357D10F8AC@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on haskell-platform (Fedora devel) for haskell-sig
petersen approved watchcommits on haskell-platform (Fedora devel) for haskell-sig
petersen approved watchbugzilla on haskell-platform (Fedora devel) for bos
petersen approved watchcommits on haskell-platform (Fedora devel) for bos
petersen approved commit on haskell-platform (Fedora devel) for bos
petersen approved build on haskell-platform (Fedora devel) for bos
petersen approved approveacls on haskell-platform (Fedora devel) for bos

To make changes to this package see:
  /pkgdb/packages/name/haskell-platform



From petersen at fedoraproject.org  Tue Sep 29 09:29:21 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:29:21 +0000 (UTC)
Subject: rpms/haskell-platform - New directory
Message-ID: <20090929092921.26CD011C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsCb6364/rpms/haskell-platform

Log Message:
Directory /cvs/pkgs/rpms/haskell-platform added to the repository




From petersen at fedoraproject.org  Tue Sep 29 09:29:21 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:29:21 +0000 (UTC)
Subject: rpms/haskell-platform/devel - New directory
Message-ID: <20090929092921.4CFDA11C0419@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsCb6364/rpms/haskell-platform/devel

Log Message:
Directory /cvs/pkgs/rpms/haskell-platform/devel added to the repository




From petersen at fedoraproject.org  Tue Sep 29 09:29:28 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:29:28 +0000 (UTC)
Subject: rpms/haskell-platform Makefile,NONE,1.1
Message-ID: <20090929092928.887DD11C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsCb6364/rpms/haskell-platform

Added Files:
	Makefile 
Log Message:
Setup of module haskell-platform


--- NEW FILE Makefile ---
# Top level Makefile for module haskell-platform
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 petersen at fedoraproject.org  Tue Sep 29 09:29:29 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:29:29 +0000 (UTC)
Subject: rpms/haskell-platform/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929092929.8EEFA11C0419@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsCb6364/rpms/haskell-platform/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module haskell-platform


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: haskell-platform
# $Id: Makefile,v 1.1 2009/09/29 09:29:29 petersen Exp $
NAME := haskell-platform
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 pbrobinson at fedoraproject.org  Tue Sep 29 09:32:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 09:32:53 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 mpp-nbtk12.patch, NONE,
	1.1 moblin-panel-people.spec, 1.2, 1.3 import.log, 1.1, NONE
Message-ID: <20090929093253.68D8311C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7036

Modified Files:
	moblin-panel-people.spec 
Added Files:
	mpp-nbtk12.patch 
Removed Files:
	import.log 
Log Message:
- Add patch for nbtk-1.2 api

mpp-nbtk12.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE mpp-nbtk12.patch ---
>From 2209855447809359f400ac64b1cd5a530fb51171 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Tue, 15 Sep 2009 15:23:14 +0000
Subject: Update for API changes in nbtk-1.2

---
diff --git a/configure.ac b/configure.ac
index 31db938..9a05d5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ PKG_CHECK_MODULES(MPL, moblin-panel)
 PKG_CHECK_MODULES(PEOPLE,
                   anerley
                   gtk+-2.0 >= 2.14
-                  nbtk-1.0
+                  nbtk-1.2
                   gio-2.0
                   gio-unix-2.0)
 
diff --git a/src/mnb-people-panel.c b/src/mnb-people-panel.c
index 833f9a0..f7ea2ff 100644
--- a/src/mnb-people-panel.c
+++ b/src/mnb-people-panel.c
@@ -329,7 +329,7 @@ _make_empty_people_tile (MnbPeoplePanel *people_panel,
                                         "x-align",
                                         0.0,
                                         NULL);
-  nbtk_bin_set_alignment (NBTK_BIN (bin), NBTK_ALIGN_LEFT, NBTK_ALIGN_CENTER);
+  nbtk_bin_set_alignment (NBTK_BIN (bin), NBTK_ALIGN_START, NBTK_ALIGN_MIDDLE);
 
   priv->app_info = (GAppInfo *)g_desktop_app_info_new ("empathy-accounts.desktop");
 
@@ -748,8 +748,8 @@ mnb_people_panel_init (MnbPeoplePanel *self)
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->nobody_selected_box),
                                (ClutterActor *)label);
   nbtk_bin_set_alignment (NBTK_BIN (priv->nobody_selected_box),
-                          NBTK_ALIGN_CENTER,
-                          NBTK_ALIGN_TOP);
+                          NBTK_ALIGN_MIDDLE,
+                          NBTK_ALIGN_START);
   nbtk_bin_set_fill (NBTK_BIN (priv->nobody_selected_box),
                      FALSE,
                      FALSE);
--
cgit v0.8.2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-people.spec	28 Sep 2009 21:37:23 -0000	1.2
+++ moblin-panel-people.spec	29 Sep 2009 09:32:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -25,6 +25,8 @@ BuildRequires: gnome-common
 # git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
 # On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
 Patch0:        mpp-mc5-port.patch
+# http://git.moblin.org/cgit.cgi/moblin-panel-people/commit/?id=2209855447809359f400ac64b1cd5a530fb51171
+Patch1:        mpp-nbtk12.patch
 
 Requires: dbus
 
@@ -33,6 +35,7 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
+%patch1 -p1 -b .nbtk12
 %patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
@@ -59,6 +62,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
+- Add patch for nbtk-1.2 api
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
 - Add patch to port to new Mission Control
 


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Tue Sep 29 09:35:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 09:35:06 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel moblin-panel-people.spec,1.3,1.4
Message-ID: <20090929093506.21C8411C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8726

Modified Files:
	moblin-panel-people.spec 
Log Message:
- Add telepathy-glib dependency


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-panel-people.spec	29 Sep 2009 09:24:06 -0000	1.3
+++ moblin-panel-people.spec	29 Sep 2009 09:35:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
 BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
+BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
 # Require these because the git tarball doesn't have the configure built
@@ -62,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-4
+- Add telepathy-glib dependency
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
 - Add patch for nbtk-1.2 api
 



From mlichvar at fedoraproject.org  Tue Sep 29 09:36:52 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 29 Sep 2009 09:36:52 +0000 (UTC)
Subject: rpms/xterm/devel xterm-248-scrollup.patch, NONE, 1.1 xterm.spec,
	1.78, 1.79
Message-ID: <20090929093652.E111311C00C1@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9302

Modified Files:
	xterm.spec 
Added Files:
	xterm-248-scrollup.patch 
Log Message:
- fix various bugs when display is scrolled up (#524503)


xterm-248-scrollup.patch:
 screen.c       |   25 +++++++++++---------
 util.c         |   69 +++++++++++++++++++++++++++++++++++----------------------
 xterm.log.html |   27 +++++++++++++++++++++-
 3 files changed, 83 insertions(+), 38 deletions(-)

--- NEW FILE xterm-248-scrollup.patch ---
# ftp://invisible-island.net/xterm/patches/temp/xterm-248c.patch.gz
# patch by Thomas E. Dickey <dickey at invisible-island.net>
# created  Fri Sep 25 10:44:37 UTC 2009
# ------------------------------------------------------------------------------
# screen.c       |    9 +++----
# util.c         |   69 ++++++++++++++++++++++++++++++++++---------------------
# xterm.log.html |   24 ++++++++++++++++++-
# 3 files changed, 71 insertions(+), 31 deletions(-)
# ------------------------------------------------------------------------------
Index: screen.c
--- xterm-248+/screen.c	2009-08-30 00:06:07.000000000 +0000
+++ xterm-248c/screen.c	2009-09-25 00:08:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.396 2009/08/30 00:06:07 tom Exp $ */
+/* $XTermId: screen.c,v 1.399 2009/09/25 00:08:26 tom Exp $ */
 
 /*
  * Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -704,7 +704,8 @@
     if_OPT_WIDE_CHARS(screen, {
 	int kl;
 	int kr;
-	if (DamagedCells(screen, len, &kl, &kr, INX2ROW(screen, row), col)
+
+	if (DamagedCells(screen, len, &kl, &kr, row, col)
 	    && kr >= kl) {
 	    ClearCells(xw, flags, (unsigned) (kr - kl + 1), row, kl);
 	}
@@ -1156,7 +1157,7 @@
     assert(last > (int) n);
 
     if_OPT_WIDE_CHARS(screen, {
-	int xx = INX2ROW(screen, screen->cur_row);
+	int xx = screen->cur_row;
 	int kl;
 	int kr = screen->cur_col;
 	if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) {
@@ -1220,7 +1221,7 @@
 	int kl;
 	int kr;
 	if (DamagedCells(screen, n, &kl, &kr,
-			 INX2ROW(screen, screen->cur_row),
+			 screen->cur_row,
 			 screen->cur_col))
 	    ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl);
     });
@@ -1647,13 +1648,15 @@
 
     TRACE(("ClearBufRows %d..%d\n", first, last));
     for (row = first; row <= last; row++) {
-	LineData *ld = getLineData(screen, ROW2INX(screen, row));
-	if_OPT_DEC_CHRSET({
-	    /* clearing the whole row resets the doublesize characters */
-	    SetLineDblCS(ld, CSET_SWL);
-	});
-	LineClrWrapped(ld);
-	ClearCells(xw, 0, len, row, 0);
+	LineData *ld = getLineData(screen, row);
+	if (ld != 0) {
+	    if_OPT_DEC_CHRSET({
+		/* clearing the whole row resets the doublesize characters */
+		SetLineDblCS(ld, CSET_SWL);
+	    });
+	    LineClrWrapped(ld);
+	    ClearCells(xw, 0, len, row, 0);
+	}
     }
 }
 
Index: util.c
--- xterm-248+/util.c	2009-09-10 09:22:43.000000000 +0000
+++ xterm-248c/util.c	2009-09-24 10:51:19.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.489 2009/09/10 09:22:43 tom Exp $ */
+/* $XTermId: util.c,v 1.496 2009/09/24 10:51:19 tom Exp $ */
 
 /*
  * Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -744,7 +744,7 @@
     int scrolltop;
     int scrollheight;
 
-    if (!ScrnIsLineInMargins(screen, INX2ROW(screen, screen->cur_row)))
+    if (!ScrnIsLineInMargins(screen, screen->cur_row))
 	return;
 
     TRACE(("InsertLine count=%d\n", n));
@@ -753,7 +753,12 @@
 	HideCursor();
 
     if (ScrnHaveSelection(screen)
-	&& ScrnAreLinesInSelection(screen, screen->top_marg, screen->bot_marg)) {
+	&& ScrnAreLinesInSelection(screen,
+				   INX2ROW(screen, screen->top_marg),
+				   INX2ROW(screen, screen->cur_row - 1))
+	&& ScrnAreLinesInSelection(screen,
+				   INX2ROW(screen, screen->cur_row),
+				   INX2ROW(screen, screen->bot_marg))) {
 	ScrnDisownSelection(xw);
     }
 
@@ -820,7 +825,7 @@
 					  && !screen->whichBuf
 					  && screen->cur_row == 0);
 
-    if (!ScrnIsLineInMargins(screen, INX2ROW(screen, screen->cur_row)))
+    if (!ScrnIsLineInMargins(screen, screen->cur_row))
 	return;
 
     TRACE(("DeleteLine count=%d\n", n));
@@ -828,14 +833,17 @@
     if (screen->cursor_state)
 	HideCursor();
 
+    if (n > (i = screen->bot_marg - screen->cur_row + 1)) {
+	n = i;
+    }
     if (ScrnHaveSelection(screen)
-	&& ScrnAreLinesInSelection(screen, screen->top_marg, screen->bot_marg)) {
+	&& ScrnAreLinesInSelection(screen,
+				   INX2ROW(screen, screen->cur_row),
+				   INX2ROW(screen, screen->cur_row + n - 1))) {
 	ScrnDisownSelection(xw);
     }
 
     screen->do_wrap = False;
-    if (n > (i = screen->bot_marg - screen->cur_row + 1))
-	n = i;
     if (screen->jumpscroll) {
 	if (screen->scroll_amt >= 0 && screen->cur_row == screen->top_marg) {
 	    if (screen->refresh_amt + n > MaxRows(screen))
@@ -847,8 +855,25 @@
 		FlushScroll(xw);
 	}
     }
-    if (!screen->scroll_amt) {
 
+    /* adjust screen->buf */
+    if (n > 0) {
+	if (scroll_all_lines)
+	    ScrnDeleteLine(xw,
+			   screen->saveBuf_index,
+			   screen->bot_marg + screen->savelines,
+			   0,
+			   (unsigned) n);
+	else
+	    ScrnDeleteLine(xw,
+			   screen->visbuf,
+			   screen->bot_marg,
+			   screen->cur_row,
+			   (unsigned) n);
+    }
+
+    /* repaint the screen, as needed */
+    if (!screen->scroll_amt) {
 	shift = INX2ROW(screen, 0);
 	bot = screen->max_row - shift;
 	scrollheight = i - n;
@@ -876,6 +901,14 @@
 	    }
 	}
 	vertical_copy_area(xw, scrolltop + n, scrollheight, n);
+	if (shift > 0 && refreshheight > 0) {
+	    int rows = refreshheight;
+	    if (rows > shift)
+		rows = shift;
+	    ScrnUpdate(xw, refreshtop, 0, rows, MaxCols(screen), True);
+	    refreshtop += shift;
+	    refreshheight -= shift;
+	}
 	if (refreshheight > 0) {
 	    ClearCurBackground(xw,
 			       (int) refreshtop * FontHeight(screen) + screen->border,
@@ -884,21 +917,6 @@
 			       (unsigned) Width(screen));
 	}
     }
-    /* adjust screen->buf */
-    if (n > 0) {
-	if (scroll_all_lines)
-	    ScrnDeleteLine(xw,
-			   screen->saveBuf_index,
-			   screen->bot_marg + screen->savelines,
-			   0,
-			   (unsigned) n);
-	else
-	    ScrnDeleteLine(xw,
-			   screen->visbuf,
-			   screen->bot_marg,
-			   screen->cur_row,
-			   (unsigned) n);
-    }
 }
 
 /*
@@ -1069,7 +1087,7 @@
 	    if (screen->scroll_amt)
 		FlushScroll(xw);
 	    if ((height = screen->cur_row + top) > screen->max_row)
-		height = screen->max_row;
+		height = screen->max_row + 1;
 	    if ((height -= top) > 0) {
 		ClearCurBackground(xw,
 				   top * FontHeight(screen) + screen->border,
@@ -1081,8 +1099,7 @@
 	ClearBufRows(xw, 0, screen->cur_row - 1);
     }
 
-    if (INX2ROW(screen, screen->cur_row) <= screen->max_row)
-	ClearLeft(xw);
+    ClearLeft(xw);
 }
 
 /*
Index: xterm.log.html
--- xterm-248+/xterm.log.html	2009-09-11 23:10:00.000000000 +0000
+++ xterm-248c/xterm.log.html	2009-09-24 08:39:31.000000000 +0000
@@ -20,7 +20,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.790 2009/09/11 23:10:00 tom Exp $
+  $XTermId: xterm.log.html,v 1.793 2009/09/24 08:39:31 tom Exp $
   -->
 <HTML>
 <HEAD>
@@ -45,6 +45,7 @@
 is the latest version of this file.
 
 <UL>
+<LI><A HREF="#xterm_dev">Develop</A>
 <LI><A HREF="#xterm_248">Patch #248 - 2009/9/11</A>
 <LI><A HREF="#xterm_247">Patch #247 - 2009/8/30</A>
 <LI><A HREF="#xterm_246">Patch #246 - 2009/8/16</A>
@@ -296,6 +297,30 @@
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_dev">Develop</A></H1>
+<ul>
+	<li>fix an (old) flaw in the delete-line operation where the text which
+	    is scrolled into view while the display is scrolled up was not
+	    repainted.
+
+	<li>improve delete-line and insert-line operations, retaining selection
+	    when the selection does not intersect the deleted/inserted lines.
+
+	<li>fix an (old) off-by-one error when an application cleared above the
+	    cursor position while the display was scrolled up, that would leave
+	    an extra line of text uncleared.
+
+	<li>fix a similar problem where the double-size attribute would not be
+	    reset when clearing the screen while the display was scrolled up.
+
+	<li>fix an indexing error which would occur if an application cleared
+	    a line while the display was scrolled up and was also in UTF-8 mode
+	    (Redhat #524503).
+	    The error was from <a href="#xterm_228">patch #228</a>
+	    but more visible after
+	    changes from <a href="#xterm_244">patch #244</a>.
+</ul>
+
 <H1><A NAME="xterm_248">Patch #248 - 2009/9/11</A></H1>
 <ul>
 	<li>fix an overlooked adjustment for selecting double-width characters


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- xterm.spec	17 Sep 2009 16:32:36 -0000	1.78
+++ xterm.spec	29 Sep 2009 09:36:52 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
 Version: 248
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -16,6 +16,7 @@ Source2: %{name}.desktop
 Patch1: xterm-245-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
+Patch4: xterm-248-scrollup.patch
 
 %bcond_with trace
 
@@ -32,6 +33,7 @@ programs that can't use the window syste
 %patch1 -p1 -b .resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .scrollup
 
 %build
 %configure \
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 248-2
+- fix various bugs when display is scrolled up (#524503)
+
 * Thu Sep 17 2009 Miroslav Lichvar <mlichvar at redhat.com> 248-1
 - update to 248
 



From petersen at fedoraproject.org  Tue Sep 29 09:44:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:44:17 +0000 (UTC)
Subject: rpms/haskell-platform/devel haskell-platform.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929094418.07E0511C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10179/devel

Modified Files:
	.cvsignore sources 
Added Files:
	haskell-platform.spec import.log 
Log Message:
initial import (#523883)



--- NEW FILE haskell-platform.spec ---
%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

%define platform_progs()\
%{?1}Requires:       ghc = 6.10.4\
%{?1}Requires:       cabal-install = 0.6.2\
%{?1}Requires:       alex = 2.3.1\
%{?1}Requires:       happy = 1.18.4\
%{nil}

%define platform_libs()\
%{?2}Requires:       ghc-cgi-%1 = 3001.1.7.1\
%{?2}Requires:       ghc-fgl-%1 = 5.4.2.2\
%{?2}Requires:       ghc-editline-%1 = 0.2.1.0\
%{?2}Requires:       ghc-GLUT-%1 = 2.1.1.2\
%{?2}Requires:       ghc-network-%1 = 2.2.1.4\
%{?2}Requires:       ghc-OpenGL-%1 = 2.2.1.1\
%{?2}Requires:       ghc-time-%1 = 1.1.2.4\
%{?2}Requires:       ghc-zlib-%1 = 0.5.0.0\
%{?2}Requires:       ghc-HTTP-%1 = 4000.0.6\
# following are part of ghc-6.10 extralibs\
# %{?2}Requires:       ghc-HUnit-%1 = 1.2.0.3\
# (all rest need to be packaged for 6.12):\
# %{?2}Requires:       ghc-QuickCheck-%1 = 1.2.0.0\
# %{?2}Requires:       ghc-haskell-src-%1 = 1.0.1.3\
# %{?2}Requires:       ghc-html-%1 = 1.0.1.2\
# %{?2}Requires:       ghc-mtl-%1 = 1.1.0.2\
# %{?2}Requires:       ghc-parsec-%1 = 2.1.0.1\
# %{?2}Requires:       ghc-parallel-%1 = 1.1.0.1\
# %{?2}Requires:       ghc-regex-base-%1 = 0.72.0.2\
# %{?2}Requires:       ghc-regex-compat-%1 = 0.71.0.1\
# %{?2}Requires:       ghc-regex-posix-%1 = 0.72.0.3\
# %{?2}Requires:       ghc-stm-%1 = 2.1.1.2\
# %{?2}Requires:       ghc-xhtml-%1 = 3000.2.0.1\
%{nil}


Name:           haskell-platform
Version:        2009.2.0.2
Release:        3%{?dist}
Summary:        Standard Haskell distribution

Group:          Development/Tools
License:        BSD
URL:            http://hackage.haskell.org/platform
Source0:        http://hackage.haskell.org/platform/%{version}/cabal/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif
%platform_progs Build
%platform_libs devel Build
%platform_progs
Requires:       ghc-haskell-platform-devel = %{version}

%description
The Haskell Platform is a blessed library and tool suite for Haskell
distilled from Hackage.


%package -n ghc-%{name}-devel
Summary:        Standard Haskell distribution libraries
Group:          Development/Libraries
Provides:       ghc-%{name} = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
%platform_libs devel

%description -n ghc-%{name}-devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package -n ghc-%{name}-doc
Summary:        Standard Haskell distribution documentation
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}
%platform_libs doc

%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:        Standard Haskell distribution profiling libraries
Group:          Development/Libraries
Requires:       ghc-%{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
%platform_libs prof

%description -n ghc-%{name}-prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q


%build
%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
# metapackage so need to create:
mkdir -p $RPM_BUILD_ROOT%{ghcpkgdir}
%ghc_install_scripts
%ghc_gen_filelists ghc-%{name}


%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 LICENSE


%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 Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-3
- fix rpmlint warnings (bos, #523883)

* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-2
- add all the buildrequires (#523883)
- create ghcpkgdir since metapackage
- nothing in bindir

* Thu Sep 17 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-1
- initial packaging for Fedora


--- NEW FILE import.log ---
haskell-platform-2009_2_0_2-3_fc11:HEAD:haskell-platform-2009.2.0.2-3.fc11.src.rpm:1254217386


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 09:29:28 -0000	1.1
+++ .cvsignore	29 Sep 2009 09:44:16 -0000	1.2
@@ -0,0 +1 @@
+haskell-platform-2009.2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 09:29:29 -0000	1.1
+++ sources	29 Sep 2009 09:44:17 -0000	1.2
@@ -0,0 +1 @@
+e81ffeb6ab1905975a6bdd8e96adb5f4  haskell-platform-2009.2.0.2.tar.gz



From petersen at fedoraproject.org  Tue Sep 29 09:49:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:49:35 +0000 (UTC)
Subject: rpms/ghc-cgi/F-11 ghc-cgi.spec,1.2,1.3
Message-ID: <20090929094935.D98D911C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-cgi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11035

Modified Files:
	ghc-cgi.spec 
Log Message:
downgrade haskell-platform


Index: ghc-cgi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-cgi/F-11/ghc-cgi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-cgi.spec	28 Sep 2009 01:22:27 -0000	1.2
+++ ghc-cgi.spec	29 Sep 2009 09:49:35 -0000	1.3
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2009.2.0.2
+# part of haskell-platform-2009.2.0.1
 Version:        3001.1.7.1
 Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library



From petersen at fedoraproject.org  Tue Sep 29 09:52:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 09:52:08 +0000 (UTC)
Subject: rpms/haskell-platform/F-12 haskell-platform.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929095208.D569A11C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11421

Modified Files:
	.cvsignore sources 
Added Files:
	haskell-platform.spec 
Log Message:
import from devel


--- NEW FILE haskell-platform.spec ---
%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

%define platform_progs()\
%{?1}Requires:       ghc = 6.10.4\
%{?1}Requires:       cabal-install = 0.6.2\
%{?1}Requires:       alex = 2.3.1\
%{?1}Requires:       happy = 1.18.4\
%{nil}

%define platform_libs()\
%{?2}Requires:       ghc-cgi-%1 = 3001.1.7.1\
%{?2}Requires:       ghc-fgl-%1 = 5.4.2.2\
%{?2}Requires:       ghc-editline-%1 = 0.2.1.0\
%{?2}Requires:       ghc-GLUT-%1 = 2.1.1.2\
%{?2}Requires:       ghc-network-%1 = 2.2.1.4\
%{?2}Requires:       ghc-OpenGL-%1 = 2.2.1.1\
%{?2}Requires:       ghc-time-%1 = 1.1.2.4\
%{?2}Requires:       ghc-zlib-%1 = 0.5.0.0\
%{?2}Requires:       ghc-HTTP-%1 = 4000.0.6\
# following are part of ghc-6.10 extralibs\
# %{?2}Requires:       ghc-HUnit-%1 = 1.2.0.3\
# (all rest need to be packaged for 6.12):\
# %{?2}Requires:       ghc-QuickCheck-%1 = 1.2.0.0\
# %{?2}Requires:       ghc-haskell-src-%1 = 1.0.1.3\
# %{?2}Requires:       ghc-html-%1 = 1.0.1.2\
# %{?2}Requires:       ghc-mtl-%1 = 1.1.0.2\
# %{?2}Requires:       ghc-parsec-%1 = 2.1.0.1\
# %{?2}Requires:       ghc-parallel-%1 = 1.1.0.1\
# %{?2}Requires:       ghc-regex-base-%1 = 0.72.0.2\
# %{?2}Requires:       ghc-regex-compat-%1 = 0.71.0.1\
# %{?2}Requires:       ghc-regex-posix-%1 = 0.72.0.3\
# %{?2}Requires:       ghc-stm-%1 = 2.1.1.2\
# %{?2}Requires:       ghc-xhtml-%1 = 3000.2.0.1\
%{nil}


Name:           haskell-platform
Version:        2009.2.0.2
Release:        3%{?dist}
Summary:        Standard Haskell distribution

Group:          Development/Tools
License:        BSD
URL:            http://hackage.haskell.org/platform
Source0:        http://hackage.haskell.org/platform/%{version}/cabal/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif
%platform_progs Build
%platform_libs devel Build
%platform_progs
Requires:       ghc-haskell-platform-devel = %{version}

%description
The Haskell Platform is a blessed library and tool suite for Haskell
distilled from Hackage.


%package -n ghc-%{name}-devel
Summary:        Standard Haskell distribution libraries
Group:          Development/Libraries
Provides:       ghc-%{name} = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
%platform_libs devel

%description -n ghc-%{name}-devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package -n ghc-%{name}-doc
Summary:        Standard Haskell distribution documentation
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}
%platform_libs doc

%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:        Standard Haskell distribution profiling libraries
Group:          Development/Libraries
Requires:       ghc-%{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
%platform_libs prof

%description -n ghc-%{name}-prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q


%build
%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
# metapackage so need to create:
mkdir -p $RPM_BUILD_ROOT%{ghcpkgdir}
%ghc_install_scripts
%ghc_gen_filelists ghc-%{name}


%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 LICENSE


%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 Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-3
- fix rpmlint warnings (bos, #523883)

* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-2
- add all the buildrequires (#523883)
- create ghcpkgdir since metapackage
- nothing in bindir

* Thu Sep 17 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-1
- initial packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 09:29:28 -0000	1.1
+++ .cvsignore	29 Sep 2009 09:52:08 -0000	1.2
@@ -0,0 +1 @@
+haskell-platform-2009.2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 09:29:29 -0000	1.1
+++ sources	29 Sep 2009 09:52:08 -0000	1.2
@@ -0,0 +1 @@
+e81ffeb6ab1905975a6bdd8e96adb5f4  haskell-platform-2009.2.0.2.tar.gz



From petersen at fedoraproject.org  Tue Sep 29 10:03:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 29 Sep 2009 10:03:54 +0000 (UTC)
Subject: rpms/ghc-HTTP/F-11 ghc-HTTP.spec,1.7,1.8
Message-ID: <20090929100354.8A96411C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14134

Modified Files:
	ghc-HTTP.spec 
Log Message:
sync haskell-platform update from devel


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/F-11/ghc-HTTP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ghc-HTTP.spec	30 May 2009 03:24:45 -0000	1.7
+++ ghc-HTTP.spec	29 Sep 2009 10:03:52 -0000	1.8
@@ -7,9 +7,9 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform
+# part of haskell-platform-2009.2.0.1
 Version:        4000.0.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Haskell HTTP client library
 
 Group:          Development/Libraries
@@ -19,13 +19,15 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc-network-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-network-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-network-prof
 %endif
 
 %description
@@ -39,6 +41,7 @@ Provides:       ghc-%{pkg_name} = %{vers
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-network-devel
 
 %description devel
 A Haskell library for client-side HTTP.
@@ -54,6 +57,7 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
+Requires:       ghc-network-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -66,6 +70,7 @@ Summary:        Profiling libraries for 
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-network-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -139,6 +144,12 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-5
+- buildrequire the new ghc-network library
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4000.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 30 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-3
 - ppc workaround no longer needed with ghc-6.10.3
 - provide ghc-HTTP (cabal2spec-0.17)



From dnovotny at fedoraproject.org  Tue Sep 29 10:09:18 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 29 Sep 2009 10:09:18 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.139,1.140
Message-ID: <20090929100918.38B8111C00C1@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15604

Modified Files:
	emacs.spec 
Log Message:
fix #516391



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- emacs.spec	24 Sep 2009 09:44:20 -0000	1.139
+++ emacs.spec	29 Sep 2009 10:09:17 -0000	1.140
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -51,6 +51,9 @@ BuildRequires: desktop-file-utils
 Requires:      desktop-file-utils
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
+# #516391
+Obsoletes: emacs-nxml-mode < 0.20041004-10
+Provides: emacs-nxml-mode = 0.20041004-10
 
 # C and build patches
 
@@ -378,6 +381,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-10
+- emacs contains nxml-mode (#516391)
+
 * Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
 - use xdg-open(1) for opening URLs (#316131)
 



From pbrobinson at fedoraproject.org  Tue Sep 29 10:15:19 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:15:19 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel mpp-mc5-port.patch,1.1,1.2
Message-ID: <20090929101519.3212711C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17069

Modified Files:
	mpp-mc5-port.patch 
Log Message:
- update anerley version in patch

mpp-mc5-port.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

Index: mpp-mc5-port.patch
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/mpp-mc5-port.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mpp-mc5-port.patch	28 Sep 2009 21:37:23 -0000	1.1
+++ mpp-mc5-port.patch	29 Sep 2009 10:15:17 -0000	1.2
@@ -15,7 +15,7 @@ index 930e188..2687e21 100644
  PKG_CHECK_MODULES(MPL, moblin-panel)
  PKG_CHECK_MODULES(PEOPLE,
 -                  anerley
-+                  anerley >= 0.1.3
++                  anerley >= 0.1.1
                    gtk+-2.0 >= 2.14
                    nbtk-1.2
                    gio-2.0



From jsafrane at fedoraproject.org  Tue Sep 29 10:15:30 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue, 29 Sep 2009 10:15:30 +0000 (UTC)
Subject: rpms/net-snmp/F-12 net-snmp.spec,1.188,1.189
Message-ID: <20090929101530.8E07811C00C1@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17125

Modified Files:
	net-snmp.spec 
Log Message:
remove static libraries from -devel subpackage


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/F-12/net-snmp.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- net-snmp.spec	14 Sep 2009 09:53:25 -0000	1.188
+++ net-snmp.spec	29 Sep 2009 10:15:30 -0000	1.189
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -194,7 +194,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
 %endif
 
 %configure \
-    --enable-static --enable-shared			\
+    --disable-static --enable-shared			\
     --with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"	\
 %ifnarch s390 s390x
     --with-ldflags="$LDFLAGS -lcrypto -lsensors"	\
@@ -393,7 +393,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(0644,root,root,0755)
 %{_libdir}/lib*.so
-%{_libdir}/*.a
 /usr/include/*
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
 %attr(0755,root,root)	%{_bindir}/net-snmp-config*
@@ -429,7 +428,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
-* Mon Sep 14 2009 Jan Safranek <orion at cora.nwra.com> 1:5.4.2.1-17
+* Tue Sep 29 2009 Jan Safranek <jsafranek at redhat.com> 5.4.2.1-18
+- remove static libraries from -devel subpackage
+
+* Mon Sep 14 2009 Jan Safranek <jsafranek at redhat.com> 5.4.2.1-17
 - implement force-reload command in initscripts (#523126)
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:5.4.2.1-16



From pbrobinson at fedoraproject.org  Tue Sep 29 10:16:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:16:47 +0000 (UTC)
Subject: rpms/anerley/devel anerley-pkgcfg-mc5.patch, NONE, 1.1 anerley.spec,
	1.6, 1.7
Message-ID: <20090929101647.7BCB111C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17648

Modified Files:
	anerley.spec 
Added Files:
	anerley-pkgcfg-mc5.patch 
Log Message:
- Add patch for pkgconfig file for mc5

anerley-pkgcfg-mc5.patch:
 anerley.pc.in |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE anerley-pkgcfg-mc5.patch ---
--- anerley-0.1.1/anerley.pc.in.orig	2009-09-29 11:06:21.000000000 +0100
+++ anerley-0.1.1/anerley.pc.in	2009-09-29 11:06:39.000000000 +0100
@@ -8,6 +8,4 @@
 Version: @VERSION@
 Libs: -L${libdir} -lanerley
 Cflags: -I${includedir}
-Requires: glib-2.0 dbus-glib-1 telepathy-glib libmissioncontrol nbtk-1.2 libebook-1.2
-
-
+Requires: glib-2.0 dbus-glib-1 telepathy-glib nbtk-1.2 libebook-1.2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- anerley.spec	28 Sep 2009 21:20:57 -0000	1.6
+++ anerley.spec	29 Sep 2009 10:16:47 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           anerley
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # git show -p 3aa84f86a5c0d33d3dc3199b3891ac6a30c8fae0~9..
 # On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/anerley.git
 Patch0:        anerley-mc5-port.patch
+Patch1:        anerley-pkgcfg-mc5.patch
 
 BuildRequires: evolution-data-server-devel
 BuildRequires: glib2-devel
@@ -44,6 +45,7 @@ Files for development with %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .mc5
+%patch1 -p1 -b .pkgcfg
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-3
+- Add patch for pkgconfig file for mc5
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.1.1-2
 - Add patch to port to Mission Control 5
 



From pbrobinson at fedoraproject.org  Tue Sep 29 10:17:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:17:43 +0000 (UTC)
Subject: rpms/anerley/F-12 anerley-pkgcfg-mc5.patch, NONE, 1.1 anerley.spec, 
	1.6, 1.7
Message-ID: <20090929101743.D314511C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17836

Modified Files:
	anerley.spec 
Added Files:
	anerley-pkgcfg-mc5.patch 
Log Message:
- Add patch for pkgconfig file for mc5

anerley-pkgcfg-mc5.patch:
 anerley.pc.in |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE anerley-pkgcfg-mc5.patch ---
--- anerley-0.1.1/anerley.pc.in.orig	2009-09-29 11:06:21.000000000 +0100
+++ anerley-0.1.1/anerley.pc.in	2009-09-29 11:06:39.000000000 +0100
@@ -8,6 +8,4 @@
 Version: @VERSION@
 Libs: -L${libdir} -lanerley
 Cflags: -I${includedir}
-Requires: glib-2.0 dbus-glib-1 telepathy-glib libmissioncontrol nbtk-1.2 libebook-1.2
-
-
+Requires: glib-2.0 dbus-glib-1 telepathy-glib nbtk-1.2 libebook-1.2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- anerley.spec	28 Sep 2009 21:20:57 -0000	1.6
+++ anerley.spec	29 Sep 2009 10:17:43 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           anerley
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # git show -p 3aa84f86a5c0d33d3dc3199b3891ac6a30c8fae0~9..
 # On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/anerley.git
 Patch0:        anerley-mc5-port.patch
+Patch1:        anerley-pkgcfg-mc5.patch
 
 BuildRequires: evolution-data-server-devel
 BuildRequires: glib2-devel
@@ -44,6 +45,7 @@ Files for development with %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .mc5
+%patch1 -p1 -b .pkgcfg
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-3
+- Add patch for pkgconfig file for mc5
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.1.1-2
 - Add patch to port to Mission Control 5
 



From pbrobinson at fedoraproject.org  Tue Sep 29 10:19:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:19:27 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel moblin-panel-status.spec, 1.4,
	1.5 mps-mc5-port.patch, 1.1, 1.2
Message-ID: <20090929101927.21DAE11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18139

Modified Files:
	moblin-panel-status.spec mps-mc5-port.patch 
Log Message:
- Add new telepathy-glib dep


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-panel-status.spec	28 Sep 2009 21:34:30 -0000	1.4
+++ moblin-panel-status.spec	29 Sep 2009 10:19:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
 Version:        0.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@ BuildRequires: gtk2-devel
 BuildRequires: mojito-devel
 BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
-BuildRequires: telepathy-mission-control-devel
+BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
 # Generated with:
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-3
+- Add new telepathy-glib dep
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.5-2
 - Add patch for new Mission Control support
 

mps-mc5-port.patch:
 configure.ac                |    3 
 src/mnb-im-status-row.c     |  150 +++++++++++++++--------
 src/mnb-status-marshal.list |    2 
 src/moblin-panel-status.c   |  285 +++++++++++++++++++-------------------------
 4 files changed, 227 insertions(+), 213 deletions(-)

Index: mps-mc5-port.patch
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/mps-mc5-port.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mps-mc5-port.patch	28 Sep 2009 21:34:30 -0000	1.1
+++ mps-mc5-port.patch	29 Sep 2009 10:19:26 -0000	1.2
@@ -1,25 +1,3 @@
-commit 419ffd4e56794e2b5ab068586d55419b7a808356
-Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Date:   Mon Sep 28 15:35:49 2009 +0100
-
-    configure.ac: add a versioned depends on telepathy-glib
-    
-    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
-
-diff --git a/configure.ac b/configure.ac
-index 555a04b..4bd087b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ PKG_CHECK_MODULES([STATUS],
-                    clutter-x11-1.0 >= 1.0.0     dnl
-                    clutter-gtk-0.10
-                    mojito-client >= 0.20.1      dnl
--                   telepathy-glib
-+                   telepathy-glib >= 0.9.0
-                    nbtk-1.2])
- 
- AC_ARG_ENABLE([cache],
-
 commit 937414d951216d1bb5399ef33d9777f66c09869a
 Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
 Date:   Sat Sep 26 17:03:59 2009 +0100
@@ -786,7 +764,7 @@ index b29fbc1..555a04b 100644
 -                   libmissioncontrol            dnl
 +                   clutter-gtk-0.10
                     mojito-client >= 0.20.1      dnl
-+                   telepathy-glib
++                   telepathy-glib >= 0.9.0
                     nbtk-1.2])
  
  AC_ARG_ENABLE([cache],



From pbrobinson at fedoraproject.org  Tue Sep 29 10:22:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:22:22 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel import.log,1.1,NONE
Message-ID: <20090929102222.72B7F11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19308

Removed Files:
	import.log 
Log Message:
-remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Tue Sep 29 10:23:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:23:11 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 moblin-panel-people.spec, 1.3,
	1.4 mpp-mc5-port.patch, 1.1, 1.2
Message-ID: <20090929102311.4018411C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19539

Modified Files:
	moblin-panel-people.spec mpp-mc5-port.patch 
Log Message:
- Add telepathy-glib dependency


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-panel-people.spec	29 Sep 2009 09:32:52 -0000	1.3
+++ moblin-panel-people.spec	29 Sep 2009 10:23:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
 BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
+BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
 # Require these because the git tarball doesn't have the configure built
@@ -62,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-4
+- Add telepathy-glib dependency
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
 - Add patch for nbtk-1.2 api
 

mpp-mc5-port.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

Index: mpp-mc5-port.patch
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/mpp-mc5-port.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mpp-mc5-port.patch	28 Sep 2009 21:37:23 -0000	1.1
+++ mpp-mc5-port.patch	29 Sep 2009 10:23:11 -0000	1.2
@@ -15,7 +15,7 @@ index 930e188..2687e21 100644
  PKG_CHECK_MODULES(MPL, moblin-panel)
  PKG_CHECK_MODULES(PEOPLE,
 -                  anerley
-+                  anerley >= 0.1.3
++                  anerley >= 0.1.1
                    gtk+-2.0 >= 2.14
                    nbtk-1.2
                    gio-2.0



From pkgdb at fedoraproject.org  Tue Sep 29 10:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 10:24:56 +0000
Subject: [pkgdb] alsa-plugins ownership updated
Message-ID: <20090929102457.8B8FD10F85F@bastion2.fedora.phx.redhat.com>

Package alsa-plugins in Fedora devel is now owned by perex

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From pbrobinson at fedoraproject.org  Tue Sep 29 10:24:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:24:50 +0000 (UTC)
Subject: rpms/moblin-panel-status/F-12 moblin-panel-status.spec, 1.4,
	1.5 mps-mc5-port.patch, 1.1, 1.2
Message-ID: <20090929102450.CD3F411C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19927

Modified Files:
	moblin-panel-status.spec mps-mc5-port.patch 
Log Message:
- Add new telepathy-glib dep


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/moblin-panel-status.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-panel-status.spec	28 Sep 2009 21:34:30 -0000	1.4
+++ moblin-panel-status.spec	29 Sep 2009 10:24:50 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
 Version:        0.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@ BuildRequires: gtk2-devel
 BuildRequires: mojito-devel
 BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
-BuildRequires: telepathy-mission-control-devel
+BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
 # Generated with:
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-3
+- Add new telepathy-glib dep
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.5-2
 - Add patch for new Mission Control support
 

mps-mc5-port.patch:
 configure.ac                |    3 
 src/mnb-im-status-row.c     |  150 +++++++++++++++--------
 src/mnb-status-marshal.list |    2 
 src/moblin-panel-status.c   |  285 +++++++++++++++++++-------------------------
 4 files changed, 227 insertions(+), 213 deletions(-)

Index: mps-mc5-port.patch
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/mps-mc5-port.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mps-mc5-port.patch	28 Sep 2009 21:34:30 -0000	1.1
+++ mps-mc5-port.patch	29 Sep 2009 10:24:50 -0000	1.2
@@ -1,25 +1,3 @@
-commit 419ffd4e56794e2b5ab068586d55419b7a808356
-Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Date:   Mon Sep 28 15:35:49 2009 +0100
-
-    configure.ac: add a versioned depends on telepathy-glib
-    
-    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
-
-diff --git a/configure.ac b/configure.ac
-index 555a04b..4bd087b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ PKG_CHECK_MODULES([STATUS],
-                    clutter-x11-1.0 >= 1.0.0     dnl
-                    clutter-gtk-0.10
-                    mojito-client >= 0.20.1      dnl
--                   telepathy-glib
-+                   telepathy-glib >= 0.9.0
-                    nbtk-1.2])
- 
- AC_ARG_ENABLE([cache],
-
 commit 937414d951216d1bb5399ef33d9777f66c09869a
 Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
 Date:   Sat Sep 26 17:03:59 2009 +0100
@@ -786,7 +764,7 @@ index b29fbc1..555a04b 100644
 -                   libmissioncontrol            dnl
 +                   clutter-gtk-0.10
                     mojito-client >= 0.20.1      dnl
-+                   telepathy-glib
++                   telepathy-glib >= 0.9.0
                     nbtk-1.2])
  
  AC_ARG_ENABLE([cache],



From pkgdb at fedoraproject.org  Tue Sep 29 10:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 10:25:10 +0000
Subject: [pkgdb] alsa-plugins ownership updated
Message-ID: <20090929102511.A89D110F857@bastion2.fedora.phx.redhat.com>

Package alsa-plugins in Fedora 11 is now owned by perex

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From pkgdb at fedoraproject.org  Tue Sep 29 10:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 10:25:14 +0000
Subject: [pkgdb] alsa-plugins ownership updated
Message-ID: <20090929102514.CDFEF10F888@bastion2.fedora.phx.redhat.com>

Package alsa-plugins in Fedora 10 is now owned by perex

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From rjones at fedoraproject.org  Tue Sep 29 10:25:14 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 10:25:14 +0000 (UTC)
Subject: rpms/libguestfs/F-12 libguestfs.spec,1.102,1.103
Message-ID: <20090929102514.C79A611C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20104

Modified Files:
	libguestfs.spec 
Log Message:
Force rebuild.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/libguestfs.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- libguestfs.spec	23 Sep 2009 15:31:14 -0000	1.102
+++ libguestfs.spec	29 Sep 2009 10:25:14 -0000	1.103
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.72
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -536,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-2
+- Force rebuild.
+
 * Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
 - New upstream release 1.0.72.
 - New tools: virt-edit, virt-rescue.



From cwickert at fedoraproject.org  Tue Sep 29 10:29:46 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 10:29:46 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 xfce4-power-manager.spec, 1.18, 1.19
Message-ID: <20090929102946.1597411C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20644

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
- Update to 0.8.4
- Drop xfpm_session_set_client_id patch, fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	9 Aug 2009 16:07:55 -0000	1.13
+++ .cvsignore	29 Sep 2009 10:29:45 -0000	1.14
@@ -1 +1 @@
-xfce4-power-manager-0.8.3.1.tar.bz2
+xfce4-power-manager-0.8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Aug 2009 16:07:55 -0000	1.13
+++ sources	29 Sep 2009 10:29:45 -0000	1.14
@@ -1 +1 @@
-f390082fffddd645e6682ccd3c338335  xfce4-power-manager-0.8.3.1.tar.bz2
+324be9320d8fae2b91a6111830465b0d  xfce4-power-manager-0.8.4.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfce4-power-manager.spec	9 Sep 2009 17:43:53 -0000	1.18
+++ xfce4-power-manager.spec	29 Sep 2009 10:29:45 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           xfce4-power-manager
-Version:        0.8.3.1
-Release:        2%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-0.8.2-dpmsconst.patch
-# from upstream's git rev 3004567
-Patch1:         %{name}-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -32,7 +30,6 @@ preferences.
 
 %prep
 %setup -q
-%patch1 -p1 -b .segfault
 %if 0%{?fedora} >= 12
 %patch0 -b .dpmsstr
 %endif
@@ -87,6 +84,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4
+- Drop xfpm_session_set_client_id patch, fixed upstream
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
 - Fix segfault in xfpm_session_set_client_id
 



From timn at fedoraproject.org  Tue Sep 29 10:34:43 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Tue, 29 Sep 2009 10:34:43 +0000 (UTC)
Subject: rpms/lua-filesystem/devel .cvsignore, 1.3, 1.4 lua-filesystem.spec, 
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090929103443.9EEC711C00C1@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21449

Modified Files:
	.cvsignore lua-filesystem.spec sources 
Log Message:
Upgrade to latest stable release 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 May 2008 18:57:24 -0000	1.3
+++ .cvsignore	29 Sep 2009 10:34:43 -0000	1.4
@@ -1 +1 @@
-luafilesystem-1.4.1.tar.gz
+luafilesystem-1.4.2.tar.gz


Index: lua-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/devel/lua-filesystem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lua-filesystem.spec	25 Jul 2009 11:24:13 -0000	1.4
+++ lua-filesystem.spec	29 Sep 2009 10:34:43 -0000	1.5
@@ -3,14 +3,14 @@
 %define luapkgdir %{_datadir}/lua/%{luaver}
 
 Name:           lua-filesystem
-Version:        1.4.1
-Release:        3%{?dist}
+Version:        1.4.2
+Release:        1%{?dist}
 Summary:        File System Library for the Lua Programming Language
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.keplerproject.org/luafilesystem/
-Source0:        http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz
+Source0:        http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua >= %{luaver}, lua-devel >= %{luaver}
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Tim Niemueller <tim at niemueller.de> - 1.4.2-1
+- Upgrade to latest stable release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 May 2008 18:57:24 -0000	1.3
+++ sources	29 Sep 2009 10:34:43 -0000	1.4
@@ -1 +1 @@
-fe2fa6decc48f0267b4f09975750280e  luafilesystem-1.4.1.tar.gz
+8e7b2a9b899d669280456d0f95afd961  luafilesystem-1.4.2.tar.gz



From hadess at fedoraproject.org  Tue Sep 29 10:38:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 10:38:32 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.93,1.94
Message-ID: <20090929103832.CFB1311C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22714

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Disable SMP build


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- gnome-bluetooth.spec	29 Sep 2009 01:12:22 -0000	1.93
+++ gnome-bluetooth.spec	29 Sep 2009 10:38:32 -0000	1.94
@@ -61,11 +61,13 @@ This package contains the libraries amd 
 for writing applications that require a Bluetooth device selection widget.
 
 %prep
-%setup -q -n gnome-bluetooth-%{version}
+%setup -q
 
 %build
 %configure --disable-desktop-update --disable-icon-update
-make %{?_smp_mflags}
+# FIXME
+# make %{?_smp_mflags}
+make
 
 
 %install



From pbrobinson at fedoraproject.org  Tue Sep 29 10:44:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:44:28 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel moblin-panel-status.spec,1.5,1.6
Message-ID: <20090929104428.400CA11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24234

Modified Files:
	moblin-panel-status.spec 
Log Message:
- Add new clutter-gtk dep


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-panel-status.spec	29 Sep 2009 10:19:26 -0000	1.5
+++ moblin-panel-status.spec	29 Sep 2009 10:44:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
 Version:        0.0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ Source0:        http://git.moblin.org/cg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
+BuildRequires: clutter-gtk-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
 BuildRequires: mojito-devel
@@ -60,6 +61,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-4
+- Add new clutter-gtk dep
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-3
 - Add new telepathy-glib dep
 



From hadess at fedoraproject.org  Tue Sep 29 10:46:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 10:46:52 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12 gnome-bluetooth.spec,1.93,1.94
Message-ID: <20090929104652.98D6A11C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24708

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Disable SMP build


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- gnome-bluetooth.spec	29 Sep 2009 01:12:22 -0000	1.93
+++ gnome-bluetooth.spec	29 Sep 2009 10:46:52 -0000	1.94
@@ -65,8 +65,10 @@ for writing applications that require a 
 
 %build
 %configure --disable-desktop-update --disable-icon-update
-make %{?_smp_mflags}
 
+# FIXME
+# make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT



From msivak at fedoraproject.org  Tue Sep 29 10:49:17 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue, 29 Sep 2009 10:49:17 +0000 (UTC)
Subject: rpms/firstaidkit/devel .cvsignore, 1.10, 1.11 firstaidkit.spec, 1.32,
	1.33 sources, 1.14, 1.15
Message-ID: <20090929104917.E4A9B11C00C1@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25138

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	22 Sep 2009 07:55:22 -0000	1.10
+++ .cvsignore	29 Sep 2009 10:49:17 -0000	1.11
@@ -1 +1 @@
-firstaidkit-0.2.6.tar.bz2
+firstaidkit-0.2.7.tar.bz2


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- firstaidkit.spec	22 Sep 2009 07:56:19 -0000	1.32
+++ firstaidkit.spec	29 Sep 2009 10:49:17 -0000	1.33
@@ -3,7 +3,7 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.6
+Version:        0.2.7
 Release:        1%{?dist}
 Summary:        System Rescue Tool
 
@@ -246,6 +246,9 @@ desktop-file-install --vendor="fedora" -
 #
 
 %changelog
+* Tue Sep 29 2009 Martin Sivak <msivak at redhat.com> - 0.2.7-1
+- Make the dialog in whiptail bigger, so it looks nicer
+
 * Tue Sep 22 2009 Martin Sivak <msivak at redhat.com> - 0.2.6-1
 - Use whiptail instead of dialog for firstaidkit-qs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Sep 2009 07:55:22 -0000	1.14
+++ sources	29 Sep 2009 10:49:17 -0000	1.15
@@ -1 +1 @@
-ccf60dc442325cc9c3a4494143a7ae8a  firstaidkit-0.2.6.tar.bz2
+d05b19153976711dd9d141d6c12c8975  firstaidkit-0.2.7.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep 29 10:51:51 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 10:51:51 +0000 (UTC)
Subject: rpms/moblin-panel-status/F-12 moblin-panel-status.spec,1.5,1.6
Message-ID: <20090929105151.0E0B611C0419@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25602

Modified Files:
	moblin-panel-status.spec 
Log Message:
- Add new clutter-gtk dep


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/moblin-panel-status.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-panel-status.spec	29 Sep 2009 10:24:50 -0000	1.5
+++ moblin-panel-status.spec	29 Sep 2009 10:51:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
 Version:        0.0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ Source0:        http://git.moblin.org/cg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
+BuildRequires: clutter-gtk-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
 BuildRequires: mojito-devel
@@ -60,6 +61,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-4
+- Add new clutter-gtk dep
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-3
 - Add new telepathy-glib dep
 



From cwickert at fedoraproject.org  Tue Sep 29 10:59:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 10:59:49 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-12 .cvsignore, 1.13, 1.14 sources, 1.13, 
	1.14 xfce4-power-manager.spec, 1.18, 1.19
Message-ID: <20090929105949.11BA211C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26797/F-12

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
- Update to 0.8.4
- Drop xfpm_session_set_client_id patch, fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	9 Aug 2009 16:07:55 -0000	1.13
+++ .cvsignore	29 Sep 2009 10:59:48 -0000	1.14
@@ -1 +1 @@
-xfce4-power-manager-0.8.3.1.tar.bz2
+xfce4-power-manager-0.8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Aug 2009 16:07:55 -0000	1.13
+++ sources	29 Sep 2009 10:59:48 -0000	1.14
@@ -1 +1 @@
-f390082fffddd645e6682ccd3c338335  xfce4-power-manager-0.8.3.1.tar.bz2
+324be9320d8fae2b91a6111830465b0d  xfce4-power-manager-0.8.4.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-12/xfce4-power-manager.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfce4-power-manager.spec	9 Sep 2009 17:43:53 -0000	1.18
+++ xfce4-power-manager.spec	29 Sep 2009 10:59:48 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           xfce4-power-manager
-Version:        0.8.3.1
-Release:        2%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-0.8.2-dpmsconst.patch
-# from upstream's git rev 3004567
-Patch1:         %{name}-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -32,7 +30,6 @@ preferences.
 
 %prep
 %setup -q
-%patch1 -p1 -b .segfault
 %if 0%{?fedora} >= 12
 %patch0 -b .dpmsstr
 %endif
@@ -87,6 +84,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4
+- Drop xfpm_session_set_client_id patch, fixed upstream
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
 - Fix segfault in xfpm_session_set_client_id
 



From cwickert at fedoraproject.org  Tue Sep 29 10:59:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 10:59:49 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11 .cvsignore, 1.11, 1.12 sources, 1.11, 
	1.12 xfce4-power-manager.spec, 1.13, 1.14
Message-ID: <20090929105949.8BC3511C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26797/F-11

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
- Update to 0.8.4
- Drop xfpm_session_set_client_id patch, fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Aug 2009 16:22:00 -0000	1.11
+++ .cvsignore	29 Sep 2009 10:59:49 -0000	1.12
@@ -1 +1 @@
-xfce4-power-manager-0.8.3.1.tar.bz2
+xfce4-power-manager-0.8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Aug 2009 16:22:00 -0000	1.11
+++ sources	29 Sep 2009 10:59:49 -0000	1.12
@@ -1 +1 @@
-f390082fffddd645e6682ccd3c338335  xfce4-power-manager-0.8.3.1.tar.bz2
+324be9320d8fae2b91a6111830465b0d  xfce4-power-manager-0.8.4.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfce4-power-manager.spec	9 Sep 2009 17:43:53 -0000	1.13
+++ xfce4-power-manager.spec	29 Sep 2009 10:59:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           xfce4-power-manager
-Version:        0.8.3.1
-Release:        2%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-0.8.2-dpmsconst.patch
-# from upstream's git rev 3004567
-Patch1:         %{name}-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -32,7 +30,6 @@ preferences.
 
 %prep
 %setup -q
-%patch1 -p1 -b .segfault
 %if 0%{?fedora} >= 12
 %patch0 -b .dpmsstr
 %endif
@@ -87,6 +84,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4
+- Drop xfpm_session_set_client_id patch, fixed upstream
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-2
 - Fix segfault in xfpm_session_set_client_id
 



From mhlavink at fedoraproject.org  Tue Sep 29 11:02:12 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 29 Sep 2009 11:02:12 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-12 ecryptfs-utils-75-nocryptdisks.patch, 1.2, 
	1.3
Message-ID: <20090929110213.0212F11C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27463

Modified Files:
	ecryptfs-utils-75-nocryptdisks.patch 
Log Message:
trim patches


ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-12/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 06:56:17 -0000	1.2
+++ ecryptfs-utils-75-nocryptdisks.patch	29 Sep 2009 11:02:10 -0000	1.3
@@ -1,18 +1,42 @@
-diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
---- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
-+++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
-@@ -158,13 +158,5 @@ for swap in $swaps; do
+diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-81/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-09-19 01:41:21.000000000 +0200
++++ ecryptfs-utils-81/src/utils/ecryptfs-setup-swap	2009-09-29 10:25:07.481996541 +0200
+@@ -37,23 +37,20 @@ warn() {
+ usage() {
+ 	echo
+ 	echo `gettext "Usage:"`
+-	echo "  $0 [-f|--force] [-n|--no-reload]"
++	echo "  $0 [-f|--force]"
+ 	echo
+ 	exit 1
+ }
+ 
+ # Handle command line options
+ FORCE=0
++NO_RELOAD=1
+ while [ ! -z "$1" ]; do
+ 	case "$1" in
+ 		-f|--force)
+ 			FORCE=1
+ 			shift 1
+ 		;;
+-		-n|--no-reload)
+-			NO_RELOAD=1
+-			shift 1
+-		;;
+ 		*)
+ 			usage
+ 		;;
+@@ -166,7 +163,6 @@ for swap in $swaps; do
+ 	# Add fstab entry
  	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
  done
- 
--# Turn swap off
--swapoff -a
--
--# Restart cryptdisks
--/etc/init.d/cryptdisks restart
--
--# Turn the swap on
--swapon -a
 -
+ if [ "$NO_RELOAD" != 1 ]; then
+ 	# Turn swap off
+ 	swapoff -a
+@@ -179,3 +175,4 @@ if [ "$NO_RELOAD" != 1 ]; then
+ fi
+ 
  info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"



From twaugh at fedoraproject.org  Tue Sep 29 11:02:23 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 11:02:23 +0000 (UTC)
Subject: rpms/emacs-nxml-mode/devel dead.package,NONE,1.1
Message-ID: <20090929110223.5F5C011C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/emacs-nxml-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27631

Added Files:
	dead.package 
Log Message:
Dead package.


--- NEW FILE dead.package ---
Included in emacs-23.*



From pbrobinson at fedoraproject.org  Tue Sep 29 11:03:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 11:03:26 +0000 (UTC)
Subject: rpms/anjal/devel anjal.spec,1.8,1.9
Message-ID: <20090929110326.BEDBD11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28059

Modified Files:
	anjal.spec 
Log Message:
- Re-enable anerley now we have a MC-5 port :)


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- anjal.spec	28 Sep 2009 13:25:14 -0000	1.8
+++ anjal.spec	29 Sep 2009 11:03:24 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.11.%{snapshot}%{?dist}
+Release:        0.12.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -18,7 +18,7 @@ URL:            http://live.gnome.org/An
 Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires: anerley-devel
+BuildRequires: anerley-devel
 BuildRequires: clutter-devel
 BuildRequires: clutter-gtk-devel
 BuildRequires: evolution-devel
@@ -51,8 +51,7 @@ all the mail backends including POP3, IM
 NOCONFIGURE=yes ./autogen.sh
 
 %build
-# configure --with-mozilla=no --with-anerley
-%configure --with-mozilla=no --without-anerley
+%configure --with-mozilla=no --with-anerley
 make %{?_smp_mflags} V=1
 
 %install
@@ -96,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.12
+- Re-enable anerley now we have a MC-5 port :)
+
 * Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.11
 - New git snapshot
 



From twaugh at fedoraproject.org  Tue Sep 29 11:03:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 11:03:32 +0000 (UTC)
Subject: rpms/emacs-nxml-mode/devel Makefile, 1.1, NONE emacs-nxml-mode.spec,
	1.5, NONE nxml-mode.el.2006-01-03.patch, 1.1, NONE slides.rnc,
	1.1, NONE sources, 1.1, NONE xsd-regexp.el.2006-01-26.patch, 1.1, NONE
Message-ID: <20090929110332.DDE5C11C0419@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/emacs-nxml-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28082

Removed Files:
	Makefile emacs-nxml-mode.spec nxml-mode.el.2006-01-03.patch 
	slides.rnc sources xsd-regexp.el.2006-01-26.patch 
Log Message:
Removed files.


--- Makefile DELETED ---


--- emacs-nxml-mode.spec DELETED ---


--- nxml-mode.el.2006-01-03.patch DELETED ---


--- slides.rnc DELETED ---


--- sources DELETED ---


--- xsd-regexp.el.2006-01-26.patch DELETED ---



From dnovotny at fedoraproject.org  Tue Sep 29 11:04:59 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 29 Sep 2009 11:04:59 +0000 (UTC)
Subject: rpms/emacs/F-11 emacs.spec,1.130,1.131
Message-ID: <20090929110459.83D1811C0419@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497

Modified Files:
	emacs.spec 
Log Message:
fix #516391



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- emacs.spec	22 Sep 2009 11:22:45 -0000	1.130
+++ emacs.spec	29 Sep 2009 11:04:59 -0000	1.131
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -49,6 +49,9 @@ Requires:      desktop-file-utils
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
 
+Obsoletes: emacs-nxml-mode < 0.20041004-10
+Provides: emacs-nxml-mode = 0.20041004-10
+
 # C and build patches
 
 # Lisp and doc patches
@@ -378,6 +381,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
+- emacs contains nxml-mode (#516391)
+
 * Tue Sep 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-4
 - update %%info_files (#510750)
 



From dnovotny at fedoraproject.org  Tue Sep 29 11:12:13 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 29 Sep 2009 11:12:13 +0000 (UTC)
Subject: rpms/file/F-11 file-5.03-ifany.patch,NONE,1.1 file.spec,1.95,1.96
Message-ID: <20090929111213.C287011C00C1@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31237

Modified Files:
	file.spec 
Added Files:
	file-5.03-ifany.patch 
Log Message:
fix #526054


file-5.03-ifany.patch:
 lisp |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE file-5.03-ifany.patch ---
diff -up file-5.03/magic/Magdir/lisp.ifany file-5.03/magic/Magdir/lisp
--- file-5.03/magic/Magdir/lisp.ifany	2009-07-23 15:46:03.000000000 +0200
+++ file-5.03/magic/Magdir/lisp	2009-07-23 15:46:17.000000000 +0200
@@ -11,8 +11,6 @@
 #>2	search/4096	!\r		Lisp/Scheme program text
 #>2	search/4096	\r		Windows INF file
 
-0	search/4096	(if\ 			Lisp/Scheme program text
-!:mime	text/x-lisp
 0	search/4096	(setq\ 			Lisp/Scheme program text
 !:mime	text/x-lisp
 0	search/4096	(defvar\ 		Lisp/Scheme program text


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-11/file.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- file.spec	11 Jun 2009 12:22:53 -0000	1.95
+++ file.spec	29 Sep 2009 11:12:13 -0000	1.96
@@ -5,13 +5,14 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 2%{?dist}
+Release: 3%{?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.03-ifany.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,8 @@ file(1) command.
 %patch0 -p1
 #fixes #463809
 %patch1 -p1
+#fixes #526054
+%patch2 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -134,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-3
+- fix #526054 - "file" reports c++ source files as "Lisp/Scheme program text"
+
 * Thu Jun 11 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-2
 - fix #500739 - Disorganized magic* file locations in file-libs
 



From pnemade at fedoraproject.org  Tue Sep 29 11:12:18 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 29 Sep 2009 11:12:18 +0000 (UTC)
Subject: rpms/hunspell-ta/F-12 .cvsignore, 1.2, 1.3 hunspell-ta.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090929111218.9544211C00C1@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-ta/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31300

Modified Files:
	.cvsignore hunspell-ta.spec sources 
Log Message:
* Tue Sep 29 2009 Parag <pnemade at redhat.com> - 20090929-1
- Update to new dictionary wordlist with new URL





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ta/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Jan 2008 06:03:37 -0000	1.2
+++ .cvsignore	29 Sep 2009 11:12:18 -0000	1.3
@@ -1 +1 @@
-ta-demo.tar.gz
+ta_IN-hunspell-wordlist.tar.gz


Index: hunspell-ta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ta/F-12/hunspell-ta.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-ta.spec	25 Jul 2009 02:42:30 -0000	1.3
+++ hunspell-ta.spec	29 Sep 2009 11:12:18 -0000	1.4
@@ -1,12 +1,12 @@
 Name: hunspell-ta
 Summary: Tamil hunspell dictionaries
-Version: 20060222
-Release: 4%{?dist}
-Source: http://hunspell.sourceforge.net/ta-demo.tar.gz
+Version: 20090929
+Release: 1%{?dist}
+Source: http://amachu.net/foss/download/ta_IN-hunspell-wordlist.tar.gz 
 Group: Applications/Text
-URL: http://hunspell.sourceforge.net
+URL: http://amachu.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL+
+License: GPLv2+
 BuildArch: noarch
 
 Requires: hunspell
@@ -15,28 +15,28 @@ Requires: hunspell
 Tamil hunspell dictionaries.
 
 %prep
-%setup -q -c -n ta-demo
-iconv -f ISO-8859-1 -t UTF-8 ta/Copyright > ta/Copyright.utf8
-mv ta/Copyright.utf8 ta/Copyright
+%setup -q -c -n ta_IN-hunspell-wordlist
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-mv ta/ta.dic ta/ta_IN.dic
-mv ta/ta.aff ta/ta_IN.aff
-cp -p ta/*.dic ta/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+
+cp -p ta_IN-hunspell-wordlist/*.dic ta_IN-hunspell-wordlist/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ta/README ta/COPYING ta/Copyright
+%doc ta_IN-hunspell-wordlist/README ta_IN-hunspell-wordlist/COPYING ta_IN-hunspell-wordlist/Copyright
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Sep 29 2009 Parag <pnemade at redhat.com> - 20090929-1
+- Update to new dictionary wordlist with new URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20060222-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ta/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Jan 2008 06:03:37 -0000	1.2
+++ sources	29 Sep 2009 11:12:18 -0000	1.3
@@ -1 +1 @@
-9f6b96db50eb6638c0afcc6dbb4ad586  ta-demo.tar.gz
+410495d307a720da5b5a8cb14b23c0d4  ta_IN-hunspell-wordlist.tar.gz



From cwickert at fedoraproject.org  Tue Sep 29 11:14:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 11:14:23 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch,
	1.1, NONE
Message-ID: <20090929111423.8B94311C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31933/devel

Removed Files:
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch 
Log Message:
remove obsolete patch


--- xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch DELETED ---



From cwickert at fedoraproject.org  Tue Sep 29 11:14:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 11:14:23 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-12
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch,
	1.1, NONE
Message-ID: <20090929111423.B4EFF11C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31933/F-12

Removed Files:
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch 
Log Message:
remove obsolete patch


--- xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch DELETED ---



From cwickert at fedoraproject.org  Tue Sep 29 11:14:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 11:14:23 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch,
	1.1, NONE
Message-ID: <20090929111423.EDD1711C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31933/F-11

Removed Files:
	xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch 
Log Message:
remove obsolete patch


--- xfce4-power-manager-0.8.3.1-fix-segfault-in-xfpm_session_set_client_id.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Sep 29 11:14:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 11:14:38 +0000 (UTC)
Subject: rpms/anjal/F-12 anjal.spec,1.8,1.9
Message-ID: <20090929111438.A26AA11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32050

Modified Files:
	anjal.spec 
Log Message:
- Re-enable anerley now we have a MC-5 port :)


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/anjal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- anjal.spec	28 Sep 2009 13:25:14 -0000	1.8
+++ anjal.spec	29 Sep 2009 11:14:38 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.11.%{snapshot}%{?dist}
+Release:        0.12.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -18,7 +18,7 @@ URL:            http://live.gnome.org/An
 Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires: anerley-devel
+BuildRequires: anerley-devel
 BuildRequires: clutter-devel
 BuildRequires: clutter-gtk-devel
 BuildRequires: evolution-devel
@@ -51,8 +51,7 @@ all the mail backends including POP3, IM
 NOCONFIGURE=yes ./autogen.sh
 
 %build
-# configure --with-mozilla=no --with-anerley
-%configure --with-mozilla=no --without-anerley
+%configure --with-mozilla=no --with-anerley
 make %{?_smp_mflags} V=1
 
 %install
@@ -96,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.12
+- Re-enable anerley now we have a MC-5 port :)
+
 * Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.11
 - New git snapshot
 



From tibbs at fedoraproject.org  Tue Sep 29 11:16:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 29 Sep 2009 11:16:08 +0000 (UTC)
Subject: rpms/nazghul/devel nazghul-make-snapshot, NONE, 1.1 .cvsignore, 1.9,
	1.10 nazghul.spec, 1.24, 1.25 sources, 1.10, 1.11
Message-ID: <20090929111608.8FB3911C00C1@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/nazghul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32523

Modified Files:
	.cvsignore nazghul.spec sources 
Added Files:
	nazghul-make-snapshot 
Log Message:
* Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
- Pull latest fixes.                                                              

* Tue Sep 22 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.3.20090918cvs
- Modernize the spec a bit; nuke BuildRoot:, no more RPM_BUILD_ROOT.              

* Fri Sep 18 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.2.20090918cvs
- New CVS snapshot; hopefully fix x86_64 startup crash and music issues.          

* Thu Sep 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.1.20090910cvs
- Initial attempt to rebase to current CVS.                                       
- Update to use xz for compression of snapshot tarballs.                          
- Rename "nazghul-haxima" package to "haxima", according to upstream wishes and   
  common sense.                                                                   




--- NEW FILE nazghul-make-snapshot ---
#!/bin/sh
CVSDATE=$1
TMPDIR=$(mktemp -d nazghul.XXXXXXXXXXX) || exit 1
pushd $TMPDIR
cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D$CVSDATE nazghul
tar cvvfJ nazghul-$CVSDATE.txz nazghul
popd
mv $TMPDIR/nazghul-$CVSDATE.txz .
rm -rf $TMPDIR


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Apr 2008 15:04:35 -0000	1.9
+++ .cvsignore	29 Sep 2009 11:16:06 -0000	1.10
@@ -1 +1 @@
-nazghul-20080407.tgz
+nazghul-20090928.txz


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nazghul.spec	25 Jul 2009 15:49:00 -0000	1.24
+++ nazghul.spec	29 Sep 2009 11:16:07 -0000	1.25
@@ -1,14 +1,13 @@
-%define         cvsdate 20080407
+%define         cvsdate 20090928
 Name:           nazghul
-Version:        0.6.0
-Release:        7.%{cvsdate}cvs%{?dist}
+Version:        0.7.0
+Release:        0.4.%{cvsdate}cvs%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
 
-
 # Occasionally upstream names things with an underscore.
 %define         version_us %(echo %{version} | sed -e 's/\\./_/g')
 
@@ -16,15 +15,13 @@ URL:            http://myweb.cableone.ne
 
 # Construct cvs checkout tarball with:
 #  cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D%{cvsdate} nazghul
-#  tar cvvfz nazghul-%{cvsdate}.tgz nazghul
-Source0:        nazghul-%{cvsdate}.tgz
+#  tar cvvfJ nazghul-%{cvsdate}.txz nazghul
+Source0:        nazghul-%{cvsdate}.txz
 Patch0:         nazghul-desktop.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
-
 # For building from a CVS snapshot
 BuildRequires:  automake, autoconf
+BuildRequires:  SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
 
 %description
 Nazghul is an old-school RPG engine modeled after those made in the
@@ -32,12 +29,14 @@ heyday of top-down, 2d tile-based graphi
 after Ultima V.
 
 
-%package haxima
+%package -n haxima
 Summary:        A full-featured role-playing game for the Nazghul engine
 Group:          Amusements/Games
 Requires:       nazghul = %{version}
+Provides:       nazghul-haxima = %{version}-%{release}
+Obsoletes:      nazghul-haxima < 0.6.0-8
 
-%description haxima
+%description -n haxima
 A complete, playable and full-featured role playing game which runs
 under the Nazghul CRPG engine.
 
@@ -64,26 +63,25 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-mv $RPM_BUILD_ROOT/%{_bindir}/haxima.sh $RPM_BUILD_ROOT/%{_bindir}/haxima
+mv %{buildroot}/%{_bindir}/haxima.sh %{buildroot}/%{_bindir}/haxima
 
 desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --dir %{buildroot}/%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         haxima.desktop
 
-install -D -m 644 icons/haxima.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/haxima.png
+install -D -m 644 icons/haxima.png %{buildroot}/%{_datadir}/pixmaps/haxima.png
 
 # It seems that the music gets left out by "make install"
-pushd %{_builddir}/%{name}/worlds/haxima-1.002
-cp -rp music $RPM_BUILD_ROOT%{_datadir}/nazghul/haxima
-popd
+#pushd %{_builddir}/%{name}/worlds/haxima-1.002
+#cp -rp music %{buildroot}/%{_datadir}/nazghul/haxima
+#popd
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -94,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc MAP_HACKERS_GUIDE engine_extension_and_design world_building
 
 
-%files haxima
+%files -n haxima
 %defattr(-,root,root,-)
 %{_bindir}/haxima
 %{_datadir}/nazghul/haxima
@@ -104,6 +102,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
+- Pull latest fixes.
+
+* Tue Sep 22 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.3.20090918cvs
+- Modernize the spec a bit; nuke BuildRoot:, no more RPM_BUILD_ROOT.
+
+* Fri Sep 18 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.2.20090918cvs
+- New CVS snapshot; hopefully fix x86_64 startup crash and music issues.
+
+* Thu Sep 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.1.20090910cvs
+- Initial attempt to rebase to current CVS.
+- Update to use xz for compression of snapshot tarballs.
+- Rename "nazghul-haxima" package to "haxima", according to upstream wishes and
+  common sense.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-7.20080407cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	7 Apr 2008 15:04:35 -0000	1.10
+++ sources	29 Sep 2009 11:16:07 -0000	1.11
@@ -1 +1 @@
-c11c930146f5f04c6b14a2eeb345872b  nazghul-20080407.tgz
+96ce0446611ae42d3aa59c75eaada5c1  nazghul-20090928.txz



From timn at fedoraproject.org  Tue Sep 29 11:26:13 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Tue, 29 Sep 2009 11:26:13 +0000 (UTC)
Subject: rpms/lua-filesystem/F-10 .cvsignore, 1.3, 1.4 lua-filesystem.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090929112613.BB42F11C00C1@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua-filesystem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2143

Modified Files:
	.cvsignore lua-filesystem.spec sources 
Log Message:
Upgrade to latest stable release 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 May 2008 18:57:24 -0000	1.3
+++ .cvsignore	29 Sep 2009 11:26:13 -0000	1.4
@@ -1 +1 @@
-luafilesystem-1.4.1.tar.gz
+luafilesystem-1.4.2.tar.gz


Index: lua-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-10/lua-filesystem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lua-filesystem.spec	8 May 2008 18:57:24 -0000	1.2
+++ lua-filesystem.spec	29 Sep 2009 11:26:13 -0000	1.3
@@ -3,14 +3,14 @@
 %define luapkgdir %{_datadir}/lua/%{luaver}
 
 Name:           lua-filesystem
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        File System Library for the Lua Programming Language
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.keplerproject.org/luafilesystem/
-Source0:        http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz
+Source0:        http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua >= %{luaver}, lua-devel >= %{luaver}
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Tim Niemueller <tim at niemueller.de> - 1.4.2-1
+- Upgrade to latest stable release
+
 * Thu May 08 2008 Tim Niemueller <tim at niemueller.de> - 1.4.1-1
 - Upgrade to latest stable release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 May 2008 18:57:24 -0000	1.3
+++ sources	29 Sep 2009 11:26:13 -0000	1.4
@@ -1 +1 @@
-fe2fa6decc48f0267b4f09975750280e  luafilesystem-1.4.1.tar.gz
+8e7b2a9b899d669280456d0f95afd961  luafilesystem-1.4.2.tar.gz



From timn at fedoraproject.org  Tue Sep 29 11:26:25 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Tue, 29 Sep 2009 11:26:25 +0000 (UTC)
Subject: rpms/lua-filesystem/F-11 .cvsignore, 1.3, 1.4 lua-filesystem.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090929112625.5FC7711C00C1@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua-filesystem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2197

Modified Files:
	.cvsignore lua-filesystem.spec sources 
Log Message:
Upgrade to latest stable release 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 May 2008 18:57:24 -0000	1.3
+++ .cvsignore	29 Sep 2009 11:26:25 -0000	1.4
@@ -1 +1 @@
-luafilesystem-1.4.1.tar.gz
+luafilesystem-1.4.2.tar.gz


Index: lua-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-11/lua-filesystem.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lua-filesystem.spec	25 Feb 2009 22:00:18 -0000	1.3
+++ lua-filesystem.spec	29 Sep 2009 11:26:25 -0000	1.4
@@ -3,14 +3,14 @@
 %define luapkgdir %{_datadir}/lua/%{luaver}
 
 Name:           lua-filesystem
-Version:        1.4.1
-Release:        2%{?dist}
+Version:        1.4.2
+Release:        1%{?dist}
 Summary:        File System Library for the Lua Programming Language
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.keplerproject.org/luafilesystem/
-Source0:        http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz
+Source0:        http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua >= %{luaver}, lua-devel >= %{luaver}
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Tim Niemueller <tim at niemueller.de> - 1.4.2-1
+- Upgrade to latest stable release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 May 2008 18:57:24 -0000	1.3
+++ sources	29 Sep 2009 11:26:25 -0000	1.4
@@ -1 +1 @@
-fe2fa6decc48f0267b4f09975750280e  luafilesystem-1.4.1.tar.gz
+8e7b2a9b899d669280456d0f95afd961  luafilesystem-1.4.2.tar.gz



From timn at fedoraproject.org  Tue Sep 29 11:26:38 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Tue, 29 Sep 2009 11:26:38 +0000 (UTC)
Subject: rpms/lua-filesystem/F-12 .cvsignore, 1.3, 1.4 lua-filesystem.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090929112638.53BCF11C00C1@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua-filesystem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2246

Modified Files:
	.cvsignore lua-filesystem.spec sources 
Log Message:
Upgrade to latest stable release 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 May 2008 18:57:24 -0000	1.3
+++ .cvsignore	29 Sep 2009 11:26:38 -0000	1.4
@@ -1 +1 @@
-luafilesystem-1.4.1.tar.gz
+luafilesystem-1.4.2.tar.gz


Index: lua-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-12/lua-filesystem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lua-filesystem.spec	25 Jul 2009 11:24:13 -0000	1.4
+++ lua-filesystem.spec	29 Sep 2009 11:26:38 -0000	1.5
@@ -3,14 +3,14 @@
 %define luapkgdir %{_datadir}/lua/%{luaver}
 
 Name:           lua-filesystem
-Version:        1.4.1
-Release:        3%{?dist}
+Version:        1.4.2
+Release:        1%{?dist}
 Summary:        File System Library for the Lua Programming Language
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.keplerproject.org/luafilesystem/
-Source0:        http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz
+Source0:        http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua >= %{luaver}, lua-devel >= %{luaver}
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Tim Niemueller <tim at niemueller.de> - 1.4.2-1
+- Upgrade to latest stable release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua-filesystem/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 May 2008 18:57:24 -0000	1.3
+++ sources	29 Sep 2009 11:26:38 -0000	1.4
@@ -1 +1 @@
-fe2fa6decc48f0267b4f09975750280e  luafilesystem-1.4.1.tar.gz
+8e7b2a9b899d669280456d0f95afd961  luafilesystem-1.4.2.tar.gz



From jreznik at fedoraproject.org  Tue Sep 29 11:30:29 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 29 Sep 2009 11:30:29 +0000 (UTC)
Subject: rpms/system-config-bind/devel .cvsignore, 1.41, 1.42 sources, 1.58, 
	1.59 system-config-bind.spec, 1.86, 1.87
Message-ID: <20090929113029.CCDA311C0423@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3263

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
* Tue Sep 29 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.15-1
- fixed polish translation (rhbz#525994)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	14 Sep 2009 12:26:00 -0000	1.41
+++ .cvsignore	29 Sep 2009 11:30:28 -0000	1.42
@@ -1 +1 @@
-system-config-bind-4.0.14.tar.gz
+system-config-bind-4.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	14 Sep 2009 12:26:00 -0000	1.58
+++ sources	29 Sep 2009 11:30:29 -0000	1.59
@@ -1 +1 @@
-718b2cc5c47351d14f8cf77370011a04  system-config-bind-4.0.14.tar.gz
+2d882206d5f42ff1be7528a53413331e  system-config-bind-4.0.15.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- system-config-bind.spec	14 Sep 2009 12:26:00 -0000	1.86
+++ system-config-bind.spec	29 Sep 2009 11:30:29 -0000	1.87
@@ -1,6 +1,6 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.14
+Version:        4.0.15
 Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
@@ -82,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi;
 
 %changelog
+* Tue Sep 29 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.15-1
+- fixed polish translation (rhbz#525994)
+
 * Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.14-1
 - repackage for translation team request (rhbz#522429)
 



From akurtakov at fedoraproject.org  Tue Sep 29 11:32:26 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 11:32:26 +0000 (UTC)
Subject: rpms/icu4j/devel icu4j.spec,1.20,1.21
Message-ID: <20090929113226.B1D8F11C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4043/devel

Modified Files:
	icu4j.spec 
Log Message:
Simplify with_eclipse conditional.


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- icu4j.spec	10 Aug 2009 12:47:05 -0000	1.20
+++ icu4j.spec	29 Sep 2009 11:32:25 -0000	1.21
@@ -28,13 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# If you want to build with eclipse support
-# give rpmbuild option '--with eclipse'
-
-%define _with_eclipse 1
-
-%define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
-%define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
+%define with_eclipse 1
 
 %define section free
 
@@ -50,7 +44,7 @@
 
 Name:           icu4j
 Version:        4.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -137,14 +131,14 @@ sed --in-place "/javac1.3/d" build.xml
 sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
 
 %build
-%if %{without_eclipse}
-%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
+%if %{with_eclipse}
+  %ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
+    -Declipse.basews=gtk -Declipse.baseos=linux \
+    -Declipse.basearch=%{eclipse_arch} \
+    -Dicu4j.eclipse.build.version.string=4.0.1.v20090415 \
+    jar docs eclipsePDEBuild
 %else
-%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
-  -Declipse.basews=gtk -Declipse.baseos=linux \
-  -Declipse.basearch=%{eclipse_arch} \
-  -Dicu4j.eclipse.build.version.string=4.0.1.v20090415 \
-  jar docs eclipsePDEBuild
+  %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
 %endif
 
 %install
@@ -191,6 +185,9 @@ unzip -qq -d %{buildroot}/%{eclipse_base
 %endif
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-4
+- Simplify with_eclipse conditional.
+
 * Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-3
 - Update qualifier to the Eclipse 3.5.0 release.
 



From tibbs at fedoraproject.org  Tue Sep 29 11:32:25 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 29 Sep 2009 11:32:25 +0000 (UTC)
Subject: rpms/nazghul/F-12 nazghul-make-snapshot, NONE, 1.1 nazghul.spec,
	1.24, 1.25 sources, 1.10, 1.11
Message-ID: <20090929113225.0C0F611C00C1@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/nazghul/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000

Modified Files:
	nazghul.spec sources 
Added Files:
	nazghul-make-snapshot 
Log Message:
* Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
- Pull latest fixes.

* Tue Sep 22 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.3.20090918cvs
- Modernize the spec a bit; nuke BuildRoot:, no more RPM_BUILD_ROOT.

* Fri Sep 18 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.2.20090918cvs
- New CVS snapshot; hopefully fix x86_64 startup crash and music issues.

* Thu Sep 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.1.20090910cvs
- Initial attempt to rebase to current CVS.
- Update to use xz for compression of snapshot tarballs.
- Rename "nazghul-haxima" package to "haxima", according to upstream wishes and
  common sense.



--- NEW FILE nazghul-make-snapshot ---
#!/bin/sh
CVSDATE=$1
TMPDIR=$(mktemp -d nazghul.XXXXXXXXXXX) || exit 1
pushd $TMPDIR
cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D$CVSDATE nazghul
tar cvvfJ nazghul-$CVSDATE.txz nazghul
popd
mv $TMPDIR/nazghul-$CVSDATE.txz .
rm -rf $TMPDIR


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/F-12/nazghul.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nazghul.spec	25 Jul 2009 15:49:00 -0000	1.24
+++ nazghul.spec	29 Sep 2009 11:32:23 -0000	1.25
@@ -1,14 +1,13 @@
-%define         cvsdate 20080407
+%define         cvsdate 20090928
 Name:           nazghul
-Version:        0.6.0
-Release:        7.%{cvsdate}cvs%{?dist}
+Version:        0.7.0
+Release:        0.4.%{cvsdate}cvs%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
 
-
 # Occasionally upstream names things with an underscore.
 %define         version_us %(echo %{version} | sed -e 's/\\./_/g')
 
@@ -16,15 +15,13 @@ URL:            http://myweb.cableone.ne
 
 # Construct cvs checkout tarball with:
 #  cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D%{cvsdate} nazghul
-#  tar cvvfz nazghul-%{cvsdate}.tgz nazghul
-Source0:        nazghul-%{cvsdate}.tgz
+#  tar cvvfJ nazghul-%{cvsdate}.txz nazghul
+Source0:        nazghul-%{cvsdate}.txz
 Patch0:         nazghul-desktop.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
-
 # For building from a CVS snapshot
 BuildRequires:  automake, autoconf
+BuildRequires:  SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
 
 %description
 Nazghul is an old-school RPG engine modeled after those made in the
@@ -32,12 +29,14 @@ heyday of top-down, 2d tile-based graphi
 after Ultima V.
 
 
-%package haxima
+%package -n haxima
 Summary:        A full-featured role-playing game for the Nazghul engine
 Group:          Amusements/Games
 Requires:       nazghul = %{version}
+Provides:       nazghul-haxima = %{version}-%{release}
+Obsoletes:      nazghul-haxima < 0.6.0-8
 
-%description haxima
+%description -n haxima
 A complete, playable and full-featured role playing game which runs
 under the Nazghul CRPG engine.
 
@@ -64,26 +63,25 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-mv $RPM_BUILD_ROOT/%{_bindir}/haxima.sh $RPM_BUILD_ROOT/%{_bindir}/haxima
+mv %{buildroot}/%{_bindir}/haxima.sh %{buildroot}/%{_bindir}/haxima
 
 desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --dir %{buildroot}/%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         haxima.desktop
 
-install -D -m 644 icons/haxima.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/haxima.png
+install -D -m 644 icons/haxima.png %{buildroot}/%{_datadir}/pixmaps/haxima.png
 
 # It seems that the music gets left out by "make install"
-pushd %{_builddir}/%{name}/worlds/haxima-1.002
-cp -rp music $RPM_BUILD_ROOT%{_datadir}/nazghul/haxima
-popd
+#pushd %{_builddir}/%{name}/worlds/haxima-1.002
+#cp -rp music %{buildroot}/%{_datadir}/nazghul/haxima
+#popd
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -94,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc MAP_HACKERS_GUIDE engine_extension_and_design world_building
 
 
-%files haxima
+%files -n haxima
 %defattr(-,root,root,-)
 %{_bindir}/haxima
 %{_datadir}/nazghul/haxima
@@ -104,6 +102,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
+- Pull latest fixes.
+
+* Tue Sep 22 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.3.20090918cvs
+- Modernize the spec a bit; nuke BuildRoot:, no more RPM_BUILD_ROOT.
+
+* Fri Sep 18 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.2.20090918cvs
+- New CVS snapshot; hopefully fix x86_64 startup crash and music issues.
+
+* Thu Sep 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.1.20090910cvs
+- Initial attempt to rebase to current CVS.
+- Update to use xz for compression of snapshot tarballs.
+- Rename "nazghul-haxima" package to "haxima", according to upstream wishes and
+  common sense.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-7.20080407cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nazghul/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	7 Apr 2008 15:04:35 -0000	1.10
+++ sources	29 Sep 2009 11:32:23 -0000	1.11
@@ -1 +1 @@
-c11c930146f5f04c6b14a2eeb345872b  nazghul-20080407.tgz
+96ce0446611ae42d3aa59c75eaada5c1  nazghul-20090928.txz



From mhlavink at fedoraproject.org  Tue Sep 29 11:34:03 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 29 Sep 2009 11:34:03 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-11 .cvsignore, 1.27,
	1.28 ecryptfs-utils-75-nocryptdisks.patch, 1.2,
	1.3 ecryptfs-utils.spec, 1.51, 1.52 sources, 1.30, 1.31
Message-ID: <20090929113403.C224511C0419@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-serv4653

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
- updated to 81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	18 Aug 2009 07:03:22 -0000	1.27
+++ .cvsignore	29 Sep 2009 11:34:03 -0000	1.28
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_79.orig.tar.gz
+ecryptfs-utils_81.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 07:03:22 -0000	1.2
+++ ecryptfs-utils-75-nocryptdisks.patch	29 Sep 2009 11:34:03 -0000	1.3
@@ -1,18 +1,42 @@
-diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
---- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
-+++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
-@@ -158,13 +158,5 @@ for swap in $swaps; do
+diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-81/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-09-19 01:41:21.000000000 +0200
++++ ecryptfs-utils-81/src/utils/ecryptfs-setup-swap	2009-09-29 10:25:07.481996541 +0200
+@@ -37,23 +37,20 @@ warn() {
+ usage() {
+ 	echo
+ 	echo `gettext "Usage:"`
+-	echo "  $0 [-f|--force] [-n|--no-reload]"
++	echo "  $0 [-f|--force]"
+ 	echo
+ 	exit 1
+ }
+ 
+ # Handle command line options
+ FORCE=0
++NO_RELOAD=1
+ while [ ! -z "$1" ]; do
+ 	case "$1" in
+ 		-f|--force)
+ 			FORCE=1
+ 			shift 1
+ 		;;
+-		-n|--no-reload)
+-			NO_RELOAD=1
+-			shift 1
+-		;;
+ 		*)
+ 			usage
+ 		;;
+@@ -166,7 +163,6 @@ for swap in $swaps; do
+ 	# Add fstab entry
  	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
  done
- 
--# Turn swap off
--swapoff -a
--
--# Restart cryptdisks
--/etc/init.d/cryptdisks restart
--
--# Turn the swap on
--swapon -a
 -
+ if [ "$NO_RELOAD" != 1 ]; then
+ 	# Turn swap off
+ 	swapoff -a
+@@ -179,3 +175,4 @@ if [ "$NO_RELOAD" != 1 ]; then
+ fi
+ 
  info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ecryptfs-utils.spec	18 Aug 2009 07:03:22 -0000	1.51
+++ ecryptfs-utils.spec	29 Sep 2009 11:34:03 -0000	1.52
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 79
+Version: 81
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
+- updated to 81
+
 * Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
 - updated to 79
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	18 Aug 2009 07:03:22 -0000	1.30
+++ sources	29 Sep 2009 11:34:03 -0000	1.31
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz
+7a8cf5c1cc638bb21036c2088806fc9d  ecryptfs-utils_81.orig.tar.gz



From twoerner at fedoraproject.org  Tue Sep 29 11:34:03 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 29 Sep 2009 11:34:03 +0000 (UTC)
Subject: rpms/system-config-firewall/F-12 .cvsignore, 1.30, 1.31 sources,
	1.33, 1.34 system-config-firewall.spec, 1.45, 1.46
Message-ID: <20090929113403.9893211C00C1@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4632

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- enhanced build environment to support usermode and policykit switches, new
  options for configure and spec file
- make toplevel invisible to not show half initialized window while policykit
  dialog is shown
- system-config-firewall.desktop.in moved to config subdir
- disable dbus usage if gui is used as root (needed for policykit v0)
- do not report dbus error if there is no firewall configuration (empty or
  missing /etc/sysconfig/system-config-firewall)
- resize main window to comfortably fit in a 800x600 gnome desktop
- moved all config files into config subdir: sysconfig, dekstop, pam and console
- new infrastructure to enable policy translations
- print exception if polkit authorization failes to console
- show dbus error dialog if dbus conection can not be established
- set title to APP_NAME for dialogs if there is no title
- center dialogs on screen if there is no parent
- make main app invisible at first to prevent to show an empty app while
  PolicyKit password dialog is visible
- updated translations: as, bn_IN, ca, da, de, ca, cs, es, fi, fr, gu, hi, it,
                        ja, kn, ko, ml, mr, nl, or, pa, pl, pt, pt_BR, ru, sk,
                        sr, sr at latin, sv, ta, te, uk, zh_TW




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	11 Sep 2009 14:57:10 -0000	1.30
+++ .cvsignore	29 Sep 2009 11:34:03 -0000	1.31
@@ -3,3 +3,4 @@ system-config-firewall-1.2.15.tar.bz2
 system-config-firewall-1.2.16.tar.bz2
 system-config-firewall-1.2.17.tar.bz2
 system-config-firewall-1.2.18.tar.bz2
+system-config-firewall-1.2.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	11 Sep 2009 14:57:11 -0000	1.33
+++ sources	29 Sep 2009 11:34:03 -0000	1.34
@@ -1 +1 @@
-c264e0d2a6938881f49eab3f017f9ab3  system-config-firewall-1.2.18.tar.bz2
+1a224404975799a54246c8c23886c39f  system-config-firewall-1.2.19.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/system-config-firewall.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- system-config-firewall.spec	11 Sep 2009 14:57:11 -0000	1.45
+++ system-config-firewall.spec	29 Sep 2009 11:34:03 -0000	1.46
@@ -1,6 +1,21 @@
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+  %bcond_with usermode
+  %bcond_with polkit0
+  %bcond_without polkit1
+%else
+  %if 0%{?fedora} >= 10
+    %bcond_with usermode
+    %bcond_without polkit0
+  %else
+    %bcond_without usermode
+    %bcond_with polkit0
+  %endif
+  %bcond_with polkit1
+%endif
+
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.18
+Version: 1.2.19
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -16,12 +31,19 @@ Obsoletes: system-config-securitylevel
 Provides: system-config-securitylevel = 1.7.0
 Requires: pygtk2
 Requires: python
-Requires: usermode-gtk >= 1.94
 Requires: system-config-firewall-tui = %{version}-%{release}
 Requires: hicolor-icon-theme
 Requires: pygtk2-libglade
 Requires: gtk2 >= 2.6
-Requires: python-slip >= 0.2.3
+%if %{with usermode}
+Requires: usermode-gtk >= 1.94
+%endif
+%if %{with polkit0}
+Requires: python-slip-dbus >= 0.1.15
+%endif
+%if %{with polkit1}
+Requires: python-slip-dbus >= 0.2.7
+%endif
 
 %description
 system-config-firewall is a graphical user interface for basic firewall setup.
@@ -47,7 +69,11 @@ interface for basic firewall setup.
 %setup -q
 
 %build
-%configure
+echo %{with usermode} %{with polkit0} %{with polkit1}
+
+%configure %{?with_usermode: --enable-usermode} \
+	   %{?with_polkit0: --enable-policykit0} \
+	   %{!?with_polkit1: --disable-policykit1}
 
 %install
 rm -rf %{buildroot}
@@ -84,11 +110,18 @@ fi
 %files
 %defattr(-,root,root)
 %{_bindir}/system-config-firewall
-#%{_datadir}/system-config-firewall/system-config-firewall.py*
+%if %{with usermode}
+%{_datadir}/system-config-firewall/system-config-firewall
+%endif
 %defattr(0644,root,root)
 %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Firewall.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Firewall.service
+%if %{with polkit0}
+%{_datadir}/PolicyKit/policy/org.fedoraproject.config.firewall.0.policy
+%endif
+%if %{with polkit1}
 %{_datadir}/polkit-1/actions/org.fedoraproject.config.firewall.policy
+%endif
 %{_datadir}/system-config-firewall/fw_gui.*
 %{_datadir}/system-config-firewall/fw_dbus.*
 %{_datadir}/system-config-firewall/gtk_*
@@ -98,8 +131,10 @@ fi
 %{_datadir}/system-config-firewall/wizard.svg
 %{_datadir}/applications/system-config-firewall.desktop
 %{_datadir}/icons/hicolor/*/apps/preferences-system-firewall.*
-#%config /etc/security/console.apps/system-config-firewall
-#%config /etc/pam.d/system-config-firewall
+%if %{with usermode}
+%config /etc/security/console.apps/system-config-firewall
+%config /etc/pam.d/system-config-firewall
+%endif
 
 %files -f %{name}.lang tui
 %defattr(-,root,root)
@@ -125,6 +160,28 @@ fi
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.19-1
+- enhanced build environment to support usermode and policykit switches, new
+  options for configure and spec file
+- make toplevel invisible to not show half initialized window while policykit
+  dialog is shown
+- system-config-firewall.desktop.in moved to config subdir
+- disable dbus usage if gui is used as root (needed for policykit v0)
+- do not report dbus error if there is no firewall configuration (empty or
+  missing /etc/sysconfig/system-config-firewall)
+- resize main window to comfortably fit in a 800x600 gnome desktop
+- moved all config files into config subdir: sysconfig, dekstop, pam and console
+- new infrastructure to enable policy translations
+- print exception if polkit authorization failes to console
+- show dbus error dialog if dbus conection can not be established
+- set title to APP_NAME for dialogs if there is no title
+- center dialogs on screen if there is no parent
+- make main app invisible at first to prevent to show an empty app while
+  PolicyKit password dialog is visible
+- updated translations: as, bn_IN, ca, da, de, ca, cs, es, fi, fr, gu, hi, it,
+                        ja, kn, ko, ml, mr, nl, or, pa, pl, pt, pt_BR, ru, sk,
+                        sr, sr at latin, sv, ta, te, uk, zh_TW
+
 * Fri Sep 11 2009 Thomas Woerner <twoerner at redhat.com> 1.2.18-1
 - added support for PolicyKit
 - removed unused inconsistent flag from CellRendererToggle in serviceView (rhbz#521144)



From mbarnes at fedoraproject.org  Tue Sep 29 11:36:22 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 29 Sep 2009 11:36:22 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.26,
	1.116.2.27 evolution.spec, 
	1.394.2.62, 1.394.2.63 sources, 1.116.2.31, 1.116.2.32
Message-ID: <20090929113622.ED64311C043B@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5079

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
- Snapshot of "kill-bonobo" progress at commit 2fa61f4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.26
retrieving revision 1.116.2.27
diff -u -p -r1.116.2.26 -r1.116.2.27
--- .cvsignore	23 Sep 2009 22:44:09 -0000	1.116.2.26
+++ .cvsignore	29 Sep 2009 11:36:21 -0000	1.116.2.27
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2
+evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.62
retrieving revision 1.394.2.63
diff -u -p -r1.394.2.62 -r1.394.2.63
--- evolution.spec	24 Sep 2009 00:23:14 -0000	1.394.2.62
+++ evolution.spec	29 Sep 2009 11:36:21 -0000	1.394.2.63
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 0c1afa3
+%define hash 2fa61f4
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.2%{?dist}
+Release: 1.kb.3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
+- Snapshot of "kill-bonobo" progress at commit 2fa61f4.
+
 * Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.2.fc12
 - Snapshot of "kill-bonobo" progress at commit 0c1afa3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.31
retrieving revision 1.116.2.32
diff -u -p -r1.116.2.31 -r1.116.2.32
--- sources	23 Sep 2009 22:44:09 -0000	1.116.2.31
+++ sources	29 Sep 2009 11:36:22 -0000	1.116.2.32
@@ -1 +1 @@
-448b519564cb448f647f7be76fe85817  evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2
+6f3e9f57c256b2596df051a6e42ca3b8  evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2



From twoerner at fedoraproject.org  Tue Sep 29 11:36:36 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 29 Sep 2009 11:36:36 +0000 (UTC)
Subject: rpms/system-config-firewall/devel sources, 1.33,
	1.34 system-config-firewall.spec, 1.45, 1.46
Message-ID: <20090929113636.9401111C00C1@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5540

Modified Files:
	sources system-config-firewall.spec 
Log Message:
- enhanced build environment to support usermode and policykit switches, new
  options for configure and spec file
- make toplevel invisible to not show half initialized window while policykit
  dialog is shown
- system-config-firewall.desktop.in moved to config subdir
- disable dbus usage if gui is used as root (needed for policykit v0)
- do not report dbus error if there is no firewall configuration (empty or
  missing /etc/sysconfig/system-config-firewall)
- resize main window to comfortably fit in a 800x600 gnome desktop
- moved all config files into config subdir: sysconfig, dekstop, pam and console
- new infrastructure to enable policy translations
- print exception if polkit authorization failes to console
- show dbus error dialog if dbus conection can not be established
- set title to APP_NAME for dialogs if there is no title
- center dialogs on screen if there is no parent
- make main app invisible at first to prevent to show an empty app while
  PolicyKit password dialog is visible
- updated translations: as, bn_IN, ca, da, de, ca, cs, es, fi, fr, gu, hi, it,
                        ja, kn, ko, ml, mr, nl, or, pa, pl, pt, pt_BR, ru, sk,
                        sr, sr at latin, sv, ta, te, uk, zh_TW




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	11 Sep 2009 14:57:11 -0000	1.33
+++ sources	29 Sep 2009 11:36:36 -0000	1.34
@@ -1 +1 @@
-c264e0d2a6938881f49eab3f017f9ab3  system-config-firewall-1.2.18.tar.bz2
+1a224404975799a54246c8c23886c39f  system-config-firewall-1.2.19.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- system-config-firewall.spec	11 Sep 2009 14:57:11 -0000	1.45
+++ system-config-firewall.spec	29 Sep 2009 11:36:36 -0000	1.46
@@ -1,6 +1,21 @@
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+  %bcond_with usermode
+  %bcond_with polkit0
+  %bcond_without polkit1
+%else
+  %if 0%{?fedora} >= 10
+    %bcond_with usermode
+    %bcond_without polkit0
+  %else
+    %bcond_without usermode
+    %bcond_with polkit0
+  %endif
+  %bcond_with polkit1
+%endif
+
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.18
+Version: 1.2.19
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -16,12 +31,19 @@ Obsoletes: system-config-securitylevel
 Provides: system-config-securitylevel = 1.7.0
 Requires: pygtk2
 Requires: python
-Requires: usermode-gtk >= 1.94
 Requires: system-config-firewall-tui = %{version}-%{release}
 Requires: hicolor-icon-theme
 Requires: pygtk2-libglade
 Requires: gtk2 >= 2.6
-Requires: python-slip >= 0.2.3
+%if %{with usermode}
+Requires: usermode-gtk >= 1.94
+%endif
+%if %{with polkit0}
+Requires: python-slip-dbus >= 0.1.15
+%endif
+%if %{with polkit1}
+Requires: python-slip-dbus >= 0.2.7
+%endif
 
 %description
 system-config-firewall is a graphical user interface for basic firewall setup.
@@ -47,7 +69,11 @@ interface for basic firewall setup.
 %setup -q
 
 %build
-%configure
+echo %{with usermode} %{with polkit0} %{with polkit1}
+
+%configure %{?with_usermode: --enable-usermode} \
+	   %{?with_polkit0: --enable-policykit0} \
+	   %{!?with_polkit1: --disable-policykit1}
 
 %install
 rm -rf %{buildroot}
@@ -84,11 +110,18 @@ fi
 %files
 %defattr(-,root,root)
 %{_bindir}/system-config-firewall
-#%{_datadir}/system-config-firewall/system-config-firewall.py*
+%if %{with usermode}
+%{_datadir}/system-config-firewall/system-config-firewall
+%endif
 %defattr(0644,root,root)
 %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Firewall.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Firewall.service
+%if %{with polkit0}
+%{_datadir}/PolicyKit/policy/org.fedoraproject.config.firewall.0.policy
+%endif
+%if %{with polkit1}
 %{_datadir}/polkit-1/actions/org.fedoraproject.config.firewall.policy
+%endif
 %{_datadir}/system-config-firewall/fw_gui.*
 %{_datadir}/system-config-firewall/fw_dbus.*
 %{_datadir}/system-config-firewall/gtk_*
@@ -98,8 +131,10 @@ fi
 %{_datadir}/system-config-firewall/wizard.svg
 %{_datadir}/applications/system-config-firewall.desktop
 %{_datadir}/icons/hicolor/*/apps/preferences-system-firewall.*
-#%config /etc/security/console.apps/system-config-firewall
-#%config /etc/pam.d/system-config-firewall
+%if %{with usermode}
+%config /etc/security/console.apps/system-config-firewall
+%config /etc/pam.d/system-config-firewall
+%endif
 
 %files -f %{name}.lang tui
 %defattr(-,root,root)
@@ -125,6 +160,28 @@ fi
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.19-1
+- enhanced build environment to support usermode and policykit switches, new
+  options for configure and spec file
+- make toplevel invisible to not show half initialized window while policykit
+  dialog is shown
+- system-config-firewall.desktop.in moved to config subdir
+- disable dbus usage if gui is used as root (needed for policykit v0)
+- do not report dbus error if there is no firewall configuration (empty or
+  missing /etc/sysconfig/system-config-firewall)
+- resize main window to comfortably fit in a 800x600 gnome desktop
+- moved all config files into config subdir: sysconfig, dekstop, pam and console
+- new infrastructure to enable policy translations
+- print exception if polkit authorization failes to console
+- show dbus error dialog if dbus conection can not be established
+- set title to APP_NAME for dialogs if there is no title
+- center dialogs on screen if there is no parent
+- make main app invisible at first to prevent to show an empty app while
+  PolicyKit password dialog is visible
+- updated translations: as, bn_IN, ca, da, de, ca, cs, es, fi, fr, gu, hi, it,
+                        ja, kn, ko, ml, mr, nl, or, pa, pl, pt, pt_BR, ru, sk,
+                        sr, sr at latin, sv, ta, te, uk, zh_TW
+
 * Fri Sep 11 2009 Thomas Woerner <twoerner at redhat.com> 1.2.18-1
 - added support for PolicyKit
 - removed unused inconsistent flag from CellRendererToggle in serviceView (rhbz#521144)



From mhlavink at fedoraproject.org  Tue Sep 29 11:46:01 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 29 Sep 2009 11:46:01 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-10 .cvsignore, 1.22,
	1.23 ecryptfs-utils-75-nocryptdisks.patch, 1.2,
	1.3 ecryptfs-utils.spec, 1.37, 1.38 sources, 1.25, 1.26
Message-ID: <20090929114601.38FE711C00C1@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-serv8551

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
- updated to 81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	18 Aug 2009 07:16:17 -0000	1.22
+++ .cvsignore	29 Sep 2009 11:46:00 -0000	1.23
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_79.orig.tar.gz
+ecryptfs-utils_81.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 07:16:18 -0000	1.2
+++ ecryptfs-utils-75-nocryptdisks.patch	29 Sep 2009 11:46:00 -0000	1.3
@@ -1,18 +1,42 @@
-diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
---- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
-+++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
-@@ -158,13 +158,5 @@ for swap in $swaps; do
+diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-81/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-09-19 01:41:21.000000000 +0200
++++ ecryptfs-utils-81/src/utils/ecryptfs-setup-swap	2009-09-29 10:25:07.481996541 +0200
+@@ -37,23 +37,20 @@ warn() {
+ usage() {
+ 	echo
+ 	echo `gettext "Usage:"`
+-	echo "  $0 [-f|--force] [-n|--no-reload]"
++	echo "  $0 [-f|--force]"
+ 	echo
+ 	exit 1
+ }
+ 
+ # Handle command line options
+ FORCE=0
++NO_RELOAD=1
+ while [ ! -z "$1" ]; do
+ 	case "$1" in
+ 		-f|--force)
+ 			FORCE=1
+ 			shift 1
+ 		;;
+-		-n|--no-reload)
+-			NO_RELOAD=1
+-			shift 1
+-		;;
+ 		*)
+ 			usage
+ 		;;
+@@ -166,7 +163,6 @@ for swap in $swaps; do
+ 	# Add fstab entry
  	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
  done
- 
--# Turn swap off
--swapoff -a
--
--# Restart cryptdisks
--/etc/init.d/cryptdisks restart
--
--# Turn the swap on
--swapon -a
 -
+ if [ "$NO_RELOAD" != 1 ]; then
+ 	# Turn swap off
+ 	swapoff -a
+@@ -179,3 +175,4 @@ if [ "$NO_RELOAD" != 1 ]; then
+ fi
+ 
  info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ecryptfs-utils.spec	18 Aug 2009 07:16:18 -0000	1.37
+++ ecryptfs-utils.spec	29 Sep 2009 11:46:00 -0000	1.38
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 79
+Version: 81
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
+- updated to 81
+
 * Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
 - updated to 79
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	18 Aug 2009 07:16:18 -0000	1.25
+++ sources	29 Sep 2009 11:46:00 -0000	1.26
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz
+7a8cf5c1cc638bb21036c2088806fc9d  ecryptfs-utils_81.orig.tar.gz



From twaugh at fedoraproject.org  Tue Sep 29 11:49:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 11:49:05 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.132,1.133 comps-f13.xml.in,1.22,1.23
Message-ID: <20090929114905.CD5A711C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9647

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Removed emacs-nxml-mode (bug #516391).


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- comps-f12.xml.in	28 Sep 2009 17:45:49 -0000	1.132
+++ comps-f12.xml.in	29 Sep 2009 11:49:05 -0000	1.133
@@ -1312,7 +1312,6 @@
       <packagereq type="optional">emacs-bbdb</packagereq>
       <packagereq type="optional">emacs-ess</packagereq>
       <packagereq type="optional">emacs-muse</packagereq>
-      <packagereq type="optional">emacs-nxml-mode</packagereq>
       <packagereq type="optional">emacs-vm</packagereq>
       <packagereq type="optional">geany</packagereq>
       <packagereq type="optional">gobby</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- comps-f13.xml.in	28 Sep 2009 17:45:49 -0000	1.22
+++ comps-f13.xml.in	29 Sep 2009 11:49:05 -0000	1.23
@@ -1306,7 +1306,6 @@
       <packagereq type="optional">emacs-bbdb</packagereq>
       <packagereq type="optional">emacs-ess</packagereq>
       <packagereq type="optional">emacs-muse</packagereq>
-      <packagereq type="optional">emacs-nxml-mode</packagereq>
       <packagereq type="optional">emacs-vm</packagereq>
       <packagereq type="optional">geany</packagereq>
       <packagereq type="optional">gobby</packagereq>



From rdieter at fedoraproject.org  Tue Sep 29 11:50:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 11:50:03 +0000 (UTC)
Subject: rpms/amarok/devel .cvsignore, 1.51, 1.52 amarok.spec, 1.165,
	1.166 sources, 1.52, 1.53 post-2.1.90-20090923git.patch, 1.1, NONE
Message-ID: <20090929115003.0488E11C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9883

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	post-2.1.90-20090923git.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
- amarok-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	22 Sep 2009 02:01:06 -0000	1.51
+++ .cvsignore	29 Sep 2009 11:50:02 -0000	1.52
@@ -1 +1 @@
-amarok-2.1.90.tar.bz2
+amarok-2.2.0.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- amarok.spec	24 Sep 2009 01:34:17 -0000	1.165
+++ amarok.spec	29 Sep 2009 11:50:02 -0000	1.166
@@ -1,23 +1,17 @@
 
-%define snap 20090923git
-
 Name:    amarok
 Summary: Media player
-Version: 2.1.90
-Release: 2.%{snap}%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-#Source0:  amarok-%{version}-%{snap}.tar.bz2
+Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-# mostly a:  git diff v2.1.90
-Patch100: post-2.1.90-%{snap}.patch 
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -38,8 +32,7 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
@@ -65,6 +58,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
 
@@ -81,7 +75,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .20090923git
 
 
 %build
@@ -173,6 +166,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- amarok-2.2.0
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
 - 20090923git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	22 Sep 2009 02:01:06 -0000	1.52
+++ sources	29 Sep 2009 11:50:02 -0000	1.53
@@ -1 +1 @@
-ec727ed72c5d371fb659ce0c3c1e6136  amarok-2.1.90.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2


--- post-2.1.90-20090923git.patch DELETED ---



From rdieter at fedoraproject.org  Tue Sep 29 11:50:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 11:50:42 +0000 (UTC)
Subject: rpms/amarok/F-12 .cvsignore, 1.51, 1.52 amarok.spec, 1.165,
	1.166 sources, 1.52, 1.53 post-2.1.90-20090923git.patch, 1.1, NONE
Message-ID: <20090929115042.EDD1B11C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10071

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	post-2.1.90-20090923git.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
- amarok-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	22 Sep 2009 02:01:41 -0000	1.51
+++ .cvsignore	29 Sep 2009 11:50:42 -0000	1.52
@@ -1 +1 @@
-amarok-2.1.90.tar.bz2
+amarok-2.2.0.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- amarok.spec	24 Sep 2009 01:35:16 -0000	1.165
+++ amarok.spec	29 Sep 2009 11:50:42 -0000	1.166
@@ -1,23 +1,17 @@
 
-%define snap 20090923git
-
 Name:    amarok
 Summary: Media player
-Version: 2.1.90
-Release: 2.%{snap}%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-#Source0:  amarok-%{version}-%{snap}.tar.bz2
+Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-# mostly a:  git diff v2.1.90
-Patch100: post-2.1.90-%{snap}.patch 
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -38,8 +32,7 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
@@ -65,6 +58,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
 
@@ -81,7 +75,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .20090923git
 
 
 %build
@@ -173,6 +166,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- amarok-2.2.0
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
 - 20090923git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	22 Sep 2009 02:01:41 -0000	1.52
+++ sources	29 Sep 2009 11:50:42 -0000	1.53
@@ -1 +1 @@
-ec727ed72c5d371fb659ce0c3c1e6136  amarok-2.1.90.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2


--- post-2.1.90-20090923git.patch DELETED ---



From twaugh at fedoraproject.org  Tue Sep 29 11:50:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 11:50:56 +0000 (UTC)
Subject: rpms/emacs-nxml-mode/F-12 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE emacs-nxml-mode.spec, 1.5,
	NONE nxml-mode.el.2006-01-03.patch, 1.1, NONE slides.rnc, 1.1,
	NONE sources, 1.1, NONE xsd-regexp.el.2006-01-26.patch, 1.1, NONE
Message-ID: <20090929115056.0EA0B11C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/emacs-nxml-mode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10173

Added Files:
	dead.package 
Removed Files:
	Makefile branch emacs-nxml-mode.spec 
	nxml-mode.el.2006-01-03.patch slides.rnc sources 
	xsd-regexp.el.2006-01-26.patch 
Log Message:
Dead package.


--- NEW FILE dead.package ---
Included in emacs-23.*


--- Makefile DELETED ---


--- branch DELETED ---


--- emacs-nxml-mode.spec DELETED ---


--- nxml-mode.el.2006-01-03.patch DELETED ---


--- slides.rnc DELETED ---


--- sources DELETED ---


--- xsd-regexp.el.2006-01-26.patch DELETED ---



From twaugh at fedoraproject.org  Tue Sep 29 11:52:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 11:52:09 +0000 (UTC)
Subject: rpms/emacs-nxml-mode/F-11 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE emacs-nxml-mode.spec, 1.4,
	NONE nxml-mode.el.2006-01-03.patch, 1.1, NONE slides.rnc, 1.1,
	NONE sources, 1.1, NONE xsd-regexp.el.2006-01-26.patch, 1.1, NONE
Message-ID: <20090929115209.CE5C211C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/emacs-nxml-mode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10415

Added Files:
	dead.package 
Removed Files:
	Makefile branch emacs-nxml-mode.spec 
	nxml-mode.el.2006-01-03.patch slides.rnc sources 
	xsd-regexp.el.2006-01-26.patch 
Log Message:
Dead package.


--- NEW FILE dead.package ---
Included in emacs-23.*


--- Makefile DELETED ---


--- branch DELETED ---


--- emacs-nxml-mode.spec DELETED ---


--- nxml-mode.el.2006-01-03.patch DELETED ---


--- slides.rnc DELETED ---


--- sources DELETED ---


--- xsd-regexp.el.2006-01-26.patch DELETED ---



From ovasik at fedoraproject.org  Tue Sep 29 11:56:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 29 Sep 2009 11:56:06 +0000 (UTC)
Subject: rpms/quota/devel quota.spec,1.56,1.57
Message-ID: <20090929115606.8EFAD11C00C1@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11635

Modified Files:
	quota.spec 
Log Message:
add buildrequires for quota_nld, enable-netlink to build quota_nld (#526047)


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- quota.spec	18 Sep 2009 07:51:15 -0000	1.56
+++ quota.spec	29 Sep 2009 11:56:06 -0000	1.57
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: initscripts >= 6.38 tcp_wrappers e2fsprogs
 Conflicts: kernel < 2.4
 BuildRequires: e2fsprogs-devel gettext tcp_wrappers-devel nss-devel
-BuildRequires: openldap-devel openssl-devel
+BuildRequires: openldap-devel openssl-devel dbus-devel libnl-devel
 Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
 Patch0:	quota-3.06-warnquota.patch
 Patch1: quota-3.06-no-stripping.patch
@@ -66,7 +66,8 @@ done
 %if %{rpcsetquota}
 	--enable-rpcsetquota=yes \
 %endif
-	--enable-rootsbin
+	--enable-rootsbin \
+	--enable-netlink=yes
 make
 
 
@@ -114,6 +115,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 29 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-8
+- add buildrequires for quota_nld, enable-netlink to build
+  quota_nld (#526047)
+
 * Fri Sep 18 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-7
 - Fix headers and structs in quotactl manpage(#524138)
 



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:25 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090929120225.47A5C10F88B@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:29 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120230.C530F10F85F@bastion2.fedora.phx.redhat.com>

limb has set the watchbugzilla acl on trac (Fedora devel) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:31 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120231.15E9010F88C@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on trac (Fedora devel) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:32 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120232.D90F610F8A9@bastion2.fedora.phx.redhat.com>

limb has set the commit acl on trac (Fedora devel) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:34 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120235.05D8E10F85F@bastion2.fedora.phx.redhat.com>

limb has set the approveacls acl on trac (Fedora devel) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:44 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120244.3066610F888@bastion2.fedora.phx.redhat.com>

limb has set the watchbugzilla acl on trac (Fedora 12) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:44 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120245.084D910F88C@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on trac (Fedora 12) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:46 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120246.84B7910F8A8@bastion2.fedora.phx.redhat.com>

limb has set the commit acl on trac (Fedora 12) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:02:47 +0000
Subject: [pkgdb] trac had acl change status
Message-ID: <20090929120247.E0D6910F874@bastion2.fedora.phx.redhat.com>

limb has set the approveacls acl on trac (Fedora 12) to Approved for jkeating

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:03:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:03:00 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090929120300.5D3F410F88C@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:05:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:05:07 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090929120507.E650A10F85F@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From pkgdb at fedoraproject.org  Tue Sep 29 12:17:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 12:17:24 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090929121724.237AC10F85F@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From akurtakov at fedoraproject.org  Tue Sep 29 12:18:17 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 12:18:17 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.81, 1.82 eclipse.spec, 1.668,
	1.669 .cvsignore, 1.62, 1.63 eclipse-dontpackicu4jsource.patch,
	1.1, NONE eclipse-addrootfiles.patch, 1.1,
	NONE eclipse-addusrsharedropins.patch, 1.1,
	NONE eclipse-swt-buildagainstxulrunner.patch, 1.2,
	NONE eclipse-help-toolbar.patch, 1.1,
	NONE eclipse-nojarsignatures.patch, 1.3,
	NONE eclipse-ecf-qualifier.patch, 1.1,
	NONE eclipse-launcher-fix-java-home.patch, 1.1,
	NONE eclipse-buildswtnatives.patch, 1.3,
	NONE eclipse-addfragmentsforotherplatforms.patch, 1.9,
	NONE eclipse-config.ini.director, 1.2,
	NONE eclipse-fix-javahome64.patch, 1.1,
	NONE eclipse-jdt_launch-customBuild.patch, 1.1,
	NONE eclipse.desktop, 1.4, NONE eclipse-swt-xulrunner191.patch,
	1.1, NONE eclipse-memorypermsizeandjvmcrash.patch, 1.6,
	NONE eclipse-platform_build.patch, 1.2,
	NONE eclipse-compilelibs.patch, 1.4,
	NONE eclipse-ia64-packaging.patch, 1.2, NONE
Message-ID: <20090929121817.6445211C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301/devel

Modified Files:
	sources eclipse.spec .cvsignore 
Removed Files:
	eclipse-dontpackicu4jsource.patch eclipse-addrootfiles.patch 
	eclipse-addusrsharedropins.patch 
	eclipse-swt-buildagainstxulrunner.patch 
	eclipse-help-toolbar.patch eclipse-nojarsignatures.patch 
	eclipse-ecf-qualifier.patch 
	eclipse-launcher-fix-java-home.patch 
	eclipse-buildswtnatives.patch 
	eclipse-addfragmentsforotherplatforms.patch 
	eclipse-config.ini.director eclipse-fix-javahome64.patch 
	eclipse-jdt_launch-customBuild.patch eclipse.desktop 
	eclipse-swt-xulrunner191.patch 
	eclipse-memorypermsizeandjvmcrash.patch 
	eclipse-platform_build.patch eclipse-compilelibs.patch 
	eclipse-ia64-packaging.patch 
Log Message:
- Build with eclipse-build 0.4.0 RC0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	21 Sep 2009 08:42:18 -0000	1.81
+++ sources	29 Sep 2009 12:18:16 -0000	1.82
@@ -1,3 +1,3 @@
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
-a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
 d9b5bdc848ded1c2f1f62da94b9c70a0  ecf-filetransfer-v20090604-1131.tar.bz2
+0c08b2d3cbdec806afeddf10ab7d7bb0  eclipse-build-0_4_RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -p -r1.668 -r1.669
--- eclipse.spec	23 Sep 2009 19:53:01 -0000	1.668
+++ eclipse.spec	29 Sep 2009 12:18:16 -0000	1.669
@@ -30,13 +30,12 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-R0_3_0.tar.gz
+Source0:        %{download_url}eclipse-build-0_4_RC0.tar.gz
 Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
-Source2:        %{name}.desktop
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
@@ -44,8 +43,6 @@ Source17:       efj.sh.in
 Source19:       %{name}-filenamepatterns.txt
 # Script to wrap PDE Build calls for bundle builds
 Source21:       %{name}-pdebuild.sh
-# config.ini to run the director for provisioning the installation
-Source22:       %{name}-config.ini.director
 Source24:       fetch-ecf.sh
 # This was fetched using the above script.
 # We will eventually have an eclipse-ecf package but since the ECF
@@ -59,14 +56,6 @@ Source27:       ecf-filetransfer-build.p
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-# Build swttools.jar before generation on 64-bit platforms.
-# Build SWT native libraries
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
-Patch4:         %{name}-buildswtnatives.patch
-Patch32:        %{name}-compilelibs.patch
-
 # This does two things:
 # 1. allows the launcher to be in /usr/bin and
 # 2. ensures that the OSGi configuration directory
@@ -76,70 +65,16 @@ Patch32:        %{name}-compilelibs.patc
 # generic releng plugins that can be used to build plugins
 # see this thread for details:
 # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-Patch15:        %{name}-pde.build-add-package-build.patch
-Patch24:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch28:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
-Patch30:        %{name}-addfragmentsforotherplatforms.patch
-Patch38:        %{name}-addrootfiles.patch
-#FIXME: file a bug upstream
-Patch26:        %{name}-launcher-fix-java-home.patch
-# Default max heap size too low for lots of people.  Bump to 512 MB.
-# Max perm size:
-# https://bugzilla.redhat.com/show_bug.cgi?id=352361
-# JVM crash:
-# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
-# https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
-Patch29:        %{name}-memorypermsizeandjvmcrash.patch
-
-Patch31:	%{name}-ia64-packaging.patch
-
-# Make ECF bundles have the same qualifier as they do upstream
-Patch35:	%{name}-ecf-qualifier.patch
-
-# Don't pack the icu4j source bundle.  Can go away when we re-build
-# icu4j against a 3.4 SDK.
-Patch36:	%{name}-dontpackicu4jsource.patch
-
-# Our dependent JARs have different signatures than the ones included
-# upstream so remove the signatures in the manifests
-Patch37:	%{name}-nojarsignatures.patch
-
-## Back-port patches from 3.4.x stream.  These will be in 3.4.1.
-## https://bugs.eclipse.org/bugs/show_bug.cgi?id=242632
-#Patch39:        %{name}-profilesync-e.o242632.patch
-#Patch40:        %{name}-profilesync-e.o242632-2.patch
-
-Patch43:		%{name}-osgi-classpath.patch
-Patch44:		%{name}-fix-javahome64.patch
-
-# TODO fix customBuildCallback
-Patch47:        %{name}-jdt_launch-customBuild.patch
-
-# Since we're building against XULRunner, build using XR flags
-# https://bugs.eclipse.org/226356
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
-# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
-# it should perhaps be -lxpcomglue.  This patch uses that instead but will
-# be replaced with the former when libxul.pc is fixed.
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
-Patch48:        %{name}-swt-buildagainstxulrunner.patch
+Patch0:        %{name}-pde.build-add-package-build.patch
+Patch1:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch2:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
-Patch49:        %{name}-add-ppc64-filesystem.patch
+Patch5:        %{name}-add-ppc64-filesystem.patch
 
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch50:        %{name}-target-platform-template.patch
-
-# Add /usr/share/eclipse/dropins to list of dropins locations
-# Already applied in eclipse-build upstream rev. #23023
-Patch51:        %{name}-addusrsharedropins.patch
-
-#Fix for help toolbar jsp compile error.
-#See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064
-#Already added to eclipse-build.
-Patch52:        %{name}-help-toolbar.patch
+Patch6:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -284,39 +219,16 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-R0_3_0
+%setup -q -n eclipse-build-0_4_RC0
 cp %{SOURCE1} .
 sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
 ant -DbuildId=I20090611-1540 applyPatches
 pushd build/eclipse-I20090611-1540-fetched-src
 
-# Add /usr/share/eclipse/dropins
-%patch51 -p3
-
-#sed --in-place "s/java5.home/java.home/" build.xml
-#sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
-# Build swttools.jar and native libraries
-#%patch4 -p0
-#%patch32 -p0
-
 # liblocalfile fixes
 sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
 sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
 
-# launcher patches
-rm plugins/org.eclipse.platform/launchersrc.zip
-pushd features/org.eclipse.equinox.executable
-#%patch12 -p0
-%patch26 -p0
-# FIXME:  deal with this
-## put the configuration directory in an arch-specific location
-#sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
-## make the eclipse binary relocatable
-#sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
-zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
-popd
-#-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
-
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -333,27 +245,10 @@ sed -i -e "s|http://java.sun.com/j2se/1.
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
 pushd plugins/org.eclipse.pde.build
-%patch15
+%patch0
 sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
 popd
 
-# TODO check whether it is needed
-#%patch36
-# TODO rebase
-#%patch37
-
-#pushd plugins/org.eclipse.equinox.p2.reconciler.dropins
-#%patch39
-#popd
-#
-#pushd plugins/org.eclipse.equinox.p2.touchpoint.eclipse
-#%patch40
-#popd
-
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch45 -p3
-#popd
-
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
 find -iname \*.rsa | xargs rm
@@ -380,13 +275,10 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %ifarch ppc64
-%patch24 -p1
-%patch28
-%patch49
+%patch1 -p1
+%patch2
+%patch5
 %endif
-#%patch30
-%patch31 -p1
-%patch38
 
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
 # the s390x strings with ppc64, etc.
@@ -460,22 +352,6 @@ IFS='
 
 %endif
 
-arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
-  features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
-  '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
-
-arches=$(echo $arches | sed s/%{eclipse_arch}//)
-
-# Don't build for arches other than the one on which we're building
-pushd features
-for f in */build.xml; do
-    for arch in $arches; do
-      sed -i "/<ant antfile=\"build.xml\" dir=.*$arch\" target=\"/,/<\/ant>/ d" $f
-      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch:0.0.0,[0-9I\.vf\-]\+,//g" $f
-    done
-done
-popd
-
 # Symlinks
 rm plugins/org.sat4j*
 ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
@@ -647,17 +523,8 @@ cp -p %{SOURCE27} build.properties
 popd
 popd
 
-%patch43
-%patch44
-%patch47
-
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch48 -p3
-#popd
-
 # target platform template patch
-%patch50 -p0
-%patch52 -p0
+%patch6 -p0
 
 popd
 
@@ -677,7 +544,6 @@ java -cp $SDK/plugins/org.eclipse.equino
 cp org.eclipse.equinox.initializer*.jar $SDK/plugins
 popd
 
-#
 # Build the ECF filetransfer plugins
 pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
 mkdir -p build
@@ -1000,11 +866,11 @@ sed --in-place "s:startup.jar:%{_libdir}
 rm -rf $installDir
 
 # A sanity check.
-desktop-file-validate %{SOURCE2}
+desktop-file-validate %{name}.desktop
 
 # freedesktop.org menu entry
 desktop-file-install --vendor="fedora" \
---dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
+--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
@@ -1429,6 +1295,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-3
+- Build with eclipse-build 0.4.0 RC0.
+
 * Wed Sep 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-2
 - Move jakarta-commons-codec requirement from jdt to platform.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	18 Sep 2009 13:41:44 -0000	1.62
+++ .cvsignore	29 Sep 2009 12:18:16 -0000	1.63
@@ -3,3 +3,4 @@ eclipse-ecj-gcj.tar.bz2
 eclipse-I20090611-1540-fetched-src.tar.bz2
 eclipse-build-R0_3_0.tar.gz
 ecf-filetransfer-v20090604-1131.tar.bz2
+eclipse-build-0_4_RC0.tar.gz


--- eclipse-dontpackicu4jsource.patch DELETED ---


--- eclipse-addrootfiles.patch DELETED ---


--- eclipse-addusrsharedropins.patch DELETED ---


--- eclipse-swt-buildagainstxulrunner.patch DELETED ---


--- eclipse-help-toolbar.patch DELETED ---


--- eclipse-nojarsignatures.patch DELETED ---


--- eclipse-ecf-qualifier.patch DELETED ---


--- eclipse-launcher-fix-java-home.patch DELETED ---


--- eclipse-buildswtnatives.patch DELETED ---


--- eclipse-addfragmentsforotherplatforms.patch DELETED ---


--- eclipse-config.ini.director DELETED ---


--- eclipse-fix-javahome64.patch DELETED ---


--- eclipse-jdt_launch-customBuild.patch DELETED ---


--- eclipse.desktop DELETED ---


--- eclipse-swt-xulrunner191.patch DELETED ---


--- eclipse-memorypermsizeandjvmcrash.patch DELETED ---


--- eclipse-platform_build.patch DELETED ---


--- eclipse-compilelibs.patch DELETED ---


--- eclipse-ia64-packaging.patch DELETED ---



From sgallagh at fedoraproject.org  Tue Sep 29 12:19:20 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 29 Sep 2009 12:19:20 +0000 (UTC)
Subject: rpms/sssd/F-12 0001-Tighten-up-permission.patch, NONE,
	1.1 0002-Fix-infinite-loop-with-empty-group-enumeration.patch,
	NONE, 1.1 sssd.spec, 1.19, 1.20
Message-ID: <20090929121920.76A6111C00C1@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19188/F-12

Modified Files:
	sssd.spec 
Added Files:
	0001-Tighten-up-permission.patch 
	0002-Fix-infinite-loop-with-empty-group-enumeration.patch 
Log Message:
Add two patches

1) Ensure that the configuration upgrade script always writes the config
   file with 0600 permissions
2) Eliminate an infinite loop in group enumerations


0001-Tighten-up-permission.patch:
 contrib/sssd.spec.in             |    2 +-
 server/upgrade/upgrade_config.py |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Tighten-up-permission.patch ---
>From 5ab9ed3c42781ae1911d253d56d67dc0288d55f7 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Mon, 28 Sep 2009 07:51:26 -0400
Subject: [PATCH 1/2] Tighten up permission.

SSSD may contain passwords and other sensitive data, make sure we always keep its
permission tight. Also make /etc/sssd permission very strict, just in case,
admins may inadvertently copy an sssd.conf file without checking it's
permissions.
---
 contrib/sssd.spec.in             |    2 +-
 server/upgrade/upgrade_config.py |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 5dc45d2..9513a6b 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{pipepath}
 %attr(700,root,root) %dir %{pipepath}/private
 %attr(750,root,root) %dir %{_var}/log/%{name}
-%dir %{_sysconfdir}/sssd
+%attr(700,root,root) %dir %{_sysconfdir}/sssd
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
 %{_mandir}/man5/sssd.conf.5*
 %{_mandir}/man5/sssd-krb5.5*
diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 412fad5..87e3990 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -20,6 +20,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import sys
 import shutil
 import traceback
@@ -91,6 +92,9 @@ class SSSDConfigFile(object):
         " Copy the file we operate on to a backup location "
         shutil.copy(self.file_name, self.file_name+".bak")
 
+        # make sure we don't leak data, force permissions on the backup
+        os.chmod(self.file_name+".bak", 0600)
+
     def _migrate_if_exists(self, to_section, to_option, from_section, from_option):
         """
         Move value of parameter from one section to another, renaming the parameter
@@ -281,8 +285,12 @@ class SSSDConfigFile(object):
         # Migrate domains
         self._migrate_domains()
 
-        # all done, write the file
+        # all done, open the file for writing
         of = open(out_file_name, "wb")
+
+        # make sure it has the right permissions too
+        os.chmod(out_file_name, 0600)
+
         self._new_config.write(of)
 
 def parse_options():
@@ -337,6 +345,9 @@ def main():
         print >>sys.stderr, "Can only upgrade from v1 to v2, file %s looks like version %d" % (options.filename, config.get_version())
         return 1
 
+    # make sure we keep strict settings when creating new files
+    os.umask(0077)
+
     try:
         config.upgrade_v2(options.outfile, options.backup)
     except Exception, e:
-- 
1.6.2.5


0002-Fix-infinite-loop-with-empty-group-enumeration.patch:
 nsssrv_cmd.c |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

--- NEW FILE 0002-Fix-infinite-loop-with-empty-group-enumeration.patch ---
>From 5cada7fa7f822ac064f3f5d452f7f32fc4595bd4 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 29 Sep 2009 07:34:30 -0400
Subject: [PATCH 2/2] Fix infinite loop with empty group enumeration

Loop control variable was not being incremented.
I also converted a goto loop into a do...while loop to make it
easier to follow the logic.
---
 server/responder/nss/nsssrv_cmd.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/responder/nss/nsssrv_cmd.c b/server/responder/nss/nsssrv_cmd.c
index 8ca0be6..ebfd1d5 100644
--- a/server/responder/nss/nsssrv_cmd.c
+++ b/server/responder/nss/nsssrv_cmd.c
@@ -2645,26 +2645,28 @@ static int nss_cmd_retgrent(struct cli_ctx *cctx, int num)
     nctx = talloc_get_type(cctx->rctx->pvt_ctx, struct nss_ctx);
     gctx = nctx->gctx;
 
-retry:
-    if (gctx->cur >= gctx->num) goto none;
-
-    gdom = &gctx->doms[gctx->cur];
+    do {
+        if (gctx->cur >= gctx->num) goto none;
 
-    n = gdom->res->count - gdom->cur;
-    if (n == 0 && (gctx->cur+1 < gctx->num)) {
-        gctx->cur++;
         gdom = &gctx->doms[gctx->cur];
+
         n = gdom->res->count - gdom->cur;
-    }
+        if (n == 0 && (gctx->cur+1 < gctx->num)) {
+            gctx->cur++;
+            gdom = &gctx->doms[gctx->cur];
+            n = gdom->res->count - gdom->cur;
+        }
 
-    if (!n) goto none;
+        if (!n) goto none;
 
-    msgs = &(gdom->res->msgs[gdom->cur]);
+        msgs = &(gdom->res->msgs[gdom->cur]);
 
-    ret = fill_grent(cctx->creq->out, gdom->domain, nctx, true, msgs, num, &n);
-    if (ret == ENOENT) goto retry;
+        ret = fill_grent(cctx->creq->out, gdom->domain, nctx, true, msgs, num, &n);
+
+        gdom->cur += n;
+
+    } while(ret == ENOENT);
 
-    gdom->cur += n;
     return ret;
 
 none:
-- 
1.6.2.5



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sssd.spec	28 Sep 2009 08:51:24 -0000	1.19
+++ sssd.spec	29 Sep 2009 12:19:20 -0000	1.20
@@ -15,6 +15,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
+Patch1: 0001-Tighten-up-permission.patch
+Patch2: 0002-Fix-infinite-loop-with-empty-group-enumeration.patch
+
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
@@ -74,6 +77,9 @@ service.
 %prep
 %setup -q
 
+%patch1 -p1 -b .tighten_permission
+%patch2 -p1 -b .infinite_group_loop
+
 %build
 %configure \
     --without-tests \



From sgallagh at fedoraproject.org  Tue Sep 29 12:19:20 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 29 Sep 2009 12:19:20 +0000 (UTC)
Subject: rpms/sssd/devel 0001-Tighten-up-permission.patch, NONE,
	1.1 0002-Fix-infinite-loop-with-empty-group-enumeration.patch,
	NONE, 1.1 sssd.spec, 1.19, 1.20
Message-ID: <20090929121920.D37BE11C00C1@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19188/devel

Modified Files:
	sssd.spec 
Added Files:
	0001-Tighten-up-permission.patch 
	0002-Fix-infinite-loop-with-empty-group-enumeration.patch 
Log Message:
Add two patches

1) Ensure that the configuration upgrade script always writes the config
   file with 0600 permissions
2) Eliminate an infinite loop in group enumerations


0001-Tighten-up-permission.patch:
 contrib/sssd.spec.in             |    2 +-
 server/upgrade/upgrade_config.py |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Tighten-up-permission.patch ---
>From 5ab9ed3c42781ae1911d253d56d67dc0288d55f7 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Mon, 28 Sep 2009 07:51:26 -0400
Subject: [PATCH 1/2] Tighten up permission.

SSSD may contain passwords and other sensitive data, make sure we always keep its
permission tight. Also make /etc/sssd permission very strict, just in case,
admins may inadvertently copy an sssd.conf file without checking it's
permissions.
---
 contrib/sssd.spec.in             |    2 +-
 server/upgrade/upgrade_config.py |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 5dc45d2..9513a6b 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{pipepath}
 %attr(700,root,root) %dir %{pipepath}/private
 %attr(750,root,root) %dir %{_var}/log/%{name}
-%dir %{_sysconfdir}/sssd
+%attr(700,root,root) %dir %{_sysconfdir}/sssd
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
 %{_mandir}/man5/sssd.conf.5*
 %{_mandir}/man5/sssd-krb5.5*
diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 412fad5..87e3990 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -20,6 +20,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import sys
 import shutil
 import traceback
@@ -91,6 +92,9 @@ class SSSDConfigFile(object):
         " Copy the file we operate on to a backup location "
         shutil.copy(self.file_name, self.file_name+".bak")
 
+        # make sure we don't leak data, force permissions on the backup
+        os.chmod(self.file_name+".bak", 0600)
+
     def _migrate_if_exists(self, to_section, to_option, from_section, from_option):
         """
         Move value of parameter from one section to another, renaming the parameter
@@ -281,8 +285,12 @@ class SSSDConfigFile(object):
         # Migrate domains
         self._migrate_domains()
 
-        # all done, write the file
+        # all done, open the file for writing
         of = open(out_file_name, "wb")
+
+        # make sure it has the right permissions too
+        os.chmod(out_file_name, 0600)
+
         self._new_config.write(of)
 
 def parse_options():
@@ -337,6 +345,9 @@ def main():
         print >>sys.stderr, "Can only upgrade from v1 to v2, file %s looks like version %d" % (options.filename, config.get_version())
         return 1
 
+    # make sure we keep strict settings when creating new files
+    os.umask(0077)
+
     try:
         config.upgrade_v2(options.outfile, options.backup)
     except Exception, e:
-- 
1.6.2.5


0002-Fix-infinite-loop-with-empty-group-enumeration.patch:
 nsssrv_cmd.c |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

--- NEW FILE 0002-Fix-infinite-loop-with-empty-group-enumeration.patch ---
>From 5cada7fa7f822ac064f3f5d452f7f32fc4595bd4 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 29 Sep 2009 07:34:30 -0400
Subject: [PATCH 2/2] Fix infinite loop with empty group enumeration

Loop control variable was not being incremented.
I also converted a goto loop into a do...while loop to make it
easier to follow the logic.
---
 server/responder/nss/nsssrv_cmd.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/responder/nss/nsssrv_cmd.c b/server/responder/nss/nsssrv_cmd.c
index 8ca0be6..ebfd1d5 100644
--- a/server/responder/nss/nsssrv_cmd.c
+++ b/server/responder/nss/nsssrv_cmd.c
@@ -2645,26 +2645,28 @@ static int nss_cmd_retgrent(struct cli_ctx *cctx, int num)
     nctx = talloc_get_type(cctx->rctx->pvt_ctx, struct nss_ctx);
     gctx = nctx->gctx;
 
-retry:
-    if (gctx->cur >= gctx->num) goto none;
-
-    gdom = &gctx->doms[gctx->cur];
+    do {
+        if (gctx->cur >= gctx->num) goto none;
 
-    n = gdom->res->count - gdom->cur;
-    if (n == 0 && (gctx->cur+1 < gctx->num)) {
-        gctx->cur++;
         gdom = &gctx->doms[gctx->cur];
+
         n = gdom->res->count - gdom->cur;
-    }
+        if (n == 0 && (gctx->cur+1 < gctx->num)) {
+            gctx->cur++;
+            gdom = &gctx->doms[gctx->cur];
+            n = gdom->res->count - gdom->cur;
+        }
 
-    if (!n) goto none;
+        if (!n) goto none;
 
-    msgs = &(gdom->res->msgs[gdom->cur]);
+        msgs = &(gdom->res->msgs[gdom->cur]);
 
-    ret = fill_grent(cctx->creq->out, gdom->domain, nctx, true, msgs, num, &n);
-    if (ret == ENOENT) goto retry;
+        ret = fill_grent(cctx->creq->out, gdom->domain, nctx, true, msgs, num, &n);
+
+        gdom->cur += n;
+
+    } while(ret == ENOENT);
 
-    gdom->cur += n;
     return ret;
 
 none:
-- 
1.6.2.5



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sssd.spec	28 Sep 2009 08:51:24 -0000	1.19
+++ sssd.spec	29 Sep 2009 12:19:20 -0000	1.20
@@ -15,6 +15,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
+Patch1: 0001-Tighten-up-permission.patch
+Patch2: 0002-Fix-infinite-loop-with-empty-group-enumeration.patch
+
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
@@ -74,6 +77,9 @@ service.
 %prep
 %setup -q
 
+%patch1 -p1 -b .tighten_permission
+%patch2 -p1 -b .infinite_group_loop
+
 %build
 %configure \
     --without-tests \



From mclasen at fedoraproject.org  Tue Sep 29 12:24:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 12:24:40 +0000 (UTC)
Subject: rpms/festival/devel festival-speech-tools-pulse.patch, NONE,
	1.1 festival.spec, 1.43, 1.44
Message-ID: <20090929122440.6B1F211C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/festival/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20952

Modified Files:
	festival.spec 
Added Files:
	festival-speech-tools-pulse.patch 
Log Message:
use native pulseaudio backend


festival-speech-tools-pulse.patch:
 lib/init.scm                                |    3 
 speech_tools/audio/Makefile                 |    2 
 speech_tools/audio/audioP.h                 |    2 
 speech_tools/audio/gen_audio.cc             |   12 ++
 speech_tools/audio/pulseaudio.cc            |  134 ++++++++++++++++++++++++++++
 speech_tools/config/config.in               |    3 
 speech_tools/config/modules/Makefile        |    3 
 speech_tools/config/modules/pulse_audio.mak |    9 +
 speech_tools/config/project.mak             |    3 
 speech_tools/config/systems/default.mak     |    6 +
 speech_tools/include/EST_audio.h            |    1 
 11 files changed, 174 insertions(+), 4 deletions(-)

--- NEW FILE festival-speech-tools-pulse.patch ---
diff -up festival/lib/init.scm.pulse festival/lib/init.scm
--- festival/lib/init.scm.pulse	2009-09-29 02:05:53.156687751 -0400
+++ festival/lib/init.scm	2009-09-29 02:14:18.911692694 -0400
@@ -77,6 +77,9 @@
 ;;;  Some default parameters
 (Parameter.def 'Wavefiletype 'riff)
 
+;;; default to pulseaudio
+(Parameter.def 'Audio_Method 'pulseaudio)
+
 ;;; Set default audio method
 (cond
  ((member 'nas *modules*)
diff -up festival/speech_tools/audio/audioP.h.pulse festival/speech_tools/audio/audioP.h
--- festival/speech_tools/audio/audioP.h.pulse	2004-07-15 19:03:04.000000000 -0400
+++ festival/speech_tools/audio/audioP.h	2009-09-29 02:05:53.353695375 -0400
@@ -40,6 +40,7 @@
 #define __AUDIOP_H__
 
 int play_nas_wave(EST_Wave &inwave, EST_Option &al);
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al);
 int play_esd_wave(EST_Wave &inwave, EST_Option &al);
 int play_sun16_wave(EST_Wave &inwave, EST_Option &al);
 int play_voxware_wave(EST_Wave &inwave, EST_Option &al);
@@ -49,6 +50,7 @@ int play_irix_wave(EST_Wave &inwave, EST
 int play_macosx_wave(EST_Wave &inwave, EST_Option &al);
 
 int record_nas_wave(EST_Wave &inwave, EST_Option &al);
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al);
 int record_esd_wave(EST_Wave &inwave, EST_Option &al);
 int record_sun16_wave(EST_Wave &inwave, EST_Option &al);
 int record_voxware_wave(EST_Wave &inwave, EST_Option &al);
diff -up festival/speech_tools/audio/gen_audio.cc.pulse festival/speech_tools/audio/gen_audio.cc
--- festival/speech_tools/audio/gen_audio.cc.pulse	2004-09-30 08:53:35.000000000 -0400
+++ festival/speech_tools/audio/gen_audio.cc	2009-09-29 02:05:53.354687890 -0400
@@ -89,6 +89,8 @@ int play_wave(EST_Wave &inwave, EST_Opti
     {
 	if (nas_supported)
 	    protocol = "netaudio";  // the default protocol
+	else if (pulse_supported)
+	    protocol = "pulseaudio";
 	else if (esd_supported)
 	    protocol = "esdaudio";
 	else if (sun16_supported)
@@ -111,6 +113,8 @@ int play_wave(EST_Wave &inwave, EST_Opti
 
     if (upcase(protocol) == "NETAUDIO")
 	return play_nas_wave(*toplay,al);
+    else if (upcase(protocol) == "PULSEAUDIO")
+	return play_pulse_wave(*toplay,al);
     else if (upcase(protocol) == "ESDAUDIO")
 	return play_esd_wave(*toplay,al);
     else if (upcase(protocol) == "SUNAUDIO")
@@ -246,6 +250,8 @@ EST_String options_supported_audio(void)
 	audios += " netaudio";
     else if (esd_supported)
 	audios += " esdaudio";
+    if (pulse_supported)
+	audios += " pulseaudio";
     if (sun16_supported)
 	audios += " sun16audio";
     if (freebsd16_supported)
@@ -286,8 +292,10 @@ int record_wave(EST_Wave &wave, EST_Opti
     {
 	if (nas_supported)
 	    protocol = "netaudio";  // the default protocol
+	else if (pulse_supported)
+	    protocol = "pulseaudio";
 	else if (esd_supported)
-	    protocol = "esdaudio";  // the default protocol
+	    protocol = "esdaudio";
 	else if (sun16_supported)
 	    protocol = "sun16audio";
 	else if (freebsd16_supported)
@@ -306,6 +314,8 @@ int record_wave(EST_Wave &wave, EST_Opti
 
     if (upcase(protocol) == "NETAUDIO")
 	return record_nas_wave(wave,al);
+    else if (upcase(protocol) == "PULSEAUDIO")
+	return record_pulse_wave(wave,al);
     else if (upcase(protocol) == "ESDAUDIO")
         return record_esd_wave(wave,al);
     else if (upcase(protocol) == "SUN16AUDIO")
diff -up festival/speech_tools/audio/Makefile.pulse festival/speech_tools/audio/Makefile
--- festival/speech_tools/audio/Makefile.pulse	2004-07-15 19:03:04.000000000 -0400
+++ festival/speech_tools/audio/Makefile	2009-09-29 02:05:53.355692417 -0400
@@ -44,7 +44,7 @@ LOCAL_DEFAULT_LIBRARY = estbase
 H = audioP.h
 CPPSRCS = gen_audio.cc nas.cc esd.cc sun16audio.cc voxware.cc  \
           mplayer.cc win32audio.cc irixaudio.cc os2audio.cc \
-          macosxaudio.cc
+          macosxaudio.cc pulseaudio.cc
 
 SRCS = $(CPPSRCS)
 OBJS = $(CPPSRCS:.cc=.o)
diff -up /dev/null festival/speech_tools/audio/pulseaudio.cc
--- /dev/null	2009-09-29 00:23:01.118964058 -0400
+++ festival/speech_tools/audio/pulseaudio.cc	2009-09-29 02:05:53.357688202 -0400
@@ -0,0 +1,134 @@
+/*************************************************************************/
+/*                                                                       */
+/*                Centre for Speech Technology Research                  */
+/*                     University of Edinburgh, UK                       */
+/*                      Copyright (c) 1997,1998                          */
+/*                            Red Hat, Inc.                              */
+/*                         Copyright (c) 2008                            */
+/*                        All Rights Reserved.                           */
+/*                                                                       */
+/*  Permission is hereby granted, free of charge, to use and distribute  */
+/*  this software and its documentation without restriction, including   */
+/*  without limitation the rights to use, copy, modify, merge, publish,  */
+/*  distribute, sublicense, and/or sell copies of this work, and to      */
+/*  permit persons to whom this work is furnished to do so, subject to   */
+/*  the following conditions:                                            */
+/*   1. The code must retain the above copyright notice, this list of    */
+/*      conditions and the following disclaimer.                         */
+/*   2. Any modifications must be clearly marked as such.                */
+/*   3. Original authors' names are not deleted.                         */
+/*   4. The authors' names are not used to endorse or promote products   */
+/*      derived from this software without specific prior written        */
+/*      permission.                                                      */
+/*                                                                       */
+/*  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        */
+/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
+/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
+/*  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     */
+/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
+/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
+/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
+/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
+/*  THIS SOFTWARE.                                                       */
+/*                                                                       */
+/*************************************************************************/
+/*                Author :  Michal Schmidt                               */
+/*                Date   :  November 2008                                */
+/*-----------------------------------------------------------------------*/
+/*  Optional support for PulseAudio                                      */
+/*=======================================================================*/
+
+#include "EST_Wave.h"
+#include "EST_Option.h"
+#include "audioP.h"
+
+#ifdef SUPPORT_PULSE
+
+#include <pulse/simple.h>
+#include <pulse/error.h>
+
+int pulse_supported = TRUE;
+const static char *err_prefix = "Pulseaudio: ";
+
+static int transfer_pulse_wave(EST_Wave &inwave, EST_Option &al, int record)
+{
+    short *waveform;
+    int num_samples;
+    int err, pa_ret;
+    int ret = -1;
+    pa_simple *s = NULL;
+    pa_sample_spec ss;
+
+    ss.format   = PA_SAMPLE_S16NE;
+    ss.channels = 1;
+    ss.rate     = inwave.sample_rate();
+
+    waveform    = inwave.values().memory();
+    num_samples = inwave.num_samples();
+
+    s = pa_simple_new(NULL,           // Use the default server.
+	"Festival",                   // Our application's name.
+	record ? PA_STREAM_RECORD : PA_STREAM_PLAYBACK,
+	NULL,                         // Use the default device.
+	record ? "Record" : "Speech", // Description of our stream.
+	&ss,                // Our sample format.
+	NULL,               // Use default channel map
+	NULL,               // Use default buffering attributes.
+	&err);
+
+    if (!s) {
+	cerr << err_prefix << pa_strerror(err) << endl;
+	goto finish;
+    }
+
+    pa_ret = record ?
+	pa_simple_read (s, waveform, num_samples*sizeof(short), &err) :
+	pa_simple_write(s, waveform, num_samples*sizeof(short), &err);
+
+    if (pa_ret < 0) {
+	cerr << err_prefix << pa_strerror(err) << endl;
+	goto finish;
+    }
+
+    if (!record && pa_simple_drain(s, &err) < 0) {
+	cerr << err_prefix << pa_strerror(err) << endl;
+	goto finish;
+    }
+
+    ret = 1;
+finish:
+    if (s)
+	pa_simple_free(s);
+    return ret;
+}
+
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+	return transfer_pulse_wave(inwave, al, 0);
+}
+
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+	return transfer_pulse_wave(inwave, al, 1);
+}
+
+#else
+int pulse_supported = FALSE;
+
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+    (void)inwave;
+    (void)al;
+    cerr << "Audio: pulse not compiled in this version" << endl;
+    return -1;
+}
+
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+    (void)inwave;
+    (void)al;
+    cerr << "Audio: pulse not compiled in this version" << endl;
+    return -1;
+}
+
+#endif
diff -up festival/speech_tools/config/config.in.pulse festival/speech_tools/config/config.in
--- festival/speech_tools/config/config.in.pulse	2009-09-29 02:05:53.045693311 -0400
+++ festival/speech_tools/config/config.in	2009-09-29 02:05:53.358687421 -0400
@@ -79,6 +79,9 @@ OPTIMISE_sigpr = 3
 ## NCD's network audio system, This is recommended.
 # INCLUDE_MODULES += NAS_AUDIO
 
+## PulseAudio sound server
+INCLUDE_MODULES += PULSE_AUDIO
+
 ## Elightenment Sound Demon, for KDE etc.
 # INCLUDE_MODULES += ESD_AUDIO
 
diff -up festival/speech_tools/config/modules/Makefile.pulse festival/speech_tools/config/modules/Makefile
--- festival/speech_tools/config/modules/Makefile.pulse	2004-07-15 19:03:05.000000000 -0400
+++ festival/speech_tools/config/modules/Makefile	2009-09-29 02:05:53.359687618 -0400
@@ -41,7 +41,8 @@ RULESETS = efence.mak dmalloc.mak debugg
 	psola_tm.mak editline.mak tcl.mak \
 	freebsd16_audio.mak irix_audio.mak linux16_audio.mak \
 	sun16_audio.mak win32_audio.mak macosx_audio.mak \
-	mplayer_audio.mak nas_audio.mak esd_audio.mak
+	mplayer_audio.mak nas_audio.mak esd_audio.mak \
+	pulse_audio.mak
 
 FILES = Makefile descriptions $(RULESETS) 
 
diff -up /dev/null festival/speech_tools/config/modules/pulse_audio.mak
--- /dev/null	2009-09-29 00:23:01.118964058 -0400
+++ festival/speech_tools/config/modules/pulse_audio.mak	2009-09-29 02:05:53.361688082 -0400
@@ -0,0 +1,9 @@
+## Definitions for PulseAudio
+
+INCLUDE_PULSE_AUDIO=1
+
+MOD_DESC_PULSE_AUDIO=PulseAudio support
+
+AUDIO_DEFINES += -DSUPPORT_PULSE
+AUDIO_INCLUDES += -I$(PULSE_INCLUDE)
+MODULE_LIBS += -lpulse-simple
diff -up festival/speech_tools/config/project.mak.pulse festival/speech_tools/config/project.mak
--- festival/speech_tools/config/project.mak.pulse	2009-09-29 02:05:53.104720729 -0400
+++ festival/speech_tools/config/project.mak	2009-09-29 02:05:53.362687372 -0400
@@ -60,7 +60,7 @@ MODULE_DIRECTORY = $(TOP)
 # List of all known modules
 
 DISTRIBUTED_MODULES = \
-	NAS_AUDIO ESD_AUDIO NATIVE_AUDIO MPLAYER_AUDIO \
+	NAS_AUDIO PULSE_AUDIO ESD_AUDIO NATIVE_AUDIO MPLAYER_AUDIO \
 	EDITLINE \
 	SIOD WAGON SCFG WFST OLS \
 	JAVA JAVA_CPP JAVA_MEDIA \
@@ -109,6 +109,7 @@ PROJECT_LIBRARY_VERSION_estbase = $(PROJ
 PROJECT_LIBRARY_VERSION_eststring = 1.2
 PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1
 
+PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1
 PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1
 
 PROJECT_DEFAULT_LIBRARY = estools
diff -up festival/speech_tools/config/systems/default.mak.pulse festival/speech_tools/config/systems/default.mak
--- festival/speech_tools/config/systems/default.mak.pulse	2005-07-17 09:06:49.000000000 -0400
+++ festival/speech_tools/config/systems/default.mak	2009-09-29 02:05:53.364688115 -0400
@@ -61,6 +61,12 @@ NAS_INCLUDE = /usr/X11R6/include
 NAS_LIB = /usr/X11R6/lib
 
 ###########################################################################
+## Where to find PulseAudio
+
+PULSE_INCLUDE = /usr/include
+PULSE_LIB = /usr/lib
+
+###########################################################################
 ## Where to find Enlightenment Speech Demon
 
 ESD_INCLUDE = /usr/local/include
diff -up festival/speech_tools/include/EST_audio.h.pulse festival/speech_tools/include/EST_audio.h
--- festival/speech_tools/include/EST_audio.h.pulse	2004-07-15 19:03:05.000000000 -0400
+++ festival/speech_tools/include/EST_audio.h	2009-09-29 02:05:53.365689290 -0400
@@ -43,6 +43,7 @@
 #include "EST_Option.h"
 
 extern int nas_supported;
+extern int pulse_supported;
 extern int esd_supported;
 extern int sun16_supported;
 extern int freebsd16_supported;


Index: festival.spec
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/festival.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- festival.spec	12 Sep 2009 22:01:10 -0000	1.43
+++ festival.spec	29 Sep 2009 12:24:40 -0000	1.44
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -131,8 +131,8 @@ Patch92: festival-1.96-nitech-sltreferen
 
 Patch93: gcc43.patch
 
-# Work with pulseaudio (bug 467531)
-Patch94: festival-use-pacat.patch
+# Native pulseaudio support, https://bugzilla.redhat.com/show_bug.cgi?id=471047
+Patch94: festival-speech-tools-pulse.patch
 
 Patch95: gcc44.patch
 
@@ -514,7 +514,7 @@ done
 %patch91 -p1
 %patch92 -p1
 %patch93 -p1 -b .gcc43
-%patch94 -p1 -b .use-pacat
+%patch94 -p1 -b .pulse
 %patch95 -p1 -b .gcc44
 
 # zero length
@@ -875,6 +875,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.96-16
+- Add native pulseaudio support (#471047)
+
 * Thu Sep 10 2009 Bernie Innocenti <bernie at codewiz.org> - 1.96-15
 - Disable esd support (resolves: rhbz#492982)
 



From mclasen at fedoraproject.org  Tue Sep 29 12:25:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 12:25:03 +0000 (UTC)
Subject: rpms/festival/F-12 festival-speech-tools-pulse.patch, NONE,
	1.1 festival.spec, 1.43, 1.44
Message-ID: <20090929122503.E226111C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/festival/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21100

Modified Files:
	festival.spec 
Added Files:
	festival-speech-tools-pulse.patch 
Log Message:
native pulseaudio backend


festival-speech-tools-pulse.patch:
 lib/init.scm                                |    3 
 speech_tools/audio/Makefile                 |    2 
 speech_tools/audio/audioP.h                 |    2 
 speech_tools/audio/gen_audio.cc             |   12 ++
 speech_tools/audio/pulseaudio.cc            |  134 ++++++++++++++++++++++++++++
 speech_tools/config/config.in               |    3 
 speech_tools/config/modules/Makefile        |    3 
 speech_tools/config/modules/pulse_audio.mak |    9 +
 speech_tools/config/project.mak             |    3 
 speech_tools/config/systems/default.mak     |    6 +
 speech_tools/include/EST_audio.h            |    1 
 11 files changed, 174 insertions(+), 4 deletions(-)

--- NEW FILE festival-speech-tools-pulse.patch ---
diff -up festival/lib/init.scm.pulse festival/lib/init.scm
--- festival/lib/init.scm.pulse	2009-09-29 02:05:53.156687751 -0400
+++ festival/lib/init.scm	2009-09-29 02:14:18.911692694 -0400
@@ -77,6 +77,9 @@
 ;;;  Some default parameters
 (Parameter.def 'Wavefiletype 'riff)
 
+;;; default to pulseaudio
+(Parameter.def 'Audio_Method 'pulseaudio)
+
 ;;; Set default audio method
 (cond
  ((member 'nas *modules*)
diff -up festival/speech_tools/audio/audioP.h.pulse festival/speech_tools/audio/audioP.h
--- festival/speech_tools/audio/audioP.h.pulse	2004-07-15 19:03:04.000000000 -0400
+++ festival/speech_tools/audio/audioP.h	2009-09-29 02:05:53.353695375 -0400
@@ -40,6 +40,7 @@
 #define __AUDIOP_H__
 
 int play_nas_wave(EST_Wave &inwave, EST_Option &al);
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al);
 int play_esd_wave(EST_Wave &inwave, EST_Option &al);
 int play_sun16_wave(EST_Wave &inwave, EST_Option &al);
 int play_voxware_wave(EST_Wave &inwave, EST_Option &al);
@@ -49,6 +50,7 @@ int play_irix_wave(EST_Wave &inwave, EST
 int play_macosx_wave(EST_Wave &inwave, EST_Option &al);
 
 int record_nas_wave(EST_Wave &inwave, EST_Option &al);
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al);
 int record_esd_wave(EST_Wave &inwave, EST_Option &al);
 int record_sun16_wave(EST_Wave &inwave, EST_Option &al);
 int record_voxware_wave(EST_Wave &inwave, EST_Option &al);
diff -up festival/speech_tools/audio/gen_audio.cc.pulse festival/speech_tools/audio/gen_audio.cc
--- festival/speech_tools/audio/gen_audio.cc.pulse	2004-09-30 08:53:35.000000000 -0400
+++ festival/speech_tools/audio/gen_audio.cc	2009-09-29 02:05:53.354687890 -0400
@@ -89,6 +89,8 @@ int play_wave(EST_Wave &inwave, EST_Opti
     {
 	if (nas_supported)
 	    protocol = "netaudio";  // the default protocol
+	else if (pulse_supported)
+	    protocol = "pulseaudio";
 	else if (esd_supported)
 	    protocol = "esdaudio";
 	else if (sun16_supported)
@@ -111,6 +113,8 @@ int play_wave(EST_Wave &inwave, EST_Opti
 
     if (upcase(protocol) == "NETAUDIO")
 	return play_nas_wave(*toplay,al);
+    else if (upcase(protocol) == "PULSEAUDIO")
+	return play_pulse_wave(*toplay,al);
     else if (upcase(protocol) == "ESDAUDIO")
 	return play_esd_wave(*toplay,al);
     else if (upcase(protocol) == "SUNAUDIO")
@@ -246,6 +250,8 @@ EST_String options_supported_audio(void)
 	audios += " netaudio";
     else if (esd_supported)
 	audios += " esdaudio";
+    if (pulse_supported)
+	audios += " pulseaudio";
     if (sun16_supported)
 	audios += " sun16audio";
     if (freebsd16_supported)
@@ -286,8 +292,10 @@ int record_wave(EST_Wave &wave, EST_Opti
     {
 	if (nas_supported)
 	    protocol = "netaudio";  // the default protocol
+	else if (pulse_supported)
+	    protocol = "pulseaudio";
 	else if (esd_supported)
-	    protocol = "esdaudio";  // the default protocol
+	    protocol = "esdaudio";
 	else if (sun16_supported)
 	    protocol = "sun16audio";
 	else if (freebsd16_supported)
@@ -306,6 +314,8 @@ int record_wave(EST_Wave &wave, EST_Opti
 
     if (upcase(protocol) == "NETAUDIO")
 	return record_nas_wave(wave,al);
+    else if (upcase(protocol) == "PULSEAUDIO")
+	return record_pulse_wave(wave,al);
     else if (upcase(protocol) == "ESDAUDIO")
         return record_esd_wave(wave,al);
     else if (upcase(protocol) == "SUN16AUDIO")
diff -up festival/speech_tools/audio/Makefile.pulse festival/speech_tools/audio/Makefile
--- festival/speech_tools/audio/Makefile.pulse	2004-07-15 19:03:04.000000000 -0400
+++ festival/speech_tools/audio/Makefile	2009-09-29 02:05:53.355692417 -0400
@@ -44,7 +44,7 @@ LOCAL_DEFAULT_LIBRARY = estbase
 H = audioP.h
 CPPSRCS = gen_audio.cc nas.cc esd.cc sun16audio.cc voxware.cc  \
           mplayer.cc win32audio.cc irixaudio.cc os2audio.cc \
-          macosxaudio.cc
+          macosxaudio.cc pulseaudio.cc
 
 SRCS = $(CPPSRCS)
 OBJS = $(CPPSRCS:.cc=.o)
diff -up /dev/null festival/speech_tools/audio/pulseaudio.cc
--- /dev/null	2009-09-29 00:23:01.118964058 -0400
+++ festival/speech_tools/audio/pulseaudio.cc	2009-09-29 02:05:53.357688202 -0400
@@ -0,0 +1,134 @@
+/*************************************************************************/
+/*                                                                       */
+/*                Centre for Speech Technology Research                  */
+/*                     University of Edinburgh, UK                       */
+/*                      Copyright (c) 1997,1998                          */
+/*                            Red Hat, Inc.                              */
+/*                         Copyright (c) 2008                            */
+/*                        All Rights Reserved.                           */
+/*                                                                       */
+/*  Permission is hereby granted, free of charge, to use and distribute  */
+/*  this software and its documentation without restriction, including   */
+/*  without limitation the rights to use, copy, modify, merge, publish,  */
+/*  distribute, sublicense, and/or sell copies of this work, and to      */
+/*  permit persons to whom this work is furnished to do so, subject to   */
+/*  the following conditions:                                            */
+/*   1. The code must retain the above copyright notice, this list of    */
+/*      conditions and the following disclaimer.                         */
+/*   2. Any modifications must be clearly marked as such.                */
+/*   3. Original authors' names are not deleted.                         */
+/*   4. The authors' names are not used to endorse or promote products   */
+/*      derived from this software without specific prior written        */
+/*      permission.                                                      */
+/*                                                                       */
+/*  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        */
+/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
+/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
+/*  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     */
+/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
+/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
+/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
+/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
+/*  THIS SOFTWARE.                                                       */
+/*                                                                       */
+/*************************************************************************/
+/*                Author :  Michal Schmidt                               */
+/*                Date   :  November 2008                                */
+/*-----------------------------------------------------------------------*/
+/*  Optional support for PulseAudio                                      */
+/*=======================================================================*/
+
+#include "EST_Wave.h"
+#include "EST_Option.h"
+#include "audioP.h"
+
+#ifdef SUPPORT_PULSE
+
+#include <pulse/simple.h>
+#include <pulse/error.h>
+
+int pulse_supported = TRUE;
+const static char *err_prefix = "Pulseaudio: ";
+
+static int transfer_pulse_wave(EST_Wave &inwave, EST_Option &al, int record)
+{
+    short *waveform;
+    int num_samples;
+    int err, pa_ret;
+    int ret = -1;
+    pa_simple *s = NULL;
+    pa_sample_spec ss;
+
+    ss.format   = PA_SAMPLE_S16NE;
+    ss.channels = 1;
+    ss.rate     = inwave.sample_rate();
+
+    waveform    = inwave.values().memory();
+    num_samples = inwave.num_samples();
+
+    s = pa_simple_new(NULL,           // Use the default server.
+	"Festival",                   // Our application's name.
+	record ? PA_STREAM_RECORD : PA_STREAM_PLAYBACK,
+	NULL,                         // Use the default device.
+	record ? "Record" : "Speech", // Description of our stream.
+	&ss,                // Our sample format.
+	NULL,               // Use default channel map
+	NULL,               // Use default buffering attributes.
+	&err);
+
+    if (!s) {
+	cerr << err_prefix << pa_strerror(err) << endl;
+	goto finish;
+    }
+
+    pa_ret = record ?
+	pa_simple_read (s, waveform, num_samples*sizeof(short), &err) :
+	pa_simple_write(s, waveform, num_samples*sizeof(short), &err);
+
+    if (pa_ret < 0) {
+	cerr << err_prefix << pa_strerror(err) << endl;
+	goto finish;
+    }
+
+    if (!record && pa_simple_drain(s, &err) < 0) {
+	cerr << err_prefix << pa_strerror(err) << endl;
+	goto finish;
+    }
+
+    ret = 1;
+finish:
+    if (s)
+	pa_simple_free(s);
+    return ret;
+}
+
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+	return transfer_pulse_wave(inwave, al, 0);
+}
+
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+	return transfer_pulse_wave(inwave, al, 1);
+}
+
+#else
+int pulse_supported = FALSE;
+
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+    (void)inwave;
+    (void)al;
+    cerr << "Audio: pulse not compiled in this version" << endl;
+    return -1;
+}
+
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al)
+{
+    (void)inwave;
+    (void)al;
+    cerr << "Audio: pulse not compiled in this version" << endl;
+    return -1;
+}
+
+#endif
diff -up festival/speech_tools/config/config.in.pulse festival/speech_tools/config/config.in
--- festival/speech_tools/config/config.in.pulse	2009-09-29 02:05:53.045693311 -0400
+++ festival/speech_tools/config/config.in	2009-09-29 02:05:53.358687421 -0400
@@ -79,6 +79,9 @@ OPTIMISE_sigpr = 3
 ## NCD's network audio system, This is recommended.
 # INCLUDE_MODULES += NAS_AUDIO
 
+## PulseAudio sound server
+INCLUDE_MODULES += PULSE_AUDIO
+
 ## Elightenment Sound Demon, for KDE etc.
 # INCLUDE_MODULES += ESD_AUDIO
 
diff -up festival/speech_tools/config/modules/Makefile.pulse festival/speech_tools/config/modules/Makefile
--- festival/speech_tools/config/modules/Makefile.pulse	2004-07-15 19:03:05.000000000 -0400
+++ festival/speech_tools/config/modules/Makefile	2009-09-29 02:05:53.359687618 -0400
@@ -41,7 +41,8 @@ RULESETS = efence.mak dmalloc.mak debugg
 	psola_tm.mak editline.mak tcl.mak \
 	freebsd16_audio.mak irix_audio.mak linux16_audio.mak \
 	sun16_audio.mak win32_audio.mak macosx_audio.mak \
-	mplayer_audio.mak nas_audio.mak esd_audio.mak
+	mplayer_audio.mak nas_audio.mak esd_audio.mak \
+	pulse_audio.mak
 
 FILES = Makefile descriptions $(RULESETS) 
 
diff -up /dev/null festival/speech_tools/config/modules/pulse_audio.mak
--- /dev/null	2009-09-29 00:23:01.118964058 -0400
+++ festival/speech_tools/config/modules/pulse_audio.mak	2009-09-29 02:05:53.361688082 -0400
@@ -0,0 +1,9 @@
+## Definitions for PulseAudio
+
+INCLUDE_PULSE_AUDIO=1
+
+MOD_DESC_PULSE_AUDIO=PulseAudio support
+
+AUDIO_DEFINES += -DSUPPORT_PULSE
+AUDIO_INCLUDES += -I$(PULSE_INCLUDE)
+MODULE_LIBS += -lpulse-simple
diff -up festival/speech_tools/config/project.mak.pulse festival/speech_tools/config/project.mak
--- festival/speech_tools/config/project.mak.pulse	2009-09-29 02:05:53.104720729 -0400
+++ festival/speech_tools/config/project.mak	2009-09-29 02:05:53.362687372 -0400
@@ -60,7 +60,7 @@ MODULE_DIRECTORY = $(TOP)
 # List of all known modules
 
 DISTRIBUTED_MODULES = \
-	NAS_AUDIO ESD_AUDIO NATIVE_AUDIO MPLAYER_AUDIO \
+	NAS_AUDIO PULSE_AUDIO ESD_AUDIO NATIVE_AUDIO MPLAYER_AUDIO \
 	EDITLINE \
 	SIOD WAGON SCFG WFST OLS \
 	JAVA JAVA_CPP JAVA_MEDIA \
@@ -109,6 +109,7 @@ PROJECT_LIBRARY_VERSION_estbase = $(PROJ
 PROJECT_LIBRARY_VERSION_eststring = 1.2
 PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1
 
+PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1
 PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1
 
 PROJECT_DEFAULT_LIBRARY = estools
diff -up festival/speech_tools/config/systems/default.mak.pulse festival/speech_tools/config/systems/default.mak
--- festival/speech_tools/config/systems/default.mak.pulse	2005-07-17 09:06:49.000000000 -0400
+++ festival/speech_tools/config/systems/default.mak	2009-09-29 02:05:53.364688115 -0400
@@ -61,6 +61,12 @@ NAS_INCLUDE = /usr/X11R6/include
 NAS_LIB = /usr/X11R6/lib
 
 ###########################################################################
+## Where to find PulseAudio
+
+PULSE_INCLUDE = /usr/include
+PULSE_LIB = /usr/lib
+
+###########################################################################
 ## Where to find Enlightenment Speech Demon
 
 ESD_INCLUDE = /usr/local/include
diff -up festival/speech_tools/include/EST_audio.h.pulse festival/speech_tools/include/EST_audio.h
--- festival/speech_tools/include/EST_audio.h.pulse	2004-07-15 19:03:05.000000000 -0400
+++ festival/speech_tools/include/EST_audio.h	2009-09-29 02:05:53.365689290 -0400
@@ -43,6 +43,7 @@
 #include "EST_Option.h"
 
 extern int nas_supported;
+extern int pulse_supported;
 extern int esd_supported;
 extern int sun16_supported;
 extern int freebsd16_supported;


Index: festival.spec
===================================================================
RCS file: /cvs/pkgs/rpms/festival/F-12/festival.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- festival.spec	12 Sep 2009 22:01:10 -0000	1.43
+++ festival.spec	29 Sep 2009 12:25:03 -0000	1.44
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -131,8 +131,8 @@ Patch92: festival-1.96-nitech-sltreferen
 
 Patch93: gcc43.patch
 
-# Work with pulseaudio (bug 467531)
-Patch94: festival-use-pacat.patch
+# Native pulseaudio support, https://bugzilla.redhat.com/show_bug.cgi?id=471047
+Patch94: festival-speech-tools-pulse.patch
 
 Patch95: gcc44.patch
 
@@ -514,7 +514,7 @@ done
 %patch91 -p1
 %patch92 -p1
 %patch93 -p1 -b .gcc43
-%patch94 -p1 -b .use-pacat
+%patch94 -p1 -b .pulse
 %patch95 -p1 -b .gcc44
 
 # zero length
@@ -875,6 +875,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.96-16
+- Add native pulseaudio support (#471047)
+
 * Thu Sep 10 2009 Bernie Innocenti <bernie at codewiz.org> - 1.96-15
 - Disable esd support (resolves: rhbz#492982)
 



From twaugh at fedoraproject.org  Tue Sep 29 12:26:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 12:26:27 +0000 (UTC)
Subject: rpms/desktop-printing/devel dead.package, NONE, 1.1 Makefile, 1.2, 
	NONE desktop-printing-0.19-crash.patch, 1.1,
	NONE desktop-printing-0.19-dbus-api.patch, 1.2,
	NONE desktop-printing-0.19-dbus-deprecated.patch, 1.1,
	NONE desktop-printing-0.19-hal_lpadmin.patch, 1.1,
	NONE desktop-printing-0.19-more-hal-lpadmin.patch, 1.1,
	NONE desktop-printing-0.19-transparent.patch, 1.1,
	NONE desktop-printing-0.20-category.patch, 1.1,
	NONE desktop-printing-0.20-dbus-close.patch, 1.1,
	NONE desktop-printing.spec, 1.89, NONE eggcups-api-name.patch,
	1.2, NONE eggcups-cancel-remote-job.patch, 1.1,
	NONE eggcups-cups12.patch, 1.1,
	NONE eggcups-dbus-send-null-crash.patch, 1.1,
	NONE eggcups-xml-parsing.patch, 1.1,
	NONE redhat-print-applet.desktop, 1.3, NONE sources, 1.24, NONE
Message-ID: <20090929122627.E44C211C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/desktop-printing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21594

Added Files:
	dead.package 
Removed Files:
	Makefile desktop-printing-0.19-crash.patch 
	desktop-printing-0.19-dbus-api.patch 
	desktop-printing-0.19-dbus-deprecated.patch 
	desktop-printing-0.19-hal_lpadmin.patch 
	desktop-printing-0.19-more-hal-lpadmin.patch 
	desktop-printing-0.19-transparent.patch 
	desktop-printing-0.20-category.patch 
	desktop-printing-0.20-dbus-close.patch desktop-printing.spec 
	eggcups-api-name.patch eggcups-cancel-remote-job.patch 
	eggcups-cups12.patch eggcups-dbus-send-null-crash.patch 
	eggcups-xml-parsing.patch redhat-print-applet.desktop sources 
Log Message:
Dead package.


--- NEW FILE dead.package ---
system-config-printer provides this functionality.


--- Makefile DELETED ---


--- desktop-printing-0.19-crash.patch DELETED ---


--- desktop-printing-0.19-dbus-api.patch DELETED ---


--- desktop-printing-0.19-dbus-deprecated.patch DELETED ---


--- desktop-printing-0.19-hal_lpadmin.patch DELETED ---


--- desktop-printing-0.19-more-hal-lpadmin.patch DELETED ---


--- desktop-printing-0.19-transparent.patch DELETED ---


--- desktop-printing-0.20-category.patch DELETED ---


--- desktop-printing-0.20-dbus-close.patch DELETED ---


--- desktop-printing.spec DELETED ---


--- eggcups-api-name.patch DELETED ---


--- eggcups-cancel-remote-job.patch DELETED ---


--- eggcups-cups12.patch DELETED ---


--- eggcups-dbus-send-null-crash.patch DELETED ---


--- eggcups-xml-parsing.patch DELETED ---


--- redhat-print-applet.desktop DELETED ---


--- sources DELETED ---



From mlichvar at fedoraproject.org  Tue Sep 29 12:26:31 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 29 Sep 2009 12:26:31 +0000 (UTC)
Subject: rpms/ntp/devel ntp-4.2.4p7-getprecision.patch, NONE,
	1.1 ntp-4.2.4-html2man.patch, 1.3, 1.4 ntp-4.2.4p5-htmldoc.patch,
	1.1, 1.2 ntp.spec, 1.94, 1.95
Message-ID: <20090929122631.C204011C00C1@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21583

Modified Files:
	ntp-4.2.4-html2man.patch ntp-4.2.4p5-htmldoc.patch ntp.spec 
Added Files:
	ntp-4.2.4p7-getprecision.patch 
Log Message:
- generate tickadj man page (#526161)
- fix precision calculation on fast CPUs


ntp-4.2.4p7-getprecision.patch:
 ntp_proto.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ntp-4.2.4p7-getprecision.patch ---
diff -up ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision ntp-4.2.4p7/ntpd/ntp_proto.c
--- ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision	2009-09-29 14:16:22.000000000 +0200
+++ ntp-4.2.4p7/ntpd/ntp_proto.c	2009-09-29 14:18:13.000000000 +0200
@@ -3099,7 +3099,7 @@ peer_unfit(
 /*
  * Find the precision of this particular machine
  */
-#define MINSTEP 100e-9		/* minimum clock increment (s) */
+#define MINSTEP 10e-9		/* minimum clock increment (s) */
 #define MAXSTEP 20e-3		/* maximum clock increment (s) */
 #define MINLOOPS 5		/* minimum number of step samples */
 

ntp-4.2.4-html2man.patch:
 html2man.in |  102 +++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 67 insertions(+), 35 deletions(-)

Index: ntp-4.2.4-html2man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4-html2man.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ntp-4.2.4-html2man.patch	29 Jan 2007 13:33:45 -0000	1.3
+++ ntp-4.2.4-html2man.patch	29 Sep 2009 12:26:31 -0000	1.4
@@ -1,6 +1,6 @@
 --- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
 +++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,10 @@
+@@ -23,10 +23,11 @@
  	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
  	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
  	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
@@ -9,6 +9,7 @@
  	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
  	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
 -	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
++	     'tickadj' => ['tickadj', 8, 'ntpd(8)'],
 +	     'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
  	     'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
  	     'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],

ntp-4.2.4p5-htmldoc.patch:
 ntp-4.2.4p5/html/authopt.html  |    4 ++--
 ntp-4.2.4p5/html/confopt.html  |    4 ++--
 ntp-4.2.4p5/html/keygen.html   |   10 ++++++----
 ntp-4.2.4p5/html/monopt.html   |   16 ++++------------
 ntp-4.2.4p5/html/ntpd.html     |   24 +++++++++++++++++-------
 ntp-4.2.4p5/html/ntpdate.html  |   16 ++++++++--------
 ntp-4.2.4p5/html/ntpdc.html    |   20 +++++++++++---------
 ntp-4.2.4p5/html/ntpq.html     |   12 ++++++------
 ntp-4.2.4p5/html/ntptrace.html |   10 +---------
 ntp-4.2.4p7/html/tickadj.html  |    6 ++++--
 10 files changed, 61 insertions(+), 61 deletions(-)

Index: ntp-4.2.4p5-htmldoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4p5-htmldoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntp-4.2.4p5-htmldoc.patch	29 Aug 2008 08:26:04 -0000	1.1
+++ ntp-4.2.4p5-htmldoc.patch	29 Sep 2009 12:26:31 -0000	1.2
@@ -397,3 +397,26 @@ diff -up ntp-4.2.4p5/html/ntptrace.html.
  		</dl>
  		<h4>Bugs</h4>
  		<p>This program makes no attempt to improve accuracy by doing multiple samples.</p>
+diff -up ntp-4.2.4p7/html/tickadj.html.htmldoc ntp-4.2.4p7/html/tickadj.html
+--- ntp-4.2.4p7/html/tickadj.html.htmldoc	2006-06-06 22:16:08.000000000 +0200
++++ ntp-4.2.4p7/html/tickadj.html	2009-09-29 14:01:40.000000000 +0200
+@@ -14,9 +14,11 @@
+ 		<p>Last update: <csobj format="ShortTime" h="25" locale="00000409" region="0" t="DateTime" w="61">18:50</csobj> UTC <csobj format="LongDate" h="25" locale="00000409" region="0" t="DateTime" w="246">Thursday, July 28, 2005</csobj></p>
+ 		<hr>
+ 		<h4>Synopsis</h4>
+-		<tt>tickadj [ -Aqs ] [ -a <i>tickadj</i> ] [ -t <i>tick</i> ]</tt>
++		<p><tt>tickadj [ <i>tick</i> ]</tt></p>
++		<p><tt>tickadj [ -Aqs ] [ -a <i>tickadj</i> ] [ -t <i>tick</i> ]</tt></p>
+ 		<h4>Description</h4>
+ 		<p>The <tt>tickadj</tt> program reads, and optionally modifies, several timekeeping-related variables in older kernels that do not have support for precision ttimekeeping, including HP-UX, SunOS, Ultrix, SGI and probably others. Those machines provide means to patch the kernel <tt>/dev/kmem</tt>. Newer machines with precision time support, including Solaris, Tru64, FreeBSD and Linux (with PPSkit patch) should NOT use the program. The particular variables that can be changed with <tt>tickadj</tt> include <tt>tick</tt>, which is the number of microseconds added to the system time for a clock interrupt, <tt>tickadj</tt>, which sets the slew rate and resolution used by the <tt>adjtime</tt> system call, and <tt>dosynctodr</tt>, which indicates to the kernels on some machines whether they should internally adjust the system clock to keep it in line with time-of-day clock or not.</p>
++		<p>On Linux, only the <tt>tick</tt> variable is supported and the only allowed argument is the tick value.</p>
+ 		<p>By default, with no arguments, <tt>tickadj</tt> reads the variables of interest in the kernel and displays them. At the same time, it determines an &quot;optimal&quot; value for the value of the <tt>tickadj</tt> variable if the intent is to run the <tt>ntpd</tt> Network Time Protocol (NTP) daemon, and prints this as well. Since the operation of <tt>tickadj</tt> when reading the kernel mimics the operation of similar parts of the <tt>ntpd</tt> program fairly closely, this can be useful when debugging problems with <tt>ntpd</tt>.</p>
+ 		<p>Note that <tt>tickadj</tt> should be run with some caution when being used for the first time on different types of machines. The operations which <tt>tickadj</tt> tries to perform are not guaranteed to work on all Unix machines and may in rare cases cause the kernel to crash.</p>
+ 		<h4>Command Line Options</h4>
+@@ -46,4 +48,4 @@
+ 		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
+ 	</body>
+ 
+-</html>
+\ No newline at end of file
++</html>


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ntp.spec	21 Aug 2009 14:45:39 -0000	1.94
+++ ntp.spec	29 Sep 2009 12:26:31 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 5%{?dist}
+Release: 6%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -104,6 +104,8 @@ Patch30: ntp-4.2.4p7-freqmode.patch
 Patch31: ntpstat-0.2-clksrc.patch
 # process first packet in multipacket response
 Patch32: ntpstat-0.2-multipacket.patch
+# fix precision calculation on fast CPUs
+Patch33: ntp-4.2.4p7-getprecision.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -192,6 +194,7 @@ This package contains NTP documentation 
 %patch30 -p1 -b .freqmode
 %patch31 -p1 -b .clksrc
 %patch32 -p1 -b .multipacket
+%patch33 -p1 -b .getprecision
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -343,6 +346,7 @@ fi
 %{_mandir}/man8/ntpq.8*
 %{_mandir}/man8/ntpstat.8*
 %{_mandir}/man8/ntptime.8*
+%{_mandir}/man8/tickadj.8*
 
 %files perl
 %defattr(-,root,root)
@@ -365,6 +369,10 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-6
+- generate tickadj man page (#526161)
+- fix precision calculation on fast CPUs
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.2.4p7-5
 - rebuilt with new openssl
 



From gerd at fedoraproject.org  Tue Sep 29 12:30:02 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 29 Sep 2009 12:30:02 +0000 (UTC)
Subject: rpms/parrot/F-12 parrot.spec,1.2,1.3
Message-ID: <20090929123002.BB8F911C0492@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21991

Modified Files:
	parrot.spec 
Log Message:
build without jitcapable; necessary for rakudo-rpm on ix86 at the moment


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/parrot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parrot.spec	15 Sep 2009 18:17:12 -0000	1.2
+++ parrot.spec	29 Sep 2009 12:30:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -128,7 +128,8 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex
+    --lex=%{_bindir}/flex \
+    --jitcapable=0     # necessary for rakudo-rpm on ix86
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
@@ -283,9 +284,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 15 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-1
-- new upstream version
+* Tue Sep 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-2
 - build only without the option '-O2' on ppc64
+- build without jitcapable; necessary for rakudo-rpm on ix86 at the moment
 
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl



From pvrabec at fedoraproject.org  Tue Sep 29 12:31:51 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue, 29 Sep 2009 12:31:51 +0000 (UTC)
Subject: rpms/openscap/F-12 .cvsignore, 1.6, 1.7 openscap.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090929123151.2F6A011C00C1@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/openscap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22328

Modified Files:
	.cvsignore openscap.spec sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Aug 2009 15:40:55 -0000	1.6
+++ .cvsignore	29 Sep 2009 12:31:50 -0000	1.7
@@ -1 +1 @@
-openscap-0.5.2.tar.gz
+openscap-0.5.3.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-12/openscap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openscap.spec	19 Aug 2009 15:40:55 -0000	1.7
+++ openscap.spec	29 Sep 2009 12:31:50 -0000	1.8
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -54,7 +54,7 @@ libraries can be used by perl.
 %setup -q
 
 %build
-%configure --enable-probes --enable-probes-independent --enable-probes-unix --enable-probes-redhat
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.3-1
+- upgrade
+
 * Wed Aug 19 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.2-1
 - upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 Aug 2009 15:40:55 -0000	1.6
+++ sources	29 Sep 2009 12:31:50 -0000	1.7
@@ -1 +1 @@
-b4b98f8ddb092c1a8dc8e1b6552034dd  openscap-0.5.2.tar.gz
+39a2b8bf0a2aa4311a73c1dff54a557e  openscap-0.5.3.tar.gz



From mbarnes at fedoraproject.org  Tue Sep 29 12:35:54 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 29 Sep 2009 12:35:54 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.63,1.394.2.64
Message-ID: <20090929123554.6F7F911C00C1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23023

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix file list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.63
retrieving revision 1.394.2.64
diff -u -p -r1.394.2.63 -r1.394.2.64
--- evolution.spec	29 Sep 2009 11:36:21 -0000	1.394.2.63
+++ evolution.spec	29 Sep 2009 12:35:54 -0000	1.394.2.64
@@ -526,8 +526,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-#%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
-#%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
+%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
+%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
 #%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
 #%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
 #%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml



From dwalsh at fedoraproject.org  Tue Sep 29 12:38:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 29 Sep 2009 12:38:59 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.34,
	1.35 modules-targeted.conf, 1.143, 1.144 policy-F12.patch, 1.93,
	1.94 selinux-policy.spec, 1.930, 1.931
Message-ID: <20090929123859.4484611C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23471

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
- Update rhcs policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- modules-minimum.conf	16 Sep 2009 17:50:32 -0000	1.34
+++ modules-minimum.conf	29 Sep 2009 12:38:57 -0000	1.35
@@ -233,6 +233,13 @@ cipe = module
 chronyd = module
 
 # Layer: services
+# Module: cobbler
+#
+# cobbler
+# 
+cobbler = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- modules-targeted.conf	16 Sep 2009 17:50:32 -0000	1.143
+++ modules-targeted.conf	29 Sep 2009 12:38:58 -0000	1.144
@@ -233,6 +233,13 @@ cipe = module
 chronyd = module
 
 # Layer: services
+# Module: cobbler
+#
+# cobbler
+# 
+cobbler = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  320 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   12 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   33 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   17 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 322 files changed, 14894 insertions(+), 2586 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.93 -r 1.94 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- policy-F12.patch	25 Sep 2009 18:47:06 -0000	1.93
+++ policy-F12.patch	29 Sep 2009 12:38:58 -0000	1.94
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
---- nsaserefpolicy/Makefile	2009-08-18 08:41:14.000000000 -0700
-+++ serefpolicy-3.6.32/Makefile	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
++++ serefpolicy-3.6.32/Makefile	2009-09-16 10:03:08.000000000 -0400
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -11,8 +11,8 @@ diff -b -B --ignore-all-space --exclude-
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
---- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 10:30:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 13:41:29.000000000 -0700
+--- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 16:41:29.000000000 -0400
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -22,8 +22,8 @@ diff -b -B --ignore-all-space --exclude-
  
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2009-07-23 11:11:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 10:03:08.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -60,8 +60,8 @@ diff -b -B --ignore-all-space --exclude-
 +gen_tunable(mmap_low_allowed, false)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
---- nsaserefpolicy/policy/mcs	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/mcs	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/mcs	2009-09-16 10:03:08.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -96,8 +96,8 @@ diff -b -B --ignore-all-space --exclude-
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
---- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 10:03:08.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -116,8 +116,8 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
---- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-21 05:25:17.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-21 08:25:17.000000000 -0400
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -128,8 +128,8 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_sysctl(brctl_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
---- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 06:23:16.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 10:03:08.000000000 -0400
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -140,16 +140,16 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
---- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 10:03:08.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
---- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 10:03:08.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -185,8 +185,8 @@ diff -b -B --ignore-all-space --exclude-
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
---- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 10:03:08.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -210,8 +210,8 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
---- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 10:03:08.000000000 -0400
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -255,8 +255,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
---- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 10:03:08.000000000 -0400
 @@ -136,4 +136,5 @@
  
  optional_policy(`
@@ -264,8 +264,8 @@ diff -b -B --ignore-all-space --exclude-
 +	samba_read_share_files(logwatch_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
---- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 06:23:16.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 10:03:08.000000000 -0400
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -275,8 +275,8 @@ diff -b -B --ignore-all-space --exclude-
  netutils_domtrans_ping(mrtg_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 10:03:08.000000000 -0400
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(netutils_t)
@@ -286,8 +286,8 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_all_users_fds(netutils_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
---- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 15:39:50.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 10:03:08.000000000 -0400
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -298,8 +298,8 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:unix_stream_socket create_socket_perms;
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.32/policy/modules/admin/prelink.if
---- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 10:03:08.000000000 -0400
 @@ -151,11 +151,11 @@
  ##	</summary>
  ## </param>
@@ -315,8 +315,8 @@ diff -b -B --ignore-all-space --exclude-
 +	relabel_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.32/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 10:03:08.000000000 -0400
 @@ -89,6 +89,7 @@
  miscfiles_read_localization(prelink_t)
  
@@ -326,8 +326,8 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amanda_manage_lib(prelink_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.32/policy/modules/admin/readahead.te
---- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-16 10:03:08.000000000 -0400
[...4109 lines suppressed...]
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1322,7 @@
+@@ -1211,6 +1323,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26826,7 +27089,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1388,15 @@
+@@ -1276,11 +1389,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26842,7 +27105,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1507,13 @@
+@@ -1391,12 +1508,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26857,7 +27120,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1546,14 @@
+@@ -1429,6 +1547,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26872,7 +27135,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1569,11 @@
+@@ -1444,9 +1570,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26884,7 +27147,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1630,25 @@
+@@ -1503,6 +1631,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26910,7 +27173,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1723,8 @@
+@@ -1577,6 +1724,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26919,7 +27182,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1818,7 @@
+@@ -1670,6 +1819,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26927,7 +27190,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1946,32 @@
+@@ -1797,19 +1947,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26967,7 +27230,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2006,7 @@
+@@ -1844,6 +2007,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26975,7 +27238,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2554,7 @@
+@@ -2391,27 +2555,7 @@
  
  ########################################
  ## <summary>
@@ -27004,7 +27267,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2908,32 @@
+@@ -2765,11 +2909,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27039,7 +27302,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3061,25 @@
+@@ -2897,7 +3062,25 @@
  		type user_tmp_t;
  	')
  
@@ -27066,7 +27329,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3116,7 @@
+@@ -2934,6 +3117,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27074,7 +27337,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3247,559 @@
+@@ -3064,3 +3248,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -27635,8 +27898,8 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 user_tmp_t:file { getattr append };
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 10:30:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 10:03:09.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27723,8 +27986,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
---- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -27753,8 +28016,8 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 10:03:09.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -27806,8 +28069,8 @@ diff -b -B --ignore-all-space --exclude-
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 10:03:09.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28106,8 +28369,8 @@ diff -b -B --ignore-all-space --exclude-
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
---- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 10:03:09.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -28141,8 +28404,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
---- nsaserefpolicy/policy/users	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/users	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/users	2009-09-16 10:03:09.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -p -r1.930 -r1.931
--- selinux-policy.spec	25 Sep 2009 18:47:07 -0000	1.930
+++ selinux-policy.spec	29 Sep 2009 12:38:58 -0000	1.931
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -432,7 +432,7 @@ SELinux Reference policy mls base module
 %saveFileContext mls
 
 %post mls 
-semodule -n -s mls -r mailscanner -r polkit 2>/dev/null
+semodule -n -s mls -r mailscanner -r polkit -r ModemManager 2>/dev/null
 packages="%{expand:%%moduleList mls}"
 %loadpolicy mls $packages
 
@@ -448,6 +448,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
+- Update rhcs policy
+
 * Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-11
 - Allow users to exec restorecond
 



From dwalsh at fedoraproject.org  Tue Sep 29 12:39:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 29 Sep 2009 12:39:15 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.127,
	1.128 setroubleshoot.spec, 1.167, 1.168 sources, 1.140, 1.141
Message-ID: <20090929123915.6B74711C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23612

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Mon Sep 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.33-1
- Fix translations, plurals and glade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- .cvsignore	25 Sep 2009 16:18:02 -0000	1.127
+++ .cvsignore	29 Sep 2009 12:39:14 -0000	1.128
@@ -44,3 +44,4 @@ setroubleshoot-2.2.28.tar.gz
 setroubleshoot-2.2.30.tar.gz
 setroubleshoot-2.2.31.tar.gz
 setroubleshoot-2.2.32.tar.gz
+setroubleshoot-2.2.33.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- setroubleshoot.spec	25 Sep 2009 16:18:02 -0000	1.167
+++ setroubleshoot.spec	29 Sep 2009 12:39:15 -0000	1.168
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.32
+Version: 2.2.33
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Sep 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.33-1
+- Fix translations, plurals and glade
+
 * Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.32-1
 - Fix browser bug handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- sources	25 Sep 2009 16:18:02 -0000	1.140
+++ sources	29 Sep 2009 12:39:15 -0000	1.141
@@ -1 +1 @@
-fac598f35d2071fea3133ed92bb3031d  setroubleshoot-2.2.32.tar.gz
+3cf9c8a75992349a6821a8019be9fda7  setroubleshoot-2.2.33.tar.gz



From dwalsh at fedoraproject.org  Tue Sep 29 12:39:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 29 Sep 2009 12:39:22 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.38,
	1.39 setroubleshoot-plugins.spec, 1.43, 1.44 sources, 1.39, 1.40
Message-ID: <20090929123922.5AB8611C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23653

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Mon Sep 28 2009  <dwalsh at redhat.com> - 2.1.23-1
- Fix translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	23 Sep 2009 01:14:21 -0000	1.38
+++ .cvsignore	29 Sep 2009 12:39:21 -0000	1.39
@@ -28,3 +28,4 @@ setroubleshoot-plugins-2.1.19.tar.gz
 setroubleshoot-plugins-2.1.20.tar.gz
 setroubleshoot-plugins-2.1.21.tar.gz
 setroubleshoot-plugins-2.1.22.tar.gz
+setroubleshoot-plugins-2.1.23.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- setroubleshoot-plugins.spec	23 Sep 2009 01:14:21 -0000	1.43
+++ setroubleshoot-plugins.spec	29 Sep 2009 12:39:22 -0000	1.44
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.22
+Version: 2.1.23
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Mon Sep 28 2009  <dwalsh at redhat.com> - 2.1.23-1
+- Fix translations
+
 * Tue Sep 22 2009  <dwalsh at redhat.com> - 2.1.22-1
 - Remove allow_daemon_user_term plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	23 Sep 2009 01:14:21 -0000	1.39
+++ sources	29 Sep 2009 12:39:22 -0000	1.40
@@ -1 +1 @@
-af4dc47f4bcfd1c42b88994fd428649f  setroubleshoot-plugins-2.1.22.tar.gz
+0f63bbd6a14622ac71a01fb8207b3a21  setroubleshoot-plugins-2.1.23.tar.gz



From sgallagh at fedoraproject.org  Tue Sep 29 12:41:09 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 29 Sep 2009 12:41:09 +0000 (UTC)
Subject: rpms/sssd/F-12 sssd.spec,1.20,1.21
Message-ID: <20090929124109.6E6EB11C00C1@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24061/F-12

Modified Files:
	sssd.spec 
Log Message:
Add missing changelog updates



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sssd.spec	29 Sep 2009 12:19:20 -0000	1.20
+++ sssd.spec	29 Sep 2009 12:41:08 -0000	1.21
@@ -180,6 +180,11 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Sep 29 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.0-1
+- Ensure that the configuration upgrade script always writes the config
+  file with 0600 permissions
+- Eliminate an infinite loop in group enumerations
+
 * Mon Sep 28 2009 Sumit Bose <sbose at redhat.com> - 0.6.0-0
 - New upstream release 0.6.0
 



From sgallagh at fedoraproject.org  Tue Sep 29 12:41:09 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 29 Sep 2009 12:41:09 +0000 (UTC)
Subject: rpms/sssd/devel sssd.spec,1.20,1.21
Message-ID: <20090929124109.A852B11C00C1@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24061/devel

Modified Files:
	sssd.spec 
Log Message:
Add missing changelog updates



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sssd.spec	29 Sep 2009 12:19:20 -0000	1.20
+++ sssd.spec	29 Sep 2009 12:41:09 -0000	1.21
@@ -180,6 +180,11 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Sep 29 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.0-1
+- Ensure that the configuration upgrade script always writes the config
+  file with 0600 permissions
+- Eliminate an infinite loop in group enumerations
+
 * Mon Sep 28 2009 Sumit Bose <sbose at redhat.com> - 0.6.0-0
 - New upstream release 0.6.0
 



From sgallagh at fedoraproject.org  Tue Sep 29 12:42:59 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 29 Sep 2009 12:42:59 +0000 (UTC)
Subject: rpms/sssd/F-12 sssd.spec,1.21,1.22
Message-ID: <20090929124259.7D03711C00C1@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24974/F-12

Modified Files:
	sssd.spec 
Log Message:
Bump release number



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sssd.spec	29 Sep 2009 12:41:08 -0000	1.21
+++ sssd.spec	29 Sep 2009 12:42:59 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name: sssd
 Version: 0.6.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 



From sgallagh at fedoraproject.org  Tue Sep 29 12:42:59 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 29 Sep 2009 12:42:59 +0000 (UTC)
Subject: rpms/sssd/devel sssd.spec,1.21,1.22
Message-ID: <20090929124259.A1E9911C00C1@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24974/devel

Modified Files:
	sssd.spec 
Log Message:
Bump release number



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sssd.spec	29 Sep 2009 12:41:09 -0000	1.21
+++ sssd.spec	29 Sep 2009 12:42:59 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name: sssd
 Version: 0.6.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 



From akurtakov at fedoraproject.org  Tue Sep 29 12:43:56 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 12:43:56 +0000 (UTC)
Subject: rpms/jetty/devel jetty.spec,1.21,1.22
Message-ID: <20090929124356.E91A811C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25425/devel

Modified Files:
	jetty.spec 
Log Message:
- Install unversioned jars.


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- jetty.spec	29 Sep 2009 08:29:09 -0000	1.21
+++ jetty.spec	29 Sep 2009 12:43:56 -0000	1.22
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -228,7 +228,9 @@ install -pm 755 %{SOURCE2} $RPM_BUILD_RO
 install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 echo '# Placeholder configuration file.  No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf
 ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
+ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
 ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util-%{version}.jar
+ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util.jar
 ( cat << EO_RC
 JAVA_HOME=/usr/lib/jvm/java
 JAVA_OPTIONS=
@@ -336,7 +338,9 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/*
 %dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}.jar
 %{_javadir}/%{name}/%{name}-%{version}.jar
+%{_javadir}/%{name}/%{name}-util.jar
 %{_javadir}/%{name}/%{name}-util-%{version}.jar
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
@@ -362,6 +366,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.21-2
+- Install unversioned jars.
+
 * Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.21-1
 - Update to upstream 6.1.21 release.
 



From mclasen at fedoraproject.org  Tue Sep 29 12:47:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 12:47:01 +0000 (UTC)
Subject: rpms/festival/devel festival.spec,1.44,1.45
Message-ID: <20090929124701.4B46D11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/festival/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25949

Modified Files:
	festival.spec 
Log Message:
Fix BRs



Index: festival.spec
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/festival.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- festival.spec	29 Sep 2009 12:24:40 -0000	1.44
+++ festival.spec	29 Sep 2009 12:47:01 -0000	1.45
@@ -136,6 +136,7 @@ Patch94: festival-speech-tools-pulse.pat
 
 Patch95: gcc44.patch
 
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: tetex
 BuildRequires: ncurses-devel
 



From pbrobinson at fedoraproject.org  Tue Sep 29 12:49:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 12:49:22 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, 1.3, 1.4 anerley.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090929124922.B6FE511C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26487

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Sep 2009 13:48:27 -0000	1.3
+++ .cvsignore	29 Sep 2009 12:49:22 -0000	1.4
@@ -1 +1 @@
-anerley-0.1.1.tar.bz2
+anerley-0.1.2.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- anerley.spec	29 Sep 2009 10:16:47 -0000	1.7
+++ anerley.spec	29 Sep 2009 12:49:22 -0000	1.8
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Name:           anerley
-Version:        0.1.1
-Release:        3%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -22,9 +22,9 @@ BuildRequires: evolution-data-server-dev
 BuildRequires: glib2-devel
 BuildRequires: nbtk-devel
 BuildRequires: telepathy-glib-devel
-BuildRequires: telepathy-mission-control-devel
 BuildRequires: intltool
 BuildRequires: gettext
+
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 BuildRequires: gnome-common
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
+- New upstream 0.1.2 release
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-3
 - Add patch for pkgconfig file for mc5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Sep 2009 13:48:27 -0000	1.3
+++ sources	29 Sep 2009 12:49:22 -0000	1.4
@@ -1 +1 @@
-3dbc9c9b1d9f2cbb75c0892e56b7961d  anerley-0.1.1.tar.bz2
+fe3e7a3c3e4ba791ba3342382f005a35  anerley-0.1.2.tar.bz2



From jreznik at fedoraproject.org  Tue Sep 29 12:49:46 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 29 Sep 2009 12:49:46 +0000 (UTC)
Subject: rpms/system-config-bind/F-12 .cvsignore, 1.41, 1.42 sources, 1.58, 
	1.59 system-config-bind.spec, 1.86, 1.87
Message-ID: <20090929124946.64C3611C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26597

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
* Tue Sep 29 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.15-1
- fixed polish translation (rhbz#525994)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	14 Sep 2009 12:26:00 -0000	1.41
+++ .cvsignore	29 Sep 2009 12:49:46 -0000	1.42
@@ -1 +1 @@
-system-config-bind-4.0.14.tar.gz
+system-config-bind-4.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	14 Sep 2009 12:26:00 -0000	1.58
+++ sources	29 Sep 2009 12:49:46 -0000	1.59
@@ -1 +1 @@
-718b2cc5c47351d14f8cf77370011a04  system-config-bind-4.0.14.tar.gz
+2d882206d5f42ff1be7528a53413331e  system-config-bind-4.0.15.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-12/system-config-bind.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- system-config-bind.spec	14 Sep 2009 12:26:00 -0000	1.86
+++ system-config-bind.spec	29 Sep 2009 12:49:46 -0000	1.87
@@ -1,6 +1,6 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.14
+Version:        4.0.15
 Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
@@ -82,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi;
 
 %changelog
+* Tue Sep 29 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.15-1
+- fixed polish translation (rhbz#525994)
+
 * Mon Sep 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.14-1
 - repackage for translation team request (rhbz#522429)
 



From pbrobinson at fedoraproject.org  Tue Sep 29 12:50:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 12:50:56 +0000 (UTC)
Subject: rpms/anerley/F-12 .cvsignore, 1.3, 1.4 anerley.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090929125056.4E5B511C048A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26787

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Sep 2009 13:48:27 -0000	1.3
+++ .cvsignore	29 Sep 2009 12:50:54 -0000	1.4
@@ -1 +1 @@
-anerley-0.1.1.tar.bz2
+anerley-0.1.2.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- anerley.spec	29 Sep 2009 10:17:43 -0000	1.7
+++ anerley.spec	29 Sep 2009 12:50:55 -0000	1.8
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Name:           anerley
-Version:        0.1.1
-Release:        3%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -22,9 +22,9 @@ BuildRequires: evolution-data-server-dev
 BuildRequires: glib2-devel
 BuildRequires: nbtk-devel
 BuildRequires: telepathy-glib-devel
-BuildRequires: telepathy-mission-control-devel
 BuildRequires: intltool
 BuildRequires: gettext
+
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 BuildRequires: gnome-common
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
+- New upstream 0.1.2 release
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-3
 - Add patch for pkgconfig file for mc5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Sep 2009 13:48:27 -0000	1.3
+++ sources	29 Sep 2009 12:50:55 -0000	1.4
@@ -1 +1 @@
-3dbc9c9b1d9f2cbb75c0892e56b7961d  anerley-0.1.1.tar.bz2
+fe3e7a3c3e4ba791ba3342382f005a35  anerley-0.1.2.tar.bz2



From jwilson at fedoraproject.org  Tue Sep 29 12:51:17 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 29 Sep 2009 12:51:17 +0000 (UTC)
Subject: rpms/memtest86+/devel .cvsignore, 1.21, 1.22 memtest86+.spec, 1.50, 
	1.51 sources, 1.21, 1.22
Message-ID: <20090929125117.C1F1B11C043A@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26982

Modified Files:
	.cvsignore memtest86+.spec sources 
Log Message:
* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
- Update to new upstream release, v4.00
- Drop gcc4.2+ patch, merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	24 Apr 2009 17:33:50 -0000	1.21
+++ .cvsignore	29 Sep 2009 12:51:15 -0000	1.22
@@ -1 +1,2 @@
 memtest86+-2.11.tar.gz
+memtest86+-4.00.tar.gz


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- memtest86+.spec	18 Aug 2009 20:40:03 -0000	1.50
+++ memtest86+.spec	29 Sep 2009 12:51:16 -0000	1.51
@@ -6,16 +6,14 @@
 %define debug_package %{nil}
 
 Name:     memtest86+
-Version:  2.11
-Release:  11%{?dist}
+Version:  4.00
+Release:  1%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
 Source1:  memtest-setup
 Source2:  new-memtest-pkg
-# Patch sent by Jarod to memtest86+ maintainer on 2009.08.18
-Patch0:   memtest86+-2.11-make-gcc4-builds-work.patch
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -41,7 +39,6 @@ to add the %{name} entry to your GRUB bo
 
 %prep
 %setup -q 
-#patch0 -p1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -87,6 +84,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
+- Update to new upstream release, v4.00
+- Drop gcc4.2+ patch, merged upstream
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> - 2.11-11
 - Fix runtime operation when built with gcc4.2+ (#442285)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Apr 2009 17:33:51 -0000	1.21
+++ sources	29 Sep 2009 12:51:16 -0000	1.22
@@ -1 +1 @@
-e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+898cfc5ff7920a8c396ebe898ac2eaa5  memtest86+-4.00.tar.gz



From nsantos at fedoraproject.org  Tue Sep 29 12:52:13 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 12:52:13 +0000 (UTC)
Subject: rpms/amqp/devel .cvsignore, 1.18, 1.19 amqp.spec, 1.25, 1.26 sources,
	1.21, 1.22
Message-ID: <20090929125213.EE1AF11C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27676

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	25 Sep 2009 17:14:57 -0000	1.18
+++ .cvsignore	29 Sep 2009 12:52:13 -0000	1.19
@@ -1 +1 @@
-amqp-1.0.818599.tar.gz
+amqp-1.0.819819.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/amqp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- amqp.spec	25 Sep 2009 17:14:57 -0000	1.25
+++ amqp.spec	29 Sep 2009 12:52:13 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.818599
+Version:        1.0.819819
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
 * Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.818599-1
 - Rebased to svn rev 818599
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 17:14:57 -0000	1.21
+++ sources	29 Sep 2009 12:52:13 -0000	1.22
@@ -1 +1 @@
-3f15cfd454adefca53c1138dade833b1  amqp-1.0.818599.tar.gz
+da0f6c461ed35ed045bd27b0f7688eff  amqp-1.0.819819.tar.gz



From jwilson at fedoraproject.org  Tue Sep 29 12:56:56 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 29 Sep 2009 12:56:56 +0000 (UTC)
Subject: rpms/wacomexpresskeys/devel wacomexpresskeys.spec,1.4,1.5
Message-ID: <20090929125656.E368A11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/wacomexpresskeys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28558

Modified Files:
	wacomexpresskeys.spec 
Log Message:
* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-3
- Add USAGE to %doc (#525546)



Index: wacomexpresskeys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wacomexpresskeys/devel/wacomexpresskeys.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wacomexpresskeys.spec	27 Jul 2009 07:02:00 -0000	1.4
+++ wacomexpresskeys.spec	29 Sep 2009 12:56:56 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		wacomexpresskeys
 Version:	0.4.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Wacom ExpressKeys and Touch Strips configuration utility
 
 Group:		System Environment/Base
@@ -36,10 +36,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS README TODO ChangeLog NEWS
+%doc AUTHORS BUGS ChangeLog NEWS README TODO USAGE
 %{_bindir}/expresskeys
 
 %changelog
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-3
+- Add USAGE to %%doc (#525546)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From msivak at fedoraproject.org  Tue Sep 29 12:57:28 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue, 29 Sep 2009 12:57:28 +0000 (UTC)
Subject: rpms/firstaidkit/F-12 .cvsignore, 1.10, 1.11 firstaidkit.spec, 1.32,
	1.33 sources, 1.14, 1.15
Message-ID: <20090929125728.CD63C11C00C1@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/firstaidkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28696

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	22 Sep 2009 07:55:22 -0000	1.10
+++ .cvsignore	29 Sep 2009 12:57:28 -0000	1.11
@@ -1 +1 @@
-firstaidkit-0.2.6.tar.bz2
+firstaidkit-0.2.7.tar.bz2


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/F-12/firstaidkit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- firstaidkit.spec	22 Sep 2009 07:56:19 -0000	1.32
+++ firstaidkit.spec	29 Sep 2009 12:57:28 -0000	1.33
@@ -3,7 +3,7 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.6
+Version:        0.2.7
 Release:        1%{?dist}
 Summary:        System Rescue Tool
 
@@ -246,6 +246,9 @@ desktop-file-install --vendor="fedora" -
 #
 
 %changelog
+* Tue Sep 29 2009 Martin Sivak <msivak at redhat.com> - 0.2.7-1
+- Make the dialog in whiptail bigger, so it looks nicer
+
 * Tue Sep 22 2009 Martin Sivak <msivak at redhat.com> - 0.2.6-1
 - Use whiptail instead of dialog for firstaidkit-qs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Sep 2009 07:55:22 -0000	1.14
+++ sources	29 Sep 2009 12:57:28 -0000	1.15
@@ -1 +1 @@
-ccf60dc442325cc9c3a4494143a7ae8a  firstaidkit-0.2.6.tar.bz2
+d05b19153976711dd9d141d6c12c8975  firstaidkit-0.2.7.tar.bz2



From nsantos at fedoraproject.org  Tue Sep 29 12:57:35 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 12:57:35 +0000 (UTC)
Subject: rpms/python-qpid/devel .cvsignore, 1.17, 1.18 python-qpid.spec, 1.31,
	1.32 sources, 1.21, 1.22
Message-ID: <20090929125735.3BD8211C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28741

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	25 Sep 2009 17:24:07 -0000	1.17
+++ .cvsignore	29 Sep 2009 12:57:34 -0000	1.18
@@ -1 +1 @@
-python-qpid-0.5.818599.tar.gz
+python-qpid-0.5.819819.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- python-qpid.spec	25 Sep 2009 17:24:07 -0000	1.31
+++ python-qpid.spec	29 Sep 2009 12:57:35 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.5.818599
+Version:        0.5.819819
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.818599
+Requires:       amqp >= 1.0.819819
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for Fedora 12 beta
+
 * Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
 - Rebased to svn rev 818599
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 17:24:07 -0000	1.21
+++ sources	29 Sep 2009 12:57:35 -0000	1.22
@@ -1 +1 @@
-bfa1ce6ad9f711f726b3b521694884b8  python-qpid-0.5.818599.tar.gz
+f219fe06eb21ff0807e9cfb70d9d07be  python-qpid-0.5.819819.tar.gz



From mclasen at fedoraproject.org  Tue Sep 29 12:57:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 12:57:36 +0000 (UTC)
Subject: rpms/festival/F-12 festival.spec,1.44,1.45
Message-ID: <20090929125736.69C3111C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/festival/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27861

Modified Files:
	festival.spec 
Log Message:
fix BRs



Index: festival.spec
===================================================================
RCS file: /cvs/pkgs/rpms/festival/F-12/festival.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- festival.spec	29 Sep 2009 12:25:03 -0000	1.44
+++ festival.spec	29 Sep 2009 12:57:36 -0000	1.45
@@ -136,6 +136,7 @@ Patch94: festival-speech-tools-pulse.pat
 
 Patch95: gcc44.patch
 
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: tetex
 BuildRequires: ncurses-devel
 



From mlichvar at fedoraproject.org  Tue Sep 29 12:58:11 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 29 Sep 2009 12:58:11 +0000 (UTC)
Subject: rpms/urlview/devel urlview.spec,1.5,1.6
Message-ID: <20090929125811.50C1711C00C1@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/urlview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29009

Modified Files:
	urlview.spec 
Log Message:
- add man page link for urlview.conf (#526162)



Index: urlview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/urlview/devel/urlview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- urlview.spec	27 Jul 2009 06:38:19 -0000	1.5
+++ urlview.spec	29 Sep 2009 12:58:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           urlview
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        URL extractor/launcher
 
 Group:          Applications/Internet
@@ -33,10 +33,11 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
+mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man{1,5}}
 install -p -m644 urlview.conf.suse $RPM_BUILD_ROOT%{_sysconfdir}/urlview.conf
 install -p urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
 install -p -m644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
+echo '.so man1/urlview.1' > $RPM_BUILD_ROOT%{_mandir}/man5/urlview.conf.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/urlview
 %{_bindir}/url_handler.sh
 %{_mandir}/man1/urlview.1*
+%{_mandir}/man5/urlview.conf.5*
 
 %changelog
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.9-7
+- add man page link for urlview.conf (#526162)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Tue Sep 29 13:01:20 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 13:01:20 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.669,1.670
Message-ID: <20090929130120.1EC6C11C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29436/devel

Modified Files:
	eclipse.spec 
Log Message:
- Symlink to unversioned jetty jars.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -p -r1.669 -r1.670
--- eclipse.spec	29 Sep 2009 12:18:16 -0000	1.669
+++ eclipse.spec	29 Sep 2009 13:01:19 -0000	1.670
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -110,7 +110,7 @@ BuildRequires: jakarta-commons-logging >
 BuildRequires: jakarta-commons-codec
 BuildRequires: jakarta-commons-httpclient
 BuildRequires: mx4j >= 2.1
-BuildRequires: jetty >= 6.1.20
+BuildRequires: jetty >= 6.1.21-2
 BuildRequires: lucene >= 2.3.1-3.4
 BuildRequires: lucene-contrib >= 2.3.1-3.4
 BuildRequires: regexp
@@ -170,7 +170,7 @@ Requires: jakarta-commons-codec
 Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
-Requires: jetty >= 6.1.20
+Requires: jetty >= 6.1.21-2
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
@@ -395,11 +395,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@@ -959,11 +959,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1295,6 +1295,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-4
+- Symlink to unversioned jetty jars.
+
 * Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-3
 - Build with eclipse-build 0.4.0 RC0.
 



From nsantos at fedoraproject.org  Tue Sep 29 13:05:45 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 13:05:45 +0000 (UTC)
Subject: rpms/amqp/F-12 amqp.spec,1.25,1.26 sources,1.21,1.22
Message-ID: <20090929130545.0E45D11C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30149

Modified Files:
	amqp.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-12/amqp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- amqp.spec	25 Sep 2009 17:14:57 -0000	1.25
+++ amqp.spec	29 Sep 2009 13:05:44 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.818599
+Version:        1.0.819819
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
 * Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.818599-1
 - Rebased to svn rev 818599
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 17:14:57 -0000	1.21
+++ sources	29 Sep 2009 13:05:44 -0000	1.22
@@ -1 +1 @@
-3f15cfd454adefca53c1138dade833b1  amqp-1.0.818599.tar.gz
+da0f6c461ed35ed045bd27b0f7688eff  amqp-1.0.819819.tar.gz



From jlayton at fedoraproject.org  Tue Sep 29 13:06:03 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Tue, 29 Sep 2009 13:06:03 +0000 (UTC)
Subject: rpms/sparse/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sparse.spec,
	1.12, 1.13
Message-ID: <20090929130603.7DC6411C00C1@cvs1.fedora.phx.redhat.com>

Author: jlayton

Update of /cvs/pkgs/rpms/sparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30181

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
Update to 0.4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Nov 2007 22:24:14 -0000	1.7
+++ .cvsignore	29 Sep 2009 13:06:03 -0000	1.8
@@ -1 +1 @@
-sparse-0.4.1.tar.bz2
+sparse-0.4.2rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Nov 2007 22:24:14 -0000	1.7
+++ sources	29 Sep 2009 13:06:03 -0000	1.8
@@ -1 +1 @@
-f27e661c5b132b037a105e4ccabfcacd  sparse-0.4.1.tar.bz2
+6085a35dc86c7274bfd305a291bb4a57  sparse-0.4.2rc1.tar.bz2


Index: sparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/devel/sparse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sparse.spec	27 Jul 2009 04:38:58 -0000	1.12
+++ sparse.spec	29 Sep 2009 13:06:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name: sparse
-Version: 0.4.1
-Release: 5%{?dist}
+Version: 0.4.2rc1
+Release: 1%{?dist}
 Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    OSL 1.1
@@ -46,9 +46,9 @@ make DESTDIR="%{buildroot}" PREFIX="%{_p
 
 %build
 %ifarch sparcv9 sparc64
-%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fPIC"
+%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fPIC -DGCC_BASE=\\\"`gcc --print-file-name=`\\\""
 %else
-%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fpic"
+%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fpic -DGCC_BASE=\\\"`gcc --print-file-name=`\\\""
 %endif
 
 %install
@@ -82,6 +82,9 @@ make clean
 
 
 %changelog
+* Tue Sep 29 2009 Jeff Layton <jlayton at redhat.com> - 0.4.2rc1-1
+- Update to 0.4.2rc1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From harald at fedoraproject.org  Tue Sep 29 13:09:11 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 29 Sep 2009 13:09:11 +0000 (UTC)
Subject: rpms/udev/devel ck-runseat.patch,NONE,1.1 udev.spec,1.293,1.294
Message-ID: <20090929130911.F2A9011C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30708

Modified Files:
	udev.spec 
Added Files:
	ck-runseat.patch 
Log Message:
* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 145-10
- add ConsoleKit patch for ConsoleKit 0.4.1


ck-runseat.patch:
 Makefile.am |    4 -
 udev-acl.c  |  207 +++++++++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 159 insertions(+), 52 deletions(-)

--- NEW FILE ck-runseat.patch ---
--- udev-145/extras/udev-acl/Makefile.am.runseat	2009-06-16 19:47:37.000000000 -0400
+++ udev-145/extras/udev-acl/Makefile.am	2009-09-25 20:21:41.959583372 -0400
@@ -15,5 +15,5 @@ udev_acl_LDADD = \
 dist_udevrules_DATA = 70-acl.rules
 
 install-exec-hook:
-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
-	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
+	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
--- udev-145/extras/udev-acl/udev-acl.c.runseat	2009-06-16 12:10:58.000000000 -0400
+++ udev-145/extras/udev-acl/udev-acl.c	2009-09-25 20:57:32.502573825 -0400
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  * Copyright (C) 2009 Kay Sievers <kay.sievers at vrfy.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -29,6 +30,13 @@
 
 static int debug;
 
+enum{
+	ACTION_NONE = 0,
+	ACTION_REMOVE,
+	ACTION_ADD,
+	ACTION_CHANGE
+};
+
 static int set_facl(const char* filename, uid_t uid, int add)
 {
 	int get;
@@ -152,44 +160,123 @@ static GSList *uids_with_local_active_se
 }
 
 /* ConsoleKit calls us with special variables */
-static int consolekit_called(const char *action, uid_t *uid, const char **own_session, int *add)
+static int consolekit_called(const char *ck_action, uid_t *uid, uid_t *uid2, const char **remove_session_id, int *action)
 {
-	int a;
-	uid_t u;
+	int a = ACTION_NONE;
+	uid_t u = 0;
+	uid_t u2 = 0;
 	const char *s;
-	const char *session;
-
-	if (action == NULL || strcmp(action, "session_active_changed") != 0)
-		return -1;
+	const char *s2;
+	const char *old_session = NULL;
 
-	s = getenv("CK_SESSION_IS_LOCAL");
-	if (s == NULL)
+	if (ck_action == NULL || strcmp(ck_action, "seat_active_session_changed") != 0)
 		return -1;
-	if (strcmp(s, "true") != 0)
-		return 0;
 
-	s = getenv("CK_SESSION_IS_ACTIVE");
-	if (s == NULL)
+	/* We can have one of: remove, add, change, no-change */
+	s = getenv("CK_SEAT_OLD_SESSION_ID");
+	s2 = getenv("CK_SEAT_SESSION_ID");
+	if (s == NULL && s2 == NULL) {
 		return -1;
-	if (strcmp(s, "true") == 0)
-		a = 1;
-	else
-		a = 0;
+	} else if (s2 == NULL) {
+		a = ACTION_REMOVE;
+	} else if (s == NULL) {
+		a = ACTION_ADD;
+	} else {
+		a = ACTION_CHANGE;
+	}
 
-	session = getenv("CK_SESSION_ID");
-	if (session == NULL)
-		return -1;
+	switch (a) {
+	case ACTION_ADD:
+		s = getenv("CK_SEAT_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u = strtoul(s, NULL, 10);
+		if (u == 0)
+			return 0;
+
+		s = getenv("CK_SEAT_SESSION_IS_LOCAL");
+		if (s == NULL)
+			return -1;
+		if (strcmp(s, "true") != 0)
+			return 0;
+
+		break;
+	case ACTION_REMOVE:
+		s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u = strtoul(s, NULL, 10);
+		if (u == 0)
+			return 0;
+
+		s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+		if (s == NULL)
+			return -1;
+		if (strcmp(s, "true") != 0)
+			return 0;
+
+		old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+		if (old_session == NULL)
+			return -1;
+
+		break;
+	case ACTION_CHANGE:
+		s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u = strtoul(s, NULL, 10);
+		if (u == 0)
+			return 0;
+		s = getenv("CK_SEAT_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u2 = strtoul(s, NULL, 10);
+		if (u2 == 0)
+			return 0;
+
+		s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+		s2 = getenv("CK_SEAT_SESSION_IS_LOCAL");
+		if (s == NULL || s2 == NULL)
+			return -1;
+		/* don't process non-local session changes */
+		if (strcmp(s, "true") != 0 && strcmp(s2, "true") != 0)
+			return 0;
+
+		if (strcmp(s, "true") == 0 && strcmp(s, "true") == 0) {
+			/* process the change */
+			if (u == u2) {
+				/* special case: we noop if we are
+				 * changing between local sessions for
+				 * the same uid */
+				a = ACTION_NONE;
+			}
+			old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+			if (old_session == NULL)
+				return -1;
+		} else if (strcmp(s, "true") == 0) {
+			/* only process the removal */
+			a = ACTION_REMOVE;
+			old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+			if (old_session == NULL)
+				return -1;
+		} else if (strcmp(s2, "true") == 0) {
+			/* only process the addition */
+			a = ACTION_ADD;
+			u = u2;
+		}
 
-	s = getenv("CK_SESSION_USER_UID");
-	if (s == NULL)
-		return -1;
-	u = strtoul(s, NULL, 10);
-	if (u == 0)
-		return 0;
+		break;
+	case ACTION_NONE:
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
 
-	*own_session = session;
+	*remove_session_id = old_session;
 	*uid = u;
-	*add = a;
+	*uid2 = u2;
+	*action = a;
 	return 0;
 }
 
@@ -223,6 +310,21 @@ static void apply_acl_to_devices(uid_t u
 	udev_unref(udev);
 }
 
+static void
+remove_uid (uid_t uid, const char *remove_session_id)
+{
+	/*
+	 * Remove ACL for given uid from all matching devices
+	 * when there is currently no local active session.
+	 */
+	GSList *list;
+
+	list = uids_with_local_active_session(remove_session_id);
+	if (!uid_in_list(list, uid))
+		apply_acl_to_devices(uid, 0);
+	g_slist_free(list);
+}
+
 int main (int argc, char* argv[])
 {
 	static const struct option options[] = {
@@ -233,10 +335,11 @@ int main (int argc, char* argv[])
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
-	int add = -1;
+	int action = -1;
 	const char *device = NULL;
 	uid_t uid = 0;
-	const char* own_session = NULL;
+	uid_t uid2 = 0;
+	const char* remove_session_id = NULL;
 	int rc = 0;
 
 	/* valgrind is more important to us than a slice allocator */
@@ -252,9 +355,9 @@ int main (int argc, char* argv[])
 		switch (option) {
 		case 'a':
 			if (strcmp(optarg, "add") == 0 || strcmp(optarg, "change") == 0)
-				add = 1;
+				action = ACTION_ADD;
 			else if (strcmp(optarg, "remove") == 0)
-				add = 0;
+				action = ACTION_REMOVE;
 			else
 				goto out;
 			break;
@@ -274,10 +377,10 @@ int main (int argc, char* argv[])
 		}
 	}
 
-	if (add < 0 && device == NULL && uid == 0)
-		consolekit_called(argv[optind], &uid, &own_session, &add);
+	if (action < 0 && device == NULL && uid == 0)
+		consolekit_called(argv[optind], &uid, &uid2, &remove_session_id, &action);
 
-	if (add < 0) {
+	if (action < 0) {
 		fprintf(stderr, "missing action\n\n");
 		rc = 2;
 		goto out;
@@ -290,20 +393,24 @@ int main (int argc, char* argv[])
 	}
 
 	if (uid != 0) {
-		if (add) {
+		switch (action) {
+		case ACTION_ADD:
 			/* Add ACL for given uid to all matching devices. */
 			apply_acl_to_devices(uid, 1);
-		} else {
-			/*
-			 * Remove ACL for given uid from all matching devices
-			 * when there is currently no local active session.
-			 */
-			GSList *list;
-
-			list = uids_with_local_active_session(own_session);
-			if (!uid_in_list(list, uid))
-				apply_acl_to_devices(uid, 0);
-			g_slist_free(list);
+			break;
+		case ACTION_REMOVE:
+			remove_uid(uid, remove_session_id);
+			break;
+		case ACTION_CHANGE:
+			remove_uid(uid, remove_session_id);
+			apply_acl_to_devices(uid2, 1);
+			break;
+		case ACTION_NONE:
+			goto out;
+			break;
+		default:
+			g_assert_not_reached();
+			break;
 		}
 	} else if (device != NULL) {
 		/*
@@ -321,8 +428,8 @@ int main (int argc, char* argv[])
 			uid_t u;
 
 			u = GPOINTER_TO_UINT(l->data);
-			if (add || !uid_in_list(list, u))
-				set_facl(device, u, add);
+			if (action == ACTION_ADD || !uid_in_list(list, u))
+				set_facl(device, u, action == ACTION_ADD);
 		}
 		g_slist_free(list);
 	} else {


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- udev.spec	25 Sep 2009 17:05:23 -0000	1.293
+++ udev.spec	29 Sep 2009 13:09:11 -0000	1.294
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,7 +19,7 @@ Patch2: 0002-udevd-add-timestamp-to-debu
 Patch3: 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch
 Patch4: 0004-fix-single-session-CD-detection.patch
 Patch5: 0005-fix-previous-commit-for-CD-detection.patch
-
+Patch6: ck-runseat.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -106,6 +106,7 @@ glib-based applications using libudev fu
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1 -b .ck041
 
 %build
 # get rid of rpath
@@ -323,7 +324,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/v4l_id
 %attr(0755,root,root) %{udev_scriptdir}/findkeyboards
 %attr(0644,root,root) %{udev_scriptdir}/keymaps/*
-%attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-session.d/udev-acl.ck
+%attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 
 %files -n libudev
@@ -357,6 +358,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 145-10
+- add ConsoleKit patch for ConsoleKit 0.4.1
+
 * Fri Sep 25 2009 harald at redhat.com 145-9
 - add patches to fix cdrom_id
 - add patch to fix the inotify bug (bug #524752)



From nsantos at fedoraproject.org  Tue Sep 29 13:10:38 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 13:10:38 +0000 (UTC)
Subject: rpms/python-qpid/F-12 python-qpid.spec,1.31,1.32 sources,1.21,1.22
Message-ID: <20090929131038.A375211C0492@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30980

Modified Files:
	python-qpid.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-12/python-qpid.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- python-qpid.spec	25 Sep 2009 17:24:07 -0000	1.31
+++ python-qpid.spec	29 Sep 2009 13:10:38 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.5.818599
+Version:        0.5.819819
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.818599
+Requires:       amqp >= 1.0.819819
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for Fedora 12 beta
+
 * Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
 - Rebased to svn rev 818599
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 17:24:07 -0000	1.21
+++ sources	29 Sep 2009 13:10:38 -0000	1.22
@@ -1 +1 @@
-bfa1ce6ad9f711f726b3b521694884b8  python-qpid-0.5.818599.tar.gz
+f219fe06eb21ff0807e9cfb70d9d07be  python-qpid-0.5.819819.tar.gz



From rhughes at fedoraproject.org  Tue Sep 29 13:33:10 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 29 Sep 2009 13:33:10 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.120,1.121
Message-ID: <20090929133310.D5E7511C00C1@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	PackageKit.spec 
Log Message:
* Tue Sep 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.2.20090928git
- Do not build smart support on RHEL.



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- PackageKit.spec	28 Sep 2009 13:36:27 -0000	1.120
+++ PackageKit.spec	29 Sep 2009 13:33:08 -0000	1.121
@@ -10,7 +10,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.3
-Release:   0.1.%{?alphatag}git%{?dist}
+Release:   0.2.%{?alphatag}git%{?dist}
 #Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -33,7 +33,7 @@ Requires: PackageKit-yum-plugin = %{vers
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: comps-extras
-%if 0%{?rhel} != 0
+%if 0%{?rhel} == 0
 Requires: preupgrade
 %endif
 BuildRequires: polkit >= %{polkit_version}
@@ -85,6 +85,7 @@ Requires: %{name} = %{version}-%{release
 %description yum
 A backend for PackageKit to enable yum functionality.
 
+%if 0%{?rhel} == 0
 %package smart
 Summary: PackageKit SMART backend
 Group: System Environment/Libraries
@@ -93,6 +94,7 @@ Requires: %{name} = %{version}-%{release
 
 %description smart
 A backend for PackageKit to enable SMART functionality.
+%endif
 
 %package docs
 Summary: Documentation for PackageKit
@@ -247,7 +249,9 @@ user to restart the computer or remove a
 %configure \
 	--disable-static \
 	--enable-yum \
+%if 0%{?rhel} == 0
 	--enable-smart \
+%endif
 	--with-default-backend=yum \
 	--disable-local \
 	--disable-ruck \
@@ -349,12 +353,14 @@ update-mime-database %{_datadir}/mime &>
 %dir %{_datadir}/PackageKit/website/img/thumbnails
 %{_datadir}/PackageKit/website/img/thumbnails/*.png
 
+%if 0%{?rhel} == 0
 %files smart
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %{_libdir}/packagekit-backend/libpk_backend_smart.so
 %dir %{_datadir}/PackageKit/helpers/smart
 %{_datadir}/PackageKit/helpers/smart/*
+%endif
 
 %files yum
 %defattr(-,root,root,-)
@@ -448,7 +454,10 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
-* Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090928git
+* Tue Sep 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.2.20090928git
+- Do not build smart support on RHEL.
+
+* Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.1.20090928git
 - Update to a newer git snapshot from the 0.5.x series.
 - Fixes command-not-found functionality
 - Lots of updated translations



From dnovotny at fedoraproject.org  Tue Sep 29 13:34:11 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 29 Sep 2009 13:34:11 +0000 (UTC)
Subject: rpms/logrotate/devel logrotate-3.7.8-man5.patch, NONE,
	1.1 logrotate.spec, 1.81, 1.82
Message-ID: <20090929133411.E806211C00C1@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/logrotate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2479

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.8-man5.patch 
Log Message:
fix #525659


logrotate-3.7.8-man5.patch:
 Makefile         |    5 ++++-
 logrotate.conf.5 |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE logrotate-3.7.8-man5.patch ---
diff -up /dev/null logrotate-3.7.8/logrotate.conf.5
--- /dev/null	2009-09-29 13:43:00.063127317 +0200
+++ logrotate-3.7.8/logrotate.conf.5	2009-09-29 14:46:24.000000000 +0200
@@ -0,0 +1 @@
+.so man8/logrotate.8
diff -up logrotate-3.7.8/Makefile.man5 logrotate-3.7.8/Makefile
--- logrotate-3.7.8/Makefile.man5	2008-05-19 12:25:54.000000000 +0200
+++ logrotate-3.7.8/Makefile	2009-09-29 14:47:01.000000000 +0200
@@ -3,7 +3,8 @@ OS_NAME = $(shell uname -s)
 LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
 CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
 PROG = logrotate
-MAN = logrotate.8
+MAN = logrotate.8 
+MAN5 = logrotate.conf.5
 LOADLIBES = -lpopt
 SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate
 SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate
@@ -99,6 +100,7 @@ install:
 	[ -d $(PREFIX)/$(BINDIR) ] || mkdir -p $(PREFIX)/$(BINDIR)
 	[ -d $(PREFIX)/$(MANDIR) ] || mkdir -p $(PREFIX)/$(MANDIR)
 	[ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
+	[ -d $(PREFIX)/$(MANDIR)/man5 ] || mkdir -p $(PREFIX)/$(MANDIR)/man5
 
 	if [ "$(OS_NAME)" = HP-UX ]; then \
 	$(INSTALL) $(PROG) $(PREFIX)/$(BINDIR) 0755 bin bin; \
@@ -106,6 +108,7 @@ install:
 	else \
 	$(INSTALL) -m 755 $(PROG) $(PREFIX)/$(BINDIR); \
 	$(INSTALL) -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
+	$(INSTALL) -m 644 $(MAN5) $(PREFIX)/$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
 	fi
 
 co:


Index: logrotate.spec
===================================================================
RCS file: /cvs/extras/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- logrotate.spec	17 Sep 2009 09:37:46 -0000	1.81
+++ logrotate.spec	29 Sep 2009 13:34:11 -0000	1.82
@@ -1,13 +1,14 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.7-curdir2.patch
 Patch2: logrotate-3.7.7-toolarge.patch
 Patch3: logrotate-3.7.8-devnull.patch
+Patch4: logrotate-3.7.8-man5.patch
 
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
@@ -29,6 +30,7 @@ log files on your system.
 %patch1 -p1 -b .curdir
 %patch2 -p1 -b .toolarge
 %patch3 -p1 -b .devnull
+%patch4 -p1 -b .man5
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -52,12 +54,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING
 %attr(0755, root, root) %{_sbindir}/logrotate
 %attr(0644, root, root) %{_mandir}/man8/logrotate.8*
+%attr(0644, root, root) %{_mandir}/man5/logrotate.conf.5*
 %attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
 %attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-5
+- fix #525659 (man page for logrotate.conf)
+
 * Thu Sep 17 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-4
 - fix #517321 (logrotate blocking anacron)
 



From akurtakov at fedoraproject.org  Tue Sep 29 13:34:24 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 29 Sep 2009 13:34:24 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.670,1.671
Message-ID: <20090929133424.6DF9D11C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2578/devel

Modified Files:
	eclipse.spec 
Log Message:
Fix changelog entry.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -p -r1.670 -r1.671
--- eclipse.spec	29 Sep 2009 13:01:19 -0000	1.670
+++ eclipse.spec	29 Sep 2009 13:34:23 -0000	1.671
@@ -1295,7 +1295,7 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-4
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-4
 - Symlink to unversioned jetty jars.
 
 * Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-3



From mbroz at fedoraproject.org  Tue Sep 29 13:37:45 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Tue, 29 Sep 2009 13:37:45 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.14,
	1.15 cryptsetup-luks.spec, 1.71, 1.72 sources, 1.14, 1.15
Message-ID: <20090929133745.763BC11C00C1@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3586

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
Update to cryptsetup 1.1.0-rc1
Add luksHeaderBackup and luksHeaderRestore commands.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	11 Sep 2009 11:46:38 -0000	1.14
+++ .cvsignore	29 Sep 2009 13:37:45 -0000	1.15
@@ -1 +1 @@
-cryptsetup-1.1.0-test0.tar.bz2
+cryptsetup-1.1.0-rc1.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- cryptsetup-luks.spec	11 Sep 2009 11:46:38 -0000	1.71
+++ cryptsetup-luks.spec	29 Sep 2009 13:37:45 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.1.0
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
@@ -14,7 +14,7 @@ Obsoletes: cryptsetup <= 0.1
 Requires: cryptsetup-luks-libs = %{version}-%{release}
 
 %define _root_sbindir /sbin
-%define upstream_version %{version}-test0
+%define upstream_version %{version}-rc1
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
@@ -89,6 +89,10 @@ popd 
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 29 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.2
+- Update to cryptsetup 1.1.0-rc1
+- Add luksHeaderBackup and luksHeaderRestore commands.
+
 * Thu Sep 11 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.1
 - Update to new upstream testing version with new API interface.
 - Add luksSuspend and luksResume commands.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Sep 2009 11:46:38 -0000	1.14
+++ sources	29 Sep 2009 13:37:45 -0000	1.15
@@ -1 +1 @@
-61f0ba826ae2d69d20e9db4e471f8e78  cryptsetup-1.1.0-test0.tar.bz2
+cb7aee7e5ef9a4c637394721878c5968  cryptsetup-1.1.0-rc1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 29 13:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 13:59:44 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090929135944.87AF210F874@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From nsantos at fedoraproject.org  Tue Sep 29 14:07:51 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 14:07:51 +0000 (UTC)
Subject: rpms/ruby-qpid/devel .cvsignore, 1.14, 1.15 ruby-qpid.spec, 1.22,
	1.23 sources, 1.14, 1.15
Message-ID: <20090929140751.19BC811C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9406

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Sep 2009 17:37:55 -0000	1.14
+++ .cvsignore	29 Sep 2009 14:07:50 -0000	1.15
@@ -1 +1 @@
-ruby-qpid-0.5.818599.tar.gz
+ruby-qpid-0.5.819819.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ruby-qpid.spec	25 Sep 2009 17:37:55 -0000	1.22
+++ ruby-qpid.spec	29 Sep 2009 14:07:50 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version: 	0.5.818599
+Version: 	0.5.819819
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -22,12 +22,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.818599
+BuildRequires:  amqp >= 1.0.819819
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.818599
+Requires:       amqp >= 1.0.819819
 Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt NOTICE.txt RELEASE_NOTES
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
 * Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
 - Rebased to svn rev 818599
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 17:37:55 -0000	1.14
+++ sources	29 Sep 2009 14:07:50 -0000	1.15
@@ -1 +1 @@
-51bdde963e7809f72b14cf77a33b3bb6  ruby-qpid-0.5.818599.tar.gz
+a3805e1bc124d9c44e7c281380f9f80c  ruby-qpid-0.5.819819.tar.gz



From nphilipp at fedoraproject.org  Tue Sep 29 14:09:19 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 14:09:19 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.21, 1.22 python-slip.spec, 1.24,
	1.25 sources, 1.24, 1.25
Message-ID: <20090929140919.06B2A11C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9962

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	28 Sep 2009 09:33:27 -0000	1.21
+++ .cvsignore	29 Sep 2009 14:09:18 -0000	1.22
@@ -1 +1 @@
-python-slip-0.2.6.tar.bz2
+python-slip-0.2.7.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- python-slip.spec	28 Sep 2009 09:33:27 -0000	1.24
+++ python-slip.spec	29 Sep 2009 14:09:18 -0000	1.25
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.6
+Version:    0.2.7
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -92,6 +92,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 0.2.7-1
+- fix persistent service objects
+
 * Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 0.2.6-1
 - ship all slip.dbus modules (#525790)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Sep 2009 09:33:27 -0000	1.24
+++ sources	29 Sep 2009 14:09:18 -0000	1.25
@@ -1 +1 @@
-7fa0124473a4e888083de7b02857a57c  python-slip-0.2.6.tar.bz2
+088f992c6c31f1497fb2c83484fbfb8b  python-slip-0.2.7.tar.bz2



From nphilipp at fedoraproject.org  Tue Sep 29 14:09:23 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 14:09:23 +0000 (UTC)
Subject: rpms/python-slip/F-12 .cvsignore, 1.21, 1.22 python-slip.spec, 1.24,
	1.25 sources, 1.24, 1.25
Message-ID: <20090929140923.0901311C0423@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9991

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	28 Sep 2009 09:33:27 -0000	1.21
+++ .cvsignore	29 Sep 2009 14:09:22 -0000	1.22
@@ -1 +1 @@
-python-slip-0.2.6.tar.bz2
+python-slip-0.2.7.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/F-12/python-slip.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- python-slip.spec	28 Sep 2009 09:33:27 -0000	1.24
+++ python-slip.spec	29 Sep 2009 14:09:22 -0000	1.25
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.6
+Version:    0.2.7
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -92,6 +92,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 0.2.7-1
+- fix persistent service objects
+
 * Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 0.2.6-1
 - ship all slip.dbus modules (#525790)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Sep 2009 09:33:27 -0000	1.24
+++ sources	29 Sep 2009 14:09:22 -0000	1.25
@@ -1 +1 @@
-7fa0124473a4e888083de7b02857a57c  python-slip-0.2.6.tar.bz2
+088f992c6c31f1497fb2c83484fbfb8b  python-slip-0.2.7.tar.bz2



From jwilson at fedoraproject.org  Tue Sep 29 14:11:48 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 29 Sep 2009 14:11:48 +0000 (UTC)
Subject: rpms/wacomexpresskeys/F-12 wacomexpresskeys.spec,1.4,1.5
Message-ID: <20090929141149.16FCA11C0492@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/wacomexpresskeys/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10612

Modified Files:
	wacomexpresskeys.spec 
Log Message:
* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-3
- Add USAGE to %doc (#525546)



Index: wacomexpresskeys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wacomexpresskeys/F-12/wacomexpresskeys.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wacomexpresskeys.spec	27 Jul 2009 07:02:00 -0000	1.4
+++ wacomexpresskeys.spec	29 Sep 2009 14:11:47 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		wacomexpresskeys
 Version:	0.4.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Wacom ExpressKeys and Touch Strips configuration utility
 
 Group:		System Environment/Base
@@ -36,10 +36,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS README TODO ChangeLog NEWS
+%doc AUTHORS BUGS ChangeLog NEWS README TODO USAGE
 %{_bindir}/expresskeys
 
 %changelog
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-3
+- Add USAGE to %%doc (#525546)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwilson at fedoraproject.org  Tue Sep 29 14:12:31 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 29 Sep 2009 14:12:31 +0000 (UTC)
Subject: rpms/wacomexpresskeys/F-11 wacomexpresskeys.spec,1.1,1.2
Message-ID: <20090929141231.BBBAC11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/wacomexpresskeys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10872

Modified Files:
	wacomexpresskeys.spec 
Log Message:
* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-3
- Add USAGE to %doc (#525546)



Index: wacomexpresskeys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wacomexpresskeys/F-11/wacomexpresskeys.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wacomexpresskeys.spec	15 Jul 2009 13:18:51 -0000	1.1
+++ wacomexpresskeys.spec	29 Sep 2009 14:12:30 -0000	1.2
@@ -1,11 +1,8 @@
-%define _x11dir		/usr
-%define _x11libdir	%{_x11dir}/%{_lib}
-%define _x11sdkdir	%{_includedir}
 %define	tarname		expresskeys
 
 Name:		wacomexpresskeys
 Version:	0.4.2
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	Wacom ExpressKeys and Touch Strips configuration utility
 
 Group:		System Environment/Base
@@ -39,10 +36,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS README TODO ChangeLog NEWS
+%doc AUTHORS BUGS ChangeLog NEWS README TODO USAGE
 %{_bindir}/expresskeys
 
 %changelog
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-3
+- Add USAGE to %%doc (#525546)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 14 2009 Jarod Wilson <jarod at redhat.com> 0.4.2-1
 - Update to 0.4.2
 - Submit for Fedora package review



From nsantos at fedoraproject.org  Tue Sep 29 14:14:05 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 14:14:05 +0000 (UTC)
Subject: rpms/ruby-qpid/F-12 ruby-qpid.spec,1.22,1.23 sources,1.14,1.15
Message-ID: <20090929141405.A178411C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11594

Modified Files:
	ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-12/ruby-qpid.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ruby-qpid.spec	25 Sep 2009 17:37:55 -0000	1.22
+++ ruby-qpid.spec	29 Sep 2009 14:14:04 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version: 	0.5.818599
+Version: 	0.5.819819
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -22,12 +22,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.818599
+BuildRequires:  amqp >= 1.0.819819
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.818599
+Requires:       amqp >= 1.0.819819
 Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt NOTICE.txt RELEASE_NOTES
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
 * Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
 - Rebased to svn rev 818599
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 17:37:55 -0000	1.14
+++ sources	29 Sep 2009 14:14:05 -0000	1.15
@@ -1 +1 @@
-51bdde963e7809f72b14cf77a33b3bb6  ruby-qpid-0.5.818599.tar.gz
+a3805e1bc124d9c44e7c281380f9f80c  ruby-qpid-0.5.819819.tar.gz



From harald at fedoraproject.org  Tue Sep 29 14:33:24 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 29 Sep 2009 14:33:24 +0000 (UTC)
Subject: rpms/system-config-boot/devel .cvsignore, 1.20, 1.21 sources, 1.20, 
	1.21 system-config-boot.spec, 1.34, 1.35
Message-ID: <20090929143324.180C911C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17457

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 0.4.1
- add error dialog, if grub.conf can't be read (bug #525886)
- updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Sep 2009 15:17:27 -0000	1.20
+++ .cvsignore	29 Sep 2009 14:33:23 -0000	1.21
@@ -1 +1 @@
-system-config-boot-0.4.0.tar.bz2
+system-config-boot-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Sep 2009 15:17:27 -0000	1.20
+++ sources	29 Sep 2009 14:33:23 -0000	1.21
@@ -1 +1 @@
-81d2e80d69b8b964d783cb1fa4b92be4  system-config-boot-0.4.0.tar.bz2
+fcf0f498eb5dd229c549f5c26819d389  system-config-boot-0.4.1.tar.bz2


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- system-config-boot.spec	11 Sep 2009 15:17:27 -0000	1.34
+++ system-config-boot.spec	29 Sep 2009 14:33:23 -0000	1.35
@@ -3,7 +3,7 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.4.0
+Version: 0.4.1
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPLv2
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 0.4.1
+- add error dialog, if grub.conf can't be read (bug #525886)
+- updated translations
+
 * Fri Sep 11 2009 Harald Hoyer <harald at redhat.com> 0.4.0
 - add tui version
 - removed rhpl dependency



From nsantos at fedoraproject.org  Tue Sep 29 14:36:59 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 14:36:59 +0000 (UTC)
Subject: rpms/qpidc/devel so_number.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 qpidc.spec, 1.101, 1.102 sources, 1.45, 1.46
Message-ID: <20090929143659.6569611C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19114

Modified Files:
	.cvsignore qpidc.spec sources 
Added Files:
	so_number.patch 
Log Message:
Rebased to svn rev 819819 for F12 beta

so_number.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE so_number.patch ---
--- cpp/configure.ac	2009-09-02 10:32:57.000000000 -0400
+++ cpp/configure.ac	2009-09-29 10:27:07.393678846 -0400
@@ -112,7 +112,7 @@
 LIBS=$gl_saved_libs
 
 # Set the argument to be used in "libtool -version-info ARG".
-QPID_CURRENT=2
+QPID_CURRENT=3
 QPID_REVISION=0
 QPID_AGE=0
 LIBTOOL_VERSION_INFO_ARG=$QPID_CURRENT:$QPID_REVISION:$QPID_AGE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	24 Sep 2009 22:19:06 -0000	1.24
+++ .cvsignore	29 Sep 2009 14:36:56 -0000	1.25
@@ -1,2 +1,2 @@
-qpidc-0.5.818599.tar.gz
+qpidc-0.5.819819.tar.gz
 rhm-0.5.3641.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- qpidc.spec	25 Sep 2009 17:47:50 -0000	1.101
+++ qpidc.spec	29 Sep 2009 14:36:56 -0000	1.102
@@ -7,7 +7,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 818599
+%define qpid_svnrev 819819
 %define rhm_svnrev 3641
 
 Name:           qpidc
@@ -20,6 +20,7 @@ URL:            http://qpid.apache.org
 Source0:        %{name}-%{version}.tar.gz
 Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
 Source2:	qpidd.pp
+Patch0:		so_number.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -241,6 +242,7 @@ exit 0
 %prep
 %setup
 %setup -T -D -b 1
+%patch0
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
@@ -517,6 +519,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
 * Thu Sep 24 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
 - Rebased to svn rev 818599
 - rhm-cpp-server-store obsoletes rhm top-level package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	24 Sep 2009 22:19:06 -0000	1.45
+++ sources	29 Sep 2009 14:36:57 -0000	1.46
@@ -1,2 +1,2 @@
-b9b04d4744f8e1e1bd55e62388b49e29  qpidc-0.5.818599.tar.gz
+3f1f75be166b0d752a9132622d5742a8  qpidc-0.5.819819.tar.gz
 5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz



From bpepple at fedoraproject.org  Tue Sep 29 14:50:07 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Sep 2009 14:50:07 +0000 (UTC)
Subject: rpms/python-reportlab/devel python-reportlab-get_python_lib.patch, 
	NONE, 1.1 python-reportlab.spec, 1.19, 1.20
Message-ID: <20090929145007.7A65811C048A@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-reportlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22438

Modified Files:
	python-reportlab.spec 
Added Files:
	python-reportlab-get_python_lib.patch 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1-7
- Add patch to fix build on x86_64 builder. (#525535)


python-reportlab-get_python_lib.patch:
 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE python-reportlab-get_python_lib.patch ---
--- reportlab_2_1.OLD/reportlab/setup.py	2007-05-24 06:08:21.000000000 -0500
+++ reportlab_2_1/reportlab/setup.py	2009-09-24 12:20:56.000000000 -0500
@@ -5,6 +5,7 @@
 
 import os, sys, distutils, glob
 from distutils.core import setup, Extension
+from distutils.sysconfig import get_python_lib
 
 # from Zope - App.Common.package_home
 def package_home(globals_dict):
@@ -18,7 +19,7 @@
 isfile = os.path.isfile
 isdir = os.path.isfile
 dirname = os.path.dirname
-package_path = pjoin(package_home(distutils.__dict__), 'site-packages', 'reportlab')
+package_path = pjoin(get_python_lib(), 'reportlab')
 
 def get_version():
     #determine Version


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- python-reportlab.spec	26 Jul 2009 20:59:18 -0000	1.19
+++ python-reportlab.spec	29 Sep 2009 14:50:07 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		python-reportlab
 Version:	2.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -10,6 +10,7 @@ License:	BSD
 URL:		http://www.reportlab.org/
 Source0:	http://www.reportlab.org/ftp/ReportLab_2_1.tgz
 Patch0:		%{name}-%{version}-remove_luxifont.patch
+Patch1:		%{name}-get_python_lib.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -34,7 +35,7 @@ The %{name}-docs package contains the do
 %prep
 %setup -q -n reportlab_2_1
 %patch0 -p1 -b .luxifont
-
+%patch1 -p1 -b .lib
 
 %build
 cd ./reportlab
@@ -87,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1-7
+- Add patch to fix build on x86_64 builder. (#525535)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Sep 29 14:51:44 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 29 Sep 2009 14:51:44 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/devel
	perl-POE-Component-Client-Keepalive.spec, 1.12, 1.13
Message-ID: <20090929145144.0254711C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22946

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
* Tue Sep 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-2
- fix provides version (for perl-POE-Component-Client-HTTP)



Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-POE-Component-Client-Keepalive.spec	27 Sep 2009 09:01:18 -0000	1.12
+++ perl-POE-Component-Client-Keepalive.spec	29 Sep 2009 14:51:43 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-Keepalive
 Version:        0.260
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manages and keeps alive client connections
 
 Group:          Development/Libraries
@@ -19,7 +19,7 @@ BuildRequires:  perl(POE::Component::Cli
 BuildRequires:  perl(Net::IP) >= 1.25
 
 # Satisfy automaticly generated requires that want this module >= 0.0901
-Provides:       perl(POE::Component::Client::Keepalive) = %{version}
+Provides:       perl(POE::Component::Client::Keepalive) = %{version}0
 
 ### auto-added reqs!
 Requires:       perl(Net::IP) >= 1.25
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Sep 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-2
+- fix provides version (for perl-POE-Component-Client-HTTP)
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-1
 - update filtering
 - auto-update to 0.260 (by cpan-spec-update 0.01)



From harald at fedoraproject.org  Tue Sep 29 14:53:14 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 29 Sep 2009 14:53:14 +0000 (UTC)
Subject: rpms/system-config-boot/F-11 .cvsignore, 1.20, 1.21 sources, 1.20, 
	1.21 system-config-boot.spec, 1.33, 1.34
Message-ID: <20090929145314.036A711C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23205

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 0.4.1
- add error dialog, if grub.conf can't be read (bug #525886)
- updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	24 Apr 2009 11:38:16 -0000	1.20
+++ .cvsignore	29 Sep 2009 14:53:13 -0000	1.21
@@ -1 +1 @@
-system-config-boot-0.3.1.tar.bz2
+system-config-boot-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	24 Apr 2009 11:38:16 -0000	1.20
+++ sources	29 Sep 2009 14:53:13 -0000	1.21
@@ -1 +1 @@
-e63da9002315977c73aee6e147396fe3  system-config-boot-0.3.1.tar.bz2
+fcf0f498eb5dd229c549f5c26819d389  system-config-boot-0.4.1.tar.bz2


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-11/system-config-boot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- system-config-boot.spec	24 Apr 2009 11:38:16 -0000	1.33
+++ system-config-boot.spec	29 Sep 2009 14:53:13 -0000	1.34
@@ -3,7 +3,7 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.3.1
+Version: 0.4.1
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPLv2
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.bz2
-Requires: pygtk2 python2 usermode >= 1.36 rhpl >= 0.6 
+Requires: pygtk2 python2 usermode >= 1.36  
 Requires: usermode-gtk
 ExclusiveArch: %{ix86} x86_64
 Obsoletes: redhat-config-boot < 0.2
@@ -66,6 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 0.4.1
+- add error dialog, if grub.conf can't be read (bug #525886)
+- updated translations
+
+* Fri Sep 11 2009 Harald Hoyer <harald at redhat.com> 0.4.0
+- add tui version
+- removed rhpl dependency
+
 * Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 0.3.1
 - translation updates
 - removed kudzu import (bug #473798)



From jsafrane at fedoraproject.org  Tue Sep 29 14:55:12 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue, 29 Sep 2009 14:55:12 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp-5.5-dir-fix.patch, NONE,
	1.1 net-snmp-5.5-multilib.patch, NONE,
	1.1 net-snmp-5.5-sensors3.patch, NONE, 1.1 net-snmp.spec, 1.188,
	1.189 net-snmp-5.1.2-dir-fix.patch, 1.3,
	NONE net-snmp-5.2.1-file_offset.patch, 1.3,
	NONE net-snmp-5.3.1-multilib.patch, 1.2,
	NONE net-snmp-5.4.1-config_libdir.patch, 1.2,
	NONE net-snmp-5.4.1-libwrap.patch, 1.1,
	NONE net-snmp-5.4.1-sensors3.patch, 1.2,
	NONE net-snmp-5.4.1-shared-ip.patch, 1.4,
	NONE net-snmp-5.4.1-strange_libpath.patch, 1.2,
	NONE net-snmp-5.4.1-xen-crash.patch, 1.2,
	NONE net-snmp-5.4.2.1-proc-div0.patch, 1.1, NONE
Message-ID: <20090929145512.76F4511C00C1@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23564

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.5-dir-fix.patch net-snmp-5.5-multilib.patch 
	net-snmp-5.5-sensors3.patch 
Removed Files:
	net-snmp-5.1.2-dir-fix.patch net-snmp-5.2.1-file_offset.patch 
	net-snmp-5.3.1-multilib.patch 
	net-snmp-5.4.1-config_libdir.patch 
	net-snmp-5.4.1-libwrap.patch net-snmp-5.4.1-sensors3.patch 
	net-snmp-5.4.1-shared-ip.patch 
	net-snmp-5.4.1-strange_libpath.patch 
	net-snmp-5.4.1-xen-crash.patch 
	net-snmp-5.4.2.1-proc-div0.patch 
Log Message:
- update to Net-SNMP 5.5
- remove static libraries from -devel subpackage
- rediff all patches to 5.5, remove unused/obsolete patches

net-snmp-5.5-dir-fix.patch:
 net-snmp-create-v3-user.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.5-dir-fix.patch ---
Let net-snmp-create-v3-user save settings into /etc/ instead of /usr/

diff -up net-snmp-5.5/net-snmp-create-v3-user.in.orig net-snmp-5.5/net-snmp-create-v3-user.in
--- net-snmp-5.5/net-snmp-create-v3-user.in.orig	2008-07-22 16:33:25.000000000 +0200
+++ net-snmp-5.5/net-snmp-create-v3-user.in	2009-09-29 16:30:36.000000000 +0200
@@ -158,7 +158,7 @@ if test ! -d $outfile ; then
     touch $outfile
 fi
 echo $line >> $outfile
-outfile="@datadir@/snmp/snmpd.conf"
+outfile="/etc/snmp/snmpd.conf"
 line="$token $user"
 echo "adding the following line to $outfile:"
 echo "  " $line

net-snmp-5.5-multilib.patch:
 config_api.3.def  |    4 ++--
 snmp_config.5.def |    2 +-
 snmpd.conf.5.def  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE net-snmp-5.5-multilib.patch ---
Make the man pages multilib safe.

diff -up net-snmp-5.5/man/config_api.3.def.orig net-snmp-5.5/man/config_api.3.def
--- net-snmp-5.5/man/config_api.3.def.orig	2009-04-21 11:36:52.000000000 +0200
+++ net-snmp-5.5/man/config_api.3.def	2009-09-29 11:45:44.000000000 +0200
@@ -256,7 +256,7 @@ machines and the second file can be used
 for one particular machine.
 .PP
 The default list of directories to search is
-SYSCONFDIR/snmp, followed by DATADIR/snmp, followed by LIBDIR/snmp,
+SYSCONFDIR/snmp, followed by DATADIR/snmp, followed by /usr/lib(64)/snmp,
 followed by $HOME/.snmp.
 This list can be changed by setting the environmental variable
 .I SNMPCONFPATH
@@ -326,7 +326,7 @@ function that it should abort the operat
 SNMPCONFPATH
 A colon separated list of directories to search for configuration
 files in.
-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp
+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp
 .SH "SEE ALSO"
 .BR mib_api "(3), " snmp_api (3)
 .\" Local Variables:
diff -up net-snmp-5.5/man/snmp_config.5.def.orig net-snmp-5.5/man/snmp_config.5.def
--- net-snmp-5.5/man/snmp_config.5.def.orig	2007-06-18 23:17:15.000000000 +0200
+++ net-snmp-5.5/man/snmp_config.5.def	2009-09-29 11:45:22.000000000 +0200
@@ -11,7 +11,7 @@ First off, there are numerous places tha
 found and read from.  By default, the applications look for
 configuration files in the following 4 directories, in order:
 SYSCONFDIR/snmp,
-DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp.  In each of these
+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp.  In each of these
 directories, it looks for files with the extension of both
 .IR conf " and " local.conf
 (reading the second ones last).  In this manner, there are
diff -up net-snmp-5.5/man/snmpd.conf.5.def.orig net-snmp-5.5/man/snmpd.conf.5.def
--- net-snmp-5.5/man/snmpd.conf.5.def.orig	2009-06-01 17:53:30.000000000 +0200
+++ net-snmp-5.5/man/snmpd.conf.5.def	2009-09-29 11:44:59.000000000 +0200
@@ -1272,7 +1272,7 @@ filename), and call the initialisation r
 .RS
 .IP "Note:"
 If the specified PATH is not a fully qualified filename, it will
-be interpreted relative to LIBDIR/snmp/dlmod, and \fC.so\fR
+be interpreted relative to /usr/lib(64)/snmp/dlmod, and \fC.so\fR
 will be appended to the filename.
 .RE
 .PP

net-snmp-5.5-sensors3.patch:
 sensors.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.5-sensors3.patch ---
Compile with lm_sensors3.

diff -up net-snmp-5.5/agent/mibgroup/hardware/sensors.h.orig net-snmp-5.5/agent/mibgroup/hardware/sensors.h
--- net-snmp-5.5/agent/mibgroup/hardware/sensors.h.orig	2009-04-24 00:53:26.000000000 +0200
+++ net-snmp-5.5/agent/mibgroup/hardware/sensors.h	2009-09-29 12:00:18.000000000 +0200
@@ -7,7 +7,7 @@ config_require(hardware/sensors/picld_se
 config_require(hardware/sensors/kstat_sensors)
 # endif
 #else
-config_require(hardware/sensors/lmsensors_v2)
+config_require(hardware/sensors/lmsensors_v3)
 #endif
 
 /* config_require(hardware/sensors/dummy_sensors) */


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- net-snmp.spec	14 Sep 2009 09:53:25 -0000	1.188
+++ net-snmp.spec	29 Sep 2009 14:55:12 -0000	1.189
@@ -3,12 +3,12 @@
 
 # Arches on which we need to prevent arch conflicts on net-snmp-config.h
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64
-%define major_ver 5.4.2.1
+%define major_ver 5.5
 
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 17%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -25,16 +25,9 @@ Source7: net-snmp-config
 Source8: net-snmp-trapd.redhat.conf
 Source9: net-snmpd.sysconfig
 Patch1: net-snmp-5.4.1-pie.patch
-Patch2: net-snmp-5.1.2-dir-fix.patch
-Patch3: net-snmp-5.2.1-file_offset.patch
-Patch4: net-snmp-5.3.1-multilib.patch
-Patch5: net-snmp-5.4.1-config_libdir.patch
-Patch6: net-snmp-5.4.1-strange_libpath.patch
-Patch7: net-snmp-5.4.1-shared-ip.patch
-Patch8: net-snmp-5.4.1-sensors3.patch
-Patch9: net-snmp-5.4.1-xen-crash.patch
-Patch10: net-snmp-5.4.1-libwrap.patch
-Patch11: net-snmp-5.4.2.1-proc-div0.patch
+Patch2: net-snmp-5.5-dir-fix.patch
+Patch3: net-snmp-5.5-multilib.patch
+Patch4: net-snmp-5.5-sensors3.patch
 
 Requires(pre): chkconfig
 Requires(post): chkconfig
@@ -166,15 +159,8 @@ Net-SNMP toolkit library.
 %endif
 
 %patch2 -p1 -b .dir-fix
-%patch3 -p1 -b .file_offset
-%patch4 -p1 -b .multilib
-%patch5 -p1 -b .libdir
-%patch6 -p1 -b .libpath
-%patch7 -p1 -b .shared-ip
-%patch8 -p1 -b .sensors
-%patch9 -p1 -b .xen-crash
-%patch10 -p1 -b .libwrap
-%patch11 -p1 -b .proc-div0
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .sensors
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -194,7 +180,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
 %endif
 
 %configure \
-    --enable-static --enable-shared			\
+    --disable-static --enable-shared			\
     --with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"	\
 %ifnarch s390 s390x
     --with-ldflags="$LDFLAGS -lcrypto -lsensors"	\
@@ -206,7 +192,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
     --with-persistent-directory="/var/lib/net-snmp"	\
     --with-mib-modules="$MIBS"				\
 %if %{tcp_wrappers}
-    --with-libwrap=%{_libdir}				\
+    --with-libwrap=yes				\
 %endif
     --sysconfdir=%{_sysconfdir}				\
     --enable-ipv6					\
@@ -219,9 +205,8 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
     --with-sys-contact="root at localhost" <<EOF
 
 EOF
-#exit 0
 
-make %{?smp_mflags} 
+make %{?_smp_mflags} 
 
 pushd perl
 # Use just built libs for perl module building, not the system libs.
@@ -372,10 +357,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/ucd5820stat
 %{_bindir}/ipf-mod.pl
 %{_bindir}/snmpconf
+%{_bindir}/net-snmp-create-v3-user
 %{_sbindir}/*
 %attr(0644,root,root)	%{_mandir}/man[58]/snmp*d*
 %attr(0644,root,root)	%{_mandir}/man5/snmp_config.5.gz
 %attr(0644,root,root)	%{_mandir}/man5/variables*
+%attr(0644,root,root)	%{_mandir}/man1/net-snmp-create-v3-user*
 %dir %{_datadir}/snmp
 %{_datadir}/snmp/snmpconf-data
 %dir %{_localstatedir}/lib/net-snmp
@@ -393,7 +380,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(0644,root,root,0755)
 %{_libdir}/lib*.so
-%{_libdir}/*.a
 /usr/include/*
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
 %attr(0755,root,root)	%{_bindir}/net-snmp-config*
@@ -429,6 +415,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
+* Tue Sep 29 2009 Jan Safranek Jan Safranek <jsafranek at redhat.com> 5.5-1
+- update to Net-SNMP 5.5
+- remove static libraries from -devel subpackage
+
 * Mon Sep 14 2009 Jan Safranek <orion at cora.nwra.com> 1:5.4.2.1-17
 - implement force-reload command in initscripts (#523126)
 


--- net-snmp-5.1.2-dir-fix.patch DELETED ---


--- net-snmp-5.2.1-file_offset.patch DELETED ---


--- net-snmp-5.3.1-multilib.patch DELETED ---


--- net-snmp-5.4.1-config_libdir.patch DELETED ---


--- net-snmp-5.4.1-libwrap.patch DELETED ---


--- net-snmp-5.4.1-sensors3.patch DELETED ---


--- net-snmp-5.4.1-shared-ip.patch DELETED ---


--- net-snmp-5.4.1-strange_libpath.patch DELETED ---


--- net-snmp-5.4.1-xen-crash.patch DELETED ---


--- net-snmp-5.4.2.1-proc-div0.patch DELETED ---



From nsantos at fedoraproject.org  Tue Sep 29 14:57:38 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 14:57:38 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.102,1.103
Message-ID: <20090929145738.89D8311C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24457

Modified Files:
	qpidc.spec 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- qpidc.spec	29 Sep 2009 14:36:56 -0000	1.102
+++ qpidc.spec	29 Sep 2009 14:57:38 -0000	1.103
@@ -353,10 +353,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
-%_libdir/libqpidcommon.so.2
-%_libdir/libqpidcommon.so.2.0.0
-%_libdir/libqpidclient.so.2
-%_libdir/libqpidclient.so.2.0.0
+%_libdir/libqpidcommon.so.3
+%_libdir/libqpidcommon.so.3.0.0
+%_libdir/libqpidclient.so.3
+%_libdir/libqpidclient.so.3.0.0
 %dir %_libdir/qpid
 %dir %_libdir/qpid/client
 %dir %_sysconfdir/qpid
@@ -383,8 +383,8 @@ rm -rf %{buildroot}
 %files -n qpidd
 %defattr(-,root,root,-)
 %_datadir/selinux/packages/qpidd.pp
-%_libdir/libqpidbroker.so.2
-%_libdir/libqpidbroker.so.2.0.0
+%_libdir/libqpidbroker.so.3
+%_libdir/libqpidbroker.so.3.0.0
 %_libdir/qpid/daemon/replicating_listener.so
 %_libdir/qpid/daemon/replication_exchange.so
 %_libdir/qpid/daemon/watchdog.so
@@ -407,12 +407,12 @@ rm -rf %{buildroot}
 
 %files -n qmf
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so.2
-%_libdir/libqmfcommon.so.2.0.0
-%_libdir/libqmfagent.so.2
-%_libdir/libqmfagent.so.2.0.0
-%_libdir/libqmfconsole.so.2
-%_libdir/libqmfconsole.so.2.0.0
+%_libdir/libqmfcommon.so.3
+%_libdir/libqmfcommon.so.3.0.0
+%_libdir/libqmfagent.so.3
+%_libdir/libqmfagent.so.3.0.0
+%_libdir/libqmfconsole.so.3
+%_libdir/libqmfconsole.so.3.0.0
 
 %files -n qmf-devel
 %defattr(-,root,root,-)
@@ -444,8 +444,8 @@ rm -rf %{buildroot}
 
 %files ssl
 %defattr(-,root,root,-)
-%_libdir/libsslcommon.so.2
-%_libdir/libsslcommon.so.2.0.0
+%_libdir/libsslcommon.so.3
+%_libdir/libsslcommon.so.3.0.0
 %_libdir/qpid/client/sslconnector.so
 
 %files -n qpidd-ssl



From mhlavink at fedoraproject.org  Tue Sep 29 15:04:15 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 29 Sep 2009 15:04:15 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.138,1.139
Message-ID: <20090929150415.3DE8811C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25150

Modified Files:
	dovecot.spec 
Log Message:
* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-2
- build with libcap enabled



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- dovecot.spec	17 Sep 2009 15:08:17 -0000	1.138
+++ dovecot.spec	29 Sep 2009 15:04:14 -0000	1.139
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -39,7 +39,7 @@ Patch2: dovecot-1.0.beta2-mkcert-permiss
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, pam-devel, zlib-devel
+BuildRequires: openssl-devel, pam-devel, zlib-devel, libcap-devel
 BuildRequires: libtool autoconf automake
 
 # gettext-devel is needed for running autoconf because of the
@@ -184,6 +184,7 @@ autoreconf -i -f
     INSTALL_DATA="install -c -p -m644" \
     --enable-header-install      \
     --disable-static             \
+    --with-libcap                \
 %if %{build_postgres}
     --with-pgsql                 \
 %endif
@@ -434,6 +435,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-2
+- build with libcap enabled
+
 * Thu Sep 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-1
 - updated to dovecot 1.2.5
 - Authentication: DIGEST-MD5 and RPA mechanisms no longer require



From mclasen at fedoraproject.org  Tue Sep 29 15:08:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 15:08:51 +0000 (UTC)
Subject: rpms/gnome-menus/F-12 fix-menu-sorting.patch, NONE,
	1.1 gnome-menus.spec, 1.108, 1.109
Message-ID: <20090929150851.7A21511C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26254

Modified Files:
	gnome-menus.spec 
Added Files:
	fix-menu-sorting.patch 
Log Message:
Fix menu sorting


fix-menu-sorting.patch:
 gmenu-tree.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE fix-menu-sorting.patch ---
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 84196b7..e03c146 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -1629,6 +1629,8 @@ gmenu_tree_item_compare_get_name_helper (GMenuTreeItem    *item,
 {
   const char *name;
 
+  name = NULL;
+
   switch (item->type)
     {
     case GMENU_TREE_ITEM_DIRECTORY:
@@ -1645,7 +1647,7 @@ gmenu_tree_item_compare_get_name_helper (GMenuTreeItem    *item,
 	  name = desktop_entry_get_name (GMENU_TREE_ENTRY (item)->desktop_entry);
 	  break;
 	case GMENU_TREE_SORT_DISPLAY_NAME:
-	  gmenu_tree_entry_get_display_name (GMENU_TREE_ENTRY (item));
+	  name = gmenu_tree_entry_get_display_name (GMENU_TREE_ENTRY (item));
 	  break;
 	default:
 	  g_assert_not_reached ();


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/F-12/gnome-menus.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- gnome-menus.spec	24 Sep 2009 23:18:29 -0000	1.108
+++ gnome-menus.spec	29 Sep 2009 15:08:51 -0000	1.109
@@ -6,7 +6,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -21,6 +21,9 @@ BuildRequires: pkgconfig
 BuildRequires: python2-devel >= 2.3.0
 BuildRequires: intltool
 
+# upstream fix
+Patch0: fix-menu-sorting.patch
+
 %description
 gnome-menus is an implementation of the draft "Desktop
 Menu Specification" from freedesktop.org. This package
@@ -43,6 +46,7 @@ writing applications that use the GNOME 
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-menu-sorting
 
 %build
 %configure \
@@ -99,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-3
+- Fix menu sorting (#523636)
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
 - Remove obsolete configure option
 



From hadess at fedoraproject.org  Tue Sep 29 15:12:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 15:12:30 +0000 (UTC)
Subject: rpms/totem/F-12 .cvsignore, 1.78, 1.79 sources, 1.78,
	1.79 totem.spec, 1.261, 1.262
Message-ID: <20090929151230.83FC011C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27388

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	21 Sep 2009 12:11:53 -0000	1.78
+++ .cvsignore	29 Sep 2009 15:12:29 -0000	1.79
@@ -1 +1 @@
-totem-2.28.0.tar.bz2
+totem-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	21 Sep 2009 12:11:53 -0000	1.78
+++ sources	29 Sep 2009 15:12:29 -0000	1.79
@@ -1 +1 @@
-481d56b78b351606cf6c75d923776a75  totem-2.28.0.tar.bz2
+42f071fcf8ffc471beb3e1689297d647  totem-2.28.1.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- totem.spec	26 Sep 2009 00:54:53 -0000	1.261
+++ totem.spec	29 Sep 2009 15:12:29 -0000	1.262
@@ -5,8 +5,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.28.0
-Release: 4%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -380,6 +380,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4
 - More requires
 



From rjones at fedoraproject.org  Tue Sep 29 15:12:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 15:12:41 +0000 (UTC)
Subject: rpms/ocaml-camlimages/F-12 ocaml-camlimages.spec,1.19,1.20
Message-ID: <20090929151241.5AE2211C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27526

Modified Files:
	ocaml-camlimages.spec 
Log Message:
Force rebuild against newer lablgtk.


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-12/ocaml-camlimages.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ocaml-camlimages.spec	25 Jul 2009 19:52:35 -0000	1.19
+++ ocaml-camlimages.spec	29 Sep 2009 15:12:40 -0000	1.20
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-12
+- Force rebuild against newer lablgtk.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Tue Sep 29 15:13:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 15:13:31 +0000 (UTC)
Subject: rpms/ocaml-camlimages/devel ocaml-camlimages.spec,1.19,1.20
Message-ID: <20090929151331.DFB6C11C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28003

Modified Files:
	ocaml-camlimages.spec 
Log Message:
Force rebuild against newer lablgtk.


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ocaml-camlimages.spec	25 Jul 2009 19:52:35 -0000	1.19
+++ ocaml-camlimages.spec	29 Sep 2009 15:13:31 -0000	1.20
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-12
+- Force rebuild against newer lablgtk.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Tue Sep 29 15:14:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 15:14:33 +0000 (UTC)
Subject: rpms/ocaml-ocamlnet/F-12 ocaml-ocamlnet.spec,1.15,1.16
Message-ID: <20090929151433.5AD9C11C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlnet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28233

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
Force rebuild against newer lablgtk.


Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/F-12/ocaml-ocamlnet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-ocamlnet.spec	25 Jul 2009 20:01:04 -0000	1.15
+++ ocaml-ocamlnet.spec	29 Sep 2009 15:14:33 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-15
+- Force rebuild against newer lablgtk.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Tue Sep 29 15:15:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 15:15:03 +0000 (UTC)
Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.15,1.16
Message-ID: <20090929151503.2488A11C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28485

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
Force rebuild against newer lablgtk.


Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-ocamlnet.spec	25 Jul 2009 20:01:04 -0000	1.15
+++ ocaml-ocamlnet.spec	29 Sep 2009 15:15:02 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-15
+- Force rebuild against newer lablgtk.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Tue Sep 29 15:16:06 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 15:16:06 +0000 (UTC)
Subject: rpms/ocaml-cairo/F-12 ocaml-cairo.spec,1.12,1.13
Message-ID: <20090929151606.3E27C11C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cairo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28944

Modified Files:
	ocaml-cairo.spec 
Log Message:
Force rebuild against newer lablgtk.


Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/F-12/ocaml-cairo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-cairo.spec	25 Jul 2009 19:51:49 -0000	1.12
+++ ocaml-cairo.spec	29 Sep 2009 15:16:06 -0000	1.13
@@ -13,7 +13,7 @@
 
 Name:           ocaml-cairo
 Version:        1.2.0.cvs20080301
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library for accessing cairo graphics
 
 Group:          Development/Libraries
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.0.cvs20080301-11
+- Force rebuild against newer lablgtk.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.cvs20080301-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Tue Sep 29 15:16:06 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Sep 2009 15:16:06 +0000 (UTC)
Subject: rpms/ocaml-cairo/devel ocaml-cairo.spec,1.12,1.13
Message-ID: <20090929151606.80DEA11C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28979

Modified Files:
	ocaml-cairo.spec 
Log Message:
Force rebuild against newer lablgtk.


Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-cairo.spec	25 Jul 2009 19:51:49 -0000	1.12
+++ ocaml-cairo.spec	29 Sep 2009 15:16:06 -0000	1.13
@@ -13,7 +13,7 @@
 
 Name:           ocaml-cairo
 Version:        1.2.0.cvs20080301
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library for accessing cairo graphics
 
 Group:          Development/Libraries
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.0.cvs20080301-11
+- Force rebuild against newer lablgtk.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.cvs20080301-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Tue Sep 29 15:16:57 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 15:16:57 +0000 (UTC)
Subject: rpms/prewikka/devel .cvsignore, 1.6, 1.7 prewikka.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090929151657.B1E0C11C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prewikka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29367

Modified Files:
	.cvsignore prewikka.spec sources 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 0.9.17.1-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jul 2009 19:48:23 -0000	1.6
+++ .cvsignore	29 Sep 2009 15:16:56 -0000	1.7
@@ -3,3 +3,4 @@ prewikka-0.9.13.tar.gz
 prewikka-0.9.14.tar.gz
 prewikka-0.9.15.tar.gz
 prewikka-0.9.17.tar.gz
+prewikka-0.9.17.1.tar.gz


Index: prewikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/devel/prewikka.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- prewikka.spec	26 Jul 2009 19:25:02 -0000	1.12
+++ prewikka.spec	29 Sep 2009 15:16:57 -0000	1.13
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           prewikka
-Version:        0.9.17
-Release:        2%{?dist}
+Version:        0.9.17.1
+Release:        1%{?dist}
 Summary:        Graphical front-end analysis console for the Prelude Hybrid IDS Framework
 Group:          Applications/Internet
 License:        GPLv2+
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %doc AUTHORS README NEWS HACKING.README README.fedora  
 
 %changelog
+* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 0.9.17.1-1
+- new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jul 2009 19:48:24 -0000	1.6
+++ sources	29 Sep 2009 15:16:57 -0000	1.7
@@ -1 +1 @@
-836cb59861d5ef9bef88ca2da170b8cd  prewikka-0.9.17.tar.gz
+65cfcd0fc4f1f328443f05ad6d4e9cd8  prewikka-0.9.17.1.tar.gz



From hadess at fedoraproject.org  Tue Sep 29 15:18:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 15:18:40 +0000 (UTC)
Subject: rpms/totem-pl-parser/F-12 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 totem-pl-parser.spec, 1.46, 1.47
Message-ID: <20090929151840.80BD011C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem-pl-parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30354

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	21 Sep 2009 11:03:04 -0000	1.25
+++ .cvsignore	29 Sep 2009 15:18:40 -0000	1.26
@@ -1 +1 @@
-totem-pl-parser-2.28.0.tar.bz2
+totem-pl-parser-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	21 Sep 2009 11:03:04 -0000	1.25
+++ sources	29 Sep 2009 15:18:40 -0000	1.26
@@ -1 +1 @@
-a40cbd7e57a3369e2b190d4797c9cbce  totem-pl-parser-2.28.0.tar.bz2
+bd4ef8ce1cd3c467cd6adc2835f027bc  totem-pl-parser-2.28.1.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/totem-pl-parser.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- totem-pl-parser.spec	21 Sep 2009 11:14:54 -0000	1.46
+++ totem-pl-parser.spec	29 Sep 2009 15:18:40 -0000	1.47
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
-Version:	2.28.0
-Release:	2%{?dist}
+Version:	2.28.1
+Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
 - Update source URL
 



From jwilson at fedoraproject.org  Tue Sep 29 15:21:35 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 29 Sep 2009 15:21:35 +0000 (UTC)
Subject: rpms/cpuspeed/F-10 cpuspeed.init,1.41,1.42 cpuspeed.spec,1.72,1.73
Message-ID: <20090929152135.ED13411C043A@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31655

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.5-12
- Move buildroot dir creation to %install

* Fri Jun 26 2009 Jarod Wilson <jarod at redhat.com> 1.5-10
- Fix #505837 for real this time, even tested on an actual
  p4-clockmod system, seems to DTRT



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-10/cpuspeed.init,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- cpuspeed.init	3 Nov 2008 20:34:41 -0000	1.41
+++ cpuspeed.init	29 Sep 2009 15:21:34 -0000	1.42
@@ -1,9 +1,26 @@
 #!/bin/sh
-# Startup script for cpuspeed
+
+# the following is the LSB init header see
+# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
+#
+### BEGIN INIT INFO
+# Provides: cpuspeed
+# Should-Start: 
+# Default-Start: 1 2 3 4 5
+# Short-Description: processor frequency scaling support
+# Description: This script enables/disables processor frequency
+#              scaling support, either using the cpuspeed daemon
+#              or in-kernel frequency scaling support
+### END INIT INFO
+
+# the following is the chkconfig init header
+#
+# cpuspeed: processor frequency scaling support
 #
 # chkconfig: 12345 06 99
 # description: Run dynamic CPU speed daemon and/or load appropriate
 #              cpu frequency scaling kernel modules and/or governors
+#
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -37,10 +54,17 @@ some_file_exist() {
 governor_is_module() {
   # Check to see if the requested cpufreq governor
   # is provided as a kernel module or not
-  module_info=`/sbin/modinfo cpufreq-${governor}`
+  module_info=`/sbin/modinfo cpufreq-${governor} > /dev/null 2>&1`
   return $?
 }
 
+is_p4_clockmod() {
+  if [ `/sbin/lsmod | grep -c -w "p4.clockmod"` -ge 1 -a -d "/sys/devices/system/cpu/cpu0/thermal_throttle" ]; then
+    return 0
+  fi
+  return 1
+}
+
 governor_module_loaded() {
 # Check to see if we have a module loaded for
 # the current cpufreq governor
@@ -81,7 +105,7 @@ start_cpuspeed() {
   else
     DOWN_THRESHOLD=80
   fi
-  OPTS="$OPTS -p $UP_THRESHOLD $DOWN_THRESHOLD"
+  OPTS="$OPTS -r -p $UP_THRESHOLD $DOWN_THRESHOLD"
   if [ -n "$MIN_SPEED" ]; then
     OPTS="$OPTS -m $MIN_SPEED"
   fi
@@ -110,6 +134,11 @@ stop_cpuspeed() {
 }
 
 start() {
+  if [ $(id -u) -ne 0 ]; then
+    echo -n "Insufficient privileges to start cpuspeed service: "
+    failure; echo
+    return 4
+  fi
   if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then
     cpu_vendor=$(awk '/vendor_id/{print $3}' /proc/cpuinfo | tail -n 1)
     cpu_family=$(awk '/cpu family/{print $4}' /proc/cpuinfo | tail -n 1)
@@ -154,7 +183,9 @@ start() {
         default_governor=ondemand
         ;;
       p4-clockmod)
-        default_governor=none
+        # not actually a governor, we want to bail without doing either
+	# in-kernel scaling or starting up the cpuspeed daemon in this case
+        default_governor=p4passive
         ;;
       *)
         default_governor=userspace
@@ -162,6 +193,12 @@ start() {
     esac
     governor=${GOVERNOR:-${default_governor}}
 
+    if [ "${governor}" == "p4passive" ]; then
+      echo -n "Enabling p4-clockmod driver (passive cooling only): "
+      success; echo
+      return 0
+    fi
+
     # Load governor module, if need be, and validate
     governor_is_module && /sbin/modprobe cpufreq-${governor}
     if [ `grep -c -w ${governor} ${cpu0freqd}/scaling_available_governors` -ge 1 ]; then
@@ -180,10 +217,6 @@ start() {
     if [ "${governor}" == "userspace" ]; then
       start_cpuspeed
       RETVAL=$?
-    elif [ "${drv}" == "p4-clockmod" -a "${governor}" == "none" ]; then
-      echo -n "Enabling p4-clockmod driver (passive cooling only): "
-      success
-      RETVAL=0
     else
       if [ -n "$MIN_SPEED" ]; then
         adjust_cpufreq scaling_min_freq $MIN_SPEED
@@ -219,6 +252,16 @@ start() {
 }
 
 stop() {
+  if [ $(id -u) -ne 0 ]; then
+    echo -n "Insufficient privileges to stop cpuspeed service: "
+    failure; echo
+    return 4
+  fi
+  is_p4_clockmod && p4status="true"
+  if [ "$p4status" == "true" -a "x${GOVERNOR}" == "x" ]; then
+    echo "p4-clockmod passive cooling support cannot be stopped"
+    return 0
+  fi
   [ ! -f ${cpu0freqd}/scaling_driver ] && return 0
   drv=`cat ${cpu0freqd}/scaling_driver`
   governor_module_loaded && module_loaded=true
@@ -256,22 +299,30 @@ case "$1" in
     ;;
 
   status)
+    is_p4_clockmod && p4status="true"
+    if [ "$p4status" == "true" -a "x${GOVERNOR}" == "x" ]; then
+      echo "p4-clockmod passive cooling is enabled"
+      exit 0
+    fi
     governor_module_loaded && module_loaded=true
     if [ -d "$xendir" ]; then
       echo "Frequency scaling not supported under xen kernels"
+      RETVAL=0
     elif [ $module_loaded == true -o ${governor} == "performance" ]; then
       echo "Frequency scaling enabled using ${governor} governor"
+      RETVAL=0
     else
       status $prog
+      RETVAL="$?"
     fi
     ;;
 
-  restart)
+  restart|reload|force-reload)
     stop
     start
     ;;
 
-  condrestart)
+  condrestart|try-restart)
     governor_module_loaded && module_loaded=true
     if [ $module_loaded == true -o -n "`pidof $prog`" -o ${governor} == "performance" ]; then
       stop
@@ -281,7 +332,7 @@ case "$1" in
 
   *)
     echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 3
+    exit 2
     ;;
 esac
 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-10/cpuspeed.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- cpuspeed.spec	3 Nov 2008 20:34:41 -0000	1.72
+++ cpuspeed.spec	29 Sep 2009 15:21:35 -0000	1.73
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        2%{?dist}
+Release:        12%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -17,7 +17,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
 BuildRequires:  automake util-linux groff gettext
-ExclusiveArch:	i386 x86_64 ppc ppc64 ia64 sparcv9 sparc64
+ExclusiveArch:	%{ix86} x86_64 ppc ppc64 ia64 sparcv9 sparc64
 Obsoletes:	kernel-utils
 
 Patch1:         cpuspeed-1.5-Makefile.patch
@@ -42,15 +42,15 @@ cp %{SOURCE1} .
 %build
 rm -rf $RPM_BUILD_ROOT
 
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/g')
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-Wl,-z,relro,-z,now"
+
+%install
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
 
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/g')
-make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-Wl,-z,relro,-z,now"
-
-%install
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/cpuspeed
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/cpuspeed
@@ -81,6 +81,42 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.5-12
+- Move buildroot dir creation to %%install
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 26 2009 Jarod Wilson <jarod at redhat.com> 1.5-10
+- Fix #505837 for real this time, even tested on an actual
+  p4-clockmod system, seems to DTRT
+
+* Mon Jun 22 2009 Jarod Wilson <jarod at redhat.com> 1.5-9
+- Un-pooch fix for #505837 (caused #507216 and didn't work right
+  to begin with...)
+
+* Wed Jun 17 2009 Jarod Wilson <jarod at redhat.com> 1.5-8
+- Let p4-clockmod users override defaults and set a governor,
+  even if its generally a Bad Idea... (#505837)
+
+* Wed Jun 10 2009 Jarod Wilson <jarod at redhat.com> 1.5-7
+- Fix up lsb compliance a bit (#246895)
+- Correct a few more exit codes (rhel5 bz, #495049)
+
+* Tue Mar 17 2009 Jarod Wilson <jarod at redhat.com> 1.5-6
+- Fix up prior fix-up so that status and stop actually do the right thing
+  on NON-p4-clockmod systems
+
+* Fri Mar 06 2009 Jarod Wilson <jarod at redhat.com> 1.5-5
+- Fix up p4-clockmod support so start/stop/status actually report
+  something sane to the user
+
+* Mon Mar 02 2009 Jarod Wilson <jarod at redhat.com> 1.5-4
+- Fix up ExclusiveArch, now that 32-bit x86 is built i586 for F11
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Nov 03 2008 Jarod Wilson <jarod at redhat.com> 1.5-2
 - Revive p4-clockmod support, for passive cooling only, when
   all else fails on Intel boxes



From jgarzik at fedoraproject.org  Tue Sep 29 15:23:23 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 29 Sep 2009 15:23:23 +0000 (UTC)
Subject: rpms/cld/devel .cvsignore, 1.4, 1.5 cld.spec, 1.20, 1.21 sources,
	1.15, 1.16
Message-ID: <20090929152323.B5D9611C00C1@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32495

Modified Files:
	.cvsignore cld.spec sources 
Log Message:
update to upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2009 16:26:51 -0000	1.4
+++ .cvsignore	29 Sep 2009 15:23:23 -0000	1.5
@@ -1 +1 @@
-cld-0.2.1.tar.gz
+cld-0.3git.tar.gz


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- cld.spec	27 Aug 2009 07:16:03 -0000	1.20
+++ cld.spec	29 Sep 2009 15:23:23 -0000	1.21
@@ -1,13 +1,15 @@
 Name:		cld
-Version:	0.2.1
-Release:	2%{?dist}
+Version:	0.3
+Release:	0.1.g232df337%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-Source0:	cld-%{version}.tar.gz
+# pulled from upstream git, commit 232df337e0063a64315aff67073e1fd69db2b19a
+# to recreate tarball, check out commit, then run "make dist"
+Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
 Source3:	cld.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +40,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n cld-0.3git
 
 %build
 %configure --disable-static
@@ -99,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.1.g232df337
+- update to 0.3git commit 232df337e0063a64315aff67073e1fd69db2b19a
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.1-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	26 Aug 2009 16:26:51 -0000	1.15
+++ sources	29 Sep 2009 15:23:23 -0000	1.16
@@ -1 +1 @@
-129757026dd287ff9ea030e457ab51cc  cld-0.2.1.tar.gz
+b4a113731e28a5c63efa6dac3bd3620d  cld-0.3git.tar.gz



From jsafrane at fedoraproject.org  Tue Sep 29 15:23:39 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue, 29 Sep 2009 15:23:39 +0000 (UTC)
Subject: rpms/net-snmp/devel .cvsignore,1.25,1.26 sources,1.25,1.26
Message-ID: <20090929152339.219A411C00C1@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32604

Modified Files:
	.cvsignore sources 
Log Message:
- update to Net-SNMP 5.5
- remove static libraries from -devel subpackage
- rediff all patches to 5.5, remove unused/obsolete patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	3 Nov 2008 09:01:59 -0000	1.25
+++ .cvsignore	29 Sep 2009 15:23:38 -0000	1.26
@@ -1 +1 @@
-net-snmp-5.4.2.1.tar.gz
+net-snmp-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	3 Nov 2008 09:01:59 -0000	1.25
+++ sources	29 Sep 2009 15:23:38 -0000	1.26
@@ -1 +1 @@
-984932520143f0c8bf7b7ce1fc9e1da1  net-snmp-5.4.2.1.tar.gz
+5b2551e7bd024fbbee84dca22a5f13a1  net-snmp-5.5.tar.gz



From twaugh at fedoraproject.org  Tue Sep 29 15:25:48 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 15:25:48 +0000 (UTC)
Subject: rpms/hplip/devel hplip-device-reconnected.patch, NONE,
	1.1 hplip.spec, 1.238, 1.239
Message-ID: <20090929152548.2767C11C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv546

Modified Files:
	hplip.spec 
Added Files:
	hplip-device-reconnected.patch 
Log Message:
* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
- Give up trying to print a job to a reconnected device (bug #515481).


hplip-device-reconnected.patch:
 hp.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE hplip-device-reconnected.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.device-reconnected	2009-09-29 16:02:14.717467334 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-09-29 16:02:20.019342096 +0100
@@ -638,6 +638,7 @@ int main(int argc, char *argv[])
    HPMUD_DEVICE hd=-1;
    HPMUD_CHANNEL cd=-1;
    int n, total=0, retry=0, size, pages;
+   int consecutive_failures=0;
    enum HPMUD_RESULT stat;
    char *printer = getenv("PRINTER"); 
    
@@ -789,10 +790,23 @@ int main(int argc, char *argv[])
                /* IO error, get printer status. */
                if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3]))
                   goto bugout;
+
+               if (++consecutive_failures == 5)
+               {
+                  /* hpmud_write_channel has failed several times in
+                   * succession but the Device ID-based status says
+                   * the printer is happy.  Time to face the fact that
+                   * the device has probably reconnected, and our USB
+                   * channel is invalidated. */
+
+                  BUG("ERROR: device reconnected?");
+                  goto bugout;
+               }
             }
             else
             {
                /* Data was sent to device successfully. */ 
+               consecutive_failures = 0;
                if (pa.pjl_device)
                {
                   /* Laserjets have a large data buffer, so manually check for operator intervention condition. */


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- hplip.spec	23 Sep 2009 09:32:54 -0000	1.238
+++ hplip.spec	29 Sep 2009 15:25:47 -0000	1.239
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -23,6 +23,7 @@ Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
+Patch11: hplip-device-reconnected.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
+# Give up trying to print a job to a reconnected device (bug #515481).
+%patch11 -p1 -b .device-reconnected
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -345,6 +349,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
+- Give up trying to print a job to a reconnected device (bug #515481).
+
 * Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
 - Enable parallel port support when configuring (bug #524979).
 



From hadess at fedoraproject.org  Tue Sep 29 15:26:14 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 15:26:14 +0000 (UTC)
Subject: rpms/totem/devel .cvsignore, 1.78, 1.79 sources, 1.78,
	1.79 totem.spec, 1.261, 1.262
Message-ID: <20090929152614.F20AF11C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv716

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	21 Sep 2009 12:11:53 -0000	1.78
+++ .cvsignore	29 Sep 2009 15:26:14 -0000	1.79
@@ -1 +1 @@
-totem-2.28.0.tar.bz2
+totem-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	21 Sep 2009 12:11:53 -0000	1.78
+++ sources	29 Sep 2009 15:26:14 -0000	1.79
@@ -1 +1 @@
-481d56b78b351606cf6c75d923776a75  totem-2.28.0.tar.bz2
+42f071fcf8ffc471beb3e1689297d647  totem-2.28.1.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- totem.spec	26 Sep 2009 00:54:53 -0000	1.261
+++ totem.spec	29 Sep 2009 15:26:14 -0000	1.262
@@ -5,8 +5,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.28.0
-Release: 4%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -380,6 +380,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4
 - More requires
 



From nsantos at fedoraproject.org  Tue Sep 29 15:27:28 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 15:27:28 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.103,1.104
Message-ID: <20090929152728.CA24511C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1009

Modified Files:
	qpidc.spec 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- qpidc.spec	29 Sep 2009 14:57:38 -0000	1.103
+++ qpidc.spec	29 Sep 2009 15:27:28 -0000	1.104
@@ -407,17 +407,17 @@ rm -rf %{buildroot}
 
 %files -n qmf
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so.3
-%_libdir/libqmfcommon.so.3.0.0
-%_libdir/libqmfagent.so.3
-%_libdir/libqmfagent.so.3.0.0
+%_libdir/libqmf.so.1
+%_libdir/libqmf.so.1.0.0
+%_libdir/libqmfengine.so.1
+%_libdir/libqmfengine.so.1.0.0
 %_libdir/libqmfconsole.so.3
 %_libdir/libqmfconsole.so.3.0.0
 
 %files -n qmf-devel
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so
-%_libdir/libqmfagent.so
+%_libdir/libqmf.so
+%_libdir/libqmfengine.so
 %_libdir/libqmfconsole.so
 %_bindir/qmf-gen
 %{python_sitelib}/qmfgen



From sgrubb at fedoraproject.org  Tue Sep 29 15:29:14 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 15:29:14 +0000 (UTC)
Subject: rpms/prewikka/F-12 prewikka.spec,1.12,1.13 sources,1.6,1.7
Message-ID: <20090929152914.A4F9311C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prewikka/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1303

Modified Files:
	prewikka.spec sources 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 0.9.17.1-1
- new upstream release



Index: prewikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/F-12/prewikka.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- prewikka.spec	26 Jul 2009 19:25:02 -0000	1.12
+++ prewikka.spec	29 Sep 2009 15:29:14 -0000	1.13
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           prewikka
-Version:        0.9.17
-Release:        2%{?dist}
+Version:        0.9.17.1
+Release:        1%{?dist}
 Summary:        Graphical front-end analysis console for the Prelude Hybrid IDS Framework
 Group:          Applications/Internet
 License:        GPLv2+
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %doc AUTHORS README NEWS HACKING.README README.fedora  
 
 %changelog
+* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 0.9.17.1-1
+- new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jul 2009 19:48:24 -0000	1.6
+++ sources	29 Sep 2009 15:29:14 -0000	1.7
@@ -1 +1 @@
-836cb59861d5ef9bef88ca2da170b8cd  prewikka-0.9.17.tar.gz
+65cfcd0fc4f1f328443f05ad6d4e9cd8  prewikka-0.9.17.1.tar.gz



From cweyl at fedoraproject.org  Tue Sep 29 15:31:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 29 Sep 2009 15:31:40 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/F-12
	perl-POE-Component-Client-Keepalive.spec, 1.12, 1.13
Message-ID: <20090929153140.30C6111C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1773

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
* Tue Sep 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-2
- fix provides version (for perl-POE-Component-Client-HTTP)



Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-POE-Component-Client-Keepalive.spec	27 Sep 2009 09:01:18 -0000	1.12
+++ perl-POE-Component-Client-Keepalive.spec	29 Sep 2009 15:31:39 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-Keepalive
 Version:        0.260
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manages and keeps alive client connections
 
 Group:          Development/Libraries
@@ -19,7 +19,7 @@ BuildRequires:  perl(POE::Component::Cli
 BuildRequires:  perl(Net::IP) >= 1.25
 
 # Satisfy automaticly generated requires that want this module >= 0.0901
-Provides:       perl(POE::Component::Client::Keepalive) = %{version}
+Provides:       perl(POE::Component::Client::Keepalive) = %{version}0
 
 ### auto-added reqs!
 Requires:       perl(Net::IP) >= 1.25
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Sep 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-2
+- fix provides version (for perl-POE-Component-Client-HTTP)
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-1
 - update filtering
 - auto-update to 0.260 (by cpan-spec-update 0.01)



From mtasaka at fedoraproject.org  Tue Sep 29 15:33:06 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Sep 2009 15:33:06 +0000 (UTC)
Subject: rpms/kazehakase/F-11
	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch,
	NONE, 1.1 kazehakase-0.5.8-gtkver.patch, NONE, 1.1 .cvsignore,
	1.30, 1.31 kazehakase.spec, 1.88, 1.89 sources, 1.30,
	1.31 kazehakase-0.5.7-gtk0218.patch, 1.1, NONE
Message-ID: <20090929153306.C404311C00C1@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2109

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch 
	kazehakase-0.5.8-gtkver.patch 
Removed Files:
	kazehakase-0.5.7-gtk0218.patch 
Log Message:
* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
- Update to 0.5.8


kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch ---
Index: libegg/pixbufthumbnail/Makefile.am
===================================================================
--- libegg/pixbufthumbnail/Makefile.am	(revision 938)
+++ libegg/pixbufthumbnail/Makefile.am	(working copy)
@@ -26,7 +26,7 @@
 
 testeggpixbufthumbnail_LDADD = \
 	$(EGG_LIBS) \
-	$(top_builddir)/libegg/pixbufthumbnail/libeggpixbufthumbnail.la
+	libeggpixbufthumbnail.la
 
 testeggpixbufthumbnail_SOURCES = \
 	testeggpixbufthumbnail.c

kazehakase-0.5.8-gtkver.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kazehakase-0.5.8-gtkver.patch ---
--- kazehakase-0.5.8/configure.ac.gtk	2009-09-29 12:41:32.000000000 +0900
+++ kazehakase-0.5.8/configure.ac	2009-09-30 00:05:53.000000000 +0900
@@ -100,7 +100,7 @@
 dnl **************************************************************
 dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
 dnl in MODULES, pass to pkg-config
-AM_PATH_GTK_2_0(2.17.7, , ,[gthread])
+AM_PATH_GTK_2_0(2.14.0, , ,[gthread])
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	29 Aug 2009 11:28:12 -0000	1.30
+++ .cvsignore	29 Sep 2009 15:33:06 -0000	1.31
@@ -1 +1 @@
-kazehakase-0.5.7.tar.gz
+kazehakase-0.5.8.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kazehakase.spec	9 Sep 2009 18:15:00 -0000	1.88
+++ kazehakase.spec	29 Sep 2009 15:33:06 -0000	1.89
@@ -12,7 +12,7 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%undefine		usesvn		
+#%%define		usesvn		0
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
@@ -30,14 +30,15 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		43338
-%define		svnver		3783_trunk
+%define		repoid		43802
+%define		svnver		3859_trunk
+
 
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define		fedorarel	2
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -45,9 +46,11 @@
 %define		support_webkit	0
 %endif
 
+# Patch17 needs autotools
+%define		need_autogen	1
 
 Name:		kazehakase
-Version:	0.5.7
+Version:	0.5.8
 #
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
@@ -62,10 +65,12 @@ Source0:	http://dl.sourceforge.jp/kazeha
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 %if 0%{?fedora} <= 11
-Patch15:	kazehakase-0.5.7-gtk0218.patch
+Patch15:	kazehakase-0.5.8-gtkver.patch
 %endif
+Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	dbus-devel
 BuildRequires:	expat-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	gtk2-devel
@@ -122,6 +127,9 @@ This package uses Gecko for HTML renderi
 %package	base
 Summary:	Base package of Kazehakase
 Group:		Applications/Internet
+%if %{support_ruby} < 1
+Obsoletes:	%{name}-ruby < %{version}-%{release}
+%endif
 
 %description	base
 This package contains base files for Kazehakase.
@@ -188,9 +196,9 @@ This package uses WebKit for HTML render
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
 %if 0%{?fedora} <= 11
-# Reverse!!
-%patch15 -p0 -b .gtk -R
+%patch15 -p1 -b .gtk
 %endif
+%patch17 -p0 -b .libegg_mak
 
 %if %{need_autogen}
 sh autogen.sh
@@ -243,20 +251,31 @@ EOF
 %build
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
+rm -rf builddir ; mkdir builddir
+pushd builddir
+ln -sf ../configure
+
 # --disable-shave is to make build.log more verbose
 %configure \
+	--srcdir=$(pwd)/.. \
 	--disable-shave \
 	--enable-migemo \
+%if %{support_ruby} < 1
+	--with-ruby=no \
+%endif
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
-%{__make} -C libegg -k # not parallel make
 %{__make} %{?_smp_mflags} -k
+popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
+
+pushd builddir
 %{__make} install DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL="%{__install} -c -p"
+popd
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.so
 find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f
@@ -284,10 +303,13 @@ desktop-file-install \
 %config(noreplace) %{_sysconfdir}/%{name}/mozilla/*.xml
 
 %{_bindir}/%{name}
+%{_bindir}/kz-embed-process
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/embed/
 %dir %{_libdir}/%{name}/search/
+
 %{_libdir}/%{name}/libkazehakase.so.*
+%{_libdir}/%{name}/embed/per_process.so
 
 %dir %{_datadir}/%{name}/
 %if %{support_ruby}
@@ -331,6 +353,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
+- Update to 0.5.8
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.5.7-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	29 Aug 2009 11:28:12 -0000	1.30
+++ sources	29 Sep 2009 15:33:06 -0000	1.31
@@ -1 +1 @@
-1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz
+22d831982ebe010338907381caee8fdf  kazehakase-0.5.8.tar.gz


--- kazehakase-0.5.7-gtk0218.patch DELETED ---



From hadess at fedoraproject.org  Tue Sep 29 15:34:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 29 Sep 2009 15:34:54 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 totem-pl-parser.spec, 1.46, 1.47
Message-ID: <20090929153454.8FAE711C00C1@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-serv2413

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	21 Sep 2009 11:03:04 -0000	1.25
+++ .cvsignore	29 Sep 2009 15:34:54 -0000	1.26
@@ -1 +1 @@
-totem-pl-parser-2.28.0.tar.bz2
+totem-pl-parser-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	21 Sep 2009 11:03:04 -0000	1.25
+++ sources	29 Sep 2009 15:34:54 -0000	1.26
@@ -1 +1 @@
-a40cbd7e57a3369e2b190d4797c9cbce  totem-pl-parser-2.28.0.tar.bz2
+bd4ef8ce1cd3c467cd6adc2835f027bc  totem-pl-parser-2.28.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.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- totem-pl-parser.spec	21 Sep 2009 11:14:54 -0000	1.46
+++ totem-pl-parser.spec	29 Sep 2009 15:34:54 -0000	1.47
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
-Version:	2.28.0
-Release:	2%{?dist}
+Version:	2.28.1
+Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
 - Update source URL
 



From twaugh at fedoraproject.org  Tue Sep 29 15:34:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 15:34:58 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip-device-reconnected.patch, NONE, 1.1 hplip.spec,
	1.238, 1.239
Message-ID: <20090929153458.2CC6D11C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2433

Modified Files:
	hplip.spec 
Added Files:
	hplip-device-reconnected.patch 
Log Message:
* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
- Give up trying to print a job to a reconnected device (bug #515481).


hplip-device-reconnected.patch:
 hp.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE hplip-device-reconnected.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.device-reconnected	2009-09-29 16:02:14.717467334 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-09-29 16:02:20.019342096 +0100
@@ -638,6 +638,7 @@ int main(int argc, char *argv[])
    HPMUD_DEVICE hd=-1;
    HPMUD_CHANNEL cd=-1;
    int n, total=0, retry=0, size, pages;
+   int consecutive_failures=0;
    enum HPMUD_RESULT stat;
    char *printer = getenv("PRINTER"); 
    
@@ -789,10 +790,23 @@ int main(int argc, char *argv[])
                /* IO error, get printer status. */
                if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3]))
                   goto bugout;
+
+               if (++consecutive_failures == 5)
+               {
+                  /* hpmud_write_channel has failed several times in
+                   * succession but the Device ID-based status says
+                   * the printer is happy.  Time to face the fact that
+                   * the device has probably reconnected, and our USB
+                   * channel is invalidated. */
+
+                  BUG("ERROR: device reconnected?");
+                  goto bugout;
+               }
             }
             else
             {
                /* Data was sent to device successfully. */ 
+               consecutive_failures = 0;
                if (pa.pjl_device)
                {
                   /* Laserjets have a large data buffer, so manually check for operator intervention condition. */


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- hplip.spec	23 Sep 2009 09:32:54 -0000	1.238
+++ hplip.spec	29 Sep 2009 15:34:58 -0000	1.239
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -23,6 +23,7 @@ Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
+Patch11: hplip-device-reconnected.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
+# Give up trying to print a job to a reconnected device (bug #515481).
+%patch11 -p1 -b .device-reconnected
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -345,6 +349,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
+- Give up trying to print a job to a reconnected device (bug #515481).
+
 * Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
 - Enable parallel port support when configuring (bug #524979).
 



From jwilson at fedoraproject.org  Tue Sep 29 15:36:03 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 29 Sep 2009 15:36:03 +0000 (UTC)
Subject: rpms/cpuspeed/F-11 cpuspeed.spec,1.79,1.80
Message-ID: <20090929153603.DE67011C00C1@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2734

Modified Files:
	cpuspeed.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.5-12
- Move buildroot dir creation to %install



Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-11/cpuspeed.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- cpuspeed.spec	30 Jun 2009 18:47:06 -0000	1.79
+++ cpuspeed.spec	29 Sep 2009 15:36:03 -0000	1.80
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        10%{?dist}
+Release:        12%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -42,15 +42,15 @@ cp %{SOURCE1} .
 %build
 rm -rf $RPM_BUILD_ROOT
 
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/g')
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-Wl,-z,relro,-z,now"
+
+%install
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
 
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/g')
-make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-Wl,-z,relro,-z,now"
-
-%install
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/cpuspeed
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/cpuspeed
@@ -81,6 +81,12 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.5-12
+- Move buildroot dir creation to %%install
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 26 2009 Jarod Wilson <jarod at redhat.com> 1.5-10
 - Fix #505837 for real this time, even tested on an actual
   p4-clockmod system, seems to DTRT



From sgrubb at fedoraproject.org  Tue Sep 29 15:37:50 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 15:37:50 +0000 (UTC)
Subject: rpms/libprelude/F-12 .cvsignore, 1.19, 1.20 libprelude.spec, 1.48, 
	1.49 sources, 1.20, 1.21
Message-ID: <20090929153750.7F30411C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3020

Modified Files:
	.cvsignore libprelude.spec sources 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Jul 2009 19:35:32 -0000	1.19
+++ .cvsignore	29 Sep 2009 15:37:49 -0000	1.20
@@ -14,3 +14,4 @@ libprelude-0.9.21.2.tar.gz
 libprelude-0.9.22.tar.gz
 libprelude-0.9.23.tar.gz
 libprelude-0.9.24.tar.gz
+libprelude-0.9.24.1.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-12/libprelude.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libprelude.spec	11 Aug 2009 15:23:48 -0000	1.48
+++ libprelude.spec	29 Sep 2009 15:37:50 -0000	1.49
@@ -4,8 +4,8 @@
 
 
 Name:		libprelude
-Version:	0.9.24
-Release:	3%{?dist}
+Version:	0.9.24.1
+Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -141,6 +141,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24.1-1
+- New upstream release
+
 * Sat Aug 8 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.24-3
 - adjust to build in EL-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	9 Jul 2009 19:35:32 -0000	1.20
+++ sources	29 Sep 2009 15:37:50 -0000	1.21
@@ -1 +1 @@
-f38ab003f16391a0e397568cddfbf169  libprelude-0.9.24.tar.gz
+07868b3d54fa8243455a27da6b87239c  libprelude-0.9.24.1.tar.gz



From twoerner at fedoraproject.org  Tue Sep 29 15:39:00 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 29 Sep 2009 15:39:00 +0000 (UTC)
Subject: rpms/system-config-firewall/F-12 .cvsignore, 1.31, 1.32 sources,
	1.34, 1.35 system-config-firewall.spec, 1.46, 1.47
Message-ID: <20090929153900.2A38011C00C1@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3207

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- new sub-package base containing the base components and the command line tool
  (rhbz#525153)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	29 Sep 2009 11:34:03 -0000	1.31
+++ .cvsignore	29 Sep 2009 15:38:59 -0000	1.32
@@ -4,3 +4,4 @@ system-config-firewall-1.2.16.tar.bz2
 system-config-firewall-1.2.17.tar.bz2
 system-config-firewall-1.2.18.tar.bz2
 system-config-firewall-1.2.19.tar.bz2
+system-config-firewall-1.2.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	29 Sep 2009 11:34:03 -0000	1.34
+++ sources	29 Sep 2009 15:39:00 -0000	1.35
@@ -1 +1 @@
-1a224404975799a54246c8c23886c39f  system-config-firewall-1.2.19.tar.bz2
+9bff633034ef0df084fe3120002f08b0  system-config-firewall-1.2.20.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/system-config-firewall.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- system-config-firewall.spec	29 Sep 2009 11:34:03 -0000	1.46
+++ system-config-firewall.spec	29 Sep 2009 15:39:00 -0000	1.47
@@ -15,7 +15,7 @@
 
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.19
+Version: 1.2.20
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -29,10 +29,10 @@ BuildRequires: gettext
 BuildRequires: intltool
 Obsoletes: system-config-securitylevel
 Provides: system-config-securitylevel = 1.7.0
-Requires: pygtk2
-Requires: python
+Requires: system-config-firewall-base = %{version}-%{release}
 Requires: system-config-firewall-tui = %{version}-%{release}
 Requires: hicolor-icon-theme
+Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: gtk2 >= 2.6
 %if %{with usermode}
@@ -48,29 +48,36 @@ Requires: python-slip-dbus >= 0.2.7
 %description
 system-config-firewall is a graphical user interface for basic firewall setup.
 
-%package tui
-Summary: A text interface for basic firewall setup
+%package base
+Summary: system-config-firewall base components and command line tool
 Group: System Environment/Base
 Obsoletes: lokkit
-Obsoletes: system-config-securitylevel-tui
 Provides: lokkit = 1.7.0
-Provides: system-config-securitylevel-tui = 1.7.0
+Requires: python
 Requires: iptables >= 1.2.8
 Requires: iptables-ipv6
+Requires: libselinux >= 1.19.1
+
+%description base
+Base components of system-config-firewall with lokkit, the command line tool 
+for basic firewall setup.
+
+%package tui
+Summary: A text interface for basic firewall setup
+Group: System Environment/Base
+Obsoletes: system-config-securitylevel-tui
+Provides: system-config-securitylevel-tui = 1.7.0
+Requires: system-config-firewall-base = %{version}-%{release}
 Requires: system-config-network-tui
 Requires: newt
-Requires: libselinux >= 1.19.1
 
 %description tui
-system-config-firewall-tui is a text and commandline user
-interface for basic firewall setup.
+system-config-firewall-tui is a text user interface for basic firewall setup.
 
 %prep
 %setup -q
 
 %build
-echo %{with usermode} %{with polkit0} %{with polkit1}
-
 %configure %{?with_usermode: --enable-usermode} \
 	   %{?with_polkit0: --enable-policykit0} \
 	   %{!?with_polkit1: --disable-policykit1}
@@ -136,11 +143,10 @@ fi
 %config /etc/pam.d/system-config-firewall
 %endif
 
-%files -f %{name}.lang tui
+%files base -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING
 %{_sbindir}/lokkit
-%{_bindir}/system-config-firewall-tui
 %{_datadir}/system-config-firewall/convert-config
 %dir %{_datadir}/system-config-firewall
 %defattr(0644,root,root)
@@ -156,10 +162,18 @@ fi
 %{_datadir}/system-config-firewall/fw_services.*
 %{_datadir}/system-config-firewall/fw_sysconfig.*
 %{_datadir}/system-config-firewall/fw_sysctl.*
-%{_datadir}/system-config-firewall/fw_tui.*
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
+%files tui
+%defattr(-,root,root)
+%{_bindir}/system-config-firewall-tui
+%{_datadir}/system-config-firewall/fw_tui.*
+
 %changelog
+* Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.20-1
+- new sub-package base containing the base components and the command line tool
+  (rhbz#525153)
+
 * Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.19-1
 - enhanced build environment to support usermode and policykit switches, new
   options for configure and spec file



From twoerner at fedoraproject.org  Tue Sep 29 15:39:47 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 29 Sep 2009 15:39:47 +0000 (UTC)
Subject: rpms/system-config-firewall/devel sources, 1.34,
	1.35 system-config-firewall.spec, 1.46, 1.47
Message-ID: <20090929153947.13B3311C00C1@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3429

Modified Files:
	sources system-config-firewall.spec 
Log Message:
- new sub-package base containing the base components and the command line tool
  (rhbz#525153)




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	29 Sep 2009 11:36:36 -0000	1.34
+++ sources	29 Sep 2009 15:39:46 -0000	1.35
@@ -1 +1 @@
-1a224404975799a54246c8c23886c39f  system-config-firewall-1.2.19.tar.bz2
+9bff633034ef0df084fe3120002f08b0  system-config-firewall-1.2.20.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- system-config-firewall.spec	29 Sep 2009 11:36:36 -0000	1.46
+++ system-config-firewall.spec	29 Sep 2009 15:39:46 -0000	1.47
@@ -15,7 +15,7 @@
 
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.19
+Version: 1.2.20
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -29,10 +29,10 @@ BuildRequires: gettext
 BuildRequires: intltool
 Obsoletes: system-config-securitylevel
 Provides: system-config-securitylevel = 1.7.0
-Requires: pygtk2
-Requires: python
+Requires: system-config-firewall-base = %{version}-%{release}
 Requires: system-config-firewall-tui = %{version}-%{release}
 Requires: hicolor-icon-theme
+Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: gtk2 >= 2.6
 %if %{with usermode}
@@ -48,29 +48,36 @@ Requires: python-slip-dbus >= 0.2.7
 %description
 system-config-firewall is a graphical user interface for basic firewall setup.
 
-%package tui
-Summary: A text interface for basic firewall setup
+%package base
+Summary: system-config-firewall base components and command line tool
 Group: System Environment/Base
 Obsoletes: lokkit
-Obsoletes: system-config-securitylevel-tui
 Provides: lokkit = 1.7.0
-Provides: system-config-securitylevel-tui = 1.7.0
+Requires: python
 Requires: iptables >= 1.2.8
 Requires: iptables-ipv6
+Requires: libselinux >= 1.19.1
+
+%description base
+Base components of system-config-firewall with lokkit, the command line tool 
+for basic firewall setup.
+
+%package tui
+Summary: A text interface for basic firewall setup
+Group: System Environment/Base
+Obsoletes: system-config-securitylevel-tui
+Provides: system-config-securitylevel-tui = 1.7.0
+Requires: system-config-firewall-base = %{version}-%{release}
 Requires: system-config-network-tui
 Requires: newt
-Requires: libselinux >= 1.19.1
 
 %description tui
-system-config-firewall-tui is a text and commandline user
-interface for basic firewall setup.
+system-config-firewall-tui is a text user interface for basic firewall setup.
 
 %prep
 %setup -q
 
 %build
-echo %{with usermode} %{with polkit0} %{with polkit1}
-
 %configure %{?with_usermode: --enable-usermode} \
 	   %{?with_polkit0: --enable-policykit0} \
 	   %{!?with_polkit1: --disable-policykit1}
@@ -136,11 +143,10 @@ fi
 %config /etc/pam.d/system-config-firewall
 %endif
 
-%files -f %{name}.lang tui
+%files base -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING
 %{_sbindir}/lokkit
-%{_bindir}/system-config-firewall-tui
 %{_datadir}/system-config-firewall/convert-config
 %dir %{_datadir}/system-config-firewall
 %defattr(0644,root,root)
@@ -156,10 +162,18 @@ fi
 %{_datadir}/system-config-firewall/fw_services.*
 %{_datadir}/system-config-firewall/fw_sysconfig.*
 %{_datadir}/system-config-firewall/fw_sysctl.*
-%{_datadir}/system-config-firewall/fw_tui.*
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
+%files tui
+%defattr(-,root,root)
+%{_bindir}/system-config-firewall-tui
+%{_datadir}/system-config-firewall/fw_tui.*
+
 %changelog
+* Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.20-1
+- new sub-package base containing the base components and the command line tool
+  (rhbz#525153)
+
 * Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.19-1
 - enhanced build environment to support usermode and policykit switches, new
   options for configure and spec file



From mccann at fedoraproject.org  Tue Sep 29 15:46:01 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Tue, 29 Sep 2009 15:46:01 +0000 (UTC)
Subject: rpms/ConsoleKit/devel .cvsignore, 1.17, 1.18 ConsoleKit.spec, 1.48, 
	1.49 sources, 1.20, 1.21
Message-ID: <20090929154601.63FFB11C00C1@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5271

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	31 Jul 2009 15:01:15 -0000	1.17
+++ .cvsignore	29 Sep 2009 15:46:00 -0000	1.18
@@ -1 +1 @@
-ConsoleKit-0.3.1.tar.bz2
+ConsoleKit-0.4.1.tar.bz2


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ConsoleKit.spec	1 Aug 2009 02:37:16 -0000	1.48
+++ ConsoleKit.spec	29 Sep 2009 15:46:00 -0000	1.49
@@ -5,8 +5,8 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -25,9 +25,6 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
-# fix a small memleak
-Patch0: small-fixes.patch
-
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -82,9 +79,6 @@ This package contains developer document
 
 %prep
 %setup -q
-%patch0 -p1 -b .small-fixes
-
-autoreconf -f -i
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -130,9 +124,11 @@ fi
 %{_datadir}/polkit-1/actions/*.policy
 %dir %{_sysconfdir}/ConsoleKit
 %dir %{_sysconfdir}/ConsoleKit/seats.d
+%dir %{_sysconfdir}/ConsoleKit/run-seat.d
 %dir %{_sysconfdir}/ConsoleKit/run-session.d
 %dir %{_prefix}/lib/ConsoleKit
 %dir %{_prefix}/lib/ConsoleKit/scripts
+%dir %{_prefix}/lib/ConsoleKit/run-seat.d
 %dir %{_prefix}/lib/ConsoleKit/run-session.d
 %dir %{_var}/run/ConsoleKit
 %attr(755,root,root) %dir %{_var}/log/ConsoleKit
@@ -170,6 +166,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Sep 29 2009 Jon McCann <jmccann at redhat.com> 0.4.1-1
+- Update to 0.4.1
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 0.3.1-2
 - Fix a small memory leak
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	31 Jul 2009 15:01:16 -0000	1.20
+++ sources	29 Sep 2009 15:46:00 -0000	1.21
@@ -1 +1 @@
-3ee89345f610c462806aaaae9a997683  ConsoleKit-0.3.1.tar.bz2
+48eda4483cc97841d5f88e8e003eb6d7  ConsoleKit-0.4.1.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep 29 15:53:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 15:53:09 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.15, 1.16 mutter-moblin.spec, 
	1.16, 1.17 sources, 1.15, 1.16
Message-ID: <20090929155309.D3E1B11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7799

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.40.1 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	28 Sep 2009 07:46:00 -0000	1.15
+++ .cvsignore	29 Sep 2009 15:53:09 -0000	1.16
@@ -1 +1 @@
-mutter-moblin-0.40.0.tar.bz2
+mutter-moblin-0.40.1.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mutter-moblin.spec	28 Sep 2009 07:46:01 -0000	1.16
+++ mutter-moblin.spec	29 Sep 2009 15:53:09 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.40.0
+Version:        0.40.1
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.40.1-1
+- New 0.40.1 upstream release
+
 * Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.40.0-1
 - New 0.40.0 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Sep 2009 07:46:01 -0000	1.15
+++ sources	29 Sep 2009 15:53:09 -0000	1.16
@@ -1 +1 @@
-19c91d5a6da2c03a38cab08fcf67d3a5  mutter-moblin-0.40.0.tar.bz2
+2b250212fba541db2bc8103c0a1e61af  mutter-moblin-0.40.1.tar.bz2



From nsantos at fedoraproject.org  Tue Sep 29 15:53:22 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 15:53:22 +0000 (UTC)
Subject: rpms/qpidc/F-12 so_number.patch, NONE, 1.1 qpidc.spec, 1.101,
	1.102 sources, 1.45, 1.46
Message-ID: <20090929155322.15FA611C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7925

Modified Files:
	qpidc.spec sources 
Added Files:
	so_number.patch 
Log Message:
Rebased to svn rev 819819 for F12 beta

so_number.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE so_number.patch ---
--- cpp/configure.ac	2009-09-02 10:32:57.000000000 -0400
+++ cpp/configure.ac	2009-09-29 10:27:07.393678846 -0400
@@ -112,7 +112,7 @@
 LIBS=$gl_saved_libs
 
 # Set the argument to be used in "libtool -version-info ARG".
-QPID_CURRENT=2
+QPID_CURRENT=3
 QPID_REVISION=0
 QPID_AGE=0
 LIBTOOL_VERSION_INFO_ARG=$QPID_CURRENT:$QPID_REVISION:$QPID_AGE


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/qpidc.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- qpidc.spec	25 Sep 2009 17:47:50 -0000	1.101
+++ qpidc.spec	29 Sep 2009 15:53:21 -0000	1.102
@@ -7,7 +7,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 818599
+%define qpid_svnrev 819819
 %define rhm_svnrev 3641
 
 Name:           qpidc
@@ -20,6 +20,7 @@ URL:            http://qpid.apache.org
 Source0:        %{name}-%{version}.tar.gz
 Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
 Source2:	qpidd.pp
+Patch0:		so_number.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -241,6 +242,7 @@ exit 0
 %prep
 %setup
 %setup -T -D -b 1
+%patch0
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
@@ -351,10 +353,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
-%_libdir/libqpidcommon.so.2
-%_libdir/libqpidcommon.so.2.0.0
-%_libdir/libqpidclient.so.2
-%_libdir/libqpidclient.so.2.0.0
+%_libdir/libqpidcommon.so.3
+%_libdir/libqpidcommon.so.3.0.0
+%_libdir/libqpidclient.so.3
+%_libdir/libqpidclient.so.3.0.0
 %dir %_libdir/qpid
 %dir %_libdir/qpid/client
 %dir %_sysconfdir/qpid
@@ -381,8 +383,8 @@ rm -rf %{buildroot}
 %files -n qpidd
 %defattr(-,root,root,-)
 %_datadir/selinux/packages/qpidd.pp
-%_libdir/libqpidbroker.so.2
-%_libdir/libqpidbroker.so.2.0.0
+%_libdir/libqpidbroker.so.3
+%_libdir/libqpidbroker.so.3.0.0
 %_libdir/qpid/daemon/replicating_listener.so
 %_libdir/qpid/daemon/replication_exchange.so
 %_libdir/qpid/daemon/watchdog.so
@@ -405,17 +407,17 @@ rm -rf %{buildroot}
 
 %files -n qmf
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so.2
-%_libdir/libqmfcommon.so.2.0.0
-%_libdir/libqmfagent.so.2
-%_libdir/libqmfagent.so.2.0.0
-%_libdir/libqmfconsole.so.2
-%_libdir/libqmfconsole.so.2.0.0
+%_libdir/libqmf.so.1
+%_libdir/libqmf.so.1.0.0
+%_libdir/libqmfengine.so.1
+%_libdir/libqmfengine.so.1.0.0
+%_libdir/libqmfconsole.so.3
+%_libdir/libqmfconsole.so.3.0.0
 
 %files -n qmf-devel
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so
-%_libdir/libqmfagent.so
+%_libdir/libqmf.so
+%_libdir/libqmfengine.so
 %_libdir/libqmfconsole.so
 %_bindir/qmf-gen
 %{python_sitelib}/qmfgen
@@ -442,8 +444,8 @@ rm -rf %{buildroot}
 
 %files ssl
 %defattr(-,root,root,-)
-%_libdir/libsslcommon.so.2
-%_libdir/libsslcommon.so.2.0.0
+%_libdir/libsslcommon.so.3
+%_libdir/libsslcommon.so.3.0.0
 %_libdir/qpid/client/sslconnector.so
 
 %files -n qpidd-ssl
@@ -517,6 +519,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
 * Thu Sep 24 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
 - Rebased to svn rev 818599
 - rhm-cpp-server-store obsoletes rhm top-level package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	24 Sep 2009 22:19:06 -0000	1.45
+++ sources	29 Sep 2009 15:53:21 -0000	1.46
@@ -1,2 +1,2 @@
-b9b04d4744f8e1e1bd55e62388b49e29  qpidc-0.5.818599.tar.gz
+3f1f75be166b0d752a9132622d5742a8  qpidc-0.5.819819.tar.gz
 5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz



From nphilipp at fedoraproject.org  Tue Sep 29 15:54:23 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 15:54:23 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.85, 1.86 sources,
	1.98, 1.99 system-config-services.spec, 1.100, 1.101
Message-ID: <20090929155423.9EFF911C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8154

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.41


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	14 Sep 2009 14:08:58 -0000	1.85
+++ .cvsignore	29 Sep 2009 15:54:23 -0000	1.86
@@ -1 +1 @@
-system-config-services-0.99.40.tar.bz2
+system-config-services-0.99.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	14 Sep 2009 14:08:59 -0000	1.98
+++ sources	29 Sep 2009 15:54:23 -0000	1.99
@@ -1 +1 @@
-81c097eeec959c12303cbae4421bcfa0  system-config-services-0.99.40.tar.bz2
+3184cd5b2fb7374e685b8115adae33b2  system-config-services-0.99.41.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- system-config-services.spec	14 Sep 2009 14:08:59 -0000	1.100
+++ system-config-services.spec	29 Sep 2009 15:54:23 -0000	1.101
@@ -11,7 +11,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.40
+Version: 0.99.41
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -35,7 +35,7 @@ Requires: python >= 2.3.0
 Requires: dbus-python
 Requires: python-slip >= 0.1.11
 %if %{with polkit1}
-Requires: python-slip-dbus >= 0.2.0
+Requires: python-slip-dbus >= 0.2.7
 %else
 Requires: python-slip-dbus >= 0.1.15
 %endif
@@ -118,6 +118,13 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 0.99.41-1
+- initialize subscribers at the right place
+- pick up new translations
+
+* Thu Sep 24 2009 Nils Philippsen <nils at redhat.com>
+- require python-slip-dbus >= 0.2.5
+
 * Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.40-1
 - pick up updated translations
 



From pkgdb at fedoraproject.org  Tue Sep 29 15:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 15:54:46 +0000
Subject: [pkgdb] trac ownership updated
Message-ID: <20090929155446.1479A10F874@bastion2.fedora.phx.redhat.com>

Package trac in Fedora devel is now owned by limb

To make changes to this package see:
  /pkgdb/packages/name/trac



From nphilipp at fedoraproject.org  Tue Sep 29 15:54:54 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 15:54:54 +0000 (UTC)
Subject: rpms/system-config-services/F-12 .cvsignore, 1.85, 1.86 sources,
	1.98, 1.99 system-config-services.spec, 1.100, 1.101
Message-ID: <20090929155454.8D64C11C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8356

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.41


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-12/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	14 Sep 2009 14:08:58 -0000	1.85
+++ .cvsignore	29 Sep 2009 15:54:54 -0000	1.86
@@ -1 +1 @@
-system-config-services-0.99.40.tar.bz2
+system-config-services-0.99.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-12/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	14 Sep 2009 14:08:59 -0000	1.98
+++ sources	29 Sep 2009 15:54:54 -0000	1.99
@@ -1 +1 @@
-81c097eeec959c12303cbae4421bcfa0  system-config-services-0.99.40.tar.bz2
+3184cd5b2fb7374e685b8115adae33b2  system-config-services-0.99.41.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-12/system-config-services.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- system-config-services.spec	14 Sep 2009 14:08:59 -0000	1.100
+++ system-config-services.spec	29 Sep 2009 15:54:54 -0000	1.101
@@ -11,7 +11,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.40
+Version: 0.99.41
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -35,7 +35,7 @@ Requires: python >= 2.3.0
 Requires: dbus-python
 Requires: python-slip >= 0.1.11
 %if %{with polkit1}
-Requires: python-slip-dbus >= 0.2.0
+Requires: python-slip-dbus >= 0.2.7
 %else
 Requires: python-slip-dbus >= 0.1.15
 %endif
@@ -118,6 +118,13 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 0.99.41-1
+- initialize subscribers at the right place
+- pick up new translations
+
+* Thu Sep 24 2009 Nils Philippsen <nils at redhat.com>
+- require python-slip-dbus >= 0.2.5
+
 * Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.40-1
 - pick up updated translations
 



From pbrobinson at fedoraproject.org  Tue Sep 29 15:55:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 15:55:09 +0000 (UTC)
Subject: rpms/mutter-moblin/F-12 .cvsignore, 1.15, 1.16 mutter-moblin.spec, 
	1.16, 1.17 sources, 1.15, 1.16
Message-ID: <20090929155509.F03B611C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8474

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.40.1 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	28 Sep 2009 07:46:00 -0000	1.15
+++ .cvsignore	29 Sep 2009 15:55:09 -0000	1.16
@@ -1 +1 @@
-mutter-moblin-0.40.0.tar.bz2
+mutter-moblin-0.40.1.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/F-12/mutter-moblin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mutter-moblin.spec	28 Sep 2009 07:46:01 -0000	1.16
+++ mutter-moblin.spec	29 Sep 2009 15:55:09 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.40.0
+Version:        0.40.1
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.40.1-1
+- New 0.40.1 upstream release
+
 * Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.40.0-1
 - New 0.40.0 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Sep 2009 07:46:01 -0000	1.15
+++ sources	29 Sep 2009 15:55:09 -0000	1.16
@@ -1 +1 @@
-19c91d5a6da2c03a38cab08fcf67d3a5  mutter-moblin-0.40.0.tar.bz2
+2b250212fba541db2bc8103c0a1e61af  mutter-moblin-0.40.1.tar.bz2



From nphilipp at fedoraproject.org  Tue Sep 29 15:58:48 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 15:58:48 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.75, 1.76 sources, 1.80,
	1.81 system-config-samba.spec, 1.84, 1.85
Message-ID: <20090929155848.46EAC11C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9629

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.83


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	14 Sep 2009 14:01:32 -0000	1.75
+++ .cvsignore	29 Sep 2009 15:58:47 -0000	1.76
@@ -1 +1 @@
-system-config-samba-1.2.82.tar.bz2
+system-config-samba-1.2.83.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	14 Sep 2009 14:01:33 -0000	1.80
+++ sources	29 Sep 2009 15:58:47 -0000	1.81
@@ -1 +1 @@
-97f9c087fda8a0a6f4bc15082389f739  system-config-samba-1.2.82.tar.bz2
+d9e66272fe63a27a23e3188f62f8763c  system-config-samba-1.2.83.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- system-config-samba.spec	14 Sep 2009 14:01:33 -0000	1.84
+++ system-config-samba.spec	29 Sep 2009 15:58:48 -0000	1.85
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.82
+Version: 1.2.83
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -41,7 +41,7 @@ Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
 %if %{with polkit1}
-Requires: python-slip-dbus >= 0.2.0
+Requires: python-slip-dbus >= 0.2.7
 %else
 Requires: python-slip-dbus >= 0.1.7
 %endif
@@ -112,6 +112,12 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 1.2.83-1
+- pick up new translations
+
+* Tue Sep 15 2009 Nils Philippsen <nils at redhat.com>
+- make polkit files translatable
+
 * Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.2.82-1
 - pick up updated translations
 



From nphilipp at fedoraproject.org  Tue Sep 29 15:58:50 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 15:58:50 +0000 (UTC)
Subject: rpms/system-config-samba/F-12 .cvsignore, 1.75, 1.76 sources, 1.80, 
	1.81 system-config-samba.spec, 1.84, 1.85
Message-ID: <20090929155850.7575F11C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9646

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.83


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-12/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	14 Sep 2009 14:01:32 -0000	1.75
+++ .cvsignore	29 Sep 2009 15:58:50 -0000	1.76
@@ -1 +1 @@
-system-config-samba-1.2.82.tar.bz2
+system-config-samba-1.2.83.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-12/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	14 Sep 2009 14:01:33 -0000	1.80
+++ sources	29 Sep 2009 15:58:50 -0000	1.81
@@ -1 +1 @@
-97f9c087fda8a0a6f4bc15082389f739  system-config-samba-1.2.82.tar.bz2
+d9e66272fe63a27a23e3188f62f8763c  system-config-samba-1.2.83.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-12/system-config-samba.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- system-config-samba.spec	14 Sep 2009 14:01:33 -0000	1.84
+++ system-config-samba.spec	29 Sep 2009 15:58:50 -0000	1.85
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.82
+Version: 1.2.83
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -41,7 +41,7 @@ Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
 %if %{with polkit1}
-Requires: python-slip-dbus >= 0.2.0
+Requires: python-slip-dbus >= 0.2.7
 %else
 Requires: python-slip-dbus >= 0.1.7
 %endif
@@ -112,6 +112,12 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 1.2.83-1
+- pick up new translations
+
+* Tue Sep 15 2009 Nils Philippsen <nils at redhat.com>
+- make polkit files translatable
+
 * Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.2.82-1
 - pick up updated translations
 



From twaugh at fedoraproject.org  Tue Sep 29 16:00:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 16:00:32 +0000 (UTC)
Subject: rpms/hplip/F-10 sources,1.30,1.31
Message-ID: <20090929160032.ED01C11C0423@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9992

Modified Files:
	sources 
Log Message:
Removed 2.8.10 source.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	23 Dec 2008 11:57:27 -0000	1.30
+++ sources	29 Sep 2009 16:00:32 -0000	1.31
@@ -1,2 +1 @@
-a9ad78c4f0d884caac6b176b3cb9bf21  hplip-2.8.10.tar.gz
 f6d04d4ed5c41e3e1c84e6a7af6b8db7  hplip-2.8.12.tar.gz



From twaugh at fedoraproject.org  Tue Sep 29 16:09:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 29 Sep 2009 16:09:56 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-device-reconnected.patch, NONE, 1.1 hplip.spec,
	1.232, 1.233
Message-ID: <20090929160956.DF81A11C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11925

Modified Files:
	hplip.spec 
Added Files:
	hplip-device-reconnected.patch 
Log Message:
* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
- Give up trying to print a job to a reconnected device (bug #515481).


hplip-device-reconnected.patch:
 hp.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE hplip-device-reconnected.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.device-reconnected	2009-09-29 16:02:14.717467334 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-09-29 16:02:20.019342096 +0100
@@ -638,6 +638,7 @@ int main(int argc, char *argv[])
    HPMUD_DEVICE hd=-1;
    HPMUD_CHANNEL cd=-1;
    int n, total=0, retry=0, size, pages;
+   int consecutive_failures=0;
    enum HPMUD_RESULT stat;
    char *printer = getenv("PRINTER"); 
    
@@ -789,10 +790,23 @@ int main(int argc, char *argv[])
                /* IO error, get printer status. */
                if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3]))
                   goto bugout;
+
+               if (++consecutive_failures == 5)
+               {
+                  /* hpmud_write_channel has failed several times in
+                   * succession but the Device ID-based status says
+                   * the printer is happy.  Time to face the fact that
+                   * the device has probably reconnected, and our USB
+                   * channel is invalidated. */
+
+                  BUG("ERROR: device reconnected?");
+                  goto bugout;
+               }
             }
             else
             {
                /* Data was sent to device successfully. */ 
+               consecutive_failures = 0;
                if (pa.pjl_device)
                {
                   /* Laserjets have a large data buffer, so manually check for operator intervention condition. */


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- hplip.spec	23 Sep 2009 09:40:42 -0000	1.232
+++ hplip.spec	29 Sep 2009 16:09:56 -0000	1.233
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,6 +24,7 @@ Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
+Patch11: hplip-device-reconnected.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -143,6 +144,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
+# Give up trying to print a job to a reconnected device (bug #515481).
+%patch11 -p1 -b .device-reconnected
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -360,6 +364,9 @@ fi
 exit 0
 
 %changelog
+* Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
+- Give up trying to print a job to a reconnected device (bug #515481).
+
 * Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
 - Enable parallel port support when configuring (bug #524979).
 - Fixed hp-setup traceback when discovery page is skipped (bug #523685).



From avesh at fedoraproject.org  Tue Sep 29 16:22:08 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 29 Sep 2009 16:22:08 +0000 (UTC)
Subject: rpms/pam_passwdqc/devel patch-219201.patch, NONE,
	1.1 pam_passwdqc.spec, 1.16, 1.17
Message-ID: <20090929162208.60CE011C00C1@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/pam_passwdqc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24935

Modified Files:
	pam_passwdqc.spec 
Added Files:
	patch-219201.patch 
Log Message:
* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-4
- Patch for new configurable options(rhbz# 219201): 
  disable first upper and last digit check, passwords 
  prompts can be read from a file


patch-219201.patch:
 README           |   13 ++++++++++++-
 pam_passwdqc.c   |   45 ++++++++++++++++++++++++++++++++++++++++-----
 passwdqc.h       |    3 +++
 passwdqc_check.c |   10 ++++++----
 4 files changed, 61 insertions(+), 10 deletions(-)

--- NEW FILE patch-219201.patch ---
diff -urNp pam_passwdqc-1.0.5-orig/pam_passwdqc.c pam_passwdqc-1.0.5/pam_passwdqc.c
--- pam_passwdqc-1.0.5-orig/pam_passwdqc.c	2008-02-12 15:11:13.000000000 -0500
+++ pam_passwdqc-1.0.5/pam_passwdqc.c	2009-09-28 12:10:32.171696694 -0400
@@ -70,6 +70,8 @@ typedef struct {
 	passwdqc_params_t qc;
 	int flags;
 	int retry;
+	char oldpass_prompt_file[FILE_LEN+1];
+	char newpass_prompt_file[FILE_LEN+1];
 } params_t;
 
 static params_t defaults = {
@@ -79,10 +81,13 @@ static params_t defaults = {
 		3,				/* passphrase_words */
 		4,				/* match_length */
 		1,				/* similar_deny */
-		42				/* random_bits */
+		42,				/* random_bits */
+		1				/* firstupper_lastdigit_check */
 	},
 	F_ENFORCE_EVERYONE,			/* flags */
-	3					/* retry */
+	3,					/* retry */
+	"",					/* oldpass_prompt_file */
+	""					/* newpass_prompt_file */
 };
 
 #define PROMPT_OLDPASS \
@@ -361,6 +366,37 @@ static int parse(params_t *params, pam_h
 		if (!strcmp(*argv, "use_authtok")) {
 			params->flags |= F_USE_AUTHTOK;
 		} else
+		if (!strcmp(*argv, "disable_firstupper_lastdigit_check")) {
+			params->qc.firstupper_lastdigit_check = 0;
+		} else
+		if (!strncmp(*argv, "oldpass_prompt_file=", 20)) {
+			int n;
+			FILE *fp = fopen(*argv + 20, "r");
+			if (fp) {
+				n=fread(params->oldpass_prompt_file, sizeof(char), FILE_LEN, fp);
+				if (0==n || ferror(fp)!=0 ) {
+					memset(params->oldpass_prompt_file, '\0', FILE_LEN+1);
+				}
+				else {
+					feof(fp)? (params->oldpass_prompt_file[n-1]='\0'): (params->oldpass_prompt_file[n]='\0');
+				}
+				fclose(fp);
+			}
+		} else
+		if (!strncmp(*argv, "newpass_prompt_file=", 20)) {
+			int n;
+			FILE *fp = fopen(*argv + 20, "r");
+			if (fp) {
+				n=fread(params->newpass_prompt_file, sizeof(char), FILE_LEN, fp);
+				if (0==n || ferror(fp)!=0 ) {
+					memset(params->newpass_prompt_file, '\0', FILE_LEN+1);
+				}
+				else {
+                                        feof(fp)? (params->newpass_prompt_file[n-1]='\0'): (params->newpass_prompt_file[n]='\0');
+				}
+				fclose(fp);
+			}
+		} else
 			break;
 		argc--; argv++;
 	}
@@ -406,7 +442,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
 
 	if (ask_oldauthtok && !am_root(pamh)) {
 		status = converse(pamh, PAM_PROMPT_ECHO_OFF,
-		    PROMPT_OLDPASS, &resp);
+		    strlen(params.oldpass_prompt_file) ? params.oldpass_prompt_file : PROMPT_OLDPASS, &resp);
 
 		if (status == PAM_SUCCESS) {
 			if (resp && resp->resp) {
@@ -540,8 +576,7 @@ retry:
 		    MESSAGE_RANDOMFAILED : MESSAGE_MISCONFIGURED);
 		return PAM_AUTHTOK_ERR;
 	}
-
-	status = converse(pamh, PAM_PROMPT_ECHO_OFF, PROMPT_NEWPASS1, &resp);
+	status = converse(pamh, PAM_PROMPT_ECHO_OFF, strlen(params.newpass_prompt_file) ? params.newpass_prompt_file : PROMPT_NEWPASS1, &resp);
 	if (status == PAM_SUCCESS && (!resp || !resp->resp))
 		status = PAM_AUTHTOK_ERR;
 
diff -urNp pam_passwdqc-1.0.5-orig/passwdqc_check.c pam_passwdqc-1.0.5/passwdqc_check.c
--- pam_passwdqc-1.0.5-orig/passwdqc_check.c	2008-02-12 14:31:52.000000000 -0500
+++ pam_passwdqc-1.0.5/passwdqc_check.c	2009-09-25 22:45:16.080842425 -0400
@@ -90,10 +90,12 @@ static int is_simple(passwdqc_params_t *
 
 /* Upper case characters and digits used in common ways don't increase the
  * strength of a password */
-	c = (unsigned char)newpass[0];
-	if (uppers && isascii(c) && isupper(c)) uppers--;
-	c = (unsigned char)newpass[length - 1];
-	if (digits && isascii(c) && isdigit(c)) digits--;
+	if (params->firstupper_lastdigit_check) {
+		c = (unsigned char)newpass[0];
+		if (uppers && isascii(c) && isupper(c)) uppers--;
+		c = (unsigned char)newpass[length - 1];
+		if (digits && isascii(c) && isdigit(c)) digits--;
+	}
 
 /* Count the number of different character classes we've seen.  We assume
  * that there are no non-ASCII characters for digits. */
diff -urNp pam_passwdqc-1.0.5-orig/passwdqc.h pam_passwdqc-1.0.5/passwdqc.h
--- pam_passwdqc-1.0.5-orig/passwdqc.h	2008-02-12 14:30:00.000000000 -0500
+++ pam_passwdqc-1.0.5/passwdqc.h	2009-09-25 14:08:56.214695858 -0400
@@ -7,12 +7,15 @@
 
 #include <pwd.h>
 
+#define FILE_LEN		4096	/* Max file len = 4096 */
+
 typedef struct {
 	int min[5], max;
 	int passphrase_words;
 	int match_length;
 	int similar_deny;
 	int random_bits;
+	int firstupper_lastdigit_check;
 } passwdqc_params_t;
 
 extern char _passwdqc_wordset_4k[0x1000][6];
diff -urNp pam_passwdqc-1.0.5-orig/README pam_passwdqc-1.0.5/README
--- pam_passwdqc-1.0.5-orig/README	2008-02-12 14:43:33.000000000 -0500
+++ pam_passwdqc-1.0.5/README	2009-09-28 12:12:40.251016423 -0400
@@ -41,9 +41,12 @@ words (see the "passphrase" option below
 N3 and N4 are used for passwords consisting of characters from three
 and four character classes, respectively.
 
+	disable_firstupper_lastdigit_check	[]
+
 When calculating the number of character classes, upper-case letters
 used as the first character and digits used as the last character of a
-password are not counted.
+password are not counted. To disable this, you can specify 
+"disable_firstupper_lastdigit_check".
 
 In addition to being sufficiently long, passwords are required to
 contain enough different characters for the character classes and
@@ -142,6 +145,14 @@ This disables user interaction within pa
 the only difference between "use_first_pass" and "use_authtok" is that
 the former is incompatible with "ask_oldauthtok".
 
+	oldpass_prompt_file=absolute-file-path	[]
+	newpass_prompt_file=abosulte-file-path	[]
+
+The options "oldpass_prompt_file" and "newpass_prompt_file" can be used
+to override prompts while requesting old password and new password, 
+respectively. The maximum size of the prompt files can be 4096 
+characters at present. If the file size is more than 4096 characters, the
+output will be truncated to 4096 characters.
 -- 
 Solar Designer <solar at openwall.com>
 


Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_passwdqc/devel/pam_passwdqc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- pam_passwdqc.spec	25 Jul 2009 23:10:25 -0000	1.16
+++ pam_passwdqc.spec	29 Sep 2009 16:22:08 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.5
-Release: 3
+Release: 4
 # License of man page is BSD, rest is Copyright only
 License: BSD and Copyright only
 Group: System Environment/Base
@@ -11,6 +11,8 @@ Source1: ftp://ftp.openwall.com/pub/proj
 BuildPrereq: pam-devel
 BuildRoot: %{_tmppath}/%name-%version
 
+Patch1: patch-219201.patch 
+
 %description
 pam_passwdqc is a simple password strength checking module for
 PAM-aware password changing programs, such as passwd(1).  In addition
@@ -21,6 +23,8 @@ and can be (re-)configured without rebui
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 make CFLAGS="-Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM $RPM_OPT_FLAGS" LDFLAGS_LINUX='--shared -Wl,--version-script,$(MAP)'
 
@@ -38,6 +42,11 @@ make install DESTDIR=$RPM_BUILD_ROOT MAN
 %{_mandir}/man*/*
 
 %changelog
+* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-4
+- Patch for new configurable options(rhbz# 219201): 
+  disable first upper and last digit check, passwords 
+  prompts can be read from a file
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thm at fedoraproject.org  Tue Sep 29 16:22:36 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Sep 2009 16:22:36 +0000 (UTC)
Subject: rpms/surfraw/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 surfraw.spec, 1.3, 1.4
Message-ID: <20090929162236.2398D11C00C1@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/surfraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25016/devel

Modified Files:
	.cvsignore sources surfraw.spec 
Added Files:
	import.log 
Log Message:
Update to 2.2.5.


--- NEW FILE import.log ---
surfraw-2_2_5-1_fc11:HEAD:surfraw-2.2.5-1.fc11.src.rpm:1254241290


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 May 2007 16:59:44 -0000	1.2
+++ .cvsignore	29 Sep 2009 16:22:35 -0000	1.3
@@ -1 +1 @@
-surfraw-1.0.7.tar.gz
+surfraw-2.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 May 2007 16:59:44 -0000	1.2
+++ sources	29 Sep 2009 16:22:36 -0000	1.3
@@ -1 +1 @@
-0957382bbdebf3d678879fa5d2592c9d  surfraw-1.0.7.tar.gz
+e33fb6fe23b1ff60095a103272500672  surfraw-2.2.5.tar.gz


Index: surfraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/surfraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- surfraw.spec	27 Jul 2009 05:09:51 -0000	1.3
+++ surfraw.spec	29 Sep 2009 16:22:36 -0000	1.4
@@ -1,16 +1,28 @@
 Name:           surfraw
-Version:        1.0.7
-Release:        5%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Shell Users Revolutionary Front Rage Against the Web
-
 Group:          Applications/Internet
 License:        Public Domain
-URL:            http://surfraw.sourceforge.net/
-Source0:        ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/surfraw-%{version}.tar.gz
+URL:            http://surfraw.alioth.debian.org/
+Source0:        http://surfraw.alioth.debian.org/dist/surfraw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       screen
 
+# Surfraw searches for a text-mode broser at configuration time, not
+# at runtime. This is something probably to be changed upstream. We
+# could depend on 'text-www-browser', but then we are not sure that
+# this resolves to the same package at build and install time. So, for
+# now, we simply pick one.
+%global text_browser elinks
+BuildRequires:  %{text_browser}
+Requires:       %{text_browser}
+
+# For calling the graphical browser, we can rely on xdg-open.
+Requires:       xdg-utils
+
+
 %description
 Surfraw provides a fast unix command line interface to a variety of
 popular WWW search engines and other artifacts of power. It reclaims
@@ -34,71 +46,45 @@ and wonder.
 
 
 %build
-%configure
+%configure --with-elvidir=%{_libexecdir}/surfraw \
+           --with-graphical-browser=xdg-open \
+           --with-text-browser=%{text_browser} \
+           --disable-opensearch
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %config(noreplace) %{_sysconfdir}/surfraw.conf
-%config(noreplace) %{_sysconfdir}/surfraw_elvi.list
+%config(noreplace) %{_sysconfdir}/surfraw.bookmarks
+%{_bindir}/sr
 %{_bindir}/surfraw
-%{_bindir}/ftpfind
-%{_bindir}/fast
-%{_bindir}/currency
-%{_bindir}/scaleplus
-%{_bindir}/sourceforge
-%{_bindir}/raging
-%{_bindir}/debcontents
-%{_bindir}/wetandwild
-%{_bindir}/freshmeat
-%{_bindir}/netbsd
-%{_bindir}/debpackages
-%{_bindir}/webster
-%{_bindir}/xxx
-%{_bindir}/cite
-%{_bindir}/swhois
-%{_bindir}/amazon
-%{_bindir}/sundocs
-%{_bindir}/woffle
-%{_bindir}/freebsd
-%{_bindir}/W
-%{_bindir}/sunsolve
-%{_bindir}/yahoo
-%{_bindir}/ask
-%{_bindir}/appwatch
-%{_bindir}/altavista
-%{_bindir}/slinuxdoc
-%{_bindir}/debbugs
-%{_bindir}/filesearching
-%{_bindir}/google
-%{_bindir}/deja
-%{_bindir}/britannica
-%{_bindir}/austlii
-%{_bindir}/translate
-%{_bindir}/rhyme
-%{_bindir}/slashdot
-%{_bindir}/stockquote
-%{_bindir}/thesaurus
-%{_bindir}/openbsd
-%{_bindir}/cnn
-%{_bindir}/jake
-%{_bindir}/pubmed
-%{_bindir}/excite
-%{_bindir}/ftpsearch
+%{_bindir}/surfraw-update-path
+%{_libexecdir}/surfraw
+%{_mandir}/man1/*.1*
 
 
 %changelog
+* Sun Sep 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.5-1
+- Update to 2.2.5.
+- New upstream, and new upstream URL.
+- Elvi are now subcommands to the 'surfraw' command (or its 'sr'
+  alias), avoids conflicts with other packages (bz 472623).
+- Hard-code text browser to elinks, and graphical browser to xdg-open
+  for now.
+- Disable opensearch, needs perl(WWW::OpenSearch).
+- Include manpages in the filelist.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -115,4 +101,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Mar 08 2007 Joe Rozner <livinded at deadbytes.net> 1.0.7-1
 - Initial specfile created.
-



From than at fedoraproject.org  Tue Sep 29 16:24:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 29 Sep 2009 16:24:21 +0000 (UTC)
Subject: rpms/switchdesk/devel .cvsignore, 1.24, 1.25 sources, 1.26,
	1.27 switchdesk.spec, 1.44, 1.45
Message-ID: <20090929162421.A885711C00C1@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/switchdesk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25413

Modified Files:
	.cvsignore sources switchdesk.spec 
Log Message:
update po files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	13 Dec 2008 22:12:14 -0000	1.24
+++ .cvsignore	29 Sep 2009 16:24:21 -0000	1.25
@@ -13,3 +13,4 @@ switchdesk-4.0.9-1.tar.bz2
 switchdesk-4.0.9-2.tar.bz2
 switchdesk-4.0.9-3.tar.bz2
 switchdesk-4.0.9-4.tar.bz2
+switchdesk-4.0.9-5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	13 Dec 2008 22:12:14 -0000	1.26
+++ sources	29 Sep 2009 16:24:21 -0000	1.27
@@ -1 +1 @@
-1015f930a63faa7d615f1f91e73ae50d  switchdesk-4.0.9-4.tar.bz2
+82d3586aa07defc44d200e8ca50966e3  switchdesk-4.0.9-5.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- switchdesk.spec	10 Aug 2009 10:10:15 -0000	1.44
+++ switchdesk.spec	29 Sep 2009 16:24:21 -0000	1.45
@@ -1,8 +1,8 @@
-%define _release 4
+%define _release 5
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
 Version: 4.0.9
-Release: %{_release}%{?dist}.3
+Release: %{_release}%{?dist}
 Source: %{name}-%{version}-%{_release}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
@@ -74,15 +74,12 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Tue Sep 29 2009 Than Ngo <than at redhat.com> - 4.0.9-5
+- update po files 
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.0.9-4.3
 - Convert specfile to UTF-8.
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.9-4.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.9-4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sat Dec 13 2008 Than Ngo <than at redhat.com> - 4.0.9-4
 - fix bz447749, broken desktop file
 



From than at fedoraproject.org  Tue Sep 29 16:25:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 29 Sep 2009 16:25:46 +0000 (UTC)
Subject: rpms/switchdesk/F-12 sources,1.26,1.27 switchdesk.spec,1.44,1.45
Message-ID: <20090929162546.13F0811C00C1@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/switchdesk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25687

Modified Files:
	sources switchdesk.spec 
Log Message:
bump release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	13 Dec 2008 22:12:14 -0000	1.26
+++ sources	29 Sep 2009 16:25:45 -0000	1.27
@@ -1 +1 @@
-1015f930a63faa7d615f1f91e73ae50d  switchdesk-4.0.9-4.tar.bz2
+82d3586aa07defc44d200e8ca50966e3  switchdesk-4.0.9-5.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/switchdesk/F-12/switchdesk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- switchdesk.spec	10 Aug 2009 10:10:15 -0000	1.44
+++ switchdesk.spec	29 Sep 2009 16:25:45 -0000	1.45
@@ -1,8 +1,8 @@
-%define _release 4
+%define _release 5
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
 Version: 4.0.9
-Release: %{_release}%{?dist}.3
+Release: %{_release}%{?dist}.1
 Source: %{name}-%{version}-%{_release}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
@@ -74,14 +74,14 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
-* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.0.9-4.3
-- Convert specfile to UTF-8.
+* Tue Sep 29 2009 Than Ngo <than at redhat.com> - 4.0.9-5.1
+- bump release
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.9-4.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 29 2009 Than Ngo <than at redhat.com> - 4.0.9-5
+- update po files 
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.9-4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.0.9-4.3
+- Convert specfile to UTF-8.
 
 * Sat Dec 13 2008 Than Ngo <than at redhat.com> - 4.0.9-4
 - fix bz447749, broken desktop file



From mcepl at fedoraproject.org  Tue Sep 29 16:26:40 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Tue, 29 Sep 2009 16:26:40 +0000 (UTC)
Subject: rpms/pyOpenSSL/devel .cvsignore, 1.6,
	1.7 pyOpenSSL-0.7-openssl.patch, 
	1.1, 1.2 pyOpenSSL.spec, 1.34, 1.35 sources, 1.6, 1.7
Message-ID: <20090929162640.6A1E711C00C1@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/pyOpenSSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25906

Modified Files:
	.cvsignore pyOpenSSL-0.7-openssl.patch pyOpenSSL.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Sep 2008 21:05:44 -0000	1.6
+++ .cvsignore	29 Sep 2009 16:26:40 -0000	1.7
@@ -1 +1 @@
-pyOpenSSL-0.7.tar.gz
+pyOpenSSL-0.9.tar.gz

pyOpenSSL-0.7-openssl.patch:
 setup.py |    3 +++
 1 file changed, 3 insertions(+)

Index: pyOpenSSL-0.7-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL-0.7-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pyOpenSSL-0.7-openssl.patch	17 Sep 2008 21:05:44 -0000	1.1
+++ pyOpenSSL-0.7-openssl.patch	29 Sep 2009 16:26:40 -0000	1.2
@@ -1,6 +1,7 @@
---- pyOpenSSL-0.7/setup.py	2008-04-11 16:53:24.000000000 +0100
-+++ pyOpenSSL-0.7/setup-new.py	2008-09-15 23:46:19.000000000 +0100
-@@ -64,6 +64,9 @@
+diff -up pyOpenSSL-0.9/setup.py.posixIncludes pyOpenSSL-0.9/setup.py
+--- pyOpenSSL-0.9/setup.py.posixIncludes	2009-03-07 17:50:11.000000000 +0100
++++ pyOpenSSL-0.9/setup.py	2009-09-29 17:46:13.449930310 +0200
+@@ -61,6 +61,9 @@ else:
  if sys.platform == 'darwin':
      IncludeDirs = ['/sw/include']
      LibraryDirs = ['/sw/lib']
@@ -8,5 +9,5 @@
 +    IncludeDirs = ['/usr/kerberos/include']
 +    LibraryDirs = ['/usr/kerberos/lib']
  
- def mkExtension(name):
-     modname = 'OpenSSL.' + name
+ # On Windows, make sure the necessary .dll's get added to the egg.
+ data_files = []


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- pyOpenSSL.spec	21 Aug 2009 15:33:17 -0000	1.34
+++ pyOpenSSL.spec	29 Sep 2009 16:26:40 -0000	1.35
@@ -2,13 +2,14 @@
 
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
-Version: 0.7
-Release: 7%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
 Patch3: pyOpenSSL-nopdfout.patch
-Patch4: pyOpenSSL-threadsafe.patch
+# Hopefully the following patch is unnecessary now
+#Patch4: pyOpenSSL-threadsafe.patch
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -26,10 +27,9 @@ High-level wrapper around a subset of th
 
 %prep
 %setup -q
-%patch0 -p1 -b .openssl097
+%patch0 -p1 -b .posixIncludes
 %patch2 -p1 -b .elinks
 %patch3 -p1 -b .nopdfout
-%patch4 -p1 -b .threadsafe
 # Fix permissions for debuginfo package
 %{__chmod} -x src/ssl/connection.c
 
@@ -37,6 +37,7 @@ High-level wrapper around a subset of th
 CFLAGS="%{optflags}" %{__python} setup.py build
 %{__make} -C doc ps
 %{__make} -C doc text html
+find doc/ -name pyOpenSSL.\*
 
 %install
 %{__rm} -rf %{buildroot}
@@ -47,12 +48,15 @@ CFLAGS="%{optflags}" %{__python} setup.p
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/pyOpenSSL.ps 
-%doc doc/pyOpenSSL.txt doc/html
+%doc README doc/pyOpenSSL.* doc/html
 %{python_sitearch}/OpenSSL/
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Tue Sep 29 2009 Mat?j Cepl <mcepl at redhat.com> - 0.9-1
+- New upstream release
+- Fix BuildRequires to make Postscript documentation buildable
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-7
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Sep 2008 21:05:44 -0000	1.6
+++ sources	29 Sep 2009 16:26:40 -0000	1.7
@@ -1 +1 @@
-1924edc58c1e99f27763971d9959ea15  pyOpenSSL-0.7.tar.gz
+5bf282b2d6a03af921920c34079580f2  pyOpenSSL-0.9.tar.gz



From mcepl at fedoraproject.org  Tue Sep 29 16:27:43 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Tue, 29 Sep 2009 16:27:43 +0000 (UTC)
Subject: rpms/pyOpenSSL/F-12 .cvsignore, 1.6, 1.7 pyOpenSSL-0.7-openssl.patch,
	1.1, 1.2 pyOpenSSL.spec, 1.34, 1.35 sources, 1.6, 1.7
Message-ID: <20090929162743.2C80F11C00C1@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/pyOpenSSL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26136

Modified Files:
	.cvsignore pyOpenSSL-0.7-openssl.patch pyOpenSSL.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Sep 2008 21:05:44 -0000	1.6
+++ .cvsignore	29 Sep 2009 16:27:42 -0000	1.7
@@ -1 +1 @@
-pyOpenSSL-0.7.tar.gz
+pyOpenSSL-0.9.tar.gz

pyOpenSSL-0.7-openssl.patch:
 setup.py |    3 +++
 1 file changed, 3 insertions(+)

Index: pyOpenSSL-0.7-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/F-12/pyOpenSSL-0.7-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pyOpenSSL-0.7-openssl.patch	17 Sep 2008 21:05:44 -0000	1.1
+++ pyOpenSSL-0.7-openssl.patch	29 Sep 2009 16:27:42 -0000	1.2
@@ -1,6 +1,7 @@
---- pyOpenSSL-0.7/setup.py	2008-04-11 16:53:24.000000000 +0100
-+++ pyOpenSSL-0.7/setup-new.py	2008-09-15 23:46:19.000000000 +0100
-@@ -64,6 +64,9 @@
+diff -up pyOpenSSL-0.9/setup.py.posixIncludes pyOpenSSL-0.9/setup.py
+--- pyOpenSSL-0.9/setup.py.posixIncludes	2009-03-07 17:50:11.000000000 +0100
++++ pyOpenSSL-0.9/setup.py	2009-09-29 17:46:13.449930310 +0200
+@@ -61,6 +61,9 @@ else:
  if sys.platform == 'darwin':
      IncludeDirs = ['/sw/include']
      LibraryDirs = ['/sw/lib']
@@ -8,5 +9,5 @@
 +    IncludeDirs = ['/usr/kerberos/include']
 +    LibraryDirs = ['/usr/kerberos/lib']
  
- def mkExtension(name):
-     modname = 'OpenSSL.' + name
+ # On Windows, make sure the necessary .dll's get added to the egg.
+ data_files = []


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/F-12/pyOpenSSL.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- pyOpenSSL.spec	21 Aug 2009 15:33:17 -0000	1.34
+++ pyOpenSSL.spec	29 Sep 2009 16:27:42 -0000	1.35
@@ -2,13 +2,14 @@
 
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
-Version: 0.7
-Release: 7%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
 Patch3: pyOpenSSL-nopdfout.patch
-Patch4: pyOpenSSL-threadsafe.patch
+# Hopefully the following patch is unnecessary now
+#Patch4: pyOpenSSL-threadsafe.patch
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -26,10 +27,9 @@ High-level wrapper around a subset of th
 
 %prep
 %setup -q
-%patch0 -p1 -b .openssl097
+%patch0 -p1 -b .posixIncludes
 %patch2 -p1 -b .elinks
 %patch3 -p1 -b .nopdfout
-%patch4 -p1 -b .threadsafe
 # Fix permissions for debuginfo package
 %{__chmod} -x src/ssl/connection.c
 
@@ -37,6 +37,7 @@ High-level wrapper around a subset of th
 CFLAGS="%{optflags}" %{__python} setup.py build
 %{__make} -C doc ps
 %{__make} -C doc text html
+find doc/ -name pyOpenSSL.\*
 
 %install
 %{__rm} -rf %{buildroot}
@@ -47,12 +48,15 @@ CFLAGS="%{optflags}" %{__python} setup.p
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/pyOpenSSL.ps 
-%doc doc/pyOpenSSL.txt doc/html
+%doc README doc/pyOpenSSL.* doc/html
 %{python_sitearch}/OpenSSL/
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Tue Sep 29 2009 Mat?j Cepl <mcepl at redhat.com> - 0.9-1
+- New upstream release
+- Fix BuildRequires to make Postscript documentation buildable
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-7
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Sep 2008 21:05:44 -0000	1.6
+++ sources	29 Sep 2009 16:27:43 -0000	1.7
@@ -1 +1 @@
-1924edc58c1e99f27763971d9959ea15  pyOpenSSL-0.7.tar.gz
+5bf282b2d6a03af921920c34079580f2  pyOpenSSL-0.9.tar.gz



From thm at fedoraproject.org  Tue Sep 29 16:28:38 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Sep 2009 16:28:38 +0000 (UTC)
Subject: rpms/surfraw/F-12 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 surfraw.spec, 1.3, 1.4
Message-ID: <20090929162838.4742C11C00C1@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/surfraw/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26509/F-12

Modified Files:
	.cvsignore sources surfraw.spec 
Added Files:
	import.log 
Log Message:
Update to 2.2.5.


--- NEW FILE import.log ---
surfraw-2_2_5-1_fc11:F-12:surfraw-2.2.5-1.fc11.src.rpm:1254241653


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 May 2007 16:59:44 -0000	1.2
+++ .cvsignore	29 Sep 2009 16:28:38 -0000	1.3
@@ -1 +1 @@
-surfraw-1.0.7.tar.gz
+surfraw-2.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 May 2007 16:59:44 -0000	1.2
+++ sources	29 Sep 2009 16:28:38 -0000	1.3
@@ -1 +1 @@
-0957382bbdebf3d678879fa5d2592c9d  surfraw-1.0.7.tar.gz
+e33fb6fe23b1ff60095a103272500672  surfraw-2.2.5.tar.gz


Index: surfraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/surfraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- surfraw.spec	27 Jul 2009 05:09:51 -0000	1.3
+++ surfraw.spec	29 Sep 2009 16:28:38 -0000	1.4
@@ -1,16 +1,28 @@
 Name:           surfraw
-Version:        1.0.7
-Release:        5%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Shell Users Revolutionary Front Rage Against the Web
-
 Group:          Applications/Internet
 License:        Public Domain
-URL:            http://surfraw.sourceforge.net/
-Source0:        ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/surfraw-%{version}.tar.gz
+URL:            http://surfraw.alioth.debian.org/
+Source0:        http://surfraw.alioth.debian.org/dist/surfraw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       screen
 
+# Surfraw searches for a text-mode broser at configuration time, not
+# at runtime. This is something probably to be changed upstream. We
+# could depend on 'text-www-browser', but then we are not sure that
+# this resolves to the same package at build and install time. So, for
+# now, we simply pick one.
+%global text_browser elinks
+BuildRequires:  %{text_browser}
+Requires:       %{text_browser}
+
+# For calling the graphical browser, we can rely on xdg-open.
+Requires:       xdg-utils
+
+
 %description
 Surfraw provides a fast unix command line interface to a variety of
 popular WWW search engines and other artifacts of power. It reclaims
@@ -34,71 +46,45 @@ and wonder.
 
 
 %build
-%configure
+%configure --with-elvidir=%{_libexecdir}/surfraw \
+           --with-graphical-browser=xdg-open \
+           --with-text-browser=%{text_browser} \
+           --disable-opensearch
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %config(noreplace) %{_sysconfdir}/surfraw.conf
-%config(noreplace) %{_sysconfdir}/surfraw_elvi.list
+%config(noreplace) %{_sysconfdir}/surfraw.bookmarks
+%{_bindir}/sr
 %{_bindir}/surfraw
-%{_bindir}/ftpfind
-%{_bindir}/fast
-%{_bindir}/currency
-%{_bindir}/scaleplus
-%{_bindir}/sourceforge
-%{_bindir}/raging
-%{_bindir}/debcontents
-%{_bindir}/wetandwild
-%{_bindir}/freshmeat
-%{_bindir}/netbsd
-%{_bindir}/debpackages
-%{_bindir}/webster
-%{_bindir}/xxx
-%{_bindir}/cite
-%{_bindir}/swhois
-%{_bindir}/amazon
-%{_bindir}/sundocs
-%{_bindir}/woffle
-%{_bindir}/freebsd
-%{_bindir}/W
-%{_bindir}/sunsolve
-%{_bindir}/yahoo
-%{_bindir}/ask
-%{_bindir}/appwatch
-%{_bindir}/altavista
-%{_bindir}/slinuxdoc
-%{_bindir}/debbugs
-%{_bindir}/filesearching
-%{_bindir}/google
-%{_bindir}/deja
-%{_bindir}/britannica
-%{_bindir}/austlii
-%{_bindir}/translate
-%{_bindir}/rhyme
-%{_bindir}/slashdot
-%{_bindir}/stockquote
-%{_bindir}/thesaurus
-%{_bindir}/openbsd
-%{_bindir}/cnn
-%{_bindir}/jake
-%{_bindir}/pubmed
-%{_bindir}/excite
-%{_bindir}/ftpsearch
+%{_bindir}/surfraw-update-path
+%{_libexecdir}/surfraw
+%{_mandir}/man1/*.1*
 
 
 %changelog
+* Sun Sep 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.5-1
+- Update to 2.2.5.
+- New upstream, and new upstream URL.
+- Elvi are now subcommands to the 'surfraw' command (or its 'sr'
+  alias), avoids conflicts with other packages (bz 472623).
+- Hard-code text browser to elinks, and graphical browser to xdg-open
+  for now.
+- Disable opensearch, needs perl(WWW::OpenSearch).
+- Include manpages in the filelist.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -115,4 +101,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Mar 08 2007 Joe Rozner <livinded at deadbytes.net> 1.0.7-1
 - Initial specfile created.
-



From peter at fedoraproject.org  Tue Sep 29 16:31:54 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 29 Sep 2009 16:31:54 +0000 (UTC)
Subject: rpms/wavpack/F-11 .cvsignore, 1.7, 1.8 import.log, 1.3, 1.4 sources,
	1.7, 1.8 wavpack.spec, 1.13, 1.14
Message-ID: <20090929163154.F2E9B11C00C1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/wavpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27185/F-11

Modified Files:
	.cvsignore import.log sources wavpack.spec 
Log Message:
Ver. 4.60


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Aug 2008 09:53:22 -0000	1.7
+++ .cvsignore	29 Sep 2009 16:31:54 -0000	1.8
@@ -1 +1 @@
-wavpack-4.50.1.tar.bz2
+wavpack-4.60.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	30 Aug 2008 11:17:22 -0000	1.3
+++ import.log	29 Sep 2009 16:31:54 -0000	1.4
@@ -1,3 +1,4 @@
 wavpack-4_50-1_fc9:HEAD:wavpack-4.50-1.fc9.src.rpm:1213791201
 wavpack-4_50_1-1_fc9:HEAD:wavpack-4.50.1-1.fc9.src.rpm:1219571566
 wavpack-4_50_1-2_fc9:HEAD:wavpack-4.50.1-2.fc9.src.rpm:1220095019
+wavpack-4_60-1_fc11:F-11:wavpack-4.60-1.fc11.src.rpm:1254241801


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Aug 2008 09:53:22 -0000	1.7
+++ sources	29 Sep 2009 16:31:54 -0000	1.8
@@ -1 +1 @@
-2c9d7e3672f60070d4fd2c86c924a3b4  wavpack-4.50.1.tar.bz2
+722f90393b292cd1413e8af8250a3783  wavpack-4.60.0.tar.bz2


Index: wavpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-11/wavpack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- wavpack.spec	25 Feb 2009 18:10:26 -0000	1.13
+++ wavpack.spec	29 Sep 2009 16:31:54 -0000	1.14
@@ -1,11 +1,11 @@
 Name:		wavpack
 Summary:	A completely open audiocodec
-Version:	4.50.1
-Release:	3%{?dist}
+Version:	4.60
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Multimedia
 Url:		http://www.wavpack.com/
-Source:		http://www.wavpack.com/%{name}-%{version}.tar.bz2
+Source:		http://www.wavpack.com/%{name}-%{version}.0.tar.bz2
 Patch0:		wavpack-wavpack_pc_in.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +26,7 @@ Requires:	pkgconfig
 Files needed for developing apps using wavpack
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.0
 %patch0 -p0 -b .libs
 
 %build
@@ -35,7 +35,7 @@ Files needed for developing apps using w
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} DESTDIR=%{buildroot} install
 %{__rm} -f %{buildroot}/%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
@@ -56,9 +56,15 @@ Files needed for developing apps using w
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/libwavpack.so
-%doc ChangeLog README doc
+%doc ChangeLog README doc/*
 
 %changelog
+* Mon Sep 28 2009 Peter Lemenkov <lemenkov at gmail.com> 4.60-1
+- Version 4.60
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.50.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.50.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From avesh at fedoraproject.org  Tue Sep 29 16:33:11 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 29 Sep 2009 16:33:11 +0000 (UTC)
Subject: rpms/pam_passwdqc/F-12 patch-219201.patch, NONE,
	1.1 pam_passwdqc.spec, 1.16, 1.17
Message-ID: <20090929163311.1EA6411C00C1@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/pam_passwdqc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27551

Modified Files:
	pam_passwdqc.spec 
Added Files:
	patch-219201.patch 
Log Message:
* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-4
- Patch for new configurable options(rhbz# 219201): 
  disable first upper and last digit check, passwords 
  prompts can be read from a file


patch-219201.patch:
 README           |   13 ++++++++++++-
 pam_passwdqc.c   |   45 ++++++++++++++++++++++++++++++++++++++++-----
 passwdqc.h       |    3 +++
 passwdqc_check.c |   10 ++++++----
 4 files changed, 61 insertions(+), 10 deletions(-)

--- NEW FILE patch-219201.patch ---
diff -urNp pam_passwdqc-1.0.5-orig/pam_passwdqc.c pam_passwdqc-1.0.5/pam_passwdqc.c
--- pam_passwdqc-1.0.5-orig/pam_passwdqc.c	2008-02-12 15:11:13.000000000 -0500
+++ pam_passwdqc-1.0.5/pam_passwdqc.c	2009-09-28 12:10:32.171696694 -0400
@@ -70,6 +70,8 @@ typedef struct {
 	passwdqc_params_t qc;
 	int flags;
 	int retry;
+	char oldpass_prompt_file[FILE_LEN+1];
+	char newpass_prompt_file[FILE_LEN+1];
 } params_t;
 
 static params_t defaults = {
@@ -79,10 +81,13 @@ static params_t defaults = {
 		3,				/* passphrase_words */
 		4,				/* match_length */
 		1,				/* similar_deny */
-		42				/* random_bits */
+		42,				/* random_bits */
+		1				/* firstupper_lastdigit_check */
 	},
 	F_ENFORCE_EVERYONE,			/* flags */
-	3					/* retry */
+	3,					/* retry */
+	"",					/* oldpass_prompt_file */
+	""					/* newpass_prompt_file */
 };
 
 #define PROMPT_OLDPASS \
@@ -361,6 +366,37 @@ static int parse(params_t *params, pam_h
 		if (!strcmp(*argv, "use_authtok")) {
 			params->flags |= F_USE_AUTHTOK;
 		} else
+		if (!strcmp(*argv, "disable_firstupper_lastdigit_check")) {
+			params->qc.firstupper_lastdigit_check = 0;
+		} else
+		if (!strncmp(*argv, "oldpass_prompt_file=", 20)) {
+			int n;
+			FILE *fp = fopen(*argv + 20, "r");
+			if (fp) {
+				n=fread(params->oldpass_prompt_file, sizeof(char), FILE_LEN, fp);
+				if (0==n || ferror(fp)!=0 ) {
+					memset(params->oldpass_prompt_file, '\0', FILE_LEN+1);
+				}
+				else {
+					feof(fp)? (params->oldpass_prompt_file[n-1]='\0'): (params->oldpass_prompt_file[n]='\0');
+				}
+				fclose(fp);
+			}
+		} else
+		if (!strncmp(*argv, "newpass_prompt_file=", 20)) {
+			int n;
+			FILE *fp = fopen(*argv + 20, "r");
+			if (fp) {
+				n=fread(params->newpass_prompt_file, sizeof(char), FILE_LEN, fp);
+				if (0==n || ferror(fp)!=0 ) {
+					memset(params->newpass_prompt_file, '\0', FILE_LEN+1);
+				}
+				else {
+                                        feof(fp)? (params->newpass_prompt_file[n-1]='\0'): (params->newpass_prompt_file[n]='\0');
+				}
+				fclose(fp);
+			}
+		} else
 			break;
 		argc--; argv++;
 	}
@@ -406,7 +442,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
 
 	if (ask_oldauthtok && !am_root(pamh)) {
 		status = converse(pamh, PAM_PROMPT_ECHO_OFF,
-		    PROMPT_OLDPASS, &resp);
+		    strlen(params.oldpass_prompt_file) ? params.oldpass_prompt_file : PROMPT_OLDPASS, &resp);
 
 		if (status == PAM_SUCCESS) {
 			if (resp && resp->resp) {
@@ -540,8 +576,7 @@ retry:
 		    MESSAGE_RANDOMFAILED : MESSAGE_MISCONFIGURED);
 		return PAM_AUTHTOK_ERR;
 	}
-
-	status = converse(pamh, PAM_PROMPT_ECHO_OFF, PROMPT_NEWPASS1, &resp);
+	status = converse(pamh, PAM_PROMPT_ECHO_OFF, strlen(params.newpass_prompt_file) ? params.newpass_prompt_file : PROMPT_NEWPASS1, &resp);
 	if (status == PAM_SUCCESS && (!resp || !resp->resp))
 		status = PAM_AUTHTOK_ERR;
 
diff -urNp pam_passwdqc-1.0.5-orig/passwdqc_check.c pam_passwdqc-1.0.5/passwdqc_check.c
--- pam_passwdqc-1.0.5-orig/passwdqc_check.c	2008-02-12 14:31:52.000000000 -0500
+++ pam_passwdqc-1.0.5/passwdqc_check.c	2009-09-25 22:45:16.080842425 -0400
@@ -90,10 +90,12 @@ static int is_simple(passwdqc_params_t *
 
 /* Upper case characters and digits used in common ways don't increase the
  * strength of a password */
-	c = (unsigned char)newpass[0];
-	if (uppers && isascii(c) && isupper(c)) uppers--;
-	c = (unsigned char)newpass[length - 1];
-	if (digits && isascii(c) && isdigit(c)) digits--;
+	if (params->firstupper_lastdigit_check) {
+		c = (unsigned char)newpass[0];
+		if (uppers && isascii(c) && isupper(c)) uppers--;
+		c = (unsigned char)newpass[length - 1];
+		if (digits && isascii(c) && isdigit(c)) digits--;
+	}
 
 /* Count the number of different character classes we've seen.  We assume
  * that there are no non-ASCII characters for digits. */
diff -urNp pam_passwdqc-1.0.5-orig/passwdqc.h pam_passwdqc-1.0.5/passwdqc.h
--- pam_passwdqc-1.0.5-orig/passwdqc.h	2008-02-12 14:30:00.000000000 -0500
+++ pam_passwdqc-1.0.5/passwdqc.h	2009-09-25 14:08:56.214695858 -0400
@@ -7,12 +7,15 @@
 
 #include <pwd.h>
 
+#define FILE_LEN		4096	/* Max file len = 4096 */
+
 typedef struct {
 	int min[5], max;
 	int passphrase_words;
 	int match_length;
 	int similar_deny;
 	int random_bits;
+	int firstupper_lastdigit_check;
 } passwdqc_params_t;
 
 extern char _passwdqc_wordset_4k[0x1000][6];
diff -urNp pam_passwdqc-1.0.5-orig/README pam_passwdqc-1.0.5/README
--- pam_passwdqc-1.0.5-orig/README	2008-02-12 14:43:33.000000000 -0500
+++ pam_passwdqc-1.0.5/README	2009-09-28 12:12:40.251016423 -0400
@@ -41,9 +41,12 @@ words (see the "passphrase" option below
 N3 and N4 are used for passwords consisting of characters from three
 and four character classes, respectively.
 
+	disable_firstupper_lastdigit_check	[]
+
 When calculating the number of character classes, upper-case letters
 used as the first character and digits used as the last character of a
-password are not counted.
+password are not counted. To disable this, you can specify 
+"disable_firstupper_lastdigit_check".
 
 In addition to being sufficiently long, passwords are required to
 contain enough different characters for the character classes and
@@ -142,6 +145,14 @@ This disables user interaction within pa
 the only difference between "use_first_pass" and "use_authtok" is that
 the former is incompatible with "ask_oldauthtok".
 
+	oldpass_prompt_file=absolute-file-path	[]
+	newpass_prompt_file=abosulte-file-path	[]
+
+The options "oldpass_prompt_file" and "newpass_prompt_file" can be used
+to override prompts while requesting old password and new password, 
+respectively. The maximum size of the prompt files can be 4096 
+characters at present. If the file size is more than 4096 characters, the
+output will be truncated to 4096 characters.
 -- 
 Solar Designer <solar at openwall.com>
 


Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_passwdqc/F-12/pam_passwdqc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- pam_passwdqc.spec	25 Jul 2009 23:10:25 -0000	1.16
+++ pam_passwdqc.spec	29 Sep 2009 16:33:10 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.5
-Release: 3
+Release: 4
 # License of man page is BSD, rest is Copyright only
 License: BSD and Copyright only
 Group: System Environment/Base
@@ -11,6 +11,8 @@ Source1: ftp://ftp.openwall.com/pub/proj
 BuildPrereq: pam-devel
 BuildRoot: %{_tmppath}/%name-%version
 
+Patch1: patch-219201.patch 
+
 %description
 pam_passwdqc is a simple password strength checking module for
 PAM-aware password changing programs, such as passwd(1).  In addition
@@ -21,6 +23,8 @@ and can be (re-)configured without rebui
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 make CFLAGS="-Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM $RPM_OPT_FLAGS" LDFLAGS_LINUX='--shared -Wl,--version-script,$(MAP)'
 
@@ -38,6 +42,11 @@ make install DESTDIR=$RPM_BUILD_ROOT MAN
 %{_mandir}/man*/*
 
 %changelog
+* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-4
+- Patch for new configurable options(rhbz# 219201): 
+  disable first upper and last digit check, passwords 
+  prompts can be read from a file
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From harald at fedoraproject.org  Tue Sep 29 16:33:55 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 29 Sep 2009 16:33:55 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.20, 1.21 dracut.spec, 1.35,
	1.36 sources, 1.21, 1.22
Message-ID: <20090929163355.C9D1D11C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27769

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 002-9
- make install of new dm/lvm udev rules optionally
- correct dasd module typo



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 Sep 2009 04:47:38 -0000	1.20
+++ .cvsignore	29 Sep 2009 16:33:55 -0000	1.21
@@ -1 +1 @@
-dracut-002-845dd502.tar.bz2
+dracut-002-99fd62e3.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- dracut.spec	25 Sep 2009 04:47:39 -0000	1.35
+++ dracut.spec	29 Sep 2009 16:33:55 -0000	1.36
@@ -1,4 +1,4 @@
-%define gittag 845dd502
+%define gittag 99fd62e3
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 8%{?rdist}
+Release: 9%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -148,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95debug
 %{_datadir}/dracut/modules.d/95resume
 %{_datadir}/dracut/modules.d/95rootfs-block
-%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95dasd
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
 %{_datadir}/dracut/modules.d/95udev-rules.ub810
@@ -181,14 +181,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 002-9
+- make install of new dm/lvm udev rules optionally
+- correct dasd module typo
+
 * Fri Sep 25 2009 Warren Togami <wtogami at redhat.com> 002-8
 - revert back to dracut-002-5 tarball 845dd502
   lvm2 was reverted to pre-udev
 
-* Wed Sep 23 2009 harald at redhat.com 002-7
+* Wed Sep 23 2009 Harald Hoyer <harald at redhat.com> 002-7
 - build with the correct tarball
 
-* Wed Sep 23 2009 harald at redhat.com 002-6
+* Wed Sep 23 2009 Harald Hoyer <harald at redhat.com> 002-6
 - add new device mapper udev rules and dmeventd 
   bug 525319, 525015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 04:47:39 -0000	1.21
+++ sources	29 Sep 2009 16:33:55 -0000	1.22
@@ -1 +1 @@
-d8d9c7088a414abdc24dc92b463dff6f  dracut-002-845dd502.tar.bz2
+00deb6d189ff2d0e30c754960b6a4a4d  dracut-002-99fd62e3.tar.bz2



From than at fedoraproject.org  Tue Sep 29 16:36:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 29 Sep 2009 16:36:33 +0000 (UTC)
Subject: rpms/system-switch-mail/F-12 .cvsignore, 1.15, 1.16 sources, 1.15, 
	1.16 system-switch-mail.spec, 1.23, 1.24
Message-ID: <20090929163633.3ED5411C00C1@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/system-switch-mail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28606

Modified Files:
	.cvsignore sources system-switch-mail.spec 
Log Message:
1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-mail/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	11 Mar 2008 18:11:29 -0000	1.15
+++ .cvsignore	29 Sep 2009 16:36:32 -0000	1.16
@@ -10,3 +10,5 @@ system-switch-mail-0.5.25-10.tar.bz2
 system-switch-mail-0.5.25-13.tar.bz2
 system-switch-mail-0.5.26-1.tar.bz2
 system-switch-mail-0.5.26-2.tar.bz2
+system-switch-mail-0.5.26-3.tar.bz2
+system-switch-mail-1.0-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-mail/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Mar 2008 18:11:29 -0000	1.15
+++ sources	29 Sep 2009 16:36:32 -0000	1.16
@@ -1 +1 @@
-f0f03778a50a29ea679b6c53ea2fe257  system-switch-mail-0.5.26-2.tar.bz2
+fdb030f17ec40ffd11043693bb43d953  system-switch-mail-1.0-1.tar.bz2


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-mail/F-12/system-switch-mail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- system-switch-mail.spec	27 Jul 2009 05:27:01 -0000	1.23
+++ system-switch-mail.spec	29 Sep 2009 16:36:32 -0000	1.24
@@ -1,8 +1,8 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
-Version: 0.5.26
-Release: 6
-Source0: %{name}-%{version}-2.tar.bz2
+Version: 1.0
+Release: 1
+Source0: %{name}-%{version}-%{release}.tar.bz2
 License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,17 +43,15 @@ The system-switch-mail-gnome package con
 Mail Transport Agent Switcher.
 
 %prep
-# This is why you should not embed the package release in
-# the source tarball. :P
-%setup -q -n %{name}-%{version}-2
+%setup -q -n %{name}-%{version}-%{release}
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} mandir=%{_mandir} sysconfdir=%{_sysconfdir} install
+%makeinstall
 
 %find_lang %{name}
 
@@ -61,7 +59,7 @@ make DESTDIR=%{buildroot} mandir=%{_mand
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_datadir}/%{name}
@@ -72,7 +70,7 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/security/console.apps/%{name}*
 
 %files gnome
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/%{name}/switchmail_gui.py*
@@ -80,17 +78,8 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.26-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.26-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5.26-4
-- Rebuild for Python 2.6
-
-* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.26-3
-- fix license tag
+* Tue Sep 29 2009 Than Ngo <than at redhat.com> - 1.0-1
+- update po files
 
 * Tue Mar 11 2008 Than Ngo <than at redhat.com> 0.5.26-2
 - fix permission of po files (bz#436888)



From peter at fedoraproject.org  Tue Sep 29 16:40:54 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 29 Sep 2009 16:40:54 +0000 (UTC)
Subject: rpms/wavpack/F-10 .cvsignore, 1.7, 1.8 import.log, 1.3, 1.4 sources,
	1.7, 1.8 wavpack.spec, 1.12, 1.13
Message-ID: <20090929164054.4400011C00C1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/wavpack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29655/F-10

Modified Files:
	.cvsignore import.log sources wavpack.spec 
Log Message:
Ver. 4.60


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Aug 2008 09:53:22 -0000	1.7
+++ .cvsignore	29 Sep 2009 16:40:54 -0000	1.8
@@ -1 +1 @@
-wavpack-4.50.1.tar.bz2
+wavpack-4.60.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	30 Aug 2008 11:17:22 -0000	1.3
+++ import.log	29 Sep 2009 16:40:54 -0000	1.4
@@ -1,3 +1,4 @@
 wavpack-4_50-1_fc9:HEAD:wavpack-4.50-1.fc9.src.rpm:1213791201
 wavpack-4_50_1-1_fc9:HEAD:wavpack-4.50.1-1.fc9.src.rpm:1219571566
 wavpack-4_50_1-2_fc9:HEAD:wavpack-4.50.1-2.fc9.src.rpm:1220095019
+wavpack-4_60-1_fc11:F-10:wavpack-4.60-1.fc11.src.rpm:1254241979


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Aug 2008 09:53:22 -0000	1.7
+++ sources	29 Sep 2009 16:40:54 -0000	1.8
@@ -1 +1 @@
-2c9d7e3672f60070d4fd2c86c924a3b4  wavpack-4.50.1.tar.bz2
+722f90393b292cd1413e8af8250a3783  wavpack-4.60.0.tar.bz2


Index: wavpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wavpack/F-10/wavpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wavpack.spec	30 Aug 2008 11:17:22 -0000	1.12
+++ wavpack.spec	29 Sep 2009 16:40:54 -0000	1.13
@@ -1,11 +1,11 @@
 Name:		wavpack
 Summary:	A completely open audiocodec
-Version:	4.50.1
-Release:	2%{?dist}
+Version:	4.60
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Multimedia
 Url:		http://www.wavpack.com/
-Source:		http://www.wavpack.com/%{name}-%{version}.tar.bz2
+Source:		http://www.wavpack.com/%{name}-%{version}.0.tar.bz2
 Patch0:		wavpack-wavpack_pc_in.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +26,7 @@ Requires:	pkgconfig
 Files needed for developing apps using wavpack
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.0
 %patch0 -p0 -b .libs
 
 %build
@@ -35,7 +35,7 @@ Files needed for developing apps using w
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} DESTDIR=%{buildroot} install
 %{__rm} -f %{buildroot}/%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
@@ -56,9 +56,18 @@ Files needed for developing apps using w
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/libwavpack.so
-%doc ChangeLog README doc
+%doc ChangeLog README doc/*
 
 %changelog
+* Mon Sep 28 2009 Peter Lemenkov <lemenkov at gmail.com> 4.60-1
+- Version 4.60
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.50.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.50.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Aug 30 2008 Peter Lemenkov <lemenkov at gmail.com> 4.50.1-2
 - Fixes to meet the Fedora Packaging Guidelines
 



From avesh at fedoraproject.org  Tue Sep 29 16:42:43 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 29 Sep 2009 16:42:43 +0000 (UTC)
Subject: rpms/pam_passwdqc/F-12 pam_passwdqc.spec,1.17,1.18
Message-ID: <20090929164243.BE19611C00C1@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/pam_passwdqc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29961

Modified Files:
	pam_passwdqc.spec 
Log Message:
* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-4
- Patch for new configurable options(rhbz# 219201): 
  disable first upper and last digit check, passwords 
  prompts can be read from a file
- Fixed an issue with spec file where "Release:" is not
  specified with "(?dist)". Without this, it gives problem
  when tagging across different fedora releases.  



Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_passwdqc/F-12/pam_passwdqc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pam_passwdqc.spec	29 Sep 2009 16:33:10 -0000	1.17
+++ pam_passwdqc.spec	29 Sep 2009 16:42:43 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.5
-Release: 4
+Release: 4%{?dist}
 # License of man page is BSD, rest is Copyright only
 License: BSD and Copyright only
 Group: System Environment/Base
@@ -46,6 +46,9 @@ make install DESTDIR=$RPM_BUILD_ROOT MAN
 - Patch for new configurable options(rhbz# 219201): 
   disable first upper and last digit check, passwords 
   prompts can be read from a file
+- Fixed an issue with spec file where "Release:" is not
+  specified with "(?dist)". Without this, it gives problem
+  when tagging across different fedora releases.  
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rdieter at fedoraproject.org  Tue Sep 29 16:45:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 16:45:39 +0000 (UTC)
Subject: rpms/libpqxx/F-12 libpqxx-2.6.8-gcc43.patch, 1.2,
	1.3 libpqxx-2.6.8-visibility-2.patch, 1.2,
	1.3 libpqxx-2.6.8-visibility.patch, 1.5, 1.6 .cvsignore, 1.10,
	1.11 libpqxx.spec, 1.27, 1.28 sources, 1.10, 1.11
Message-ID: <20090929164539.2CA8D11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30485

Modified Files:
	.cvsignore libpqxx.spec sources 
Added Files:
	libpqxx-2.6.8-gcc43.patch libpqxx-2.6.8-visibility-2.patch 
	libpqxx-2.6.8-visibility.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.6.8-14
- Epoch: 1 (revert from libpqxx-3.0.0 on F-12)


libpqxx-2.6.8-gcc43.patch:
 binarystring.cxx     |    1 +
 connection_base.cxx  |    2 ++
 cursor.cxx           |    2 ++
 result.cxx           |    3 +++
 transaction_base.cxx |    2 ++
 5 files changed, 10 insertions(+)

Index: libpqxx-2.6.8-gcc43.patch
===================================================================
RCS file: libpqxx-2.6.8-gcc43.patch
diff -N libpqxx-2.6.8-gcc43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libpqxx-2.6.8-gcc43.patch	29 Sep 2009 16:45:36 -0000	1.3
@@ -0,0 +1,60 @@
+diff -up libpqxx-2.6.8/src/transaction_base.cxx.gcc43 libpqxx-2.6.8/src/transaction_base.cxx
+--- libpqxx-2.6.8/src/transaction_base.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
++++ libpqxx-2.6.8/src/transaction_base.cxx	2008-02-19 08:19:47.000000000 -0600
+@@ -20,6 +20,8 @@
+ 
+ #include <stdexcept>
+ 
++#include <string.h>
++
+ #include "pqxx/connection_base"
+ #include "pqxx/result"
+ #include "pqxx/tablestream"
+diff -up libpqxx-2.6.8/src/result.cxx.gcc43 libpqxx-2.6.8/src/result.cxx
+--- libpqxx-2.6.8/src/result.cxx.gcc43	2006-08-29 09:18:37.000000000 -0500
++++ libpqxx-2.6.8/src/result.cxx	2008-02-19 08:18:12.000000000 -0600
+@@ -19,6 +19,9 @@
+ 
+ #include <stdexcept>
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "libpq-fe.h"
+ 
+ #include "pqxx/except"
+diff -up libpqxx-2.6.8/src/cursor.cxx.gcc43 libpqxx-2.6.8/src/cursor.cxx
+--- libpqxx-2.6.8/src/cursor.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
++++ libpqxx-2.6.8/src/cursor.cxx	2008-02-19 08:07:51.000000000 -0600
+@@ -19,6 +19,8 @@
+ 
+ #include <cstdlib>
+ 
++#include <string.h>
++
+ #include "pqxx/cursor"
+ #include "pqxx/result"
+ #include "pqxx/transaction"
+diff -up libpqxx-2.6.8/src/connection_base.cxx.gcc43 libpqxx-2.6.8/src/connection_base.cxx
+--- libpqxx-2.6.8/src/connection_base.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
++++ libpqxx-2.6.8/src/connection_base.cxx	2008-02-19 08:05:04.000000000 -0600
+@@ -40,6 +40,8 @@
+ #include <poll.h>
+ #endif
+ 
++#include <string.h>
++
+ #include "libpq-fe.h"
+ 
+ #include "pqxx/binarystring"
+diff -up libpqxx-2.6.8/src/binarystring.cxx.gcc43 libpqxx-2.6.8/src/binarystring.cxx
+--- libpqxx-2.6.8/src/binarystring.cxx.gcc43	2006-03-30 21:28:22.000000000 -0600
++++ libpqxx-2.6.8/src/binarystring.cxx	2008-02-19 08:04:33.000000000 -0600
+@@ -18,6 +18,7 @@
+ 
+ #include <new>
+ #include <stdexcept>
++#include <string.h>
+ 
+ #include "libpq-fe.h"
+ 

libpqxx-2.6.8-visibility-2.patch:
 prepared_statement.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libpqxx-2.6.8-visibility-2.patch
===================================================================
RCS file: libpqxx-2.6.8-visibility-2.patch
diff -N libpqxx-2.6.8-visibility-2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libpqxx-2.6.8-visibility-2.patch	29 Sep 2009 16:45:37 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility libpqxx-2.6.8/include/pqxx/prepared_statement.hxx
+--- libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility	2006-08-29 10:32:55.000000000 -0500
++++ libpqxx-2.6.8/include/pqxx/prepared_statement.hxx	2009-04-09 13:37:38.000000000 -0500
+@@ -138,7 +138,7 @@ private:
+ namespace internal
+ {
+ /// Internal representation of a prepared statement definition
+-struct PQXX_PRIVATE prepared_def
++struct PQXX_LIBEXPORT prepared_def
+ {
+   /// Parameter definition
+   struct param

libpqxx-2.6.8-visibility.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libpqxx-2.6.8-visibility.patch
===================================================================
RCS file: libpqxx-2.6.8-visibility.patch
diff -N libpqxx-2.6.8-visibility.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libpqxx-2.6.8-visibility.patch	29 Sep 2009 16:45:37 -0000	1.6
@@ -0,0 +1,11 @@
+--- libpqxx-2.6.8/configure.disable_visibility	2006-09-06 04:53:48.000000000 -0500
++++ libpqxx-2.6.8/configure	2006-09-20 13:51:53.000000000 -0500
+@@ -20203,7 +20203,7 @@
+ echo $ECHO_N "checking g++ visibility attribute... $ECHO_C" >&6; }
+ gcc_visibility=yes
+ SAVE_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror"
++#CXXFLAGS="$CXXFLAGS -Werror"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Apr 2009 13:58:53 -0000	1.10
+++ .cvsignore	29 Sep 2009 16:45:36 -0000	1.11
@@ -1,2 +1,4 @@
-libpqxx-3.0.tar.gz
-libpqxx-3.0.tar.gz.md5sum
+libpqxx-2.6.7.tar.gz
+libpqxx-2.6.8.tar.gz
+libpqxx-2.6.8.tar.gz.md5sum
+libpqxx-2.6.9.tar.gz


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/libpqxx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libpqxx.spec	25 Jul 2009 08:28:15 -0000	1.27
+++ libpqxx.spec	29 Sep 2009 16:45:37 -0000	1.28
@@ -1,6 +1,7 @@
 Name:           libpqxx
-Version:        3.0
-Release:        2%{?dist}
+Epoch:          1
+Version:        2.6.8
+Release:        14%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -10,8 +11,15 @@ Source0:        http://pqxx.org/download
 Source1:        http://pqxx.org/download/software/libpqxx/libpqxx-%{version}.tar.gz.md5sum
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# drop -Werror for now, since we get -fvisibility warnings using gcc-4.1.1/fc6+
+# http://thaiopensource.org/development/libpqxx/ticket/83
+Patch1:         libpqxx-2.6.8-visibility.patch
+# or better yet, fix it:
+Patch11:        libpqxx-2.6.8-visibility-2.patch
+Patch2:         libpqxx-2.6.8-gcc43.patch
 Patch3:         libpqxx-2.6.8-multilib.patch
 
+BuildRequires:  automake libtool
 BuildRequires:  postgresql-devel
 BuildRequires:  pkgconfig
 
@@ -34,14 +42,23 @@ Requires:       postgresql-devel
 %setup -q
 
 # fix spurious permissions
-chmod -x COPYING
+chmod -x COPYING INSTALL
 
+%patch11 -p1 -b .visibility
+%patch2 -p1 -b .gcc43
 %patch3 -p1 -b .multilib
 
+# better fix/hack for current rpath and libtool issues
+libtoolize --force
+autoreconf -f -i
+
 
 %build
 %configure --enable-shared --disable-static
 
+# rpath sucks...
+#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
+
 make %{?_smp_mflags}
 
 
@@ -69,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-*.so
+%{_libdir}/libpqxx-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -81,11 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.6.8-14
+- Epoch: 1 (revert from libpqxx-3.0.0 on F-12)
 
-* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> 3.0.0-1
-- libpqxx-3.0
+* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
+- properly fix visibility issues
 
 * Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 2.6.8-12
 - Rebuilt against libtool 2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Apr 2009 13:58:53 -0000	1.10
+++ sources	29 Sep 2009 16:45:37 -0000	1.11
@@ -1,2 +1,2 @@
-57b0fe82ed08df7b8fbe3df313960001  libpqxx-3.0.tar.gz
-b0d0ab5450cfa9d18c204391225c2b63  libpqxx-3.0.tar.gz.md5sum
+cb818ca7698955bcea8b7ba1b7962811  libpqxx-2.6.8.tar.gz
+21cc6ac2cd7bb6fc9a16639c29acbf21  libpqxx-2.6.8.tar.gz.md5sum



From rdieter at fedoraproject.org  Tue Sep 29 16:50:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 16:50:55 +0000 (UTC)
Subject: rpms/libpqxx/devel .cvsignore, 1.10, 1.11 libpqxx.spec, 1.27,
	1.28 sources, 1.10, 1.11
Message-ID: <20090929165055.82E5611C048A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31914

Modified Files:
	.cvsignore libpqxx.spec sources 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:3.0.2-3
- Epoch: 1
- libpqxx-3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Apr 2009 13:58:53 -0000	1.10
+++ .cvsignore	29 Sep 2009 16:50:54 -0000	1.11
@@ -1,2 +1,2 @@
-libpqxx-3.0.tar.gz
-libpqxx-3.0.tar.gz.md5sum
+libpqxx-3.0.2.tar.gz
+libpqxx-3.0.2.tar.gz.md5sum


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libpqxx.spec	25 Jul 2009 08:28:15 -0000	1.27
+++ libpqxx.spec	29 Sep 2009 16:50:54 -0000	1.28
@@ -1,5 +1,7 @@
+
 Name:           libpqxx
-Version:        3.0
+Epoch:          1
+Version:        3.0.2
 Release:        2%{?dist}
 Summary:        C++ client API for PostgreSQL
 
@@ -23,7 +25,7 @@ Supersedes older libpq++ interface.
 %package devel
 Summary:        Development tools for %{name} 
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       postgresql-devel
 %description devel
@@ -69,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-*.so
+%{_libdir}/libpqxx-3.0.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:3.0.2-3
+- Epoch: 1
+- libpqxx-3.0.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Apr 2009 13:58:53 -0000	1.10
+++ sources	29 Sep 2009 16:50:54 -0000	1.11
@@ -1,2 +1,2 @@
-57b0fe82ed08df7b8fbe3df313960001  libpqxx-3.0.tar.gz
-b0d0ab5450cfa9d18c204391225c2b63  libpqxx-3.0.tar.gz.md5sum
+3baa257e851b773fa1d693bbe185a418  libpqxx-3.0.2.tar.gz
+4b2f9ec1a35488e95b63df8c5c2c73c7  libpqxx-3.0.2.tar.gz.md5sum



From avesh at fedoraproject.org  Tue Sep 29 16:54:10 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 29 Sep 2009 16:54:10 +0000 (UTC)
Subject: rpms/pam_passwdqc/devel pam_passwdqc.spec,1.17,1.18
Message-ID: <20090929165410.6BE4C11C00C1@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/pam_passwdqc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1440

Modified Files:
	pam_passwdqc.spec 
Log Message:
* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-5
- Fixed an issue with spec file where "Release:" is not
  specified with "(?dist)". Without this, it gives problem
  when tagging across different fedora releases.



Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_passwdqc/devel/pam_passwdqc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pam_passwdqc.spec	29 Sep 2009 16:22:08 -0000	1.17
+++ pam_passwdqc.spec	29 Sep 2009 16:54:10 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.5
-Release: 4
+Release: 5%{?dist}
 # License of man page is BSD, rest is Copyright only
 License: BSD and Copyright only
 Group: System Environment/Base
@@ -42,6 +42,11 @@ make install DESTDIR=$RPM_BUILD_ROOT MAN
 %{_mandir}/man*/*
 
 %changelog
+* Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-5
+- Fixed an issue with spec file where "Release:" is not
+  specified with "(?dist)". Without this, it gives problem
+  when tagging across different fedora releases.
+
 * Tue Sep 29 2009 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-4
 - Patch for new configurable options(rhbz# 219201): 
   disable first upper and last digit check, passwords 



From jjames at fedoraproject.org  Tue Sep 29 17:12:10 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 29 Sep 2009 17:12:10 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.302, 1.303 comps-f12.xml.in, 1.133,
	1.134 comps-f13.xml.in, 1.23, 1.24
Message-ID: <20090929171210.9ED1011C0423@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4757

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
Add expatmm, cmusphinx3, and pocketsphinx to comps.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- comps-f11.xml.in	27 Sep 2009 00:50:37 -0000	1.302
+++ comps-f11.xml.in	29 Sep 2009 17:12:09 -0000	1.303
@@ -872,6 +872,7 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
+      <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
       <packagereq type="optional">mona-devel</packagereq>
@@ -4847,6 +4848,7 @@
       <packagereq type="optional">cdcollect</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">cdrskin</packagereq>
+      <packagereq type="optional">cmusphinx3</packagereq>
       <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
       <packagereq type="optional">decibel-audio-player</packagereq>
@@ -4891,6 +4893,7 @@
       <packagereq type="optional">pavumeter</packagereq>
       <packagereq type="optional">picard</packagereq>
       <packagereq type="optional">pitivi</packagereq>
+      <packagereq type="optional">pocketsphinx</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- comps-f12.xml.in	29 Sep 2009 11:49:05 -0000	1.133
+++ comps-f12.xml.in	29 Sep 2009 17:12:10 -0000	1.134
@@ -963,6 +963,7 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
+      <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
       <packagereq type="optional">mona-devel</packagereq>
@@ -5069,6 +5070,7 @@
       <packagereq type="optional">cdcollect</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">cdrskin</packagereq>
+      <packagereq type="optional">cmusphinx3</packagereq>
       <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
       <packagereq type="optional">decibel-audio-player</packagereq>
@@ -5114,6 +5116,7 @@
       <packagereq type="optional">pavumeter</packagereq>
       <packagereq type="optional">picard</packagereq>
       <packagereq type="optional">pitivi</packagereq>
+      <packagereq type="optional">pocketsphinx</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- comps-f13.xml.in	29 Sep 2009 11:49:05 -0000	1.23
+++ comps-f13.xml.in	29 Sep 2009 17:12:10 -0000	1.24
@@ -957,6 +957,7 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
+      <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
       <packagereq type="optional">mona-devel</packagereq>
@@ -5036,6 +5037,7 @@
       <packagereq type="optional">cdcollect</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">cdrskin</packagereq>
+      <packagereq type="optional">cmusphinx3</packagereq>
       <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
       <packagereq type="optional">decibel-audio-player</packagereq>
@@ -5081,6 +5083,7 @@
       <packagereq type="optional">pavumeter</packagereq>
       <packagereq type="optional">picard</packagereq>
       <packagereq type="optional">pitivi</packagereq>
+      <packagereq type="optional">pocketsphinx</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>



From steved at fedoraproject.org  Tue Sep 29 17:16:22 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 29 Sep 2009 17:16:22 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1840,
	1.1841 linux-2.6-nfsd4-proots.patch, 1.3, 1.4
Message-ID: <20090929171622.8E30411C00C1@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5773

Modified Files:
	kernel.spec linux-2.6-nfsd4-proots.patch 
Log Message:
Updated the NFS4 pseudo root code with a fix from upstream



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1840
retrieving revision 1.1841
diff -u -p -r1.1840 -r1.1841
--- kernel.spec	29 Sep 2009 08:26:12 -0000	1.1840
+++ kernel.spec	29 Sep 2009 17:16:21 -0000	1.1841
@@ -2074,6 +2074,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 29 2009 Steve Dickson <steved at redhat.com>  2.6.31.1-55
+- Updated the NFS4 pseudo root code with a fix from upstream
+
 * Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-54
 - Fix broken capabilties that stopped dbus working due to copy from user
   fixups.

linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |   12 +++++-
 fs/nfsd/nfs4xdr.c           |   83 ++++++++++++++++++++++++++++++++++++--------
 fs/nfsd/nfsfh.c             |   32 ++++++++++++++++
 fs/nfsd/vfs.c               |   77 ++++++++++++++++++++++++++++++++++++++--
 include/linux/nfsd/export.h |    3 +
 include/linux/nfsd/nfsd.h   |    2 +
 6 files changed, 189 insertions(+), 20 deletions(-)

Index: linux-2.6-nfsd4-proots.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-nfsd4-proots.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-nfsd4-proots.patch	9 Sep 2009 22:43:52 -0000	1.3
+++ linux-2.6-nfsd4-proots.patch	29 Sep 2009 17:16:22 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up linux-2.6.30.noarch/fs/nfsd/export.c.save linux-2.6.30.noarch/fs/nfsd/export.c
---- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-09-09 15:11:54.702436000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-09-09 15:12:44.520167000 -0400
+diff -up linux-2.6.31.noarch/fs/nfsd/export.c.orig linux-2.6.31.noarch/fs/nfsd/export.c
+--- linux-2.6.31.noarch/fs/nfsd/export.c.orig	2009-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/export.c	2009-09-29 11:29:40.000000000 -0400
 @@ -104,6 +104,7 @@ static int expkey_parse(struct cache_det
  	if (mesg[mlen-1] != '\n')
  		return -EINVAL;
@@ -63,9 +63,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  		seq_puts(m, "# Path Client(Flags) # IPs\n");
  		return 0;
  	}
-diff -up linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c
---- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-09-09 15:11:54.707433000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-09-09 15:12:36.408695000 -0400
+diff -up linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c.orig linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c
+--- linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c.orig	2009-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c	2009-09-29 11:29:40.000000000 -0400
 @@ -2176,28 +2176,61 @@ static inline int attributes_need_mount(
  	return 0;
  }
@@ -191,9 +191,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	switch (nfserr) {
  	case nfs_ok:
  		p += buflen;
-diff -up linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save linux-2.6.30.noarch/fs/nfsd/nfsfh.c
---- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-09-09 15:11:54.711427000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-09-09 15:12:48.357903000 -0400
+diff -up linux-2.6.31.noarch/fs/nfsd/nfsfh.c.orig linux-2.6.31.noarch/fs/nfsd/nfsfh.c
+--- linux-2.6.31.noarch/fs/nfsd/nfsfh.c.orig	2009-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/nfsfh.c	2009-09-29 11:29:40.000000000 -0400
 @@ -109,6 +109,30 @@ static __be32 nfsd_setuser_and_check_por
  	return nfserrno(nfsd_setuser(rqstp, exp));
  }
@@ -240,9 +240,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	}
  
  	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
-diff -up linux-2.6.30.noarch/fs/nfsd/vfs.c.save linux-2.6.30.noarch/fs/nfsd/vfs.c
---- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-09-09 15:11:54.715423000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-09-09 15:12:39.978431000 -0400
+diff -up linux-2.6.31.noarch/fs/nfsd/vfs.c.orig linux-2.6.31.noarch/fs/nfsd/vfs.c
+--- linux-2.6.31.noarch/fs/nfsd/vfs.c.orig	2009-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/vfs.c	2009-09-29 11:31:06.000000000 -0400
 @@ -89,6 +89,12 @@ struct raparm_hbucket {
  #define RAPARM_HASH_MASK	(RAPARM_HASH_SIZE-1)
  static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];
@@ -339,6 +339,15 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  
  	/* Lookup the name, but don't follow links */
  	if (isdotent(name, len)) {
+@@ -162,7 +219,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
+ 			dentry = dget(dparent);
+ 		else if (dparent != exp->ex_path.dentry)
+ 			dentry = dget_parent(dparent);
+-		else if (!EX_NOHIDE(exp))
++		else if (!EX_NOHIDE(exp) && !nfsd_v4client(rqstp))
+ 			dentry = dget(dparent); /* .. == . just like at / */
+ 		else {
+ 			/* checking mountpoint crossing is very different when stepping up */
 @@ -199,9 +256,21 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
  		if (IS_ERR(dentry))
  			goto out_nfserr;
@@ -362,9 +371,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  			if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
  				dput(dentry);
  				goto out_nfserr;
-diff -up linux-2.6.30.noarch/include/linux/nfsd/export.h.save linux-2.6.30.noarch/include/linux/nfsd/export.h
---- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-09-09 15:11:54.719419000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-09-09 15:12:29.064157000 -0400
+diff -up linux-2.6.31.noarch/include/linux/nfsd/export.h.orig linux-2.6.31.noarch/include/linux/nfsd/export.h
+--- linux-2.6.31.noarch/include/linux/nfsd/export.h.orig	2009-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/include/linux/nfsd/export.h	2009-09-29 11:29:40.000000000 -0400
 @@ -39,7 +39,8 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
@@ -375,9 +384,9 @@ diff -up linux-2.6.30.noarch/include/lin
  
  /* The flags that may vary depending on security flavor: */
  #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-diff -up linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save linux-2.6.30.noarch/include/linux/nfsd/nfsd.h
---- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-09-09 15:11:54.723415000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-09-09 15:12:33.025896000 -0400
+diff -up linux-2.6.31.noarch/include/linux/nfsd/nfsd.h.orig linux-2.6.31.noarch/include/linux/nfsd/nfsd.h
+--- linux-2.6.31.noarch/include/linux/nfsd/nfsd.h.orig	2009-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/include/linux/nfsd/nfsd.h	2009-09-29 11:29:40.000000000 -0400
 @@ -76,6 +76,8 @@ int		nfsd_racache_init(int);
  void		nfsd_racache_shutdown(void);
  int		nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,



From rstrode at fedoraproject.org  Tue Sep 29 17:21:11 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 29 Sep 2009 17:21:11 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.146,1.147 sources,1.59,1.60
Message-ID: <20090929172111.4171911C00C1@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6325

Modified Files:
	plymouth.spec sources 
Log Message:
- Fix escape and ask-for-password



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- plymouth.spec	28 Sep 2009 23:30:47 -0000	1.146
+++ plymouth.spec	29 Sep 2009 17:21:10 -0000	1.147
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.28.09%{?dist}
+Release: 0.2009.29.09%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -451,6 +451,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09
+- Fix escape and ask-for-password
+
 * Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.28.09
 - Add prerelease of 0.8.0 for multihead support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	28 Sep 2009 22:21:39 -0000	1.59
+++ sources	29 Sep 2009 17:21:11 -0000	1.60
@@ -1 +1 @@
-029968e91ff135b522c06b606d8cbf87  plymouth-0.8.0.tar.bz2
+4d1ba11f12f3ec0fa11cbacdd43400da  plymouth-0.8.0.tar.bz2



From nphilipp at fedoraproject.org  Tue Sep 29 17:26:56 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 17:26:56 +0000 (UTC)
Subject: rpms/system-config-samba/devel sources,1.81,1.82
Message-ID: <20090929172656.A1D1511C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8044

Modified Files:
	sources 
Log Message:
fix build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	29 Sep 2009 15:58:47 -0000	1.81
+++ sources	29 Sep 2009 17:26:56 -0000	1.82
@@ -1 +1 @@
-d9e66272fe63a27a23e3188f62f8763c  system-config-samba-1.2.83.tar.bz2
+669a4f6c9a45b8ef56f385784ae52087  system-config-samba-1.2.83.tar.bz2



From nphilipp at fedoraproject.org  Tue Sep 29 17:27:24 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Sep 2009 17:27:24 +0000 (UTC)
Subject: rpms/system-config-samba/F-12 sources,1.81,1.82
Message-ID: <20090929172724.5E16111C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8233

Modified Files:
	sources 
Log Message:
fix build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-12/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	29 Sep 2009 15:58:50 -0000	1.81
+++ sources	29 Sep 2009 17:27:24 -0000	1.82
@@ -1 +1 @@
-d9e66272fe63a27a23e3188f62f8763c  system-config-samba-1.2.83.tar.bz2
+669a4f6c9a45b8ef56f385784ae52087  system-config-samba-1.2.83.tar.bz2



From praveenp at fedoraproject.org  Tue Sep 29 17:29:00 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 29 Sep 2009 17:29:00 +0000 (UTC)
Subject: rpms/openwsman/EL-5 python-config,NONE,1.1 openwsman.spec,1.2,1.3
Message-ID: <20090929172900.3872411C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8503

Modified Files:
	openwsman.spec 
Added Files:
	python-config 
Log Message:
Made a few changes to support python-config test on RHEL5.



--- NEW FILE python-config ---
#!/usr/bin/python2.5

import sys
import os
import getopt
from distutils import sysconfig

valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
              'ldflags', 'help']

def exit_with_usage(code=1):
    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
                                            '|'.join('--'+opt for opt in valid_opts))
    sys.exit(code)

try:
    opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
except getopt.error:
    exit_with_usage()

if not opts:
    exit_with_usage()

opt = opts[0][0]

pyver = sysconfig.get_config_var('VERSION')
getvar = sysconfig.get_config_var

if opt == '--help':
    exit_with_usage(0)

elif opt == '--prefix':
    print sysconfig.PREFIX

elif opt == '--exec-prefix':
    print sysconfig.EXEC_PREFIX

elif opt in ('--includes', '--cflags'):
    flags = ['-I' + sysconfig.get_python_inc(),
             '-I' + sysconfig.get_python_inc(plat_specific=True)]
    if opt == '--cflags':
        flags.extend(getvar('CFLAGS').split())
    print ' '.join(flags)

elif opt in ('--libs', '--ldflags'):
    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
    libs.append('-lpython'+pyver)
    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
    # shared library in prefix/lib/.
    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
        libs.insert(0, '-L' + getvar('LIBPL'))
    print ' '.join(libs)



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openwsman.spec	24 Sep 2009 22:57:22 -0000	1.2
+++ openwsman.spec	29 Sep 2009 17:28:59 -0000	1.3
@@ -4,10 +4,11 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source2:        python-config
 Patch0:         %{name}-initscript.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
@@ -53,8 +54,10 @@ Openwsman ruby bindings
 
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
+cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
+sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
 chmod a-x src/lib/*.[ch]
@@ -63,8 +66,7 @@ chmod a-x include/*.[ch]
 
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
-echo %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings PATH=$PATH:.
 make %{?_smp_flags}
 
 %install
@@ -97,7 +99,7 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
-/usr/lib/ruby/site_ruby/1.8/openwsman/
+%{_libdir}/ruby/site_ruby/1.8/openwsman/
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
@@ -139,6 +141,11 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
+- check for python-configure in configure.ac fails because python-config
+- is not part of python-2.4 which is currently available in RHEL
+- So added a script python-config to the sources, and allowed configure to 
+- search in BUILD/opewsman-2.2.0 for python-configure script.
 * Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
 - Added the new 2.2.0 sources.
 - Changed the release and version numbers.



From jkratoch at fedoraproject.org  Tue Sep 29 17:35:56 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 29 Sep 2009 17:35:56 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.19.51.0.14-cxxfilt-java-doc.patch,
	NONE, 1.1 binutils.spec, 1.174, 1.175
Message-ID: <20090929173556.6834811C00C1@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9511

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.19.51.0.14-cxxfilt-java-doc.patch 
Log Message:
* Tue Sep 29 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-32
- Remove spurious description of nonexistent --java switch for cxxfilt.


binutils-2.19.51.0.14-cxxfilt-java-doc.patch:
 binutils.texi |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE binutils-2.19.51.0.14-cxxfilt-java-doc.patch ---
http://sourceware.org/ml/binutils/2009-09/msg00701.html
http://sourceware.org/ml/binutils-cvs/2009-09/msg00335.html

### binutils/ChangeLog	2009/09/29 14:17:04	1.1543
### binutils/ChangeLog	2009/09/29 15:34:08	1.1544
## -1,3 +1,8 @@
+2009-09-29  Nick Clifton  <nickc at redhat.com>
+
+	* doc/binutils.texi (c++filt): Remove spurious description of
+	nonexistent --java command line switch for cxxfilt.
+
 2009-09-29  DJ Delorie  <dj at redhat.com>
 
 	* readelf.c: Add support for RX target.
--- binutils/doc/binutils.texi	2009/09/11 11:16:19	1.154
+++ binutils/doc/binutils.texi	2009/09/29 15:34:08	1.155
@@ -2814,11 +2814,6 @@
 name @code{_foo}.  This option removes the initial underscore.  Whether
 @command{c++filt} removes the underscore by default is target dependent.
 
- at item -j
- at itemx --java
-Prints demangled names using Java syntax.  The default is to use C++
-syntax.
-
 @item -n
 @itemx --no-strip-underscores
 Do not remove the initial underscore.


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- binutils.spec	6 Aug 2009 13:17:59 -0000	1.174
+++ binutils.spec	29 Sep 2009 17:35:56 -0000	1.175
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.51.0.14
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -32,6 +32,7 @@ Patch06: binutils-2.19.51.0.10-set-long-
 Patch07: binutils-2.19.51.0.10-build-id.patch
 Patch09: binutils-2.19.51.0.11-moxie.patch
 Patch10: binutils-2.19.51.0.14-unique-is-global.patch
+Patch11: binutils-2.19.51.0.14-cxxfilt-java-doc.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -105,6 +106,7 @@ to consider using libelf instead of BFD.
 %patch07 -p0 -b .build-id~
 %patch09 -p0 -b .moxie~
 %patch10 -p0 -b .unique-is-global~
+%patch11 -p0 -b .cxxfilt-java-doc~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -355,6 +357,9 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Tue Sep 29 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-32
+- Remove spurious description of nonexistent --java switch for cxxfilt.
+
 * Thu Aug  6 2009 Jakub Jelinek <jakub at redhat.com> 2.19.51.0.14-31
 - Fix strip on objects with STB_GNU_UNIQUE symbols. (BZ 515700, PR binutils/10492)
 



From orion at fedoraproject.org  Tue Sep 29 17:36:18 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 29 Sep 2009 17:36:18 +0000 (UTC)
Subject: rpms/cmake/devel cmake-2.8.0-vtk64.patch, NONE, 1.1 .cvsignore, 1.28,
	1.29 cmake.spec, 1.60, 1.61 sources, 1.28,
	1.29 cmake-2.6.4-vtk64.patch, 1.1, NONE
Message-ID: <20090929173618.6C65F11C0419@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9722

Modified Files:
	.cvsignore cmake.spec sources 
Added Files:
	cmake-2.8.0-vtk64.patch 
Removed Files:
	cmake-2.6.4-vtk64.patch 
Log Message:
* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc1
- Update to 2.8.0 RC 1


cmake-2.8.0-vtk64.patch:
 FindVTK.cmake |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE cmake-2.8.0-vtk64.patch ---
--- cmake-2.8.0-rc1/Modules/FindVTK.cmake.vtk64	2009-09-25 12:29:20.000000000 -0600
+++ cmake-2.8.0-rc1/Modules/FindVTK.cmake	2009-09-29 10:33:20.506713352 -0600
@@ -45,10 +45,15 @@
   SET(VTK_DIR_SEARCH "")
   FOREACH(dir ${VTK_DIR_SEARCH2})
     SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
+      ${dir}/../lib64/vtk-5.4
       ${dir}/../lib/vtk-5.4
+      ${dir}/../lib64/vtk-5.2
       ${dir}/../lib/vtk-5.2
+      ${dir}/../lib64/vtk-5.1
       ${dir}/../lib/vtk-5.1
+      ${dir}/../lib64/vtk-5.0
       ${dir}/../lib/vtk-5.0
+      ${dir}/../lib64/vtk
       ${dir}/../lib/vtk
       )
   ENDFOREACH(dir)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	29 Apr 2009 21:14:42 -0000	1.28
+++ .cvsignore	29 Sep 2009 17:36:17 -0000	1.29
@@ -1 +1 @@
-cmake-2.6.4.tar.gz
+cmake-2.8.0-rc1.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cmake.spec	17 Sep 2009 15:19:25 -0000	1.60
+++ cmake.spec	29 Sep 2009 17:36:18 -0000	1.61
@@ -4,21 +4,21 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver %{nil}
+%define rcver -rc1
 
 Name:           cmake
-Version:        2.6.4
-Release:        4%{?dist}
+Version:        2.8.0
+Release:        0.1.rc1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.cmake.org
-Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
+Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
 #Find UseVTK.cmake in /usr/lib64/vtk-* on 64-bit machines
 #http://public.kitware.com/mantis/view.php?id=9105
-Patch0:         cmake-2.6.4-vtk64.patch
+Patch0:         cmake-2.8.0-vtk64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -52,7 +52,7 @@ The %{name}-gui package contains the Qt 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{rcver}
+%setup -q -n %{name}-%{version}%{?rcver}
 %patch0 -p1 -b .vtk64
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
@@ -132,6 +132,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc1
+- Update to 2.8.0 RC 1
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.4-4
 - macro.cmake: prefixes cmake with the package being builts bindir (#523878)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	29 Apr 2009 21:14:42 -0000	1.28
+++ sources	29 Sep 2009 17:36:18 -0000	1.29
@@ -1 +1 @@
-50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz
+d849a05aa043d0e28193ae3d03928c8f  cmake-2.8.0-rc1.tar.gz


--- cmake-2.6.4-vtk64.patch DELETED ---



From jgarzik at fedoraproject.org  Tue Sep 29 17:37:59 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 29 Sep 2009 17:37:59 +0000 (UTC)
Subject: rpms/chunkd/devel .cvsignore, 1.3, 1.4 chunkd.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <20090929173759.69E4511C00C1@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10144

Modified Files:
	.cvsignore chunkd.spec sources 
Log Message:
update to upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Aug 2009 12:55:01 -0000	1.3
+++ .cvsignore	29 Sep 2009 17:37:59 -0000	1.4
@@ -1 +1 @@
-chunkd-0.4.tar.gz
+chunkd-0.5git.tar.gz


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- chunkd.spec	30 Aug 2009 17:41:28 -0000	1.16
+++ chunkd.spec	29 Sep 2009 17:37:59 -0000	1.17
@@ -1,13 +1,15 @@
 Name:		chunkd
-Version:	0.4
-Release:	5%{?dist}
+Version:	0.5
+Release:	0.1.gfa9dd039%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-Source0:	chunkd-%{version}.tar.gz
+# pulled from upstream git, commit fa9dd039a2b0e73c564c069dedf0764d160225a0
+# to recreate tarball, check out commit, then run "make dist"
+Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
 Source3:	chunkd.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,8 +41,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
-
+%setup -q -n chunkd-0.5git
 
 %build
 %configure --disable-static
@@ -97,6 +98,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.1.gfa9dd039
+- update source to commit fa9dd039a2b0e73c564c069dedf0764d160225a0
+
 * Sun Aug 30 2009 Pete Zaitcev <zaitcev at redhat.com> - 0.4-5
 - rebuilt with new openssl, again (for libssl.so.9 now)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Aug 2009 12:55:01 -0000	1.9
+++ sources	29 Sep 2009 17:37:59 -0000	1.10
@@ -1 +1 @@
-c35af84524521216422aad1cf9fc7599  chunkd-0.4.tar.gz
+3dadaceb6e0e836a2d44a3386861f1b8  chunkd-0.5git.tar.gz



From rstrode at fedoraproject.org  Tue Sep 29 17:39:35 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 29 Sep 2009 17:39:35 +0000 (UTC)
Subject: rpms/plymouth/F-12 plymouth.spec,1.146,1.147 sources,1.59,1.60
Message-ID: <20090929173935.6A73511C00C1@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10424

Modified Files:
	plymouth.spec sources 
Log Message:
- Fix escape and ask-for-password



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- plymouth.spec	28 Sep 2009 23:30:47 -0000	1.146
+++ plymouth.spec	29 Sep 2009 17:39:35 -0000	1.147
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.28.09%{?dist}
+Release: 0.2009.29.09%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -451,6 +451,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09
+- Fix escape and ask-for-password
+
 * Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.28.09
 - Add prerelease of 0.8.0 for multihead support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	28 Sep 2009 22:21:39 -0000	1.59
+++ sources	29 Sep 2009 17:39:35 -0000	1.60
@@ -1 +1 @@
-029968e91ff135b522c06b606d8cbf87  plymouth-0.8.0.tar.bz2
+4d1ba11f12f3ec0fa11cbacdd43400da  plymouth-0.8.0.tar.bz2



From rstrode at fedoraproject.org  Tue Sep 29 17:40:26 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 29 Sep 2009 17:40:26 +0000 (UTC)
Subject: rpms/plymouth/F-12 plymouth.spec,1.147,1.148
Message-ID: <20090929174026.291BC11C048B@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10585

Modified Files:
	plymouth.spec 
Log Message:
update release to not conflict with devel



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- plymouth.spec	29 Sep 2009 17:39:35 -0000	1.147
+++ plymouth.spec	29 Sep 2009 17:40:25 -0000	1.148
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09%{?dist}
+Release: 0.2009.29.09.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -451,7 +451,7 @@ fi
 %defattr(-, root, root)
 
 %changelog
-* Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09
+* Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.1
 - Fix escape and ask-for-password
 
 * Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.28.09



From pkgdb at fedoraproject.org  Tue Sep 29 17:55:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:55:08 +0000
Subject: [pkgdb] bug-buddy ownership updated
Message-ID: <20090929175508.7622510F88B@bastion2.fedora.phx.redhat.com>

Package bug-buddy in Fedora devel was orphaned by toshio

To make changes to this package see:
  /pkgdb/packages/name/bug-buddy



From pkgdb at fedoraproject.org  Tue Sep 29 17:55:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:55:08 +0000
Subject: [pkgdb] bug-buddy (un)retirement
Message-ID: <20090929175508.C0B8E10F8B8@bastion2.fedora.phx.redhat.com>

Package bug-buddy in Fedora devel has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/bug-buddy



From pkgdb at fedoraproject.org  Tue Sep 29 17:55:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:55:21 +0000
Subject: [pkgdb] bug-buddy ownership updated
Message-ID: <20090929175521.7C90A10F85F@bastion2.fedora.phx.redhat.com>

Package bug-buddy in Fedora 12 was orphaned by toshio

To make changes to this package see:
  /pkgdb/packages/name/bug-buddy



From pkgdb at fedoraproject.org  Tue Sep 29 17:55:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:55:21 +0000
Subject: [pkgdb] bug-buddy (un)retirement
Message-ID: <20090929175521.B975D10F8D4@bastion2.fedora.phx.redhat.com>

Package bug-buddy in Fedora 12 has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/bug-buddy



From pkgdb at fedoraproject.org  Tue Sep 29 17:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:56:17 +0000
Subject: [pkgdb] emacs-nxml-mode ownership updated
Message-ID: <20090929175617.8F54710F874@bastion2.fedora.phx.redhat.com>

Package emacs-nxml-mode in Fedora devel was orphaned by toshio

To make changes to this package see:
  /pkgdb/packages/name/emacs-nxml-mode



From pkgdb at fedoraproject.org  Tue Sep 29 17:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:56:17 +0000
Subject: [pkgdb] emacs-nxml-mode (un)retirement
Message-ID: <20090929175617.A6D4810F88B@bastion2.fedora.phx.redhat.com>

Package emacs-nxml-mode in Fedora devel has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/emacs-nxml-mode



From pkgdb at fedoraproject.org  Tue Sep 29 17:56:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:56:24 +0000
Subject: [pkgdb] emacs-nxml-mode ownership updated
Message-ID: <20090929175625.1468110F85F@bastion2.fedora.phx.redhat.com>

Package emacs-nxml-mode in Fedora 12 was orphaned by toshio

To make changes to this package see:
  /pkgdb/packages/name/emacs-nxml-mode



From pkgdb at fedoraproject.org  Tue Sep 29 17:56:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 17:56:24 +0000
Subject: [pkgdb] emacs-nxml-mode (un)retirement
Message-ID: <20090929175625.362A010F888@bastion2.fedora.phx.redhat.com>

Package emacs-nxml-mode in Fedora 12 has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/emacs-nxml-mode



From linville at fedoraproject.org  Tue Sep 29 17:58:37 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 29 Sep 2009 17:58:37 +0000 (UTC)
Subject: rpms/rfkill/devel rfkill-default-install-to-PREFIX-sbin.patch, NONE,
	1.1 rfkill.spec, 1.2, 1.3
Message-ID: <20090929175837.14E2D11C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15002

Modified Files:
	rfkill.spec 
Added Files:
	rfkill-default-install-to-PREFIX-sbin.patch 
Log Message:
Install binary into /sbin to enable use during boot

rfkill-default-install-to-PREFIX-sbin.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE rfkill-default-install-to-PREFIX-sbin.patch ---
>From 45605d5063e96d1b3229db8edac6f489bf29a382 Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Tue, 29 Sep 2009 13:39:13 -0400
Subject: [rfkill PATCH] default install to $(PREFIX)/sbin

The rfkill utility isn't generally useful to normal users, so move it to
/sbin with other system management executables.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cda48c4..71a6082 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 
 MKDIR ?= mkdir -p
@@ -48,8 +48,8 @@ check:
 
 install: rfkill rfkill.1.gz
 	@$(NQ) ' INST rfkill'
-	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) rfkill
+	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) rfkill
 	@$(NQ) ' INST rfkill.1'
 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man1/
 	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man1/ rfkill.1.gz
-- 
1.6.2.5



Index: rfkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/devel/rfkill.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rfkill.spec	15 Sep 2009 17:39:02 -0000	1.2
+++ rfkill.spec	29 Sep 2009 17:58:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           rfkill
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A tool for enabling and disabling wireless devices
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://www.linuxwireless
 Source0:        http://wireless.kernel.org/download/rfkill/rfkill-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         rfkill-default-install-to-PREFIX-sbin.patch
 
 %description
 rfkill is a simple tool for accessing the Linux rfkill device interface,
@@ -17,6 +18,7 @@ WLAN, Bluetooth and mobile broadband.
 
 %prep
 %setup -q
+%patch0 -p 1
 
 
 %build
@@ -25,7 +27,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT} PREFIX='' MANDIR=%{_mandir}
 
 
 %clean
@@ -34,12 +36,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/rfkill
+/sbin/rfkill
 %{_mandir}/man1/*
 %doc COPYING README
 
 
 %changelog
+* Tue Sep 29 2009 John W. Linville <linville at tuxdriver.com> 0.3-3
+- Install binary into /sbin to enable use during boot
+
 * Tue Sep 15 2009 John W. Linville <linville at tuxdriver.com> 0.3-2
 - Change summary and description as suggested by Tomasz Torcz <zdzichu at irc.pl>
 



From praveenp at fedoraproject.org  Tue Sep 29 18:01:13 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 29 Sep 2009 18:01:13 +0000 (UTC)
Subject: rpms/openwsman/EL-5 openwsman.spec,1.3,1.4
Message-ID: <20090929180113.DD84E11C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15285

Modified Files:
	openwsman.spec 
Log Message:
Hardcoding back the path to /usr/lib in %files



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openwsman.spec	29 Sep 2009 17:28:59 -0000	1.3
+++ openwsman.spec	29 Sep 2009 18:01:13 -0000	1.4
@@ -99,7 +99,7 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
-%{_libdir}/ruby/site_ruby/1.8/openwsman/
+/usr/lib/ruby/site_ruby/1.8/openwsman/
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 



From linville at fedoraproject.org  Tue Sep 29 18:01:55 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 29 Sep 2009 18:01:55 +0000 (UTC)
Subject: rpms/rfkill/F-12 rfkill-default-install-to-PREFIX-sbin.patch, NONE, 
	1.1 rfkill.spec, 1.2, 1.3
Message-ID: <20090929180155.9E8E611C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15536

Modified Files:
	rfkill.spec 
Added Files:
	rfkill-default-install-to-PREFIX-sbin.patch 
Log Message:
Install binary into /sbin to enable use during boot

rfkill-default-install-to-PREFIX-sbin.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE rfkill-default-install-to-PREFIX-sbin.patch ---
>From 45605d5063e96d1b3229db8edac6f489bf29a382 Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Tue, 29 Sep 2009 13:39:13 -0400
Subject: [rfkill PATCH] default install to $(PREFIX)/sbin

The rfkill utility isn't generally useful to normal users, so move it to
/sbin with other system management executables.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cda48c4..71a6082 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 
 MKDIR ?= mkdir -p
@@ -48,8 +48,8 @@ check:
 
 install: rfkill rfkill.1.gz
 	@$(NQ) ' INST rfkill'
-	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) rfkill
+	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) rfkill
 	@$(NQ) ' INST rfkill.1'
 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man1/
 	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man1/ rfkill.1.gz
-- 
1.6.2.5



Index: rfkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/F-12/rfkill.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rfkill.spec	15 Sep 2009 17:39:02 -0000	1.2
+++ rfkill.spec	29 Sep 2009 18:01:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           rfkill
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A tool for enabling and disabling wireless devices
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://www.linuxwireless
 Source0:        http://wireless.kernel.org/download/rfkill/rfkill-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         rfkill-default-install-to-PREFIX-sbin.patch
 
 %description
 rfkill is a simple tool for accessing the Linux rfkill device interface,
@@ -17,6 +18,7 @@ WLAN, Bluetooth and mobile broadband.
 
 %prep
 %setup -q
+%patch0 -p 1
 
 
 %build
@@ -25,7 +27,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT} PREFIX='' MANDIR=%{_mandir}
 
 
 %clean
@@ -34,12 +36,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/rfkill
+/sbin/rfkill
 %{_mandir}/man1/*
 %doc COPYING README
 
 
 %changelog
+* Tue Sep 29 2009 John W. Linville <linville at tuxdriver.com> 0.3-3
+- Install binary into /sbin to enable use during boot
+
 * Tue Sep 15 2009 John W. Linville <linville at tuxdriver.com> 0.3-2
 - Change summary and description as suggested by Tomasz Torcz <zdzichu at irc.pl>
 



From praveenp at fedoraproject.org  Tue Sep 29 18:02:36 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 29 Sep 2009 18:02:36 +0000 (UTC)
Subject: rpms/openwsman/EL-5 openwsman.spec,1.4,1.5
Message-ID: <20090929180236.5E58911C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15643

Modified Files:
	openwsman.spec 
Log Message:
increased the release after the previous change



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openwsman.spec	29 Sep 2009 18:01:13 -0000	1.4
+++ openwsman.spec	29 Sep 2009 18:02:36 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -141,6 +141,8 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
+- Changed back the hard coding of /usr/lib
 * Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
 - check for python-configure in configure.ac fails because python-config
 - is not part of python-2.4 which is currently available in RHEL



From mbarnes at fedoraproject.org  Tue Sep 29 18:03:39 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 29 Sep 2009 18:03:39 +0000 (UTC)
Subject: rpms/evolution/F-12 .cvsignore, 1.116.2.26,
	1.116.2.27 evolution.spec, 
	1.394.2.62, 1.394.2.63 sources, 1.116.2.31, 1.116.2.32
Message-ID: <20090929180339.5FC4D11C00C1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15977

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
- Snapshot of "kill-bonobo" progress at commit 2fa61f4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/.cvsignore,v
retrieving revision 1.116.2.26
retrieving revision 1.116.2.27
diff -u -p -r1.116.2.26 -r1.116.2.27
--- .cvsignore	23 Sep 2009 22:44:09 -0000	1.116.2.26
+++ .cvsignore	29 Sep 2009 18:03:39 -0000	1.116.2.27
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2
+evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.62
retrieving revision 1.394.2.63
diff -u -p -r1.394.2.62 -r1.394.2.63
--- evolution.spec	24 Sep 2009 00:23:14 -0000	1.394.2.62
+++ evolution.spec	29 Sep 2009 18:03:39 -0000	1.394.2.63
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 0c1afa3
+%define hash 2fa61f4
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.2%{?dist}
+Release: 1.kb.3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -526,8 +526,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-#%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
-#%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
+%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
+%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
 #%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
 #%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
 #%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
+- Snapshot of "kill-bonobo" progress at commit 2fa61f4.
+
 * Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.2.fc12
 - Snapshot of "kill-bonobo" progress at commit 0c1afa3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/sources,v
retrieving revision 1.116.2.31
retrieving revision 1.116.2.32
diff -u -p -r1.116.2.31 -r1.116.2.32
--- sources	23 Sep 2009 22:44:09 -0000	1.116.2.31
+++ sources	29 Sep 2009 18:03:39 -0000	1.116.2.32
@@ -1 +1 @@
-448b519564cb448f647f7be76fe85817  evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2
+6f3e9f57c256b2596df051a6e42ca3b8  evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2



From linville at fedoraproject.org  Tue Sep 29 18:03:43 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 29 Sep 2009 18:03:43 +0000 (UTC)
Subject: rpms/rfkill/F-11 rfkill-default-install-to-PREFIX-sbin.patch, NONE, 
	1.1 rfkill.spec, 1.1, 1.2
Message-ID: <20090929180343.A789D11C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16025

Modified Files:
	rfkill.spec 
Added Files:
	rfkill-default-install-to-PREFIX-sbin.patch 
Log Message:
Install binary into /sbin to enable use during boot

rfkill-default-install-to-PREFIX-sbin.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE rfkill-default-install-to-PREFIX-sbin.patch ---
>From 45605d5063e96d1b3229db8edac6f489bf29a382 Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Tue, 29 Sep 2009 13:39:13 -0400
Subject: [rfkill PATCH] default install to $(PREFIX)/sbin

The rfkill utility isn't generally useful to normal users, so move it to
/sbin with other system management executables.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cda48c4..71a6082 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 
 MKDIR ?= mkdir -p
@@ -48,8 +48,8 @@ check:
 
 install: rfkill rfkill.1.gz
 	@$(NQ) ' INST rfkill'
-	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) rfkill
+	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) rfkill
 	@$(NQ) ' INST rfkill.1'
 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man1/
 	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man1/ rfkill.1.gz
-- 
1.6.2.5



Index: rfkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/F-11/rfkill.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rfkill.spec	15 Sep 2009 17:50:55 -0000	1.1
+++ rfkill.spec	29 Sep 2009 18:03:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           rfkill
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A tool for enabling and disabling wireless devices
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://www.linuxwireless
 Source0:        http://wireless.kernel.org/download/rfkill/rfkill-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         rfkill-default-install-to-PREFIX-sbin.patch
 
 %description
 rfkill is a simple tool for accessing the Linux rfkill device interface,
@@ -17,6 +18,7 @@ WLAN, Bluetooth and mobile broadband.
 
 %prep
 %setup -q
+%patch0 -p 1
 
 
 %build
@@ -25,7 +27,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT} PREFIX='' MANDIR=%{_mandir}
 
 
 %clean
@@ -34,12 +36,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/rfkill
+/sbin/rfkill
 %{_mandir}/man1/*
 %doc COPYING README
 
 
 %changelog
+* Tue Sep 29 2009 John W. Linville <linville at tuxdriver.com> 0.3-3
+- Install binary into /sbin to enable use during boot
+
 * Tue Sep 15 2009 John W. Linville <linville at tuxdriver.com> 0.3-2
 - Change summary and description as suggested by Tomasz Torcz <zdzichu at irc.pl>
 



From pkgdb at fedoraproject.org  Tue Sep 29 18:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:04:19 +0000
Subject: [pkgdb] rhm ownership updated
Message-ID: <20090929180419.819B310F88B@bastion2.fedora.phx.redhat.com>

Package rhm in Fedora devel is now owned by nsantos

To make changes to this package see:
  /pkgdb/packages/name/rhm



From pkgdb at fedoraproject.org  Tue Sep 29 18:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:04:24 +0000
Subject: [pkgdb] rhm ownership updated
Message-ID: <20090929180424.9001910F8A9@bastion2.fedora.phx.redhat.com>

Package rhm in Fedora 12 is now owned by nsantos

To make changes to this package see:
  /pkgdb/packages/name/rhm



From pkgdb at fedoraproject.org  Tue Sep 29 18:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:04:19 +0000
Subject: [pkgdb] rhm (un)retirement
Message-ID: <20090929180419.8EE5C10F895@bastion2.fedora.phx.redhat.com>

Package rhm in Fedora devel has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/rhm



From pkgdb at fedoraproject.org  Tue Sep 29 18:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:04:24 +0000
Subject: [pkgdb] rhm (un)retirement
Message-ID: <20090929180424.9FD6810F8AD@bastion2.fedora.phx.redhat.com>

Package rhm in Fedora 12 has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/rhm



From pkgdb at fedoraproject.org  Tue Sep 29 18:05:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:05:18 +0000
Subject: [pkgdb] znc-extra (un)retirement
Message-ID: <20090929180518.7EE8B10F888@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora 12 has been retired by toshio

To make changes to this package see:
  /pkgdb/packages/name/znc-extra



From rdieter at fedoraproject.org  Tue Sep 29 18:13:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 18:13:26 +0000 (UTC)
Subject: rpms/libpqxx/F-12 libpqxx.spec,1.28,1.29
Message-ID: <20090929181326.C297B11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18091

Modified Files:
	libpqxx.spec 
Log Message:
-devel: fix pkg deps



Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/F-12/libpqxx.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libpqxx.spec	29 Sep 2009 16:45:37 -0000	1.28
+++ libpqxx.spec	29 Sep 2009 18:13:26 -0000	1.29
@@ -1,7 +1,8 @@
+
 Name:           libpqxx
 Epoch:          1
 Version:        2.6.8
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -31,7 +32,7 @@ Supersedes older libpq++ interface.
 %package devel
 Summary:        Development tools for %{name} 
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:       pkgconfig
 Requires:       postgresql-devel
 %description devel
@@ -98,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.6.8-14
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.6.8-15
 - Epoch: 1 (revert from libpqxx-3.0.0 on F-12)
 
 * Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13



From rdieter at fedoraproject.org  Tue Sep 29 18:14:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 18:14:50 +0000 (UTC)
Subject: rpms/libpqxx/devel libpqxx.spec,1.28,1.29
Message-ID: <20090929181450.18AD411C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18316

Modified Files:
	libpqxx.spec 
Log Message:
-devel: fix pkg deps (curse you epoch)



Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libpqxx.spec	29 Sep 2009 16:50:54 -0000	1.28
+++ libpqxx.spec	29 Sep 2009 18:14:49 -0000	1.29
@@ -2,7 +2,7 @@
 Name:           libpqxx
 Epoch:          1
 Version:        3.0.2
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -25,7 +25,7 @@ Supersedes older libpq++ interface.
 %package devel
 Summary:        Development tools for %{name} 
 Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:       pkgconfig
 Requires:       postgresql-devel
 %description devel
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:3.0.2-3
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:3.0.2-4
 - Epoch: 1
 - libpqxx-3.0.2
 



From orion at fedoraproject.org  Tue Sep 29 18:14:52 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 29 Sep 2009 18:14:52 +0000 (UTC)
Subject: rpms/octave/devel .cvsignore, 1.26, 1.27 octave.spec, 1.92,
	1.93 sources, 1.26, 1.27
Message-ID: <20090929181452.2B22211C00C1@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18365

Modified Files:
	.cvsignore octave.spec sources 
Log Message:
* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.3-1
- Update to 3.2.3
- Re-add make check



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	31 Jul 2009 08:01:59 -0000	1.26
+++ .cvsignore	29 Sep 2009 18:14:51 -0000	1.27
@@ -1 +1 @@
-octave-3.2.2.tar.bz2
+octave-3.2.3.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- octave.spec	23 Sep 2009 06:08:23 -0000	1.92
+++ octave.spec	29 Sep 2009 18:14:51 -0000	1.93
@@ -2,8 +2,8 @@
 %define octave_api api-v37
 
 Name:           octave
-Version:        3.2.2
-Release:        5%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -118,8 +118,8 @@ touch %{buildroot}%{_datadir}/%{name}/oc
 mkdir interpreter
 cp -a doc/interpreter/*.pdf doc/interpreter/HTML/ interpreter/
 
-#check
-#make check
+%check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -171,6 +171,10 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.3-1
+- Update to 3.2.3
+- Re-add make check
+
 * Tue Sep 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 6:3.2.2-5
 - Added categories to desktop file: Education, DataVisualization, NumericalAnalysis 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	31 Jul 2009 08:01:59 -0000	1.26
+++ sources	29 Sep 2009 18:14:52 -0000	1.27
@@ -1 +1 @@
-656d0d11bf9cfea7a4cee226ee63fea7  octave-3.2.2.tar.bz2
+eecaa1a3b2da3b94fa7bcebbc4f1a1f2  octave-3.2.3.tar.bz2



From clumens at fedoraproject.org  Tue Sep 29 18:22:35 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue, 29 Sep 2009 18:22:35 +0000 (UTC)
Subject: rpms/python-meh/devel .cvsignore, 1.5, 1.6 python-meh.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090929182235.7150711C00C1@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20016

Modified Files:
	.cvsignore python-meh.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Sep 2009 19:29:48 -0000	1.5
+++ .cvsignore	29 Sep 2009 18:22:35 -0000	1.6
@@ -2,3 +2,4 @@ python-meh-0.1.tar.gz
 python-meh-0.2.tar.gz
 python-meh-0.3.tar.gz
 python-meh-0.4.tar.gz
+python-meh-0.5.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/python-meh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-meh.spec	25 Sep 2009 19:29:48 -0000	1.4
+++ python-meh.spec	29 Sep 2009 18:22:35 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: http://git.fedoraproject.org/git/?p=python-meh.git
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_datadir}/python-meh
 
 %changelog
+* Tue Sep 29 2009 Chris Lumens <clumens at redhat.com> - 0.5-1
+- Always compare version numbers as strings (#526188).
+
 * Fri Sep 25 2009 Chris Lumens <clumens at redhat.com> - 0.4-1
 - Add a default description to bug reports.
 - Handle the user pressing Escape by continuing to show the dialog.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Sep 2009 19:29:48 -0000	1.5
+++ sources	29 Sep 2009 18:22:35 -0000	1.6
@@ -1 +1 @@
-8a368a55ad1273a8e9f0872d1807fb66  python-meh-0.4.tar.gz
+f5ea8244a49657e770f23675e2997888  python-meh-0.5.tar.gz



From clumens at fedoraproject.org  Tue Sep 29 18:28:54 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue, 29 Sep 2009 18:28:54 +0000 (UTC)
Subject: rpms/python-meh/F-12 .cvsignore, 1.5, 1.6 python-meh.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090929182854.81A9E11C00C1@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22584

Modified Files:
	.cvsignore python-meh.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Sep 2009 19:29:48 -0000	1.5
+++ .cvsignore	29 Sep 2009 18:28:54 -0000	1.6
@@ -2,3 +2,4 @@ python-meh-0.1.tar.gz
 python-meh-0.2.tar.gz
 python-meh-0.3.tar.gz
 python-meh-0.4.tar.gz
+python-meh-0.5.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/F-12/python-meh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-meh.spec	25 Sep 2009 19:29:48 -0000	1.4
+++ python-meh.spec	29 Sep 2009 18:28:54 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: http://git.fedoraproject.org/git/?p=python-meh.git
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_datadir}/python-meh
 
 %changelog
+* Tue Sep 29 2009 Chris Lumens <clumens at redhat.com> - 0.5-1
+- Always compare version numbers as strings (#526188).
+
 * Fri Sep 25 2009 Chris Lumens <clumens at redhat.com> - 0.4-1
 - Add a default description to bug reports.
 - Handle the user pressing Escape by continuing to show the dialog.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Sep 2009 19:29:48 -0000	1.5
+++ sources	29 Sep 2009 18:28:54 -0000	1.6
@@ -1 +1 @@
-8a368a55ad1273a8e9f0872d1807fb66  python-meh-0.4.tar.gz
+f5ea8244a49657e770f23675e2997888  python-meh-0.5.tar.gz



From denis at fedoraproject.org  Tue Sep 29 18:45:11 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 29 Sep 2009 18:45:11 +0000 (UTC)
Subject: rpms/libgdamm/devel .cvsignore, 1.12, 1.13 libgdamm.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090929184511.1765011C00C1@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgdamm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26551

Modified Files:
	.cvsignore libgdamm.spec sources 
Log Message:
Update to upstream 3.99.17.1. Added documentation under gtk-doc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	25 Jun 2009 07:16:02 -0000	1.12
+++ .cvsignore	29 Sep 2009 18:45:10 -0000	1.13
@@ -1 +1 @@
-libgdamm-3.99.15.tar.bz2
+libgdamm-3.99.17.1.tar.bz2


Index: libgdamm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/libgdamm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libgdamm.spec	25 Jul 2009 05:41:24 -0000	1.18
+++ libgdamm.spec	29 Sep 2009 18:45:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		libgdamm
-Version:	3.99.15
-Release:	2%{?dist}
+Version:	3.99.17.1
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -37,6 +37,17 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation, put everything under gtk-doc
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
+mv ${RPM_BUILD_ROOT}%{_docdir}/libgdamm-4.0/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0/
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libgdamm-4.0/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
+
+# Fix devhelp broken base
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/libgdamm-4.0/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libgdamm-4.0/*.devhelp2
+# Remove old doc directory
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/libgdamm-4.0
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,26 +55,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/libgdamm-4.0
 %{_libdir}/*.so
 %{_libdir}/libgdamm-4.0
 %{_libdir}/pkgconfig/*.pc
+%doc %{_datadir}/gtk-doc/html/libgdamm-4.0
+
 
 %changelog
+* Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 3.99.17.1-1
+- Update to upstream 3.99.17.1
+- Added documentation under gtk-doc
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.99.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Jun 25 2009 Denis Leroy <denis at poolshark.org> - 3.99.15-1
 - Update to upstream 3.99.15, as part of glom update
 
-* Mon Mar 23 2009  <denis at poolshark.org> - 3.99.14-1
+* Mon Mar 23 2009 Denis Leroy <denis at poolshark.org> - 3.99.14-1
 - Update to upstream 3.99.14
 
 * Wed Mar  4 2009 Denis Leroy <denis at poolshark.org> - 3.99.12-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Jun 2009 07:16:02 -0000	1.12
+++ sources	29 Sep 2009 18:45:10 -0000	1.13
@@ -1 +1 @@
-a2ce57fc1e04fe87a63429b3ca87ff1c  libgdamm-3.99.15.tar.bz2
+227d838905b45e8ccd6440cf661630fc  libgdamm-3.99.17.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 29 18:47:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:47:19 +0000
Subject: [pkgdb] at: tmraz has requested watchcommits
Message-ID: <20090929184719.7738110F88B@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on at (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/at



From pkgdb at fedoraproject.org  Tue Sep 29 18:47:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:47:22 +0000
Subject: [pkgdb] at: tmraz has requested commit
Message-ID: <20090929184722.5A4FF10F88C@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on at (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/at



From pkgdb at fedoraproject.org  Tue Sep 29 18:47:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:47:28 +0000
Subject: [pkgdb] at: tmraz has requested watchcommits
Message-ID: <20090929184728.7930D10F888@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on at (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/at



From pkgdb at fedoraproject.org  Tue Sep 29 18:47:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:47:29 +0000
Subject: [pkgdb] at: tmraz has requested commit
Message-ID: <20090929184729.27DD310F894@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on at (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/at



From denis at fedoraproject.org  Tue Sep 29 18:48:31 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 29 Sep 2009 18:48:31 +0000 (UTC)
Subject: rpms/libgdamm/F-12 .cvsignore, 1.12, 1.13 libgdamm.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090929184831.A9D0211C00C1@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgdamm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28353

Modified Files:
	.cvsignore libgdamm.spec sources 
Log Message:
Update to upstream 3.99.17.1. Added documentation under gtk-doc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	25 Jun 2009 07:16:02 -0000	1.12
+++ .cvsignore	29 Sep 2009 18:48:31 -0000	1.13
@@ -1 +1 @@
-libgdamm-3.99.15.tar.bz2
+libgdamm-3.99.17.1.tar.bz2


Index: libgdamm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/F-12/libgdamm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libgdamm.spec	25 Jul 2009 05:41:24 -0000	1.18
+++ libgdamm.spec	29 Sep 2009 18:48:31 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		libgdamm
-Version:	3.99.15
-Release:	2%{?dist}
+Version:	3.99.17.1
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -37,6 +37,17 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation, put everything under gtk-doc
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
+mv ${RPM_BUILD_ROOT}%{_docdir}/libgdamm-4.0/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0/
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libgdamm-4.0/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
+
+# Fix devhelp broken base
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/libgdamm-4.0/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libgdamm-4.0/*.devhelp2
+# Remove old doc directory
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/libgdamm-4.0
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,26 +55,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/libgdamm-4.0
 %{_libdir}/*.so
 %{_libdir}/libgdamm-4.0
 %{_libdir}/pkgconfig/*.pc
+%doc %{_datadir}/gtk-doc/html/libgdamm-4.0
+
 
 %changelog
+* Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 3.99.17.1-1
+- Update to upstream 3.99.17.1
+- Added documentation under gtk-doc
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.99.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Jun 25 2009 Denis Leroy <denis at poolshark.org> - 3.99.15-1
 - Update to upstream 3.99.15, as part of glom update
 
-* Mon Mar 23 2009  <denis at poolshark.org> - 3.99.14-1
+* Mon Mar 23 2009 Denis Leroy <denis at poolshark.org> - 3.99.14-1
 - Update to upstream 3.99.14
 
 * Wed Mar  4 2009 Denis Leroy <denis at poolshark.org> - 3.99.12-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Jun 2009 07:16:02 -0000	1.12
+++ sources	29 Sep 2009 18:48:31 -0000	1.13
@@ -1 +1 @@
-a2ce57fc1e04fe87a63429b3ca87ff1c  libgdamm-3.99.15.tar.bz2
+227d838905b45e8ccd6440cf661630fc  libgdamm-3.99.17.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 29 18:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:50:01 +0000
Subject: [pkgdb] at had acl change status
Message-ID: <20090929185001.D09A310F88C@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchcommits acl on at (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/at



From pkgdb at fedoraproject.org  Tue Sep 29 18:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:50:03 +0000
Subject: [pkgdb] at had acl change status
Message-ID: <20090929185003.63CE410F8A8@bastion2.fedora.phx.redhat.com>

mmaslano has set the commit acl on at (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/at



From tmraz at fedoraproject.org  Tue Sep 29 18:54:20 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 29 Sep 2009 18:54:20 +0000 (UTC)
Subject: rpms/at/F-12 at-3.1.10-pam.patch,1.6,1.7 at.spec,1.78,1.79
Message-ID: <20090929185420.C6E3811C00C1@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/at/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30538

Modified Files:
	at-3.1.10-pam.patch at.spec 
Log Message:
* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-38
- authentication PAM modules have to be configured for pam_setcred()


at-3.1.10-pam.patch:
 Makefile.in  |    5 -
 atd.c        |  251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 config.h.in  |    6 +
 configure.in |   15 +++
 pam_atd      |    9 ++
 perm.c       |   51 +++++++++++
 6 files changed, 314 insertions(+), 23 deletions(-)

Index: at-3.1.10-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/at/F-12/at-3.1.10-pam.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- at-3.1.10-pam.patch	16 Sep 2009 09:31:39 -0000	1.6
+++ at-3.1.10-pam.patch	29 Sep 2009 18:54:20 -0000	1.7
@@ -1,10 +1,11 @@
 --- at-3.1.10/pam_atd.pam   2007-07-03 13:29:24.000000000 +0200
 +++ at-3.1.10/pam_atd   2007-07-03 13:29:24.000000000 +0200
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
 +# The PAM configuration file for the at daemon
 +#
 +#
-+# PAM authentication not called, no auth modules needed
++auth       required    pam_env.so
++auth       include     password-auth
 +account    required    pam_access.so
 +account    include     password-auth
 +session    required    pam_loginuid.so


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/F-12/at.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- at.spec	16 Sep 2009 09:31:40 -0000	1.78
+++ at.spec	29 Sep 2009 18:54:20 -0000	1.79
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -196,6 +196,9 @@ fi
 %attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-38
+- authentication PAM modules have to be configured for pam_setcred()
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-37
 - improve the PAM configuration, use password-auth common stack
 



From pkgdb at fedoraproject.org  Tue Sep 29 18:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:56:22 +0000
Subject: [pkgdb] at had acl change status
Message-ID: <20090929185622.448BE10F874@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchcommits acl on at (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/at



From pkgdb at fedoraproject.org  Tue Sep 29 18:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 18:56:25 +0000
Subject: [pkgdb] at had acl change status
Message-ID: <20090929185625.99AB910F857@bastion2.fedora.phx.redhat.com>

mmaslano has set the commit acl on at (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/at



From jgarzik at fedoraproject.org  Tue Sep 29 19:01:13 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 29 Sep 2009 19:01:13 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.16,1.17
Message-ID: <20090929190113.8420F11C0423@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv814

Modified Files:
	tabled.spec 
Log Message:
update to upstream


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tabled.spec	29 Sep 2009 03:00:22 -0000	1.16
+++ tabled.spec	29 Sep 2009 19:01:11 -0000	1.17
@@ -1,13 +1,15 @@
 Name:		tabled
-Version:	0.3
-Release:	6%{?dist}
+Version:	0.4
+Release:	0.1.g0c7f54dc%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-Source0:	tabled-%{version}.tar.gz
+# pulled from upstream git, commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
+# to recreate tarball, check out commit, then run "make dist"
+Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
 Source3:	tabled.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,8 +44,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
-
+%setup -q -n tabled-0.4git
 
 %build
 %configure --disable-static
@@ -101,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.1.g0c7f54dc
+- update to git commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
+
 * Mon Sep 28 2009 Pete Zaitcev <zaitcev at redhat.com> - 0.3-6
 - Drop ExcludeArch, fixed in bz#514651.
 



From jgarzik at fedoraproject.org  Tue Sep 29 19:01:59 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 29 Sep 2009 19:01:59 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.17,1.18
Message-ID: <20090929190159.0672C11C0423@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1111

Modified Files:
	tabled.spec 
Log Message:
update to upstream


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- tabled.spec	29 Sep 2009 19:01:11 -0000	1.17
+++ tabled.spec	29 Sep 2009 19:01:58 -0000	1.18
@@ -102,7 +102,7 @@ fi
 %{_includedir}/*
 
 %changelog
-* Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.1.g0c7f54dc
+* Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.1.g0c7f54dc
 - update to git commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
 
 * Mon Sep 28 2009 Pete Zaitcev <zaitcev at redhat.com> - 0.3-6



From rdieter at fedoraproject.org  Tue Sep 29 19:17:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 19:17:06 +0000 (UTC)
Subject: rpms/wv2/F-12 wv2-0.2.2-no-extra-libs.patch, 1.2,
	1.3 wv2-0.2.2-no-undefined.patch, 1.2, 1.3 wv2-fixmultilib.patch,
	1.2, 1.3 wv2-gcc43.patch, 1.2, 1.3 .cvsignore, 1.4, 1.5 sources,
	1.4, 1.5 wv2.spec, 1.18, 1.19 wv2-0.4.0-LIB_SUFFIX.patch, 1.1,
	NONE wv2-0.4.0-defines.patch, 1.1,
	NONE wv2-0.4.0-extra_libs.patch, 1.1,
	NONE wv2-0.4.0-multilib.patch, 1.1, NONE
Message-ID: <20090929191706.D86E011C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6940

Modified Files:
	.cvsignore sources wv2.spec 
Added Files:
	wv2-0.2.2-no-extra-libs.patch wv2-0.2.2-no-undefined.patch 
	wv2-fixmultilib.patch wv2-gcc43.patch 
Removed Files:
	wv2-0.4.0-LIB_SUFFIX.patch wv2-0.4.0-defines.patch 
	wv2-0.4.0-extra_libs.patch wv2-0.4.0-multilib.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.2.3-9
- Epoch: 1
- tighten %files


wv2-0.2.2-no-extra-libs.patch:
 wv2-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: wv2-0.2.2-no-extra-libs.patch
===================================================================
RCS file: wv2-0.2.2-no-extra-libs.patch
diff -N wv2-0.2.2-no-extra-libs.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wv2-0.2.2-no-extra-libs.patch	29 Sep 2009 19:17:06 -0000	1.3
@@ -0,0 +1,11 @@
+--- wv2-0.2.2/wv2-config.in.extra_libs	2006-02-21 11:36:20.000000000 -0600
++++ wv2-0.2.2/wv2-config.in	2004-05-09 13:23:15.000000000 -0500
+@@ -76,7 +76,7 @@
+ 	echo $exec_prefix
+ fi
+ 
+-wv2_libs="-lwv2 @WV_LDFLAGS@"
++wv2_libs="-lwv2"
+ 
+ if test "$echo_cflags" = "yes"; then
+ 	includes="@WV_CFLAGS@"

wv2-0.2.2-no-undefined.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: wv2-0.2.2-no-undefined.patch
===================================================================
RCS file: wv2-0.2.2-no-undefined.patch
diff -N wv2-0.2.2-no-undefined.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wv2-0.2.2-no-undefined.patch	29 Sep 2009 19:17:06 -0000	1.3
@@ -0,0 +1,11 @@
+--- wv2-0.2.2/src/Makefile.am.no-undefined	2004-05-09 13:23:16.000000000 -0500
++++ wv2-0.2.2/src/Makefile.am	2006-02-21 12:02:08.000000000 -0600
+@@ -16,7 +16,7 @@
+ 
+ libwv2_la_LDFLAGS = \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+-	-export-dynamic
++	-export-dynamic -no-undefined -Wl,--no-undefined
+ 
+ libwv2_la_SOURCES = olestorage.cpp olestream.cpp \
+ 	word97_generated.cpp word97_helper.cpp word95_helper.cpp \

wv2-fixmultilib.patch:
 wv2-config.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: wv2-fixmultilib.patch
===================================================================
RCS file: wv2-fixmultilib.patch
diff -N wv2-fixmultilib.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wv2-fixmultilib.patch	29 Sep 2009 19:17:06 -0000	1.3
@@ -0,0 +1,17 @@
+--- wv2-config.in.orig	2008-01-04 00:28:42.000000000 +0100
++++ wv2-config.in	2008-01-04 00:30:43.000000000 +0100
+@@ -87,7 +87,6 @@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-	libdirs=-L at libdir@
+ 	my_wv2_libs=
+ 	for i in $wv2_libs ; do
+ 		if test "x$i" != "x-L at libdir@" ; then
+@@ -99,5 +98,5 @@
+ 		fi
+ 	done
+ 
+-	echo $libdirs $my_wv2_libs
++	echo $my_wv2_libs
+ fi      

wv2-gcc43.patch:
 styles.cpp |    1 +
 1 file changed, 1 insertion(+)

Index: wv2-gcc43.patch
===================================================================
RCS file: wv2-gcc43.patch
diff -N wv2-gcc43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wv2-gcc43.patch	29 Sep 2009 19:17:06 -0000	1.3
@@ -0,0 +1,10 @@
+--- src/styles.cpp.orig	2008-02-22 15:40:41.000000000 +0100
++++ src/styles.cpp	2008-02-22 15:41:05.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include "wvlog.h"
+ #include <algorithm>
++#include <string.h>
+ 
+ namespace wvWare
+ {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Sep 2009 15:56:41 -0000	1.4
+++ .cvsignore	29 Sep 2009 19:17:05 -0000	1.5
@@ -1 +1 @@
-wv2-0.4.0.tar.bz2
+wv2-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Sep 2009 15:56:41 -0000	1.4
+++ sources	29 Sep 2009 19:17:06 -0000	1.5
@@ -1 +1 @@
-e0acd7a551c898aab3fb6afafc606bb4  wv2-0.4.0.tar.bz2
+ea7e3331fbe597185070c0784411a3f7  wv2-0.2.3.tar.bz2


Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/wv2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- wv2.spec	11 Sep 2009 16:47:37 -0000	1.18
+++ wv2.spec	29 Sep 2009 19:17:06 -0000	1.19
@@ -1,28 +1,31 @@
+
 Name:           wv2
-Version:        0.4.0
-Release:        1%{?dist}
+Epoch:          1
+Version:        0.2.3
+Release:        9%{?dist}
 Summary:        A library which allows access to Microsoft? Word files
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://wvware.sourceforge.net
-Source0:        http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2
+Source0:        http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2
+# see bug #182293
+Patch1:         wv2-0.2.2-no-undefined.patch
+# see bug #192291
+Patch2:         wv2-0.2.2-no-extra-libs.patch
+# see bug #343451 
+Patch3:         wv2-fixmultilib.patch
+# fix gcc43 build
+Patch4:         wv2-gcc43.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# see bug #192291
-Patch2: wv2-0.4.0-extra_libs.patch
-# see bug #343451
-Patch3: wv2-0.4.0-multilib.patch
-## upstreamable patches
-Patch50: wv2-0.4.0-defines.patch
-Patch51: wv2-0.4.0-LIB_SUFFIX.patch
-
-BuildRequires: cmake
-BuildRequires: libgsf-devel
-BuildRequires: libxml2-devel
-BuildRequires: pkgconfig
-BuildRequires: glib2-devel
-BuildRequires: zlib-devel
+BuildRequires:  automake libtool
+BuildRequires:  libgsf-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  glib2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig
 
 %description
 wv is a library which allows access to Microsoft? Word files. It can load and
@@ -33,27 +36,25 @@ formats as well: Word 2 docs are convert
 %package devel
 Summary:        Development tools for programs which will use the wv2 library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       libgsf-devel
 Requires:       glib2-devel
 Requires:       libxml2-devel
+
 %description devel 
 The wv2-devel package includes the header files necessary for developing.
 
-
 %prep
 %setup -q
 
+%patch1 -p1 -b .no-undefined
 %patch2 -p1 -b .extra_libs
-%patch3 -p1 -b .multilib
-%patch50 -p1 -b .defines
-%patch51 -p1 -b .LIB_SUFFIX
-
+%patch3
+./autogen.sh
+%patch4
 
 %build
-
-%cmake .
-
+%configure --disable-warnings --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -61,50 +62,33 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
-
-%check
-# checks currently fail on ppc64, appears to be a toolchain prob
-%ifarch ppc64
-make -k test ||: 
-%else
-make -k test
-%endif
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/wv2-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO
-%{_libdir}/libwv2.so.3*
-%dir %{_libdir}/wvWare/
+%{_libdir}/libwv2.so.1*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/wv2-config
 %{_libdir}/libwv2.so
-%{_libdir}/wvWare/wv2-noconfig.cmake
-%{_libdir}/wvWare/wv2.cmake
 %{_includedir}/wv2/
 
-
 %changelog
-* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
-- wv2-0.4.0
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.2.3-9
+- Epoch: 1
+- tighten %%files
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


--- wv2-0.4.0-LIB_SUFFIX.patch DELETED ---


--- wv2-0.4.0-defines.patch DELETED ---


--- wv2-0.4.0-extra_libs.patch DELETED ---


--- wv2-0.4.0-multilib.patch DELETED ---



From rdieter at fedoraproject.org  Tue Sep 29 19:18:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 19:18:15 +0000 (UTC)
Subject: rpms/wv2/F-12 wv2.spec,1.19,1.20
Message-ID: <20090929191815.81C6611C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7215

Modified Files:
	wv2.spec 
Log Message:
Release++



Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/wv2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- wv2.spec	29 Sep 2009 19:17:06 -0000	1.19
+++ wv2.spec	29 Sep 2009 19:18:14 -0000	1.20
@@ -2,7 +2,7 @@
 Name:           wv2
 Epoch:          1
 Version:        0.2.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A library which allows access to Microsoft? Word files
 
 Group:          System Environment/Libraries
@@ -86,10 +86,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/wv2/
 
 %changelog
-* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.2.3-9
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.2.3-10
 - Epoch: 1
 - tighten %%files
 
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From tmraz at fedoraproject.org  Tue Sep 29 19:21:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 29 Sep 2009 19:21:36 +0000 (UTC)
Subject: rpms/opensc/devel opensc.spec,1.49,1.50
Message-ID: <20090929192136.D866211C0423@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8520

Modified Files:
	opensc.spec 
Log Message:
* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-2
- fix multilib conflict in the configuration file (#526269)



Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- opensc.spec	9 Sep 2009 15:33:07 -0000	1.49
+++ opensc.spec	29 Sep 2009 19:21:36 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -70,7 +70,7 @@ sed -i -e 's|/usr/local/towitoko/lib/|/u
   --enable-pcsc \
   --enable-openct \
   --enable-doc \
-  --with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \
+  --with-pcsc-provider=libpcsclite.so.1 \
   --with-plugindir=%{plugindir} \
   --with-pin-entry=%{_bindir}/pinentry
 make %{?_smp_mflags}
@@ -81,6 +81,8 @@ rm -rf $RPM_BUILD_ROOT _docs
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
+# use NEWS file timestamp as reference for configuration file
+touch -r NEWS $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
@@ -153,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-2
+- fix multilib conflict in the configuration file (#526269)
+
 * Wed Sep 09 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-1
 - new upstream version
 



From crobinso at fedoraproject.org  Tue Sep 29 19:24:29 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 29 Sep 2009 19:24:29 +0000 (UTC)
Subject: rpms/virt-manager/F-12 virt-manager-0.8.0-fix-vcpu-hotplug.patch,
	NONE, 1.1 virt-manager-0.8.0-hide-help-docs.patch, NONE,
	1.1 virt-manager-0.8.0-update-translations.patch, NONE,
	1.1 virt-manager-0.8.0-update-vm-state.patch, NONE,
	1.1 virt-manager.spec, 1.60,
	1.61 virtinst-0.500.0-change-path-perms.patch, 1.1,
	NONE virtinst-0.500.0-no-iso-driver.patch, 1.1, NONE
Message-ID: <20090929192429.372FF11C00C1@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9465

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-fix-vcpu-hotplug.patch 
	virt-manager-0.8.0-hide-help-docs.patch 
	virt-manager-0.8.0-update-translations.patch 
	virt-manager-0.8.0-update-vm-state.patch 
Removed Files:
	virtinst-0.500.0-change-path-perms.patch 
	virtinst-0.500.0-no-iso-driver.patch 
Log Message:
Fix VCPU hotplug
Remove access to outdated docs (bz 522823, bz 524805)
Update VM state text in manager view (bz 526182)
Update translations (bz 493795)


virt-manager-0.8.0-fix-vcpu-hotplug.patch:
 domain.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.0-fix-vcpu-hotplug.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253823268 14400
# Node ID d78b7e7131439dc9f22c8e7391e82c5f29888fe8
# Parent  cfcd19d057ddc973a129e7816cd4ea39f0d4365a
Fix vcpu hotplug.

diff -r cfcd19d057dd -r d78b7e713143 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/domain.py	Thu Sep 24 16:14:28 2009 -0400
@@ -1355,7 +1355,7 @@
         self._change_cdrom(result, dev_id_info)
 
     def hotplug_vcpu(self, vcpus):
-        self.vm.setVcpus()
+        self.vm.setVcpus(int(vcpus))
 
     def hotplug_vcpus(self, vcpus):
         vcpus = int(vcpus)

virt-manager-0.8.0-hide-help-docs.patch:
 addhardware.py |    3 +++
 clone.py       |    3 +++
 createnet.py   |    3 +++
 createpool.py  |    3 +++
 createvol.py   |    4 ++++
 details.py     |    5 ++++-
 host.py        |    3 +++
 manager.py     |    7 ++++++-
 preferences.py |    3 +++
 9 files changed, 32 insertions(+), 2 deletions(-)

--- NEW FILE virt-manager-0.8.0-hide-help-docs.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254248737 14400
# Node ID 65951459abe9efb9fc5f58a243ddcfd49deba0a5
# Parent  59f3d7a2ec289145c41437b7f12bcd730e17f340
Hide access to help docs: they are out of date to the point of uselessness.

diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/addhardware.py	Tue Sep 29 14:25:37 2009 -0400
@@ -115,6 +115,9 @@
             "char_telnet_focus_in": (self.update_doc, "protocol"),
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("create-help").hide()
+
         self.set_initial_state()
 
     def update_doc(self, ignore1, ignore2, param):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/clone.py
--- a/src/virtManager/clone.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/clone.py	Tue Sep 29 14:25:37 2009 -0400
@@ -129,6 +129,9 @@
             "on_clone_help_clicked" : self.show_help,
         })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("clone-help").hide()
+
         self.set_initial_state()
 
     def show(self):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/createnet.py
--- a/src/virtManager/createnet.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/createnet.py	Tue Sep 29 14:25:37 2009 -0400
@@ -68,6 +68,9 @@
             "on_create_help_clicked": self.show_help,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("create-help").hide()
+
         self.set_initial_state()
 
     def show(self):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/createpool.py
--- a/src/virtManager/createpool.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/createpool.py	Tue Sep 29 14:25:37 2009 -0400
@@ -88,6 +88,9 @@
             "on_pool_build_focus_in_event": (self.update_build_doc)
         })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("pool-help").hide()
+
         self.set_initial_state()
 
     def show(self):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/createvol.py
--- a/src/virtManager/createvol.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/createvol.py	Tue Sep 29 14:25:37 2009 -0400
@@ -72,6 +72,10 @@
         format_list.add_attribute(text2, 'text', 1)
         self.window.get_widget("vol-info-view").modify_bg(gtk.STATE_NORMAL,
                                                           gtk.gdk.color_parse("grey"))
+
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("pool-help").hide()
+
         self.reset_state()
 
 
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/details.py
--- a/src/virtManager/details.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/details.py	Tue Sep 29 14:25:37 2009 -0400
@@ -313,6 +313,9 @@
             "on_security_model_changed": self.security_model_changed,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("help1").hide()
+
         self.vm.connect("status-changed", self.update_widget_states)
         self.vm.connect("resources-sampled", self.refresh_resources)
         self.vm.connect("config-changed", self.refresh_vm_info)
@@ -575,7 +578,7 @@
         if self.is_visible():
             self.topwin.present()
             return
-        self.topwin.show_all()
+        self.topwin.show()
         self.topwin.present()
 
         self.engine.increment_window_counter()
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/host.py
--- a/src/virtManager/host.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/host.py	Tue Sep 29 14:25:37 2009 -0400
@@ -169,6 +169,9 @@
             "on_config_autoconnect_toggled": self.toggle_autoconnect,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("help1").hide()
+
         self.conn.connect("resources-sampled", self.refresh_resources)
         self.reset_state()
 
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/manager.py	Tue Sep 29 14:25:37 2009 -0400
@@ -188,6 +188,7 @@
             filename = self.config.get_icon_dir() + "/%s" % iconfile
             pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename, l, w)
             image = gtk.image_new_from_pixbuf(pixbuf)
+            image.show_all()
             self.window.get_widget(widget).set_icon_widget(image)
 
         set_toolbar_image("vm-new", "vm_new_wizard.png", 28, 28)
@@ -356,6 +357,9 @@
             "on_menu_help_activate": self.show_help,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("menu_help").hide()
+
         self.vm_selected(None)
         self.window.get_widget("vm-list").get_selection().connect("changed", self.vm_selected)
 
@@ -391,7 +395,8 @@
         if self.is_visible():
             win.present()
             return
-        win.show_all()
+        win.show()
+        win.present()
         self.engine.increment_window_counter()
 
         if self.startup_error:
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/preferences.py
--- a/src/virtManager/preferences.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/preferences.py	Tue Sep 29 14:25:37 2009 -0400
@@ -75,6 +75,9 @@
             "on_prefs_stats_enable_net_toggled": self.change_net_poll,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("prefs-help").hide()
+
     def close(self, ignore1=None, ignore2=None):
         self.topwin.hide()
         return 1

virt-manager-0.8.0-update-translations.patch:
 as.po       | 1847 ++---
 bg.po       |  918 +-
 bn_IN.po    | 2250 ++----
 bs.po       |  917 +-
 ca.po       |  921 +-
 cs.po       |  917 +-
 da.po       |  917 +-
 de.po       | 8692 ++++++++++++--------------
 es.po       | 1187 +--
 fi.po       |  921 +-
 fr.po       |19894 +++++++++++++++++++++++++++++-------------------------------
 gu.po       | 1492 +---
 hi.po       | 1495 +---
 hr.po       |  918 +-
 hu.po       | 2958 ++++----
 is.po       |  914 +-
 it.po       |  929 +-
 ja.po       | 1169 +--
 kn.po       | 1502 +---
 ko.po       | 2197 +-----
 ml.po       | 2798 +++-----
 mr.po       | 1514 +---
 ms.po       |  923 +-
 nb.po       |  918 +-
 nl.po       | 1144 +--
 or.po       | 1479 +---
 pa.po       | 1496 +---
 pl.po       | 1500 +---
 pt.po       |  924 +-
 pt_BR.po    |  933 +-
 ro.po       |  917 +-
 ru.po       |  918 +-
 sr.po       |  918 +-
 sr at latin.po |  918 +-
 sv.po       |  926 +-
 ta.po       | 1504 +---
 te.po       | 1506 +---
 tr.po       |  911 +-
 uk.po       |  917 +-
 zh_CN.po    | 1165 +--
 zh_TW.po    |  929 +-
 41 files changed, 36406 insertions(+), 41707 deletions(-)

--- NEW FILE virt-manager-0.8.0-update-translations.patch ---
# HG changeset patch
# User Laurent L?onard <laurent at open-minds.org>
# Date 1249496263 14400
# Node ID 5195fe3509bc3a3938c607240f215c9921af8f2c
# Parent  18e673ca4e148a3e023f56353412d259aea487c2
Updated french translation.

diff -r 18e673ca4e14 -r 5195fe3509bc po/fr.po
--- a/po/fr.po	Tue Jul 28 22:25:13 2009 -0400
+++ b/po/fr.po	Wed Aug 05 14:17:43 2009 -0400
@@ -1,5099 +1,4131 @@
-# translation of virt-manager.tip.po to french
-# Copyright (C) 2006 Virt-Manager
-# This file is distributed under the same license as the Virt-Manager package.
-#
-# Damien Durand <splinux at fedoraproject.org>, 2006.
-# Thomas Canniot <thomas.canniot at laposte.net>, 2006, 2007.
-# Alain PORTAL <aportal at univ-montp2.fr>, 2006, 2007.
-# Decroux Fabien <fdecroux at redhat.com>, 2006.
-# Gauthier Ancelin <gauthier.ancelin at laposte.net>, 2007, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: virt-manager.tip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-28 20:55-0400\n"
-"PO-Revision-Date: 2008-01-31 20:53+0100\n"
-"Last-Translator: Gauthier Ancelin <gauthier.ancelin at laposte.net>\n"
-"Language-Team: french <fedora-trans-fr at redhat.com>\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"
-
-#: ../src/virt-manager.desktop.in.in.h:1
-msgid "Manage virtual machines"
-msgstr "G?rer les machines virtuelles"
-
-#: ../src/virt-manager.desktop.in.in.h:2 ../src/virtManager/systray.py:101
-#: ../src/vmm-manager.glade.h:11
-msgid "Virtual Machine Manager"
-msgstr "Gestionnaire de machine virtuelle"
-
-#: ../src/virt-manager.py.in:55
-#, fuzzy
-msgid "Error starting Virtual Machine Manager"
-msgstr "Gestionnaire de machine virtuelle"
-
-#. ...the risk is we catch too much though
-#. Damned if we do, damned if we dont :-)(
-#: ../src/virt-manager.py.in:288
-#, fuzzy, python-format
-msgid "Unable to initialize GTK: %s"
-msgstr "Impossible d'initialiser GTK : "
-
-#: ../src/virt-manager.schemas.in.h:1
-msgid "Default image path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:2
-#, fuzzy
-msgid "Default media path"
-msgstr "Param?tre de r?seau invalide"
-
-#: ../src/virt-manager.schemas.in.h:3
-msgid "Default path for choosing VM images"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:4
-msgid "Default path for choosing media"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:5
-msgid "Default path for saving VM snaphots"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:6
-msgid "Default path for saving screenshots from VMs"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:7
-msgid "Default path for stored VM snapshots"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:8
-msgid "Default restore path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:9
-msgid "Default save domain path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:10
-msgid "Default screenshot path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:11
-msgid "Install sound device for local VM"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:12
-msgid "Install sound device for remote VM"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:13
-msgid "Poll disk i/o stats"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:14
-msgid "Poll net i/o stats"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:15
-msgid "Show system tray icon"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:16
-msgid "Show system tray icon while app is running"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:17
-msgid "Stats type in manager view"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:18
-msgid "The length of the list of URLs"
-msgstr "La longueur de la liste d'URL"
-
-#: ../src/virt-manager.schemas.in.h:19
-msgid "The number of samples to keep in the statistics history"
-msgstr ""
-"Le nombre d'?chantillons ? conserver dans l'historique des statistiques"
-
-#: ../src/virt-manager.schemas.in.h:20
-msgid ""
-"The number of urls to keep in the history for the install media address page."
-msgstr ""
-"Le nombre d'URL ? conserver dans l'historique pour la page des adresses de "
-"media d'installation."
-
-#: ../src/virt-manager.schemas.in.h:21
-msgid "The statistics history length"
-msgstr "La longueur de l'historique de statistiques"
-
-#: ../src/virt-manager.schemas.in.h:22
-msgid "The statistics update interval"
-msgstr "L'intervalle de rafra?chissement des statistiques"
-
-#: ../src/virt-manager.schemas.in.h:23
-msgid "The statistics update interval in seconds"
-msgstr "L'intervalle de rafra?chissement des statistiques en secondes"
-
-#: ../src/virt-manager.schemas.in.h:24
-msgid "Type of stats to graph (cpu, disk, net) in manager view"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:25
-msgid "When to grab keyboard input for the console"
-msgstr "Quand la console peut s'approprier le clavier"
-
-#: ../src/virt-manager.schemas.in.h:26
-msgid "When to pop up a console for a guest"
-msgstr "Quand pr?senter une console pour un invit?"
-
-#: ../src/virt-manager.schemas.in.h:27
-msgid "When to scale the VM graphical console"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:28
-#, fuzzy
-msgid ""
-"When to scale the VM graphical console. 0 = never, 1 = only when in full "
-"screen mode, 2 = Always"
-msgstr ""
-"Quand une console d'invit? peut s'approprier le clavier. ? 0 ? = jamais, ? 1 ? "
-"= seulement en mode plein ?cran, ? 2 ? = lorsque la souris est au-dessus de "
-"la console"
-
-#: ../src/virt-manager.schemas.in.h:29
-msgid "Whether or not the app will poll VM disk i/o statistics"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:30
-msgid "Whether or not the app will poll VM network i/o statistics"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:31
-msgid ""
-"Whether to grab keyboard input for a guest console. 0 = never, 1 = only when "
-"in full screen mode, 2 = when mouse is over console"
-msgstr ""
-"Quand une console d'invit? peut s'approprier le clavier. ? 0 ? = jamais, ? 1 ? "
-"= seulement en mode plein ?cran, ? 2 ? = lorsque la souris est au-dessus de "
-"la console"
-
-#: ../src/virt-manager.schemas.in.h:32
-msgid "Whether to install a sound device for local VMs or not"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:33
[...148040 lines suppressed...]
 msgstr ""
 
-#: ../src/vmm-create.glade.h:44
+#: ../src/vmm-create.glade.h:45
 msgid "URL:"
 msgstr ""
 
-#: ../src/vmm-create.glade.h:45
+#: ../src/vmm-create.glade.h:46
 #, fuzzy
 msgid "Use CDROM or DVD"
 msgstr "???? DVD ???(_C)"
 
-#: ../src/vmm-create.glade.h:46
+#: ../src/vmm-create.glade.h:47
 #, fuzzy
 msgid "Use ISO image:"
 msgstr "?? ISO ???"
 
-#: ../src/vmm-create.glade.h:47
+#: ../src/vmm-create.glade.h:48
 #, fuzzy
 msgid "Version:"
 msgstr "???"
 
-#: ../src/vmm-create.glade.h:48
+#: ../src/vmm-create.glade.h:49
 #, fuzzy
 msgid "Virt Type:"
 msgstr "???"
@@ -3076,10 +3074,6 @@
 msgid "Delete associated storage files"
 msgstr ""
 
-#: ../src/vmm-delete.glade.h:4
-msgid "gtk-delete"
-msgstr ""
-
 #: ../src/vmm-details.glade.h:1
 msgid ""
 "0 KBytes/s\n"
@@ -3229,7 +3223,7 @@
 msgid "Device virtual machine will boot from:"
 msgstr "?????????????"
 
-#: ../src/vmm-details.glade.h:40 ../src/vmm-manager.glade.h:4
+#: ../src/vmm-details.glade.h:40 ../src/vmm-manager.glade.h:2
 msgid "Disk"
 msgstr "??"
 
@@ -3431,10 +3425,6 @@
 msgid "Stats"
 msgstr "??"
 
-#: ../src/vmm-details.glade.h:100
-msgid "Status:"
-msgstr "???"
-
 #: ../src/vmm-details.glade.h:101
 msgid "Target Port:"
 msgstr "??????"
@@ -3508,29 +3498,24 @@
 msgstr "??(_B)..."
 
 #: ../src/vmm-details.glade.h:119 ../src/vmm-host.glade.h:41
-#: ../src/vmm-manager.glade.h:12
-msgid "_Contents"
-msgstr "??(_C)"
-
-#: ../src/vmm-details.glade.h:120 ../src/vmm-host.glade.h:42
-#: ../src/vmm-manager.glade.h:14
+#: ../src/vmm-manager.glade.h:9
 msgid "_File"
 msgstr "??(_F)"
 
-#: ../src/vmm-details.glade.h:121 ../src/vmm-host.glade.h:43
-#: ../src/vmm-manager.glade.h:15
+#: ../src/vmm-details.glade.h:120 ../src/vmm-host.glade.h:42
+#: ../src/vmm-manager.glade.h:10
 msgid "_Help"
 msgstr "??(_H)"
 
-#: ../src/vmm-details.glade.h:125
+#: ../src/vmm-details.glade.h:124
 msgid "_Save"
 msgstr "??(_S)"
 
-#: ../src/vmm-details.glade.h:126
+#: ../src/vmm-details.glade.h:125
 msgid "_Take Screenshot"
 msgstr "????(_T)"
 
-#: ../src/vmm-details.glade.h:127 ../src/vmm-manager.glade.h:21
+#: ../src/vmm-details.glade.h:126 ../src/vmm-manager.glade.h:16
 msgid "_View"
 msgstr "??(_V)"
 
@@ -3590,7 +3575,7 @@
 msgid "Forwarding:"
 msgstr "???"
 
-#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:6
+#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:4
 msgid "Host Details"
 msgstr "??????"
 
@@ -3651,50 +3636,32 @@
 msgstr "????"
 
 #: ../src/vmm-manager.glade.h:1
-msgid "Add Connection..."
-msgstr "????..."
-
-#: ../src/vmm-manager.glade.h:2
 #, fuzzy
 msgid "CPU"
 msgstr "VCPU"
 
 #: ../src/vmm-manager.glade.h:3
-#, fuzzy
-msgid "Delete Virtual Machine"
-msgstr "??????"
-
-#: ../src/vmm-manager.glade.h:5
 msgid "Graph"
 msgstr ""
 
-#: ../src/vmm-manager.glade.h:8
+#: ../src/vmm-manager.glade.h:6
 msgid "Restore a saved machine from a filesystem image"
 msgstr "???????????????????"
 
-#: ../src/vmm-manager.glade.h:9
-msgid "Restore saved machine..."
-msgstr "????????..."
-
-#: ../src/vmm-manager.glade.h:10
-#, fuzzy
-msgid "Virtual Machine Details"
-msgstr "????"
-
-#: ../src/vmm-manager.glade.h:13
+#: ../src/vmm-manager.glade.h:8
 msgid "_Edit"
 msgstr "??(_E)"
 
-#: ../src/vmm-manager.glade.h:16
+#: ../src/vmm-manager.glade.h:11
 #, fuzzy
 msgid "_New"
 msgstr "??(_V)"
 
-#: ../src/vmm-manager.glade.h:17
+#: ../src/vmm-manager.glade.h:12
 msgid "_Open"
 msgstr ""
 
-#: ../src/vmm-manager.glade.h:20
+#: ../src/vmm-manager.glade.h:15
 #, fuzzy
 msgid "_Shutdown"
 msgstr "??"
@@ -3879,6 +3846,26 @@
 msgid "_New Volume"
 msgstr "???"
 
+#~ msgid "Create _Volume"
+#~ msgstr "????(_V)"
+
+#~ msgid "_Contents"
+#~ msgstr "??(_C)"
+
+#~ msgid "Add Connection..."
+#~ msgstr "????..."
+
+#, fuzzy
+#~ msgid "Delete Virtual Machine"
+#~ msgstr "??????"
+
+#~ msgid "Restore saved machine..."
+#~ msgstr "????????..."
+
+#, fuzzy
+#~ msgid "Virtual Machine Details"
+#~ msgstr "????"
+
 #, fuzzy
 #~ msgid "Poll memory usage stats"
 #~ msgstr "????????????"
@@ -4239,10 +4226,6 @@
 #~ msgstr "CPU ???"
 
 #, fuzzy
-#~ msgid "Enable audio:"
-#~ msgstr "?????"
-
-#, fuzzy
 #~ msgid "F_ully virtualized:"
 #~ msgstr "?????(_u)?"
 

virt-manager-0.8.0-update-vm-state.patch:
 manager.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE virt-manager-0.8.0-update-vm-state.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254247348 14400
# Node ID 59f3d7a2ec289145c41437b7f12bcd730e17f340
# Parent  6d219a6db4fbcb343d41a959dac7a8623f3dcbb3
manager: Actually update VM state text when state changes

diff -r 6d219a6db4fb -r 59f3d7a2ec28 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Tue Sep 29 14:00:50 2009 -0400
+++ b/src/virtManager/manager.py	Tue Sep 29 14:02:28 2009 -0400
@@ -584,6 +584,7 @@
         row[ROW_STATUS] = vm.run_status()
         row[ROW_STATUS_ICON] = vm.run_status_icon_large()
         row[ROW_IS_VM_RUNNING] = vm.is_active()
+        row[ROW_MARKUP] = self._build_vm_markup(vm, row)
         model.row_changed(row.path, row.iter)
 
 


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/virt-manager.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- virt-manager.spec	24 Sep 2009 15:47:35 -0000	1.60
+++ virt-manager.spec	29 Sep 2009 19:24:28 -0000	1.61
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 5%{_extra_release}
+Release: 6%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -40,6 +40,14 @@ Patch8: %{name}-%{version}-stats-logging
 Patch9: %{name}-%{version}-refresh-disk-space.patch
 # Offer to fix disk permission issues (bz 517379)
 Patch10: %{name}-%{version}-fix-path-perms.patch
+# Fix VCPU hotplug
+Patch11: %{name}-%{version}-fix-vcpu-hotplug.patch
+# Remove access to outdated docs (bz 522823, bz 524805)
+Patch12: %{name}-%{version}-hide-help-docs.patch
+# Update VM state text in manager view (bz 526182)
+Patch13: %{name}-%{version}-update-vm-state.patch
+# Update translations (bz 493795)
+Patch14: %{name}-%{version}-update-translations.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -117,6 +125,10 @@ cp %{SOURCE3} pixmaps
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 %configure
@@ -190,6 +202,12 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Sep 29 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-6.fc12
+- Fix VCPU hotplug
+- Remove access to outdated docs (bz 522823, bz 524805)
+- Update VM state text in manager view (bz 526182)
+- Update translations (bz 493795)
+
 * Thu Sep 24 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-5.fc12
 - Refresh host disk space in create wizard (bz 502777)
 - Offer to fix disk permission issues (bz 517379)


--- virtinst-0.500.0-change-path-perms.patch DELETED ---


--- virtinst-0.500.0-no-iso-driver.patch DELETED ---



From jgarzik at fedoraproject.org  Tue Sep 29 19:27:29 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 29 Sep 2009 19:27:29 +0000 (UTC)
Subject: rpms/tabled/devel .cvsignore,1.3,1.4 sources,1.9,1.10
Message-ID: <20090929192729.3CB7811C00C1@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11208

Modified Files:
	.cvsignore sources 
Log Message:
check in new source too... doh


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Aug 2009 15:08:01 -0000	1.3
+++ .cvsignore	29 Sep 2009 19:27:28 -0000	1.4
@@ -1 +1 @@
-tabled-0.3.tar.gz
+tabled-0.4git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Aug 2009 15:08:01 -0000	1.9
+++ sources	29 Sep 2009 19:27:28 -0000	1.10
@@ -1 +1 @@
-4beccbcd7adefac4fac775e9ebec4bc1  tabled-0.3.tar.gz
+54d05b0581014cdb876b5edfafa9bbb7  tabled-0.4git.tar.gz



From nsantos at fedoraproject.org  Tue Sep 29 19:27:45 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 19:27:45 +0000 (UTC)
Subject: rpms/rhm/devel dead.package, NONE, 1.1 rhm.spec, 1.48, NONE sources,
	1.18, NONE stdint.patch, 1.3, NONE
Message-ID: <20090929192745.5B5F611C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11320

Added Files:
	dead.package 
Removed Files:
	rhm.spec sources stdint.patch 
Log Message:
rhm package is obsoleted/replaced by a new subpackage of the qpidc rpm, called rhm-cpp-server-store


--- NEW FILE dead.package ---
rhm package is obsoleted/replaced by a new subpackage of the qpidc rpm, called rhm-cpp-server-store


--- rhm.spec DELETED ---


--- sources DELETED ---


--- stdint.patch DELETED ---



From jgarzik at fedoraproject.org  Tue Sep 29 19:28:23 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 29 Sep 2009 19:28:23 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.18,1.19
Message-ID: <20090929192823.F04D311C00C1@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11611

Modified Files:
	tabled.spec 
Log Message:
check in new source too... doh


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- tabled.spec	29 Sep 2009 19:01:58 -0000	1.18
+++ tabled.spec	29 Sep 2009 19:28:23 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.4
-Release:	0.1.g0c7f54dc%{?dist}
+Release:	0.2.g0c7f54dc%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -102,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.2.g0c7f54dc
+- add sources for git commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
+
 * Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.1.g0c7f54dc
 - update to git commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
 



From nsantos at fedoraproject.org  Tue Sep 29 19:28:38 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 29 Sep 2009 19:28:38 +0000 (UTC)
Subject: rpms/rhm/F-12 dead.package, NONE, 1.1 rhm.spec, 1.48, NONE sources, 
	1.18, NONE stdint.patch, 1.3, NONE
Message-ID: <20090929192838.1F3A511C00C1@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11740

Added Files:
	dead.package 
Removed Files:
	rhm.spec sources stdint.patch 
Log Message:
rhm package is obsoleted/replaced by a new subpackage of the qpidc rpm, called rhm-cpp-server-store


--- NEW FILE dead.package ---
rhm package is obsoleted/replaced by a new subpackage of the qpidc rpm, called rhm-cpp-server-store


--- rhm.spec DELETED ---


--- sources DELETED ---


--- stdint.patch DELETED ---



From tmraz at fedoraproject.org  Tue Sep 29 19:31:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 29 Sep 2009 19:31:01 +0000 (UTC)
Subject: rpms/opensc/F-12 opensc.spec,1.49,1.50
Message-ID: <20090929193101.7D02011C0423@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opensc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12760

Modified Files:
	opensc.spec 
Log Message:
* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-2
- fix multilib conflict in the configuration file (#526269)



Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/F-12/opensc.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- opensc.spec	9 Sep 2009 15:33:07 -0000	1.49
+++ opensc.spec	29 Sep 2009 19:31:01 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -70,7 +70,7 @@ sed -i -e 's|/usr/local/towitoko/lib/|/u
   --enable-pcsc \
   --enable-openct \
   --enable-doc \
-  --with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \
+  --with-pcsc-provider=libpcsclite.so.1 \
   --with-plugindir=%{plugindir} \
   --with-pin-entry=%{_bindir}/pinentry
 make %{?_smp_mflags}
@@ -81,6 +81,8 @@ rm -rf $RPM_BUILD_ROOT _docs
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
+# use NEWS file timestamp as reference for configuration file
+touch -r NEWS $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
@@ -153,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-2
+- fix multilib conflict in the configuration file (#526269)
+
 * Wed Sep 09 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.9-1
 - new upstream version
 



From crobinso at fedoraproject.org  Tue Sep 29 19:37:26 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 29 Sep 2009 19:37:26 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.0-fix-vcpu-hotplug.patch, 
	NONE, 1.1 virt-manager-0.8.0-hide-help-docs.patch, NONE,
	1.1 virt-manager-0.8.0-update-translations.patch, NONE,
	1.1 virt-manager-0.8.0-update-vm-state.patch, NONE,
	1.1 virt-manager.spec, 1.60,
	1.61 virtinst-0.500.0-change-path-perms.patch, 1.1,
	NONE virtinst-0.500.0-no-iso-driver.patch, 1.1, NONE
Message-ID: <20090929193726.AE45F11C00C1@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13807

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-fix-vcpu-hotplug.patch 
	virt-manager-0.8.0-hide-help-docs.patch 
	virt-manager-0.8.0-update-translations.patch 
	virt-manager-0.8.0-update-vm-state.patch 
Removed Files:
	virtinst-0.500.0-change-path-perms.patch 
	virtinst-0.500.0-no-iso-driver.patch 
Log Message:
Fix VCPU hotplug
Remove access to outdated docs (bz 522823, bz 524805)
Update VM state text in manager view (bz 526182)
Update translations (bz 493795)


virt-manager-0.8.0-fix-vcpu-hotplug.patch:
 domain.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.0-fix-vcpu-hotplug.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253823268 14400
# Node ID d78b7e7131439dc9f22c8e7391e82c5f29888fe8
# Parent  cfcd19d057ddc973a129e7816cd4ea39f0d4365a
Fix vcpu hotplug.

diff -r cfcd19d057dd -r d78b7e713143 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/domain.py	Thu Sep 24 16:14:28 2009 -0400
@@ -1355,7 +1355,7 @@
         self._change_cdrom(result, dev_id_info)
 
     def hotplug_vcpu(self, vcpus):
-        self.vm.setVcpus()
+        self.vm.setVcpus(int(vcpus))
 
     def hotplug_vcpus(self, vcpus):
         vcpus = int(vcpus)

virt-manager-0.8.0-hide-help-docs.patch:
 addhardware.py |    3 +++
 clone.py       |    3 +++
 createnet.py   |    3 +++
 createpool.py  |    3 +++
 createvol.py   |    4 ++++
 details.py     |    5 ++++-
 host.py        |    3 +++
 manager.py     |    7 ++++++-
 preferences.py |    3 +++
 9 files changed, 32 insertions(+), 2 deletions(-)

--- NEW FILE virt-manager-0.8.0-hide-help-docs.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254248737 14400
# Node ID 65951459abe9efb9fc5f58a243ddcfd49deba0a5
# Parent  59f3d7a2ec289145c41437b7f12bcd730e17f340
Hide access to help docs: they are out of date to the point of uselessness.

diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/addhardware.py	Tue Sep 29 14:25:37 2009 -0400
@@ -115,6 +115,9 @@
             "char_telnet_focus_in": (self.update_doc, "protocol"),
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("create-help").hide()
+
         self.set_initial_state()
 
     def update_doc(self, ignore1, ignore2, param):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/clone.py
--- a/src/virtManager/clone.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/clone.py	Tue Sep 29 14:25:37 2009 -0400
@@ -129,6 +129,9 @@
             "on_clone_help_clicked" : self.show_help,
         })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("clone-help").hide()
+
         self.set_initial_state()
 
     def show(self):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/createnet.py
--- a/src/virtManager/createnet.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/createnet.py	Tue Sep 29 14:25:37 2009 -0400
@@ -68,6 +68,9 @@
             "on_create_help_clicked": self.show_help,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("create-help").hide()
+
         self.set_initial_state()
 
     def show(self):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/createpool.py
--- a/src/virtManager/createpool.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/createpool.py	Tue Sep 29 14:25:37 2009 -0400
@@ -88,6 +88,9 @@
             "on_pool_build_focus_in_event": (self.update_build_doc)
         })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("pool-help").hide()
+
         self.set_initial_state()
 
     def show(self):
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/createvol.py
--- a/src/virtManager/createvol.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/createvol.py	Tue Sep 29 14:25:37 2009 -0400
@@ -72,6 +72,10 @@
         format_list.add_attribute(text2, 'text', 1)
         self.window.get_widget("vol-info-view").modify_bg(gtk.STATE_NORMAL,
                                                           gtk.gdk.color_parse("grey"))
+
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("pool-help").hide()
+
         self.reset_state()
 
 
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/details.py
--- a/src/virtManager/details.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/details.py	Tue Sep 29 14:25:37 2009 -0400
@@ -313,6 +313,9 @@
             "on_security_model_changed": self.security_model_changed,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("help1").hide()
+
         self.vm.connect("status-changed", self.update_widget_states)
         self.vm.connect("resources-sampled", self.refresh_resources)
         self.vm.connect("config-changed", self.refresh_vm_info)
@@ -575,7 +578,7 @@
         if self.is_visible():
             self.topwin.present()
             return
-        self.topwin.show_all()
+        self.topwin.show()
         self.topwin.present()
 
         self.engine.increment_window_counter()
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/host.py
--- a/src/virtManager/host.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/host.py	Tue Sep 29 14:25:37 2009 -0400
@@ -169,6 +169,9 @@
             "on_config_autoconnect_toggled": self.toggle_autoconnect,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("help1").hide()
+
         self.conn.connect("resources-sampled", self.refresh_resources)
         self.reset_state()
 
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/manager.py	Tue Sep 29 14:25:37 2009 -0400
@@ -188,6 +188,7 @@
             filename = self.config.get_icon_dir() + "/%s" % iconfile
             pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename, l, w)
             image = gtk.image_new_from_pixbuf(pixbuf)
+            image.show_all()
             self.window.get_widget(widget).set_icon_widget(image)
 
         set_toolbar_image("vm-new", "vm_new_wizard.png", 28, 28)
@@ -356,6 +357,9 @@
             "on_menu_help_activate": self.show_help,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("menu_help").hide()
+
         self.vm_selected(None)
         self.window.get_widget("vm-list").get_selection().connect("changed", self.vm_selected)
 
@@ -391,7 +395,8 @@
         if self.is_visible():
             win.present()
             return
-        win.show_all()
+        win.show()
+        win.present()
         self.engine.increment_window_counter()
 
         if self.startup_error:
diff -r 59f3d7a2ec28 -r 65951459abe9 src/virtManager/preferences.py
--- a/src/virtManager/preferences.py	Tue Sep 29 14:02:28 2009 -0400
+++ b/src/virtManager/preferences.py	Tue Sep 29 14:25:37 2009 -0400
@@ -75,6 +75,9 @@
             "on_prefs_stats_enable_net_toggled": self.change_net_poll,
             })
 
+        # XXX: Help docs useless/out of date
+        self.window.get_widget("prefs-help").hide()
+
     def close(self, ignore1=None, ignore2=None):
         self.topwin.hide()
         return 1

virt-manager-0.8.0-update-translations.patch:
 as.po       | 1847 ++---
 bg.po       |  918 +-
 bn_IN.po    | 2250 ++----
 bs.po       |  917 +-
 ca.po       |  921 +-
 cs.po       |  917 +-
 da.po       |  917 +-
 de.po       | 8692 ++++++++++++--------------
 es.po       | 1187 +--
 fi.po       |  921 +-
 fr.po       |19894 +++++++++++++++++++++++++++++-------------------------------
 gu.po       | 1492 +---
 hi.po       | 1495 +---
 hr.po       |  918 +-
 hu.po       | 2958 ++++----
 is.po       |  914 +-
 it.po       |  929 +-
 ja.po       | 1169 +--
 kn.po       | 1502 +---
 ko.po       | 2197 +-----
 ml.po       | 2798 +++-----
 mr.po       | 1514 +---
 ms.po       |  923 +-
 nb.po       |  918 +-
 nl.po       | 1144 +--
 or.po       | 1479 +---
 pa.po       | 1496 +---
 pl.po       | 1500 +---
 pt.po       |  924 +-
 pt_BR.po    |  933 +-
 ro.po       |  917 +-
 ru.po       |  918 +-
 sr.po       |  918 +-
 sr at latin.po |  918 +-
 sv.po       |  926 +-
 ta.po       | 1504 +---
 te.po       | 1506 +---
 tr.po       |  911 +-
 uk.po       |  917 +-
 zh_CN.po    | 1165 +--
 zh_TW.po    |  929 +-
 41 files changed, 36406 insertions(+), 41707 deletions(-)

--- NEW FILE virt-manager-0.8.0-update-translations.patch ---
# HG changeset patch
# User Laurent L?onard <laurent at open-minds.org>
# Date 1249496263 14400
# Node ID 5195fe3509bc3a3938c607240f215c9921af8f2c
# Parent  18e673ca4e148a3e023f56353412d259aea487c2
Updated french translation.

diff -r 18e673ca4e14 -r 5195fe3509bc po/fr.po
--- a/po/fr.po	Tue Jul 28 22:25:13 2009 -0400
+++ b/po/fr.po	Wed Aug 05 14:17:43 2009 -0400
@@ -1,5099 +1,4131 @@
-# translation of virt-manager.tip.po to french
-# Copyright (C) 2006 Virt-Manager
-# This file is distributed under the same license as the Virt-Manager package.
-#
-# Damien Durand <splinux at fedoraproject.org>, 2006.
-# Thomas Canniot <thomas.canniot at laposte.net>, 2006, 2007.
-# Alain PORTAL <aportal at univ-montp2.fr>, 2006, 2007.
-# Decroux Fabien <fdecroux at redhat.com>, 2006.
-# Gauthier Ancelin <gauthier.ancelin at laposte.net>, 2007, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: virt-manager.tip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-28 20:55-0400\n"
-"PO-Revision-Date: 2008-01-31 20:53+0100\n"
-"Last-Translator: Gauthier Ancelin <gauthier.ancelin at laposte.net>\n"
-"Language-Team: french <fedora-trans-fr at redhat.com>\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"
-
-#: ../src/virt-manager.desktop.in.in.h:1
-msgid "Manage virtual machines"
-msgstr "G?rer les machines virtuelles"
-
-#: ../src/virt-manager.desktop.in.in.h:2 ../src/virtManager/systray.py:101
-#: ../src/vmm-manager.glade.h:11
-msgid "Virtual Machine Manager"
-msgstr "Gestionnaire de machine virtuelle"
-
-#: ../src/virt-manager.py.in:55
-#, fuzzy
-msgid "Error starting Virtual Machine Manager"
-msgstr "Gestionnaire de machine virtuelle"
-
-#. ...the risk is we catch too much though
-#. Damned if we do, damned if we dont :-)(
-#: ../src/virt-manager.py.in:288
-#, fuzzy, python-format
-msgid "Unable to initialize GTK: %s"
-msgstr "Impossible d'initialiser GTK : "
-
-#: ../src/virt-manager.schemas.in.h:1
-msgid "Default image path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:2
-#, fuzzy
-msgid "Default media path"
-msgstr "Param?tre de r?seau invalide"
-
-#: ../src/virt-manager.schemas.in.h:3
-msgid "Default path for choosing VM images"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:4
-msgid "Default path for choosing media"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:5
-msgid "Default path for saving VM snaphots"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:6
-msgid "Default path for saving screenshots from VMs"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:7
-msgid "Default path for stored VM snapshots"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:8
-msgid "Default restore path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:9
-msgid "Default save domain path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:10
-msgid "Default screenshot path"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:11
-msgid "Install sound device for local VM"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:12
-msgid "Install sound device for remote VM"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:13
-msgid "Poll disk i/o stats"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:14
-msgid "Poll net i/o stats"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:15
-msgid "Show system tray icon"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:16
-msgid "Show system tray icon while app is running"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:17
-msgid "Stats type in manager view"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:18
-msgid "The length of the list of URLs"
-msgstr "La longueur de la liste d'URL"
-
-#: ../src/virt-manager.schemas.in.h:19
-msgid "The number of samples to keep in the statistics history"
-msgstr ""
-"Le nombre d'?chantillons ? conserver dans l'historique des statistiques"
-
-#: ../src/virt-manager.schemas.in.h:20
-msgid ""
-"The number of urls to keep in the history for the install media address page."
-msgstr ""
-"Le nombre d'URL ? conserver dans l'historique pour la page des adresses de "
-"media d'installation."
-
-#: ../src/virt-manager.schemas.in.h:21
-msgid "The statistics history length"
-msgstr "La longueur de l'historique de statistiques"
-
-#: ../src/virt-manager.schemas.in.h:22
-msgid "The statistics update interval"
-msgstr "L'intervalle de rafra?chissement des statistiques"
-
-#: ../src/virt-manager.schemas.in.h:23
-msgid "The statistics update interval in seconds"
-msgstr "L'intervalle de rafra?chissement des statistiques en secondes"
-
-#: ../src/virt-manager.schemas.in.h:24
-msgid "Type of stats to graph (cpu, disk, net) in manager view"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:25
-msgid "When to grab keyboard input for the console"
-msgstr "Quand la console peut s'approprier le clavier"
-
-#: ../src/virt-manager.schemas.in.h:26
-msgid "When to pop up a console for a guest"
-msgstr "Quand pr?senter une console pour un invit?"
-
-#: ../src/virt-manager.schemas.in.h:27
-msgid "When to scale the VM graphical console"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:28
-#, fuzzy
-msgid ""
-"When to scale the VM graphical console. 0 = never, 1 = only when in full "
-"screen mode, 2 = Always"
-msgstr ""
-"Quand une console d'invit? peut s'approprier le clavier. ? 0 ? = jamais, ? 1 ? "
-"= seulement en mode plein ?cran, ? 2 ? = lorsque la souris est au-dessus de "
-"la console"
-
-#: ../src/virt-manager.schemas.in.h:29
-msgid "Whether or not the app will poll VM disk i/o statistics"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:30
-msgid "Whether or not the app will poll VM network i/o statistics"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:31
-msgid ""
-"Whether to grab keyboard input for a guest console. 0 = never, 1 = only when "
-"in full screen mode, 2 = when mouse is over console"
-msgstr ""
-"Quand une console d'invit? peut s'approprier le clavier. ? 0 ? = jamais, ? 1 ? "
-"= seulement en mode plein ?cran, ? 2 ? = lorsque la souris est au-dessus de "
-"la console"
-
-#: ../src/virt-manager.schemas.in.h:32
-msgid "Whether to install a sound device for local VMs or not"
-msgstr ""
-
-#: ../src/virt-manager.schemas.in.h:33
[...148040 lines suppressed...]
 msgstr ""
 
-#: ../src/vmm-create.glade.h:44
+#: ../src/vmm-create.glade.h:45
 msgid "URL:"
 msgstr ""
 
-#: ../src/vmm-create.glade.h:45
+#: ../src/vmm-create.glade.h:46
 #, fuzzy
 msgid "Use CDROM or DVD"
 msgstr "???? DVD ???(_C)"
 
-#: ../src/vmm-create.glade.h:46
+#: ../src/vmm-create.glade.h:47
 #, fuzzy
 msgid "Use ISO image:"
 msgstr "?? ISO ???"
 
-#: ../src/vmm-create.glade.h:47
+#: ../src/vmm-create.glade.h:48
 #, fuzzy
 msgid "Version:"
 msgstr "???"
 
-#: ../src/vmm-create.glade.h:48
+#: ../src/vmm-create.glade.h:49
 #, fuzzy
 msgid "Virt Type:"
 msgstr "???"
@@ -3076,10 +3074,6 @@
 msgid "Delete associated storage files"
 msgstr ""
 
-#: ../src/vmm-delete.glade.h:4
-msgid "gtk-delete"
-msgstr ""
-
 #: ../src/vmm-details.glade.h:1
 msgid ""
 "0 KBytes/s\n"
@@ -3229,7 +3223,7 @@
 msgid "Device virtual machine will boot from:"
 msgstr "?????????????"
 
-#: ../src/vmm-details.glade.h:40 ../src/vmm-manager.glade.h:4
+#: ../src/vmm-details.glade.h:40 ../src/vmm-manager.glade.h:2
 msgid "Disk"
 msgstr "??"
 
@@ -3431,10 +3425,6 @@
 msgid "Stats"
 msgstr "??"
 
-#: ../src/vmm-details.glade.h:100
-msgid "Status:"
-msgstr "???"
-
 #: ../src/vmm-details.glade.h:101
 msgid "Target Port:"
 msgstr "??????"
@@ -3508,29 +3498,24 @@
 msgstr "??(_B)..."
 
 #: ../src/vmm-details.glade.h:119 ../src/vmm-host.glade.h:41
-#: ../src/vmm-manager.glade.h:12
-msgid "_Contents"
-msgstr "??(_C)"
-
-#: ../src/vmm-details.glade.h:120 ../src/vmm-host.glade.h:42
-#: ../src/vmm-manager.glade.h:14
+#: ../src/vmm-manager.glade.h:9
 msgid "_File"
 msgstr "??(_F)"
 
-#: ../src/vmm-details.glade.h:121 ../src/vmm-host.glade.h:43
-#: ../src/vmm-manager.glade.h:15
+#: ../src/vmm-details.glade.h:120 ../src/vmm-host.glade.h:42
+#: ../src/vmm-manager.glade.h:10
 msgid "_Help"
 msgstr "??(_H)"
 
-#: ../src/vmm-details.glade.h:125
+#: ../src/vmm-details.glade.h:124
 msgid "_Save"
 msgstr "??(_S)"
 
-#: ../src/vmm-details.glade.h:126
+#: ../src/vmm-details.glade.h:125
 msgid "_Take Screenshot"
 msgstr "????(_T)"
 
-#: ../src/vmm-details.glade.h:127 ../src/vmm-manager.glade.h:21
+#: ../src/vmm-details.glade.h:126 ../src/vmm-manager.glade.h:16
 msgid "_View"
 msgstr "??(_V)"
 
@@ -3590,7 +3575,7 @@
 msgid "Forwarding:"
 msgstr "???"
 
-#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:6
+#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:4
 msgid "Host Details"
 msgstr "??????"
 
@@ -3651,50 +3636,32 @@
 msgstr "????"
 
 #: ../src/vmm-manager.glade.h:1
-msgid "Add Connection..."
-msgstr "????..."
-
-#: ../src/vmm-manager.glade.h:2
 #, fuzzy
 msgid "CPU"
 msgstr "VCPU"
 
 #: ../src/vmm-manager.glade.h:3
-#, fuzzy
-msgid "Delete Virtual Machine"
-msgstr "??????"
-
-#: ../src/vmm-manager.glade.h:5
 msgid "Graph"
 msgstr ""
 
-#: ../src/vmm-manager.glade.h:8
+#: ../src/vmm-manager.glade.h:6
 msgid "Restore a saved machine from a filesystem image"
 msgstr "???????????????????"
 
-#: ../src/vmm-manager.glade.h:9
-msgid "Restore saved machine..."
-msgstr "????????..."
-
-#: ../src/vmm-manager.glade.h:10
-#, fuzzy
-msgid "Virtual Machine Details"
-msgstr "????"
-
-#: ../src/vmm-manager.glade.h:13
+#: ../src/vmm-manager.glade.h:8
 msgid "_Edit"
 msgstr "??(_E)"
 
-#: ../src/vmm-manager.glade.h:16
+#: ../src/vmm-manager.glade.h:11
 #, fuzzy
 msgid "_New"
 msgstr "??(_V)"
 
-#: ../src/vmm-manager.glade.h:17
+#: ../src/vmm-manager.glade.h:12
 msgid "_Open"
 msgstr ""
 
-#: ../src/vmm-manager.glade.h:20
+#: ../src/vmm-manager.glade.h:15
 #, fuzzy
 msgid "_Shutdown"
 msgstr "??"
@@ -3879,6 +3846,26 @@
 msgid "_New Volume"
 msgstr "???"
 
+#~ msgid "Create _Volume"
+#~ msgstr "????(_V)"
+
+#~ msgid "_Contents"
+#~ msgstr "??(_C)"
+
+#~ msgid "Add Connection..."
+#~ msgstr "????..."
+
+#, fuzzy
+#~ msgid "Delete Virtual Machine"
+#~ msgstr "??????"
+
+#~ msgid "Restore saved machine..."
+#~ msgstr "????????..."
+
+#, fuzzy
+#~ msgid "Virtual Machine Details"
+#~ msgstr "????"
+
 #, fuzzy
 #~ msgid "Poll memory usage stats"
 #~ msgstr "????????????"
@@ -4239,10 +4226,6 @@
 #~ msgstr "CPU ???"
 
 #, fuzzy
-#~ msgid "Enable audio:"
-#~ msgstr "?????"
-
-#, fuzzy
 #~ msgid "F_ully virtualized:"
 #~ msgstr "?????(_u)?"
 

virt-manager-0.8.0-update-vm-state.patch:
 manager.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE virt-manager-0.8.0-update-vm-state.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254247348 14400
# Node ID 59f3d7a2ec289145c41437b7f12bcd730e17f340
# Parent  6d219a6db4fbcb343d41a959dac7a8623f3dcbb3
manager: Actually update VM state text when state changes

diff -r 6d219a6db4fb -r 59f3d7a2ec28 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Tue Sep 29 14:00:50 2009 -0400
+++ b/src/virtManager/manager.py	Tue Sep 29 14:02:28 2009 -0400
@@ -584,6 +584,7 @@
         row[ROW_STATUS] = vm.run_status()
         row[ROW_STATUS_ICON] = vm.run_status_icon_large()
         row[ROW_IS_VM_RUNNING] = vm.is_active()
+        row[ROW_MARKUP] = self._build_vm_markup(vm, row)
         model.row_changed(row.path, row.iter)
 
 


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- virt-manager.spec	24 Sep 2009 15:47:35 -0000	1.60
+++ virt-manager.spec	29 Sep 2009 19:37:26 -0000	1.61
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 5%{_extra_release}
+Release: 6%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -40,6 +40,14 @@ Patch8: %{name}-%{version}-stats-logging
 Patch9: %{name}-%{version}-refresh-disk-space.patch
 # Offer to fix disk permission issues (bz 517379)
 Patch10: %{name}-%{version}-fix-path-perms.patch
+# Fix VCPU hotplug
+Patch11: %{name}-%{version}-fix-vcpu-hotplug.patch
+# Remove access to outdated docs (bz 522823, bz 524805)
+Patch12: %{name}-%{version}-hide-help-docs.patch
+# Update VM state text in manager view (bz 526182)
+Patch13: %{name}-%{version}-update-vm-state.patch
+# Update translations (bz 493795)
+Patch14: %{name}-%{version}-update-translations.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -117,6 +125,10 @@ cp %{SOURCE3} pixmaps
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 %configure
@@ -190,6 +202,12 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Sep 29 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-6.fc13
+- Fix VCPU hotplug
+- Remove access to outdated docs (bz 522823, bz 524805)
+- Update VM state text in manager view (bz 526182)
+- Update translations (bz 493795)
+
 * Thu Sep 24 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-5.fc12
 - Refresh host disk space in create wizard (bz 502777)
 - Offer to fix disk permission issues (bz 517379)


--- virtinst-0.500.0-change-path-perms.patch DELETED ---


--- virtinst-0.500.0-no-iso-driver.patch DELETED ---



From dwalsh at fedoraproject.org  Tue Sep 29 19:44:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 29 Sep 2009 19:44:06 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.35,
	1.36 modules-targeted.conf, 1.144, 1.145 policy-F12.patch, 1.94, 1.95
Message-ID: <20090929194407.0763111C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15014

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
Log Message:
* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
- Update rhcs policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- modules-minimum.conf	29 Sep 2009 12:38:57 -0000	1.35
+++ modules-minimum.conf	29 Sep 2009 19:44:06 -0000	1.36
@@ -1200,6 +1200,20 @@ rgmanager = module
 rhcs = module
  
 # Layer: services
+# Module: aisexec
+#
+# RHCS - Red Hat Cluster Suite
+#
+aisexec = module
+ 
+# Layer: services
+# Module: rgmanager
+#
+# rgmanager
+# 
+rgmanager = module
+
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- modules-targeted.conf	29 Sep 2009 12:38:58 -0000	1.144
+++ modules-targeted.conf	29 Sep 2009 19:44:06 -0000	1.145
@@ -1200,6 +1200,20 @@ rgmanager = module
 rhcs = module
  
 # Layer: services
+# Module: aisexec
+#
+# RHCS - Red Hat Cluster Suite
+#
+aisexec = module
+ 
+# Layer: services
+# Module: rgmanager
+#
+# rgmanager
+# 
+rgmanager = module
+
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  320 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   12 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   33 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  310 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 326 files changed, 15144 insertions(+), 2591 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- policy-F12.patch	29 Sep 2009 12:38:58 -0000	1.94
+++ policy-F12.patch	29 Sep 2009 19:44:06 -0000	1.95
@@ -388,7 +388,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.32/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-28 10:22:14.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-29 10:11:37.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -8438,6 +8438,248 @@ diff -b -B --ignore-all-space --exclude-
  files_rw_etc_runtime_files(afs_t)
  
  fs_getattr_xattr_fs(afs_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.fc serefpolicy-3.6.32/policy/modules/services/aisexec.fc
+--- nsaserefpolicy/policy/modules/services/aisexec.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/aisexec.fc	2009-09-29 09:58:56.000000000 -0400
+@@ -0,0 +1,12 @@
++
++/etc/rc\.d/init\.d/openais             --      gen_context(system_u:object_r:aisexec_initrc_exec_t,s0)
++
++/usr/sbin/aisexec                      --      gen_context(system_u:object_r:aisexec_exec_t,s0)
++
++/var/lib/openais(/.*)?                         gen_context(system_u:object_r:aisexec_var_lib_t,s0)
++
++/var/log/cluster/aisexec\.log          --      gen_context(system_u:object_r:aisexec_var_log_t,s0)
++
++/var/run/aisexec\.pid                  --      gen_context(system_u:object_r:aisexec_var_run_t,s0)
++
++/var/run/cman_.*                       -s      gen_context(system_u:object_r:aisexec_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.if serefpolicy-3.6.32/policy/modules/services/aisexec.if
+--- nsaserefpolicy/policy/modules/services/aisexec.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/aisexec.if	2009-09-29 09:58:56.000000000 -0400
+@@ -0,0 +1,106 @@
++## <summary>SELinux policy for Aisexec Cluster Engine</summary>
++
++########################################
++## <summary>
++##      Execute a domain transition to run aisexec.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`aisexec_domtrans',`
++        gen_require(`
++                type aisexec_t, aisexec_exec_t;
++        ')
++
++        domtrans_pattern($1, aisexec_exec_t, aisexec_t)
++')
++
++#####################################
++## <summary>
++##      Connect to aisexec over a unix domain
++##      stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`aisexec_stream_connect',`
++        gen_require(`
++                type aisexec_t, aisexec_var_run_t;
++        ')
++
++        files_search_pids($1)
++        stream_connect_pattern($1, aisexec_var_run_t, aisexec_var_run_t, aisexec_t)
++')
++
++#######################################
++## <summary>
++##      Allow the specified domain to read aisexec's log files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`aisexec_read_log',`
++        gen_require(`
++                type aisexec_var_log_t;
++        ')
++
++        logging_search_logs($1)
++        list_dirs_pattern($1, aisexec_var_log_t, aisexec_var_log_t)
++        read_files_pattern($1, aisexec_var_log_t, aisexec_var_log_t)
++')
++
++######################################
++## <summary>
++##      All of the rules required to administrate 
++##      an aisexec environment
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++## <param name="role">
++##      <summary>
++##      The role to be allowed to manage the aisexecd domain.
++##      </summary>
++## </param>
++## <rolecap/>
++#
++interface(`aisexecd_admin',`
++        gen_require(`
++                type aisexec_t, aisexec_var_lib_t, aisexec_var_log_t;
++                type aisexec_var_run_t, aisexec_tmp_t, aisexec_tmpfs_t;
++                type aisexec_initrc_exec_t;
++        ')
++
++        allow $1 aisexec_t:process { ptrace signal_perms };
++        ps_process_pattern($1, aisexec_t)
++
++        init_labeled_script_domtrans($1, aisexec_initrc_exec_t)
++        domain_system_change_exemption($1)
++        role_transition $2 aisexec_initrc_exec_t system_r;
++        allow $2 system_r;
++
++        files_search_var_lib($1)
++        admin_pattern($1, aisexec_var_lib_t)
++
++        logging_search_logs($1)
++        admin_pattern($1, aisexec_var_log_t)
++
++        files_search_pids($1)
++        admin_pattern($1, aisexec_var_run_t)
++
++        files_search_tmp($1)
++        admin_pattern($1, aisexec_tmp_t)
++
++        admin_pattern($1, aisexec_tmpfs_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.te serefpolicy-3.6.32/policy/modules/services/aisexec.te
+--- nsaserefpolicy/policy/modules/services/aisexec.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/aisexec.te	2009-09-29 09:58:56.000000000 -0400
+@@ -0,0 +1,112 @@
++
++policy_module(aisexec,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type aisexec_t;
++type aisexec_exec_t;
++init_daemon_domain(aisexec_t, aisexec_exec_t)
++
++type aisexec_initrc_exec_t;
++init_script_file(aisexec_initrc_exec_t);
++
++# tmp files
++type aisexec_tmp_t;
++files_tmp_file(aisexec_tmp_t)
++
++type aisexec_tmpfs_t;
++files_tmpfs_file(aisexec_tmpfs_t)
++
++# log files
++type aisexec_var_log_t;
++logging_log_file(aisexec_var_log_t)
++
++# var/lib files
++type aisexec_var_lib_t;
++files_type(aisexec_var_lib_t)
++
++# pid files
++type aisexec_var_run_t;
++files_pid_file(aisexec_var_run_t)
++
++########################################
++#
++# aisexec local policy
++#
++
++allow aisexec_t self:capability { sys_nice sys_resource ipc_lock };
++allow aisexec_t self:process { setrlimit setsched signal };
++
++allow aisexec_t self:fifo_file rw_fifo_file_perms;
++allow aisexec_t self:sem create_sem_perms;
++allow aisexec_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow aisexec_t self:unix_dgram_socket create_socket_perms;
++allow aisexec_t self:udp_socket create_socket_perms;
++
++# tmp files
++manage_dirs_pattern(aisexec_t, aisexec_tmp_t, aisexec_tmp_t)
++manage_files_pattern(aisexec_t, aisexec_tmp_t, aisexec_tmp_t)
++files_tmp_filetrans(aisexec_t, aisexec_tmp_t, { file dir })
++
++manage_dirs_pattern(aisexec_t, aisexec_tmpfs_t, aisexec_tmpfs_t)
++manage_files_pattern(aisexec_t, aisexec_tmpfs_t, aisexec_tmpfs_t)
++fs_tmpfs_filetrans(aisexec_t, aisexec_tmpfs_t,{ dir file })
++
++# var/lib files
++manage_files_pattern(aisexec_t, aisexec_var_lib_t,aisexec_var_lib_t)
++manage_dirs_pattern(aisexec_t, aisexec_var_lib_t,aisexec_var_lib_t)
++manage_sock_files_pattern(aisexec_t, aisexec_var_lib_t,aisexec_var_lib_t)
++files_var_lib_filetrans(aisexec_t,aisexec_var_lib_t, { file dir sock_file })
++
++# log files
++manage_files_pattern(aisexec_t, aisexec_var_log_t,aisexec_var_log_t)
++manage_sock_files_pattern(aisexec_t, aisexec_var_log_t,aisexec_var_log_t)
++logging_log_filetrans(aisexec_t,aisexec_var_log_t,{ sock_file file })
++
++# pid file
++manage_files_pattern(aisexec_t, aisexec_var_run_t,aisexec_var_run_t)
++manage_sock_files_pattern(aisexec_t, aisexec_var_run_t,aisexec_var_run_t)
++files_pid_filetrans(aisexec_t,aisexec_var_run_t, { file sock_file })
++
++corenet_udp_bind_netsupport_port(aisexec_t)
++corenet_tcp_bind_reserved_port(aisexec_t)
++corenet_udp_bind_cluster_port(aisexec_t)
++
++ccs_stream_connect(aisexec_t)
++
++corecmd_exec_bin(aisexec_t)
++
++kernel_read_system_state(aisexec_t)
++
++files_manage_mounttab(aisexec_t)
++
++auth_use_nsswitch(aisexec_t)
++
++dev_read_urand(aisexec_t)
++
++libs_use_ld_so(aisexec_t)
++libs_use_shared_libs(aisexec_t)
++miscfiles_read_localization(aisexec_t)
++
++init_rw_script_tmp_files(aisexec_t)
++
++logging_send_syslog_msg(aisexec_t)
++
++# to communication with RHCS
++dlm_controld_manage_tmpfs_files(aisexec_t)
++dlm_controld_rw_semaphores(aisexec_t)
++
++fenced_manage_tmpfs_files(aisexec_t)
++fenced_rw_semaphores(aisexec_t)
++
++gfs_controld_manage_tmpfs_files(aisexec_t)
++gfs_controld_rw_semaphores(aisexec_t)
++gfs_controld_t_rw_shm(aisexec_t)
++
++groupd_manage_tmpfs_files(aisexec_t)
++groupd_rw_semaphores(aisexec_t)
++groupd_rw_shm(aisexec_t)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.6.32/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/amavis.te	2009-09-28 09:36:06.000000000 -0400
@@ -10089,6 +10331,19 @@ diff -b -B --ignore-all-space --exclude-
  		pulseaudio_dbus_chat(bluetooth_t)
  	')
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-3.6.32/policy/modules/services/ccs.fc
+--- nsaserefpolicy/policy/modules/services/ccs.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ccs.fc	2009-09-29 15:31:19.000000000 -0400
+@@ -2,9 +2,4 @@
+ 
+ /sbin/ccsd		--	gen_context(system_u:object_r:ccs_exec_t,s0)
+ 
+-/usr/sbin/aisexec 	--	gen_context(system_u:object_r:ccs_exec_t,s0)
+-
+-/var/lib/openais(/.*)?		gen_context(system_u:object_r:ccs_var_lib_t,s0)
+-
+ /var/run/cluster(/.*)?		gen_context(system_u:object_r:ccs_var_run_t,s0)
+-/var/run/cman_.*	-s	gen_context(system_u:object_r:ccs_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.te serefpolicy-3.6.32/policy/modules/services/certmaster.te
 --- nsaserefpolicy/policy/modules/services/certmaster.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/certmaster.te	2009-09-16 10:03:09.000000000 -0400
@@ -16021,8 +16276,19 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.32/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ricci.te	2009-09-16 10:03:09.000000000 -0400
-@@ -264,6 +264,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/ricci.te	2009-09-29 09:58:56.000000000 -0400
+@@ -227,6 +227,10 @@
+ ricci_stream_connect_modclusterd(ricci_modcluster_t)
+ 
+ optional_policy(`
++        aisexec_stream_connect(ricci_modcluster_t)
++')
++
++optional_policy(`
+ 	ccs_stream_connect(ricci_modcluster_t)
+ 	ccs_domtrans(ricci_modcluster_t)
+ 	ccs_manage_config(ricci_modcluster_t)
+@@ -264,6 +268,7 @@
  allow ricci_modclusterd_t self:socket create_socket_perms;
  
  allow ricci_modclusterd_t ricci_modcluster_t:unix_stream_socket connectto;
@@ -16030,7 +16296,18 @@ diff -b -B --ignore-all-space --exclude-
  
  # log files
  allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
-@@ -440,6 +441,10 @@
+@@ -306,6 +311,10 @@
+ sysnet_dns_name_resolve(ricci_modclusterd_t)
+ 
+ optional_policy(`
++        aisexec_stream_connect(ricci_modclusterd_t)
++')
++
++optional_policy(`
+ 	ccs_domtrans(ricci_modclusterd_t)
+ 	ccs_stream_connect(ricci_modclusterd_t)
+ 	ccs_read_config(ricci_modclusterd_t)
+@@ -440,6 +449,10 @@
  files_read_usr_files(ricci_modstorage_t)
  files_read_kernel_modules(ricci_modstorage_t)
  
@@ -16041,6 +16318,17 @@ diff -b -B --ignore-all-space --exclude-
  storage_raw_read_fixed_disk(ricci_modstorage_t)
  
  term_dontaudit_use_console(ricci_modstorage_t)
+@@ -457,6 +470,10 @@
+ mount_domtrans(ricci_modstorage_t)
+ 
+ optional_policy(`
++        aisexec_stream_connect(ricci_modstorage_t)
++')
++
++optional_policy(`
+ 	ccs_stream_connect(ricci_modstorage_t)
+ 	ccs_read_config(ricci_modstorage_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.6.32/policy/modules/services/rpcbind.if
 --- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/rpcbind.if	2009-09-16 10:03:09.000000000 -0400
@@ -23141,7 +23429,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.32/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/lvm.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/lvm.te	2009-09-29 09:58:56.000000000 -0400
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t, clvmd_exec_t)
@@ -23160,7 +23448,18 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_getattr_removable_dev(clvmd_t)
  storage_manage_fixed_disk(clvmd_t)
-@@ -168,7 +172,7 @@
+@@ -138,6 +142,10 @@
+ ')
+ 
+ optional_policy(`
++        aisexec_stream_connect(clvmd_t)
++')
++
++optional_policy(`
+ 	ccs_stream_connect(clvmd_t)
+ ')
+ 
+@@ -168,7 +176,7 @@
  # LVM will complain a lot if it cannot set its priority.
  allow lvm_t self:process setsched;
  allow lvm_t self:file rw_file_perms;
@@ -23169,7 +23468,7 @@ diff -b -B --ignore-all-space --exclude-
  allow lvm_t self:unix_dgram_socket create_socket_perms;
  allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms;
  
-@@ -214,6 +218,7 @@
+@@ -214,6 +222,7 @@
  # it has no reason to need this
  kernel_dontaudit_getattr_core_if(lvm_t)
  kernel_use_fds(lvm_t)
@@ -23177,7 +23476,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(lvm_t)
  corecmd_exec_shell(lvm_t)
-@@ -239,6 +244,7 @@
+@@ -239,6 +248,7 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -23185,7 +23484,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(lvm_t)
  domain_read_all_domains_state(lvm_t)
-@@ -248,6 +254,7 @@
+@@ -248,6 +258,7 @@
  files_read_etc_runtime_files(lvm_t)
  # for when /usr is not mounted:
  files_dontaudit_search_isid_type_dirs(lvm_t)
@@ -23193,7 +23492,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -255,6 +262,7 @@
+@@ -255,6 +266,7 @@
  fs_read_tmpfs_symlinks(lvm_t)
  fs_dontaudit_read_removable_files(lvm_t)
  fs_dontaudit_getattr_tmpfs_files(lvm_t)
@@ -23201,7 +23500,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_fs_mount(lvm_t)
  selinux_validate_context(lvm_t)
-@@ -273,10 +281,15 @@
+@@ -273,10 +285,15 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
@@ -23217,7 +23516,18 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(lvm_t)
  
-@@ -313,8 +326,10 @@
+@@ -299,6 +316,10 @@
+ ')
+ 
+ optional_policy(`
++        aisexec_stream_connect(lvm_t)
++')
++
++optional_policy(`
+ 	bootloader_rw_tmp_files(lvm_t)
+ ')
+ 
+@@ -313,8 +334,10 @@
  optional_policy(`
  	dbus_system_bus_client(lvm_t)
  



From dwalsh at fedoraproject.org  Tue Sep 29 19:47:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 29 Sep 2009 19:47:33 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.95,1.96
Message-ID: <20090929194733.850C111C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16233

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
- Update rhcs policy


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  322 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   12 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   33 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  314 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 327 files changed, 15151 insertions(+), 2592 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- policy-F12.patch	29 Sep 2009 19:44:06 -0000	1.95
+++ policy-F12.patch	29 Sep 2009 19:47:31 -0000	1.96
@@ -2593,8 +2593,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.32/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-23 10:34:03.000000000 -0400
-@@ -0,0 +1,320 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-29 15:46:41.000000000 -0400
+@@ -0,0 +1,322 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2686,6 +2686,8 @@ diff -b -B --ignore-all-space --exclude-
 +	role $1 types nsplugin_config_t;
 +
 +	allow nsplugin_t $2:process signull;
++	allow nsplugin_t $2:dbus send_msg;
++	allow $2 nsplugin_t:dbus send_msg;
 +
 +	list_dirs_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
 +	read_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
@@ -3332,6 +3334,18 @@ diff -b -B --ignore-all-space --exclude-
 +type openoffice_t;
 +type openoffice_exec_t;
 +application_domain(openoffice_t, openoffice_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.32/policy/modules/apps/pulseaudio.if
+--- nsaserefpolicy/policy/modules/apps/pulseaudio.if	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.if	2009-09-29 15:46:25.000000000 -0400
+@@ -40,7 +40,7 @@
+ 	userdom_manage_tmpfs_role($1, pulseaudio_t)
+ 
+ 	allow $2 pulseaudio_t:dbus send_msg;
+-	allow pulseaudio_t $2:dbus send_msg;
++	allow pulseaudio_t $2:dbus { acquire_svc send_msg };
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.32/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-08-31 13:30:04.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.te	2009-09-16 10:03:08.000000000 -0400
@@ -20311,7 +20325,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.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-21 08:22:39.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-29 15:34:33.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -20727,7 +20741,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +652,30 @@
+@@ -542,6 +652,34 @@
  ')
  
  optional_policy(`
@@ -20739,6 +20753,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	pcscd_stream_connect(xdm_t)
++')
++
++optional_policy(`
 +	pulseaudio_exec(xdm_t)
 +	pulseaudio_dbus_chat(xdm_t)
 +')
@@ -20758,7 +20776,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +684,9 @@
+@@ -550,8 +688,9 @@
  ')
  
  optional_policy(`
@@ -20770,7 +20788,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +695,6 @@
+@@ -560,7 +699,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -20778,7 +20796,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +705,10 @@
+@@ -571,6 +709,10 @@
  ')
  
  optional_policy(`
@@ -20789,7 +20807,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +725,9 @@
+@@ -587,10 +729,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -20801,7 +20819,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +739,12 @@
+@@ -602,9 +743,12 @@
  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;
@@ -20814,7 +20832,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +756,14 @@
+@@ -616,13 +760,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -20830,7 +20848,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 +776,19 @@
+@@ -635,9 +780,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -20850,7 +20868,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +822,6 @@
+@@ -671,7 +826,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -20858,7 +20876,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +831,12 @@
+@@ -681,9 +835,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -20872,7 +20890,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +851,12 @@
+@@ -698,8 +855,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -20885,7 +20903,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +878,7 @@
+@@ -721,6 +882,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -20893,7 +20911,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +901,7 @@
+@@ -743,7 +905,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -20902,7 +20920,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +933,20 @@
+@@ -775,12 +937,20 @@
  ')
  
  optional_policy(`
@@ -20924,7 +20942,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,7 +973,7 @@
+@@ -807,7 +977,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -20933,7 +20951,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)
-@@ -828,9 +994,14 @@
+@@ -828,9 +998,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -20948,7 +20966,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)
-@@ -845,11 +1016,14 @@
+@@ -845,11 +1020,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -20964,7 +20982,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1056,8 @@
+@@ -882,6 +1060,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -20973,7 +20991,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1082,8 @@
+@@ -906,6 +1086,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 };
  
@@ -20982,7 +21000,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 };
-@@ -973,17 +1151,49 @@
+@@ -973,17 +1155,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  



From pkgdb at fedoraproject.org  Tue Sep 29 19:50:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:50:28 +0000
Subject: [pkgdb] luci was added for rmccabe
Message-ID: <20090929195028.D5BC610F8AF@bastion2.fedora.phx.redhat.com>

kevin has added Package luci with summary Web-based cluster administration application
kevin has approved Package luci
kevin has added a Fedora devel branch for luci with an owner of rmccabe
kevin has approved luci in Fedora devel
kevin has approved Package luci
kevin has set commit to Approved for 107427 on luci (Fedora devel)
kevin has set checkout to Approved for 107427 on luci (Fedora devel)
kevin has set build to Approved for 107427 on luci (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/luci



From sgrubb at fedoraproject.org  Tue Sep 29 19:51:48 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 19:51:48 +0000 (UTC)
Subject: rpms/libprelude/F-12 libprelude.spec,1.49,1.50
Message-ID: <20090929195148.64CBE11C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17893

Modified Files:
	libprelude.spec 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24.1-1
- New upstream release



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-12/libprelude.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libprelude.spec	29 Sep 2009 15:37:50 -0000	1.49
+++ libprelude.spec	29 Sep 2009 19:51:48 -0000	1.50
@@ -45,7 +45,7 @@ Python bindings for libprelude.
 %package perl
 Summary:	Perl bindings for libprelude
 Group:		System Environment/Libraries
-%if 0%{?rhel} <= 5
+%if 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires:	perl
 %else
 BuildRequires:	perl-devel



From pkgdb at fedoraproject.org  Tue Sep 29 19:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:53:13 +0000
Subject: [pkgdb] TurboGears2 was added for lmacken
Message-ID: <20090929195313.3C0B110F888@bastion2.fedora.phx.redhat.com>

kevin has added Package TurboGears2 with summary Next generation Front-to-back web development megaframework built on Pylons
kevin has approved Package TurboGears2
kevin has added a Fedora devel branch for TurboGears2 with an owner of lmacken
kevin has approved TurboGears2 in Fedora devel
kevin has approved Package TurboGears2
kevin has set commit to Approved for 107427 on TurboGears2 (Fedora devel)
kevin has set checkout to Approved for 107427 on TurboGears2 (Fedora devel)
kevin has set build to Approved for 107427 on TurboGears2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/TurboGears2



From pkgdb at fedoraproject.org  Tue Sep 29 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:53:15 +0000
Subject: [pkgdb] TurboGears2 summary updated by kevin
Message-ID: <20090929195315.CBB7610F88B@bastion2.fedora.phx.redhat.com>

kevin set package TurboGears2 summary to Next generation Front-to-back web development megaframework built on Pylons

To make changes to this package see:
  /pkgdb/packages/name/TurboGears2



From pkgdb at fedoraproject.org  Tue Sep 29 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:53:15 +0000
Subject: [pkgdb] TurboGears2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195315.E9D9910F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for TurboGears2
kevin has set commit to Approved for 107427 on TurboGears2 (Fedora 11)
kevin has set checkout to Approved for 107427 on TurboGears2 (Fedora 11)
kevin has set build to Approved for 107427 on TurboGears2 (Fedora 11)
kevin approved watchbugzilla on TurboGears2 (Fedora 11) for toshio
kevin approved watchcommits on TurboGears2 (Fedora 11) for toshio
kevin approved commit on TurboGears2 (Fedora 11) for toshio
kevin approved build on TurboGears2 (Fedora 11) for toshio
kevin approved approveacls on TurboGears2 (Fedora 11) for toshio

To make changes to this package see:
  /pkgdb/packages/name/TurboGears2



From pkgdb at fedoraproject.org  Tue Sep 29 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:53:15 +0000
Subject: [pkgdb] TurboGears2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195316.007A910F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for TurboGears2
kevin has set commit to Approved for 107427 on TurboGears2 (Fedora 12)
kevin has set checkout to Approved for 107427 on TurboGears2 (Fedora 12)
kevin has set build to Approved for 107427 on TurboGears2 (Fedora 12)
kevin approved watchbugzilla on TurboGears2 (Fedora 12) for toshio
kevin approved watchcommits on TurboGears2 (Fedora 12) for toshio
kevin approved commit on TurboGears2 (Fedora 12) for toshio
kevin approved build on TurboGears2 (Fedora 12) for toshio
kevin approved approveacls on TurboGears2 (Fedora 12) for toshio

To make changes to this package see:
  /pkgdb/packages/name/TurboGears2



From pkgdb at fedoraproject.org  Tue Sep 29 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:53:15 +0000
Subject: [pkgdb] TurboGears2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195316.18F7010F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for TurboGears2
kevin has set commit to Approved for 107427 on TurboGears2 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on TurboGears2 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on TurboGears2 (Fedora EPEL 5)
kevin approved watchbugzilla on TurboGears2 (Fedora EPEL 5) for toshio
kevin approved watchcommits on TurboGears2 (Fedora EPEL 5) for toshio
kevin approved commit on TurboGears2 (Fedora EPEL 5) for toshio
kevin approved build on TurboGears2 (Fedora EPEL 5) for toshio
kevin approved approveacls on TurboGears2 (Fedora EPEL 5) for toshio

To make changes to this package see:
  /pkgdb/packages/name/TurboGears2



From pkgdb at fedoraproject.org  Tue Sep 29 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:53:15 +0000
Subject: [pkgdb] TurboGears2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195316.2919210F8B7@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on TurboGears2 (Fedora devel) for toshio
kevin approved watchcommits on TurboGears2 (Fedora devel) for toshio
kevin approved commit on TurboGears2 (Fedora devel) for toshio
kevin approved build on TurboGears2 (Fedora devel) for toshio
kevin approved approveacls on TurboGears2 (Fedora devel) for toshio

To make changes to this package see:
  /pkgdb/packages/name/TurboGears2



From kevin at fedoraproject.org  Tue Sep 29 19:53:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:53:28 +0000 (UTC)
Subject: rpms/TurboGears2/devel - New directory
Message-ID: <20090929195328.4021D11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TurboGears2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU18844/rpms/TurboGears2/devel

Log Message:
Directory /cvs/pkgs/rpms/TurboGears2/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:53:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:53:28 +0000 (UTC)
Subject: rpms/TurboGears2 - New directory
Message-ID: <20090929195328.152AC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TurboGears2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU18844/rpms/TurboGears2

Log Message:
Directory /cvs/pkgs/rpms/TurboGears2 added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:53:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:53:36 +0000 (UTC)
Subject: rpms/TurboGears2 Makefile,NONE,1.1
Message-ID: <20090929195336.E220511C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TurboGears2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU18844/rpms/TurboGears2

Added Files:
	Makefile 
Log Message:
Setup of module TurboGears2


--- NEW FILE Makefile ---
# Top level Makefile for module TurboGears2
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  Tue Sep 29 19:53:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:53:37 +0000 (UTC)
Subject: rpms/TurboGears2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929195337.2F66511C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TurboGears2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU18844/rpms/TurboGears2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module TurboGears2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: TurboGears2
# $Id: Makefile,v 1.1 2009/09/29 19:53:37 kevin Exp $
NAME := TurboGears2
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  Tue Sep 29 19:54:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:08 +0000
Subject: [pkgdb] python-tg-devtools was added for lmacken
Message-ID: <20090929195409.11C0F10F874@bastion2.fedora.phx.redhat.com>

kevin has added Package python-tg-devtools with summary Development tools and templates for TurboGears2
kevin has approved Package python-tg-devtools
kevin has added a Fedora devel branch for python-tg-devtools with an owner of lmacken
kevin has approved python-tg-devtools in Fedora devel
kevin has approved Package python-tg-devtools
kevin has set commit to Approved for 107427 on python-tg-devtools (Fedora devel)
kevin has set checkout to Approved for 107427 on python-tg-devtools (Fedora devel)
kevin has set build to Approved for 107427 on python-tg-devtools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-tg-devtools



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:13 +0000
Subject: [pkgdb] python-tg-devtools summary updated by kevin
Message-ID: <20090929195413.3092B10F88C@bastion2.fedora.phx.redhat.com>

kevin set package python-tg-devtools summary to Development tools and templates for TurboGears2

To make changes to this package see:
  /pkgdb/packages/name/python-tg-devtools



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:13 +0000
Subject: [pkgdb] python-tg-devtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195413.460CF10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-tg-devtools
kevin has set commit to Approved for 107427 on python-tg-devtools (Fedora 11)
kevin has set checkout to Approved for 107427 on python-tg-devtools (Fedora 11)
kevin has set build to Approved for 107427 on python-tg-devtools (Fedora 11)
kevin approved watchbugzilla on python-tg-devtools (Fedora 11) for toshio
kevin approved watchcommits on python-tg-devtools (Fedora 11) for toshio
kevin approved commit on python-tg-devtools (Fedora 11) for toshio
kevin approved build on python-tg-devtools (Fedora 11) for toshio
kevin approved approveacls on python-tg-devtools (Fedora 11) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-tg-devtools



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:13 +0000
Subject: [pkgdb] python-tg-devtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195413.5703810F8AD@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on python-tg-devtools (Fedora devel) for toshio
kevin approved watchcommits on python-tg-devtools (Fedora devel) for toshio
kevin approved commit on python-tg-devtools (Fedora devel) for toshio
kevin approved build on python-tg-devtools (Fedora devel) for toshio
kevin approved approveacls on python-tg-devtools (Fedora devel) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-tg-devtools



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:13 +0000
Subject: [pkgdb] python-tg-devtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195413.6DC9E10F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-tg-devtools
kevin has set commit to Approved for 107427 on python-tg-devtools (Fedora 12)
kevin has set checkout to Approved for 107427 on python-tg-devtools (Fedora 12)
kevin has set build to Approved for 107427 on python-tg-devtools (Fedora 12)
kevin approved watchbugzilla on python-tg-devtools (Fedora 12) for toshio
kevin approved watchcommits on python-tg-devtools (Fedora 12) for toshio
kevin approved commit on python-tg-devtools (Fedora 12) for toshio
kevin approved build on python-tg-devtools (Fedora 12) for toshio
kevin approved approveacls on python-tg-devtools (Fedora 12) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-tg-devtools



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:13 +0000
Subject: [pkgdb] python-tg-devtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195413.7616B10F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-tg-devtools
kevin has set commit to Approved for 107427 on python-tg-devtools (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-tg-devtools (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-tg-devtools (Fedora EPEL 5)
kevin approved watchbugzilla on python-tg-devtools (Fedora EPEL 5) for toshio
kevin approved watchcommits on python-tg-devtools (Fedora EPEL 5) for toshio
kevin approved commit on python-tg-devtools (Fedora EPEL 5) for toshio
kevin approved build on python-tg-devtools (Fedora EPEL 5) for toshio
kevin approved approveacls on python-tg-devtools (Fedora EPEL 5) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-tg-devtools



From kevin at fedoraproject.org  Tue Sep 29 19:54:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:54:21 +0000 (UTC)
Subject: rpms/python-tg-devtools - New directory
Message-ID: <20090929195421.1A68911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tg-devtools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ19288/rpms/python-tg-devtools

Log Message:
Directory /cvs/pkgs/rpms/python-tg-devtools added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:54:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:54:21 +0000 (UTC)
Subject: rpms/python-tg-devtools/devel - New directory
Message-ID: <20090929195421.3C9FE11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tg-devtools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ19288/rpms/python-tg-devtools/devel

Log Message:
Directory /cvs/pkgs/rpms/python-tg-devtools/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:54:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:54:28 +0000 (UTC)
Subject: rpms/python-tg-devtools Makefile,NONE,1.1
Message-ID: <20090929195428.A132911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tg-devtools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ19288/rpms/python-tg-devtools

Added Files:
	Makefile 
Log Message:
Setup of module python-tg-devtools


--- NEW FILE Makefile ---
# Top level Makefile for module python-tg-devtools
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  Tue Sep 29 19:54:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:54:28 +0000 (UTC)
Subject: rpms/python-tg-devtools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090929195428.E794811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tg-devtools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ19288/rpms/python-tg-devtools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tg-devtools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-tg-devtools
# $Id: Makefile,v 1.1 2009/09/29 19:54:28 kevin Exp $
NAME := python-tg-devtools
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  Tue Sep 29 19:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:55 +0000
Subject: [pkgdb] python-catwalk was added for lmacken
Message-ID: <20090929195456.1381210F874@bastion2.fedora.phx.redhat.com>

kevin has added Package python-catwalk with summary A way to view your models using TurboGears
kevin has approved Package python-catwalk
kevin has added a Fedora devel branch for python-catwalk with an owner of lmacken
kevin has approved python-catwalk in Fedora devel
kevin has approved Package python-catwalk
kevin has set commit to Approved for 107427 on python-catwalk (Fedora devel)
kevin has set checkout to Approved for 107427 on python-catwalk (Fedora devel)
kevin has set build to Approved for 107427 on python-catwalk (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-catwalk



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:57 +0000
Subject: [pkgdb] python-catwalk summary updated by kevin
Message-ID: <20090929195457.7F27E10F894@bastion2.fedora.phx.redhat.com>

kevin set package python-catwalk summary to A way to view your models using TurboGears

To make changes to this package see:
  /pkgdb/packages/name/python-catwalk



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:57 +0000
Subject: [pkgdb] python-catwalk (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195457.88FB010F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-catwalk
kevin has set commit to Approved for 107427 on python-catwalk (Fedora 11)
kevin has set checkout to Approved for 107427 on python-catwalk (Fedora 11)
kevin has set build to Approved for 107427 on python-catwalk (Fedora 11)
kevin approved watchbugzilla on python-catwalk (Fedora 11) for toshio
kevin approved watchcommits on python-catwalk (Fedora 11) for toshio
kevin approved commit on python-catwalk (Fedora 11) for toshio
kevin approved build on python-catwalk (Fedora 11) for toshio
kevin approved approveacls on python-catwalk (Fedora 11) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-catwalk



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:57 +0000
Subject: [pkgdb] python-catwalk (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195457.8EC6C10F8B0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on python-catwalk (Fedora devel) for toshio
kevin approved watchcommits on python-catwalk (Fedora devel) for toshio
kevin approved commit on python-catwalk (Fedora devel) for toshio
kevin approved build on python-catwalk (Fedora devel) for toshio
kevin approved approveacls on python-catwalk (Fedora devel) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-catwalk



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:57 +0000
Subject: [pkgdb] python-catwalk (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195457.A14E710F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-catwalk
kevin has set commit to Approved for 107427 on python-catwalk (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-catwalk (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-catwalk (Fedora EPEL 5)
kevin approved watchbugzilla on python-catwalk (Fedora EPEL 5) for toshio
kevin approved watchcommits on python-catwalk (Fedora EPEL 5) for toshio
kevin approved commit on python-catwalk (Fedora EPEL 5) for toshio
kevin approved build on python-catwalk (Fedora EPEL 5) for toshio
kevin approved approveacls on python-catwalk (Fedora EPEL 5) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-catwalk



From pkgdb at fedoraproject.org  Tue Sep 29 19:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:54:57 +0000
Subject: [pkgdb] python-catwalk (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195457.AAF9510F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-catwalk
kevin has set commit to Approved for 107427 on python-catwalk (Fedora 12)
kevin has set checkout to Approved for 107427 on python-catwalk (Fedora 12)
kevin has set build to Approved for 107427 on python-catwalk (Fedora 12)
kevin approved watchbugzilla on python-catwalk (Fedora 12) for toshio
kevin approved watchcommits on python-catwalk (Fedora 12) for toshio
kevin approved commit on python-catwalk (Fedora 12) for toshio
kevin approved build on python-catwalk (Fedora 12) for toshio
kevin approved approveacls on python-catwalk (Fedora 12) for toshio

To make changes to this package see:
  /pkgdb/packages/name/python-catwalk



From kevin at fedoraproject.org  Tue Sep 29 19:55:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:55:05 +0000 (UTC)
Subject: rpms/python-catwalk - New directory
Message-ID: <20090929195505.2053111C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-catwalk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19632/rpms/python-catwalk

Log Message:
Directory /cvs/pkgs/rpms/python-catwalk added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:55:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:55:05 +0000 (UTC)
Subject: rpms/python-catwalk/devel - New directory
Message-ID: <20090929195505.4487D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-catwalk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19632/rpms/python-catwalk/devel

Log Message:
Directory /cvs/pkgs/rpms/python-catwalk/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:55:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:55:12 +0000 (UTC)
Subject: rpms/python-catwalk Makefile,NONE,1.1
Message-ID: <20090929195512.62B3D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-catwalk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19632/rpms/python-catwalk

Added Files:
	Makefile 
Log Message:
Setup of module python-catwalk


--- NEW FILE Makefile ---
# Top level Makefile for module python-catwalk
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  Tue Sep 29 19:55:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:55:12 +0000 (UTC)
Subject: rpms/python-catwalk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929195512.C2DB011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-catwalk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19632/rpms/python-catwalk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-catwalk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-catwalk
# $Id: Makefile,v 1.1 2009/09/29 19:55:12 kevin Exp $
NAME := python-catwalk
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  Tue Sep 29 19:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:46 +0000
Subject: [pkgdb] snacc was added for shakthimaan
Message-ID: <20090929195646.D575410F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package snacc with summary Sample Neufeld ASN.1 to C Compiler
kevin has approved Package snacc
kevin has added a Fedora devel branch for snacc with an owner of shakthimaan
kevin has approved snacc in Fedora devel
kevin has approved Package snacc
kevin has set commit to Approved for 107427 on snacc (Fedora devel)
kevin has set checkout to Approved for 107427 on snacc (Fedora devel)
kevin has set build to Approved for 107427 on snacc (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/snacc



From pkgdb at fedoraproject.org  Tue Sep 29 19:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:50 +0000
Subject: [pkgdb] snacc summary updated by kevin
Message-ID: <20090929195650.B6F4B10F8B5@bastion2.fedora.phx.redhat.com>

kevin set package snacc summary to Sample Neufeld ASN.1 to C Compiler

To make changes to this package see:
  /pkgdb/packages/name/snacc



From pkgdb at fedoraproject.org  Tue Sep 29 19:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:50 +0000
Subject: [pkgdb] snacc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195650.BC2E310F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for snacc
kevin has set commit to Approved for 107427 on snacc (Fedora 11)
kevin has set checkout to Approved for 107427 on snacc (Fedora 11)
kevin has set build to Approved for 107427 on snacc (Fedora 11)
kevin approved watchbugzilla on snacc (Fedora 11) for chitlesh
kevin approved watchcommits on snacc (Fedora 11) for chitlesh
kevin approved commit on snacc (Fedora 11) for chitlesh
kevin approved build on snacc (Fedora 11) for chitlesh
kevin approved approveacls on snacc (Fedora 11) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/snacc



From pkgdb at fedoraproject.org  Tue Sep 29 19:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:50 +0000
Subject: [pkgdb] snacc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195650.D4E3110F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for snacc
kevin has set commit to Approved for 107427 on snacc (Fedora 12)
kevin has set checkout to Approved for 107427 on snacc (Fedora 12)
kevin has set build to Approved for 107427 on snacc (Fedora 12)
kevin approved watchbugzilla on snacc (Fedora 12) for chitlesh
kevin approved watchcommits on snacc (Fedora 12) for chitlesh
kevin approved commit on snacc (Fedora 12) for chitlesh
kevin approved build on snacc (Fedora 12) for chitlesh
kevin approved approveacls on snacc (Fedora 12) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/snacc



From pkgdb at fedoraproject.org  Tue Sep 29 19:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:50 +0000
Subject: [pkgdb] snacc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195650.D841810F8C0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on snacc (Fedora devel) for chitlesh
kevin approved watchcommits on snacc (Fedora devel) for chitlesh
kevin approved commit on snacc (Fedora devel) for chitlesh
kevin approved build on snacc (Fedora devel) for chitlesh
kevin approved approveacls on snacc (Fedora devel) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/snacc



From pkgdb at fedoraproject.org  Tue Sep 29 19:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:50 +0000
Subject: [pkgdb] snacc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195650.F00F410F8C6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for snacc
kevin has set commit to Approved for 107427 on snacc (Fedora 10)
kevin has set checkout to Approved for 107427 on snacc (Fedora 10)
kevin has set build to Approved for 107427 on snacc (Fedora 10)
kevin approved watchbugzilla on snacc (Fedora 10) for chitlesh
kevin approved watchcommits on snacc (Fedora 10) for chitlesh
kevin approved commit on snacc (Fedora 10) for chitlesh
kevin approved build on snacc (Fedora 10) for chitlesh
kevin approved approveacls on snacc (Fedora 10) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/snacc



From pkgdb at fedoraproject.org  Tue Sep 29 19:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:56:50 +0000
Subject: [pkgdb] snacc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195651.0662310F8C9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for snacc
kevin has set commit to Approved for 107427 on snacc (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on snacc (Fedora EPEL 5)
kevin has set build to Approved for 107427 on snacc (Fedora EPEL 5)
kevin approved watchbugzilla on snacc (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on snacc (Fedora EPEL 5) for chitlesh
kevin approved commit on snacc (Fedora EPEL 5) for chitlesh
kevin approved build on snacc (Fedora EPEL 5) for chitlesh
kevin approved approveacls on snacc (Fedora EPEL 5) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/snacc



From kevin at fedoraproject.org  Tue Sep 29 19:57:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:57:01 +0000 (UTC)
Subject: rpms/snacc - New directory
Message-ID: <20090929195701.1ABA911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/snacc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF20503/rpms/snacc

Log Message:
Directory /cvs/pkgs/rpms/snacc added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:57:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:57:01 +0000 (UTC)
Subject: rpms/snacc/devel - New directory
Message-ID: <20090929195701.3DF8611C0423@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/snacc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF20503/rpms/snacc/devel

Log Message:
Directory /cvs/pkgs/rpms/snacc/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:57:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:57:08 +0000 (UTC)
Subject: rpms/snacc Makefile,NONE,1.1
Message-ID: <20090929195708.CEA4611C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/snacc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF20503/rpms/snacc

Added Files:
	Makefile 
Log Message:
Setup of module snacc


--- NEW FILE Makefile ---
# Top level Makefile for module snacc
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  Tue Sep 29 19:57:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:57:09 +0000 (UTC)
Subject: rpms/snacc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090929195709.1674711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/snacc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF20503/rpms/snacc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module snacc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: snacc
# $Id: Makefile,v 1.1 2009/09/29 19:57:08 kevin Exp $
NAME := snacc
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  Tue Sep 29 19:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:45 +0000
Subject: [pkgdb] gplcver was added for shakthimaan
Message-ID: <20090929195745.1CA6A10F8AD@bastion2.fedora.phx.redhat.com>

kevin has added Package gplcver with summary An interpreted Verilog HDL simulator
kevin has approved Package gplcver
kevin has added a Fedora devel branch for gplcver with an owner of shakthimaan
kevin has approved gplcver in Fedora devel
kevin has approved Package gplcver
kevin has set commit to Approved for 107427 on gplcver (Fedora devel)
kevin has set checkout to Approved for 107427 on gplcver (Fedora devel)
kevin has set build to Approved for 107427 on gplcver (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From pkgdb at fedoraproject.org  Tue Sep 29 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:48 +0000
Subject: [pkgdb] gplcver summary updated by kevin
Message-ID: <20090929195748.270CE10F8B2@bastion2.fedora.phx.redhat.com>

kevin set package gplcver summary to An interpreted Verilog HDL simulator

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From pkgdb at fedoraproject.org  Tue Sep 29 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:48 +0000
Subject: [pkgdb] gplcver (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195748.2A9C010F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gplcver
kevin has set commit to Approved for 107427 on gplcver (Fedora 11)
kevin has set checkout to Approved for 107427 on gplcver (Fedora 11)
kevin has set build to Approved for 107427 on gplcver (Fedora 11)
kevin approved watchbugzilla on gplcver (Fedora 11) for chitlesh
kevin approved watchcommits on gplcver (Fedora 11) for chitlesh
kevin approved commit on gplcver (Fedora 11) for chitlesh
kevin approved build on gplcver (Fedora 11) for chitlesh
kevin approved approveacls on gplcver (Fedora 11) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From pkgdb at fedoraproject.org  Tue Sep 29 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:48 +0000
Subject: [pkgdb] gplcver (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195748.38B9110F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gplcver
kevin has set commit to Approved for 107427 on gplcver (Fedora 10)
kevin has set checkout to Approved for 107427 on gplcver (Fedora 10)
kevin has set build to Approved for 107427 on gplcver (Fedora 10)
kevin approved watchbugzilla on gplcver (Fedora 10) for chitlesh
kevin approved watchcommits on gplcver (Fedora 10) for chitlesh
kevin approved commit on gplcver (Fedora 10) for chitlesh
kevin approved build on gplcver (Fedora 10) for chitlesh
kevin approved approveacls on gplcver (Fedora 10) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From pkgdb at fedoraproject.org  Tue Sep 29 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:48 +0000
Subject: [pkgdb] gplcver (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195748.42A1B10F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gplcver
kevin has set commit to Approved for 107427 on gplcver (Fedora 12)
kevin has set checkout to Approved for 107427 on gplcver (Fedora 12)
kevin has set build to Approved for 107427 on gplcver (Fedora 12)
kevin approved watchbugzilla on gplcver (Fedora 12) for chitlesh
kevin approved watchcommits on gplcver (Fedora 12) for chitlesh
kevin approved commit on gplcver (Fedora 12) for chitlesh
kevin approved build on gplcver (Fedora 12) for chitlesh
kevin approved approveacls on gplcver (Fedora 12) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From pkgdb at fedoraproject.org  Tue Sep 29 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:48 +0000
Subject: [pkgdb] gplcver (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195748.504FA10F8C3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gplcver (Fedora devel) for chitlesh
kevin approved watchcommits on gplcver (Fedora devel) for chitlesh
kevin approved commit on gplcver (Fedora devel) for chitlesh
kevin approved build on gplcver (Fedora devel) for chitlesh
kevin approved approveacls on gplcver (Fedora devel) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From pkgdb at fedoraproject.org  Tue Sep 29 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 19:57:48 +0000
Subject: [pkgdb] gplcver (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929195748.55FA610F8C6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gplcver
kevin has set commit to Approved for 107427 on gplcver (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on gplcver (Fedora EPEL 5)
kevin has set build to Approved for 107427 on gplcver (Fedora EPEL 5)
kevin approved watchbugzilla on gplcver (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on gplcver (Fedora EPEL 5) for chitlesh
kevin approved commit on gplcver (Fedora EPEL 5) for chitlesh
kevin approved build on gplcver (Fedora EPEL 5) for chitlesh
kevin approved approveacls on gplcver (Fedora EPEL 5) for chitlesh

To make changes to this package see:
  /pkgdb/packages/name/gplcver



From kevin at fedoraproject.org  Tue Sep 29 19:57:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:57:58 +0000 (UTC)
Subject: rpms/gplcver - New directory
Message-ID: <20090929195758.14B6A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gplcver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx21477/rpms/gplcver

Log Message:
Directory /cvs/pkgs/rpms/gplcver added to the repository




From kevin at fedoraproject.org  Tue Sep 29 19:57:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:57:58 +0000 (UTC)
Subject: rpms/gplcver/devel - New directory
Message-ID: <20090929195758.39A2B11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gplcver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx21477/rpms/gplcver/devel

Log Message:
Directory /cvs/pkgs/rpms/gplcver/devel added to the repository




From airlied at fedoraproject.org  Tue Sep 29 19:58:01 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 29 Sep 2009 19:58:01 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1841,1.1842
Message-ID: <20090929195801.6548611C00C1@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21285

Modified Files:
	kernel.spec 
Log Message:
* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-56
- revert all the arjan patches until someone tests them.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1841
retrieving revision 1.1842
diff -u -p -r1.1841 -r1.1842
--- kernel.spec	29 Sep 2009 17:16:21 -0000	1.1841
+++ kernel.spec	29 Sep 2009 19:58:01 -0000	1.1842
@@ -1286,7 +1286,8 @@ ApplyPatch linux-2.6-input-kill-stupid-m
 ApplyPatch die-floppy-die.patch
 
 # make copy_from_user to a stack slot provable right
-ApplyPatch linux-2.6.31-copy_from_user-bounds.patch
+# hosed stuff, just drop this close to beta
+#ApplyPatch linux-2.6.31-copy_from_user-bounds.patch
 
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
@@ -2074,6 +2075,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-56
+- revert all the arjan patches until someone tests them.
+
 * Tue Sep 29 2009 Steve Dickson <steved at redhat.com>  2.6.31.1-55
 - Updated the NFS4 pseudo root code with a fix from upstream
 



From kevin at fedoraproject.org  Tue Sep 29 19:58:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:58:06 +0000 (UTC)
Subject: rpms/gplcver Makefile,NONE,1.1
Message-ID: <20090929195806.8EA6D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gplcver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx21477/rpms/gplcver

Added Files:
	Makefile 
Log Message:
Setup of module gplcver


--- NEW FILE Makefile ---
# Top level Makefile for module gplcver
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  Tue Sep 29 19:58:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 19:58:06 +0000 (UTC)
Subject: rpms/gplcver/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090929195806.E3B0D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gplcver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx21477/rpms/gplcver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gplcver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gplcver
# $Id: Makefile,v 1.1 2009/09/29 19:58:06 kevin Exp $
NAME := gplcver
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  Tue Sep 29 20:02:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:02:43 +0000
Subject: [pkgdb] gpointing-device-settings was added for giallu
Message-ID: <20090929200243.88D3410F888@bastion2.fedora.phx.redhat.com>

kevin has added Package gpointing-device-settings with summary Configuration tool for pointing devices
kevin has approved Package gpointing-device-settings
kevin has added a Fedora devel branch for gpointing-device-settings with an owner of giallu
kevin has approved gpointing-device-settings in Fedora devel
kevin has approved Package gpointing-device-settings
kevin has set commit to Approved for 107427 on gpointing-device-settings (Fedora devel)
kevin has set checkout to Approved for 107427 on gpointing-device-settings (Fedora devel)
kevin has set build to Approved for 107427 on gpointing-device-settings (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpointing-device-settings



From pkgdb at fedoraproject.org  Tue Sep 29 20:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:02:46 +0000
Subject: [pkgdb] gpointing-device-settings summary updated by kevin
Message-ID: <20090929200246.2D47010F895@bastion2.fedora.phx.redhat.com>

kevin set package gpointing-device-settings summary to Configuration tool for pointing devices

To make changes to this package see:
  /pkgdb/packages/name/gpointing-device-settings



From pkgdb at fedoraproject.org  Tue Sep 29 20:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:02:46 +0000
Subject: [pkgdb] gpointing-device-settings (Fedora, 11) updated by kevin
Message-ID: <20090929200246.36A4710F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gpointing-device-settings (Fedora devel) for whot
kevin approved watchcommits on gpointing-device-settings (Fedora devel) for whot
kevin approved commit on gpointing-device-settings (Fedora devel) for whot
kevin approved build on gpointing-device-settings (Fedora devel) for whot
kevin approved approveacls on gpointing-device-settings (Fedora devel) for whot

To make changes to this package see:
  /pkgdb/packages/name/gpointing-device-settings



From pkgdb at fedoraproject.org  Tue Sep 29 20:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:02:46 +0000
Subject: [pkgdb] gpointing-device-settings (Fedora, 11) updated by kevin
Message-ID: <20090929200246.4135910F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gpointing-device-settings
kevin has set commit to Approved for 107427 on gpointing-device-settings (Fedora 11)
kevin has set checkout to Approved for 107427 on gpointing-device-settings (Fedora 11)
kevin has set build to Approved for 107427 on gpointing-device-settings (Fedora 11)
kevin approved watchbugzilla on gpointing-device-settings (Fedora 11) for whot
kevin approved watchcommits on gpointing-device-settings (Fedora 11) for whot
kevin approved commit on gpointing-device-settings (Fedora 11) for whot
kevin approved build on gpointing-device-settings (Fedora 11) for whot
kevin approved approveacls on gpointing-device-settings (Fedora 11) for whot

To make changes to this package see:
  /pkgdb/packages/name/gpointing-device-settings



From pkgdb at fedoraproject.org  Tue Sep 29 20:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:02:46 +0000
Subject: [pkgdb] gpointing-device-settings (Fedora, 11) updated by kevin
Message-ID: <20090929200246.4DBD810F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gpointing-device-settings
kevin has set commit to Approved for 107427 on gpointing-device-settings (Fedora 12)
kevin has set checkout to Approved for 107427 on gpointing-device-settings (Fedora 12)
kevin has set build to Approved for 107427 on gpointing-device-settings (Fedora 12)
kevin approved watchbugzilla on gpointing-device-settings (Fedora 12) for whot
kevin approved watchcommits on gpointing-device-settings (Fedora 12) for whot
kevin approved commit on gpointing-device-settings (Fedora 12) for whot
kevin approved build on gpointing-device-settings (Fedora 12) for whot
kevin approved approveacls on gpointing-device-settings (Fedora 12) for whot

To make changes to this package see:
  /pkgdb/packages/name/gpointing-device-settings



From kevin at fedoraproject.org  Tue Sep 29 20:02:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:02:57 +0000 (UTC)
Subject: rpms/gpointing-device-settings - New directory
Message-ID: <20090929200257.15DBC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpointing-device-settings
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23768/rpms/gpointing-device-settings

Log Message:
Directory /cvs/pkgs/rpms/gpointing-device-settings added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:02:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:02:57 +0000 (UTC)
Subject: rpms/gpointing-device-settings/devel - New directory
Message-ID: <20090929200257.418CD11C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpointing-device-settings/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23768/rpms/gpointing-device-settings/devel

Log Message:
Directory /cvs/pkgs/rpms/gpointing-device-settings/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:03:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:03:04 +0000 (UTC)
Subject: rpms/gpointing-device-settings Makefile,NONE,1.1
Message-ID: <20090929200304.E889E11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpointing-device-settings
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23768/rpms/gpointing-device-settings

Added Files:
	Makefile 
Log Message:
Setup of module gpointing-device-settings


--- NEW FILE Makefile ---
# Top level Makefile for module gpointing-device-settings
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  Tue Sep 29 20:03:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:03:05 +0000 (UTC)
Subject: rpms/gpointing-device-settings/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090929200305.3F0C011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpointing-device-settings/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23768/rpms/gpointing-device-settings/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpointing-device-settings


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gpointing-device-settings
# $Id: Makefile,v 1.1 2009/09/29 20:03:05 kevin Exp $
NAME := gpointing-device-settings
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  Tue Sep 29 20:03:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:03:50 +0000
Subject: [pkgdb] libgtkhotkey was added for maxx
Message-ID: <20090929200350.D53C910F888@bastion2.fedora.phx.redhat.com>

kevin has added Package libgtkhotkey with summary Platform independent hotkey handling for Gtk+ applications
kevin has approved Package libgtkhotkey
kevin has added a Fedora devel branch for libgtkhotkey with an owner of maxx
kevin has approved libgtkhotkey in Fedora devel
kevin has approved Package libgtkhotkey
kevin has set commit to Approved for 107427 on libgtkhotkey (Fedora devel)
kevin has set checkout to Approved for 107427 on libgtkhotkey (Fedora devel)
kevin has set build to Approved for 107427 on libgtkhotkey (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgtkhotkey



From pkgdb at fedoraproject.org  Tue Sep 29 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:03:53 +0000
Subject: [pkgdb] libgtkhotkey summary updated by kevin
Message-ID: <20090929200353.6C5EA10F894@bastion2.fedora.phx.redhat.com>

kevin set package libgtkhotkey summary to Platform independent hotkey handling for Gtk+ applications

To make changes to this package see:
  /pkgdb/packages/name/libgtkhotkey



From pkgdb at fedoraproject.org  Tue Sep 29 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:03:53 +0000
Subject: [pkgdb] libgtkhotkey (Fedora, 11) updated by kevin
Message-ID: <20090929200353.8238D10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libgtkhotkey
kevin has set commit to Approved for 107427 on libgtkhotkey (Fedora 11)
kevin has set checkout to Approved for 107427 on libgtkhotkey (Fedora 11)
kevin has set build to Approved for 107427 on libgtkhotkey (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgtkhotkey



From pkgdb at fedoraproject.org  Tue Sep 29 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:03:53 +0000
Subject: [pkgdb] libgtkhotkey (Fedora, 11) updated by kevin
Message-ID: <20090929200353.9EA0710F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for libgtkhotkey
kevin has set commit to Approved for 107427 on libgtkhotkey (Fedora 12)
kevin has set checkout to Approved for 107427 on libgtkhotkey (Fedora 12)
kevin has set build to Approved for 107427 on libgtkhotkey (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgtkhotkey



From kevin at fedoraproject.org  Tue Sep 29 20:04:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:04:06 +0000 (UTC)
Subject: rpms/libgtkhotkey - New directory
Message-ID: <20090929200406.1F55011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgtkhotkey
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24268/rpms/libgtkhotkey

Log Message:
Directory /cvs/pkgs/rpms/libgtkhotkey added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:04:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:04:06 +0000 (UTC)
Subject: rpms/libgtkhotkey/devel - New directory
Message-ID: <20090929200406.4936611C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgtkhotkey/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24268/rpms/libgtkhotkey/devel

Log Message:
Directory /cvs/pkgs/rpms/libgtkhotkey/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:04:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:04:13 +0000 (UTC)
Subject: rpms/libgtkhotkey Makefile,NONE,1.1
Message-ID: <20090929200413.D4BD211C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgtkhotkey
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24268/rpms/libgtkhotkey

Added Files:
	Makefile 
Log Message:
Setup of module libgtkhotkey


--- NEW FILE Makefile ---
# Top level Makefile for module libgtkhotkey
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  Tue Sep 29 20:04:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:04:14 +0000 (UTC)
Subject: rpms/libgtkhotkey/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929200414.7956011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgtkhotkey/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24268/rpms/libgtkhotkey/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgtkhotkey


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libgtkhotkey
# $Id: Makefile,v 1.1 2009/09/29 20:04:14 kevin Exp $
NAME := libgtkhotkey
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 sgrubb at fedoraproject.org  Tue Sep 29 20:04:52 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 20:04:52 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.48,1.49 sources,1.20,1.21
Message-ID: <20090929200452.AE7D211C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24569

Modified Files:
	libprelude.spec sources 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24.1-1
- New upstream release



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libprelude.spec	11 Aug 2009 15:23:48 -0000	1.48
+++ libprelude.spec	29 Sep 2009 20:04:52 -0000	1.49
@@ -4,8 +4,8 @@
 
 
 Name:		libprelude
-Version:	0.9.24
-Release:	3%{?dist}
+Version:	0.9.24.1
+Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -45,7 +45,7 @@ Python bindings for libprelude.
 %package perl
 Summary:	Perl bindings for libprelude
 Group:		System Environment/Libraries
-%if 0%{?rhel} <= 5
+%if 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires:	perl
 %else
 BuildRequires:	perl-devel
@@ -141,6 +141,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24.1-1
+- New upstream release
+
 * Sat Aug 8 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.24-3
 - adjust to build in EL-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	9 Jul 2009 19:35:32 -0000	1.20
+++ sources	29 Sep 2009 20:04:52 -0000	1.21
@@ -1 +1 @@
-f38ab003f16391a0e397568cddfbf169  libprelude-0.9.24.tar.gz
+07868b3d54fa8243455a27da6b87239c  libprelude-0.9.24.1.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 29 20:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:05:39 +0000
Subject: [pkgdb] fife was added for cassmodiah
Message-ID: <20090929200540.38F9F10F874@bastion2.fedora.phx.redhat.com>

kevin has added Package fife with summary Cross platform game creation framework
kevin has approved Package fife
kevin has added a Fedora devel branch for fife with an owner of cassmodiah
kevin has approved fife in Fedora devel
kevin has approved Package fife
kevin has set commit to Approved for 107427 on fife (Fedora devel)
kevin has set checkout to Approved for 107427 on fife (Fedora devel)
kevin has set build to Approved for 107427 on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Tue Sep 29 20:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:05:41 +0000
Subject: [pkgdb] fife summary updated by kevin
Message-ID: <20090929200541.E804F10F88C@bastion2.fedora.phx.redhat.com>

kevin set package fife summary to Cross platform game creation framework

To make changes to this package see:
  /pkgdb/packages/name/fife



From kevin at fedoraproject.org  Tue Sep 29 20:05:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:05:58 +0000 (UTC)
Subject: rpms/fife - New directory
Message-ID: <20090929200558.9E47511C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fife
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24914/rpms/fife

Log Message:
Directory /cvs/pkgs/rpms/fife added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:05:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:05:58 +0000 (UTC)
Subject: rpms/fife/devel - New directory
Message-ID: <20090929200558.A520F11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24914/rpms/fife/devel

Log Message:
Directory /cvs/pkgs/rpms/fife/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:06:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:06:31 +0000 (UTC)
Subject: rpms/fife Makefile,NONE,1.1
Message-ID: <20090929200631.87A2711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fife
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24914/rpms/fife

Added Files:
	Makefile 
Log Message:
Setup of module fife


--- NEW FILE Makefile ---
# Top level Makefile for module fife
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  Tue Sep 29 20:06:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:06:32 +0000 (UTC)
Subject: rpms/fife/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090929200632.E3A2611C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24914/rpms/fife/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fife


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fife
# $Id: Makefile,v 1.1 2009/09/29 20:06:32 kevin Exp $
NAME := fife
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  Tue Sep 29 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:08:15 +0000
Subject: [pkgdb] kchechers was added for atorkhov
Message-ID: <20090929200815.A8DAD10F888@bastion2.fedora.phx.redhat.com>

kevin has added Package kchechers with summary Checkers board game
kevin has approved Package kchechers
kevin has added a Fedora devel branch for kchechers with an owner of atorkhov
kevin has approved kchechers in Fedora devel
kevin has approved Package kchechers
kevin has set commit to Approved for 107427 on kchechers (Fedora devel)
kevin has set checkout to Approved for 107427 on kchechers (Fedora devel)
kevin has set build to Approved for 107427 on kchechers (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kchechers



From pkgdb at fedoraproject.org  Tue Sep 29 20:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:08:16 +0000
Subject: [pkgdb] kchechers summary updated by kevin
Message-ID: <20090929200816.B0B0710F895@bastion2.fedora.phx.redhat.com>

kevin set package kchechers summary to Checkers board game

To make changes to this package see:
  /pkgdb/packages/name/kchechers



From pkgdb at fedoraproject.org  Tue Sep 29 20:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:08:16 +0000
Subject: [pkgdb] kchechers (Fedora, 10) updated by kevin
Message-ID: <20090929200816.B310E10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for kchechers
kevin has set commit to Approved for 107427 on kchechers (Fedora 11)
kevin has set checkout to Approved for 107427 on kchechers (Fedora 11)
kevin has set build to Approved for 107427 on kchechers (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kchechers



From pkgdb at fedoraproject.org  Tue Sep 29 20:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:08:16 +0000
Subject: [pkgdb] kchechers (Fedora, 10) updated by kevin
Message-ID: <20090929200816.B67B010F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for kchechers
kevin has set commit to Approved for 107427 on kchechers (Fedora 12)
kevin has set checkout to Approved for 107427 on kchechers (Fedora 12)
kevin has set build to Approved for 107427 on kchechers (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kchechers



From pkgdb at fedoraproject.org  Tue Sep 29 20:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:08:16 +0000
Subject: [pkgdb] kchechers (Fedora, 10) updated by kevin
Message-ID: <20090929200816.C296E10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kchechers
kevin has set commit to Approved for 107427 on kchechers (Fedora 10)
kevin has set checkout to Approved for 107427 on kchechers (Fedora 10)
kevin has set build to Approved for 107427 on kchechers (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kchechers



From kevin at fedoraproject.org  Tue Sep 29 20:08:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:08:29 +0000 (UTC)
Subject: rpms/kchechers - New directory
Message-ID: <20090929200829.3231811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kchechers
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26448/rpms/kchechers

Log Message:
Directory /cvs/pkgs/rpms/kchechers added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:08:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:08:29 +0000 (UTC)
Subject: rpms/kchechers/devel - New directory
Message-ID: <20090929200829.5F2C811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kchechers/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26448/rpms/kchechers/devel

Log Message:
Directory /cvs/pkgs/rpms/kchechers/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:08:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:08:45 +0000 (UTC)
Subject: rpms/kchechers Makefile,NONE,1.1
Message-ID: <20090929200845.1D58011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kchechers
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26448/rpms/kchechers

Added Files:
	Makefile 
Log Message:
Setup of module kchechers


--- NEW FILE Makefile ---
# Top level Makefile for module kchechers
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  Tue Sep 29 20:08:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:08:45 +0000 (UTC)
Subject: rpms/kchechers/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929200845.B20BE11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kchechers/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26448/rpms/kchechers/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kchechers


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kchechers
# $Id: Makefile,v 1.1 2009/09/29 20:08:45 kevin Exp $
NAME := kchechers
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  Tue Sep 29 20:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:09:39 +0000
Subject: [pkgdb] vecmath was added for jussilehtola
Message-ID: <20090929200939.775EE10F888@bastion2.fedora.phx.redhat.com>

kevin has added Package vecmath with summary The 3D vector math Java package, javax.vecmath
kevin has approved Package vecmath
kevin has added a Fedora devel branch for vecmath with an owner of jussilehtola
kevin has approved vecmath in Fedora devel
kevin has approved Package vecmath
kevin has set commit to Approved for 107427 on vecmath (Fedora devel)
kevin has set checkout to Approved for 107427 on vecmath (Fedora devel)
kevin has set build to Approved for 107427 on vecmath (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vecmath



From pkgdb at fedoraproject.org  Tue Sep 29 20:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:09:41 +0000
Subject: [pkgdb] vecmath summary updated by kevin
Message-ID: <20090929200941.BB5C710F894@bastion2.fedora.phx.redhat.com>

kevin set package vecmath summary to The 3D vector math Java package, javax.vecmath

To make changes to this package see:
  /pkgdb/packages/name/vecmath



From pkgdb at fedoraproject.org  Tue Sep 29 20:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:09:41 +0000
Subject: [pkgdb] vecmath (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929200941.C42EC10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vecmath
kevin has set commit to Approved for 107427 on vecmath (Fedora 10)
kevin has set checkout to Approved for 107427 on vecmath (Fedora 10)
kevin has set build to Approved for 107427 on vecmath (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/vecmath



From pkgdb at fedoraproject.org  Tue Sep 29 20:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:09:41 +0000
Subject: [pkgdb] vecmath (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929200941.DB10E10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vecmath
kevin has set commit to Approved for 107427 on vecmath (Fedora 11)
kevin has set checkout to Approved for 107427 on vecmath (Fedora 11)
kevin has set build to Approved for 107427 on vecmath (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/vecmath



From pkgdb at fedoraproject.org  Tue Sep 29 20:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:09:41 +0000
Subject: [pkgdb] vecmath (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929200941.E627910F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for vecmath
kevin has set commit to Approved for 107427 on vecmath (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on vecmath (Fedora EPEL 5)
kevin has set build to Approved for 107427 on vecmath (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/vecmath



From pkgdb at fedoraproject.org  Tue Sep 29 20:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:09:41 +0000
Subject: [pkgdb] vecmath (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929200941.ED44D10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for vecmath
kevin has set commit to Approved for 107427 on vecmath (Fedora 12)
kevin has set checkout to Approved for 107427 on vecmath (Fedora 12)
kevin has set build to Approved for 107427 on vecmath (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/vecmath



From kevin at fedoraproject.org  Tue Sep 29 20:09:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:09:52 +0000 (UTC)
Subject: rpms/vecmath - New directory
Message-ID: <20090929200952.14D9411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vecmath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV27147/rpms/vecmath

Log Message:
Directory /cvs/pkgs/rpms/vecmath added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:09:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:09:52 +0000 (UTC)
Subject: rpms/vecmath/devel - New directory
Message-ID: <20090929200952.3D28D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vecmath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV27147/rpms/vecmath/devel

Log Message:
Directory /cvs/pkgs/rpms/vecmath/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:10:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:10:00 +0000 (UTC)
Subject: rpms/vecmath Makefile,NONE,1.1
Message-ID: <20090929201000.4FAD311C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vecmath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV27147/rpms/vecmath

Added Files:
	Makefile 
Log Message:
Setup of module vecmath


--- NEW FILE Makefile ---
# Top level Makefile for module vecmath
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  Tue Sep 29 20:10:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:10:00 +0000 (UTC)
Subject: rpms/vecmath/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090929201000.B518F11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vecmath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV27147/rpms/vecmath/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vecmath


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vecmath
# $Id: Makefile,v 1.1 2009/09/29 20:10:00 kevin Exp $
NAME := vecmath
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  Tue Sep 29 20:10:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:10:34 +0000
Subject: [pkgdb] pure was added for salimma
Message-ID: <20090929201034.4C4E610F874@bastion2.fedora.phx.redhat.com>

kevin has added Package pure with summary The Pure programming language
kevin has approved Package pure
kevin has added a Fedora devel branch for pure with an owner of salimma
kevin has approved pure in Fedora devel
kevin has approved Package pure
kevin has set commit to Approved for 107427 on pure (Fedora devel)
kevin has set checkout to Approved for 107427 on pure (Fedora devel)
kevin has set build to Approved for 107427 on pure (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pure



From pkgdb at fedoraproject.org  Tue Sep 29 20:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:10:35 +0000
Subject: [pkgdb] pure summary updated by kevin
Message-ID: <20090929201035.D810C10F894@bastion2.fedora.phx.redhat.com>

kevin set package pure summary to The Pure programming language

To make changes to this package see:
  /pkgdb/packages/name/pure



From pkgdb at fedoraproject.org  Tue Sep 29 20:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:10:35 +0000
Subject: [pkgdb] pure (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201035.F13B210F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pure
kevin has set commit to Approved for 107427 on pure (Fedora 11)
kevin has set checkout to Approved for 107427 on pure (Fedora 11)
kevin has set build to Approved for 107427 on pure (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pure



From pkgdb at fedoraproject.org  Tue Sep 29 20:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:10:35 +0000
Subject: [pkgdb] pure (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201036.075D510F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for pure
kevin has set commit to Approved for 107427 on pure (Fedora 12)
kevin has set checkout to Approved for 107427 on pure (Fedora 12)
kevin has set build to Approved for 107427 on pure (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/pure



From pkgdb at fedoraproject.org  Tue Sep 29 20:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:10:35 +0000
Subject: [pkgdb] pure (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201036.0F84510F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pure
kevin has set commit to Approved for 107427 on pure (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pure (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pure (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pure



From pkgdb at fedoraproject.org  Tue Sep 29 20:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:10:35 +0000
Subject: [pkgdb] pure (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201036.23A6210F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pure
kevin has set commit to Approved for 107427 on pure (Fedora 10)
kevin has set checkout to Approved for 107427 on pure (Fedora 10)
kevin has set build to Approved for 107427 on pure (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pure



From kevin at fedoraproject.org  Tue Sep 29 20:10:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:10:46 +0000 (UTC)
Subject: rpms/pure - New directory
Message-ID: <20090929201046.17E9E11C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pure
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK27680/rpms/pure

Log Message:
Directory /cvs/pkgs/rpms/pure added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:10:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:10:46 +0000 (UTC)
Subject: rpms/pure/devel - New directory
Message-ID: <20090929201046.621CB11C04C0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pure/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK27680/rpms/pure/devel

Log Message:
Directory /cvs/pkgs/rpms/pure/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:10:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:10:57 +0000 (UTC)
Subject: rpms/pure Makefile,NONE,1.1
Message-ID: <20090929201057.90F7111C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pure
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK27680/rpms/pure

Added Files:
	Makefile 
Log Message:
Setup of module pure


--- NEW FILE Makefile ---
# Top level Makefile for module pure
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  Tue Sep 29 20:10:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:10:57 +0000 (UTC)
Subject: rpms/pure/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090929201057.DE36C11C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pure/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK27680/rpms/pure/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pure


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pure
# $Id: Makefile,v 1.1 2009/09/29 20:10:57 kevin Exp $
NAME := pure
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 sbose at fedoraproject.org  Tue Sep 29 20:11:20 2009
From: sbose at fedoraproject.org (sbose)
Date: Tue, 29 Sep 2009 20:11:20 +0000 (UTC)
Subject: rpms/ctdb/F-12 .cvsignore, 1.10, 1.11 ctdb.spec, 1.13, 1.14 sources,
	1.10, 1.11
Message-ID: <20090929201120.8DF4411C00C1@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28081

Modified Files:
	.cvsignore ctdb.spec sources 
Log Message:
Update to ctdb version 1.0.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Sep 2009 16:02:02 -0000	1.10
+++ .cvsignore	29 Sep 2009 20:11:20 -0000	1.11
@@ -1 +1 @@
-ctdb-1.0.90.tar.bz2
+ctdb-1.0.91.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/F-12/ctdb.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ctdb.spec	23 Sep 2009 16:02:02 -0000	1.13
+++ ctdb.spec	29 Sep 2009 20:11:20 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.90
+Version: 1.0.91
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -132,6 +132,21 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Wed Sep 29 2009 Sumit Bose <sbose at redhat.com> - 1.0.91-1
+ - Update to ctdb version 1.0.91
+
+* Tue Sep 29 2009 : Version 1.0.91
+ - New vacuum and repack design from Wolgang Mueller.
+ - Add a new eventscript 01.reclock that will first mark a node unhealthy and
+   later ban the node if the reclock file can not be accessed.
+ - Add machinereadable output to the ctdb getreclock command
+ - merge transaction updates from Michael Adam
+ - In the new banning code, reset the culprit count to 0 for all nodes that
+   could successfully compelte a full recovery.
+ - dont mark the recovery master as a ban culprit because a node in the cluster
+   needs a recovery. this happens naturally when using ctdb recover command so
+   dont make this cause a node to be banned.
+
 * Wed Sep 23 2009 Sumit Bose <sbose at redhat.com> - 1.0.90-1
  - Update to ctdb version 1.0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Sep 2009 16:02:02 -0000	1.10
+++ sources	29 Sep 2009 20:11:20 -0000	1.11
@@ -1 +1 @@
-3c803ac713fefebd28a837ced557ba20  ctdb-1.0.90.tar.bz2
+9680d0c250daeb87327a9cd87ad8421b  ctdb-1.0.91.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 29 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:11:28 +0000
Subject: [pkgdb] geda-gaf summary updated by kevin
Message-ID: <20090929201128.B239E10F88C@bastion2.fedora.phx.redhat.com>

kevin set package geda-gaf summary to Design Automation toolkit for electronic design

To make changes to this package see:
  /pkgdb/packages/name/geda-gaf



From pkgdb at fedoraproject.org  Tue Sep 29 20:11:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:11:27 +0000
Subject: [pkgdb] geda-gaf was added for chitlesh
Message-ID: <20090929201127.4D4F610F874@bastion2.fedora.phx.redhat.com>

kevin has added Package geda-gaf with summary Design Automation toolkit for electronic design
kevin has approved Package geda-gaf
kevin has added a Fedora devel branch for geda-gaf with an owner of chitlesh
kevin has approved geda-gaf in Fedora devel
kevin has approved Package geda-gaf
kevin has set commit to Approved for 107427 on geda-gaf (Fedora devel)
kevin has set checkout to Approved for 107427 on geda-gaf (Fedora devel)
kevin has set build to Approved for 107427 on geda-gaf (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/geda-gaf



From pkgdb at fedoraproject.org  Tue Sep 29 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:11:28 +0000
Subject: [pkgdb] geda-gaf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201128.DF59010F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for geda-gaf
kevin has set commit to Approved for 107427 on geda-gaf (Fedora 11)
kevin has set checkout to Approved for 107427 on geda-gaf (Fedora 11)
kevin has set build to Approved for 107427 on geda-gaf (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/geda-gaf



From pkgdb at fedoraproject.org  Tue Sep 29 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:11:28 +0000
Subject: [pkgdb] geda-gaf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201128.E808510F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for geda-gaf
kevin has set commit to Approved for 107427 on geda-gaf (Fedora 12)
kevin has set checkout to Approved for 107427 on geda-gaf (Fedora 12)
kevin has set build to Approved for 107427 on geda-gaf (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/geda-gaf



From pkgdb at fedoraproject.org  Tue Sep 29 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:11:28 +0000
Subject: [pkgdb] geda-gaf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201129.0CCD110F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for geda-gaf
kevin has set commit to Approved for 107427 on geda-gaf (Fedora 10)
kevin has set checkout to Approved for 107427 on geda-gaf (Fedora 10)
kevin has set build to Approved for 107427 on geda-gaf (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/geda-gaf



From pkgdb at fedoraproject.org  Tue Sep 29 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:11:28 +0000
Subject: [pkgdb] geda-gaf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201129.22F6310F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for geda-gaf
kevin has set commit to Approved for 107427 on geda-gaf (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on geda-gaf (Fedora EPEL 5)
kevin has set build to Approved for 107427 on geda-gaf (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/geda-gaf



From kevin at fedoraproject.org  Tue Sep 29 20:11:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:11:37 +0000 (UTC)
Subject: rpms/geda-gaf - New directory
Message-ID: <20090929201137.1883C11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/geda-gaf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28175/rpms/geda-gaf

Log Message:
Directory /cvs/pkgs/rpms/geda-gaf added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:11:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:11:37 +0000 (UTC)
Subject: rpms/geda-gaf/devel - New directory
Message-ID: <20090929201137.3D2ED11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/geda-gaf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28175/rpms/geda-gaf/devel

Log Message:
Directory /cvs/pkgs/rpms/geda-gaf/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:11:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:11:44 +0000 (UTC)
Subject: rpms/geda-gaf Makefile,NONE,1.1
Message-ID: <20090929201144.E185711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/geda-gaf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28175/rpms/geda-gaf

Added Files:
	Makefile 
Log Message:
Setup of module geda-gaf


--- NEW FILE Makefile ---
# Top level Makefile for module geda-gaf
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  Tue Sep 29 20:11:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:11:45 +0000 (UTC)
Subject: rpms/geda-gaf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929201145.2BF1A11C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/geda-gaf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28175/rpms/geda-gaf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module geda-gaf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: geda-gaf
# $Id: Makefile,v 1.1 2009/09/29 20:11:45 kevin Exp $
NAME := geda-gaf
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  Tue Sep 29 20:12:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:12:43 +0000
Subject: [pkgdb] dualscreen-mouse-utils was added for chkr
Message-ID: <20090929201243.8911210F874@bastion2.fedora.phx.redhat.com>

kevin has added Package dualscreen-mouse-utils with summary Utilities for use with dual head setups using independent screens
kevin has approved Package dualscreen-mouse-utils
kevin has added a Fedora devel branch for dualscreen-mouse-utils with an owner of chkr
kevin has approved dualscreen-mouse-utils in Fedora devel
kevin has approved Package dualscreen-mouse-utils
kevin has set commit to Approved for 107427 on dualscreen-mouse-utils (Fedora devel)
kevin has set checkout to Approved for 107427 on dualscreen-mouse-utils (Fedora devel)
kevin has set build to Approved for 107427 on dualscreen-mouse-utils (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dualscreen-mouse-utils



From pkgdb at fedoraproject.org  Tue Sep 29 20:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:12:45 +0000
Subject: [pkgdb] dualscreen-mouse-utils summary updated by kevin
Message-ID: <20090929201245.9BB5610F88B@bastion2.fedora.phx.redhat.com>

kevin set package dualscreen-mouse-utils summary to Utilities for use with dual head setups using independent screens

To make changes to this package see:
  /pkgdb/packages/name/dualscreen-mouse-utils



From pkgdb at fedoraproject.org  Tue Sep 29 20:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:12:45 +0000
Subject: [pkgdb] dualscreen-mouse-utils (Fedora, 11) updated by kevin
Message-ID: <20090929201245.A8EFA10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for dualscreen-mouse-utils
kevin has set commit to Approved for 107427 on dualscreen-mouse-utils (Fedora 11)
kevin has set checkout to Approved for 107427 on dualscreen-mouse-utils (Fedora 11)
kevin has set build to Approved for 107427 on dualscreen-mouse-utils (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dualscreen-mouse-utils



From pkgdb at fedoraproject.org  Tue Sep 29 20:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:12:45 +0000
Subject: [pkgdb] dualscreen-mouse-utils (Fedora, 11) updated by kevin
Message-ID: <20090929201245.D76FA10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for dualscreen-mouse-utils
kevin has set commit to Approved for 107427 on dualscreen-mouse-utils (Fedora 12)
kevin has set checkout to Approved for 107427 on dualscreen-mouse-utils (Fedora 12)
kevin has set build to Approved for 107427 on dualscreen-mouse-utils (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dualscreen-mouse-utils



From kevin at fedoraproject.org  Tue Sep 29 20:12:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:12:56 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils - New directory
Message-ID: <20090929201256.1B39A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28794/rpms/dualscreen-mouse-utils

Log Message:
Directory /cvs/pkgs/rpms/dualscreen-mouse-utils added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:12:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:12:56 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils/devel - New directory
Message-ID: <20090929201256.A37A111C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28794/rpms/dualscreen-mouse-utils/devel

Log Message:
Directory /cvs/pkgs/rpms/dualscreen-mouse-utils/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:13:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:13:04 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils Makefile,NONE,1.1
Message-ID: <20090929201304.7467A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28794/rpms/dualscreen-mouse-utils

Added Files:
	Makefile 
Log Message:
Setup of module dualscreen-mouse-utils


--- NEW FILE Makefile ---
# Top level Makefile for module dualscreen-mouse-utils
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  Tue Sep 29 20:13:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:13:04 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090929201304.BA2A911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28794/rpms/dualscreen-mouse-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dualscreen-mouse-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dualscreen-mouse-utils
# $Id: Makefile,v 1.1 2009/09/29 20:13:04 kevin Exp $
NAME := dualscreen-mouse-utils
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  Tue Sep 29 20:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:13:33 +0000
Subject: [pkgdb] dokuwiki was added for topdog
Message-ID: <20090929201334.2AC0510F874@bastion2.fedora.phx.redhat.com>

kevin has added Package dokuwiki with summary Standards compliant simple to use wiki
kevin has approved Package dokuwiki
kevin has added a Fedora devel branch for dokuwiki with an owner of topdog
kevin has approved dokuwiki in Fedora devel
kevin has approved Package dokuwiki
kevin has set commit to Approved for 107427 on dokuwiki (Fedora devel)
kevin has set checkout to Approved for 107427 on dokuwiki (Fedora devel)
kevin has set build to Approved for 107427 on dokuwiki (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dokuwiki



From pkgdb at fedoraproject.org  Tue Sep 29 20:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:13:35 +0000
Subject: [pkgdb] dokuwiki summary updated by kevin
Message-ID: <20090929201335.B5BF010F88B@bastion2.fedora.phx.redhat.com>

kevin set package dokuwiki summary to Standards compliant simple to use wiki

To make changes to this package see:
  /pkgdb/packages/name/dokuwiki



From pkgdb at fedoraproject.org  Tue Sep 29 20:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:13:35 +0000
Subject: [pkgdb] dokuwiki (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201335.C479510F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for dokuwiki
kevin has set commit to Approved for 107427 on dokuwiki (Fedora 11)
kevin has set checkout to Approved for 107427 on dokuwiki (Fedora 11)
kevin has set build to Approved for 107427 on dokuwiki (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dokuwiki



From pkgdb at fedoraproject.org  Tue Sep 29 20:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:13:35 +0000
Subject: [pkgdb] dokuwiki (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201335.D858810F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for dokuwiki
kevin has set commit to Approved for 107427 on dokuwiki (Fedora 12)
kevin has set checkout to Approved for 107427 on dokuwiki (Fedora 12)
kevin has set build to Approved for 107427 on dokuwiki (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dokuwiki



From pkgdb at fedoraproject.org  Tue Sep 29 20:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:13:35 +0000
Subject: [pkgdb] dokuwiki (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201335.DC5F410F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dokuwiki
kevin has set commit to Approved for 107427 on dokuwiki (Fedora 10)
kevin has set checkout to Approved for 107427 on dokuwiki (Fedora 10)
kevin has set build to Approved for 107427 on dokuwiki (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dokuwiki



From pkgdb at fedoraproject.org  Tue Sep 29 20:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:13:35 +0000
Subject: [pkgdb] dokuwiki (Fedora EPEL, 5) updated by kevin
Message-ID: <20090929201335.EECF510F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for dokuwiki
kevin has set commit to Approved for 107427 on dokuwiki (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on dokuwiki (Fedora EPEL 5)
kevin has set build to Approved for 107427 on dokuwiki (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/dokuwiki



From kevin at fedoraproject.org  Tue Sep 29 20:13:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:13:46 +0000 (UTC)
Subject: rpms/dokuwiki - New directory
Message-ID: <20090929201346.1A1AC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dokuwiki
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE29241/rpms/dokuwiki

Log Message:
Directory /cvs/pkgs/rpms/dokuwiki added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:13:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:13:46 +0000 (UTC)
Subject: rpms/dokuwiki/devel - New directory
Message-ID: <20090929201346.40CC811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dokuwiki/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE29241/rpms/dokuwiki/devel

Log Message:
Directory /cvs/pkgs/rpms/dokuwiki/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:13:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:13:53 +0000 (UTC)
Subject: rpms/dokuwiki Makefile,NONE,1.1
Message-ID: <20090929201353.946E011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dokuwiki
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE29241/rpms/dokuwiki

Added Files:
	Makefile 
Log Message:
Setup of module dokuwiki


--- NEW FILE Makefile ---
# Top level Makefile for module dokuwiki
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  Tue Sep 29 20:13:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:13:53 +0000 (UTC)
Subject: rpms/dokuwiki/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929201353.E060A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dokuwiki/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE29241/rpms/dokuwiki/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dokuwiki


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dokuwiki
# $Id: Makefile,v 1.1 2009/09/29 20:13:53 kevin Exp $
NAME := dokuwiki
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  Tue Sep 29 20:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:14:51 +0000
Subject: [pkgdb] etckeeper was added for bernie
Message-ID: <20090929201451.D0F7810F888@bastion2.fedora.phx.redhat.com>

kevin has added Package etckeeper with summary Store /etc in git, mercurial, bzr or darcs
kevin has approved Package etckeeper
kevin has added a Fedora devel branch for etckeeper with an owner of bernie
kevin has approved etckeeper in Fedora devel
kevin has approved Package etckeeper
kevin has set commit to Approved for 107427 on etckeeper (Fedora devel)
kevin has set checkout to Approved for 107427 on etckeeper (Fedora devel)
kevin has set build to Approved for 107427 on etckeeper (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/etckeeper



From pkgdb at fedoraproject.org  Tue Sep 29 20:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:14:53 +0000
Subject: [pkgdb] etckeeper summary updated by kevin
Message-ID: <20090929201453.B129F10F8A9@bastion2.fedora.phx.redhat.com>

kevin set package etckeeper summary to Store /etc in git, mercurial, bzr or darcs

To make changes to this package see:
  /pkgdb/packages/name/etckeeper



From mclasen at fedoraproject.org  Tue Sep 29 20:14:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 29 Sep 2009 20:14:51 +0000 (UTC)
Subject: rpms/gvfs/F-12 http-icons.patch,NONE,1.1 gvfs.spec,1.157,1.158
Message-ID: <20090929201451.92F8111C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29600

Modified Files:
	gvfs.spec 
Added Files:
	http-icons.patch 
Log Message:
fix lack of icons in the http backend


http-icons.patch:
 gvfsbackendhttp.c |   46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

--- NEW FILE http-icons.patch ---
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index 45ea54d..97c6ce7 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -47,6 +47,7 @@
 #include "gvfsjobqueryattributes.h"
 #include "gvfsjobenumerate.h"
 #include "gvfsdaemonprotocol.h"
+#include "gvfsdaemonutils.h"
 
 #include "soup-input-stream.h"
 
@@ -539,10 +540,12 @@ query_info_ready (SoupSession *session,
   const char            *text;
   GFileInfo             *info;
   char                  *basename;
+  char                  *ed_name;
 
   job     = G_VFS_JOB_QUERY_INFO (user_data);
   info    = job->file_info;
   matcher = job->attribute_matcher;
+  ed_name = NULL;
 
   if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
     {
@@ -562,30 +565,18 @@ query_info_ready (SoupSession *session,
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
     {
-      char *display_name = g_filename_display_name (basename);
-
-      if (strstr (display_name, "\357\277\275") != NULL)
-        {
-          char *p = display_name;
-          display_name = g_strconcat (display_name, _(" (invalid encoding)"), NULL);
-          g_free (p);
-        }
-
-      g_file_info_set_display_name (info, display_name);
-      g_free (display_name);
+      ed_name = gvfs_file_info_populate_names_as_local (info, basename);
     }
 
-  if (basename != NULL &&
+  if (ed_name != NULL &&
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
     {
-      char *edit_name = g_filename_display_name (basename);
-      g_file_info_set_edit_name (info, edit_name);
-      g_free (edit_name);
-    } 
+      g_file_info_set_edit_name (info, ed_name);
+    }
 
   g_free (basename);
-
+  g_free (ed_name);
 
   text = soup_message_headers_get (msg->response_headers,
                                    "Content-Length");
@@ -601,15 +592,22 @@ query_info_ready (SoupSession *session,
   if (text)
     {
       char *p = strchr (text, ';');
+      char *tmp = NULL;
+      GIcon *icon;
 
       if (p != NULL)
-        {
-          char *tmp = g_strndup (text, p - text);
-          g_file_info_set_content_type (info, tmp);
-          g_free (tmp);
-        }
-      else
-        g_file_info_set_content_type (info, text);
+        text = tmp = g_strndup (text, p - text);
+
+      g_file_info_set_file_type (info, G_FILE_TYPE_REGULAR);
+      g_file_info_set_content_type (info, text);
+      g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, text);
+
+      icon = g_content_type_get_icon (text);
+      g_file_info_set_icon (info, icon);
+      g_object_unref (icon);
+
+      g_free (tmp);
+
     }
 
 


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- gvfs.spec	21 Sep 2009 15:09:47 -0000	1.157
+++ gvfs.spec	29 Sep 2009 20:14:51 -0000	1.158
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,9 +34,11 @@ Requires(postun): desktop-file-utils
 BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
-Patch1: gvfs-archive-integration.patch
+Patch0: gvfs-archive-integration.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
-Patch10: 0001-Add-AFC-backend.patch
+Patch1: 0001-Add-AFC-backend.patch
+# from upstream
+Patch2: http-icons.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -128,8 +130,9 @@ and iPod Touches to applications using g
 
 %prep
 %setup -q
-%patch1 -p1 -b .archive-integration
-%patch10 -p1 -b .afc
+%patch0 -p1 -b .archive-integration
+%patch1 -p1 -b .afc
+%patch2 -p1 -b .http-icons
 
 %build
 
@@ -283,6 +286,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-2
+- Fix the lack of icons in the http backend
+
 * Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 



From pkgdb at fedoraproject.org  Tue Sep 29 20:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:14:53 +0000
Subject: [pkgdb] etckeeper (Fedora, 11) updated by kevin
Message-ID: <20090929201453.DA45410F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for etckeeper
kevin has set commit to Approved for 107427 on etckeeper (Fedora 11)
kevin has set checkout to Approved for 107427 on etckeeper (Fedora 11)
kevin has set build to Approved for 107427 on etckeeper (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/etckeeper



From pkgdb at fedoraproject.org  Tue Sep 29 20:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:14:53 +0000
Subject: [pkgdb] etckeeper (Fedora, 11) updated by kevin
Message-ID: <20090929201454.06E3210F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for etckeeper
kevin has set commit to Approved for 107427 on etckeeper (Fedora 12)
kevin has set checkout to Approved for 107427 on etckeeper (Fedora 12)
kevin has set build to Approved for 107427 on etckeeper (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/etckeeper



From kevin at fedoraproject.org  Tue Sep 29 20:15:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:15:04 +0000 (UTC)
Subject: rpms/etckeeper/devel - New directory
Message-ID: <20090929201504.5A28311C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/etckeeper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY29737/rpms/etckeeper/devel

Log Message:
Directory /cvs/pkgs/rpms/etckeeper/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:15:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:15:04 +0000 (UTC)
Subject: rpms/etckeeper - New directory
Message-ID: <20090929201504.1DB4D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/etckeeper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY29737/rpms/etckeeper

Log Message:
Directory /cvs/pkgs/rpms/etckeeper added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:15:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:15:12 +0000 (UTC)
Subject: rpms/etckeeper Makefile,NONE,1.1
Message-ID: <20090929201512.C675411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/etckeeper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY29737/rpms/etckeeper

Added Files:
	Makefile 
Log Message:
Setup of module etckeeper


--- NEW FILE Makefile ---
# Top level Makefile for module etckeeper
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  Tue Sep 29 20:15:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:15:13 +0000 (UTC)
Subject: rpms/etckeeper/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929201513.0270011C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/etckeeper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY29737/rpms/etckeeper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module etckeeper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: etckeeper
# $Id: Makefile,v 1.1 2009/09/29 20:15:12 kevin Exp $
NAME := etckeeper
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  Tue Sep 29 20:15:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:15:41 +0000
Subject: [pkgdb] iwl1000-firmware was added for linville
Message-ID: <20090929201541.8609610F874@bastion2.fedora.phx.redhat.com>

kevin has added Package iwl1000-firmware with summary Firmware for Intel? PRO/Wireless 1000 B/G/N network adaptors
kevin has approved Package iwl1000-firmware
kevin has added a Fedora devel branch for iwl1000-firmware with an owner of linville
kevin has approved iwl1000-firmware in Fedora devel
kevin has approved Package iwl1000-firmware
kevin has set commit to Approved for 107427 on iwl1000-firmware (Fedora devel)
kevin has set checkout to Approved for 107427 on iwl1000-firmware (Fedora devel)
kevin has set build to Approved for 107427 on iwl1000-firmware (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/iwl1000-firmware



From pkgdb at fedoraproject.org  Tue Sep 29 20:15:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:15:42 +0000
Subject: [pkgdb] iwl1000-firmware summary updated by kevin
Message-ID: <20090929201543.284DC10F88C@bastion2.fedora.phx.redhat.com>

kevin set package iwl1000-firmware summary to Firmware for Intel? PRO/Wireless 1000 B/G/N network adaptors

To make changes to this package see:
  /pkgdb/packages/name/iwl1000-firmware



From pkgdb at fedoraproject.org  Tue Sep 29 20:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:15:43 +0000
Subject: [pkgdb] iwl1000-firmware (Fedora, 11) updated by kevin
Message-ID: <20090929201543.594A810F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for iwl1000-firmware
kevin has set commit to Approved for 107427 on iwl1000-firmware (Fedora 11)
kevin has set checkout to Approved for 107427 on iwl1000-firmware (Fedora 11)
kevin has set build to Approved for 107427 on iwl1000-firmware (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/iwl1000-firmware



From pkgdb at fedoraproject.org  Tue Sep 29 20:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:15:43 +0000
Subject: [pkgdb] iwl1000-firmware (Fedora, 11) updated by kevin
Message-ID: <20090929201543.EB28310F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for iwl1000-firmware
kevin has set commit to Approved for 107427 on iwl1000-firmware (Fedora 12)
kevin has set checkout to Approved for 107427 on iwl1000-firmware (Fedora 12)
kevin has set build to Approved for 107427 on iwl1000-firmware (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/iwl1000-firmware



From kevin at fedoraproject.org  Tue Sep 29 20:15:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:15:56 +0000 (UTC)
Subject: rpms/iwl1000-firmware - New directory
Message-ID: <20090929201556.CF6F211C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iwl1000-firmware
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30187/rpms/iwl1000-firmware

Log Message:
Directory /cvs/pkgs/rpms/iwl1000-firmware added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:15:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:15:57 +0000 (UTC)
Subject: rpms/iwl1000-firmware/devel - New directory
Message-ID: <20090929201557.89B1711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iwl1000-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30187/rpms/iwl1000-firmware/devel

Log Message:
Directory /cvs/pkgs/rpms/iwl1000-firmware/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:16:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:16:20 +0000 (UTC)
Subject: rpms/iwl1000-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090929201620.3415511C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iwl1000-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30187/rpms/iwl1000-firmware/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iwl1000-firmware


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: iwl1000-firmware
# $Id: Makefile,v 1.1 2009/09/29 20:16:19 kevin Exp $
NAME := iwl1000-firmware
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Sep 29 20:16:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:16:18 +0000 (UTC)
Subject: rpms/iwl1000-firmware Makefile,NONE,1.1
Message-ID: <20090929201618.299F411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iwl1000-firmware
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss30187/rpms/iwl1000-firmware

Added Files:
	Makefile 
Log Message:
Setup of module iwl1000-firmware


--- NEW FILE Makefile ---
# Top level Makefile for module iwl1000-firmware
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Sep 29 20:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:16:37 +0000
Subject: [pkgdb] avra was added for musolinoa
Message-ID: <20090929201638.5B20810F8AB@bastion2.fedora.phx.redhat.com>

kevin has added Package avra with summary ATmel AVR 8-bit RISC microcontroller assembler
kevin has approved Package avra
kevin has added a Fedora devel branch for avra with an owner of musolinoa
kevin has approved avra in Fedora devel
kevin has approved Package avra
kevin has set commit to Approved for 107427 on avra (Fedora devel)
kevin has set checkout to Approved for 107427 on avra (Fedora devel)
kevin has set build to Approved for 107427 on avra (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/avra



From pkgdb at fedoraproject.org  Tue Sep 29 20:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:16:42 +0000
Subject: [pkgdb] avra summary updated by kevin
Message-ID: <20090929201642.2D7F410F8AF@bastion2.fedora.phx.redhat.com>

kevin set package avra summary to ATmel AVR 8-bit RISC microcontroller assembler

To make changes to this package see:
  /pkgdb/packages/name/avra



From pkgdb at fedoraproject.org  Tue Sep 29 20:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:16:42 +0000
Subject: [pkgdb] avra (Fedora, 10) updated by kevin
Message-ID: <20090929201642.36E6210F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for avra
kevin has set commit to Approved for 107427 on avra (Fedora 11)
kevin has set checkout to Approved for 107427 on avra (Fedora 11)
kevin has set build to Approved for 107427 on avra (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/avra



From pkgdb at fedoraproject.org  Tue Sep 29 20:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:16:42 +0000
Subject: [pkgdb] avra (Fedora, 10) updated by kevin
Message-ID: <20090929201642.6C54010F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for avra
kevin has set commit to Approved for 107427 on avra (Fedora 12)
kevin has set checkout to Approved for 107427 on avra (Fedora 12)
kevin has set build to Approved for 107427 on avra (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/avra



From pkgdb at fedoraproject.org  Tue Sep 29 20:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:16:42 +0000
Subject: [pkgdb] avra (Fedora, 10) updated by kevin
Message-ID: <20090929201642.9879110F8BD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for avra
kevin has set commit to Approved for 107427 on avra (Fedora 10)
kevin has set checkout to Approved for 107427 on avra (Fedora 10)
kevin has set build to Approved for 107427 on avra (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/avra



From kevin at fedoraproject.org  Tue Sep 29 20:16:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:16:54 +0000 (UTC)
Subject: rpms/avra - New directory
Message-ID: <20090929201654.1488A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/avra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30798/rpms/avra

Log Message:
Directory /cvs/pkgs/rpms/avra added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:16:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:16:54 +0000 (UTC)
Subject: rpms/avra/devel - New directory
Message-ID: <20090929201654.4077711C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/avra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30798/rpms/avra/devel

Log Message:
Directory /cvs/pkgs/rpms/avra/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:17:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:17:01 +0000 (UTC)
Subject: rpms/avra Makefile,NONE,1.1
Message-ID: <20090929201701.ECFEC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/avra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30798/rpms/avra

Added Files:
	Makefile 
Log Message:
Setup of module avra


--- NEW FILE Makefile ---
# Top level Makefile for module avra
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  Tue Sep 29 20:17:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:17:02 +0000 (UTC)
Subject: rpms/avra/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090929201702.493AA11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/avra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30798/rpms/avra/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module avra


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: avra
# $Id: Makefile,v 1.1 2009/09/29 20:17:02 kevin Exp $
NAME := avra
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  Tue Sep 29 20:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:18:00 +0000
Subject: [pkgdb] perl-Tk-ProgressBar-Mac was added for hvad
Message-ID: <20090929201800.E5DAF10F888@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Tk-ProgressBar-Mac with summary Mac ProgressBar for Perl::Tk
kevin has approved Package perl-Tk-ProgressBar-Mac
kevin has added a Fedora devel branch for perl-Tk-ProgressBar-Mac with an owner of hvad
kevin has approved perl-Tk-ProgressBar-Mac in Fedora devel
kevin has approved Package perl-Tk-ProgressBar-Mac
kevin has set commit to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora devel)
kevin has set build to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Tk-ProgressBar-Mac



From pkgdb at fedoraproject.org  Tue Sep 29 20:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:18:02 +0000
Subject: [pkgdb] perl-Tk-ProgressBar-Mac summary updated by kevin
Message-ID: <20090929201802.AB0DF10F894@bastion2.fedora.phx.redhat.com>

kevin set package perl-Tk-ProgressBar-Mac summary to Mac ProgressBar for Perl::Tk

To make changes to this package see:
  /pkgdb/packages/name/perl-Tk-ProgressBar-Mac



From pkgdb at fedoraproject.org  Tue Sep 29 20:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:18:02 +0000
Subject: [pkgdb] perl-Tk-ProgressBar-Mac (Fedora, 10) updated by kevin
Message-ID: <20090929201802.C25BE10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Tk-ProgressBar-Mac
kevin has set commit to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 11)
kevin has set build to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/perl-Tk-ProgressBar-Mac



From pkgdb at fedoraproject.org  Tue Sep 29 20:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:18:02 +0000
Subject: [pkgdb] perl-Tk-ProgressBar-Mac (Fedora, 10) updated by kevin
Message-ID: <20090929201803.0BA9610F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Tk-ProgressBar-Mac
kevin has set commit to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 12)
kevin has set build to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/perl-Tk-ProgressBar-Mac



From pkgdb at fedoraproject.org  Tue Sep 29 20:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:18:02 +0000
Subject: [pkgdb] perl-Tk-ProgressBar-Mac (Fedora, 10) updated by kevin
Message-ID: <20090929201803.1C3E710F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Tk-ProgressBar-Mac
kevin has set commit to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 10)
kevin has set build to Approved for 107427 on perl-Tk-ProgressBar-Mac (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/perl-Tk-ProgressBar-Mac



From kevin at fedoraproject.org  Tue Sep 29 20:18:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:18:10 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac - New directory
Message-ID: <20090929201810.274E511C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr31391/rpms/perl-Tk-ProgressBar-Mac

Log Message:
Directory /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:18:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:18:10 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/devel - New directory
Message-ID: <20090929201810.4A04211C0423@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr31391/rpms/perl-Tk-ProgressBar-Mac/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:18:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:18:17 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac Makefile,NONE,1.1
Message-ID: <20090929201817.DE64811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr31391/rpms/perl-Tk-ProgressBar-Mac

Added Files:
	Makefile 
Log Message:
Setup of module perl-Tk-ProgressBar-Mac


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Tk-ProgressBar-Mac
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  Tue Sep 29 20:18:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:18:18 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090929201818.1E0B411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr31391/rpms/perl-Tk-ProgressBar-Mac/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Tk-ProgressBar-Mac


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Tk-ProgressBar-Mac
# $Id: Makefile,v 1.1 2009/09/29 20:18:18 kevin Exp $
NAME := perl-Tk-ProgressBar-Mac
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  Tue Sep 29 20:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:19:41 +0000
Subject: [pkgdb] perl-common-sense was added for cweyl
Message-ID: <20090929201942.2E5A510F8A9@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-common-sense with summary "Common sense" Perl defaults
kevin has approved Package perl-common-sense
kevin has added a Fedora devel branch for perl-common-sense with an owner of cweyl
kevin has approved perl-common-sense in Fedora devel
kevin has approved Package perl-common-sense
kevin has set commit to Approved for 107427 on perl-common-sense (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-common-sense (Fedora devel)
kevin has set build to Approved for 107427 on perl-common-sense (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-common-sense



From pkgdb at fedoraproject.org  Tue Sep 29 20:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:19:43 +0000
Subject: [pkgdb] perl-common-sense summary updated by kevin
Message-ID: <20090929201943.B194310F8A8@bastion2.fedora.phx.redhat.com>

kevin set package perl-common-sense summary to "Common sense" Perl defaults

To make changes to this package see:
  /pkgdb/packages/name/perl-common-sense



From pkgdb at fedoraproject.org  Tue Sep 29 20:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:19:43 +0000
Subject: [pkgdb] perl-common-sense (Fedora, 10) updated by kevin
Message-ID: <20090929201943.B671710F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-common-sense
kevin has set commit to Approved for 107427 on perl-common-sense (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-common-sense (Fedora 10)
kevin has set build to Approved for 107427 on perl-common-sense (Fedora 10)
kevin approved watchbugzilla on perl-common-sense (Fedora 10) for perl-sig
kevin approved watchcommits on perl-common-sense (Fedora 10) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-common-sense



From pkgdb at fedoraproject.org  Tue Sep 29 20:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:19:43 +0000
Subject: [pkgdb] perl-common-sense (Fedora, 10) updated by kevin
Message-ID: <20090929201943.BF0B210F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-common-sense
kevin has set commit to Approved for 107427 on perl-common-sense (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-common-sense (Fedora 11)
kevin has set build to Approved for 107427 on perl-common-sense (Fedora 11)
kevin approved watchbugzilla on perl-common-sense (Fedora 11) for perl-sig
kevin approved watchcommits on perl-common-sense (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-common-sense



From pkgdb at fedoraproject.org  Tue Sep 29 20:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:19:43 +0000
Subject: [pkgdb] perl-common-sense (Fedora, 10) updated by kevin
Message-ID: <20090929201943.C79D610F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-common-sense
kevin has set commit to Approved for 107427 on perl-common-sense (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-common-sense (Fedora 12)
kevin has set build to Approved for 107427 on perl-common-sense (Fedora 12)
kevin approved watchbugzilla on perl-common-sense (Fedora 12) for perl-sig
kevin approved watchcommits on perl-common-sense (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-common-sense



From pkgdb at fedoraproject.org  Tue Sep 29 20:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:19:43 +0000
Subject: [pkgdb] perl-common-sense (Fedora, 10) updated by kevin
Message-ID: <20090929201943.E548C10F8B9@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-common-sense (Fedora devel) for perl-sig
kevin approved watchcommits on perl-common-sense (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-common-sense



From kevin at fedoraproject.org  Tue Sep 29 20:19:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:19:57 +0000 (UTC)
Subject: rpms/perl-common-sense/devel - New directory
Message-ID: <20090929201957.4A4AC11C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-common-sense/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP31859/rpms/perl-common-sense/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-common-sense/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:19:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:19:57 +0000 (UTC)
Subject: rpms/perl-common-sense - New directory
Message-ID: <20090929201957.24AFB11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-common-sense
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP31859/rpms/perl-common-sense

Log Message:
Directory /cvs/pkgs/rpms/perl-common-sense added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:20:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:20:04 +0000 (UTC)
Subject: rpms/perl-common-sense Makefile,NONE,1.1
Message-ID: <20090929202004.9EF5511C0489@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-common-sense
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP31859/rpms/perl-common-sense

Added Files:
	Makefile 
Log Message:
Setup of module perl-common-sense


--- NEW FILE Makefile ---
# Top level Makefile for module perl-common-sense
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  Tue Sep 29 20:20:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:20:04 +0000 (UTC)
Subject: rpms/perl-common-sense/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090929202004.E250C11C0489@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-common-sense/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP31859/rpms/perl-common-sense/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-common-sense


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-common-sense
# $Id: Makefile,v 1.1 2009/09/29 20:20:04 kevin Exp $
NAME := perl-common-sense
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  Tue Sep 29 20:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:21:55 +0000
Subject: [pkgdb] perl-WWW-Mechanize-GZip was added for cweyl
Message-ID: <20090929202155.C2FA510F888@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-WWW-Mechanize-GZip with summary Fetch compressed webpages
kevin has approved Package perl-WWW-Mechanize-GZip
kevin has added a Fedora devel branch for perl-WWW-Mechanize-GZip with an owner of cweyl
kevin has approved perl-WWW-Mechanize-GZip in Fedora devel
kevin has approved Package perl-WWW-Mechanize-GZip
kevin has set commit to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora devel)
kevin has set build to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-WWW-Mechanize-GZip



From pkgdb at fedoraproject.org  Tue Sep 29 20:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:21:57 +0000
Subject: [pkgdb] perl-WWW-Mechanize-GZip summary updated by kevin
Message-ID: <20090929202157.7E5A910F895@bastion2.fedora.phx.redhat.com>

kevin set package perl-WWW-Mechanize-GZip summary to Fetch compressed webpages

To make changes to this package see:
  /pkgdb/packages/name/perl-WWW-Mechanize-GZip



From pkgdb at fedoraproject.org  Tue Sep 29 20:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:21:57 +0000
Subject: [pkgdb] perl-WWW-Mechanize-GZip (Fedora, 10) updated by kevin
Message-ID: <20090929202157.846E810F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-WWW-Mechanize-GZip
kevin has set commit to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 11)
kevin has set build to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 11)
kevin approved watchbugzilla on perl-WWW-Mechanize-GZip (Fedora 11) for perl-sig
kevin approved watchcommits on perl-WWW-Mechanize-GZip (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-WWW-Mechanize-GZip



From pkgdb at fedoraproject.org  Tue Sep 29 20:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:21:57 +0000
Subject: [pkgdb] perl-WWW-Mechanize-GZip (Fedora, 10) updated by kevin
Message-ID: <20090929202157.89B5E10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-WWW-Mechanize-GZip
kevin has set commit to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 10)
kevin has set build to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 10)
kevin approved watchbugzilla on perl-WWW-Mechanize-GZip (Fedora 10) for perl-sig
kevin approved watchcommits on perl-WWW-Mechanize-GZip (Fedora 10) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-WWW-Mechanize-GZip



From pkgdb at fedoraproject.org  Tue Sep 29 20:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:21:57 +0000
Subject: [pkgdb] perl-WWW-Mechanize-GZip (Fedora, 10) updated by kevin
Message-ID: <20090929202157.8F65C10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-WWW-Mechanize-GZip
kevin has set commit to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 12)
kevin has set build to Approved for 107427 on perl-WWW-Mechanize-GZip (Fedora 12)
kevin approved watchbugzilla on perl-WWW-Mechanize-GZip (Fedora 12) for perl-sig
kevin approved watchcommits on perl-WWW-Mechanize-GZip (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-WWW-Mechanize-GZip



From pkgdb at fedoraproject.org  Tue Sep 29 20:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:21:57 +0000
Subject: [pkgdb] perl-WWW-Mechanize-GZip (Fedora, 10) updated by kevin
Message-ID: <20090929202157.9A44B10F8B5@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-WWW-Mechanize-GZip (Fedora devel) for perl-sig
kevin approved watchcommits on perl-WWW-Mechanize-GZip (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-WWW-Mechanize-GZip



From kevin at fedoraproject.org  Tue Sep 29 20:22:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:22:06 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip - New directory
Message-ID: <20090929202206.1D8C811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj32485/rpms/perl-WWW-Mechanize-GZip

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:22:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:22:06 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/devel - New directory
Message-ID: <20090929202206.4F53811C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj32485/rpms/perl-WWW-Mechanize-GZip/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:22:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:22:13 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip Makefile,NONE,1.1
Message-ID: <20090929202213.72E9011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj32485/rpms/perl-WWW-Mechanize-GZip

Added Files:
	Makefile 
Log Message:
Setup of module perl-WWW-Mechanize-GZip


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WWW-Mechanize-GZip
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  Tue Sep 29 20:22:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:22:13 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090929202213.AE92B11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj32485/rpms/perl-WWW-Mechanize-GZip/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WWW-Mechanize-GZip


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-WWW-Mechanize-GZip
# $Id: Makefile,v 1.1 2009/09/29 20:22:13 kevin Exp $
NAME := perl-WWW-Mechanize-GZip
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  Tue Sep 29 20:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:23:40 +0000
Subject: [pkgdb] fedora-gnat-project-common was added for rombobeorn
Message-ID: <20090929202340.8433D10F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package fedora-gnat-project-common with summary Files shared by Ada libraries
kevin has approved Package fedora-gnat-project-common
kevin has added a Fedora devel branch for fedora-gnat-project-common with an owner of rombobeorn
kevin has approved fedora-gnat-project-common in Fedora devel
kevin has approved Package fedora-gnat-project-common
kevin has set commit to Approved for 107427 on fedora-gnat-project-common (Fedora devel)
kevin has set checkout to Approved for 107427 on fedora-gnat-project-common (Fedora devel)
kevin has set build to Approved for 107427 on fedora-gnat-project-common (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnat-project-common



From pkgdb at fedoraproject.org  Tue Sep 29 20:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:23:42 +0000
Subject: [pkgdb] fedora-gnat-project-common summary updated by kevin
Message-ID: <20090929202342.2837210F88C@bastion2.fedora.phx.redhat.com>

kevin set package fedora-gnat-project-common summary to Files shared by Ada libraries

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnat-project-common



From pkgdb at fedoraproject.org  Tue Sep 29 20:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:23:42 +0000
Subject: [pkgdb] fedora-gnat-project-common (Fedora, 10) updated by kevin
Message-ID: <20090929202342.4A89D10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for fedora-gnat-project-common
kevin has set commit to Approved for 107427 on fedora-gnat-project-common (Fedora 11)
kevin has set checkout to Approved for 107427 on fedora-gnat-project-common (Fedora 11)
kevin has set build to Approved for 107427 on fedora-gnat-project-common (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnat-project-common



From pkgdb at fedoraproject.org  Tue Sep 29 20:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:23:42 +0000
Subject: [pkgdb] fedora-gnat-project-common (Fedora, 10) updated by kevin
Message-ID: <20090929202342.5AB5410F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for fedora-gnat-project-common
kevin has set commit to Approved for 107427 on fedora-gnat-project-common (Fedora 12)
kevin has set checkout to Approved for 107427 on fedora-gnat-project-common (Fedora 12)
kevin has set build to Approved for 107427 on fedora-gnat-project-common (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnat-project-common



From pkgdb at fedoraproject.org  Tue Sep 29 20:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:23:42 +0000
Subject: [pkgdb] fedora-gnat-project-common (Fedora, 10) updated by kevin
Message-ID: <20090929202342.6637010F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for fedora-gnat-project-common
kevin has set commit to Approved for 107427 on fedora-gnat-project-common (Fedora 10)
kevin has set checkout to Approved for 107427 on fedora-gnat-project-common (Fedora 10)
kevin has set build to Approved for 107427 on fedora-gnat-project-common (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/fedora-gnat-project-common



From kevin at fedoraproject.org  Tue Sep 29 20:23:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:23:51 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common - New directory
Message-ID: <20090929202351.1B12811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fedora-gnat-project-common
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslB1092/rpms/fedora-gnat-project-common

Log Message:
Directory /cvs/pkgs/rpms/fedora-gnat-project-common added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:23:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:23:51 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common/devel - New directory
Message-ID: <20090929202351.4A7EC11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fedora-gnat-project-common/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslB1092/rpms/fedora-gnat-project-common/devel

Log Message:
Directory /cvs/pkgs/rpms/fedora-gnat-project-common/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 29 20:23:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:23:59 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common Makefile,NONE,1.1
Message-ID: <20090929202359.29C5D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fedora-gnat-project-common
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslB1092/rpms/fedora-gnat-project-common

Added Files:
	Makefile 
Log Message:
Setup of module fedora-gnat-project-common


--- NEW FILE Makefile ---
# Top level Makefile for module fedora-gnat-project-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  Tue Sep 29 20:23:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Sep 2009 20:23:59 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090929202359.6345211C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fedora-gnat-project-common/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslB1092/rpms/fedora-gnat-project-common/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fedora-gnat-project-common


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fedora-gnat-project-common
# $Id: Makefile,v 1.1 2009/09/29 20:23:59 kevin Exp $
NAME := fedora-gnat-project-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  Tue Sep 29 20:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:25:07 +0000
Subject: [pkgdb] perl-Curses (Fedora EPEL, 4) updated by kevin
Message-ID: <20090929202507.B3A9910F874@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-Curses
kevin has set commit to Approved for 107427 on perl-Curses (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on perl-Curses (Fedora EPEL 4)
kevin has set build to Approved for 107427 on perl-Curses (Fedora EPEL 4)
kevin changed owner of perl-Curses in Fedora EPEL 4 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Tue Sep 29 20:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:25:07 +0000
Subject: [pkgdb] perl-Curses (Fedora EPEL, 4) updated by kevin
Message-ID: <20090929202507.D762A10F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Curses
kevin has set commit to Approved for 107427 on perl-Curses (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-Curses (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-Curses (Fedora EPEL 5)
kevin changed owner of perl-Curses in Fedora EPEL 5 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/perl-Curses



From pkgdb at fedoraproject.org  Tue Sep 29 20:26:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:26:47 +0000
Subject: [pkgdb] python-pp (Fedora EPEL, 4) updated by kevin
Message-ID: <20090929202647.9BBBC10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-pp
kevin has set commit to Approved for 107427 on python-pp (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-pp (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-pp (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/python-pp



From pkgdb at fedoraproject.org  Tue Sep 29 20:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 20:27:19 +0000
Subject: [pkgdb] python-pygments (Fedora EPEL, 4) updated by kevin
Message-ID: <20090929202719.603EE10F874@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-pygments
kevin has set commit to Approved for 107427 on python-pygments (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-pygments (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-pygments (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/python-pygments



From rdieter at fedoraproject.org  Tue Sep 29 20:33:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:33:48 +0000 (UTC)
Subject: rpms/digikam/F-12 digikam.spec,1.97,1.98
Message-ID: <20090929203348.B95DF11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6070/F-12

Modified Files:
	digikam.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
- fix marble dep(s)



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/digikam.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- digikam.spec	2 Sep 2009 13:59:06 -0000	1.97
+++ digikam.spec	29 Sep 2009 20:33:47 -0000	1.98
@@ -3,7 +3,7 @@
 
 Name:	 digikam
 Version: 1.0.0
-Release: 0.5.%{pre}%{?dist}
+Release: 0.6.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -63,7 +63,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble%{?_isa} >= %{marble_version}
+Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
 %description libs
 %{summary}.
 
@@ -155,6 +155,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
+- fix marble dep(s)
+
 * Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
 - digikam-1.0.0-beta4
 - BR: liblqr-1-devel



From rdieter at fedoraproject.org  Tue Sep 29 20:33:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:33:49 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.97,1.98
Message-ID: <20090929203349.41B8611C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6070/devel

Modified Files:
	digikam.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
- fix marble dep(s)



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- digikam.spec	2 Sep 2009 13:59:06 -0000	1.97
+++ digikam.spec	29 Sep 2009 20:33:48 -0000	1.98
@@ -3,7 +3,7 @@
 
 Name:	 digikam
 Version: 1.0.0
-Release: 0.5.%{pre}%{?dist}
+Release: 0.6.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -63,7 +63,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble%{?_isa} >= %{marble_version}
+Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
 %description libs
 %{summary}.
 
@@ -155,6 +155,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
+- fix marble dep(s)
+
 * Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
 - digikam-1.0.0-beta4
 - BR: liblqr-1-devel



From pbrobinson at fedoraproject.org  Tue Sep 29 20:34:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 20:34:09 +0000 (UTC)
Subject: rpms/scitools/devel scitools.spec,1.4,1.5
Message-ID: <20090929203409.2677011C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/scitools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6609

Modified Files:
	scitools.spec 
Log Message:
- Update -extras to depend on numpy like the main package


Index: scitools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scitools/devel/scitools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- scitools.spec	27 Jul 2009 03:58:47 -0000	1.4
+++ scitools.spec	29 Sep 2009 20:34:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       scitools
 Version:    0.6
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A Python library for scientific computing
 
 Group:      Applications/Engineering
@@ -31,7 +31,7 @@ Group:      Applications/Engineering
 
 # Pygrace is not currently in RHEL 4
 Requires:   %{name} = %{version}-%{release}
-Requires:   python-numeric 
+Requires:   numpy
 Requires:   python-numarray 
 Requires:   vtk-python,
 Requires:   python-matplotlib 
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-3
+- Update -extras to depend on numpy like the main package
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Tue Sep 29 20:35:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 20:35:16 +0000 (UTC)
Subject: rpms/scitools/F-12 scitools.spec,1.4,1.5
Message-ID: <20090929203516.1A1F611C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/scitools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7338

Modified Files:
	scitools.spec 
Log Message:
- Update -extras to depend on numpy like the main package


Index: scitools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scitools/F-12/scitools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- scitools.spec	27 Jul 2009 03:58:47 -0000	1.4
+++ scitools.spec	29 Sep 2009 20:35:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       scitools
 Version:    0.6
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A Python library for scientific computing
 
 Group:      Applications/Engineering
@@ -31,7 +31,7 @@ Group:      Applications/Engineering
 
 # Pygrace is not currently in RHEL 4
 Requires:   %{name} = %{version}-%{release}
-Requires:   python-numeric 
+Requires:   numpy
 Requires:   python-numarray 
 Requires:   vtk-python,
 Requires:   python-matplotlib 
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-3
+- Update -extras to depend on numpy like the main package
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Sep 29 20:36:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:36:36 +0000 (UTC)
Subject: rpms/digikam/F-12 digikam.spec,1.98,1.99
Message-ID: <20090929203636.09B8F11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7807/F-12

Modified Files:
	digikam.spec 
Log Message:
cleaner/simpler marble solution



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/digikam.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- digikam.spec	29 Sep 2009 20:33:47 -0000	1.98
+++ digikam.spec	29 Sep 2009 20:36:35 -0000	1.99
@@ -63,7 +63,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
+Requires: kdeedu-marble >= %{marble_version}
 %description libs
 %{summary}.
 



From rdieter at fedoraproject.org  Tue Sep 29 20:36:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:36:36 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.98,1.99
Message-ID: <20090929203636.764CF11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7807/devel

Modified Files:
	digikam.spec 
Log Message:
cleaner/simpler marble solution



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- digikam.spec	29 Sep 2009 20:33:48 -0000	1.98
+++ digikam.spec	29 Sep 2009 20:36:36 -0000	1.99
@@ -63,7 +63,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
+Requires: kdeedu-marble >= %{marble_version}
 %description libs
 %{summary}.
 



From rdieter at fedoraproject.org  Tue Sep 29 20:37:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:37:37 +0000 (UTC)
Subject: rpms/digikam/F-11 digikam.spec,1.89,1.90
Message-ID: <20090929203737.94B0D11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8734

Modified Files:
	digikam.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-3
- fix marble deps



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/digikam.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- digikam.spec	5 Aug 2009 17:31:17 -0000	1.89
+++ digikam.spec	29 Sep 2009 20:37:37 -0000	1.90
@@ -1,7 +1,7 @@
 
 Name:	 digikam
 Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -59,7 +59,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble%{?_isa} >= %{marble_version} 
+Requires: kdeedu-marble >= %{marble_version} 
 %description libs
 %{summary}.
 
@@ -157,6 +157,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-3
+- fix marble deps
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
 - rebuild against kde-4.3
 - optimize scriptlets



From rdieter at fedoraproject.org  Tue Sep 29 20:38:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:38:07 +0000 (UTC)
Subject: rpms/digikam/F-10 digikam.spec,1.80,1.81
Message-ID: <20090929203807.D968D11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8964

Modified Files:
	digikam.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-3
- fix marble deps



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- digikam.spec	5 Aug 2009 17:33:08 -0000	1.80
+++ digikam.spec	29 Sep 2009 20:38:07 -0000	1.81
@@ -1,7 +1,7 @@
 
 Name:	 digikam
 Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -59,7 +59,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble%{?_isa} >= %{marble_version} 
+Requires: kdeedu-marble >= %{marble_version} 
 %description libs
 %{summary}.
 
@@ -157,6 +157,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-3
+- fix marble deps
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
 - rebuild against kde-4.3
 - optimize scriptlets



From topdog at fedoraproject.org  Tue Sep 29 20:45:11 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 29 Sep 2009 20:45:11 +0000 (UTC)
Subject: rpms/dokuwiki/devel dokuwiki-use-fedora-email-valid.patch, NONE,
	1.1 dokuwiki-use-fedora-geshi.patch, NONE, 1.1 dokuwiki.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929204511.3B9CE11C048B@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11519/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec import.log 
Log Message:
* Tue Sep 29 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- initial import



dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dokuwiki-use-fedora-email-valid.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
--- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
@@ -8,7 +8,7 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/utf8.php');
-require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+require_once('/usr/share/php/php-email-address-validation/EmailAddressValidator.php');
 
 // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
 // think different

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dokuwiki-use-fedora-geshi.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
--- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
@@ -640,16 +640,16 @@
   $cache = getCacheName($language.$code,".code");
   $ctime = @filemtime($cache);
   if($ctime && !$_REQUEST['purge'] &&
-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
     $highlighted_code = io_readFile($cache, false);
 
   } else {
 
-    require_once(DOKU_INC . 'inc/geshi.php');
+    require_once('/usr/share/php/geshi.php');
 
-    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
     $geshi->set_encoding('utf-8');
     $geshi->enable_classes();
     $geshi->set_header_type(GESHI_HEADER_PRE);


--- NEW FILE dokuwiki.spec ---
Name:		dokuwiki
Version:	0
Release:	0.2.20090214.b%{?dist}
Summary:	Standards compliant simple to use wiki
Group:		Applications/Internet
License:	GPLv2
URL:		http://www.dokuwiki.org/dokuwiki
Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
#Fedora specific patches to use fedora packaged libraries
Patch1:		dokuwiki-use-fedora-geshi.patch
#Patch2:		dokuwiki-use-fedora-simplepie.patch
Patch3:		dokuwiki-use-fedora-email-valid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-gd
Requires:	php-geshi
#Requires:	php-simplepie
Requires:	php-email-address-validation
Requires:	httpd

%description
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating 
documentation of any kind. It has a simple but powerful syntax which makes sure 
the datafiles remain readable outside the Wiki and eases the creation of 
structured texts. 

All data is stored in plain text files no database is required. 

%prep
%setup -q -n %{name}-2009-02-14
%patch1 -p1 
#%patch2 -p1
%patch3 -p1

mv -f conf/mysql.conf.php.example .

sed -i "s:'./data':'%{_localstatedir}/lib/%{name}/data':" conf/%{name}.php
sed -i "s:ALL        8:ALL        1:" conf/acl.auth.php.dist

cat <<EOF >%{name}.httpd
# %{name}
# %{summary}
# %{version}
#

Alias /%{name} %{_datadir}/%{name}

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	Order Allow,Deny
	Allow from 127.0.0.1
</Directory>

<Directory %{_datadir}/%{name}/inc>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_datadir}/%{name}/inc/lang>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

EOF

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
install -d -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/{index,tmp,media,attic,pages,cache,meta,locks}
rm -f install.php
rm -rf inc/geshi*
rm -f inc/EmailAddressValidator.php
rm -f inc/.htaccess
rm -f inc/lang/.htaccess
#rm -f inc/SimplePie.php
rm -f lib/plugins/revert/lang/sk/intro.txt
cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cp -rp bin/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
cp -rp lib  $RPM_BUILD_ROOT%{_datadir}/%{name}/
cp -rp inc  $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m0644 %{name}.httpd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
for d in *.dist; do
	d0=`basename $d .dist`
	if [ ! -f "$d0" ]; then
		mv -f $d $d0
	fi
done
popd

pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
	ln -sf ../../../etc/%name conf
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README VERSION mysql.conf.php.example
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/*
%dir %attr(0755,apache,apache) %{_sysconfdir}/%{name}
%attr(0755,apache,apache) %{_datadir}/%{name}/bin/*.php
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/*.php
%dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/lib/exe
%{_datadir}/%{name}/lib/images
%{_datadir}/%{name}/lib/index.html
%{_datadir}/%{name}/lib/scripts
%{_datadir}/%{name}/lib/styles
%{_datadir}/%{name}/lib/tpl
%attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
%{_datadir}/%{name}/lib/plugins/*
%{_datadir}/%{name}/inc
%dir %{_localstatedir}/lib/%{name}
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/attic
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/cache
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/meta
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/locks
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/tmp
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/index
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki
%{_localstatedir}/lib/%{name}/data/pages/*/*

%changelog
* Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- Fixes requested by reviewer

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090214.b
- Initial package


--- NEW FILE import.log ---
dokuwiki-0-0_2_20090214_b_fc11:HEAD:dokuwiki-0-0.2.20090214.b.fc11.src.rpm:1254256989


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:53 -0000	1.1
+++ .cvsignore	29 Sep 2009 20:45:10 -0000	1.2
@@ -0,0 +1 @@
+dokuwiki-2009-02-14b.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:53 -0000	1.1
+++ sources	29 Sep 2009 20:45:11 -0000	1.2
@@ -0,0 +1 @@
+c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz



From rdieter at fedoraproject.org  Tue Sep 29 20:47:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:47:54 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.208,1.209
Message-ID: <20090929204754.BDFF811C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12893/devel

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
- kdeedu-marble multilib fixes (rebuild for digikam botch)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- kdeedu.spec	24 Sep 2009 14:16:16 -0000	1.208
+++ kdeedu.spec	29 Sep 2009 20:47:54 -0000	1.209
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -130,7 +130,7 @@ Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 # help multilib upgrades 
-Obsoletes: kdeedu-marble < 4.3.0-5
+Obsoletes: kdeedu-marble < 4.3.1-4
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- kdeedu-marble multilib fixes (rebuild for digikam botch)
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - Requires: python-mwclient (#520954)
 



From rdieter at fedoraproject.org  Tue Sep 29 20:47:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:47:55 +0000 (UTC)
Subject: rpms/kdeedu/F-12 kdeedu.spec,1.208,1.209
Message-ID: <20090929204755.12C7C11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12893/F-12

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
- kdeedu-marble multilib fixes (rebuild for digikam botch)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-12/kdeedu.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- kdeedu.spec	24 Sep 2009 14:16:16 -0000	1.208
+++ kdeedu.spec	29 Sep 2009 20:47:54 -0000	1.209
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -130,7 +130,7 @@ Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 # help multilib upgrades 
-Obsoletes: kdeedu-marble < 4.3.0-5
+Obsoletes: kdeedu-marble < 4.3.1-4
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- kdeedu-marble multilib fixes (rebuild for digikam botch)
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - Requires: python-mwclient (#520954)
 



From notting at fedoraproject.org  Tue Sep 29 20:48:48 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 29 Sep 2009 20:48:48 +0000 (UTC)
Subject: rpms/chkconfig/F-12 .cvsignore, 1.45, 1.46 chkconfig.spec, 1.57,
	1.58 sources, 1.46, 1.47
Message-ID: <20090929204848.59BB511C00C1@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/chkconfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13427

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
1.3.44-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/F-12/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	14 Sep 2009 16:21:46 -0000	1.45
+++ .cvsignore	29 Sep 2009 20:48:48 -0000	1.46
@@ -1 +1 @@
-chkconfig-1.3.43.tar.bz2
+chkconfig-1.3.44.tar.bz2


Index: chkconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/F-12/chkconfig.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- chkconfig.spec	14 Sep 2009 16:21:46 -0000	1.57
+++ chkconfig.spec	29 Sep 2009 20:48:48 -0000	1.58
@@ -1,6 +1,6 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.43
+Version: 1.3.44
 Release: 1
 License: GPLv2
 Group: System Environment/Base
@@ -74,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Sep 29 2009 Bill Nottingham <notting at redhat.com> 1.3.44-1
+- alternatives: update symlinks if they exist on installation (#104940)
+- alternatives: clarify error messages with more context (#441443)
+- alternatives: fix removal of manual links (#525021, <dtardon at redhat.com>)
+- translation updates: ml, mr, pl, ta, uk
+
 * Mon Sep 14 2009 Bill Nottingham <notting at redhat.com> 1.3.43-1
 - ntsysv man page tweak (#516599)
 - another minor LSB tweak (#474223)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	14 Sep 2009 16:21:46 -0000	1.46
+++ sources	29 Sep 2009 20:48:48 -0000	1.47
@@ -1 +1 @@
-208ed7aa3e6165f10f3e9204da585106  chkconfig-1.3.43.tar.bz2
+b3dc6a063a90a9670f7d2159a3da22fc  chkconfig-1.3.44.tar.bz2



From topdog at fedoraproject.org  Tue Sep 29 20:50:35 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 29 Sep 2009 20:50:35 +0000 (UTC)
Subject: rpms/dokuwiki/F-12 dokuwiki-use-fedora-email-valid.patch, NONE,
	1.1 dokuwiki-use-fedora-geshi.patch, NONE, 1.1 dokuwiki.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929205035.59B8611C048B@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13971/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec import.log 
Log Message:

* Tue Sep 29 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- initial import



dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dokuwiki-use-fedora-email-valid.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
--- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
@@ -8,7 +8,7 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/utf8.php');
-require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+require_once('/usr/share/php/php-email-address-validation/EmailAddressValidator.php');
 
 // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
 // think different

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dokuwiki-use-fedora-geshi.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
--- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
@@ -640,16 +640,16 @@
   $cache = getCacheName($language.$code,".code");
   $ctime = @filemtime($cache);
   if($ctime && !$_REQUEST['purge'] &&
-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
     $highlighted_code = io_readFile($cache, false);
 
   } else {
 
-    require_once(DOKU_INC . 'inc/geshi.php');
+    require_once('/usr/share/php/geshi.php');
 
-    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
     $geshi->set_encoding('utf-8');
     $geshi->enable_classes();
     $geshi->set_header_type(GESHI_HEADER_PRE);


--- NEW FILE dokuwiki.spec ---
Name:		dokuwiki
Version:	0
Release:	0.2.20090214.b%{?dist}
Summary:	Standards compliant simple to use wiki
Group:		Applications/Internet
License:	GPLv2
URL:		http://www.dokuwiki.org/dokuwiki
Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
#Fedora specific patches to use fedora packaged libraries
Patch1:		dokuwiki-use-fedora-geshi.patch
#Patch2:		dokuwiki-use-fedora-simplepie.patch
Patch3:		dokuwiki-use-fedora-email-valid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-gd
Requires:	php-geshi
#Requires:	php-simplepie
Requires:	php-email-address-validation
Requires:	httpd

%description
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating 
documentation of any kind. It has a simple but powerful syntax which makes sure 
the datafiles remain readable outside the Wiki and eases the creation of 
structured texts. 

All data is stored in plain text files no database is required. 

%prep
%setup -q -n %{name}-2009-02-14
%patch1 -p1 
#%patch2 -p1
%patch3 -p1

mv -f conf/mysql.conf.php.example .

sed -i "s:'./data':'%{_localstatedir}/lib/%{name}/data':" conf/%{name}.php
sed -i "s:ALL        8:ALL        1:" conf/acl.auth.php.dist

cat <<EOF >%{name}.httpd
# %{name}
# %{summary}
# %{version}
#

Alias /%{name} %{_datadir}/%{name}

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	Order Allow,Deny
	Allow from 127.0.0.1
</Directory>

<Directory %{_datadir}/%{name}/inc>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_datadir}/%{name}/inc/lang>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

EOF

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
install -d -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/{index,tmp,media,attic,pages,cache,meta,locks}
rm -f install.php
rm -rf inc/geshi*
rm -f inc/EmailAddressValidator.php
rm -f inc/.htaccess
rm -f inc/lang/.htaccess
#rm -f inc/SimplePie.php
rm -f lib/plugins/revert/lang/sk/intro.txt
cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cp -rp bin/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
cp -rp lib  $RPM_BUILD_ROOT%{_datadir}/%{name}/
cp -rp inc  $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m0644 %{name}.httpd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
for d in *.dist; do
	d0=`basename $d .dist`
	if [ ! -f "$d0" ]; then
		mv -f $d $d0
	fi
done
popd

pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
	ln -sf ../../../etc/%name conf
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README VERSION mysql.conf.php.example
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/*
%dir %attr(0755,apache,apache) %{_sysconfdir}/%{name}
%attr(0755,apache,apache) %{_datadir}/%{name}/bin/*.php
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/*.php
%dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/lib/exe
%{_datadir}/%{name}/lib/images
%{_datadir}/%{name}/lib/index.html
%{_datadir}/%{name}/lib/scripts
%{_datadir}/%{name}/lib/styles
%{_datadir}/%{name}/lib/tpl
%attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
%{_datadir}/%{name}/lib/plugins/*
%{_datadir}/%{name}/inc
%dir %{_localstatedir}/lib/%{name}
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/attic
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/cache
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/meta
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/locks
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/tmp
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/index
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki
%{_localstatedir}/lib/%{name}/data/pages/*/*

%changelog
* Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- Fixes requested by reviewer

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090214.b
- Initial package


--- NEW FILE import.log ---
dokuwiki-0-0_2_20090214_b_fc11:F-12:dokuwiki-0-0.2.20090214.b.fc11.src.rpm:1254257426


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:53 -0000	1.1
+++ .cvsignore	29 Sep 2009 20:50:34 -0000	1.2
@@ -0,0 +1 @@
+dokuwiki-2009-02-14b.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:53 -0000	1.1
+++ sources	29 Sep 2009 20:50:35 -0000	1.2
@@ -0,0 +1 @@
+c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz



From dwalsh at fedoraproject.org  Tue Sep 29 20:51:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 29 Sep 2009 20:51:17 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.96,1.97
Message-ID: <20090929205117.3669411C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14266

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
- Update rhcs policy


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   33 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  314 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 327 files changed, 15155 insertions(+), 2593 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- policy-F12.patch	29 Sep 2009 19:47:31 -0000	1.96
+++ policy-F12.patch	29 Sep 2009 20:51:16 -0000	1.97
@@ -388,7 +388,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.32/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-29 10:11:37.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-29 16:46:01.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -2593,8 +2593,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.32/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-29 15:46:41.000000000 -0400
-@@ -0,0 +1,322 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.if	2009-09-29 16:37:24.000000000 -0400
+@@ -0,0 +1,323 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2680,6 +2680,7 @@ diff -b -B --ignore-all-space --exclude-
 +		type nsplugin_config_t;
 +		class x_drawable all_x_drawable_perms;
 +		class x_resource all_x_resource_perms;
++		class dbus send_msg;
 +	')
 +
 +	role $1 types nsplugin_t;
@@ -8398,7 +8399,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-09-24 11:54:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-09-29 16:46:09.000000000 -0400
 @@ -75,6 +75,7 @@
  
  corecmd_exec_bin(abrt_t)
@@ -8407,7 +8408,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_tcp_connect_http_port(abrt_t)
  
-@@ -105,13 +106,20 @@
+@@ -105,13 +106,22 @@
  	dbus_system_bus_client(abrt_t)
  ')
  
@@ -8420,6 +8421,8 @@ diff -b -B --ignore-all-space --exclude-
 -	rpm_manage_db(abrt_t)
 -	rpm_domtrans(abrt_t)
 +	rpm_manage_cache(abrt_t)
++	rpm_read_db(abrt_t)
++	rpm_dontaudit_manage_db(abrt_t)
 +	rpm_domtrans_debuginfo(abrt_t)
 +	rpm_signull(abrt_t)
  ')
@@ -12124,7 +12127,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.32/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-09-29 16:39:40.000000000 -0400
 @@ -103,6 +103,7 @@
  dev_read_urand(dovecot_t)
  
@@ -12133,6 +12136,15 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(dovecot_t)
  fs_list_inotifyfs(dovecot_t)
  
+@@ -159,7 +160,7 @@
+ #
+ 
+ allow dovecot_auth_t self:capability { chown dac_override setgid setuid };
+-allow dovecot_auth_t self:process signal_perms;
++allow dovecot_auth_t self:process { signal_perms getcap setcap };
+ allow dovecot_auth_t self:fifo_file rw_fifo_file_perms;
+ allow dovecot_auth_t self:unix_dgram_socket create_socket_perms;
+ allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
 @@ -220,9 +221,15 @@
  ')
  



From markmc at fedoraproject.org  Tue Sep 29 20:53:23 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 29 Sep 2009 20:53:23 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-fix-virtio-net-gso-support.patch, NONE,
	1.1 qemu.spec, 1.104, 1.105
Message-ID: <20090929205323.749CC11C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15069

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-virtio-net-gso-support.patch 
Log Message:
* Tue Sep 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-6
- Fix broken virtio-net with 2.6.30 guests (#522994)


qemu-fix-virtio-net-gso-support.patch:
 virtio-net.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE qemu-fix-virtio-net-gso-support.patch ---
>From 0a662a2983f1afeb5dce338d7dbe906d5c4c91a7 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 5 May 2009 09:56:25 +0100
Subject: [PATCH] virtio-net: Re-instate GSO code removed upstream

This commit:

   commit 559a8f45f34cc50d1a60b4f67a06614d506b2e01
   Subject: Remove stray GSO code from virtio_net (Mark McLoughlin)

Removed some GSO code from upstream qemu.git, but it needs to
be re-instated in qemu-kvm.git.

(cherry picked from commit 6e57bb9a636cefdaba7decbd5ac10f1508ff64c0)

Reported-by: Sridhar Samudrala <sri at us.ibm.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
Fedora-patch: qemu-fix-virtio-net-gso-support.patch
---
 hw/virtio-net.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index f65ecd7..aaab83b 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -424,6 +424,11 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size)
     if (n->promisc)
         return 1;
 
+#ifdef TAP_VNET_HDR
+    if (tap_has_vnet_hdr(n->vc->vlan->first_client))
+        ptr += sizeof(struct virtio_net_hdr);
+#endif
+
     if (!memcmp(&ptr[12], vlan, sizeof(vlan))) {
         int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff;
         if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f))))
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- qemu.spec	11 Sep 2009 11:16:05 -0000	1.104
+++ qemu.spec	29 Sep 2009 20:53:23 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -36,6 +36,7 @@ Patch15: qemu-avoid-harmless-msr-warning
 Patch16: qemu-ppc-on-ppc.patch
 Patch17: qemu-use-statfs-to-determine-huge-page-size.patch
 Patch18: qemu-allow-pulseaudio-to-be-the-default.patch
+Patch19: qemu-fix-virtio-net-gso-support.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -237,6 +238,7 @@ such as kvmtrace and kvm_stat.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -479,6 +481,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Sep 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-6
+- Fix broken virtio-net with 2.6.30 guests (#522994)
+
 * Fri Sep 11 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-5
 - Fix vnc segfault on disconnect (#501131)
 - Fix vnc screen corruption with e.g. xterm (#503156)



From topdog at fedoraproject.org  Tue Sep 29 20:54:10 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 29 Sep 2009 20:54:10 +0000 (UTC)
Subject: rpms/dokuwiki/F-11 dokuwiki-use-fedora-email-valid.patch, NONE,
	1.1 dokuwiki-use-fedora-geshi.patch, NONE, 1.1 dokuwiki.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929205410.818D311C00C1@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15245/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec import.log 
Log Message:
* Tue Sep 29 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- initial import



dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dokuwiki-use-fedora-email-valid.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
--- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
@@ -8,7 +8,7 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/utf8.php');
-require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+require_once('/usr/share/php/php-email-address-validation/EmailAddressValidator.php');
 
 // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
 // think different

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dokuwiki-use-fedora-geshi.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
--- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
@@ -640,16 +640,16 @@
   $cache = getCacheName($language.$code,".code");
   $ctime = @filemtime($cache);
   if($ctime && !$_REQUEST['purge'] &&
-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
     $highlighted_code = io_readFile($cache, false);
 
   } else {
 
-    require_once(DOKU_INC . 'inc/geshi.php');
+    require_once('/usr/share/php/geshi.php');
 
-    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
     $geshi->set_encoding('utf-8');
     $geshi->enable_classes();
     $geshi->set_header_type(GESHI_HEADER_PRE);


--- NEW FILE dokuwiki.spec ---
Name:		dokuwiki
Version:	0
Release:	0.2.20090214.b%{?dist}
Summary:	Standards compliant simple to use wiki
Group:		Applications/Internet
License:	GPLv2
URL:		http://www.dokuwiki.org/dokuwiki
Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
#Fedora specific patches to use fedora packaged libraries
Patch1:		dokuwiki-use-fedora-geshi.patch
#Patch2:		dokuwiki-use-fedora-simplepie.patch
Patch3:		dokuwiki-use-fedora-email-valid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-gd
Requires:	php-geshi
#Requires:	php-simplepie
Requires:	php-email-address-validation
Requires:	httpd

%description
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating 
documentation of any kind. It has a simple but powerful syntax which makes sure 
the datafiles remain readable outside the Wiki and eases the creation of 
structured texts. 

All data is stored in plain text files no database is required. 

%prep
%setup -q -n %{name}-2009-02-14
%patch1 -p1 
#%patch2 -p1
%patch3 -p1

mv -f conf/mysql.conf.php.example .

sed -i "s:'./data':'%{_localstatedir}/lib/%{name}/data':" conf/%{name}.php
sed -i "s:ALL        8:ALL        1:" conf/acl.auth.php.dist

cat <<EOF >%{name}.httpd
# %{name}
# %{summary}
# %{version}
#

Alias /%{name} %{_datadir}/%{name}

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	Order Allow,Deny
	Allow from 127.0.0.1
</Directory>

<Directory %{_datadir}/%{name}/inc>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_datadir}/%{name}/inc/lang>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

EOF

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
install -d -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/{index,tmp,media,attic,pages,cache,meta,locks}
rm -f install.php
rm -rf inc/geshi*
rm -f inc/EmailAddressValidator.php
rm -f inc/.htaccess
rm -f inc/lang/.htaccess
#rm -f inc/SimplePie.php
rm -f lib/plugins/revert/lang/sk/intro.txt
cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cp -rp bin/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
cp -rp lib  $RPM_BUILD_ROOT%{_datadir}/%{name}/
cp -rp inc  $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m0644 %{name}.httpd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
for d in *.dist; do
	d0=`basename $d .dist`
	if [ ! -f "$d0" ]; then
		mv -f $d $d0
	fi
done
popd

pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
	ln -sf ../../../etc/%name conf
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README VERSION mysql.conf.php.example
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/*
%dir %attr(0755,apache,apache) %{_sysconfdir}/%{name}
%attr(0755,apache,apache) %{_datadir}/%{name}/bin/*.php
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/*.php
%dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/lib/exe
%{_datadir}/%{name}/lib/images
%{_datadir}/%{name}/lib/index.html
%{_datadir}/%{name}/lib/scripts
%{_datadir}/%{name}/lib/styles
%{_datadir}/%{name}/lib/tpl
%attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
%{_datadir}/%{name}/lib/plugins/*
%{_datadir}/%{name}/inc
%dir %{_localstatedir}/lib/%{name}
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/attic
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/cache
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/meta
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/locks
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/tmp
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/index
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki
%{_localstatedir}/lib/%{name}/data/pages/*/*

%changelog
* Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- Fixes requested by reviewer

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090214.b
- Initial package


--- NEW FILE import.log ---
dokuwiki-0-0_2_20090214_b_fc11:F-11:dokuwiki-0-0.2.20090214.b.fc11.src.rpm:1254257633


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:53 -0000	1.1
+++ .cvsignore	29 Sep 2009 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+dokuwiki-2009-02-14b.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:53 -0000	1.1
+++ sources	29 Sep 2009 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz



From rdieter at fedoraproject.org  Tue Sep 29 20:54:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:54:17 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.185,1.186
Message-ID: <20090929205417.22D8C11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15351

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
- kdeedu-marble multilib fixes (rebuild for digikam botch)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- kdeedu.spec	22 Sep 2009 16:26:04 -0000	1.185
+++ kdeedu.spec	29 Sep 2009 20:54:16 -0000	1.186
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -69,7 +69,7 @@ Requires: sj-stevehand-fonts
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
 # parley
-Requires: kross-python
+Requires: kross(python)
 Requires: python-mwclient
 
 %description
@@ -130,7 +130,7 @@ Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 # help multilib upgrades 
-Obsoletes: kdeedu-marble < 4.3.0-5
+Obsoletes: kdeedu-marble < 4.3.1-4
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- kdeedu-marble multilib fixes (rebuild for digikam botch)
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - Requires: python-mwclient (#520954)
 



From rdieter at fedoraproject.org  Tue Sep 29 20:54:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Sep 2009 20:54:45 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.157,1.158
Message-ID: <20090929205445.4AB0611C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15563

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
- kdeedu-marble multilib fixes (rebuild for digikam botch)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- kdeedu.spec	22 Sep 2009 16:26:03 -0000	1.157
+++ kdeedu.spec	29 Sep 2009 20:54:45 -0000	1.158
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -69,7 +69,7 @@ Requires: sj-stevehand-fonts
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
 # parley
-Requires: kross-python
+Requires: kross(python)
 Requires: python-mwclient
 
 %description
@@ -130,7 +130,7 @@ Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 # help multilib upgrades 
-Obsoletes: kdeedu-marble < 4.3.0-5
+Obsoletes: kdeedu-marble < 4.3.1-4
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- kdeedu-marble multilib fixes (rebuild for digikam botch)
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - Requires: python-mwclient (#520954)
 



From topdog at fedoraproject.org  Tue Sep 29 20:57:31 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 29 Sep 2009 20:57:31 +0000 (UTC)
Subject: rpms/dokuwiki/F-10 dokuwiki-use-fedora-email-valid.patch, NONE,
	1.1 dokuwiki-use-fedora-geshi.patch, NONE, 1.1 dokuwiki.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929205731.B1B2E11C00C1@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16418/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec import.log 
Log Message:
* Tue Sep 29 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- initial import



dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dokuwiki-use-fedora-email-valid.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
--- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
@@ -8,7 +8,7 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/utf8.php');
-require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+require_once('/usr/share/php/php-email-address-validation/EmailAddressValidator.php');
 
 // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
 // think different

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dokuwiki-use-fedora-geshi.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
--- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
@@ -640,16 +640,16 @@
   $cache = getCacheName($language.$code,".code");
   $ctime = @filemtime($cache);
   if($ctime && !$_REQUEST['purge'] &&
-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
     $highlighted_code = io_readFile($cache, false);
 
   } else {
 
-    require_once(DOKU_INC . 'inc/geshi.php');
+    require_once('/usr/share/php/geshi.php');
 
-    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
     $geshi->set_encoding('utf-8');
     $geshi->enable_classes();
     $geshi->set_header_type(GESHI_HEADER_PRE);


--- NEW FILE dokuwiki.spec ---
Name:		dokuwiki
Version:	0
Release:	0.2.20090214.b%{?dist}
Summary:	Standards compliant simple to use wiki
Group:		Applications/Internet
License:	GPLv2
URL:		http://www.dokuwiki.org/dokuwiki
Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
#Fedora specific patches to use fedora packaged libraries
Patch1:		dokuwiki-use-fedora-geshi.patch
#Patch2:		dokuwiki-use-fedora-simplepie.patch
Patch3:		dokuwiki-use-fedora-email-valid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-gd
Requires:	php-geshi
#Requires:	php-simplepie
Requires:	php-email-address-validation
Requires:	httpd

%description
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating 
documentation of any kind. It has a simple but powerful syntax which makes sure 
the datafiles remain readable outside the Wiki and eases the creation of 
structured texts. 

All data is stored in plain text files no database is required. 

%prep
%setup -q -n %{name}-2009-02-14
%patch1 -p1 
#%patch2 -p1
%patch3 -p1

mv -f conf/mysql.conf.php.example .

sed -i "s:'./data':'%{_localstatedir}/lib/%{name}/data':" conf/%{name}.php
sed -i "s:ALL        8:ALL        1:" conf/acl.auth.php.dist

cat <<EOF >%{name}.httpd
# %{name}
# %{summary}
# %{version}
#

Alias /%{name} %{_datadir}/%{name}

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	Order Allow,Deny
	Allow from 127.0.0.1
</Directory>

<Directory %{_datadir}/%{name}/inc>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_datadir}/%{name}/inc/lang>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

EOF

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
install -d -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/{index,tmp,media,attic,pages,cache,meta,locks}
rm -f install.php
rm -rf inc/geshi*
rm -f inc/EmailAddressValidator.php
rm -f inc/.htaccess
rm -f inc/lang/.htaccess
#rm -f inc/SimplePie.php
rm -f lib/plugins/revert/lang/sk/intro.txt
cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cp -rp bin/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
cp -rp lib  $RPM_BUILD_ROOT%{_datadir}/%{name}/
cp -rp inc  $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m0644 %{name}.httpd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
for d in *.dist; do
	d0=`basename $d .dist`
	if [ ! -f "$d0" ]; then
		mv -f $d $d0
	fi
done
popd

pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
	ln -sf ../../../etc/%name conf
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README VERSION mysql.conf.php.example
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/*
%dir %attr(0755,apache,apache) %{_sysconfdir}/%{name}
%attr(0755,apache,apache) %{_datadir}/%{name}/bin/*.php
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/*.php
%dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/lib/exe
%{_datadir}/%{name}/lib/images
%{_datadir}/%{name}/lib/index.html
%{_datadir}/%{name}/lib/scripts
%{_datadir}/%{name}/lib/styles
%{_datadir}/%{name}/lib/tpl
%attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
%{_datadir}/%{name}/lib/plugins/*
%{_datadir}/%{name}/inc
%dir %{_localstatedir}/lib/%{name}
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/attic
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/cache
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/meta
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/locks
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/tmp
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/index
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki
%{_localstatedir}/lib/%{name}/data/pages/*/*

%changelog
* Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- Fixes requested by reviewer

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090214.b
- Initial package


--- NEW FILE import.log ---
dokuwiki-0-0_2_20090214_b_fc11:F-10:dokuwiki-0-0.2.20090214.b.fc11.src.rpm:1254257846


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:53 -0000	1.1
+++ .cvsignore	29 Sep 2009 20:57:31 -0000	1.2
@@ -0,0 +1 @@
+dokuwiki-2009-02-14b.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:53 -0000	1.1
+++ sources	29 Sep 2009 20:57:31 -0000	1.2
@@ -0,0 +1 @@
+c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz



From topdog at fedoraproject.org  Tue Sep 29 21:01:38 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 29 Sep 2009 21:01:38 +0000 (UTC)
Subject: rpms/dokuwiki/EL-5 dokuwiki-use-fedora-email-valid.patch, NONE,
	1.1 dokuwiki-use-fedora-geshi.patch, NONE, 1.1 dokuwiki.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929210138.CAE3A11C00C1@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19151/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec import.log 
Log Message:
* Tue Sep 29 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- initial import



dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dokuwiki-use-fedora-email-valid.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
--- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
@@ -8,7 +8,7 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 require_once(DOKU_INC.'inc/utf8.php');
-require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+require_once('/usr/share/php/php-email-address-validation/EmailAddressValidator.php');
 
 // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
 // think different

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dokuwiki-use-fedora-geshi.patch ---
diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
--- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
@@ -640,16 +640,16 @@
   $cache = getCacheName($language.$code,".code");
   $ctime = @filemtime($cache);
   if($ctime && !$_REQUEST['purge'] &&
-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
     $highlighted_code = io_readFile($cache, false);
 
   } else {
 
-    require_once(DOKU_INC . 'inc/geshi.php');
+    require_once('/usr/share/php/geshi.php');
 
-    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
     $geshi->set_encoding('utf-8');
     $geshi->enable_classes();
     $geshi->set_header_type(GESHI_HEADER_PRE);


--- NEW FILE dokuwiki.spec ---
Name:		dokuwiki
Version:	0
Release:	0.2.20090214.b%{?dist}
Summary:	Standards compliant simple to use wiki
Group:		Applications/Internet
License:	GPLv2
URL:		http://www.dokuwiki.org/dokuwiki
Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
#Fedora specific patches to use fedora packaged libraries
Patch1:		dokuwiki-use-fedora-geshi.patch
#Patch2:		dokuwiki-use-fedora-simplepie.patch
Patch3:		dokuwiki-use-fedora-email-valid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php-gd
Requires:	php-geshi
#Requires:	php-simplepie
Requires:	php-email-address-validation
Requires:	httpd

%description
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating 
documentation of any kind. It has a simple but powerful syntax which makes sure 
the datafiles remain readable outside the Wiki and eases the creation of 
structured texts. 

All data is stored in plain text files no database is required. 

%prep
%setup -q -n %{name}-2009-02-14
%patch1 -p1 
#%patch2 -p1
%patch3 -p1

mv -f conf/mysql.conf.php.example .

sed -i "s:'./data':'%{_localstatedir}/lib/%{name}/data':" conf/%{name}.php
sed -i "s:ALL        8:ALL        1:" conf/acl.auth.php.dist

cat <<EOF >%{name}.httpd
# %{name}
# %{summary}
# %{version}
#

Alias /%{name} %{_datadir}/%{name}

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	Order Allow,Deny
	Allow from 127.0.0.1
</Directory>

<Directory %{_datadir}/%{name}/inc>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_datadir}/%{name}/inc/lang>
	Order Deny,Allow
	Deny from all
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

EOF

%build
# nothing to do here

%install
rm -rf $RPM_BUILD_ROOT
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d -p $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
install -d -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/{index,tmp,media,attic,pages,cache,meta,locks}
rm -f install.php
rm -rf inc/geshi*
rm -f inc/EmailAddressValidator.php
rm -f inc/.htaccess
rm -f inc/lang/.htaccess
#rm -f inc/SimplePie.php
rm -f lib/plugins/revert/lang/sk/intro.txt
cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cp -rp bin/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
cp -rp lib  $RPM_BUILD_ROOT%{_datadir}/%{name}/
cp -rp inc  $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m0644 %{name}.httpd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
for d in *.dist; do
	d0=`basename $d .dist`
	if [ ! -f "$d0" ]; then
		mv -f $d $d0
	fi
done
popd

pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
	ln -sf ../../../etc/%name conf
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README VERSION mysql.conf.php.example
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/*
%dir %attr(0755,apache,apache) %{_sysconfdir}/%{name}
%attr(0755,apache,apache) %{_datadir}/%{name}/bin/*.php
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/*.php
%dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/lib/exe
%{_datadir}/%{name}/lib/images
%{_datadir}/%{name}/lib/index.html
%{_datadir}/%{name}/lib/scripts
%{_datadir}/%{name}/lib/styles
%{_datadir}/%{name}/lib/tpl
%attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
%{_datadir}/%{name}/lib/plugins/*
%{_datadir}/%{name}/inc
%dir %{_localstatedir}/lib/%{name}
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/attic
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/cache
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/meta
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/locks
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/tmp
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/index
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground
%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki
%{_localstatedir}/lib/%{name}/data/pages/*/*

%changelog
* Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
- Fixes requested by reviewer

* Thu Aug 06 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20090214.b
- Initial package


--- NEW FILE import.log ---
dokuwiki-0-0_2_20090214_b_fc11:EL-5:dokuwiki-0-0.2.20090214.b.fc11.src.rpm:1254258056


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:53 -0000	1.1
+++ .cvsignore	29 Sep 2009 21:01:38 -0000	1.2
@@ -0,0 +1 @@
+dokuwiki-2009-02-14b.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:53 -0000	1.1
+++ sources	29 Sep 2009 21:01:38 -0000	1.2
@@ -0,0 +1 @@
+c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz



From sbose at fedoraproject.org  Tue Sep 29 21:01:51 2009
From: sbose at fedoraproject.org (sbose)
Date: Tue, 29 Sep 2009 21:01:51 +0000 (UTC)
Subject: rpms/ctdb/devel .cvsignore, 1.10, 1.11 ctdb.spec, 1.13, 1.14 sources,
	1.10, 1.11
Message-ID: <20090929210151.CFFC611C00C1@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19703

Modified Files:
	.cvsignore ctdb.spec sources 
Log Message:
Update to ctdb version 1.0.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Sep 2009 16:02:02 -0000	1.10
+++ .cvsignore	29 Sep 2009 21:01:51 -0000	1.11
@@ -1 +1 @@
-ctdb-1.0.90.tar.bz2
+ctdb-1.0.91.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ctdb.spec	23 Sep 2009 16:02:02 -0000	1.13
+++ ctdb.spec	29 Sep 2009 21:01:51 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.90
+Version: 1.0.91
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -132,6 +132,21 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Wed Sep 29 2009 Sumit Bose <sbose at redhat.com> - 1.0.91-1
+ - Update to ctdb version 1.0.91
+
+* Tue Sep 29 2009 : Version 1.0.91
+ - New vacuum and repack design from Wolgang Mueller.
+ - Add a new eventscript 01.reclock that will first mark a node unhealthy and
+   later ban the node if the reclock file can not be accessed.
+ - Add machinereadable output to the ctdb getreclock command
+ - merge transaction updates from Michael Adam
+ - In the new banning code, reset the culprit count to 0 for all nodes that
+   could successfully compelte a full recovery.
+ - dont mark the recovery master as a ban culprit because a node in the cluster
+   needs a recovery. this happens naturally when using ctdb recover command so
+   dont make this cause a node to be banned.
+
 * Wed Sep 23 2009 Sumit Bose <sbose at redhat.com> - 1.0.90-1
  - Update to ctdb version 1.0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Sep 2009 16:02:02 -0000	1.10
+++ sources	29 Sep 2009 21:01:51 -0000	1.11
@@ -1 +1 @@
-3c803ac713fefebd28a837ced557ba20  ctdb-1.0.90.tar.bz2
+9680d0c250daeb87327a9cd87ad8421b  ctdb-1.0.91.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep 29 21:03:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Sep 2009 21:03:27 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel .cvsignore, 1.2,
	1.3 network-manager-netbook.spec, 1.3, 1.4 sources, 1.2,
	1.3 nmn-fixNMdetect.patch, 1.1, NONE
Message-ID: <20090929210327.C85B111C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20812

Modified Files:
	.cvsignore network-manager-netbook.spec sources 
Removed Files:
	nmn-fixNMdetect.patch 
Log Message:
- Update to 1.4 upstream release. Cleanup spec from upstreamed fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Aug 2009 22:37:46 -0000	1.2
+++ .cvsignore	29 Sep 2009 21:03:27 -0000	1.3
@@ -1 +1 @@
-network-manager-netbook-1.2.tar.bz2
+network-manager-netbook-1.4.tar.bz2


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- network-manager-netbook.spec	31 Aug 2009 14:14:01 -0000	1.3
+++ network-manager-netbook.spec	29 Sep 2009 21:03:27 -0000	1.4
@@ -1,22 +1,19 @@
 # Tarfile created using git
 # git clone git://git.gnome.org/network-manager-netbook
 # git archive --format=tar --prefix=network-manager-netbook-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
-%define git_version 926dfeb
+%define git_version 4f459ae
 %define tarfile %{name}-%{version}.tar.bz2
 
 Name:           network-manager-netbook
-Version:        1.2
-Release:        6%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
-#License has been confirmed by maintainer. Will fix upstream.
 License:        GPLv2
 URL:            http://projects.gnome.org/NetworkManager/
 Source0:        %{tarfile}
-Source1:        COPYING
 Patch0:         network-manager-netbook-full-desktop.patch
-Patch1:         nmn-fixNMdetect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -44,11 +41,6 @@ NetworkManager to connect to wired, wire
 %prep
 %setup -q
 %patch0 -p1 -b .fixdesktop
-%patch1 -p1 -b .fixNMdetect
-
-#Copy license files until upstream fixes them in git
-rm -f $RPM_BUILD_DIR/%{name}-%{version}/COPYING
-cp %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -90,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.4-1
+- Update to 1.4 upstream release. Cleanup spec from upstreamed fixes
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-6
 - Add patch for detection of new NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Aug 2009 22:37:46 -0000	1.2
+++ sources	29 Sep 2009 21:03:27 -0000	1.3
@@ -1 +1 @@
-e45589dde04728029f0afa616af6fed3  network-manager-netbook-1.2.tar.bz2
+be0507867b476efcf9e11894426c509f  network-manager-netbook-1.4.tar.bz2


--- nmn-fixNMdetect.patch DELETED ---



From epienbro at fedoraproject.org  Tue Sep 29 21:19:51 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 29 Sep 2009 21:19:51 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel .cvsignore, 1.5, 1.6 mingw32-pixman.spec, 
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090929211951.F3B1311C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26967

Modified Files:
	.cvsignore mingw32-pixman.spec sources 
Log Message:
Update to 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Aug 2009 20:56:33 -0000	1.5
+++ .cvsignore	29 Sep 2009 21:19:51 -0000	1.6
@@ -1 +1 @@
-pixman-0.16.0.tar.bz2
+pixman-0.16.2.tar.bz2


Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-pixman.spec	18 Sep 2009 21:54:41 -0000	1.10
+++ mingw32-pixman.spec	29 Sep 2009 21:19:51 -0000	1.11
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pixman
-Version:        0.16.0
-Release:        2%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.2-1
+- Update to 0.16.2
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.0-2
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Aug 2009 20:56:33 -0000	1.5
+++ sources	29 Sep 2009 21:19:51 -0000	1.6
@@ -1 +1 @@
-183dea8a100c1d9732cdb2146ec90f68  pixman-0.16.0.tar.bz2
+0ce7de6d649f1a80d328b05e403730b6  pixman-0.16.2.tar.bz2



From atorkhov at fedoraproject.org  Tue Sep 29 21:21:34 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 21:21:34 +0000 (UTC)
Subject: rpms/kcheckers/devel import.log, NONE,
	1.1 kcheckers-0.8.1-prefix.patch, NONE,
	1.1 kcheckers-0.8.1-qt-translator.patch, NONE,
	1.1 kcheckers.desktop, NONE, 1.1 kcheckers.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929212134.0FF8711C0423@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/kcheckers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27594/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcheckers-0.8.1-prefix.patch 
	kcheckers-0.8.1-qt-translator.patch kcheckers.desktop 
	kcheckers.spec 
Log Message:
Import.



--- NEW FILE import.log ---
kcheckers-0_8_1-4_local12:HEAD:kcheckers-0.8.1-4.local12.src.rpm:1254257412

kcheckers-0.8.1-prefix.patch:
 common.h      |    2 +-
 kcheckers.pro |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kcheckers-0.8.1-prefix.patch ---
--- kcheckers-0.8.1/common.h~	2005-12-29 20:53:16 +0300
+++ kcheckers-0.8.1/common.h	2007-10-02 16:28:17 +0400
@@ -35,7 +35,7 @@
 
 /* !!! Do not change PREFIX variable name, please. !!! */
 /* !!! It is used in kcheckers.pro. !!! */
-#define PREFIX		"/usr/local"
+#define PREFIX		"/usr"
 #define USER_PATH	".kcheckers"		// in $HOME
 #define THEME_DIR	"themes/"
 
--- kcheckers-0.8.1/kcheckers.pro~	2005-12-29 20:55:55 +0300
+++ kcheckers-0.8.1/kcheckers.pro	2007-10-02 16:33:22 +0400
@@ -21,8 +21,8 @@ RESOURCES = kcheckers.qrc
 
 
 TARGET		= kcheckers
-PREFIX		= $$system(grep 'define PREFIX' common.h | cut -d'"' -f2)
-SHARE_PATH	= $$system(grep 'define SHARE_PATH' common.h | cut -d'"' -f2)
+PREFIX		= "/usr"
+SHARE_PATH	= "/usr/share"
 
 TRANSLATIONS	= i18n/kcheckers_de.ts i18n/kcheckers_fr.ts
 #		i18n/kcheckers_ru.ts

kcheckers-0.8.1-qt-translator.patch:
 main.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kcheckers-0.8.1-qt-translator.patch ---
--- kcheckers-0.8.1/main.cc~	2005-12-19 21:16:45 +0300
+++ kcheckers-0.8.1/main.cc	2007-10-02 16:31:55 +0400
@@ -3,6 +3,7 @@
 #include <QLocale>
 #include <QDebug>
 //#include <QPlastiqueStyle>
+#include <QLibraryInfo>
 
 
 #include "toplevel.h"
@@ -20,7 +21,7 @@ int main(int argc, char *argv[])
 
     // Qt translations
     QTranslator qt_tr;
-    if(qt_tr.load("qt_" + QLocale::system().name()))
+    if(qt_tr.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_"+QLocale::system().name()))
 	app.installTranslator(&qt_tr);
     else
 	qDebug() << "Loading Qt translations failed.";


--- NEW FILE kcheckers.desktop ---
[Desktop Entry]
Type=Application
Name=KCheckers
GenericName=Checkers
GenericName[ru]=?????
Comment=Classic boardgame - checkers
Comment[ru]=???????????? ?????????? ???? - ?????
Icon=kcheckers
Exec=kcheckers
Terminal=false
Categories=Game;BoardGame;


--- NEW FILE kcheckers.spec ---
Name:           kcheckers
Version:        0.8.1
Release:        4%{?dist}
Summary:        Checkers board game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://qcheckers.sourceforge.net/
Source0:        http://downloads.sourceforge.net/qcheckers/%{name}-%{version}.tar.gz
# Desktop file and patches are taken from ALT Linux package
Source1:        kcheckers.desktop
# Fedora specific prefix
Patch0:         kcheckers-0.8.1-prefix.patch
# Patch is committed into upstream CVS
Patch1:         kcheckers-0.8.1-qt-translator.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:       hicolor-icon-theme
BuildRequires:  qt4-devel desktop-file-utils

%description
The Qt version of the classic board game checkers. This game is also
known as draughts.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
qmake-qt4
make %{?_smp_mflags}
lrelease-qt4 i18n/*.ts


%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
install -Dp -m 644 icons/biglogo.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/
install -p -m 644 i18n/*.qm $RPM_BUILD_ROOT/%{_datadir}/%{name}/
cp -p -r themes $RPM_BUILD_ROOT/%{_datadir}/%{name}/
%find_lang %{name} --with-qt


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/themes


%changelog
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Use qt4-devel build requires

* Thu Apr 09 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Adding comments for patches

* Sat Mar 21 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-3
- Install icon to hicolor theme
- Use qt-devel build requires instead of qt4-devel

* Fri Mar 20 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-2
- Using find_lang to find qt translations
- Use desktop-file-install

* Sun Mar 08 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:08:45 -0000	1.1
+++ .cvsignore	29 Sep 2009 21:21:30 -0000	1.2
@@ -0,0 +1 @@
+kcheckers-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:08:45 -0000	1.1
+++ sources	29 Sep 2009 21:21:33 -0000	1.2
@@ -0,0 +1 @@
+793736a007cd92122dfd91bcfd14ab69  kcheckers-0.8.1.tar.gz



From atorkhov at fedoraproject.org  Tue Sep 29 21:23:04 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 21:23:04 +0000 (UTC)
Subject: rpms/kcheckers/F-12 import.log, NONE,
	1.1 kcheckers-0.8.1-prefix.patch, 
	NONE, 1.1 kcheckers-0.8.1-qt-translator.patch, NONE,
	1.1 kcheckers.desktop, NONE, 1.1 kcheckers.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929212304.90FF611C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/kcheckers/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28813/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcheckers-0.8.1-prefix.patch 
	kcheckers-0.8.1-qt-translator.patch kcheckers.desktop 
	kcheckers.spec 
Log Message:
Import.



--- NEW FILE import.log ---
kcheckers-0_8_1-4_local12:F-12:kcheckers-0.8.1-4.local12.src.rpm:1254259352

kcheckers-0.8.1-prefix.patch:
 common.h      |    2 +-
 kcheckers.pro |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kcheckers-0.8.1-prefix.patch ---
--- kcheckers-0.8.1/common.h~	2005-12-29 20:53:16 +0300
+++ kcheckers-0.8.1/common.h	2007-10-02 16:28:17 +0400
@@ -35,7 +35,7 @@
 
 /* !!! Do not change PREFIX variable name, please. !!! */
 /* !!! It is used in kcheckers.pro. !!! */
-#define PREFIX		"/usr/local"
+#define PREFIX		"/usr"
 #define USER_PATH	".kcheckers"		// in $HOME
 #define THEME_DIR	"themes/"
 
--- kcheckers-0.8.1/kcheckers.pro~	2005-12-29 20:55:55 +0300
+++ kcheckers-0.8.1/kcheckers.pro	2007-10-02 16:33:22 +0400
@@ -21,8 +21,8 @@ RESOURCES = kcheckers.qrc
 
 
 TARGET		= kcheckers
-PREFIX		= $$system(grep 'define PREFIX' common.h | cut -d'"' -f2)
-SHARE_PATH	= $$system(grep 'define SHARE_PATH' common.h | cut -d'"' -f2)
+PREFIX		= "/usr"
+SHARE_PATH	= "/usr/share"
 
 TRANSLATIONS	= i18n/kcheckers_de.ts i18n/kcheckers_fr.ts
 #		i18n/kcheckers_ru.ts

kcheckers-0.8.1-qt-translator.patch:
 main.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kcheckers-0.8.1-qt-translator.patch ---
--- kcheckers-0.8.1/main.cc~	2005-12-19 21:16:45 +0300
+++ kcheckers-0.8.1/main.cc	2007-10-02 16:31:55 +0400
@@ -3,6 +3,7 @@
 #include <QLocale>
 #include <QDebug>
 //#include <QPlastiqueStyle>
+#include <QLibraryInfo>
 
 
 #include "toplevel.h"
@@ -20,7 +21,7 @@ int main(int argc, char *argv[])
 
     // Qt translations
     QTranslator qt_tr;
-    if(qt_tr.load("qt_" + QLocale::system().name()))
+    if(qt_tr.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_"+QLocale::system().name()))
 	app.installTranslator(&qt_tr);
     else
 	qDebug() << "Loading Qt translations failed.";


--- NEW FILE kcheckers.desktop ---
[Desktop Entry]
Type=Application
Name=KCheckers
GenericName=Checkers
GenericName[ru]=?????
Comment=Classic boardgame - checkers
Comment[ru]=???????????? ?????????? ???? - ?????
Icon=kcheckers
Exec=kcheckers
Terminal=false
Categories=Game;BoardGame;


--- NEW FILE kcheckers.spec ---
Name:           kcheckers
Version:        0.8.1
Release:        4%{?dist}
Summary:        Checkers board game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://qcheckers.sourceforge.net/
Source0:        http://downloads.sourceforge.net/qcheckers/%{name}-%{version}.tar.gz
# Desktop file and patches are taken from ALT Linux package
Source1:        kcheckers.desktop
# Fedora specific prefix
Patch0:         kcheckers-0.8.1-prefix.patch
# Patch is committed into upstream CVS
Patch1:         kcheckers-0.8.1-qt-translator.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:       hicolor-icon-theme
BuildRequires:  qt4-devel desktop-file-utils

%description
The Qt version of the classic board game checkers. This game is also
known as draughts.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
qmake-qt4
make %{?_smp_mflags}
lrelease-qt4 i18n/*.ts


%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
install -Dp -m 644 icons/biglogo.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/
install -p -m 644 i18n/*.qm $RPM_BUILD_ROOT/%{_datadir}/%{name}/
cp -p -r themes $RPM_BUILD_ROOT/%{_datadir}/%{name}/
%find_lang %{name} --with-qt


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/themes


%changelog
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Use qt4-devel build requires

* Thu Apr 09 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Adding comments for patches

* Sat Mar 21 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-3
- Install icon to hicolor theme
- Use qt-devel build requires instead of qt4-devel

* Fri Mar 20 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-2
- Using find_lang to find qt translations
- Use desktop-file-install

* Sun Mar 08 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:08:45 -0000	1.1
+++ .cvsignore	29 Sep 2009 21:23:03 -0000	1.2
@@ -0,0 +1 @@
+kcheckers-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:08:45 -0000	1.1
+++ sources	29 Sep 2009 21:23:04 -0000	1.2
@@ -0,0 +1 @@
+793736a007cd92122dfd91bcfd14ab69  kcheckers-0.8.1.tar.gz



From atorkhov at fedoraproject.org  Tue Sep 29 21:25:55 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 21:25:55 +0000 (UTC)
Subject: rpms/kcheckers/F-11 import.log, NONE,
	1.1 kcheckers-0.8.1-prefix.patch, 
	NONE, 1.1 kcheckers-0.8.1-qt-translator.patch, NONE,
	1.1 kcheckers.desktop, NONE, 1.1 kcheckers.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929212555.B8F5911C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/kcheckers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30879/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcheckers-0.8.1-prefix.patch 
	kcheckers-0.8.1-qt-translator.patch kcheckers.desktop 
	kcheckers.spec 
Log Message:
Import.



--- NEW FILE import.log ---
kcheckers-0_8_1-4_local12:F-11:kcheckers-0.8.1-4.local12.src.rpm:1254259435

kcheckers-0.8.1-prefix.patch:
 common.h      |    2 +-
 kcheckers.pro |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kcheckers-0.8.1-prefix.patch ---
--- kcheckers-0.8.1/common.h~	2005-12-29 20:53:16 +0300
+++ kcheckers-0.8.1/common.h	2007-10-02 16:28:17 +0400
@@ -35,7 +35,7 @@
 
 /* !!! Do not change PREFIX variable name, please. !!! */
 /* !!! It is used in kcheckers.pro. !!! */
-#define PREFIX		"/usr/local"
+#define PREFIX		"/usr"
 #define USER_PATH	".kcheckers"		// in $HOME
 #define THEME_DIR	"themes/"
 
--- kcheckers-0.8.1/kcheckers.pro~	2005-12-29 20:55:55 +0300
+++ kcheckers-0.8.1/kcheckers.pro	2007-10-02 16:33:22 +0400
@@ -21,8 +21,8 @@ RESOURCES = kcheckers.qrc
 
 
 TARGET		= kcheckers
-PREFIX		= $$system(grep 'define PREFIX' common.h | cut -d'"' -f2)
-SHARE_PATH	= $$system(grep 'define SHARE_PATH' common.h | cut -d'"' -f2)
+PREFIX		= "/usr"
+SHARE_PATH	= "/usr/share"
 
 TRANSLATIONS	= i18n/kcheckers_de.ts i18n/kcheckers_fr.ts
 #		i18n/kcheckers_ru.ts

kcheckers-0.8.1-qt-translator.patch:
 main.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kcheckers-0.8.1-qt-translator.patch ---
--- kcheckers-0.8.1/main.cc~	2005-12-19 21:16:45 +0300
+++ kcheckers-0.8.1/main.cc	2007-10-02 16:31:55 +0400
@@ -3,6 +3,7 @@
 #include <QLocale>
 #include <QDebug>
 //#include <QPlastiqueStyle>
+#include <QLibraryInfo>
 
 
 #include "toplevel.h"
@@ -20,7 +21,7 @@ int main(int argc, char *argv[])
 
     // Qt translations
     QTranslator qt_tr;
-    if(qt_tr.load("qt_" + QLocale::system().name()))
+    if(qt_tr.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_"+QLocale::system().name()))
 	app.installTranslator(&qt_tr);
     else
 	qDebug() << "Loading Qt translations failed.";


--- NEW FILE kcheckers.desktop ---
[Desktop Entry]
Type=Application
Name=KCheckers
GenericName=Checkers
GenericName[ru]=?????
Comment=Classic boardgame - checkers
Comment[ru]=???????????? ?????????? ???? - ?????
Icon=kcheckers
Exec=kcheckers
Terminal=false
Categories=Game;BoardGame;


--- NEW FILE kcheckers.spec ---
Name:           kcheckers
Version:        0.8.1
Release:        4%{?dist}
Summary:        Checkers board game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://qcheckers.sourceforge.net/
Source0:        http://downloads.sourceforge.net/qcheckers/%{name}-%{version}.tar.gz
# Desktop file and patches are taken from ALT Linux package
Source1:        kcheckers.desktop
# Fedora specific prefix
Patch0:         kcheckers-0.8.1-prefix.patch
# Patch is committed into upstream CVS
Patch1:         kcheckers-0.8.1-qt-translator.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:       hicolor-icon-theme
BuildRequires:  qt4-devel desktop-file-utils

%description
The Qt version of the classic board game checkers. This game is also
known as draughts.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
qmake-qt4
make %{?_smp_mflags}
lrelease-qt4 i18n/*.ts


%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
install -Dp -m 644 icons/biglogo.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/
install -p -m 644 i18n/*.qm $RPM_BUILD_ROOT/%{_datadir}/%{name}/
cp -p -r themes $RPM_BUILD_ROOT/%{_datadir}/%{name}/
%find_lang %{name} --with-qt


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/themes


%changelog
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Use qt4-devel build requires

* Thu Apr 09 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Adding comments for patches

* Sat Mar 21 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-3
- Install icon to hicolor theme
- Use qt-devel build requires instead of qt4-devel

* Fri Mar 20 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-2
- Using find_lang to find qt translations
- Use desktop-file-install

* Sun Mar 08 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:08:45 -0000	1.1
+++ .cvsignore	29 Sep 2009 21:25:54 -0000	1.2
@@ -0,0 +1 @@
+kcheckers-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:08:45 -0000	1.1
+++ sources	29 Sep 2009 21:25:55 -0000	1.2
@@ -0,0 +1 @@
+793736a007cd92122dfd91bcfd14ab69  kcheckers-0.8.1.tar.gz



From atorkhov at fedoraproject.org  Tue Sep 29 21:27:43 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Tue, 29 Sep 2009 21:27:43 +0000 (UTC)
Subject: rpms/kcheckers/F-10 import.log, NONE,
	1.1 kcheckers-0.8.1-prefix.patch, 
	NONE, 1.1 kcheckers-0.8.1-qt-translator.patch, NONE,
	1.1 kcheckers.desktop, NONE, 1.1 kcheckers.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929212743.C28EF11C00C1@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/kcheckers/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32316/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcheckers-0.8.1-prefix.patch 
	kcheckers-0.8.1-qt-translator.patch kcheckers.desktop 
	kcheckers.spec 
Log Message:
Import.


--- NEW FILE import.log ---
kcheckers-0_8_1-4_local12:F-10:kcheckers-0.8.1-4.local12.src.rpm:1254259613

kcheckers-0.8.1-prefix.patch:
 common.h      |    2 +-
 kcheckers.pro |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kcheckers-0.8.1-prefix.patch ---
--- kcheckers-0.8.1/common.h~	2005-12-29 20:53:16 +0300
+++ kcheckers-0.8.1/common.h	2007-10-02 16:28:17 +0400
@@ -35,7 +35,7 @@
 
 /* !!! Do not change PREFIX variable name, please. !!! */
 /* !!! It is used in kcheckers.pro. !!! */
-#define PREFIX		"/usr/local"
+#define PREFIX		"/usr"
 #define USER_PATH	".kcheckers"		// in $HOME
 #define THEME_DIR	"themes/"
 
--- kcheckers-0.8.1/kcheckers.pro~	2005-12-29 20:55:55 +0300
+++ kcheckers-0.8.1/kcheckers.pro	2007-10-02 16:33:22 +0400
@@ -21,8 +21,8 @@ RESOURCES = kcheckers.qrc
 
 
 TARGET		= kcheckers
-PREFIX		= $$system(grep 'define PREFIX' common.h | cut -d'"' -f2)
-SHARE_PATH	= $$system(grep 'define SHARE_PATH' common.h | cut -d'"' -f2)
+PREFIX		= "/usr"
+SHARE_PATH	= "/usr/share"
 
 TRANSLATIONS	= i18n/kcheckers_de.ts i18n/kcheckers_fr.ts
 #		i18n/kcheckers_ru.ts

kcheckers-0.8.1-qt-translator.patch:
 main.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kcheckers-0.8.1-qt-translator.patch ---
--- kcheckers-0.8.1/main.cc~	2005-12-19 21:16:45 +0300
+++ kcheckers-0.8.1/main.cc	2007-10-02 16:31:55 +0400
@@ -3,6 +3,7 @@
 #include <QLocale>
 #include <QDebug>
 //#include <QPlastiqueStyle>
+#include <QLibraryInfo>
 
 
 #include "toplevel.h"
@@ -20,7 +21,7 @@ int main(int argc, char *argv[])
 
     // Qt translations
     QTranslator qt_tr;
-    if(qt_tr.load("qt_" + QLocale::system().name()))
+    if(qt_tr.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_"+QLocale::system().name()))
 	app.installTranslator(&qt_tr);
     else
 	qDebug() << "Loading Qt translations failed.";


--- NEW FILE kcheckers.desktop ---
[Desktop Entry]
Type=Application
Name=KCheckers
GenericName=Checkers
GenericName[ru]=?????
Comment=Classic boardgame - checkers
Comment[ru]=???????????? ?????????? ???? - ?????
Icon=kcheckers
Exec=kcheckers
Terminal=false
Categories=Game;BoardGame;


--- NEW FILE kcheckers.spec ---
Name:           kcheckers
Version:        0.8.1
Release:        4%{?dist}
Summary:        Checkers board game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://qcheckers.sourceforge.net/
Source0:        http://downloads.sourceforge.net/qcheckers/%{name}-%{version}.tar.gz
# Desktop file and patches are taken from ALT Linux package
Source1:        kcheckers.desktop
# Fedora specific prefix
Patch0:         kcheckers-0.8.1-prefix.patch
# Patch is committed into upstream CVS
Patch1:         kcheckers-0.8.1-qt-translator.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:       hicolor-icon-theme
BuildRequires:  qt4-devel desktop-file-utils

%description
The Qt version of the classic board game checkers. This game is also
known as draughts.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
qmake-qt4
make %{?_smp_mflags}
lrelease-qt4 i18n/*.ts


%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
install -Dp -m 644 icons/biglogo.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/
install -p -m 644 i18n/*.qm $RPM_BUILD_ROOT/%{_datadir}/%{name}/
cp -p -r themes $RPM_BUILD_ROOT/%{_datadir}/%{name}/
%find_lang %{name} --with-qt


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/themes


%changelog
* Tue Sep 29 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Use qt4-devel build requires

* Thu Apr 09 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-4
- Adding comments for patches

* Sat Mar 21 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-3
- Install icon to hicolor theme
- Use qt-devel build requires instead of qt4-devel

* Fri Mar 20 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-2
- Using find_lang to find qt translations
- Use desktop-file-install

* Sun Mar 08 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:08:45 -0000	1.1
+++ .cvsignore	29 Sep 2009 21:27:43 -0000	1.2
@@ -0,0 +1 @@
+kcheckers-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcheckers/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:08:45 -0000	1.1
+++ sources	29 Sep 2009 21:27:43 -0000	1.2
@@ -0,0 +1 @@
+793736a007cd92122dfd91bcfd14ab69  kcheckers-0.8.1.tar.gz



From leigh123linux at fedoraproject.org  Tue Sep 29 21:36:32 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Tue, 29 Sep 2009 21:36:32 +0000 (UTC)
Subject: rpms/libcompizconfig/F-12 protobuf_version.patch, NONE,
	1.1 libcompizconfig.spec, 1.20, 1.21
Message-ID: <20090929213632.1844511C00C1@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/libcompizconfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4797

Modified Files:
	libcompizconfig.spec 
Added Files:
	protobuf_version.patch 
Log Message:
* Sat Sep 29 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-7
- add patch for protobuf version and re-enable protobuf support


protobuf_version.patch:
 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE protobuf_version.patch ---
--- libcompizconfig-0.8.2/configure
+++ libcompizconfig-0.8.2/configure.new
@@ -19882,7 +19882,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lprotobuf  $LIBS"
+LIBS="-lprotobuf -lpthread $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
--- libcompizconfig-0.8.2/configure.ac
+++ libcompizconfig-0.8.2/configure.ac.new
@@ -105,7 +105,7 @@
     echo -e $protobuf_error_msg; use_protobuf=no
   else
     AC_CHECK_LIB(protobuf, _ZN6google8protobuf7MessageD2Ev, [], [
-      echo -e $protobuf_error_msg; use_protobuf=no ])
+      echo -e $protobuf_error_msg; use_protobuf=no ], -lpthread)
     if test "x$use_protobuf" = "xyes"; then
       AC_LANG([C++])
       AC_CHECK_HEADER([google/protobuf/message.h],,[


Index: libcompizconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcompizconfig/F-12/libcompizconfig.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libcompizconfig.spec	19 Sep 2009 12:53:26 -0000	1.20
+++ libcompizconfig.spec	29 Sep 2009 21:36:31 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           libcompizconfig
 Version:        0.8.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Configuration backend for compiz
 
 Group:          System Environment/Libraries
@@ -15,14 +15,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch100:       libcompizconfig-update_pb.patch
 #Patch101:        libcompizconfig-gcc43-buildfix.patch
 #Patch102:        libcompizconfig-gcc43-buildfix2.patch
-
+Patch103:       protobuf_version.patch
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
 BuildRequires:  compiz-devel >= %{basever}, compiz-bcop >= %{basever}
 BuildRequires:  libX11-devel, gettext, intltool
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  mesa-libGL-devel
-#BuildRequires:  protobuf-devel
+BuildRequires:  protobuf-devel
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -48,9 +48,10 @@ developing applications that use %{name}
 %patch100 -p1 -b .libcompizconfig-update_pb
 #%patch101 -p1 -b .gcc43-buildfix
 #%patch102 -p1 -b .gcc43-buildfix2
+%patch103 -p1 -b  .protobuf_version
 
 %build
-%configure --disable-static --disable-protobuf
+%configure --disable-static
            
 make %{?_smp_mflags}
 
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 29 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-7
+- add patch for protobuf version and re-enable protobuf support
+
 * Sat Sep 19 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-6
 - disable protobuf support
 



From leigh123linux at fedoraproject.org  Tue Sep 29 21:40:01 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Tue, 29 Sep 2009 21:40:01 +0000 (UTC)
Subject: rpms/libcompizconfig/devel protobuf_version.patch, NONE,
	1.1 libcompizconfig.spec, 1.20, 1.21
Message-ID: <20090929214001.CE0C711C048A@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/libcompizconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6454

Modified Files:
	libcompizconfig.spec 
Added Files:
	protobuf_version.patch 
Log Message:
* Sat Sep 29 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-7
- add patch for protobuf version and re-enable protobuf support


protobuf_version.patch:
 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE protobuf_version.patch ---
--- libcompizconfig-0.8.2/configure
+++ libcompizconfig-0.8.2/configure.new
@@ -19882,7 +19882,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lprotobuf  $LIBS"
+LIBS="-lprotobuf -lpthread $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
--- libcompizconfig-0.8.2/configure.ac
+++ libcompizconfig-0.8.2/configure.ac.new
@@ -105,7 +105,7 @@
     echo -e $protobuf_error_msg; use_protobuf=no
   else
     AC_CHECK_LIB(protobuf, _ZN6google8protobuf7MessageD2Ev, [], [
-      echo -e $protobuf_error_msg; use_protobuf=no ])
+      echo -e $protobuf_error_msg; use_protobuf=no ], -lpthread)
     if test "x$use_protobuf" = "xyes"; then
       AC_LANG([C++])
       AC_CHECK_HEADER([google/protobuf/message.h],,[


Index: libcompizconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcompizconfig/devel/libcompizconfig.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libcompizconfig.spec	19 Sep 2009 12:53:26 -0000	1.20
+++ libcompizconfig.spec	29 Sep 2009 21:40:01 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           libcompizconfig
 Version:        0.8.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Configuration backend for compiz
 
 Group:          System Environment/Libraries
@@ -15,14 +15,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch100:       libcompizconfig-update_pb.patch
 #Patch101:        libcompizconfig-gcc43-buildfix.patch
 #Patch102:        libcompizconfig-gcc43-buildfix2.patch
-
+Patch103:       protobuf_version.patch
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
 BuildRequires:  compiz-devel >= %{basever}, compiz-bcop >= %{basever}
 BuildRequires:  libX11-devel, gettext, intltool
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  mesa-libGL-devel
-#BuildRequires:  protobuf-devel
+BuildRequires:  protobuf-devel
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -48,9 +48,10 @@ developing applications that use %{name}
 %patch100 -p1 -b .libcompizconfig-update_pb
 #%patch101 -p1 -b .gcc43-buildfix
 #%patch102 -p1 -b .gcc43-buildfix2
+%patch103 -p1 -b  .protobuf_version
 
 %build
-%configure --disable-static --disable-protobuf
+%configure --disable-static
            
 make %{?_smp_mflags}
 
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 29 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-7
+- add patch for protobuf version and re-enable protobuf support
+
 * Sat Sep 19 2009 leigh scott <leigh123linux at googlemail.com> - 0.8.2-6
 - disable protobuf support
 



From mathstuf at fedoraproject.org  Tue Sep 29 21:49:00 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 29 Sep 2009 21:49:00 +0000 (UTC)
Subject: rpms/krename/devel .cvsignore, 1.3, 1.4 krename.spec, 1.8,
	1.9 sources, 1.3, 1.4 krename.desktop, 1.1, NONE
Message-ID: <20090929214900.DDD4B11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krename/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10085

Modified Files:
	.cvsignore krename.spec sources 
Removed Files:
	krename.desktop 
Log Message:
Update to KDE4 version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krename/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Apr 2007 10:49:16 -0000	1.3
+++ .cvsignore	29 Sep 2009 21:49:00 -0000	1.4
@@ -1 +1 @@
-krename-3.0.14.tar.bz2
+krename-4.0.0.tar.bz2


Index: krename.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krename/devel/krename.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- krename.spec	30 Jul 2009 00:14:59 -0000	1.8
+++ krename.spec	29 Sep 2009 21:49:00 -0000	1.9
@@ -1,15 +1,21 @@
 Name:           krename
-Version:        3.0.14
-Release:        7%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        Powerful batch file renamer
 Group:          Applications/File
 License:        GPLv2
 URL:            http://www.krename.net/
 Source0:        http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Source3:        krename.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Requires:       hicolor-icon-theme
-BuildRequires:  kdelibs3-devel desktop-file-utils
+
+BuildRequires:  kdelibs4-devel
+BuildRequires:  taglib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  exiv2-devel
+BuildRequires:  gettext
+
 %description
 KRename is a powerful batch renamer for KDE. It allows you to easily rename
 hundreds or even more files in one go. The filenames can be created by parts
@@ -17,57 +23,57 @@ of the original filename, numbering the 
 informations about the file, like creation date or Exif informations of an
 image.
 
+
 %prep
 %setup -q
-for file in ChangeLog TODO; do
+for file in TODO; do
     iconv -f iso8859-1 -t utf8 $file > $file.utf8
     rm -rf $file
     mv $file.utf8 $file
 done
 
+
 %build
-%configure --disable-rpath
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/applications #deleting unwanted default desktop file
-desktop-file-install --vendor="fedora" \
-                     --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-                     %{SOURCE3}
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform} install/fast
 %find_lang %{name}
 
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/apps/konqueror
-%{_datadir}/apps/krename
-%{_datadir}/doc/HTML/en/krename
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/locolor
+%doc AUTHORS COPYING README TODO
+%{_kde4_bindir}/%{name}
+%{_kde4_datadir}/applications/kde4/krename.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/%{name}.png
+%{_kde4_iconsdir}/locolor/*/apps/%{name}.png
 
 
 %changelog
-* Wed Jul 29 2009 Ben Boeckel <MathStuf at gmail.com> - 3.0.14-7
-- Retry build for mass rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.14-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 4.0.0-1
+- Update to KDE4 version
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krename/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Apr 2007 10:49:16 -0000	1.3
+++ sources	29 Sep 2009 21:49:00 -0000	1.4
@@ -1 +1 @@
-1f5fe57384d912c11fbd0fae94bb7fca  krename-3.0.14.tar.bz2
+f90424d6224f4855740c9e37514f0ccc  krename-4.0.0.tar.bz2


--- krename.desktop DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 29 21:57:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 21:57:46 +0000
Subject: [pkgdb] kdevelop: mathstuf has requested watchbugzilla
Message-ID: <20090929215746.C234810F88C@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdevelop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 21:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 21:57:48 +0000
Subject: [pkgdb] kdevelop: mathstuf has requested commit
Message-ID: <20090929215749.0A1F010F8AB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdevelop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 21:57:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 21:57:51 +0000
Subject: [pkgdb] kdevelop: mathstuf has requested watchcommits
Message-ID: <20090929215751.8871010F8B0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdevelop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 21:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 21:57:58 +0000
Subject: [pkgdb] kdevelop: mathstuf has requested watchcommits
Message-ID: <20090929215758.AFA9110F88C@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdevelop (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 21:58:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 21:58:00 +0000
Subject: [pkgdb] kdevelop: mathstuf has requested commit
Message-ID: <20090929215800.5150910F8AB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdevelop (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 21:58:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 21:58:02 +0000
Subject: [pkgdb] kdevelop: mathstuf has requested watchbugzilla
Message-ID: <20090929215802.2AC4910F8B2@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdevelop (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From sgrubb at fedoraproject.org  Tue Sep 29 22:00:04 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 22:00:04 +0000 (UTC)
Subject: rpms/audit/F-11 .cvsignore, 1.101, 1.102 audit.spec, 1.211,
	1.212 sources, 1.126, 1.127
Message-ID: <20090929220004.B343211C048B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13451

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 1.7.14-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	24 Feb 2009 21:36:08 -0000	1.101
+++ .cvsignore	29 Sep 2009 22:00:04 -0000	1.102
@@ -98,3 +98,4 @@ audit-1.7.9.tar.gz
 audit-1.7.10.tar.gz
 audit-1.7.11.tar.gz
 audit-1.7.12.tar.gz
+audit-1.7.14.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/audit.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- audit.spec	8 Jun 2009 19:32:45 -0000	1.211
+++ audit.spec	29 Sep 2009 22:00:04 -0000	1.212
@@ -1,7 +1,7 @@
-%define audit_version 1.7.13
+%define audit_version 1.7.14
 %define audit_release 1%{?dist}
 %define sca_version 0.4.8
-%define sca_release 20
+%define sca_release 21
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
@@ -258,6 +258,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 1.7.14-1
+- New upstream release
+
 * Mon Jun 08 2009 Steve Grubb <sgrubb at redhat.com> 1.7.13-1
 - New upstream release
 - Fix problem with negative uids in audit rules on 32 bit systems


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- sources	8 Jun 2009 19:32:45 -0000	1.126
+++ sources	29 Sep 2009 22:00:04 -0000	1.127
@@ -1 +1 @@
-967776cbec046043ef02ffefe0e89cb7  audit-1.7.13.tar.gz
+7a6810f0c7e7cf5c3bfa388cb09f8fbb  audit-1.7.14.tar.gz



From sgrubb at fedoraproject.org  Tue Sep 29 22:08:52 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 29 Sep 2009 22:08:52 +0000 (UTC)
Subject: rpms/audit/F-11 audit.spec,1.212,1.213
Message-ID: <20090929220852.D9BDE11C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19014

Modified Files:
	audit.spec 
Log Message:
* Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 1.7.14-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/audit.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- audit.spec	29 Sep 2009 22:00:04 -0000	1.212
+++ audit.spec	29 Sep 2009 22:08:52 -0000	1.213
@@ -1,7 +1,7 @@
 %define audit_version 1.7.14
 %define audit_release 1%{?dist}
-%define sca_version 0.4.8
-%define sca_release 21
+%define sca_version 0.4.10
+%define sca_release 1
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
@@ -199,6 +199,7 @@ fi
 %attr(644,root,root) %{_mandir}/man8/aulast.8.gz
 %attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
 %attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz
+%attr(644,root,root) %{_mandir}/man7/audit.rules.7.gz
 %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz



From mathstuf at fedoraproject.org  Tue Sep 29 22:18:59 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 29 Sep 2009 22:18:59 +0000 (UTC)
Subject: rpms/kdevplatform/F-12 .cvsignore, 1.2, 1.3 kdevplatform.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20090929221859.BB7D911C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24216

Modified Files:
	.cvsignore kdevplatform.spec sources 
Log Message:
Use an official beta snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 05:38:33 -0000	1.2
+++ .cvsignore	29 Sep 2009 22:18:59 -0000	1.3
@@ -1 +1 @@
-kdevplatform-0.9.95.20090914svn1023119.tar.bz2
+kdevplatform-0.9.95.tar.bz2


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-12/kdevplatform.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdevplatform.spec	14 Sep 2009 05:45:46 -0000	1.2
+++ kdevplatform.spec	29 Sep 2009 22:18:59 -0000	1.3
@@ -1,25 +1,12 @@
-%define alphatag .20090914svn1023119
-
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        0.9.95
-Release:        0.2%{?alphatag}%{?dist}
+Release:        0.3.beta5%{?alphatag}%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.kde.org/
-### SNAPSHOT
-#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform | grep 'Rev:' | cut -d" " -f4)
-#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform kdevplatform-%{version}.%{svnrel}
-#Source0:CMD tar cjf %{_sourcedir}/kdevplatform-%{version}.%{svnrel}.tar.bz2 kdevplatform-%{version}.%{svnrel}
-#Source0:CMD rm -rf kdevplatform-%{version}.%{svnrel}
-### TAG
-#Source0:DISABLECMD svn export svn://anonsvn.kde.org/home/kde/tags/kdevplatform/%{version} kdevplatform-%{version}
-#Source0:DISABLECMD tar cjf %{_sourcedir}/kdevplatform-%{version}.tar.bz2 kdevplatform-%{version}
-#Source0:DISABLECMD rm -rf kdevplatform-%{version}
-Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
-### ORIGINAL
-#Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.95/src/kdevplatform-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -33,17 +20,19 @@ BuildRequires:  kdesdk-devel >= 4.2.85
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-
 %description
 KDE Development platform, the foundations upon which
 KDevelop and Quanta are built.
 
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+
 %description libs
 %{summary}.
 
+
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
@@ -56,12 +45,13 @@ Requires: commoncpp2-devel
 
 
 %prep
-%setup -q -n kdevplatform-%{version}%{?alphatag}
+%setup -q -n kdevplatform-%{version}
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DCMAKE_BUILD_TYPE=Debugfull ..
+%{cmake_kde4} ..
 popd
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
@@ -70,6 +60,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -114,6 +105,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3.beta5
+- Use official release
+
 * Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.2
 - Add icon scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 05:38:33 -0000	1.2
+++ sources	29 Sep 2009 22:18:59 -0000	1.3
@@ -1 +1 @@
-a60de80748d1a130f3f3ce0a10f471ae  kdevplatform-0.9.95.20090914svn1023119.tar.bz2
+e38fd54ea9c16b41222e893c06ca3946  kdevplatform-0.9.95.tar.bz2



From cwickert at fedoraproject.org  Tue Sep 29 22:35:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 22:35:04 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings.spec,1.18,1.19
Message-ID: <20090929223505.13AA311C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31314

Modified Files:
	xfce4-settings.spec 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
- Update to 4.6.3
- Drop patches that were upstreamed



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfce4-settings.spec	26 Sep 2009 20:42:17 -0000	1.18
+++ xfce4-settings.spec	29 Sep 2009 22:35:04 -0000	1.19
@@ -1,22 +1,17 @@
+%global xfceversion 4.6
+
 Name:           xfce4-settings
-Version:        4.6.1
-Release:        5%{?dist}
+Version:        4.6.3
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
 # xfce4-settings-helper is GPLv2 only. 
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
-# mew libxklavier 4 API in Fedora 12
+Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+# new libxklavier 4 API in Fedora 12
 Patch1:         xfce4-settings-4.6.1-xkl.patch
-# http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
-Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
-# Fix typo in xfce-keyboard-settings
-Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
-# Always restore the display on login: 
-# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
-Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,9 +19,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: exo-devel >= 0.3.93
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: xfconf-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
+BuildRequires: libxfce4util-devel >= %{xfceversion}
+BuildRequires: xfconf-devel >= %{xfceversion}
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: desktop-file-utils >= 0.7
@@ -49,9 +44,6 @@ This package includes the settings manag
 %if 0%{?fedora} >= 12
 %patch1 -p1 -b .xkl
 %endif
-%patch2 -p1 -b .timeout
-%patch3 -p1 -b .keyrepeat
-%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -81,6 +73,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
 desktop-file-install                                            \
@@ -96,6 +89,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
 desktop-file-install                                            \
@@ -128,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+- Drop patches that were upstreamed
+
 * Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
 - Add patch for restoring display resolution on login (bug #504908)
 



From pkgdb at fedoraproject.org  Tue Sep 29 22:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:35:17 +0000
Subject: [pkgdb] python-fedora: jstanley has requested watchbugzilla
Message-ID: <20090929223517.CC5BB10F85F@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchbugzilla acl on python-fedora (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-fedora



From cwickert at fedoraproject.org  Tue Sep 29 22:40:12 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 22:40:12 +0000 (UTC)
Subject: rpms/xfce4-settings/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch, 1.1,
	NONE xfce4-settings-4.6.1-fix-timeout-startup.patch, 1.1,
	NONE xfce4-settings-4.6.1-restore-display-settings.patch, 1.1, NONE
Message-ID: <20090929224012.7867C11C048B@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv498

Modified Files:
	.cvsignore sources 
Removed Files:
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch 
	xfce4-settings-4.6.1-fix-timeout-startup.patch 
	xfce4-settings-4.6.1-restore-display-settings.patch 
Log Message:
upload new source and remove obsolete patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Apr 2009 02:52:40 -0000	1.6
+++ .cvsignore	29 Sep 2009 22:40:11 -0000	1.7
@@ -1 +1 @@
-xfce4-settings-4.6.1.tar.bz2
+xfce4-settings-4.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Apr 2009 02:52:40 -0000	1.6
+++ sources	29 Sep 2009 22:40:11 -0000	1.7
@@ -1 +1 @@
-dc1c8704471c5b0104fa10c30eb60cb6  xfce4-settings-4.6.1.tar.bz2
+60e726143baf0605f6ee8b158d536ed0  xfce4-settings-4.6.3.tar.bz2


--- xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch DELETED ---


--- xfce4-settings-4.6.1-fix-timeout-startup.patch DELETED ---


--- xfce4-settings-4.6.1-restore-display-settings.patch DELETED ---



From mathstuf at fedoraproject.org  Tue Sep 29 22:40:38 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 29 Sep 2009 22:40:38 +0000 (UTC)
Subject: rpms/kdevplatform/F-11 kdevplatform.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090929224038.BA68011C048B@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv605

Modified Files:
	.cvsignore sources 
Added Files:
	kdevplatform.spec 
Log Message:
First F-11 build


--- NEW FILE kdevplatform.spec ---
Name:           kdevplatform
Summary:        Libraries for use by KDE development tools
Version:        0.9.95
Release:        0.3.beta5%{?alphatag}%{?dist}

Group:          Development/Tools
License:        GPLv2
URL:            http://www.kde.org/
Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.95/src/kdevplatform-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}

BuildRequires:  kdelibs-devel >= 4.2.0
BuildRequires:  pcre-devel
BuildRequires:  giflib-devel
BuildRequires:  boost-devel
BuildRequires:  subversion-devel
BuildRequires:  kdesdk-devel >= 4.2.85

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
KDE Development platform, the foundations upon which
KDevelop and Quanta are built.


%package libs
Summary: Runtime libraries for %{name}
Group:   System Environment/Libraries

%description libs
%{summary}.


%package devel
Group:    Development/Libraries
Summary:  Developer files for %{name}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: boost-devel
Requires: subversion-devel
Requires: commoncpp2-devel
%description devel
%{summary}.


%prep
%setup -q -n kdevplatform-%{version}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%post libs -p /sbin/ldconfig

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%postun libs -p /sbin/ldconfig

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING.PLUGINS COPYING.SRC
#{_kde4_bindir}/kdevteamwork_server
%{_kde4_datadir}/kde4/apps/*
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_iconsdir}/hicolor/*/*/*

%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/kde4/*

%files devel
%defattr(-,root,root,-)
%{_kde4_datadir}/kde4/apps/cmake/modules/FindKDevPlatform.cmake
%{_kde4_libdir}/lib*.so
%{_kde4_includedir}/kdevplatform/
%{_kde4_libdir}/cmake/kdevplatform/*.cmake


%changelog
* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3.beta5
- Use official release

* Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.2
- Add icon scriptlets

* Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.1
- Update tarball

* Fri May 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.93-0.1
- 1.0 Beta 3

* Sat Feb 21 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.9.91-0.2.20090221svn929301
- Post KDevplatform 1.0 Beta 1 snapshot

* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.9.85-1
- 0.9.85 snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:02:11 -0000	1.1
+++ .cvsignore	29 Sep 2009 22:40:37 -0000	1.2
@@ -0,0 +1 @@
+kdevplatform-0.9.95.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:02:11 -0000	1.1
+++ sources	29 Sep 2009 22:40:38 -0000	1.2
@@ -0,0 +1 @@
+e38fd54ea9c16b41222e893c06ca3946  kdevplatform-0.9.95.tar.bz2



From deji at fedoraproject.org  Tue Sep 29 22:45:48 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Sep 2009 22:45:48 +0000 (UTC)
Subject: rpms/mutt/F-11 mutt.spec,1.62,1.63
Message-ID: <20090929224548.EE5BD11C00C1@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mutt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3089

Modified Files:
	mutt.spec 
Log Message:
* Tue Sep 29 2009 Deji Akingunola <dakingun at gmail.com> 5:1.5.19-6
- Rebuild for tokyocabinet soname bump (related to #520024)



Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-11/mutt.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- mutt.spec	9 Jun 2009 15:17:54 -0000	1.62
+++ mutt.spec	29 Sep 2009 22:45:47 -0000	1.63
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Tue Sep 29 2009 Deji Akingunola <dakingun at gmail.com> 5:1.5.19-6
+- Rebuild for tokyocabinet soname bump (related to #520024)
+
 * Tue Jun 09 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.19-5
 - fix certificate verification (CVE-2009-1390)
 - add support for gnutls INSECURE_ALGORITHM error code (#499390) 



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:20 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20090929224820.3501D10F88B@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdevelop (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:20 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20090929224820.A1B1D10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdevelop (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:27 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20090929224827.991D510F888@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdevelop (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:43 +0000
Subject: [pkgdb] kdevelop: rdieter has requested watchbugzilla
Message-ID: <20090929224843.B97A210F874@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdevelop (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:44 +0000
Subject: [pkgdb] kdevelop: rdieter has requested watchcommits
Message-ID: <20090929224844.2A4DF10F88C@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdevelop (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:46 +0000
Subject: [pkgdb] kdevelop: rdieter has requested commit
Message-ID: <20090929224846.15CD210F8A9@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdevelop (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:48 +0000
Subject: [pkgdb] kdevelop: rdieter has requested approveacls
Message-ID: <20090929224848.798B410F874@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdevelop (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:59 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20090929224859.4DF3D10F888@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdevelop (Fedora 12) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:48:59 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20090929224859.662BC10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdevelop (Fedora 12) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep 29 22:49:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:49:02 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20090929224902.D478B10F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdevelop (Fedora 12) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdevelop



From smilner at fedoraproject.org  Tue Sep 29 22:49:12 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 29 Sep 2009 22:49:12 +0000 (UTC)
Subject: rpms/python-pygments/devel .cvsignore, 1.6, 1.7 python-pygments.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090929224912.C6C1311C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4795

Modified Files:
	.cvsignore python-pygments.spec sources 
Log Message:
Updated for current release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Nov 2008 03:18:51 -0000	1.6
+++ .cvsignore	29 Sep 2009 22:49:10 -0000	1.7
@@ -1 +1 @@
-Pygments-1.0.tar.gz
+Pygments-1.1.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/devel/python-pygments.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-pygments.spec	26 Jul 2009 20:56:10 -0000	1.12
+++ python-pygments.spec	29 Sep 2009 22:49:11 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pygments
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1.1-1
+- Updated for release.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Nov 2008 03:18:51 -0000	1.6
+++ sources	29 Sep 2009 22:49:11 -0000	1.7
@@ -1 +1 @@
-70c40ff5331460cabfcb24f86a8d451d  Pygments-1.0.tar.gz
+80ac64669a75e2d6647822b2778e38c8  Pygments-1.1.1.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 29 22:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Sep 2009 22:54:26 +0000
Subject: [pkgdb] python-fedora had acl change status
Message-ID: <20090929225426.EBDAE10F85F@bastion2.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on python-fedora (Fedora devel) to Approved for jstanley

To make changes to this package see:
  /pkgdb/packages/name/python-fedora



From mathstuf at fedoraproject.org  Tue Sep 29 22:54:38 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 29 Sep 2009 22:54:38 +0000 (UTC)
Subject: rpms/kdevplatform/F-10 kdevplatform.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090929225438.D86D211C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7962

Modified Files:
	.cvsignore sources 
Added Files:
	kdevplatform.spec 
Log Message:
First F-10 build


--- NEW FILE kdevplatform.spec ---
Name:           kdevplatform
Summary:        Libraries for use by KDE development tools
Version:        0.9.95
Release:        0.3.beta5%{?alphatag}%{?dist}

Group:          Development/Tools
License:        GPLv2
URL:            http://www.kde.org/
Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.95/src/kdevplatform-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}

BuildRequires:  kdelibs-devel >= 4.2.0
BuildRequires:  pcre-devel
BuildRequires:  giflib-devel
BuildRequires:  boost-devel
BuildRequires:  subversion-devel
BuildRequires:  kdesdk-devel >= 4.2.85

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
KDE Development platform, the foundations upon which
KDevelop and Quanta are built.


%package libs
Summary: Runtime libraries for %{name}
Group:   System Environment/Libraries

%description libs
%{summary}.


%package devel
Group:    Development/Libraries
Summary:  Developer files for %{name}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: boost-devel
Requires: subversion-devel
Requires: commoncpp2-devel
%description devel
%{summary}.


%prep
%setup -q -n kdevplatform-%{version}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%post libs -p /sbin/ldconfig

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%postun libs -p /sbin/ldconfig

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING.PLUGINS COPYING.SRC
#{_kde4_bindir}/kdevteamwork_server
%{_kde4_datadir}/kde4/apps/*
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_iconsdir}/hicolor/*/*/*

%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/kde4/*

%files devel
%defattr(-,root,root,-)
%{_kde4_datadir}/kde4/apps/cmake/modules/FindKDevPlatform.cmake
%{_kde4_libdir}/lib*.so
%{_kde4_includedir}/kdevplatform/
%{_kde4_libdir}/cmake/kdevplatform/*.cmake


%changelog
* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3.beta5
- Use official release

* Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.2
- Add icon scriptlets

* Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.1
- Update tarball

* Fri May 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.93-0.1
- 1.0 Beta 3

* Sat Feb 21 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.9.91-0.2.20090221svn929301
- Post KDevplatform 1.0 Beta 1 snapshot

* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.9.85-1
- 0.9.85 snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Sep 2009 05:02:11 -0000	1.1
+++ .cvsignore	29 Sep 2009 22:54:38 -0000	1.2
@@ -0,0 +1 @@
+kdevplatform-0.9.95.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Sep 2009 05:02:11 -0000	1.1
+++ sources	29 Sep 2009 22:54:38 -0000	1.2
@@ -0,0 +1 @@
+e38fd54ea9c16b41222e893c06ca3946  kdevplatform-0.9.95.tar.bz2



From smilner at fedoraproject.org  Tue Sep 29 22:56:31 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 29 Sep 2009 22:56:31 +0000 (UTC)
Subject: rpms/python-pygments/F-12 .cvsignore, 1.6, 1.7 python-pygments.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090929225631.9895211C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8762

Modified Files:
	.cvsignore python-pygments.spec sources 
Log Message:
Updated for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Nov 2008 03:18:51 -0000	1.6
+++ .cvsignore	29 Sep 2009 22:56:31 -0000	1.7
@@ -1 +1 @@
-Pygments-1.0.tar.gz
+Pygments-1.1.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-12/python-pygments.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-pygments.spec	26 Jul 2009 20:56:10 -0000	1.12
+++ python-pygments.spec	29 Sep 2009 22:56:31 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pygments
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1.1-1
+- Updated for release.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Nov 2008 03:18:51 -0000	1.6
+++ sources	29 Sep 2009 22:56:31 -0000	1.7
@@ -1 +1 @@
-70c40ff5331460cabfcb24f86a8d451d  Pygments-1.0.tar.gz
+80ac64669a75e2d6647822b2778e38c8  Pygments-1.1.1.tar.gz



From cwickert at fedoraproject.org  Tue Sep 29 23:03:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 23:03:17 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings.spec, 1.19,
	1.20 xfce4-settings-4.6.1-xkl.patch, 1.1, NONE
Message-ID: <20090929230317.4E4DA11C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11791

Modified Files:
	xfce4-settings.spec 
Removed Files:
	xfce4-settings-4.6.1-xkl.patch 
Log Message:
drop libxklavier patch, also upstreamed


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-settings.spec	29 Sep 2009 22:35:04 -0000	1.19
+++ xfce4-settings.spec	29 Sep 2009 23:03:14 -0000	1.20
@@ -10,8 +10,6 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# new libxklavier 4 API in Fedora 12
-Patch1:         xfce4-settings-4.6.1-xkl.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,9 +39,6 @@ This package includes the settings manag
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 12
-%patch1 -p1 -b .xkl
-%endif
 %patch10 -p1 -b .vendor
 
 %build


--- xfce4-settings-4.6.1-xkl.patch DELETED ---



From rombobeorn at fedoraproject.org  Tue Sep 29 23:12:44 2009
From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=)
Date: Tue, 29 Sep 2009 23:12:44 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common/devel
	fedora-gnat-project-common.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929231244.9ECF811C00C1@cvs1.fedora.phx.redhat.com>

Author: rombobeorn

Update of /cvs/pkgs/rpms/fedora-gnat-project-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15985/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-gnat-project-common.spec import.log 
Log Message:
Initial import (#509158).



--- NEW FILE fedora-gnat-project-common.spec ---
Name:           fedora-gnat-project-common
Version:        1.2
Release:        1%{?dist}
Summary:        Files shared by Ada libraries
Summary(sv):    Gemensamma filer f?r adabibliotek

Group:          System Environment/Libraries
License:        Copyright only
URL:            https://fedorahosted.org/released/fedora-gnat-project-common
Source1:        https://fedorahosted.org/released/fedora-gnat-project-common/download/fedora-gnat-project-common-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       gcc-gnat setup

%description
The fedora-gnat-project-common package contains files that are used by the GNAT
project files of multiple Ada libraries, and also GNAT-specific RPM macros.

%description -l sv
Paketet fedora-gnat-project-common inneh?ller filer som anv?nds av
GNAT-projektfilerna f?r flera adabibliotek, samt GNAT-specifika RPM-makron.

# Extract the GNAT project file location from the file of macro definitions so
# that this package won't build-require itself.
%global _GNAT_project_dir %(tar --extract --gzip --to-stdout --no-anchored --file=%{SOURCE1} macros.gnat | grep ^._GNAT_project_dir | sed 's/[^ ]* *//')


%prep
%setup -q -T -b 1


%build
# nothing to do


%install
rm -rf %{buildroot}
mkdir --parents %{buildroot}%{_GNAT_project_dir} %{buildroot}%{_sysconfdir}/profile.d %{buildroot}%{_sysconfdir}/rpm/
cp -p common.gpr %{buildroot}%{_GNAT_project_dir}/
cp -p gnat-project.sh gnat-project.csh %{buildroot}%{_sysconfdir}/profile.d/
cp -p macros.gnat %{buildroot}%{_sysconfdir}/rpm/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_GNAT_project_dir}
%config(noreplace) %{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/rpm/*


%changelog
* Tue Aug 04 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.2-1
- Updated to version 1.2 with a more complete list of processor architectures.

* Thu Jul 23 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-3
- Added a BuildRoot tag even though it's unnecessary.
- Removed a macro reference from the previous changelog entry.
- Silenced some RPMlint warnings.

* Fri Jul 03 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-2
- Renamed the package to fedora-gnat-project-common.
- There is now an "upstream" project at Fedora Hosted.
- Added a license file.
- Replaced "/etc" with _sysconfdir.

* Wed Jul 01 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1-1
- ready to be submitted for review


--- NEW FILE import.log ---
fedora-gnat-project-common-1_2-1_fc11:HEAD:fedora-gnat-project-common-1.2-1.fc11.src.rpm:1254265449


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:23:59 -0000	1.1
+++ .cvsignore	29 Sep 2009 23:12:44 -0000	1.2
@@ -0,0 +1 @@
+fedora-gnat-project-common-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:23:59 -0000	1.1
+++ sources	29 Sep 2009 23:12:44 -0000	1.2
@@ -0,0 +1 @@
+acc2b458110c12c378d8749b3d6ffbb5  fedora-gnat-project-common-1.2.tar.gz



From cwickert at fedoraproject.org  Tue Sep 29 23:16:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 23:16:29 +0000 (UTC)
Subject: rpms/xfce4-settings/F-12 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xfce4-settings.spec, 1.18,
	1.19 xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch, 1.1,
	NONE xfce4-settings-4.6.1-fix-timeout-startup.patch, 1.1,
	NONE xfce4-settings-4.6.1-restore-display-settings.patch, 1.1,
	NONE xfce4-settings-4.6.1-xkl.patch, 1.1, NONE
Message-ID: <20090929231629.AF0DB11C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19578/F-12

Modified Files:
	.cvsignore sources xfce4-settings.spec 
Removed Files:
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch 
	xfce4-settings-4.6.1-fix-timeout-startup.patch 
	xfce4-settings-4.6.1-restore-display-settings.patch 
	xfce4-settings-4.6.1-xkl.patch 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
- Update to 4.6.3
- Drop patches that were upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Apr 2009 02:52:40 -0000	1.6
+++ .cvsignore	29 Sep 2009 23:16:28 -0000	1.7
@@ -1 +1 @@
-xfce4-settings-4.6.1.tar.bz2
+xfce4-settings-4.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Apr 2009 02:52:40 -0000	1.6
+++ sources	29 Sep 2009 23:16:28 -0000	1.7
@@ -1 +1 @@
-dc1c8704471c5b0104fa10c30eb60cb6  xfce4-settings-4.6.1.tar.bz2
+60e726143baf0605f6ee8b158d536ed0  xfce4-settings-4.6.3.tar.bz2


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-12/xfce4-settings.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfce4-settings.spec	26 Sep 2009 20:42:17 -0000	1.18
+++ xfce4-settings.spec	29 Sep 2009 23:16:29 -0000	1.19
@@ -1,22 +1,15 @@
+%global xfceversion 4.6
+
 Name:           xfce4-settings
-Version:        4.6.1
-Release:        5%{?dist}
+Version:        4.6.3
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
 # xfce4-settings-helper is GPLv2 only. 
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
-# mew libxklavier 4 API in Fedora 12
-Patch1:         xfce4-settings-4.6.1-xkl.patch
-# http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
-Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
-# Fix typo in xfce-keyboard-settings
-Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
-# Always restore the display on login: 
-# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
-Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
+Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,9 +17,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: exo-devel >= 0.3.93
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: xfconf-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
+BuildRequires: libxfce4util-devel >= %{xfceversion}
+BuildRequires: xfconf-devel >= %{xfceversion}
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: desktop-file-utils >= 0.7
@@ -46,12 +39,6 @@ This package includes the settings manag
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 12
-%patch1 -p1 -b .xkl
-%endif
-%patch2 -p1 -b .timeout
-%patch3 -p1 -b .keyrepeat
-%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -81,6 +68,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
 desktop-file-install                                            \
@@ -96,6 +84,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
 desktop-file-install                                            \
@@ -128,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+- Drop patches that were upstreamed
+
 * Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
 - Add patch for restoring display resolution on login (bug #504908)
 


--- xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch DELETED ---


--- xfce4-settings-4.6.1-fix-timeout-startup.patch DELETED ---


--- xfce4-settings-4.6.1-restore-display-settings.patch DELETED ---


--- xfce4-settings-4.6.1-xkl.patch DELETED ---



From cwickert at fedoraproject.org  Tue Sep 29 23:16:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Sep 2009 23:16:30 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xfce4-settings.spec, 1.14,
	1.15 xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch, 1.1,
	NONE xfce4-settings-4.6.1-fix-timeout-startup.patch, 1.1,
	NONE xfce4-settings-4.6.1-restore-display-settings.patch, 1.1,
	NONE xfce4-settings-4.6.1-xkl.patch, 1.1, NONE
Message-ID: <20090929231630.55E9611C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19578/F-11

Modified Files:
	.cvsignore sources xfce4-settings.spec 
Removed Files:
	xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch 
	xfce4-settings-4.6.1-fix-timeout-startup.patch 
	xfce4-settings-4.6.1-restore-display-settings.patch 
	xfce4-settings-4.6.1-xkl.patch 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
- Update to 4.6.3
- Drop patches that were upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	21 Apr 2009 02:26:52 -0000	1.6
+++ .cvsignore	29 Sep 2009 23:16:29 -0000	1.7
@@ -1 +1 @@
-xfce4-settings-4.6.1.tar.bz2
+xfce4-settings-4.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Apr 2009 02:26:52 -0000	1.6
+++ sources	29 Sep 2009 23:16:29 -0000	1.7
@@ -1 +1 @@
-dc1c8704471c5b0104fa10c30eb60cb6  xfce4-settings-4.6.1.tar.bz2
+60e726143baf0605f6ee8b158d536ed0  xfce4-settings-4.6.3.tar.bz2


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-settings.spec	26 Sep 2009 20:56:49 -0000	1.14
+++ xfce4-settings.spec	29 Sep 2009 23:16:30 -0000	1.15
@@ -1,22 +1,15 @@
+%global xfceversion 4.6
+
 Name:           xfce4-settings
-Version:        4.6.1
-Release:        5%{?dist}
+Version:        4.6.3
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
 # xfce4-settings-helper is GPLv2 only. 
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
-# mew libxklavier 4 API in Fedora 12
-Patch1:         xfce4-settings-4.6.1-xkl.patch
-# http://svn.xfce.org/svn/xfce/xfce4-settings/trunk at 29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
-Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
-# Fix typo in xfce-keyboard-settings
-Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
-# Always restore the display on login: 
-# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
-Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
+Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,9 +17,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: exo-devel >= 0.3.93
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: xfconf-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
+BuildRequires: libxfce4util-devel >= %{xfceversion}
+BuildRequires: xfconf-devel >= %{xfceversion}
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: desktop-file-utils >= 0.7
@@ -46,12 +39,6 @@ This package includes the settings manag
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 12
-%patch1 -p1 -b .xkl
-%endif
-%patch2 -p1 -b .timeout
-%patch3 -p1 -b .keyrepeat
-%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -81,6 +68,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
 desktop-file-install                                            \
@@ -96,6 +84,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
 desktop-file-install                                            \
@@ -128,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+- Drop patches that were upstreamed
+
 * Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
 - Add patch for restoring display resolution on login (bug #504908)
 


--- xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch DELETED ---


--- xfce4-settings-4.6.1-fix-timeout-startup.patch DELETED ---


--- xfce4-settings-4.6.1-restore-display-settings.patch DELETED ---


--- xfce4-settings-4.6.1-xkl.patch DELETED ---



From bpepple at fedoraproject.org  Tue Sep 29 23:17:03 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Sep 2009 23:17:03 +0000 (UTC)
Subject: rpms/libepc/devel libepc.spec,1.14,1.15
Message-ID: <20090929231703.2F4CC11C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libepc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19798

Modified Files:
	libepc.spec 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-3
- Add BR on libuuid-devel, and drop BR on e2fsprogs-devel.



Index: libepc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libepc/devel/libepc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libepc.spec	25 Jul 2009 05:33:52 -0000	1.14
+++ libepc.spec	29 Sep 2009 23:17:02 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name:           libepc
 Version:        0.3.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy Publish and Consume library
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@ URL:            http://live.gnome.org/li
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	e2fsprogs-devel >= 1.36
+BuildRequires:	libuuid-devel >= 1.36
 BuildRequires:	libsoup-devel >= %{soup_version}
 BuildRequires:	avahi-glib-devel >= %{avahi_version}
 BuildRequires:	avahi-ui-devel >= %{avahi_version}
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-3
+- Add BR on libuuid-devel, and drop BR on e2fsprogs-devel.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Tue Sep 29 23:18:27 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Sep 2009 23:18:27 +0000 (UTC)
Subject: rpms/libepc/F-12 libepc.spec,1.14,1.15
Message-ID: <20090929231827.D346411C0423@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libepc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20339

Modified Files:
	libepc.spec 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-3
- Add BR on libuuid-devel, and drop BR on e2fsprogs-devel.



Index: libepc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libepc/F-12/libepc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libepc.spec	25 Jul 2009 05:33:52 -0000	1.14
+++ libepc.spec	29 Sep 2009 23:18:27 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name:           libepc
 Version:        0.3.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy Publish and Consume library
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@ URL:            http://live.gnome.org/li
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	e2fsprogs-devel >= 1.36
+BuildRequires:	libuuid-devel >= 1.36
 BuildRequires:	libsoup-devel >= %{soup_version}
 BuildRequires:	avahi-glib-devel >= %{avahi_version}
 BuildRequires:	avahi-ui-devel >= %{avahi_version}
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-3
+- Add BR on libuuid-devel, and drop BR on e2fsprogs-devel.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From deji at fedoraproject.org  Tue Sep 29 23:21:10 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Sep 2009 23:21:10 +0000 (UTC)
Subject: rpms/atlas/F-11 atlas.spec,1.24,1.25
Message-ID: <20090929232110.E45C811C00C1@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21635

Modified Files:
	atlas.spec 
Log Message:
* Tue Sep 29 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-9
- Obsolete the -header subpackage properly. 



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-11/atlas.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- atlas.spec	27 Sep 2009 21:14:21 -0000	1.24
+++ atlas.spec	29 Sep 2009 23:21:10 -0000	1.25
@@ -37,7 +37,7 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
 
 %description devel
 This package contains the static libraries and headers for development
@@ -65,7 +65,7 @@ and SSE3 extensions.
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-3dnow = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
 
 %description 3dnow-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -86,7 +86,7 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
 
 %description sse-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -107,7 +107,7 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
 
 %description sse2-devel
 This package contains shared and static versions of the ATLAS
@@ -127,7 +127,7 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
 
 %description sse3-devel
 This package contains shared and static versions of the ATLAS
@@ -322,6 +322,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Sep 29 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-9
+- Obsolete the -header subpackage properly. 
+
 * Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-8
 - Use the new arch. default for Pentium PRO (Fedora bug #510498)
 - (Re-)Introduce 3dNow subpackage



From deji at fedoraproject.org  Tue Sep 29 23:32:19 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Sep 2009 23:32:19 +0000 (UTC)
Subject: rpms/atlas/F-11 atlas.spec,1.25,1.26
Message-ID: <20090929233219.D650711C00C1@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27303

Modified Files:
	atlas.spec 
Log Message:
Actually bump the release tag



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-11/atlas.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- atlas.spec	29 Sep 2009 23:21:10 -0000	1.25
+++ atlas.spec	29 Sep 2009 23:32:19 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries



From mathstuf at fedoraproject.org  Tue Sep 29 23:32:35 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 29 Sep 2009 23:32:35 +0000 (UTC)
Subject: rpms/kdevelop/devel .cvsignore, 1.35, 1.36 kdevelop.spec, 1.88,
	1.89 sources, 1.39, 1.40 c_cpp_reference-2.0.2-config.patch, 1.1,
	NONE kdevelop-2.1.5_for_KDE_3.1-doc.patch, 1.1,
	NONE kdevelop-3.5.2-kde4template.patch, 1.2,
	NONE kdevelop-3.5.4-gcc-44.patch, 1.1, NONE
Message-ID: <20090929233235.E28AC11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27473

Modified Files:
	.cvsignore kdevelop.spec sources 
Removed Files:
	c_cpp_reference-2.0.2-config.patch 
	kdevelop-2.1.5_for_KDE_3.1-doc.patch 
	kdevelop-3.5.2-kde4template.patch kdevelop-3.5.4-gcc-44.patch 
Log Message:
Update to KDevelop4 beta 5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	30 Aug 2008 15:27:43 -0000	1.35
+++ .cvsignore	29 Sep 2009 23:32:34 -0000	1.36
@@ -1,2 +1 @@
-c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-kdevelop-3.5.3.tar.bz2
+kdevelop-3.9.95.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kdevelop.spec	12 Sep 2009 23:53:23 -0000	1.88
+++ kdevelop.spec	29 Sep 2009 23:32:35 -0000	1.89
@@ -1,87 +1,26 @@
-%define _default_patch_fuzz 2
-
-%define debug 0
-%define final 1 
-
-%define kde_version 3.5.9
-%define qt_version 3.3.8b
-# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
-%define qt_ver %{qt_version}
-
-%define make_cvs 1
-
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 3.5.4
-Release: 6%{?dist}
+Version: 3.9.95
+Release: 0.1.beta5%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/ide/%{name}-%{version}.tar.bz2
-Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/%{version}/src/%{name}-%{version}.tar.bz2
 
-Patch1: c_cpp_reference-2.0.2-config.patch
-Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch3: kdevelop-3.5.4-gcc-44.patch
-# improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora
-Patch4: kdevelop-3.5.2-kde4template.patch
-
-#upstream patches
-
-Provides: kdevelop3 = %{version}-%{release}
-
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: kdelibs3-devel >= %{kde_version}
-# embedded konsole (#507653)
-Requires: kdebase3
-Requires: make
-Requires: perl
-Requires: automake libtool 
-Requires: flex >= 2.5.4
-%if 0%{?fedora} < 9
-Requires: qt-designer
-%else
-Requires: qt3-designer
-%endif
-Requires: gettext
-Requires: ctags
-## Skip these, for now -- Rex
-#Requires(hint): htdig
-#Source3: kdevelop-htdig.conf
-#Requires(hint): kdelibs3-apidocs
-#Requires(hint): ark
-
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-BuildRequires: kdelibs3-devel >= %{kde_version}
-BuildRequires: kdelibs3-apidocs
-%if 0%{?fedora} < 9
-BuildRequires: qt-devel-docs
-%else
-BuildRequires: qt3-devel-docs
-%endif
-BuildRequires: db4-devel
-BuildRequires: flex
-# FIXME: No CVS support in KDevelop? This is going to suck...
-# Requires kdesdk3.
-%if 0%{?fedora} < 9
-# for cvs plugin
-BuildRequires: kdesdk3-devel
-%endif
-BuildRequires: subversion-devel neon-devel
-# looks like this is dragged in by apr-devel (dep of subversion-devel), but not
-# a dependency
-BuildRequires: openldap-devel
+Requires: kdevplatform
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
-## ancient, deprecated?  -- Rex
-#Obsoletes: kdevelop-c_c++_ref
+BuildRequires: kdevplatform-devel >= 0.9.91
+BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: pcre-devel
+BuildRequires: giflib-devel
+BuildRequires: boost-devel >= 1.35.0
+BuildRequires: valgrind-devel
+BuildRequires: kdebase-workspace-devel
 
 %description
 The KDevelop Integrated Development Environment provides many features
@@ -107,140 +46,87 @@ with KIconEdit; The inclusion of any oth
 development by adding it to the "Tools"-menu according to your
 individual needs.
 
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
-Provides: kdevelop3-devel = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdelibs3-devel
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
 %description devel
 %{summary}.
 
+
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: kdelibs3 >= %{version}
+Requires: kdelibs4 >= %{version}
 # helps multilib upgrades
-Obsoletes: kdevelop < 9:3.5.4-6
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
 %description libs
 %{summary}.
 
 
-
 %prep
-
-%setup -q -a1
-%patch1 -p0 -b .config
-%patch2 -p1 -b .doc
-%patch3 -p1 -b .gcc44
-%patch4 -p1 -b .kde4template
-
-%if %{make_cvs}
-# hack/fix for newer automake
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-  rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
-  cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
-  make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
-  make -f admin/Makefile.common cvs
-%endif
+%setup -q -n kdevelop-%{version}
 
 
 %build
-QTDIR="" && source /etc/profile.d/qt.sh
-
-# c references
-pushd c_cpp_reference-2.0.2_for_KDE_3.0
-%configure \
-  --with-qt-libraries=$QTDIR/lib \
-  --with-qt-includes=$QTDIR/include \
-  --with-extra-libs=%{_libdir}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
 popd
-
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-  --enable-final \
-%endif
-  --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_ver}/html/ \
-  --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \
-  --with-extra-libs=%{_libdir}
-
-# parallel make disabled because otherwise main.cpp can get built before
-# profileeditorbase.h is fully generated
-make
-make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+rm -f %{buildroot}/%{_kde4_datadir}/kde4/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2
 
-make DESTDIR=%{buildroot} install
-make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
-
-# remove useless files
-rm -rf %{buildroot}%{_prefix}/kdevbdb
 
+%clean
+rm -rf %{buildroot}
 
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
-%{_bindir}/*
-%{_libdir}/kde3/*
-%{_libdir}/kconf_update_bin/*
-%{_datadir}/applications/kde/*
-%{_datadir}/apps/*
-%{_datadir}/config/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/application/*
-%{_datadir}/mimelnk/text/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
+%doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog TODO NEWS
+%{_kde4_bindir}/kdevelop
+%{_kde4_datadir}/config/kdeveloprc
+%{_kde4_datadir}/kde4/apps/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/applications/kde4/kdevelop.desktop
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
+%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_includedir}/*
+%{_kde4_includedir}/kdevelop/
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 9:3.9.95-0.1.beta5
+- Upgrade to 3.9.95
+
+* Sat Feb 21 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 9:3.9.91-0.2.20090221svn929503
+- Post KDevelop 4 Beta 1 snapshot
+
+* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 9:3.9.85.1
+- 4.0 snapshot
+- BR cmake >= 2.6.2
+- make install/fast
+
 * Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
 - make -libs unconditional
 - Requires: kdebase3 (#507653)
@@ -325,7 +211,7 @@ rm -rf %{buildroot}
 - make qt-devel-doc/qt_ver detection more robust
 
 * Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-1
-- cleanup 
+- cleanup
 
 * Thu Jun 14 2007 Than Ngo <than at redhat.com> - 9:3.4.1-1.fc7
 - 3.4.1
@@ -360,7 +246,7 @@ rm -rf %{buildroot}
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sun Feb 05 2006 Than Ngo <than at redhat.com> 9:3.3.1-1 
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 9:3.3.1-1
 - 3.3.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -420,7 +306,7 @@ rm -rf %{buildroot}
 
 * Thu Sep 02 2004 Than Ngo <than at redhat.com> 3.1.0-2
 - remove kdevelop-gdb_shared_library.patch, it's include in new upstream
-- cleanup specfile 
+- cleanup specfile
 
 * Wed Sep 01 2004 Than Ngo <than at redhat.com> 3.1.0-1
 - update to 3.1.0
@@ -428,7 +314,7 @@ rm -rf %{buildroot}
 * Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.1.0-0.1.rc2
 - update to 3.1.0 rc2
 
-* Sat Jun 19 2004 Than Ngo <than at redhat.com> 3.0.4-1 
+* Sat Jun 19 2004 Than Ngo <than at redhat.com> 3.0.4-1
 - update to 3.0.4
 
 * Thu Apr 15 2004 Than Ngo <than at redhat.com> 3.0.3-2
@@ -680,79 +566,79 @@ rm -rf %{buildroot}
 - updated to 1.4beta1 with KDE2 support
 - fixed to build on s390
 - fixed some broken codes
- 
+
 * Fri Dec 8 2000 Than Ngo <than at redhat.com>
 - fixed for building on ia64
- 
+
 * Wed Nov 15 2000 Than Ngo <than at redhat.com>
 - build snapshot 20001112, it works now with KDE2 and kde1-compat
 - fix libtool to build on sparc and alpha
 - don't use make -j
- 
+
 * Sun Aug 13 2000 Than Ngo <than at redhat.com>
 - fix kdelibsdoc-dir to show kdelibs-1.1.2 html docu correct
- 
+
 * Tue Aug 01 2000 Than Ngo <than at redhat.de>
 - add missing ldconfig in %post and %postun section (Bug #14924)
 - add missing C references stuff to kdevelop
- 
+
 * Sun Jul 30 2000 Than Ngo <than at redhat.de>
 - rebuilt against compat-egcs-c++, put KDE1 under /usr
 - cleanup specfile
- 
+
 * Tue Jul 25 2000 Than Ngo <than at redhat.de>
 - fix dependency problem
- 
+
 * Wed Jul 19 2000 Than Ngo <than at redhat.de>
 - rebuilt against compat-libstdc++
- 
+
 * Mon Jul 17 2000 Than Ngo <than at redhat.de>
 - install under /usr/share instead /usr/lib/kde1-compat/share,
   fix dependency problem
- 
+
 * Sat Jul 15 2000 Than Ngo <than at redhat.de>
 - rebuilt with egcs-c++-1.1.2
 
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
- 
+
 * Mon Jul 03 2000 Than Ngo <than at redhat.de>
 - fix docdir
 - add requires kdebase
- 
+
 * Sun Jul 02 2000 Than Ngo <than at redhat.de>
 - rebuilt with  kde1-compat
- 
+
 * Sun Jun 18 2000 Than Ngo <than at redhat.de>
 - rebuilt in the new build environment, fix docdir
 - FHS packaging
- 
+
 * Thu Jun 08 2000 Than Ngo <than at redhat.de>
 - update to 1.2
 - move from powertools to main CD
 - use %%configure
- 
+
 * Mon Apr 3 2000 Ngo Than <than at redhat.de>
 - fix up reference (Bug #10368)
- 
+
 * Tue Feb 15 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
 - Fix up documentation path (Bug #7291)
 - Update to current stable branch - this should fix up the debugger problem
 - clean up spec file
- 
+
 * Fri Jan  6 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
 - Update to current stable branch
 - Adapt to 6.2 Qt libraries
 - Use BuildPrereq
- 
+
 * Wed Jan 05 2000 Ngo Than <than at redhat.de>
 - added patch for alpha
- 
+
 * Tue Dec 21 1999 Ngo Than <than at redhat.de>
 - updated kdevelop-1.0 release
- 
+
 * Tue Nov 16 1999 Preston Brown <pbrown at redhat.com>
 - kdevelop 1.0beta4.1, docdir added, using DESTDIR env. variable.
- 
+
 * Thu Sep 09 1999 Preston Brown <pbrown at redhat.com>
 - initial packaging for 6.1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	18 Dec 2008 11:48:20 -0000	1.39
+++ sources	29 Sep 2009 23:32:35 -0000	1.40
@@ -1,2 +1 @@
-5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-06aa12a89b2c09968a92e1d8b575819c  kdevelop-3.5.4.tar.bz2
+70064ad0e285d29242a90af3f3c2283f  kdevelop-3.9.95.tar.bz2


--- c_cpp_reference-2.0.2-config.patch DELETED ---


--- kdevelop-2.1.5_for_KDE_3.1-doc.patch DELETED ---


--- kdevelop-3.5.2-kde4template.patch DELETED ---


--- kdevelop-3.5.4-gcc-44.patch DELETED ---



From mathstuf at fedoraproject.org  Tue Sep 29 23:34:36 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 29 Sep 2009 23:34:36 +0000 (UTC)
Subject: rpms/kdevelop/devel kdevelop.spec,1.89,1.90
Message-ID: <20090929233436.DCBB511C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28733

Modified Files:
	kdevelop.spec 
Log Message:
Remove lvillani's changelog entries since things choke on tagging with out-of-order changelogs


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kdevelop.spec	29 Sep 2009 23:32:35 -0000	1.89
+++ kdevelop.spec	29 Sep 2009 23:34:36 -0000	1.90
@@ -119,14 +119,6 @@ rm -rf %{buildroot}
 * Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 9:3.9.95-0.1.beta5
 - Upgrade to 3.9.95
 
-* Sat Feb 21 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 9:3.9.91-0.2.20090221svn929503
-- Post KDevelop 4 Beta 1 snapshot
-
-* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 9:3.9.85.1
-- 4.0 snapshot
-- BR cmake >= 2.6.2
-- make install/fast
-
 * Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
 - make -libs unconditional
 - Requires: kdebase3 (#507653)



From bojan at fedoraproject.org  Tue Sep 29 23:39:40 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 29 Sep 2009 23:39:40 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-10 subversion-api-docs.spec,1.22,1.23
Message-ID: <20090929233940.6CDF811C00C1@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32085

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.5.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-10/subversion-api-docs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- subversion-api-docs.spec	3 Sep 2009 09:06:18 -0000	1.22
+++ subversion-api-docs.spec	29 Sep 2009 23:39:39 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
-Version:        1.6.4
-Release:        2%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Sep 30 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-1
+- bump up to 1.6.5
+
 * Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-2
 - add search
 



From rombobeorn at fedoraproject.org  Tue Sep 29 23:43:11 2009
From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=)
Date: Tue, 29 Sep 2009 23:43:11 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common/F-10
	fedora-gnat-project-common.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090929234311.4136D11C00C1@cvs1.fedora.phx.redhat.com>

Author: rombobeorn

Update of /cvs/pkgs/rpms/fedora-gnat-project-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1079/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-gnat-project-common.spec import.log 
Log Message:
Initial import (#509158).


--- NEW FILE fedora-gnat-project-common.spec ---
Name:           fedora-gnat-project-common
Version:        1.2
Release:        1%{?dist}
Summary:        Files shared by Ada libraries
Summary(sv):    Gemensamma filer f?r adabibliotek

Group:          System Environment/Libraries
License:        Copyright only
URL:            https://fedorahosted.org/released/fedora-gnat-project-common
Source1:        https://fedorahosted.org/released/fedora-gnat-project-common/download/fedora-gnat-project-common-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       gcc-gnat setup

%description
The fedora-gnat-project-common package contains files that are used by the GNAT
project files of multiple Ada libraries, and also GNAT-specific RPM macros.

%description -l sv
Paketet fedora-gnat-project-common inneh?ller filer som anv?nds av
GNAT-projektfilerna f?r flera adabibliotek, samt GNAT-specifika RPM-makron.

# Extract the GNAT project file location from the file of macro definitions so
# that this package won't build-require itself.
%global _GNAT_project_dir %(tar --extract --gzip --to-stdout --no-anchored --file=%{SOURCE1} macros.gnat | grep ^._GNAT_project_dir | sed 's/[^ ]* *//')


%prep
%setup -q -T -b 1


%build
# nothing to do


%install
rm -rf %{buildroot}
mkdir --parents %{buildroot}%{_GNAT_project_dir} %{buildroot}%{_sysconfdir}/profile.d %{buildroot}%{_sysconfdir}/rpm/
cp -p common.gpr %{buildroot}%{_GNAT_project_dir}/
cp -p gnat-project.sh gnat-project.csh %{buildroot}%{_sysconfdir}/profile.d/
cp -p macros.gnat %{buildroot}%{_sysconfdir}/rpm/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_GNAT_project_dir}
%config(noreplace) %{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/rpm/*


%changelog
* Tue Aug 04 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.2-1
- Updated to version 1.2 with a more complete list of processor architectures.

* Thu Jul 23 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-3
- Added a BuildRoot tag even though it's unnecessary.
- Removed a macro reference from the previous changelog entry.
- Silenced some RPMlint warnings.

* Fri Jul 03 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-2
- Renamed the package to fedora-gnat-project-common.
- There is now an "upstream" project at Fedora Hosted.
- Added a license file.
- Replaced "/etc" with _sysconfdir.

* Wed Jul 01 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1-1
- ready to be submitted for review


--- NEW FILE import.log ---
fedora-gnat-project-common-1_2-1_fc11:F-10:fedora-gnat-project-common-1.2-1.fc11.src.rpm:1254267683


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:23:59 -0000	1.1
+++ .cvsignore	29 Sep 2009 23:43:10 -0000	1.2
@@ -0,0 +1 @@
+fedora-gnat-project-common-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:23:59 -0000	1.1
+++ sources	29 Sep 2009 23:43:11 -0000	1.2
@@ -0,0 +1 @@
+acc2b458110c12c378d8749b3d6ffbb5  fedora-gnat-project-common-1.2.tar.gz



From rombobeorn at fedoraproject.org  Wed Sep 30 00:01:33 2009
From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=)
Date: Wed, 30 Sep 2009 00:01:33 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common/F-11
	fedora-gnat-project-common.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930000133.C352B11C0337@cvs1.fedora.phx.redhat.com>

Author: rombobeorn

Update of /cvs/pkgs/rpms/fedora-gnat-project-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11843/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-gnat-project-common.spec import.log 
Log Message:
Initial import (#509158).


--- NEW FILE fedora-gnat-project-common.spec ---
Name:           fedora-gnat-project-common
Version:        1.2
Release:        1%{?dist}
Summary:        Files shared by Ada libraries
Summary(sv):    Gemensamma filer f?r adabibliotek

Group:          System Environment/Libraries
License:        Copyright only
URL:            https://fedorahosted.org/released/fedora-gnat-project-common
Source1:        https://fedorahosted.org/released/fedora-gnat-project-common/download/fedora-gnat-project-common-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       gcc-gnat setup

%description
The fedora-gnat-project-common package contains files that are used by the GNAT
project files of multiple Ada libraries, and also GNAT-specific RPM macros.

%description -l sv
Paketet fedora-gnat-project-common inneh?ller filer som anv?nds av
GNAT-projektfilerna f?r flera adabibliotek, samt GNAT-specifika RPM-makron.

# Extract the GNAT project file location from the file of macro definitions so
# that this package won't build-require itself.
%global _GNAT_project_dir %(tar --extract --gzip --to-stdout --no-anchored --file=%{SOURCE1} macros.gnat | grep ^._GNAT_project_dir | sed 's/[^ ]* *//')


%prep
%setup -q -T -b 1


%build
# nothing to do


%install
rm -rf %{buildroot}
mkdir --parents %{buildroot}%{_GNAT_project_dir} %{buildroot}%{_sysconfdir}/profile.d %{buildroot}%{_sysconfdir}/rpm/
cp -p common.gpr %{buildroot}%{_GNAT_project_dir}/
cp -p gnat-project.sh gnat-project.csh %{buildroot}%{_sysconfdir}/profile.d/
cp -p macros.gnat %{buildroot}%{_sysconfdir}/rpm/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_GNAT_project_dir}
%config(noreplace) %{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/rpm/*


%changelog
* Tue Aug 04 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.2-1
- Updated to version 1.2 with a more complete list of processor architectures.

* Thu Jul 23 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-3
- Added a BuildRoot tag even though it's unnecessary.
- Removed a macro reference from the previous changelog entry.
- Silenced some RPMlint warnings.

* Fri Jul 03 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-2
- Renamed the package to fedora-gnat-project-common.
- There is now an "upstream" project at Fedora Hosted.
- Added a license file.
- Replaced "/etc" with _sysconfdir.

* Wed Jul 01 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1-1
- ready to be submitted for review


--- NEW FILE import.log ---
fedora-gnat-project-common-1_2-1_fc11:F-11:fedora-gnat-project-common-1.2-1.fc11.src.rpm:1254268821


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:23:59 -0000	1.1
+++ .cvsignore	30 Sep 2009 00:01:32 -0000	1.2
@@ -0,0 +1 @@
+fedora-gnat-project-common-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:23:59 -0000	1.1
+++ sources	30 Sep 2009 00:01:33 -0000	1.2
@@ -0,0 +1 @@
+acc2b458110c12c378d8749b3d6ffbb5  fedora-gnat-project-common-1.2.tar.gz



From rombobeorn at fedoraproject.org  Wed Sep 30 00:03:06 2009
From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=)
Date: Wed, 30 Sep 2009 00:03:06 +0000 (UTC)
Subject: rpms/fedora-gnat-project-common/F-12
	fedora-gnat-project-common.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930000306.2ED2111C00C1@cvs1.fedora.phx.redhat.com>

Author: rombobeorn

Update of /cvs/pkgs/rpms/fedora-gnat-project-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12729/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-gnat-project-common.spec import.log 
Log Message:
Initial import (#509158).


--- NEW FILE fedora-gnat-project-common.spec ---
Name:           fedora-gnat-project-common
Version:        1.2
Release:        1%{?dist}
Summary:        Files shared by Ada libraries
Summary(sv):    Gemensamma filer f?r adabibliotek

Group:          System Environment/Libraries
License:        Copyright only
URL:            https://fedorahosted.org/released/fedora-gnat-project-common
Source1:        https://fedorahosted.org/released/fedora-gnat-project-common/download/fedora-gnat-project-common-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       gcc-gnat setup

%description
The fedora-gnat-project-common package contains files that are used by the GNAT
project files of multiple Ada libraries, and also GNAT-specific RPM macros.

%description -l sv
Paketet fedora-gnat-project-common inneh?ller filer som anv?nds av
GNAT-projektfilerna f?r flera adabibliotek, samt GNAT-specifika RPM-makron.

# Extract the GNAT project file location from the file of macro definitions so
# that this package won't build-require itself.
%global _GNAT_project_dir %(tar --extract --gzip --to-stdout --no-anchored --file=%{SOURCE1} macros.gnat | grep ^._GNAT_project_dir | sed 's/[^ ]* *//')


%prep
%setup -q -T -b 1


%build
# nothing to do


%install
rm -rf %{buildroot}
mkdir --parents %{buildroot}%{_GNAT_project_dir} %{buildroot}%{_sysconfdir}/profile.d %{buildroot}%{_sysconfdir}/rpm/
cp -p common.gpr %{buildroot}%{_GNAT_project_dir}/
cp -p gnat-project.sh gnat-project.csh %{buildroot}%{_sysconfdir}/profile.d/
cp -p macros.gnat %{buildroot}%{_sysconfdir}/rpm/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_GNAT_project_dir}
%config(noreplace) %{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/rpm/*


%changelog
* Tue Aug 04 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.2-1
- Updated to version 1.2 with a more complete list of processor architectures.

* Thu Jul 23 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-3
- Added a BuildRoot tag even though it's unnecessary.
- Removed a macro reference from the previous changelog entry.
- Silenced some RPMlint warnings.

* Fri Jul 03 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1.1-2
- Renamed the package to fedora-gnat-project-common.
- There is now an "upstream" project at Fedora Hosted.
- Added a license file.
- Replaced "/etc" with _sysconfdir.

* Wed Jul 01 2009 Bj?rn Persson <bjorn at rombobj?rn.se> - 1-1
- ready to be submitted for review


--- NEW FILE import.log ---
fedora-gnat-project-common-1_2-1_fc11:F-12:fedora-gnat-project-common-1.2-1.fc11.src.rpm:1254268945


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:23:59 -0000	1.1
+++ .cvsignore	30 Sep 2009 00:03:04 -0000	1.2
@@ -0,0 +1 @@
+fedora-gnat-project-common-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnat-project-common/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:23:59 -0000	1.1
+++ sources	30 Sep 2009 00:03:05 -0000	1.2
@@ -0,0 +1 @@
+acc2b458110c12c378d8749b3d6ffbb5  fedora-gnat-project-common-1.2.tar.gz



From bpepple at fedoraproject.org  Wed Sep 30 00:03:21 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 00:03:21 +0000 (UTC)
Subject: rpms/json-glib/devel .cvsignore, 1.3, 1.4 json-glib.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090930000321.850E911C0489@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/json-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12881

Modified Files:
	.cvsignore json-glib.spec sources 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.
- Update source url.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 May 2008 16:34:21 -0000	1.3
+++ .cvsignore	30 Sep 2009 00:03:19 -0000	1.4
@@ -1 +1 @@
-json-glib-0.6.2.tar.gz
+json-glib-0.8.0.tar.bz2


Index: json-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/devel/json-glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- json-glib.spec	25 Jul 2009 04:11:40 -0000	1.5
+++ json-glib.spec	30 Sep 2009 00:03:20 -0000	1.6
@@ -1,14 +1,14 @@
 %define glib_ver 2.15
 
 Name:		json-glib
-Version:	0.6.2
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	Library for JavaScript Object Notation format
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://live.gnome.org/JsonGlib
-Source0:	http://folks.o-hand.com/~ebassi/sources/%{name}-%{version}.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	glib2-devel >= %{glib_ver}
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+- Update source url.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 May 2008 16:34:21 -0000	1.3
+++ sources	30 Sep 2009 00:03:20 -0000	1.4
@@ -1 +1 @@
-d98f5580035ad0b37fa11896053a57af  json-glib-0.6.2.tar.gz
+03d1989e035703a939c1b62115cf08ee  json-glib-0.8.0.tar.bz2



From phuang at fedoraproject.org  Wed Sep 30 00:03:59 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 30 Sep 2009 00:03:59 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 ibus-chewing.spec,1.25,1.26
Message-ID: <20090930000359.59B8111C00C1@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-chewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13429

Modified Files:
	ibus-chewing.spec 
Log Message:
Rebuild with ibus-1.2.0


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ibus-chewing.spec	17 Sep 2009 05:22:12 -0000	1.25
+++ ibus-chewing.spec	30 Sep 2009 00:03:57 -0000	1.26
@@ -1,6 +1,6 @@
 Name:       ibus-chewing
 Version:    1.2.0.20090917
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Sep 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090917-2
+- Rebuild with ibus-1.2.0
+
 * Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.



From smilner at fedoraproject.org  Wed Sep 30 00:05:16 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 30 Sep 2009 00:05:16 +0000 (UTC)
Subject: rpms/python-pygments/F-11 .cvsignore, 1.6, 1.7 python-pygments.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20090930000516.2FF2411C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14070

Modified Files:
	.cvsignore python-pygments.spec sources 
Log Message:
updated for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Nov 2008 03:18:51 -0000	1.6
+++ .cvsignore	30 Sep 2009 00:05:15 -0000	1.7
@@ -1 +1 @@
-Pygments-1.0.tar.gz
+Pygments-1.1.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-11/python-pygments.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-pygments.spec	26 Feb 2009 23:09:48 -0000	1.11
+++ python-pygments.spec	30 Sep 2009 00:05:15 -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-pygments
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
 Group:          Development/Libraries
@@ -53,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1.1-1
+- Updated for release.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Nov 2008 03:18:51 -0000	1.6
+++ sources	30 Sep 2009 00:05:16 -0000	1.7
@@ -1 +1 @@
-70c40ff5331460cabfcb24f86a8d451d  Pygments-1.0.tar.gz
+80ac64669a75e2d6647822b2778e38c8  Pygments-1.1.1.tar.gz



From mathstuf at fedoraproject.org  Wed Sep 30 00:09:20 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 00:09:20 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.15,1.16 sources,1.8,1.9
Message-ID: <20090930000920.3EF3E11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16524

Modified Files:
	krazy2.spec sources 
Log Message:
Update snapshot and build using kdevplatform


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- krazy2.spec	25 Jul 2009 04:46:29 -0000	1.15
+++ krazy2.spec	30 Sep 2009 00:09:19 -0000	1.16
@@ -1,9 +1,6 @@
-# Set to 1 if kdevplatform is available
-%define kdp 0
-
 Name:           krazy2
 Version:        2.9
-Release:        3.20090719svn%{?dist}
+Release:        4.20090928svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -11,13 +8,11 @@ License:        GPLv2+
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 999498 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 1029034 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
 #  tar -c krazy2-2.9 | bzip2 --best -c > krazy2-2.9.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Source1:        krazy-licensecheck
-%if 0%{?kdp}
 Patch0:         krazy2-prefix.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # krazy-licensecheck moved from kdesdk to here in 4.2.0
@@ -29,11 +24,9 @@ BuildRequires:  perl(HTML::Parser)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
-%if 0%{?kdp}
 BuildRequires:  cmake
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdevplatform-devel
-%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
@@ -46,9 +39,7 @@ good reason.
 
 %prep
 %setup -q
-%if 0%{?kdp}
 %patch0
-%endif
 
 
 %build
@@ -58,18 +49,16 @@ pushd src/passbyvalue
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
-%if 0%{?kdp}
 pushd cppchecks
 %{cmake}
 make VERBOSE=1 %{?_smp_mflags}
 popd
-%endif
 
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
+chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,xml}
 pushd helpers
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
     %if "%{_lib}" == "lib64"
@@ -106,50 +95,52 @@ popd
 pushd doc
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
-%if 0%{?kdp}
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 pushd cppchecks
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-%endif
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-# chmod -R ug+w %{buildroot}%{_bindir}
-# chmod -R ug+w %{buildroot}%{_libdir}
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_mandir}/man1/krazy2.1.gz
 %{_mandir}/man1/krazy2all.1.gz
-%{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man1/krazy2xml.1.gz
 %{_mandir}/man5/krazyrc.5.gz
 %{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
-%{_bindir}/krazy2ebn
 %{_bindir}/krazy2xml
-%if 0%{?kdp}
 %{_libdir}/libcpp_parser.so
 %{_libdir}/libcppmodel.so
 %{_libdir}/libpreprocessor.so
 %{_libdir}/libcheckutil.so
 %{_libdir}/libcheckutil.so.1
 %{_libdir}/libcheckutil.so.1.0
-%endif
 %{_libdir}/krazy2/
 %{_datadir}/dtd/
 %{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn
+- Update snapshot
+- krazy2ebn is gone
+- Use kdevplatform by default now
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-3.20090719svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Jul 2009 15:34:49 -0000	1.8
+++ sources	30 Sep 2009 00:09:19 -0000	1.9
@@ -1 +1 @@
-0b2513f67f8ae516a5d7042590080efe  krazy2-2.9.tar.bz2
+eedb968c4a1236ff2b041fa40554aa6d  krazy2-2.9.tar.bz2



From mathstuf at fedoraproject.org  Wed Sep 30 00:11:49 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 00:11:49 +0000 (UTC)
Subject: rpms/krazy2/F-12 krazy2.spec,1.15,1.16 sources,1.8,1.9
Message-ID: <20090930001149.38BB811C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17517

Modified Files:
	krazy2.spec sources 
Log Message:
Update snapshot and build using kdevplatform


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-12/krazy2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- krazy2.spec	25 Jul 2009 04:46:29 -0000	1.15
+++ krazy2.spec	30 Sep 2009 00:11:48 -0000	1.16
@@ -1,9 +1,6 @@
-# Set to 1 if kdevplatform is available
-%define kdp 0
-
 Name:           krazy2
 Version:        2.9
-Release:        3.20090719svn%{?dist}
+Release:        4.20090928svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -11,13 +8,11 @@ License:        GPLv2+
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 999498 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 1029034 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
 #  tar -c krazy2-2.9 | bzip2 --best -c > krazy2-2.9.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Source1:        krazy-licensecheck
-%if 0%{?kdp}
 Patch0:         krazy2-prefix.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # krazy-licensecheck moved from kdesdk to here in 4.2.0
@@ -29,11 +24,9 @@ BuildRequires:  perl(HTML::Parser)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
-%if 0%{?kdp}
 BuildRequires:  cmake
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdevplatform-devel
-%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
@@ -46,9 +39,7 @@ good reason.
 
 %prep
 %setup -q
-%if 0%{?kdp}
 %patch0
-%endif
 
 
 %build
@@ -58,18 +49,16 @@ pushd src/passbyvalue
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
-%if 0%{?kdp}
 pushd cppchecks
 %{cmake}
 make VERBOSE=1 %{?_smp_mflags}
 popd
-%endif
 
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
+chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,xml}
 pushd helpers
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
     %if "%{_lib}" == "lib64"
@@ -106,50 +95,52 @@ popd
 pushd doc
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
-%if 0%{?kdp}
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 pushd cppchecks
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-%endif
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-# chmod -R ug+w %{buildroot}%{_bindir}
-# chmod -R ug+w %{buildroot}%{_libdir}
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_mandir}/man1/krazy2.1.gz
 %{_mandir}/man1/krazy2all.1.gz
-%{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man1/krazy2xml.1.gz
 %{_mandir}/man5/krazyrc.5.gz
 %{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
-%{_bindir}/krazy2ebn
 %{_bindir}/krazy2xml
-%if 0%{?kdp}
 %{_libdir}/libcpp_parser.so
 %{_libdir}/libcppmodel.so
 %{_libdir}/libpreprocessor.so
 %{_libdir}/libcheckutil.so
 %{_libdir}/libcheckutil.so.1
 %{_libdir}/libcheckutil.so.1.0
-%endif
 %{_libdir}/krazy2/
 %{_datadir}/dtd/
 %{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn
+- Update snapshot
+- krazy2ebn is gone
+- Use kdevplatform by default now
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-3.20090719svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Jul 2009 15:34:49 -0000	1.8
+++ sources	30 Sep 2009 00:11:48 -0000	1.9
@@ -1 +1 @@
-0b2513f67f8ae516a5d7042590080efe  krazy2-2.9.tar.bz2
+eedb968c4a1236ff2b041fa40554aa6d  krazy2-2.9.tar.bz2



From smilner at fedoraproject.org  Wed Sep 30 00:12:22 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 30 Sep 2009 00:12:22 +0000 (UTC)
Subject: rpms/python-pygments/F-10 .cvsignore, 1.6, 1.7 python-pygments.spec,
	1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20090930001222.A113111C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17748

Modified Files:
	.cvsignore python-pygments.spec sources 
Log Message:
update for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Nov 2008 03:36:10 -0000	1.6
+++ .cvsignore	30 Sep 2009 00:12:22 -0000	1.7
@@ -1 +1 @@
-Pygments-1.0.tar.gz
+Pygments-1.1.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-10/python-pygments.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-pygments.spec	22 Dec 2008 02:07:30 -0000	1.9
+++ python-pygments.spec	30 Sep 2009 00:12:22 -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-pygments
-Version:        1.0
-Release:        3%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
 Group:          Development/Libraries
@@ -53,9 +53,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1.1-1
+- Updated for release.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 21 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.0-3
 - Updated for release.
 
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0-2
+- Rebuild for Python 2.6
+
 * Fri Nov 27 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.0-1
 - Updated for upstream 1.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Nov 2008 03:36:10 -0000	1.6
+++ sources	30 Sep 2009 00:12:22 -0000	1.7
@@ -1 +1 @@
-70c40ff5331460cabfcb24f86a8d451d  Pygments-1.0.tar.gz
+80ac64669a75e2d6647822b2778e38c8  Pygments-1.1.1.tar.gz



From mathstuf at fedoraproject.org  Wed Sep 30 00:13:47 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 00:13:47 +0000 (UTC)
Subject: rpms/krazy2/F-11 krazy2.spec,1.13,1.14 sources,1.8,1.9
Message-ID: <20090930001347.6F7FF11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18192

Modified Files:
	krazy2.spec sources 
Log Message:
Update snapshot and build using kdevplatform


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-11/krazy2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- krazy2.spec	20 Jul 2009 15:44:19 -0000	1.13
+++ krazy2.spec	30 Sep 2009 00:13:47 -0000	1.14
@@ -1,9 +1,6 @@
-# Set to 1 if kdevplatform is available
-%define kdp 0
-
 Name:           krazy2
 Version:        2.9
-Release:        2.20090719svn%{?dist}
+Release:        4.20090928svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -11,13 +8,11 @@ License:        GPLv2+
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 999498 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 1029034 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
 #  tar -c krazy2-2.9 | bzip2 --best -c > krazy2-2.9.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Source1:        krazy-licensecheck
-%if 0%{?kdp}
 Patch0:         krazy2-prefix.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # krazy-licensecheck moved from kdesdk to here in 4.2.0
@@ -29,11 +24,9 @@ BuildRequires:  perl(HTML::Parser)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
-%if 0%{?kdp}
 BuildRequires:  cmake
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdevplatform-devel
-%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
@@ -46,9 +39,7 @@ good reason.
 
 %prep
 %setup -q
-%if 0%{?kdp}
 %patch0
-%endif
 
 
 %build
@@ -58,18 +49,16 @@ pushd src/passbyvalue
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
-%if 0%{?kdp}
 pushd cppchecks
 %{cmake}
 make VERBOSE=1 %{?_smp_mflags}
 popd
-%endif
 
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
+chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,xml}
 pushd helpers
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
     %if "%{_lib}" == "lib64"
@@ -106,50 +95,55 @@ popd
 pushd doc
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
-%if 0%{?kdp}
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 pushd cppchecks
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-%endif
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-# chmod -R ug+w %{buildroot}%{_bindir}
-# chmod -R ug+w %{buildroot}%{_libdir}
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_mandir}/man1/krazy2.1.gz
 %{_mandir}/man1/krazy2all.1.gz
-%{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man1/krazy2xml.1.gz
 %{_mandir}/man5/krazyrc.5.gz
 %{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
-%{_bindir}/krazy2ebn
 %{_bindir}/krazy2xml
-%if 0%{?kdp}
 %{_libdir}/libcpp_parser.so
 %{_libdir}/libcppmodel.so
 %{_libdir}/libpreprocessor.so
 %{_libdir}/libcheckutil.so
 %{_libdir}/libcheckutil.so.1
 %{_libdir}/libcheckutil.so.1.0
-%endif
 %{_libdir}/krazy2/
 %{_datadir}/dtd/
 %{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn
+- Update snapshot
+- krazy2ebn is gone
+- Use kdevplatform by default now
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-3.20090719svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 20 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-2.20090719svn
 - Fix %%changelog
 - Fix CVS mistakes (update tarball)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Jul 2009 15:44:19 -0000	1.8
+++ sources	30 Sep 2009 00:13:47 -0000	1.9
@@ -1 +1 @@
-0b2513f67f8ae516a5d7042590080efe  krazy2-2.9.tar.bz2
+eedb968c4a1236ff2b041fa40554aa6d  krazy2-2.9.tar.bz2



From mathstuf at fedoraproject.org  Wed Sep 30 00:15:04 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 00:15:04 +0000 (UTC)
Subject: rpms/krazy2/F-10 krazy2.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <20090930001504.7118811C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18603

Modified Files:
	krazy2.spec sources 
Log Message:
Update snapshot and build using kdevplatform


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/krazy2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- krazy2.spec	20 Jul 2009 15:56:28 -0000	1.5
+++ krazy2.spec	30 Sep 2009 00:15:04 -0000	1.6
@@ -1,9 +1,6 @@
-# Set to 1 if kdevplatform is available
-%define kdp 0
-
 Name:           krazy2
 Version:        2.9
-Release:        2.20090719svn%{?dist}
+Release:        4.20090928svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -11,13 +8,11 @@ License:        GPLv2+
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 999498 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 1029034 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
 #  tar -c krazy2-2.9 | bzip2 --best -c > krazy2-2.9.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Source1:        krazy-licensecheck
-%if 0%{?kdp}
 Patch0:         krazy2-prefix.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # krazy-licensecheck moved from kdesdk to here in 4.2.0
@@ -29,11 +24,9 @@ BuildRequires:  perl(HTML::Parser)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
-%if 0%{?kdp}
 BuildRequires:  cmake
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdevplatform-devel
-%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
@@ -46,9 +39,7 @@ good reason.
 
 %prep
 %setup -q
-%if 0%{?kdp}
 %patch0
-%endif
 
 
 %build
@@ -58,18 +49,16 @@ pushd src/passbyvalue
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
-%if 0%{?kdp}
 pushd cppchecks
 %{cmake}
 make VERBOSE=1 %{?_smp_mflags}
 popd
-%endif
 
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
+chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,xml}
 pushd helpers
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
     %if "%{_lib}" == "lib64"
@@ -106,50 +95,55 @@ popd
 pushd doc
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
-%if 0%{?kdp}
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 pushd cppchecks
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
-%endif
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-# chmod -R ug+w %{buildroot}%{_bindir}
-# chmod -R ug+w %{buildroot}%{_libdir}
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_mandir}/man1/krazy2.1.gz
 %{_mandir}/man1/krazy2all.1.gz
-%{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man1/krazy2xml.1.gz
 %{_mandir}/man5/krazyrc.5.gz
 %{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
-%{_bindir}/krazy2ebn
 %{_bindir}/krazy2xml
-%if 0%{?kdp}
 %{_libdir}/libcpp_parser.so
 %{_libdir}/libcppmodel.so
 %{_libdir}/libpreprocessor.so
 %{_libdir}/libcheckutil.so
 %{_libdir}/libcheckutil.so.1
 %{_libdir}/libcheckutil.so.1.0
-%endif
 %{_libdir}/krazy2/
 %{_datadir}/dtd/
 %{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn
+- Update snapshot
+- krazy2ebn is gone
+- Use kdevplatform by default now
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-3.20090719svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 20 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-2.20090719svn
 - Fix %%changelog
 - Fix CVS mistakes (update tarball)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Jul 2009 15:56:28 -0000	1.6
+++ sources	30 Sep 2009 00:15:04 -0000	1.7
@@ -1 +1 @@
-0b2513f67f8ae516a5d7042590080efe  krazy2-2.9.tar.bz2
+eedb968c4a1236ff2b041fa40554aa6d  krazy2-2.9.tar.bz2



From mathstuf at fedoraproject.org  Wed Sep 30 00:19:45 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 00:19:45 +0000 (UTC)
Subject: rpms/krazy2/F-11 krazy2.spec,1.14,1.15
Message-ID: <20090930001945.C0B7C11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20232

Modified Files:
	krazy2.spec 
Log Message:
Bump dist release for newRepo task


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-11/krazy2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- krazy2.spec	30 Sep 2009 00:13:47 -0000	1.14
+++ krazy2.spec	30 Sep 2009 00:19:45 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.9
-Release:        4.20090928svn%{?dist}
+Release:        4.20090928svn%{?dist}.1
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -136,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn.1
+- Wait for newRepo task
+
 * Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn
 - Update snapshot
 - krazy2ebn is gone



From bpepple at fedoraproject.org  Wed Sep 30 00:21:22 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 00:21:22 +0000 (UTC)
Subject: rpms/json-glib/F-12 .cvsignore, 1.3, 1.4 json-glib.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090930002123.0051511C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/json-glib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20946

Modified Files:
	.cvsignore json-glib.spec sources 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.
- Update source url.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 May 2008 16:34:21 -0000	1.3
+++ .cvsignore	30 Sep 2009 00:21:22 -0000	1.4
@@ -1 +1 @@
-json-glib-0.6.2.tar.gz
+json-glib-0.8.0.tar.bz2


Index: json-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/F-12/json-glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- json-glib.spec	25 Jul 2009 04:11:40 -0000	1.5
+++ json-glib.spec	30 Sep 2009 00:21:22 -0000	1.6
@@ -1,14 +1,14 @@
 %define glib_ver 2.15
 
 Name:		json-glib
-Version:	0.6.2
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	Library for JavaScript Object Notation format
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://live.gnome.org/JsonGlib
-Source0:	http://folks.o-hand.com/~ebassi/sources/%{name}-%{version}.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	glib2-devel >= %{glib_ver}
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+- Update source url.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 May 2008 16:34:21 -0000	1.3
+++ sources	30 Sep 2009 00:21:22 -0000	1.4
@@ -1 +1 @@
-d98f5580035ad0b37fa11896053a57af  json-glib-0.6.2.tar.gz
+03d1989e035703a939c1b62115cf08ee  json-glib-0.8.0.tar.bz2



From mathstuf at fedoraproject.org  Wed Sep 30 00:21:52 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 00:21:52 +0000 (UTC)
Subject: rpms/krazy2/F-10 krazy2.spec,1.6,1.7
Message-ID: <20090930002152.6175F11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21175

Modified Files:
	krazy2.spec 
Log Message:
Bump dist release for newRepo task


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/krazy2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- krazy2.spec	30 Sep 2009 00:15:04 -0000	1.6
+++ krazy2.spec	30 Sep 2009 00:21:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.9
-Release:        4.20090928svn%{?dist}
+Release:        4.20090928svn%{?dist}.1
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -136,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn.1
+- Wait for newRepo task
+
 * Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-4.20090928svn
 - Update snapshot
 - krazy2ebn is gone



From smilner at fedoraproject.org  Wed Sep 30 00:28:25 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 30 Sep 2009 00:28:25 +0000 (UTC)
Subject: rpms/python-pygments/EL-5 .cvsignore, 1.3, 1.4 python-pygments.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090930002825.2914C11C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24340

Modified Files:
	.cvsignore python-pygments.spec sources 
Log Message:
update for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Nov 2007 01:18:38 -0000	1.3
+++ .cvsignore	30 Sep 2009 00:28:24 -0000	1.4
@@ -1 +1 @@
-Pygments-0.9.tar.gz
+Pygments-1.1.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/EL-5/python-pygments.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-pygments.spec	29 Nov 2007 14:27:53 -0000	1.4
+++ python-pygments.spec	30 Sep 2009 00:28:24 -0000	1.5
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pygments
-Version:        0.9
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
 Group:          Development/Libraries
@@ -53,6 +53,30 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1.1-1
+- Updated for release.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.0-3
+- Updated for release.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0-2
+- Rebuild for Python 2.6
+
+* Fri Nov 27 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.0-1
+- Updated for upstream 1.0.
+
+* Sun Sep 14 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.11.1-1
+- Updated for upstream 0.11.
+
+* Mon Jul 21 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.10-1
+- Updated for upstream 0.10.
+
 * Thu Nov 29 2007 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.9-2
 - Added python-setuptools as a Requires per bz#403601.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Nov 2007 01:18:38 -0000	1.3
+++ sources	30 Sep 2009 00:28:24 -0000	1.4
@@ -1 +1 @@
-8cdce901a66c0febb576955e90814485  Pygments-0.9.tar.gz
+80ac64669a75e2d6647822b2778e38c8  Pygments-1.1.1.tar.gz



From smilner at fedoraproject.org  Wed Sep 30 00:30:18 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 30 Sep 2009 00:30:18 +0000 (UTC)
Subject: rpms/python-pygments/EL-4 .cvsignore, 1.6, 1.7 python-pygments.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090930003018.B3F6D11C048B@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25039

Modified Files:
	.cvsignore python-pygments.spec sources 
Log Message:
update for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Nov 2008 03:18:51 -0000	1.6
+++ .cvsignore	30 Sep 2009 00:30:18 -0000	1.7
@@ -1 +1 @@
-Pygments-1.0.tar.gz
+Pygments-1.1.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/EL-4/python-pygments.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-pygments.spec	26 Jul 2009 20:56:10 -0000	1.12
+++ python-pygments.spec	30 Sep 2009 00:30:18 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pygments
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1.1-1
+- Updated for release.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Nov 2008 03:18:51 -0000	1.6
+++ sources	30 Sep 2009 00:30:18 -0000	1.7
@@ -1 +1 @@
-70c40ff5331460cabfcb24f86a8d451d  Pygments-1.0.tar.gz
+80ac64669a75e2d6647822b2778e38c8  Pygments-1.1.1.tar.gz



From bpepple at fedoraproject.org  Wed Sep 30 00:33:29 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 00:33:29 +0000 (UTC)
Subject: rpms/twitter-glib/devel twitter-glib.spec,1.3,1.4
Message-ID: <20090930003329.B9EDC11C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/twitter-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26484

Modified Files:
	twitter-glib.spec 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.8-4
- Rebuild for new json-glib.



Index: twitter-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twitter-glib/devel/twitter-glib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- twitter-glib.spec	7 Aug 2009 12:16:49 -0000	1.3
+++ twitter-glib.spec	30 Sep 2009 00:33:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           twitter-glib
 Version:        0.9.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library wrapping the Twitter RESTful API
 
 Group:          System Environment/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.8-4
+- Rebuild for new json-glib.
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.8-3
 - A few minor spec file cleanups
 



From rdieter at fedoraproject.org  Wed Sep 30 00:42:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 00:42:32 +0000 (UTC)
Subject: rpms/koffice/F-12 koffice-1.6.3-no_kexi_examples.patch, NONE,
	1.1 koffice.spec, 1.121, 1.122
Message-ID: <20090930004232.8B40711C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31001

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-no_kexi_examples.patch 
Log Message:
try to workaround kexi/examples borkage


koffice-1.6.3-no_kexi_examples.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE koffice-1.6.3-no_kexi_examples.patch ---
diff -up koffice-1.6.3/kexi/Makefile.am.no_kexi_examples koffice-1.6.3/kexi/Makefile.am
--- koffice-1.6.3/kexi/Makefile.am.no_kexi_examples	2007-05-30 16:36:09.000000000 -0500
+++ koffice-1.6.3/kexi/Makefile.am	2009-09-29 19:40:47.418252396 -0500
@@ -8,7 +8,7 @@ kexi_la_LDFLAGS = $(all_libraries) -modu
 kexi_la_LIBADD = ./core/libkexicore.la ./main/libkeximain.la
 
 SUBDIRS= 3rdparty kexiutils kexidb core widget formeditor \
-data pics main migration plugins . tests examples tools
+data pics main migration plugins . tests tools
 
 #(will be reenabled after main/startup move)
 


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/koffice.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- koffice.spec	26 Sep 2009 18:19:02 -0000	1.121
+++ koffice.spec	30 Sep 2009 00:42:31 -0000	1.122
@@ -49,6 +49,9 @@ Patch3: koffice-1.6.3-gcc43.patch
 # drop need/use of local fonts, use dejavu instead of arev
 Patch4: koffice-1.6.3-dejavu_fonts.patch
 
+# skip/omit kexi examples (which crash on ppc)
+Patch5: koffice-1.6.3-no_kexi_examples.patch
+
 # BuildRequires: world-devel ;)
 BuildRequires:  %{kdelibs3}-devel
 # See http://bugzilla.redhat.com/244091
@@ -75,7 +78,6 @@ BuildRequires:  perl
 BuildRequires:  wv2-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
-BuildRequires:  aspell-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
@@ -95,6 +97,7 @@ BuildRequires: libwpd-devel
 %define libwpd 1
 BuildRequires: poppler-qt-devel
 %endif
+#BuildRequires: sqlite-devel
 
 
 %description
@@ -281,6 +284,8 @@ sed -i.dejavu-lgc \
   -e 's|dejavu sans|dejavu lgc sans|' \
   lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
 
+%patch -p1 -b .no_kexi_examples
+
 %patch50 -p1 -b glibc_strrchr
 
 # hack/fix for newer automake



From rdieter at fedoraproject.org  Wed Sep 30 00:43:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 00:43:00 +0000 (UTC)
Subject: rpms/koffice/F-12 koffice.spec,1.122,1.123
Message-ID: <20090930004300.A66BF11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31407

Modified Files:
	koffice.spec 
Log Message:
fix patch



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/koffice.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- koffice.spec	30 Sep 2009 00:42:31 -0000	1.122
+++ koffice.spec	30 Sep 2009 00:43:00 -0000	1.123
@@ -284,7 +284,7 @@ sed -i.dejavu-lgc \
   -e 's|dejavu sans|dejavu lgc sans|' \
   lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
 
-%patch -p1 -b .no_kexi_examples
+%patch5 -p1 -b .no_kexi_examples
 
 %patch50 -p1 -b glibc_strrchr
 



From steved at fedoraproject.org  Wed Sep 30 00:52:01 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 30 Sep 2009 00:52:01 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-mount-vers4.patch, NONE,
	1.1 nfs-utils-1.2.1-rc6.patch, NONE, 1.1 nfs-utils.spec, 1.242, 1.243
Message-ID: <20090930005201.6F29411C00C1@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2900

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-mount-vers4.patch nfs-utils-1.2.1-rc6.patch 
Log Message:
- Added upstream 1.2.1-rc5 patch
  - mount.nfs: Support negotiation between v4, v3, and v2
  - mount.nfs: Keep server's address in nfsmount_info
  - mount.nfs: Sandbox each mount attempt
  - mount.nfs: Support negotiation between v4, v3, and v2


nfs-utils-1.2.0-mount-vers4.patch:
 nfsmount.conf |    6 +++---
 stropts.c     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE nfs-utils-1.2.0-mount-vers4.patch ---
diff -up nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig nfs-utils-1.2.0/utils/mount/nfsmount.conf
--- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-09-29 18:48:47.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-09-29 19:02:06.000000000 -0400
@@ -24,12 +24,12 @@
 # All reads and writes to the 'nfsserver.foo.com' server 
 # will be done with 32k (32768 bytes) block sizes.
 #
-#[ NFSMount_Global_Options ]
+[ NFSMount_Global_Options ]
 # This statically named section defines global mount 
 # options that can be applied on all NFS mount.
 #
-# Protocol Version [2,3]
-# Nfsvers=3
+# Protocol Version [2,3,4]
+#Nfsvers=3
 # Network Transport [Udp,Tcp,Rdma]
 # Proto=Tcp
 #
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-29 18:48:47.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-29 19:01:10.000000000 -0400
@@ -601,7 +601,7 @@ static int nfs_try_mount(struct nfsmount
 
 	switch (mi->version) {
 	case 0:
-		if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
+		if (linux_version_code() >= MAKE_VERSION(2, 6, 31)) {
 			errno = 0;
 			result = nfs_try_mount_v4(mi);
 			if (errno != EPROTONOSUPPORT)

nfs-utils-1.2.1-rc6.patch:
 parse_opt.c |   65 +++++++++++++++++++++++++
 parse_opt.h |    1 
 stropts.c   |  156 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 194 insertions(+), 28 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc6.patch ---
diff --git a/utils/mount/parse_opt.c b/utils/mount/parse_opt.c
index 1dfee8a..f0918f7 100644
--- a/utils/mount/parse_opt.c
+++ b/utils/mount/parse_opt.c
@@ -101,6 +101,37 @@ fail:
 	return NULL;
 }
 
+static struct mount_option *option_dup(const struct mount_option *option)
+{
+	struct mount_option *new;
+
+	new = malloc(sizeof(*new));
+	if (!new)
+		return NULL;
+	
+	new->next = NULL;
+	new->prev = NULL;
+
+	new->keyword = strdup(option->keyword);
+	if (!new->keyword)
+		goto fail;
+
+	new->value = NULL;
+	if (option->value) {
+		new->value = strdup(option->value);
+		if (!new->value) {
+			free(new->keyword);
+			goto fail;
+		}
+	}
+
+	return new;
+
+fail:
+	free(new);
+	return NULL;
+}
+
 static void option_destroy(struct mount_option *option)
 {
 	free(option->keyword);
@@ -229,6 +260,40 @@ fail:
 }
 
 /**
+ * po_dup - duplicate an existing list of options
+ * @options: pointer to mount options
+ *
+ */
+struct mount_options *po_dup(struct mount_options *source)
+{
+	struct mount_options *target;
+	struct mount_option *current;
+
+	if (!source)
+		return NULL;
+
+	target = options_create();
+	if (options_empty(source) || target == NULL)
+		return target;
+
+	current = source->head;
+	while (target->count < source->count) {
+		struct mount_option *option;
+
+		option = option_dup(current);
+		if (!option) {
+			po_destroy(target);
+			return NULL;
+		}
+
+		options_tail_insert(target, option);
+		current = current->next;
+	}
+
+	return target;
+}
+
+/**
  * po_replace - replace mount options in one mount_options object with another
  * @target: pointer to previously instantiated object to replace
  * @source: pointer to object containing source mount options
diff --git a/utils/mount/parse_opt.h b/utils/mount/parse_opt.h
index f9243c3..2c0b5f4 100644
--- a/utils/mount/parse_opt.h
+++ b/utils/mount/parse_opt.h
@@ -38,6 +38,7 @@ typedef enum {
 struct mount_options;
 
 struct mount_options *	po_split(char *);
+struct mount_options *	po_dup(struct mount_options *);
 void			po_replace(struct mount_options *,
 				   struct mount_options *);
 po_return_t		po_join(struct mount_options *, char **);
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 3eb661e..069bdc1 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -80,6 +80,8 @@ struct nfsmount_info {
 				*node,		/* mounted-on dir */
 				*type;		/* "nfs" or "nfs4" */
 	char			*hostname;	/* server's hostname */
+	struct sockaddr_storage	address;	/* server's address */
+	socklen_t		salen;		/* size of server's address */
 
 	struct mount_options	*options;	/* parsed mount options */
 	char			**extra_opts;	/* string for /etc/mtab */
@@ -257,47 +259,35 @@ static int nfs_append_sloppy_option(struct mount_options *options)
 }
 
 /*
- * Set up mandatory NFS mount options.
+ * Set up mandatory non-version specific NFS mount options.
  *
  * Returns 1 if successful; otherwise zero.
  */
 static int nfs_validate_options(struct nfsmount_info *mi)
 {
-	struct sockaddr_storage dummy;
-	struct sockaddr *sap = (struct sockaddr *)&dummy;
-	socklen_t salen = sizeof(dummy);
+	struct sockaddr *sap = (struct sockaddr *)&mi->address;
 
 	if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
 		return 0;
 
-	if (!nfs_name_to_address(mi->hostname, sap, &salen))
+	mi->salen = sizeof(mi->address);
+	if (!nfs_name_to_address(mi->hostname, sap, &mi->salen))
 		return 0;
 
 	if (!nfs_nfs_version(mi->options, &mi->version))
 		return 0;
 	if (strncmp(mi->type, "nfs4", 4) == 0)
 		mi->version = 4;
-
-	if (mi->version == 4) {
-		if (!nfs_append_clientaddr_option(sap, salen, mi->options))
-			return 0;
-	} else {
-		if (!nfs_fix_mounthost_option(mi->options))
-			return 0;
-		if (!mi->fake && !nfs_verify_lock_option(mi->options))
-			return 0;
+	else {
+		char *option = po_get(mi->options, "proto");
+		if (option && strcmp(option, "rdma") == 0)
+			mi->version = 3;
 	}
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;
 
-	if (!nfs_append_addr_option(sap, salen, mi->options))
-		return 0;
-
-	/*
-	 * Update option string to be recorded in /etc/mnttab
-	 */
-	if (po_join(mi->options, mi->extra_opts) == PO_FAILED)
+	if (!nfs_append_addr_option(sap, mi->salen, mi->options))
 		return 0;
 
 	return 1;
@@ -489,17 +479,12 @@ out:
  * Returns TRUE if successful, otherwise FALSE.
  * "errno" is set to reflect the individual error.
  */
-static int nfs_try_mount(struct nfsmount_info *mi)
+static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts)
 {
 	char *options = NULL;
 	int result;
 
-	if (mi->version != 4) {
-		if (!nfs_rewrite_pmap_mount_options(mi->options))
-			return 0;
-	}
-
-	if (po_join(mi->options, &options) == PO_FAILED) {
+	if (po_join(opts, &options) == PO_FAILED) {
 		errno = EIO;
 		return 0;
 	}
@@ -522,6 +507,121 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 }
 
 /*
+ * For "-t nfs vers=2" or "-t nfs vers=3" mounts.
+ */
+static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
+{
+	struct mount_options *options = po_dup(mi->options);
+	int result = 0;
+
+	if (!options) {
+		errno = ENOMEM;
+		return result;
+	}
+
+	if (!nfs_fix_mounthost_option(options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+	if (!mi->fake && !nfs_verify_lock_option(options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+
+	/*
+	 * Options we negotiate below may be stale by the time this
+	 * file system is unmounted.  In order to force umount.nfs
+	 * to renegotiate with the server, only write the user-
+	 * specified options, and not negotiated options, to /etc/mtab.
+	 */
+	if (po_join(options, mi->extra_opts) == PO_FAILED) {
+		errno = ENOMEM;
+		goto out_fail;
+	}
+
+	if (!nfs_rewrite_pmap_mount_options(options))
+		goto out_fail;
+
+	result = nfs_sys_mount(mi, options);
+
+out_fail:
+	po_destroy(options);
+	return result;
+}
+
+/*
+ * For "-t nfs -o vers=4" or "-t nfs4" mounts.
+ */
+static int nfs_try_mount_v4(struct nfsmount_info *mi)
+{
+	struct sockaddr *sap = (struct sockaddr *)&mi->address;
+	struct mount_options *options = po_dup(mi->options);
+	int result = 0;
+
+	if (!options) {
+		errno = ENOMEM;
+		return result;
+	}
+
+	if (mi->version == 0) {
+		if (po_append(options, "vers=4") == PO_FAILED) {
+			errno = EINVAL;
+			goto out_fail;
+		}
+	}
+
+	if (!nfs_append_clientaddr_option(sap, mi->salen, options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+	/*
+	 * Update option string to be recorded in /etc/mtab.
+	 */
+	if (po_join(options, mi->extra_opts) == PO_FAILED) {
+		errno = ENOMEM;
+		return 0;
+	}
+
+	result = nfs_sys_mount(mi, options);
+
+out_fail:
+	po_destroy(options);
+	return result;
+}
+
+/*
+ * This is a single pass through the fg/bg loop.
+ *
+ * Returns TRUE if successful, otherwise FALSE.
+ * "errno" is set to reflect the individual error.
+ */
+static int nfs_try_mount(struct nfsmount_info *mi)
+{
+	int result = 0;
+
+	switch (mi->version) {
+	case 0:
+		if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
+			errno = 0;
+			result = nfs_try_mount_v4(mi);
+			if (errno != EPROTONOSUPPORT)
+				break;
+		}
+	case 2:
+	case 3:
+		result = nfs_try_mount_v3v2(mi);
+		break;
+	case 4:
+		result = nfs_try_mount_v4(mi);
+		break;
+	default:
+		errno = EIO;
+	}
+
+	return result;
+}
+
+/*
  * Distinguish between permanent and temporary errors.
  *
  * Basically, we retry if communication with the server has


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- nfs-utils.spec	23 Sep 2009 20:09:06 -0000	1.242
+++ nfs-utils.spec	30 Sep 2009 00:52:00 -0000	1.243
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -27,6 +27,8 @@ Patch101: nfs-utils-1.2.1-rc2.patch
 Patch102: nfs-utils-1.2.1-rc3.patch
 Patch103: nfs-utils-1.2.1-rc4.patch
 Patch104: nfs-utils-1.2.1-rc5.patch
+Patch105: nfs-utils-1.2.1-rc6.patch
+Patch106: nfs-utils-1.2.0-mount-vers4.patch
 
 Patch200: nfs-utils-1.2.0-v4root-rel6.patch
 
@@ -85,6 +87,8 @@ This package also contains the mount.nfs
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
+%patch106 -p1
 
 %patch200 -p1
 
@@ -258,6 +262,13 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Sep 29 2009 Steve Dickson <steved at redhat.com> 1.2.0-13
+- Added upstream 1.2.1-rc5 patch
+  - mount.nfs: Support negotiation between v4, v3, and v2
+  - mount.nfs: Keep server's address in nfsmount_info
+  - mount.nfs: Sandbox each mount attempt
+  - mount.nfs: Support negotiation between v4, v3, and v2
+
 * Wed Sep 23 2009 Steve Dickson <steved at redhat.com> 1.2.0-12
 - Updated to the latest pseudo root release (rel6).
 



From bpepple at fedoraproject.org  Wed Sep 30 00:52:40 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 00:52:40 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel purple-facebookchat.spec,1.18,1.19
Message-ID: <20090930005240.5F78B11C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3394

Modified Files:
	purple-facebookchat.spec 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.61-2
- Rebuild for new json-glib.
* Tue Jul 23 2009 Ismael Olea <ismael at olea.org> 1.60-1
- updating to 1.60
- adding new sourcecode files to makefile



Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- purple-facebookchat.spec	12 Sep 2009 11:22:25 -0000	1.18
+++ purple-facebookchat.spec	30 Sep 2009 00:52:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.61
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.61-2
+- Rebuild for new json-glib.
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1
 - updating to 1.61
 %changelog



From airlied at fedoraproject.org  Wed Sep 30 00:54:01 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 30 Sep 2009 00:54:01 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 xorg-x11-drv-ati.spec,1.187,1.188
Message-ID: <20090930005401.C8FF411C00C1@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4390

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.6.20090929git7968e1fb8
- mixed appears to break r600 for some reason need to investigate disable for
  beta



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/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	29 Sep 2009 03:26:31 -0000	1.187
+++ xorg-x11-drv-ati.spec	30 Sep 2009 00:54:01 -0000	1.188
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.5.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.6.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -48,7 +48,7 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
-%patch14 -p1 -b .mix
+#%patch14 -p1 -b .mix
 
 %build
 autoreconf -iv
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.6.20090929git7968e1fb8
+- mixed appears to break r600 for some reason need to investigate disable for
+  beta
+
 * Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.5.20090929git7968e1fb8
 - rebase to latest upstream for vline fixes and zaphod fixes
 



From steved at fedoraproject.org  Wed Sep 30 00:57:48 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 30 Sep 2009 00:57:48 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.0-mount-vers4.patch, NONE,
	1.1 nfs-utils-1.2.1-rc6.patch, NONE, 1.1 nfs-utils.spec, 1.242, 1.243
Message-ID: <20090930005748.AB9F211C00C1@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6167

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-mount-vers4.patch nfs-utils-1.2.1-rc6.patch 
Log Message:
- Added upstream 1.2.1-rc5 patch
  - mount.nfs: Support negotiation between v4, v3, and v2
  - mount.nfs: Keep server's address in nfsmount_info
  - mount.nfs: Sandbox each mount attempt
  - mount.nfs: Support negotiation between v4, v3, and v2


nfs-utils-1.2.0-mount-vers4.patch:
 nfsmount.conf |    6 +++---
 stropts.c     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE nfs-utils-1.2.0-mount-vers4.patch ---
diff -up nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig nfs-utils-1.2.0/utils/mount/nfsmount.conf
--- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-09-29 18:48:47.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-09-29 19:02:06.000000000 -0400
@@ -24,12 +24,12 @@
 # All reads and writes to the 'nfsserver.foo.com' server 
 # will be done with 32k (32768 bytes) block sizes.
 #
-#[ NFSMount_Global_Options ]
+[ NFSMount_Global_Options ]
 # This statically named section defines global mount 
 # options that can be applied on all NFS mount.
 #
-# Protocol Version [2,3]
-# Nfsvers=3
+# Protocol Version [2,3,4]
+#Nfsvers=3
 # Network Transport [Udp,Tcp,Rdma]
 # Proto=Tcp
 #
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-29 18:48:47.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-29 19:01:10.000000000 -0400
@@ -601,7 +601,7 @@ static int nfs_try_mount(struct nfsmount
 
 	switch (mi->version) {
 	case 0:
-		if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
+		if (linux_version_code() >= MAKE_VERSION(2, 6, 31)) {
 			errno = 0;
 			result = nfs_try_mount_v4(mi);
 			if (errno != EPROTONOSUPPORT)

nfs-utils-1.2.1-rc6.patch:
 parse_opt.c |   65 +++++++++++++++++++++++++
 parse_opt.h |    1 
 stropts.c   |  156 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 194 insertions(+), 28 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc6.patch ---
diff --git a/utils/mount/parse_opt.c b/utils/mount/parse_opt.c
index 1dfee8a..f0918f7 100644
--- a/utils/mount/parse_opt.c
+++ b/utils/mount/parse_opt.c
@@ -101,6 +101,37 @@ fail:
 	return NULL;
 }
 
+static struct mount_option *option_dup(const struct mount_option *option)
+{
+	struct mount_option *new;
+
+	new = malloc(sizeof(*new));
+	if (!new)
+		return NULL;
+	
+	new->next = NULL;
+	new->prev = NULL;
+
+	new->keyword = strdup(option->keyword);
+	if (!new->keyword)
+		goto fail;
+
+	new->value = NULL;
+	if (option->value) {
+		new->value = strdup(option->value);
+		if (!new->value) {
+			free(new->keyword);
+			goto fail;
+		}
+	}
+
+	return new;
+
+fail:
+	free(new);
+	return NULL;
+}
+
 static void option_destroy(struct mount_option *option)
 {
 	free(option->keyword);
@@ -229,6 +260,40 @@ fail:
 }
 
 /**
+ * po_dup - duplicate an existing list of options
+ * @options: pointer to mount options
+ *
+ */
+struct mount_options *po_dup(struct mount_options *source)
+{
+	struct mount_options *target;
+	struct mount_option *current;
+
+	if (!source)
+		return NULL;
+
+	target = options_create();
+	if (options_empty(source) || target == NULL)
+		return target;
+
+	current = source->head;
+	while (target->count < source->count) {
+		struct mount_option *option;
+
+		option = option_dup(current);
+		if (!option) {
+			po_destroy(target);
+			return NULL;
+		}
+
+		options_tail_insert(target, option);
+		current = current->next;
+	}
+
+	return target;
+}
+
+/**
  * po_replace - replace mount options in one mount_options object with another
  * @target: pointer to previously instantiated object to replace
  * @source: pointer to object containing source mount options
diff --git a/utils/mount/parse_opt.h b/utils/mount/parse_opt.h
index f9243c3..2c0b5f4 100644
--- a/utils/mount/parse_opt.h
+++ b/utils/mount/parse_opt.h
@@ -38,6 +38,7 @@ typedef enum {
 struct mount_options;
 
 struct mount_options *	po_split(char *);
+struct mount_options *	po_dup(struct mount_options *);
 void			po_replace(struct mount_options *,
 				   struct mount_options *);
 po_return_t		po_join(struct mount_options *, char **);
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 3eb661e..069bdc1 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -80,6 +80,8 @@ struct nfsmount_info {
 				*node,		/* mounted-on dir */
 				*type;		/* "nfs" or "nfs4" */
 	char			*hostname;	/* server's hostname */
+	struct sockaddr_storage	address;	/* server's address */
+	socklen_t		salen;		/* size of server's address */
 
 	struct mount_options	*options;	/* parsed mount options */
 	char			**extra_opts;	/* string for /etc/mtab */
@@ -257,47 +259,35 @@ static int nfs_append_sloppy_option(struct mount_options *options)
 }
 
 /*
- * Set up mandatory NFS mount options.
+ * Set up mandatory non-version specific NFS mount options.
  *
  * Returns 1 if successful; otherwise zero.
  */
 static int nfs_validate_options(struct nfsmount_info *mi)
 {
-	struct sockaddr_storage dummy;
-	struct sockaddr *sap = (struct sockaddr *)&dummy;
-	socklen_t salen = sizeof(dummy);
+	struct sockaddr *sap = (struct sockaddr *)&mi->address;
 
 	if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
 		return 0;
 
-	if (!nfs_name_to_address(mi->hostname, sap, &salen))
+	mi->salen = sizeof(mi->address);
+	if (!nfs_name_to_address(mi->hostname, sap, &mi->salen))
 		return 0;
 
 	if (!nfs_nfs_version(mi->options, &mi->version))
 		return 0;
 	if (strncmp(mi->type, "nfs4", 4) == 0)
 		mi->version = 4;
-
-	if (mi->version == 4) {
-		if (!nfs_append_clientaddr_option(sap, salen, mi->options))
-			return 0;
-	} else {
-		if (!nfs_fix_mounthost_option(mi->options))
-			return 0;
-		if (!mi->fake && !nfs_verify_lock_option(mi->options))
-			return 0;
+	else {
+		char *option = po_get(mi->options, "proto");
+		if (option && strcmp(option, "rdma") == 0)
+			mi->version = 3;
 	}
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;
 
-	if (!nfs_append_addr_option(sap, salen, mi->options))
-		return 0;
-
-	/*
-	 * Update option string to be recorded in /etc/mnttab
-	 */
-	if (po_join(mi->options, mi->extra_opts) == PO_FAILED)
+	if (!nfs_append_addr_option(sap, mi->salen, mi->options))
 		return 0;
 
 	return 1;
@@ -489,17 +479,12 @@ out:
  * Returns TRUE if successful, otherwise FALSE.
  * "errno" is set to reflect the individual error.
  */
-static int nfs_try_mount(struct nfsmount_info *mi)
+static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts)
 {
 	char *options = NULL;
 	int result;
 
-	if (mi->version != 4) {
-		if (!nfs_rewrite_pmap_mount_options(mi->options))
-			return 0;
-	}
-
-	if (po_join(mi->options, &options) == PO_FAILED) {
+	if (po_join(opts, &options) == PO_FAILED) {
 		errno = EIO;
 		return 0;
 	}
@@ -522,6 +507,121 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 }
 
 /*
+ * For "-t nfs vers=2" or "-t nfs vers=3" mounts.
+ */
+static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
+{
+	struct mount_options *options = po_dup(mi->options);
+	int result = 0;
+
+	if (!options) {
+		errno = ENOMEM;
+		return result;
+	}
+
+	if (!nfs_fix_mounthost_option(options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+	if (!mi->fake && !nfs_verify_lock_option(options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+
+	/*
+	 * Options we negotiate below may be stale by the time this
+	 * file system is unmounted.  In order to force umount.nfs
+	 * to renegotiate with the server, only write the user-
+	 * specified options, and not negotiated options, to /etc/mtab.
+	 */
+	if (po_join(options, mi->extra_opts) == PO_FAILED) {
+		errno = ENOMEM;
+		goto out_fail;
+	}
+
+	if (!nfs_rewrite_pmap_mount_options(options))
+		goto out_fail;
+
+	result = nfs_sys_mount(mi, options);
+
+out_fail:
+	po_destroy(options);
+	return result;
+}
+
+/*
+ * For "-t nfs -o vers=4" or "-t nfs4" mounts.
+ */
+static int nfs_try_mount_v4(struct nfsmount_info *mi)
+{
+	struct sockaddr *sap = (struct sockaddr *)&mi->address;
+	struct mount_options *options = po_dup(mi->options);
+	int result = 0;
+
+	if (!options) {
+		errno = ENOMEM;
+		return result;
+	}
+
+	if (mi->version == 0) {
+		if (po_append(options, "vers=4") == PO_FAILED) {
+			errno = EINVAL;
+			goto out_fail;
+		}
+	}
+
+	if (!nfs_append_clientaddr_option(sap, mi->salen, options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+	/*
+	 * Update option string to be recorded in /etc/mtab.
+	 */
+	if (po_join(options, mi->extra_opts) == PO_FAILED) {
+		errno = ENOMEM;
+		return 0;
+	}
+
+	result = nfs_sys_mount(mi, options);
+
+out_fail:
+	po_destroy(options);
+	return result;
+}
+
+/*
+ * This is a single pass through the fg/bg loop.
+ *
+ * Returns TRUE if successful, otherwise FALSE.
+ * "errno" is set to reflect the individual error.
+ */
+static int nfs_try_mount(struct nfsmount_info *mi)
+{
+	int result = 0;
+
+	switch (mi->version) {
+	case 0:
+		if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
+			errno = 0;
+			result = nfs_try_mount_v4(mi);
+			if (errno != EPROTONOSUPPORT)
+				break;
+		}
+	case 2:
+	case 3:
+		result = nfs_try_mount_v3v2(mi);
+		break;
+	case 4:
+		result = nfs_try_mount_v4(mi);
+		break;
+	default:
+		errno = EIO;
+	}
+
+	return result;
+}
+
+/*
  * Distinguish between permanent and temporary errors.
  *
  * Basically, we retry if communication with the server has


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- nfs-utils.spec	23 Sep 2009 20:09:06 -0000	1.242
+++ nfs-utils.spec	30 Sep 2009 00:57:48 -0000	1.243
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -27,6 +27,8 @@ Patch101: nfs-utils-1.2.1-rc2.patch
 Patch102: nfs-utils-1.2.1-rc3.patch
 Patch103: nfs-utils-1.2.1-rc4.patch
 Patch104: nfs-utils-1.2.1-rc5.patch
+Patch105: nfs-utils-1.2.1-rc6.patch
+Patch106: nfs-utils-1.2.0-mount-vers4.patch
 
 Patch200: nfs-utils-1.2.0-v4root-rel6.patch
 
@@ -85,6 +87,8 @@ This package also contains the mount.nfs
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
+%patch106 -p1
 
 %patch200 -p1
 
@@ -258,6 +262,13 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Sep 29 2009 Steve Dickson <steved at redhat.com> 1.2.0-13
+- Added upstream 1.2.1-rc5 patch
+  - mount.nfs: Support negotiation between v4, v3, and v2
+  - mount.nfs: Keep server's address in nfsmount_info
+  - mount.nfs: Sandbox each mount attempt
+  - mount.nfs: Support negotiation between v4, v3, and v2
+
 * Wed Sep 23 2009 Steve Dickson <steved at redhat.com> 1.2.0-12
 - Updated to the latest pseudo root release (rel6).
 



From cwickert at fedoraproject.org  Wed Sep 30 01:05:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 01:05:20 +0000 (UTC)
Subject: rpms/xfce4-panel/devel xfce4-panel-4.6.0-defaults.patch, 1.1,
	1.2 xfce4-panel.spec, 1.40, 1.41
Message-ID: <20090930010520.2DC2D11C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10586/devel

Modified Files:
	xfce4-panel-4.6.0-defaults.patch xfce4-panel.spec 
Log Message:
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Add xfswitch-plugin to default panel config (#525563)


xfce4-panel-4.6.0-defaults.patch:
 panels.xml |    2 ++
 1 file changed, 2 insertions(+)

Index: xfce4-panel-4.6.0-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel-4.6.0-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfce4-panel-4.6.0-defaults.patch	27 Feb 2009 20:33:29 -0000	1.1
+++ xfce4-panel-4.6.0-defaults.patch	30 Sep 2009 01:05:19 -0000	1.2
@@ -1,60 +1,17 @@
-diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.am xfce4-panel-4.6.0/config/Makefile.am
---- xfce4-panel-4.6.0.orig/config/Makefile.am	2009-01-12 14:35:34.000000000 -0700
-+++ xfce4-panel-4.6.0/config/Makefile.am	2009-02-27 11:04:19.000000000 -0700
-@@ -17,6 +17,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_files)
- 
- # copied from INTLTOOL_DESKTOP_RULE
-@@ -27,6 +28,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_in_files)
- 
- distclean-local:
-diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.in xfce4-panel-4.6.0/config/Makefile.in
---- xfce4-panel-4.6.0.orig/config/Makefile.in	2009-02-24 14:39:18.000000000 -0700
-+++ xfce4-panel-4.6.0/config/Makefile.in	2009-02-27 11:04:19.000000000 -0700
-@@ -279,6 +279,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_files)
- 
- EXTRA_DIST = \
-@@ -286,6 +287,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_in_files)
- 
- all: all-am
-diff -Nur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
+diff -dur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
 --- xfce4-panel-4.6.0.orig/config/panels.xml	2009-02-24 14:14:35.000000000 -0700
 +++ xfce4-panel-4.6.0/config/panels.xml	2009-02-27 11:07:35.000000000 -0700
-@@ -23,6 +23,8 @@
+@@ -23,11 +23,13 @@
  			<item name="launcher" id="10"/>
  			<item name="tasklist" id="3"/>
  			<item name="systray" id="4"/>
-+			<item name="xfce4-mixer" id="20"/>
 +			<item name="thunar-tpa" id="21"/>
  			<item name="pager" id="2"/>
  			<item name="showdesktop" id="1"/>
  			<item name="separator" id="11"/>
-diff -Nur xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc xfce4-panel-4.6.0/config/xfce4-mixer-20.rc
---- xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc	1969-12-31 17:00:00.000000000 -0700
-+++ xfce4-panel-4.6.0/config/xfce4-mixer-20.rc	2009-02-27 11:04:19.000000000 -0700
-@@ -0,0 +1,6 @@
-+[mixer-plugin]
-+LauncherRunInTerminal=false
-+LauncherUseStartupNotification=false
-+Device=default
-+LauncherCommand=xfce4-mixer
-+MasterControl=Master,0
+ 			<item name="clock" id="14"/>
+ 			<item name="separator" id="13"/>
++			<item name="xfswitch-plugin" id="20"/>
+ 			<item name="actions" id="12"/>
+ 		</items>
+ 	</panel>


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xfce4-panel.spec	27 Jul 2009 07:54:34 -0000	1.40
+++ xfce4-panel.spec	30 Sep 2009 01:05:19 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
@@ -127,6 +127,9 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Add xfswitch-plugin to default panel config (#525563)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Wed Sep 30 01:05:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 01:05:20 +0000 (UTC)
Subject: rpms/xfce4-panel/F-12 xfce4-panel-4.6.0-defaults.patch, 1.1,
	1.2 xfce4-panel.spec, 1.40, 1.41
Message-ID: <20090930010520.7A10311C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10586/F-12

Modified Files:
	xfce4-panel-4.6.0-defaults.patch xfce4-panel.spec 
Log Message:
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Add xfswitch-plugin to default panel config (#525563)


xfce4-panel-4.6.0-defaults.patch:
 panels.xml |    2 ++
 1 file changed, 2 insertions(+)

Index: xfce4-panel-4.6.0-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/xfce4-panel-4.6.0-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfce4-panel-4.6.0-defaults.patch	27 Feb 2009 20:33:29 -0000	1.1
+++ xfce4-panel-4.6.0-defaults.patch	30 Sep 2009 01:05:20 -0000	1.2
@@ -1,60 +1,17 @@
-diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.am xfce4-panel-4.6.0/config/Makefile.am
---- xfce4-panel-4.6.0.orig/config/Makefile.am	2009-01-12 14:35:34.000000000 -0700
-+++ xfce4-panel-4.6.0/config/Makefile.am	2009-02-27 11:04:19.000000000 -0700
-@@ -17,6 +17,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_files)
- 
- # copied from INTLTOOL_DESKTOP_RULE
-@@ -27,6 +28,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_in_files)
- 
- distclean-local:
-diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.in xfce4-panel-4.6.0/config/Makefile.in
---- xfce4-panel-4.6.0.orig/config/Makefile.in	2009-02-24 14:39:18.000000000 -0700
-+++ xfce4-panel-4.6.0/config/Makefile.in	2009-02-27 11:04:19.000000000 -0700
-@@ -279,6 +279,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_files)
- 
- EXTRA_DIST = \
-@@ -286,6 +287,7 @@
- 	systray-4.rc							\
- 	xfce4-menu-5.rc							\
- 	clock-14.rc							\
-+	xfce4-mixer-20.rc						\
- 	$(conf_in_files)
- 
- all: all-am
-diff -Nur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
+diff -dur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
 --- xfce4-panel-4.6.0.orig/config/panels.xml	2009-02-24 14:14:35.000000000 -0700
 +++ xfce4-panel-4.6.0/config/panels.xml	2009-02-27 11:07:35.000000000 -0700
-@@ -23,6 +23,8 @@
+@@ -23,11 +23,13 @@
  			<item name="launcher" id="10"/>
  			<item name="tasklist" id="3"/>
  			<item name="systray" id="4"/>
-+			<item name="xfce4-mixer" id="20"/>
 +			<item name="thunar-tpa" id="21"/>
  			<item name="pager" id="2"/>
  			<item name="showdesktop" id="1"/>
  			<item name="separator" id="11"/>
-diff -Nur xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc xfce4-panel-4.6.0/config/xfce4-mixer-20.rc
---- xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc	1969-12-31 17:00:00.000000000 -0700
-+++ xfce4-panel-4.6.0/config/xfce4-mixer-20.rc	2009-02-27 11:04:19.000000000 -0700
-@@ -0,0 +1,6 @@
-+[mixer-plugin]
-+LauncherRunInTerminal=false
-+LauncherUseStartupNotification=false
-+Device=default
-+LauncherCommand=xfce4-mixer
-+MasterControl=Master,0
+ 			<item name="clock" id="14"/>
+ 			<item name="separator" id="13"/>
++			<item name="xfswitch-plugin" id="20"/>
+ 			<item name="actions" id="12"/>
+ 		</items>
+ 	</panel>


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/xfce4-panel.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xfce4-panel.spec	27 Jul 2009 07:54:34 -0000	1.40
+++ xfce4-panel.spec	30 Sep 2009 01:05:20 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
@@ -127,6 +127,9 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Add xfswitch-plugin to default panel config (#525563)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Sep 30 01:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:07:31 +0000
Subject: [pkgdb] anaconda: dcantrel has requested commit
Message-ID: <20090930010732.17AAA10F874@bastion2.fedora.phx.redhat.com>

dcantrel has requested the commit acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Wed Sep 30 01:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:07:36 +0000
Subject: [pkgdb] anaconda: dcantrel has requested approveacls
Message-ID: <20090930010736.8BFF510F888@bastion2.fedora.phx.redhat.com>

dcantrel has requested the approveacls acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Wed Sep 30 01:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:07:39 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchcommits
Message-ID: <20090930010740.0D7F410F874@bastion2.fedora.phx.redhat.com>

dcantrel has requested the watchcommits acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Wed Sep 30 01:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:09:08 +0000
Subject: [pkgdb] anaconda: clumens has requested watchcommits
Message-ID: <20090930010908.1C56610F888@bastion2.fedora.phx.redhat.com>

clumens has requested the watchcommits acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Wed Sep 30 01:09:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:09:09 +0000
Subject: [pkgdb] anaconda: clumens has requested approveacls
Message-ID: <20090930010909.E7A0A10F88C@bastion2.fedora.phx.redhat.com>

clumens has requested the approveacls acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Wed Sep 30 01:09:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:09:23 +0000
Subject: [pkgdb] anaconda: clumens has requested commit
Message-ID: <20090930010923.AA9AC10F88B@bastion2.fedora.phx.redhat.com>

clumens has requested the commit acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From dcantrel at fedoraproject.org  Wed Sep 30 01:09:34 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 30 Sep 2009 01:09:34 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.673, 1.674 anaconda.spec, 1.823, 
	1.824 sources, 1.807, 1.808
Message-ID: <20090930010934.CA8F611C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12403

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Sep 29 2009 David Cantrell <dcantrell at redhat.com> - 12.32-1
- Improve loader messages in parseCmdLineFlags when passing vnc (#526350).
  (maier)
- Update po/anaconda.pot during a 'bumpver' run. (dcantrell)
- Add 'make release' as a synonym for 'make archive'. (dcantrell)
- Whitespace cleanup in loader/net.c. (dcantrell)
- Clean up getHostandPath() debugging messages for host & file. (dcantrell)
- Need an extra  on the PS1 line in /.profile (dcantrell)
- Korean font package name changed (#525597) (dcantrell)
- We can't prompt for new network info in cmdline mode (#526262). (clumens)
- yaboot supports /boot on ext4 (#526219). (clumens)
- bootloader --append= should append, not set the args list (#524004).
  (clumens)
- Don't check if /boot is under the 4MB mark on i/p Series (#526200).
  (clumens)
- "minimal" has been renamed to "core" (#526191). (clumens)
- Remove some unused isys methods. (clumens)
- Make sure the disk holding /boot is setup before setting boot flag
  (#526063) (hdegoede)
- Use temporary repo id for edited object to prevent Duplicate Repo error
  (#524599). (rvykydal)
- Do not delete repo twice or when it had not been added actually (#524599).
  (rvykydal)
- Disable repo before deleting it (#524599). (rvykydal)
- Log more, repo editing UI. (rvykydal)
- Make _enableRepo a little more readable. (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -p -r1.673 -r1.674
--- .cvsignore	26 Sep 2009 03:45:15 -0000	1.673
+++ .cvsignore	30 Sep 2009 01:09:33 -0000	1.674
@@ -1 +1 @@
-anaconda-12.31.tar.bz2
+anaconda-12.32.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -p -r1.823 -r1.824
--- anaconda.spec	26 Sep 2009 03:45:16 -0000	1.823
+++ anaconda.spec	30 Sep 2009 01:09:33 -0000	1.824
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.31
+Version: 12.32
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,33 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Sep 29 2009 David Cantrell <dcantrell at redhat.com> - 12.32-1
+- Improve loader messages in parseCmdLineFlags when passing vnc (#526350).
+  (maier)
+- Update po/anaconda.pot during a 'bumpver' run. (dcantrell)
+- Add 'make release' as a synonym for 'make archive'. (dcantrell)
+- Whitespace cleanup in loader/net.c. (dcantrell)
+- Clean up getHostandPath() debugging messages for host & file. (dcantrell)
+- Need an extra  on the PS1 line in /.profile (dcantrell)
+- Korean font package name changed (#525597) (dcantrell)
+- We can't prompt for new network info in cmdline mode (#526262). (clumens)
+- yaboot supports /boot on ext4 (#526219). (clumens)
+- bootloader --append= should append, not set the args list (#524004).
+  (clumens)
+- Don't check if /boot is under the 4MB mark on i/p Series (#526200).
+  (clumens)
+- "minimal" has been renamed to "core" (#526191). (clumens)
+- Remove some unused isys methods. (clumens)
+- Make sure the disk holding /boot is setup before setting boot flag
+  (#526063) (hdegoede)
+- Use temporary repo id for edited object to prevent Duplicate Repo error
+  (#524599). (rvykydal)
+- Do not delete repo twice or when it had not been added actually (#524599).
+  (rvykydal)
+- Disable repo before deleting it (#524599). (rvykydal)
+- Log more, repo editing UI. (rvykydal)
+- Make _enableRepo a little more readable. (rvykydal)
+
 * Fri Sep 25 2009 David Cantrell <dcantrell at redhat.com> - 12.31-1
 - Move S390MODS to inside makeBootImages(), remove libiscsi_tcp. (dcantrell)
 - Require the latest and greatest python-meh. (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -p -r1.807 -r1.808
--- sources	26 Sep 2009 03:45:16 -0000	1.807
+++ sources	30 Sep 2009 01:09:33 -0000	1.808
@@ -1 +1 @@
-8e4a7cf339c3787e781652fe25adc8b3  anaconda-12.31.tar.bz2
+243e5017608dcd9ef0798925e1a2a0e3  anaconda-12.32.tar.bz2



From lennart at fedoraproject.org  Wed Sep 30 01:14:45 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 30 Sep 2009 01:14:45 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.44, 1.45 pulseaudio.spec, 1.101,
	1.102 sources, 1.48, 1.49
Message-ID: <20090930011445.A573511C00C1@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14699

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	19 Sep 2009 00:18:30 -0000	1.44
+++ .cvsignore	30 Sep 2009 01:14:42 -0000	1.45
@@ -1 +1 @@
-pulseaudio-0.9.18.tar.gz
+pulseaudio-0.9.19.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- pulseaudio.spec	19 Sep 2009 00:18:31 -0000	1.101
+++ pulseaudio.spec	30 Sep 2009 01:14:43 -0000	1.102
@@ -1,6 +1,6 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
-Version:        0.9.18
+Version:        0.9.19
 Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
@@ -437,6 +437,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Wed Sep 30 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.19-1
+- New release
+
 * Sat Sep 19 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.18-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	19 Sep 2009 00:18:31 -0000	1.48
+++ sources	30 Sep 2009 01:14:43 -0000	1.49
@@ -1 +1 @@
-120dc3c7b75946e649fd3d6bde2b3661  pulseaudio-0.9.18.tar.gz
+02adc2b99252675f0271db3b9edd432e  pulseaudio-0.9.19.tar.gz



From bpepple at fedoraproject.org  Wed Sep 30 01:22:22 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 01:22:22 +0000 (UTC)
Subject: rpms/twitter-glib/F-12 twitter-glib.spec,1.3,1.4
Message-ID: <20090930012222.C6FD011C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/twitter-glib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17228

Modified Files:
	twitter-glib.spec 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.8-4
- Rebuild for new json-glib.



Index: twitter-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twitter-glib/F-12/twitter-glib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- twitter-glib.spec	7 Aug 2009 12:16:49 -0000	1.3
+++ twitter-glib.spec	30 Sep 2009 01:22:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           twitter-glib
 Version:        0.9.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library wrapping the Twitter RESTful API
 
 Group:          System Environment/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.8-4
+- Rebuild for new json-glib.
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.8-3
 - A few minor spec file cleanups
 



From pkgdb at fedoraproject.org  Wed Sep 30 01:27:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 01:27:49 +0000
Subject: [pkgdb] anaconda F-12 cloned from devel
Message-ID: <20090930012749.766A810F85F@bastion2.fedora.phx.redhat.com>

toshio cloned anaconda F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From lennart at fedoraproject.org  Wed Sep 30 01:31:22 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 30 Sep 2009 01:31:22 +0000 (UTC)
Subject: rpms/pulseaudio/F-12 .cvsignore, 1.44, 1.45 pulseaudio.spec, 1.101, 
	1.102 sources, 1.48, 1.49
Message-ID: <20090930013122.80AAC11C0337@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20553

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-12/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	19 Sep 2009 00:18:30 -0000	1.44
+++ .cvsignore	30 Sep 2009 01:31:20 -0000	1.45
@@ -1 +1 @@
-pulseaudio-0.9.18.tar.gz
+pulseaudio-0.9.19.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-12/pulseaudio.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- pulseaudio.spec	19 Sep 2009 00:18:31 -0000	1.101
+++ pulseaudio.spec	30 Sep 2009 01:31:21 -0000	1.102
@@ -1,6 +1,6 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
-Version:        0.9.18
+Version:        0.9.19
 Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
@@ -437,6 +437,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Wed Sep 30 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.19-1
+- New release
+
 * Sat Sep 19 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.18-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	19 Sep 2009 00:18:31 -0000	1.48
+++ sources	30 Sep 2009 01:31:21 -0000	1.49
@@ -1 +1 @@
-120dc3c7b75946e649fd3d6bde2b3661  pulseaudio-0.9.18.tar.gz
+02adc2b99252675f0271db3b9edd432e  pulseaudio-0.9.19.tar.gz



From dcantrel at fedoraproject.org  Wed Sep 30 01:31:28 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 30 Sep 2009 01:31:28 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.673, 1.674 anaconda.spec, 1.823,
	1.824 sources, 1.807, 1.808
Message-ID: <20090930013128.63EE711C0337@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20650

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Sep 29 2009 David Cantrell <dcantrell at redhat.com> - 12.32-1
- Improve loader messages in parseCmdLineFlags when passing vnc (#526350).
  (maier)
- Update po/anaconda.pot during a 'bumpver' run. (dcantrell)
- Add 'make release' as a synonym for 'make archive'. (dcantrell)
- Whitespace cleanup in loader/net.c. (dcantrell)
- Clean up getHostandPath() debugging messages for host & file. (dcantrell)
- Need an extra  on the PS1 line in /.profile (dcantrell)
- Korean font package name changed (#525597) (dcantrell)
- We can't prompt for new network info in cmdline mode (#526262). (clumens)
- yaboot supports /boot on ext4 (#526219). (clumens)
- bootloader --append= should append, not set the args list (#524004).
  (clumens)
- Don't check if /boot is under the 4MB mark on i/p Series (#526200).
  (clumens)
- "minimal" has been renamed to "core" (#526191). (clumens)
- Remove some unused isys methods. (clumens)
- Make sure the disk holding /boot is setup before setting boot flag
  (#526063) (hdegoede)
- Use temporary repo id for edited object to prevent Duplicate Repo error
  (#524599). (rvykydal)
- Do not delete repo twice or when it had not been added actually (#524599).
  (rvykydal)
- Disable repo before deleting it (#524599). (rvykydal)
- Log more, repo editing UI. (rvykydal)
- Make _enableRepo a little more readable. (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -p -r1.673 -r1.674
--- .cvsignore	26 Sep 2009 03:45:15 -0000	1.673
+++ .cvsignore	30 Sep 2009 01:31:27 -0000	1.674
@@ -1 +1 @@
-anaconda-12.31.tar.bz2
+anaconda-12.32.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -p -r1.823 -r1.824
--- anaconda.spec	26 Sep 2009 03:45:16 -0000	1.823
+++ anaconda.spec	30 Sep 2009 01:31:27 -0000	1.824
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.31
+Version: 12.32
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,33 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Sep 29 2009 David Cantrell <dcantrell at redhat.com> - 12.32-1
+- Improve loader messages in parseCmdLineFlags when passing vnc (#526350).
+  (maier)
+- Update po/anaconda.pot during a 'bumpver' run. (dcantrell)
+- Add 'make release' as a synonym for 'make archive'. (dcantrell)
+- Whitespace cleanup in loader/net.c. (dcantrell)
+- Clean up getHostandPath() debugging messages for host & file. (dcantrell)
+- Need an extra  on the PS1 line in /.profile (dcantrell)
+- Korean font package name changed (#525597) (dcantrell)
+- We can't prompt for new network info in cmdline mode (#526262). (clumens)
+- yaboot supports /boot on ext4 (#526219). (clumens)
+- bootloader --append= should append, not set the args list (#524004).
+  (clumens)
+- Don't check if /boot is under the 4MB mark on i/p Series (#526200).
+  (clumens)
+- "minimal" has been renamed to "core" (#526191). (clumens)
+- Remove some unused isys methods. (clumens)
+- Make sure the disk holding /boot is setup before setting boot flag
+  (#526063) (hdegoede)
+- Use temporary repo id for edited object to prevent Duplicate Repo error
+  (#524599). (rvykydal)
+- Do not delete repo twice or when it had not been added actually (#524599).
+  (rvykydal)
+- Disable repo before deleting it (#524599). (rvykydal)
+- Log more, repo editing UI. (rvykydal)
+- Make _enableRepo a little more readable. (rvykydal)
+
 * Fri Sep 25 2009 David Cantrell <dcantrell at redhat.com> - 12.31-1
 - Move S390MODS to inside makeBootImages(), remove libiscsi_tcp. (dcantrell)
 - Require the latest and greatest python-meh. (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -p -r1.807 -r1.808
--- sources	26 Sep 2009 03:45:16 -0000	1.807
+++ sources	30 Sep 2009 01:31:27 -0000	1.808
@@ -1 +1 @@
-8e4a7cf339c3787e781652fe25adc8b3  anaconda-12.31.tar.bz2
+243e5017608dcd9ef0798925e1a2a0e3  anaconda-12.32.tar.bz2



From bpepple at fedoraproject.org  Wed Sep 30 01:39:08 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 01:39:08 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-12 purple-facebookchat.spec,1.18,1.19
Message-ID: <20090930013908.7D25511C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/purple-facebookchat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23485

Modified Files:
	purple-facebookchat.spec 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.61-2
- Rebuild for new json-glib.
* Tue Jul 23 2009 Ismael Olea <ismael at olea.org> 1.60-1
- updating to 1.60
- adding new sourcecode files to makefile



Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-12/purple-facebookchat.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- purple-facebookchat.spec	12 Sep 2009 11:22:25 -0000	1.18
+++ purple-facebookchat.spec	30 Sep 2009 01:39:08 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.61
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.61-2
+- Rebuild for new json-glib.
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1
 - updating to 1.61
 %changelog



From dchen at fedoraproject.org  Wed Sep 30 01:40:43 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 30 Sep 2009 01:40:43 +0000 (UTC)
Subject: rpms/libchewing/devel libchewing-0.3.2.chewing_zuin.patch, NONE,
	1.1 import.log, 1.15, 1.16 libchewing.spec, 1.38, 1.39
Message-ID: <20090930014043.336E711C048B@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23967/devel

Modified Files:
	import.log libchewing.spec 
Added Files:
	libchewing-0.3.2.chewing_zuin.patch 
Log Message:
chewing Google issue 352

libchewing-0.3.2.chewing_zuin.patch:
 mod_aux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libchewing-0.3.2.chewing_zuin.patch ---
diff -up ./src/mod_aux.c.chewing_zuin ./src/mod_aux.c
--- ./src/mod_aux.c.chewing_zuin	2009-09-30 11:11:56.000000000 +1000
+++ ./src/mod_aux.c	2009-09-30 11:20:31.000000000 +1000
@@ -90,7 +90,7 @@ CHEWING_API char *chewing_zuin_String( C
 		if ( ctx->output->zuinBuf[ i ].s[ 0 ] != '\0' ) {
 			strcat( s, (char *) (ctx->output->zuinBuf[ i ].s) );
 			if ( zuin_count )
-				*zuin_count++;
+				(*zuin_count)++;
 		}
 	}
 	return s;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	3 Aug 2009 04:53:39 -0000	1.15
+++ import.log	30 Sep 2009 01:40:42 -0000	1.16
@@ -13,3 +13,4 @@ libchewing-0_3_2-11_fc11:HEAD:libchewing
 libchewing-0_3_2-12_fc11:HEAD:libchewing-0.3.2-12.fc11.src.rpm:1246329909
 libchewing-0_3_2-14_fc11:HEAD:libchewing-0.3.2-14.fc11.src.rpm:1249025558
 libchewing-0_3_2-15_fc11:HEAD:libchewing-0.3.2-15.fc11.src.rpm:1249275193
+libchewing-0_3_2-16_fc11:HEAD:libchewing-0.3.2-16.fc11.src.rpm:1254274732


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libchewing.spec	3 Aug 2009 04:53:39 -0000	1.38
+++ libchewing.spec	30 Sep 2009 01:40:42 -0000	1.39
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@ Source:         http://chewing.csie.net/
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 Patch10: libchewing-0.3.2.phraseChoiceRearward.patch
+Patch11: libchewing-0.3.2.chewing_zuin.patch
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define libchewing_python_dir %{python_sitearch}/%{name}
@@ -57,6 +58,7 @@ library.
 #%patch8 -p1 -b .9-bz195416
 %patch9 -p0 -b .bz477690
 %patch10 -p0 -b .phraseChoiceRearward
+%patch11 -p0 -b .chewing_zuin
 
 %build
 export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
@@ -98,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-16
+- Fix chewing Google issue 352: 
+  zuin_count in chewing_zuin_String( ChewingContext *ctx, int *zuin_count ) 
+  does not count correctly.
+
 * Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
 - Fix [Bug 512108:issue 11] ibus-chewing crash the application
   by move cursor_orig to chewingio.c global.



From salimma at fedoraproject.org  Wed Sep 30 01:42:02 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 01:42:02 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.36,1.37 sources,1.8,1.9
Message-ID: <20090930014202.33E9411C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24407/devel

Modified Files:
	llvm.spec sources 
Log Message:
* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.6.pre2
- Update to 2.6 pre-release2
- -devel subpackage now virtually provides -static



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- llvm.spec	10 Sep 2009 04:08:51 -0000	1.36
+++ llvm.spec	30 Sep 2009 01:42:01 -0000	1.37
@@ -5,14 +5,14 @@
 
 Name:           llvm
 Version:        2.6
-Release:        0.5.pre1%{?dist}
+Release:        0.6.pre2%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/prereleases/%{version}/llvm-%{version}.tar.gz
-Source1:        http://llvm.org/prereleases/%{version}/clang-%{version}.tar.gz
+Source0:        http://llvm.org/prereleases/%{version}/pre-release2/llvm-%{version}.tar.gz
+Source1:        http://llvm.org/prereleases/%{version}/pre-release2/clang-%{version}.tar.gz
 # http://llvm.org/bugs/show_bug.cgi?id=3153
 Patch0:         llvm-2.6-destdir.patch
 Patch1:         llvm-2.6-destdir-clang.patch
@@ -53,6 +53,7 @@ Summary:        Libraries and header fil
 Group:          Development/Languages
 Requires:       %{name} = %{version}-%{release}
 Requires:       libstdc++-devel >= 3.4
+Provides:       llvm-static = %{version}-%{release}
 
 
 %description devel
@@ -177,6 +178,8 @@ mkdir obj && cd obj
   --enable-jit \
 %ifarch %{ix86}
   --enable-pic=no
+%else
+  --enable-shared
 %endif
 
 # FIXME file this
@@ -358,6 +361,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.6.pre2
+- Update to 2.6 pre-release2
+- -devel subpackage now virtually provides -static
+
 * Wed Sep  9 2009 Michel Salim <salimma at fedoraproject.org> - 2.6-0.5.pre1
 - Disable var tracking assignments on PPC
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Sep 2009 06:59:47 -0000	1.8
+++ sources	30 Sep 2009 01:42:02 -0000	1.9
@@ -1,2 +1,2 @@
-d4d2cfbb962eca0c96aa1d794e23a681  llvm-2.6.tar.gz
-80a2a9bbe8fa7c403b2ec7aca8b4108f  clang-2.6.tar.gz
+1333eb8765e581fa572eca644791e5f8  llvm-2.6.tar.gz
+ef76d07c035f311c1362c56eb25df3bd  clang-2.6.tar.gz



From dchen at fedoraproject.org  Wed Sep 30 01:42:12 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 30 Sep 2009 01:42:12 +0000 (UTC)
Subject: rpms/libchewing/F-11 libchewing-0.3.2.chewing_zuin.patch, NONE,
	1.1 import.log, 1.15, 1.16 libchewing.spec, 1.37, 1.38
Message-ID: <20090930014212.BFF6911C00C1@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24480/F-11

Modified Files:
	import.log libchewing.spec 
Added Files:
	libchewing-0.3.2.chewing_zuin.patch 
Log Message:
chewing Google issue 352

libchewing-0.3.2.chewing_zuin.patch:
 mod_aux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libchewing-0.3.2.chewing_zuin.patch ---
diff -up ./src/mod_aux.c.chewing_zuin ./src/mod_aux.c
--- ./src/mod_aux.c.chewing_zuin	2009-09-30 11:11:56.000000000 +1000
+++ ./src/mod_aux.c	2009-09-30 11:20:31.000000000 +1000
@@ -90,7 +90,7 @@ CHEWING_API char *chewing_zuin_String( C
 		if ( ctx->output->zuinBuf[ i ].s[ 0 ] != '\0' ) {
 			strcat( s, (char *) (ctx->output->zuinBuf[ i ].s) );
 			if ( zuin_count )
-				*zuin_count++;
+				(*zuin_count)++;
 		}
 	}
 	return s;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	3 Aug 2009 05:04:44 -0000	1.15
+++ import.log	30 Sep 2009 01:42:12 -0000	1.16
@@ -13,3 +13,4 @@ libchewing-0_3_2-11_fc11:F-11:libchewing
 libchewing-0_3_2-12_fc11:F-11:libchewing-0.3.2-12.fc11.src.rpm:1246330058
 libchewing-0_3_2-14_fc11:F-11:libchewing-0.3.2-14.fc11.src.rpm:1249025650
 libchewing-0_3_2-15_fc11:F-11:libchewing-0.3.2-15.fc11.src.rpm:1249275892
+libchewing-0_3_2-16_fc11:F-11:libchewing-0.3.2-16.fc11.src.rpm:1254274911


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/libchewing.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libchewing.spec	3 Aug 2009 05:04:44 -0000	1.37
+++ libchewing.spec	30 Sep 2009 01:42:12 -0000	1.38
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@ Source:         http://chewing.csie.net/
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 Patch10: libchewing-0.3.2.phraseChoiceRearward.patch
+Patch11: libchewing-0.3.2.chewing_zuin.patch
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define libchewing_python_dir %{python_sitearch}/%{name}
@@ -57,6 +58,7 @@ library.
 #%patch8 -p1 -b .9-bz195416
 %patch9 -p0 -b .bz477690
 %patch10 -p0 -b .phraseChoiceRearward
+%patch11 -p0 -b .chewing_zuin
 
 %build
 export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
@@ -98,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-16
+- Fix chewing Google issue 352: 
+  zuin_count in chewing_zuin_String( ChewingContext *ctx, int *zuin_count ) 
+  does not count correctly.
+
 * Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
 - Fix [Bug 512108:issue 11] ibus-chewing crash the application
   by move cursor_orig to chewingio.c global.



From dchen at fedoraproject.org  Wed Sep 30 01:43:14 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 30 Sep 2009 01:43:14 +0000 (UTC)
Subject: rpms/libchewing/F-10 libchewing-0.3.2.chewing_zuin.patch, NONE,
	1.1 import.log, 1.15, 1.16 libchewing.spec, 1.35, 1.36
Message-ID: <20090930014314.0B66E11C00C1@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24943/F-10

Modified Files:
	import.log libchewing.spec 
Added Files:
	libchewing-0.3.2.chewing_zuin.patch 
Log Message:
chewing Google issue 352

libchewing-0.3.2.chewing_zuin.patch:
 mod_aux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libchewing-0.3.2.chewing_zuin.patch ---
diff -up ./src/mod_aux.c.chewing_zuin ./src/mod_aux.c
--- ./src/mod_aux.c.chewing_zuin	2009-09-30 11:11:56.000000000 +1000
+++ ./src/mod_aux.c	2009-09-30 11:20:31.000000000 +1000
@@ -90,7 +90,7 @@ CHEWING_API char *chewing_zuin_String( C
 		if ( ctx->output->zuinBuf[ i ].s[ 0 ] != '\0' ) {
 			strcat( s, (char *) (ctx->output->zuinBuf[ i ].s) );
 			if ( zuin_count )
-				*zuin_count++;
+				(*zuin_count)++;
 		}
 	}
 	return s;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	3 Aug 2009 05:06:49 -0000	1.15
+++ import.log	30 Sep 2009 01:43:13 -0000	1.16
@@ -13,3 +13,4 @@ libchewing-0_3_2-11_fc11:F-10:libchewing
 libchewing-0_3_2-12_fc11:F-10:libchewing-0.3.2-12.fc11.src.rpm:1246331199
 libchewing-0_3_2-14_fc11:F-10:libchewing-0.3.2-14.fc11.src.rpm:1249025696
 libchewing-0_3_2-15_fc11:F-10:libchewing-0.3.2-15.fc11.src.rpm:1249276018
+libchewing-0_3_2-16_fc11:F-10:libchewing-0.3.2-16.fc11.src.rpm:1254274971


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libchewing.spec	3 Aug 2009 05:06:49 -0000	1.35
+++ libchewing.spec	30 Sep 2009 01:43:13 -0000	1.36
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@ Source:         http://chewing.csie.net/
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 Patch10: libchewing-0.3.2.phraseChoiceRearward.patch
+Patch11: libchewing-0.3.2.chewing_zuin.patch
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define libchewing_python_dir %{python_sitearch}/%{name}
@@ -57,6 +58,7 @@ library.
 #%patch8 -p1 -b .9-bz195416
 %patch9 -p0 -b .bz477690
 %patch10 -p0 -b .phraseChoiceRearward
+%patch11 -p0 -b .chewing_zuin
 
 %build
 export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
@@ -98,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-16
+- Fix chewing Google issue 352: 
+  zuin_count in chewing_zuin_String( ChewingContext *ctx, int *zuin_count ) 
+  does not count correctly.
+
 * Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
 - Fix [Bug 512108:issue 11] ibus-chewing crash the application
   by move cursor_orig to chewingio.c global.



From dchen at fedoraproject.org  Wed Sep 30 01:45:37 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 30 Sep 2009 01:45:37 +0000 (UTC)
Subject: rpms/libchewing/F-12 libchewing-0.3.2.chewing_zuin.patch, NONE,
	1.1 import.log, 1.15, 1.16 libchewing.spec, 1.38, 1.39
Message-ID: <20090930014537.A1B8111C00C1@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26466/F-12

Modified Files:
	import.log libchewing.spec 
Added Files:
	libchewing-0.3.2.chewing_zuin.patch 
Log Message:
chewing Google issue 352

libchewing-0.3.2.chewing_zuin.patch:
 mod_aux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libchewing-0.3.2.chewing_zuin.patch ---
diff -up ./src/mod_aux.c.chewing_zuin ./src/mod_aux.c
--- ./src/mod_aux.c.chewing_zuin	2009-09-30 11:11:56.000000000 +1000
+++ ./src/mod_aux.c	2009-09-30 11:20:31.000000000 +1000
@@ -90,7 +90,7 @@ CHEWING_API char *chewing_zuin_String( C
 		if ( ctx->output->zuinBuf[ i ].s[ 0 ] != '\0' ) {
 			strcat( s, (char *) (ctx->output->zuinBuf[ i ].s) );
 			if ( zuin_count )
-				*zuin_count++;
+				(*zuin_count)++;
 		}
 	}
 	return s;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-12/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	3 Aug 2009 04:53:39 -0000	1.15
+++ import.log	30 Sep 2009 01:45:37 -0000	1.16
@@ -13,3 +13,4 @@ libchewing-0_3_2-11_fc11:HEAD:libchewing
 libchewing-0_3_2-12_fc11:HEAD:libchewing-0.3.2-12.fc11.src.rpm:1246329909
 libchewing-0_3_2-14_fc11:HEAD:libchewing-0.3.2-14.fc11.src.rpm:1249025558
 libchewing-0_3_2-15_fc11:HEAD:libchewing-0.3.2-15.fc11.src.rpm:1249275193
+libchewing-0_3_2-16_fc11:F-12:libchewing-0.3.2-16.fc11.src.rpm:1254275115


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-12/libchewing.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libchewing.spec	3 Aug 2009 04:53:39 -0000	1.38
+++ libchewing.spec	30 Sep 2009 01:45:37 -0000	1.39
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@ Source:         http://chewing.csie.net/
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 Patch10: libchewing-0.3.2.phraseChoiceRearward.patch
+Patch11: libchewing-0.3.2.chewing_zuin.patch
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define libchewing_python_dir %{python_sitearch}/%{name}
@@ -57,6 +58,7 @@ library.
 #%patch8 -p1 -b .9-bz195416
 %patch9 -p0 -b .bz477690
 %patch10 -p0 -b .phraseChoiceRearward
+%patch11 -p0 -b .chewing_zuin
 
 %build
 export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
@@ -98,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-16
+- Fix chewing Google issue 352: 
+  zuin_count in chewing_zuin_String( ChewingContext *ctx, int *zuin_count ) 
+  does not count correctly.
+
 * Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
 - Fix [Bug 512108:issue 11] ibus-chewing crash the application
   by move cursor_orig to chewingio.c global.



From cweyl at fedoraproject.org  Wed Sep 30 01:47:16 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:47:16 +0000 (UTC)
Subject: rpms/perl-common-sense/devel import.log, NONE,
	1.1 perl-common-sense.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014716.F1EFB11C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-common-sense/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27117/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-common-sense.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-common-sense-1_0-2_fc11:HEAD:perl-common-sense-1.0-2.fc11.src.rpm:1254275232


--- NEW FILE perl-common-sense.spec ---
Name:       perl-common-sense
Version:    1.0
Release:    2%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    "Common sense" Perl defaults 
Source:     http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/common-sense-%{version}.tar.gz
Url:        http://search.cpan.org/dist/common-sense
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)

%{?perl_default_filter}

%description
This module implements some sane defaults for Perl programs, as defined
by two typical (or not so typical - use your common sense) specimens of
Perl coders:

  use strict qw(vars subs);
  use feature qw(say state switch);
  no warnings;

%prep
%setup -q -n common-sense-%{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 LICENSE Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
- update summary (though now we deviate from upstream)

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-1
- auto-update to 1.0 (by cpan-spec-update 0.01)

* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:20:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:47:16 -0000	1.2
@@ -0,0 +1 @@
+common-sense-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:20:04 -0000	1.1
+++ sources	30 Sep 2009 01:47:16 -0000	1.2
@@ -0,0 +1 @@
+c6fd2a8fd579f62c57211d7c8e4115f3  common-sense-1.0.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:47:29 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:47:29 +0000 (UTC)
Subject: rpms/perl-common-sense/F-12 import.log, NONE,
	1.1 perl-common-sense.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014729.1129D11C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-common-sense/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27296/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-common-sense.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-common-sense-1_0-2_fc11:F-12:perl-common-sense-1.0-2.fc11.src.rpm:1254275244


--- NEW FILE perl-common-sense.spec ---
Name:       perl-common-sense
Version:    1.0
Release:    2%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    "Common sense" Perl defaults 
Source:     http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/common-sense-%{version}.tar.gz
Url:        http://search.cpan.org/dist/common-sense
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)

%{?perl_default_filter}

%description
This module implements some sane defaults for Perl programs, as defined
by two typical (or not so typical - use your common sense) specimens of
Perl coders:

  use strict qw(vars subs);
  use feature qw(say state switch);
  no warnings;

%prep
%setup -q -n common-sense-%{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 LICENSE Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
- update summary (though now we deviate from upstream)

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-1
- auto-update to 1.0 (by cpan-spec-update 0.01)

* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:20:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:47:28 -0000	1.2
@@ -0,0 +1 @@
+common-sense-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:20:04 -0000	1.1
+++ sources	30 Sep 2009 01:47:28 -0000	1.2
@@ -0,0 +1 @@
+c6fd2a8fd579f62c57211d7c8e4115f3  common-sense-1.0.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:47:39 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:47:39 +0000 (UTC)
Subject: rpms/perl-common-sense/F-11 import.log, NONE,
	1.1 perl-common-sense.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014739.228B811C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-common-sense/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27470/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-common-sense.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-common-sense-1_0-2_fc11:F-11:perl-common-sense-1.0-2.fc11.src.rpm:1254275254


--- NEW FILE perl-common-sense.spec ---
Name:       perl-common-sense
Version:    1.0
Release:    2%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    "Common sense" Perl defaults 
Source:     http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/common-sense-%{version}.tar.gz
Url:        http://search.cpan.org/dist/common-sense
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)

%{?perl_default_filter}

%description
This module implements some sane defaults for Perl programs, as defined
by two typical (or not so typical - use your common sense) specimens of
Perl coders:

  use strict qw(vars subs);
  use feature qw(say state switch);
  no warnings;

%prep
%setup -q -n common-sense-%{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 LICENSE Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
- update summary (though now we deviate from upstream)

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-1
- auto-update to 1.0 (by cpan-spec-update 0.01)

* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:20:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:47:38 -0000	1.2
@@ -0,0 +1 @@
+common-sense-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:20:04 -0000	1.1
+++ sources	30 Sep 2009 01:47:38 -0000	1.2
@@ -0,0 +1 @@
+c6fd2a8fd579f62c57211d7c8e4115f3  common-sense-1.0.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:47:58 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:47:58 +0000 (UTC)
Subject: rpms/perl-common-sense/F-10 import.log, NONE,
	1.1 perl-common-sense.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014758.7690511C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-common-sense/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27693/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-common-sense.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-common-sense-1_0-2_fc11:F-10:perl-common-sense-1.0-2.fc11.src.rpm:1254275267


--- NEW FILE perl-common-sense.spec ---
Name:       perl-common-sense
Version:    1.0
Release:    2%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    "Common sense" Perl defaults 
Source:     http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/common-sense-%{version}.tar.gz
Url:        http://search.cpan.org/dist/common-sense
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)

%{?perl_default_filter}

%description
This module implements some sane defaults for Perl programs, as defined
by two typical (or not so typical - use your common sense) specimens of
Perl coders:

  use strict qw(vars subs);
  use feature qw(say state switch);
  no warnings;

%prep
%setup -q -n common-sense-%{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 LICENSE Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
- update summary (though now we deviate from upstream)

* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-1
- auto-update to 1.0 (by cpan-spec-update 0.01)

* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:20:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:47:57 -0000	1.2
@@ -0,0 +1 @@
+common-sense-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-common-sense/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:20:04 -0000	1.1
+++ sources	30 Sep 2009 01:47:58 -0000	1.2
@@ -0,0 +1 @@
+c6fd2a8fd579f62c57211d7c8e4115f3  common-sense-1.0.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:49:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:49:07 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/devel import.log, NONE,
	1.1 perl-WWW-Mechanize-GZip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014907.3E95511C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Mechanize-GZip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28092/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Mechanize-GZip.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-WWW-Mechanize-GZip-0_12-1_fc11:HEAD:perl-WWW-Mechanize-GZip-0.12-1.fc11.src.rpm:1254275342


--- NEW FILE perl-WWW-Mechanize-GZip.spec ---
Name:       perl-WWW-Mechanize-GZip 
Version:    0.12 
Release:    1%{?dist}
# lib/WWW/Mechanize/GZip.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Fetch compressed webpages
Source:     http://search.cpan.org/CPAN/authors/id/P/PE/PEGI/WWW-Mechanize-GZip-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/WWW-Mechanize-GZip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(WWW::Mechanize)

Requires:      perl(WWW::Mechanize)
Requires:      perl(Compress::Zlib)

%{?perl_default_filter}

%description
The WWW::Mechanize::GZip module tries to fetch a URL by requesting 
gzip-compression from the webserver.  If the response contains
a header with 'Content-Encoding: gzip', it decompresses the response in
order to get the original (uncompressed) content. This module will help
to reduce bandwith fetching webpages, if supported by the webeserver.
If the webserver does not support gzip-compression, no decompression
will be made.


%prep
%setup -q -n WWW-Mechanize-GZip-%{version}
find . -type f -exec chmod -x -c {} \;

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
- submission
- update filtering

* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:22:13 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:49:06 -0000	1.2
@@ -0,0 +1 @@
+WWW-Mechanize-GZip-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:22:13 -0000	1.1
+++ sources	30 Sep 2009 01:49:07 -0000	1.2
@@ -0,0 +1 @@
+c3475fcff561629dddbd25b9db611e49  WWW-Mechanize-GZip-0.12.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:49:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:49:18 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/F-12 import.log, NONE,
	1.1 perl-WWW-Mechanize-GZip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014918.333F011C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28258/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Mechanize-GZip.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-WWW-Mechanize-GZip-0_12-1_fc11:F-12:perl-WWW-Mechanize-GZip-0.12-1.fc11.src.rpm:1254275353


--- NEW FILE perl-WWW-Mechanize-GZip.spec ---
Name:       perl-WWW-Mechanize-GZip 
Version:    0.12 
Release:    1%{?dist}
# lib/WWW/Mechanize/GZip.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Fetch compressed webpages
Source:     http://search.cpan.org/CPAN/authors/id/P/PE/PEGI/WWW-Mechanize-GZip-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/WWW-Mechanize-GZip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(WWW::Mechanize)

Requires:      perl(WWW::Mechanize)
Requires:      perl(Compress::Zlib)

%{?perl_default_filter}

%description
The WWW::Mechanize::GZip module tries to fetch a URL by requesting 
gzip-compression from the webserver.  If the response contains
a header with 'Content-Encoding: gzip', it decompresses the response in
order to get the original (uncompressed) content. This module will help
to reduce bandwith fetching webpages, if supported by the webeserver.
If the webserver does not support gzip-compression, no decompression
will be made.


%prep
%setup -q -n WWW-Mechanize-GZip-%{version}
find . -type f -exec chmod -x -c {} \;

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
- submission
- update filtering

* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:22:13 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:49:17 -0000	1.2
@@ -0,0 +1 @@
+WWW-Mechanize-GZip-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:22:13 -0000	1.1
+++ sources	30 Sep 2009 01:49:18 -0000	1.2
@@ -0,0 +1 @@
+c3475fcff561629dddbd25b9db611e49  WWW-Mechanize-GZip-0.12.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:49:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:49:30 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/F-11 import.log, NONE,
	1.1 perl-WWW-Mechanize-GZip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014930.AC17311C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28428/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Mechanize-GZip.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-WWW-Mechanize-GZip-0_12-1_fc11:F-11:perl-WWW-Mechanize-GZip-0.12-1.fc11.src.rpm:1254275364


--- NEW FILE perl-WWW-Mechanize-GZip.spec ---
Name:       perl-WWW-Mechanize-GZip 
Version:    0.12 
Release:    1%{?dist}
# lib/WWW/Mechanize/GZip.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Fetch compressed webpages
Source:     http://search.cpan.org/CPAN/authors/id/P/PE/PEGI/WWW-Mechanize-GZip-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/WWW-Mechanize-GZip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(WWW::Mechanize)

Requires:      perl(WWW::Mechanize)
Requires:      perl(Compress::Zlib)

%{?perl_default_filter}

%description
The WWW::Mechanize::GZip module tries to fetch a URL by requesting 
gzip-compression from the webserver.  If the response contains
a header with 'Content-Encoding: gzip', it decompresses the response in
order to get the original (uncompressed) content. This module will help
to reduce bandwith fetching webpages, if supported by the webeserver.
If the webserver does not support gzip-compression, no decompression
will be made.


%prep
%setup -q -n WWW-Mechanize-GZip-%{version}
find . -type f -exec chmod -x -c {} \;

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
- submission
- update filtering

* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:22:13 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:49:30 -0000	1.2
@@ -0,0 +1 @@
+WWW-Mechanize-GZip-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:22:13 -0000	1.1
+++ sources	30 Sep 2009 01:49:30 -0000	1.2
@@ -0,0 +1 @@
+c3475fcff561629dddbd25b9db611e49  WWW-Mechanize-GZip-0.12.tar.gz



From cweyl at fedoraproject.org  Wed Sep 30 01:49:42 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 30 Sep 2009 01:49:42 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/F-10 import.log, NONE,
	1.1 perl-WWW-Mechanize-GZip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930014942.76D5811C00C1@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28604/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Mechanize-GZip.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-WWW-Mechanize-GZip-0_12-1_fc11:F-10:perl-WWW-Mechanize-GZip-0.12-1.fc11.src.rpm:1254275377


--- NEW FILE perl-WWW-Mechanize-GZip.spec ---
Name:       perl-WWW-Mechanize-GZip 
Version:    0.12 
Release:    1%{?dist}
# lib/WWW/Mechanize/GZip.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Fetch compressed webpages
Source:     http://search.cpan.org/CPAN/authors/id/P/PE/PEGI/WWW-Mechanize-GZip-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/WWW-Mechanize-GZip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(WWW::Mechanize)

Requires:      perl(WWW::Mechanize)
Requires:      perl(Compress::Zlib)

%{?perl_default_filter}

%description
The WWW::Mechanize::GZip module tries to fetch a URL by requesting 
gzip-compression from the webserver.  If the response contains
a header with 'Content-Encoding: gzip', it decompresses the response in
order to get the original (uncompressed) content. This module will help
to reduce bandwith fetching webpages, if supported by the webeserver.
If the webserver does not support gzip-compression, no decompression
will be made.


%prep
%setup -q -n WWW-Mechanize-GZip-%{version}
find . -type f -exec chmod -x -c {} \;

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
- submission
- update filtering

* Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:22:13 -0000	1.1
+++ .cvsignore	30 Sep 2009 01:49:42 -0000	1.2
@@ -0,0 +1 @@
+WWW-Mechanize-GZip-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize-GZip/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:22:13 -0000	1.1
+++ sources	30 Sep 2009 01:49:42 -0000	1.2
@@ -0,0 +1 @@
+c3475fcff561629dddbd25b9db611e49  WWW-Mechanize-GZip-0.12.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 30 02:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:12:59 +0000
Subject: [pkgdb] clojure: salimma has requested watchcommits
Message-ID: <20090930021259.9F40F10F874@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on clojure (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:06 +0000
Subject: [pkgdb] clojure: salimma has requested approveacls
Message-ID: <20090930021306.A8E6B10F888@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on clojure (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:08 +0000
Subject: [pkgdb] clojure: salimma has requested commit
Message-ID: <20090930021308.8282510F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on clojure (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:12 +0000
Subject: [pkgdb] clojure: salimma has requested watchbugzilla
Message-ID: <20090930021312.3893810F85F@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on clojure (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:22 +0000
Subject: [pkgdb] clojure: salimma has requested watchbugzilla
Message-ID: <20090930021322.9347010F874@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on clojure (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:24 +0000
Subject: [pkgdb] clojure: salimma has requested watchcommits
Message-ID: <20090930021325.2B55810F857@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on clojure (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:27 +0000
Subject: [pkgdb] clojure: salimma has requested commit
Message-ID: <20090930021327.DB76710F894@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on clojure (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:30 +0000
Subject: [pkgdb] clojure: salimma has requested approveacls
Message-ID: <20090930021330.8D07410F874@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on clojure (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:36 +0000
Subject: [pkgdb] clojure: salimma has requested watchbugzilla
Message-ID: <20090930021336.91E5F10F888@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on clojure (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:39 +0000
Subject: [pkgdb] clojure: salimma has requested watchcommits
Message-ID: <20090930021339.DB62210F88C@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on clojure (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:42 +0000
Subject: [pkgdb] clojure: salimma has requested commit
Message-ID: <20090930021342.F1B6510F8A8@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on clojure (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:44 +0000
Subject: [pkgdb] clojure: salimma has requested approveacls
Message-ID: <20090930021344.C4B9410F85F@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on clojure (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:50 +0000
Subject: [pkgdb] clojure: salimma has requested watchbugzilla
Message-ID: <20090930021350.4965910F85F@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on clojure (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:52 +0000
Subject: [pkgdb] clojure: salimma has requested watchcommits
Message-ID: <20090930021352.BD80810F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on clojure (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:58 +0000
Subject: [pkgdb] clojure: salimma has requested approveacls
Message-ID: <20090930021358.D497910F888@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on clojure (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From pkgdb at fedoraproject.org  Wed Sep 30 02:13:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 02:13:55 +0000
Subject: [pkgdb] clojure: salimma has requested commit
Message-ID: <20090930021355.A234410F85F@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on clojure (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/clojure



From mclasen at fedoraproject.org  Wed Sep 30 02:25:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 02:25:43 +0000 (UTC)
Subject: rpms/glib2/F-12 .cvsignore, 1.116, 1.117 glib2.spec, 1.223,
	1.224 sources, 1.118, 1.119
Message-ID: <20090930022543.71E6E11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8175

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.22.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	22 Sep 2009 23:37:28 -0000	1.116
+++ .cvsignore	30 Sep 2009 02:25:41 -0000	1.117
@@ -1 +1 @@
-glib-2.22.0.tar.bz2
+glib-2.22.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- glib2.spec	25 Sep 2009 15:04:59 -0000	1.223
+++ glib2.spec	30 Sep 2009 02:25:41 -0000	1.224
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.22.0
-Release: 4%{?dist}
+Version: 2.22.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -21,8 +21,6 @@ BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
-Patch0: pyloc.patch
-
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -54,7 +52,6 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .pyloc
 
 autoreconf -f -i
 
@@ -127,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-4
 - Avoid multilib conflicts even harder
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	22 Sep 2009 23:37:28 -0000	1.118
+++ sources	30 Sep 2009 02:25:41 -0000	1.119
@@ -1 +1 @@
-e0bc5b08d467cc3763550923087772d3  glib-2.22.0.tar.bz2
+12297a7da577321647b38ade0593cb3c  glib-2.22.1.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 30 03:03:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 03:03:55 +0000 (UTC)
Subject: rpms/glib2/F-12 fix-runtime-libdir.patch, NONE, 1.1 glib2.spec,
	1.224, 1.225
Message-ID: <20090930030355.59B1E11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19270

Modified Files:
	glib2.spec 
Added Files:
	fix-runtime-libdir.patch 
Log Message:
2.22.1


fix-runtime-libdir.patch:
 gio/Makefile.am     |    4 ++--
 glib/Makefile.am    |    4 ++--
 gmodule/Makefile.am |    4 ++--
 gobject/Makefile.am |    4 ++--
 gthread/Makefile.am |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE fix-runtime-libdir.patch ---
diff -up glib-2.22.1/gio/Makefile.am.fix-runtime-libdir glib-2.22.1/gio/Makefile.am
--- glib-2.22.1/gio/Makefile.am.fix-runtime-libdir	2009-09-22 13:43:48.000000000 -0400
+++ glib-2.22.1/gio/Makefile.am	2009-09-29 22:52:56.044577337 -0400
@@ -430,7 +430,7 @@ if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libgio-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	rm -f $(DESTDIR)$(libdir)/libgio-2.0.so
-	ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgio-2.0.so
+	ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgio-2.0.so
 endif
diff -up glib-2.22.1/glib/Makefile.am.fix-runtime-libdir glib-2.22.1/glib/Makefile.am
--- glib-2.22.1/glib/Makefile.am.fix-runtime-libdir	2009-09-29 18:06:56.000000000 -0400
+++ glib-2.22.1/glib/Makefile.am	2009-09-29 22:52:56.040593799 -0400
@@ -385,7 +385,7 @@ install-data-hook: libglib-gdb.py
 if HAVE_GLIB_RUNTIME_LIBDIR
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	rm -f $(DESTDIR)$(libdir)/libglib-2.0.so
-	ln -s $(GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libglib-2.0.so
+	ln -s $(GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libglib-2.0.so
 endif
diff -up glib-2.22.1/gmodule/Makefile.am.fix-runtime-libdir glib-2.22.1/gmodule/Makefile.am
--- glib-2.22.1/gmodule/Makefile.am.fix-runtime-libdir	2009-09-29 22:56:34.846827363 -0400
+++ glib-2.22.1/gmodule/Makefile.am	2009-09-29 22:57:06.690827788 -0400
@@ -121,7 +121,7 @@ if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	rm -f $(DESTDIR)$(libdir)/libgmodule-2.0.so
-	ln -s $(GLIB_RUNTIME_LIBDIR)/libgmodule-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgmodule-2.0.so
+	ln -s $(GLIB_RUNTIME_LIBDIR)/libgmodule-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgmodule-2.0.so
 endif
diff -up glib-2.22.1/gobject/Makefile.am.fix-runtime-libdir glib-2.22.1/gobject/Makefile.am
--- glib-2.22.1/gobject/Makefile.am.fix-runtime-libdir	2009-09-29 18:06:56.000000000 -0400
+++ glib-2.22.1/gobject/Makefile.am	2009-09-29 22:52:56.041593367 -0400
@@ -279,7 +279,7 @@ install-data-hook: libgobject-gdb.py
 if HAVE_GLIB_RUNTIME_LIBDIR
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	rm -f $(DESTDIR)$(libdir)/libgobject-2.0.so
-	ln -s $(GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgobject-2.0.so
+	ln -s $(GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgobject-2.0.so
 endif
diff -up glib-2.22.1/gthread/Makefile.am.fix-runtime-libdir glib-2.22.1/gthread/Makefile.am
--- glib-2.22.1/gthread/Makefile.am.fix-runtime-libdir	2009-09-29 22:57:23.832578375 -0400
+++ glib-2.22.1/gthread/Makefile.am	2009-09-29 22:57:51.978582942 -0400
@@ -96,7 +96,7 @@ if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:
 	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	mv $(DESTDIR)$(libdir)/libgthread-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
-	mv $(DESTDIR)$(libdir)/libgthread-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+	mv $(DESTDIR)$(libdir)/libgthread-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
 	rm -f $(DESTDIR)$(libdir)/libgthread-2.0.so
-	ln -s $(GLIB_RUNTIME_LIBDIR)/libgthread-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgthread-2.0.so
+	ln -s $(GLIB_RUNTIME_LIBDIR)/libgthread-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgthread-2.0.so
 endif


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- glib2.spec	30 Sep 2009 02:25:41 -0000	1.224
+++ glib2.spec	30 Sep 2009 03:03:54 -0000	1.225
@@ -21,6 +21,8 @@ BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
+Patch0: fix-runtime-libdir.patch
+
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -52,6 +54,7 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .fix-runtime-libdir
 
 autoreconf -f -i
 



From mclasen at fedoraproject.org  Wed Sep 30 03:21:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 03:21:00 +0000 (UTC)
Subject: rpms/gtksourceview2/F-12 .cvsignore, 1.32, 1.33 gtksourceview2.spec,
	1.39, 1.40 sources, 1.32, 1.33
Message-ID: <20090930032100.DE5AA11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24098

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	24 Sep 2009 01:50:35 -0000	1.32
+++ .cvsignore	30 Sep 2009 03:20:59 -0000	1.33
@@ -1 +1 @@
-gtksourceview-2.8.0.tar.bz2
+gtksourceview-2.8.1.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-12/gtksourceview2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gtksourceview2.spec	24 Sep 2009 01:50:35 -0000	1.39
+++ gtksourceview2.spec	30 Sep 2009 03:20:59 -0000	1.40
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.8.0
+Version: 2.8.1
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.1-1
+- Update to 2.8.1
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.0-1
 - Update to 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	24 Sep 2009 01:50:35 -0000	1.32
+++ sources	30 Sep 2009 03:20:59 -0000	1.33
@@ -1 +1 @@
-b8456e21357bdffe5adb17b76d7e99a3  gtksourceview-2.8.0.tar.bz2
+7741e41d3c7c83a35014f0faef3c94a2  gtksourceview-2.8.1.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 30 03:22:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 03:22:35 +0000 (UTC)
Subject: rpms/gtk2-engines/F-12 .cvsignore, 1.66, 1.67 gtk2-engines.spec,
	1.116, 1.117 sources, 1.67, 1.68
Message-ID: <20090930032235.B25F411C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2-engines/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24651

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.18.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	22 Sep 2009 00:19:20 -0000	1.66
+++ .cvsignore	30 Sep 2009 03:22:35 -0000	1.67
@@ -1 +1 @@
-gtk-engines-2.18.3.tar.bz2
+gtk-engines-2.18.4.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/gtk2-engines.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- gtk2-engines.spec	22 Sep 2009 00:19:20 -0000	1.116
+++ gtk2-engines.spec	30 Sep 2009 03:22:35 -0000	1.117
@@ -1,6 +1,6 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.18.3
+Version:        2.18.4
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
+- Update to 2.18.4
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-1
 - Update to 2.18.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	22 Sep 2009 00:19:20 -0000	1.67
+++ sources	30 Sep 2009 03:22:35 -0000	1.68
@@ -1 +1 @@
-eb50c327331396be735570190d82db81  gtk-engines-2.18.3.tar.bz2
+95748497eafdfe898588931f08b2fccc  gtk-engines-2.18.4.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 30 03:24:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 03:24:51 +0000 (UTC)
Subject: rpms/cheese/F-12 .cvsignore, 1.36, 1.37 cheese.spec, 1.64,
	1.65 sources, 1.36, 1.37
Message-ID: <20090930032451.2010011C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25222

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.28.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	22 Sep 2009 03:23:32 -0000	1.36
+++ .cvsignore	30 Sep 2009 03:24:50 -0000	1.37
@@ -1 +1 @@
-cheese-2.28.0.tar.bz2
+cheese-2.28.0.1.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-12/cheese.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- cheese.spec	27 Sep 2009 06:34:33 -0000	1.64
+++ cheese.spec	30 Sep 2009 03:24:50 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           cheese
-Version:        2.28.0
-Release:        2%{?dist}
+Version:        2.28.0.1
+Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
@@ -127,6 +127,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Tue Sep 29 2009 Matthias Clasen  <mclasen at redhat.com> 2.28.0.1-1
+- Update to 2.28.0.1
+
 * Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.28.0-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	22 Sep 2009 03:23:32 -0000	1.36
+++ sources	30 Sep 2009 03:24:50 -0000	1.37
@@ -1 +1 @@
-1f41665f670350fcb0bba93f60ffef5c  cheese-2.28.0.tar.bz2
+843a64fb7392286dce9ac1dd0e2457c5  cheese-2.28.0.1.tar.bz2



From epienbro at fedoraproject.org  Wed Sep 30 03:39:14 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 30 Sep 2009 03:39:14 +0000 (UTC)
Subject: rpms/mingw32-pixman/F-12 .cvsignore, 1.5, 1.6 mingw32-pixman.spec, 
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090930033914.630F811C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29154

Modified Files:
	.cvsignore mingw32-pixman.spec sources 
Log Message:
Update to 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Aug 2009 20:56:33 -0000	1.5
+++ .cvsignore	30 Sep 2009 03:39:13 -0000	1.6
@@ -1 +1 @@
-pixman-0.16.0.tar.bz2
+pixman-0.16.2.tar.bz2


Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-12/mingw32-pixman.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-pixman.spec	18 Sep 2009 21:54:41 -0000	1.10
+++ mingw32-pixman.spec	30 Sep 2009 03:39:14 -0000	1.11
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pixman
-Version:        0.16.0
-Release:        2%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.2-1
+- Update to 0.16.2
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.0-2
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Aug 2009 20:56:33 -0000	1.5
+++ sources	30 Sep 2009 03:39:14 -0000	1.6
@@ -1 +1 @@
-183dea8a100c1d9732cdb2146ec90f68  pixman-0.16.0.tar.bz2
+0ce7de6d649f1a80d328b05e403730b6  pixman-0.16.2.tar.bz2



From shakthimaan at fedoraproject.org  Wed Sep 30 03:43:38 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 03:43:38 +0000 (UTC)
Subject: rpms/snacc/devel import.log, NONE, 1.1 snacc-bts-442873.patch, NONE,
	1.1 snacc-configure.patch, NONE, 1.1 snacc-examples.patch, NONE,
	1.1 snacc-gcc.patch, NONE, 1.1 snacc-ttab-tex-UTF8-fix.patch,
	NONE, 1.1 snacc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930034338.A4E2411C00C1@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/snacc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30468/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snacc-bts-442873.patch snacc-configure.patch 
	snacc-examples.patch snacc-gcc.patch 
	snacc-ttab-tex-UTF8-fix.patch snacc.spec 
Log Message:
First snacc package.



--- NEW FILE import.log ---
snacc-1_3-4_fc11:HEAD:snacc-1.3-4.fc11.src.rpm:1254282459

snacc-bts-442873.patch:
 snacc-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-bts-442873.patch ---
diff -uraN snacc-1.3bbn.orig/snacc-config.in snacc-1.3bbn/snacc-config.in
--- snacc-1.3bbn.orig/snacc-config.in	2001-01-27 02:02:40.000000000 +0100
+++ snacc-1.3bbn/snacc-config.in	2008-04-16 01:19:43.153755670 +0200
@@ -95,7 +95,7 @@
     if test $exec_prefix != /usr; then echo -n "-L${exec_prefix}/lib "; fi
     case "$language" in
     C)   echo -n "-lasn1c${buffertype} " ;;
-    C++) echo -n "-Iasn1c++ " ;;
+    C++) echo -n "-lasn1c++ " ;;
     *) ;;
     esac
   else

snacc-configure.patch:
 configure.ac |  313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  305 ---------------------------------------------------------
 2 files changed, 313 insertions(+), 305 deletions(-)

--- NEW FILE snacc-configure.patch ---
diff -uraN snacc-1.3bbn/configure.ac snacc-1.3bbn-debian/configure.ac
--- snacc-1.3bbn/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3bbn-debian/configure.ac	2005-07-30 17:20:35.043753552 +0000
@@ -0,0 +1,313 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl ---
+dnl	$Log: configure.ac,v $
+dnl	Revision 1.3  2002/11/19 20:28:12  debacle
+dnl	libtool changes.
+dnl	
+dnl	Revision 1.2  2002/11/19 19:37:38  debacle
+dnl	Auto-tools stuff.
+dnl	
+dnl	Revision 1.1  2002/11/19 19:18:04  debacle
+dnl	New autoconf.
+dnl	
+dnl	Revision 1.13  1997/09/04 13:54:04  wan
+dnl	A little more portability
+dnl
+dnl	Revision 1.12  1997/02/28 13:39:35  wan
+dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
+dnl
+dnl	Revision 1.11  1997/02/16 16:50:27  rj
+dnl	made return *this after calling abort()'' a compile time option.
+dnl
+dnl	Revision 1.10  1997/02/15 20:06:27  rj
+dnl	adjust to changed AC_TRY_COMPILE macro
+dnl
+dnl	Revision 1.9  1997/02/15 20:01:38  rj
+dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
+dnl
+dnl	Revision 1.8  1997/01/01 19:57:01  rj
+dnl	changes for autoconf version 2.12
+dnl
+dnl	Revision 1.7  1995/09/07  18:36:47  rj
+dnl	psbook and psnup are looked for (used by .../doc/makefile)
+dnl
+dnl	Revision 1.6  1995/07/24  14:44:47  rj
+dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
+dnl
+dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
+dnl
+dnl	look for patch(1). the c-lib uses it to patch tbl.h.
+dnl
+dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
+dnl
+dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
+dnl
+dnl	Revision 1.5  1995/02/20  11:18:41  rj
+dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
+dnl	check for isinf(3) and finite(3) added.
+dnl
+dnl	Revision 1.4  1995/02/17  15:15:44  rj
+dnl	hack to let makedepend find .h files the way gcc does.
+dnl
+dnl	Revision 1.3  1995/02/17  14:26:40  rj
+dnl	adjustments for autoconf 2.x
+dnl
+dnl	Revision 1.2  1994/10/08  04:29:37  rj
+dnl	search for Tcl/Tk
+dnl
+dnl	Revision 1.1  1994/09/01  00:51:22  rj
+dnl	first check-in (new file).
+dnl
+AC_INIT( compiler/core/snacc.c)
+AC_REVISION($Revision: 1.3 $)
+AM_INIT_AUTOMAKE(snacc, 1.3)
+AM_CONFIG_HEADER( config.h)
+dnl --- alternative programs:
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_ISC_POSIX
+dnl if CDPATH is set, the configure script might fail
+unset CDPATH
+dnl if test -n "$GCC"; then
+dnl   saveCC="$CC"
+dnl   CC="$CC -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
+dnl fi
+AC_PROG_GCC_TRADITIONAL
+AC_MSG_CHECKING( whether ANSI or K&R style C)
+AC_TRY_COMPILE([ ], [void *p; p = "test";], [
+AC_MSG_RESULT(ANSI)
+AC_DEFINE( __USE_ANSI_C__)
+], [
+AC_MSG_RESULT(K&R)
+])
+AC_PROG_CXX
+AC_LANG_CPLUSPLUS
+dnl if test -n "$GCC"; then
+dnl   saveCXX="$CXX"
+dnl   CXX="$CXX -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
+dnl fi
+AC_MSG_CHECKING( for bool built-in)
+AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for variable sized automatic arrays)
+AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for volatile functions)
+AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
+AC_LANG_C
+AM_PROG_LEX
+case "$LEX" in
+  lex)
+    LFLAGS="-Nc10000"
+  ;;
+  flex)
+    CFLAGS="$CFLAGS -DFLEX_IN_USE"
+esac
+AC_SUBST( LFLAGS)
+AC_SUBST( CFLAGS)
+# the boot strapping code in .../c-lib/ needs patch:
+AC_CHECK_PROGS( PATCH, patch, false)
+AC_PROG_YACC
+AC_PROG_LN_S
+AC_PROG_INSTALL
+dnl --- header files:
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_HEADER_STDC
+AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
+AC_FUNC_VPRINTF
+dnl --- system and compiler characteristics:
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_LIB( m, sin)
+AC_CHECK_FUNCS( isinf finite)
+AC_CHECK_FUNCS( memset memcpy memcmp)
+dnl ---
+AC_PATH_X
+AC_PATH_XTRA
+AC_CHECK_PROGS( TCLSH, tclsh, false)
+if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
+  AC_CHECK_HEADER(
+    tcl.h,
+    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
+    AC_CHECK_LIB(
+      tcl,
+      Tcl_CreateInterp,
+      [saveCFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS $X_CFLAGS"
+      AC_CHECK_LIB(
+	tk,
+	Tk_CreateWindow,
+	[AC_DEFINE( HAVE_TCL)
+	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
+	CXXTCLDIR="tcl"
+	TCLDIRS="tcl-lib tcl-asn tcl-example"
+	AC_LANG_CPLUSPLUS
+	AC_CHECK_LIB(
+	  TkTree,
+	  Tree_Init,
+	  [TREELIBS="-lTkTree"],
+	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
+	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+	AC_LANG_C],
+	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
+	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+      CFLAGS="$saveCFLAGS"],
+      [AC_MSG_RESULT( [tcl library not found])],
+      $TCLOTHERLIBS -lm)])
+fi
+AC_SUBST( CXXTCLDIR)
+AC_SUBST( TCLDIRS)
+AC_SUBST( TCLLIBS)
+AC_SUBST( TREELIBS)
+dnl ---
+AC_CHECK_PROGS( LATEX, latex, false)
+AC_CHECK_PROGS( BIBTEX, bibtex, false)
+AC_CHECK_PROGS( DVIPS, dvips, false)
+AC_CHECK_PROGS( DETEX, detex2 detex, false)
+AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
+AC_CHECK_PROGS( PSBOOK, psbook, false)
+AC_CHECK_PROGS( PSNUP, psnup, false)
+AC_CHECK_PROGS( SPELL, ispell spell, spell)
+dnl ---
+
+dnl Configure for libtool.
+AC_PROG_LIBTOOL
+
+dnl Generate the C library build directories.
+linked_files=`cd c-lib/src && ls *.c`
+for dir in Cebuf ebuf mbuf sbuf tbl; do
+  if test -d c-lib/$dir; then :; else
+    echo creating c-lib/$dir
+    mkdir c-lib/$dir
+  fi
+  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
+  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
+  case $dir in
+  Cebuf) 
+    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
+    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
+    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
+    ;;
+  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
+  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
+  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
+  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
+  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
+done
+
+dnl Generate the C++ and Tcl library build directories.
+linked_files=`cd c++-lib/src && ls *.c *.C`
+for dir in c++ tcl; do
+  if test -d c++-lib/$dir; then :; else
+    echo creating c++-lib/$dir
+    mkdir c++-lib/$dir
+  fi
+  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
+  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
+  case $dir in
+  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
+  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
+  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
+done  
+
+dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
+dnl from glib-1.2.1's configure.in.  See that file for an explanation.
+AC_OUTPUT_COMMANDS([
+          
+## Generate `snaccconfig.h' in two 
+## cases:
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+case "x$CONFIG_OTHER" in
+*snaccconfig.h) gen_snaccconfig_h=yes
+;;
+esac
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  if test "x${CONFIG_OTHER}" = x; then
+    gen_snaccconfig_h=yes
+  fi
+fi
+
+## If we're generating snaccconfig.h:
+## FIXME - currently, snaccconfig.h is just the normal
+## config.h wrapped.  this is because the user include
+## files use the normal config.h symbol names, and I 
+## haven't changed those yet.
+if test "x$gen_snaccconfig_h" = xyes; then
+  outfile=snaccconfig.h
+  echo creating $outfile
+  cat <<SNACCEOF > ${outfile}-tmp
+/* snaccconfig.h
+ * 
+ * This is an automatically generated file - please modify 'configure.in'.
+ */
+
+#ifndef _SNACCCONFIG_H
+#define _SNACCCONFIG_H
+
+SNACCEOF
+  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
+  cat <<SNACCEOF >> ${outfile}-tmp
+
+#endif /* !_SNACCCONFIG_H */
+SNACCEOF
+  if cmp -s ${outfile}-tmp $outfile; then
+    echo $outfile is unchanged
+    rm -f ${outfile}-tmp
+  else
+    mv ${outfile}-tmp ${outfile}
+  fi
+fi
+])
+
+dnl Writes files.
+AC_OUTPUT(Makefile
+          compiler/Makefile
+          compiler/back-ends/c++-gen/Makefile
+          compiler/back-ends/c-gen/Makefile
+          compiler/back-ends/idl-gen/Makefile
+          compiler/back-ends/Makefile
+          compiler/core/Makefile
+	  c-lib/Makefile
+	  c-lib/inc/Makefile
+	  c-lib/src/Makefile
+	  c-lib/Cebuf/Makefile
+	  c-lib/ebuf/Makefile
+	  c-lib/mbuf/Makefile
+	  c-lib/sbuf/Makefile
+	  c-lib/tbl/Makefile
+	  c++-lib/Makefile
+	  c++-lib/inc/Makefile
+	  c++-lib/src/Makefile
+	  c++-lib/c++/Makefile
+          asn1specs/Makefile
+          tbl-tools/berdecode/Makefile
+          tbl-tools/mkchdr/Makefile
+          tbl-tools/ptbl/Makefile
+          tbl-tools/pval/Makefile
+          tbl-tools/Makefile
+          doc/Makefile
+          snacc-config,
+[if test -f snacc-config; then chmod +x snacc-config; fi])
+dnl --- finis
diff -uraN snacc-1.3bbn/configure.in snacc-1.3bbn-debian/configure.in
--- snacc-1.3bbn/configure.in	2005-07-30 20:06:02.703761472 +0000
+++ snacc-1.3bbn-debian/configure.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl ---
-dnl	$Log: configure.in,v $
-dnl	Revision 1.13  1997/09/04 13:54:04  wan
-dnl	A little more portability
-dnl
-dnl	Revision 1.12  1997/02/28 13:39:35  wan
-dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
-dnl
-dnl	Revision 1.11  1997/02/16 16:50:27  rj
-dnl	made return *this after calling abort()'' a compile time option.
-dnl
-dnl	Revision 1.10  1997/02/15 20:06:27  rj
-dnl	adjust to changed AC_TRY_COMPILE macro
-dnl
-dnl	Revision 1.9  1997/02/15 20:01:38  rj
-dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
-dnl
-dnl	Revision 1.8  1997/01/01 19:57:01  rj
-dnl	changes for autoconf version 2.12
-dnl
-dnl	Revision 1.7  1995/09/07  18:36:47  rj
-dnl	psbook and psnup are looked for (used by .../doc/makefile)
-dnl
-dnl	Revision 1.6  1995/07/24  14:44:47  rj
-dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
-dnl
-dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
-dnl
-dnl	look for patch(1). the c-lib uses it to patch tbl.h.
-dnl
-dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
-dnl
-dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
-dnl
-dnl	Revision 1.5  1995/02/20  11:18:41  rj
-dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
-dnl	check for isinf(3) and finite(3) added.
-dnl
-dnl	Revision 1.4  1995/02/17  15:15:44  rj
-dnl	hack to let makedepend find .h files the way gcc does.
-dnl
-dnl	Revision 1.3  1995/02/17  14:26:40  rj
-dnl	adjustments for autoconf 2.x
-dnl
-dnl	Revision 1.2  1994/10/08  04:29:37  rj
-dnl	search for Tcl/Tk
-dnl
-dnl	Revision 1.1  1994/09/01  00:51:22  rj
-dnl	first check-in (new file).
-dnl
-AC_INIT( compiler/core/snacc.c)
-AC_REVISION($Revision: 1.13 $)
-AM_INIT_AUTOMAKE(snacc, 1.3)
-AM_CONFIG_HEADER( config.h)
-dnl --- alternative programs:
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_ISC_POSIX
-if test -n "$GCC"; then
-dnl   saveCC="$CC"
-dnl   CC="$CC -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
-fi
-AC_PROG_GCC_TRADITIONAL
-AC_MSG_CHECKING( whether ANSI or K&R style C)
-AC_TRY_COMPILE([ ], [void *p; p = "test";], [
-AC_MSG_RESULT(ANSI)
-AC_DEFINE( __USE_ANSI_C__)
-], [
-AC_MSG_RESULT(K&R)
-])
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-dnl if test -n "$GCC"; then
-dnl   saveCXX="$CXX"
-dnl   CXX="$CXX -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
-dnl fi
-AC_MSG_CHECKING( for bool built-in)
-AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for variable sized automatic arrays)
-AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for volatile functions)
-AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
-AC_LANG_C
-AM_PROG_LEX
-case "$LEX" in
-  lex)
-    LFLAGS="-Nc10000"
-  ;;
-  flex)
-    CFLAGS="$CFLAGS -DFLEX_IN_USE"
-esac
-AC_SUBST( LFLAGS)
-AC_SUBST( CFLAGS)
-# the boot strapping code in .../c-lib/ needs patch:
-AC_CHECK_PROGS( PATCH, patch, false)
-AC_PROG_YACC
-AC_PROG_LN_S
-AC_PROG_INSTALL
-dnl --- header files:
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_HEADER_STDC
-AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
-AC_FUNC_VPRINTF
-dnl --- system and compiler characteristics:
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_LIB( m, sin)
-AC_CHECK_FUNCS( isinf finite)
-AC_CHECK_FUNCS( memset memcpy memcmp)
-dnl ---
-AC_PATH_X
-AC_PATH_XTRA
-AC_CHECK_PROGS( TCLSH, tclsh, false)
-if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
-  AC_CHECK_HEADER(
-    tcl.h,
-    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
-    AC_CHECK_LIB(
-      tcl,
-      Tcl_CreateInterp,
-      [saveCFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $X_CFLAGS"
-      AC_CHECK_LIB(
-	tk,
-	Tk_CreateWindow,
-	[AC_DEFINE( HAVE_TCL)
-	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
-	CXXTCLDIR="tcl"
-	TCLDIRS="tcl-lib tcl-asn tcl-example"
-	AC_LANG_CPLUSPLUS
-	AC_CHECK_LIB(
-	  TkTree,
-	  Tree_Init,
-	  [TREELIBS="-lTkTree"],
-	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
-	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-	AC_LANG_C],
-	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
-	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-      CFLAGS="$saveCFLAGS"],
-      [AC_MSG_RESULT( [tcl library not found])],
-      $TCLOTHERLIBS -lm)])
-fi
-AC_SUBST( CXXTCLDIR)
-AC_SUBST( TCLDIRS)
-AC_SUBST( TCLLIBS)
-AC_SUBST( TREELIBS)
-dnl ---
-AC_CHECK_PROGS( LATEX, latex, false)
-AC_CHECK_PROGS( BIBTEX, bibtex, false)
-AC_CHECK_PROGS( DVIPS, dvips, false)
-AC_CHECK_PROGS( DETEX, detex2 detex, false)
-AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
-AC_CHECK_PROGS( PSBOOK, psbook, false)
-AC_CHECK_PROGS( PSNUP, psnup, false)
-AC_CHECK_PROGS( SPELL, ispell spell, spell)
-dnl ---
-
-dnl Configure for libtool.
-AM_PROG_LIBTOOL
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
-AC_SUBST(LTLIBOBJS)
-
-dnl Generate the C library build directories.
-linked_files=`cd c-lib/src && ls *.c`
-for dir in Cebuf ebuf mbuf sbuf tbl; do
-  if test -d c-lib/$dir; then :; else
-    echo creating c-lib/$dir
-    mkdir c-lib/$dir
-  fi
-  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
-  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
-  case $dir in
-  Cebuf) 
-    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
-    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
-    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
-    ;;
-  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
-  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
-  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
-  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
-  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
-done
-
-dnl Generate the C++ and Tcl library build directories.
-linked_files=`cd c++-lib/src && ls *.c *.C`
-for dir in c++ tcl; do
-  if test -d c++-lib/$dir; then :; else
-    echo creating c++-lib/$dir
-    mkdir c++-lib/$dir
-  fi
-  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
-  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
-  case $dir in
-  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
-  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
-  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
-done  
-
-dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
-dnl from glib-1.2.1's configure.in.  See that file for an explanation.
-AC_OUTPUT_COMMANDS([
-          
-## Generate `snaccconfig.h' in two 
-## cases:
-## 1. `config.status' is run either explicitly, or via configure.
-##     Esp. not when it is run in `Makefile' to generate makefiles and
-##     config.h
-## 2. CONFIG_OTHER is set explicitly
-##
-## Case 1 is difficult.  We know that `automake' sets one of
-## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
-## only when AM_CONFIG_HEADER is set, however.
-
-case "x$CONFIG_OTHER" in
-*snaccconfig.h) gen_snaccconfig_h=yes
-;;
-esac
-if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
-  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
-  if test "x${CONFIG_OTHER}" = x; then
-    gen_snaccconfig_h=yes
-  fi
-fi
-
-## If we're generating snaccconfig.h:
-## FIXME - currently, snaccconfig.h is just the normal
-## config.h wrapped.  this is because the user include
-## files use the normal config.h symbol names, and I 
-## haven't changed those yet.
-if test "x$gen_snaccconfig_h" = xyes; then
-  outfile=snaccconfig.h
-  echo creating $outfile
-  cat <<SNACCEOF > ${outfile}-tmp
-/* snaccconfig.h
- * 
- * This is an automatically generated file - please modify 'configure.in'.
- */
-
-#ifndef _SNACCCONFIG_H
-#define _SNACCCONFIG_H
-
-SNACCEOF
-  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
-  cat <<SNACCEOF >> ${outfile}-tmp
-
-#endif /* !_SNACCCONFIG_H */
-SNACCEOF
-  if cmp -s ${outfile}-tmp $outfile; then
-    echo $outfile is unchanged
-    rm -f ${outfile}-tmp
-  else
-    mv ${outfile}-tmp ${outfile}
-  fi
-fi
-])
-
-dnl Writes files.
-AC_OUTPUT(Makefile
-          compiler/Makefile
-          compiler/back-ends/c++-gen/Makefile
-          compiler/back-ends/c-gen/Makefile
-          compiler/back-ends/idl-gen/Makefile
-          compiler/back-ends/Makefile
-          compiler/core/Makefile
-	  c-lib/Makefile
-	  c-lib/inc/Makefile
-	  c-lib/src/Makefile
-	  c-lib/Cebuf/Makefile
-	  c-lib/ebuf/Makefile
-	  c-lib/mbuf/Makefile
-	  c-lib/sbuf/Makefile
-	  c-lib/tbl/Makefile
-	  c++-lib/Makefile
-	  c++-lib/inc/Makefile
-	  c++-lib/src/Makefile
-	  c++-lib/c++/Makefile
-	  c++-lib/tcl/Makefile
-          asn1specs/Makefile
-          tbl-tools/berdecode/Makefile
-          tbl-tools/mkchdr/Makefile
-          tbl-tools/ptbl/Makefile
-          tbl-tools/pval/Makefile
-          tbl-tools/Makefile
-          doc/Makefile
-          snacc-config,
-[if test -f snacc-config; then chmod +x snacc-config; fi])
-dnl --- finis

snacc-examples.patch:
 c++-examples/any/README            |   90 +++
 c++-examples/any/example.C         |  115 ++++
 c++-examples/any/genber.C          |  150 +++++
 c++-examples/any/makefile          |  154 ++++++
 c++-examples/makefile              |   34 +
 c++-examples/simple/README         |  105 ++++
 c++-examples/simple/example.C      |  115 ++++
 c++-examples/simple/genber.C       |   99 +++
 c++-examples/simple/good-pr.ber.uu |    7 
 c++-examples/simple/makefile       |  146 +++++
 c++-examples/snmp/README           |  126 ++++
 c++-examples/snmp/makefile         |  103 ++++
 c++-examples/test-lib/README       |   37 +
 c++-examples/test-lib/makefile     |   59 ++
 c++-examples/test-lib/test-lib.C   |  781 ++++++++++++++++++++++++++++++
 c-examples/any/README              |  107 ++++
 c-examples/any/example.c           |  161 ++++++
 c-examples/any/genber.c            |  164 ++++++
 c-examples/any/makefile            |  144 +++++
 c-examples/makefile                |   42 +
 c-examples/simple/README           |  128 +++++
 c-examples/simple/expbuf-ex.c      |  166 ++++++
 c-examples/simple/genber.c         |  154 ++++++
 c-examples/simple/good-pr.ber.uu   |    7 
 c-examples/simple/makefile         |  198 +++++++
 c-examples/simple/minbuf-ex.c      |  162 ++++++
 c-examples/simple/sbuf-ex.c        |  154 ++++++
 c-examples/snmp/README             |  118 ++++
 c-examples/snmp/makefile           |   91 +++
 c-examples/test-lib/README         |   37 +
 c-examples/test-lib/makefile       |   50 +
 c-examples/test-lib/test-lib.c     |  935 +++++++++++++++++++++++++++++++++++++
 tbl-example/README                 |   83 +++
 tbl-example/example.c              |  174 ++++++
 tbl-example/makefile               |   82 +++
 tbl-example/p-rec.ber.uu           |    7 
 36 files changed, 5285 insertions(+)

--- NEW FILE snacc-examples.patch ---
diff -uraN snacc-1.3bbn/c++-examples/any/README snacc-1.3b4/c++-examples/any/README
--- snacc-1.3bbn/c++-examples/any/README	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/README	1997-02-16 20:25:26.000000000 +0000
@@ -0,0 +1,90 @@
+(RCS control information is at the end of this file.)
+
+
+C++ ANY example README
+---------------------
+
+This example shows how the snacc compiler handles the ANY DEFINED BY
+type in C++.  ANY types (not ANY DEFINED BY) require modifications
+to the generated code.  Type "make" to build this example.
+
+This directory should have the following 4 files in it:
+
+        README
+        example.C
+        genber.C
+        makefile
+
+There are 3 programs generated by the makefile:
+
+        genber - builds a BER value of the AnyTestType and writes it
+                 to a file called "att.ber"
+
+        def    - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses definite
+                 lengths for constructed values.
+
+        indef  - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses indefinite
+                 lengths for constructed values.
+
+
+These files use the code generated by snacc from the
+snacc/asn1specs/any.asn1 file. (see the makefile)
+
+Look at genber.C to see how values can be built and printed.
+
+Look at the generated code in any_test.C and any_test.h to see how the
+any hash table is built.
+
+
+try the following commands in your c-shell:
+
+%1 genber                   # generate the att.ber file
+%2 indef att.ber > tmp.ber  # decode att.ber an re-encode into tmp.ber
+%3 def tmp.ber > tmp2.ber   # decode tmp.ber an re-encode into tmp2.ber
+%4 diff att.ber tmp2.ber    # compare .ber files (should be the same)
+
+When you are finished with the example type "make clean"  to remove
+the binaries and generated code.
+
+
+
+Things To Note
+--------------
+
+Snacc ASN.1 comment commands
+
+In the snacc/asn1specs/any.asn1 file, the AnyTestType has a special
+"--snacc" ASN.1 comment after ::= to give snacc some extra information
+about the AnyTestType.
+
+AnyTestType ::= --snacc isPdu:"TRUE" -- SEQUENCE { ... etc. ... }
+
+The "isPdu" flag only affects the generated C code, not C++.  Each
+C++ type gets PDU methods by default.
+
+
+SNMP OBJECT-TYPE Macro
+
+The SNMP OBJECT-TYPE macro is used to define the id value to type
+mapping for ANY DEFINED BY types.  The macro has been modified to
+accept both INTEGERs and OBJECT IDENTIFIERs as id values (see
+snacc/asn1specs/any.asn1).  This macro can be used with other
+protocols to define the id to type mapping.
+
+Two hash tables are used to hold the id to type mappings. One for
+INTEGER to type mappings and the other for OBJECT IDENTIFIER to type
+mappings.  The hash tables are automatically initialized in each
+module that has OBJECT-TYPE macros.  In C the hash table must be
+explicitly initialized.
+
+#-------------------------------------------------------------------------------
+# $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/README,v 1.2 1997/02/16 20:25:26 rj Exp $
+# $Log: README,v $
+# Revision 1.2  1997/02/16 20:25:26  rj
+# check-in of a few cosmetic changes
+#
+# Revision 1.1  1994/08/31  08:47:59  rj
+# first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+#
diff -uraN snacc-1.3bbn/c++-examples/any/example.C snacc-1.3b4/c++-examples/any/example.C
--- snacc-1.3bbn/c++-examples/any/example.C	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/example.C	1995-07-24 15:33:33.000000000 +0000
@@ -0,0 +1,115 @@
+// c++_examples/any/example.C - an example of how to use C++ ASN.1-BER
+//              for ANY Types
+//
+// AUTHOR: Mike Sample
+// DATE:   92
+//
+// $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/example.C,v 1.5 1995/07/24 15:33:33 rj Exp $
+// $Log: example.C,v $
+// Revision 1.5  1995/07/24 15:33:33  rj
+// changed `_' to `-' in file names.
+//
+// any-test.[hC] becomes any.[hC] due to to snacc's new file name generation scheme.
+//
+// check return value of new.
+//
+// Revision 1.4  1995/02/18  13:53:07  rj
+// added #define HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS since not every C++ compiler provides them.
+//
+// Revision 1.3  1994/10/08  01:26:21  rj
+// several \size_t'
+//
+// Revision 1.2  1994/08/31  08:56:29  rj
+// first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+//
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fstream.h>
+
+#include "asn-incl.h"
+#include "any.h"
+
+main (int argc, char *argv[])
+{
+    if (argc != 2)
+    {
+        cerr << "Usage: " << argv[0] << " <BER data file name>" << endl;
+        cerr << "   Decodes the given AnyTestType BER data file" << endl;
+        cerr << "   and re-encodes it to stdout" << endl;
+        exit (1);
+    }
+
+    ifstream dataFile;
+    // open the data file
+    dataFile.open (argv[1]);
+
+    if (!dataFile)
+    {
+        perror ("ifstream::open");
+        exit (1);
+    }
+
+    // get size of the data file file
+    dataFile.seekg (0, ios::end);
+    int dataSize = dataFile.tellg();
+    dataFile.seekg (0);
+
+    // read data from file into contiguous block for a buffer
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char data[dataSize];
+#else
+    char *data = new char[dataSize];
+    if (!data)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    dataFile.read (data, dataSize);
+    dataFile.close();
+
+    //
+    // put the BER data read from the file
+    // into buffer format, ready for reading from the
+    // beginning
+    //
+    AsnBuf inputBuf;
+    inputBuf.InstallData ((char*)data, dataSize);
+
+    size_t decodedLen;
+    AnyTestType att;
+
+    if (!att.BDecPdu (inputBuf, decodedLen))
+    {
+        cerr << "ERROR - Decode routines failed, exiting..." << endl;
+        exit (1);
+    }
+
+    cerr  << "decodedValue AnyTestType ::= " << att << endl << endl;
+
+    //
+    // allocate a new buffer and set up for writing to
+    //
+    AsnBuf  outputBuf;
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char outputData[dataSize + 512];
+#else
+    char *outputData = new char[dataSize + 512];
+    if (!outputData)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    outputBuf.Init (outputData, dataSize+512);
+    outputBuf.ResetInWriteRvsMode();
[...5030 lines suppressed...]
+
+    if (argc != 3)
+    {
+        Usage (argv[0]);
+        return 1;
+    }
+
+    tblFileName = argv[1];
+    berFileName = argv[2];
+
+    /* init mem pool to hold  decoded val */
+    InitNibbleMem (1024, 1024);
+
+    /* read in and decode the type table */
+    tbl = LoadTblFile (tblFileName);
+    if (tbl == NULL)
+        return 1;
+
+    fileData = LoadFile (berFileName, &fsize);
+    if (fileData == NULL)
+        return 1;
+
+    SBufInstallData (&sb, fileData, fsize);
+    PutSBufInGenBuf (&sb, &gb);
+
+    fprintf (stdout, "\n\n-- decoded contents of BER PersonnelRecord file: \"%s\"--\n", berFileName);
+
+    val = TblDecode (tbl, NULL, "PersonnelRecord", &gb, &bytesDecoded);
+
+    if (val == NULL)
+        fprintf (stdout, "-- Decoding error occured somewhere -- \n");
+    else
+        TblPrintValue (tbl, NULL, "PersonnelRecord", stdout, val);
+
+    fprintf (stdout, "\n\n -- decoded %d bytes for the above value --\n\n", bytesDecoded, berFileName);
+
+    free (fileData); /* was malloc'd in LoadFile */
+
+    /*
+     * process value here
+     * (This is where the header file generated by mkchdr is
+     * useful - you can access the decoded value in a standard
+     * /easier way).
+     *
+     * Ok, well, the names "field0" etc aren't that nice
+     * but what did you expect - they aren't named in the ASN.1
+     * spec so mkchdr just makes them up.  To fix this, just
+     * add field names to you ASN.1 spec - it will not change the
+     * way the values are encoded - so you're not making it
+     * incompatible with the original. (not including value notation)
+     */
+    printf ("The following printout is an example of using the\n");
+    printf ("hdr file generated by mkchdr to access the data\n");
+    printf ("returned from the table decoder.  Look in \"example.c\"\n\n");
+
+
+    printf ("***** JQ GUMBY & CO Database *****************************************\n");
+    printf ("Employee Name:      %s %s %s\n", val->field0->givenName->octs, val->field0->initial->octs, val->field0->familyName->octs);
+    printf ("Title:              %s\n", val->title->octs);
+    printf ("Employee Number:    %d\n", *val->field1);
+    printf ("Date of Hire:       %s\n", val->dateOfHire->octs);
+    printf ("Name of Spouse:     %s %s %s\n", val->nameOfSpouse->givenName->octs, val->nameOfSpouse->initial->octs, val->nameOfSpouse->familyName->octs);
+    printf ("Number of Children: %d\n", AsnListCount (val->children));
+    printf ("**********************************************************************\n\n");
+
+    /*
+     * finished playing with the decoded value.
+     * now re-encode the value.  Using an expbuf to hold the encoded val
+     * because they can grow and in general you can predict a values
+     * encoded size (although we could assume that is would be close to
+     * the same size as the one we read in at the beginning of this prg).
+     * (note: the size of PersonnelRecord BER value we decoded may be
+     * different from the size of the re-encoded version depending on
+     * the use of indefinite or definite lengths.  Both are valid BER.)
+     */
+    fprintf (stdout, "now re-encoding the PersonnelRecord value to \"%s\"\n", outputFileNameG);
+
+    ebPtr = ExpBufAllocBufAndData();
+    ExpBufResetInWriteRvsMode (ebPtr); /* set up to hold encoding (= writing) */
+
+    PutExpBufInGenBuf (ebPtr, &gb);
+
+    if (TblEncode (tbl, NULL, "PersonnelRecord", &gb, val, &bytesEncoded) < 0)
+        fprintf (stderr, "main: error encoding the PersonnelRecord\n");
+
+    /* copy ExpBuf data to file */
+    outputFile = fopen (outputFileNameG, "w");
+    if (outputFile == NULL)
+    {
+        fprintf (stderr, "error - could not open file \"%s\"\n", outputFileNameG);
+        perror ("main: fopen:");
+    }
+
+    ExpBufCopyToFile (ebPtr, outputFile);
+
+    fclose (outputFile);
+
+    /* free the encoded version */
+    ExpBufFreeBufAndDataList (ebPtr);
+
+
+    return 0;
+} /* main */
diff -uraN snacc-1.3bbn/tbl-example/makefile snacc-1.3b4/tbl-example/makefile
--- snacc-1.3bbn/tbl-example/makefile	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/makefile	1997-02-15 19:33:26.000000000 +0000
@@ -0,0 +1,82 @@
+# file: .../tbl-example/makefile
+#
+# $Header: /usr/app/odstb/CVS/snacc/tbl-example/makefile,v 1.1 1997/02/15 19:33:26 rj Exp $
+# $Log: makefile,v $
+# Revision 1.1  1997/02/15 19:33:26  rj
+# first check-in
+#
+
+include ../makehead
+
+TOP		= ..
+
+ASN1_SRC_DIR	= $(TOP)/asn1specs
+
+ASN1_C_LIB_DIR	= $(TOP)/c-lib
+ASN1_C_INC_DIR	= $(ASN1_C_LIB_DIR)/inc
+TTBL_ASN1_LIB	= $(ASN1_C_LIB_DIR)/libasn1ctbl.a
+
+COMPILERDIR	= $(TOP)/compiler
+SNACC		= $(COMPILERDIR)/snacc
+USEFUL_TYPES	= $(ASN1_SRC_DIR)/asn-useful.asn1
+SNACCFLAGS	= -u $(USEFUL_TYPES)
+
+TBLTOOLSDIR	= $(TOP)/tbl-tools
+MKHDR		= $(TBLTOOLSDIR)/mkchdr/mkchdr
+
+ASN1FILES	= $(ASN1_SRC_DIR)/p-rec.asn1
+ASN1TTFILE	= p-rec.tt
+ASN1TTHFILE	= p-rec.h
+
+CFILES	= example.c
+OFILES	= example.o
+
+DISTFILES = \
+	README		\
+	makefile	\
+	$(CFILES)	\
+	p-rec.ber
+
+CPPFLAGS	+= -I$(TOP) -I$(ASN1_C_INC_DIR) -DUSE_GEN_BUF
+
+#-------------------------------------------------------------------------------
+
+all::		example
+
+example:	$(OFILES) $(TTBL_ASN1_LIB)
+		$(REASON)
+		$(CC) $(CFLAGS) -o example $(OFILES) $(TTBL_ASN1_LIB) $(LIBS)
+
+$(ASN1TTFILE):	$(ASN1FILES)
+		$(REASON)
+		$(SNACC) $(SNACCFLAGS) -T $@ $(ASN1FILES)
+
+$(SNACC) $(MKHDR):
+		cd $(@D) && $(MAKE) $(@F)
+
+$(TTBL_ASN1_LIB):
+		cd $(@D) && $(MAKE) tbl-lib
+
+$(ASN1TTHFILE):	$(ASN1TTFILE)
+		$(REASON)
+		$(MKHDR) $? $@
+
+check::		example $(ASN1TTFILE)
+
+check::
+		./example p-rec.tt p-rec.ber
+		cmp p-rec.ber p-rec.out.ber
+		@echo "+++ the test was successful"
+
+# dummy:
+install::
+
+clean::
+		$(RM) example *.o *~ core .emacs* $(ASN1TTFILE) $(ASN1TTHFILE) p-rec.out.ber
+
+depend::
+		$(MAKE) $(MKHDR)
+
+depend::	$(ASN1TTHFILE)
+
+include ../maketail
diff -uraN snacc-1.3bbn/tbl-example/p-rec.ber.uu snacc-1.3b4/tbl-example/p-rec.ber.uu
--- snacc-1.3bbn/tbl-example/p-rec.ber.uu	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/p-rec.ber.uu	2005-07-30 16:57:00.588101736 +0000
@@ -0,0 +1,7 @@
+begin 644 p-rec.ber
+M8(&.81`6!$IO:&X6`446!5-M:71HH!`6#E1H92!":6<@0VAE97-E7X$``P&&
+MGZ$*0P at Q.3@R,#$P-*(281`6!$UA<GD6`4P6!5-M:71HHT$Q'V$1%@5*86UE
+M<Q8!4A8%4VUI=&B@"D,(,3DU-S`S,3`Q'F$0%@1,:7-A%@%-%@53;6ET:*`*
+*0P at Q.38Q,#8R,0``
+`
+end

snacc-gcc.patch:
 c++-lib/inc/asn-any.h                 |    2 
 c++-lib/inc/asn-bits.h                |    2 
 c++-lib/inc/asn-bool.h                |    2 
 c++-lib/inc/asn-config.h              |    6 +-
 c++-lib/inc/asn-int.h                 |    2 
 c++-lib/inc/asn-list.h                |    2 
 c++-lib/inc/asn-null.h                |    2 
 c++-lib/inc/asn-octs.h                |    2 
 c++-lib/inc/asn-oid.h                 |    2 
 c++-lib/inc/asn-real.h                |    2 
 c++-lib/inc/asn-type.h                |    2 
 c++-lib/inc/print.h                   |    4 -
 c++-lib/src/asn-any.C                 |    2 
 c++-lib/src/asn-bits.C                |    4 +
 c++-lib/src/asn-bool.C                |    4 +
 c++-lib/src/asn-enum.C                |    4 +
 c++-lib/src/asn-int.C                 |    4 +
 c++-lib/src/asn-len.C                 |    1 
 c++-lib/src/asn-list.C                |    6 +-
 c++-lib/src/asn-null.C                |    4 +
 c++-lib/src/asn-octs.C                |    4 +
 c++-lib/src/asn-oid.C                 |    8 +-
 c++-lib/src/asn-real.C                |    6 +-
 c++-lib/src/asn-tag.C                 |    2 
 c++-lib/src/asn-type.C                |    4 +
 c++-lib/src/meta.C                    |    2 
 c++-lib/src/print.C                   |    4 -
 c++-lib/src/tcl-if.C                  |    7 +-
 compiler/back-ends/c++-gen/gen-code.c |  102 +++++++++++++++++-----------------
 compiler/back-ends/c-gen/gen-code.c   |    1 
 compiler/core/parse-asn1.y            |    2 
 31 files changed, 116 insertions(+), 85 deletions(-)

--- NEW FILE snacc-gcc.patch ---
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-any.h snacc-1.3bbn/c++-lib/inc/asn-any.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-any.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-any.h	2005-07-30 19:22:42.514097072 +0000
@@ -81,7 +81,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if 0
 #if TCL
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h snacc-1.3bbn/c++-lib/inc/asn-bits.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bits.h	2005-07-30 19:23:29.321981192 +0000
@@ -105,7 +105,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBitsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h snacc-1.3bbn/c++-lib/inc/asn-bool.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bool.h	2005-07-30 19:23:45.319549192 +0000
@@ -101,7 +101,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBoolTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-config.h snacc-1.3bbn/c++-lib/inc/asn-config.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-config.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-config.h	2005-07-30 19:24:29.054900408 +0000
@@ -49,7 +49,7 @@
 #define _asn_config_h_
 
 #include <ctype.h>  /* for isprint() in <<op on AsnOcts */
-#include <iostream.h>
+#include <iostream>
 #include <memory.h>
 #include <string.h>
 #include <setjmp.h>
@@ -85,14 +85,14 @@
  * Asn1Error (char *str)
  *  - configure error handler
  */
-#define Asn1Error		cerr
+#define Asn1Error		std::cerr
 
 
 /*
  * Asn1Warning (char *str)  - configure warning mechanism
  * (currently not called)
  */
-#define Asn1Warning		cerr
+#define Asn1Warning		std::cerr
 
 
 /*
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-int.h snacc-1.3bbn/c++-lib/inc/asn-int.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-int.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-int.h	2005-07-30 19:24:45.421412320 +0000
@@ -70,7 +70,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnIntTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-list.h snacc-1.3bbn/c++-lib/inc/asn-list.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-list.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-list.h	2005-07-30 19:25:10.914682616 +0000
@@ -86,7 +86,7 @@
 				  last (NULL)
 				{}
 
-  friend ostream		&operator << (ostream &os, AsnList &l);
+  friend std::ostream		&operator << (std::ostream &os, AsnList &l);
 
   void				SetCurrElmt (unsigned long int index);
   void				SetCurrToFirst()			{ curr = first; }
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-null.h snacc-1.3bbn/c++-lib/inc/asn-null.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-null.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-null.h	2005-07-30 19:25:26.432323576 +0000
@@ -57,7 +57,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnNullTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h snacc-1.3bbn/c++-lib/inc/asn-octs.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-octs.h	2005-07-30 19:25:41.916969552 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOctsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h snacc-1.3bbn/c++-lib/inc/asn-oid.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-oid.h	2005-07-30 19:25:52.747323088 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOidTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-real.h snacc-1.3bbn/c++-lib/inc/asn-real.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-real.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-real.h	2005-07-30 19:26:05.321411536 +0000
@@ -67,7 +67,7 @@
   AsnLen			BEnc (BUF_TYPE b);
   void				BDec (BUF_TYPE b, AsnLen &bytesDecoded, ENV_TYPE env);
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
   PDU_MEMBER_MACROS
 
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-type.h snacc-1.3bbn/c++-lib/inc/asn-type.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-type.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-type.h	2005-07-30 19:26:16.551704272 +0000
@@ -111,7 +111,7 @@
 
 #endif
 
-  virtual void			Print (ostream &) const;
+  virtual void			Print (std::ostream &) const;
 
 #if META
   static const AsnTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/print.h snacc-1.3bbn/c++-lib/inc/print.h
--- snacc-1.3bbn.orig/c++-lib/inc/print.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/print.h	2005-07-30 19:26:54.240974632 +0000
@@ -42,8 +42,8 @@
 extern unsigned short int	indentG;
 extern unsigned short int	stdIndentG;
 
-void				Indent (ostream &os, unsigned short int i);
+void				Indent (std::ostream &os, unsigned short int i);
 
-ostream				&operator << (ostream &os, const AsnType &a);
+std::ostream			&operator << (std::ostream &os, const AsnType &a);
 
 #endif /* conditional include */
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-any.C snacc-1.3bbn/c++-lib/src/asn-any.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-any.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-any.C	2005-07-30 19:27:15.597727912 +0000
@@ -165,7 +165,7 @@
 }
 
 
-void AsnAny::Print (ostream &os) const
+void AsnAny::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bits.C snacc-1.3bbn/c++-lib/src/asn-bits.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bits.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bits.C	2005-07-30 19:27:51.063336320 +0000
@@ -65,6 +65,8 @@
 #include "asn-bits.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 unsigned short int  strStkUnusedBitsG;
 
@@ -440,7 +442,7 @@
 }  /* BDecConsBits */
 
 // prints the BIT STRING to the given ostream.
-void AsnBits::Print (ostream &os) const
+void AsnBits::Print (std::ostream &os) const
 {
     size_t octetLen = (bitLen+7)/8;
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bool.C snacc-1.3bbn/c++-lib/src/asn-bool.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bool.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bool.C	2005-07-30 19:28:23.793360600 +0000
@@ -54,6 +54,8 @@
 #include "asn-type.h"
 #include "asn-bool.h"
 
+using std::endl;
+
 AsnType *AsnBool::Clone() const
 {
   return new AsnBool;
@@ -110,7 +112,7 @@
 }
 
 // print the BOOLEAN's value in ASN.1 value notation to the given ostream
-void AsnBool::Print (ostream &os) const
+void AsnBool::Print (std::ostream &os) const
 {
   os << (value ? "TRUE" : "FALSE");
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-enum.C snacc-1.3bbn/c++-lib/src/asn-enum.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-enum.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-enum.C	2005-07-30 19:28:57.068302040 +0000
@@ -41,9 +41,11 @@
 #include "asn-int.h"
 #include "asn-enum.h"
 
+using std::endl;
+
 AsnType *AsnEnum::Clone() const
 {
-  cerr << "AsnEnum::Clone() called" << endl;
+  std::cerr << "AsnEnum::Clone() called" << endl;
   abort();
   return NULL;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-int.C snacc-1.3bbn/c++-lib/src/asn-int.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-int.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-int.C	2005-07-30 19:31:10.276100376 +0000
@@ -55,6 +55,8 @@
 #include "asn-type.h"
 #include "asn-int.h"
 
+using std::endl;
+
 AsnType *AsnInt::Clone() const
 {
   return new AsnInt;
@@ -171,7 +173,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, INTEGER_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnInt::Print (ostream &os) const
+void AsnInt::Print (std::ostream &os) const
 {
     os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-len.C snacc-1.3bbn/c++-lib/src/asn-len.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-len.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-len.C	2005-07-30 19:31:35.984192152 +0000
@@ -41,6 +41,7 @@
 #include "asn-config.h"
 #include "asn-len.h"
 
+using std::endl;
 
 /*
  * Encodes the given length to the given buffer.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-list.C snacc-1.3bbn/c++-lib/src/asn-list.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-list.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-list.C	2005-07-30 19:32:25.815616624 +0000
@@ -62,6 +62,8 @@
 #include "asn-tag.h"
 #include "asn-type.h"
 
+using std::endl;
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -80,7 +82,7 @@
 
 // print routine for lists
 template <class T>
-ostream &operator << (ostream &os, AsnList<T> &l)
+std::ostream &operator << (std::ostream &os, AsnList<T> &l)
 {
     os << "SEQUENCE OF { ";
 
@@ -241,7 +243,7 @@
      {
          listElmtTagId = BDecTag (b, bytesDecoded, env);
 
-         if ((listElmtTagId == EOC) && (elmtLen == INDEFINITE_LEN))
+         if ((listElmtTagId == EOC_TAG_ID) && (elmtLen == INDEFINITE_LEN))
              break;
 
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-null.C snacc-1.3bbn/c++-lib/src/asn-null.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-null.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-null.C	2005-07-30 19:33:01.169242056 +0000
@@ -48,6 +48,8 @@
 #include "asn-type.h"
 #include "asn-null.h"
 
+using std::endl;
+
 AsnType *AsnNull::Clone() const
 {
   return new AsnNull;
@@ -85,7 +87,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, NULLTYPE_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnNull::Print (ostream &os) const
+void AsnNull::Print (std::ostream &os) const
 {
     os << "NULL";
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-octs.C snacc-1.3bbn/c++-lib/src/asn-octs.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-octs.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-octs.C	2005-07-30 19:33:30.540776904 +0000
@@ -58,6 +58,8 @@
 #include "asn-octs.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 
 AsnOcts::~AsnOcts()
@@ -166,7 +168,7 @@
 
 
 // Prints the AsnOcts to the given ostream in Value Notation.
-void AsnOcts::Print (ostream &os) const
+void AsnOcts::Print (std::ostream &os) const
 {
     int i;
     os << "'";
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-oid.C snacc-1.3bbn/c++-lib/src/asn-oid.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-oid.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-oid.C	2005-07-30 19:43:47.320214040 +0000
@@ -51,7 +51,7 @@
 
 #include "asn-config.h"
 #if TCL
-#include <strstream.h>
+#include <strstream>
 #endif
 #include "asn-len.h"
 #include "asn-tag.h"
@@ -59,6 +59,8 @@
 #include "asn-oid.h"
 #include "print.h"
 
+using std::endl;
+
 AsnOid::~AsnOid()
 {
   delete oid;
@@ -157,7 +159,7 @@
     *(tmpBuf++) = 0x7f & headArcNum;
 
     // repeat for the rest of the arc numbers
-    for (i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
+    for (int i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
     {
         tmpArcNum = arcNumArr[i];
         for (elmtLen = 1; (tmpArcNum >>= 7) != 0; elmtLen++)
@@ -308,7 +310,7 @@
 
 // Prints an AsnOid in ASN.1 Value Notation.
 // Decodes the oid to get the individual arc numbers
-void AsnOid::Print (ostream &os) const
+void AsnOid::Print (std::ostream &os) const
 {
   unsigned short int firstArcNum;
   unsigned long int arcNum;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-real.C snacc-1.3bbn/c++-lib/src/asn-real.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-real.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-real.C	2005-07-30 19:44:57.954476000 +0000
@@ -57,12 +57,16 @@
 #include "asn-type.h"
 #include "asn-real.h"
 
+using std::endl;
+
 #ifndef IEEE_REAL_LIB
 /* ieee functions (in case not in math.h)*/
 extern "C" {
 extern int iszero (double);
+#if defined(__GNUC__) && (__GNUC__ < 3)
 extern int isinf (double);
 extern int signbit (double);
+#endif /* __GNUC__ && __GNUC__ < 3 */
 extern int ilogb (double);
 extern double scalbn (double, int);
 }
@@ -841,7 +845,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, REAL_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnReal::Print (ostream &os) const
+void AsnReal::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-tag.C snacc-1.3bbn/c++-lib/src/asn-tag.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-tag.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-tag.C	2005-07-30 19:45:24.267135808 +0000
@@ -45,6 +45,8 @@
 #include "asn-len.h"
 #include "asn-tag.h"
 
+using std::endl;
+
 /*
  * Decode a BER Tag from the given buffer.  Error is
  * flagged if the tag is too long or if a read error occurs.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-type.C snacc-1.3bbn/c++-lib/src/asn-type.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-type.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-type.C	2005-07-30 19:30:07.294675008 +0000
@@ -72,6 +72,8 @@
 #include "asn-len.h"
 #include "asn-type.h"
 
+using std::endl;
+
 AsnType::~AsnType()
 {
 }
@@ -97,7 +99,7 @@
 
 #endif
 
-void AsnType::Print (ostream &os) const
+void AsnType::Print (std::ostream &os) const
 {
   os << "ERROR - Attempt to print an improperly formed ANY type (programming error)." << endl;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/meta.C snacc-1.3bbn/c++-lib/src/meta.C
--- snacc-1.3bbn.orig/c++-lib/src/meta.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/meta.C	2005-07-30 19:46:03.588158104 +0000
@@ -27,6 +27,8 @@
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if META
 
 AsnMemberDesc::AsnMemberDesc (const char *_name, const AsnTypeDesc *_desc):
diff -uraN snacc-1.3bbn.orig/c++-lib/src/print.C snacc-1.3bbn/c++-lib/src/print.C
--- snacc-1.3bbn.orig/c++-lib/src/print.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/print.C	2005-07-30 19:46:33.326637168 +0000
@@ -45,13 +45,13 @@
 unsigned short int stdIndentG = 4;
 
 void
-Indent (ostream &os, unsigned short int i)
+Indent (std::ostream &os, unsigned short int i)
 {
   while (i-->0)
     os <<  ' ';
 }
 
-ostream &operator << (ostream &os, const AsnType &v)
+std::ostream &operator << (std::ostream &os, const AsnType &v)
 {
   v.Print (os);
   return os;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/tcl-if.C snacc-1.3bbn/c++-lib/src/tcl-if.C
--- snacc-1.3bbn.orig/c++-lib/src/tcl-if.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/tcl-if.C	2005-07-30 19:48:01.296263752 +0000
@@ -28,12 +28,13 @@
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <strstream.h>
-#include <fstream.h>
+#include <sstream>
 #include <string.h>
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if TCL
 
 #ifdef _AIX32
@@ -835,7 +836,7 @@
     }
 
 cout << *var;
-  strstream s;
+  stringstream s;
   s << *var;
   s.put ('\0');
   cout << strlen(s.str()) << endl;
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c	2001-01-27 01:02:54.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c	2005-07-30 19:58:00.407885728 +0000
@@ -453,7 +453,7 @@
         fprintf (src, "    else\n");
         fprintf (src, "        return false;\n");
 /*
-        fprintf (src, "    { cerr << \"longjmp return value is \" << val << endl;\n");
+        fprintf (src, "    { std::cerr << \"longjmp return value is \" << val << std::endl;\n");
         fprintf (src, "        return false; }\n");
 */
         fprintf (src, "}\n\n");
@@ -999,7 +999,7 @@
                                 fprintf (src, ")\n");
                         }
                         fprintf (src, "    {\n");
-            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
                         fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "    }\n");
 
@@ -1357,7 +1357,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -1423,7 +1423,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -1666,7 +1666,7 @@
                         }
 
                         fprintf (src, "      {\n");
-                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << endl;\n");
+                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                         fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "      }\n\n");
 
@@ -1780,7 +1780,7 @@
         }
 
         fprintf (src, "    default:\n");
-        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << endl;\n");
+        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << std::endl;\n");
         fprintf (src, "      longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "      break;\n");
 
@@ -1847,7 +1847,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))", classStr, formStr, tag->code);
             fprintf (src, "    {\n");
-	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    }\n");
             fprintf (src, "    extraLen%d = BDecLen (b, bytesDecoded, env);\n", ++elmtLevel);
@@ -1876,11 +1876,11 @@
     /* ostream printing routine */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n", td->cxxTypeDefInfo->className);
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n", td->cxxTypeDefInfo->className);
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        /*    fprintf (src, "  os << \"{\" << endl;\n") */
+        /*    fprintf (src, "  os << \"{\" << std::endl;\n") */
         fprintf (src, "  switch (choiceId)\n");
         fprintf (src, "  {\n");
         FOR_EACH_LIST_ELMT (e, choice->basicType->a.choice)
@@ -1909,7 +1909,7 @@
         }
         fprintf (src, "  } // end of switch\n");
 
-        /*    fprintf (src, "  os << \"}\" << endl;\n") */
+        /*    fprintf (src, "  os << \"}\" << std::endl;\n") */
         fprintf (src, "} // %s::Print\n\n", td->cxxTypeDefInfo->className);
     }
     /* end of Print Method code */
@@ -2260,7 +2260,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -2310,7 +2310,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -2460,7 +2460,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2638,7 +2638,7 @@
                             }
 
                             fprintf (src, "    {\n");
-                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "       longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "    }\n\n");
                             fprintf (src, "    elmtLen%d = BDecLen (b, seqBytesDecoded, env);\n", ++elmtLevel);
@@ -2826,7 +2826,7 @@
                     fprintf (src, "  }\n"); /* end of tag check if */
                     fprintf (src, "  else\n");
                     fprintf (src, "  {\n");
-                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << endl;\n");
+                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << std::endl;\n");
                     fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
                     fprintf (src, "  }\n\n");
                 }
@@ -2845,7 +2845,7 @@
             fprintf (src, "  }\n");
             fprintf (src, "  else if (seqBytesDecoded != elmtLen0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << endl;\n");
+            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << std::endl;\n");
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
             fprintf (src, "  else\n");
@@ -2914,7 +2914,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2939,14 +2939,14 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (seq->basicType->a.sequence);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
-        fprintf (src, "  os << \"{ -- SEQUENCE --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SEQUENCE --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, seq->basicType->a.sequence)
@@ -2963,12 +2963,12 @@
                 if (e != FIRST_LIST_ELMT (seq->basicType->a.sequence))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -2982,10 +2982,10 @@
 
 #ifdef KHO
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence)&&(!e->type->cxxTypeRefInfo->isPtr) )
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #else
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence) && !inTailOptElmts && !NextIsTailOptional (seq->basicType->a.sequence))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #endif
 
 	    fprintf (src, "  }\n");
@@ -3000,9 +3000,9 @@
                   fprintf (src, "    os << \"%s \";\n", e->fieldName);
 		fprintf (src, "    os << \"-- void --\";\n");
     		if (e != LAST_LIST_ELMT (seq->basicType->a.sequence))
-                   fprintf (src, "    os << \",\" << endl;\n");
+                   fprintf (src, "    os << \",\" << std::endl;\n");
                 else
-                   fprintf (src, "    os << endl;\n");
+                   fprintf (src, "    os << std::endl;\n");
 		fprintf (src, "  }\n");
 #else
 		fprintf (src, "    os << \"-- void --\";\n");
@@ -3012,7 +3012,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (seq->basicType->a.sequence))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
 
         fprintf (src, "  indentG -= stdIndentG;\n");
@@ -3361,7 +3361,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -3411,7 +3411,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -3557,7 +3557,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3697,7 +3697,7 @@
                             }
 
                             fprintf (src, "        {\n");
-                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "           longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "        }\n\n");
 
@@ -3814,14 +3814,14 @@
                 FreeTags (tags);
             } /* for each elmt */
             fprintf (src, "       default:\n");
-            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << endl;\n");
+            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << std::endl;\n");
             fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    } // end switch\n");
             fprintf (src, "  } // end for loop\n");
             fprintf (src, "  bytesDecoded += setBytesDecoded;\n");
             fprintf (src, "  if (mandatoryElmtsDecoded != %d)\n", mandatoryElmtCount);
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3889,7 +3889,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3914,15 +3914,15 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n");
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (set->basicType->a.set);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
 
-        fprintf (src, "  os << \"{ -- SET --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SET --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, set->basicType->a.set)
@@ -3939,12 +3939,12 @@
                 if (e != FIRST_LIST_ELMT (set->basicType->a.set))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -3957,7 +3957,7 @@
                 fprintf (src, "    os << %s;\n", e->type->cxxTypeRefInfo->fieldName);
 
             if (e != LAST_LIST_ELMT (set->basicType->a.set) && !inTailOptElmts && !NextIsTailOptional (set->basicType->a.set))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 
 	    fprintf (src, "  }\n");
 
@@ -3974,7 +3974,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (set->basicType->a.set))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
         fprintf (src, "  indentG -= stdIndentG;\n");
         fprintf (src, "  Indent (os, indentG);\n");
@@ -4294,7 +4294,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -4324,7 +4324,7 @@
     fprintf (hdr, "  PDU_MEMBER_MACROS\n");
 
     if (printPrintersG)
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
     fprintf (hdr, "};\n\n\n");
 
@@ -4380,7 +4380,7 @@
         }
         fprintf (src, "))\n");
         fprintf (src, "        {\n");
-        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
         fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "        }\n\n");
         fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4406,7 +4406,7 @@
                 fprintf (src, "))\n");
 
             fprintf (src, "        {\n");
-            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
             fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "        }\n\n");
             fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4461,7 +4461,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -4494,7 +4494,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -4506,9 +4506,9 @@
 
     if (printPrintersG)
     {
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << endl;\n");
+        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << std::endl;\n");
         fprintf (src, "    indentG += stdIndentG;\n");
 
         fprintf (src, "    //SetCurrToFirst();\n");
@@ -4521,7 +4521,7 @@
         fprintf (src, "        //if (Curr() != Last())\n");
         fprintf (src, "        if (run != last)\n");
         fprintf (src, "            os << \",\";\n");
-        fprintf (src, "        os << endl;\n");
+        fprintf (src, "        os << std::endl;\n");
         fprintf (src, "    }\n");
 
         fprintf (src, "    indentG -= stdIndentG;\n");
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c	2001-01-27 01:02:52.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c	2005-07-30 19:22:04.488877784 +0000
@@ -33,6 +33,7 @@
  */
 
 #include <stdio.h>
+#include <time.h>
 
 #include "asn-incl.h"
 #include "asn1module.h"
diff -uraN snacc-1.3bbn.orig/compiler/core/parse-asn1.y snacc-1.3bbn/compiler/core/parse-asn1.y
--- snacc-1.3bbn.orig/compiler/core/parse-asn1.y	2001-01-27 01:02:47.000000000 +0000
+++ snacc-1.3bbn/compiler/core/parse-asn1.y	2005-07-30 17:29:02.838828848 +0000
@@ -456,6 +456,7 @@
 /*-----------------------------------------------------------------------*/
 
 LineNo: { $$ = myLineNoG; }
+;
 
 ModuleDefinition:
      ModuleIdentifier
@@ -1462,6 +1463,7 @@
         $$->choiceId = SUBTYPEVALUE_SINGLEVALUE;
         $$->a.singleValue = $1;
     }
+;
 
 ContainedSubtype:
     INCLUDES_SYM Type

snacc-ttab-tex-UTF8-fix.patch:
 ttab.tex |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-ttab-tex-UTF8-fix.patch ---
diff -up ./doc/ttab.tex.texfix ./doc/ttab.tex
--- ./doc/ttab.tex.texfix	2009-09-09 10:30:25.597509928 +0530
+++ ./doc/ttab.tex	2009-09-09 10:30:54.173509922 +0530
@@ -18,7 +18,7 @@ size of your type tables, put the only u
 your ASN.1 module and compile it without using the useful types
 module.
 
-A generic buffer type (? la ISODE and XDR) was defined to allow type
+A generic buffer type (ISODE and XDR) was defined to allow type
 table driven routines to read from a wide variety of buffer formats.
 Currently slightly modified versions of the {\C ExpBuf} and the
 {\C SBuf} are provided.  It shouldn't be too hard for you to add


--- NEW FILE snacc.spec ---
Name:           snacc
Version:        1.3
Release:        4%{?dist}
Summary:        Sample Neufeld ASN.1 to C Compiler

Group:          Applications/System
License:        GPLv2+
URL:            http://packages.debian.org/source/sid/snacc
Source0:        http://ftp.de.debian.org/debian/pool/main/s/snacc/%{name}_%{version}bbn.orig.tar.gz
Patch0:         snacc-bts-442873.patch
Patch1:         snacc-configure.patch
Patch2:         snacc-examples.patch
Patch3:         snacc-gcc.patch
Patch4:         snacc-ttab-tex-UTF8-fix.patch

BUILDROOT:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake17 libtool flex bison

%description
Snacc is Sample Neufeld ASN.1 to C compiler that can produce C, C++ routines
or type tables for BER encoding, decoding, printing and freeing.

%package devel
Summary:        Header files for snacc development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release} 

%description devel
The %{name}-devel package contains the header files
for snacc development.

%prep
%setup -qn %{name}-%{version}bbn.orig
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%{__mkdir} -p c-lib/Cebuf c-lib/ebuf c-lib/mbuf c-lib/sbuf c-lib/tbl c++-lib/c++

# ---- Build ----
# configure without tcl for libtool to use -DMETA=0

%build
AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 autoreconf -fi
%configure
%{__make}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.a`
%{__rm} -f `find %{buildroot} -name *.la`

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING doc/snacc-a5.ps
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/asn1
%{_bindir}/%{name}
%{_bindir}/berdecode
%{_bindir}/mkchdr
%{_bindir}/ptbl
%{_bindir}/pval
%{_mandir}/man1/mkchdr.1.gz
%{_mandir}/man1/ptbl.1.gz
%{_mandir}/man1/pval.1.gz
%{_mandir}/man1/snacc.1.gz
%{_mandir}/man1/snacced.1.gz
%{_mandir}/mann/snacc.n.gz
%{_libdir}/libasn1c++.so.0.0.0
%{_libdir}/libasn1cCebuf.so.0.0.0
%{_libdir}/libasn1cebuf.so.0.0.0
%{_libdir}/libasn1cmbuf.so.0.0.0
%{_libdir}/libasn1csbuf.so.0.0.0
%{_libdir}/libasn1ctbl.so.0.0.0
%{_libdir}/libasn1c++.so.0
%{_libdir}/libasn1cCebuf.so.0
%{_libdir}/libasn1cebuf.so.0
%{_libdir}/libasn1cmbuf.so.0
%{_libdir}/libasn1csbuf.so.0
%{_libdir}/libasn1ctbl.so.0

%files devel
%defattr(-,root,root,-)
%doc c-examples/ c++-examples/
%{_bindir}/snacc-config
%{_datadir}/aclocal/snacc.m4
%{_includedir}/%{name}/c
%{_includedir}/%{name}/c++
%{_libdir}/libasn1c++.so
%{_libdir}/libasn1cCebuf.so
%{_libdir}/libasn1cebuf.so
%{_libdir}/libasn1cmbuf.so
%{_libdir}/libasn1csbuf.so
%{_libdir}/libasn1ctbl.so

%changelog
* Sat Sep 26 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-4
- Removed --without-tcl as it doesn not affect configure.
- snacc-configure.patch will not build c++-lib/tcl/Makefile as tcl is not
  required. 

* Thu Sep 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-3
- Removed -libs package, and moved them to -base package.
- s/sample/Sample in package description.
- Directory ownership in base package for includedir/name.
- snacc.m4 moved to -devel package.
- Patch names start with snacc-.
- Removed .tex and .bib files as .ps is already shipped.

* Wed Sep 23 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-2
- Fixed spelling mistake s/dample/sample.
- Added {c, c++}-examples to devel package.
- Moved *.asn1 files to base package.
- Created separate libs package.
- Call ldconfig for post, postun for libs package.

* Mon Sep 21 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-1
- First snacc package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:57:08 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:43:38 -0000	1.2
@@ -0,0 +1 @@
+snacc_1.3bbn.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:57:09 -0000	1.1
+++ sources	30 Sep 2009 03:43:38 -0000	1.2
@@ -0,0 +1 @@
+24c969e2673f1713d5d995d2f9e64781  snacc_1.3bbn.orig.tar.gz



From bernie at fedoraproject.org  Wed Sep 30 03:44:43 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Wed, 30 Sep 2009 03:44:43 +0000 (UTC)
Subject: rpms/etckeeper/devel etckeeper.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930034443.3052311C00C1@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/etckeeper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30977/devel

Modified Files:
	.cvsignore sources 
Added Files:
	etckeeper.spec import.log 
Log Message:
Initial import.



--- NEW FILE etckeeper.spec ---
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")

Name:      etckeeper
Version:   0.41
Release:   1%{?dist}
Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
Group:     Applications/System
License:   GPLv2+
URL:       http://kitenet.net/~joey/code/etckeeper/
Source0:   http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  git >= 1.6

%description
The etckeeper program is a tool to let /etc be stored in a git,
mercurial, bzr or darcs repository. It hooks into yum to automatically
commit changes made to /etc during package upgrades. It tracks file
metadata that version control systems do not normally support, but that
is important for /etc, such as the permissions of /etc/shadow. It's
quite modular and configurable, while also being simple to use if you
understand the basics of working with version control.

The default backend is git, if want to use a another backend please
install the appropriate tool (mercurial, darcs or bzr).
To use bzr as backend, please also install the %{name}-bzr package.

To start using the package please read %{_docdir}/%{name}-%{version}/README

%package bzr
Summary:  Support for bzr with etckeeper
Group:    Applications/System
Requires: %{name} = %{version}-%{release} bzr
BuildRequires: bzr
BuildRequires: python-devel

%description bzr
This package provides a bzr backend for etckeeper, if you want to use
etckeeper with bzr backend, install this package.

%prep
%setup -q -n %{name}
%{__perl} -pi -e '
    s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|;
    s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|;
    ' etckeeper.conf
%{__sed} -i -e '1d' yum-etckeeper.py 

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
%{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name}
%{__install} -d  %{buildroot}%{_localstatedir}/cache/%{name}
%{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py

%clean
rm -rf %{buildroot}

# Users must study the README anyway.
#post
#{_sbindir}/%{name} init -d /etc/

%files
%defattr(-, root, root, -)
%doc GPL INSTALL TODO README
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/*.d
%{_sysconfdir}/%{name}/*.d/
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}
%dir %{_sysconfdir}/bash_completion.d
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
%dir %{_prefix}/lib/yum-plugins
%{_prefix}/lib/yum-plugins/%{name}.*
%dir %{_sysconfdir}/yum/pluginconf.d
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
%{_localstatedir}/cache/%{name}

%files bzr
%defattr(-, root, root, -)
%doc GPL
%{python_sitelib}/bzrlib/plugins/%{name}
%{python_sitelib}/bzr_%{name}-*.egg-info

%changelog
* Sat Sep 12 2009 Bernie Innocenti <bernie at codewiz.org> - 0.41-1
- Updatte to 0.41
- Add missing directory ownerships

* Sat Sep 12 2009 Bernie Innocenti <bernie at codewiz.org> - 0.40-3
- Make the bzr subpackage builddepend on python-devel

* Wed Sep 09 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.40-2
- Package is noarch
- Rpmlint clean
- Random cleanup
- Ship cache dir in package
- bzr subpackage
- Add bzr to buildreq

* Sat Sep 05 2009 Bernie Innocenti <bernie at codewiz.org> - 0.40-1
- Update to 0.40

* Sun Jun 14 2009 Bernie Innocenti <bernie at codewiz.org> - 0.37-1
- Update to 0.37
- Change license tag to GPLv2+

* Fri Feb 27 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.33-4
- fix up initial install to make directory in /var/cache/etckeeper
- install the etckeeper daily cron job
- define some config files that shouldn't be replaced, should the hooks
in commit.d, init.d etc... saved and not blown away? if so they can
defined as config files. etckeeper should record the changes anyway.

* Wed Feb 25 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.32-1
- yum etckeeper plugin is now apart of this package

* Tue Feb 24 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.31-1
- initial package


--- NEW FILE import.log ---
etckeeper-0_41-1_fc12:HEAD:etckeeper-0.41-1.fc12.src.rpm:1254282233


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etckeeper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:15:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:44:42 -0000	1.2
@@ -0,0 +1 @@
+etckeeper_0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etckeeper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:15:12 -0000	1.1
+++ sources	30 Sep 2009 03:44:42 -0000	1.2
@@ -0,0 +1 @@
+d8929c79fcab4f3e57d7ebb03f20df63  etckeeper_0.41.tar.gz



From shakthimaan at fedoraproject.org  Wed Sep 30 03:47:02 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 03:47:02 +0000 (UTC)
Subject: rpms/snacc/EL-5 import.log, NONE, 1.1 snacc-bts-442873.patch, NONE, 
	1.1 snacc-configure.patch, NONE, 1.1 snacc-examples.patch, NONE,
	1.1 snacc-gcc.patch, NONE, 1.1 snacc-ttab-tex-UTF8-fix.patch,
	NONE, 1.1 snacc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930034702.EF05B11C00C1@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/snacc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31714/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snacc-bts-442873.patch snacc-configure.patch 
	snacc-examples.patch snacc-gcc.patch 
	snacc-ttab-tex-UTF8-fix.patch snacc.spec 
Log Message:
First snacc package.



--- NEW FILE import.log ---
snacc-1_3-4_fc11:EL-5:snacc-1.3-4.fc11.src.rpm:1254282754

snacc-bts-442873.patch:
 snacc-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-bts-442873.patch ---
diff -uraN snacc-1.3bbn.orig/snacc-config.in snacc-1.3bbn/snacc-config.in
--- snacc-1.3bbn.orig/snacc-config.in	2001-01-27 02:02:40.000000000 +0100
+++ snacc-1.3bbn/snacc-config.in	2008-04-16 01:19:43.153755670 +0200
@@ -95,7 +95,7 @@
     if test $exec_prefix != /usr; then echo -n "-L${exec_prefix}/lib "; fi
     case "$language" in
     C)   echo -n "-lasn1c${buffertype} " ;;
-    C++) echo -n "-Iasn1c++ " ;;
+    C++) echo -n "-lasn1c++ " ;;
     *) ;;
     esac
   else

snacc-configure.patch:
 configure.ac |  313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  305 ---------------------------------------------------------
 2 files changed, 313 insertions(+), 305 deletions(-)

--- NEW FILE snacc-configure.patch ---
diff -uraN snacc-1.3bbn/configure.ac snacc-1.3bbn-debian/configure.ac
--- snacc-1.3bbn/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3bbn-debian/configure.ac	2005-07-30 17:20:35.043753552 +0000
@@ -0,0 +1,313 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl ---
+dnl	$Log: configure.ac,v $
+dnl	Revision 1.3  2002/11/19 20:28:12  debacle
+dnl	libtool changes.
+dnl	
+dnl	Revision 1.2  2002/11/19 19:37:38  debacle
+dnl	Auto-tools stuff.
+dnl	
+dnl	Revision 1.1  2002/11/19 19:18:04  debacle
+dnl	New autoconf.
+dnl	
+dnl	Revision 1.13  1997/09/04 13:54:04  wan
+dnl	A little more portability
+dnl
+dnl	Revision 1.12  1997/02/28 13:39:35  wan
+dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
+dnl
+dnl	Revision 1.11  1997/02/16 16:50:27  rj
+dnl	made return *this after calling abort()'' a compile time option.
+dnl
+dnl	Revision 1.10  1997/02/15 20:06:27  rj
+dnl	adjust to changed AC_TRY_COMPILE macro
+dnl
+dnl	Revision 1.9  1997/02/15 20:01:38  rj
+dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
+dnl
+dnl	Revision 1.8  1997/01/01 19:57:01  rj
+dnl	changes for autoconf version 2.12
+dnl
+dnl	Revision 1.7  1995/09/07  18:36:47  rj
+dnl	psbook and psnup are looked for (used by .../doc/makefile)
+dnl
+dnl	Revision 1.6  1995/07/24  14:44:47  rj
+dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
+dnl
+dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
+dnl
+dnl	look for patch(1). the c-lib uses it to patch tbl.h.
+dnl
+dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
+dnl
+dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
+dnl
+dnl	Revision 1.5  1995/02/20  11:18:41  rj
+dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
+dnl	check for isinf(3) and finite(3) added.
+dnl
+dnl	Revision 1.4  1995/02/17  15:15:44  rj
+dnl	hack to let makedepend find .h files the way gcc does.
+dnl
+dnl	Revision 1.3  1995/02/17  14:26:40  rj
+dnl	adjustments for autoconf 2.x
+dnl
+dnl	Revision 1.2  1994/10/08  04:29:37  rj
+dnl	search for Tcl/Tk
+dnl
+dnl	Revision 1.1  1994/09/01  00:51:22  rj
+dnl	first check-in (new file).
+dnl
+AC_INIT( compiler/core/snacc.c)
+AC_REVISION($Revision: 1.3 $)
+AM_INIT_AUTOMAKE(snacc, 1.3)
+AM_CONFIG_HEADER( config.h)
+dnl --- alternative programs:
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_ISC_POSIX
+dnl if CDPATH is set, the configure script might fail
+unset CDPATH
+dnl if test -n "$GCC"; then
+dnl   saveCC="$CC"
+dnl   CC="$CC -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
+dnl fi
+AC_PROG_GCC_TRADITIONAL
+AC_MSG_CHECKING( whether ANSI or K&R style C)
+AC_TRY_COMPILE([ ], [void *p; p = "test";], [
+AC_MSG_RESULT(ANSI)
+AC_DEFINE( __USE_ANSI_C__)
+], [
+AC_MSG_RESULT(K&R)
+])
+AC_PROG_CXX
+AC_LANG_CPLUSPLUS
+dnl if test -n "$GCC"; then
+dnl   saveCXX="$CXX"
+dnl   CXX="$CXX -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
+dnl fi
+AC_MSG_CHECKING( for bool built-in)
+AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for variable sized automatic arrays)
+AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for volatile functions)
+AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
+AC_LANG_C
+AM_PROG_LEX
+case "$LEX" in
+  lex)
+    LFLAGS="-Nc10000"
+  ;;
+  flex)
+    CFLAGS="$CFLAGS -DFLEX_IN_USE"
+esac
+AC_SUBST( LFLAGS)
+AC_SUBST( CFLAGS)
+# the boot strapping code in .../c-lib/ needs patch:
+AC_CHECK_PROGS( PATCH, patch, false)
+AC_PROG_YACC
+AC_PROG_LN_S
+AC_PROG_INSTALL
+dnl --- header files:
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_HEADER_STDC
+AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
+AC_FUNC_VPRINTF
+dnl --- system and compiler characteristics:
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_LIB( m, sin)
+AC_CHECK_FUNCS( isinf finite)
+AC_CHECK_FUNCS( memset memcpy memcmp)
+dnl ---
+AC_PATH_X
+AC_PATH_XTRA
+AC_CHECK_PROGS( TCLSH, tclsh, false)
+if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
+  AC_CHECK_HEADER(
+    tcl.h,
+    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
+    AC_CHECK_LIB(
+      tcl,
+      Tcl_CreateInterp,
+      [saveCFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS $X_CFLAGS"
+      AC_CHECK_LIB(
+	tk,
+	Tk_CreateWindow,
+	[AC_DEFINE( HAVE_TCL)
+	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
+	CXXTCLDIR="tcl"
+	TCLDIRS="tcl-lib tcl-asn tcl-example"
+	AC_LANG_CPLUSPLUS
+	AC_CHECK_LIB(
+	  TkTree,
+	  Tree_Init,
+	  [TREELIBS="-lTkTree"],
+	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
+	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+	AC_LANG_C],
+	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
+	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+      CFLAGS="$saveCFLAGS"],
+      [AC_MSG_RESULT( [tcl library not found])],
+      $TCLOTHERLIBS -lm)])
+fi
+AC_SUBST( CXXTCLDIR)
+AC_SUBST( TCLDIRS)
+AC_SUBST( TCLLIBS)
+AC_SUBST( TREELIBS)
+dnl ---
+AC_CHECK_PROGS( LATEX, latex, false)
+AC_CHECK_PROGS( BIBTEX, bibtex, false)
+AC_CHECK_PROGS( DVIPS, dvips, false)
+AC_CHECK_PROGS( DETEX, detex2 detex, false)
+AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
+AC_CHECK_PROGS( PSBOOK, psbook, false)
+AC_CHECK_PROGS( PSNUP, psnup, false)
+AC_CHECK_PROGS( SPELL, ispell spell, spell)
+dnl ---
+
+dnl Configure for libtool.
+AC_PROG_LIBTOOL
+
+dnl Generate the C library build directories.
+linked_files=`cd c-lib/src && ls *.c`
+for dir in Cebuf ebuf mbuf sbuf tbl; do
+  if test -d c-lib/$dir; then :; else
+    echo creating c-lib/$dir
+    mkdir c-lib/$dir
+  fi
+  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
+  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
+  case $dir in
+  Cebuf) 
+    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
+    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
+    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
+    ;;
+  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
+  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
+  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
+  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
+  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
+done
+
+dnl Generate the C++ and Tcl library build directories.
+linked_files=`cd c++-lib/src && ls *.c *.C`
+for dir in c++ tcl; do
+  if test -d c++-lib/$dir; then :; else
+    echo creating c++-lib/$dir
+    mkdir c++-lib/$dir
+  fi
+  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
+  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
+  case $dir in
+  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
+  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
+  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
+done  
+
+dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
+dnl from glib-1.2.1's configure.in.  See that file for an explanation.
+AC_OUTPUT_COMMANDS([
+          
+## Generate `snaccconfig.h' in two 
+## cases:
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+case "x$CONFIG_OTHER" in
+*snaccconfig.h) gen_snaccconfig_h=yes
+;;
+esac
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  if test "x${CONFIG_OTHER}" = x; then
+    gen_snaccconfig_h=yes
+  fi
+fi
+
+## If we're generating snaccconfig.h:
+## FIXME - currently, snaccconfig.h is just the normal
+## config.h wrapped.  this is because the user include
+## files use the normal config.h symbol names, and I 
+## haven't changed those yet.
+if test "x$gen_snaccconfig_h" = xyes; then
+  outfile=snaccconfig.h
+  echo creating $outfile
+  cat <<SNACCEOF > ${outfile}-tmp
+/* snaccconfig.h
+ * 
+ * This is an automatically generated file - please modify 'configure.in'.
+ */
+
+#ifndef _SNACCCONFIG_H
+#define _SNACCCONFIG_H
+
+SNACCEOF
+  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
+  cat <<SNACCEOF >> ${outfile}-tmp
+
+#endif /* !_SNACCCONFIG_H */
+SNACCEOF
+  if cmp -s ${outfile}-tmp $outfile; then
+    echo $outfile is unchanged
+    rm -f ${outfile}-tmp
+  else
+    mv ${outfile}-tmp ${outfile}
+  fi
+fi
+])
+
+dnl Writes files.
+AC_OUTPUT(Makefile
+          compiler/Makefile
+          compiler/back-ends/c++-gen/Makefile
+          compiler/back-ends/c-gen/Makefile
+          compiler/back-ends/idl-gen/Makefile
+          compiler/back-ends/Makefile
+          compiler/core/Makefile
+	  c-lib/Makefile
+	  c-lib/inc/Makefile
+	  c-lib/src/Makefile
+	  c-lib/Cebuf/Makefile
+	  c-lib/ebuf/Makefile
+	  c-lib/mbuf/Makefile
+	  c-lib/sbuf/Makefile
+	  c-lib/tbl/Makefile
+	  c++-lib/Makefile
+	  c++-lib/inc/Makefile
+	  c++-lib/src/Makefile
+	  c++-lib/c++/Makefile
+          asn1specs/Makefile
+          tbl-tools/berdecode/Makefile
+          tbl-tools/mkchdr/Makefile
+          tbl-tools/ptbl/Makefile
+          tbl-tools/pval/Makefile
+          tbl-tools/Makefile
+          doc/Makefile
+          snacc-config,
+[if test -f snacc-config; then chmod +x snacc-config; fi])
+dnl --- finis
diff -uraN snacc-1.3bbn/configure.in snacc-1.3bbn-debian/configure.in
--- snacc-1.3bbn/configure.in	2005-07-30 20:06:02.703761472 +0000
+++ snacc-1.3bbn-debian/configure.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl ---
-dnl	$Log: configure.in,v $
-dnl	Revision 1.13  1997/09/04 13:54:04  wan
-dnl	A little more portability
-dnl
-dnl	Revision 1.12  1997/02/28 13:39:35  wan
-dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
-dnl
-dnl	Revision 1.11  1997/02/16 16:50:27  rj
-dnl	made return *this after calling abort()'' a compile time option.
-dnl
-dnl	Revision 1.10  1997/02/15 20:06:27  rj
-dnl	adjust to changed AC_TRY_COMPILE macro
-dnl
-dnl	Revision 1.9  1997/02/15 20:01:38  rj
-dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
-dnl
-dnl	Revision 1.8  1997/01/01 19:57:01  rj
-dnl	changes for autoconf version 2.12
-dnl
-dnl	Revision 1.7  1995/09/07  18:36:47  rj
-dnl	psbook and psnup are looked for (used by .../doc/makefile)
-dnl
-dnl	Revision 1.6  1995/07/24  14:44:47  rj
-dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
-dnl
-dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
-dnl
-dnl	look for patch(1). the c-lib uses it to patch tbl.h.
-dnl
-dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
-dnl
-dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
-dnl
-dnl	Revision 1.5  1995/02/20  11:18:41  rj
-dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
-dnl	check for isinf(3) and finite(3) added.
-dnl
-dnl	Revision 1.4  1995/02/17  15:15:44  rj
-dnl	hack to let makedepend find .h files the way gcc does.
-dnl
-dnl	Revision 1.3  1995/02/17  14:26:40  rj
-dnl	adjustments for autoconf 2.x
-dnl
-dnl	Revision 1.2  1994/10/08  04:29:37  rj
-dnl	search for Tcl/Tk
-dnl
-dnl	Revision 1.1  1994/09/01  00:51:22  rj
-dnl	first check-in (new file).
-dnl
-AC_INIT( compiler/core/snacc.c)
-AC_REVISION($Revision: 1.13 $)
-AM_INIT_AUTOMAKE(snacc, 1.3)
-AM_CONFIG_HEADER( config.h)
-dnl --- alternative programs:
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_ISC_POSIX
-if test -n "$GCC"; then
-dnl   saveCC="$CC"
-dnl   CC="$CC -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
-fi
-AC_PROG_GCC_TRADITIONAL
-AC_MSG_CHECKING( whether ANSI or K&R style C)
-AC_TRY_COMPILE([ ], [void *p; p = "test";], [
-AC_MSG_RESULT(ANSI)
-AC_DEFINE( __USE_ANSI_C__)
-], [
-AC_MSG_RESULT(K&R)
-])
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-dnl if test -n "$GCC"; then
-dnl   saveCXX="$CXX"
-dnl   CXX="$CXX -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
-dnl fi
-AC_MSG_CHECKING( for bool built-in)
-AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for variable sized automatic arrays)
-AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for volatile functions)
-AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
-AC_LANG_C
-AM_PROG_LEX
-case "$LEX" in
-  lex)
-    LFLAGS="-Nc10000"
-  ;;
-  flex)
-    CFLAGS="$CFLAGS -DFLEX_IN_USE"
-esac
-AC_SUBST( LFLAGS)
-AC_SUBST( CFLAGS)
-# the boot strapping code in .../c-lib/ needs patch:
-AC_CHECK_PROGS( PATCH, patch, false)
-AC_PROG_YACC
-AC_PROG_LN_S
-AC_PROG_INSTALL
-dnl --- header files:
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_HEADER_STDC
-AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
-AC_FUNC_VPRINTF
-dnl --- system and compiler characteristics:
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_LIB( m, sin)
-AC_CHECK_FUNCS( isinf finite)
-AC_CHECK_FUNCS( memset memcpy memcmp)
-dnl ---
-AC_PATH_X
-AC_PATH_XTRA
-AC_CHECK_PROGS( TCLSH, tclsh, false)
-if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
-  AC_CHECK_HEADER(
-    tcl.h,
-    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
-    AC_CHECK_LIB(
-      tcl,
-      Tcl_CreateInterp,
-      [saveCFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $X_CFLAGS"
-      AC_CHECK_LIB(
-	tk,
-	Tk_CreateWindow,
-	[AC_DEFINE( HAVE_TCL)
-	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
-	CXXTCLDIR="tcl"
-	TCLDIRS="tcl-lib tcl-asn tcl-example"
-	AC_LANG_CPLUSPLUS
-	AC_CHECK_LIB(
-	  TkTree,
-	  Tree_Init,
-	  [TREELIBS="-lTkTree"],
-	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
-	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-	AC_LANG_C],
-	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
-	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-      CFLAGS="$saveCFLAGS"],
-      [AC_MSG_RESULT( [tcl library not found])],
-      $TCLOTHERLIBS -lm)])
-fi
-AC_SUBST( CXXTCLDIR)
-AC_SUBST( TCLDIRS)
-AC_SUBST( TCLLIBS)
-AC_SUBST( TREELIBS)
-dnl ---
-AC_CHECK_PROGS( LATEX, latex, false)
-AC_CHECK_PROGS( BIBTEX, bibtex, false)
-AC_CHECK_PROGS( DVIPS, dvips, false)
-AC_CHECK_PROGS( DETEX, detex2 detex, false)
-AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
-AC_CHECK_PROGS( PSBOOK, psbook, false)
-AC_CHECK_PROGS( PSNUP, psnup, false)
-AC_CHECK_PROGS( SPELL, ispell spell, spell)
-dnl ---
-
-dnl Configure for libtool.
-AM_PROG_LIBTOOL
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
-AC_SUBST(LTLIBOBJS)
-
-dnl Generate the C library build directories.
-linked_files=`cd c-lib/src && ls *.c`
-for dir in Cebuf ebuf mbuf sbuf tbl; do
-  if test -d c-lib/$dir; then :; else
-    echo creating c-lib/$dir
-    mkdir c-lib/$dir
-  fi
-  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
-  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
-  case $dir in
-  Cebuf) 
-    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
-    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
-    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
-    ;;
-  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
-  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
-  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
-  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
-  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
-done
-
-dnl Generate the C++ and Tcl library build directories.
-linked_files=`cd c++-lib/src && ls *.c *.C`
-for dir in c++ tcl; do
-  if test -d c++-lib/$dir; then :; else
-    echo creating c++-lib/$dir
-    mkdir c++-lib/$dir
-  fi
-  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
-  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
-  case $dir in
-  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
-  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
-  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
-done  
-
-dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
-dnl from glib-1.2.1's configure.in.  See that file for an explanation.
-AC_OUTPUT_COMMANDS([
-          
-## Generate `snaccconfig.h' in two 
-## cases:
-## 1. `config.status' is run either explicitly, or via configure.
-##     Esp. not when it is run in `Makefile' to generate makefiles and
-##     config.h
-## 2. CONFIG_OTHER is set explicitly
-##
-## Case 1 is difficult.  We know that `automake' sets one of
-## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
-## only when AM_CONFIG_HEADER is set, however.
-
-case "x$CONFIG_OTHER" in
-*snaccconfig.h) gen_snaccconfig_h=yes
-;;
-esac
-if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
-  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
-  if test "x${CONFIG_OTHER}" = x; then
-    gen_snaccconfig_h=yes
-  fi
-fi
-
-## If we're generating snaccconfig.h:
-## FIXME - currently, snaccconfig.h is just the normal
-## config.h wrapped.  this is because the user include
-## files use the normal config.h symbol names, and I 
-## haven't changed those yet.
-if test "x$gen_snaccconfig_h" = xyes; then
-  outfile=snaccconfig.h
-  echo creating $outfile
-  cat <<SNACCEOF > ${outfile}-tmp
-/* snaccconfig.h
- * 
- * This is an automatically generated file - please modify 'configure.in'.
- */
-
-#ifndef _SNACCCONFIG_H
-#define _SNACCCONFIG_H
-
-SNACCEOF
-  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
-  cat <<SNACCEOF >> ${outfile}-tmp
-
-#endif /* !_SNACCCONFIG_H */
-SNACCEOF
-  if cmp -s ${outfile}-tmp $outfile; then
-    echo $outfile is unchanged
-    rm -f ${outfile}-tmp
-  else
-    mv ${outfile}-tmp ${outfile}
-  fi
-fi
-])
-
-dnl Writes files.
-AC_OUTPUT(Makefile
-          compiler/Makefile
-          compiler/back-ends/c++-gen/Makefile
-          compiler/back-ends/c-gen/Makefile
-          compiler/back-ends/idl-gen/Makefile
-          compiler/back-ends/Makefile
-          compiler/core/Makefile
-	  c-lib/Makefile
-	  c-lib/inc/Makefile
-	  c-lib/src/Makefile
-	  c-lib/Cebuf/Makefile
-	  c-lib/ebuf/Makefile
-	  c-lib/mbuf/Makefile
-	  c-lib/sbuf/Makefile
-	  c-lib/tbl/Makefile
-	  c++-lib/Makefile
-	  c++-lib/inc/Makefile
-	  c++-lib/src/Makefile
-	  c++-lib/c++/Makefile
-	  c++-lib/tcl/Makefile
-          asn1specs/Makefile
-          tbl-tools/berdecode/Makefile
-          tbl-tools/mkchdr/Makefile
-          tbl-tools/ptbl/Makefile
-          tbl-tools/pval/Makefile
-          tbl-tools/Makefile
-          doc/Makefile
-          snacc-config,
-[if test -f snacc-config; then chmod +x snacc-config; fi])
-dnl --- finis

snacc-examples.patch:
 c++-examples/any/README            |   90 +++
 c++-examples/any/example.C         |  115 ++++
 c++-examples/any/genber.C          |  150 +++++
 c++-examples/any/makefile          |  154 ++++++
 c++-examples/makefile              |   34 +
 c++-examples/simple/README         |  105 ++++
 c++-examples/simple/example.C      |  115 ++++
 c++-examples/simple/genber.C       |   99 +++
 c++-examples/simple/good-pr.ber.uu |    7 
 c++-examples/simple/makefile       |  146 +++++
 c++-examples/snmp/README           |  126 ++++
 c++-examples/snmp/makefile         |  103 ++++
 c++-examples/test-lib/README       |   37 +
 c++-examples/test-lib/makefile     |   59 ++
 c++-examples/test-lib/test-lib.C   |  781 ++++++++++++++++++++++++++++++
 c-examples/any/README              |  107 ++++
 c-examples/any/example.c           |  161 ++++++
 c-examples/any/genber.c            |  164 ++++++
 c-examples/any/makefile            |  144 +++++
 c-examples/makefile                |   42 +
 c-examples/simple/README           |  128 +++++
 c-examples/simple/expbuf-ex.c      |  166 ++++++
 c-examples/simple/genber.c         |  154 ++++++
 c-examples/simple/good-pr.ber.uu   |    7 
 c-examples/simple/makefile         |  198 +++++++
 c-examples/simple/minbuf-ex.c      |  162 ++++++
 c-examples/simple/sbuf-ex.c        |  154 ++++++
 c-examples/snmp/README             |  118 ++++
 c-examples/snmp/makefile           |   91 +++
 c-examples/test-lib/README         |   37 +
 c-examples/test-lib/makefile       |   50 +
 c-examples/test-lib/test-lib.c     |  935 +++++++++++++++++++++++++++++++++++++
 tbl-example/README                 |   83 +++
 tbl-example/example.c              |  174 ++++++
 tbl-example/makefile               |   82 +++
 tbl-example/p-rec.ber.uu           |    7 
 36 files changed, 5285 insertions(+)

--- NEW FILE snacc-examples.patch ---
diff -uraN snacc-1.3bbn/c++-examples/any/README snacc-1.3b4/c++-examples/any/README
--- snacc-1.3bbn/c++-examples/any/README	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/README	1997-02-16 20:25:26.000000000 +0000
@@ -0,0 +1,90 @@
+(RCS control information is at the end of this file.)
+
+
+C++ ANY example README
+---------------------
+
+This example shows how the snacc compiler handles the ANY DEFINED BY
+type in C++.  ANY types (not ANY DEFINED BY) require modifications
+to the generated code.  Type "make" to build this example.
+
+This directory should have the following 4 files in it:
+
+        README
+        example.C
+        genber.C
+        makefile
+
+There are 3 programs generated by the makefile:
+
+        genber - builds a BER value of the AnyTestType and writes it
+                 to a file called "att.ber"
+
+        def    - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses definite
+                 lengths for constructed values.
+
+        indef  - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses indefinite
+                 lengths for constructed values.
+
+
+These files use the code generated by snacc from the
+snacc/asn1specs/any.asn1 file. (see the makefile)
+
+Look at genber.C to see how values can be built and printed.
+
+Look at the generated code in any_test.C and any_test.h to see how the
+any hash table is built.
+
+
+try the following commands in your c-shell:
+
+%1 genber                   # generate the att.ber file
+%2 indef att.ber > tmp.ber  # decode att.ber an re-encode into tmp.ber
+%3 def tmp.ber > tmp2.ber   # decode tmp.ber an re-encode into tmp2.ber
+%4 diff att.ber tmp2.ber    # compare .ber files (should be the same)
+
+When you are finished with the example type "make clean"  to remove
+the binaries and generated code.
+
+
+
+Things To Note
+--------------
+
+Snacc ASN.1 comment commands
+
+In the snacc/asn1specs/any.asn1 file, the AnyTestType has a special
+"--snacc" ASN.1 comment after ::= to give snacc some extra information
+about the AnyTestType.
+
+AnyTestType ::= --snacc isPdu:"TRUE" -- SEQUENCE { ... etc. ... }
+
+The "isPdu" flag only affects the generated C code, not C++.  Each
+C++ type gets PDU methods by default.
+
+
+SNMP OBJECT-TYPE Macro
+
+The SNMP OBJECT-TYPE macro is used to define the id value to type
+mapping for ANY DEFINED BY types.  The macro has been modified to
+accept both INTEGERs and OBJECT IDENTIFIERs as id values (see
+snacc/asn1specs/any.asn1).  This macro can be used with other
+protocols to define the id to type mapping.
+
+Two hash tables are used to hold the id to type mappings. One for
+INTEGER to type mappings and the other for OBJECT IDENTIFIER to type
+mappings.  The hash tables are automatically initialized in each
+module that has OBJECT-TYPE macros.  In C the hash table must be
+explicitly initialized.
+
+#-------------------------------------------------------------------------------
+# $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/README,v 1.2 1997/02/16 20:25:26 rj Exp $
+# $Log: README,v $
+# Revision 1.2  1997/02/16 20:25:26  rj
+# check-in of a few cosmetic changes
+#
+# Revision 1.1  1994/08/31  08:47:59  rj
+# first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+#
diff -uraN snacc-1.3bbn/c++-examples/any/example.C snacc-1.3b4/c++-examples/any/example.C
--- snacc-1.3bbn/c++-examples/any/example.C	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/example.C	1995-07-24 15:33:33.000000000 +0000
@@ -0,0 +1,115 @@
+// c++_examples/any/example.C - an example of how to use C++ ASN.1-BER
+//              for ANY Types
+//
+// AUTHOR: Mike Sample
+// DATE:   92
+//
+// $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/example.C,v 1.5 1995/07/24 15:33:33 rj Exp $
+// $Log: example.C,v $
+// Revision 1.5  1995/07/24 15:33:33  rj
+// changed `_' to `-' in file names.
+//
+// any-test.[hC] becomes any.[hC] due to to snacc's new file name generation scheme.
+//
+// check return value of new.
+//
+// Revision 1.4  1995/02/18  13:53:07  rj
+// added #define HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS since not every C++ compiler provides them.
+//
+// Revision 1.3  1994/10/08  01:26:21  rj
+// several \size_t'
+//
+// Revision 1.2  1994/08/31  08:56:29  rj
+// first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+//
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fstream.h>
+
+#include "asn-incl.h"
+#include "any.h"
+
+main (int argc, char *argv[])
+{
+    if (argc != 2)
+    {
+        cerr << "Usage: " << argv[0] << " <BER data file name>" << endl;
+        cerr << "   Decodes the given AnyTestType BER data file" << endl;
+        cerr << "   and re-encodes it to stdout" << endl;
+        exit (1);
+    }
+
+    ifstream dataFile;
+    // open the data file
+    dataFile.open (argv[1]);
+
+    if (!dataFile)
+    {
+        perror ("ifstream::open");
+        exit (1);
+    }
+
+    // get size of the data file file
+    dataFile.seekg (0, ios::end);
+    int dataSize = dataFile.tellg();
+    dataFile.seekg (0);
+
+    // read data from file into contiguous block for a buffer
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char data[dataSize];
+#else
+    char *data = new char[dataSize];
+    if (!data)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    dataFile.read (data, dataSize);
+    dataFile.close();
+
+    //
+    // put the BER data read from the file
+    // into buffer format, ready for reading from the
+    // beginning
+    //
+    AsnBuf inputBuf;
+    inputBuf.InstallData ((char*)data, dataSize);
+
+    size_t decodedLen;
+    AnyTestType att;
+
+    if (!att.BDecPdu (inputBuf, decodedLen))
+    {
+        cerr << "ERROR - Decode routines failed, exiting..." << endl;
+        exit (1);
+    }
+
+    cerr  << "decodedValue AnyTestType ::= " << att << endl << endl;
+
+    //
+    // allocate a new buffer and set up for writing to
+    //
+    AsnBuf  outputBuf;
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char outputData[dataSize + 512];
+#else
+    char *outputData = new char[dataSize + 512];
+    if (!outputData)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    outputBuf.Init (outputData, dataSize+512);
+    outputBuf.ResetInWriteRvsMode();
[...5030 lines suppressed...]
+
+    if (argc != 3)
+    {
+        Usage (argv[0]);
+        return 1;
+    }
+
+    tblFileName = argv[1];
+    berFileName = argv[2];
+
+    /* init mem pool to hold  decoded val */
+    InitNibbleMem (1024, 1024);
+
+    /* read in and decode the type table */
+    tbl = LoadTblFile (tblFileName);
+    if (tbl == NULL)
+        return 1;
+
+    fileData = LoadFile (berFileName, &fsize);
+    if (fileData == NULL)
+        return 1;
+
+    SBufInstallData (&sb, fileData, fsize);
+    PutSBufInGenBuf (&sb, &gb);
+
+    fprintf (stdout, "\n\n-- decoded contents of BER PersonnelRecord file: \"%s\"--\n", berFileName);
+
+    val = TblDecode (tbl, NULL, "PersonnelRecord", &gb, &bytesDecoded);
+
+    if (val == NULL)
+        fprintf (stdout, "-- Decoding error occured somewhere -- \n");
+    else
+        TblPrintValue (tbl, NULL, "PersonnelRecord", stdout, val);
+
+    fprintf (stdout, "\n\n -- decoded %d bytes for the above value --\n\n", bytesDecoded, berFileName);
+
+    free (fileData); /* was malloc'd in LoadFile */
+
+    /*
+     * process value here
+     * (This is where the header file generated by mkchdr is
+     * useful - you can access the decoded value in a standard
+     * /easier way).
+     *
+     * Ok, well, the names "field0" etc aren't that nice
+     * but what did you expect - they aren't named in the ASN.1
+     * spec so mkchdr just makes them up.  To fix this, just
+     * add field names to you ASN.1 spec - it will not change the
+     * way the values are encoded - so you're not making it
+     * incompatible with the original. (not including value notation)
+     */
+    printf ("The following printout is an example of using the\n");
+    printf ("hdr file generated by mkchdr to access the data\n");
+    printf ("returned from the table decoder.  Look in \"example.c\"\n\n");
+
+
+    printf ("***** JQ GUMBY & CO Database *****************************************\n");
+    printf ("Employee Name:      %s %s %s\n", val->field0->givenName->octs, val->field0->initial->octs, val->field0->familyName->octs);
+    printf ("Title:              %s\n", val->title->octs);
+    printf ("Employee Number:    %d\n", *val->field1);
+    printf ("Date of Hire:       %s\n", val->dateOfHire->octs);
+    printf ("Name of Spouse:     %s %s %s\n", val->nameOfSpouse->givenName->octs, val->nameOfSpouse->initial->octs, val->nameOfSpouse->familyName->octs);
+    printf ("Number of Children: %d\n", AsnListCount (val->children));
+    printf ("**********************************************************************\n\n");
+
+    /*
+     * finished playing with the decoded value.
+     * now re-encode the value.  Using an expbuf to hold the encoded val
+     * because they can grow and in general you can predict a values
+     * encoded size (although we could assume that is would be close to
+     * the same size as the one we read in at the beginning of this prg).
+     * (note: the size of PersonnelRecord BER value we decoded may be
+     * different from the size of the re-encoded version depending on
+     * the use of indefinite or definite lengths.  Both are valid BER.)
+     */
+    fprintf (stdout, "now re-encoding the PersonnelRecord value to \"%s\"\n", outputFileNameG);
+
+    ebPtr = ExpBufAllocBufAndData();
+    ExpBufResetInWriteRvsMode (ebPtr); /* set up to hold encoding (= writing) */
+
+    PutExpBufInGenBuf (ebPtr, &gb);
+
+    if (TblEncode (tbl, NULL, "PersonnelRecord", &gb, val, &bytesEncoded) < 0)
+        fprintf (stderr, "main: error encoding the PersonnelRecord\n");
+
+    /* copy ExpBuf data to file */
+    outputFile = fopen (outputFileNameG, "w");
+    if (outputFile == NULL)
+    {
+        fprintf (stderr, "error - could not open file \"%s\"\n", outputFileNameG);
+        perror ("main: fopen:");
+    }
+
+    ExpBufCopyToFile (ebPtr, outputFile);
+
+    fclose (outputFile);
+
+    /* free the encoded version */
+    ExpBufFreeBufAndDataList (ebPtr);
+
+
+    return 0;
+} /* main */
diff -uraN snacc-1.3bbn/tbl-example/makefile snacc-1.3b4/tbl-example/makefile
--- snacc-1.3bbn/tbl-example/makefile	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/makefile	1997-02-15 19:33:26.000000000 +0000
@@ -0,0 +1,82 @@
+# file: .../tbl-example/makefile
+#
+# $Header: /usr/app/odstb/CVS/snacc/tbl-example/makefile,v 1.1 1997/02/15 19:33:26 rj Exp $
+# $Log: makefile,v $
+# Revision 1.1  1997/02/15 19:33:26  rj
+# first check-in
+#
+
+include ../makehead
+
+TOP		= ..
+
+ASN1_SRC_DIR	= $(TOP)/asn1specs
+
+ASN1_C_LIB_DIR	= $(TOP)/c-lib
+ASN1_C_INC_DIR	= $(ASN1_C_LIB_DIR)/inc
+TTBL_ASN1_LIB	= $(ASN1_C_LIB_DIR)/libasn1ctbl.a
+
+COMPILERDIR	= $(TOP)/compiler
+SNACC		= $(COMPILERDIR)/snacc
+USEFUL_TYPES	= $(ASN1_SRC_DIR)/asn-useful.asn1
+SNACCFLAGS	= -u $(USEFUL_TYPES)
+
+TBLTOOLSDIR	= $(TOP)/tbl-tools
+MKHDR		= $(TBLTOOLSDIR)/mkchdr/mkchdr
+
+ASN1FILES	= $(ASN1_SRC_DIR)/p-rec.asn1
+ASN1TTFILE	= p-rec.tt
+ASN1TTHFILE	= p-rec.h
+
+CFILES	= example.c
+OFILES	= example.o
+
+DISTFILES = \
+	README		\
+	makefile	\
+	$(CFILES)	\
+	p-rec.ber
+
+CPPFLAGS	+= -I$(TOP) -I$(ASN1_C_INC_DIR) -DUSE_GEN_BUF
+
+#-------------------------------------------------------------------------------
+
+all::		example
+
+example:	$(OFILES) $(TTBL_ASN1_LIB)
+		$(REASON)
+		$(CC) $(CFLAGS) -o example $(OFILES) $(TTBL_ASN1_LIB) $(LIBS)
+
+$(ASN1TTFILE):	$(ASN1FILES)
+		$(REASON)
+		$(SNACC) $(SNACCFLAGS) -T $@ $(ASN1FILES)
+
+$(SNACC) $(MKHDR):
+		cd $(@D) && $(MAKE) $(@F)
+
+$(TTBL_ASN1_LIB):
+		cd $(@D) && $(MAKE) tbl-lib
+
+$(ASN1TTHFILE):	$(ASN1TTFILE)
+		$(REASON)
+		$(MKHDR) $? $@
+
+check::		example $(ASN1TTFILE)
+
+check::
+		./example p-rec.tt p-rec.ber
+		cmp p-rec.ber p-rec.out.ber
+		@echo "+++ the test was successful"
+
+# dummy:
+install::
+
+clean::
+		$(RM) example *.o *~ core .emacs* $(ASN1TTFILE) $(ASN1TTHFILE) p-rec.out.ber
+
+depend::
+		$(MAKE) $(MKHDR)
+
+depend::	$(ASN1TTHFILE)
+
+include ../maketail
diff -uraN snacc-1.3bbn/tbl-example/p-rec.ber.uu snacc-1.3b4/tbl-example/p-rec.ber.uu
--- snacc-1.3bbn/tbl-example/p-rec.ber.uu	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/p-rec.ber.uu	2005-07-30 16:57:00.588101736 +0000
@@ -0,0 +1,7 @@
+begin 644 p-rec.ber
+M8(&.81`6!$IO:&X6`446!5-M:71HH!`6#E1H92!":6<@0VAE97-E7X$``P&&
+MGZ$*0P at Q.3@R,#$P-*(281`6!$UA<GD6`4P6!5-M:71HHT$Q'V$1%@5*86UE
+M<Q8!4A8%4VUI=&B@"D,(,3DU-S`S,3`Q'F$0%@1,:7-A%@%-%@53;6ET:*`*
+*0P at Q.38Q,#8R,0``
+`
+end

snacc-gcc.patch:
 c++-lib/inc/asn-any.h                 |    2 
 c++-lib/inc/asn-bits.h                |    2 
 c++-lib/inc/asn-bool.h                |    2 
 c++-lib/inc/asn-config.h              |    6 +-
 c++-lib/inc/asn-int.h                 |    2 
 c++-lib/inc/asn-list.h                |    2 
 c++-lib/inc/asn-null.h                |    2 
 c++-lib/inc/asn-octs.h                |    2 
 c++-lib/inc/asn-oid.h                 |    2 
 c++-lib/inc/asn-real.h                |    2 
 c++-lib/inc/asn-type.h                |    2 
 c++-lib/inc/print.h                   |    4 -
 c++-lib/src/asn-any.C                 |    2 
 c++-lib/src/asn-bits.C                |    4 +
 c++-lib/src/asn-bool.C                |    4 +
 c++-lib/src/asn-enum.C                |    4 +
 c++-lib/src/asn-int.C                 |    4 +
 c++-lib/src/asn-len.C                 |    1 
 c++-lib/src/asn-list.C                |    6 +-
 c++-lib/src/asn-null.C                |    4 +
 c++-lib/src/asn-octs.C                |    4 +
 c++-lib/src/asn-oid.C                 |    8 +-
 c++-lib/src/asn-real.C                |    6 +-
 c++-lib/src/asn-tag.C                 |    2 
 c++-lib/src/asn-type.C                |    4 +
 c++-lib/src/meta.C                    |    2 
 c++-lib/src/print.C                   |    4 -
 c++-lib/src/tcl-if.C                  |    7 +-
 compiler/back-ends/c++-gen/gen-code.c |  102 +++++++++++++++++-----------------
 compiler/back-ends/c-gen/gen-code.c   |    1 
 compiler/core/parse-asn1.y            |    2 
 31 files changed, 116 insertions(+), 85 deletions(-)

--- NEW FILE snacc-gcc.patch ---
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-any.h snacc-1.3bbn/c++-lib/inc/asn-any.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-any.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-any.h	2005-07-30 19:22:42.514097072 +0000
@@ -81,7 +81,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if 0
 #if TCL
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h snacc-1.3bbn/c++-lib/inc/asn-bits.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bits.h	2005-07-30 19:23:29.321981192 +0000
@@ -105,7 +105,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBitsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h snacc-1.3bbn/c++-lib/inc/asn-bool.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bool.h	2005-07-30 19:23:45.319549192 +0000
@@ -101,7 +101,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBoolTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-config.h snacc-1.3bbn/c++-lib/inc/asn-config.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-config.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-config.h	2005-07-30 19:24:29.054900408 +0000
@@ -49,7 +49,7 @@
 #define _asn_config_h_
 
 #include <ctype.h>  /* for isprint() in <<op on AsnOcts */
-#include <iostream.h>
+#include <iostream>
 #include <memory.h>
 #include <string.h>
 #include <setjmp.h>
@@ -85,14 +85,14 @@
  * Asn1Error (char *str)
  *  - configure error handler
  */
-#define Asn1Error		cerr
+#define Asn1Error		std::cerr
 
 
 /*
  * Asn1Warning (char *str)  - configure warning mechanism
  * (currently not called)
  */
-#define Asn1Warning		cerr
+#define Asn1Warning		std::cerr
 
 
 /*
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-int.h snacc-1.3bbn/c++-lib/inc/asn-int.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-int.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-int.h	2005-07-30 19:24:45.421412320 +0000
@@ -70,7 +70,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnIntTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-list.h snacc-1.3bbn/c++-lib/inc/asn-list.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-list.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-list.h	2005-07-30 19:25:10.914682616 +0000
@@ -86,7 +86,7 @@
 				  last (NULL)
 				{}
 
-  friend ostream		&operator << (ostream &os, AsnList &l);
+  friend std::ostream		&operator << (std::ostream &os, AsnList &l);
 
   void				SetCurrElmt (unsigned long int index);
   void				SetCurrToFirst()			{ curr = first; }
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-null.h snacc-1.3bbn/c++-lib/inc/asn-null.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-null.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-null.h	2005-07-30 19:25:26.432323576 +0000
@@ -57,7 +57,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnNullTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h snacc-1.3bbn/c++-lib/inc/asn-octs.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-octs.h	2005-07-30 19:25:41.916969552 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOctsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h snacc-1.3bbn/c++-lib/inc/asn-oid.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-oid.h	2005-07-30 19:25:52.747323088 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOidTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-real.h snacc-1.3bbn/c++-lib/inc/asn-real.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-real.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-real.h	2005-07-30 19:26:05.321411536 +0000
@@ -67,7 +67,7 @@
   AsnLen			BEnc (BUF_TYPE b);
   void				BDec (BUF_TYPE b, AsnLen &bytesDecoded, ENV_TYPE env);
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
   PDU_MEMBER_MACROS
 
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-type.h snacc-1.3bbn/c++-lib/inc/asn-type.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-type.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-type.h	2005-07-30 19:26:16.551704272 +0000
@@ -111,7 +111,7 @@
 
 #endif
 
-  virtual void			Print (ostream &) const;
+  virtual void			Print (std::ostream &) const;
 
 #if META
   static const AsnTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/print.h snacc-1.3bbn/c++-lib/inc/print.h
--- snacc-1.3bbn.orig/c++-lib/inc/print.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/print.h	2005-07-30 19:26:54.240974632 +0000
@@ -42,8 +42,8 @@
 extern unsigned short int	indentG;
 extern unsigned short int	stdIndentG;
 
-void				Indent (ostream &os, unsigned short int i);
+void				Indent (std::ostream &os, unsigned short int i);
 
-ostream				&operator << (ostream &os, const AsnType &a);
+std::ostream			&operator << (std::ostream &os, const AsnType &a);
 
 #endif /* conditional include */
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-any.C snacc-1.3bbn/c++-lib/src/asn-any.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-any.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-any.C	2005-07-30 19:27:15.597727912 +0000
@@ -165,7 +165,7 @@
 }
 
 
-void AsnAny::Print (ostream &os) const
+void AsnAny::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bits.C snacc-1.3bbn/c++-lib/src/asn-bits.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bits.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bits.C	2005-07-30 19:27:51.063336320 +0000
@@ -65,6 +65,8 @@
 #include "asn-bits.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 unsigned short int  strStkUnusedBitsG;
 
@@ -440,7 +442,7 @@
 }  /* BDecConsBits */
 
 // prints the BIT STRING to the given ostream.
-void AsnBits::Print (ostream &os) const
+void AsnBits::Print (std::ostream &os) const
 {
     size_t octetLen = (bitLen+7)/8;
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bool.C snacc-1.3bbn/c++-lib/src/asn-bool.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bool.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bool.C	2005-07-30 19:28:23.793360600 +0000
@@ -54,6 +54,8 @@
 #include "asn-type.h"
 #include "asn-bool.h"
 
+using std::endl;
+
 AsnType *AsnBool::Clone() const
 {
   return new AsnBool;
@@ -110,7 +112,7 @@
 }
 
 // print the BOOLEAN's value in ASN.1 value notation to the given ostream
-void AsnBool::Print (ostream &os) const
+void AsnBool::Print (std::ostream &os) const
 {
   os << (value ? "TRUE" : "FALSE");
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-enum.C snacc-1.3bbn/c++-lib/src/asn-enum.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-enum.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-enum.C	2005-07-30 19:28:57.068302040 +0000
@@ -41,9 +41,11 @@
 #include "asn-int.h"
 #include "asn-enum.h"
 
+using std::endl;
+
 AsnType *AsnEnum::Clone() const
 {
-  cerr << "AsnEnum::Clone() called" << endl;
+  std::cerr << "AsnEnum::Clone() called" << endl;
   abort();
   return NULL;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-int.C snacc-1.3bbn/c++-lib/src/asn-int.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-int.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-int.C	2005-07-30 19:31:10.276100376 +0000
@@ -55,6 +55,8 @@
 #include "asn-type.h"
 #include "asn-int.h"
 
+using std::endl;
+
 AsnType *AsnInt::Clone() const
 {
   return new AsnInt;
@@ -171,7 +173,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, INTEGER_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnInt::Print (ostream &os) const
+void AsnInt::Print (std::ostream &os) const
 {
     os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-len.C snacc-1.3bbn/c++-lib/src/asn-len.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-len.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-len.C	2005-07-30 19:31:35.984192152 +0000
@@ -41,6 +41,7 @@
 #include "asn-config.h"
 #include "asn-len.h"
 
+using std::endl;
 
 /*
  * Encodes the given length to the given buffer.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-list.C snacc-1.3bbn/c++-lib/src/asn-list.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-list.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-list.C	2005-07-30 19:32:25.815616624 +0000
@@ -62,6 +62,8 @@
 #include "asn-tag.h"
 #include "asn-type.h"
 
+using std::endl;
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -80,7 +82,7 @@
 
 // print routine for lists
 template <class T>
-ostream &operator << (ostream &os, AsnList<T> &l)
+std::ostream &operator << (std::ostream &os, AsnList<T> &l)
 {
     os << "SEQUENCE OF { ";
 
@@ -241,7 +243,7 @@
      {
          listElmtTagId = BDecTag (b, bytesDecoded, env);
 
-         if ((listElmtTagId == EOC) && (elmtLen == INDEFINITE_LEN))
+         if ((listElmtTagId == EOC_TAG_ID) && (elmtLen == INDEFINITE_LEN))
              break;
 
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-null.C snacc-1.3bbn/c++-lib/src/asn-null.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-null.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-null.C	2005-07-30 19:33:01.169242056 +0000
@@ -48,6 +48,8 @@
 #include "asn-type.h"
 #include "asn-null.h"
 
+using std::endl;
+
 AsnType *AsnNull::Clone() const
 {
   return new AsnNull;
@@ -85,7 +87,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, NULLTYPE_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnNull::Print (ostream &os) const
+void AsnNull::Print (std::ostream &os) const
 {
     os << "NULL";
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-octs.C snacc-1.3bbn/c++-lib/src/asn-octs.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-octs.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-octs.C	2005-07-30 19:33:30.540776904 +0000
@@ -58,6 +58,8 @@
 #include "asn-octs.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 
 AsnOcts::~AsnOcts()
@@ -166,7 +168,7 @@
 
 
 // Prints the AsnOcts to the given ostream in Value Notation.
-void AsnOcts::Print (ostream &os) const
+void AsnOcts::Print (std::ostream &os) const
 {
     int i;
     os << "'";
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-oid.C snacc-1.3bbn/c++-lib/src/asn-oid.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-oid.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-oid.C	2005-07-30 19:43:47.320214040 +0000
@@ -51,7 +51,7 @@
 
 #include "asn-config.h"
 #if TCL
-#include <strstream.h>
+#include <strstream>
 #endif
 #include "asn-len.h"
 #include "asn-tag.h"
@@ -59,6 +59,8 @@
 #include "asn-oid.h"
 #include "print.h"
 
+using std::endl;
+
 AsnOid::~AsnOid()
 {
   delete oid;
@@ -157,7 +159,7 @@
     *(tmpBuf++) = 0x7f & headArcNum;
 
     // repeat for the rest of the arc numbers
-    for (i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
+    for (int i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
     {
         tmpArcNum = arcNumArr[i];
         for (elmtLen = 1; (tmpArcNum >>= 7) != 0; elmtLen++)
@@ -308,7 +310,7 @@
 
 // Prints an AsnOid in ASN.1 Value Notation.
 // Decodes the oid to get the individual arc numbers
-void AsnOid::Print (ostream &os) const
+void AsnOid::Print (std::ostream &os) const
 {
   unsigned short int firstArcNum;
   unsigned long int arcNum;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-real.C snacc-1.3bbn/c++-lib/src/asn-real.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-real.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-real.C	2005-07-30 19:44:57.954476000 +0000
@@ -57,12 +57,16 @@
 #include "asn-type.h"
 #include "asn-real.h"
 
+using std::endl;
+
 #ifndef IEEE_REAL_LIB
 /* ieee functions (in case not in math.h)*/
 extern "C" {
 extern int iszero (double);
+#if defined(__GNUC__) && (__GNUC__ < 3)
 extern int isinf (double);
 extern int signbit (double);
+#endif /* __GNUC__ && __GNUC__ < 3 */
 extern int ilogb (double);
 extern double scalbn (double, int);
 }
@@ -841,7 +845,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, REAL_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnReal::Print (ostream &os) const
+void AsnReal::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-tag.C snacc-1.3bbn/c++-lib/src/asn-tag.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-tag.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-tag.C	2005-07-30 19:45:24.267135808 +0000
@@ -45,6 +45,8 @@
 #include "asn-len.h"
 #include "asn-tag.h"
 
+using std::endl;
+
 /*
  * Decode a BER Tag from the given buffer.  Error is
  * flagged if the tag is too long or if a read error occurs.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-type.C snacc-1.3bbn/c++-lib/src/asn-type.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-type.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-type.C	2005-07-30 19:30:07.294675008 +0000
@@ -72,6 +72,8 @@
 #include "asn-len.h"
 #include "asn-type.h"
 
+using std::endl;
+
 AsnType::~AsnType()
 {
 }
@@ -97,7 +99,7 @@
 
 #endif
 
-void AsnType::Print (ostream &os) const
+void AsnType::Print (std::ostream &os) const
 {
   os << "ERROR - Attempt to print an improperly formed ANY type (programming error)." << endl;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/meta.C snacc-1.3bbn/c++-lib/src/meta.C
--- snacc-1.3bbn.orig/c++-lib/src/meta.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/meta.C	2005-07-30 19:46:03.588158104 +0000
@@ -27,6 +27,8 @@
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if META
 
 AsnMemberDesc::AsnMemberDesc (const char *_name, const AsnTypeDesc *_desc):
diff -uraN snacc-1.3bbn.orig/c++-lib/src/print.C snacc-1.3bbn/c++-lib/src/print.C
--- snacc-1.3bbn.orig/c++-lib/src/print.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/print.C	2005-07-30 19:46:33.326637168 +0000
@@ -45,13 +45,13 @@
 unsigned short int stdIndentG = 4;
 
 void
-Indent (ostream &os, unsigned short int i)
+Indent (std::ostream &os, unsigned short int i)
 {
   while (i-->0)
     os <<  ' ';
 }
 
-ostream &operator << (ostream &os, const AsnType &v)
+std::ostream &operator << (std::ostream &os, const AsnType &v)
 {
   v.Print (os);
   return os;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/tcl-if.C snacc-1.3bbn/c++-lib/src/tcl-if.C
--- snacc-1.3bbn.orig/c++-lib/src/tcl-if.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/tcl-if.C	2005-07-30 19:48:01.296263752 +0000
@@ -28,12 +28,13 @@
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <strstream.h>
-#include <fstream.h>
+#include <sstream>
 #include <string.h>
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if TCL
 
 #ifdef _AIX32
@@ -835,7 +836,7 @@
     }
 
 cout << *var;
-  strstream s;
+  stringstream s;
   s << *var;
   s.put ('\0');
   cout << strlen(s.str()) << endl;
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c	2001-01-27 01:02:54.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c	2005-07-30 19:58:00.407885728 +0000
@@ -453,7 +453,7 @@
         fprintf (src, "    else\n");
         fprintf (src, "        return false;\n");
 /*
-        fprintf (src, "    { cerr << \"longjmp return value is \" << val << endl;\n");
+        fprintf (src, "    { std::cerr << \"longjmp return value is \" << val << std::endl;\n");
         fprintf (src, "        return false; }\n");
 */
         fprintf (src, "}\n\n");
@@ -999,7 +999,7 @@
                                 fprintf (src, ")\n");
                         }
                         fprintf (src, "    {\n");
-            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
                         fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "    }\n");
 
@@ -1357,7 +1357,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -1423,7 +1423,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -1666,7 +1666,7 @@
                         }
 
                         fprintf (src, "      {\n");
-                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << endl;\n");
+                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                         fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "      }\n\n");
 
@@ -1780,7 +1780,7 @@
         }
 
         fprintf (src, "    default:\n");
-        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << endl;\n");
+        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << std::endl;\n");
         fprintf (src, "      longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "      break;\n");
 
@@ -1847,7 +1847,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))", classStr, formStr, tag->code);
             fprintf (src, "    {\n");
-	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    }\n");
             fprintf (src, "    extraLen%d = BDecLen (b, bytesDecoded, env);\n", ++elmtLevel);
@@ -1876,11 +1876,11 @@
     /* ostream printing routine */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n", td->cxxTypeDefInfo->className);
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n", td->cxxTypeDefInfo->className);
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        /*    fprintf (src, "  os << \"{\" << endl;\n") */
+        /*    fprintf (src, "  os << \"{\" << std::endl;\n") */
         fprintf (src, "  switch (choiceId)\n");
         fprintf (src, "  {\n");
         FOR_EACH_LIST_ELMT (e, choice->basicType->a.choice)
@@ -1909,7 +1909,7 @@
         }
         fprintf (src, "  } // end of switch\n");
 
-        /*    fprintf (src, "  os << \"}\" << endl;\n") */
+        /*    fprintf (src, "  os << \"}\" << std::endl;\n") */
         fprintf (src, "} // %s::Print\n\n", td->cxxTypeDefInfo->className);
     }
     /* end of Print Method code */
@@ -2260,7 +2260,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -2310,7 +2310,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -2460,7 +2460,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2638,7 +2638,7 @@
                             }
 
                             fprintf (src, "    {\n");
-                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "       longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "    }\n\n");
                             fprintf (src, "    elmtLen%d = BDecLen (b, seqBytesDecoded, env);\n", ++elmtLevel);
@@ -2826,7 +2826,7 @@
                     fprintf (src, "  }\n"); /* end of tag check if */
                     fprintf (src, "  else\n");
                     fprintf (src, "  {\n");
-                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << endl;\n");
+                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << std::endl;\n");
                     fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
                     fprintf (src, "  }\n\n");
                 }
@@ -2845,7 +2845,7 @@
             fprintf (src, "  }\n");
             fprintf (src, "  else if (seqBytesDecoded != elmtLen0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << endl;\n");
+            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << std::endl;\n");
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
             fprintf (src, "  else\n");
@@ -2914,7 +2914,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2939,14 +2939,14 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (seq->basicType->a.sequence);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
-        fprintf (src, "  os << \"{ -- SEQUENCE --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SEQUENCE --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, seq->basicType->a.sequence)
@@ -2963,12 +2963,12 @@
                 if (e != FIRST_LIST_ELMT (seq->basicType->a.sequence))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -2982,10 +2982,10 @@
 
 #ifdef KHO
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence)&&(!e->type->cxxTypeRefInfo->isPtr) )
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #else
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence) && !inTailOptElmts && !NextIsTailOptional (seq->basicType->a.sequence))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #endif
 
 	    fprintf (src, "  }\n");
@@ -3000,9 +3000,9 @@
                   fprintf (src, "    os << \"%s \";\n", e->fieldName);
 		fprintf (src, "    os << \"-- void --\";\n");
     		if (e != LAST_LIST_ELMT (seq->basicType->a.sequence))
-                   fprintf (src, "    os << \",\" << endl;\n");
+                   fprintf (src, "    os << \",\" << std::endl;\n");
                 else
-                   fprintf (src, "    os << endl;\n");
+                   fprintf (src, "    os << std::endl;\n");
 		fprintf (src, "  }\n");
 #else
 		fprintf (src, "    os << \"-- void --\";\n");
@@ -3012,7 +3012,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (seq->basicType->a.sequence))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
 
         fprintf (src, "  indentG -= stdIndentG;\n");
@@ -3361,7 +3361,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -3411,7 +3411,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -3557,7 +3557,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3697,7 +3697,7 @@
                             }
 
                             fprintf (src, "        {\n");
-                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "           longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "        }\n\n");
 
@@ -3814,14 +3814,14 @@
                 FreeTags (tags);
             } /* for each elmt */
             fprintf (src, "       default:\n");
-            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << endl;\n");
+            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << std::endl;\n");
             fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    } // end switch\n");
             fprintf (src, "  } // end for loop\n");
             fprintf (src, "  bytesDecoded += setBytesDecoded;\n");
             fprintf (src, "  if (mandatoryElmtsDecoded != %d)\n", mandatoryElmtCount);
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3889,7 +3889,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3914,15 +3914,15 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n");
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (set->basicType->a.set);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
 
-        fprintf (src, "  os << \"{ -- SET --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SET --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, set->basicType->a.set)
@@ -3939,12 +3939,12 @@
                 if (e != FIRST_LIST_ELMT (set->basicType->a.set))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -3957,7 +3957,7 @@
                 fprintf (src, "    os << %s;\n", e->type->cxxTypeRefInfo->fieldName);
 
             if (e != LAST_LIST_ELMT (set->basicType->a.set) && !inTailOptElmts && !NextIsTailOptional (set->basicType->a.set))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 
 	    fprintf (src, "  }\n");
 
@@ -3974,7 +3974,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (set->basicType->a.set))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
         fprintf (src, "  indentG -= stdIndentG;\n");
         fprintf (src, "  Indent (os, indentG);\n");
@@ -4294,7 +4294,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -4324,7 +4324,7 @@
     fprintf (hdr, "  PDU_MEMBER_MACROS\n");
 
     if (printPrintersG)
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
     fprintf (hdr, "};\n\n\n");
 
@@ -4380,7 +4380,7 @@
         }
         fprintf (src, "))\n");
         fprintf (src, "        {\n");
-        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
         fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "        }\n\n");
         fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4406,7 +4406,7 @@
                 fprintf (src, "))\n");
 
             fprintf (src, "        {\n");
-            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
             fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "        }\n\n");
             fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4461,7 +4461,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -4494,7 +4494,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -4506,9 +4506,9 @@
 
     if (printPrintersG)
     {
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << endl;\n");
+        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << std::endl;\n");
         fprintf (src, "    indentG += stdIndentG;\n");
 
         fprintf (src, "    //SetCurrToFirst();\n");
@@ -4521,7 +4521,7 @@
         fprintf (src, "        //if (Curr() != Last())\n");
         fprintf (src, "        if (run != last)\n");
         fprintf (src, "            os << \",\";\n");
-        fprintf (src, "        os << endl;\n");
+        fprintf (src, "        os << std::endl;\n");
         fprintf (src, "    }\n");
 
         fprintf (src, "    indentG -= stdIndentG;\n");
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c	2001-01-27 01:02:52.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c	2005-07-30 19:22:04.488877784 +0000
@@ -33,6 +33,7 @@
  */
 
 #include <stdio.h>
+#include <time.h>
 
 #include "asn-incl.h"
 #include "asn1module.h"
diff -uraN snacc-1.3bbn.orig/compiler/core/parse-asn1.y snacc-1.3bbn/compiler/core/parse-asn1.y
--- snacc-1.3bbn.orig/compiler/core/parse-asn1.y	2001-01-27 01:02:47.000000000 +0000
+++ snacc-1.3bbn/compiler/core/parse-asn1.y	2005-07-30 17:29:02.838828848 +0000
@@ -456,6 +456,7 @@
 /*-----------------------------------------------------------------------*/
 
 LineNo: { $$ = myLineNoG; }
+;
 
 ModuleDefinition:
      ModuleIdentifier
@@ -1462,6 +1463,7 @@
         $$->choiceId = SUBTYPEVALUE_SINGLEVALUE;
         $$->a.singleValue = $1;
     }
+;
 
 ContainedSubtype:
     INCLUDES_SYM Type

snacc-ttab-tex-UTF8-fix.patch:
 ttab.tex |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-ttab-tex-UTF8-fix.patch ---
diff -up ./doc/ttab.tex.texfix ./doc/ttab.tex
--- ./doc/ttab.tex.texfix	2009-09-09 10:30:25.597509928 +0530
+++ ./doc/ttab.tex	2009-09-09 10:30:54.173509922 +0530
@@ -18,7 +18,7 @@ size of your type tables, put the only u
 your ASN.1 module and compile it without using the useful types
 module.
 
-A generic buffer type (? la ISODE and XDR) was defined to allow type
+A generic buffer type (ISODE and XDR) was defined to allow type
 table driven routines to read from a wide variety of buffer formats.
 Currently slightly modified versions of the {\C ExpBuf} and the
 {\C SBuf} are provided.  It shouldn't be too hard for you to add


--- NEW FILE snacc.spec ---
Name:           snacc
Version:        1.3
Release:        4%{?dist}
Summary:        Sample Neufeld ASN.1 to C Compiler

Group:          Applications/System
License:        GPLv2+
URL:            http://packages.debian.org/source/sid/snacc
Source0:        http://ftp.de.debian.org/debian/pool/main/s/snacc/%{name}_%{version}bbn.orig.tar.gz
Patch0:         snacc-bts-442873.patch
Patch1:         snacc-configure.patch
Patch2:         snacc-examples.patch
Patch3:         snacc-gcc.patch
Patch4:         snacc-ttab-tex-UTF8-fix.patch

BUILDROOT:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake17 libtool flex bison

%description
Snacc is Sample Neufeld ASN.1 to C compiler that can produce C, C++ routines
or type tables for BER encoding, decoding, printing and freeing.

%package devel
Summary:        Header files for snacc development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release} 

%description devel
The %{name}-devel package contains the header files
for snacc development.

%prep
%setup -qn %{name}-%{version}bbn.orig
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%{__mkdir} -p c-lib/Cebuf c-lib/ebuf c-lib/mbuf c-lib/sbuf c-lib/tbl c++-lib/c++

# ---- Build ----
# configure without tcl for libtool to use -DMETA=0

%build
AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 autoreconf -fi
%configure
%{__make}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.a`
%{__rm} -f `find %{buildroot} -name *.la`

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING doc/snacc-a5.ps
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/asn1
%{_bindir}/%{name}
%{_bindir}/berdecode
%{_bindir}/mkchdr
%{_bindir}/ptbl
%{_bindir}/pval
%{_mandir}/man1/mkchdr.1.gz
%{_mandir}/man1/ptbl.1.gz
%{_mandir}/man1/pval.1.gz
%{_mandir}/man1/snacc.1.gz
%{_mandir}/man1/snacced.1.gz
%{_mandir}/mann/snacc.n.gz
%{_libdir}/libasn1c++.so.0.0.0
%{_libdir}/libasn1cCebuf.so.0.0.0
%{_libdir}/libasn1cebuf.so.0.0.0
%{_libdir}/libasn1cmbuf.so.0.0.0
%{_libdir}/libasn1csbuf.so.0.0.0
%{_libdir}/libasn1ctbl.so.0.0.0
%{_libdir}/libasn1c++.so.0
%{_libdir}/libasn1cCebuf.so.0
%{_libdir}/libasn1cebuf.so.0
%{_libdir}/libasn1cmbuf.so.0
%{_libdir}/libasn1csbuf.so.0
%{_libdir}/libasn1ctbl.so.0

%files devel
%defattr(-,root,root,-)
%doc c-examples/ c++-examples/
%{_bindir}/snacc-config
%{_datadir}/aclocal/snacc.m4
%{_includedir}/%{name}/c
%{_includedir}/%{name}/c++
%{_libdir}/libasn1c++.so
%{_libdir}/libasn1cCebuf.so
%{_libdir}/libasn1cebuf.so
%{_libdir}/libasn1cmbuf.so
%{_libdir}/libasn1csbuf.so
%{_libdir}/libasn1ctbl.so

%changelog
* Sat Sep 26 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-4
- Removed --without-tcl as it doesn not affect configure.
- snacc-configure.patch will not build c++-lib/tcl/Makefile as tcl is not
  required. 

* Thu Sep 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-3
- Removed -libs package, and moved them to -base package.
- s/sample/Sample in package description.
- Directory ownership in base package for includedir/name.
- snacc.m4 moved to -devel package.
- Patch names start with snacc-.
- Removed .tex and .bib files as .ps is already shipped.

* Wed Sep 23 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-2
- Fixed spelling mistake s/dample/sample.
- Added {c, c++}-examples to devel package.
- Moved *.asn1 files to base package.
- Created separate libs package.
- Call ldconfig for post, postun for libs package.

* Mon Sep 21 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-1
- First snacc package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:57:08 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:47:02 -0000	1.2
@@ -0,0 +1 @@
+snacc_1.3bbn.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:57:09 -0000	1.1
+++ sources	30 Sep 2009 03:47:02 -0000	1.2
@@ -0,0 +1 @@
+24c969e2673f1713d5d995d2f9e64781  snacc_1.3bbn.orig.tar.gz



From shakthimaan at fedoraproject.org  Wed Sep 30 03:50:47 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 03:50:47 +0000 (UTC)
Subject: rpms/snacc/F-10 import.log, NONE, 1.1 snacc-bts-442873.patch, NONE, 
	1.1 snacc-configure.patch, NONE, 1.1 snacc-examples.patch, NONE,
	1.1 snacc-gcc.patch, NONE, 1.1 snacc-ttab-tex-UTF8-fix.patch,
	NONE, 1.1 snacc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930035047.6989311C048B@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/snacc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1290/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snacc-bts-442873.patch snacc-configure.patch 
	snacc-examples.patch snacc-gcc.patch 
	snacc-ttab-tex-UTF8-fix.patch snacc.spec 
Log Message:
First snacc package.



--- NEW FILE import.log ---
snacc-1_3-4_fc11:F-10:snacc-1.3-4.fc11.src.rpm:1254282998

snacc-bts-442873.patch:
 snacc-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-bts-442873.patch ---
diff -uraN snacc-1.3bbn.orig/snacc-config.in snacc-1.3bbn/snacc-config.in
--- snacc-1.3bbn.orig/snacc-config.in	2001-01-27 02:02:40.000000000 +0100
+++ snacc-1.3bbn/snacc-config.in	2008-04-16 01:19:43.153755670 +0200
@@ -95,7 +95,7 @@
     if test $exec_prefix != /usr; then echo -n "-L${exec_prefix}/lib "; fi
     case "$language" in
     C)   echo -n "-lasn1c${buffertype} " ;;
-    C++) echo -n "-Iasn1c++ " ;;
+    C++) echo -n "-lasn1c++ " ;;
     *) ;;
     esac
   else

snacc-configure.patch:
 configure.ac |  313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  305 ---------------------------------------------------------
 2 files changed, 313 insertions(+), 305 deletions(-)

--- NEW FILE snacc-configure.patch ---
diff -uraN snacc-1.3bbn/configure.ac snacc-1.3bbn-debian/configure.ac
--- snacc-1.3bbn/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3bbn-debian/configure.ac	2005-07-30 17:20:35.043753552 +0000
@@ -0,0 +1,313 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl ---
+dnl	$Log: configure.ac,v $
+dnl	Revision 1.3  2002/11/19 20:28:12  debacle
+dnl	libtool changes.
+dnl	
+dnl	Revision 1.2  2002/11/19 19:37:38  debacle
+dnl	Auto-tools stuff.
+dnl	
+dnl	Revision 1.1  2002/11/19 19:18:04  debacle
+dnl	New autoconf.
+dnl	
+dnl	Revision 1.13  1997/09/04 13:54:04  wan
+dnl	A little more portability
+dnl
+dnl	Revision 1.12  1997/02/28 13:39:35  wan
+dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
+dnl
+dnl	Revision 1.11  1997/02/16 16:50:27  rj
+dnl	made return *this after calling abort()'' a compile time option.
+dnl
+dnl	Revision 1.10  1997/02/15 20:06:27  rj
+dnl	adjust to changed AC_TRY_COMPILE macro
+dnl
+dnl	Revision 1.9  1997/02/15 20:01:38  rj
+dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
+dnl
+dnl	Revision 1.8  1997/01/01 19:57:01  rj
+dnl	changes for autoconf version 2.12
+dnl
+dnl	Revision 1.7  1995/09/07  18:36:47  rj
+dnl	psbook and psnup are looked for (used by .../doc/makefile)
+dnl
+dnl	Revision 1.6  1995/07/24  14:44:47  rj
+dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
+dnl
+dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
+dnl
+dnl	look for patch(1). the c-lib uses it to patch tbl.h.
+dnl
+dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
+dnl
+dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
+dnl
+dnl	Revision 1.5  1995/02/20  11:18:41  rj
+dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
+dnl	check for isinf(3) and finite(3) added.
+dnl
+dnl	Revision 1.4  1995/02/17  15:15:44  rj
+dnl	hack to let makedepend find .h files the way gcc does.
+dnl
+dnl	Revision 1.3  1995/02/17  14:26:40  rj
+dnl	adjustments for autoconf 2.x
+dnl
+dnl	Revision 1.2  1994/10/08  04:29:37  rj
+dnl	search for Tcl/Tk
+dnl
+dnl	Revision 1.1  1994/09/01  00:51:22  rj
+dnl	first check-in (new file).
+dnl
+AC_INIT( compiler/core/snacc.c)
+AC_REVISION($Revision: 1.3 $)
+AM_INIT_AUTOMAKE(snacc, 1.3)
+AM_CONFIG_HEADER( config.h)
+dnl --- alternative programs:
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_ISC_POSIX
+dnl if CDPATH is set, the configure script might fail
+unset CDPATH
+dnl if test -n "$GCC"; then
+dnl   saveCC="$CC"
+dnl   CC="$CC -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
+dnl fi
+AC_PROG_GCC_TRADITIONAL
+AC_MSG_CHECKING( whether ANSI or K&R style C)
+AC_TRY_COMPILE([ ], [void *p; p = "test";], [
+AC_MSG_RESULT(ANSI)
+AC_DEFINE( __USE_ANSI_C__)
+], [
+AC_MSG_RESULT(K&R)
+])
+AC_PROG_CXX
+AC_LANG_CPLUSPLUS
+dnl if test -n "$GCC"; then
+dnl   saveCXX="$CXX"
+dnl   CXX="$CXX -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
+dnl fi
+AC_MSG_CHECKING( for bool built-in)
+AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for variable sized automatic arrays)
+AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for volatile functions)
+AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
+AC_LANG_C
+AM_PROG_LEX
+case "$LEX" in
+  lex)
+    LFLAGS="-Nc10000"
+  ;;
+  flex)
+    CFLAGS="$CFLAGS -DFLEX_IN_USE"
+esac
+AC_SUBST( LFLAGS)
+AC_SUBST( CFLAGS)
+# the boot strapping code in .../c-lib/ needs patch:
+AC_CHECK_PROGS( PATCH, patch, false)
+AC_PROG_YACC
+AC_PROG_LN_S
+AC_PROG_INSTALL
+dnl --- header files:
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_HEADER_STDC
+AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
+AC_FUNC_VPRINTF
+dnl --- system and compiler characteristics:
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_LIB( m, sin)
+AC_CHECK_FUNCS( isinf finite)
+AC_CHECK_FUNCS( memset memcpy memcmp)
+dnl ---
+AC_PATH_X
+AC_PATH_XTRA
+AC_CHECK_PROGS( TCLSH, tclsh, false)
+if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
+  AC_CHECK_HEADER(
+    tcl.h,
+    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
+    AC_CHECK_LIB(
+      tcl,
+      Tcl_CreateInterp,
+      [saveCFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS $X_CFLAGS"
+      AC_CHECK_LIB(
+	tk,
+	Tk_CreateWindow,
+	[AC_DEFINE( HAVE_TCL)
+	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
+	CXXTCLDIR="tcl"
+	TCLDIRS="tcl-lib tcl-asn tcl-example"
+	AC_LANG_CPLUSPLUS
+	AC_CHECK_LIB(
+	  TkTree,
+	  Tree_Init,
+	  [TREELIBS="-lTkTree"],
+	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
+	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+	AC_LANG_C],
+	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
+	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+      CFLAGS="$saveCFLAGS"],
+      [AC_MSG_RESULT( [tcl library not found])],
+      $TCLOTHERLIBS -lm)])
+fi
+AC_SUBST( CXXTCLDIR)
+AC_SUBST( TCLDIRS)
+AC_SUBST( TCLLIBS)
+AC_SUBST( TREELIBS)
+dnl ---
+AC_CHECK_PROGS( LATEX, latex, false)
+AC_CHECK_PROGS( BIBTEX, bibtex, false)
+AC_CHECK_PROGS( DVIPS, dvips, false)
+AC_CHECK_PROGS( DETEX, detex2 detex, false)
+AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
+AC_CHECK_PROGS( PSBOOK, psbook, false)
+AC_CHECK_PROGS( PSNUP, psnup, false)
+AC_CHECK_PROGS( SPELL, ispell spell, spell)
+dnl ---
+
+dnl Configure for libtool.
+AC_PROG_LIBTOOL
+
+dnl Generate the C library build directories.
+linked_files=`cd c-lib/src && ls *.c`
+for dir in Cebuf ebuf mbuf sbuf tbl; do
+  if test -d c-lib/$dir; then :; else
+    echo creating c-lib/$dir
+    mkdir c-lib/$dir
+  fi
+  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
+  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
+  case $dir in
+  Cebuf) 
+    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
+    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
+    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
+    ;;
+  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
+  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
+  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
+  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
+  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
+done
+
+dnl Generate the C++ and Tcl library build directories.
+linked_files=`cd c++-lib/src && ls *.c *.C`
+for dir in c++ tcl; do
+  if test -d c++-lib/$dir; then :; else
+    echo creating c++-lib/$dir
+    mkdir c++-lib/$dir
+  fi
+  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
+  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
+  case $dir in
+  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
+  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
+  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
+done  
+
+dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
+dnl from glib-1.2.1's configure.in.  See that file for an explanation.
+AC_OUTPUT_COMMANDS([
+          
+## Generate `snaccconfig.h' in two 
+## cases:
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+case "x$CONFIG_OTHER" in
+*snaccconfig.h) gen_snaccconfig_h=yes
+;;
+esac
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  if test "x${CONFIG_OTHER}" = x; then
+    gen_snaccconfig_h=yes
+  fi
+fi
+
+## If we're generating snaccconfig.h:
+## FIXME - currently, snaccconfig.h is just the normal
+## config.h wrapped.  this is because the user include
+## files use the normal config.h symbol names, and I 
+## haven't changed those yet.
+if test "x$gen_snaccconfig_h" = xyes; then
+  outfile=snaccconfig.h
+  echo creating $outfile
+  cat <<SNACCEOF > ${outfile}-tmp
+/* snaccconfig.h
+ * 
+ * This is an automatically generated file - please modify 'configure.in'.
+ */
+
+#ifndef _SNACCCONFIG_H
+#define _SNACCCONFIG_H
+
+SNACCEOF
+  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
+  cat <<SNACCEOF >> ${outfile}-tmp
+
+#endif /* !_SNACCCONFIG_H */
+SNACCEOF
+  if cmp -s ${outfile}-tmp $outfile; then
+    echo $outfile is unchanged
+    rm -f ${outfile}-tmp
+  else
+    mv ${outfile}-tmp ${outfile}
+  fi
+fi
+])
+
+dnl Writes files.
+AC_OUTPUT(Makefile
+          compiler/Makefile
+          compiler/back-ends/c++-gen/Makefile
+          compiler/back-ends/c-gen/Makefile
+          compiler/back-ends/idl-gen/Makefile
+          compiler/back-ends/Makefile
+          compiler/core/Makefile
+	  c-lib/Makefile
+	  c-lib/inc/Makefile
+	  c-lib/src/Makefile
+	  c-lib/Cebuf/Makefile
+	  c-lib/ebuf/Makefile
+	  c-lib/mbuf/Makefile
+	  c-lib/sbuf/Makefile
+	  c-lib/tbl/Makefile
+	  c++-lib/Makefile
+	  c++-lib/inc/Makefile
+	  c++-lib/src/Makefile
+	  c++-lib/c++/Makefile
+          asn1specs/Makefile
+          tbl-tools/berdecode/Makefile
+          tbl-tools/mkchdr/Makefile
+          tbl-tools/ptbl/Makefile
+          tbl-tools/pval/Makefile
+          tbl-tools/Makefile
+          doc/Makefile
+          snacc-config,
+[if test -f snacc-config; then chmod +x snacc-config; fi])
+dnl --- finis
diff -uraN snacc-1.3bbn/configure.in snacc-1.3bbn-debian/configure.in
--- snacc-1.3bbn/configure.in	2005-07-30 20:06:02.703761472 +0000
+++ snacc-1.3bbn-debian/configure.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl ---
-dnl	$Log: configure.in,v $
-dnl	Revision 1.13  1997/09/04 13:54:04  wan
-dnl	A little more portability
-dnl
-dnl	Revision 1.12  1997/02/28 13:39:35  wan
-dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
-dnl
-dnl	Revision 1.11  1997/02/16 16:50:27  rj
-dnl	made return *this after calling abort()'' a compile time option.
-dnl
-dnl	Revision 1.10  1997/02/15 20:06:27  rj
-dnl	adjust to changed AC_TRY_COMPILE macro
-dnl
-dnl	Revision 1.9  1997/02/15 20:01:38  rj
-dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
-dnl
-dnl	Revision 1.8  1997/01/01 19:57:01  rj
-dnl	changes for autoconf version 2.12
-dnl
-dnl	Revision 1.7  1995/09/07  18:36:47  rj
-dnl	psbook and psnup are looked for (used by .../doc/makefile)
-dnl
-dnl	Revision 1.6  1995/07/24  14:44:47  rj
-dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
-dnl
-dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
-dnl
-dnl	look for patch(1). the c-lib uses it to patch tbl.h.
-dnl
-dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
-dnl
-dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
-dnl
-dnl	Revision 1.5  1995/02/20  11:18:41  rj
-dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
-dnl	check for isinf(3) and finite(3) added.
-dnl
-dnl	Revision 1.4  1995/02/17  15:15:44  rj
-dnl	hack to let makedepend find .h files the way gcc does.
-dnl
-dnl	Revision 1.3  1995/02/17  14:26:40  rj
-dnl	adjustments for autoconf 2.x
-dnl
-dnl	Revision 1.2  1994/10/08  04:29:37  rj
-dnl	search for Tcl/Tk
-dnl
-dnl	Revision 1.1  1994/09/01  00:51:22  rj
-dnl	first check-in (new file).
-dnl
-AC_INIT( compiler/core/snacc.c)
-AC_REVISION($Revision: 1.13 $)
-AM_INIT_AUTOMAKE(snacc, 1.3)
-AM_CONFIG_HEADER( config.h)
-dnl --- alternative programs:
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_ISC_POSIX
-if test -n "$GCC"; then
-dnl   saveCC="$CC"
-dnl   CC="$CC -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
-fi
-AC_PROG_GCC_TRADITIONAL
-AC_MSG_CHECKING( whether ANSI or K&R style C)
-AC_TRY_COMPILE([ ], [void *p; p = "test";], [
-AC_MSG_RESULT(ANSI)
-AC_DEFINE( __USE_ANSI_C__)
-], [
-AC_MSG_RESULT(K&R)
-])
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-dnl if test -n "$GCC"; then
-dnl   saveCXX="$CXX"
-dnl   CXX="$CXX -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
-dnl fi
-AC_MSG_CHECKING( for bool built-in)
-AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for variable sized automatic arrays)
-AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for volatile functions)
-AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
-AC_LANG_C
-AM_PROG_LEX
-case "$LEX" in
-  lex)
-    LFLAGS="-Nc10000"
-  ;;
-  flex)
-    CFLAGS="$CFLAGS -DFLEX_IN_USE"
-esac
-AC_SUBST( LFLAGS)
-AC_SUBST( CFLAGS)
-# the boot strapping code in .../c-lib/ needs patch:
-AC_CHECK_PROGS( PATCH, patch, false)
-AC_PROG_YACC
-AC_PROG_LN_S
-AC_PROG_INSTALL
-dnl --- header files:
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_HEADER_STDC
-AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
-AC_FUNC_VPRINTF
-dnl --- system and compiler characteristics:
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_LIB( m, sin)
-AC_CHECK_FUNCS( isinf finite)
-AC_CHECK_FUNCS( memset memcpy memcmp)
-dnl ---
-AC_PATH_X
-AC_PATH_XTRA
-AC_CHECK_PROGS( TCLSH, tclsh, false)
-if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
-  AC_CHECK_HEADER(
-    tcl.h,
-    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
-    AC_CHECK_LIB(
-      tcl,
-      Tcl_CreateInterp,
-      [saveCFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $X_CFLAGS"
-      AC_CHECK_LIB(
-	tk,
-	Tk_CreateWindow,
-	[AC_DEFINE( HAVE_TCL)
-	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
-	CXXTCLDIR="tcl"
-	TCLDIRS="tcl-lib tcl-asn tcl-example"
-	AC_LANG_CPLUSPLUS
-	AC_CHECK_LIB(
-	  TkTree,
-	  Tree_Init,
-	  [TREELIBS="-lTkTree"],
-	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
-	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-	AC_LANG_C],
-	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
-	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-      CFLAGS="$saveCFLAGS"],
-      [AC_MSG_RESULT( [tcl library not found])],
-      $TCLOTHERLIBS -lm)])
-fi
-AC_SUBST( CXXTCLDIR)
-AC_SUBST( TCLDIRS)
-AC_SUBST( TCLLIBS)
-AC_SUBST( TREELIBS)
-dnl ---
-AC_CHECK_PROGS( LATEX, latex, false)
-AC_CHECK_PROGS( BIBTEX, bibtex, false)
-AC_CHECK_PROGS( DVIPS, dvips, false)
-AC_CHECK_PROGS( DETEX, detex2 detex, false)
-AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
-AC_CHECK_PROGS( PSBOOK, psbook, false)
-AC_CHECK_PROGS( PSNUP, psnup, false)
-AC_CHECK_PROGS( SPELL, ispell spell, spell)
-dnl ---
-
-dnl Configure for libtool.
-AM_PROG_LIBTOOL
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
-AC_SUBST(LTLIBOBJS)
-
-dnl Generate the C library build directories.
-linked_files=`cd c-lib/src && ls *.c`
-for dir in Cebuf ebuf mbuf sbuf tbl; do
-  if test -d c-lib/$dir; then :; else
-    echo creating c-lib/$dir
-    mkdir c-lib/$dir
-  fi
-  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
-  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
-  case $dir in
-  Cebuf) 
-    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
-    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
-    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
-    ;;
-  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
-  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
-  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
-  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
-  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
-done
-
-dnl Generate the C++ and Tcl library build directories.
-linked_files=`cd c++-lib/src && ls *.c *.C`
-for dir in c++ tcl; do
-  if test -d c++-lib/$dir; then :; else
-    echo creating c++-lib/$dir
-    mkdir c++-lib/$dir
-  fi
-  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
-  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
-  case $dir in
-  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
-  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
-  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
-done  
-
-dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
-dnl from glib-1.2.1's configure.in.  See that file for an explanation.
-AC_OUTPUT_COMMANDS([
-          
-## Generate `snaccconfig.h' in two 
-## cases:
-## 1. `config.status' is run either explicitly, or via configure.
-##     Esp. not when it is run in `Makefile' to generate makefiles and
-##     config.h
-## 2. CONFIG_OTHER is set explicitly
-##
-## Case 1 is difficult.  We know that `automake' sets one of
-## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
-## only when AM_CONFIG_HEADER is set, however.
-
-case "x$CONFIG_OTHER" in
-*snaccconfig.h) gen_snaccconfig_h=yes
-;;
-esac
-if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
-  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
-  if test "x${CONFIG_OTHER}" = x; then
-    gen_snaccconfig_h=yes
-  fi
-fi
-
-## If we're generating snaccconfig.h:
-## FIXME - currently, snaccconfig.h is just the normal
-## config.h wrapped.  this is because the user include
-## files use the normal config.h symbol names, and I 
-## haven't changed those yet.
-if test "x$gen_snaccconfig_h" = xyes; then
-  outfile=snaccconfig.h
-  echo creating $outfile
-  cat <<SNACCEOF > ${outfile}-tmp
-/* snaccconfig.h
- * 
- * This is an automatically generated file - please modify 'configure.in'.
- */
-
-#ifndef _SNACCCONFIG_H
-#define _SNACCCONFIG_H
-
-SNACCEOF
-  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
-  cat <<SNACCEOF >> ${outfile}-tmp
-
-#endif /* !_SNACCCONFIG_H */
-SNACCEOF
-  if cmp -s ${outfile}-tmp $outfile; then
-    echo $outfile is unchanged
-    rm -f ${outfile}-tmp
-  else
-    mv ${outfile}-tmp ${outfile}
-  fi
-fi
-])
-
-dnl Writes files.
-AC_OUTPUT(Makefile
-          compiler/Makefile
-          compiler/back-ends/c++-gen/Makefile
-          compiler/back-ends/c-gen/Makefile
-          compiler/back-ends/idl-gen/Makefile
-          compiler/back-ends/Makefile
-          compiler/core/Makefile
-	  c-lib/Makefile
-	  c-lib/inc/Makefile
-	  c-lib/src/Makefile
-	  c-lib/Cebuf/Makefile
-	  c-lib/ebuf/Makefile
-	  c-lib/mbuf/Makefile
-	  c-lib/sbuf/Makefile
-	  c-lib/tbl/Makefile
-	  c++-lib/Makefile
-	  c++-lib/inc/Makefile
-	  c++-lib/src/Makefile
-	  c++-lib/c++/Makefile
-	  c++-lib/tcl/Makefile
-          asn1specs/Makefile
-          tbl-tools/berdecode/Makefile
-          tbl-tools/mkchdr/Makefile
-          tbl-tools/ptbl/Makefile
-          tbl-tools/pval/Makefile
-          tbl-tools/Makefile
-          doc/Makefile
-          snacc-config,
-[if test -f snacc-config; then chmod +x snacc-config; fi])
-dnl --- finis

snacc-examples.patch:
 c++-examples/any/README            |   90 +++
 c++-examples/any/example.C         |  115 ++++
 c++-examples/any/genber.C          |  150 +++++
 c++-examples/any/makefile          |  154 ++++++
 c++-examples/makefile              |   34 +
 c++-examples/simple/README         |  105 ++++
 c++-examples/simple/example.C      |  115 ++++
 c++-examples/simple/genber.C       |   99 +++
 c++-examples/simple/good-pr.ber.uu |    7 
 c++-examples/simple/makefile       |  146 +++++
 c++-examples/snmp/README           |  126 ++++
 c++-examples/snmp/makefile         |  103 ++++
 c++-examples/test-lib/README       |   37 +
 c++-examples/test-lib/makefile     |   59 ++
 c++-examples/test-lib/test-lib.C   |  781 ++++++++++++++++++++++++++++++
 c-examples/any/README              |  107 ++++
 c-examples/any/example.c           |  161 ++++++
 c-examples/any/genber.c            |  164 ++++++
 c-examples/any/makefile            |  144 +++++
 c-examples/makefile                |   42 +
 c-examples/simple/README           |  128 +++++
 c-examples/simple/expbuf-ex.c      |  166 ++++++
 c-examples/simple/genber.c         |  154 ++++++
 c-examples/simple/good-pr.ber.uu   |    7 
 c-examples/simple/makefile         |  198 +++++++
 c-examples/simple/minbuf-ex.c      |  162 ++++++
 c-examples/simple/sbuf-ex.c        |  154 ++++++
 c-examples/snmp/README             |  118 ++++
 c-examples/snmp/makefile           |   91 +++
 c-examples/test-lib/README         |   37 +
 c-examples/test-lib/makefile       |   50 +
 c-examples/test-lib/test-lib.c     |  935 +++++++++++++++++++++++++++++++++++++
 tbl-example/README                 |   83 +++
 tbl-example/example.c              |  174 ++++++
 tbl-example/makefile               |   82 +++
 tbl-example/p-rec.ber.uu           |    7 
 36 files changed, 5285 insertions(+)

--- NEW FILE snacc-examples.patch ---
diff -uraN snacc-1.3bbn/c++-examples/any/README snacc-1.3b4/c++-examples/any/README
--- snacc-1.3bbn/c++-examples/any/README	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/README	1997-02-16 20:25:26.000000000 +0000
@@ -0,0 +1,90 @@
+(RCS control information is at the end of this file.)
+
+
+C++ ANY example README
+---------------------
+
+This example shows how the snacc compiler handles the ANY DEFINED BY
+type in C++.  ANY types (not ANY DEFINED BY) require modifications
+to the generated code.  Type "make" to build this example.
+
+This directory should have the following 4 files in it:
+
+        README
+        example.C
+        genber.C
+        makefile
+
+There are 3 programs generated by the makefile:
+
+        genber - builds a BER value of the AnyTestType and writes it
+                 to a file called "att.ber"
+
+        def    - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses definite
+                 lengths for constructed values.
+
+        indef  - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses indefinite
+                 lengths for constructed values.
+
+
+These files use the code generated by snacc from the
+snacc/asn1specs/any.asn1 file. (see the makefile)
+
+Look at genber.C to see how values can be built and printed.
+
+Look at the generated code in any_test.C and any_test.h to see how the
+any hash table is built.
+
+
+try the following commands in your c-shell:
+
+%1 genber                   # generate the att.ber file
+%2 indef att.ber > tmp.ber  # decode att.ber an re-encode into tmp.ber
+%3 def tmp.ber > tmp2.ber   # decode tmp.ber an re-encode into tmp2.ber
+%4 diff att.ber tmp2.ber    # compare .ber files (should be the same)
+
+When you are finished with the example type "make clean"  to remove
+the binaries and generated code.
+
+
+
+Things To Note
+--------------
+
+Snacc ASN.1 comment commands
+
+In the snacc/asn1specs/any.asn1 file, the AnyTestType has a special
+"--snacc" ASN.1 comment after ::= to give snacc some extra information
+about the AnyTestType.
+
+AnyTestType ::= --snacc isPdu:"TRUE" -- SEQUENCE { ... etc. ... }
+
+The "isPdu" flag only affects the generated C code, not C++.  Each
+C++ type gets PDU methods by default.
+
+
+SNMP OBJECT-TYPE Macro
+
+The SNMP OBJECT-TYPE macro is used to define the id value to type
+mapping for ANY DEFINED BY types.  The macro has been modified to
+accept both INTEGERs and OBJECT IDENTIFIERs as id values (see
+snacc/asn1specs/any.asn1).  This macro can be used with other
+protocols to define the id to type mapping.
+
+Two hash tables are used to hold the id to type mappings. One for
+INTEGER to type mappings and the other for OBJECT IDENTIFIER to type
+mappings.  The hash tables are automatically initialized in each
+module that has OBJECT-TYPE macros.  In C the hash table must be
+explicitly initialized.
+
+#-------------------------------------------------------------------------------
+# $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/README,v 1.2 1997/02/16 20:25:26 rj Exp $
+# $Log: README,v $
+# Revision 1.2  1997/02/16 20:25:26  rj
+# check-in of a few cosmetic changes
+#
+# Revision 1.1  1994/08/31  08:47:59  rj
+# first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+#
diff -uraN snacc-1.3bbn/c++-examples/any/example.C snacc-1.3b4/c++-examples/any/example.C
--- snacc-1.3bbn/c++-examples/any/example.C	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/example.C	1995-07-24 15:33:33.000000000 +0000
@@ -0,0 +1,115 @@
+// c++_examples/any/example.C - an example of how to use C++ ASN.1-BER
+//              for ANY Types
+//
+// AUTHOR: Mike Sample
+// DATE:   92
+//
+// $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/example.C,v 1.5 1995/07/24 15:33:33 rj Exp $
+// $Log: example.C,v $
+// Revision 1.5  1995/07/24 15:33:33  rj
+// changed `_' to `-' in file names.
+//
+// any-test.[hC] becomes any.[hC] due to to snacc's new file name generation scheme.
+//
+// check return value of new.
+//
+// Revision 1.4  1995/02/18  13:53:07  rj
+// added #define HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS since not every C++ compiler provides them.
+//
+// Revision 1.3  1994/10/08  01:26:21  rj
+// several \size_t'
+//
+// Revision 1.2  1994/08/31  08:56:29  rj
+// first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+//
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fstream.h>
+
+#include "asn-incl.h"
+#include "any.h"
+
+main (int argc, char *argv[])
+{
+    if (argc != 2)
+    {
+        cerr << "Usage: " << argv[0] << " <BER data file name>" << endl;
+        cerr << "   Decodes the given AnyTestType BER data file" << endl;
+        cerr << "   and re-encodes it to stdout" << endl;
+        exit (1);
+    }
+
+    ifstream dataFile;
+    // open the data file
+    dataFile.open (argv[1]);
+
+    if (!dataFile)
+    {
+        perror ("ifstream::open");
+        exit (1);
+    }
+
+    // get size of the data file file
+    dataFile.seekg (0, ios::end);
+    int dataSize = dataFile.tellg();
+    dataFile.seekg (0);
+
+    // read data from file into contiguous block for a buffer
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char data[dataSize];
+#else
+    char *data = new char[dataSize];
+    if (!data)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    dataFile.read (data, dataSize);
+    dataFile.close();
+
+    //
+    // put the BER data read from the file
+    // into buffer format, ready for reading from the
+    // beginning
+    //
+    AsnBuf inputBuf;
+    inputBuf.InstallData ((char*)data, dataSize);
+
+    size_t decodedLen;
+    AnyTestType att;
+
+    if (!att.BDecPdu (inputBuf, decodedLen))
+    {
+        cerr << "ERROR - Decode routines failed, exiting..." << endl;
+        exit (1);
+    }
+
+    cerr  << "decodedValue AnyTestType ::= " << att << endl << endl;
+
+    //
+    // allocate a new buffer and set up for writing to
+    //
+    AsnBuf  outputBuf;
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char outputData[dataSize + 512];
+#else
+    char *outputData = new char[dataSize + 512];
+    if (!outputData)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    outputBuf.Init (outputData, dataSize+512);
+    outputBuf.ResetInWriteRvsMode();
[...5030 lines suppressed...]
+
+    if (argc != 3)
+    {
+        Usage (argv[0]);
+        return 1;
+    }
+
+    tblFileName = argv[1];
+    berFileName = argv[2];
+
+    /* init mem pool to hold  decoded val */
+    InitNibbleMem (1024, 1024);
+
+    /* read in and decode the type table */
+    tbl = LoadTblFile (tblFileName);
+    if (tbl == NULL)
+        return 1;
+
+    fileData = LoadFile (berFileName, &fsize);
+    if (fileData == NULL)
+        return 1;
+
+    SBufInstallData (&sb, fileData, fsize);
+    PutSBufInGenBuf (&sb, &gb);
+
+    fprintf (stdout, "\n\n-- decoded contents of BER PersonnelRecord file: \"%s\"--\n", berFileName);
+
+    val = TblDecode (tbl, NULL, "PersonnelRecord", &gb, &bytesDecoded);
+
+    if (val == NULL)
+        fprintf (stdout, "-- Decoding error occured somewhere -- \n");
+    else
+        TblPrintValue (tbl, NULL, "PersonnelRecord", stdout, val);
+
+    fprintf (stdout, "\n\n -- decoded %d bytes for the above value --\n\n", bytesDecoded, berFileName);
+
+    free (fileData); /* was malloc'd in LoadFile */
+
+    /*
+     * process value here
+     * (This is where the header file generated by mkchdr is
+     * useful - you can access the decoded value in a standard
+     * /easier way).
+     *
+     * Ok, well, the names "field0" etc aren't that nice
+     * but what did you expect - they aren't named in the ASN.1
+     * spec so mkchdr just makes them up.  To fix this, just
+     * add field names to you ASN.1 spec - it will not change the
+     * way the values are encoded - so you're not making it
+     * incompatible with the original. (not including value notation)
+     */
+    printf ("The following printout is an example of using the\n");
+    printf ("hdr file generated by mkchdr to access the data\n");
+    printf ("returned from the table decoder.  Look in \"example.c\"\n\n");
+
+
+    printf ("***** JQ GUMBY & CO Database *****************************************\n");
+    printf ("Employee Name:      %s %s %s\n", val->field0->givenName->octs, val->field0->initial->octs, val->field0->familyName->octs);
+    printf ("Title:              %s\n", val->title->octs);
+    printf ("Employee Number:    %d\n", *val->field1);
+    printf ("Date of Hire:       %s\n", val->dateOfHire->octs);
+    printf ("Name of Spouse:     %s %s %s\n", val->nameOfSpouse->givenName->octs, val->nameOfSpouse->initial->octs, val->nameOfSpouse->familyName->octs);
+    printf ("Number of Children: %d\n", AsnListCount (val->children));
+    printf ("**********************************************************************\n\n");
+
+    /*
+     * finished playing with the decoded value.
+     * now re-encode the value.  Using an expbuf to hold the encoded val
+     * because they can grow and in general you can predict a values
+     * encoded size (although we could assume that is would be close to
+     * the same size as the one we read in at the beginning of this prg).
+     * (note: the size of PersonnelRecord BER value we decoded may be
+     * different from the size of the re-encoded version depending on
+     * the use of indefinite or definite lengths.  Both are valid BER.)
+     */
+    fprintf (stdout, "now re-encoding the PersonnelRecord value to \"%s\"\n", outputFileNameG);
+
+    ebPtr = ExpBufAllocBufAndData();
+    ExpBufResetInWriteRvsMode (ebPtr); /* set up to hold encoding (= writing) */
+
+    PutExpBufInGenBuf (ebPtr, &gb);
+
+    if (TblEncode (tbl, NULL, "PersonnelRecord", &gb, val, &bytesEncoded) < 0)
+        fprintf (stderr, "main: error encoding the PersonnelRecord\n");
+
+    /* copy ExpBuf data to file */
+    outputFile = fopen (outputFileNameG, "w");
+    if (outputFile == NULL)
+    {
+        fprintf (stderr, "error - could not open file \"%s\"\n", outputFileNameG);
+        perror ("main: fopen:");
+    }
+
+    ExpBufCopyToFile (ebPtr, outputFile);
+
+    fclose (outputFile);
+
+    /* free the encoded version */
+    ExpBufFreeBufAndDataList (ebPtr);
+
+
+    return 0;
+} /* main */
diff -uraN snacc-1.3bbn/tbl-example/makefile snacc-1.3b4/tbl-example/makefile
--- snacc-1.3bbn/tbl-example/makefile	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/makefile	1997-02-15 19:33:26.000000000 +0000
@@ -0,0 +1,82 @@
+# file: .../tbl-example/makefile
+#
+# $Header: /usr/app/odstb/CVS/snacc/tbl-example/makefile,v 1.1 1997/02/15 19:33:26 rj Exp $
+# $Log: makefile,v $
+# Revision 1.1  1997/02/15 19:33:26  rj
+# first check-in
+#
+
+include ../makehead
+
+TOP		= ..
+
+ASN1_SRC_DIR	= $(TOP)/asn1specs
+
+ASN1_C_LIB_DIR	= $(TOP)/c-lib
+ASN1_C_INC_DIR	= $(ASN1_C_LIB_DIR)/inc
+TTBL_ASN1_LIB	= $(ASN1_C_LIB_DIR)/libasn1ctbl.a
+
+COMPILERDIR	= $(TOP)/compiler
+SNACC		= $(COMPILERDIR)/snacc
+USEFUL_TYPES	= $(ASN1_SRC_DIR)/asn-useful.asn1
+SNACCFLAGS	= -u $(USEFUL_TYPES)
+
+TBLTOOLSDIR	= $(TOP)/tbl-tools
+MKHDR		= $(TBLTOOLSDIR)/mkchdr/mkchdr
+
+ASN1FILES	= $(ASN1_SRC_DIR)/p-rec.asn1
+ASN1TTFILE	= p-rec.tt
+ASN1TTHFILE	= p-rec.h
+
+CFILES	= example.c
+OFILES	= example.o
+
+DISTFILES = \
+	README		\
+	makefile	\
+	$(CFILES)	\
+	p-rec.ber
+
+CPPFLAGS	+= -I$(TOP) -I$(ASN1_C_INC_DIR) -DUSE_GEN_BUF
+
+#-------------------------------------------------------------------------------
+
+all::		example
+
+example:	$(OFILES) $(TTBL_ASN1_LIB)
+		$(REASON)
+		$(CC) $(CFLAGS) -o example $(OFILES) $(TTBL_ASN1_LIB) $(LIBS)
+
+$(ASN1TTFILE):	$(ASN1FILES)
+		$(REASON)
+		$(SNACC) $(SNACCFLAGS) -T $@ $(ASN1FILES)
+
+$(SNACC) $(MKHDR):
+		cd $(@D) && $(MAKE) $(@F)
+
+$(TTBL_ASN1_LIB):
+		cd $(@D) && $(MAKE) tbl-lib
+
+$(ASN1TTHFILE):	$(ASN1TTFILE)
+		$(REASON)
+		$(MKHDR) $? $@
+
+check::		example $(ASN1TTFILE)
+
+check::
+		./example p-rec.tt p-rec.ber
+		cmp p-rec.ber p-rec.out.ber
+		@echo "+++ the test was successful"
+
+# dummy:
+install::
+
+clean::
+		$(RM) example *.o *~ core .emacs* $(ASN1TTFILE) $(ASN1TTHFILE) p-rec.out.ber
+
+depend::
+		$(MAKE) $(MKHDR)
+
+depend::	$(ASN1TTHFILE)
+
+include ../maketail
diff -uraN snacc-1.3bbn/tbl-example/p-rec.ber.uu snacc-1.3b4/tbl-example/p-rec.ber.uu
--- snacc-1.3bbn/tbl-example/p-rec.ber.uu	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/p-rec.ber.uu	2005-07-30 16:57:00.588101736 +0000
@@ -0,0 +1,7 @@
+begin 644 p-rec.ber
+M8(&.81`6!$IO:&X6`446!5-M:71HH!`6#E1H92!":6<@0VAE97-E7X$``P&&
+MGZ$*0P at Q.3@R,#$P-*(281`6!$UA<GD6`4P6!5-M:71HHT$Q'V$1%@5*86UE
+M<Q8!4A8%4VUI=&B@"D,(,3DU-S`S,3`Q'F$0%@1,:7-A%@%-%@53;6ET:*`*
+*0P at Q.38Q,#8R,0``
+`
+end

snacc-gcc.patch:
 c++-lib/inc/asn-any.h                 |    2 
 c++-lib/inc/asn-bits.h                |    2 
 c++-lib/inc/asn-bool.h                |    2 
 c++-lib/inc/asn-config.h              |    6 +-
 c++-lib/inc/asn-int.h                 |    2 
 c++-lib/inc/asn-list.h                |    2 
 c++-lib/inc/asn-null.h                |    2 
 c++-lib/inc/asn-octs.h                |    2 
 c++-lib/inc/asn-oid.h                 |    2 
 c++-lib/inc/asn-real.h                |    2 
 c++-lib/inc/asn-type.h                |    2 
 c++-lib/inc/print.h                   |    4 -
 c++-lib/src/asn-any.C                 |    2 
 c++-lib/src/asn-bits.C                |    4 +
 c++-lib/src/asn-bool.C                |    4 +
 c++-lib/src/asn-enum.C                |    4 +
 c++-lib/src/asn-int.C                 |    4 +
 c++-lib/src/asn-len.C                 |    1 
 c++-lib/src/asn-list.C                |    6 +-
 c++-lib/src/asn-null.C                |    4 +
 c++-lib/src/asn-octs.C                |    4 +
 c++-lib/src/asn-oid.C                 |    8 +-
 c++-lib/src/asn-real.C                |    6 +-
 c++-lib/src/asn-tag.C                 |    2 
 c++-lib/src/asn-type.C                |    4 +
 c++-lib/src/meta.C                    |    2 
 c++-lib/src/print.C                   |    4 -
 c++-lib/src/tcl-if.C                  |    7 +-
 compiler/back-ends/c++-gen/gen-code.c |  102 +++++++++++++++++-----------------
 compiler/back-ends/c-gen/gen-code.c   |    1 
 compiler/core/parse-asn1.y            |    2 
 31 files changed, 116 insertions(+), 85 deletions(-)

--- NEW FILE snacc-gcc.patch ---
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-any.h snacc-1.3bbn/c++-lib/inc/asn-any.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-any.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-any.h	2005-07-30 19:22:42.514097072 +0000
@@ -81,7 +81,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if 0
 #if TCL
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h snacc-1.3bbn/c++-lib/inc/asn-bits.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bits.h	2005-07-30 19:23:29.321981192 +0000
@@ -105,7 +105,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBitsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h snacc-1.3bbn/c++-lib/inc/asn-bool.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bool.h	2005-07-30 19:23:45.319549192 +0000
@@ -101,7 +101,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBoolTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-config.h snacc-1.3bbn/c++-lib/inc/asn-config.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-config.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-config.h	2005-07-30 19:24:29.054900408 +0000
@@ -49,7 +49,7 @@
 #define _asn_config_h_
 
 #include <ctype.h>  /* for isprint() in <<op on AsnOcts */
-#include <iostream.h>
+#include <iostream>
 #include <memory.h>
 #include <string.h>
 #include <setjmp.h>
@@ -85,14 +85,14 @@
  * Asn1Error (char *str)
  *  - configure error handler
  */
-#define Asn1Error		cerr
+#define Asn1Error		std::cerr
 
 
 /*
  * Asn1Warning (char *str)  - configure warning mechanism
  * (currently not called)
  */
-#define Asn1Warning		cerr
+#define Asn1Warning		std::cerr
 
 
 /*
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-int.h snacc-1.3bbn/c++-lib/inc/asn-int.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-int.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-int.h	2005-07-30 19:24:45.421412320 +0000
@@ -70,7 +70,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnIntTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-list.h snacc-1.3bbn/c++-lib/inc/asn-list.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-list.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-list.h	2005-07-30 19:25:10.914682616 +0000
@@ -86,7 +86,7 @@
 				  last (NULL)
 				{}
 
-  friend ostream		&operator << (ostream &os, AsnList &l);
+  friend std::ostream		&operator << (std::ostream &os, AsnList &l);
 
   void				SetCurrElmt (unsigned long int index);
   void				SetCurrToFirst()			{ curr = first; }
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-null.h snacc-1.3bbn/c++-lib/inc/asn-null.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-null.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-null.h	2005-07-30 19:25:26.432323576 +0000
@@ -57,7 +57,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnNullTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h snacc-1.3bbn/c++-lib/inc/asn-octs.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-octs.h	2005-07-30 19:25:41.916969552 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOctsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h snacc-1.3bbn/c++-lib/inc/asn-oid.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-oid.h	2005-07-30 19:25:52.747323088 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOidTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-real.h snacc-1.3bbn/c++-lib/inc/asn-real.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-real.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-real.h	2005-07-30 19:26:05.321411536 +0000
@@ -67,7 +67,7 @@
   AsnLen			BEnc (BUF_TYPE b);
   void				BDec (BUF_TYPE b, AsnLen &bytesDecoded, ENV_TYPE env);
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
   PDU_MEMBER_MACROS
 
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-type.h snacc-1.3bbn/c++-lib/inc/asn-type.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-type.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-type.h	2005-07-30 19:26:16.551704272 +0000
@@ -111,7 +111,7 @@
 
 #endif
 
-  virtual void			Print (ostream &) const;
+  virtual void			Print (std::ostream &) const;
 
 #if META
   static const AsnTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/print.h snacc-1.3bbn/c++-lib/inc/print.h
--- snacc-1.3bbn.orig/c++-lib/inc/print.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/print.h	2005-07-30 19:26:54.240974632 +0000
@@ -42,8 +42,8 @@
 extern unsigned short int	indentG;
 extern unsigned short int	stdIndentG;
 
-void				Indent (ostream &os, unsigned short int i);
+void				Indent (std::ostream &os, unsigned short int i);
 
-ostream				&operator << (ostream &os, const AsnType &a);
+std::ostream			&operator << (std::ostream &os, const AsnType &a);
 
 #endif /* conditional include */
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-any.C snacc-1.3bbn/c++-lib/src/asn-any.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-any.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-any.C	2005-07-30 19:27:15.597727912 +0000
@@ -165,7 +165,7 @@
 }
 
 
-void AsnAny::Print (ostream &os) const
+void AsnAny::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bits.C snacc-1.3bbn/c++-lib/src/asn-bits.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bits.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bits.C	2005-07-30 19:27:51.063336320 +0000
@@ -65,6 +65,8 @@
 #include "asn-bits.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 unsigned short int  strStkUnusedBitsG;
 
@@ -440,7 +442,7 @@
 }  /* BDecConsBits */
 
 // prints the BIT STRING to the given ostream.
-void AsnBits::Print (ostream &os) const
+void AsnBits::Print (std::ostream &os) const
 {
     size_t octetLen = (bitLen+7)/8;
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bool.C snacc-1.3bbn/c++-lib/src/asn-bool.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bool.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bool.C	2005-07-30 19:28:23.793360600 +0000
@@ -54,6 +54,8 @@
 #include "asn-type.h"
 #include "asn-bool.h"
 
+using std::endl;
+
 AsnType *AsnBool::Clone() const
 {
   return new AsnBool;
@@ -110,7 +112,7 @@
 }
 
 // print the BOOLEAN's value in ASN.1 value notation to the given ostream
-void AsnBool::Print (ostream &os) const
+void AsnBool::Print (std::ostream &os) const
 {
   os << (value ? "TRUE" : "FALSE");
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-enum.C snacc-1.3bbn/c++-lib/src/asn-enum.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-enum.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-enum.C	2005-07-30 19:28:57.068302040 +0000
@@ -41,9 +41,11 @@
 #include "asn-int.h"
 #include "asn-enum.h"
 
+using std::endl;
+
 AsnType *AsnEnum::Clone() const
 {
-  cerr << "AsnEnum::Clone() called" << endl;
+  std::cerr << "AsnEnum::Clone() called" << endl;
   abort();
   return NULL;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-int.C snacc-1.3bbn/c++-lib/src/asn-int.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-int.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-int.C	2005-07-30 19:31:10.276100376 +0000
@@ -55,6 +55,8 @@
 #include "asn-type.h"
 #include "asn-int.h"
 
+using std::endl;
+
 AsnType *AsnInt::Clone() const
 {
   return new AsnInt;
@@ -171,7 +173,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, INTEGER_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnInt::Print (ostream &os) const
+void AsnInt::Print (std::ostream &os) const
 {
     os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-len.C snacc-1.3bbn/c++-lib/src/asn-len.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-len.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-len.C	2005-07-30 19:31:35.984192152 +0000
@@ -41,6 +41,7 @@
 #include "asn-config.h"
 #include "asn-len.h"
 
+using std::endl;
 
 /*
  * Encodes the given length to the given buffer.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-list.C snacc-1.3bbn/c++-lib/src/asn-list.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-list.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-list.C	2005-07-30 19:32:25.815616624 +0000
@@ -62,6 +62,8 @@
 #include "asn-tag.h"
 #include "asn-type.h"
 
+using std::endl;
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -80,7 +82,7 @@
 
 // print routine for lists
 template <class T>
-ostream &operator << (ostream &os, AsnList<T> &l)
+std::ostream &operator << (std::ostream &os, AsnList<T> &l)
 {
     os << "SEQUENCE OF { ";
 
@@ -241,7 +243,7 @@
      {
          listElmtTagId = BDecTag (b, bytesDecoded, env);
 
-         if ((listElmtTagId == EOC) && (elmtLen == INDEFINITE_LEN))
+         if ((listElmtTagId == EOC_TAG_ID) && (elmtLen == INDEFINITE_LEN))
              break;
 
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-null.C snacc-1.3bbn/c++-lib/src/asn-null.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-null.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-null.C	2005-07-30 19:33:01.169242056 +0000
@@ -48,6 +48,8 @@
 #include "asn-type.h"
 #include "asn-null.h"
 
+using std::endl;
+
 AsnType *AsnNull::Clone() const
 {
   return new AsnNull;
@@ -85,7 +87,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, NULLTYPE_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnNull::Print (ostream &os) const
+void AsnNull::Print (std::ostream &os) const
 {
     os << "NULL";
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-octs.C snacc-1.3bbn/c++-lib/src/asn-octs.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-octs.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-octs.C	2005-07-30 19:33:30.540776904 +0000
@@ -58,6 +58,8 @@
 #include "asn-octs.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 
 AsnOcts::~AsnOcts()
@@ -166,7 +168,7 @@
 
 
 // Prints the AsnOcts to the given ostream in Value Notation.
-void AsnOcts::Print (ostream &os) const
+void AsnOcts::Print (std::ostream &os) const
 {
     int i;
     os << "'";
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-oid.C snacc-1.3bbn/c++-lib/src/asn-oid.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-oid.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-oid.C	2005-07-30 19:43:47.320214040 +0000
@@ -51,7 +51,7 @@
 
 #include "asn-config.h"
 #if TCL
-#include <strstream.h>
+#include <strstream>
 #endif
 #include "asn-len.h"
 #include "asn-tag.h"
@@ -59,6 +59,8 @@
 #include "asn-oid.h"
 #include "print.h"
 
+using std::endl;
+
 AsnOid::~AsnOid()
 {
   delete oid;
@@ -157,7 +159,7 @@
     *(tmpBuf++) = 0x7f & headArcNum;
 
     // repeat for the rest of the arc numbers
-    for (i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
+    for (int i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
     {
         tmpArcNum = arcNumArr[i];
         for (elmtLen = 1; (tmpArcNum >>= 7) != 0; elmtLen++)
@@ -308,7 +310,7 @@
 
 // Prints an AsnOid in ASN.1 Value Notation.
 // Decodes the oid to get the individual arc numbers
-void AsnOid::Print (ostream &os) const
+void AsnOid::Print (std::ostream &os) const
 {
   unsigned short int firstArcNum;
   unsigned long int arcNum;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-real.C snacc-1.3bbn/c++-lib/src/asn-real.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-real.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-real.C	2005-07-30 19:44:57.954476000 +0000
@@ -57,12 +57,16 @@
 #include "asn-type.h"
 #include "asn-real.h"
 
+using std::endl;
+
 #ifndef IEEE_REAL_LIB
 /* ieee functions (in case not in math.h)*/
 extern "C" {
 extern int iszero (double);
+#if defined(__GNUC__) && (__GNUC__ < 3)
 extern int isinf (double);
 extern int signbit (double);
+#endif /* __GNUC__ && __GNUC__ < 3 */
 extern int ilogb (double);
 extern double scalbn (double, int);
 }
@@ -841,7 +845,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, REAL_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnReal::Print (ostream &os) const
+void AsnReal::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-tag.C snacc-1.3bbn/c++-lib/src/asn-tag.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-tag.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-tag.C	2005-07-30 19:45:24.267135808 +0000
@@ -45,6 +45,8 @@
 #include "asn-len.h"
 #include "asn-tag.h"
 
+using std::endl;
+
 /*
  * Decode a BER Tag from the given buffer.  Error is
  * flagged if the tag is too long or if a read error occurs.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-type.C snacc-1.3bbn/c++-lib/src/asn-type.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-type.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-type.C	2005-07-30 19:30:07.294675008 +0000
@@ -72,6 +72,8 @@
 #include "asn-len.h"
 #include "asn-type.h"
 
+using std::endl;
+
 AsnType::~AsnType()
 {
 }
@@ -97,7 +99,7 @@
 
 #endif
 
-void AsnType::Print (ostream &os) const
+void AsnType::Print (std::ostream &os) const
 {
   os << "ERROR - Attempt to print an improperly formed ANY type (programming error)." << endl;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/meta.C snacc-1.3bbn/c++-lib/src/meta.C
--- snacc-1.3bbn.orig/c++-lib/src/meta.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/meta.C	2005-07-30 19:46:03.588158104 +0000
@@ -27,6 +27,8 @@
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if META
 
 AsnMemberDesc::AsnMemberDesc (const char *_name, const AsnTypeDesc *_desc):
diff -uraN snacc-1.3bbn.orig/c++-lib/src/print.C snacc-1.3bbn/c++-lib/src/print.C
--- snacc-1.3bbn.orig/c++-lib/src/print.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/print.C	2005-07-30 19:46:33.326637168 +0000
@@ -45,13 +45,13 @@
 unsigned short int stdIndentG = 4;
 
 void
-Indent (ostream &os, unsigned short int i)
+Indent (std::ostream &os, unsigned short int i)
 {
   while (i-->0)
     os <<  ' ';
 }
 
-ostream &operator << (ostream &os, const AsnType &v)
+std::ostream &operator << (std::ostream &os, const AsnType &v)
 {
   v.Print (os);
   return os;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/tcl-if.C snacc-1.3bbn/c++-lib/src/tcl-if.C
--- snacc-1.3bbn.orig/c++-lib/src/tcl-if.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/tcl-if.C	2005-07-30 19:48:01.296263752 +0000
@@ -28,12 +28,13 @@
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <strstream.h>
-#include <fstream.h>
+#include <sstream>
 #include <string.h>
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if TCL
 
 #ifdef _AIX32
@@ -835,7 +836,7 @@
     }
 
 cout << *var;
-  strstream s;
+  stringstream s;
   s << *var;
   s.put ('\0');
   cout << strlen(s.str()) << endl;
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c	2001-01-27 01:02:54.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c	2005-07-30 19:58:00.407885728 +0000
@@ -453,7 +453,7 @@
         fprintf (src, "    else\n");
         fprintf (src, "        return false;\n");
 /*
-        fprintf (src, "    { cerr << \"longjmp return value is \" << val << endl;\n");
+        fprintf (src, "    { std::cerr << \"longjmp return value is \" << val << std::endl;\n");
         fprintf (src, "        return false; }\n");
 */
         fprintf (src, "}\n\n");
@@ -999,7 +999,7 @@
                                 fprintf (src, ")\n");
                         }
                         fprintf (src, "    {\n");
-            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
                         fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "    }\n");
 
@@ -1357,7 +1357,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -1423,7 +1423,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -1666,7 +1666,7 @@
                         }
 
                         fprintf (src, "      {\n");
-                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << endl;\n");
+                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                         fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "      }\n\n");
 
@@ -1780,7 +1780,7 @@
         }
 
         fprintf (src, "    default:\n");
-        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << endl;\n");
+        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << std::endl;\n");
         fprintf (src, "      longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "      break;\n");
 
@@ -1847,7 +1847,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))", classStr, formStr, tag->code);
             fprintf (src, "    {\n");
-	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    }\n");
             fprintf (src, "    extraLen%d = BDecLen (b, bytesDecoded, env);\n", ++elmtLevel);
@@ -1876,11 +1876,11 @@
     /* ostream printing routine */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n", td->cxxTypeDefInfo->className);
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n", td->cxxTypeDefInfo->className);
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        /*    fprintf (src, "  os << \"{\" << endl;\n") */
+        /*    fprintf (src, "  os << \"{\" << std::endl;\n") */
         fprintf (src, "  switch (choiceId)\n");
         fprintf (src, "  {\n");
         FOR_EACH_LIST_ELMT (e, choice->basicType->a.choice)
@@ -1909,7 +1909,7 @@
         }
         fprintf (src, "  } // end of switch\n");
 
-        /*    fprintf (src, "  os << \"}\" << endl;\n") */
+        /*    fprintf (src, "  os << \"}\" << std::endl;\n") */
         fprintf (src, "} // %s::Print\n\n", td->cxxTypeDefInfo->className);
     }
     /* end of Print Method code */
@@ -2260,7 +2260,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -2310,7 +2310,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -2460,7 +2460,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2638,7 +2638,7 @@
                             }
 
                             fprintf (src, "    {\n");
-                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "       longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "    }\n\n");
                             fprintf (src, "    elmtLen%d = BDecLen (b, seqBytesDecoded, env);\n", ++elmtLevel);
@@ -2826,7 +2826,7 @@
                     fprintf (src, "  }\n"); /* end of tag check if */
                     fprintf (src, "  else\n");
                     fprintf (src, "  {\n");
-                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << endl;\n");
+                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << std::endl;\n");
                     fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
                     fprintf (src, "  }\n\n");
                 }
@@ -2845,7 +2845,7 @@
             fprintf (src, "  }\n");
             fprintf (src, "  else if (seqBytesDecoded != elmtLen0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << endl;\n");
+            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << std::endl;\n");
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
             fprintf (src, "  else\n");
@@ -2914,7 +2914,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2939,14 +2939,14 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (seq->basicType->a.sequence);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
-        fprintf (src, "  os << \"{ -- SEQUENCE --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SEQUENCE --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, seq->basicType->a.sequence)
@@ -2963,12 +2963,12 @@
                 if (e != FIRST_LIST_ELMT (seq->basicType->a.sequence))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -2982,10 +2982,10 @@
 
 #ifdef KHO
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence)&&(!e->type->cxxTypeRefInfo->isPtr) )
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #else
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence) && !inTailOptElmts && !NextIsTailOptional (seq->basicType->a.sequence))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #endif
 
 	    fprintf (src, "  }\n");
@@ -3000,9 +3000,9 @@
                   fprintf (src, "    os << \"%s \";\n", e->fieldName);
 		fprintf (src, "    os << \"-- void --\";\n");
     		if (e != LAST_LIST_ELMT (seq->basicType->a.sequence))
-                   fprintf (src, "    os << \",\" << endl;\n");
+                   fprintf (src, "    os << \",\" << std::endl;\n");
                 else
-                   fprintf (src, "    os << endl;\n");
+                   fprintf (src, "    os << std::endl;\n");
 		fprintf (src, "  }\n");
 #else
 		fprintf (src, "    os << \"-- void --\";\n");
@@ -3012,7 +3012,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (seq->basicType->a.sequence))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
 
         fprintf (src, "  indentG -= stdIndentG;\n");
@@ -3361,7 +3361,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -3411,7 +3411,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -3557,7 +3557,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3697,7 +3697,7 @@
                             }
 
                             fprintf (src, "        {\n");
-                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "           longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "        }\n\n");
 
@@ -3814,14 +3814,14 @@
                 FreeTags (tags);
             } /* for each elmt */
             fprintf (src, "       default:\n");
-            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << endl;\n");
+            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << std::endl;\n");
             fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    } // end switch\n");
             fprintf (src, "  } // end for loop\n");
             fprintf (src, "  bytesDecoded += setBytesDecoded;\n");
             fprintf (src, "  if (mandatoryElmtsDecoded != %d)\n", mandatoryElmtCount);
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3889,7 +3889,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3914,15 +3914,15 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n");
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (set->basicType->a.set);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
 
-        fprintf (src, "  os << \"{ -- SET --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SET --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, set->basicType->a.set)
@@ -3939,12 +3939,12 @@
                 if (e != FIRST_LIST_ELMT (set->basicType->a.set))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -3957,7 +3957,7 @@
                 fprintf (src, "    os << %s;\n", e->type->cxxTypeRefInfo->fieldName);
 
             if (e != LAST_LIST_ELMT (set->basicType->a.set) && !inTailOptElmts && !NextIsTailOptional (set->basicType->a.set))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 
 	    fprintf (src, "  }\n");
 
@@ -3974,7 +3974,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (set->basicType->a.set))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
         fprintf (src, "  indentG -= stdIndentG;\n");
         fprintf (src, "  Indent (os, indentG);\n");
@@ -4294,7 +4294,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -4324,7 +4324,7 @@
     fprintf (hdr, "  PDU_MEMBER_MACROS\n");
 
     if (printPrintersG)
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
     fprintf (hdr, "};\n\n\n");
 
@@ -4380,7 +4380,7 @@
         }
         fprintf (src, "))\n");
         fprintf (src, "        {\n");
-        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
         fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "        }\n\n");
         fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4406,7 +4406,7 @@
                 fprintf (src, "))\n");
 
             fprintf (src, "        {\n");
-            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
             fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "        }\n\n");
             fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4461,7 +4461,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -4494,7 +4494,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -4506,9 +4506,9 @@
 
     if (printPrintersG)
     {
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << endl;\n");
+        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << std::endl;\n");
         fprintf (src, "    indentG += stdIndentG;\n");
 
         fprintf (src, "    //SetCurrToFirst();\n");
@@ -4521,7 +4521,7 @@
         fprintf (src, "        //if (Curr() != Last())\n");
         fprintf (src, "        if (run != last)\n");
         fprintf (src, "            os << \",\";\n");
-        fprintf (src, "        os << endl;\n");
+        fprintf (src, "        os << std::endl;\n");
         fprintf (src, "    }\n");
 
         fprintf (src, "    indentG -= stdIndentG;\n");
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c	2001-01-27 01:02:52.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c	2005-07-30 19:22:04.488877784 +0000
@@ -33,6 +33,7 @@
  */
 
 #include <stdio.h>
+#include <time.h>
 
 #include "asn-incl.h"
 #include "asn1module.h"
diff -uraN snacc-1.3bbn.orig/compiler/core/parse-asn1.y snacc-1.3bbn/compiler/core/parse-asn1.y
--- snacc-1.3bbn.orig/compiler/core/parse-asn1.y	2001-01-27 01:02:47.000000000 +0000
+++ snacc-1.3bbn/compiler/core/parse-asn1.y	2005-07-30 17:29:02.838828848 +0000
@@ -456,6 +456,7 @@
 /*-----------------------------------------------------------------------*/
 
 LineNo: { $$ = myLineNoG; }
+;
 
 ModuleDefinition:
      ModuleIdentifier
@@ -1462,6 +1463,7 @@
         $$->choiceId = SUBTYPEVALUE_SINGLEVALUE;
         $$->a.singleValue = $1;
     }
+;
 
 ContainedSubtype:
     INCLUDES_SYM Type

snacc-ttab-tex-UTF8-fix.patch:
 ttab.tex |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-ttab-tex-UTF8-fix.patch ---
diff -up ./doc/ttab.tex.texfix ./doc/ttab.tex
--- ./doc/ttab.tex.texfix	2009-09-09 10:30:25.597509928 +0530
+++ ./doc/ttab.tex	2009-09-09 10:30:54.173509922 +0530
@@ -18,7 +18,7 @@ size of your type tables, put the only u
 your ASN.1 module and compile it without using the useful types
 module.
 
-A generic buffer type (? la ISODE and XDR) was defined to allow type
+A generic buffer type (ISODE and XDR) was defined to allow type
 table driven routines to read from a wide variety of buffer formats.
 Currently slightly modified versions of the {\C ExpBuf} and the
 {\C SBuf} are provided.  It shouldn't be too hard for you to add


--- NEW FILE snacc.spec ---
Name:           snacc
Version:        1.3
Release:        4%{?dist}
Summary:        Sample Neufeld ASN.1 to C Compiler

Group:          Applications/System
License:        GPLv2+
URL:            http://packages.debian.org/source/sid/snacc
Source0:        http://ftp.de.debian.org/debian/pool/main/s/snacc/%{name}_%{version}bbn.orig.tar.gz
Patch0:         snacc-bts-442873.patch
Patch1:         snacc-configure.patch
Patch2:         snacc-examples.patch
Patch3:         snacc-gcc.patch
Patch4:         snacc-ttab-tex-UTF8-fix.patch

BUILDROOT:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake17 libtool flex bison

%description
Snacc is Sample Neufeld ASN.1 to C compiler that can produce C, C++ routines
or type tables for BER encoding, decoding, printing and freeing.

%package devel
Summary:        Header files for snacc development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release} 

%description devel
The %{name}-devel package contains the header files
for snacc development.

%prep
%setup -qn %{name}-%{version}bbn.orig
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%{__mkdir} -p c-lib/Cebuf c-lib/ebuf c-lib/mbuf c-lib/sbuf c-lib/tbl c++-lib/c++

# ---- Build ----
# configure without tcl for libtool to use -DMETA=0

%build
AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 autoreconf -fi
%configure
%{__make}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.a`
%{__rm} -f `find %{buildroot} -name *.la`

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING doc/snacc-a5.ps
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/asn1
%{_bindir}/%{name}
%{_bindir}/berdecode
%{_bindir}/mkchdr
%{_bindir}/ptbl
%{_bindir}/pval
%{_mandir}/man1/mkchdr.1.gz
%{_mandir}/man1/ptbl.1.gz
%{_mandir}/man1/pval.1.gz
%{_mandir}/man1/snacc.1.gz
%{_mandir}/man1/snacced.1.gz
%{_mandir}/mann/snacc.n.gz
%{_libdir}/libasn1c++.so.0.0.0
%{_libdir}/libasn1cCebuf.so.0.0.0
%{_libdir}/libasn1cebuf.so.0.0.0
%{_libdir}/libasn1cmbuf.so.0.0.0
%{_libdir}/libasn1csbuf.so.0.0.0
%{_libdir}/libasn1ctbl.so.0.0.0
%{_libdir}/libasn1c++.so.0
%{_libdir}/libasn1cCebuf.so.0
%{_libdir}/libasn1cebuf.so.0
%{_libdir}/libasn1cmbuf.so.0
%{_libdir}/libasn1csbuf.so.0
%{_libdir}/libasn1ctbl.so.0

%files devel
%defattr(-,root,root,-)
%doc c-examples/ c++-examples/
%{_bindir}/snacc-config
%{_datadir}/aclocal/snacc.m4
%{_includedir}/%{name}/c
%{_includedir}/%{name}/c++
%{_libdir}/libasn1c++.so
%{_libdir}/libasn1cCebuf.so
%{_libdir}/libasn1cebuf.so
%{_libdir}/libasn1cmbuf.so
%{_libdir}/libasn1csbuf.so
%{_libdir}/libasn1ctbl.so

%changelog
* Sat Sep 26 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-4
- Removed --without-tcl as it doesn not affect configure.
- snacc-configure.patch will not build c++-lib/tcl/Makefile as tcl is not
  required. 

* Thu Sep 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-3
- Removed -libs package, and moved them to -base package.
- s/sample/Sample in package description.
- Directory ownership in base package for includedir/name.
- snacc.m4 moved to -devel package.
- Patch names start with snacc-.
- Removed .tex and .bib files as .ps is already shipped.

* Wed Sep 23 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-2
- Fixed spelling mistake s/dample/sample.
- Added {c, c++}-examples to devel package.
- Moved *.asn1 files to base package.
- Created separate libs package.
- Call ldconfig for post, postun for libs package.

* Mon Sep 21 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-1
- First snacc package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:57:08 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:50:46 -0000	1.2
@@ -0,0 +1 @@
+snacc_1.3bbn.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:57:09 -0000	1.1
+++ sources	30 Sep 2009 03:50:47 -0000	1.2
@@ -0,0 +1 @@
+24c969e2673f1713d5d995d2f9e64781  snacc_1.3bbn.orig.tar.gz



From shakthimaan at fedoraproject.org  Wed Sep 30 03:54:02 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 03:54:02 +0000 (UTC)
Subject: rpms/snacc/F-11 import.log, NONE, 1.1 snacc-bts-442873.patch, NONE, 
	1.1 snacc-configure.patch, NONE, 1.1 snacc-examples.patch, NONE,
	1.1 snacc-gcc.patch, NONE, 1.1 snacc-ttab-tex-UTF8-fix.patch,
	NONE, 1.1 snacc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930035402.5FA4211C00C1@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/snacc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2413/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snacc-bts-442873.patch snacc-configure.patch 
	snacc-examples.patch snacc-gcc.patch 
	snacc-ttab-tex-UTF8-fix.patch snacc.spec 
Log Message:
First snacc package.



--- NEW FILE import.log ---
snacc-1_3-4_fc11:F-11:snacc-1.3-4.fc11.src.rpm:1254283195

snacc-bts-442873.patch:
 snacc-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-bts-442873.patch ---
diff -uraN snacc-1.3bbn.orig/snacc-config.in snacc-1.3bbn/snacc-config.in
--- snacc-1.3bbn.orig/snacc-config.in	2001-01-27 02:02:40.000000000 +0100
+++ snacc-1.3bbn/snacc-config.in	2008-04-16 01:19:43.153755670 +0200
@@ -95,7 +95,7 @@
     if test $exec_prefix != /usr; then echo -n "-L${exec_prefix}/lib "; fi
     case "$language" in
     C)   echo -n "-lasn1c${buffertype} " ;;
-    C++) echo -n "-Iasn1c++ " ;;
+    C++) echo -n "-lasn1c++ " ;;
     *) ;;
     esac
   else

snacc-configure.patch:
 configure.ac |  313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  305 ---------------------------------------------------------
 2 files changed, 313 insertions(+), 305 deletions(-)

--- NEW FILE snacc-configure.patch ---
diff -uraN snacc-1.3bbn/configure.ac snacc-1.3bbn-debian/configure.ac
--- snacc-1.3bbn/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3bbn-debian/configure.ac	2005-07-30 17:20:35.043753552 +0000
@@ -0,0 +1,313 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl ---
+dnl	$Log: configure.ac,v $
+dnl	Revision 1.3  2002/11/19 20:28:12  debacle
+dnl	libtool changes.
+dnl	
+dnl	Revision 1.2  2002/11/19 19:37:38  debacle
+dnl	Auto-tools stuff.
+dnl	
+dnl	Revision 1.1  2002/11/19 19:18:04  debacle
+dnl	New autoconf.
+dnl	
+dnl	Revision 1.13  1997/09/04 13:54:04  wan
+dnl	A little more portability
+dnl
+dnl	Revision 1.12  1997/02/28 13:39:35  wan
+dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
+dnl
+dnl	Revision 1.11  1997/02/16 16:50:27  rj
+dnl	made return *this after calling abort()'' a compile time option.
+dnl
+dnl	Revision 1.10  1997/02/15 20:06:27  rj
+dnl	adjust to changed AC_TRY_COMPILE macro
+dnl
+dnl	Revision 1.9  1997/02/15 20:01:38  rj
+dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
+dnl
+dnl	Revision 1.8  1997/01/01 19:57:01  rj
+dnl	changes for autoconf version 2.12
+dnl
+dnl	Revision 1.7  1995/09/07  18:36:47  rj
+dnl	psbook and psnup are looked for (used by .../doc/makefile)
+dnl
+dnl	Revision 1.6  1995/07/24  14:44:47  rj
+dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
+dnl
+dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
+dnl
+dnl	look for patch(1). the c-lib uses it to patch tbl.h.
+dnl
+dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
+dnl
+dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
+dnl
+dnl	Revision 1.5  1995/02/20  11:18:41  rj
+dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
+dnl	check for isinf(3) and finite(3) added.
+dnl
+dnl	Revision 1.4  1995/02/17  15:15:44  rj
+dnl	hack to let makedepend find .h files the way gcc does.
+dnl
+dnl	Revision 1.3  1995/02/17  14:26:40  rj
+dnl	adjustments for autoconf 2.x
+dnl
+dnl	Revision 1.2  1994/10/08  04:29:37  rj
+dnl	search for Tcl/Tk
+dnl
+dnl	Revision 1.1  1994/09/01  00:51:22  rj
+dnl	first check-in (new file).
+dnl
+AC_INIT( compiler/core/snacc.c)
+AC_REVISION($Revision: 1.3 $)
+AM_INIT_AUTOMAKE(snacc, 1.3)
+AM_CONFIG_HEADER( config.h)
+dnl --- alternative programs:
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_ISC_POSIX
+dnl if CDPATH is set, the configure script might fail
+unset CDPATH
+dnl if test -n "$GCC"; then
+dnl   saveCC="$CC"
+dnl   CC="$CC -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
+dnl fi
+AC_PROG_GCC_TRADITIONAL
+AC_MSG_CHECKING( whether ANSI or K&R style C)
+AC_TRY_COMPILE([ ], [void *p; p = "test";], [
+AC_MSG_RESULT(ANSI)
+AC_DEFINE( __USE_ANSI_C__)
+], [
+AC_MSG_RESULT(K&R)
+])
+AC_PROG_CXX
+AC_LANG_CPLUSPLUS
+dnl if test -n "$GCC"; then
+dnl   saveCXX="$CXX"
+dnl   CXX="$CXX -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
+dnl fi
+AC_MSG_CHECKING( for bool built-in)
+AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for variable sized automatic arrays)
+AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for volatile functions)
+AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
+AC_LANG_C
+AM_PROG_LEX
+case "$LEX" in
+  lex)
+    LFLAGS="-Nc10000"
+  ;;
+  flex)
+    CFLAGS="$CFLAGS -DFLEX_IN_USE"
+esac
+AC_SUBST( LFLAGS)
+AC_SUBST( CFLAGS)
+# the boot strapping code in .../c-lib/ needs patch:
+AC_CHECK_PROGS( PATCH, patch, false)
+AC_PROG_YACC
+AC_PROG_LN_S
+AC_PROG_INSTALL
+dnl --- header files:
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_HEADER_STDC
+AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
+AC_FUNC_VPRINTF
+dnl --- system and compiler characteristics:
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_LIB( m, sin)
+AC_CHECK_FUNCS( isinf finite)
+AC_CHECK_FUNCS( memset memcpy memcmp)
+dnl ---
+AC_PATH_X
+AC_PATH_XTRA
+AC_CHECK_PROGS( TCLSH, tclsh, false)
+if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
+  AC_CHECK_HEADER(
+    tcl.h,
+    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
+    AC_CHECK_LIB(
+      tcl,
+      Tcl_CreateInterp,
+      [saveCFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS $X_CFLAGS"
+      AC_CHECK_LIB(
+	tk,
+	Tk_CreateWindow,
+	[AC_DEFINE( HAVE_TCL)
+	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
+	CXXTCLDIR="tcl"
+	TCLDIRS="tcl-lib tcl-asn tcl-example"
+	AC_LANG_CPLUSPLUS
+	AC_CHECK_LIB(
+	  TkTree,
+	  Tree_Init,
+	  [TREELIBS="-lTkTree"],
+	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
+	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+	AC_LANG_C],
+	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
+	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+      CFLAGS="$saveCFLAGS"],
+      [AC_MSG_RESULT( [tcl library not found])],
+      $TCLOTHERLIBS -lm)])
+fi
+AC_SUBST( CXXTCLDIR)
+AC_SUBST( TCLDIRS)
+AC_SUBST( TCLLIBS)
+AC_SUBST( TREELIBS)
+dnl ---
+AC_CHECK_PROGS( LATEX, latex, false)
+AC_CHECK_PROGS( BIBTEX, bibtex, false)
+AC_CHECK_PROGS( DVIPS, dvips, false)
+AC_CHECK_PROGS( DETEX, detex2 detex, false)
+AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
+AC_CHECK_PROGS( PSBOOK, psbook, false)
+AC_CHECK_PROGS( PSNUP, psnup, false)
+AC_CHECK_PROGS( SPELL, ispell spell, spell)
+dnl ---
+
+dnl Configure for libtool.
+AC_PROG_LIBTOOL
+
+dnl Generate the C library build directories.
+linked_files=`cd c-lib/src && ls *.c`
+for dir in Cebuf ebuf mbuf sbuf tbl; do
+  if test -d c-lib/$dir; then :; else
+    echo creating c-lib/$dir
+    mkdir c-lib/$dir
+  fi
+  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
+  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
+  case $dir in
+  Cebuf) 
+    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
+    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
+    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
+    ;;
+  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
+  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
+  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
+  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
+  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
+done
+
+dnl Generate the C++ and Tcl library build directories.
+linked_files=`cd c++-lib/src && ls *.c *.C`
+for dir in c++ tcl; do
+  if test -d c++-lib/$dir; then :; else
+    echo creating c++-lib/$dir
+    mkdir c++-lib/$dir
+  fi
+  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
+  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
+  case $dir in
+  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
+  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
+  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
+done  
+
+dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
+dnl from glib-1.2.1's configure.in.  See that file for an explanation.
+AC_OUTPUT_COMMANDS([
+          
+## Generate `snaccconfig.h' in two 
+## cases:
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+case "x$CONFIG_OTHER" in
+*snaccconfig.h) gen_snaccconfig_h=yes
+;;
+esac
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  if test "x${CONFIG_OTHER}" = x; then
+    gen_snaccconfig_h=yes
+  fi
+fi
+
+## If we're generating snaccconfig.h:
+## FIXME - currently, snaccconfig.h is just the normal
+## config.h wrapped.  this is because the user include
+## files use the normal config.h symbol names, and I 
+## haven't changed those yet.
+if test "x$gen_snaccconfig_h" = xyes; then
+  outfile=snaccconfig.h
+  echo creating $outfile
+  cat <<SNACCEOF > ${outfile}-tmp
+/* snaccconfig.h
+ * 
+ * This is an automatically generated file - please modify 'configure.in'.
+ */
+
+#ifndef _SNACCCONFIG_H
+#define _SNACCCONFIG_H
+
+SNACCEOF
+  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
+  cat <<SNACCEOF >> ${outfile}-tmp
+
+#endif /* !_SNACCCONFIG_H */
+SNACCEOF
+  if cmp -s ${outfile}-tmp $outfile; then
+    echo $outfile is unchanged
+    rm -f ${outfile}-tmp
+  else
+    mv ${outfile}-tmp ${outfile}
+  fi
+fi
+])
+
+dnl Writes files.
+AC_OUTPUT(Makefile
+          compiler/Makefile
+          compiler/back-ends/c++-gen/Makefile
+          compiler/back-ends/c-gen/Makefile
+          compiler/back-ends/idl-gen/Makefile
+          compiler/back-ends/Makefile
+          compiler/core/Makefile
+	  c-lib/Makefile
+	  c-lib/inc/Makefile
+	  c-lib/src/Makefile
+	  c-lib/Cebuf/Makefile
+	  c-lib/ebuf/Makefile
+	  c-lib/mbuf/Makefile
+	  c-lib/sbuf/Makefile
+	  c-lib/tbl/Makefile
+	  c++-lib/Makefile
+	  c++-lib/inc/Makefile
+	  c++-lib/src/Makefile
+	  c++-lib/c++/Makefile
+          asn1specs/Makefile
+          tbl-tools/berdecode/Makefile
+          tbl-tools/mkchdr/Makefile
+          tbl-tools/ptbl/Makefile
+          tbl-tools/pval/Makefile
+          tbl-tools/Makefile
+          doc/Makefile
+          snacc-config,
+[if test -f snacc-config; then chmod +x snacc-config; fi])
+dnl --- finis
diff -uraN snacc-1.3bbn/configure.in snacc-1.3bbn-debian/configure.in
--- snacc-1.3bbn/configure.in	2005-07-30 20:06:02.703761472 +0000
+++ snacc-1.3bbn-debian/configure.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl ---
-dnl	$Log: configure.in,v $
-dnl	Revision 1.13  1997/09/04 13:54:04  wan
-dnl	A little more portability
-dnl
-dnl	Revision 1.12  1997/02/28 13:39:35  wan
-dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
-dnl
-dnl	Revision 1.11  1997/02/16 16:50:27  rj
-dnl	made return *this after calling abort()'' a compile time option.
-dnl
-dnl	Revision 1.10  1997/02/15 20:06:27  rj
-dnl	adjust to changed AC_TRY_COMPILE macro
-dnl
-dnl	Revision 1.9  1997/02/15 20:01:38  rj
-dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
-dnl
-dnl	Revision 1.8  1997/01/01 19:57:01  rj
-dnl	changes for autoconf version 2.12
-dnl
-dnl	Revision 1.7  1995/09/07  18:36:47  rj
-dnl	psbook and psnup are looked for (used by .../doc/makefile)
-dnl
-dnl	Revision 1.6  1995/07/24  14:44:47  rj
-dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
-dnl
-dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
-dnl
-dnl	look for patch(1). the c-lib uses it to patch tbl.h.
-dnl
-dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
-dnl
-dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
-dnl
-dnl	Revision 1.5  1995/02/20  11:18:41  rj
-dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
-dnl	check for isinf(3) and finite(3) added.
-dnl
-dnl	Revision 1.4  1995/02/17  15:15:44  rj
-dnl	hack to let makedepend find .h files the way gcc does.
-dnl
-dnl	Revision 1.3  1995/02/17  14:26:40  rj
-dnl	adjustments for autoconf 2.x
-dnl
-dnl	Revision 1.2  1994/10/08  04:29:37  rj
-dnl	search for Tcl/Tk
-dnl
-dnl	Revision 1.1  1994/09/01  00:51:22  rj
-dnl	first check-in (new file).
-dnl
-AC_INIT( compiler/core/snacc.c)
-AC_REVISION($Revision: 1.13 $)
-AM_INIT_AUTOMAKE(snacc, 1.3)
-AM_CONFIG_HEADER( config.h)
-dnl --- alternative programs:
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_ISC_POSIX
-if test -n "$GCC"; then
-dnl   saveCC="$CC"
-dnl   CC="$CC -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
-fi
-AC_PROG_GCC_TRADITIONAL
-AC_MSG_CHECKING( whether ANSI or K&R style C)
-AC_TRY_COMPILE([ ], [void *p; p = "test";], [
-AC_MSG_RESULT(ANSI)
-AC_DEFINE( __USE_ANSI_C__)
-], [
-AC_MSG_RESULT(K&R)
-])
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-dnl if test -n "$GCC"; then
-dnl   saveCXX="$CXX"
-dnl   CXX="$CXX -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
-dnl fi
-AC_MSG_CHECKING( for bool built-in)
-AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for variable sized automatic arrays)
-AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for volatile functions)
-AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
-AC_LANG_C
-AM_PROG_LEX
-case "$LEX" in
-  lex)
-    LFLAGS="-Nc10000"
-  ;;
-  flex)
-    CFLAGS="$CFLAGS -DFLEX_IN_USE"
-esac
-AC_SUBST( LFLAGS)
-AC_SUBST( CFLAGS)
-# the boot strapping code in .../c-lib/ needs patch:
-AC_CHECK_PROGS( PATCH, patch, false)
-AC_PROG_YACC
-AC_PROG_LN_S
-AC_PROG_INSTALL
-dnl --- header files:
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_HEADER_STDC
-AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
-AC_FUNC_VPRINTF
-dnl --- system and compiler characteristics:
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_LIB( m, sin)
-AC_CHECK_FUNCS( isinf finite)
-AC_CHECK_FUNCS( memset memcpy memcmp)
-dnl ---
-AC_PATH_X
-AC_PATH_XTRA
-AC_CHECK_PROGS( TCLSH, tclsh, false)
-if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
-  AC_CHECK_HEADER(
-    tcl.h,
-    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
-    AC_CHECK_LIB(
-      tcl,
-      Tcl_CreateInterp,
-      [saveCFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $X_CFLAGS"
-      AC_CHECK_LIB(
-	tk,
-	Tk_CreateWindow,
-	[AC_DEFINE( HAVE_TCL)
-	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
-	CXXTCLDIR="tcl"
-	TCLDIRS="tcl-lib tcl-asn tcl-example"
-	AC_LANG_CPLUSPLUS
-	AC_CHECK_LIB(
-	  TkTree,
-	  Tree_Init,
-	  [TREELIBS="-lTkTree"],
-	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
-	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-	AC_LANG_C],
-	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
-	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-      CFLAGS="$saveCFLAGS"],
-      [AC_MSG_RESULT( [tcl library not found])],
-      $TCLOTHERLIBS -lm)])
-fi
-AC_SUBST( CXXTCLDIR)
-AC_SUBST( TCLDIRS)
-AC_SUBST( TCLLIBS)
-AC_SUBST( TREELIBS)
-dnl ---
-AC_CHECK_PROGS( LATEX, latex, false)
-AC_CHECK_PROGS( BIBTEX, bibtex, false)
-AC_CHECK_PROGS( DVIPS, dvips, false)
-AC_CHECK_PROGS( DETEX, detex2 detex, false)
-AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
-AC_CHECK_PROGS( PSBOOK, psbook, false)
-AC_CHECK_PROGS( PSNUP, psnup, false)
-AC_CHECK_PROGS( SPELL, ispell spell, spell)
-dnl ---
-
-dnl Configure for libtool.
-AM_PROG_LIBTOOL
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
-AC_SUBST(LTLIBOBJS)
-
-dnl Generate the C library build directories.
-linked_files=`cd c-lib/src && ls *.c`
-for dir in Cebuf ebuf mbuf sbuf tbl; do
-  if test -d c-lib/$dir; then :; else
-    echo creating c-lib/$dir
-    mkdir c-lib/$dir
-  fi
-  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
-  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
-  case $dir in
-  Cebuf) 
-    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
-    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
-    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
-    ;;
-  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
-  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
-  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
-  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
-  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
-done
-
-dnl Generate the C++ and Tcl library build directories.
-linked_files=`cd c++-lib/src && ls *.c *.C`
-for dir in c++ tcl; do
-  if test -d c++-lib/$dir; then :; else
-    echo creating c++-lib/$dir
-    mkdir c++-lib/$dir
-  fi
-  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
-  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
-  case $dir in
-  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
-  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
-  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
-done  
-
-dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
-dnl from glib-1.2.1's configure.in.  See that file for an explanation.
-AC_OUTPUT_COMMANDS([
-          
-## Generate `snaccconfig.h' in two 
-## cases:
-## 1. `config.status' is run either explicitly, or via configure.
-##     Esp. not when it is run in `Makefile' to generate makefiles and
-##     config.h
-## 2. CONFIG_OTHER is set explicitly
-##
-## Case 1 is difficult.  We know that `automake' sets one of
-## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
-## only when AM_CONFIG_HEADER is set, however.
-
-case "x$CONFIG_OTHER" in
-*snaccconfig.h) gen_snaccconfig_h=yes
-;;
-esac
-if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
-  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
-  if test "x${CONFIG_OTHER}" = x; then
-    gen_snaccconfig_h=yes
-  fi
-fi
-
-## If we're generating snaccconfig.h:
-## FIXME - currently, snaccconfig.h is just the normal
-## config.h wrapped.  this is because the user include
-## files use the normal config.h symbol names, and I 
-## haven't changed those yet.
-if test "x$gen_snaccconfig_h" = xyes; then
-  outfile=snaccconfig.h
-  echo creating $outfile
-  cat <<SNACCEOF > ${outfile}-tmp
-/* snaccconfig.h
- * 
- * This is an automatically generated file - please modify 'configure.in'.
- */
-
-#ifndef _SNACCCONFIG_H
-#define _SNACCCONFIG_H
-
-SNACCEOF
-  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
-  cat <<SNACCEOF >> ${outfile}-tmp
-
-#endif /* !_SNACCCONFIG_H */
-SNACCEOF
-  if cmp -s ${outfile}-tmp $outfile; then
-    echo $outfile is unchanged
-    rm -f ${outfile}-tmp
-  else
-    mv ${outfile}-tmp ${outfile}
-  fi
-fi
-])
-
-dnl Writes files.
-AC_OUTPUT(Makefile
-          compiler/Makefile
-          compiler/back-ends/c++-gen/Makefile
-          compiler/back-ends/c-gen/Makefile
-          compiler/back-ends/idl-gen/Makefile
-          compiler/back-ends/Makefile
-          compiler/core/Makefile
-	  c-lib/Makefile
-	  c-lib/inc/Makefile
-	  c-lib/src/Makefile
-	  c-lib/Cebuf/Makefile
-	  c-lib/ebuf/Makefile
-	  c-lib/mbuf/Makefile
-	  c-lib/sbuf/Makefile
-	  c-lib/tbl/Makefile
-	  c++-lib/Makefile
-	  c++-lib/inc/Makefile
-	  c++-lib/src/Makefile
-	  c++-lib/c++/Makefile
-	  c++-lib/tcl/Makefile
-          asn1specs/Makefile
-          tbl-tools/berdecode/Makefile
-          tbl-tools/mkchdr/Makefile
-          tbl-tools/ptbl/Makefile
-          tbl-tools/pval/Makefile
-          tbl-tools/Makefile
-          doc/Makefile
-          snacc-config,
-[if test -f snacc-config; then chmod +x snacc-config; fi])
-dnl --- finis

snacc-examples.patch:
 c++-examples/any/README            |   90 +++
 c++-examples/any/example.C         |  115 ++++
 c++-examples/any/genber.C          |  150 +++++
 c++-examples/any/makefile          |  154 ++++++
 c++-examples/makefile              |   34 +
 c++-examples/simple/README         |  105 ++++
 c++-examples/simple/example.C      |  115 ++++
 c++-examples/simple/genber.C       |   99 +++
 c++-examples/simple/good-pr.ber.uu |    7 
 c++-examples/simple/makefile       |  146 +++++
 c++-examples/snmp/README           |  126 ++++
 c++-examples/snmp/makefile         |  103 ++++
 c++-examples/test-lib/README       |   37 +
 c++-examples/test-lib/makefile     |   59 ++
 c++-examples/test-lib/test-lib.C   |  781 ++++++++++++++++++++++++++++++
 c-examples/any/README              |  107 ++++
 c-examples/any/example.c           |  161 ++++++
 c-examples/any/genber.c            |  164 ++++++
 c-examples/any/makefile            |  144 +++++
 c-examples/makefile                |   42 +
 c-examples/simple/README           |  128 +++++
 c-examples/simple/expbuf-ex.c      |  166 ++++++
 c-examples/simple/genber.c         |  154 ++++++
 c-examples/simple/good-pr.ber.uu   |    7 
 c-examples/simple/makefile         |  198 +++++++
 c-examples/simple/minbuf-ex.c      |  162 ++++++
 c-examples/simple/sbuf-ex.c        |  154 ++++++
 c-examples/snmp/README             |  118 ++++
 c-examples/snmp/makefile           |   91 +++
 c-examples/test-lib/README         |   37 +
 c-examples/test-lib/makefile       |   50 +
 c-examples/test-lib/test-lib.c     |  935 +++++++++++++++++++++++++++++++++++++
 tbl-example/README                 |   83 +++
 tbl-example/example.c              |  174 ++++++
 tbl-example/makefile               |   82 +++
 tbl-example/p-rec.ber.uu           |    7 
 36 files changed, 5285 insertions(+)

--- NEW FILE snacc-examples.patch ---
diff -uraN snacc-1.3bbn/c++-examples/any/README snacc-1.3b4/c++-examples/any/README
--- snacc-1.3bbn/c++-examples/any/README	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/README	1997-02-16 20:25:26.000000000 +0000
@@ -0,0 +1,90 @@
+(RCS control information is at the end of this file.)
+
+
+C++ ANY example README
+---------------------
+
+This example shows how the snacc compiler handles the ANY DEFINED BY
+type in C++.  ANY types (not ANY DEFINED BY) require modifications
+to the generated code.  Type "make" to build this example.
+
+This directory should have the following 4 files in it:
+
+        README
+        example.C
+        genber.C
+        makefile
+
+There are 3 programs generated by the makefile:
+
+        genber - builds a BER value of the AnyTestType and writes it
+                 to a file called "att.ber"
+
+        def    - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses definite
+                 lengths for constructed values.
+
+        indef  - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses indefinite
+                 lengths for constructed values.
+
+
+These files use the code generated by snacc from the
+snacc/asn1specs/any.asn1 file. (see the makefile)
+
+Look at genber.C to see how values can be built and printed.
+
+Look at the generated code in any_test.C and any_test.h to see how the
+any hash table is built.
+
+
+try the following commands in your c-shell:
+
+%1 genber                   # generate the att.ber file
+%2 indef att.ber > tmp.ber  # decode att.ber an re-encode into tmp.ber
+%3 def tmp.ber > tmp2.ber   # decode tmp.ber an re-encode into tmp2.ber
+%4 diff att.ber tmp2.ber    # compare .ber files (should be the same)
+
+When you are finished with the example type "make clean"  to remove
+the binaries and generated code.
+
+
+
+Things To Note
+--------------
+
+Snacc ASN.1 comment commands
+
+In the snacc/asn1specs/any.asn1 file, the AnyTestType has a special
+"--snacc" ASN.1 comment after ::= to give snacc some extra information
+about the AnyTestType.
+
+AnyTestType ::= --snacc isPdu:"TRUE" -- SEQUENCE { ... etc. ... }
+
+The "isPdu" flag only affects the generated C code, not C++.  Each
+C++ type gets PDU methods by default.
+
+
+SNMP OBJECT-TYPE Macro
+
+The SNMP OBJECT-TYPE macro is used to define the id value to type
+mapping for ANY DEFINED BY types.  The macro has been modified to
+accept both INTEGERs and OBJECT IDENTIFIERs as id values (see
+snacc/asn1specs/any.asn1).  This macro can be used with other
+protocols to define the id to type mapping.
+
+Two hash tables are used to hold the id to type mappings. One for
+INTEGER to type mappings and the other for OBJECT IDENTIFIER to type
+mappings.  The hash tables are automatically initialized in each
+module that has OBJECT-TYPE macros.  In C the hash table must be
+explicitly initialized.
+
+#-------------------------------------------------------------------------------
+# $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/README,v 1.2 1997/02/16 20:25:26 rj Exp $
+# $Log: README,v $
+# Revision 1.2  1997/02/16 20:25:26  rj
+# check-in of a few cosmetic changes
+#
+# Revision 1.1  1994/08/31  08:47:59  rj
+# first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+#
diff -uraN snacc-1.3bbn/c++-examples/any/example.C snacc-1.3b4/c++-examples/any/example.C
--- snacc-1.3bbn/c++-examples/any/example.C	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/example.C	1995-07-24 15:33:33.000000000 +0000
@@ -0,0 +1,115 @@
+// c++_examples/any/example.C - an example of how to use C++ ASN.1-BER
+//              for ANY Types
+//
+// AUTHOR: Mike Sample
+// DATE:   92
+//
+// $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/example.C,v 1.5 1995/07/24 15:33:33 rj Exp $
+// $Log: example.C,v $
+// Revision 1.5  1995/07/24 15:33:33  rj
+// changed `_' to `-' in file names.
+//
+// any-test.[hC] becomes any.[hC] due to to snacc's new file name generation scheme.
+//
+// check return value of new.
+//
+// Revision 1.4  1995/02/18  13:53:07  rj
+// added #define HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS since not every C++ compiler provides them.
+//
+// Revision 1.3  1994/10/08  01:26:21  rj
+// several \size_t'
+//
+// Revision 1.2  1994/08/31  08:56:29  rj
+// first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+//
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fstream.h>
+
+#include "asn-incl.h"
+#include "any.h"
+
+main (int argc, char *argv[])
+{
+    if (argc != 2)
+    {
+        cerr << "Usage: " << argv[0] << " <BER data file name>" << endl;
+        cerr << "   Decodes the given AnyTestType BER data file" << endl;
+        cerr << "   and re-encodes it to stdout" << endl;
+        exit (1);
+    }
+
+    ifstream dataFile;
+    // open the data file
+    dataFile.open (argv[1]);
+
+    if (!dataFile)
+    {
+        perror ("ifstream::open");
+        exit (1);
+    }
+
+    // get size of the data file file
+    dataFile.seekg (0, ios::end);
+    int dataSize = dataFile.tellg();
+    dataFile.seekg (0);
+
+    // read data from file into contiguous block for a buffer
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char data[dataSize];
+#else
+    char *data = new char[dataSize];
+    if (!data)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    dataFile.read (data, dataSize);
+    dataFile.close();
+
+    //
+    // put the BER data read from the file
+    // into buffer format, ready for reading from the
+    // beginning
+    //
+    AsnBuf inputBuf;
+    inputBuf.InstallData ((char*)data, dataSize);
+
+    size_t decodedLen;
+    AnyTestType att;
+
+    if (!att.BDecPdu (inputBuf, decodedLen))
+    {
+        cerr << "ERROR - Decode routines failed, exiting..." << endl;
+        exit (1);
+    }
+
+    cerr  << "decodedValue AnyTestType ::= " << att << endl << endl;
+
+    //
+    // allocate a new buffer and set up for writing to
+    //
+    AsnBuf  outputBuf;
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char outputData[dataSize + 512];
+#else
+    char *outputData = new char[dataSize + 512];
+    if (!outputData)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    outputBuf.Init (outputData, dataSize+512);
+    outputBuf.ResetInWriteRvsMode();
[...5030 lines suppressed...]
+
+    if (argc != 3)
+    {
+        Usage (argv[0]);
+        return 1;
+    }
+
+    tblFileName = argv[1];
+    berFileName = argv[2];
+
+    /* init mem pool to hold  decoded val */
+    InitNibbleMem (1024, 1024);
+
+    /* read in and decode the type table */
+    tbl = LoadTblFile (tblFileName);
+    if (tbl == NULL)
+        return 1;
+
+    fileData = LoadFile (berFileName, &fsize);
+    if (fileData == NULL)
+        return 1;
+
+    SBufInstallData (&sb, fileData, fsize);
+    PutSBufInGenBuf (&sb, &gb);
+
+    fprintf (stdout, "\n\n-- decoded contents of BER PersonnelRecord file: \"%s\"--\n", berFileName);
+
+    val = TblDecode (tbl, NULL, "PersonnelRecord", &gb, &bytesDecoded);
+
+    if (val == NULL)
+        fprintf (stdout, "-- Decoding error occured somewhere -- \n");
+    else
+        TblPrintValue (tbl, NULL, "PersonnelRecord", stdout, val);
+
+    fprintf (stdout, "\n\n -- decoded %d bytes for the above value --\n\n", bytesDecoded, berFileName);
+
+    free (fileData); /* was malloc'd in LoadFile */
+
+    /*
+     * process value here
+     * (This is where the header file generated by mkchdr is
+     * useful - you can access the decoded value in a standard
+     * /easier way).
+     *
+     * Ok, well, the names "field0" etc aren't that nice
+     * but what did you expect - they aren't named in the ASN.1
+     * spec so mkchdr just makes them up.  To fix this, just
+     * add field names to you ASN.1 spec - it will not change the
+     * way the values are encoded - so you're not making it
+     * incompatible with the original. (not including value notation)
+     */
+    printf ("The following printout is an example of using the\n");
+    printf ("hdr file generated by mkchdr to access the data\n");
+    printf ("returned from the table decoder.  Look in \"example.c\"\n\n");
+
+
+    printf ("***** JQ GUMBY & CO Database *****************************************\n");
+    printf ("Employee Name:      %s %s %s\n", val->field0->givenName->octs, val->field0->initial->octs, val->field0->familyName->octs);
+    printf ("Title:              %s\n", val->title->octs);
+    printf ("Employee Number:    %d\n", *val->field1);
+    printf ("Date of Hire:       %s\n", val->dateOfHire->octs);
+    printf ("Name of Spouse:     %s %s %s\n", val->nameOfSpouse->givenName->octs, val->nameOfSpouse->initial->octs, val->nameOfSpouse->familyName->octs);
+    printf ("Number of Children: %d\n", AsnListCount (val->children));
+    printf ("**********************************************************************\n\n");
+
+    /*
+     * finished playing with the decoded value.
+     * now re-encode the value.  Using an expbuf to hold the encoded val
+     * because they can grow and in general you can predict a values
+     * encoded size (although we could assume that is would be close to
+     * the same size as the one we read in at the beginning of this prg).
+     * (note: the size of PersonnelRecord BER value we decoded may be
+     * different from the size of the re-encoded version depending on
+     * the use of indefinite or definite lengths.  Both are valid BER.)
+     */
+    fprintf (stdout, "now re-encoding the PersonnelRecord value to \"%s\"\n", outputFileNameG);
+
+    ebPtr = ExpBufAllocBufAndData();
+    ExpBufResetInWriteRvsMode (ebPtr); /* set up to hold encoding (= writing) */
+
+    PutExpBufInGenBuf (ebPtr, &gb);
+
+    if (TblEncode (tbl, NULL, "PersonnelRecord", &gb, val, &bytesEncoded) < 0)
+        fprintf (stderr, "main: error encoding the PersonnelRecord\n");
+
+    /* copy ExpBuf data to file */
+    outputFile = fopen (outputFileNameG, "w");
+    if (outputFile == NULL)
+    {
+        fprintf (stderr, "error - could not open file \"%s\"\n", outputFileNameG);
+        perror ("main: fopen:");
+    }
+
+    ExpBufCopyToFile (ebPtr, outputFile);
+
+    fclose (outputFile);
+
+    /* free the encoded version */
+    ExpBufFreeBufAndDataList (ebPtr);
+
+
+    return 0;
+} /* main */
diff -uraN snacc-1.3bbn/tbl-example/makefile snacc-1.3b4/tbl-example/makefile
--- snacc-1.3bbn/tbl-example/makefile	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/makefile	1997-02-15 19:33:26.000000000 +0000
@@ -0,0 +1,82 @@
+# file: .../tbl-example/makefile
+#
+# $Header: /usr/app/odstb/CVS/snacc/tbl-example/makefile,v 1.1 1997/02/15 19:33:26 rj Exp $
+# $Log: makefile,v $
+# Revision 1.1  1997/02/15 19:33:26  rj
+# first check-in
+#
+
+include ../makehead
+
+TOP		= ..
+
+ASN1_SRC_DIR	= $(TOP)/asn1specs
+
+ASN1_C_LIB_DIR	= $(TOP)/c-lib
+ASN1_C_INC_DIR	= $(ASN1_C_LIB_DIR)/inc
+TTBL_ASN1_LIB	= $(ASN1_C_LIB_DIR)/libasn1ctbl.a
+
+COMPILERDIR	= $(TOP)/compiler
+SNACC		= $(COMPILERDIR)/snacc
+USEFUL_TYPES	= $(ASN1_SRC_DIR)/asn-useful.asn1
+SNACCFLAGS	= -u $(USEFUL_TYPES)
+
+TBLTOOLSDIR	= $(TOP)/tbl-tools
+MKHDR		= $(TBLTOOLSDIR)/mkchdr/mkchdr
+
+ASN1FILES	= $(ASN1_SRC_DIR)/p-rec.asn1
+ASN1TTFILE	= p-rec.tt
+ASN1TTHFILE	= p-rec.h
+
+CFILES	= example.c
+OFILES	= example.o
+
+DISTFILES = \
+	README		\
+	makefile	\
+	$(CFILES)	\
+	p-rec.ber
+
+CPPFLAGS	+= -I$(TOP) -I$(ASN1_C_INC_DIR) -DUSE_GEN_BUF
+
+#-------------------------------------------------------------------------------
+
+all::		example
+
+example:	$(OFILES) $(TTBL_ASN1_LIB)
+		$(REASON)
+		$(CC) $(CFLAGS) -o example $(OFILES) $(TTBL_ASN1_LIB) $(LIBS)
+
+$(ASN1TTFILE):	$(ASN1FILES)
+		$(REASON)
+		$(SNACC) $(SNACCFLAGS) -T $@ $(ASN1FILES)
+
+$(SNACC) $(MKHDR):
+		cd $(@D) && $(MAKE) $(@F)
+
+$(TTBL_ASN1_LIB):
+		cd $(@D) && $(MAKE) tbl-lib
+
+$(ASN1TTHFILE):	$(ASN1TTFILE)
+		$(REASON)
+		$(MKHDR) $? $@
+
+check::		example $(ASN1TTFILE)
+
+check::
+		./example p-rec.tt p-rec.ber
+		cmp p-rec.ber p-rec.out.ber
+		@echo "+++ the test was successful"
+
+# dummy:
+install::
+
+clean::
+		$(RM) example *.o *~ core .emacs* $(ASN1TTFILE) $(ASN1TTHFILE) p-rec.out.ber
+
+depend::
+		$(MAKE) $(MKHDR)
+
+depend::	$(ASN1TTHFILE)
+
+include ../maketail
diff -uraN snacc-1.3bbn/tbl-example/p-rec.ber.uu snacc-1.3b4/tbl-example/p-rec.ber.uu
--- snacc-1.3bbn/tbl-example/p-rec.ber.uu	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/p-rec.ber.uu	2005-07-30 16:57:00.588101736 +0000
@@ -0,0 +1,7 @@
+begin 644 p-rec.ber
+M8(&.81`6!$IO:&X6`446!5-M:71HH!`6#E1H92!":6<@0VAE97-E7X$``P&&
+MGZ$*0P at Q.3@R,#$P-*(281`6!$UA<GD6`4P6!5-M:71HHT$Q'V$1%@5*86UE
+M<Q8!4A8%4VUI=&B@"D,(,3DU-S`S,3`Q'F$0%@1,:7-A%@%-%@53;6ET:*`*
+*0P at Q.38Q,#8R,0``
+`
+end

snacc-gcc.patch:
 c++-lib/inc/asn-any.h                 |    2 
 c++-lib/inc/asn-bits.h                |    2 
 c++-lib/inc/asn-bool.h                |    2 
 c++-lib/inc/asn-config.h              |    6 +-
 c++-lib/inc/asn-int.h                 |    2 
 c++-lib/inc/asn-list.h                |    2 
 c++-lib/inc/asn-null.h                |    2 
 c++-lib/inc/asn-octs.h                |    2 
 c++-lib/inc/asn-oid.h                 |    2 
 c++-lib/inc/asn-real.h                |    2 
 c++-lib/inc/asn-type.h                |    2 
 c++-lib/inc/print.h                   |    4 -
 c++-lib/src/asn-any.C                 |    2 
 c++-lib/src/asn-bits.C                |    4 +
 c++-lib/src/asn-bool.C                |    4 +
 c++-lib/src/asn-enum.C                |    4 +
 c++-lib/src/asn-int.C                 |    4 +
 c++-lib/src/asn-len.C                 |    1 
 c++-lib/src/asn-list.C                |    6 +-
 c++-lib/src/asn-null.C                |    4 +
 c++-lib/src/asn-octs.C                |    4 +
 c++-lib/src/asn-oid.C                 |    8 +-
 c++-lib/src/asn-real.C                |    6 +-
 c++-lib/src/asn-tag.C                 |    2 
 c++-lib/src/asn-type.C                |    4 +
 c++-lib/src/meta.C                    |    2 
 c++-lib/src/print.C                   |    4 -
 c++-lib/src/tcl-if.C                  |    7 +-
 compiler/back-ends/c++-gen/gen-code.c |  102 +++++++++++++++++-----------------
 compiler/back-ends/c-gen/gen-code.c   |    1 
 compiler/core/parse-asn1.y            |    2 
 31 files changed, 116 insertions(+), 85 deletions(-)

--- NEW FILE snacc-gcc.patch ---
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-any.h snacc-1.3bbn/c++-lib/inc/asn-any.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-any.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-any.h	2005-07-30 19:22:42.514097072 +0000
@@ -81,7 +81,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if 0
 #if TCL
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h snacc-1.3bbn/c++-lib/inc/asn-bits.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bits.h	2005-07-30 19:23:29.321981192 +0000
@@ -105,7 +105,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBitsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h snacc-1.3bbn/c++-lib/inc/asn-bool.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bool.h	2005-07-30 19:23:45.319549192 +0000
@@ -101,7 +101,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBoolTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-config.h snacc-1.3bbn/c++-lib/inc/asn-config.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-config.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-config.h	2005-07-30 19:24:29.054900408 +0000
@@ -49,7 +49,7 @@
 #define _asn_config_h_
 
 #include <ctype.h>  /* for isprint() in <<op on AsnOcts */
-#include <iostream.h>
+#include <iostream>
 #include <memory.h>
 #include <string.h>
 #include <setjmp.h>
@@ -85,14 +85,14 @@
  * Asn1Error (char *str)
  *  - configure error handler
  */
-#define Asn1Error		cerr
+#define Asn1Error		std::cerr
 
 
 /*
  * Asn1Warning (char *str)  - configure warning mechanism
  * (currently not called)
  */
-#define Asn1Warning		cerr
+#define Asn1Warning		std::cerr
 
 
 /*
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-int.h snacc-1.3bbn/c++-lib/inc/asn-int.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-int.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-int.h	2005-07-30 19:24:45.421412320 +0000
@@ -70,7 +70,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnIntTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-list.h snacc-1.3bbn/c++-lib/inc/asn-list.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-list.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-list.h	2005-07-30 19:25:10.914682616 +0000
@@ -86,7 +86,7 @@
 				  last (NULL)
 				{}
 
-  friend ostream		&operator << (ostream &os, AsnList &l);
+  friend std::ostream		&operator << (std::ostream &os, AsnList &l);
 
   void				SetCurrElmt (unsigned long int index);
   void				SetCurrToFirst()			{ curr = first; }
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-null.h snacc-1.3bbn/c++-lib/inc/asn-null.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-null.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-null.h	2005-07-30 19:25:26.432323576 +0000
@@ -57,7 +57,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnNullTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h snacc-1.3bbn/c++-lib/inc/asn-octs.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-octs.h	2005-07-30 19:25:41.916969552 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOctsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h snacc-1.3bbn/c++-lib/inc/asn-oid.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-oid.h	2005-07-30 19:25:52.747323088 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOidTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-real.h snacc-1.3bbn/c++-lib/inc/asn-real.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-real.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-real.h	2005-07-30 19:26:05.321411536 +0000
@@ -67,7 +67,7 @@
   AsnLen			BEnc (BUF_TYPE b);
   void				BDec (BUF_TYPE b, AsnLen &bytesDecoded, ENV_TYPE env);
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
   PDU_MEMBER_MACROS
 
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-type.h snacc-1.3bbn/c++-lib/inc/asn-type.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-type.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-type.h	2005-07-30 19:26:16.551704272 +0000
@@ -111,7 +111,7 @@
 
 #endif
 
-  virtual void			Print (ostream &) const;
+  virtual void			Print (std::ostream &) const;
 
 #if META
   static const AsnTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/print.h snacc-1.3bbn/c++-lib/inc/print.h
--- snacc-1.3bbn.orig/c++-lib/inc/print.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/print.h	2005-07-30 19:26:54.240974632 +0000
@@ -42,8 +42,8 @@
 extern unsigned short int	indentG;
 extern unsigned short int	stdIndentG;
 
-void				Indent (ostream &os, unsigned short int i);
+void				Indent (std::ostream &os, unsigned short int i);
 
-ostream				&operator << (ostream &os, const AsnType &a);
+std::ostream			&operator << (std::ostream &os, const AsnType &a);
 
 #endif /* conditional include */
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-any.C snacc-1.3bbn/c++-lib/src/asn-any.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-any.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-any.C	2005-07-30 19:27:15.597727912 +0000
@@ -165,7 +165,7 @@
 }
 
 
-void AsnAny::Print (ostream &os) const
+void AsnAny::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bits.C snacc-1.3bbn/c++-lib/src/asn-bits.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bits.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bits.C	2005-07-30 19:27:51.063336320 +0000
@@ -65,6 +65,8 @@
 #include "asn-bits.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 unsigned short int  strStkUnusedBitsG;
 
@@ -440,7 +442,7 @@
 }  /* BDecConsBits */
 
 // prints the BIT STRING to the given ostream.
-void AsnBits::Print (ostream &os) const
+void AsnBits::Print (std::ostream &os) const
 {
     size_t octetLen = (bitLen+7)/8;
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bool.C snacc-1.3bbn/c++-lib/src/asn-bool.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bool.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bool.C	2005-07-30 19:28:23.793360600 +0000
@@ -54,6 +54,8 @@
 #include "asn-type.h"
 #include "asn-bool.h"
 
+using std::endl;
+
 AsnType *AsnBool::Clone() const
 {
   return new AsnBool;
@@ -110,7 +112,7 @@
 }
 
 // print the BOOLEAN's value in ASN.1 value notation to the given ostream
-void AsnBool::Print (ostream &os) const
+void AsnBool::Print (std::ostream &os) const
 {
   os << (value ? "TRUE" : "FALSE");
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-enum.C snacc-1.3bbn/c++-lib/src/asn-enum.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-enum.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-enum.C	2005-07-30 19:28:57.068302040 +0000
@@ -41,9 +41,11 @@
 #include "asn-int.h"
 #include "asn-enum.h"
 
+using std::endl;
+
 AsnType *AsnEnum::Clone() const
 {
-  cerr << "AsnEnum::Clone() called" << endl;
+  std::cerr << "AsnEnum::Clone() called" << endl;
   abort();
   return NULL;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-int.C snacc-1.3bbn/c++-lib/src/asn-int.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-int.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-int.C	2005-07-30 19:31:10.276100376 +0000
@@ -55,6 +55,8 @@
 #include "asn-type.h"
 #include "asn-int.h"
 
+using std::endl;
+
 AsnType *AsnInt::Clone() const
 {
   return new AsnInt;
@@ -171,7 +173,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, INTEGER_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnInt::Print (ostream &os) const
+void AsnInt::Print (std::ostream &os) const
 {
     os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-len.C snacc-1.3bbn/c++-lib/src/asn-len.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-len.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-len.C	2005-07-30 19:31:35.984192152 +0000
@@ -41,6 +41,7 @@
 #include "asn-config.h"
 #include "asn-len.h"
 
+using std::endl;
 
 /*
  * Encodes the given length to the given buffer.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-list.C snacc-1.3bbn/c++-lib/src/asn-list.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-list.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-list.C	2005-07-30 19:32:25.815616624 +0000
@@ -62,6 +62,8 @@
 #include "asn-tag.h"
 #include "asn-type.h"
 
+using std::endl;
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -80,7 +82,7 @@
 
 // print routine for lists
 template <class T>
-ostream &operator << (ostream &os, AsnList<T> &l)
+std::ostream &operator << (std::ostream &os, AsnList<T> &l)
 {
     os << "SEQUENCE OF { ";
 
@@ -241,7 +243,7 @@
      {
          listElmtTagId = BDecTag (b, bytesDecoded, env);
 
-         if ((listElmtTagId == EOC) && (elmtLen == INDEFINITE_LEN))
+         if ((listElmtTagId == EOC_TAG_ID) && (elmtLen == INDEFINITE_LEN))
              break;
 
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-null.C snacc-1.3bbn/c++-lib/src/asn-null.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-null.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-null.C	2005-07-30 19:33:01.169242056 +0000
@@ -48,6 +48,8 @@
 #include "asn-type.h"
 #include "asn-null.h"
 
+using std::endl;
+
 AsnType *AsnNull::Clone() const
 {
   return new AsnNull;
@@ -85,7 +87,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, NULLTYPE_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnNull::Print (ostream &os) const
+void AsnNull::Print (std::ostream &os) const
 {
     os << "NULL";
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-octs.C snacc-1.3bbn/c++-lib/src/asn-octs.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-octs.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-octs.C	2005-07-30 19:33:30.540776904 +0000
@@ -58,6 +58,8 @@
 #include "asn-octs.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 
 AsnOcts::~AsnOcts()
@@ -166,7 +168,7 @@
 
 
 // Prints the AsnOcts to the given ostream in Value Notation.
-void AsnOcts::Print (ostream &os) const
+void AsnOcts::Print (std::ostream &os) const
 {
     int i;
     os << "'";
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-oid.C snacc-1.3bbn/c++-lib/src/asn-oid.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-oid.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-oid.C	2005-07-30 19:43:47.320214040 +0000
@@ -51,7 +51,7 @@
 
 #include "asn-config.h"
 #if TCL
-#include <strstream.h>
+#include <strstream>
 #endif
 #include "asn-len.h"
 #include "asn-tag.h"
@@ -59,6 +59,8 @@
 #include "asn-oid.h"
 #include "print.h"
 
+using std::endl;
+
 AsnOid::~AsnOid()
 {
   delete oid;
@@ -157,7 +159,7 @@
     *(tmpBuf++) = 0x7f & headArcNum;
 
     // repeat for the rest of the arc numbers
-    for (i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
+    for (int i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
     {
         tmpArcNum = arcNumArr[i];
         for (elmtLen = 1; (tmpArcNum >>= 7) != 0; elmtLen++)
@@ -308,7 +310,7 @@
 
 // Prints an AsnOid in ASN.1 Value Notation.
 // Decodes the oid to get the individual arc numbers
-void AsnOid::Print (ostream &os) const
+void AsnOid::Print (std::ostream &os) const
 {
   unsigned short int firstArcNum;
   unsigned long int arcNum;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-real.C snacc-1.3bbn/c++-lib/src/asn-real.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-real.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-real.C	2005-07-30 19:44:57.954476000 +0000
@@ -57,12 +57,16 @@
 #include "asn-type.h"
 #include "asn-real.h"
 
+using std::endl;
+
 #ifndef IEEE_REAL_LIB
 /* ieee functions (in case not in math.h)*/
 extern "C" {
 extern int iszero (double);
+#if defined(__GNUC__) && (__GNUC__ < 3)
 extern int isinf (double);
 extern int signbit (double);
+#endif /* __GNUC__ && __GNUC__ < 3 */
 extern int ilogb (double);
 extern double scalbn (double, int);
 }
@@ -841,7 +845,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, REAL_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnReal::Print (ostream &os) const
+void AsnReal::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-tag.C snacc-1.3bbn/c++-lib/src/asn-tag.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-tag.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-tag.C	2005-07-30 19:45:24.267135808 +0000
@@ -45,6 +45,8 @@
 #include "asn-len.h"
 #include "asn-tag.h"
 
+using std::endl;
+
 /*
  * Decode a BER Tag from the given buffer.  Error is
  * flagged if the tag is too long or if a read error occurs.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-type.C snacc-1.3bbn/c++-lib/src/asn-type.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-type.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-type.C	2005-07-30 19:30:07.294675008 +0000
@@ -72,6 +72,8 @@
 #include "asn-len.h"
 #include "asn-type.h"
 
+using std::endl;
+
 AsnType::~AsnType()
 {
 }
@@ -97,7 +99,7 @@
 
 #endif
 
-void AsnType::Print (ostream &os) const
+void AsnType::Print (std::ostream &os) const
 {
   os << "ERROR - Attempt to print an improperly formed ANY type (programming error)." << endl;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/meta.C snacc-1.3bbn/c++-lib/src/meta.C
--- snacc-1.3bbn.orig/c++-lib/src/meta.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/meta.C	2005-07-30 19:46:03.588158104 +0000
@@ -27,6 +27,8 @@
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if META
 
 AsnMemberDesc::AsnMemberDesc (const char *_name, const AsnTypeDesc *_desc):
diff -uraN snacc-1.3bbn.orig/c++-lib/src/print.C snacc-1.3bbn/c++-lib/src/print.C
--- snacc-1.3bbn.orig/c++-lib/src/print.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/print.C	2005-07-30 19:46:33.326637168 +0000
@@ -45,13 +45,13 @@
 unsigned short int stdIndentG = 4;
 
 void
-Indent (ostream &os, unsigned short int i)
+Indent (std::ostream &os, unsigned short int i)
 {
   while (i-->0)
     os <<  ' ';
 }
 
-ostream &operator << (ostream &os, const AsnType &v)
+std::ostream &operator << (std::ostream &os, const AsnType &v)
 {
   v.Print (os);
   return os;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/tcl-if.C snacc-1.3bbn/c++-lib/src/tcl-if.C
--- snacc-1.3bbn.orig/c++-lib/src/tcl-if.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/tcl-if.C	2005-07-30 19:48:01.296263752 +0000
@@ -28,12 +28,13 @@
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <strstream.h>
-#include <fstream.h>
+#include <sstream>
 #include <string.h>
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if TCL
 
 #ifdef _AIX32
@@ -835,7 +836,7 @@
     }
 
 cout << *var;
-  strstream s;
+  stringstream s;
   s << *var;
   s.put ('\0');
   cout << strlen(s.str()) << endl;
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c	2001-01-27 01:02:54.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c	2005-07-30 19:58:00.407885728 +0000
@@ -453,7 +453,7 @@
         fprintf (src, "    else\n");
         fprintf (src, "        return false;\n");
 /*
-        fprintf (src, "    { cerr << \"longjmp return value is \" << val << endl;\n");
+        fprintf (src, "    { std::cerr << \"longjmp return value is \" << val << std::endl;\n");
         fprintf (src, "        return false; }\n");
 */
         fprintf (src, "}\n\n");
@@ -999,7 +999,7 @@
                                 fprintf (src, ")\n");
                         }
                         fprintf (src, "    {\n");
-            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
                         fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "    }\n");
 
@@ -1357,7 +1357,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -1423,7 +1423,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -1666,7 +1666,7 @@
                         }
 
                         fprintf (src, "      {\n");
-                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << endl;\n");
+                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                         fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "      }\n\n");
 
@@ -1780,7 +1780,7 @@
         }
 
         fprintf (src, "    default:\n");
-        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << endl;\n");
+        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << std::endl;\n");
         fprintf (src, "      longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "      break;\n");
 
@@ -1847,7 +1847,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))", classStr, formStr, tag->code);
             fprintf (src, "    {\n");
-	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    }\n");
             fprintf (src, "    extraLen%d = BDecLen (b, bytesDecoded, env);\n", ++elmtLevel);
@@ -1876,11 +1876,11 @@
     /* ostream printing routine */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n", td->cxxTypeDefInfo->className);
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n", td->cxxTypeDefInfo->className);
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        /*    fprintf (src, "  os << \"{\" << endl;\n") */
+        /*    fprintf (src, "  os << \"{\" << std::endl;\n") */
         fprintf (src, "  switch (choiceId)\n");
         fprintf (src, "  {\n");
         FOR_EACH_LIST_ELMT (e, choice->basicType->a.choice)
@@ -1909,7 +1909,7 @@
         }
         fprintf (src, "  } // end of switch\n");
 
-        /*    fprintf (src, "  os << \"}\" << endl;\n") */
+        /*    fprintf (src, "  os << \"}\" << std::endl;\n") */
         fprintf (src, "} // %s::Print\n\n", td->cxxTypeDefInfo->className);
     }
     /* end of Print Method code */
@@ -2260,7 +2260,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -2310,7 +2310,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -2460,7 +2460,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2638,7 +2638,7 @@
                             }
 
                             fprintf (src, "    {\n");
-                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "       longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "    }\n\n");
                             fprintf (src, "    elmtLen%d = BDecLen (b, seqBytesDecoded, env);\n", ++elmtLevel);
@@ -2826,7 +2826,7 @@
                     fprintf (src, "  }\n"); /* end of tag check if */
                     fprintf (src, "  else\n");
                     fprintf (src, "  {\n");
-                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << endl;\n");
+                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << std::endl;\n");
                     fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
                     fprintf (src, "  }\n\n");
                 }
@@ -2845,7 +2845,7 @@
             fprintf (src, "  }\n");
             fprintf (src, "  else if (seqBytesDecoded != elmtLen0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << endl;\n");
+            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << std::endl;\n");
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
             fprintf (src, "  else\n");
@@ -2914,7 +2914,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2939,14 +2939,14 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (seq->basicType->a.sequence);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
-        fprintf (src, "  os << \"{ -- SEQUENCE --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SEQUENCE --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, seq->basicType->a.sequence)
@@ -2963,12 +2963,12 @@
                 if (e != FIRST_LIST_ELMT (seq->basicType->a.sequence))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -2982,10 +2982,10 @@
 
 #ifdef KHO
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence)&&(!e->type->cxxTypeRefInfo->isPtr) )
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #else
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence) && !inTailOptElmts && !NextIsTailOptional (seq->basicType->a.sequence))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #endif
 
 	    fprintf (src, "  }\n");
@@ -3000,9 +3000,9 @@
                   fprintf (src, "    os << \"%s \";\n", e->fieldName);
 		fprintf (src, "    os << \"-- void --\";\n");
     		if (e != LAST_LIST_ELMT (seq->basicType->a.sequence))
-                   fprintf (src, "    os << \",\" << endl;\n");
+                   fprintf (src, "    os << \",\" << std::endl;\n");
                 else
-                   fprintf (src, "    os << endl;\n");
+                   fprintf (src, "    os << std::endl;\n");
 		fprintf (src, "  }\n");
 #else
 		fprintf (src, "    os << \"-- void --\";\n");
@@ -3012,7 +3012,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (seq->basicType->a.sequence))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
 
         fprintf (src, "  indentG -= stdIndentG;\n");
@@ -3361,7 +3361,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -3411,7 +3411,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -3557,7 +3557,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3697,7 +3697,7 @@
                             }
 
                             fprintf (src, "        {\n");
-                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "           longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "        }\n\n");
 
@@ -3814,14 +3814,14 @@
                 FreeTags (tags);
             } /* for each elmt */
             fprintf (src, "       default:\n");
-            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << endl;\n");
+            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << std::endl;\n");
             fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    } // end switch\n");
             fprintf (src, "  } // end for loop\n");
             fprintf (src, "  bytesDecoded += setBytesDecoded;\n");
             fprintf (src, "  if (mandatoryElmtsDecoded != %d)\n", mandatoryElmtCount);
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3889,7 +3889,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3914,15 +3914,15 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n");
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (set->basicType->a.set);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
 
-        fprintf (src, "  os << \"{ -- SET --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SET --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, set->basicType->a.set)
@@ -3939,12 +3939,12 @@
                 if (e != FIRST_LIST_ELMT (set->basicType->a.set))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -3957,7 +3957,7 @@
                 fprintf (src, "    os << %s;\n", e->type->cxxTypeRefInfo->fieldName);
 
             if (e != LAST_LIST_ELMT (set->basicType->a.set) && !inTailOptElmts && !NextIsTailOptional (set->basicType->a.set))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 
 	    fprintf (src, "  }\n");
 
@@ -3974,7 +3974,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (set->basicType->a.set))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
         fprintf (src, "  indentG -= stdIndentG;\n");
         fprintf (src, "  Indent (os, indentG);\n");
@@ -4294,7 +4294,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -4324,7 +4324,7 @@
     fprintf (hdr, "  PDU_MEMBER_MACROS\n");
 
     if (printPrintersG)
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
     fprintf (hdr, "};\n\n\n");
 
@@ -4380,7 +4380,7 @@
         }
         fprintf (src, "))\n");
         fprintf (src, "        {\n");
-        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
         fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "        }\n\n");
         fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4406,7 +4406,7 @@
                 fprintf (src, "))\n");
 
             fprintf (src, "        {\n");
-            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
             fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "        }\n\n");
             fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4461,7 +4461,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -4494,7 +4494,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -4506,9 +4506,9 @@
 
     if (printPrintersG)
     {
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << endl;\n");
+        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << std::endl;\n");
         fprintf (src, "    indentG += stdIndentG;\n");
 
         fprintf (src, "    //SetCurrToFirst();\n");
@@ -4521,7 +4521,7 @@
         fprintf (src, "        //if (Curr() != Last())\n");
         fprintf (src, "        if (run != last)\n");
         fprintf (src, "            os << \",\";\n");
-        fprintf (src, "        os << endl;\n");
+        fprintf (src, "        os << std::endl;\n");
         fprintf (src, "    }\n");
 
         fprintf (src, "    indentG -= stdIndentG;\n");
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c	2001-01-27 01:02:52.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c	2005-07-30 19:22:04.488877784 +0000
@@ -33,6 +33,7 @@
  */
 
 #include <stdio.h>
+#include <time.h>
 
 #include "asn-incl.h"
 #include "asn1module.h"
diff -uraN snacc-1.3bbn.orig/compiler/core/parse-asn1.y snacc-1.3bbn/compiler/core/parse-asn1.y
--- snacc-1.3bbn.orig/compiler/core/parse-asn1.y	2001-01-27 01:02:47.000000000 +0000
+++ snacc-1.3bbn/compiler/core/parse-asn1.y	2005-07-30 17:29:02.838828848 +0000
@@ -456,6 +456,7 @@
 /*-----------------------------------------------------------------------*/
 
 LineNo: { $$ = myLineNoG; }
+;
 
 ModuleDefinition:
      ModuleIdentifier
@@ -1462,6 +1463,7 @@
         $$->choiceId = SUBTYPEVALUE_SINGLEVALUE;
         $$->a.singleValue = $1;
     }
+;
 
 ContainedSubtype:
     INCLUDES_SYM Type

snacc-ttab-tex-UTF8-fix.patch:
 ttab.tex |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-ttab-tex-UTF8-fix.patch ---
diff -up ./doc/ttab.tex.texfix ./doc/ttab.tex
--- ./doc/ttab.tex.texfix	2009-09-09 10:30:25.597509928 +0530
+++ ./doc/ttab.tex	2009-09-09 10:30:54.173509922 +0530
@@ -18,7 +18,7 @@ size of your type tables, put the only u
 your ASN.1 module and compile it without using the useful types
 module.
 
-A generic buffer type (? la ISODE and XDR) was defined to allow type
+A generic buffer type (ISODE and XDR) was defined to allow type
 table driven routines to read from a wide variety of buffer formats.
 Currently slightly modified versions of the {\C ExpBuf} and the
 {\C SBuf} are provided.  It shouldn't be too hard for you to add


--- NEW FILE snacc.spec ---
Name:           snacc
Version:        1.3
Release:        4%{?dist}
Summary:        Sample Neufeld ASN.1 to C Compiler

Group:          Applications/System
License:        GPLv2+
URL:            http://packages.debian.org/source/sid/snacc
Source0:        http://ftp.de.debian.org/debian/pool/main/s/snacc/%{name}_%{version}bbn.orig.tar.gz
Patch0:         snacc-bts-442873.patch
Patch1:         snacc-configure.patch
Patch2:         snacc-examples.patch
Patch3:         snacc-gcc.patch
Patch4:         snacc-ttab-tex-UTF8-fix.patch

BUILDROOT:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake17 libtool flex bison

%description
Snacc is Sample Neufeld ASN.1 to C compiler that can produce C, C++ routines
or type tables for BER encoding, decoding, printing and freeing.

%package devel
Summary:        Header files for snacc development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release} 

%description devel
The %{name}-devel package contains the header files
for snacc development.

%prep
%setup -qn %{name}-%{version}bbn.orig
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%{__mkdir} -p c-lib/Cebuf c-lib/ebuf c-lib/mbuf c-lib/sbuf c-lib/tbl c++-lib/c++

# ---- Build ----
# configure without tcl for libtool to use -DMETA=0

%build
AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 autoreconf -fi
%configure
%{__make}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.a`
%{__rm} -f `find %{buildroot} -name *.la`

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING doc/snacc-a5.ps
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/asn1
%{_bindir}/%{name}
%{_bindir}/berdecode
%{_bindir}/mkchdr
%{_bindir}/ptbl
%{_bindir}/pval
%{_mandir}/man1/mkchdr.1.gz
%{_mandir}/man1/ptbl.1.gz
%{_mandir}/man1/pval.1.gz
%{_mandir}/man1/snacc.1.gz
%{_mandir}/man1/snacced.1.gz
%{_mandir}/mann/snacc.n.gz
%{_libdir}/libasn1c++.so.0.0.0
%{_libdir}/libasn1cCebuf.so.0.0.0
%{_libdir}/libasn1cebuf.so.0.0.0
%{_libdir}/libasn1cmbuf.so.0.0.0
%{_libdir}/libasn1csbuf.so.0.0.0
%{_libdir}/libasn1ctbl.so.0.0.0
%{_libdir}/libasn1c++.so.0
%{_libdir}/libasn1cCebuf.so.0
%{_libdir}/libasn1cebuf.so.0
%{_libdir}/libasn1cmbuf.so.0
%{_libdir}/libasn1csbuf.so.0
%{_libdir}/libasn1ctbl.so.0

%files devel
%defattr(-,root,root,-)
%doc c-examples/ c++-examples/
%{_bindir}/snacc-config
%{_datadir}/aclocal/snacc.m4
%{_includedir}/%{name}/c
%{_includedir}/%{name}/c++
%{_libdir}/libasn1c++.so
%{_libdir}/libasn1cCebuf.so
%{_libdir}/libasn1cebuf.so
%{_libdir}/libasn1cmbuf.so
%{_libdir}/libasn1csbuf.so
%{_libdir}/libasn1ctbl.so

%changelog
* Sat Sep 26 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-4
- Removed --without-tcl as it doesn not affect configure.
- snacc-configure.patch will not build c++-lib/tcl/Makefile as tcl is not
  required. 

* Thu Sep 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-3
- Removed -libs package, and moved them to -base package.
- s/sample/Sample in package description.
- Directory ownership in base package for includedir/name.
- snacc.m4 moved to -devel package.
- Patch names start with snacc-.
- Removed .tex and .bib files as .ps is already shipped.

* Wed Sep 23 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-2
- Fixed spelling mistake s/dample/sample.
- Added {c, c++}-examples to devel package.
- Moved *.asn1 files to base package.
- Created separate libs package.
- Call ldconfig for post, postun for libs package.

* Mon Sep 21 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-1
- First snacc package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:57:08 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:54:01 -0000	1.2
@@ -0,0 +1 @@
+snacc_1.3bbn.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:57:09 -0000	1.1
+++ sources	30 Sep 2009 03:54:02 -0000	1.2
@@ -0,0 +1 @@
+24c969e2673f1713d5d995d2f9e64781  snacc_1.3bbn.orig.tar.gz



From bernie at fedoraproject.org  Wed Sep 30 03:54:04 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Wed, 30 Sep 2009 03:54:04 +0000 (UTC)
Subject: rpms/etckeeper/F-12 etckeeper.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930035404.9AB6211C00C1@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/etckeeper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2596/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	etckeeper.spec import.log 
Log Message:
Initial import.



--- NEW FILE etckeeper.spec ---
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")

Name:      etckeeper
Version:   0.41
Release:   1%{?dist}
Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
Group:     Applications/System
License:   GPLv2+
URL:       http://kitenet.net/~joey/code/etckeeper/
Source0:   http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  git >= 1.6

%description
The etckeeper program is a tool to let /etc be stored in a git,
mercurial, bzr or darcs repository. It hooks into yum to automatically
commit changes made to /etc during package upgrades. It tracks file
metadata that version control systems do not normally support, but that
is important for /etc, such as the permissions of /etc/shadow. It's
quite modular and configurable, while also being simple to use if you
understand the basics of working with version control.

The default backend is git, if want to use a another backend please
install the appropriate tool (mercurial, darcs or bzr).
To use bzr as backend, please also install the %{name}-bzr package.

To start using the package please read %{_docdir}/%{name}-%{version}/README

%package bzr
Summary:  Support for bzr with etckeeper
Group:    Applications/System
Requires: %{name} = %{version}-%{release} bzr
BuildRequires: bzr
BuildRequires: python-devel

%description bzr
This package provides a bzr backend for etckeeper, if you want to use
etckeeper with bzr backend, install this package.

%prep
%setup -q -n %{name}
%{__perl} -pi -e '
    s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|;
    s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|;
    ' etckeeper.conf
%{__sed} -i -e '1d' yum-etckeeper.py 

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
%{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name}
%{__install} -d  %{buildroot}%{_localstatedir}/cache/%{name}
%{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py

%clean
rm -rf %{buildroot}

# Users must study the README anyway.
#post
#{_sbindir}/%{name} init -d /etc/

%files
%defattr(-, root, root, -)
%doc GPL INSTALL TODO README
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/*.d
%{_sysconfdir}/%{name}/*.d/
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}
%dir %{_sysconfdir}/bash_completion.d
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
%dir %{_prefix}/lib/yum-plugins
%{_prefix}/lib/yum-plugins/%{name}.*
%dir %{_sysconfdir}/yum/pluginconf.d
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
%{_localstatedir}/cache/%{name}

%files bzr
%defattr(-, root, root, -)
%doc GPL
%{python_sitelib}/bzrlib/plugins/%{name}
%{python_sitelib}/bzr_%{name}-*.egg-info

%changelog
* Sat Sep 12 2009 Bernie Innocenti <bernie at codewiz.org> - 0.41-1
- Updatte to 0.41
- Add missing directory ownerships

* Sat Sep 12 2009 Bernie Innocenti <bernie at codewiz.org> - 0.40-3
- Make the bzr subpackage builddepend on python-devel

* Wed Sep 09 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.40-2
- Package is noarch
- Rpmlint clean
- Random cleanup
- Ship cache dir in package
- bzr subpackage
- Add bzr to buildreq

* Sat Sep 05 2009 Bernie Innocenti <bernie at codewiz.org> - 0.40-1
- Update to 0.40

* Sun Jun 14 2009 Bernie Innocenti <bernie at codewiz.org> - 0.37-1
- Update to 0.37
- Change license tag to GPLv2+

* Fri Feb 27 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.33-4
- fix up initial install to make directory in /var/cache/etckeeper
- install the etckeeper daily cron job
- define some config files that shouldn't be replaced, should the hooks
in commit.d, init.d etc... saved and not blown away? if so they can
defined as config files. etckeeper should record the changes anyway.

* Wed Feb 25 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.32-1
- yum etckeeper plugin is now apart of this package

* Tue Feb 24 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.31-1
- initial package


--- NEW FILE import.log ---
etckeeper-0_41-1_fc12:F-12:etckeeper-0.41-1.fc12.src.rpm:1254282824


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etckeeper/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:15:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:54:04 -0000	1.2
@@ -0,0 +1 @@
+etckeeper_0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etckeeper/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:15:12 -0000	1.1
+++ sources	30 Sep 2009 03:54:04 -0000	1.2
@@ -0,0 +1 @@
+d8929c79fcab4f3e57d7ebb03f20df63  etckeeper_0.41.tar.gz



From shakthimaan at fedoraproject.org  Wed Sep 30 03:58:08 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 03:58:08 +0000 (UTC)
Subject: rpms/snacc/F-12 import.log, NONE, 1.1 snacc-bts-442873.patch, NONE, 
	1.1 snacc-configure.patch, NONE, 1.1 snacc-examples.patch, NONE,
	1.1 snacc-gcc.patch, NONE, 1.1 snacc-ttab-tex-UTF8-fix.patch,
	NONE, 1.1 snacc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930035808.78BE611C00C1@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/snacc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4062/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snacc-bts-442873.patch snacc-configure.patch 
	snacc-examples.patch snacc-gcc.patch 
	snacc-ttab-tex-UTF8-fix.patch snacc.spec 
Log Message:
First snacc package.



--- NEW FILE import.log ---
snacc-1_3-4_fc11:F-12:snacc-1.3-4.fc11.src.rpm:1254283407

snacc-bts-442873.patch:
 snacc-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-bts-442873.patch ---
diff -uraN snacc-1.3bbn.orig/snacc-config.in snacc-1.3bbn/snacc-config.in
--- snacc-1.3bbn.orig/snacc-config.in	2001-01-27 02:02:40.000000000 +0100
+++ snacc-1.3bbn/snacc-config.in	2008-04-16 01:19:43.153755670 +0200
@@ -95,7 +95,7 @@
     if test $exec_prefix != /usr; then echo -n "-L${exec_prefix}/lib "; fi
     case "$language" in
     C)   echo -n "-lasn1c${buffertype} " ;;
-    C++) echo -n "-Iasn1c++ " ;;
+    C++) echo -n "-lasn1c++ " ;;
     *) ;;
     esac
   else

snacc-configure.patch:
 configure.ac |  313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  305 ---------------------------------------------------------
 2 files changed, 313 insertions(+), 305 deletions(-)

--- NEW FILE snacc-configure.patch ---
diff -uraN snacc-1.3bbn/configure.ac snacc-1.3bbn-debian/configure.ac
--- snacc-1.3bbn/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3bbn-debian/configure.ac	2005-07-30 17:20:35.043753552 +0000
@@ -0,0 +1,313 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl ---
+dnl	$Log: configure.ac,v $
+dnl	Revision 1.3  2002/11/19 20:28:12  debacle
+dnl	libtool changes.
+dnl	
+dnl	Revision 1.2  2002/11/19 19:37:38  debacle
+dnl	Auto-tools stuff.
+dnl	
+dnl	Revision 1.1  2002/11/19 19:18:04  debacle
+dnl	New autoconf.
+dnl	
+dnl	Revision 1.13  1997/09/04 13:54:04  wan
+dnl	A little more portability
+dnl
+dnl	Revision 1.12  1997/02/28 13:39:35  wan
+dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
+dnl
+dnl	Revision 1.11  1997/02/16 16:50:27  rj
+dnl	made return *this after calling abort()'' a compile time option.
+dnl
+dnl	Revision 1.10  1997/02/15 20:06:27  rj
+dnl	adjust to changed AC_TRY_COMPILE macro
+dnl
+dnl	Revision 1.9  1997/02/15 20:01:38  rj
+dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
+dnl
+dnl	Revision 1.8  1997/01/01 19:57:01  rj
+dnl	changes for autoconf version 2.12
+dnl
+dnl	Revision 1.7  1995/09/07  18:36:47  rj
+dnl	psbook and psnup are looked for (used by .../doc/makefile)
+dnl
+dnl	Revision 1.6  1995/07/24  14:44:47  rj
+dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
+dnl
+dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
+dnl
+dnl	look for patch(1). the c-lib uses it to patch tbl.h.
+dnl
+dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
+dnl
+dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
+dnl
+dnl	Revision 1.5  1995/02/20  11:18:41  rj
+dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
+dnl	check for isinf(3) and finite(3) added.
+dnl
+dnl	Revision 1.4  1995/02/17  15:15:44  rj
+dnl	hack to let makedepend find .h files the way gcc does.
+dnl
+dnl	Revision 1.3  1995/02/17  14:26:40  rj
+dnl	adjustments for autoconf 2.x
+dnl
+dnl	Revision 1.2  1994/10/08  04:29:37  rj
+dnl	search for Tcl/Tk
+dnl
+dnl	Revision 1.1  1994/09/01  00:51:22  rj
+dnl	first check-in (new file).
+dnl
+AC_INIT( compiler/core/snacc.c)
+AC_REVISION($Revision: 1.3 $)
+AM_INIT_AUTOMAKE(snacc, 1.3)
+AM_CONFIG_HEADER( config.h)
+dnl --- alternative programs:
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_ISC_POSIX
+dnl if CDPATH is set, the configure script might fail
+unset CDPATH
+dnl if test -n "$GCC"; then
+dnl   saveCC="$CC"
+dnl   CC="$CC -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
+dnl fi
+AC_PROG_GCC_TRADITIONAL
+AC_MSG_CHECKING( whether ANSI or K&R style C)
+AC_TRY_COMPILE([ ], [void *p; p = "test";], [
+AC_MSG_RESULT(ANSI)
+AC_DEFINE( __USE_ANSI_C__)
+], [
+AC_MSG_RESULT(K&R)
+])
+AC_PROG_CXX
+AC_LANG_CPLUSPLUS
+dnl if test -n "$GCC"; then
+dnl   saveCXX="$CXX"
+dnl   CXX="$CXX -pipe"
+dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
+dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
+dnl fi
+AC_MSG_CHECKING( for bool built-in)
+AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for variable sized automatic arrays)
+AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
+AC_MSG_CHECKING( for volatile functions)
+AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
+AC_LANG_C
+AM_PROG_LEX
+case "$LEX" in
+  lex)
+    LFLAGS="-Nc10000"
+  ;;
+  flex)
+    CFLAGS="$CFLAGS -DFLEX_IN_USE"
+esac
+AC_SUBST( LFLAGS)
+AC_SUBST( CFLAGS)
+# the boot strapping code in .../c-lib/ needs patch:
+AC_CHECK_PROGS( PATCH, patch, false)
+AC_PROG_YACC
+AC_PROG_LN_S
+AC_PROG_INSTALL
+dnl --- header files:
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_HEADER_STDC
+AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
+AC_FUNC_VPRINTF
+dnl --- system and compiler characteristics:
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_LIB( m, sin)
+AC_CHECK_FUNCS( isinf finite)
+AC_CHECK_FUNCS( memset memcpy memcmp)
+dnl ---
+AC_PATH_X
+AC_PATH_XTRA
+AC_CHECK_PROGS( TCLSH, tclsh, false)
+if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
+  AC_CHECK_HEADER(
+    tcl.h,
+    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
+    AC_CHECK_LIB(
+      tcl,
+      Tcl_CreateInterp,
+      [saveCFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS $X_CFLAGS"
+      AC_CHECK_LIB(
+	tk,
+	Tk_CreateWindow,
+	[AC_DEFINE( HAVE_TCL)
+	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
+	CXXTCLDIR="tcl"
+	TCLDIRS="tcl-lib tcl-asn tcl-example"
+	AC_LANG_CPLUSPLUS
+	AC_CHECK_LIB(
+	  TkTree,
+	  Tree_Init,
+	  [TREELIBS="-lTkTree"],
+	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
+	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+	AC_LANG_C],
+	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
+	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
+      CFLAGS="$saveCFLAGS"],
+      [AC_MSG_RESULT( [tcl library not found])],
+      $TCLOTHERLIBS -lm)])
+fi
+AC_SUBST( CXXTCLDIR)
+AC_SUBST( TCLDIRS)
+AC_SUBST( TCLLIBS)
+AC_SUBST( TREELIBS)
+dnl ---
+AC_CHECK_PROGS( LATEX, latex, false)
+AC_CHECK_PROGS( BIBTEX, bibtex, false)
+AC_CHECK_PROGS( DVIPS, dvips, false)
+AC_CHECK_PROGS( DETEX, detex2 detex, false)
+AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
+AC_CHECK_PROGS( PSBOOK, psbook, false)
+AC_CHECK_PROGS( PSNUP, psnup, false)
+AC_CHECK_PROGS( SPELL, ispell spell, spell)
+dnl ---
+
+dnl Configure for libtool.
+AC_PROG_LIBTOOL
+
+dnl Generate the C library build directories.
+linked_files=`cd c-lib/src && ls *.c`
+for dir in Cebuf ebuf mbuf sbuf tbl; do
+  if test -d c-lib/$dir; then :; else
+    echo creating c-lib/$dir
+    mkdir c-lib/$dir
+  fi
+  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
+  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
+  case $dir in
+  Cebuf) 
+    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
+    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
+    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
+    ;;
+  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
+  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
+  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
+  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
+  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
+done
+
+dnl Generate the C++ and Tcl library build directories.
+linked_files=`cd c++-lib/src && ls *.c *.C`
+for dir in c++ tcl; do
+  if test -d c++-lib/$dir; then :; else
+    echo creating c++-lib/$dir
+    mkdir c++-lib/$dir
+  fi
+  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
+  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
+  case $dir in
+  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
+  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
+  esac
+  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
+  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
+done  
+
+dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
+dnl from glib-1.2.1's configure.in.  See that file for an explanation.
+AC_OUTPUT_COMMANDS([
+          
+## Generate `snaccconfig.h' in two 
+## cases:
+## 1. `config.status' is run either explicitly, or via configure.
+##     Esp. not when it is run in `Makefile' to generate makefiles and
+##     config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult.  We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+case "x$CONFIG_OTHER" in
+*snaccconfig.h) gen_snaccconfig_h=yes
+;;
+esac
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+  if test "x${CONFIG_OTHER}" = x; then
+    gen_snaccconfig_h=yes
+  fi
+fi
+
+## If we're generating snaccconfig.h:
+## FIXME - currently, snaccconfig.h is just the normal
+## config.h wrapped.  this is because the user include
+## files use the normal config.h symbol names, and I 
+## haven't changed those yet.
+if test "x$gen_snaccconfig_h" = xyes; then
+  outfile=snaccconfig.h
+  echo creating $outfile
+  cat <<SNACCEOF > ${outfile}-tmp
+/* snaccconfig.h
+ * 
+ * This is an automatically generated file - please modify 'configure.in'.
+ */
+
+#ifndef _SNACCCONFIG_H
+#define _SNACCCONFIG_H
+
+SNACCEOF
+  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
+  cat <<SNACCEOF >> ${outfile}-tmp
+
+#endif /* !_SNACCCONFIG_H */
+SNACCEOF
+  if cmp -s ${outfile}-tmp $outfile; then
+    echo $outfile is unchanged
+    rm -f ${outfile}-tmp
+  else
+    mv ${outfile}-tmp ${outfile}
+  fi
+fi
+])
+
+dnl Writes files.
+AC_OUTPUT(Makefile
+          compiler/Makefile
+          compiler/back-ends/c++-gen/Makefile
+          compiler/back-ends/c-gen/Makefile
+          compiler/back-ends/idl-gen/Makefile
+          compiler/back-ends/Makefile
+          compiler/core/Makefile
+	  c-lib/Makefile
+	  c-lib/inc/Makefile
+	  c-lib/src/Makefile
+	  c-lib/Cebuf/Makefile
+	  c-lib/ebuf/Makefile
+	  c-lib/mbuf/Makefile
+	  c-lib/sbuf/Makefile
+	  c-lib/tbl/Makefile
+	  c++-lib/Makefile
+	  c++-lib/inc/Makefile
+	  c++-lib/src/Makefile
+	  c++-lib/c++/Makefile
+          asn1specs/Makefile
+          tbl-tools/berdecode/Makefile
+          tbl-tools/mkchdr/Makefile
+          tbl-tools/ptbl/Makefile
+          tbl-tools/pval/Makefile
+          tbl-tools/Makefile
+          doc/Makefile
+          snacc-config,
+[if test -f snacc-config; then chmod +x snacc-config; fi])
+dnl --- finis
diff -uraN snacc-1.3bbn/configure.in snacc-1.3bbn-debian/configure.in
--- snacc-1.3bbn/configure.in	2005-07-30 20:06:02.703761472 +0000
+++ snacc-1.3bbn-debian/configure.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl ---
-dnl	$Log: configure.in,v $
-dnl	Revision 1.13  1997/09/04 13:54:04  wan
-dnl	A little more portability
-dnl
-dnl	Revision 1.12  1997/02/28 13:39:35  wan
-dnl	Modifications collected for new version 1.3: Bug fixes, tk4.2.
-dnl
-dnl	Revision 1.11  1997/02/16 16:50:27  rj
-dnl	made return *this after calling abort()'' a compile time option.
-dnl
-dnl	Revision 1.10  1997/02/15 20:06:27  rj
-dnl	adjust to changed AC_TRY_COMPILE macro
-dnl
-dnl	Revision 1.9  1997/02/15 20:01:38  rj
-dnl	check whether the compiler supports volatile functions (and whether abort() is volatile).
-dnl
-dnl	Revision 1.8  1997/01/01 19:57:01  rj
-dnl	changes for autoconf version 2.12
-dnl
-dnl	Revision 1.7  1995/09/07  18:36:47  rj
-dnl	psbook and psnup are looked for (used by .../doc/makefile)
-dnl
-dnl	Revision 1.6  1995/07/24  14:44:47  rj
-dnl	don't use gcc/g++ with -pipe, compiling some files may exceed virtual memory.
-dnl
-dnl	look for tclsh(1). tcl-lib uses it to construct the tclIndex file. don't look for Tcl/Tk if the tclsh is absent.
-dnl
-dnl	look for patch(1). the c-lib uses it to patch tbl.h.
-dnl
-dnl	search for tree-3.6's libtktree.a and set TREELIBS in .../makehead accordingly.
-dnl
-dnl	check for memset(3), memcpy(3) and memcmp(3). .../snacc.h reverts to bzero(3), bcopy(3) and bcmp(3) if necessary.
-dnl
-dnl	Revision 1.5  1995/02/20  11:18:41  rj
-dnl	cpp switch HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS added.
-dnl	check for isinf(3) and finite(3) added.
-dnl
-dnl	Revision 1.4  1995/02/17  15:15:44  rj
-dnl	hack to let makedepend find .h files the way gcc does.
-dnl
-dnl	Revision 1.3  1995/02/17  14:26:40  rj
-dnl	adjustments for autoconf 2.x
-dnl
-dnl	Revision 1.2  1994/10/08  04:29:37  rj
-dnl	search for Tcl/Tk
-dnl
-dnl	Revision 1.1  1994/09/01  00:51:22  rj
-dnl	first check-in (new file).
-dnl
-AC_INIT( compiler/core/snacc.c)
-AC_REVISION($Revision: 1.13 $)
-AM_INIT_AUTOMAKE(snacc, 1.3)
-AM_CONFIG_HEADER( config.h)
-dnl --- alternative programs:
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_ISC_POSIX
-if test -n "$GCC"; then
-dnl   saveCC="$CC"
-dnl   CC="$CC -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCC takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no); CC="$saveCC"])
-fi
-AC_PROG_GCC_TRADITIONAL
-AC_MSG_CHECKING( whether ANSI or K&R style C)
-AC_TRY_COMPILE([ ], [void *p; p = "test";], [
-AC_MSG_RESULT(ANSI)
-AC_DEFINE( __USE_ANSI_C__)
-], [
-AC_MSG_RESULT(K&R)
-])
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-dnl if test -n "$GCC"; then
-dnl   saveCXX="$CXX"
-dnl   CXX="$CXX -pipe"
-dnl   AC_MSG_CHECKING( whether $saveCXX takes -pipe)
-dnl   AC_TRY_LINK( , , [AC_MSG_RESULT( yes)], [AC_MSG_RESULT( no);CC="$saveCC"])
-dnl fi
-AC_MSG_CHECKING( for bool built-in)
-AC_TRY_COMPILE( , bool b = false;, [AC_DEFINE( BOOL_BUILTIN) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for variable sized automatic arrays)
-AC_TRY_COMPILE( , changequote(<,>)int i = 42; char a[++i]; *a = i;changequote([,]), [AC_DEFINE( HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS) AC_MSG_RESULT( yes)], AC_MSG_RESULT( no))
-AC_MSG_CHECKING( for volatile functions)
-AC_TRY_COMPILE( , changequote(<,>)abort();changequote([,]), [AC_MSG_RESULT( yes)], [AC_DEFINE( COMPILER_WITHOUT_VOLATILE_FUNCTIONS) SNACC_NOVOLAT=-novolat; AC_SUBST( SNACC_NOVOLAT) AC_MSG_RESULT( no)])
-AC_LANG_C
-AM_PROG_LEX
-case "$LEX" in
-  lex)
-    LFLAGS="-Nc10000"
-  ;;
-  flex)
-    CFLAGS="$CFLAGS -DFLEX_IN_USE"
-esac
-AC_SUBST( LFLAGS)
-AC_SUBST( CFLAGS)
-# the boot strapping code in .../c-lib/ needs patch:
-AC_CHECK_PROGS( PATCH, patch, false)
-AC_PROG_YACC
-AC_PROG_LN_S
-AC_PROG_INSTALL
-dnl --- header files:
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_HEADER_STDC
-AC_CHECK_HEADERS( unistd.h memory.h string.h malloc.h fcntl.h)
-AC_FUNC_VPRINTF
-dnl --- system and compiler characteristics:
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_LIB( m, sin)
-AC_CHECK_FUNCS( isinf finite)
-AC_CHECK_FUNCS( memset memcpy memcmp)
-dnl ---
-AC_PATH_X
-AC_PATH_XTRA
-AC_CHECK_PROGS( TCLSH, tclsh, false)
-if test "$TCLSH" != false && test "x$no_x" != "xyes"; then
-  AC_CHECK_HEADER(
-    tcl.h,
-    [AC_CHECK_LIB( ld, ldopen, TCLOTHERLIBS=-lld)
-    AC_CHECK_LIB(
-      tcl,
-      Tcl_CreateInterp,
-      [saveCFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $X_CFLAGS"
-      AC_CHECK_LIB(
-	tk,
-	Tk_CreateWindow,
-	[AC_DEFINE( HAVE_TCL)
-	TCLLIBS="-ltk -ltcl $TCLOTHERLIBS"
-	CXXTCLDIR="tcl"
-	TCLDIRS="tcl-lib tcl-asn tcl-example"
-	AC_LANG_CPLUSPLUS
-	AC_CHECK_LIB(
-	  TkTree,
-	  Tree_Init,
-	  [TREELIBS="-lTkTree"],
-	  [AC_MSG_RESULT( [tcl/tk libs found, but tree widget is missing])],
-	  -lTkTree -ltk -ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-	AC_LANG_C],
-	[AC_MSG_RESULT( [tcl lib found, but tk lib is missing])],
-	-ltcl $TCLOTHERLIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
-      CFLAGS="$saveCFLAGS"],
-      [AC_MSG_RESULT( [tcl library not found])],
-      $TCLOTHERLIBS -lm)])
-fi
-AC_SUBST( CXXTCLDIR)
-AC_SUBST( TCLDIRS)
-AC_SUBST( TCLLIBS)
-AC_SUBST( TREELIBS)
-dnl ---
-AC_CHECK_PROGS( LATEX, latex, false)
-AC_CHECK_PROGS( BIBTEX, bibtex, false)
-AC_CHECK_PROGS( DVIPS, dvips, false)
-AC_CHECK_PROGS( DETEX, detex2 detex, false)
-AC_CHECK_PROGS( PSPREVIEW, ghostview gs, true)
-AC_CHECK_PROGS( PSBOOK, psbook, false)
-AC_CHECK_PROGS( PSNUP, psnup, false)
-AC_CHECK_PROGS( SPELL, ispell spell, spell)
-dnl ---
-
-dnl Configure for libtool.
-AM_PROG_LIBTOOL
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
-AC_SUBST(LTLIBOBJS)
-
-dnl Generate the C library build directories.
-linked_files=`cd c-lib/src && ls *.c`
-for dir in Cebuf ebuf mbuf sbuf tbl; do
-  if test -d c-lib/$dir; then :; else
-    echo creating c-lib/$dir
-    mkdir c-lib/$dir
-  fi
-  (cd c-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c . )
-  sed_code="-e s/libasn1cbuf/libasn1c$dir/g"
-  case $dir in
-  Cebuf) 
-    (cd c-lib/$dir && rm -f asn-useful.c asn-useful.h tbl.c tbl.h && $LN_S ../boot/asn* ../boot/tbl* .)
-    sed_code="$sed_code -e s/^.*asn-useful\.c:/neverA:/ -e s/^.*tbl\.c:/neverB:/"
-    BUFFLAGS="-DCOMPILER -DUSE_NIBBLE_MEMORY=0 -DUSE_EXP_BUF -I\$(top_srcdir)/compiler/core"
-    ;;
-  ebuf) BUFFLAGS="-DUSE_EXP_BUF" ;;
-  mbuf) BUFFLAGS="-DUSE_MIN_BUF" ;;
-  sbuf) BUFFLAGS="-DUSE_SBUF" ;;
-  tbl) BUFFLAGS="-DUSE_GEN_BUF -DTTBL" ;;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c-lib/$dir/Makefile.in
-  eval sed $sed_code < c-lib/src/Makefile.in >> c-lib/$dir/Makefile.in
-done
-
-dnl Generate the C++ and Tcl library build directories.
-linked_files=`cd c++-lib/src && ls *.c *.C`
-for dir in c++ tcl; do
-  if test -d c++-lib/$dir; then :; else
-    echo creating c++-lib/$dir
-    mkdir c++-lib/$dir
-  fi
-  (cd c++-lib/$dir && touch Makefile.am && rm -f Makefile.in $linked_files && $LN_S ../src/*.c ../src/*.C .)
-  sed_code="-e s/libasn1cxxtcl/libasn1$dir/g"
-  case $dir in
-  c++) BUFFLAGS="-DMETA=0" sed_code="$sed_code -e s/noinst/lib/g";;
-  tcl) BUFFLAGS="-DTCL" sed_code="$sed_code -e s/noinst/lib/g";;
-  esac
-  echo "BUFFLAGS = $BUFFLAGS" >> c++-lib/$dir/Makefile.in
-  eval sed $sed_code < c++-lib/src/Makefile.in >> c++-lib/$dir/Makefile.in
-done  
-
-dnl Generate snaccconfig.h.  The whether-to-generate logic is cribbed
-dnl from glib-1.2.1's configure.in.  See that file for an explanation.
-AC_OUTPUT_COMMANDS([
-          
-## Generate `snaccconfig.h' in two 
-## cases:
-## 1. `config.status' is run either explicitly, or via configure.
-##     Esp. not when it is run in `Makefile' to generate makefiles and
-##     config.h
-## 2. CONFIG_OTHER is set explicitly
-##
-## Case 1 is difficult.  We know that `automake' sets one of
-## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
-## only when AM_CONFIG_HEADER is set, however.
-
-case "x$CONFIG_OTHER" in
-*snaccconfig.h) gen_snaccconfig_h=yes
-;;
-esac
-if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
-  # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
-  if test "x${CONFIG_OTHER}" = x; then
-    gen_snaccconfig_h=yes
-  fi
-fi
-
-## If we're generating snaccconfig.h:
-## FIXME - currently, snaccconfig.h is just the normal
-## config.h wrapped.  this is because the user include
-## files use the normal config.h symbol names, and I 
-## haven't changed those yet.
-if test "x$gen_snaccconfig_h" = xyes; then
-  outfile=snaccconfig.h
-  echo creating $outfile
-  cat <<SNACCEOF > ${outfile}-tmp
-/* snaccconfig.h
- * 
- * This is an automatically generated file - please modify 'configure.in'.
- */
-
-#ifndef _SNACCCONFIG_H
-#define _SNACCCONFIG_H
-
-SNACCEOF
-  egrep -v 'PACKAGE|VERSION' config.h >> ${outfile}-tmp
-  cat <<SNACCEOF >> ${outfile}-tmp
-
-#endif /* !_SNACCCONFIG_H */
-SNACCEOF
-  if cmp -s ${outfile}-tmp $outfile; then
-    echo $outfile is unchanged
-    rm -f ${outfile}-tmp
-  else
-    mv ${outfile}-tmp ${outfile}
-  fi
-fi
-])
-
-dnl Writes files.
-AC_OUTPUT(Makefile
-          compiler/Makefile
-          compiler/back-ends/c++-gen/Makefile
-          compiler/back-ends/c-gen/Makefile
-          compiler/back-ends/idl-gen/Makefile
-          compiler/back-ends/Makefile
-          compiler/core/Makefile
-	  c-lib/Makefile
-	  c-lib/inc/Makefile
-	  c-lib/src/Makefile
-	  c-lib/Cebuf/Makefile
-	  c-lib/ebuf/Makefile
-	  c-lib/mbuf/Makefile
-	  c-lib/sbuf/Makefile
-	  c-lib/tbl/Makefile
-	  c++-lib/Makefile
-	  c++-lib/inc/Makefile
-	  c++-lib/src/Makefile
-	  c++-lib/c++/Makefile
-	  c++-lib/tcl/Makefile
-          asn1specs/Makefile
-          tbl-tools/berdecode/Makefile
-          tbl-tools/mkchdr/Makefile
-          tbl-tools/ptbl/Makefile
-          tbl-tools/pval/Makefile
-          tbl-tools/Makefile
-          doc/Makefile
-          snacc-config,
-[if test -f snacc-config; then chmod +x snacc-config; fi])
-dnl --- finis

snacc-examples.patch:
 c++-examples/any/README            |   90 +++
 c++-examples/any/example.C         |  115 ++++
 c++-examples/any/genber.C          |  150 +++++
 c++-examples/any/makefile          |  154 ++++++
 c++-examples/makefile              |   34 +
 c++-examples/simple/README         |  105 ++++
 c++-examples/simple/example.C      |  115 ++++
 c++-examples/simple/genber.C       |   99 +++
 c++-examples/simple/good-pr.ber.uu |    7 
 c++-examples/simple/makefile       |  146 +++++
 c++-examples/snmp/README           |  126 ++++
 c++-examples/snmp/makefile         |  103 ++++
 c++-examples/test-lib/README       |   37 +
 c++-examples/test-lib/makefile     |   59 ++
 c++-examples/test-lib/test-lib.C   |  781 ++++++++++++++++++++++++++++++
 c-examples/any/README              |  107 ++++
 c-examples/any/example.c           |  161 ++++++
 c-examples/any/genber.c            |  164 ++++++
 c-examples/any/makefile            |  144 +++++
 c-examples/makefile                |   42 +
 c-examples/simple/README           |  128 +++++
 c-examples/simple/expbuf-ex.c      |  166 ++++++
 c-examples/simple/genber.c         |  154 ++++++
 c-examples/simple/good-pr.ber.uu   |    7 
 c-examples/simple/makefile         |  198 +++++++
 c-examples/simple/minbuf-ex.c      |  162 ++++++
 c-examples/simple/sbuf-ex.c        |  154 ++++++
 c-examples/snmp/README             |  118 ++++
 c-examples/snmp/makefile           |   91 +++
 c-examples/test-lib/README         |   37 +
 c-examples/test-lib/makefile       |   50 +
 c-examples/test-lib/test-lib.c     |  935 +++++++++++++++++++++++++++++++++++++
 tbl-example/README                 |   83 +++
 tbl-example/example.c              |  174 ++++++
 tbl-example/makefile               |   82 +++
 tbl-example/p-rec.ber.uu           |    7 
 36 files changed, 5285 insertions(+)

--- NEW FILE snacc-examples.patch ---
diff -uraN snacc-1.3bbn/c++-examples/any/README snacc-1.3b4/c++-examples/any/README
--- snacc-1.3bbn/c++-examples/any/README	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/README	1997-02-16 20:25:26.000000000 +0000
@@ -0,0 +1,90 @@
+(RCS control information is at the end of this file.)
+
+
+C++ ANY example README
+---------------------
+
+This example shows how the snacc compiler handles the ANY DEFINED BY
+type in C++.  ANY types (not ANY DEFINED BY) require modifications
+to the generated code.  Type "make" to build this example.
+
+This directory should have the following 4 files in it:
+
+        README
+        example.C
+        genber.C
+        makefile
+
+There are 3 programs generated by the makefile:
+
+        genber - builds a BER value of the AnyTestType and writes it
+                 to a file called "att.ber"
+
+        def    - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses definite
+                 lengths for constructed values.
+
+        indef  - takes file name of an AnyTestType BER value.  Decodes the
+                 file and re-encodes it to stdout.  Uses indefinite
+                 lengths for constructed values.
+
+
+These files use the code generated by snacc from the
+snacc/asn1specs/any.asn1 file. (see the makefile)
+
+Look at genber.C to see how values can be built and printed.
+
+Look at the generated code in any_test.C and any_test.h to see how the
+any hash table is built.
+
+
+try the following commands in your c-shell:
+
+%1 genber                   # generate the att.ber file
+%2 indef att.ber > tmp.ber  # decode att.ber an re-encode into tmp.ber
+%3 def tmp.ber > tmp2.ber   # decode tmp.ber an re-encode into tmp2.ber
+%4 diff att.ber tmp2.ber    # compare .ber files (should be the same)
+
+When you are finished with the example type "make clean"  to remove
+the binaries and generated code.
+
+
+
+Things To Note
+--------------
+
+Snacc ASN.1 comment commands
+
+In the snacc/asn1specs/any.asn1 file, the AnyTestType has a special
+"--snacc" ASN.1 comment after ::= to give snacc some extra information
+about the AnyTestType.
+
+AnyTestType ::= --snacc isPdu:"TRUE" -- SEQUENCE { ... etc. ... }
+
+The "isPdu" flag only affects the generated C code, not C++.  Each
+C++ type gets PDU methods by default.
+
+
+SNMP OBJECT-TYPE Macro
+
+The SNMP OBJECT-TYPE macro is used to define the id value to type
+mapping for ANY DEFINED BY types.  The macro has been modified to
+accept both INTEGERs and OBJECT IDENTIFIERs as id values (see
+snacc/asn1specs/any.asn1).  This macro can be used with other
+protocols to define the id to type mapping.
+
+Two hash tables are used to hold the id to type mappings. One for
+INTEGER to type mappings and the other for OBJECT IDENTIFIER to type
+mappings.  The hash tables are automatically initialized in each
+module that has OBJECT-TYPE macros.  In C the hash table must be
+explicitly initialized.
+
+#-------------------------------------------------------------------------------
+# $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/README,v 1.2 1997/02/16 20:25:26 rj Exp $
+# $Log: README,v $
+# Revision 1.2  1997/02/16 20:25:26  rj
+# check-in of a few cosmetic changes
+#
+# Revision 1.1  1994/08/31  08:47:59  rj
+# first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+#
diff -uraN snacc-1.3bbn/c++-examples/any/example.C snacc-1.3b4/c++-examples/any/example.C
--- snacc-1.3bbn/c++-examples/any/example.C	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/c++-examples/any/example.C	1995-07-24 15:33:33.000000000 +0000
@@ -0,0 +1,115 @@
+// c++_examples/any/example.C - an example of how to use C++ ASN.1-BER
+//              for ANY Types
+//
+// AUTHOR: Mike Sample
+// DATE:   92
+//
+// $Header: /usr/app/odstb/CVS/snacc/c++-examples/any/example.C,v 1.5 1995/07/24 15:33:33 rj Exp $
+// $Log: example.C,v $
+// Revision 1.5  1995/07/24 15:33:33  rj
+// changed `_' to `-' in file names.
+//
+// any-test.[hC] becomes any.[hC] due to to snacc's new file name generation scheme.
+//
+// check return value of new.
+//
+// Revision 1.4  1995/02/18  13:53:07  rj
+// added #define HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS since not every C++ compiler provides them.
+//
+// Revision 1.3  1994/10/08  01:26:21  rj
+// several \size_t'
+//
+// Revision 1.2  1994/08/31  08:56:29  rj
+// first check-in. for a list of changes to the snacc-1.1 distribution please refer to the ChangeLog.
+//
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fstream.h>
+
+#include "asn-incl.h"
+#include "any.h"
+
+main (int argc, char *argv[])
+{
+    if (argc != 2)
+    {
+        cerr << "Usage: " << argv[0] << " <BER data file name>" << endl;
+        cerr << "   Decodes the given AnyTestType BER data file" << endl;
+        cerr << "   and re-encodes it to stdout" << endl;
+        exit (1);
+    }
+
+    ifstream dataFile;
+    // open the data file
+    dataFile.open (argv[1]);
+
+    if (!dataFile)
+    {
+        perror ("ifstream::open");
+        exit (1);
+    }
+
+    // get size of the data file file
+    dataFile.seekg (0, ios::end);
+    int dataSize = dataFile.tellg();
+    dataFile.seekg (0);
+
+    // read data from file into contiguous block for a buffer
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char data[dataSize];
+#else
+    char *data = new char[dataSize];
+    if (!data)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    dataFile.read (data, dataSize);
+    dataFile.close();
+
+    //
+    // put the BER data read from the file
+    // into buffer format, ready for reading from the
+    // beginning
+    //
+    AsnBuf inputBuf;
+    inputBuf.InstallData ((char*)data, dataSize);
+
+    size_t decodedLen;
+    AnyTestType att;
+
+    if (!att.BDecPdu (inputBuf, decodedLen))
+    {
+        cerr << "ERROR - Decode routines failed, exiting..." << endl;
+        exit (1);
+    }
+
+    cerr  << "decodedValue AnyTestType ::= " << att << endl << endl;
+
+    //
+    // allocate a new buffer and set up for writing to
+    //
+    AsnBuf  outputBuf;
+#if HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS
+    char outputData[dataSize + 512];
+#else
+    char *outputData = new char[dataSize + 512];
+    if (!outputData)
+	return 1;
+#endif /* HAVE_VARIABLE_SIZED_AUTOMATIC_ARRAYS */
+    outputBuf.Init (outputData, dataSize+512);
+    outputBuf.ResetInWriteRvsMode();
[...5030 lines suppressed...]
+
+    if (argc != 3)
+    {
+        Usage (argv[0]);
+        return 1;
+    }
+
+    tblFileName = argv[1];
+    berFileName = argv[2];
+
+    /* init mem pool to hold  decoded val */
+    InitNibbleMem (1024, 1024);
+
+    /* read in and decode the type table */
+    tbl = LoadTblFile (tblFileName);
+    if (tbl == NULL)
+        return 1;
+
+    fileData = LoadFile (berFileName, &fsize);
+    if (fileData == NULL)
+        return 1;
+
+    SBufInstallData (&sb, fileData, fsize);
+    PutSBufInGenBuf (&sb, &gb);
+
+    fprintf (stdout, "\n\n-- decoded contents of BER PersonnelRecord file: \"%s\"--\n", berFileName);
+
+    val = TblDecode (tbl, NULL, "PersonnelRecord", &gb, &bytesDecoded);
+
+    if (val == NULL)
+        fprintf (stdout, "-- Decoding error occured somewhere -- \n");
+    else
+        TblPrintValue (tbl, NULL, "PersonnelRecord", stdout, val);
+
+    fprintf (stdout, "\n\n -- decoded %d bytes for the above value --\n\n", bytesDecoded, berFileName);
+
+    free (fileData); /* was malloc'd in LoadFile */
+
+    /*
+     * process value here
+     * (This is where the header file generated by mkchdr is
+     * useful - you can access the decoded value in a standard
+     * /easier way).
+     *
+     * Ok, well, the names "field0" etc aren't that nice
+     * but what did you expect - they aren't named in the ASN.1
+     * spec so mkchdr just makes them up.  To fix this, just
+     * add field names to you ASN.1 spec - it will not change the
+     * way the values are encoded - so you're not making it
+     * incompatible with the original. (not including value notation)
+     */
+    printf ("The following printout is an example of using the\n");
+    printf ("hdr file generated by mkchdr to access the data\n");
+    printf ("returned from the table decoder.  Look in \"example.c\"\n\n");
+
+
+    printf ("***** JQ GUMBY & CO Database *****************************************\n");
+    printf ("Employee Name:      %s %s %s\n", val->field0->givenName->octs, val->field0->initial->octs, val->field0->familyName->octs);
+    printf ("Title:              %s\n", val->title->octs);
+    printf ("Employee Number:    %d\n", *val->field1);
+    printf ("Date of Hire:       %s\n", val->dateOfHire->octs);
+    printf ("Name of Spouse:     %s %s %s\n", val->nameOfSpouse->givenName->octs, val->nameOfSpouse->initial->octs, val->nameOfSpouse->familyName->octs);
+    printf ("Number of Children: %d\n", AsnListCount (val->children));
+    printf ("**********************************************************************\n\n");
+
+    /*
+     * finished playing with the decoded value.
+     * now re-encode the value.  Using an expbuf to hold the encoded val
+     * because they can grow and in general you can predict a values
+     * encoded size (although we could assume that is would be close to
+     * the same size as the one we read in at the beginning of this prg).
+     * (note: the size of PersonnelRecord BER value we decoded may be
+     * different from the size of the re-encoded version depending on
+     * the use of indefinite or definite lengths.  Both are valid BER.)
+     */
+    fprintf (stdout, "now re-encoding the PersonnelRecord value to \"%s\"\n", outputFileNameG);
+
+    ebPtr = ExpBufAllocBufAndData();
+    ExpBufResetInWriteRvsMode (ebPtr); /* set up to hold encoding (= writing) */
+
+    PutExpBufInGenBuf (ebPtr, &gb);
+
+    if (TblEncode (tbl, NULL, "PersonnelRecord", &gb, val, &bytesEncoded) < 0)
+        fprintf (stderr, "main: error encoding the PersonnelRecord\n");
+
+    /* copy ExpBuf data to file */
+    outputFile = fopen (outputFileNameG, "w");
+    if (outputFile == NULL)
+    {
+        fprintf (stderr, "error - could not open file \"%s\"\n", outputFileNameG);
+        perror ("main: fopen:");
+    }
+
+    ExpBufCopyToFile (ebPtr, outputFile);
+
+    fclose (outputFile);
+
+    /* free the encoded version */
+    ExpBufFreeBufAndDataList (ebPtr);
+
+
+    return 0;
+} /* main */
diff -uraN snacc-1.3bbn/tbl-example/makefile snacc-1.3b4/tbl-example/makefile
--- snacc-1.3bbn/tbl-example/makefile	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/makefile	1997-02-15 19:33:26.000000000 +0000
@@ -0,0 +1,82 @@
+# file: .../tbl-example/makefile
+#
+# $Header: /usr/app/odstb/CVS/snacc/tbl-example/makefile,v 1.1 1997/02/15 19:33:26 rj Exp $
+# $Log: makefile,v $
+# Revision 1.1  1997/02/15 19:33:26  rj
+# first check-in
+#
+
+include ../makehead
+
+TOP		= ..
+
+ASN1_SRC_DIR	= $(TOP)/asn1specs
+
+ASN1_C_LIB_DIR	= $(TOP)/c-lib
+ASN1_C_INC_DIR	= $(ASN1_C_LIB_DIR)/inc
+TTBL_ASN1_LIB	= $(ASN1_C_LIB_DIR)/libasn1ctbl.a
+
+COMPILERDIR	= $(TOP)/compiler
+SNACC		= $(COMPILERDIR)/snacc
+USEFUL_TYPES	= $(ASN1_SRC_DIR)/asn-useful.asn1
+SNACCFLAGS	= -u $(USEFUL_TYPES)
+
+TBLTOOLSDIR	= $(TOP)/tbl-tools
+MKHDR		= $(TBLTOOLSDIR)/mkchdr/mkchdr
+
+ASN1FILES	= $(ASN1_SRC_DIR)/p-rec.asn1
+ASN1TTFILE	= p-rec.tt
+ASN1TTHFILE	= p-rec.h
+
+CFILES	= example.c
+OFILES	= example.o
+
+DISTFILES = \
+	README		\
+	makefile	\
+	$(CFILES)	\
+	p-rec.ber
+
+CPPFLAGS	+= -I$(TOP) -I$(ASN1_C_INC_DIR) -DUSE_GEN_BUF
+
+#-------------------------------------------------------------------------------
+
+all::		example
+
+example:	$(OFILES) $(TTBL_ASN1_LIB)
+		$(REASON)
+		$(CC) $(CFLAGS) -o example $(OFILES) $(TTBL_ASN1_LIB) $(LIBS)
+
+$(ASN1TTFILE):	$(ASN1FILES)
+		$(REASON)
+		$(SNACC) $(SNACCFLAGS) -T $@ $(ASN1FILES)
+
+$(SNACC) $(MKHDR):
+		cd $(@D) && $(MAKE) $(@F)
+
+$(TTBL_ASN1_LIB):
+		cd $(@D) && $(MAKE) tbl-lib
+
+$(ASN1TTHFILE):	$(ASN1TTFILE)
+		$(REASON)
+		$(MKHDR) $? $@
+
+check::		example $(ASN1TTFILE)
+
+check::
+		./example p-rec.tt p-rec.ber
+		cmp p-rec.ber p-rec.out.ber
+		@echo "+++ the test was successful"
+
+# dummy:
+install::
+
+clean::
+		$(RM) example *.o *~ core .emacs* $(ASN1TTFILE) $(ASN1TTHFILE) p-rec.out.ber
+
+depend::
+		$(MAKE) $(MKHDR)
+
+depend::	$(ASN1TTHFILE)
+
+include ../maketail
diff -uraN snacc-1.3bbn/tbl-example/p-rec.ber.uu snacc-1.3b4/tbl-example/p-rec.ber.uu
--- snacc-1.3bbn/tbl-example/p-rec.ber.uu	1970-01-01 00:00:00.000000000 +0000
+++ snacc-1.3b4/tbl-example/p-rec.ber.uu	2005-07-30 16:57:00.588101736 +0000
@@ -0,0 +1,7 @@
+begin 644 p-rec.ber
+M8(&.81`6!$IO:&X6`446!5-M:71HH!`6#E1H92!":6<@0VAE97-E7X$``P&&
+MGZ$*0P at Q.3@R,#$P-*(281`6!$UA<GD6`4P6!5-M:71HHT$Q'V$1%@5*86UE
+M<Q8!4A8%4VUI=&B@"D,(,3DU-S`S,3`Q'F$0%@1,:7-A%@%-%@53;6ET:*`*
+*0P at Q.38Q,#8R,0``
+`
+end

snacc-gcc.patch:
 c++-lib/inc/asn-any.h                 |    2 
 c++-lib/inc/asn-bits.h                |    2 
 c++-lib/inc/asn-bool.h                |    2 
 c++-lib/inc/asn-config.h              |    6 +-
 c++-lib/inc/asn-int.h                 |    2 
 c++-lib/inc/asn-list.h                |    2 
 c++-lib/inc/asn-null.h                |    2 
 c++-lib/inc/asn-octs.h                |    2 
 c++-lib/inc/asn-oid.h                 |    2 
 c++-lib/inc/asn-real.h                |    2 
 c++-lib/inc/asn-type.h                |    2 
 c++-lib/inc/print.h                   |    4 -
 c++-lib/src/asn-any.C                 |    2 
 c++-lib/src/asn-bits.C                |    4 +
 c++-lib/src/asn-bool.C                |    4 +
 c++-lib/src/asn-enum.C                |    4 +
 c++-lib/src/asn-int.C                 |    4 +
 c++-lib/src/asn-len.C                 |    1 
 c++-lib/src/asn-list.C                |    6 +-
 c++-lib/src/asn-null.C                |    4 +
 c++-lib/src/asn-octs.C                |    4 +
 c++-lib/src/asn-oid.C                 |    8 +-
 c++-lib/src/asn-real.C                |    6 +-
 c++-lib/src/asn-tag.C                 |    2 
 c++-lib/src/asn-type.C                |    4 +
 c++-lib/src/meta.C                    |    2 
 c++-lib/src/print.C                   |    4 -
 c++-lib/src/tcl-if.C                  |    7 +-
 compiler/back-ends/c++-gen/gen-code.c |  102 +++++++++++++++++-----------------
 compiler/back-ends/c-gen/gen-code.c   |    1 
 compiler/core/parse-asn1.y            |    2 
 31 files changed, 116 insertions(+), 85 deletions(-)

--- NEW FILE snacc-gcc.patch ---
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-any.h snacc-1.3bbn/c++-lib/inc/asn-any.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-any.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-any.h	2005-07-30 19:22:42.514097072 +0000
@@ -81,7 +81,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if 0
 #if TCL
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h snacc-1.3bbn/c++-lib/inc/asn-bits.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bits.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bits.h	2005-07-30 19:23:29.321981192 +0000
@@ -105,7 +105,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBitsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h snacc-1.3bbn/c++-lib/inc/asn-bool.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-bool.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-bool.h	2005-07-30 19:23:45.319549192 +0000
@@ -101,7 +101,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &) const;
+  void				Print (std::ostream &) const;
 
 #if META
   static const AsnBoolTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-config.h snacc-1.3bbn/c++-lib/inc/asn-config.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-config.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-config.h	2005-07-30 19:24:29.054900408 +0000
@@ -49,7 +49,7 @@
 #define _asn_config_h_
 
 #include <ctype.h>  /* for isprint() in <<op on AsnOcts */
-#include <iostream.h>
+#include <iostream>
 #include <memory.h>
 #include <string.h>
 #include <setjmp.h>
@@ -85,14 +85,14 @@
  * Asn1Error (char *str)
  *  - configure error handler
  */
-#define Asn1Error		cerr
+#define Asn1Error		std::cerr
 
 
 /*
  * Asn1Warning (char *str)  - configure warning mechanism
  * (currently not called)
  */
-#define Asn1Warning		cerr
+#define Asn1Warning		std::cerr
 
 
 /*
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-int.h snacc-1.3bbn/c++-lib/inc/asn-int.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-int.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-int.h	2005-07-30 19:24:45.421412320 +0000
@@ -70,7 +70,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnIntTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-list.h snacc-1.3bbn/c++-lib/inc/asn-list.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-list.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-list.h	2005-07-30 19:25:10.914682616 +0000
@@ -86,7 +86,7 @@
 				  last (NULL)
 				{}
 
-  friend ostream		&operator << (ostream &os, AsnList &l);
+  friend std::ostream		&operator << (std::ostream &os, AsnList &l);
 
   void				SetCurrElmt (unsigned long int index);
   void				SetCurrToFirst()			{ curr = first; }
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-null.h snacc-1.3bbn/c++-lib/inc/asn-null.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-null.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-null.h	2005-07-30 19:25:26.432323576 +0000
@@ -57,7 +57,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnNullTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h snacc-1.3bbn/c++-lib/inc/asn-octs.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-octs.h	2001-01-27 01:03:02.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-octs.h	2005-07-30 19:25:41.916969552 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOctsTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h snacc-1.3bbn/c++-lib/inc/asn-oid.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-oid.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-oid.h	2005-07-30 19:25:52.747323088 +0000
@@ -108,7 +108,7 @@
 
   PDU_MEMBER_MACROS
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
 #if META
   static const AsnOidTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-real.h snacc-1.3bbn/c++-lib/inc/asn-real.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-real.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-real.h	2005-07-30 19:26:05.321411536 +0000
@@ -67,7 +67,7 @@
   AsnLen			BEnc (BUF_TYPE b);
   void				BDec (BUF_TYPE b, AsnLen &bytesDecoded, ENV_TYPE env);
 
-  void				Print (ostream &os) const;
+  void				Print (std::ostream &os) const;
 
   PDU_MEMBER_MACROS
 
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/asn-type.h snacc-1.3bbn/c++-lib/inc/asn-type.h
--- snacc-1.3bbn.orig/c++-lib/inc/asn-type.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/asn-type.h	2005-07-30 19:26:16.551704272 +0000
@@ -111,7 +111,7 @@
 
 #endif
 
-  virtual void			Print (ostream &) const;
+  virtual void			Print (std::ostream &) const;
 
 #if META
   static const AsnTypeDesc	_desc;
diff -uraN snacc-1.3bbn.orig/c++-lib/inc/print.h snacc-1.3bbn/c++-lib/inc/print.h
--- snacc-1.3bbn.orig/c++-lib/inc/print.h	2001-01-27 01:03:03.000000000 +0000
+++ snacc-1.3bbn/c++-lib/inc/print.h	2005-07-30 19:26:54.240974632 +0000
@@ -42,8 +42,8 @@
 extern unsigned short int	indentG;
 extern unsigned short int	stdIndentG;
 
-void				Indent (ostream &os, unsigned short int i);
+void				Indent (std::ostream &os, unsigned short int i);
 
-ostream				&operator << (ostream &os, const AsnType &a);
+std::ostream			&operator << (std::ostream &os, const AsnType &a);
 
 #endif /* conditional include */
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-any.C snacc-1.3bbn/c++-lib/src/asn-any.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-any.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-any.C	2005-07-30 19:27:15.597727912 +0000
@@ -165,7 +165,7 @@
 }
 
 
-void AsnAny::Print (ostream &os) const
+void AsnAny::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bits.C snacc-1.3bbn/c++-lib/src/asn-bits.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bits.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bits.C	2005-07-30 19:27:51.063336320 +0000
@@ -65,6 +65,8 @@
 #include "asn-bits.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 unsigned short int  strStkUnusedBitsG;
 
@@ -440,7 +442,7 @@
 }  /* BDecConsBits */
 
 // prints the BIT STRING to the given ostream.
-void AsnBits::Print (ostream &os) const
+void AsnBits::Print (std::ostream &os) const
 {
     size_t octetLen = (bitLen+7)/8;
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-bool.C snacc-1.3bbn/c++-lib/src/asn-bool.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-bool.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-bool.C	2005-07-30 19:28:23.793360600 +0000
@@ -54,6 +54,8 @@
 #include "asn-type.h"
 #include "asn-bool.h"
 
+using std::endl;
+
 AsnType *AsnBool::Clone() const
 {
   return new AsnBool;
@@ -110,7 +112,7 @@
 }
 
 // print the BOOLEAN's value in ASN.1 value notation to the given ostream
-void AsnBool::Print (ostream &os) const
+void AsnBool::Print (std::ostream &os) const
 {
   os << (value ? "TRUE" : "FALSE");
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-enum.C snacc-1.3bbn/c++-lib/src/asn-enum.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-enum.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-enum.C	2005-07-30 19:28:57.068302040 +0000
@@ -41,9 +41,11 @@
 #include "asn-int.h"
 #include "asn-enum.h"
 
+using std::endl;
+
 AsnType *AsnEnum::Clone() const
 {
-  cerr << "AsnEnum::Clone() called" << endl;
+  std::cerr << "AsnEnum::Clone() called" << endl;
   abort();
   return NULL;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-int.C snacc-1.3bbn/c++-lib/src/asn-int.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-int.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-int.C	2005-07-30 19:31:10.276100376 +0000
@@ -55,6 +55,8 @@
 #include "asn-type.h"
 #include "asn-int.h"
 
+using std::endl;
+
 AsnType *AsnInt::Clone() const
 {
   return new AsnInt;
@@ -171,7 +173,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, INTEGER_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnInt::Print (ostream &os) const
+void AsnInt::Print (std::ostream &os) const
 {
     os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-len.C snacc-1.3bbn/c++-lib/src/asn-len.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-len.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-len.C	2005-07-30 19:31:35.984192152 +0000
@@ -41,6 +41,7 @@
 #include "asn-config.h"
 #include "asn-len.h"
 
+using std::endl;
 
 /*
  * Encodes the given length to the given buffer.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-list.C snacc-1.3bbn/c++-lib/src/asn-list.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-list.C	2001-01-27 01:03:00.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-list.C	2005-07-30 19:32:25.815616624 +0000
@@ -62,6 +62,8 @@
 #include "asn-tag.h"
 #include "asn-type.h"
 
+using std::endl;
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -80,7 +82,7 @@
 
 // print routine for lists
 template <class T>
-ostream &operator << (ostream &os, AsnList<T> &l)
+std::ostream &operator << (std::ostream &os, AsnList<T> &l)
 {
     os << "SEQUENCE OF { ";
 
@@ -241,7 +243,7 @@
      {
          listElmtTagId = BDecTag (b, bytesDecoded, env);
 
-         if ((listElmtTagId == EOC) && (elmtLen == INDEFINITE_LEN))
+         if ((listElmtTagId == EOC_TAG_ID) && (elmtLen == INDEFINITE_LEN))
              break;
 
 
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-null.C snacc-1.3bbn/c++-lib/src/asn-null.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-null.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-null.C	2005-07-30 19:33:01.169242056 +0000
@@ -48,6 +48,8 @@
 #include "asn-type.h"
 #include "asn-null.h"
 
+using std::endl;
+
 AsnType *AsnNull::Clone() const
 {
   return new AsnNull;
@@ -85,7 +87,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, NULLTYPE_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnNull::Print (ostream &os) const
+void AsnNull::Print (std::ostream &os) const
 {
     os << "NULL";
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-octs.C snacc-1.3bbn/c++-lib/src/asn-octs.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-octs.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-octs.C	2005-07-30 19:33:30.540776904 +0000
@@ -58,6 +58,8 @@
 #include "asn-octs.h"
 #include "str-stk.h"
 
+using std::endl;
+
 extern StrStk strStkG;
 
 AsnOcts::~AsnOcts()
@@ -166,7 +168,7 @@
 
 
 // Prints the AsnOcts to the given ostream in Value Notation.
-void AsnOcts::Print (ostream &os) const
+void AsnOcts::Print (std::ostream &os) const
 {
     int i;
     os << "'";
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-oid.C snacc-1.3bbn/c++-lib/src/asn-oid.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-oid.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-oid.C	2005-07-30 19:43:47.320214040 +0000
@@ -51,7 +51,7 @@
 
 #include "asn-config.h"
 #if TCL
-#include <strstream.h>
+#include <strstream>
 #endif
 #include "asn-len.h"
 #include "asn-tag.h"
@@ -59,6 +59,8 @@
 #include "asn-oid.h"
 #include "print.h"
 
+using std::endl;
+
 AsnOid::~AsnOid()
 {
   delete oid;
@@ -157,7 +159,7 @@
     *(tmpBuf++) = 0x7f & headArcNum;
 
     // repeat for the rest of the arc numbers
-    for (i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
+    for (int i = 2; (i < 11) && (arcNumArr[i] > 0); i++)
     {
         tmpArcNum = arcNumArr[i];
         for (elmtLen = 1; (tmpArcNum >>= 7) != 0; elmtLen++)
@@ -308,7 +310,7 @@
 
 // Prints an AsnOid in ASN.1 Value Notation.
 // Decodes the oid to get the individual arc numbers
-void AsnOid::Print (ostream &os) const
+void AsnOid::Print (std::ostream &os) const
 {
   unsigned short int firstArcNum;
   unsigned long int arcNum;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-real.C snacc-1.3bbn/c++-lib/src/asn-real.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-real.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-real.C	2005-07-30 19:44:57.954476000 +0000
@@ -57,12 +57,16 @@
 #include "asn-type.h"
 #include "asn-real.h"
 
+using std::endl;
+
 #ifndef IEEE_REAL_LIB
 /* ieee functions (in case not in math.h)*/
 extern "C" {
 extern int iszero (double);
+#if defined(__GNUC__) && (__GNUC__ < 3)
 extern int isinf (double);
 extern int signbit (double);
+#endif /* __GNUC__ && __GNUC__ < 3 */
 extern int ilogb (double);
 extern double scalbn (double, int);
 }
@@ -841,7 +845,7 @@
     BDecContent (b, MAKE_TAG_ID (UNIV, PRIM, REAL_TAG_CODE), elmtLen, bytesDecoded, env);
 }
 
-void AsnReal::Print (ostream &os) const
+void AsnReal::Print (std::ostream &os) const
 {
   os << value;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-tag.C snacc-1.3bbn/c++-lib/src/asn-tag.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-tag.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-tag.C	2005-07-30 19:45:24.267135808 +0000
@@ -45,6 +45,8 @@
 #include "asn-len.h"
 #include "asn-tag.h"
 
+using std::endl;
+
 /*
  * Decode a BER Tag from the given buffer.  Error is
  * flagged if the tag is too long or if a read error occurs.
diff -uraN snacc-1.3bbn.orig/c++-lib/src/asn-type.C snacc-1.3bbn/c++-lib/src/asn-type.C
--- snacc-1.3bbn.orig/c++-lib/src/asn-type.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/asn-type.C	2005-07-30 19:30:07.294675008 +0000
@@ -72,6 +72,8 @@
 #include "asn-len.h"
 #include "asn-type.h"
 
+using std::endl;
+
 AsnType::~AsnType()
 {
 }
@@ -97,7 +99,7 @@
 
 #endif
 
-void AsnType::Print (ostream &os) const
+void AsnType::Print (std::ostream &os) const
 {
   os << "ERROR - Attempt to print an improperly formed ANY type (programming error)." << endl;
 }
diff -uraN snacc-1.3bbn.orig/c++-lib/src/meta.C snacc-1.3bbn/c++-lib/src/meta.C
--- snacc-1.3bbn.orig/c++-lib/src/meta.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/meta.C	2005-07-30 19:46:03.588158104 +0000
@@ -27,6 +27,8 @@
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if META
 
 AsnMemberDesc::AsnMemberDesc (const char *_name, const AsnTypeDesc *_desc):
diff -uraN snacc-1.3bbn.orig/c++-lib/src/print.C snacc-1.3bbn/c++-lib/src/print.C
--- snacc-1.3bbn.orig/c++-lib/src/print.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/print.C	2005-07-30 19:46:33.326637168 +0000
@@ -45,13 +45,13 @@
 unsigned short int stdIndentG = 4;
 
 void
-Indent (ostream &os, unsigned short int i)
+Indent (std::ostream &os, unsigned short int i)
 {
   while (i-->0)
     os <<  ' ';
 }
 
-ostream &operator << (ostream &os, const AsnType &v)
+std::ostream &operator << (std::ostream &os, const AsnType &v)
 {
   v.Print (os);
   return os;
diff -uraN snacc-1.3bbn.orig/c++-lib/src/tcl-if.C snacc-1.3bbn/c++-lib/src/tcl-if.C
--- snacc-1.3bbn.orig/c++-lib/src/tcl-if.C	2001-01-27 01:03:01.000000000 +0000
+++ snacc-1.3bbn/c++-lib/src/tcl-if.C	2005-07-30 19:48:01.296263752 +0000
@@ -28,12 +28,13 @@
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <strstream.h>
-#include <fstream.h>
+#include <sstream>
 #include <string.h>
 
 #include "asn-incl.h"
 
+using std::endl;
+
 #if TCL
 
 #ifdef _AIX32
@@ -835,7 +836,7 @@
     }
 
 cout << *var;
-  strstream s;
+  stringstream s;
   s << *var;
   s.put ('\0');
   cout << strlen(s.str()) << endl;
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c++-gen/gen-code.c	2001-01-27 01:02:54.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c++-gen/gen-code.c	2005-07-30 19:58:00.407885728 +0000
@@ -453,7 +453,7 @@
         fprintf (src, "    else\n");
         fprintf (src, "        return false;\n");
 /*
-        fprintf (src, "    { cerr << \"longjmp return value is \" << val << endl;\n");
+        fprintf (src, "    { std::cerr << \"longjmp return value is \" << val << std::endl;\n");
         fprintf (src, "        return false; }\n");
 */
         fprintf (src, "}\n\n");
@@ -999,7 +999,7 @@
                                 fprintf (src, ")\n");
                         }
                         fprintf (src, "    {\n");
-            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+            		fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
                         fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "    }\n");
 
@@ -1357,7 +1357,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -1423,7 +1423,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -1666,7 +1666,7 @@
                         }
 
                         fprintf (src, "      {\n");
-                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << endl;\n");
+                        fprintf (src, "         Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                         fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
                         fprintf (src, "      }\n\n");
 
@@ -1780,7 +1780,7 @@
         }
 
         fprintf (src, "    default:\n");
-        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << endl;\n");
+        fprintf (src, "      Asn1Error << \"ERROR - unexpected tag in CHOICE\" << std::endl;\n");
         fprintf (src, "      longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "      break;\n");
 
@@ -1847,7 +1847,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))", classStr, formStr, tag->code);
             fprintf (src, "    {\n");
-	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "        Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "        longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    }\n");
             fprintf (src, "    extraLen%d = BDecLen (b, bytesDecoded, env);\n", ++elmtLevel);
@@ -1876,11 +1876,11 @@
     /* ostream printing routine */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n", td->cxxTypeDefInfo->className);
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n", td->cxxTypeDefInfo->className);
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        /*    fprintf (src, "  os << \"{\" << endl;\n") */
+        /*    fprintf (src, "  os << \"{\" << std::endl;\n") */
         fprintf (src, "  switch (choiceId)\n");
         fprintf (src, "  {\n");
         FOR_EACH_LIST_ELMT (e, choice->basicType->a.choice)
@@ -1909,7 +1909,7 @@
         }
         fprintf (src, "  } // end of switch\n");
 
-        /*    fprintf (src, "  os << \"}\" << endl;\n") */
+        /*    fprintf (src, "  os << \"}\" << std::endl;\n") */
         fprintf (src, "} // %s::Print\n\n", td->cxxTypeDefInfo->className);
     }
     /* end of Print Method code */
@@ -2260,7 +2260,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -2310,7 +2310,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -2460,7 +2460,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2638,7 +2638,7 @@
                             }
 
                             fprintf (src, "    {\n");
-                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "       Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "       longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "    }\n\n");
                             fprintf (src, "    elmtLen%d = BDecLen (b, seqBytesDecoded, env);\n", ++elmtLevel);
@@ -2826,7 +2826,7 @@
                     fprintf (src, "  }\n"); /* end of tag check if */
                     fprintf (src, "  else\n");
                     fprintf (src, "  {\n");
-                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << endl;\n");
+                    fprintf (src, "    Asn1Error << \"ERROR - SEQUENCE is missing non-optional elmt.\" << std::endl;\n");
                     fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
                     fprintf (src, "  }\n\n");
                 }
@@ -2845,7 +2845,7 @@
             fprintf (src, "  }\n");
             fprintf (src, "  else if (seqBytesDecoded != elmtLen0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << endl;\n");
+            fprintf (src, "    Asn1Error << \"ERROR - Length discrepancy on sequence.\" << std::endl;\n");
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
             fprintf (src, "  else\n");
@@ -2914,7 +2914,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -2939,14 +2939,14 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (seq->basicType->a.sequence);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
-        fprintf (src, "  os << \"{ -- SEQUENCE --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SEQUENCE --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, seq->basicType->a.sequence)
@@ -2963,12 +2963,12 @@
                 if (e != FIRST_LIST_ELMT (seq->basicType->a.sequence))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -2982,10 +2982,10 @@
 
 #ifdef KHO
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence)&&(!e->type->cxxTypeRefInfo->isPtr) )
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #else
             if (e != LAST_LIST_ELMT (seq->basicType->a.sequence) && !inTailOptElmts && !NextIsTailOptional (seq->basicType->a.sequence))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 #endif
 
 	    fprintf (src, "  }\n");
@@ -3000,9 +3000,9 @@
                   fprintf (src, "    os << \"%s \";\n", e->fieldName);
 		fprintf (src, "    os << \"-- void --\";\n");
     		if (e != LAST_LIST_ELMT (seq->basicType->a.sequence))
-                   fprintf (src, "    os << \",\" << endl;\n");
+                   fprintf (src, "    os << \",\" << std::endl;\n");
                 else
-                   fprintf (src, "    os << endl;\n");
+                   fprintf (src, "    os << std::endl;\n");
 		fprintf (src, "  }\n");
 #else
 		fprintf (src, "    os << \"-- void --\";\n");
@@ -3012,7 +3012,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (seq->basicType->a.sequence))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
 
         fprintf (src, "  indentG -= stdIndentG;\n");
@@ -3361,7 +3361,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -3411,7 +3411,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -3557,7 +3557,7 @@
             fprintf (src, "    BDecEoc (b, bytesDecoded, env);\n");
             fprintf (src, "  else if (elmtLen0 != 0)\n");
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"Expected an empty sequence\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3697,7 +3697,7 @@
                             }
 
                             fprintf (src, "        {\n");
-                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << endl;\n");
+                            fprintf (src, "           Asn1Error << \"Unexpected Tag\" << std::endl;\n");
                             fprintf (src, "           longjmp (env, %d);\n", longJmpValG--);
                             fprintf (src, "        }\n\n");
 
@@ -3814,14 +3814,14 @@
                 FreeTags (tags);
             } /* for each elmt */
             fprintf (src, "       default:\n");
-            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << endl;\n");
+            fprintf (src, "         Asn1Error << \"Unexpected Tag on SET elmt.\" << std::endl;\n");
             fprintf (src, "         longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "    } // end switch\n");
             fprintf (src, "  } // end for loop\n");
             fprintf (src, "  bytesDecoded += setBytesDecoded;\n");
             fprintf (src, "  if (mandatoryElmtsDecoded != %d)\n", mandatoryElmtCount);
             fprintf (src, "  {\n");
-            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << endl;\n");
+            fprintf (src, "     Asn1Error << \"ERROR - non-optional SET element missing.\" << std::endl;\n");
             fprintf (src, "     longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3889,7 +3889,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -3914,15 +3914,15 @@
     /* write code for printing */
     if (printPrintersG)
     {
-        fprintf (hdr, "  void			Print (ostream &os) const;\n");
+        fprintf (hdr, "  void			Print (std::ostream &os) const;\n");
 
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
         allOpt = AllElmtsOptional (set->basicType->a.set);
         if (allOpt)
             fprintf (src, "  int nonePrinted = true;\n");
 
-        fprintf (src, "  os << \"{ -- SET --\" << endl;\n");
+        fprintf (src, "  os << \"{ -- SET --\" << std::endl;\n");
         fprintf (src, "  indentG += stdIndentG;\n\n");
 
         FOR_EACH_LIST_ELMT (e, set->basicType->a.set)
@@ -3939,12 +3939,12 @@
                 if (e != FIRST_LIST_ELMT (set->basicType->a.set))
                 {
                     fprintf (src, "    if (!nonePrinted)\n");
-                    fprintf (src, "      os << \",\" << endl;\n");
+                    fprintf (src, "      os << \",\" << std::endl;\n");
                 }
                 fprintf (src, "    nonePrinted = false;\n", i);
             }
             else if (inTailOptElmts) /* cannot be first elmt ow allOpt is true */
-                fprintf (src, "    os << \",\"<< endl;\n");
+                fprintf (src, "    os << \",\"<< std::endl;\n");
 
             fprintf (src, "    Indent (os, indentG);\n");
 
@@ -3957,7 +3957,7 @@
                 fprintf (src, "    os << %s;\n", e->type->cxxTypeRefInfo->fieldName);
 
             if (e != LAST_LIST_ELMT (set->basicType->a.set) && !inTailOptElmts && !NextIsTailOptional (set->basicType->a.set))
-                fprintf (src, "    os << \",\" << endl;\n");
+                fprintf (src, "    os << \",\" << std::endl;\n");
 
 	    fprintf (src, "  }\n");
 
@@ -3974,7 +3974,7 @@
 	    fprintf (src, "\n");
 
             if (e == LAST_LIST_ELMT (set->basicType->a.set))
-                fprintf (src, "  os << endl;\n");
+                fprintf (src, "  os << std::endl;\n");
         }
         fprintf (src, "  indentG -= stdIndentG;\n");
         fprintf (src, "  Indent (os, indentG);\n");
@@ -4294,7 +4294,7 @@
             else
                 fprintf (src, "MAKE_TAG_ID (%s, %s, %d))\n", classStr, formStr, tag->code);
             fprintf (src, "  {\n");
-	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
+	    fprintf (src, "    Asn1Error << \"%s::B%s: ERROR - wrong tag\" << std::endl;\n", td->cxxTypeDefInfo->className, r->decodeBaseName);
             fprintf (src, "    longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "  }\n");
 
@@ -4324,7 +4324,7 @@
     fprintf (hdr, "  PDU_MEMBER_MACROS\n");
 
     if (printPrintersG)
-        fprintf (hdr, "  void		Print (ostream &os) const;\n");
+        fprintf (hdr, "  void		Print (std::ostream &os) const;\n");
 
     fprintf (hdr, "};\n\n\n");
 
@@ -4380,7 +4380,7 @@
         }
         fprintf (src, "))\n");
         fprintf (src, "        {\n");
-        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+        fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
         fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
         fprintf (src, "        }\n\n");
         fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4406,7 +4406,7 @@
                 fprintf (src, "))\n");
 
             fprintf (src, "        {\n");
-            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << endl;\n");
+            fprintf (src, "            Asn1Error << \"Unexpected Tag\" << std::endl;\n");
             fprintf (src, "            longjmp (env, %d);\n", longJmpValG--);
             fprintf (src, "        }\n\n");
             fprintf (src, "        elmtLen%d = BDecLen (b, listBytesDecoded, env);\n", ++elmtLevel);
@@ -4461,7 +4461,7 @@
 
     fprintf (src, "%s::%s (const %s &)\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "{\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s::%s (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "}\n\n");
 
@@ -4494,7 +4494,7 @@
     fprintf (src, "\n");
     fprintf (src, "  return *this;\n");
     fprintf (src, "#else // SNACC_DEEP_COPY\n");
-    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
+    fprintf (src, "  Asn1Error << \"use of incompletely defined %s &%s::operator = (const %s &)\" << std::endl;\n", td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className, td->cxxTypeDefInfo->className);
     fprintf (src, "  abort();\n");
     fprintf (src, "  // if your compiler complains here, check the -novolat option\n");
     if (novolatilefuncs)
@@ -4506,9 +4506,9 @@
 
     if (printPrintersG)
     {
-        fprintf (src, "void %s::Print (ostream &os) const\n", td->cxxTypeDefInfo->className);
+        fprintf (src, "void %s::Print (std::ostream &os) const\n", td->cxxTypeDefInfo->className);
         fprintf (src, "{\n");
-        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << endl;\n");
+        fprintf (src, "    os << \"{ -- SEQUENCE/SET OF -- \" << std::endl;\n");
         fprintf (src, "    indentG += stdIndentG;\n");
 
         fprintf (src, "    //SetCurrToFirst();\n");
@@ -4521,7 +4521,7 @@
         fprintf (src, "        //if (Curr() != Last())\n");
         fprintf (src, "        if (run != last)\n");
         fprintf (src, "            os << \",\";\n");
-        fprintf (src, "        os << endl;\n");
+        fprintf (src, "        os << std::endl;\n");
         fprintf (src, "    }\n");
 
         fprintf (src, "    indentG -= stdIndentG;\n");
diff -uraN snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c
--- snacc-1.3bbn.orig/compiler/back-ends/c-gen/gen-code.c	2001-01-27 01:02:52.000000000 +0000
+++ snacc-1.3bbn/compiler/back-ends/c-gen/gen-code.c	2005-07-30 19:22:04.488877784 +0000
@@ -33,6 +33,7 @@
  */
 
 #include <stdio.h>
+#include <time.h>
 
 #include "asn-incl.h"
 #include "asn1module.h"
diff -uraN snacc-1.3bbn.orig/compiler/core/parse-asn1.y snacc-1.3bbn/compiler/core/parse-asn1.y
--- snacc-1.3bbn.orig/compiler/core/parse-asn1.y	2001-01-27 01:02:47.000000000 +0000
+++ snacc-1.3bbn/compiler/core/parse-asn1.y	2005-07-30 17:29:02.838828848 +0000
@@ -456,6 +456,7 @@
 /*-----------------------------------------------------------------------*/
 
 LineNo: { $$ = myLineNoG; }
+;
 
 ModuleDefinition:
      ModuleIdentifier
@@ -1462,6 +1463,7 @@
         $$->choiceId = SUBTYPEVALUE_SINGLEVALUE;
         $$->a.singleValue = $1;
     }
+;
 
 ContainedSubtype:
     INCLUDES_SYM Type

snacc-ttab-tex-UTF8-fix.patch:
 ttab.tex |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snacc-ttab-tex-UTF8-fix.patch ---
diff -up ./doc/ttab.tex.texfix ./doc/ttab.tex
--- ./doc/ttab.tex.texfix	2009-09-09 10:30:25.597509928 +0530
+++ ./doc/ttab.tex	2009-09-09 10:30:54.173509922 +0530
@@ -18,7 +18,7 @@ size of your type tables, put the only u
 your ASN.1 module and compile it without using the useful types
 module.
 
-A generic buffer type (? la ISODE and XDR) was defined to allow type
+A generic buffer type (ISODE and XDR) was defined to allow type
 table driven routines to read from a wide variety of buffer formats.
 Currently slightly modified versions of the {\C ExpBuf} and the
 {\C SBuf} are provided.  It shouldn't be too hard for you to add


--- NEW FILE snacc.spec ---
Name:           snacc
Version:        1.3
Release:        4%{?dist}
Summary:        Sample Neufeld ASN.1 to C Compiler

Group:          Applications/System
License:        GPLv2+
URL:            http://packages.debian.org/source/sid/snacc
Source0:        http://ftp.de.debian.org/debian/pool/main/s/snacc/%{name}_%{version}bbn.orig.tar.gz
Patch0:         snacc-bts-442873.patch
Patch1:         snacc-configure.patch
Patch2:         snacc-examples.patch
Patch3:         snacc-gcc.patch
Patch4:         snacc-ttab-tex-UTF8-fix.patch

BUILDROOT:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake17 libtool flex bison

%description
Snacc is Sample Neufeld ASN.1 to C compiler that can produce C, C++ routines
or type tables for BER encoding, decoding, printing and freeing.

%package devel
Summary:        Header files for snacc development
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release} 

%description devel
The %{name}-devel package contains the header files
for snacc development.

%prep
%setup -qn %{name}-%{version}bbn.orig
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%{__mkdir} -p c-lib/Cebuf c-lib/ebuf c-lib/mbuf c-lib/sbuf c-lib/tbl c++-lib/c++

# ---- Build ----
# configure without tcl for libtool to use -DMETA=0

%build
AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 autoreconf -fi
%configure
%{__make}

%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
%{__rm} -f `find %{buildroot} -name *.a`
%{__rm} -f `find %{buildroot} -name *.la`

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING doc/snacc-a5.ps
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/asn1
%{_bindir}/%{name}
%{_bindir}/berdecode
%{_bindir}/mkchdr
%{_bindir}/ptbl
%{_bindir}/pval
%{_mandir}/man1/mkchdr.1.gz
%{_mandir}/man1/ptbl.1.gz
%{_mandir}/man1/pval.1.gz
%{_mandir}/man1/snacc.1.gz
%{_mandir}/man1/snacced.1.gz
%{_mandir}/mann/snacc.n.gz
%{_libdir}/libasn1c++.so.0.0.0
%{_libdir}/libasn1cCebuf.so.0.0.0
%{_libdir}/libasn1cebuf.so.0.0.0
%{_libdir}/libasn1cmbuf.so.0.0.0
%{_libdir}/libasn1csbuf.so.0.0.0
%{_libdir}/libasn1ctbl.so.0.0.0
%{_libdir}/libasn1c++.so.0
%{_libdir}/libasn1cCebuf.so.0
%{_libdir}/libasn1cebuf.so.0
%{_libdir}/libasn1cmbuf.so.0
%{_libdir}/libasn1csbuf.so.0
%{_libdir}/libasn1ctbl.so.0

%files devel
%defattr(-,root,root,-)
%doc c-examples/ c++-examples/
%{_bindir}/snacc-config
%{_datadir}/aclocal/snacc.m4
%{_includedir}/%{name}/c
%{_includedir}/%{name}/c++
%{_libdir}/libasn1c++.so
%{_libdir}/libasn1cCebuf.so
%{_libdir}/libasn1cebuf.so
%{_libdir}/libasn1cmbuf.so
%{_libdir}/libasn1csbuf.so
%{_libdir}/libasn1ctbl.so

%changelog
* Sat Sep 26 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-4
- Removed --without-tcl as it doesn not affect configure.
- snacc-configure.patch will not build c++-lib/tcl/Makefile as tcl is not
  required. 

* Thu Sep 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-3
- Removed -libs package, and moved them to -base package.
- s/sample/Sample in package description.
- Directory ownership in base package for includedir/name.
- snacc.m4 moved to -devel package.
- Patch names start with snacc-.
- Removed .tex and .bib files as .ps is already shipped.

* Wed Sep 23 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-2
- Fixed spelling mistake s/dample/sample.
- Added {c, c++}-examples to devel package.
- Moved *.asn1 files to base package.
- Created separate libs package.
- Call ldconfig for post, postun for libs package.

* Mon Sep 21 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 1.3-1
- First snacc package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:57:08 -0000	1.1
+++ .cvsignore	30 Sep 2009 03:58:07 -0000	1.2
@@ -0,0 +1 @@
+snacc_1.3bbn.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snacc/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:57:09 -0000	1.1
+++ sources	30 Sep 2009 03:58:08 -0000	1.2
@@ -0,0 +1 @@
+24c969e2673f1713d5d995d2f9e64781  snacc_1.3bbn.orig.tar.gz



From rdieter at fedoraproject.org  Wed Sep 30 04:00:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 04:00:54 +0000 (UTC)
Subject: rpms/cmucl/devel .cvsignore, 1.9, 1.10 cmucl.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <20090930040054.3B75311C0423@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmucl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5254

Modified Files:
	.cvsignore cmucl.spec sources 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 20a-1
- cmucl-20a



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Mar 2009 14:36:12 -0000	1.9
+++ .cvsignore	30 Sep 2009 04:00:53 -0000	1.10
@@ -1,4 +1,4 @@
-cmucl-19f-x86-linux.tar.bz2
-cmucl-19f-x86-linux.tar.bz2.asc
-cmucl-src-19f.tar.bz2
-cmucl-src-19f.tar.bz2.asc
+cmucl-20a-x86-linux.tar.bz2
+cmucl-20a-x86-linux.tar.bz2.asc
+cmucl-src-20a.tar.bz2
+cmucl-src-20a.tar.bz2.asc


Index: cmucl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- cmucl.spec	24 Jul 2009 19:11:16 -0000	1.21
+++ cmucl.spec	30 Sep 2009 04:00:53 -0000	1.22
@@ -4,8 +4,8 @@
 
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
-Version: 19f
-Release: 2%{?dist}
+Version: 20a
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 Development/Languages
@@ -17,8 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # bootstrap available for %%ix86 only: http://bugzilla.redhat.com/185085
 ExclusiveArch: %{ix86}
 
-Source10: http://common-lisp.net/project/cmucl/downloads/release/19f/cmucl-19f-x86-linux.tar.bz2
-Source11: http://common-lisp.net/project/cmucl/downloads/release/19f/cmucl-19f-x86-linux.tar.bz2.asc
+Source10: http://common-lisp.net/project/cmucl/downloads/release/20a/cmucl-20a-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/20a/cmucl-20a-x86-linux.tar.bz2.asc
 
 ## ix86 section
 %ifarch %{ix86}
@@ -188,7 +188,6 @@ QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUI
 %{_libdir}/cmucl/lib/linker.sh
 %{_libdir}/cmucl/lib/lisp.a
 %dir %{_libdir}/cmucl/lib/subsystems
-%{_libdir}/cmucl/lib/subsystems/external-formats-library.*
 %{_libdir}/cmucl/lib/subsystems/gray-*-library.*
 %{_libdir}/cmucl/lib/subsystems/iodefs-library.*
 %{_libdir}/cmucl/lib/subsystems/simple-*-library.*
@@ -215,6 +214,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 20a-1
+- cmucl-20a
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 19f-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Mar 2009 14:36:12 -0000	1.8
+++ sources	30 Sep 2009 04:00:53 -0000	1.9
@@ -1,4 +1,4 @@
-b4d5e17959f808448f90ba074ef84843  cmucl-19f-x86-linux.tar.bz2
-cf12b9527247ebaf4b1d18ad571a202e  cmucl-19f-x86-linux.tar.bz2.asc
-89529846608fe6fbf1227d52556109d9  cmucl-src-19f.tar.bz2
-c4a30b169d5a2c6fcafe73713302638f  cmucl-src-19f.tar.bz2.asc
+bfc6eb859c9219d8e7b00796c69e504c  cmucl-20a-x86-linux.tar.bz2
+3c4cd0edb996c1f4f60ac2a8823d7dbc  cmucl-20a-x86-linux.tar.bz2.asc
+e3e1daa3631d38ed3c3e7601d798aba1  cmucl-src-20a.tar.bz2
+a931b7ded4c6de398ed5dae283b78468  cmucl-src-20a.tar.bz2.asc



From bernie at fedoraproject.org  Wed Sep 30 04:02:26 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Wed, 30 Sep 2009 04:02:26 +0000 (UTC)
Subject: rpms/etckeeper/F-11 etckeeper.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930040226.4CE6B11C00C1@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/etckeeper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6082/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	etckeeper.spec import.log 
Log Message:
Initial import.



--- NEW FILE etckeeper.spec ---
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")

Name:      etckeeper
Version:   0.41
Release:   1%{?dist}
Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
Group:     Applications/System
License:   GPLv2+
URL:       http://kitenet.net/~joey/code/etckeeper/
Source0:   http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  git >= 1.6

%description
The etckeeper program is a tool to let /etc be stored in a git,
mercurial, bzr or darcs repository. It hooks into yum to automatically
commit changes made to /etc during package upgrades. It tracks file
metadata that version control systems do not normally support, but that
is important for /etc, such as the permissions of /etc/shadow. It's
quite modular and configurable, while also being simple to use if you
understand the basics of working with version control.

The default backend is git, if want to use a another backend please
install the appropriate tool (mercurial, darcs or bzr).
To use bzr as backend, please also install the %{name}-bzr package.

To start using the package please read %{_docdir}/%{name}-%{version}/README

%package bzr
Summary:  Support for bzr with etckeeper
Group:    Applications/System
Requires: %{name} = %{version}-%{release} bzr
BuildRequires: bzr
BuildRequires: python-devel

%description bzr
This package provides a bzr backend for etckeeper, if you want to use
etckeeper with bzr backend, install this package.

%prep
%setup -q -n %{name}
%{__perl} -pi -e '
    s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|;
    s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|;
    ' etckeeper.conf
%{__sed} -i -e '1d' yum-etckeeper.py 

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
%{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name}
%{__install} -d  %{buildroot}%{_localstatedir}/cache/%{name}
%{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py

%clean
rm -rf %{buildroot}

# Users must study the README anyway.
#post
#{_sbindir}/%{name} init -d /etc/

%files
%defattr(-, root, root, -)
%doc GPL INSTALL TODO README
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/*.d
%{_sysconfdir}/%{name}/*.d/
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}
%dir %{_sysconfdir}/bash_completion.d
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
%dir %{_prefix}/lib/yum-plugins
%{_prefix}/lib/yum-plugins/%{name}.*
%dir %{_sysconfdir}/yum/pluginconf.d
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
%{_localstatedir}/cache/%{name}

%files bzr
%defattr(-, root, root, -)
%doc GPL
%{python_sitelib}/bzrlib/plugins/%{name}
%{python_sitelib}/bzr_%{name}-*.egg-info

%changelog
* Sat Sep 12 2009 Bernie Innocenti <bernie at codewiz.org> - 0.41-1
- Updatte to 0.41
- Add missing directory ownerships

* Sat Sep 12 2009 Bernie Innocenti <bernie at codewiz.org> - 0.40-3
- Make the bzr subpackage builddepend on python-devel

* Wed Sep 09 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.40-2
- Package is noarch
- Rpmlint clean
- Random cleanup
- Ship cache dir in package
- bzr subpackage
- Add bzr to buildreq

* Sat Sep 05 2009 Bernie Innocenti <bernie at codewiz.org> - 0.40-1
- Update to 0.40

* Sun Jun 14 2009 Bernie Innocenti <bernie at codewiz.org> - 0.37-1
- Update to 0.37
- Change license tag to GPLv2+

* Fri Feb 27 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.33-4
- fix up initial install to make directory in /var/cache/etckeeper
- install the etckeeper daily cron job
- define some config files that shouldn't be replaced, should the hooks
in commit.d, init.d etc... saved and not blown away? if so they can
defined as config files. etckeeper should record the changes anyway.

* Wed Feb 25 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.32-1
- yum etckeeper plugin is now apart of this package

* Tue Feb 24 2009 Jimmy Tang <jtang at tchpc.tcd.ie> - 0.31-1
- initial package


--- NEW FILE import.log ---
etckeeper-0_41-1_fc12:F-11:etckeeper-0.41-1.fc12.src.rpm:1254283313


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etckeeper/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:15:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:02:25 -0000	1.2
@@ -0,0 +1 @@
+etckeeper_0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etckeeper/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:15:12 -0000	1.1
+++ sources	30 Sep 2009 04:02:25 -0000	1.2
@@ -0,0 +1 @@
+d8929c79fcab4f3e57d7ebb03f20df63  etckeeper_0.41.tar.gz



From rdieter at fedoraproject.org  Wed Sep 30 04:03:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 04:03:50 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.138,1.139
Message-ID: <20090930040350.0B91811C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7441

Modified Files:
	maxima.spec 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-2
- rebuild (cmucl)



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- maxima.spec	30 Aug 2009 20:04:58 -0000	1.138
+++ maxima.spec	30 Sep 2009 04:03:49 -0000	1.139
@@ -3,7 +3,7 @@ Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.19.2
 
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -91,8 +91,6 @@ Obsoletes: %{name}-lang-pt-utf8 < %{vers
 Obsoletes: %{name}-lang-pt_BR < %{version}-%{release}
 Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
 
-# 5.18.0 tarball busted?, temporary 
-#BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: time
 # texi2dvi
@@ -433,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-2
+- rebuild (cmucl)
+
 * Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
 - maxima-5.19.2
 



From pravins at fedoraproject.org  Wed Sep 30 04:05:52 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 30 Sep 2009 04:05:52 +0000 (UTC)
Subject: rpms/ibus-sayura/F-11 .cvsignore, 1.2, 1.3 ibus-sayura.spec, 1.5,
	1.6 sources, 1.2, 1.3 dual_matra_problem.patch, 1.3, NONE
Message-ID: <20090930040552.467A411C00EC@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/ibus-sayura/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23009

Modified Files:
	.cvsignore ibus-sayura.spec sources 
Removed Files:
	dual_matra_problem.patch 
Log Message:
* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -1
- upstream release 1.2.0
- bugfix 526373



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-sayura/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Mar 2009 10:42:51 -0000	1.2
+++ .cvsignore	30 Sep 2009 04:05:51 -0000	1.3
@@ -1 +1,2 @@
 ibus-sayura-1.0.0.20090326.tar.gz
+ibus-sayura-1.2.0.20090703.tar.gz


Index: ibus-sayura.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-sayura/F-11/ibus-sayura.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ibus-sayura.spec	2 Jul 2009 13:13:31 -0000	1.5
+++ ibus-sayura.spec	30 Sep 2009 04:05:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       ibus-sayura
-Version:    1.0.0.20090326
-Release:    5%{?dist}
+Version:    1.2.0.20090703
+Release:    1%{?dist}
 Summary:    The Sinhala engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -15,13 +15,11 @@ BuildRequires:  pkgconfig
 BuildRequires:  ibus-devel
 
 Requires:   ibus
-Patch1: dual_matra_problem.patch
 %description
 The Sayura engine for IBus platform. It provides Sinhala input method.
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-dual_matra
 
 %build
 %configure --disable-static
@@ -45,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -1
+- upstream release 1.2.0
+- bugfix 526373
+
 * Thu Jul 2 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -5
 - bugfix 507209, 509347, 509346
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-sayura/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Mar 2009 10:42:51 -0000	1.2
+++ sources	30 Sep 2009 04:05:52 -0000	1.3
@@ -1 +1 @@
-cc781a2df344b02d3848e075d46c3745  ibus-sayura-1.0.0.20090326.tar.gz
+8db2886ea5690c71f828353302365d46  ibus-sayura-1.2.0.20090703.tar.gz


--- dual_matra_problem.patch DELETED ---



From shakthimaan at fedoraproject.org  Wed Sep 30 04:06:33 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 04:06:33 +0000 (UTC)
Subject: rpms/gplcver/devel gplcver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930040633.9BD3911C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/gplcver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24960/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gplcver.spec import.log 
Log Message:
First gplcver package.



--- NEW FILE gplcver.spec ---
Name:        gplcver
Version:     2.11a
Release:     2%{?dist}
Summary:     An interpreted Verilog HDL simulator

License:     GPLv2
Group:       Applications/Engineering
URL:         http://www.pragmatic-c.com/gpl-cver

Source0:     http://www.sourcefiles.org/Scientific/Electronic/%{name}-%{version}.src.tar.bz2

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:    dinotrace perl

%description
Cver is a full 1995 IEEE P1364 standard Verilog simulator. It also
implements some of the 2001 P1364 standard features. All three
PLI interfaces (tf_, acc_, and vpi_) are implemented as defined
in the IEEE 2001 P1364 LRM.

GPL Cver is an older version of Cver that is released under the GNU
General Public License. A newer and faster commercial version of Cver
is available from Pragmatic C Software Corp.


%prep
%setup -q -n %{name}-%{version}.src

# preserving timestamps while fixing paths
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         vcddiff.dir/examples.vcddiff/vcddiff_test.sh > vcddiff.ex
touch -r vcddiff.dir/examples.vcddiff/vcddiff_test.sh vcddiff.ex
%{__mv} vcddiff.ex vcddiff.dir/examples.vcddiff/vcddiff_test.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         dinotrace.dir/examples.dino/dino_tst.sh > dino.ex
touch -r dinotrace.dir/examples.dino/dino_tst.sh dino.ex
%{__mv} dino.ex dinotrace.dir/examples.dino/dino_tst.sh

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/config_tst.sh >> config_tst.ex 
touch -r tests_and_examples/v2001/config/config_tst.sh config_tst.ex
%{__mv} config_tst.ex tests_and_examples/v2001/config/config_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/v2001/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/v2001/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.tf/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.tf/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.tf/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.tf/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.tf/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.tf/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/install.tst/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/install.tst/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.acc/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.acc/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.acc/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.acc/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.acc/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.vpi/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.vpi/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.vpi/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.vpi/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.vpi/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.vpi/makefile.lnx


# fixing PATHS in documentation
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/capacity.tst/README > README.ex
touch -r tests_and_examples/capacity.tst/README README.ex
%{__mv} README.ex tests_and_examples/capacity.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/README > README.ex
touch -r tests_and_examples/v2001/README README.ex
%{__mv} README.ex tests_and_examples/v2001/README

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/README > README.ex
touch -r tests_and_examples/v2001/config/README README.ex
%{__mv} README.ex tests_and_examples/v2001/config/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/README > README.ex
touch -r tests_and_examples/install.tst/README README.ex
%{__mv} README.ex tests_and_examples/install.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/README > README.ex
touch -r tests_and_examples/examples.acc/README README.ex
%{__mv} README.ex tests_and_examples/examples.acc/README


# fixing optflags
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(WARNS) \$(INCS) \$(OPTFLGS) -O2|CFLAGS= %{optflags} \$(INCS)|" \
src/makefile.lnx
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(OPTFLGS) -O2|CFLAGS= %{optflags}|" \
vcddiff.dir/src/makefile.lnx


# remove other OS files
%{__rm} -f `find . -name *cygwin*`
%{__rm} -f `find . -name *osx*`


# remove zero byte file
%{__rm} -f `find . -name xxdel.tst`


# To package scripts in doc, change permissions
find . -name "*.sh" | xargs -i chmod 644 {}
find . -name "*.pl" | xargs -i chmod 644 {}


%build
%{__make} -C src -f makefile.lnx
%{__make} -C vcddiff.dir/src -f makefile.lnx

%install
%{__rm} -rf %{buildroot}

%{__install} -d %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_includedir}/cver
%{__install} -d %{buildroot}%{_mandir}/man1

%{__install} -pm 755 bin/*      %{buildroot}%{_bindir}/
%{__install} -pm 644 pli_incs/* %{buildroot}%{_includedir}/cver/
%{__install} -pm 644 doc/*.1    %{buildroot}%{_mandir}/man1/


# removing duplicates
%{__rm} -f doc/*.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc Changelog COPYING LICENSE OUR_PHILOSOPHY
%doc NEW.CVER.2001.RELEASE.NOTES README doc/
%doc pli_src ver_src tests_and_examples/
%doc vcddiff.dir/examples.vcddiff/
%doc dinotrace.dir/
%{_bindir}/cver
%{_bindir}/vcddiff
%{_mandir}/man*/*
%{_includedir}/cver

%changelog
* Tue Sep 29 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 2.11a-2
- Updated valid Source0 package URL.
- Added more PATH, README fixes.
- Remove executable permission on script files in doc section.
- Remove other OS files, and zero byte files.

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.11a-1
- Initial package for fedora.

--- NEW FILE import.log ---
gplcver-2_11a-2_fc11:HEAD:gplcver-2.11a-2.fc11.src.rpm:1254283974


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:58:06 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:06:33 -0000	1.2
@@ -0,0 +1 @@
+gplcver-2.11a.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:58:06 -0000	1.1
+++ sources	30 Sep 2009 04:06:33 -0000	1.2
@@ -0,0 +1 @@
+4967e78c299bdfdb0c9f2dcd4803e734  gplcver-2.11a.src.tar.bz2



From shakthimaan at fedoraproject.org  Wed Sep 30 04:08:00 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 04:08:00 +0000 (UTC)
Subject: rpms/gplcver/EL-5 gplcver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930040800.3A15911C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/gplcver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15818/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	gplcver.spec import.log 
Log Message:
First gplcver package.



--- NEW FILE gplcver.spec ---
Name:        gplcver
Version:     2.11a
Release:     2%{?dist}
Summary:     An interpreted Verilog HDL simulator

License:     GPLv2
Group:       Applications/Engineering
URL:         http://www.pragmatic-c.com/gpl-cver

Source0:     http://www.sourcefiles.org/Scientific/Electronic/%{name}-%{version}.src.tar.bz2

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:    dinotrace perl

%description
Cver is a full 1995 IEEE P1364 standard Verilog simulator. It also
implements some of the 2001 P1364 standard features. All three
PLI interfaces (tf_, acc_, and vpi_) are implemented as defined
in the IEEE 2001 P1364 LRM.

GPL Cver is an older version of Cver that is released under the GNU
General Public License. A newer and faster commercial version of Cver
is available from Pragmatic C Software Corp.


%prep
%setup -q -n %{name}-%{version}.src

# preserving timestamps while fixing paths
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         vcddiff.dir/examples.vcddiff/vcddiff_test.sh > vcddiff.ex
touch -r vcddiff.dir/examples.vcddiff/vcddiff_test.sh vcddiff.ex
%{__mv} vcddiff.ex vcddiff.dir/examples.vcddiff/vcddiff_test.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         dinotrace.dir/examples.dino/dino_tst.sh > dino.ex
touch -r dinotrace.dir/examples.dino/dino_tst.sh dino.ex
%{__mv} dino.ex dinotrace.dir/examples.dino/dino_tst.sh

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/config_tst.sh >> config_tst.ex 
touch -r tests_and_examples/v2001/config/config_tst.sh config_tst.ex
%{__mv} config_tst.ex tests_and_examples/v2001/config/config_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/v2001/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/v2001/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.tf/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.tf/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.tf/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.tf/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.tf/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.tf/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/install.tst/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/install.tst/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.acc/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.acc/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.acc/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.acc/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.acc/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.vpi/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.vpi/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.vpi/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.vpi/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.vpi/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.vpi/makefile.lnx


# fixing PATHS in documentation
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/capacity.tst/README > README.ex
touch -r tests_and_examples/capacity.tst/README README.ex
%{__mv} README.ex tests_and_examples/capacity.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/README > README.ex
touch -r tests_and_examples/v2001/README README.ex
%{__mv} README.ex tests_and_examples/v2001/README

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/README > README.ex
touch -r tests_and_examples/v2001/config/README README.ex
%{__mv} README.ex tests_and_examples/v2001/config/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/README > README.ex
touch -r tests_and_examples/install.tst/README README.ex
%{__mv} README.ex tests_and_examples/install.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/README > README.ex
touch -r tests_and_examples/examples.acc/README README.ex
%{__mv} README.ex tests_and_examples/examples.acc/README


# fixing optflags
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(WARNS) \$(INCS) \$(OPTFLGS) -O2|CFLAGS= %{optflags} \$(INCS)|" \
src/makefile.lnx
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(OPTFLGS) -O2|CFLAGS= %{optflags}|" \
vcddiff.dir/src/makefile.lnx


# remove other OS files
%{__rm} -f `find . -name *cygwin*`
%{__rm} -f `find . -name *osx*`


# remove zero byte file
%{__rm} -f `find . -name xxdel.tst`


# To package scripts in doc, change permissions
find . -name "*.sh" | xargs -i chmod 644 {}
find . -name "*.pl" | xargs -i chmod 644 {}


%build
%{__make} -C src -f makefile.lnx
%{__make} -C vcddiff.dir/src -f makefile.lnx

%install
%{__rm} -rf %{buildroot}

%{__install} -d %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_includedir}/cver
%{__install} -d %{buildroot}%{_mandir}/man1

%{__install} -pm 755 bin/*      %{buildroot}%{_bindir}/
%{__install} -pm 644 pli_incs/* %{buildroot}%{_includedir}/cver/
%{__install} -pm 644 doc/*.1    %{buildroot}%{_mandir}/man1/


# removing duplicates
%{__rm} -f doc/*.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc Changelog COPYING LICENSE OUR_PHILOSOPHY
%doc NEW.CVER.2001.RELEASE.NOTES README doc/
%doc pli_src ver_src tests_and_examples/
%doc vcddiff.dir/examples.vcddiff/
%doc dinotrace.dir/
%{_bindir}/cver
%{_bindir}/vcddiff
%{_mandir}/man*/*
%{_includedir}/cver

%changelog
* Tue Sep 29 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 2.11a-2
- Updated valid Source0 package URL.
- Added more PATH, README fixes.
- Remove executable permission on script files in doc section.
- Remove other OS files, and zero byte files.

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.11a-1
- Initial package for fedora.

--- NEW FILE import.log ---
gplcver-2_11a-2_fc11:EL-5:gplcver-2.11a-2.fc11.src.rpm:1254284079


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:58:06 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:07:59 -0000	1.2
@@ -0,0 +1 @@
+gplcver-2.11a.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:58:06 -0000	1.1
+++ sources	30 Sep 2009 04:08:00 -0000	1.2
@@ -0,0 +1 @@
+4967e78c299bdfdb0c9f2dcd4803e734  gplcver-2.11a.src.tar.bz2



From shakthimaan at fedoraproject.org  Wed Sep 30 04:09:10 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 04:09:10 +0000 (UTC)
Subject: rpms/gplcver/F-10 gplcver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930040910.10A2711C00E6@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/gplcver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31379/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gplcver.spec import.log 
Log Message:
First gplcver package.



--- NEW FILE gplcver.spec ---
Name:        gplcver
Version:     2.11a
Release:     2%{?dist}
Summary:     An interpreted Verilog HDL simulator

License:     GPLv2
Group:       Applications/Engineering
URL:         http://www.pragmatic-c.com/gpl-cver

Source0:     http://www.sourcefiles.org/Scientific/Electronic/%{name}-%{version}.src.tar.bz2

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:    dinotrace perl

%description
Cver is a full 1995 IEEE P1364 standard Verilog simulator. It also
implements some of the 2001 P1364 standard features. All three
PLI interfaces (tf_, acc_, and vpi_) are implemented as defined
in the IEEE 2001 P1364 LRM.

GPL Cver is an older version of Cver that is released under the GNU
General Public License. A newer and faster commercial version of Cver
is available from Pragmatic C Software Corp.


%prep
%setup -q -n %{name}-%{version}.src

# preserving timestamps while fixing paths
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         vcddiff.dir/examples.vcddiff/vcddiff_test.sh > vcddiff.ex
touch -r vcddiff.dir/examples.vcddiff/vcddiff_test.sh vcddiff.ex
%{__mv} vcddiff.ex vcddiff.dir/examples.vcddiff/vcddiff_test.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         dinotrace.dir/examples.dino/dino_tst.sh > dino.ex
touch -r dinotrace.dir/examples.dino/dino_tst.sh dino.ex
%{__mv} dino.ex dinotrace.dir/examples.dino/dino_tst.sh

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/config_tst.sh >> config_tst.ex 
touch -r tests_and_examples/v2001/config/config_tst.sh config_tst.ex
%{__mv} config_tst.ex tests_and_examples/v2001/config/config_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/v2001/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/v2001/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.tf/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.tf/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.tf/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.tf/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.tf/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.tf/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/install.tst/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/install.tst/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.acc/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.acc/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.acc/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.acc/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.acc/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.vpi/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.vpi/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.vpi/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.vpi/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.vpi/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.vpi/makefile.lnx


# fixing PATHS in documentation
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/capacity.tst/README > README.ex
touch -r tests_and_examples/capacity.tst/README README.ex
%{__mv} README.ex tests_and_examples/capacity.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/README > README.ex
touch -r tests_and_examples/v2001/README README.ex
%{__mv} README.ex tests_and_examples/v2001/README

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/README > README.ex
touch -r tests_and_examples/v2001/config/README README.ex
%{__mv} README.ex tests_and_examples/v2001/config/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/README > README.ex
touch -r tests_and_examples/install.tst/README README.ex
%{__mv} README.ex tests_and_examples/install.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/README > README.ex
touch -r tests_and_examples/examples.acc/README README.ex
%{__mv} README.ex tests_and_examples/examples.acc/README


# fixing optflags
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(WARNS) \$(INCS) \$(OPTFLGS) -O2|CFLAGS= %{optflags} \$(INCS)|" \
src/makefile.lnx
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(OPTFLGS) -O2|CFLAGS= %{optflags}|" \
vcddiff.dir/src/makefile.lnx


# remove other OS files
%{__rm} -f `find . -name *cygwin*`
%{__rm} -f `find . -name *osx*`


# remove zero byte file
%{__rm} -f `find . -name xxdel.tst`


# To package scripts in doc, change permissions
find . -name "*.sh" | xargs -i chmod 644 {}
find . -name "*.pl" | xargs -i chmod 644 {}


%build
%{__make} -C src -f makefile.lnx
%{__make} -C vcddiff.dir/src -f makefile.lnx

%install
%{__rm} -rf %{buildroot}

%{__install} -d %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_includedir}/cver
%{__install} -d %{buildroot}%{_mandir}/man1

%{__install} -pm 755 bin/*      %{buildroot}%{_bindir}/
%{__install} -pm 644 pli_incs/* %{buildroot}%{_includedir}/cver/
%{__install} -pm 644 doc/*.1    %{buildroot}%{_mandir}/man1/


# removing duplicates
%{__rm} -f doc/*.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc Changelog COPYING LICENSE OUR_PHILOSOPHY
%doc NEW.CVER.2001.RELEASE.NOTES README doc/
%doc pli_src ver_src tests_and_examples/
%doc vcddiff.dir/examples.vcddiff/
%doc dinotrace.dir/
%{_bindir}/cver
%{_bindir}/vcddiff
%{_mandir}/man*/*
%{_includedir}/cver

%changelog
* Tue Sep 29 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 2.11a-2
- Updated valid Source0 package URL.
- Added more PATH, README fixes.
- Remove executable permission on script files in doc section.
- Remove other OS files, and zero byte files.

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.11a-1
- Initial package for fedora.

--- NEW FILE import.log ---
gplcver-2_11a-2_fc11:F-10:gplcver-2.11a-2.fc11.src.rpm:1254284152


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:58:06 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:09:09 -0000	1.2
@@ -0,0 +1 @@
+gplcver-2.11a.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:58:06 -0000	1.1
+++ sources	30 Sep 2009 04:09:09 -0000	1.2
@@ -0,0 +1 @@
+4967e78c299bdfdb0c9f2dcd4803e734  gplcver-2.11a.src.tar.bz2



From shakthimaan at fedoraproject.org  Wed Sep 30 04:10:20 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 04:10:20 +0000 (UTC)
Subject: rpms/gplcver/F-11 gplcver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930041020.5BDB411C048B@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/gplcver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31779/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gplcver.spec import.log 
Log Message:
First gplcver package.



--- NEW FILE gplcver.spec ---
Name:        gplcver
Version:     2.11a
Release:     2%{?dist}
Summary:     An interpreted Verilog HDL simulator

License:     GPLv2
Group:       Applications/Engineering
URL:         http://www.pragmatic-c.com/gpl-cver

Source0:     http://www.sourcefiles.org/Scientific/Electronic/%{name}-%{version}.src.tar.bz2

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:    dinotrace perl

%description
Cver is a full 1995 IEEE P1364 standard Verilog simulator. It also
implements some of the 2001 P1364 standard features. All three
PLI interfaces (tf_, acc_, and vpi_) are implemented as defined
in the IEEE 2001 P1364 LRM.

GPL Cver is an older version of Cver that is released under the GNU
General Public License. A newer and faster commercial version of Cver
is available from Pragmatic C Software Corp.


%prep
%setup -q -n %{name}-%{version}.src

# preserving timestamps while fixing paths
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         vcddiff.dir/examples.vcddiff/vcddiff_test.sh > vcddiff.ex
touch -r vcddiff.dir/examples.vcddiff/vcddiff_test.sh vcddiff.ex
%{__mv} vcddiff.ex vcddiff.dir/examples.vcddiff/vcddiff_test.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         dinotrace.dir/examples.dino/dino_tst.sh > dino.ex
touch -r dinotrace.dir/examples.dino/dino_tst.sh dino.ex
%{__mv} dino.ex dinotrace.dir/examples.dino/dino_tst.sh

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/config_tst.sh >> config_tst.ex 
touch -r tests_and_examples/v2001/config/config_tst.sh config_tst.ex
%{__mv} config_tst.ex tests_and_examples/v2001/config/config_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/v2001/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/v2001/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.tf/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.tf/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.tf/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.tf/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.tf/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.tf/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/install.tst/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/install.tst/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.acc/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.acc/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.acc/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.acc/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.acc/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.vpi/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.vpi/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.vpi/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.vpi/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.vpi/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.vpi/makefile.lnx


# fixing PATHS in documentation
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/capacity.tst/README > README.ex
touch -r tests_and_examples/capacity.tst/README README.ex
%{__mv} README.ex tests_and_examples/capacity.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/README > README.ex
touch -r tests_and_examples/v2001/README README.ex
%{__mv} README.ex tests_and_examples/v2001/README

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/README > README.ex
touch -r tests_and_examples/v2001/config/README README.ex
%{__mv} README.ex tests_and_examples/v2001/config/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/README > README.ex
touch -r tests_and_examples/install.tst/README README.ex
%{__mv} README.ex tests_and_examples/install.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/README > README.ex
touch -r tests_and_examples/examples.acc/README README.ex
%{__mv} README.ex tests_and_examples/examples.acc/README


# fixing optflags
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(WARNS) \$(INCS) \$(OPTFLGS) -O2|CFLAGS= %{optflags} \$(INCS)|" \
src/makefile.lnx
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(OPTFLGS) -O2|CFLAGS= %{optflags}|" \
vcddiff.dir/src/makefile.lnx


# remove other OS files
%{__rm} -f `find . -name *cygwin*`
%{__rm} -f `find . -name *osx*`


# remove zero byte file
%{__rm} -f `find . -name xxdel.tst`


# To package scripts in doc, change permissions
find . -name "*.sh" | xargs -i chmod 644 {}
find . -name "*.pl" | xargs -i chmod 644 {}


%build
%{__make} -C src -f makefile.lnx
%{__make} -C vcddiff.dir/src -f makefile.lnx

%install
%{__rm} -rf %{buildroot}

%{__install} -d %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_includedir}/cver
%{__install} -d %{buildroot}%{_mandir}/man1

%{__install} -pm 755 bin/*      %{buildroot}%{_bindir}/
%{__install} -pm 644 pli_incs/* %{buildroot}%{_includedir}/cver/
%{__install} -pm 644 doc/*.1    %{buildroot}%{_mandir}/man1/


# removing duplicates
%{__rm} -f doc/*.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc Changelog COPYING LICENSE OUR_PHILOSOPHY
%doc NEW.CVER.2001.RELEASE.NOTES README doc/
%doc pli_src ver_src tests_and_examples/
%doc vcddiff.dir/examples.vcddiff/
%doc dinotrace.dir/
%{_bindir}/cver
%{_bindir}/vcddiff
%{_mandir}/man*/*
%{_includedir}/cver

%changelog
* Tue Sep 29 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 2.11a-2
- Updated valid Source0 package URL.
- Added more PATH, README fixes.
- Remove executable permission on script files in doc section.
- Remove other OS files, and zero byte files.

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.11a-1
- Initial package for fedora.

--- NEW FILE import.log ---
gplcver-2_11a-2_fc11:F-11:gplcver-2.11a-2.fc11.src.rpm:1254284219


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:58:06 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:10:20 -0000	1.2
@@ -0,0 +1 @@
+gplcver-2.11a.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:58:06 -0000	1.1
+++ sources	30 Sep 2009 04:10:20 -0000	1.2
@@ -0,0 +1 @@
+4967e78c299bdfdb0c9f2dcd4803e734  gplcver-2.11a.src.tar.bz2



From shakthimaan at fedoraproject.org  Wed Sep 30 04:11:29 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Wed, 30 Sep 2009 04:11:29 +0000 (UTC)
Subject: rpms/gplcver/F-12 gplcver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930041129.B5F2311C00E6@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/gplcver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32275/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gplcver.spec import.log 
Log Message:
First gplcver package.



--- NEW FILE gplcver.spec ---
Name:        gplcver
Version:     2.11a
Release:     2%{?dist}
Summary:     An interpreted Verilog HDL simulator

License:     GPLv2
Group:       Applications/Engineering
URL:         http://www.pragmatic-c.com/gpl-cver

Source0:     http://www.sourcefiles.org/Scientific/Electronic/%{name}-%{version}.src.tar.bz2

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:    dinotrace perl

%description
Cver is a full 1995 IEEE P1364 standard Verilog simulator. It also
implements some of the 2001 P1364 standard features. All three
PLI interfaces (tf_, acc_, and vpi_) are implemented as defined
in the IEEE 2001 P1364 LRM.

GPL Cver is an older version of Cver that is released under the GNU
General Public License. A newer and faster commercial version of Cver
is available from Pragmatic C Software Corp.


%prep
%setup -q -n %{name}-%{version}.src

# preserving timestamps while fixing paths
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         vcddiff.dir/examples.vcddiff/vcddiff_test.sh > vcddiff.ex
touch -r vcddiff.dir/examples.vcddiff/vcddiff_test.sh vcddiff.ex
%{__mv} vcddiff.ex vcddiff.dir/examples.vcddiff/vcddiff_test.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         dinotrace.dir/examples.dino/dino_tst.sh > dino.ex
touch -r dinotrace.dir/examples.dino/dino_tst.sh dino.ex
%{__mv} dino.ex dinotrace.dir/examples.dino/dino_tst.sh

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/config_tst.sh >> config_tst.ex 
touch -r tests_and_examples/v2001/config/config_tst.sh config_tst.ex
%{__mv} config_tst.ex tests_and_examples/v2001/config/config_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/v2001/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/v2001/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.tf/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.tf/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.tf/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.tf/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.tf/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.tf/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/inst_tst.sh > inst_tst.ex 
touch -r tests_and_examples/install.tst/inst_tst.sh inst_tst.ex
%{__mv} inst_tst.ex tests_and_examples/install.tst/inst_tst.sh

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.acc/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.acc/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.acc/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.acc/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.acc/makefile.lnx

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.vpi/inst_pli.sh > inst_pli.ex 
touch -r tests_and_examples/examples.vpi/inst_pli.sh inst_pli.ex
%{__mv} inst_pli.ex tests_and_examples/examples.vpi/inst_pli.sh

%{__sed} -e "s|../../pli_incs|%{_includedir}/cver|"  \
         tests_and_examples/examples.vpi/makefile.lnx > makefile.ex 
touch -r tests_and_examples/examples.vpi/makefile.lnx makefile.ex
%{__mv} makefile.ex tests_and_examples/examples.vpi/makefile.lnx


# fixing PATHS in documentation
%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/capacity.tst/README > README.ex
touch -r tests_and_examples/capacity.tst/README README.ex
%{__mv} README.ex tests_and_examples/capacity.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/README > README.ex
touch -r tests_and_examples/v2001/README README.ex
%{__mv} README.ex tests_and_examples/v2001/README

%{__sed} -e "s|../../../bin|%{_bindir}|"  \
         tests_and_examples/v2001/config/README > README.ex
touch -r tests_and_examples/v2001/config/README README.ex
%{__mv} README.ex tests_and_examples/v2001/config/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/install.tst/README > README.ex
touch -r tests_and_examples/install.tst/README README.ex
%{__mv} README.ex tests_and_examples/install.tst/README

%{__sed} -e "s|../../bin|%{_bindir}|"  \
         tests_and_examples/examples.acc/README > README.ex
touch -r tests_and_examples/examples.acc/README README.ex
%{__mv} README.ex tests_and_examples/examples.acc/README


# fixing optflags
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(WARNS) \$(INCS) \$(OPTFLGS) -O2|CFLAGS= %{optflags} \$(INCS)|" \
src/makefile.lnx
%{__sed} -i \
"s|CFLAGS= \$(ARCHFLGS) -pipe \$(OPTFLGS) -O2|CFLAGS= %{optflags}|" \
vcddiff.dir/src/makefile.lnx


# remove other OS files
%{__rm} -f `find . -name *cygwin*`
%{__rm} -f `find . -name *osx*`


# remove zero byte file
%{__rm} -f `find . -name xxdel.tst`


# To package scripts in doc, change permissions
find . -name "*.sh" | xargs -i chmod 644 {}
find . -name "*.pl" | xargs -i chmod 644 {}


%build
%{__make} -C src -f makefile.lnx
%{__make} -C vcddiff.dir/src -f makefile.lnx

%install
%{__rm} -rf %{buildroot}

%{__install} -d %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_includedir}/cver
%{__install} -d %{buildroot}%{_mandir}/man1

%{__install} -pm 755 bin/*      %{buildroot}%{_bindir}/
%{__install} -pm 644 pli_incs/* %{buildroot}%{_includedir}/cver/
%{__install} -pm 644 doc/*.1    %{buildroot}%{_mandir}/man1/


# removing duplicates
%{__rm} -f doc/*.1


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc Changelog COPYING LICENSE OUR_PHILOSOPHY
%doc NEW.CVER.2001.RELEASE.NOTES README doc/
%doc pli_src ver_src tests_and_examples/
%doc vcddiff.dir/examples.vcddiff/
%doc dinotrace.dir/
%{_bindir}/cver
%{_bindir}/vcddiff
%{_mandir}/man*/*
%{_includedir}/cver

%changelog
* Tue Sep 29 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> 2.11a-2
- Updated valid Source0 package URL.
- Added more PATH, README fixes.
- Remove executable permission on script files in doc section.
- Remove other OS files, and zero byte files.

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.11a-1
- Initial package for fedora.

--- NEW FILE import.log ---
gplcver-2_11a-2_fc11:F-12:gplcver-2.11a-2.fc11.src.rpm:1254284289


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:58:06 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:11:29 -0000	1.2
@@ -0,0 +1 @@
+gplcver-2.11a.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gplcver/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:58:06 -0000	1.1
+++ sources	30 Sep 2009 04:11:29 -0000	1.2
@@ -0,0 +1 @@
+4967e78c299bdfdb0c9f2dcd4803e734  gplcver-2.11a.src.tar.bz2



From pravins at fedoraproject.org  Wed Sep 30 04:18:39 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 30 Sep 2009 04:18:39 +0000 (UTC)
Subject: rpms/ibus-rawcode/F-11 .cvsignore, 1.2, 1.3 ibus-rawcode.spec, 1.2, 
	1.3 sources, 1.2, 1.3 candidate_501907_501911.patch, 1.1, NONE
Message-ID: <20090930041839.0585511C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/ibus-rawcode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1846

Modified Files:
	.cvsignore ibus-rawcode.spec sources 
Removed Files:
	candidate_501907_501911.patch 
Log Message:
* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -1
- upstream release 1.2.0
- bugfix 526359



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-rawcode/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Mar 2009 04:31:51 -0000	1.2
+++ .cvsignore	30 Sep 2009 04:18:38 -0000	1.3
@@ -1 +1,2 @@
 ibus-rawcode-1.0.0.20090303.tar.gz
+ibus-rawcode-1.2.0.20090703.tar.gz


Index: ibus-rawcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-rawcode/F-11/ibus-rawcode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-rawcode.spec	29 Jun 2009 09:24:37 -0000	1.2
+++ ibus-rawcode.spec	30 Sep 2009 04:18:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       ibus-rawcode
-Version:    1.0.0.20090303
-Release:    3%{?dist}
+Version:    1.2.0.20090703
+Release:    1%{?dist}
 Summary:    The Rawcode engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -15,14 +15,12 @@ BuildRequires:  pkgconfig
 BuildRequires:  ibus-devel
 
 Requires:   ibus
-Patch1: candidate_501907_501911.patch
 
 %description
 The Rawcode engine for IBus platform.
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-candidate_501907_501911
 
 %build
 %configure --disable-static
@@ -47,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -1
+- upstream release 1.2.0
+- bugfix 526359
+
 * Mon Jun 29 2009 Pravin Satpute <pravin.d.s at gmail.com> - 1.0.0.20090303-3
 - bug fix 501907 501911
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-rawcode/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Mar 2009 04:31:51 -0000	1.2
+++ sources	30 Sep 2009 04:18:38 -0000	1.3
@@ -1 +1 @@
-26e7aeb1e54ebbab4de222f67ffe174f  ibus-rawcode-1.0.0.20090303.tar.gz
+03fc896cde4c7cdefc24b0b769b8ca94  ibus-rawcode-1.2.0.20090703.tar.gz


--- candidate_501907_501911.patch DELETED ---



From musolinoa at fedoraproject.org  Wed Sep 30 04:58:30 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Wed, 30 Sep 2009 04:58:30 +0000 (UTC)
Subject: rpms/avra/devel avra.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930045830.8483811C00E6@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/avra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12001/devel

Modified Files:
	.cvsignore sources 
Added Files:
	avra.spec import.log 
Log Message:
Imported avra into devel branch



--- NEW FILE avra.spec ---
Name:		avra
Version:	1.2.3
Release:	4%{?dist}
Summary:	Atmel AVR assembler

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://avra.sourceforge.net/
Source0:	http://downloads.sourceforge.net/project/avra/avra/%{version}/avra-%{version}a-src.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	dos2unix
BuildRequires:	unzip

%description
Avra is an assembler for Atmel's AVR 8-bit RISC microcontollers.
It is mostly compatible with Atmel's own assembler, but provides new features
such as better macro support and additional preprocessor directives.
This package also contains various device definition files.


%prep
%setup -q
rm avra

aclocal
autoconf
automake -a

# Fix up encoding of documentation
dos2unix -k AUTHORS
iconv -f ISO-8859-1 -t UTF-8 README -o README.new
touch -r README README.new
mv README.new README

# Unpack include files
unzip AVR000.zip -d include

# Fix permissions and encoding of examples
chmod 644 Example/*
dos2unix -k Example/*


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{_bindir}/install -p" DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/
install -p -m 0644 include/*.inc $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO README ChangeLog COPYING Example
%{_datadir}/%{name}-%{version}
%{_bindir}/%{name}


%changelog
* Tue Sep 29 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-4
- Pass `install` arguments to make via command line arguments

* Fri Sep 25 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-3
- Moved build preperation commands to %%prep section
- Retain timestamps throughout
- Mentioned device definitions in %%description

* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-2
- Added examples
- Added include files

* Sat Sep 19 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-1
- Initial RPM package


--- NEW FILE import.log ---
avra-1_2_3-4_fc10:HEAD:avra-1.2.3-4.fc10.src.rpm:1254286648


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avra/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:17:02 -0000	1.1
+++ .cvsignore	30 Sep 2009 04:58:30 -0000	1.2
@@ -0,0 +1 @@
+avra-1.2.3a-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avra/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:17:02 -0000	1.1
+++ sources	30 Sep 2009 04:58:30 -0000	1.2
@@ -0,0 +1 @@
+738a40e52bb5b836ee7fd816669a99c2  avra-1.2.3a-src.tar.bz2



From musolinoa at fedoraproject.org  Wed Sep 30 05:01:41 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Wed, 30 Sep 2009 05:01:41 +0000 (UTC)
Subject: rpms/avra/F-10 avra.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930050141.BCEB611C00E6@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/avra/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12824/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	avra.spec import.log 
Log Message:
Imported avra into F-10 branch



--- NEW FILE avra.spec ---
Name:		avra
Version:	1.2.3
Release:	4%{?dist}
Summary:	Atmel AVR assembler

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://avra.sourceforge.net/
Source0:	http://downloads.sourceforge.net/project/avra/avra/%{version}/avra-%{version}a-src.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	dos2unix
BuildRequires:	unzip

%description
Avra is an assembler for Atmel's AVR 8-bit RISC microcontollers.
It is mostly compatible with Atmel's own assembler, but provides new features
such as better macro support and additional preprocessor directives.
This package also contains various device definition files.


%prep
%setup -q
rm avra

aclocal
autoconf
automake -a

# Fix up encoding of documentation
dos2unix -k AUTHORS
iconv -f ISO-8859-1 -t UTF-8 README -o README.new
touch -r README README.new
mv README.new README

# Unpack include files
unzip AVR000.zip -d include

# Fix permissions and encoding of examples
chmod 644 Example/*
dos2unix -k Example/*


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{_bindir}/install -p" DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/
install -p -m 0644 include/*.inc $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO README ChangeLog COPYING Example
%{_datadir}/%{name}-%{version}
%{_bindir}/%{name}


%changelog
* Tue Sep 29 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-4
- Pass `install` arguments to make via command line arguments

* Fri Sep 25 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-3
- Moved build preperation commands to %%prep section
- Retain timestamps throughout
- Mentioned device definitions in %%description

* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-2
- Added examples
- Added include files

* Sat Sep 19 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-1
- Initial RPM package


--- NEW FILE import.log ---
avra-1_2_3-4_fc10:F-10:avra-1.2.3-4.fc10.src.rpm:1254286801


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avra/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:17:02 -0000	1.1
+++ .cvsignore	30 Sep 2009 05:01:41 -0000	1.2
@@ -0,0 +1 @@
+avra-1.2.3a-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avra/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:17:02 -0000	1.1
+++ sources	30 Sep 2009 05:01:41 -0000	1.2
@@ -0,0 +1 @@
+738a40e52bb5b836ee7fd816669a99c2  avra-1.2.3a-src.tar.bz2



From rdieter at fedoraproject.org  Wed Sep 30 05:02:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 05:02:42 +0000 (UTC)
Subject: rpms/cmucl/devel cmucl.spec,1.22,1.23
Message-ID: <20090930050242.223B611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmucl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13089

Modified Files:
	cmucl.spec 
Log Message:
fix %%files
s|%%libdir|%%_prefix/lib|



Index: cmucl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- cmucl.spec	30 Sep 2009 04:00:53 -0000	1.22
+++ cmucl.spec	30 Sep 2009 05:02:41 -0000	1.23
@@ -142,26 +142,26 @@ pushd dist
 tar xvjf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.bz2
 tar xvjf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.bz2
 
-mkdir -p %{buildroot}%{_libdir}/cmucl/
-cp -a bin %{buildroot}%{_libdir}/cmucl/
-cp -a lib/cmucl %{buildroot}%{_libdir}/
+mkdir -p %{buildroot}%{_prefix}/lib/cmucl/
+cp -a bin %{buildroot}%{_prefix}/lib/cmucl/
+cp -a lib/cmucl %{buildroot}%{_prefix}/lib/
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p man/man1/* %{buildroot}%{_mandir}/man1/
 popd 
 
 ## Setup app-wrapper
-install -m755 -p -D %{buildroot}%{_libdir}/cmucl/sample-wrapper %{buildroot}%{_bindir}/cmucl
+install -m755 -p -D %{buildroot}%{_prefix}/lib/cmucl/sample-wrapper %{buildroot}%{_bindir}/cmucl
 # Fixup paths in wrapper
-sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" %{buildroot}%{_bindir}/cmucl
-sed -i -e "s|/<<your-cmucl-path>>|%{_libdir}/cmucl|"      %{buildroot}%{_bindir}/cmucl
+sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_prefix}/lib/cmucl/lib|" %{buildroot}%{_bindir}/cmucl
+sed -i -e "s|/<<your-cmucl-path>>|%{_prefix}/lib/cmucl|"      %{buildroot}%{_bindir}/cmucl
 # 
 ln -sf cmucl %{buildroot}%{_bindir}/cmulisp
 # many apps (ie, maxima) expect to find the wrapper named 'lisp' too
 ln -sf cmucl %{buildroot}%{_bindir}/lisp
 
 ## Unpackaged files
-rm -f %{buildroot}%{_libdir}/cmucl/sample-wrapper
+rm -f %{buildroot}%{_prefix}/lib/cmucl/sample-wrapper
 
 # lisp.core contains environment used to build, including %{buildroot} 
 QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
@@ -173,40 +173,41 @@ QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUI
 %{_bindir}/cmucl
 %{_bindir}/cmulisp
 %{_bindir}/lisp
-%dir %{_libdir}/cmucl
-%{_libdir}/cmucl/internals.inc
-%{_libdir}/cmucl/bin/
-%dir %{_libdir}/cmucl/lib
-%{_libdir}/cmucl/lib/lisp-x87.core
-%{_libdir}/cmucl/lib/lisp-sse2.core
-%{_libdir}/cmucl/lib/load-foreign.csh
-%{_libdir}/cmucl/lib/config
-%{_libdir}/cmucl/lib/config.lisp
-%{_libdir}/cmucl/lib/ext-formats/
-%{_libdir}/cmucl/lib/generic-site.lisp
-%{_libdir}/cmucl/lib/Linux-cmucl-linker-script
-%{_libdir}/cmucl/lib/linker.sh
-%{_libdir}/cmucl/lib/lisp.a
-%dir %{_libdir}/cmucl/lib/subsystems
-%{_libdir}/cmucl/lib/subsystems/gray-*-library.*
-%{_libdir}/cmucl/lib/subsystems/iodefs-library.*
-%{_libdir}/cmucl/lib/subsystems/simple-*-library.*
-%{_libdir}/cmucl/lisp.nm
-%{_libdir}/cmucl/lisp.map
-%{_libdir}/cmucl/internals.h
+%dir %{_prefix}/lib/cmucl
+%{_prefix}/lib/cmucl/internals.inc
+%{_prefix}/lib/cmucl/bin/
+%dir %{_prefix}/lib/cmucl/lib
+%{_prefix}/lib/cmucl/lib/lisp-x87.core
+%{_prefix}/lib/cmucl/lib/lisp-sse2.core
+%{_prefix}/lib/cmucl/lib/load-foreign.csh
+%{_prefix}/lib/cmucl/lib/config
+%{_prefix}/lib/cmucl/lib/config.lisp
+%{_prefix}/lib/cmucl/lib/contrib/
+%{_prefix}/lib/cmucl/lib/ext-formats/
+%{_prefix}/lib/cmucl/lib/generic-site.lisp
+%{_prefix}/lib/cmucl/lib/Linux-cmucl-linker-script
+%{_prefix}/lib/cmucl/lib/linker.sh
+%{_prefix}/lib/cmucl/lib/lisp.a
+%dir %{_prefix}/lib/cmucl/lib/subsystems
+%{_prefix}/lib/cmucl/lib/subsystems/gray-*-library.*
+%{_prefix}/lib/cmucl/lib/subsystems/iodefs-library.*
+%{_prefix}/lib/cmucl/lib/subsystems/simple-*-library.*
+%{_prefix}/lib/cmucl/lisp.nm
+%{_prefix}/lib/cmucl/lisp.map
+%{_prefix}/lib/cmucl/internals.h
 %{_mandir}/man1/*
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/cmucl/lib/subsystems/clx-library.*
-%{_libdir}/cmucl/lib/subsystems/hemlock-library.*
-%{_libdir}/cmucl/lib/subsystems/clm-library.*
-%{_libdir}/cmucl/lib/XKeysymDB
-%{_libdir}/cmucl/lib/hemlock11.cursor
-%{_libdir}/cmucl/lib/hemlock11.mask
-%{_libdir}/cmucl/lib/spell-dictionary.bin
-%{_libdir}/cmucl/lib/mh-scan
-%{_libdir}/cmucl/lib/motifd
+%{_prefix}/lib/cmucl/lib/subsystems/clx-library.*
+%{_prefix}/lib/cmucl/lib/subsystems/hemlock-library.*
+%{_prefix}/lib/cmucl/lib/subsystems/clm-library.*
+%{_prefix}/lib/cmucl/lib/XKeysymDB
+%{_prefix}/lib/cmucl/lib/hemlock11.cursor
+%{_prefix}/lib/cmucl/lib/hemlock11.mask
+%{_prefix}/lib/cmucl/lib/spell-dictionary.bin
+%{_prefix}/lib/cmucl/lib/mh-scan
+%{_prefix}/lib/cmucl/lib/motifd
 
 
 %clean



From musolinoa at fedoraproject.org  Wed Sep 30 05:02:58 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Wed, 30 Sep 2009 05:02:58 +0000 (UTC)
Subject: rpms/avra/F-11 avra.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930050258.6FC6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/avra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13205/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	avra.spec import.log 
Log Message:
Imported avra into F-11 branch



--- NEW FILE avra.spec ---
Name:		avra
Version:	1.2.3
Release:	4%{?dist}
Summary:	Atmel AVR assembler

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://avra.sourceforge.net/
Source0:	http://downloads.sourceforge.net/project/avra/avra/%{version}/avra-%{version}a-src.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	dos2unix
BuildRequires:	unzip

%description
Avra is an assembler for Atmel's AVR 8-bit RISC microcontollers.
It is mostly compatible with Atmel's own assembler, but provides new features
such as better macro support and additional preprocessor directives.
This package also contains various device definition files.


%prep
%setup -q
rm avra

aclocal
autoconf
automake -a

# Fix up encoding of documentation
dos2unix -k AUTHORS
iconv -f ISO-8859-1 -t UTF-8 README -o README.new
touch -r README README.new
mv README.new README

# Unpack include files
unzip AVR000.zip -d include

# Fix permissions and encoding of examples
chmod 644 Example/*
dos2unix -k Example/*


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{_bindir}/install -p" DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/
install -p -m 0644 include/*.inc $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO README ChangeLog COPYING Example
%{_datadir}/%{name}-%{version}
%{_bindir}/%{name}


%changelog
* Tue Sep 29 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-4
- Pass `install` arguments to make via command line arguments

* Fri Sep 25 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-3
- Moved build preperation commands to %%prep section
- Retain timestamps throughout
- Mentioned device definitions in %%description

* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-2
- Added examples
- Added include files

* Sat Sep 19 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-1
- Initial RPM package


--- NEW FILE import.log ---
avra-1_2_3-4_fc10:F-11:avra-1.2.3-4.fc10.src.rpm:1254286939


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avra/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:17:02 -0000	1.1
+++ .cvsignore	30 Sep 2009 05:02:58 -0000	1.2
@@ -0,0 +1 @@
+avra-1.2.3a-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avra/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:17:02 -0000	1.1
+++ sources	30 Sep 2009 05:02:58 -0000	1.2
@@ -0,0 +1 @@
+738a40e52bb5b836ee7fd816669a99c2  avra-1.2.3a-src.tar.bz2



From musolinoa at fedoraproject.org  Wed Sep 30 05:04:02 2009
From: musolinoa at fedoraproject.org (Alex Musolino)
Date: Wed, 30 Sep 2009 05:04:02 +0000 (UTC)
Subject: rpms/avra/F-12 avra.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930050402.CF17D11C00E6@cvs1.fedora.phx.redhat.com>

Author: musolinoa

Update of /cvs/pkgs/rpms/avra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13583/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	avra.spec import.log 
Log Message:
Imported avra into F-12 branch



--- NEW FILE avra.spec ---
Name:		avra
Version:	1.2.3
Release:	4%{?dist}
Summary:	Atmel AVR assembler

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://avra.sourceforge.net/
Source0:	http://downloads.sourceforge.net/project/avra/avra/%{version}/avra-%{version}a-src.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	dos2unix
BuildRequires:	unzip

%description
Avra is an assembler for Atmel's AVR 8-bit RISC microcontollers.
It is mostly compatible with Atmel's own assembler, but provides new features
such as better macro support and additional preprocessor directives.
This package also contains various device definition files.


%prep
%setup -q
rm avra

aclocal
autoconf
automake -a

# Fix up encoding of documentation
dos2unix -k AUTHORS
iconv -f ISO-8859-1 -t UTF-8 README -o README.new
touch -r README README.new
mv README.new README

# Unpack include files
unzip AVR000.zip -d include

# Fix permissions and encoding of examples
chmod 644 Example/*
dos2unix -k Example/*


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{_bindir}/install -p" DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/
install -p -m 0644 include/*.inc $RPM_BUILD_ROOT/usr/share/%{name}-%{version}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO README ChangeLog COPYING Example
%{_datadir}/%{name}-%{version}
%{_bindir}/%{name}


%changelog
* Tue Sep 29 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-4
- Pass `install` arguments to make via command line arguments

* Fri Sep 25 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-3
- Moved build preperation commands to %%prep section
- Retain timestamps throughout
- Mentioned device definitions in %%description

* Sun Sep 20 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-2
- Added examples
- Added include files

* Sat Sep 19 2009 Alex Musolino <musolinoa at gmail.com> - 1.2.3-1
- Initial RPM package


--- NEW FILE import.log ---
avra-1_2_3-4_fc10:F-12:avra-1.2.3-4.fc10.src.rpm:1254287012


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avra/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:17:02 -0000	1.1
+++ .cvsignore	30 Sep 2009 05:04:02 -0000	1.2
@@ -0,0 +1 @@
+avra-1.2.3a-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avra/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:17:02 -0000	1.1
+++ sources	30 Sep 2009 05:04:02 -0000	1.2
@@ -0,0 +1 @@
+738a40e52bb5b836ee7fd816669a99c2  avra-1.2.3a-src.tar.bz2



From airlied at fedoraproject.org  Wed Sep 30 05:21:25 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 30 Sep 2009 05:21:25 +0000 (UTC)
Subject: rpms/xorg-x11-drv-dummy/F-12 xorg-x11-drv-dummy.spec,1.25,1.26
Message-ID: <20090930052125.3107C11C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-dummy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16914

Modified Files:
	xorg-x11-drv-dummy.spec 
Log Message:
* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 0.3.2-3
- rebuild for new ABI



Index: xorg-x11-drv-dummy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-dummy/F-12/xorg-x11-drv-dummy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-dummy.spec	27 Jul 2009 08:24:35 -0000	1.25
+++ xorg-x11-drv-dummy.spec	30 Sep 2009 05:21:24 -0000	1.26
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
 Version:   0.3.2
-Release:   2%{?dist}.1
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
+* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 0.3.2-3
+- rebuild for new ABI
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Wed Sep 30 06:06:35 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed, 30 Sep 2009 06:06:35 +0000 (UTC)
Subject: rpms/man-pages-cs/devel man-pages-cs-04.patch, NONE,
	1.1 man-pages-cs-05.patch, NONE, 1.1 man-pages-cs.spec, 1.26, 1.27
Message-ID: <20090930060635.992EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-cs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29610

Modified Files:
	man-pages-cs.spec 
Added Files:
	man-pages-cs-04.patch man-pages-cs-05.patch 
Log Message:
- add another patches created by Ludek Dolihal



man-pages-cs-04.patch:
 shutdown.2     |   29 ++++++-----
 sigreturn.2    |   34 ++++++++-----
 sigvec.2       |  145 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 socketpair.2   |   53 ++++++++++++--------
 undocumented.2 |   67 ++++++++++++++++++++------
 5 files changed, 253 insertions(+), 75 deletions(-)

--- NEW FILE man-pages-cs-04.patch ---
diff -urNp man-pages-cs-0.18.20090209-orig/man-pages/man2/shutdown.2 man-pages-cs-0.18.20090209/man-pages/man2/shutdown.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/shutdown.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/shutdown.2	2009-09-21 13:16:49.000000000 +0200
@@ -1,4 +1,5 @@
-.TH SHUTDOWN 2 "4. dubna 1997" "BSD Man Page" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SHUTDOWN 2 "17. z??? 2009" "BSD Man Page" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -8,20 +9,20 @@ shutdown \- ukon?i ??st pln? duplexn
 .sp
 .BI "int shutdown(int " s ", int " how );
 .SH POPIS
-The
+Vol?n?
 .I shutdown
-m??e ukon?it ??st nebo cel? spojen? soketu
-.I s .
-Je-li 
+m??e ukon?it ??st nebo cel? spojen? t?kaj?c? se soketu
+.IR s .
+Je-li
 .I how
-0, dal?? data nebudou p?ij?m?na. Je-li
+\fBSHUT_RD\fP, dal?? data nebudou p?ij?m?na. Je-li
 .I how
-1, dal?? data nebudou pos?l?na. Je-li
+\fBSHUT_WR\fP, dal?? data nebudou pos?l?na. Je-li
 .I how
-2, nebudou p?ij?m?na ani vys?l?na ??dn? data.
+\fBSHUT_RDWR\fP, nebudou p?ij?m?na ani vys?l?na ??dn? data.
 .SH N?VRATOV? HODNOTA
 Je-li vol?n? ?sp??n?, vrac? se 0, jinak \-1 a je nastavena prom?nn?
-.I errno
+.IR errno .
 
 .SH CHYBY
 .TP 0.8i
@@ -37,10 +38,14 @@ je soubor, ne soket.
 .B ENOTCONN
 Specifikovan? soket nen? spojen.
 .SH SPL?UJE STANDARDY
-4.4BSD (vol?n?
+POSIX.1-2001, 4.4BSD (vol?n?
 .B shutdown
 se poprv? objevilo v 4.2BSD).
+.SH POZN?MKY
+Konstanty \fBSHUT_RD\fP, \fBSHUT_WR\fP, \fBSHUT_RDWR\fP, maj? hodnoty 0, 1, 2
+a jsou definov?ny v \fI<sys/socket.h>\fP od verze glibc-2.1.91.
 .SH DAL?? INFORMACE
 .BR connect "(2), " socket (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
diff -urNp man-pages-cs-0.18.20090209-orig/man-pages/man2/sigreturn.2 man-pages-cs-0.18.20090209/man-pages/man2/sigreturn.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/sigreturn.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/sigreturn.2	2009-09-21 12:12:54.000000000 +0200
@@ -1,3 +1,4 @@
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
 .TH SIGRETURN 2 "18. ?nora 1997" "Linux 1.3.20" "Linux \- p??ru?ka Program?tora"
 .do hla cs
 .do hpf hyphen.cs
@@ -11,14 +12,26 @@ p?id? do n?j vol?n?
 .B sigreturn ","
 tak?e obslu?n? rutina zavol? p?i n?vratu
 .B sigreturn "."
+
 Toto vol?n?
 .B sigreturn
-vr?t? z?sobn?k do p?vodn?ho stavu, tak?e proces m??e pokra?ovat v m?st?,
+vr?t? z?sobn?k do p?vodn?ho stavu;obnov? masku sign?l?, p?ehod? z?sobn?ky a znovu nastav? kontext
+procesu(registry, flagy procesoru), tak?e proces m??e pokra?ovat v m?st?,
 kde byl p?eru?en sign?lem.
+
 .SH "N?VRATOV? HODNOTA"
 Vol?n? funkce
 .B sigreturn
-se nikdy nevrac?.
+() se nikdy nevrac?.
+.SH
+.SH SOUBORY
+/usr/src/linux/arch/i386/kernel/signal.c
+.br
+/usr/src/linux/arch/alpha/kernel/entry.S
+.SH "SPL?UJE STANDARDY"
+Vol?n?
+.B sigreturn
+je specifick? pro Linux a nem?lo by b?t pou??v?no v p?enositeln?ch programech.
 .SH UPOZORN?N?
 Syst?mov? vol?n?
 .B sigreturn
@@ -28,15 +41,10 @@ by nem?lo b?t vol?no p??mo z progra
 Pou?it? parametru
 .I __unused
 je nav?c z?visl? na hardwarov? architektu?e.
-.SH "SPL?UJE STANDARDY"
-Vol?n?
-.B sigreturn
-je specifick? pro Linux a nem?lo by b?t pou??v?no v p?enositeln?ch programech.
-.SH SOUBORY
-/usr/src/linux/arch/i386/kernel/signal.c
-.br
-/usr/src/linux/arch/alpha/kernel/entry.S
+
+
 .SH "DAL?? INFORMACE"
-.BR kill "(2), " signal "(2), " signal (7)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR kill "(2), "sigaltstack "(2), " signal "(2), " signal (7)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
diff -urNp man-pages-cs-0.18.20090209-orig/man-pages/man2/sigvec.2 man-pages-cs-0.18.20090209/man-pages/man2/sigvec.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/sigvec.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/sigvec.2	2009-09-21 12:59:00.000000000 +0200
@@ -1,26 +1,139 @@
-.TH SIGVEC 2 "18. ?nora 1997" "Linux 1.3" "Linux \- p??ru?ka Program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SIGVEC 2 "17. z??? 2009" "Linux 1.3" "Linux \- p??ru?ka Program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-sigvec \- BSD prost?edky pro pr?ci se sign?ly
+sigvec, sigblock, sigsetmask, siggsetmask, sigmask - BSD signal API
 
 .SH SYNTAXE
 .B #include <bsd/signal.h>
 .sp
 .BI "int sigvec(int " sig ", struct sigvec *" vec ", struct sigvec *" ovec );
-
+.sp
+.BI "int sigmask(int " signum);
+.sp
+.BI "int sigblock(int " mask);
+.sp
+.BI "int sigsetmask(int " mask);
+.sp
+.BI "int siggsetmask(void);
+.sp
+Vy?aduje Feature Test Macro pro glibc(viz \fBfeature_stest_macros\fP(7)):
+.sp
+V?echny funkce v??e: _BSD_SOURCE
 .SH POPIS
-Tato funkce je zastaral? a m?sto n? se doporu?uje pou??vat vol?n?
-.BR sigaction (2).
+Toto funkce jsou poskytov?ny v glibc kv?li zp?tn? kompatibilit?.
+N?kter? programy toti? st?le pou??vaj? zastaral? BSD signal API.
+Toto API je v?ak ji? zastaral?. Nov? programy by m?ly pou??vat POSIX
+signal API(\FBsigaction\fP (2), \fBsigprocmask\fP(2), etc.)
 .PP
-V Linuxu je funkce
-.B sigvec
-implementov?na jako makro, volaj?c?
-.BR sigaction .
-Umo??uje p?ibli?n? tot?? co BSD funkce sigvec.
-.SH "SPL?UJE STANDARDY"
-BSD, SVr4
-.SH "DAL?? INFORMACE"
-.BR sigaction "(2), " signal (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+Funkce \fBsigvec\fP() nastavuje a\nebo ?te hodnotu sign?lu \fIsig\fP
+(stejn? jako POSIXov? funkce \fBsigaction\fP(2)). Pokud nen? hodnota
+\fI vec\fP NULL, pak ukazuje na \fIsigvec\fP strukturu, kter? obsahuje
+dispozice pro \fIsig\fP. Pokud \fI ovec\fP nen? NULL pak ukazuje na strukturu,
+kde bude ulo?ena p?edchoz? hodnota \fIsig\fP. Pro z?sk?n? aktu?ln?
+dispozice \fIsig\fP bez toho, aby jsme ji m?nili, je t?eba nastavit NULL
+pro \fIvec\fP a r?zn? od NULL pro \fIovec\fP.
+
+Stav \fB SIGKILL\fP a \fB SIGSOP\fP nesm? b?t m?n?n.
+
+Struktura \fIsigvec\fP m? n?sleduj?c? formu:
+
+struct sigvec{
+   void (*sv_handler)();  /*stav sign?lu*/
+   int    sv_mask;        /*blokovan? sign?ly*/
+   int    sv_flags;       /*p??znaky*/
+.br
+};
+
+Pole \fIsv_handler\fP specifikuje stav obsluhy sign?lu a
+nab?v? jedn? z n?sleduj?c?ch hodnot: adresa obslu?n? funkce;
+nebo \fB SIG_DFL \fP zna??c?, ?e sign?l je nastaven na
+implicitn? hodnotu; nebo \fBSIG_IGN\fP co? zna??, ?e sign?l
+je ignorov?n.
+
+Pokud \fIsv_handler\fP obsahuje adresu funkce, kter? slou?? pro
+obsluhu sign?lu, pak \fIsv_mask\fP specifikuje sadu sign?l?, kter?
+budou blokov?ny b?hem prov?d?n? obslu?n? funkce. Nav?c sign?l, pro
+kter? je vol?na obslu?n? funkce, je blokov?n implicitn?. Pokusy
+o blokov?n? \fBSIGKILL\fP nebo \fBSIGSTOP\fP jsou ti?e
+ignorov?ny.
+
+Pokud \fIsv_handler\fP specifikuje adresu obslu?n? funkce sign?lu,
+pak pole \fIsv_flags\fP specifikuje p??znaky kontroluj?c? co se bude
+odehr?vat v p??pad?, ?e bude vol?na obslu?n? funkce. Toto pole m??e
+obsahovat jeden nebo v?ce n?sleduj?c?ch p??znak?:
+.TP
+.B SV_INTERRUPT
+V p??pad?, ?e obsluha sign?lu p?eru?? blokuj?c? vol?n? syst?mu,
+pak p?i n?vratu z obsluhy sign?lu nebude vol?n? syst?mu restartov?no:
+m?sto toho syst?mov? vol?n? skon?? ne?sp??n? s n?vratovou hodnotou
+\fBEINTR\fP. Nen?-li tento p??znak specifikov?n, jsou syst?mov? vol?n?
+implicitn? restartov?na.
+.TP
+.B SV_RESETHAND
+Nastav? stav sign?lu na implicitn? hodnotu p?ed zavol?n? obslu?n? funkce.
+Pokud nen? tento p??znak specifikov?n, pak obslu?n? funkce z?stane etablov?na,
+dokud nebude explicitn? odstran?na pozd?j??m vol?n?m \fBsigvec\fP() nebo dokud
+proces neprovede \fBexecve\fP(2).
+
+
+.TP
+.B SV_ONSTACK
+Obsluha sign?lu je na alternativn?m sign?lov?m z?sobn?ku (v minulosti z??zen?m pod
+BSD za pou?it? zastaral? funkce \fBsigstack\fP(); POSIX n?hradou za tuto funkci
+je \fBsigaltstack\fP(2)).
+.LP
+Funkce  \fBsigmask\fP() vytvo?? a vr?t? "masku sign?lu" pro \fIsignum\fP.
+Nap??klad m??eme inicializovat pole \fIvec.sv_mask\fP p?edan?
+\fBsigvec\fP() n?sleduj?c?m k?dem:
+
+    vec.sv_mask = sigmask(SIGQUIT) | sigpause(SIGABRT);
+            /* blokuj SIGQUIT a SIGABRT b?hem
+                           prov?d?n? obslu?n? funkce*/
+
+Funkce \fBsigblock\fP() p?id? sign?ly v \fImasce\fP k sign?l?m ji? obsa?en?m
+v masce procesu (stejn? jako POSIX funkce \fIsigprocmask(SIG_BLOCK)\fP) a
+vr?t? p?edchoz? sign?lovou masku. Pokusy o blokov?n? \fBSIGKILL\fP
+nebo \fBSIGSTOP\fP jsou ti?e ignorov?ny.
+
+Funkce \fBsigsetmask\fP() nastavuje nastav? masku sign?l? procesu na hodnotu
+danou v \fImask\fP (stejn? jako POSIX \fIsigprocmask(SIG_SETMASK)\fP) a vr?t?
+p?edchoz? sign?lovou masku.
+
+Funkce \fBsiggetmask\fP() vr?t? aktu?ln? sign?lovou masku procesu. Tato funkce
+je ekvivalentn? \fIsigblock(0)\fP.
+
+.SH N?VRATOV? HODNOTA
+Funkce \fBsigvec\fP() vrac? hodnotu 0 p?i ?sp?chu; p?i chyb? vrac?
+hodnotu -1 a nastav? \fIerrno\fP k indikaci typu chyby.
+
+Funkce \fBsigblock\fP() a \fBsigsetmask\fP() vrac? p?edchoz? sign?lovou masku.
+
+Funkce \fBsigmask\fP() vrac? masku sign?l? pro \fIsignum\fP.
+
+.SH CHYBY
+Viz chyby pod \fBsigaction\fP(2) a \fBsigprocmask\fP(2).
+
+.SH SPL?UJE STANDARDY
+V?echny funkce byly v 4.3BSD vyjma \fBsiggetmask\fP(), jej?? p?vod je nejasn?.
+Tyto funkce jsou zastaral?, nepou??vejte je v nov?ch programech.
+
+.SH POZN?MKY
+Na 4.3BSD poskytovala funkce \fBsignal\fP() jasnou s?mantiku(vol?n?
+\fBsigvec\fP() s \fI vec.sv_mask\fP rovnu 0). Na System V, \fBsignal\fP()
+bohu?el neposkytuje jasnou s?mantiku. Specifikace POSIX.1-2001 nech?v?
+aspekty funkce \fBsignal\fP() nespecifikov?ny. Viz \fBsignal\fP(2) pro
+v?ce detail?.
+
+P?i ?ek?n? na sign?l jak BSD tak System V poskytuj? funkci pojmenovanou
+\fBsigpause\fP(3), ale tato funkce m? na ka?d?m syst?mu jin? parametry.
+Viz \fBsigpause\fP(3) pro v?ce detail?.
+
+.SH DAL?? INFORMACE
+\fBkill\fP(2), \fBpause\fP(2), \fBsigaction\fP(2), \fBsignal\fP(2), \fBsigprocmask\fP(2)
+\fBraise\fP(2), \fBsigpause\fP(3), \fBsigset\fP(3), \fBsignal\fP(7)
+
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
diff -urNp man-pages-cs-0.18.20090209-orig/man-pages/man2/socketpair.2 man-pages-cs-0.18.20090209/man-pages/man2/socketpair.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/socketpair.2	1999-05-31 19:28:29.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/socketpair.2	2009-09-21 13:10:58.000000000 +0200
@@ -1,4 +1,5 @@
-.TH SOCKETPAIR 2 "5. dubna 1997" "BSD Man Page" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SOCKETPAIR 2 "17. z??? 2009" "BSD Man Page" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -11,46 +12,58 @@ socketpair \- vytvo?? p?r spojen?ch 
 .BI "int socketpair(int " d ", int " type ", int " protocol ", int " sv [2]);
 .SH POPIS
 Vol?n?
-.N socketpair
+.B socketpair
 vytvo?? p?r nepojmenovan?ch spojen?ch soket? ve specifikovan?m jmenn?m
-prostoru
+prostoru (dom?n?)
 .IR d ,
 jejich typ bude
 .IR type ,
 pou??van? protokol
 .IR protocol .
-Deskriptory nov?ch soket? jsou vr?ceny v 
-.IR sv [0]
-a
-.IR sv [1].
+Pro v?ce informac? o t?chto parametrech viz \fBsocket\fP(2).
+.br
+.sp
+Deskriptory nov?ch soket? jsou vr?ceny v \fIsv\fP[0] a \fIsv\fP[1].
 Tyto dva sokety jsou nerozli?iteln?.
 .SH N?VRATOV? HODNOTA
 Bylo-li vol?n? ?sp??n?, je vr?cena 0, jinak \-1 a je nastavena extern?
 prom?nn?
-.I errno
+.IR errno .
 .SH CHYBY
 .TP 0.8i
-.B EMFILE
-Soubor m? otev?eno p??li? mnoho soubor?.
-.TP
 .B EAFNOSUPPORT
 Specifikovan? jmenn? prostor nen? na tomto po??ta?i podporov?n.
 .TP
-.B EPROTONOSUPPORT
-Specifikovan? protokol nen? na tomto po??ta?i podporov?n.
-.TP
-.B EOPNOSUPPORT
-Specifikovan? protokol nepodporuje vytvo?en? soketov?ho p?ru.
-.TP
 .B EFAULT
 .I sv
 nen? v platn? ??sti adresov?ho prostoru procesu.
+.TP
+.B EMFILE
+Soubor m? otev?eno p??li? mnoho soubor?.
+.TP
+.B ENFILE
+Byl dosa?en limit pro absolutn? po?et soubor? v syst?mu.
+.TP
+.B EOPNOSUPP
+Specifikovan? protokol nepodporuje vytvo?en? soketov?ho p?ru.
+.TP
+.B EPROTONOSUPPORT
+Specifikovan? protokol nen? na tomto po??ta?i podporov?n.
 .SH SPL?UJE STANDARDY
 4.4BSD (vol?n?
 .B socketpair
 se poprv? objevilo v 4.2BSD). Obvykle p?enositeln? z ne-BSD syst?m?, kter?
 podporuj? BSD Sokety (v?etn? variant syst?mu V).
+.SH POZN?MKY
+Jedin? podporovan? dom?ny pro tato vol?n? jsou v Linuxu \fBAF_UNIX\fP
+(nebo synchronn? \fBAF_LOCAL\fP). (V?t?ina implementac? m? stejn? omezen?.)
+
+POSIX.1-2001 nevy?aduje vlo?en? \fI<sys/types.h>\fP a proto nen? tento hlavi?kov? soubor
+v Linuxu vy?adov?n. Nicm?n? n?kter? star?? (BSD) implementace jej vy?aduj?
+a v p?enositeln?ch aplikac?ch by tak? bylo tento hlavi?kov? soubor zachovat.
+
 .SH DAL?? INFORMACE
-.BR read "(2), " write "(2), " pipe (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR read "(2), " write "(2), " pipe (2), " socket"(2), "unix " (7)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
diff -urNp man-pages-cs-0.18.20090209-orig/man-pages/man2/undocumented.2 man-pages-cs-0.18.20090209/man-pages/man2/undocumented.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/undocumented.2	1999-05-31 19:28:29.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/undocumented.2	2009-09-21 13:12:40.000000000 +0200
@@ -1,4 +1,5 @@
-.TH UNDOCUMENTED 2 "5.ledna 1997" "Linux 1.3.86" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH UNDOCUMENTED 2 "16.z??? 2009" "Linux 1.3.86" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -6,21 +7,59 @@ nedokumentovan? syst?mov? vol?n?
 .SH SYNTAXE
 Nedokumentovan? syst?mov? vol?n?.
 .SH POPIS
-Nyn? je v j?d?e 1.3.88 163 vol?n?, kter? jsou obsa?ena v 
-.IR /usr/include/asm/unistd.h .
-Tato str?nka obsahuje ta z nich, kter? jsou ji? implementov?na, ale je?t?
-nejsou pops?na v manu?lov?ch str?nk?ch.
-N?kter? z t?chto vol?n? je?t? nemaj? prototyp v hlavi?kov?ch souborech
-knihovny libc.
+Tato str?nka zmi?uje takov? funkce knihoven, kter? jsou ji? implementov?ny, ale je?t?
+nejsou pops?ny v manu?lov?ch str?nk?ch.
 .SH ??DOST
 M?te-li o t?chto vol?n?ch n?jak? informace, pros?m pod?vejte se do
 zdrojov?ch text? j?dra a napi?te manu?lovou str?nku (podobn?ho stylu jako
 ostatn? str?nky v sekci 2) a po?lete ji na adresu
-.B aeb at cwi.nl ,
+.B mtk.manpages at gmail.com ,
 abychom ji mohli d?t do dal?? distribuce manu?lov?ch str?nek.
-.SH SITUACE
-Nen? ??dn? nedokumentovan? vol?n? j?dra.
-.SH DAL?? INFORMACE
-.BR obsolete "(2), " unimplemented "(2)"
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH SEZNAM
+\fBauthdes_create\fP(3), \fBauthdes_getucred\fP(3), \fBauthdes_pk_create\fP(3),
+\fBclntunix_create\fP(3), \fBcreat64\fP(3), \fBdn_skipname\fP(3), \fBfcrypt\fP(3),
+\fBfopencookie\fP(3), \fBfp_nquery\fP(3), \fBfp_query\fP(3), \fBfp_resstat\fP(3),
+\fBfreading\fP(3), \fBfreeifaddrs\fP(3), \fBfreeopen64\fP(3), \fBfseeko64\fP(3),
+\fBftello64\fP(3),  \fBftw64\fP(3), \fBfwscanf\fP(3), \fBget_avphys_pages\fP(3),
+\fBgetdirentries64\fP(3), \fBgetmsg\fP(3), \fBgetnetname\fP(3), \fBget_nprocs\fP(3),
+\fBget_nprocs_conf\fP(3), \fBget_phys_pages\fP(3), \fBgetpublickey\fP(3),
+\fBgetsecretkey\fP(3), \fBgetutmp\fP(3), \fBgetutmpx\fP(3), \fBh_errlist\fP(3),
+\fBhost2netname\fP(3), \fBhostalias\fP(3), \fBif_freenameindex\fP(3), \fBif_indextoname\fP(3),
+\fBif_nameindex\fP(3), \fBif_nametoindex\fP(3), \fB inet_nsap_addr\fP(3),
+\fBinet_nsap_ntoa\fP(3), \fBinit_des\fP(3), \fBlibc_nls_init\fP(3),
+\fBlio_listio\fP(3), \fBmallinfo\fP(3), \fBmallopt\fP(3), \fBmcheck\fP(3), \fBmprobe\fP(3),
+\fBmstats\fP(3), \fBnetname2host\fP(3), \fBnetname2user\fP(3), \fBnlist\fP(3),
+\fBobstack_free\fP(3), \fBparse_printf_format\fP(3), \fBp_cdname\fP(3),
+\fBp_cdnname\fP(3), \fBp_class\fP(3), \fBp_fqname\fP(3), \fBp_option\fP(3), \fB p_query\fP(3),
+\fBprintf_size\fP(3), \fB printf_size_info\fP(3), \fBp_rr\fP(3), \fBp_time\fP(3),
+\fBp_type\fP(3), \fBputlong\fP(3), \fBputshort\fP(3), \fBrawmemchr\fP(3), \fBreaddir_r\fP(3),
+\fBre_compile_fastmap\fP(3),\fBre_compile_pattern\fP(3),
+\fBregister_printf_function\fP(3), \fB re_match\fP(3), \fBre_match_2\fP(3),
+\fBre_rx_search\fP(3),  \fBre_search\fP(3), \fBre_search_2\fP(3),
+\fBre_set_registers\fP(3), \fBre_set_syntax\fP(3), \fB res_send_setqhook\fP(3), \fB res_send_setrhook\fP(3), \fBruserpass\fP(3),
+\fBsetfileno\fP(3), \fB sethostfile\fP(3), \fBsvc_exit\fP(3), \fBsvcudp_enablecache\fP(3), \fBtell\fP(3),
+\fBtr_break\fP(3), \fB tzsetwall\fP(3), \fB ufc_dofinalperm\fP(3), \fBufc_doit\fP(3),
+\fBuser2netname\fP(3), \fButmpxname\fP(3), \fBvlimit\fP(3), \fBvtimes\fP(3),
+\fBwcschrnul\fP(3), \fB wcsftime\fP(3), \fB  wscanf\fP(3), \fBxdr_authdes_cred\fP(3),
+\fB xdr_authdes_verf\fP(3), \fBxdr_cryptkeyarg\fP(3), \fBxdr_cryptkeyres\fP(3),
+\fBxdr_datum\fP(3),\fBxdr_des_block\fP(3), \fBxdr_domainname\fP(3),
+\fBxdr_getcredres\fP(3), \fB xdr_keybuf\fP(3), \fBxdr_keystatus\fP(3), \fBxdr_mapname\fP(3),
+\fBxdr_netnamestr\fP(3), \fBxdr_netobj\fP(3), \fBxdr_passwd\fP(3),
+\fBxdr_peername\fP(3), \fB xdr_rmtcall_args\fP(3), \fB xdr_rmtcallres\fP(3),
+\fBxdr_unixcred\fP(3),  \fBxdr_yp_buf\fP(3),  \fBxdr_yp_inaddr\fP(3),
+\fBxdr_ypbind_binding\fP(3), \fBxdr_ypbind_resp\fP(3), \fBxdr_ypbind_resptype\fP(3),
+\fBxdr_ypbind_setdom\fP(3), \fB xdr_ypdelete_args\fP(3), \fBxdr_ypmaplist\fP(3),
+\fBxdr_ypmaplist_str\fP(3),  \fBxdr_yppasswd\fP(3),  \fBxdr_ypreq_key\fP(3),
+\fBxdr_ypreq_nokey\fP(3), \fBxdr_ypresp_all\fP(3), \fB xdr_ypresp_all_seq\fP(3),
+\fBxdr_ypresp_key_val\fP(3), \fB xdr_ypresp_maplist\fP(3), \fBxdr_ypresp_master\fP(3),
+\fBxdr_ypresp_order\fP(3), \fBxdr_ypresp_val\fP(3), \fB xdr_ypstat\fP(3), \fB xdr_ypupdate_args\fP(3),  \fByp_all\fP(3), \fByp_bind\fP(3),
+\fByperr_string\fP(3), \fByp_first\fP(3), \fByp_get_default_domain\fP(3), \fByp_maplist\fP(3),
+\fByp_master\fP(3), \fByp_match\fP(3), \fByp_next\fP(3),\fByp_order\fP(3), \fBypprot_err\fP(3),
+\fByp_unbind\fP(3), \fByp_update\fP(3)
+
+
+
+
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.

man-pages-cs-05.patch:
 chdir.2         |   58 ++++++++++-------
 connect.2       |   93 ++++++++++++++++++++++------
 getpeername.2   |   21 +++++-
 getsockname.2   |   23 ++++---
 listen.2        |  105 ++++++++++++++++++++++++--------
 signal.2        |  182 +++++++++++++++++++++++++++++++++++++-------------------
 sigpause.2      |   48 ++++++++++----
 unimplemented.2 |   32 +++++++--
 8 files changed, 397 insertions(+), 165 deletions(-)

--- NEW FILE man-pages-cs-05.patch ---
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/connect.2 man-pages-cs-0.18.20090209/man-pages/man2/connect.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/connect.2	1999-05-31 19:28:27.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/connect.2	2009-09-29 13:04:54.000000000 +0200
@@ -1,44 +1,86 @@
-.TH CONNECT 2 "5. dubna 1997" "Linux 0.99.11" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH CONNECT 2 "25. z??? 2009" "Linux 0.99.11" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
 connect \- inicializuj spojen? soketu
 .SH SYNTAXE
-.B #include <sys/types.h>
+.B #include <sys/types.h>    /* Viz POZN?MKY*/
 .br
 .B #include <sys/socket.h>
 .sp
-.BI "int connect(int " sockfd ", struct sockaddr *" serv_addr ", int
-.BI " addrlen );
+.BI "int connect(int " sockfd ", struct struct sockaddr *" serv_addr ", socklen_t  " addrlen );
 .SH POPIS
+Syst?mov? vol?n? \fBconnect\fP() p?ipoj? soket specifikovan? v \fIsockfd\fP k adrese
+specifikovan? v \fIserv_addr\fP. Parametr \fIaddrlen\fP ud?v? velikost \fIserv_addr\fP.
+Form?t adresy v \fIserv_addr\fP je d?n adresov?m prostorem deskriptoru v \fIsockfd\fP.
+Viz \fBsocket\fP(2) pro v?ce detail?.
+
 Parametr
 .I sockfd
 je soket.
 Je-li jeho typ
 .BR SOCK_DGRAM ,
-potom toto vol?n? specifikuje, kam m? tento soket standardn? pos?lat data.
-Tato adresa je jedin?m m?stem, odkud a kam budou p?ij?m?ny, resp. pos?l?ny
+pak je \fIserv_addr\fP jedin?m m?stem, odkud a kam budou p?ij?m?ny, resp. pos?l?ny
 datagramy. Je-li typ soketu
-.B SOCK_STREAM ,
-potom se toto vol?n? pokus? nav?zat spojen? s jin?m soketem, kter? je
+.B SOCK_STREAM
+, nebo
+.B SOCK_SEQPACKET
+potom se toto vol?n? pokus? nav?zat spojen? se soketem, kter? je
 specifikov?n v
-.BR serv_addr ,
+.I serv_addr ,
 co? je adresa v jmenn?m prostoru soketu. Ka?d? jmenn? prostor interpretuje
-adresu v 
-.BR serv_addr
-podle sv?ho. Obvykle se mohou proudov? sokety spojit 
+adresu v
+.BR serv_addr.
+
+Obecn? se mohou protokolov? sokety ?sp??n? spojit
 pouze jednou; datagramov? sokety mohou pou??t vol?n?
 .B connect
 v?cekr?t. Datagramov? sokety mohou zru?it asociovan? soket tak, ?e se
-pokus? spojit s n?jakou neplatnou adresou (nebo s adesou NULL).
+pokus? spojit s adresou z \fIsa_family\fP z \fIsockaddr\fP nastavenou
+na \fBAF_UNSPEC\fP (podporov?no od linuxov?ho j?dra 2.2).
 .SH N?VRATOV? HODNOTA
-Je-li spojen? nav?z?no, je vr?cena 0, jinak \-1 a extern? prom?nn? 
+Je-li spojen? nav?z?no, je vr?cena 0, jinak \-1 a extern? prom?nn?
 .I errno
 je p??slu?n? nastavena.
 .SH CHYBY
 Tento seznam je pouze v?eobecn?. Mohou existovat dal?? specifick? chyby pro
 pou?it? jmenn? prostor.
 .TP
+.B EACCES
+Pro sokety unixov? dom?ny, kter? jsou identifikov?ny jm?nem: je odm?tnuto
+zapisov?n? do souboru specifikovan?ho soketem, nebo je odm?tnuto pr?vo
+vyhled?vat v adres???ch specifikovan?ch cestou. (Viz \fBpath_resolution\fP(7).)
+.TP
+.B EACCES, EPERM
+U?ivatel se pokusil p?ipojit k broadcastov? adrese, ani? by m?l povolen
+broadcastov? p??znak na soketu, nebo po?adavek na spojen? byl odm?tnut kv?li
+lok?ln?mu pravidlu firewallu.
+.TP
+.B EAFNOSUPPORT
+Poskytnut? adresa nem? spr?vn? specifikovanou rodinu adres v poli \fIsa_family\fp.
+.TP
+.B EAGAIN
+Nejsou voln? ??dn? lok?ln? porty, nebo jsou nedostate?n? z?znamy v cache
+sm?rova?e.
+Pro \fBAF_INET\fP viz \fPnet.ipv4.ip_local_port_range\fP v \fBip\fP(7)
+,jak zv??it po?et lok?ln?ch port?.
+.TP
+.B EINPROGRESS
+Soket je neblokuj?c? a spojen? nem??e b?t okam?it? dokon?eno. Viz \fBselect\fP(2)
+nebo \fBpoll\fP(2).
+.TP
+.B ETIMEDOUT
+Timeout p?i pokusu o nav?z?n? spojen?. Server m??e b?t p??li? zanepr?zdn?n
+a nen? schopen p?ijmou dal?? spojen?. V?zte, ?e pro IP sokety m??e b?t timeout
+velmi dlouh?, pokud jsou syncookies povoleny na stran? serveru.
+.TP
+.B EINTR
+Syst?mov? vol?n? bylo p?eru?eno doru?en?m sign?lu. Viz \fBsignal\fP(7).
+.TP
+.B EALREADY
+Soket je neblokuj?c? a p?edchoz? pokus o spojen? je?t? nebyl dokon?en.
+.TP
 .B EBADF
 ?patn? deskriptor.
 .TP
@@ -63,12 +105,21 @@
 .B EADDRINUSE
 Adresa je ji? pou??v?na.
 .SH SPL?UJE STANDARDY
-SVr4, 4.4BSD (vol?n?
-.B connect
-se poprv? objevilo v BSD 4.2).  SVr4 dokumentuje dal?? chybov? k?dy:
-EADDRNOTAVAIL, EINVAL, EAFNOSUPPORT, EALREADY, EINTR, EPROTOTYPE, ENOSR.
+SVe4, 4.4BSD, (funkce \fBconnect\fP() se poprv? objevila ve 4.2BSD),
+POSIX.1-2001.
+.SH POZN?MKY
+POSIX.1-2001 nevy?aduje vlo?en? <sys/types.h> a ani na Linuxu nen? tento
+soubor vy?adov?n. Nicm?n? n?kter? star?? (BSD) implementace tento hlavi?kov?
+soubor vy?aduj? a v p?enositeln?ch aplikac?ch by tedy m?l b?t vlo?en.
+
+T?et? argument \fBconnect\fP()je ve skute?nosti \fIint\fP(v BSD4.X
+a libc4 a libc5). N?kter? zmatky v norm? POSIX vy?stily v p??tomnost
+\fIsocklen_t\fP pou??van?m tak? v glibc. Viz \fBaccept\fP(2).
+.SH  P??KLAD
+P??klad pou?it? \fBconnect\fP() je v \fBgetaddrinfo\fP(3).
 .SH DAL?? INFORMACE
 .BR accept "(2), " bind "(2), " listen "(2), "
-.BR socket "(2), " getsockname (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR socket "(2), " getsockname "(2), " path_resolution "(7)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/getpeername.2 man-pages-cs-0.18.20090209/man-pages/man2/getpeername.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/getpeername.2	1999-05-31 19:28:27.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/getpeername.2	2009-09-29 13:05:26.000000000 +0200
@@ -1,9 +1,11 @@
-.TH GETPEERNAME 2 "2. ?ervence 1997" "BSD Man Page" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH GETPEERNAME 2 "25. z??? 2009" "BSD Man Page" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
 getpeername \- vra? adresu vzd?len?ho konce soketu
 .SH SYNTAXE
+.B #include <sys/socket.h>
 .BI "int getpeername(int " s ", struct sockaddr *" name ", int *" namelen );
 .SH POPIS
 .B Getpeername
@@ -44,11 +46,22 @@
 .I name
 ukazuje na pam??, kter? se nenach?z? v platn? ??sti adresov?ho prostoru
 procesu.
+.B EINVAL
+\fINamelen\fP je neplatn?(nap??klad z?porn? ??slo).
 .SH SPL?UJE STANDARDY
 SVr4, 4.4BSD (vol?n?
 .B getpeername
-se poprv? objevilo ve 4.2BSD).
+se poprv? objevilo ve 4.2BSD), POSIX.1-2001 .
+.POZN?MKA
+T?et? argument \fBgetpeername\fP() je ve skute?nosti \fI int *\fP
+(pou?ito v 4.x BSD a libc4 a libc5). N?kter? zmatky okolo POSIXu
+vy?stily v p??tomnost \fIsocklen_t\fP, kter? je tak? u??v?no v glibc.
+Viz
+.B accept
+(2).
 .SH DAL?? INFORMACE
 .BR accept "(2), " bind "(2), " getsockname (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/getsockname.2 man-pages-cs-0.18.20090209/man-pages/man2/getsockname.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/getsockname.2	1999-05-31 19:28:27.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/getsockname.2	2009-09-29 13:06:47.000000000 +0200
@@ -1,9 +1,12 @@
-.TH GETSOCKNAME 2 "29. b?ezna 1997" "BSD Man Page" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH GETSOCKNAME 2 "25. z??? 2009" "BSD Man Page" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
 getsockname \- z?skej jm?no (adresu) soketu
 .SH SYNTAXE
+.B #include <sys/socket.h>
+.br
 .B "int getsockname(int " s ", struct sockaddr *" name ", int *" namelen )
 .SH POPIS
 .B Getsockname
@@ -11,7 +14,7 @@
 .I name .
 Parametr
 .I namelen
-by m?l b?t inicializov?n, aby ukazoval mno?stv? m?sta, na kter? ukazuje 
+by m?l b?t inicializov?n, aby ukazoval mno?stv? m?sta, na kter? ukazuje
 .IR name .
 Po n?vratu bude ukazovat skute?nou velikost vr?cen?ho jm?na (v bajtech).
 .SH N?VRATOV? HODNOTA
@@ -40,13 +43,13 @@
 .SH SPL?UJE STANDARDY
 SVr4, 4.4BSD (vol?n?
 .B getsockname
-se poprv? objevilo v 4.2BSD).  SVr4 dokumentuje dal?? chybov? k?dy ENOMEM
-a ENOSR.
-.SH CHYBY
-Jm?na soket? v dom?n? UNIX nejsou p??stupn?; vol?n?
-.B getsockname
-vrac? data o d?lce 0.
+se poprv? objevilo v 4.2BSD), POSIX.1-2001.
+.SH POZN?MKY
+T?et? argument \fBconnect\fP()je ve skute?nosti \fIint\fP(v BSD4.X
+a libc4 a libc5). N?kter? zmatky v norm? POSIX vy?stily v p??tomnost
+\fIsocklen_t\fP pou??van?m tak? v glibc. Viz \fBaccept\fP(2).
 .SH DAL?? INFORMACE
 .BR bind "(2), " socket (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/chdir.2 man-pages-cs-0.18.20090209/man-pages/man2/chdir.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/chdir.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/chdir.2	2009-09-29 13:04:21.000000000 +0200
@@ -1,4 +1,5 @@
-.TH CHDIR 2 "21. b?ezna 1997" "Linux 1.2.4" "Linux - p??ru?ka Program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH CHDIR 2 "25. z??? 2009" "Linux 1.2.4" "Linux - p??ru?ka Program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -9,22 +10,29 @@
 .BI "int chdir(const char *" path );
 .br
 .BI "int fchdir(int " fd ");"
+
+Po?aduje mno?inu testovac?ch maker pro glibc (viz \fBfeature_test_macros\fP(7)):
+
+\fBfchdir\fP(): _BSD_SOURCE || _XOPEN_SOURCE >= 500
 .SH POPIS
 .B chdir
-zm?n? sou?asn? adres?? na adres?? specifikovan? v 
+()
+zm?n? sou?asn? adres?? na adres?? specifikovan? v
 .IR path .
 .PP
 .B fchdir
+()
 m? tut?? funkci jako
-.BR chdir ,
+.BR chdir
+(),
 pouze s t?m rozd?lem, ?e adres?? je zad?n jako otev?en? deskriptor souboru.
 .SH "N?VRATOV? HODNOTA"
 Bylo-li vol?n? ?sp??n?, je vr?cena nula, jinak \-1 a je nastavena prom?nn?
-.I errno .
+\fIerrno\fP.
 .SH CHYBY
 V z?vislosti na druhu souborov?ho syst?mu mohou b?t vr?ceny i jin? chyby.
 Nejobvyklej?? chyby pro
-.B chmod
+.B chdir
 jsou vyps?ny zde:
 .TP 0.8i
 .B EPERM
@@ -34,6 +42,9 @@
 .I path
 ukazuje mimo v?m p??stupn? adresov? prostor.
 .TP
+.B EIO
+Objevila se vstup/v?stupn? chyba.
+.TP
 .B ENAMETOOLONG
 .I path
 je p??li? dlouh?.
@@ -59,29 +70,30 @@
 .I path
 obsahuje cyklick? odkazy (nap?. p?es symbolick? odkaz)
 .PP
-Obvykl? chyby 
-.B fchmod
+Obvykl? chyby
+.B fchdir
 jsou zde:
 .TP 0.8i
 .B EBADF
 Deskriptor je neplatn?.
 .TP
-.B EPERM
-Viz v??e.
-.TP
-.B EROFS
-Viz v??e.
+.B EACECSS
+Prohled?n? adres??e specifikovan?ho \fIfd\fP bylo odm?tnuto kv?li nedostate?n?m
+pr?v?m.
 .SH "SPL?UJE STANDARDY"
-Vol?n? 
-.B chdir
-je kompatibiln? se SVr4, SVID, POSIX, X/OPEN, 4.4BSD.  SVr4 dokumentuje
-nav?c chyby EIO, EINTR, ENOLINK a EMULTIHOP, ale nem? ENOMEM a EPERM.
-POSIX.1 nem? EPERM, ENOMEM a ELOOP.
+SVr4, 4.4BSD, POSIX.1-2001.
+.SH POZN?MKY
+Aktu?ln? pracovn? adres?? je v?choz?m bodem pro interpretaci relativn?ch cest
+(za??naj? '/').
 
-Vol?n?
-.B fchdir
-spl?uje SVr4 a 4.4BSD. SVr4 dokumentuje nav?c EIO, EINTR a ENOLINK.
+Synovsk? proces vytvo?en? pomoc? \fBfork\fP(2) zd?d? aktu?ln? pracovn? adres??
+sv?ho rodi?e. Pracovn? adres?? je ponech?n beze zm?ny p?i u?it? \fBexecve\fP(2).
+
+Prototyp pro \fBfchdir\fP() je dostupn? pouze kdy? je definov?no \fB_BSD_SOURCE\fP,
+nebo \fB_XOPEN_SOURCE\fP je definov?no s hodnotou 500.
 .SH "VIZ T??"
-.BR getcwd "(3), " chroot (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR getcwd "(3), " chroot "(2), " path_resolution "(7)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/listen.2 man-pages-cs-0.18.20090209/man-pages/man2/listen.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/listen.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/listen.2	2009-09-29 13:06:07.000000000 +0200
@@ -1,61 +1,114 @@
-.TH LISTEN 2 "11.dubna 1997" "BSD Man Page" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH LISTEN 2 "23.z??? 2009" "BSD Man Page" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
 listen \- ?ekej na spojen? na soketu
 .SH SYNTAXE
+.B #include <sys/types.h>    /*viz POZN?MKY*/
 .B #include <sys/socket.h>
 .sp
-.BI "int listen(int " s ", int " backlog );
+.BI "int listen(int " sockfd ", int " backlog );
 .SH POPIS
-K p?ijet? spojen? na soketu je nejd??ve t?eba tento soket vytvo?it funkc?
-.BR socket (2),
-ochota akceptovat p??choz? spojen? a d?lka fronty ?ekaj?c?ch po?adavk? je
-specifikov?na funkc? 
-.BR listen ,
-a pot? jsou po?adavky na spojen? akceptov?ny funkc?
-.BR accept (2).
-Vol?n?
-.B listen
-lze aplikovat pouze na sokety typ?
+
+Funkce \fBlisten\fP(2) ozna?? soket specifikovan? parametrem
+\fIsockfd\fP jako pasivn?, to znamen?, ?e soket bude pou?it
+pro p?ijet? po?adavk? p??choz?ch spojen? pomoc? funkce
+.BR accept
+(2).
+
+
+Parametr
+.I sockfd
+je file deskriptor, kter? popisuje soket, kter? je typu
 .B SOCK_STREAM
 nebo
 .B SOCK_SEQPACKET.
 
 Parametr
 .I backlog
-specifikuje d?lku fronty ?ekaj?c?ch po?adavk? na spojen?. Je-li fronta
+specifikuje maxim?ln? d?lku, do kter? fronta ?ekaj?c?ch po?adavk? na spojen?
+prost?ednictv?m \fIsockfd\fP m??e dor?st. Je-li fronta
 zapln?na, obdr?? klient zpr?vu
-.BR ECONNREFUSED .
+.BR ECONNREFUSED nebo pokud to ni??? vrstva podporuje znovuzasl?n?,
+po?adavek m??e b?t ignorov?n a pozd?j?? pokus o spojen? usp?je.
 .SH N?VRATOV? HODNOTA
 V p??pad? ?sp?chu je vr?cena nula, jinak -1 a je p??slu?n? nastavena
 prom?nn?
 .I errno
 .SH CHYBY
 .TP 0.8i
+.B EADDRINUSE
+Jin? soket u? naslouch? na dan?m portu.
 .B EBADF
 Argument
-.I s
+.I sockfd
 nen? platn?m deskriptorem.
 .TP
 .B ENOTSOCK
 Argument
-.I s
+.I ssockfd
 nen? deskriptorem soketu.
 .TP
 .B EOPNOTSUPP
 Typ soketu nen? podporov?n vol?n?m
 .BR listen .
 .SH SPL?UJE STANDARDY
-SVr4, 4.4BSD (vol?n?
+4.4BSD, POSIX.1-2001. Vol?n? \fBlisten\fP se poprv? objevilo v
+4.2BSD.
+.SH POZN?MKY
+K p?ijet? spojen? jsou provedeny tyto kroky:
+.br
+.TP
+1.
+Je vytvo?en soket pomoc? \fBsocket\fP(2).
+.br
+.TP
+2.
+Soket je nav?z?n na lok?ln? adresu pomoc?
+\fBbind\fP(2), tak?e dal?? sokety na n?j mohou
+b?t napojeny pomoc? \fBconnect\fP(2).
+.br
+.TP
+3.
+Ochota k p?ijet? p??choz?ho spojen? a limit
+pro d?lku fronty jsou specifikov?ny pomoc?
 .B listen
-se poprv? objevilo ve 4.2BSD). 
-.SH CHYBY
-Je-li soket typu AF\_INET a argument backlog je v?t?? ne? 
-konstanta SOMAXCONN (128 v 2.0.29), je ti?e zmen?en na 
-SOMAXCONN. Budete-li ps?t p?enositeln? aplikace, tak si z t?to konstanty nic
-ned?lejte, proto?e nap?. n?kter? BSD syst?my limituj? backlog na 5.
+().
+.br
+.TP
+4.
+Spojen? je p?ijato pomoc?
+.B accept
+(2).
+.br
+.LP
+
+POSIX.1-2001 nevy?aduje vlo?en? \fI<sys/types.h> a
+tento hlavi?kov? soubor nen? vy?adov?n ani v Linuxu.
+Nicm?n? n?kter? star?? (BSD) implementace vy?aduj?
+tento soubor a proto by m?l b?t vlo?en do p?enositeln?ch aplikac?.
+
+Chov?n? argumentu \fIbacklog\fP na TCP soketech
+se zm?nilo v Linuxu 2.2. Nyn? specifikuje d?lku
+fronty pro \fI kompletn?\fP za??zen? soket ?ekaj?c?
+na p?ijet?, m?sto po?tu nekompletn?ch po?adavk?
+na spojen?. Maxim?ln? d?lka fronty nekompletn?ho soketu
+m??e b?t nastavena pomoc? \fItcp_max_syn_backlog\fP
+sysctl. Pokud jsou syncookies povoleny nen? logicky
+??dn? maxim?ln? d?lka a toto sysctl nastaven? je
+ignorov?no. Viz \fBtcp\fP(7) pro v?ce informac?.
+
+Pokud je \fIbacklog\fP argument v?t?? ne? hodnota
+v \fI /proc/sys/ net/core/somaxconn, pak je ti?e
+o??znuta na tuto hodnotu. implicitn? hodnota je
+128. V j?drech star??ch ne? 2.4.25 bylo tato hodnota
+pevn? stanovena na 128.
+.SH P??KLAD
+Viz \fBbind\fP(2).
 .SH DAL?? INFORMACE
-.BR accept "(2), " connect "(2), " socket (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR accept "(2), "bind"(2), " connect "(2), " socket (2)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/signal.2 man-pages-cs-0.18.20090209/man-pages/man2/signal.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/signal.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/signal.2	2009-09-29 13:07:21.000000000 +0200
@@ -1,4 +1,5 @@
-.TH SIGNAL 2 "18. ?nora 1997" "Linux 2.0" "Linux \- p??ru?ka Program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SIGNAL 2 "23.z??? 2009" "Linux 2.0" "Linux \- p??ru?ka Program?tora"
 .do hla cs
 .do hpf hyphen.cs
 
@@ -8,24 +9,41 @@
 .SH SYNTAXE
 .B #include <signal.h>
 .sp 2
-.BI "void (*signal(int " signum ", void (*" handler ")(int)))(int);"
+.B typedef void (*sighandler_t)(int);
+.sp 2
+.BI "sighandler_t signal(int " signum ", sighandler_t " handler ");
 
 .SH POPIS
-Syst?mov? vol?n?
-.B signal
-instaluje novou obslu?nou funkci pro sign?l s ??slem
-.I signum.
-Obsluha sign?lu je nastavena na
-.I handler,
-co? m??e b?t u?ivatelsky definovan? funkce, nebo jedna z n?sleduj?c?ch konstant:
-.RS
-.TP
-.B SIG_IGN
-Sign?l bude ignorov?n.
-.TP
-.B SIG_DFL
-Nastav? se standardn? obsluha sign?lu.
-.RE
+Chov?n? vol?n? \fBsignal\fP() se li?? nap??? distribucemi Unixu a tak?
+se li?? historicky v jednotliv?ch vyd?n?ch Linuxu. \fB Vyhn?te se pou?it?
+t?to funkce.\fP Rad?ji pou?ijte \fB sigaction\fP(2). Viz \fI p?enositelnost\fP
+n??e.
+
+Syst?mov?  vol?n?  \fBsignal\fP  instaluje novou obslu?nou funkci pro
+ sign?l s ??slem \fIsignum\fP.  Obsluha sign?lu je nastavena na  \fIhandler\fP,
+co?  m??e b?t u?ivatelsky definovan? funkce nebo \fBSIG_IGN\fP p??padn?
+\fBSIG_DFL\fP.
+
+Pokud je sign?l \fIsignum\fP p?ijat procesem, stane se jedna z n?sleduj?c?ch
+v?c?:
+.TP
+*
+Je-li nastaveno \fBSIG_IGN\fP sign?l je ignorov?n.
+.TP
+*
+Je-li nastaveno  \fBSIG_DFL\fP je vyvol?na implicitn? funkce.
+.TP
+*
+Pokud je dispozice nastavena na funkci, pak je nejd??v bu? znovu
+nastavena dispozice na \fBSIG_DFL\fP nebo je sign?l blokov?n(viz p?enositelnost
+n??e) a \fIobslu?n? funkce\fP je vol?na s parametrem \fI signum\fP. Pokud vol?n?
+funkce zablokovalo sign?l, je sign?l odblokov?n p?i n?vratu z obslu?n?
+funkce.
+
+.LP
+Sign?ly \fB SIGKILL \fP a \fBSIGSTOP \fP nemohou b?t odchyceny nebo blokov?ny.
+
+
 .PP
 Obslu?n? funkce dostane p?i zavol?n? jako parametr ??slo sign?lu. To umo??uje
 pou??t jednu obslu?nou funkci pro v?ce sign?l?.
@@ -33,52 +51,96 @@
 .SH "N?VRATOV? HODNOTA"
 Funkce
 .B signal
-vrac? p?edchoz? hodnotu obsluhy sign?lu, nebo 
+vrac? p?edchoz? hodnotu obsluhy sign?lu, nebo
 .B SIG_ERR ","
 nastane-li chyba.
-.SH POZN?MKY
-Nelze nastavit obsluhu sign?l?
-.B SIGKILL
-a
-.BR SIGSTOP .
-.PP
-V Linuxu se na rozd?l od syst?m? BSD obsluha sign?lu vrac?
-p?i p??chodu sign?lu na standardn? hodnotu.
-Kdy? ale pou?ijete
-.B "#include <bsd/signal.h>"
-m?sto
-.B "<signal.h>" ","
-je funkce
-.B signal
-p?edefinov?na na
-.B __bsd_signal
-a chov? se jako v BSD.
-Ob? verze funkce
-.B signal
-jsou knihovn? funkce, kter? pou??vaj? syst?mov? vol?n?
-.BR sigaction (2).
-.PP
-Nen?\-li V?m jasn? syntaxe uveden? na za??tku t?to manu?lov? str?nky,
-mo?n? V?m pom??e tento ekvivalentn? z?pis:
-.PP
-typedef void (*sighandler_t)(int);
-.br
-.BI "sighandler_t signal(int " signum ", sighandler_t " handler );
-.PP
-Podle normy POSIX nen? definov?no chov?n? procesu pot?, co
-ignoruje sign?l SIGFPE, SIGILL, nebo SIGSEGV, kter? nebyl generov?n
-funkcemi \fIkill()\fP nebo \fIraise()\fP.
-Celo??seln? d?len? nulou d?v? nedefinovan? v?sledek a
-na n?kter?ch architektur?ch generuje sign?l SIGFPE.
-Ignorov?n? tohoto sign?lu m??e zp?sobit zacyklen? procesu.
-
+.SH "CHYBY"
+.B EINVAL
+.I signum
+je neplatn?
 .SH "SPL?UJE STANDARDY"
-ANSI C
+C89, C99, POSIX.1-2001.
+.SH "POZN?MKY"
+Efekt funkce signal v procesech s vl?kny nejsou specifikov?ny.
+
+Dle specifikace POSIX je chov?n? syst?mu nespecifikov?no, pokud
+ignoruje \fB SIGFPE \fP, \fBSIGILL \fP nebo \fBSIGSEGV \fP sign?l
+pokud nebyl vyvol?n pomoc? \fBkill \fP(2) nebo \fBraise \fP(3).
+Celo??seln? d?len? nulou m? nedefinovan? v?sledek. Na n?kter?ch
+architektur?ch se generuje \fBSIGFRE\fP sign?l. (Tak? d?len?
+nejv?t??ho z?porn?ho cel?ho ??sla -1 generuje \fBSIGFRE\fP).
+Ignorov?n? tohoto sign?lu m??e v?st k nekone?n? smy?ce.
+
+Viz \fBsigaction\fP(2) pro v?ce informac? co se stane je-li
+\fBSIGCHLD\fP nastaveno na \fBSIG_IGN\fP.
+
+Viz \fBsignal\fP(7) pro seznam asynchronn?ch bezpe?n?ch funkc?,
+kter? mohou b?t bezpe?n? vol?ny uvnit? funkce pro obsluhu sign?lu.
+
+Pou?it? \fI sighandler_t\fP je roz???en?m GNU. R?zn? verze
+glibc p?edem definuj? tento typ; libc4 a libc5 definuj?
+\fISignalHandler\fP, glibc definuje \fIsig_t\fP a je-li
+definov?n \fB_GNU_SOURCE\fP pak je definov?n i \fIsighandler_t\fP.
+Bez definice takov?ho typu je deklarace funkce \fBsignal\fP h??e
+?iteln?.
+
+\fB void ( *\fP \fIsignal\fP\fB(int\fP \fIsignum\fP\fB, void (*\fP
+\fIhandler\fP\fB)(int)) ) (int);\fP
+
+.SH P?enositelnost
+Jedin? p?enositeln? pou?it? funkce \fBsignal\fP() je nastavit obsluhu sign?lu
+na \fBSIG_DFL\fP nebo \fBSIG_IGN\fP. S?mantika pou?it? \fBsignal\fP() na nastaven?
+obsluhy sign?lu se li?? na r?zn?ch syst?mech (a POSIX.1 tot explicitn? podporuje).
+\fB Proto jej nepou??vejte za t?mto ??elem.\fP
+
+POSIX.1 vy?e?il tento nesoulad v p?enositelnosti zaveden?m \fBsigaction\fP(2),
+kter? poskytuje explicitn? kontrolu s?mantiky v p??pad? vyvol?n? obsluhy
+sign?lu. Pou??vejte jej proto m?sto \fBsignal\fP()u.
+
+Pokud v p?vodn?ch Unixov?ch syst?mech byla obslu?n? funkce z??zen? pomoc?
+\fBsignal\fP() vyvol?na pomoc? doru?en? sign?lu, stav byl nastaven na
+\fBSIG_DFL\fP a syst?m neblokoval dal?? mo?n? doru?en? tohoto sign?lu.
+System V tak? poskytuje s?mantiku pro \fBsignal\fP(). To bylo ?patn?, proto?e
+sign?l mohl b?t znovu doru?en p?ed t?m, ne? se mohla obsluha sign?lu obnovit.
+Nav?c doru?en? n?kolika sign?lu stejn?ho druhu bezprost?edn? za sebou
+vy?stilo v rekurzivn? vol?n? obsluhy sign?lu.
+
+BSD vylep?ilo tuto situaci zm?nou s?mantiky obsluhy sign?lu (ale nane?t?st?
+v tichosti tak? zm?nily s?mantiku z??zen? obsluhy pomoc? \fbsignal\fP()).
+Kdy? je na BSD vyvol?na obsluha sign?lu , tak nen? dispozice sign?lu znovu
+nastavena a dal?? doru?en? sign?lu je blokov?no dokud se prov?d? obsluha.
 
+Situace na Linuxu je n?sleduj?c?:
+.TP
+*
+Syst?mov? vol?n? j?dra \fBsignal\fP poskytuje System V s?mantiku.
+.TP
+*
+Implicitn? v glibc 2 a pozd?j??ch vyd?n?ch je obalen \fBsignal\fP()
+funkc?, kter? nevol? j?dro syst?mu. M?sto toho vol? \fBsigaction\fP(2)
+a pou??v? p??znaky, kter? zaru?? BSD s?mantiku. Toto chov?n? ja zaru?eno
+po dobu trv?n? definice makra \fB_BSD_SOURCE\fP. Standartn? je \fB_BSD_SOURCE\fP
+definov?no; je tak? implicitn? definov?no, pokud je nadefinov?no \fB_GNU_SOURCE\fP
+a tak? m??e b?t definov?no explicitn?.
+
+Na glibc 2 a pozd?j??ch, pokud nen? \fB_BSD_SOURCE\fP test makro definov?no,
+poskytuje \fBsignal\fP() s?mantiku System V. (Standardn? implicitn? definice
+\fB_BSD_SOURCE\fP nen? poskytnuta, pokud je \fBgcc\fP(1) vyvol?no v jenom ze
+standardn?ch m?d? (-std=xxx nebo -ansi) nebo je definov?no jin? test makro
+jako nap??klad \fB_POSIX_SOURCE\fP, \fB_XOPEN_SOURCE\fP nebo \fB_SVID_SOURCE\fP
+viz \fB feature_test_macros\fP(7).)
+.TP
+Funkce \fBsignal\fP() v Linuxu libc4 a libc5 poskutyje s?mantiku
+System V. Pokud je na libc5 syst?m vlo?eno <bsd/signal.h> m?sto
+<signal.h> pak poskytuje \fBsignal\fP() BSD s?mantiku.
 .SH "DAL?? INFORMACE"
-.BR kill "(1), " kill "(2), " killpg "(2), " pause "(2), " raise "(3), "
-.BR sigaction "(2), " signal "(7), " sigsetops "(3), " sigvec (2),
-.BR alarm (2).
+.BR kill "(1), "alarm "(2)" kill "(2), " killpg "(2), " pause "(2), "
+.BR sigaction "(2), " signalfd "(2),"sigpending "(2) " sigprocmask "(2), "
+.BR sigqueue "(2), " sigsuspend "(2),"bsd_signal "(3) " raise "(3), "
+.BR siginterrupt "(3), " sigsetopts "(3),"sigvec "(3) " sysv_signal "(3), "
+.BR feature_test_macros " (7), " signal " (7).
+
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
 
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/sigpause.2 man-pages-cs-0.18.20090209/man-pages/man2/sigpause.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/sigpause.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/sigpause.2	2009-09-29 13:07:41.000000000 +0200
@@ -1,13 +1,16 @@
-.TH SIGPAUSE 2 "18. ?nora 1997" "Linux 1.3" "Linux - p??ru?ka Program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SIGPAUSE 2 "25. z??? 2009" "Linux 1.3" "Linux - p??ru?ka Program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-sigpause \- uvolni blokovan? sign?ly a ?ekej na p?eru?en?
+sigpause \- atomicky uvoln? blokovan? sign?ly a ?ek? na p?eru?en?
 
 .SH SYNTAXE
 .B #include <signal.h>
 .sp
-.BI "int sigpause(int " sigmask );
+\fB int sigpause(int\fP \fIsigmask\fP\fB);  /* BSD */ \fP
+.sp
+\fB int sigpause(int\fP\fI sig\fP\fB); /* SYSTEM V / Unix 95 */ \fP
 
 .SH POPIS
 Tato funkce je zastaral? a je nahrazena funkc?
@@ -19,21 +22,38 @@
 .I sigmask
 a pot? ?ek? na p??chod sign?lu. P?i n?vratu je obnovena p?vodn? maska sign?l?.
 .PP
-Parametr
-.I sigmask
-je obvykle nastavov?n na nulu, tj. ?e nem? b?t blokov?n ??dn? sign?l.
-Funkce
+.SH N?VRATOV? HODNOTA
+Pokud se funkce
 .B sigpause
-je v?dy ukon?ena p?eru?en?m, vrac? \-1 a glob?ln? prom?nn?
+() vr?t?, byla ukon?ena p?eru?en?m a n?vratov? hodnota je \-1 a glob?ln? prom?nn?
 .I errno
 je nastavena na
 .BR EINTR .
 .SH "SPL?UJE STANDARDY"
-4.4BSD. Funkce
-.B sigpause
-se poprv? objevila v 4.3BSD a jej? pou?it? v nov?ch programech se nedoporu?uje.
+Syst?m V verze funkce \fB sigpause\fP() je standardizov?na v POSIX.1-2001.
+.SH POZN?MKY
+.TP
+\fB Historie\fP
+Klasick? BSD verze t?to funkce se objevila v 4.2BSD. Nastavuje masku sign?l? procesu
+na \fIsigmask\fP. Unix95 standardizoval nekompatibiln? System V verzi t?to funkce,
+kter? odstran? specifikovan? sign?l \fIsig\fP ze sign?lov? masky procesu. Nep?ehledn?
+situace kolem dvou nekompatibiln?ch funkc? se stejn?m n?zvem byla vy?e?ena pomoc?
+funkce \fBsigsuspend\fP(2), kter? bere argument \fIsigset_t *\fP (m?sto \fI int\fP).
+.TP
+.B Linuxov? pozn?mky
+Na Linuxu je tato rutina syst?mov?m vol?n?m pouze na architektu?e Sparc
+(sparc64).
+
+Libc4 a libc5 u??vaj? pouze BSD verzi.
+
+Glibc pou??v? BSD verzi pokud je specifikov?na t??da testovac?ch maker \fB_BSD_SOURCE\fP a
+z?rove? nen? definov?no ??dn? z  \fB_POSIC_SOURCE\fP,\fB_POSIX_C_SOURCE\fP, \fB_XOPEN_SOURCE\fP,
+\fB_GNU_SOURCE\fP, \fB_SVID_SOURCE\fP. System V verze je pou?ita v \fB_XOPEN_SOURCE\fP pokud
+je definov?no.
 .SH "DAL?? INFORMACE"
 .BR sigsuspend "(2), " kill "(2), " sigaction "(2), " sigprocmask "(2), "
-.BR sigblock "(2), " sigvec (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR sigblock "(2), " sigvec " (2), " feature_test_macros "(7)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/unimplemented.2 man-pages-cs-0.18.20090209/man-pages/man2/unimplemented.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/unimplemented.2	1999-05-31 19:28:29.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/unimplemented.2	2009-09-29 13:07:55.000000000 +0200
@@ -1,20 +1,38 @@
-.TH UNIMPLEMENTED 2 "5.ledna 1997" "Linux 1.2.4" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH UNIMPLEMENTED 2 "23.z??? 2009" "Linux 1.2.4" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-afs_syscall, break, gtty, lock, mpx, prof, stty, ulimit
+afs_syscall, break, fattach, fdetach, ftime, getmsg,  getpmsg,
+gtty, isastream, lock, madvise1, mpx, multiplexer, prof,  pro-
+fil, putmsg, putpmsg, security, stty, tuxcall, ulimit, vserver
 \- neimplementovan? syst?mov? vol?n?
+
 .SH SYNTAXE
 Neimplementovan? syst?mov? vol?n?.
 .SH POPIS
-Tato syst?mov? vol?n? nejsou implementov?na v Linuxu verze 1.2.4.
+Tato syst?mov? vol?n? nejsou implementov?na v Linuxov?m j?d?e
+2.6.22
 .SH N?VRATOV? HODNOTA
 Tato syst?mov? vol?n? v?dy vrac? \-1 a nastav?
 .I errno
 na
 .BR ENOSYS .
+.SH POZN?MKY
+Funkce \fBftime\fP(3), \fBprofil\fP(3) a \fBulimit\fP(3) jsou
+implementov?ny jako knihovn? funkce.
+
+N?kter? syst?mov? vol?n? jako \fBalloc_hugepages\fP(2),
+\fBfree_hugepages\fP(2), \fBioperm\fP(2), \fBiopl\fP(2)
+a \fBvm86\fP(2) existuj? pouze na n?kter?ch architektur?ch.
+
+N?kter? syst?mov? vol?n? jako \fBipc\fP(2),
+\fBcreate_module\fP(2), \fBinit_module\fP(2) a \fBdelete_module\fP(2)
+existuj? pouze pokud byla podpora t?chto vol?n? zakompilov?na
+do linuxov?ho j?dra.
 .SH DAL?? INFORMACE
-.BR obsolete (2),
-.BR undocumented (2).
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR syscalls (2)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+


Index: man-pages-cs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-cs/devel/man-pages-cs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- man-pages-cs.spec	15 Sep 2009 11:41:24 -0000	1.26
+++ man-pages-cs.spec	30 Sep 2009 06:06:33 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: Czech man pages from the Linux Documentation Project
 Name: man-pages-cs
 Version: 0.18.20090209
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GFDL and GPL+
 Group: Documentation
 URL: http://sweb.cz/tropikhajma/man-pages-cs/index.html
@@ -10,6 +10,8 @@ Source: http://tropikhajma.sweb.cz/%{nam
 Patch1: man-pages-cs-01.patch
 Patch2: man-pages-cs-02.patch
 Patch3: man-pages-cs-03.patch
+Patch4: man-pages-cs-04.patch
+Patch5: man-pages-cs-05.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -22,6 +24,8 @@ Czech.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # coreutils directory contains newer version
@@ -47,6 +51,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/cs/*
 
 %changelog
+* Tue Sep 28 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-3
+- add another patches created by Ludek Dolihal
+
 * Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-2
 - fix instalation part
 - remove duplicate files



From cchance at fedoraproject.org  Wed Sep 30 06:07:09 2009
From: cchance at fedoraproject.org (cchance)
Date: Wed, 30 Sep 2009 06:07:09 +0000 (UTC)
Subject: rpms/ibus-table/F-11 .cvsignore, 1.9, 1.10 ibus-table.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20090930060709.AEDB611C00E6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29766

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
rebuilt for ibus 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 Jun 2009 04:08:59 -0000	1.9
+++ .cvsignore	30 Sep 2009 06:07:09 -0000	1.10
@@ -1,2 +1 @@
-ibus-table-1.1.0.20090527.tar.gz
-ibus-table-1.1.0.20090316.tar.gz
+ibus-table-1.2.0.20090912.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/ibus-table.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ibus-table.spec	16 Jun 2009 04:14:28 -0000	1.19
+++ ibus-table.spec	30 Sep 2009 06:07:09 -0000	1.20
@@ -1,18 +1,15 @@
 Name:       ibus-table
-Version:    1.1.0.20090610
+Version:    1.2.0.20090912
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-#Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source0:    http://ibus.googlecode.com/files/%{name}-1.1.0.20090316.tar.gz
-Patch0:     ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch
-Patch1:     ibus-table-1.1.0.20090316-4.candidate_order.patch
+Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
-BuildRequires:  ibus-devel > 1.1.0
-Requires:   ibus > 1.1.0
+BuildRequires:  ibus-devel > 1.2
+Requires:   ibus > 1.2
 
 %description
 The package contains general Table engine for IBus platform.
@@ -26,9 +23,7 @@ Requires:   %{name} = %{version}-%{relea
 This package contains additional tables.
 
 %prep
-%setup -q -n %{name}-1.1.0.20090316
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 %build
 %configure --disable-static --enable-additional
@@ -70,7 +65,7 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/py-mode.svg
 %{_datadir}/%{name}/icons/tab-mode.svg
 %{_datadir}/%{name}/icons/chinese.svg
-%{_datadir}/%{name}/icons/dcommit.svg
+%{_datadir}/%{name}/icons/acommit.svg
 %{_datadir}/%{name}/icons/english.svg
 %{_datadir}/%{name}/icons/ncommit.svg
 %{_datadir}/%{name}/data/pinyin_table.txt.bz2
@@ -109,13 +104,15 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Wed Sep 30 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090912-1.fc11
+- Rebuilt with IBus 1.2.
+
 * Tue Jun 16 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090609-1.fc11
 - Resolves: rhbz#505700 (Cannout input CangJie and Quick.)
 
 * Wed May 27 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090527-1.fc11
 - Updated source tarball from upstream, which with candidate order fix.
 
-
 * Mon Mar 16 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-1.fc11
 - Resolves: rhbz#490396
 - Updated source tarball.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Jun 2009 04:08:59 -0000	1.10
+++ sources	30 Sep 2009 06:07:09 -0000	1.11
@@ -1,2 +1 @@
-84a2cceaf596780269af80c897d5f037  ibus-table-1.1.0.20090527.tar.gz
-f512ac6bd166c68c8308a255fcd77d48  ibus-table-1.1.0.20090316.tar.gz
+22c3994f665b129adc1db6eabed90fda  ibus-table-1.2.0.20090912.tar.gz



From cchance at fedoraproject.org  Wed Sep 30 06:24:31 2009
From: cchance at fedoraproject.org (cchance)
Date: Wed, 30 Sep 2009 06:24:31 +0000 (UTC)
Subject: rpms/ibus-table-cangjie/F-11 .cvsignore, 1.2,
	1.3 ibus-table-cangjie.spec, 1.9, 1.10 sources, 1.2, 1.3
Message-ID: <20090930062431.F3E7011C00E6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-cangjie/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3078

Modified Files:
	.cvsignore ibus-table-cangjie.spec sources 
Log Message:
rebuilt w/ ibus 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 01:25:53 -0000	1.2
+++ .cvsignore	30 Sep 2009 06:24:31 -0000	1.3
@@ -1 +1,2 @@
-ibus-table-cangjie-1.1.0.20090309.tar.gz
+ibus-table-quick-1.2.0.20090902.tar.gz
+ibus-table-cangjie-1.2.0.20090717.tar.gz


Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/ibus-table-cangjie.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ibus-table-cangjie.spec	15 Jul 2009 06:16:46 -0000	1.9
+++ ibus-table-cangjie.spec	30 Sep 2009 06:24:31 -0000	1.10
@@ -1,42 +1,42 @@
 Name:       ibus-table-cangjie
-Version:    1.1.0.20090309
-Release:    13%{?dist}
-Summary:    Cang Jie input methods for ibus-table
+Version:    1.2.0.20090717
+Release:    1%{?dist}
+Summary:    CangJie table(s) for ibus-table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    COPYING.tables
+Source1:    http://ibus.googlecode.com/files/ibus-table-quick-1.2.0.20090902.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 # for noarch pkgconfig
-Requires:   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-Requires(post):   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-BuildRequires: ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
+Requires:   ibus >= 1.2, ibus-table >= 1.2
+BuildRequires: ibus >= 1.2, ibus-table >= 1.2
 BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.1
 
 %description
-The package contains Cang Jie input methods for Table engine of IBus platform. 
+The package contains CangJie table for Table engine of IBus platform. 
 
 %prep
-%setup -q
-%__cp COPYING icons/COPYING.icons
-%__cp %{SOURCE1} tables/COPYING.tables
+%setup0 -q -b 0 -n %{name}-%{version}
+%setup1 -q -b 1 -n ibus-table-quick-1.2.0.20090902
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
-./autogen.sh \
-    --prefix=%{_prefix} \
-    --enable-cangjie5 \
-    --enable-cangjie3 \
-    --enable-quick5 \
-    --enable-quick3
+
+cd ../%{name}-%{version}
+./autogen.sh --prefix=%{_prefix} --enable-cangjie5 --enable-cangjie3
 %__make %{?_smp_mflags}
+cd ../ibus-table-quick-1.2.0.20090902/
+./autogen.sh --prefix=%{_prefix} --enable-quick5 --enable-quick3
 
 %install
 %__rm -rf %{buildroot}
+cd ../%{name}-%{version}
+make DESTDIR=%{buildroot} INSTALL="install -p" NO_INDEX=true install
+cd ../ibus-table-quick-1.2.0.20090902/
 make DESTDIR=%{buildroot} INSTALL="install -p" NO_INDEX=true install
 
 %clean
@@ -48,10 +48,11 @@ cd %{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cangjie5.db
 %{_bindir}/ibus-table-createdb -i -n quick3.db
 %{_bindir}/ibus-table-createdb -i -n quick5.db
+%{_bindir}/ibus-table-createdb -i -n quick-classic.db
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
+%doc AUTHORS COPYING README
 %dir %{_datadir}/ibus-table
 %dir %{_datadir}/ibus-table/icons
 %dir %{_datadir}/ibus-table/tables
@@ -59,12 +60,17 @@ cd %{_datadir}/ibus-table/tables/
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.db
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick-classic.db
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
 %{_datadir}/ibus-table/icons/quick3.png
 %{_datadir}/ibus-table/icons/quick5.png
+%{_datadir}/ibus-table/icons/quick-classic.png
 
 %changelog
+* Wed Sep 30 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090717-1.fc11
+- Rebuilt for ibus 1.2.
+
 * Tue Jun 23 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090309-13.fc11
 - Refined macros.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 01:25:54 -0000	1.2
+++ sources	30 Sep 2009 06:24:31 -0000	1.3
@@ -1 +1,2 @@
-21b4c23cd7c700330d7006d8c38f3b2e  ibus-table-cangjie-1.1.0.20090309.tar.gz
+488c33d4ae2b35aa82764cb746fe4cb4  ibus-table-quick-1.2.0.20090902.tar.gz
+c18db9f349ff92479c5528e1ea61fe79  ibus-table-cangjie-1.2.0.20090717.tar.gz



From salimma at fedoraproject.org  Wed Sep 30 06:30:47 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 06:30:47 +0000 (UTC)
Subject: rpms/llvm/devel llvm-2.6-destdir.patch,1.1,1.2 llvm.spec,1.37,1.38
Message-ID: <20090930063047.63D2911C0261@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5955

Modified Files:
	llvm-2.6-destdir.patch llvm.spec 
Log Message:
Reworked destdir patch, due to slight changes in Makefiles


llvm-2.6-destdir.patch:
 Makefile.config.in         |   16 +++++++--------
 Makefile.rules             |   46 ++++++++++++++++++++++-----------------------
 docs/CommandGuide/Makefile |    6 ++---
 docs/Makefile              |   24 +++++++++++------------
 docs/tutorial/Makefile     |    2 -
 lib/VMCore/Makefile        |    4 +--
 tools/gccas/Makefile       |    4 +--
 tools/gccld/Makefile       |    4 +--
 tools/llvm-config/Makefile |    4 +--
 9 files changed, 55 insertions(+), 55 deletions(-)

Index: llvm-2.6-destdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm-2.6-destdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- llvm-2.6-destdir.patch	7 Sep 2009 06:59:47 -0000	1.1
+++ llvm-2.6-destdir.patch	30 Sep 2009 06:30:46 -0000	1.2
@@ -1,39 +1,102 @@
-From 5a380ce5d1c8d5a1474764a7a54a1e2072fddb03 Mon Sep 17 00:00:00 2001
-From: Erick Tryzelaar <idadesub at users.sourceforge.net>
-Date: Fri, 21 Aug 2009 11:59:01 -0700
-Subject: [PATCH] Rewrite makefiles to explicitly reference DESTDIR so we can not bake DESTDIR
- into the O'Caml symlinks.
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="------------1.6.4"
-
-This is a multi-part message in MIME format.
---------------1.6.4
-Content-Type: text/plain; charset=UTF-8; format=fixed
-Content-Transfer-Encoding: 8bit
-
----
- Makefile.config.in         |   16 +++++++-------
- Makefile.rules             |   46 ++++++++++++++++++++++----------------------
- docs/CommandGuide/Makefile |    6 ++--
- docs/Makefile              |   24 +++++++++++-----------
- docs/tutorial/Makefile     |    2 +-
- lib/VMCore/Makefile        |    4 +-
- tools/gccas/Makefile       |    4 +-
- tools/gccld/Makefile       |    4 +-
- tools/llvm-config/Makefile |    4 +-
- 9 files changed, 55 insertions(+), 55 deletions(-)
-
-
---------------1.6.4
-Content-Type: text/x-patch; name="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
-
-diff --git Makefile.config.in Makefile.config.in
-index ecd0595..73656f7 100644
---- Makefile.config.in
-+++ Makefile.config.in
-@@ -76,14 +76,14 @@ endif
+diff -ru llvm-2.6.orig/docs/CommandGuide/Makefile llvm-2.6/docs/CommandGuide/Makefile
+--- llvm-2.6.orig/docs/CommandGuide/Makefile	2009-08-31 02:25:32.000000000 -0400
++++ llvm-2.6/docs/CommandGuide/Makefile	2009-09-30 02:28:03.107649582 -0400
+@@ -77,9 +77,9 @@
+ clean-local::
+ 	$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
+ 
+-HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
+-MAN_DIR  := $(PROJ_mandir)/man1
+-PS_DIR   := $(PROJ_docsdir)/ps
++HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
++MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
++PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
+ 
+ install-local:: $(HTML) $(INSTALL_MANS) $(PS)
+ 	$(Echo) Installing HTML CommandGuide Documentation
+diff -ru llvm-2.6.orig/docs/Makefile llvm-2.6/docs/Makefile
+--- llvm-2.6.orig/docs/Makefile	2008-03-31 13:27:57.000000000 -0400
++++ llvm-2.6/docs/Makefile	2009-09-30 02:28:03.110650445 -0400
+@@ -48,11 +48,11 @@
+ 
+ install-html: $(PROJ_OBJ_DIR)/html.tar.gz
+ 	$(Echo) Installing HTML documentation
+-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
+-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
+-	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
+-	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
++	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
++	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
++	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
++	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
++	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ 
+ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+ 	$(Echo) Packaging HTML documentation
+@@ -63,11 +63,11 @@
+ 
+ install-doxygen: doxygen
+ 	$(Echo) Installing doxygen documentation
+-	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
++	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
++	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+ 	  $(FIND) . -type f -exec \
+-	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
++	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+ 
+ doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
+ 
+@@ -94,11 +94,11 @@
+ 
+ install-ocamldoc: ocamldoc
+ 	$(Echo) Installing ocamldoc documentation
+-	$(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
++	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
++	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
+ 	  $(FIND) . -type f -exec \
+-	    $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
++	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
+ 
+ ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
+ 
+@@ -122,4 +122,4 @@
+ 
+ uninstall-local::
+ 	$(Echo) Uninstalling Documentation
+-	$(Verb) $(RM) -rf $(PROJ_docsdir)
++	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
+diff -ru llvm-2.6.orig/docs/tutorial/Makefile llvm-2.6/docs/tutorial/Makefile
+--- llvm-2.6.orig/docs/tutorial/Makefile	2008-03-30 16:32:18.000000000 -0400
++++ llvm-2.6/docs/tutorial/Makefile	2009-09-30 02:28:03.112652092 -0400
+@@ -12,7 +12,7 @@
+ 
+ HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
+ EXTRA_DIST := $(HTML) index.html
+-HTML_DIR   := $(PROJ_docsdir)/html/tutorial
++HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
+ 
+ install-local:: $(HTML)
+ 	$(Echo) Installing HTML Tutorial Documentation
+diff -ru llvm-2.6.orig/lib/VMCore/Makefile llvm-2.6/lib/VMCore/Makefile
+--- llvm-2.6.orig/lib/VMCore/Makefile	2009-01-09 11:44:42.000000000 -0500
++++ llvm-2.6/lib/VMCore/Makefile	2009-09-30 02:28:03.114651503 -0400
+@@ -29,5 +29,5 @@
+ 	    changed significantly. )
+ 
+ install-local:: $(GENFILE)
+-	$(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
+-	$(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
++	$(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
++	$(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
+diff -ru llvm-2.6.orig/Makefile.config.in llvm-2.6/Makefile.config.in
+--- llvm-2.6.orig/Makefile.config.in	2009-08-17 20:40:33.000000000 -0400
++++ llvm-2.6/Makefile.config.in	2009-09-30 02:28:03.099649281 -0400
+@@ -76,14 +76,14 @@
  
  LLVMMAKE := $(LLVM_SRC_ROOT)/make
  
@@ -56,11 +119,10 @@ index ecd0595..73656f7 100644
  
  # Determine if we're on a unix type operating system
  LLVM_ON_UNIX:=@LLVM_ON_UNIX@
-diff --git Makefile.rules Makefile.rules
-index 5556684..08965f3 100644
---- Makefile.rules
-+++ Makefile.rules
-@@ -720,7 +720,7 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+diff -ru llvm-2.6.orig/Makefile.rules llvm-2.6/Makefile.rules
+--- llvm-2.6.orig/Makefile.rules	2009-09-12 18:25:41.000000000 -0400
++++ llvm-2.6/Makefile.rules	2009-09-30 02:28:03.104648788 -0400
+@@ -725,7 +725,7 @@
  # in the file so they get built before dependencies
  #---------------------------------------------------------
  
@@ -69,7 +131,7 @@ index 5556684..08965f3 100644
  	$(Verb) $(MKDIR) $@
  
  # To create other directories, as needed, and timestamp their creation
-@@ -842,22 +842,22 @@ install-local::
+@@ -847,22 +847,22 @@
  uninstall-local::
  	$(Echo) UnInstall circumvented with NO_INSTALL
  else
@@ -98,7 +160,7 @@ index 5556684..08965f3 100644
  	done
  endif
  
-@@ -944,7 +944,7 @@ endif
+@@ -949,7 +949,7 @@
  ifdef BYTECODE_DESTINATION
  ModuleDestDir := $(BYTECODE_DESTINATION)
  else
@@ -107,7 +169,7 @@ index 5556684..08965f3 100644
  endif
  
  ifdef NO_INSTALL
-@@ -1023,17 +1023,17 @@ install-local::
+@@ -1028,17 +1028,17 @@
  uninstall-local::
  	$(Echo) Uninstall circumvented with NO_INSTALL
  else
@@ -128,7 +190,7 @@ index 5556684..08965f3 100644
  endif
  endif
  
-@@ -1078,7 +1078,7 @@ endif
+@@ -1083,7 +1083,7 @@
  ifdef BYTECODE_DESTINATION
  BytecodeDestDir := $(BYTECODE_DESTINATION)
  else
@@ -137,7 +199,7 @@ index 5556684..08965f3 100644
  endif
  
  DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).bca
-@@ -1141,13 +1141,13 @@ install-local::
+@@ -1146,13 +1146,13 @@
  uninstall-local::
  	$(Echo) Uninstall circumvented with NO_INSTALL
  else
@@ -154,7 +216,7 @@ index 5556684..08965f3 100644
  	$(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib)
  
  uninstall-local::
-@@ -1225,11 +1225,11 @@ install-local::
+@@ -1230,11 +1230,11 @@
  uninstall-local::
  	$(Echo) Uninstall circumvented with NO_INSTALL
  else
@@ -168,7 +230,7 @@ index 5556684..08965f3 100644
  	$(Echo) Installing $(BuildMode) $(DestTool)
  	$(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
  
-@@ -1824,25 +1824,25 @@ uninstall-local::
+@@ -1829,25 +1829,25 @@
  else
  install-local::
  	$(Echo) Installing include files
@@ -198,7 +260,7 @@ index 5556684..08965f3 100644
  	  done ; \
  	fi
  endif
-@@ -1854,10 +1854,10 @@ uninstall-local::
+@@ -1859,10 +1859,10 @@
  	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
  	      '!' '(' -name '*~' -o -name '.#*' \
          -o -name '*.in' ')' -print ')' | \
@@ -211,110 +273,10 @@ index 5556684..08965f3 100644
  	fi
  endif
  endif
-diff --git docs/CommandGuide/Makefile docs/CommandGuide/Makefile
-index cf77e6a..28835ac 100644
---- docs/CommandGuide/Makefile
-+++ docs/CommandGuide/Makefile
-@@ -71,9 +71,9 @@ EXTRA_DIST := $(POD) index.html
- clean-local::
- 	$(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
- 
--HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
--MAN_DIR  := $(PROJ_mandir)/man1
--PS_DIR   := $(PROJ_docsdir)/ps
-+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
-+MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
-+PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
- 
- install-local:: $(HTML) $(MAN) $(PS)
- 	$(Echo) Installing HTML CommandGuide Documentation
-diff --git docs/Makefile docs/Makefile
-index 310c4bd..30cd8a7 100644
---- docs/Makefile
-+++ docs/Makefile
-@@ -48,11 +48,11 @@ generated:: doxygen ocamldoc
- 
- install-html: $(PROJ_OBJ_DIR)/html.tar.gz
- 	$(Echo) Installing HTML documentation
--	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
--	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
--	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
--	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
--	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
-+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
-+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
-+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
-+	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
-+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
- 
- $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- 	$(Echo) Packaging HTML documentation
-@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- 
- install-doxygen: doxygen
- 	$(Echo) Installing doxygen documentation
--	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
--	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
-+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
-+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
- 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
- 	  $(FIND) . -type f -exec \
--	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
-+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
- 
- doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
- 
-@@ -94,11 +94,11 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
- 
- install-ocamldoc: ocamldoc
- 	$(Echo) Installing ocamldoc documentation
--	$(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
--	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
-+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
-+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
- 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
- 	  $(FIND) . -type f -exec \
--	    $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
-+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
- 
- ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
- 
-@@ -122,4 +122,4 @@ $(PROJ_OBJ_DIR)/ocamldoc.tar.gz:
- 
- uninstall-local::
- 	$(Echo) Uninstalling Documentation
--	$(Verb) $(RM) -rf $(PROJ_docsdir)
-+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
-diff --git docs/tutorial/Makefile docs/tutorial/Makefile
-index 6169bb8..9082ad4 100644
---- docs/tutorial/Makefile
-+++ docs/tutorial/Makefile
-@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.common
- 
- HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
- EXTRA_DIST := $(HTML) index.html
--HTML_DIR   := $(PROJ_docsdir)/html/tutorial
-+HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
- 
- install-local:: $(HTML)
- 	$(Echo) Installing HTML Tutorial Documentation
-diff --git lib/VMCore/Makefile lib/VMCore/Makefile
-index e9d3dc8..c4817a5 100644
---- lib/VMCore/Makefile
-+++ lib/VMCore/Makefile
-@@ -29,5 +29,5 @@ $(GENFILE): $(ObjDir)/Intrinsics.gen.tmp
- 	    changed significantly. )
- 
- install-local:: $(GENFILE)
--	$(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
--	$(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
-+	$(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
-+	$(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
-diff --git tools/gccas/Makefile tools/gccas/Makefile
-index ff84d96..594f9e4 100644
---- tools/gccas/Makefile
-+++ tools/gccas/Makefile
-@@ -10,9 +10,9 @@ LEVEL = ../..
+diff -ru llvm-2.6.orig/tools/gccas/Makefile llvm-2.6/tools/gccas/Makefile
+--- llvm-2.6.orig/tools/gccas/Makefile	2007-12-29 15:07:17.000000000 -0500
++++ llvm-2.6/tools/gccas/Makefile	2009-09-30 02:28:03.116650426 -0400
+@@ -10,9 +10,9 @@
  
  include $(LEVEL)/Makefile.common
  
@@ -326,11 +288,10 @@ index ff84d96..594f9e4 100644
  	$(Echo) Installing gccas shell script.
  	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
  	$(Verb) chmod 0755 $@
-diff --git tools/gccld/Makefile tools/gccld/Makefile
-index b2d3f73..8ec0307 100644
---- tools/gccld/Makefile
-+++ tools/gccld/Makefile
-@@ -11,9 +11,9 @@ LEVEL = ../..
+diff -ru llvm-2.6.orig/tools/gccld/Makefile llvm-2.6/tools/gccld/Makefile
+--- llvm-2.6.orig/tools/gccld/Makefile	2007-12-29 15:07:17.000000000 -0500
++++ llvm-2.6/tools/gccld/Makefile	2009-09-30 02:28:03.117649993 -0400
+@@ -11,9 +11,9 @@
  
  include $(LEVEL)/Makefile.common
  
@@ -342,11 +303,10 @@ index b2d3f73..8ec0307 100644
  	$(Echo) Installing gccld shell script.
  	$(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
  	$(Verb) chmod 0755 $@
-diff --git tools/llvm-config/Makefile tools/llvm-config/Makefile
-index 6eedca0..8659681 100644
---- tools/llvm-config/Makefile
-+++ tools/llvm-config/Makefile
-@@ -87,6 +87,6 @@ clean-local::
+diff -ru llvm-2.6.orig/tools/llvm-config/Makefile llvm-2.6/tools/llvm-config/Makefile
+--- llvm-2.6.orig/tools/llvm-config/Makefile	2009-03-10 15:01:23.000000000 -0400
++++ llvm-2.6/tools/llvm-config/Makefile	2009-09-30 02:28:03.119650243 -0400
+@@ -87,6 +87,6 @@
  	  $(LibDeps) GenLibDeps.out
  install-local:: all-local
  	$(Echo) Installing llvm-config
@@ -355,7 +315,3 @@ index 6eedca0..8659681 100644
 +	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
 +	$(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
  
-
---------------1.6.4--
-
-


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- llvm.spec	30 Sep 2009 01:42:01 -0000	1.37
+++ llvm.spec	30 Sep 2009 06:30:47 -0000	1.38
@@ -158,7 +158,7 @@ HTML documentation for LLVM's OCaml bind
 %setup -q -n llvm-%{version} -a1 %{?_with_gcc:-a2}
 mv clang-2.6 tools/clang
 
-%patch0 -p0 -b .destdir
+%patch0 -p1 -b .destdir
 pushd tools/clang
 %patch1 -p0 -b .destdir-clang
 popd



From pkgdb at fedoraproject.org  Wed Sep 30 06:37:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:37:51 +0000
Subject: [pkgdb] ibus-table-translit: kaio has requested watchcommits
Message-ID: <20090930063751.E806610F894@bastion2.fedora.phx.redhat.com>

kaio has requested the watchcommits acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:37:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:37:52 +0000
Subject: [pkgdb] ibus-table-translit: kaio has requested watchbugzilla
Message-ID: <20090930063753.2A5F310F8A9@bastion2.fedora.phx.redhat.com>

kaio has requested the watchbugzilla acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:38:14 +0000
Subject: [pkgdb] ibus-table-translit: kaio has requested watchbugzilla
Message-ID: <20090930063814.1A3C110F875@bastion2.fedora.phx.redhat.com>

kaio has requested the watchbugzilla acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:38:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:38:16 +0000
Subject: [pkgdb] ibus-table-translit: kaio has requested watchcommits
Message-ID: <20090930063816.8C99910F894@bastion2.fedora.phx.redhat.com>

kaio has requested the watchcommits acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:38:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:38:23 +0000
Subject: [pkgdb] ibus-table-translit: kaio has given up watchbugzilla
Message-ID: <20090930063823.928ED10F88B@bastion2.fedora.phx.redhat.com>

kaio has given up the watchbugzilla acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:38:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:38:25 +0000
Subject: [pkgdb] ibus-table-translit: kaio has given up watchcommits
Message-ID: <20090930063825.9A59C10F895@bastion2.fedora.phx.redhat.com>

kaio has given up the watchcommits acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:38:28 +0000
Subject: [pkgdb] ibus-table-translit: kaio has given up watchcommits
Message-ID: <20090930063828.DE46510F875@bastion2.fedora.phx.redhat.com>

kaio has given up the watchcommits acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Wed Sep 30 06:38:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:38:29 +0000
Subject: [pkgdb] ibus-table-translit: kaio has given up watchbugzilla
Message-ID: <20090930063829.8D49D10F88C@bastion2.fedora.phx.redhat.com>

kaio has given up the watchbugzilla acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From jfch2222 at fedoraproject.org  Wed Sep 30 06:43:44 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 30 Sep 2009 06:43:44 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-nss-keys.patch, 1.2,
	1.3 openssh.spec, 1.169, 1.170
Message-ID: <20090930064344.456B811C00E6@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9807

Modified Files:
	openssh-5.2p1-nss-keys.patch openssh.spec 
Log Message:
Resolve locking in ssh-add


openssh-5.2p1-nss-keys.patch:
 Makefile.in  |    2 
 authfd.c     |   39 +++++++
 authfd.h     |    8 +
 configure.ac |   15 ++
 key.c        |   61 +++++++++++
 key.h        |   20 +++
 nsskeys.c    |  327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nsskeys.h    |   39 +++++++
 readconf.c   |   20 +++
 readconf.h   |    2 
 ssh-add.c    |  181 ++++++++++++++++++++++++++++++++
 ssh-agent.c  |  121 +++++++++++++++++++++
 ssh-dss.c    |   36 ++++++
 ssh-keygen.c |   51 ++++++++-
 ssh-rsa.c    |   42 +++++++
 ssh.c        |   28 ++++-
 16 files changed, 980 insertions(+), 12 deletions(-)

Index: openssh-5.2p1-nss-keys.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-nss-keys.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openssh-5.2p1-nss-keys.patch	10 Mar 2009 13:39:03 -0000	1.2
+++ openssh-5.2p1-nss-keys.patch	30 Sep 2009 06:43:43 -0000	1.3
@@ -1,289 +1,55 @@
-diff -up openssh-5.2p1/key.c.nss-keys openssh-5.2p1/key.c
---- openssh-5.2p1/key.c.nss-keys	2008-07-11 09:35:09.000000000 +0200
-+++ openssh-5.2p1/key.c	2008-11-18 19:11:41.000000000 +0100
-@@ -96,6 +96,54 @@ key_new(int type)
- 	return k;
- }
- 
-+#ifdef HAVE_LIBNSS
-+Key *
-+key_new_nss(int type)
-+{
-+	Key *k = key_new(type);
-+
-+	k->nss = xcalloc(1, sizeof(*k->nss));
-+	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
-+
-+	return k;
-+}
-+
-+Key *
-+key_new_nss_copy(int type, const Key *c)
-+{
-+	Key *k = key_new_nss(type);
-+
-+	switch (k->type) {
-+		case KEY_RSA:
-+			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
-+				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
-+				fatal("key_new_nss_copy: BN_copy failed");
-+			break;
-+		case KEY_DSA:
-+			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
-+				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
-+				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
-+				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
-+				fatal("key_new_nss_copy: BN_copy failed");
-+			break;
-+	}
-+		
-+	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
-+	if (k->nss->privk == NULL)
-+		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
-+
-+	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
-+	if (k->nss->pubk == NULL)
-+		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
-+	
-+	if (c->nss->privk->wincx)
-+		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
-+
-+	return k;
-+}
-+#endif
-+
-+
- Key *
- key_new_private(int type)
- {
-@@ -151,6 +199,19 @@ key_free(Key *k)
- 		fatal("key_free: bad key type %d", k->type);
- 		break;
- 	}
-+#ifdef HAVE_LIBNSS
-+	if (k->flags & KEY_FLAG_NSS) {
-+		if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) {
-+			memset(k->nss->privk->wincx, 0,
-+				strlen(k->nss->privk->wincx));
-+			xfree(k->nss->privk->wincx);
-+			k->nss->privk->wincx = NULL;
-+		}
-+		SECKEY_DestroyPrivateKey(k->nss->privk);
-+		SECKEY_DestroyPublicKey(k->nss->pubk);
-+		xfree(k->nss);
-+	}
-+#endif
- 	xfree(k);
- }
- 
-diff -up openssh-5.2p1/ssh-dss.c.nss-keys openssh-5.2p1/ssh-dss.c
---- openssh-5.2p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
-+++ openssh-5.2p1/ssh-dss.c	2008-11-18 19:11:41.000000000 +0100
-@@ -39,6 +39,10 @@
- #include "log.h"
- #include "key.h"
- 
-+#ifdef HAVE_LIBNSS
-+#include <cryptohi.h>
-+#endif
-+
- #define INTBLOB_LEN	20
- #define SIGBLOB_LEN	(2*INTBLOB_LEN)
- 
-@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
- 		error("ssh_dss_sign: no DSA key");
- 		return -1;
- 	}
-+#ifdef HAVE_LIBNSS
-+	if (key->flags & KEY_FLAG_NSS) {
-+		SECItem sigitem;
-+		SECItem *rawsig;
-+
-+		memset(&sigitem, 0, sizeof(sigitem));
-+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
-+			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
-+			error("ssh_dss_sign: sign failed");
-+			return -1;
-+		}
-+		
-+		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
-+			error("ssh_dss_sign: der decode failed");
-+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
-+			return -1;
-+		}
-+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
-+		if (rawsig->len != SIGBLOB_LEN) {
-+			error("ssh_dss_sign: unsupported signature length %d",
-+				rawsig->len);
-+			SECITEM_ZfreeItem(rawsig, PR_TRUE);
-+			return -1;
-+		}
-+		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
-+		SECITEM_ZfreeItem(rawsig, PR_TRUE);
-+	} else {
-+#endif
- 	EVP_DigestInit(&md, evp_md);
- 	EVP_DigestUpdate(&md, data, datalen);
- 	EVP_DigestFinal(&md, digest, &dlen);
-@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
- 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
- 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
- 	DSA_SIG_free(sig);
--
-+#ifdef HAVE_LIBNSS
-+	}
-+#endif
- 	if (datafellows & SSH_BUG_SIGBLOB) {
- 		if (lenp != NULL)
- 			*lenp = SIGBLOB_LEN;
-diff -up openssh-5.2p1/ssh-agent.c.nss-keys openssh-5.2p1/ssh-agent.c
---- openssh-5.2p1/ssh-agent.c.nss-keys	2008-07-04 15:10:49.000000000 +0200
-+++ openssh-5.2p1/ssh-agent.c	2008-11-18 19:11:41.000000000 +0100
-@@ -80,6 +80,10 @@
- #include "scard.h"
- #endif
- 
-+#ifdef HAVE_LIBNSS
-+#include "nsskeys.h"
-+#endif
-+
- #if defined(HAVE_SYS_PRCTL_H)
- #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
- #endif
-@@ -714,6 +718,114 @@ send:
+diff -up openssh-5.2p1/authfd.c.nss-keys openssh-5.2p1/authfd.c
+--- openssh-5.2p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
++++ openssh-5.2p1/authfd.c	2009-08-15 11:39:07.376618281 +0200
+@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
+ 	return decode_reply(type);
  }
- #endif /* SMARTCARD */
  
-+#ifdef HAVE_LIBNSS
-+static void
-+process_add_nss_key (SocketEntry *e)
++int
++ssh_update_nss_key(AuthenticationConnection *auth, int add,
++    const char *tokenname, const char *keyname,
++    const char *pass, u_int life, u_int confirm)
 +{
-+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
-+	int i, version, success = 0, death = 0, confirm = 0;
-+	Key **keys, *k;
-+	Identity *id;
-+	Idtab *tab;
-+
-+	tokenname = buffer_get_string(&e->request, NULL);
-+	keyname = buffer_get_string(&e->request, NULL);
-+	password = buffer_get_string(&e->request, NULL);
++	Buffer msg;
++	int type, constrained = (life || confirm);
 +
-+	while (buffer_len(&e->request)) {
-+		switch (buffer_get_char(&e->request)) {
-+		case SSH_AGENT_CONSTRAIN_LIFETIME:
-+			death = time(NULL) + buffer_get_int(&e->request);
-+			break;
-+		case SSH_AGENT_CONSTRAIN_CONFIRM:
-+			confirm = 1;
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+	if (lifetime && !death)
-+		death = time(NULL) + lifetime;
++	if (add) {
++		type = constrained ?
++		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
++		    SSH_AGENTC_ADD_NSS_KEY;
++	} else
++		type = SSH_AGENTC_REMOVE_NSS_KEY;
 +
-+	keys = nss_get_keys(tokenname, keyname, password);
-+	/* password is owned by keys[0] now */
-+	xfree(tokenname);
-+	xfree(keyname);
++	buffer_init(&msg);
++	buffer_put_char(&msg, type);
++	buffer_put_cstring(&msg, tokenname);
++	buffer_put_cstring(&msg, keyname);
++	buffer_put_cstring(&msg, pass);
 +
-+	if (keys == NULL) {
-+		memset(password, 0, strlen(password));
-+		xfree(password);
-+		error("nss_get_keys failed");
-+		goto send;
-+	}
-+	for (i = 0; keys[i] != NULL; i++) {
-+		k = keys[i];
-+		version = k->type == KEY_RSA1 ? 1 : 2;
-+		tab = idtab_lookup(version);
-+		if (lookup_identity(k, version) == NULL) {
-+			id = xmalloc(sizeof(Identity));
-+			id->key = k;
-+			id->comment = nss_get_key_label(k);
-+			id->death = death;
-+			id->confirm = confirm;
-+			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
-+			tab->nentries++;
-+			success = 1;
-+		} else {
-+			key_free(k);
++	if (constrained) {
++		if (life != 0) {
++			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
++			buffer_put_int(&msg, life);
 +		}
-+		keys[i] = NULL;
++		if (confirm != 0)
++			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
 +	}
-+	xfree(keys);
-+send:
-+	buffer_put_int(&e->output, 1);
-+	buffer_put_char(&e->output,
-+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
-+}
 +
-+static void
-+process_remove_nss_key(SocketEntry *e)
-+{
-+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
-+	int i, version, success = 0;
-+	Key **keys, *k = NULL;
-+	Identity *id;
-+	Idtab *tab;
-+
-+	tokenname = buffer_get_string(&e->request, NULL);
-+	keyname = buffer_get_string(&e->request, NULL);
-+	password = buffer_get_string(&e->request, NULL);
-+
-+	keys = nss_get_keys(tokenname, keyname, password);
-+	xfree(tokenname);
-+	xfree(keyname);
-+	xfree(password);
-+
-+	if (keys == NULL || keys[0] == NULL) {
-+		error("nss_get_keys failed");
-+		goto send;
-+	}
-+	for (i = 0; keys[i] != NULL; i++) {
-+		k = keys[i];
-+		version = k->type == KEY_RSA1 ? 1 : 2;
-+		if ((id = lookup_identity(k, version)) != NULL) {
-+			tab = idtab_lookup(version);
-+			TAILQ_REMOVE(&tab->idlist, id, next);
-+			tab->nentries--;
-+			free_identity(id);
-+			success = 1;
-+		}
-+		key_free(k);
-+		keys[i] = NULL;
++	if (ssh_request_reply(auth, &msg, &msg) == 0) {
++		buffer_free(&msg);
++		return 0;
 +	}
-+	xfree(keys);
-+send:
-+	buffer_put_int(&e->output, 1);
-+	buffer_put_char(&e->output,
-+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
++	type = buffer_get_char(&msg);
++	buffer_free(&msg);
++	return decode_reply(type);
 +}
-+#endif /* HAVE_LIBNSS */
 +
- /* dispatch incoming messages */
- 
- static void
-@@ -806,6 +918,15 @@ process_message(SocketEntry *e)
- 		process_remove_smartcard_key(e);
- 		break;
- #endif /* SMARTCARD */
-+#ifdef HAVE_LIBNSS
-+	case SSH_AGENTC_ADD_NSS_KEY:
-+	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
-+		process_add_nss_key(e);
-+		break;
-+	case SSH_AGENTC_REMOVE_NSS_KEY:
-+		process_remove_nss_key(e);
-+		break;
-+#endif /* SMARTCARD */
- 	default:
- 		/* Unknown message.  Respond with failure. */
- 		error("Unknown message %d", type);
+ /*
+  * Removes all identities from the agent.  This call is not meant to be used
+  * by normal applications.
 diff -up openssh-5.2p1/authfd.h.nss-keys openssh-5.2p1/authfd.h
 --- openssh-5.2p1/authfd.h.nss-keys	2006-08-05 04:39:39.000000000 +0200
-+++ openssh-5.2p1/authfd.h	2008-11-18 19:11:41.000000000 +0100
++++ openssh-5.2p1/authfd.h	2009-08-15 11:39:07.369353952 +0200
 @@ -49,6 +49,12 @@
  #define SSH2_AGENTC_ADD_ID_CONSTRAINED		25
  #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26
@@ -307,9 +73,9 @@ diff -up openssh-5.2p1/authfd.h.nss-keys
  int
  ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
 diff -up openssh-5.2p1/configure.ac.nss-keys openssh-5.2p1/configure.ac
---- openssh-5.2p1/configure.ac.nss-keys	2008-11-18 19:11:41.000000000 +0100
-+++ openssh-5.2p1/configure.ac	2008-11-18 19:12:38.000000000 +0100
-@@ -3436,6 +3436,20 @@ AC_ARG_WITH(kerberos5,
+--- openssh-5.2p1/configure.ac.nss-keys	2009-08-15 11:39:07.161229467 +0200
++++ openssh-5.2p1/configure.ac	2009-08-15 11:39:07.373539105 +0200
+@@ -3462,6 +3462,20 @@ AC_ARG_WITH(kerberos5,
  	]
  )
  
@@ -330,7 +96,7 @@ diff -up openssh-5.2p1/configure.ac.nss-
  # Looking for programs, paths and files
  
  PRIVSEP_PATH=/var/empty
-@@ -4163,6 +4177,7 @@ echo "              TCP Wrappers support
+@@ -4189,6 +4203,7 @@ echo "              TCP Wrappers support
  echo "              MD5 password support: $MD5_MSG"
  echo "                   libedit support: $LIBEDIT_MSG"
  echo "  Solaris process contract support: $SPC_MSG"
@@ -338,110 +104,151 @@ diff -up openssh-5.2p1/configure.ac.nss-
  echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
  echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
-diff -up /dev/null openssh-5.2p1/README.nss
---- /dev/null	2008-11-17 17:51:52.160001870 +0100
-+++ openssh-5.2p1/README.nss	2008-11-18 19:11:41.000000000 +0100
-@@ -0,0 +1,36 @@
-+How to use NSS tokens with OpenSSH?
-+
-+This version of OpenSSH contains experimental support for authentication using
-+keys stored in tokens stored in NSS database. This for example includes any
-+PKCS#11 tokens which are installed in your NSS database.
-+
-+As the code is experimental and preliminary only SSH protocol 2 is supported.
-+The NSS certificate and token databases are looked for in the ~/.ssh
-+directory or in a directory specified by environment variable NSS_DB_PATH.
-+
-+Common operations:
-+
-+(1) tell the ssh client to use the NSS keys:
+diff -up openssh-5.2p1/key.c.nss-keys openssh-5.2p1/key.c
+--- openssh-5.2p1/key.c.nss-keys	2008-11-03 09:24:17.000000000 +0100
++++ openssh-5.2p1/key.c	2009-08-15 11:39:07.363301772 +0200
+@@ -96,6 +96,54 @@ key_new(int type)
+ 	return k;
+ }
+ 
++#ifdef HAVE_LIBNSS
++Key *
++key_new_nss(int type)
++{
++	Key *k = key_new(type);
 +
-+	$ ssh -o 'UseNSS yes' otherhost
-+	
-+	if you want to use a specific token:
-+	
-+	$ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost
++	k->nss = xcalloc(1, sizeof(*k->nss));
++	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
 +
-+(2) or tell the agent to use the NSS keys:
++	return k;
++}
 +
-+	$ ssh-add -n
-+	
-+	if you want to use a specific token:
-+	
-+	$ ssh-add -n -T 'My PKCS11 Token'
++Key *
++key_new_nss_copy(int type, const Key *c)
++{
++	Key *k = key_new_nss(type);
 +
-+(3) extract the public key from token so it can be added to the
-+server:
++	switch (k->type) {
++		case KEY_RSA:
++			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
++				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
++				fatal("key_new_nss_copy: BN_copy failed");
++			break;
++		case KEY_DSA:
++			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
++				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
++				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
++				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
++				fatal("key_new_nss_copy: BN_copy failed");
++			break;
++	}
++		
++	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
++	if (k->nss->privk == NULL)
++		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
 +
-+	$ ssh-keygen -n
-+	
-+	if you want to use a specific token and/or key:
++	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
++	if (k->nss->pubk == NULL)
++		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
 +	
-+	$ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID'
-diff -up openssh-5.2p1/authfd.c.nss-keys openssh-5.2p1/authfd.c
---- openssh-5.2p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
-+++ openssh-5.2p1/authfd.c	2008-11-18 19:11:41.000000000 +0100
-@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
- 	return decode_reply(type);
- }
- 
-+int
-+ssh_update_nss_key(AuthenticationConnection *auth, int add,
-+    const char *tokenname, const char *keyname,
-+    const char *pass, u_int life, u_int confirm)
-+{
-+	Buffer msg;
-+	int type, constrained = (life || confirm);
++	if (c->nss->privk->wincx)
++		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
 +
-+	if (add) {
-+		type = constrained ?
-+		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
-+		    SSH_AGENTC_ADD_NSS_KEY;
-+	} else
-+		type = SSH_AGENTC_REMOVE_NSS_KEY;
++	return k;
++}
++#endif
 +
-+	buffer_init(&msg);
-+	buffer_put_char(&msg, type);
-+	buffer_put_cstring(&msg, tokenname);
-+	buffer_put_cstring(&msg, keyname);
-+	buffer_put_cstring(&msg, pass);
 +
-+	if (constrained) {
-+		if (life != 0) {
-+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
-+			buffer_put_int(&msg, life);
+ Key *
+ key_new_private(int type)
+ {
+@@ -151,6 +199,19 @@ key_free(Key *k)
+ 		fatal("key_free: bad key type %d", k->type);
+ 		break;
+ 	}
++#ifdef HAVE_LIBNSS
++	if (k->flags & KEY_FLAG_NSS) {
++		if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) {
++			memset(k->nss->privk->wincx, 0,
++				strlen(k->nss->privk->wincx));
++			xfree(k->nss->privk->wincx);
++			k->nss->privk->wincx = NULL;
 +		}
-+		if (confirm != 0)
-+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
++		SECKEY_DestroyPrivateKey(k->nss->privk);
++		SECKEY_DestroyPublicKey(k->nss->pubk);
++		xfree(k->nss);
 +	}
++#endif
+ 	xfree(k);
+ }
+ 
+diff -up openssh-5.2p1/key.h.nss-keys openssh-5.2p1/key.h
+--- openssh-5.2p1/key.h.nss-keys	2008-06-12 20:40:35.000000000 +0200
++++ openssh-5.2p1/key.h	2009-08-15 11:39:07.388333558 +0200
+@@ -29,11 +29,17 @@
+ #include <openssl/rsa.h>
+ #include <openssl/dsa.h>
+ 
++#ifdef HAVE_LIBNSS
++#include <nss.h>
++#include <keyhi.h>
++#endif
 +
-+	if (ssh_request_reply(auth, &msg, &msg) == 0) {
-+		buffer_free(&msg);
-+		return 0;
-+	}
-+	type = buffer_get_char(&msg);
-+	buffer_free(&msg);
-+	return decode_reply(type);
-+}
+ typedef struct Key Key;
+ enum types {
+ 	KEY_RSA1,
+ 	KEY_RSA,
+ 	KEY_DSA,
++	KEY_NSS,
+ 	KEY_UNSPEC
+ };
+ enum fp_type {
+@@ -48,16 +54,30 @@ enum fp_rep {
+ 
+ /* key is stored in external hardware */
+ #define KEY_FLAG_EXT		0x0001
++#define KEY_FLAG_NSS		0x0002
 +
- /*
-  * Removes all identities from the agent.  This call is not meant to be used
-  * by normal applications.
-diff -up openssh-5.2p1/readconf.h.nss-keys openssh-5.2p1/readconf.h
---- openssh-5.2p1/readconf.h.nss-keys	2008-06-29 16:04:03.000000000 +0200
-+++ openssh-5.2p1/readconf.h	2008-11-18 19:11:41.000000000 +0100
-@@ -84,6 +84,8 @@ typedef struct {
- 	char   *preferred_authentications;
- 	char   *bind_address;	/* local socket address for connection to sshd */
- 	char   *smartcard_device; /* Smartcard reader device */
-+	int     use_nss;        /* Use NSS library for keys */
-+	char   *nss_token;      /* Look for NSS keys on token */
- 	int	verify_host_key_dns;	/* Verify host key using DNS */
++#ifdef HAVE_LIBNSS
++typedef struct NSSKey NSSKey;
++struct NSSKey {
++	SECKEYPrivateKey *privk;
++	SECKEYPublicKey *pubk;
++};
++#endif
  
- 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
+ struct Key {
+ 	int	 type;
+ 	int	 flags;
+ 	RSA	*rsa;
+ 	DSA	*dsa;
++#ifdef HAVE_LIBNSS
++	NSSKey  *nss;
++#endif
+ };
+ 
+ Key		*key_new(int);
+ Key		*key_new_private(int);
++Key 		*key_new_nss(int);
++Key		*key_new_nss_copy(int, const Key *);
+ void		 key_free(Key *);
+ Key		*key_demote(const Key *);
+ int		 key_equal(const Key *, const Key *);
+diff -up openssh-5.2p1/Makefile.in.nss-keys openssh-5.2p1/Makefile.in
+--- openssh-5.2p1/Makefile.in.nss-keys	2008-11-05 06:20:46.000000000 +0100
++++ openssh-5.2p1/Makefile.in	2009-08-15 11:39:07.387287237 +0200
+@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
+ 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
+ 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
+ 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
+-	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o
++	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o
+ 
+ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
+ 	sshconnect.o sshconnect1.o sshconnect2.o mux.o
 diff -up /dev/null openssh-5.2p1/nsskeys.c
---- /dev/null	2008-11-17 17:51:52.160001870 +0100
-+++ openssh-5.2p1/nsskeys.c	2008-11-18 19:11:41.000000000 +0100
+--- /dev/null	2009-08-11 04:59:51.783705773 +0200
++++ openssh-5.2p1/nsskeys.c	2009-08-15 11:39:07.381280271 +0200
 @@ -0,0 +1,327 @@
 +/*
 + * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -770,63 +577,9 @@ diff -up /dev/null openssh-5.2p1/nsskeys
 +}
 +
 +#endif /* HAVE_LIBNSS */
-diff -up openssh-5.2p1/ssh.c.nss-keys openssh-5.2p1/ssh.c
---- openssh-5.2p1/ssh.c.nss-keys	2008-07-04 04:53:50.000000000 +0200
-+++ openssh-5.2p1/ssh.c	2008-11-18 19:11:41.000000000 +0100
-@@ -104,6 +104,9 @@
- #ifdef SMARTCARD
- #include "scard.h"
- #endif
-+#ifdef HAVE_LIBNSS
-+#include "nsskeys.h"
-+#endif
- 
- extern char *__progname;
- 
-@@ -1235,9 +1238,11 @@ load_public_identity_files(void)
- 	int i = 0;
- 	Key *public;
- 	struct passwd *pw;
--#ifdef SMARTCARD
-+#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
- 	Key **keys;
-+#endif
- 
-+#ifdef SMARTCARD
- 	if (options.smartcard_device != NULL &&
- 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
- 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
-@@ -1260,6 +1265,27 @@ load_public_identity_files(void)
- 		xfree(keys);
- 	}
- #endif /* SMARTCARD */
-+#ifdef HAVE_LIBNSS
-+	if (options.use_nss &&
-+	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
-+	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
-+		int count;
-+		for (count = 0; keys[count] != NULL; count++) {
-+			memmove(&options.identity_files[1], &options.identity_files[0],
-+			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
-+			memmove(&options.identity_keys[1], &options.identity_keys[0],
-+			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
-+			options.num_identity_files++;
-+			options.identity_keys[0] = keys[count];
-+			options.identity_files[0] = nss_get_key_label(keys[count]);
-+		}
-+		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
-+			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
-+		i += count;
-+		xfree(keys);
-+	}
-+#endif /* HAVE_LIBNSS */
-+
- 	if ((pw = getpwuid(original_real_uid)) == NULL)
- 		fatal("load_public_identity_files: getpwuid failed");
- 	pwname = xstrdup(pw->pw_name);
 diff -up /dev/null openssh-5.2p1/nsskeys.h
---- /dev/null	2008-11-17 17:51:52.160001870 +0100
-+++ openssh-5.2p1/nsskeys.h	2008-11-18 19:11:41.000000000 +0100
+--- /dev/null	2009-08-11 04:59:51.783705773 +0200
++++ openssh-5.2p1/nsskeys.h	2009-08-15 11:39:07.385223433 +0200
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -867,73 +620,79 @@ diff -up /dev/null openssh-5.2p1/nsskeys
 +
 +#endif
 +#endif
-diff -up openssh-5.2p1/Makefile.in.nss-keys openssh-5.2p1/Makefile.in
---- openssh-5.2p1/Makefile.in.nss-keys	2008-07-08 16:21:12.000000000 +0200
-+++ openssh-5.2p1/Makefile.in	2008-11-18 19:11:41.000000000 +0100
-@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
- 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
- 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
- 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
--	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o
-+	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o
- 
- SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
- 	sshconnect.o sshconnect1.o sshconnect2.o mux.o
-diff -up openssh-5.2p1/key.h.nss-keys openssh-5.2p1/key.h
---- openssh-5.2p1/key.h.nss-keys	2008-06-12 20:40:35.000000000 +0200
-+++ openssh-5.2p1/key.h	2008-11-18 19:11:41.000000000 +0100
-@@ -29,11 +29,17 @@
- #include <openssl/rsa.h>
- #include <openssl/dsa.h>
- 
-+#ifdef HAVE_LIBNSS
-+#include <nss.h>
-+#include <keyhi.h>
-+#endif
-+
- typedef struct Key Key;
- enum types {
- 	KEY_RSA1,
- 	KEY_RSA,
- 	KEY_DSA,
-+	KEY_NSS,
- 	KEY_UNSPEC
- };
- enum fp_type {
-@@ -48,16 +54,30 @@ enum fp_rep {
- 
- /* key is stored in external hardware */
- #define KEY_FLAG_EXT		0x0001
-+#define KEY_FLAG_NSS		0x0002
-+
-+#ifdef HAVE_LIBNSS
-+typedef struct NSSKey NSSKey;
-+struct NSSKey {
-+	SECKEYPrivateKey *privk;
-+	SECKEYPublicKey *pubk;
-+};
-+#endif
- 
- struct Key {
- 	int	 type;
- 	int	 flags;
- 	RSA	*rsa;
- 	DSA	*dsa;
+diff -up openssh-5.2p1/readconf.c.nss-keys openssh-5.2p1/readconf.c
+--- openssh-5.2p1/readconf.c.nss-keys	2009-02-14 06:28:21.000000000 +0100
++++ openssh-5.2p1/readconf.c	2009-08-15 11:39:07.397161060 +0200
+@@ -124,6 +124,7 @@ typedef enum {
+ 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
+ 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
+ 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
++	oUseNSS, oNSSToken,
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
+@@ -210,6 +211,13 @@ static struct {
+ #else
+ 	{ "smartcarddevice", oUnsupported },
+ #endif
 +#ifdef HAVE_LIBNSS
-+	NSSKey  *nss;
++	{ "usenss", oUseNSS },
++	{ "nsstoken", oNSSToken },
++#else
++	{ "usenss", oUnsupported },
++	{ "nsstoken", oNSSToken },
 +#endif
- };
+ 	{ "clearallforwardings", oClearAllForwardings },
+ 	{ "enablesshkeysign", oEnableSSHKeysign },
+ 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
+@@ -612,6 +620,14 @@ parse_string:
+ 		charptr = &options->smartcard_device;
+ 		goto parse_string;
  
- Key		*key_new(int);
- Key		*key_new_private(int);
-+Key 		*key_new_nss(int);
-+Key		*key_new_nss_copy(int, const Key *);
- void		 key_free(Key *);
- Key		*key_demote(const Key *);
- int		 key_equal(const Key *, const Key *);
++	case oUseNSS:
++		intptr = &options->use_nss;
++		goto parse_flag;
++
++	case oNSSToken:
++		charptr = &options->nss_token;
++		goto parse_command;
++
+ 	case oProxyCommand:
+ 		charptr = &options->proxy_command;
+ parse_command:
+@@ -1047,6 +1063,8 @@ initialize_options(Options * options)
+ 	options->preferred_authentications = NULL;
+ 	options->bind_address = NULL;
+ 	options->smartcard_device = NULL;
++	options->use_nss = -1;
++	options->nss_token = NULL;
+ 	options->enable_ssh_keysign = - 1;
+ 	options->no_host_authentication_for_localhost = - 1;
+ 	options->identities_only = - 1;
+@@ -1177,6 +1195,8 @@ fill_default_options(Options * options)
+ 		options->no_host_authentication_for_localhost = 0;
+ 	if (options->identities_only == -1)
+ 		options->identities_only = 0;
++	if (options->use_nss == -1)
++		options->use_nss = 0;
+ 	if (options->enable_ssh_keysign == -1)
+ 		options->enable_ssh_keysign = 0;
+ 	if (options->rekey_limit == -1)
+diff -up openssh-5.2p1/readconf.h.nss-keys openssh-5.2p1/readconf.h
+--- openssh-5.2p1/readconf.h.nss-keys	2009-02-14 06:28:21.000000000 +0100
++++ openssh-5.2p1/readconf.h	2009-08-15 11:39:07.377835083 +0200
+@@ -85,6 +85,8 @@ typedef struct {
+ 	char   *preferred_authentications;
+ 	char   *bind_address;	/* local socket address for connection to sshd */
+ 	char   *smartcard_device; /* Smartcard reader device */
++	int     use_nss;        /* Use NSS library for keys */
++	char   *nss_token;      /* Look for NSS keys on token */
+ 	int	verify_host_key_dns;	/* Verify host key using DNS */
+ 
+ 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
 diff -up openssh-5.2p1/ssh-add.c.nss-keys openssh-5.2p1/ssh-add.c
 --- openssh-5.2p1/ssh-add.c.nss-keys	2008-02-28 09:13:52.000000000 +0100
-+++ openssh-5.2p1/ssh-add.c	2008-11-18 19:11:41.000000000 +0100
++++ openssh-5.2p1/ssh-add.c	2009-08-15 11:39:07.414164844 +0200
 @@ -44,6 +44,14 @@
  #include <openssl/evp.h>
  #include "openbsd-compat/openssl-compat.h"
@@ -957,7 +716,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  #include "buffer.h"
  #include "authfd.h"
  #include "authfile.h"
-@@ -307,6 +316,117 @@ do_file(AuthenticationConnection *ac, in
+@@ -307,6 +316,128 @@ do_file(AuthenticationConnection *ac, in
  	return 0;
  }
  
@@ -1004,8 +763,10 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
 +	SECKEYPrivateKeyListNode *node;
 +	char *passcache = NULL;
 +	char *tokenname;
++	char **xkeyname = NULL;
 +	
 +	int count = 0;
++	int i;
 +	
 +	if (PK11_NeedLogin(slot))
 +		PK11_Authenticate(slot, PR_TRUE, &passcache);
@@ -1046,21 +807,30 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
 +			continue; /* not possible to obtain public key */
 +		}
 +		SECKEY_DestroyPublicKey(pub);
++	
++		if ((count % 10) == 0)	
++			xkeyname = xrealloc (xkeyname, count + 10, sizeof (char *));
 +		
-+		if (ssh_update_nss_key(ac, add, tokenname, keyname,
++		xkeyname[count++] = keyname;
++	}
++
++	PK11_Logout(slot);
++
++	for (i = 0; i < count; i++) {
++		if (ssh_update_nss_key(ac, add, tokenname, xkeyname[i],
 +			passcache?passcache:"",	lifetime, confirm)) {
 +			fprintf(stderr, "Key %s: %s:%s\n",
-+				add?"added":"removed", tokenname, keyname);
-+			count++;
++				add?"added":"removed", tokenname, xkeyname[i]);
 +		} else {
 +			fprintf(stderr, "Could not %s key: %s:%s\n",
-+				add?"add":"remove", tokenname, keyname);
++				add?"add":"remove", tokenname, xkeyname[i]);
 +		}
-+		
-+		PORT_Free(keyname);
-+		count++;
++		PORT_Free(xkeyname[i]);
 +	}
 +
++	if (xkeyname != NULL)
++		free (xkeyname);
++
 +	if (passcache != NULL) {
 +		memset(passcache, 0, strlen(passcache));
 +		xfree(passcache);
@@ -1075,7 +845,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  static void
  usage(void)
  {
-@@ -334,6 +454,10 @@ main(int argc, char **argv)
+@@ -334,6 +465,10 @@ main(int argc, char **argv)
  	AuthenticationConnection *ac = NULL;
  	char *sc_reader_id = NULL;
  	int i, ch, deleting = 0, ret = 0;
@@ -1086,7 +856,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  
  	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
  	sanitise_stdfd();
-@@ -351,7 +475,7 @@ main(int argc, char **argv)
+@@ -351,7 +486,7 @@ main(int argc, char **argv)
  		    "Could not open a connection to your authentication agent.\n");
  		exit(2);
  	}
@@ -1095,7 +865,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  		switch (ch) {
  		case 'l':
  		case 'L':
-@@ -373,6 +497,11 @@ main(int argc, char **argv)
+@@ -373,6 +508,11 @@ main(int argc, char **argv)
  			if (delete_all(ac) == -1)
  				ret = 1;
  			goto done;
@@ -1107,7 +877,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  		case 's':
  			sc_reader_id = optarg;
  			break;
-@@ -387,6 +516,11 @@ main(int argc, char **argv)
+@@ -387,6 +527,11 @@ main(int argc, char **argv)
  				goto done;
  			}
  			break;
@@ -1119,123 +889,309 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  		default:
  			usage();
  			ret = 1;
-@@ -400,6 +534,40 @@ main(int argc, char **argv)
+@@ -400,6 +545,40 @@ main(int argc, char **argv)
  			ret = 1;
  		goto done;
  	}
 +#ifdef HAVE_LIBNSS
-+	if (use_nss) {
-+		PK11SlotList *slots;
-+		PK11SlotListElement *sle;
-+		int count = 0;
-+		if (nss_init(password_cb) == -1) {
-+			fprintf(stderr, "Failed to initialize NSS library\n");
-+			ret = 1;
-+			goto done;
-+		}
-+		
-+		if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE,
-+			NULL)) == NULL) {
-+			fprintf(stderr, "No tokens found\n");
-+			ret = 1;
-+			goto nss_done;
-+		}
-+
-+		for (sle = slots->head; sle; sle = sle->next) {
-+			int rv;
-+			if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) {
-+				ret = 1;
-+			}
-+			count += rv;
-+		}
-+		if (count == 0) {
-+			ret = 1;
++	if (use_nss) {
++		PK11SlotList *slots;
++		PK11SlotListElement *sle;
++		int count = 0;
++		if (nss_init(password_cb) == -1) {
++			fprintf(stderr, "Failed to initialize NSS library\n");
++			ret = 1;
++			goto done;
++		}
++		
++		if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE,
++			NULL)) == NULL) {
++			fprintf(stderr, "No tokens found\n");
++			ret = 1;
++			goto nss_done;
++		}
++
++		for (sle = slots->head; sle; sle = sle->next) {
++			int rv;
++			if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) {
++				ret = 1;
++			}
++			count += rv;
++		}
++		if (count == 0) {
++			ret = 1;
++		}
++nss_done:		
++		NSS_Shutdown();
++		clear_pass();
++		goto done;
++	}
++#endif
+ 	if (argc == 0) {
+ 		char buf[MAXPATHLEN];
+ 		struct passwd *pw;
+diff -up openssh-5.2p1/ssh-agent.c.nss-keys openssh-5.2p1/ssh-agent.c
+--- openssh-5.2p1/ssh-agent.c.nss-keys	2008-07-04 15:10:49.000000000 +0200
++++ openssh-5.2p1/ssh-agent.c	2009-08-15 11:39:07.368143486 +0200
+@@ -80,6 +80,10 @@
+ #include "scard.h"
+ #endif
+ 
++#ifdef HAVE_LIBNSS
++#include "nsskeys.h"
++#endif
++
+ #if defined(HAVE_SYS_PRCTL_H)
+ #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
+ #endif
+@@ -714,6 +718,114 @@ send:
+ }
+ #endif /* SMARTCARD */
+ 
++#ifdef HAVE_LIBNSS
++static void
++process_add_nss_key (SocketEntry *e)
++{
++	char *tokenname = NULL, *keyname = NULL, *password = NULL;
++	int i, version, success = 0, death = 0, confirm = 0;
++	Key **keys, *k;
++	Identity *id;
++	Idtab *tab;
++
++	tokenname = buffer_get_string(&e->request, NULL);
++	keyname = buffer_get_string(&e->request, NULL);
++	password = buffer_get_string(&e->request, NULL);
++
++	while (buffer_len(&e->request)) {
++		switch (buffer_get_char(&e->request)) {
++		case SSH_AGENT_CONSTRAIN_LIFETIME:
++			death = time(NULL) + buffer_get_int(&e->request);
++			break;
++		case SSH_AGENT_CONSTRAIN_CONFIRM:
++			confirm = 1;
++			break;
++		default:
++			break;
++		}
++	}
++	if (lifetime && !death)
++		death = time(NULL) + lifetime;
++
++	keys = nss_get_keys(tokenname, keyname, password);
++	/* password is owned by keys[0] now */
++	xfree(tokenname);
++	xfree(keyname);
++
++	if (keys == NULL) {
++		memset(password, 0, strlen(password));
++		xfree(password);
++		error("nss_get_keys failed");
++		goto send;
++	}
++	for (i = 0; keys[i] != NULL; i++) {
++		k = keys[i];
++		version = k->type == KEY_RSA1 ? 1 : 2;
++		tab = idtab_lookup(version);
++		if (lookup_identity(k, version) == NULL) {
++			id = xmalloc(sizeof(Identity));
++			id->key = k;
++			id->comment = nss_get_key_label(k);
++			id->death = death;
++			id->confirm = confirm;
++			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
++			tab->nentries++;
++			success = 1;
++		} else {
++			key_free(k);
++		}
++		keys[i] = NULL;
++	}
++	xfree(keys);
++send:
++	buffer_put_int(&e->output, 1);
++	buffer_put_char(&e->output,
++	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
++}
++
++static void
++process_remove_nss_key(SocketEntry *e)
++{
++	char *tokenname = NULL, *keyname = NULL, *password = NULL;
++	int i, version, success = 0;
++	Key **keys, *k = NULL;
++	Identity *id;
++	Idtab *tab;
++
++	tokenname = buffer_get_string(&e->request, NULL);
++	keyname = buffer_get_string(&e->request, NULL);
++	password = buffer_get_string(&e->request, NULL);
++
++	keys = nss_get_keys(tokenname, keyname, password);
++	xfree(tokenname);
++	xfree(keyname);
++	xfree(password);
++
++	if (keys == NULL || keys[0] == NULL) {
++		error("nss_get_keys failed");
++		goto send;
++	}
++	for (i = 0; keys[i] != NULL; i++) {
++		k = keys[i];
++		version = k->type == KEY_RSA1 ? 1 : 2;
++		if ((id = lookup_identity(k, version)) != NULL) {
++			tab = idtab_lookup(version);
++			TAILQ_REMOVE(&tab->idlist, id, next);
++			tab->nentries--;
++			free_identity(id);
++			success = 1;
++		}
++		key_free(k);
++		keys[i] = NULL;
++	}
++	xfree(keys);
++send:
++	buffer_put_int(&e->output, 1);
++	buffer_put_char(&e->output,
++	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
++}
++#endif /* HAVE_LIBNSS */
++
+ /* dispatch incoming messages */
+ 
+ static void
+@@ -806,6 +918,15 @@ process_message(SocketEntry *e)
+ 		process_remove_smartcard_key(e);
+ 		break;
+ #endif /* SMARTCARD */
++#ifdef HAVE_LIBNSS
++	case SSH_AGENTC_ADD_NSS_KEY:
++	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
++		process_add_nss_key(e);
++		break;
++	case SSH_AGENTC_REMOVE_NSS_KEY:
++		process_remove_nss_key(e);
++		break;
++#endif /* SMARTCARD */
+ 	default:
+ 		/* Unknown message.  Respond with failure. */
+ 		error("Unknown message %d", type);
+diff -up openssh-5.2p1/ssh.c.nss-keys openssh-5.2p1/ssh.c
+--- openssh-5.2p1/ssh.c.nss-keys	2009-02-14 06:28:21.000000000 +0100
++++ openssh-5.2p1/ssh.c	2009-08-15 11:39:07.383383769 +0200
+@@ -104,6 +104,9 @@
+ #ifdef SMARTCARD
+ #include "scard.h"
+ #endif
++#ifdef HAVE_LIBNSS
++#include "nsskeys.h"
++#endif
+ 
+ extern char *__progname;
+ 
+@@ -1231,9 +1234,11 @@ load_public_identity_files(void)
+ 	int i = 0;
+ 	Key *public;
+ 	struct passwd *pw;
+-#ifdef SMARTCARD
++#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
+ 	Key **keys;
++#endif
+ 
++#ifdef SMARTCARD
+ 	if (options.smartcard_device != NULL &&
+ 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
+ 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
+@@ -1256,6 +1261,27 @@ load_public_identity_files(void)
+ 		xfree(keys);
+ 	}
+ #endif /* SMARTCARD */
++#ifdef HAVE_LIBNSS
++	if (options.use_nss &&
++	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
++	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
++		int count;
++		for (count = 0; keys[count] != NULL; count++) {
++			memmove(&options.identity_files[1], &options.identity_files[0],
++			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
++			memmove(&options.identity_keys[1], &options.identity_keys[0],
++			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
++			options.num_identity_files++;
++			options.identity_keys[0] = keys[count];
++			options.identity_files[0] = nss_get_key_label(keys[count]);
 +		}
-+nss_done:		
-+		NSS_Shutdown();
-+		clear_pass();
-+		goto done;
++		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
++			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
++		i += count;
++		xfree(keys);
 +	}
-+#endif
- 	if (argc == 0) {
- 		char buf[MAXPATHLEN];
- 		struct passwd *pw;
-diff -up openssh-5.2p1/ssh-rsa.c.nss-keys openssh-5.2p1/ssh-rsa.c
---- openssh-5.2p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
-+++ openssh-5.2p1/ssh-rsa.c	2008-11-18 19:11:41.000000000 +0100
-@@ -32,6 +32,10 @@
- #include "compat.h"
- #include "ssh.h"
++#endif /* HAVE_LIBNSS */
++
+ 	if ((pw = getpwuid(original_real_uid)) == NULL)
+ 		fatal("load_public_identity_files: getpwuid failed");
+ 	pwname = xstrdup(pw->pw_name);
+diff -up openssh-5.2p1/ssh-dss.c.nss-keys openssh-5.2p1/ssh-dss.c
+--- openssh-5.2p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
++++ openssh-5.2p1/ssh-dss.c	2009-08-15 11:39:07.365182193 +0200
+@@ -39,6 +39,10 @@
+ #include "log.h"
+ #include "key.h"
  
 +#ifdef HAVE_LIBNSS
 +#include <cryptohi.h>
 +#endif
 +
- static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
+ #define INTBLOB_LEN	20
+ #define SIGBLOB_LEN	(2*INTBLOB_LEN)
  
- /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
-@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
- 		error("ssh_rsa_sign: no RSA key");
+@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
+ 		error("ssh_dss_sign: no DSA key");
  		return -1;
  	}
-+
-+	slen = RSA_size(key->rsa);
-+	sig = xmalloc(slen);
-+
 +#ifdef HAVE_LIBNSS
 +	if (key->flags & KEY_FLAG_NSS) {
 +		SECItem sigitem;
-+		SECOidTag alg;
++		SECItem *rawsig;
 +
 +		memset(&sigitem, 0, sizeof(sigitem));
-+		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
-+			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
-+			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
-+
 +		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
-+			alg) != SECSuccess) {
-+			error("ssh_rsa_sign: sign failed");
++			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
++			error("ssh_dss_sign: sign failed");
 +			return -1;
 +		}
-+		if (sigitem.len > slen) {
-+			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
-+			xfree(sig);
++		
++		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
++			error("ssh_dss_sign: der decode failed");
 +			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
 +			return -1;
 +		}
-+		if (sigitem.len < slen) {
-+			memset(sig, 0, slen - sigitem.len);
-+		}
-+		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
 +		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
++		if (rawsig->len != SIGBLOB_LEN) {
++			error("ssh_dss_sign: unsupported signature length %d",
++				rawsig->len);
++			SECITEM_ZfreeItem(rawsig, PR_TRUE);
++			return -1;
++		}
++		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
++		SECITEM_ZfreeItem(rawsig, PR_TRUE);
 +	} else {
 +#endif
- 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
- 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
- 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
-@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 	EVP_DigestInit(&md, evp_md);
  	EVP_DigestUpdate(&md, data, datalen);
  	EVP_DigestFinal(&md, digest, &dlen);
- 
--	slen = RSA_size(key->rsa);
--	sig = xmalloc(slen);
+@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
+ 	DSA_SIG_free(sig);
 -
- 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
- 	memset(digest, 'd', sizeof(digest));
- 
-@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
- 		xfree(sig);
- 		return -1;
- 	}
 +#ifdef HAVE_LIBNSS
 +	}
 +#endif
- 	/* encode signature */
- 	buffer_init(&b);
- 	buffer_put_cstring(&b, "ssh-rsa");
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+ 		if (lenp != NULL)
+ 			*lenp = SIGBLOB_LEN;
 diff -up openssh-5.2p1/ssh-keygen.c.nss-keys openssh-5.2p1/ssh-keygen.c
---- openssh-5.2p1/ssh-keygen.c.nss-keys	2008-07-14 03:28:29.000000000 +0200
-+++ openssh-5.2p1/ssh-keygen.c	2008-11-18 19:11:41.000000000 +0100
+--- openssh-5.2p1/ssh-keygen.c.nss-keys	2009-02-21 22:47:02.000000000 +0100
++++ openssh-5.2p1/ssh-keygen.c	2009-08-15 11:39:07.395366022 +0200
 @@ -53,6 +53,11 @@
  #include "scard.h"
  #endif
@@ -1337,61 +1293,76 @@ diff -up openssh-5.2p1/ssh-keygen.c.nss-
  	if (reader_id != NULL) {
  #ifdef SMARTCARD
  		if (download)
-diff -up openssh-5.2p1/readconf.c.nss-keys openssh-5.2p1/readconf.c
---- openssh-5.2p1/readconf.c.nss-keys	2008-06-29 16:04:03.000000000 +0200
-+++ openssh-5.2p1/readconf.c	2008-11-18 19:11:41.000000000 +0100
-@@ -124,6 +124,7 @@ typedef enum {
- 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
- 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
- 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
-+	oUseNSS, oNSSToken,
- 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-@@ -210,6 +211,13 @@ static struct {
- #else
- 	{ "smartcarddevice", oUnsupported },
- #endif
+diff -up openssh-5.2p1/ssh-rsa.c.nss-keys openssh-5.2p1/ssh-rsa.c
+--- openssh-5.2p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
++++ openssh-5.2p1/ssh-rsa.c	2009-08-15 11:39:07.393249953 +0200
+@@ -32,6 +32,10 @@
+ #include "compat.h"
+ #include "ssh.h"
+ 
 +#ifdef HAVE_LIBNSS
-+	{ "usenss", oUseNSS },
-+	{ "nsstoken", oNSSToken },
-+#else
-+	{ "usenss", oUnsupported },
-+	{ "nsstoken", oNSSToken },
++#include <cryptohi.h>
 +#endif
- 	{ "clearallforwardings", oClearAllForwardings },
- 	{ "enablesshkeysign", oEnableSSHKeysign },
- 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
-@@ -603,6 +611,14 @@ parse_string:
- 		charptr = &options->smartcard_device;
- 		goto parse_string;
++
+ static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
  
-+	case oUseNSS:
-+		intptr = &options->use_nss;
-+		goto parse_flag;
+ /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
+@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 		error("ssh_rsa_sign: no RSA key");
+ 		return -1;
+ 	}
 +
-+	case oNSSToken:
-+		charptr = &options->nss_token;
-+		goto parse_command;
++	slen = RSA_size(key->rsa);
++	sig = xmalloc(slen);
 +
- 	case oProxyCommand:
- 		charptr = &options->proxy_command;
- parse_command:
-@@ -1055,6 +1071,8 @@ initialize_options(Options * options)
- 	options->preferred_authentications = NULL;
- 	options->bind_address = NULL;
- 	options->smartcard_device = NULL;
-+	options->use_nss = -1;
-+	options->nss_token = NULL;
- 	options->enable_ssh_keysign = - 1;
- 	options->no_host_authentication_for_localhost = - 1;
- 	options->identities_only = - 1;
-@@ -1184,6 +1202,8 @@ fill_default_options(Options * options)
- 		options->no_host_authentication_for_localhost = 0;
- 	if (options->identities_only == -1)
- 		options->identities_only = 0;
-+	if (options->use_nss == -1)
-+		options->use_nss = 0;
- 	if (options->enable_ssh_keysign == -1)
- 		options->enable_ssh_keysign = 0;
- 	if (options->rekey_limit == -1)
++#ifdef HAVE_LIBNSS
++	if (key->flags & KEY_FLAG_NSS) {
++		SECItem sigitem;
++		SECOidTag alg;
++
++		memset(&sigitem, 0, sizeof(sigitem));
++		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
++			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
++			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
++
++		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
++			alg) != SECSuccess) {
++			error("ssh_rsa_sign: sign failed");
++			return -1;
++		}
++		if (sigitem.len > slen) {
++			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
++			xfree(sig);
++			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
++			return -1;
++		}
++		if (sigitem.len < slen) {
++			memset(sig, 0, slen - sigitem.len);
++		}
++		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
++		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
++	} else {
++#endif
+ 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
+ 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
+ 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+ 
+-	slen = RSA_size(key->rsa);
+-	sig = xmalloc(slen);
+-
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
+ 
+@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 		xfree(sig);
+ 		return -1;
+ 	}
++#ifdef HAVE_LIBNSS
++	}
++#endif
+ 	/* encode signature */
+ 	buffer_init(&b);
+ 	buffer_put_cstring(&b, "ssh-rsa");


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- openssh.spec	24 Sep 2009 16:05:26 -0000	1.169
+++ openssh.spec	30 Sep 2009 06:43:43 -0000	1.170
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 28%{?dist}%{?rescue_rel}
+Release: 29%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 29 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-29
+- Resolve locking in ssh-add (#491312)
+
 * Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-28
 - Repair initscript to be acord to guidelines (#521860)
 - Add bugzilla# to application of edns and xmodifiers patch



From fabbione at fedoraproject.org  Wed Sep 30 06:51:34 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 30 Sep 2009 06:51:34 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel .cvsignore, 1.3, 1.4 minor_build_fixes.diff, 
	1.1, 1.2 ocfs2-tools.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20090930065135.01D1A11C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11852

Modified Files:
	.cvsignore minor_build_fixes.diff ocfs2-tools.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Sep 2009 11:13:54 -0000	1.3
+++ .cvsignore	30 Sep 2009 06:51:32 -0000	1.4
@@ -1 +1 @@
-ocfs2-tools-1.4.2.tar.gz
+ocfs2-tools-1.4.3.tar.gz

minor_build_fixes.diff:
 Makefile    |    2 +-
 pacemaker.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Index: minor_build_fixes.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/minor_build_fixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- minor_build_fixes.diff	2 Sep 2009 11:13:54 -0000	1.1
+++ minor_build_fixes.diff	30 Sep 2009 06:51:33 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.2/ocfs2_controld/Makefile
---- ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile	2009-04-14 00:10:40.000000000 +0200
-+++ ocfs2-tools-1.4.2/ocfs2_controld/Makefile	2009-08-31 16:15:04.000000000 +0200
+diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_controld/Makefile
+--- ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile	2009-04-14 00:10:40.000000000 +0200
++++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile	2009-09-30 08:22:04.000000000 +0200
 @@ -17,7 +17,7 @@
  PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS)
  endif
@@ -10,9 +10,9 @@ diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2
  LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
  LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
  LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
-diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c
---- ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c	2009-05-06 03:36:57.000000000 +0200
-+++ ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c	2009-08-31 16:18:15.000000000 +0200
+diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c
+--- ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c	2009-05-06 03:36:57.000000000 +0200
++++ ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c	2009-09-30 08:22:22.000000000 +0200
 @@ -22,6 +22,7 @@
  
  #include <bzlib.h>
@@ -21,3 +21,12 @@ diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2
  #include <pacemaker/crm_config.h>
  /* heartbeat support is irrelevant here */
  #undef SUPPORT_HEARTBEAT
+@@ -155,7 +156,7 @@
+ 	crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
+ 
+ 	if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
+-		log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);
++		log_error("Connection to our AIS plugin (%d) failed", PCMK_SERVICE);
+ 		return -1;
+ 	}
+ 


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocfs2-tools.spec	21 Sep 2009 07:56:03 -0000	1.12
+++ ocfs2-tools.spec	30 Sep 2009 06:51:33 -0000	1.13
@@ -5,8 +5,8 @@
 
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
-Version: 1.4.2
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.4.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -212,6 +212,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
+- New upstream release.
+
 * Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
 - Fix pcmk resource agent.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Sep 2009 11:13:54 -0000	1.3
+++ sources	30 Sep 2009 06:51:33 -0000	1.4
@@ -1 +1 @@
-1dfc4a4ba72ba96250b508c8e27af981  ocfs2-tools-1.4.2.tar.gz
+7d8895ea41999ce8f468e2bc7dc55ddc  ocfs2-tools-1.4.3.tar.gz



From fabbione at fedoraproject.org  Wed Sep 30 06:53:31 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 30 Sep 2009 06:53:31 +0000 (UTC)
Subject: rpms/ocfs2-tools/F-12 .cvsignore, 1.3, 1.4 minor_build_fixes.diff,
	1.1, 1.2 ocfs2-tools.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20090930065331.1ED8811C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12547

Modified Files:
	.cvsignore minor_build_fixes.diff ocfs2-tools.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Sep 2009 11:13:54 -0000	1.3
+++ .cvsignore	30 Sep 2009 06:53:30 -0000	1.4
@@ -1 +1 @@
-ocfs2-tools-1.4.2.tar.gz
+ocfs2-tools-1.4.3.tar.gz

minor_build_fixes.diff:
 Makefile    |    2 +-
 pacemaker.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Index: minor_build_fixes.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/minor_build_fixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- minor_build_fixes.diff	2 Sep 2009 11:13:54 -0000	1.1
+++ minor_build_fixes.diff	30 Sep 2009 06:53:30 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.2/ocfs2_controld/Makefile
---- ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile	2009-04-14 00:10:40.000000000 +0200
-+++ ocfs2-tools-1.4.2/ocfs2_controld/Makefile	2009-08-31 16:15:04.000000000 +0200
+diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_controld/Makefile
+--- ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile	2009-04-14 00:10:40.000000000 +0200
++++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile	2009-09-30 08:22:04.000000000 +0200
 @@ -17,7 +17,7 @@
  PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS)
  endif
@@ -10,9 +10,9 @@ diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2
  LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
  LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
  LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
-diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c
---- ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c	2009-05-06 03:36:57.000000000 +0200
-+++ ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c	2009-08-31 16:18:15.000000000 +0200
+diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c
+--- ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c	2009-05-06 03:36:57.000000000 +0200
++++ ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c	2009-09-30 08:22:22.000000000 +0200
 @@ -22,6 +22,7 @@
  
  #include <bzlib.h>
@@ -21,3 +21,12 @@ diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2
  #include <pacemaker/crm_config.h>
  /* heartbeat support is irrelevant here */
  #undef SUPPORT_HEARTBEAT
+@@ -155,7 +156,7 @@
+ 	crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
+ 
+ 	if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
+-		log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);
++		log_error("Connection to our AIS plugin (%d) failed", PCMK_SERVICE);
+ 		return -1;
+ 	}
+ 


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/ocfs2-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocfs2-tools.spec	21 Sep 2009 07:56:03 -0000	1.12
+++ ocfs2-tools.spec	30 Sep 2009 06:53:30 -0000	1.13
@@ -5,8 +5,8 @@
 
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
-Version: 1.4.2
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.4.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -212,6 +212,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
+- New upstream release.
+
 * Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
 - Fix pcmk resource agent.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Sep 2009 11:13:54 -0000	1.3
+++ sources	30 Sep 2009 06:53:30 -0000	1.4
@@ -1 +1 @@
-1dfc4a4ba72ba96250b508c8e27af981  ocfs2-tools-1.4.2.tar.gz
+7d8895ea41999ce8f468e2bc7dc55ddc  ocfs2-tools-1.4.3.tar.gz



From jsafrane at fedoraproject.org  Wed Sep 30 06:54:01 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed, 30 Sep 2009 06:54:01 +0000 (UTC)
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.70,1.71
Message-ID: <20090930065401.DF11411C00E6@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12735

Modified Files:
	OpenIPMI.spec 
Log Message:
rebuilt with new net-snmp


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- OpenIPMI.spec	21 Aug 2009 12:18:18 -0000	1.70
+++ OpenIPMI.spec	30 Sep 2009 06:54:01 -0000	1.71
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Wed Sep 30 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-5
+- rebuilt with new net-snmp
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.16-4
 - rebuilt with new openssl
 



From jzeleny at fedoraproject.org  Wed Sep 30 06:54:38 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed, 30 Sep 2009 06:54:38 +0000 (UTC)
Subject: rpms/fcoe-utils/F-12 fcoe-utils.spec,1.8,1.9
Message-ID: <20090930065438.9CB6A11C00E6@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12954

Modified Files:
	fcoe-utils.spec 
Log Message:
Updated uptream sources. More info in spec file changelog.


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/F-12/fcoe-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fcoe-utils.spec	14 Sep 2009 10:28:16 -0000	1.8
+++ fcoe-utils.spec	30 Sep 2009 06:54:37 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -98,6 +98,10 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-4
+- updated source file. Upstream did mistake before and placed 1.0.8 tag
+  in a bad position, so F12 checkout covered some unfinished functions
+
 * Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-3
 - update of init script to be LSB-compliant
 



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:17 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested watchbugzilla
Message-ID: <20090930065617.6409E10F86A@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on redhat-lsb (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:21 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested commit
Message-ID: <20090930065621.32AA610F88C@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on redhat-lsb (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:23 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested watchcommits
Message-ID: <20090930065624.002D910F8A8@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on redhat-lsb (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:25 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested approveacls
Message-ID: <20090930065625.CFDEF10F8A9@bastion2.fedora.phx.redhat.com>

pnemade has requested the approveacls acl on redhat-lsb (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:29 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested approveacls
Message-ID: <20090930065629.63A6310F894@bastion2.fedora.phx.redhat.com>

pnemade has requested the approveacls acl on redhat-lsb (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:32 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested commit
Message-ID: <20090930065633.04F2E10F88B@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on redhat-lsb (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:34 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested watchcommits
Message-ID: <20090930065635.092E910F8AB@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on redhat-lsb (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:56:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:56:37 +0000
Subject: [pkgdb] redhat-lsb: pnemade has requested watchbugzilla
Message-ID: <20090930065637.4825310F8AD@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on redhat-lsb (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:28 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065828.B5F7310F86A@bastion2.fedora.phx.redhat.com>

petersen has set the watchbugzilla acl on redhat-lsb (Fedora devel) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:30 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065830.88A3810F894@bastion2.fedora.phx.redhat.com>

petersen has set the watchcommits acl on redhat-lsb (Fedora devel) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:30 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065830.AE97510F8AB@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on redhat-lsb (Fedora devel) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:33 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065833.1513010F8AF@bastion2.fedora.phx.redhat.com>

petersen has set the approveacls acl on redhat-lsb (Fedora devel) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:40 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065840.3033510F894@bastion2.fedora.phx.redhat.com>

petersen has set the watchbugzilla acl on redhat-lsb (Fedora 12) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:41 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065841.09D9810F8A8@bastion2.fedora.phx.redhat.com>

petersen has set the watchcommits acl on redhat-lsb (Fedora 12) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:42 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065842.CA04810F8AB@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on redhat-lsb (Fedora 12) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From pkgdb at fedoraproject.org  Wed Sep 30 06:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 06:58:44 +0000
Subject: [pkgdb] redhat-lsb had acl change status
Message-ID: <20090930065844.BCFA610F8AF@bastion2.fedora.phx.redhat.com>

petersen has set the approveacls acl on redhat-lsb (Fedora 12) to Approved for pnemade

To make changes to this package see:
  /pkgdb/packages/name/redhat-lsb



From kdudka at fedoraproject.org  Wed Sep 30 06:59:52 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 30 Sep 2009 06:59:52 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.118,1.119
Message-ID: <20090930065952.ED76F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14890

Modified Files:
	curl.spec 
Log Message:
remove outdated comment in .spec


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- curl.spec	27 Sep 2009 15:06:58 -0000	1.118
+++ curl.spec	30 Sep 2009 06:59:52 -0000	1.119
@@ -73,8 +73,6 @@ use cURL's capabilities internally.
 # upstream patches (already applied)
 %patch1 -p1
 %patch2 -p1
-
-# upstream patches (not yet applied)
 %patch3 -p1
 %patch4 -p1
 



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:11 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071311.5BB0A10F88C@bastion2.fedora.phx.redhat.com>

pnemade has set the watchcommits acl on bitmap-fonts (Fedora devel) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:08 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071308.D655710F86A@bastion2.fedora.phx.redhat.com>

pnemade has set the watchbugzilla acl on bitmap-fonts (Fedora devel) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:13 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071313.A160910F8A8@bastion2.fedora.phx.redhat.com>

pnemade has set the commit acl on bitmap-fonts (Fedora devel) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:33 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071333.9593810F88B@bastion2.fedora.phx.redhat.com>

pnemade has set the watchbugzilla acl on bitmap-fonts (Fedora 12) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:34 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071334.8C35310F895@bastion2.fedora.phx.redhat.com>

pnemade has set the watchcommits acl on bitmap-fonts (Fedora 12) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:34 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071335.32C2210F8AF@bastion2.fedora.phx.redhat.com>

pnemade has set the commit acl on bitmap-fonts (Fedora 12) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pkgdb at fedoraproject.org  Wed Sep 30 07:13:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 07:13:36 +0000
Subject: [pkgdb] bitmap-fonts had acl change status
Message-ID: <20090930071336.2682510F8A8@bastion2.fedora.phx.redhat.com>

pnemade has set the approveacls acl on bitmap-fonts (Fedora 12) to Approved for pravins

To make changes to this package see:
  /pkgdb/packages/name/bitmap-fonts



From pravins at fedoraproject.org  Wed Sep 30 07:26:47 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 30 Sep 2009 07:26:47 +0000 (UTC)
Subject: rpms/bitmap-fonts/F-12 bitmap-fonts.spec,1.20,1.21
Message-ID: <20090930072647.AE18611C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/bitmap-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21578

Modified Files:
	bitmap-fonts.spec 
Log Message:
* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - 0.3-9
- updating as per new packaging guidelines
- bugfix 481068



Index: bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bitmap-fonts/F-12/bitmap-fonts.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bitmap-fonts.spec	24 Jul 2009 18:07:05 -0000	1.20
+++ bitmap-fonts.spec	30 Sep 2009 07:26:47 -0000	1.21
@@ -1,6 +1,12 @@
+#%global fontname bitmap
+%define common_desc \
+The bitmap-fonts package provides a number of bitmap fonts selected\
+from the xorg package designed for use locations such as\
+terminals.
+
 Name: bitmap-fonts
 Version: 0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Lucida and MIT and Public Domain
 Source0: bitmap-fonts-%{version}.tar.bz2
 Source1: fixfont-3.5.tar.bz2
@@ -10,25 +16,40 @@ Group: User Interface/X
 Summary: Selected set of bitmap fonts
 Requires(pre): fontconfig
 BuildRequires: xorg-x11-font-utils
+BuildRequires: fontpackages-devel
 
 %description
-The bitmap-fonts package provides a number of bitmap fonts selected
-from the xorg package designed for use locations such as
-terminals.
+%common_desc
+
+%package common
+Summary:  Common files for bitmap-fonts
+Requires: fontpackages-filesystem
 
-%package cjk
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
+
+%_font_pkg  lut* con* [0-9]*
+
+%package -n bitmap-cjk-fonts
 Summary: Selected CJK bitmap fonts for Anaconda
 Group: Applications/System
 Requires(pre): fontconfig
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-cjk = %{version}-%{release}
 
-%description cjk
+%description -n %{fontname}-cjk-fonts
 bitmap-fonts-cjk package contains bitmap fonts used by Anaconda. They are
 selected from the xorg packages, and the font encoding are converted from 
 native encoding to ISO10646. They are only intended to be used in Anaconda.
 
+%_font_pkg -n cjk fangsongti*
+
 %prep
 %setup -q -a 1
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -38,44 +59,25 @@ cd fixfont-3.5
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir}
+
+#install -m 0755 -d %{buildroot}%{_fontdir}
+
 # %%ghost the fonts.cache-1 file
-touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1
+#touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-fc-cache %{_datadir}/fonts
-
-%postun
-if [ "$1" = "0" ]; then
-  fc-cache %{_datadir}/fonts
-fi
-
-%post cjk
-fc-cache %{_datadir}/fonts
-
-%postun cjk
-if [ "$1" = "0" ]; then
-  fc-cache %{_datadir}/fonts
-fi
-
-%files
+%files common
 %defattr(-,root,root)
 %doc README LU_LEGALNOTICE
-%dir %{_datadir}/fonts/bitmap-fonts
-%{_datadir}/fonts/bitmap-fonts/lut*
-%{_datadir}/fonts/bitmap-fonts/con*
-%{_datadir}/fonts/bitmap-fonts/[0-9]*
-%ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
-
-%files cjk
-%defattr(-,root,root)
-%dir %{_datadir}/fonts/bitmap-fonts
-%{_datadir}/fonts/bitmap-fonts/fangsongti*
-%ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %changelog
+* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - 0.3-9
+- updating as per new packaging guidelines
+- bugfix 481068
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From harald at fedoraproject.org  Wed Sep 30 07:33:20 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 30 Sep 2009 07:33:20 +0000 (UTC)
Subject: rpms/dracut/F-11 .cvsignore, 1.11, 1.12 dracut.spec, 1.16,
	1.17 sources, 1.15, 1.16
Message-ID: <20090930073320.D5CE511C043C@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24277

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 002-9
- make install of new dm/lvm udev rules optionally
- correct dasd module typo



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	23 Sep 2009 17:42:33 -0000	1.11
+++ .cvsignore	30 Sep 2009 07:33:20 -0000	1.12
@@ -1 +1 @@
-dracut-002-23aa2048.tar.bz2
+dracut-002-99fd62e3.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dracut.spec	23 Sep 2009 17:42:33 -0000	1.16
+++ dracut.spec	30 Sep 2009 07:33:20 -0000	1.17
@@ -1,4 +1,4 @@
-%define gittag 23aa2048
+%define gittag 99fd62e3
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 4%{?rdist}
+Release: 9%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -148,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95debug
 %{_datadir}/dracut/modules.d/95resume
 %{_datadir}/dracut/modules.d/95rootfs-block
-%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95dasd
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
 %{_datadir}/dracut/modules.d/95udev-rules.ub810
@@ -181,6 +181,25 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 002-9
+- make install of new dm/lvm udev rules optionally
+- correct dasd module typo
+
+* Fri Sep 25 2009 Warren Togami <wtogami at redhat.com> 002-8
+- revert back to dracut-002-5 tarball 845dd502
+  lvm2 was reverted to pre-udev
+
+* Wed Sep 23 2009 Harald Hoyer <harald at redhat.com> 002-7
+- build with the correct tarball
+
+* Wed Sep 23 2009 Harald Hoyer <harald at redhat.com> 002-6
+- add new device mapper udev rules and dmeventd 
+  bug 525319, 525015
+
+* Wed Sep 23 2009 Warren Togami <wtogami at redaht.com> 002-5
+- Revert back to -3, Add umount back to initrd
+  This makes no functional difference to LiveCD.  See Bug #525319
+
 * Mon Sep 21 2009 Warren Togami <wtogami at redhat.com> 002-4
 - Fix LiveCD boot regression
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	23 Sep 2009 17:42:33 -0000	1.15
+++ sources	30 Sep 2009 07:33:20 -0000	1.16
@@ -1 +1 @@
-a068ff45f641d00e93c399eb2bc937a9  dracut-002-23aa2048.tar.bz2
+00deb6d189ff2d0e30c754960b6a4a4d  dracut-002-99fd62e3.tar.bz2



From harald at fedoraproject.org  Wed Sep 30 07:34:36 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 30 Sep 2009 07:34:36 +0000 (UTC)
Subject: rpms/dracut/F-11 0005-mdraid-add-grep-for-convenience.patch, 1.1,
	NONE 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch,
	1.1,
	NONE 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch, 
	1.1, NONE dracut-0.9-vol_id.patch, 1.1, NONE
Message-ID: <20090930073436.61E4411C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24609

Removed Files:
	0005-mdraid-add-grep-for-convenience.patch 
	0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch 
	0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch 
	dracut-0.9-vol_id.patch 
Log Message:
removed obsolete patches



--- 0005-mdraid-add-grep-for-convenience.patch DELETED ---


--- 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch DELETED ---


--- 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch DELETED ---


--- dracut-0.9-vol_id.patch DELETED ---



From pravins at fedoraproject.org  Wed Sep 30 07:36:14 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 30 Sep 2009 07:36:14 +0000 (UTC)
Subject: rpms/bitmap-fonts/devel bitmap-fonts.spec,1.20,1.21
Message-ID: <20090930073614.AD38011C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/bitmap-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24980

Modified Files:
	bitmap-fonts.spec 
Log Message:
* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - 0.3-9
- updating as per new packaging guidelines
- bugfix 481068



Index: bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bitmap-fonts/devel/bitmap-fonts.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bitmap-fonts.spec	24 Jul 2009 18:07:05 -0000	1.20
+++ bitmap-fonts.spec	30 Sep 2009 07:36:13 -0000	1.21
@@ -1,6 +1,12 @@
+#%global fontname bitmap
+%define common_desc \
+The bitmap-fonts package provides a number of bitmap fonts selected\
+from the xorg package designed for use locations such as\
+terminals.
+
 Name: bitmap-fonts
 Version: 0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Lucida and MIT and Public Domain
 Source0: bitmap-fonts-%{version}.tar.bz2
 Source1: fixfont-3.5.tar.bz2
@@ -10,25 +16,40 @@ Group: User Interface/X
 Summary: Selected set of bitmap fonts
 Requires(pre): fontconfig
 BuildRequires: xorg-x11-font-utils
+BuildRequires: fontpackages-devel
 
 %description
-The bitmap-fonts package provides a number of bitmap fonts selected
-from the xorg package designed for use locations such as
-terminals.
+%common_desc
+
+%package common
+Summary:  Common files for bitmap-fonts
+Requires: fontpackages-filesystem
 
-%package cjk
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
+
+%_font_pkg  lut* con* [0-9]*
+
+%package -n bitmap-cjk-fonts
 Summary: Selected CJK bitmap fonts for Anaconda
 Group: Applications/System
 Requires(pre): fontconfig
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-cjk = %{version}-%{release}
 
-%description cjk
+%description -n %{fontname}-cjk-fonts
 bitmap-fonts-cjk package contains bitmap fonts used by Anaconda. They are
 selected from the xorg packages, and the font encoding are converted from 
 native encoding to ISO10646. They are only intended to be used in Anaconda.
 
+%_font_pkg -n cjk fangsongti*
+
 %prep
 %setup -q -a 1
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -38,44 +59,25 @@ cd fixfont-3.5
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir}
+
+#install -m 0755 -d %{buildroot}%{_fontdir}
+
 # %%ghost the fonts.cache-1 file
-touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1
+#touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-fc-cache %{_datadir}/fonts
-
-%postun
-if [ "$1" = "0" ]; then
-  fc-cache %{_datadir}/fonts
-fi
-
-%post cjk
-fc-cache %{_datadir}/fonts
-
-%postun cjk
-if [ "$1" = "0" ]; then
-  fc-cache %{_datadir}/fonts
-fi
-
-%files
+%files common
 %defattr(-,root,root)
 %doc README LU_LEGALNOTICE
-%dir %{_datadir}/fonts/bitmap-fonts
-%{_datadir}/fonts/bitmap-fonts/lut*
-%{_datadir}/fonts/bitmap-fonts/con*
-%{_datadir}/fonts/bitmap-fonts/[0-9]*
-%ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
-
-%files cjk
-%defattr(-,root,root)
-%dir %{_datadir}/fonts/bitmap-fonts
-%{_datadir}/fonts/bitmap-fonts/fangsongti*
-%ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %changelog
+* Wed Sep 30 2009 Pravin Satpute <psatpute at redhat.com> - 0.3-9
+- updating as per new packaging guidelines
+- bugfix 481068
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jzeleny at fedoraproject.org  Wed Sep 30 08:12:31 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed, 30 Sep 2009 08:12:31 +0000 (UTC)
Subject: rpms/fcoe-utils/F-12 fcoe-utils.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <20090930081232.549DC11C04F5@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5451

Modified Files:
	fcoe-utils.spec sources 
Log Message:
forgot to upload new tarball, should be ok now


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/F-12/fcoe-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fcoe-utils.spec	30 Sep 2009 06:54:37 -0000	1.9
+++ fcoe-utils.spec	30 Sep 2009 08:12:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -98,6 +98,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-5
+- forgot to upload new tarball, should be ok now
+
 * Wed Sep 30 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-4
 - updated source file. Upstream did mistake before and placed 1.0.8 tag
   in a bad position, so F12 checkout covered some unfinished functions


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Jul 2009 17:51:10 -0000	1.3
+++ sources	30 Sep 2009 08:12:18 -0000	1.4
@@ -1 +1 @@
-0f8ddd3e4a5d75dc9568fe7141364894  fcoe-utils-1.0.8.tar.gz
+c7934f9dcaa64e73c1cc823a1327e04b  fcoe-utils-1.0.8.tar.gz



From jzeleny at fedoraproject.org  Wed Sep 30 08:28:52 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed, 30 Sep 2009 08:28:52 +0000 (UTC)
Subject: rpms/openldap/F-12 openldap-2.4.18-ldif-buf-overflow.patch, 1.2,
	1.3 openldap.spec, 1.151, 1.152
Message-ID: <20090930082852.D89B611C00E6@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11999

Modified Files:
	openldap-2.4.18-ldif-buf-overflow.patch openldap.spec 
Log Message:
buffer overflow patch from upstream, minor changes in spec file

openldap-2.4.18-ldif-buf-overflow.patch:
 ldif.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: openldap-2.4.18-ldif-buf-overflow.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-12/openldap-2.4.18-ldif-buf-overflow.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openldap-2.4.18-ldif-buf-overflow.patch	24 Sep 2009 13:23:53 -0000	1.2
+++ openldap-2.4.18-ldif-buf-overflow.patch	30 Sep 2009 08:28:49 -0000	1.3
@@ -1,54 +1,17 @@
---- openldap-2.4.18/servers/slapd/back-ldif/ldif.c.orig	2009-09-24 09:46:01.000000000 +0200
-+++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 13:40:07.000000000 +0200
-@@ -593,9 +593,7 @@ typedef struct bvlist {
+Avoid the struct hack, just malloc two data structures in one chunk:
+
+--- openldap-2.4.18/servers/slapd/back-ldif/ldif.c.orig	2009-08-18 23:58:27
++++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 16:08:14
+@@ -593,9 +593,9 @@ typedef struct bvlist {
  	char *trunc;	/* filename was truncated here */
  	int  inum;		/* num from "attr={num}" in filename, or INT_MIN */
  	char savech;	/* original char at *trunc */
 -	char fname;		/* variable length array BVL_NAME(bvl) = &fname */
 -#	define BVL_NAME(bvl) ((char *) (bvl) + offsetof(bvlist, fname))
 -#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen))
-+	char *fname;		/* variable length array */
++	/* BVL_NAME(&bvlist) is the filename, allocated after the struct: */
++#	define BVL_NAME(bvl)     ((char *) ((bvl) + 1))
++#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen) + 1)
  } bvlist;
  
  static int
-@@ -709,17 +707,18 @@ ldif_readdir(
- 			if ( *fname_maxlenp < fname_len )
- 				*fname_maxlenp = fname_len;
- 
--			bvl = SLAP_MALLOC( BVL_SIZE( fname_len ) );
-+			bvl = SLAP_MALLOC( sizeof( bvlist ) );
-+			bvl->fname = SLAP_MALLOC( fname_len+1 );
- 			if ( bvl == NULL ) {
- 				rc = LDAP_OTHER;
- 				save_errno = errno;
- 				break;
- 			}
--			strcpy( BVL_NAME( bvl ), dir->d_name );
-+			strcpy( bvl->fname, dir->d_name );
- 
- 			/* Make it sortable by ("attr=val" or <preceding {num}, num>) */
--			trunc = BVL_NAME( bvl ) + fname_len - STRLENOF( LDIF );
--			if ( (idxp = strchr( BVL_NAME( bvl ) + 2, IX_FSL )) != NULL &&
-+			trunc = bvl->fname + fname_len - STRLENOF( LDIF );
-+			if ( (idxp = strchr( bvl->fname + 2, IX_FSL )) != NULL &&
- 				 (endp = strchr( ++idxp, IX_FSR )) != NULL && endp > idxp &&
- 				 (eq_unsafe || idxp[-2] == '=' || endp + 1 == trunc) )
- 			{
-@@ -737,7 +736,7 @@ ldif_readdir(
- 			*trunc = '\0';
- 
- 			for ( prev = listp; (ptr = *prev) != NULL; prev = &ptr->next ) {
--				int cmp = strcmp( BVL_NAME( bvl ), BVL_NAME( ptr ));
-+				int cmp = strcmp( bvl->fname, ptr->fname );
- 				if ( cmp < 0 || (cmp == 0 && bvl->inum < ptr->inum) )
- 					break;
- 			}
-@@ -826,7 +825,7 @@ ldif_search_entry(
- 
- 				if ( rc == LDAP_SUCCESS ) {
- 					*ptr->trunc = ptr->savech;
--					FILL_PATH( &fpath, dir_end, BVL_NAME( ptr ));
-+					FILL_PATH( &fpath, dir_end, ptr->fname );
- 
- 					rc = ldif_read_entry( op, fpath.bv_val, &dn, &ndn,
- 						&e, text );


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-12/openldap.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- openldap.spec	24 Sep 2009 13:23:53 -0000	1.151
+++ openldap.spec	30 Sep 2009 08:28:51 -0000	1.152
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -388,6 +388,10 @@ for X in acl add auth cat dn index passw
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
 chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
 
+# Add files and dirs which would be created by %post scriptlet
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.conf.bak
+mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.d
+
 # Remove files which we don't want packaged.
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.la
@@ -596,7 +600,9 @@ fi
 %ghost %config(noreplace) %{_sysconfdir}/pki/tls/certs/slapd.pem
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/slapd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf
-%attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
+%attr(0640,root,ldap) %config(noreplace,missingok) %{_sysconfdir}/openldap/slapd.conf
+%attr(0640,root,ldap) %ghost %{_sysconfdir}/openldap/slapd.conf.bak
+%attr(0640,ldap,ldap) %ghost %{_sysconfdir}/openldap/slapd.d
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ldap
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/schema/*.schema*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/schema/*.ldif
@@ -639,6 +645,11 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Sep 30 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-4
+- buffer overflow patch from upstream
+- added /etc/openldap/slapd.d and /etc/openldap/slapd.conf.bak
+  to files owned by openldap-servers
+
 * Thu Sep 24 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-3
 - cleanup of previous patch fixing buffer overflow
 



From jwrdegoede at fedoraproject.org  Wed Sep 30 08:31:35 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 30 Sep 2009 08:31:35 +0000 (UTC)
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.72,1.73
Message-ID: <20090930083135.C8C2611C0261@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lm_sensors/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13398

Modified Files:
	lm_sensors.spec 
Log Message:
* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> 3.1.1-4
- Create a sensor3.conf.5 symlink to the sensors.conf.5 manpage (#526178)



Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- lm_sensors.spec	25 Jul 2009 11:11:59 -0000	1.72
+++ lm_sensors.spec	30 Sep 2009 08:31:34 -0000	1.73
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 3.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.lm-sensors.org/
 Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
 Source1: lm_sensors.sysconfig
@@ -37,7 +37,7 @@ Core libraries for lm_sensors applicatio
 %package devel
 Summary: Development files for programs which will use lm_sensors
 Group: Development/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 The lm_sensors-devel package includes a header files and libraries for use
@@ -72,6 +72,8 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir}
   DESTDIR=$RPM_BUILD_ROOT user_install
 rm $RPM_BUILD_ROOT%{_libdir}/libsensors.a
 
+ln -s sensors.conf.5.gz $RPM_BUILD_ROOT%{_mandir}/man5/sensors3.conf.5.gz
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensord
@@ -175,6 +177,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> 3.1.1-4
+- Create a sensor3.conf.5 symlink to the sensors.conf.5 manpage (#526178)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From giallu at fedoraproject.org  Wed Sep 30 08:31:55 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Wed, 30 Sep 2009 08:31:55 +0000 (UTC)
Subject: rpms/gpointing-device-settings/devel
	gpds-1.3.1-fix_typos_bug_596015.patch, NONE,
	1.1 gpds-1.3.1-pkgconfig.patch, NONE,
	1.1 gpointing-device-settings.desktop, NONE,
	1.1 gpointing-device-settings.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930083155.080FA11C0261@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/gpointing-device-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13450

Modified Files:
	.cvsignore sources 
Added Files:
	gpds-1.3.1-fix_typos_bug_596015.patch 
	gpds-1.3.1-pkgconfig.patch gpointing-device-settings.desktop 
	gpointing-device-settings.spec 
Log Message:
Imported sources


gpds-1.3.1-fix_typos_bug_596015.patch:
 gpds-mouse-definitions.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gpds-1.3.1-fix_typos_bug_596015.patch ---
>From d39cf65fceb7abb4c5db241bb261f4e0f9eeb8a8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 27 Sep 2009 01:40:37 +0000
Subject: Fix typos. Fixes for bug 596015.

---
diff --git a/modules/common/gpds-mouse-definitions.h b/modules/common/gpds-mouse-definitions.h
index a78771d..1b2039d 100644
--- a/modules/common/gpds-mouse-definitions.h
+++ b/modules/common/gpds-mouse-definitions.h
@@ -22,9 +22,9 @@
 
 #define GPDS_MOUSE_GCONF_DIR                   "/desktop/gnome/peripherals"
 #define GPDS_MOUSE_MIDDLE_BUTTON_EMULATION_KEY "middle_button_emulation"
-#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeoue"
+#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeout"
 #define GPDS_MOUSE_WHEEL_EMULATION_KEY         "wheel_emulation"
-#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inetia"
+#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inertia"
 #define GPDS_MOUSE_WHEEL_EMULATION_X_AXIS_KEY  "wheel_emulation_x_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_Y_AXIS_KEY  "wheel_emulation_y_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT_KEY "wheel_emulation_timeout"
--
cgit v0.8.2


gpds-1.3.1-pkgconfig.patch:
 libgpointing-device-settings.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpds-1.3.1-pkgconfig.patch ---
diff --git a/libgpointing-device-settings.pc.in b/libgpointing-device-settings.pc.in
index 8fda90e..900beaa 100644
--- a/libgpointing-device-settings.pc.in
+++ b/libgpointing-device-settings.pc.in
@@ -12,5 +12,5 @@ Name: LibGPointingDeviceSettings
 Description: Library to create dynamic module of UI for pointing device settings
 Version: @VERSION@
 Requires: gtk+-2.0 >= @GTK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@
-Libs: -L${libdir} -lgpointing-device-settings
+Libs: -L${libdir} -lgpds
 Cflags: -I${includedir}/gpointing-device-settings


--- NEW FILE gpointing-device-settings.desktop ---
[Desktop Entry]
Name=Pointing Devices
Comment=Set your pointing device preferences
Exec=gpointing-device-settings
Icon=touchpad
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;Settings;
OnlyShowIn=GNOME;


--- NEW FILE gpointing-device-settings.spec ---
Name:           gpointing-device-settings
Version:        1.3.1
Release:        5%{?dist}
Summary:        Configuration tool for pointing devices

Group:          Applications/System
License:        LGPLv3+
URL:            http://live.gnome.org/GPointingDeviceSettings
Source0:        http://dl.sourceforge.jp/gsynaptics/38468/gpointing-device-settings-1.3.1.tar.gz
Source1:        gpointing-device-settings.desktop
Source2:        touchpad.png

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext, intltool
BuildRequires:  GConf2-devel
BuildRequires:  libXi-devel
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils

Requires:       gnome-settings-daemon
Requires(pre):  GConf2
Requires(post): GConf2
Requires(preun):GConf2

# Obsoletes gsynaptics, to be removed in F14
Obsoletes:      gsynaptics < 0.9.17
Provides:       gsynaptics = %{version}-%{release}

# Reported upstream https://bugzilla.gnome.org/show_bug.cgi?id=596835
Patch0:         gpds-1.3.1-pkgconfig.patch
# Fixed upstream https://bugzilla.gnome.org/show_bug.cgi?id=596015
Patch1:         gpds-1.3.1-fix_typos_bug_596015.patch


%description
GUI tool for setting pointing device such as TrackPoint or Touchpad. It
allows configuring of various drivers parameters on the fly.
It is a successor of GSynaptics.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtk2-devel, GConf2-devel, libXi-devel
Requires:       pkgconfig

%description devel
Development headers and libraries for %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .typos

%build
%configure \
        --disable-static \
        --disable-schemas-install \
        --disable-dependency-tracking

# https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_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

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

# Remove useless files
find %{buildroot} -name '*.la' -delete

desktop-file-install                                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
%{SOURCE1}

install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/touchpad.png


%clean
rm -rf $RPM_BUILD_ROOT


%post devel -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi

%post 
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
    %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :

%postun -p /sbin/ldconfig

%preun 
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS TODO MAINTAINERS COPYING
%{_sysconfdir}/gconf/schemas/*
%{_bindir}/gpointing-device-settings
%{_libdir}/gnome-settings-daemon-2.0/*
%{_libdir}/gpointing-device-settings/
%{_datadir}/gpointing-device-settings/
%{_datadir}/applications/*
%{_datadir}/pixmaps/touchpad.png
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so


%changelog
* Mon Sep 28 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-5
- Add patch from upstream

* Wed Sep 23 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-4
- fix .desktop validation issues
- add missing icon from gsynaptics

* Sun Sep 20 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-3
- Don't split libgdps until translations are split as well
- Fix .pc library name
- Fix GConf scriptlets according to guidelines snippets
- Fix obsoletes
- Add .desktop file

* Tue Jul 21 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-2
- Require gnome-settings-daemon
- Fix Source0 URL
- Obsoletes gsynaptics

* Wed Jul  1 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:03:05 -0000	1.1
+++ .cvsignore	30 Sep 2009 08:31:53 -0000	1.2
@@ -0,0 +1 @@
+gpointing-device-settings-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:03:05 -0000	1.1
+++ sources	30 Sep 2009 08:31:54 -0000	1.2
@@ -0,0 +1 @@
+2b0a567739fb565364cdca8dfc72545c  gpointing-device-settings-1.3.1.tar.gz



From giallu at fedoraproject.org  Wed Sep 30 08:46:08 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Wed, 30 Sep 2009 08:46:08 +0000 (UTC)
Subject: rpms/gpointing-device-settings/devel touchpad.png,NONE,1.1
Message-ID: <20090930084608.A74D211C00E6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/gpointing-device-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18280

Added Files:
	touchpad.png 
Log Message:
Add icon




From jussilehtola at fedoraproject.org  Wed Sep 30 08:51:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 08:51:28 +0000 (UTC)
Subject: rpms/vecmath1.2/devel vecmath1.2.spec,1.4,1.5
Message-ID: <20090930085128.F124811C0261@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath1.2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20027

Modified Files:
	vecmath1.2.spec 
Log Message:
Cleaned up spec file.


Index: vecmath1.2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath1.2/devel/vecmath1.2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vecmath1.2.spec	27 Jul 2009 06:48:58 -0000	1.4
+++ vecmath1.2.spec	30 Sep 2009 08:51:28 -0000	1.5
@@ -1,13 +1,22 @@
 Name:           vecmath1.2
 Version:        1.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free version of vecmath from the Java3D 1.2 specification
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.objectclub.jp/download/vecmath_e
 Source0:        http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  java-javadoc java-gcj-compat-devel
+BuildArch:      noarch
+
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
+
+Requires:       jpackage-utils
+Requires:       java >= 1:1.6.0
+
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description
 This is an unofficial implementation (java source code) of the javax.vecmath
@@ -21,74 +30,57 @@ Generic matrices' LU and SV decompositio
 %package javadoc
 Group:          Development/Libraries
 Summary:        Javadoc for %{name}
+Requires:       %{name} = %{version}-%{release}
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+This package contains the API documentation for %{name}.
 
 
 %prep
 %setup -q
+find -name *.jar -delete
+find -name *.class -delete
 
 
 %build
 make -f Makefile.unix all docs
 pushd classes
-jar cf ../%{name}-%{version}.jar .
+jar cf ../%{name}.jar .
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
 # jar
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vecmath.jar
+install -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# gcj
-%{_bindir}/aot-compile-rpm
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES
-%{_javadir}/vecmath*
-%{_libdir}/gcj/%{name}
+%{_javadir}/%{name}.jar
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
 
 
 %changelog
+* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.14-5
+- Modernized spec file to conform to Java guidelines.
+- Removed clash with vecmath package.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jussilehtola at fedoraproject.org  Wed Sep 30 08:58:58 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 08:58:58 +0000 (UTC)
Subject: rpms/vecmath1.2/F-11 vecmath1.2.spec,1.3,1.4
Message-ID: <20090930085858.EFCE411C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath1.2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22358/F-11

Modified Files:
	vecmath1.2.spec 
Log Message:
Cleaned up spec file.


Index: vecmath1.2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath1.2/F-11/vecmath1.2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vecmath1.2.spec	26 Feb 2009 00:05:31 -0000	1.3
+++ vecmath1.2.spec	30 Sep 2009 08:58:58 -0000	1.4
@@ -1,13 +1,22 @@
 Name:           vecmath1.2
 Version:        1.14
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Free version of vecmath from the Java3D 1.2 specification
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.objectclub.jp/download/vecmath_e
 Source0:        http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  java-javadoc java-gcj-compat-devel
+BuildArch:      noarch
+
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
+
+Requires:       jpackage-utils
+Requires:       java >= 1:1.6.0
+
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description
 This is an unofficial implementation (java source code) of the javax.vecmath
@@ -21,74 +30,60 @@ Generic matrices' LU and SV decompositio
 %package javadoc
 Group:          Development/Libraries
 Summary:        Javadoc for %{name}
+Requires:       %{name} = %{version}-%{release}
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+This package contains the API documentation for %{name}.
 
 
 %prep
 %setup -q
+find -name *.jar -delete
+find -name *.class -delete
 
 
 %build
 make -f Makefile.unix all docs
 pushd classes
-jar cf ../%{name}-%{version}.jar .
+jar cf ../%{name}.jar .
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
 # jar
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vecmath.jar
+install -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# gcj
-%{_bindir}/aot-compile-rpm
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES
-%{_javadir}/vecmath*
-%{_libdir}/gcj/%{name}
+%{_javadir}/%{name}.jar
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
 
 
 %changelog
+* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.14-5
+- Modernized spec file to conform to Java guidelines.
+- Removed clash with vecmath package.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jussilehtola at fedoraproject.org  Wed Sep 30 08:58:58 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 08:58:58 +0000 (UTC)
Subject: rpms/vecmath1.2/F-10 vecmath1.2.spec,1.2,1.3
Message-ID: <20090930085858.CE09711C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath1.2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22358/F-10

Modified Files:
	vecmath1.2.spec 
Log Message:
Cleaned up spec file.


Index: vecmath1.2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath1.2/F-10/vecmath1.2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vecmath1.2.spec	19 Feb 2008 09:49:26 -0000	1.2
+++ vecmath1.2.spec	30 Sep 2009 08:58:58 -0000	1.3
@@ -1,13 +1,22 @@
 Name:           vecmath1.2
 Version:        1.14
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Free version of vecmath from the Java3D 1.2 specification
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.objectclub.jp/download/vecmath_e
 Source0:        http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  java-javadoc java-gcj-compat-devel
+BuildArch:      noarch
+
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
+
+Requires:       jpackage-utils
+Requires:       java >= 1:1.6.0
+
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description
 This is an unofficial implementation (java source code) of the javax.vecmath
@@ -21,74 +30,63 @@ Generic matrices' LU and SV decompositio
 %package javadoc
 Group:          Development/Libraries
 Summary:        Javadoc for %{name}
+Requires:       %{name} = %{version}-%{release}
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+This package contains the API documentation for %{name}.
 
 
 %prep
 %setup -q
+find -name *.jar -delete
+find -name *.class -delete
 
 
 %build
 make -f Makefile.unix all docs
 pushd classes
-jar cf ../%{name}-%{version}.jar .
+jar cf ../%{name}.jar .
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
 # jar
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vecmath.jar
+install -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# gcj
-%{_bindir}/aot-compile-rpm
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES
-%{_javadir}/vecmath*
-%{_libdir}/gcj/%{name}
+%{_javadir}/%{name}.jar
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
 
 
 %changelog
+* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.14-5
+- Modernized spec file to conform to Java guidelines.
+- Removed clash with vecmath package.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.14-2
 - Autorebuild for GCC 4.3
 



From jussilehtola at fedoraproject.org  Wed Sep 30 08:58:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 08:58:59 +0000 (UTC)
Subject: rpms/vecmath1.2/F-12 vecmath1.2.spec,1.4,1.5
Message-ID: <20090930085859.2D3AF11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath1.2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22358/F-12

Modified Files:
	vecmath1.2.spec 
Log Message:
Cleaned up spec file.


Index: vecmath1.2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath1.2/F-12/vecmath1.2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vecmath1.2.spec	27 Jul 2009 06:48:58 -0000	1.4
+++ vecmath1.2.spec	30 Sep 2009 08:58:59 -0000	1.5
@@ -1,13 +1,22 @@
 Name:           vecmath1.2
 Version:        1.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free version of vecmath from the Java3D 1.2 specification
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.objectclub.jp/download/vecmath_e
 Source0:        http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  java-javadoc java-gcj-compat-devel
+BuildArch:      noarch
+
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
+
+Requires:       jpackage-utils
+Requires:       java >= 1:1.6.0
+
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description
 This is an unofficial implementation (java source code) of the javax.vecmath
@@ -21,74 +30,57 @@ Generic matrices' LU and SV decompositio
 %package javadoc
 Group:          Development/Libraries
 Summary:        Javadoc for %{name}
+Requires:       %{name} = %{version}-%{release}
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+This package contains the API documentation for %{name}.
 
 
 %prep
 %setup -q
+find -name *.jar -delete
+find -name *.class -delete
 
 
 %build
 make -f Makefile.unix all docs
 pushd classes
-jar cf ../%{name}-%{version}.jar .
+jar cf ../%{name}.jar .
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
 # jar
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vecmath.jar
+install -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# gcj
-%{_bindir}/aot-compile-rpm
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES
-%{_javadir}/vecmath*
-%{_libdir}/gcj/%{name}
+%{_javadir}/%{name}.jar
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
 
 
 %changelog
+* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.14-5
+- Modernized spec file to conform to Java guidelines.
+- Removed clash with vecmath package.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From npajkovs at fedoraproject.org  Wed Sep 30 09:07:29 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed, 30 Sep 2009 09:07:29 +0000 (UTC)
Subject: rpms/gpm/F-12 gpm-1.20.6-capability.patch, 1.1, 1.2 gpm.spec, 1.77,
	1.78
Message-ID: <20090930090729.0C23311C00E6@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/gpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25130

Modified Files:
	gpm-1.20.6-capability.patch gpm.spec 
Log Message:
add BuildRequires: libcap-ng-devel
> - fix patch .capability

gpm-1.20.6-capability.patch:
 configure.ac      |    3 +++
 src/Makefile.in   |    3 ++-
 src/daemon/main.c |    9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

Index: gpm-1.20.6-capability.patch
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-12/gpm-1.20.6-capability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpm-1.20.6-capability.patch	20 Aug 2009 08:39:53 -0000	1.1
+++ gpm-1.20.6-capability.patch	30 Sep 2009 09:07:28 -0000	1.2
@@ -42,7 +42,7 @@ diff -urp gpm-1.20.6.orig/src/Makefile.i
  gpm:	$(GOBJ)
 -	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
 +	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) \
-+		-lm $(CAPNG_LDADD)
++		-lm @CAPNG_LDADD@
  
  # construct dependings of sourcefiles and link sourcefiles
  $(DEPFILE) dep: prog/gpm-root.c


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-12/gpm.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- gpm.spec	20 Aug 2009 08:39:53 -0000	1.77
+++ gpm.spec	30 Sep 2009 09:07:28 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -21,7 +21,7 @@ Requires(postun): /sbin/ldconfig 
 # this defines the library version that this package builds.
 %define LIBVER 2.1.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: sed gawk texinfo bison ncurses-devel autoconf automake libtool
+BuildRequires: sed gawk texinfo bison ncurses-devel autoconf automake libtool libcap-ng-devel
 
 %description
 Gpm provides mouse support to text-based Linux applications like the
@@ -160,6 +160,10 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Wed Sep 30 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6-7
+- add BuildRequires: libcap-ng-devel
+- fix patch .capability
+
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.20.6-6
 - Don't complain if installing with --excludedocs (#515927)
 - Drop unnecessary capabilities in gpm (#517659)



From chitlesh at fedoraproject.org  Wed Sep 30 09:13:35 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 30 Sep 2009 09:13:35 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.134,1.135 comps-f13.xml.in,1.24,1.25
Message-ID: <20090930091335.5690A11C00E6@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26490

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
added gplcver and avra to electronic-lab group


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- comps-f12.xml.in	29 Sep 2009 17:12:10 -0000	1.134
+++ comps-f12.xml.in	30 Sep 2009 09:13:33 -0000	1.135
@@ -1389,6 +1389,7 @@
       <packagereq type="default">avr-gcc</packagereq>
       <packagereq type="default">avr-gcc-c++</packagereq>
       <packagereq type="default">avr-gdb</packagereq>
+      <packagereq type="default">avra</packagereq>
       <packagereq type="default">avrdude</packagereq>
       <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
@@ -1420,6 +1421,7 @@
       <packagereq type="default">gnucap</packagereq>
       <packagereq type="default">gnuradio</packagereq>
       <packagereq type="default">gnusim8085</packagereq>
+      <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gpsim</packagereq>
       <packagereq type="default">gputils</packagereq>
       <packagereq type="default">gresistor</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- comps-f13.xml.in	29 Sep 2009 17:12:10 -0000	1.24
+++ comps-f13.xml.in	30 Sep 2009 09:13:33 -0000	1.25
@@ -1383,6 +1383,7 @@
       <packagereq type="default">avr-gcc</packagereq>
       <packagereq type="default">avr-gcc-c++</packagereq>
       <packagereq type="default">avr-gdb</packagereq>
+      <packagereq type="default">avra</packagereq>
       <packagereq type="default">avrdude</packagereq>
       <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
@@ -1414,6 +1415,7 @@
       <packagereq type="default">gnucap</packagereq>
       <packagereq type="default">gnuradio</packagereq>
       <packagereq type="default">gnusim8085</packagereq>
+      <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gpsim</packagereq>
       <packagereq type="default">gputils</packagereq>
       <packagereq type="default">gresistor</packagereq>



From pkgdb at fedoraproject.org  Wed Sep 30 09:21:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:21:40 +0000
Subject: [pkgdb] gpm: npajkovs has requested watchbugzilla
Message-ID: <20090930092140.550A810F857@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchbugzilla acl on gpm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:21:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:21:48 +0000
Subject: [pkgdb] gpm: npajkovs has requested watchcommits
Message-ID: <20090930092148.216EC10F857@bastion2.fedora.phx.redhat.com>

npajkovs has requested the watchcommits acl on gpm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:21:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:21:50 +0000
Subject: [pkgdb] gpm: npajkovs has requested commit
Message-ID: <20090930092150.697D710F88B@bastion2.fedora.phx.redhat.com>

npajkovs has requested the commit acl on gpm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:21:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:21:52 +0000
Subject: [pkgdb] gpm: npajkovs has requested approveacls
Message-ID: <20090930092152.CB26210F857@bastion2.fedora.phx.redhat.com>

npajkovs has requested the approveacls acl on gpm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:12 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092212.B299610F88C@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on gpm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:15 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092216.3E33C10F8AC@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on gpm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:19 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092219.1470A10F895@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on gpm (Fedora devel) to Denied for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:21 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092221.ACAD010F88B@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on gpm (Fedora devel) to Obsolete for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:25 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092225.5243410F88C@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on gpm (Fedora devel) to Obsolete for pertusus

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:29 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092229.91F6910F875@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchbugzilla acl on gpm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:30 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092230.E4AEC10F894@bastion2.fedora.phx.redhat.com>

npajkovs has set the commit acl on gpm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:29 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092230.2429310F88B@bastion2.fedora.phx.redhat.com>

npajkovs has set the watchcommits acl on gpm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:22:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:22:32 +0000
Subject: [pkgdb] gpm had acl change status
Message-ID: <20090930092232.9B78510F8A8@bastion2.fedora.phx.redhat.com>

npajkovs has set the approveacls acl on gpm (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  /pkgdb/packages/name/gpm



From pkgdb at fedoraproject.org  Wed Sep 30 09:26:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:26:37 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested watchcommits
Message-ID: <20090930092637.C686210F86A@bastion2.fedora.phx.redhat.com>

fabbione has requested the watchcommits acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:26:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:26:43 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested
	watchbugzilla
Message-ID: <20090930092643.9B5D710F895@bastion2.fedora.phx.redhat.com>

fabbione has requested the watchbugzilla acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:26:48 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested commit
Message-ID: <20090930092648.1C88610F86A@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:27:00 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested
	watchbugzilla
Message-ID: <20090930092700.235AA10F88B@bastion2.fedora.phx.redhat.com>

fabbione has requested the watchbugzilla acl on device-mapper-multipath (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:27:03 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested watchcommits
Message-ID: <20090930092703.7842310F8AB@bastion2.fedora.phx.redhat.com>

fabbione has requested the watchcommits acl on device-mapper-multipath (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:27:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:27:07 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested commit
Message-ID: <20090930092708.0533410F86A@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on device-mapper-multipath (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:27:14 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested
	watchbugzilla
Message-ID: <20090930092714.D009310F86A@bastion2.fedora.phx.redhat.com>

fabbione has requested the watchbugzilla acl on device-mapper-multipath (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:27:17 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested watchcommits
Message-ID: <20090930092717.5859D10F88C@bastion2.fedora.phx.redhat.com>

fabbione has requested the watchcommits acl on device-mapper-multipath (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 09:27:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 09:27:20 +0000
Subject: [pkgdb] device-mapper-multipath: fabbione has requested commit
Message-ID: <20090930092720.C5EB210F86A@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on device-mapper-multipath (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From jussilehtola at fedoraproject.org  Wed Sep 30 09:31:58 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:31:58 +0000 (UTC)
Subject: rpms/vecmath/devel import.log, NONE, 1.1 vecmath.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930093158.A950F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32164/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vecmath.spec 
Log Message:
Import in Fedora.


--- NEW FILE import.log ---
vecmath-0-2_20090922cvs_fc11:HEAD:vecmath-0-2.20090922cvs.fc11.src.rpm:1254302971


--- NEW FILE vecmath.spec ---
%global tardate 20090922

Name:		vecmath
Version:	0
Release:	2.%{tardate}cvs%{?dist}
Summary:	The 3D vector math Java package, javax.vecmath
Group:		Development/Libraries
# License is GNU General Public License, version 2, with the Classpath Exception
License:	GPLv2 with exceptions
URL:		https://vecmath.dev.java.net/
## Source pulled from upstream CVS.
# https://vecmath.dev.java.net/servlets/ProjectSource
## Tarball created with
## (you need to create a username)
# cvs -d :pserver:username at cvs.dev.java.net:/cvs login
# cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
# tar cf vecmath-%{tardate}.tar vecmath
# xz vecmath-%{tardate}.tar
Source0:	%{name}-%{tardate}.tar.xz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# For EPEL 5
BuildRequires:	xz

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
The 3D vector math Java package, javax.vecmath.

%prep
%setup -q -n %{name}
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
ant

%install
rm -rf %{buildroot}
install -D -p -m 644 build/debug/lib/ext/vecmath.jar %{buildroot}%{_javadir}/vecmath.jar

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc docs/api-changes* LICENSE.txt LICENSE-SPEC.html
%{_javadir}/vecmath.jar

%changelog
* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-2.20090922cvs
- Minor review fixes.

* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.20090922cvs
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:10:00 -0000	1.1
+++ .cvsignore	30 Sep 2009 09:31:58 -0000	1.2
@@ -0,0 +1 @@
+vecmath-20090922.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:00 -0000	1.1
+++ sources	30 Sep 2009 09:31:58 -0000	1.2
@@ -0,0 +1 @@
+f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz



From jussilehtola at fedoraproject.org  Wed Sep 30 09:33:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:33:02 +0000 (UTC)
Subject: rpms/vecmath/EL-5 vecmath.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090930093302.12A2211C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32383/EL-5

Modified Files:
	sources 
Added Files:
	vecmath.spec 
Log Message:
Import in Fedora.


--- NEW FILE vecmath.spec ---
%global tardate 20090922

Name:		vecmath
Version:	0
Release:	2.%{tardate}cvs%{?dist}
Summary:	The 3D vector math Java package, javax.vecmath
Group:		Development/Libraries
# License is GNU General Public License, version 2, with the Classpath Exception
License:	GPLv2 with exceptions
URL:		https://vecmath.dev.java.net/
## Source pulled from upstream CVS.
# https://vecmath.dev.java.net/servlets/ProjectSource
## Tarball created with
## (you need to create a username)
# cvs -d :pserver:username at cvs.dev.java.net:/cvs login
# cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
# tar cf vecmath-%{tardate}.tar vecmath
# xz vecmath-%{tardate}.tar
Source0:	%{name}-%{tardate}.tar.xz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# For EPEL 5
BuildRequires:	xz

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
The 3D vector math Java package, javax.vecmath.

%prep
%setup -q -n %{name}
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
ant

%install
rm -rf %{buildroot}
install -D -p -m 644 build/debug/lib/ext/vecmath.jar %{buildroot}%{_javadir}/vecmath.jar

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc docs/api-changes* LICENSE.txt LICENSE-SPEC.html
%{_javadir}/vecmath.jar

%changelog
* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-2.20090922cvs
- Minor review fixes.

* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.20090922cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:00 -0000	1.1
+++ sources	30 Sep 2009 09:33:01 -0000	1.2
@@ -0,0 +1 @@
+f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz



From jussilehtola at fedoraproject.org  Wed Sep 30 09:33:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:33:02 +0000 (UTC)
Subject: rpms/vecmath/F-10 vecmath.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090930093302.5AF1A11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32383/F-10

Modified Files:
	sources 
Added Files:
	vecmath.spec 
Log Message:
Import in Fedora.


--- NEW FILE vecmath.spec ---
%global tardate 20090922

Name:		vecmath
Version:	0
Release:	2.%{tardate}cvs%{?dist}
Summary:	The 3D vector math Java package, javax.vecmath
Group:		Development/Libraries
# License is GNU General Public License, version 2, with the Classpath Exception
License:	GPLv2 with exceptions
URL:		https://vecmath.dev.java.net/
## Source pulled from upstream CVS.
# https://vecmath.dev.java.net/servlets/ProjectSource
## Tarball created with
## (you need to create a username)
# cvs -d :pserver:username at cvs.dev.java.net:/cvs login
# cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
# tar cf vecmath-%{tardate}.tar vecmath
# xz vecmath-%{tardate}.tar
Source0:	%{name}-%{tardate}.tar.xz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# For EPEL 5
BuildRequires:	xz

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
The 3D vector math Java package, javax.vecmath.

%prep
%setup -q -n %{name}
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
ant

%install
rm -rf %{buildroot}
install -D -p -m 644 build/debug/lib/ext/vecmath.jar %{buildroot}%{_javadir}/vecmath.jar

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc docs/api-changes* LICENSE.txt LICENSE-SPEC.html
%{_javadir}/vecmath.jar

%changelog
* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-2.20090922cvs
- Minor review fixes.

* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.20090922cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:00 -0000	1.1
+++ sources	30 Sep 2009 09:33:02 -0000	1.2
@@ -0,0 +1 @@
+f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz



From jussilehtola at fedoraproject.org  Wed Sep 30 09:33:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:33:02 +0000 (UTC)
Subject: rpms/vecmath/F-12 vecmath.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090930093302.CCB7911C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32383/F-12

Modified Files:
	sources 
Added Files:
	vecmath.spec 
Log Message:
Import in Fedora.


--- NEW FILE vecmath.spec ---
%global tardate 20090922

Name:		vecmath
Version:	0
Release:	2.%{tardate}cvs%{?dist}
Summary:	The 3D vector math Java package, javax.vecmath
Group:		Development/Libraries
# License is GNU General Public License, version 2, with the Classpath Exception
License:	GPLv2 with exceptions
URL:		https://vecmath.dev.java.net/
## Source pulled from upstream CVS.
# https://vecmath.dev.java.net/servlets/ProjectSource
## Tarball created with
## (you need to create a username)
# cvs -d :pserver:username at cvs.dev.java.net:/cvs login
# cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
# tar cf vecmath-%{tardate}.tar vecmath
# xz vecmath-%{tardate}.tar
Source0:	%{name}-%{tardate}.tar.xz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# For EPEL 5
BuildRequires:	xz

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
The 3D vector math Java package, javax.vecmath.

%prep
%setup -q -n %{name}
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
ant

%install
rm -rf %{buildroot}
install -D -p -m 644 build/debug/lib/ext/vecmath.jar %{buildroot}%{_javadir}/vecmath.jar

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc docs/api-changes* LICENSE.txt LICENSE-SPEC.html
%{_javadir}/vecmath.jar

%changelog
* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-2.20090922cvs
- Minor review fixes.

* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.20090922cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:00 -0000	1.1
+++ sources	30 Sep 2009 09:33:02 -0000	1.2
@@ -0,0 +1 @@
+f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz



From jussilehtola at fedoraproject.org  Wed Sep 30 09:33:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:33:02 +0000 (UTC)
Subject: rpms/vecmath/F-11 vecmath.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090930093302.98C8411C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32383/F-11

Modified Files:
	sources 
Added Files:
	vecmath.spec 
Log Message:
Import in Fedora.


--- NEW FILE vecmath.spec ---
%global tardate 20090922

Name:		vecmath
Version:	0
Release:	2.%{tardate}cvs%{?dist}
Summary:	The 3D vector math Java package, javax.vecmath
Group:		Development/Libraries
# License is GNU General Public License, version 2, with the Classpath Exception
License:	GPLv2 with exceptions
URL:		https://vecmath.dev.java.net/
## Source pulled from upstream CVS.
# https://vecmath.dev.java.net/servlets/ProjectSource
## Tarball created with
## (you need to create a username)
# cvs -d :pserver:username at cvs.dev.java.net:/cvs login
# cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
# tar cf vecmath-%{tardate}.tar vecmath
# xz vecmath-%{tardate}.tar
Source0:	%{name}-%{tardate}.tar.xz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# For EPEL 5
BuildRequires:	xz

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
The 3D vector math Java package, javax.vecmath.

%prep
%setup -q -n %{name}
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
ant

%install
rm -rf %{buildroot}
install -D -p -m 644 build/debug/lib/ext/vecmath.jar %{buildroot}%{_javadir}/vecmath.jar

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc docs/api-changes* LICENSE.txt LICENSE-SPEC.html
%{_javadir}/vecmath.jar

%changelog
* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-2.20090922cvs
- Minor review fixes.

* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.20090922cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:00 -0000	1.1
+++ sources	30 Sep 2009 09:33:02 -0000	1.2
@@ -0,0 +1 @@
+f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz



From sharkcz at fedoraproject.org  Wed Sep 30 09:36:13 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 30 Sep 2009 09:36:13 +0000 (UTC)
Subject: rpms/hercstudio/EL-5 hercstudio-qt42.patch, NONE,
	1.1 hercstudio.spec, 1.1, 1.2
Message-ID: <20090930093613.5716411C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv902

Modified Files:
	hercstudio.spec 
Added Files:
	hercstudio-qt42.patch 
Log Message:
* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta.1
- backport to QT 4.2


hercstudio-qt42.patch:
 HercConfiguration/Configuration.ui |  217 -------------------------------------
 HercStudio/mainwindow.cpp          |    2 
 2 files changed, 219 deletions(-)

--- NEW FILE hercstudio-qt42.patch ---
>From 4410cca1e3edea8f9b3bef2ed87d4cc0949248b3 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 17 Sep 2009 12:27:30 +0200
Subject: [PATCH 1/2] remove call of method unsupported in qt 4.2

---
 HerculesStudio/HercStudio/mainwindow.cpp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/HerculesStudio/HercStudio/mainwindow.cpp b/HerculesStudio/HercStudio/mainwindow.cpp
index e8c468b..c62cb26 100644
--- a/HerculesStudio/HercStudio/mainwindow.cpp
+++ b/HerculesStudio/HercStudio/mainwindow.cpp
@@ -537,7 +537,6 @@ void MainWindow::deleteMessages()
         msgBox.setText("Messages belong to to a running Hercules.");
         msgBox.setInformativeText("Are you sure you want to delete history messages?");
         msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        msgBox.setDefaultButton(QMessageBox::Yes);
         msgBox.setIcon(QMessageBox::Warning);
         int ret = msgBox.exec();
         if (ret != QMessageBox::Yes)
-- 
1.6.3.3

>From deddadf39bc61fff47035ff2c028b3173d25d069 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 17 Sep 2009 12:29:52 +0200
Subject: [PATCH 2/2] remove items unsupported in qt 4.2

---
 HerculesStudio/HercConfiguration/Configuration.ui |  216 ---------------------
 1 files changed, 0 insertions(+), 216 deletions(-)

diff --git a/HerculesStudio/HercConfiguration/Configuration.ui b/HerculesStudio/HercConfiguration/Configuration.ui
index bce9ca0..b2b92cc 100644
--- a/HerculesStudio/HercConfiguration/Configuration.ui
+++ b/HerculesStudio/HercConfiguration/Configuration.ui
@@ -968,24 +968,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </active>
         <inactive>
          <colorrole role="WindowText">
@@ -1105,24 +1087,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </inactive>
         <disabled>
          <colorrole role="WindowText">
@@ -1242,24 +1206,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </disabled>
        </palette>
       </property>
@@ -1411,24 +1357,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </active>
         <inactive>
          <colorrole role="WindowText">
@@ -1548,24 +1476,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </inactive>
         <disabled>
          <colorrole role="WindowText">
@@ -1685,24 +1595,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </disabled>
        </palette>
       </property>
@@ -1854,24 +1746,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </active>
         <inactive>
          <colorrole role="WindowText">
@@ -1991,24 +1865,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </inactive>
         <disabled>
          <colorrole role="WindowText">
@@ -2128,24 +1984,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </disabled>
        </palette>
       </property>
@@ -2302,24 +2140,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </active>
         <inactive>
          <colorrole role="WindowText">
@@ -2439,24 +2259,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </inactive>
         <disabled>
          <colorrole role="WindowText">
@@ -2576,24 +2378,6 @@ p, li { white-space: pre-wrap; }
            </color>
           </brush>
          </colorrole>
-         <colorrole role="ToolTipBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>220</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ToolTipText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
         </disabled>
        </palette>
       </property>
-- 
1.6.3.3



Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/hercstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio.spec	17 Sep 2009 08:49:12 -0000	1.1
+++ hercstudio.spec	30 Sep 2009 09:36:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           hercstudio
 Version:        1.0
-Release:        0.2.beta%{?dist}
+Release:        0.2.beta%{?dist}.1
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
 Group:          Applications/Emulators
@@ -12,6 +12,8 @@ Source0:        %{name}-svn3.tar.bz2
 Source1:        %{name}.desktop
 Patch0:         %{name}-gcc44.patch
 Patch1:         %{name}-buttons.patch
+# backport to QT 4.2
+Patch2:         %{name}-qt42.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -27,10 +29,14 @@ GUI front-end to the Hercules mainframe 
 %setup -q -n %{name}
 %patch0 -p2 -b .gcc44
 %patch1 -p0 -b .buttons
+%patch2 -p2 -b .qt42
+
+# remove first line from ui file iff it starts with <?xml ...>
+find . -name \*.ui | xargs sed -i '1{/<?xml/d}'
 
 
 %build
-%{_qt4_qmake}
+%{_libdir}/qt4/bin/qmake -unix QMAKE_CFLAGS="%{optflags}" QMAKE_CXXFLAGS="%{optflags}"
 make %{?_smp_mflags}
 
 
@@ -44,7 +50,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixm
 install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm
 
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
 
 %clean
@@ -60,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta.1
+- backport to QT 4.2
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
 - add patch for panel buttons from upstream
 



From wolfy at fedoraproject.org  Wed Sep 30 09:40:13 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 30 Sep 2009 09:40:13 +0000 (UTC)
Subject: rpms/libprelude/EL-5 libprelude.spec,1.7,1.8
Message-ID: <20090930094013.20DBD11C048B@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/libprelude/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2340

Modified Files:
	libprelude.spec 
Log Message:
fix the conditionals in the spec.



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/EL-5/libprelude.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libprelude.spec	11 Aug 2009 15:21:14 -0000	1.7
+++ libprelude.spec	30 Sep 2009 09:40:12 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.24
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -45,7 +45,7 @@ Python bindings for libprelude.
 %package perl
 Summary:	Perl bindings for libprelude
 Group:		System Environment/Libraries
-%if 0%{?rhel} <= 5
+%if 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires:	perl
 %else
 BuildRequires:	perl-devel
@@ -141,6 +141,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Wed Sep 30 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.24-4
+- correct the identification of rhel <= 5 during build time
+
 * Sat Aug 8 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.24-3
 - adjust to build in EL-5
 



From jussilehtola at fedoraproject.org  Wed Sep 30 09:49:11 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:49:11 +0000 (UTC)
Subject: rpms/vecmath/EL-5 sources,1.2,1.3 vecmath.spec,1.1,1.2
Message-ID: <20090930094911.713ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254/EL-5

Modified Files:
	sources vecmath.spec 
Log Message:
Use bz2 source instead of xz which doesn't work on EPEL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2009 09:33:01 -0000	1.2
+++ sources	30 Sep 2009 09:49:11 -0000	1.3
@@ -1 +1 @@
-f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz
+0bf68079840358b3606f7b8833d26857  vecmath-20090922.tar.bz2


Index: vecmath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/EL-5/vecmath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vecmath.spec	30 Sep 2009 09:33:01 -0000	1.1
+++ vecmath.spec	30 Sep 2009 09:49:11 -0000	1.2
@@ -16,15 +16,13 @@ URL:		https://vecmath.dev.java.net/
 # cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
 # tar cf vecmath-%{tardate}.tar vecmath
 # xz vecmath-%{tardate}.tar
-Source0:	%{name}-%{tardate}.tar.xz
+Source0:	%{name}-%{tardate}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 BuildRequires:	ant
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
-# For EPEL 5
-BuildRequires:	xz
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils



From jussilehtola at fedoraproject.org  Wed Sep 30 09:49:11 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:49:11 +0000 (UTC)
Subject: rpms/vecmath/F-10 sources,1.2,1.3 vecmath.spec,1.1,1.2
Message-ID: <20090930094911.9559B11C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254/F-10

Modified Files:
	sources vecmath.spec 
Log Message:
Use bz2 source instead of xz which doesn't work on EPEL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2009 09:33:02 -0000	1.2
+++ sources	30 Sep 2009 09:49:11 -0000	1.3
@@ -1 +1 @@
-f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz
+0bf68079840358b3606f7b8833d26857  vecmath-20090922.tar.bz2


Index: vecmath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-10/vecmath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vecmath.spec	30 Sep 2009 09:33:02 -0000	1.1
+++ vecmath.spec	30 Sep 2009 09:49:11 -0000	1.2
@@ -16,15 +16,13 @@ URL:		https://vecmath.dev.java.net/
 # cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
 # tar cf vecmath-%{tardate}.tar vecmath
 # xz vecmath-%{tardate}.tar
-Source0:	%{name}-%{tardate}.tar.xz
+Source0:	%{name}-%{tardate}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 BuildRequires:	ant
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
-# For EPEL 5
-BuildRequires:	xz
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils



From jussilehtola at fedoraproject.org  Wed Sep 30 09:49:12 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:49:12 +0000 (UTC)
Subject: rpms/vecmath/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vecmath.spec, 1.1, 1.2
Message-ID: <20090930094912.62C9E11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254/devel

Modified Files:
	.cvsignore sources vecmath.spec 
Log Message:
Use bz2 source instead of xz which doesn't work on EPEL.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Sep 2009 09:31:58 -0000	1.2
+++ .cvsignore	30 Sep 2009 09:49:12 -0000	1.3
@@ -1 +1 @@
-vecmath-20090922.tar.xz
+vecmath-20090922.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2009 09:31:58 -0000	1.2
+++ sources	30 Sep 2009 09:49:12 -0000	1.3
@@ -1 +1 @@
-f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz
+0bf68079840358b3606f7b8833d26857  vecmath-20090922.tar.bz2


Index: vecmath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/devel/vecmath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vecmath.spec	30 Sep 2009 09:31:58 -0000	1.1
+++ vecmath.spec	30 Sep 2009 09:49:12 -0000	1.2
@@ -16,15 +16,13 @@ URL:		https://vecmath.dev.java.net/
 # cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
 # tar cf vecmath-%{tardate}.tar vecmath
 # xz vecmath-%{tardate}.tar
-Source0:	%{name}-%{tardate}.tar.xz
+Source0:	%{name}-%{tardate}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 BuildRequires:	ant
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
-# For EPEL 5
-BuildRequires:	xz
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils



From jussilehtola at fedoraproject.org  Wed Sep 30 09:49:12 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:49:12 +0000 (UTC)
Subject: rpms/vecmath/F-12 sources,1.2,1.3 vecmath.spec,1.1,1.2
Message-ID: <20090930094912.157BA11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254/F-12

Modified Files:
	sources vecmath.spec 
Log Message:
Use bz2 source instead of xz which doesn't work on EPEL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2009 09:33:02 -0000	1.2
+++ sources	30 Sep 2009 09:49:11 -0000	1.3
@@ -1 +1 @@
-f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz
+0bf68079840358b3606f7b8833d26857  vecmath-20090922.tar.bz2


Index: vecmath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-12/vecmath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vecmath.spec	30 Sep 2009 09:33:02 -0000	1.1
+++ vecmath.spec	30 Sep 2009 09:49:11 -0000	1.2
@@ -16,15 +16,13 @@ URL:		https://vecmath.dev.java.net/
 # cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
 # tar cf vecmath-%{tardate}.tar vecmath
 # xz vecmath-%{tardate}.tar
-Source0:	%{name}-%{tardate}.tar.xz
+Source0:	%{name}-%{tardate}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 BuildRequires:	ant
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
-# For EPEL 5
-BuildRequires:	xz
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils



From jussilehtola at fedoraproject.org  Wed Sep 30 09:49:11 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 09:49:11 +0000 (UTC)
Subject: rpms/vecmath/F-11 sources,1.2,1.3 vecmath.spec,1.1,1.2
Message-ID: <20090930094911.CC19611C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vecmath/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254/F-11

Modified Files:
	sources vecmath.spec 
Log Message:
Use bz2 source instead of xz which doesn't work on EPEL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2009 09:33:02 -0000	1.2
+++ sources	30 Sep 2009 09:49:11 -0000	1.3
@@ -1 +1 @@
-f4ade6e893a52ff15998066bfeb0ad1f  vecmath-20090922.tar.xz
+0bf68079840358b3606f7b8833d26857  vecmath-20090922.tar.bz2


Index: vecmath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath/F-11/vecmath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vecmath.spec	30 Sep 2009 09:33:02 -0000	1.1
+++ vecmath.spec	30 Sep 2009 09:49:11 -0000	1.2
@@ -16,15 +16,13 @@ URL:		https://vecmath.dev.java.net/
 # cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout vecmath
 # tar cf vecmath-%{tardate}.tar vecmath
 # xz vecmath-%{tardate}.tar
-Source0:	%{name}-%{tardate}.tar.xz
+Source0:	%{name}-%{tardate}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 BuildRequires:	ant
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
-# For EPEL 5
-BuildRequires:	xz
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils



From ovasik at fedoraproject.org  Wed Sep 30 10:08:51 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 30 Sep 2009 10:08:51 +0000 (UTC)
Subject: rpms/quota/F-12 quota.spec,1.56,1.57
Message-ID: <20090930100851.E360711C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8813

Modified Files:
	quota.spec 
Log Message:
add buildrequires for quota_nld, enable-netlink to build  quota_nld (#526047)


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-12/quota.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- quota.spec	18 Sep 2009 07:51:15 -0000	1.56
+++ quota.spec	30 Sep 2009 10:08:50 -0000	1.57
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -13,8 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: initscripts >= 6.38 tcp_wrappers e2fsprogs
 Conflicts: kernel < 2.4
 BuildRequires: e2fsprogs-devel gettext tcp_wrappers-devel nss-devel
-BuildRequires: openldap-devel openssl-devel
+BuildRequires: openldap-devel openssl-devel dbus-devel libnl-devel
 Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
+Source2: quota_nld.init
 Patch0:	quota-3.06-warnquota.patch
 Patch1: quota-3.06-no-stripping.patch
 Patch2: quota-3.06-man-page.patch
@@ -66,7 +67,8 @@ done
 %if %{rpcsetquota}
 	--enable-rpcsetquota=yes \
 %endif
-	--enable-rootsbin
+	--enable-rootsbin \
+	--enable-netlink=yes
 make
 
 
@@ -79,6 +81,7 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8}
 make install INSTALL='install -p' ROOTDIR=%{buildroot}
 install -m 644 warnquota.conf %{buildroot}%{_sysconfdir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/quota_nld
 #
 # we don't support XFS yet
 #
@@ -100,6 +103,7 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/*
+%config(noreplace) %attr(-,root,root) %{sysconfdir}/rc.d/init.d/innd
 %attr(0755,root,root) /sbin/*
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sbindir}/*
@@ -114,6 +118,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 30 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-8
+- add buildrequires for quota_nld, enable-netlink to build
+  quota_nld (#526047)
+
 * Fri Sep 18 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-7
 - Fix headers and structs in quotactl manpage(#524138)
 



From ovasik at fedoraproject.org  Wed Sep 30 10:13:14 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 30 Sep 2009 10:13:14 +0000 (UTC)
Subject: rpms/quota/F-12 quota.spec,1.57,1.58
Message-ID: <20090930101314.5110011C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9981

Modified Files:
	quota.spec 
Log Message:
Remove rawhide glitches from F-12 spec file


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-12/quota.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- quota.spec	30 Sep 2009 10:08:50 -0000	1.57
+++ quota.spec	30 Sep 2009 10:13:13 -0000	1.58
@@ -15,7 +15,6 @@ Conflicts: kernel < 2.4
 BuildRequires: e2fsprogs-devel gettext tcp_wrappers-devel nss-devel
 BuildRequires: openldap-devel openssl-devel dbus-devel libnl-devel
 Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
-Source2: quota_nld.init
 Patch0:	quota-3.06-warnquota.patch
 Patch1: quota-3.06-no-stripping.patch
 Patch2: quota-3.06-man-page.patch
@@ -81,7 +80,6 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8}
 make install INSTALL='install -p' ROOTDIR=%{buildroot}
 install -m 644 warnquota.conf %{buildroot}%{_sysconfdir}
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/quota_nld
 #
 # we don't support XFS yet
 #
@@ -103,7 +101,6 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/*
-%config(noreplace) %attr(-,root,root) %{sysconfdir}/rc.d/init.d/innd
 %attr(0755,root,root) /sbin/*
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sbindir}/*



From pbrobinson at fedoraproject.org  Wed Sep 30 10:13:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:13:21 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, 1.4, 1.5 anerley.spec, 1.8,
	1.9 sources, 1.4, 1.5 anerley-mc5-port.patch, 1.1,
	NONE anerley-pkgcfg-mc5.patch, 1.1, NONE
Message-ID: <20090930101321.E227111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10034

Modified Files:
	.cvsignore anerley.spec sources 
Removed Files:
	anerley-mc5-port.patch anerley-pkgcfg-mc5.patch 
Log Message:
- New upstream 0.1.4 release, drop upstreamed MC5 patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Sep 2009 12:49:22 -0000	1.4
+++ .cvsignore	30 Sep 2009 10:13:21 -0000	1.5
@@ -1 +1 @@
-anerley-0.1.2.tar.bz2
+anerley-0.1.4.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- anerley.spec	29 Sep 2009 12:49:22 -0000	1.8
+++ anerley.spec	30 Sep 2009 10:13:21 -0000	1.9
@@ -1,7 +1,5 @@
-%define _default_patch_fuzz 2
-
 Name:           anerley
-Version:        0.1.2
+Version:        0.1.4
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -11,13 +9,6 @@ URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Created with:
-# git show -p f76297e57d4368ef4e289716e03cd8e256532fad
-# git show -p 3aa84f86a5c0d33d3dc3199b3891ac6a30c8fae0~9..
-# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/anerley.git
-Patch0:        anerley-mc5-port.patch
-Patch1:        anerley-pkgcfg-mc5.patch
-
 BuildRequires: evolution-data-server-devel
 BuildRequires: glib2-devel
 BuildRequires: nbtk-devel
@@ -44,8 +35,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mc5
-%patch1 -p1 -b .pkgcfg
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -83,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
+- New upstream 0.1.4 release, drop upstreamed MC5 patches
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
 - New upstream 0.1.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Sep 2009 12:49:22 -0000	1.4
+++ sources	30 Sep 2009 10:13:21 -0000	1.5
@@ -1 +1 @@
-fe3e7a3c3e4ba791ba3342382f005a35  anerley-0.1.2.tar.bz2
+569a7dc19efce61f1cb703f1d94416c7  anerley-0.1.4.tar.bz2


--- anerley-mc5-port.patch DELETED ---


--- anerley-pkgcfg-mc5.patch DELETED ---



From jpopelka at fedoraproject.org  Wed Sep 30 10:14:07 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Wed, 30 Sep 2009 10:14:07 +0000 (UTC)
Subject: rpms/netplug/devel netplug.spec, 1.1, 1.2 netplug-1.2.9.1-init.patch,
	1.1, 1.2
Message-ID: <20090930101407.4625011C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/netplug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10188

Modified Files:
	netplug.spec netplug-1.2.9.1-init.patch 
Log Message:
* Wed Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-2
- fix init script to be LSB-compliant (#521641)



Index: netplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netplug/devel/netplug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netplug.spec	29 Sep 2009 09:20:58 -0000	1.1
+++ netplug.spec	30 Sep 2009 10:14:06 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Daemon that responds to network cables being plugged in and out
 Name: netplug
 Version: 1.2.9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://www.red-bean.com/~bos/
@@ -11,6 +11,7 @@ Source0: http://www.red-bean.com/~bos/ne
 Patch1: netplug-1.2.9.1-execshield.patch
 
 #fix netplugd init script (#242919)
+#fix init script to be LSB-compliant (#521641)
 Patch2: netplug-1.2.9.1-init.patch
 
 Requires: iproute >= 2.4.7
@@ -81,5 +82,8 @@ exit 0
 
 %changelog
 
+* Wed Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-2
+- fix init script to be LSB-compliant (#521641)
+
 * Tue Sep 8 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-1
-- Initial standalone package. Up to now netplug has been part of net-tools.
\ No newline at end of file
+- Initial standalone package. Up to now netplug has been part of net-tools.

netplug-1.2.9.1-init.patch:
 rc.netplugd |  111 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 82 insertions(+), 29 deletions(-)

Index: netplug-1.2.9.1-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netplug/devel/netplug-1.2.9.1-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netplug-1.2.9.1-init.patch	29 Sep 2009 09:20:58 -0000	1.1
+++ netplug-1.2.9.1-init.patch	30 Sep 2009 10:14:06 -0000	1.2
@@ -1,33 +1,140 @@
 diff -up netplug-1.2.9.1/scripts/rc.netplugd.init netplug-1.2.9.1/scripts/rc.netplugd
 --- netplug-1.2.9.1/scripts/rc.netplugd.init	2008-12-23 00:36:23.000000000 +0100
-+++ netplug-1.2.9.1/scripts/rc.netplugd	2009-09-08 11:55:03.000000000 +0200
-@@ -17,11 +17,6 @@
++++ netplug-1.2.9.1/scripts/rc.netplugd	2009-09-21 14:49:42.000000000 +0200
+@@ -1,5 +1,12 @@
+ #!/bin/sh
+ #
++### BEGIN INIT INFO
++# Provides: netplugd
++# Short-Description: start and stop network plug daemon
++# Description: netplugd is a daemon for managing non-static network
++#              interfaces.
++### END INIT INFO
++#
+ # netplugd     This shell script takes care of starting and stopping
+ #              the network plug management daemon.
+ #
+@@ -17,48 +24,94 @@
  # Source networking configuration.
  . /etc/sysconfig/network
  
 -# Check that networking is up.
 -[ ${NETWORKING} = "no" ] && exit 0
--
++[ -f /etc/sysconfig/netplugd ] && . /etc/sysconfig/netplugd
++
+ 
 -[ -x /sbin/netplugd ] || exit 0
--
- if [ -f /etc/sysconfig/netplugd ]; then
-     . /etc/sysconfig/netplugd
++prog=netplugd
++exec=/sbin/netplugd
++config=/etc/netplug.d/netplugd.conf
++lockfile=/var/lock/subsys/netplugd
++pidfile=/var/run/netplugd.pid
++
++check() {
++	# Check that we're a privileged user
++	[ `id -u` = 0 ] || exit 4
++	
++	# Check if netplugd is executable
++	[ -x $exec ] || exit 5
++}
+ 
+-if [ -f /etc/sysconfig/netplugd ]; then
+-    . /etc/sysconfig/netplugd
++start () {
++        check
++
++	[ ${NETWORKING} = "no" ] && exit 1
++	[ -f $config ] || exit 6
++
++	echo -n $"Starting $prog: "
++	daemon $exec ${NETPLUGDARGS} -p $pidfile
++	RETVAL=$?
++	echo
++
++	[ $RETVAL -eq 0 ] && touch $lockfile
++	return $RETVAL
++}
++
++stop () {
++        check
++
++	echo -n $"Shutting down $prog: "
++	killproc $prog
++	RETVAL=$?
++	echo
++
++	[ $RETVAL -eq 0 ] && rm -f $lockfile
++	return $RETVAL
++}
++
++restart() {
++	stop
++	start
++}
++
++rh_status() {
++    status $prog
++}
++
++rh_status_q() {
++    rh_status >/dev/null 2>&1
++}
++
++if [ $# -gt 1 ]; then
++    exit 2
  fi
-@@ -30,6 +25,8 @@ fi
+ 
+-# See how we were called.
  case "$1" in
    start)
- 	# Start daemon.
-+	[ ${NETWORKING} = "no" ] && exit 1
-+	[ -x /sbin/netplugd ] || exit 1
- 	echo -n $"Starting network plug daemon: "
- 	daemon /sbin/netplugd ${NETPLUGDARGS} -p /var/run/netplugd.pid
- 	RETVAL=$?
-@@ -57,7 +54,7 @@ case "$1" in
+-	# Start daemon.
+-	echo -n $"Starting network plug daemon: "
+-	daemon /sbin/netplugd ${NETPLUGDARGS} -p /var/run/netplugd.pid
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd
++	rh_status_q && exit 0
++	start
+ 	;;
+   stop)
+-	# Stop daemon.
+-	echo -n $"Shutting down network plug daemon: "
+-	killproc netplugd
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd
++	rh_status_q || exit 0
++	stop
+ 	;;
+-  status)
+-	status netplugd
+-	RETVAL=$?
++  restart|force-reload)
++	restart
+ 	;;
+-  restart|reload)
+-	$0 stop
+-	$0 start
++  reload)
++        rh_status_q || exit 7
++        restart
++        ;;
++  condrestart|try-restart)
++	rh_status_q || exit 0
++	restart
+ 	;;
+-  condrestart)
+-	[ -f /var/lock/subsys/netplugd ] && restart || :
++  status)
++	rh_status
  	;;
    *)
- 	echo $"Usage: $0 {start|stop|status|restart}"
+-	echo $"Usage: $0 {start|stop|status|restart}"
 -	RETVAL=1
-+	RETVAL=3
++	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++	exit 2
  	;;
  esac
  
+-exit $RETVAL
++exit $?



From pbrobinson at fedoraproject.org  Wed Sep 30 10:15:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:15:41 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel .cvsignore, 1.4,
	1.5 moblin-panel-status.spec, 1.6, 1.7 sources, 1.4,
	1.5 mps-mc5-port.patch, 1.2, NONE
Message-ID: <20090930101541.6E2E811C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10792

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Removed Files:
	mps-mc5-port.patch 
Log Message:
- New upstream 0.0.6 release, drop upstreamed MC5 patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Sep 2009 13:53:02 -0000	1.4
+++ .cvsignore	30 Sep 2009 10:15:40 -0000	1.5
@@ -1 +1 @@
-moblin-panel-status-0.0.5.tar.bz2
+moblin-panel-status-0.0.6.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-panel-status.spec	29 Sep 2009 10:44:26 -0000	1.6
+++ moblin-panel-status.spec	30 Sep 2009 10:15:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
-Version:        0.0.5
-Release:        4%{?dist}
+Version:        0.0.6
+Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -19,11 +19,6 @@ BuildRequires: nbtk-devel
 BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
-# Generated with:
-# git show -p 419ffd4e56794e2b5ab068586d55419b7a808356~4..
-# in mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-status.git
-Patch0:        mps-mc5-port.patch
-
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 BuildRequires: gnome-common
@@ -35,7 +30,6 @@ status.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -61,6 +55,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
+- New upstream 0.0.6 release, drop upstreamed MC5 patches
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-4
 - Add new clutter-gtk dep
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Sep 2009 13:53:02 -0000	1.4
+++ sources	30 Sep 2009 10:15:40 -0000	1.5
@@ -1 +1 @@
-8cb6bd6e4296aae65778bec3cafa6422  moblin-panel-status-0.0.5.tar.bz2
+570bb1173a0b75777ce3da6a3940ddec  moblin-panel-status-0.0.6.tar.bz2


--- mps-mc5-port.patch DELETED ---



From giallu at fedoraproject.org  Wed Sep 30 10:20:45 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Wed, 30 Sep 2009 10:20:45 +0000 (UTC)
Subject: rpms/gpointing-device-settings/F-12
	gpds-1.3.1-fix_typos_bug_596015.patch, NONE,
	1.1 gpds-1.3.1-pkgconfig.patch, NONE,
	1.1 gpointing-device-settings.desktop, NONE,
	1.1 gpointing-device-settings.spec, NONE, 1.1 touchpad.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930102045.62C1211C043C@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/gpointing-device-settings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12177

Modified Files:
	.cvsignore sources 
Added Files:
	gpds-1.3.1-fix_typos_bug_596015.patch 
	gpds-1.3.1-pkgconfig.patch gpointing-device-settings.desktop 
	gpointing-device-settings.spec touchpad.png 
Log Message:
Initial import


gpds-1.3.1-fix_typos_bug_596015.patch:
 gpds-mouse-definitions.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gpds-1.3.1-fix_typos_bug_596015.patch ---
>From d39cf65fceb7abb4c5db241bb261f4e0f9eeb8a8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 27 Sep 2009 01:40:37 +0000
Subject: Fix typos. Fixes for bug 596015.

---
diff --git a/modules/common/gpds-mouse-definitions.h b/modules/common/gpds-mouse-definitions.h
index a78771d..1b2039d 100644
--- a/modules/common/gpds-mouse-definitions.h
+++ b/modules/common/gpds-mouse-definitions.h
@@ -22,9 +22,9 @@
 
 #define GPDS_MOUSE_GCONF_DIR                   "/desktop/gnome/peripherals"
 #define GPDS_MOUSE_MIDDLE_BUTTON_EMULATION_KEY "middle_button_emulation"
-#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeoue"
+#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeout"
 #define GPDS_MOUSE_WHEEL_EMULATION_KEY         "wheel_emulation"
-#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inetia"
+#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inertia"
 #define GPDS_MOUSE_WHEEL_EMULATION_X_AXIS_KEY  "wheel_emulation_x_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_Y_AXIS_KEY  "wheel_emulation_y_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT_KEY "wheel_emulation_timeout"
--
cgit v0.8.2


gpds-1.3.1-pkgconfig.patch:
 libgpointing-device-settings.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpds-1.3.1-pkgconfig.patch ---
diff --git a/libgpointing-device-settings.pc.in b/libgpointing-device-settings.pc.in
index 8fda90e..900beaa 100644
--- a/libgpointing-device-settings.pc.in
+++ b/libgpointing-device-settings.pc.in
@@ -12,5 +12,5 @@ Name: LibGPointingDeviceSettings
 Description: Library to create dynamic module of UI for pointing device settings
 Version: @VERSION@
 Requires: gtk+-2.0 >= @GTK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@
-Libs: -L${libdir} -lgpointing-device-settings
+Libs: -L${libdir} -lgpds
 Cflags: -I${includedir}/gpointing-device-settings


--- NEW FILE gpointing-device-settings.desktop ---
[Desktop Entry]
Name=Pointing Devices
Comment=Set your pointing device preferences
Exec=gpointing-device-settings
Icon=touchpad
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;Settings;
OnlyShowIn=GNOME;


--- NEW FILE gpointing-device-settings.spec ---
Name:           gpointing-device-settings
Version:        1.3.1
Release:        5%{?dist}
Summary:        Configuration tool for pointing devices

Group:          Applications/System
License:        LGPLv3+
URL:            http://live.gnome.org/GPointingDeviceSettings
Source0:        http://dl.sourceforge.jp/gsynaptics/38468/gpointing-device-settings-1.3.1.tar.gz
Source1:        gpointing-device-settings.desktop
Source2:        touchpad.png

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext, intltool
BuildRequires:  GConf2-devel
BuildRequires:  libXi-devel
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils

Requires:       gnome-settings-daemon
Requires(pre):  GConf2
Requires(post): GConf2
Requires(preun):GConf2

# Obsoletes gsynaptics, to be removed in F14
Obsoletes:      gsynaptics < 0.9.17
Provides:       gsynaptics = %{version}-%{release}

# Reported upstream https://bugzilla.gnome.org/show_bug.cgi?id=596835
Patch0:         gpds-1.3.1-pkgconfig.patch
# Fixed upstream https://bugzilla.gnome.org/show_bug.cgi?id=596015
Patch1:         gpds-1.3.1-fix_typos_bug_596015.patch


%description
GUI tool for setting pointing device such as TrackPoint or Touchpad. It
allows configuring of various drivers parameters on the fly.
It is a successor of GSynaptics.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtk2-devel, GConf2-devel, libXi-devel
Requires:       pkgconfig

%description devel
Development headers and libraries for %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .typos

%build
%configure \
        --disable-static \
        --disable-schemas-install \
        --disable-dependency-tracking

# https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_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

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

# Remove useless files
find %{buildroot} -name '*.la' -delete

desktop-file-install                                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
%{SOURCE1}

install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/touchpad.png


%clean
rm -rf $RPM_BUILD_ROOT


%post devel -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi

%post 
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
    %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :

%postun -p /sbin/ldconfig

%preun 
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS TODO MAINTAINERS COPYING
%{_sysconfdir}/gconf/schemas/*
%{_bindir}/gpointing-device-settings
%{_libdir}/gnome-settings-daemon-2.0/*
%{_libdir}/gpointing-device-settings/
%{_datadir}/gpointing-device-settings/
%{_datadir}/applications/*
%{_datadir}/pixmaps/touchpad.png
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so


%changelog
* Mon Sep 28 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-5
- Add patch from upstream

* Wed Sep 23 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-4
- fix .desktop validation issues
- add missing icon from gsynaptics

* Sun Sep 20 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-3
- Don't split libgdps until translations are split as well
- Fix .pc library name
- Fix GConf scriptlets according to guidelines snippets
- Fix obsoletes
- Add .desktop file

* Tue Jul 21 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-2
- Require gnome-settings-daemon
- Fix Source0 URL
- Obsoletes gsynaptics

* Wed Jul  1 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:03:05 -0000	1.1
+++ .cvsignore	30 Sep 2009 10:20:44 -0000	1.2
@@ -0,0 +1 @@
+gpointing-device-settings-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:03:05 -0000	1.1
+++ sources	30 Sep 2009 10:20:44 -0000	1.2
@@ -0,0 +1 @@
+2b0a567739fb565364cdca8dfc72545c  gpointing-device-settings-1.3.1.tar.gz



From pbrobinson at fedoraproject.org  Wed Sep 30 10:20:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:20:53 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.2,
	1.3 moblin-panel-people.spec, 1.4, 1.5 sources, 1.2,
	1.3 mpp-mc5-port.patch, 1.2, NONE mpp-nbtk12.patch, 1.1, NONE
Message-ID: <20090930102053.C131E11C043C@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12279

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Removed Files:
	mpp-mc5-port.patch mpp-nbtk12.patch 
Log Message:
- New upstream 0.0.3 release, drop upstreamed MC5 patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Aug 2009 22:37:59 -0000	1.2
+++ .cvsignore	30 Sep 2009 10:20:52 -0000	1.3
@@ -1 +1 @@
-moblin-panel-people-0.0.1.tar.bz2
+moblin-panel-people-0.0.3.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-panel-people.spec	29 Sep 2009 09:35:05 -0000	1.4
+++ moblin-panel-people.spec	30 Sep 2009 10:20:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
-Version:        0.0.1
-Release:        4%{?dist}
+Version:        0.0.3
+Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -22,13 +22,6 @@ BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: gnome-common
 
-# Generated with:
-# git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
-# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
-Patch0:        mpp-mc5-port.patch
-# http://git.moblin.org/cgit.cgi/moblin-panel-people/commit/?id=2209855447809359f400ac64b1cd5a530fb51171
-Patch1:        mpp-nbtk12.patch
-
 Requires: dbus
 
 %description
@@ -36,8 +29,6 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
-%patch1 -p1 -b .nbtk12
-%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -63,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
+- New upstream 0.0.3 release, drop upstreamed MC5 patches
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-4
 - Add telepathy-glib dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Aug 2009 22:37:59 -0000	1.2
+++ sources	30 Sep 2009 10:20:53 -0000	1.3
@@ -1 +1 @@
-df86408bf2291bbe01d9277217f68901  moblin-panel-people-0.0.1.tar.bz2
+082697fc4904a763487e0d508630d615  moblin-panel-people-0.0.3.tar.bz2


--- mpp-mc5-port.patch DELETED ---


--- mpp-nbtk12.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:20 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102520.789AD10F857@bastion2.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on device-mapper-multipath (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:25 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102525.912EF10F857@bastion2.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on device-mapper-multipath (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:29 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102530.09EC210F86A@bastion2.fedora.phx.redhat.com>

mbroz has set the commit acl on device-mapper-multipath (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:42 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102542.51B6C10F86A@bastion2.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on device-mapper-multipath (Fedora 11) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pbrobinson at fedoraproject.org  Wed Sep 30 10:25:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:25:31 +0000 (UTC)
Subject: rpms/anerley/F-12 .cvsignore, 1.4, 1.5 anerley.spec, 1.8,
	1.9 sources, 1.4, 1.5 anerley-mc5-port.patch, 1.1,
	NONE anerley-pkgcfg-mc5.patch, 1.1, NONE
Message-ID: <20090930102531.F168B11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13079

Modified Files:
	.cvsignore anerley.spec sources 
Removed Files:
	anerley-mc5-port.patch anerley-pkgcfg-mc5.patch 
Log Message:
- New upstream 0.1.4 release, drop upstreamed MC5 patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Sep 2009 12:50:54 -0000	1.4
+++ .cvsignore	30 Sep 2009 10:25:30 -0000	1.5
@@ -1 +1 @@
-anerley-0.1.2.tar.bz2
+anerley-0.1.4.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- anerley.spec	29 Sep 2009 12:50:55 -0000	1.8
+++ anerley.spec	30 Sep 2009 10:25:30 -0000	1.9
@@ -1,7 +1,5 @@
-%define _default_patch_fuzz 2
-
 Name:           anerley
-Version:        0.1.2
+Version:        0.1.4
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -11,13 +9,6 @@ URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Created with:
-# git show -p f76297e57d4368ef4e289716e03cd8e256532fad
-# git show -p 3aa84f86a5c0d33d3dc3199b3891ac6a30c8fae0~9..
-# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/anerley.git
-Patch0:        anerley-mc5-port.patch
-Patch1:        anerley-pkgcfg-mc5.patch
-
 BuildRequires: evolution-data-server-devel
 BuildRequires: glib2-devel
 BuildRequires: nbtk-devel
@@ -44,8 +35,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mc5
-%patch1 -p1 -b .pkgcfg
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -83,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
+- New upstream 0.1.4 release, drop upstreamed MC5 patches
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
 - New upstream 0.1.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Sep 2009 12:50:55 -0000	1.4
+++ sources	30 Sep 2009 10:25:30 -0000	1.5
@@ -1 +1 @@
-fe3e7a3c3e4ba791ba3342382f005a35  anerley-0.1.2.tar.bz2
+569a7dc19efce61f1cb703f1d94416c7  anerley-0.1.4.tar.bz2


--- anerley-mc5-port.patch DELETED ---


--- anerley-pkgcfg-mc5.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:45 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102545.DF3B410F8A9@bastion2.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on device-mapper-multipath (Fedora 11) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:48 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102548.988AC10F857@bastion2.fedora.phx.redhat.com>

mbroz has set the commit acl on device-mapper-multipath (Fedora 11) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:56 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102556.CBBC810F857@bastion2.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on device-mapper-multipath (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:25:59 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102559.AE24210F8A9@bastion2.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on device-mapper-multipath (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Sep 30 10:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:26:03 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090930102603.A180E10F857@bastion2.fedora.phx.redhat.com>

mbroz has set the commit acl on device-mapper-multipath (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/device-mapper-multipath



From pbrobinson at fedoraproject.org  Wed Sep 30 10:27:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:27:49 +0000 (UTC)
Subject: rpms/moblin-panel-status/F-12 .cvsignore, 1.4,
	1.5 moblin-panel-status.spec, 1.6, 1.7 sources, 1.4,
	1.5 mps-mc5-port.patch, 1.2, NONE
Message-ID: <20090930102749.703F811C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13849

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Removed Files:
	mps-mc5-port.patch 
Log Message:
- New upstream 0.0.6 release, drop upstreamed MC5 patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Sep 2009 13:53:02 -0000	1.4
+++ .cvsignore	30 Sep 2009 10:27:48 -0000	1.5
@@ -1 +1 @@
-moblin-panel-status-0.0.5.tar.bz2
+moblin-panel-status-0.0.6.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/moblin-panel-status.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-panel-status.spec	29 Sep 2009 10:51:50 -0000	1.6
+++ moblin-panel-status.spec	30 Sep 2009 10:27:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           moblin-panel-status
-Version:        0.0.5
-Release:        4%{?dist}
+Version:        0.0.6
+Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
 Group:          System Environment/Libraries
@@ -19,11 +19,6 @@ BuildRequires: nbtk-devel
 BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
-# Generated with:
-# git show -p 419ffd4e56794e2b5ab068586d55419b7a808356~4..
-# in mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-status.git
-Patch0:        mps-mc5-port.patch
-
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 BuildRequires: gnome-common
@@ -35,7 +30,6 @@ status.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -61,6 +55,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
+- New upstream 0.0.6 release, drop upstreamed MC5 patches
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-4
 - Add new clutter-gtk dep
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Sep 2009 13:53:02 -0000	1.4
+++ sources	30 Sep 2009 10:27:49 -0000	1.5
@@ -1 +1 @@
-8cb6bd6e4296aae65778bec3cafa6422  moblin-panel-status-0.0.5.tar.bz2
+570bb1173a0b75777ce3da6a3940ddec  moblin-panel-status-0.0.6.tar.bz2


--- mps-mc5-port.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Sep 30 10:32:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:32:14 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 .cvsignore, 1.2,
	1.3 moblin-panel-people.spec, 1.4, 1.5 sources, 1.2,
	1.3 mpp-mc5-port.patch, 1.2, NONE
Message-ID: <20090930103214.8E38111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14408

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Removed Files:
	mpp-mc5-port.patch 
Log Message:
- New upstream 0.0.3 release, drop upstreamed MC5 patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Aug 2009 22:37:59 -0000	1.2
+++ .cvsignore	30 Sep 2009 10:32:14 -0000	1.3
@@ -1 +1 @@
-moblin-panel-people-0.0.1.tar.bz2
+moblin-panel-people-0.0.3.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-panel-people.spec	29 Sep 2009 10:23:10 -0000	1.4
+++ moblin-panel-people.spec	30 Sep 2009 10:32:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
-Version:        0.0.1
-Release:        4%{?dist}
+Version:        0.0.3
+Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -22,13 +22,6 @@ BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: gnome-common
 
-# Generated with:
-# git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
-# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
-Patch0:        mpp-mc5-port.patch
-# http://git.moblin.org/cgit.cgi/moblin-panel-people/commit/?id=2209855447809359f400ac64b1cd5a530fb51171
-Patch1:        mpp-nbtk12.patch
-
 Requires: dbus
 
 %description
@@ -36,8 +29,6 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
-%patch1 -p1 -b .nbtk12
-%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -63,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
+- New upstream 0.0.3 release, drop upstreamed MC5 patches
+
 * Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-4
 - Add telepathy-glib dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Aug 2009 22:37:59 -0000	1.2
+++ sources	30 Sep 2009 10:32:14 -0000	1.3
@@ -1 +1 @@
-df86408bf2291bbe01d9277217f68901  moblin-panel-people-0.0.1.tar.bz2
+082697fc4904a763487e0d508630d615  moblin-panel-people-0.0.3.tar.bz2


--- mpp-mc5-port.patch DELETED ---



From jpopelka at fedoraproject.org  Wed Sep 30 10:32:58 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Wed, 30 Sep 2009 10:32:58 +0000 (UTC)
Subject: rpms/netplug/devel netplug.spec,1.2,1.3
Message-ID: <20090930103258.4DDEB11C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/netplug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14506

Modified Files:
	netplug.spec 
Log Message:
* Wed Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-3
- use %{_initddir} macro instead of deprecated %{_initrddir}



Index: netplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netplug/devel/netplug.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netplug.spec	30 Sep 2009 10:14:06 -0000	1.2
+++ netplug.spec	30 Sep 2009 10:32:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Daemon that responds to network cables being plugged in and out
 Name: netplug
 Version: 1.2.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://www.red-bean.com/~bos/
@@ -78,12 +78,16 @@ exit 0
 %{_mandir}/man[58]/*
 %{_sysconfdir}/netplug.d
 %config(noreplace) %{_sysconfdir}/netplug.d/netplugd.conf
-%{_initrddir}/netplugd
+%{_initddir}/netplugd
 
 %changelog
 
+* Wed Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-3
+- use %{_initddir} macro instead of deprecated %{_initrddir}
+
 * Wed Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-2
 - fix init script to be LSB-compliant (#521641)
 
 * Tue Sep 8 2009  Jiri Popelka <jpopelka at redhat.com> - 1.2.9.1-1
 - Initial standalone package. Up to now netplug has been part of net-tools.
+



From pbrobinson at fedoraproject.org  Wed Sep 30 10:33:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 30 Sep 2009 10:33:41 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 mpp-nbtk12.patch,1.1,NONE
Message-ID: <20090930103341.BA36111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14671

Removed Files:
	mpp-nbtk12.patch 
Log Message:
- remove old nbtk-1.2 patch


--- mpp-nbtk12.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:00 +0000
Subject: [pkgdb] links: ovasik has requested watchcommits
Message-ID: <20090930104300.9BE7210F88B@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on links (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:00 +0000
Subject: [pkgdb] links: ovasik has requested watchbugzilla
Message-ID: <20090930104300.E564510F895@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on links (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:05 +0000
Subject: [pkgdb] links: ovasik has requested watchcommits
Message-ID: <20090930104305.AA3BE10F8AC@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on links (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:01 +0000
Subject: [pkgdb] links: ovasik has requested commit
Message-ID: <20090930104301.95F7F10F8AB@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on links (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:06 +0000
Subject: [pkgdb] links: ovasik has requested commit
Message-ID: <20090930104306.59F1C10F8AF@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on links (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:15 +0000
Subject: [pkgdb] links: ovasik has requested watchbugzilla
Message-ID: <20090930104315.1E39910F86A@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on links (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:21 +0000
Subject: [pkgdb] links: ovasik has requested watchbugzilla
Message-ID: <20090930104321.96AFA10F875@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on links (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:22 +0000
Subject: [pkgdb] links: ovasik has requested watchcommits
Message-ID: <20090930104322.8A26D10F894@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on links (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 10:43:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 10:43:24 +0000
Subject: [pkgdb] links: ovasik has requested commit
Message-ID: <20090930104324.6B86010F8A9@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on links (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/links



From oliver at fedoraproject.org  Wed Sep 30 11:06:16 2009
From: oliver at fedoraproject.org (Oliver Falk)
Date: Wed, 30 Sep 2009 11:06:16 +0000 (UTC)
Subject: rpms/ngrep/F-12 ngrep.spec,1.11,1.12
Message-ID: <20090930110616.9BAD511C0261@cvs1.fedora.phx.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/ngrep/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19289

Modified Files:
	ngrep.spec 
Log Message:

* Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.1
- Bump-n-build for new libpcap



Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/F-12/ngrep.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ngrep.spec	25 Jul 2009 19:20:19 -0000	1.11
+++ ngrep.spec	30 Sep 2009 11:06:15 -0000	1.12
@@ -5,7 +5,7 @@ Name:				ngrep
 Summary:			Network layer grep tool
 
 Version:			1.45
-Release:			6%{?dist}
+Release:			6.1%{?dist}
 
 Group:				Applications/Internet
 License:			BSD with advertising
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.1
+- Bump-n-build for new libpcap
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From denis at fedoraproject.org  Wed Sep 30 11:29:54 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 30 Sep 2009 11:29:54 +0000 (UTC)
Subject: rpms/libburn/F-11 .cvsignore, 1.9, 1.10 libburn.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20090930112954.2A14311C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libburn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24636

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
- Update to upstream 0.7.0
- Fixed binary installation
- Removed rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Jan 2009 09:06:15 -0000	1.9
+++ .cvsignore	30 Sep 2009 11:29:53 -0000	1.10
@@ -1 +1 @@
-libburn-0.6.0.pl01.tar.gz
+libburn-0.7.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-11/libburn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libburn.spec	25 Feb 2009 13:55:52 -0000	1.17
+++ libburn.spec	30 Sep 2009 11:29:53 -0000	1.18
@@ -1,8 +1,8 @@
-%define tbpostfix pl01
+%define tbpostfix pl00
 
 Name:           libburn
-Version:        0.6.0
-Release:        3%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
@@ -51,6 +51,8 @@ features from the command line.
 
 %build
 %configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 doxygen doc/doxygen.conf
 
@@ -58,10 +60,6 @@ doxygen doc/doxygen.conf
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
-install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -71,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
 
@@ -79,21 +78,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING COPYRIGHT README
 %{_libdir}/%{name}*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html
 %{_includedir}/%{name}
 %{_libdir}/%{name}*.so
 %{_libdir}/pkgconfig/%{name}*.pc
+%doc doc/html/*
 
 %files -n cdrskin
 %defattr(-,root,root,-)
-%doc
 %{_mandir}/*/*
 %{_bindir}/cdrskin
 
 
 %changelog
+* Wed Sep 30 2009 Denis Leroy <denis at poolshark.org> - 0.7.0-1
+- Update to upstream 0.7.0
+- Fixed binary installation
+- Removed rpath
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Jan 2009 09:06:15 -0000	1.10
+++ sources	30 Sep 2009 11:29:53 -0000	1.11
@@ -1 +1 @@
-9ad48fe011dd5cbe9a15367ae8173647  libburn-0.6.0.pl01.tar.gz
+57ac20c1b951be17f8100f6106d471c6  libburn-0.7.0.pl00.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:30 +0000
Subject: [pkgdb] help2man: ovasik has requested watchcommits
Message-ID: <20090930113230.2599F10F857@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on help2man (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:31 +0000
Subject: [pkgdb] help2man: ovasik has requested commit
Message-ID: <20090930113231.4F02810F88B@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on help2man (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:37 +0000
Subject: [pkgdb] help2man: ovasik has requested watchbugzilla
Message-ID: <20090930113237.458F110F86A@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on help2man (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:35 +0000
Subject: [pkgdb] help2man: ovasik has requested watchbugzilla
Message-ID: <20090930113235.887C810F857@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on help2man (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:38 +0000
Subject: [pkgdb] help2man: ovasik has requested watchcommits
Message-ID: <20090930113238.1D90210F88B@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on help2man (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:40 +0000
Subject: [pkgdb] help2man: ovasik has requested commit
Message-ID: <20090930113240.A9BFC10F8A8@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on help2man (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:46 +0000
Subject: [pkgdb] help2man: ovasik has requested watchbugzilla
Message-ID: <20090930113246.77C7710F86A@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchbugzilla acl on help2man (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:48 +0000
Subject: [pkgdb] help2man: ovasik has requested watchcommits
Message-ID: <20090930113248.9D32F10F88C@bastion2.fedora.phx.redhat.com>

ovasik has requested the watchcommits acl on help2man (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Wed Sep 30 11:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 11:32:51 +0000
Subject: [pkgdb] help2man: ovasik has requested commit
Message-ID: <20090930113251.2084310F86A@bastion2.fedora.phx.redhat.com>

ovasik has requested the commit acl on help2man (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/help2man



From xiashing at fedoraproject.org  Wed Sep 30 11:34:45 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Wed, 30 Sep 2009 11:34:45 +0000 (UTC)
Subject: rpms/quotatool/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 quotatool.spec, 1.2, 1.3 sources, 1.2,
	1.3 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, 1.1, NONE
Message-ID: <20090930113445.7463711C00E6@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25810/devel

Modified Files:
	.cvsignore import.log quotatool.spec sources 
Removed Files:
	quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
Log Message:
* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
- New version release from upstream which honors DESTDIR. Previously needed patch removed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 07:56:06 -0000	1.2
+++ .cvsignore	30 Sep 2009 11:34:45 -0000	1.3
@@ -1 +1 @@
-quotatool-1.4.10.tar.gz
+quotatool-1.4.11.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 07:56:06 -0000	1.1
+++ import.log	30 Sep 2009 11:34:45 -0000	1.2
@@ -1 +1,2 @@
 quotatool-1_4_10-5_fc11:HEAD:quotatool-1.4.10-5.fc11.src.rpm:1253173885
+quotatool-1_4_11-8_fc11:HEAD:quotatool-1.4.11-8.fc11.src.rpm:1254310195


Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/quotatool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- quotatool.spec	17 Sep 2009 09:54:12 -0000	1.2
+++ quotatool.spec	30 Sep 2009 11:34:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           quotatool
-Version:        1.4.10
-Release:        7%{?dist}
+Version:        1.4.11
+Release:        8%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -8,9 +8,6 @@ License:        GPLv2
 URL:            http://quotatool.ekenberg.se
 Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz
 
-#Patch makes the Makefile honor DESTDIR
-#Upstream was sent an updated Makefile via email
-Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +16,6 @@ It is suitable for use in scripts and ot
 
 %prep
 %setup -q
-%patch0 -p1 -b .destdir
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} tools/
@@ -43,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
+- New version release from upstream which honors DESTDIR. Previously needed patch removed.
+
 * Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
 - Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 07:56:06 -0000	1.2
+++ sources	30 Sep 2009 11:34:45 -0000	1.3
@@ -1 +1 @@
-d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz
+3925c50b2ecdade601ade6bbfdc048ce  quotatool-1.4.11.tar.gz


--- quotatool-1.4.10_MAKEFILE_DESTDIR.patch DELETED ---



From xiashing at fedoraproject.org  Wed Sep 30 11:35:53 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Wed, 30 Sep 2009 11:35:53 +0000 (UTC)
Subject: rpms/quotatool/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 quotatool.spec, 1.2, 1.3 sources, 1.2,
	1.3 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, 1.1, NONE
Message-ID: <20090930113553.C6BC011C00E6@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26665/F-12

Modified Files:
	.cvsignore import.log quotatool.spec sources 
Removed Files:
	quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
Log Message:
* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
- New version release from upstream which honors DESTDIR. Previously needed patch removed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 07:56:06 -0000	1.2
+++ .cvsignore	30 Sep 2009 11:35:53 -0000	1.3
@@ -1 +1 @@
-quotatool-1.4.10.tar.gz
+quotatool-1.4.11.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 07:56:06 -0000	1.1
+++ import.log	30 Sep 2009 11:35:53 -0000	1.2
@@ -1 +1,2 @@
 quotatool-1_4_10-5_fc11:HEAD:quotatool-1.4.10-5.fc11.src.rpm:1253173885
+quotatool-1_4_11-8_fc11:F-12:quotatool-1.4.11-8.fc11.src.rpm:1254310306


Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-12/quotatool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- quotatool.spec	17 Sep 2009 09:54:12 -0000	1.2
+++ quotatool.spec	30 Sep 2009 11:35:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           quotatool
-Version:        1.4.10
-Release:        7%{?dist}
+Version:        1.4.11
+Release:        8%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -8,9 +8,6 @@ License:        GPLv2
 URL:            http://quotatool.ekenberg.se
 Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz
 
-#Patch makes the Makefile honor DESTDIR
-#Upstream was sent an updated Makefile via email
-Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +16,6 @@ It is suitable for use in scripts and ot
 
 %prep
 %setup -q
-%patch0 -p1 -b .destdir
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} tools/
@@ -43,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
+- New version release from upstream which honors DESTDIR. Previously needed patch removed.
+
 * Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
 - Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 07:56:06 -0000	1.2
+++ sources	30 Sep 2009 11:35:53 -0000	1.3
@@ -1 +1 @@
-d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz
+3925c50b2ecdade601ade6bbfdc048ce  quotatool-1.4.11.tar.gz


--- quotatool-1.4.10_MAKEFILE_DESTDIR.patch DELETED ---



From twaugh at fedoraproject.org  Wed Sep 30 11:37:42 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 11:37:42 +0000 (UTC)
Subject: rpms/cups/devel cups-str3356.patch,NONE,1.1 cups.spec,1.522,1.523
Message-ID: <20090930113742.9608611C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27070

Modified Files:
	cups.spec 
Added Files:
	cups-str3356.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-6
- Don't use cached PPD for raw queue (bug #526405, STR #3356).


cups-str3356.patch:
 printers.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3356.patch ---
diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
--- cups-1.4.1/scheduler/printers.c.str3356	2009-09-30 12:02:53.467761538 +0100
+++ cups-1.4.1/scheduler/printers.c	2009-09-30 12:03:28.489636706 +0100
@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Pri
   ippDelete(p->ppd_attrs);
   p->ppd_attrs = ippNew();
 
-  if (cache_info.st_mtime >= ppd_info.st_mtime &&
+  if (ppd_info.st_mtime != 1 &&
+      cache_info.st_mtime >= ppd_info.st_mtime &&
       (cache = cupsFileOpen(cache_name, "r")) != NULL)
   {
    /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -p -r1.522 -r1.523
--- cups.spec	23 Sep 2009 14:31:50 -0000	1.522
+++ cups.spec	30 Sep 2009 11:37:42 -0000	1.523
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -52,6 +52,7 @@ Patch30: cups-uri-compat.patch
 Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
+Patch39: cups-str3356.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -205,6 +206,7 @@ module. 
 %patch35 -p1 -b .cups-get-classes
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3332
+%patch39 -p1 -b .str3356
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -505,6 +507,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-6
+- Don't use cached PPD for raw queue (bug #526405, STR #3356).
 
 * Wed Sep 23 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-5
 - Fixed cups.init to be LSB compliant (bug #521641)



From xiashing at fedoraproject.org  Wed Sep 30 11:38:33 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Wed, 30 Sep 2009 11:38:33 +0000 (UTC)
Subject: rpms/quotatool/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 quotatool.spec, 1.2, 1.3 sources, 1.2,
	1.3 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, 1.1, NONE
Message-ID: <20090930113833.7A0F711C00E6@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27633/F-11

Modified Files:
	.cvsignore import.log quotatool.spec sources 
Removed Files:
	quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
Log Message:
* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
- New version release from upstream which honors DESTDIR. Previously needed patch removed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:07:31 -0000	1.2
+++ .cvsignore	30 Sep 2009 11:38:33 -0000	1.3
@@ -1 +1 @@
-quotatool-1.4.10.tar.gz
+quotatool-1.4.11.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Sep 2009 08:07:31 -0000	1.1
+++ import.log	30 Sep 2009 11:38:33 -0000	1.2
@@ -1 +1,2 @@
 quotatool-1_4_10-5_fc11:F-11:quotatool-1.4.10-5.fc11.src.rpm:1253174538
+quotatool-1_4_11-8_fc11:F-11:quotatool-1.4.11-8.fc11.src.rpm:1254310460


Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/quotatool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- quotatool.spec	17 Sep 2009 09:54:12 -0000	1.2
+++ quotatool.spec	30 Sep 2009 11:38:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           quotatool
-Version:        1.4.10
-Release:        7%{?dist}
+Version:        1.4.11
+Release:        8%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -8,9 +8,6 @@ License:        GPLv2
 URL:            http://quotatool.ekenberg.se
 Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz
 
-#Patch makes the Makefile honor DESTDIR
-#Upstream was sent an updated Makefile via email
-Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +16,6 @@ It is suitable for use in scripts and ot
 
 %prep
 %setup -q
-%patch0 -p1 -b .destdir
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} tools/
@@ -43,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
+- New version release from upstream which honors DESTDIR. Previously needed patch removed.
+
 * Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
 - Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:07:31 -0000	1.2
+++ sources	30 Sep 2009 11:38:33 -0000	1.3
@@ -1 +1 @@
-d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz
+3925c50b2ecdade601ade6bbfdc048ce  quotatool-1.4.11.tar.gz


--- quotatool-1.4.10_MAKEFILE_DESTDIR.patch DELETED ---



From xiashing at fedoraproject.org  Wed Sep 30 11:39:36 2009
From: xiashing at fedoraproject.org (xiashing)
Date: Wed, 30 Sep 2009 11:39:36 +0000 (UTC)
Subject: rpms/quotatool/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 quotatool.spec, 1.2, 1.3 sources, 1.2,
	1.3 quotatool-1.4.10_MAKEFILE_DESTDIR.patch, 1.1, NONE
Message-ID: <20090930113936.D8EA311C00E6@cvs1.fedora.phx.redhat.com>

Author: xiashing

Update of /cvs/pkgs/rpms/quotatool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27886/EL-5

Modified Files:
	.cvsignore import.log quotatool.spec sources 
Removed Files:
	quotatool-1.4.10_MAKEFILE_DESTDIR.patch 
Log Message:
* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
- New version release from upstream which honors DESTDIR. Previously needed patch removed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
- Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.

* Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-6
- Line added in %%configure to fix ppc64 failed build

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-5
- Makefile and Makefile.old in wrong order.

* Wed Sep 16 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-4
- Makefile.patch was renamed
- Source0 editted to be consistent with the name and version of the package
- %%patch editted to make a backup of the Makefile
- New Makefile sent to upstream
- rm -rf $RPM_BUILD_ROOT was removed from %%install

* Tue Sep 08 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-3
- Fixed some changelog and spec file errors

* Thu Sep 03 2009  Xia Shing Zee <XiaShing at gmail.com> 1.4.10-2
- Comments added above Patch0. %%doc cleaned up.

* Thu Sep 03 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-1
- Initial RPM release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:09:17 -0000	1.2
+++ .cvsignore	30 Sep 2009 11:39:36 -0000	1.3
@@ -1 +1 @@
-quotatool-1.4.10.tar.gz
+quotatool-1.4.11.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	17 Sep 2009 10:07:34 -0000	1.2
+++ import.log	30 Sep 2009 11:39:36 -0000	1.3
@@ -1,2 +1,3 @@
 quotatool-1_4_10-5_fc11:EL-5:quotatool-1.4.10-5.fc11.src.rpm:1253174717
 quotatool-1_4_10-7_fc11:EL-5:quotatool-1.4.10-7.fc11.src.rpm:1253181786
+quotatool-1_4_11-8_fc11:EL-5:quotatool-1.4.11-8.fc11.src.rpm:1254310527


Index: quotatool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/quotatool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- quotatool.spec	17 Sep 2009 10:07:34 -0000	1.2
+++ quotatool.spec	30 Sep 2009 11:39:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           quotatool
-Version:        1.4.10
-Release:        7%{?dist}
+Version:        1.4.11
+Release:        8%{?dist}
 Summary:        A utility to set filesystem quotas
 
 Group:          Applications/System
@@ -8,9 +8,6 @@ License:        GPLv2
 URL:            http://quotatool.ekenberg.se
 Source0:        http://quotatool.ekenberg.se/%{name}-%{version}.tar.gz
 
-#Patch makes the Makefile honor DESTDIR
-#Upstream was sent an updated Makefile via email
-Patch0:         quotatool-%{version}_MAKEFILE_DESTDIR.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +16,6 @@ It is suitable for use in scripts and ot
 
 %prep
 %setup -q
-%patch0 -p1 -b .destdir
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} tools/
@@ -43,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/quotatool.8.gz
 
 %changelog
+* Thu Sep 29 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.11-8
+- New version release from upstream which honors DESTDIR. Previously needed patch removed.
+
 * Thu Sep 17 2009 Xia Shing Zee <XiaShing at gmail.com> 1.4.10-7
 - Line 'cp -p /usr/lib/rpm/config.{guess,sub} /tools' placed in wrong position. Fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quotatool/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:09:19 -0000	1.2
+++ sources	30 Sep 2009 11:39:36 -0000	1.3
@@ -1 +1 @@
-d0eb99718a0dbc02189993d8667ef9b1  quotatool-1.4.10.tar.gz
+3925c50b2ecdade601ade6bbfdc048ce  quotatool-1.4.11.tar.gz


--- quotatool-1.4.10_MAKEFILE_DESTDIR.patch DELETED ---



From denis at fedoraproject.org  Wed Sep 30 11:41:16 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 30 Sep 2009 11:41:16 +0000 (UTC)
Subject: rpms/libburn/F-11 libburn.spec,1.18,1.19
Message-ID: <20090930114116.D73B811C048B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libburn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28310

Modified Files:
	libburn.spec 
Log Message:
Fixed location of html documentation


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-11/libburn.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libburn.spec	30 Sep 2009 11:29:53 -0000	1.18
+++ libburn.spec	30 Sep 2009 11:41:16 -0000	1.19
@@ -84,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}
 %{_libdir}/%{name}*.so
 %{_libdir}/pkgconfig/%{name}*.pc
-%doc doc/html/*
+%doc doc/html
 
 %files -n cdrskin
 %defattr(-,root,root,-)



From denis at fedoraproject.org  Wed Sep 30 11:48:01 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 30 Sep 2009 11:48:01 +0000 (UTC)
Subject: rpms/libburn/F-12 .cvsignore, 1.9, 1.10 libburn.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20090930114801.7078111C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libburn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30273

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
- Update to upstream 0.7.0
- Fixed binary installation
- Removed rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Jan 2009 09:06:15 -0000	1.9
+++ .cvsignore	30 Sep 2009 11:48:01 -0000	1.10
@@ -1 +1 @@
-libburn-0.6.0.pl01.tar.gz
+libburn-0.7.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-12/libburn.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libburn.spec	25 Jul 2009 05:23:19 -0000	1.18
+++ libburn.spec	30 Sep 2009 11:48:01 -0000	1.19
@@ -1,8 +1,8 @@
-%define tbpostfix pl01
+%define tbpostfix pl00
 
 Name:           libburn
-Version:        0.6.0
-Release:        4%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
@@ -51,6 +51,8 @@ features from the command line.
 
 %build
 %configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 doxygen doc/doxygen.conf
 
@@ -58,10 +60,6 @@ doxygen doc/doxygen.conf
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
-install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -71,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
 
@@ -79,21 +78,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING COPYRIGHT README
 %{_libdir}/%{name}*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html
 %{_includedir}/%{name}
 %{_libdir}/%{name}*.so
 %{_libdir}/pkgconfig/%{name}*.pc
+%doc doc/html
 
 %files -n cdrskin
 %defattr(-,root,root,-)
-%doc
 %{_mandir}/*/*
 %{_bindir}/cdrskin
 
 
 %changelog
+* Wed Sep 30 2009 Denis Leroy <denis at poolshark.org> - 0.7.0-1
+- Update to upstream 0.7.0
+- Fixed binary installation
+- Removed rpath
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Jan 2009 09:06:15 -0000	1.10
+++ sources	30 Sep 2009 11:48:01 -0000	1.11
@@ -1 +1 @@
-9ad48fe011dd5cbe9a15367ae8173647  libburn-0.6.0.pl01.tar.gz
+57ac20c1b951be17f8100f6106d471c6  libburn-0.7.0.pl00.tar.gz



From vcrhonek at fedoraproject.org  Wed Sep 30 11:48:28 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 30 Sep 2009 11:48:28 +0000 (UTC)
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.78,1.79
Message-ID: <20090930114828.C348E11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31393

Modified Files:
	tog-pegasus.spec 
Log Message:
Rebuilt with new net-snmp


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- tog-pegasus.spec	23 Sep 2009 13:36:42 -0000	1.78
+++ tog-pegasus.spec	30 Sep 2009 11:48:28 -0000	1.79
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.9.0
-Release: 		7%{?dist}
+Release: 		8%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -463,6 +463,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.9.0-8
+- Rebuilt with new net-snmp
+
 * Wed Sep 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.9.0-7
 - Fix initscript
   Resolves: #523370



From denis at fedoraproject.org  Wed Sep 30 11:50:57 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 30 Sep 2009 11:50:57 +0000 (UTC)
Subject: rpms/libburn/devel .cvsignore, 1.9, 1.10 libburn.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20090930115057.4348E11C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31872

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
- Update to upstream 0.7.0
- Fixed binary installation
- Removed rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Jan 2009 09:06:15 -0000	1.9
+++ .cvsignore	30 Sep 2009 11:50:56 -0000	1.10
@@ -1 +1 @@
-libburn-0.6.0.pl01.tar.gz
+libburn-0.7.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libburn.spec	25 Jul 2009 05:23:19 -0000	1.18
+++ libburn.spec	30 Sep 2009 11:50:57 -0000	1.19
@@ -1,8 +1,8 @@
-%define tbpostfix pl01
+%define tbpostfix pl00
 
 Name:           libburn
-Version:        0.6.0
-Release:        4%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
@@ -51,6 +51,8 @@ features from the command line.
 
 %build
 %configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 doxygen doc/doxygen.conf
 
@@ -58,10 +60,6 @@ doxygen doc/doxygen.conf
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
-install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -71,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
 
@@ -79,21 +78,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING COPYRIGHT README
 %{_libdir}/%{name}*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html
 %{_includedir}/%{name}
 %{_libdir}/%{name}*.so
 %{_libdir}/pkgconfig/%{name}*.pc
+%doc doc/html
 
 %files -n cdrskin
 %defattr(-,root,root,-)
-%doc
 %{_mandir}/*/*
 %{_bindir}/cdrskin
 
 
 %changelog
+* Wed Sep 30 2009 Denis Leroy <denis at poolshark.org> - 0.7.0-1
+- Update to upstream 0.7.0
+- Fixed binary installation
+- Removed rpath
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Jan 2009 09:06:15 -0000	1.10
+++ sources	30 Sep 2009 11:50:57 -0000	1.11
@@ -1 +1 @@
-9ad48fe011dd5cbe9a15367ae8173647  libburn-0.6.0.pl01.tar.gz
+57ac20c1b951be17f8100f6106d471c6  libburn-0.7.0.pl00.tar.gz



From ltinkl at fedoraproject.org  Wed Sep 30 12:09:45 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 30 Sep 2009 12:09:45 +0000 (UTC)
Subject: rpms/kio_sysinfo/F-12 .cvsignore, 1.4, 1.5 kio_sysinfo.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090930120945.3261411C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kio_sysinfo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3135/F-12

Modified Files:
	.cvsignore kio_sysinfo.spec sources 
Log Message:
latest fixes from SVN, mainly device mounting via Solid and HTML templates fixups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 11:53:24 -0000	1.4
+++ .cvsignore	30 Sep 2009 12:09:44 -0000	1.5
@@ -1 +1 @@
-kio_sysinfo-20090828.tar.bz2
+kio_sysinfo-20090930.tar.bz2


Index: kio_sysinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/F-12/kio_sysinfo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kio_sysinfo.spec	28 Aug 2009 11:53:24 -0000	1.6
+++ kio_sysinfo.spec	30 Sep 2009 12:09:44 -0000	1.7
@@ -1,7 +1,7 @@
 %define SYSINFO_DISTRO fedora
 
 Name:           kio_sysinfo
-Version:        20090828
+Version:        20090930
 Release:        1%{?dist}
 Summary:        KIO slave which shows basic system information
 
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 20090930-1
+- fix mounting devices using Solid, HTML template fixes
+
 * Fri Aug 28 2009 Luk?? Tinkl <ltinkl at redhat.com> - 20090828-1
 - new upstream version with a couple of small fixes
   (most notably the empty disk Label fix)
@@ -86,4 +89,4 @@ rm -rf %{buildroot}
 
 * Wed Nov 21 2008 Jaroslav Reznik <jreznik at redhat.com> 20081121-1
 - initial package
-- use SYSINFO_DISTRO
\ No newline at end of file
+- use SYSINFO_DISTRO


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2009 11:53:24 -0000	1.5
+++ sources	30 Sep 2009 12:09:44 -0000	1.6
@@ -1 +1 @@
-c6c5d39d92c035ab27f7ca9577794eca  kio_sysinfo-20090828.tar.bz2
+51232be747958bd3777641a80b045def  kio_sysinfo-20090930.tar.bz2



From ltinkl at fedoraproject.org  Wed Sep 30 12:09:45 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 30 Sep 2009 12:09:45 +0000 (UTC)
Subject: rpms/kio_sysinfo/devel .cvsignore, 1.4, 1.5 kio_sysinfo.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <20090930120945.62AA211C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kio_sysinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3135/devel

Modified Files:
	.cvsignore kio_sysinfo.spec sources 
Log Message:
latest fixes from SVN, mainly device mounting via Solid and HTML templates fixups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 11:53:24 -0000	1.4
+++ .cvsignore	30 Sep 2009 12:09:45 -0000	1.5
@@ -1 +1 @@
-kio_sysinfo-20090828.tar.bz2
+kio_sysinfo-20090930.tar.bz2


Index: kio_sysinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/devel/kio_sysinfo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kio_sysinfo.spec	28 Aug 2009 11:53:24 -0000	1.6
+++ kio_sysinfo.spec	30 Sep 2009 12:09:45 -0000	1.7
@@ -1,7 +1,7 @@
 %define SYSINFO_DISTRO fedora
 
 Name:           kio_sysinfo
-Version:        20090828
+Version:        20090930
 Release:        1%{?dist}
 Summary:        KIO slave which shows basic system information
 
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 20090930-1
+- fix mounting devices using Solid, HTML template fixes
+
 * Fri Aug 28 2009 Luk?? Tinkl <ltinkl at redhat.com> - 20090828-1
 - new upstream version with a couple of small fixes
   (most notably the empty disk Label fix)
@@ -86,4 +89,4 @@ rm -rf %{buildroot}
 
 * Wed Nov 21 2008 Jaroslav Reznik <jreznik at redhat.com> 20081121-1
 - initial package
-- use SYSINFO_DISTRO
\ No newline at end of file
+- use SYSINFO_DISTRO


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2009 11:53:24 -0000	1.5
+++ sources	30 Sep 2009 12:09:45 -0000	1.6
@@ -1 +1 @@
-c6c5d39d92c035ab27f7ca9577794eca  kio_sysinfo-20090828.tar.bz2
+51232be747958bd3777641a80b045def  kio_sysinfo-20090930.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:42 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121942.B71A310F894@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on links (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:41 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121941.D265710F875@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on links (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:43 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121943.B42CD10F8A9@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on links (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:44 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121944.CA4ED10F8AD@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on links (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:51 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121951.A6B1410F88B@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on links (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:51 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121951.B419610F88C@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on links (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:52 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121952.79B5110F8AB@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on links (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:54 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121954.3287210F8AC@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on links (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:55 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121955.A7AE310F8B3@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on links (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:56 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930121956.D6D7010F8B1@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on links (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:19:59 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930122000.0058710F895@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on links (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:20:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:20:03 +0000
Subject: [pkgdb] links had acl change status
Message-ID: <20090930122004.0D79A10F8AB@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on links (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Wed Sep 30 12:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:20:21 +0000
Subject: [pkgdb] subversion: pauloneto has requested watchcommits
Message-ID: <20090930122022.0048F10F86A@bastion2.fedora.phx.redhat.com>

pauloneto has requested the watchcommits acl on subversion (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/subversion



From abbot at fedoraproject.org  Wed Sep 30 12:22:07 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Wed, 30 Sep 2009 12:22:07 +0000 (UTC)
Subject: rpms/protobuf/F-11 protobuf.spec,1.6,1.7
Message-ID: <20090930122207.166A211C00E6@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/protobuf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6754

Modified Files:
	protobuf.spec 
Log Message:
added export PTHREAD_LIBS="-lpthread"



Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/F-11/protobuf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- protobuf.spec	18 Sep 2009 13:55:38 -0000	1.6
+++ protobuf.spec	30 Sep 2009 12:22:06 -0000	1.7
@@ -13,7 +13,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -178,6 +178,7 @@ rm -rf java/src/test
 %build
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
 mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
+export PTHREAD_LIBS="-lpthread"
 ./autogen.sh
 %configure
 
@@ -316,6 +317,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep 30 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-2
+- added export PTHREAD_LIBS="-lpthread"
+
 * Fri Sep 18 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-1
 - Upgraded to upstream protobuf-2.2.0
 - New -lite packages



From pkgdb at fedoraproject.org  Wed Sep 30 12:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:23:15 +0000
Subject: [pkgdb] subversion: pauloneto has given up watchcommits
Message-ID: <20090930122315.7164710F875@bastion2.fedora.phx.redhat.com>

pauloneto has given up the watchcommits acl on subversion (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/subversion



From rjones at fedoraproject.org  Wed Sep 30 12:23:14 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Sep 2009 12:23:14 +0000 (UTC)
Subject: rpms/cduce/devel .cvsignore, 1.7, 1.8 cduce.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <20090930122314.D63D811C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7155

Modified Files:
	.cvsignore cduce.spec sources 
Log Message:
* Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-3
- Rebuild for OCaml 3.11.1.
- Reenable ocamlduce 3.11.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 May 2009 15:51:37 -0000	1.7
+++ .cvsignore	30 Sep 2009 12:23:14 -0000	1.8
@@ -4,3 +4,5 @@ ocaml-3.11.0.tar.bz2
 ocamlduce-3.11.0.0rc1.tar.gz
 ocaml-3.11.1+rc0.tar.gz
 cduce-0.5.3.tar.gz
+ocamlduce-3.11.1.0.tar.gz
+ocaml-3.11.1.tar.bz2


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cduce.spec	24 Jul 2009 18:46:06 -0000	1.14
+++ cduce.spec	30 Sep 2009 12:23:14 -0000	1.15
@@ -4,18 +4,15 @@
 %define ocaml_major 3.11
 %define ocaml_minor 1
 
-# ocamlduce is disabled until upstream produce a version
-# which is compatible with OCaml 3.11.1.
-# http://forge.ocamlcore.org/frs/?group_id=75&release_id=69
-%define with_ocamlduce 0
+%define with_ocamlduce 1
 
 %if %{with_ocamlduce}
-%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0rc1
+%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0
 %endif
 
 Name:           cduce
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -25,9 +22,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExcludeArch:    ppc64 s390 s390x sparc64
 
 Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
-Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}+rc0.tar.gz
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 %if %{with_ocamlduce}
-Source2:        https://forge.ocamlcore.org/frs/download.php/107/ocamlduce-%{ocamlduce_version}.tar.gz
+Source2:        http://forge.ocamlcore.org/frs/download.php/225/ocamlduce-%{ocamlduce_version}.tar.gz
 %endif
 
 BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -91,12 +88,12 @@ incorporates CDuce extensions for workin
 %endif
 
 # Unpack the OCaml sources in the build directory.
-zcat %{SOURCE1} | tar xf -
+bzcat %{SOURCE1} | tar xf -
 ./configure --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --mandir=%{_mandir} \
   --docdir=%{_docdir} \
-  --mliface=ocaml-%{ocaml_major}.%{ocaml_minor}rc0
+  --mliface=ocaml-%{ocaml_major}.%{ocaml_minor}
 
 
 %build
@@ -110,8 +107,8 @@ pushd ocamlduce-%{ocamlduce_version}
 make prepare \
   OCAML_VERSION=%{ocaml_major}.%{ocaml_minor} \
   OCAML_SOURCE=%{SOURCE1} \
-  OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}rc0
-cd ocaml-%{ocaml_major}.%{ocaml_minor}rc0
+  OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}
+cd ocaml-%{ocaml_major}.%{ocaml_minor}
   # Configure must match the one from base ocaml.spec
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
@@ -180,6 +177,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-3
+- Rebuild for OCaml 3.11.1.
+- Reenable ocamlduce 3.11.1.0.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 May 2009 15:51:38 -0000	1.7
+++ sources	30 Sep 2009 12:23:14 -0000	1.8
@@ -1,3 +1,3 @@
-0e36873aa7c3ae9684a49e3e831446ed  ocamlduce-3.11.0.0rc1.tar.gz
-45f626b33bec543a40abbf6afa1a6d96  ocaml-3.11.1+rc0.tar.gz
 5506326db28419b3f578ff225417448f  cduce-0.5.3.tar.gz
+5ef11249b590ab038c45583369936baa  ocamlduce-3.11.1.0.tar.gz
+fe011781f37f6b41fe08e0706969a89e  ocaml-3.11.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 30 12:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:23:35 +0000
Subject: [pkgdb] subversion: pauloneto has requested watchcommits
Message-ID: <20090930122335.BDC6C10F86A@bastion2.fedora.phx.redhat.com>

pauloneto has requested the watchcommits acl on subversion (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/subversion



From rjones at fedoraproject.org  Wed Sep 30 12:25:22 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Sep 2009 12:25:22 +0000 (UTC)
Subject: rpms/ocaml/devel .cvsignore, 1.15, 1.16 ocaml.spec, 1.57,
	1.58 sources, 1.18, 1.19
Message-ID: <20090930122522.A0E6411C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7450

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
* Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-1
- OCaml 3.11.1 (this is virtually the same as the release candidate
  that we were using for Fedora 12).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	3 Jun 2009 18:20:32 -0000	1.15
+++ .cvsignore	30 Sep 2009 12:25:22 -0000	1.16
@@ -3,3 +3,4 @@ ocaml-3.11-refman.info.tar.gz
 ocaml-3.11-refman.pdf
 ocaml-3.11.1+rc0.tar.gz
 ocaml-3.11.1+rc1.tar.gz
+ocaml-3.11.1.tar.bz2


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ocaml.spec	25 Jul 2009 19:49:19 -0000	1.57
+++ ocaml.spec	30 Sep 2009 12:25:22 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        0.rc1.2%{?dist}.1
+Release:        1%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -11,8 +11,7 @@ License:        QPL and (LGPLv2+ with ex
 
 URL:            http://www.ocaml.org
 
-Source0:        ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-3.11/ocaml-3.11.1+rc1.tar.gz
-#Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
+Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
 Source1:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.html.tar.gz
 Source2:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.pdf
 Source3:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.info.tar.gz
@@ -190,9 +189,9 @@ man pages and info files.
 
 
 %prep
-%setup -q -T -b 0 -n %{name}-%{version}+rc1
-%setup -q -T -D -a 1 -n %{name}-%{version}+rc1
-%setup -q -T -D -a 3 -n %{name}-%{version}+rc1
+%setup -q -T -b 0 -n %{name}-%{version}
+%setup -q -T -D -a 1 -n %{name}-%{version}
+%setup -q -T -D -a 3 -n %{name}-%{version}
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .cflags
 %patch3 -p1 -b .ppc64
@@ -434,6 +433,10 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-1
+- OCaml 3.11.1 (this is virtually the same as the release candidate
+  that we were using for Fedora 12).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.1-0.rc1.2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Jun 2009 18:20:32 -0000	1.18
+++ sources	30 Sep 2009 12:25:22 -0000	1.19
@@ -1,4 +1,4 @@
 7e20778259f87ab5e7cb60d2a17c657c  ocaml-3.11-refman.html.tar.gz
 3fcfedf63a852f502a10eac547c9042d  ocaml-3.11-refman.info.tar.gz
 076a163e511e575fc384ad96394760a2  ocaml-3.11-refman.pdf
-e7bf9cbdfc62c71cb13b716d77aebc76  ocaml-3.11.1+rc1.tar.gz
+fe011781f37f6b41fe08e0706969a89e  ocaml-3.11.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 30 12:32:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:32:53 +0000
Subject: [pkgdb] parted: jwrdegoede has requested watchbugzilla
Message-ID: <20090930123253.96D7010F88C@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on parted (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:32:52 +0000
Subject: [pkgdb] parted: jwrdegoede has requested watchbugzilla
Message-ID: <20090930123252.4EE2710F86A@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on parted (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:32:54 +0000
Subject: [pkgdb] parted: jwrdegoede has requested watchcommits
Message-ID: <20090930123254.82D8F10F8A8@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on parted (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:32:55 +0000
Subject: [pkgdb] parted: jwrdegoede has requested watchcommits
Message-ID: <20090930123255.A81F510F8AD@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on parted (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:32:57 +0000
Subject: [pkgdb] parted: jwrdegoede has requested commit
Message-ID: <20090930123257.458FA10F8AF@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on parted (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:32:58 +0000
Subject: [pkgdb] parted: jwrdegoede has requested commit
Message-ID: <20090930123258.D6B4110F8B1@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on parted (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:33:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:33:00 +0000
Subject: [pkgdb] parted: jwrdegoede has requested approveacls
Message-ID: <20090930123300.372B210F88C@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on parted (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:33:01 +0000
Subject: [pkgdb] parted: jwrdegoede has requested approveacls
Message-ID: <20090930123301.3E11A10F8B3@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on parted (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:33:07 +0000
Subject: [pkgdb] parted: jwrdegoede has requested watchbugzilla
Message-ID: <20090930123307.37DDA10F895@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on parted (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:33:07 +0000
Subject: [pkgdb] parted: jwrdegoede has requested watchcommits
Message-ID: <20090930123307.C5D4C10F8A9@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on parted (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:33:10 +0000
Subject: [pkgdb] parted: jwrdegoede has requested commit
Message-ID: <20090930123311.49E8A10F8AB@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on parted (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:33:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:33:13 +0000
Subject: [pkgdb] parted: jwrdegoede has requested approveacls
Message-ID: <20090930123313.1C31510F8AC@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on parted (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:02 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123803.07FA610F875@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on parted (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:03 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123803.E816010F894@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on parted (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:05 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123805.419BC10F8A9@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on parted (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:06 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123807.0E1F010F8AD@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on parted (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:11 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123811.5855A10F875@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on parted (Fedora 11) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:12 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123812.7541010F894@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on parted (Fedora 11) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:13 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123813.D32EB10F8B0@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on parted (Fedora 11) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:14 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123815.18EAA10F8AF@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on parted (Fedora 11) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:19 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123820.1A74410F8AC@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on parted (Fedora 12) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:20 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123821.1A6EB10F88C@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on parted (Fedora 12) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:22 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123822.3D59C10F8B1@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on parted (Fedora 12) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:38:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:38:23 +0000
Subject: [pkgdb] parted had acl change status
Message-ID: <20090930123823.8AF2510F8B3@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on parted (Fedora 12) to Approved for jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From twaugh at fedoraproject.org  Wed Sep 30 12:38:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 12:38:41 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3332.patch, NONE, 1.1 .cvsignore, 1.46,
	1.47 cups-lspp.patch, 1.43, 1.44 cups.spec, 1.517, 1.518 sources,
	1.50, 1.51 cups-str3262.patch, 1.1, NONE cups-str3279.patch, 1.1,
	NONE cups-str3284.patch, 1.1, NONE cups-str3285.patch, 1.1,
	NONE cups-str3287.patch, 1.1, NONE cups-str3292.patch, 1.2,
	NONE cups-str3293.patch, 1.1, NONE cups-str3308.patch, 1.1,
	NONE cups-str3311.patch, 1.1, NONE cups-str3312.patch, 1.1, NONE
Message-ID: <20090930123841.81D2C11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8839

Modified Files:
	.cvsignore cups-lspp.patch cups.spec sources 
Added Files:
	cups-str3332.patch 
Removed Files:
	cups-str3262.patch cups-str3279.patch cups-str3284.patch 
	cups-str3285.patch cups-str3287.patch cups-str3292.patch 
	cups-str3293.patch cups-str3308.patch cups-str3311.patch 
	cups-str3312.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
- 1.4.1.


cups-str3332.patch:
 usb-unix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3332.patch ---
diff -up cups-1.4.1/backend/usb-unix.c.function-decl cups-1.4.1/backend/usb-unix.c
--- cups-1.4.1/backend/usb-unix.c.function-decl	2009-09-14 17:36:06.087996470 +0100
+++ cups-1.4.1/backend/usb-unix.c	2009-09-14 17:36:13.656996607 +0100
@@ -605,7 +605,7 @@ open_device(const char *uri,		/* I - Dev
  * 'side_cb()' - Handle side-channel requests...
  */
 
-static void
+static int
 side_cb(int         print_fd,		/* I - Print file */
         int         device_fd,		/* I - Device file */
         int         snmp_fd,		/* I - SNMP socket (unused) */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	17 Jun 2009 11:37:31 -0000	1.46
+++ .cvsignore	30 Sep 2009 12:38:40 -0000	1.47
@@ -38,3 +38,4 @@ cups-1.4b1-source.tar.bz2
 cups-1.4b2-source.tar.bz2
 cups-1.4b2-svn8404-source.tar.bz2
 cups-1.4rc1-source.tar.bz2
+cups-1.4b1-source.tar.bz2

cups-lspp.patch:
 Makedefs.in                 |    4 
 config-scripts/cups-lspp.m4 |   36 +++
 config.h.in                 |    7 
 configure.in                |    2 
 cups/cups.h                 |    9 
 data/Makefile               |    5 
 data/mls                    |  261 +++++++++++++++++++++++++
 data/selinux                |  261 +++++++++++++++++++++++++
 data/te                     |  261 +++++++++++++++++++++++++
 filter/common.c             |  139 +++++++++++++
 filter/pstops.c             |  133 ++++++++++++
 scheduler/client.c          |  171 ++++++++++++++++
 scheduler/client.h          |   14 +
 scheduler/conf.c            |   56 +++++
 scheduler/conf.h            |    9 
 scheduler/ipp.c             |  456 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  303 ++++++++++++++++++++++++++++-
 scheduler/job.h             |   11 +
 scheduler/main.c            |   32 +++
 scheduler/printers.c        |   50 ++++
 20 files changed, 2212 insertions(+), 8 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-lspp.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- cups-lspp.patch	17 Jun 2009 11:37:31 -0000	1.43
+++ cups-lspp.patch	30 Sep 2009 12:38:40 -0000	1.44
@@ -1,7 +1,7 @@
-diff -up cups-1.4rc1/config.h.in.lspp cups-1.4rc1/config.h.in
---- cups-1.4rc1/config.h.in.lspp	2009-05-14 21:48:55.000000000 +0100
-+++ cups-1.4rc1/config.h.in	2009-06-17 11:24:06.635318677 +0100
-@@ -628,6 +628,13 @@
+diff -up cups-1.4.1/config.h.in.lspp cups-1.4.1/config.h.in
+--- cups-1.4.1/config.h.in.lspp	2009-09-14 16:59:30.108873598 +0100
++++ cups-1.4.1/config.h.in	2009-09-14 16:59:30.122873526 +0100
+@@ -619,6 +619,13 @@
  #undef HAVE_TCPD_H
  
  
@@ -15,9 +15,9 @@ diff -up cups-1.4rc1/config.h.in.lspp cu
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up /dev/null cups-1.4rc1/config-scripts/cups-lspp.m4
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/config-scripts/cups-lspp.m4	2009-06-17 11:24:06.636318615 +0100
+diff -up /dev/null cups-1.4.1/config-scripts/cups-lspp.m4
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/config-scripts/cups-lspp.m4	2009-09-14 16:59:30.124872629 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@ diff -up /dev/null cups-1.4rc1/config-sc
 +            ;;
 +    esac
 +fi
-diff -up cups-1.4rc1/configure.in.lspp cups-1.4rc1/configure.in
---- cups-1.4rc1/configure.in.lspp	2008-11-14 19:32:22.000000000 +0000
-+++ cups-1.4rc1/configure.in	2009-06-17 11:24:06.636318615 +0100
+diff -up cups-1.4.1/configure.in.lspp cups-1.4.1/configure.in
+--- cups-1.4.1/configure.in.lspp	2008-11-14 19:32:22.000000000 +0000
++++ cups-1.4.1/configure.in	2009-09-14 16:59:30.125879233 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -67,9 +67,9 @@ diff -up cups-1.4rc1/configure.in.lspp c
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-1.4rc1/cups/cups.h.lspp cups-1.4rc1/cups/cups.h
---- cups-1.4rc1/cups/cups.h.lspp	2009-05-22 22:46:12.000000000 +0100
-+++ cups-1.4rc1/cups/cups.h	2009-06-17 11:24:06.637318262 +0100
+diff -up cups-1.4.1/cups/cups.h.lspp cups-1.4.1/cups/cups.h
+--- cups-1.4.1/cups/cups.h.lspp	2009-08-28 18:51:05.000000000 +0100
++++ cups-1.4.1/cups/cups.h	2009-09-14 16:59:30.127873074 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -93,9 +93,9 @@ diff -up cups-1.4rc1/cups/cups.h.lspp cu
  /*
   * Types and structures...
   */
-diff -up cups-1.4rc1/data/Makefile.lspp cups-1.4rc1/data/Makefile
---- cups-1.4rc1/data/Makefile.lspp	2008-11-12 19:30:57.000000000 +0000
-+++ cups-1.4rc1/data/Makefile	2009-06-17 11:24:06.638317553 +0100
+diff -up cups-1.4.1/data/Makefile.lspp cups-1.4.1/data/Makefile
+--- cups-1.4.1/data/Makefile.lspp	2008-11-12 19:30:57.000000000 +0000
++++ cups-1.4.1/data/Makefile	2009-09-14 16:59:30.129874067 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -108,9 +108,9 @@ diff -up cups-1.4rc1/data/Makefile.lspp 
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.4rc1/data/mls
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/data/mls	2009-06-17 11:24:06.639317340 +0100
+diff -up /dev/null cups-1.4.1/data/mls
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/data/mls	2009-09-14 16:59:30.131873095 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -373,9 +373,9 @@ diff -up /dev/null cups-1.4rc1/data/mls
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.4rc1/data/selinux
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/data/selinux	2009-06-17 11:24:06.639317340 +0100
+diff -up /dev/null cups-1.4.1/data/selinux
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/data/selinux	2009-09-14 16:59:30.133872489 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -638,9 +638,9 @@ diff -up /dev/null cups-1.4rc1/data/seli
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.4rc1/data/te
---- /dev/null	2009-06-17 07:38:58.313242196 +0100
-+++ cups-1.4rc1/data/te	2009-06-17 11:24:06.640317408 +0100
+diff -up /dev/null cups-1.4.1/data/te
+--- /dev/null	2009-09-14 09:02:25.290577766 +0100
++++ cups-1.4.1/data/te	2009-09-14 16:59:30.135873116 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -903,9 +903,9 @@ diff -up /dev/null cups-1.4rc1/data/te
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.4rc1/filter/common.c.lspp cups-1.4rc1/filter/common.c
---- cups-1.4rc1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.4rc1/filter/common.c	2009-06-17 11:24:06.641317391 +0100
+diff -up cups-1.4.1/filter/common.c.lspp cups-1.4.1/filter/common.c
+--- cups-1.4.1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.4.1/filter/common.c	2009-09-14 16:59:30.137872500 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1074,9 +1074,9 @@ diff -up cups-1.4rc1/filter/common.c.lsp
  
  
  /*
-diff -up cups-1.4rc1/filter/pstops.c.lspp cups-1.4rc1/filter/pstops.c
---- cups-1.4rc1/filter/pstops.c.lspp	2009-06-17 11:24:06.511318859 +0100
-+++ cups-1.4rc1/filter/pstops.c	2009-06-17 11:24:06.643317146 +0100
+diff -up cups-1.4.1/filter/pstops.c.lspp cups-1.4.1/filter/pstops.c
+--- cups-1.4.1/filter/pstops.c.lspp	2009-09-14 16:59:29.803998275 +0100
++++ cups-1.4.1/filter/pstops.c	2009-09-14 16:59:30.141872862 +0100
 @@ -3242,6 +3242,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
@@ -1232,9 +1232,9 @@ diff -up cups-1.4rc1/filter/pstops.c.lsp
  
  
  /*
-diff -up cups-1.4rc1/Makedefs.in.lspp cups-1.4rc1/Makedefs.in
---- cups-1.4rc1/Makedefs.in.lspp	2009-06-17 11:24:06.613318752 +0100
-+++ cups-1.4rc1/Makedefs.in	2009-06-17 11:24:06.645317442 +0100
+diff -up cups-1.4.1/Makedefs.in.lspp cups-1.4.1/Makedefs.in
+--- cups-1.4.1/Makedefs.in.lspp	2009-09-14 16:59:30.024872775 +0100
++++ cups-1.4.1/Makedefs.in	2009-09-14 16:59:30.143872406 +0100
 @@ -146,7 +146,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@@ -1253,9 +1253,9 @@ diff -up cups-1.4rc1/Makedefs.in.lspp cu
  .SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
  
  .c.o:
-diff -up cups-1.4rc1/scheduler/client.c.lspp cups-1.4rc1/scheduler/client.c
---- cups-1.4rc1/scheduler/client.c.lspp	2009-05-26 23:01:23.000000000 +0100
-+++ cups-1.4rc1/scheduler/client.c	2009-06-17 11:24:32.101443240 +0100
+diff -up cups-1.4.1/scheduler/client.c.lspp cups-1.4.1/scheduler/client.c
+--- cups-1.4.1/scheduler/client.c.lspp	2009-07-15 00:02:05.000000000 +0100
++++ cups-1.4.1/scheduler/client.c	2009-09-14 16:59:30.148872510 +0100
 @@ -44,6 +44,7 @@
   *   valid_host()           - Is the Host: field valid?
   *   write_file()           - Send a file via HTTP.
@@ -1425,7 +1425,7 @@ diff -up cups-1.4rc1/scheduler/client.c.
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4448,6 +4575,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4472,6 +4599,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1476,9 +1476,9 @@ diff -up cups-1.4rc1/scheduler/client.c.
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -up cups-1.4rc1/scheduler/client.h.lspp cups-1.4rc1/scheduler/client.h
---- cups-1.4rc1/scheduler/client.h.lspp	2009-05-26 23:01:23.000000000 +0100
-+++ cups-1.4rc1/scheduler/client.h	2009-06-17 11:24:06.652317592 +0100
+diff -up cups-1.4.1/scheduler/client.h.lspp cups-1.4.1/scheduler/client.h
+--- cups-1.4.1/scheduler/client.h.lspp	2009-05-26 23:01:23.000000000 +0100
++++ cups-1.4.1/scheduler/client.h	2009-09-14 16:59:30.150872942 +0100
 @@ -18,6 +18,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1514,9 +1514,9 @@ diff -up cups-1.4rc1/scheduler/client.h.
  
  
  /*
-diff -up cups-1.4rc1/scheduler/conf.c.lspp cups-1.4rc1/scheduler/conf.c
---- cups-1.4rc1/scheduler/conf.c.lspp	2009-06-17 11:24:06.521317718 +0100
-+++ cups-1.4rc1/scheduler/conf.c	2009-06-17 11:25:04.221442770 +0100
+diff -up cups-1.4.1/scheduler/conf.c.lspp cups-1.4.1/scheduler/conf.c
+--- cups-1.4.1/scheduler/conf.c.lspp	2009-09-14 16:59:29.837998036 +0100
++++ cups-1.4.1/scheduler/conf.c	2009-09-14 16:59:30.155872264 +0100
 @@ -29,6 +29,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1626,9 +1626,9 @@ diff -up cups-1.4rc1/scheduler/conf.c.ls
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-1.4rc1/scheduler/conf.h.lspp cups-1.4rc1/scheduler/conf.h
---- cups-1.4rc1/scheduler/conf.h.lspp	2009-06-17 11:24:06.522318771 +0100
-+++ cups-1.4rc1/scheduler/conf.h	2009-06-17 11:24:06.663317557 +0100
+diff -up cups-1.4.1/scheduler/conf.h.lspp cups-1.4.1/scheduler/conf.h
+--- cups-1.4.1/scheduler/conf.h.lspp	2009-09-14 16:59:29.839997456 +0100
++++ cups-1.4.1/scheduler/conf.h	2009-09-14 16:59:30.157872484 +0100
 @@ -253,6 +253,12 @@ VAR char		*ServerKey		VALUE(NULL);
  VAR int			SSLOptions		VALUE(CUPSD_SSL_NONE);
  					/* SSL/TLS options */
@@ -1652,9 +1652,9 @@ diff -up cups-1.4rc1/scheduler/conf.h.ls
  
  /*
   * Prototypes...
-diff -up cups-1.4rc1/scheduler/ipp.c.lspp cups-1.4rc1/scheduler/ipp.c
---- cups-1.4rc1/scheduler/ipp.c.lspp	2009-06-17 11:24:06.598318705 +0100
-+++ cups-1.4rc1/scheduler/ipp.c	2009-06-17 11:24:06.668442879 +0100
+diff -up cups-1.4.1/scheduler/ipp.c.lspp cups-1.4.1/scheduler/ipp.c
+--- cups-1.4.1/scheduler/ipp.c.lspp	2009-09-14 16:59:29.974871379 +0100
++++ cups-1.4.1/scheduler/ipp.c	2009-09-14 16:59:30.168872218 +0100
 @@ -41,6 +41,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1698,7 +1698,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  static int	check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
  static ipp_attribute_t	*copy_attribute(ipp_t *to, ipp_attribute_t *attr,
  		                        int quickcopy);
-@@ -1332,6 +1347,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1338,6 +1353,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1720,7 +1720,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1548,6 +1578,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1554,6 +1584,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -1825,7 +1825,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1556,6 +1684,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1562,6 +1690,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      return (NULL);
    }
  
@@ -1858,7 +1858,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1764,6 +1918,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1769,6 +1923,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
        attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]);
        attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]);
      }
@@ -1888,7 +1888,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
      job->job_sheets = attr;
  
-@@ -1794,6 +1971,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1799,6 +1976,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                		     "job-sheets=\"%s,none\", "
  					     "job-originating-user-name=\"%s\"",
  	              Classification, job->username);
@@ -1898,7 +1898,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1812,6 +1992,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1817,6 +1997,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  					     "job-originating-user-name=\"%s\"",
  		      attr->values[0].string.text,
  		      attr->values[1].string.text, job->username);
@@ -1908,7 +1908,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1832,6 +2015,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1837,6 +2020,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  			"job-originating-user-name=\"%s\"",
  			attr->values[0].string.text,
  			attr->values[1].string.text, job->username);
@@ -1918,7 +1918,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1872,8 +2058,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1877,8 +2063,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  		      "job-sheets=\"%s\", "
  		      "job-originating-user-name=\"%s\"",
  		      Classification, job->username);
@@ -1971,7 +1971,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
     /*
      * See if we need to add the starting sheet...
-@@ -4205,6 +4435,103 @@ check_rss_recipient(
+@@ -4210,6 +4440,103 @@ check_rss_recipient(
  }
  
  
@@ -2075,7 +2075,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4756,6 +5083,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4761,6 +5088,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -2091,7 +2091,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4791,6 +5127,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4796,6 +5132,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2174,7 +2174,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4885,6 +5297,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4890,6 +5302,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2199,7 +2199,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -6824,6 +7254,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -6829,6 +7259,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2222,7 +2222,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
   /*
    * Copy attributes...
    */
-@@ -7043,6 +7489,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -7048,6 +7494,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (username[0] && strcasecmp(username, job->username))
        continue;
  
@@ -2234,7 +2234,7 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
      if (count > 0)
        ippAddSeparator(con->response);
  
-@@ -11425,6 +11876,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -11430,6 +11881,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2246,9 +2246,9 @@ diff -up cups-1.4rc1/scheduler/ipp.c.lsp
   /*
    * Check the username against the owner...
    */
-diff -up cups-1.4rc1/scheduler/job.c.lspp cups-1.4rc1/scheduler/job.c
---- cups-1.4rc1/scheduler/job.c.lspp	2009-06-17 11:24:06.534317793 +0100
-+++ cups-1.4rc1/scheduler/job.c	2009-06-17 11:24:06.674442529 +0100
+diff -up cups-1.4.1/scheduler/job.c.lspp cups-1.4.1/scheduler/job.c
+--- cups-1.4.1/scheduler/job.c.lspp	2009-09-14 16:59:30.058872907 +0100
++++ cups-1.4.1/scheduler/job.c	2009-09-14 17:00:42.616998003 +0100
 @@ -66,6 +66,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2289,7 +2289,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -911,6 +930,67 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -929,6 +948,67 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
      }
    }
  
@@ -2357,7 +2357,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-@@ -1147,13 +1227,13 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -1165,13 +1245,13 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
        if (access(command, F_OK))
  	{
  	  snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
@@ -2373,7 +2373,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  			      ServerBin);
  	    }
  	  else
-@@ -1161,7 +1241,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -1179,7 +1259,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
  	      /* Not in the compat directory either; make any error
  		 messages use the correct directory name then. */
  	      snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
@@ -2382,7 +2382,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  	    }
  	}
  #endif /* __x86_64__ */
-@@ -1608,6 +1688,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+@@ -1626,6 +1706,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
      goto error;
    }
  
@@ -2403,7 +2403,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1957,6 +2051,14 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1975,6 +2069,14 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2418,7 +2418,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1975,6 +2077,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1993,6 +2095,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2495,7 +2495,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3103,6 +3275,18 @@ get_options(cupsd_job_t *job,		/* I - Jo
+@@ -3138,6 +3310,18 @@ get_options(cupsd_job_t *job,		/* I - Jo
  	  banner_page)
          continue;
  
@@ -2514,7 +2514,7 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
       /*
        * Otherwise add them to the list...
        */
-@@ -3777,6 +3961,19 @@ static void
+@@ -3810,6 +3994,19 @@ static void
  start_job(cupsd_job_t     *job,		/* I - Job ID */
            cupsd_printer_t *printer)	/* I - Printer to print job */
  {
@@ -2534,9 +2534,9 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))",
                    job, job->id, printer, printer->name);
  
-@@ -3894,6 +4091,106 @@ start_job(cupsd_job_t     *job,		/* I - 
-   fcntl(job->side_pipes[1], F_SETFL,
- 	fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
+@@ -3932,6 +4129,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+   fcntl(job->side_pipes[1], F_SETFD,
+ 	fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
  
 +#ifdef WITH_LSPP
 +  if (is_lspp_config())
@@ -2641,9 +2641,9 @@ diff -up cups-1.4rc1/scheduler/job.c.lsp
   /*
    * Now start the first file in the job...
    */
-diff -up cups-1.4rc1/scheduler/job.h.lspp cups-1.4rc1/scheduler/job.h
---- cups-1.4rc1/scheduler/job.h.lspp	2009-05-11 23:46:01.000000000 +0100
-+++ cups-1.4rc1/scheduler/job.h	2009-06-17 11:25:35.151318166 +0100
+diff -up cups-1.4.1/scheduler/job.h.lspp cups-1.4.1/scheduler/job.h
+--- cups-1.4.1/scheduler/job.h.lspp	2009-05-11 23:46:01.000000000 +0100
++++ cups-1.4.1/scheduler/job.h	2009-09-14 16:59:30.177872674 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2669,9 +2669,9 @@ diff -up cups-1.4rc1/scheduler/job.h.lsp
  };
  
  typedef struct cupsd_joblog_s		/**** Job log message ****/
-diff -up cups-1.4rc1/scheduler/main.c.lspp cups-1.4rc1/scheduler/main.c
---- cups-1.4rc1/scheduler/main.c.lspp	2009-06-17 11:24:06.577318612 +0100
-+++ cups-1.4rc1/scheduler/main.c	2009-06-17 11:24:06.678443262 +0100
+diff -up cups-1.4.1/scheduler/main.c.lspp cups-1.4.1/scheduler/main.c
+--- cups-1.4.1/scheduler/main.c.lspp	2009-09-14 16:59:29.925872130 +0100
++++ cups-1.4.1/scheduler/main.c	2009-09-14 16:59:30.180872667 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -2739,9 +2739,9 @@ diff -up cups-1.4rc1/scheduler/main.c.ls
    return (!stop_scheduler);
  }
  
-diff -up cups-1.4rc1/scheduler/printers.c.lspp cups-1.4rc1/scheduler/printers.c
---- cups-1.4rc1/scheduler/printers.c.lspp	2009-06-17 11:24:06.543317142 +0100
-+++ cups-1.4rc1/scheduler/printers.c	2009-06-17 11:26:11.746318088 +0100
+diff -up cups-1.4.1/scheduler/printers.c.lspp cups-1.4.1/scheduler/printers.c
+--- cups-1.4.1/scheduler/printers.c.lspp	2009-09-14 16:59:29.866997809 +0100
++++ cups-1.4.1/scheduler/printers.c	2009-09-14 16:59:30.185871787 +0100
 @@ -58,6 +58,8 @@
   *   write_xml_string()         - Write a string with XML escaping.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -p -r1.517 -r1.518
--- cups.spec	4 Sep 2009 14:08:35 -0000	1.517
+++ cups.spec	30 Sep 2009 12:38:41 -0000	1.518
@@ -8,8 +8,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -49,18 +49,9 @@ Patch22: cups-build.patch
 Patch23: cups-res_init.patch
 Patch25: cups-filter-debug.patch
 Patch30: cups-uri-compat.patch
-Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
-Patch39: cups-str3284.patch
-Patch40: cups-str3285.patch
-Patch41: cups-str3279.patch
-Patch42: cups-str3287.patch
-Patch43: cups-str3292.patch
-Patch44: cups-str3293.patch
-Patch45: cups-str3308.patch
-Patch46: cups-str3311.patch
-Patch47: cups-str3312.patch
+Patch38: cups-str3332.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -211,18 +202,9 @@ module. 
 %patch23 -p1 -b .res_init
 %patch25 -p1 -b .filter-debug
 %patch30 -p1 -b .uri-compat
-%patch34 -p1 -b .str3262
 %patch35 -p1 -b .cups-get-classes
 %patch37 -p1 -b .avahi
-%patch39 -p1 -b .str3284
-%patch40 -p1 -b .str3285
-%patch41 -p1 -b .str3279
-%patch42 -p1 -b .str3287
-%patch43 -p1 -b .str3292
-%patch44 -p1 -b .str3293
-%patch45 -p1 -b .str3308
-%patch46 -p1 -b .str3311
-%patch47 -p1 -b .str3312
+%patch38 -p1 -b .str3332
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -519,6 +501,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
+- 1.4.1.
+
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
 - Fixed the dnssd backend so that it only reports devices once avahi
   resolution has completed.  This makes it report Device IDs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	28 Aug 2009 21:30:05 -0000	1.50
+++ sources	30 Sep 2009 12:38:41 -0000	1.51
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-bc5e777d4320cecdd1a64de8035171a8  cups-1.4.0-source.tar.bz2
+587a58039c112ecb3c932e048c8a7b01  cups-1.4.1-source.tar.bz2


--- cups-str3262.patch DELETED ---


--- cups-str3279.patch DELETED ---


--- cups-str3284.patch DELETED ---


--- cups-str3285.patch DELETED ---


--- cups-str3287.patch DELETED ---


--- cups-str3292.patch DELETED ---


--- cups-str3293.patch DELETED ---


--- cups-str3308.patch DELETED ---


--- cups-str3311.patch DELETED ---


--- cups-str3312.patch DELETED ---



From twaugh at fedoraproject.org  Wed Sep 30 12:40:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 12:40:01 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3356.patch,NONE,1.1 cups.spec,1.522,1.523
Message-ID: <20090930124001.6C9DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9005

Modified Files:
	cups.spec 
Added Files:
	cups-str3356.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-6
- Don't use cached PPD for raw queue (bug #526405, STR #3356).


cups-str3356.patch:
 printers.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3356.patch ---
diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
--- cups-1.4.1/scheduler/printers.c.str3356	2009-09-30 12:02:53.467761538 +0100
+++ cups-1.4.1/scheduler/printers.c	2009-09-30 12:03:28.489636706 +0100
@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Pri
   ippDelete(p->ppd_attrs);
   p->ppd_attrs = ippNew();
 
-  if (cache_info.st_mtime >= ppd_info.st_mtime &&
+  if (ppd_info.st_mtime != 1 &&
+      cache_info.st_mtime >= ppd_info.st_mtime &&
       (cache = cupsFileOpen(cache_name, "r")) != NULL)
   {
    /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -p -r1.522 -r1.523
--- cups.spec	23 Sep 2009 14:31:50 -0000	1.522
+++ cups.spec	30 Sep 2009 12:40:01 -0000	1.523
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -52,6 +52,7 @@ Patch30: cups-uri-compat.patch
 Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
+Patch39: cups-str3356.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -205,6 +206,7 @@ module. 
 %patch35 -p1 -b .cups-get-classes
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3332
+%patch39 -p1 -b .str3356
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -505,6 +507,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-6
+- Don't use cached PPD for raw queue (bug #526405, STR #3356).
 
 * Wed Sep 23 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-5
 - Fixed cups.init to be LSB compliant (bug #521641)



From pkgdb at fedoraproject.org  Wed Sep 30 12:46:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:46:45 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124645.BFFAB10F875@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora devel) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:46:47 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124647.70A6410F857@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on python-imaging (Fedora devel) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:46:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:46:48 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124648.814F610F8AB@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on python-imaging (Fedora devel) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:46:50 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124650.3956610F875@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on python-imaging (Fedora devel) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:46:56 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124656.D682610F88C@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora EPEL 4) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:46:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:46:58 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124659.72C0310F8A8@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on python-imaging (Fedora EPEL 4) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:00 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124700.30E6210F8A9@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on python-imaging (Fedora EPEL 4) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:08 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124708.C463610F88B@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on python-imaging (Fedora EPEL 4) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:12 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124713.335B110F894@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora EPEL 5) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:13 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124713.E979510F895@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on python-imaging (Fedora EPEL 5) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:14 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124715.10A4B10F8AB@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on python-imaging (Fedora EPEL 5) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:17 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124717.13AC510F894@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on python-imaging (Fedora EPEL 5) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:27 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124727.BB20110F88C@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora 10) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:28 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124728.6226910F8AC@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on python-imaging (Fedora 10) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:31 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124731.610F810F895@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on python-imaging (Fedora 10) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:32 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124732.CB29810F86A@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on python-imaging (Fedora 10) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:35 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124735.9D86710F8B1@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora 11) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:36 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124736.6036710F8AB@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on python-imaging (Fedora 11) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:37 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124737.305DD10F8B6@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on python-imaging (Fedora 11) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:39 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124739.5C46610F8B0@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on python-imaging (Fedora 11) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:44 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124744.E5C6110F86A@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora 12) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:45 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124745.26DEA10F895@bastion2.fedora.phx.redhat.com>

jgranado has set the watchcommits acl on python-imaging (Fedora 12) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:45 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124745.97BE910F8BC@bastion2.fedora.phx.redhat.com>

jgranado has set the commit acl on python-imaging (Fedora 12) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:47:46 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930124746.B210910F8B1@bastion2.fedora.phx.redhat.com>

jgranado has set the approveacls acl on python-imaging (Fedora 12) to Approved for rrakus

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 12:51:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:51:49 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930125149.C3DC010F86A@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora devel) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From twaugh at fedoraproject.org  Wed Sep 30 12:51:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 12:51:54 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3356.patch,NONE,1.1 cups.spec,1.518,1.519
Message-ID: <20090930125154.BEA0B11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10922

Modified Files:
	cups.spec 
Added Files:
	cups-str3356.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
- Don't use cached PPD for raw queue (bug #526405, STR #3356).


cups-str3356.patch:
 printers.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3356.patch ---
diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
--- cups-1.4.1/scheduler/printers.c.str3356	2009-09-30 12:02:53.467761538 +0100
+++ cups-1.4.1/scheduler/printers.c	2009-09-30 12:03:28.489636706 +0100
@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Pri
   ippDelete(p->ppd_attrs);
   p->ppd_attrs = ippNew();
 
-  if (cache_info.st_mtime >= ppd_info.st_mtime &&
+  if (ppd_info.st_mtime != 1 &&
+      cache_info.st_mtime >= ppd_info.st_mtime &&
       (cache = cupsFileOpen(cache_name, "r")) != NULL)
   {
    /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- cups.spec	30 Sep 2009 12:38:41 -0000	1.518
+++ cups.spec	30 Sep 2009 12:51:54 -0000	1.519
@@ -52,6 +52,7 @@ Patch30: cups-uri-compat.patch
 Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
+Patch39: cups-str3356.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -205,6 +206,7 @@ module. 
 %patch35 -p1 -b .cups-get-classes
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3332
+%patch39 -p1 -b .str3356
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -503,6 +505,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
 - 1.4.1.
+- Don't use cached PPD for raw queue (bug #526405, STR #3356).
 
 * Fri Sep  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
 - Fixed the dnssd backend so that it only reports devices once avahi



From pkgdb at fedoraproject.org  Wed Sep 30 12:58:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:58:32 +0000
Subject: [pkgdb] parted ownership updated
Message-ID: <20090930125832.62FB010F875@bastion2.fedora.phx.redhat.com>

Package parted in Fedora devel is now owned by jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:58:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:58:37 +0000
Subject: [pkgdb] parted ownership updated
Message-ID: <20090930125838.09FDF10F88B@bastion2.fedora.phx.redhat.com>

Package parted in Fedora 11 is now owned by jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 12:58:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 12:58:46 +0000
Subject: [pkgdb] parted ownership updated
Message-ID: <20090930125846.EFCA110F86A@bastion2.fedora.phx.redhat.com>

Package parted in Fedora 12 is now owned by jwrdegoede

To make changes to this package see:
  /pkgdb/packages/name/parted



From pkgdb at fedoraproject.org  Wed Sep 30 13:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:00:50 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930130050.5BB3210F86A@bastion2.fedora.phx.redhat.com>

jgranado has set the watchbugzilla acl on python-imaging (Fedora devel) to Approved for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From abbot at fedoraproject.org  Wed Sep 30 13:15:05 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Wed, 30 Sep 2009 13:15:05 +0000 (UTC)
Subject: rpms/protobuf/devel protobuf.spec,1.8,1.9
Message-ID: <20090930131506.054D711C00E6@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/protobuf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14052

Modified Files:
	protobuf.spec 
Log Message:
added export PTHREAD_LIBS="-lpthread"



Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/protobuf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- protobuf.spec	18 Sep 2009 12:56:32 -0000	1.8
+++ protobuf.spec	30 Sep 2009 13:15:05 -0000	1.9
@@ -13,7 +13,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -178,6 +178,7 @@ rm -rf java/src/test
 %build
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
 mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
+export PTHREAD_LIBS="-lpthread"
 ./autogen.sh
 %configure
 
@@ -316,6 +317,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep 30 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-2
+- added export PTHREAD_LIBS="-lpthread"
+
 * Fri Sep 18 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-1
 - Upgraded to upstream protobuf-2.2.0
 - New -lite packages



From oliver at fedoraproject.org  Wed Sep 30 13:18:44 2009
From: oliver at fedoraproject.org (Oliver Falk)
Date: Wed, 30 Sep 2009 13:18:44 +0000 (UTC)
Subject: rpms/ngrep/F-12 ngrep.spec,1.12,1.13
Message-ID: <20090930131844.94A8211C00E6@cvs1.fedora.phx.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/ngrep/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14517

Modified Files:
	ngrep.spec 
Log Message:


* Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.2
- Next shot with --with-pcap-includes (Thanks Moroslav!)



Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/F-12/ngrep.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ngrep.spec	30 Sep 2009 11:06:15 -0000	1.12
+++ ngrep.spec	30 Sep 2009 13:18:44 -0000	1.13
@@ -5,7 +5,7 @@ Name:				ngrep
 Summary:			Network layer grep tool
 
 Version:			1.45
-Release:			6.1%{?dist}
+Release:			6.2%{?dist}
 
 Group:				Applications/Internet
 License:			BSD with advertising
@@ -39,7 +39,7 @@ install -pm 644 %{SOURCE1} ./README.fedo
 %build
 export EXTRA_INCLUDES=$(pcre-config --cflags)
 export EXTRA_LIBS=$(pcre-config --libs)
-%configure --enable-pcre --enable-ipv6
+%configure --enable-pcre --enable-ipv6 --with-pcap-includes=%{_includedir}
 make %{?_smp_mflags} STRIPFLAG=
 
 %install
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.2
+- Next shot with --with-pcap-includes (Thanks Moroslav!)
+
 * Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.1
 - Bump-n-build for new libpcap
 



From timlau at fedoraproject.org  Wed Sep 30 13:21:15 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 30 Sep 2009 13:21:15 +0000 (UTC)
Subject: rpms/yumex/devel .cvsignore, 1.43, 1.44 sources, 1.62,
	1.63 yumex.spec, 1.75, 1.76
Message-ID: <20090930132115.2E52311C00E6@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14834

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 2.9.2-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	18 Sep 2009 08:21:42 -0000	1.43
+++ .cvsignore	30 Sep 2009 13:21:14 -0000	1.44
@@ -1 +1 @@
-yumex-2.9.1.tar.gz
+yumex-2.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	18 Sep 2009 08:21:42 -0000	1.62
+++ sources	30 Sep 2009 13:21:14 -0000	1.63
@@ -1 +1 @@
-169a7878aa2e739bc440be0828cd1cba  yumex-2.9.1.tar.gz
+1f8e57ab09c54611945c5d0fea476d82  yumex-2.9.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- yumex.spec	18 Sep 2009 08:21:42 -0000	1.75
+++ yumex.spec	30 Sep 2009 13:21:14 -0000	1.76
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.9.1
+Version:  2.9.2
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -73,7 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Fri Sep 18 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
+* Wed Sep 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.2-1
+- bumped version to 2.9.2-1 
+* Fri Sep 18 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.1-1
 - bumped version to 2.9.1-1 
 * Sun Aug 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
 - bumped version to 2.9.0-1



From jpopelka at fedoraproject.org  Wed Sep 30 13:23:57 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Wed, 30 Sep 2009 13:23:57 +0000 (UTC)
Subject: rpms/net-tools/devel net-tools-1.60-makefile-berlios.patch, NONE,
	1.1 net-tools-1.60-man-RHEL-bugs.patch, NONE,
	1.1 net-tools-1.60-masqinfo-raw-ip.patch, NONE,
	1.1 net-tools-1.60-slattach-fchown.patch, NONE,
	1.1 net-tools-1.60-ec_hw_null.patch, 1.1, 1.2 net-tools.spec,
	1.101, 1.102 sources, 1.12, 1.13 net-tools-1.60-bitkeeper.patch,
	1.3, NONE net-tools-1.60-execshield.patch, 1.4,
	NONE net-tools-1.60-netplugd_init.patch, 1.1,
	NONE netplug-1.2.9-execshield.patch, 1.3, NONE
Message-ID: <20090930132357.BC02911C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15152

Modified Files:
	net-tools-1.60-ec_hw_null.patch net-tools.spec sources 
Added Files:
	net-tools-1.60-makefile-berlios.patch 
	net-tools-1.60-man-RHEL-bugs.patch 
	net-tools-1.60-masqinfo-raw-ip.patch 
	net-tools-1.60-slattach-fchown.patch 
Removed Files:
	net-tools-1.60-bitkeeper.patch net-tools-1.60-execshield.patch 
	net-tools-1.60-netplugd_init.patch 
	netplug-1.2.9-execshield.patch 
Log Message:
* Tue Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-96
- netplug moved to separate package
- #319981 and #322901 - minor man pages changes
- applied changes from berlios cvs, which fix: Berlios #16232, Gentoo #283759 and polish Makefile and slattach


net-tools-1.60-makefile-berlios.patch:
 Makefile     |   21 ++++++++++-----------
 lib/Makefile |    2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE net-tools-1.60-makefile-berlios.patch ---
diff -up net-tools-1.60/lib/Makefile.makefile-berlios net-tools-1.60/lib/Makefile
--- net-tools-1.60/lib/Makefile.makefile-berlios	2009-09-15 18:07:12.000000000 +0200
+++ net-tools-1.60/lib/Makefile	2009-09-15 18:07:12.000000000 +0200
@@ -36,7 +36,7 @@ OBJS	= $(sort $(VARIA) $(AFOBJS) $(HWOBJ
 
 # This can be overwritten by the TOPLEVEL Makefile
 TOPDIR=..
-CFLAGS += -I$(TOPDIR) -idirafter $(TOPDIR)/include # -fPIC
+CFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include # -fPIC
 SONAME=libnet-tools.so.0
 
 .SUFFIXES: .a .so
diff -up net-tools-1.60/Makefile.makefile-berlios net-tools-1.60/Makefile
--- net-tools-1.60/Makefile.makefile-berlios	2009-09-15 18:07:12.000000000 +0200
+++ net-tools-1.60/Makefile	2009-09-15 18:08:25.000000000 +0200
@@ -88,10 +88,9 @@ endif
 
 # Compiler and Linker Options
 # You may need to uncomment and edit these if you are using libc5 and IPv6.
-COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
-ifeq ($(origin LOPTS), undefined)
-LOPTS = 
-endif
+CFLAGS ?= -O2 -g
+CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe
+CPPFLAGS += -D_GNU_SOURCE
 RESLIB = # -L/usr/inet6/lib -linet6
 
 ifeq ($(HAVE_AFDECnet),1)
@@ -119,8 +118,9 @@ CFLAGS += -DHAVE_SELINUX
 else
 endif
 
-CFLAGS	+= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
-LDFLAGS	+= $(LOPTS) -L$(NET_LIB_PATH)
+CPPFLAGS += -I. -I$(TOPDIR)/include -I$(NET_LIB_PATH)
+LDFLAGS  += -L$(NET_LIB_PATH)
+
 
 SUBDIRS	= man/ $(NET_LIB_PATH)/
 
@@ -131,8 +131,6 @@ LD	= $(CC)
 
 NLIB	= -l$(NET_LIB_NAME)
 
-MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)'
-
 %.o:		%.c config.h version.h intl.h net-features.h $<
 		$(CC) $(CFLAGS) -c $<
 
@@ -181,14 +179,15 @@ $(NET_LIB):	config.h version.h intl.h li
 
 i18n.h:		i18ndir
 
-libdir:
-		@$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES)
+libdir:		version.h
+		@$(MAKE) -C $(NET_LIB_PATH)
 
 i18ndir:
 		@$(MAKE) -C po
 
 subdirs:
-		@for i in $(SUBDIRS); do $(MAKE) -C $$i $(MDEFINES) ; done
+		@for i in $(SUBDIRS); do $(MAKE) -C $$i || exit $$? ; done
+
 
 ifconfig:	$(NET_LIB) ifconfig.o
 		$(CC) $(LDFLAGS) -o ifconfig ifconfig.o $(NLIB) $(RESLIB)

net-tools-1.60-man-RHEL-bugs.patch:
 de_DE/arp.8      |    8 +++-----
 en_US/hostname.1 |   18 ++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE net-tools-1.60-man-RHEL-bugs.patch ---
diff -up net-tools-1.60/man/de_DE/arp.8.man-RHEL-bugs net-tools-1.60/man/de/arp.8
--- net-tools-1.60/man/de_DE/arp.8.man-RHEL-bugs	2009-09-09 15:52:27.000000000 +0200
+++ net-tools-1.60/man/de_DE/arp.8	2009-09-09 15:59:33.000000000 +0200
@@ -120,11 +120,9 @@ Flagge) kann
 .B Netmaske
 f\(:ur ARP-Eintr\(:age f\(:ur ganze Subnetze angegeben werde.  Von dieser
 Praxis wird abgeraten.  Sie wird von \(:alteren Kerneln unterst\(:utzt, da
-sie gelegentlich n\(:utzlich ist.  Wird die
-If the
-.B temp
-Flagge nicht angegeben, so werden die erzeugten Eintr\(:age nicht dauerhaft
-in den ARP-Cache eingetragen.
+sie gelegentlich n\(:utzlich ist.
+Der Eintrag wird permanent im ARP-Cache gespeichert,
+wenn das \fBtemp\fR-Flag nicht angegeben wird.
 .br
 .B ANMERKUNG:
 Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich ARP-Eintr\(:age f\(:ur
diff -up net-tools-1.60/man/en_US/hostname.1.man-RHEL-bugs net-tools-1.60/man/en_US/hostname.1
--- net-tools-1.60/man/en_US/hostname.1.man-RHEL-bugs	2009-09-09 15:52:27.000000000 +0200
+++ net-tools-1.60/man/en_US/hostname.1	2009-09-09 15:52:27.000000000 +0200
@@ -100,11 +100,11 @@ complete FQDN of the system is returned 
 .LP
 The function 
 .BR gethostname(2)
-is used to get the hostname.  Only when the 
-.BR "hostname \-s" 
-is called will 
-.BR gethostbyname(3)
-be called.  The difference in 
+is used to get the hostname.
+When \fBhostname\fR
+is called with \fB-s\fR, \fB-a\fR, \fB-i\fR, \fB-f\fR or \fB-d\fR
+the \fBgethostbyname(3)\fR will be called.
+The difference in 
 .BR gethostname(2)
 and
 .BR gethostbyname(3)
@@ -117,11 +117,9 @@ and
 to decide whether to read information in
 .IR /etc/sysconfig/network
 or
-.IR /etc/hosts
-. To add another dimension to this,
-the 
-.B hostname 
-is also set when the network interface is brought up.
+.IR /etc/hosts .
+If \fBgethostbyname(3)\fR cannot resolve host name,
+\fIUnknown host\fR warning is returned.
 
 .SS "SET NAME"
 When called with one argument or with the 

net-tools-1.60-masqinfo-raw-ip.patch:
 masq_info.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE net-tools-1.60-masqinfo-raw-ip.patch ---
diff -up net-tools-1.60/lib/masq_info.c.masqinfo-raw-ip net-tools-1.60/lib/masq_info.c
--- net-tools-1.60/lib/masq_info.c.masqinfo-raw-ip	2000-10-28 12:59:42.000000000 +0200
+++ net-tools-1.60/lib/masq_info.c	2009-09-15 17:05:24.000000000 +0200
@@ -119,7 +119,9 @@ static int read_masqinfo(FILE * f, struc
 	ms->src.sin_family = AF_INET;
 	ms->dst.sin_family = AF_INET;
 
-	if (strcmp("TCP", buf) == 0)
+	if (strcmp("IP", buf) == 0)
+	    ms->proto = "ip";
+	else if (strcmp("TCP", buf) == 0)
 	    ms->proto = "tcp";
 	else if (strcmp("UDP", buf) == 0)
 	    ms->proto = "udp";

net-tools-1.60-slattach-fchown.patch:
 slattach.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE net-tools-1.60-slattach-fchown.patch ---
diff -up net-tools-1.60/slattach.c.slattach-fchown net-tools-1.60/slattach.c
--- net-tools-1.60/slattach.c.slattach-fchown	2000-10-28 12:59:41.000000000 +0200
+++ net-tools-1.60/slattach.c	2009-09-15 18:17:01.000000000 +0200
@@ -195,15 +195,17 @@ tty_lock(char *path, int mode)
 		return(-1);
 	}
 
-	(void) close(fd);
-
 	/* Make sure UUCP owns the lockfile.  Required by some packages. */
 	if ((pw = getpwnam(_UID_UUCP)) == NULL) {
 		if (opt_q == 0) fprintf(stderr, _("slattach: tty_lock: UUCP user %s unknown!\n"),
 					_UID_UUCP);
+		(void) close(fd);
 		return(0);	/* keep the lock anyway */
 	}
-	(void) chown(saved_path, pw->pw_uid, pw->pw_gid);
+	(void) fchown(fd, pw->pw_uid, pw->pw_gid);
+ 
+	(void) close(fd);
+
 	saved_lock = 1;
   } else {	/* unlock */
 	if (saved_lock != 1) return(0);

net-tools-1.60-ec_hw_null.patch:
 ec_hw.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: net-tools-1.60-ec_hw_null.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools-1.60-ec_hw_null.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- net-tools-1.60-ec_hw_null.patch	25 Feb 2008 08:08:33 -0000	1.1
+++ net-tools-1.60-ec_hw_null.patch	30 Sep 2009 13:23:57 -0000	1.2
@@ -1,11 +1,12 @@
-diff -up net-tools-1.60/lib/ec_hw.c.old net-tools-1.60/lib/ec_hw.c
---- net-tools-1.60/lib/ec_hw.c.old	1999-11-20 22:02:53.000000000 +0100
-+++ net-tools-1.60/lib/ec_hw.c	2008-02-25 09:04:00.000000000 +0100
-@@ -18,6 +18,7 @@
+diff -up net-tools-1.60/lib/ec_hw.c.ec_hw_null net-tools-1.60/lib/ec_hw.c
+--- net-tools-1.60/lib/ec_hw.c.ec_hw_null	1999-11-20 22:02:53.000000000 +0100
++++ net-tools-1.60/lib/ec_hw.c	2009-09-15 16:33:27.000000000 +0200
+@@ -15,7 +15,7 @@
+ #include "config.h"
  
+ #if HAVE_HWEC
+-
++#include <stdlib.h>
  #include <net/if_arp.h>
  #include "net-support.h"
-+#define NULL ((void *) 0)
  
- struct hwtype ec_hwtype =
- {


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- net-tools.spec	1 Sep 2009 13:18:22 -0000	1.101
+++ net-tools.spec	30 Sep 2009 13:23:57 -0000	1.102
@@ -1,22 +1,19 @@
-%define npversion	1.2.9
-
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 95%{?dist}
+Release: 96%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
-Source1: http://www.red-bean.com/~bos/netplug/netplug-%{npversion}.tar.bz2
-Source2: net-tools-%{version}-config.h
-Source3: net-tools-%{version}-config.make
-Source4: ether-wake.c
-Source5: ether-wake.8
-Source6: mii-diag.c
-Source7: mii-diag.8
-Source8: iptunnel.8
-Source9: ipmaddr.8
+Source1: net-tools-%{version}-config.h
+Source2: net-tools-%{version}-config.make
+Source3: ether-wake.c
+Source4: ether-wake.8
+Source5: mii-diag.c
+Source6: mii-diag.8
+Source7: iptunnel.8
+Source8: ipmaddr.8
 Patch1: net-tools-1.57-bug22040.patch
 Patch2: net-tools-1.60-miiioctl.patch
 Patch3: net-tools-1.60-manydevs.patch
@@ -45,10 +42,8 @@ Patch29: net-tools-1.60-num-ports.patch
 Patch30: net-tools-1.60-duplicate-tcp.patch
 Patch31: net-tools-1.60-statalias.patch
 Patch32: net-tools-1.60-isofix.patch
-Patch33: net-tools-1.60-bitkeeper.patch
 Patch34: net-tools-1.60-ifconfig_ib.patch
 Patch35: net-tools-1.60-de.patch
-Patch36: netplug-1.2.9-execshield.patch
 Patch37: net-tools-1.60-pie.patch
 Patch38: net-tools-1.60-ifaceopt.patch
 Patch39: net-tools-1.60-trim_iface.patch
@@ -75,7 +70,6 @@ Patch59: net-tools-1.60-arp-unaligned-ac
 Patch60: net-tools-1.60-sctp-quiet.patch
 Patch61: net-tools-1.60-remove_node.patch
 Patch62: net-tools-1.60-netstat-interfaces-crash.patch
-Patch63: net-tools-1.60-netplugd_init.patch
 Patch64: net-tools-1.60-ec_hw_null.patch
 Patch65: net-tools-1.60-statistics_buffer.patch
 Patch66: net-tools-1.60-sctp-addrs.patch
@@ -103,10 +97,21 @@ Patch76: net-tools-1.60-ib-warning.patch
 # notes in man pages, saying that these tools are obsolete
 Patch77: net-tools-1.60-man-obsolete.patch
 
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+# Bug 319981  hostname -s gives hostname: Unknown host when the FQDN does not resolve
+# Bug 322901  Sens negating error in man page translation (arp)
+Patch78: net-tools-1.60-man-RHEL-bugs.patch
+
+# handle raw "IP" masqinfo
+Patch79: net-tools-1.60-masqinfo-raw-ip.patch
+
+# touch up build system to respect normal toolchain env vars rather than requiring people to set random custom ones
+# add missing dependency on version.h to libdir target to fix parallel build failures
+# convert -idirafter to -I
+Patch80: net-tools-1.60-makefile-berlios.patch
+
+# slattach: use fchown() rather than chown() to avoid race between creation and permission changing
+Patch81: net-tools-1.60-slattach-fchown.patch
+
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
 
@@ -116,7 +121,7 @@ including ifconfig, netstat, route, and 
 Most of them are obsolete. For replacement check iproute package.
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch1 -p1 -b .bug22040
 %patch2 -p1 -b .miiioctl
 %patch3 -p0 -b .manydevs
@@ -145,10 +150,8 @@ Most of them are obsolete. For replaceme
 %patch30 -p1 -b .dup-tcp
 %patch31 -p1 -b .statalias
 %patch32 -p1 -b .isofix
-%patch33 -p1 -b .bitkeeper
 %patch34 -p1 -b .ifconfig_ib
 %patch35 -p1 
-%patch36 -p1 -b .execshield
 %patch37 -p1 -b .pie
 %patch38 -p1 -b .ifaceopt
 %patch39 -p1 -b .trim-iface
@@ -175,7 +178,6 @@ Most of them are obsolete. For replaceme
 %patch60 -p1 -b .quiet
 %patch61 -p1
 %patch62 -p1 -b .iface-crash
-%patch63 -p1
 %patch64 -p1
 %patch65 -p1 -b .buffer
 %patch66 -p1 -b .sctp-addrs
@@ -190,15 +192,19 @@ Most of them are obsolete. For replaceme
 %patch75 -p1 -b .debug-fix
 %patch76 -p1 -b .ib-warning
 %patch77 -p1 -b .man-obsolete
-
-cp %SOURCE2 ./config.h
-cp %SOURCE3 ./config.make
-cp %SOURCE4 .
-cp %SOURCE5 ./man/en_US
-cp %SOURCE6 .
+%patch78 -p1 -b .man-RHEL-bugs
+%patch79 -p1 -b .masqinfo-raw-ip
+%patch80 -p1 -b .makefile-berlios
+%patch81 -p1 -b .slattach-fchown
+
+cp %SOURCE1 ./config.h
+cp %SOURCE2 ./config.make
+cp %SOURCE3 .
+cp %SOURCE4 ./man/en_US
+cp %SOURCE5 .
+cp %SOURCE6 ./man/en_US
 cp %SOURCE7 ./man/en_US
 cp %SOURCE8 ./man/en_US
-cp %SOURCE9 ./man/en_US
 
 %ifarch alpha
 perl -pi -e "s|-O2||" Makefile
@@ -239,12 +245,8 @@ export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
 make
 gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c
 gcc $RPM_OPT_FLAGS -o mii-diag mii-diag.c
-pushd netplug-%{npversion}
-make
-popd
 
 %install
-rm -rf %{buildroot}
 mv man/de_DE man/de
 mv man/fr_FR man/fr
 mv man/pt_BR man/pt
@@ -254,24 +256,13 @@ make BASEDIR=%{buildroot} mandir=%{_mand
 install -m 755 ether-wake %{buildroot}/sbin
 install -m 755 mii-diag %{buildroot}/sbin
 
-pushd netplug-%{npversion}
-make install prefix=%{buildroot} \
-	initdir=%{buildroot}/%{_initrddir} \
-	mandir=%{buildroot}/%{_mandir}
-mv README README.netplugd
-mv TODO TODO.netplugd
-popd
-
-ln -s %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplug.5.gz
-ln -s %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplug.d.5.gz
-ln -s %{_mandir}/man8/netplugd.8.gz %{buildroot}/%{_mandir}/man5/netplugd.conf.5.gz
-
 rm %{buildroot}/sbin/rarp
 rm %{buildroot}%{_mandir}/man8/rarp.8*
 rm %{buildroot}%{_mandir}/de/man8/rarp.8*
 rm %{buildroot}%{_mandir}/fr/man8/rarp.8*
 rm %{buildroot}%{_mandir}/pt/man8/rarp.8*
 
+mkdir -p %{buildroot}%{_sysconfdir}
 touch %{buildroot}%{_sysconfdir}/ethers
 echo "# see man ethers for syntax" > %{buildroot}%{_sysconfdir}/ethers
 
@@ -280,37 +271,24 @@ echo "# see man ethers for syntax" > %{b
 %clean
 rm -rf %{buildroot}
 
-%post
-  /sbin/chkconfig --add netplugd
-  exit 0
-
-%preun
-if [ "$1" = "0" ]; then
-  /sbin/chkconfig --del netplugd || :
-  /sbin/service netplugd stop &> /dev/null || :
-fi
-exit 0
-
-%postun
-  /sbin/service netplugd condrestart >/dev/null 2>&1 || :
-  exit 0
-
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc netplug-%{npversion}/TODO.netplugd netplug-%{npversion}/README.netplugd COPYING
+%doc COPYING
 /bin/*
 /sbin/*
 %{_mandir}/man[158]/*
 %lang(de)	%{_mandir}/de/man[158]/*
 %lang(fr)	%{_mandir}/fr/man[158]/*
 %lang(pt)	%{_mandir}/pt/man[158]/*
-%dir	%{_sysconfdir}/netplug
-%config(noreplace) %{_sysconfdir}/netplug/netplugd.conf
 %config(noreplace) %{_sysconfdir}/ethers
-%{_sysconfdir}/netplug.d
-%{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+
+* Tue Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-96
+- netplug moved to separate package
+- #319981 and #322901 - minor man pages changes
+- applied changes from berlios cvs, which fix: Berlios #16232, Gentoo #283759 and polish Makefile and slattach 
+
 * Tue Sep 1 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-95
 - netstat - avoid name resolution for listening or established sockets (-l) by return fast. 
 - netstat - --continuous should flush stdout


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Sep 2009 13:18:22 -0000	1.12
+++ sources	30 Sep 2009 13:23:57 -0000	1.13
@@ -1,5 +1,4 @@
 888774accab40217dde927e21979c165  net-tools-1.60.tar.bz2
-3bc8062d8033e3f897b015f2889ce5a9  netplug-1.2.9.tar.bz2
 64a9a08dd016d02b6af3deef3277ad98  mii-diag.c
 8c6ac053fcab98a3fce2181e7da878ea  mii-diag.8
 15fe21b9cac19a79649c41fa7919e888  ether-wake.c


--- net-tools-1.60-bitkeeper.patch DELETED ---


--- net-tools-1.60-execshield.patch DELETED ---


--- net-tools-1.60-netplugd_init.patch DELETED ---


--- netplug-1.2.9-execshield.patch DELETED ---



From abbot at fedoraproject.org  Wed Sep 30 13:24:25 2009
From: abbot at fedoraproject.org (Lev Shamardin)
Date: Wed, 30 Sep 2009 13:24:25 +0000 (UTC)
Subject: rpms/protobuf/F-12 protobuf.spec,1.8,1.9
Message-ID: <20090930132425.71D5611C00E6@cvs1.fedora.phx.redhat.com>

Author: abbot

Update of /cvs/pkgs/rpms/protobuf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15340

Modified Files:
	protobuf.spec 
Log Message:
added export PTHREAD_LIBS="-lpthread"



Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/F-12/protobuf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- protobuf.spec	18 Sep 2009 12:56:32 -0000	1.8
+++ protobuf.spec	30 Sep 2009 13:24:25 -0000	1.9
@@ -13,7 +13,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -178,6 +178,7 @@ rm -rf java/src/test
 %build
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
 mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
+export PTHREAD_LIBS="-lpthread"
 ./autogen.sh
 %configure
 
@@ -316,6 +317,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep 30 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-2
+- added export PTHREAD_LIBS="-lpthread"
+
 * Fri Sep 18 2009 Lev Shamardin <shamardin at gmail.com> - 2.2.0-1
 - Upgraded to upstream protobuf-2.2.0
 - New -lite packages



From somlo at fedoraproject.org  Wed Sep 30 13:35:21 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 30 Sep 2009 13:35:21 +0000 (UTC)
Subject: rpms/argus/devel argus.spec,1.11,1.12
Message-ID: <20090930133521.4D95C11C00E6@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/argus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16841/devel

Modified Files:
	argus.spec 
Log Message:
rebuild devel for libpcap.1.0



Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/devel/argus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- argus.spec	24 Jul 2009 17:03:06 -0000	1.11
+++ argus.spec	30 Sep 2009 13:35:20 -0000	1.12
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Network transaction audit tool
 License: GPLv2+
 Group: Applications/Internet
@@ -123,6 +123,9 @@ fi
 %{_mandir}/man5/ra*
 
 %changelog
+* Wed Sep 30 2009 Gabriel Somlo <somlo at cmu.edu> - 2.0.6.fixes.1-18
+- Rebuilt for libpcap.1.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6.fixes.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Wed Sep 30 13:36:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 13:36:58 +0000 (UTC)
Subject: rpms/control-center/F-12 mirror-crash.patch, NONE,
	1.1 control-center.spec, 1.493, 1.494
Message-ID: <20090930133658.8375511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17088

Modified Files:
	control-center.spec 
Added Files:
	mirror-crash.patch 
Log Message:
Fix a crash in the display capplet


mirror-crash.patch:
 xrandr-capplet.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE mirror-crash.patch ---
--- gnome-control-center-2.28.0/capplets/display/xrandr-capplet.c	2009-08-24 06:54:41.000000000 -0400
+++ hacked/capplets/display/xrandr-capplet.c	2009-09-30 09:29:05.160839814 -0400
@@ -516,6 +516,7 @@
 {
     int i;
     GnomeRRMode **modes;
+    int best_w, best_h;
     const char *current;
 
     clear_combo (app->resolution_combo);
@@ -533,6 +534,8 @@
 
     gtk_widget_set_sensitive (app->resolution_combo, TRUE);
 
+    best_w = 0;
+    best_h = 0;
     for (i = 0; modes[i] != NULL; ++i)
     {
 	int width, height;
@@ -543,12 +546,21 @@
 	add_key (app->resolution_combo,
 		 idle_free (make_resolution_string (width, height)),
 		 width, height, 0, -1);
+
+        if (width * height > best_w * best_h)
+        {
+            best_w = width;
+            best_h = height;
+        }
     }
 
     current = idle_free (make_resolution_string (app->current_output->width, app->current_output->height));
 
     if (!combo_select (app->resolution_combo, current))
-	g_assert_not_reached ();
+    {
+         combo_select (app->resolution_combo,
+                       idle_free (make_resolution_string (best_w, best_h)));
+    }
 }
 
 static void


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- control-center.spec	29 Sep 2009 02:22:33 -0000	1.493
+++ control-center.spec	30 Sep 2009 13:36:58 -0000	1.494
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -58,6 +58,9 @@ Patch47: save-as.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596369
 Patch50: fix-background-tooltips.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=593866
+Patch51: mirror-crash.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -192,6 +195,7 @@ for the GNOME desktop.
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .fix-background-tooltips
+%patch51 -p1 -b .mirror-crash
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -382,6 +386,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-12
+- Fix a crash in the display capplet
+
 * Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
 - Steal translations for "Make Default" from gnome-power-manager
 



From mhlavink at fedoraproject.org  Wed Sep 30 13:37:47 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 30 Sep 2009 13:37:47 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.139,1.140
Message-ID: <20090930133747.0648711C00E6@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17226

Modified Files:
	dovecot.spec 
Log Message:
fix _initddir <-> _initrddir



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- dovecot.spec	29 Sep 2009 15:04:14 -0000	1.139
+++ dovecot.spec	30 Sep 2009 13:37:46 -0000	1.140
@@ -243,8 +243,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name
 
 install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dovecot
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot



From mkasik at fedoraproject.org  Wed Sep 30 13:45:10 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 30 Sep 2009 13:45:10 +0000 (UTC)
Subject: rpms/cups-pk-helper/F-11 job_edit.patch, NONE,
	1.1 cups-pk-helper.spec, 1.9, 1.10
Message-ID: <20090930134510.F2F6E11C01EA@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18752

Modified Files:
	cups-pk-helper.spec 
Added Files:
	job_edit.patch 
Log Message:
* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-4
- Fix policies to check when editing a job.


job_edit.patch:
 cups-pk-helper-mechanism.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE job_edit.patch ---
--- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-09-30 15:03:55.000000000 +0200
+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-09-30 15:06:57.000000000 +0200
@@ -1058,7 +1058,6 @@ cph_mechanism_job_cancel (CphMechanism  
         switch (job_status) {
                 case CPH_JOB_STATUS_OWNED_BY_USER: {
                         if (!_check_polkit_for_action_v (mechanism, context,
-                                                         "job-not-owned-edit",
                                                          "job-edit",
                                                          NULL))
                                 return FALSE;
@@ -1100,7 +1099,6 @@ cph_mechanism_job_restart (CphMechanism 
         switch (job_status) {
                 case CPH_JOB_STATUS_OWNED_BY_USER: {
                         if (!_check_polkit_for_action_v (mechanism, context,
-                                                         "job-not-owned-edit",
                                                          "job-edit",
                                                          NULL))
                                 return FALSE;
@@ -1143,7 +1141,6 @@ cph_mechanism_job_set_hold_until (CphMec
         switch (job_status) {
                 case CPH_JOB_STATUS_OWNED_BY_USER: {
                         if (!_check_polkit_for_action_v (mechanism, context,
-                                                         "job-not-owned-edit",
                                                          "job-edit",
                                                          NULL))
                                 return FALSE;


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-11/cups-pk-helper.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cups-pk-helper.spec	13 Aug 2009 14:02:51 -0000	1.9
+++ cups-pk-helper.spec	30 Sep 2009 13:45:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://www.vuntz.net/dow
 Source0:        http://www.vuntz.net/download/cups-pk-helper/cups-pk-helper-%{version}.tar.bz2
 
 Patch0:         get_devices.patch
+Patch1:         job_edit.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,6 +37,7 @@ interfaces available under control of Po
 %setup -q
 
 %patch0 -p1 -b .get-devices
+%patch1 -p1 -b .job-edit
 
 %build
 %configure
@@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-4
+- Fix policies to check when editing a job.
+
 * Thu Aug 13 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-3
 - Add parameters to DevicesGet method.
 



From mhlavink at fedoraproject.org  Wed Sep 30 13:46:44 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 30 Sep 2009 13:46:44 +0000 (UTC)
Subject: rpms/dovecot/F-12 dovecot.spec,1.138,1.139
Message-ID: <20090930134644.CC53411C00E6@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19340

Modified Files:
	dovecot.spec 
Log Message:
build with libcap enabled



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- dovecot.spec	17 Sep 2009 15:08:17 -0000	1.138
+++ dovecot.spec	30 Sep 2009 13:46:44 -0000	1.139
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -39,7 +39,7 @@ Patch2: dovecot-1.0.beta2-mkcert-permiss
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, pam-devel, zlib-devel
+BuildRequires: openssl-devel, pam-devel, zlib-devel, libcap-devel
 BuildRequires: libtool autoconf automake
 
 # gettext-devel is needed for running autoconf because of the
@@ -184,6 +184,7 @@ autoreconf -i -f
     INSTALL_DATA="install -c -p -m644" \
     --enable-header-install      \
     --disable-static             \
+    --with-libcap                \
 %if %{build_postgres}
     --with-pgsql                 \
 %endif
@@ -242,8 +243,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name
 
 install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dovecot
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot
@@ -434,6 +435,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-2
+- build with libcap enabled
+
 * Thu Sep 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-1
 - updated to dovecot 1.2.5
 - Authentication: DIGEST-MD5 and RPA mechanisms no longer require



From pkgdb at fedoraproject.org  Wed Sep 30 13:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:59:24 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930135924.1A63810F875@bastion2.fedora.phx.redhat.com>

Package argus in Fedora devel was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 13:59:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:59:46 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930135946.A15A710F875@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 10 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 13:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:59:48 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930135948.AD02C10F88B@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 11 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 13:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:59:51 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930135953.07A0C10F895@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 12 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 13:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:59:57 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930135957.85A8110F857@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 9 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 13:59:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 13:59:59 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930135959.82A7510F88B@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 8 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 14:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:00:02 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930140002.3158110F857@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 6 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 14:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:00:04 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930140004.B8DFF10F88C@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 5 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Wed Sep 30 14:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:00:06 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20090930140006.E42EE10F857@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 4 was orphaned by somlo

To make changes to this package see:
  /pkgdb/packages/name/argus



From caolanm at fedoraproject.org  Wed Sep 30 14:02:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 30 Sep 2009 14:02:41 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, NONE,
	1.1 openoffice.org.spec, 1.2013, 1.2014
Message-ID: <20090930140241.145BC11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21458/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 
Log Message:
Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges

openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch:
 psprint/source/fontsubset/gsub.cxx |   10 ++++++++--
 vcl/source/glyphs/gcach_ftyp.cxx   |   11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch ---
diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2009-09-30 09:56:24.000000000 +0100
+++ vcl/source/glyphs/gcach_ftyp.cxx	2009-09-30 14:27:39.000000000 +0100
@@ -2509,10 +2509,17 @@
                         {
                             const USHORT nGlyph0 = GetUShort( pCoverage+0 );
                             const USHORT nGlyph1 = GetUShort( pCoverage+2 );
-                            const USHORT nCovIdx = GetUShort( pCoverage+4 );
+                            const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
                             pCoverage += 6;
                             for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                                aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                            {
+                                //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                                //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                                //e.g. http://qa.openoffice.org/issues/show_bug.cgi?id=92671
+                                DBG_ASSERT(aSubstVector.size() == nStartCoverageIndex + j - nGlyph0, "coverage index mismatch");
+                                (void)nStartCoverageIndex;
+                                aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                            }
                         }
                     }
                     break;
diff -ru psprint.orig/source/fontsubset/gsub.cxx psprint/source/fontsubset/gsub.cxx
--- psprint.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
+++ psprint/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
@@ -282,9 +282,15 @@
                     {
                         const USHORT nGlyph0 = NEXT_UShort( pCoverage );
                         const USHORT nGlyph1 = NEXT_UShort( pCoverage );
-                        const USHORT nCovIdx = NEXT_UShort( pCoverage );
+                        const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
                         for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                            aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                        {
+                            //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                            //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                            //e.g. #i92671#
+                            (void)nStartCoverageIndex;
+                            aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                        }
                     }
                 }
                 break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -p -r1.2013 -r1.2014
--- openoffice.org.spec	23 Sep 2009 15:43:06 -0000	1.2013
+++ openoffice.org.spec	30 Sep 2009 14:02:40 -0000	1.2014
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -161,6 +161,7 @@ Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch87: workspace.aw073.patch
+Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1708,6 +1709,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch87 -p0 -b .workspace.aw073.patch
+%patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4241,6 +4243,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
+- Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
+
 * Wed Sep 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
 - Resolves: rhbz#522839 crash on exit after loading .doc (caolanm)
 



From caolanm at fedoraproject.org  Wed Sep 30 14:02:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 30 Sep 2009 14:02:41 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, NONE,
	1.1 openoffice.org.spec, 1.2013, 1.2014
Message-ID: <20090930140241.AAF0411C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21458/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 
Log Message:
Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges

openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch:
 psprint/source/fontsubset/gsub.cxx |   10 ++++++++--
 vcl/source/glyphs/gcach_ftyp.cxx   |   11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch ---
diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2009-09-30 09:56:24.000000000 +0100
+++ vcl/source/glyphs/gcach_ftyp.cxx	2009-09-30 14:27:39.000000000 +0100
@@ -2509,10 +2509,17 @@
                         {
                             const USHORT nGlyph0 = GetUShort( pCoverage+0 );
                             const USHORT nGlyph1 = GetUShort( pCoverage+2 );
-                            const USHORT nCovIdx = GetUShort( pCoverage+4 );
+                            const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
                             pCoverage += 6;
                             for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                                aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                            {
+                                //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                                //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                                //e.g. http://qa.openoffice.org/issues/show_bug.cgi?id=92671
+                                DBG_ASSERT(aSubstVector.size() == nStartCoverageIndex + j - nGlyph0, "coverage index mismatch");
+                                (void)nStartCoverageIndex;
+                                aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                            }
                         }
                     }
                     break;
diff -ru psprint.orig/source/fontsubset/gsub.cxx psprint/source/fontsubset/gsub.cxx
--- psprint.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
+++ psprint/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
@@ -282,9 +282,15 @@
                     {
                         const USHORT nGlyph0 = NEXT_UShort( pCoverage );
                         const USHORT nGlyph1 = NEXT_UShort( pCoverage );
-                        const USHORT nCovIdx = NEXT_UShort( pCoverage );
+                        const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
                         for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                            aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                        {
+                            //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                            //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                            //e.g. #i92671#
+                            (void)nStartCoverageIndex;
+                            aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                        }
                     }
                 }
                 break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -p -r1.2013 -r1.2014
--- openoffice.org.spec	23 Sep 2009 15:43:06 -0000	1.2013
+++ openoffice.org.spec	30 Sep 2009 14:02:41 -0000	1.2014
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -161,6 +161,7 @@ Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch87: workspace.aw073.patch
+Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1708,6 +1709,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch87 -p0 -b .workspace.aw073.patch
+%patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4241,6 +4243,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
+- Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
+
 * Wed Sep 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
 - Resolves: rhbz#522839 crash on exit after loading .doc (caolanm)
 



From mkasik at fedoraproject.org  Wed Sep 30 14:10:01 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 30 Sep 2009 14:10:01 +0000 (UTC)
Subject: rpms/cups-pk-helper/F-11 cups-pk-helper-ppd-name.patch, NONE,
	1.1 cups-pk-helper.spec, 1.10, 1.11
Message-ID: <20090930141002.16ADD11C00E6@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717

Modified Files:
	cups-pk-helper.spec 
Added Files:
	cups-pk-helper-ppd-name.patch 
Log Message:
* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
- Fix adding of printers without specification of device-uri.
- Patch by Tim Waugh.
- Resolves: #526442


cups-pk-helper-ppd-name.patch:
 cups.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE cups-pk-helper-ppd-name.patch ---
--- cups-pk-helper-0.0.4/src/cups.c	2009-09-30 15:51:20.000000000 +0200
+++ cups-pk-helper-0.0.4/src/cups.c	2009-09-30 15:53:03.000000000 +0200
@@ -2,8 +2,9 @@
  * vim: set et ts=8 sw=8:
  *
  * Copyright (C) 2008 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
  *
- * Authors: Vincent Untz
+ * Authors: Vincent Untz, Tim Waugh
  *
  * 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
@@ -997,11 +998,13 @@ cph_cups_printer_add (CphCups    *cups,
 
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "printer-name", NULL, printer_name);
-        ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
-                      "device-uri", NULL, printer_uri);
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "ppd-name", NULL, ppd_file);
 
+        if (printer_uri && printer_uri[0] != '\0') {
+                ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
+                              "device-uri", NULL, printer_uri);
+        }
         if (info && info[0] != '\0') {
                 ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
                               "printer-info", NULL, info);


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-11/cups-pk-helper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cups-pk-helper.spec	30 Sep 2009 13:45:10 -0000	1.10
+++ cups-pk-helper.spec	30 Sep 2009 14:10:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        http://www.vuntz.net/dow
 
 Patch0:         get_devices.patch
 Patch1:         job_edit.patch
+Patch2:         cups-pk-helper-ppd-name.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,6 +39,7 @@ interfaces available under control of Po
 
 %patch0 -p1 -b .get-devices
 %patch1 -p1 -b .job-edit
+%patch2 -p1 -b .ppd-name
 
 %build
 %configure
@@ -64,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
+- Fix adding of printers without specification of device-uri.
+- Patch by Tim Waugh.
+- Resolves: #526442
+
 * Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-4
 - Fix policies to check when editing a job.
 



From markmc at fedoraproject.org  Wed Sep 30 14:20:16 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 30 Sep 2009 14:20:16 +0000 (UTC)
Subject: rpms/libvirt/F-11
	libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch, 
	NONE, 1.1 libvirt-0.6.2-refactor-qemu-version-parsing.patch,
	NONE, 1.1 libvirt-0.6.2-svirt-sound.patch, 1.4, 1.5 libvirt.spec,
	1.141, 1.142
Message-ID: <20090930142016.E88E911C048A@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25702

Modified Files:
	libvirt-0.6.2-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch 
	libvirt-0.6.2-refactor-qemu-version-parsing.patch 
Log Message:
* Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-18
- Fix qemu-kvm version detection so GSO is enabled for virtio_net (#526472)


libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch:
 qemu_conf.c |   45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

--- NEW FILE libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch ---
>From fe3cb2edefceacc76d0dc9c98b8d3b677a495c32 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 11 Jun 2009 14:15:49 +0000
Subject: [PATCH] Detect newer qemu-kvm versions

The KVM version string can be one of the following:

  - qemu-kvm-x.y.z in stable releases
  - kvm-XX for kvm versions up to kvm-85
  - qemu-kvm-devel-XX for kvm version kvm-86 and later

There are only a few of places where we need to detect
differences between KVM versions based on 0.9.1:

  1) VNET_HDR introduced in kvm-74

  2) -incoming tcp introduced in kvm-79

  3) -incoming exec introduced in kvm-80

  4) -incoming stdio in all earlier kvm versions

With qemu-kvm-0.10.x, we can now assume that (1) is available
if it's a KVM release, (2) and (3) is always available and
(4) is never available.

So, from now on we should only need to check the qemu version
number and the "is_kvm" flag for detecting feature availability.
We only need the KVM version number for older releases.

(cherry picked from commit 04cbe687974b3b46c96fa20180bbb07ffeff69da)

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch
---
 src/qemu_conf.c |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index e488d74..d76b2b6 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -416,6 +416,7 @@ virCapsPtr qemudCapsInit(void) {
 
 static unsigned int qemudComputeCmdFlags(const char *help,
                                          unsigned int version,
+                                         unsigned int is_kvm,
                                          unsigned int kvm_version)
 {
     unsigned int flags = 0;
@@ -441,7 +442,8 @@ static unsigned int qemudComputeCmdFlags(const char *help,
         flags |= QEMUD_CMD_FLAG_DRIVE_BOOT;
     if (version >= 9000)
         flags |= QEMUD_CMD_FLAG_VNC_COLON;
-    if (kvm_version >= 74)
+
+    if (is_kvm && (version >= 10000 || kvm_version >= 74))
         flags |= QEMUD_CMD_FLAG_VNET_HDR;
 
     /*
@@ -454,15 +456,15 @@ static unsigned int qemudComputeCmdFlags(const char *help,
      * was broken, because it blocked the monitor console
      * while waiting for data, so pretend it doesn't exist
      */
-    if (kvm_version >= 79) {
+    if (version >= 10000) {
+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
+    } else if (kvm_version >= 79) {
         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
         if (kvm_version >= 80)
             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
     } else if (kvm_version > 0) {
         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
-    } else if (version >= 10000) {
-        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
     }
 
     return flags;
@@ -472,10 +474,19 @@ static unsigned int qemudComputeCmdFlags(const char *help,
  * version number. The first bit is easy, just parse
  * 'QEMU PC emulator version x.y.z'.
  *
- * With qemu-kvm, however, that is followed by a kvm-XX
- * string in parenthesis.
+ * With qemu-kvm, however, that is followed by a string
+ * in parenthesis as follows:
+ *  - qemu-kvm-x.y.z in stable releases
+ *  - kvm-XX for kvm versions up to kvm-85
+ *  - qemu-kvm-devel-XX for kvm version kvm-86 and later
+ *
+ * For qemu-kvm versions before 0.10.z, we need to detect
+ * the KVM version number for some features. With 0.10.z
+ * and later, we just need the QEMU version number and
+ * whether it is KVM QEMU or mainline QEMU.
  */
 #define QEMU_VERSION_STR    "QEMU PC emulator version"
+#define QEMU_KVM_VER_PREFIX "(qemu-kvm-"
 #define KVM_VER_PREFIX      "(kvm-"
 
 #define SKIP_BLANKS(p) do { while ((*(p) == ' ') || (*(p) == '\t')) (p)++; } while (0)
@@ -483,12 +494,13 @@ static unsigned int qemudComputeCmdFlags(const char *help,
 static int qemudParseHelpStr(const char *help,
                              unsigned int *flags,
                              unsigned int *version,
+                             unsigned int *is_kvm,
                              unsigned int *kvm_version)
 {
     unsigned major, minor, micro;
     const char *p = help;
 
-    *flags = *version = *kvm_version = 0;
+    *flags = *version = *is_kvm = *kvm_version = 0;
 
     if (!STRPREFIX(p, QEMU_VERSION_STR))
         goto fail;
@@ -515,9 +527,13 @@ static int qemudParseHelpStr(const char *help,
 
     SKIP_BLANKS(p);
 
-    if (STRPREFIX(p, KVM_VER_PREFIX)) {
+    if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) {
+        *is_kvm = 1;
+        p += strlen(QEMU_KVM_VER_PREFIX);
+    } else if (STRPREFIX(p, KVM_VER_PREFIX)) {
         int ret;
 
+        *is_kvm = 1;
         p += strlen(KVM_VER_PREFIX);
 
         ret = virParseNumber(&p);
@@ -529,12 +545,14 @@ static int qemudParseHelpStr(const char *help,
 
     *version = (major * 1000 * 1000) + (minor * 1000) + micro;
 
-    *flags = qemudComputeCmdFlags(help, *version, *kvm_version);
+    *flags = qemudComputeCmdFlags(help, *version, *is_kvm, *kvm_version);
 
     qemudDebug("Version %u.%u.%u, cooked version %u, flags %u",
                major, minor, micro, *version, *flags);
     if (*kvm_version)
-        qemudDebug("KVM version %u detected", *kvm_version);
+        qemudDebug("KVM version %d detected", *kvm_version);
+    else if (*is_kvm)
+        qemudDebug("qemu-kvm version %u.%u.%u detected", major, minor, micro);
 
     return 0;
 
@@ -560,7 +578,7 @@ int qemudExtractVersionInfo(const char *qemu,
     pid_t child;
     int newstdout = -1;
     int ret = -1, status;
-    unsigned int version, kvm_version;
+    unsigned int version, is_kvm, kvm_version;
     unsigned int flags = 0;
 
     if (retflags)
@@ -581,7 +599,7 @@ int qemudExtractVersionInfo(const char *qemu,
         goto cleanup2;
     }
 
-    if (qemudParseHelpStr(help, &flags, &version, &kvm_version) == -1)
+    if (qemudParseHelpStr(help, &flags, &version, &is_kvm, &kvm_version) == -1)
         goto cleanup2;
 
     if (retversion)
-- 
1.6.2.5


libvirt-0.6.2-refactor-qemu-version-parsing.patch:
 qemu_conf.c |  175 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 123 insertions(+), 52 deletions(-)

--- NEW FILE libvirt-0.6.2-refactor-qemu-version-parsing.patch ---
>From 266df161bfd87220bac68918613a2ce9323c8238 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 11 Jun 2009 14:12:30 +0000
Subject: [PATCH] Re-factor qemu version parsing

This patch is purely re-factoring without any functional changes
to make way for the next patch.

The main thing achieved by the refactoring is that we now have
easier access to the parenthesised string that KVM folks seem
to delight in changing.

(cherry picked from commit 56ecebf22dd5a235503028e20bf936229037664b)

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: libvirt-0.6.2-refactor-qemu-version-parsing.patch
---
 src/qemu_conf.c |  174 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 123 insertions(+), 51 deletions(-)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 1194e36..e488d74 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -414,54 +414,12 @@ virCapsPtr qemudCapsInit(void) {
     return NULL;
 }
 
-
-int qemudExtractVersionInfo(const char *qemu,
-                            unsigned int *retversion,
-                            unsigned int *retflags) {
-    const char *const qemuarg[] = { qemu, "-help", NULL };
-    const char *const qemuenv[] = { "LC_ALL=C", NULL };
-    pid_t child;
-    int newstdout = -1;
-    int ret = -1, status;
-    unsigned int major, minor, micro;
-    unsigned int version, kvm_version;
+static unsigned int qemudComputeCmdFlags(const char *help,
+                                         unsigned int version,
+                                         unsigned int kvm_version)
+{
     unsigned int flags = 0;
 
-    if (retflags)
-        *retflags = 0;
-    if (retversion)
-        *retversion = 0;
-
-    if (virExec(NULL, qemuarg, qemuenv, NULL,
-                &child, -1, &newstdout, NULL, VIR_EXEC_NONE) < 0)
-        return -1;
-
-    char *help = NULL;
-    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
-    int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
-    if (len < 0) {
-        virReportSystemError(NULL, errno, "%s",
-                             _("Unable to read QEMU help output"));
-        goto cleanup2;
-    }
-
-    if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)",
-               &major, &minor, &micro, &kvm_version) != 4)
-        kvm_version = 0;
-
-    if (!kvm_version &&
-        sscanf(help, "QEMU PC emulator version %u.%u.%u",
-               &major, &minor, &micro) != 3) {
-        char *eol = strchr(help, '\n');
-        if (eol) *eol = '\0';
-        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                         _("cannot parse QEMU version number in '%s'"),
-                         help);
-        goto cleanup2;
-    }
-
-    version = (major * 1000 * 1000) + (minor * 1000) + micro;
-
     if (strstr(help, "-no-kqemu"))
         flags |= QEMUD_CMD_FLAG_KQEMU;
     if (strstr(help, "-no-kvm"))
@@ -507,6 +465,125 @@ int qemudExtractVersionInfo(const char *qemu,
         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
     }
 
+    return flags;
+}
+
+/* We parse the output of 'qemu -help' to get the QEMU
+ * version number. The first bit is easy, just parse
+ * 'QEMU PC emulator version x.y.z'.
+ *
+ * With qemu-kvm, however, that is followed by a kvm-XX
+ * string in parenthesis.
+ */
+#define QEMU_VERSION_STR    "QEMU PC emulator version"
+#define KVM_VER_PREFIX      "(kvm-"
+
+#define SKIP_BLANKS(p) do { while ((*(p) == ' ') || (*(p) == '\t')) (p)++; } while (0)
+
+static int qemudParseHelpStr(const char *help,
+                             unsigned int *flags,
+                             unsigned int *version,
+                             unsigned int *kvm_version)
+{
+    unsigned major, minor, micro;
+    const char *p = help;
+
+    *flags = *version = *kvm_version = 0;
+
+    if (!STRPREFIX(p, QEMU_VERSION_STR))
+        goto fail;
+
+    p += strlen(QEMU_VERSION_STR);
+
+    SKIP_BLANKS(p);
+
+    major = virParseNumber(&p);
+    if (major == -1 || *p != '.')
+        goto fail;
+
+    ++p;
+
+    minor = virParseNumber(&p);
+    if (major == -1 || *p != '.')
+        goto fail;
+
+    ++p;
+
+    micro = virParseNumber(&p);
+    if (major == -1)
+        goto fail;
+
+    SKIP_BLANKS(p);
+
+    if (STRPREFIX(p, KVM_VER_PREFIX)) {
+        int ret;
+
+        p += strlen(KVM_VER_PREFIX);
+
+        ret = virParseNumber(&p);
+        if (ret == -1)
+            goto fail;
+
+        *kvm_version = ret;
+    }
+
+    *version = (major * 1000 * 1000) + (minor * 1000) + micro;
+
+    *flags = qemudComputeCmdFlags(help, *version, *kvm_version);
+
+    qemudDebug("Version %u.%u.%u, cooked version %u, flags %u",
+               major, minor, micro, *version, *flags);
+    if (*kvm_version)
+        qemudDebug("KVM version %u detected", *kvm_version);
+
+    return 0;
+
+fail:
+    p = strchr(help, '\n');
+    if (p)
+        p = strndup(help, p - help);
+
+    qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                     _("cannot parse QEMU version number in '%s'"),
+                     p ? p : help);
+
+    VIR_FREE(p);
+
+    return -1;
+}
+
+int qemudExtractVersionInfo(const char *qemu,
+                            unsigned int *retversion,
+                            unsigned int *retflags) {
+    const char *const qemuarg[] = { qemu, "-help", NULL };
+    const char *const qemuenv[] = { "LC_ALL=C", NULL };
+    pid_t child;
+    int newstdout = -1;
+    int ret = -1, status;
+    unsigned int version, kvm_version;
+    unsigned int flags = 0;
+
+    if (retflags)
+        *retflags = 0;
+    if (retversion)
+        *retversion = 0;
+
+    if (virExec(NULL, qemuarg, qemuenv, NULL,
+                &child, -1, &newstdout, NULL, VIR_EXEC_NONE) < 0)
+        return -1;
+
+    char *help = NULL;
+    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
+    int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
+    if (len < 0) {
+        virReportSystemError(NULL, errno, "%s",
+                             _("Unable to read QEMU help output"));
+        goto cleanup2;
+    }
+
+    if (qemudParseHelpStr(help, &flags, &version, &kvm_version) == -1)
+        goto cleanup2;
+
     if (retversion)
         *retversion = version;
     if (retflags)
@@ -514,11 +591,6 @@ int qemudExtractVersionInfo(const char *qemu,
 
     ret = 0;
 
-    qemudDebug("Version %d %d %d  Cooked version: %d, with flags ? %d",
-               major, minor, micro, version, flags);
-    if (kvm_version)
-        qemudDebug("KVM version %d detected", kvm_version);
-
 cleanup2:
     VIR_FREE(help);
     if (close(newstdout) < 0)
-- 
1.6.2.5


libvirt-0.6.2-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.2-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-svirt-sound.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libvirt-0.6.2-svirt-sound.patch	19 Aug 2009 17:08:59 -0000	1.4
+++ libvirt-0.6.2-svirt-sound.patch	30 Sep 2009 14:20:16 -0000	1.5
@@ -1,4 +1,4 @@
-From 0d72b6fb7d4aa5e55294eb3222e7156d3d75a9e7 Mon Sep 17 00:00:00 2001
+From 6096cb19d6b05707ca32f52b905c53818ecfc84b Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 17 Aug 2009 08:52:30 +0100
 Subject: [PATCH] Disable sound cards when running sVirt
@@ -12,10 +12,10 @@ Fedora-patch: libvirt-0.6.2-svirt-sound.
  1 files changed, 16 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 1194e36..f42aeaa 100644
+index d76b2b6..22c5363 100644
 --- a/src/qemu_conf.c
 +++ b/src/qemu_conf.c
-@@ -795,6 +795,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
+@@ -885,6 +885,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
      char domid[50];
      char *pidfile;
      const char *cpu = NULL;
@@ -36,7 +36,7 @@ index 1194e36..f42aeaa 100644
  
      uname_normalize(&ut);
  
-@@ -1441,7 +1455,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
+@@ -1531,7 +1545,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
      }
  
      /* Add sound hardware */


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- libvirt.spec	21 Aug 2009 10:20:12 -0000	1.141
+++ libvirt.spec	30 Sep 2009 14:20:16 -0000	1.142
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 17%{?dist}%{?extra_release}
+Release: 18%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -134,6 +134,9 @@ Patch29: libvirt-allow-pci-hostdev-reset
 Patch30: libvirt-fix-migration-completion-with-newer-qemu.patch
 # Fix dumpxml segfault with newer versions of Xen (#518091)
 Patch31: libvirt-fix-xen-driver-segfault-with-newer-xen.patch
+# Fix qemu-kvm version detection so GSO is enabled
+Patch32: libvirt-0.6.2-refactor-qemu-version-parsing.patch
+Patch33: libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -317,6 +320,8 @@ of recent versions of Linux (and other O
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
+%patch33 -p1
 
 %patch200 -p1
 
@@ -640,6 +645,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-18
+- Fix qemu-kvm version detection so GSO is enabled for virtio_net (#526472)
+
 * Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-17
 - Fix migration completion with newer versions of qemu (#516187)
 - Fix dumpxml segfault with newer versions of Xen (#518091)



From rmeggins at fedoraproject.org  Wed Sep 30 14:29:29 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 30 Sep 2009 14:29:29 +0000 (UTC)
Subject: rpms/389-console/F-10 389-console.spec,1.2,1.3
Message-ID: <20090930142929.31AA811C00E6@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821/F-10

Modified Files:
	389-console.spec 
Log Message:
Resolves: bug 521523
Description: RPM Dependencies for 389 console are incomplete
Fix: Add the "which" package to the Requires



Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-10/389-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-console.spec	12 Aug 2009 20:03:47 -0000	1.2
+++ 389-console.spec	30 Sep 2009 14:29:28 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -13,12 +13,13 @@ URL: http://port389.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
-Requires: idm-console-framework >= 1.1
+Requires: idm-console-framework
 Requires: java >= 1:1.6.0
-BuildRequires: ant >= 1.6.2
+Requires: which
+BuildRequires: ant
 BuildRequires: ldapjdk
-BuildRequires: jss >=  4.2
-BuildRequires: idm-console-framework >= 1.1
+BuildRequires: jss
+BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-4
+- bug 521523 - add the "which" package to the Requires
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-3
 - final rebuild for 1.1.3 release
 



From rmeggins at fedoraproject.org  Wed Sep 30 14:29:29 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 30 Sep 2009 14:29:29 +0000 (UTC)
Subject: rpms/389-console/devel 389-console.spec,1.3,1.4
Message-ID: <20090930142929.9453711C00E6@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821/devel

Modified Files:
	389-console.spec 
Log Message:
Resolves: bug 521523
Description: RPM Dependencies for 389 console are incomplete
Fix: Add the "which" package to the Requires



Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/devel/389-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-console.spec	12 Aug 2009 20:03:47 -0000	1.3
+++ 389-console.spec	30 Sep 2009 14:29:29 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -13,12 +13,13 @@ URL: http://port389.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
-Requires: idm-console-framework >= 1.1
+Requires: idm-console-framework
 Requires: java >= 1:1.6.0
-BuildRequires: ant >= 1.6.2
+Requires: which
+BuildRequires: ant
 BuildRequires: ldapjdk
-BuildRequires: jss >=  4.2
-BuildRequires: idm-console-framework >= 1.1
+BuildRequires: jss
+BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-5
+- bug 521523 - add the "which" package to the Requires
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-4
 - final rebuild for 1.1.3 release
 



From rmeggins at fedoraproject.org  Wed Sep 30 14:29:29 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 30 Sep 2009 14:29:29 +0000 (UTC)
Subject: rpms/389-console/F-11 389-console.spec,1.2,1.3
Message-ID: <20090930142929.45D1011C00EC@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821/F-11

Modified Files:
	389-console.spec 
Log Message:
Resolves: bug 521523
Description: RPM Dependencies for 389 console are incomplete
Fix: Add the "which" package to the Requires



Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-11/389-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-console.spec	12 Aug 2009 20:03:47 -0000	1.2
+++ 389-console.spec	30 Sep 2009 14:29:29 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -13,12 +13,13 @@ URL: http://port389.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
-Requires: idm-console-framework >= 1.1
+Requires: idm-console-framework
 Requires: java >= 1:1.6.0
-BuildRequires: ant >= 1.6.2
+Requires: which
+BuildRequires: ant
 BuildRequires: ldapjdk
-BuildRequires: jss >=  4.2
-BuildRequires: idm-console-framework >= 1.1
+BuildRequires: jss
+BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-4
+- bug 521523 - add the "which" package to the Requires
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-3
 - final rebuild for 1.1.3 release
 



From rmeggins at fedoraproject.org  Wed Sep 30 14:29:29 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 30 Sep 2009 14:29:29 +0000 (UTC)
Subject: rpms/389-console/F-12 389-console.spec,1.3,1.4
Message-ID: <20090930142929.6BB3B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821/F-12

Modified Files:
	389-console.spec 
Log Message:
Resolves: bug 521523
Description: RPM Dependencies for 389 console are incomplete
Fix: Add the "which" package to the Requires



Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-12/389-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-console.spec	12 Aug 2009 20:03:47 -0000	1.3
+++ 389-console.spec	30 Sep 2009 14:29:29 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -13,12 +13,13 @@ URL: http://port389.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
-Requires: idm-console-framework >= 1.1
+Requires: idm-console-framework
 Requires: java >= 1:1.6.0
-BuildRequires: ant >= 1.6.2
+Requires: which
+BuildRequires: ant
 BuildRequires: ldapjdk
-BuildRequires: jss >=  4.2
-BuildRequires: idm-console-framework >= 1.1
+BuildRequires: jss
+BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-5
+- bug 521523 - add the "which" package to the Requires
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-4
 - final rebuild for 1.1.3 release
 



From giallu at fedoraproject.org  Wed Sep 30 14:32:14 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Wed, 30 Sep 2009 14:32:14 +0000 (UTC)
Subject: rpms/gpointing-device-settings/F-11
	gpds-1.3.1-fix_typos_bug_596015.patch, NONE,
	1.1 gpds-1.3.1-pkgconfig.patch, NONE,
	1.1 gpointing-device-settings.desktop, NONE,
	1.1 gpointing-device-settings.spec, NONE, 1.1 touchpad.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930143214.7B73411C00E6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/gpointing-device-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27192

Modified Files:
	.cvsignore sources 
Added Files:
	gpds-1.3.1-fix_typos_bug_596015.patch 
	gpds-1.3.1-pkgconfig.patch gpointing-device-settings.desktop 
	gpointing-device-settings.spec touchpad.png 
Log Message:
Initial import


gpds-1.3.1-fix_typos_bug_596015.patch:
 gpds-mouse-definitions.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gpds-1.3.1-fix_typos_bug_596015.patch ---
>From d39cf65fceb7abb4c5db241bb261f4e0f9eeb8a8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 27 Sep 2009 01:40:37 +0000
Subject: Fix typos. Fixes for bug 596015.

---
diff --git a/modules/common/gpds-mouse-definitions.h b/modules/common/gpds-mouse-definitions.h
index a78771d..1b2039d 100644
--- a/modules/common/gpds-mouse-definitions.h
+++ b/modules/common/gpds-mouse-definitions.h
@@ -22,9 +22,9 @@
 
 #define GPDS_MOUSE_GCONF_DIR                   "/desktop/gnome/peripherals"
 #define GPDS_MOUSE_MIDDLE_BUTTON_EMULATION_KEY "middle_button_emulation"
-#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeoue"
+#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeout"
 #define GPDS_MOUSE_WHEEL_EMULATION_KEY         "wheel_emulation"
-#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inetia"
+#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inertia"
 #define GPDS_MOUSE_WHEEL_EMULATION_X_AXIS_KEY  "wheel_emulation_x_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_Y_AXIS_KEY  "wheel_emulation_y_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT_KEY "wheel_emulation_timeout"
--
cgit v0.8.2


gpds-1.3.1-pkgconfig.patch:
 libgpointing-device-settings.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpds-1.3.1-pkgconfig.patch ---
diff --git a/libgpointing-device-settings.pc.in b/libgpointing-device-settings.pc.in
index 8fda90e..900beaa 100644
--- a/libgpointing-device-settings.pc.in
+++ b/libgpointing-device-settings.pc.in
@@ -12,5 +12,5 @@ Name: LibGPointingDeviceSettings
 Description: Library to create dynamic module of UI for pointing device settings
 Version: @VERSION@
 Requires: gtk+-2.0 >= @GTK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@
-Libs: -L${libdir} -lgpointing-device-settings
+Libs: -L${libdir} -lgpds
 Cflags: -I${includedir}/gpointing-device-settings


--- NEW FILE gpointing-device-settings.desktop ---
[Desktop Entry]
Name=Pointing Devices
Comment=Set your pointing device preferences
Exec=gpointing-device-settings
Icon=touchpad
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;Settings;
OnlyShowIn=GNOME;


--- NEW FILE gpointing-device-settings.spec ---
Name:           gpointing-device-settings
Version:        1.3.1
Release:        5%{?dist}
Summary:        Configuration tool for pointing devices

Group:          Applications/System
License:        LGPLv3+
URL:            http://live.gnome.org/GPointingDeviceSettings
Source0:        http://dl.sourceforge.jp/gsynaptics/38468/gpointing-device-settings-1.3.1.tar.gz
Source1:        gpointing-device-settings.desktop
Source2:        touchpad.png

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext, intltool
BuildRequires:  GConf2-devel
BuildRequires:  libXi-devel
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils

Requires:       gnome-settings-daemon
Requires(pre):  GConf2
Requires(post): GConf2
Requires(preun):GConf2

# Obsoletes gsynaptics, to be removed in F14
Obsoletes:      gsynaptics < 0.9.17
Provides:       gsynaptics = %{version}-%{release}

# Reported upstream https://bugzilla.gnome.org/show_bug.cgi?id=596835
Patch0:         gpds-1.3.1-pkgconfig.patch
# Fixed upstream https://bugzilla.gnome.org/show_bug.cgi?id=596015
Patch1:         gpds-1.3.1-fix_typos_bug_596015.patch


%description
GUI tool for setting pointing device such as TrackPoint or Touchpad. It
allows configuring of various drivers parameters on the fly.
It is a successor of GSynaptics.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtk2-devel, GConf2-devel, libXi-devel
Requires:       pkgconfig

%description devel
Development headers and libraries for %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .typos

%build
%configure \
        --disable-static \
        --disable-schemas-install \
        --disable-dependency-tracking

# https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_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

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

# Remove useless files
find %{buildroot} -name '*.la' -delete

desktop-file-install                                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
%{SOURCE1}

install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/touchpad.png


%clean
rm -rf $RPM_BUILD_ROOT


%post devel -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi

%post 
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
    %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :

%postun -p /sbin/ldconfig

%preun 
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS TODO MAINTAINERS COPYING
%{_sysconfdir}/gconf/schemas/*
%{_bindir}/gpointing-device-settings
%{_libdir}/gnome-settings-daemon-2.0/*
%{_libdir}/gpointing-device-settings/
%{_datadir}/gpointing-device-settings/
%{_datadir}/applications/*
%{_datadir}/pixmaps/touchpad.png
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so


%changelog
* Mon Sep 28 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-5
- Add patch from upstream

* Wed Sep 23 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-4
- fix .desktop validation issues
- add missing icon from gsynaptics

* Sun Sep 20 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-3
- Don't split libgdps until translations are split as well
- Fix .pc library name
- Fix GConf scriptlets according to guidelines snippets
- Fix obsoletes
- Add .desktop file

* Tue Jul 21 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-2
- Require gnome-settings-daemon
- Fix Source0 URL
- Obsoletes gsynaptics

* Wed Jul  1 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:03:05 -0000	1.1
+++ .cvsignore	30 Sep 2009 14:32:14 -0000	1.2
@@ -0,0 +1 @@
+gpointing-device-settings-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:03:05 -0000	1.1
+++ sources	30 Sep 2009 14:32:14 -0000	1.2
@@ -0,0 +1 @@
+2b0a567739fb565364cdca8dfc72545c  gpointing-device-settings-1.3.1.tar.gz



From linville at fedoraproject.org  Wed Sep 30 14:36:57 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 30 Sep 2009 14:36:57 +0000 (UTC)
Subject: rpms/iwl1000-firmware/devel import.log, NONE,
	1.1 iwl1000-firmware.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930143657.1B30D11C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl1000-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28197/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log iwl1000-firmware.spec 
Log Message:
Initial import...


--- NEW FILE import.log ---
iwl1000-firmware-128_50_3_1-1_fc11:HEAD:iwl1000-firmware-128.50.3.1-1.fc11.src.rpm:1254321327


--- NEW FILE iwl1000-firmware.spec ---
Name:           iwl1000-firmware
Version:        128.50.3.1
Release:        1%{?dist}
Summary:        Firmware for Intel? PRO/Wireless 1000 B/G/N network adaptors

Group:          System Environment/Kernel
License:        Redistributable, no modification permitted
URL:            http://intellinuxwireless.org/
Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch


%description
This package contains the firmware required by the iwlagn driver
for Linux to support the iwl1000 hardware.  Usage of the firmware
is subject to the terms and conditions contained inside the provided
LICENSE file. Please read it carefully.

%prep
%setup -c -q

pushd iwlwifi-1000-ucode-%{version}
# Change encoding
sed -i 's/\r//'  LICENSE.iwlwifi-1000-ucode README.iwlwifi-1000-ucode
# Rename docs
mv LICENSE.iwlwifi-1000-ucode ../LICENSE
mv README.iwlwifi-1000-ucode ../README
# Preserve timestamp
touch -r *.ucode ../LICENSE ../README
popd


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
pushd iwlwifi-1000-ucode-%{version}
install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README
/lib/firmware/*.ucode


%changelog
* Wed Sep 16 2009 John W. Linville <linville at tuxdriver.com> - 128.50.3.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iwl1000-firmware/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:16:18 -0000	1.1
+++ .cvsignore	30 Sep 2009 14:36:54 -0000	1.2
@@ -0,0 +1 @@
+iwlwifi-1000-ucode-128.50.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwl1000-firmware/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:16:19 -0000	1.1
+++ sources	30 Sep 2009 14:36:56 -0000	1.2
@@ -0,0 +1 @@
+cfad8d5a7651dde665c5c23e8209c35d  iwlwifi-1000-ucode-128.50.3.1.tgz



From kdudka at fedoraproject.org  Wed Sep 30 14:38:55 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 30 Sep 2009 14:38:55 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.119,1.120
Message-ID: <20090930143855.0882411C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28808

Modified Files:
	curl.spec 
Log Message:
- build libcurl with c-ares support (#514771)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- curl.spec	30 Sep 2009 06:59:52 -0000	1.119
+++ curl.spec	30 Sep 2009 14:38:54 -0000	1.120
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -17,6 +17,7 @@ Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
+BuildRequires: c-ares-devel
 BuildRequires: groff
 BuildRequires: krb5-devel
 BuildRequires: libidn-devel
@@ -92,7 +93,7 @@ autoconf
 %configure --without-ssl --with-nss --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
-	--enable-ldaps --disable-static --with-libssh2 --enable-manual
+	--enable-ldaps --disable-static --with-libssh2 --enable-manual --enable-ares
 sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
 	Makefile libcurl.pc
 # Remove bogus rpath
@@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Sep 30 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-11
+- build libcurl with c-ares support (#514771)
+
 * Sun Sep 27 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-10
 - require libssh2>=1.2 properly (#525002)
 



From mkasik at fedoraproject.org  Wed Sep 30 14:40:55 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 30 Sep 2009 14:40:55 +0000 (UTC)
Subject: rpms/cups-pk-helper/F-12 cups-pk-helper-ppd-name.patch, NONE,
	1.1 cups-pk-helper.spec, 1.13, 1.14
Message-ID: <20090930144055.4A7D411C048B@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29305

Modified Files:
	cups-pk-helper.spec 
Added Files:
	cups-pk-helper-ppd-name.patch 
Log Message:
* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-8
- Fix adding of printers without specification of device-uri.
- Patch by Tim Waugh.
- Resolves: #526442


cups-pk-helper-ppd-name.patch:
 cups.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE cups-pk-helper-ppd-name.patch ---
--- cups-pk-helper-0.0.4/src/cups.c	2009-09-30 10:38:21.895761263 +0100
+++ cups-pk-helper-0.0.4/src/cups.c	2009-09-30 10:44:07.794636125 +0100
@@ -2,8 +2,9 @@
  * vim: set et ts=8 sw=8:
  *
  * Copyright (C) 2008 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
  *
- * Authors: Vincent Untz
+ * Authors: Vincent Untz, Tim Waugh
  *
  * 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
@@ -997,11 +998,13 @@ cph_cups_printer_add (CphCups    *cups,
 
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "printer-name", NULL, printer_name);
-        ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
-                      "device-uri", NULL, printer_uri);
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "ppd-name", NULL, ppd_file);
 
+        if (printer_uri && printer_uri[0] != '\0') {
+                ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
+                              "device-uri", NULL, printer_uri);
+        }
         if (info && info[0] != '\0') {
                 ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
                               "printer-info", NULL, info);


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-12/cups-pk-helper.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cups-pk-helper.spec	18 Aug 2009 17:06:39 -0000	1.13
+++ cups-pk-helper.spec	30 Sep 2009 14:40:54 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -12,6 +12,7 @@ Patch0:         polkit-1.patch
 Patch1:         get_devices.patch
 Patch2:         polkit_result.patch
 Patch3:         edit_job.patch
+Patch4:         cups-pk-helper-ppd-name.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +46,7 @@ interfaces available under control of Po
 %patch1 -p1 -b .get-devices
 %patch2 -p1 -b .polkit-result
 %patch3 -p1 -b .edit-job
+%patch4 -p1 -b .ppd-name
 
 %build
 # Patch0 modifies configure.ac
@@ -74,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-8
+- Fix adding of printers without specification of device-uri.
+- Patch by Tim Waugh.
+- Resolves: #526442
+
 * Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-7
 - Fix policies to check when editing a job.
 



From pkgdb at fedoraproject.org  Wed Sep 30 14:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:44:26 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090930144427.2BB5610F894@bastion2.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on libvirt (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Wed Sep 30 14:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:44:31 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090930144431.9BC8410F8AB@bastion2.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libvirt (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Wed Sep 30 14:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:45:01 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090930144501.9D06C10F875@bastion2.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on libvirt (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Wed Sep 30 14:45:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 14:45:03 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090930144503.C634410F8A8@bastion2.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libvirt (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From linville at fedoraproject.org  Wed Sep 30 14:49:03 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 30 Sep 2009 14:49:03 +0000 (UTC)
Subject: rpms/iwl1000-firmware/F-12 iwl1000-firmware.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930144904.0132D11C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl1000-firmware/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30949

Modified Files:
	.cvsignore sources 
Added Files:
	iwl1000-firmware.spec 
Log Message:
Initial import...


--- NEW FILE iwl1000-firmware.spec ---
Name:           iwl1000-firmware
Version:        128.50.3.1
Release:        1%{?dist}
Summary:        Firmware for Intel? PRO/Wireless 1000 B/G/N network adaptors

Group:          System Environment/Kernel
License:        Redistributable, no modification permitted
URL:            http://intellinuxwireless.org/
Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch


%description
This package contains the firmware required by the iwlagn driver
for Linux to support the iwl1000 hardware.  Usage of the firmware
is subject to the terms and conditions contained inside the provided
LICENSE file. Please read it carefully.

%prep
%setup -c -q

pushd iwlwifi-1000-ucode-%{version}
# Change encoding
sed -i 's/\r//'  LICENSE.iwlwifi-1000-ucode README.iwlwifi-1000-ucode
# Rename docs
mv LICENSE.iwlwifi-1000-ucode ../LICENSE
mv README.iwlwifi-1000-ucode ../README
# Preserve timestamp
touch -r *.ucode ../LICENSE ../README
popd


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
pushd iwlwifi-1000-ucode-%{version}
install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README
/lib/firmware/*.ucode


%changelog
* Wed Sep 16 2009 John W. Linville <linville at tuxdriver.com> - 128.50.3.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iwl1000-firmware/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:16:18 -0000	1.1
+++ .cvsignore	30 Sep 2009 14:49:03 -0000	1.2
@@ -0,0 +1 @@
+iwlwifi-1000-ucode-128.50.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwl1000-firmware/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:16:19 -0000	1.1
+++ sources	30 Sep 2009 14:49:03 -0000	1.2
@@ -0,0 +1 @@
+cfad8d5a7651dde665c5c23e8209c35d  iwlwifi-1000-ucode-128.50.3.1.tgz



From mkasik at fedoraproject.org  Wed Sep 30 14:49:22 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 30 Sep 2009 14:49:22 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel cups-pk-helper-ppd-name.patch, NONE,
	1.1 cups-pk-helper.spec, 1.13, 1.14
Message-ID: <20090930144922.81A7111C00E6@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31110

Modified Files:
	cups-pk-helper.spec 
Added Files:
	cups-pk-helper-ppd-name.patch 
Log Message:
* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-8
- Fix adding of printers without specification of device-uri.
- Patch by Tim Waugh.
- Resolves: #526442


cups-pk-helper-ppd-name.patch:
 cups.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE cups-pk-helper-ppd-name.patch ---
--- cups-pk-helper-0.0.4/src/cups.c	2009-09-30 10:38:21.895761263 +0100
+++ cups-pk-helper-0.0.4/src/cups.c	2009-09-30 10:44:07.794636125 +0100
@@ -2,8 +2,9 @@
  * vim: set et ts=8 sw=8:
  *
  * Copyright (C) 2008 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
  *
- * Authors: Vincent Untz
+ * Authors: Vincent Untz, Tim Waugh
  *
  * 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
@@ -997,11 +998,13 @@ cph_cups_printer_add (CphCups    *cups,
 
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "printer-name", NULL, printer_name);
-        ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
-                      "device-uri", NULL, printer_uri);
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "ppd-name", NULL, ppd_file);
 
+        if (printer_uri && printer_uri[0] != '\0') {
+                ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
+                              "device-uri", NULL, printer_uri);
+        }
         if (info && info[0] != '\0') {
                 ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
                               "printer-info", NULL, info);


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/cups-pk-helper.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cups-pk-helper.spec	18 Aug 2009 17:06:39 -0000	1.13
+++ cups-pk-helper.spec	30 Sep 2009 14:49:22 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -12,6 +12,7 @@ Patch0:         polkit-1.patch
 Patch1:         get_devices.patch
 Patch2:         polkit_result.patch
 Patch3:         edit_job.patch
+Patch4:         cups-pk-helper-ppd-name.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +46,7 @@ interfaces available under control of Po
 %patch1 -p1 -b .get-devices
 %patch2 -p1 -b .polkit-result
 %patch3 -p1 -b .edit-job
+%patch4 -p1 -b .ppd-name
 
 %build
 # Patch0 modifies configure.ac
@@ -74,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-8
+- Fix adding of printers without specification of device-uri.
+- Patch by Tim Waugh.
+- Resolves: #526442
+
 * Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-7
 - Fix policies to check when editing a job.
 



From heffer at fedoraproject.org  Wed Sep 30 14:51:38 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 30 Sep 2009 14:51:38 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel .cvsignore, 1.8,
	1.9 php-ZendFramework.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20090930145138.AE94611C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31402

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
- new upstream version
- new component: Queue
- fixed dangling symlinks
- enabled Db-Adapter-Firebird



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Jul 2009 10:00:09 -0000	1.8
+++ .cvsignore	30 Sep 2009 14:51:38 -0000	1.9
@@ -1 +1 @@
-ZendFramework-1.8.4PL1.tar.gz
+ZendFramework-1.9.3PL1.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- php-ZendFramework.spec	26 Jul 2009 17:58:05 -0000	1.17
+++ php-ZendFramework.spec	30 Sep 2009 14:51:38 -0000	1.18
@@ -3,8 +3,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.8.4
-Release:         3.%{posttag}%{?dist}
+Version:         1.9.3
+Release:         1.%{posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,7 +33,6 @@ Requires: php-pdo
 Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
-BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -62,11 +61,8 @@ Requires: php-pear(pear.phpunit.de/PHPUn
 %if 0%{fedora} > 10
 Requires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
 Requires: bitstream-vera-serif-fonts
-BuildRequires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
-BuildRequires: bitstream-vera-serif-fonts
 %else
 Requires: bitstream-vera-fonts
-BuildRequires: bitstream-vera-fonts
 %endif
 
 %description tests
@@ -168,15 +164,15 @@ MySQL server via mysqli connector.
 # IBM DB2 database.
 
 
-# %package Db-Adapter-Firebird
-# Summary:  Zend Framework database adapter for InterBase
-# Group:    Development/Libraries
-# Requires: %{name} = %{version}-%{release}
-# Requires: php-interbase # Not available in Fedora's PHP
+%package Db-Adapter-Firebird
+Summary:  Zend Framework database adapter for InterBase
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-interbase
 
-# %description Db-Adapter-Firebird
-# This package contains the files for Zend Framework necessary to connect to a
-# Firebird/InterBase database.
+%description Db-Adapter-Firebird
+This package contains the files for Zend Framework necessary to connect to a
+Firebird/InterBase database.
 
 
 # %package Db-Adapter-Oracle
@@ -185,7 +181,7 @@ MySQL server via mysqli connector.
 # Requires: %{name} = %{version}-%{release}
 # Requires: php-oci8 # Not available in Fedora's PHP
 
-# %description Db-Adapter-Mysqli
+# %description Db-Adapter-Oracle
 # This package contains the files for Zend Framework necessary to connect to an
 # Oracle database.
 
@@ -353,18 +349,11 @@ cd ..
   $RPM_BUILD_ROOT%{_bindir}/zf
 
 # Bug 477440
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
-
 cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
-%{__rm} -f *.ttf
-
-for file in /usr/share/fonts/bitstream-vera/*.ttf
+for file in *.ttf
 do
-  touch $RPM_BUILD_ROOT${file}
+  ln -sf %{_datadir}/fonts/bitstream-vera/${file} .
 done
-%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
-symlinks -c . > /dev/null
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
 
 
 %clean
@@ -449,6 +438,8 @@ symlinks -c . > /dev/null
 %{_datadir}/php/Zend/Navigation.php
 %{_datadir}/php/Zend/OpenId
 %{_datadir}/php/Zend/OpenId.php
+%{_datadir}/php/Zend/Queue.php
+%{_datadir}/php/Zend/Queue
 %{_datadir}/php/Zend/Paginator
 %{_datadir}/php/Zend/Paginator.php
 %{_datadir}/php/Zend/ProgressBar
@@ -515,7 +506,6 @@ symlinks -c . > /dev/null
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-# php-interbase not available for Fedora
 %exclude %{_datadir}/php/ZendX/Db
 %doc LICENSE.txt extras/documentation/*
 
@@ -556,6 +546,14 @@ symlinks -c . > /dev/null
 # %{_datadir}/php/Zend/Db/Statement/Db2
 # %doc LICENSE.txt
 
+%files Db-Adapter-Firebird
+%defattr(-,root,root,-)
+%{_datadir}/php/ZendX/Db/Adapter/Firebird.php
+%{_datadir}/php/ZendX/Db/Adapter/Firebird
+%{_datadir}/php/ZendX/Db/Statement/Firebird.php
+%{_datadir}/php/ZendX/Db/Statement/Firebird
+%doc LICENSE.txt
+
 # php-oci8 not available for Fedora
 # %files Db-Adapter-Oracle
 # %defattr(-,root,root,-)
@@ -634,6 +632,12 @@ symlinks -c . > /dev/null
 
 
 %changelog
+* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
+- new upstream version
+- new component: Queue
+- fixed dangling symlinks
+- enabled Db-Adapter-Firebird
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.4-3.PL1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Jul 2009 10:00:09 -0000	1.8
+++ sources	30 Sep 2009 14:51:38 -0000	1.9
@@ -1 +1 @@
-d7374bf9b1741e2f925e8d2443475f9d  ZendFramework-1.8.4PL1.tar.gz
+87b5a65e2597389544dddb22ecef7bf8  ZendFramework-1.9.3PL1.tar.gz



From linville at fedoraproject.org  Wed Sep 30 14:57:17 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 30 Sep 2009 14:57:17 +0000 (UTC)
Subject: rpms/iwl1000-firmware/F-11 iwl1000-firmware.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930145718.67F1311C01EA@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl1000-firmware/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32645

Modified Files:
	.cvsignore sources 
Added Files:
	iwl1000-firmware.spec 
Log Message:
Initial import...


--- NEW FILE iwl1000-firmware.spec ---
Name:           iwl1000-firmware
Version:        128.50.3.1
Release:        1%{?dist}
Summary:        Firmware for Intel? PRO/Wireless 1000 B/G/N network adaptors

Group:          System Environment/Kernel
License:        Redistributable, no modification permitted
URL:            http://intellinuxwireless.org/
Source0:        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch


%description
This package contains the firmware required by the iwlagn driver
for Linux to support the iwl1000 hardware.  Usage of the firmware
is subject to the terms and conditions contained inside the provided
LICENSE file. Please read it carefully.

%prep
%setup -c -q

pushd iwlwifi-1000-ucode-%{version}
# Change encoding
sed -i 's/\r//'  LICENSE.iwlwifi-1000-ucode README.iwlwifi-1000-ucode
# Rename docs
mv LICENSE.iwlwifi-1000-ucode ../LICENSE
mv README.iwlwifi-1000-ucode ../README
# Preserve timestamp
touch -r *.ucode ../LICENSE ../README
popd


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
pushd iwlwifi-1000-ucode-%{version}
install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README
/lib/firmware/*.ucode


%changelog
* Wed Sep 16 2009 John W. Linville <linville at tuxdriver.com> - 128.50.3.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iwl1000-firmware/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:16:18 -0000	1.1
+++ .cvsignore	30 Sep 2009 14:57:16 -0000	1.2
@@ -0,0 +1 @@
+iwlwifi-1000-ucode-128.50.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwl1000-firmware/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:16:19 -0000	1.1
+++ sources	30 Sep 2009 14:57:16 -0000	1.2
@@ -0,0 +1 @@
+cfad8d5a7651dde665c5c23e8209c35d  iwlwifi-1000-ucode-128.50.3.1.tgz



From praveenp at fedoraproject.org  Wed Sep 30 15:02:30 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:02:30 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-4 LocalInterfaceInvokeMethodFix.patch, NONE,
	1.1 destroyThreadKey.patch, NONE, 1.1 sblim-sfcb.spec, 1.2, 1.3
Message-ID: <20090930150230.4F30D11C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv913

Modified Files:
	sblim-sfcb.spec 
Added Files:
	LocalInterfaceInvokeMethodFix.patch destroyThreadKey.patch 
Log Message:
Added two patches


LocalInterfaceInvokeMethodFix.patch:
 cimcClientSfcbLocal.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE LocalInterfaceInvokeMethodFix.patch ---
diff -Naur sblim-sfcb-1.3.2/cimcClientSfcbLocal.c sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c
--- sblim-sfcb-1.3.2/cimcClientSfcbLocal.c	2008-10-03 05:54:47.000000000 +0530
+++ sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c	2009-04-07 22:14:55.000000000 +0530
@@ -1168,6 +1168,9 @@
    OperationHdr oHdr={OPS_InvokeMethod,0,5};
    CMPIArgs   *argsout;
    CMPIData retval={0,CMPI_notFound,{0l}};
+   
+   CMPIData rval={0,CMPI_notFound,{0l}}; //Fix : Local interface in InvokeMethod call crash.
+
    if (rc) CMSetStatus(rc, CMPI_RC_OK);
    
    _SFCB_ENTER(TRACE_CIMXMLPROC, "referenceNames");
@@ -1216,19 +1219,26 @@
             CMPIData data = CMGetArgAt(argsout,i, &name,NULL);
             CMAddArg(out,(char*)name->hdl,&data.value,data.type);
          }
+	rval = resp->rv; //FIX - Invoke Method crash
          if (resp->rvValue) {
             if (resp->rv.type==CMPI_chars) {
                resp->rv.value.chars=(long)resp->rvEnc.data+(char*)resp;
+		rval.value.chars = strdup((long)resp->rvEnc.data+(char*)resp); //FIX -- Invoke Method crash
             }
             else if (resp->rv.type==CMPI_dateTime) {
                resp->rv.value.dateTime=
                   NewCMPIDateTimeFromChars((long)resp->rvEnc.data
                                           +(char*)resp,NULL);
+		rval.value.dateTime = CMClone(resp->rv.value.dateTime,rc);
             }
+	    else
+	    {
+		rval = resp->rv;		
+	    }
          }
          retval = resp->rv;
          free(resp);
-         _SFCB_RETURN(retval);
+         _SFCB_RETURN(rval);
       }
       if (rc) CIMCSetStatusWithChars(rc, resp->rc, (char*)resp->object[0].data);
       free(resp);

destroyThreadKey.patch:
 support.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE destroyThreadKey.patch ---
--- sblim-sfcb-1.3.2/support.c	2008-06-26 04:45:36.000000000 +0530
+++ sblim-sfcb-1.3.2_new/support.c	2009-07-27 17:53:35.000000000 +0530
@@ -433,7 +433,7 @@
    
    __cleanup_mt(mt);
    CMPI_BrokerExt_Ftab->setThreadSpecific(__mm_key,NULL);
-
+   CMPI_BrokerExt_Ftab->destroyThreadKey(__mm_key);
 }
 
 static managed_thread *__init_mt()


Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-4/sblim-sfcb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sblim-sfcb.spec	25 Sep 2009 21:14:06 -0000	1.2
+++ sblim-sfcb.spec	30 Sep 2009 15:02:30 -0000	1.3
@@ -8,12 +8,14 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 11%{dist}
+Release: 12%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 patch0:	%{name}-disable_auto_service_start.patch
+patch1: LocalInterfaceInvokeMethodFix.patch
+patch2: destroyThreadKey.patch
 Provides: cim-server
 Requires: cim-schema
 %if 0%{?rhel}
@@ -45,6 +47,8 @@ Programming Interface (CMPI).
 %prep
 %setup -q -T -b 0 -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -111,6 +115,12 @@ fi
 #%doc COPYING README
 
 %changelog
+* Wed Sep 30 2009 <praveen_paladugu at dell.com>- 1.3.4-12
+- LocalInterfaceInvokeMethodFix: CHARS and string were handled the same.
+-  They are differentiated in this patch.
+- destroyThreadKey: Local sfcb connect was creating thread specific data 
+-  associating a key to it. This won't get deleted resulting in crash
+-  of opwsman, sfcc and sfcb. This patch deletes that data. 
 * Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-11
 - Changing the initddir to initrddir, since not defined in rhel
 * Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-10



From praveenp at fedoraproject.org  Wed Sep 30 15:03:26 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:03:26 +0000 (UTC)
Subject: rpms/sblim-sfcb/EL-5 LocalInterfaceInvokeMethodFix.patch, NONE,
	1.1 destroyThreadKey.patch, NONE, 1.1 sblim-sfcb.spec, 1.4, 1.5
Message-ID: <20090930150326.DDB7111C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1122

Modified Files:
	sblim-sfcb.spec 
Added Files:
	LocalInterfaceInvokeMethodFix.patch destroyThreadKey.patch 
Log Message:
Added two patches


LocalInterfaceInvokeMethodFix.patch:
 cimcClientSfcbLocal.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE LocalInterfaceInvokeMethodFix.patch ---
diff -Naur sblim-sfcb-1.3.2/cimcClientSfcbLocal.c sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c
--- sblim-sfcb-1.3.2/cimcClientSfcbLocal.c	2008-10-03 05:54:47.000000000 +0530
+++ sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c	2009-04-07 22:14:55.000000000 +0530
@@ -1168,6 +1168,9 @@
    OperationHdr oHdr={OPS_InvokeMethod,0,5};
    CMPIArgs   *argsout;
    CMPIData retval={0,CMPI_notFound,{0l}};
+   
+   CMPIData rval={0,CMPI_notFound,{0l}}; //Fix : Local interface in InvokeMethod call crash.
+
    if (rc) CMSetStatus(rc, CMPI_RC_OK);
    
    _SFCB_ENTER(TRACE_CIMXMLPROC, "referenceNames");
@@ -1216,19 +1219,26 @@
             CMPIData data = CMGetArgAt(argsout,i, &name,NULL);
             CMAddArg(out,(char*)name->hdl,&data.value,data.type);
          }
+	rval = resp->rv; //FIX - Invoke Method crash
          if (resp->rvValue) {
             if (resp->rv.type==CMPI_chars) {
                resp->rv.value.chars=(long)resp->rvEnc.data+(char*)resp;
+		rval.value.chars = strdup((long)resp->rvEnc.data+(char*)resp); //FIX -- Invoke Method crash
             }
             else if (resp->rv.type==CMPI_dateTime) {
                resp->rv.value.dateTime=
                   NewCMPIDateTimeFromChars((long)resp->rvEnc.data
                                           +(char*)resp,NULL);
+		rval.value.dateTime = CMClone(resp->rv.value.dateTime,rc);
             }
+	    else
+	    {
+		rval = resp->rv;		
+	    }
          }
          retval = resp->rv;
          free(resp);
-         _SFCB_RETURN(retval);
+         _SFCB_RETURN(rval);
       }
       if (rc) CIMCSetStatusWithChars(rc, resp->rc, (char*)resp->object[0].data);
       free(resp);

destroyThreadKey.patch:
 support.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE destroyThreadKey.patch ---
--- sblim-sfcb-1.3.2/support.c	2008-06-26 04:45:36.000000000 +0530
+++ sblim-sfcb-1.3.2_new/support.c	2009-07-27 17:53:35.000000000 +0530
@@ -433,7 +433,7 @@
    
    __cleanup_mt(mt);
    CMPI_BrokerExt_Ftab->setThreadSpecific(__mm_key,NULL);
-
+   CMPI_BrokerExt_Ftab->destroyThreadKey(__mm_key);
 }
 
 static managed_thread *__init_mt()


Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/EL-5/sblim-sfcb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sblim-sfcb.spec	25 Sep 2009 21:00:30 -0000	1.4
+++ sblim-sfcb.spec	30 Sep 2009 15:03:26 -0000	1.5
@@ -8,12 +8,14 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 11%{dist}
+Release: 12%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 patch0:	%{name}-disable_auto_service_start.patch
+patch1: LocalInterfaceInvokeMethodFix.patch
+patch2: destroyThreadKey.patch
 Provides: cim-server
 Requires: cim-schema
 %if 0%{?rhel}
@@ -45,6 +47,8 @@ Programming Interface (CMPI).
 %prep
 %setup -q -T -b 0 -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -111,6 +115,12 @@ fi
 #%doc COPYING README
 
 %changelog
+* Wed Sep 30 2009 <praveen_paladugu at dell.com>- 1.3.4-12
+- LocalInterfaceInvokeMethodFix: CHARS and string were handled the same.
+-  They are differentiated in this patch.
+- destroyThreadKey: Local sfcb connect was creating thread specific data
+-  associating a key to it. This won't get deleted resulting in crash
+-  of opwsman, sfcc and sfcb. This patch deletes that data.
 * Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-11
 - Changing the initddir to initrddir, since not defined in rhel
 * Fri Sep 25 2009 <praveen_paladugu at dell.com>- 1.3.4-10



From deji at fedoraproject.org  Wed Sep 30 15:03:33 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 30 Sep 2009 15:03:33 +0000 (UTC)
Subject: rpms/exaile/F-12 .cvsignore, 1.10, 1.11 exaile-makefile.patch, 1.3, 
	1.4 exaile.spec, 1.27, 1.28 sources, 1.10, 1.11
Message-ID: <20090930150333.1422511C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exaile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1155

Modified Files:
	.cvsignore exaile-makefile.patch exaile.spec sources 
Log Message:
* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0.1-1
- Update to 0.3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Aug 2009 22:46:31 -0000	1.10
+++ .cvsignore	30 Sep 2009 15:03:32 -0000	1.11
@@ -1 +1 @@
-exaile-0.3.0.tar.gz
+exaile-0.3.0.1.tar.gz

exaile-makefile.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: exaile-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/F-12/exaile-makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- exaile-makefile.patch	29 Aug 2009 22:46:31 -0000	1.3
+++ exaile-makefile.patch	30 Sep 2009 15:03:32 -0000	1.4
@@ -1,5 +1,5 @@
---- Makefile	2009-08-24 17:25:03.000000000 -0400
-+++ Makefile.new	2009-08-28 19:46:25.227288689 -0400
+--- Makefile	2009-09-06 19:45:01.161376822 -0400
++++ Makefile.new	2009-09-30 10:42:46.877746915 -0400
 @@ -2,7 +2,7 @@
  LIBINSTALLDIR ?= /lib
  XDGCONFDIR ?= /etc/xdg
@@ -9,7 +9,7 @@
  EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
  
  all: compile
-@@ -87,7 +87,7 @@
+@@ -83,7 +83,7 @@
  	# the printf here is for bsd compat, dont use echo!
  	cd $(DESTDIR)$(PREFIX)/bin && \
  	 printf "#!/bin/sh\n\


Index: exaile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/F-12/exaile.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- exaile.spec	29 Aug 2009 22:46:31 -0000	1.27
+++ exaile.spec	30 Sep 2009 15:03:32 -0000	1.28
@@ -2,7 +2,7 @@
 
 Summary:	A music player
 Name:		exaile
-Version:	0.3.0
+Version:	0.3.0.1
 Release:	1%{?dist}
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/exaile/
 
 %changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0.1-1
+- Update to 0.3.0.1
+
 * Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0-1
 - Update to 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Aug 2009 22:46:31 -0000	1.10
+++ sources	30 Sep 2009 15:03:32 -0000	1.11
@@ -1 +1 @@
-8d89110396b088042f39677892829e2d  exaile-0.3.0.tar.gz
+c6bd14cea747a808570b304e647544f1  exaile-0.3.0.1.tar.gz



From praveenp at fedoraproject.org  Wed Sep 30 15:04:26 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:04:26 +0000 (UTC)
Subject: rpms/sblim-sfcb/F-11 LocalInterfaceInvokeMethodFix.patch, NONE,
	1.1 destroyThreadKey.patch, NONE, 1.1 sblim-sfcb.spec, 1.1, 1.2
Message-ID: <20090930150426.CA1E911C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1417

Modified Files:
	sblim-sfcb.spec 
Added Files:
	LocalInterfaceInvokeMethodFix.patch destroyThreadKey.patch 
Log Message:
Added two patches


LocalInterfaceInvokeMethodFix.patch:
 cimcClientSfcbLocal.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE LocalInterfaceInvokeMethodFix.patch ---
diff -Naur sblim-sfcb-1.3.2/cimcClientSfcbLocal.c sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c
--- sblim-sfcb-1.3.2/cimcClientSfcbLocal.c	2008-10-03 05:54:47.000000000 +0530
+++ sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c	2009-04-07 22:14:55.000000000 +0530
@@ -1168,6 +1168,9 @@
    OperationHdr oHdr={OPS_InvokeMethod,0,5};
    CMPIArgs   *argsout;
    CMPIData retval={0,CMPI_notFound,{0l}};
+   
+   CMPIData rval={0,CMPI_notFound,{0l}}; //Fix : Local interface in InvokeMethod call crash.
+
    if (rc) CMSetStatus(rc, CMPI_RC_OK);
    
    _SFCB_ENTER(TRACE_CIMXMLPROC, "referenceNames");
@@ -1216,19 +1219,26 @@
             CMPIData data = CMGetArgAt(argsout,i, &name,NULL);
             CMAddArg(out,(char*)name->hdl,&data.value,data.type);
          }
+	rval = resp->rv; //FIX - Invoke Method crash
          if (resp->rvValue) {
             if (resp->rv.type==CMPI_chars) {
                resp->rv.value.chars=(long)resp->rvEnc.data+(char*)resp;
+		rval.value.chars = strdup((long)resp->rvEnc.data+(char*)resp); //FIX -- Invoke Method crash
             }
             else if (resp->rv.type==CMPI_dateTime) {
                resp->rv.value.dateTime=
                   NewCMPIDateTimeFromChars((long)resp->rvEnc.data
                                           +(char*)resp,NULL);
+		rval.value.dateTime = CMClone(resp->rv.value.dateTime,rc);
             }
+	    else
+	    {
+		rval = resp->rv;		
+	    }
          }
          retval = resp->rv;
          free(resp);
-         _SFCB_RETURN(retval);
+         _SFCB_RETURN(rval);
       }
       if (rc) CIMCSetStatusWithChars(rc, resp->rc, (char*)resp->object[0].data);
       free(resp);

destroyThreadKey.patch:
 support.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE destroyThreadKey.patch ---
--- sblim-sfcb-1.3.2/support.c	2008-06-26 04:45:36.000000000 +0530
+++ sblim-sfcb-1.3.2_new/support.c	2009-07-27 17:53:35.000000000 +0530
@@ -433,7 +433,7 @@
    
    __cleanup_mt(mt);
    CMPI_BrokerExt_Ftab->setThreadSpecific(__mm_key,NULL);
-
+   CMPI_BrokerExt_Ftab->destroyThreadKey(__mm_key);
 }
 
 static managed_thread *__init_mt()


Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-11/sblim-sfcb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-sfcb.spec	24 Sep 2009 18:05:00 -0000	1.1
+++ sblim-sfcb.spec	30 Sep 2009 15:04:26 -0000	1.2
@@ -8,12 +8,14 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 8%{dist}
+Release: 9%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 patch0:	%{name}-disable_auto_service_start.patch
+patch1: LocalInterfaceInvokeMethodFix.patch
+patch2: destroyThreadKey.patch
 Provides: cim-server
 Requires: cim-schema
 BuildRequires: libcurl-devel
@@ -41,6 +43,8 @@ Programming Interface (CMPI).
 %prep
 %setup -q -T -b 0 -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -107,6 +111,13 @@ fi
 #%doc COPYING README
 
 %changelog
+* Wed Sep 30 2009 <praveen_paladugu at dell.com>- 1.3.4-9
+- LocalInterfaceInvokeMethodFix: CHARS and string were handled the same.
+-  They are differentiated in this patch.
+- destroyThreadKey: Local sfcb connect was creating thread specific data
+-  associating a key to it. This won't get deleted resulting in crash
+-  of opwsman, sfcc and sfcb. This patch deletes that data.
+
 * Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
 - Removed the devel package and moved the init script to right directory
 * Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7



From praveenp at fedoraproject.org  Wed Sep 30 15:05:54 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:05:54 +0000 (UTC)
Subject: rpms/sblim-sfcb/F-12 LocalInterfaceInvokeMethodFix.patch, NONE,
	1.1 destroyThreadKey.patch, NONE, 1.1 sblim-sfcb.spec, 1.1, 1.2
Message-ID: <20090930150554.57DCA11C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1820

Modified Files:
	sblim-sfcb.spec 
Added Files:
	LocalInterfaceInvokeMethodFix.patch destroyThreadKey.patch 
Log Message:
Added two patches


LocalInterfaceInvokeMethodFix.patch:
 cimcClientSfcbLocal.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE LocalInterfaceInvokeMethodFix.patch ---
diff -Naur sblim-sfcb-1.3.2/cimcClientSfcbLocal.c sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c
--- sblim-sfcb-1.3.2/cimcClientSfcbLocal.c	2008-10-03 05:54:47.000000000 +0530
+++ sblim-sfcb-1.3.2_fix/cimcClientSfcbLocal.c	2009-04-07 22:14:55.000000000 +0530
@@ -1168,6 +1168,9 @@
    OperationHdr oHdr={OPS_InvokeMethod,0,5};
    CMPIArgs   *argsout;
    CMPIData retval={0,CMPI_notFound,{0l}};
+   
+   CMPIData rval={0,CMPI_notFound,{0l}}; //Fix : Local interface in InvokeMethod call crash.
+
    if (rc) CMSetStatus(rc, CMPI_RC_OK);
    
    _SFCB_ENTER(TRACE_CIMXMLPROC, "referenceNames");
@@ -1216,19 +1219,26 @@
             CMPIData data = CMGetArgAt(argsout,i, &name,NULL);
             CMAddArg(out,(char*)name->hdl,&data.value,data.type);
          }
+	rval = resp->rv; //FIX - Invoke Method crash
          if (resp->rvValue) {
             if (resp->rv.type==CMPI_chars) {
                resp->rv.value.chars=(long)resp->rvEnc.data+(char*)resp;
+		rval.value.chars = strdup((long)resp->rvEnc.data+(char*)resp); //FIX -- Invoke Method crash
             }
             else if (resp->rv.type==CMPI_dateTime) {
                resp->rv.value.dateTime=
                   NewCMPIDateTimeFromChars((long)resp->rvEnc.data
                                           +(char*)resp,NULL);
+		rval.value.dateTime = CMClone(resp->rv.value.dateTime,rc);
             }
+	    else
+	    {
+		rval = resp->rv;		
+	    }
          }
          retval = resp->rv;
          free(resp);
-         _SFCB_RETURN(retval);
+         _SFCB_RETURN(rval);
       }
       if (rc) CIMCSetStatusWithChars(rc, resp->rc, (char*)resp->object[0].data);
       free(resp);

destroyThreadKey.patch:
 support.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE destroyThreadKey.patch ---
--- sblim-sfcb-1.3.2/support.c	2008-06-26 04:45:36.000000000 +0530
+++ sblim-sfcb-1.3.2_new/support.c	2009-07-27 17:53:35.000000000 +0530
@@ -433,7 +433,7 @@
    
    __cleanup_mt(mt);
    CMPI_BrokerExt_Ftab->setThreadSpecific(__mm_key,NULL);
-
+   CMPI_BrokerExt_Ftab->destroyThreadKey(__mm_key);
 }
 
 static managed_thread *__init_mt()


Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-12/sblim-sfcb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-sfcb.spec	24 Sep 2009 18:05:24 -0000	1.1
+++ sblim-sfcb.spec	30 Sep 2009 15:05:54 -0000	1.2
@@ -8,12 +8,14 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 8%{dist}
+Release: 9%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 patch0:	%{name}-disable_auto_service_start.patch
+patch1: LocalInterfaceInvokeMethodFix.patch
+patch2: destroyThreadKey.patch
 Provides: cim-server
 Requires: cim-schema
 BuildRequires: libcurl-devel
@@ -41,6 +43,8 @@ Programming Interface (CMPI).
 %prep
 %setup -q -T -b 0 -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -107,6 +111,12 @@ fi
 #%doc COPYING README
 
 %changelog
+* Wed Sep 30 2009 <praveen_paladugu at dell.com>- 1.3.4-9
+- LocalInterfaceInvokeMethodFix: CHARS and string were handled the same.
+-  They are differentiated in this patch.
+- destroyThreadKey: Local sfcb connect was creating thread specific data
+-  associating a key to it. This won't get deleted resulting in crash
+-  of opwsman, sfcc and sfcb. This patch deletes that data.
 * Tue Sep 22 2009 <srinivas_ramanatha at dell.com> - 1.3.4-8
 - Removed the devel package and moved the init script to right directory
 * Wed Sep 16 2009 <srinivas_ramanatha at dell.com> - 1.3.4-7



From linville at fedoraproject.org  Wed Sep 30 15:10:53 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 30 Sep 2009 15:10:53 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.135,1.136 comps-f13.xml.in,1.25,1.26
Message-ID: <20090930151053.C103B11C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2544

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
add entries for iwl1000-firmware in f12 and f13


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- comps-f12.xml.in	30 Sep 2009 09:13:33 -0000	1.135
+++ comps-f12.xml.in	30 Sep 2009 15:10:53 -0000	1.136
@@ -2946,6 +2946,7 @@
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">ivtv-firmware</packagereq>
+      <packagereq type="default">iwl1000-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>
       <packagereq type="default">iwl4965-firmware</packagereq>
       <packagereq type="default">iwl5000-firmware</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- comps-f13.xml.in	30 Sep 2009 09:13:33 -0000	1.25
+++ comps-f13.xml.in	30 Sep 2009 15:10:53 -0000	1.26
@@ -2937,6 +2937,7 @@
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">ivtv-firmware</packagereq>
+      <packagereq type="default">iwl1000-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>
       <packagereq type="default">iwl4965-firmware</packagereq>
       <packagereq type="default">iwl5000-firmware</packagereq>



From nphilipp at fedoraproject.org  Wed Sep 30 15:11:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 30 Sep 2009 15:11:28 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.3.1-manpath.patch, NONE,
	1.1 kdebase-runtime.spec, 1.141, 1.142
Message-ID: <20090930151128.5EF3211C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2627

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-manpath.patch 
Log Message:
if available, use the "manpath" command in the man kioslave to determine man page file locations


kdebase-runtime-4.3.1-manpath.patch:
 kio_man.cpp |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 kio_man.h   |    4 +++-
 2 files changed, 51 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-manpath.patch ---
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath	2009-06-03 13:54:13.000000000 +0200
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp	2009-09-30 16:55:52.068576442 +0200
@@ -1,5 +1,6 @@
 /*  This file is part of the KDE libraries
     Copyright (c) 2000 Matthias Hoelzer-Kluepfel <mhk at caldera.de>
+    Copyright (c) 2009 Red Hat, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -17,6 +18,13 @@
     Boston, MA 02110-1301, USA.
 */
 
+/* 
+ Changes:
+ 
+ - 2009-09-30: use manpath binary if available to construct the man path (Nils
+               Philippsen <nils at redhat.com>)
+*/
+
 #include "kio_man.h"
 
 #include <stdio.h>
@@ -31,6 +39,8 @@
 #include <QTextStream>
 #include <QDataStream>
 #include <QMap>
+#include <QIODevice>
+#include <QProcess>
 #include <QRegExp>
 #include <QTextCodec>
 
@@ -817,7 +827,7 @@ void MANProtocol::showMainIndex()
     finished();
 }
 
-void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_catmanpath)
+void MANProtocol::constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath)
 {
     QMap<QString, QString> manpath_map;
     QMap<QString, QString> mandb_map;
@@ -984,6 +994,43 @@ void MANProtocol::constructPath(QStringL
     }
 }
 
+void MANProtocol::constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    QProcess manpath;
+    QStringList args;
+
+    // start the "manpath" command, ...
+    manpath.start( "manpath", args, QIODevice::ReadOnly );
+
+    // ... wait (forever) until it's started, ...
+    if ( ! manpath.waitForStarted( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... grab its output, ...
+    QString manpath_output = QString( manpath.readAllStandardOutput() );
+
+    // ... wait (forever) until it's finished, ...
+    if ( ! manpath.waitForFinished( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... close the process, ...
+    manpath.close();
+
+    // ... then process its output.
+    constr_path = manpath_output.split( ":", QString::SkipEmptyParts );
+}
+
+void MANProtocol::constructPath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    // Attempt to use the "manpath" command, ...
+    constructPathManpath( constr_path, constr_catmanpath );
+    if ( constr_path.count() == 0 )
+        // ... if that yields nothing, fall back to our own implementation
+        constructPathFallback ( constr_path, constr_catmanpath );
+}
+
 void MANProtocol::checkManPaths()
 {
     static bool inited = false;
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.h
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath	2008-11-19 11:17:53.000000000 +0100
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h	2009-09-30 14:05:22.254577337 +0200
@@ -68,7 +68,9 @@ private:
     void addToBuffer(const char *buffer, int buflen);
     QString pageName(const QString& page) const;
     QStringList buildSectionList(const QStringList& dirs) const;
-    void constructPath(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath);
+    void constructPath(QStringList& constr_path, QStringList& constr_catmanpath);
 private:
     static MANProtocol *_self;
     QByteArray lastdir;


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- kdebase-runtime.spec	15 Sep 2009 23:57:30 -0000	1.141
+++ kdebase-runtime.spec	30 Sep 2009 15:11:28 -0000	1.142
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -21,6 +21,7 @@ Patch1:        kdebase-runtime-4.1.x-sea
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
+Patch5:        kdebase-runtime-4.3.1-manpath.patch
 
 ## Upstream patches
 
@@ -94,6 +95,7 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p1 -b .manpath
 
 %build
 mkdir -p %{_target_platform}
@@ -210,6 +212,10 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-3
+- if available, use the "manpath" command in the man kioslave to determine man
+  page file locations
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
 - restore some previously inadvertantly omitted nepomuk ontologies
 



From ruben at fedoraproject.org  Wed Sep 30 15:13:06 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed, 30 Sep 2009 15:13:06 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/devel
	perl-Nagios-Plugin-Beanstalk.spec, 1.1, 1.2
Message-ID: <20090930151306.ADB6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3050

Modified Files:
	perl-Nagios-Plugin-Beanstalk.spec 
Log Message:
* Fri Sep 25 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-3
- Install plugin in nagios plugin dir



Index: perl-Nagios-Plugin-Beanstalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel/perl-Nagios-Plugin-Beanstalk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Nagios-Plugin-Beanstalk.spec	24 Sep 2009 07:40:02 -0000	1.1
+++ perl-Nagios-Plugin-Beanstalk.spec	30 Sep 2009 15:13:06 -0000	1.2
@@ -1,17 +1,19 @@
+%define debug_package %{nil}
+
 Name:           perl-Nagios-Plugin-Beanstalk
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios plugin to observe Beanstalkd queue server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Nagios-Plugin-Beanstalk/
 Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugin-Beanstalk-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 BuildRequires:  perl(Beanstalk::Client)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Nagios::Plugin)
 BuildRequires:  perl(Test::More)
+Requires:	nagios-plugins
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -22,7 +24,8 @@ A Nagios plugin to observe a Beanstalkd 
 %setup -q -n Nagios-Plugin-Beanstalk-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=%{_libdir}/nagios/plugins
+
 make %{?_smp_mflags}
 
 %install
@@ -45,9 +48,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
-%{_bindir}/check_beanstalkd
+%{_libdir}/nagios/plugins/check_beanstalkd
 
 %changelog
+* Fri Sep 25 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-3
+- Install plugin in nagios plugin dir
+
 * Wed Sep 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-2
 - Clarify description
 



From praveenp at fedoraproject.org  Wed Sep 30 15:13:26 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:13:26 +0000 (UTC)
Subject: rpms/cim-schema/EL-4 LICENSE, NONE, 1.1 cim-schema.spec, NONE,
	1.1 import.log, NONE, 1.1 loadmof.sh, NONE, 1.1 rmmof.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930151326.90E8511C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/cim-schema/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3092/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE cim-schema.spec import.log loadmof.sh rmmof.sh 
Log Message:
Added cim-schema to RHEL-4



--- NEW FILE LICENSE ---
// Copyright 1998-2008 Distributed Management Task Force, Inc. (DMTF).
// All rights reserved.
// DMTF is a not-for-profit association of industry members dedicated
// to promoting enterprise and systems management and interoperability.
// DMTF specifications and documents may be reproduced by
// members and non-members, provided that correct attribution is given.
// As DMTF specifications may be revised from time to time,
// the particular version and release date should always be noted.
// 
// Implementation of certain elements of this standard or proposed
// standard may be subject to third party patent rights, including
// provisional patent rights (herein "patent rights"). DMTF makes
// no representations to users of the standard as to the existence
// of such rights, and is not responsible to recognize, disclose, or
// identify any or all such third party patent right, owners or
// claimants, nor for any incomplete or inaccurate identification or
// disclosure of such rights, owners or claimants. DMTF shall have no
// liability to any party, in any manner or circumstance, under any
// legal theory whatsoever, for failure to recognize, disclose, or
// identify any such third party patent rights, or for such party's
// reliance on the standard or incorporation thereof in its product,
// protocols or testing procedures. DMTF shall have no liability to
// any party implementing such standard, whether such implementation
// is foreseeable or not, nor to any patent owner or claimant, and shall
// have no liability or responsibility for costs or losses incurred if
// a standard is withdrawn or modified after publication, and shall be
// indemnified and held harmless by any party implementing the
// standard from any and all claims of infringement by a patent owner
// for such implementations.
// 
// For information about patents held by third-parties which have
// notified the DMTF that, in their opinion, such patent may relate to
// or impact implementations of DMTF standards, visit
// http://www.dmtf.org/about/policies/disclosures.php.


--- NEW FILE cim-schema.spec ---
#
# spec file for package cim-schema
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.
#
# The license for this spec file is the MIT/X11 license:
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#

# norootforbuild

Name:           cim-schema
Url:            http://www.dmtf.org/
Summary:        Common Information Model (CIM) Schema
Version:        2.22.0
Release:        1%{?dist}
Group:          Development/Libraries
License:        DMTF
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Source0:        http://www.dmtf.org/standards/cim/cim_schema_v2220/cim_schema_%{version}Experimental-MOFs.zip
Source1:        http://www.dmtf.org/standards/cim/cim_schema_v2220/cim_schema_%{version}Experimental-Doc.zip
Source2:        loadmof.sh
Source3:        rmmof.sh
Source4:        LICENSE
BuildArch:      noarch

%package docs
Summary:        Common Information Model (CIM) Schema documentation
Group:          Documentation


%description
Common Information Model (CIM) is a model for describing overall
management information in a network or enterprise environment. CIM
consists of a specification and a schema. The specification defines the
details for integration with other management models. The schema
provides the actual model descriptions.



Authors:
--------
    DTMF <http://www.dmtf.org/about/contact>

%description docs
Common Information Model (CIM) schema documentation.

%prep
%setup -q -T -a 1 -c -n %{name}-%{version}-docs
%setup -q -T -a 0 -c -n %{name}-%{version}
cp -a %{SOURCE4} ..

%build
%install
MOFDIR=%{_datadir}/mof
CIMDIR=$MOFDIR/cimv%{version}
%__rm -rf $RPM_BUILD_ROOT
for i in `find . -name "*.mof"`; do
  sed -i -e 's/\r//g' $i
done
install -d $RPM_BUILD_ROOT/$CIMDIR
chmod -R go-wx .
chmod -R a+rX .
%__mv * $RPM_BUILD_ROOT/$CIMDIR/
ln -s cimv%{version} $RPM_BUILD_ROOT/$MOFDIR/cim-current
ln -s cim_schema_%{version}.mof $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
install -d $RPM_BUILD_ROOT/usr/bin
install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/bin/
install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/bin/

%clean
%__rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%dir /usr/share/mof
%dir /usr/share/mof/cimv%{version}
/usr/share/mof/cimv%{version}/*
/usr/share/mof/cim-current
/usr/bin/loadmof.sh
/usr/bin/rmmof.sh
%doc ../LICENSE

%files docs
%defattr(-, root, root)
%doc ../%{name}-%{version}-docs/*

%changelog
* Thu Jul 16 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.22.0-1.fc12
- add dist tag

* Tue Jul 14 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.22.0-1
- spec license change to MIT per Novell
- remove BR: unzip, it's in the default buildroot already
- add MIT license to spec file

* Wed May 20 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.21.0-1
- upgrade to v2.22.0

* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 2.19.1-1
- Upgraded to cimv2.19.1Experimental
- now meets Fedora packaging guidelines too
- added -docs subpackage
* Wed May 14 2008 bwhiteley at suse.de
- Upgraded to cimv2.18Experimental
* Thu Jan 17 2008 bwhiteley at suse.de
- Fixed order of includes so that it will import in pegasus.
* Tue Jan 08 2008 bwhiteley at suse.de
- Updated to cimv2.17Experimental (#341800)
* Wed Nov 28 2007 bwhiteley at suse.de
- Updated to cimv2.16Experimental (#341800)
  Remove carriage returns from MOF files.
  Fix broken comment blocks in 2.16 schema.
* Thu Mar 29 2007 bwhiteley at suse.de
- Added unzip to BuildRequires
* Tue Mar 27 2007 bwhiteley at suse.de
- Fixed inclusion of missing file (#258187)
* Tue Mar 13 2007 bart at novell.com
- Added some classes from 2.15 preliminary needed for Xen
  providers (#228365)
* Fri Jan 19 2007 bwhiteley at suse.de
- update to schema version 2.14 (#228365)
* Mon Jan 08 2007 bwhiteley at suse.de
- Combine all qualifiers back into one file (#232667)
* Tue Dec 19 2006 bwhiteley at suse.de
- added loadmof.sh script. (#228349)
* Wed Dec 13 2006 bwhiteley at suse.de
- Updated to schema version cimv2.13.1 (#228365)
* Fri Oct 06 2006 bwhiteley at suse.de
- Updated to schema version cimv2.13
* Mon May 08 2006 bwhiteley at suse.de
- Updated to schema version cimv2.12, required for SMASH 1.0
  compliance (#173777)
* Fri May 05 2006 bwhiteley at suse.de
- removed non-ascii char from CIM_DNSSettingData.mof (was breaking
  some XML parsers) (#172939)
* Fri Feb 10 2006 bwhiteley at suse.de
- fixed execute bit on directories (#149992)
* Wed Jan 25 2006 mls at suse.de
- converted neededforbuild to BuildRequires
* Tue Jan 17 2006 bwhiteley at suse.de
- Added a symlink cim-current so other packages don't have to hard-
  code cim schema versions.
* Tue Jan 10 2006 bwhiteley at suse.de
- Update to v2.11 Experimental.
- Moved MOFs under /usr/share/mof
* Thu Jan 13 2005 nashif at suse.de
- Update to v2.9 Final
* Tue Oct 12 2004 nashif at suse.de
- Update with cim v2.9
* Tue Feb 17 2004 nashif at suse.de
- Fixed directory permissions
- build as normal user
* Mon Feb 16 2004 nashif at suse.de
- Updated to 2.8 final
* Thu Nov 27 2003 nashif at suse.de
- Initial Release


--- NEW FILE import.log ---
cim-schema-2_22_0-1_el5:EL-4:cim-schema-2.22.0-1.el5.src.rpm:1254323626


--- NEW FILE loadmof.sh ---
#!/bin/sh

OWLM=/usr/bin/ow-loadmof.sh
PEGLM=/usr/bin/peg-loadmof.sh

if [ -x $OWLM ]; then
  $OWLM $@
fi

if [ -x $PEGLM ]; then
  $PEGLM $@
fi



--- NEW FILE rmmof.sh ---
#!/bin/sh

OWLM=/usr/bin/ow-rmmof.sh
PEGLM=/usr/bin/peg-rmmof.sh

if [ -x $OWLM ]; then
  $OWLM $@
fi

if [ -x $PEGLM ]; then
  $PEGLM $@
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cim-schema/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Jul 2009 05:46:16 -0000	1.1
+++ .cvsignore	30 Sep 2009 15:13:26 -0000	1.2
@@ -0,0 +1,2 @@
+cim_schema_2.22.0Experimental-Doc.zip
+cim_schema_2.22.0Experimental-MOFs.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cim-schema/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Jul 2009 05:46:16 -0000	1.1
+++ sources	30 Sep 2009 15:13:26 -0000	1.2
@@ -0,0 +1,2 @@
+965a56879d23e82d0cf1b2cb474e6076  cim_schema_2.22.0Experimental-Doc.zip
+3e55062f785a67a8548bae96afbec299  cim_schema_2.22.0Experimental-MOFs.zip



From clumens at fedoraproject.org  Wed Sep 30 15:16:04 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 30 Sep 2009 15:16:04 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.116, 1.117 pykickstart.spec,
	1.127, 1.128 sources, 1.126, 1.127
Message-ID: <20090930151604.521A211C00E6@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3762

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	16 Sep 2009 19:45:03 -0000	1.116
+++ .cvsignore	30 Sep 2009 15:16:03 -0000	1.117
@@ -50,3 +50,4 @@ pykickstart-1.60.tar.gz
 pykickstart-1.61.tar.gz
 pykickstart-1.62.tar.gz
 pykickstart-1.63.tar.gz
+pykickstart-1.64.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- pykickstart.spec	16 Sep 2009 19:45:03 -0000	1.127
+++ pykickstart.spec	30 Sep 2009 15:16:03 -0000	1.128
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.63
+Version: 1.64
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -23,9 +23,9 @@ files.
 
 %prep
 %setup -q
-make
 
 %build
+make
 
 %install
 rm -rf %{buildroot}
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Wed Sep 30 2009 Chris Lumens <clumens at redhat.com> - 1.64-1
+- Update the zfcp command for F12 (#526360).
+- Move "make" to %build (#524215).
+
 * Wed Sep 16 2009 Chris Lumens <clumens at redhat.com> - 1.63-1
 - Add encryption key escrow support (mitr, #508963).
 - Fix the repo test cases to expect quotes around the repo's name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- sources	16 Sep 2009 19:45:03 -0000	1.126
+++ sources	30 Sep 2009 15:16:03 -0000	1.127
@@ -1 +1 @@
-4b2c802a1568aee638c57ba173f9f2ac  pykickstart-1.63.tar.gz
+4c9a12220031967690689e34b7f6996a  pykickstart-1.64.tar.gz



From rdieter at fedoraproject.org  Wed Sep 30 15:19:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 15:19:56 +0000 (UTC)
Subject: rpms/phonon/devel phonon-4.2.96-pulseaudio.patch, 1.2,
	1.3 phonon-4.3.2-gstreamer-utf8-url.patch, 1.2,
	1.3 phonon-4.3.2-gstreamer-volumefader.patch, 1.2,
	1.3 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 phonon.spec, 1.44, 1.45 sources, 1.13, 1.14
Message-ID: <20090930151956.6005C11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4615

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
first try at qt->phonon revert, no builds yet, please review


phonon-4.2.96-pulseaudio.patch:
 globalconfig.cpp |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Index: phonon-4.2.96-pulseaudio.patch
===================================================================
RCS file: phonon-4.2.96-pulseaudio.patch
diff -N phonon-4.2.96-pulseaudio.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phonon-4.2.96-pulseaudio.patch	30 Sep 2009 15:19:54 -0000	1.3
@@ -0,0 +1,43 @@
+diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
+--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
++++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include "phononnamespace_p.h"
+ 
+ #include <QtCore/QList>
++#include <QtCore/QHash>
+ #include <QtCore/QVariant>
+ 
+ QT_BEGIN_NAMESPACE
+@@ -167,6 +168,15 @@
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
+                     );
+         }
++        // make PulseAudio the global default (assume it is already default in this list)
++        if (!list.isEmpty()) {
++            int firstIndex = list.first();
++            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
++                  firstIndex)["name"].toString() == "PulseAudio") {
++                list.removeFirst();
++                defaultList.prepend(firstIndex);
++            }
++        }
+         defaultList += list;
+     }
+ 
+@@ -222,6 +232,15 @@
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
+                   );
+         }
++        // make PulseAudio the global default (assume it is already default in this list)
++        if (!list.isEmpty()) {
++            int firstIndex = list.first();
++            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
++                  firstIndex)["name"].toString() == "PulseAudio") {
++                list.removeFirst();
++                defaultList.prepend(firstIndex);
++            }
++        }
+         defaultList += list;
+     }
+ 

phonon-4.3.2-gstreamer-utf8-url.patch:
 mediaobject.cpp |   13 ++++---------
 mediaobject.h   |    2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

Index: phonon-4.3.2-gstreamer-utf8-url.patch
===================================================================
RCS file: phonon-4.3.2-gstreamer-utf8-url.patch
diff -N phonon-4.3.2-gstreamer-utf8-url.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phonon-4.3.2-gstreamer-utf8-url.patch	30 Sep 2009 15:19:54 -0000	1.3
@@ -0,0 +1,59 @@
+Index: gstreamer/mediaobject.h
+===================================================================
+--- gstreamer/mediaobject.h	(revision 932755)
++++ gstreamer/mediaobject.h	(revision 932756)
+@@ -185,7 +185,7 @@
+     /*
+      * @param encodedUrl percent-encoded QString for source compat reasons.  Should change to QUrl
+      */
+-    bool createPipefromURL(const QString &encodedUrl);
++    bool createPipefromURL(const QUrl &url);
+     bool createPipefromStream(const MediaSource &);
+ 
+ private Q_SLOTS:
+Index: gstreamer/mediaobject.cpp
+===================================================================
+--- gstreamer/mediaobject.cpp	(revision 932755)
++++ gstreamer/mediaobject.cpp	(revision 932756)
+@@ -347,11 +347,8 @@
+  *
+  * returns true if successful
+  */
+-bool MediaObject::createPipefromURL(const QString &encodedUrl)
++bool MediaObject::createPipefromURL(const QUrl &url)
+ {
+-    // Convert back to URL
+-    QUrl url(encodedUrl, QUrl::StrictMode);
+-
+     // Remove any existing data source
+     if (m_datasource) {
+         gst_bin_remove(GST_BIN(m_pipeline), m_datasource);
+@@ -361,7 +358,7 @@
+ 
+     // Verify that the uri can be parsed
+     if (!url.isValid()) {
+-        m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl));
++        m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString()));
+         return false;
+     }
+ 
+@@ -875,8 +872,7 @@
+ 
+     switch (source.type()) {
+     case MediaSource::Url: {            
+-            QString urlString = source.url().toEncoded();
+-            if (createPipefromURL(urlString))
++            if (createPipefromURL(source.url()))
+                 m_loading = true;
+             else
+                 setError(tr("Could not open media source."));
+@@ -884,8 +880,7 @@
+         break;
+ 
+     case MediaSource::LocalFile: {
+-            QString urlString = QUrl::fromLocalFile(source.fileName()).toString();
+-            if (createPipefromURL(urlString))
++            if (createPipefromURL(QUrl::fromLocalFile(source.fileName())))
+                 m_loading = true;
+             else
+                 setError(tr("Could not open media source."));

phonon-4.3.2-gstreamer-volumefader.patch:
 mediaobject.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: phonon-4.3.2-gstreamer-volumefader.patch
===================================================================
RCS file: phonon-4.3.2-gstreamer-volumefader.patch
diff -N phonon-4.3.2-gstreamer-volumefader.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phonon-4.3.2-gstreamer-volumefader.patch	30 Sep 2009 15:19:55 -0000	1.3
@@ -0,0 +1,16 @@
+Index: gstreamer/mediaobject.cpp
+===================================================================
+--- gstreamer/mediaobject.cpp	(revision 932979)
++++ gstreamer/mediaobject.cpp	(revision 932980)
+@@ -141,9 +141,9 @@
+     if (m_resumeState)
+         return;
+ 
+-    if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) {
++    if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) {
+         m_resumeState = true;
+-        m_oldState = m_state;
++        m_oldState = m_pendingState;
+         m_oldPos = getPipelinePos();
+     }
+ }

qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch:
 audiooutput.cpp   |    4 +++-
 devicemanager.cpp |   22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
@@ -141,7 +141,9 @@ bool AudioOutput::setOutputDevice(int ne
         // Save previous state
         GstState oldState = GST_STATE(m_audioSink);
         const QByteArray oldDeviceValue = GstHelper::property(m_audioSink, "device");
-        const QByteArray deviceId = deviceList.at(newDevice).gstId;
+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
+                                     ? "default"
+                                     : deviceList.at(newDevice).gstId);
         m_device = newDevice;
 
         // We test if the device can be opened by checking if it can go from NULL to READY state
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
@@ -50,6 +50,8 @@ AudioDevice::AudioDevice(DeviceManager *
     //get name from device
     if (gstId == "default") {
         description = "Default audio device";
+    } else if (gstId == "PulseAudio") {
+        description = QObject::tr("Pass all audio through the PulseAudio Sound Server.\n").toUtf8();
     } else {
         GstElement *aSink= manager->createAudioSink();
 
@@ -175,6 +177,18 @@ GstElement *DeviceManager::createAudioSi
                 }
             }
 
+            if (!sink) {
+                sink = gst_element_factory_make ("pulsesink", NULL);
+                if (canOpenDevice(sink)) {
+                    m_backend->logMessage("AudioOutput using pulse audio sink");
+                    m_audioSink = "pulsesink";
+                }
+                else if (sink) {
+                    gst_object_unref(sink);
+                    sink = 0;
+                }
+            }
+
 #ifdef USE_ALSASINK2
             if (!sink) {
                 sink = gst_element_factory_make ("_k_alsasink", NULL);
@@ -306,8 +320,12 @@ void DeviceManager::updateDeviceList()
     QList<QByteArray> list;
 
     if (audioSink) {
-        list = GstHelper::extractProperties(audioSink, "device");
-        list.prepend("default");
+        if (m_audioSink == "pulsesink") {
+            list.append("PulseAudio");
+        } else {
+            list = GstHelper::extractProperties(audioSink, "device");
+            list.prepend("default");
+        }
 
         for (int i = 0 ; i < list.size() ; ++i) {
             QByteArray gstId = list.at(i);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Feb 2009 11:07:08 -0000	1.11
+++ .cvsignore	30 Sep 2009 15:19:54 -0000	1.12
@@ -1,3 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.0.tar.bz2
 phonon-4.3.1.tar.bz2
+hi128-phonon-gstreamer.png
+hi16-phonon-gstreamer.png
+hi22-phonon-gstreamer.png
+hi32-phonon-gstreamer.png
+hi48-phonon-gstreamer.png
+hi64-phonon-gstreamer.png


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- phonon.spec	26 Jul 2009 17:55:47 -0000	1.44
+++ phonon.spec	30 Sep 2009 15:19:55 -0000	1.45
@@ -1,57 +1,108 @@
 
-%define phonon_version_major 4.3
-
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 12%{?dist}
-Group:   Applications/Multimedia
+Release: 101%{?dist}
+Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# build only the xine backend
-Patch0: phonon-4.3.1-xineonly.patch
-# bump PulseAudio's priority in the xine backend
-Patch1: phonon-4.2.96-xine-pulseaudio.patch
-# make InitialPreference=9
-Patch2: phonon-4.3.1-xine-InitialPreference.patch
+Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+Source14: hi48-phonon-gstreamer.png
+Source15: hi64-phonon-gstreamer.png
+Source16: hi128-phonon-gstreamer.png
+
+# Make PulseAudio the default 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
+# set through systemsettings, and listed devices are only those supported by the
+# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
+# it as a "sink", and then the device setting is ignored entirely.
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
+Patch2:  qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
+
+## define to build phonon-backend-xine only
+#define xine_only 1
+Patch10: phonon-4.3.1-xineonly.patch
 
 ## 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
-Patch100: phonon-4.3.2-kdebug#172242.patch
+Patch102: phonon-4.3.2-kdebug#172242.patch
 # escape '#' too
-Patch101: phonon-4.3.2-kdebug#172242-2.patch
+Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.5.1
+BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
+Requires: phonon-backend%{?_isa} >= %{version}
+
+## can switch to Requires instead of Conflicts once bootstrapping is done
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Conflicts: qt4 < 4.5.2-21
+
 %description
 %{summary}.
 
+%package devel
+Summary: Developer files for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel
+Requires: pkgconfig
+%description devel
+%{summary}.
+
 %package backend-xine
-Summary: Xine phonon backend
+Summary: xine phonon backend
 Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend%{?_isa} = %{version}-%{release}
-Requires: phonon%{?_isa} >= %{phonon_version_major} 
 %description backend-xine
 %{summary}.
 
+%package backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Epoch:   2
+Requires: %{name} = %{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
+%{summary}.
+
 
 %prep
 %setup -q -n phonon-%{version}%{?alphatag}
-%patch0 -p1 -b .xineonly
+%patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .xine-pulseaudio
-%patch100 -p1 -b .xine_nonascii
-%patch101 -p1 -b .xine_nonascii-2
+%patch2 -p4 -b .gst-pulseaudio
+%patch100 -p0 -b .gstreamer-utf8-url
+%patch101 -p0 -b .gstreamer-volumefader
+%patch102 -p1 -b .xine_nonascii
+%patch103 -p1 -b .xine_nonascii-2
+
+# not working?  use -C .../xine hack below instead for now  -- Rex
+%if 0%{?xine_only}
+%patch10 -p1 -b .xineonly
+%endif
 
 
 %build
@@ -60,39 +111,90 @@ pushd %{_target_platform}
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}%{?xine_only:/xine}
 
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
 # move the oxygen-only phonon-xine icons to hicolor
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
 
+%if ! 0%{?xine_only}
+# gstreamer icons
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%post backend-xine
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+%if ! 0%{?xine_only}
+%post -p /sbin/ldconfig
 
-%posttrans backend-xine
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+%postun -p /sbin/ldconfig
+
+%post backend-gstreamer
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun backend-gstreamer
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%posttrans backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+
+%post backend-xine
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun backend-xine
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%posttrans backend-xine
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%files backend-xine
+%if ! 0%{?xine_only}
+%files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
+%{_libdir}/libphonon*.so.4*
+%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+# kde4-specific dirs
+%dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
+%dir %{_kde4_datadir}/kde4/services/phononbackends/
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/KDE
+%{_includedir}/KDE/Phonon/
+%{_includedir}/phonon/
+%{_libdir}/pkgconfig/phonon.pc
+%{_libdir}/libphonon*.so
+
+%files backend-gstreamer
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
+%{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+%endif
+
+%files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
@@ -100,6 +202,11 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
+- revert to kde/phonon
+- inflate to Release: 101
+- -backend-gstreamer: Epoch: 2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Feb 2009 11:07:08 -0000	1.13
+++ sources	30 Sep 2009 15:19:55 -0000	1.14
@@ -1,2 +1,8 @@
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 767cb68052c108e95f293f30acdef3fb  phonon-4.3.1.tar.bz2
+60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
+7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
+0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
+12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
+86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
+153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png



From linville at fedoraproject.org  Wed Sep 30 15:20:03 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 30 Sep 2009 15:20:03 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.136,1.137 comps-f13.xml.in,1.26,1.27
Message-ID: <20090930152003.2E09211C04F0@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4888

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
add b43-openfwwf in f12 and f13 -- helps a lot of people, and b43 driver will still prefer proprietary firmware if it is installed anyway


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- comps-f12.xml.in	30 Sep 2009 15:10:53 -0000	1.136
+++ comps-f12.xml.in	30 Sep 2009 15:20:02 -0000	1.137
@@ -2943,6 +2943,7 @@
     <packagelist>
       <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
+      <packagereq type="default">b43-openfwwf</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">ivtv-firmware</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- comps-f13.xml.in	30 Sep 2009 15:10:53 -0000	1.26
+++ comps-f13.xml.in	30 Sep 2009 15:20:02 -0000	1.27
@@ -2934,6 +2934,7 @@
     <packagelist>
       <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
+      <packagereq type="default">b43-openfwwf</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">ivtv-firmware</packagereq>



From rdieter at fedoraproject.org  Wed Sep 30 15:21:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 15:21:37 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.330,1.331
Message-ID: <20090930152137.F0B1F11C0261@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5878

Modified Files:
	qt.spec 
Log Message:
first try at qt/phonon revert, no builds yet, please review



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- qt.spec	28 Sep 2009 13:33:30 -0000	1.330
+++ qt.spec	30 Sep 2009 15:21:36 -0000	1.331
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -97,7 +97,11 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
+# if building with -phonon, define to internal version (ie, Obsolete external phonon)
+#define phonon_internal 1
 %define phonon_backend -phonon-backend
+# if -phonon-backend, include in packaging (else it's omitted)
+#define phonon_backend_packaged 1
 %define phonon_version 4.3.1
 %define phonon_version_major 4.3
 %define phonon_release 100
@@ -237,6 +241,8 @@ Requires: libjpeg-devel
 Requires: pkgconfig
 %if 0%{?phonon:1}
 Provides: qt4-phonon-devel = %{version}-%{release}
+%endif
+%if 0%{?phonon_internal}
 Obsoletes: phonon-devel < 4.3.1-100
 Provides:  phonon-devel = %{phonon_version}-%{phonon_release}
 %endif
@@ -312,10 +318,12 @@ Provides:  qt4-postgresql = %{version}-%
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 %if 0%{?phonon:1}
+Requires:  phonon-backend%{?_isa} >= %{phonon_version_major} 
+%endif
+%if 0%{?phonon_internal}
 Obsoletes: phonon < 4.3.1-100
 Provides:  phonon = %{phonon_version}-%{phonon_release}
 Provides:  phonon%{?_isa} = %{phonon_version}-%{phonon_release}
-Requires:  phonon-backend%{?_isa} >= %{phonon_version_major} 
 Provides:  qt4-phonon = %{version}-%{release}
 %endif
 %if 0%{?webkit:1}
@@ -579,9 +587,11 @@ install -p -m644 -D %{SOURCE4} %{buildro
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+%if 0%{?docs}
 # assistant icons
 install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant.png
 install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant.png
+%endif
 # designer icons
 install -p -m644 -D tools/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer.png
 # linguist icons
@@ -640,7 +650,20 @@ ln -s phonon Phonon
 popd
 %endif
 
-%if "%{?phonon_backend}" == "-phonon-backend"
+%if ! 0%{?phonon_internal}
+rm -fv  %{buildroot}%{_qt4_libdir}/libphonon.so*
+rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
+# contents slightly different between phonon-4.3.1 and qt-4.5.0
+rm -fv  %{buildroot}%{_includedir}/phonon/phononnamespace.h
+# contents dup'd but should remove just in case
+rm -fv  %{buildroot}%{_includedir}/phonon/*.h
+#rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
+#rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
+rm -fv %{buildroot}%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%endif
+
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
 install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
 install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
@@ -685,7 +708,8 @@ touch --no-create %{_datadir}/icons/hico
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 fi
 
-%if "%{?phonon_backend}" == "-phonon-backend"
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
 %post -n phonon-backend-gstreamer
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
@@ -815,6 +839,8 @@ fi
 %{_qt4_datadir}/q3porting.xml
 %if 0%{?phonon:1}
 %{_qt4_libdir}/libphonon.prl
+%endif
+%if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so
 %endif
 %{_qt4_libdir}/libQt*.so
@@ -873,7 +899,7 @@ fi
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
-%if 0%{?phonon:1}
+%if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so.4*
 %dir %{_datadir}/kde4/services/phononbackends/
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
@@ -891,7 +917,8 @@ fi
 %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/sqldrivers
-%if "%{?phonon_backend}" == "-phonon-backend"
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
 %exclude %{_qt4_plugindir}/phonon_backend/*_gstreamer.so
 %endif
 %if "%{_qt4_bindir}" != "%{_bindir}"
@@ -905,7 +932,11 @@ fi
 %{_datadir}/applications/*qtconfig.desktop
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
+
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
+- switch to external/kde phonon
+
 * Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-20
 - use internal Qt Assistant/Designer icons
 - -devel: move designer.qch,linguist.qch here



From clumens at fedoraproject.org  Wed Sep 30 15:23:47 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 30 Sep 2009 15:23:47 +0000 (UTC)
Subject: rpms/pykickstart/F-12 .cvsignore, 1.116, 1.117 pykickstart.spec,
	1.127, 1.128 sources, 1.126, 1.127
Message-ID: <20090930152347.2197711C00E6@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6730

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-12/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	16 Sep 2009 19:45:03 -0000	1.116
+++ .cvsignore	30 Sep 2009 15:23:46 -0000	1.117
@@ -50,3 +50,4 @@ pykickstart-1.60.tar.gz
 pykickstart-1.61.tar.gz
 pykickstart-1.62.tar.gz
 pykickstart-1.63.tar.gz
+pykickstart-1.64.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-12/pykickstart.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- pykickstart.spec	16 Sep 2009 19:45:03 -0000	1.127
+++ pykickstart.spec	30 Sep 2009 15:23:46 -0000	1.128
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.63
+Version: 1.64
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -23,9 +23,9 @@ files.
 
 %prep
 %setup -q
-make
 
 %build
+make
 
 %install
 rm -rf %{buildroot}
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Wed Sep 30 2009 Chris Lumens <clumens at redhat.com> - 1.64-1
+- Update the zfcp command for F12 (#526360).
+- Move "make" to %build (#524215).
+
 * Wed Sep 16 2009 Chris Lumens <clumens at redhat.com> - 1.63-1
 - Add encryption key escrow support (mitr, #508963).
 - Fix the repo test cases to expect quotes around the repo's name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-12/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- sources	16 Sep 2009 19:45:03 -0000	1.126
+++ sources	30 Sep 2009 15:23:46 -0000	1.127
@@ -1 +1 @@
-4b2c802a1568aee638c57ba173f9f2ac  pykickstart-1.63.tar.gz
+4c9a12220031967690689e34b7f6996a  pykickstart-1.64.tar.gz



From heffer at fedoraproject.org  Wed Sep 30 15:24:32 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 30 Sep 2009 15:24:32 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-12 .cvsignore, 1.8,
	1.9 php-ZendFramework.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20090930152432.B618511C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6932

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
- new upstream version
- new component: Queue
- fixed dangling symlinks
- enabled Db-Adapter-Firebird



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Jul 2009 10:00:09 -0000	1.8
+++ .cvsignore	30 Sep 2009 15:24:32 -0000	1.9
@@ -1 +1 @@
-ZendFramework-1.8.4PL1.tar.gz
+ZendFramework-1.9.3PL1.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-12/php-ZendFramework.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- php-ZendFramework.spec	26 Jul 2009 17:58:05 -0000	1.17
+++ php-ZendFramework.spec	30 Sep 2009 15:24:32 -0000	1.18
@@ -3,8 +3,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.8.4
-Release:         3.%{posttag}%{?dist}
+Version:         1.9.3
+Release:         1.%{posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,7 +33,6 @@ Requires: php-pdo
 Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
-BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -62,11 +61,8 @@ Requires: php-pear(pear.phpunit.de/PHPUn
 %if 0%{fedora} > 10
 Requires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
 Requires: bitstream-vera-serif-fonts
-BuildRequires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
-BuildRequires: bitstream-vera-serif-fonts
 %else
 Requires: bitstream-vera-fonts
-BuildRequires: bitstream-vera-fonts
 %endif
 
 %description tests
@@ -168,15 +164,15 @@ MySQL server via mysqli connector.
 # IBM DB2 database.
 
 
-# %package Db-Adapter-Firebird
-# Summary:  Zend Framework database adapter for InterBase
-# Group:    Development/Libraries
-# Requires: %{name} = %{version}-%{release}
-# Requires: php-interbase # Not available in Fedora's PHP
+%package Db-Adapter-Firebird
+Summary:  Zend Framework database adapter for InterBase
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-interbase
 
-# %description Db-Adapter-Firebird
-# This package contains the files for Zend Framework necessary to connect to a
-# Firebird/InterBase database.
+%description Db-Adapter-Firebird
+This package contains the files for Zend Framework necessary to connect to a
+Firebird/InterBase database.
 
 
 # %package Db-Adapter-Oracle
@@ -185,7 +181,7 @@ MySQL server via mysqli connector.
 # Requires: %{name} = %{version}-%{release}
 # Requires: php-oci8 # Not available in Fedora's PHP
 
-# %description Db-Adapter-Mysqli
+# %description Db-Adapter-Oracle
 # This package contains the files for Zend Framework necessary to connect to an
 # Oracle database.
 
@@ -353,18 +349,11 @@ cd ..
   $RPM_BUILD_ROOT%{_bindir}/zf
 
 # Bug 477440
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
-
 cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
-%{__rm} -f *.ttf
-
-for file in /usr/share/fonts/bitstream-vera/*.ttf
+for file in *.ttf
 do
-  touch $RPM_BUILD_ROOT${file}
+  ln -sf %{_datadir}/fonts/bitstream-vera/${file} .
 done
-%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
-symlinks -c . > /dev/null
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
 
 
 %clean
@@ -449,6 +438,8 @@ symlinks -c . > /dev/null
 %{_datadir}/php/Zend/Navigation.php
 %{_datadir}/php/Zend/OpenId
 %{_datadir}/php/Zend/OpenId.php
+%{_datadir}/php/Zend/Queue.php
+%{_datadir}/php/Zend/Queue
 %{_datadir}/php/Zend/Paginator
 %{_datadir}/php/Zend/Paginator.php
 %{_datadir}/php/Zend/ProgressBar
@@ -515,7 +506,6 @@ symlinks -c . > /dev/null
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-# php-interbase not available for Fedora
 %exclude %{_datadir}/php/ZendX/Db
 %doc LICENSE.txt extras/documentation/*
 
@@ -556,6 +546,14 @@ symlinks -c . > /dev/null
 # %{_datadir}/php/Zend/Db/Statement/Db2
 # %doc LICENSE.txt
 
+%files Db-Adapter-Firebird
+%defattr(-,root,root,-)
+%{_datadir}/php/ZendX/Db/Adapter/Firebird.php
+%{_datadir}/php/ZendX/Db/Adapter/Firebird
+%{_datadir}/php/ZendX/Db/Statement/Firebird.php
+%{_datadir}/php/ZendX/Db/Statement/Firebird
+%doc LICENSE.txt
+
 # php-oci8 not available for Fedora
 # %files Db-Adapter-Oracle
 # %defattr(-,root,root,-)
@@ -634,6 +632,12 @@ symlinks -c . > /dev/null
 
 
 %changelog
+* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
+- new upstream version
+- new component: Queue
+- fixed dangling symlinks
+- enabled Db-Adapter-Firebird
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.4-3.PL1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Jul 2009 10:00:09 -0000	1.8
+++ sources	30 Sep 2009 15:24:32 -0000	1.9
@@ -1 +1 @@
-d7374bf9b1741e2f925e8d2443475f9d  ZendFramework-1.8.4PL1.tar.gz
+87b5a65e2597389544dddb22ecef7bf8  ZendFramework-1.9.3PL1.tar.gz



From deji at fedoraproject.org  Wed Sep 30 15:25:08 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 30 Sep 2009 15:25:08 +0000 (UTC)
Subject: rpms/exaile/devel .cvsignore, 1.10, 1.11 exaile-makefile.patch, 1.3,
	1.4 exaile.spec, 1.27, 1.28 sources, 1.10, 1.11
Message-ID: <20090930152508.42F5B11C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exaile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7117

Modified Files:
	.cvsignore exaile-makefile.patch exaile.spec sources 
Log Message:
* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0.1-1
- Update to 0.3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Aug 2009 22:46:31 -0000	1.10
+++ .cvsignore	30 Sep 2009 15:25:07 -0000	1.11
@@ -1 +1 @@
-exaile-0.3.0.tar.gz
+exaile-0.3.0.1.tar.gz

exaile-makefile.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: exaile-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/exaile-makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- exaile-makefile.patch	29 Aug 2009 22:46:31 -0000	1.3
+++ exaile-makefile.patch	30 Sep 2009 15:25:07 -0000	1.4
@@ -1,5 +1,5 @@
---- Makefile	2009-08-24 17:25:03.000000000 -0400
-+++ Makefile.new	2009-08-28 19:46:25.227288689 -0400
+--- Makefile	2009-09-06 19:45:01.161376822 -0400
++++ Makefile.new	2009-09-30 10:42:46.877746915 -0400
 @@ -2,7 +2,7 @@
  LIBINSTALLDIR ?= /lib
  XDGCONFDIR ?= /etc/xdg
@@ -9,7 +9,7 @@
  EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
  
  all: compile
-@@ -87,7 +87,7 @@
+@@ -83,7 +83,7 @@
  	# the printf here is for bsd compat, dont use echo!
  	cd $(DESTDIR)$(PREFIX)/bin && \
  	 printf "#!/bin/sh\n\


Index: exaile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/exaile.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- exaile.spec	29 Aug 2009 22:46:31 -0000	1.27
+++ exaile.spec	30 Sep 2009 15:25:07 -0000	1.28
@@ -2,7 +2,7 @@
 
 Summary:	A music player
 Name:		exaile
-Version:	0.3.0
+Version:	0.3.0.1
 Release:	1%{?dist}
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/exaile/
 
 %changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0.1-1
+- Update to 0.3.0.1
+
 * Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0-1
 - Update to 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Aug 2009 22:46:31 -0000	1.10
+++ sources	30 Sep 2009 15:25:07 -0000	1.11
@@ -1 +1 @@
-8d89110396b088042f39677892829e2d  exaile-0.3.0.tar.gz
+c6bd14cea747a808570b304e647544f1  exaile-0.3.0.1.tar.gz



From ruben at fedoraproject.org  Wed Sep 30 15:24:54 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed, 30 Sep 2009 15:24:54 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/F-11
	perl-Nagios-Plugin-Beanstalk.spec, 1.1, 1.2
Message-ID: <20090930152454.5D78211C00E6@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7009

Modified Files:
	perl-Nagios-Plugin-Beanstalk.spec 
Log Message:
* Fri Sep 25 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-3
- Install plugin in nagios plugin dir



Index: perl-Nagios-Plugin-Beanstalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/F-11/perl-Nagios-Plugin-Beanstalk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Nagios-Plugin-Beanstalk.spec	24 Sep 2009 08:35:54 -0000	1.1
+++ perl-Nagios-Plugin-Beanstalk.spec	30 Sep 2009 15:24:54 -0000	1.2
@@ -1,17 +1,19 @@
+%define debug_package %{nil}
+
 Name:           perl-Nagios-Plugin-Beanstalk
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios plugin to observe Beanstalkd queue server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Nagios-Plugin-Beanstalk/
 Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugin-Beanstalk-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 BuildRequires:  perl(Beanstalk::Client)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Nagios::Plugin)
 BuildRequires:  perl(Test::More)
+Requires:	nagios-plugins
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -22,7 +24,8 @@ A Nagios plugin to observe a Beanstalkd 
 %setup -q -n Nagios-Plugin-Beanstalk-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=%{_libdir}/nagios/plugins
+
 make %{?_smp_mflags}
 
 %install
@@ -45,9 +48,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
-%{_bindir}/check_beanstalkd
+%{_libdir}/nagios/plugins/check_beanstalkd
 
 %changelog
+* Fri Sep 25 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-3
+- Install plugin in nagios plugin dir
+
 * Wed Sep 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-2
 - Clarify description
 



From heffer at fedoraproject.org  Wed Sep 30 15:26:21 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 30 Sep 2009 15:26:21 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-11 .cvsignore, 1.7,
	1.8 php-ZendFramework.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <20090930152621.8D84011C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7686

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
- new upstream version
- new component: Queue
- fixed dangling symlinks
- enabled Db-Adapter-Firebird



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Mar 2009 13:44:21 -0000	1.7
+++ .cvsignore	30 Sep 2009 15:26:21 -0000	1.8
@@ -1 +1 @@
-ZendFramework-1.7.7.tar.gz
+ZendFramework-1.9.3PL1.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-11/php-ZendFramework.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- php-ZendFramework.spec	20 Jul 2009 10:28:07 -0000	1.16
+++ php-ZendFramework.spec	30 Sep 2009 15:26:21 -0000	1.17
@@ -3,8 +3,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.8.4
-Release:         2.%{posttag}%{?dist}
+Version:         1.9.3
+Release:         1.%{posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,7 +33,6 @@ Requires: php-pdo
 Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
-BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -62,11 +61,8 @@ Requires: php-pear(pear.phpunit.de/PHPUn
 %if 0%{fedora} > 10
 Requires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
 Requires: bitstream-vera-serif-fonts
-BuildRequires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
-BuildRequires: bitstream-vera-serif-fonts
 %else
 Requires: bitstream-vera-fonts
-BuildRequires: bitstream-vera-fonts
 %endif
 
 %description tests
@@ -168,15 +164,15 @@ MySQL server via mysqli connector.
 # IBM DB2 database.
 
 
-# %package Db-Adapter-Firebird
-# Summary:  Zend Framework database adapter for InterBase
-# Group:    Development/Libraries
-# Requires: %{name} = %{version}-%{release}
-# Requires: php-interbase # Not available in Fedora's PHP
+%package Db-Adapter-Firebird
+Summary:  Zend Framework database adapter for InterBase
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-interbase
 
-# %description Db-Adapter-Firebird
-# This package contains the files for Zend Framework necessary to connect to a
-# Firebird/InterBase database.
+%description Db-Adapter-Firebird
+This package contains the files for Zend Framework necessary to connect to a
+Firebird/InterBase database.
 
 
 # %package Db-Adapter-Oracle
@@ -185,7 +181,7 @@ MySQL server via mysqli connector.
 # Requires: %{name} = %{version}-%{release}
 # Requires: php-oci8 # Not available in Fedora's PHP
 
-# %description Db-Adapter-Mysqli
+# %description Db-Adapter-Oracle
 # This package contains the files for Zend Framework necessary to connect to an
 # Oracle database.
 
@@ -353,18 +349,11 @@ cd ..
   $RPM_BUILD_ROOT%{_bindir}/zf
 
 # Bug 477440
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
-
 cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
-%{__rm} -f *.ttf
-
-for file in /usr/share/fonts/bitstream-vera/*.ttf
+for file in *.ttf
 do
-  touch $RPM_BUILD_ROOT${file}
+  ln -sf %{_datadir}/fonts/bitstream-vera/${file} .
 done
-%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
-symlinks -c . > /dev/null
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
 
 
 %clean
@@ -449,6 +438,8 @@ symlinks -c . > /dev/null
 %{_datadir}/php/Zend/Navigation.php
 %{_datadir}/php/Zend/OpenId
 %{_datadir}/php/Zend/OpenId.php
+%{_datadir}/php/Zend/Queue.php
+%{_datadir}/php/Zend/Queue
 %{_datadir}/php/Zend/Paginator
 %{_datadir}/php/Zend/Paginator.php
 %{_datadir}/php/Zend/ProgressBar
@@ -515,7 +506,6 @@ symlinks -c . > /dev/null
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-# php-interbase not available for Fedora
 %exclude %{_datadir}/php/ZendX/Db
 %doc LICENSE.txt extras/documentation/*
 
@@ -556,6 +546,14 @@ symlinks -c . > /dev/null
 # %{_datadir}/php/Zend/Db/Statement/Db2
 # %doc LICENSE.txt
 
+%files Db-Adapter-Firebird
+%defattr(-,root,root,-)
+%{_datadir}/php/ZendX/Db/Adapter/Firebird.php
+%{_datadir}/php/ZendX/Db/Adapter/Firebird
+%{_datadir}/php/ZendX/Db/Statement/Firebird.php
+%{_datadir}/php/ZendX/Db/Statement/Firebird
+%doc LICENSE.txt
+
 # php-oci8 not available for Fedora
 # %files Db-Adapter-Oracle
 # %defattr(-,root,root,-)
@@ -634,6 +632,12 @@ symlinks -c . > /dev/null
 
 
 %changelog
+* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
+- new upstream version
+- new component: Queue
+- fixed dangling symlinks
+- enabled Db-Adapter-Firebird
+
 * Mon Jul 20 2009 Alexander Kahl <akahl at iconmobile.com> - 1.8.4-2.PL1
 - removed Fileinfo dependency
 - don't make zf.sh symlink absolute (breaks the script)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Jul 2009 11:25:02 -0000	1.8
+++ sources	30 Sep 2009 15:26:21 -0000	1.9
@@ -1 +1 @@
-d7374bf9b1741e2f925e8d2443475f9d  ZendFramework-1.8.4PL1.tar.gz
+87b5a65e2597389544dddb22ecef7bf8  ZendFramework-1.9.3PL1.tar.gz



From deji at fedoraproject.org  Wed Sep 30 15:27:02 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 30 Sep 2009 15:27:02 +0000 (UTC)
Subject: rpms/bibletime/devel .cvsignore, 1.11, 1.12 bibletime.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <20090930152702.CC5FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/bibletime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8041

Modified Files:
	.cvsignore bibletime.spec sources 
Log Message:
* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 2.2-1
- Update to 2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Aug 2009 03:48:35 -0000	1.11
+++ .cvsignore	30 Sep 2009 15:27:00 -0000	1.12
@@ -1 +1 @@
-bibletime-2.1.tar.gz
+bibletime-2.2.tar.gz


Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/bibletime.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bibletime.spec	13 Aug 2009 03:48:35 -0000	1.16
+++ bibletime.spec	30 Sep 2009 15:27:01 -0000	1.17
@@ -1,6 +1,6 @@
 Summary:	BibleTime is an easy to use Bible study tool for KDE
 Name:		bibletime
-Version:	2.1
+Version:	2.2
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -82,6 +82,9 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 2.2-1
+- Update to 2.2
+
 * Wed Aug 12 2009 Deji Akingunola <dakingun at gmail.com> - 2.1-1
 - Update to 2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Aug 2009 03:48:35 -0000	1.11
+++ sources	30 Sep 2009 15:27:01 -0000	1.12
@@ -1 +1 @@
-79bb28840f655e7e5d6ce759e41dd832  bibletime-2.1.tar.gz
+ad4affc7aa847c0fd9b06cc55cc6919f  bibletime-2.2.tar.gz



From mathstuf at fedoraproject.org  Wed Sep 30 15:27:45 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 15:27:45 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement-0.9-desktop.patch, NONE,
	1.1 kde-plasma-networkmanagement.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090930152745.1725D11C00E6@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8397

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Added Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
New snapshot

kde-plasma-networkmanagement-0.9-desktop.patch:
 kded/networkmanagement.desktop           |    2 +-
 monolithic/knetworkmanager.desktop       |    2 +-
 settings/service/knetworkmanager.desktop |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kde-plasma-networkmanagement-0.9-desktop.patch ---
diff -r -U5 kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop
--- kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop	2009-09-30 11:17:27.000000000 -0400
@@ -45,6 +45,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=networkmanagement
 X-KDE-DBus-ModuleName=networkmanagement
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -64,6 +64,6 @@
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
 X-DCOP-ServiceType=Unique
 X-KDE-autostart-condition=networkmanagementrc:General:Autostart:true
 Categories=Utility;TrayIcon;System;Applet;
-
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop	2009-09-21 05:35:32.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -52,6 +52,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=knetworkmanager
 X-KDE-DBus-ModuleName=knetworkmanager
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kde-plasma-networkmanagement.spec	21 Sep 2009 14:04:32 -0000	1.20
+++ kde-plasma-networkmanagement.spec	30 Sep 2009 15:27:43 -0000	1.21
@@ -7,7 +7,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.2.20090919svn%{?dist}
+Release:        0.3.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -17,9 +17,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1025605 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
 #  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
+# Patch to get .desktop files validated
+Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -81,6 +83,7 @@ Provides:       kde-plasma-networkmanage
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop
 
 
 %build
@@ -177,6 +180,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
+- New snapshot
+
 * Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
 - Add back missing Requires:
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Sep 2009 14:04:32 -0000	1.11
+++ sources	30 Sep 2009 15:27:43 -0000	1.12
@@ -1 +1 @@
-0b75f5c48f35d47785a2bbe9a2c879e8  kde-plasma-networkmanagement-0.9.tar.bz2
+445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2



From heffer at fedoraproject.org  Wed Sep 30 15:35:39 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Wed, 30 Sep 2009 15:35:39 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-10 .cvsignore, 1.3,
	1.4 php-ZendFramework.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20090930153539.F1F1B11C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9648

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
- new upstream version
- new component: Queue
- fixed dangling symlinks
- enabled Db-Adapter-Firebird
- last update for F-10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Sep 2008 20:29:53 -0000	1.3
+++ .cvsignore	30 Sep 2009 15:35:38 -0000	1.4
@@ -1 +1 @@
-ZendFramework-1.6.0.tar.gz
+ZendFramework-1.9.3PL1.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/php-ZendFramework.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-ZendFramework.spec	20 Jul 2009 12:30:31 -0000	1.11
+++ php-ZendFramework.spec	30 Sep 2009 15:35:39 -0000	1.12
@@ -3,8 +3,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.8.4
-Release:         2.%{posttag}%{?dist}
+Version:         1.9.3
+Release:         1.%{posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,7 +33,6 @@ Requires: php-pdo
 Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
-BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -62,11 +61,8 @@ Requires: php-pear(pear.phpunit.de/PHPUn
 %if 0%{fedora} > 10
 Requires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
 Requires: bitstream-vera-serif-fonts
-BuildRequires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts
-BuildRequires: bitstream-vera-serif-fonts
 %else
 Requires: bitstream-vera-fonts
-BuildRequires: bitstream-vera-fonts
 %endif
 
 %description tests
@@ -168,15 +164,15 @@ MySQL server via mysqli connector.
 # IBM DB2 database.
 
 
-# %package Db-Adapter-Firebird
-# Summary:  Zend Framework database adapter for InterBase
-# Group:    Development/Libraries
-# Requires: %{name} = %{version}-%{release}
-# Requires: php-interbase # Not available in Fedora's PHP
+%package Db-Adapter-Firebird
+Summary:  Zend Framework database adapter for InterBase
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-interbase
 
-# %description Db-Adapter-Firebird
-# This package contains the files for Zend Framework necessary to connect to a
-# Firebird/InterBase database.
+%description Db-Adapter-Firebird
+This package contains the files for Zend Framework necessary to connect to a
+Firebird/InterBase database.
 
 
 # %package Db-Adapter-Oracle
@@ -185,7 +181,7 @@ MySQL server via mysqli connector.
 # Requires: %{name} = %{version}-%{release}
 # Requires: php-oci8 # Not available in Fedora's PHP
 
-# %description Db-Adapter-Mysqli
+# %description Db-Adapter-Oracle
 # This package contains the files for Zend Framework necessary to connect to an
 # Oracle database.
 
@@ -353,18 +349,11 @@ cd ..
   $RPM_BUILD_ROOT%{_bindir}/zf
 
 # Bug 477440
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
-
 cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
-%{__rm} -f *.ttf
-
-for file in /usr/share/fonts/bitstream-vera/*.ttf
+for file in *.ttf
 do
-  touch $RPM_BUILD_ROOT${file}
+  ln -sf %{_datadir}/fonts/bitstream-vera/${file} .
 done
-%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
-symlinks -c . > /dev/null
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
 
 
 %clean
@@ -449,6 +438,8 @@ symlinks -c . > /dev/null
 %{_datadir}/php/Zend/Navigation.php
 %{_datadir}/php/Zend/OpenId
 %{_datadir}/php/Zend/OpenId.php
+%{_datadir}/php/Zend/Queue.php
+%{_datadir}/php/Zend/Queue
 %{_datadir}/php/Zend/Paginator
 %{_datadir}/php/Zend/Paginator.php
 %{_datadir}/php/Zend/ProgressBar
@@ -515,7 +506,6 @@ symlinks -c . > /dev/null
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-# php-interbase not available for Fedora
 %exclude %{_datadir}/php/ZendX/Db
 %doc LICENSE.txt extras/documentation/*
 
@@ -556,6 +546,14 @@ symlinks -c . > /dev/null
 # %{_datadir}/php/Zend/Db/Statement/Db2
 # %doc LICENSE.txt
 
+%files Db-Adapter-Firebird
+%defattr(-,root,root,-)
+%{_datadir}/php/ZendX/Db/Adapter/Firebird.php
+%{_datadir}/php/ZendX/Db/Adapter/Firebird
+%{_datadir}/php/ZendX/Db/Statement/Firebird.php
+%{_datadir}/php/ZendX/Db/Statement/Firebird
+%doc LICENSE.txt
+
 # php-oci8 not available for Fedora
 # %files Db-Adapter-Oracle
 # %defattr(-,root,root,-)
@@ -634,6 +632,13 @@ symlinks -c . > /dev/null
 
 
 %changelog
+* Wed Sep 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.3-1.PL1
+- new upstream version
+- new component: Queue
+- fixed dangling symlinks
+- enabled Db-Adapter-Firebird
+- last update for F-10
+
 * Mon Jul 20 2009 Alexander Kahl <akahl at iconmobile.com> - 1.8.4-2.PL1
 - removed Fileinfo dependency
 - don't make zf.sh symlink absolute (breaks the script)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Jul 2009 11:37:36 -0000	1.8
+++ sources	30 Sep 2009 15:35:39 -0000	1.9
@@ -1 +1 @@
-d7374bf9b1741e2f925e8d2443475f9d  ZendFramework-1.8.4PL1.tar.gz
+87b5a65e2597389544dddb22ecef7bf8  ZendFramework-1.9.3PL1.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 30 15:37:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 15:37:22 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.91,
	1.92 policycoreutils-po.patch, 1.56,
	1.57 policycoreutils-rhat.patch, 1.446,
	1.447 policycoreutils.spec, 1.646, 1.647
Message-ID: <20090930153722.CDB7711C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10210

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-5
- Fixes for semanage -equiv, readded modules, --enable, --disable


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1183 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13949 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- policycoreutils-gui.patch	9 Sep 2009 21:07:24 -0000	1.91
+++ policycoreutils-gui.patch	30 Sep 2009 15:37:12 -0000	1.92
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.73/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.74/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/booleansPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/booleansPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -249,9 +249,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.73/gui/domainsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.74/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/domainsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/domainsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -407,9 +407,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.73/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.74/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/fcontextPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.73/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.74/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/html_util.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/html_util.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -802,9 +802,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +    doc += tail
 +    return doc
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.73/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.74/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/lockdown.glade	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.glade	2009-09-28 09:13:55.000000000 -0400
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1577,9 +1577,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.73/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.74/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/lockdown.gladep	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1588,9 +1588,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.73/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.74/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/lockdown.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1974,9 +1974,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.73/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.74/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/loginsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/loginsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2163,9 +2163,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.73/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.74/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/Makefile	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/Makefile	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -2208,9 +2208,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.73/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.74/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/mappingsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2268,9 +2268,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.73/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.74/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/modulesPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/modulesPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2462,9 +2462,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.73/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.74/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgen.glade	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.glade	2009-09-28 09:14:14.000000000 -0400
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5771,9 +5771,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.73/gui/polgen.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.74/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgen.gladep	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.gladep	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5782,9 +5782,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.73/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.74/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgengui.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgengui.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,627 @@
 +#!/usr/bin/python -E
 +#
@@ -6413,9 +6413,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.73/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgen.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,1183 @@
 +#!/usr/bin/python
 +#
@@ -7600,9 +7600,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 +    print mypolicy.generate()
 +    sys.exit(0)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.73/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.74/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/portsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/portsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7863,9 +7863,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.73/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.74/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/selinux.tbl	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/selinux.tbl	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8101,9 +8101,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.73/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.74/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/semanagePage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/semanagePage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8273,9 +8273,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.73/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.74/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/statusPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/statusPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8467,9 +8467,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.73/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/system-config-selinux.glade	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,3403 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -11874,9 +11874,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.73/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.74/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/system-config-selinux.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,189 @@
 +#!/usr/bin/python
 +#
@@ -12067,9 +12067,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.73/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/boolean.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12111,9 +12111,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.73/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/etc_rw.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-09-30 11:32:23.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12144,8 +12144,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_etc_rw_t)
 +"""
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_etc_rw_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_etc_rw_t:dir manage_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
 +files_etc_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_etc_rw_t, { file dir })
 +"""
 +
@@ -12244,9 +12244,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.73/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/executable.py	2009-09-09 14:55:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12616,9 +12616,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.73/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/__init__.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12638,9 +12638,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.73/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/network.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12722,10 +12722,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.73/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/rw.py	2009-09-08 09:21:09.000000000 -0400
-@@ -0,0 +1,128 @@
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-09-30 11:32:29.000000000 -0400
+@@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12755,8 +12755,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_rw_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_rw_t:dir create_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
 +"""
 +
 +########################### Interface File #############################
@@ -12816,8 +12816,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+	allow $1 TEMPLATETYPE_rw_t:file manage_file_perms;
-+	allow $1 TEMPLATETYPE_rw_t:dir rw_dir_perms;
++         manage_files_pattern($1, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
 +')
 +
 +########################################
@@ -12854,9 +12853,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.73/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/script.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12957,9 +12956,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Adding roles to SELinux user USER
 +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.73/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/semodule.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13002,9 +13001,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.73/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/tmp.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-09-30 11:32:04.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13035,8 +13034,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:dir create_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
 +files_tmp_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
 +"""
 +
@@ -13103,9 +13102,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.73/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/user.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13289,9 +13288,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_newrole_rules="""
 +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.73/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_lib.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13451,9 +13450,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.73/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_log.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13565,9 +13564,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.73/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_run.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13687,9 +13686,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.73/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_spool.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-09-30 11:31:43.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13720,9 +13719,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:dir manage_dir_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:sock_file manage_sock_file_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
++manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
 +files_spool_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_spool_t, { file dir sock_file })
 +"""
 +
@@ -13820,9 +13819,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.73/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.74/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/translationsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/translationsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13942,9 +13941,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.73/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.74/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/usersPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/usersPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-po.patch:
 Makefile            |   28 
 POTFILES            |   28 
 POTFILES.in         |    1 
 af.po               | 2449 +++++++++++++++++++++++--
 am.po               | 2449 +++++++++++++++++++++++--
 ar.po               | 2449 +++++++++++++++++++++++--
 as.po               | 3499 ++++++++++++++++++++++--------------
 be.po               | 2449 +++++++++++++++++++++++--
 bg.po               | 3605 ++++++++++++++++++++++---------------
 bn.po               | 2449 +++++++++++++++++++++++--
 bn_IN.po            | 4066 ++++++++++++++++++++++++------------------
 bs.po               | 2505 +++++++++++++++++++++++---
 ca.po               | 2906 +++++++++++++++++++++++++-----
 cs.po               | 2841 ++++++++++++++++++++++++-----
 cy.po               | 2449 +++++++++++++++++++++++--
 da.po               | 3128 +++++++++++++++++++++++++++-----
 de.po               | 4597 ++++++++++++++++++++++++++---------------------
 el.po               | 2512 +++++++++++++++++++++++---
 en_GB.po            | 2505 +++++++++++++++++++++++---
 es.po               | 4575 ++++++++++++++++++++++++++---------------------
 et.po               | 2447 +++++++++++++++++++++++--
 eu_ES.po            | 2449 +++++++++++++++++++++++--
 fa.po               | 2449 +++++++++++++++++++++++--
 fi.po               | 3158 ++++++++++++++++++++++++++++----
 fr.po               | 3856 +++++++++++++++++++++++-----------------
 gl.po               | 2447 +++++++++++++++++++++++--
 gu.po               | 4130 ++++++++++++++++++++++++------------------
 he.po               | 2449 +++++++++++++++++++++++--
 hi.po               | 4117 ++++++++++++++++++++++++------------------
 hr.po               | 2997 ++++++++++++++++++++-----------
 hu.po               | 3071 +++++++++++++++++++++++++++----
 hy.po               | 2449 +++++++++++++++++++++++--
 id.po               | 2447 +++++++++++++++++++++++--
 is.po               | 2449 +++++++++++++++++++++++--
 it.po               | 4531 ++++++++++++++++++++++++++---------------------
 ja.po               | 4183 ++++++++++++++++++++++++-------------------
 ka.po               | 2449 +++++++++++++++++++++++--
 kn.po               | 3841 ++++++++++-----------------------------
 ko.po               | 2793 ++++++++++++++++++++++++-----
 ku.po               | 2449 +++++++++++++++++++++++--
 lo.po               | 2449 +++++++++++++++++++++++--
 lt.po               | 2449 +++++++++++++++++++++++--
 lv.po               | 2449 +++++++++++++++++++++++--
 mai.po              | 3462 ++++++++++++++++++++++++++++++++++++
 mk.po               | 2505 +++++++++++++++++++++++---
 ml.po               | 4274 ++++++++++++++++++++++++--------------------
 mr.po               | 4156 ++++++++++++++++++++++++-------------------
 ms.po               | 2498 +++++++++++++++++++++++--
 my.po               | 2449 +++++++++++++++++++++++--
 nb.po               | 2485 +++++++++++++++++++++++--
 nl.po               | 2920 ++++++++++++++++++++++++------
 nn.po               | 2449 +++++++++++++++++++++++--
 no.po               | 1272 -------------
 nso.po              | 2449 +++++++++++++++++++++++--
 or.po               | 3984 +++++++++++++++++++++++------------------
 pa.po               | 4075 +++++++++++++++++++++++-------------------
 pl.po               | 4024 +++++++++++++++++++++++------------------
 policycoreutils.pot | 2485 +++++++++++++++++++++++--
 pt.po               | 4999 ++++++++++++++++++++++++++++------------------------
 pt_BR.po            | 4979 ++++++++++++++++++++++++++++-----------------------
 ro.po               | 2449 +++++++++++++++++++++++--
 ru.po               | 3468 +++++++++++++++++++++++-------------
 si.po               | 2449 +++++++++++++++++++++++--
 sk.po               | 2505 +++++++++++++++++++++++---
 sl.po               | 2449 +++++++++++++++++++++++--
 sq.po               | 2449 +++++++++++++++++++++++--
 sr.po               | 4125 ++++++++++++++++++++++++------------------
 sr at latin.po         | 4135 ++++++++++++++++++++++++-------------------
 sv.po               | 3165 ++++++++++++++++++++++----------
 ta.po               | 3935 ++++++++++++++++++++++++++--------------
 te.po               | 4069 +++++++++++++++++++++++-------------------
 th.po               | 2449 +++++++++++++++++++++++--
 tr.po               | 2449 +++++++++++++++++++++++--
 uk.po               | 2505 +++++++++++++++++++++++---
 ur.po               | 2449 +++++++++++++++++++++++--
 vi.po               | 2449 +++++++++++++++++++++++--
 zh_CN.po            | 3887 +++++++++++++++++++++++-----------------
 zh_TW.po            | 4174 ++++++++++++++++++++++++-------------------
 zu.po               | 2449 +++++++++++++++++++++++--
 79 files changed, 173532 insertions(+), 59940 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.56 -r 1.57 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- policycoreutils-po.patch	14 Sep 2009 19:39:09 -0000	1.56
+++ policycoreutils-po.patch	30 Sep 2009 15:37:12 -0000	1.57
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.73/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/af.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/af.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3045,9 +3045,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.73/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.74/po/am.po
 --- nsapolicycoreutils/po/am.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/am.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/am.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6092,9 +6092,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.73/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.74/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ar.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/ar.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -9139,9 +9139,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.73/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.74/po/as.po
 --- nsapolicycoreutils/po/as.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/as.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/as.po	2009-09-30 11:35:04.000000000 -0400
 @@ -1,23 +1,23 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -13726,9 +13726,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "MLS/\n"
 -#~ "MCS Level"
 -#~ msgstr "????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.73/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.74/po/be.po
 --- nsapolicycoreutils/po/be.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/be.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/be.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -16773,9 +16773,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.73/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.74/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bg.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bg.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21342,9 +21342,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgid "Requires value"
  #~ msgstr "??????? ????????"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.73/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.74/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn_IN.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bn_IN.po	2009-09-30 11:35:04.000000000 -0400
 @@ -9,10 +9,10 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -26103,9 +26103,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Enforcing\n"
 -#~ "Permissive\n"
 -#~ "Disabled\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.73/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.74/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bn.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -29150,9 +29150,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.73/po/bs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.74/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bs.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bs.po	2009-09-30 11:35:04.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -32287,9 +32287,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Zahtijeva vrijednost"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.73/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.74/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ca.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/ca.po	2009-09-30 11:35:04.000000000 -0400
 @@ -5,6 +5,8 @@
  #
  # Josep Puigdemont Casamaj? <josep.puigdemont at gmail.com>, 2006.
@@ -35811,9 +35811,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
 -#~ msgid "Options Error: %s "
 -#~ msgstr "Error en les opcions: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.73/po/cs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.74/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cs.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/cs.po	2009-09-30 11:35:04.000000000 -0400
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -39433,9 +39433,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgid "<b>Device number:</b>"
  #~ msgstr "<b>??slo za??zen?:</b>"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.73/po/cy.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.74/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cy.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/cy.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -42480,9 +42480,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.73/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.74/po/da.po
 --- nsapolicycoreutils/po/da.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/da.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/da.po	2009-09-30 11:35:04.000000000 -0400
 @@ -1,24 +1,25 @@
 -# translation of da.po to
 -# Danish messages for policycoreutils.
@@ -46376,9 +46376,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ "skal du k?re \n"
  #~ "\n"
  #~ "semodule -i %s.pp\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.73/po/de.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.74/po/de.po
 --- nsapolicycoreutils/po/de.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/de.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/de.po	2009-09-30 11:35:04.000000000 -0400
 @@ -1,28 +1,30 @@
 -# translation of policycoreutils.HEAD.de.po to German
 +# translation of policycoreutils.HEAD.de.po to
@@ -46405,7 +46405,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
 -"Language-Team: German <i18 at redhat.com>\n"
 +"POT-Creation-Date: 2008-09-09 13:24-0400\n"
-+"PO-Revision-Date: 2009-09-14 17:02+1000\n"
++"PO-Revision-Date: 2009-09-15 12:02+1000\n"
 +"Last-Translator: Hedda Peters <hpeters at redhat.com>\n"
 +"Language-Team: \n"
  "MIME-Version: 1.0\n"
@@ -46476,9 +46476,12 @@ diff --exclude-from=exclude -N -u -r nsa
  #, c-format
  msgid "Could not set exec context to %s.\n"
  msgstr "Konnte exec-Kontext nicht auf %s setzen.\n"
-@@ -99,839 +103,874 @@
+@@ -97,841 +101,876 @@
+ 
+ #: ../audit2allow/audit2allow:218
  msgid "To make this policy package active, execute:"
- msgstr "Um dieses Richtlinien-Paket zu aktivieren, f?hren sie folgendes aus:"
+-msgstr "Um dieses Richtlinien-Paket zu aktivieren, f?hren sie folgendes aus:"
++msgstr "Um dieses Richtlinien-Paket zu aktivieren, f?hren Sie folgendes aus:"
  
 -#: ../semanage/seobject.py:48
 +#: ../semanage/seobject.py:49
@@ -47265,31 +47268,36 @@ diff --exclude-from=exclude -N -u -r nsa
 +#: ../semanage/seobject.py:1261
  #, python-format
[...9229 lines suppressed...]
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.73/po/si.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.74/po/si.po
 --- nsapolicycoreutils/po/si.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/si.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/si.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -224120,9 +224538,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.73/po/sk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.74/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sk.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sk.po	2009-09-30 11:35:05.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -227257,9 +227675,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Po?aduje hodnotu"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.73/po/sl.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.74/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sl.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sl.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -230304,9 +230722,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.73/po/sq.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.74/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sq.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sq.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -233351,9 +233769,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.73/po/sr at latin.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.74/po/sr at latin.po
 --- nsapolicycoreutils/po/sr at latin.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr at latin.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sr at latin.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian(Latin) translations for policycoreutils
@@ -238224,9 +238642,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr "SELinux korisnik ?%s? je neophodan"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.73/po/sr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.74/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sr.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian translations for policycoreutils
@@ -243089,9 +243507,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr "SELinux ???????? ?%s? ?? ?????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.73/po/sv.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.74/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sv.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sv.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,16 +1,18 @@
  # Swedish messages for policycoreutils.
 -# Copyright ? 2001-2008 Free Software Foundation, Inc.
@@ -247177,9 +247595,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr "SELinux-anv?ndare \"%s\" kr?vs"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.73/po/ta.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.74/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ta.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/ta.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,28 +1,23 @@
 -# translation of ta.po to Tamil
 +# translation of policycoreutils.HEAD.ta.po to Tamil
@@ -251868,9 +252286,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "MLS/\n"
 -#~ "MCS ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.73/po/te.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.74/po/te.po
 --- nsapolicycoreutils/po/te.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/te.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/te.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,21 +1,23 @@
 -# translation of new_policycoreutils.HEAD.te.po to Telugu
 +# translation of policycoreutils.HEAD.te.po to Telugu
@@ -256649,9 +257067,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "???????\n"
 -#~ "????????\n"
 -#~ "????????\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.73/po/th.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.74/po/th.po
 --- nsapolicycoreutils/po/th.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/th.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/th.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -259696,9 +260114,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.73/po/tr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.74/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/tr.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/tr.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -262743,9 +263161,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.73/po/uk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.74/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/uk.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/uk.po	2009-09-30 11:35:05.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -265880,9 +266298,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "???????? ??????? ????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.73/po/ur.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.74/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ur.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/ur.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -268927,9 +269345,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.73/po/vi.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.74/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/vi.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/vi.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -271974,9 +272392,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.73/po/zh_CN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.74/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_CN.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/zh_CN.po	2009-09-30 11:35:05.000000000 -0400
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -276595,9 +277013,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
 -#~ msgid "SELinux user '%s' is required"
 -#~ msgstr "SELinux ?? '%s' ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.73/po/zh_TW.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.74/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_TW.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/zh_TW.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,19 +1,19 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -281513,9 +281931,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "tcp\n"
 -#~ "udp"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.73/po/zu.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.74/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zu.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/zu.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  222 +++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  265 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   97 ++--
 semanage/seobject.py                        |  229 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 2087 insertions(+), 1073 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- policycoreutils-rhat.patch	21 Sep 2009 13:54:02 -0000	1.446
+++ policycoreutils-rhat.patch	30 Sep 2009 15:37:19 -0000	1.447
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.74/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 05:45:35.000000000 -0800
-+++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-20 21:26:36.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -39,19 +39,29 @@ diff --exclude-from=exclude --exclude=se
              # This is the default if no input is specified
              f = sys.stdin
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.74/load_policy/Makefile
---- nsapolicycoreutils/load_policy/Makefile	2008-08-28 06:34:24.000000000 -0700
-+++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-20 18:26:36.000000000 -0700
-@@ -1,6 +1,6 @@
+--- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-25 15:28:19.000000000 -0400
+@@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
 -SBINDIR ?= $(PREFIX)/sbin
 +SBINDIR ?= $(DESTDIR)/sbin
++USRSBINDIR ?= $(PREFIX)/sbin
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
  
+@@ -17,6 +18,8 @@
+ 	install -m 755 $(TARGETS) $(SBINDIR)
+ 	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
+ 	install -m 644 load_policy.8 $(MANDIR)/man8/
++	-mkdir -p $(USRSBINDIR)
++	ln -s /sbin/load_policy $(USRSBINDIR)/load_policy
+ 
+ clean:
+ 	-rm -f $(TARGETS) *.o 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.74/Makefile
---- nsapolicycoreutils/Makefile	2008-08-28 06:34:24.000000000 -0700
-+++ policycoreutils-2.0.74/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/Makefile	2009-09-20 21:26:36.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 sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -59,8 +69,8 @@ diff --exclude-from=exclude --exclude=se
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.74/restorecond/Makefile
---- nsapolicycoreutils/restorecond/Makefile	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -108,15 +118,15 @@ diff --exclude-from=exclude --exclude=se
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service
---- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-20 21:26:36.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.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-24 22:59:01.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -608,8 +618,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.74/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-20 21:26:36.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -621,8 +631,8 @@ diff --exclude-from=exclude --exclude=se
 -
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.74/restorecond/restorecond.desktop
---- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -632,8 +642,8 @@ diff --exclude-from=exclude --exclude=se
 +Type=Application
 +StartupNotify=false
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.74/restorecond/restorecond.h
---- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-20 21:26:36.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -659,8 +669,8 @@ diff --exclude-from=exclude --exclude=se
  
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.74/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-20 21:26:36.000000000 -0400
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -681,14 +691,14 @@ diff --exclude-from=exclude --exclude=se
  exit $RETVAL
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
---- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
---- nsapolicycoreutils/restorecond/user.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -928,8 +938,8 @@ diff --exclude-from=exclude --exclude=se
 +}
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
---- nsapolicycoreutils/restorecond/watch.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1186,8 +1196,8 @@ diff --exclude-from=exclude --exclude=se
 +}
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.74/sandbox/Makefile
---- nsapolicycoreutils/sandbox/Makefile	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1220,116 +1230,14 @@ diff --exclude-from=exclude --exclude=se
 +	../../scripts/Lindent $(wildcard *.[ch])
 +
 +relabel:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:29:11.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-tPO8npawe6,guid=497ca5f938615eccf673a5584ab6d6e7
-+DBUS_SESSION_BUS_PID=18391
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand5EuHAP/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sand5EuHAP/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.recently-used.xbel	2009-09-20 18:29:17.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.sandboxrc policycoreutils-2.0.74/sandbox/.sand5EuHAP/.sandboxrc
---- nsapolicycoreutils/sandbox/.sand5EuHAP/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.sandboxrc	2009-09-20 18:29:10.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2 policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2	2009-09-20 18:31:06.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :2 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-xOrKqKCzxN,guid=1c095101cac51dbf1e0a2dbf4ab6d75a
-+DBUS_SESSION_BUS_PID=18477
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.gconfd/saved_state	2009-09-20 18:31:28.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343832382d302d313761313165363262366135330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343832382d302d3137613131653632623661353300000000001c00000000000000827e8470b000e8a8eb2428282828282801000000cf1fbbf301000000480000000100000002000000050000001c00000000000000827e8470b000e8a8eb2428282828282801000000cf1fbbf301000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.recently-used.xbel	2009-09-20 18:31:12.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.sandboxrc policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.sandboxrc
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.sandboxrc	2009-09-20 18:31:05.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:15.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cdg3FAXkMm,guid=0e83184f4aaf91de7fbe64e04ab6dbd7
-+DBUS_SESSION_BUS_PID=19427
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sand9auIqB/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sand9auIqB/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.gconfd/saved_state	2009-09-20 18:50:18.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346264662d302d363036353934646336636532660000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346264662d302d3630363539346463366365326600000000001c00000000000000a82a2c20e74368a8eb242828282828280100000091dd417901000000480000000100000002000000050000001c00000000000000a82a2c20e74368a8eb242828282828280100000091dd417901000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand9auIqB/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sand9auIqB/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.recently-used.xbel	2009-09-20 18:50:18.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.sandboxrc policycoreutils-2.0.74/sandbox/.sand9auIqB/.sandboxrc
---- nsapolicycoreutils/sandbox/.sand9auIqB/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.sandboxrc	2009-09-20 18:50:14.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandaH0LFh/.sandboxrc policycoreutils-2.0.74/sandbox/.sandaH0LFh/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandaH0LFh/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandaH0LFh/.sandboxrc	2009-09-20 18:50:03.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
---- nsapolicycoreutils/sandbox/sandbox	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-20 18:26:36.000000000 -0700
-@@ -0,0 +1,207 @@
+--- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-23 11:24:57.000000000 -0400
+@@ -0,0 +1,222 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
++import signal
 +
 +PROGNAME = "policycoreutils"
 +
@@ -1352,6 +1260,17 @@ diff --exclude-from=exclude --exclude=se
 +
 +random.seed(None)
 +
++def sighandler(signum, frame):
++    print "exiting on signal %s" % signum
++    signal.signal(signum,  signal.SIG_IGN)
++    os.kill(0, signum)
++    raise KeyboardInterrupt
++
++def setup_sighandlers():
++    signal.signal(signal.SIGHUP,  sighandler)
++    signal.signal(signal.SIGQUIT, sighandler)
++    signal.signal(signal.SIGTERM, sighandler)
++
 +def error_exit(msg):
 +    sys.stderr.write("%s: " % sys.argv[0])
 +    sys.stderr.write("%s\n" % msg)
@@ -1415,6 +1334,7 @@ diff --exclude-from=exclude --exclude=se
 +              copyfile(f,"/tmp", newtmpdir)
 +
 +if __name__ == '__main__':
++    setup_sighandlers()
 +    if selinux.is_selinux_enabled() != 1:
 +        error_exit("Requires an SELinux enabled system")
 +        
@@ -1531,12 +1451,14 @@ diff --exclude-from=exclude --exclude=se
 +           error_exit(_("Invalid value %s") % error.args[0])
 +    except IOError, error:
 +           error_exit(error.args[1])
-+        
++    except KeyboardInterrupt:
++           rc = 0
++           
 +    sys.exit(rc)
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.74/sandbox/sandbox.8
---- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1565,8 +1487,8 @@ diff --exclude-from=exclude --exclude=se
 +runcon(1)
 +.PP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.74/sandbox/sandboxX.sh
---- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-20 18:51:31.000000000 -0700
+--- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-20 21:51:31.000000000 -0400
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1584,545 +1506,9 @@ diff --exclude-from=exclude --exclude=se
 +kill -HUP 0
 +break
 +done
-Binary files nsapolicycoreutils/sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandca9QI3/.sandboxrc policycoreutils-2.0.74/sandbox/.sandca9QI3/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandca9QI3/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandca9QI3/.sandboxrc	2009-09-20 18:50:27.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-Binary files nsapolicycoreutils/sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDkHGLK/.sandboxrc policycoreutils-2.0.74/sandbox/.sandDkHGLK/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandDkHGLK/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDkHGLK/.sandboxrc	2009-09-20 18:51:37.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:43:52.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-XDwPExYfIi,guid=adec649dfa1a8bd855054ed94ab6da58
-+DBUS_SESSION_BUS_PID=19095
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandDU27fU/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandDU27fU/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.gconfd/saved_state	2009-09-20 18:43:56.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346139332d302d316561646230353261343636310000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346139332d302d3165616462303532613436363100000000001c0000000000000059c8e8a8bb622828eb242828282828280100000022a8b89801000000480000000100000002000000050000001c0000000000000059c8e8a8bb622828eb242828282828280100000022a8b89801000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandDU27fU/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandDU27fU/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.recently-used.xbel	2009-09-20 18:43:56.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.sandboxrc policycoreutils-2.0.74/sandbox/.sandDU27fU/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandDU27fU/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.sandboxrc	2009-09-20 18:43:51.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:49.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-9sxjAoKmU1,guid=635ecdfe5313853941699f3c4ab6db81
-+DBUS_SESSION_BUS_PID=19273
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandEwfYil/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandEwfYil/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.gconfd/saved_state	2009-09-20 18:48:53.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346234342d302d353962333062343032633766330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346234342d302d3539623330623430326337663300000000001c000000000000007f8470980ca3a828eb2428282828282801000000440e9ebe01000000480000000100000002000000050000001c000000000000007f8470980ca3a828eb2428282828282801000000440e9ebe01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandEwfYil/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandEwfYil/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.recently-used.xbel	2009-09-20 18:48:53.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.sandboxrc policycoreutils-2.0.74/sandbox/.sandEwfYil/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandEwfYil/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.sandboxrc	2009-09-20 18:48:49.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:51:41.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-SS7TyVm1DO,guid=f1c44cf39424360da4f412464ab6dc2d
-+DBUS_SESSION_BUS_PID=19638
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gconfd/saved_state	2009-09-20 18:51:44.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346362312d302d353139386637353961326462330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346362312d302d3531393866373539613264623300000000001c0000000000000041f8886819642828eb24282828282828010000001cfc38b001000000480000000100000002000000050000001c0000000000000041f8886819642828eb24282828282828010000001cfc38b001000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed	2009-09-20 18:51:41.000000000 -0700
-@@ -0,0 +1,3 @@
-+
-+[Evince]
-+documents=empty-window;
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.sandboxrc policycoreutils-2.0.74/sandbox/.sandFvSaCB/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.sandboxrc	2009-09-20 18:51:40.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandfXZ7O0/.sandboxrc policycoreutils-2.0.74/sandbox/.sandfXZ7O0/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandfXZ7O0/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandfXZ7O0/.sandboxrc	2009-09-20 18:51:13.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandGljofi/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandGljofi/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandGljofi/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandGljofi/.gconfd/saved_state	2009-09-20 18:35:38.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343931302d302d373632313236323935623534310000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343931302d302d3736323132363239356235343100000000001c00000000000000dec6f4904881e8a8eb2428282828282801000000b70b778f01000000480000000100000002000000050000001c00000000000000dec6f4904881e8a8eb2428282828282801000000b70b778f01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:09.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-wm3V6XS1BH,guid=834e597a2191494022c5dbcd4ab6dbd1
-+DBUS_SESSION_BUS_PID=19399
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandgWA5fU/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.gconfd/saved_state	2009-09-20 18:50:12.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346263312d302d336364633665643236343239000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346263312d302d3363646336656432363432390000000000001c0000000000000040fa8c60794368a8eb24282828282828010000007d3db9b101000000480000000100000002000000050000001c0000000000000040fa8c60794368a8eb24282828282828010000007d3db9b101000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandgWA5fU/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.recently-used.xbel	2009-09-20 18:50:12.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.sandboxrc policycoreutils-2.0.74/sandbox/.sandgWA5fU/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.sandboxrc	2009-09-20 18:50:08.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:41:58.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-3eOkeaFHzR,guid=e8e2d3e31ed54d2678cc388e4ab6d9e6
-+DBUS_SESSION_BUS_PID=18956
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandhGC2MA/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.gconfd/saved_state	2009-09-20 18:42:04.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346130372d302d623231643561336435386663000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346130372d302d6232316435613364353866630000000000001c00000000000000223e04709f02e8a8eb24282828282828010000007a954ffb01000000480000000100000002000000050000001c00000000000000223e04709f02e8a8eb24282828282828010000007a954ffb01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandhGC2MA/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.recently-used.xbel	2009-09-20 18:42:03.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.sandboxrc policycoreutils-2.0.74/sandbox/.sandhGC2MA/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.sandboxrc	2009-09-20 18:41:58.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:32.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-spRMvWreBA,guid=dbc49f7f1fdc92aed762a27f4ab6dbe8
-+DBUS_SESSION_BUS_PID=19516
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gconfd/saved_state	2009-09-20 18:50:37.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346333372d302d333235393933376261316262000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346333372d302d3332353939333762613162620000000000001c000000000000009948e8a81f642828eb24282828282828010000000cb4c02801000000480000000100000002000000050000001c000000000000009948e8a81f642828eb24282828282828010000000cb4c02801000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml	2009-09-20 18:50:34.000000000 -0700
-@@ -0,0 +1,9 @@
-+<?xml version="1.0"?>
-+<metadata>
-+  <document uri="file:///home/dwalsh/d" atime="1253497832">
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+  <document uri="last-used-value" atime="1253497832">
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+</metadata>
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.recently-used.xbel	2009-09-20 18:50:37.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.sandboxrc policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.sandboxrc	2009-09-20 18:50:32.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince d
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandm8rUJi/.sandboxrc policycoreutils-2.0.74/sandbox/.sandm8rUJi/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandm8rUJi/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandm8rUJi/.sandboxrc	2009-09-20 18:49:10.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:52:03.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-eCyP2ZHgv3,guid=a600a08dd74abe0f38b442554ab6dc43
-+DBUS_SESSION_BUS_PID=19667
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandMsqk5z/Documents/College.pdf and policycoreutils-2.0.74/sandbox/.sandMsqk5z/Documents/College.pdf differ
-Binary files nsapolicycoreutils/sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gconfd/saved_state	2009-09-20 18:52:08.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346363662d302d316437383165343639306335000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346363662d302d3164373831653436393063350000000000001c00000000000000d7d4d0d807a4a828eb24282828282828010000001e42fe8601000000480000000100000002000000050000001c00000000000000d7d4d0d807a4a828eb24282828282828010000001e42fe8601000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml	2009-09-20 18:52:05.000000000 -0700
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<metadata>
-+  <document uri="file:///home/dwalsh/Documents/College.pdf" atime="1253497923">
-+    <entry key="sidebar_page" type="gchararray" value="thumbnails"/>
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+  <document uri="last-used-value" atime="1253497923">
-+    <entry key="sidebar_page" type="gchararray" value="thumbnails"/>
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+</metadata>
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandMsqk5z/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.recently-used.xbel	2009-09-20 18:52:08.000000000 -0700
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+>
-+  <bookmark href="file:///home/dwalsh/Documents/College.pdf" added="2009-09-21T01:52:03Z" modified="2009-09-21T01:52:03Z" visited="2009-09-21T01:52:03Z">
-+    <info>
-+      <metadata owner="http://freedesktop.org">
-+        <mime:mime-type type="application/pdf"/>
-+        <bookmark:applications>
-+          <bookmark:application name="Document Viewer" exec="&apos;evince %u&apos;" modified="2009-09-21T01:52:03Z" count="1"/>
-+        </bookmark:applications>
-+      </metadata>
-+    </info>
-+  </bookmark>
-+</xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.sandboxrc policycoreutils-2.0.74/sandbox/.sandMsqk5z/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.sandboxrc	2009-09-20 18:52:02.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince /home/dwalsh/Documents/College.pdf
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:47:42.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-P54hariU2d,guid=05b16df695d69b77e7b530304ab6db3e
-+DBUS_SESSION_BUS_PID=19199
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sando4RPnA/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sando4RPnA/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.gconfd/saved_state	2009-09-20 18:47:47.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346166612d302d373862373933386135636237300000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346166612d302d3738623739333861356362373000000000001c00000000000000827e84706202e8a8eb2428282828282801000000868d9fbb01000000480000000100000002000000050000001c00000000000000827e84706202e8a8eb2428282828282801000000868d9fbb01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sando4RPnA/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sando4RPnA/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.recently-used.xbel	2009-09-20 18:47:47.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.sandboxrc policycoreutils-2.0.74/sandbox/.sando4RPnA/.sandboxrc
---- nsapolicycoreutils/sandbox/.sando4RPnA/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.sandboxrc	2009-09-20 18:47:41.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandqdddIr/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandqdddIr/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandqdddIr/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandqdddIr/.gconfd/saved_state	2009-09-20 18:32:20.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343836632d302d313636393239626536636239390000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343836632d302d3136363932396265366362393900000000001c00000000000000905acce0d44068a8eb24282828282828010000005807bdc901000000480000000100000002000000050000001c00000000000000905acce0d44068a8eb24282828282828010000005807bdc901000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandr0OyvJ/.sandboxrc policycoreutils-2.0.74/sandbox/.sandr0OyvJ/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandr0OyvJ/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandr0OyvJ/.sandboxrc	2009-09-20 18:50:55.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandTHLOge/.sandboxrc policycoreutils-2.0.74/sandbox/.sandTHLOge/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandTHLOge/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandTHLOge/.sandboxrc	2009-09-20 18:50:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinc
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandU2xZMV/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandU2xZMV/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandU2xZMV/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandU2xZMV/.gconfd/saved_state	2009-09-20 18:34:09.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d343863392d302d323037643136316365636230000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d343863392d302d3230376431363163656362300000000000001c00000000000000fc827c80b1c068a8eb24282828282828010000008c1b316501000000480000000100000002000000050000001c00000000000000fc827c80b1c068a8eb24282828282828010000008c1b316501000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:01.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-XXbHt6cdJ0,guid=e30722c9dfbd86c8d83d901d4ab6db51
-+DBUS_SESSION_BUS_PID=19234
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sanduaug79/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sanduaug79/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.gconfd/saved_state	2009-09-20 18:48:06.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346231652d302d343336353837373237633538630000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346231652d302d3433363538373732376335386300000000001c0000000000000021380868b6632828eb2428282828282801000000381448f001000000480000000100000002000000050000001c0000000000000021380868b6632828eb2428282828282801000000381448f001000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sanduaug79/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sanduaug79/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.recently-used.xbel	2009-09-20 18:48:06.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.sandboxrc policycoreutils-2.0.74/sandbox/.sanduaug79/.sandboxrc
---- nsapolicycoreutils/sandbox/.sanduaug79/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.sandboxrc	2009-09-20 18:48:00.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:46:23.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-5ZD3S9bft3,guid=0d5ef668ed9bdbf6ae8ab5914ab6daef
-+DBUS_SESSION_BUS_PID=19160
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandutCK9C/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandutCK9C/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.gconfd/saved_state	2009-09-20 18:46:26.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346164332d302d343539643064643463623432320000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346164332d302d3435396430646434636234323200000000001c00000000000000caeea430cb02e8a8eb2428282828282801000000c2dde79301000000480000000100000002000000050000001c00000000000000caeea430cb02e8a8eb2428282828282801000000c2dde79301000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed policycoreutils-2.0.74/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed
---- nsapolicycoreutils/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed	2009-09-20 18:46:24.000000000 -0700
-@@ -0,0 +1,3 @@
-+
-+[Evince]
-+documents=empty-window;
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.sandboxrc policycoreutils-2.0.74/sandbox/.sandutCK9C/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandutCK9C/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.sandboxrc	2009-09-20 18:46:23.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:59.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-nZ6H1CwYTL,guid=218b75054435610d0a4bb5774ab6db8b
-+DBUS_SESSION_BUS_PID=19308
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sanduzC9A9/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.gconfd/saved_state	2009-09-20 18:49:08.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346236372d302d333463366265393465313965340000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346236372d302d3334633662653934653139653400000000001c000000000000008968a8284f632828eb2428282828282801000000a2d828c801000000480000000100000002000000050000001c000000000000008968a8284f632828eb2428282828282801000000a2d828c801000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sanduzC9A9/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.recently-used.xbel	2009-09-20 18:49:08.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.sandboxrc policycoreutils-2.0.74/sandbox/.sanduzC9A9/.sandboxrc
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.sandboxrc	2009-09-20 18:48:59.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:43:04.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-IK0B4vyQB6,guid=2412a23e2a1cad56ad0e693b4ab6da28
-+DBUS_SESSION_BUS_PID=19026
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandv0FPZq/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.gconfd/saved_state	2009-09-20 18:43:08.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346134652d302d653532633038643430626461000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346134652d302d6535326330386434306264610000000000001c000000000000009754d0d886a2a828eb242828282828280100000024f6561601000000480000000100000002000000050000001c000000000000009754d0d886a2a828eb242828282828280100000024f6561601000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandv0FPZq/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.recently-used.xbel	2009-09-20 18:43:08.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.sandboxrc policycoreutils-2.0.74/sandbox/.sandv0FPZq/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.sandboxrc	2009-09-20 18:43:04.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandxW7Kqn/.sandboxrc policycoreutils-2.0.74/sandbox/.sandxW7Kqn/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandxW7Kqn/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandxW7Kqn/.sandboxrc	2009-09-20 18:50:24.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evincdd
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:42:34.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-HOpff6V9mX,guid=e42f34a85c84b5d478ca18b64ab6da0a
-+DBUS_SESSION_BUS_PID=18991
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandzKCpug/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandzKCpug/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.gconfd/saved_state	2009-09-20 18:42:38.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346132622d302d353865373764613765386162370000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346132622d302d3538653737646137653861623700000000001c0000000000000062be0470b302e8a8eb24282828282828010000001183a3e301000000480000000100000002000000050000001c0000000000000062be0470b302e8a8eb24282828282828010000001183a3e301000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandzKCpug/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandzKCpug/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.recently-used.xbel	2009-09-20 18:42:38.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.sandboxrc policycoreutils-2.0.74/sandbox/.sandzKCpug/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandzKCpug/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.sandboxrc	2009-09-20 18:42:34.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.74/sandbox/seunshare differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c
---- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-20 18:48:31.000000000 -0700
+--- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-20 21:48:31.000000000 -0400
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -2389,10 +1775,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.74/sandbox/seunshare.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.74/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2009-06-23 12:36:07.000000000 -0700
-+++ policycoreutils-2.0.74/scripts/chcat	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
++++ policycoreutils-2.0.74/scripts/chcat	2009-09-20 21:26:36.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -2403,8 +1788,8 @@ diff --exclude-from=exclude --exclude=se
      sys.exit(errors)
      
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2008-08-28 06:34:24.000000000 -0700
-+++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -2415,9 +1800,38 @@ diff --exclude-from=exclude --exclude=se
  install: all
  	-mkdir -p $(BINDIR)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.74/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2009-09-08 06:03:10.000000000 -0700
-+++ policycoreutils-2.0.74/semanage/semanage	2009-09-20 18:26:36.000000000 -0700
-@@ -85,6 +85,7 @@
+--- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.74/semanage/semanage	2009-09-30 11:07:29.000000000 -0400
+@@ -39,19 +39,26 @@
+        __builtin__.__dict__['_'] = unicode
+ 
+ if __name__ == '__main__':
++        action  = False
+ 
++        def set_action(option):
++               global action
++               if action:
++                      raise ValueError(_("%s bad option") % option)
++               action = True
++                      
+ 	def usage(message = ""):
+                text = _("""
+ semanage [ -S store ] -i [ input_file | - ]
+ 
+-semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
++semanage {boolean|login|user|port|interface|module|node|fcontext} -{l|D} [-n]
+ semanage login -{a|d|m} [-sr] login_name | %groupname
+ semanage user -{a|d|m} [-LrRP] selinux_name
+ semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
+ semanage interface -{a|d|m} [-tr] interface_spec
++semanage module -{a|d|m} [--enable|--disable] module
+ semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
+ semanage fcontext -{a|d|m} [-frst] file_spec
+-semanage translation -{a|d|m} [-T] level
+ semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
+ semanage permissive -{d|a} type
+ semanage dontaudit [ on | off ]
+@@ -85,14 +92,15 @@
          -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
@@ -2425,7 +1839,45 @@ 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")
-@@ -194,6 +195,7 @@
+-	-T, --trans      SELinux Level Translation (MLS/MCS Systems only)
+-
+ 	-s, --seuser     SELinux User Name
+ 	-t, --type       SELinux Type for the object
+ 	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
++        --enable         Enable a module
++        --disable        Disable a module
+ """)
+                raise ValueError("%s\n%s" % (text, message))
+ 		
+@@ -115,11 +123,11 @@
+ 		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range']
+ 		valid_option["node"] = []
+ 		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
++		valid_option["module"] = []
++		valid_option["module"] += valid_everyone + [ '--enable', '--disable']
+ 		valid_option["fcontext"] = []
+ 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+ 		valid_option["dontaudit"] = [ '-S', '--store' ]
+-		valid_option["translation"] = []
+-		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
+ 		valid_option["boolean"] = []
+ 		valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] 
+ 		valid_option["permissive"] = []
+@@ -180,7 +188,6 @@
+ 		selevel = ""
+ 		setype = ""
+ 		ftype = ""
+-		setrans = ""
+ 		roles = ""
+ 		seuser = ""
+ 		prefix = "user"
+@@ -190,10 +197,13 @@
+ 		modify = False
+ 		delete = False
+ 		deleteall = False
++		enable = False
++		disable = False
+ 		list = False
  		locallist = False
  		use_file = False
                  store = ""
@@ -2433,40 +1885,120 @@ diff --exclude-from=exclude --exclude=se
  			
  		object = argv[0]
  		option_dict=get_options()
-@@ -203,10 +205,11 @@
+@@ -203,10 +213,13 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
 -					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
-+					    '01ade:f:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
++					    '01ade:f:i:lhmnp:s:FCDR:L:r:t:P:S:M:',
  					    ['add',
  					     'delete',
  					     'deleteall',
 +					     'equal=',
++					     'enable',
++					     'disable',
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -250,6 +253,9 @@
+@@ -225,7 +238,6 @@
+ 					     'level=',
+ 					     'roles=',
+ 					     'type=',
+-					     'trans=',
+ 					     'prefix=',
+                                              'mask='
+ 					     ])
+@@ -235,26 +247,39 @@
+ 				
+ 		for o,a in gopts:
+ 			if o == "-a" or o == "--add":
+-				if modify or delete:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				add = True
+ 				
+ 			if o == "-d"  or o == "--delete":
+-				if modify or add:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				delete = True
++
+ 			if o == "-D"  or o == "--deleteall":
+-				if modify:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				deleteall = True
++
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
 +			if o == "-e"  or o == "--equal":
 +				equal = a
 +
++			if o == "--enable":
++                                if disable:
++                                       raise ValueError(_("You can't disable and enable at the same time"))
++
++				enable = True
++
++			if o == "--disable":
++                                if enable:
++                                       raise ValueError(_("You can't disable and enable at the same time"))
++				disable = True
++
  			if o == "-F"  or o == "--file":
  				use_file = True
  
-@@ -326,6 +332,9 @@
+ 			if o == "-h" or o == "--help":
+-                               raise ValueError(_("%s bad option") % o)
++                               raise usage()
+ 
+ 			if o == "-n" or o == "--noheading":
+ 				heading = False
+@@ -263,8 +288,7 @@
+ 				locallist = True
+ 
+ 			if o == "-m"or o == "--modify":
+-				if delete or add:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				modify = True
+ 				
+ 			if o == "-S" or o == '--store':
+@@ -297,9 +321,6 @@
+ 			if o == "-t" or o == "--type":
+ 				setype = a
+ 
+-			if o == "-T" or o == "--trans":
+-				setrans = a
+-
+                         if o == "--on" or o == "-1":
+                                value = "on"
+                         if o == "--off" or o == "-0":
+@@ -325,9 +346,10 @@
+ 		
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
++                        modify = True
  		
+-		if object == "translation":
+-			OBJECT = seobject.setransRecords()
 +		if object == "module":
 +			OBJECT = seobject.moduleRecords(store)
-+		
- 		if object == "translation":
- 			OBJECT = seobject.setransRecords()
  		
-@@ -370,11 +379,17 @@
+ 		if object == "permissive":
+ 			OBJECT = seobject.permissiveRecords(store)
+@@ -358,9 +380,6 @@
+ 			if object == "login":
+ 				OBJECT.add(target, seuser, serange)
+ 
+-			if object == "translation":
+-				OBJECT.add(target, setrans)
+-
+ 			if object == "user":
+ 				OBJECT.add(target, roles.split(), selevel, serange, prefix)
+ 
+@@ -370,11 +389,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -2485,17 +2017,29 @@ diff --exclude-from=exclude --exclude=se
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -394,6 +409,9 @@
+@@ -387,13 +412,18 @@
+ 			if object == "login":
+ 				OBJECT.modify(target, seuser, serange)
+ 
+-			if object == "translation":
+-				OBJECT.modify(target, setrans)
+-
+ 			if object == "user":
  				rlist = roles.split()
  				OBJECT.modify(target, rlist, selevel, serange, prefix)
  
 +			if object == "module":
-+				OBJECT.modify(target)
++                                if enable:
++                                       OBJECT.enable(target)
++                                elif disable:
++                                       OBJECT.disable(target)
++                                else:
++                                       OBJECT.modify(target)
 +
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -404,7 +422,10 @@
+@@ -404,7 +434,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -2507,10 +2051,272 @@ diff --exclude-from=exclude --exclude=se
  
                          return
  
+@@ -423,7 +456,7 @@
+ 
+                         return
+ 
+-                raise ValueError(_("Invalid command") % " ".join(argv))
++                raise ValueError(_("Invalid command: semanage %s") % " ".join(argv))
+ 
+ 	#
+ 	# 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2009-09-08 06:03:10.000000000 -0700
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-20 18:26:36.000000000 -0700
-@@ -1586,9 +1586,16 @@
+--- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-30 11:07:37.000000000 -0400
+@@ -195,88 +195,6 @@
+ 	else:
+ 		return raw
+ 	
+-class setransRecords:
+-	def __init__(self):
+-		self.filename = selinux.selinux_translations_path()
+-		try:
+-			fd = open(self.filename, "r")
+-			translations = fd.readlines()
+-			fd.close()
+-		except IOError, e:
+-			raise ValueError(_("Unable to open %s: translations not supported on non-MLS machines: %s") % (self.filename, e) )
+-			
+-		self.ddict = {}
+-		self.comments = []
+-		for r in translations:
+-			if len(r) == 0:
+-				continue
+-			i = r.strip()
+-			if i == "" or i[0] == "#":
+-				self.comments.append(r)
+-				continue
+-			i = i.split("=")
+-			if len(i) != 2:
+-				self.comments.append(r)
+-				continue
+-                        if self.ddict.has_key(i[0]) == 0:
+-                               self.ddict[i[0]] = i[1]
+-
+-	def get_all(self):
+-		return self.ddict
+-
+-	def out(self):
+-		rec = ""
+-		for c in self.comments:
+-			rec += c
+-		keys = self.ddict.keys()
+-		keys.sort()
+-		for k in keys:
+-			rec += "%s=%s\n" %  (k, self.ddict[k])
+-		return rec
+-	
+-	def list(self, heading = 1, locallist = 0):
+-		if heading:
+-			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
+-		keys = self.ddict.keys()
+-		keys.sort()
+-		for k in keys:
+-			print "%-25s %s" % (k, self.ddict[k])
+-		
+-	def add(self, raw, trans):
+-		if trans.find(" ") >= 0:
+-			raise ValueError(_("Translations can not contain spaces '%s' ") % trans)
+-
+-		if validate_level(raw) == None:
+-			raise ValueError(_("Invalid Level '%s' ") % raw)
+-		
+-		if self.ddict.has_key(raw):
+-			raise ValueError(_("%s already defined in translations") % raw)
+-		else:
+-			self.ddict[raw] = trans
+-		self.save()
+-	
+-	def modify(self, raw, trans):
+-		if trans.find(" ") >= 0:
+-
+-			raise ValueError(_("Translations can not contain spaces '%s' ") % trans)
+-		if self.ddict.has_key(raw):
+-			self.ddict[raw] = trans
+-		else:
+-			raise ValueError(_("%s not defined in translations") % raw)
+-		self.save()
+-		
+-	def delete(self, raw):
+-		self.ddict.pop(raw)
+-		self.save()
+-
+-	def save(self):
+-		(fd, newfilename) = tempfile.mkstemp('', self.filename)
+-		os.write(fd, self.out())
+-		os.close(fd)
+-		os.chmod(newfilename, os.stat(self.filename)[stat.ST_MODE])
+-		os.rename(newfilename, self.filename)
+-                os.system("/sbin/service mcstrans reload > /dev/null")
+-
+ class semanageRecords:
+ 	def __init__(self, store):
+                global handle
+@@ -315,17 +233,6 @@
+                self.transaction = False
+                self.commit()
+ 
+-class dontauditClass(semanageRecords):
+-	def __init__(self, store):
+-               semanageRecords.__init__(self, store)
+-
+-	def toggle(self, dontaudit):
+-               if dontaudit not in [ "on", "off" ]:
+-                      raise ValueError(_("dontaudit requires either 'on' or 'off'"))
+-               self.begin()
+-               rc = semanage_set_disable_dontaudit(self.sh, dontaudit == "off")
+-               self.commit()
+-               
+ class permissiveRecords(semanageRecords):
+ 	def __init__(self, store):
+                semanageRecords.__init__(self, store)
+@@ -341,6 +248,7 @@
+                       name = semanage_module_get_name(mod)
+                       if name and name.startswith("permissive_"):
+                              l.append(name.split("permissive_")[1])
++
+                return l
+ 
+ 	def list(self, heading = 1, locallist = 0):
+@@ -403,6 +311,88 @@
+                       all = " ".join(l)
+                       self.delete(all)
+ 
++class moduleRecords(semanageRecords):
++	def __init__(self, store):
++               semanageRecords.__init__(self, store)
++
++	def get_all(self):
++               l = []
++               (rc, mlist, number) = semanage_module_list(self.sh)
++               if rc < 0:
++                      raise ValueError(_("Could not list SELinux modules"))
++
++               for i in range(number):
++                      mod = semanage_module_list_nth(mlist, i)
++                      l.append((semanage_module_get_name(mod), semanage_module_get_version(mod), semanage_module_get_enabled(mod)))
++               return l
++
++	def list(self, heading = 1, locallist = 0):
++		if heading:
++			print "\n%-25s%-10s\n" % (_("Modules Name"), _("Version"))
++                for t in self.get_all():
++                       if t[2] == 0:
++                              disabled = _("Disabled")
++                       else:
++                              disabled = ""
++                       print "%-25s%-10s%s" % (t[0], t[1], disabled)
++
++	def add(self, file):
++               rc = semanage_module_install_file(self.sh, file);
++               if rc >= 0:
++                      self.commit()
++
++	def disable(self, module):
++               need_commit = False                      
++               for m in module.split():
++                      rc = semanage_module_disable(self.sh, m)
++                      if rc < 0 and rc != -3:
++                             raise ValueError(_("Could not disable module %s (remove failed)") % m)
++                      if rc != -3:
++                             need_commit = True 
++               if need_commit:
++                      self.commit()
++			
++	def enable(self, module):
++               need_commit = False                      
++               for m in module.split():
++                      rc = semanage_module_enable(self.sh, m)
++                      if rc < 0 and rc != -3:
++                             raise ValueError(_("Could not enable module %s (remove failed)") % m)
++                      if rc != -3:
++                             need_commit = True 
++               if need_commit:
++                      self.commit()
++
++	def modify(self, file):
++               rc = semanage_module_update_file(self.sh, file);
++               if rc >= 0:
++                      self.commit()
++
++	def delete(self, module):
++               for m in module.split():
++                      rc = semanage_module_remove(self.sh, m)
++                      if rc < 0 and rc != -2:
++                             raise ValueError(_("Could not remove module %s (remove failed)") % m)
++                      
++               self.commit()
++			
++	def deleteall(self):
++               l = self.get_all()
++               if len(l) > 0:
++                      all = " ".join(l[0])
++                      self.delete(all)
++
++class dontauditClass(semanageRecords):
++	def __init__(self, store):
++               semanageRecords.__init__(self, store)
++
++	def toggle(self, dontaudit):
++               if dontaudit not in [ "on", "off" ]:
++                      raise ValueError(_("dontaudit requires either 'on' or 'off'"))
++               self.begin()
++               rc = semanage_set_disable_dontaudit(self.sh, dontaudit == "off")
++               self.commit()
++               
+ class loginRecords(semanageRecords):
+ 	def __init__(self, store = ""):
+ 		semanageRecords.__init__(self, store)
+@@ -1420,6 +1410,48 @@
+ class fcontextRecords(semanageRecords):
+ 	def __init__(self, store = ""):
+ 		semanageRecords.__init__(self, store)
++                self.equiv = {}
++                self.equal_ind = False
++                try:
++                       fd = open(selinux.selinux_file_context_subs_path(), "r")
++                       for i in fd.readlines():
++                              src, dst = i.split()
++                              self.equiv[src] = dst
++                       fd.close()
++                except IOError:
++                       pass
++
++        def commit(self):
++                if self.equal_ind:
++                       subs_file = selinux.selinux_file_context_subs_path()
++                       tmpfile = "%s.tmp" % subs_file
++                       fd = open(tmpfile, "w")
++                       for src in self.equiv.keys():
++                              fd.write("%s %s\n" % (src, self.equiv[src]))
++                       fd.close()
++                       try:
++                              os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE])
++                       except:
++                              pass
++                       os.rename(tmpfile,subs_file)
++                       self.equal_ind = False
++		semanageRecords.commit(self)
++
++        def add_equal(self, src, dst):
++                self.begin()
++                if src in self.equiv.keys():
++                       raise ValueError(_("Equivalence class for %s already exists") % src)
++                self.equiv[src] = dst
++                self.equal_ind = True
++                self.commit()
++
++        def modify_equal(self, src, dst):
++                self.begin()
++                if src not in self.equiv.keys():
++                       raise ValueError(_("Equivalence class for %s does not exists") % src)
++                self.equiv[src] = dst
++                self.equal_ind = True
++                self.commit()
+ 
+         def createcon(self, target, seuser = "system_u"):
+                 (rc, con) = semanage_context_create(self.sh)
+@@ -1586,9 +1618,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -2527,7 +2333,7 @@ diff --exclude-from=exclude --exclude=se
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
-@@ -1644,11 +1651,11 @@
+@@ -1644,11 +1683,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -2542,15 +2348,9 @@ diff --exclude-from=exclude --exclude=se
  			if fcon_dict[k]:
  				if is_mls_enabled:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.74/semodule/semodule.8
---- nsapolicycoreutils/semodule/semodule.8	2009-09-17 05:59:43.000000000 -0700
-+++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-20 18:26:36.000000000 -0700
-@@ -30,11 +30,17 @@
- install/replace a module package
- .TP
- .B  \-u,\-\-upgrade=MODULE_PKG
--upgrade an existing module package, or install if the module does not exist
-+upgrade an existing module package
- .TP
+--- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-25 15:21:16.000000000 -0400
+@@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
  .TP
@@ -2564,8 +2364,8 @@ diff --exclude-from=exclude --exclude=se
  remove existing module
  .TP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.74/semodule/semodule.c
---- nsapolicycoreutils/semodule/semodule.c	2009-09-17 05:59:43.000000000 -0700
-+++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-20 21:26:36.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -2684,17 +2484,8 @@ diff --exclude-from=exclude --exclude=se
  						    (m);
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.74/setfiles/Makefile
---- nsapolicycoreutils/setfiles/Makefile	2009-07-07 12:32:32.000000000 -0700
-+++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-20 18:26:36.000000000 -0700
-@@ -5,7 +5,7 @@
- LIBDIR ?= $(PREFIX)/lib
- AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
- 
--CFLAGS = -Werror -Wall -W
-+CFLAGS = -g -Werror -Wall -W
- override CFLAGS += -I$(PREFIX)/include
- LDLIBS = -lselinux -lsepol -L$(LIBDIR)
- 
+--- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-25 15:21:58.000000000 -0400
 @@ -16,7 +16,7 @@
  
  all: setfiles restorecon
@@ -2705,8 +2496,8 @@ diff --exclude-from=exclude --exclude=se
  restorecon: setfiles
  	ln -sf setfiles restorecon
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.74/setfiles/restore.c
---- nsapolicycoreutils/setfiles/restore.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -3228,8 +3019,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.74/setfiles/restore.h
---- nsapolicycoreutils/setfiles/restore.h	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -3281,8 +3072,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 05:59:43.000000000 -0700
-+++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 21:26:36.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -p -r1.646 -r1.647
--- policycoreutils.spec	21 Sep 2009 13:54:03 -0000	1.646
+++ policycoreutils.spec	30 Sep 2009 15:37:20 -0000	1.647
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-5
+- Fixes for semanage -equiv, readded modules, --enable, --disable
+
 * Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-4
 - Close sandbox when eclipse exits
 



From mathstuf at fedoraproject.org  Wed Sep 30 15:38:37 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 15:38:37 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-12
	kde-plasma-networkmanagement-0.9-desktop.patch, NONE,
	1.1 kde-plasma-networkmanagement.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090930153837.F287511C00E6@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10789

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Added Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
New snapshot

kde-plasma-networkmanagement-0.9-desktop.patch:
 kded/networkmanagement.desktop           |    2 +-
 monolithic/knetworkmanager.desktop       |    2 +-
 settings/service/knetworkmanager.desktop |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kde-plasma-networkmanagement-0.9-desktop.patch ---
diff -r -U5 kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop
--- kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop	2009-09-30 11:17:27.000000000 -0400
@@ -45,6 +45,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=networkmanagement
 X-KDE-DBus-ModuleName=networkmanagement
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -64,6 +64,6 @@
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
 X-DCOP-ServiceType=Unique
 X-KDE-autostart-condition=networkmanagementrc:General:Autostart:true
 Categories=Utility;TrayIcon;System;Applet;
-
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop	2009-09-21 05:35:32.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -52,6 +52,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=knetworkmanager
 X-KDE-DBus-ModuleName=knetworkmanager
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kde-plasma-networkmanagement.spec	21 Sep 2009 14:04:32 -0000	1.20
+++ kde-plasma-networkmanagement.spec	30 Sep 2009 15:38:37 -0000	1.21
@@ -7,7 +7,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.2.20090919svn%{?dist}
+Release:        0.3.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -17,9 +17,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1025605 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
 #  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
+# Patch to get .desktop files validated
+Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -81,6 +83,7 @@ Provides:       kde-plasma-networkmanage
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop
 
 
 %build
@@ -177,6 +180,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
+- New snapshot
+
 * Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
 - Add back missing Requires:
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Sep 2009 14:04:32 -0000	1.11
+++ sources	30 Sep 2009 15:38:37 -0000	1.12
@@ -1 +1 @@
-0b75f5c48f35d47785a2bbe9a2c879e8  kde-plasma-networkmanagement-0.9.tar.bz2
+445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2



From praveenp at fedoraproject.org  Wed Sep 30 15:47:16 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:47:16 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/devel import.log, NONE,
	1.1 sblim-cmpi-network.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930154716.3F8F511C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12121/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-network.spec 
Log Message:
sblim-cmpi-network is devel



--- NEW FILE import.log ---
sblim-cmpi-network-1_3_8-1_fc11:HEAD:sblim-cmpi-network-1.3.8-1.fc11.src.rpm:1254325659


--- NEW FILE sblim-cmpi-network.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-network
Version:        1.3.8
Release:        1%{?dist}
Summary:        SBLIM Network Instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base >= 1.5

%description
Standards Based Linux Instrumentation Network Providers

%package        devel
Summary:        SBLIM Network Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
SBLIM Base Network Development Package

%package        test
Summary:        SBLIM Network Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-network = %{version}-%{release}
Requires:       %{name}

%description    test
SBLIM Base Network Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{provider_dir}/*.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite
%{_datadir}/doc/%{name}-%{version}

%pre
if [ "$1" -gt 1 ]; then
# If upgrading, deregister old version
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
# Register Schema and Provider
    %{_datadir}/%{name}/provider-register.sh \
        -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%preun
if [ "$1" -eq 0 ]; then
# Deregister only if not upgrading
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog

* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
- modified the spec file to fix some rpmlint warnings
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:40:40 -0000	1.1
+++ .cvsignore	30 Sep 2009 15:47:15 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-network-1.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:40:40 -0000	1.1
+++ sources	30 Sep 2009 15:47:16 -0000	1.2
@@ -0,0 +1 @@
+698040584ea345d12c838e0ab6c42b9f  sblim-cmpi-network-1.3.8.tar.bz2



From mitr at fedoraproject.org  Wed Sep 30 15:47:30 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Wed, 30 Sep 2009 15:47:30 +0000 (UTC)
Subject: rpms/volume_key/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 volume_key.spec, 1.3, 1.4 cryptsetup-svn-r62.patch, 1.1,
	NONE volume_key-0.2-libblkid-type.patch, 1.1, NONE
Message-ID: <20090930154730.8D7E011C00E6@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12227

Modified Files:
	.cvsignore sources volume_key.spec 
Removed Files:
	cryptsetup-svn-r62.patch volume_key-0.2-libblkid-type.patch 
Log Message:
* Wed Sep 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.3-1
- Update to volume_key-0.3.
- Drop bundled libcryptsetup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jul 2009 23:16:04 -0000	1.2
+++ .cvsignore	30 Sep 2009 15:47:30 -0000	1.3
@@ -1,2 +1 @@
-volume_key-0.2.tar.bz2
-cryptsetup-1.0.7-rc1.tar.bz2
+volume_key-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 23:16:05 -0000	1.2
+++ sources	30 Sep 2009 15:47:30 -0000	1.3
@@ -1,2 +1 @@
-882ec96bef41962a33a24d6ee5821a29  volume_key-0.2.tar.bz2
-0910632173fb960252412bf7342b42fc  cryptsetup-1.0.7-rc1.tar.bz2
+fa406b4c4fd444967e413e2fbd6ff528  volume_key-0.3.tar.bz2


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- volume_key.spec	8 Aug 2009 03:34:48 -0000	1.3
+++ volume_key.spec	30 Sep 2009 15:47:30 -0000	1.4
@@ -2,25 +2,17 @@
 
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
-Version: 0.2
-Release: 3
+Version: 0.3
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
 Requires: volume_key-libs = %{version}-%{release}
 
 Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.bz2
-Source1: http://cryptsetup.googlecode.com/files/cryptsetup-1.0.7-rc1.tar.bz2
-# http://code.google.com/p/cryptsetup/issues/detail?id=15
-Patch0: https://fedorahosted.org/releases/v/o/volume_key/cryptsetup-svn-r62.patch
-Patch1: volume_key-0.2-libblkid-type.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: gettext-devel, glib2-devel, gnupg, gpgme-devel, libblkid-devel
-BuildRequires: nss-devel, python-devel
-
-# For cryptsetup
-BuildRequires: device-mapper-devel, e2fsprogs-devel, libgcrypt-devel
-BuildRequires: libgpg-error-devel, libselinux-devel, libsepol-devel, popt-devel
+BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
+BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
 
 %description
 This package provides a command-line tool for manipulating storage volume
@@ -81,23 +73,10 @@ volume_key currently supports only the L
 for other formats is possible, some formats are planned for future releases.
 
 %prep
-%setup -q -a 1
-%patch1 -p1 -b .libblkid-type
-pushd cryptsetup-1.0.7-rc1
-%patch0 -p0 -b .cs-vk
-popd
+%setup -q
 
 %build
-cryptsetup_root=$(pwd)/cryptsetup-root
-
-pushd cryptsetup-1.0.7-rc1
-%configure --enable-static --disable-shared --with-pic
-make %{?_smp_mflags}
-make install "DESTDIR=$cryptsetup_root"
-popd
-
-%configure "CPPFLAGS=-I$cryptsetup_root"%{_includedir} \
-	"LDFLAGS=-L$cryptsetup_root"%{_libdir} --disable-static
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -137,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Wed Sep 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.3-1
+- Update to volume_key-0.3.
+- Drop bundled libcryptsetup.
+
 * Sat Aug  8 2009 Miloslav Trma? <mitr at redhat.com> - 0.2-3
 - Handle changed "TYPE=crypto_LUKS" from libblkid
 - Preserve file timestamps during installation


--- cryptsetup-svn-r62.patch DELETED ---


--- volume_key-0.2-libblkid-type.patch DELETED ---



From praveenp at fedoraproject.org  Wed Sep 30 15:48:13 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:48:13 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/EL-4 import.log, NONE,
	1.1 sblim-cmpi-network.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930154813.D5FB611C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12425/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-network.spec 
Log Message:
sblim-cmpi-network in EL-4



--- NEW FILE import.log ---
sblim-cmpi-network-1_3_8-1_fc11:EL-4:sblim-cmpi-network-1.3.8-1.fc11.src.rpm:1254325713


--- NEW FILE sblim-cmpi-network.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-network
Version:        1.3.8
Release:        1%{?dist}
Summary:        SBLIM Network Instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base >= 1.5

%description
Standards Based Linux Instrumentation Network Providers

%package        devel
Summary:        SBLIM Network Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
SBLIM Base Network Development Package

%package        test
Summary:        SBLIM Network Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-network = %{version}-%{release}
Requires:       %{name}

%description    test
SBLIM Base Network Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{provider_dir}/*.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite
%{_datadir}/doc/%{name}-%{version}

%pre
if [ "$1" -gt 1 ]; then
# If upgrading, deregister old version
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
# Register Schema and Provider
    %{_datadir}/%{name}/provider-register.sh \
        -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%preun
if [ "$1" -eq 0 ]; then
# Deregister only if not upgrading
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog

* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
- modified the spec file to fix some rpmlint warnings
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:40:40 -0000	1.1
+++ .cvsignore	30 Sep 2009 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-network-1.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:40:40 -0000	1.1
+++ sources	30 Sep 2009 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+698040584ea345d12c838e0ab6c42b9f  sblim-cmpi-network-1.3.8.tar.bz2



From mathstuf at fedoraproject.org  Wed Sep 30 15:49:05 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed, 30 Sep 2009 15:49:05 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-11
	kde-plasma-networkmanagement-0.9-desktop.patch, NONE,
	1.1 kde-plasma-networkmanagement.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090930154905.8055811C00E6@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12748

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Added Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
New snapshot

kde-plasma-networkmanagement-0.9-desktop.patch:
 kded/networkmanagement.desktop           |    2 +-
 monolithic/knetworkmanager.desktop       |    2 +-
 settings/service/knetworkmanager.desktop |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kde-plasma-networkmanagement-0.9-desktop.patch ---
diff -r -U5 kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop
--- kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop	2009-09-30 11:17:27.000000000 -0400
@@ -45,6 +45,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=networkmanagement
 X-KDE-DBus-ModuleName=networkmanagement
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -64,6 +64,6 @@
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
 X-DCOP-ServiceType=Unique
 X-KDE-autostart-condition=networkmanagementrc:General:Autostart:true
 Categories=Utility;TrayIcon;System;Applet;
-
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop	2009-09-21 05:35:32.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -52,6 +52,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=knetworkmanager
 X-KDE-DBus-ModuleName=knetworkmanager
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kde-plasma-networkmanagement.spec	16 Sep 2009 00:32:54 -0000	1.9
+++ kde-plasma-networkmanagement.spec	30 Sep 2009 15:49:05 -0000	1.10
@@ -6,21 +6,22 @@ We still recommend nm-applet from Networ
 Name:           kde-plasma-networkmanagement
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
-Version:        0.8
-Release:        0.22.20090815svn%{?dist}
+Version:        0.9
+Release:        0.3.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
-Group:          Applications/Internet 
+Group:          Applications/Internet
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1011744 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
-Source0: kde-plasma-networkmanagement-0.1.tar.bz2
+#  svn export -r 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
+# Patch to get .desktop files validated
+Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -31,17 +32,17 @@ Requires: NetworkManager
 
 # multilib upgrades
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
-Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
-the default NetworkManager service. 
+the default NetworkManager service.
 %{?disclaimer}
 
 %package -n knetworkmanager
-Summary: NetworkManager KDE 4 integration 
+Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
 Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager
@@ -59,8 +60,8 @@ Requires: knetworkmanager = %{?epoch:%{e
 
 %package -n knetworkmanager-openvpn
 Summary:        OpenVPN support for knetworkmanager
-Group:          Applications/Internet 
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release} 
+Group:          Applications/Internet
+Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -70,7 +71,7 @@ Provides:       kde-plasma-networkmanage
 
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
-Group:          Applications/Internet 
+Group:          Applications/Internet
 Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
@@ -81,7 +82,8 @@ Provides:       kde-plasma-networkmanage
 
 
 %prep
-%setup -q -n kde-plasma-networkmanagement-0.1
+%setup -q
+%patch0 -p1 -b .desktop
 
 
 %build
@@ -170,18 +172,31 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %files -n kde-plasma-networkmanagement
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop
 %{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 %{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
 %{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
 
 
 %changelog
+* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
+- New snapshot
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
+- Add back missing Requires:
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
+- Version seems to be .9 now
+- Fix trailing spaces
+- New snapshot
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
 - Epoch: 1
 
 * Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
 - use knetworkmanager pkg names
-- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path 
+- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
   for knetworkmanager-0.7 (from F-10)
 - nuke -devel pkg
 - drop references to short-lived kde-plasma-networkmanager
@@ -246,7 +261,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 * Sat Feb 7 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.3.20090207svn
 - Add changelog
-- Added tarball creation 
+- Added tarball creation
 - Changed name to kde-plasma-networkmanagement
 
 * Tue Jan 13 2009 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1-0.2.20090111svn


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 18:38:05 -0000	1.8
+++ sources	30 Sep 2009 15:49:05 -0000	1.9
@@ -1 +1 @@
-8a072d778cda60990c4670d85cad2f0c  kde-plasma-networkmanagement-0.1.tar.bz2
+445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2



From praveenp at fedoraproject.org  Wed Sep 30 15:49:06 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:49:06 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/EL-5 import.log, NONE,
	1.1 sblim-cmpi-network.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930154906.8C53611C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12695/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-network.spec 
Log Message:
sblim-cmpi-network in EL-5



--- NEW FILE import.log ---
sblim-cmpi-network-1_3_8-1_fc11:EL-5:sblim-cmpi-network-1.3.8-1.fc11.src.rpm:1254325770


--- NEW FILE sblim-cmpi-network.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-network
Version:        1.3.8
Release:        1%{?dist}
Summary:        SBLIM Network Instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base >= 1.5

%description
Standards Based Linux Instrumentation Network Providers

%package        devel
Summary:        SBLIM Network Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
SBLIM Base Network Development Package

%package        test
Summary:        SBLIM Network Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-network = %{version}-%{release}
Requires:       %{name}

%description    test
SBLIM Base Network Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{provider_dir}/*.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite
%{_datadir}/doc/%{name}-%{version}

%pre
if [ "$1" -gt 1 ]; then
# If upgrading, deregister old version
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
# Register Schema and Provider
    %{_datadir}/%{name}/provider-register.sh \
        -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%preun
if [ "$1" -eq 0 ]; then
# Deregister only if not upgrading
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog

* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
- modified the spec file to fix some rpmlint warnings
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:40:40 -0000	1.1
+++ .cvsignore	30 Sep 2009 15:49:06 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-network-1.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:40:40 -0000	1.1
+++ sources	30 Sep 2009 15:49:06 -0000	1.2
@@ -0,0 +1 @@
+698040584ea345d12c838e0ab6c42b9f  sblim-cmpi-network-1.3.8.tar.bz2



From praveenp at fedoraproject.org  Wed Sep 30 15:49:51 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:49:51 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/F-11 import.log, NONE,
	1.1 sblim-cmpi-network.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930154951.D100F11C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13060/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-network.spec 
Log Message:
sblim-cmpi-network in F-11



--- NEW FILE import.log ---
sblim-cmpi-network-1_3_8-1_fc11:F-11:sblim-cmpi-network-1.3.8-1.fc11.src.rpm:1254325814


--- NEW FILE sblim-cmpi-network.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-network
Version:        1.3.8
Release:        1%{?dist}
Summary:        SBLIM Network Instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base >= 1.5

%description
Standards Based Linux Instrumentation Network Providers

%package        devel
Summary:        SBLIM Network Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
SBLIM Base Network Development Package

%package        test
Summary:        SBLIM Network Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-network = %{version}-%{release}
Requires:       %{name}

%description    test
SBLIM Base Network Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{provider_dir}/*.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite
%{_datadir}/doc/%{name}-%{version}

%pre
if [ "$1" -gt 1 ]; then
# If upgrading, deregister old version
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
# Register Schema and Provider
    %{_datadir}/%{name}/provider-register.sh \
        -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%preun
if [ "$1" -eq 0 ]; then
# Deregister only if not upgrading
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog

* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
- modified the spec file to fix some rpmlint warnings
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:40:40 -0000	1.1
+++ .cvsignore	30 Sep 2009 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-network-1.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:40:40 -0000	1.1
+++ sources	30 Sep 2009 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+698040584ea345d12c838e0ab6c42b9f  sblim-cmpi-network-1.3.8.tar.bz2



From mitr at fedoraproject.org  Wed Sep 30 15:50:15 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Wed, 30 Sep 2009 15:50:15 +0000 (UTC)
Subject: rpms/volume_key/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 volume_key.spec, 1.3, 1.4 cryptsetup-svn-r62.patch, 1.1,
	NONE volume_key-0.2-libblkid-type.patch, 1.1, NONE
Message-ID: <20090930155015.05D1211C043C@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/volume_key/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13185

Modified Files:
	.cvsignore sources volume_key.spec 
Removed Files:
	cryptsetup-svn-r62.patch volume_key-0.2-libblkid-type.patch 
Log Message:
* Wed Sep 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.3-1
- Update to volume_key-0.3.
- Drop bundled libcryptsetup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jul 2009 23:16:04 -0000	1.2
+++ .cvsignore	30 Sep 2009 15:50:13 -0000	1.3
@@ -1,2 +1 @@
-volume_key-0.2.tar.bz2
-cryptsetup-1.0.7-rc1.tar.bz2
+volume_key-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 23:16:05 -0000	1.2
+++ sources	30 Sep 2009 15:50:13 -0000	1.3
@@ -1,2 +1 @@
-882ec96bef41962a33a24d6ee5821a29  volume_key-0.2.tar.bz2
-0910632173fb960252412bf7342b42fc  cryptsetup-1.0.7-rc1.tar.bz2
+fa406b4c4fd444967e413e2fbd6ff528  volume_key-0.3.tar.bz2


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/F-12/volume_key.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- volume_key.spec	8 Aug 2009 03:34:48 -0000	1.3
+++ volume_key.spec	30 Sep 2009 15:50:13 -0000	1.4
@@ -2,25 +2,17 @@
 
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
-Version: 0.2
-Release: 3
+Version: 0.3
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
 Requires: volume_key-libs = %{version}-%{release}
 
 Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.bz2
-Source1: http://cryptsetup.googlecode.com/files/cryptsetup-1.0.7-rc1.tar.bz2
-# http://code.google.com/p/cryptsetup/issues/detail?id=15
-Patch0: https://fedorahosted.org/releases/v/o/volume_key/cryptsetup-svn-r62.patch
-Patch1: volume_key-0.2-libblkid-type.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: gettext-devel, glib2-devel, gnupg, gpgme-devel, libblkid-devel
-BuildRequires: nss-devel, python-devel
-
-# For cryptsetup
-BuildRequires: device-mapper-devel, e2fsprogs-devel, libgcrypt-devel
-BuildRequires: libgpg-error-devel, libselinux-devel, libsepol-devel, popt-devel
+BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
+BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
 
 %description
 This package provides a command-line tool for manipulating storage volume
@@ -81,23 +73,10 @@ volume_key currently supports only the L
 for other formats is possible, some formats are planned for future releases.
 
 %prep
-%setup -q -a 1
-%patch1 -p1 -b .libblkid-type
-pushd cryptsetup-1.0.7-rc1
-%patch0 -p0 -b .cs-vk
-popd
+%setup -q
 
 %build
-cryptsetup_root=$(pwd)/cryptsetup-root
-
-pushd cryptsetup-1.0.7-rc1
-%configure --enable-static --disable-shared --with-pic
-make %{?_smp_mflags}
-make install "DESTDIR=$cryptsetup_root"
-popd
-
-%configure "CPPFLAGS=-I$cryptsetup_root"%{_includedir} \
-	"LDFLAGS=-L$cryptsetup_root"%{_libdir} --disable-static
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -137,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Wed Sep 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.3-1
+- Update to volume_key-0.3.
+- Drop bundled libcryptsetup.
+
 * Sat Aug  8 2009 Miloslav Trma? <mitr at redhat.com> - 0.2-3
 - Handle changed "TYPE=crypto_LUKS" from libblkid
 - Preserve file timestamps during installation


--- cryptsetup-svn-r62.patch DELETED ---


--- volume_key-0.2-libblkid-type.patch DELETED ---



From praveenp at fedoraproject.org  Wed Sep 30 15:50:54 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:50:54 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/F-12 import.log, NONE,
	1.1 sblim-cmpi-network.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930155054.8FE7111C043C@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13374/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-network.spec 
Log Message:
sblim-cmpi-network in F-12



--- NEW FILE import.log ---
sblim-cmpi-network-1_3_8-1_fc11:F-12:sblim-cmpi-network-1.3.8-1.fc11.src.rpm:1254325860


--- NEW FILE sblim-cmpi-network.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-network
Version:        1.3.8
Release:        1%{?dist}
Summary:        SBLIM Network Instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base >= 1.5

%description
Standards Based Linux Instrumentation Network Providers

%package        devel
Summary:        SBLIM Network Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
SBLIM Base Network Development Package

%package        test
Summary:        SBLIM Network Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-network = %{version}-%{release}
Requires:       %{name}

%description    test
SBLIM Base Network Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{provider_dir}/*.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite
%{_datadir}/doc/%{name}-%{version}

%pre
if [ "$1" -gt 1 ]; then
# If upgrading, deregister old version
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
# Register Schema and Provider
    %{_datadir}/%{name}/provider-register.sh \
        -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%preun
if [ "$1" -eq 0 ]; then
# Deregister only if not upgrading
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog

* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
- modified the spec file to fix some rpmlint warnings
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:40:40 -0000	1.1
+++ .cvsignore	30 Sep 2009 15:50:51 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-network-1.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:40:40 -0000	1.1
+++ sources	30 Sep 2009 15:50:52 -0000	1.2
@@ -0,0 +1 @@
+698040584ea345d12c838e0ab6c42b9f  sblim-cmpi-network-1.3.8.tar.bz2



From twaugh at fedoraproject.org  Wed Sep 30 15:51:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 15:51:58 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-find-return-accel.patch, NONE,
	1.1 system-config-printer.spec, 1.289, 1.290
Message-ID: <20090930155158.2F9D811C0337@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14261

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-find-return-accel.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed traceback when cancelling change-driver dialog.


system-config-printer-find-return-accel.patch:
 NewPrinterWindow.glade |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-find-return-accel.patch ---
diff -up system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel system-config-printer-1.1.13/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/glade/NewPrinterWindow.glade	2009-09-30 16:50:36.981760810 +0100
@@ -2580,6 +2580,7 @@ DTR/DSR (Hardware)</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
 						  <signal name="clicked" handler="on_btnNetworkFind_clicked" last_modification_time="Fri, 19 Dec 2008 16:04:53 GMT"/>
+						  <accelerator key="Return" modifiers="0" signal="activate"/>
 						</widget>
 						<packing>
 						  <property name="left_attach">2</property>


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- system-config-printer.spec	22 Sep 2009 10:18:28 -0000	1.289
+++ system-config-printer.spec	30 Sep 2009 15:51:56 -0000	1.290
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-data-butto
 Patch2: system-config-printer-cancel-traceback.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
+Patch7: system-config-printer-find-return-accel.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -71,6 +72,7 @@ the configuration tool.
 %patch2 -p1 -b .cancel-traceback
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
+%patch7 -p1 -b .find-return-accel
 
 %build
 %configure
@@ -172,6 +174,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Let Return key activate the Find button for Find Network Printer.
+
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
 - Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.



From twaugh at fedoraproject.org  Wed Sep 30 15:53:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 15:53:45 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-physdev-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.290, 1.291
Message-ID: <20090930155345.2E7C511C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15147

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-physdev-traceback.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Avoid traceback in PhysicalDevice.py.


system-config-printer-physdev-traceback.patch:
 PhysicalDevice.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py	2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
                     hostport = ipparam[3:]
                 else:
                     return None
+            else:
+                return None
         else:
             (hostport, rest) = urllib.splithost (rest)
             if hostport == None:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- system-config-printer.spec	30 Sep 2009 15:51:56 -0000	1.290
+++ system-config-printer.spec	30 Sep 2009 15:53:44 -0000	1.291
@@ -20,6 +20,7 @@ Patch2: system-config-printer-cancel-tra
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
 Patch7: system-config-printer-find-return-accel.patch
+Patch8: system-config-printer-physdev-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -73,6 +74,7 @@ the configuration tool.
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
 %patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
 
 %build
 %configure
@@ -175,6 +177,7 @@ exit 0
 
 %changelog
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Avoid traceback in PhysicalDevice.py.
 - Let Return key activate the Find button for Find Network Printer.
 
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2



From twaugh at fedoraproject.org  Wed Sep 30 15:55:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 15:55:39 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-autoselect-raw.patch, NONE,
	1.1 system-config-printer.spec, 1.291, 1.292
Message-ID: <20090930155540.4B8E311C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15480

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-autoselect-raw.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Auto-select the correct driver entry for raw queues.


system-config-printer-autoselect-raw.patch:
 system-config-printer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-autoselect-raw.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.autoselect-raw system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.autoselect-raw	2009-09-30 16:54:07.363635374 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:54:19.189761633 +0100
@@ -3948,8 +3948,8 @@ class NewPrinterGUI(GtkGUI):
                  cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
             else:
                 # Special CUPS names for a raw queue.
-                self.auto_make = 'Raw'
-                self.auto_model = 'Queue'
+                self.auto_make = 'Generic'
+                self.auto_model = 'Raw Queue'
 
             try:
                 if self.dialog_mode == "ppd":


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- system-config-printer.spec	30 Sep 2009 15:53:44 -0000	1.291
+++ system-config-printer.spec	30 Sep 2009 15:55:38 -0000	1.292
@@ -21,6 +21,7 @@ Patch5: system-config-printer-fetchdevic
 Patch6: system-config-printer-missing-import.patch
 Patch7: system-config-printer-find-return-accel.patch
 Patch8: system-config-printer-physdev-traceback.patch
+Patch9: system-config-printer-autoselect-raw.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -75,6 +76,7 @@ the configuration tool.
 %patch6 -p1 -b .missing-import
 %patch7 -p1 -b .find-return-accel
 %patch8 -p1 -b .physdev-traceback
+%patch9 -p1 -b .autoselect-raw
 
 %build
 %configure
@@ -177,6 +179,7 @@ exit 0
 
 %changelog
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Auto-select the correct driver entry for raw queues.
 - Avoid traceback in PhysicalDevice.py.
 - Let Return key activate the Find button for Find Network Printer.
 



From mgrepl at fedoraproject.org  Wed Sep 30 15:56:05 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed, 30 Sep 2009 15:56:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 modules-minimum.conf, 1.24,
	1.25 modules-targeted.conf, 1.133, 1.134 policy-20090521.patch,
	1.52, 1.53 selinux-policy.spec, 1.906, 1.907
Message-ID: <20090930155605.7732811C00E6@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15500

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20090521.patch selinux-policy.spec 
Log Message:
- dovecot needs setcap/getcap
- Fix up sssd policy




Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-minimum.conf,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- modules-minimum.conf	14 Aug 2009 06:45:12 -0000	1.24
+++ modules-minimum.conf	30 Sep 2009 15:56:03 -0000	1.25
@@ -219,6 +219,13 @@ certmaster = module
 cipe = module
 
 # Layer: services
+# Module: cobbler
+#
+# cobbler
+# 
+cobbler = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-targeted.conf,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- modules-targeted.conf	14 Aug 2009 06:45:12 -0000	1.133
+++ modules-targeted.conf	30 Sep 2009 15:56:03 -0000	1.134
@@ -240,6 +240,13 @@ clamav = module
 clock = base
 
 # Layer: services
+# Module: cobbler
+#
+# cobbler
+# 
+cobbler = module
+
+# Layer: services
 # Module: consolekit
 #
 # ConsoleKit is a system daemon for tracking what users are logged

policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 policy/modules/admin/prelink.te           |    9 
 policy/modules/admin/readahead.te         |    2 
 policy/modules/admin/rpm.fc               |    1 
 policy/modules/admin/rpm.if               |   46 +++++
 policy/modules/admin/rpm.te               |    4 
 policy/modules/admin/shorewall.fc         |   12 +
 policy/modules/admin/shorewall.if         |  166 ++++++++++++++++++
 policy/modules/admin/shorewall.te         |  103 +++++++++++
 policy/modules/admin/sudo.if              |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    3 
 policy/modules/admin/usermanage.te        |    3 
 policy/modules/apps/awstats.te            |    2 
 policy/modules/apps/calamaris.te          |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++++++++++
 policy/modules/apps/gitosis.te            |   43 ++++
 policy/modules/apps/gnome.te              |   10 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 policy/modules/apps/java.te               |    2 
 policy/modules/apps/mozilla.if            |   16 +
 policy/modules/apps/mozilla.te            |   14 -
 policy/modules/apps/nsplugin.if           |    2 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 ++
 policy/modules/apps/ptchown.te            |   40 ++++
 policy/modules/apps/qemu.fc               |    1 
 policy/modules/apps/qemu.te               |    5 
 policy/modules/apps/sandbox.if            |  134 +++++++++++---
 policy/modules/apps/sandbox.te            |  274 +++++++++++++++++++++++++++---
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    6 
 policy/modules/kernel/corecommands.fc     |   10 -
 policy/modules/kernel/corenetwork.te.in   |    5 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   31 +++
 policy/modules/kernel/files.if            |    4 
 policy/modules/kernel/kernel.if           |    2 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/roles/staff.te             |   12 +
 policy/modules/roles/sysadm.if            |   35 +++
 policy/modules/roles/sysadm.te            |    4 
 policy/modules/roles/unconfineduser.te    |   10 -
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/apache.fc         |    5 
 policy/modules/services/apache.te         |    1 
 policy/modules/services/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   26 ++
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   22 +-
 policy/modules/services/exim.te           |    7 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |   15 +
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   19 +-
 policy/modules/services/hal.te            |   15 +
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 ++++
 policy/modules/services/hddtemp.te        |   40 ++++
 policy/modules/services/kerberos.if       |    2 
 policy/modules/services/kerberos.te       |   12 +
 policy/modules/services/lircd.te          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 policy/modules/services/nslcd.te          |   50 +++++
 policy/modules/services/nx.fc             |    3 
 policy/modules/services/nx.if             |   20 ++
 policy/modules/services/openvpn.te        |   14 +
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/polkit.fc         |    2 
 policy/modules/services/polkit.if         |    2 
 policy/modules/services/polkit.te         |    3 
 policy/modules/services/postfix.if        |   26 ++
 policy/modules/services/postfix.te        |   26 --
 policy/modules/services/postgresql.te     |    2 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |    2 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/radvd.te          |    2 
 policy/modules/services/rpc.te            |   15 +
 policy/modules/services/rpcbind.if        |   20 ++
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/samba.te          |    6 
 policy/modules/services/sasl.te           |    6 
 policy/modules/services/sendmail.if       |   39 ++++
 policy/modules/services/sendmail.te       |    7 
 policy/modules/services/setroubleshoot.te |    5 
 policy/modules/services/shorewall.fc      |   12 -
 policy/modules/services/shorewall.if      |  166 ------------------
 policy/modules/services/shorewall.te      |  102 -----------
 policy/modules/services/smartmon.te       |    4 
 policy/modules/services/snmp.if           |   37 ++++
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    2 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |   14 +
 policy/modules/services/sssd.fc           |    4 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   35 +--
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.fc           |    1 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    3 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   15 +
 policy/modules/system/authlogin.fc        |    3 
 policy/modules/system/authlogin.if        |  270 ++++++++++++++++++-----------
 policy/modules/system/authlogin.te        |   27 +-
 policy/modules/system/init.fc             |    2 
 policy/modules/system/init.te             |    6 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/logging.fc          |    1 
 policy/modules/system/logging.te          |    4 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |    1 
 policy/modules/system/sysnetwork.if       |    1 
 policy/modules/system/sysnetwork.te       |   17 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |   10 +
 policy/modules/system/userdomain.if       |   35 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 169 files changed, 2589 insertions(+), 686 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- policy-20090521.patch	22 Sep 2009 15:58:58 -0000	1.52
+++ policy-20090521.patch	30 Sep 2009 15:56:03 -0000	1.53
@@ -1688,7 +1688,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(monopd, tcp,1234,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.12/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.fc	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.fc	2009-09-29 18:31:58.000000000 +0200
 @@ -46,8 +46,10 @@
  /dev/kmem		-c	gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
  /dev/kmsg		-c	gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh)
@@ -1700,6 +1700,14 @@ diff -b -B --ignore-all-space --exclude-
  /dev/lircm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/logibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
+@@ -168,6 +170,7 @@
+ 
+ ifdef(`distro_redhat',`
+ # originally from named.fc
++/var/named/chroot/dev 		-d 	gen_context(system_u:object_r:device_t,s0)
+ /var/named/chroot/dev/null -c	gen_context(system_u:object_r:null_device_t,s0)
+ /var/named/chroot/dev/random -c	gen_context(system_u:object_r:random_device_t,s0)
+ /var/named/chroot/dev/zero -c	gen_context(system_u:object_r:zero_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-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-07-03 11:25:38.000000000 +0200
@@ -2419,6 +2427,51 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_rand(freshclam_t)
  dev_read_urand(freshclam_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.fc serefpolicy-3.6.12/policy/modules/services/cobbler.fc
+--- nsaserefpolicy/policy/modules/services/cobbler.fc	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/services/cobbler.fc	2009-09-30 09:41:34.000000000 +0200
+@@ -0,0 +1,2 @@
++
++/var/lib/cobbler(/.*)?                  gen_context(system_u:object_r:cobbler_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.if serefpolicy-3.6.12/policy/modules/services/cobbler.if
+--- nsaserefpolicy/policy/modules/services/cobbler.if	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/services/cobbler.if	2009-09-30 10:26:41.000000000 +0200
+@@ -0,0 +1,21 @@
++## <summary>cobbler server policy</summary>
++
++#######################################
++## <summary>
++##      Read cobbler lib files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`cobbler_read_lib_files',`
++        gen_require(`
++                type cobbler_var_lib_t;
++        ')
++
++        read_files_pattern($1, cobbler_var_lib_t, cobbler_var_lib_t)
++        allow $1 cobbler_var_lib_t:dir list_dir_perms;
++        files_search_var_lib($1)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.te serefpolicy-3.6.12/policy/modules/services/cobbler.te
+--- nsaserefpolicy/policy/modules/services/cobbler.te	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/services/cobbler.te	2009-09-30 09:41:20.000000000 +0200
+@@ -0,0 +1,10 @@
++
++policy_module(cobbler,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type cobbler_var_lib_t;
++files_type(cobbler_var_lib_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-08-04 12:44:39.000000000 +0200
@@ -2606,7 +2659,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-08-05 21:48:06.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-09-29 18:19:43.000000000 +0200
 @@ -176,6 +176,10 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
@@ -2618,6 +2671,32 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+@@ -458,3 +462,25 @@
+ 	allow $1 system_dbusd_t:tcp_socket { read write };
+ 	allow $1 system_dbusd_t:fd use;
+ ')
++
++#######################################
++## <summary>
++##      Dontaudit connect to system dbus 
++##	over an unix domain stream socket
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dbus_dontaudit_system_bus_stream_connect',`
++        gen_require(`
++                type system_dbusd_t, system_dbusd_var_run_t;
++        ')
++
++	dontaudit $1 system_dbusd_var_run_t:sock_file rw_sock_file_perms;
++        dontaudit $1 system_dbusd_t:unix_stream_socket connectto;
++')
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.6.12/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/dcc.te	2009-06-25 10:21:01.000000000 +0200
@@ -2728,8 +2807,16 @@ diff -b -B --ignore-all-space --exclude-
  	polkit_read_reload(devicekit_disk_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.6.12/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/dnsmasq.te	2009-06-25 10:21:01.000000000 +0200
-@@ -87,6 +87,10 @@
++++ serefpolicy-3.6.12/policy/modules/services/dnsmasq.te	2009-09-30 09:43:10.000000000 +0200
+@@ -83,10 +83,18 @@
+ userdom_dontaudit_search_user_home_dirs(dnsmasq_t)
+ 
+ optional_policy(`
++	cobbler_read_lib_files(dnsmasq_t)
++')
++
++optional_policy(`
+ 	cron_manage_pid_files(dnsmasq_t)
  ')
  
  optional_policy(`
@@ -2827,7 +2914,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	<summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.12/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/dovecot.te	2009-07-31 13:05:22.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/dovecot.te	2009-09-30 15:36:17.000000000 +0200
 @@ -1,5 +1,5 @@
  
 -policy_module(dovecot, 1.10.2)
@@ -2867,6 +2954,15 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # dovecot local policy
+@@ -56,7 +56,7 @@
+ 
+ allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
+ dontaudit dovecot_t self:capability sys_tty_config;
+-allow dovecot_t self:process { setrlimit signal_perms };
++allow dovecot_t self:process { getcap setcap setrlimit signal_perms };
+ allow dovecot_t self:fifo_file rw_fifo_file_perms;
+ allow dovecot_t self:tcp_socket create_stream_socket_perms;
+ allow dovecot_t self:unix_dgram_socket create_socket_perms;
 @@ -73,7 +73,6 @@
  
  can_exec(dovecot_t, dovecot_exec_t)
@@ -3949,6 +4045,18 @@ diff -b -B --ignore-all-space --exclude-
  corecmd_list_bin(pyzor_t)
  corecmd_getattr_bin_files(pyzor_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.6.12/policy/modules/services/radvd.te
+--- nsaserefpolicy/policy/modules/services/radvd.te	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/radvd.te	2009-09-29 18:03:17.000000000 +0200
+@@ -23,7 +23,7 @@
+ # Local policy
+ #
+ allow radvd_t self:capability { setgid setuid net_raw net_admin };
+-dontaudit radvd_t self:capability sys_tty_config;
++dontaudit radvd_t self:capability { sys_module sys_tty_config };
+ allow radvd_t self:process signal_perms;
+ allow radvd_t self:unix_dgram_socket create_socket_perms;
+ allow radvd_t self:unix_stream_socket create_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.6.12/policy/modules/services/rpcbind.if
 --- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-04-07 21:54:47.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/rpcbind.if	2009-09-14 15:08:43.000000000 +0200
@@ -4073,7 +4181,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.6.12/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/sasl.te	2009-08-18 14:47:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/sasl.te	2009-09-29 18:20:22.000000000 +0200
 @@ -31,7 +31,7 @@
  # Local policy
  #
@@ -4083,6 +4191,17 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit saslauthd_t self:capability sys_tty_config;
  allow saslauthd_t self:process signal_perms;
  allow saslauthd_t self:fifo_file rw_fifo_file_perms;
+@@ -98,6 +98,10 @@
+ ')
+ 
+ optional_policy(`
++	dbus_dontaudit_system_bus_stream_connect(saslauthd_t)
++')
++
++optional_policy(`
+ 	kerberos_keytab_template(saslauthd, saslauthd_t)
+ 	kerberos_manage_host_rcache(saslauthd_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-07-31 13:22:05.000000000 +0200
@@ -4693,6 +4812,148 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_use_script_fds(sshd_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.fc serefpolicy-3.6.12/policy/modules/services/sssd.fc
+--- nsaserefpolicy/policy/modules/services/sssd.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/sssd.fc	2009-09-29 18:28:19.000000000 +0200
+@@ -1,6 +1,6 @@
++/etc/rc\.d/init\.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
+ 
+ /usr/sbin/sssd	--	gen_context(system_u:object_r:sssd_exec_t,s0)
+ 
+-/etc/rc.d/init.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
+-/var/run/sssd.pid		--	gen_context(system_u:object_r:sssd_var_run_t,s0)
+ /var/lib/sss(/.*)?			gen_context(system_u:object_r:sssd_var_lib_t,s0)
++/var/run/sssd.pid	--	gen_context(system_u:object_r:sssd_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.6.12/policy/modules/services/sssd.if
+--- nsaserefpolicy/policy/modules/services/sssd.if	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/sssd.if	2009-09-29 18:28:19.000000000 +0200
+@@ -1,5 +1,4 @@
+-
+-## <summary>policy for sssd</summary>
++## <summary>System Security Services Daemon</summary>
+ 
+ ########################################
+ ## <summary>
+@@ -68,17 +67,15 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`sssd_manage_var_run',`
++interface(`sssd_manage_pids',`
+ 	gen_require(`
+ 		type sssd_var_run_t;
+ 	')
+ 
+          manage_dirs_pattern($1,sssd_var_run_t,sssd_var_run_t)
+          manage_files_pattern($1,sssd_var_run_t,sssd_var_run_t)
+-         manage_lnk_files_pattern($1,sssd_var_run_t,sssd_var_run_t)
+ ')
+ 
+-
+ ########################################
+ ## <summary>
+ ##	Search sssd lib directories.
+@@ -196,8 +192,7 @@
+ 	')
+ 
+ 	files_search_pids($1)
+-	write_sock_files_pattern($1, sssd_var_lib_t, sssd_var_lib_t)
+-	allow $1 sssd_t:unix_stream_socket connectto;
++	stream_connect_pattern($1, sssd_var_lib_t, sssd_var_lib_t, sssd_t)
+ ')
+ 
+ ########################################
+@@ -241,9 +235,7 @@
+ 	role_transition $2 sssd_initrc_exec_t system_r;
+ 	allow $2 system_r;
+ 
+-	sssd_manage_var_run($1)
+-
+-	sssd_manage_var_lib($1)
++	sssd_manage_pids($1)
+ 
++	sssd_manage_lib_files($1)
+ ')
+-
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
+--- nsaserefpolicy/policy/modules/services/sssd.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-09-29 18:28:19.000000000 +0200
+@@ -9,54 +10,45 @@
+ type sssd_exec_t;
+ init_daemon_domain(sssd_t, sssd_exec_t)
+ 
+-permissive sssd_t;
+-
+ type sssd_initrc_exec_t;
+ init_script_file(sssd_initrc_exec_t)
+ 
+-type sssd_var_run_t;
+-files_pid_file(sssd_var_run_t)
+-
+ type sssd_var_lib_t;
+ files_type(sssd_var_lib_t)
+ 
++type sssd_var_run_t;
++files_pid_file(sssd_var_run_t)
++
+ ########################################
+ #
+ # sssd local policy
+ #
+-allow sssd_t self:capability { sys_nice setuid };
++allow sssd_t self:capability { sys_nice setgid setuid };
+ allow sssd_t self:process { setsched signal getsched };
+-allow sssd_t tmp_t:dir { read getattr open };
+-
+-# Init script handling
+-domain_use_interactive_fds(sssd_t)
+-
+-# internal communication is often done using fifo and unix sockets.
+-allow sssd_t self:process signal;
+ allow sssd_t self:fifo_file rw_file_perms;
+ allow sssd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ 
+-manage_dirs_pattern(sssd_t, sssd_var_run_t,  sssd_var_run_t)
+-manage_files_pattern(sssd_t, sssd_var_run_t,  sssd_var_run_t)
+-files_pid_filetrans(sssd_t,sssd_var_run_t, { file dir })
+-
+ manage_dirs_pattern(sssd_t, sssd_var_lib_t,  sssd_var_lib_t)
+ manage_files_pattern(sssd_t, sssd_var_lib_t,  sssd_var_lib_t)
+ manage_sock_files_pattern(sssd_t, sssd_var_lib_t,  sssd_var_lib_t)
+ files_var_lib_filetrans(sssd_t, sssd_var_lib_t, { file dir } )
+ 
+-corecmd_exec_bin(sssd_t)
++manage_dirs_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t)
++manage_files_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t)
++files_pid_filetrans(sssd_t, sssd_var_run_t, { file dir })
+ 
+-dev_read_urand(sssd_t)
++fs_list_inotifyfs(sssd_t)
+ 
+ kernel_read_system_state(sssd_t)
+ 
++corecmd_exec_bin(sssd_t)
++
++dev_read_urand(sssd_t)
++
+ files_list_tmp(sssd_t)
+ files_read_etc_files(sssd_t)
+ files_read_usr_files(sssd_t)
+ 
+-fs_list_inotifyfs(sssd_t)
+-
+ auth_use_nsswitch(sssd_t)
+ auth_domtrans_chk_passwd(sssd_t)
+ auth_domtrans_upd_passwd(sssd_t)
+@@ -68,6 +60,8 @@
+ 
+ miscfiles_read_localization(sssd_t)
+ 
++userdom_manage_tmp_role(system_t, sssd_t)
++
+ optional_policy(`
+ 	dbus_system_bus_client(sssd_t)
+ 	dbus_connect_system_bus(sssd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.12/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/uucp.te	2009-07-07 09:47:39.000000000 +0200
@@ -4806,8 +5067,16 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.12/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.fc	2009-07-28 14:14:07.000000000 +0200
-@@ -62,6 +62,7 @@
++++ serefpolicy-3.6.12/policy/modules/services/xserver.fc	2009-09-29 18:24:34.000000000 +0200
+@@ -13,6 +13,7 @@
+ HOME_DIR/\.dmrc			--	gen_context(system_u:object_r:xdm_home_t,s0)
+ 
+ /root/\.xauth.*			--	gen_context(system_u:object_r:xauth_home_t,s0)
++/root/\.Xauth.*			--	gen_context(system_u:object_r:xauth_home_t,s0)
+ #
+ # /dev
+ #
+@@ -62,6 +63,7 @@
  /usr/bin/iceauth	--	gen_context(system_u:object_r:iceauth_exec_t,s0)
  /usr/bin/slim		--	gen_context(system_u:object_r:xdm_exec_t,s0)
  /usr/bin/Xair		--	gen_context(system_u:object_r:xserver_exec_t,s0)
@@ -4815,7 +5084,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/xauth		--	gen_context(system_u:object_r:xauth_exec_t,s0)
  /usr/bin/Xorg		--	gen_context(system_u:object_r:xserver_exec_t,s0)
  ifdef(`distro_debian', `
-@@ -104,6 +105,7 @@
+@@ -104,6 +106,7 @@
  /var/run/gdm(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
  /var/run/gdm_socket	-s	gen_context(system_u:object_r:xdm_var_run_t,s0)
  /var/run/[gx]dm\.pid	--	gen_context(system_u:object_r:xdm_var_run_t,s0)
@@ -4901,7 +5170,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 xdm_t:x_drawable { read receive get_property getattr send list_child add_child };
 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-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-07-08 21:12:32.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-09-30 09:25:12.000000000 +0200
 @@ -370,8 +370,9 @@
  manage_lnk_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
  manage_fifo_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
@@ -4929,15 +5198,20 @@ diff -b -B --ignore-all-space --exclude-
  userdom_manage_user_tmp_sockets(xdm_t)
  userdom_manage_tmpfs_role(system_r, xdm_t)
  
-@@ -652,6 +655,7 @@
+@@ -651,7 +654,12 @@
+ ')
  
  optional_policy(`
++	pcscd_stream_connect(xdm_t)
++')
++
++optional_policy(`
  	pulseaudio_exec(xdm_t)
 +	pulseaudio_dbus_chat(xdm_t)
  ')
  
  # On crash gdm execs gdb to dump stack
-@@ -839,7 +843,6 @@
+@@ -839,7 +847,6 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -4945,7 +5219,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_rw_tmpfs_files(xserver_t)
  
  mls_xwin_read_to_clearance(xserver_t)
-@@ -931,6 +934,10 @@
+@@ -931,6 +938,10 @@
  ')
  
  optional_policy(`
@@ -5754,6 +6028,31 @@ diff -b -B --ignore-all-space --exclude-
  
  ifdef(`sulogin_no_pam', `
  	allow sulogin_t self:capability sys_tty_config;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.6.12/policy/modules/system/logging.fc
+--- nsaserefpolicy/policy/modules/system/logging.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/logging.fc	2009-09-29 18:32:45.000000000 +0200
+@@ -50,6 +50,7 @@
+ ')
+ 
+ ifdef(`distro_redhat',`
++/var/named/chroot/dev/log -s 	gen_context(system_u:object_r:devlog_t,s0)
+ /var/named/chroot/var/log -d	gen_context(system_u:object_r:var_log_t,s0)
+ ')
+ 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.12/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/logging.te	2009-09-29 14:05:27.000000000 +0200
+@@ -481,6 +481,10 @@
+ ')
+ 
+ optional_policy(`
++	bind_search_cache(syslogd_t)
++')
++
++optional_policy(`
+ 	inn_manage_log(syslogd_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.6.12/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2009-04-07 21:54:48.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/miscfiles.fc	2009-07-30 17:46:06.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -p -r1.906 -r1.907
--- selinux-policy.spec	22 Sep 2009 15:58:58 -0000	1.906
+++ selinux-policy.spec	30 Sep 2009 15:56:03 -0000	1.907
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 84%{?dist}
+Release: 85%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,9 +442,14 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 30 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-85
+- dovecot needs setcap/getcap
+- Fix up sssd policy  
+
 * Tue Sep 22 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-84
 - Allow sshd to create .ssh directory and content
 
+
 * Wed Sep 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-83
 - Add wordpress/wp-content/uploads label
 - Add /var/lib/libvirt/qemu label



From twaugh at fedoraproject.org  Wed Sep 30 15:57:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 30 Sep 2009 15:57:08 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-network-model.patch, NONE,
	1.1 system-config-printer.spec, 1.292, 1.293
Message-ID: <20090930155708.0062A11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16240

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-network-model.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Determine make/model for network printers (bug #524321).


system-config-printer-network-model.patch:
 system-config-printer.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE system-config-printer-network-model.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.network-model system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.network-model	2009-09-30 16:55:46.115760592 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:55:52.545635754 +0100
@@ -4217,6 +4217,12 @@ class NewPrinterGUI(GtkGUI):
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
                     return
+
+                if not devid and self.device.type in ["socket", "lpd", "ipp"]:
+                    # This is a network printer whose model we don't yet know.
+                    # Try to discover it.
+                    self.getNetworkPrinterMakeModel ()
+
                 uri = self.device.uri
                 if uri and uri.startswith ("smb://"):
                     uri = SMBURI (uri=uri[6:]).sanitize_uri ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- system-config-printer.spec	30 Sep 2009 15:55:38 -0000	1.292
+++ system-config-printer.spec	30 Sep 2009 15:57:07 -0000	1.293
@@ -22,6 +22,7 @@ Patch6: system-config-printer-missing-im
 Patch7: system-config-printer-find-return-accel.patch
 Patch8: system-config-printer-physdev-traceback.patch
 Patch9: system-config-printer-autoselect-raw.patch
+Patch10: system-config-printer-network-model.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,6 +78,7 @@ the configuration tool.
 %patch7 -p1 -b .find-return-accel
 %patch8 -p1 -b .physdev-traceback
 %patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
 
 %build
 %configure
@@ -179,6 +181,7 @@ exit 0
 
 %changelog
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Determine make/model for network printers (bug #524321).
 - Auto-select the correct driver entry for raw queues.
 - Avoid traceback in PhysicalDevice.py.
 - Let Return key activate the Find button for Find Network Printer.



From praveenp at fedoraproject.org  Wed Sep 30 15:57:52 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:57:52 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/devel sblim-cmpi-network.spec,1.1,1.2
Message-ID: <20090930155752.768B011C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16304

Modified Files:
	sblim-cmpi-network.spec 
Log Message:
changed the release to match the changelog



Index: sblim-cmpi-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/devel/sblim-cmpi-network.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-network.spec	30 Sep 2009 15:47:16 -0000	1.1
+++ sblim-cmpi-network.spec	30 Sep 2009 15:57:52 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-network
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM Network Instrumentation
 
 Group:          Applications/System
@@ -122,7 +122,7 @@ fi
 
 %changelog
 
-* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
+* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> - 1.3.8-2
 - modified the spec file to fix some rpmlint warnings
 * Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
 - Initial support



From praveenp at fedoraproject.org  Wed Sep 30 15:58:04 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:58:04 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/EL-4 sblim-cmpi-network.spec,1.1,1.2
Message-ID: <20090930155804.C80BD11C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16355

Modified Files:
	sblim-cmpi-network.spec 
Log Message:
changed the release to match the changelog



Index: sblim-cmpi-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/EL-4/sblim-cmpi-network.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-network.spec	30 Sep 2009 15:48:13 -0000	1.1
+++ sblim-cmpi-network.spec	30 Sep 2009 15:58:04 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-network
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM Network Instrumentation
 
 Group:          Applications/System
@@ -122,7 +122,7 @@ fi
 
 %changelog
 
-* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
+* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> - 1.3.8-2
 - modified the spec file to fix some rpmlint warnings
 * Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
 - Initial support



From praveenp at fedoraproject.org  Wed Sep 30 15:58:20 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:58:20 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/EL-5 sblim-cmpi-network.spec,1.1,1.2
Message-ID: <20090930155820.72FD011C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16409

Modified Files:
	sblim-cmpi-network.spec 
Log Message:
changed the release to match the changelog



Index: sblim-cmpi-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/EL-5/sblim-cmpi-network.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-network.spec	30 Sep 2009 15:49:06 -0000	1.1
+++ sblim-cmpi-network.spec	30 Sep 2009 15:58:20 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-network
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM Network Instrumentation
 
 Group:          Applications/System
@@ -122,7 +122,7 @@ fi
 
 %changelog
 
-* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
+* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> - 1.3.8-2
 - modified the spec file to fix some rpmlint warnings
 * Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
 - Initial support



From praveenp at fedoraproject.org  Wed Sep 30 15:58:36 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:58:36 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/F-11 sblim-cmpi-network.spec,1.1,1.2
Message-ID: <20090930155836.5FF9711C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16463

Modified Files:
	sblim-cmpi-network.spec 
Log Message:
changed the release to match the changelog



Index: sblim-cmpi-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/F-11/sblim-cmpi-network.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-network.spec	30 Sep 2009 15:49:51 -0000	1.1
+++ sblim-cmpi-network.spec	30 Sep 2009 15:58:36 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-network
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM Network Instrumentation
 
 Group:          Applications/System
@@ -122,7 +122,7 @@ fi
 
 %changelog
 
-* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
+* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> - 1.3.8-2
 - modified the spec file to fix some rpmlint warnings
 * Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
 - Initial support



From praveenp at fedoraproject.org  Wed Sep 30 15:58:52 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 30 Sep 2009 15:58:52 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/F-12 sblim-cmpi-network.spec,1.1,1.2
Message-ID: <20090930155852.497F611C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-network/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16511

Modified Files:
	sblim-cmpi-network.spec 
Log Message:
changed the release to match the changelog



Index: sblim-cmpi-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-network/F-12/sblim-cmpi-network.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-network.spec	30 Sep 2009 15:50:52 -0000	1.1
+++ sblim-cmpi-network.spec	30 Sep 2009 15:58:52 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-network
 Version:        1.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM Network Instrumentation
 
 Group:          Applications/System
@@ -122,7 +122,7 @@ fi
 
 %changelog
 
-* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com>
+* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> - 1.3.8-2
 - modified the spec file to fix some rpmlint warnings
 * Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
 - Initial support



From deji at fedoraproject.org  Wed Sep 30 16:00:00 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 30 Sep 2009 16:00:00 +0000 (UTC)
Subject: rpms/bibletime/F-12 .cvsignore, 1.11, 1.12 bibletime.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <20090930160000.988D511C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/bibletime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16921

Modified Files:
	.cvsignore bibletime.spec sources 
Log Message:
* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 2.2-1
- Update to 2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Aug 2009 03:48:35 -0000	1.11
+++ .cvsignore	30 Sep 2009 16:00:00 -0000	1.12
@@ -1 +1 @@
-bibletime-2.1.tar.gz
+bibletime-2.2.tar.gz


Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-12/bibletime.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bibletime.spec	13 Aug 2009 03:48:35 -0000	1.16
+++ bibletime.spec	30 Sep 2009 16:00:00 -0000	1.17
@@ -1,6 +1,6 @@
 Summary:	BibleTime is an easy to use Bible study tool for KDE
 Name:		bibletime
-Version:	2.1
+Version:	2.2
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -82,6 +82,9 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 2.2-1
+- Update to 2.2
+
 * Wed Aug 12 2009 Deji Akingunola <dakingun at gmail.com> - 2.1-1
 - Update to 2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Aug 2009 03:48:35 -0000	1.11
+++ sources	30 Sep 2009 16:00:00 -0000	1.12
@@ -1 +1 @@
-79bb28840f655e7e5d6ce759e41dd832  bibletime-2.1.tar.gz
+ad4affc7aa847c0fd9b06cc55cc6919f  bibletime-2.2.tar.gz



From limb at fedoraproject.org  Wed Sep 30 16:06:43 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 30 Sep 2009 16:06:43 +0000 (UTC)
Subject: rpms/inksmoto/devel .cvsignore, 1.8, 1.9 inksmoto.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20090930160643.D6C7111C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18598

Modified Files:
	.cvsignore inksmoto.spec sources 
Log Message:
0.7.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Aug 2009 15:06:57 -0000	1.8
+++ .cvsignore	30 Sep 2009 16:06:43 -0000	1.9
@@ -1 +1 @@
-inksmoto-0.6.0.tar.gz
+inksmoto-0.7.0~rc1.tar.gz


Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/inksmoto.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- inksmoto.spec	24 Aug 2009 15:06:57 -0000	1.12
+++ inksmoto.spec	30 Sep 2009 16:06:43 -0000	1.13
@@ -1,12 +1,12 @@
 Name: inksmoto
-Version: 0.6.0
-Release:  2%{?dist}
+Version: 0.7.0
+Release:  1.rc1%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc1.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Wed Sep 30 2009 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1.rc1
+- Update to 0.7.0~rc1.
+
 * Mon Aug 24 2009 Jon Ciesla <limb at jcomserv.net> - 0.6.0-2
 - 0.6.0 final.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Aug 2009 15:06:57 -0000	1.8
+++ sources	30 Sep 2009 16:06:43 -0000	1.9
@@ -1 +1 @@
-01a0fcb17f0c9658fe8c5b6db584c772  inksmoto-0.6.0.tar.gz
+be4626de34f7d5edefea99e6a51f5608  inksmoto-0.7.0~rc1.tar.gz



From timlau at fedoraproject.org  Wed Sep 30 16:07:18 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 30 Sep 2009 16:07:18 +0000 (UTC)
Subject: rpms/yumex/F-12 sources,1.62,1.63 yumex.spec,1.75,1.76
Message-ID: <20090930160718.0A8CF11C00E6@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18729

Modified Files:
	sources yumex.spec 
Log Message:
Release 2.9.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-12/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	18 Sep 2009 08:21:42 -0000	1.62
+++ sources	30 Sep 2009 16:07:17 -0000	1.63
@@ -1 +1 @@
-169a7878aa2e739bc440be0828cd1cba  yumex-2.9.1.tar.gz
+1f8e57ab09c54611945c5d0fea476d82  yumex-2.9.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-12/yumex.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- yumex.spec	18 Sep 2009 08:21:42 -0000	1.75
+++ yumex.spec	30 Sep 2009 16:07:17 -0000	1.76
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.9.1
+Version:  2.9.2
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -73,7 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Fri Sep 18 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
+* Wed Sep 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.2-1
+- bumped version to 2.9.2-1 
+* Fri Sep 18 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.1-1
 - bumped version to 2.9.1-1 
 * Sun Aug 30 2009 Tim Lauridsen <timlau at fedoraproject.org> - 2.9.0-1
 - bumped version to 2.9.0-1



From deji at fedoraproject.org  Wed Sep 30 16:17:56 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 30 Sep 2009 16:17:56 +0000 (UTC)
Subject: rpms/tokyocabinet/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 tokyocabinet-fedora.patch, 1.6, 1.7 tokyocabinet.spec, 1.15, 1.16
Message-ID: <20090930161756.30AFA11C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19971

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.33-1
- Update to 1.4.33



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Aug 2009 22:01:09 -0000	1.13
+++ .cvsignore	30 Sep 2009 16:17:55 -0000	1.14
@@ -1 +1 @@
-tokyocabinet-1.4.32.tar.gz
+tokyocabinet-1.4.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Aug 2009 22:01:09 -0000	1.13
+++ sources	30 Sep 2009 16:17:55 -0000	1.14
@@ -1 +1 @@
-a1a161eab1cb7487b23b6c914e2afb3e  tokyocabinet-1.4.32.tar.gz
+d81c3b04921d189f843c64d56b81a8d4  tokyocabinet-1.4.33.tar.gz

tokyocabinet-fedora.patch:
 Makefile.in        |    4 ++--
 configure.in       |   17 +++--------------
 tokyocabinet.pc.in |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet-fedora.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tokyocabinet-fedora.patch	28 Aug 2009 22:02:25 -0000	1.6
+++ tokyocabinet-fedora.patch	30 Sep 2009 16:17:55 -0000	1.7
@@ -1,5 +1,5 @@
---- configure.in	2009-08-13 22:57:42.000000000 -0400
-+++ configure.in.new	2009-08-28 17:47:51.203289024 -0400
+--- configure.in	2009-08-31 05:36:58.000000000 -0400
++++ configure.in.new	2009-09-30 12:02:41.608745987 -0400
 @@ -31,26 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
@@ -31,7 +31,7 @@
  # Options
  #================================================================
 --- Makefile.in	2009-08-04 03:37:52.000000000 -0400
-+++ Makefile.in.new	2009-08-28 17:49:17.050288532 -0400
++++ Makefile.in.new	2009-09-30 12:11:36.134746916 -0400
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -44,7 +44,7 @@
  
  
 --- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
-+++ tokyocabinet.pc.in.new	2009-08-28 17:50:19.201288883 -0400
++++ tokyocabinet.pc.in.new	2009-09-30 12:12:02.046746604 -0400
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tokyocabinet.spec	28 Aug 2009 22:01:09 -0000	1.15
+++ tokyocabinet.spec	30 Sep 2009 16:17:55 -0000	1.16
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.4.32
+Version:	1.4.33
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %doc doc/*
 
 %changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.33-1
+- Update to 1.4.33
+
 * Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.32-1
 - Update to 1.4.32
 



From cwickert at fedoraproject.org  Wed Sep 30 16:26:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 16:26:15 +0000 (UTC)
Subject: rpms/gxmessage/devel .cvsignore, 1.3, 1.4 gxmessage.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090930162615.B63E911C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22841

Modified Files:
	.cvsignore gxmessage.spec sources 
Log Message:
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.4-1
- Update to 2.12.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Sep 2009 12:15:56 -0000	1.3
+++ .cvsignore	30 Sep 2009 16:26:14 -0000	1.4
@@ -1 +1 @@
-gxmessage-2.12.2.tar.gz
+gxmessage-2.12.4.tar.gz


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/gxmessage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gxmessage.spec	18 Sep 2009 12:15:56 -0000	1.4
+++ gxmessage.spec	30 Sep 2009 16:26:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gxmessage
-Version:        2.12.2
-Release:        2%{?dist}
+Version:        2.12.4
+Release:        1%{?dist}
 Summary:        GTK2 based xmessage clone
 
 Group:          User Interface/X
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.4-1
+- Update to 2.12.4
+
 * Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.2-1
 - Update to 2.12.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Sep 2009 12:15:56 -0000	1.3
+++ sources	30 Sep 2009 16:26:14 -0000	1.4
@@ -1 +1 @@
-91a65c67ab150bb5324b95149f9904e7  gxmessage-2.12.2.tar.gz
+7c94c714ebedbfa2db2d645cc4a4092a  gxmessage-2.12.4.tar.gz



From rrakus at fedoraproject.org  Wed Sep 30 16:27:09 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed, 30 Sep 2009 16:27:09 +0000 (UTC)
Subject: rpms/system-config-kdump/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 system-config-kdump.spec, 1.11, 1.12
Message-ID: <20090930162709.DE8F711C00E6@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-serv23273

Modified Files:
	.cvsignore sources system-config-kdump.spec 
Log Message:
Update to version 2.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 May 2009 14:32:14 -0000	1.5
+++ .cvsignore	30 Sep 2009 16:27:09 -0000	1.6
@@ -1 +1 @@
-system-config-kdump-2.0.0.tar.bz2
+system-config-kdump-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 May 2009 14:32:14 -0000	1.5
+++ sources	30 Sep 2009 16:27:09 -0000	1.6
@@ -1 +1 @@
-fc0af839ac193056ca0295efc9026f4e  system-config-kdump-2.0.0.tar.bz2
+ec996bc629ee02278576fb6acfe24f6c  system-config-kdump-2.0.1.tar.bz2


Index: system-config-kdump.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/system-config-kdump.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- system-config-kdump.spec	27 Jul 2009 05:23:08 -0000	1.11
+++ system-config-kdump.spec	30 Sep 2009 16:27:09 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-kdump/
 License: GPLv2+
 Group: System Environment/Base
@@ -14,7 +14,6 @@ BuildRequires: intltool, gettext, gnome-
 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
@@ -75,7 +74,7 @@ fi
 
 %{_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}/polkit-1/actions/org.fedoraproject.systemconfig.kdump.policy
 
 %{_datadir}/icons/hicolor/48x48/apps/system-config-kdump.png
 
@@ -84,6 +83,9 @@ fi
 %doc %{_datadir}/omf/system-config-kdump
 
 %changelog
+* Wed Sep 30 2009 Roman Rakus <rrakus at redhat.com> - 2.0.1-1
+- Update to version 2.0.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Wed Sep 30 16:31:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 16:31:33 +0000 (UTC)
Subject: rpms/gxmessage/devel gxmessage.spec,1.5,1.6
Message-ID: <20090930163133.1B38F11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24454

Modified Files:
	gxmessage.spec 
Log Message:
clarify license, icon is Public Domain


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/gxmessage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gxmessage.spec	30 Sep 2009 16:26:14 -0000	1.5
+++ gxmessage.spec	30 Sep 2009 16:31:32 -0000	1.6
@@ -4,7 +4,7 @@ Release:        1%{?dist}
 Summary:        GTK2 based xmessage clone
 
 Group:          User Interface/X
-License:        GPLv3+
+License:        GPLv3+ and Public Domain
 URL:            http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
 Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING COPYING.icon HACKING NEWS README TODO
 %doc examples/
 %{_bindir}/%{name}*
 %{_mandir}/man1/%{name}.*



From rdieter at fedoraproject.org  Wed Sep 30 16:32:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 16:32:10 +0000 (UTC)
Subject: rpms/taglib/F-11 taglib-1.6-test_mp4.patch, 1.2, 1.3 .cvsignore,
	1.13, 1.14 sources, 1.13, 1.14 taglib.spec, 1.35,
	1.36 taglib-1.5-1.6-ape.patch, 1.1,
	NONE taglib-1.5-1.6-flac.patch, 1.1,
	NONE taglib-1.5-1.6-mpeg-cmake.patch, 1.1,
	NONE taglib-1.5-1.6-mpeg.patch, 1.1,
	NONE taglib-1.5-1.6-ogg.patch, 1.1,
	NONE taglib-1.5-1.6-toolkit.patch, 1.1,
	NONE taglib-1.5-tests.patch, 1.1, NONE
Message-ID: <20090930163210.5FEC411C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24478

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.6-test_mp4.patch 
Removed Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib-1.5-tests.patch 
Log Message:
sync with devel/ branch for 1.6 goodness


taglib-1.6-test_mp4.patch:
 test_mp4.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: taglib-1.6-test_mp4.patch
===================================================================
RCS file: taglib-1.6-test_mp4.patch
diff -N taglib-1.6-test_mp4.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ taglib-1.6-test_mp4.patch	30 Sep 2009 16:32:10 -0000	1.3
@@ -0,0 +1,12 @@
+diff -Nur taglib-1.6-orig/tests/test_mp4.cpp taglib-1.6/tests/test_mp4.cpp
+--- taglib-1.6-orig/tests/test_mp4.cpp	2009-07-24 15:08:51.000000000 +0200
++++ taglib-1.6/tests/test_mp4.cpp	2009-09-14 14:46:41.724715605 +0200
+@@ -130,7 +130,7 @@
+     MP4::Atom *moov = atoms->atoms[0];
+     CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
+ 
+-    f->tag()->itemListMap()["pgap"] = 1;
++    f->tag()->itemListMap()["pgap"] = true;
+     f->save();
+ 
+     f = new MP4::File(filename.c_str());


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Sep 2009 17:09:36 -0000	1.13
+++ .cvsignore	30 Sep 2009 16:32:09 -0000	1.14
@@ -1 +1 @@
-taglib-1.5.tar.gz
+taglib-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Sep 2009 17:09:36 -0000	1.13
+++ sources	30 Sep 2009 16:32:09 -0000	1.14
@@ -1 +1 @@
-7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz
+5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/taglib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- taglib.spec	14 Sep 2009 17:09:37 -0000	1.35
+++ taglib.spec	30 Sep 2009 16:32:10 -0000	1.36
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    9%{?dist}
+Version:    1.6
+Release:    2%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,15 +30,7 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.5-tests.patch
-
-## upstream patches
-Patch101: taglib-1.5-1.6-ape.patch
-Patch102: taglib-1.5-1.6-ogg.patch
-Patch103: taglib-1.5-1.6-flac.patch
-Patch104: taglib-1.5-1.6-toolkit.patch
-Patch105: taglib-1.5-1.6-mpeg.patch
-Patch106: taglib-1.5-1.6-mpeg-cmake.patch
+Patch3: taglib-1.6-test_mp4.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig
@@ -92,19 +84,13 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .tests
-%patch101 -p1 -b .ape
-%patch102 -p1 -b .ogg
-%patch103 -p1 -b .flac
-%patch104 -p1 -b .toolkit
-%patch105 -p1 -b .mpeg
-%patch106 -p1 -b .mpeg-build
+%patch3 -p1 -b .test_mp4
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?buildtests} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -152,7 +138,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING.LGPL
+%doc AUTHORS COPYING.LGPL NEWS
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -171,8 +157,16 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-9
-- Merge minor changes in id3v2/ogg from 1.6 final.
+* Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
+- Include the new NEWS file as %%doc.
+
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Add patch to fix MP4 test on ppc/ppc64.
+- Update to 1.6 final.
+
+* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
+- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
+- Build optional support for MP4 and ASF/WMA files.
 
 * Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
 - Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and


--- taglib-1.5-1.6-ape.patch DELETED ---


--- taglib-1.5-1.6-flac.patch DELETED ---


--- taglib-1.5-1.6-mpeg-cmake.patch DELETED ---


--- taglib-1.5-1.6-mpeg.patch DELETED ---


--- taglib-1.5-1.6-ogg.patch DELETED ---


--- taglib-1.5-1.6-toolkit.patch DELETED ---


--- taglib-1.5-tests.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 30 16:33:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 16:33:02 +0000 (UTC)
Subject: rpms/taglib/F-10 taglib-1.6-test_mp4.patch, 1.2, 1.3 .cvsignore,
	1.13, 1.14 sources, 1.13, 1.14 taglib.spec, 1.33,
	1.34 taglib-1.5-1.6-ape.patch, 1.1,
	NONE taglib-1.5-1.6-flac.patch, 1.1,
	NONE taglib-1.5-1.6-mpeg-cmake.patch, 1.1,
	NONE taglib-1.5-1.6-mpeg.patch, 1.1,
	NONE taglib-1.5-1.6-ogg.patch, 1.1,
	NONE taglib-1.5-1.6-toolkit.patch, 1.1,
	NONE taglib-1.5-tests.patch, 1.1, NONE
Message-ID: <20090930163302.6E6FC11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24985

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.6-test_mp4.patch 
Removed Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib-1.5-tests.patch 
Log Message:
sync with devel/ branch for 1.6 goodness


taglib-1.6-test_mp4.patch:
 test_mp4.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: taglib-1.6-test_mp4.patch
===================================================================
RCS file: taglib-1.6-test_mp4.patch
diff -N taglib-1.6-test_mp4.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ taglib-1.6-test_mp4.patch	30 Sep 2009 16:33:02 -0000	1.3
@@ -0,0 +1,12 @@
+diff -Nur taglib-1.6-orig/tests/test_mp4.cpp taglib-1.6/tests/test_mp4.cpp
+--- taglib-1.6-orig/tests/test_mp4.cpp	2009-07-24 15:08:51.000000000 +0200
++++ taglib-1.6/tests/test_mp4.cpp	2009-09-14 14:46:41.724715605 +0200
+@@ -130,7 +130,7 @@
+     MP4::Atom *moov = atoms->atoms[0];
+     CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
+ 
+-    f->tag()->itemListMap()["pgap"] = 1;
++    f->tag()->itemListMap()["pgap"] = true;
+     f->save();
+ 
+     f = new MP4::File(filename.c_str());


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Sep 2009 17:09:37 -0000	1.13
+++ .cvsignore	30 Sep 2009 16:33:01 -0000	1.14
@@ -1 +1 @@
-taglib-1.5.tar.gz
+taglib-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Sep 2009 17:09:37 -0000	1.13
+++ sources	30 Sep 2009 16:33:01 -0000	1.14
@@ -1 +1 @@
-7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz
+5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/taglib.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- taglib.spec	14 Sep 2009 17:09:38 -0000	1.33
+++ taglib.spec	30 Sep 2009 16:33:02 -0000	1.34
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    9%{?dist}
+Version:    1.6
+Release:    2%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,15 +30,7 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.5-tests.patch
-
-## upstream patches
-Patch101: taglib-1.5-1.6-ape.patch
-Patch102: taglib-1.5-1.6-ogg.patch
-Patch103: taglib-1.5-1.6-flac.patch
-Patch104: taglib-1.5-1.6-toolkit.patch
-Patch105: taglib-1.5-1.6-mpeg.patch
-Patch106: taglib-1.5-1.6-mpeg-cmake.patch
+Patch3: taglib-1.6-test_mp4.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig
@@ -92,19 +84,13 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .tests
-%patch101 -p1 -b .ape
-%patch102 -p1 -b .ogg
-%patch103 -p1 -b .flac
-%patch104 -p1 -b .toolkit
-%patch105 -p1 -b .mpeg
-%patch106 -p1 -b .mpeg-build
+%patch3 -p1 -b .test_mp4
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?buildtests} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -152,7 +138,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING.LGPL
+%doc AUTHORS COPYING.LGPL NEWS
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -171,8 +157,16 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-9
-- Merge minor changes in id3v2/ogg from 1.6 final.
+* Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
+- Include the new NEWS file as %%doc.
+
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Add patch to fix MP4 test on ppc/ppc64.
+- Update to 1.6 final.
+
+* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
+- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
+- Build optional support for MP4 and ASF/WMA files.
 
 * Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
 - Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and


--- taglib-1.5-1.6-ape.patch DELETED ---


--- taglib-1.5-1.6-flac.patch DELETED ---


--- taglib-1.5-1.6-mpeg-cmake.patch DELETED ---


--- taglib-1.5-1.6-mpeg.patch DELETED ---


--- taglib-1.5-1.6-ogg.patch DELETED ---


--- taglib-1.5-1.6-toolkit.patch DELETED ---


--- taglib-1.5-tests.patch DELETED ---



From deji at fedoraproject.org  Wed Sep 30 16:35:24 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 30 Sep 2009 16:35:24 +0000 (UTC)
Subject: rpms/tokyocabinet/F-12 .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 tokyocabinet-fedora.patch, 1.6, 1.7 tokyocabinet.spec, 1.15, 1.16
Message-ID: <20090930163524.56FCC11C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.33-1
- Update to 1.4.33



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Aug 2009 22:01:09 -0000	1.13
+++ .cvsignore	30 Sep 2009 16:35:23 -0000	1.14
@@ -1 +1 @@
-tokyocabinet-1.4.32.tar.gz
+tokyocabinet-1.4.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Aug 2009 22:01:09 -0000	1.13
+++ sources	30 Sep 2009 16:35:23 -0000	1.14
@@ -1 +1 @@
-a1a161eab1cb7487b23b6c914e2afb3e  tokyocabinet-1.4.32.tar.gz
+d81c3b04921d189f843c64d56b81a8d4  tokyocabinet-1.4.33.tar.gz

tokyocabinet-fedora.patch:
 Makefile.in        |    4 ++--
 configure.in       |   17 +++--------------
 tokyocabinet.pc.in |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-12/tokyocabinet-fedora.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tokyocabinet-fedora.patch	28 Aug 2009 22:02:25 -0000	1.6
+++ tokyocabinet-fedora.patch	30 Sep 2009 16:35:24 -0000	1.7
@@ -1,5 +1,5 @@
---- configure.in	2009-08-13 22:57:42.000000000 -0400
-+++ configure.in.new	2009-08-28 17:47:51.203289024 -0400
+--- configure.in	2009-08-31 05:36:58.000000000 -0400
++++ configure.in.new	2009-09-30 12:02:41.608745987 -0400
 @@ -31,26 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
@@ -31,7 +31,7 @@
  # Options
  #================================================================
 --- Makefile.in	2009-08-04 03:37:52.000000000 -0400
-+++ Makefile.in.new	2009-08-28 17:49:17.050288532 -0400
++++ Makefile.in.new	2009-09-30 12:11:36.134746916 -0400
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -44,7 +44,7 @@
  
  
 --- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
-+++ tokyocabinet.pc.in.new	2009-08-28 17:50:19.201288883 -0400
++++ tokyocabinet.pc.in.new	2009-09-30 12:12:02.046746604 -0400
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-12/tokyocabinet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tokyocabinet.spec	28 Aug 2009 22:01:09 -0000	1.15
+++ tokyocabinet.spec	30 Sep 2009 16:35:24 -0000	1.16
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.4.32
+Version:	1.4.33
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %doc doc/*
 
 %changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.33-1
+- Update to 1.4.33
+
 * Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.32-1
 - Update to 1.4.32
 



From cwickert at fedoraproject.org  Wed Sep 30 16:37:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 16:37:31 +0000 (UTC)
Subject: rpms/gxmessage/F-12 .cvsignore, 1.3, 1.4 gxmessage.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090930163731.5F1BE11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26370

Modified Files:
	.cvsignore gxmessage.spec sources 
Log Message:
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.4-1
- Update to 2.12.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Sep 2009 12:15:56 -0000	1.3
+++ .cvsignore	30 Sep 2009 16:37:31 -0000	1.4
@@ -1 +1 @@
-gxmessage-2.12.2.tar.gz
+gxmessage-2.12.4.tar.gz


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-12/gxmessage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gxmessage.spec	18 Sep 2009 12:15:56 -0000	1.4
+++ gxmessage.spec	30 Sep 2009 16:37:31 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           gxmessage
-Version:        2.12.2
-Release:        2%{?dist}
+Version:        2.12.4
+Release:        1%{?dist}
 Summary:        GTK2 based xmessage clone
 
 Group:          User Interface/X
-License:        GPLv3+
+License:        GPLv3+ and Public Domain
 URL:            http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
 Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING COPYING.icon HACKING NEWS README TODO
 %doc examples/
 %{_bindir}/%{name}*
 %{_mandir}/man1/%{name}.*
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.4-1
+- Update to 2.12.4
+
 * Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.2-1
 - Update to 2.12.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Sep 2009 12:15:56 -0000	1.3
+++ sources	30 Sep 2009 16:37:31 -0000	1.4
@@ -1 +1 @@
-91a65c67ab150bb5324b95149f9904e7  gxmessage-2.12.2.tar.gz
+7c94c714ebedbfa2db2d645cc4a4092a  gxmessage-2.12.4.tar.gz



From cwickert at fedoraproject.org  Wed Sep 30 16:39:06 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 16:39:06 +0000 (UTC)
Subject: rpms/gxmessage/F-12 gxmessage.spec,1.5,1.6
Message-ID: <20090930163906.C3EB411C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26903/F-12

Modified Files:
	gxmessage.spec 
Log Message:
BR intltool


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-12/gxmessage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gxmessage.spec	30 Sep 2009 16:37:31 -0000	1.5
+++ gxmessage.spec	30 Sep 2009 16:39:06 -0000	1.6
@@ -9,7 +9,7 @@ URL:            http://homepages.ihug.co
 Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
+BuildRequires:  gtk2-devel >= 2.6.0, gettext, intltool
 Requires(post): info
 Requires(preun): info
 



From cwickert at fedoraproject.org  Wed Sep 30 16:39:06 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Sep 2009 16:39:06 +0000 (UTC)
Subject: rpms/gxmessage/devel gxmessage.spec,1.6,1.7
Message-ID: <20090930163906.86BEB11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26903/devel

Modified Files:
	gxmessage.spec 
Log Message:
BR intltool


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/gxmessage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gxmessage.spec	30 Sep 2009 16:31:32 -0000	1.6
+++ gxmessage.spec	30 Sep 2009 16:39:06 -0000	1.7
@@ -9,7 +9,7 @@ URL:            http://homepages.ihug.co
 Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
+BuildRequires:  gtk2-devel >= 2.6.0, gettext, intltool
 Requires(post): info
 Requires(preun): info
 



From salimma at fedoraproject.org  Wed Sep 30 16:48:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 16:48:32 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.38,1.39
Message-ID: <20090930164832.EBC7411C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29823

Modified Files:
	llvm.spec 
Log Message:
Make tests advisory for now



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- llvm.spec	30 Sep 2009 06:30:47 -0000	1.38
+++ llvm.spec	30 Sep 2009 16:48:32 -0000	1.39
@@ -138,6 +138,7 @@ Summary:        Development files for %{
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       %{name}-ocaml = %{version}-%{release}
+Requires:       ocaml
 
 %description    ocaml-devel
 The %{name}-ocaml-devel package contains libraries and signature files
@@ -195,14 +196,13 @@ make %{_smp_mflags} \
 
 
 %check
-# some tests fail on PPC
+# pre1: some tests fail on PPC
 # http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
+# pre2: test failures on x86_64 as well
 cd obj
-%ifnarch ppc
-make check
-%endif
+make check 2>&1 | tee ../llvm-testlog.txt || true
 # some clang tests still fail, preserve test results
-(cd tools/clang && make test 2>&1) | tee ../testlog.txt || true
+(cd tools/clang && make test 2>&1) | tee ../clang-testlog.txt || true
 
 
 %install
@@ -285,7 +285,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt
+%doc CREDITS.TXT LICENSE.TXT README.txt llvm-testlog.txt
 %exclude %{_bindir}/llvm-config
 %{_bindir}/bugpoint
 %{_bindir}/llc
@@ -293,7 +293,6 @@ rm -rf %{buildroot}
 %{_bindir}/llvm*
 %{_bindir}/opt
 %exclude %{_mandir}/man1/clang.1.*
-%exclude %{_mandir}/man1/FileCheck.1.*
 %doc %{_mandir}/man1/*.1.gz
 
 %if %{?_with_doxygen:1}%{!?_with_doxygen:0}
@@ -313,15 +312,12 @@ rm -rf %{buildroot}
 
 %files -n clang
 %defattr(-,root,root,-)
-%doc clang-docs/* testlog.txt
+%doc clang-docs/* clang-testlog.txt
 %{_bindir}/clang*
-%{_bindir}/FileCheck
-%{_bindir}/FileUpdate
 %{_bindir}/tblgen
 %{_prefix}/lib/clang
 %{_libexecdir}/clang-cc
 %doc %{_mandir}/man1/clang.1.*
-%doc %{_mandir}/man1/FileCheck.1.*
 
 %files -n clang-analyzer
 %defattr(-,root,root,-)



From kasal at fedoraproject.org  Wed Sep 30 16:52:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 16:52:26 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-HTTP/devel
	perl-POE-Component-Client-HTTP.spec, 1.16, 1.17
Message-ID: <20090930165226.5410F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30809

Modified Files:
	perl-POE-Component-Client-HTTP.spec 
Log Message:
- fix the perl(POE::Component::Client::Keepalive) require
  to match our numbering


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-POE-Component-Client-HTTP.spec	27 Sep 2009 09:01:29 -0000	1.16
+++ perl-POE-Component-Client-HTTP.spec	30 Sep 2009 16:52:26 -0000	1.17
@@ -11,7 +11,7 @@
 
 Name:           perl-POE-Component-Client-HTTP
 Version:        0.890
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -27,7 +27,7 @@ BuildRequires:  perl(POE) >= 1.007
 BuildRequires:  perl(HTTP::Request) >= 1.3
 BuildRequires:  perl(HTTP::Response) >= 1.37
 BuildRequires:  perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.26
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.2600
 
 # tests...
 BuildRequires:  perl(Test::Pod)
@@ -37,7 +37,7 @@ BuildRequires:  perl(Test::More)
 # use base...
 Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
 # use POE qw{ ... }
-Requires:       perl(POE::Component::Client::Keepalive) >= 0.26
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.2600
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -103,6 +103,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Stepan Kasal <skasal at redhat.com> 0.890-2
+- fix the perl(POE::Component::Client::Keepalive) require
+  to match our numbering
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.890-1
 - auto-update to 0.890 (by cpan-spec-update 0.01)
 - altered br on perl(POE) (0.3202 => 1.007)



From kasal at fedoraproject.org  Wed Sep 30 16:53:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 16:53:00 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-HTTP/F-12
	perl-POE-Component-Client-HTTP.spec, 1.16, 1.17
Message-ID: <20090930165300.A5F1E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30969

Modified Files:
	perl-POE-Component-Client-HTTP.spec 
Log Message:
sync w/ rawhide


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/F-12/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-POE-Component-Client-HTTP.spec	27 Sep 2009 09:01:29 -0000	1.16
+++ perl-POE-Component-Client-HTTP.spec	30 Sep 2009 16:53:00 -0000	1.17
@@ -11,7 +11,7 @@
 
 Name:           perl-POE-Component-Client-HTTP
 Version:        0.890
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -27,7 +27,7 @@ BuildRequires:  perl(POE) >= 1.007
 BuildRequires:  perl(HTTP::Request) >= 1.3
 BuildRequires:  perl(HTTP::Response) >= 1.37
 BuildRequires:  perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.26
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.2600
 
 # tests...
 BuildRequires:  perl(Test::Pod)
@@ -37,7 +37,7 @@ BuildRequires:  perl(Test::More)
 # use base...
 Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
 # use POE qw{ ... }
-Requires:       perl(POE::Component::Client::Keepalive) >= 0.26
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.2600
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -103,6 +103,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Stepan Kasal <skasal at redhat.com> 0.890-2
+- fix the perl(POE::Component::Client::Keepalive) require
+  to match our numbering
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.890-1
 - auto-update to 0.890 (by cpan-spec-update 0.01)
 - altered br on perl(POE) (0.3202 => 1.007)



From jcollie at fedoraproject.org  Wed Sep 30 16:57:58 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 30 Sep 2009 16:57:58 +0000 (UTC)
Subject: rpms/asterisk/devel .cvsignore, 1.22,
	1.23 0005-Build-using-external-libedit.patch, 1.6,
	1.7 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.5,
	1.6 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.4, 1.5 0011-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec,
	1.56, 1.57 sources, 1.22,
	1.23 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.5, NONE asterisk-strip.sh, 1.5, NONE
Message-ID: <20090930165758.80CC911C00E6@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv919

Modified Files:
	.cvsignore 0005-Build-using-external-libedit.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0011-Fix-up-some-paths.patch asterisk.spec sources 
Removed Files:
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	asterisk-strip.sh 
Log Message:
* Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.1.rc2
- Update to 1.6.2.0-rc2
- We no longer need to strip the tarball as it no longer includes non-free items.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	7 Sep 2009 05:43:12 -0000	1.22
+++ .cvsignore	30 Sep 2009 16:57:57 -0000	1.23
@@ -1,3 +1,3 @@
-asterisk-1.6.1.6-stripped.tar.gz
-asterisk-1.6.1.6.tar.gz.asc
+asterisk-1.6.2.0-rc2.tar.gz
+asterisk-1.6.2.0-rc2.tar.gz.asc
 asterisk-developer-pubring.gpg

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0005-Build-using-external-libedit.patch	7 Sep 2009 05:43:12 -0000	1.6
+++ 0005-Build-using-external-libedit.patch	30 Sep 2009 16:57:57 -0000	1.7
@@ -1,8 +1,8 @@
 Index: build_tools/menuselect-deps.in
 ===================================================================
---- build_tools/menuselect-deps.in	(revision 216642)
+--- build_tools/menuselect-deps.in	(revision 221084)
 +++ build_tools/menuselect-deps.in	(working copy)
-@@ -17,6 +17,7 @@
+@@ -19,6 +19,7 @@
  IXJUSER=@PBX_IXJUSER@
  JACK=@PBX_JACK@
  LDAP=@PBX_LDAP@
@@ -12,17 +12,17 @@ Index: build_tools/menuselect-deps.in
  MISDN=@PBX_MISDN@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 216642)
+--- configure.ac	(revision 221084)
 +++ configure.ac	(working copy)
-@@ -232,6 +232,7 @@
+@@ -264,6 +264,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
 +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
+ AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
- AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1621,6 +1622,27 @@
+@@ -1667,6 +1668,27 @@
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -47,14 +47,14 @@ Index: configure.ac
 +AC_SUBST(LIBEDIT_LIB)
 +AC_SUBST(LIBEDIT_OBJ)
 +
- if test "${USE_CURL}" != "no"; then
-    AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
-    if test ! x"${CURL_CONFIG}" = xNo; then
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+ 
+ # build a GENERIC_ODBC result based on the presence of either UnixODBC (preferred)
 Index: main/Makefile
 ===================================================================
---- main/Makefile	(revision 216642)
+--- main/Makefile	(revision 221084)
 +++ main/Makefile	(working copy)
-@@ -129,6 +129,8 @@
+@@ -132,6 +132,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
  	rm ast_expr2.o ast_expr2f.o 
  
@@ -63,7 +63,7 @@ Index: main/Makefile
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -161,13 +163,13 @@
+@@ -164,13 +166,13 @@
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
@@ -82,18 +82,18 @@ Index: main/Makefile
  
 Index: main/cli.c
 ===================================================================
---- main/cli.c	(revision 216642)
+--- main/cli.c	(revision 221084)
 +++ main/cli.c	(working copy)
-@@ -34,6 +34,8 @@
- #include <ctype.h>
- #include <regex.h>
+@@ -36,6 +36,8 @@
+ #include <pwd.h>
+ #include <grp.h>
  
 +#include <readline.h>
 +
  #include "asterisk/cli.h"
  #include "asterisk/linkedlists.h"
  #include "asterisk/module.h"
-@@ -42,7 +44,6 @@
+@@ -44,7 +46,6 @@
  #include "asterisk/utils.h"
  #include "asterisk/app.h"
  #include "asterisk/lock.h"
@@ -103,12 +103,12 @@ Index: main/cli.c
  /*!
 Index: makeopts.in
 ===================================================================
---- makeopts.in	(revision 216642)
+--- makeopts.in	(revision 221084)
 +++ makeopts.in	(working copy)
-@@ -246,3 +246,7 @@
- 
+@@ -263,3 +263,7 @@
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
+ TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
 +
 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 +LIBEDIT_LIB=@LIBEDIT_LIB@

0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	7 Sep 2009 05:43:12 -0000	1.5
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	30 Sep 2009 16:57:58 -0000	1.6
@@ -1,8 +1,8 @@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 216642)
+--- configure.ac	(revision 221084)
 +++ configure.ac	(working copy)
-@@ -1493,7 +1493,17 @@
+@@ -1520,7 +1520,17 @@
      AST_CHECK_OSPTK([3], [5], [0])
  fi
  

0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch:
 res_http_post.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Index: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch	9 Feb 2009 05:54:21 -0000	1.4
+++ 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch	30 Sep 2009 16:57:58 -0000	1.5
@@ -1,17 +1,8 @@
-From 8c0899c97ac05f3c84ef61c4e95e4aa0309b1570 Mon Sep 17 00:00:00 2001
-From: Caolan McNamara <caolanm at redhat.com>
-Date: Sat, 3 Jan 2009 19:15:12 -0600
-Subject: [PATCH 10/15] my guess as replacements for the missing/broken stuff against the new gmime api
-
----
- res/res_http_post.c |   12 ++++--------
- 1 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/res/res_http_post.c b/res/res_http_post.c
-index 5fbf46a..8827e65 100644
---- a/res/res_http_post.c
-+++ b/res/res_http_post.c
-@@ -119,14 +119,10 @@ static void process_message_callback(GMimeObject *part, gpointer user_data)
+Index: res/res_http_post.c
+===================================================================
+--- res/res_http_post.c	(revision 221084)
++++ res/res_http_post.c	(working copy)
+@@ -122,14 +122,10 @@
  		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
  		return;
  	} else if (GMIME_IS_MULTIPART(part)) {
@@ -29,7 +20,7 @@ index 5fbf46a..8827e65 100644
  	} else if (GMIME_IS_PART(part)) {
  		const char *filename;
  
-@@ -148,7 +144,7 @@ static int process_message(GMimeMessage *message, const char *post_dir)
+@@ -151,7 +147,7 @@
  		.post_dir = post_dir,
  	};
  
@@ -38,6 +29,3 @@ index 5fbf46a..8827e65 100644
  
  	return cbinfo.count;
  }
--- 
-1.6.1
-

0011-Fix-up-some-paths.patch:
 UPGRADE-1.4.txt                             |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 +++---
 configs/iax.conf.sample                     |    4 ++--
 configs/musiconhold.conf.sample             |    6 +++---
 configs/osp.conf.sample                     |    4 ++--
 configs/phoneprov.conf.sample               |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 +++---
 doc/osp.txt                                 |    8 ++++----
 doc/tex/asterisk-conf.tex                   |    4 ++--
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 +++---
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 ++++++++++++++--------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 ++++++++++++++--------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 +++++++++++++-------------
 16 files changed, 68 insertions(+), 68 deletions(-)

Index: 0011-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0011-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0011-Fix-up-some-paths.patch	9 Feb 2009 05:54:21 -0000	1.1
+++ 0011-Fix-up-some-paths.patch	30 Sep 2009 16:57:58 -0000	1.2
@@ -1,279 +1,105 @@
-From 2f393dd3178974151a4b69a56bb1523546ff1b10 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 11/15] Fix up some paths.
-
----
- UPGRADE-1.4.txt                             |    2 +-
- configs/festival.conf.sample                |    2 +-
- configs/http.conf.sample                    |    6 ++--
- configs/iax.conf.sample                     |    4 +-
- configs/musiconhold.conf.sample             |   10 ++++----
- configs/osp.conf.sample                     |    4 +-
- configs/phoneprov.conf.sample               |    2 +-
- contrib/scripts/astgenkey                   |    2 +-
- contrib/scripts/astgenkey.8                 |    6 ++--
- doc/osp.txt                                 |    8 +++---
- doc/tex/phoneprov.tex                       |    2 +-
- doc/tex/privacy.tex                         |    6 ++--
- pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
- pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
- pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
- 15 files changed, 68 insertions(+), 68 deletions(-)
-
-diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
-index 4f82694..69bf322 100644
---- a/UPGRADE-1.4.txt
-+++ b/UPGRADE-1.4.txt
-@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
- WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
- instead of the alternate-language files being stored in subdirectories underneath
- the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
--etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
-+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
- language itself, then places all the sound files for that language under that
- directory and its subdirectories. This is the layout that will be created if you
- select non-English languages to be installed via menuselect, HOWEVER Asterisk does
-diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
-index 774f1a1..815f11d 100644
---- a/configs/festival.conf.sample
-+++ b/configs/festival.conf.sample
-@@ -21,7 +21,7 @@
- ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
- ; Defaults to /tmp/
- ;
--;cachedir=/var/lib/asterisk/festivalcache/
-+;cachedir=/var/spool/asterisk/festival/
- ;
- ; Festival command to send to the server.
- ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index f15c9cf..6349905 100644
---- a/configs/http.conf.sample
-+++ b/configs/http.conf.sample
-@@ -5,7 +5,7 @@
- ; Note about Asterisk documentation:
- ;   If Asterisk was installed from a tarball, then the HTML documentation should
- ;   be installed in the static-http/docs directory which is
--;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
-+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
- ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
- ;   and "bindport" options, then you should be able to view the documentation
- ;   remotely by browsing to:
-@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
- ;[post_mappings]
- ;
- ; In this example, if the prefix option is set to "asterisk", then using the
--; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
--;uploads = /var/lib/asterisk/uploads/
-+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
-+;uploads = /var/spool/asterisk/uploads/
- ;
-diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
-index dc3c465..69de2b4 100644
---- a/configs/iax.conf.sample
-+++ b/configs/iax.conf.sample
-@@ -361,8 +361,8 @@ inkeys=freeworlddialup
- ; authentication is used, "inkeys" is a list of acceptable public keys on the 
- ; local system that can be used to authenticate the remote peer, separated by
- ; the ":" character.  "outkey" is a single, private key to use to authenticate
--; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
--; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
-+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
-+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
- ; keys should always be 3DES encrypted.
- ;
- ;
-diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
-index 4df1afd..b730335 100644
---- a/configs/musiconhold.conf.sample
-+++ b/configs/musiconhold.conf.sample
-@@ -39,11 +39,11 @@
- 
- [default]
- mode=files
--directory=/var/lib/asterisk/moh
-+directory=/usr/share/asterisk/moh
- ;
- ;[native-random]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;digit=#        ; If this option is set for a class, then when callers are
- ;               ; listening to music on hold, they can press this digit, and
- ;               ; they will switch to listening to this music class.
-@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
- 
- ;[native-alphabetical]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
- ;               ; not specified, the sort order is undefined.
- 
-@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
- ;mode=custom
- ; Note that with mode=custom, a directory is not required, such as when reading
- ; from a stream.
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
- 
- ;[ulawstream]
-@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
- ; choice
- ;[solaris]
- ;mode=custom
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
-diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
-index e342337..2e346e6 100644
---- a/configs/osp.conf.sample
-+++ b/configs/osp.conf.sample
-@@ -36,8 +36,8 @@
- ;source=domain name or [IP address in brackets]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
--; defined, crypto files will in /var/lib/asterisk/keys directory.
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
-+; defined, crypto files will in /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name will be the 
-diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
-index 8f55fa8..2608914 100644
---- a/configs/phoneprov.conf.sample
-+++ b/configs/phoneprov.conf.sample
-@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
- ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
- config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
- ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
-diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
-index 6376048..e4a5a80 100644
---- a/contrib/scripts/astgenkey
-+++ b/contrib/scripts/astgenkey
-@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
- 	echo "in PEM format for use by Asterisk.  You will be asked to"
- 	echo "enter a passcode for your key multiple times.  Please"
- 	echo "enter the same code each time.  The resulting files will"
--	echo "need to be moved to /var/lib/asterisk/keys if you want"
-+	echo "need to be moved to /usr/share/asterisk/keys if you want"
- 	echo "to use them, and any private keys (.key files) will"
- 	echo "need to be initialized at runtime either by running"
- 	echo "Asterisk with the '-i' option, or with the 'init keys'"
-diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
-index 328a4d2..ac6feae 100644
---- a/contrib/scripts/astgenkey.8
-+++ b/contrib/scripts/astgenkey.8
-@@ -88,7 +88,7 @@ The private key: secret.
- .RE
- 
- Those files should be copied to 
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- 
- (The private key: on your system. The public key: on other systems)
- 
-@@ -122,10 +122,10 @@ readable, such as with the following commands:
- And then make the key accessible to Asterisk (assuming you run it as
- user "asterisk").
+Index: pbx/ael/ael-test/ref.ael-vtest13
+===================================================================
+--- pbx/ael/ael-test/ref.ael-vtest13	(revision 221084)
++++ pbx/ael/ael-test/ref.ael-vtest13	(working copy)
+@@ -2107,7 +2107,7 @@
  
--  chown asterisk /var/lib/asterisk/keys/yourname.*
-+  chown asterisk /usr/share/asterisk/keys/yourname.*
- 
- .SH FILES
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- .RS
- .RE
- 
-diff --git a/doc/osp.txt b/doc/osp.txt
-index a0cd429..932f214 100644
---- a/doc/osp.txt
-+++ b/doc/osp.txt
-@@ -136,7 +136,7 @@ make clean; make linux
- Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
- 
- 2.2 Obtain Crypto Files
--The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
-+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
- 
- Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
- 
-@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
- verify return:1
- The certificate request was successful.
- Error Code returned from localcert command : 0
--The files generated should be copied to the /var/lib/asterisk/keys directory. 
-+The files generated should be copied to the /usr/share/asterisk/keys directory. 
- Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
  
- 3 Asterisk
-@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
- source=[host IP]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no
- ; path is defined, crypto files should be in  
--; /var/lib/asterisk/keys directory.
-+; /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name 
-diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
-index cb236a8..be01d34 100644
---- a/doc/tex/phoneprov.tex
-+++ b/doc/tex/phoneprov.tex
-@@ -58,7 +58,7 @@ files, respectively. A sample profile:
- [polycom]
- staticdir => configs/
- mime_type => text/xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
- static_file => bootrom.ld,application/octet-stream
- static_file => bootrom.ver,plain/text
- static_file => sip.ld,application/octet-stream
-diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
-index a4ae7b9..bad6815 100644
---- a/doc/tex/privacy.tex
-+++ b/doc/tex/privacy.tex
-@@ -210,7 +210,7 @@ helpful.
- 
- When there is no CallerID, P and p options will always record an intro
- for the incoming caller. This intro will be stored temporarily in the
--\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
-+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
- NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
- callee decides what to do with the call.
- 
-@@ -245,7 +245,7 @@ introductions are stored and re-used for the convenience of the CALLER.
- \subsubsection{Introductions}
- Unless instructed to not save introductions (see the 'n' option above),
- the screening modes will save the recordings of the caller's names in
--the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
-+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
- a CallerID.  Just the 10-digit callerid numbers are used as filenames,
- with a ".gsm" at the end.
- 
-@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
+ [callerid-liar]
+-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
++exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+ exten => s,2,Background(priv-liar)
+ exten => s,3,Hangup()
+ exten => s,4,Return()
+@@ -2142,7 +2142,7 @@
+ exten => s,4,Zapateller(nocallerid)
+ exten => s,5,PrivacyManager()
+ exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
+-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
++exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
+ exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => s,9,Hangup()
+ exten => s,10,Return()
+@@ -2168,7 +2168,7 @@
+ exten => s,30,verbose(direct is XXX#${direct}XXXX)
+ exten => s,31,Playback(greetings/direct)
+ exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
+ exten => s,35,Goto(sw-92-${direct},10)
+ exten => s,36,NoOp(Finish switch-if-homeline-91-92)
+@@ -2247,7 +2247,7 @@
+ exten => sw-92-2,11,Goto(s,loopback)
+ exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
+ exten => sw-92-1,11,Goto(s,loopback)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2324,31 +2324,31 @@
  
- \begin{astlisting}
- \begin{verbatim}
--exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
-+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
- exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
- \end{verbatim}
- \end{astlisting}
-diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
-index ff1f6ae..53fb918 100755
---- a/pbx/ael/ael-test/ael-test3/extensions.ael
-+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
-@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
+ [homeline-kids]
+ exten => s,1(begin),Background(murphy-homeline-kids)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(homeline,s,loopback)
+-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
+ exten => 2,3,Voicemail(u4)
+ exten => 2,4,Goto(homeline,s,loopback)
+-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
+ exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
+ exten => 3,4,Goto(homeline,s,loopback)
+-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
+ exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
+ exten => 4,4,Goto(homeline,s,loopback)
+-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
+ exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
+ exten => 5,4,Goto(homeline,s,loopback)
+-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
+ exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
+ exten => 6,4,Goto(homeline,s,loopback)
+-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
+ exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
+ exten => 7,4,Goto(homeline,s,loopback)
+@@ -2376,7 +2376,7 @@
+ exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
+ exten => s,7(loopback),Background(greetings/greeting)
+ exten => s,8,Background(murphy-office-intro1)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2502,7 +2502,7 @@
+ exten => 760,1,DateTime()
+ exten => 760,2,Goto(s,loopback)
+ exten => 761,1,Record(announcement:gsm)
+-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
++exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
+ exten => 761,3,Goto(s,loopback)
+ exten => 762,1,agi(tts-riddle.agi)
+ exten => 762,2,Background(gsm/what-time-it-is2)
+Index: pbx/ael/ael-test/ael-test3/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-test3/extensions.ael	(revision 221084)
++++ pbx/ael/ael-test/ael-test3/extensions.ael	(working copy)
+@@ -2049,7 +2049,7 @@
  
  macro callerid-liar()
  {
@@ -282,7 +108,7 @@ index ff1f6ae..53fb918 100755
  	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                              //         faces to get in the front door, and unidentified callers won't fair
                              //         any better. You entered *MY* phone number. That won't work.
-@@ -2106,7 +2106,7 @@ context homeline {
+@@ -2106,7 +2106,7 @@
  		PrivacyManager();
  		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
  		{
@@ -291,7 +117,7 @@ index ff1f6ae..53fb918 100755
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			Hangup();
  			return;
-@@ -2138,7 +2138,7 @@ context homeline {
+@@ -2138,7 +2138,7 @@
  			verbose(direct is XXX#${direct}XXXX);
  			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
  			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
@@ -300,7 +126,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
  			switch(${direct})
  			{
-@@ -2223,7 +2223,7 @@ context homeline {
+@@ -2223,7 +2223,7 @@
  		
  	}
  	1 => {  // Sonya
@@ -309,7 +135,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			goto s|loopback;
-@@ -2421,51 +2421,51 @@ context homeline-kids {
+@@ -2421,51 +2421,51 @@
  		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
  	}
  	1 => {  // SEAN
@@ -369,7 +195,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
  			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
  			goto homeline|s|loopback;
-@@ -2517,7 +2517,7 @@ context workline {
+@@ -2517,7 +2517,7 @@
                                                // Otherwise, dial 1, and hopefully, you will reach Steve.
  	}
  	1 => {
@@ -378,7 +204,7 @@ index ff1f6ae..53fb918 100755
  		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
  		
  		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2778,7 +2778,7 @@ context homeext {
+@@ -2778,7 +2778,7 @@
  	}
  	761 => {
  		Record(announcement:gsm);
@@ -387,11 +213,11 @@ index ff1f6ae..53fb918 100755
  		goto s|loopback;
  	}
  	762 => {
-diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
-index b7e953e..48baaef 100755
---- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
-+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
-@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
+Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-vtest13/extensions.ael	(revision 221084)
++++ pbx/ael/ael-test/ael-vtest13/extensions.ael	(working copy)
+@@ -2048,7 +2048,7 @@
  
  macro callerid-liar()
  {
@@ -400,7 +226,7 @@ index b7e953e..48baaef 100755
  	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                              //         faces to get in the front door, and unidentified callers won't fair
                              //         any better. You entered *MY* phone number. That won't work.
-@@ -2105,7 +2105,7 @@ context homeline {
+@@ -2105,7 +2105,7 @@
  		PrivacyManager();
  		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
  		{
@@ -409,7 +235,7 @@ index b7e953e..48baaef 100755
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			Hangup();
  			return;
-@@ -2137,7 +2137,7 @@ context homeline {
+@@ -2137,7 +2137,7 @@
  			verbose(direct is XXX#${direct}XXXX);
  			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
  			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
@@ -418,7 +244,7 @@ index b7e953e..48baaef 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
  			switch(${direct})
  			{
-@@ -2222,7 +2222,7 @@ context homeline {
+@@ -2222,7 +2222,7 @@
  		
  	}
  	1 => {  // Sonya
@@ -427,7 +253,7 @@ index b7e953e..48baaef 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			goto s|loopback;
-@@ -2420,51 +2420,51 @@ context homeline-kids {
+@@ -2420,51 +2420,51 @@
  		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
  	}
  	1 => {  // SEAN
@@ -487,7 +313,7 @@ index b7e953e..48baaef 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
  			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
  			goto homeline|s|loopback;
-@@ -2516,7 +2516,7 @@ context workline {
+@@ -2516,7 +2516,7 @@
                                                // Otherwise, dial 1, and hopefully, you will reach Steve.
  	}
  	1 => {
@@ -496,7 +322,7 @@ index b7e953e..48baaef 100755
  		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
  		
  		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2777,7 +2777,7 @@ context homeext {
+@@ -2777,7 +2777,7 @@
  	}
  	761 => {
  		Record(announcement:gsm);
@@ -505,103 +331,254 @@ index b7e953e..48baaef 100755
  		goto s|loopback;
  	}
  	762 => {
-diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
-index 07ae29e..70956d4 100644
---- a/pbx/ael/ael-test/ref.ael-vtest13
-+++ b/pbx/ael/ael-test/ref.ael-vtest13
-@@ -2107,7 +2107,7 @@ exten => s,20,Return()
+Index: doc/osp.txt
+===================================================================
+--- doc/osp.txt	(revision 221084)
++++ doc/osp.txt	(working copy)
+@@ -136,7 +136,7 @@
+ Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
  
+ 2.2 Obtain Crypto Files
+-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
++The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
  
- [callerid-liar]
--exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
-+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
- exten => s,2,Background(priv-liar)
- exten => s,3,Hangup()
- exten => s,4,Return()
-@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
- exten => s,4,Zapateller(nocallerid)
- exten => s,5,PrivacyManager()
- exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
--exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
- exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => s,9,Hangup()
- exten => s,10,Return()
-@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
- exten => s,30,verbose(direct is XXX#${direct}XXXX)
- exten => s,31,Playback(greetings/direct)
- exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
--exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
- exten => s,35,Goto(sw-92-${direct},10)
- exten => s,36,NoOp(Finish switch-if-homeline-91-92)
-@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
- exten => sw-92-2,11,Goto(s,loopback)
- exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
- exten => sw-92-1,11,Goto(s,loopback)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
+ Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
  
- [homeline-kids]
- exten => s,1(begin),Background(murphy-homeline-kids)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
- exten => 1,4,Goto(homeline,s,loopback)
--exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
- exten => 2,3,Voicemail(u4)
- exten => 2,4,Goto(homeline,s,loopback)
--exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
- exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
- exten => 3,4,Goto(homeline,s,loopback)
--exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
- exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
- exten => 4,4,Goto(homeline,s,loopback)
--exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
- exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
- exten => 5,4,Goto(homeline,s,loopback)
--exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
- exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
- exten => 6,4,Goto(homeline,s,loopback)
--exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
- exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
- exten => 7,4,Goto(homeline,s,loopback)
-@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
- exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
- exten => s,7(loopback),Background(greetings/greeting)
- exten => s,8,Background(murphy-office-intro1)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
- exten => 760,1,DateTime()
- exten => 760,2,Goto(s,loopback)
- exten => 761,1,Record(announcement:gsm)
--exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
-+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
- exten => 761,3,Goto(s,loopback)
- exten => 762,1,agi(tts-riddle.agi)
- exten => 762,2,Background(gsm/what-time-it-is2)
--- 
-1.6.1
-
+@@ -183,7 +183,7 @@
+ verify return:1
+ The certificate request was successful.
+ Error Code returned from localcert command : 0
+-The files generated should be copied to the /var/lib/asterisk/keys directory. 
++The files generated should be copied to the /usr/share/asterisk/keys directory. 
+ Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
+ 
+ 3 Asterisk
+@@ -247,9 +247,9 @@
+ source=[host IP]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no
++; The default path for crypto file is /usr/share/asterisk/keys.  If no
+ ; path is defined, crypto files should be in  
+-; /var/lib/asterisk/keys directory.
++; /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.  
+ ; If this parameter is unspecified or not present, the default name 
+Index: doc/tex/phoneprov.tex
+===================================================================
+--- doc/tex/phoneprov.tex	(revision 221084)
++++ doc/tex/phoneprov.tex	(working copy)
+@@ -58,7 +58,7 @@
+ [polycom]
+ staticdir => configs/
+ mime_type => text/xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
+ static_file => bootrom.ld,application/octet-stream
+ static_file => bootrom.ver,plain/text
+ static_file => sip.ld,application/octet-stream
+Index: doc/tex/asterisk-conf.tex
+===================================================================
+--- doc/tex/asterisk-conf.tex	(revision 221084)
++++ doc/tex/asterisk-conf.tex	(working copy)
+@@ -18,10 +18,10 @@
+ astmoddir => /usr/lib/asterisk/modules
+ 
+ ; Where additional 'library' elements (scripts, etc.) are located
+-astvarlibdir => /var/lib/asterisk
++astvarlibdir => /usr/share/asterisk
+ 
+ ; Where AGI scripts/programs are located
+-astagidir => /var/lib/asterisk/agi-bin
++astagidir => /usr/share/asterisk/agi-bin
+ 
+ ; Where spool directories are located
+ ; Voicemail, monitor, dictation and other apps will create files here
+Index: doc/tex/privacy.tex
+===================================================================
+--- doc/tex/privacy.tex	(revision 221084)
++++ doc/tex/privacy.tex	(working copy)
+@@ -210,7 +210,7 @@
+ 
+ When there is no CallerID, P and p options will always record an intro
+ for the incoming caller. This intro will be stored temporarily in the
+-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
++\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
+ NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
+ callee decides what to do with the call.
+ 
+@@ -245,7 +245,7 @@
+ \subsubsection{Introductions}
+ Unless instructed to not save introductions (see the 'n' option above),
+ the screening modes will save the recordings of the caller's names in
+-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
++the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
+ a CallerID.  Just the 10-digit callerid numbers are used as filenames,
+ with a ".gsm" at the end.
+ 
+@@ -260,7 +260,7 @@
+ 
+ \begin{astlisting}
+ \begin{verbatim}
+-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
++exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
+ exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
+ \end{verbatim}
+ \end{astlisting}
+Index: configs/iax.conf.sample
+===================================================================
+--- configs/iax.conf.sample	(revision 221084)
++++ configs/iax.conf.sample	(working copy)
+@@ -416,8 +416,8 @@
+ ; authentication is used, "inkeys" is a list of acceptable public keys on the 
+ ; local system that can be used to authenticate the remote peer, separated by
+ ; the ":" character.  "outkey" is a single, private key to use to authenticate
+-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
+-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
++; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
++; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
+ ; keys should always be 3DES encrypted.
+ ;
+ ;
+Index: configs/festival.conf.sample
+===================================================================
+--- configs/festival.conf.sample	(revision 221084)
++++ configs/festival.conf.sample	(working copy)
+@@ -21,7 +21,7 @@
+ ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
+ ; Defaults to /tmp/
+ ;
+-;cachedir=/var/lib/asterisk/festivalcache/
++;cachedir=/var/spool/asterisk/festival/
+ ;
+ ; Festival command to send to the server.
+ ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
+Index: configs/http.conf.sample
+===================================================================
+--- configs/http.conf.sample	(revision 221084)
++++ configs/http.conf.sample	(working copy)
+@@ -5,7 +5,7 @@
+ ; Note about Asterisk documentation:
+ ;   If Asterisk was installed from a tarball, then the HTML documentation should
+ ;   be installed in the static-http/docs directory which is
+-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
++;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
+ ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
+ ;   and "bindport" options, then you should be able to view the documentation
+ ;   remotely by browsing to:
+@@ -66,6 +66,6 @@
+ ;[post_mappings]
+ ;
+ ; In this example, if the prefix option is set to "asterisk", then using the
+-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
+-;uploads = /var/lib/asterisk/uploads/
++; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
++;uploads = /var/spool/asterisk/uploads/
+ ;
+Index: configs/phoneprov.conf.sample
+===================================================================
+--- configs/phoneprov.conf.sample	(revision 221084)
++++ configs/phoneprov.conf.sample	(working copy)
+@@ -114,4 +114,4 @@
+ ${MAC}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
+ config/${MAC} => polycom.xml                 ; Dynamic Filename => template file 
+ ${MAC}-directory.xml => 000000000000-directory.xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+Index: configs/musiconhold.conf.sample
+===================================================================
+--- configs/musiconhold.conf.sample	(revision 221084)
++++ configs/musiconhold.conf.sample	(working copy)
+@@ -32,7 +32,7 @@
+ ; The path specified can be either an absolute path (starts with '/'),
+ ; or a relative path; relative paths are interpreted as being relative
+ ; to the 'astvarlibdir' in asterisk.conf, which defaults to
+-; /var/lib/asterisk.
++; /usr/share/asterisk.
+ ;
+ ; NOTE:
+ ; If you are not using "autoload" in modules.conf, then you
+@@ -68,7 +68,7 @@
+ ;mode=custom
+ ; Note that with mode=custom, a directory is not required, such as when reading
+ ; from a stream.
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
+ 
+ ;[ulawstream]
+@@ -80,5 +80,5 @@
+ ; choice
+ ;[solaris]
+ ;mode=custom
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
+Index: configs/osp.conf.sample
+===================================================================
+--- configs/osp.conf.sample	(revision 221084)
++++ configs/osp.conf.sample	(working copy)
+@@ -36,8 +36,8 @@
+ ;source=domain name or [IP address in brackets]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
+-; defined, crypto files will in /var/lib/asterisk/keys directory.
++; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
++; defined, crypto files will in /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.  
+ ; If this parameter is unspecified or not present, the default name will be the 
+Index: contrib/scripts/astgenkey.8
+===================================================================
+--- contrib/scripts/astgenkey.8	(revision 221084)
++++ contrib/scripts/astgenkey.8	(working copy)
+@@ -88,7 +88,7 @@
+ .RE
+ 
+ Those files should be copied to 
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ 
+ (The private key: on your system. The public key: on other systems)
+ 
+@@ -122,10 +122,10 @@
+ And then make the key accessible to Asterisk (assuming you run it as
+ user "asterisk").
+ 
+-  chown asterisk /var/lib/asterisk/keys/yourname.*
++  chown asterisk /usr/share/asterisk/keys/yourname.*
+ 
+ .SH FILES
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ .RS
+ .RE
+ 
+Index: contrib/scripts/astgenkey
+===================================================================
+--- contrib/scripts/astgenkey	(revision 221084)
++++ contrib/scripts/astgenkey	(working copy)
+@@ -29,7 +29,7 @@
+ 	echo "in PEM format for use by Asterisk.  You will be asked to"
+ 	echo "enter a passcode for your key multiple times.  Please"
+ 	echo "enter the same code each time.  The resulting files will"
+-	echo "need to be moved to /var/lib/asterisk/keys if you want"
++	echo "need to be moved to /usr/share/asterisk/keys if you want"
+ 	echo "to use them, and any private keys (.key files) will"
+ 	echo "need to be initialized at runtime either by running"
+ 	echo "Asterisk with the '-i' option, or with the 'init keys'"
+Index: UPGRADE-1.4.txt
+===================================================================
+--- UPGRADE-1.4.txt	(revision 221084)
++++ UPGRADE-1.4.txt	(working copy)
+@@ -92,7 +92,7 @@
+ WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
+ instead of the alternate-language files being stored in subdirectories underneath
+ the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
+-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
++etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
+ language itself, then places all the sound files for that language under that
+ directory and its subdirectories. This is the layout that will be created if you
+ select non-English languages to be installed via menuselect, HOWEVER Asterisk does


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- asterisk.spec	10 Sep 2009 04:38:52 -0000	1.56
+++ asterisk.spec	30 Sep 2009 16:57:58 -0000	1.57
@@ -1,48 +1,22 @@
-#define _rc 1
+%define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.6
-Release: 2%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.2.0
+Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-# The Asterisk tarball contains some items that we don't want in there,
-# so start with the original tarball from here:
-#
-# http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
-#
-# Then run the included script file to build the stripped tarball:
-#
-# sh asterisk-strip.sh %{version}
-
-# MD5 Sums
-# ========
-# 63a928373e741524aac09d8c078df7d5  asterisk-1.6.1.6.tar.gz
-# 4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA1 Sums
-# =========
-# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1  asterisk-1.6.1.6.tar.gz
-# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1  asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA256 Sums
-# =========
-# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22  asterisk-1.6.1.6.tar.gz
-# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3  asterisk-1.6.1.6-stripped.tar.gz
-
-Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
+Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
 Source1: asterisk-logrotate
 Source2: menuselect.makedeps
 Source3: menuselect.makeopts
-Source4: asterisk-strip.sh
-Source5: asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
+Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
 Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Fix-up-some-paths.patch
@@ -70,6 +44,7 @@ BuildRequires: gmime-devel
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: graphviz-gd
+BuildRequires: libxml2-devel
 
 # for codec_speex
 BuildRequires: speex-devel >= 1.2
@@ -414,10 +389,9 @@ local filesystem.
 %patch1 -p1
 %patch2 -p0
 %patch5 -p0
-%patch6 -p1
 %patch8 -p0
-%patch10 -p1
-%patch11 -p1
+%patch10 -p0
+%patch11 -p0
 %patch12 -p1
 
 cp %{SOURCE2} menuselect.makedeps
@@ -501,22 +475,22 @@ install -D -p -m 0644 doc/digium-mib.txt
 
 rm %{buildroot}%{_libdir}/asterisk/modules/app_directory.so
 rm %{buildroot}%{_libdir}/asterisk/modules/app_voicemail.so
-install -D -p -m 0755 apps/app_directory_imap.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_voicemail_imap.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_directory_odbc.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_voicemail_odbc.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_directory_plain.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules/
+install -D -p -m 0755 apps/app_directory_imap.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_voicemail_imap.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_directory_odbc.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_voicemail_odbc.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_directory_plain.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules
 
 # create some directories that need to be packaged
-mkdir -p %{buildroot}%{_datadir}/asterisk/moh/
-mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
+mkdir -p %{buildroot}%{_datadir}/asterisk/moh
+mkdir -p %{buildroot}%{_datadir}/asterisk/sounds
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
-mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
+mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -531,6 +505,8 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
 rm -rf %{buildroot}%{_sbindir}/hashtest
 rm -rf %{buildroot}%{_sbindir}/hashtest2
 
+rm -rf %{buildroot}%{_datadir}/asterisk/documentation
+
 find doc/api/html -name \*.map -size 0 -delete
 
 %clean
@@ -561,9 +537,11 @@ fi
 %defattr(-,root,root,-)
 %doc README* *.txt ChangeLog BUGS CREDITS configs
 
+%doc doc/appdocsxml.dtd
 %doc doc/asterisk.sgml
 %doc doc/backtrace.txt
 %doc doc/callfiles.txt
+%doc doc/core-*.xml
 %doc doc/externalivr.txt
 %doc doc/macroexclusive.txt
 %doc doc/manager_1_1.txt
@@ -592,6 +570,7 @@ fi
 %{_libdir}/asterisk/modules/app_chanisavail.so
 %{_libdir}/asterisk/modules/app_channelredirect.so
 %{_libdir}/asterisk/modules/app_chanspy.so
+%{_libdir}/asterisk/modules/app_confbridge.so
 %{_libdir}/asterisk/modules/app_controlplayback.so
 %{_libdir}/asterisk/modules/app_db.so
 %{_libdir}/asterisk/modules/app_dial.so
@@ -611,8 +590,10 @@ fi
 %{_libdir}/asterisk/modules/app_mixmonitor.so
 %{_libdir}/asterisk/modules/app_morsecode.so
 %{_libdir}/asterisk/modules/app_nbscat.so
+%{_libdir}/asterisk/modules/app_originate.so
 %{_libdir}/asterisk/modules/app_parkandannounce.so
 %{_libdir}/asterisk/modules/app_playback.so
+%{_libdir}/asterisk/modules/app_playtones.so
 %{_libdir}/asterisk/modules/app_privacy.so
 %{_libdir}/asterisk/modules/app_queue.so
 %{_libdir}/asterisk/modules/app_readexten.so
@@ -639,10 +620,15 @@ fi
 %{_libdir}/asterisk/modules/app_waituntil.so
 %{_libdir}/asterisk/modules/app_while.so
 %{_libdir}/asterisk/modules/app_zapateller.so
+%{_libdir}/asterisk/modules/bridge_builtin_features.so
+%{_libdir}/asterisk/modules/bridge_multiplexed.so
+%{_libdir}/asterisk/modules/bridge_simple.so
+%{_libdir}/asterisk/modules/bridge_softmix.so
 %{_libdir}/asterisk/modules/cdr_csv.so
 %{_libdir}/asterisk/modules/cdr_custom.so
 %{_libdir}/asterisk/modules/cdr_manager.so
 %{_libdir}/asterisk/modules/chan_agent.so
+%{_libdir}/asterisk/modules/chan_bridge.so
 %{_libdir}/asterisk/modules/chan_iax2.so
 %{_libdir}/asterisk/modules/chan_local.so
 %{_libdir}/asterisk/modules/chan_mgcp.so
@@ -667,11 +653,14 @@ fi
 %{_libdir}/asterisk/modules/format_jpeg.so
 %{_libdir}/asterisk/modules/format_ogg_vorbis.so
 %{_libdir}/asterisk/modules/format_pcm.so
+%{_libdir}/asterisk/modules/format_siren14.so
+%{_libdir}/asterisk/modules/format_siren7.so
 %{_libdir}/asterisk/modules/format_sln.so
 %{_libdir}/asterisk/modules/format_sln16.so
 %{_libdir}/asterisk/modules/format_vox.so
 %{_libdir}/asterisk/modules/format_wav_gsm.so
 %{_libdir}/asterisk/modules/format_wav.so
+%{_libdir}/asterisk/modules/func_aes.so
 %{_libdir}/asterisk/modules/func_audiohookinherit.so
 %{_libdir}/asterisk/modules/func_base64.so
 %{_libdir}/asterisk/modules/func_blacklist.so
@@ -700,6 +689,7 @@ fi
 %{_libdir}/asterisk/modules/func_sha1.so
 %{_libdir}/asterisk/modules/func_shell.so
 %{_libdir}/asterisk/modules/func_speex.so
+%{_libdir}/asterisk/modules/func_sprintf.so
 %{_libdir}/asterisk/modules/func_strings.so
 %{_libdir}/asterisk/modules/func_sysinfo.so
 %{_libdir}/asterisk/modules/func_timeout.so
@@ -715,10 +705,10 @@ fi
 %{_libdir}/asterisk/modules/res_adsi.so
 %{_libdir}/asterisk/modules/res_ael_share.so
 %{_libdir}/asterisk/modules/res_agi.so
+%{_libdir}/asterisk/modules/res_clialiases.so
 %{_libdir}/asterisk/modules/res_clioriginate.so
 %{_libdir}/asterisk/modules/res_convert.so
 %{_libdir}/asterisk/modules/res_crypto.so
-%{_libdir}/asterisk/modules/res_indications.so
 %{_libdir}/asterisk/modules/res_http_post.so
 %{_libdir}/asterisk/modules/res_limit.so
 %{_libdir}/asterisk/modules/res_monitor.so
@@ -728,8 +718,10 @@ fi
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.so
 %{_libdir}/asterisk/modules/res_timing_pthread.so
+%{_libdir}/asterisk/modules/res_timing_timerfd.so
 %{_libdir}/asterisk/modules/test_dlinklists.so
 %{_libdir}/asterisk/modules/test_heap.so
+%{_libdir}/asterisk/modules/test_sched.so
 
 %{_sbindir}/aelparse
 %{_sbindir}/astcanary
@@ -763,6 +755,8 @@ fi
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
 %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
+%config(noreplace) %{_sysconfdir}/asterisk/cli_aliases.conf
+%config(noreplace) %{_sysconfdir}/asterisk/cli_permissions.conf
 %config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
 %config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
 %config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
@@ -986,6 +980,7 @@ fi
 %files sqlite
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%config(noreplace) %{_sysconfdir}/asterisk/res_config_sqlite.conf
 %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
 
 %files tds
@@ -1026,6 +1021,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.1.rc2
+- Update to 1.6.2.0-rc2
+- We no longer need to strip the tarball as it no longer includes non-free items.
+
 * Wed Sep  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-2
 - Enable building of API docs.
 - Depend on version 1.2 or newer of speex


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	7 Sep 2009 05:43:14 -0000	1.22
+++ sources	30 Sep 2009 16:57:58 -0000	1.23
@@ -1,3 +1,3 @@
-4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
-0c07f535bada3bca06d459ed3a416f22  asterisk-1.6.1.6.tar.gz.asc
+8e17e49736259f673c28b6ec8c5ac6b0  asterisk-1.6.2.0-rc2.tar.gz
+8f4b07dc08c8a734773fbbe38b277d94  asterisk-1.6.2.0-rc2.tar.gz.asc
 dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg


--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---


--- asterisk-strip.sh DELETED ---



From kasal at fedoraproject.org  Wed Sep 30 16:58:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 16:58:30 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/devel
	perl-POE-Component-Client-Keepalive.spec, 1.13, 1.14
Message-ID: <20090930165830.2314211C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1097

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
- keep the version aligned to 0.xxxx to maintain upgrade path


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-POE-Component-Client-Keepalive.spec	29 Sep 2009 14:51:43 -0000	1.13
+++ perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 16:58:30 -0000	1.14
@@ -1,6 +1,9 @@
 Name:           perl-POE-Component-Client-Keepalive
-Version:        0.260
-Release:        2%{?dist}
+%define real_ver 0.260
+# Keep four digits to stay above the unfortunate 0.0901,
+# so that epoch need not be changed.
+Version:        %{real_ver}0
+Release:        3%{?dist}
 Summary:        Manages and keeps alive client connections
 
 Group:          Development/Libraries
@@ -19,7 +22,8 @@ BuildRequires:  perl(POE::Component::Cli
 BuildRequires:  perl(Net::IP) >= 1.25
 
 # Satisfy automaticly generated requires that want this module >= 0.0901
-Provides:       perl(POE::Component::Client::Keepalive) = %{version}0
+# (So the package has this provide in two versions, oh well.)
+Provides:       perl(POE::Component::Client::Keepalive) = %{version}
 
 ### auto-added reqs!
 Requires:       perl(Net::IP) >= 1.25
@@ -69,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 30 2009 Stepan Kasal <skasal at redhat.com> 0.2600-3
+- keep the version aligned to 0.xxxx to maintain upgrade path
+
 * Tue Sep 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-2
 - fix provides version (for perl-POE-Component-Client-HTTP)
 



From kasal at fedoraproject.org  Wed Sep 30 16:58:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 16:58:53 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/F-12
	perl-POE-Component-Client-Keepalive.spec, 1.13, 1.14
Message-ID: <20090930165853.A65DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1190

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
- keep the version aligned to 0.xxxx to maintain upgrade path


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-POE-Component-Client-Keepalive.spec	29 Sep 2009 15:31:39 -0000	1.13
+++ perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 16:58:53 -0000	1.14
@@ -1,6 +1,9 @@
 Name:           perl-POE-Component-Client-Keepalive
-Version:        0.260
-Release:        2%{?dist}
+%define real_ver 0.260
+# Keep four digits to stay above the unfortunate 0.0901,
+# so that epoch need not be changed.
+Version:        %{real_ver}0
+Release:        3%{?dist}
 Summary:        Manages and keeps alive client connections
 
 Group:          Development/Libraries
@@ -19,7 +22,8 @@ BuildRequires:  perl(POE::Component::Cli
 BuildRequires:  perl(Net::IP) >= 1.25
 
 # Satisfy automaticly generated requires that want this module >= 0.0901
-Provides:       perl(POE::Component::Client::Keepalive) = %{version}0
+# (So the package has this provide in two versions, oh well.)
+Provides:       perl(POE::Component::Client::Keepalive) = %{version}
 
 ### auto-added reqs!
 Requires:       perl(Net::IP) >= 1.25
@@ -69,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 30 2009 Stepan Kasal <skasal at redhat.com> 0.2600-3
+- keep the version aligned to 0.xxxx to maintain upgrade path
+
 * Tue Sep 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.260-2
 - fix provides version (for perl-POE-Component-Client-HTTP)
 



From toshio at fedoraproject.org  Wed Sep 30 16:59:30 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 30 Sep 2009 16:59:30 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-system-zlib.patch, NONE,
	1.1 deltarpm.spec, 1.31, 1.32
Message-ID: <20090930165930.EA32011C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1367

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
- Correct prerelease rlease numbering.
- Build against the system zlib, not the bundled library.  This remedies the
  fact that the included zlib is affected by CAN-2005-1849.


deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-git-20090913/Makefile
===================================================================
--- deltarpm-git-20090913.orig/Makefile
+++ deltarpm-git-20090913/Makefile
@@ -3,10 +3,9 @@ bindir=$(prefix)/bin
 libdir=$(prefix)/lib
 mandir=$(prefix)/man
 rpmdumpheader=$(bindir)/rpmdumpheader
-zlibdir=zlib-1.2.2.f-rsyncable
 CFLAGS = -fPIC -O2 -Wall -g
-CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
+CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I.
+LDLIBS = -lbz2 -lz -llzma
 LDFLAGS =
 PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
 
@@ -14,37 +13,33 @@ all: makedeltarpm applydeltarpm rpmdumph
 
 python: _deltarpmmodule.so
 
-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o
 
-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o
 
-combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
+combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o
 
 rpmdumpheader: rpmdumpheader.o
 	$(CC) $(LDFLAGS) $^ -lrpm -o $@
 
-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o
 
-fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
+fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o
 
-_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
+_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o
 	for ver in $(PYTHONVERS) ; do \
 		if [ ! -f "$$ver/$@" ]; then \
 			mkdir -p $$ver ;\
-			$(CC) $(CFLAGS) -I/usr/include/$$ver -I$(zlibdir) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
-			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(zlibdir)/libz.a -llzma -lbz2; \
+			$(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
+			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so -lz -llzma -lbz2; \
 		fi; \
 	done
 
-$(zlibdir)/libz.a:
-	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
-
 clean:
 	rm -f *.o
 	rm -f makedeltarpm applydeltarpm combinedeltarpm rpmdumpheader makedeltaiso applydeltaiso fragiso
-	cd $(zlibdir) ; make clean
 
 install:
 	mkdir -p $(DESTDIR)$(bindir)


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- deltarpm.spec	13 Sep 2009 14:32:52 -0000	1.31
+++ deltarpm.spec	30 Sep 2009 16:59:30 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090913%{?dist}
+Release: 0.2.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -13,9 +13,12 @@ URL: http://gitorious.org/deltarpm/delta
 # git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
 Source: %{name}-git-20090913.tar.bz2
+# Build with system zlib
+Patch0: deltarpm-system-zlib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
+BuildRequires: zlib-devel
 BuildRequires: python-devel
 
 %description
@@ -50,6 +53,9 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090913
+# Build with system zlib
+%patch0 -p1 -b .zlib
+%{__rm} -rf zlib-1.2.2.f-rsyncable
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -96,6 +102,11 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
+- Correct prerelease rlease numbering.
+- Build against the system zlib, not the bundled library.  This remedies the
+  fact that the included zlib is affected by CAN-2005-1849.
+
 * Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
 - Merge python error patch upstream
 



From davej at fedoraproject.org  Wed Sep 30 17:02:03 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 30 Sep 2009 17:02:03 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6.31-copy_from_user-bounds.patch,1.2,1.3
Message-ID: <20090930170203.31AAE11C01EA@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2279

Modified Files:
	linux-2.6.31-copy_from_user-bounds.patch 
Log Message:
update to arjans latest (still not applied, this is just for testing)

linux-2.6.31-copy_from_user-bounds.patch:
 b/arch/x86/include/asm/uaccess_32.h               |   12 ++++-
 b/arch/x86/lib/usercopy_32.c                      |    6 ++
 b/drivers/acpi/proc.c                             |    4 -
 b/drivers/acpi/video.c                            |   20 ++++++---
 b/drivers/char/nvram.c                            |   12 ++++-
 b/fs/cifs/cifs_debug.c                            |   10 ++--
 b/include/linux/compiler-gcc4.h                   |    3 +
 b/include/linux/compiler.h                        |    9 +---
 b/kernel/capability.c                             |   11 ++---
 b/mm/migrate.c                                    |   47 ++++++++++++++++++++--
 b/net/socket.c                                    |    9 ++--
 b/net/wireless/wext.c                             |   11 ++---
 linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c |   21 ++++++---
 13 files changed, 127 insertions(+), 48 deletions(-)

Index: linux-2.6.31-copy_from_user-bounds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6.31-copy_from_user-bounds.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6.31-copy_from_user-bounds.patch	29 Sep 2009 08:26:13 -0000	1.2
+++ linux-2.6.31-copy_from_user-bounds.patch	30 Sep 2009 17:02:01 -0000	1.3
@@ -1,5 +1,5 @@
-From davej  Sat Sep 26 11:56:25 2009
-Return-Path: BATV+801d9f966e814c9eff35+2225+infradead.org+arjan at casper.srs.infradead.org
+From davej  Wed Sep 30 12:03:40 2009
+Return-Path: linux-kernel-owner at vger.kernel.org
 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
 	gelk.kernelslacker.org
 X-Spam-Level: 
@@ -7,230 +7,174 @@ X-Spam-Status: No, score=-6.1 required=5
 	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
 Received: from mail.corp.redhat.com [10.5.5.52]
 	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
-	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 11:56:25 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
+	for <davej at localhost> (single-drop); Wed, 30 Sep 2009 12:03:40 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ mail04.corp.redhat.com with LMTP; Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
 Received: from localhost (localhost.localdomain [127.0.0.1])
-	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A7DF39E640
-	for <davej at redhat.com>; Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
-	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id hkbfP756iXek for <davej at redhat.com>;
-	Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
-Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
-	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8FFA39E63B
-	for <davej at mail.corp.redhat.com>; Sat, 26 Sep 2009 08:33:07 -0400 (EDT)
-Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.6])
-	by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QCX7cQ016845
-	for <davej at redhat.com>; Sat, 26 Sep 2009 08:33:07 -0400
-Received: from casper.infradead.org (casper.infradead.org [85.118.1.10])
-	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QCWsOO027686
-	for <davej at redhat.com>; Sat, 26 Sep 2009 08:32:55 -0400
+	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A83B191E74;
+	Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id C2l5G8z2ZQxe; Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
+Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
+	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6C40F91AFB;
+	Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
+Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.9])
+	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8UB5Hsn004857;
+	Wed, 30 Sep 2009 07:05:18 -0400
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8UAvsRr008879;
+	Wed, 30 Sep 2009 07:05:06 -0400
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+	id S1754157AbZI3LE4 (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
+	Wed, 30 Sep 2009 07:04:56 -0400
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1753441AbZI3LE4
+	(ORCPT <rfc822;linux-kernel-outgoing>);
+	Wed, 30 Sep 2009 07:04:56 -0400
+Received: from casper.infradead.org ([85.118.1.10]:46939 "EHLO
+	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+	with ESMTP id S1752896AbZI3LEz convert rfc822-to-8bit (ORCPT
+	<rfc822;linux-kernel at vger.kernel.org>);
+	Wed, 30 Sep 2009 07:04:55 -0400
 Received: from [83.119.188.87] (helo=localhost.localdomain)
 	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
-	id 1MrWS9-00025Y-Q2; Sat, 26 Sep 2009 12:32:42 +0000
-Date: Sat, 26 Sep 2009 14:33:01 +0200
+	id 1MswzQ-0005Tp-EG; Wed, 30 Sep 2009 11:04:56 +0000
+Date: 	Wed, 30 Sep 2009 13:05:23 +0200
 From: Arjan van de Ven <arjan at infradead.org>
 To: linux-kernel at vger.kernel.org
 Cc: mingo at elte.hu, tglx at tglx.de, hpa at zytor.com
-Subject: [PATCH] x86: Use __builtin_object_size to validate the buffer size
- for copy_from_user
-Message-ID: <20090926143301.2c396b94 at infradead.org>
+Subject: [PATCH] x86: Turn the copy_from_user check into an (optional)
+ compile time warning
+Message-ID: <20090930130523.348ae6c4 at infradead.org>
 Organization: Intel
 Mime-Version: 1.0
 Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: quoted-printable
+Content-Transfer-Encoding: 8BIT
 X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
 	See http://www.infradead.org/rpr.html
-X-RedHat-Spam-Score: -3.884  (AWL,RCVD_IN_DNSWL_MED)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21
-X-Scanned-By: MIMEDefang 2.67 on 10.5.110.6
+Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: 	linux-kernel at vger.kernel.org
+X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
+X-Scanned-By: MIMEDefang 2.67 on 10.5.110.9
 Status: RO
-Content-Length: 6453
-Lines: 191
+Content-Length: 3934
+Lines: 111
+
 
-=46rom 524a1da3c45683cec77480acc6cab1d33ae8d5cb Mon Sep 17 00:00:00 2001
+>From 350cf3cd513e6759ae6852946532a47249f25600 Mon Sep 17 00:00:00 2001
 From: Arjan van de Ven <arjan at linux.intel.com>
-Date: Sat, 26 Sep 2009 12:36:21 +0200
-Subject: [PATCH] x86: Use __builtin_object_size to validate the buffer size for copy_from_user
+Date: Wed, 30 Sep 2009 12:57:46 +0200
+Subject: [PATCH] x86: Turn the copy_from_user check into an (optional) compile time warning
 
-gcc (4.x) supports the __builtin_object_size() builtin, which reports the
-size of an object that a pointer point to, when known at compile time.
-If the buffer size is not known at compile time, a constant -1 is returned.
-
-This patch uses this feature to add a sanity check to copy_from_user();
-if the target buffer is known to be smaller than the copy size, the copy
-is aborted and a WARNing is emitted in memory debug mode.
+A previous patch added the buffer size check to copy_from_user().
 
-These extra checks compile away when the object size is not known,
-or if both the buffer size and the copy length are constants.
+One of the things learned from analyzing the result of the previous patch
+is that in general, gcc is really good at proving that the code contains
+sufficient security checks to not need to do a runtime check. But that
+for those cases where gcc could not prove this, there was a relatively
+high percentage of real security issues.
+
+This patch turns the case of "gcc cannot prove" into a compile time
+warning, as long as a sufficiently new gcc is in use that supports this.
+The objective is that these warnings will trigger developers checking
+new cases out before a security hole enters a linux kernel release.
 
 Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-Reviewed-by: Ingo Molnar <mingo at elte.hu>
 ---
- arch/x86/include/asm/uaccess_32.h |   19 ++++++++++++++++++-
- arch/x86/include/asm/uaccess_64.h |   19 ++++++++++++++++++-
- arch/x86/kernel/x8664_ksyms_64.c  |    2 +-
- arch/x86/lib/copy_user_64.S       |    4 ++--
- arch/x86/lib/usercopy_32.c        |    4 ++--
- include/linux/compiler-gcc4.h     |    2 ++
+ arch/x86/include/asm/uaccess_32.h |   12 +++++++++---
+ arch/x86/lib/usercopy_32.c        |    6 ++++++
+ include/linux/compiler-gcc4.h     |    3 +++
  include/linux/compiler.h          |    4 ++++
- 7 files changed, 47 insertions(+), 7 deletions(-)
+ 4 files changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
-index 632fb44..582d6ae 100644
+index 582d6ae..7826639 100644
 --- a/arch/x86/include/asm/uaccess_32.h
 +++ b/arch/x86/include/asm/uaccess_32.h
-@@ -187,9 +187,26 @@ __copy_from_user_inatomic_nocache(void *to, const void __user *from,
- 
- unsigned long __must_check copy_to_user(void __user *to,
- 					const void *from, unsigned long n);
--unsigned long __must_check copy_from_user(void *to,
-+unsigned long __must_check _copy_from_user(void *to,
+@@ -191,6 +191,13 @@ unsigned long __must_check _copy_from_user(void *to,
  					  const void __user *from,
  					  unsigned long n);
+ 
 +
-+static inline unsigned long __must_check copy_from_user(void *to,
-+					  const void __user *from,
-+					  unsigned long n)
-+{
-+	int sz = __compiletime_object_size(to);
-+	int ret = -EFAULT;
-+
-+	if (likely(sz == -1 || sz >= n))
-+		ret = _copy_from_user(to, from, n);
-+#ifdef CONFIG_DEBUG_VM
-+	else
-+		WARN(1, "Buffer overflow detected!\n");
-+#endif
-+	return ret;
-+}
-+
- long __must_check strncpy_from_user(char *dst, const char __user *src,
- 				    long count);
- long __must_check __strncpy_from_user(char *dst,
-diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
-index db24b21..ce6fec7 100644
---- a/arch/x86/include/asm/uaccess_64.h
-+++ b/arch/x86/include/asm/uaccess_64.h
-@@ -21,10 +21,27 @@ copy_user_generic(void *to, const void *from, unsigned len);
- __must_check unsigned long
- copy_to_user(void __user *to, const void *from, unsigned len);
- __must_check unsigned long
--copy_from_user(void *to, const void __user *from, unsigned len);
-+_copy_from_user(void *to, const void __user *from, unsigned len);
- __must_check unsigned long
- copy_in_user(void __user *to, const void __user *from, unsigned len);
- 
-+static inline unsigned long __must_check copy_from_user(void *to,
-+					  const void __user *from,
-+					  unsigned long n)
-+{
-+	int sz = __compiletime_object_size(to);
-+	int ret = -EFAULT;
-+
-+	if (likely(sz == -1 || sz >= n))
-+		ret = _copy_from_user(to, from, n);
-+#ifdef CONFIG_DEBUG_VM
-+	else
-+		WARN(1, "Buffer overflow detected!\n");
++extern void copy_from_user_overflow(void)
++#ifdef CONFIG_DEBUG_STACKOVERFLOW
++	__compiletime_warning("copy_from_user buffer size is not provably correct")
 +#endif
-+	return ret;
-+}
++;
 +
+ static inline unsigned long __must_check copy_from_user(void *to,
+ 					  const void __user *from,
+ 					  unsigned long n)
+@@ -200,10 +207,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
+ 
+ 	if (likely(sz == -1 || sz >= n))
+ 		ret = _copy_from_user(to, from, n);
+-#ifdef CONFIG_DEBUG_VM
+ 	else
+-		WARN(1, "Buffer overflow detected!\n");
+-#endif
++		copy_from_user_overflow();
 +
- static __always_inline __must_check
- int __copy_from_user(void *dst, const void __user *src, unsigned size)
- {
-diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
-index 3909e3b..a0cdd8c 100644
---- a/arch/x86/kernel/x8664_ksyms_64.c
-+++ b/arch/x86/kernel/x8664_ksyms_64.c
-@@ -30,7 +30,7 @@ EXPORT_SYMBOL(__put_user_8);
- 
- EXPORT_SYMBOL(copy_user_generic);
- EXPORT_SYMBOL(__copy_user_nocache);
--EXPORT_SYMBOL(copy_from_user);
-+EXPORT_SYMBOL(_copy_from_user);
- EXPORT_SYMBOL(copy_to_user);
- EXPORT_SYMBOL(__copy_from_user_inatomic);
- 
-diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
-index 6ba0f7b..4be3c41 100644
---- a/arch/x86/lib/copy_user_64.S
-+++ b/arch/x86/lib/copy_user_64.S
-@@ -78,7 +78,7 @@ ENTRY(copy_to_user)
- ENDPROC(copy_to_user)
- 
- /* Standard copy_from_user with segment limit checking */
--ENTRY(copy_from_user)
-+ENTRY(_copy_from_user)
- 	CFI_STARTPROC
- 	GET_THREAD_INFO(%rax)
- 	movq %rsi,%rcx
-@@ -88,7 +88,7 @@ ENTRY(copy_from_user)
- 	jae bad_from_user
- 	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
- 	CFI_ENDPROC
--ENDPROC(copy_from_user)
-+ENDPROC(_copy_from_user)
+ 	return ret;
+ }
  
- ENTRY(copy_user_generic)
- 	CFI_STARTPROC
 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
-index 1f118d4..8498684 100644
+index 8498684..e218d5d 100644
 --- a/arch/x86/lib/usercopy_32.c
 +++ b/arch/x86/lib/usercopy_32.c
-@@ -874,7 +874,7 @@ EXPORT_SYMBOL(copy_to_user);
-  * data to the requested size using zero bytes.
-  */
- unsigned long
--copy_from_user(void *to, const void __user *from, unsigned long n)
-+_copy_from_user(void *to, const void __user *from, unsigned long n)
- {
- 	if (access_ok(VERIFY_READ, from, n))
- 		n = __copy_from_user(to, from, n);
-@@ -882,4 +882,4 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
- 		memset(to, 0, n);
+@@ -883,3 +883,9 @@ _copy_from_user(void *to, const void __user *from, unsigned long n)
  	return n;
  }
--EXPORT_SYMBOL(copy_from_user);
-+EXPORT_SYMBOL(_copy_from_user);
+ EXPORT_SYMBOL(_copy_from_user);
++
++void copy_from_user_overflow(void)
++{
++	WARN(1, "Buffer overflow detected!\n");
++}
++EXPORT_SYMBOL(copy_from_user_overflow);
 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index 450fa59..a3aef5d 100644
+index a3aef5d..f1709c1 100644
 --- a/include/linux/compiler-gcc4.h
 +++ b/include/linux/compiler-gcc4.h
-@@ -37,3 +37,5 @@
- #define __cold			__attribute__((__cold__))
- 
+@@ -39,3 +39,6 @@
  #endif
-+
-+#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+ 
+ #define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
++#if __GNUC_MINOR__ >= 4
++#define __compiletime_warning(message) __attribute__((warning(message)))
++#endif
 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
-index 9d4c4b0..9c42853 100644
+index 9c42853..241dfd8 100644
 --- a/include/linux/compiler.h
 +++ b/include/linux/compiler.h
-@@ -185,6 +185,10 @@ extern void __chk_io_ptr(const volatile void __iomem *);
- # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
+@@ -189,6 +189,10 @@ extern void __chk_io_ptr(const volatile void __iomem *);
+ #ifndef __compiletime_object_size
+ # define __compiletime_object_size(obj) -1
  #endif
- 
-+/* Compile time object size, -1 for unknown */
-+#ifndef __compiletime_object_size
-+# define __compiletime_object_size(obj) -1
++#ifndef __compiletime_warning
++# define __compiletime_warning(message)
 +#endif
++
  /*
   * Prevent the compiler from merging or refetching accesses.  The compiler
   * is also forbidden from reordering successive instances of ACCESS_ONCE(),
 -- 
-1.6.0.6
-
+1.6.2.5
 
 
 -- 
 Arjan van de Ven 	Intel Open Source Technology Centre
 For development, discussion and tips for power savings, 
 visit http://www.lesswatts.org
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
 
 From davej  Sat Sep 26 14:57:33 2009
 Return-Path: linux-kernel-owner at vger.kernel.org



From nphilipp at fedoraproject.org  Wed Sep 30 17:02:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 30 Sep 2009 17:02:28 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.109, 1.110 sources,
	1.121, 1.122 system-config-date.spec, 1.129, 1.130
Message-ID: <20090930170228.1EE8811C01EA@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2404

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.51


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- .cvsignore	28 Sep 2009 13:26:23 -0000	1.109
+++ .cvsignore	30 Sep 2009 17:02:25 -0000	1.110
@@ -1 +1 @@
-system-config-date-1.9.50.tar.bz2
+system-config-date-1.9.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sources	28 Sep 2009 13:26:23 -0000	1.121
+++ sources	30 Sep 2009 17:02:26 -0000	1.122
@@ -1 +1 @@
-287321c637325217d66f4c5a2785c5de  system-config-date-1.9.50.tar.bz2
+a936979ae353116c52be1f5c9b51654c  system-config-date-1.9.51.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- system-config-date.spec	28 Sep 2009 13:31:17 -0000	1.129
+++ system-config-date.spec	30 Sep 2009 17:02:27 -0000	1.130
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.50
+Version: 1.9.51
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 1.9.51-1
+- deal better with untranslated time zones (#524823)
+
 * Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.50-1
 - pick up new translations
 



From nphilipp at fedoraproject.org  Wed Sep 30 17:02:41 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 30 Sep 2009 17:02:41 +0000 (UTC)
Subject: rpms/system-config-date/F-12 .cvsignore, 1.109, 1.110 sources, 1.121,
	1.122 system-config-date.spec, 1.129, 1.130
Message-ID: <20090930170241.9B7CD11C01EA@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2631

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.51


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- .cvsignore	28 Sep 2009 13:26:23 -0000	1.109
+++ .cvsignore	30 Sep 2009 17:02:40 -0000	1.110
@@ -1 +1 @@
-system-config-date-1.9.50.tar.bz2
+system-config-date-1.9.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sources	28 Sep 2009 13:26:23 -0000	1.121
+++ sources	30 Sep 2009 17:02:41 -0000	1.122
@@ -1 +1 @@
-287321c637325217d66f4c5a2785c5de  system-config-date-1.9.50.tar.bz2
+a936979ae353116c52be1f5c9b51654c  system-config-date-1.9.51.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/system-config-date.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- system-config-date.spec	28 Sep 2009 13:31:17 -0000	1.129
+++ system-config-date.spec	30 Sep 2009 17:02:41 -0000	1.130
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.50
+Version: 1.9.51
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 1.9.51-1
+- deal better with untranslated time zones (#524823)
+
 * Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.50-1
 - pick up new translations
 



From kasal at fedoraproject.org  Wed Sep 30 17:05:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 17:05:56 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/devel
	perl-POE-Component-Client-Keepalive.spec, 1.14, 1.15
Message-ID: <20090930170556.ACE9711C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3829

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
fix typo


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 16:58:30 -0000	1.14
+++ perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:05:56 -0000	1.15
@@ -9,7 +9,7 @@ Summary:        Manages and keeps alive 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/POE-Component-Client-Keepalive
-Source0:        http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))



From agoode at fedoraproject.org  Wed Sep 30 17:06:27 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 30 Sep 2009 17:06:27 +0000 (UTC)
Subject: rpms/debootstrap/devel debootstrap-1.0.19-devices.patch, NONE,
	1.1 debootstrap-1.0.19-perms.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 debootstrap.spec, 1.9, 1.10 sources, 1.5,
	1.6 debootstrap-1.0.10-perms.patch, 1.1,
	NONE debootstrap-1.0.7-arch.patch, 1.1,
	NONE debootstrap-1.0.7-devices.patch, 1.1, NONE
Message-ID: <20090930170627.35D6511C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/debootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4027

Modified Files:
	.cvsignore debootstrap.spec sources 
Added Files:
	debootstrap-1.0.19-devices.patch 
	debootstrap-1.0.19-perms.patch 
Removed Files:
	debootstrap-1.0.10-perms.patch debootstrap-1.0.7-arch.patch 
	debootstrap-1.0.7-devices.patch 
Log Message:
* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-1
- New upstream release
   + Many bugfixes
   + Support for new distributions
- Arch patch no longer needed
- Rebase other patches


debootstrap-1.0.19-devices.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE debootstrap-1.0.19-devices.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 12:58:12.210944282 -0400
@@ -40,6 +40,6 @@
 	mkdir -p dev
 	chown 0:0 dev
 	chmod 755 dev
-	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
+	$(MAKEDEV) -d dev std ptmx fd consoleonly
 	tar cf - dev | gzip -9 >devices.tar.gz
 	rm -rf dev

debootstrap-1.0.19-perms.patch:
 Makefile |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE debootstrap-1.0.19-perms.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 13:01:27.151069252 -0400
@@ -13,9 +13,9 @@
 	mkdir -p $(DSDIR)/scripts
 	mkdir -p $(DESTDIR)/usr/sbin
 
-	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 functions $(DSDIR)/
+	install -m 0644 scripts/debian/* $(DSDIR)/scripts/
+	install -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+	install -m 0644 functions $(DSDIR)/
 
         # no special script for etch anymore
 	ln -s sid $(DSDIR)/scripts/etch
@@ -30,10 +30,9 @@
 	ln -s gutsy $(DSDIR)/scripts/lucid
 
 	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
-	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 
-	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
+	install -m 0644 devices.tar.gz $(DSDIR)/
 
 devices.tar.gz:
 	rm -rf dev


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 20:46:15 -0000	1.5
+++ .cvsignore	30 Sep 2009 17:06:26 -0000	1.6
@@ -1 +1 @@
-debootstrap_1.0.10.tar.gz
+debootstrap_1.0.19.tar.gz


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/devel/debootstrap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- debootstrap.spec	24 Jul 2009 20:07:01 -0000	1.9
+++ debootstrap.spec	30 Sep 2009 17:06:27 -0000	1.10
@@ -1,15 +1,14 @@
 Name:           debootstrap
-Version:        1.0.10
-Release:        3%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 Summary:        Debian GNU/Linux bootstrapper
 
 Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-1.0.7-arch.patch
-Patch1:         debootstrap-1.0.7-devices.patch
-Patch2:         debootstrap-1.0.10-perms.patch
+Patch0:         debootstrap-1.0.19-devices.patch
+Patch1:         debootstrap-1.0.19-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,9 +28,8 @@ Debian GNU/Linux guest system.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .arch
-%patch1 -p1 -b .devices
-%patch2 -p1 -b .perms
+%patch0 -p1 -b .devices
+%patch1 -p1 -b .perms
 
 
 %build
@@ -70,6 +68,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-1
+- New upstream release
+   + Many bugfixes
+   + Support for new distributions
+- Arch patch no longer needed
+- Rebase other patches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Jul 2008 20:46:15 -0000	1.5
+++ sources	30 Sep 2009 17:06:27 -0000	1.6
@@ -1 +1 @@
-7e69840dd670af938fc13eea9e53e49f  debootstrap_1.0.10.tar.gz
+e82b5745ec9c25bbe15c4cf075af4999  debootstrap_1.0.19.tar.gz


--- debootstrap-1.0.10-perms.patch DELETED ---


--- debootstrap-1.0.7-arch.patch DELETED ---


--- debootstrap-1.0.7-devices.patch DELETED ---



From kasal at fedoraproject.org  Wed Sep 30 17:07:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 17:07:09 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/F-12
	perl-POE-Component-Client-Keepalive.spec, 1.14, 1.15
Message-ID: <20090930170709.1B52C11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4222

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
fix typo


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 16:58:53 -0000	1.14
+++ perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:07:08 -0000	1.15
@@ -9,7 +9,7 @@ Summary:        Manages and keeps alive 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/POE-Component-Client-Keepalive
-Source0:        http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))



From thias at fedoraproject.org  Wed Sep 30 17:16:15 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Wed, 30 Sep 2009 17:16:15 +0000 (UTC)
Subject: rpms/spawn-fcgi/devel spawn-fcgi.init, NONE,
	1.1 spawn-fcgi.sysconfig, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 spawn-fcgi.spec,
	1.1, 1.2
Message-ID: <20090930171615.25FBA11C00E6@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spawn-fcgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6061

Modified Files:
	.cvsignore sources spawn-fcgi.spec 
Added Files:
	spawn-fcgi.init spawn-fcgi.sysconfig 
Log Message:
Update to 1.6.3 and add custom init script.



--- NEW FILE spawn-fcgi.init ---
#!/bin/sh
#
# spawn-fcgi   Start and stop FastCGI processes
#
# chkconfig:   - 80 20
# description: Spawn FastCGI scripts to be used by web servers

### BEGIN INIT INFO
# Provides: 
# Required-Start: $local_fs $network $syslog $remote_fs $named
# Required-Stop: 
# Should-Start: 
# Should-Stop: 
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Start and stop FastCGI processes
# Description:       Spawn FastCGI scripts to be used by web servers
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/spawn-fcgi"
prog="spawn-fcgi"
config="/etc/sysconfig/spawn-fcgi"

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # Just in case this is left over with wrong ownership
    [ -n "${SOCKET}" -a -S "${SOCKET}" ] && rm -f ${SOCKET}
    daemon "$exec $OPTIONS >/dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    # Remove the socket in order to never leave it with wrong ownership
    [ -n "${SOCKET}" -a -S "${SOCKET}" ] && rm -f ${SOCKET}
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status &>/dev/null
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?



--- NEW FILE spawn-fcgi.sysconfig ---
# You must set some working options before the "spawn-fcgi" service will work.
# If SOCKET points to a file, then this file is cleaned up by the init script.
#
# See spawn-fcgi(1) for all possible options.
#
# Example :
#SOCKET=/var/run/php-fcgi.sock
#OPTIONS="-u apache -g apache -s $SOCKET -S -M 0600 -C 32 -F 1 -P /var/run/spawn-fcgi.pid -- /usr/bin/php-cgi"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 09:59:29 -0000	1.2
+++ .cvsignore	30 Sep 2009 17:16:14 -0000	1.3
@@ -1 +1 @@
-spawn-fcgi-1.6.2.tar.bz2
+spawn-fcgi-1.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 09:59:29 -0000	1.2
+++ sources	30 Sep 2009 17:16:14 -0000	1.3
@@ -1 +1 @@
-f74a8f4d8e379c53926b5eeef84b381c  spawn-fcgi-1.6.2.tar.bz2
+787ed2f88d2204bf1fe4fbd6e509d1d7  spawn-fcgi-1.6.3.tar.bz2


Index: spawn-fcgi.spec
===================================================================
RCS file: /cvs/extras/rpms/spawn-fcgi/devel/spawn-fcgi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spawn-fcgi.spec	14 Sep 2009 09:59:29 -0000	1.1
+++ spawn-fcgi.spec	30 Sep 2009 17:16:14 -0000	1.2
@@ -1,12 +1,17 @@
 Summary: Simple program for spawning FastCGI processes
 Name: spawn-fcgi
-Version: 1.6.2
+Version: 1.6.3
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
 Source0: http://www.lighttpd.net/download/spawn-fcgi-%{version}.tar.bz2
+Source1: spawn-fcgi.init
+Source2: spawn-fcgi.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Note that restarting automatically upon update makes no sense at all here
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
 
 %description
 This package contains the spawn-fcgi program used for spawning FastCGI
@@ -25,20 +30,41 @@ processes, which can be local or remote.
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
+%{__install} -D -p -m 0755 %{SOURCE1} \
+    %{buildroot}%{_sysconfdir}/init.d/spawn-fcgi
+%{__install} -D -p -m 0600 %{SOURCE2} \
+    %{buildroot}%{_sysconfdir}/sysconfig/spawn-fcgi
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+/sbin/chkconfig --add spawn-fcgi
+
+%preun
+if [ $1 -eq 0 ]; then
+    /sbin/service spawn-fcgi stop &>/dev/null || :
+    /sbin/chkconfig --del spawn-fcgi
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
+%{_sysconfdir}/init.d/spawn-fcgi
+%config(noreplace) %{_sysconfdir}/sysconfig/spawn-fcgi
 %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
 
 %changelog
+* Wed Sep 30 2009 Matthias Saou <http://freshrpms.net/> 1.6.3-1
+- Update to 1.6.3.
+- Include init script and sysconfig file to make it easy to manage a single
+  instance.
+
 * Tue Apr 21 2009 Matthias Saou <http://freshrpms.net/> 1.6.2-1
 - Update to 1.6.2.
 - Remove leftover -f from %%files section.



From kasal at fedoraproject.org  Wed Sep 30 17:17:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 17:17:01 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/devel
	perl-POE-Component-Client-Keepalive.spec, 1.15, 1.16
Message-ID: <20090930171701.CBF5E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6634

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
fix typo


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:05:56 -0000	1.15
+++ perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:17:01 -0000	1.16
@@ -40,7 +40,7 @@ connections, such as HTTP clients. Using
 probably be silly.
 
 %prep
-%setup -q -n POE-Component-Client-Keepalive-%{version}
+%setup -q -n POE-Component-Client-Keepalive-%{real_ver}
 chmod -c -x mylib/* t/*
 
 %build



From rdieter at fedoraproject.org  Wed Sep 30 17:19:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 17:19:03 +0000 (UTC)
Subject: rpms/taglib-extras/F-11 taglib-extras-1.0.1-version.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 taglib-extras.spec,
	1.7, 1.8
Message-ID: <20090930171903.D5E7511C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7131

Modified Files:
	.cvsignore sources taglib-extras.spec 
Added Files:
	taglib-extras-1.0.1-version.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- taglib-extras-1.0.1


taglib-extras-1.0.1-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE taglib-extras-1.0.1-version.patch ---
diff -up taglib-extras-1.0.1/CMakeLists.txt.version taglib-extras-1.0.1/CMakeLists.txt
--- taglib-extras-1.0.1/CMakeLists.txt.version	2009-09-17 14:31:50.000000000 -0500
+++ taglib-extras-1.0.1/CMakeLists.txt	2009-09-21 19:40:38.076666807 -0500
@@ -29,7 +29,7 @@ endif (WIN32)
 
 set(TAGLIB-EXTRAS_LIB_MAJOR_VERSION "1")
 set(TAGLIB-EXTRAS_LIB_MINOR_VERSION "0")
-set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "0")
+set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "1")
 
 set(TAGLIB-EXTRAS_LIB_VERSION_STRING "${TAGLIB-EXTRAS_LIB_MAJOR_VERSION}.${TAGLIB-EXTRAS_LIB_MINOR_VERSION}.${TAGLIB-EXTRAS_LIB_PATCH_VERSION}")
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Sep 2009 14:32:56 -0000	1.7
+++ .cvsignore	30 Sep 2009 17:19:03 -0000	1.8
@@ -1 +1 @@
-taglib-extras-0.1.7.tar.gz
+taglib-extras-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Sep 2009 14:32:56 -0000	1.7
+++ sources	30 Sep 2009 17:19:03 -0000	1.8
@@ -1 +1 @@
-09bf9c89d953a238b55ac74bf9db0be3  taglib-extras-0.1.7.tar.gz
+e973ca609b18e2c03c147ff9fd9e6eb8  taglib-extras-1.0.1.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/taglib-extras.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- taglib-extras.spec	16 Sep 2009 14:32:57 -0000	1.7
+++ taglib-extras.spec	30 Sep 2009 17:19:03 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.7
+Version:        1.0.1
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -14,9 +14,13 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 # it's already in default linker search path
 Patch1: taglib-extras-0.1-multilib-1.patch
 
+## upstream patches
+Patch100: taglib-extras-1.0.1-version.patch
+
 BuildRequires: cmake >= 2.6.0
-BuildRequires: taglib-devel
-BuildRequires: kdelibs4-devel
+BuildRequires: taglib-devel >= 1.6
+
+Requires: taglib%{?_isa} => 1.6
 
 %description
 Taglib-extras delivers support for reading and editing the meta-data of 
@@ -37,12 +41,13 @@ Requires: taglib-devel
 %setup -q 
 
 %patch1 -p1 -b .multilib
+%patch100 -p1 -b .version
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}   
-%{cmake} -DWITH_KDE=1 ..
+%{cmake} ..
 popd                        
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -57,6 +62,7 @@ make install DESTDIR=%{buildroot} -C %{_
 %clean
 rm -rf %{buildroot} 
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -65,7 +71,7 @@ rm -rf %{buildroot} 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LGPL
-%{_libdir}/libtag-extras.so.0*
+%{_libdir}/libtag-extras.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -76,6 +82,15 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- taglib-extras-1.0.1
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
+- drop (deprecated/no-op) kde integration
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- taglib-extras-1.0.0 (API/ABI bump)
+
 * Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
 - taglib-extras-0.1.7
 



From rdieter at fedoraproject.org  Wed Sep 30 17:19:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 17:19:39 +0000 (UTC)
Subject: rpms/taglib-extras/F-10 taglib-extras-1.0.1-version.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 taglib-extras.spec,
	1.6, 1.7
Message-ID: <20090930171939.647E611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330

Modified Files:
	.cvsignore sources taglib-extras.spec 
Added Files:
	taglib-extras-1.0.1-version.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- taglib-extras-1.0.1


taglib-extras-1.0.1-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE taglib-extras-1.0.1-version.patch ---
diff -up taglib-extras-1.0.1/CMakeLists.txt.version taglib-extras-1.0.1/CMakeLists.txt
--- taglib-extras-1.0.1/CMakeLists.txt.version	2009-09-17 14:31:50.000000000 -0500
+++ taglib-extras-1.0.1/CMakeLists.txt	2009-09-21 19:40:38.076666807 -0500
@@ -29,7 +29,7 @@ endif (WIN32)
 
 set(TAGLIB-EXTRAS_LIB_MAJOR_VERSION "1")
 set(TAGLIB-EXTRAS_LIB_MINOR_VERSION "0")
-set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "0")
+set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "1")
 
 set(TAGLIB-EXTRAS_LIB_VERSION_STRING "${TAGLIB-EXTRAS_LIB_MAJOR_VERSION}.${TAGLIB-EXTRAS_LIB_MINOR_VERSION}.${TAGLIB-EXTRAS_LIB_PATCH_VERSION}")
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Sep 2009 14:32:32 -0000	1.7
+++ .cvsignore	30 Sep 2009 17:19:38 -0000	1.8
@@ -1 +1 @@
-taglib-extras-0.1.7.tar.gz
+taglib-extras-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Sep 2009 14:32:32 -0000	1.7
+++ sources	30 Sep 2009 17:19:39 -0000	1.8
@@ -1 +1 @@
-09bf9c89d953a238b55ac74bf9db0be3  taglib-extras-0.1.7.tar.gz
+e973ca609b18e2c03c147ff9fd9e6eb8  taglib-extras-1.0.1.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/taglib-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- taglib-extras.spec	16 Sep 2009 14:32:32 -0000	1.6
+++ taglib-extras.spec	30 Sep 2009 17:19:39 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.7
+Version:        1.0.1
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -14,9 +14,13 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 # it's already in default linker search path
 Patch1: taglib-extras-0.1-multilib-1.patch
 
+## upstream patches
+Patch100: taglib-extras-1.0.1-version.patch
+
 BuildRequires: cmake >= 2.6.0
-BuildRequires: taglib-devel
-BuildRequires: kdelibs4-devel
+BuildRequires: taglib-devel >= 1.6
+
+Requires: taglib%{?_isa} => 1.6
 
 %description
 Taglib-extras delivers support for reading and editing the meta-data of 
@@ -37,12 +41,13 @@ Requires: taglib-devel
 %setup -q 
 
 %patch1 -p1 -b .multilib
+%patch100 -p1 -b .version
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}   
-%{cmake} -DWITH_KDE=1 ..
+%{cmake} ..
 popd                        
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -57,6 +62,7 @@ make install DESTDIR=%{buildroot} -C %{_
 %clean
 rm -rf %{buildroot} 
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -65,7 +71,7 @@ rm -rf %{buildroot} 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LGPL
-%{_libdir}/libtag-extras.so.0*
+%{_libdir}/libtag-extras.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -76,6 +82,15 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- taglib-extras-1.0.1
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
+- drop (deprecated/no-op) kde integration
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- taglib-extras-1.0.0 (API/ABI bump)
+
 * Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.7-1
 - taglib-extras-0.1.7
 



From kasal at fedoraproject.org  Wed Sep 30 17:24:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 30 Sep 2009 17:24:31 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/F-12
	perl-POE-Component-Client-Keepalive.spec, 1.15, 1.16
Message-ID: <20090930172431.A5B1511C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8669

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
fix typo


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/F-12/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:07:08 -0000	1.15
+++ perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:24:31 -0000	1.16
@@ -40,7 +40,7 @@ connections, such as HTTP clients. Using
 probably be silly.
 
 %prep
-%setup -q -n POE-Component-Client-Keepalive-%{version}
+%setup -q -n POE-Component-Client-Keepalive-%{real_ver}
 chmod -c -x mylib/* t/*
 
 %build



From toshio at fedoraproject.org  Wed Sep 30 17:24:36 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 30 Sep 2009 17:24:36 +0000 (UTC)
Subject: rpms/deltarpm/F-12 deltarpm-system-zlib.patch, NONE,
	1.1 deltarpm.spec, 1.31, 1.32
Message-ID: <20090930172436.72BB711C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/deltarpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8711

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
- Correct prerelease rlease numbering.
- Build against the system zlib, not the bundled library.  This remedies the
  fact that the included zlib is affected by CAN-2005-1849.


deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-git-20090913/Makefile
===================================================================
--- deltarpm-git-20090913.orig/Makefile
+++ deltarpm-git-20090913/Makefile
@@ -3,10 +3,9 @@ bindir=$(prefix)/bin
 libdir=$(prefix)/lib
 mandir=$(prefix)/man
 rpmdumpheader=$(bindir)/rpmdumpheader
-zlibdir=zlib-1.2.2.f-rsyncable
 CFLAGS = -fPIC -O2 -Wall -g
-CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
+CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I.
+LDLIBS = -lbz2 -lz -llzma
 LDFLAGS =
 PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
 
@@ -14,37 +13,33 @@ all: makedeltarpm applydeltarpm rpmdumph
 
 python: _deltarpmmodule.so
 
-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o
 
-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o
 
-combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
+combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o
 
 rpmdumpheader: rpmdumpheader.o
 	$(CC) $(LDFLAGS) $^ -lrpm -o $@
 
-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o
 
-fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
+fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o
 
-_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
+_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o
 	for ver in $(PYTHONVERS) ; do \
 		if [ ! -f "$$ver/$@" ]; then \
 			mkdir -p $$ver ;\
-			$(CC) $(CFLAGS) -I/usr/include/$$ver -I$(zlibdir) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
-			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(zlibdir)/libz.a -llzma -lbz2; \
+			$(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
+			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so -lz -llzma -lbz2; \
 		fi; \
 	done
 
-$(zlibdir)/libz.a:
-	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
-
 clean:
 	rm -f *.o
 	rm -f makedeltarpm applydeltarpm combinedeltarpm rpmdumpheader makedeltaiso applydeltaiso fragiso
-	cd $(zlibdir) ; make clean
 
 install:
 	mkdir -p $(DESTDIR)$(bindir)


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/F-12/deltarpm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- deltarpm.spec	13 Sep 2009 14:32:52 -0000	1.31
+++ deltarpm.spec	30 Sep 2009 17:24:36 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090913%{?dist}
+Release: 0.2.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -13,9 +13,12 @@ URL: http://gitorious.org/deltarpm/delta
 # git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
 Source: %{name}-git-20090913.tar.bz2
+# Build with system zlib
+Patch0: deltarpm-system-zlib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
+BuildRequires: zlib-devel
 BuildRequires: python-devel
 
 %description
@@ -50,6 +53,9 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090913
+# Build with system zlib
+%patch0 -p1 -b .zlib
+%{__rm} -rf zlib-1.2.2.f-rsyncable
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -96,6 +102,11 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
+- Correct prerelease rlease numbering.
+- Build against the system zlib, not the bundled library.  This remedies the
+  fact that the included zlib is affected by CAN-2005-1849.
+
 * Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
 - Merge python error patch upstream
 



From nphilipp at fedoraproject.org  Wed Sep 30 17:26:30 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 30 Sep 2009 17:26:30 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.3.1-manpath.patch, 1.1,
	1.2 kdebase-runtime.spec, 1.142, 1.143
Message-ID: <20090930172630.9584C11C00E6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9836

Modified Files:
	kdebase-runtime-4.3.1-manpath.patch kdebase-runtime.spec 
Log Message:
fix manpath patch (spotted by Kevin Kofler)


kdebase-runtime-4.3.1-manpath.patch:
 kio_man.cpp |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 kio_man.h   |    4 +++-
 2 files changed, 51 insertions(+), 2 deletions(-)

Index: kdebase-runtime-4.3.1-manpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime-4.3.1-manpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-runtime-4.3.1-manpath.patch	30 Sep 2009 15:11:28 -0000	1.1
+++ kdebase-runtime-4.3.1-manpath.patch	30 Sep 2009 17:26:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp
 --- kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath	2009-06-03 13:54:13.000000000 +0200
-+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp	2009-09-30 16:55:52.068576442 +0200
++++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp	2009-09-30 19:25:03.254684269 +0200
 @@ -1,5 +1,6 @@
  /*  This file is part of the KDE libraries
      Copyright (c) 2000 Matthias Hoelzer-Kluepfel <mhk at caldera.de>
@@ -57,14 +57,14 @@ diff -up kdebase-runtime-4.3.1/kioslave/
 +        // ... or errors out, ...
 +        return;
 +
-+    // ... grab its output, ...
-+    QString manpath_output = QString( manpath.readAllStandardOutput() );
-+
 +    // ... wait (forever) until it's finished, ...
 +    if ( ! manpath.waitForFinished( -1 ) )
 +        // ... or errors out, ...
 +        return;
 +
++    // ... grab its output, ...
++    QString manpath_output = QString( manpath.readAllStandardOutput() );
++
 +    // ... close the process, ...
 +    manpath.close();
 +
@@ -86,7 +86,7 @@ diff -up kdebase-runtime-4.3.1/kioslave/
      static bool inited = false;
 diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.h
 --- kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath	2008-11-19 11:17:53.000000000 +0100
-+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h	2009-09-30 14:05:22.254577337 +0200
++++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h	2009-09-30 19:24:18.733936178 +0200
 @@ -68,7 +68,9 @@ private:
      void addToBuffer(const char *buffer, int buflen);
      QString pageName(const QString& page) const;


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- kdebase-runtime.spec	30 Sep 2009 15:11:28 -0000	1.142
+++ kdebase-runtime.spec	30 Sep 2009 17:26:30 -0000	1.143
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.1
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-4
+- fix manpath patch (spotted by Kevin Kofler)
+
 * Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-3
 - if available, use the "manpath" command in the man kioslave to determine man
   page file locations



From dwalsh at fedoraproject.org  Wed Sep 30 17:28:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 17:28:58 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.647,1.648
Message-ID: <20090930172858.EFC2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-5
- Fixes for semanage -equiv, readded modules, --enable, --disable



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -p -r1.647 -r1.648
--- policycoreutils.spec	30 Sep 2009 15:37:20 -0000	1.647
+++ policycoreutils.spec	30 Sep 2009 17:28:58 -0000	1.648
@@ -88,7 +88,6 @@ tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
-ln -s /sbin/load_policy %{buildroot}%{_sbindir}/load_policy
 
 desktop-file-install	--vendor fedora \
 			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\



From rdieter at fedoraproject.org  Wed Sep 30 17:31:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 17:31:53 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.137,1.138 comps-f13.xml.in,1.27,1.28
Message-ID: <20090930173153.D671711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11234

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
+kmymoney2-aqbanking



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- comps-f12.xml.in	30 Sep 2009 15:20:02 -0000	1.137
+++ comps-f12.xml.in	30 Sep 2009 17:31:53 -0000	1.138
@@ -4580,6 +4580,7 @@
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">kmymoney2-aqbanking</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- comps-f13.xml.in	30 Sep 2009 15:20:02 -0000	1.27
+++ comps-f13.xml.in	30 Sep 2009 17:31:53 -0000	1.28
@@ -4551,6 +4551,7 @@
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">kmymoney2-aqbanking</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>



From dwalsh at fedoraproject.org  Wed Sep 30 17:37:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 17:37:44 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.36,
	1.37 modules-mls.conf, 1.58, 1.59 modules-targeted.conf, 1.145,
	1.146 policy-F12.patch, 1.97, 1.98 selinux-policy.spec, 1.931, 1.932
Message-ID: <20090930173744.AE0D611C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12783

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
- Allow cupsd_config to read user tmp
- Allow snmpd_t to signal itself
- Allow sysstat_t to makedir in sysstat_log_t



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- modules-minimum.conf	29 Sep 2009 19:44:06 -0000	1.36
+++ modules-minimum.conf	30 Sep 2009 17:37:43 -0000	1.37
@@ -1760,6 +1760,13 @@ aide = module
 w3c = module
 
 # Layer: services
+# Module: plymouth
+#
+#  Plymouth
+# 
+plymouth = module
+
+# Layer: services
 # Module: portreserve
 #
 #  reserve ports to prevent portmap mapping them


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- modules-mls.conf	8 Sep 2009 23:55:30 -0000	1.58
+++ modules-mls.conf	30 Sep 2009 17:37:43 -0000	1.59
@@ -543,6 +543,13 @@ gnomeclock = module
 hal = module
 
 # Layer: services
+# Module: plymouth
+#
+#  Plymouth
+# 
+plymouth = module
+
+# Layer: services
 # Module: policykit
 #
 # Hardware abstraction layer


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- modules-targeted.conf	29 Sep 2009 19:44:06 -0000	1.145
+++ modules-targeted.conf	30 Sep 2009 17:37:43 -0000	1.146
@@ -1760,6 +1760,13 @@ aide = module
 w3c = module
 
 # Layer: services
+# Module: plymouth
+#
+#  Plymouth
+# 
+plymouth = module
+
+# Layer: services
 # Module: portreserve
 #
 #  reserve ports to prevent portmap mapping them

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 330 files changed, 15540 insertions(+), 2595 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- policy-F12.patch	29 Sep 2009 20:51:16 -0000	1.97
+++ policy-F12.patch	30 Sep 2009 17:37:44 -0000	1.98
@@ -4887,7 +4887,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/named/chroot/dev/zero -c	gen_context(system_u:object_r:zero_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.32/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-09-21 08:39:30.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-09-30 13:17:45.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -11496,7 +11496,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.32/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-09-28 09:49:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-09-30 10:20:40.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -11559,7 +11559,15 @@ diff -b -B --ignore-all-space --exclude-
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
-@@ -419,12 +430,15 @@
+@@ -407,6 +418,7 @@
+ 
+ userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
+ userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
++userdom_read_user_tmp_files(cupsd_config_t)
+ 
+ cups_stream_connect(cupsd_config_t)
+ 
+@@ -419,12 +431,15 @@
  ')
  
  optional_policy(`
@@ -11577,7 +11585,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -446,6 +460,10 @@
+@@ -446,6 +461,10 @@
  ')
  
  optional_policy(`
@@ -11588,7 +11596,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(cupsd_config_t)
  ')
  
-@@ -542,6 +560,8 @@
+@@ -542,6 +561,8 @@
  manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
  files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
  
@@ -11597,7 +11605,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -601,6 +621,9 @@
+@@ -601,6 +622,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -14100,6 +14108,395 @@ diff -b -B --ignore-all-space --exclude-
 +	xen_stream_connect(pegasus_t)
 +	xen_stream_connect_xenstore(pegasus_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.fc serefpolicy-3.6.32/policy/modules/services/plymouth.fc
+--- nsaserefpolicy/policy/modules/services/plymouth.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.fc	2009-09-30 13:21:52.000000000 -0400
+@@ -0,0 +1,5 @@
++/sbin/plymouthd				--	gen_context(system_u:object_r:plymouthd_exec_t, s0)
++/bin/plymouth				--	gen_context(system_u:object_r:plymouth_exec_t, s0)
++/var/spool/plymouth(/.*)?			gen_context(system_u:object_r:plymouthd_spool_t, s0)
++/var/lib/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_lib_t, s0)
++/var/run/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_run_t, s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.if serefpolicy-3.6.32/policy/modules/services/plymouth.if
+--- nsaserefpolicy/policy/modules/services/plymouth.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.if	2009-09-30 13:20:45.000000000 -0400
+@@ -0,0 +1,286 @@
++## <summary>policy for plymouthd</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run plymouthd.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`plymouth_domtrans', `
++	gen_require(`
++		type plymouthd_t, plymouthd_exec_t;
++	')
++
++	domtrans_pattern($1, plymouthd_exec_t, plymouthd_t)
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run plymouthd.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`plymouth_domtrans_plymouth', `
++	gen_require(`
++		type plymouth_t, plymouth_exec_t;
++	')
++
++	domtrans_pattern($1, plymouth_exec_t, plymouth_t)
++')
++
++
++########################################
++## <summary>
++##	Read plymouthd PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_read_pid_files', `
++	gen_require(`
++		type plymouthd_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 plymouthd_var_run_t:file read_file_perms;
++')
++
++########################################
++## <summary>
++##	Manage plymouthd var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_manage_var_run', `
++	gen_require(`
++		type plymouthd_var_run_t;
++	')
++
++         manage_dirs_pattern($1, plymouthd_var_run_t, plymouthd_var_run_t)
++         manage_files_pattern($1, plymouthd_var_run_t, plymouthd_var_run_t)
++         manage_lnk_files_pattern($1, plymouthd_var_run_t, plymouthd_var_run_t)
++')
++
++
++########################################
++## <summary>
++##	Search plymouthd lib directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_search_lib', `
++	gen_require(`
++		type plymouthd_var_lib_t;
++	')
++
++	allow $1 plymouthd_var_lib_t:dir search_dir_perms;
++	files_search_var_lib($1)
++')
++
++########################################
++## <summary>
++##	Read plymouthd lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_read_lib_files', `
++	gen_require(`
++		type plymouthd_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++        read_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	plymouthd lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_manage_lib_files', `
++	gen_require(`
++		type plymouthd_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++        manage_files_pattern($1, plymouthd_var_lib_t,  plymouthd_var_lib_t)
++')
++
++########################################
++## <summary>
++##	Manage plymouthd var_lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_manage_var_lib', `
++	gen_require(`
++		type plymouthd_var_lib_t;
++	')
++
++         manage_dirs_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
++         manage_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
++         manage_lnk_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
++')
++
++
++########################################
++## <summary>
++##	Search plymouthd spool directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_search_spool', `
++	gen_require(`
++		type plymouthd_spool_t;
++	')
++
++	allow $1 plymouthd_spool_t:dir search_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Read plymouthd spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_read_spool_files', `
++	gen_require(`
++		type plymouthd_spool_t;
++	')
++
++	files_search_spool($1)
++        read_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	plymouthd spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`plymouth_manage_spool_files', `
++	gen_require(`
++		type plymouthd_spool_t;
++	')
++
++	files_search_spool($1)
++        manage_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
++')
++
++########################################
++## <summary>
++##	Allow domain to manage plymouthd spool files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++#
++interface(`plymouth_manage_spool', `
++	gen_require(`
++		type plymouthd_spool_t;
++	')
++
++         manage_dirs_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
++         manage_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
++         manage_lnk_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate 
++##	an plymouthd environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	Role allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`plymouth_admin', `
++	gen_require(`
++		type plymouthd_t;
++	')
++
++	allow $1 plymouthd_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, plymouthd_t, plymouthd_t)
++	        
++	plymouthd_manage_var_run($1)
++
++	plymouthd_manage_var_lib($1)
++
++	plymouthd_manage_spool($1)
++')
++
++########################################
++## <summary>
++##      Allow domain to Stream socket connect
++##	to Plymouth daemon.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`plymouth_stream_connect', `
++	gen_require(`
++		type plymouthd_t;
++	')
++
++	allow $1 plymouthd_t:unix_stream_socket connectto;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.te serefpolicy-3.6.32/policy/modules/services/plymouth.te
+--- nsaserefpolicy/policy/modules/services/plymouth.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-09-30 13:18:14.000000000 -0400
+@@ -0,0 +1,86 @@
++policy_module(plymouthd, 1.0.0)
++
++########################################
++#
++# Plymouthd private declarations
++#
++
++type plymouthd_t;
++type plymouthd_exec_t;
++init_daemon_domain(plymouthd_t, plymouthd_exec_t)
++
++permissive plymouthd_t;
++
++type plymouthd_var_run_t;
++files_pid_file(plymouthd_var_run_t)
++
++type plymouthd_var_lib_t;
++files_type(plymouthd_var_lib_t)
++
++type plymouthd_spool_t;
++files_type(plymouthd_spool_t)
++
++########################################
++#
++# Plymouth private declarations
++#
++
++type plymouth_t;
++type plymouth_exec_t;
++init_daemon_domain(plymouth_t, plymouth_exec_t)
++
++permissive plymouth_t;
++
++########################################
++#
++# Plymouthd private policy
++#
++
++allow plymouthd_t self:capability { sys_admin sys_tty_config };
++allow plymouthd_t self:process { signal };
++allow plymouthd_t self:fifo_file rw_fifo_file_perms;
++allow plymouthd_t self:unix_stream_socket create_stream_socket_perms;
++
++kernel_read_system_state(plymouthd_t)
++
++dev_rw_dri(plymouthd_t)
++dev_read_sysfs(plymouthd_t)
++
++domain_use_interactive_fds(plymouthd_t)
++
++files_read_etc_files(plymouthd_t)
++files_read_usr_files(plymouthd_t)
++
++miscfiles_read_localization(plymouthd_t)
++
++manage_dirs_pattern(plymouthd_t, plymouthd_var_run_t,  plymouthd_var_run_t)
++manage_files_pattern(plymouthd_t, plymouthd_var_run_t,  plymouthd_var_run_t)
++files_pid_filetrans(plymouthd_t,plymouthd_var_run_t, { file dir })
++
++manage_dirs_pattern(plymouthd_t, plymouthd_var_lib_t,  plymouthd_var_lib_t)
++manage_files_pattern(plymouthd_t, plymouthd_var_lib_t,  plymouthd_var_lib_t)
++files_var_lib_filetrans(plymouthd_t, plymouthd_var_lib_t, { file dir })
++
++manage_dirs_pattern(plymouthd_t, plymouthd_spool_t,  plymouthd_spool_t)
++manage_files_pattern(plymouthd_t, plymouthd_spool_t,  plymouthd_spool_t)
++manage_sock_files_pattern(plymouthd_t, plymouthd_spool_t,  plymouthd_spool_t)
++files_spool_filetrans(plymouthd_t,plymouthd_spool_t, { file dir sock_file })
++
++########################################
++#
++# Plymouth private policy
++#
++
++allow plymouth_t self:process { signal };
++allow plymouth_t self:fifo_file rw_file_perms;
++allow plymouth_t self:unix_stream_socket create_stream_socket_perms;
++
++kernel_stream_connect(plymouth_t)
++
++domain_use_interactive_fds(plymouth_t)
++
++files_read_etc_files(plymouth_t)
++
++miscfiles_read_localization(plymouth_t)
++
++plymouth_stream_connect(plymouth_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.fc serefpolicy-3.6.32/policy/modules/services/policykit.fc
 --- nsaserefpolicy/policy/modules/services/policykit.fc	2009-08-18 11:41:14.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/policykit.fc	2009-09-16 10:03:09.000000000 -0400
@@ -14601,7 +14998,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.32/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/postfix.te	2009-09-29 07:47:01.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/postfix.te	2009-09-29 17:17:09.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -17074,7 +17471,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.32/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sendmail.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/sendmail.if	2009-09-29 17:16:32.000000000 -0400
 @@ -59,20 +59,20 @@
  
  ########################################
@@ -17811,7 +18208,16 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.6.32/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/snmp.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/snmp.te	2009-09-29 17:04:42.000000000 -0400
+@@ -27,7 +27,7 @@
+ #
+ allow snmpd_t self:capability { dac_override kill ipc_lock sys_ptrace net_admin sys_nice sys_tty_config };
+ dontaudit snmpd_t self:capability { sys_module sys_tty_config };
+-allow snmpd_t self:process { getsched setsched };
++allow snmpd_t self:process { signal_perms getsched setsched };
+ allow snmpd_t self:fifo_file rw_fifo_file_perms;
+ allow snmpd_t self:unix_dgram_socket create_socket_perms;
+ allow snmpd_t self:unix_stream_socket create_stream_socket_perms;
 @@ -72,6 +72,8 @@
  corenet_udp_bind_snmp_port(snmpd_t)
  corenet_sendrecv_snmp_server_packets(snmpd_t)
@@ -18930,8 +19336,8 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_connect_system_bus(sssd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.6.32/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sysstat.te	2009-09-16 10:03:09.000000000 -0400
-@@ -19,7 +19,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/sysstat.te	2009-09-29 17:13:34.000000000 -0400
+@@ -19,14 +19,15 @@
  # Local policy
  #
  
@@ -18940,6 +19346,15 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit sysstat_t self:capability sys_admin;
  allow sysstat_t self:fifo_file rw_fifo_file_perms;
  
+ can_exec(sysstat_t, sysstat_exec_t)
+ 
++manage_dirs_pattern(sysstat_t,sysstat_log_t,sysstat_log_t)
+ manage_files_pattern(sysstat_t, sysstat_log_t, sysstat_log_t)
+-read_lnk_files_pattern(sysstat_t, sysstat_log_t, sysstat_log_t)
++manage_lnk_files_pattern(sysstat_t,sysstat_log_t,sysstat_log_t)
+ logging_log_filetrans(sysstat_t, sysstat_log_t, { file dir })
+ 
+ # get info from /proc
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.32/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/uucp.te	2009-09-16 10:03:09.000000000 -0400
@@ -20337,7 +20752,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.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-29 15:34:33.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-30 13:28:34.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -20753,7 +21168,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +652,34 @@
+@@ -542,6 +652,38 @@
  ')
  
  optional_policy(`
@@ -20769,6 +21184,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	plymouth_search_spool(xdm_t)
++')
++
++optional_policy(`
 +	pulseaudio_exec(xdm_t)
 +	pulseaudio_dbus_chat(xdm_t)
 +')
@@ -20788,7 +21207,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +688,9 @@
+@@ -550,8 +692,9 @@
  ')
  
  optional_policy(`
@@ -20800,7 +21219,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +699,6 @@
+@@ -560,7 +703,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -20808,7 +21227,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +709,10 @@
+@@ -571,6 +713,10 @@
  ')
  
  optional_policy(`
@@ -20819,7 +21238,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +729,9 @@
+@@ -587,10 +733,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -20831,7 +21250,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +743,12 @@
+@@ -602,9 +747,12 @@
  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;
@@ -20844,7 +21263,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +760,14 @@
+@@ -616,13 +764,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -20860,7 +21279,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 +780,19 @@
+@@ -635,9 +784,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -20880,7 +21299,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +826,6 @@
+@@ -671,7 +830,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -20888,7 +21307,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +835,12 @@
+@@ -681,9 +839,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -20902,7 +21321,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +855,12 @@
+@@ -698,8 +859,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -20915,7 +21334,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +882,7 @@
+@@ -721,6 +886,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -20923,7 +21342,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +905,7 @@
+@@ -743,7 +909,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -20932,7 +21351,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +937,20 @@
+@@ -775,12 +941,20 @@
  ')
  
  optional_policy(`
@@ -20954,7 +21373,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,7 +977,7 @@
+@@ -807,7 +981,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -20963,7 +21382,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)
-@@ -828,9 +998,14 @@
+@@ -828,9 +1002,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -20978,7 +21397,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)
-@@ -845,11 +1020,14 @@
+@@ -845,11 +1024,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -20994,7 +21413,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1060,8 @@
+@@ -882,6 +1064,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -21003,7 +21422,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1086,8 @@
+@@ -906,6 +1090,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 };
  
@@ -21012,7 +21431,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 };
-@@ -973,17 +1155,49 @@
+@@ -973,17 +1159,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -p -r1.931 -r1.932
--- selinux-policy.spec	29 Sep 2009 12:38:58 -0000	1.931
+++ selinux-policy.spec	30 Sep 2009 17:37:44 -0000	1.932
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -448,6 +448,11 @@ exit 0
 %endif
 
 %changelog
+* Tue Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
+- Allow cupsd_config to read user tmp
+- Allow snmpd_t to signal itself
+- Allow sysstat_t to makedir in sysstat_log_t
+
 * Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
 - Update rhcs policy
 



From lutter at fedoraproject.org  Wed Sep 30 17:48:16 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 30 Sep 2009 17:48:16 +0000 (UTC)
Subject: rpms/rubygem-rails/F-11 rubygem-rails.spec,1.15,1.16
Message-ID: <20090930174816.D749D11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15372/F-11

Modified Files:
	rubygem-rails.spec 
Log Message:
Restore fix for bz #496480


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/rubygem-rails.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rubygem-rails.spec	26 Sep 2009 16:19:12 -0000	1.15
+++ rubygem-rails.spec	30 Sep 2009 17:48:16 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -51,8 +51,9 @@ find %{buildroot}%{geminstdir}/bin -type
 # Cleanup some upstream packaging oddities, mostly to make rpmlint happy
 sed -i '1i#!/usr/bin/ruby\n' %{buildroot}%{geminstdir}/bin/rails
 
+# ref: bug 496480
 for file in `find %{buildroot}/%{geminstdir}/ -type f -perm /a+x`; do
-  sed -i -e '1c#!/usr/bin/ruby' $file
+  sed -i -e '1s|%{_bindir}/env ruby|%{_bindir}/ruby|' $file
   chmod 755 $file
 done
 
@@ -105,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 David Lutterkort <lutter at redhat.com> - 2.3.3-4
+- Restore fix for bz 496480
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-3
 - Force rebuild
 
@@ -114,6 +118,9 @@ rm -rf %{buildroot}
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 
+* Wed May  6 2009 David Lutterkort <lutter at redhat.com> - 2.3.2-2
+- Fix replacement of shebang lines; broke scripts/generate (bz 496480)
+
 * Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.2-1
 - New upstream version
 



From stevetraylen at fedoraproject.org  Wed Sep 30 17:56:28 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 30 Sep 2009 17:56:28 +0000 (UTC)
Subject: rpms/perl-Curses/EL-5 .cvsignore, 1.4, 1.5 perl-Curses.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090930175628.A9BD211C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Curses/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17692

Modified Files:
	.cvsignore perl-Curses.spec sources 
Log Message:
First EL-5 version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Oct 2006 03:15:15 -0000	1.4
+++ .cvsignore	30 Sep 2009 17:56:28 -0000	1.5
@@ -1 +1 @@
-Curses-1.15.tgz
+Curses-1.27.tgz


Index: perl-Curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-5/perl-Curses.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Curses.spec	17 Oct 2006 03:15:15 -0000	1.4
+++ perl-Curses.spec	30 Sep 2009 17:56:28 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           perl-Curses
-Version:        1.15
-Release:        1%{?dist}
+Version:        1.27
+Release:        3%{?dist}
 Summary:        Perl bindings for ncurses
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+
 URL:            http://search.cpan.org/dist/Curses/
 Source0:        http://search.cpan.org/CPAN/authors/id/G/GI/GIRAFFED/Curses-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel
+BuildRequires:  ncurses-devel perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,7 +19,9 @@ handling capabilities to Perl.
 
 %prep
 %setup -q -n Curses-%{version}
+test -f hints/c-linux.ncursesw.h || cp hints/c-linux.ncurses.h hints/c-linux.ncursesw.h
 sed -i -e 's|/usr/local/bin/perl|%{__perl}|' demo*
+sed -i -e 's|/usr//bin/perl|%{__perl}|' demo*
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \
@@ -47,6 +49,8 @@ find $RPM_BUILD_ROOT -type f -name '*.bs
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+#Remove exec perm for file aimed to be bundled as %%doc
+chmod -x demo*
 
 %check
 make test
@@ -65,6 +69,42 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> - 1.27-3
+- First build for EPEL5, Remove perl-devel BR.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 kwizart < kwizart at gmail.com > - 1.27-1
+- Update to 1.27
+- Remove exec perm for demo* provided as %%doc - Fix #510186
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-3
+- rebuild for new perl
+
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 1.20-2
+- forgot to update tarball, building
+
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 1.20-1
+- bump to 1.20
+
+* Fri Aug 17 2007 Garrick Staples <garrick at usc.edu> 1.16-4
+- fix /usr//bin/perl, bz#253336
+
+* Thu Aug 16 2007 Garrick Staples <garrick at usc.edu> 1.16-3
+- need BR: perl(Test::More)
+
+* Thu Aug 16 2007 Garrick Staples <garrick at usc.edu> 1.16-2
+- rebuild
+
+* Thu Aug 16 2007 Garrick Staples <garrick at usc.edu> 1.16-1
+- bump to 1.16
+- correct License: tag
+- need BR: perl-devel
+
 * Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.15-1
 - bump to 1.15
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Oct 2006 03:15:15 -0000	1.4
+++ sources	30 Sep 2009 17:56:28 -0000	1.5
@@ -1 +1 @@
-6f3c5ea61cbbfabe15b0004febcb3a4d  Curses-1.15.tgz
+f125ccc648141ff0be7b0743a73cf67e  Curses-1.27.tgz



From stevetraylen at fedoraproject.org  Wed Sep 30 17:57:57 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 30 Sep 2009 17:57:57 +0000 (UTC)
Subject: rpms/perl-Curses/EL-5 perl-Curses.spec,1.5,1.6
Message-ID: <20090930175757.6CACB11C00E6@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Curses/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18106

Modified Files:
	perl-Curses.spec 
Log Message:
commit before tag.



Index: perl-Curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-5/perl-Curses.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Curses.spec	30 Sep 2009 17:56:28 -0000	1.5
+++ perl-Curses.spec	30 Sep 2009 17:57:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Curses
 Version:        1.27
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl bindings for ncurses
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> - 1.27-4
+- Forgot to commit.
+
 * Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> - 1.27-3
 - First build for EPEL5, Remove perl-devel BR.
 



From markmc at fedoraproject.org  Wed Sep 30 17:57:51 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 30 Sep 2009 17:57:51 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-fix-usb-device-passthrough.patch, NONE,
	1.1 libvirt.spec, 1.183, 1.184
Message-ID: <20090930175751.0711D11C00E6@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18124

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-usb-device-passthrough.patch 
Log Message:
* Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
- Fix USB device passthrough (#522683)


libvirt-fix-usb-device-passthrough.patch:
 security_selinux.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-fix-usb-device-passthrough.patch ---
>From 16f20706f8d2f113bb6a49f56e415c16d438183e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 30 Sep 2009 18:37:03 +0100
Subject: [PATCH] Fix USB device re-labelling

A simple misplaced break out of a switch results in:

  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory
  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory
  libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c.

when trying to passthrough a USB host device to qemu.

* src/security_selinux.c: fix a switch/break thinko

Fedora-patch: libvirt-fix-usb-device-passthrough.patch
---
 src/security_selinux.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/security_selinux.c b/src/security_selinux.c
index bc295b1..b4dc153 100644
--- a/src/security_selinux.c
+++ b/src/security_selinux.c
@@ -464,12 +464,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn,
 
             ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
             usbFreeDevice(conn, usb);
-
-            break;
         } else {
             /* XXX deal with product/vendor better */
             ret = 0;
         }
+        break;
     }
 
     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
-- 
1.6.4.4



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- libvirt.spec	22 Sep 2009 03:52:07 -0000	1.183
+++ libvirt.spec	30 Sep 2009 17:57:50 -0000	1.184
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 6%{?dist}%{?extra_release}
+Release: 7%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -170,6 +170,9 @@ Patch03: libvirt-fix-drv-supports-featur
 # Fix raw save format
 Patch04: libvirt-fix-qemu-raw-format-save.patch
 
+# Fix USB device passthrough (#422683)
+Patch05: libvirt-fix-usb-device-passthrough.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -387,6 +390,7 @@ of recent versions of Linux (and other O
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
+%patch05 -p1
 
 %build
 %if ! %{with_xen}
@@ -777,6 +781,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
+- Fix USB device passthrough (#522683)
+
 * Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.7.1-6
 - rebuild for libssh2 1.2
 



From markmc at fedoraproject.org  Wed Sep 30 17:58:52 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 30 Sep 2009 17:58:52 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-fix-usb-device-passthrough.patch, NONE, 
	1.1 libvirt.spec, 1.183, 1.184
Message-ID: <20090930175852.56BF911C00E6@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18610

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-usb-device-passthrough.patch 
Log Message:
* Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
- Fix USB device passthrough (#522683)


libvirt-fix-usb-device-passthrough.patch:
 security_selinux.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-fix-usb-device-passthrough.patch ---
>From 16f20706f8d2f113bb6a49f56e415c16d438183e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 30 Sep 2009 18:37:03 +0100
Subject: [PATCH] Fix USB device re-labelling

A simple misplaced break out of a switch results in:

  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory
  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory
  libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c.

when trying to passthrough a USB host device to qemu.

* src/security_selinux.c: fix a switch/break thinko

Fedora-patch: libvirt-fix-usb-device-passthrough.patch
---
 src/security_selinux.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/security_selinux.c b/src/security_selinux.c
index bc295b1..b4dc153 100644
--- a/src/security_selinux.c
+++ b/src/security_selinux.c
@@ -464,12 +464,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn,
 
             ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
             usbFreeDevice(conn, usb);
-
-            break;
         } else {
             /* XXX deal with product/vendor better */
             ret = 0;
         }
+        break;
     }
 
     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
-- 
1.6.4.4



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- libvirt.spec	22 Sep 2009 03:52:07 -0000	1.183
+++ libvirt.spec	30 Sep 2009 17:58:52 -0000	1.184
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 6%{?dist}%{?extra_release}
+Release: 7%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -170,6 +170,9 @@ Patch03: libvirt-fix-drv-supports-featur
 # Fix raw save format
 Patch04: libvirt-fix-qemu-raw-format-save.patch
 
+# Fix USB device passthrough (#422683)
+Patch05: libvirt-fix-usb-device-passthrough.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -387,6 +390,7 @@ of recent versions of Linux (and other O
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
+%patch05 -p1
 
 %build
 %if ! %{with_xen}
@@ -777,6 +781,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
+- Fix USB device passthrough (#522683)
+
 * Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.7.1-6
 - rebuild for libssh2 1.2
 



From stevetraylen at fedoraproject.org  Wed Sep 30 18:00:51 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 30 Sep 2009 18:00:51 +0000 (UTC)
Subject: rpms/perl-Curses/EL-4 .cvsignore, 1.2, 1.3 perl-Curses.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090930180051.7364211C01EA@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Curses/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19193

Modified Files:
	.cvsignore perl-Curses.spec sources 
Log Message:
First EL-5 build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Apr 2006 19:17:55 -0000	1.2
+++ .cvsignore	30 Sep 2009 18:00:50 -0000	1.3
@@ -1 +1 @@
-Curses-1.13.tgz
+Curses-1.27.tgz


Index: perl-Curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-4/perl-Curses.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Curses.spec	23 Apr 2006 19:17:55 -0000	1.1
+++ perl-Curses.spec	30 Sep 2009 18:00:50 -0000	1.2
@@ -1,15 +1,15 @@
 Name:           perl-Curses
-Version:        1.13
+Version:        1.27
 Release:        3%{?dist}
 Summary:        Perl bindings for ncurses
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+
 URL:            http://search.cpan.org/dist/Curses/
 Source0:        http://search.cpan.org/CPAN/authors/id/G/GI/GIRAFFED/Curses-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel
+BuildRequires:  ncurses-devel perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,8 +19,9 @@ handling capabilities to Perl.
 
 %prep
 %setup -q -n Curses-%{version}
+test -f hints/c-linux.ncursesw.h || cp hints/c-linux.ncurses.h hints/c-linux.ncursesw.h
 sed -i -e 's|/usr/local/bin/perl|%{__perl}|' demo*
-
+sed -i -e 's|/usr//bin/perl|%{__perl}|' demo*
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \
@@ -48,6 +49,8 @@ find $RPM_BUILD_ROOT -type f -name '*.bs
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+#Remove exec perm for file aimed to be bundled as %%doc
+chmod -x demo*
 
 %check
 make test
@@ -66,6 +69,52 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> - 1.27-3
+- First build for EPEL4, remove perl-devel BR.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 kwizart < kwizart at gmail.com > - 1.27-1
+- Update to 1.27
+- Remove exec perm for demo* provided as %%doc - Fix #510186
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-3
+- rebuild for new perl
+
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 1.20-2
+- forgot to update tarball, building
+
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 1.20-1
+- bump to 1.20
+
+* Fri Aug 17 2007 Garrick Staples <garrick at usc.edu> 1.16-4
+- fix /usr//bin/perl, bz#253336
+
+* Thu Aug 16 2007 Garrick Staples <garrick at usc.edu> 1.16-3
+- need BR: perl(Test::More)
+
+* Thu Aug 16 2007 Garrick Staples <garrick at usc.edu> 1.16-2
+- rebuild
+
+* Thu Aug 16 2007 Garrick Staples <garrick at usc.edu> 1.16-1
+- bump to 1.16
+- correct License: tag
+- need BR: perl-devel
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.15-1
+- bump to 1.15
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.14-2
+- rebuild
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.14-1
+- bump to 1.14
+- FC6 mass rebuild
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 1.13-3
 - add a note about the falsely alarming warning
 - don't remove execute bit from demos


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Apr 2006 19:17:55 -0000	1.2
+++ sources	30 Sep 2009 18:00:50 -0000	1.3
@@ -1 +1 @@
-33f6a17f9ece7efda2dde3431e1540f6  Curses-1.13.tgz
+f125ccc648141ff0be7b0743a73cf67e  Curses-1.27.tgz



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:14 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180514.0F22D10F86A@bastion2.fedora.phx.redhat.com>

jamatos has set the watchbugzilla acl on python-imaging (Fedora devel) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:17 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180517.91E5610F895@bastion2.fedora.phx.redhat.com>

jamatos has set the watchcommits acl on python-imaging (Fedora devel) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:19 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180519.2A7D410F8A8@bastion2.fedora.phx.redhat.com>

jamatos has set the commit acl on python-imaging (Fedora devel) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:21 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180521.D6C4410F875@bastion2.fedora.phx.redhat.com>

jamatos has set the approveacls acl on python-imaging (Fedora devel) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From rdieter at fedoraproject.org  Wed Sep 30 18:05:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 18:05:24 +0000 (UTC)
Subject: rpms/maxima/devel sources,1.31,1.32 .cvsignore,1.33,1.34
Message-ID: <20090930180524.8946211C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20644

Modified Files:
	sources .cvsignore 
Log Message:
drop old sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	30 Aug 2009 20:04:58 -0000	1.31
+++ sources	30 Sep 2009 18:05:24 -0000	1.32
@@ -1,5 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-5b23dcfccad10988e344a839a0fbbe2b  maxima-5.19.1.tar.gz
 c75eec2586f5be18e02978e70fac0b07  maxima-5.19.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	30 Aug 2009 20:04:58 -0000	1.33
+++ .cvsignore	30 Sep 2009 18:05:24 -0000	1.34
@@ -2,5 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.19.1.tar.gz
 maxima-5.19.2.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:28 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180528.6134610F88B@bastion2.fedora.phx.redhat.com>

jamatos has set the watchbugzilla acl on python-imaging (Fedora EPEL 4) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:29 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180529.F221410F8A8@bastion2.fedora.phx.redhat.com>

jamatos has set the watchcommits acl on python-imaging (Fedora EPEL 4) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:30 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180530.873EE10F8AD@bastion2.fedora.phx.redhat.com>

jamatos has set the commit acl on python-imaging (Fedora EPEL 4) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:33 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180533.87D9110F86A@bastion2.fedora.phx.redhat.com>

jamatos has set the approveacls acl on python-imaging (Fedora EPEL 4) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:35 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180535.E278810F8A8@bastion2.fedora.phx.redhat.com>

jamatos has set the watchbugzilla acl on python-imaging (Fedora EPEL 5) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:38 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180538.6BCBA10F8B2@bastion2.fedora.phx.redhat.com>

jamatos has set the watchcommits acl on python-imaging (Fedora EPEL 5) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:39 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180539.E1AE010F8AF@bastion2.fedora.phx.redhat.com>

jamatos has set the commit acl on python-imaging (Fedora EPEL 5) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From rdieter at fedoraproject.org  Wed Sep 30 18:05:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 18:05:39 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.139,1.140
Message-ID: <20090930180539.DC67D11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20709

Modified Files:
	maxima.spec 
Log Message:
fixup _with_cmucl_runtime macro



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- maxima.spec	30 Sep 2009 04:03:49 -0000	1.139
+++ maxima.spec	30 Sep 2009 18:05:39 -0000	1.140
@@ -153,7 +153,7 @@ Maxima compiled with Common Lisp (clisp)
 %endif
 
 %if "x%{?_enable_cmucl:1}" == "x1"
-%define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
+%define _with_cmucl_runtime --with-cmucl-runtime=%{_prefix}/lib/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 



From pkgdb at fedoraproject.org  Wed Sep 30 18:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:05:41 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180541.59A3610F8B8@bastion2.fedora.phx.redhat.com>

jamatos has set the approveacls acl on python-imaging (Fedora EPEL 5) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:18 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180618.4548110F894@bastion2.fedora.phx.redhat.com>

jamatos has set the watchcommits acl on python-imaging (Fedora 10) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:16 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180616.5403210F86A@bastion2.fedora.phx.redhat.com>

jamatos has set the watchbugzilla acl on python-imaging (Fedora 10) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:20 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180620.954F810F8A9@bastion2.fedora.phx.redhat.com>

jamatos has set the commit acl on python-imaging (Fedora 10) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:20 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180620.BCC3C10F8AF@bastion2.fedora.phx.redhat.com>

jamatos has set the approveacls acl on python-imaging (Fedora 10) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:23 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180623.2146E10F8B3@bastion2.fedora.phx.redhat.com>

jamatos has set the watchbugzilla acl on python-imaging (Fedora 11) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:26 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180626.46A3210F88B@bastion2.fedora.phx.redhat.com>

jamatos has set the watchcommits acl on python-imaging (Fedora 11) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:26 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180626.70BD410F8B6@bastion2.fedora.phx.redhat.com>

jamatos has set the commit acl on python-imaging (Fedora 11) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:28 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180628.A906610F895@bastion2.fedora.phx.redhat.com>

jamatos has set the approveacls acl on python-imaging (Fedora 11) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:35 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180635.EE61710F8AB@bastion2.fedora.phx.redhat.com>

jamatos has set the watchbugzilla acl on python-imaging (Fedora 12) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:37 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180637.B137910F88C@bastion2.fedora.phx.redhat.com>

jamatos has set the watchcommits acl on python-imaging (Fedora 12) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:39 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180640.1293810F8B0@bastion2.fedora.phx.redhat.com>

jamatos has set the commit acl on python-imaging (Fedora 12) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pkgdb at fedoraproject.org  Wed Sep 30 18:06:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 18:06:42 +0000
Subject: [pkgdb] python-imaging had acl change status
Message-ID: <20090930180642.92C3810F8A8@bastion2.fedora.phx.redhat.com>

jamatos has set the approveacls acl on python-imaging (Fedora 12) to Obsolete for jgranado

To make changes to this package see:
  /pkgdb/packages/name/python-imaging



From pfj at fedoraproject.org  Wed Sep 30 18:11:10 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 30 Sep 2009 18:11:10 +0000 (UTC)
Subject: rpms/monodevelop/devel import.log, 1.24, 1.25 monodevelop.spec, 1.44,
	1.45
Message-ID: <20090930181110.6023A11C048B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21817/devel

Modified Files:
	import.log monodevelop.spec 
Log Message:

Fix for lib64 archs 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- import.log	9 Sep 2009 22:24:13 -0000	1.24
+++ import.log	30 Sep 2009 18:11:09 -0000	1.25
@@ -22,3 +22,4 @@ monodevelop-1_9_3-1_beta2_fc11:HEAD:mono
 monodevelop-2_0-1_fc11:HEAD:monodevelop-2.0-1.fc11.src.rpm:1238109849
 monodevelop-2_0-3_fc12:HEAD:monodevelop-2.0-3.fc12.src.rpm:1245788128
 monodevelop-2_1_0-1_fc12:HEAD:monodevelop-2.1.0-1.fc12.src.rpm:1252535001
+monodevelop-2_1_0-3_fc12:HEAD:monodevelop-2.1.0-3.fc12.src.rpm:1254334217


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- monodevelop.spec	21 Sep 2009 08:11:48 -0000	1.44
+++ monodevelop.spec	30 Sep 2009 18:11:09 -0000	1.45
@@ -6,7 +6,7 @@
 
 Name:           monodevelop
 Version:        2.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -60,6 +60,7 @@ sed -i -e 's!$(prefix)/lib/!%{_libdir}/!
     -e 's!${exec_prefix}/lib!%{_libdir}!' configure
 sed -i -e 's!/lib/monodevelop!/%{_lib}/monodevelop!' monodevelop
 sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' mdtool.in
+sed -i -e 's!monodevelop}/lib/!monodevelop}/%{_lib}/!' monodevelop.in
 
 
 find . -name Makefile.in -or -name \*.pc.in \
@@ -140,6 +141,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.0-3
+- Fix for lib64
+
 * Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 2.1.0-2
 - Properly disable bundled Mono.Cecil and NUnit
 - Readjust launcher script (bz #523695)



From tmraz at fedoraproject.org  Wed Sep 30 18:18:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 30 Sep 2009 18:18:48 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-camellia-rounds.patch, NONE, 
	1.1 openssl-1.0.0-beta3-fips.patch, 1.4, 1.5 openssl.spec, 1.141,
	1.142 openssl-1.0.0-beta3-cmll-noasm.patch, 1.1, NONE
Message-ID: <20090930181848.BFA5411C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24523

Modified Files:
	openssl-1.0.0-beta3-fips.patch openssl.spec 
Added Files:
	openssl-1.0.0-beta3-camellia-rounds.patch 
Removed Files:
	openssl-1.0.0-beta3-cmll-noasm.patch 
Log Message:
* Wed Sep 30 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.8.beta3
- fix RSA and DSA FIPS selftests
- reenable fixed x86_64 camellia assembler code (#521127)


openssl-1.0.0-beta3-camellia-rounds.patch:
 cmll-x86_64.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-camellia-rounds.patch ---
diff -up openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl.rounds openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl
--- openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl.rounds	2009-09-15 12:09:08.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl	2009-09-15 12:09:48.000000000 +0200
@@ -656,7 +656,7 @@ Camellia_cbc_encrypt:
 	mov	%rsi,$out		# out argument
 	mov	%r8,%rbx		# ivp argument
 	mov	%rcx,$key		# key argument
-	mov	272(%rcx),$keyend	# grandRounds
+	mov	272(%rcx),${keyend}d	# grandRounds
 
 	mov	%r8,$_ivp
 	mov	%rbp,$_rsp

openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/Makefile           |    4 
 crypto/camellia/asm/cmll-x86.pl    |    7 
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_fblk.c        |   68 ++
 crypto/camellia/cmll_misc.c        |    9 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   61 ++
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   27 -
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/evp/p_sign.c                |   17 
 crypto/evp/p_verify.c              |   17 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  101 +++
 crypto/fips/fips_des_selftest.c    |  137 +++++
 crypto/fips/fips_dsa_selftest.c    |  184 +++++++
 crypto/fips/fips_hmac_selftest.c   |  135 +++++
 crypto/fips/fips_rand.c            |  410 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  371 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  439 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   97 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    3 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  158 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |  104 ++++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 119 files changed, 10121 insertions(+), 180 deletions(-)

Index: openssl-1.0.0-beta3-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl-1.0.0-beta3-fips.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openssl-1.0.0-beta3-fips.patch	20 Aug 2009 17:22:41 -0000	1.4
+++ openssl-1.0.0-beta3-fips.patch	30 Sep 2009 18:18:48 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up openssl-1.0.0-beta3/Configure.fips openssl-1.0.0-beta3/Configure
---- openssl-1.0.0-beta3/Configure.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/Configure	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/Configure.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/Configure	2009-09-30 13:25:58.000000000 +0200
 @@ -654,6 +654,7 @@ my $cmll_enc="camellia.o cmll_misc.o cml
  my $processor="";
  my $default_ranlib;
@@ -45,7 +45,7 @@ diff -up openssl-1.0.0-beta3/Configure.f
  	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
 diff -up openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips openssl-1.0.0-beta3/crypto/bf/bf_skey.c
 --- openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips	2008-11-12 04:57:52.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/bf/bf_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bf/bf_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,10 +59,15 @@
  #include <stdio.h>
  #include <string.h>
@@ -64,8 +64,8 @@ diff -up openssl-1.0.0-beta3/crypto/bf/b
  	int i;
  	BF_LONG *p,ri,in[2];
 diff -up openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips openssl-1.0.0-beta3/crypto/bf/blowfish.h
---- openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/bf/blowfish.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bf/blowfish.h	2009-09-30 13:25:58.000000000 +0200
 @@ -104,7 +104,9 @@ typedef struct bf_key_st
  	BF_LONG S[4*256];
  	} BF_KEY;
@@ -78,8 +78,8 @@ diff -up openssl-1.0.0-beta3/crypto/bf/b
  
  void BF_encrypt(BF_LONG *data,const BF_KEY *key);
 diff -up openssl-1.0.0-beta3/crypto/bn/bn.h.fips openssl-1.0.0-beta3/crypto/bn/bn.h
---- openssl-1.0.0-beta3/crypto/bn/bn.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/bn/bn.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/bn/bn.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bn/bn.h	2009-09-30 13:25:58.000000000 +0200
 @@ -540,6 +540,17 @@ int	BN_is_prime_ex(const BIGNUM *p,int n
  int	BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
  		int do_trial_division, BN_GENCB *cb);
@@ -99,8 +99,8 @@ diff -up openssl-1.0.0-beta3/crypto/bn/b
  void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
  int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
 diff -up /dev/null openssl-1.0.0-beta3/crypto/bn/bn_x931p.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/bn/bn_x931p.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/bn/bn_x931p.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,272 @@
 +/* bn_x931p.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -376,7 +376,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 diff -up openssl-1.0.0-beta3/crypto/bn/Makefile.fips openssl-1.0.0-beta3/crypto/bn/Makefile
 --- openssl-1.0.0-beta3/crypto/bn/Makefile.fips	2008-11-12 09:19:02.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/bn/Makefile	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bn/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -26,13 +26,13 @@ LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_li
  	bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
  	bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
@@ -395,7 +395,7 @@ diff -up openssl-1.0.0-beta3/crypto/bn/M
  
 diff -up openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl.fips openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl
 --- openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl.fips	2009-04-06 16:25:02.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl	2009-08-20 16:54:59.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl	2009-09-30 13:25:58.000000000 +0200
 @@ -722,12 +722,15 @@ my $bias=int(@T[0])?shift(@T):0;
  }
  &function_end("Camellia_Ekeygen");
@@ -423,8 +423,8 @@ diff -up openssl-1.0.0-beta3/crypto/came
  
  @SBOX=(
 diff -up openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips openssl-1.0.0-beta3/crypto/camellia/camellia.h
---- openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/camellia/camellia.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips	2009-09-30 13:25:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/camellia.h	2009-09-30 13:25:58.000000000 +0200
 @@ -88,6 +88,11 @@ struct camellia_key_st 
  	};
  typedef struct camellia_key_st CAMELLIA_KEY;
@@ -437,9 +437,9 @@ diff -up openssl-1.0.0-beta3/crypto/came
  int Camellia_set_key(const unsigned char *userKey, const int bits,
  	CAMELLIA_KEY *key);
  
-diff -up openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c.fips openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c
---- openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c.fips	2009-08-20 17:01:56.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c	2009-08-20 17:03:21.000000000 +0200
+diff -up /dev/null openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,68 @@
 +/* crypto/camellia/camellia_misc.c -*- mode:C; c-file-style: "eay" -*- */
 +/* ====================================================================
@@ -511,7 +511,7 @@ diff -up openssl-1.0.0-beta3/crypto/came
 +#endif
 diff -up openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c.fips openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c
 --- openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c.fips	2008-10-28 13:13:52.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c	2009-08-20 17:04:10.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c	2009-09-30 13:25:58.000000000 +0200
 @@ -52,11 +52,20 @@
  #include <openssl/opensslv.h>
  #include <openssl/camellia.h>
@@ -535,7 +535,7 @@ diff -up openssl-1.0.0-beta3/crypto/came
  		return -1;
 diff -up openssl-1.0.0-beta3/crypto/camellia/Makefile.fips openssl-1.0.0-beta3/crypto/camellia/Makefile
 --- openssl-1.0.0-beta3/crypto/camellia/Makefile.fips	2008-12-23 12:33:00.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/camellia/Makefile	2009-08-20 17:02:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -23,9 +23,9 @@ APPS=
  
  LIB=$(TOP)/libcrypto.a
@@ -549,8 +549,8 @@ diff -up openssl-1.0.0-beta3/crypto/came
  SRC= $(LIBSRC)
  
 diff -up openssl-1.0.0-beta3/crypto/cast/cast.h.fips openssl-1.0.0-beta3/crypto/cast/cast.h
---- openssl-1.0.0-beta3/crypto/cast/cast.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/cast/cast.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/cast/cast.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/cast/cast.h	2009-09-30 13:25:58.000000000 +0200
 @@ -83,7 +83,9 @@ typedef struct cast_key_st
  	int short_key;	/* Use reduced rounds for short key */
  	} CAST_KEY;
@@ -564,7 +564,7 @@ diff -up openssl-1.0.0-beta3/crypto/cast
  		      int enc);
 diff -up openssl-1.0.0-beta3/crypto/cast/c_skey.c.fips openssl-1.0.0-beta3/crypto/cast/c_skey.c
 --- openssl-1.0.0-beta3/crypto/cast/c_skey.c.fips	2000-06-03 16:13:35.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/cast/c_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/cast/c_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -57,6 +57,11 @@
   */
  
@@ -587,8 +587,8 @@ diff -up openssl-1.0.0-beta3/crypto/cast
  	CAST_LONG x[16];
  	CAST_LONG z[16];
 diff -up openssl-1.0.0-beta3/crypto/crypto.h.fips openssl-1.0.0-beta3/crypto/crypto.h
---- openssl-1.0.0-beta3/crypto/crypto.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/crypto.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/crypto.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/crypto.h	2009-09-30 13:25:58.000000000 +0200
 @@ -546,12 +546,69 @@ void OpenSSLDie(const char *file,int lin
  unsigned long *OPENSSL_ia32cap_loc(void);
  #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
@@ -661,7 +661,7 @@ diff -up openssl-1.0.0-beta3/crypto/cryp
  /* Function codes. */
 diff -up openssl-1.0.0-beta3/crypto/dh/dh_err.c.fips openssl-1.0.0-beta3/crypto/dh/dh_err.c
 --- openssl-1.0.0-beta3/crypto/dh/dh_err.c.fips	2006-11-21 22:29:37.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/dh/dh_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -73,6 +73,8 @@ static ERR_STRING_DATA DH_str_functs[]=
  {ERR_FUNC(DH_F_COMPUTE_KEY),	"COMPUTE_KEY"},
  {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP),	"DHparams_print_fp"},
@@ -681,7 +681,7 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  {ERR_REASON(DH_R_NO_PARAMETERS_SET)      ,"no parameters set"},
 diff -up openssl-1.0.0-beta3/crypto/dh/dh_gen.c.fips openssl-1.0.0-beta3/crypto/dh/dh_gen.c
 --- openssl-1.0.0-beta3/crypto/dh/dh_gen.c.fips	2005-04-26 20:53:15.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dh/dh_gen.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh_gen.c	2009-09-30 13:25:58.000000000 +0200
 @@ -65,6 +65,10 @@
  #include "cryptlib.h"
  #include <openssl/bn.h>
@@ -715,8 +715,8 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  	if (ctx == NULL) goto err;
  	BN_CTX_start(ctx);
 diff -up openssl-1.0.0-beta3/crypto/dh/dh.h.fips openssl-1.0.0-beta3/crypto/dh/dh.h
---- openssl-1.0.0-beta3/crypto/dh/dh.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dh/dh.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/dh/dh.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh.h	2009-09-30 13:25:58.000000000 +0200
 @@ -77,6 +77,8 @@
  # define OPENSSL_DH_MAX_MODULUS_BITS	10000
  #endif
@@ -745,7 +745,7 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  }
 diff -up openssl-1.0.0-beta3/crypto/dh/dh_key.c.fips openssl-1.0.0-beta3/crypto/dh/dh_key.c
 --- openssl-1.0.0-beta3/crypto/dh/dh_key.c.fips	2007-03-28 02:15:23.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dh/dh_key.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh_key.c	2009-09-30 13:25:58.000000000 +0200
 @@ -61,6 +61,9 @@
  #include <openssl/bn.h>
  #include <openssl/rand.h>
@@ -797,7 +797,7 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  	}
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c.fips openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c
 --- openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c.fips	2008-12-26 18:17:21.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c	2009-09-30 13:25:58.000000000 +0200
 @@ -77,8 +77,12 @@
  #include "cryptlib.h"
  #include <openssl/evp.h>
@@ -834,8 +834,8 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  	    qsize != SHA256_DIGEST_LENGTH)
  		/* invalid q size */
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa.h.fips openssl-1.0.0-beta3/crypto/dsa/dsa.h
---- openssl-1.0.0-beta3/crypto/dsa/dsa.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/dsa/dsa.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dsa/dsa.h	2009-09-30 13:25:58.000000000 +0200
 @@ -88,6 +88,8 @@
  # define OPENSSL_DSA_MAX_MODULUS_BITS	10000
  #endif
@@ -894,8 +894,8 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  #ifdef  __cplusplus
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_key.c.fips openssl-1.0.0-beta3/crypto/dsa/dsa_key.c
 --- openssl-1.0.0-beta3/crypto/dsa/dsa_key.c.fips	2007-03-28 02:15:25.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa_key.c	2009-08-11 18:09:42.000000000 +0200
-@@ -63,9 +63,40 @@
++++ openssl-1.0.0-beta3/crypto/dsa/dsa_key.c	2009-09-30 17:01:34.000000000 +0200
+@@ -63,9 +63,53 @@
  #include <openssl/bn.h>
  #include <openssl/dsa.h>
  #include <openssl/rand.h>
@@ -917,26 +917,39 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
 +
 +int fips_check_dsa(DSA *dsa)
 +	{
-+	EVP_PKEY pk;
++	EVP_PKEY *pk;
 +	unsigned char tbs[] = "DSA Pairwise Check Data";
-+    	pk.type = EVP_PKEY_DSA;
-+    	pk.pkey.dsa = dsa;
++	int ret = 0;
++
++    	if ((pk=EVP_PKEY_new()) == NULL)
++		goto err;
++
++	EVP_PKEY_set1_DSA(pk, dsa);
++
++	if (!fips_pkey_signature_test(pk, tbs, -1,
++					NULL, 0, EVP_sha1(), 0, NULL))
++		goto err;
++
++	ret = 1;
 +
-+	if (!fips_pkey_signature_test(&pk, tbs, -1,
-+					NULL, 0, EVP_dss1(), 0, NULL))
++err:
++	if (ret == 0)
 +		{
-+		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
 +		fips_set_selftest_fail();
-+		return 0;
++		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
 +		}
-+	return 1;
++
++	if (pk)
++		EVP_PKEY_free(pk);
++
++	return ret;
 +	}
 +#endif
 +
  int DSA_generate_key(DSA *dsa)
  	{
  	if(dsa->meth->dsa_keygen)
-@@ -79,6 +110,14 @@ static int dsa_builtin_keygen(DSA *dsa)
+@@ -79,6 +123,14 @@ static int dsa_builtin_keygen(DSA *dsa)
  	BN_CTX *ctx=NULL;
  	BIGNUM *pub_key=NULL,*priv_key=NULL;
  
@@ -951,7 +964,7 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  	if ((ctx=BN_CTX_new()) == NULL) goto err;
  
  	if (dsa->priv_key == NULL)
-@@ -117,6 +156,15 @@ static int dsa_builtin_keygen(DSA *dsa)
+@@ -117,6 +169,15 @@ static int dsa_builtin_keygen(DSA *dsa)
  
  	dsa->priv_key=priv_key;
  	dsa->pub_key=pub_key;
@@ -969,7 +982,7 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  err:
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c.fips openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c
 --- openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c.fips	2007-03-28 02:15:26.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c	2009-09-30 13:25:58.000000000 +0200
 @@ -65,6 +65,9 @@
  #include <openssl/dsa.h>
  #include <openssl/rand.h>
@@ -1043,7 +1056,7 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  }
 diff -up openssl-1.0.0-beta3/crypto/err/err_all.c.fips openssl-1.0.0-beta3/crypto/err/err_all.c
 --- openssl-1.0.0-beta3/crypto/err/err_all.c.fips	2008-11-24 18:27:06.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/err/err_all.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/err/err_all.c	2009-09-30 13:25:58.000000000 +0200
 @@ -96,6 +96,9 @@
  #include <openssl/ocsp.h>
  #include <openssl/err.h>
@@ -1066,7 +1079,7 @@ diff -up openssl-1.0.0-beta3/crypto/err/
  #endif
 diff -up openssl-1.0.0-beta3/crypto/evp/digest.c.fips openssl-1.0.0-beta3/crypto/evp/digest.c
 --- openssl-1.0.0-beta3/crypto/evp/digest.c.fips	2008-11-04 13:06:09.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/digest.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/digest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -116,6 +116,7 @@
  #ifndef OPENSSL_NO_ENGINE
  #include <openssl/engine.h>
@@ -1167,7 +1180,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	ret=ctx->digest->final(ctx,md);
 diff -up openssl-1.0.0-beta3/crypto/evp/e_aes.c.fips openssl-1.0.0-beta3/crypto/evp/e_aes.c
 --- openssl-1.0.0-beta3/crypto/evp/e_aes.c.fips	2004-01-28 20:05:33.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/e_aes.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_aes.c	2009-09-30 13:25:58.000000000 +0200
 @@ -69,32 +69,29 @@ typedef struct
  
  IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,
@@ -1222,7 +1235,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  		   const unsigned char *iv, int enc)
 diff -up openssl-1.0.0-beta3/crypto/evp/e_camellia.c.fips openssl-1.0.0-beta3/crypto/evp/e_camellia.c
 --- openssl-1.0.0-beta3/crypto/evp/e_camellia.c.fips	2006-08-31 22:56:20.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/e_camellia.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_camellia.c	2009-09-30 13:25:58.000000000 +0200
 @@ -93,7 +93,7 @@ IMPLEMENT_BLOCK_CIPHER(camellia_256, ks,
  	EVP_CIPHER_get_asn1_iv,
  	NULL)
@@ -1234,7 +1247,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  IMPLEMENT_CAMELLIA_CFBR(192,1)
 diff -up openssl-1.0.0-beta3/crypto/evp/e_des3.c.fips openssl-1.0.0-beta3/crypto/evp/e_des3.c
 --- openssl-1.0.0-beta3/crypto/evp/e_des3.c.fips	2008-12-29 13:35:47.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/e_des3.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_des3.c	2009-09-30 13:25:58.000000000 +0200
 @@ -206,9 +206,9 @@ static int des_ede3_cfb8_cipher(EVP_CIPH
      }
  
@@ -1281,7 +1294,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 diff -up openssl-1.0.0-beta3/crypto/evp/e_null.c.fips openssl-1.0.0-beta3/crypto/evp/e_null.c
 --- openssl-1.0.0-beta3/crypto/evp/e_null.c.fips	2008-10-31 20:48:24.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/e_null.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_null.c	2009-09-30 13:25:58.000000000 +0200
 @@ -69,7 +69,7 @@ static const EVP_CIPHER n_cipher=
  	{
  	NID_undef,
@@ -1293,7 +1306,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	NULL,
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_enc.c.fips openssl-1.0.0-beta3/crypto/evp/evp_enc.c
 --- openssl-1.0.0-beta3/crypto/evp/evp_enc.c.fips	2008-11-12 04:58:00.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/evp_enc.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_enc.c	2009-09-30 13:25:58.000000000 +0200
 @@ -68,8 +68,53 @@
  
  const char EVP_version[]="EVP" OPENSSL_VERSION_PTEXT;
@@ -1388,7 +1401,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	}
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_err.c.fips openssl-1.0.0-beta3/crypto/evp/evp_err.c
 --- openssl-1.0.0-beta3/crypto/evp/evp_err.c.fips	2008-12-29 17:11:54.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/evp_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -154,6 +154,7 @@ static ERR_STRING_DATA EVP_str_reasons[]
  {ERR_REASON(EVP_R_DECODE_ERROR)          ,"decode error"},
  {ERR_REASON(EVP_R_DIFFERENT_KEY_TYPES)   ,"different key types"},
@@ -1398,8 +1411,8 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  {ERR_REASON(EVP_R_EVP_PBE_CIPHERINIT_ERROR),"evp pbe cipherinit error"},
  {ERR_REASON(EVP_R_EXPECTING_AN_RSA_KEY)  ,"expecting an rsa key"},
 diff -up openssl-1.0.0-beta3/crypto/evp/evp.h.fips openssl-1.0.0-beta3/crypto/evp/evp.h
---- openssl-1.0.0-beta3/crypto/evp/evp.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/evp.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/evp/evp.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp.h	2009-09-30 14:40:54.000000000 +0200
 @@ -75,6 +75,10 @@
  #include <openssl/bio.h>
  #endif
@@ -1431,7 +1444,18 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  #define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW	0x0008	/* Allow use of non FIPS digest
  						 * in FIPS mode */
  
-@@ -330,6 +332,14 @@ struct evp_cipher_st
+@@ -284,6 +286,10 @@ struct env_md_ctx_st
+ #define EVP_MD_CTX_FLAG_PAD_PKCS1	0x00	/* PKCS#1 v1.5 mode */
+ #define EVP_MD_CTX_FLAG_PAD_X931	0x10	/* X9.31 mode */
+ #define EVP_MD_CTX_FLAG_PAD_PSS		0x20	/* PSS mode */
++#define M_EVP_MD_CTX_FLAG_PSS_SALT(ctx) \
++		((ctx->flags>>16) &0xFFFF) /* seed length */
++#define EVP_MD_CTX_FLAG_PSS_MDLEN	0xFFFF	/* salt len same as digest */
++#define EVP_MD_CTX_FLAG_PSS_MREC	0xFFFE	/* salt max or auto recovered */
+ 
+ #define EVP_MD_CTX_FLAG_NO_INIT		0x0100 /* Don't initialize md_data */
+ 
+@@ -330,6 +336,14 @@ struct evp_cipher_st
  #define 	EVP_CIPH_NO_PADDING		0x100
  /* cipher handles random key generation */
  #define 	EVP_CIPH_RAND_KEY		0x200
@@ -1446,7 +1470,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  
  /* ctrl() values */
  
-@@ -507,6 +517,10 @@ int	EVP_BytesToKey(const EVP_CIPHER *typ
+@@ -507,6 +521,10 @@ int	EVP_BytesToKey(const EVP_CIPHER *typ
  		const unsigned char *salt, const unsigned char *data,
  		int datal, int count, unsigned char *key,unsigned char *iv);
  
@@ -1457,7 +1481,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  int	EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
  		const unsigned char *key, const unsigned char *iv);
  int	EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-@@ -1225,6 +1239,7 @@ void ERR_load_EVP_strings(void);
+@@ -1225,6 +1243,7 @@ void ERR_load_EVP_strings(void);
  #define EVP_R_DECODE_ERROR				 114
  #define EVP_R_DIFFERENT_KEY_TYPES			 101
  #define EVP_R_DIFFERENT_PARAMETERS			 153
@@ -1467,7 +1491,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  #define EVP_R_EXPECTING_AN_RSA_KEY			 127
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_lib.c.fips openssl-1.0.0-beta3/crypto/evp/evp_lib.c
 --- openssl-1.0.0-beta3/crypto/evp/evp_lib.c.fips	2009-04-10 12:30:27.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/evp_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -67,6 +67,8 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_
  
  	if (c->cipher->set_asn1_parameters != NULL)
@@ -1516,8 +1540,8 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
 +	return (ctx->flags & flags);
 +	}
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_locl.h.fips openssl-1.0.0-beta3/crypto/evp/evp_locl.h
---- openssl-1.0.0-beta3/crypto/evp/evp_locl.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/evp_locl.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/evp/evp_locl.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_locl.h	2009-09-30 13:25:58.000000000 +0200
 @@ -111,11 +111,11 @@ static int cname##_cbc_cipher(EVP_CIPHER
  static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
  {\
@@ -1567,24 +1591,24 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  
  struct evp_pkey_ctx_st
  	{
-diff -up openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss1.c
---- openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips	2006-04-19 19:05:57.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/m_dss1.c	2009-08-11 18:07:30.000000000 +0200
-@@ -82,7 +82,7 @@ static const EVP_MD dss1_md=
- 	NID_dsa,
- 	NID_dsaWithSHA1,
+diff -up openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss.c
+--- openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips	2006-04-19 19:05:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/m_dss.c	2009-09-30 13:25:58.000000000 +0200
+@@ -81,7 +81,7 @@ static const EVP_MD dsa_md=
+ 	NID_dsaWithSHA,
+ 	NID_dsaWithSHA,
  	SHA_DIGEST_LENGTH,
 -	EVP_MD_FLAG_PKEY_DIGEST,
 +	EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
  	init,
  	update,
  	final,
-diff -up openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss.c
---- openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips	2006-04-19 19:05:57.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/m_dss.c	2009-08-11 18:07:30.000000000 +0200
-@@ -81,7 +81,7 @@ static const EVP_MD dsa_md=
- 	NID_dsaWithSHA,
- 	NID_dsaWithSHA,
+diff -up openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss1.c
+--- openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips	2006-04-19 19:05:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/m_dss1.c	2009-09-30 13:25:58.000000000 +0200
+@@ -82,7 +82,7 @@ static const EVP_MD dss1_md=
+ 	NID_dsa,
+ 	NID_dsaWithSHA1,
  	SHA_DIGEST_LENGTH,
 -	EVP_MD_FLAG_PKEY_DIGEST,
 +	EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
@@ -1593,7 +1617,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	final,
 diff -up openssl-1.0.0-beta3/crypto/evp/m_sha1.c.fips openssl-1.0.0-beta3/crypto/evp/m_sha1.c
 --- openssl-1.0.0-beta3/crypto/evp/m_sha1.c.fips	2008-03-12 22:14:24.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/m_sha1.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/m_sha1.c	2009-09-30 13:25:58.000000000 +0200
 @@ -82,7 +82,8 @@ static const EVP_MD sha1_md=
  	NID_sha1,
  	NID_sha1WithRSAEncryption,
@@ -1646,7 +1670,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	final512,
 diff -up openssl-1.0.0-beta3/crypto/evp/names.c.fips openssl-1.0.0-beta3/crypto/evp/names.c
 --- openssl-1.0.0-beta3/crypto/evp/names.c.fips	2009-04-10 12:30:27.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/names.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/names.c	2009-09-30 13:25:58.000000000 +0200
 @@ -66,6 +66,10 @@ int EVP_add_cipher(const EVP_CIPHER *c)
  	{
  	int r;
@@ -1669,9 +1693,77 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	name=OBJ_nid2sn(md->type);
  	r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
  	if (r == 0) return(0);
+diff -up openssl-1.0.0-beta3/crypto/evp/p_sign.c.fips openssl-1.0.0-beta3/crypto/evp/p_sign.c
+--- openssl-1.0.0-beta3/crypto/evp/p_sign.c.fips	2006-05-24 15:29:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/p_sign.c	2009-09-30 15:07:14.000000000 +0200
+@@ -61,6 +61,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/objects.h>
+ #include <openssl/x509.h>
++#include <openssl/rsa.h>
+ 
+ #ifdef undef
+ void EVP_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
+@@ -101,6 +102,22 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsig
+ 			goto err;
+ 		if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
+ 			goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_X931)
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_X931_PADDING) <= 0)
++				goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_PSS)
++			{
++			int saltlen;
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_PKCS1_PSS_PADDING) <= 0)
++				goto err;
++			saltlen = M_EVP_MD_CTX_FLAG_PSS_SALT(ctx);
++			if (saltlen == EVP_MD_CTX_FLAG_PSS_MDLEN)
++				saltlen = -1;
++			else if (saltlen == EVP_MD_CTX_FLAG_PSS_MREC)
++				saltlen = -2;
++			if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkctx, saltlen) <= 0)
++				goto err;
++			}
+ 		if (EVP_PKEY_sign(pkctx, sigret, &sltmp, m, m_len) <= 0)
+ 			goto err;
+ 		*siglen = sltmp;
+diff -up openssl-1.0.0-beta3/crypto/evp/p_verify.c.fips openssl-1.0.0-beta3/crypto/evp/p_verify.c
+--- openssl-1.0.0-beta3/crypto/evp/p_verify.c.fips	2008-11-12 04:58:01.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/evp/p_verify.c	2009-09-30 15:07:27.000000000 +0200
+@@ -61,6 +61,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/objects.h>
+ #include <openssl/x509.h>
++#include <openssl/rsa.h>
+ 
+ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
+ 	     unsigned int siglen, EVP_PKEY *pkey)
+@@ -86,6 +87,22 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, con
+ 			goto err;
+ 		if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
+ 			goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_X931)
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_X931_PADDING) <= 0)
++				goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_PSS)
++			{
++			int saltlen;
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_PKCS1_PSS_PADDING) <= 0)
++				goto err;
++			saltlen = M_EVP_MD_CTX_FLAG_PSS_SALT(ctx);
++			if (saltlen == EVP_MD_CTX_FLAG_PSS_MDLEN)
++				saltlen = -1;
++			else if (saltlen == EVP_MD_CTX_FLAG_PSS_MREC)
++				saltlen = -2;
++			if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkctx, saltlen) <= 0)
++				goto err;
++			}
+ 		i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
+ 		err:
+ 		EVP_PKEY_CTX_free(pkctx);
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_aesavs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_aesavs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_aesavs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,939 @@
 +/* ====================================================================
 + * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
@@ -2613,8 +2705,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_desmovs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_desmovs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_desmovs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,702 @@
 +/* ====================================================================
 + * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
@@ -3319,8 +3411,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_dssvs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_dssvs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_dssvs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,537 @@
 +#include <openssl/opensslconf.h>
 +
@@ -3860,8 +3952,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rngvs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rngvs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rngvs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,230 @@
 +/*
 + * Crude test driver for processing the VST and MCT testvector files
@@ -4094,8 +4186,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsagtest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsagtest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsagtest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,390 @@
 +/* fips_rsagtest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -4488,8 +4580,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsastest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsastest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsastest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,370 @@
 +/* fips_rsastest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -4862,8 +4954,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +	}
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsavtest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsavtest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsavtest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,377 @@
 +/* fips_rsavtest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -5243,8 +5335,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +	}
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_shatest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_shatest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_shatest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,388 @@
 +/* fips_shatest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -5635,8 +5727,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_utl.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_utl.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_utl.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,343 @@
 +/* ====================================================================
 + * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
@@ -5982,8 +6074,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips_err.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips_err.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,7 @@
 +#include <openssl/opensslconf.h>
 +
@@ -5993,8 +6085,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +static void *dummy=&dummy;
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips_err.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips_err.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips_err.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,137 @@
 +/* crypto/fips_err.h */
 +/* ====================================================================
@@ -6134,8 +6226,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +	}
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_aes_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_aes_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_aes_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,101 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -6239,8 +6331,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,419 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -6662,8 +6754,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_des_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_des_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_des_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,137 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -6803,9 +6895,9 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_dsa_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_dsa_selftest.c	2009-08-11 18:07:30.000000000 +0200
-@@ -0,0 +1,180 @@
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_dsa_selftest.c	2009-09-30 13:25:58.000000000 +0200
+@@ -0,0 +1,184 @@
 +/* crypto/dsa/dsatest.c */
 +/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
 + * All rights reserved.
@@ -6923,13 +7015,13 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +int FIPS_selftest_dsa()
 +    {
-+    DSA *dsa=NULL;
++    DSA *dsa;
 +    int counter,i,j, ret = 0;
 +    unsigned int slen;
 +    unsigned char buf[256];
 +    unsigned long h;
 +    EVP_MD_CTX mctx;
-+    EVP_PKEY pk;
++    EVP_PKEY *pk = NULL;
 +
 +    EVP_MD_CTX_init(&mctx);
 +
@@ -6958,28 +7050,32 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    if (i != j || memcmp(buf,out_g,i) != 0)
 +	goto err;
 +    DSA_generate_key(dsa);
-+    pk.type = EVP_PKEY_DSA;
-+    pk.pkey.dsa = dsa;
++
++    if ((pk=EVP_PKEY_new()) == NULL)
++	goto err;
++    EVP_PKEY_assign_DSA(pk, dsa);
 +
 +    if (!EVP_SignInit_ex(&mctx, EVP_dss1(), NULL))
 +	goto err;
 +    if (!EVP_SignUpdate(&mctx, str1, 20))
 +	goto err;
-+    if (!EVP_SignFinal(&mctx, buf, &slen, &pk))
++    if (!EVP_SignFinal(&mctx, buf, &slen, pk))
 +	goto err;
 +
 +    if (!EVP_VerifyInit_ex(&mctx, EVP_dss1(), NULL))
 +	goto err;
 +    if (!EVP_VerifyUpdate(&mctx, str1, 20))
 +	goto err;
-+    if (EVP_VerifyFinal(&mctx, buf, slen, &pk) != 1)
++    if (EVP_VerifyFinal(&mctx, buf, slen, pk) != 1)
 +	goto err;
 +
 +    ret = 1;
 +
 +    err:
 +    EVP_MD_CTX_cleanup(&mctx);
-+    if (dsa)
++    if (pk)
++	EVP_PKEY_free(pk);
++    else if (dsa)
 +	DSA_free(dsa);
 +    if (ret == 0)
 +	    FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
@@ -6987,8 +7083,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,163 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -7154,8 +7250,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_hmac_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_hmac_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_hmac_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,135 @@
 +/* ====================================================================
 + * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
@@ -7293,8 +7389,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rand.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rand.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rand.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,410 @@
 +/* ====================================================================
 + * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
@@ -7707,8 +7803,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rand.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rand.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rand.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,77 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -7788,8 +7884,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rand_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rand_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rand_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,371 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -8163,8 +8259,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_randtest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_randtest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_randtest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,248 @@
 +/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
 + * All rights reserved.
@@ -8415,9 +8511,9 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rsa_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_selftest.c	2009-08-11 18:07:30.000000000 +0200
-@@ -0,0 +1,432 @@
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_selftest.c	2009-09-30 13:25:58.000000000 +0200
+@@ -0,0 +1,439 @@
 +/* ====================================================================
 + * Copyright (c) 2003-2007 The OpenSSL Project.  All rights reserved.
 + *
@@ -8759,83 +8855,87 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +int FIPS_selftest_rsa()
 +	{
 +	int ret = 0;
-+	RSA *key = NULL;
-+	EVP_PKEY pk;
-+	key=RSA_new();
++	RSA *key;
++	EVP_PKEY *pk = NULL;
++
++	if ((key=RSA_new()) == NULL)
++		goto err;
 +	setrsakey(key);
-+	pk.type = EVP_PKEY_RSA;
-+	pk.pkey.rsa = key;
++	if ((pk=EVP_PKEY_new()) == NULL)
++		goto err;
++
++	EVP_PKEY_assign_RSA(pk, key);
 +
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA1, sizeof(kat_RSA_SHA1),
 +				EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA1 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA224, sizeof(kat_RSA_SHA224),
 +				EVP_sha224(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA224 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA256, sizeof(kat_RSA_SHA256),
 +				EVP_sha256(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA256 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA384, sizeof(kat_RSA_SHA384),
 +				EVP_sha384(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA384 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA512, sizeof(kat_RSA_SHA512),
 +				EVP_sha512(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA512 PKCS#1"))
 +		goto err;
 +
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA1, sizeof(kat_RSA_PSS_SHA1),
 +				EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA1 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA224, sizeof(kat_RSA_PSS_SHA224),
 +				EVP_sha224(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA224 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA256, sizeof(kat_RSA_PSS_SHA256),
 +				EVP_sha256(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA256 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA384, sizeof(kat_RSA_PSS_SHA384),
 +				EVP_sha384(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA384 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA512, sizeof(kat_RSA_PSS_SHA512),
 +				EVP_sha512(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA512 PSS"))
 +		goto err;
 +
 +
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA1, sizeof(kat_RSA_X931_SHA1),
 +			EVP_sha1(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA1 X931"))
 +		goto err;
 +	/* NB: SHA224 not supported in X9.31 */
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA256, sizeof(kat_RSA_X931_SHA256),
 +			EVP_sha256(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA256 X931"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA384, sizeof(kat_RSA_X931_SHA384),
 +			EVP_sha384(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA384 X931"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA512, sizeof(kat_RSA_X931_SHA512),
 +			EVP_sha512(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA512 X931"))
@@ -8845,14 +8945,17 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +	ret = 1;
 +
 +	err:
-+	RSA_free(key);
++	if (pk)
++		EVP_PKEY_free(pk);
++	else if (key)
++		RSA_free(key);
 +	return ret;
 +	}
 +
 +#endif /* def OPENSSL_FIPS */
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rsa_x931g.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_x931g.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_x931g.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,281 @@
 +/* crypto/rsa/rsa_gen.c */
 +/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
@@ -9136,8 +9239,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +	}
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_sha1_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_sha1_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_sha1_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,97 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -9237,8 +9340,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,173 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -9414,8 +9517,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_test_suite.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_test_suite.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_test_suite.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,588 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10006,8 +10109,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips_locl.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips_locl.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips_locl.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,72 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10082,8 +10185,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/Makefile
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/Makefile	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,81 @@
 +#
 +# OpenSSL/crypto/fips/Makefile
@@ -10168,7 +10271,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 diff -up openssl-1.0.0-beta3/crypto/hmac/hmac.c.fips openssl-1.0.0-beta3/crypto/hmac/hmac.c
 --- openssl-1.0.0-beta3/crypto/hmac/hmac.c.fips	2008-11-12 04:58:02.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/hmac/hmac.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/hmac/hmac.c	2009-09-30 13:25:58.000000000 +0200
 @@ -77,6 +77,13 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const vo
  
  	if (key != NULL)
@@ -10195,8 +10298,8 @@ diff -up openssl-1.0.0-beta3/crypto/hmac
 +	}
 +
 diff -up openssl-1.0.0-beta3/crypto/hmac/hmac.h.fips openssl-1.0.0-beta3/crypto/hmac/hmac.h
---- openssl-1.0.0-beta3/crypto/hmac/hmac.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/hmac/hmac.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/hmac/hmac.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/hmac/hmac.h	2009-09-30 13:25:58.000000000 +0200
 @@ -101,6 +101,7 @@ unsigned char *HMAC(const EVP_MD *evp_md
  		    unsigned int *md_len);
  int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
@@ -10207,7 +10310,7 @@ diff -up openssl-1.0.0-beta3/crypto/hmac
  }
 diff -up openssl-1.0.0-beta3/crypto/Makefile.fips openssl-1.0.0-beta3/crypto/Makefile
 --- openssl-1.0.0-beta3/crypto/Makefile.fips	2009-04-06 16:31:35.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/Makefile	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -34,14 +34,14 @@ GENERAL=Makefile README crypto-lib.com i
  
  LIB= $(TOP)/libcrypto.a
@@ -10226,9 +10329,47 @@ diff -up openssl-1.0.0-beta3/crypto/Make
  
  ALL=    $(GENERAL) $(SRC) $(HEADER)
  
+diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c
+--- openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips	2004-07-25 21:10:41.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c	2009-09-30 13:25:58.000000000 +0200
+@@ -61,6 +61,11 @@
+ #include <string.h>
+ #include <openssl/des.h>
+ #include <openssl/mdc2.h>
++#include <openssl/err.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
+ 
+ #undef c2l
+ #define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
+@@ -75,7 +80,7 @@
+ 			*((c)++)=(unsigned char)(((l)>>24L)&0xff))
+ 
+ static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
+-int MDC2_Init(MDC2_CTX *c)
++FIPS_NON_FIPS_MD_Init(MDC2)
+ 	{
+ 	c->num=0;
+ 	c->pad_type=1;
+diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2.h
+--- openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/mdc2/mdc2.h	2009-09-30 13:25:58.000000000 +0200
+@@ -80,7 +80,9 @@ typedef struct mdc2_ctx_st
+ 	int pad_type; /* either 1 or 2, default 1 */
+ 	} MDC2_CTX;
+ 
+-
++#ifdef OPENSSL_FIPS
++int private_MDC2_Init(MDC2_CTX *c);
++#endif
+ int MDC2_Init(MDC2_CTX *c);
+ int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
+ int MDC2_Final(unsigned char *md, MDC2_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/md2/md2_dgst.c.fips openssl-1.0.0-beta3/crypto/md2/md2_dgst.c
 --- openssl-1.0.0-beta3/crypto/md2/md2_dgst.c.fips	2007-08-31 12:12:35.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md2/md2_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md2/md2_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -62,6 +62,11 @@
  #include <openssl/md2.h>
  #include <openssl/opensslv.h>
@@ -10251,8 +10392,8 @@ diff -up openssl-1.0.0-beta3/crypto/md2/
  	c->num=0;
  	memset(c->state,0,sizeof c->state);
 diff -up openssl-1.0.0-beta3/crypto/md2/md2.h.fips openssl-1.0.0-beta3/crypto/md2/md2.h
---- openssl-1.0.0-beta3/crypto/md2/md2.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md2/md2.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/md2/md2.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md2/md2.h	2009-09-30 13:25:58.000000000 +0200
 @@ -81,6 +81,9 @@ typedef struct MD2state_st
  	} MD2_CTX;
  
@@ -10265,7 +10406,7 @@ diff -up openssl-1.0.0-beta3/crypto/md2/
  int MD2_Final(unsigned char *md, MD2_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/md4/md4_dgst.c.fips openssl-1.0.0-beta3/crypto/md4/md4_dgst.c
 --- openssl-1.0.0-beta3/crypto/md4/md4_dgst.c.fips	2007-01-21 14:07:11.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/md4/md4_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md4/md4_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <stdio.h>
  #include "md4_locl.h"
@@ -10288,8 +10429,8 @@ diff -up openssl-1.0.0-beta3/crypto/md4/
  	memset (c,0,sizeof(*c));
  	c->A=INIT_DATA_A;
 diff -up openssl-1.0.0-beta3/crypto/md4/md4.h.fips openssl-1.0.0-beta3/crypto/md4/md4.h
---- openssl-1.0.0-beta3/crypto/md4/md4.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md4/md4.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/md4/md4.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md4/md4.h	2009-09-30 13:25:58.000000000 +0200
 @@ -105,6 +105,9 @@ typedef struct MD4state_st
  	unsigned int num;
  	} MD4_CTX;
@@ -10302,7 +10443,7 @@ diff -up openssl-1.0.0-beta3/crypto/md4/
  int MD4_Final(unsigned char *md, MD4_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/md5/md5_dgst.c.fips openssl-1.0.0-beta3/crypto/md5/md5_dgst.c
 --- openssl-1.0.0-beta3/crypto/md5/md5_dgst.c.fips	2007-01-21 14:07:11.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/md5/md5_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md5/md5_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <stdio.h>
  #include "md5_locl.h"
@@ -10325,8 +10466,8 @@ diff -up openssl-1.0.0-beta3/crypto/md5/
  	memset (c,0,sizeof(*c));
  	c->A=INIT_DATA_A;
 diff -up openssl-1.0.0-beta3/crypto/md5/md5.h.fips openssl-1.0.0-beta3/crypto/md5/md5.h
---- openssl-1.0.0-beta3/crypto/md5/md5.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md5/md5.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/md5/md5.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md5/md5.h	2009-09-30 13:25:58.000000000 +0200
 @@ -105,6 +105,9 @@ typedef struct MD5state_st
  	unsigned int num;
  	} MD5_CTX;
@@ -10337,47 +10478,9 @@ diff -up openssl-1.0.0-beta3/crypto/md5/
  int MD5_Init(MD5_CTX *c);
  int MD5_Update(MD5_CTX *c, const void *data, size_t len);
  int MD5_Final(unsigned char *md, MD5_CTX *c);
-diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c
---- openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips	2004-07-25 21:10:41.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c	2009-08-11 18:07:30.000000000 +0200
-@@ -61,6 +61,11 @@
- #include <string.h>
- #include <openssl/des.h>
- #include <openssl/mdc2.h>
-+#include <openssl/err.h>
-+#ifdef OPENSSL_FIPS
-+#include <openssl/fips.h>
-+#endif
-+
- 
- #undef c2l
- #define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
-@@ -75,7 +80,7 @@
- 			*((c)++)=(unsigned char)(((l)>>24L)&0xff))
- 
- static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
--int MDC2_Init(MDC2_CTX *c)
-+FIPS_NON_FIPS_MD_Init(MDC2)
- 	{
- 	c->num=0;
- 	c->pad_type=1;
-diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2.h
---- openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/mdc2/mdc2.h	2009-08-11 18:07:30.000000000 +0200
-@@ -80,7 +80,9 @@ typedef struct mdc2_ctx_st
- 	int pad_type; /* either 1 or 2, default 1 */
- 	} MDC2_CTX;
- 
--
-+#ifdef OPENSSL_FIPS
-+int private_MDC2_Init(MDC2_CTX *c);
-+#endif
- int MDC2_Init(MDC2_CTX *c);
- int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
- int MDC2_Final(unsigned char *md, MDC2_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/mem.c.fips openssl-1.0.0-beta3/crypto/mem.c
 --- openssl-1.0.0-beta3/crypto/mem.c.fips	2008-11-12 04:57:47.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/mem.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/mem.c	2009-09-30 13:25:58.000000000 +0200
 @@ -101,7 +101,7 @@ static void (*free_locked_func)(void *) 
  
  /* may be changed as long as 'allow_customize_debug' is set */
@@ -10388,8 +10491,8 @@ diff -up openssl-1.0.0-beta3/crypto/mem.
  static void (*malloc_debug_func)(void *,int,const char *,int,int)
  	= CRYPTO_dbg_malloc;
 diff -up /dev/null openssl-1.0.0-beta3/crypto/o_init.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/o_init.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/o_init.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,80 @@
 +/* o_init.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -10473,7 +10576,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 diff -up openssl-1.0.0-beta3/crypto/opensslconf.h.in.fips openssl-1.0.0-beta3/crypto/opensslconf.h.in
 --- openssl-1.0.0-beta3/crypto/opensslconf.h.in.fips	2005-12-16 11:37:23.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/opensslconf.h.in	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/opensslconf.h.in	2009-09-30 13:25:58.000000000 +0200
 @@ -1,5 +1,20 @@
  /* crypto/opensslconf.h.in */
  
@@ -10497,7 +10600,7 @@ diff -up openssl-1.0.0-beta3/crypto/open
  
 diff -up openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c.fips openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c
 --- openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c.fips	2009-03-09 14:08:04.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,10 @@
  #include <stdio.h>
  #include "cryptlib.h"
@@ -10526,7 +10629,7 @@ diff -up openssl-1.0.0-beta3/crypto/pkcs
  	if (!iter)
 diff -up openssl-1.0.0-beta3/crypto/rand/md_rand.c.fips openssl-1.0.0-beta3/crypto/rand/md_rand.c
 --- openssl-1.0.0-beta3/crypto/rand/md_rand.c.fips	2009-01-03 10:25:32.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rand/md_rand.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/md_rand.c	2009-09-30 13:25:58.000000000 +0200
 @@ -126,6 +126,10 @@
  
  #include <openssl/crypto.h>
@@ -10555,7 +10658,7 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  		{
 diff -up openssl-1.0.0-beta3/crypto/rand/rand_err.c.fips openssl-1.0.0-beta3/crypto/rand/rand_err.c
 --- openssl-1.0.0-beta3/crypto/rand/rand_err.c.fips	2006-11-21 22:29:41.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rand/rand_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/rand_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -70,6 +70,13 @@
  
  static ERR_STRING_DATA RAND_str_functs[]=
@@ -10589,8 +10692,8 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  	};
  
 diff -up openssl-1.0.0-beta3/crypto/rand/rand.h.fips openssl-1.0.0-beta3/crypto/rand/rand.h
---- openssl-1.0.0-beta3/crypto/rand/rand.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rand/rand.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rand/rand.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/rand.h	2009-09-30 13:25:58.000000000 +0200
 @@ -128,11 +128,28 @@ void ERR_load_RAND_strings(void);
  /* Error codes for the RAND functions. */
  
@@ -10622,7 +10725,7 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  }
 diff -up openssl-1.0.0-beta3/crypto/rand/rand_lib.c.fips openssl-1.0.0-beta3/crypto/rand/rand_lib.c
 --- openssl-1.0.0-beta3/crypto/rand/rand_lib.c.fips	2008-11-12 04:58:04.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rand/rand_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/rand_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -60,6 +60,12 @@
  #include <time.h>
  #include "cryptlib.h"
@@ -10657,8 +10760,8 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  	}
  
 diff -up openssl-1.0.0-beta3/crypto/rc2/rc2.h.fips openssl-1.0.0-beta3/crypto/rc2/rc2.h
---- openssl-1.0.0-beta3/crypto/rc2/rc2.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc2/rc2.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rc2/rc2.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc2/rc2.h	2009-09-30 13:25:58.000000000 +0200
 @@ -79,7 +79,9 @@ typedef struct rc2_key_st
  	RC2_INT data[64];
  	} RC2_KEY;
@@ -10672,7 +10775,7 @@ diff -up openssl-1.0.0-beta3/crypto/rc2/
  		     int enc);
 diff -up openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c.fips openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c
 --- openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c.fips	2007-09-18 23:10:32.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -57,6 +57,11 @@
   */
  
@@ -10706,9 +10809,31 @@ diff -up openssl-1.0.0-beta3/crypto/rc2/
  	int i,j;
  	unsigned char *k;
  	RC2_INT *ki;
+diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl
+--- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips	2009-02-12 15:48:49.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl	2009-09-30 13:25:58.000000000 +0200
+@@ -202,4 +202,6 @@ RC4_options:
+ .string	"rc4(8x,char)"
+ ___
+ 
++$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
++
+ print $code;
+diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl
+--- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips	2009-04-27 21:31:04.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl	2009-09-30 13:25:58.000000000 +0200
+@@ -499,6 +499,8 @@ ___
+ 
+ $code =~ s/#([bwd])/$1/gm;
+ 
++$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
++
+ print $code;
+ 
+ close STDOUT;
 diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl
 --- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl.fips	2007-12-02 22:32:03.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl	2009-09-30 13:25:58.000000000 +0200
 @@ -166,8 +166,12 @@ $idx="edx";
  
  &external_label("OPENSSL_ia32cap_P");
@@ -10732,31 +10857,9 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  
  # const char *RC4_options(void);
  &function_begin_B("RC4_options");
-diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl
---- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips	2009-02-12 15:48:49.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl	2009-08-11 18:07:30.000000000 +0200
-@@ -202,4 +202,6 @@ RC4_options:
- .string	"rc4(8x,char)"
- ___
- 
-+$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
-+
- print $code;
-diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl
---- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips	2009-04-27 21:31:04.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl	2009-08-11 18:07:30.000000000 +0200
-@@ -499,6 +499,8 @@ ___
- 
- $code =~ s/#([bwd])/$1/gm;
- 
-+$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
-+
- print $code;
- 
- close STDOUT;
 diff -up openssl-1.0.0-beta3/crypto/rc4/Makefile.fips openssl-1.0.0-beta3/crypto/rc4/Makefile
 --- openssl-1.0.0-beta3/crypto/rc4/Makefile.fips	2009-02-11 11:01:36.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/Makefile	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -21,8 +21,8 @@ TEST=rc4test.c
  APPS=
  
@@ -10769,8 +10872,8 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  SRC= $(LIBSRC)
  
 diff -up /dev/null openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,75 @@
 +/* crypto/rc4/rc4_fblk.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -10848,8 +10951,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +
 diff -up openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips openssl-1.0.0-beta3/crypto/rc4/rc4.h
---- openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc4/rc4.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/rc4.h	2009-09-30 13:25:58.000000000 +0200
 @@ -78,6 +78,9 @@ typedef struct rc4_key_st
  
   
@@ -10862,7 +10965,7 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  		unsigned char *outdata);
 diff -up openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c
 --- openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips	2007-01-21 14:07:13.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <openssl/rc4.h>
  #include "rc4_locl.h"
@@ -10901,8 +11004,8 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  
  			for (i=0;i<256;i++) cp[i]=i;
 diff -up openssl-1.0.0-beta3/crypto/ripemd/ripemd.h.fips openssl-1.0.0-beta3/crypto/ripemd/ripemd.h
---- openssl-1.0.0-beta3/crypto/ripemd/ripemd.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/ripemd/ripemd.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/ripemd/ripemd.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/ripemd/ripemd.h	2009-09-30 13:25:58.000000000 +0200
 @@ -91,6 +91,9 @@ typedef struct RIPEMD160state_st
  	unsigned int   num;
  	} RIPEMD160_CTX;
@@ -10915,7 +11018,7 @@ diff -up openssl-1.0.0-beta3/crypto/ripe
  int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c.fips openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c
 --- openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c.fips	2007-01-21 14:07:13.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <stdio.h>
  #include "rmd_locl.h"
@@ -10939,7 +11042,7 @@ diff -up openssl-1.0.0-beta3/crypto/ripe
  	c->A=RIPEMD160_A;
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c.fips	2008-09-14 15:51:44.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c	2009-09-30 13:25:58.000000000 +0200
 @@ -114,6 +114,8 @@
  #include <openssl/bn.h>
  #include <openssl/rsa.h>
@@ -11200,7 +11303,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  	}
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_err.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_err.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_err.c.fips	2008-12-29 17:11:56.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -111,8 +111,12 @@ static ERR_STRING_DATA RSA_str_functs[]=
  {ERR_FUNC(RSA_F_RSA_PRINT_FP),	"RSA_print_fp"},
  {ERR_FUNC(RSA_F_RSA_PRIV_DECODE),	"RSA_PRIV_DECODE"},
@@ -11229,8 +11332,8 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  {ERR_REASON(RSA_R_P_NOT_PRIME)           ,"p not prime"},
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c.fips	2007-03-28 02:15:27.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c	2009-08-11 18:07:30.000000000 +0200
-@@ -67,6 +67,77 @@
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c	2009-09-30 16:55:26.000000000 +0200
+@@ -67,6 +67,82 @@
  #include "cryptlib.h"
  #include <openssl/bn.h>
  #include <openssl/rsa.h>
@@ -11252,16 +11355,19 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
 +	const unsigned char tbs[] = "RSA Pairwise Check Data";
 +	unsigned char *ctbuf = NULL, *ptbuf = NULL;
 +	int len, ret = 0;
-+	EVP_PKEY pk;
-+    	pk.type = EVP_PKEY_RSA;
-+    	pk.pkey.rsa = rsa;
++	EVP_PKEY *pk;
++
++	if ((pk=EVP_PKEY_new()) == NULL)
++		goto err;
++
++	EVP_PKEY_set1_RSA(pk, rsa);
 +
 +	/* Perform pairwise consistency signature test */
-+	if (!fips_pkey_signature_test(&pk, tbs, -1,
++	if (!fips_pkey_signature_test(pk, tbs, -1,
 +			NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PKCS1, NULL)
-+		|| !fips_pkey_signature_test(&pk, tbs, -1,
++		|| !fips_pkey_signature_test(pk, tbs, -1,
 +			NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_X931, NULL)
-+		|| !fips_pkey_signature_test(&pk, tbs, -1,
++		|| !fips_pkey_signature_test(pk, tbs, -1,
 +			NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PSS, NULL))
 +		goto err;
 +	/* Now perform pairwise consistency encrypt/decrypt test */
@@ -11301,6 +11407,8 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
 +		OPENSSL_free(ctbuf);
 +	if (ptbuf)
 +		OPENSSL_free(ptbuf);
++	if (pk)
++		EVP_PKEY_free(pk);
 +
 +	return ret;
 +	}
@@ -11308,7 +11416,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  
  static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb);
  
-@@ -90,6 +161,23 @@ static int rsa_builtin_keygen(RSA *rsa, 
+@@ -90,6 +166,23 @@ static int rsa_builtin_keygen(RSA *rsa, 
  	int bitsp,bitsq,ok= -1,n=0;
  	BN_CTX *ctx=NULL;
  
@@ -11332,7 +11440,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  	ctx=BN_CTX_new();
  	if (ctx == NULL) goto err;
  	BN_CTX_start(ctx);
-@@ -201,6 +289,17 @@ static int rsa_builtin_keygen(RSA *rsa, 
+@@ -201,6 +294,17 @@ static int rsa_builtin_keygen(RSA *rsa, 
  		p = rsa->p;
  	if (!BN_mod_inverse(rsa->iqmp,rsa->q,p,ctx)) goto err;
  
@@ -11351,8 +11459,8 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  err:
  	if (ok == -1)
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa.h.fips openssl-1.0.0-beta3/crypto/rsa/rsa.h
---- openssl-1.0.0-beta3/crypto/rsa/rsa.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rsa/rsa.h.fips	2009-09-30 13:25:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa.h	2009-09-30 13:25:58.000000000 +0200
 @@ -74,6 +74,21 @@
  #error RSA is disabled.
  #endif
@@ -11424,7 +11532,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  #define RSA_R_P_NOT_PRIME				 128
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c.fips	2008-08-06 17:54:14.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -80,6 +80,13 @@ RSA *RSA_new(void)
  
  void RSA_set_default_method(const RSA_METHOD *meth)
@@ -11556,7 +11664,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
 -	}
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c.fips	2007-04-24 03:05:42.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c	2009-09-30 13:25:58.000000000 +0200
 @@ -130,7 +130,8 @@ int RSA_sign(int type, const unsigned ch
  		i2d_X509_SIG(&sig,&p);
  		s=tmps;
@@ -11588,9 +11696,57 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  
  	if (i <= 0) goto err;
  
+diff -up openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips openssl-1.0.0-beta3/crypto/sha/sha_dgst.c
+--- openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips	2007-01-21 14:07:14.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/sha/sha_dgst.c	2009-09-30 13:25:58.000000000 +0200
+@@ -57,6 +57,12 @@
+  */
+ 
+ #include <openssl/opensslconf.h>
++#include <openssl/crypto.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
++#include <openssl/err.h>
+ #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
+ 
+ #undef  SHA_1
+diff -up openssl-1.0.0-beta3/crypto/sha/sha.h.fips openssl-1.0.0-beta3/crypto/sha/sha.h
+--- openssl-1.0.0-beta3/crypto/sha/sha.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha.h	2009-09-30 13:25:58.000000000 +0200
+@@ -106,6 +106,9 @@ typedef struct SHAstate_st
+ 	} SHA_CTX;
+ 
+ #ifndef OPENSSL_NO_SHA0
++#ifdef OPENSSL_FIPS
++int private_SHA_Init(SHA_CTX *c);
++#endif
+ int SHA_Init(SHA_CTX *c);
+ int SHA_Update(SHA_CTX *c, const void *data, size_t len);
+ int SHA_Final(unsigned char *md, SHA_CTX *c);
+diff -up openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips openssl-1.0.0-beta3/crypto/sha/sha_locl.h
+--- openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha_locl.h	2009-09-30 13:25:58.000000000 +0200
+@@ -122,8 +122,15 @@ void sha1_block_data_order (SHA_CTX *c, 
+ #define INIT_DATA_h3 0x10325476UL
+ #define INIT_DATA_h4 0xc3d2e1f0UL
+ 
++#if defined(SHA_0) && defined(OPENSSL_FIPS)
++FIPS_NON_FIPS_MD_Init(SHA)
++#else
+ int HASH_INIT (SHA_CTX *c)
++#endif
+ 	{
++#if defined(SHA_1) && defined(OPENSSL_FIPS)
++	FIPS_selftest_check();
++#endif
+ 	memset (c,0,sizeof(*c));
+ 	c->h0=INIT_DATA_h0;
+ 	c->h1=INIT_DATA_h1;
 diff -up openssl-1.0.0-beta3/crypto/sha/sha1dgst.c.fips openssl-1.0.0-beta3/crypto/sha/sha1dgst.c
 --- openssl-1.0.0-beta3/crypto/sha/sha1dgst.c.fips	2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha1dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha1dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -63,6 +63,10 @@
  #define SHA_1
  
@@ -11604,7 +11760,7 @@ diff -up openssl-1.0.0-beta3/crypto/sha/
  
 diff -up openssl-1.0.0-beta3/crypto/sha/sha256.c.fips openssl-1.0.0-beta3/crypto/sha/sha256.c
 --- openssl-1.0.0-beta3/crypto/sha/sha256.c.fips	2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha256.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha256.c	2009-09-30 13:25:58.000000000 +0200
 @@ -12,12 +12,19 @@
  
  #include <openssl/crypto.h>
@@ -11637,7 +11793,7 @@ diff -up openssl-1.0.0-beta3/crypto/sha/
  	c->h[2]=0x3c6ef372UL;	c->h[3]=0xa54ff53aUL;
 diff -up openssl-1.0.0-beta3/crypto/sha/sha512.c.fips openssl-1.0.0-beta3/crypto/sha/sha512.c
 --- openssl-1.0.0-beta3/crypto/sha/sha512.c.fips	2008-12-29 13:35:48.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha512.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha512.c	2009-09-30 13:25:58.000000000 +0200
 @@ -5,6 +5,10 @@
   * ====================================================================
   */
@@ -11678,57 +11834,9 @@ diff -up openssl-1.0.0-beta3/crypto/sha/
  				asm ("rotrdi %0,%1,%2"	\
  				: "=r"(ret)		\
  				: "r"(a),"K"(n)); ret;	})
-diff -up openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips openssl-1.0.0-beta3/crypto/sha/sha_dgst.c
---- openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips	2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha_dgst.c	2009-08-11 18:07:30.000000000 +0200
-@@ -57,6 +57,12 @@
-  */
- 
- #include <openssl/opensslconf.h>
-+#include <openssl/crypto.h>
-+#ifdef OPENSSL_FIPS
-+#include <openssl/fips.h>
-+#endif
-+
-+#include <openssl/err.h>
- #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
- 
- #undef  SHA_1
-diff -up openssl-1.0.0-beta3/crypto/sha/sha.h.fips openssl-1.0.0-beta3/crypto/sha/sha.h
---- openssl-1.0.0-beta3/crypto/sha/sha.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/sha/sha.h	2009-08-11 18:07:30.000000000 +0200
-@@ -106,6 +106,9 @@ typedef struct SHAstate_st
- 	} SHA_CTX;
- 
- #ifndef OPENSSL_NO_SHA0
-+#ifdef OPENSSL_FIPS
-+int private_SHA_Init(SHA_CTX *c);
-+#endif
- int SHA_Init(SHA_CTX *c);
- int SHA_Update(SHA_CTX *c, const void *data, size_t len);
- int SHA_Final(unsigned char *md, SHA_CTX *c);
-diff -up openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips openssl-1.0.0-beta3/crypto/sha/sha_locl.h
---- openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/sha/sha_locl.h	2009-08-11 18:07:30.000000000 +0200
-@@ -122,8 +122,15 @@ void sha1_block_data_order (SHA_CTX *c, 
- #define INIT_DATA_h3 0x10325476UL
- #define INIT_DATA_h4 0xc3d2e1f0UL
- 
-+#if defined(SHA_0) && defined(OPENSSL_FIPS)
-+FIPS_NON_FIPS_MD_Init(SHA)
-+#else
- int HASH_INIT (SHA_CTX *c)
-+#endif
- 	{
-+#if defined(SHA_1) && defined(OPENSSL_FIPS)
-+	FIPS_selftest_check();
-+#endif
- 	memset (c,0,sizeof(*c));
- 	c->h0=INIT_DATA_h0;
- 	c->h1=INIT_DATA_h1;
 diff -up openssl-1.0.0-beta3/Makefile.org.fips openssl-1.0.0-beta3/Makefile.org
---- openssl-1.0.0-beta3/Makefile.org.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/Makefile.org	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/Makefile.org.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/Makefile.org	2009-09-30 13:25:58.000000000 +0200
 @@ -109,6 +109,9 @@ LIBKRB5=
  ZLIB_INCLUDE=
  LIBZLIB=
@@ -11756,124 +11864,9 @@ diff -up openssl-1.0.0-beta3/Makefile.or
  		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
  # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
  # which in turn eliminates ambiguities in variable treatment with -e.
-diff -up openssl-1.0.0-beta3/ssl/s23_clnt.c.fips openssl-1.0.0-beta3/ssl/s23_clnt.c
---- openssl-1.0.0-beta3/ssl/s23_clnt.c.fips	2009-04-07 19:01:07.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s23_clnt.c	2009-08-11 18:07:30.000000000 +0200
-@@ -332,6 +332,14 @@ static int ssl23_client_hello(SSL *s)
- 			version_major = TLS1_VERSION_MAJOR;
- 			version_minor = TLS1_VERSION_MINOR;
- 			}
-+#ifdef OPENSSL_FIPS
-+		else if(FIPS_mode())
-+			{
-+			SSLerr(SSL_F_SSL23_CLIENT_HELLO,
-+					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
-+			return -1;
-+			}
-+#endif
- 		else if (version == SSL3_VERSION)
- 			{
- 			version_major = SSL3_VERSION_MAJOR;
-@@ -615,6 +623,14 @@ static int ssl23_get_server_hello(SSL *s
- 		if ((p[2] == SSL3_VERSION_MINOR) &&
- 			!(s->options & SSL_OP_NO_SSLv3))
- 			{
-+#ifdef OPENSSL_FIPS
-+			if(FIPS_mode())
-+				{
-+				SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,
-+					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
-+				goto err;
-+				}
-+#endif
- 			s->version=SSL3_VERSION;
- 			s->method=SSLv3_client_method();
- 			}
-diff -up openssl-1.0.0-beta3/ssl/s23_srvr.c.fips openssl-1.0.0-beta3/ssl/s23_srvr.c
---- openssl-1.0.0-beta3/ssl/s23_srvr.c.fips	2008-06-03 04:48:34.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s23_srvr.c	2009-08-11 18:07:30.000000000 +0200
-@@ -386,6 +386,15 @@ int ssl23_get_client_hello(SSL *s)
- 			}
- 		}
- 
-+#ifdef OPENSSL_FIPS
-+	if (FIPS_mode() && (s->version < TLS1_VERSION))
-+		{
-+		SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
-+					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
-+		goto err;
-+		}
-+#endif
-+
- 	if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
- 		{
- 		/* we have SSLv3/TLSv1 in an SSLv2 header
-diff -up openssl-1.0.0-beta3/ssl/s3_clnt.c.fips openssl-1.0.0-beta3/ssl/s3_clnt.c
---- openssl-1.0.0-beta3/ssl/s3_clnt.c.fips	2009-06-16 18:39:20.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s3_clnt.c	2009-08-11 18:07:30.000000000 +0200
-@@ -156,6 +156,10 @@
- #include <openssl/objects.h>
- #include <openssl/evp.h>
- #include <openssl/md5.h>
-+#ifdef OPENSSL_FIPS
-+#include <openssl/fips.h>
-+#endif
-+
- #ifndef OPENSSL_NO_DH
- #include <openssl/dh.h>
- #endif
-@@ -1524,6 +1528,8 @@ int ssl3_get_key_exchange(SSL *s)
- 			q=md_buf;
- 			for (num=2; num > 0; num--)
- 				{
-+				EVP_MD_CTX_set_flags(&md_ctx,
-+					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 				EVP_DigestInit_ex(&md_ctx,(num == 2)
- 					?s->ctx->md5:s->ctx->sha1, NULL);
- 				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-diff -up openssl-1.0.0-beta3/ssl/s3_enc.c.fips openssl-1.0.0-beta3/ssl/s3_enc.c
---- openssl-1.0.0-beta3/ssl/s3_enc.c.fips	2009-04-16 19:22:50.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s3_enc.c	2009-08-11 18:07:30.000000000 +0200
-@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
- #endif
- 	k=0;
- 	EVP_MD_CTX_init(&m5);
-+	EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 	EVP_MD_CTX_init(&s1);
- 	for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
- 		{
-@@ -614,6 +615,8 @@ int ssl3_digest_cached_records(SSL *s)
- 		if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
- 			{
- 			s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
-+			EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
-+				EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 			EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
- 			EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
- 			} 
-@@ -670,6 +673,7 @@ static int ssl3_handshake_mac(SSL *s, in
- 		return 0;
- 	}	
- 	EVP_MD_CTX_init(&ctx);
-+	EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 	EVP_MD_CTX_copy_ex(&ctx,d);
- 	n=EVP_MD_CTX_size(&ctx);
- 	if (n < 0)
-diff -up openssl-1.0.0-beta3/ssl/s3_srvr.c.fips openssl-1.0.0-beta3/ssl/s3_srvr.c
---- openssl-1.0.0-beta3/ssl/s3_srvr.c.fips	2009-06-26 17:04:22.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s3_srvr.c	2009-08-11 18:07:30.000000000 +0200
-@@ -1674,6 +1674,8 @@ int ssl3_send_server_key_exchange(SSL *s
- 				j=0;
- 				for (num=2; num > 0; num--)
- 					{
-+					EVP_MD_CTX_set_flags(&md_ctx,
-+						EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 					EVP_DigestInit_ex(&md_ctx,(num == 2)
- 						?s->ctx->md5:s->ctx->sha1, NULL);
- 					EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips openssl-1.0.0-beta3/ssl/ssl_ciph.c
 --- openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips	2009-04-07 14:10:59.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-09-30 13:25:58.000000000 +0200
 @@ -727,6 +727,9 @@ static void ssl_cipher_collect_ciphers(c
  		    !(c->algorithm_auth & disabled_auth) &&
  		    !(c->algorithm_enc & disabled_enc) &&
@@ -11898,7 +11891,7 @@ diff -up openssl-1.0.0-beta3/ssl/ssl_cip
  #ifdef CIPHER_DEBUG
 diff -up openssl-1.0.0-beta3/ssl/ssl_lib.c.fips openssl-1.0.0-beta3/ssl/ssl_lib.c
 --- openssl-1.0.0-beta3/ssl/ssl_lib.c.fips	2009-06-30 13:57:24.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -1470,6 +1470,14 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
  		return(NULL);
  		}
@@ -11915,8 +11908,8 @@ diff -up openssl-1.0.0-beta3/ssl/ssl_lib
  		{
  		SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
 diff -up openssl-1.0.0-beta3/ssl/ssltest.c.fips openssl-1.0.0-beta3/ssl/ssltest.c
---- openssl-1.0.0-beta3/ssl/ssltest.c.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/ssltest.c	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/ssl/ssltest.c.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssltest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -265,6 +265,9 @@ static void sv_usage(void)
  	{
  	fprintf(stderr,"usage: ssltest [args ...]\n");
@@ -11991,9 +11984,124 @@ diff -up openssl-1.0.0-beta3/ssl/ssltest
  	if(s->version == TLS1_VERSION)
  		FIPS_allow_md5(0);
  # endif
+diff -up openssl-1.0.0-beta3/ssl/s23_clnt.c.fips openssl-1.0.0-beta3/ssl/s23_clnt.c
+--- openssl-1.0.0-beta3/ssl/s23_clnt.c.fips	2009-04-07 19:01:07.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s23_clnt.c	2009-09-30 13:25:58.000000000 +0200
+@@ -332,6 +332,14 @@ static int ssl23_client_hello(SSL *s)
+ 			version_major = TLS1_VERSION_MAJOR;
+ 			version_minor = TLS1_VERSION_MINOR;
+ 			}
++#ifdef OPENSSL_FIPS
++		else if(FIPS_mode())
++			{
++			SSLerr(SSL_F_SSL23_CLIENT_HELLO,
++					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
++			return -1;
++			}
++#endif
+ 		else if (version == SSL3_VERSION)
+ 			{
+ 			version_major = SSL3_VERSION_MAJOR;
+@@ -615,6 +623,14 @@ static int ssl23_get_server_hello(SSL *s
+ 		if ((p[2] == SSL3_VERSION_MINOR) &&
+ 			!(s->options & SSL_OP_NO_SSLv3))
+ 			{
++#ifdef OPENSSL_FIPS
++			if(FIPS_mode())
++				{
++				SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,
++					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
++				goto err;
++				}
++#endif
+ 			s->version=SSL3_VERSION;
+ 			s->method=SSLv3_client_method();
+ 			}
+diff -up openssl-1.0.0-beta3/ssl/s23_srvr.c.fips openssl-1.0.0-beta3/ssl/s23_srvr.c
+--- openssl-1.0.0-beta3/ssl/s23_srvr.c.fips	2008-06-03 04:48:34.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s23_srvr.c	2009-09-30 13:25:58.000000000 +0200
+@@ -386,6 +386,15 @@ int ssl23_get_client_hello(SSL *s)
+ 			}
+ 		}
+ 
++#ifdef OPENSSL_FIPS
++	if (FIPS_mode() && (s->version < TLS1_VERSION))
++		{
++		SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
++					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
++		goto err;
++		}
++#endif
++
+ 	if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
+ 		{
+ 		/* we have SSLv3/TLSv1 in an SSLv2 header
+diff -up openssl-1.0.0-beta3/ssl/s3_clnt.c.fips openssl-1.0.0-beta3/ssl/s3_clnt.c
+--- openssl-1.0.0-beta3/ssl/s3_clnt.c.fips	2009-06-16 18:39:20.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s3_clnt.c	2009-09-30 13:25:58.000000000 +0200
+@@ -156,6 +156,10 @@
+ #include <openssl/objects.h>
+ #include <openssl/evp.h>
+ #include <openssl/md5.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
+ #ifndef OPENSSL_NO_DH
+ #include <openssl/dh.h>
+ #endif
+@@ -1524,6 +1528,8 @@ int ssl3_get_key_exchange(SSL *s)
+ 			q=md_buf;
+ 			for (num=2; num > 0; num--)
+ 				{
++				EVP_MD_CTX_set_flags(&md_ctx,
++					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 				EVP_DigestInit_ex(&md_ctx,(num == 2)
+ 					?s->ctx->md5:s->ctx->sha1, NULL);
+ 				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
+diff -up openssl-1.0.0-beta3/ssl/s3_enc.c.fips openssl-1.0.0-beta3/ssl/s3_enc.c
+--- openssl-1.0.0-beta3/ssl/s3_enc.c.fips	2009-04-16 19:22:50.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s3_enc.c	2009-09-30 13:25:58.000000000 +0200
+@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
+ #endif
+ 	k=0;
+ 	EVP_MD_CTX_init(&m5);
++	EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 	EVP_MD_CTX_init(&s1);
+ 	for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
+ 		{
+@@ -614,6 +615,8 @@ int ssl3_digest_cached_records(SSL *s)
+ 		if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
+ 			{
+ 			s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
++			EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
++				EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 			EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
+ 			EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
+ 			} 
+@@ -670,6 +673,7 @@ static int ssl3_handshake_mac(SSL *s, in
+ 		return 0;
+ 	}	
+ 	EVP_MD_CTX_init(&ctx);
++	EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 	EVP_MD_CTX_copy_ex(&ctx,d);
+ 	n=EVP_MD_CTX_size(&ctx);
+ 	if (n < 0)
+diff -up openssl-1.0.0-beta3/ssl/s3_srvr.c.fips openssl-1.0.0-beta3/ssl/s3_srvr.c
+--- openssl-1.0.0-beta3/ssl/s3_srvr.c.fips	2009-06-26 17:04:22.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s3_srvr.c	2009-09-30 13:25:58.000000000 +0200
+@@ -1674,6 +1674,8 @@ int ssl3_send_server_key_exchange(SSL *s
+ 				j=0;
+ 				for (num=2; num > 0; num--)
+ 					{
++					EVP_MD_CTX_set_flags(&md_ctx,
++						EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 					EVP_DigestInit_ex(&md_ctx,(num == 2)
+ 						?s->ctx->md5:s->ctx->sha1, NULL);
+ 					EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 diff -up openssl-1.0.0-beta3/ssl/t1_enc.c.fips openssl-1.0.0-beta3/ssl/t1_enc.c
 --- openssl-1.0.0-beta3/ssl/t1_enc.c.fips	2009-04-19 20:03:13.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/t1_enc.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/t1_enc.c	2009-09-30 13:25:58.000000000 +0200
 @@ -169,6 +169,8 @@ static void tls1_P_hash(const EVP_MD *md
  
  	HMAC_CTX_init(&ctx);


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- openssl.spec	4 Sep 2009 12:08:42 -0000	1.141
+++ openssl.spec	30 Sep 2009 18:18:48 -0000	1.142
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.7.%{beta}%{?dist}
+Release: 0.8.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -63,10 +63,10 @@ Patch49: openssl-0.9.8k-algo-doc.patch
 Patch50: openssl-1.0.0-beta3-curl.patch
 Patch51: openssl-1.0.0-beta3-const.patch
 Patch52: openssl-1.0.0-beta3-dss1.patch
-Patch53: openssl-1.0.0-beta3-cmll-noasm.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
+Patch62: openssl-1.0.0-beta3-camellia-rounds.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -148,9 +148,9 @@ from other formats to the formats used b
 %patch50 -p1 -b .curl
 %patch51 -p1 -b .const
 %patch52 -p1 -b .dss1
-%patch53 -p1 -b .cmll-noasm
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
+%patch62 -p1 -b .cmll-rounds
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -399,6 +399,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 30 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.8.beta3
+- fix RSA and DSA FIPS selftests
+- reenable fixed x86_64 camellia assembler code (#521127)
+
 * Fri Sep  4 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.7.beta3
 - temporarily disable x86_64 camellia assembler code (#521127)
 


--- openssl-1.0.0-beta3-cmll-noasm.patch DELETED ---



From jeckersb at fedoraproject.org  Wed Sep 30 18:19:34 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Wed, 30 Sep 2009 18:19:34 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.12, 1.13 python-netaddr.spec,
	1.17, 1.18 sources, 1.12, 1.13
Message-ID: <20090930181934.9836D11C00E6@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24784

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
New upstream release 0.7.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Aug 2009 14:46:18 -0000	1.12
+++ .cvsignore	30 Sep 2009 18:19:34 -0000	1.13
@@ -1 +1 @@
-netaddr-0.7.2.tar.gz
+netaddr-0.7.3.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-netaddr.spec	21 Aug 2009 14:46:18 -0000	1.17
+++ python-netaddr.spec	30 Sep 2009 18:19:34 -0000	1.18
@@ -3,7 +3,7 @@
 #====================================================================#
 
 Name:           python-netaddr
-Version:        0.7.2
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        Pythonic manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_bindir}/netaddr
 
 %changelog
+* Wed Sep 30 2009 John Eckersberg <jeckersb at redhat.com> - 0.7.3-1
+- New upstream release 0.7.3
+
 * Fri Aug 21 2009 John Eckersberg <jeckersb at redhat.com> - 0.7.2-1
 - New upstream release 0.7.2
 - Updated Summary and Description with new values provided by upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Aug 2009 14:46:18 -0000	1.12
+++ sources	30 Sep 2009 18:19:34 -0000	1.13
@@ -1 +1 @@
-061324a678980a03efc0b0b9f3659436  netaddr-0.7.2.tar.gz
+8b7b574bca2f60722ccd90c71334ee32  netaddr-0.7.3.tar.gz



From notting at fedoraproject.org  Wed Sep 30 18:25:09 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 30 Sep 2009 18:25:09 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.138,1.139 comps-f13.xml.in,1.28,1.29
Message-ID: <20090930182509.EB8FA11C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27593

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
package rename


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- comps-f12.xml.in	30 Sep 2009 17:31:53 -0000	1.138
+++ comps-f12.xml.in	30 Sep 2009 18:25:09 -0000	1.139
@@ -1274,6 +1274,7 @@
     <packagelist>
       <packagereq type="mandatory">eclipse-cdt</packagereq>
       <packagereq type="mandatory">eclipse-jdt</packagereq>
+      <packagereq type="default">eclipse-callgraph</packagereq>
       <packagereq type="default">eclipse-changelog</packagereq>
       <packagereq type="default">eclipse-egit</packagereq>
       <packagereq type="default">eclipse-mylyn</packagereq>
@@ -1283,7 +1284,6 @@
       <packagereq type="default">eclipse-pydev</packagereq>
       <packagereq type="default">eclipse-rpm-editor</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
-      <packagereq type="default">eclipse-systemtap</packagereq>
       <packagereq type="default">eclipse-valgrind</packagereq>
       <packagereq type="optional">eclipse-cmakeed</packagereq>
       <packagereq type="optional">eclipse-epic</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- comps-f13.xml.in	30 Sep 2009 17:31:53 -0000	1.28
+++ comps-f13.xml.in	30 Sep 2009 18:25:09 -0000	1.29
@@ -1268,6 +1268,7 @@
     <packagelist>
       <packagereq type="mandatory">eclipse-cdt</packagereq>
       <packagereq type="mandatory">eclipse-jdt</packagereq>
+      <packagereq type="default">eclipse-callgraph</packagereq>
       <packagereq type="default">eclipse-changelog</packagereq>
       <packagereq type="default">eclipse-egit</packagereq>
       <packagereq type="default">eclipse-mylyn</packagereq>
@@ -1277,7 +1278,6 @@
       <packagereq type="default">eclipse-pydev</packagereq>
       <packagereq type="default">eclipse-rpm-editor</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
-      <packagereq type="default">eclipse-systemtap</packagereq>
       <packagereq type="default">eclipse-valgrind</packagereq>
       <packagereq type="optional">eclipse-cmakeed</packagereq>
       <packagereq type="optional">eclipse-epic</packagereq>



From rvinyard at fedoraproject.org  Wed Sep 30 18:28:00 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 18:28:00 +0000 (UTC)
Subject: rpms/dbus-cxx/devel .cvsignore, 1.13, 1.14 dbus-cxx.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20090930182800.25A7A11C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28985

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	21 Sep 2009 19:42:27 -0000	1.13
+++ .cvsignore	30 Sep 2009 18:27:59 -0000	1.14
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.3.tar.bz2
-dbus-cxx-0.4.3-doc.tar.bz2
+dbus-cxx-0.5.0.tar.bz2
+dbus-cxx-0.5.0-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/dbus-cxx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dbus-cxx.spec	21 Sep 2009 19:42:27 -0000	1.13
+++ dbus-cxx.spec	30 Sep 2009 18:27:59 -0000	1.14
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.3
+Version:          0.5.0
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -8,13 +8,17 @@ Group:            System Environment/Lib
 Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
 Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    dbus-devel >= 1.2
+BuildRequires:    dbus-devel >= 1.1
 BuildRequires:    libsigc++20-devel >= 2.0.0
 BuildRequires:    glibmm24-devel >= 2.4.0
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    expat-devel
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
 BuildRequires:    popt-devel
+%else
+BuildRequires:    popt
+%endif
 
 %description
 C++ wrapper for the DBus C reference implementation.
@@ -52,7 +56,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.4
+hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.5
 
 %package          tools
 Summary:          Tools to support dbus-cxx application development
@@ -106,9 +110,9 @@ developing dbus-cxx-glibmm applications.
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/ doc/dbus-cxx-0.4.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/ doc/dbus-cxx-0.5.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -130,14 +134,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx.so
 %{_libdir}/pkgconfig/dbus-cxx-1.0.pc
-%dir %{_includedir}/dbus-cxx-0.4
-%{_includedir}/dbus-cxx-0.4/dbus-cxx.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx/
+%dir %{_includedir}/dbus-cxx-0.5
+%{_includedir}/dbus-cxx-0.5/dbus-cxx.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.4/
+%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.5/
 
 %files tools
 %defattr(-,root,root,-)
@@ -152,10 +156,13 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx-glibmm.so
 %{_libdir}/pkgconfig/dbus-cxx-glibmm-1.0.pc
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm/
 
 %changelog
+* Tue Sep 29 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-1
+- New release
+
 * Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Sep 2009 19:42:28 -0000	1.13
+++ sources	30 Sep 2009 18:27:59 -0000	1.14
@@ -1,2 +1,2 @@
-09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
-0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2
+58a45a1ff9f3fd4d15afcb329b180afe  dbus-cxx-0.5.0.tar.bz2
+0c4996c4a94fe01bf22058a516c72742  dbus-cxx-0.5.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Sep 30 18:28:07 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 18:28:07 +0000 (UTC)
Subject: rpms/dbus-cxx/F-12 .cvsignore, 1.13, 1.14 dbus-cxx.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20090930182807.63FE411C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29164

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	21 Sep 2009 19:42:27 -0000	1.13
+++ .cvsignore	30 Sep 2009 18:28:07 -0000	1.14
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.3.tar.bz2
-dbus-cxx-0.4.3-doc.tar.bz2
+dbus-cxx-0.5.0.tar.bz2
+dbus-cxx-0.5.0-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-12/dbus-cxx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dbus-cxx.spec	21 Sep 2009 19:42:27 -0000	1.13
+++ dbus-cxx.spec	30 Sep 2009 18:28:07 -0000	1.14
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.3
+Version:          0.5.0
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -8,13 +8,17 @@ Group:            System Environment/Lib
 Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
 Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    dbus-devel >= 1.2
+BuildRequires:    dbus-devel >= 1.1
 BuildRequires:    libsigc++20-devel >= 2.0.0
 BuildRequires:    glibmm24-devel >= 2.4.0
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    expat-devel
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
 BuildRequires:    popt-devel
+%else
+BuildRequires:    popt
+%endif
 
 %description
 C++ wrapper for the DBus C reference implementation.
@@ -52,7 +56,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.4
+hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.5
 
 %package          tools
 Summary:          Tools to support dbus-cxx application development
@@ -106,9 +110,9 @@ developing dbus-cxx-glibmm applications.
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/ doc/dbus-cxx-0.4.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/ doc/dbus-cxx-0.5.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -130,14 +134,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx.so
 %{_libdir}/pkgconfig/dbus-cxx-1.0.pc
-%dir %{_includedir}/dbus-cxx-0.4
-%{_includedir}/dbus-cxx-0.4/dbus-cxx.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx/
+%dir %{_includedir}/dbus-cxx-0.5
+%{_includedir}/dbus-cxx-0.5/dbus-cxx.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.4/
+%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.5/
 
 %files tools
 %defattr(-,root,root,-)
@@ -152,10 +156,13 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx-glibmm.so
 %{_libdir}/pkgconfig/dbus-cxx-glibmm-1.0.pc
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm/
 
 %changelog
+* Tue Sep 29 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-1
+- New release
+
 * Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Sep 2009 19:42:28 -0000	1.13
+++ sources	30 Sep 2009 18:28:07 -0000	1.14
@@ -1,2 +1,2 @@
-09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
-0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2
+58a45a1ff9f3fd4d15afcb329b180afe  dbus-cxx-0.5.0.tar.bz2
+0c4996c4a94fe01bf22058a516c72742  dbus-cxx-0.5.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Sep 30 18:28:13 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 18:28:13 +0000 (UTC)
Subject: rpms/dbus-cxx/F-11 .cvsignore, 1.13, 1.14 dbus-cxx.spec, 1.12,
	1.13 sources, 1.13, 1.14
Message-ID: <20090930182813.0D6CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29325

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	21 Sep 2009 19:42:28 -0000	1.13
+++ .cvsignore	30 Sep 2009 18:28:12 -0000	1.14
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.3.tar.bz2
-dbus-cxx-0.4.3-doc.tar.bz2
+dbus-cxx-0.5.0.tar.bz2
+dbus-cxx-0.5.0-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/dbus-cxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dbus-cxx.spec	21 Sep 2009 19:42:28 -0000	1.12
+++ dbus-cxx.spec	30 Sep 2009 18:28:12 -0000	1.13
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.3
+Version:          0.5.0
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -8,13 +8,17 @@ Group:            System Environment/Lib
 Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
 Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    dbus-devel >= 1.2
+BuildRequires:    dbus-devel >= 1.1
 BuildRequires:    libsigc++20-devel >= 2.0.0
 BuildRequires:    glibmm24-devel >= 2.4.0
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    expat-devel
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
 BuildRequires:    popt-devel
+%else
+BuildRequires:    popt
+%endif
 
 %description
 C++ wrapper for the DBus C reference implementation.
@@ -52,7 +56,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.4
+hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.5
 
 %package          tools
 Summary:          Tools to support dbus-cxx application development
@@ -106,9 +110,9 @@ developing dbus-cxx-glibmm applications.
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/ doc/dbus-cxx-0.4.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/ doc/dbus-cxx-0.5.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -130,14 +134,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx.so
 %{_libdir}/pkgconfig/dbus-cxx-1.0.pc
-%dir %{_includedir}/dbus-cxx-0.4
-%{_includedir}/dbus-cxx-0.4/dbus-cxx.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx/
+%dir %{_includedir}/dbus-cxx-0.5
+%{_includedir}/dbus-cxx-0.5/dbus-cxx.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.4/
+%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.5/
 
 %files tools
 %defattr(-,root,root,-)
@@ -152,10 +156,13 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx-glibmm.so
 %{_libdir}/pkgconfig/dbus-cxx-glibmm-1.0.pc
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm/
 
 %changelog
+* Tue Sep 29 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-1
+- New release
+
 * Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Sep 2009 19:42:28 -0000	1.13
+++ sources	30 Sep 2009 18:28:12 -0000	1.14
@@ -1,2 +1,2 @@
-09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
-0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2
+58a45a1ff9f3fd4d15afcb329b180afe  dbus-cxx-0.5.0.tar.bz2
+0c4996c4a94fe01bf22058a516c72742  dbus-cxx-0.5.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Sep 30 18:28:19 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 18:28:19 +0000 (UTC)
Subject: rpms/dbus-cxx/F-10 .cvsignore, 1.13, 1.14 dbus-cxx.spec, 1.12,
	1.13 sources, 1.13, 1.14
Message-ID: <20090930182819.1BF2F11C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29480

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	21 Sep 2009 19:42:33 -0000	1.13
+++ .cvsignore	30 Sep 2009 18:28:18 -0000	1.14
@@ -1,2 +1,2 @@
-dbus-cxx-0.4.3.tar.bz2
-dbus-cxx-0.4.3-doc.tar.bz2
+dbus-cxx-0.5.0.tar.bz2
+dbus-cxx-0.5.0-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/dbus-cxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dbus-cxx.spec	21 Sep 2009 19:42:33 -0000	1.12
+++ dbus-cxx.spec	30 Sep 2009 18:28:18 -0000	1.13
@@ -1,6 +1,6 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.3
+Version:          0.5.0
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://dbus-cxx.sourceforge.net/
@@ -8,13 +8,17 @@ Group:            System Environment/Lib
 Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
 Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    dbus-devel >= 1.2
+BuildRequires:    dbus-devel >= 1.1
 BuildRequires:    libsigc++20-devel >= 2.0.0
 BuildRequires:    glibmm24-devel >= 2.4.0
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    expat-devel
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
 BuildRequires:    popt-devel
+%else
+BuildRequires:    popt
+%endif
 
 %description
 C++ wrapper for the DBus C reference implementation.
@@ -52,7 +56,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.4
+hierarchy and can be found at /usr/share/gtk-doc/html/dbus-cxx-0.5
 
 %package          tools
 Summary:          Tools to support dbus-cxx application development
@@ -106,9 +110,9 @@ developing dbus-cxx-glibmm applications.
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.4/ doc/dbus-cxx-0.4.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/dbus-cxx-0.5/ doc/dbus-cxx-0.5.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -130,14 +134,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx.so
 %{_libdir}/pkgconfig/dbus-cxx-1.0.pc
-%dir %{_includedir}/dbus-cxx-0.4
-%{_includedir}/dbus-cxx-0.4/dbus-cxx.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx/
+%dir %{_includedir}/dbus-cxx-0.5
+%{_includedir}/dbus-cxx-0.5/dbus-cxx.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.4/
+%doc %{_datadir}/gtk-doc/html/dbus-cxx-0.5/
 
 %files tools
 %defattr(-,root,root,-)
@@ -152,10 +156,13 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libdbus-cxx-glibmm.so
 %{_libdir}/pkgconfig/dbus-cxx-glibmm-1.0.pc
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm.h
-%{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm.h
+%{_includedir}/dbus-cxx-0.5/dbus-cxx-glibmm/
 
 %changelog
+* Tue Sep 29 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-1
+- New release
+
 * Mon Sep 21 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.3-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Sep 2009 19:42:33 -0000	1.13
+++ sources	30 Sep 2009 18:28:18 -0000	1.14
@@ -1,2 +1,2 @@
-09ac414156abcd240cf2b7e4d0e4739c  dbus-cxx-0.4.3.tar.bz2
-0424ec68d24ef4f670babae7d2489601  dbus-cxx-0.4.3-doc.tar.bz2
+58a45a1ff9f3fd4d15afcb329b180afe  dbus-cxx-0.5.0.tar.bz2
+0c4996c4a94fe01bf22058a516c72742  dbus-cxx-0.5.0-doc.tar.bz2



From tmraz at fedoraproject.org  Wed Sep 30 18:34:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 30 Sep 2009 18:34:36 +0000 (UTC)
Subject: rpms/openssl/F-12 openssl-1.0.0-beta3-camellia-rounds.patch, NONE, 
	1.1 openssl-1.0.0-beta3-fips.patch, 1.4, 1.5 openssl.spec, 1.141,
	1.142 openssl-1.0.0-beta3-cmll-noasm.patch, 1.1, NONE
Message-ID: <20090930183436.299CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32130

Modified Files:
	openssl-1.0.0-beta3-fips.patch openssl.spec 
Added Files:
	openssl-1.0.0-beta3-camellia-rounds.patch 
Removed Files:
	openssl-1.0.0-beta3-cmll-noasm.patch 
Log Message:
* Wed Sep 30 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.8.beta3
- fix RSA and DSA FIPS selftests
- reenable fixed x86_64 camellia assembler code (#521127)


openssl-1.0.0-beta3-camellia-rounds.patch:
 cmll-x86_64.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-camellia-rounds.patch ---
diff -up openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl.rounds openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl
--- openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl.rounds	2009-09-15 12:09:08.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl	2009-09-15 12:09:48.000000000 +0200
@@ -656,7 +656,7 @@ Camellia_cbc_encrypt:
 	mov	%rsi,$out		# out argument
 	mov	%r8,%rbx		# ivp argument
 	mov	%rcx,$key		# key argument
-	mov	272(%rcx),$keyend	# grandRounds
+	mov	272(%rcx),${keyend}d	# grandRounds
 
 	mov	%r8,$_ivp
 	mov	%rbp,$_rsp

openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/Makefile           |    4 
 crypto/camellia/asm/cmll-x86.pl    |    7 
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_fblk.c        |   68 ++
 crypto/camellia/cmll_misc.c        |    9 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   61 ++
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   27 -
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/evp/p_sign.c                |   17 
 crypto/evp/p_verify.c              |   17 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  101 +++
 crypto/fips/fips_des_selftest.c    |  137 +++++
 crypto/fips/fips_dsa_selftest.c    |  184 +++++++
 crypto/fips/fips_hmac_selftest.c   |  135 +++++
 crypto/fips/fips_rand.c            |  410 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  371 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  439 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   97 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    3 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  158 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |  104 ++++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 119 files changed, 10121 insertions(+), 180 deletions(-)

Index: openssl-1.0.0-beta3-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-12/openssl-1.0.0-beta3-fips.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openssl-1.0.0-beta3-fips.patch	20 Aug 2009 17:22:41 -0000	1.4
+++ openssl-1.0.0-beta3-fips.patch	30 Sep 2009 18:34:35 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up openssl-1.0.0-beta3/Configure.fips openssl-1.0.0-beta3/Configure
---- openssl-1.0.0-beta3/Configure.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/Configure	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/Configure.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/Configure	2009-09-30 13:25:58.000000000 +0200
 @@ -654,6 +654,7 @@ my $cmll_enc="camellia.o cmll_misc.o cml
  my $processor="";
  my $default_ranlib;
@@ -45,7 +45,7 @@ diff -up openssl-1.0.0-beta3/Configure.f
  	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
 diff -up openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips openssl-1.0.0-beta3/crypto/bf/bf_skey.c
 --- openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips	2008-11-12 04:57:52.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/bf/bf_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bf/bf_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,10 +59,15 @@
  #include <stdio.h>
  #include <string.h>
@@ -64,8 +64,8 @@ diff -up openssl-1.0.0-beta3/crypto/bf/b
  	int i;
  	BF_LONG *p,ri,in[2];
 diff -up openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips openssl-1.0.0-beta3/crypto/bf/blowfish.h
---- openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/bf/blowfish.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bf/blowfish.h	2009-09-30 13:25:58.000000000 +0200
 @@ -104,7 +104,9 @@ typedef struct bf_key_st
  	BF_LONG S[4*256];
  	} BF_KEY;
@@ -78,8 +78,8 @@ diff -up openssl-1.0.0-beta3/crypto/bf/b
  
  void BF_encrypt(BF_LONG *data,const BF_KEY *key);
 diff -up openssl-1.0.0-beta3/crypto/bn/bn.h.fips openssl-1.0.0-beta3/crypto/bn/bn.h
---- openssl-1.0.0-beta3/crypto/bn/bn.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/bn/bn.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/bn/bn.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bn/bn.h	2009-09-30 13:25:58.000000000 +0200
 @@ -540,6 +540,17 @@ int	BN_is_prime_ex(const BIGNUM *p,int n
  int	BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
  		int do_trial_division, BN_GENCB *cb);
@@ -99,8 +99,8 @@ diff -up openssl-1.0.0-beta3/crypto/bn/b
  void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
  int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
 diff -up /dev/null openssl-1.0.0-beta3/crypto/bn/bn_x931p.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/bn/bn_x931p.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/bn/bn_x931p.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,272 @@
 +/* bn_x931p.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -376,7 +376,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 diff -up openssl-1.0.0-beta3/crypto/bn/Makefile.fips openssl-1.0.0-beta3/crypto/bn/Makefile
 --- openssl-1.0.0-beta3/crypto/bn/Makefile.fips	2008-11-12 09:19:02.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/bn/Makefile	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/bn/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -26,13 +26,13 @@ LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_li
  	bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
  	bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
@@ -395,7 +395,7 @@ diff -up openssl-1.0.0-beta3/crypto/bn/M
  
 diff -up openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl.fips openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl
 --- openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl.fips	2009-04-06 16:25:02.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl	2009-08-20 16:54:59.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl	2009-09-30 13:25:58.000000000 +0200
 @@ -722,12 +722,15 @@ my $bias=int(@T[0])?shift(@T):0;
  }
  &function_end("Camellia_Ekeygen");
@@ -423,8 +423,8 @@ diff -up openssl-1.0.0-beta3/crypto/came
  
  @SBOX=(
 diff -up openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips openssl-1.0.0-beta3/crypto/camellia/camellia.h
---- openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/camellia/camellia.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips	2009-09-30 13:25:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/camellia.h	2009-09-30 13:25:58.000000000 +0200
 @@ -88,6 +88,11 @@ struct camellia_key_st 
  	};
  typedef struct camellia_key_st CAMELLIA_KEY;
@@ -437,9 +437,9 @@ diff -up openssl-1.0.0-beta3/crypto/came
  int Camellia_set_key(const unsigned char *userKey, const int bits,
  	CAMELLIA_KEY *key);
  
-diff -up openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c.fips openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c
---- openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c.fips	2009-08-20 17:01:56.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c	2009-08-20 17:03:21.000000000 +0200
+diff -up /dev/null openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,68 @@
 +/* crypto/camellia/camellia_misc.c -*- mode:C; c-file-style: "eay" -*- */
 +/* ====================================================================
@@ -511,7 +511,7 @@ diff -up openssl-1.0.0-beta3/crypto/came
 +#endif
 diff -up openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c.fips openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c
 --- openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c.fips	2008-10-28 13:13:52.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c	2009-08-20 17:04:10.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c	2009-09-30 13:25:58.000000000 +0200
 @@ -52,11 +52,20 @@
  #include <openssl/opensslv.h>
  #include <openssl/camellia.h>
@@ -535,7 +535,7 @@ diff -up openssl-1.0.0-beta3/crypto/came
  		return -1;
 diff -up openssl-1.0.0-beta3/crypto/camellia/Makefile.fips openssl-1.0.0-beta3/crypto/camellia/Makefile
 --- openssl-1.0.0-beta3/crypto/camellia/Makefile.fips	2008-12-23 12:33:00.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/camellia/Makefile	2009-08-20 17:02:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -23,9 +23,9 @@ APPS=
  
  LIB=$(TOP)/libcrypto.a
@@ -549,8 +549,8 @@ diff -up openssl-1.0.0-beta3/crypto/came
  SRC= $(LIBSRC)
  
 diff -up openssl-1.0.0-beta3/crypto/cast/cast.h.fips openssl-1.0.0-beta3/crypto/cast/cast.h
---- openssl-1.0.0-beta3/crypto/cast/cast.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/cast/cast.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/cast/cast.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/cast/cast.h	2009-09-30 13:25:58.000000000 +0200
 @@ -83,7 +83,9 @@ typedef struct cast_key_st
  	int short_key;	/* Use reduced rounds for short key */
  	} CAST_KEY;
@@ -564,7 +564,7 @@ diff -up openssl-1.0.0-beta3/crypto/cast
  		      int enc);
 diff -up openssl-1.0.0-beta3/crypto/cast/c_skey.c.fips openssl-1.0.0-beta3/crypto/cast/c_skey.c
 --- openssl-1.0.0-beta3/crypto/cast/c_skey.c.fips	2000-06-03 16:13:35.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/cast/c_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/cast/c_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -57,6 +57,11 @@
   */
  
@@ -587,8 +587,8 @@ diff -up openssl-1.0.0-beta3/crypto/cast
  	CAST_LONG x[16];
  	CAST_LONG z[16];
 diff -up openssl-1.0.0-beta3/crypto/crypto.h.fips openssl-1.0.0-beta3/crypto/crypto.h
---- openssl-1.0.0-beta3/crypto/crypto.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/crypto.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/crypto.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/crypto.h	2009-09-30 13:25:58.000000000 +0200
 @@ -546,12 +546,69 @@ void OpenSSLDie(const char *file,int lin
  unsigned long *OPENSSL_ia32cap_loc(void);
  #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
@@ -661,7 +661,7 @@ diff -up openssl-1.0.0-beta3/crypto/cryp
  /* Function codes. */
 diff -up openssl-1.0.0-beta3/crypto/dh/dh_err.c.fips openssl-1.0.0-beta3/crypto/dh/dh_err.c
 --- openssl-1.0.0-beta3/crypto/dh/dh_err.c.fips	2006-11-21 22:29:37.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/dh/dh_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -73,6 +73,8 @@ static ERR_STRING_DATA DH_str_functs[]=
  {ERR_FUNC(DH_F_COMPUTE_KEY),	"COMPUTE_KEY"},
  {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP),	"DHparams_print_fp"},
@@ -681,7 +681,7 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  {ERR_REASON(DH_R_NO_PARAMETERS_SET)      ,"no parameters set"},
 diff -up openssl-1.0.0-beta3/crypto/dh/dh_gen.c.fips openssl-1.0.0-beta3/crypto/dh/dh_gen.c
 --- openssl-1.0.0-beta3/crypto/dh/dh_gen.c.fips	2005-04-26 20:53:15.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dh/dh_gen.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh_gen.c	2009-09-30 13:25:58.000000000 +0200
 @@ -65,6 +65,10 @@
  #include "cryptlib.h"
  #include <openssl/bn.h>
@@ -715,8 +715,8 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  	if (ctx == NULL) goto err;
  	BN_CTX_start(ctx);
 diff -up openssl-1.0.0-beta3/crypto/dh/dh.h.fips openssl-1.0.0-beta3/crypto/dh/dh.h
---- openssl-1.0.0-beta3/crypto/dh/dh.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dh/dh.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/dh/dh.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh.h	2009-09-30 13:25:58.000000000 +0200
 @@ -77,6 +77,8 @@
  # define OPENSSL_DH_MAX_MODULUS_BITS	10000
  #endif
@@ -745,7 +745,7 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  }
 diff -up openssl-1.0.0-beta3/crypto/dh/dh_key.c.fips openssl-1.0.0-beta3/crypto/dh/dh_key.c
 --- openssl-1.0.0-beta3/crypto/dh/dh_key.c.fips	2007-03-28 02:15:23.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dh/dh_key.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dh/dh_key.c	2009-09-30 13:25:58.000000000 +0200
 @@ -61,6 +61,9 @@
  #include <openssl/bn.h>
  #include <openssl/rand.h>
@@ -797,7 +797,7 @@ diff -up openssl-1.0.0-beta3/crypto/dh/d
  	}
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c.fips openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c
 --- openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c.fips	2008-12-26 18:17:21.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dsa/dsa_gen.c	2009-09-30 13:25:58.000000000 +0200
 @@ -77,8 +77,12 @@
  #include "cryptlib.h"
  #include <openssl/evp.h>
@@ -834,8 +834,8 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  	    qsize != SHA256_DIGEST_LENGTH)
  		/* invalid q size */
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa.h.fips openssl-1.0.0-beta3/crypto/dsa/dsa.h
---- openssl-1.0.0-beta3/crypto/dsa/dsa.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/dsa/dsa.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dsa/dsa.h	2009-09-30 13:25:58.000000000 +0200
 @@ -88,6 +88,8 @@
  # define OPENSSL_DSA_MAX_MODULUS_BITS	10000
  #endif
@@ -894,8 +894,8 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  #ifdef  __cplusplus
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_key.c.fips openssl-1.0.0-beta3/crypto/dsa/dsa_key.c
 --- openssl-1.0.0-beta3/crypto/dsa/dsa_key.c.fips	2007-03-28 02:15:25.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa_key.c	2009-08-11 18:09:42.000000000 +0200
-@@ -63,9 +63,40 @@
++++ openssl-1.0.0-beta3/crypto/dsa/dsa_key.c	2009-09-30 17:01:34.000000000 +0200
+@@ -63,9 +63,53 @@
  #include <openssl/bn.h>
  #include <openssl/dsa.h>
  #include <openssl/rand.h>
@@ -917,26 +917,39 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
 +
 +int fips_check_dsa(DSA *dsa)
 +	{
-+	EVP_PKEY pk;
++	EVP_PKEY *pk;
 +	unsigned char tbs[] = "DSA Pairwise Check Data";
-+    	pk.type = EVP_PKEY_DSA;
-+    	pk.pkey.dsa = dsa;
++	int ret = 0;
++
++    	if ((pk=EVP_PKEY_new()) == NULL)
++		goto err;
++
++	EVP_PKEY_set1_DSA(pk, dsa);
++
++	if (!fips_pkey_signature_test(pk, tbs, -1,
++					NULL, 0, EVP_sha1(), 0, NULL))
++		goto err;
++
++	ret = 1;
 +
-+	if (!fips_pkey_signature_test(&pk, tbs, -1,
-+					NULL, 0, EVP_dss1(), 0, NULL))
++err:
++	if (ret == 0)
 +		{
-+		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
 +		fips_set_selftest_fail();
-+		return 0;
++		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
 +		}
-+	return 1;
++
++	if (pk)
++		EVP_PKEY_free(pk);
++
++	return ret;
 +	}
 +#endif
 +
  int DSA_generate_key(DSA *dsa)
  	{
  	if(dsa->meth->dsa_keygen)
-@@ -79,6 +110,14 @@ static int dsa_builtin_keygen(DSA *dsa)
+@@ -79,6 +123,14 @@ static int dsa_builtin_keygen(DSA *dsa)
  	BN_CTX *ctx=NULL;
  	BIGNUM *pub_key=NULL,*priv_key=NULL;
  
@@ -951,7 +964,7 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  	if ((ctx=BN_CTX_new()) == NULL) goto err;
  
  	if (dsa->priv_key == NULL)
-@@ -117,6 +156,15 @@ static int dsa_builtin_keygen(DSA *dsa)
+@@ -117,6 +169,15 @@ static int dsa_builtin_keygen(DSA *dsa)
  
  	dsa->priv_key=priv_key;
  	dsa->pub_key=pub_key;
@@ -969,7 +982,7 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  err:
 diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c.fips openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c
 --- openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c.fips	2007-03-28 02:15:26.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/dsa/dsa_ossl.c	2009-09-30 13:25:58.000000000 +0200
 @@ -65,6 +65,9 @@
  #include <openssl/dsa.h>
  #include <openssl/rand.h>
@@ -1043,7 +1056,7 @@ diff -up openssl-1.0.0-beta3/crypto/dsa/
  }
 diff -up openssl-1.0.0-beta3/crypto/err/err_all.c.fips openssl-1.0.0-beta3/crypto/err/err_all.c
 --- openssl-1.0.0-beta3/crypto/err/err_all.c.fips	2008-11-24 18:27:06.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/err/err_all.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/err/err_all.c	2009-09-30 13:25:58.000000000 +0200
 @@ -96,6 +96,9 @@
  #include <openssl/ocsp.h>
  #include <openssl/err.h>
@@ -1066,7 +1079,7 @@ diff -up openssl-1.0.0-beta3/crypto/err/
  #endif
 diff -up openssl-1.0.0-beta3/crypto/evp/digest.c.fips openssl-1.0.0-beta3/crypto/evp/digest.c
 --- openssl-1.0.0-beta3/crypto/evp/digest.c.fips	2008-11-04 13:06:09.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/digest.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/digest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -116,6 +116,7 @@
  #ifndef OPENSSL_NO_ENGINE
  #include <openssl/engine.h>
@@ -1167,7 +1180,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	ret=ctx->digest->final(ctx,md);
 diff -up openssl-1.0.0-beta3/crypto/evp/e_aes.c.fips openssl-1.0.0-beta3/crypto/evp/e_aes.c
 --- openssl-1.0.0-beta3/crypto/evp/e_aes.c.fips	2004-01-28 20:05:33.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/e_aes.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_aes.c	2009-09-30 13:25:58.000000000 +0200
 @@ -69,32 +69,29 @@ typedef struct
  
  IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,
@@ -1222,7 +1235,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  		   const unsigned char *iv, int enc)
 diff -up openssl-1.0.0-beta3/crypto/evp/e_camellia.c.fips openssl-1.0.0-beta3/crypto/evp/e_camellia.c
 --- openssl-1.0.0-beta3/crypto/evp/e_camellia.c.fips	2006-08-31 22:56:20.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/e_camellia.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_camellia.c	2009-09-30 13:25:58.000000000 +0200
 @@ -93,7 +93,7 @@ IMPLEMENT_BLOCK_CIPHER(camellia_256, ks,
  	EVP_CIPHER_get_asn1_iv,
  	NULL)
@@ -1234,7 +1247,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  IMPLEMENT_CAMELLIA_CFBR(192,1)
 diff -up openssl-1.0.0-beta3/crypto/evp/e_des3.c.fips openssl-1.0.0-beta3/crypto/evp/e_des3.c
 --- openssl-1.0.0-beta3/crypto/evp/e_des3.c.fips	2008-12-29 13:35:47.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/e_des3.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_des3.c	2009-09-30 13:25:58.000000000 +0200
 @@ -206,9 +206,9 @@ static int des_ede3_cfb8_cipher(EVP_CIPH
      }
  
@@ -1281,7 +1294,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 diff -up openssl-1.0.0-beta3/crypto/evp/e_null.c.fips openssl-1.0.0-beta3/crypto/evp/e_null.c
 --- openssl-1.0.0-beta3/crypto/evp/e_null.c.fips	2008-10-31 20:48:24.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/e_null.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/e_null.c	2009-09-30 13:25:58.000000000 +0200
 @@ -69,7 +69,7 @@ static const EVP_CIPHER n_cipher=
  	{
  	NID_undef,
@@ -1293,7 +1306,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	NULL,
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_enc.c.fips openssl-1.0.0-beta3/crypto/evp/evp_enc.c
 --- openssl-1.0.0-beta3/crypto/evp/evp_enc.c.fips	2008-11-12 04:58:00.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/evp_enc.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_enc.c	2009-09-30 13:25:58.000000000 +0200
 @@ -68,8 +68,53 @@
  
  const char EVP_version[]="EVP" OPENSSL_VERSION_PTEXT;
@@ -1388,7 +1401,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	}
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_err.c.fips openssl-1.0.0-beta3/crypto/evp/evp_err.c
 --- openssl-1.0.0-beta3/crypto/evp/evp_err.c.fips	2008-12-29 17:11:54.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/evp_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -154,6 +154,7 @@ static ERR_STRING_DATA EVP_str_reasons[]
  {ERR_REASON(EVP_R_DECODE_ERROR)          ,"decode error"},
  {ERR_REASON(EVP_R_DIFFERENT_KEY_TYPES)   ,"different key types"},
@@ -1398,8 +1411,8 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  {ERR_REASON(EVP_R_EVP_PBE_CIPHERINIT_ERROR),"evp pbe cipherinit error"},
  {ERR_REASON(EVP_R_EXPECTING_AN_RSA_KEY)  ,"expecting an rsa key"},
 diff -up openssl-1.0.0-beta3/crypto/evp/evp.h.fips openssl-1.0.0-beta3/crypto/evp/evp.h
---- openssl-1.0.0-beta3/crypto/evp/evp.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/evp.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/evp/evp.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp.h	2009-09-30 14:40:54.000000000 +0200
 @@ -75,6 +75,10 @@
  #include <openssl/bio.h>
  #endif
@@ -1431,7 +1444,18 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  #define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW	0x0008	/* Allow use of non FIPS digest
  						 * in FIPS mode */
  
-@@ -330,6 +332,14 @@ struct evp_cipher_st
+@@ -284,6 +286,10 @@ struct env_md_ctx_st
+ #define EVP_MD_CTX_FLAG_PAD_PKCS1	0x00	/* PKCS#1 v1.5 mode */
+ #define EVP_MD_CTX_FLAG_PAD_X931	0x10	/* X9.31 mode */
+ #define EVP_MD_CTX_FLAG_PAD_PSS		0x20	/* PSS mode */
++#define M_EVP_MD_CTX_FLAG_PSS_SALT(ctx) \
++		((ctx->flags>>16) &0xFFFF) /* seed length */
++#define EVP_MD_CTX_FLAG_PSS_MDLEN	0xFFFF	/* salt len same as digest */
++#define EVP_MD_CTX_FLAG_PSS_MREC	0xFFFE	/* salt max or auto recovered */
+ 
+ #define EVP_MD_CTX_FLAG_NO_INIT		0x0100 /* Don't initialize md_data */
+ 
+@@ -330,6 +336,14 @@ struct evp_cipher_st
  #define 	EVP_CIPH_NO_PADDING		0x100
  /* cipher handles random key generation */
  #define 	EVP_CIPH_RAND_KEY		0x200
@@ -1446,7 +1470,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  
  /* ctrl() values */
  
-@@ -507,6 +517,10 @@ int	EVP_BytesToKey(const EVP_CIPHER *typ
+@@ -507,6 +521,10 @@ int	EVP_BytesToKey(const EVP_CIPHER *typ
  		const unsigned char *salt, const unsigned char *data,
  		int datal, int count, unsigned char *key,unsigned char *iv);
  
@@ -1457,7 +1481,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  int	EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
  		const unsigned char *key, const unsigned char *iv);
  int	EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-@@ -1225,6 +1239,7 @@ void ERR_load_EVP_strings(void);
+@@ -1225,6 +1243,7 @@ void ERR_load_EVP_strings(void);
  #define EVP_R_DECODE_ERROR				 114
  #define EVP_R_DIFFERENT_KEY_TYPES			 101
  #define EVP_R_DIFFERENT_PARAMETERS			 153
@@ -1467,7 +1491,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  #define EVP_R_EXPECTING_AN_RSA_KEY			 127
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_lib.c.fips openssl-1.0.0-beta3/crypto/evp/evp_lib.c
 --- openssl-1.0.0-beta3/crypto/evp/evp_lib.c.fips	2009-04-10 12:30:27.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/evp_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -67,6 +67,8 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_
  
  	if (c->cipher->set_asn1_parameters != NULL)
@@ -1516,8 +1540,8 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
 +	return (ctx->flags & flags);
 +	}
 diff -up openssl-1.0.0-beta3/crypto/evp/evp_locl.h.fips openssl-1.0.0-beta3/crypto/evp/evp_locl.h
---- openssl-1.0.0-beta3/crypto/evp/evp_locl.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/evp_locl.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/evp/evp_locl.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/evp_locl.h	2009-09-30 13:25:58.000000000 +0200
 @@ -111,11 +111,11 @@ static int cname##_cbc_cipher(EVP_CIPHER
  static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
  {\
@@ -1567,24 +1591,24 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  
  struct evp_pkey_ctx_st
  	{
-diff -up openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss1.c
---- openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips	2006-04-19 19:05:57.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/m_dss1.c	2009-08-11 18:07:30.000000000 +0200
-@@ -82,7 +82,7 @@ static const EVP_MD dss1_md=
- 	NID_dsa,
- 	NID_dsaWithSHA1,
+diff -up openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss.c
+--- openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips	2006-04-19 19:05:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/m_dss.c	2009-09-30 13:25:58.000000000 +0200
+@@ -81,7 +81,7 @@ static const EVP_MD dsa_md=
+ 	NID_dsaWithSHA,
+ 	NID_dsaWithSHA,
  	SHA_DIGEST_LENGTH,
 -	EVP_MD_FLAG_PKEY_DIGEST,
 +	EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
  	init,
  	update,
  	final,
-diff -up openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss.c
---- openssl-1.0.0-beta3/crypto/evp/m_dss.c.fips	2006-04-19 19:05:57.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/m_dss.c	2009-08-11 18:07:30.000000000 +0200
-@@ -81,7 +81,7 @@ static const EVP_MD dsa_md=
- 	NID_dsaWithSHA,
- 	NID_dsaWithSHA,
+diff -up openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips openssl-1.0.0-beta3/crypto/evp/m_dss1.c
+--- openssl-1.0.0-beta3/crypto/evp/m_dss1.c.fips	2006-04-19 19:05:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/m_dss1.c	2009-09-30 13:25:58.000000000 +0200
+@@ -82,7 +82,7 @@ static const EVP_MD dss1_md=
+ 	NID_dsa,
+ 	NID_dsaWithSHA1,
  	SHA_DIGEST_LENGTH,
 -	EVP_MD_FLAG_PKEY_DIGEST,
 +	EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
@@ -1593,7 +1617,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	final,
 diff -up openssl-1.0.0-beta3/crypto/evp/m_sha1.c.fips openssl-1.0.0-beta3/crypto/evp/m_sha1.c
 --- openssl-1.0.0-beta3/crypto/evp/m_sha1.c.fips	2008-03-12 22:14:24.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/evp/m_sha1.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/m_sha1.c	2009-09-30 13:25:58.000000000 +0200
 @@ -82,7 +82,8 @@ static const EVP_MD sha1_md=
  	NID_sha1,
  	NID_sha1WithRSAEncryption,
@@ -1646,7 +1670,7 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	final512,
 diff -up openssl-1.0.0-beta3/crypto/evp/names.c.fips openssl-1.0.0-beta3/crypto/evp/names.c
 --- openssl-1.0.0-beta3/crypto/evp/names.c.fips	2009-04-10 12:30:27.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/evp/names.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/names.c	2009-09-30 13:25:58.000000000 +0200
 @@ -66,6 +66,10 @@ int EVP_add_cipher(const EVP_CIPHER *c)
  	{
  	int r;
@@ -1669,9 +1693,77 @@ diff -up openssl-1.0.0-beta3/crypto/evp/
  	name=OBJ_nid2sn(md->type);
  	r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
  	if (r == 0) return(0);
+diff -up openssl-1.0.0-beta3/crypto/evp/p_sign.c.fips openssl-1.0.0-beta3/crypto/evp/p_sign.c
+--- openssl-1.0.0-beta3/crypto/evp/p_sign.c.fips	2006-05-24 15:29:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/evp/p_sign.c	2009-09-30 15:07:14.000000000 +0200
+@@ -61,6 +61,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/objects.h>
+ #include <openssl/x509.h>
++#include <openssl/rsa.h>
+ 
+ #ifdef undef
+ void EVP_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
+@@ -101,6 +102,22 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsig
+ 			goto err;
+ 		if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
+ 			goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_X931)
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_X931_PADDING) <= 0)
++				goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_PSS)
++			{
++			int saltlen;
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_PKCS1_PSS_PADDING) <= 0)
++				goto err;
++			saltlen = M_EVP_MD_CTX_FLAG_PSS_SALT(ctx);
++			if (saltlen == EVP_MD_CTX_FLAG_PSS_MDLEN)
++				saltlen = -1;
++			else if (saltlen == EVP_MD_CTX_FLAG_PSS_MREC)
++				saltlen = -2;
++			if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkctx, saltlen) <= 0)
++				goto err;
++			}
+ 		if (EVP_PKEY_sign(pkctx, sigret, &sltmp, m, m_len) <= 0)
+ 			goto err;
+ 		*siglen = sltmp;
+diff -up openssl-1.0.0-beta3/crypto/evp/p_verify.c.fips openssl-1.0.0-beta3/crypto/evp/p_verify.c
+--- openssl-1.0.0-beta3/crypto/evp/p_verify.c.fips	2008-11-12 04:58:01.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/evp/p_verify.c	2009-09-30 15:07:27.000000000 +0200
+@@ -61,6 +61,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/objects.h>
+ #include <openssl/x509.h>
++#include <openssl/rsa.h>
+ 
+ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
+ 	     unsigned int siglen, EVP_PKEY *pkey)
+@@ -86,6 +87,22 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, con
+ 			goto err;
+ 		if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
+ 			goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_X931)
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_X931_PADDING) <= 0)
++				goto err;
++		if (ctx->flags & EVP_MD_CTX_FLAG_PAD_PSS)
++			{
++			int saltlen;
++			if (EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_PKCS1_PSS_PADDING) <= 0)
++				goto err;
++			saltlen = M_EVP_MD_CTX_FLAG_PSS_SALT(ctx);
++			if (saltlen == EVP_MD_CTX_FLAG_PSS_MDLEN)
++				saltlen = -1;
++			else if (saltlen == EVP_MD_CTX_FLAG_PSS_MREC)
++				saltlen = -2;
++			if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkctx, saltlen) <= 0)
++				goto err;
++			}
+ 		i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
+ 		err:
+ 		EVP_PKEY_CTX_free(pkctx);
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_aesavs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_aesavs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_aesavs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,939 @@
 +/* ====================================================================
 + * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
@@ -2613,8 +2705,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_desmovs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_desmovs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_desmovs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,702 @@
 +/* ====================================================================
 + * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
@@ -3319,8 +3411,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_dssvs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_dssvs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_dssvs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,537 @@
 +#include <openssl/opensslconf.h>
 +
@@ -3860,8 +3952,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rngvs.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rngvs.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rngvs.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,230 @@
 +/*
 + * Crude test driver for processing the VST and MCT testvector files
@@ -4094,8 +4186,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsagtest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsagtest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsagtest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,390 @@
 +/* fips_rsagtest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -4488,8 +4580,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsastest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsastest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsastest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,370 @@
 +/* fips_rsastest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -4862,8 +4954,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +	}
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsavtest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsavtest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_rsavtest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,377 @@
 +/* fips_rsavtest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -5243,8 +5335,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +	}
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_shatest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_shatest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_shatest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,388 @@
 +/* fips_shatest.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -5635,8 +5727,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/cavs/fips_utl.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_utl.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/cavs/fips_utl.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,343 @@
 +/* ====================================================================
 + * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
@@ -5982,8 +6074,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips_err.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips_err.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,7 @@
 +#include <openssl/opensslconf.h>
 +
@@ -5993,8 +6085,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +static void *dummy=&dummy;
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips_err.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips_err.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips_err.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,137 @@
 +/* crypto/fips_err.h */
 +/* ====================================================================
@@ -6134,8 +6226,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +	}
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_aes_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_aes_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_aes_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,101 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -6239,8 +6331,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,419 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -6662,8 +6754,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_des_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_des_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_des_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,137 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -6803,9 +6895,9 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_dsa_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_dsa_selftest.c	2009-08-11 18:07:30.000000000 +0200
-@@ -0,0 +1,180 @@
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_dsa_selftest.c	2009-09-30 13:25:58.000000000 +0200
+@@ -0,0 +1,184 @@
 +/* crypto/dsa/dsatest.c */
 +/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
 + * All rights reserved.
@@ -6923,13 +7015,13 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +int FIPS_selftest_dsa()
 +    {
-+    DSA *dsa=NULL;
++    DSA *dsa;
 +    int counter,i,j, ret = 0;
 +    unsigned int slen;
 +    unsigned char buf[256];
 +    unsigned long h;
 +    EVP_MD_CTX mctx;
-+    EVP_PKEY pk;
++    EVP_PKEY *pk = NULL;
 +
 +    EVP_MD_CTX_init(&mctx);
 +
@@ -6958,28 +7050,32 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    if (i != j || memcmp(buf,out_g,i) != 0)
 +	goto err;
 +    DSA_generate_key(dsa);
-+    pk.type = EVP_PKEY_DSA;
-+    pk.pkey.dsa = dsa;
++
++    if ((pk=EVP_PKEY_new()) == NULL)
++	goto err;
++    EVP_PKEY_assign_DSA(pk, dsa);
 +
 +    if (!EVP_SignInit_ex(&mctx, EVP_dss1(), NULL))
 +	goto err;
 +    if (!EVP_SignUpdate(&mctx, str1, 20))
 +	goto err;
-+    if (!EVP_SignFinal(&mctx, buf, &slen, &pk))
++    if (!EVP_SignFinal(&mctx, buf, &slen, pk))
 +	goto err;
 +
 +    if (!EVP_VerifyInit_ex(&mctx, EVP_dss1(), NULL))
 +	goto err;
 +    if (!EVP_VerifyUpdate(&mctx, str1, 20))
 +	goto err;
-+    if (EVP_VerifyFinal(&mctx, buf, slen, &pk) != 1)
++    if (EVP_VerifyFinal(&mctx, buf, slen, pk) != 1)
 +	goto err;
 +
 +    ret = 1;
 +
 +    err:
 +    EVP_MD_CTX_cleanup(&mctx);
-+    if (dsa)
++    if (pk)
++	EVP_PKEY_free(pk);
++    else if (dsa)
 +	DSA_free(dsa);
 +    if (ret == 0)
 +	    FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
@@ -6987,8 +7083,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,163 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -7154,8 +7250,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_hmac_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_hmac_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_hmac_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,135 @@
 +/* ====================================================================
 + * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
@@ -7293,8 +7389,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +    }
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rand.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rand.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rand.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,410 @@
 +/* ====================================================================
 + * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
@@ -7707,8 +7803,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rand.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rand.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rand.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,77 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -7788,8 +7884,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rand_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rand_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rand_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,371 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -8163,8 +8259,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_randtest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_randtest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_randtest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,248 @@
 +/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
 + * All rights reserved.
@@ -8415,9 +8511,9 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rsa_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_selftest.c	2009-08-11 18:07:30.000000000 +0200
-@@ -0,0 +1,432 @@
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_selftest.c	2009-09-30 13:25:58.000000000 +0200
+@@ -0,0 +1,439 @@
 +/* ====================================================================
 + * Copyright (c) 2003-2007 The OpenSSL Project.  All rights reserved.
 + *
@@ -8759,83 +8855,87 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +int FIPS_selftest_rsa()
 +	{
 +	int ret = 0;
-+	RSA *key = NULL;
-+	EVP_PKEY pk;
-+	key=RSA_new();
++	RSA *key;
++	EVP_PKEY *pk = NULL;
++
++	if ((key=RSA_new()) == NULL)
++		goto err;
 +	setrsakey(key);
-+	pk.type = EVP_PKEY_RSA;
-+	pk.pkey.rsa = key;
++	if ((pk=EVP_PKEY_new()) == NULL)
++		goto err;
++
++	EVP_PKEY_assign_RSA(pk, key);
 +
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA1, sizeof(kat_RSA_SHA1),
 +				EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA1 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA224, sizeof(kat_RSA_SHA224),
 +				EVP_sha224(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA224 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA256, sizeof(kat_RSA_SHA256),
 +				EVP_sha256(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA256 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA384, sizeof(kat_RSA_SHA384),
 +				EVP_sha384(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA384 PKCS#1"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_SHA512, sizeof(kat_RSA_SHA512),
 +				EVP_sha512(), EVP_MD_CTX_FLAG_PAD_PKCS1,
 +				"RSA SHA512 PKCS#1"))
 +		goto err;
 +
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA1, sizeof(kat_RSA_PSS_SHA1),
 +				EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA1 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA224, sizeof(kat_RSA_PSS_SHA224),
 +				EVP_sha224(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA224 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA256, sizeof(kat_RSA_PSS_SHA256),
 +				EVP_sha256(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA256 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA384, sizeof(kat_RSA_PSS_SHA384),
 +				EVP_sha384(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA384 PSS"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +				kat_RSA_PSS_SHA512, sizeof(kat_RSA_PSS_SHA512),
 +				EVP_sha512(), EVP_MD_CTX_FLAG_PAD_PSS,
 +				"RSA SHA512 PSS"))
 +		goto err;
 +
 +
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA1, sizeof(kat_RSA_X931_SHA1),
 +			EVP_sha1(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA1 X931"))
 +		goto err;
 +	/* NB: SHA224 not supported in X9.31 */
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA256, sizeof(kat_RSA_X931_SHA256),
 +			EVP_sha256(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA256 X931"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA384, sizeof(kat_RSA_X931_SHA384),
 +			EVP_sha384(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA384 X931"))
 +		goto err;
-+	if (!fips_pkey_signature_test(&pk, kat_tbs, sizeof(kat_tbs) - 1,
++	if (!fips_pkey_signature_test(pk, kat_tbs, sizeof(kat_tbs) - 1,
 +			kat_RSA_X931_SHA512, sizeof(kat_RSA_X931_SHA512),
 +			EVP_sha512(), EVP_MD_CTX_FLAG_PAD_X931,
 +			"RSA SHA512 X931"))
@@ -8845,14 +8945,17 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +	ret = 1;
 +
 +	err:
-+	RSA_free(key);
++	if (pk)
++		EVP_PKEY_free(pk);
++	else if (key)
++		RSA_free(key);
 +	return ret;
 +	}
 +
 +#endif /* def OPENSSL_FIPS */
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_rsa_x931g.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_x931g.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_rsa_x931g.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,281 @@
 +/* crypto/rsa/rsa_gen.c */
 +/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
@@ -9136,8 +9239,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +	}
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_sha1_selftest.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_sha1_selftest.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_sha1_selftest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,97 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -9237,8 +9340,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,173 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -9414,8 +9517,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/fips_test_suite.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/fips_test_suite.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/fips_test_suite.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,588 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10006,8 +10109,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips_locl.h
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips_locl.h	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips_locl.h	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,72 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10082,8 +10185,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +#endif
 diff -up /dev/null openssl-1.0.0-beta3/crypto/fips/Makefile
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/fips/Makefile	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/fips/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,81 @@
 +#
 +# OpenSSL/crypto/fips/Makefile
@@ -10168,7 +10271,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 diff -up openssl-1.0.0-beta3/crypto/hmac/hmac.c.fips openssl-1.0.0-beta3/crypto/hmac/hmac.c
 --- openssl-1.0.0-beta3/crypto/hmac/hmac.c.fips	2008-11-12 04:58:02.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/hmac/hmac.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/hmac/hmac.c	2009-09-30 13:25:58.000000000 +0200
 @@ -77,6 +77,13 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const vo
  
  	if (key != NULL)
@@ -10195,8 +10298,8 @@ diff -up openssl-1.0.0-beta3/crypto/hmac
 +	}
 +
 diff -up openssl-1.0.0-beta3/crypto/hmac/hmac.h.fips openssl-1.0.0-beta3/crypto/hmac/hmac.h
---- openssl-1.0.0-beta3/crypto/hmac/hmac.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/hmac/hmac.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/hmac/hmac.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/hmac/hmac.h	2009-09-30 13:25:58.000000000 +0200
 @@ -101,6 +101,7 @@ unsigned char *HMAC(const EVP_MD *evp_md
  		    unsigned int *md_len);
  int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
@@ -10207,7 +10310,7 @@ diff -up openssl-1.0.0-beta3/crypto/hmac
  }
 diff -up openssl-1.0.0-beta3/crypto/Makefile.fips openssl-1.0.0-beta3/crypto/Makefile
 --- openssl-1.0.0-beta3/crypto/Makefile.fips	2009-04-06 16:31:35.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/Makefile	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -34,14 +34,14 @@ GENERAL=Makefile README crypto-lib.com i
  
  LIB= $(TOP)/libcrypto.a
@@ -10226,9 +10329,47 @@ diff -up openssl-1.0.0-beta3/crypto/Make
  
  ALL=    $(GENERAL) $(SRC) $(HEADER)
  
+diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c
+--- openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips	2004-07-25 21:10:41.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c	2009-09-30 13:25:58.000000000 +0200
+@@ -61,6 +61,11 @@
+ #include <string.h>
+ #include <openssl/des.h>
+ #include <openssl/mdc2.h>
++#include <openssl/err.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
+ 
+ #undef c2l
+ #define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
+@@ -75,7 +80,7 @@
+ 			*((c)++)=(unsigned char)(((l)>>24L)&0xff))
+ 
+ static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
+-int MDC2_Init(MDC2_CTX *c)
++FIPS_NON_FIPS_MD_Init(MDC2)
+ 	{
+ 	c->num=0;
+ 	c->pad_type=1;
+diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2.h
+--- openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/mdc2/mdc2.h	2009-09-30 13:25:58.000000000 +0200
+@@ -80,7 +80,9 @@ typedef struct mdc2_ctx_st
+ 	int pad_type; /* either 1 or 2, default 1 */
+ 	} MDC2_CTX;
+ 
+-
++#ifdef OPENSSL_FIPS
++int private_MDC2_Init(MDC2_CTX *c);
++#endif
+ int MDC2_Init(MDC2_CTX *c);
+ int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
+ int MDC2_Final(unsigned char *md, MDC2_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/md2/md2_dgst.c.fips openssl-1.0.0-beta3/crypto/md2/md2_dgst.c
 --- openssl-1.0.0-beta3/crypto/md2/md2_dgst.c.fips	2007-08-31 12:12:35.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md2/md2_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md2/md2_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -62,6 +62,11 @@
  #include <openssl/md2.h>
  #include <openssl/opensslv.h>
@@ -10251,8 +10392,8 @@ diff -up openssl-1.0.0-beta3/crypto/md2/
  	c->num=0;
  	memset(c->state,0,sizeof c->state);
 diff -up openssl-1.0.0-beta3/crypto/md2/md2.h.fips openssl-1.0.0-beta3/crypto/md2/md2.h
---- openssl-1.0.0-beta3/crypto/md2/md2.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md2/md2.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/md2/md2.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md2/md2.h	2009-09-30 13:25:58.000000000 +0200
 @@ -81,6 +81,9 @@ typedef struct MD2state_st
  	} MD2_CTX;
  
@@ -10265,7 +10406,7 @@ diff -up openssl-1.0.0-beta3/crypto/md2/
  int MD2_Final(unsigned char *md, MD2_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/md4/md4_dgst.c.fips openssl-1.0.0-beta3/crypto/md4/md4_dgst.c
 --- openssl-1.0.0-beta3/crypto/md4/md4_dgst.c.fips	2007-01-21 14:07:11.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/md4/md4_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md4/md4_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <stdio.h>
  #include "md4_locl.h"
@@ -10288,8 +10429,8 @@ diff -up openssl-1.0.0-beta3/crypto/md4/
  	memset (c,0,sizeof(*c));
  	c->A=INIT_DATA_A;
 diff -up openssl-1.0.0-beta3/crypto/md4/md4.h.fips openssl-1.0.0-beta3/crypto/md4/md4.h
---- openssl-1.0.0-beta3/crypto/md4/md4.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md4/md4.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/md4/md4.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md4/md4.h	2009-09-30 13:25:58.000000000 +0200
 @@ -105,6 +105,9 @@ typedef struct MD4state_st
  	unsigned int num;
  	} MD4_CTX;
@@ -10302,7 +10443,7 @@ diff -up openssl-1.0.0-beta3/crypto/md4/
  int MD4_Final(unsigned char *md, MD4_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/md5/md5_dgst.c.fips openssl-1.0.0-beta3/crypto/md5/md5_dgst.c
 --- openssl-1.0.0-beta3/crypto/md5/md5_dgst.c.fips	2007-01-21 14:07:11.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/md5/md5_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md5/md5_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <stdio.h>
  #include "md5_locl.h"
@@ -10325,8 +10466,8 @@ diff -up openssl-1.0.0-beta3/crypto/md5/
  	memset (c,0,sizeof(*c));
  	c->A=INIT_DATA_A;
 diff -up openssl-1.0.0-beta3/crypto/md5/md5.h.fips openssl-1.0.0-beta3/crypto/md5/md5.h
---- openssl-1.0.0-beta3/crypto/md5/md5.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/md5/md5.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/md5/md5.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/md5/md5.h	2009-09-30 13:25:58.000000000 +0200
 @@ -105,6 +105,9 @@ typedef struct MD5state_st
  	unsigned int num;
  	} MD5_CTX;
@@ -10337,47 +10478,9 @@ diff -up openssl-1.0.0-beta3/crypto/md5/
  int MD5_Init(MD5_CTX *c);
  int MD5_Update(MD5_CTX *c, const void *data, size_t len);
  int MD5_Final(unsigned char *md, MD5_CTX *c);
-diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c
---- openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c.fips	2004-07-25 21:10:41.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/mdc2/mdc2dgst.c	2009-08-11 18:07:30.000000000 +0200
-@@ -61,6 +61,11 @@
- #include <string.h>
- #include <openssl/des.h>
- #include <openssl/mdc2.h>
-+#include <openssl/err.h>
-+#ifdef OPENSSL_FIPS
-+#include <openssl/fips.h>
-+#endif
-+
- 
- #undef c2l
- #define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
-@@ -75,7 +80,7 @@
- 			*((c)++)=(unsigned char)(((l)>>24L)&0xff))
- 
- static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
--int MDC2_Init(MDC2_CTX *c)
-+FIPS_NON_FIPS_MD_Init(MDC2)
- 	{
- 	c->num=0;
- 	c->pad_type=1;
-diff -up openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips openssl-1.0.0-beta3/crypto/mdc2/mdc2.h
---- openssl-1.0.0-beta3/crypto/mdc2/mdc2.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/mdc2/mdc2.h	2009-08-11 18:07:30.000000000 +0200
-@@ -80,7 +80,9 @@ typedef struct mdc2_ctx_st
- 	int pad_type; /* either 1 or 2, default 1 */
- 	} MDC2_CTX;
- 
--
-+#ifdef OPENSSL_FIPS
-+int private_MDC2_Init(MDC2_CTX *c);
-+#endif
- int MDC2_Init(MDC2_CTX *c);
- int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
- int MDC2_Final(unsigned char *md, MDC2_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/mem.c.fips openssl-1.0.0-beta3/crypto/mem.c
 --- openssl-1.0.0-beta3/crypto/mem.c.fips	2008-11-12 04:57:47.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/mem.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/mem.c	2009-09-30 13:25:58.000000000 +0200
 @@ -101,7 +101,7 @@ static void (*free_locked_func)(void *) 
  
  /* may be changed as long as 'allow_customize_debug' is set */
@@ -10388,8 +10491,8 @@ diff -up openssl-1.0.0-beta3/crypto/mem.
  static void (*malloc_debug_func)(void *,int,const char *,int,int)
  	= CRYPTO_dbg_malloc;
 diff -up /dev/null openssl-1.0.0-beta3/crypto/o_init.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/o_init.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/o_init.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,80 @@
 +/* o_init.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -10473,7 +10576,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +
 diff -up openssl-1.0.0-beta3/crypto/opensslconf.h.in.fips openssl-1.0.0-beta3/crypto/opensslconf.h.in
 --- openssl-1.0.0-beta3/crypto/opensslconf.h.in.fips	2005-12-16 11:37:23.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/opensslconf.h.in	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/opensslconf.h.in	2009-09-30 13:25:58.000000000 +0200
 @@ -1,5 +1,20 @@
  /* crypto/opensslconf.h.in */
  
@@ -10497,7 +10600,7 @@ diff -up openssl-1.0.0-beta3/crypto/open
  
 diff -up openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c.fips openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c
 --- openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c.fips	2009-03-09 14:08:04.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/pkcs12/p12_crt.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,10 @@
  #include <stdio.h>
  #include "cryptlib.h"
@@ -10526,7 +10629,7 @@ diff -up openssl-1.0.0-beta3/crypto/pkcs
  	if (!iter)
 diff -up openssl-1.0.0-beta3/crypto/rand/md_rand.c.fips openssl-1.0.0-beta3/crypto/rand/md_rand.c
 --- openssl-1.0.0-beta3/crypto/rand/md_rand.c.fips	2009-01-03 10:25:32.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rand/md_rand.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/md_rand.c	2009-09-30 13:25:58.000000000 +0200
 @@ -126,6 +126,10 @@
  
  #include <openssl/crypto.h>
@@ -10555,7 +10658,7 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  		{
 diff -up openssl-1.0.0-beta3/crypto/rand/rand_err.c.fips openssl-1.0.0-beta3/crypto/rand/rand_err.c
 --- openssl-1.0.0-beta3/crypto/rand/rand_err.c.fips	2006-11-21 22:29:41.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rand/rand_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/rand_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -70,6 +70,13 @@
  
  static ERR_STRING_DATA RAND_str_functs[]=
@@ -10589,8 +10692,8 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  	};
  
 diff -up openssl-1.0.0-beta3/crypto/rand/rand.h.fips openssl-1.0.0-beta3/crypto/rand/rand.h
---- openssl-1.0.0-beta3/crypto/rand/rand.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rand/rand.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rand/rand.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/rand.h	2009-09-30 13:25:58.000000000 +0200
 @@ -128,11 +128,28 @@ void ERR_load_RAND_strings(void);
  /* Error codes for the RAND functions. */
  
@@ -10622,7 +10725,7 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  }
 diff -up openssl-1.0.0-beta3/crypto/rand/rand_lib.c.fips openssl-1.0.0-beta3/crypto/rand/rand_lib.c
 --- openssl-1.0.0-beta3/crypto/rand/rand_lib.c.fips	2008-11-12 04:58:04.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rand/rand_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rand/rand_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -60,6 +60,12 @@
  #include <time.h>
  #include "cryptlib.h"
@@ -10657,8 +10760,8 @@ diff -up openssl-1.0.0-beta3/crypto/rand
  	}
  
 diff -up openssl-1.0.0-beta3/crypto/rc2/rc2.h.fips openssl-1.0.0-beta3/crypto/rc2/rc2.h
---- openssl-1.0.0-beta3/crypto/rc2/rc2.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc2/rc2.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rc2/rc2.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc2/rc2.h	2009-09-30 13:25:58.000000000 +0200
 @@ -79,7 +79,9 @@ typedef struct rc2_key_st
  	RC2_INT data[64];
  	} RC2_KEY;
@@ -10672,7 +10775,7 @@ diff -up openssl-1.0.0-beta3/crypto/rc2/
  		     int enc);
 diff -up openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c.fips openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c
 --- openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c.fips	2007-09-18 23:10:32.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc2/rc2_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -57,6 +57,11 @@
   */
  
@@ -10706,9 +10809,31 @@ diff -up openssl-1.0.0-beta3/crypto/rc2/
  	int i,j;
  	unsigned char *k;
  	RC2_INT *ki;
+diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl
+--- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips	2009-02-12 15:48:49.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl	2009-09-30 13:25:58.000000000 +0200
+@@ -202,4 +202,6 @@ RC4_options:
+ .string	"rc4(8x,char)"
+ ___
+ 
++$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
++
+ print $code;
+diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl
+--- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips	2009-04-27 21:31:04.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl	2009-09-30 13:25:58.000000000 +0200
+@@ -499,6 +499,8 @@ ___
+ 
+ $code =~ s/#([bwd])/$1/gm;
+ 
++$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
++
+ print $code;
+ 
+ close STDOUT;
 diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl
 --- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl.fips	2007-12-02 22:32:03.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-586.pl	2009-09-30 13:25:58.000000000 +0200
 @@ -166,8 +166,12 @@ $idx="edx";
  
  &external_label("OPENSSL_ia32cap_P");
@@ -10732,31 +10857,9 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  
  # const char *RC4_options(void);
  &function_begin_B("RC4_options");
-diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl
---- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl.fips	2009-02-12 15:48:49.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-s390x.pl	2009-08-11 18:07:30.000000000 +0200
-@@ -202,4 +202,6 @@ RC4_options:
- .string	"rc4(8x,char)"
- ___
- 
-+$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
-+
- print $code;
-diff -up openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl
---- openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl.fips	2009-04-27 21:31:04.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc4/asm/rc4-x86_64.pl	2009-08-11 18:07:30.000000000 +0200
-@@ -499,6 +499,8 @@ ___
- 
- $code =~ s/#([bwd])/$1/gm;
- 
-+$code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPS} ne "");
-+
- print $code;
- 
- close STDOUT;
 diff -up openssl-1.0.0-beta3/crypto/rc4/Makefile.fips openssl-1.0.0-beta3/crypto/rc4/Makefile
 --- openssl-1.0.0-beta3/crypto/rc4/Makefile.fips	2009-02-11 11:01:36.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/Makefile	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/Makefile	2009-09-30 13:25:58.000000000 +0200
 @@ -21,8 +21,8 @@ TEST=rc4test.c
  APPS=
  
@@ -10769,8 +10872,8 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  SRC= $(LIBSRC)
  
 diff -up /dev/null openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c
---- /dev/null	2009-07-27 08:39:22.849064505 +0200
-+++ openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c	2009-08-11 18:07:30.000000000 +0200
+--- /dev/null	2009-09-23 10:56:02.148001752 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c	2009-09-30 13:25:58.000000000 +0200
 @@ -0,0 +1,75 @@
 +/* crypto/rc4/rc4_fblk.c */
 +/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -10848,8 +10951,8 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 +#endif
 +
 diff -up openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips openssl-1.0.0-beta3/crypto/rc4/rc4.h
---- openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rc4/rc4.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/rc4.h	2009-09-30 13:25:58.000000000 +0200
 @@ -78,6 +78,9 @@ typedef struct rc4_key_st
  
   
@@ -10862,7 +10965,7 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  		unsigned char *outdata);
 diff -up openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c
 --- openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips	2007-01-21 14:07:13.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <openssl/rc4.h>
  #include "rc4_locl.h"
@@ -10901,8 +11004,8 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  
  			for (i=0;i<256;i++) cp[i]=i;
 diff -up openssl-1.0.0-beta3/crypto/ripemd/ripemd.h.fips openssl-1.0.0-beta3/crypto/ripemd/ripemd.h
---- openssl-1.0.0-beta3/crypto/ripemd/ripemd.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/ripemd/ripemd.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/ripemd/ripemd.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/ripemd/ripemd.h	2009-09-30 13:25:58.000000000 +0200
 @@ -91,6 +91,9 @@ typedef struct RIPEMD160state_st
  	unsigned int   num;
  	} RIPEMD160_CTX;
@@ -10915,7 +11018,7 @@ diff -up openssl-1.0.0-beta3/crypto/ripe
  int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
 diff -up openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c.fips openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c
 --- openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c.fips	2007-01-21 14:07:13.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/ripemd/rmd_dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -59,6 +59,11 @@
  #include <stdio.h>
  #include "rmd_locl.h"
@@ -10939,7 +11042,7 @@ diff -up openssl-1.0.0-beta3/crypto/ripe
  	c->A=RIPEMD160_A;
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c.fips	2008-09-14 15:51:44.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_eay.c	2009-09-30 13:25:58.000000000 +0200
 @@ -114,6 +114,8 @@
  #include <openssl/bn.h>
  #include <openssl/rsa.h>
@@ -11200,7 +11303,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  	}
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_err.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_err.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_err.c.fips	2008-12-29 17:11:56.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_err.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_err.c	2009-09-30 13:25:58.000000000 +0200
 @@ -111,8 +111,12 @@ static ERR_STRING_DATA RSA_str_functs[]=
  {ERR_FUNC(RSA_F_RSA_PRINT_FP),	"RSA_print_fp"},
  {ERR_FUNC(RSA_F_RSA_PRIV_DECODE),	"RSA_PRIV_DECODE"},
@@ -11229,8 +11332,8 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  {ERR_REASON(RSA_R_P_NOT_PRIME)           ,"p not prime"},
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c.fips	2007-03-28 02:15:27.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c	2009-08-11 18:07:30.000000000 +0200
-@@ -67,6 +67,77 @@
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_gen.c	2009-09-30 16:55:26.000000000 +0200
+@@ -67,6 +67,82 @@
  #include "cryptlib.h"
  #include <openssl/bn.h>
  #include <openssl/rsa.h>
@@ -11252,16 +11355,19 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
 +	const unsigned char tbs[] = "RSA Pairwise Check Data";
 +	unsigned char *ctbuf = NULL, *ptbuf = NULL;
 +	int len, ret = 0;
-+	EVP_PKEY pk;
-+    	pk.type = EVP_PKEY_RSA;
-+    	pk.pkey.rsa = rsa;
++	EVP_PKEY *pk;
++
++	if ((pk=EVP_PKEY_new()) == NULL)
++		goto err;
++
++	EVP_PKEY_set1_RSA(pk, rsa);
 +
 +	/* Perform pairwise consistency signature test */
-+	if (!fips_pkey_signature_test(&pk, tbs, -1,
++	if (!fips_pkey_signature_test(pk, tbs, -1,
 +			NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PKCS1, NULL)
-+		|| !fips_pkey_signature_test(&pk, tbs, -1,
++		|| !fips_pkey_signature_test(pk, tbs, -1,
 +			NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_X931, NULL)
-+		|| !fips_pkey_signature_test(&pk, tbs, -1,
++		|| !fips_pkey_signature_test(pk, tbs, -1,
 +			NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PSS, NULL))
 +		goto err;
 +	/* Now perform pairwise consistency encrypt/decrypt test */
@@ -11301,6 +11407,8 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
 +		OPENSSL_free(ctbuf);
 +	if (ptbuf)
 +		OPENSSL_free(ptbuf);
++	if (pk)
++		EVP_PKEY_free(pk);
 +
 +	return ret;
 +	}
@@ -11308,7 +11416,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  
  static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb);
  
-@@ -90,6 +161,23 @@ static int rsa_builtin_keygen(RSA *rsa, 
+@@ -90,6 +166,23 @@ static int rsa_builtin_keygen(RSA *rsa, 
  	int bitsp,bitsq,ok= -1,n=0;
  	BN_CTX *ctx=NULL;
  
@@ -11332,7 +11440,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  	ctx=BN_CTX_new();
  	if (ctx == NULL) goto err;
  	BN_CTX_start(ctx);
-@@ -201,6 +289,17 @@ static int rsa_builtin_keygen(RSA *rsa, 
+@@ -201,6 +294,17 @@ static int rsa_builtin_keygen(RSA *rsa, 
  		p = rsa->p;
  	if (!BN_mod_inverse(rsa->iqmp,rsa->q,p,ctx)) goto err;
  
@@ -11351,8 +11459,8 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  err:
  	if (ok == -1)
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa.h.fips openssl-1.0.0-beta3/crypto/rsa/rsa.h
---- openssl-1.0.0-beta3/crypto/rsa/rsa.h.fips	2009-08-11 18:07:29.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa.h	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/crypto/rsa/rsa.h.fips	2009-09-30 13:25:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa.h	2009-09-30 13:25:58.000000000 +0200
 @@ -74,6 +74,21 @@
  #error RSA is disabled.
  #endif
@@ -11424,7 +11532,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  #define RSA_R_P_NOT_PRIME				 128
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c.fips	2008-08-06 17:54:14.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -80,6 +80,13 @@ RSA *RSA_new(void)
  
  void RSA_set_default_method(const RSA_METHOD *meth)
@@ -11556,7 +11664,7 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
 -	}
 diff -up openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c.fips openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c
 --- openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c.fips	2007-04-24 03:05:42.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/rsa/rsa_sign.c	2009-09-30 13:25:58.000000000 +0200
 @@ -130,7 +130,8 @@ int RSA_sign(int type, const unsigned ch
  		i2d_X509_SIG(&sig,&p);
  		s=tmps;
@@ -11588,9 +11696,57 @@ diff -up openssl-1.0.0-beta3/crypto/rsa/
  
  	if (i <= 0) goto err;
  
+diff -up openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips openssl-1.0.0-beta3/crypto/sha/sha_dgst.c
+--- openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips	2007-01-21 14:07:14.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/sha/sha_dgst.c	2009-09-30 13:25:58.000000000 +0200
+@@ -57,6 +57,12 @@
+  */
+ 
+ #include <openssl/opensslconf.h>
++#include <openssl/crypto.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
++#include <openssl/err.h>
+ #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
+ 
+ #undef  SHA_1
+diff -up openssl-1.0.0-beta3/crypto/sha/sha.h.fips openssl-1.0.0-beta3/crypto/sha/sha.h
+--- openssl-1.0.0-beta3/crypto/sha/sha.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha.h	2009-09-30 13:25:58.000000000 +0200
+@@ -106,6 +106,9 @@ typedef struct SHAstate_st
+ 	} SHA_CTX;
+ 
+ #ifndef OPENSSL_NO_SHA0
++#ifdef OPENSSL_FIPS
++int private_SHA_Init(SHA_CTX *c);
++#endif
+ int SHA_Init(SHA_CTX *c);
+ int SHA_Update(SHA_CTX *c, const void *data, size_t len);
+ int SHA_Final(unsigned char *md, SHA_CTX *c);
+diff -up openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips openssl-1.0.0-beta3/crypto/sha/sha_locl.h
+--- openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha_locl.h	2009-09-30 13:25:58.000000000 +0200
+@@ -122,8 +122,15 @@ void sha1_block_data_order (SHA_CTX *c, 
+ #define INIT_DATA_h3 0x10325476UL
+ #define INIT_DATA_h4 0xc3d2e1f0UL
+ 
++#if defined(SHA_0) && defined(OPENSSL_FIPS)
++FIPS_NON_FIPS_MD_Init(SHA)
++#else
+ int HASH_INIT (SHA_CTX *c)
++#endif
+ 	{
++#if defined(SHA_1) && defined(OPENSSL_FIPS)
++	FIPS_selftest_check();
++#endif
+ 	memset (c,0,sizeof(*c));
+ 	c->h0=INIT_DATA_h0;
+ 	c->h1=INIT_DATA_h1;
 diff -up openssl-1.0.0-beta3/crypto/sha/sha1dgst.c.fips openssl-1.0.0-beta3/crypto/sha/sha1dgst.c
 --- openssl-1.0.0-beta3/crypto/sha/sha1dgst.c.fips	2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha1dgst.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha1dgst.c	2009-09-30 13:25:58.000000000 +0200
 @@ -63,6 +63,10 @@
  #define SHA_1
  
@@ -11604,7 +11760,7 @@ diff -up openssl-1.0.0-beta3/crypto/sha/
  
 diff -up openssl-1.0.0-beta3/crypto/sha/sha256.c.fips openssl-1.0.0-beta3/crypto/sha/sha256.c
 --- openssl-1.0.0-beta3/crypto/sha/sha256.c.fips	2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha256.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha256.c	2009-09-30 13:25:58.000000000 +0200
 @@ -12,12 +12,19 @@
  
  #include <openssl/crypto.h>
@@ -11637,7 +11793,7 @@ diff -up openssl-1.0.0-beta3/crypto/sha/
  	c->h[2]=0x3c6ef372UL;	c->h[3]=0xa54ff53aUL;
 diff -up openssl-1.0.0-beta3/crypto/sha/sha512.c.fips openssl-1.0.0-beta3/crypto/sha/sha512.c
 --- openssl-1.0.0-beta3/crypto/sha/sha512.c.fips	2008-12-29 13:35:48.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha512.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/sha/sha512.c	2009-09-30 13:25:58.000000000 +0200
 @@ -5,6 +5,10 @@
   * ====================================================================
   */
@@ -11678,57 +11834,9 @@ diff -up openssl-1.0.0-beta3/crypto/sha/
  				asm ("rotrdi %0,%1,%2"	\
  				: "=r"(ret)		\
  				: "r"(a),"K"(n)); ret;	})
-diff -up openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips openssl-1.0.0-beta3/crypto/sha/sha_dgst.c
---- openssl-1.0.0-beta3/crypto/sha/sha_dgst.c.fips	2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/sha/sha_dgst.c	2009-08-11 18:07:30.000000000 +0200
-@@ -57,6 +57,12 @@
-  */
- 
- #include <openssl/opensslconf.h>
-+#include <openssl/crypto.h>
-+#ifdef OPENSSL_FIPS
-+#include <openssl/fips.h>
-+#endif
-+
-+#include <openssl/err.h>
- #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
- 
- #undef  SHA_1
-diff -up openssl-1.0.0-beta3/crypto/sha/sha.h.fips openssl-1.0.0-beta3/crypto/sha/sha.h
---- openssl-1.0.0-beta3/crypto/sha/sha.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/sha/sha.h	2009-08-11 18:07:30.000000000 +0200
-@@ -106,6 +106,9 @@ typedef struct SHAstate_st
- 	} SHA_CTX;
- 
- #ifndef OPENSSL_NO_SHA0
-+#ifdef OPENSSL_FIPS
-+int private_SHA_Init(SHA_CTX *c);
-+#endif
- int SHA_Init(SHA_CTX *c);
- int SHA_Update(SHA_CTX *c, const void *data, size_t len);
- int SHA_Final(unsigned char *md, SHA_CTX *c);
-diff -up openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips openssl-1.0.0-beta3/crypto/sha/sha_locl.h
---- openssl-1.0.0-beta3/crypto/sha/sha_locl.h.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/crypto/sha/sha_locl.h	2009-08-11 18:07:30.000000000 +0200
-@@ -122,8 +122,15 @@ void sha1_block_data_order (SHA_CTX *c, 
- #define INIT_DATA_h3 0x10325476UL
- #define INIT_DATA_h4 0xc3d2e1f0UL
- 
-+#if defined(SHA_0) && defined(OPENSSL_FIPS)
-+FIPS_NON_FIPS_MD_Init(SHA)
-+#else
- int HASH_INIT (SHA_CTX *c)
-+#endif
- 	{
-+#if defined(SHA_1) && defined(OPENSSL_FIPS)
-+	FIPS_selftest_check();
-+#endif
- 	memset (c,0,sizeof(*c));
- 	c->h0=INIT_DATA_h0;
- 	c->h1=INIT_DATA_h1;
 diff -up openssl-1.0.0-beta3/Makefile.org.fips openssl-1.0.0-beta3/Makefile.org
---- openssl-1.0.0-beta3/Makefile.org.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/Makefile.org	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/Makefile.org.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/Makefile.org	2009-09-30 13:25:58.000000000 +0200
 @@ -109,6 +109,9 @@ LIBKRB5=
  ZLIB_INCLUDE=
  LIBZLIB=
@@ -11756,124 +11864,9 @@ diff -up openssl-1.0.0-beta3/Makefile.or
  		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
  # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
  # which in turn eliminates ambiguities in variable treatment with -e.
-diff -up openssl-1.0.0-beta3/ssl/s23_clnt.c.fips openssl-1.0.0-beta3/ssl/s23_clnt.c
---- openssl-1.0.0-beta3/ssl/s23_clnt.c.fips	2009-04-07 19:01:07.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s23_clnt.c	2009-08-11 18:07:30.000000000 +0200
-@@ -332,6 +332,14 @@ static int ssl23_client_hello(SSL *s)
- 			version_major = TLS1_VERSION_MAJOR;
- 			version_minor = TLS1_VERSION_MINOR;
- 			}
-+#ifdef OPENSSL_FIPS
-+		else if(FIPS_mode())
-+			{
-+			SSLerr(SSL_F_SSL23_CLIENT_HELLO,
-+					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
-+			return -1;
-+			}
-+#endif
- 		else if (version == SSL3_VERSION)
- 			{
- 			version_major = SSL3_VERSION_MAJOR;
-@@ -615,6 +623,14 @@ static int ssl23_get_server_hello(SSL *s
- 		if ((p[2] == SSL3_VERSION_MINOR) &&
- 			!(s->options & SSL_OP_NO_SSLv3))
- 			{
-+#ifdef OPENSSL_FIPS
-+			if(FIPS_mode())
-+				{
-+				SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,
-+					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
-+				goto err;
-+				}
-+#endif
- 			s->version=SSL3_VERSION;
- 			s->method=SSLv3_client_method();
- 			}
-diff -up openssl-1.0.0-beta3/ssl/s23_srvr.c.fips openssl-1.0.0-beta3/ssl/s23_srvr.c
---- openssl-1.0.0-beta3/ssl/s23_srvr.c.fips	2008-06-03 04:48:34.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s23_srvr.c	2009-08-11 18:07:30.000000000 +0200
-@@ -386,6 +386,15 @@ int ssl23_get_client_hello(SSL *s)
- 			}
- 		}
- 
-+#ifdef OPENSSL_FIPS
-+	if (FIPS_mode() && (s->version < TLS1_VERSION))
-+		{
-+		SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
-+					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
-+		goto err;
-+		}
-+#endif
-+
- 	if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
- 		{
- 		/* we have SSLv3/TLSv1 in an SSLv2 header
-diff -up openssl-1.0.0-beta3/ssl/s3_clnt.c.fips openssl-1.0.0-beta3/ssl/s3_clnt.c
---- openssl-1.0.0-beta3/ssl/s3_clnt.c.fips	2009-06-16 18:39:20.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s3_clnt.c	2009-08-11 18:07:30.000000000 +0200
-@@ -156,6 +156,10 @@
- #include <openssl/objects.h>
- #include <openssl/evp.h>
- #include <openssl/md5.h>
-+#ifdef OPENSSL_FIPS
-+#include <openssl/fips.h>
-+#endif
-+
- #ifndef OPENSSL_NO_DH
- #include <openssl/dh.h>
- #endif
-@@ -1524,6 +1528,8 @@ int ssl3_get_key_exchange(SSL *s)
- 			q=md_buf;
- 			for (num=2; num > 0; num--)
- 				{
-+				EVP_MD_CTX_set_flags(&md_ctx,
-+					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 				EVP_DigestInit_ex(&md_ctx,(num == 2)
- 					?s->ctx->md5:s->ctx->sha1, NULL);
- 				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-diff -up openssl-1.0.0-beta3/ssl/s3_enc.c.fips openssl-1.0.0-beta3/ssl/s3_enc.c
---- openssl-1.0.0-beta3/ssl/s3_enc.c.fips	2009-04-16 19:22:50.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s3_enc.c	2009-08-11 18:07:30.000000000 +0200
-@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
- #endif
- 	k=0;
- 	EVP_MD_CTX_init(&m5);
-+	EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 	EVP_MD_CTX_init(&s1);
- 	for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
- 		{
-@@ -614,6 +615,8 @@ int ssl3_digest_cached_records(SSL *s)
- 		if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
- 			{
- 			s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
-+			EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
-+				EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 			EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
- 			EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
- 			} 
-@@ -670,6 +673,7 @@ static int ssl3_handshake_mac(SSL *s, in
- 		return 0;
- 	}	
- 	EVP_MD_CTX_init(&ctx);
-+	EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 	EVP_MD_CTX_copy_ex(&ctx,d);
- 	n=EVP_MD_CTX_size(&ctx);
- 	if (n < 0)
-diff -up openssl-1.0.0-beta3/ssl/s3_srvr.c.fips openssl-1.0.0-beta3/ssl/s3_srvr.c
---- openssl-1.0.0-beta3/ssl/s3_srvr.c.fips	2009-06-26 17:04:22.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/s3_srvr.c	2009-08-11 18:07:30.000000000 +0200
-@@ -1674,6 +1674,8 @@ int ssl3_send_server_key_exchange(SSL *s
- 				j=0;
- 				for (num=2; num > 0; num--)
- 					{
-+					EVP_MD_CTX_set_flags(&md_ctx,
-+						EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- 					EVP_DigestInit_ex(&md_ctx,(num == 2)
- 						?s->ctx->md5:s->ctx->sha1, NULL);
- 					EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips openssl-1.0.0-beta3/ssl/ssl_ciph.c
 --- openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips	2009-04-07 14:10:59.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-09-30 13:25:58.000000000 +0200
 @@ -727,6 +727,9 @@ static void ssl_cipher_collect_ciphers(c
  		    !(c->algorithm_auth & disabled_auth) &&
  		    !(c->algorithm_enc & disabled_enc) &&
@@ -11898,7 +11891,7 @@ diff -up openssl-1.0.0-beta3/ssl/ssl_cip
  #ifdef CIPHER_DEBUG
 diff -up openssl-1.0.0-beta3/ssl/ssl_lib.c.fips openssl-1.0.0-beta3/ssl/ssl_lib.c
 --- openssl-1.0.0-beta3/ssl/ssl_lib.c.fips	2009-06-30 13:57:24.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-09-30 13:25:58.000000000 +0200
 @@ -1470,6 +1470,14 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
  		return(NULL);
  		}
@@ -11915,8 +11908,8 @@ diff -up openssl-1.0.0-beta3/ssl/ssl_lib
  		{
  		SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
 diff -up openssl-1.0.0-beta3/ssl/ssltest.c.fips openssl-1.0.0-beta3/ssl/ssltest.c
---- openssl-1.0.0-beta3/ssl/ssltest.c.fips	2009-08-11 18:07:30.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/ssltest.c	2009-08-11 18:07:30.000000000 +0200
+--- openssl-1.0.0-beta3/ssl/ssltest.c.fips	2009-09-30 13:25:57.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssltest.c	2009-09-30 13:25:58.000000000 +0200
 @@ -265,6 +265,9 @@ static void sv_usage(void)
  	{
  	fprintf(stderr,"usage: ssltest [args ...]\n");
@@ -11991,9 +11984,124 @@ diff -up openssl-1.0.0-beta3/ssl/ssltest
  	if(s->version == TLS1_VERSION)
  		FIPS_allow_md5(0);
  # endif
+diff -up openssl-1.0.0-beta3/ssl/s23_clnt.c.fips openssl-1.0.0-beta3/ssl/s23_clnt.c
+--- openssl-1.0.0-beta3/ssl/s23_clnt.c.fips	2009-04-07 19:01:07.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s23_clnt.c	2009-09-30 13:25:58.000000000 +0200
+@@ -332,6 +332,14 @@ static int ssl23_client_hello(SSL *s)
+ 			version_major = TLS1_VERSION_MAJOR;
+ 			version_minor = TLS1_VERSION_MINOR;
+ 			}
++#ifdef OPENSSL_FIPS
++		else if(FIPS_mode())
++			{
++			SSLerr(SSL_F_SSL23_CLIENT_HELLO,
++					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
++			return -1;
++			}
++#endif
+ 		else if (version == SSL3_VERSION)
+ 			{
+ 			version_major = SSL3_VERSION_MAJOR;
+@@ -615,6 +623,14 @@ static int ssl23_get_server_hello(SSL *s
+ 		if ((p[2] == SSL3_VERSION_MINOR) &&
+ 			!(s->options & SSL_OP_NO_SSLv3))
+ 			{
++#ifdef OPENSSL_FIPS
++			if(FIPS_mode())
++				{
++				SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,
++					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
++				goto err;
++				}
++#endif
+ 			s->version=SSL3_VERSION;
+ 			s->method=SSLv3_client_method();
+ 			}
+diff -up openssl-1.0.0-beta3/ssl/s23_srvr.c.fips openssl-1.0.0-beta3/ssl/s23_srvr.c
+--- openssl-1.0.0-beta3/ssl/s23_srvr.c.fips	2008-06-03 04:48:34.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s23_srvr.c	2009-09-30 13:25:58.000000000 +0200
+@@ -386,6 +386,15 @@ int ssl23_get_client_hello(SSL *s)
+ 			}
+ 		}
+ 
++#ifdef OPENSSL_FIPS
++	if (FIPS_mode() && (s->version < TLS1_VERSION))
++		{
++		SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
++					SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
++		goto err;
++		}
++#endif
++
+ 	if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
+ 		{
+ 		/* we have SSLv3/TLSv1 in an SSLv2 header
+diff -up openssl-1.0.0-beta3/ssl/s3_clnt.c.fips openssl-1.0.0-beta3/ssl/s3_clnt.c
+--- openssl-1.0.0-beta3/ssl/s3_clnt.c.fips	2009-06-16 18:39:20.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s3_clnt.c	2009-09-30 13:25:58.000000000 +0200
+@@ -156,6 +156,10 @@
+ #include <openssl/objects.h>
+ #include <openssl/evp.h>
+ #include <openssl/md5.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
+ #ifndef OPENSSL_NO_DH
+ #include <openssl/dh.h>
+ #endif
+@@ -1524,6 +1528,8 @@ int ssl3_get_key_exchange(SSL *s)
+ 			q=md_buf;
+ 			for (num=2; num > 0; num--)
+ 				{
++				EVP_MD_CTX_set_flags(&md_ctx,
++					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 				EVP_DigestInit_ex(&md_ctx,(num == 2)
+ 					?s->ctx->md5:s->ctx->sha1, NULL);
+ 				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
+diff -up openssl-1.0.0-beta3/ssl/s3_enc.c.fips openssl-1.0.0-beta3/ssl/s3_enc.c
+--- openssl-1.0.0-beta3/ssl/s3_enc.c.fips	2009-04-16 19:22:50.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s3_enc.c	2009-09-30 13:25:58.000000000 +0200
+@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
+ #endif
+ 	k=0;
+ 	EVP_MD_CTX_init(&m5);
++	EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 	EVP_MD_CTX_init(&s1);
+ 	for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
+ 		{
+@@ -614,6 +615,8 @@ int ssl3_digest_cached_records(SSL *s)
+ 		if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
+ 			{
+ 			s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
++			EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
++				EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 			EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
+ 			EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
+ 			} 
+@@ -670,6 +673,7 @@ static int ssl3_handshake_mac(SSL *s, in
+ 		return 0;
+ 	}	
+ 	EVP_MD_CTX_init(&ctx);
++	EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 	EVP_MD_CTX_copy_ex(&ctx,d);
+ 	n=EVP_MD_CTX_size(&ctx);
+ 	if (n < 0)
+diff -up openssl-1.0.0-beta3/ssl/s3_srvr.c.fips openssl-1.0.0-beta3/ssl/s3_srvr.c
+--- openssl-1.0.0-beta3/ssl/s3_srvr.c.fips	2009-06-26 17:04:22.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/s3_srvr.c	2009-09-30 13:25:58.000000000 +0200
+@@ -1674,6 +1674,8 @@ int ssl3_send_server_key_exchange(SSL *s
+ 				j=0;
+ 				for (num=2; num > 0; num--)
+ 					{
++					EVP_MD_CTX_set_flags(&md_ctx,
++						EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+ 					EVP_DigestInit_ex(&md_ctx,(num == 2)
+ 						?s->ctx->md5:s->ctx->sha1, NULL);
+ 					EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 diff -up openssl-1.0.0-beta3/ssl/t1_enc.c.fips openssl-1.0.0-beta3/ssl/t1_enc.c
 --- openssl-1.0.0-beta3/ssl/t1_enc.c.fips	2009-04-19 20:03:13.000000000 +0200
-+++ openssl-1.0.0-beta3/ssl/t1_enc.c	2009-08-11 18:07:30.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/t1_enc.c	2009-09-30 13:25:58.000000000 +0200
 @@ -169,6 +169,8 @@ static void tls1_P_hash(const EVP_MD *md
  
  	HMAC_CTX_init(&ctx);


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-12/openssl.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- openssl.spec	4 Sep 2009 12:08:42 -0000	1.141
+++ openssl.spec	30 Sep 2009 18:34:35 -0000	1.142
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.7.%{beta}%{?dist}
+Release: 0.8.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -63,10 +63,10 @@ Patch49: openssl-0.9.8k-algo-doc.patch
 Patch50: openssl-1.0.0-beta3-curl.patch
 Patch51: openssl-1.0.0-beta3-const.patch
 Patch52: openssl-1.0.0-beta3-dss1.patch
-Patch53: openssl-1.0.0-beta3-cmll-noasm.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
+Patch62: openssl-1.0.0-beta3-camellia-rounds.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -148,9 +148,9 @@ from other formats to the formats used b
 %patch50 -p1 -b .curl
 %patch51 -p1 -b .const
 %patch52 -p1 -b .dss1
-%patch53 -p1 -b .cmll-noasm
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
+%patch62 -p1 -b .cmll-rounds
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -399,6 +399,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 30 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.8.beta3
+- fix RSA and DSA FIPS selftests
+- reenable fixed x86_64 camellia assembler code (#521127)
+
 * Fri Sep  4 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.7.beta3
 - temporarily disable x86_64 camellia assembler code (#521127)
 


--- openssl-1.0.0-beta3-cmll-noasm.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 30 18:37:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 18:37:12 +0000 (UTC)
Subject: rpms/amarok/F-11 .cvsignore, 1.45, 1.46 amarok.spec, 1.151,
	1.152 sources, 1.47, 1.48 amarok-2.1.1-lyricwiki.patch, 1.1, NONE
Message-ID: <20090930183712.D8C1211C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv404

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.1.1-lyricwiki.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
- amarok-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	13 Jun 2009 23:25:03 -0000	1.45
+++ .cvsignore	30 Sep 2009 18:37:12 -0000	1.46
@@ -1 +1 @@
-amarok-2.1.1.tar.bz2
+amarok-2.2.0.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- amarok.spec	2 Sep 2009 17:19:09 -0000	1.151
+++ amarok.spec	30 Sep 2009 18:37:12 -0000	1.152
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.1
-Release: 5%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,15 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=202366
-Patch100: amarok-2.1.1-lyricwiki.patch
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
+BuildRequires: liblastfm-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
@@ -32,16 +29,18 @@ BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
-BuildRequires: taglib-devel
-BuildRequires: taglib-extras-devel
+BuildRequires: taglib-devel >= 1.6
+BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
-%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# when we grew a -libs subpkg, multilib love
+Obsoletes: amarok < 2.1.80
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -54,6 +53,15 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%description libs
+%{summary}.
+
 %package utils
 Summary: Amarok standalone utilities
 Group: Applications/Multimedia
@@ -64,10 +72,9 @@ Obsoletes: amarok-utilities < 2.0.96
 
 
 %prep
-%setup -q
+%setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .lyricwiki
 
 
 %build
@@ -84,12 +91,15 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang amarok
-%find_lang amarokcollectionscanner_qt
+%find_lang amarok 
+%find_lang amarokcollectionscanner_qt 
+%find_lang amarokpkg 
+%find_lang amarok_scriptengine_qscript 
+cat amarokpkg.lang >> amarok.lang
+cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
-rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
+rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud,ocsclient}.so
 
 
 %check
@@ -101,7 +111,6 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %posttrans
@@ -109,26 +118,31 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f amarok.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_kde4_bindir}/amarok
+%{_kde4_bindir}/amarokpkg
 %{_kde4_bindir}/amarok_afttagger
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
-%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
+%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
 %{_kde4_configdir}/amarok_homerc
+%{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -137,20 +151,45 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/libamarok*.so.*
-%{_kde4_libdir}/libmediadevicelib.so.*
-%{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libamaroklib.so.1*
+%{_kde4_libdir}/libamarokocsclient.so.4*
+%{_kde4_libdir}/libamarokpud.so.1*
+
 %files utils -f amarokcollectionscanner_qt.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/amarokcollectionscanner
 
 
 %changelog
-* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-5
-- lyricwiki patch respin (kdebug#202366)
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- amarok-2.2.0
+
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
+- 20090923git snapshot
+
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
+- amarok-2.1.90 (2.2rc1)
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
+- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
+
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
+- amarok-2.1.85 (2.2beta2)
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
+- another lyricwiki fix
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
+- amarok-2.1.80 (2.2beta1)
+- -libs subpkg
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-5
+- rebuilt with new openssl
 
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
 - lyricwiki patch (kdebug#202366)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	13 Jun 2009 23:25:03 -0000	1.47
+++ sources	30 Sep 2009 18:37:12 -0000	1.48
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2


--- amarok-2.1.1-lyricwiki.patch DELETED ---



From rdieter at fedoraproject.org  Wed Sep 30 18:40:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 18:40:46 +0000 (UTC)
Subject: rpms/amarok/F-10 .cvsignore, 1.45, 1.46 amarok.spec, 1.147,
	1.148 sources, 1.47, 1.48 amarok-parse-lyricwiki-website.patch,
	1.1, NONE
Message-ID: <20090930184046.6974711C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2331

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
- amarok-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	14 Jun 2009 00:08:07 -0000	1.45
+++ .cvsignore	30 Sep 2009 18:40:44 -0000	1.46
@@ -1 +1 @@
-amarok-2.1.1.tar.bz2
+amarok-2.2.0.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- amarok.spec	9 Aug 2009 00:16:35 -0000	1.147
+++ amarok.spec	30 Sep 2009 18:40:45 -0000	1.148
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.1
-Release: 4%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,15 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=202366
-Patch100: amarok-parse-lyricwiki-website.patch
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
+BuildRequires: liblastfm-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
@@ -32,16 +29,18 @@ BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
-BuildRequires: taglib-devel
-BuildRequires: taglib-extras-devel
+BuildRequires: taglib-devel >= 1.6
+BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
-%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# when we grew a -libs subpkg, multilib love
+Obsoletes: amarok < 2.1.80
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -54,6 +53,15 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%description libs
+%{summary}.
+
 %package utils
 Summary: Amarok standalone utilities
 Group: Applications/Multimedia
@@ -64,10 +72,9 @@ Obsoletes: amarok-utilities < 2.0.96
 
 
 %prep
-%setup -q
+%setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .lyricwiki
 
 
 %build
@@ -84,12 +91,15 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang amarok
-%find_lang amarokcollectionscanner_qt
+%find_lang amarok 
+%find_lang amarokcollectionscanner_qt 
+%find_lang amarokpkg 
+%find_lang amarok_scriptengine_qscript 
+cat amarokpkg.lang >> amarok.lang
+cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
-rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
+rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud,ocsclient}.so
 
 
 %check
@@ -101,7 +111,6 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %posttrans
@@ -109,26 +118,31 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f amarok.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_kde4_bindir}/amarok
+%{_kde4_bindir}/amarokpkg
 %{_kde4_bindir}/amarok_afttagger
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
-%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
+%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
 %{_kde4_configdir}/amarok_homerc
+%{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -137,18 +151,46 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/libamarok*.so.*
-%{_kde4_libdir}/libmediadevicelib.so.*
-%{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libamaroklib.so.1*
+%{_kde4_libdir}/libamarokocsclient.so.4*
+%{_kde4_libdir}/libamarokpud.so.1*
+
 %files utils -f amarokcollectionscanner_qt.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/amarokcollectionscanner
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- amarok-2.2.0
+
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
+- 20090923git snapshot
+
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
+- amarok-2.1.90 (2.2rc1)
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
+- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
+
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
+- amarok-2.1.85 (2.2beta2)
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
+- another lyricwiki fix
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
+- amarok-2.1.80 (2.2beta1)
+- -libs subpkg
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-5
+- rebuilt with new openssl
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
 - lyricwiki patch (kdebug#202366)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	14 Jun 2009 00:08:07 -0000	1.47
+++ sources	30 Sep 2009 18:40:45 -0000	1.48
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2


--- amarok-parse-lyricwiki-website.patch DELETED ---



From nsantos at fedoraproject.org  Wed Sep 30 18:42:19 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 18:42:19 +0000 (UTC)
Subject: rpms/amqp/F-10 .cvsignore, 1.17, 1.18 amqp.spec, 1.22, 1.23 sources,
	1.20, 1.21
Message-ID: <20090930184219.D0E6511C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2994

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	2 Jul 2009 16:52:57 -0000	1.17
+++ .cvsignore	30 Sep 2009 18:42:18 -0000	1.18
@@ -1 +1 @@
-amqp-1.0.790661.tar.gz
+amqp-1.0.819819.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/amqp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- amqp.spec	2 Jul 2009 16:52:57 -0000	1.22
+++ amqp.spec	30 Sep 2009 18:42:18 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.790661
+Version:        1.0.819819
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,6 +39,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.818599-1
+- Rebased to svn rev 818599
+
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.816781-1
+- Rebased to svn rev 816781
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.790661-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  2 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.790661-1
 - Rebased to svn rev 790661
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	2 Jul 2009 16:52:57 -0000	1.20
+++ sources	30 Sep 2009 18:42:18 -0000	1.21
@@ -1 +1 @@
-10dacce89b0c319b5b23ba76470ba6bd  amqp-1.0.790661.tar.gz
+da0f6c461ed35ed045bd27b0f7688eff  amqp-1.0.819819.tar.gz



From nsantos at fedoraproject.org  Wed Sep 30 18:43:25 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 18:43:25 +0000 (UTC)
Subject: rpms/amqp/F-11 .cvsignore, 1.17, 1.18 amqp.spec, 1.23, 1.24 sources,
	1.20, 1.21
Message-ID: <20090930184325.4562011C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3573

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	2 Jul 2009 16:59:02 -0000	1.17
+++ .cvsignore	30 Sep 2009 18:43:24 -0000	1.18
@@ -1 +1 @@
-amqp-1.0.790661.tar.gz
+amqp-1.0.819819.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-11/amqp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- amqp.spec	2 Jul 2009 16:59:02 -0000	1.23
+++ amqp.spec	30 Sep 2009 18:43:24 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.790661
+Version:        1.0.819819
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,6 +39,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.818599-1
+- Rebased to svn rev 818599
+
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.816781-1
+- Rebased to svn rev 816781
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.790661-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  2 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.790661-1
 - Rebased to svn rev 790661
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	2 Jul 2009 16:59:02 -0000	1.20
+++ sources	30 Sep 2009 18:43:24 -0000	1.21
@@ -1 +1 @@
-10dacce89b0c319b5b23ba76470ba6bd  amqp-1.0.790661.tar.gz
+da0f6c461ed35ed045bd27b0f7688eff  amqp-1.0.819819.tar.gz



From nsantos at fedoraproject.org  Wed Sep 30 18:49:05 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 18:49:05 +0000 (UTC)
Subject: rpms/python-qpid/F-11 python-qpid.spec,1.26,1.27 sources,1.20,1.21
Message-ID: <20090930184905.98C8511C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6221

Modified Files:
	python-qpid.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-11/python-qpid.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-qpid.spec	2 Jul 2009 17:22:23 -0000	1.26
+++ python-qpid.spec	30 Sep 2009 18:49:05 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.5.790661
+Version:        0.5.819819
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.790661
+Requires:       amqp >= 1.0.819819
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -45,7 +45,7 @@ install -d $RPM_BUILD_ROOT%{python_sitel
 install -pm 0644 *.* qpid/*.py $RPM_BUILD_ROOT%{python_sitelib}/qpid
 install -pm 0644 qpid_config.* $RPM_BUILD_ROOT%{python_sitelib}
 install -d $RPM_BUILD_ROOT%{_bindir}
-install -pm 0755 run-tests $RPM_BUILD_ROOT%{_bindir}/python-qpid-tests
+#install -pm 0755 run-tests $RPM_BUILD_ROOT%{_bindir}/python-qpid-tests
 install -pm 0755 commands/* $RPM_BUILD_ROOT%{_bindir}
 install -pm 0644 mllib/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/mllib
 install -pm 0644 doc/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/doc
@@ -68,13 +68,25 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/qpid
 %{python_sitelib}/qpid_config.*
 %{python_sitelib}/qmf
-%{_bindir}/python-qpid-tests
+#%{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt examples/
 
 
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for Fedora 12 beta
+
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
+- Rebased to svn rev 816781
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.790661-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.790661-1
 - Rebased to svn rev 790661
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	2 Jul 2009 17:22:23 -0000	1.20
+++ sources	30 Sep 2009 18:49:05 -0000	1.21
@@ -1 +1 @@
-17f2af041cf2ed18cf0982c0dffdfdc9  python-qpid-0.5.790661.tar.gz
+f219fe06eb21ff0807e9cfb70d9d07be  python-qpid-0.5.819819.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 30 18:50:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 18:50:24 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.932,1.933
Message-ID: <20090930185024.3335D11C043C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6582

Modified Files:
	selinux-policy.spec 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
- Add plymouth policy



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -p -r1.932 -r1.933
--- selinux-policy.spec	30 Sep 2009 17:37:44 -0000	1.932
+++ selinux-policy.spec	30 Sep 2009 18:50:23 -0000	1.933
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -448,7 +448,10 @@ exit 0
 %endif
 
 %changelog
-* Tue Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
+- Add plymouth policy
+
+* Tue Sep 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
 - Allow cupsd_config to read user tmp
 - Allow snmpd_t to signal itself
 - Allow sysstat_t to makedir in sysstat_log_t



From dwalsh at fedoraproject.org  Wed Sep 30 18:57:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 18:57:24 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.34,
	1.35 modules-mls.conf, 1.58, 1.59 modules-targeted.conf, 1.143,
	1.144 policy-F12.patch, 1.93, 1.94 selinux-policy.spec, 1.930, 1.931
Message-ID: <20090930185725.0362811C01EA@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8515

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
- Add plymouth policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- modules-minimum.conf	16 Sep 2009 17:50:32 -0000	1.34
+++ modules-minimum.conf	30 Sep 2009 18:57:20 -0000	1.35
@@ -233,6 +233,13 @@ cipe = module
 chronyd = module
 
 # Layer: services
+# Module: cobbler
+#
+# cobbler
+# 
+cobbler = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.
@@ -1193,6 +1200,20 @@ rgmanager = module
 rhcs = module
  
 # Layer: services
+# Module: aisexec
+#
+# RHCS - Red Hat Cluster Suite
+#
+aisexec = module
+ 
+# Layer: services
+# Module: rgmanager
+#
+# rgmanager
+# 
+rgmanager = module
+
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager
@@ -1739,6 +1760,13 @@ aide = module
 w3c = module
 
 # Layer: services
+# Module: plymouth
+#
+#  Plymouth
+# 
+plymouth = module
+
+# Layer: services
 # Module: portreserve
 #
 #  reserve ports to prevent portmap mapping them


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-mls.conf,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- modules-mls.conf	8 Sep 2009 23:55:30 -0000	1.58
+++ modules-mls.conf	30 Sep 2009 18:57:21 -0000	1.59
@@ -543,6 +543,13 @@ gnomeclock = module
 hal = module
 
 # Layer: services
+# Module: plymouth
+#
+#  Plymouth
+# 
+plymouth = module
+
+# Layer: services
 # Module: policykit
 #
 # Hardware abstraction layer


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- modules-targeted.conf	16 Sep 2009 17:50:32 -0000	1.143
+++ modules-targeted.conf	30 Sep 2009 18:57:21 -0000	1.144
@@ -233,6 +233,13 @@ cipe = module
 chronyd = module
 
 # Layer: services
+# Module: cobbler
+#
+# cobbler
+# 
+cobbler = module
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.
@@ -1193,6 +1200,20 @@ rgmanager = module
 rhcs = module
  
 # Layer: services
+# Module: aisexec
+#
+# RHCS - Red Hat Cluster Suite
+#
+aisexec = module
+ 
+# Layer: services
+# Module: rgmanager
+#
+# rgmanager
+# 
+rgmanager = module
+
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager
@@ -1739,6 +1760,13 @@ aide = module
 w3c = module
 
 # Layer: services
+# Module: plymouth
+#
+#  Plymouth
+# 
+plymouth = module
+
+# Layer: services
 # Module: portreserve
 #
 #  reserve ports to prevent portmap mapping them

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   28 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 330 files changed, 15540 insertions(+), 2595 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.93 -r 1.94 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- policy-F12.patch	25 Sep 2009 18:47:06 -0000	1.93
+++ policy-F12.patch	30 Sep 2009 18:57:21 -0000	1.94
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
---- nsaserefpolicy/Makefile	2009-08-18 08:41:14.000000000 -0700
-+++ serefpolicy-3.6.32/Makefile	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
++++ serefpolicy-3.6.32/Makefile	2009-09-16 10:03:08.000000000 -0400
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -11,8 +11,8 @@ diff -b -B --ignore-all-space --exclude-
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
---- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 10:30:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 13:41:29.000000000 -0700
+--- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 16:41:29.000000000 -0400
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -22,8 +22,8 @@ diff -b -B --ignore-all-space --exclude-
  
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2009-07-23 11:11:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 10:03:08.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -60,8 +60,8 @@ diff -b -B --ignore-all-space --exclude-
 +gen_tunable(mmap_low_allowed, false)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
---- nsaserefpolicy/policy/mcs	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/mcs	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/mcs	2009-09-16 10:03:08.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -96,8 +96,8 @@ diff -b -B --ignore-all-space --exclude-
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
---- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 10:03:08.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -116,8 +116,8 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
---- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-21 05:25:17.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-21 08:25:17.000000000 -0400
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -128,8 +128,8 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_sysctl(brctl_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
---- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 06:23:16.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 10:03:08.000000000 -0400
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -140,16 +140,16 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
---- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 10:03:08.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
---- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 10:03:08.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -185,8 +185,8 @@ diff -b -B --ignore-all-space --exclude-
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
---- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 10:03:08.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -210,8 +210,8 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
---- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 10:03:08.000000000 -0400
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -255,8 +255,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
---- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 10:03:08.000000000 -0400
 @@ -136,4 +136,5 @@
  
  optional_policy(`
@@ -264,8 +264,8 @@ diff -b -B --ignore-all-space --exclude-
 +	samba_read_share_files(logwatch_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
---- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 06:23:16.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 10:03:08.000000000 -0400
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -275,8 +275,8 @@ diff -b -B --ignore-all-space --exclude-
  netutils_domtrans_ping(mrtg_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 10:03:08.000000000 -0400
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(netutils_t)
@@ -286,8 +286,8 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_all_users_fds(netutils_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
---- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 15:39:50.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 10:03:08.000000000 -0400
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -298,8 +298,8 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:unix_stream_socket create_socket_perms;
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.32/policy/modules/admin/prelink.if
---- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 10:03:08.000000000 -0400
 @@ -151,11 +151,11 @@
  ##	</summary>
  ## </param>
@@ -315,8 +315,8 @@ diff -b -B --ignore-all-space --exclude-
 +	relabel_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.32/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 10:03:08.000000000 -0400
 @@ -89,6 +89,7 @@
  miscfiles_read_localization(prelink_t)
  
@@ -326,8 +326,8 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amanda_manage_lib(prelink_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.32/policy/modules/admin/readahead.te
---- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 06:09:20.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-16 07:03:08.000000000 -0700
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-16 10:03:08.000000000 -0400
[...5223 lines suppressed...]
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1322,7 @@
+@@ -1211,6 +1323,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26826,7 +27848,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1388,15 @@
+@@ -1276,11 +1389,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26842,7 +27864,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1507,13 @@
+@@ -1391,12 +1508,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26857,7 +27879,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1546,14 @@
+@@ -1429,6 +1547,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26872,7 +27894,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1569,11 @@
+@@ -1444,9 +1570,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26884,7 +27906,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1630,25 @@
+@@ -1503,6 +1631,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26910,7 +27932,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1723,8 @@
+@@ -1577,6 +1724,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26919,7 +27941,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1818,7 @@
+@@ -1670,6 +1819,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26927,7 +27949,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1797,19 +1946,32 @@
+@@ -1797,19 +1947,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26967,7 +27989,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2006,7 @@
+@@ -1844,6 +2007,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26975,7 +27997,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2554,7 @@
+@@ -2391,27 +2555,7 @@
  
  ########################################
  ## <summary>
@@ -27004,7 +28026,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2908,32 @@
+@@ -2765,11 +2909,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27039,7 +28061,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3061,25 @@
+@@ -2897,7 +3062,25 @@
  		type user_tmp_t;
  	')
  
@@ -27066,7 +28088,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3116,7 @@
+@@ -2934,6 +3117,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27074,7 +28096,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3247,559 @@
+@@ -3064,3 +3248,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -27635,8 +28657,8 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 user_tmp_t:file { getattr append };
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 10:30:04.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 10:03:09.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27723,8 +28745,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
---- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 10:03:09.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -27753,8 +28775,8 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 10:03:09.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -27806,8 +28828,8 @@ diff -b -B --ignore-all-space --exclude-
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 13:14:31.000000000 -0700
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 10:03:09.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28106,8 +29128,8 @@ diff -b -B --ignore-all-space --exclude-
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
---- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 10:03:09.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -28141,8 +29163,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
---- nsaserefpolicy/policy/users	2009-07-14 11:19:57.000000000 -0700
-+++ serefpolicy-3.6.32/policy/users	2009-09-16 07:03:09.000000000 -0700
+--- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/users	2009-09-16 10:03:09.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -p -r1.930 -r1.931
--- selinux-policy.spec	25 Sep 2009 18:47:07 -0000	1.930
+++ selinux-policy.spec	30 Sep 2009 18:57:22 -0000	1.931
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 11%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -432,7 +432,7 @@ SELinux Reference policy mls base module
 %saveFileContext mls
 
 %post mls 
-semodule -n -s mls -r mailscanner -r polkit 2>/dev/null
+semodule -n -s mls -r mailscanner -r polkit -r ModemManager 2>/dev/null
 packages="%{expand:%%moduleList mls}"
 %loadpolicy mls $packages
 
@@ -448,6 +448,17 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
+- Add plymouth policy
+
+* Tue Sep 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
+- Allow cupsd_config to read user tmp
+- Allow snmpd_t to signal itself
+- Allow sysstat_t to makedir in sysstat_log_t
+
+* Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-12
+- Update rhcs policy
+
 * Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-11
 - Allow users to exec restorecond
 



From nsantos at fedoraproject.org  Wed Sep 30 19:03:36 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 19:03:36 +0000 (UTC)
Subject: rpms/ruby-qpid/F-11 ruby-qpid.spec,1.18,1.19 sources,1.14,1.15
Message-ID: <20090930190336.578BB11C00E6@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-serv10971

Modified Files:
	ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-11/ruby-qpid.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ruby-qpid.spec	28 Jul 2009 17:00:00 -0000	1.18
+++ ruby-qpid.spec	30 Sep 2009 19:03:36 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version: 	0.5.795209
+Version: 	0.5.819819
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -22,12 +22,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.790661
+BuildRequires:  amqp >= 1.0.819819
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.790661
+Requires:       amqp >= 1.0.819819
 Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
@@ -65,9 +65,21 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt NOTICE.txt RELEASE_NOTES
 
 %changelog
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
+* Fri Sep 25 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+
+* Fri Sep 18 2009 Nuno Santos <nsantos at redhat.com> - 0.5.816781-1
+- Rebased to svn rev 816781
+
 * Tue Jul 28 2009 Nuno Santos <nsantos at redhat.com> - 0.5.795209-1
 - Rebased to svn rev 795209
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.791584-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Nuno Santos <nsantos at redhat.com> - 0.5.791584-1
 - Rebased to svn rev 791584
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	28 Jul 2009 17:00:00 -0000	1.14
+++ sources	30 Sep 2009 19:03:36 -0000	1.15
@@ -1 +1 @@
-38a0a3a6f4678c8812bafae146d6c00d  ruby-qpid-0.5.795209.tar.gz
+a3805e1bc124d9c44e7c281380f9f80c  ruby-qpid-0.5.819819.tar.gz



From agoode at fedoraproject.org  Wed Sep 30 19:08:53 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 30 Sep 2009 19:08:53 +0000 (UTC)
Subject: rpms/debootstrap/devel debootstrap-1.0.19-devices.patch, 1.1,
	1.2 debootstrap.spec, 1.10, 1.11
Message-ID: <20090930190853.16BCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/debootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12526

Modified Files:
	debootstrap-1.0.19-devices.patch debootstrap.spec 
Log Message:
* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
- Make sure to create /dev/console in devices.tar.gz


debootstrap-1.0.19-devices.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: debootstrap-1.0.19-devices.patch
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/devel/debootstrap-1.0.19-devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- debootstrap-1.0.19-devices.patch	30 Sep 2009 17:06:27 -0000	1.1
+++ debootstrap-1.0.19-devices.patch	30 Sep 2009 19:08:52 -0000	1.2
@@ -1,11 +1,13 @@
 diff -ur debootstrap.orig/Makefile debootstrap/Makefile
 --- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
-+++ debootstrap/Makefile	2009-09-30 12:58:12.210944282 -0400
-@@ -40,6 +40,6 @@
++++ debootstrap/Makefile	2009-09-30 15:01:01.899945579 -0400
+@@ -40,6 +40,8 @@
  	mkdir -p dev
  	chown 0:0 dev
  	chmod 755 dev
 -	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
-+	$(MAKEDEV) -d dev std ptmx fd consoleonly
++	$(MAKEDEV) -d dev std ptmx fd
++	$(MAKEDEV) -d dev -x console
++	mknod dev/console c 5 1
  	tar cf - dev | gzip -9 >devices.tar.gz
  	rm -rf dev


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/devel/debootstrap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- debootstrap.spec	30 Sep 2009 17:06:27 -0000	1.10
+++ debootstrap.spec	30 Sep 2009 19:08:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           debootstrap
 Version:        1.0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Debian GNU/Linux bootstrapper
 
 Group:          System Environment/Base
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
+- Make sure to create /dev/console in devices.tar.gz
+
 * Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-1
 - New upstream release
    + Many bugfixes



From rvinyard at fedoraproject.org  Wed Sep 30 19:09:06 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 19:09:06 +0000 (UTC)
Subject: rpms/cairomm/devel .cvsignore, 1.11, 1.12 cairomm.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090930190906.6B7DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12599

Modified Files:
	.cvsignore cairomm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Feb 2009 20:57:30 -0000	1.11
+++ .cvsignore	30 Sep 2009 19:09:06 -0000	1.12
@@ -1 +1 @@
-cairomm-1.8.0.tar.gz
+cairomm-1.8.2.tar.gz


Index: cairomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/devel/cairomm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cairomm.spec	24 Jul 2009 18:36:52 -0000	1.17
+++ cairomm.spec	30 Sep 2009 19:09:06 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:          C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.8.0
-Release:          2%{?dist}
+Version:          1.8.2
+Release:          1%{?dist}
 URL:              http://www.cairographics.org
 License:          LGPLv2+
 Group:            System Environment/Libraries
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 %doc ChangeLog docs/reference
 
 %changelog
+* Wed Sep 30 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.8.2-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Feb 2009 20:57:30 -0000	1.11
+++ sources	30 Sep 2009 19:09:06 -0000	1.12
@@ -1 +1 @@
-15c0f56eee57bb418c38463a6297d715  cairomm-1.8.0.tar.gz
+24aa46a4f92bdb2af7cd80e6b335f07f  cairomm-1.8.2.tar.gz



From rvinyard at fedoraproject.org  Wed Sep 30 19:09:14 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 19:09:14 +0000 (UTC)
Subject: rpms/cairomm/F-12 .cvsignore, 1.11, 1.12 cairomm.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090930190914.0DA0311C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/cairomm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12662

Modified Files:
	.cvsignore cairomm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Feb 2009 20:57:30 -0000	1.11
+++ .cvsignore	30 Sep 2009 19:09:13 -0000	1.12
@@ -1 +1 @@
-cairomm-1.8.0.tar.gz
+cairomm-1.8.2.tar.gz


Index: cairomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-12/cairomm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cairomm.spec	24 Jul 2009 18:36:52 -0000	1.17
+++ cairomm.spec	30 Sep 2009 19:09:13 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:          C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.8.0
-Release:          2%{?dist}
+Version:          1.8.2
+Release:          1%{?dist}
 URL:              http://www.cairographics.org
 License:          LGPLv2+
 Group:            System Environment/Libraries
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 %doc ChangeLog docs/reference
 
 %changelog
+* Wed Sep 30 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.8.2-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Feb 2009 20:57:30 -0000	1.11
+++ sources	30 Sep 2009 19:09:13 -0000	1.12
@@ -1 +1 @@
-15c0f56eee57bb418c38463a6297d715  cairomm-1.8.0.tar.gz
+24aa46a4f92bdb2af7cd80e6b335f07f  cairomm-1.8.2.tar.gz



From nsantos at fedoraproject.org  Wed Sep 30 19:09:27 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 19:09:27 +0000 (UTC)
Subject: rpms/ruby-qpid/F-11 ruby-qpid.spec,1.19,1.20
Message-ID: <20090930190927.D273411C00E6@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-serv12783

Modified Files:
	ruby-qpid.spec 
Log Message:
buildreq for amqp


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-11/ruby-qpid.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ruby-qpid.spec	30 Sep 2009 19:03:36 -0000	1.19
+++ ruby-qpid.spec	30 Sep 2009 19:09:27 -0000	1.20
@@ -22,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.819819
+BuildRequires:  amqp >= 1.0.795209
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby



From rvinyard at fedoraproject.org  Wed Sep 30 19:09:21 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 19:09:21 +0000 (UTC)
Subject: rpms/cairomm/F-11 .cvsignore, 1.11, 1.12 cairomm.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <20090930190921.E7A9411C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/cairomm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12720

Modified Files:
	.cvsignore cairomm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Feb 2009 20:57:30 -0000	1.11
+++ .cvsignore	30 Sep 2009 19:09:21 -0000	1.12
@@ -1 +1 @@
-cairomm-1.8.0.tar.gz
+cairomm-1.8.2.tar.gz


Index: cairomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-11/cairomm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cairomm.spec	14 May 2009 20:06:27 -0000	1.16
+++ cairomm.spec	30 Sep 2009 19:09:21 -0000	1.17
@@ -1,6 +1,6 @@
 Summary:          C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.8.0
+Version:          1.8.2
 Release:          1%{?dist}
 URL:              http://www.cairographics.org
 License:          LGPLv2+
@@ -62,6 +62,12 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 %doc ChangeLog docs/reference
 
 %changelog
+* Wed Sep 30 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.8.2-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.8.0-1
 - Update to 1.8.0
 - Added libsigc++20-devel dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Feb 2009 20:57:30 -0000	1.11
+++ sources	30 Sep 2009 19:09:21 -0000	1.12
@@ -1 +1 @@
-15c0f56eee57bb418c38463a6297d715  cairomm-1.8.0.tar.gz
+24aa46a4f92bdb2af7cd80e6b335f07f  cairomm-1.8.2.tar.gz



From rvinyard at fedoraproject.org  Wed Sep 30 19:09:28 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 30 Sep 2009 19:09:28 +0000 (UTC)
Subject: rpms/cairomm/F-10 .cvsignore, 1.11, 1.12 cairomm.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <20090930190928.A0F5311C00E6@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/cairomm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12769

Modified Files:
	.cvsignore cairomm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	14 May 2009 19:42:15 -0000	1.11
+++ .cvsignore	30 Sep 2009 19:09:28 -0000	1.12
@@ -1 +1 @@
-cairomm-1.8.0.tar.gz
+cairomm-1.8.2.tar.gz


Index: cairomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-10/cairomm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cairomm.spec	14 May 2009 20:05:31 -0000	1.15
+++ cairomm.spec	30 Sep 2009 19:09:28 -0000	1.16
@@ -1,6 +1,6 @@
 Summary:          C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.8.0
+Version:          1.8.2
 Release:          1%{?dist}
 URL:              http://www.cairographics.org
 License:          LGPLv2+
@@ -62,6 +62,12 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 %doc ChangeLog docs/reference
 
 %changelog
+* Wed Sep 30 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.8.2-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.8.0-1
 - Update to 1.8.0
 - Added libsigc++20-devel dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairomm/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 May 2009 19:42:15 -0000	1.11
+++ sources	30 Sep 2009 19:09:28 -0000	1.12
@@ -1 +1 @@
-15c0f56eee57bb418c38463a6297d715  cairomm-1.8.0.tar.gz
+24aa46a4f92bdb2af7cd80e6b335f07f  cairomm-1.8.2.tar.gz



From dwmw2 at fedoraproject.org  Wed Sep 30 19:12:05 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 30 Sep 2009 19:12:05 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-intel-iommu-updates.patch, 1.1,
	1.2 kernel.spec, 1.1842, 1.1843
Message-ID: <20090930191205.C875A11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14162

Modified Files:
	linux-2.6-intel-iommu-updates.patch kernel.spec 
Log Message:
Work around more BIOS braindamage killing iommu

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/Kconfig               |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   50 ++++-
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 10 files changed, 295 insertions(+), 196 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-intel-iommu-updates.patch	10 Aug 2009 14:21:09 -0000	1.1
+++ linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:12:03 -0000	1.2
@@ -1,3 +1,310 @@
+commit e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Wed Sep 30 09:12:17 2009 -0700
+
+    intel-iommu: Yet another BIOS workaround: Isoch DMAR unit with no TLB space
+    
+    Asus decided to ship a BIOS which configures sound DMA to go via the
+    dedicated IOMMU unit, but assigns precisely zero TLB entries to that
+    unit. Which causes the whole thing to deadlock, including the DMA
+    traffic on the _other_ IOMMU units. Nice one.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 17b6097753e926ca546189463070a7e94e7ea9fa
+Author: Roland Dreier <rdreier at cisco.com>
+Date:   Thu Sep 24 12:14:00 2009 -0700
+
+    intel-iommu: Decode (and ignore) RHSA entries
+    
+    I recently got a system where the DMAR table included a couple of RHSA
+    (remapping hardware static affinity) entries.  Rather than printing a
+    message about an "Unknown DMAR structure," it would probably be more
+    useful to dump the RHSA structure (as other DMAR structures are dumped).
+    
+    Signed-off-by: Roland Dreier <rolandd at cisco.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 4de75cf9391b538bbfe7dc0a9782f1ebe8e242ad
+Author: Roland Dreier <rdreier at cisco.com>
+Date:   Thu Sep 24 01:01:29 2009 +0100
+
+    intel-iommu: Make "Unknown DMAR structure" message more informative
+    
+    We might as well print the type of the DMAR structure we don't know how
+    to handle when skipping it.  Then someone getting this message has a
+    chance of telling whether the structure is just bogus, or if there
+    really is something valid that the kernel doesn't know how to handle.
+    
+    Signed-off-by: Roland Dreier <rolandd at cisco.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit b09a75fc5e77b7c58d097236f89b1ff72dcdb562
+Merge: cf63ff5 b94996c
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date:   Wed Sep 23 10:06:10 2009 -0700
+
+    Merge git://git.infradead.org/iommu-2.6
+    
+    * git://git.infradead.org/iommu-2.6: (23 commits)
+      intel-iommu: Disable PMRs after we enable translation, not before
+      intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
+      intel-iommu: Fix integer wrap on 32 bit kernels
+      intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()
+      intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long'
+      intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS
+      intel-iommu: Disallow interrupt remapping if not all ioapics covered
+      intel-iommu: include linux/dmi.h to use dmi_ routines
+      pci/dmar: correct off-by-one error in dmar_fault()
+      intel-iommu: Cope with yet another BIOS screwup causing crashes
+      intel-iommu: iommu init error path bug fixes
+      intel-iommu: Mark functions with __init
+      USB: Work around BIOS bugs by quiescing USB controllers earlier
+      ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
+      intel-iommu: make domain_add_dev_info() call domain_context_mapping()
+      intel-iommu: Unify hardware and software passthrough support
+      intel-iommu: Cope with broken HP DC7900 BIOS
+      iommu=pt is a valid early param
+      intel-iommu: double kfree()
+      intel-iommu: Kill pointless intel_unmap_single() function
+      ...
+    
+    Fixed up trivial include lines conflict in drivers/pci/intel-iommu.c
+
+commit b94996c99c8befed9cbbb8804a4625e203913318
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 15:28:12 2009 -0700
+
+    intel-iommu: Disable PMRs after we enable translation, not before
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 0c02a20ff7695f9c54cc7c013dda326270ccdac8
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 09:37:23 2009 -0700
+
+    intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
+    
+    Just make it depend on BROKEN for now, in case people scream really loud
+    about it (and because we might want to keep some of this logic for an
+    upcoming BIOS workaround, so I don't just want to rip it out entirely
+    just yet). But for graphics devices, it really ought to be unnecessary.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 64de5af000e99f32dd49ff5dd9a0fd7db1f60305
+Author: Benjamin LaHaise <ben.lahaise at neterion.com>
+Date:   Wed Sep 16 21:05:55 2009 -0400
+
+    intel-iommu: Fix integer wrap on 32 bit kernels
+    
+    The following 64 bit promotions are necessary to handle memory above the
+    4GiB boundary correctly.
+    
+    [dwmw2: Fix the second part not to need 64-bit arithmetic at all]
+    
+    Signed-off-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 59c36286b74ae6a8adebf6e133a83d7f2e3e6704
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 07:36:28 2009 -0700
+
+    intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()
+    
+    If end_pfn is equal to (unsigned long)-1, then the loop will never end.
+    
+    Seen on 32-bit kernel, but could have happened on 64-bit too once we get
+    hardware that supports 64-bit guest addresses.
+    
+    Change both functions to a 'do {} while' loop with the test at the end,
+    and check for the PFN having wrapper round to zero.
+    
+    Reported-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Tested-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 2ebe31513fcbe7a781f27002f065b50ae195022f
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 07:34:04 2009 -0700
+
+    intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long'
+    
+    This means we're limited to 44-bit addresses on 32-bit kernels, and
+    makes it sane for us to use 'unsigned long' for PFNs throughout.
+    
+    Which is just as well, really, since we already do that.
+    
+    Reported-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Tested-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 074835f0143b83845af5044af2739c52c9f53808
+Author: Youquan Song <youquan.song at intel.com>
+Date:   Wed Sep 9 12:05:39 2009 -0400
+
+    intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS
+    
+    BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current
+    kernel only check interrupt remapping(IR) flag in DRHD's extended capability
+    register to decide interrupt remapping support or not. But IR flag will not
+    change when BIOS disable/enable interrupt remapping.
+    
+    When user disable interrupt remapping in BIOS or BIOS often defaultly disable
+    interrupt remapping feature when BIOS is not mature.Though BIOS disable
+    interrupt remapping but intr_remapping_supported function will always report
+    to OS support interrupt remapping if VT-d2 chipset populated. On this
+    cases, kernel will continue enable interrupt remapping and result kernel panic.
+    This bug exist on almost all platforms with interrupt remapping support.
+    
+    This patch add DMAR table INTR_REMAP flag check before enable interrupt
+    remapping.
+    
+    Signed-off-by: Youquan Song <youquan.song at intel.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit e936d0773df172ec8600777fdd72bbc1f75f22ad
+Author: Youquan Song <youquan.song at intel.com>
+Date:   Mon Sep 7 10:58:07 2009 -0400
+
+    intel-iommu: Disallow interrupt remapping if not all ioapics covered
+    
+    Current kernel enable interrupt remapping only when all the vt-d unit support
+    interrupt remapping. So it is reasonable we should also disallow enabling
+    intr-remapping if there any io-apics that are not listed under vt-d units.
+    Otherwise we can run into issues.
+    
+    Acked-by: Suresh Siddha <suresh.b.siddha at intel.com>
+    Signed-off-by: Youquan Song <youquan.song at intel.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit adb2fe0277607d50f4e9ef06e1d180051a609c25
+Author: Stephen Rothwell <sfr at canb.auug.org.au>
+Date:   Mon Aug 31 15:24:23 2009 +1000
+
+    intel-iommu: include linux/dmi.h to use dmi_ routines
+    
+    This file needs to include linux/dmi.h directly rather than relying on
+    it being pulled in from elsewhere.
+    
+    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 8211a7b5857914058c52ae977c96463e419b37ab
+Author: Troy Heber <troy.heber at hp.com>
+Date:   Wed Aug 19 15:26:11 2009 -0600
+
+    pci/dmar: correct off-by-one error in dmar_fault()
+    
+    DMAR faults are recorded into a ring of "fault recording registers".
+    fault_index is a 0-based index into the ring. The code allows the
+    0-based fault_index to be equal to the total number of fault registers
+    available from the cap_num_fault_regs() macro, which causes access
+    beyond the last available register.
+    
+    Signed-off-by Troy Heber <troy.heber at hp.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 2ff729f5445cc47d1910386c36e53fc6b1c5e47a
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Wed Aug 26 14:25:41 2009 +0100
+
+    intel-iommu: Cope with yet another BIOS screwup causing crashes
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 94a91b5051a77d8a71d4f11a3240f0d9c51b6cf2
+Author: Donald Dutile <ddutile at redhat.com>
+Date:   Thu Aug 20 16:51:34 2009 -0400
+
+    intel-iommu: iommu init error path bug fixes
+    
+    The kcalloc() failure path in iommu_init_domains() calls
+    free_dmar_iommu(), which assumes that ->domains, ->domain_ids,
+    and ->lock have been properly initialized.
+    
+    Add checks in free_[dmar]_iommu to not use ->domains,->domain_ids
+    if not alloced. Move the lock init to prior to the kcalloc()'s,
+    so it is valid in free_context_table() when free_dmar_iommu() invokes
+    it at the end.
+    
+    Patch based on iommu-2.6,
+    commit 132032274a594ee9ffb6b9c9e2e9698149a09ea9
+    
+    Signed-off-by: Donald Dutile <ddutile at redhat.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 071e13746f9ebb259987c71ea77f11e7656769a2
+Author: Matt Kraai <kraai at ftbfs.org>
+Date:   Sun Aug 23 22:30:22 2009 -0700
+
+    intel-iommu: Mark functions with __init
+    
+    Mark si_domain_init and iommu_prepare_static_identity_mapping with
+    __init, to eliminate the following warnings:
+    
+    WARNING: drivers/pci/built-in.o(.text+0xf1f4): Section mismatch in reference from the function si_domain_init() to the function .init.text:si_domain_work_fn()
+    The function si_domain_init() references
+    the function __init si_domain_work_fn().
+    This is often because si_domain_init lacks a __init
+    annotation or the annotation of si_domain_work_fn is wrong.
+    
+    WARNING: drivers/pci/built-in.o(.text+0xe340): Section mismatch in reference from the function iommu_prepare_static_identity_mapping() to the function .init.text:si_domain_init()
+    The function iommu_prepare_static_identity_mapping() references
+    the function __init si_domain_init().
+    This is often because iommu_prepare_static_identity_mapping lacks a __init
+    annotation or the annotation of si_domain_init is wrong.
+    
+    Signed-off-by: Matt Kraai <kraai at ftbfs.org>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 132032274a594ee9ffb6b9c9e2e9698149a09ea9
+Author: David Woodhouse <dwmw2 at infradead.org>
+Date:   Mon Aug 3 12:40:27 2009 +0100
+
+    USB: Work around BIOS bugs by quiescing USB controllers earlier
+    
+    We are seeing a number of crashes in SMM, when VT-d is enabled while
+    'Legacy USB support' is enabled in various BIOSes.
+    
+    The BIOS is supposed to indicate which addresses it uses for DMA in a
+    special ACPI table ("RMRR"), so that we can punch a hole for it when we
+    set up the IOMMU.
+    
+    The problem is, as usual, that BIOS engineers are totally incompetent.
+    They write code which will crash if the DMA goes AWOL, and then they
+    either neglect to provide an RMRR table at all, or they put the wrong
+    addresses in it. And of course they don't do _any_ QA, since that would
+    take too much time away from their crack-smoking habit.
+    
+    The real fix, of course, is for consumers to refuse to buy motherboards
+    which only have closed-source firmware available. If we had _open_
+    firmware, bugs like this would be easy to fix.
+    
+    Since that's something I can only dream about, this patch implements an
+    alternative -- ensuring that the USB controllers are handed off from the
+    BIOS and quiesced _before_ the IOMMU is initialised. That would have
+    been a much better design than this RMRR nonsense in the first place, of
+    course. The bootloader has no business doing DMA after the OS has booted
+    anyway.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit ba6c548701ef7a93b9ea05d1506d2b62f1628333
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Thu Aug 13 18:18:00 2009 +0100
+
+    ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
+    
+    Since commit 19943b0e30b05d42e494ae6fef78156ebc8c637e ('intel-iommu:
+    Unify hardware and software passthrough support'), hardware passthrough
+    mode will do the same as software passthrough mode was doing -- it'll
+    still use the IOMMU normally for devices which can't address all of
+    memory. This means that we don't need to bother with swiotlb.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
 commit 5fe60f4e5871b64e687229199fafd4ef13cd0886
 Author: David Woodhouse <David.Woodhouse at intel.com>
 Date:   Sun Aug 9 10:53:41 2009 +0100
@@ -124,22 +431,49 @@ Date:   Tue Jul 7 19:43:20 2009 +0100
     cycles to 4812 cycles on my Lenovo x200s test box -- a modest 20%.
     
     Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 1a041bc..ae13e34 100644
---- a/arch/x86/kernel/pci-dma.c
-+++ b/arch/x86/kernel/pci-dma.c
-@@ -212,10 +212,8 @@ static __init int iommu_setup(char *p)
- 		if (!strncmp(p, "soft", 4))
- 			swiotlb = 1;
- #endif
--		if (!strncmp(p, "pt", 2)) {
-+		if (!strncmp(p, "pt", 2))
- 			iommu_pass_through = 1;
--			return 1;
--		}
- 
- 		gart_parse_options(p);
+diff --git a/Documentation/Intel-IOMMU.txt b/Documentation/Intel-IOMMU.txt
+index 21bc416..cf9431d 100644
+--- a/Documentation/Intel-IOMMU.txt
++++ b/Documentation/Intel-IOMMU.txt
+@@ -56,11 +56,7 @@ Graphics Problems?
+ ------------------
+ If you encounter issues with graphics devices, you can try adding
+ option intel_iommu=igfx_off to turn off the integrated graphics engine.
+-
+-If it happens to be a PCI device included in the INCLUDE_ALL Engine,
+-then try enabling CONFIG_DMAR_GFX_WA to setup a 1-1 map. We hear
+-graphics drivers may be in process of using DMA api's in the near
+-future and at that time this option can be yanked out.
++If this fixes anything, please ensure you file a bug reporting the problem.
+ 
+ Some exceptions to IOVA
+ -----------------------
+diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
+index 223abb1..285aae8 100644
+--- a/arch/ia64/kernel/pci-swiotlb.c
++++ b/arch/ia64/kernel/pci-swiotlb.c
+@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void)
  
+ void __init pci_swiotlb_init(void)
+ {
+-	if (!iommu_detected || iommu_pass_through) {
++	if (!iommu_detected) {
+ #ifdef CONFIG_IA64_GENERIC
+ 		swiotlb = 1;
+ 		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 13ffa5d..5499da1 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1916,7 +1916,7 @@ config DMAR_DEFAULT_ON
+ config DMAR_BROKEN_GFX_WA
+ 	def_bool n
+ 	prompt "Workaround broken graphics drivers (going away soon)"
+-	depends on DMAR
++	depends on DMAR && BROKEN
+ 	---help---
+ 	  Current Graphics drivers tend to use physical address
+ 	  for DMA and avoid using DMA APIs. Setting this config
 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
 index 6af96ee..1e66b18 100644
 --- a/arch/x86/kernel/pci-swiotlb.c
@@ -157,10 +491,56 @@ index 6af96ee..1e66b18 100644
  	if (swiotlb_force)
  		swiotlb = 1;
 diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
-index 7b287cb..380b60e 100644
+index 7b287cb..708176d 100644
 --- a/drivers/pci/dmar.c
 +++ b/drivers/pci/dmar.c
-@@ -632,20 +632,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
+@@ -353,6 +353,7 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
+ 	struct acpi_dmar_hardware_unit *drhd;
+ 	struct acpi_dmar_reserved_memory *rmrr;
+ 	struct acpi_dmar_atsr *atsr;
++	struct acpi_dmar_rhsa *rhsa;
+ 
+ 	switch (header->type) {
+ 	case ACPI_DMAR_TYPE_HARDWARE_UNIT:
+@@ -374,6 +375,12 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
+ 		atsr = container_of(header, struct acpi_dmar_atsr, header);
+ 		printk(KERN_INFO PREFIX "ATSR flags: %#x\n", atsr->flags);
+ 		break;
++	case ACPI_DMAR_HARDWARE_AFFINITY:
++		rhsa = container_of(header, struct acpi_dmar_rhsa, header);
++		printk(KERN_INFO PREFIX "RHSA base: %#016Lx proximity domain: %#x\n",
++		       (unsigned long long)rhsa->base_address,
++		       rhsa->proximity_domain);
++		break;
+ 	}
+ }
+ 
+@@ -452,9 +459,13 @@ parse_dmar_table(void)
+ 			ret = dmar_parse_one_atsr(entry_header);
+ #endif
+ 			break;
++		case ACPI_DMAR_HARDWARE_AFFINITY:
++			/* We don't do anything with RHSA (yet?) */
++			break;
+ 		default:
+ 			printk(KERN_WARNING PREFIX
+-				"Unknown DMAR structure type\n");
++				"Unknown DMAR structure type %d\n",
++				entry_header->type);
+ 			ret = 0; /* for forward compatibility */
+ 			break;
+ 		}
+@@ -570,9 +581,6 @@ int __init dmar_table_init(void)
+ 		printk(KERN_INFO PREFIX "No ATSR found\n");
+ #endif
+ 
+-#ifdef CONFIG_INTR_REMAP
+-	parse_ioapics_under_ir();
+-#endif
+ 	return 0;
+ }
+ 
+@@ -632,20 +640,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  	iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG);
  	iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
  
@@ -194,7 +574,7 @@ index 7b287cb..380b60e 100644
  	}
  #endif
  	iommu->agaw = agaw;
-@@ -665,7 +676,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
+@@ -665,7 +684,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  	}
  
  	ver = readl(iommu->reg + DMAR_VER_REG);
@@ -203,7 +583,7 @@ index 7b287cb..380b60e 100644
  		(unsigned long long)drhd->reg_base_addr,
  		DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),
  		(unsigned long long)iommu->cap,
-@@ -675,7 +686,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
+@@ -675,7 +694,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  
  	drhd->iommu = iommu;
  	return 0;
@@ -215,11 +595,75 @@ index 7b287cb..380b60e 100644
  	kfree(iommu);
  	return -1;
  }
+@@ -1212,7 +1234,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
+ 				source_id, guest_addr);
+ 
+ 		fault_index++;
+-		if (fault_index > cap_num_fault_regs(iommu->cap))
++		if (fault_index >= cap_num_fault_regs(iommu->cap))
+ 			fault_index = 0;
+ 		spin_lock_irqsave(&iommu->register_lock, flag);
+ 	}
+@@ -1305,3 +1327,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
+ 
+ 	return 0;
+ }
++
++/*
++ * Check interrupt remapping support in DMAR table description.
++ */
++int dmar_ir_support(void)
++{
++	struct acpi_table_dmar *dmar;
++	dmar = (struct acpi_table_dmar *)dmar_tbl;
++	return dmar->flags & 0x1;
++}
 diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index 2314ad7..09606e9 100644
+index 2314ad7..f89ce3f 100644
 --- a/drivers/pci/intel-iommu.c
 +++ b/drivers/pci/intel-iommu.c
-@@ -251,7 +251,8 @@ static inline int first_pte_in_page(struct dma_pte *pte)
+@@ -37,6 +37,7 @@
+ #include <linux/iommu.h>
+ #include <linux/intel-iommu.h>
+ #include <linux/sysdev.h>
++#include <linux/dmi.h>
+ #include <asm/cacheflush.h>
+ #include <asm/iommu.h>
+ #include "pci.h"
+@@ -46,6 +47,7 @@
+ 
+ #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
+ #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
++#define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
+ 
+ #define IOAPIC_RANGE_START	(0xfee00000)
+ #define IOAPIC_RANGE_END	(0xfeefffff)
+@@ -55,8 +57,14 @@
+ 
+ #define MAX_AGAW_WIDTH 64
+ 
+-#define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1)
+-#define DOMAIN_MAX_PFN(gaw)  ((((u64)1) << (gaw-VTD_PAGE_SHIFT)) - 1)
++#define __DOMAIN_MAX_PFN(gaw)  ((((uint64_t)1) << (gaw-VTD_PAGE_SHIFT)) - 1)
++#define __DOMAIN_MAX_ADDR(gaw) ((((uint64_t)1) << gaw) - 1)
++
++/* We limit DOMAIN_MAX_PFN to fit in an unsigned long, and DOMAIN_MAX_ADDR
++   to match. That way, we can use 'unsigned long' for PFNs with impunity. */
++#define DOMAIN_MAX_PFN(gaw)	((unsigned long) min_t(uint64_t, \
++				__DOMAIN_MAX_PFN(gaw), (unsigned long)-1))
++#define DOMAIN_MAX_ADDR(gaw)	(((uint64_t)__DOMAIN_MAX_PFN(gaw)) << VTD_PAGE_SHIFT)
+ 
+ #define IOVA_PFN(addr)		((addr) >> PAGE_SHIFT)
+ #define DMA_32BIT_PFN		IOVA_PFN(DMA_BIT_MASK(32))
+@@ -86,6 +94,7 @@ static inline unsigned long virt_to_dma_pfn(void *p)
+ /* global iommu list, set NULL for ignored DMAR units */
+ static struct intel_iommu **g_iommus;
+ 
++static void __init check_tylersburg_isoch(void);
+ static int rwbf_quirk;
+ 
+ /*
+@@ -251,7 +260,8 @@ static inline int first_pte_in_page(struct dma_pte *pte)
   * 	2. It maps to each iommu if successful.
   *	3. Each iommu mapps to this domain if successful.
   */
@@ -229,7 +673,125 @@ index 2314ad7..09606e9 100644
  
  /* devices under the same p2p bridge are owned in one domain */
  #define DOMAIN_FLAG_P2P_MULTIPLE_DEVICES (1 << 0)
-@@ -1309,7 +1310,6 @@ static void iommu_detach_domain(struct dmar_domain *domain,
+@@ -727,7 +737,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
+ 				return NULL;
+ 
+ 			domain_flush_cache(domain, tmp_page, VTD_PAGE_SIZE);
+-			pteval = (virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
++			pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
+ 			if (cmpxchg64(&pte->val, 0ULL, pteval)) {
+ 				/* Someone else set it while we were thinking; use theirs. */
+ 				free_pgtable_page(tmp_page);
+@@ -777,9 +787,10 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
+ 
+ 	BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
+ 	BUG_ON(addr_width < BITS_PER_LONG && last_pfn >> addr_width);
++	BUG_ON(start_pfn > last_pfn);
+ 
+ 	/* we don't need lock here; nobody else touches the iova range */
+-	while (start_pfn <= last_pfn) {
++	do {
+ 		first_pte = pte = dma_pfn_level_pte(domain, start_pfn, 1);
+ 		if (!pte) {
+ 			start_pfn = align_to_level(start_pfn + 1, 2);
+@@ -793,7 +804,8 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
+ 
+ 		domain_flush_cache(domain, first_pte,
+ 				   (void *)pte - (void *)first_pte);
+-	}
++
++	} while (start_pfn && start_pfn <= last_pfn);
+ }
+ 
+ /* free page table pages. last level pte should already be cleared */
+@@ -809,6 +821,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
+ 
+ 	BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
+ 	BUG_ON(addr_width < BITS_PER_LONG && last_pfn >> addr_width);
++	BUG_ON(start_pfn > last_pfn);
+ 
+ 	/* We don't need lock here; nobody else touches the iova range */
+ 	level = 2;
+@@ -819,7 +832,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
+ 		if (tmp + level_size(level) - 1 > last_pfn)
+ 			return;
+ 
+-		while (tmp + level_size(level) - 1 <= last_pfn) {
++		do {
+ 			first_pte = pte = dma_pfn_level_pte(domain, tmp, level);
+ 			if (!pte) {
+ 				tmp = align_to_level(tmp + 1, level + 1);
+@@ -838,7 +851,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
+ 			domain_flush_cache(domain, first_pte,
+ 					   (void *)pte - (void *)first_pte);
+ 			
+-		}
++		} while (tmp && tmp + level_size(level) - 1 <= last_pfn);
+ 		level++;
+ 	}
+ 	/* free pgd */
+@@ -1157,6 +1170,8 @@ static int iommu_init_domains(struct intel_iommu *iommu)
+ 	pr_debug("Number of Domains supportd <%ld>\n", ndomains);
+ 	nlongs = BITS_TO_LONGS(ndomains);
+ 
++	spin_lock_init(&iommu->lock);
++
+ 	/* TBD: there might be 64K domains,
+ 	 * consider other allocation for future chip
+ 	 */
+@@ -1169,12 +1184,9 @@ static int iommu_init_domains(struct intel_iommu *iommu)
+ 			GFP_KERNEL);
+ 	if (!iommu->domains) {
+ 		printk(KERN_ERR "Allocating domain array failed\n");
+-		kfree(iommu->domain_ids);
+ 		return -ENOMEM;
+ 	}
+ 
+-	spin_lock_init(&iommu->lock);
+-
+ 	/*
+ 	 * if Caching mode is set, then invalid translations are tagged
+ 	 * with domainid 0. Hence we need to pre-allocate it.
+@@ -1194,22 +1206,24 @@ void free_dmar_iommu(struct intel_iommu *iommu)
+ 	int i;
+ 	unsigned long flags;
+ 
+-	i = find_first_bit(iommu->domain_ids, cap_ndoms(iommu->cap));
+-	for (; i < cap_ndoms(iommu->cap); ) {
+-		domain = iommu->domains[i];
+-		clear_bit(i, iommu->domain_ids);
++	if ((iommu->domains) && (iommu->domain_ids)) {
++		i = find_first_bit(iommu->domain_ids, cap_ndoms(iommu->cap));
++		for (; i < cap_ndoms(iommu->cap); ) {
++			domain = iommu->domains[i];
++			clear_bit(i, iommu->domain_ids);
++
++			spin_lock_irqsave(&domain->iommu_lock, flags);
++			if (--domain->iommu_count == 0) {
++				if (domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE)
++					vm_domain_exit(domain);
++				else
++					domain_exit(domain);
++			}
++			spin_unlock_irqrestore(&domain->iommu_lock, flags);
+ 
+-		spin_lock_irqsave(&domain->iommu_lock, flags);
+-		if (--domain->iommu_count == 0) {
+-			if (domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE)
+-				vm_domain_exit(domain);
+-			else
+-				domain_exit(domain);
++			i = find_next_bit(iommu->domain_ids,
++				cap_ndoms(iommu->cap), i+1);
+ 		}
+-		spin_unlock_irqrestore(&domain->iommu_lock, flags);
+-
+-		i = find_next_bit(iommu->domain_ids,
+-			cap_ndoms(iommu->cap), i+1);
+ 	}
+ 
+ 	if (iommu->gcmd & DMA_GCMD_TE)
+@@ -1309,7 +1323,6 @@ static void iommu_detach_domain(struct dmar_domain *domain,
  }
  
  static struct iova_domain reserved_iova_list;
@@ -237,7 +799,7 @@ index 2314ad7..09606e9 100644
  static struct lock_class_key reserved_rbtree_key;
  
  static void dmar_init_reserved_ranges(void)
-@@ -1320,8 +1320,6 @@ static void dmar_init_reserved_ranges(void)
+@@ -1320,8 +1333,6 @@ static void dmar_init_reserved_ranges(void)
  
  	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
  
@@ -246,7 +808,17 @@ index 2314ad7..09606e9 100644
  	lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
  		&reserved_rbtree_key);
  
-@@ -1958,14 +1956,24 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
+@@ -1924,6 +1935,9 @@ error:
+ }
+ 
+ static int iommu_identity_mapping;
++#define IDENTMAP_ALL		1
++#define IDENTMAP_GFX		2
++#define IDENTMAP_AZALIA		4
+ 
+ static int iommu_domain_identity_map(struct dmar_domain *domain,
+ 				     unsigned long long start,
+@@ -1958,14 +1972,35 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
  	struct dmar_domain *domain;
  	int ret;
  
@@ -271,11 +843,22 @@ index 2314ad7..09606e9 100644
 +	printk(KERN_INFO
 +	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
 +	       pci_name(pdev), start, end);
++	
++	if (end >> agaw_to_width(domain->agaw)) {
++		WARN(1, "Your BIOS is broken; RMRR exceeds permitted address width (%d bits)\n"
++		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
++		     agaw_to_width(domain->agaw),
++		     dmi_get_system_info(DMI_BIOS_VENDOR),
++		     dmi_get_system_info(DMI_BIOS_VERSION),
++		     dmi_get_system_info(DMI_PRODUCT_VERSION));
++		ret = -EIO;
++		goto error;
++	}
 +
  	ret = iommu_domain_identity_map(domain, start, end);
  	if (ret)
  		goto error;
-@@ -2016,23 +2024,6 @@ static inline void iommu_prepare_isa(void)
+@@ -2016,23 +2051,6 @@ static inline void iommu_prepare_isa(void)
  }
  #endif /* !CONFIG_DMAR_FLPY_WA */
  
@@ -299,16 +882,16 @@ index 2314ad7..09606e9 100644
  static int md_domain_init(struct dmar_domain *domain, int guest_width);
  
  static int __init si_domain_work_fn(unsigned long start_pfn,
-@@ -2047,7 +2038,7 @@ static int __init si_domain_work_fn(unsigned long start_pfn,
+@@ -2047,7 +2065,7 @@ static int __init si_domain_work_fn(unsigned long start_pfn,
  
  }
  
 -static int si_domain_init(void)
-+static int si_domain_init(int hw)
++static int __init si_domain_init(int hw)
  {
  	struct dmar_drhd_unit *drhd;
  	struct intel_iommu *iommu;
-@@ -2074,6 +2065,9 @@ static int si_domain_init(void)
+@@ -2074,6 +2092,9 @@ static int si_domain_init(void)
  
  	si_domain->flags = DOMAIN_FLAG_STATIC_IDENTITY;
  
@@ -318,7 +901,7 @@ index 2314ad7..09606e9 100644
  	for_each_online_node(nid) {
  		work_with_active_regions(nid, si_domain_work_fn, &ret);
  		if (ret)
-@@ -2100,15 +2094,23 @@ static int identity_mapping(struct pci_dev *pdev)
+@@ -2100,15 +2121,23 @@ static int identity_mapping(struct pci_dev *pdev)
  }
  
  static int domain_add_dev_info(struct dmar_domain *domain,
@@ -343,12 +926,29 @@ index 2314ad7..09606e9 100644
  	info->segment = pci_domain_nr(pdev->bus);
  	info->bus = pdev->bus->number;
  	info->devfn = pdev->devfn;
-@@ -2165,27 +2167,25 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
+@@ -2126,8 +2155,14 @@ static int domain_add_dev_info(struct dmar_domain *domain,
+ 
+ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
+ {
+-	if (iommu_identity_mapping == 2)
+-		return IS_GFX_DEVICE(pdev);
++	if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
++		return 1;
++
++	if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
++		return 1;
++
++	if (!(iommu_identity_mapping & IDENTMAP_ALL))
++		return 0;
+ 
+ 	/*
+ 	 * We want to start off with all devices in the 1:1 domain, and
+@@ -2165,27 +2200,25 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
  	return 1;
  }
  
 -static int iommu_prepare_static_identity_mapping(void)
-+static int iommu_prepare_static_identity_mapping(int hw)
++static int __init iommu_prepare_static_identity_mapping(int hw)
  {
  	struct pci_dev *pdev = NULL;
  	int ret;
@@ -377,7 +977,7 @@ index 2314ad7..09606e9 100644
  		}
  	}
  
-@@ -2199,14 +2199,6 @@ int __init init_dmars(void)
+@@ -2199,14 +2232,6 @@ int __init init_dmars(void)
  	struct pci_dev *pdev;
  	struct intel_iommu *iommu;
  	int i, ret;
@@ -392,7 +992,7 @@ index 2314ad7..09606e9 100644
  
  	/*
  	 * for each drhd
-@@ -2234,7 +2226,6 @@ int __init init_dmars(void)
+@@ -2234,7 +2259,6 @@ int __init init_dmars(void)
  	deferred_flush = kzalloc(g_num_of_iommus *
  		sizeof(struct deferred_flush_tables), GFP_KERNEL);
  	if (!deferred_flush) {
@@ -400,7 +1000,7 @@ index 2314ad7..09606e9 100644
  		ret = -ENOMEM;
  		goto error;
  	}
-@@ -2261,14 +2252,8 @@ int __init init_dmars(void)
+@@ -2261,14 +2285,8 @@ int __init init_dmars(void)
  			goto error;
  		}
  		if (!ecap_pass_through(iommu->ecap))
@@ -416,16 +1016,19 @@ index 2314ad7..09606e9 100644
  
  	/*
  	 * Start from the sane iommu hardware state.
-@@ -2323,64 +2308,57 @@ int __init init_dmars(void)
+@@ -2323,64 +2341,60 @@ int __init init_dmars(void)
  		}
  	}
  
 +	if (iommu_pass_through)
-+		iommu_identity_mapping = 1;
++		iommu_identity_mapping |= IDENTMAP_ALL;
++
 +#ifdef CONFIG_DMAR_BROKEN_GFX_WA
-+	else
-+		iommu_identity_mapping = 2;
++	iommu_identity_mapping |= IDENTMAP_GFX;
 +#endif
++
++	check_tylersburg_isoch();
++
  	/*
 -	 * If pass through is set and enabled, context entries of all pci
 -	 * devices are intialized by pass through translation type.
@@ -522,7 +1125,21 @@ index 2314ad7..09606e9 100644
  	/*
  	 * for each drhd
  	 *   enable fault log
-@@ -2454,8 +2432,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
+@@ -2403,11 +2417,12 @@ int __init init_dmars(void)
+ 
+ 		iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
+ 		iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
+-		iommu_disable_protect_mem_regions(iommu);
+ 
+ 		ret = iommu_enable_translation(iommu);
+ 		if (ret)
+ 			goto error;
++
++		iommu_disable_protect_mem_regions(iommu);
+ 	}
+ 
+ 	return 0;
+@@ -2454,8 +2469,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
  	return iova;
  }
  
@@ -532,7 +1149,7 @@ index 2314ad7..09606e9 100644
  {
  	struct dmar_domain *domain;
  	int ret;
-@@ -2483,6 +2460,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
+@@ -2483,6 +2497,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
  	return domain;
  }
  
@@ -551,7 +1168,7 @@ index 2314ad7..09606e9 100644
  static int iommu_dummy(struct pci_dev *pdev)
  {
  	return pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
-@@ -2525,10 +2514,10 @@ static int iommu_no_mapping(struct device *dev)
+@@ -2525,10 +2551,10 @@ static int iommu_no_mapping(struct device *dev)
  		 */
  		if (iommu_should_identity_map(pdev, 0)) {
  			int ret;
@@ -566,7 +1183,20 @@ index 2314ad7..09606e9 100644
  			if (!ret) {
  				printk(KERN_INFO "64bit %s uses identity mapping\n",
  				       pci_name(pdev));
-@@ -2733,12 +2722,6 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
+@@ -2637,10 +2663,9 @@ static void flush_unmaps(void)
+ 			unsigned long mask;
+ 			struct iova *iova = deferred_flush[i].iova[j];
+ 
+-			mask = (iova->pfn_hi - iova->pfn_lo + 1) << PAGE_SHIFT;
+-			mask = ilog2(mask >> VTD_PAGE_SHIFT);
++			mask = ilog2(mm_to_dma_pfn(iova->pfn_hi - iova->pfn_lo + 1));
+ 			iommu_flush_dev_iotlb(deferred_flush[i].domain[j],
+-					iova->pfn_lo << PAGE_SHIFT, mask);
++					(uint64_t)iova->pfn_lo << PAGE_SHIFT, mask);
+ 			__free_iova(&deferred_flush[i].domain[j]->iovad, iova);
+ 		}
+ 		deferred_flush[i].next = 0;
+@@ -2733,12 +2758,6 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
  	}
  }
  
@@ -579,7 +1209,7 @@ index 2314ad7..09606e9 100644
  static void *intel_alloc_coherent(struct device *hwdev, size_t size,
  				  dma_addr_t *dma_handle, gfp_t flags)
  {
-@@ -2771,7 +2754,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
+@@ -2771,7 +2790,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
  	size = PAGE_ALIGN(size);
  	order = get_order(size);
  
@@ -588,7 +1218,7 @@ index 2314ad7..09606e9 100644
  	free_pages((unsigned long)vaddr, order);
  }
  
-@@ -2807,11 +2790,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
+@@ -2807,11 +2826,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
  	/* free page tables */
  	dma_pte_free_pagetable(domain, start_pfn, last_pfn);
  
@@ -612,7 +1242,17 @@ index 2314ad7..09606e9 100644
  }
  
  static int intel_nontranslate_map_sg(struct device *hddev,
-@@ -3194,7 +3184,7 @@ int __init intel_iommu_init(void)
+@@ -3055,8 +3081,8 @@ static int init_iommu_hw(void)
+ 					   DMA_CCMD_GLOBAL_INVL);
+ 		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+ 					 DMA_TLB_GLOBAL_FLUSH);
+-		iommu_disable_protect_mem_regions(iommu);
+ 		iommu_enable_translation(iommu);
++		iommu_disable_protect_mem_regions(iommu);
+ 	}
+ 
+ 	return 0;
+@@ -3194,7 +3220,7 @@ int __init intel_iommu_init(void)
  	 * Check the need for DMA-remapping initialization now.
  	 * Above initialization will also be used by Interrupt-remapping.
  	 */
@@ -621,7 +1261,7 @@ index 2314ad7..09606e9 100644
  		return -ENODEV;
  
  	iommu_init_mempool();
-@@ -3214,14 +3204,7 @@ int __init intel_iommu_init(void)
+@@ -3214,14 +3240,7 @@ int __init intel_iommu_init(void)
  
  	init_timer(&unmap_timer);
  	force_iommu = 1;
@@ -637,7 +1277,7 @@ index 2314ad7..09606e9 100644
  
  	init_iommu_sysfs();
  
-@@ -3504,7 +3487,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
+@@ -3504,7 +3523,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
  	struct intel_iommu *iommu;
  	int addr_width;
  	u64 end;
@@ -645,7 +1285,7 @@ index 2314ad7..09606e9 100644
  
  	/* normally pdev is not mapped */
  	if (unlikely(domain_context_mapped(pdev))) {
-@@ -3536,12 +3518,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
+@@ -3536,12 +3554,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
  		return -EFAULT;
  	}
  
@@ -659,6 +1299,94 @@ index 2314ad7..09606e9 100644
  }
  
  static void intel_iommu_detach_device(struct iommu_domain *domain,
+@@ -3658,3 +3671,61 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
+ }
+ 
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
++
++/* On Tylersburg chipsets, some BIOSes have been known to enable the
++   ISOCH DMAR unit for the Azalia sound device, but not give it any
++   TLB entries, which causes it to deadlock. Check for that.  We do
++   this in a function called from init_dmars(), instead of in a PCI
++   quirk, because we don't want to print the obnoxious "BIOS broken"
++   message if VT-d is actually disabled.
++*/
++static void __init check_tylersburg_isoch(void)
++{
++	struct pci_dev *pdev;
++	uint32_t vtisochctrl;
++
++	/* If there's no Azalia in the system anyway, forget it. */
++	pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x3a3e, NULL);
++	if (!pdev)
++		return;
++	pci_dev_put(pdev);
++
++	/* System Management Registers. Might be hidden, in which case
++	   we can't do the sanity check. But that's OK, because the
++	   known-broken BIOSes _don't_ actually hide it, so far. */
++	pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x342e, NULL);
++	if (!pdev)
++		return;
++
++	if (pci_read_config_dword(pdev, 0x188, &vtisochctrl)) {
++		pci_dev_put(pdev);
++		return;
++	}
++
++	pci_dev_put(pdev);
++
++	/* If Azalia DMA is routed to the non-isoch DMAR unit, fine. */
++	if (vtisochctrl & 1)
++		return;
++
++	/* Drop all bits other than the number of TLB entries */
++	vtisochctrl &= 0x1c;
++
++	/* If we have the recommended number of TLB entries (16), fine. */
++	if (vtisochctrl == 0x10)
++		return;
++
++	/* Zero TLB entries? You get to ride the short bus to school. */
++	if (!vtisochctrl) {
++		WARN(1, "Your BIOS is broken; DMA routed to ISOCH DMAR unit but no TLB space.\n"
++		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
++		     dmi_get_system_info(DMI_BIOS_VENDOR),
++		     dmi_get_system_info(DMI_BIOS_VERSION),
++		     dmi_get_system_info(DMI_PRODUCT_VERSION));
++		iommu_identity_mapping |= IDENTMAP_AZALIA;
++		return;
++	}
++	
++	printk(KERN_WARNING "DMAR: Recommended TLB entries for ISOCH unit is 16; your BIOS set %d\n",
++	       vtisochctrl);
++}
+diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
+index 4f5b871..ac06514 100644
+--- a/drivers/pci/intr_remapping.c
++++ b/drivers/pci/intr_remapping.c
+@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
+ 	if (disable_intremap)
+ 		return 0;
+ 
++	if (!dmar_ir_support())
++		return 0;
++
+ 	for_each_drhd_unit(drhd) {
+ 		struct intel_iommu *iommu = drhd->iommu;
+ 
+@@ -626,6 +629,11 @@ int __init enable_intr_remapping(int eim)
+ 	struct dmar_drhd_unit *drhd;
+ 	int setup = 0;
+ 
++	if (parse_ioapics_under_ir() != 1) {
++		printk(KERN_INFO "Not enable interrupt remapping\n");
++		return -1;
++	}
++
+ 	for_each_drhd_unit(drhd) {
+ 		struct intel_iommu *iommu = drhd->iommu;
+ 
 diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
 index 46dd440..7914951 100644
 --- a/drivers/pci/iova.c
@@ -729,6 +1457,17 @@ index 46dd440..7914951 100644
 -	spin_unlock_irqrestore(&from->iova_alloc_lock, flags);
 +	spin_unlock_irqrestore(&from->iova_rbtree_lock, flags);
  }
+diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
+index 482dc91..4f0a72a 100644
+--- a/include/linux/intel-iommu.h
++++ b/include/linux/intel-iommu.h
+@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
+ 
+ extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
+ 
++extern int dmar_ir_support(void);
++
+ #endif
 diff --git a/include/linux/iova.h b/include/linux/iova.h
 index 228f6c9..76a0759 100644
 --- a/include/linux/iova.h


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1842
retrieving revision 1.1843
diff -u -p -r1.1842 -r1.1843
--- kernel.spec	29 Sep 2009 19:58:01 -0000	1.1842
+++ kernel.spec	30 Sep 2009 19:12:04 -0000	1.1843
@@ -2075,6 +2075,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 30 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Update IOMMU code; mostly a bunch more workarounds for broken BIOSes.
+
 * Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-56
 - revert all the arjan patches until someone tests them.
 



From nsantos at fedoraproject.org  Wed Sep 30 19:17:06 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 19:17:06 +0000 (UTC)
Subject: rpms/ruby-qpid/F-11 ruby-qpid.spec,1.20,1.21
Message-ID: <20090930191706.1274C11C00E6@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-serv15419

Modified Files:
	ruby-qpid.spec 
Log Message:
buildreq for amqp


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-11/ruby-qpid.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ruby-qpid.spec	30 Sep 2009 19:09:27 -0000	1.20
+++ ruby-qpid.spec	30 Sep 2009 19:17:05 -0000	1.21
@@ -22,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
-BuildRequires:  amqp >= 1.0.795209
+BuildRequires:  amqp >= 1.0.790661
 BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby



From steved at fedoraproject.org  Wed Sep 30 19:18:22 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 30 Sep 2009 19:18:22 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.0-mntconf-negation.patch, NONE,
	1.1 nfs-utils-1.2.0-mntconf-vers.patch, NONE,
	1.1 nfs-utils-1.2.0-mount-vers4.patch, 1.1, 1.2 nfs-utils.spec,
	1.243, 1.244
Message-ID: <20090930191822.6B83811C00E6@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15568

Modified Files:
	nfs-utils-1.2.0-mount-vers4.patch nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-mntconf-negation.patch 
	nfs-utils-1.2.0-mntconf-vers.patch 
Log Message:
- Change the nfsmount.conf file to define v3 as the default 
  protocol version.
- Make sure versions set on the command line override version
  set in nfsmount.conf
- Make version rollbacks still work when versions are set in
  nfsmount.conf


nfs-utils-1.2.0-mntconf-negation.patch:
 configfile.c |   13 +++++++++++++
 stropts.c    |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.2.0-mntconf-negation.patch ---
diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
--- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-09-30 13:57:48.647286000 -0400
+++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-09-30 14:50:05.365468000 -0400
@@ -198,6 +198,15 @@ int inline check_vers(char *mopt, char *
 	}
 	return 0;
 }
+int inline vers_is_set(char *mopt)
+{
+	int i;
+
+	for (i=0; versions[i]; i++)
+		if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
+			return 1;
+	return 0;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -256,6 +265,8 @@ conf_parse_mntopts(char *section, char *
 	conf_free_list(list);
 }
 
+int do_version_negation;
+
 /*
  * Concatenate options from the configuration file with the 
  * given options by building a link list of options from the
@@ -326,6 +337,8 @@ char *conf_get_mntopts(char *spec, char 
 		strcat(config_opts, ",");
 	}
 	SLIST_FOREACH(entry, &head, entries) {
+		if (vers_is_set(entry->opt))
+			do_version_negation = 1;
 		strcat(config_opts, entry->opt);
 		strcat(config_opts, ",");
 	}
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-30 13:57:48.613288000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-30 14:59:56.716461000 -0400
@@ -588,6 +588,7 @@ out_fail:
 	po_destroy(options);
 	return result;
 }
+extern int do_version_negation;
 
 /*
  * This is a single pass through the fg/bg loop.
@@ -607,12 +608,20 @@ static int nfs_try_mount(struct nfsmount
 			if (errno != EPROTONOSUPPORT)
 				break;
 		}
-	case 2:
 	case 3:
+		if (do_version_negation)
+			po_remove_all(mi->options, "nfsvers");
+	case 2:
 		result = nfs_try_mount_v3v2(mi);
 		break;
 	case 4:
 		result = nfs_try_mount_v4(mi);
+		if (do_version_negation && !result) {
+			if (errno == EPROTONOSUPPORT) {
+				po_remove_all(mi->options, "nfsvers");
+				result = nfs_try_mount_v3v2(mi);
+			}
+		}
 		break;
 	default:
 		errno = EIO;

nfs-utils-1.2.0-mntconf-vers.patch:
 configfile.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE nfs-utils-1.2.0-mntconf-vers.patch ---
diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
--- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-09-30 11:38:53.745992000 -0400
+++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-09-30 13:49:38.480625000 -0400
@@ -185,6 +185,19 @@ void free_all(void)
 		free(entry);
 	}
 }
+static char *versions[] = {"v2", "v3", "v4", "vers", "nfsvers", NULL};
+int inline check_vers(char *mopt, char *field)
+{
+	int i;
+
+	if (strcasecmp(field, "nfsvers") == 0 || 
+				strcasecmp(field, "vers") == 0) {
+		for (i=0; versions[i]; i++)
+			if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
+				return 1;
+	}
+	return 0;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -207,6 +220,12 @@ conf_parse_mntopts(char *section, char *
 		snprintf(buf, BUFSIZ, "%s=", node->field);
 		if (opts && strcasestr(opts, buf) != NULL)
 			continue;
+		/* 
+		 * Protocol verions can be set in a number of ways
+		 */
+		if (opts && check_vers(opts, node->field))
+			continue;
+
 		if (lookup_entry(node->field) != NULL)
 			continue;
 		buf[0] = '\0';

nfs-utils-1.2.0-mount-vers4.patch:
 nfsmount.conf |    6 +++---
 stropts.c     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: nfs-utils-1.2.0-mount-vers4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils-1.2.0-mount-vers4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-mount-vers4.patch	30 Sep 2009 00:57:48 -0000	1.1
+++ nfs-utils-1.2.0-mount-vers4.patch	30 Sep 2009 19:18:22 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig nfs-utils-1.2.0/utils/mount/nfsmount.conf
---- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-09-29 18:48:47.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-09-29 19:02:06.000000000 -0400
+--- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-09-30 11:32:14.148326000 -0400
++++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-09-30 11:35:24.714787000 -0400
 @@ -24,12 +24,12 @@
  # All reads and writes to the 'nfsserver.foo.com' server 
  # will be done with 32k (32768 bytes) block sizes.
@@ -13,13 +13,13 @@ diff -up nfs-utils-1.2.0/utils/mount/nfs
 -# Protocol Version [2,3]
 -# Nfsvers=3
 +# Protocol Version [2,3,4]
-+#Nfsvers=3
++Nfsvers=3
  # Network Transport [Udp,Tcp,Rdma]
  # Proto=Tcp
  #
 diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
---- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-29 18:48:47.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-29 19:01:10.000000000 -0400
+--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-30 11:32:14.214327000 -0400
++++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-30 11:34:35.841020000 -0400
 @@ -601,7 +601,7 @@ static int nfs_try_mount(struct nfsmount
  
  	switch (mi->version) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- nfs-utils.spec	30 Sep 2009 00:57:48 -0000	1.243
+++ nfs-utils.spec	30 Sep 2009 19:18:22 -0000	1.244
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,9 @@ Patch106: nfs-utils-1.2.0-mount-vers4.pa
 
 Patch200: nfs-utils-1.2.0-v4root-rel6.patch
 
+Patch300: nfs-utils-1.2.0-mntconf-vers.patch
+Patch301: nfs-utils-1.2.0-mntconf-negation.patch
+
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
 Provides: nfsstat     = %{epoch}:%{version}-%{release}
@@ -92,6 +95,9 @@ This package also contains the mount.nfs
 
 %patch200 -p1
 
+%patch300 -p1
+%patch301 -p1
+
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -262,6 +268,14 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-14
+- Change the nfsmount.conf file to define v3 as the default 
+  protocol version.
+- Make sure versions set on the command line override version
+  set in nfsmount.conf
+- Make version rollbacks still work when versions are set in
+  nfsmount.conf
+
 * Tue Sep 29 2009 Steve Dickson <steved at redhat.com> 1.2.0-13
 - Added upstream 1.2.1-rc5 patch
   - mount.nfs: Support negotiation between v4, v3, and v2



From chkr at fedoraproject.org  Wed Sep 30 19:19:00 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 19:19:00 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils/devel dualscreen-mouse-utils.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930191900.CD2F011C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15843/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dualscreen-mouse-utils.spec import.log 
Log Message:
initial import of dualscreen-mouse-utils



--- NEW FILE dualscreen-mouse-utils.spec ---
Summary: Utilities for use with dual head setups using independent screens
Name: dualscreen-mouse-utils
Version: 0.5
Release: 3%{?dist}
License: GPLv2
Group: User Interface/X
URL: http://digamma.cs.unm.edu/trac.dmohr/wiki/DualscreenMouseUtils
Source0: http://dsp.mcbf.net/releases/dualscreen-mouse-utils-%{version}.tar.gz
BuildRequires: libX11-devel

%description
Utilities for use with old-school dual head setups: namely not
twinview / one big desktop, but rather two X screens.

mouse-switchscreen:
  Change the mouse cursor from one screen to the other. Remembers the previous
  mouse position for each screen.

mouse-wrapscreen:
  If you have an xorg.conf where both X screens are "separated" on the X
  coordinates, then the mouse cursor cannot cross. Which is sometimes desired,
  and sometimes not. Using mouse-wrapscreen you can configure them to be
  "uncrossable", and then run it in the background when you do want to be able
  to cross the cursor.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}

%install
install -d %{buildroot}%{_bindir}
install -m 755 mouse-wrapscreen mouse-switchscreen %{buildroot}%{_bindir}/

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root,-)
%doc gpl.txt README
%{_bindir}/*

%changelog
* Mon Sep 28 2009 Christian Krause <chkr at plauener.de> - 0.5-3
- Fix spelling mistake

* Sun Sep 27 2009 Christian Krause <chkr at plauener.de> - 0.5-2
- Deleting %%buildroot is not necessary in %%install anymore (F10 and greater)
- Remove definition of %%buildroot (not needed for F10 and greater)
- Use rpm macro for optflags now

* Wed Sep 16 2009 Christian Krause <chkr at plauener.de> - 0.5-1
- Initial package



--- NEW FILE import.log ---
dualscreen-mouse-utils-0_5-3_fc10:HEAD:dualscreen-mouse-utils-0.5-3.fc10.src.rpm:1254338176


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 19:19:00 -0000	1.2
@@ -0,0 +1 @@
+dualscreen-mouse-utils-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:04 -0000	1.1
+++ sources	30 Sep 2009 19:19:00 -0000	1.2
@@ -0,0 +1 @@
+b68a43c9041cbb8dc373553ccef93070  dualscreen-mouse-utils-0.5.tar.gz



From agoode at fedoraproject.org  Wed Sep 30 19:21:12 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 30 Sep 2009 19:21:12 +0000 (UTC)
Subject: rpms/debootstrap/F-12 debootstrap-1.0.19-devices.patch, NONE,
	1.1 debootstrap-1.0.19-perms.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 debootstrap.spec, 1.9, 1.10 sources, 1.5,
	1.6 debootstrap-1.0.10-perms.patch, 1.1,
	NONE debootstrap-1.0.7-arch.patch, 1.1,
	NONE debootstrap-1.0.7-devices.patch, 1.1, NONE
Message-ID: <20090930192113.545F511C043C@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/debootstrap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16612

Modified Files:
	.cvsignore debootstrap.spec sources 
Added Files:
	debootstrap-1.0.19-devices.patch 
	debootstrap-1.0.19-perms.patch 
Removed Files:
	debootstrap-1.0.10-perms.patch debootstrap-1.0.7-arch.patch 
	debootstrap-1.0.7-devices.patch 
Log Message:
* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
- Make sure to create /dev/console in devices.tar.gz


debootstrap-1.0.19-devices.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE debootstrap-1.0.19-devices.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 15:01:01.899945579 -0400
@@ -40,6 +40,8 @@
 	mkdir -p dev
 	chown 0:0 dev
 	chmod 755 dev
-	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
+	$(MAKEDEV) -d dev std ptmx fd
+	$(MAKEDEV) -d dev -x console
+	mknod dev/console c 5 1
 	tar cf - dev | gzip -9 >devices.tar.gz
 	rm -rf dev

debootstrap-1.0.19-perms.patch:
 Makefile |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE debootstrap-1.0.19-perms.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 13:01:27.151069252 -0400
@@ -13,9 +13,9 @@
 	mkdir -p $(DSDIR)/scripts
 	mkdir -p $(DESTDIR)/usr/sbin
 
-	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 functions $(DSDIR)/
+	install -m 0644 scripts/debian/* $(DSDIR)/scripts/
+	install -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+	install -m 0644 functions $(DSDIR)/
 
         # no special script for etch anymore
 	ln -s sid $(DSDIR)/scripts/etch
@@ -30,10 +30,9 @@
 	ln -s gutsy $(DSDIR)/scripts/lucid
 
 	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
-	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 
-	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
+	install -m 0644 devices.tar.gz $(DSDIR)/
 
 devices.tar.gz:
 	rm -rf dev


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 20:46:15 -0000	1.5
+++ .cvsignore	30 Sep 2009 19:21:09 -0000	1.6
@@ -1 +1 @@
-debootstrap_1.0.10.tar.gz
+debootstrap_1.0.19.tar.gz


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-12/debootstrap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- debootstrap.spec	24 Jul 2009 20:07:01 -0000	1.9
+++ debootstrap.spec	30 Sep 2009 19:21:10 -0000	1.10
@@ -1,15 +1,14 @@
 Name:           debootstrap
-Version:        1.0.10
-Release:        3%{?dist}
+Version:        1.0.19
+Release:        2%{?dist}
 Summary:        Debian GNU/Linux bootstrapper
 
 Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-1.0.7-arch.patch
-Patch1:         debootstrap-1.0.7-devices.patch
-Patch2:         debootstrap-1.0.10-perms.patch
+Patch0:         debootstrap-1.0.19-devices.patch
+Patch1:         debootstrap-1.0.19-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,9 +28,8 @@ Debian GNU/Linux guest system.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .arch
-%patch1 -p1 -b .devices
-%patch2 -p1 -b .perms
+%patch0 -p1 -b .devices
+%patch1 -p1 -b .perms
 
 
 %build
@@ -70,6 +68,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
+- Make sure to create /dev/console in devices.tar.gz
+
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-1
+- New upstream release
+   + Many bugfixes
+   + Support for new distributions
+- Arch patch no longer needed
+- Rebase other patches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Jul 2008 20:46:15 -0000	1.5
+++ sources	30 Sep 2009 19:21:10 -0000	1.6
@@ -1 +1 @@
-7e69840dd670af938fc13eea9e53e49f  debootstrap_1.0.10.tar.gz
+e82b5745ec9c25bbe15c4cf075af4999  debootstrap_1.0.19.tar.gz


--- debootstrap-1.0.10-perms.patch DELETED ---


--- debootstrap-1.0.7-arch.patch DELETED ---


--- debootstrap-1.0.7-devices.patch DELETED ---



From chkr at fedoraproject.org  Wed Sep 30 19:21:26 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 19:21:26 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils/devel dualscreen-mouse-utils.spec, 1.1, 
	1.2
Message-ID: <20090930192126.A2E6511C0261@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757

Modified Files:
	dualscreen-mouse-utils.spec 
Log Message:
* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-4
- Correct email address



Index: dualscreen-mouse-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/devel/dualscreen-mouse-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dualscreen-mouse-utils.spec	30 Sep 2009 19:19:00 -0000	1.1
+++ dualscreen-mouse-utils.spec	30 Sep 2009 19:21:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Utilities for use with dual head setups using independent screens
 Name: dualscreen-mouse-utils
 Version: 0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: User Interface/X
 URL: http://digamma.cs.unm.edu/trac.dmohr/wiki/DualscreenMouseUtils
@@ -42,14 +42,17 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
-* Mon Sep 28 2009 Christian Krause <chkr at plauener.de> - 0.5-3
+* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-4
+- Correct email address
+
+* Mon Sep 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-3
 - Fix spelling mistake
 
-* Sun Sep 27 2009 Christian Krause <chkr at plauener.de> - 0.5-2
+* Sun Sep 27 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-2
 - Deleting %%buildroot is not necessary in %%install anymore (F10 and greater)
 - Remove definition of %%buildroot (not needed for F10 and greater)
 - Use rpm macro for optflags now
 
-* Wed Sep 16 2009 Christian Krause <chkr at plauener.de> - 0.5-1
+* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-1
 - Initial package
 



From dwmw2 at fedoraproject.org  Wed Sep 30 19:24:09 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 30 Sep 2009 19:24:09 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-intel-iommu-updates.patch,1.2,1.3
Message-ID: <20090930192409.ABB7111C00E6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17422

Modified Files:
	linux-2.6-intel-iommu-updates.patch 
Log Message:
don't kill BROKEN_GFX_WA

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   50 ++++-
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 9 files changed, 294 insertions(+), 195 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:12:03 -0000	1.2
+++ linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:24:09 -0000	1.3
@@ -1,3 +1,5 @@
+(Reverted the part which kills BROKEN_GFX_WA)
+
 commit e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
 Author: David Woodhouse <David.Woodhouse at intel.com>
 Date:   Wed Sep 30 09:12:17 2009 -0700
@@ -461,19 +463,6 @@ index 223abb1..285aae8 100644
  #ifdef CONFIG_IA64_GENERIC
  		swiotlb = 1;
  		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 13ffa5d..5499da1 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1916,7 +1916,7 @@ config DMAR_DEFAULT_ON
- config DMAR_BROKEN_GFX_WA
- 	def_bool n
- 	prompt "Workaround broken graphics drivers (going away soon)"
--	depends on DMAR
-+	depends on DMAR && BROKEN
- 	---help---
- 	  Current Graphics drivers tend to use physical address
- 	  for DMA and avoid using DMA APIs. Setting this config
 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
 index 6af96ee..1e66b18 100644
 --- a/arch/x86/kernel/pci-swiotlb.c



From agoode at fedoraproject.org  Wed Sep 30 19:25:21 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 30 Sep 2009 19:25:21 +0000 (UTC)
Subject: rpms/debootstrap/F-11 debootstrap-1.0.19-devices.patch, NONE,
	1.1 debootstrap-1.0.19-perms.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 debootstrap.spec, 1.8, 1.9 sources, 1.5,
	1.6 debootstrap-1.0.10-perms.patch, 1.1,
	NONE debootstrap-1.0.7-arch.patch, 1.1,
	NONE debootstrap-1.0.7-devices.patch, 1.1, NONE
Message-ID: <20090930192521.E50D811C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/debootstrap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17746

Modified Files:
	.cvsignore debootstrap.spec sources 
Added Files:
	debootstrap-1.0.19-devices.patch 
	debootstrap-1.0.19-perms.patch 
Removed Files:
	debootstrap-1.0.10-perms.patch debootstrap-1.0.7-arch.patch 
	debootstrap-1.0.7-devices.patch 
Log Message:
* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
- Make sure to create /dev/console in devices.tar.gz


debootstrap-1.0.19-devices.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE debootstrap-1.0.19-devices.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 15:01:01.899945579 -0400
@@ -40,6 +40,8 @@
 	mkdir -p dev
 	chown 0:0 dev
 	chmod 755 dev
-	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
+	$(MAKEDEV) -d dev std ptmx fd
+	$(MAKEDEV) -d dev -x console
+	mknod dev/console c 5 1
 	tar cf - dev | gzip -9 >devices.tar.gz
 	rm -rf dev

debootstrap-1.0.19-perms.patch:
 Makefile |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE debootstrap-1.0.19-perms.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 13:01:27.151069252 -0400
@@ -13,9 +13,9 @@
 	mkdir -p $(DSDIR)/scripts
 	mkdir -p $(DESTDIR)/usr/sbin
 
-	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 functions $(DSDIR)/
+	install -m 0644 scripts/debian/* $(DSDIR)/scripts/
+	install -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+	install -m 0644 functions $(DSDIR)/
 
         # no special script for etch anymore
 	ln -s sid $(DSDIR)/scripts/etch
@@ -30,10 +30,9 @@
 	ln -s gutsy $(DSDIR)/scripts/lucid
 
 	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
-	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 
-	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
+	install -m 0644 devices.tar.gz $(DSDIR)/
 
 devices.tar.gz:
 	rm -rf dev


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 20:46:15 -0000	1.5
+++ .cvsignore	30 Sep 2009 19:25:19 -0000	1.6
@@ -1 +1 @@
-debootstrap_1.0.10.tar.gz
+debootstrap_1.0.19.tar.gz


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-11/debootstrap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- debootstrap.spec	24 Feb 2009 11:16:53 -0000	1.8
+++ debootstrap.spec	30 Sep 2009 19:25:21 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           debootstrap
-Version:        1.0.10
+Version:        1.0.19
 Release:        2%{?dist}
 Summary:        Debian GNU/Linux bootstrapper
 
@@ -7,9 +7,8 @@ Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-1.0.7-arch.patch
-Patch1:         debootstrap-1.0.7-devices.patch
-Patch2:         debootstrap-1.0.10-perms.patch
+Patch0:         debootstrap-1.0.19-devices.patch
+Patch1:         debootstrap-1.0.19-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,9 +28,8 @@ Debian GNU/Linux guest system.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .arch
-%patch1 -p1 -b .devices
-%patch2 -p1 -b .perms
+%patch0 -p1 -b .devices
+%patch1 -p1 -b .perms
 
 
 %build
@@ -70,6 +68,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
+- Make sure to create /dev/console in devices.tar.gz
+
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-1
+- New upstream release
+   + Many bugfixes
+   + Support for new distributions
+- Arch patch no longer needed
+- Rebase other patches
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Jul 2008 20:46:15 -0000	1.5
+++ sources	30 Sep 2009 19:25:21 -0000	1.6
@@ -1 +1 @@
-7e69840dd670af938fc13eea9e53e49f  debootstrap_1.0.10.tar.gz
+e82b5745ec9c25bbe15c4cf075af4999  debootstrap_1.0.19.tar.gz


--- debootstrap-1.0.10-perms.patch DELETED ---


--- debootstrap-1.0.7-arch.patch DELETED ---


--- debootstrap-1.0.7-devices.patch DELETED ---



From agoode at fedoraproject.org  Wed Sep 30 19:27:32 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 30 Sep 2009 19:27:32 +0000 (UTC)
Subject: rpms/debootstrap/F-10 debootstrap-1.0.19-devices.patch, NONE,
	1.1 debootstrap-1.0.19-perms.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 debootstrap.spec, 1.6, 1.7 sources, 1.5,
	1.6 debootstrap-1.0.10-perms.patch, 1.1,
	NONE debootstrap-1.0.7-arch.patch, 1.1,
	NONE debootstrap-1.0.7-devices.patch, 1.1, NONE
Message-ID: <20090930192733.0017911C00E6@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/debootstrap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18361

Modified Files:
	.cvsignore debootstrap.spec sources 
Added Files:
	debootstrap-1.0.19-devices.patch 
	debootstrap-1.0.19-perms.patch 
Removed Files:
	debootstrap-1.0.10-perms.patch debootstrap-1.0.7-arch.patch 
	debootstrap-1.0.7-devices.patch 
Log Message:
* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
- Make sure to create /dev/console in devices.tar.gz


debootstrap-1.0.19-devices.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE debootstrap-1.0.19-devices.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 15:01:01.899945579 -0400
@@ -40,6 +40,8 @@
 	mkdir -p dev
 	chown 0:0 dev
 	chmod 755 dev
-	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
+	$(MAKEDEV) -d dev std ptmx fd
+	$(MAKEDEV) -d dev -x console
+	mknod dev/console c 5 1
 	tar cf - dev | gzip -9 >devices.tar.gz
 	rm -rf dev

debootstrap-1.0.19-perms.patch:
 Makefile |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE debootstrap-1.0.19-perms.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 13:01:27.151069252 -0400
@@ -13,9 +13,9 @@
 	mkdir -p $(DSDIR)/scripts
 	mkdir -p $(DESTDIR)/usr/sbin
 
-	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 functions $(DSDIR)/
+	install -m 0644 scripts/debian/* $(DSDIR)/scripts/
+	install -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+	install -m 0644 functions $(DSDIR)/
 
         # no special script for etch anymore
 	ln -s sid $(DSDIR)/scripts/etch
@@ -30,10 +30,9 @@
 	ln -s gutsy $(DSDIR)/scripts/lucid
 
 	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
-	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 
-	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
+	install -m 0644 devices.tar.gz $(DSDIR)/
 
 devices.tar.gz:
 	rm -rf dev


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 20:46:15 -0000	1.5
+++ .cvsignore	30 Sep 2009 19:27:32 -0000	1.6
@@ -1 +1 @@
-debootstrap_1.0.10.tar.gz
+debootstrap_1.0.19.tar.gz


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-10/debootstrap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- debootstrap.spec	15 Jul 2008 20:58:18 -0000	1.6
+++ debootstrap.spec	30 Sep 2009 19:27:32 -0000	1.7
@@ -1,15 +1,14 @@
 Name:           debootstrap
-Version:        1.0.10
-Release:        1%{?dist}
-Summary:        Bootstrap a basic Debian GNU/Linux system
+Version:        1.0.19
+Release:        2%{?dist}
+Summary:        Debian GNU/Linux bootstrapper
 
 Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-1.0.7-arch.patch
-Patch1:         debootstrap-1.0.7-devices.patch
-Patch2:         debootstrap-1.0.10-perms.patch
+Patch0:         debootstrap-1.0.19-devices.patch
+Patch1:         debootstrap-1.0.19-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,9 +28,8 @@ Debian GNU/Linux guest system.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .arch
-%patch1 -p1 -b .devices
-%patch2 -p1 -b .perms
+%patch0 -p1 -b .devices
+%patch1 -p1 -b .perms
 
 
 %build
@@ -70,6 +68,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
+- Make sure to create /dev/console in devices.tar.gz
+
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-1
+- New upstream release
+   + Many bugfixes
+   + Support for new distributions
+- Arch patch no longer needed
+- Rebase other patches
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 15 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.0.10-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Jul 2008 20:46:15 -0000	1.5
+++ sources	30 Sep 2009 19:27:32 -0000	1.6
@@ -1 +1 @@
-7e69840dd670af938fc13eea9e53e49f  debootstrap_1.0.10.tar.gz
+e82b5745ec9c25bbe15c4cf075af4999  debootstrap_1.0.19.tar.gz


--- debootstrap-1.0.10-perms.patch DELETED ---


--- debootstrap-1.0.7-arch.patch DELETED ---


--- debootstrap-1.0.7-devices.patch DELETED ---



From sharkcz at fedoraproject.org  Wed Sep 30 19:33:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 30 Sep 2009 19:33:33 +0000 (UTC)
Subject: rpms/s390utils/F-11
	0023-change-default-load-address-for-ramdisk.patch, NONE,
	1.1 0024-s390-tools-1.8.1-cpuplugd-limits.patch, NONE,
	1.1 0025-s390-tools-1.8.1-misc-bugfixes.patch, NONE,
	1.1 s390utils.spec, 1.8, 1.9 zfcpconf.sh, 1.1, 1.2
Message-ID: <20090930193333.921D111C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20794

Modified Files:
	s390utils.spec zfcpconf.sh 
Added Files:
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
- changed ramdisk load address (#526339)
- updated zfcpconf.sh script to new sysfs interface (#526324)
- added 1.8.1 fixes from IBM (#525495)


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0023-change-default-load-address-for-ramdisk.patch ---
>From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:19:23 +0200
Subject: [PATCH 23/25] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x100000 to 0x200000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..0f04072 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -21,7 +21,7 @@
 #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
-#define DEFAULT_IMAGE_ADDRESS		0x10000LL
+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
 #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
-- 
1.6.3.3


0024-s390-tools-1.8.1-cpuplugd-limits.patch:
 config.c |   15 +++++++++++++--
 daemon.c |   11 -----------
 mem.c    |    7 +++----
 3 files changed, 16 insertions(+), 17 deletions(-)

--- NEW FILE 0024-s390-tools-1.8.1-cpuplugd-limits.patch ---
>From 0b02dbdbd248ca51583e9dce3bd57025b965534d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:22:15 +0200
Subject: [PATCH 24/25] s390-tools-1.8.1-cpuplugd-limits

Description: cpuplugd: fix cmm_pages allocation outside min and max range
Symptom:     cpuplugd might instruct CMM to operated outside the predefined limits
Problem:     This problem is basically caused by a missing new line separator at
	     the interface between the daemon and the proc file.
Solution:    Add newline to the end of each line when writing to /proc/sys/vm/cmm_pages
Problem-ID:  55472
---
 cpuplugd/config.c |   15 +++++++++++++--
 cpuplugd/daemon.c |   11 -----------
 cpuplugd/mem.c    |    6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cpuplugd/config.c b/cpuplugd/config.c
index c013a65..bd3cb43 100644
--- a/cpuplugd/config.c
+++ b/cpuplugd/config.c
@@ -494,7 +494,7 @@ void check_config(struct config *cfg)
 	if (memory == 1) {
 		/*
 		 * check that the initial value of cmm_pages is not below
-		 * cmm_min
+		 * cmm_min or above cmm_max
 		 */
 		cmm_pagesize_start = get_cmmpages_size();
 		if (cmm_pagesize_start < cfg->cmm_min) {
@@ -506,7 +506,18 @@ void check_config(struct config *cfg)
 				syslog(LOG_INFO, "cmm_pages is below minimum "
 						"and will be increased\n");
 			}
-			memunplug(cfg->cmm_min);
+			set_cmm_pages(cfg->cmm_min);
+		}
+		if (cmm_pagesize_start > cfg->cmm_max) {
+			if (debug && foreground == 1) {
+				printf("cmm_pages is above the maximum and will "
+						"be decreased.\n");
+			}
+			if (debug && foreground == 0) {
+				syslog(LOG_INFO, "cmm_pages is above the maximum "
+						"and will be decreased\n");
+			}
+			set_cmm_pages(cfg->cmm_max);
 		}
 	}
 }
diff --git a/cpuplugd/daemon.c b/cpuplugd/daemon.c
index d0769f3..e1ef623 100644
--- a/cpuplugd/daemon.c
+++ b/cpuplugd/daemon.c
@@ -260,17 +260,6 @@ void check_max(struct config *cfg)
 			cpuid++;
 		}
 	}
-	if (memory && get_cmmpages_size() > cfg->cmm_max) {
-		if (debug && foreground == 1) {
-			printf("cmm_pages is above the maximum and will "
-					"be decreased.\n");
-		}
-		if (debug && foreground == 0) {
-			syslog(LOG_INFO, "cmm_pages is above the maximum "
-					"and will be decreased\n");
-		}
-		set_cmm_pages(cfg->cmm_max);
-	}
 }
 
 /* check if we are running in an LPAR environment.
diff --git a/cpuplugd/mem.c b/cpuplugd/mem.c
index 2f3d219..6200904 100644
--- a/cpuplugd/mem.c
+++ b/cpuplugd/mem.c
@@ -138,7 +138,7 @@ int memunplug(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", new_size);
+	fprintf(filp, "%d\n", new_size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", new_size);
@@ -173,7 +173,7 @@ int memplug(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", new_size);
+	fprintf(filp, "%d\n", new_size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", new_size);
@@ -200,7 +200,7 @@ int set_cmm_pages(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", size);
+	fprintf(filp, "%d\n", size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", size);
-- 
1.6.3.3


0025-s390-tools-1.8.1-misc-bugfixes.patch:
 ipl_tools/system.c |   13 ++-
 man/af_iucv.7      |  175 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 166 insertions(+), 22 deletions(-)

--- NEW FILE 0025-s390-tools-1.8.1-misc-bugfixes.patch ---
>From 60a3bf1df6d7039f75d889f15d7839f8482c2889 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:24:52 +0200
Subject: [PATCH 25/25] s390-tools-1.8.1-misc-bugfixes

Miscellaneous minor bufgixes for s390-tools RHEL5.5:
* lsshut:  Fix printing of vmcmd shutdown action: Also print CP commands
           that have more than one word.
* af_iucv: Doc update for connection-oriented datagram sockets.
---
 ipl_tools/system.c |   13 +++--
 man/af_iucv.7      |  174 +++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 166 insertions(+), 21 deletions(-)

diff --git a/ipl_tools/system.c b/ipl_tools/system.c
index 8294db0..fd5b76b 100644
--- a/ipl_tools/system.c
+++ b/ipl_tools/system.c
@@ -74,7 +74,7 @@ out:
 char *substring(size_t start, size_t stop, const char *src, char *dst,
 		size_t size)
 {
-	int count;
+	unsigned int count;
 
 	count = stop - start;
 	if (count >= --size)
@@ -102,7 +102,7 @@ int check_for_root(void)
 int ishex(char *cp)
 {
 
-	int i;
+	unsigned int i;
 	char c;
 
 	for (i = 0; i <= strlen(cp); i++) {
@@ -168,13 +168,13 @@ int strrd(char *string, char *file)
 
 	strncpy(path, file, sizeof(path));
 	if (access(path, R_OK) == 0) {
-		filp = fopen(path, "r");
+		filp = fopen(path, "rb");
 		if (!filp) {
 			fprintf(stderr,	"%s: Can not open %s: ", name, file);
 			fprintf(stderr, "%s\n", strerror(errno));
 			exit(1);
 		}
-		rc = fscanf(filp, "%s", string);
+		rc = fread(string, 4096, 1, filp);
 		fclose(filp);
 		/*
 		 *  special handling is required for
@@ -192,8 +192,11 @@ int strrd(char *string, char *file)
 					file);
 			fprintf(stderr, "%s\n", strerror(errno));
 			return -1;
-		} else
+		} else {
+			if (string[strlen(string) - 1] == '\n')
+				string[strlen(string) - 1] = 0;
 			return 0;
+		}
 	} else {
 		fprintf(stderr,	"%s: Can not open %s: ", name, file);
 		fprintf(stderr, "%s\n", strerror(errno));
diff --git a/man/af_iucv.7 b/man/af_iucv.7
index cdd2691..9d56640 100644
--- a/man/af_iucv.7
+++ b/man/af_iucv.7
@@ -4,7 +4,7 @@
 .\" Copyright IBM Corp. 2008, 2009.
 .\" Author(s): Hendrik Brueckner <brueckner at linux.vnet.ibm.com>
 .\" ----------------------------------------------------------------------
-.TH AF_IUCV 7 "March 2009"  "s390-tools" "Linux Programmer's Manual"
+.TH AF_IUCV 7 "September 2009"  "s390-tools" "Linux Programmer's Manual"
 .SH NAME
 iucv, AF_IUCV \- Sockets for z/VM IUCV communication
 .
@@ -13,15 +13,17 @@ iucv, AF_IUCV \- Sockets for z/VM IUCV communication
 .SH SYNOPSIS
 .B #include <sys/socket.h>
 
-.IB iucv_socket " = socket(AF_IUCV, SOCK_STREAM, 0);"
+.IB iucv_stream_socket " = socket(AF_IUCV, SOCK_STREAM, 0);"
+.br
+.IB iucv_packet_socket " = socket(AF_IUCV, SOCK_SEQPACKET, 0);"
 .
 .
 .
 .SH DESCRIPTION
 The Inter-User Communication Vehicle (IUCV) is a z/VM communication facility
 that enables a program running in one z/VM guest virtual machine to communicate
-with another z/VM guest virtual machine, or with a control program, or even
-with itself.
+with another z/VM guest virtual machine, or with the control program (CP), or
+even with itself.
 
 The AF_IUCV address family provides communication and addressing in the IUCV
 domain.  In the IUCV domain, address spaces or virtual machines can use the
@@ -32,7 +34,11 @@ AF_IUCV connects socket applications running on different Linux guest operating
 systems, or it connects a Linux application to another socket application
 running in another z/VM guest operating system (like z/VM CMS).
 
-The AF_IUCV address family supports stream sockets only.
+The AF_IUCV address family supports stream-oriented sockets
+(\f(CWSOCK_STREAM\fP) and connection-oriented datagram sockets
+(\f(CWSOCK_SEQPACKET\fP). Stream-oriented sockets fragment data over several
+native IUCV messages, whereas sockets of type SOCK_SEQPACKET map a particular
+socket write or read operation to a single native IUCV message.
 
 .SS Features
 The AF_IUCV address family provides:
@@ -78,28 +84,106 @@ are reserved for future use. The
 .B siucv_port
 and
 .B siucv_addr
-fields must be zero. The 
+fields must be zero. The
 .B siucv_nodeid
 field must be set to exactly eight blank characters.
 .
 .TP
 .B siucv_userid
 is set to the z/VM user ID of the Linux guest virtual machine running the
-application which owns the address. The field must be eight characters long,
+application that owns the address. The field must be eight characters long,
 padded with blanks on the right.
 
 For
 .BR bind "(2), " siucv_userid
-must contain blanks only, because AF_IUCV sets the correct z/VM user ID.
+must contain blanks only to allow AF_IUCV to set the z/VM user ID of the Linux
+guest operating system.
 .
 .TP
 .B siucv_name
-is set to the application name by which the socket is known. Servers advertises
+is set to the application name by which the socket is known. Servers advertise
 application names and clients use these application names to connect to servers.
 This field must be eight characters long, padded with blanks on the right.
 .
 .
 .
+.SH "SOCKET OPTIONS"
+Socket options can be set with
+.BR setsockopt (2)
+and read with
+.BR getsockopt (2)
+by specifying \f(CWSOL_IUCV\fP as the socket level.
+
+.TP
+.B SO_IPRMDATA_MSG
+Enables the application to send up to seven bytes of socket data in the
+parameter list of an IUCV message. Use this option to increase performance
+when transferring small amounts of data.
+
+To send data in the parameter list, specify a non-zero integer value.
+
+.RS
+.TP
+.B Note:
+Use this option with care, older AF_IUCV versions do not support receiving
+socket data in the parameter list and shut down the socket on which
+a parameter list message has been received.
+.RE
+.
+.TP
+.B SO_MSGLIMIT
+Modifies the message limit for new IUCV communication paths. The message
+limit specifies the maximum number of outstanding messages that are allowed
+for established connections. This setting can be lowered by z/VM when an IUCV
+connection is established.
+
+The message limit is an integer value in range 1 to 65535.
+The default value is 65535.
+
+The message limit must be set before
+.BR connect "(2) or " listen (2)
+is called for sockets.
+.br
+For sockets that are already connected or listening for connections,
+the message limit cannot be changed.
+.br
+New sockets created by
+.BR accept (2)
+inherit the message limit that has been set for the listening socket.
+
+.BR getsockopt (2)
+returns the default message limit or the limit that has been set.
+For connected sockets, the current message limit is returned. The current
+message limit is assigned by z/VM for each connection and it depends
+on the IUCV MSGLIMIT statement specified for the z/VM guest virtual machine.
+The current message limit is the lower value of the socket option and the
+value specified for the IUCV MSGLIMIT statement.
+
+See the SECURITY section below for setting IUCV MSGLIMIT authorizations.
+.
+.
+.
+.SH "ANCILLARY DATA"
+Ancillary data is sent and received using the
+.BR sendmsg (2)
+and
+.BR recvmsg (2)\fR.\fP
+To send ancillary data, set the \fBcmsg_level\fP field of struct \fBcmsghdr\fP
+to \f(CWSOL_IUCV\fP and the \fBcmsg_type\fP field to the type.
+.br
+For more information see
+.BR cmsg (3).
+
+.TP
+.B SCM_IUCV_TRGCLS
+Send or receive IUCV target class information. The IUCV target class can be used
+to classify and identify an IUCV message at IUCV protocol level. If the target
+class is not specified as ancillary data, it is set to zero.
+
+The target class is a number of type \fBuint32_t\fP.
+.
+.
+.
 .
 .SH SECURITY
 This section provides an overview of the required IUCV statements for your z/VM
@@ -129,20 +213,20 @@ any other z/VM guest virtual machine.
 .TP
 .B IUCV \fIuser_ID\fP
 allows this z/VM guest virtual machine to establish a communication path to the
-z/VM guest virtual machine with the z/VM user ID \fIuser_ID\fP. 
+z/VM guest virtual machine with the z/VM user ID \fIuser_ID\fP.
 .PP
 You can specify multiple IUCV statements. To any of these IUCV statements you
 can append the
 .B MSGLIMIT \fIlimit\fP
 parameter.
 \fIlimit\fP specifies the maximum number of outstanding messages that are
-allowed for each connection authorized by this entry.
+allowed for each connection authorized by this statement.
 If no value is specified for \fBMSGLIMIT\fP, AF_IUCV requests 65535,
 which is the maximum supported by IUCV.
 .
 .
 .SS "Setting a connection limit"
-Use the \fBOPTION\fP statement to limit the number of concurrent connections. 
+Use the \fBOPTION\fP statement to limit the number of concurrent connections.
 .TP
 .B OPTION MAXCONN \fImaxno\fP
 \fImaxno\fP specifies the maximum number of IUCV connections allowed for this
@@ -151,7 +235,7 @@ virtual machine. The default is 64. The maximum is 65535.
 .
 .SS "Example"
 These sample statements allow any z/VM guest virtual machine to connect to your
-z/VM guest virtual machine with a maximum of 10000 outstanding messages for each
+z/VM guest virtual machine with a maximum of 10\^000 outstanding messages for each
 incoming connection. Your z/VM guest virtual machine is permitted to connect to
 all other z/VM guest virtual machines. The total number of connections for your
 z/VM guest virtual machine cannot exceed 100.
@@ -200,6 +284,14 @@ This error can be temporary and the application may try again after some time.
 If the error occurs repeatedly, try to increase the maximum number of
 connections (for one or both z/VM guest virtual machines).
 See the SECURITY section about the required authorization statement.
+
+.B sendmsg (2)
+called but the maximum number of outstanding IUCV messages for the socket
+connection is reached; i.e. there are data available that has not yet been
+received by the communication partner.
+.br
+If necessary, change the IUCV message limit as explained in section
+"IUCV AUTHORIZATIONS".
 .
 .TP
 .B EACCES
@@ -217,10 +309,22 @@ called but the AF_IUCV setting in the
 field of the passed address is missing.
 
 .BR listen (2)
-called but the AF_IUCV socket has not yet been bound to an address.  Always call
+called but the AF_IUCV socket has not yet been bound to an address.
+Always call
 .BR bind (2)
 before
 .BR listen (2).
+
+.BR setsockopt (2)
+called with option \fBSO_MSGLIMIT\fP for sockets that are already connected.
+.
+.TP
+.B ENOPROTOOPT
+.BR setsockopt (2),
+or
+.BR getsockopt (2)
+called but the socket level has not been set to \f(CWSOL_IUCV\fP, or the
+specified socket option is not supported.
 .
 .TP
 .B EOPNOTSUPP
@@ -232,13 +336,27 @@ might be called with the
 flag set.
 AF_IUCV does not support sending or receiving \fIout-of-band\fP data on its
 sockets.
+
+For \f(CWSOCK_SEQPACKET\fP sockets,
+.BR sendmsg (2)
+called without the
+.I MSG_EOR
+flag set.
+AF_IUCV does not support segmentation, and thus, the "end-of-record"
+(\fIMSG_EOR\fP) flag must always be set.
+.
+.TP
+.B EPROTONOSUPPORT
+.BR socket (2)
+called with a protocol that is not supported. The socket protocol parameter
+must be either zero or \f(CWPF_IUCV\fP.
 .
 .TP
 .B EAFNOSUPPORT
 .BR socket (2)
-called with \fIAF_IUCV\fP but the AF_IUCV protocol / addressing family is not
+called with \f(CWAF_IUCV\fP but the AF_IUCV address family is not
 supported by the current Linux kernel.  Ensure that your Linux kernel has been
-compiled with support for the AF_IUCV addressing family.
+compiled with support for the AF_IUCV address family.
 .
 .PP
 Other errors can be generated by the generic socket layer. See the respective
@@ -251,6 +369,9 @@ manual pages for more information.
 .BR recvmsg (2),
 .BR sendmsg (2),
 .BR socket (2),
+.BR setsockopt (2),
+.BR getsockopt (2),
+.BR cmsg (3),
 .BR socket (7)
 
 .I "Linux on System z - Device Drivers, Features, and Commands"
@@ -258,3 +379,24 @@ manual pages for more information.
 .I "z/VM CP Planning and Administration"
 .br
 .I "z/VM CP Programming Services"
+.
+.
+.
+.SH "HISTORY"
+.TP
+.B AF_IUCV, version 1.0
+Initial version.
+.TP
+.B AF_IUCV, version 1.1
+.RS 4
+.IP "\(bu" 4
+Support for sending socket data in the parameter list of an IUCV message
+(\f(CWSO_IPRMDATA_MSG\fP).
+.IP "\(bu" 4
+Access the target class of an IUCV message as ancillary data using
+.BR sendmsg "(2) and " recvmsg (2).
+.IP "\(bu" 4
+Support for \f(CWSOCK_SEQPACKET\fP sockets to facilitate development of native
+IUCV applications that interact with AF_IUCV.
+.RE
+
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- s390utils.spec	25 Sep 2009 12:01:05 -0000	1.8
+++ s390utils.spec	30 Sep 2009 19:33:32 -0000	1.9
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@ Patch19:  0019-s390-tools-1.8.1-lsluns-d
 Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
 Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
 Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch23:  0023-change-default-load-address-for-ramdisk.patch
+Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
+Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -128,6 +131,15 @@ be used together with the zSeries (s390)
 # Fix string overflow in vtoc_volume_label_init (#525318)
 %patch22 -p1 -b .vtoc-label
 
+# Change default load address for ramdisk (#526339)
+%patch23 -p1 -b .ramdisk-address
+
+# Fix cmm_pages allocation outside min and max range (#525495)
+%patch24 -p1 -b .ramdisk-address
+
+# Miscelaneous fixes for 1.8.1 (#525495)
+%patch25 -p1 -b .misc
+
 #
 # cmsfs
 #
@@ -776,6 +788,11 @@ User-space development files for the s39
 
 
 %changelog
+* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
+- changed ramdisk load address (#526339)
+- updated zfcpconf.sh script to new sysfs interface (#526324)
+- added 1.8.1 fixes from IBM (#525495)
+
 * Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
 - fix issues in lib-zfcp-hbaapi with a patch
 


Index: zfcpconf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/zfcpconf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfcpconf.sh	7 Apr 2009 08:03:09 -0000	1.1
+++ zfcpconf.sh	30 Sep 2009 19:33:32 -0000	1.2
@@ -10,15 +10,13 @@
 #
 # manual setup:
 # modprobe zfcp
-# echo WWPN > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
-# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
 # echo 1    > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
+# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
 # 
 # Example:
 # modprobe zfcp
-# echo 0x5005076300c213e9 > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
-# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
 # echo 1                  > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
+# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
 
 CONFIG=/etc/zfcp.conf
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -39,8 +37,7 @@ if [ -f "$CONFIG" ]; then
       elif [ $numparams == 3 ]; then
          read DEVICE WWPN FCPLUN < <(echo $line)
       fi
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN ] && echo $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
       echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
+      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
    done
 fi



From hadess at fedoraproject.org  Wed Sep 30 19:36:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 30 Sep 2009 19:36:11 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.267,1.268
Message-ID: <20090930193611.91BB011C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21867

Modified Files:
	rhythmbox.spec 
Log Message:
* Wed Sep 30 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-4
- Enable the FM radio plugin



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- rhythmbox.spec	28 Sep 2009 18:43:44 -0000	1.267
+++ rhythmbox.spec	30 Sep 2009 19:36:11 -0000	1.268
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -43,6 +43,7 @@ BuildRequires: lirc-devel
 BuildRequires: libmtp-devel
 BuildRequires: gstreamer-python-devel
 BuildRequires: libgudev-devel
+BuildRequires: kernel-headers
 BuildRequires: perl(XML::Parser) intltool
 
 
@@ -208,6 +209,7 @@ fi
 %{_libdir}/rhythmbox/plugins/fmradio/
 %{_libdir}/rhythmbox/plugins/im-status/
 %{_libdir}/rhythmbox/plugins/status-icon/
+%{_libdir}/rhythmbox/plugins/fmradio/
 %{_libexecdir}/rhythmbox-metadata
 
 %files lirc
@@ -219,6 +221,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Sep 30 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-4
+- Enable the FM radio plugin
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-3
 - Fix the symbols for the browser plugin being mangled (#525826)
 



From lmacken at fedoraproject.org  Wed Sep 30 19:39:07 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 19:39:07 +0000 (UTC)
Subject: rpms/python-catwalk/devel import.log, NONE, 1.1 python-catwalk.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930193907.DF9B511C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-catwalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22564/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-catwalk.spec 
Log Message:
Initial import of python-catwalk



--- NEW FILE import.log ---
python-catwalk-2_0_2-1_fc10:HEAD:python-catwalk-2.0.2-1.fc10.src.rpm:1254324726


--- NEW FILE python-catwalk.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-catwalk
Version:        2.0.2
Release:        1%{?dist}
Summary:        A way to view your models using TurboGears

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/tgtools/wiki/Catwalk
Source0:        http://pypi.python.org/packages/source/C/Catwalk/Catwalk-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose python-sprox python-tgext-admin
Requires:       python-sprox python-tgext-admin

%description
Catwalk is a database manipulation application built on top of TurboGears.
With it you can easily interact with your application data model and manage
your data.


%prep
%setup -q -n Catwalk-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


# Disabled until chameleon.genshi is packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/Catwalk*
%{python_sitelib}/catwalk/


%changelog
* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:55:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 19:39:07 -0000	1.2
@@ -0,0 +1 @@
+Catwalk-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:55:12 -0000	1.1
+++ sources	30 Sep 2009 19:39:07 -0000	1.2
@@ -0,0 +1 @@
+e301fad3aa9c0888f9ff03b9f556bf46  Catwalk-2.0.2.tar.gz



From dwmw2 at fedoraproject.org  Wed Sep 30 19:42:24 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 30 Sep 2009 19:42:24 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-intel-iommu-updates.patch,1.3,1.4
Message-ID: <20090930194224.936A111C00E6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23378

Modified Files:
	linux-2.6-intel-iommu-updates.patch 
Log Message:
make it build

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   37 ++-
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 9 files changed, 282 insertions(+), 194 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:24:09 -0000	1.3
+++ linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:42:24 -0000	1.4
@@ -1,4 +1,5 @@
 (Reverted the part which kills BROKEN_GFX_WA)
+(...and the HARDWARE_AFFINITY bit)
 
 commit e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
 Author: David Woodhouse <David.Woodhouse at intel.com>
@@ -483,42 +484,6 @@ diff --git a/drivers/pci/dmar.c b/driver
 index 7b287cb..708176d 100644
 --- a/drivers/pci/dmar.c
 +++ b/drivers/pci/dmar.c
-@@ -353,6 +353,7 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
- 	struct acpi_dmar_hardware_unit *drhd;
- 	struct acpi_dmar_reserved_memory *rmrr;
- 	struct acpi_dmar_atsr *atsr;
-+	struct acpi_dmar_rhsa *rhsa;
- 
- 	switch (header->type) {
- 	case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-@@ -374,6 +375,12 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
- 		atsr = container_of(header, struct acpi_dmar_atsr, header);
- 		printk(KERN_INFO PREFIX "ATSR flags: %#x\n", atsr->flags);
- 		break;
-+	case ACPI_DMAR_HARDWARE_AFFINITY:
-+		rhsa = container_of(header, struct acpi_dmar_rhsa, header);
-+		printk(KERN_INFO PREFIX "RHSA base: %#016Lx proximity domain: %#x\n",
-+		       (unsigned long long)rhsa->base_address,
-+		       rhsa->proximity_domain);
-+		break;
- 	}
- }
- 
-@@ -452,9 +459,13 @@ parse_dmar_table(void)
- 			ret = dmar_parse_one_atsr(entry_header);
- #endif
- 			break;
-+		case ACPI_DMAR_HARDWARE_AFFINITY:
-+			/* We don't do anything with RHSA (yet?) */
-+			break;
- 		default:
- 			printk(KERN_WARNING PREFIX
--				"Unknown DMAR structure type\n");
-+				"Unknown DMAR structure type %d\n",
-+				entry_header->type);
- 			ret = 0; /* for forward compatibility */
- 			break;
- 		}
 @@ -570,9 +581,6 @@ int __init dmar_table_init(void)
  		printk(KERN_INFO PREFIX "No ATSR found\n");
  #endif



From lmacken at fedoraproject.org  Wed Sep 30 19:46:24 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 19:46:24 +0000 (UTC)
Subject: rpms/python-catwalk/F-11 import.log, NONE, 1.1 python-catwalk.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930194624.12B3711C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-catwalk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24286/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-catwalk.spec 
Log Message:
Initial import of python-catwalk (#503591)


--- NEW FILE import.log ---
python-catwalk-2_0_2-1_fc10:F-11:python-catwalk-2.0.2-1.fc10.src.rpm:1254325175


--- NEW FILE python-catwalk.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-catwalk
Version:        2.0.2
Release:        1%{?dist}
Summary:        A way to view your models using TurboGears

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/tgtools/wiki/Catwalk
Source0:        http://pypi.python.org/packages/source/C/Catwalk/Catwalk-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose python-sprox python-tgext-admin
Requires:       python-sprox python-tgext-admin

%description
Catwalk is a database manipulation application built on top of TurboGears.
With it you can easily interact with your application data model and manage
your data.


%prep
%setup -q -n Catwalk-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


# Disabled until chameleon.genshi is packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/Catwalk*
%{python_sitelib}/catwalk/


%changelog
* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:55:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 19:46:23 -0000	1.2
@@ -0,0 +1 @@
+Catwalk-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:55:12 -0000	1.1
+++ sources	30 Sep 2009 19:46:23 -0000	1.2
@@ -0,0 +1 @@
+e301fad3aa9c0888f9ff03b9f556bf46  Catwalk-2.0.2.tar.gz



From rdieter at fedoraproject.org  Wed Sep 30 19:48:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 19:48:15 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12
	kdeplasma-addons-4.3.2-ublog_twitter.patch, 
	NONE, 1.1 kdeplasma-addons.spec, 1.59, 1.60
Message-ID: <20090930194815.0812611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24801/F-12

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
- Microblogging Widget Does Not Fetch Tweets (#526524)


kdeplasma-addons-4.3.2-ublog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-ublog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/12 11:44:41	1022729
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        uint maxId = m_lastTweet;
+        ulong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            uint i = id.toUInt();
+            ulong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/07/07 22:51:13	992910
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<uint, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        uint m_lastTweet;
+        ulong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- kdeplasma-addons.spec	1 Sep 2009 21:41:10 -0000	1.59
+++ kdeplasma-addons.spec	30 Sep 2009 19:48:14 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+# https://bugzilla.redhat.com/526524
+Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -72,6 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -159,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+- Microblogging Widget Does Not Fetch Tweets (#526524)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From rdieter at fedoraproject.org  Wed Sep 30 19:48:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 19:48:14 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.2-ublog_twitter.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.59, 1.60
Message-ID: <20090930194814.BC32D11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24801/devel

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
- Microblogging Widget Does Not Fetch Tweets (#526524)


kdeplasma-addons-4.3.2-ublog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-ublog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/12 11:44:41	1022729
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        uint maxId = m_lastTweet;
+        ulong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            uint i = id.toUInt();
+            ulong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/07/07 22:51:13	992910
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<uint, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        uint m_lastTweet;
+        ulong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- kdeplasma-addons.spec	1 Sep 2009 21:41:10 -0000	1.59
+++ kdeplasma-addons.spec	30 Sep 2009 19:48:14 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+# https://bugzilla.redhat.com/526524
+Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -72,6 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -159,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+- Microblogging Widget Does Not Fetch Tweets (#526524)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From rdieter at fedoraproject.org  Wed Sep 30 19:49:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 19:49:36 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11
	kdeplasma-addons-4.3.2-ublog_twitter.patch, 
	NONE, 1.1 kdeplasma-addons.spec, 1.39, 1.40
Message-ID: <20090930194936.782C011C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25153/F-11

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
- Microblogging Widget Does Not Fetch Tweets (#526524)


kdeplasma-addons-4.3.2-ublog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-ublog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/12 11:44:41	1022729
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        uint maxId = m_lastTweet;
+        ulong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            uint i = id.toUInt();
+            ulong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/07/07 22:51:13	992910
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<uint, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        uint m_lastTweet;
+        ulong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- kdeplasma-addons.spec	1 Sep 2009 21:41:10 -0000	1.39
+++ kdeplasma-addons.spec	30 Sep 2009 19:49:36 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+# https://bugzilla.redhat.com/526524
+Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -72,6 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -159,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+- Microblogging Widget Does Not Fetch Tweets (#526524)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From rdieter at fedoraproject.org  Wed Sep 30 19:49:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Sep 2009 19:49:36 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10
	kdeplasma-addons-4.3.2-ublog_twitter.patch, 
	NONE, 1.1 kdeplasma-addons.spec, 1.21, 1.22
Message-ID: <20090930194936.475AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25153/F-10

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
- Microblogging Widget Does Not Fetch Tweets (#526524)


kdeplasma-addons-4.3.2-ublog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-ublog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/12 11:44:41	1022729
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        uint maxId = m_lastTweet;
+        ulong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            uint i = id.toUInt();
+            ulong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<uint, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/07/07 22:51:13	992910
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<uint, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        uint m_lastTweet;
+        ulong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kdeplasma-addons.spec	1 Sep 2009 21:41:09 -0000	1.21
+++ kdeplasma-addons.spec	30 Sep 2009 19:49:36 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+# https://bugzilla.redhat.com/526524
+Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -72,6 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -159,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+- Microblogging Widget Does Not Fetch Tweets (#526524)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 



From jussilehtola at fedoraproject.org  Wed Sep 30 19:51:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 30 Sep 2009 19:51:39 +0000 (UTC)
Subject: rpms/matio/devel matio.spec,1.2,1.3
Message-ID: <20090930195139.66DAD11C0261@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/matio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26062

Modified Files:
	matio.spec 
Log Message:
Conform to Fortran Packaging guidelines. Added missing Requires: pkgconfig on -devel.


Index: matio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matio/devel/matio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- matio.spec	25 Jul 2009 11:50:20 -0000	1.2
+++ matio.spec	30 Sep 2009 19:51:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           matio
 Version:        1.3.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for reading/writing Matlab MAT files
 
 Group:          System Environment/Libraries
@@ -30,6 +30,7 @@ Summary:        Development files for %{
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       zlib-devel
+Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -92,6 +93,9 @@ for f in $(find doxygen/html -type f); d
   touch -r doxygen/Makefile.am ${f}
 done
 
+#Fix location of Fortran module
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}
+mv $RPM_BUILD_ROOT%{_includedir}/matio.mod $RPM_BUILD_ROOT%{_fmoddir}
 
 %check
 pushd test
@@ -116,12 +120,17 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc doxygen/html
-%{_includedir}/*
+%{_includedir}/matio*.h
+%{_fmoddir}/matio.mod
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Wed Sep 30 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.3-5
+- Fix location of Fortran module.
+- Add Requires: pkgconfig on -devel.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chkr at fedoraproject.org  Wed Sep 30 19:52:05 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 19:52:05 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils/F-12 dualscreen-mouse-utils.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930195205.C035511C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26177/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	dualscreen-mouse-utils.spec import.log 
Log Message:
initial import of dualscreen-mouse-utils



--- NEW FILE dualscreen-mouse-utils.spec ---
Summary: Utilities for use with dual head setups using independent screens
Name: dualscreen-mouse-utils
Version: 0.5
Release: 4%{?dist}
License: GPLv2
Group: User Interface/X
URL: http://digamma.cs.unm.edu/trac.dmohr/wiki/DualscreenMouseUtils
Source0: http://dsp.mcbf.net/releases/dualscreen-mouse-utils-%{version}.tar.gz
BuildRequires: libX11-devel

%description
Utilities for use with old-school dual head setups: namely not
twinview / one big desktop, but rather two X screens.

mouse-switchscreen:
  Change the mouse cursor from one screen to the other. Remembers the previous
  mouse position for each screen.

mouse-wrapscreen:
  If you have an xorg.conf where both X screens are "separated" on the X
  coordinates, then the mouse cursor cannot cross. Which is sometimes desired,
  and sometimes not. Using mouse-wrapscreen you can configure them to be
  "uncrossable", and then run it in the background when you do want to be able
  to cross the cursor.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}

%install
install -d %{buildroot}%{_bindir}
install -m 755 mouse-wrapscreen mouse-switchscreen %{buildroot}%{_bindir}/

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root,-)
%doc gpl.txt README
%{_bindir}/*

%changelog
* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-4
- Correct email address

* Mon Sep 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-3
- Fix spelling mistake

* Sun Sep 27 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-2
- Deleting %%buildroot is not necessary in %%install anymore (F10 and greater)
- Remove definition of %%buildroot (not needed for F10 and greater)
- Use rpm macro for optflags now

* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-1
- Initial package



--- NEW FILE import.log ---
dualscreen-mouse-utils-0_5-4_fc13:F-12:dualscreen-mouse-utils-0.5-4.fc13.src.rpm:1254340274


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 19:52:04 -0000	1.2
@@ -0,0 +1 @@
+dualscreen-mouse-utils-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:04 -0000	1.1
+++ sources	30 Sep 2009 19:52:04 -0000	1.2
@@ -0,0 +1 @@
+b68a43c9041cbb8dc373553ccef93070  dualscreen-mouse-utils-0.5.tar.gz



From lmacken at fedoraproject.org  Wed Sep 30 19:53:03 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 19:53:03 +0000 (UTC)
Subject: rpms/python-catwalk/F-12 import.log, NONE, 1.1 python-catwalk.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930195303.E041111C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-catwalk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26977/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-catwalk.spec 
Log Message:
Initial import of python-catwalk (#503591)


--- NEW FILE import.log ---
python-catwalk-2_0_2-1_fc10:F-12:python-catwalk-2.0.2-1.fc10.src.rpm:1254325496


--- NEW FILE python-catwalk.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-catwalk
Version:        2.0.2
Release:        1%{?dist}
Summary:        A way to view your models using TurboGears

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/tgtools/wiki/Catwalk
Source0:        http://pypi.python.org/packages/source/C/Catwalk/Catwalk-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose python-sprox python-tgext-admin
Requires:       python-sprox python-tgext-admin

%description
Catwalk is a database manipulation application built on top of TurboGears.
With it you can easily interact with your application data model and manage
your data.


%prep
%setup -q -n Catwalk-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


# Disabled until chameleon.genshi is packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/Catwalk*
%{python_sitelib}/catwalk/


%changelog
* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:55:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 19:53:03 -0000	1.2
@@ -0,0 +1 @@
+Catwalk-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:55:12 -0000	1.1
+++ sources	30 Sep 2009 19:53:03 -0000	1.2
@@ -0,0 +1 @@
+e301fad3aa9c0888f9ff03b9f556bf46  Catwalk-2.0.2.tar.gz



From lmacken at fedoraproject.org  Wed Sep 30 19:54:36 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 19:54:36 +0000 (UTC)
Subject: rpms/python-catwalk/EL-5 import.log, NONE, 1.1 python-catwalk.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930195436.BBD7B11C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-catwalk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27397/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-catwalk.spec 
Log Message:
Initial import of python-catwalk (#503591)


--- NEW FILE import.log ---
python-catwalk-2_0_2-1_fc10:EL-5:python-catwalk-2.0.2-1.fc10.src.rpm:1254325661


--- NEW FILE python-catwalk.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-catwalk
Version:        2.0.2
Release:        1%{?dist}
Summary:        A way to view your models using TurboGears

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/tgtools/wiki/Catwalk
Source0:        http://pypi.python.org/packages/source/C/Catwalk/Catwalk-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose python-sprox python-tgext-admin
Requires:       python-sprox python-tgext-admin

%description
Catwalk is a database manipulation application built on top of TurboGears.
With it you can easily interact with your application data model and manage
your data.


%prep
%setup -q -n Catwalk-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


# Disabled until chameleon.genshi is packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/Catwalk*
%{python_sitelib}/catwalk/


%changelog
* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:55:12 -0000	1.1
+++ .cvsignore	30 Sep 2009 19:54:36 -0000	1.2
@@ -0,0 +1 @@
+Catwalk-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-catwalk/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:55:12 -0000	1.1
+++ sources	30 Sep 2009 19:54:36 -0000	1.2
@@ -0,0 +1 @@
+e301fad3aa9c0888f9ff03b9f556bf46  Catwalk-2.0.2.tar.gz



From nsantos at fedoraproject.org  Wed Sep 30 19:59:04 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 19:59:04 +0000 (UTC)
Subject: rpms/qpidc/F-11 qpidc.spec,1.86,1.87 sources,1.44,1.45
Message-ID: <20090930195904.5192011C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29018

Modified Files:
	qpidc.spec sources 
Log Message:
Rebased to svn rev 819819 for F12 beta


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- qpidc.spec	21 Sep 2009 20:27:33 -0000	1.86
+++ qpidc.spec	30 Sep 2009 19:59:04 -0000	1.87
@@ -7,23 +7,26 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
+%define qpid_svnrev 819819
+%define rhm_svnrev 3641
+
 Name:           qpidc
-Version:        0.5.817349
+Version:        0.5.%{qpid_svnrev}
 Release:        1%{?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
-#Patch1:		qpidc_f12_new_cpg.diff
-#Patch2:		qpidc_798397.diff
-Patch1:		qpidc_798518.diff
+Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
+Source2:	qpidd.pp
+Patch0:		so_number.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
+#BuildRequires: libuuid-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
@@ -43,6 +46,13 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
 
+%ifarch i686 x86_64
+#RHM
+BuildRequires: db4-devel
+BuildRequires: libaio-devel
+#/RHM
+%endif
+
 Requires: boost
 
 Requires(post):/sbin/chkconfig
@@ -61,6 +71,7 @@ Group: Development/System
 Requires: %name = %version-%release
 Requires: boost-devel
 Requires: e2fsprogs-devel
+#Requires: libuuid-devel
 Requires: python
 
 %description devel
@@ -204,6 +215,23 @@ Requires: qpidc = %version-%release
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
+%ifarch i686 x86_64
+#RHM
+%package -n rhm-cpp-server-store
+Summary: Red Hat persistence extension to the Qpid messaging system
+Group: System Environment/Libraries
+Requires: qpidd = 0.5.%{qpid_svnrev}
+Requires: db4
+Requires: libaio
+Obsoletes: rhm
+
+%description -n rhm-cpp-server-store
+Red Hat persistence extension to the Qpid AMQP broker: persistent message
+storage using either a libaio-based asynchronous journal, or synchronously
+with Berkeley DB.
+#/RHM
+%endif
+
 %pre -n qpidd
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
@@ -212,23 +240,21 @@ getent passwd qpidd >/dev/null || \
 exit 0
 
 %prep
-%setup -q
-%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%setup
+%setup -T -D -b 1
+%patch0
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
 install -d selinux
-install %{SOURCE1} selinux
+install %{SOURCE2} selinux
 
 %build
+pushd cpp
+./bootstrap
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
 ECHO=echo make #%{?_smp_mflags}
-# Remove this generated perl file, we don't need it and it upsets rpmlint.
-# This is generating an error as of 21 Nov 08 because the file doesn't exist.
-# rm docs/api/html/installdox
 
 # Make perftest utilities
 pushd src/tests
@@ -236,21 +262,38 @@ for ptest in %{perftests}; do
   ECHO=echo make $ptest
 done
 popd
+popd
+
+%ifarch i686 x86_64
+#RHM
+pushd ../rhm-0.5.%{rhm_svnrev}
+export CXXFLAGS="%{optflags} -DNDEBUG" 
+./bootstrap
+%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{name}-%{version}
+make dist
+make #%{?_smp_mflags}
+popd
+#/RHM
+%endif
 
 %install
 rm -rf %{buildroot}
 mkdir -p -m0755 %{buildroot}/%_bindir
+pushd %{_builddir}/%{name}-%{version}/cpp
 make install DESTDIR=%{buildroot}
 install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
 install -d -m0755 %{buildroot}%{_libdir}/qpidd
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
-pushd %{_builddir}/%{name}-%{version}/src/tests/
+pushd src/tests/
 for ptest in %{perftests}; do
   libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
 done
 popd
+pushd docs/api
+make html
+popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
 rm -f %{buildroot}%_libdir/*.la
@@ -258,39 +301,62 @@ rm -f %{buildroot}%_libdir/librdmawrap.s
 rm -f %{buildroot}%_libdir/libsslcommon.so
 rm -f %{buildroot}%_libdir/qpid/client/*.la
 rm -f %{buildroot}%_libdir/qpid/daemon/*.la
-# remove examples, are being packages separately in the rhm-docs package
-#rm -fr %{buildroot}/usr/share/qpidc/examples
 
 # disable auth by default
 echo "auth=no" >> %{buildroot}/etc/qpidd.conf
 
 install -d %{buildroot}%{_datadir}/selinux/packages
-install -m 644 selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
-
-install -pm 644 bindings/qmf/ruby/qmf.rb $RPM_BUILD_ROOT%{ruby_sitelib}
-install -pm 755 bindings/qmf/ruby/.libs/qmfengine.so $RPM_BUILD_ROOT%{ruby_sitearch}
+install -m 644 %{_builddir}/%{name}-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
+install -pm 644 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
+install -pm 755 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
 
 rm -f %{buildroot}%_libdir/_*
 rm -fr %{buildroot}%_libdir/qpid/tests
 rm -fr %{buildroot}%_libexecdir/qpid/tests
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
+popd
+
+%ifarch i686 x86_64
+#RHM
+pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+make install DESTDIR=%{buildroot}
+install -d -m0775 %{buildroot}%{_localstatedir}/rhm
+install -d -m0755 %{buildroot}%{_libdir}/qpid/daemon
+rm -f %{buildroot}%_libdir/qpid/daemon/*.a
+rm -f %{buildroot}%_libdir/qpid/daemon/*.la
+rm -f %{buildroot}%_libdir/*.a
+rm -f %{buildroot}%_libdir/*.la
+rm %{buildroot}%_sysconfdir/rhmd.conf
+popd
+#/RHM
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 %check
+#pushd %{_builddir}/%{name}-%{version}/cpp
 # LANG=C needs to be in the environment to deal with a libtool issue
 # temporarily disabling make check due to libtool issues
 # needs to be re-enabled asap
-LANG=C ECHO=echo make check
+#LANG=C ECHO=echo make check
+#popd
+
+%ifarch i686 x86_64
+#RHM
+#pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+#make check
+#popd
+#/RHM
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE NOTICE README INSTALL RELEASE_NOTES DESIGN
-%_libdir/libqpidcommon.so.2
-%_libdir/libqpidcommon.so.2.0.0
-%_libdir/libqpidclient.so.2
-%_libdir/libqpidclient.so.2.0.0
+%doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
+%_libdir/libqpidcommon.so.3
+%_libdir/libqpidcommon.so.3.0.0
+%_libdir/libqpidclient.so.3
+%_libdir/libqpidclient.so.3.0.0
 %dir %_libdir/qpid
 %dir %_libdir/qpid/client
 %dir %_sysconfdir/qpid
@@ -317,8 +383,8 @@ LANG=C ECHO=echo make check
 %files -n qpidd
 %defattr(-,root,root,-)
 %_datadir/selinux/packages/qpidd.pp
-%_libdir/libqpidbroker.so.2
-%_libdir/libqpidbroker.so.2.0.0
+%_libdir/libqpidbroker.so.3
+%_libdir/libqpidbroker.so.3.0.0
 %_libdir/qpid/daemon/replicating_listener.so
 %_libdir/qpid/daemon/replication_exchange.so
 %_libdir/qpid/daemon/watchdog.so
@@ -341,17 +407,17 @@ LANG=C ECHO=echo make check
 
 %files -n qmf
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so.2
-%_libdir/libqmfcommon.so.2.0.0
-%_libdir/libqmfagent.so.2
-%_libdir/libqmfagent.so.2.0.0
-%_libdir/libqmfconsole.so.2
-%_libdir/libqmfconsole.so.2.0.0
+%_libdir/libqmf.so.1
+%_libdir/libqmf.so.1.0.0
+%_libdir/libqmfengine.so.1
+%_libdir/libqmfengine.so.1.0.0
+%_libdir/libqmfconsole.so.3
+%_libdir/libqmfconsole.so.3.0.0
 
 %files -n qmf-devel
 %defattr(-,root,root,-)
-%_libdir/libqmfcommon.so
-%_libdir/libqmfagent.so
+%_libdir/libqmf.so
+%_libdir/libqmfengine.so
 %_libdir/libqmfconsole.so
 %_bindir/qmf-gen
 %{python_sitelib}/qmfgen
@@ -378,8 +444,8 @@ LANG=C ECHO=echo make check
 
 %files ssl
 %defattr(-,root,root,-)
-%_libdir/libsslcommon.so.2
-%_libdir/libsslcommon.so.2.0.0
+%_libdir/libsslcommon.so.3
+%_libdir/libsslcommon.so.3.0.0
 %_libdir/qpid/client/sslconnector.so
 
 %files -n qpidd-ssl
@@ -405,7 +471,15 @@ LANG=C ECHO=echo make check
 
 %files devel-docs
 %defattr(-,root,root,-)
-%doc docs/api/html
+%doc cpp/docs/api/html
+
+%ifarch i686 x86_64
+%files -n rhm-cpp-server-store
+%defattr(-,root,root,-)
+%doc ../rhm-0.5.%{rhm_svnrev}/README 
+%{_libdir}/qpid/daemon/msgstore.so*
+%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -445,17 +519,23 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Mon Sep 21 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349-1
+* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
+- Rebased to svn rev 819819 for F12 beta
+
+* Thu Sep 24 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+- rhm-cpp-server-store obsoletes rhm top-level package
+
+* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349
 - Rebased to svn rev 817349
 
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-2
+* Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-3
 - Update BuildRequires and Requires to use latest stable versions of
   corosync and clusterlib.
-- Sync spec file changelog from rawhide.
 - Unbreak perftests define (and fix vim spec syntax coloring).
-- Apply qpidc_f12_new_cpg.diff from rawhide.
-- Apply svn commits r798397 and r798518 from svn trunk to unbreak
-  testsuite.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.790661-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Jul  2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.790661-1
 - Rebased to svn rev 790661; .so lib numbers bumped


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	21 Sep 2009 20:27:33 -0000	1.44
+++ sources	30 Sep 2009 19:59:04 -0000	1.45
@@ -1 +1,2 @@
-3d8e101731c2f8a8fba5907f9cdb9282  qpidc-0.5.817349.tar.gz
+3f1f75be166b0d752a9132622d5742a8  qpidc-0.5.819819.tar.gz
+5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz



From nsantos at fedoraproject.org  Wed Sep 30 19:59:30 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 19:59:30 +0000 (UTC)
Subject: rpms/qpidc/F-11 so_number.patch,NONE,1.1
Message-ID: <20090930195930.763ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29630

Added Files:
	so_number.patch 
Log Message:
Rebased to svn rev 819819 for F12 beta

so_number.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE so_number.patch ---
--- cpp/configure.ac	2009-09-02 10:32:57.000000000 -0400
+++ cpp/configure.ac	2009-09-29 10:27:07.393678846 -0400
@@ -112,7 +112,7 @@
 LIBS=$gl_saved_libs
 
 # Set the argument to be used in "libtool -version-info ARG".
-QPID_CURRENT=2
+QPID_CURRENT=3
 QPID_REVISION=0
 QPID_AGE=0
 LIBTOOL_VERSION_INFO_ARG=$QPID_CURRENT:$QPID_REVISION:$QPID_AGE



From pkgdb at fedoraproject.org  Wed Sep 30 20:03:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 20:03:46 +0000
Subject: [pkgdb] s390utils F-12 cloned from devel
Message-ID: <20090930200346.DC11E10F894@bastion2.fedora.phx.redhat.com>

toshio cloned s390utils F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/s390utils



From mso at fedoraproject.org  Wed Sep 30 20:03:57 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 30 Sep 2009 20:03:57 +0000 (UTC)
Subject: rpms/constantine-backgrounds/F-12 .cvsignore, 1.4,
	1.5 constantine-backgrounds.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090930200357.215BA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30403/F-12

Modified Files:
	.cvsignore constantine-backgrounds.spec sources 
Log Message:


Update default to beta artwork, update 4flowers to latest version.

Split -single subpackage as we now ship dual screen wallpapers as well and
KDE does not need/want them.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Aug 2009 16:38:57 -0000	1.4
+++ .cvsignore	30 Sep 2009 20:03:56 -0000	1.5
@@ -1 +1 @@
-constantine-backgrounds-11.90.2.1.tar.lzma
+constantine-backgrounds-12.0.0.tar.lzma


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/F-12/constantine-backgrounds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- constantine-backgrounds.spec	22 Aug 2009 16:38:57 -0000	1.6
+++ constantine-backgrounds.spec	30 Sep 2009 20:03:56 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           constantine-backgrounds
-Version:        11.90.2.1
+Version:        12.0.0
 Release:        1%{?dist}
 Summary:        Constantine desktop backgrounds
 
@@ -14,6 +14,7 @@ BuildArch:      noarch
 BuildRequires:  inkscape
 # for %%_kde4_* macros
 BuildRequires:	kde-filesystem
+Requires:       %{name}-single = %{version}-%{release}
 
 %if 0%{?fedora} == 12
 Provides: system-backgrounds
@@ -22,6 +23,14 @@ Provides: system-backgrounds
 %description
 This package contains desktop backgrounds for the Constantine theme.
 
+%package        single
+Summary:        Single screen images for Constantine Backgrounds
+Group:          Applications/Multimedia
+Conflicts:      %{name} < 12.0.0
+
+%description    single
+This package contains Single screen images for Constantine Backgrounds
+
 %package        extras
 Summary:        Extra Constantine Backgrounds
 Group:          Applications/Multimedia
@@ -37,7 +46,7 @@ Obsoletes:      constantine-kde-theme <=
 Provides:       system-backgrounds-kde
 %endif
 
-Requires:       %{name} = %{version}-%{release} 
+Requires:       %{name}-single = %{version}-%{release} 
 Requires:       kde-filesystem
 
 %description    kde 
@@ -72,10 +81,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc
+%{_datadir}/backgrounds/constantine/default/standard.dual
+%{_datadir}/backgrounds/constantine/default/wide.dual
+%{_datadir}/backgrounds/constantine/default/normalish.dual
+%{_datadir}/backgrounds/constantine/default/constantine.xml
+%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml
+
+%files single
+%defattr(-,root,root,-)
 %doc COPYING Credits
 %dir %{_datadir}/backgrounds/constantine
-%{_datadir}/backgrounds/constantine/default
-%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml
+%dir %{_datadir}/backgrounds/constantine/default
+%{_datadir}/backgrounds/constantine/default/standard
+%{_datadir}/backgrounds/constantine/default/wide
+%{_datadir}/backgrounds/constantine/default/normalish
 
 %files extras
 %defattr(-,root,root,-)
@@ -93,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Martin Sourada <mso at fedoraproject.org> - 12.0.0-1
+- Update default and 4flowers, adds dual screen versions for default
+  => split single screen versions into -single subpackage
+
 * Sat Aug 22 2009 Martin Sourada <mso at feodraproject.org> - 11.90.2.1-1
 - Extras slideshow bugfix respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Aug 2009 16:38:57 -0000	1.4
+++ sources	30 Sep 2009 20:03:56 -0000	1.5
@@ -1 +1 @@
-4388ee40f65d59114bdf2af14093166f  constantine-backgrounds-11.90.2.1.tar.lzma
+fc795aeeb4e164fe106ac965c261ad97  constantine-backgrounds-12.0.0.tar.lzma



From mso at fedoraproject.org  Wed Sep 30 20:03:57 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 30 Sep 2009 20:03:57 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel .cvsignore, 1.4,
	1.5 constantine-backgrounds.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090930200357.4FD9F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30403/devel

Modified Files:
	.cvsignore constantine-backgrounds.spec sources 
Log Message:


Update default to beta artwork, update 4flowers to latest version.

Split -single subpackage as we now ship dual screen wallpapers as well and
KDE does not need/want them.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Aug 2009 16:38:57 -0000	1.4
+++ .cvsignore	30 Sep 2009 20:03:57 -0000	1.5
@@ -1 +1 @@
-constantine-backgrounds-11.90.2.1.tar.lzma
+constantine-backgrounds-12.0.0.tar.lzma


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- constantine-backgrounds.spec	22 Aug 2009 16:38:57 -0000	1.6
+++ constantine-backgrounds.spec	30 Sep 2009 20:03:57 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           constantine-backgrounds
-Version:        11.90.2.1
+Version:        12.0.0
 Release:        1%{?dist}
 Summary:        Constantine desktop backgrounds
 
@@ -14,6 +14,7 @@ BuildArch:      noarch
 BuildRequires:  inkscape
 # for %%_kde4_* macros
 BuildRequires:	kde-filesystem
+Requires:       %{name}-single = %{version}-%{release}
 
 %if 0%{?fedora} == 12
 Provides: system-backgrounds
@@ -22,6 +23,14 @@ Provides: system-backgrounds
 %description
 This package contains desktop backgrounds for the Constantine theme.
 
+%package        single
+Summary:        Single screen images for Constantine Backgrounds
+Group:          Applications/Multimedia
+Conflicts:      %{name} < 12.0.0
+
+%description    single
+This package contains Single screen images for Constantine Backgrounds
+
 %package        extras
 Summary:        Extra Constantine Backgrounds
 Group:          Applications/Multimedia
@@ -37,7 +46,7 @@ Obsoletes:      constantine-kde-theme <=
 Provides:       system-backgrounds-kde
 %endif
 
-Requires:       %{name} = %{version}-%{release} 
+Requires:       %{name}-single = %{version}-%{release} 
 Requires:       kde-filesystem
 
 %description    kde 
@@ -72,10 +81,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc
+%{_datadir}/backgrounds/constantine/default/standard.dual
+%{_datadir}/backgrounds/constantine/default/wide.dual
+%{_datadir}/backgrounds/constantine/default/normalish.dual
+%{_datadir}/backgrounds/constantine/default/constantine.xml
+%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml
+
+%files single
+%defattr(-,root,root,-)
 %doc COPYING Credits
 %dir %{_datadir}/backgrounds/constantine
-%{_datadir}/backgrounds/constantine/default
-%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml
+%dir %{_datadir}/backgrounds/constantine/default
+%{_datadir}/backgrounds/constantine/default/standard
+%{_datadir}/backgrounds/constantine/default/wide
+%{_datadir}/backgrounds/constantine/default/normalish
 
 %files extras
 %defattr(-,root,root,-)
@@ -93,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Martin Sourada <mso at fedoraproject.org> - 12.0.0-1
+- Update default and 4flowers, adds dual screen versions for default
+  => split single screen versions into -single subpackage
+
 * Sat Aug 22 2009 Martin Sourada <mso at feodraproject.org> - 11.90.2.1-1
 - Extras slideshow bugfix respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Aug 2009 16:38:57 -0000	1.4
+++ sources	30 Sep 2009 20:03:57 -0000	1.5
@@ -1 +1 @@
-4388ee40f65d59114bdf2af14093166f  constantine-backgrounds-11.90.2.1.tar.lzma
+fc795aeeb4e164fe106ac965c261ad97  constantine-backgrounds-12.0.0.tar.lzma



From sharkcz at fedoraproject.org  Wed Sep 30 20:09:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 30 Sep 2009 20:09:33 +0000 (UTC)
Subject: rpms/s390utils/devel
	0023-change-default-load-address-for-ramdisk.patch, NONE,
	1.1 0024-s390-tools-1.8.1-cpuplugd-limits.patch, NONE,
	1.1 0025-s390-tools-1.8.1-misc-bugfixes.patch, NONE,
	1.1 s390utils.spec, 1.7, 1.8 zfcpconf.sh, 1.1, 1.2
Message-ID: <20090930200933.B7A2111C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32566

Modified Files:
	s390utils.spec zfcpconf.sh 
Added Files:
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
- changed ramdisk load address (#526339)
- updated zfcpconf.sh script to new sysfs interface (#526324)
- added 1.8.1 fixes from IBM (#525495)


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0023-change-default-load-address-for-ramdisk.patch ---
>From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:19:23 +0200
Subject: [PATCH 23/25] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x100000 to 0x200000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..0f04072 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -21,7 +21,7 @@
 #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
-#define DEFAULT_IMAGE_ADDRESS		0x10000LL
+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
 #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
-- 
1.6.3.3


0024-s390-tools-1.8.1-cpuplugd-limits.patch:
 config.c |   15 +++++++++++++--
 daemon.c |   11 -----------
 mem.c    |    7 +++----
 3 files changed, 16 insertions(+), 17 deletions(-)

--- NEW FILE 0024-s390-tools-1.8.1-cpuplugd-limits.patch ---
>From 0b02dbdbd248ca51583e9dce3bd57025b965534d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:22:15 +0200
Subject: [PATCH 24/25] s390-tools-1.8.1-cpuplugd-limits

Description: cpuplugd: fix cmm_pages allocation outside min and max range
Symptom:     cpuplugd might instruct CMM to operated outside the predefined limits
Problem:     This problem is basically caused by a missing new line separator at
	     the interface between the daemon and the proc file.
Solution:    Add newline to the end of each line when writing to /proc/sys/vm/cmm_pages
Problem-ID:  55472
---
 cpuplugd/config.c |   15 +++++++++++++--
 cpuplugd/daemon.c |   11 -----------
 cpuplugd/mem.c    |    6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cpuplugd/config.c b/cpuplugd/config.c
index c013a65..bd3cb43 100644
--- a/cpuplugd/config.c
+++ b/cpuplugd/config.c
@@ -494,7 +494,7 @@ void check_config(struct config *cfg)
 	if (memory == 1) {
 		/*
 		 * check that the initial value of cmm_pages is not below
-		 * cmm_min
+		 * cmm_min or above cmm_max
 		 */
 		cmm_pagesize_start = get_cmmpages_size();
 		if (cmm_pagesize_start < cfg->cmm_min) {
@@ -506,7 +506,18 @@ void check_config(struct config *cfg)
 				syslog(LOG_INFO, "cmm_pages is below minimum "
 						"and will be increased\n");
 			}
-			memunplug(cfg->cmm_min);
+			set_cmm_pages(cfg->cmm_min);
+		}
+		if (cmm_pagesize_start > cfg->cmm_max) {
+			if (debug && foreground == 1) {
+				printf("cmm_pages is above the maximum and will "
+						"be decreased.\n");
+			}
+			if (debug && foreground == 0) {
+				syslog(LOG_INFO, "cmm_pages is above the maximum "
+						"and will be decreased\n");
+			}
+			set_cmm_pages(cfg->cmm_max);
 		}
 	}
 }
diff --git a/cpuplugd/daemon.c b/cpuplugd/daemon.c
index d0769f3..e1ef623 100644
--- a/cpuplugd/daemon.c
+++ b/cpuplugd/daemon.c
@@ -260,17 +260,6 @@ void check_max(struct config *cfg)
 			cpuid++;
 		}
 	}
-	if (memory && get_cmmpages_size() > cfg->cmm_max) {
-		if (debug && foreground == 1) {
-			printf("cmm_pages is above the maximum and will "
-					"be decreased.\n");
-		}
-		if (debug && foreground == 0) {
-			syslog(LOG_INFO, "cmm_pages is above the maximum "
-					"and will be decreased\n");
-		}
-		set_cmm_pages(cfg->cmm_max);
-	}
 }
 
 /* check if we are running in an LPAR environment.
diff --git a/cpuplugd/mem.c b/cpuplugd/mem.c
index 2f3d219..6200904 100644
--- a/cpuplugd/mem.c
+++ b/cpuplugd/mem.c
@@ -138,7 +138,7 @@ int memunplug(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", new_size);
+	fprintf(filp, "%d\n", new_size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", new_size);
@@ -173,7 +173,7 @@ int memplug(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", new_size);
+	fprintf(filp, "%d\n", new_size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", new_size);
@@ -200,7 +200,7 @@ int set_cmm_pages(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", size);
+	fprintf(filp, "%d\n", size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", size);
-- 
1.6.3.3


0025-s390-tools-1.8.1-misc-bugfixes.patch:
 ipl_tools/system.c |   13 ++-
 man/af_iucv.7      |  175 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 166 insertions(+), 22 deletions(-)

--- NEW FILE 0025-s390-tools-1.8.1-misc-bugfixes.patch ---
>From 60a3bf1df6d7039f75d889f15d7839f8482c2889 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:24:52 +0200
Subject: [PATCH 25/25] s390-tools-1.8.1-misc-bugfixes

Miscellaneous minor bufgixes for s390-tools RHEL5.5:
* lsshut:  Fix printing of vmcmd shutdown action: Also print CP commands
           that have more than one word.
* af_iucv: Doc update for connection-oriented datagram sockets.
---
 ipl_tools/system.c |   13 +++--
 man/af_iucv.7      |  174 +++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 166 insertions(+), 21 deletions(-)

diff --git a/ipl_tools/system.c b/ipl_tools/system.c
index 8294db0..fd5b76b 100644
--- a/ipl_tools/system.c
+++ b/ipl_tools/system.c
@@ -74,7 +74,7 @@ out:
 char *substring(size_t start, size_t stop, const char *src, char *dst,
 		size_t size)
 {
-	int count;
+	unsigned int count;
 
 	count = stop - start;
 	if (count >= --size)
@@ -102,7 +102,7 @@ int check_for_root(void)
 int ishex(char *cp)
 {
 
-	int i;
+	unsigned int i;
 	char c;
 
 	for (i = 0; i <= strlen(cp); i++) {
@@ -168,13 +168,13 @@ int strrd(char *string, char *file)
 
 	strncpy(path, file, sizeof(path));
 	if (access(path, R_OK) == 0) {
-		filp = fopen(path, "r");
+		filp = fopen(path, "rb");
 		if (!filp) {
 			fprintf(stderr,	"%s: Can not open %s: ", name, file);
 			fprintf(stderr, "%s\n", strerror(errno));
 			exit(1);
 		}
-		rc = fscanf(filp, "%s", string);
+		rc = fread(string, 4096, 1, filp);
 		fclose(filp);
 		/*
 		 *  special handling is required for
@@ -192,8 +192,11 @@ int strrd(char *string, char *file)
 					file);
 			fprintf(stderr, "%s\n", strerror(errno));
 			return -1;
-		} else
+		} else {
+			if (string[strlen(string) - 1] == '\n')
+				string[strlen(string) - 1] = 0;
 			return 0;
+		}
 	} else {
 		fprintf(stderr,	"%s: Can not open %s: ", name, file);
 		fprintf(stderr, "%s\n", strerror(errno));
diff --git a/man/af_iucv.7 b/man/af_iucv.7
index cdd2691..9d56640 100644
--- a/man/af_iucv.7
+++ b/man/af_iucv.7
@@ -4,7 +4,7 @@
 .\" Copyright IBM Corp. 2008, 2009.
 .\" Author(s): Hendrik Brueckner <brueckner at linux.vnet.ibm.com>
 .\" ----------------------------------------------------------------------
-.TH AF_IUCV 7 "March 2009"  "s390-tools" "Linux Programmer's Manual"
+.TH AF_IUCV 7 "September 2009"  "s390-tools" "Linux Programmer's Manual"
 .SH NAME
 iucv, AF_IUCV \- Sockets for z/VM IUCV communication
 .
@@ -13,15 +13,17 @@ iucv, AF_IUCV \- Sockets for z/VM IUCV communication
 .SH SYNOPSIS
 .B #include <sys/socket.h>
 
-.IB iucv_socket " = socket(AF_IUCV, SOCK_STREAM, 0);"
+.IB iucv_stream_socket " = socket(AF_IUCV, SOCK_STREAM, 0);"
+.br
+.IB iucv_packet_socket " = socket(AF_IUCV, SOCK_SEQPACKET, 0);"
 .
 .
 .
 .SH DESCRIPTION
 The Inter-User Communication Vehicle (IUCV) is a z/VM communication facility
 that enables a program running in one z/VM guest virtual machine to communicate
-with another z/VM guest virtual machine, or with a control program, or even
-with itself.
+with another z/VM guest virtual machine, or with the control program (CP), or
+even with itself.
 
 The AF_IUCV address family provides communication and addressing in the IUCV
 domain.  In the IUCV domain, address spaces or virtual machines can use the
@@ -32,7 +34,11 @@ AF_IUCV connects socket applications running on different Linux guest operating
 systems, or it connects a Linux application to another socket application
 running in another z/VM guest operating system (like z/VM CMS).
 
-The AF_IUCV address family supports stream sockets only.
+The AF_IUCV address family supports stream-oriented sockets
+(\f(CWSOCK_STREAM\fP) and connection-oriented datagram sockets
+(\f(CWSOCK_SEQPACKET\fP). Stream-oriented sockets fragment data over several
+native IUCV messages, whereas sockets of type SOCK_SEQPACKET map a particular
+socket write or read operation to a single native IUCV message.
 
 .SS Features
 The AF_IUCV address family provides:
@@ -78,28 +84,106 @@ are reserved for future use. The
 .B siucv_port
 and
 .B siucv_addr
-fields must be zero. The 
+fields must be zero. The
 .B siucv_nodeid
 field must be set to exactly eight blank characters.
 .
 .TP
 .B siucv_userid
 is set to the z/VM user ID of the Linux guest virtual machine running the
-application which owns the address. The field must be eight characters long,
+application that owns the address. The field must be eight characters long,
 padded with blanks on the right.
 
 For
 .BR bind "(2), " siucv_userid
-must contain blanks only, because AF_IUCV sets the correct z/VM user ID.
+must contain blanks only to allow AF_IUCV to set the z/VM user ID of the Linux
+guest operating system.
 .
 .TP
 .B siucv_name
-is set to the application name by which the socket is known. Servers advertises
+is set to the application name by which the socket is known. Servers advertise
 application names and clients use these application names to connect to servers.
 This field must be eight characters long, padded with blanks on the right.
 .
 .
 .
+.SH "SOCKET OPTIONS"
+Socket options can be set with
+.BR setsockopt (2)
+and read with
+.BR getsockopt (2)
+by specifying \f(CWSOL_IUCV\fP as the socket level.
+
+.TP
+.B SO_IPRMDATA_MSG
+Enables the application to send up to seven bytes of socket data in the
+parameter list of an IUCV message. Use this option to increase performance
+when transferring small amounts of data.
+
+To send data in the parameter list, specify a non-zero integer value.
+
+.RS
+.TP
+.B Note:
+Use this option with care, older AF_IUCV versions do not support receiving
+socket data in the parameter list and shut down the socket on which
+a parameter list message has been received.
+.RE
+.
+.TP
+.B SO_MSGLIMIT
+Modifies the message limit for new IUCV communication paths. The message
+limit specifies the maximum number of outstanding messages that are allowed
+for established connections. This setting can be lowered by z/VM when an IUCV
+connection is established.
+
+The message limit is an integer value in range 1 to 65535.
+The default value is 65535.
+
+The message limit must be set before
+.BR connect "(2) or " listen (2)
+is called for sockets.
+.br
+For sockets that are already connected or listening for connections,
+the message limit cannot be changed.
+.br
+New sockets created by
+.BR accept (2)
+inherit the message limit that has been set for the listening socket.
+
+.BR getsockopt (2)
+returns the default message limit or the limit that has been set.
+For connected sockets, the current message limit is returned. The current
+message limit is assigned by z/VM for each connection and it depends
+on the IUCV MSGLIMIT statement specified for the z/VM guest virtual machine.
+The current message limit is the lower value of the socket option and the
+value specified for the IUCV MSGLIMIT statement.
+
+See the SECURITY section below for setting IUCV MSGLIMIT authorizations.
+.
+.
+.
+.SH "ANCILLARY DATA"
+Ancillary data is sent and received using the
+.BR sendmsg (2)
+and
+.BR recvmsg (2)\fR.\fP
+To send ancillary data, set the \fBcmsg_level\fP field of struct \fBcmsghdr\fP
+to \f(CWSOL_IUCV\fP and the \fBcmsg_type\fP field to the type.
+.br
+For more information see
+.BR cmsg (3).
+
+.TP
+.B SCM_IUCV_TRGCLS
+Send or receive IUCV target class information. The IUCV target class can be used
+to classify and identify an IUCV message at IUCV protocol level. If the target
+class is not specified as ancillary data, it is set to zero.
+
+The target class is a number of type \fBuint32_t\fP.
+.
+.
+.
 .
 .SH SECURITY
 This section provides an overview of the required IUCV statements for your z/VM
@@ -129,20 +213,20 @@ any other z/VM guest virtual machine.
 .TP
 .B IUCV \fIuser_ID\fP
 allows this z/VM guest virtual machine to establish a communication path to the
-z/VM guest virtual machine with the z/VM user ID \fIuser_ID\fP. 
+z/VM guest virtual machine with the z/VM user ID \fIuser_ID\fP.
 .PP
 You can specify multiple IUCV statements. To any of these IUCV statements you
 can append the
 .B MSGLIMIT \fIlimit\fP
 parameter.
 \fIlimit\fP specifies the maximum number of outstanding messages that are
-allowed for each connection authorized by this entry.
+allowed for each connection authorized by this statement.
 If no value is specified for \fBMSGLIMIT\fP, AF_IUCV requests 65535,
 which is the maximum supported by IUCV.
 .
 .
 .SS "Setting a connection limit"
-Use the \fBOPTION\fP statement to limit the number of concurrent connections. 
+Use the \fBOPTION\fP statement to limit the number of concurrent connections.
 .TP
 .B OPTION MAXCONN \fImaxno\fP
 \fImaxno\fP specifies the maximum number of IUCV connections allowed for this
@@ -151,7 +235,7 @@ virtual machine. The default is 64. The maximum is 65535.
 .
 .SS "Example"
 These sample statements allow any z/VM guest virtual machine to connect to your
-z/VM guest virtual machine with a maximum of 10000 outstanding messages for each
+z/VM guest virtual machine with a maximum of 10\^000 outstanding messages for each
 incoming connection. Your z/VM guest virtual machine is permitted to connect to
 all other z/VM guest virtual machines. The total number of connections for your
 z/VM guest virtual machine cannot exceed 100.
@@ -200,6 +284,14 @@ This error can be temporary and the application may try again after some time.
 If the error occurs repeatedly, try to increase the maximum number of
 connections (for one or both z/VM guest virtual machines).
 See the SECURITY section about the required authorization statement.
+
+.B sendmsg (2)
+called but the maximum number of outstanding IUCV messages for the socket
+connection is reached; i.e. there are data available that has not yet been
+received by the communication partner.
+.br
+If necessary, change the IUCV message limit as explained in section
+"IUCV AUTHORIZATIONS".
 .
 .TP
 .B EACCES
@@ -217,10 +309,22 @@ called but the AF_IUCV setting in the
 field of the passed address is missing.
 
 .BR listen (2)
-called but the AF_IUCV socket has not yet been bound to an address.  Always call
+called but the AF_IUCV socket has not yet been bound to an address.
+Always call
 .BR bind (2)
 before
 .BR listen (2).
+
+.BR setsockopt (2)
+called with option \fBSO_MSGLIMIT\fP for sockets that are already connected.
+.
+.TP
+.B ENOPROTOOPT
+.BR setsockopt (2),
+or
+.BR getsockopt (2)
+called but the socket level has not been set to \f(CWSOL_IUCV\fP, or the
+specified socket option is not supported.
 .
 .TP
 .B EOPNOTSUPP
@@ -232,13 +336,27 @@ might be called with the
 flag set.
 AF_IUCV does not support sending or receiving \fIout-of-band\fP data on its
 sockets.
+
+For \f(CWSOCK_SEQPACKET\fP sockets,
+.BR sendmsg (2)
+called without the
+.I MSG_EOR
+flag set.
+AF_IUCV does not support segmentation, and thus, the "end-of-record"
+(\fIMSG_EOR\fP) flag must always be set.
+.
+.TP
+.B EPROTONOSUPPORT
+.BR socket (2)
+called with a protocol that is not supported. The socket protocol parameter
+must be either zero or \f(CWPF_IUCV\fP.
 .
 .TP
 .B EAFNOSUPPORT
 .BR socket (2)
-called with \fIAF_IUCV\fP but the AF_IUCV protocol / addressing family is not
+called with \f(CWAF_IUCV\fP but the AF_IUCV address family is not
 supported by the current Linux kernel.  Ensure that your Linux kernel has been
-compiled with support for the AF_IUCV addressing family.
+compiled with support for the AF_IUCV address family.
 .
 .PP
 Other errors can be generated by the generic socket layer. See the respective
@@ -251,6 +369,9 @@ manual pages for more information.
 .BR recvmsg (2),
 .BR sendmsg (2),
 .BR socket (2),
+.BR setsockopt (2),
+.BR getsockopt (2),
+.BR cmsg (3),
 .BR socket (7)
 
 .I "Linux on System z - Device Drivers, Features, and Commands"
@@ -258,3 +379,24 @@ manual pages for more information.
 .I "z/VM CP Planning and Administration"
 .br
 .I "z/VM CP Programming Services"
+.
+.
+.
+.SH "HISTORY"
+.TP
+.B AF_IUCV, version 1.0
+Initial version.
+.TP
+.B AF_IUCV, version 1.1
+.RS 4
+.IP "\(bu" 4
+Support for sending socket data in the parameter list of an IUCV message
+(\f(CWSO_IPRMDATA_MSG\fP).
+.IP "\(bu" 4
+Access the target class of an IUCV message as ancillary data using
+.BR sendmsg "(2) and " recvmsg (2).
+.IP "\(bu" 4
+Support for \f(CWSOCK_SEQPACKET\fP sockets to facilitate development of native
+IUCV applications that interact with AF_IUCV.
+.RE
+
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- s390utils.spec	25 Sep 2009 12:24:55 -0000	1.7
+++ s390utils.spec	30 Sep 2009 20:09:33 -0000	1.8
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@ Patch19:  0019-s390-tools-1.8.1-lsluns-d
 Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
 Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
 Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch23:  0023-change-default-load-address-for-ramdisk.patch
+Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
+Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -128,6 +131,15 @@ be used together with the zSeries (s390)
 # Fix string overflow in vtoc_volume_label_init (#525318)
 %patch22 -p1 -b .vtoc-label
 
+# Change default load address for ramdisk (#526339)
+%patch23 -p1 -b .ramdisk-address
+
+# Fix cmm_pages allocation outside min and max range (#525495)
+%patch24 -p1 -b .ramdisk-address
+
+# Miscelaneous fixes for 1.8.1 (#525495)
+%patch25 -p1 -b .misc
+
 #
 # cmsfs
 #
@@ -776,6 +788,11 @@ User-space development files for the s39
 
 
 %changelog
+* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
+- changed ramdisk load address (#526339)
+- updated zfcpconf.sh script to new sysfs interface (#526324)
+- added 1.8.1 fixes from IBM (#525495)
+
 * Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
 - fix issues in lib-zfcp-hbaapi with a patch
 


Index: zfcpconf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/zfcpconf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfcpconf.sh	7 Apr 2009 08:03:09 -0000	1.1
+++ zfcpconf.sh	30 Sep 2009 20:09:33 -0000	1.2
@@ -10,15 +10,13 @@
 #
 # manual setup:
 # modprobe zfcp
-# echo WWPN > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
-# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
 # echo 1    > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
+# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
 # 
 # Example:
 # modprobe zfcp
-# echo 0x5005076300c213e9 > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
-# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
 # echo 1                  > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
+# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
 
 CONFIG=/etc/zfcp.conf
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -39,8 +37,7 @@ if [ -f "$CONFIG" ]; then
       elif [ $numparams == 3 ]; then
          read DEVICE WWPN FCPLUN < <(echo $line)
       fi
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN ] && echo $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
       echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
+      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
    done
 fi



From chkr at fedoraproject.org  Wed Sep 30 20:10:24 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 20:10:24 +0000 (UTC)
Subject: rpms/dualscreen-mouse-utils/F-11 dualscreen-mouse-utils.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930201024.14EA011C048B@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/dualscreen-mouse-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32703/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	dualscreen-mouse-utils.spec import.log 
Log Message:
initial import of dualscreen-mouse-utils



--- NEW FILE dualscreen-mouse-utils.spec ---
Summary: Utilities for use with dual head setups using independent screens
Name: dualscreen-mouse-utils
Version: 0.5
Release: 4%{?dist}
License: GPLv2
Group: User Interface/X
URL: http://digamma.cs.unm.edu/trac.dmohr/wiki/DualscreenMouseUtils
Source0: http://dsp.mcbf.net/releases/dualscreen-mouse-utils-%{version}.tar.gz
BuildRequires: libX11-devel

%description
Utilities for use with old-school dual head setups: namely not
twinview / one big desktop, but rather two X screens.

mouse-switchscreen:
  Change the mouse cursor from one screen to the other. Remembers the previous
  mouse position for each screen.

mouse-wrapscreen:
  If you have an xorg.conf where both X screens are "separated" on the X
  coordinates, then the mouse cursor cannot cross. Which is sometimes desired,
  and sometimes not. Using mouse-wrapscreen you can configure them to be
  "uncrossable", and then run it in the background when you do want to be able
  to cross the cursor.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}

%install
install -d %{buildroot}%{_bindir}
install -m 755 mouse-wrapscreen mouse-switchscreen %{buildroot}%{_bindir}/

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root,-)
%doc gpl.txt README
%{_bindir}/*

%changelog
* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-4
- Correct email address

* Mon Sep 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-3
- Fix spelling mistake

* Sun Sep 27 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-2
- Deleting %%buildroot is not necessary in %%install anymore (F10 and greater)
- Remove definition of %%buildroot (not needed for F10 and greater)
- Use rpm macro for optflags now

* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.5-1
- Initial package



--- NEW FILE import.log ---
dualscreen-mouse-utils-0_5-4_fc13:F-11:dualscreen-mouse-utils-0.5-4.fc13.src.rpm:1254341214


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:13:04 -0000	1.1
+++ .cvsignore	30 Sep 2009 20:10:23 -0000	1.2
@@ -0,0 +1 @@
+dualscreen-mouse-utils-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dualscreen-mouse-utils/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:13:04 -0000	1.1
+++ sources	30 Sep 2009 20:10:23 -0000	1.2
@@ -0,0 +1 @@
+b68a43c9041cbb8dc373553ccef93070  dualscreen-mouse-utils-0.5.tar.gz



From sharkcz at fedoraproject.org  Wed Sep 30 20:10:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 30 Sep 2009 20:10:53 +0000 (UTC)
Subject: rpms/s390utils/F-12
	0023-change-default-load-address-for-ramdisk.patch, NONE,
	1.1 0024-s390-tools-1.8.1-cpuplugd-limits.patch, NONE,
	1.1 0025-s390-tools-1.8.1-misc-bugfixes.patch, NONE,
	1.1 s390utils.spec, 1.7, 1.8 zfcpconf.sh, 1.1, 1.2
Message-ID: <20090930201053.CC93711C048B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv480

Modified Files:
	s390utils.spec zfcpconf.sh 
Added Files:
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
- changed ramdisk load address (#526339)
- updated zfcpconf.sh script to new sysfs interface (#526324)
- added 1.8.1 fixes from IBM (#525495)


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0023-change-default-load-address-for-ramdisk.patch ---
>From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:19:23 +0200
Subject: [PATCH 23/25] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x100000 to 0x200000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..0f04072 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -21,7 +21,7 @@
 #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
-#define DEFAULT_IMAGE_ADDRESS		0x10000LL
+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
 #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
-- 
1.6.3.3


0024-s390-tools-1.8.1-cpuplugd-limits.patch:
 config.c |   15 +++++++++++++--
 daemon.c |   11 -----------
 mem.c    |    7 +++----
 3 files changed, 16 insertions(+), 17 deletions(-)

--- NEW FILE 0024-s390-tools-1.8.1-cpuplugd-limits.patch ---
>From 0b02dbdbd248ca51583e9dce3bd57025b965534d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:22:15 +0200
Subject: [PATCH 24/25] s390-tools-1.8.1-cpuplugd-limits

Description: cpuplugd: fix cmm_pages allocation outside min and max range
Symptom:     cpuplugd might instruct CMM to operated outside the predefined limits
Problem:     This problem is basically caused by a missing new line separator at
	     the interface between the daemon and the proc file.
Solution:    Add newline to the end of each line when writing to /proc/sys/vm/cmm_pages
Problem-ID:  55472
---
 cpuplugd/config.c |   15 +++++++++++++--
 cpuplugd/daemon.c |   11 -----------
 cpuplugd/mem.c    |    6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cpuplugd/config.c b/cpuplugd/config.c
index c013a65..bd3cb43 100644
--- a/cpuplugd/config.c
+++ b/cpuplugd/config.c
@@ -494,7 +494,7 @@ void check_config(struct config *cfg)
 	if (memory == 1) {
 		/*
 		 * check that the initial value of cmm_pages is not below
-		 * cmm_min
+		 * cmm_min or above cmm_max
 		 */
 		cmm_pagesize_start = get_cmmpages_size();
 		if (cmm_pagesize_start < cfg->cmm_min) {
@@ -506,7 +506,18 @@ void check_config(struct config *cfg)
 				syslog(LOG_INFO, "cmm_pages is below minimum "
 						"and will be increased\n");
 			}
-			memunplug(cfg->cmm_min);
+			set_cmm_pages(cfg->cmm_min);
+		}
+		if (cmm_pagesize_start > cfg->cmm_max) {
+			if (debug && foreground == 1) {
+				printf("cmm_pages is above the maximum and will "
+						"be decreased.\n");
+			}
+			if (debug && foreground == 0) {
+				syslog(LOG_INFO, "cmm_pages is above the maximum "
+						"and will be decreased\n");
+			}
+			set_cmm_pages(cfg->cmm_max);
 		}
 	}
 }
diff --git a/cpuplugd/daemon.c b/cpuplugd/daemon.c
index d0769f3..e1ef623 100644
--- a/cpuplugd/daemon.c
+++ b/cpuplugd/daemon.c
@@ -260,17 +260,6 @@ void check_max(struct config *cfg)
 			cpuid++;
 		}
 	}
-	if (memory && get_cmmpages_size() > cfg->cmm_max) {
-		if (debug && foreground == 1) {
-			printf("cmm_pages is above the maximum and will "
-					"be decreased.\n");
-		}
-		if (debug && foreground == 0) {
-			syslog(LOG_INFO, "cmm_pages is above the maximum "
-					"and will be decreased\n");
-		}
-		set_cmm_pages(cfg->cmm_max);
-	}
 }
 
 /* check if we are running in an LPAR environment.
diff --git a/cpuplugd/mem.c b/cpuplugd/mem.c
index 2f3d219..6200904 100644
--- a/cpuplugd/mem.c
+++ b/cpuplugd/mem.c
@@ -138,7 +138,7 @@ int memunplug(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", new_size);
+	fprintf(filp, "%d\n", new_size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", new_size);
@@ -173,7 +173,7 @@ int memplug(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", new_size);
+	fprintf(filp, "%d\n", new_size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", new_size);
@@ -200,7 +200,7 @@ int set_cmm_pages(int size)
 			       ":%s\n", strerror(errno));
 		return -1;
 	}
-	fprintf(filp, "%d", size);
+	fprintf(filp, "%d\n", size);
 	if (debug && foreground == 1)
 		printf("changed number of pages permanently reserved "
 		       "to  %d \n", size);
-- 
1.6.3.3


0025-s390-tools-1.8.1-misc-bugfixes.patch:
 ipl_tools/system.c |   13 ++-
 man/af_iucv.7      |  175 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 166 insertions(+), 22 deletions(-)

--- NEW FILE 0025-s390-tools-1.8.1-misc-bugfixes.patch ---
>From 60a3bf1df6d7039f75d889f15d7839f8482c2889 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 30 Sep 2009 18:24:52 +0200
Subject: [PATCH 25/25] s390-tools-1.8.1-misc-bugfixes

Miscellaneous minor bufgixes for s390-tools RHEL5.5:
* lsshut:  Fix printing of vmcmd shutdown action: Also print CP commands
           that have more than one word.
* af_iucv: Doc update for connection-oriented datagram sockets.
---
 ipl_tools/system.c |   13 +++--
 man/af_iucv.7      |  174 +++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 166 insertions(+), 21 deletions(-)

diff --git a/ipl_tools/system.c b/ipl_tools/system.c
index 8294db0..fd5b76b 100644
--- a/ipl_tools/system.c
+++ b/ipl_tools/system.c
@@ -74,7 +74,7 @@ out:
 char *substring(size_t start, size_t stop, const char *src, char *dst,
 		size_t size)
 {
-	int count;
+	unsigned int count;
 
 	count = stop - start;
 	if (count >= --size)
@@ -102,7 +102,7 @@ int check_for_root(void)
 int ishex(char *cp)
 {
 
-	int i;
+	unsigned int i;
 	char c;
 
 	for (i = 0; i <= strlen(cp); i++) {
@@ -168,13 +168,13 @@ int strrd(char *string, char *file)
 
 	strncpy(path, file, sizeof(path));
 	if (access(path, R_OK) == 0) {
-		filp = fopen(path, "r");
+		filp = fopen(path, "rb");
 		if (!filp) {
 			fprintf(stderr,	"%s: Can not open %s: ", name, file);
 			fprintf(stderr, "%s\n", strerror(errno));
 			exit(1);
 		}
-		rc = fscanf(filp, "%s", string);
+		rc = fread(string, 4096, 1, filp);
 		fclose(filp);
 		/*
 		 *  special handling is required for
@@ -192,8 +192,11 @@ int strrd(char *string, char *file)
 					file);
 			fprintf(stderr, "%s\n", strerror(errno));
 			return -1;
-		} else
+		} else {
+			if (string[strlen(string) - 1] == '\n')
+				string[strlen(string) - 1] = 0;
 			return 0;
+		}
 	} else {
 		fprintf(stderr,	"%s: Can not open %s: ", name, file);
 		fprintf(stderr, "%s\n", strerror(errno));
diff --git a/man/af_iucv.7 b/man/af_iucv.7
index cdd2691..9d56640 100644
--- a/man/af_iucv.7
+++ b/man/af_iucv.7
@@ -4,7 +4,7 @@
 .\" Copyright IBM Corp. 2008, 2009.
 .\" Author(s): Hendrik Brueckner <brueckner at linux.vnet.ibm.com>
 .\" ----------------------------------------------------------------------
-.TH AF_IUCV 7 "March 2009"  "s390-tools" "Linux Programmer's Manual"
+.TH AF_IUCV 7 "September 2009"  "s390-tools" "Linux Programmer's Manual"
 .SH NAME
 iucv, AF_IUCV \- Sockets for z/VM IUCV communication
 .
@@ -13,15 +13,17 @@ iucv, AF_IUCV \- Sockets for z/VM IUCV communication
 .SH SYNOPSIS
 .B #include <sys/socket.h>
 
-.IB iucv_socket " = socket(AF_IUCV, SOCK_STREAM, 0);"
+.IB iucv_stream_socket " = socket(AF_IUCV, SOCK_STREAM, 0);"
+.br
+.IB iucv_packet_socket " = socket(AF_IUCV, SOCK_SEQPACKET, 0);"
 .
 .
 .
 .SH DESCRIPTION
 The Inter-User Communication Vehicle (IUCV) is a z/VM communication facility
 that enables a program running in one z/VM guest virtual machine to communicate
-with another z/VM guest virtual machine, or with a control program, or even
-with itself.
+with another z/VM guest virtual machine, or with the control program (CP), or
+even with itself.
 
 The AF_IUCV address family provides communication and addressing in the IUCV
 domain.  In the IUCV domain, address spaces or virtual machines can use the
@@ -32,7 +34,11 @@ AF_IUCV connects socket applications running on different Linux guest operating
 systems, or it connects a Linux application to another socket application
 running in another z/VM guest operating system (like z/VM CMS).
 
-The AF_IUCV address family supports stream sockets only.
+The AF_IUCV address family supports stream-oriented sockets
+(\f(CWSOCK_STREAM\fP) and connection-oriented datagram sockets
+(\f(CWSOCK_SEQPACKET\fP). Stream-oriented sockets fragment data over several
+native IUCV messages, whereas sockets of type SOCK_SEQPACKET map a particular
+socket write or read operation to a single native IUCV message.
 
 .SS Features
 The AF_IUCV address family provides:
@@ -78,28 +84,106 @@ are reserved for future use. The
 .B siucv_port
 and
 .B siucv_addr
-fields must be zero. The 
+fields must be zero. The
 .B siucv_nodeid
 field must be set to exactly eight blank characters.
 .
 .TP
 .B siucv_userid
 is set to the z/VM user ID of the Linux guest virtual machine running the
-application which owns the address. The field must be eight characters long,
+application that owns the address. The field must be eight characters long,
 padded with blanks on the right.
 
 For
 .BR bind "(2), " siucv_userid
-must contain blanks only, because AF_IUCV sets the correct z/VM user ID.
+must contain blanks only to allow AF_IUCV to set the z/VM user ID of the Linux
+guest operating system.
 .
 .TP
 .B siucv_name
-is set to the application name by which the socket is known. Servers advertises
+is set to the application name by which the socket is known. Servers advertise
 application names and clients use these application names to connect to servers.
 This field must be eight characters long, padded with blanks on the right.
 .
 .
 .
+.SH "SOCKET OPTIONS"
+Socket options can be set with
+.BR setsockopt (2)
+and read with
+.BR getsockopt (2)
+by specifying \f(CWSOL_IUCV\fP as the socket level.
+
+.TP
+.B SO_IPRMDATA_MSG
+Enables the application to send up to seven bytes of socket data in the
+parameter list of an IUCV message. Use this option to increase performance
+when transferring small amounts of data.
+
+To send data in the parameter list, specify a non-zero integer value.
+
+.RS
+.TP
+.B Note:
+Use this option with care, older AF_IUCV versions do not support receiving
+socket data in the parameter list and shut down the socket on which
+a parameter list message has been received.
+.RE
+.
+.TP
+.B SO_MSGLIMIT
+Modifies the message limit for new IUCV communication paths. The message
+limit specifies the maximum number of outstanding messages that are allowed
+for established connections. This setting can be lowered by z/VM when an IUCV
+connection is established.
+
+The message limit is an integer value in range 1 to 65535.
+The default value is 65535.
+
+The message limit must be set before
+.BR connect "(2) or " listen (2)
+is called for sockets.
+.br
+For sockets that are already connected or listening for connections,
+the message limit cannot be changed.
+.br
+New sockets created by
+.BR accept (2)
+inherit the message limit that has been set for the listening socket.
+
+.BR getsockopt (2)
+returns the default message limit or the limit that has been set.
+For connected sockets, the current message limit is returned. The current
+message limit is assigned by z/VM for each connection and it depends
+on the IUCV MSGLIMIT statement specified for the z/VM guest virtual machine.
+The current message limit is the lower value of the socket option and the
+value specified for the IUCV MSGLIMIT statement.
+
+See the SECURITY section below for setting IUCV MSGLIMIT authorizations.
+.
+.
+.
+.SH "ANCILLARY DATA"
+Ancillary data is sent and received using the
+.BR sendmsg (2)
+and
+.BR recvmsg (2)\fR.\fP
+To send ancillary data, set the \fBcmsg_level\fP field of struct \fBcmsghdr\fP
+to \f(CWSOL_IUCV\fP and the \fBcmsg_type\fP field to the type.
+.br
+For more information see
+.BR cmsg (3).
+
+.TP
+.B SCM_IUCV_TRGCLS
+Send or receive IUCV target class information. The IUCV target class can be used
+to classify and identify an IUCV message at IUCV protocol level. If the target
+class is not specified as ancillary data, it is set to zero.
+
+The target class is a number of type \fBuint32_t\fP.
+.
+.
+.
 .
 .SH SECURITY
 This section provides an overview of the required IUCV statements for your z/VM
@@ -129,20 +213,20 @@ any other z/VM guest virtual machine.
 .TP
 .B IUCV \fIuser_ID\fP
 allows this z/VM guest virtual machine to establish a communication path to the
-z/VM guest virtual machine with the z/VM user ID \fIuser_ID\fP. 
+z/VM guest virtual machine with the z/VM user ID \fIuser_ID\fP.
 .PP
 You can specify multiple IUCV statements. To any of these IUCV statements you
 can append the
 .B MSGLIMIT \fIlimit\fP
 parameter.
 \fIlimit\fP specifies the maximum number of outstanding messages that are
-allowed for each connection authorized by this entry.
+allowed for each connection authorized by this statement.
 If no value is specified for \fBMSGLIMIT\fP, AF_IUCV requests 65535,
 which is the maximum supported by IUCV.
 .
 .
 .SS "Setting a connection limit"
-Use the \fBOPTION\fP statement to limit the number of concurrent connections. 
+Use the \fBOPTION\fP statement to limit the number of concurrent connections.
 .TP
 .B OPTION MAXCONN \fImaxno\fP
 \fImaxno\fP specifies the maximum number of IUCV connections allowed for this
@@ -151,7 +235,7 @@ virtual machine. The default is 64. The maximum is 65535.
 .
 .SS "Example"
 These sample statements allow any z/VM guest virtual machine to connect to your
-z/VM guest virtual machine with a maximum of 10000 outstanding messages for each
+z/VM guest virtual machine with a maximum of 10\^000 outstanding messages for each
 incoming connection. Your z/VM guest virtual machine is permitted to connect to
 all other z/VM guest virtual machines. The total number of connections for your
 z/VM guest virtual machine cannot exceed 100.
@@ -200,6 +284,14 @@ This error can be temporary and the application may try again after some time.
 If the error occurs repeatedly, try to increase the maximum number of
 connections (for one or both z/VM guest virtual machines).
 See the SECURITY section about the required authorization statement.
+
+.B sendmsg (2)
+called but the maximum number of outstanding IUCV messages for the socket
+connection is reached; i.e. there are data available that has not yet been
+received by the communication partner.
+.br
+If necessary, change the IUCV message limit as explained in section
+"IUCV AUTHORIZATIONS".
 .
 .TP
 .B EACCES
@@ -217,10 +309,22 @@ called but the AF_IUCV setting in the
 field of the passed address is missing.
 
 .BR listen (2)
-called but the AF_IUCV socket has not yet been bound to an address.  Always call
+called but the AF_IUCV socket has not yet been bound to an address.
+Always call
 .BR bind (2)
 before
 .BR listen (2).
+
+.BR setsockopt (2)
+called with option \fBSO_MSGLIMIT\fP for sockets that are already connected.
+.
+.TP
+.B ENOPROTOOPT
+.BR setsockopt (2),
+or
+.BR getsockopt (2)
+called but the socket level has not been set to \f(CWSOL_IUCV\fP, or the
+specified socket option is not supported.
 .
 .TP
 .B EOPNOTSUPP
@@ -232,13 +336,27 @@ might be called with the
 flag set.
 AF_IUCV does not support sending or receiving \fIout-of-band\fP data on its
 sockets.
+
+For \f(CWSOCK_SEQPACKET\fP sockets,
+.BR sendmsg (2)
+called without the
+.I MSG_EOR
+flag set.
+AF_IUCV does not support segmentation, and thus, the "end-of-record"
+(\fIMSG_EOR\fP) flag must always be set.
+.
+.TP
+.B EPROTONOSUPPORT
+.BR socket (2)
+called with a protocol that is not supported. The socket protocol parameter
+must be either zero or \f(CWPF_IUCV\fP.
 .
 .TP
 .B EAFNOSUPPORT
 .BR socket (2)
-called with \fIAF_IUCV\fP but the AF_IUCV protocol / addressing family is not
+called with \f(CWAF_IUCV\fP but the AF_IUCV address family is not
 supported by the current Linux kernel.  Ensure that your Linux kernel has been
-compiled with support for the AF_IUCV addressing family.
+compiled with support for the AF_IUCV address family.
 .
 .PP
 Other errors can be generated by the generic socket layer. See the respective
@@ -251,6 +369,9 @@ manual pages for more information.
 .BR recvmsg (2),
 .BR sendmsg (2),
 .BR socket (2),
+.BR setsockopt (2),
+.BR getsockopt (2),
+.BR cmsg (3),
 .BR socket (7)
 
 .I "Linux on System z - Device Drivers, Features, and Commands"
@@ -258,3 +379,24 @@ manual pages for more information.
 .I "z/VM CP Planning and Administration"
 .br
 .I "z/VM CP Programming Services"
+.
+.
+.
+.SH "HISTORY"
+.TP
+.B AF_IUCV, version 1.0
+Initial version.
+.TP
+.B AF_IUCV, version 1.1
+.RS 4
+.IP "\(bu" 4
+Support for sending socket data in the parameter list of an IUCV message
+(\f(CWSO_IPRMDATA_MSG\fP).
+.IP "\(bu" 4
+Access the target class of an IUCV message as ancillary data using
+.BR sendmsg "(2) and " recvmsg (2).
+.IP "\(bu" 4
+Support for \f(CWSOCK_SEQPACKET\fP sockets to facilitate development of native
+IUCV applications that interact with AF_IUCV.
+.RE
+
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- s390utils.spec	25 Sep 2009 12:24:55 -0000	1.7
+++ s390utils.spec	30 Sep 2009 20:10:48 -0000	1.8
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@ Patch19:  0019-s390-tools-1.8.1-lsluns-d
 Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
 Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
 Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch23:  0023-change-default-load-address-for-ramdisk.patch
+Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
+Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -128,6 +131,15 @@ be used together with the zSeries (s390)
 # Fix string overflow in vtoc_volume_label_init (#525318)
 %patch22 -p1 -b .vtoc-label
 
+# Change default load address for ramdisk (#526339)
+%patch23 -p1 -b .ramdisk-address
+
+# Fix cmm_pages allocation outside min and max range (#525495)
+%patch24 -p1 -b .ramdisk-address
+
+# Miscelaneous fixes for 1.8.1 (#525495)
+%patch25 -p1 -b .misc
+
 #
 # cmsfs
 #
@@ -776,6 +788,11 @@ User-space development files for the s39
 
 
 %changelog
+* Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
+- changed ramdisk load address (#526339)
+- updated zfcpconf.sh script to new sysfs interface (#526324)
+- added 1.8.1 fixes from IBM (#525495)
+
 * Fri Sep 25 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-6
 - fix issues in lib-zfcp-hbaapi with a patch
 


Index: zfcpconf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/zfcpconf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfcpconf.sh	7 Apr 2009 08:03:09 -0000	1.1
+++ zfcpconf.sh	30 Sep 2009 20:10:50 -0000	1.2
@@ -10,15 +10,13 @@
 #
 # manual setup:
 # modprobe zfcp
-# echo WWPN > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
-# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
 # echo 1    > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
+# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
 # 
 # Example:
 # modprobe zfcp
-# echo 0x5005076300c213e9 > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
-# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
 # echo 1                  > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
+# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
 
 CONFIG=/etc/zfcp.conf
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -39,8 +37,7 @@ if [ -f "$CONFIG" ]; then
       elif [ $numparams == 3 ]; then
          read DEVICE WWPN FCPLUN < <(echo $line)
       fi
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN ] && echo $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
       echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
+      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
    done
 fi



From dwalsh at fedoraproject.org  Wed Sep 30 20:18:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 20:18:00 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.94,1.95
Message-ID: <20090930201800.ECB2111C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2776

Modified Files:
	policy-F12.patch 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
- Add plymouth policy


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 330 files changed, 15541 insertions(+), 2596 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.94 -r 1.95 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- policy-F12.patch	30 Sep 2009 18:57:21 -0000	1.94
+++ policy-F12.patch	30 Sep 2009 20:18:00 -0000	1.95
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/Makefile	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/Makefile	2009-09-30 16:12:48.000000000 -0400
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -12,7 +12,7 @@ diff -b -B --ignore-all-space --exclude-
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-18 16:41:29.000000000 -0400
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-30 16:12:48.000000000 -0400
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -23,7 +23,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/global_tunables	2009-09-30 16:12:48.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -61,7 +61,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/mcs	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/mcs	2009-09-30 16:12:48.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -97,7 +97,7 @@ diff -b -B --ignore-all-space --exclude-
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-30 16:12:48.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -117,7 +117,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-21 08:25:17.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-30 16:12:48.000000000 -0400
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -129,7 +129,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-30 16:12:48.000000000 -0400
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -141,7 +141,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -149,7 +149,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-30 16:12:48.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -186,7 +186,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-30 16:12:48.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -211,7 +211,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-09-30 16:12:48.000000000 -0400
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -256,7 +256,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-30 16:12:48.000000000 -0400
 @@ -136,4 +136,5 @@
  
  optional_policy(`
@@ -265,7 +265,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-30 16:12:48.000000000 -0400
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -276,7 +276,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-09-30 16:12:48.000000000 -0400
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(netutils_t)
@@ -287,7 +287,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-30 16:12:48.000000000 -0400
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -299,7 +299,7 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.32/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-09-30 16:12:48.000000000 -0400
 @@ -151,11 +151,11 @@
  ##	</summary>
  ## </param>
@@ -316,7 +316,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.32/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-30 16:12:48.000000000 -0400
 @@ -89,6 +89,7 @@
  miscfiles_read_localization(prelink_t)
  
@@ -327,7 +327,7 @@ diff -b -B --ignore-all-space --exclude-
  	amanda_manage_lib(prelink_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.32/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-16 10:03:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-30 16:12:48.000000000 -0400
 @@ -52,6 +52,7 @@
  
  files_list_non_security(readahead_t)
@@ -338,7 +338,7 @@ diff -b -B --ignore-all-space --exclude-
  files_dontaudit_getattr_all_sockets(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.32/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-09-24 11:56:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -1,17 +1,17 @@
  
  /bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -388,7 +388,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.32/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-29 16:46:01.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-30 16:12:48.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -721,7 +721,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.32/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-09-24 11:56:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-09-30 16:12:48.000000000 -0400
 @@ -15,6 +15,9 @@
  domain_interactive_fd(rpm_t)
  role system_r types rpm_t;
@@ -971,7 +971,7 @@ diff -b -B --ignore-all-space --exclude-
  		java_domtrans_unconfined(rpm_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.if serefpolicy-3.6.32/policy/modules/admin/shorewall.if
 --- nsaserefpolicy/policy/modules/admin/shorewall.if	2009-09-09 09:23:16.000000000 -0400
[...2560 lines suppressed...]
  /sbin/mdmpd		--	gen_context(system_u:object_r:mdadm_exec_t,s0)
  
@@ -24513,7 +24522,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/.mdadm.map		--	gen_context(system_u:object_r:mdadm_map_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.6.32/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/raid.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/raid.te	2009-09-30 16:12:48.000000000 -0400
 @@ -14,6 +14,9 @@
  type mdadm_var_run_t;
  files_pid_file(mdadm_var_run_t)
@@ -24543,7 +24552,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -6,13 +6,13 @@
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -24585,7 +24594,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.32/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-09-24 23:11:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-09-30 16:12:48.000000000 -0400
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -24943,7 +24952,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.32/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-09-24 14:41:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-09-30 16:12:48.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -25310,7 +25319,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.32/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-09-30 16:12:48.000000000 -0400
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1, setrans_var_run_t, setrans_var_run_t, setrans_t)
  	files_list_pids($1)
@@ -25337,7 +25346,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -25368,7 +25377,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-09-30 16:12:48.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -25548,7 +25557,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.32/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-09-21 08:24:25.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-09-30 16:12:48.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -25750,7 +25759,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.32/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -25763,7 +25772,7 @@ diff -b -B --ignore-all-space --exclude-
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.32/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-09-30 16:12:48.000000000 -0400
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)
@@ -25792,7 +25801,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-30 16:12:48.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;
@@ -25904,7 +25913,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.32/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -25924,7 +25933,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.32/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-09-30 16:12:48.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -26430,7 +26439,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.32/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-09-30 16:12:48.000000000 -0400
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -26662,7 +26671,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.fc serefpolicy-3.6.32/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -1,4 +1,8 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -26675,7 +26684,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-28 10:22:23.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-30 16:12:48.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28658,7 +28667,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.32/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-30 16:12:48.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -28746,7 +28755,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-30 16:12:48.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -28776,7 +28785,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.if serefpolicy-3.6.32/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-30 16:12:48.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -28829,7 +28838,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.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-30 16:12:48.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -29129,7 +29138,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-30 16:12:48.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -29164,7 +29173,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/users	2009-09-16 10:03:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/users	2009-09-30 16:12:48.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #



From dwalsh at fedoraproject.org  Wed Sep 30 20:20:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 20:20:30 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 selinux-policy.spec,1.931,1.932
Message-ID: <20090930202031.1124711C043C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3384

Modified Files:
	selinux-policy.spec 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-15
- Add plymouth policy
- Allow local_login to sys_admin



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -p -r1.931 -r1.932
--- selinux-policy.spec	30 Sep 2009 18:57:22 -0000	1.931
+++ selinux-policy.spec	30 Sep 2009 20:20:30 -0000	1.932
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -448,8 +448,9 @@ exit 0
 %endif
 
 %changelog
-* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-15
 - Add plymouth policy
+- Allow local_login to sys_admin
 
 * Tue Sep 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
 - Allow cupsd_config to read user tmp



From ausil at fedoraproject.org  Wed Sep 30 20:24:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 30 Sep 2009 20:24:12 +0000 (UTC)
Subject: common branches,1.34,1.35
Message-ID: <20090930202412.B6AA311C00E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4209

Modified Files:
	branches 
Log Message:
send F-12 builds to dist-f12-updates-candidate



Index: branches
===================================================================
RCS file: /cvs/extras/common/branches,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- branches	29 Sep 2009 07:33:28 -0000	1.34
+++ branches	30 Sep 2009 20:24:12 -0000	1.35
@@ -17,6 +17,6 @@ F-8:dist-f8-updates-candidate:.fc8:fedor
 F-9:dist-f9-updates-candidate:.fc9:fedora:9
 F-10:dist-f10-updates-candidate:.fc10:fedora:10
 F-11:dist-f11-updates-candidate:.fc11:fedora:11
-F-12:dist-f12:.fc12:fedora:12
+F-12:dist-f12-updates-candidate:.fc12:fedora:12
 F-13:dist-f13:.fc13:fedora:13
 devel:dist-f13:.fc13:fedora:13



From lmacken at fedoraproject.org  Wed Sep 30 20:44:50 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 20:44:50 +0000 (UTC)
Subject: rpms/TurboGears2/devel TurboGears2.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930204450.A991E11C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10605/devel

Modified Files:
	.cvsignore sources 
Added Files:
	TurboGears2.spec import.log 
Log Message:
Initial import of TurboGears2 (#468230)


--- NEW FILE TurboGears2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           TurboGears2
Version:        2.0.3
Release:        3%{?dist}
Summary:        Next generation Front-to-back web development megaframework built on Pylons

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
BuildRequires:  python-nose python-coverage python-paver python-pylons
BuildRequires:  python-turbokid python-zope-sqlalchemy python-jinja2 python-toscawidgets python-genshi
BuildRequires:  python-repoze-what python-repoze-who-testutil python-repoze-what-pylons
BuildRequires:  python-webflash python-tw-forms python-turbojson python-repoze-what-quickstart

%{?el5:BuildRequires: python-wsgiref}

Requires:       python-pylons >= 0.9.7
Requires:       python-webflash >= 0.1-0.a8
Requires:       python-weberror >= 0.10.1
Requires:       python-genshi >= 0.5.1
Requires:       python-zope-sqlalchemy
Requires:       python-toscawidgets >= 0.9.4
Requires:       python-turbojson >= 1.2.1
Requires:       python-repoze-tm2 >= 1.0-0.a4
Requires:       python-repoze-what-pylons >= 1.0-0.rc3


%description
TurboGears2, provides a comprehensive web development toolkit.  It is designed
to help you create the basic outline of a database-driven web application in
minutes.

TurboGears provides you with sane default for designer friendly templates,
tools to make  AJAX, and dynamic Javascript driven pages easy on both the
browser side and the server side.

TurboGears is a project that is built upon a foundation of reuse and building
up.  In retrospect, much of the code that was home grown in the TurboGears
project should have been released as independent projects that integrate with
TurboGears.


%prep
%setup -q


%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot}

%check
# Disabled until we package chameleon.genshi
#nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(0644,root,root,0755)
%doc README.txt
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%{python_sitelib}/tg/


%changelog
* Mon Sep 14 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-3
- Tweak our python-wsgiref conditional for EL5

* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-2
- Remove the SQLAlchemy requirement, as python-zope-sqlalchemy
  is now set to include the appropriate version

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-1
- 2.0.3

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> 2.0.1-1
- 2.0.1
- Bump our ToscaWigdets requirement to 0.9.4
- Remove TurboGears2-custom-content-type.patch, which is upstream

* Sat Jun 06 2009 Luke Macken <lmacken at redhat.com> 2.0-4
- Require the new python-sqlalchemy0.5 package

* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> 2.0-3
- Add a patch to fix custom content types.
  http://trac.turbogears.org/ticket/2280

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> 2.0-2
- Conditionally include wsgiref

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> 2.0-1
- Update to 2.0 final.
- Add python-repoze-what-pylons and python-webflash to the BuildRequires
- Disable the test suite until we package chameleon.genshi

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> 1.9.7.0.3.b1dev.r5627
- Update to a svn snapshot to support tgext.authorization instead of
  tg.ext.repoze.who

* Mon Oct 27 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.2.b1
- Update to 1.9.7b1

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.1.a5dev.r5564
- Initial packaging of TurboGears2 for Fedora.


--- NEW FILE import.log ---
TurboGears2-2_0_3-3_fc11:HEAD:TurboGears2-2.0.3-3.fc11.src.rpm:1254328684


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:53:36 -0000	1.1
+++ .cvsignore	30 Sep 2009 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+TurboGears2-2.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:53:37 -0000	1.1
+++ sources	30 Sep 2009 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+a5628df522f201fd94cbea8289f21ec1  TurboGears2-2.0.3.tar.gz



From maxx at fedoraproject.org  Wed Sep 30 20:47:38 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 30 Sep 2009 20:47:38 +0000 (UTC)
Subject: rpms/libgtkhotkey/devel libgtkhotkey.spec, NONE,
	1.1 libgtkhotkey_doc_prefix.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930204738.E9B9411C00E6@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/libgtkhotkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11905

Modified Files:
	.cvsignore sources 
Added Files:
	libgtkhotkey.spec libgtkhotkey_doc_prefix.patch 
Log Message:
Initial import of libgtkhotkey


--- NEW FILE libgtkhotkey.spec ---
Name:           libgtkhotkey
Version:        0.2.1
Release:        3%{?dist}
Summary:        Platform independent hotkey handling for Gtk+ applications

Group:          System Environment/Libraries
License:        LGPLv3 
URL:            https://launchpad.net/gtkhotkey
Source0:        http://launchpad.net/gtkhotkey/0.2/%{version}/+download/gtkhotkey-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Use datadir instead of prefix to install documentation
# patch mailed to author on 2009-09-22
Patch0:         libgtkhotkey_doc_prefix.patch

BuildRequires:  gtk2-devel, intltool, pkgconfig

%description
Platform independent hotkey handling for Gtk+ applications

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n gtkhotkey-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Remove the docs installed by the package itself. Docs will be handled by the rpm %doc directive
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gtkhotkey


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/gtkhotkey
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sun Sep 27 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-3
- Let rpm handle doc installation to get properly versioned doc dir

* Sat Sep 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-2
- Add intltool and pkgconfig to BuildRequires

* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-1
- Initial packaging


libgtkhotkey_doc_prefix.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libgtkhotkey_doc_prefix.patch ---
diff -u -r gtkhotkey-0.2.1/Makefile.am gtkhotkey-0.2.1.new/Makefile.am
--- gtkhotkey-0.2.1/Makefile.am	2009-09-03 22:52:49.000000000 +0200
+++ gtkhotkey-0.2.1.new/Makefile.am	2009-09-22 20:15:01.883750783 +0200
@@ -11,7 +11,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtkhotkey-1.0.pc
 
-gtkhotkeydocdir = ${prefix}/doc/gtkhotkey
+gtkhotkeydocdir = ${datadir}/doc/gtkhotkey
 gtkhotkeydoc_DATA = \
 	README			\
 	COPYING			\
diff -u -r gtkhotkey-0.2.1/Makefile.in gtkhotkey-0.2.1.new/Makefile.in
--- gtkhotkey-0.2.1/Makefile.in	2009-09-03 22:53:33.000000000 +0200
+++ gtkhotkey-0.2.1.new/Makefile.in	2009-09-22 20:15:44.598750932 +0200
@@ -246,7 +246,7 @@
 SUBDIRS = src po test doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtkhotkey-1.0.pc
-gtkhotkeydocdir = ${prefix}/doc/gtkhotkey
+gtkhotkeydocdir = ${datadir}/doc/gtkhotkey
 gtkhotkeydoc_DATA = \
 	README			\
 	COPYING			\


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgtkhotkey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:04:14 -0000	1.1
+++ .cvsignore	30 Sep 2009 20:47:38 -0000	1.2
@@ -0,0 +1 @@
+gtkhotkey-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgtkhotkey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:04:14 -0000	1.1
+++ sources	30 Sep 2009 20:47:38 -0000	1.2
@@ -0,0 +1 @@
+bfdc73e68e9adbe0d506d31a25862914  gtkhotkey-0.2.1.tar.gz



From lmacken at fedoraproject.org  Wed Sep 30 20:51:11 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 20:51:11 +0000 (UTC)
Subject: rpms/TurboGears2/F-11 TurboGears2.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930205111.C49C811C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12572/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	TurboGears2.spec import.log 
Log Message:
Initial import of TurboGears2 (#468230)


--- NEW FILE TurboGears2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           TurboGears2
Version:        2.0.3
Release:        3%{?dist}
Summary:        Next generation Front-to-back web development megaframework built on Pylons

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
BuildRequires:  python-nose python-coverage python-paver python-pylons
BuildRequires:  python-turbokid python-zope-sqlalchemy python-jinja2 python-toscawidgets python-genshi
BuildRequires:  python-repoze-what python-repoze-who-testutil python-repoze-what-pylons
BuildRequires:  python-webflash python-tw-forms python-turbojson python-repoze-what-quickstart

%{?el5:BuildRequires: python-wsgiref}

Requires:       python-pylons >= 0.9.7
Requires:       python-webflash >= 0.1-0.a8
Requires:       python-weberror >= 0.10.1
Requires:       python-genshi >= 0.5.1
Requires:       python-zope-sqlalchemy
Requires:       python-toscawidgets >= 0.9.4
Requires:       python-turbojson >= 1.2.1
Requires:       python-repoze-tm2 >= 1.0-0.a4
Requires:       python-repoze-what-pylons >= 1.0-0.rc3


%description
TurboGears2, provides a comprehensive web development toolkit.  It is designed
to help you create the basic outline of a database-driven web application in
minutes.

TurboGears provides you with sane default for designer friendly templates,
tools to make  AJAX, and dynamic Javascript driven pages easy on both the
browser side and the server side.

TurboGears is a project that is built upon a foundation of reuse and building
up.  In retrospect, much of the code that was home grown in the TurboGears
project should have been released as independent projects that integrate with
TurboGears.


%prep
%setup -q


%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot}

%check
# Disabled until we package chameleon.genshi
#nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(0644,root,root,0755)
%doc README.txt
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%{python_sitelib}/tg/


%changelog
* Mon Sep 14 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-3
- Tweak our python-wsgiref conditional for EL5

* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-2
- Remove the SQLAlchemy requirement, as python-zope-sqlalchemy
  is now set to include the appropriate version

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-1
- 2.0.3

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> 2.0.1-1
- 2.0.1
- Bump our ToscaWigdets requirement to 0.9.4
- Remove TurboGears2-custom-content-type.patch, which is upstream

* Sat Jun 06 2009 Luke Macken <lmacken at redhat.com> 2.0-4
- Require the new python-sqlalchemy0.5 package

* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> 2.0-3
- Add a patch to fix custom content types.
  http://trac.turbogears.org/ticket/2280

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> 2.0-2
- Conditionally include wsgiref

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> 2.0-1
- Update to 2.0 final.
- Add python-repoze-what-pylons and python-webflash to the BuildRequires
- Disable the test suite until we package chameleon.genshi

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> 1.9.7.0.3.b1dev.r5627
- Update to a svn snapshot to support tgext.authorization instead of
  tg.ext.repoze.who

* Mon Oct 27 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.2.b1
- Update to 1.9.7b1

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.1.a5dev.r5564
- Initial packaging of TurboGears2 for Fedora.


--- NEW FILE import.log ---
TurboGears2-2_0_3-3_fc11:F-11:TurboGears2-2.0.3-3.fc11.src.rpm:1254329064


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:53:36 -0000	1.1
+++ .cvsignore	30 Sep 2009 20:51:11 -0000	1.2
@@ -0,0 +1 @@
+TurboGears2-2.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:53:37 -0000	1.1
+++ sources	30 Sep 2009 20:51:11 -0000	1.2
@@ -0,0 +1 @@
+a5628df522f201fd94cbea8289f21ec1  TurboGears2-2.0.3.tar.gz



From maxx at fedoraproject.org  Wed Sep 30 20:56:44 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 30 Sep 2009 20:56:44 +0000 (UTC)
Subject: rpms/libgtkhotkey/F-12 libgtkhotkey.spec, NONE,
	1.1 libgtkhotkey_doc_prefix.patch, NONE, 1.1
Message-ID: <20090930205644.E095011C00E6@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/libgtkhotkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13445

Added Files:
	libgtkhotkey.spec libgtkhotkey_doc_prefix.patch 
Log Message:
Initial import of libgtkhotkey


--- NEW FILE libgtkhotkey.spec ---
Name:           libgtkhotkey
Version:        0.2.1
Release:        3%{?dist}
Summary:        Platform independent hotkey handling for Gtk+ applications

Group:          System Environment/Libraries
License:        LGPLv3 
URL:            https://launchpad.net/gtkhotkey
Source0:        http://launchpad.net/gtkhotkey/0.2/%{version}/+download/gtkhotkey-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Use datadir instead of prefix to install documentation
# patch mailed to author on 2009-09-22
Patch0:         libgtkhotkey_doc_prefix.patch

BuildRequires:  gtk2-devel, intltool, pkgconfig

%description
Platform independent hotkey handling for Gtk+ applications

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n gtkhotkey-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Remove the docs installed by the package itself. Docs will be handled by the rpm %doc directive
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gtkhotkey


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/gtkhotkey
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sun Sep 27 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-3
- Let rpm handle doc installation to get properly versioned doc dir

* Sat Sep 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-2
- Add intltool and pkgconfig to BuildRequires

* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-1
- Initial packaging


libgtkhotkey_doc_prefix.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libgtkhotkey_doc_prefix.patch ---
diff -u -r gtkhotkey-0.2.1/Makefile.am gtkhotkey-0.2.1.new/Makefile.am
--- gtkhotkey-0.2.1/Makefile.am	2009-09-03 22:52:49.000000000 +0200
+++ gtkhotkey-0.2.1.new/Makefile.am	2009-09-22 20:15:01.883750783 +0200
@@ -11,7 +11,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtkhotkey-1.0.pc
 
-gtkhotkeydocdir = ${prefix}/doc/gtkhotkey
+gtkhotkeydocdir = ${datadir}/doc/gtkhotkey
 gtkhotkeydoc_DATA = \
 	README			\
 	COPYING			\
diff -u -r gtkhotkey-0.2.1/Makefile.in gtkhotkey-0.2.1.new/Makefile.in
--- gtkhotkey-0.2.1/Makefile.in	2009-09-03 22:53:33.000000000 +0200
+++ gtkhotkey-0.2.1.new/Makefile.in	2009-09-22 20:15:44.598750932 +0200
@@ -246,7 +246,7 @@
 SUBDIRS = src po test doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtkhotkey-1.0.pc
-gtkhotkeydocdir = ${prefix}/doc/gtkhotkey
+gtkhotkeydocdir = ${datadir}/doc/gtkhotkey
 gtkhotkeydoc_DATA = \
 	README			\
 	COPYING			\



From lmacken at fedoraproject.org  Wed Sep 30 20:56:57 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 20:56:57 +0000 (UTC)
Subject: rpms/TurboGears2/EL-5 TurboGears2.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930205657.8081E11C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13542/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	TurboGears2.spec import.log 
Log Message:
Initial import of TurboGears2 (#468230)


--- NEW FILE TurboGears2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           TurboGears2
Version:        2.0.3
Release:        3%{?dist}
Summary:        Next generation Front-to-back web development megaframework built on Pylons

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
BuildRequires:  python-nose python-coverage python-paver python-pylons
BuildRequires:  python-turbokid python-zope-sqlalchemy python-jinja2 python-toscawidgets python-genshi
BuildRequires:  python-repoze-what python-repoze-who-testutil python-repoze-what-pylons
BuildRequires:  python-webflash python-tw-forms python-turbojson python-repoze-what-quickstart

%{?el5:BuildRequires: python-wsgiref}

Requires:       python-pylons >= 0.9.7
Requires:       python-webflash >= 0.1-0.a8
Requires:       python-weberror >= 0.10.1
Requires:       python-genshi >= 0.5.1
Requires:       python-zope-sqlalchemy
Requires:       python-toscawidgets >= 0.9.4
Requires:       python-turbojson >= 1.2.1
Requires:       python-repoze-tm2 >= 1.0-0.a4
Requires:       python-repoze-what-pylons >= 1.0-0.rc3


%description
TurboGears2, provides a comprehensive web development toolkit.  It is designed
to help you create the basic outline of a database-driven web application in
minutes.

TurboGears provides you with sane default for designer friendly templates,
tools to make  AJAX, and dynamic Javascript driven pages easy on both the
browser side and the server side.

TurboGears is a project that is built upon a foundation of reuse and building
up.  In retrospect, much of the code that was home grown in the TurboGears
project should have been released as independent projects that integrate with
TurboGears.


%prep
%setup -q


%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot}

%check
# Disabled until we package chameleon.genshi
#nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(0644,root,root,0755)
%doc README.txt
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%{python_sitelib}/tg/


%changelog
* Mon Sep 14 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-3
- Tweak our python-wsgiref conditional for EL5

* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-2
- Remove the SQLAlchemy requirement, as python-zope-sqlalchemy
  is now set to include the appropriate version

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-1
- 2.0.3

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> 2.0.1-1
- 2.0.1
- Bump our ToscaWigdets requirement to 0.9.4
- Remove TurboGears2-custom-content-type.patch, which is upstream

* Sat Jun 06 2009 Luke Macken <lmacken at redhat.com> 2.0-4
- Require the new python-sqlalchemy0.5 package

* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> 2.0-3
- Add a patch to fix custom content types.
  http://trac.turbogears.org/ticket/2280

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> 2.0-2
- Conditionally include wsgiref

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> 2.0-1
- Update to 2.0 final.
- Add python-repoze-what-pylons and python-webflash to the BuildRequires
- Disable the test suite until we package chameleon.genshi

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> 1.9.7.0.3.b1dev.r5627
- Update to a svn snapshot to support tgext.authorization instead of
  tg.ext.repoze.who

* Mon Oct 27 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.2.b1
- Update to 1.9.7b1

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.1.a5dev.r5564
- Initial packaging of TurboGears2 for Fedora.


--- NEW FILE import.log ---
TurboGears2-2_0_3-3_fc11:EL-5:TurboGears2-2.0.3-3.fc11.src.rpm:1254329411


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:53:36 -0000	1.1
+++ .cvsignore	30 Sep 2009 20:56:57 -0000	1.2
@@ -0,0 +1 @@
+TurboGears2-2.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:53:37 -0000	1.1
+++ sources	30 Sep 2009 20:56:57 -0000	1.2
@@ -0,0 +1 @@
+a5628df522f201fd94cbea8289f21ec1  TurboGears2-2.0.3.tar.gz



From jkratoch at fedoraproject.org  Wed Sep 30 20:58:51 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Wed, 30 Sep 2009 20:58:51 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.41,
	1.42 gdb-6.7-testsuite-stable-results.patch, 1.7,
	1.8 gdb-archer.patch, 1.32, 1.33 gdb.spec, 1.389, 1.390 sources,
	1.40, 1.41
Message-ID: <20090930205851.1F9AD11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14019

Modified Files:
	.cvsignore gdb-6.7-testsuite-stable-results.patch 
	gdb-archer.patch gdb.spec sources 
Log Message:
* Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-1
- Fix broken python "help()" command "modules" (BZ 526552).
- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090930
- archer-jankratochvil-fedora12 commit: 7cb860f03e2437c97239334ebe240d06f45723e0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	25 Sep 2009 06:49:19 -0000	1.41
+++ .cvsignore	30 Sep 2009 20:58:49 -0000	1.42
@@ -1,2 +1,2 @@
 libstdc++-v3-python-r151798.tar.xz
-gdb-6.8.91.20090925.tar.bz2
+gdb-6.8.91.20090930.tar.bz2

gdb-6.7-testsuite-stable-results.patch:
 fileio.c   |   33 +++++++++++++++++++++++++++++++++
 fileio.exp |   10 +++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)

Index: gdb-6.7-testsuite-stable-results.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.7-testsuite-stable-results.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gdb-6.7-testsuite-stable-results.patch	4 Aug 2009 05:37:28 -0000	1.7
+++ gdb-6.7-testsuite-stable-results.patch	30 Sep 2009 20:58:49 -0000	1.8
@@ -102,17 +102,3 @@ frames-invalid can happen asynchronously
  
  set timeout $oldtimeout
  return 0
---- sources/gdb/testsuite/gdb.base/dump.exp-orig	2008-08-28 11:44:40.000000000 +0200
-+++ sources/gdb/testsuite/gdb.base/dump.exp	2008-08-28 11:44:49.000000000 +0200
-@@ -493,8 +493,10 @@ if ![string compare $is64bitonly "no"] t
-   gdb_test "print zero_all ()" "" ""
- 
-   # restore with expressions 
-+  # Address may fit in int32 but its negative result would be 0xffffxxxx for
-+  # 64-bit LONGEST addresses.
-   test_restore_saved_value \
--	"intarr3.srec ${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
-+	"intarr3.srec (long)${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
- 	"array partial with expressions" 4 "intarray2\[3\]"
- 
-   gdb_test "print intarray2\[2\] == 0" " = 1" "element 2 not changed, == 4"

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  763 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  281 +-
 cp-support.c                                             |  123 +
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1758 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  599 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  185 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   73 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   14 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |   10 
 testsuite/gdb.cp/cplusfuncs.exp                          |  225 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   72 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 238 files changed, 18375 insertions(+), 2438 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gdb-archer.patch	25 Sep 2009 06:49:20 -0000	1.32
+++ gdb-archer.patch	30 Sep 2009 20:58:49 -0000	1.33
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 4338ea85c798007c32594032f602db9fd230eba9
+commit 7cb860f03e2437c97239334ebe240d06f45723e0
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -21843,7 +21843,7 @@ index 7f033d6..11dba06 100644
 +typedef int myint;
 +int	dm_type_typedef (myint i)		{ return i; }
 diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
-index 5e08768..10ffdf0 100644
+index 5e08768..2ec50ca 100644
 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
 +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
 @@ -63,12 +63,28 @@ set dm_type_foo_ref 		"foo&"
@@ -22195,6 +22195,25 @@ index 5e08768..10ffdf0 100644
  }
  
  proc do_tests {} {
+@@ -534,6 +704,7 @@ proc do_tests {} {
+     global srcdir
+     global binfile
+     global gdb_prompt
++    global dm_type_int_star
+ 
+     set prms_id 0
+     set bug_id 0
+@@ -557,6 +728,10 @@ proc do_tests {} {
+     test_paddr_operator_functions
+     test_paddr_hairy_functions
+     test_lookup_operator_functions
++
++    # A regression test on errors involving operators
++    gdb_test "list foo::operator $dm_type_int_star" \
++	".*the class foo does not have any method named operator $dm_type_int_star.*"
+ }
+ 
+ do_tests
 diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp
 index 3c302c3..cd0496d 100644
 --- a/gdb/testsuite/gdb.cp/expand-sals.exp


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- gdb.spec	27 Sep 2009 15:51:46 -0000	1.389
+++ gdb.spec	30 Sep 2009 20:58:50 -0000	1.390
@@ -10,11 +10,11 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.91.20090925
+Version: 6.8.91.20090930
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 3%{?_with_upstream:.upstream}%{?dist}
+Release: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -374,7 +374,6 @@ BuildRequires: readline-devel
 #Requires: rpm-libs
 BuildRequires: rpm-devel
 %if 0%{!?_without_python:1}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
 # Temporarily before it gets moved to libstdc++.rpm
@@ -612,7 +611,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 	--mandir=%{_mandir}				\
 	--infodir=%{_infodir}				\
 	--with-gdb-datadir=%{_datadir}/gdb		\
-	--with-pythondir=%{python_sitelib}		\
+	--with-pythondir=%{_datadir}/gdb/python		\
 	--enable-gdb-build-warnings=,-Wno-unused	\
 %ifnarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64 sparcv9 sparc64
 	--disable-werror				\
@@ -764,14 +763,14 @@ for LIB in lib lib64;do
   LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"
   mkdir -p $LIBPATH
   # basename is being run only for the native (non-biarch) file.
-  sed -e 's, at pythondir@,%{python_sitelib}/gdb,'			\
+  sed -e 's, at pythondir@,%{_datadir}/gdb/python,'		\
       -e 's, at toolexeclibdir@,%{_prefix}/'"$LIB,"		\
       < $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/hook.in	\
       > $LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py
 done
-test ! -e $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+test ! -e $RPM_BUILD_ROOT%{_datadir}/gdb/python/libstdcxx
 cp -a $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/libstdcxx	\
-      $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+      $RPM_BUILD_ROOT%{_datadir}/gdb/python/libstdcxx
 %endif	# 0%{!?_without_python:1}
 
 # Remove the files that are part of a gdb build but that are owned and
@@ -832,9 +831,6 @@ fi
 %{_bindir}/pstack
 %{_mandir}/*/gstack.1*
 %{_mandir}/*/pstack.1*
-%if 0%{!?_without_python:1}
-%{python_sitelib}/gdb
-%endif	# 0%{!?_without_python:1}
 %endif	# 0%{!?_with_upstream:1}
 %{_datadir}/gdb
 %{_infodir}/annotate.info*
@@ -851,6 +847,11 @@ fi
 %endif
 
 %changelog
+* Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-1
+- Fix broken python "help()" command "modules" (BZ 526552).
+- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090930
+- archer-jankratochvil-fedora12 commit: 7cb860f03e2437c97239334ebe240d06f45723e0
+
 * Sun Sep 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-3
 - New test for step-resume breakpoint placed in multiple threads at once.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	25 Sep 2009 06:49:21 -0000	1.40
+++ sources	30 Sep 2009 20:58:50 -0000	1.41
@@ -1,2 +1,2 @@
 1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz
-b6ff9aa4c78ca41931052c8658bdabfd  gdb-6.8.91.20090925.tar.bz2
+729517cc8e6ca6e25cf4be343ffc4c3d  gdb-6.8.91.20090930.tar.bz2



From maxx at fedoraproject.org  Wed Sep 30 21:00:54 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 30 Sep 2009 21:00:54 +0000 (UTC)
Subject: rpms/libgtkhotkey/F-12 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090930210054.5D91D11C01EA@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/libgtkhotkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14781

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources file to correctly include the actual source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgtkhotkey/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:04:14 -0000	1.1
+++ .cvsignore	30 Sep 2009 21:00:54 -0000	1.2
@@ -0,0 +1 @@
+gtkhotkey-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgtkhotkey/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:04:14 -0000	1.1
+++ sources	30 Sep 2009 21:00:54 -0000	1.2
@@ -0,0 +1 @@
+bfdc73e68e9adbe0d506d31a25862914  gtkhotkey-0.2.1.tar.gz



From jkratoch at fedoraproject.org  Wed Sep 30 21:02:26 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Wed, 30 Sep 2009 21:02:26 +0000 (UTC)
Subject: rpms/gdb/F-12 .cvsignore, 1.41,
	1.42 gdb-6.7-testsuite-stable-results.patch, 1.7,
	1.8 gdb-archer.patch, 1.32, 1.33 gdb.spec, 1.389, 1.390 sources,
	1.40, 1.41
Message-ID: <20090930210226.C9E0C11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15241

Modified Files:
	.cvsignore gdb-6.7-testsuite-stable-results.patch 
	gdb-archer.patch gdb.spec sources 
Log Message:
* Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-1
- Fix broken python "help()" command "modules" (BZ 526552).
- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090930
- archer-jankratochvil-fedora12 commit: 7cb860f03e2437c97239334ebe240d06f45723e0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	25 Sep 2009 06:49:19 -0000	1.41
+++ .cvsignore	30 Sep 2009 21:02:25 -0000	1.42
@@ -1,2 +1,2 @@
 libstdc++-v3-python-r151798.tar.xz
-gdb-6.8.91.20090925.tar.bz2
+gdb-6.8.91.20090930.tar.bz2

gdb-6.7-testsuite-stable-results.patch:
 fileio.c   |   33 +++++++++++++++++++++++++++++++++
 fileio.exp |   10 +++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)

Index: gdb-6.7-testsuite-stable-results.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.7-testsuite-stable-results.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gdb-6.7-testsuite-stable-results.patch	4 Aug 2009 05:37:28 -0000	1.7
+++ gdb-6.7-testsuite-stable-results.patch	30 Sep 2009 21:02:25 -0000	1.8
@@ -102,17 +102,3 @@ frames-invalid can happen asynchronously
  
  set timeout $oldtimeout
  return 0
---- sources/gdb/testsuite/gdb.base/dump.exp-orig	2008-08-28 11:44:40.000000000 +0200
-+++ sources/gdb/testsuite/gdb.base/dump.exp	2008-08-28 11:44:49.000000000 +0200
-@@ -493,8 +493,10 @@ if ![string compare $is64bitonly "no"] t
-   gdb_test "print zero_all ()" "" ""
- 
-   # restore with expressions 
-+  # Address may fit in int32 but its negative result would be 0xffffxxxx for
-+  # 64-bit LONGEST addresses.
-   test_restore_saved_value \
--	"intarr3.srec ${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
-+	"intarr3.srec (long)${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
- 	"array partial with expressions" 4 "intarray2\[3\]"
- 
-   gdb_test "print intarray2\[2\] == 0" " = 1" "element 2 not changed, == 4"

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  763 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  281 +-
 cp-support.c                                             |  123 +
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1758 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  599 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  185 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   73 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   14 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |   10 
 testsuite/gdb.cp/cplusfuncs.exp                          |  225 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   72 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 238 files changed, 18375 insertions(+), 2438 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gdb-archer.patch	25 Sep 2009 06:49:20 -0000	1.32
+++ gdb-archer.patch	30 Sep 2009 21:02:25 -0000	1.33
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 4338ea85c798007c32594032f602db9fd230eba9
+commit 7cb860f03e2437c97239334ebe240d06f45723e0
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -21843,7 +21843,7 @@ index 7f033d6..11dba06 100644
 +typedef int myint;
 +int	dm_type_typedef (myint i)		{ return i; }
 diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
-index 5e08768..10ffdf0 100644
+index 5e08768..2ec50ca 100644
 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
 +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
 @@ -63,12 +63,28 @@ set dm_type_foo_ref 		"foo&"
@@ -22195,6 +22195,25 @@ index 5e08768..10ffdf0 100644
  }
  
  proc do_tests {} {
+@@ -534,6 +704,7 @@ proc do_tests {} {
+     global srcdir
+     global binfile
+     global gdb_prompt
++    global dm_type_int_star
+ 
+     set prms_id 0
+     set bug_id 0
+@@ -557,6 +728,10 @@ proc do_tests {} {
+     test_paddr_operator_functions
+     test_paddr_hairy_functions
+     test_lookup_operator_functions
++
++    # A regression test on errors involving operators
++    gdb_test "list foo::operator $dm_type_int_star" \
++	".*the class foo does not have any method named operator $dm_type_int_star.*"
+ }
+ 
+ do_tests
 diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp
 index 3c302c3..cd0496d 100644
 --- a/gdb/testsuite/gdb.cp/expand-sals.exp


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- gdb.spec	27 Sep 2009 15:51:46 -0000	1.389
+++ gdb.spec	30 Sep 2009 21:02:26 -0000	1.390
@@ -10,11 +10,11 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.91.20090925
+Version: 6.8.91.20090930
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 3%{?_with_upstream:.upstream}%{?dist}
+Release: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -374,7 +374,6 @@ BuildRequires: readline-devel
 #Requires: rpm-libs
 BuildRequires: rpm-devel
 %if 0%{!?_without_python:1}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
 # Temporarily before it gets moved to libstdc++.rpm
@@ -612,7 +611,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 	--mandir=%{_mandir}				\
 	--infodir=%{_infodir}				\
 	--with-gdb-datadir=%{_datadir}/gdb		\
-	--with-pythondir=%{python_sitelib}		\
+	--with-pythondir=%{_datadir}/gdb/python		\
 	--enable-gdb-build-warnings=,-Wno-unused	\
 %ifnarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64 sparcv9 sparc64
 	--disable-werror				\
@@ -764,14 +763,14 @@ for LIB in lib lib64;do
   LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"
   mkdir -p $LIBPATH
   # basename is being run only for the native (non-biarch) file.
-  sed -e 's, at pythondir@,%{python_sitelib}/gdb,'			\
+  sed -e 's, at pythondir@,%{_datadir}/gdb/python,'		\
       -e 's, at toolexeclibdir@,%{_prefix}/'"$LIB,"		\
       < $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/hook.in	\
       > $LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py
 done
-test ! -e $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+test ! -e $RPM_BUILD_ROOT%{_datadir}/gdb/python/libstdcxx
 cp -a $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/libstdcxx	\
-      $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+      $RPM_BUILD_ROOT%{_datadir}/gdb/python/libstdcxx
 %endif	# 0%{!?_without_python:1}
 
 # Remove the files that are part of a gdb build but that are owned and
@@ -832,9 +831,6 @@ fi
 %{_bindir}/pstack
 %{_mandir}/*/gstack.1*
 %{_mandir}/*/pstack.1*
-%if 0%{!?_without_python:1}
-%{python_sitelib}/gdb
-%endif	# 0%{!?_without_python:1}
 %endif	# 0%{!?_with_upstream:1}
 %{_datadir}/gdb
 %{_infodir}/annotate.info*
@@ -851,6 +847,11 @@ fi
 %endif
 
 %changelog
+* Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-1
+- Fix broken python "help()" command "modules" (BZ 526552).
+- Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090930
+- archer-jankratochvil-fedora12 commit: 7cb860f03e2437c97239334ebe240d06f45723e0
+
 * Sun Sep 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090925-3
 - New test for step-resume breakpoint placed in multiple threads at once.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	25 Sep 2009 06:49:21 -0000	1.40
+++ sources	30 Sep 2009 21:02:26 -0000	1.41
@@ -1,2 +1,2 @@
 1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz
-b6ff9aa4c78ca41931052c8658bdabfd  gdb-6.8.91.20090925.tar.bz2
+729517cc8e6ca6e25cf4be343ffc4c3d  gdb-6.8.91.20090930.tar.bz2



From jkratoch at fedoraproject.org  Wed Sep 30 21:03:21 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Wed, 30 Sep 2009 21:03:21 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb.spec,1.390,1.391
Message-ID: <20090930210321.2C63B11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15781

Modified Files:
	gdb.spec 
Log Message:
* Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-2
- Bump release.



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- gdb.spec	30 Sep 2009 21:02:26 -0000	1.390
+++ gdb.spec	30 Sep 2009 21:03:20 -0000	1.391
@@ -14,7 +14,7 @@ Version: 6.8.91.20090930
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 1%{?_with_upstream:.upstream}%{?dist}
+Release: 2%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -847,6 +847,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-2
+- Bump release.
+
 * Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-1
 - Fix broken python "help()" command "modules" (BZ 526552).
 - Upgrade to the FSF GDB gdb-7.0 snapshot: 6.8.91.20090930



From lmacken at fedoraproject.org  Wed Sep 30 21:09:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 21:09:00 +0000 (UTC)
Subject: rpms/python-zope-sqlalchemy/EL-5 import.log, NONE,
	1.1 python-zope-sqlalchemy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930210901.00D0411C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-zope-sqlalchemy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18377/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-zope-sqlalchemy.spec 
Log Message:
Initial import of python-zope-sqlalchemy for EL-5



--- NEW FILE import.log ---
python-zope-sqlalchemy-0_4-3_fc11:EL-5:python-zope-sqlalchemy-0.4-3.fc11.src.rpm:1254330092


--- NEW FILE python-zope-sqlalchemy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zope-sqlalchemy
Version:        0.4
Release:        3%{?dist}
Summary:        Minimal Zope/SQLAlchemy transaction integration

Group:          Development/Languages
License:        ZPL
URL:            http://pypi.python.org/pypi/zope.sqlalchemy
Source0:        http://pypi.python.org/packages/source/z/zope.sqlalchemy/zope.sqlalchemy-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
Requires:       python-transaction
Requires:       python-zope-interface

%if 0%{?fedora} > 10
Requires:       python-sqlalchemy
%else
Requires:       python-sqlalchemy0.5
%endif

%description
The aim of this package is to unify the plethora of existing packages
integrating SQLAlchemy with Zope's transaction management. As such it seeks
only to provide a data manager and makes no attempt to define a zopeish way to
configure engines.


%prep
%setup -q -n zope.sqlalchemy-%{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,-)
%doc README.txt
%{python_sitelib}/*



%changelog
* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 0.4-3
- Conditionally require the appropriate version of SQLAlchemy

* Wed Jun 17 2009 Luke Macken <lmacken at redhat.com> - 0.4-2
- Require python-sqlalchemy0.5

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.4-1
- Update to 0.4

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3-2
- Rebuild for Python 2.6

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-sqlalchemy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Nov 2008 03:58:56 -0000	1.1
+++ .cvsignore	30 Sep 2009 21:09:00 -0000	1.2
@@ -0,0 +1 @@
+zope.sqlalchemy-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-sqlalchemy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Nov 2008 03:58:56 -0000	1.1
+++ sources	30 Sep 2009 21:09:00 -0000	1.2
@@ -0,0 +1 @@
+245885dc0923fa36216386867cf450ae  zope.sqlalchemy-0.4.tar.gz



From chkr at fedoraproject.org  Wed Sep 30 21:17:07 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 21:17:07 +0000 (UTC)
Subject: rpms/f-spot/devel
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE,
	1.1 f-spot.spec, 1.93, 1.94
Message-ID: <20090930211707.BC52C11C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20043

Modified Files:
	f-spot.spec 
Added Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
  was not installed (BZ 526563)
- Minor spec file beautification


0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch:
 SoftFocus.cs |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch ---
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..a85e48c 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -108,7 +105,7 @@ namespace FSpot.Widgets {
 			RadialGradient circle;
 
 			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
+			if (Cairo.CairoAPI.Version > (1 * 10000 + 2 * 100 + 0)) {
 				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
 							     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- f-spot.spec	22 Sep 2009 22:08:57 -0000	1.93
+++ f-spot.spec	30 Sep 2009 21:17:07 -0000	1.94
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -16,7 +16,10 @@ Patch3:         0002-enhance-the-f-spot-
 # upstream patch to fix crash in facebook exporter:
 # commit 807dab4344ecdadc7e46793369821de8b49692e5
 # commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch        
+Patch4:         facebook-exporter-duplicate-label-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=596922
+Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -70,6 +73,7 @@ photo collection in a slideshow as a scr
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -b .faceboox-exporter-crash
+%patch5 -p1 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -143,26 +147,31 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
+- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
+  was not installed (BZ 526563)
+- Minor spec file beautification
+
 * Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
-- add upstream patches (
+- Add upstream patches (
   commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
   commit 807dab4344ecdadc7e46793369821de8b49692e5 )
   to fix crash in facebook exporter (BZ 524860)
 
 * Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
-- update to 0.6.1.2 (BZ 519290)
+- Update to 0.6.1.2 (BZ 519290)
 
 * Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
-- move the screensaver plugin into a sub-package (BZ 519640)
-- let f-spot-screensaver obsolete older f-spot version so that it
+- Move the screensaver plugin into a sub-package (BZ 519640)
+- Let f-spot-screensaver obsolete older f-spot version so that it
   is pulled in during update (fresh installations of f-spot will not
   pull in gnome-screensaver)
 
 * Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
-- update to 0.6.1.1
-- remove upstreamed patch
-- updated use-system-Mono.Addins-if-available patch
-- add a patch to enable parallel build 
+- Update to 0.6.1.1
+- Remove upstreamed patch
+- Updated use-system-Mono.Addins-if-available patch
+- Add a patch to enable parallel build 
 
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
 - Build arch ppc64.



From dwalsh at fedoraproject.org  Wed Sep 30 21:20:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Sep 2009 21:20:46 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.95,
	1.96 selinux-policy.spec, 1.932, 1.933
Message-ID: <20090930212046.E40B111C043C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20661

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-16
- Fix minimum policy installs
- Allow udev and rpcbind to request the kernel to load modules


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 ++
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 ++
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 ++
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 ++
 policy/modules/services/corosync.te       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 -
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 +
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    2 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 ++++++
 policy/modules/system/selinuxutil.te      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 331 files changed, 15543 insertions(+), 2596 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- policy-F12.patch	30 Sep 2009 20:18:00 -0000	1.95
+++ policy-F12.patch	30 Sep 2009 21:20:46 -0000	1.96
@@ -16782,6 +16782,17 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an rpcbind environment
  ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.6.32/policy/modules/services/rpcbind.te
+--- nsaserefpolicy/policy/modules/services/rpcbind.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/rpcbind.te	2009-09-30 17:16:58.000000000 -0400
+@@ -42,6 +42,7 @@
+ 
+ kernel_read_system_state(rpcbind_t)
+ kernel_read_network_state(rpcbind_t)
++kernel_request_load_module(rpcbind_t)
+ 
+ corenet_all_recvfrom_unlabeled(rpcbind_t)
+ corenet_all_recvfrom_netlabel(rpcbind_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.32/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/rpc.if	2009-09-30 16:12:48.000000000 -0400
@@ -25801,7 +25812,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-30 17:17:54.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;
@@ -25810,7 +25821,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow udev_t udev_exec_t:file write;
  can_exec(udev_t, udev_exec_t)
-@@ -66,6 +67,7 @@
+@@ -66,9 +67,11 @@
  
  manage_dirs_pattern(udev_t, udev_var_run_t, udev_var_run_t)
  manage_files_pattern(udev_t, udev_var_run_t, udev_var_run_t)
@@ -25818,7 +25829,11 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(udev_t, udev_var_run_t, { dir file })
  
  kernel_read_system_state(udev_t)
-@@ -111,6 +113,7 @@
++kernel_request_load_module(udev_t)
+ kernel_getattr_core_if(udev_t)
+ kernel_use_fds(udev_t)
+ kernel_read_device_sysctls(udev_t)
+@@ -111,6 +114,7 @@
  
  fs_getattr_all_fs(udev_t)
  fs_list_inotifyfs(udev_t)
@@ -25826,7 +25841,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mcs_ptrace_all(udev_t)
  
-@@ -140,6 +143,7 @@
+@@ -140,6 +144,7 @@
  logging_send_audit_msgs(udev_t)
  
  miscfiles_read_localization(udev_t)
@@ -25834,7 +25849,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(udev_t)
  # read modules.inputmap:
-@@ -194,6 +198,10 @@
+@@ -194,6 +199,10 @@
  ')
  
  optional_policy(`
@@ -25845,7 +25860,7 @@ diff -b -B --ignore-all-space --exclude-
  	brctl_domtrans(udev_t)
  ')
  
-@@ -202,14 +210,27 @@
+@@ -202,14 +211,27 @@
  ')
  
  optional_policy(`
@@ -25873,7 +25888,7 @@ diff -b -B --ignore-all-space --exclude-
  	lvm_domtrans(udev_t)
  ')
  
-@@ -219,6 +240,7 @@
+@@ -219,6 +241,7 @@
  
  optional_policy(`
  	hal_dgram_send(udev_t)
@@ -25881,7 +25896,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -228,6 +250,10 @@
+@@ -228,6 +251,10 @@
  ')
  
  optional_policy(`
@@ -25892,7 +25907,7 @@ diff -b -B --ignore-all-space --exclude-
  	openct_read_pid_files(udev_t)
  	openct_domtrans(udev_t)
  ')
-@@ -242,6 +268,18 @@
+@@ -242,6 +269,18 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -p -r1.932 -r1.933
--- selinux-policy.spec	30 Sep 2009 20:20:30 -0000	1.932
+++ selinux-policy.spec	30 Sep 2009 21:20:46 -0000	1.933
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -448,6 +448,10 @@ exit 0
 %endif
 
 %changelog
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-16
+- Fix minimum policy installs
+- Allow udev and rpcbind to request the kernel to load modules
+
 * Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-15
 - Add plymouth policy
 - Allow local_login to sys_admin



From maxx at fedoraproject.org  Wed Sep 30 21:21:04 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 30 Sep 2009 21:21:04 +0000 (UTC)
Subject: rpms/libgtkhotkey/F-11 libgtkhotkey.spec, NONE,
	1.1 libgtkhotkey_doc_prefix.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930212104.7CC7311C00E6@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/libgtkhotkey/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20797

Modified Files:
	.cvsignore sources 
Added Files:
	libgtkhotkey.spec libgtkhotkey_doc_prefix.patch 
Log Message:
Initial import of libgtkhotkey


--- NEW FILE libgtkhotkey.spec ---
Name:           libgtkhotkey
Version:        0.2.1
Release:        3%{?dist}
Summary:        Platform independent hotkey handling for Gtk+ applications

Group:          System Environment/Libraries
License:        LGPLv3 
URL:            https://launchpad.net/gtkhotkey
Source0:        http://launchpad.net/gtkhotkey/0.2/%{version}/+download/gtkhotkey-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Use datadir instead of prefix to install documentation
# patch mailed to author on 2009-09-22
Patch0:         libgtkhotkey_doc_prefix.patch

BuildRequires:  gtk2-devel, intltool, pkgconfig

%description
Platform independent hotkey handling for Gtk+ applications

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n gtkhotkey-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Remove the docs installed by the package itself. Docs will be handled by the rpm %doc directive
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gtkhotkey


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/gtkhotkey
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sun Sep 27 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-3
- Let rpm handle doc installation to get properly versioned doc dir

* Sat Sep 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-2
- Add intltool and pkgconfig to BuildRequires

* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.1-1
- Initial packaging


libgtkhotkey_doc_prefix.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libgtkhotkey_doc_prefix.patch ---
diff -u -r gtkhotkey-0.2.1/Makefile.am gtkhotkey-0.2.1.new/Makefile.am
--- gtkhotkey-0.2.1/Makefile.am	2009-09-03 22:52:49.000000000 +0200
+++ gtkhotkey-0.2.1.new/Makefile.am	2009-09-22 20:15:01.883750783 +0200
@@ -11,7 +11,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtkhotkey-1.0.pc
 
-gtkhotkeydocdir = ${prefix}/doc/gtkhotkey
+gtkhotkeydocdir = ${datadir}/doc/gtkhotkey
 gtkhotkeydoc_DATA = \
 	README			\
 	COPYING			\
diff -u -r gtkhotkey-0.2.1/Makefile.in gtkhotkey-0.2.1.new/Makefile.in
--- gtkhotkey-0.2.1/Makefile.in	2009-09-03 22:53:33.000000000 +0200
+++ gtkhotkey-0.2.1.new/Makefile.in	2009-09-22 20:15:44.598750932 +0200
@@ -246,7 +246,7 @@
 SUBDIRS = src po test doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtkhotkey-1.0.pc
-gtkhotkeydocdir = ${prefix}/doc/gtkhotkey
+gtkhotkeydocdir = ${datadir}/doc/gtkhotkey
 gtkhotkeydoc_DATA = \
 	README			\
 	COPYING			\


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgtkhotkey/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:04:14 -0000	1.1
+++ .cvsignore	30 Sep 2009 21:21:04 -0000	1.2
@@ -0,0 +1 @@
+gtkhotkey-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgtkhotkey/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:04:14 -0000	1.1
+++ sources	30 Sep 2009 21:21:04 -0000	1.2
@@ -0,0 +1 @@
+bfdc73e68e9adbe0d506d31a25862914  gtkhotkey-0.2.1.tar.gz



From nsantos at fedoraproject.org  Wed Sep 30 21:23:20 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 30 Sep 2009 21:23:20 +0000 (UTC)
Subject: rpms/qpidc/F-11 qpidc.spec,1.87,1.88
Message-ID: <20090930212321.07E2E11C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21109

Modified Files:
	qpidc.spec 
Log Message:
include i586 arch


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- qpidc.spec	30 Sep 2009 19:59:04 -0000	1.87
+++ qpidc.spec	30 Sep 2009 21:23:20 -0000	1.88
@@ -12,7 +12,7 @@
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -46,7 +46,7 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
 
-%ifarch i686 x86_64
+%ifarch i586 i686 x86_64
 #RHM
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
@@ -215,7 +215,7 @@ Requires: qpidc = %version-%release
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
-%ifarch i686 x86_64
+%ifarch i586 i686 x86_64
 #RHM
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
@@ -264,7 +264,7 @@ done
 popd
 popd
 
-%ifarch i686 x86_64
+%ifarch i586 i686 x86_64
 #RHM
 pushd ../rhm-0.5.%{rhm_svnrev}
 export CXXFLAGS="%{optflags} -DNDEBUG" 
@@ -316,7 +316,7 @@ rm -fr %{buildroot}%_libexecdir/qpid/tes
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
 popd
 
-%ifarch i686 x86_64
+%ifarch i586 i686 x86_64
 #RHM
 pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 make install DESTDIR=%{buildroot}
@@ -342,7 +342,7 @@ rm -rf %{buildroot}
 #LANG=C ECHO=echo make check
 #popd
 
-%ifarch i686 x86_64
+%ifarch i586 i686 x86_64
 #RHM
 #pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 #make check
@@ -473,7 +473,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc cpp/docs/api/html
 
-%ifarch i686 x86_64
+%ifarch i586 i686 x86_64
 %files -n rhm-cpp-server-store
 %defattr(-,root,root,-)
 %doc ../rhm-0.5.%{rhm_svnrev}/README 



From jwrdegoede at fedoraproject.org  Wed Sep 30 21:30:34 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 30 Sep 2009 21:30:34 +0000 (UTC)
Subject: rpms/xfig/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xfig.spec,
	1.65, 1.66 xfig-3.2.4-redhat.patch, 1.3,
	NONE xfig-3.2.5-color-resources.patch, 1.2,
	NONE xfig-3.2.5-missing-protos.patch, 1.2,
	NONE xfig-3.2.5-mkstemp.diff, 1.2,
	NONE xfig-3.2.5-rh490257.patch, 1.2,
	NONE xfig-3.2.5-rh490259.patch, 1.3,
	NONE xfig-3.2.5-rh494193.patch, 1.1,
	NONE xfig-3.2.5-zoom-crash.patch, 1.2, NONE
Message-ID: <20090930213034.1073B11C01EA@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23544

Modified Files:
	.cvsignore sources xfig.spec 
Removed Files:
	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch 
	xfig-3.2.5-missing-protos.patch xfig-3.2.5-mkstemp.diff 
	xfig-3.2.5-rh490257.patch xfig-3.2.5-rh490259.patch 
	xfig-3.2.5-rh494193.patch xfig-3.2.5-zoom-crash.patch 
Log Message:
* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-23.b
- New upstream 3.2.5b release
- Drop many merged patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Mar 2009 09:00:01 -0000	1.6
+++ .cvsignore	30 Sep 2009 21:30:32 -0000	1.7
@@ -1 +1 @@
-xfig.3.2.5a.tar.gz
+xfig.3.2.5b.full.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Mar 2009 09:00:01 -0000	1.6
+++ sources	30 Sep 2009 21:30:32 -0000	1.7
@@ -1 +1 @@
-20e8774f9cbaaf314ddf515110641a52  xfig.3.2.5a.tar.gz
+499b0ce103a6b353453bf7e327f9a3b9  xfig.3.2.5b.full.tar.gz


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xfig.spec	27 Jul 2009 07:59:56 -0000	1.65
+++ xfig.spec	30 Sep 2009 21:30:33 -0000	1.66
@@ -3,32 +3,22 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 22.a%{?dist}
+Release: 23.b%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
-# The new upstream 3.2.5a release was made available to me (Hans) by the Debian
-# maintainer who is in contact with upstream, which appearantly is still
-# somewhat alive (but not alive enough to put the tarbal on the homepage ??)
-Source0: xfig.%{version}a.tar.gz
+Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}b.full.tar.gz
 Source1: xfig.png
 Source2: xfig.desktop
 Source3: xfig.sh
 
 Patch0: xfig-3.2.5a-default-apps.patch
 Patch1: xfig-3.2.5-fhs.patch
-Patch2: xfig-3.2.5-mkstemp.diff
 Patch7: xfig.3.2.5-modularX.patch
 Patch9: xfig.3.2.5-Xaw3d.patch
 Patch10: xfig-3.2.5-enable-Xaw3d.patch
-Patch11: xfig-3.2.5-color-resources.patch
 Patch13: xfig-3.2.5-urwfonts.patch
-Patch14: xfig-3.2.5-zoom-crash.patch
-Patch15: xfig-3.2.5-missing-protos.patch
-Patch17: xfig-3.2.5-rh490257.patch
-Patch18: xfig-3.2.5-rh490259.patch
 Patch19: xfig-3.2.5-debian.patch
-Patch20: xfig-3.2.5-rh494193.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -94,22 +84,17 @@ Files common to both the plain Xaw and t
 
 
 %prep
-%setup -q -n xfig.%{version}a
+%setup -q -n xfig.%{version}b
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .fhs
-%patch2 -p1 -b .mkstemp
 %patch7 -p1 -b .modularX
 %patch9 -p1 -b .Xaw3d
 %patch10 -p1 -b .no-Xaw3d
-%patch11 -p1 -b .color-resources
 %patch13 -p1 -b .urw
-%patch14 -p1 -b .zoom-crash
-%patch15 -p1
-%patch17 -p1
-%patch18 -p1
 %patch19 -p1
-%patch20 -p1
+iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES
 rm Doc/html/images/sav1a0.tmp
+chmod -x `find -type f`
 
 
 %build
@@ -199,6 +184,10 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-23.b
+- New upstream 3.2.5b release
+- Drop many merged patches
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-22.a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xfig-3.2.4-redhat.patch DELETED ---


--- xfig-3.2.5-color-resources.patch DELETED ---


--- xfig-3.2.5-missing-protos.patch DELETED ---


--- xfig-3.2.5-mkstemp.diff DELETED ---


--- xfig-3.2.5-rh490257.patch DELETED ---


--- xfig-3.2.5-rh490259.patch DELETED ---


--- xfig-3.2.5-rh494193.patch DELETED ---


--- xfig-3.2.5-zoom-crash.patch DELETED ---



From kevin at fedoraproject.org  Wed Sep 30 21:34:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 21:34:56 +0000 (UTC)
Subject: rpms/exo/devel exo.spec,1.38,1.39
Message-ID: <20090930213456.BB76211C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25929

Modified Files:
	exo.spec 
Log Message:
Use touch -r trick to fix multilib issue



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- exo.spec	10 Sep 2009 05:00:00 -0000	1.38
+++ exo.spec	30 Sep 2009 21:34:56 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 4%{?dist}
+Release: 5%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -78,6 +78,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
+touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
+touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
+
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -140,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
+- Use touch -r trick to fix multilib issue
+
 * Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
 - Mount vfat and ntfs volumes with UTF-8 (#508823)
 - Mount ntfs with ntfs-3g



From lmacken at fedoraproject.org  Wed Sep 30 21:39:45 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 30 Sep 2009 21:39:45 +0000 (UTC)
Subject: rpms/python-tg-devtools/devel import.log, NONE,
	1.1 python-tg-devtools-sa05.patch, NONE,
	1.1 python-tg-devtools-test_admin.patch, NONE,
	1.1 python-tg-devtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090930213945.127F411C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tg-devtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27422/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-tg-devtools-sa05.patch 
	python-tg-devtools-test_admin.patch python-tg-devtools.spec 
Log Message:
Initial import of python-tg-devtools (#468804)


--- NEW FILE import.log ---
python-tg-devtools-2_0_2-2_fc11:HEAD:python-tg-devtools-2.0.2-2.fc11.src.rpm:1254331978

python-tg-devtools-sa05.patch:
 test_pastetemplate.py |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE python-tg-devtools-sa05.patch ---
--- devtools/tests/test_pastetemplate.py.orig	2009-06-17 19:31:23.000000000 -0400
+++ devtools/tests/test_pastetemplate.py	2009-06-17 19:31:26.000000000 -0400
@@ -1,3 +1,6 @@
+__requires__ = ['SQLAlchemy>=0.5', 'sqlalchemy-migrate>=0.5.1']
+import pkg_resources
+
 from devtools.pastetemplate import TurboGearsTemplate
 import os, shutil, urllib
 import pkg_resources

python-tg-devtools-test_admin.patch:
 test_pastetemplate.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE python-tg-devtools-test_admin.patch ---
--- devtools/tests/test_pastetemplate.py.orig	2009-06-03 10:41:04.000000000 -0400
+++ devtools/tests/test_pastetemplate.py	2009-06-03 10:41:13.000000000 -0400
@@ -1,5 +1,5 @@
 from devtools.pastetemplate import TurboGearsTemplate
-import os, shutil
+import os, shutil, urllib
 import pkg_resources
 from paste.deploy import loadapp
 from webtest import TestApp
@@ -66,10 +66,8 @@
         assert '<div id="loginform">' in resp
 
     def test_admin(self):
-        resp = self.app.get('/admin/')
-        print resp
-        assert 'This is a fully-configurable administrative tool to help you administer your website.' in resp
-        assert '<li><a href="group/">Groups</a></li><li><a href="user/">Users</a></li><li><a href="permission/">Permissions</a></li>' in resp
+        resp = self.app.get('/admin/', status=302)
+        assert 'The current user must belong to the group \\"managers\\"' in urllib.unquote(resp.cookies_set['webflash'])
 
 #now we run the quickstarted project nosetests
 #FIXME, we need a better implementation


--- NEW FILE python-tg-devtools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tg-devtools
Version:        2.0.2
Release:        2%{?dist}
Summary:        Development tools and templates for TurboGears2

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://www.turbogears.org/2.0/downloads/current/tg.devtools-%{version}.tar.gz
Patch0:         %{name}-test_admin.patch
Patch1:         %{name}-sa05.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-nose python-coverage
BuildRequires:  python-repoze-tm2 python-turbokid python-turbojson
BuildRequires:  python-repoze-what-quickstart python-catwalk
BuildRequires:  python-zope-sqlalchemy

BuildRequires:  python-paste-script python-tempita python-webtest
BuildRequires:  python-migrate0.5 python-repoze-who python-repoze-who-testutil
BuildRequires:  python-babel
BuildRequires:  TurboGears2

Requires:       TurboGears2
Requires:       python-repoze-what-quickstart >= 1.0
Requires:       python-repoze-who >= 1.0.10
Requires:       python-repoze-who-testutil
Requires:       python-catwalk

%if 0%{?fedora} <= 6
Requires:       python-sqlite2
BuildRequires:  python-sqlite2
BuildRequires:  python-hashlib
Requires:       python-hashlib
%endif

%if 0%{?fedora} > 10
Requires:       python-sqlalchemy
Requires:       python-migrate
%else
BuildRequires:  python-sqlalchemy0.5
BuildRequires:  python-migrate0.5

# Including these to hack around some setuptools bugs...
BuildRequires:  python-sqlalchemy
BuildRequires:  python-migrate

Requires:       python-sqlalchemy0.5
Requires:       python-migrate0.5
%endif

%description
This package contains various paster commands and templates used for
TurboGears2 development.


%prep
%setup -q -n tg.devtools-%{version}
%patch0 -p0 -b .test_admin
%patch1 -p0 -b .sqlalchemy


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


%check
PYTHONPATH=$(pwd) %{__python} devtools/tests/test_pastetemplate.py

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/devtools/
%{python_sitelib}/tg.devtools-%{version}-py%{pyver}.egg-info/



%changelog
* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-2
- Update SQLAlchemy0.5 patch
- Include both version of SQLAlchemy to get the test suite to run

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- 2.0.2

* Fri Jun 26 2009 Luke Macken <lmacken at redhat.com> - 2.0-9
- Update the sa05 patch to work with sqlalchemy-migrate 0.4 and 0.5

* Tue Jun 23 2009 Luke Macken <lmacken at redhat.com> - 2.0-8
- Hack around a setuptools bug to get the test suite to pass
  with both SQLAlchemy 0.4 and 0.5 installed in the same site-packages

* Wed Jun 17 2009 Luke Macken <lmacken at redhat.com> - 2.0-7
- Add a patch to get things working with SQLAlchemy 0.5

* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 2.0-6
- Add a patch to "fix" the test_pastetemplate.TestQuickStart.test_admin unit test
- Enable the test suite.

* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 2.0-5
- Add python-catwalk to the BuildRequires
- Require python-hashlib on FC6 and below.

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-4
- Conditionally require python-sqlite2

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-3
- Require python-catwalk

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-2
- Require python-repoze-who-testutil

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> - 2.0-1
- Update to 2.0 final
- Sync our requirements
- Remove the setuptools wsgiref patch
- Disable unit tests until Catwalk is packaged

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> - 1.9.7-0.2.a4
- Swap out tg.ext.repoze.who for tgext.authorization

* Sun Oct 26 2008 Luke Macken <lmacken at redhat.com> - 1.9.7-0.1.a4
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:54:28 -0000	1.1
+++ .cvsignore	30 Sep 2009 21:39:44 -0000	1.2
@@ -0,0 +1 @@
+tg.devtools-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:54:28 -0000	1.1
+++ sources	30 Sep 2009 21:39:44 -0000	1.2
@@ -0,0 +1 @@
+0aa191ec9f98158f977a82ca841f93af  tg.devtools-2.0.2.tar.gz



From gavin at fedoraproject.org  Wed Sep 30 21:44:38 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Wed, 30 Sep 2009 21:44:38 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.8, 1.9 etoys.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20090930214438.BDDA611C00E6@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28918

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to upstream 4.0.2319



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2009 13:44:24 -0000	1.8
+++ .cvsignore	30 Sep 2009 21:44:38 -0000	1.9
@@ -1 +1 @@
-etoys-4.0.2279.tar.gz
+etoys-4.0.2319.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- etoys.spec	12 Sep 2009 13:44:24 -0000	1.9
+++ etoys.spec	30 Sep 2009 21:44:38 -0000	1.10
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2279
+%define version 4.0.2319
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -89,7 +89,7 @@ update-desktop-database &> /dev/null || 
 %endif
 %doc ChangeLog LICENSE NOTICE README
 %dir %{_datadir}/etoys
-%{_datadir}/etoys/EtoysActivity.017.pr
+%{_datadir}/etoys/Home.004.pr
 %{_datadir}/etoys/EtoysV4.sources
 %{_datadir}/etoys/ExampleEtoys
 %{_datadir}/etoys/Gallery.024.pr
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Sep 30 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2319-1
+- lastest upstream release 4.0.2319	
+
 * Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1
 - lastest upstream release 4.0.2279	
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 13:44:24 -0000	1.8
+++ sources	30 Sep 2009 21:44:38 -0000	1.9
@@ -1 +1 @@
-77701b44a106f1316bed3b2c09319a50  etoys-4.0.2279.tar.gz
+604ba19acf9260ffd4650e6ff4234450  etoys-4.0.2319.tar.gz



From jwrdegoede at fedoraproject.org  Wed Sep 30 21:46:31 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 30 Sep 2009 21:46:31 +0000 (UTC)
Subject: rpms/gnotime/devel gnotime.spec,1.33,1.34
Message-ID: <20090930214631.6821311C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29224

Modified Files:
	gnotime.spec 
Log Message:
* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> - 2.3.0-6
- Really fix FTBFS



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gnotime.spec	30 Jul 2009 12:46:29 -0000	1.33
+++ gnotime.spec	30 Sep 2009 21:46:31 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -44,6 +44,9 @@ been split out, renamed, and greatly enh
 sed -i 's/\(Icon=.*\)\.png/\1/' gnotime.desktop.in
 
 %build
+# Work around broken auto foo stuff
+export LIBGNOMEUI_CFLAGS="$(pkg-config libgnomeui-2.0 --cflags)"
+export LIBGNOMEUI_LIBS="$(pkg-config libgnomeui-2.0 --libs)"
 # Test that the next release of gnotime can build with --disable-schemas-install
 # That should allow us to get rid of the GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 # stuff.
@@ -111,6 +114,9 @@ scrollkeeper-update -q || :
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> - 2.3.0-6
+- Really fix FTBFS
+
 * Thu Jul 30 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.0-5
 - Add libgnomeui-devel BR to fix FTBFS.
 



From jwrdegoede at fedoraproject.org  Wed Sep 30 21:48:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 30 Sep 2009 21:48:32 +0000 (UTC)
Subject: rpms/gnotime/F-12 gnotime.spec,1.33,1.34
Message-ID: <20090930214832.87FD011C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnotime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30301

Modified Files:
	gnotime.spec 
Log Message:
* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> - 2.3.0-6
- Really fix FTBFS



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/F-12/gnotime.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gnotime.spec	30 Jul 2009 12:46:29 -0000	1.33
+++ gnotime.spec	30 Sep 2009 21:48:32 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -44,6 +44,9 @@ been split out, renamed, and greatly enh
 sed -i 's/\(Icon=.*\)\.png/\1/' gnotime.desktop.in
 
 %build
+# Work around broken auto foo stuff
+export LIBGNOMEUI_CFLAGS="$(pkg-config libgnomeui-2.0 --cflags)"
+export LIBGNOMEUI_LIBS="$(pkg-config libgnomeui-2.0 --libs)"
 # Test that the next release of gnotime can build with --disable-schemas-install
 # That should allow us to get rid of the GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 # stuff.
@@ -111,6 +114,9 @@ scrollkeeper-update -q || :
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Sep 30 2009 Hans de Goede <hdegoede at redhat.com> - 2.3.0-6
+- Really fix FTBFS
+
 * Thu Jul 30 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.0-5
 - Add libgnomeui-devel BR to fix FTBFS.
 



From hvad at fedoraproject.org  Wed Sep 30 21:53:24 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Wed, 30 Sep 2009 21:53:24 +0000 (UTC)
Subject: rpms/perl-Config-Model/F-12 import.log,1.1,1.2
Message-ID: <20090930215324.6BFEC11C00E6@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Config-Model/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31050/F-12

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Aug 2009 17:38:29 -0000	1.1
+++ import.log	30 Sep 2009 21:53:24 -0000	1.2
@@ -1 +1,2 @@
 perl-Config-Model-0_638-4_fc10:HEAD:perl-Config-Model-0.638-4.fc10.src.rpm:1249328598
+perl-Config-Model-0_638-4_fc10:F-12:perl-Config-Model-0.638-4.fc10.src.rpm:1254354625



From kevin at fedoraproject.org  Wed Sep 30 21:55:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 21:55:38 +0000 (UTC)
Subject: rpms/exo/F-12 exo.spec,1.38,1.39
Message-ID: <20090930215538.6150411C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32039

Modified Files:
	exo.spec 
Log Message:
Use touch -r trick to fix multilib issue



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/F-12/exo.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- exo.spec	10 Sep 2009 05:00:00 -0000	1.38
+++ exo.spec	30 Sep 2009 21:55:38 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 4%{?dist}
+Release: 5%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -78,6 +78,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
+touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
+touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
+
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -140,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
+- Use touch -r trick to fix multilib issue
+
 * Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
 - Mount vfat and ntfs volumes with UTF-8 (#508823)
 - Mount ntfs with ntfs-3g



From toshio at fedoraproject.org  Wed Sep 30 21:56:29 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 30 Sep 2009 21:56:29 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-system-zlib.patch, 1.1,
	1.2 deltarpm.spec, 1.32, 1.33
Message-ID: <20090930215629.CECD811C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32238

Modified Files:
	deltarpm-system-zlib.patch deltarpm.spec 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.3.20090913git
- Make building with system zlib selectable at build time.
- Fix cfile_detect_rsync() to detect rsync even if we don't have a zlib capable
  of making rsync-friendly compressed files.


deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++++++------------
 cfile.c  |   30 +++++++++++++++++-------------
 2 files changed, 32 insertions(+), 25 deletions(-)

Index: deltarpm-system-zlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm-system-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- deltarpm-system-zlib.patch	30 Sep 2009 16:59:30 -0000	1.1
+++ deltarpm-system-zlib.patch	30 Sep 2009 21:56:29 -0000	1.2
@@ -1,64 +1,121 @@
-Index: deltarpm-git-20090913/Makefile
-===================================================================
---- deltarpm-git-20090913.orig/Makefile
-+++ deltarpm-git-20090913/Makefile
-@@ -3,10 +3,9 @@ bindir=$(prefix)/bin
- libdir=$(prefix)/lib
+diff -up deltarpm-git-20090913/cfile.c.mine deltarpm-git-20090913/cfile.c
+--- deltarpm-git-20090913/cfile.c.mine	2009-09-30 14:14:01.422201390 -0700
++++ deltarpm-git-20090913/cfile.c	2009-09-30 14:14:04.779201784 -0700
+@@ -17,6 +17,16 @@
+ 
+ #include "cfile.h"
+ 
++/* Unfortunately, we need to know what this flag is whether we have a zlib
++ * which has been modified to include it or not
++ */
++#ifdef Z_RSYNCABLE
++#define CFILE_Z_RSYNCABLE Z_RSYNCABLE
++#else
++/* This is the value from the current patch */
++#define CFILE_Z_RSYNCABLE           0x4000
++#endif
++
+ /*****************************************************************
+  *  generic input/output routines
+  */
+@@ -888,8 +898,12 @@ crunread_un(struct cfile *f, void *buf, 
+ }
+ 
+ 
+-#ifdef Z_RSYNCABLE
+-
++/*
++ * Checks whether a cfile was compressed with the RSYNCABLE flag via amodified
++ * zlib. If so, it changes the cfile->comp to CFILE_COMP_GZ_RSYNC.
++ *
++ * On error, return -1, otherwise return 0.
++ */
+ int
+ cfile_detect_rsync(struct cfile *f)
+ {
+@@ -922,7 +936,7 @@ cfile_detect_rsync(struct cfile *f)
+       cstrm[i].zalloc = 0;
+       cstrm[i].zfree = 0;
+       cstrm[i].opaque = 0;
+-      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
++      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? CFILE_Z_RSYNCABLE : 0)) != Z_OK)
+ 	{
+ 	  if (i)
+ 	    deflateEnd(&cstrm[0]);
+@@ -1053,16 +1067,6 @@ cfile_detect_rsync(struct cfile *f)
+   return comp == -1 ? -1 : 0;
+ }
+ 
+-#else
+-
+-int
+-cfile_detect_rsync(struct cfile *f)
+-{
+-  return -1;
+-}
+-
+-#endif
+-
+ /*****************************************************************
+  *  our open function
+  */
+diff -up deltarpm-git-20090913/Makefile.mine deltarpm-git-20090913/Makefile
+--- deltarpm-git-20090913/Makefile.mine	2009-09-30 14:13:54.161201546 -0700
++++ deltarpm-git-20090913/Makefile	2009-09-30 14:14:09.189200835 -0700
+@@ -4,9 +4,12 @@ libdir=$(prefix)/lib
  mandir=$(prefix)/man
  rpmdumpheader=$(bindir)/rpmdumpheader
--zlibdir=zlib-1.2.2.f-rsyncable
+ zlibdir=zlib-1.2.2.f-rsyncable
++zlibbundled=$(zlibdir)/libz.a
++zlibldflags=$(zlibbundled)
++zlibcppflags=-I$(zlibdir)
  CFLAGS = -fPIC -O2 -Wall -g
 -CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
 -LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
-+CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I.
-+LDLIBS = -lbz2 -lz -llzma
++CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
++LDLIBS = -lbz2 $(zlibldflags) -llzma
  LDFLAGS =
  PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
  
-@@ -14,37 +13,33 @@ all: makedeltarpm applydeltarpm rpmdumph
+@@ -14,31 +17,31 @@ all: makedeltarpm applydeltarpm rpmdumph
  
  python: _deltarpmmodule.so
  
 -makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
-+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o
++makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
  
 -applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
-+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o
++applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
  
 -combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
-+combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o
++combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibbundled)
  
  rpmdumpheader: rpmdumpheader.o
  	$(CC) $(LDFLAGS) $^ -lrpm -o $@
  
 -makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
-+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o
++makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
  
 -applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
-+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o
++applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
  
 -fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
-+fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o
++fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibbundled)
  
 -_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
-+_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o
++_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
  	for ver in $(PYTHONVERS) ; do \
  		if [ ! -f "$$ver/$@" ]; then \
  			mkdir -p $$ver ;\
 -			$(CC) $(CFLAGS) -I/usr/include/$$ver -I$(zlibdir) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
 -			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(zlibdir)/libz.a -llzma -lbz2; \
-+			$(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
-+			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so -lz -llzma -lbz2; \
++			$(CC) $(CFLAGS) -I/usr/include/$$ver $(zlibcppflag) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
++			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
  		fi; \
  	done
  
 -$(zlibdir)/libz.a:
--	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
--
- clean:
- 	rm -f *.o
- 	rm -f makedeltarpm applydeltarpm combinedeltarpm rpmdumpheader makedeltaiso applydeltaiso fragiso
--	cd $(zlibdir) ; make clean
++$(zlibbundled):
+ 	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
  
- install:
- 	mkdir -p $(DESTDIR)$(bindir)
+ clean:


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- deltarpm.spec	30 Sep 2009 16:59:30 -0000	1.32
+++ deltarpm.spec	30 Sep 2009 21:56:29 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.2.20090913git%{?dist}
+Release: 0.3.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -55,13 +55,15 @@ This package contains python bindings fo
 %setup -q -n %{name}-git-20090913
 # Build with system zlib
 %patch0 -p1 -b .zlib
-%{__rm} -rf zlib-1.2.2.f-rsyncable
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix}
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags=''
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} python
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags='' \
+    python
 
 %install
 %{__rm} -rf %{buildroot}
@@ -102,6 +104,11 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.3.20090913git
+- Make building with system zlib selectable at build time.
+- Fix cfile_detect_rsync() to detect rsync even if we don't have a zlib capable
+  of making rsync-friendly compressed files.
+
 * Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
 - Correct prerelease rlease numbering.
 - Build against the system zlib, not the bundled library.  This remedies the



From chkr at fedoraproject.org  Wed Sep 30 22:14:37 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 22:14:37 +0000 (UTC)
Subject: rpms/f-spot/F-12
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE,
	1.1 f-spot.spec, 1.93, 1.94
Message-ID: <20090930221437.44B6011C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4172

Modified Files:
	f-spot.spec 
Added Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
  was not installed (BZ 526563)
- Minor spec file beautification


0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch:
 SoftFocus.cs |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch ---
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..a85e48c 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -108,7 +105,7 @@ namespace FSpot.Widgets {
 			RadialGradient circle;
 
 			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
+			if (Cairo.CairoAPI.Version > (1 * 10000 + 2 * 100 + 0)) {
 				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
 							     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-12/f-spot.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- f-spot.spec	22 Sep 2009 22:08:57 -0000	1.93
+++ f-spot.spec	30 Sep 2009 22:14:36 -0000	1.94
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -16,7 +16,10 @@ Patch3:         0002-enhance-the-f-spot-
 # upstream patch to fix crash in facebook exporter:
 # commit 807dab4344ecdadc7e46793369821de8b49692e5
 # commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch        
+Patch4:         facebook-exporter-duplicate-label-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=596922
+Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -70,6 +73,7 @@ photo collection in a slideshow as a scr
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -b .faceboox-exporter-crash
+%patch5 -p1 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -143,26 +147,31 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
+- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
+  was not installed (BZ 526563)
+- Minor spec file beautification
+
 * Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
-- add upstream patches (
+- Add upstream patches (
   commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
   commit 807dab4344ecdadc7e46793369821de8b49692e5 )
   to fix crash in facebook exporter (BZ 524860)
 
 * Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
-- update to 0.6.1.2 (BZ 519290)
+- Update to 0.6.1.2 (BZ 519290)
 
 * Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
-- move the screensaver plugin into a sub-package (BZ 519640)
-- let f-spot-screensaver obsolete older f-spot version so that it
+- Move the screensaver plugin into a sub-package (BZ 519640)
+- Let f-spot-screensaver obsolete older f-spot version so that it
   is pulled in during update (fresh installations of f-spot will not
   pull in gnome-screensaver)
 
 * Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
-- update to 0.6.1.1
-- remove upstreamed patch
-- updated use-system-Mono.Addins-if-available patch
-- add a patch to enable parallel build 
+- Update to 0.6.1.1
+- Remove upstreamed patch
+- Updated use-system-Mono.Addins-if-available patch
+- Add a patch to enable parallel build 
 
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
 - Build arch ppc64.



From kevin at fedoraproject.org  Wed Sep 30 22:22:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 22:22:03 +0000 (UTC)
Subject: rpms/exo/F-11 exo.spec,1.37,1.38
Message-ID: <20090930222203.1435511C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7105

Modified Files:
	exo.spec 
Log Message:
Use touch -r trick to fix multilib issue



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/F-11/exo.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- exo.spec	10 Sep 2009 05:27:08 -0000	1.37
+++ exo.spec	30 Sep 2009 22:22:02 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 4%{?dist}
+Release: 5%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -78,6 +78,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
+touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
+touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
+
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -140,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
+- Use touch -r trick to fix multilib issue
+
 * Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
 - Mount vfat and ntfs volumes with UTF-8 (#508823)
 - Mount ntfs with ntfs-3g



From pkgdb at fedoraproject.org  Wed Sep 30 22:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:36:01 +0000
Subject: [pkgdb] fife: linuxdonald has requested watchbugzilla
Message-ID: <20090930223601.F406A10F86A@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:36:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:36:06 +0000
Subject: [pkgdb] fife: linuxdonald has requested commit
Message-ID: <20090930223607.15F5310F875@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:36:09 +0000
Subject: [pkgdb] fife: linuxdonald has requested approveacls
Message-ID: <20090930223609.8A3C810F88C@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:36:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:36:39 +0000
Subject: [pkgdb] fife: linuxdonald has given up watchbugzilla
Message-ID: <20090930223639.56D4410F88B@bastion2.fedora.phx.redhat.com>

linuxdonald has given up the watchbugzilla acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:36:43 +0000
Subject: [pkgdb] fife: linuxdonald has given up commit
Message-ID: <20090930223643.98C0F10F86A@bastion2.fedora.phx.redhat.com>

linuxdonald has given up the commit acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:36:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:36:45 +0000
Subject: [pkgdb] fife: linuxdonald has given up approveacls
Message-ID: <20090930223645.C0B1210F88C@bastion2.fedora.phx.redhat.com>

linuxdonald has given up the approveacls acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:37:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:37:05 +0000
Subject: [pkgdb] fife: linuxdonald has requested commit
Message-ID: <20090930223705.B047410F895@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:37:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:37:06 +0000
Subject: [pkgdb] fife: linuxdonald has requested watchbugzilla
Message-ID: <20090930223706.7D90610F8AC@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Wed Sep 30 22:37:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 22:37:06 +0000
Subject: [pkgdb] fife: linuxdonald has requested approveacls
Message-ID: <20090930223706.D36AF10F8B0@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on fife (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fife



From chkr at fedoraproject.org  Wed Sep 30 22:39:42 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 30 Sep 2009 22:39:42 +0000 (UTC)
Subject: rpms/f-spot/F-11
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE,
	1.1 f-spot.spec, 1.92, 1.93
Message-ID: <20090930223942.7C69A11C00E6@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13974

Modified Files:
	f-spot.spec 
Added Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Thu Oct 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
  was not installed (BZ 526563)


0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch:
 SoftFocus.cs |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch ---
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..a85e48c 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -108,7 +105,7 @@ namespace FSpot.Widgets {
 			RadialGradient circle;
 
 			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
+			if (Cairo.CairoAPI.Version > (1 * 10000 + 2 * 100 + 0)) {
 				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
 							     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- f-spot.spec	22 Sep 2009 22:31:40 -0000	1.92
+++ f-spot.spec	30 Sep 2009 22:39:41 -0000	1.93
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -16,7 +16,10 @@ Patch3:         0002-enhance-the-f-spot-
 # upstream patch to fix crash in facebook exporter:
 # commit 807dab4344ecdadc7e46793369821de8b49692e5
 # commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch        
+Patch4:         facebook-exporter-duplicate-label-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=596922
+Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -71,6 +74,7 @@ photo collection in a slideshow as a scr
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -b .faceboox-exporter-crash
+%patch5 -p1 -b .cairo-fix
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -143,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Thu Oct 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
+- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
+  was not installed (BZ 526563)
+
 * Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
 - Add upstream patches (
   commit b87604bc9782bf92f053aaf3ceb739a32f44ea13



From jgarzik at fedoraproject.org  Wed Sep 30 22:44:42 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 30 Sep 2009 22:44:42 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.21,1.22 sources,1.16,1.17
Message-ID: <20090930224442.7788711C00E6@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15937

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- cld.spec	29 Sep 2009 15:23:23 -0000	1.21
+++ cld.spec	30 Sep 2009 22:44:42 -0000	1.22
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.3
-Release:	0.1.g232df337%{?dist}
+Release:	0.2.gaaa8fb15%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 232df337e0063a64315aff67073e1fd69db2b19a
+# pulled from upstream git, commit aaa8fb15a4345cb1da65869e51691ff33549639c
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Sep 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.2.gaaa8fb15
+- update to 0.3git commit aaa8fb15a4345cb1da65869e51691ff33549639c
+
 * Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.1.g232df337
 - update to 0.3git commit 232df337e0063a64315aff67073e1fd69db2b19a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Sep 2009 15:23:23 -0000	1.16
+++ sources	30 Sep 2009 22:44:42 -0000	1.17
@@ -1 +1 @@
-b4a113731e28a5c63efa6dac3bd3620d  cld-0.3git.tar.gz
+c8768b8cc06d56cca404aa3b9dd967e7  cld-0.3git.tar.gz



From jgarzik at fedoraproject.org  Wed Sep 30 22:47:05 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 30 Sep 2009 22:47:05 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.17,1.18 sources,1.10,1.11
Message-ID: <20090930224705.7490311C00E6@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17319

Modified Files:
	chunkd.spec sources 
Log Message:
update to latest upstream


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- chunkd.spec	29 Sep 2009 17:37:59 -0000	1.17
+++ chunkd.spec	30 Sep 2009 22:47:04 -0000	1.18
@@ -1,13 +1,13 @@
 Name:		chunkd
 Version:	0.5
-Release:	0.1.gfa9dd039%{?dist}
+Release:	0.2.g2d9d37d9%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit fa9dd039a2b0e73c564c069dedf0764d160225a0
+# pulled from upstream git, commit 2d9d37d9379e23d8bd696b9c3fd650d7e0f9b022
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
@@ -98,6 +98,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Sep 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.2.g2d9d37d9
+- update source to commit 2d9d37d9379e23d8bd696b9c3fd650d7e0f9b022
+
 * Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.1.gfa9dd039
 - update source to commit fa9dd039a2b0e73c564c069dedf0764d160225a0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Sep 2009 17:37:59 -0000	1.10
+++ sources	30 Sep 2009 22:47:05 -0000	1.11
@@ -1 +1 @@
-3dadaceb6e0e836a2d44a3386861f1b8  chunkd-0.5git.tar.gz
+abc465c19e0882bd3e782a9622d9af16  chunkd-0.5git.tar.gz



From jgarzik at fedoraproject.org  Wed Sep 30 22:50:00 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 30 Sep 2009 22:50:00 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.10,1.11 tabled.spec,1.19,1.20
Message-ID: <20090930225000.BB51911C00E6@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18893

Modified Files:
	sources tabled.spec 
Log Message:
update to latest upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Sep 2009 19:27:28 -0000	1.10
+++ sources	30 Sep 2009 22:50:00 -0000	1.11
@@ -1 +1 @@
-54d05b0581014cdb876b5edfafa9bbb7  tabled-0.4git.tar.gz
+ca512f2d51bdc1a4c0a2eb4a3b017e69  tabled-0.4git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- tabled.spec	29 Sep 2009 19:28:23 -0000	1.19
+++ tabled.spec	30 Sep 2009 22:50:00 -0000	1.20
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.4
-Release:	0.2.g0c7f54dc%{?dist}
+Release:	0.3.g784b42ad%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
+# pulled from upstream git, commit 784b42ad5cd766450c4df93cfb7f91605708dcb1
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
@@ -102,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Sep 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.3.g784b42ad
+- add sources for git commit 784b42ad5cd766450c4df93cfb7f91605708dcb1
+
 * Tue Sep 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.2.g0c7f54dc
 - add sources for git commit 0c7f54dcdb057ba46e7f8406695cd66bfc70b0f2
 



From denis at fedoraproject.org  Wed Sep 30 22:55:43 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 30 Sep 2009 22:55:43 +0000 (UTC)
Subject: rpms/glom/devel .cvsignore, 1.26, 1.27 glom.spec, 1.36, 1.37 sources,
	1.26, 1.27
Message-ID: <20090930225543.9ADF811C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21091

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to upstream 1.12.0. BRs update, library versioning update. Moved examples back into datadir.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	25 Jun 2009 07:53:15 -0000	1.26
+++ .cvsignore	30 Sep 2009 22:55:42 -0000	1.27
@@ -1 +1 @@
-glom-1.10.1.tar.bz2
+glom-1.12.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- glom.spec	25 Jul 2009 00:24:24 -0000	1.36
+++ glom.spec	30 Sep 2009 22:55:42 -0000	1.37
@@ -1,9 +1,9 @@
-%define major_version  1.10
-%define minor_version  1
+%define major_version  1.12
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -12,7 +12,6 @@ URL:            http://www.glom.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bakery-devel >= 2.6.0
 BuildRequires:  desktop-file-utils gettext-devel intltool
 BuildRequires:  libgdamm-devel >= 3.99.14
 BuildRequires:  libxml++-devel >= 2.18.1
@@ -26,11 +25,11 @@ BuildRequires:  iso-codes-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  scrollkeeper
 BuildRequires:  gtksourceviewmm-devel >= 2.0.0
-BuildRequires:  libgda-devel >= 4.0.1
+BuildRequires:  libgda-devel >= 4.0.4
 BuildRequires:  postgresql-server
 BuildRequires:  libgda-postgres-devel
 BuildRequires:  avahi-ui-devel
-BuildRequires:  goocanvasmm-devel >= 0.13.0
+BuildRequires:  goocanvasmm-devel >= 0.14.0
 BuildRequires:  libepc-devel
 
 # Glom curently only supports postgresql well and uses it by default.
@@ -87,7 +86,8 @@ that use the %{name} libraries.
         --disable-update-mime-database \
         --disable-scrollkeeper \
         --with-postgres-utils=/usr/bin \
-        --disable-sqlite
+        --disable-sqlite \
+	--docdir=%{_datadir}/%{name}/examples
 make %{?_smp_mflags}
 
 
@@ -97,11 +97,8 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
-
 desktop-file-install --vendor "" --delete-original         \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
 
 
@@ -140,29 +137,32 @@ scrollkeeper-update -q || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
-%{_libdir}/python?.?/site-packages/%{name}.so
+%{_libdir}/python?.?/site-packages/%{name}*.so
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/mime-info/*
 %{_datadir}/omf/%{name}
 
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib%{name}-1.0.so.*
+%{_libdir}/lib%{name}-%{major_version}.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/glom-1.0
-%{_libdir}/lib%{name}-1.0.so
+%{_includedir}/glom-%{major_version}
+%{_libdir}/lib%{name}-%{major_version}.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 1.12.0-1
+- Update to upstream 1.12.0
+- BRs update, library versioning update
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	25 Jun 2009 07:53:15 -0000	1.26
+++ sources	30 Sep 2009 22:55:42 -0000	1.27
@@ -1 +1 @@
-611a9cc73aadd1ff5fdc4dd81e240822  glom-1.10.1.tar.bz2
+c2a39caea867eb907302fc646e7e097b  glom-1.12.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 30 23:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:07:02 +0000
Subject: [pkgdb] python-pylons (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930230702.EFDDE10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-pylons
kevin has set commit to Approved for 107427 on python-pylons (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-pylons (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-pylons (Fedora EPEL 5)
kevin changed owner of python-pylons in Fedora EPEL 5 to kylev
kevin approved watchbugzilla on python-pylons (Fedora EPEL 5) for lmacken
kevin approved watchcommits on python-pylons (Fedora EPEL 5) for lmacken
kevin approved commit on python-pylons (Fedora EPEL 5) for lmacken
kevin approved build on python-pylons (Fedora EPEL 5) for lmacken
kevin approved approveacls on python-pylons (Fedora EPEL 5) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-pylons



From salimma at fedoraproject.org  Wed Sep 30 23:07:25 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 23:07:25 +0000 (UTC)
Subject: rpms/pure/F-10 pure-init.el, NONE, 1.1 pure.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930230725.8982B11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	pure-init.el pure.spec 
Log Message:
Initial import



--- NEW FILE pure-init.el ---
;; Register pure-mode

(autoload 'pure-mode "pure-mode" "Major mode for editing Pure code." t)
(add-to-list 'auto-mode-alist '("\\.pure$" . pure-mode))

(add-hook 'pure-mode-hook 'turn-on-font-lock)
(add-hook 'pure-eval-mode-hook 'turn-on-font-lock)


--- NEW FILE pure.spec ---
%if %($(pkg-config emacs) ; echo $?)
# This will get overridden by pkg-config; defaulting to the version in F-10
%define emacs_version 22.3
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           pure
Version:        0.35
Release:        1%{?dist}
Summary:        A term-rewriting functional programming language

Group:          Development/Languages
License:        GPLv3+
URL:            http://code.google.com/p/pure-lang/
Source0:        http://pure-lang.googlecode.com/files/pure-%{version}.tar.gz
Source1:        pure-init.el
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gmp-devel readline-devel gsl-devel
# Not checked by configure
BuildRequires:  llvm-devel >= 2.4 flex bison
# For compiling emacs mode
BuildRequires:  emacs emacs-el

# LLVM is not supported on ppc64
ExcludeArch:    ppc64

%description
Pure is a modern-style functional programming language based on term
rewriting. It offers equational definitions with pattern matching,
full symbolic rewriting capabilities, dynamic typing, eager and lazy
evaluation, lexical closures, built-in list and matrix support and an
easy-to-use C interface. The interpreter uses LLVM as a backend to
JIT-compile Pure programs to fast native code.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        doc
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
The %{name}-doc package contains examples for programming in %{name}.

%package -n emacs-pure
Summary:        Vala mode for Emacs
Group:          Applications/Editors
Requires:       emacs(bin) >= %{emacs_version}


%description -n emacs-pure
An Emacs mode for editing Pure source code.


%prep
%setup -q


%build
%ifarch ppc
# http://code.google.com/p/pure-lang/issues/detail?id=13#c47
%configure --disable-fastcc
%else
%configure
%endif

make %{?_smp_mflags}
# Compile emacs module
cd etc && emacs -batch -f batch-byte-compile pure-mode.el


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Emacs mode files
rm etc/*.el.in
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
mv etc/*.el* $RPM_BUILD_ROOT%{emacs_lispdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}


%check
%ifnarch ppc
make check
%else
(make check 2>&1 | tee testlog.txt ; true)
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig



%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README TODO etc
%ifarch ppc
%doc testlog.txt test/test020.*
%endif
%{_bindir}/pure*
%{_libdir}/libpure*.so.*
%exclude %{_libdir}/pure/pure_main.c
%{_libdir}/pure*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/pure*
%{_libdir}/*.so
%{_libdir}/pure/pure_main.c

%files doc
%defattr(-,root,root,-)
%doc examples

%files -n emacs-pure
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el*
%{emacs_startdir}/*



%changelog
* Thu Sep 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.35-1
- Update to 0.35
- Reenable PPC tests

* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-2
- Make tests advisory on ppc for now

* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-1
- Update to 0.34

* Tue Sep  1 2009 Michel Salim <salimma at fedoraproject.org> - 0.33-1
- Update to 0.33

* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.32-1
- Update to 0.32
- Split out -devel and -doc subpackages
- Disable ppc build on Rawhide; massive testcase failures

* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.30-1
- Update to 0.30

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.29-1
- Update to 0.29

* Sun Mar 15 2009 Michel Salim <salimma at fedoraproject.org> - 0.19-1
- Update to 0.19
- Add build dependencies that configure does not check: llvm-devel, flex

* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.18a-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:10:57 -0000	1.1
+++ .cvsignore	30 Sep 2009 23:07:24 -0000	1.2
@@ -0,0 +1 @@
+pure-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:57 -0000	1.1
+++ sources	30 Sep 2009 23:07:25 -0000	1.2
@@ -0,0 +1 @@
+e04f66c6d874b36751b495b1911d6437  pure-0.35.tar.gz



From salimma at fedoraproject.org  Wed Sep 30 23:07:25 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 23:07:25 +0000 (UTC)
Subject: rpms/pure/EL-5 pure-init.el,NONE,1.1 pure.spec,NONE,1.1
Message-ID: <20090930230725.898C711C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055/EL-5

Added Files:
	pure-init.el pure.spec 
Log Message:
Initial import



--- NEW FILE pure-init.el ---
;; Register pure-mode

(autoload 'pure-mode "pure-mode" "Major mode for editing Pure code." t)
(add-to-list 'auto-mode-alist '("\\.pure$" . pure-mode))

(add-hook 'pure-mode-hook 'turn-on-font-lock)
(add-hook 'pure-eval-mode-hook 'turn-on-font-lock)


--- NEW FILE pure.spec ---
%if %($(pkg-config emacs) ; echo $?)
# This will get overridden by pkg-config; defaulting to the version in F-10
%define emacs_version 22.3
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           pure
Version:        0.35
Release:        1%{?dist}
Summary:        A term-rewriting functional programming language

Group:          Development/Languages
License:        GPLv3+
URL:            http://code.google.com/p/pure-lang/
Source0:        http://pure-lang.googlecode.com/files/pure-%{version}.tar.gz
Source1:        pure-init.el
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gmp-devel readline-devel gsl-devel
# Not checked by configure
BuildRequires:  llvm-devel >= 2.4 flex bison
# For compiling emacs mode
BuildRequires:  emacs emacs-el

# LLVM is not supported on ppc64
ExcludeArch:    ppc64

%description
Pure is a modern-style functional programming language based on term
rewriting. It offers equational definitions with pattern matching,
full symbolic rewriting capabilities, dynamic typing, eager and lazy
evaluation, lexical closures, built-in list and matrix support and an
easy-to-use C interface. The interpreter uses LLVM as a backend to
JIT-compile Pure programs to fast native code.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        doc
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
The %{name}-doc package contains examples for programming in %{name}.

%package -n emacs-pure
Summary:        Vala mode for Emacs
Group:          Applications/Editors
Requires:       emacs(bin) >= %{emacs_version}


%description -n emacs-pure
An Emacs mode for editing Pure source code.


%prep
%setup -q


%build
%ifarch ppc
# http://code.google.com/p/pure-lang/issues/detail?id=13#c47
%configure --disable-fastcc
%else
%configure
%endif

make %{?_smp_mflags}
# Compile emacs module
cd etc && emacs -batch -f batch-byte-compile pure-mode.el


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Emacs mode files
rm etc/*.el.in
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
mv etc/*.el* $RPM_BUILD_ROOT%{emacs_lispdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}


%check
%ifnarch ppc
make check
%else
(make check 2>&1 | tee testlog.txt ; true)
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig



%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README TODO etc
%ifarch ppc
%doc testlog.txt test/test020.*
%endif
%{_bindir}/pure*
%{_libdir}/libpure*.so.*
%exclude %{_libdir}/pure/pure_main.c
%{_libdir}/pure*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/pure*
%{_libdir}/*.so
%{_libdir}/pure/pure_main.c

%files doc
%defattr(-,root,root,-)
%doc examples

%files -n emacs-pure
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el*
%{emacs_startdir}/*



%changelog
* Thu Sep 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.35-1
- Update to 0.35
- Reenable PPC tests

* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-2
- Make tests advisory on ppc for now

* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-1
- Update to 0.34

* Tue Sep  1 2009 Michel Salim <salimma at fedoraproject.org> - 0.33-1
- Update to 0.33

* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.32-1
- Update to 0.32
- Split out -devel and -doc subpackages
- Disable ppc build on Rawhide; massive testcase failures

* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.30-1
- Update to 0.30

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.29-1
- Update to 0.29

* Sun Mar 15 2009 Michel Salim <salimma at fedoraproject.org> - 0.19-1
- Update to 0.19
- Add build dependencies that configure does not check: llvm-devel, flex

* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.18a-1
- Initial package




From salimma at fedoraproject.org  Wed Sep 30 23:07:25 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 23:07:25 +0000 (UTC)
Subject: rpms/pure/F-12 pure-init.el, NONE, 1.1 pure.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930230725.E733411C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	pure-init.el pure.spec 
Log Message:
Initial import



--- NEW FILE pure-init.el ---
;; Register pure-mode

(autoload 'pure-mode "pure-mode" "Major mode for editing Pure code." t)
(add-to-list 'auto-mode-alist '("\\.pure$" . pure-mode))

(add-hook 'pure-mode-hook 'turn-on-font-lock)
(add-hook 'pure-eval-mode-hook 'turn-on-font-lock)


--- NEW FILE pure.spec ---
%if %($(pkg-config emacs) ; echo $?)
# This will get overridden by pkg-config; defaulting to the version in F-10
%define emacs_version 22.3
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           pure
Version:        0.35
Release:        1%{?dist}
Summary:        A term-rewriting functional programming language

Group:          Development/Languages
License:        GPLv3+
URL:            http://code.google.com/p/pure-lang/
Source0:        http://pure-lang.googlecode.com/files/pure-%{version}.tar.gz
Source1:        pure-init.el
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gmp-devel readline-devel gsl-devel
# Not checked by configure
BuildRequires:  llvm-devel >= 2.4 flex bison
# For compiling emacs mode
BuildRequires:  emacs emacs-el

# LLVM is not supported on ppc64
ExcludeArch:    ppc64

%description
Pure is a modern-style functional programming language based on term
rewriting. It offers equational definitions with pattern matching,
full symbolic rewriting capabilities, dynamic typing, eager and lazy
evaluation, lexical closures, built-in list and matrix support and an
easy-to-use C interface. The interpreter uses LLVM as a backend to
JIT-compile Pure programs to fast native code.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        doc
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
The %{name}-doc package contains examples for programming in %{name}.

%package -n emacs-pure
Summary:        Vala mode for Emacs
Group:          Applications/Editors
Requires:       emacs(bin) >= %{emacs_version}


%description -n emacs-pure
An Emacs mode for editing Pure source code.


%prep
%setup -q


%build
%ifarch ppc
# http://code.google.com/p/pure-lang/issues/detail?id=13#c47
%configure --disable-fastcc
%else
%configure
%endif

make %{?_smp_mflags}
# Compile emacs module
cd etc && emacs -batch -f batch-byte-compile pure-mode.el


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Emacs mode files
rm etc/*.el.in
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
mv etc/*.el* $RPM_BUILD_ROOT%{emacs_lispdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}


%check
%ifnarch ppc
make check
%else
(make check 2>&1 | tee testlog.txt ; true)
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig



%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README TODO etc
%ifarch ppc
%doc testlog.txt test/test020.*
%endif
%{_bindir}/pure*
%{_libdir}/libpure*.so.*
%exclude %{_libdir}/pure/pure_main.c
%{_libdir}/pure*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/pure*
%{_libdir}/*.so
%{_libdir}/pure/pure_main.c

%files doc
%defattr(-,root,root,-)
%doc examples

%files -n emacs-pure
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el*
%{emacs_startdir}/*



%changelog
* Thu Sep 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.35-1
- Update to 0.35
- Reenable PPC tests

* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-2
- Make tests advisory on ppc for now

* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-1
- Update to 0.34

* Tue Sep  1 2009 Michel Salim <salimma at fedoraproject.org> - 0.33-1
- Update to 0.33

* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.32-1
- Update to 0.32
- Split out -devel and -doc subpackages
- Disable ppc build on Rawhide; massive testcase failures

* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.30-1
- Update to 0.30

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.29-1
- Update to 0.29

* Sun Mar 15 2009 Michel Salim <salimma at fedoraproject.org> - 0.19-1
- Update to 0.19
- Add build dependencies that configure does not check: llvm-devel, flex

* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.18a-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:10:57 -0000	1.1
+++ .cvsignore	30 Sep 2009 23:07:25 -0000	1.2
@@ -0,0 +1 @@
+pure-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:57 -0000	1.1
+++ sources	30 Sep 2009 23:07:25 -0000	1.2
@@ -0,0 +1 @@
+e04f66c6d874b36751b495b1911d6437  pure-0.35.tar.gz



From salimma at fedoraproject.org  Wed Sep 30 23:07:26 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 23:07:26 +0000 (UTC)
Subject: rpms/pure/devel pure-init.el, NONE, 1.1 pure.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930230726.766CF11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pure-init.el pure.spec 
Log Message:
Initial import



--- NEW FILE pure-init.el ---
;; Register pure-mode

(autoload 'pure-mode "pure-mode" "Major mode for editing Pure code." t)
(add-to-list 'auto-mode-alist '("\\.pure$" . pure-mode))

(add-hook 'pure-mode-hook 'turn-on-font-lock)
(add-hook 'pure-eval-mode-hook 'turn-on-font-lock)


--- NEW FILE pure.spec ---
%if %($(pkg-config emacs) ; echo $?)
# This will get overridden by pkg-config; defaulting to the version in F-10
%define emacs_version 22.3
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           pure
Version:        0.35
Release:        1%{?dist}
Summary:        A term-rewriting functional programming language

Group:          Development/Languages
License:        GPLv3+
URL:            http://code.google.com/p/pure-lang/
Source0:        http://pure-lang.googlecode.com/files/pure-%{version}.tar.gz
Source1:        pure-init.el
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gmp-devel readline-devel gsl-devel
# Not checked by configure
BuildRequires:  llvm-devel >= 2.4 flex bison
# For compiling emacs mode
BuildRequires:  emacs emacs-el

# LLVM is not supported on ppc64
ExcludeArch:    ppc64

%description
Pure is a modern-style functional programming language based on term
rewriting. It offers equational definitions with pattern matching,
full symbolic rewriting capabilities, dynamic typing, eager and lazy
evaluation, lexical closures, built-in list and matrix support and an
easy-to-use C interface. The interpreter uses LLVM as a backend to
JIT-compile Pure programs to fast native code.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        doc
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
The %{name}-doc package contains examples for programming in %{name}.

%package -n emacs-pure
Summary:        Vala mode for Emacs
Group:          Applications/Editors
Requires:       emacs(bin) >= %{emacs_version}


%description -n emacs-pure
An Emacs mode for editing Pure source code.


%prep
%setup -q


%build
%ifarch ppc
# http://code.google.com/p/pure-lang/issues/detail?id=13#c47
%configure --disable-fastcc
%else
%configure
%endif

make %{?_smp_mflags}
# Compile emacs module
cd etc && emacs -batch -f batch-byte-compile pure-mode.el


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Emacs mode files
rm etc/*.el.in
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
mv etc/*.el* $RPM_BUILD_ROOT%{emacs_lispdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}


%check
%ifnarch ppc
make check
%else
(make check 2>&1 | tee testlog.txt ; true)
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig



%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README TODO etc
%ifarch ppc
%doc testlog.txt test/test020.*
%endif
%{_bindir}/pure*
%{_libdir}/libpure*.so.*
%exclude %{_libdir}/pure/pure_main.c
%{_libdir}/pure*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/pure*
%{_libdir}/*.so
%{_libdir}/pure/pure_main.c

%files doc
%defattr(-,root,root,-)
%doc examples

%files -n emacs-pure
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el*
%{emacs_startdir}/*



%changelog
* Thu Sep 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.35-1
- Update to 0.35
- Reenable PPC tests

* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-2
- Make tests advisory on ppc for now

* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-1
- Update to 0.34

* Tue Sep  1 2009 Michel Salim <salimma at fedoraproject.org> - 0.33-1
- Update to 0.33

* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.32-1
- Update to 0.32
- Split out -devel and -doc subpackages
- Disable ppc build on Rawhide; massive testcase failures

* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.30-1
- Update to 0.30

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.29-1
- Update to 0.29

* Sun Mar 15 2009 Michel Salim <salimma at fedoraproject.org> - 0.19-1
- Update to 0.19
- Add build dependencies that configure does not check: llvm-devel, flex

* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.18a-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:10:57 -0000	1.1
+++ .cvsignore	30 Sep 2009 23:07:25 -0000	1.2
@@ -0,0 +1 @@
+pure-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:57 -0000	1.1
+++ sources	30 Sep 2009 23:07:26 -0000	1.2
@@ -0,0 +1 @@
+e04f66c6d874b36751b495b1911d6437  pure-0.35.tar.gz



From salimma at fedoraproject.org  Wed Sep 30 23:07:25 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 30 Sep 2009 23:07:25 +0000 (UTC)
Subject: rpms/pure/F-11 pure-init.el, NONE, 1.1 pure.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090930230725.96A9311C01EA@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	pure-init.el pure.spec 
Log Message:
Initial import



--- NEW FILE pure-init.el ---
;; Register pure-mode

(autoload 'pure-mode "pure-mode" "Major mode for editing Pure code." t)
(add-to-list 'auto-mode-alist '("\\.pure$" . pure-mode))

(add-hook 'pure-mode-hook 'turn-on-font-lock)
(add-hook 'pure-eval-mode-hook 'turn-on-font-lock)


--- NEW FILE pure.spec ---
%if %($(pkg-config emacs) ; echo $?)
# This will get overridden by pkg-config; defaulting to the version in F-10
%define emacs_version 22.3
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           pure
Version:        0.35
Release:        1%{?dist}
Summary:        A term-rewriting functional programming language

Group:          Development/Languages
License:        GPLv3+
URL:            http://code.google.com/p/pure-lang/
Source0:        http://pure-lang.googlecode.com/files/pure-%{version}.tar.gz
Source1:        pure-init.el
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gmp-devel readline-devel gsl-devel
# Not checked by configure
BuildRequires:  llvm-devel >= 2.4 flex bison
# For compiling emacs mode
BuildRequires:  emacs emacs-el

# LLVM is not supported on ppc64
ExcludeArch:    ppc64

%description
Pure is a modern-style functional programming language based on term
rewriting. It offers equational definitions with pattern matching,
full symbolic rewriting capabilities, dynamic typing, eager and lazy
evaluation, lexical closures, built-in list and matrix support and an
easy-to-use C interface. The interpreter uses LLVM as a backend to
JIT-compile Pure programs to fast native code.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        doc
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
The %{name}-doc package contains examples for programming in %{name}.

%package -n emacs-pure
Summary:        Vala mode for Emacs
Group:          Applications/Editors
Requires:       emacs(bin) >= %{emacs_version}


%description -n emacs-pure
An Emacs mode for editing Pure source code.


%prep
%setup -q


%build
%ifarch ppc
# http://code.google.com/p/pure-lang/issues/detail?id=13#c47
%configure --disable-fastcc
%else
%configure
%endif

make %{?_smp_mflags}
# Compile emacs module
cd etc && emacs -batch -f batch-byte-compile pure-mode.el


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Emacs mode files
rm etc/*.el.in
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
mv etc/*.el* $RPM_BUILD_ROOT%{emacs_lispdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}


%check
%ifnarch ppc
make check
%else
(make check 2>&1 | tee testlog.txt ; true)
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig



%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README TODO etc
%ifarch ppc
%doc testlog.txt test/test020.*
%endif
%{_bindir}/pure*
%{_libdir}/libpure*.so.*
%exclude %{_libdir}/pure/pure_main.c
%{_libdir}/pure*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/pure*
%{_libdir}/*.so
%{_libdir}/pure/pure_main.c

%files doc
%defattr(-,root,root,-)
%doc examples

%files -n emacs-pure
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el*
%{emacs_startdir}/*



%changelog
* Thu Sep 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.35-1
- Update to 0.35
- Reenable PPC tests

* Tue Sep  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-2
- Make tests advisory on ppc for now

* Mon Sep  7 2009 Michel Salim <salimma at fedoraproject.org> - 0.34-1
- Update to 0.34

* Tue Sep  1 2009 Michel Salim <salimma at fedoraproject.org> - 0.33-1
- Update to 0.33

* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.32-1
- Update to 0.32
- Split out -devel and -doc subpackages
- Disable ppc build on Rawhide; massive testcase failures

* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.30-1
- Update to 0.30

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.29-1
- Update to 0.29

* Sun Mar 15 2009 Michel Salim <salimma at fedoraproject.org> - 0.19-1
- Update to 0.19
- Add build dependencies that configure does not check: llvm-devel, flex

* Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 0.18a-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:10:57 -0000	1.1
+++ .cvsignore	30 Sep 2009 23:07:25 -0000	1.2
@@ -0,0 +1 @@
+pure-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:10:57 -0000	1.1
+++ sources	30 Sep 2009 23:07:25 -0000	1.2
@@ -0,0 +1 @@
+e04f66c6d874b36751b495b1911d6437  pure-0.35.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 30 23:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:08:11 +0000
Subject: [pkgdb] yum-rhn-plugin was added for msuchy
Message-ID: <20090930230811.1953110F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package yum-rhn-plugin with summary RHN support for yum
kevin has approved Package yum-rhn-plugin
kevin has added a Fedora devel branch for yum-rhn-plugin with an owner of msuchy
kevin has approved yum-rhn-plugin in Fedora devel
kevin has approved Package yum-rhn-plugin
kevin has set commit to Approved for 107427 on yum-rhn-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on yum-rhn-plugin (Fedora devel)
kevin has set build to Approved for 107427 on yum-rhn-plugin (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/yum-rhn-plugin



From pkgdb at fedoraproject.org  Wed Sep 30 23:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:08:13 +0000
Subject: [pkgdb] yum-rhn-plugin summary updated by kevin
Message-ID: <20090930230813.9359B10F8A8@bastion2.fedora.phx.redhat.com>

kevin set package yum-rhn-plugin summary to RHN support for yum

To make changes to this package see:
  /pkgdb/packages/name/yum-rhn-plugin



From pkgdb at fedoraproject.org  Wed Sep 30 23:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:08:13 +0000
Subject: [pkgdb] yum-rhn-plugin (Fedora, 11) updated by kevin
Message-ID: <20090930230813.AAD4310F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for yum-rhn-plugin
kevin has set commit to Approved for 107427 on yum-rhn-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on yum-rhn-plugin (Fedora 11)
kevin has set build to Approved for 107427 on yum-rhn-plugin (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/yum-rhn-plugin



From pkgdb at fedoraproject.org  Wed Sep 30 23:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:08:13 +0000
Subject: [pkgdb] yum-rhn-plugin (Fedora, 11) updated by kevin
Message-ID: <20090930230813.C020910F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for yum-rhn-plugin
kevin has set commit to Approved for 107427 on yum-rhn-plugin (Fedora 12)
kevin has set checkout to Approved for 107427 on yum-rhn-plugin (Fedora 12)
kevin has set build to Approved for 107427 on yum-rhn-plugin (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/yum-rhn-plugin



From mclasen at fedoraproject.org  Wed Sep 30 23:23:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 30 Sep 2009 23:23:39 +0000 (UTC)
Subject: rpms/gtk2/F-12 .cvsignore, 1.117, 1.118 gtk2.spec, 1.407,
	1.408 sources, 1.126, 1.127
Message-ID: <20090930232339.4A6C511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29876

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- .cvsignore	23 Sep 2009 05:33:38 -0000	1.117
+++ .cvsignore	30 Sep 2009 23:23:37 -0000	1.118
@@ -1 +1 @@
-gtk+-2.18.0.tar.bz2
+gtk+-2.18.1.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- gtk2.spec	28 Sep 2009 16:47:25 -0000	1.407
+++ gtk2.spec	30 Sep 2009 23:23:37 -0000	1.408
@@ -11,13 +11,13 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.18.0
+%define base_version 2.18.1
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -28,15 +28,6 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=566522
-Patch1: gtk2-printing-smb-auth.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=586207
-Patch2: gtk2-printing-nonblocking-printer-list.patch
-# from upstream
-Patch3: fix-anchors.patch
-# from upstream
-Patch4: iconview-crash.patch
-
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -147,15 +138,6 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .printing-smb-auth
-%patch2 -p1 -b .printing-nonblocking-printer-list
-%patch3 -p1 -b .fix-anchors
-%patch4 -p1 -b .iconview-crash
-
-# make sure that gtkmarshalers.{c, h} get regenerated during the build
-#  - caused by print_authentication.patch
-rm --force ./gtk/gtkmarshalers.c
-rm --force ./gtk/gtkmarshalers.h
 
 %build
 libtoolize --force --copy
@@ -392,6 +374,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
 - Fix a crash in the appearance capplet
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- sources	23 Sep 2009 05:33:38 -0000	1.126
+++ sources	30 Sep 2009 23:23:37 -0000	1.127
@@ -1 +1 @@
-bb7ef5463a74a80454ced2c1d47a0192  gtk+-2.18.0.tar.bz2
+d6e0f982a84d393cd11e2ea90a9e3775  gtk+-2.18.1.tar.bz2



From kevin at fedoraproject.org  Wed Sep 30 23:39:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:39:56 +0000 (UTC)
Subject: rpms/yum-rhn-plugin/devel - New directory
Message-ID: <20090930233956.AC2C111C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-rhn-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI24691/rpms/yum-rhn-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/yum-rhn-plugin/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:39:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:39:56 +0000 (UTC)
Subject: rpms/yum-rhn-plugin - New directory
Message-ID: <20090930233956.4ED6C11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-rhn-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI24691/rpms/yum-rhn-plugin

Log Message:
Directory /cvs/pkgs/rpms/yum-rhn-plugin added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:40:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:40:10 +0000 (UTC)
Subject: rpms/yum-rhn-plugin Makefile,NONE,1.1
Message-ID: <20090930234010.B9AE311C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-rhn-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI24691/rpms/yum-rhn-plugin

Added Files:
	Makefile 
Log Message:
Setup of module yum-rhn-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module yum-rhn-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 Sep 30 23:40:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:40:12 +0000 (UTC)
Subject: rpms/yum-rhn-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090930234012.296C311C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-rhn-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI24691/rpms/yum-rhn-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yum-rhn-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: yum-rhn-plugin
# $Id: Makefile,v 1.1 2009/09/30 23:40:11 kevin Exp $
NAME := yum-rhn-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 bpepple at fedoraproject.org  Wed Sep 30 23:43:20 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 30 Sep 2009 23:43:20 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12 .cvsignore, 1.54, 1.55 sources, 1.54,
	1.55 telepathy-gabble.spec, 1.66, 1.67
Message-ID: <20090930234320.69FD211C00E6@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5297

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Sep 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.4-1
- Update to 0.8.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	10 Sep 2009 22:01:05 -0000	1.54
+++ .cvsignore	30 Sep 2009 23:43:19 -0000	1.55
@@ -1 +1 @@
-telepathy-gabble-0.8.3.tar.gz
+telepathy-gabble-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	10 Sep 2009 22:01:06 -0000	1.54
+++ sources	30 Sep 2009 23:43:20 -0000	1.55
@@ -1 +1 @@
-224a2ba110b401354dc71be009fd0e63  telepathy-gabble-0.8.3.tar.gz
+98c8b62427d5bf7345310cf75cbd422c  telepathy-gabble-0.8.4.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/telepathy-gabble.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- telepathy-gabble.spec	10 Sep 2009 22:01:06 -0000	1.66
+++ telepathy-gabble.spec	30 Sep 2009 23:43:20 -0000	1.67
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4.
+
 * Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.3-1
 - Update to 0.8.3.
 



From kevin at fedoraproject.org  Wed Sep 30 23:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:43:45 +0000 (UTC)
Subject: rpms/luci - New directory
Message-ID: <20090930234345.31F0311C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/luci
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn5399/rpms/luci

Log Message:
Directory /cvs/pkgs/rpms/luci added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:43:45 +0000 (UTC)
Subject: rpms/luci/devel - New directory
Message-ID: <20090930234345.6624111C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/luci/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn5399/rpms/luci/devel

Log Message:
Directory /cvs/pkgs/rpms/luci/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:43:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:43:55 +0000 (UTC)
Subject: rpms/luci/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090930234355.3D79B11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/luci/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn5399/rpms/luci/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module luci


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: luci
# $Id: Makefile,v 1.1 2009/09/30 23:43:54 kevin Exp $
NAME := luci
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  Wed Sep 30 23:43:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:43:54 +0000 (UTC)
Subject: rpms/luci Makefile,NONE,1.1
Message-ID: <20090930234354.D102C11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/luci
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn5399/rpms/luci

Added Files:
	Makefile 
Log Message:
Setup of module luci


--- NEW FILE Makefile ---
# Top level Makefile for module luci
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 Sep 30 23:44:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:44:42 +0000
Subject: [pkgdb] fped was added for chitlesh
Message-ID: <20090930234442.5F3E410F857@bastion2.fedora.phx.redhat.com>

kevin has added Package fped with summary A footprint editor used by openmoko developers
kevin has approved Package fped
kevin has added a Fedora devel branch for fped with an owner of chitlesh
kevin has approved fped in Fedora devel
kevin has approved Package fped
kevin has set commit to Approved for 107427 on fped (Fedora devel)
kevin has set checkout to Approved for 107427 on fped (Fedora devel)
kevin has set build to Approved for 107427 on fped (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fped



From pkgdb at fedoraproject.org  Wed Sep 30 23:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:44:43 +0000
Subject: [pkgdb] fped summary updated by kevin
Message-ID: <20090930234443.E1CDC10F88C@bastion2.fedora.phx.redhat.com>

kevin set package fped summary to A footprint editor used by openmoko developers

To make changes to this package see:
  /pkgdb/packages/name/fped



From pkgdb at fedoraproject.org  Wed Sep 30 23:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:44:43 +0000
Subject: [pkgdb] fped (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234443.E61DE10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for fped
kevin has set commit to Approved for 107427 on fped (Fedora 11)
kevin has set checkout to Approved for 107427 on fped (Fedora 11)
kevin has set build to Approved for 107427 on fped (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/fped



From pkgdb at fedoraproject.org  Wed Sep 30 23:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:44:43 +0000
Subject: [pkgdb] fped (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234443.E9E9310F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for fped
kevin has set commit to Approved for 107427 on fped (Fedora 10)
kevin has set checkout to Approved for 107427 on fped (Fedora 10)
kevin has set build to Approved for 107427 on fped (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/fped



From pkgdb at fedoraproject.org  Wed Sep 30 23:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:44:43 +0000
Subject: [pkgdb] fped (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234444.01D9010F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for fped
kevin has set commit to Approved for 107427 on fped (Fedora 12)
kevin has set checkout to Approved for 107427 on fped (Fedora 12)
kevin has set build to Approved for 107427 on fped (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/fped



From kevin at fedoraproject.org  Wed Sep 30 23:44:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:44:51 +0000 (UTC)
Subject: rpms/fped/devel - New directory
Message-ID: <20090930234451.4987F11C0337@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fped/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdb6203/rpms/fped/devel

Log Message:
Directory /cvs/pkgs/rpms/fped/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 30 23:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:44:43 +0000
Subject: [pkgdb] fped (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234444.0AFA410F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for fped
kevin has set commit to Approved for 107427 on fped (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on fped (Fedora EPEL 5)
kevin has set build to Approved for 107427 on fped (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/fped



From kevin at fedoraproject.org  Wed Sep 30 23:44:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:44:51 +0000 (UTC)
Subject: rpms/fped - New directory
Message-ID: <20090930234451.1470B11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fped
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdb6203/rpms/fped

Log Message:
Directory /cvs/pkgs/rpms/fped added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:44:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:44:59 +0000 (UTC)
Subject: rpms/fped Makefile,NONE,1.1
Message-ID: <20090930234459.39CA211C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fped
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdb6203/rpms/fped

Added Files:
	Makefile 
Log Message:
Setup of module fped


--- NEW FILE Makefile ---
# Top level Makefile for module fped
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 Sep 30 23:44:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:44:59 +0000 (UTC)
Subject: rpms/fped/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090930234459.AD52211C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fped/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdb6203/rpms/fped/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fped


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fped
# $Id: Makefile,v 1.1 2009/09/30 23:44:59 kevin Exp $
NAME := fped
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 Sep 30 23:47:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:47:14 +0000
Subject: [pkgdb] spacewalk-koan was added for msuchy
Message-ID: <20090930234714.0D55310F857@bastion2.fedora.phx.redhat.com>

kevin has added Package spacewalk-koan with summary Support package for spacewalk koan interaction
kevin has approved Package spacewalk-koan
kevin has added a Fedora devel branch for spacewalk-koan with an owner of msuchy
kevin has approved spacewalk-koan in Fedora devel
kevin has approved Package spacewalk-koan
kevin has set commit to Approved for 107427 on spacewalk-koan (Fedora devel)
kevin has set checkout to Approved for 107427 on spacewalk-koan (Fedora devel)
kevin has set build to Approved for 107427 on spacewalk-koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/spacewalk-koan



From pkgdb at fedoraproject.org  Wed Sep 30 23:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:47:16 +0000
Subject: [pkgdb] spacewalk-koan summary updated by kevin
Message-ID: <20090930234716.4A3A610F88B@bastion2.fedora.phx.redhat.com>

kevin set package spacewalk-koan summary to Support package for spacewalk koan interaction

To make changes to this package see:
  /pkgdb/packages/name/spacewalk-koan



From pkgdb at fedoraproject.org  Wed Sep 30 23:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:47:16 +0000
Subject: [pkgdb] spacewalk-koan (Fedora, 11) updated by kevin
Message-ID: <20090930234716.5489D10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for spacewalk-koan
kevin has set commit to Approved for 107427 on spacewalk-koan (Fedora 11)
kevin has set checkout to Approved for 107427 on spacewalk-koan (Fedora 11)
kevin has set build to Approved for 107427 on spacewalk-koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/spacewalk-koan



From pkgdb at fedoraproject.org  Wed Sep 30 23:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:47:16 +0000
Subject: [pkgdb] spacewalk-koan (Fedora, 11) updated by kevin
Message-ID: <20090930234716.6EFAB10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for spacewalk-koan
kevin has set commit to Approved for 107427 on spacewalk-koan (Fedora 12)
kevin has set checkout to Approved for 107427 on spacewalk-koan (Fedora 12)
kevin has set build to Approved for 107427 on spacewalk-koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/spacewalk-koan



From kevin at fedoraproject.org  Wed Sep 30 23:47:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:47:30 +0000 (UTC)
Subject: rpms/spacewalk-koan/devel - New directory
Message-ID: <20090930234730.47CBE11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spacewalk-koan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn7533/rpms/spacewalk-koan/devel

Log Message:
Directory /cvs/pkgs/rpms/spacewalk-koan/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:47:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:47:30 +0000 (UTC)
Subject: rpms/spacewalk-koan - New directory
Message-ID: <20090930234730.1918311C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spacewalk-koan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn7533/rpms/spacewalk-koan

Log Message:
Directory /cvs/pkgs/rpms/spacewalk-koan added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:47:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:47:38 +0000 (UTC)
Subject: rpms/spacewalk-koan Makefile,NONE,1.1
Message-ID: <20090930234738.63FDF11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spacewalk-koan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn7533/rpms/spacewalk-koan

Added Files:
	Makefile 
Log Message:
Setup of module spacewalk-koan


--- NEW FILE Makefile ---
# Top level Makefile for module spacewalk-koan
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 Sep 30 23:47:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:47:38 +0000 (UTC)
Subject: rpms/spacewalk-koan/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090930234738.C587D11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spacewalk-koan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVn7533/rpms/spacewalk-koan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spacewalk-koan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: spacewalk-koan
# $Id: Makefile,v 1.1 2009/09/30 23:47:38 kevin Exp $
NAME := spacewalk-koan
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 Sep 30 23:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:48:54 +0000
Subject: [pkgdb] afraid-dyndns (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234854.43AB610F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for afraid-dyndns
kevin has set commit to Approved for 107427 on afraid-dyndns (Fedora 11)
kevin has set checkout to Approved for 107427 on afraid-dyndns (Fedora 11)
kevin has set build to Approved for 107427 on afraid-dyndns (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/afraid-dyndns



From pkgdb at fedoraproject.org  Wed Sep 30 23:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:48:54 +0000
Subject: [pkgdb] afraid-dyndns summary updated by kevin
Message-ID: <20090930234854.27EA410F88C@bastion2.fedora.phx.redhat.com>

kevin set package afraid-dyndns summary to A dynamic DNS client for the free service afraid.org

To make changes to this package see:
  /pkgdb/packages/name/afraid-dyndns



From pkgdb at fedoraproject.org  Wed Sep 30 23:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:48:49 +0000
Subject: [pkgdb] afraid-dyndns was added for ekkis
Message-ID: <20090930234849.9351610F86A@bastion2.fedora.phx.redhat.com>

kevin has added Package afraid-dyndns with summary A dynamic DNS client for the free service afraid.org
kevin has approved Package afraid-dyndns
kevin has added a Fedora devel branch for afraid-dyndns with an owner of ekkis
kevin has approved afraid-dyndns in Fedora devel
kevin has approved Package afraid-dyndns
kevin has set commit to Approved for 107427 on afraid-dyndns (Fedora devel)
kevin has set checkout to Approved for 107427 on afraid-dyndns (Fedora devel)
kevin has set build to Approved for 107427 on afraid-dyndns (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/afraid-dyndns



From pkgdb at fedoraproject.org  Wed Sep 30 23:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:48:54 +0000
Subject: [pkgdb] afraid-dyndns (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234854.54E4610F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for afraid-dyndns
kevin has set commit to Approved for 107427 on afraid-dyndns (Fedora 10)
kevin has set checkout to Approved for 107427 on afraid-dyndns (Fedora 10)
kevin has set build to Approved for 107427 on afraid-dyndns (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/afraid-dyndns



From pkgdb at fedoraproject.org  Wed Sep 30 23:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:48:54 +0000
Subject: [pkgdb] afraid-dyndns (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234854.887E810F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for afraid-dyndns
kevin has set commit to Approved for 107427 on afraid-dyndns (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on afraid-dyndns (Fedora EPEL 5)
kevin has set build to Approved for 107427 on afraid-dyndns (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/afraid-dyndns



From pkgdb at fedoraproject.org  Wed Sep 30 23:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:48:54 +0000
Subject: [pkgdb] afraid-dyndns (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930234854.64E7610F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for afraid-dyndns
kevin has set commit to Approved for 107427 on afraid-dyndns (Fedora 12)
kevin has set checkout to Approved for 107427 on afraid-dyndns (Fedora 12)
kevin has set build to Approved for 107427 on afraid-dyndns (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/afraid-dyndns



From kevin at fedoraproject.org  Wed Sep 30 23:49:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:49:07 +0000 (UTC)
Subject: rpms/afraid-dyndns/devel - New directory
Message-ID: <20090930234907.B65F911C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/afraid-dyndns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfg8300/rpms/afraid-dyndns/devel

Log Message:
Directory /cvs/pkgs/rpms/afraid-dyndns/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:49:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:49:07 +0000 (UTC)
Subject: rpms/afraid-dyndns - New directory
Message-ID: <20090930234907.6EA2411C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfg8300/rpms/afraid-dyndns

Log Message:
Directory /cvs/pkgs/rpms/afraid-dyndns added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:49:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:49:25 +0000 (UTC)
Subject: rpms/afraid-dyndns Makefile,NONE,1.1
Message-ID: <20090930234925.48B1211C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfg8300/rpms/afraid-dyndns

Added Files:
	Makefile 
Log Message:
Setup of module afraid-dyndns


--- NEW FILE Makefile ---
# Top level Makefile for module afraid-dyndns
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 Sep 30 23:49:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:49:26 +0000 (UTC)
Subject: rpms/afraid-dyndns/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090930234926.77B4F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/afraid-dyndns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfg8300/rpms/afraid-dyndns/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module afraid-dyndns


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: afraid-dyndns
# $Id: Makefile,v 1.1 2009/09/30 23:49:25 kevin Exp $
NAME := afraid-dyndns
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 Sep 30 23:49:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:49:43 +0000
Subject: [pkgdb] popfile was added for amatubu
Message-ID: <20090930234943.5D0C510F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package popfile with summary Automatic Email Classification
kevin has approved Package popfile
kevin has added a Fedora devel branch for popfile with an owner of amatubu
kevin has approved popfile in Fedora devel
kevin has approved Package popfile
kevin has set commit to Approved for 107427 on popfile (Fedora devel)
kevin has set checkout to Approved for 107427 on popfile (Fedora devel)
kevin has set build to Approved for 107427 on popfile (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/popfile



From pkgdb at fedoraproject.org  Wed Sep 30 23:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:49:45 +0000
Subject: [pkgdb] popfile summary updated by kevin
Message-ID: <20090930234945.E386910F894@bastion2.fedora.phx.redhat.com>

kevin set package popfile summary to Automatic Email Classification

To make changes to this package see:
  /pkgdb/packages/name/popfile



From pkgdb at fedoraproject.org  Wed Sep 30 23:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:49:45 +0000
Subject: [pkgdb] popfile (Fedora, 10) updated by kevin
Message-ID: <20090930234945.F253010F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for popfile
kevin has set commit to Approved for 107427 on popfile (Fedora 11)
kevin has set checkout to Approved for 107427 on popfile (Fedora 11)
kevin has set build to Approved for 107427 on popfile (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/popfile



From pkgdb at fedoraproject.org  Wed Sep 30 23:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:49:45 +0000
Subject: [pkgdb] popfile (Fedora, 10) updated by kevin
Message-ID: <20090930234946.10BEF10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for popfile
kevin has set commit to Approved for 107427 on popfile (Fedora 12)
kevin has set checkout to Approved for 107427 on popfile (Fedora 12)
kevin has set build to Approved for 107427 on popfile (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/popfile



From pkgdb at fedoraproject.org  Wed Sep 30 23:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:49:45 +0000
Subject: [pkgdb] popfile (Fedora, 10) updated by kevin
Message-ID: <20090930234946.2043710F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for popfile
kevin has set commit to Approved for 107427 on popfile (Fedora 10)
kevin has set checkout to Approved for 107427 on popfile (Fedora 10)
kevin has set build to Approved for 107427 on popfile (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/popfile



From kevin at fedoraproject.org  Wed Sep 30 23:50:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:50:35 +0000 (UTC)
Subject: rpms/popfile/devel - New directory
Message-ID: <20090930235035.ABC7B11C04F5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/popfile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGP9135/rpms/popfile/devel

Log Message:
Directory /cvs/pkgs/rpms/popfile/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:50:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:50:35 +0000 (UTC)
Subject: rpms/popfile - New directory
Message-ID: <20090930235035.6423A11C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/popfile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGP9135/rpms/popfile

Log Message:
Directory /cvs/pkgs/rpms/popfile added to the repository




From pkgdb at fedoraproject.org  Wed Sep 30 23:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:50:59 +0000
Subject: [pkgdb] gnucap (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930235100.0A7B710F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gnucap
kevin has set commit to Approved for 107427 on gnucap (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on gnucap (Fedora EPEL 5)
kevin has set build to Approved for 107427 on gnucap (Fedora EPEL 5)
kevin changed owner of gnucap in Fedora EPEL 5 to chitlesh

To make changes to this package see:
  /pkgdb/packages/name/gnucap



From kevin at fedoraproject.org  Wed Sep 30 23:51:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:51:06 +0000 (UTC)
Subject: rpms/popfile Makefile,NONE,1.1
Message-ID: <20090930235106.A4CF211C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/popfile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGP9135/rpms/popfile

Added Files:
	Makefile 
Log Message:
Setup of module popfile


--- NEW FILE Makefile ---
# Top level Makefile for module popfile
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 Sep 30 23:51:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:51:07 +0000 (UTC)
Subject: rpms/popfile/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090930235107.9F89811C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/popfile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGP9135/rpms/popfile/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module popfile


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: popfile
# $Id: Makefile,v 1.1 2009/09/30 23:51:06 kevin Exp $
NAME := popfile
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 Sep 30 23:52:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:23 +0000
Subject: [pkgdb] mod_gnutls was added for ekkis
Message-ID: <20090930235223.356C210F86A@bastion2.fedora.phx.redhat.com>

kevin has added Package mod_gnutls with summary GnuTLS module for the Apache HTTP server
kevin has approved Package mod_gnutls
kevin has added a Fedora devel branch for mod_gnutls with an owner of ekkis
kevin has approved mod_gnutls in Fedora devel
kevin has approved Package mod_gnutls
kevin has set commit to Approved for 107427 on mod_gnutls (Fedora devel)
kevin has set checkout to Approved for 107427 on mod_gnutls (Fedora devel)
kevin has set build to Approved for 107427 on mod_gnutls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mod_gnutls



From pkgdb at fedoraproject.org  Wed Sep 30 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:25 +0000
Subject: [pkgdb] mod_gnutls summary updated by kevin
Message-ID: <20090930235225.170F110F894@bastion2.fedora.phx.redhat.com>

kevin set package mod_gnutls summary to GnuTLS module for the Apache HTTP server

To make changes to this package see:
  /pkgdb/packages/name/mod_gnutls



From pkgdb at fedoraproject.org  Wed Sep 30 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:25 +0000
Subject: [pkgdb] mod_gnutls (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930235225.1DE7B10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mod_gnutls
kevin has set commit to Approved for 107427 on mod_gnutls (Fedora 11)
kevin has set checkout to Approved for 107427 on mod_gnutls (Fedora 11)
kevin has set build to Approved for 107427 on mod_gnutls (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mod_gnutls



From pkgdb at fedoraproject.org  Wed Sep 30 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:25 +0000
Subject: [pkgdb] mod_gnutls (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930235225.23E0810F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mod_gnutls
kevin has set commit to Approved for 107427 on mod_gnutls (Fedora 12)
kevin has set checkout to Approved for 107427 on mod_gnutls (Fedora 12)
kevin has set build to Approved for 107427 on mod_gnutls (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mod_gnutls



From pkgdb at fedoraproject.org  Wed Sep 30 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:25 +0000
Subject: [pkgdb] mod_gnutls (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930235225.2AD3E10F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mod_gnutls
kevin has set commit to Approved for 107427 on mod_gnutls (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on mod_gnutls (Fedora EPEL 5)
kevin has set build to Approved for 107427 on mod_gnutls (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/mod_gnutls



From kevin at fedoraproject.org  Wed Sep 30 23:52:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:52:33 +0000 (UTC)
Subject: rpms/mod_gnutls - New directory
Message-ID: <20090930235233.1568D11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_gnutls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN10240/rpms/mod_gnutls

Log Message:
Directory /cvs/pkgs/rpms/mod_gnutls added to the repository




From pkgdb at fedoraproject.org  Wed Sep 30 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:25 +0000
Subject: [pkgdb] mod_gnutls (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930235225.3688E10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mod_gnutls
kevin has set commit to Approved for 107427 on mod_gnutls (Fedora 10)
kevin has set checkout to Approved for 107427 on mod_gnutls (Fedora 10)
kevin has set build to Approved for 107427 on mod_gnutls (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mod_gnutls



From kevin at fedoraproject.org  Wed Sep 30 23:52:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:52:33 +0000 (UTC)
Subject: rpms/mod_gnutls/devel - New directory
Message-ID: <20090930235233.3B9A711C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN10240/rpms/mod_gnutls/devel

Log Message:
Directory /cvs/pkgs/rpms/mod_gnutls/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 30 23:52:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:52:41 +0000 (UTC)
Subject: rpms/mod_gnutls Makefile,NONE,1.1
Message-ID: <20090930235241.D045A11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_gnutls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN10240/rpms/mod_gnutls

Added Files:
	Makefile 
Log Message:
Setup of module mod_gnutls


--- NEW FILE Makefile ---
# Top level Makefile for module mod_gnutls
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 Sep 30 23:52:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 30 Sep 2009 23:52:42 +0000 (UTC)
Subject: rpms/mod_gnutls/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090930235242.2C52411C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN10240/rpms/mod_gnutls/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_gnutls


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mod_gnutls
# $Id: Makefile,v 1.1 2009/09/30 23:52:41 kevin Exp $
NAME := mod_gnutls
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 Sep 30 23:52:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:52:49 +0000
Subject: [pkgdb] dbus-cxx (Fedora EPEL, 5) updated by kevin
Message-ID: <20090930235249.5DC3510F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for dbus-cxx
kevin has set commit to Approved for 107427 on dbus-cxx (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on dbus-cxx (Fedora EPEL 5)
kevin has set build to Approved for 107427 on dbus-cxx (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/dbus-cxx



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:30 +0000
Subject: [pkgdb] dansguardian: steve has requested watchbugzilla
Message-ID: <20090930235330.39FCE10F80B@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on dansguardian (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:30 +0000
Subject: [pkgdb] dansguardian: steve has requested watchcommits
Message-ID: <20090930235330.AB16310F875@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on dansguardian (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:38 +0000
Subject: [pkgdb] dansguardian: steve has requested watchbugzilla
Message-ID: <20090930235338.40FF810F80B@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on dansguardian (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:33 +0000
Subject: [pkgdb] dansguardian: steve has requested commit
Message-ID: <20090930235333.5560610F894@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on dansguardian (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:40 +0000
Subject: [pkgdb] dansguardian: steve has requested watchcommits
Message-ID: <20090930235340.3C4AF10F88C@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on dansguardian (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:41 +0000
Subject: [pkgdb] dansguardian: steve has requested commit
Message-ID: <20090930235342.00A4A10F8A8@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on dansguardian (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:50 +0000
Subject: [pkgdb] dansguardian: steve has requested watchbugzilla
Message-ID: <20090930235350.46ED710F88C@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on dansguardian (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:53 +0000
Subject: [pkgdb] dansguardian: steve has requested commit
Message-ID: <20090930235353.A945110F8AF@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on dansguardian (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:58 +0000
Subject: [pkgdb] dansguardian: steve has requested watchbugzilla
Message-ID: <20090930235358.ECDFD10F875@bastion2.fedora.phx.redhat.com>

steve has requested the watchbugzilla acl on dansguardian (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:54:01 +0000
Subject: [pkgdb] dansguardian: steve has requested watchcommits
Message-ID: <20090930235400.EB6A010F8A9@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on dansguardian (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:54:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:54:03 +0000
Subject: [pkgdb] dansguardian: steve has requested commit
Message-ID: <20090930235403.32B5410F8AB@bastion2.fedora.phx.redhat.com>

steve has requested the commit acl on dansguardian (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Wed Sep 30 23:53:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Sep 2009 23:53:52 +0000
Subject: [pkgdb] dansguardian: steve has requested watchcommits
Message-ID: <20090930235352.30A3710F8A8@bastion2.fedora.phx.redhat.com>

steve has requested the watchcommits acl on dansguardian (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dansguardian